From df946cc9a50ca3d8007949a412136c01414848c4 Mon Sep 17 00:00:00 2001
From: Charlie Collard <charliecollard0@gmail.com>
Date: Thu, 7 Nov 2024 19:29:04 +0000
Subject: [PATCH 0001/6226] nixos/services.openvpn: add package option

---
 nixos/modules/services/networking/openvpn.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
index 56b1f6f5ab8f..0e6c3f376a8d 100644
--- a/nixos/modules/services/networking/openvpn.nix
+++ b/nixos/modules/services/networking/openvpn.nix
@@ -6,8 +6,6 @@ let
 
   cfg = config.services.openvpn;
 
-  inherit (pkgs) openvpn;
-
   makeOpenVPNJob = cfg: name:
     let
 
@@ -64,7 +62,7 @@ let
 
       path = [ pkgs.iptables pkgs.iproute2 pkgs.nettools ];
 
-      serviceConfig.ExecStart = "@${openvpn}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}";
+      serviceConfig.ExecStart = "@${cfg.package}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}";
       serviceConfig.Restart = "always";
       serviceConfig.Type = "notify";
     };
@@ -150,6 +148,8 @@ in
             '';
           };
 
+          package = lib.mkPackageOption pkgs "openvpn" { };
+
           up = mkOption {
             default = "";
             type = types.lines;

From 93561e675dd60c5447db8a56f66f8c945a1a5537 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Thu, 3 Apr 2025 11:17:38 +0300
Subject: [PATCH 0002/6226] emacs/wrapper.nix: link included executables by
 their resolved paths

This allows bundling Emacs with packages like `nodePackages.prettier`,
whose executables are relative symlinks.

Fixes #395442
---
 .../editors/emacs/build-support/wrapper.nix        | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs/build-support/wrapper.nix b/pkgs/applications/editors/emacs/build-support/wrapper.nix
index 7bef6596b62a..8a36c507afff 100644
--- a/pkgs/applications/editors/emacs/build-support/wrapper.nix
+++ b/pkgs/applications/editors/emacs/build-support/wrapper.nix
@@ -125,9 +125,19 @@ runCommand (lib.appendToName "with-packages" emacs).name
             local origin_path=$2
             local dest_path=$3
 
-            # Add the path to the search path list, but only if it exists
+            # Add the path to the search path list, but only if it exists.
+            # Executables in /bin are linked by their resolved paths in case they are
+            # relative symlinks (which break when 'lndir'ed as is);
+            # see https://github.com/NixOS/nixpkgs/issues/395442
             if [[ -d "$pkg/$origin_path" ]]; then
-              $lndir/bin/lndir -silent "$pkg/$origin_path" "$out/$dest_path"
+              case "$origin_path" in
+                bin)
+                  for exe in $pkg/$origin_path/*; do
+                    ln -s "$(realpath "$exe")" "$out/$dest_path/$(basename "$exe")"
+                  done
+                  ;;
+                *) $lndir/bin/lndir -silent "$pkg/$origin_path" "$out/$dest_path";;
+              esac
             fi
           }
 

From fee9d68c3e1b59e7f95bc334520d60eca8cc7462 Mon Sep 17 00:00:00 2001
From: nobbele <realnobbele@gmail.com>
Date: Sun, 6 Apr 2025 16:17:05 +0200
Subject: [PATCH 0003/6226] maintainers: add nobbele

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index d2f0b3ccb6f3..0ddd30211db1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17296,6 +17296,12 @@
     github = "noahgitsham";
     githubId = 73707948;
   };
+  nobbele = {
+    name = "nobbele";
+    email = "realnobbele@gmail.com";
+    github = "nobbele";
+    githubId = 17962514;
+  };
   nobbz = {
     name = "Norbert Melzer";
     email = "timmelzer+nixpkgs@gmail.com";

From 2b9740196ccae11dd164c443b049fc5ca643d8bf Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Thu, 24 Apr 2025 21:46:59 +0300
Subject: [PATCH 0004/6226] iosevka: get `set` value from `privateBuildPlan`,
 if it's an attrset

I find it redundant to set `set`, when a config is supplied.
---
 pkgs/by-name/io/iosevka/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix
index 90f9b1140ad5..353e7ca68813 100644
--- a/pkgs/by-name/io/iosevka/package.nix
+++ b/pkgs/by-name/io/iosevka/package.nix
@@ -47,10 +47,12 @@
   #   sequence = "+>"
   # '';
   extraParameters ? null,
-  # Custom font set name. Required if any custom settings above.
-  set ? null,
+  # Custom font set name. Required if `extraParameters` is used and/or
+  # if `privateBuildPlan` is a TOML string.
+  set ? privateBuildPlan.family or null,
 }:
 
+assert (builtins.isAttrs privateBuildPlan) -> builtins.hasAttr "family" privateBuildPlan;
 assert (privateBuildPlan != null) -> set != null;
 assert (extraParameters != null) -> set != null;
 

From 5ff65d46624b9e1fa5af1230431cbf9926113b40 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Sun, 25 May 2025 14:54:29 +0200
Subject: [PATCH 0005/6226] netdata: add missing breaking release notes

---
 nixos/doc/manual/release-notes/rl-2505.section.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2505.section.md b/nixos/doc/manual/release-notes/rl-2505.section.md
index 50cd00ea43c3..31b60e9b2ecc 100644
--- a/nixos/doc/manual/release-notes/rl-2505.section.md
+++ b/nixos/doc/manual/release-notes/rl-2505.section.md
@@ -370,6 +370,8 @@ Alongside many enhancements to NixOS modules and general system improvements, th
 
 - `virtualisation.azure.agent` option provided by `azure-agent.nix` is replaced by `services.waagent`, and will be removed in a future release.
 
+- Netdata removed support for non cloud deployments in version 2, so the `withCloud` option has been removed.
+
 - The ZFS import service now respects `fileSystems.*.options = [ "noauto" ];` and does not add that pool's import service to `zfs-import.target`, meaning it will not be automatically imported at boot.
 
 - Default file names of images generated by several builders in `system.build` have been changed as outlined in the table below.

From d3f7bc4a1e8b520b37ec73848b863e8ee31d2ab3 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Tue, 16 Jul 2024 00:25:30 +0200
Subject: [PATCH 0006/6226] smatch: fix include path for standard headers

---
 pkgs/by-name/sm/smatch/fix_include_path.patch | 58 +++++++++++++++++++
 pkgs/by-name/sm/smatch/package.nix            | 31 +++++++---
 2 files changed, 80 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/by-name/sm/smatch/fix_include_path.patch

diff --git a/pkgs/by-name/sm/smatch/fix_include_path.patch b/pkgs/by-name/sm/smatch/fix_include_path.patch
new file mode 100644
index 000000000000..af6de589f9e9
--- /dev/null
+++ b/pkgs/by-name/sm/smatch/fix_include_path.patch
@@ -0,0 +1,58 @@
+diff --git a/pre-process.c b/pre-process.c
+index 457685c0..006209ad 100644
+--- a/pre-process.c
++++ b/pre-process.c
+@@ -2410,32 +2410,27 @@ static void do_preprocess(struct token **list)
+ 
+ void init_include_path(void)
+ {
+-	FILE *fp;
+-	char path[256];
+-	char arch[32];
+-	char os[32];
+-
+-	fp = popen("/bin/uname -m", "r");
+-	if (!fp)
+-		return;
+-	if (!fgets(arch, sizeof(arch) - 1, fp))
+-		return;
+-	pclose(fp);
+-	if (arch[strlen(arch) - 1] == '\n')
+-		arch[strlen(arch) - 1] = '\0';
+-
+-	fp = popen("/bin/uname -o", "r");
+-	if (!fp)
+-		return;
+-	fgets(os, sizeof(os) - 1, fp);
+-	pclose(fp);
+-
+-	if (strcmp(os, "GNU/Linux\n") != 0)
+-		return;
+-	strcpy(os, "linux-gnu");
+-
+-	snprintf(path, sizeof(path), "/usr/include/%s-%s/", arch, os);
+-	add_pre_buffer("#add_system \"%s/\"\n", path);
++	add_pre_buffer("#add_system \"%s/\"\n", "@clang@");
++	add_pre_buffer("#add_system \"%s/\"\n", "@libc@");
++
++    bool collect = false;
++    char *nix_cflags = getenv("NIX_CFLAGS_COMPILE");
++    if (nix_cflags == NULL)
++        return;
++
++    for (
++        char *token = strtok(nix_cflags, " ");
++        token != NULL;
++        token = strtok(NULL, " ")
++    ) {
++        if (collect && *token == '/') {
++	        add_pre_buffer("#add_system \"%s/\"\n", token);
++            collect = false;
++            continue;
++        }
++        if (!strcmp(token, "-isystem"))
++            collect = true;
++    }
+ }
+ 
+ struct token * preprocess(struct token *token)
diff --git a/pkgs/by-name/sm/smatch/package.nix b/pkgs/by-name/sm/smatch/package.nix
index fe6514e15d92..7c13cf571ab8 100644
--- a/pkgs/by-name/sm/smatch/package.nix
+++ b/pkgs/by-name/sm/smatch/package.nix
@@ -5,31 +5,44 @@
   pkg-config,
   sqlite,
   openssl,
-  buildllvmsparse ? false,
-  buildc2xml ? false,
   libllvm,
   libxml2,
+  replaceVars,
+  llvmPackages,
+  buildllvmsparse ? false,
+  buildc2xml ? false,
 }:
 let
   version = "1.73";
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "smatch";
   inherit version;
 
   src = fetchFromGitHub {
     owner = "error27";
     repo = "smatch";
-    rev = version;
-    sha256 = "sha256-Pv3bd2cjnQKnhH7TrkYWfDEeaq6u/q/iK1ZErzn6bME=";
+    tag = finalAttrs.version;
+    hash = "sha256-Pv3bd2cjnQKnhH7TrkYWfDEeaq6u/q/iK1ZErzn6bME=";
   };
 
-  NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [
-    "-Wno-incompatible-function-pointer-types"
+  patches = [
+    ./remove_const.patch
+    (
+      let
+        clang-major = lib.versions.major (lib.getVersion llvmPackages.clang-unwrapped);
+        clang-lib = lib.getLib llvmPackages.clang-unwrapped;
+      in
+      replaceVars ./fix_include_path.patch {
+        clang = "${clang-lib}/lib/clang/${clang-major}/include";
+        libc = "${lib.getDev stdenv.cc.libc}/include";
+      }
+    )
   ];
 
+  enableParallelBuilding = true;
+
   nativeBuildInputs = [ pkg-config ];
-  patches = [ ./remove_const.patch ];
 
   buildInputs =
     [
@@ -51,4 +64,4 @@ stdenv.mkDerivation {
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.all;
   };
-}
+})

From ba9f907a7482630fb8e7d17b393aceeb151bcc02 Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Fri, 30 May 2025 20:18:39 +0200
Subject: [PATCH 0007/6226] nixos/pgbouncer: use `cfg.package` option, instead
 of global pkgs

---
 nixos/modules/services/databases/pgbouncer.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/databases/pgbouncer.nix b/nixos/modules/services/databases/pgbouncer.nix
index 378cbc3f81bb..7aedd0b62085 100644
--- a/nixos/modules/services/databases/pgbouncer.nix
+++ b/nixos/modules/services/databases/pgbouncer.nix
@@ -420,7 +420,7 @@ in
         User = cfg.user;
         Group = cfg.group;
         ExecStart = utils.escapeSystemdExecArgs [
-          (lib.getExe pkgs.pgbouncer)
+          (lib.getExe cfg.package)
           "/etc/${configPath}"
         ];
         RuntimeDirectory = "pgbouncer";

From 8eed004ff59d7d5f5b9b55d9887ad462c4525a54 Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Fri, 30 May 2025 20:19:10 +0200
Subject: [PATCH 0008/6226] nixos/karma: use `cfg.package` option, instead of
 global pkgs

---
 nixos/modules/services/monitoring/karma.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/karma.nix b/nixos/modules/services/monitoring/karma.nix
index 50b8d384a4a3..771654dd6175 100644
--- a/nixos/modules/services/monitoring/karma.nix
+++ b/nixos/modules/services/monitoring/karma.nix
@@ -117,7 +117,7 @@ in
         Type = "simple";
         DynamicUser = true;
         Restart = "on-failure";
-        ExecStart = "${pkgs.karma}/bin/karma --config.file ${cfg.configFile} ${lib.concatStringsSep " " cfg.extraOptions}";
+        ExecStart = "${lib.getExe cfg.package} --config.file ${cfg.configFile} ${lib.concatStringsSep " " cfg.extraOptions}";
       };
     };
     networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.settings.listen.port ];

From aa2b60bb4f0e085d8810ebb403693a57d19f40ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luukas=20P=C3=B6rtfors?= <lajp@iki.fi>
Date: Fri, 27 Jun 2025 22:45:17 +0200
Subject: [PATCH 0009/6226] maintainers: add lajp

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 17c86233489e..a7e6caa88841 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13893,6 +13893,17 @@
     githubId = 55911173;
     name = "Gwendolyn Quasebarth";
   };
+  lajp = {
+    email = "lajp@iki.fi";
+    github = "lajp";
+    githubId = 31856315;
+    name = "Luukas Pörtfors";
+    keys = [
+      {
+        fingerprint = "24E8 E4CC 0295 F4ED B9E0  B4A6 C913 9B8D EA65 BD82";
+      }
+    ];
+  };
   lamarios = {
     matrix = "@lamarios:matrix.org";
     github = "lamarios";

From ad4549120b4ab508a0c85fe771b3108fc9b807b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luukas=20P=C3=B6rtfors?= <lajp@iki.fi>
Date: Fri, 27 Jun 2025 22:29:51 +0200
Subject: [PATCH 0010/6226] voikko-fi: init at 2.5

Co-authored-by: Nikolay Korotkiy <sikmir@disroot.org>
---
 pkgs/by-name/vo/voikko-fi/package.nix | 39 +++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/by-name/vo/voikko-fi/package.nix

diff --git a/pkgs/by-name/vo/voikko-fi/package.nix b/pkgs/by-name/vo/voikko-fi/package.nix
new file mode 100644
index 000000000000..c51ccaae5d83
--- /dev/null
+++ b/pkgs/by-name/vo/voikko-fi/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  fetchFromGitHub,
+  stdenvNoCC,
+  python3,
+  foma,
+  libvoikko,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "voikko-fi";
+  version = "2.5";
+
+  src = fetchFromGitHub {
+    owner = "voikko";
+    repo = "corevoikko";
+    tag = "rel-voikko-fi-${finalAttrs.version}";
+    hash = "sha256-0MIQ54dCxyAfdgYWmmTVF+Yfa15K2sjJyP1JNxwHP2M=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/voikko-fi";
+
+  enableParallelBuilding = true;
+
+  installTargets = "vvfst-install DESTDIR=$(out)/share/voikko-fi";
+
+  nativeBuildInputs = [
+    python3
+    foma
+    libvoikko
+  ];
+
+  meta = {
+    homepage = "https://voikko.puimula.org";
+    description = "Description of Finnish morphology written for libvoikko";
+    license = lib.licenses.lgpl21Plus;
+    maintainers = with lib.maintainers; [ lajp ];
+    platforms = lib.platforms.unix;
+  };
+})

From 69e96cf207b91a072b1b08475adbabc8cb51e5c4 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Mon, 6 Jan 2025 18:39:04 +0100
Subject: [PATCH 0011/6226] steam-lancache-prefill: init at 3.3.0

---
 .../current-dir-config.patch                  |  13 +
 .../st/steam-lancache-prefill/deps.json       | 232 ++++++++++++++++++
 .../st/steam-lancache-prefill/package.nix     |  52 ++++
 3 files changed, 297 insertions(+)
 create mode 100644 pkgs/by-name/st/steam-lancache-prefill/current-dir-config.patch
 create mode 100644 pkgs/by-name/st/steam-lancache-prefill/deps.json
 create mode 100644 pkgs/by-name/st/steam-lancache-prefill/package.nix

diff --git a/pkgs/by-name/st/steam-lancache-prefill/current-dir-config.patch b/pkgs/by-name/st/steam-lancache-prefill/current-dir-config.patch
new file mode 100644
index 000000000000..be780aa3b149
--- /dev/null
+++ b/pkgs/by-name/st/steam-lancache-prefill/current-dir-config.patch
@@ -0,0 +1,13 @@
+diff --git a/SteamPrefill/Settings/AppConfig.cs b/SteamPrefill/Settings/AppConfig.cs
+index 05215f9..394b13f 100644
+--- a/SteamPrefill/Settings/AppConfig.cs
++++ b/SteamPrefill/Settings/AppConfig.cs
+@@ -36,7 +36,7 @@ namespace SteamPrefill.Settings
+         /// <summary>
+         /// Contains user configuration.  Should not be deleted, doing so will reset the app back to defaults.
+         /// </summary>
+-        private static readonly string ConfigDir = Path.Combine(AppContext.BaseDirectory, "Config");
++        private static readonly string ConfigDir = Path.Combine(Directory.GetCurrentDirectory(), "Config");
+ 
+         #region Serialization file paths
+ 
diff --git a/pkgs/by-name/st/steam-lancache-prefill/deps.json b/pkgs/by-name/st/steam-lancache-prefill/deps.json
new file mode 100644
index 000000000000..03ae8464bfbc
--- /dev/null
+++ b/pkgs/by-name/st/steam-lancache-prefill/deps.json
@@ -0,0 +1,232 @@
+[
+  {
+    "pname": "AsyncFixer",
+    "version": "1.6.0",
+    "hash": "sha256-8MWfDkTyotnouLwZASK27lM32NoGCLPLr4sBBqPkJFI="
+  },
+  {
+    "pname": "AutoMapper",
+    "version": "11.0.1",
+    "hash": "sha256-47l2b8IWIyaOKl5KTpVAPeEL6ZMGlzoFCWby2QIrPfw="
+  },
+  {
+    "pname": "ByteSize",
+    "version": "2.1.1",
+    "hash": "sha256-ZPiO0zdDX3F9QkQLWLbkyeicRZZoOGnS5vo55RttS2w="
+  },
+  {
+    "pname": "Devlooped.SponsorLink",
+    "version": "0.10.5",
+    "hash": "sha256-m+eCuL8ifD/PJkyA70okbWYIDcp8ZV6mtDvnbthz6DQ="
+  },
+  {
+    "pname": "ErrorProne.NET.Structs",
+    "version": "0.1.2",
+    "hash": "sha256-B0kzqe24j0+X96JCtQWXZK3aWfFAYKIYvhrMePMfgPI="
+  },
+  {
+    "pname": "HexMate",
+    "version": "0.0.3",
+    "hash": "sha256-pA/wUH3+1CIXNmvpwedOOtfGA5uEMeis3XbSArol8r4="
+  },
+  {
+    "pname": "Intellenum",
+    "version": "1.0.0-beta.3",
+    "hash": "sha256-FdLXSwxvQNyZWjFjJnUvuk1LAxPvuch557w0qHvmdfw="
+  },
+  {
+    "pname": "JetBrains.Annotations",
+    "version": "2022.1.0",
+    "hash": "sha256-AgCfhDvBb/xOLxNvFoZPYuiSBWEhXihHTBvYqLS+WFM="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
+    "version": "3.3.4",
+    "hash": "sha256-YPTHTZ8xRPMLADdcVYRO/eq3O9uZjsD+OsGRZE+0+e8="
+  },
+  {
+    "pname": "Microsoft.CSharp",
+    "version": "4.5.0",
+    "hash": "sha256-dAhj/CgXG5VIy2dop1xplUsLje7uBPFjxasz9rdFIgY="
+  },
+  {
+    "pname": "Microsoft.CSharp",
+    "version": "4.7.0",
+    "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
+  },
+  {
+    "pname": "Microsoft.IdentityModel.Abstractions",
+    "version": "6.34.0",
+    "hash": "sha256-Al1vWcfH//XZRKSg5JE2nEHMb8Z6kekMHccJEmYo9jU="
+  },
+  {
+    "pname": "Microsoft.IdentityModel.JsonWebTokens",
+    "version": "6.34.0",
+    "hash": "sha256-+h0uNBMx6zh/f96+WiSR6c89G1alBOCuTx+VpDxuATA="
+  },
+  {
+    "pname": "Microsoft.IdentityModel.Logging",
+    "version": "6.34.0",
+    "hash": "sha256-a0IPOjmYsIT2/HFAdhaN/32X3c8GYCFZ5sRiCGO2pDo="
+  },
+  {
+    "pname": "Microsoft.IdentityModel.Tokens",
+    "version": "6.34.0",
+    "hash": "sha256-lO/gLOFYkwCEm98Zn+4X20dXMwYoD+y4Urpx8n3mcu4="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "1.1.0",
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "5.0.0",
+    "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="
+  },
+  {
+    "pname": "Microsoft.NETCore.Targets",
+    "version": "1.1.0",
+    "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
+  },
+  {
+    "pname": "Microsoft.VisualStudio.Threading.Analyzers",
+    "version": "16.9.60",
+    "hash": "sha256-1ke2CCKndVws3lgfEuEhKgnm+h706XhfKcpBNyypcDU="
+  },
+  {
+    "pname": "Microsoft.Win32.Registry",
+    "version": "5.0.0",
+    "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="
+  },
+  {
+    "pname": "NStack.Core",
+    "version": "0.17.1",
+    "hash": "sha256-sVuArQwL2dzytCei2fhCNg1Bcm4vntPb+PpXStk3rqM="
+  },
+  {
+    "pname": "protobuf-net",
+    "version": "3.2.30",
+    "hash": "sha256-keRy5OWT+/tlZt3D7x+9PEdjTvEJcZdYsf/i1ZBtciE="
+  },
+  {
+    "pname": "protobuf-net.Core",
+    "version": "3.2.30",
+    "hash": "sha256-GMpJNecoBfrV2VgpYOhcZnKZaLFDObNLcX2LBTThrwY="
+  },
+  {
+    "pname": "runtime.any.System.Runtime",
+    "version": "4.3.0",
+    "hash": "sha256-qwhNXBaJ1DtDkuRacgHwnZmOZ1u9q7N8j0cWOLYOELM="
+  },
+  {
+    "pname": "runtime.any.System.Text.Encoding",
+    "version": "4.3.0",
+    "hash": "sha256-Q18B9q26MkWZx68exUfQT30+0PGmpFlDgaF0TnaIGCs="
+  },
+  {
+    "pname": "runtime.native.System",
+    "version": "4.3.0",
+    "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
+  },
+  {
+    "pname": "runtime.unix.System.Private.Uri",
+    "version": "4.3.0",
+    "hash": "sha256-c5tXWhE/fYbJVl9rXs0uHh3pTsg44YD1dJvyOA0WoMs="
+  },
+  {
+    "pname": "Spectre.Console",
+    "version": "0.49.2-preview.0.67",
+    "hash": "sha256-e1BrfX8ME8Ob7ZVKx8VYExKNvLzHHxNJ1R+Yv2lVE3A="
+  },
+  {
+    "pname": "Spectre.Console.Analyzer",
+    "version": "1.0.0",
+    "hash": "sha256-Om2PRAfm4LoPImty4zpGo/uoqha6ZnuCU6iNcAvKiUE="
+  },
+  {
+    "pname": "SteamKit2",
+    "version": "3.0.0-beta.5",
+    "hash": "sha256-6AXrY3OYtF00FzP3yNWOdyFJE5jTqLegrlMh7hvDHJ8="
+  },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "7.0.0",
+    "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="
+  },
+  {
+    "pname": "System.IdentityModel.Tokens.Jwt",
+    "version": "6.34.0",
+    "hash": "sha256-nv+tAb/Gw2W026gBgoAT53Oj5LOonHYGG1UntQheHpQ="
+  },
+  {
+    "pname": "System.IO.Hashing",
+    "version": "8.0.0",
+    "hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE="
+  },
+  {
+    "pname": "System.Private.Uri",
+    "version": "4.3.0",
+    "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
+  },
+  {
+    "pname": "System.Runtime",
+    "version": "4.3.0",
+    "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
+  },
+  {
+    "pname": "System.Security.AccessControl",
+    "version": "5.0.0",
+    "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="
+  },
+  {
+    "pname": "System.Security.Cryptography.Cng",
+    "version": "4.5.0",
+    "hash": "sha256-9llRbEcY1fHYuTn3vGZaCxsFxSAqXl4bDA6Rz9b0pN4="
+  },
+  {
+    "pname": "System.Security.Principal.Windows",
+    "version": "5.0.0",
+    "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="
+  },
+  {
+    "pname": "System.Text.Encoding",
+    "version": "4.3.0",
+    "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
+  },
+  {
+    "pname": "System.Text.Encodings.Web",
+    "version": "4.7.2",
+    "hash": "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "4.7.2",
+    "hash": "sha256-xA8PZwxX9iOJvPbfdi7LWjM2RMVJ7hmtEqS9JvgNsoM="
+  },
+  {
+    "pname": "System.Threading.Tasks.Extensions",
+    "version": "4.5.4",
+    "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
+  },
+  {
+    "pname": "System.ValueTuple",
+    "version": "4.5.0",
+    "hash": "sha256-niH6l2fU52vAzuBlwdQMw0OEoRS/7E1w5smBFoqSaAI="
+  },
+  {
+    "pname": "Terminal.Gui",
+    "version": "1.7.2",
+    "hash": "sha256-qt42B0L8Na3kRCKkzmPru8IoLcjyn6nosEJL7nb67aA="
+  },
+  {
+    "pname": "ThisAssembly.AssemblyInfo",
+    "version": "1.2.14",
+    "hash": "sha256-Sx9lTx51Nt8XlzuB7FI/8MVRYNw4Mm2lfQECBf3TXJU="
+  },
+  {
+    "pname": "Wcwidth",
+    "version": "1.0.0",
+    "hash": "sha256-weNqGgpKcVMkTtaMV5npzbLRbCPyI0tgkN+qmzeqIwo="
+  }
+]
diff --git a/pkgs/by-name/st/steam-lancache-prefill/package.nix b/pkgs/by-name/st/steam-lancache-prefill/package.nix
new file mode 100644
index 000000000000..b1254d4f09ce
--- /dev/null
+++ b/pkgs/by-name/st/steam-lancache-prefill/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildDotnetModule,
+  dotnetCorePackages,
+  fetchFromGitHub,
+  curl,
+  jq,
+  unzip,
+}:
+
+buildDotnetModule (finalAttrs: {
+  pname = "steam-lancache-prefill";
+  version = "3.3.0";
+
+  src = fetchFromGitHub {
+    owner = "tpill90";
+    repo = "steam-lancache-prefill";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-V3hegWhJCkQiE6pkGLRVKw6UcNNEt0dF9URSfBz3BEk=";
+    fetchSubmodules = true;
+  };
+
+  projectFile = "SteamPrefill/SteamPrefill.csproj";
+  nugetDeps = ./deps.json;
+
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
+
+  executables = [ "SteamPrefill" ];
+
+  patches = [ ./current-dir-config.patch ];
+
+  nativeBuildInputs = [
+    curl
+    jq
+    unzip
+  ];
+
+  postInstall = ''
+    rm -rf $out/lib/steam-lancache-prefill/update.sh
+  '';
+
+  meta = {
+    description = "Automatically fills a Lancache with games from Steam";
+    homepage = "https://github.com/tpill90/steam-lancache-prefill";
+    changelog = "https://github.com/tpill90/steam-lancache-prefill/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ rhoriguchi ];
+    mainProgram = "SteamPrefill";
+    platforms = lib.platforms.all;
+  };
+})

From b1a34ed0ca58d37ce9c07724062b22a6664e6a45 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Mon, 21 Jul 2025 03:12:02 +0200
Subject: [PATCH 0012/6226] libheif: add lib output

This enables referencing the `bin` output from `out` without creating a
circular dependency.
---
 pkgs/by-name/li/libheif/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libheif/package.nix b/pkgs/by-name/li/libheif/package.nix
index 0d5e976c27ff..9954e66d560a 100644
--- a/pkgs/by-name/li/libheif/package.nix
+++ b/pkgs/by-name/li/libheif/package.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation rec {
     "out"
     "dev"
     "man"
+    "lib"
   ];
 
   src = fetchFromGitHub {
@@ -57,7 +58,7 @@ stdenv.mkDerivation rec {
   ];
 
   # Fix installation path for gdk-pixbuf module
-  PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${placeholder "out"}/${gdk-pixbuf.moduleDir}";
+  PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${placeholder "lib"}/${gdk-pixbuf.moduleDir}";
 
   # Wrong include path in .cmake.  It's a bit difficult to patch because of special characters.
   postFixup = ''

From d4d8c251961582ce31dbeaaa130c6081571914e6 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sat, 26 Jul 2025 01:24:56 +0200
Subject: [PATCH 0013/6226] {eog,shotwell,xfce.ristretto,zathura}: libheif.out
 -> libheif.lib

libheif moved the gdk-pixbuf loader to its new `lib` output.
---
 pkgs/applications/misc/zathura/core/default.nix       | 2 +-
 pkgs/by-name/eo/eog/package.nix                       | 2 +-
 pkgs/by-name/sh/shotwell/package.nix                  | 2 +-
 pkgs/desktops/xfce/applications/ristretto/default.nix | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/zathura/core/default.nix b/pkgs/applications/misc/zathura/core/default.nix
index b6de5c2eec01..ab7f2a1ff65b 100644
--- a/pkgs/applications/misc/zathura/core/default.nix
+++ b/pkgs/applications/misc/zathura/core/default.nix
@@ -92,7 +92,7 @@ stdenv.mkDerivation (finalAttrs: {
   # add support for more image formats
   env.GDK_PIXBUF_MODULE_FILE = gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
     extraLoaders = [
-      libheif.out
+      libheif.lib
       libjxl
       librsvg
       webp-pixbuf-loader
diff --git a/pkgs/by-name/eo/eog/package.nix b/pkgs/by-name/eo/eog/package.nix
index 09ce3ade221a..4169f140d603 100644
--- a/pkgs/by-name/eo/eog/package.nix
+++ b/pkgs/by-name/eo/eog/package.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
           libjxl
           librsvg
           webp-pixbuf-loader
-          libheif.out
+          libheif.lib
         ];
       }
     }"
diff --git a/pkgs/by-name/sh/shotwell/package.nix b/pkgs/by-name/sh/shotwell/package.nix
index cfa106cf00a9..2207a8ee8d5b 100644
--- a/pkgs/by-name/sh/shotwell/package.nix
+++ b/pkgs/by-name/sh/shotwell/package.nix
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
     export GDK_PIXBUF_MODULE_FILE="${
       gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
         extraLoaders = [
-          libheif.out
+          libheif.lib
         ];
       }
     }"
diff --git a/pkgs/desktops/xfce/applications/ristretto/default.nix b/pkgs/desktops/xfce/applications/ristretto/default.nix
index 153c9051b8b5..4c27e4d0056c 100644
--- a/pkgs/desktops/xfce/applications/ristretto/default.nix
+++ b/pkgs/desktops/xfce/applications/ristretto/default.nix
@@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
     export GDK_PIXBUF_MODULE_FILE="${
       gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
         extraLoaders = [
-          libheif.out
+          libheif.lib
           libjxl
           librsvg
           webp-pixbuf-loader

From aab4ae5d70050971d02e2c45a961a29961c3eac8 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Mon, 21 Jul 2025 12:47:45 +0200
Subject: [PATCH 0014/6226] libheif: use absolute binary path in thumbnailer
 file

This fixes the thumbnailer for Nautilus when installed via home-manager.
---
 pkgs/by-name/li/libheif/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/li/libheif/package.nix b/pkgs/by-name/li/libheif/package.nix
index 9954e66d560a..3f7521b26c3d 100644
--- a/pkgs/by-name/li/libheif/package.nix
+++ b/pkgs/by-name/li/libheif/package.nix
@@ -60,6 +60,12 @@ stdenv.mkDerivation rec {
   # Fix installation path for gdk-pixbuf module
   PKG_CONFIG_GDK_PIXBUF_2_0_GDK_PIXBUF_MODULEDIR = "${placeholder "lib"}/${gdk-pixbuf.moduleDir}";
 
+  postInstall = ''
+    substituteInPlace $out/share/thumbnailers/heif.thumbnailer \
+      --replace-fail "TryExec=heif-thumbnailer" "TryExec=$bin/bin/heif-thumbnailer" \
+      --replace-fail "Exec=heif-thumbnailer" "Exec=$bin/bin/heif-thumbnailer"
+  '';
+
   # Wrong include path in .cmake.  It's a bit difficult to patch because of special characters.
   postFixup = ''
     sed '/^  INTERFACE_INCLUDE_DIRECTORIES/s|"[^"]*/include"|"${placeholder "dev"}/include"|' \

From 7ed6a3f3e7f56e6eb35515f98b9fd068cd8a3f6f Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Fri, 25 Apr 2025 10:35:34 -0700
Subject: [PATCH 0015/6226] doc: update platform support

---
 doc/redirects.json                    | 18 +++++++++
 doc/using/platform-support.chapter.md | 53 +++++++++++++++++++++------
 2 files changed, 60 insertions(+), 11 deletions(-)

diff --git a/doc/redirects.json b/doc/redirects.json
index ad13136e23ef..d47c7e16531a 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -177,6 +177,24 @@
   "sec-pkg-overrideDerivation": [
     "index.html#sec-pkg-overrideDerivation"
   ],
+  "sec-platform-breakdown": [
+    "index.html#sec-platform-breakdown"
+  ],
+  "sec-platform-tier1": [
+    "index.html#sec-platform-tier1"
+  ],
+  "sec-platform-tier2": [
+    "index.html#sec-platform-tier2"
+  ],
+  "sec-platform-tier3": [
+    "index.html#sec-platform-tier3"
+  ],
+  "sec-platform-tier4-7": [
+    "index.html#sec-platform-tier4-7"
+  ],
+  "sec-platform-tiers": [
+    "index.html#sec-platform-tiers"
+  ],
   "sec-lib-makeOverridable": [
     "index.html#sec-lib-makeOverridable"
   ],
diff --git a/doc/using/platform-support.chapter.md b/doc/using/platform-support.chapter.md
index 3f91b3d5d980..d5a985c90d35 100644
--- a/doc/using/platform-support.chapter.md
+++ b/doc/using/platform-support.chapter.md
@@ -1,18 +1,49 @@
 # Platform Support {#chap-platform-support}
 
-Packages receive varying degrees of support, both in terms of maintainer attention and available computation resources for continuous integration (CI).
+Packages receive varying degrees of support, both in terms of maintainer attention and available computation resources for continuous integration (CI). We have 7 defined tiers denoting how well supported each platform is.
 
-Below is the list of the best supported platforms:
+## Tiers {#sec-platform-tiers}
 
-- `x86_64-linux`: Highest level of support.
-- `aarch64-linux`: Well supported, with most packages building successfully in CI.
-- `aarch64-darwin`: Receives better support than `x86_64-darwin`.
-- `x86_64-darwin`: Receives some support.
+### Tier 1 {#sec-platform-tier1}
 
-There are many other platforms with varying levels of support.
-The provisional platform list in [Appendix A] of [RFC046], while not up to date, can be used as guidance.
+[Tier 1](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-1) platforms receive the highest level of support where problems can block updates, platform-specific patches are freely applied, and most packages are expected to work.
 
-A more formal definition of the platform support tiers is provided in [RFC046], but has not been fully implemented yet.
+### Tier 2 {#sec-platform-tier2}
 
-[RFC046]: https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md
-[Appendix A]: https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#appendix-a-non-normative-description-of-platforms-in-november-2019
+[Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) platforms are expected to remain functional with updates, receive platform-specific patches as needed, and have many packages built by Hydra with full ofBorg support.
+
+### Tier 3 {#sec-platform-tier3}
+
+[Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) platforms may receive non-intrusive platform-specific fixes, have native bootstrap tools available with cross-build toolchains in binary cache, but updates might break builds on these platforms.
+
+### Tier 4-7 {#sec-platform-tier4-7}
+
+Platform Tiers [4 through 7](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-4) indicate varying levels of minimal support going from receiving only limited fixes to platforms with no support, but a path to support.
+
+## Breakdown {#sec-platform-breakdown}
+
+| Triple                                | Support Tier | Channel Blockers | Hydra Support | Ofborg Support | Bootstrap Tarballs | Cross Compiling Support |
+| ------------------------------------- | ------------ | ---------------- | ------------- | -------------- | ------------------ | ----------------------- |
+| `x86_64-unknown-linux-gnu`            | [Tier 1](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-1) | Many | ✔️            | ✔️            | ✔️                 | ✔️                      |
+| `aarch64-unknown-linux-gnu`           | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️            | ✔️            | ✔️                 | ✔️                      |
+| `x86_64-unknown-linux-musl`           | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited        | ❌             | ✔️                 | ✔️                      |
+| `aarch64-unknown-linux-musl`          | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited        | ❌             | ✔️                 | ✔️                      |
+| `x86_64-unknown-unknown-freebsd`      | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `arm64-apple-darwin`                  | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️            | ✔️            | ✔️                 | ❌\*                     |
+| `x86_64-apple-darwin`                 | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️            | ✔️            | ✔️                 | ❌\*                     |
+| `i686-unknown-linux-gnu`              | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited        | ❌             | ✔️                 | ✔️                      |
+| `riscv32-unknown-linux-gnu`           | [Tier 4](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-4) | None | ❌             | ❌             | ❌                  | ✔️                      |
+| `riscv64-unknown-linux-gnu`           | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `loongarch64-unknown-linux-gnu`       | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `armv6l-unknown-linux-gnueabihf`      | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `armv6l-unknown-linux-musleabihf`     | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `armv7l-unknown-linux-gnueabihf`      | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `armv5tel-unknown-linux-gnueabi`      | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `mips64el-unknown-linux-gnuabi64`     | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `mips64el-unknown-linux-gnuabin32`    | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `mipsel-unknown-linux-gnu`            | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `powerpc64-unknown-linux-gnuabielfv2` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `powerpc64le-unknown-linux-gnu`       | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+| `s390x-unknown-linux-gnu`             | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌             | ❌             | ✔️                 | ✔️                      |
+
+\* - Cross compiling is only supported on Darwin hosts.

From 468bc894fb5f0bb31713d25225c658cae6784b83 Mon Sep 17 00:00:00 2001
From: bizmythy <andrew.p.council@gmail.com>
Date: Sun, 3 Aug 2025 15:27:20 -0400
Subject: [PATCH 0016/6226] maintainers: add bizmyth

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 78ebc75dae15..17c334272f48 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3341,6 +3341,12 @@
     githubId = 10164833;
     name = "Birk Bohne";
   };
+  bizmyth = {
+    email = "andrew.p.council@gmail.com";
+    github = "bizmythy";
+    githubId = 45700916;
+    name = "Drew Council";
+  };
   bjesus = {
     email = "nixpkgs@yoavmoshe.com";
     github = "bjesus";

From f3c54e43babe6577640873769acbc0b236581a0d Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Thu, 3 Jul 2025 23:30:12 -0700
Subject: [PATCH 0017/6226] c99sh: init at 1.1.1

---
 pkgs/by-name/c9/c99sh/package.nix | 88 +++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 pkgs/by-name/c9/c99sh/package.nix

diff --git a/pkgs/by-name/c9/c99sh/package.nix b/pkgs/by-name/c9/c99sh/package.nix
new file mode 100644
index 000000000000..ad578c879673
--- /dev/null
+++ b/pkgs/by-name/c9/c99sh/package.nix
@@ -0,0 +1,88 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  patsh,
+  bashNonInteractive,
+  pkg-config,
+  gcc,
+  gsl,
+  targetPackages,
+  cc ? targetPackages.stdenv.cc,
+  nix-update-script,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "c99sh";
+  version = "1.1.1";
+
+  src = fetchFromGitHub {
+    owner = "RhysU";
+    repo = "c99sh";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-nLq6J1PRROTOSvScyyXUqwtj10MEfQCHC8YYNd+JxkA=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ patsh ];
+
+  # Used by `patsh`
+  buildInputs = [
+    bashNonInteractive
+    pkg-config
+  ];
+
+  postPatch = ''
+    patsh c99sh \
+      --force --store-dir ${builtins.storeDir} --path "$HOST_PATH"
+
+    patchShebangs .
+
+    substituteInPlace c99sh \
+      --replace-fail -cc -${lib.getExe' cc "cc"} \
+      --replace-fail -c++ -${lib.getExe' cc "c++"}
+  '';
+
+  # FIXME: `patchShebangs` doesn't function in cross-builds
+  doCheck = !stdenvNoCC.hostPlatform.isDarwin;
+
+  nativeCheckInputs = [
+    pkg-config
+    gcc
+  ];
+
+  checkInputs = [ gsl ];
+
+  checkPhase = ''
+    runHook preCheck
+
+    ./tests
+
+    runHook postCheck
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir --parents $out/bin
+    cp --no-dereference c*sh $out/bin # c11sh and cxxsh
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Shebang-friendly script for \"interpreting\" C files";
+    longDescription = ''
+      Shebang-friendly script for \"interpreting\" single C99, C11,
+      and C++ files, including rcfile support
+    '';
+    homepage = "https://github.com/RhysU/c99sh";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ yiyu ];
+    mainProgram = "c99sh";
+    platforms = lib.platforms.all;
+  };
+})

From 44da664db54cfad044a6e368089de2198ef3fcba Mon Sep 17 00:00:00 2001
From: yakrobat <yakrobat@protonmail.com>
Date: Fri, 2 Feb 2024 05:45:28 +0300
Subject: [PATCH 0018/6226] maintainers: add nasrally

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 9e23d7401e46..0f9d1ca9a96c 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17602,6 +17602,12 @@
     name = "Nasir Hussain";
     keys = [ { fingerprint = "7A10 AB8E 0BEC 566B 090C  9BE3 D812 6E55 9CE7 C35D"; } ];
   };
+  nasrally = {
+    email = "suffer.ring@ya.ru";
+    github = "nasrally";
+    githubId = 50599445;
+    name = "Nikita Grishko";
+  };
   nat-418 = {
     github = "nat-418";
     githubId = 93013864;

From 70469150c9d53de554b0e47cc4af9abba2ff710d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 8 Aug 2025 09:30:37 +0200
Subject: [PATCH 0019/6226] xppen_{3,4}: init at 3.4.9-240607 and 4.0.7-250117

Co-authored-by: yakrobat <yakrobat@protonmail.com>
---
 pkgs/applications/misc/xppen/default.nix | 19 +++++++
 pkgs/applications/misc/xppen/generic.nix | 71 ++++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  5 ++
 3 files changed, 95 insertions(+)
 create mode 100644 pkgs/applications/misc/xppen/default.nix
 create mode 100644 pkgs/applications/misc/xppen/generic.nix

diff --git a/pkgs/applications/misc/xppen/default.nix b/pkgs/applications/misc/xppen/default.nix
new file mode 100644
index 000000000000..27bc92f168b3
--- /dev/null
+++ b/pkgs/applications/misc/xppen/default.nix
@@ -0,0 +1,19 @@
+{
+  callPackage,
+}:
+
+# to update: try to find the latest 3.x.x or 4.x.x .tar.gz on https://www.xp-pen.com/download
+{
+  xppen_3 = callPackage ./generic.nix {
+    pname = "xppen_3";
+    version = "3.4.9-240607";
+    url = "https://www.xp-pen.com/download/file.html?id=2901&pid=819&ext=gz";
+    hash = "sha256-ZXeTlDjhryXamb7x2LxDdOtf8R9rgKPyUsdx96XchWM=";
+  };
+  xppen_4 = callPackage ./generic.nix {
+    pname = "xppen_4";
+    version = "4.0.7-250117";
+    url = "https://www.xp-pen.com/download/file.html?id=3652&pid=1211&ext=gz";
+    hash = "sha256-sH05Qquo2u0npSlv8Par/mn1w/ESO9g42CCGwBauHhU=";
+  };
+}
diff --git a/pkgs/applications/misc/xppen/generic.nix b/pkgs/applications/misc/xppen/generic.nix
new file mode 100644
index 000000000000..a48a20b2ef4c
--- /dev/null
+++ b/pkgs/applications/misc/xppen/generic.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  stdenv,
+  fetchzip,
+  autoPatchelfHook,
+  qt5,
+  libusb1,
+  pname,
+  version,
+  url,
+  hash,
+}:
+
+stdenv.mkDerivation {
+  inherit pname version;
+
+  src = fetchzip {
+    name = "XPPenLinux${version}.tar.gz";
+    extension = "tar.gz";
+    inherit url hash;
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    qt5.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    qt5.qtbase
+    libusb1
+  ];
+
+  dontConfigure = true;
+  dontBuild = true;
+  dontCheck = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    rm -r App/usr/lib/pentablet/{lib,platforms,PenTablet.sh}
+    mkdir -p $out/{bin,usr}
+    cp -r App/lib $out/lib
+    cp -r App/usr/share $out/share
+    cp -r App/usr/lib $out/usr/lib
+
+    # hack: edit the binary directly
+    # TODO: replace it with buildFHSEnv if possible? last time it caused other issues
+    sed -i 's#/usr/lib/pentablet#/var/lib/pentablet#g' $out/usr/lib/pentablet/PenTablet
+    ln -s $out/usr/lib/pentablet/PenTablet $out/bin/PenTablet
+
+    substituteInPlace $out/share/applications/xppentablet.desktop \
+      --replace-fail "/usr/lib/pentablet/PenTablet.sh" "PenTablet" \
+      --replace-fail "/usr/share/icons/hicolor/256x256/apps/xppentablet.png" "xppentablet"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "XPPen driver";
+    downloadPage = "https://www.xp-pen.com/download/";
+    homepage = "https://www.xp-pen.com/";
+    license = lib.licenses.unfree;
+    mainProgram = "PenTablet";
+    maintainers = with lib.maintainers; [
+      gepbird
+      nasrally
+    ];
+    platforms = [ "x86_64-linux" ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b3a9bf4d938a..3cc85d4ef09c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14077,6 +14077,11 @@ with pkgs;
 
   libxpdf = callPackage ../applications/misc/xpdf/libxpdf.nix { };
 
+  inherit (callPackage ../applications/misc/xppen { })
+    xppen_3
+    xppen_4
+    ;
+
   xygrib = libsForQt5.callPackage ../applications/misc/xygrib { };
 
   ydiff = with python3.pkgs; toPythonApplication ydiff;

From c29545ba8db9d89b9916a92e4e8ece84e4a59ea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Fri, 8 Aug 2025 09:33:34 +0200
Subject: [PATCH 0020/6226] nixos/xppen: init

Co-authored-by: yakrobat <yakrobat@protonmail.com>
---
 .../manual/release-notes/rl-2511.section.md   |  2 +
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/programs/xppen.nix              | 55 +++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 nixos/modules/programs/xppen.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 01ad322de9c5..e055c3220289 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -31,6 +31,8 @@
 
 - [Homebridge](https://github.com/homebridge/homebridge), a lightweight Node.js server you can run on your home network that emulates the iOS HomeKit API. Available as [services.homebridge](#opt-services.homebridge.enable).
 
+- [XPPen](https://www.xp-pen.com/), the official closed-source driver for XP Pen tablets. Available as [programs.xppen](#opt-programs.xppen.enable).
+
 - [LACT](https://github.com/ilya-zlobintsev/LACT), a GPU monitoring and configuration tool, can now be enabled through [services.lact.enable](#opt-services.lact.enable).
   Note that for LACT to work properly on AMD GPU systems, you need to enable [hardware.amdgpu.overdrive.enable](#opt-hardware.amdgpu.overdrive.enable).
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 77e96c2d85a8..0529761cd82d 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -357,6 +357,7 @@
   ./programs/xfconf.nix
   ./programs/xfs_quota.nix
   ./programs/xonsh.nix
+  ./programs/xppen.nix
   ./programs/xss-lock.nix
   ./programs/xwayland.nix
   ./programs/yazi.nix
diff --git a/nixos/modules/programs/xppen.nix b/nixos/modules/programs/xppen.nix
new file mode 100644
index 000000000000..e3ce1f7f314f
--- /dev/null
+++ b/nixos/modules/programs/xppen.nix
@@ -0,0 +1,55 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.programs.xppen;
+in
+
+{
+  options.programs.xppen = {
+    enable = lib.mkEnableOption "XPPen PenTablet application";
+    package = lib.mkPackageOption pkgs "xppen_4" {
+      example = "pkgs.xppen_3";
+      extraDescription = ''
+        Use xppen_4 for newer and xppen_3 for older tablets.
+        To check which version of the driver you need, go to
+        https://www.xp-pen.com/download/ then select your tablet
+        and look for the major version in the available files for Linux.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    hardware.uinput.enable = true;
+
+    environment.systemPackages = [ cfg.package ];
+
+    services.udev.packages = [ cfg.package ];
+
+    systemd.tmpfiles.rules = [
+      "d /var/lib/pentablet/conf/xppen 0777 - - -"
+    ];
+
+    systemd.services.xppen-create-config-dir = {
+      restartTriggers = [ cfg.package ];
+      wantedBy = [ "multi-user.target" ];
+      serviceConfig = {
+        Type = "oneshot";
+        TimeoutSec = 60;
+        ExecStart = pkgs.writeShellScript "xppen-create-config-dir" ''
+          readarray -d "" files < <(find ${cfg.package}/usr/lib/pentablet/conf -type f -print0)
+          for file in "''${files[@]}"; do
+            file_new="/var''${file#${cfg.package + "/usr"}}"
+            if [ ! -f $file_new ]; then
+              install -m 666 "''$file" "''$file_new"
+            fi
+          done
+        '';
+      };
+    };
+  };
+}

From c9c9027c71e02013b199fbbd63438077796a56d0 Mon Sep 17 00:00:00 2001
From: bizmythy <andrew.p.council@gmail.com>
Date: Sun, 3 Aug 2025 15:29:34 -0400
Subject: [PATCH 0021/6226] protobuf-language-server: init at 0.1.1

skip TestMethodsGen which breaks other tests

formatting

Applied suggested changes from acid-bong, using modern nixpkgs best practices
---
 .../pr/protobuf-language-server/package.nix   | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)
 create mode 100644 pkgs/by-name/pr/protobuf-language-server/package.nix

diff --git a/pkgs/by-name/pr/protobuf-language-server/package.nix b/pkgs/by-name/pr/protobuf-language-server/package.nix
new file mode 100644
index 000000000000..095e0c0fc021
--- /dev/null
+++ b/pkgs/by-name/pr/protobuf-language-server/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "protobuf-language-server";
+  version = "0.1.1";
+
+  src = fetchFromGitHub {
+    owner = "lasorda";
+    repo = "protobuf-language-server";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-bDsvByXa2kH3DnvQpAq79XvwFg4gfhtOP2BpqA1LCI0=";
+  };
+
+  vendorHash = "sha256-dRria1zm5Jk7ScXh0HXeU686EmZcRrz5ZgnF0ca9aUQ=";
+
+  # TestMethodsGen overwrites go-lsp/lsp/methods_gen.go with missing imports.
+  # This causes other tests to break.
+  checkFlags = [ "-skip=TestMethodsGen" ];
+
+  meta = {
+    description = "Language server implementation for Google Protocol Buffers";
+    mainProgram = "protobuf-language-server";
+    homepage = "https://github.com/lasorda/protobuf-language-server";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ bizmyth ];
+  };
+})

From 6bc5bf225dd57f66c68e9689879921c06272b026 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Sun, 10 Aug 2025 19:59:41 -0400
Subject: [PATCH 0022/6226] modrinth-app: 0.9.5 -> 0.10.3

Diff: https://github.com/modrinth/code/compare/v0.9.5...v0.10.3

Co-authored-by: Valentine Briese <valentinegb@icloud.com>
---
 .../mo/modrinth-app-unwrapped/deps.json       | 72 ++++++++++++++++++
 .../gradle-from-path.patch                    | 36 +++++++++
 .../mo/modrinth-app-unwrapped/package.nix     | 74 ++++++++++++++++++-
 .../remove-spotless.patch                     | 25 +++++++
 4 files changed, 203 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/by-name/mo/modrinth-app-unwrapped/deps.json
 create mode 100644 pkgs/by-name/mo/modrinth-app-unwrapped/gradle-from-path.patch
 create mode 100644 pkgs/by-name/mo/modrinth-app-unwrapped/remove-spotless.patch

diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json b/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json
new file mode 100644
index 000000000000..098bd55d03f2
--- /dev/null
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/deps.json
@@ -0,0 +1,72 @@
+{
+ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
+ "!version": 1,
+ "https://plugins.gradle.org/m2": {
+  "com/google/code/gson#gson-parent/2.10.1": {
+   "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM="
+  },
+  "com/google/code/gson#gson/2.10.1": {
+   "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=",
+   "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc="
+  },
+  "org/gradle/toolchains#foojay-resolver/0.10.0": {
+   "jar": "sha256-DNfKn57RuooyPxkCwFryHdYiOhMDRfvnj15I1YzNbUw=",
+   "module": "sha256-SduV7YEABA8dZfCWuied7msSeCSNL3k7z7itAg59HNA=",
+   "pom": "sha256-vndZUF4PPTTVzJzcaGwZxlIuhMzg+MEJ69LW9HsYqSU="
+  },
+  "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/0.10.0": {
+   "pom": "sha256-OpLrFa3uBcGiaCT2SIcqVx6fk99koO3L4TTjjtLY4Q8="
+  }
+ },
+ "https://repo.maven.apache.org/maven2/org": {
+  "apiguardian#apiguardian-api/1.1.2": {
+   "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=",
+   "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
+   "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
+  },
+  "junit#junit-bom/5.12.1": {
+   "module": "sha256-TdKqnplFecYwRX35lbkZsDVFYzZGNy6q3R0WXQv1jBo=",
+   "pom": "sha256-fIJrxyvt3IF9rZJjAn+QEqD1Wjd9ON+JxCkyolAcK/A="
+  },
+  "junit/jupiter#junit-jupiter-api/5.12.1": {
+   "jar": "sha256-pAHgtgNz7fffCWLCXrMhPkUaR3h5LTOnaHbDuKW7IJs=",
+   "module": "sha256-iv9r5FYIFhBl7mO4QDyfKTE6HdnzkfP5eIVlpiMxGXY=",
+   "pom": "sha256-zqRvFdpTNT8vtSYZyvbcAH7CqE8O2vQMwSV/jjzvd9w="
+  },
+  "junit/jupiter#junit-jupiter-engine/5.12.1": {
+   "jar": "sha256-Dn8tvrkb+usNTLM6SHNRuvDlpu1ykGFU2P2ZddMpxZI=",
+   "module": "sha256-tvSQZ/FmJdFN7gmT8weKTGYeF8kOV0yf0SoWRur98tA=",
+   "pom": "sha256-GCeXDlNI10sY6757guDLGdxOj5np1NmEyyZJTVcTPao="
+  },
+  "junit/jupiter#junit-jupiter-params/5.12.1": {
+   "jar": "sha256-WVFwaZnjWVHU3w7KbgkdNhn2WanBCFjy9aPOGRy1dnM=",
+   "module": "sha256-KYwQtU+G3dtCeclfSYnRW+DV5QDEU+yTXv1Wd8v6Guk=",
+   "pom": "sha256-dHNtHnFnHQDeQFyxnD2GhOHFl9BwfeJmH7gHGyeEJ8M="
+  },
+  "junit/jupiter#junit-jupiter/5.12.1": {
+   "jar": "sha256-IoqUye50PVW/6gm1djBoHqeyCmYaR3RH9cH2DcEtnjo=",
+   "module": "sha256-OY71Q1eCyqfceKDRVRBpP6Xt7w/HP5PFVOZ3FxtCIj4=",
+   "pom": "sha256-m42YgPjFl2/JUEKEnzsSwRWdom5UUkMSY3edCx54yKQ="
+  },
+  "junit/platform#junit-platform-commons/1.12.1": {
+   "jar": "sha256-wxYWNYGqpWSSgBIrEuo2/k6cICoaImd1P+p8nh3wVes=",
+   "module": "sha256-ypN54aC/xbLOQ8dOh0SxT7fEkhPiISv1pH7QIv3bMM4=",
+   "pom": "sha256-tzKBEektR47QlWxjCgwkZm52gbUTgWj6FchbUJRqcAM="
+  },
+  "junit/platform#junit-platform-engine/1.12.1": {
+   "jar": "sha256-f+3/k/2SrsfSn8YNwB+gJyRrNrgIhCOl78SUnl9q/6Q=",
+   "module": "sha256-Vb3CX4rhKh3yQQisSArgiAKMiOMV+ou01HbU4RXyrGE=",
+   "pom": "sha256-TANohTegh/d9NLNNjczZO5NhcWu5u/S0ucbYMXkBS5w="
+  },
+  "junit/platform#junit-platform-launcher/1.12.1": {
+   "jar": "sha256-67sU57KfYHMOrt6GLtadfeDVgeoMA4+mogKVXHVB9SU=",
+   "module": "sha256-e+5FMgZp1sP8SKnaJV9Xn7zlgA+mY8QgT6NL1XgkUfQ=",
+   "pom": "sha256-nd9DNXV223LpTvM8ipY09gOrQEb+Cubl4ZJMq2aIjtk="
+  },
+  "opentest4j#opentest4j/1.3.0": {
+   "jar": "sha256-SOLfY2yrZWPO1k3N/4q7I1VifLI27wvzdZhoLd90Lxs=",
+   "module": "sha256-SL8dbItdyU90ZSvReQD2VN63FDUCSM9ej8onuQkMjg0=",
+   "pom": "sha256-m/fP/EEPPoNywlIleN+cpW2dQ72TfjCUhwbCMqlDs1U="
+  }
+ }
+}
diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/gradle-from-path.patch b/pkgs/by-name/mo/modrinth-app-unwrapped/gradle-from-path.patch
new file mode 100644
index 000000000000..ef97f6e66e6e
--- /dev/null
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/gradle-from-path.patch
@@ -0,0 +1,36 @@
+diff --git a/packages/app-lib/build.rs b/packages/app-lib/build.rs
+index 251c4e84..eeacd02a 100644
+--- a/packages/app-lib/build.rs
++++ b/packages/app-lib/build.rs
+@@ -1,7 +1,7 @@
+ use std::ffi::OsString;
+ use std::path::PathBuf;
+ use std::process::{Command, exit};
+-use std::{env, fs};
++use std::env;
+ 
+ fn main() {
+     println!("cargo::rerun-if-changed=java/gradle");
+@@ -19,21 +19,11 @@ fn main() {
+         out_dir.join("java/libs").display()
+     );
+ 
+-    let gradle_path = fs::canonicalize(
+-        #[cfg(target_os = "windows")]
+-        "java\\gradlew.bat",
+-        #[cfg(not(target_os = "windows"))]
+-        "java/gradlew",
+-    )
+-    .unwrap();
+-
+     let mut build_dir_str = OsString::from("-Dorg.gradle.project.buildDir=");
+     build_dir_str.push(out_dir.join("java"));
+-    let exit_status = Command::new(gradle_path)
++    let exit_status = Command::new("@gradle@")
+         .arg(build_dir_str)
+         .arg("build")
+-        .arg("--no-daemon")
+-        .arg("--console=rich")
+         .current_dir(dunce::canonicalize("java").unwrap())
+         .status()
+         .expect("Failed to wait on Gradle build");
diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
index c744a2168ff0..8014d0a4d1b4 100644
--- a/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/package.nix
@@ -5,44 +5,84 @@
   cargo-tauri,
   desktop-file-utils,
   fetchFromGitHub,
+  gradle_8,
+  jdk11,
   makeBinaryWrapper,
+  makeShellWrapper,
   nix-update-script,
   nodejs,
   openssl,
   pkg-config,
   pnpm_9,
+  replaceVars,
+  runCommand,
   rustPlatform,
   turbo,
   webkitgtk_4_1,
 }:
 
 let
+  gradle = gradle_8.override { java = jdk; };
+  jdk = jdk11;
   pnpm = pnpm_9;
 in
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "modrinth-app-unwrapped";
-  version = "0.9.5";
+  version = "0.10.3";
 
   src = fetchFromGitHub {
     owner = "modrinth";
     repo = "code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1+Fmc8qyU3hCZmRNgp90nuvFgaB/GOH6SNc9AyWZYn0=";
+    hash = "sha256-XfJbjbVcP9N3exAhXQoMGpoHORpKAlb0dPhQq195roY=";
   };
 
-  cargoHash = "sha256-6hEnXzaL6PnME9s+T+MtmoTQmaux/0m/6xaQ99lwM2I=";
+  patches = [
+    # `packages/app-lib/build.rs` requires a Gradle executable, but our flags
+    # are injected through a bash function sourced by the stdenv :(
+    #
+    # So, re-implement said wrapper to have the same behavior when Gradle is ran in `build.rs`
+    (replaceVars ./gradle-from-path.patch {
+      # Yes, it has to be a shell wrapper
+      # https://github.com/NixOS/nixpkgs/issues/172583
+      gradle =
+        runCommand "gradle-exe-wrapper-${gradle.version}" { nativeBuildInputs = [ makeShellWrapper ]; }
+          ''
+            makeShellWrapper ${lib.getExe gradle} $out \
+              --add-flags "\''${NIX_GRADLEFLAGS_COMPILE:-}"
+          '';
+    })
+
+    # `gradle.fetchDeps` doesn't seem to pick up a few integrations here
+    # Thankfully that's fine, since it's only for development
+    ./remove-spotless.patch
+  ];
+
+  # Let the app know about our actual version number
+  postPatch = ''
+    substituteInPlace {apps/app,packages/app-lib}/Cargo.toml apps/app-frontend/package.json \
+      --replace-fail '1.0.0-local' '${finalAttrs.version}'
+  '';
+
+  cargoHash = "sha256-jWMHii65hTnTmiBFHxZ4xO5V+Qt/MPCy75eJvnlyE4c=";
+
+  mitmCache = gradle.fetchDeps {
+    inherit (finalAttrs) pname;
+    data = ./deps.json;
+  };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-Q6e942R+3+511qFe4oehxdquw1TgaWMyOGOmP3me54o=";
+    hash = "sha256-7iqXuIQPbP2p26vrWDjMoyZBPpbVQpigYAylhIg8+ZY=";
   };
 
   nativeBuildInputs = [
     cacert # Required for turbo
     cargo-tauri.hook
     desktop-file-utils
+    gradle
     nodejs
     pkg-config
     pnpm.configHook
@@ -51,16 +91,38 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   buildInputs = [ openssl ] ++ lib.optional stdenv.hostPlatform.isLinux webkitgtk_4_1;
 
+  gradleFlags = [
+    "-Dfile.encoding=utf-8"
+    "--no-configuration-cache"
+  ];
+
+  dontUseGradleBuild = true;
+  dontUseGradleCheck = true;
+
   # Tests fail on other, unrelated packages in the monorepo
   cargoTestFlags = [
     "--package"
     "theseus_gui"
   ];
 
+  # Required for mitmCache
+  __darwinAllowLocalNetworking = true;
+
   env = {
     TURBO_BINARY_PATH = lib.getExe turbo;
   };
 
+  preGradleUpdate = ''
+    cd packages/app-lib/java
+  '';
+
+  # Required for the exe wrapper above
+  preBuild = ''
+    local nixGradleFlags=()
+    concatTo nixGradleFlags gradleFlags gradleFlagsArray
+    export NIX_GRADLEFLAGS_COMPILE="''${nixGradleFlags[@]}"
+  '';
+
   postInstall =
     lib.optionalString stdenv.hostPlatform.isDarwin ''
       makeBinaryWrapper "$out"/Applications/Modrinth\ App.app/Contents/MacOS/Modrinth\ App "$out"/bin/ModrinthApp
@@ -97,5 +159,9 @@ rustPlatform.buildRustPackage (finalAttrs: {
     # Darwin is the only exception
     # See https://github.com/modrinth/code/issues/776#issuecomment-1742495678
     broken = !stdenv.hostPlatform.isx86_64 && !stdenv.hostPlatform.isDarwin;
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      binaryBytecode # mitm cache
+    ];
   };
 })
diff --git a/pkgs/by-name/mo/modrinth-app-unwrapped/remove-spotless.patch b/pkgs/by-name/mo/modrinth-app-unwrapped/remove-spotless.patch
new file mode 100644
index 000000000000..61c11124aada
--- /dev/null
+++ b/pkgs/by-name/mo/modrinth-app-unwrapped/remove-spotless.patch
@@ -0,0 +1,25 @@
+diff --git a/packages/app-lib/java/build.gradle.kts b/packages/app-lib/java/build.gradle.kts
+index b7f9ede0..8a336897 100644
+--- a/packages/app-lib/java/build.gradle.kts
++++ b/packages/app-lib/java/build.gradle.kts
+@@ -1,6 +1,5 @@
+ plugins {
+     java
+-    id("com.diffplug.spotless") version "7.0.4"
+ }
+ 
+ repositories {
+@@ -23,13 +22,6 @@ tasks.withType<JavaCompile>().configureEach {
+     options.compilerArgs.addAll(listOf("-Xlint:all", "-Werror"))
+ }
+ 
+-spotless {
+-    java {
+-        palantirJavaFormat()
+-        removeUnusedImports()
+-    }
+-}
+-
+ tasks.jar {
+     archiveFileName = "theseus.jar"
+ }

From 537f5bab3bd0dc4677dfaa46d8a5f21bac9c435e Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Sun, 10 Aug 2025 20:01:24 -0400
Subject: [PATCH 0023/6226] modrinth-app: wrap with gsettings-desktop-schemas

This fixes some issues on non-GTK desktops

Co-authored-by: Ludanta Spirito <guardspirit@protonmail.com>
---
 pkgs/by-name/mo/modrinth-app/package.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mo/modrinth-app/package.nix b/pkgs/by-name/mo/modrinth-app/package.nix
index 65ea5598cb1a..be0442eabfbb 100644
--- a/pkgs/by-name/mo/modrinth-app/package.nix
+++ b/pkgs/by-name/mo/modrinth-app/package.nix
@@ -4,7 +4,9 @@
   addDriverRunpath,
   alsa-lib,
   flite,
+  glib,
   glib-networking,
+  gsettings-desktop-schemas,
   jdk17,
   jdk21,
   jdk8,
@@ -30,9 +32,17 @@ symlinkJoin {
 
   paths = [ modrinth-app-unwrapped ];
 
-  nativeBuildInputs = [ wrapGAppsHook4 ];
+  strictDeps = true;
 
-  buildInputs = [ glib-networking ];
+  nativeBuildInputs = [
+    glib
+    wrapGAppsHook4
+  ];
+
+  buildInputs = [
+    glib-networking
+    gsettings-desktop-schemas
+  ];
 
   runtimeDependencies = lib.optionalString stdenv.hostPlatform.isLinux (
     lib.makeLibraryPath [
@@ -72,6 +82,8 @@ symlinkJoin {
       ''}
     )
 
+    glibPostInstallHook
+    gappsWrapperArgsHook
     wrapGAppsHook
   '';
 

From 2aa5caaf7381da88a56a8f00bf39b6368fc285e6 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 7 Aug 2025 17:56:28 -0400
Subject: [PATCH 0024/6226] gitbutler: 0.14.19 -> 0.15.10

Diff: https://github.com/gitbutlerapp/gitbutler/compare/release/0.14.9...release/0.15.10
Changelog: https://github.com/gitbutlerapp/gitbutler/releases/tag/release%2F0.15.10
---
 .../gi/gitbutler/gix-from-crates-io.patch     | 4292 +++++++++++++++++
 pkgs/by-name/gi/gitbutler/package.nix         |   25 +-
 2 files changed, 4309 insertions(+), 8 deletions(-)
 create mode 100644 pkgs/by-name/gi/gitbutler/gix-from-crates-io.patch

diff --git a/pkgs/by-name/gi/gitbutler/gix-from-crates-io.patch b/pkgs/by-name/gi/gitbutler/gix-from-crates-io.patch
new file mode 100644
index 000000000000..b686317c2c7a
--- /dev/null
+++ b/pkgs/by-name/gi/gitbutler/gix-from-crates-io.patch
@@ -0,0 +1,4292 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 60b520f8d..8406c39d0 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -13,9 +13,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "adler2"
+-version = "2.0.0"
++version = "2.0.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
++checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+ 
+ [[package]]
+ name = "aes"
+@@ -95,9 +95,9 @@ checksum = "84521a3cf562bc62942e294181d9eef17eb38ceb8c68677bc49f144e4c3d4f8d"
+ 
+ [[package]]
+ name = "android_logger"
+-version = "0.15.0"
++version = "0.15.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f6f39be698127218cca460cb624878c9aa4e2b47dba3b277963d2bf00bad263b"
++checksum = "dbb4e440d04be07da1f1bf44fb4495ebd58669372fe0cffa6e48595ac5bd88a3"
+ dependencies = [
+  "android_log-sys",
+  "env_filter",
+@@ -115,9 +115,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "anstream"
+-version = "0.6.18"
++version = "0.6.20"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8acc5369981196006228e28809f761875c0327210a891e941f4c683b3a99529b"
++checksum = "3ae563653d1938f79b1ab1b5e668c87c76a9930414574a6583a7b7e11a8e6192"
+ dependencies = [
+  "anstyle",
+  "anstyle-parse",
+@@ -130,37 +130,37 @@ dependencies = [
+ 
+ [[package]]
+ name = "anstyle"
+-version = "1.0.10"
++version = "1.0.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
++checksum = "862ed96ca487e809f1c8e5a8447f6ee2cf102f846893800b20cebdf541fc6bbd"
+ 
+ [[package]]
+ name = "anstyle-parse"
+-version = "0.2.6"
++version = "0.2.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3b2d16507662817a6a20a9ea92df6652ee4f94f914589377d69f3b21bc5798a9"
++checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
+ dependencies = [
+  "utf8parse",
+ ]
+ 
+ [[package]]
+ name = "anstyle-query"
+-version = "1.1.2"
++version = "1.1.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "79947af37f4177cfead1110013d678905c37501914fba0efea834c3fe9a8d60c"
++checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2"
+ dependencies = [
+- "windows-sys 0.59.0",
++ "windows-sys 0.60.2",
+ ]
+ 
+ [[package]]
+ name = "anstyle-wincon"
+-version = "3.0.7"
++version = "3.0.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ca3534e77181a9cc07539ad51f2141fe32f6c3ffd4df76db8ad92346b003ae4e"
++checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a"
+ dependencies = [
+  "anstyle",
+- "once_cell",
+- "windows-sys 0.59.0",
++ "once_cell_polyfill",
++ "windows-sys 0.60.2",
+ ]
+ 
+ [[package]]
+@@ -180,15 +180,15 @@ dependencies = [
+ 
+ [[package]]
+ name = "arboard"
+-version = "3.5.0"
++version = "3.6.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c1df21f715862ede32a0c525ce2ca4d52626bb0007f8c18b87a384503ac33e70"
++checksum = "55f533f8e0af236ffe5eb979b99381df3258853f00ba2e44b6e1955292c75227"
+ dependencies = [
+  "clipboard-win",
+  "image",
+  "log",
+  "objc2 0.6.1",
+- "objc2-app-kit 0.3.1",
++ "objc2-app-kit",
+  "objc2-core-foundation",
+  "objc2-core-graphics",
+  "objc2-foundation 0.3.1",
+@@ -213,14 +213,14 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+ 
+ [[package]]
+ name = "ashpd"
+-version = "0.9.2"
++version = "0.11.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4d43c03d9e36dd40cab48435be0b09646da362c278223ca535493877b2c1dee9"
++checksum = "6cbdf310d77fd3aaee6ea2093db7011dc2d35d2eb3481e5607f1f8d942ed99df"
+ dependencies = [
+  "enumflags2",
+  "futures-channel",
+  "futures-util",
+- "rand 0.8.5",
++ "rand 0.9.2",
+  "raw-window-handle",
+  "serde",
+  "serde_repr",
+@@ -229,7 +229,7 @@ dependencies = [
+  "wayland-backend",
+  "wayland-client",
+  "wayland-protocols",
+- "zbus 4.4.0",
++ "zbus 5.9.0",
+ ]
+ 
+ [[package]]
+@@ -262,9 +262,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "async-channel"
+-version = "2.3.1"
++version = "2.5.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
++checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+ dependencies = [
+  "concurrent-queue",
+  "event-listener-strategy",
+@@ -288,9 +288,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "async-io"
+-version = "2.4.0"
++version = "2.5.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "43a2b323ccce0a1d90b449fd71f2a06ca7faa7c54c2751f06c9bd851fc061059"
++checksum = "19634d6336019ef220f09fd31168ce5c184b295cbf80345437cc36094ef223ca"
+ dependencies = [
+  "async-lock",
+  "cfg-if",
+@@ -299,17 +299,16 @@ dependencies = [
+  "futures-lite",
+  "parking",
+  "polling",
+- "rustix 0.38.44",
++ "rustix 1.0.8",
+  "slab",
+- "tracing",
+- "windows-sys 0.59.0",
++ "windows-sys 0.60.2",
+ ]
+ 
+ [[package]]
+ name = "async-lock"
+-version = "3.4.0"
++version = "3.4.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
++checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc"
+ dependencies = [
+  "event-listener",
+  "event-listener-strategy",
+@@ -350,14 +349,14 @@ checksum = "0289cba6d5143bfe8251d57b4a8cac036adf158525a76533a7082ba65ec76398"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+ name = "async-process"
+-version = "2.3.0"
++version = "2.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "63255f1dc2381611000436537bbedfe83183faa303a5a0edaf191edef06526bb"
++checksum = "65daa13722ad51e6ab1a1b9c01299142bc75135b337923cfa10e79bbbd669f00"
+ dependencies = [
+  "async-channel",
+  "async-io",
+@@ -368,8 +367,7 @@ dependencies = [
+  "cfg-if",
+  "event-listener",
+  "futures-lite",
+- "rustix 0.38.44",
+- "tracing",
++ "rustix 1.0.8",
+ ]
+ 
+ [[package]]
+@@ -380,14 +378,14 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+ name = "async-signal"
+-version = "0.2.10"
++version = "0.2.12"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "637e00349800c0bdf8bfc21ebbc0b6524abea702b0da4168ac00d070d0c0b9f3"
++checksum = "f567af260ef69e1d52c2b560ce0ea230763e6fbb9214a85d768760a920e3e3c1"
+ dependencies = [
+  "async-io",
+  "async-lock",
+@@ -395,10 +393,10 @@ dependencies = [
+  "cfg-if",
+  "futures-core",
+  "futures-io",
+- "rustix 0.38.44",
++ "rustix 1.0.8",
+  "signal-hook-registry",
+  "slab",
+- "windows-sys 0.59.0",
++ "windows-sys 0.60.2",
+ ]
+ 
+ [[package]]
+@@ -420,7 +418,7 @@ checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -437,7 +435,7 @@ checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -471,9 +469,9 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+ 
+ [[package]]
+ name = "autocfg"
+-version = "1.4.0"
++version = "1.5.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
++checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+ 
+ [[package]]
+ name = "axum"
+@@ -691,9 +689,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "blocking"
+-version = "1.6.1"
++version = "1.6.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
++checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
+ dependencies = [
+  "async-channel",
+  "async-task",
+@@ -722,7 +720,7 @@ dependencies = [
+  "proc-macro-crate 3.3.0",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -759,9 +757,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "bumpalo"
+-version = "3.17.0"
++version = "3.19.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
++checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+ 
+ [[package]]
+ name = "but"
+@@ -941,7 +939,7 @@ dependencies = [
+  "insta",
+  "serde",
+  "serde_json",
+- "toml",
++ "toml 0.8.23",
+  "tracing",
+  "uuid",
+ ]
+@@ -986,7 +984,7 @@ dependencies = [
+  "petgraph 0.8.2",
+  "serde",
+  "termtree",
+- "toml",
++ "toml 0.8.23",
+  "tracing",
+ ]
+ 
+@@ -1008,7 +1006,7 @@ dependencies = [
+  "serde",
+  "serde-error",
+  "serde_json",
+- "toml",
++ "toml 0.8.23",
+  "tracing",
+  "uuid",
+ ]
+@@ -1057,7 +1055,7 @@ dependencies = [
+  "insta",
+  "serde",
+  "tempfile",
+- "toml",
++ "toml 0.8.23",
+  "tracing",
+ ]
+ 
+@@ -1275,9 +1273,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "bytemuck"
+-version = "1.23.0"
++version = "1.23.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9134a6ef01ce4b366b50689c94f82c14bc72bc5d0386829828a2e2752ef7958c"
++checksum = "3995eaeebcdf32f91f980d360f78732ddc061097ab4e39991ae7a6ace9194677"
+ 
+ [[package]]
+ name = "byteorder"
+@@ -1346,9 +1344,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "camino"
+-version = "1.1.9"
++version = "1.1.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
++checksum = "5d07aa9a93b00c76f71bc35d598bed923f6d4f3a9ca5c24b7737ae1a292841c0"
+ dependencies = [
+  "serde",
+ ]
+@@ -1378,12 +1376,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "cargo_toml"
+-version = "0.22.1"
++version = "0.22.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "02260d489095346e5cafd04dea8e8cb54d1d74fcd759022a9b72986ebe9a1257"
++checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77"
+ dependencies = [
+  "serde",
+- "toml",
++ "toml 0.9.5",
+ ]
+ 
+ [[package]]
+@@ -1397,9 +1395,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "cc"
+-version = "1.2.23"
++version = "1.2.31"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5f4ac86a9e5bc1e2b3449ab9d7d3a6a405e3d1bb28d7b9be8614f55846ae3766"
++checksum = "c3a42d84bb6b69d3a8b3eaacf0d88f179e1929695e1ad012b6cf64d9caaa5fd2"
+ dependencies = [
+  "jobserver",
+  "libc",
+@@ -1435,9 +1433,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "cfg-if"
+-version = "1.0.0"
++version = "1.0.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
++checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
+ 
+ [[package]]
+ name = "cfg_aliases"
+@@ -1472,9 +1470,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "clap"
+-version = "4.5.42"
++version = "4.5.43"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ed87a9d530bb41a67537289bafcac159cb3ee28460e0a4571123d2a778a6a882"
++checksum = "50fd97c9dc2399518aa331917ac6f274280ec5eb34e555dd291899745c48ec6f"
+ dependencies = [
+  "clap_builder",
+  "clap_derive",
+@@ -1482,9 +1480,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "clap_builder"
+-version = "4.5.42"
++version = "4.5.43"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "64f4f3f3c77c94aff3c7e9aac9a2ca1974a5adf392a8bb751e827d6d127ab966"
++checksum = "c35b5830294e1fa0462034af85cc95225a4cb07092c088c55bda3147cfcd8f65"
+ dependencies = [
+  "anstream",
+  "anstyle",
+@@ -1501,20 +1499,20 @@ dependencies = [
+  "heck 0.5.0",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+ name = "clap_lex"
+-version = "0.7.4"
++version = "0.7.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
++checksum = "b94f61472cee1439c0b966b47e3aca9ae07e45d070759512cd390ea2bebc6675"
+ 
+ [[package]]
+ name = "clipboard-win"
+-version = "5.4.0"
++version = "5.4.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "15efe7a882b08f34e38556b14f2fb3daa98769d06c7f0c1b076dfd0d983bc892"
++checksum = "bde03770d3df201d4fb868f2c9c59e66a3e4e2bd06692a0fe701e7103c7e84d4"
+ dependencies = [
+  "error-code",
+ ]
+@@ -1527,14 +1525,14 @@ checksum = "cbd0f76e066e64fdc5631e3bb46381254deab9ef1158292f27c8c57e3bf3fe59"
+ 
+ [[package]]
+ name = "cocoa"
+-version = "0.26.0"
++version = "0.26.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f79398230a6e2c08f5c9760610eb6924b52aa9e7950a619602baba59dcbbdbb2"
++checksum = "ad36507aeb7e16159dfe68db81ccc27571c3ccd4b76fb2fb72fc59e7a4b1b64c"
+ dependencies = [
+  "bitflags 2.9.1",
+  "block",
+  "cocoa-foundation",
+- "core-foundation 0.10.0",
++ "core-foundation 0.10.1",
+  "core-graphics",
+  "foreign-types 0.5.0",
+  "libc",
+@@ -1543,23 +1541,22 @@ dependencies = [
+ 
+ [[package]]
+ name = "cocoa-foundation"
+-version = "0.2.0"
++version = "0.2.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e14045fb83be07b5acf1c0884b2180461635b433455fa35d1cd6f17f1450679d"
++checksum = "81411967c50ee9a1fc11365f8c585f863a22a9697c89239c452292c40ba79b0d"
+ dependencies = [
+  "bitflags 2.9.1",
+  "block",
+- "core-foundation 0.10.0",
++ "core-foundation 0.10.1",
+  "core-graphics-types",
+- "libc",
+  "objc",
+ ]
+ 
+ [[package]]
+ name = "colorchoice"
+-version = "1.0.3"
++version = "1.0.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5b63caa9aa9397e2d9480a9b13673856c78d8ac123288526c37d7839f2a86990"
++checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
+ 
+ [[package]]
+ name = "colored"
+@@ -1705,9 +1702,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "core-foundation"
+-version = "0.10.0"
++version = "0.10.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b55271e5c8c478ad3f38ad24ef34923091e0548492a266d19b3c0b4d82574c63"
++checksum = "b2a6cd9ae233e7f62ba4e9353e81a88df7fc8a5987b8d445b4d90c879bd156f6"
+ dependencies = [
+  "core-foundation-sys",
+  "libc",
+@@ -1726,7 +1723,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
+ dependencies = [
+  "bitflags 2.9.1",
+- "core-foundation 0.10.0",
++ "core-foundation 0.10.1",
+  "core-graphics-types",
+  "foreign-types 0.5.0",
+  "libc",
+@@ -1739,7 +1736,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "3d44a101f213f6c4cdc1853d4b78aef6db6bdfa3468798cc1d9912f4735013eb"
+ dependencies = [
+  "bitflags 2.9.1",
+- "core-foundation 0.10.0",
++ "core-foundation 0.10.1",
+  "libc",
+ ]
+ 
+@@ -1825,7 +1822,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
+ dependencies = [
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -1835,29 +1832,29 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "32a2785755761f3ddc1492979ce1e48d2c00d09311c39e4466429188f3dd6501"
+ dependencies = [
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+ name = "curl"
+-version = "0.4.47"
++version = "0.4.48"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d9fb4d13a1be2b58f14d60adba57c9834b78c62fd86c3e76a148f732686e9265"
++checksum = "9e2d5c8f48d9c0c23250e52b55e82a6ab4fdba6650c931f5a0a57a43abda812b"
+ dependencies = [
+  "curl-sys",
+  "libc",
+  "openssl-probe",
+  "openssl-sys",
+  "schannel",
+- "socket2 0.5.9",
+- "windows-sys 0.52.0",
++ "socket2 0.5.10",
++ "windows-sys 0.59.0",
+ ]
+ 
+ [[package]]
+ name = "curl-sys"
+-version = "0.4.80+curl-8.12.1"
++version = "0.4.82+curl-8.14.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "55f7df2eac63200c3ab25bde3b2268ef2ee56af3d238e76d61f01c3c49bff734"
++checksum = "c4d63638b5ec65f1a4ae945287b3fd035be4554bbaf211901159c9a2a74fb5be"
+ dependencies = [
+  "cc",
+  "libc",
+@@ -1865,7 +1862,7 @@ dependencies = [
+  "openssl-sys",
+  "pkg-config",
+  "vcpkg",
+- "windows-sys 0.52.0",
++ "windows-sys 0.59.0",
+ ]
+ 
+ [[package]]
+@@ -1889,7 +1886,7 @@ dependencies = [
+  "proc-macro2",
+  "quote",
+  "strsim",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -1900,7 +1897,7 @@ checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
+ dependencies = [
+  "darling_core",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -1982,7 +1979,7 @@ checksum = "30542c1ad912e0e3d22a1935c290e12e8a29d704a420177a31faad4a601a0800"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2003,7 +2000,7 @@ dependencies = [
+  "darling",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2013,7 +2010,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "ab63b0e2bf4d5928aff72e83a7dace85d7bba5fe12dcc3c5a572d78caffd3f3c"
+ dependencies = [
+  "derive_builder_core",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2026,7 +2023,7 @@ dependencies = [
+  "proc-macro2",
+  "quote",
+  "rustc_version",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2052,15 +2049,15 @@ dependencies = [
+ 
+ [[package]]
+ name = "diesel_derives"
+-version = "2.2.5"
++version = "2.2.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "68d4216021b3ea446fd2047f5c8f8fe6e98af34508a254a01e4d6bc1e844f84d"
++checksum = "1b96984c469425cb577bf6f17121ecb3e4fe1e81de5d8f780dd372802858d756"
+ dependencies = [
+  "diesel_table_macro_syntax",
+  "dsl_auto_type",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2080,7 +2077,7 @@ version = "0.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "209c735641a413bc68c4923a9d6ad4bcb3ca306b794edaa7eb0b3228a99ffb25"
+ dependencies = [
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2162,7 +2159,7 @@ checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab"
+ dependencies = [
+  "libc",
+  "option-ext",
+- "redox_users 0.5.0",
++ "redox_users 0.5.2",
+  "windows-sys 0.60.2",
+ ]
+ 
+@@ -2190,6 +2187,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "89a09f22a6c6069a18470eb92d2298acf25463f14256d24778e1230d789a2aec"
+ dependencies = [
+  "bitflags 2.9.1",
++ "block2 0.6.1",
++ "libc",
+  "objc2 0.6.1",
+ ]
+ 
+@@ -2201,7 +2200,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2210,7 +2209,7 @@ version = "0.5.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412"
+ dependencies = [
+- "libloading",
++ "libloading 0.8.8",
+ ]
+ 
+ [[package]]
+@@ -2227,13 +2226,13 @@ dependencies = [
+ 
+ [[package]]
+ name = "dlopen2_derive"
+-version = "0.4.0"
++version = "0.4.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54"
++checksum = "788160fb30de9cdd857af31c6a2675904b16ece8fc2737b2c7127ba368c9d0f4"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2277,7 +2276,7 @@ dependencies = [
+  "heck 0.5.0",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2303,9 +2302,9 @@ checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813"
+ 
+ [[package]]
+ name = "dyn-clone"
+-version = "1.0.19"
++version = "1.0.20"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1c7a8fb8a9fbf66c1f703fe16184d10ca0ee9d23be5b4436400408ba54a95005"
++checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555"
+ 
+ [[package]]
+ name = "either"
+@@ -2315,16 +2314,16 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+ 
+ [[package]]
+ name = "embed-resource"
+-version = "3.0.2"
++version = "3.0.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7fbc6e0d8e0c03a655b53ca813f0463d2c956bc4db8138dbc89f120b066551e3"
++checksum = "4c6d81016d6c977deefb2ef8d8290da019e27cc26167e102185da528e6c0ab38"
+ dependencies = [
+  "cc",
+  "memchr",
+  "rustc_version",
+- "toml",
++ "toml 0.9.5",
+  "vswhom",
+- "winreg 0.52.0",
++ "winreg 0.55.0",
+ ]
+ 
+ [[package]]
+@@ -2356,9 +2355,9 @@ checksum = "a3d8a32ae18130a3c84dd492d4215c3d913c3b07c6b63c2eb3eb7ff1101ab7bf"
+ 
+ [[package]]
+ name = "enumflags2"
+-version = "0.7.11"
++version = "0.7.12"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ba2f4b465f5318854c6f8dd686ede6c0a9dc67d4b1ac241cf0eb51521a309147"
++checksum = "1027f7680c853e056ebcec683615fb6fbbc07dbaa13b4d5d9442b146ded4ecef"
+ dependencies = [
+  "enumflags2_derive",
+  "serde",
+@@ -2366,13 +2365,13 @@ dependencies = [
+ 
+ [[package]]
+ name = "enumflags2_derive"
+-version = "0.7.11"
++version = "0.7.12"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fc4caf64a58d7a6d65ab00639b046ff54399a39f5f2554728895ace4b297cd79"
++checksum = "67c78a4d8fdf9953a5c9d458f9efe940fd97a0cab0941c075a813ac594733827"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2403,12 +2402,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "errno"
+-version = "0.3.12"
++version = "0.3.13"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "cea14ef9355e3beab063703aa9dab15afd25f0667c341310c1e5274bb1d0da18"
++checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+ dependencies = [
+  "libc",
+- "windows-sys 0.59.0",
++ "windows-sys 0.60.2",
+ ]
+ 
+ [[package]]
+@@ -2419,9 +2418,9 @@ checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59"
+ 
+ [[package]]
+ name = "event-listener"
+-version = "5.4.0"
++version = "5.4.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3492acde4c3fc54c845eaab3eed8bd00c7a7d881f78bfc801e43a93dec1331ae"
++checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+ dependencies = [
+  "concurrent-queue",
+  "parking",
+@@ -2495,11 +2494,11 @@ dependencies = [
+ 
+ [[package]]
+ name = "file-id"
+-version = "0.2.2"
++version = "0.2.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6bc904b9bbefcadbd8e3a9fb0d464a9b979de6324c03b3c663e8994f46a5be36"
++checksum = "e1fc6a637b6dc58414714eddd9170ff187ecb0933d4c7024d1abbd23a3cc26e9"
+ dependencies = [
+- "windows-sys 0.52.0",
++ "windows-sys 0.60.2",
+ ]
+ 
+ [[package]]
+@@ -2528,9 +2527,9 @@ checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
+ 
+ [[package]]
+ name = "flate2"
+-version = "1.1.1"
++version = "1.1.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7ced92e76e966ca2fd84c8f7aa01a4aea65b0eb6648d72f7c8f3e2764a67fece"
++checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d"
+ dependencies = [
+  "crc32fast",
+  "libz-rs-sys",
+@@ -2588,7 +2587,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2703,9 +2702,9 @@ checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+ 
+ [[package]]
+ name = "futures-lite"
+-version = "2.6.0"
++version = "2.6.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f5edaec856126859abb19ed65f39e90fea3a9574b9707f13539acf4abf7eb532"
++checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
+ dependencies = [
+  "fastrand",
+  "futures-core",
+@@ -2722,7 +2721,7 @@ checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -2919,7 +2918,7 @@ dependencies = [
+  "cfg-if",
+  "js-sys",
+  "libc",
+- "wasi 0.11.0+wasi-snapshot-preview1",
++ "wasi 0.11.1+wasi-snapshot-preview1",
+  "wasm-bindgen",
+ ]
+ 
+@@ -2997,7 +2996,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "587d0dd757ea38f8a7b4761026162f6b9ab39e2cc7eba386852371841f5fe69b"
+ dependencies = [
+  "git2",
+- "gix-path 0.10.19",
++ "gix-path",
+  "log",
+  "shellexpand",
+  "thiserror 2.0.12",
+@@ -3066,7 +3065,7 @@ dependencies = [
+  "serde-error",
+  "tempfile",
+  "tokio",
+- "toml",
++ "toml 0.8.23",
+  "tracing",
+  "url",
+ ]
+@@ -3235,7 +3234,7 @@ dependencies = [
+  "bstr",
+  "gix",
+  "serde",
+- "toml",
++ "toml 0.8.23",
+  "walkdir",
+ ]
+ 
+@@ -3318,7 +3317,7 @@ dependencies = [
+  "gitbutler-testsupport",
+  "gix",
+  "serde",
+- "toml",
++ "toml 0.8.23",
+  "tracing",
+ ]
+ 
+@@ -3346,7 +3345,7 @@ dependencies = [
+  "serde",
+  "strum",
+  "tempfile",
+- "toml",
++ "toml 0.8.23",
+  "tracing",
+ ]
+ 
+@@ -3429,7 +3428,7 @@ dependencies = [
+  "serde_json",
+  "tempfile",
+  "thiserror 2.0.12",
+- "toml",
++ "toml 0.8.23",
+  "tracing",
+  "uuid",
+ ]
+@@ -3506,7 +3505,7 @@ dependencies = [
+  "itertools",
+  "serde",
+  "tempfile",
+- "toml",
++ "toml 0.8.23",
+ ]
+ 
+ [[package]]
+@@ -3729,15 +3728,16 @@ dependencies = [
+ [[package]]
+ name = "gix"
+ version = "0.73.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "514c29cc879bdc0286b0cbc205585a49b252809eb86c69df4ce4f855ee75f635"
+ dependencies = [
+- "gix-actor 0.35.3",
++ "gix-actor",
+  "gix-attributes 0.27.0",
+  "gix-command",
+  "gix-commitgraph 0.29.0",
+  "gix-config",
+  "gix-credentials",
+- "gix-date 0.10.4",
++ "gix-date",
+  "gix-diff",
+  "gix-dir",
+  "gix-discover 0.41.0",
+@@ -3756,7 +3756,7 @@ dependencies = [
+  "gix-object 0.50.1",
+  "gix-odb",
+  "gix-pack",
+- "gix-path 0.10.20",
++ "gix-path",
+  "gix-pathspec",
+  "gix-prompt",
+  "gix-protocol",
+@@ -3769,12 +3769,12 @@ dependencies = [
+  "gix-status",
+  "gix-submodule",
+  "gix-tempfile 18.0.0",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-trace",
+  "gix-transport",
+  "gix-traverse 0.47.0",
+  "gix-url",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-utils",
++ "gix-validate",
+  "gix-worktree 0.42.0",
+  "gix-worktree-state",
+  "once_cell",
+@@ -3783,28 +3783,15 @@ dependencies = [
+  "thiserror 2.0.12",
+ ]
+ 
+-[[package]]
+-name = "gix-actor"
+-version = "0.35.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "58ebbb8f41071c7cf318a0b1db667c34e1df49db7bf387d282a4e61a3b97882c"
+-dependencies = [
+- "bstr",
+- "gix-date 0.10.3",
+- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "itoa",
+- "thiserror 2.0.12",
+- "winnow 0.7.12",
+-]
+-
+ [[package]]
+ name = "gix-actor"
+ version = "0.35.3"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d1b1ec302f8dc059df125ed46dfdc7e9d33fe7724df19843aea53b5ffd32d5bb"
+ dependencies = [
+  "bstr",
+- "gix-date 0.10.4",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-date",
++ "gix-utils",
+  "itoa",
+  "serde",
+  "thiserror 2.0.12",
+@@ -3819,9 +3806,9 @@ checksum = "6f50d813d5c2ce9463ba0c29eea90060df08e38ad8f34b8a192259f8bce5c078"
+ dependencies = [
+  "bstr",
+  "gix-glob 0.20.1",
+- "gix-path 0.10.19",
+- "gix-quote 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "gix-trace 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-path",
++ "gix-quote",
++ "gix-trace",
+  "kstring",
+  "smallvec",
+  "thiserror 2.0.12",
+@@ -3831,13 +3818,14 @@ dependencies = [
+ [[package]]
+ name = "gix-attributes"
+ version = "0.27.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "45442188216d08a5959af195f659cb1f244a50d7d2d0c3873633b1cd7135f638"
+ dependencies = [
+  "bstr",
+  "gix-glob 0.21.0",
+- "gix-path 0.10.20",
+- "gix-quote 0.6.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-path",
++ "gix-quote",
++ "gix-trace",
+  "kstring",
+  "serde",
+  "smallvec",
+@@ -3854,14 +3842,6 @@ dependencies = [
+  "thiserror 2.0.12",
+ ]
+ 
+-[[package]]
+-name = "gix-bitmap"
+-version = "0.2.14"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
+-dependencies = [
+- "thiserror 2.0.12",
+-]
+-
+ [[package]]
+ name = "gix-chunk"
+ version = "0.4.11"
+@@ -3871,23 +3851,16 @@ dependencies = [
+  "thiserror 2.0.12",
+ ]
+ 
+-[[package]]
+-name = "gix-chunk"
+-version = "0.4.11"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
+-dependencies = [
+- "thiserror 2.0.12",
+-]
+-
+ [[package]]
+ name = "gix-command"
+ version = "0.6.2"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6b31b65ca48a352ae86312b27a514a0c661935f96b481ac8b4371f65815eb196"
+ dependencies = [
+  "bstr",
+- "gix-path 0.10.20",
+- "gix-quote 0.6.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-path",
++ "gix-quote",
++ "gix-trace",
+  "shell-words",
+ ]
+ 
+@@ -3898,7 +3871,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "e05050fd6caa6c731fe3bd7f9485b3b520be062d3d139cb2626e052d6c127951"
+ dependencies = [
+  "bstr",
+- "gix-chunk 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-chunk",
+  "gix-hash 0.18.0",
+  "memmap2",
+  "thiserror 2.0.12",
+@@ -3907,10 +3880,11 @@ dependencies = [
+ [[package]]
+ name = "gix-commitgraph"
+ version = "0.29.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6bb23121e952f43a5b07e3e80890336cb847297467a410475036242732980d06"
+ dependencies = [
+  "bstr",
+- "gix-chunk 0.4.11 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-chunk",
+  "gix-hash 0.19.0",
+  "memmap2",
+  "serde",
+@@ -3920,13 +3894,14 @@ dependencies = [
+ [[package]]
+ name = "gix-config"
+ version = "0.46.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5dfb898c5b695fd4acfc3c0ab638525a65545d47706064dcf7b5ead6cdb136c0"
+ dependencies = [
+  "bstr",
+  "gix-config-value",
+  "gix-features 0.43.1",
+  "gix-glob 0.21.0",
+- "gix-path 0.10.20",
++ "gix-path",
+  "gix-ref 0.53.0",
+  "gix-sec 0.12.0",
+  "memchr",
+@@ -3940,11 +3915,12 @@ dependencies = [
+ [[package]]
+ name = "gix-config-value"
+ version = "0.15.1"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9f012703eb67e263c6c1fc96649fec47694dd3e5d2a91abfc65e4a6a6dc85309"
+ dependencies = [
+  "bitflags 2.9.1",
+  "bstr",
+- "gix-path 0.10.20",
++ "gix-path",
+  "libc",
+  "thiserror 2.0.12",
+ ]
+@@ -3952,38 +3928,27 @@ dependencies = [
+ [[package]]
+ name = "gix-credentials"
+ version = "0.30.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0039dd3ac606dd80b16353a41b61fc237ca5cb8b612f67a9f880adfad4be4e05"
+ dependencies = [
+  "bstr",
+  "gix-command",
+  "gix-config-value",
+- "gix-date 0.10.4",
+- "gix-path 0.10.20",
++ "gix-date",
++ "gix-path",
+  "gix-prompt",
+  "gix-sec 0.12.0",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-trace",
+  "gix-url",
+  "serde",
+  "thiserror 2.0.12",
+ ]
+ 
+-[[package]]
+-name = "gix-date"
+-version = "0.10.3"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d7235bdf4d9d54a6901928e3a37f91c16f419e6957f520ed929c3d292b84226e"
+-dependencies = [
+- "bstr",
+- "itoa",
+- "jiff",
+- "smallvec",
+- "thiserror 2.0.12",
+-]
+-
+ [[package]]
+ name = "gix-date"
+ version = "0.10.4"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "467254054f8df1e85b5f73cb910602767b0122391d994302a091841ba43edfaa"
+ dependencies = [
+  "bstr",
+  "itoa",
+@@ -3996,7 +3961,8 @@ dependencies = [
+ [[package]]
+ name = "gix-diff"
+ version = "0.53.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "de854852010d44a317f30c92d67a983e691c9478c8a3fb4117c1f48626bcdea8"
+ dependencies = [
+  "bstr",
+  "gix-attributes 0.27.0",
+@@ -4006,10 +3972,10 @@ dependencies = [
+  "gix-hash 0.19.0",
+  "gix-index 0.41.0",
+  "gix-object 0.50.1",
+- "gix-path 0.10.20",
++ "gix-path",
+  "gix-pathspec",
+  "gix-tempfile 18.0.0",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-trace",
+  "gix-traverse 0.47.0",
+  "gix-worktree 0.42.0",
+  "imara-diff",
+@@ -4019,7 +3985,8 @@ dependencies = [
+ [[package]]
+ name = "gix-dir"
+ version = "0.15.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dad34e4f373f94902df1ba1d2a1df3a1b29eacd15e316ac5972d842e31422dd7"
+ dependencies = [
+  "bstr",
+  "gix-discover 0.41.0",
+@@ -4027,10 +3994,10 @@ dependencies = [
+  "gix-ignore 0.16.0",
+  "gix-index 0.41.0",
+  "gix-object 0.50.1",
+- "gix-path 0.10.20",
++ "gix-path",
+  "gix-pathspec",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-trace",
++ "gix-utils",
+  "gix-worktree 0.42.0",
+  "thiserror 2.0.12",
+ ]
+@@ -4045,7 +4012,7 @@ dependencies = [
+  "dunce",
+  "gix-fs 0.15.0",
+  "gix-hash 0.18.0",
+- "gix-path 0.10.19",
++ "gix-path",
+  "gix-ref 0.52.1",
+  "gix-sec 0.11.0",
+  "thiserror 2.0.12",
+@@ -4054,13 +4021,14 @@ dependencies = [
+ [[package]]
+ name = "gix-discover"
+ version = "0.41.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ffb180c91ca1a2cf53e828bb63d8d8f8fa7526f49b83b33d7f46cbeb5d79d30a"
+ dependencies = [
+  "bstr",
+  "dunce",
+  "gix-fs 0.16.0",
+  "gix-hash 0.19.0",
+- "gix-path 0.10.20",
++ "gix-path",
+  "gix-ref 0.53.0",
+  "gix-sec 0.12.0",
+  "thiserror 2.0.12",
+@@ -4072,9 +4040,9 @@ version = "0.42.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "56f4399af6ec4fd9db84dd4cf9656c5c785ab492ab40a7c27ea92b4241923fed"
+ dependencies = [
+- "gix-path 0.10.19",
+- "gix-trace 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-path",
++ "gix-trace",
++ "gix-utils",
+  "libc",
+  "prodash 29.0.2",
+  "walkdir",
+@@ -4083,15 +4051,16 @@ dependencies = [
+ [[package]]
+ name = "gix-features"
+ version = "0.43.1"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cd1543cd9b8abcbcebaa1a666a5c168ee2cda4dea50d3961ee0e6d1c42f81e5b"
+ dependencies = [
+  "bytes",
+  "crc32fast",
+  "crossbeam-channel",
+  "flate2",
+- "gix-path 0.10.20",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-path",
++ "gix-trace",
++ "gix-utils",
+  "libc",
+  "once_cell",
+  "parking_lot",
+@@ -4103,7 +4072,8 @@ dependencies = [
+ [[package]]
+ name = "gix-filter"
+ version = "0.20.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "aa6571a3927e7ab10f64279a088e0dae08e8da05547771796d7389bbe28ad9ff"
+ dependencies = [
+  "bstr",
+  "encoding_rs",
+@@ -4112,10 +4082,10 @@ dependencies = [
+  "gix-hash 0.19.0",
+  "gix-object 0.50.1",
+  "gix-packetline-blocking",
+- "gix-path 0.10.20",
+- "gix-quote 0.6.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-path",
++ "gix-quote",
++ "gix-trace",
++ "gix-utils",
+  "smallvec",
+  "thiserror 2.0.12",
+ ]
+@@ -4129,21 +4099,22 @@ dependencies = [
+  "bstr",
+  "fastrand",
+  "gix-features 0.42.1",
+- "gix-path 0.10.19",
+- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-path",
++ "gix-utils",
+  "thiserror 2.0.12",
+ ]
+ 
+ [[package]]
+ name = "gix-fs"
+ version = "0.16.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d793f71e955d18f228d20ec433dcce6d0e8577efcdfd11d72d09d7cc2758dfd1"
+ dependencies = [
+  "bstr",
+  "fastrand",
+  "gix-features 0.43.1",
+- "gix-path 0.10.20",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-path",
++ "gix-utils",
+  "thiserror 2.0.12",
+ ]
+ 
+@@ -4156,18 +4127,19 @@ dependencies = [
+  "bitflags 2.9.1",
+  "bstr",
+  "gix-features 0.42.1",
+- "gix-path 0.10.19",
++ "gix-path",
+ ]
+ 
+ [[package]]
+ name = "gix-glob"
+ version = "0.21.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b947db8366823e7a750c254f6bb29e27e17f27e457bf336ba79b32423db62cd5"
+ dependencies = [
+  "bitflags 2.9.1",
+  "bstr",
+  "gix-features 0.43.1",
+- "gix-path 0.10.20",
++ "gix-path",
+  "serde",
+ ]
+ 
+@@ -4186,7 +4158,8 @@ dependencies = [
+ [[package]]
+ name = "gix-hash"
+ version = "0.19.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "251fad79796a731a2a7664d9ea95ee29a9e99474de2769e152238d4fdb69d50e"
+ dependencies = [
+  "faster-hex",
+  "gix-features 0.43.1",
+@@ -4209,7 +4182,8 @@ dependencies = [
+ [[package]]
+ name = "gix-hashtable"
+ version = "0.9.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c35300b54896153e55d53f4180460931ccd69b7e8d2f6b9d6401122cdedc4f07"
+ dependencies = [
+  "gix-hash 0.19.0",
+  "hashbrown 0.15.4",
+@@ -4224,20 +4198,21 @@ checksum = "ae358c3c96660b10abc7da63c06788dfded603e717edbd19e38c6477911b71c8"
+ dependencies = [
+  "bstr",
+  "gix-glob 0.20.1",
+- "gix-path 0.10.19",
+- "gix-trace 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-path",
++ "gix-trace",
+  "unicode-bom",
+ ]
+ 
+ [[package]]
+ name = "gix-ignore"
+ version = "0.16.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "564d6fddf46e2c981f571b23d6ad40cb08bddcaf6fc7458b1d49727ad23c2870"
+ dependencies = [
+  "bstr",
+  "gix-glob 0.21.0",
+- "gix-path 0.10.20",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-path",
++ "gix-trace",
+  "serde",
+  "unicode-bom",
+ ]
+@@ -4252,15 +4227,15 @@ dependencies = [
+  "bstr",
+  "filetime",
+  "fnv",
+- "gix-bitmap 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-bitmap",
+  "gix-features 0.42.1",
+  "gix-fs 0.15.0",
+  "gix-hash 0.18.0",
+  "gix-lock 17.1.0",
+  "gix-object 0.49.1",
+  "gix-traverse 0.46.2",
+- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "gix-validate 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-utils",
++ "gix-validate",
+  "hashbrown 0.14.5",
+  "itoa",
+  "libc",
+@@ -4273,21 +4248,22 @@ dependencies = [
+ [[package]]
+ name = "gix-index"
+ version = "0.41.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2af39fde3ce4ce11371d9ce826f2936ec347318f2d1972fe98c2e7134e267e25"
+ dependencies = [
+  "bitflags 2.9.1",
+  "bstr",
+  "filetime",
+  "fnv",
+- "gix-bitmap 0.2.14 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-bitmap",
+  "gix-features 0.43.1",
+  "gix-fs 0.16.0",
+  "gix-hash 0.19.0",
+  "gix-lock 18.0.0",
+  "gix-object 0.50.1",
+  "gix-traverse 0.47.0",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-utils",
++ "gix-validate",
+  "hashbrown 0.15.4",
+  "itoa",
+  "libc",
+@@ -4305,28 +4281,30 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "570f8b034659f256366dc90f1a24924902f20acccd6a15be96d44d1269e7a796"
+ dependencies = [
+  "gix-tempfile 17.1.0",
+- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-utils",
+  "thiserror 2.0.12",
+ ]
+ 
+ [[package]]
+ name = "gix-lock"
+ version = "18.0.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b9fa71da90365668a621e184eb5b979904471af1b3b09b943a84bc50e8ad42ed"
+ dependencies = [
+  "gix-tempfile 18.0.0",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-utils",
+  "thiserror 2.0.12",
+ ]
+ 
+ [[package]]
+ name = "gix-mailmap"
+ version = "0.27.2"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9a8982e1874a2034d7dd481bcdd6a05579ba444bcda748511eb0f8e50eb10487"
+ dependencies = [
+  "bstr",
+- "gix-actor 0.35.3",
+- "gix-date 0.10.4",
++ "gix-actor",
++ "gix-date",
+  "serde",
+  "thiserror 2.0.12",
+ ]
+@@ -4334,7 +4312,8 @@ dependencies = [
+ [[package]]
+ name = "gix-merge"
+ version = "0.6.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "88c2580b4122a0c40de25f8f20a1817704b5f4e4798c78d29d4a89500af2da89"
+ dependencies = [
+  "bstr",
+  "gix-command",
+@@ -4344,12 +4323,12 @@ dependencies = [
+  "gix-hash 0.19.0",
+  "gix-index 0.41.0",
+  "gix-object 0.50.1",
+- "gix-path 0.10.20",
+- "gix-quote 0.6.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-path",
++ "gix-quote",
+  "gix-revision",
+  "gix-revwalk 0.21.0",
+  "gix-tempfile 18.0.0",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-trace",
+  "gix-worktree 0.42.0",
+  "imara-diff",
+  "thiserror 2.0.12",
+@@ -4358,11 +4337,12 @@ dependencies = [
+ [[package]]
+ name = "gix-negotiate"
+ version = "0.21.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1d58d4c9118885233be971e0d7a589f5cfb1a8bd6cb6e2ecfb0fc6b1b293c83b"
+ dependencies = [
+  "bitflags 2.9.1",
+  "gix-commitgraph 0.29.0",
+- "gix-date 0.10.4",
++ "gix-date",
+  "gix-hash 0.19.0",
+  "gix-object 0.50.1",
+  "gix-revwalk 0.21.0",
+@@ -4377,14 +4357,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "d957ca3640c555d48bb27f8278c67169fa1380ed94f6452c5590742524c40fbb"
+ dependencies = [
+  "bstr",
+- "gix-actor 0.35.2",
+- "gix-date 0.10.3",
++ "gix-actor",
++ "gix-date",
+  "gix-features 0.42.1",
+  "gix-hash 0.18.0",
+  "gix-hashtable 0.8.1",
+- "gix-path 0.10.19",
+- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "gix-validate 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-path",
++ "gix-utils",
++ "gix-validate",
+  "itoa",
+  "smallvec",
+  "thiserror 2.0.12",
+@@ -4394,17 +4374,18 @@ dependencies = [
+ [[package]]
+ name = "gix-object"
+ version = "0.50.1"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "aff2047f96d57bcc721426e11ec0f9efeb432d5e6ef5f1aa84cfc55198971dca"
+ dependencies = [
+  "bstr",
+- "gix-actor 0.35.3",
+- "gix-date 0.10.4",
++ "gix-actor",
++ "gix-date",
+  "gix-features 0.43.1",
+  "gix-hash 0.19.0",
+  "gix-hashtable 0.9.0",
+- "gix-path 0.10.20",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-path",
++ "gix-utils",
++ "gix-validate",
+  "itoa",
+  "serde",
+  "smallvec",
+@@ -4415,18 +4396,19 @@ dependencies = [
+ [[package]]
+ name = "gix-odb"
+ version = "0.70.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9c9d7af10fda9df0bb4f7f9bd507963560b3c66cb15a5b825caf752e0eb109ac"
+ dependencies = [
+  "arc-swap",
+- "gix-date 0.10.4",
++ "gix-date",
+  "gix-features 0.43.1",
+  "gix-fs 0.16.0",
+  "gix-hash 0.19.0",
+  "gix-hashtable 0.9.0",
+  "gix-object 0.50.1",
+  "gix-pack",
+- "gix-path 0.10.20",
+- "gix-quote 0.6.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-path",
++ "gix-quote",
+  "parking_lot",
+  "serde",
+  "tempfile",
+@@ -4436,15 +4418,16 @@ dependencies = [
+ [[package]]
+ name = "gix-pack"
+ version = "0.60.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d8571df89bfca5abb49c3e3372393f7af7e6f8b8dbe2b96303593cef5b263019"
+ dependencies = [
+  "clru",
+- "gix-chunk 0.4.11 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-chunk",
+  "gix-features 0.43.1",
+  "gix-hash 0.19.0",
+  "gix-hashtable 0.9.0",
+  "gix-object 0.50.1",
+- "gix-path 0.10.20",
++ "gix-path",
+  "gix-tempfile 18.0.0",
+  "memmap2",
+  "parking_lot",
+@@ -4457,47 +4440,36 @@ dependencies = [
+ [[package]]
+ name = "gix-packetline"
+ version = "0.19.1"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2592fbd36249a2fea11056f7055cc376301ef38d903d157de41998335bbf1f93"
+ dependencies = [
+  "bstr",
+  "faster-hex",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-trace",
+  "thiserror 2.0.12",
+ ]
+ 
+ [[package]]
+ name = "gix-packetline-blocking"
+ version = "0.19.1"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
+-dependencies = [
+- "bstr",
+- "faster-hex",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "thiserror 2.0.12",
+-]
+-
+-[[package]]
+-name = "gix-path"
+-version = "0.10.19"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c6279d323d925ad4790602105ae27df4b915e7a7d81e4cdba2603121c03ad111"
++checksum = "fc4e706f328cd494cc8f932172e123a72b9a4711b0db5e411681432a89bd4c94"
+ dependencies = [
+  "bstr",
+- "gix-trace 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
+- "gix-validate 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "home",
+- "once_cell",
++ "faster-hex",
++ "gix-trace",
+  "thiserror 2.0.12",
+ ]
+ 
+ [[package]]
+ name = "gix-path"
+ version = "0.10.20"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "06d37034a4c67bbdda76f7bcd037b2f7bc0fba0c09a6662b19697a5716e7b2fd"
+ dependencies = [
+  "bstr",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-trace",
++ "gix-validate",
+  "home",
+  "once_cell",
+  "thiserror 2.0.12",
+@@ -4506,21 +4478,23 @@ dependencies = [
+ [[package]]
+ name = "gix-pathspec"
+ version = "0.12.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "daedead611c9bd1f3640dc90a9012b45f790201788af4d659f28d94071da7fba"
+ dependencies = [
+  "bitflags 2.9.1",
+  "bstr",
+  "gix-attributes 0.27.0",
+  "gix-config-value",
+  "gix-glob 0.21.0",
+- "gix-path 0.10.20",
++ "gix-path",
+  "thiserror 2.0.12",
+ ]
+ 
+ [[package]]
+ name = "gix-prompt"
+ version = "0.11.1"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6ffa1a7a34c81710aaa666a428c142b6c5d640492fcd41267db0740d923c7906"
+ dependencies = [
+  "gix-command",
+  "gix-config-value",
+@@ -4532,11 +4506,12 @@ dependencies = [
+ [[package]]
+ name = "gix-protocol"
+ version = "0.51.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "12b4b807c47ffcf7c1e5b8119585368a56449f3493da93b931e1d4239364e922"
+ dependencies = [
+  "bstr",
+  "gix-credentials",
+- "gix-date 0.10.4",
++ "gix-date",
+  "gix-features 0.43.1",
+  "gix-hash 0.19.0",
+  "gix-lock 18.0.0",
+@@ -4546,9 +4521,9 @@ dependencies = [
+  "gix-refspec",
+  "gix-revwalk 0.21.0",
+  "gix-shallow",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-trace",
+  "gix-transport",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-utils",
+  "maybe-async",
+  "serde",
+  "thiserror 2.0.12",
+@@ -4562,17 +4537,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "4a375a75b4d663e8bafe3bf4940a18a23755644c13582fa326e99f8f987d83fd"
+ dependencies = [
+  "bstr",
+- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "thiserror 2.0.12",
+-]
+-
+-[[package]]
+-name = "gix-quote"
+-version = "0.6.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
+-dependencies = [
+- "bstr",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-utils",
+  "thiserror 2.0.12",
+ ]
+ 
+@@ -4582,16 +4547,16 @@ version = "0.52.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "d1b7985657029684d759f656b09abc3e2c73085596d5cdb494428823970a7762"
+ dependencies = [
+- "gix-actor 0.35.2",
++ "gix-actor",
+  "gix-features 0.42.1",
+  "gix-fs 0.15.0",
+  "gix-hash 0.18.0",
+  "gix-lock 17.1.0",
+  "gix-object 0.49.1",
+- "gix-path 0.10.19",
++ "gix-path",
+  "gix-tempfile 17.1.0",
+- "gix-utils 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "gix-validate 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-utils",
++ "gix-validate",
+  "memmap2",
+  "thiserror 2.0.12",
+  "winnow 0.7.12",
+@@ -4600,18 +4565,19 @@ dependencies = [
+ [[package]]
+ name = "gix-ref"
+ version = "0.53.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4b7a23209d4e4cbdc2086d294f5f3f8707ac6286768847024d952d8cd3278c5b"
+ dependencies = [
+- "gix-actor 0.35.3",
++ "gix-actor",
+  "gix-features 0.43.1",
+  "gix-fs 0.16.0",
+  "gix-hash 0.19.0",
+  "gix-lock 18.0.0",
+  "gix-object 0.50.1",
+- "gix-path 0.10.20",
++ "gix-path",
+  "gix-tempfile 18.0.0",
+- "gix-utils 0.3.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
+- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-utils",
++ "gix-validate",
+  "memmap2",
+  "serde",
+  "thiserror 2.0.12",
+@@ -4621,12 +4587,13 @@ dependencies = [
+ [[package]]
+ name = "gix-refspec"
+ version = "0.31.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7d29cae1ae31108826e7156a5e60bffacab405f4413f5bc0375e19772cce0055"
+ dependencies = [
+  "bstr",
+  "gix-hash 0.19.0",
+  "gix-revision",
+- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-validate",
+  "smallvec",
+  "thiserror 2.0.12",
+ ]
+@@ -4634,17 +4601,18 @@ dependencies = [
+ [[package]]
+ name = "gix-revision"
+ version = "0.35.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f651f2b1742f760bb8161d6743229206e962b73d9c33c41f4e4aefa6586cbd3d"
+ dependencies = [
+  "bitflags 2.9.1",
+  "bstr",
+  "gix-commitgraph 0.29.0",
+- "gix-date 0.10.4",
++ "gix-date",
+  "gix-hash 0.19.0",
+  "gix-hashtable 0.9.0",
+  "gix-object 0.50.1",
+  "gix-revwalk 0.21.0",
+- "gix-trace 0.1.13 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-trace",
+  "serde",
+  "thiserror 2.0.12",
+ ]
+@@ -4656,7 +4624,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "1bc756b73225bf005ddeb871d1ca7b3c33e2417d0d53e56effa5a36765b52b28"
+ dependencies = [
+  "gix-commitgraph 0.28.0",
+- "gix-date 0.10.3",
++ "gix-date",
+  "gix-hash 0.18.0",
+  "gix-hashtable 0.8.1",
+  "gix-object 0.49.1",
+@@ -4667,10 +4635,11 @@ dependencies = [
+ [[package]]
+ name = "gix-revwalk"
+ version = "0.21.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "06e74f91709729e099af6721bd0fa7d62f243f2005085152301ca5cdd86ec02c"
+ dependencies = [
+  "gix-commitgraph 0.29.0",
+- "gix-date 0.10.4",
++ "gix-date",
+  "gix-hash 0.19.0",
+  "gix-hashtable 0.9.0",
+  "gix-object 0.50.1",
+@@ -4685,7 +4654,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "d0dabbc78c759ecc006b970339394951b2c8e1e38a37b072c105b80b84c308fd"
+ dependencies = [
+  "bitflags 2.9.1",
+- "gix-path 0.10.19",
++ "gix-path",
+  "libc",
+  "windows-sys 0.59.0",
+ ]
+@@ -4693,19 +4662,21 @@ dependencies = [
+ [[package]]
+ name = "gix-sec"
+ version = "0.12.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "09f7053ed7c66633b56c57bc6ed3377be3166eaf3dc2df9f1c5ec446df6fdf2c"
+ dependencies = [
+  "bitflags 2.9.1",
+- "gix-path 0.10.20",
++ "gix-path",
+  "libc",
+  "serde",
+- "windows-sys 0.60.2",
++ "windows-sys 0.59.0",
+ ]
+ 
+ [[package]]
+ name = "gix-shallow"
+ version = "0.5.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d936745103243ae4c510f19e0760ce73fb0f08096588fdbe0f0d7fb7ce8944b7"
+ dependencies = [
+  "bstr",
+  "gix-hash 0.19.0",
+@@ -4717,7 +4688,8 @@ dependencies = [
+ [[package]]
+ name = "gix-status"
+ version = "0.20.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "2a4afff9b34eeececa8bdc32b42fb318434b6b1391d9f8d45fe455af08dc2d35"
+ dependencies = [
+  "bstr",
+  "filetime",
+@@ -4729,7 +4701,7 @@ dependencies = [
+  "gix-hash 0.19.0",
+  "gix-index 0.41.0",
+  "gix-object 0.50.1",
+- "gix-path 0.10.20",
++ "gix-path",
+  "gix-pathspec",
+  "gix-worktree 0.42.0",
+  "portable-atomic",
+@@ -4739,11 +4711,12 @@ dependencies = [
+ [[package]]
+ name = "gix-submodule"
+ version = "0.20.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "657cc5dd43cbc7a14d9c5aaf02cfbe9c2a15d077cded3f304adb30ef78852d3e"
+ dependencies = [
+  "bstr",
+  "gix-config",
+- "gix-path 0.10.20",
++ "gix-path",
+  "gix-pathspec",
+  "gix-refspec",
+  "gix-url",
+@@ -4768,7 +4741,8 @@ dependencies = [
+ [[package]]
+ name = "gix-tempfile"
+ version = "18.0.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "666c0041bcdedf5fa05e9bef663c897debab24b7dc1741605742412d1d47da57"
+ dependencies = [
+  "dashmap",
+  "gix-fs 0.16.0",
+@@ -4807,11 +4781,6 @@ name = "gix-trace"
+ version = "0.1.13"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "e2ccaf54b0b1743a695b482ca0ab9d7603744d8d10b2e5d1a332fef337bee658"
+-
+-[[package]]
+-name = "gix-trace"
+-version = "0.1.13"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
+ dependencies = [
+  "tracing-core",
+ ]
+@@ -4819,7 +4788,8 @@ dependencies = [
+ [[package]]
+ name = "gix-transport"
+ version = "0.48.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "12f7cc0179fc89d53c54e1f9ce51229494864ab4bf136132d69db1b011741ca3"
+ dependencies = [
+  "base64 0.22.1",
+  "bstr",
+@@ -4828,7 +4798,7 @@ dependencies = [
+  "gix-credentials",
+  "gix-features 0.43.1",
+  "gix-packetline",
+- "gix-quote 0.6.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-quote",
+  "gix-sec 0.12.0",
+  "gix-url",
+  "serde",
+@@ -4843,7 +4813,7 @@ checksum = "b8648172f85aca3d6e919c06504b7ac26baef54e04c55eb0100fa588c102cc33"
+ dependencies = [
+  "bitflags 2.9.1",
+  "gix-commitgraph 0.28.0",
+- "gix-date 0.10.3",
++ "gix-date",
+  "gix-hash 0.18.0",
+  "gix-hashtable 0.8.1",
+  "gix-object 0.49.1",
+@@ -4855,11 +4825,12 @@ dependencies = [
+ [[package]]
+ name = "gix-traverse"
+ version = "0.47.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c7cdc82509d792ba0ad815f86f6b469c7afe10f94362e96c4494525a6601bdd5"
+ dependencies = [
+  "bitflags 2.9.1",
+  "gix-commitgraph 0.29.0",
+- "gix-date 0.10.4",
++ "gix-date",
+  "gix-hash 0.19.0",
+  "gix-hashtable 0.9.0",
+  "gix-object 0.50.1",
+@@ -4871,11 +4842,12 @@ dependencies = [
+ [[package]]
+ name = "gix-url"
+ version = "0.32.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1b76a9d266254ad287ffd44467cd88e7868799b08f4d52e02d942b93e514d16f"
+ dependencies = [
+  "bstr",
+  "gix-features 0.43.1",
+- "gix-path 0.10.20",
++ "gix-path",
+  "percent-encoding",
+  "serde",
+  "thiserror 2.0.12",
+@@ -4887,15 +4859,6 @@ name = "gix-utils"
+ version = "0.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "5351af2b172caf41a3728eb4455326d84e0d70fe26fc4de74ab0bd37df4191c5"
+-dependencies = [
+- "fastrand",
+- "unicode-normalization",
+-]
+-
+-[[package]]
+-name = "gix-utils"
+-version = "0.3.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
+ dependencies = [
+  "bstr",
+  "fastrand",
+@@ -4912,15 +4875,6 @@ dependencies = [
+  "thiserror 2.0.12",
+ ]
+ 
+-[[package]]
+-name = "gix-validate"
+-version = "0.10.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
+-dependencies = [
+- "bstr",
+- "thiserror 2.0.12",
+-]
+-
+ [[package]]
+ name = "gix-worktree"
+ version = "0.41.0"
+@@ -4936,14 +4890,15 @@ dependencies = [
+  "gix-ignore 0.15.0",
+  "gix-index 0.40.1",
+  "gix-object 0.49.1",
+- "gix-path 0.10.19",
+- "gix-validate 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "gix-path",
++ "gix-validate",
+ ]
+ 
+ [[package]]
+ name = "gix-worktree"
+ version = "0.42.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "55f625ac9126c19bef06dbc6d2703cdd7987e21e35b497bb265ac37d383877b1"
+ dependencies = [
+  "bstr",
+  "gix-attributes 0.27.0",
+@@ -4954,15 +4909,16 @@ dependencies = [
+  "gix-ignore 0.16.0",
+  "gix-index 0.41.0",
+  "gix-object 0.50.1",
+- "gix-path 0.10.20",
+- "gix-validate 0.10.0 (git+https://github.com/GitoxideLabs/gitoxide?branch=main)",
++ "gix-path",
++ "gix-validate",
+  "serde",
+ ]
+ 
+ [[package]]
+ name = "gix-worktree-state"
+ version = "0.20.0"
+-source = "git+https://github.com/GitoxideLabs/gitoxide?branch=main#202bc6da79854d1fb6bb32b9c6bb2a6f882c77f5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "06ba9b17cbacc02b25801197b20100f7f9bd621db1e7fce9d3c8ab3175207bf8"
+ dependencies = [
+  "bstr",
+  "gix-features 0.43.1",
+@@ -4972,7 +4928,7 @@ dependencies = [
+  "gix-hash 0.19.0",
+  "gix-index 0.41.0",
+  "gix-object 0.50.1",
+- "gix-path 0.10.20",
++ "gix-path",
+  "gix-worktree 0.42.0",
+  "io-close",
+  "thiserror 2.0.12",
+@@ -5012,7 +4968,7 @@ dependencies = [
+  "proc-macro-error",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -5091,14 +5047,14 @@ dependencies = [
+  "proc-macro-error",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+ name = "h2"
+-version = "0.3.26"
++version = "0.3.27"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
++checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d"
+ dependencies = [
+  "bytes",
+  "fnv",
+@@ -5106,7 +5062,7 @@ dependencies = [
+  "futures-sink",
+  "futures-util",
+  "http 0.2.12",
+- "indexmap 2.9.0",
++ "indexmap 2.10.0",
+  "slab",
+  "tokio",
+  "tokio-util",
+@@ -5115,9 +5071,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "h2"
+-version = "0.4.10"
++version = "0.4.12"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a9421a676d1b147b16b82c9225157dc629087ef8ec4d5e2960f9437a90dac0a5"
++checksum = "f3c0b69cfcb4e1b9f1bf2f53f95f766e4661169728ec61cd3fe5a0166f2d1386"
+ dependencies = [
+  "atomic-waker",
+  "bytes",
+@@ -5125,7 +5081,7 @@ dependencies = [
+  "futures-core",
+  "futures-sink",
+  "http 1.3.1",
+- "indexmap 2.9.0",
++ "indexmap 2.10.0",
+  "slab",
+  "tokio",
+  "tokio-util",
+@@ -5208,9 +5164,9 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+ 
+ [[package]]
+ name = "hermit-abi"
+-version = "0.4.0"
++version = "0.5.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
++checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+ 
+ [[package]]
+ name = "hex"
+@@ -5341,14 +5297,14 @@ dependencies = [
+  "futures-channel",
+  "futures-core",
+  "futures-util",
+- "h2 0.3.26",
++ "h2 0.3.27",
+  "http 0.2.12",
+  "http-body 0.4.6",
+  "httparse",
+  "httpdate",
+  "itoa",
+  "pin-project-lite",
+- "socket2 0.5.9",
++ "socket2 0.5.10",
+  "tokio",
+  "tower-service",
+  "tracing",
+@@ -5364,7 +5320,7 @@ dependencies = [
+  "bytes",
+  "futures-channel",
+  "futures-util",
+- "h2 0.4.10",
++ "h2 0.4.12",
+  "http 1.3.1",
+  "http-body 1.0.1",
+  "httparse",
+@@ -5392,21 +5348,20 @@ dependencies = [
+ 
+ [[package]]
+ name = "hyper-rustls"
+-version = "0.27.5"
++version = "0.27.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2d191583f3da1305256f22463b9bb0471acad48a4e534a5218b9963e9c1f59b2"
++checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
+ dependencies = [
+- "futures-util",
+  "http 1.3.1",
+  "hyper 1.6.0",
+  "hyper-util",
+- "rustls 0.23.27",
++ "rustls 0.23.31",
+  "rustls-native-certs",
+  "rustls-pki-types",
+  "tokio",
+  "tokio-rustls 0.26.2",
+  "tower-service",
+- "webpki-roots 0.26.11",
++ "webpki-roots 1.0.2",
+ ]
+ 
+ [[package]]
+@@ -5440,9 +5395,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "hyper-util"
+-version = "0.1.13"
++version = "0.1.16"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b1c293b6b3d21eca78250dc7dbebd6b9210ec5530e038cbfe0661b5c47ab06e8"
++checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e"
+ dependencies = [
+  "base64 0.22.1",
+  "bytes",
+@@ -5456,7 +5411,7 @@ dependencies = [
+  "libc",
+  "percent-encoding",
+  "pin-project-lite",
+- "socket2 0.5.9",
++ "socket2 0.6.0",
+  "system-configuration 0.6.1",
+  "tokio",
+  "tower-service",
+@@ -5547,9 +5502,9 @@ checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+ 
+ [[package]]
+ name = "icu_properties"
+-version = "2.0.0"
++version = "2.0.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2549ca8c7241c82f59c80ba2a6f415d931c5b58d24fb8412caa1a1f02c49139a"
++checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+ dependencies = [
+  "displaydoc",
+  "icu_collections",
+@@ -5563,9 +5518,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "icu_properties_data"
+-version = "2.0.0"
++version = "2.0.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8197e866e47b68f8f7d95249e172903bec06004b18b2937f1095d40a0c57de04"
++checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+ 
+ [[package]]
+ name = "icu_provider"
+@@ -5646,9 +5601,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "indexmap"
+-version = "2.9.0"
++version = "2.10.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
++checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+ dependencies = [
+  "equivalent",
+  "hashbrown 0.15.4",
+@@ -5843,7 +5798,7 @@ checksum = "03343451ff899767262ec32146f6d559dd759fdadf42ff0e227c7c48f72594b4"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -5895,9 +5850,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "jpeg-decoder"
+-version = "0.3.1"
++version = "0.3.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
++checksum = "00810f1d8b74be64b13dbf3db89ac67740615d6c891f0e7b6179326533011a07"
+ 
+ [[package]]
+ name = "js-sys"
+@@ -5954,7 +5909,7 @@ dependencies = [
+  "log",
+  "secret-service",
+  "security-framework 2.11.1",
+- "security-framework 3.2.0",
++ "security-framework 3.3.0",
+  "windows-sys 0.60.2",
+  "zeroize",
+ ]
+@@ -5997,7 +5952,7 @@ checksum = "02cb977175687f33fa4afa0c95c112b987ea1443e5a51c8f8ff27dc618270cc2"
+ dependencies = [
+  "cssparser",
+  "html5ever",
+- "indexmap 2.9.0",
++ "indexmap 2.10.0",
+  "selectors",
+ ]
+ 
+@@ -6027,7 +5982,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf"
+ dependencies = [
+  "gtk-sys",
+- "libloading",
++ "libloading 0.7.4",
+  "once_cell",
+ ]
+ 
+@@ -6048,9 +6003,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "libgit2-sys"
+-version = "0.18.1+1.9.0"
++version = "0.18.2+1.9.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e1dcb20f84ffcdd825c7a311ae347cce604a6f084a767dec4a4929829645290e"
++checksum = "1c42fe03df2bd3c53a3a9c7317ad91d80c81cd1fb0caec8d7cc4cd2bfa10c222"
+ dependencies = [
+  "cc",
+  "libc",
+@@ -6070,11 +6025,21 @@ dependencies = [
+  "winapi",
+ ]
+ 
++[[package]]
++name = "libloading"
++version = "0.8.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
++dependencies = [
++ "cfg-if",
++ "windows-targets 0.53.3",
++]
++
+ [[package]]
+ name = "libredox"
+-version = "0.1.3"
++version = "0.1.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
++checksum = "391290121bad3d37fbddad76d8f5d1c1c314cfc646d143d7e07a3086ddff0ce3"
+ dependencies = [
+  "bitflags 2.9.1",
+  "libc",
+@@ -6108,9 +6073,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "libz-rs-sys"
+-version = "0.5.0"
++version = "0.5.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6489ca9bd760fe9642d7644e827b0c9add07df89857b0416ee15c1cc1a3b8c5a"
++checksum = "172a788537a2221661b480fee8dc5f96c580eb34fa88764d3205dc356c7e4221"
+ dependencies = [
+  "zlib-rs",
+ ]
+@@ -6157,9 +6122,9 @@ checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+ 
+ [[package]]
+ name = "litrs"
+-version = "0.4.1"
++version = "0.4.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"
++checksum = "f5e54036fe321fd421e10d732f155734c4e4afd610dd556d9a82833ab3ee0bed"
+ 
+ [[package]]
+ name = "lock_api"
+@@ -6244,7 +6209,7 @@ checksum = "88a9689d8d44bf9964484516275f5cd4c9b59457a6940c1d5d0ecbb94510a36b"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -6282,7 +6247,7 @@ checksum = "5cf92c10c7e361d6b99666ec1c6f9805b0bea2c3bd8c78dc6fe98ac5bd78db11"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -6293,9 +6258,9 @@ checksum = "ae960838283323069879657ca3de837e9f7bbb4c7bf6ea7f1b290d5e9476d2e0"
+ 
+ [[package]]
+ name = "memchr"
+-version = "2.7.4"
++version = "2.7.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
++checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+ 
+ [[package]]
+ name = "memmap2"
+@@ -6317,12 +6282,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "migrations_internals"
+-version = "2.2.0"
++version = "2.2.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fd01039851e82f8799046eabbb354056283fb265c8ec0996af940f4e85a380ff"
++checksum = "3bda1634d70d5bd53553cf15dca9842a396e8c799982a3ad22998dc44d961f24"
+ dependencies = [
+  "serde",
+- "toml",
++ "toml 0.9.5",
+ ]
+ 
+ [[package]]
+@@ -6360,15 +6325,15 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+ 
+ [[package]]
+ name = "minisign-verify"
+-version = "0.2.3"
++version = "0.2.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6367d84fb54d4242af283086402907277715b8fe46976963af5ebf173f8efba3"
++checksum = "e856fdd13623a2f5f2f54676a4ee49502a96a80ef4a62bcedd23d52427c44d43"
+ 
+ [[package]]
+ name = "miniz_oxide"
+-version = "0.8.8"
++version = "0.8.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3be647b768db090acb35d5ec5db2b0e1f1de11133ca123b9eacf5137868f892a"
++checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+ dependencies = [
+  "adler2",
+  "simd-adler32",
+@@ -6376,14 +6341,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "mio"
+-version = "1.0.3"
++version = "1.0.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
++checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+ dependencies = [
+  "libc",
+  "log",
+- "wasi 0.11.0+wasi-snapshot-preview1",
+- "windows-sys 0.52.0",
++ "wasi 0.11.1+wasi-snapshot-preview1",
++ "windows-sys 0.59.0",
+ ]
+ 
+ [[package]]
+@@ -6394,23 +6359,23 @@ checksum = "4e1d4c44418358edcac6e1d9ce59cea7fb38052429c7704033f1196f0c179e6a"
+ 
+ [[package]]
+ name = "muda"
+-version = "0.17.0"
++version = "0.17.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "58b89bf91c19bf036347f1ab85a81c560f08c0667c8601bece664d860a600988"
++checksum = "01c1738382f66ed56b3b9c8119e794a2e23148ac8ea214eda86622d4cb9d415a"
+ dependencies = [
+  "crossbeam-channel",
+  "dpi",
+  "gtk",
+  "keyboard-types",
+  "objc2 0.6.1",
+- "objc2-app-kit 0.3.1",
++ "objc2-app-kit",
+  "objc2-core-foundation",
+  "objc2-foundation 0.3.1",
+  "once_cell",
+  "png",
+  "serde",
+  "thiserror 2.0.12",
+- "windows-sys 0.59.0",
++ "windows-sys 0.60.2",
+ ]
+ 
+ [[package]]
+@@ -6661,23 +6626,24 @@ dependencies = [
+ 
+ [[package]]
+ name = "num_enum"
+-version = "0.7.3"
++version = "0.7.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
++checksum = "a973b4e44ce6cad84ce69d797acf9a044532e4184c4f267913d1b546a0727b7a"
+ dependencies = [
+  "num_enum_derive",
++ "rustversion",
+ ]
+ 
+ [[package]]
+ name = "num_enum_derive"
+-version = "0.7.3"
++version = "0.7.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
++checksum = "77e878c846a8abae00dd069496dbe8751b16ac1c3d6bd2a7283a938e8228f90d"
+ dependencies = [
+  "proc-macro-crate 3.3.0",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -6724,22 +6690,6 @@ dependencies = [
+  "objc2-exception-helper",
+ ]
+ 
+-[[package]]
+-name = "objc2-app-kit"
+-version = "0.2.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e4e89ad9e3d7d297152b17d39ed92cd50ca8063a89a9fa569046d41568891eff"
+-dependencies = [
+- "bitflags 2.9.1",
+- "block2 0.5.1",
+- "libc",
+- "objc2 0.5.2",
+- "objc2-core-data 0.2.2",
+- "objc2-core-image 0.2.2",
+- "objc2-foundation 0.2.2",
+- "objc2-quartz-core 0.2.2",
+-]
+-
+ [[package]]
+ name = "objc2-app-kit"
+ version = "0.3.1"
+@@ -6751,10 +6701,10 @@ dependencies = [
+  "libc",
+  "objc2 0.6.1",
+  "objc2-cloud-kit",
+- "objc2-core-data 0.3.1",
++ "objc2-core-data",
+  "objc2-core-foundation",
+  "objc2-core-graphics",
+- "objc2-core-image 0.3.1",
++ "objc2-core-image",
+  "objc2-foundation 0.3.1",
+  "objc2-quartz-core 0.3.1",
+ ]
+@@ -6770,18 +6720,6 @@ dependencies = [
+  "objc2-foundation 0.3.1",
+ ]
+ 
+-[[package]]
+-name = "objc2-core-data"
+-version = "0.2.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "617fbf49e071c178c0b24c080767db52958f716d9eabdf0890523aeae54773ef"
+-dependencies = [
+- "bitflags 2.9.1",
+- "block2 0.5.1",
+- "objc2 0.5.2",
+- "objc2-foundation 0.2.2",
+-]
+-
+ [[package]]
+ name = "objc2-core-data"
+ version = "0.3.1"
+@@ -6817,18 +6755,6 @@ dependencies = [
+  "objc2-io-surface",
+ ]
+ 
+-[[package]]
+-name = "objc2-core-image"
+-version = "0.2.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "55260963a527c99f1819c4f8e3b47fe04f9650694ef348ffd2227e8196d34c80"
+-dependencies = [
+- "block2 0.5.1",
+- "objc2 0.5.2",
+- "objc2-foundation 0.2.2",
+- "objc2-metal",
+-]
+-
+ [[package]]
+ name = "objc2-core-image"
+ version = "0.3.1"
+@@ -6862,7 +6788,6 @@ checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
+ dependencies = [
+  "bitflags 2.9.1",
+  "block2 0.5.1",
+- "dispatch",
+  "libc",
+  "objc2 0.5.2",
+ ]
+@@ -6921,7 +6846,7 @@ checksum = "26bb88504b5a050dbba515d2414607bf5e57dd56b107bc5f0351197a3e7bdc5d"
+ dependencies = [
+  "bitflags 2.9.1",
+  "objc2 0.6.1",
+- "objc2-app-kit 0.3.1",
++ "objc2-app-kit",
+  "objc2-foundation 0.3.1",
+ ]
+ 
+@@ -6970,7 +6895,7 @@ dependencies = [
+  "bitflags 2.9.1",
+  "block2 0.6.1",
+  "objc2 0.6.1",
+- "objc2-app-kit 0.3.1",
++ "objc2-app-kit",
+  "objc2-core-foundation",
+  "objc2-foundation 0.3.1",
+ ]
+@@ -6990,6 +6915,12 @@ version = "1.21.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+ 
++[[package]]
++name = "once_cell_polyfill"
++version = "1.70.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a4895175b425cb1f87721b59f0f286c2092bd4af812243672510e1ac53e2e0ad"
++
+ [[package]]
+ name = "open"
+ version = "5.3.2"
+@@ -7004,9 +6935,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "openssl"
+-version = "0.10.72"
++version = "0.10.73"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fedfea7d58a1f73118430a55da6a286e7b044961736ce96a16a17068ea25e5da"
++checksum = "8505734d46c8ab1e19a1dce3aef597ad87dcb4c37e7188231769bd6bd51cebf8"
+ dependencies = [
+  "bitflags 2.9.1",
+  "cfg-if",
+@@ -7025,7 +6956,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -7036,18 +6967,18 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+ 
+ [[package]]
+ name = "openssl-src"
+-version = "300.5.0+3.5.0"
++version = "300.5.1+3.5.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e8ce546f549326b0e6052b649198487d91320875da901e7bd11a06d1ee3f9c2f"
++checksum = "735230c832b28c000e3bc117119e6466a663ec73506bc0a9907ea4187508e42a"
+ dependencies = [
+  "cc",
+ ]
+ 
+ [[package]]
+ name = "openssl-sys"
+-version = "0.9.108"
++version = "0.9.109"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e145e1651e858e820e4860f7b9c5e169bc1d8ce1c86043be79fa7b7634821847"
++checksum = "90096e2e47630d78b7d1c20952dc621f957103f8bc2c8359ec81290d75238571"
+ dependencies = [
+  "cc",
+  "libc",
+@@ -7074,20 +7005,21 @@ dependencies = [
+ 
+ [[package]]
+ name = "os_info"
+-version = "3.11.0"
++version = "3.12.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "41fc863e2ca13dc2d5c34fb22ea4a588248ac14db929616ba65c45f21744b1e9"
++checksum = "d0e1ac5fde8d43c34139135df8ea9ee9465394b2d8d20f032d38998f64afffc3"
+ dependencies = [
+  "log",
++ "plist",
+  "serde",
+  "windows-sys 0.52.0",
+ ]
+ 
+ [[package]]
+ name = "os_pipe"
+-version = "1.2.1"
++version = "1.2.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5ffd2b0a5634335b135d5728d84c5e0fd726954b87111f7506a61c502280d982"
++checksum = "db335f4760b14ead6290116f2427bf33a14d4f0617d49f78a246de10c1831224"
+ dependencies = [
+  "libc",
+  "windows-sys 0.59.0",
+@@ -7202,7 +7134,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+ dependencies = [
+  "fixedbitset 0.4.2",
+- "indexmap 2.9.0",
++ "indexmap 2.10.0",
+ ]
+ 
+ [[package]]
+@@ -7213,7 +7145,7 @@ checksum = "54acf3a685220b533e437e264e4d932cfbdc4cc7ec0cd232ed73c08d03b8a7ca"
+ dependencies = [
+  "fixedbitset 0.5.7",
+  "hashbrown 0.15.4",
+- "indexmap 2.9.0",
++ "indexmap 2.10.0",
+  "serde",
+ ]
+ 
+@@ -7321,7 +7253,7 @@ dependencies = [
+  "phf_shared 0.11.3",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -7368,7 +7300,7 @@ checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -7402,13 +7334,13 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+ 
+ [[package]]
+ name = "plist"
+-version = "1.7.1"
++version = "1.7.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "eac26e981c03a6e53e0aee43c113e3202f5581d5360dae7bd2c70e800dd0451d"
++checksum = "3af6b589e163c5a788fab00ce0c0366f6efbb9959c2f9874b224936af7fce7e1"
+ dependencies = [
+  "base64 0.22.1",
+- "indexmap 2.9.0",
+- "quick-xml 0.32.0",
++ "indexmap 2.10.0",
++ "quick-xml 0.38.1",
+  "serde",
+  "time",
+ ]
+@@ -7428,24 +7360,23 @@ dependencies = [
+ 
+ [[package]]
+ name = "polling"
+-version = "3.7.4"
++version = "3.10.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a604568c3202727d1507653cb121dbd627a58684eb09a820fd746bee38b4442f"
++checksum = "b5bd19146350fe804f7cb2669c851c03d69da628803dab0d98018142aaa5d829"
+ dependencies = [
+  "cfg-if",
+  "concurrent-queue",
+  "hermit-abi",
+  "pin-project-lite",
+- "rustix 0.38.44",
+- "tracing",
+- "windows-sys 0.59.0",
++ "rustix 1.0.8",
++ "windows-sys 0.60.2",
+ ]
+ 
+ [[package]]
+ name = "portable-atomic"
+-version = "1.11.0"
++version = "1.11.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "350e9b48cbc6b0e028b0473b114454c6316e57336ee184ceab6e53f72c178b3e"
++checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+ 
+ [[package]]
+ name = "portable-atomic-util"
+@@ -7563,7 +7494,7 @@ version = "3.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "edce586971a4dfaa28950c6f18ed55e0406c1ab88bbce2c6f6293a7aaba73d35"
+ dependencies = [
+- "toml_edit 0.22.26",
++ "toml_edit 0.22.27",
+ ]
+ 
+ [[package]]
+@@ -7644,7 +7575,7 @@ dependencies = [
+  "itertools",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -7694,18 +7625,18 @@ dependencies = [
+ 
+ [[package]]
+ name = "quick-xml"
+-version = "0.32.0"
++version = "0.37.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1d3a6e5838b60e0e8fa7a43f22ade549a37d61f8bdbe636d0d7816191de969c2"
++checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
+ dependencies = [
+  "memchr",
+ ]
+ 
+ [[package]]
+ name = "quick-xml"
+-version = "0.37.5"
++version = "0.38.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb"
++checksum = "9845d9dccf565065824e69f9f235fafba1587031eda353c1f1561cd6a6be78f4"
+ dependencies = [
+  "memchr",
+ ]
+@@ -7722,8 +7653,8 @@ dependencies = [
+  "quinn-proto",
+  "quinn-udp",
+  "rustc-hash",
+- "rustls 0.23.27",
+- "socket2 0.5.9",
++ "rustls 0.23.31",
++ "socket2 0.5.10",
+  "thiserror 2.0.12",
+  "tokio",
+  "tracing",
+@@ -7742,7 +7673,7 @@ dependencies = [
+  "rand 0.9.2",
+  "ring",
+  "rustc-hash",
+- "rustls 0.23.27",
++ "rustls 0.23.31",
+  "rustls-pki-types",
+  "slab",
+  "thiserror 2.0.12",
+@@ -7753,14 +7684,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "quinn-udp"
+-version = "0.5.12"
++version = "0.5.13"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ee4e529991f949c5e25755532370b8af5d114acae52326361d68d47af64aa842"
++checksum = "fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970"
+ dependencies = [
+  "cfg_aliases",
+  "libc",
+  "once_cell",
+- "socket2 0.5.9",
++ "socket2 0.5.10",
+  "tracing",
+  "windows-sys 0.59.0",
+ ]
+@@ -7776,9 +7707,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "r-efi"
+-version = "5.2.0"
++version = "5.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
++checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+ 
+ [[package]]
+ name = "radium"
+@@ -7904,9 +7835,9 @@ checksum = "20675572f6f24e9e76ef639bc5552774ed45f1c30e2951e1e99c59888861c539"
+ 
+ [[package]]
+ name = "redox_syscall"
+-version = "0.5.12"
++version = "0.5.17"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "928fca9cf2aa042393a8325b9ead81d2f0df4cb12e1e24cef072922ccd99c5af"
++checksum = "5407465600fb0548f1442edf71dd20683c6ed326200ace4b1ef0763521bb3b77"
+ dependencies = [
+  "bitflags 2.9.1",
+ ]
+@@ -7924,9 +7855,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "redox_users"
+-version = "0.5.0"
++version = "0.5.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "dd6f9d3d47bdd2ad6945c5015a226ec6155d0bcdfd8f7cd29f86b71f8de99d2b"
++checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac"
+ dependencies = [
+  "getrandom 0.2.16",
+  "libredox",
+@@ -7950,7 +7881,7 @@ checksum = "1165225c21bff1f3bbce98f5a1f889949bc902d3575308cc7b0de30b4f6d27c7"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -8023,7 +7954,7 @@ dependencies = [
+  "encoding_rs",
+  "futures-core",
+  "futures-util",
+- "h2 0.3.26",
++ "h2 0.3.27",
+  "http 0.2.12",
+  "http-body 0.4.6",
+  "hyper 0.14.32",
+@@ -8066,12 +7997,12 @@ dependencies = [
+  "encoding_rs",
+  "futures-core",
+  "futures-util",
+- "h2 0.4.10",
++ "h2 0.4.12",
+  "http 1.3.1",
+  "http-body 1.0.1",
+  "http-body-util",
+  "hyper 1.6.0",
+- "hyper-rustls 0.27.5",
++ "hyper-rustls 0.27.7",
+  "hyper-tls",
+  "hyper-util",
+  "js-sys",
+@@ -8082,7 +8013,7 @@ dependencies = [
+  "percent-encoding",
+  "pin-project-lite",
+  "quinn",
+- "rustls 0.23.27",
++ "rustls 0.23.31",
+  "rustls-native-certs",
+  "rustls-pki-types",
+  "serde",
+@@ -8101,7 +8032,7 @@ dependencies = [
+  "wasm-bindgen-futures",
+  "wasm-streams",
+  "web-sys",
+- "webpki-roots 1.0.0",
++ "webpki-roots 1.0.2",
+ ]
+ 
+ [[package]]
+@@ -8131,25 +8062,27 @@ dependencies = [
+ 
+ [[package]]
+ name = "rfd"
+-version = "0.15.0"
++version = "0.15.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8af382a047821a08aa6bfc09ab0d80ff48d45d8726f7cd8e44891f7cb4a4278e"
++checksum = "ef2bee61e6cffa4635c72d7d81a84294e28f0930db0ddcb0f66d10244674ebed"
+ dependencies = [
+  "ashpd",
+- "block2 0.5.1",
++ "block2 0.6.1",
++ "dispatch2",
+  "glib-sys",
+  "gobject-sys",
+  "gtk-sys",
+  "js-sys",
+  "log",
+- "objc2 0.5.2",
+- "objc2-app-kit 0.2.2",
+- "objc2-foundation 0.2.2",
++ "objc2 0.6.1",
++ "objc2-app-kit",
++ "objc2-core-foundation",
++ "objc2-foundation 0.3.1",
+  "raw-window-handle",
+  "wasm-bindgen",
+  "wasm-bindgen-futures",
+  "web-sys",
+- "windows-sys 0.48.0",
++ "windows-sys 0.59.0",
+ ]
+ 
+ [[package]]
+@@ -8224,7 +8157,7 @@ checksum = "a6e2b2fd7497540489fa2db285edd43b7ed14c49157157438664278da6e42a7a"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -8253,15 +8186,15 @@ dependencies = [
+  "regex",
+  "relative-path",
+  "rustc_version",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "unicode-ident",
+ ]
+ 
+ [[package]]
+ name = "rust_decimal"
+-version = "1.37.1"
++version = "1.37.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "faa7de2ba56ac291bd90c6b9bece784a52ae1411f9506544b3eae36dd2356d50"
++checksum = "b203a6425500a03e0919c42d3c47caca51e79f1132046626d2c8871c5092035d"
+ dependencies = [
+  "arrayvec",
+  "borsh",
+@@ -8275,9 +8208,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "rustc-demangle"
+-version = "0.1.24"
++version = "0.1.26"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
++checksum = "56f7d92ca342cea22a06f2121d944b4fd82af56988c270852495420f961d4ace"
+ 
+ [[package]]
+ name = "rustc-hash"
+@@ -8334,14 +8267,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "rustls"
+-version = "0.23.27"
++version = "0.23.31"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "730944ca083c1c233a75c09f199e973ca499344a2b7ba9e755c457e86fb4a321"
++checksum = "c0ebcbd2f03de0fc1122ad9bb24b127a5a6cd51d72604a3f3c50ac459762b6cc"
+ dependencies = [
+  "once_cell",
+  "ring",
+  "rustls-pki-types",
+- "rustls-webpki 0.103.3",
++ "rustls-webpki 0.103.4",
+  "subtle",
+  "zeroize",
+ ]
+@@ -8355,7 +8288,7 @@ dependencies = [
+  "openssl-probe",
+  "rustls-pki-types",
+  "schannel",
+- "security-framework 3.2.0",
++ "security-framework 3.3.0",
+ ]
+ 
+ [[package]]
+@@ -8389,9 +8322,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "rustls-webpki"
+-version = "0.103.3"
++version = "0.103.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e4a72fe2bcf7a6ac6fd7d0b9e5cb68aeb7d4c0a0271730218b3e92d43b4eb435"
++checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
+ dependencies = [
+  "ring",
+  "rustls-pki-types",
+@@ -8400,9 +8333,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "rustversion"
+-version = "1.0.20"
++version = "1.0.21"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
++checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
+ 
+ [[package]]
+ name = "ryu"
+@@ -8465,6 +8398,18 @@ dependencies = [
+  "serde_json",
+ ]
+ 
++[[package]]
++name = "schemars"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "82d20c4491bc164fa2f6c5d44565947a52ad80b9505d8e36f8d54c27c739fcd0"
++dependencies = [
++ "dyn-clone",
++ "ref-cast",
++ "serde",
++ "serde_json",
++]
++
+ [[package]]
+ name = "schemars_derive"
+ version = "0.8.22"
+@@ -8474,7 +8419,7 @@ dependencies = [
+  "proc-macro2",
+  "quote",
+  "serde_derive_internals",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -8486,7 +8431,7 @@ dependencies = [
+  "proc-macro2",
+  "quote",
+  "serde_derive_internals",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -8513,9 +8458,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "sdd"
+-version = "3.0.8"
++version = "3.0.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "584e070911c7017da6cb2eb0788d09f43d789029b5877d3e5ecc8acf86ceee21"
++checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca"
+ 
+ [[package]]
+ name = "seahash"
+@@ -8567,12 +8512,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "security-framework"
+-version = "3.2.0"
++version = "3.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "271720403f46ca04f7ba6f55d438f8bd878d6b8ca0a1046e8228c4145bcbb316"
++checksum = "80fb1d92c5028aa318b4b8bd7302a5bfcf48be96a37fc6fc790f806b0004ee0c"
+ dependencies = [
+  "bitflags 2.9.1",
+- "core-foundation 0.10.0",
++ "core-foundation 0.10.1",
+  "core-foundation-sys",
+  "libc",
+  "security-framework-sys",
+@@ -8652,7 +8597,7 @@ checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -8663,7 +8608,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -8718,14 +8663,23 @@ checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
++]
++
++[[package]]
++name = "serde_spanned"
++version = "0.6.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bf41e0cfaf7226dca15e8197172c295a782857fcb97fad1808a166870dee75a3"
++dependencies = [
++ "serde",
+ ]
+ 
+ [[package]]
+ name = "serde_spanned"
+-version = "0.6.8"
++version = "1.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
++checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
+ dependencies = [
+  "serde",
+ ]
+@@ -8744,15 +8698,17 @@ dependencies = [
+ 
+ [[package]]
+ name = "serde_with"
+-version = "3.12.0"
++version = "3.14.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d6b6f7f2fcb69f747921f79f3926bd1e203fce4fef62c268dd3abfb6d86029aa"
++checksum = "f2c45cd61fefa9db6f254525d46e392b852e0e61d9a1fd36e5bd183450a556d5"
+ dependencies = [
+  "base64 0.22.1",
+  "chrono",
+  "hex",
+  "indexmap 1.9.3",
+- "indexmap 2.9.0",
++ "indexmap 2.10.0",
++ "schemars 0.9.0",
++ "schemars 1.0.4",
+  "serde",
+  "serde_derive",
+  "serde_json",
+@@ -8762,14 +8718,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "serde_with_macros"
+-version = "3.12.0"
++version = "3.14.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8d00caa5193a3c8362ac2b73be6b9e768aa5a4b2f721d8f4b339600c3cb51f8e"
++checksum = "de90945e6565ce0d9a25098082ed4ee4002e047cb59892c318d66821e14bb30f"
+ dependencies = [
+  "darling",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -8794,7 +8750,7 @@ checksum = "5d69265a08751de7844521fd15003ae0a888e035773ba05695c5c759a6f89eef"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -8872,12 +8828,13 @@ dependencies = [
+ 
+ [[package]]
+ name = "shared_child"
+-version = "1.0.2"
++version = "1.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7e297bd52991bbe0686c086957bee142f13df85d1e79b0b21630a99d374ae9dc"
++checksum = "1e362d9935bc50f019969e2f9ecd66786612daae13e8f277be7bfb66e8bed3f7"
+ dependencies = [
+  "libc",
+- "windows-sys 0.59.0",
++ "sigchld",
++ "windows-sys 0.60.2",
+ ]
+ 
+ [[package]]
+@@ -8901,6 +8858,17 @@ version = "1.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+ 
++[[package]]
++name = "sigchld"
++version = "0.2.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "47106eded3c154e70176fc83df9737335c94ce22f821c32d17ed1db1f83badb1"
++dependencies = [
++ "libc",
++ "os_pipe",
++ "signal-hook",
++]
++
+ [[package]]
+ name = "signal-hook"
+ version = "0.3.18"
+@@ -8913,9 +8881,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "signal-hook-registry"
+-version = "1.4.5"
++version = "1.4.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9203b8055f63a2a00e2f593bb0510367fe707d7ff1e5c872de2f537b339e5410"
++checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
+ dependencies = [
+  "libc",
+ ]
+@@ -8952,12 +8920,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+ 
+ [[package]]
+ name = "slab"
+-version = "0.4.9"
++version = "0.4.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+-dependencies = [
+- "autocfg",
+-]
++checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
+ 
+ [[package]]
+ name = "smallvec"
+@@ -8970,9 +8935,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "socket2"
+-version = "0.5.9"
++version = "0.5.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4f5fd57c80058a56cf5c777ab8a126398ece8e442983605d280a44ce79d0edef"
++checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
+ dependencies = [
+  "libc",
+  "windows-sys 0.52.0",
+@@ -9099,15 +9064,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "strum_macros"
+-version = "0.27.1"
++version = "0.27.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c77a8c5abcaf0f9ce05d62342b7d298c346515365c36b673df4ebe3ced01fde8"
++checksum = "7695ce3845ea4b33927c055a39dc438a45b059f7c1b3d91d38d10355fb8cbca7"
+ dependencies = [
+  "heck 0.5.0",
+  "proc-macro2",
+  "quote",
+- "rustversion",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -9140,9 +9104,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "syn"
+-version = "2.0.101"
++version = "2.0.104"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
++checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -9172,7 +9136,7 @@ checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -9186,9 +9150,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "sysinfo"
+-version = "0.36.0"
++version = "0.36.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "aab138f5c1bb35231de19049060a87977ad23e04f2303e953bc5c2947ac7dec4"
++checksum = "252800745060e7b9ffb7b2badbd8b31cfa4aa2e61af879d0a3bf2a317c20217d"
+ dependencies = [
+  "libc",
+  "memchr",
+@@ -9249,7 +9213,7 @@ dependencies = [
+  "cfg-expr",
+  "heck 0.5.0",
+  "pkg-config",
+- "toml",
++ "toml 0.8.23",
+  "version-compare",
+ ]
+ 
+@@ -9260,7 +9224,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "49c380ca75a231b87b6c9dd86948f035012e7171d1a7c40a9c2890489a7ffd8a"
+ dependencies = [
+  "bitflags 2.9.1",
+- "core-foundation 0.10.0",
++ "core-foundation 0.10.1",
+  "core-graphics",
+  "crossbeam-channel",
+  "dispatch",
+@@ -9277,7 +9241,7 @@ dependencies = [
+  "ndk-context",
+  "ndk-sys",
+  "objc2 0.6.1",
+- "objc2-app-kit 0.3.1",
++ "objc2-app-kit",
+  "objc2-foundation 0.3.1",
+  "once_cell",
+  "parking_lot",
+@@ -9300,7 +9264,7 @@ checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -9348,7 +9312,7 @@ dependencies = [
+  "mime",
+  "muda",
+  "objc2 0.6.1",
+- "objc2-app-kit 0.3.1",
++ "objc2-app-kit",
+  "objc2-foundation 0.3.1",
+  "objc2-ui-kit",
+  "percent-encoding",
+@@ -9394,7 +9358,7 @@ dependencies = [
+  "serde_json",
+  "tauri-utils",
+  "tauri-winres",
+- "toml",
++ "toml 0.8.23",
+  "walkdir",
+ ]
+ 
+@@ -9416,7 +9380,7 @@ dependencies = [
+  "serde",
+  "serde_json",
+  "sha2",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "tauri-utils",
+  "thiserror 2.0.12",
+  "time",
+@@ -9434,16 +9398,16 @@ dependencies = [
+  "heck 0.5.0",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "tauri-codegen",
+  "tauri-utils",
+ ]
+ 
+ [[package]]
+ name = "tauri-plugin"
+-version = "2.3.0"
++version = "2.3.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1d9a0bd00bf1930ad1a604d08b0eb6b2a9c1822686d65d7f4731a7723b8901d3"
++checksum = "5bd5c1e56990c70a906ef67a9851bbdba9136d26075ee9a2b19c8b46986b3e02"
+ dependencies = [
+  "anyhow",
+  "glob",
+@@ -9452,7 +9416,7 @@ dependencies = [
+  "serde",
+  "serde_json",
+  "tauri-utils",
+- "toml",
++ "toml 0.8.23",
+  "walkdir",
+ ]
+ 
+@@ -9473,9 +9437,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "tauri-plugin-dialog"
+-version = "2.3.0"
++version = "2.3.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1aefb14219b492afb30b12647b5b1247cadd2c0603467310c36e0f7ae1698c28"
++checksum = "37e5858cc7b455a73ab4ea2ebc08b5be33682c00ff1bf4cad5537d4fb62499d9"
+ dependencies = [
+  "log",
+  "raw-window-handle",
+@@ -9507,7 +9471,7 @@ dependencies = [
+  "tauri-plugin",
+  "tauri-utils",
+  "thiserror 2.0.12",
+- "toml",
++ "toml 0.8.23",
+  "url",
+ ]
+ 
+@@ -9677,7 +9641,7 @@ dependencies = [
+  "tokio",
+  "url",
+  "windows-sys 0.60.2",
+- "zip 4.2.0",
++ "zip 4.3.0",
+ ]
+ 
+ [[package]]
+@@ -9728,7 +9692,7 @@ dependencies = [
+  "jni",
+  "log",
+  "objc2 0.6.1",
+- "objc2-app-kit 0.3.1",
++ "objc2-app-kit",
+  "objc2-foundation 0.3.1",
+  "once_cell",
+  "percent-encoding",
+@@ -9775,7 +9739,7 @@ dependencies = [
+  "serde_with",
+  "swift-rs",
+  "thiserror 2.0.12",
+- "toml",
++ "toml 0.8.23",
+  "url",
+  "urlpattern",
+  "uuid",
+@@ -9784,13 +9748,13 @@ dependencies = [
+ 
+ [[package]]
+ name = "tauri-winres"
+-version = "0.3.1"
++version = "0.3.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e8d321dbc6f998d825ab3f0d62673e810c861aac2d0de2cc2c395328f1d113b4"
++checksum = "7c6d9028d41d4de835e3c482c677a8cb88137ac435d6ff9a71f392d4421576c9"
+ dependencies = [
+  "embed-resource",
+- "indexmap 2.9.0",
+- "toml",
++ "indexmap 2.10.0",
++ "toml 0.9.5",
+ ]
+ 
+ [[package]]
+@@ -9849,7 +9813,7 @@ checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -9860,17 +9824,16 @@ checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+ name = "thread_local"
+-version = "1.1.8"
++version = "1.1.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
++checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185"
+ dependencies = [
+  "cfg-if",
+- "once_cell",
+ ]
+ 
+ [[package]]
+@@ -9971,7 +9934,7 @@ checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -10000,7 +9963,7 @@ version = "0.26.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+ dependencies = [
+- "rustls 0.23.27",
++ "rustls 0.23.31",
+  "tokio",
+ ]
+ 
+@@ -10042,21 +10005,45 @@ dependencies = [
+ 
+ [[package]]
+ name = "toml"
+-version = "0.8.22"
++version = "0.8.23"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae"
++checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362"
+ dependencies = [
+  "serde",
+- "serde_spanned",
+- "toml_datetime",
+- "toml_edit 0.22.26",
++ "serde_spanned 0.6.9",
++ "toml_datetime 0.6.11",
++ "toml_edit 0.22.27",
++]
++
++[[package]]
++name = "toml"
++version = "0.9.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8"
++dependencies = [
++ "indexmap 2.10.0",
++ "serde",
++ "serde_spanned 1.0.0",
++ "toml_datetime 0.7.0",
++ "toml_parser",
++ "toml_writer",
++ "winnow 0.7.12",
+ ]
+ 
+ [[package]]
+ name = "toml_datetime"
+-version = "0.6.9"
++version = "0.6.11"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
++dependencies = [
++ "serde",
++]
++
++[[package]]
++name = "toml_datetime"
++version = "0.7.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3da5db5a963e24bc68be8b17b6fa82814bb22ee8660f192bb182771d498f09a3"
++checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
+ dependencies = [
+  "serde",
+ ]
+@@ -10067,8 +10054,8 @@ version = "0.19.15"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+ dependencies = [
+- "indexmap 2.9.0",
+- "toml_datetime",
++ "indexmap 2.10.0",
++ "toml_datetime 0.6.11",
+  "winnow 0.5.40",
+ ]
+ 
+@@ -10078,30 +10065,45 @@ version = "0.20.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
+ dependencies = [
+- "indexmap 2.9.0",
+- "toml_datetime",
++ "indexmap 2.10.0",
++ "toml_datetime 0.6.11",
+  "winnow 0.5.40",
+ ]
+ 
+ [[package]]
+ name = "toml_edit"
+-version = "0.22.26"
++version = "0.22.27"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
++checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a"
+ dependencies = [
+- "indexmap 2.9.0",
++ "indexmap 2.10.0",
+  "serde",
+- "serde_spanned",
+- "toml_datetime",
++ "serde_spanned 0.6.9",
++ "toml_datetime 0.6.11",
+  "toml_write",
+  "winnow 0.7.12",
+ ]
+ 
++[[package]]
++name = "toml_parser"
++version = "1.0.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10"
++dependencies = [
++ "winnow 0.7.12",
++]
++
+ [[package]]
+ name = "toml_write"
+-version = "0.1.1"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801"
++
++[[package]]
++name = "toml_writer"
++version = "1.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076"
++checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
+ 
+ [[package]]
+ name = "tonic"
+@@ -10114,7 +10116,7 @@ dependencies = [
+  "axum 0.7.9",
+  "base64 0.22.1",
+  "bytes",
+- "h2 0.4.10",
++ "h2 0.4.12",
+  "http 1.3.1",
+  "http-body 1.0.1",
+  "http-body-util",
+@@ -10124,7 +10126,7 @@ dependencies = [
+  "percent-encoding",
+  "pin-project",
+  "prost",
+- "socket2 0.5.9",
++ "socket2 0.5.10",
+  "tokio",
+  "tokio-stream",
+  "tower 0.4.13",
+@@ -10225,13 +10227,13 @@ dependencies = [
+ 
+ [[package]]
+ name = "tracing-attributes"
+-version = "0.1.28"
++version = "0.1.30"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "395ae124c09f9e6918a2310af6038fba074bcf474ac352496d5910dd59a2226d"
++checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -10287,16 +10289,16 @@ dependencies = [
+ 
+ [[package]]
+ name = "tray-icon"
+-version = "0.21.0"
++version = "0.21.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2da75ec677957aa21f6e0b361df0daab972f13a5bee3606de0638fd4ee1c666a"
++checksum = "a0d92153331e7d02ec09137538996a7786fe679c629c279e82a6be762b7e6fe2"
+ dependencies = [
+  "crossbeam-channel",
+  "dirs 6.0.0",
+  "libappindicator",
+  "muda",
+  "objc2 0.6.1",
+- "objc2-app-kit 0.3.1",
++ "objc2-app-kit",
+  "objc2-core-foundation",
+  "objc2-core-graphics",
+  "objc2-foundation 0.3.1",
+@@ -10602,9 +10604,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+ 
+ [[package]]
+ name = "wasi"
+-version = "0.11.0+wasi-snapshot-preview1"
++version = "0.11.1+wasi-snapshot-preview1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
++checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+ 
+ [[package]]
+ name = "wasi"
+@@ -10637,7 +10639,7 @@ dependencies = [
+  "log",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "wasm-bindgen-shared",
+ ]
+ 
+@@ -10672,7 +10674,7 @@ checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "wasm-bindgen-backend",
+  "wasm-bindgen-shared",
+ ]
+@@ -10701,13 +10703,13 @@ dependencies = [
+ 
+ [[package]]
+ name = "wayland-backend"
+-version = "0.3.10"
++version = "0.3.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "fe770181423e5fc79d3e2a7f4410b7799d5aab1de4372853de3c6aa13ca24121"
++checksum = "673a33c33048a5ade91a6b139580fa174e19fb0d23f396dca9fa15f2e1e49b35"
+ dependencies = [
+  "cc",
+  "downcast-rs",
+- "rustix 0.38.44",
++ "rustix 1.0.8",
+  "scoped-tls",
+  "smallvec",
+  "wayland-sys",
+@@ -10715,21 +10717,21 @@ dependencies = [
+ 
+ [[package]]
+ name = "wayland-client"
+-version = "0.31.10"
++version = "0.31.11"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "978fa7c67b0847dbd6a9f350ca2569174974cd4082737054dbb7fbb79d7d9a61"
++checksum = "c66a47e840dc20793f2264eb4b3e4ecb4b75d91c0dd4af04b456128e0bdd449d"
+ dependencies = [
+  "bitflags 2.9.1",
+- "rustix 0.38.44",
++ "rustix 1.0.8",
+  "wayland-backend",
+  "wayland-scanner",
+ ]
+ 
+ [[package]]
+ name = "wayland-protocols"
+-version = "0.32.8"
++version = "0.32.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "779075454e1e9a521794fed15886323ea0feda3f8b0fc1390f5398141310422a"
++checksum = "efa790ed75fbfd71283bd2521a1cfdc022aabcc28bdcff00851f9e4ae88d9901"
+ dependencies = [
+  "bitflags 2.9.1",
+  "wayland-backend",
+@@ -10739,9 +10741,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wayland-protocols-wlr"
+-version = "0.3.8"
++version = "0.3.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1cb6cdc73399c0e06504c437fe3cf886f25568dd5454473d565085b36d6a8bbf"
++checksum = "efd94963ed43cf9938a090ca4f7da58eb55325ec8200c3848963e98dc25b78ec"
+ dependencies = [
+  "bitflags 2.9.1",
+  "wayland-backend",
+@@ -10752,9 +10754,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wayland-scanner"
+-version = "0.31.6"
++version = "0.31.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "896fdafd5d28145fce7958917d69f2fd44469b1d4e861cb5961bcbeebc6d1484"
++checksum = "54cb1e9dc49da91950bdfd8b848c49330536d9d1fb03d4bfec8cae50caa50ae3"
+ dependencies = [
+  "proc-macro2",
+  "quick-xml 0.37.5",
+@@ -10763,9 +10765,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wayland-sys"
+-version = "0.31.6"
++version = "0.31.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "dbcebb399c77d5aa9fa5db874806ee7b4eba4e73650948e8f93963f128896615"
++checksum = "34949b42822155826b41db8e5d0c1be3a2bd296c747577a43a3e6daefc296142"
+ dependencies = [
+  "dlib",
+  "log",
+@@ -10844,18 +10846,9 @@ checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
+ 
+ [[package]]
+ name = "webpki-roots"
+-version = "0.26.11"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
+-dependencies = [
+- "webpki-roots 1.0.0",
+-]
+-
+-[[package]]
+-name = "webpki-roots"
+-version = "1.0.0"
++version = "1.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2853738d1cc4f2da3a225c18ec6c3721abb31961096e9dbf5ab35fa88b19cfdb"
++checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2"
+ dependencies = [
+  "rustls-pki-types",
+ ]
+@@ -10882,7 +10875,7 @@ checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -10898,9 +10891,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "weezl"
+-version = "0.1.8"
++version = "0.1.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
++checksum = "a751b3277700db47d3e574514de2eced5e54dc8a5436a3bf7a0b248b2cee16f3"
+ 
+ [[package]]
+ name = "winapi"
+@@ -10940,7 +10933,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c"
+ dependencies = [
+  "objc2 0.6.1",
+- "objc2-app-kit 0.3.1",
++ "objc2-app-kit",
+  "objc2-core-foundation",
+  "objc2-foundation 0.3.1",
+  "raw-window-handle",
+@@ -10980,7 +10973,7 @@ dependencies = [
+  "windows-interface",
+  "windows-link",
+  "windows-result",
+- "windows-strings 0.4.2",
++ "windows-strings",
+ ]
+ 
+ [[package]]
+@@ -11002,7 +10995,7 @@ checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -11013,7 +11006,7 @@ checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -11034,13 +11027,13 @@ dependencies = [
+ 
+ [[package]]
+ name = "windows-registry"
+-version = "0.4.0"
++version = "0.5.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4286ad90ddb45071efd1a66dfa43eb02dd0dfbae1545ad6cc3c51cf34d7e8ba3"
++checksum = "5b8a9ed28765efc97bbc954883f4e6796c33a06546ebafacbabee9696967499e"
+ dependencies = [
++ "windows-link",
+  "windows-result",
+- "windows-strings 0.3.1",
+- "windows-targets 0.53.2",
++ "windows-strings",
+ ]
+ 
+ [[package]]
+@@ -11052,15 +11045,6 @@ dependencies = [
+  "windows-link",
+ ]
+ 
+-[[package]]
+-name = "windows-strings"
+-version = "0.3.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
+-dependencies = [
+- "windows-link",
+-]
+-
+ [[package]]
+ name = "windows-strings"
+ version = "0.4.2"
+@@ -11112,7 +11096,7 @@ version = "0.60.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+ dependencies = [
+- "windows-targets 0.53.2",
++ "windows-targets 0.53.3",
+ ]
+ 
+ [[package]]
+@@ -11163,10 +11147,11 @@ dependencies = [
+ 
+ [[package]]
+ name = "windows-targets"
+-version = "0.53.2"
++version = "0.53.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
++checksum = "d5fe6031c4041849d7c496a8ded650796e7b6ecc19df1a431c1a363342e5dc91"
+ dependencies = [
++ "windows-link",
+  "windows_aarch64_gnullvm 0.53.0",
+  "windows_aarch64_msvc 0.53.0",
+  "windows_i686_gnu 0.53.0",
+@@ -11405,12 +11390,12 @@ dependencies = [
+ 
+ [[package]]
+ name = "winreg"
+-version = "0.52.0"
++version = "0.55.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
++checksum = "cb5a765337c50e9ec252c2069be9bf91c7df47afb103b642ba3a53bf8101be97"
+ dependencies = [
+  "cfg-if",
+- "windows-sys 0.48.0",
++ "windows-sys 0.59.0",
+ ]
+ 
+ [[package]]
+@@ -11469,7 +11454,7 @@ dependencies = [
+  "libc",
+  "ndk",
+  "objc2 0.6.1",
+- "objc2-app-kit 0.3.1",
++ "objc2-app-kit",
+  "objc2-core-foundation",
+  "objc2-foundation 0.3.1",
+  "objc2-ui-kit",
+@@ -11540,9 +11525,9 @@ checksum = "ec107c4503ea0b4a98ef47356329af139c0a4f7750e621cf2973cd3385ebcb3d"
+ 
+ [[package]]
+ name = "xattr"
+-version = "1.5.0"
++version = "1.5.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0d65cbf2f12c15564212d48f4e3dfb87923d25d611f2aed18f4cb23f0413d89e"
++checksum = "af3a19837351dc82ba89f8a125e22a3c475f05aba604acc023d62b2739ae2909"
+ dependencies = [
+  "libc",
+  "rustix 1.0.8",
+@@ -11593,7 +11578,7 @@ checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "synstructure",
+ ]
+ 
+@@ -11620,7 +11605,6 @@ dependencies = [
+  "serde_repr",
+  "sha1",
+  "static_assertions",
+- "tokio",
+  "tracing",
+  "uds_windows",
+  "windows-sys 0.52.0",
+@@ -11654,13 +11638,14 @@ dependencies = [
+  "ordered-stream",
+  "serde",
+  "serde_repr",
++ "tokio",
+  "tracing",
+  "uds_windows",
+  "windows-sys 0.59.0",
+  "winnow 0.7.12",
+  "zbus_macros 5.9.0",
+  "zbus_names 4.2.0",
+- "zvariant 5.5.3",
++ "zvariant 5.6.0",
+ ]
+ 
+ [[package]]
+@@ -11672,7 +11657,7 @@ dependencies = [
+  "proc-macro-crate 3.3.0",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "zvariant_utils 2.1.0",
+ ]
+ 
+@@ -11685,9 +11670,9 @@ dependencies = [
+  "proc-macro-crate 3.3.0",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "zbus_names 4.2.0",
+- "zvariant 5.5.3",
++ "zvariant 5.6.0",
+  "zvariant_utils 3.2.0",
+ ]
+ 
+@@ -11711,27 +11696,27 @@ dependencies = [
+  "serde",
+  "static_assertions",
+  "winnow 0.7.12",
+- "zvariant 5.5.3",
++ "zvariant 5.6.0",
+ ]
+ 
+ [[package]]
+ name = "zerocopy"
+-version = "0.8.25"
++version = "0.8.26"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a1702d9583232ddb9174e01bb7c15a2ab8fb1bc6f227aa1233858c351a3ba0cb"
++checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
+ dependencies = [
+  "zerocopy-derive",
+ ]
+ 
+ [[package]]
+ name = "zerocopy-derive"
+-version = "0.8.25"
++version = "0.8.26"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "28a6e20d751156648aa063f3800b706ee209a32c0b4d9f24be3d980b01be55ef"
++checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -11751,7 +11736,7 @@ checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "synstructure",
+ ]
+ 
+@@ -11772,7 +11757,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -11788,9 +11773,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "zerovec"
+-version = "0.11.2"
++version = "0.11.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
++checksum = "e7aa2bd55086f1ab526693ecbe444205da57e25f4489879da80635a46d90e73b"
+ dependencies = [
+  "yoke",
+  "zerofrom",
+@@ -11805,7 +11790,7 @@ checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -11825,7 +11810,7 @@ dependencies = [
+  "flate2",
+  "getrandom 0.3.3",
+  "hmac",
+- "indexmap 2.9.0",
++ "indexmap 2.10.0",
+  "lzma-rs",
+  "memchr",
+  "pbkdf2",
+@@ -11840,21 +11825,21 @@ dependencies = [
+ 
+ [[package]]
+ name = "zip"
+-version = "4.2.0"
++version = "4.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "95ab361742de920c5535880f89bbd611ee62002bf11341d16a5f057bb8ba6899"
++checksum = "9aed4ac33e8eb078c89e6cbb1d5c4c7703ec6d299fc3e7c3695af8f8b423468b"
+ dependencies = [
+  "arbitrary",
+  "crc32fast",
+- "indexmap 2.9.0",
++ "indexmap 2.10.0",
+  "memchr",
+ ]
+ 
+ [[package]]
+ name = "zlib-rs"
+-version = "0.5.0"
++version = "0.5.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "868b928d7949e09af2f6086dfc1e01936064cc7a819253bce650d4e2a2d63ba8"
++checksum = "626bd9fa9734751fc50d6060752170984d7053f5a39061f524cda68023d4db8a"
+ 
+ [[package]]
+ name = "zopfli"
+@@ -11906,21 +11891,21 @@ dependencies = [
+  "enumflags2",
+  "serde",
+  "static_assertions",
+- "url",
+  "zvariant_derive 4.2.0",
+ ]
+ 
+ [[package]]
+ name = "zvariant"
+-version = "5.5.3"
++version = "5.6.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9d30786f75e393ee63a21de4f9074d4c038d52c5b1bb4471f955db249f9dffb1"
++checksum = "d91b3680bb339216abd84714172b5138a4edac677e641ef17e1d8cb1b3ca6e6f"
+ dependencies = [
+  "endi",
+  "enumflags2",
+  "serde",
++ "url",
+  "winnow 0.7.12",
+- "zvariant_derive 5.5.3",
++ "zvariant_derive 5.6.0",
+  "zvariant_utils 3.2.0",
+ ]
+ 
+@@ -11933,20 +11918,20 @@ dependencies = [
+  "proc-macro-crate 3.3.0",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "zvariant_utils 2.1.0",
+ ]
+ 
+ [[package]]
+ name = "zvariant_derive"
+-version = "5.5.3"
++version = "5.6.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "75fda702cd42d735ccd48117b1630432219c0e9616bf6cb0f8350844ee4d9580"
++checksum = "3a8c68501be459a8dbfffbe5d792acdd23b4959940fc87785fb013b32edbc208"
+ dependencies = [
+  "proc-macro-crate 3.3.0",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "zvariant_utils 3.2.0",
+ ]
+ 
+@@ -11958,7 +11943,7 @@ checksum = "c51bcff7cc3dbb5055396bcf774748c3dab426b4b8659046963523cee4808340"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.101",
++ "syn 2.0.104",
+ ]
+ 
+ [[package]]
+@@ -11971,6 +11956,6 @@ dependencies = [
+  "quote",
+  "serde",
+  "static_assertions",
+- "syn 2.0.101",
++ "syn 2.0.104",
+  "winnow 0.7.12",
+ ]
+diff --git a/Cargo.toml b/Cargo.toml
+index c560a9b64..718574be8 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -5,7 +5,7 @@ resolver = "2"
+ [workspace.dependencies]
+ bstr = "1.11.1"
+ # Add the `tracing` or `tracing-detail` features to see more of gitoxide in the logs. Useful to see which programs it invokes.
+-gix = { version = "0.73.0", git = "https://github.com/GitoxideLabs/gitoxide", branch = "main", default-features = false, features = [
++gix = { version = "0.73.0", default-features = false, features = [
+ ] }
+ gix-testtools = "0.16.1"
+ insta = "1.43.1"
diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix
index c68297840174..5196791667fa 100644
--- a/pkgs/by-name/gi/gitbutler/package.nix
+++ b/pkgs/by-name/gi/gitbutler/package.nix
@@ -17,7 +17,7 @@
   nodejs,
   openssl,
   pkg-config,
-  pnpm_9,
+  pnpm_10,
   rust,
   rustPlatform,
   turbo,
@@ -27,6 +27,7 @@
 }:
 
 let
+  pnpm = pnpm_10;
   excludeSpec = spec: [
     "--exclude"
     spec
@@ -35,15 +36,18 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "gitbutler";
-  version = "0.14.19";
+  version = "0.15.10";
 
   src = fetchFromGitHub {
     owner = "gitbutlerapp";
     repo = "gitbutler";
     tag = "release/${version}";
-    hash = "sha256-NopuZbgF2jdwuf/p/JzubS0IM5xBnlkh9Tj234auBnE=";
+    hash = "sha256-6sRSH7OSprOsRMoORjy9HI8SoOAXqPak2kqtgRx2bWI=";
   };
 
+  # Workaround for https://github.com/NixOS/nixpkgs/issues/359340
+  cargoPatches = [ ./gix-from-crates-io.patch ];
+
   # Let Tauri know what version we're building
   #
   # Remove references to non-existent workspaces in `gix` crates
@@ -59,12 +63,12 @@ rustPlatform.buildRustPackage rec {
       --replace-fail 'checkUpdate = check;' 'checkUpdate = () => null;'
   '';
 
-  cargoHash = "sha256-wzSRUZeB5f9Z/D+Sa5Nl77jh7GDnnUehcmwanPcaSKM=";
+  cargoHash = "sha256-H8YR+euwMGiGckURAWJIE9fOcu/ddJ6ENcnA1gHD9B8=";
 
-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm.fetchDeps {
     inherit pname version src;
-    fetcherVersion = 1;
-    hash = "sha256-5NtfstUuIYyntt09Mu9GAFAOImfO6VMmJ7g15kvGaLE=";
+    fetcherVersion = 2;
+    hash = "sha256-I55RNWP6csT08SBIFEyUp9JTC5EzQXjKIPPSxkSpg7Y=";
   };
 
   nativeBuildInputs = [
@@ -76,7 +80,7 @@ rustPlatform.buildRustPackage rec {
     moreutils
     nodejs
     pkg-config
-    pnpm_9.configHook
+    pnpm.configHook
     turbo
     wrapGAppsHook4
     yq # For `tomlq`
@@ -141,6 +145,11 @@ rustPlatform.buildRustPackage rec {
     LIBGIT2_NO_VENDOR = 1;
   };
 
+  preBuild = ''
+    turbo run --filter @gitbutler/svelte-comment-injector build
+    pnpm build:desktop -- --mode production
+  '';
+
   postInstall =
     lib.optionalString stdenv.hostPlatform.isDarwin ''
       makeBinaryWrapper $out/Applications/GitButler.app/Contents/MacOS/gitbutler-tauri $out/bin/gitbutler-tauri

From 565a5270d0e605dbfbecb2762e34b246e0538425 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 7 Aug 2025 18:26:11 -0400
Subject: [PATCH 0025/6226] gitbutler: `rec` -> `finalAttrs`

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

diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix
index 5196791667fa..707ab58cc0c3 100644
--- a/pkgs/by-name/gi/gitbutler/package.nix
+++ b/pkgs/by-name/gi/gitbutler/package.nix
@@ -34,14 +34,14 @@ let
   ];
 in
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gitbutler";
   version = "0.15.10";
 
   src = fetchFromGitHub {
     owner = "gitbutlerapp";
     repo = "gitbutler";
-    tag = "release/${version}";
+    tag = "release/${finalAttrs.version}";
     hash = "sha256-6sRSH7OSprOsRMoORjy9HI8SoOAXqPak2kqtgRx2bWI=";
   };
 
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage rec {
   # Deactivate the built-in updater
   postPatch = ''
     tauriConfRelease="crates/gitbutler-tauri/tauri.conf.release.json"
-    jq '.version = "${version}" | .bundle.createUpdaterArtifacts = false' "$tauriConfRelease" | sponge "$tauriConfRelease"
+    jq '.version = "${finalAttrs.version}" | .bundle.createUpdaterArtifacts = false' "$tauriConfRelease" | sponge "$tauriConfRelease"
 
     tomlq -ti 'del(.lints) | del(.workspace.lints)' "$cargoDepsCopy"/gix*/Cargo.toml
 
@@ -66,7 +66,7 @@ rustPlatform.buildRustPackage rec {
   cargoHash = "sha256-H8YR+euwMGiGckURAWJIE9fOcu/ddJ6ENcnA1gHD9B8=";
 
   pnpmDeps = pnpm.fetchDeps {
-    inherit pname version src;
+    inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
     hash = "sha256-I55RNWP6csT08SBIFEyUp9JTC5EzQXjKIPPSxkSpg7Y=";
   };
@@ -174,7 +174,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Git client for simultaneous branches on top of your existing workflow";
     homepage = "https://gitbutler.com";
-    changelog = "https://github.com/gitbutlerapp/gitbutler/releases/tag/release/${version}";
+    changelog = "https://github.com/gitbutlerapp/gitbutler/releases/tag/release/${finalAttrs.version}";
     license = lib.licenses.fsl11Mit;
     maintainers = with lib.maintainers; [
       getchoo
@@ -183,4 +183,4 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "gitbutler-tauri";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
-}
+})

From d0a16bfdfb501aa5a95d8ce0675637070d997ac1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 13 Aug 2025 00:36:31 +0000
Subject: [PATCH 0026/6226] libdisplay-info: 0.2.0 -> 0.3.0

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

diff --git a/pkgs/by-name/li/libdisplay-info/package.nix b/pkgs/by-name/li/libdisplay-info/package.nix
index 97406754be65..efa503d495a2 100644
--- a/pkgs/by-name/li/libdisplay-info/package.nix
+++ b/pkgs/by-name/li/libdisplay-info/package.nix
@@ -12,14 +12,14 @@
 
 stdenv.mkDerivation rec {
   pname = "libdisplay-info";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "emersion";
     repo = "libdisplay-info";
     rev = version;
-    sha256 = "sha256-6xmWBrPHghjok43eIDGeshpUEQTuwWLXNHg7CnBUt3Q=";
+    sha256 = "sha256-nXf2KGovNKvcchlHlzKBkAOeySMJXgxMpbi5z9gLrdc=";
   };
 
   depsBuildBuild = [ pkg-config ];

From 3615a9dfc12af66518f308d2696f78d8ae838076 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sat, 16 Aug 2025 14:03:17 +0200
Subject: [PATCH 0027/6226] biber: skip impossible tests on 32bit systems

biber has some tests with bibliography entries that have the year
17000002 and -17000002 etc. Such dates are not representable with 32bit
integer values and thus break on such systems. Users of 32bit systems
should expect such problems, additionally such bibliography entries seem
very unlikely in the wild. Let's follow Gentoo and Alpine in ignoring
these test failures.
---
 pkgs/by-name/bi/biber/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/bi/biber/package.nix b/pkgs/by-name/bi/biber/package.nix
index 0d6dbed84676..ccc47ea66539 100644
--- a/pkgs/by-name/bi/biber/package.nix
+++ b/pkgs/by-name/bi/biber/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   perlPackages,
   shortenPerlShebang,
   texlive,
@@ -15,6 +16,15 @@ perlPackages.buildPerlModule {
 
   src = "${biberSource}/source/bibtex/biber/biblatex-biber.tar.gz";
 
+  # Test suite checks years that are out of range with 32bit integers
+  patches = lib.optionals stdenv.hostPlatform.is32bit [
+    (fetchpatch {
+      name = "biber-skip-64bit-only-tests.patch";
+      url = "https://raw.githubusercontent.com/gentoo/gentoo/65871ad2d20b8ab39caf25a0aaec3ab95fbcf511/dev-tex/biber/files/biber-2.16-disable-64bit-only-tests.patch";
+      hash = "sha256-6Tbp62uZuFPoSKZrXerObg+gcSyLwC66IAcvcP+KcHM=";
+    })
+  ];
+
   buildInputs = with perlPackages; [
     autovivification
     BusinessISBN

From a4aa79d13fdadec5f8f8068d60b956b268fe45a1 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Tue, 19 Aug 2025 21:28:25 +0200
Subject: [PATCH 0028/6226] cudaPackages.fabricmanager: deprecate phases

---
 pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix
index 9880425393dd..4d4e61a5942f 100644
--- a/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/fabricmanager.nix
@@ -26,11 +26,6 @@ stdenv.mkDerivation rec {
     inherit sha256;
   };
 
-  phases = [
-    "unpackPhase"
-    "installPhase"
-  ];
-
   installPhase = ''
     mkdir -p $out/{bin,share/nvidia-fabricmanager}
     for bin in nv{-fabricmanager,switch-audit};do

From 64f6840d5cc116032cd1b5f6254c66cad52f2dcb Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 22 Aug 2025 14:18:27 +0300
Subject: [PATCH 0029/6226] doc: remove old docs

They have not been updated for more than 10 years
---
 doc/old/cross.txt | 329 ----------------------------------------------
 1 file changed, 329 deletions(-)
 delete mode 100644 doc/old/cross.txt

diff --git a/doc/old/cross.txt b/doc/old/cross.txt
deleted file mode 100644
index 0f958e772b78..000000000000
--- a/doc/old/cross.txt
+++ /dev/null
@@ -1,329 +0,0 @@
-Setting up a cross compiler with Nix
-
-"Cross compilation" means compiling a program on one machine for another
-type of machine. A typical use of cross compilation is to compile programs
-for embedded devices. These devices often don't have the computing power
-and memory to compile programs natively.
-
-For a fully working cross compiler the following are needed:
-
-* cross binutils: assembler, archiver, linker, etcetera that understand
-the format of the target system
-
-* cross compiler: a compiler that can generate binary code and object files
-for the target platform
-
-* cross C library: a library to link object files with to create fully
-functional programs
-
-Cross compilers are difficult to set up. A lot of people report that they
-cannot succeed in building a cross toolchain successfully. The answers
-usually consist of "download this pre-built toolchain", which is equally
-unhelpful.
-
-A toolchain is set up in five steps:
-
-1. build binutils to that can run on the host platform, but generate code
-for the target platform
-
-2. build Linux kernel headers for the target platform
-
-3. build a minimal C only version of GCC, that can run on the host platform
-and generate code for the target platform
-
-4. build a C library for the target platform. This includes the dynamic
-linker, C library, etc.
-
-5. build a full GCC
-
-****
-NB:
-
-Keep in mind that many programs are not very well suited for cross
-compilation. Either they are not intended to run on other platforms,
-because the code is highly platform specific, or the configuration process
-is not written with cross compilation in mind.
-
-Nix will not solve these problems for you!
-***
-
-This document describes to set up a cross compiler to generate code for
-arm-linux with uClibc and runs on i686-linux. The "stdenv" used is the
-default from the standard Nix packages collection.
-
-Step 1: build binutils for arm-linux in the stdenv for i686-linux
-
----
-{stdenv, fetchurl, noSysDirs}:
-
-stdenv.mkDerivation {
-  name = "binutils-2.16.1-arm";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = "http://ftp.nluug.nl/gnu/binutils/binutils-2.16.1.tar.bz2";
-    hash = "sha256-14pv+YKrL3NyFwbnv9MoWsZHgEZk5+pHhuZtAfkcVsU=";
-  };
-  inherit noSysDirs;
-  configureFlags = [ "--target=arm-linux" ];
-}
----
-
-This will compile binutils that will run on i686-linux, but knows the
-format used by arm-linux.
-
-Step 2: build kernel headers for the target architecture
-
-  default.nix for kernel-headers-arm:
-
----
-{stdenv, fetchurl}:
-
-assert stdenv.buildPlatform.system == "i686-linux";
-
-stdenv.mkDerivation {
-  name = "linux-headers-2.6.13.1-arm";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = "http://www.kernel.org/pub/linux/kernel/v2.6/linux-2.6.13.1.tar.bz2";
-    hash = "sha256-qtICDjfiA1HxWBrHqtB5DCv9s9/HyznKV1C6IxCrHYs=";
-  };
-}
----
-
-  builder.sh for kernel-headers-arm:
-
----
-source $stdenv/setup
-
-
-buildPhase() {
-    make include/linux/version.h
-}
-
-buildPhase=buildPhase
-
-
-installPhase() {
-    mkdir $out
-    mkdir $out/include
-    #cd $out/include
-    #ln -s asm-arm asm
-    make include/asm ARCH=arm
-    cp -prvd include/linux include/asm include/asm-arm include/asm-generic $out/include
-    echo -n > $out/include/linux/autoconf.h
-}
-
-installPhase=installPhase
-
-
-genericBuild
----
-
-Step 3: build a minimal GCC
-
-Extra/different parameters include the target platform and the kernel
-headers argument (this needs a major cleanup, as well as the name, it
-needs to be different!). Profiled compilers are disabled. The tarball
-used here is just gcc-core. For some reason it doesn't install nicely
-if the whole tarball is used (or is this some braino on my side? -- AH).
-
-Only C is used, because for other languages (such as C++) extra libraries
-need to be compiled, for which libraries compiled for the target system
-are needed.
-
-There is a bit of evilness going on. The cross compiled utilities need
-to be either copied to or be linked from the output tree of the compiler.
-(Is this really true? Back this up with arguments! -- AH)
-
-Symbolic links are not something we want inside the Nix store.
-
----
-{ stdenv, fetchurl, noSysDirs
-, langC ? true, langCC ? true, langF77 ? false
-, profiledCompiler ? false
-, binutilsArm
-, kernelHeadersArm
-}:
-
-assert langC;
-
-stdenv.mkDerivation {
-  name = "gcc-4.0.2-arm";
-  builder = ./builder.sh;
-  src = fetchurl {
-    url = "ftp://ftp.nluug.nl/pub/gnu/gcc/gcc-4.0.2/gcc-core-4.0.2.tar.bz2";
-    hash = "sha256-LANmXRS7/fN2zF5JUJVd8OjNA5aCDsGLQKhSpxWA3Qk=";
-  };
-  # !!! apply only if noSysDirs is set
-  patches = [./no-sys-dirs.patch ./gcc-inhibit.patch];
-  inherit noSysDirs langC langCC langF77 profiledCompiler;
-  buildInputs = [binutilsArm];
-  inherit kernelHeadersArm binutilsArm;
-  platform = "arm-linux";
-}
----
-
-The builder.sh for a cross-compiler. Note that the binutils are prefixed
-with the architecture name, so arm-linux-ld instead of ld, etc. This is
-necessary because when we cross-compile a lot of programs look for these
-tools with these specific names. The standard gcc-wrapper does not take this
-into account yet.
-
----
-source $stdenv/setup
-
-
-export NIX_FIXINC_DUMMY=$NIX_BUILD_TOP/dummy
-mkdir $NIX_FIXINC_DUMMY
-
-
-if test "$noSysDirs" = "1"; then
-
-    if test "$noSysDirs" = "1"; then
-        # Figure out what extra flags to pass to the gcc compilers
-        # being generated to make sure that they use our glibc.
-        if test -e $NIX_CC/nix-support/orig-glibc; then
-            glibc=$(cat $NIX_CC/nix-support/orig-glibc)
-            # Ugh.  Copied from gcc-wrapper/builder.sh.  We can't just
-            # source in $NIX_CC/nix-support/add-flags, since that
-            # would cause *this* GCC to be linked against the
-            # *previous* GCC.  Need some more modularity there.
-            extraCFlags="-B$glibc/lib -isystem $glibc/include"
-            extraLDFlags="-B$glibc/lib -L$glibc/lib -Wl,-s \
-              -Wl,-dynamic-linker,$glibc/lib/ld-linux.so.2"
-
-            # Oh, what a hack.  I should be shot for this.
-            # In stage 1, we should link against the previous GCC, but
-            # not afterwards.  Otherwise we retain a dependency.
-            # However, ld-wrapper, which adds the linker flags for the
-            # previous GCC, is also used in stage 2/3.  We can prevent
-            # it from adding them by NIX_GLIBC_FLAGS_SET, but then
-            # gcc-wrapper will also not add them, thereby causing
-            # stage 1 to fail.  So we use a trick to only set the
-            # flags in gcc-wrapper.
-            hook=$(pwd)/ld-wrapper-hook
-            echo "NIX_GLIBC_FLAGS_SET=1" > $hook
-            export NIX_LD_WRAPPER_START_HOOK=$hook
-        fi
-
-        export NIX_EXTRA_CFLAGS=$extraCFlags
-        export NIX_EXTRA_LDFLAGS=$extraLDFlags
-        export CFLAGS=$extraCFlags
-        export CXXFLAGS=$extraCFlags
-        export LDFLAGS=$extraLDFlags
-    fi
-
-else
-    patches=""
-fi
-
-
-preConfigure=preConfigure
-preConfigure() {
-
-    # Determine the frontends to build.
-    langs="c"
-    if test -n "$langCC"; then
-        langs="$langs,c++"
-    fi
-    if test -n "$langF77"; then
-        langs="$langs,f77"
-    fi
-
-    # Cross compiler evilness
-    mkdir -p $out
-    mkdir -p $out/arm-linux
-    mkdir -p $out/arm-linux/bin
-    ln -s $binutilsArm/arm-linux/bin/as $out/arm-linux/bin/as
-    ln -s $binutilsArm/arm-linux/bin/ld $out/arm-linux/bin/ld
-    ln -s $binutilsArm/arm-linux/bin/ar $out/arm-linux/bin/ar
-    ln -s $binutilsArm/arm-linux/bin/ranlib $out/arm-linux/bin/ranlib
-
-    # Perform the build in a different directory.
-    mkdir ../build
-    cd ../build
-
-    configureScript=../$sourceRoot/configure
-    configureFlags="--enable-languages=$langs --target=$platform --disable-threads --disable-libmudflap --disable-shared --with-headers=$kernelHeadersArm/include --disable-multilib"
-}
-
-
-postInstall=postInstall
-postInstall() {
-    # Remove precompiled headers for now.  They are very big and
-    # probably not very useful yet.
-    find $out/include -name "*.gch" -exec rm -rf {} \; -prune
-
-    # Remove `fixincl' to prevent a retained dependency on the
-    # previous gcc.
-    rm -rf $out/libexec/gcc/*/*/install-tools
-}
-
-
-#if test -z "$profiledCompiler"; then
-    #makeFlags="bootstrap"
-#else
-    #makeFlags="profiledbootstrap"
-#fi
-
-genericBuild
----
-
-Step 4: build a C library for the target platform.
-
-The previous steps are enough to compile a C library. In our case we take
-uClibc. It's intended to be a small sized replacement for glibc. It is widely
-used in embedded environments.
-
-...
-
-Step 5: Build a compiler to link with the newly built C library.
-
-...
-
-If we restrict the compiler to just C programs it is relatively easy,
-since we only need to wrap the GCC we built in the previous step with all
-the right tools and the right C library. Successfully compiled programs with
-this compiler and verified to be working on a HP Jornada 820 running Linux
-are "patch", "make" and "wget".
-
-If we want to build C++ programs it gets a lot more difficult. GCC has a
-three step compilation process. In the first step a simple compiler, called
-xgcc, that can compile only C programs is built. With that compiler it
-compiles itself two more times: one time to build a full compiler, and another
-time to build a full compiler once again with the freshly built compiler from
-step 2. In the second and third step support for C++ is compiled, if this
-is configured.
-
-One of the libraries that has to be built for C++ support step is libstdc++.
-This library uses xgcc, even when cross compiling, since libstdc++ has to be
-compiled for arm-linux.
-
-One of the compiler flags that GCC uses for this compiler is called X_CFLAGS.
-This is used by the Nix build process to set the dynamic linker, glibc
-in the case of i686-linux using the default Nix packages collection.
-
-Obviously, since we need to compile libstc++ for arm-linux with uClibc linking
-will not be done correctly: you can't link object files built for arm-linux
-with a glibc built for i686-linux.
-
-Setting X_CFLAGS to use the uClibc libraries and dynamic linker will fail
-too. Earlier on in the build process these flags are used to compile important
-files like libgcc.a by the host system gcc, which does need to be linked
-to glibc. To make this work correctly you will need to carefully juggle
-with compilation flags. This is still work in progress for Nix.
-
-
----
-
-After successfully completing the whole toolchain you can start building
-packages with the newly built tools. To make everything build correctly
-you will need a stdenv for your target platform. Setting up this platform
-will take some effort. Right now there is a very experimental setup for
-arm-linux, which needs to be cleaned up before it is production ready.
-
-Please note that many packages are not well suited for cross-compilation.
-Even though the package itself might be very well portable often the
-buildscripts are not. One thing that we have seen that causes frequent
-build failures is the use of the LD variable. This is often set to 'ld'
-and not $(CROSS)-ld.

From 833a0eb9b885be383f8efa995722adf47a79a941 Mon Sep 17 00:00:00 2001
From: Ashley Ruglys <ashley.ruglys@gmail.com>
Date: Sat, 23 Aug 2025 09:42:51 +0200
Subject: [PATCH 0030/6226] sendme: 0.26.0 -> 0.27.0

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

diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix
index b8e29ffdf01e..259e8bc8800c 100644
--- a/pkgs/by-name/se/sendme/package.nix
+++ b/pkgs/by-name/se/sendme/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sendme";
-  version = "0.26.0";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = "sendme";
     rev = "v${version}";
-    hash = "sha256-21JNyncChl8rv3IDdvYRF/nvMpAGCBps4xsBP9b/1lA=";
+    hash = "sha256-A1dZH7qeQTsMaJdB4UejpP/HD5tE07gCHFv2Mb1ZXWY=";
   };
 
-  cargoHash = "sha256-1VVpjeGU6/+apTHv7klo7FkAQ3AVjiziQRNI7yFbvh0=";
+  cargoHash = "sha256-Iwm1VGxIBfuT3nXk5Si9gpDFJRjHBOc3nfE8DFvI5YE=";
 
   __darwinAllowLocalNetworking = true;
 

From effa5e9bff9c055e299bfdfea488558f8e924d2a Mon Sep 17 00:00:00 2001
From: Ophestra <contrib@gensokyo.uk>
Date: Mon, 25 Aug 2025 17:34:47 +0900
Subject: [PATCH 0031/6226] sphinx: disable racy test

This disables another racy test that #435419 missed. It fails on the
same local networking mechanism.
---
 pkgs/development/python-modules/sphinx/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/sphinx/default.nix b/pkgs/development/python-modules/sphinx/default.nix
index 5d4b4d581fa4..7402fa2b3103 100644
--- a/pkgs/development/python-modules/sphinx/default.nix
+++ b/pkgs/development/python-modules/sphinx/default.nix
@@ -135,6 +135,7 @@ buildPythonPackage rec {
     # Racy local networking
     "test_load_mappings_cache"
     "test_load_mappings_cache_update"
+    "test_load_mappings_cache_revert_update"
   ]
   ++ lib.optionals (pythonAtLeast "3.12") [
     # https://github.com/sphinx-doc/sphinx/issues/12430

From 779515eb7c13723f4ac373451bcb6e63a6ac3e3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 26 Aug 2025 12:36:59 +0000
Subject: [PATCH 0032/6226] gumbo: 0.13.1 -> 0.13.2

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

diff --git a/pkgs/by-name/gu/gumbo/package.nix b/pkgs/by-name/gu/gumbo/package.nix
index 7c64ef08745f..ef1dbf8a7f47 100644
--- a/pkgs/by-name/gu/gumbo/package.nix
+++ b/pkgs/by-name/gu/gumbo/package.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation rec {
   pname = "gumbo";
-  version = "0.13.1";
+  version = "0.13.2";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "gumbo-parser";
     repo = "gumbo-parser";
     rev = version;
-    hash = "sha256-QNzllJI0ZHRl8o3ktJq+rI8v4SUUJ3MJ6uIubqf1heI=";
+    hash = "sha256-8mri7mLZkuIZgzE6p0yc41bNNyzGTV9V90OiA/9TkkU=";
   };
 
   nativeBuildInputs = [ autoreconfHook ];

From d3e3c7aaf473b3cc065ef19a2651fbfacf5776f0 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 23 Aug 2025 07:01:15 +0200
Subject: [PATCH 0033/6226] libxcomposite: refactor, move to pkgs/by-name and
 rename from xorg.libXcomposite

---
 pkgs/by-name/li/libxcomposite/package.nix     | 65 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +-----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  5 +-
 pkgs/servers/x11/xorg/overrides.nix           |  8 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 72 insertions(+), 49 deletions(-)
 create mode 100644 pkgs/by-name/li/libxcomposite/package.nix

diff --git a/pkgs/by-name/li/libxcomposite/package.nix b/pkgs/by-name/li/libxcomposite/package.nix
new file mode 100644
index 000000000000..b141e7eece76
--- /dev/null
+++ b/pkgs/by-name/li/libxcomposite/package.nix
@@ -0,0 +1,65 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxfixes,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxcomposite";
+  version = "0.4.6";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXcomposite-${finalAttrs.version}.tar.xz";
+    hash = "sha256-/kC88K4aCQcOuiQIil65gQ7+V0U3eeweIKVQgMbcLIc=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxfixes
+  ];
+
+  propagatedBuildInputs = [
+    xorgproto
+    # header file dependencies
+    libxfixes
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXcomposite \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Client library for the Composite extension to the X11 protocol";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcomposite";
+    license = with lib.licenses; [
+      hpndSellVariant
+      mit
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "xcomposite" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 15acd52e9e48..a624e138cc0c 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -29,8 +29,9 @@
   libxcb-render-util,
   libxcb-util,
   libxcb-wm,
-  libxcvt,
+  libxcomposite,
   libxcursor,
+  libxcvt,
   libxdmcp,
   libxext,
   libxfixes,
@@ -130,6 +131,7 @@ self: with self; {
   libX11 = libx11;
   libXau = libxau;
   libXaw = libxaw;
+  libXcomposite = libxcomposite;
   libXcursor = libxcursor;
   libXdmcp = libxdmcp;
   libXext = libxext;
@@ -1758,44 +1760,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXcomposite = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXfixes,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXcomposite";
-      version = "0.4.6";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz";
-        sha256 = "11rcvk380l5540gfqy9p8mbzw3l1p5g8l214p870f28smvqbqh7y";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXfixes
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xcomposite" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXdamage = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 0abd26780af1..677d521fdd77 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -61,6 +61,7 @@ $pcMap{"xcb-keysyms"} = "xcbutilkeysyms";
 $pcMap{"xcb-proto"} = "xcbproto";
 $pcMap{"xcb-renderutil"} = "xcbutilrenderutil";
 $pcMap{"xcb-util"} = "xcbutil";
+$pcMap{"xcomposite"} = "libXcomposite";
 $pcMap{"xcursor"} = "libXcursor";
 $pcMap{"xdmcp"} = "libXdmcp";
 $pcMap{"xext"} = "libXext";
@@ -345,8 +346,9 @@ print OUT <<EOF;
   libxcb-render-util,
   libxcb-util,
   libxcb-wm,
-  libxcvt,
+  libxcomposite,
   libxcursor,
+  libxcvt,
   libxdmcp,
   libxext,
   libxfixes,
@@ -446,6 +448,7 @@ self: with self; {
   libX11 = libx11;
   libXau = libxau;
   libXaw = libxaw;
+  libXcomposite = libxcomposite;
   libXcursor = libxcursor;
   libXdmcp = libxdmcp;
   libXext = libxext;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index df416c019038..870408a2f5f1 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -204,14 +204,6 @@ self: super:
     };
   });
 
-  libXcomposite = super.libXcomposite.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ];
-    propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.libXfixes ];
-  });
-
   libXdamage = super.libXdamage.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index c9e2c7583076..e1f1a407ed11 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -126,7 +126,6 @@ mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz
 mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz
 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
 mirror://xorg/individual/lib/libXfont2-2.0.7.tar.xz

From 9e7b4cc4776000b8cd709277ec6f27212f422b74 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Mon, 18 Aug 2025 21:50:17 +0200
Subject: [PATCH 0034/6226] libxdamage: refactor, move to pkgs/by-name and
 rename from xorg.libXdamage

---
 pkgs/by-name/li/libxdamage/package.nix        | 58 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  7 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 63 insertions(+), 46 deletions(-)
 create mode 100644 pkgs/by-name/li/libxdamage/package.nix

diff --git a/pkgs/by-name/li/libxdamage/package.nix b/pkgs/by-name/li/libxdamage/package.nix
new file mode 100644
index 000000000000..39c34e3530fa
--- /dev/null
+++ b/pkgs/by-name/li/libxdamage/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxfixes,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxdamage";
+  version = "1.1.6";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXdamage-${finalAttrs.version}.tar.xz";
+    hash = "sha256-UnM8H1Ji/KNfZOfVBgxvzYGogLqOHmXJYhzwcnr7XRE=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxfixes
+  ];
+
+  propagatedBuildInputs = [ xorgproto ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXdamage \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X Damage Extension library";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxdamage";
+    license = lib.licenses.hpndSellVariant;
+    maintainers = [ ];
+    pkgConfigModules = [ "xdamage" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index a624e138cc0c..0024c39765cc 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -32,6 +32,7 @@
   libxcomposite,
   libxcursor,
   libxcvt,
+  libxdamage,
   libxdmcp,
   libxext,
   libxfixes,
@@ -133,6 +134,7 @@ self: with self; {
   libXaw = libxaw;
   libXcomposite = libxcomposite;
   libXcursor = libxcursor;
+  libXdamage = libxdamage;
   libXdmcp = libxdmcp;
   libXext = libxext;
   libXfixes = libxfixes;
@@ -1760,44 +1762,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXdamage = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXfixes,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXdamage";
-      version = "1.1.6";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz";
-        sha256 = "04axzdx75w0wcb4na7lfpa0ai0fddw60dmg7cigs7z32a8gkqwsj";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXfixes
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xdamage" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXfont = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 677d521fdd77..5ca2415e875d 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -63,6 +63,7 @@ $pcMap{"xcb-renderutil"} = "xcbutilrenderutil";
 $pcMap{"xcb-util"} = "xcbutil";
 $pcMap{"xcomposite"} = "libXcomposite";
 $pcMap{"xcursor"} = "libXcursor";
+$pcMap{"xdamage"} = "libXdamage";
 $pcMap{"xdmcp"} = "libXdmcp";
 $pcMap{"xext"} = "libXext";
 $pcMap{"xfixes"} = "libXfixes";
@@ -349,6 +350,7 @@ print OUT <<EOF;
   libxcomposite,
   libxcursor,
   libxcvt,
+  libxdamage,
   libxdmcp,
   libxext,
   libxfixes,
@@ -450,6 +452,7 @@ self: with self; {
   libXaw = libxaw;
   libXcomposite = libxcomposite;
   libXcursor = libxcursor;
+  libXdamage = libxdamage;
   libXdmcp = libxdmcp;
   libXext = libxext;
   libXfixes = libxfixes;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 870408a2f5f1..4d464fc6f02d 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -204,13 +204,6 @@ self: super:
     };
   });
 
-  libXdamage = super.libXdamage.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ];
-  });
-
   libXft = super.libXft.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index e1f1a407ed11..78ce8d011fa9 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -126,7 +126,6 @@ mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz
 mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
 mirror://xorg/individual/lib/libXfont2-2.0.7.tar.xz
 mirror://xorg/individual/lib/libXft-2.3.9.tar.xz

From 5e02ae89216ed8f187188e06ec397527a62496bf Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 23 Aug 2025 14:53:09 +0200
Subject: [PATCH 0035/6226] libxfont_{1,2}: refactor, move to pkgs/by-name and
 rename from xorg.libXfont{,2}

relevant changes:
- this removes freetype from propagatedBuildInputs of libxfont_1 since
  it is not in 'Requires:' of xfont.pc nor imported in the header files
  The comment on the line said "propagate link reqs", however, if i
  understand this correctly, link requirements don't need to be propagated
---
 pkgs/by-name/li/libxfont_1/package.nix        | 73 +++++++++++++++
 pkgs/by-name/li/libxfont_2/package.nix        | 60 +++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 88 +------------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  6 ++
 pkgs/servers/x11/xorg/overrides.nix           | 10 ---
 pkgs/servers/x11/xorg/tarballs.list           |  2 -
 6 files changed, 143 insertions(+), 96 deletions(-)
 create mode 100644 pkgs/by-name/li/libxfont_1/package.nix
 create mode 100644 pkgs/by-name/li/libxfont_2/package.nix

diff --git a/pkgs/by-name/li/libxfont_1/package.nix b/pkgs/by-name/li/libxfont_1/package.nix
new file mode 100644
index 000000000000..421f34dd9afe
--- /dev/null
+++ b/pkgs/by-name/li/libxfont_1/package.nix
@@ -0,0 +1,73 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libfontenc,
+  xorgproto,
+  freetype,
+  xtrans,
+  zlib,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxfont_1";
+  version = "1.5.4";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXfont-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-Gn90kHdMh/IFLRRtHg5kUY0y5oSBhKGGVOjQu1eIMkI=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libfontenc
+    xorgproto
+    freetype
+    xtrans
+    zlib
+  ];
+
+  propagatedBuildInputs = [ xorgproto ];
+
+  # prevents "misaligned_stack_error_entering_dyld_stub_binder"
+  configureFlags = lib.optional stdenv.hostPlatform.isDarwin "CFLAGS=-O0";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXfont \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X font handling library for server & utilities";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxfont";
+    license = with lib.licenses; [
+      mit
+      mitOpenGroup
+      hpnd
+      hpndSellVariant
+      # this was originally BSD-3-Clause-UC, however the University of California rescinded
+      # clause 3, the advertising clause, in 1999 effectively reverting it to a BSD-3-Clause
+      bsd3
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "xfont" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/by-name/li/libxfont_2/package.nix b/pkgs/by-name/li/libxfont_2/package.nix
new file mode 100644
index 000000000000..2902d682931f
--- /dev/null
+++ b/pkgs/by-name/li/libxfont_2/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  libfontenc,
+  xorgproto,
+  freetype,
+  xtrans,
+  zlib,
+  writeScript,
+  testers,
+  # for inheriting the meta attributes
+  libxfont_1,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxfont_2";
+  version = "2.0.7";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXfont2-${finalAttrs.version}.tar.xz";
+    hash = "sha256-i3uC/eukh2m2lDPo4/u5hKX2vzaLDV9Hq+7EnePljvs=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    libfontenc
+    xorgproto
+    freetype
+    xtrans
+    zlib
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXfont2 \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    inherit (libxfont_1.meta) description homepage license;
+    maintainers = [ ];
+    pkgConfigModules = [ "xfont2" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 0024c39765cc..b41b8d631691 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -36,6 +36,8 @@
   libxdmcp,
   libxext,
   libxfixes,
+  libxfont_1,
+  libxfont_2,
   libxmu,
   libxpm,
   libxrandr,
@@ -138,6 +140,8 @@ self: with self; {
   libXdmcp = libxdmcp;
   libXext = libxext;
   libXfixes = libxfixes;
+  libXfont2 = libxfont_2;
+  libXfont = libxfont_1;
   libXmu = libxmu;
   libXpm = libxpm;
   libXrandr = libxrandr;
@@ -1762,90 +1766,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXfont = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libfontenc,
-      xorgproto,
-      freetype,
-      xtrans,
-      zlib,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXfont";
-      version = "1.5.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2";
-        sha256 = "0hiji1bvpl78aj3a3141hkk353aich71wv8l5l2z51scfy878zqs";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libfontenc
-        xorgproto
-        freetype
-        xtrans
-        zlib
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xfont" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXfont2 = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libfontenc,
-      xorgproto,
-      freetype,
-      xtrans,
-      zlib,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXfont2";
-      version = "2.0.7";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXfont2-2.0.7.tar.xz";
-        sha256 = "1ywfwpirvi7fmd3my3cb6szzd9c4p7xy7s1kjjv6k1x4xgyq4ywb";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libfontenc
-        xorgproto
-        freetype
-        xtrans
-        zlib
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xfont2" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXft = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 5ca2415e875d..a163122e191f 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -67,6 +67,8 @@ $pcMap{"xdamage"} = "libXdamage";
 $pcMap{"xdmcp"} = "libXdmcp";
 $pcMap{"xext"} = "libXext";
 $pcMap{"xfixes"} = "libXfixes";
+$pcMap{"xfont"} = "libXfont";
+$pcMap{"xfont2"} = "libXfont2";
 $pcMap{"xmu"} = "libXmu";
 $pcMap{"xmuu"} = "libXmu";
 $pcMap{"xpm"} = "libXpm";
@@ -354,6 +356,8 @@ print OUT <<EOF;
   libxdmcp,
   libxext,
   libxfixes,
+  libxfont_1,
+  libxfont_2,
   libxmu,
   libxpm,
   libxrandr,
@@ -456,6 +460,8 @@ self: with self; {
   libXdmcp = libxdmcp;
   libXext = libxext;
   libXfixes = libxfixes;
+  libXfont2 = libxfont_2;
+  libXfont = libxfont_1;
   libXmu = libxmu;
   libXpm = libxpm;
   libXrandr = libxrandr;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 4d464fc6f02d..7cadc9ef5624 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -156,16 +156,6 @@ self: super:
     };
   });
 
-  libXfont = super.libXfont.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ];
-    propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ freetype ]; # propagate link reqs. like bzip2
-    # prevents "misaligned_stack_error_entering_dyld_stub_binder"
-    configureFlags = lib.optional isDarwin "CFLAGS=-O0";
-  });
-
   libWindowsWM = super.libWindowsWM.overrideAttrs (attrs: {
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
   });
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 78ce8d011fa9..3d7f0c978193 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -126,8 +126,6 @@ mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libXfont-1.5.4.tar.bz2
-mirror://xorg/individual/lib/libXfont2-2.0.7.tar.xz
 mirror://xorg/individual/lib/libXft-2.3.9.tar.xz
 mirror://xorg/individual/lib/libXi-1.8.2.tar.xz
 mirror://xorg/individual/lib/libXinerama-1.1.5.tar.xz

From 0b402f072535c1ecd9e96ac279bf2d2c466cb33d Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 23 Aug 2025 13:16:31 +0200
Subject: [PATCH 0036/6226] libxft: refactor, move to pkgs/by-name and rename
 from xorg.libXft

relevant changes:
- remove the patched in 'Requires: freetype2' as it does not matter
  since the dependency is propagated anyway
- remove 'inherit freetype fontconfig' from passthru because that was
  probably there through an error anyways. It was added here
  https://github.com/NixOS/nixpkgs/commit/9454f71fefcbe413fdfcb61b510256f1301c5f5c
---
 pkgs/by-name/li/libxft/package.nix            | 76 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 44 +----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           | 21 -----
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 81 insertions(+), 64 deletions(-)
 create mode 100644 pkgs/by-name/li/libxft/package.nix

diff --git a/pkgs/by-name/li/libxft/package.nix b/pkgs/by-name/li/libxft/package.nix
new file mode 100644
index 000000000000..3f5955be00ac
--- /dev/null
+++ b/pkgs/by-name/li/libxft/package.nix
@@ -0,0 +1,76 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  fontconfig,
+  freetype,
+  libx11,
+  libxrender,
+  xorgproto,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxft";
+  version = "2.3.9";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXft-${finalAttrs.version}.tar.xz";
+    hash = "sha256-YKJbeJRe1pMmNbO7GJmlF9Md90VuaYZ/+6J/if85dvU=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    fontconfig
+    freetype
+    libx11
+    libxrender
+    xorgproto
+  ];
+
+  propagatedBuildInputs = [
+    xorgproto
+    # header file dependencies
+    freetype
+    fontconfig
+    libxrender
+  ];
+
+  configureFlags = lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--enable-malloc0returnsnull";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXft \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X FreeType library";
+    longDescription = ''
+      libXft is the client side font rendering library, using libfreetype, libX11, and the
+      X Render extension to display anti-aliased text.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxft";
+    license = lib.licenses.hpndSellVariant;
+    maintainers = [ ];
+    pkgConfigModules = [ "xft" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index b41b8d631691..470a7319989b 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -38,6 +38,7 @@
   libxfixes,
   libxfont_1,
   libxfont_2,
+  libxft,
   libxmu,
   libxpm,
   libxrandr,
@@ -142,6 +143,7 @@ self: with self; {
   libXfixes = libxfixes;
   libXfont2 = libxfont_2;
   libXfont = libxfont_1;
+  libXft = libxft;
   libXmu = libxmu;
   libXpm = libxpm;
   libXrandr = libxrandr;
@@ -1766,48 +1768,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXft = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontconfig,
-      freetype,
-      libX11,
-      xorgproto,
-      libXrender,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXft";
-      version = "2.3.9";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXft-2.3.9.tar.xz";
-        sha256 = "1xbn77zqjzx2zdzqcsbf8pvivlqplnciifxk6lk97mjyjiw5p8k0";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        fontconfig
-        freetype
-        libX11
-        xorgproto
-        libXrender
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xft" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXi = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index a163122e191f..974d338324b7 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -69,6 +69,7 @@ $pcMap{"xext"} = "libXext";
 $pcMap{"xfixes"} = "libXfixes";
 $pcMap{"xfont"} = "libXfont";
 $pcMap{"xfont2"} = "libXfont2";
+$pcMap{"xft"} = "libXft";
 $pcMap{"xmu"} = "libXmu";
 $pcMap{"xmuu"} = "libXmu";
 $pcMap{"xpm"} = "libXpm";
@@ -358,6 +359,7 @@ print OUT <<EOF;
   libxfixes,
   libxfont_1,
   libxfont_2,
+  libxft,
   libxmu,
   libxpm,
   libxrandr,
@@ -462,6 +464,7 @@ self: with self; {
   libXfixes = libxfixes;
   libXfont2 = libxfont_2;
   libXfont = libxfont_1;
+  libXft = libxft;
   libXmu = libxmu;
   libXpm = libxpm;
   libXrandr = libxrandr;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 7cadc9ef5624..ace5bb4d7b29 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -194,27 +194,6 @@ self: super:
     };
   });
 
-  libXft = super.libXft.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ];
-    propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [
-      xorg.libXrender
-      freetype
-      fontconfig
-    ];
-    configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
-
-    # the include files need ft2build.h, and Requires.private isn't enough for us
-    postInstall = ''
-      sed "/^Requires:/s/$/, freetype2/" -i "$dev/lib/pkgconfig/xft.pc"
-    '';
-    passthru = attrs.passthru // {
-      inherit freetype fontconfig;
-    };
-  });
-
   libXi = super.libXi.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 3d7f0c978193..cae367655a1c 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -126,7 +126,6 @@ mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libXft-2.3.9.tar.xz
 mirror://xorg/individual/lib/libXi-1.8.2.tar.xz
 mirror://xorg/individual/lib/libXinerama-1.1.5.tar.xz
 mirror://xorg/individual/lib/libxkbfile-1.1.3.tar.xz

From 203364c3a78622c67f9caca6aa98e80da92d3109 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 23 Aug 2025 13:52:48 +0200
Subject: [PATCH 0037/6226] libxi: refactor, move to pkgs/by-name and rename
 from xorg.libXi

---
 pkgs/by-name/li/libxi/package.nix             | 76 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +---------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           | 18 -----
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 81 insertions(+), 59 deletions(-)
 create mode 100644 pkgs/by-name/li/libxi/package.nix

diff --git a/pkgs/by-name/li/libxi/package.nix b/pkgs/by-name/li/libxi/package.nix
new file mode 100644
index 000000000000..3cbac22c36f3
--- /dev/null
+++ b/pkgs/by-name/li/libxi/package.nix
@@ -0,0 +1,76 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  libxfixes,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxi";
+  version = "1.8.2";
+
+  outputs = [
+    "out"
+    "dev"
+    "man"
+    "doc"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXi-${finalAttrs.version}.tar.xz";
+    hash = "sha256-0OBVXlPW4hFOq/pEImuhYtJwhQGiXhjZnPs1wJTGwQQ=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+    libxfixes
+  ];
+
+  propagatedBuildInputs = [
+    xorgproto
+    # header file dependencies
+    libx11
+    libxext
+    libxfixes
+  ];
+
+  configureFlags =
+    lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "xorg_cv_malloc0_returns_null=no"
+    ++ lib.optional stdenv.hostPlatform.isStatic "--disable-shared";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXi \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "library for the X Input Extension";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxi";
+    license = with lib.licenses; [
+      mitOpenGroup
+      hpnd
+      mit
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "xi" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 470a7319989b..f9014e1b707b 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -39,6 +39,7 @@
   libxfont_1,
   libxfont_2,
   libxft,
+  libxi,
   libxmu,
   libxpm,
   libxrandr,
@@ -144,6 +145,7 @@ self: with self; {
   libXfont2 = libxfont_2;
   libXfont = libxfont_1;
   libXft = libxft;
+  libXi = libxi;
   libXmu = libxmu;
   libXpm = libxpm;
   libXrandr = libxrandr;
@@ -1768,46 +1770,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXi = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXext,
-      libXfixes,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXi";
-      version = "1.8.2";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXi-1.8.2.tar.xz";
-        sha256 = "0161qsac0dgvkkcihpm2062p1lk2l5mj4i7smd713qnnadg5bq6h";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXext
-        libXfixes
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xi" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXinerama = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 974d338324b7..7707038ca648 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -70,6 +70,7 @@ $pcMap{"xfixes"} = "libXfixes";
 $pcMap{"xfont"} = "libXfont";
 $pcMap{"xfont2"} = "libXfont2";
 $pcMap{"xft"} = "libXft";
+$pcMap{"xi"} = "libXi";
 $pcMap{"xmu"} = "libXmu";
 $pcMap{"xmuu"} = "libXmu";
 $pcMap{"xpm"} = "libXpm";
@@ -360,6 +361,7 @@ print OUT <<EOF;
   libxfont_1,
   libxfont_2,
   libxft,
+  libxi,
   libxmu,
   libxpm,
   libxrandr,
@@ -465,6 +467,7 @@ self: with self; {
   libXfont2 = libxfont_2;
   libXfont = libxfont_1;
   libXft = libxft;
+  libXi = libxi;
   libXmu = libxmu;
   libXpm = libxpm;
   libXrandr = libxrandr;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index ace5bb4d7b29..7b280c7be4b9 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -194,24 +194,6 @@ self: super:
     };
   });
 
-  libXi = super.libXi.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-      "man"
-      "doc"
-    ];
-    propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [
-      xorg.libXfixes
-      xorg.libXext
-    ];
-    configureFlags =
-      lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-        "xorg_cv_malloc0_returns_null=no"
-      ]
-      ++ lib.optional stdenv.hostPlatform.isStatic "--disable-shared";
-  });
-
   libXinerama = super.libXinerama.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index cae367655a1c..03b23d238da8 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -126,7 +126,6 @@ mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libXi-1.8.2.tar.xz
 mirror://xorg/individual/lib/libXinerama-1.1.5.tar.xz
 mirror://xorg/individual/lib/libxkbfile-1.1.3.tar.xz
 mirror://xorg/individual/lib/libXp-1.0.4.tar.xz

From 7e96b523d10942786a3b8371ef0eafabd1231a87 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 23 Aug 2025 21:40:15 +0200
Subject: [PATCH 0038/6226] appres: refactor and move to pkgs/by-name from xorg
 namespace

---
 pkgs/by-name/ap/appres/package.nix            | 60 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           | 10 ----
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 64 insertions(+), 49 deletions(-)
 create mode 100644 pkgs/by-name/ap/appres/package.nix

diff --git a/pkgs/by-name/ap/appres/package.nix b/pkgs/by-name/ap/appres/package.nix
new file mode 100644
index 000000000000..21d45efb2ea3
--- /dev/null
+++ b/pkgs/by-name/ap/appres/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  meson,
+  ninja,
+  xorgproto,
+  libx11,
+  libxt,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "appres";
+  version = "1.0.7";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/appres-${finalAttrs.version}.tar.xz";
+    hash = "sha256-ERSxiSOf2HqNHbQz7ctEhjRtKZEhMrkeru5WZ/E7gZ8=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    meson
+    ninja
+  ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxt
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Utility to list X application resource database";
+    longDescription = ''
+      The appres program prints the resources seen by an application (or subhierarchy of an
+      application) with the specified class and instance names.
+      It can be used to determine which resources a particular program will load.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/app/appres";
+    license = lib.licenses.mitOpenGroup;
+    mainProgram = "appres";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 15acd52e9e48..9b4c8979b481 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -1,6 +1,7 @@
 # THIS IS A GENERATED FILE.  DO NOT EDIT!
 {
   lib,
+  appres,
   bdftopcf,
   font-alias,
   font-bh-ttf,
@@ -81,6 +82,7 @@
 self: with self; {
 
   inherit
+    appres
     bdftopcf
     gccmakedep
     ico
@@ -158,44 +160,6 @@ self: with self; {
   xorgdocs = xorg-docs;
   xorgsgmldoctools = xorg-sgml-doctools;
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  appres = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      xorgproto,
-      libXt,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "appres";
-      version = "1.0.7";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/appres-1.0.7.tar.xz";
-        sha256 = "17w17gqnfmpfmqgbjci1j4lnsd468k5yscxl3n6pmn4z4f4v250i";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        xorgproto
-        libXt
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   bitmap = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 0abd26780af1..2d9f4ecb1b07 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -317,6 +317,7 @@ print OUT <<EOF;
 # THIS IS A GENERATED FILE.  DO NOT EDIT!
 {
   lib,
+  appres,
   bdftopcf,
   font-alias,
   font-bh-ttf,
@@ -397,6 +398,7 @@ print OUT <<EOF;
 self: with self; {
 
   inherit
+    appres
     bdftopcf
     gccmakedep
     ico
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index df416c019038..1eccdbb5c8bf 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -112,16 +112,6 @@ self: super:
       )
   ) { };
 
-  appres = super.appres.overrideAttrs (attrs: {
-    nativeBuildInputs = attrs.nativeBuildInputs ++ [
-      meson
-      ninja
-    ];
-    meta = attrs.meta // {
-      mainProgram = "appres";
-    };
-  });
-
   bitmap = addMainProgram super.bitmap { };
 
   editres = super.editres.overrideAttrs (attrs: {
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index c9e2c7583076..53ce1c31383c 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -1,4 +1,3 @@
-mirror://xorg/individual/app/appres-1.0.7.tar.xz
 mirror://xorg/individual/app/bitmap-1.1.1.tar.xz
 mirror://xorg/individual/app/editres-1.0.9.tar.xz
 mirror://xorg/individual/app/fonttosfnt-1.2.4.tar.xz

From d323f2925773e9f0d57da6b3ba069ca4221d6300 Mon Sep 17 00:00:00 2001
From: Bang Lee <qusicx@gmail.com>
Date: Tue, 26 Aug 2025 16:52:53 -0700
Subject: [PATCH 0039/6226] nixos/wayvnc: init

---
 .../manual/release-notes/rl-2511.section.md   |  2 ++
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/programs/wayland/wayvnc.nix     | 25 +++++++++++++++++++
 3 files changed, 28 insertions(+)
 create mode 100644 nixos/modules/programs/wayland/wayvnc.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index ede6b54dbd7b..e04e2155349f 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -25,6 +25,8 @@
 - [gtklock](https://github.com/jovanlanik/gtklock), a GTK-based lockscreen for Wayland. Available as [programs.gtklock](#opt-programs.gtklock.enable).
 - [Chrysalis](https://github.com/keyboardio/Chrysalis), a graphical configurator for Kaleidoscope-powered keyboards. Available as [programs.chrysalis](#opt-programs.chrysalis.enable).
 
+- [wayvnc](https://github.com/any1/wayvnc), VNC server for wlroots based Wayland compositors. Available as [programs.wayvnc](#opt-programs.wayvnc.enable).
+
 - [Pi-hole](https://pi-hole.net/), a DNS sinkhole for advertisements based on Dnsmasq. Available as [services.pihole-ftl](#opt-services.pihole-ftl.enable), and [services.pihole-web](#opt-services.pihole-web.enable) for the web GUI and API.
 
 - [Fediwall](https://fediwall.social), a web application for live displaying toots from mastodon, inspired by mastowall. Available as [services.fediwall](#opt-services.fediwall.enable).
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index b4d2ebc3c7ae..0501ba817229 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -350,6 +350,7 @@
   ./programs/wayland/uwsm.nix
   ./programs/wayland/waybar.nix
   ./programs/wayland/wayfire.nix
+  ./programs/wayland/wayvnc.nix
   ./programs/weylus.nix
   ./programs/winbox.nix
   ./programs/wireshark.nix
diff --git a/nixos/modules/programs/wayland/wayvnc.nix b/nixos/modules/programs/wayland/wayvnc.nix
new file mode 100644
index 000000000000..0a19541c098d
--- /dev/null
+++ b/nixos/modules/programs/wayland/wayvnc.nix
@@ -0,0 +1,25 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}:
+
+let
+  cfg = config.programs.wayvnc;
+in
+{
+  options.programs.wayvnc = {
+    enable = lib.mkEnableOption "wayvnc, VNC server for wlroots based Wayland compositors";
+    package = lib.mkPackageOption pkgs "wayvnc" { };
+  };
+
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+
+    # https://github.com/any1/wayvnc/blob/master/src/pam_auth.c
+    security.pam.services.wayvnc = { };
+  };
+
+  meta.maintainers = with lib.maintainers; [ qusic ];
+}

From 4be90e083ef1f7ae9c547e1689fca0450b00ee51 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Thu, 28 Aug 2025 00:43:32 +0200
Subject: [PATCH 0040/6226] wineasio: add wineasio-settings

`wineasio-settings` is the GUI that comes with WineASIO. It hasn't
been included by the `wineasio` package up until now.
---
 pkgs/by-name/wi/wineasio/package.nix | 36 ++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/pkgs/by-name/wi/wineasio/package.nix b/pkgs/by-name/wi/wineasio/package.nix
index 21ddf7083b35..9d1212dc59dc 100644
--- a/pkgs/by-name/wi/wineasio/package.nix
+++ b/pkgs/by-name/wi/wineasio/package.nix
@@ -6,6 +6,9 @@
   pkg-config,
   wineWowPackages,
   pkgsi686Linux,
+  python3,
+  python3Packages,
+  qt6,
 }:
 
 multiStdenv.mkDerivation rec {
@@ -20,6 +23,34 @@ multiStdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  wineasio-settings = python3Packages.buildPythonApplication {
+    inherit src version;
+    pname = "wineasio-settings";
+    pyproject = false;
+
+    sourceRoot = "${src.name}/gui";
+
+    postPatch = ''
+      patchShebangs wineasio-settings
+      substituteInPlace wineasio-settings \
+        --replace-fail /usr/bin/python3 ${python3}/bin/python3
+    '';
+
+    nativeBuildInputs = [ qt6.wrapQtAppsHook ];
+    buildInputs = [ qt6.qtbase ];
+    dependencies = with python3Packages; [ pyqt6 ];
+
+    makeFlags = [ "PREFIX=$(out)" ];
+
+    dontWrapQtApps = true;
+    dontWrapPythonPrograms = true;
+
+    postFixup = ''
+      wrapQtApp $out/bin/wineasio-settings \
+        --prefix PYTHONPATH : "$PYTHONPATH"
+    '';
+  };
+
   nativeBuildInputs = [
     pkg-config
     wineWowPackages.stable
@@ -43,10 +74,15 @@ multiStdenv.mkDerivation rec {
 
   installPhase = ''
     runHook preInstall
+
     install -D build32/wineasio32.dll    $out/lib/wine/i386-windows/wineasio32.dll
     install -D build32/wineasio32.dll.so $out/lib/wine/i386-unix/wineasio32.dll.so
     install -D build64/wineasio64.dll    $out/lib/wine/x86_64-windows/wineasio64.dll
     install -D build64/wineasio64.dll.so $out/lib/wine/x86_64-unix/wineasio64.dll.so
+
+    mkdir -p $out/bin
+    ln -s ${wineasio-settings}/bin/wineasio-settings $out/bin/wineasio-settings
+
     runHook postInstall
   '';
 

From 50b421cc527eaf339b7f53f251bdd4814e68f347 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Thu, 28 Aug 2025 00:55:39 +0200
Subject: [PATCH 0041/6226] wineasio: add meta.changelog

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

diff --git a/pkgs/by-name/wi/wineasio/package.nix b/pkgs/by-name/wi/wineasio/package.nix
index 9d1212dc59dc..a6727bcc8f15 100644
--- a/pkgs/by-name/wi/wineasio/package.nix
+++ b/pkgs/by-name/wi/wineasio/package.nix
@@ -88,6 +88,7 @@ multiStdenv.mkDerivation rec {
 
   meta = with lib; {
     homepage = "https://github.com/wineasio/wineasio";
+    changelog = "https://github.com/wineasio/wineasio/releases/tag/${src.tag}";
     description = "ASIO to JACK driver for WINE";
     license = with licenses; [
       gpl2

From 5473ce1668247cf91501a20ab536f17e7c24cbd5 Mon Sep 17 00:00:00 2001
From: Armel Cloarec <armel@armelclo.fr>
Date: Thu, 28 Aug 2025 01:09:57 +0200
Subject: [PATCH 0042/6226] xdg-desktop-portal-phosh: init at 0.0.4

---
 .../cargo_lock_deps_version.patch             | 30 +++++++
 .../xd/xdg-desktop-portal-phosh/package.nix   | 87 +++++++++++++++++++
 2 files changed, 117 insertions(+)
 create mode 100644 pkgs/by-name/xd/xdg-desktop-portal-phosh/cargo_lock_deps_version.patch
 create mode 100644 pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix

diff --git a/pkgs/by-name/xd/xdg-desktop-portal-phosh/cargo_lock_deps_version.patch b/pkgs/by-name/xd/xdg-desktop-portal-phosh/cargo_lock_deps_version.patch
new file mode 100644
index 000000000000..881a22dbcf82
--- /dev/null
+++ b/pkgs/by-name/xd/xdg-desktop-portal-phosh/cargo_lock_deps_version.patch
@@ -0,0 +1,30 @@
+diff --git a/subprojects/pfs/Cargo.lock b/subprojects/pfs/Cargo.lock
+index efe74be..9b5f48e 100644
+--- a/subprojects/pfs/Cargo.lock
++++ b/subprojects/pfs/Cargo.lock
+@@ -458,9 +458,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+ 
+ [[package]]
+ name = "libadwaita"
+-version = "0.7.1"
++version = "0.7.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8611ee9fb85e7606c362b513afcaf5b59853f79e4d98caaaf581d99465014247"
++checksum = "500135d29c16aabf67baafd3e7741d48e8b8978ca98bac39e589165c8dc78191"
+ dependencies = [
+  "gdk4",
+  "gio",
+diff --git a/subprojects/pfs/Cargo.toml b/subprojects/pfs/Cargo.toml
+index ae3b519..6cf25dd 100644
+--- a/subprojects/pfs/Cargo.toml
++++ b/subprojects/pfs/Cargo.toml
+@@ -18,7 +18,7 @@ path = "src/examples/open/pfs_open.rs"
+ 
+ [dependencies]
+ gettext-rs = { version = "0.7", features = ["gettext-system"] }
+-glib-macros = "0.20.5"
++glib-macros = "0.20.12"
+ gtk = { version = "0.9", package = "gtk4", features = ["gnome_47"] }
+ 
+ [dependencies.adw]
+
diff --git a/pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix
new file mode 100644
index 000000000000..f65cfd986a98
--- /dev/null
+++ b/pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix
@@ -0,0 +1,87 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitLab,
+  gnome-desktop,
+  libadwaita,
+  meson,
+  ninja,
+  pkg-config,
+  xdg-desktop-portal,
+  rustc,
+  desktop-file-utils,
+  cargo,
+  rustPlatform,
+  gettext,
+}:
+let
+  # Derived from subprojects/pfs.wrap
+  pfs = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "guidog";
+    repo = "pfs";
+    tag = "v0.0.4";
+    hash = "sha256-b0S/jNE03h26bGA76fb/qlyJ8/MifZeltTc16UX2h9w=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xdg-desktop-portal-phosh";
+  version = "0.49.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
+    owner = "guidog";
+    repo = "xdg-desktop-portal-phosh";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-VF+ZNUP5Y2xm2nlNN3QsLJh8yNRJH7d3k+kLJ+4eu9s=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-h+VQqtirReLIHlVByKSb6DpqR1FtCxSwQpjowHX1mcg=";
+  };
+
+  nativeBuildInputs = [
+    meson
+    ninja
+    pkg-config
+    rustc
+    desktop-file-utils
+    cargo
+    rustPlatform.cargoSetupHook
+    gettext
+  ];
+
+  buildInputs = [
+    libadwaita
+    gnome-desktop
+    xdg-desktop-portal
+  ];
+
+  strictDeps = true;
+
+  prePatch = ''
+    cp -r ${pfs} subprojects/pfs
+    chmod +w -R subprojects/pfs # Allow patches for subprojects to work
+  '';
+
+  patches = [
+    # Patch that fixes the issue with two Rust package versions.
+    # For reasons that I don't understand, rustPlatform.fetchCargoVendor seems to not fetch the version inside the Cargo.lock file.
+    # Like with libadwaita, fetchCargoVendor download the version 0.7.2 but in the lock file specified 0.7.1 and in the toml file specified 0.7.
+    ./cargo_lock_deps_version.patch
+  ];
+
+  passthru = {
+    updateScript = lib.updateScript { };
+  };
+
+  meta = with lib; {
+    description = "A backend implementation for xdg-desktop-portal that is using GTK/GNOME/Phosh to provide interfaces that aren't provided by the GTK portal";
+    homepage = "https://gitlab.gnome.org/guidog/xdg-desktop-portal-phosh";
+    changelog = "https://gitlab.gnome.org/guidog/xdg-desktop-portal-phosh/-/blob/main/NEWS";
+    maintainers = with maintainers; [ armelclo ];
+    platforms = platforms.linux;
+    license = licenses.gpl3Only;
+  };
+})

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

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

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

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

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

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

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

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

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

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

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

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

From 02af430cb107b2f900843f7910c99cdcf718f72a Mon Sep 17 00:00:00 2001
From: Armel Cloarec <armel@armelclo.fr>
Date: Thu, 28 Aug 2025 19:10:39 +0200
Subject: [PATCH 0047/6226] nixos/phosh: add xdg-desktop-portal-phosh add
 meta.maintainers

---
 .../services/x11/desktop-managers/phosh.nix       | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/nixos/modules/services/x11/desktop-managers/phosh.nix b/nixos/modules/services/x11/desktop-managers/phosh.nix
index 12118089a1f7..8937a1f8c2bd 100644
--- a/nixos/modules/services/x11/desktop-managers/phosh.nix
+++ b/nixos/modules/services/x11/desktop-managers/phosh.nix
@@ -145,6 +145,11 @@ let
 in
 
 {
+
+  meta = {
+    maintainers = with lib.maintainers; [ armelclo ];
+  };
+
   options = {
     services.xserver.desktopManager.phosh = {
       enable = lib.mkOption {
@@ -224,6 +229,16 @@ in
       };
     };
 
+    xdg.portal = {
+      enable = true;
+      extraPortals = [
+        pkgs.xdg-desktop-portal-phosh
+        pkgs.xdg-desktop-portal-gnome
+        pkgs.xdg-desktop-portal-gtk
+      ];
+      configPackages = lib.mkDefault [ pkgs.phosh ];
+    };
+
     environment.systemPackages = [
       pkgs.phoc
       cfg.package

From ee9f1c437d4a2c3667d0803646a0d7efd3198869 Mon Sep 17 00:00:00 2001
From: benaryorg <binary@benary.org>
Date: Fri, 29 Aug 2025 13:15:35 +0000
Subject: [PATCH 0048/6226] nixos/display-managers: phosh on tty1

As #428972 was merged this seems to be the correct setting for *phosh*.
Specifically when using *mobile-nixos* this will fix issues of some devices (Lenovo Krane and Pinephone) not switching to *phosh* on startup (as they will remain on *tty1*).

Signed-off-by: benaryorg <binary@benary.org>
---
 nixos/modules/services/x11/desktop-managers/phosh.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/x11/desktop-managers/phosh.nix b/nixos/modules/services/x11/desktop-managers/phosh.nix
index 12118089a1f7..2a05a37bea05 100644
--- a/nixos/modules/services/x11/desktop-managers/phosh.nix
+++ b/nixos/modules/services/x11/desktop-managers/phosh.nix
@@ -183,8 +183,11 @@ in
 
   config = lib.mkIf cfg.enable {
     # Inspired by https://gitlab.gnome.org/World/Phosh/phosh/-/blob/main/data/phosh.service
+    # Parts taken from nixos/modules/services/wayland/cage.nix
     systemd.services.phosh = {
       wantedBy = [ "graphical.target" ];
+      after = [ "getty@tty1.service" ];
+      conflicts = [ "getty@tty1.service" ];
       serviceConfig = {
         ExecStart = "${cfg.package}/bin/phosh-session";
         User = cfg.user;
@@ -193,7 +196,7 @@ in
         WorkingDirectory = "~";
         Restart = "always";
 
-        TTYPath = "/dev/tty7";
+        TTYPath = "/dev/tty1";
         TTYReset = "yes";
         TTYVHangup = "yes";
         TTYVTDisallocate = "yes";
@@ -204,7 +207,7 @@ in
         StandardError = "journal";
 
         # Log this user with utmp, letting it show up with commands 'w' and 'who'.
-        UtmpIdentifier = "tty7";
+        UtmpIdentifier = "tty1";
         UtmpMode = "user";
       };
       environment = {

From b382ee61ef949028e95f9ccc4e1f274e939a050b Mon Sep 17 00:00:00 2001
From: kashw2 <supra4keanu@hotmail.com>
Date: Sun, 31 Aug 2025 18:52:18 +1000
Subject: [PATCH 0049/6226] upower: 1.90.6 -> 1.90.10

---
 pkgs/by-name/up/upower/package.nix | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/up/upower/package.nix b/pkgs/by-name/up/upower/package.nix
index 6d85d57bc05e..2042988e5104 100644
--- a/pkgs/by-name/up/upower/package.nix
+++ b/pkgs/by-name/up/upower/package.nix
@@ -38,7 +38,7 @@ assert withDocs -> withIntrospection;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "upower";
-  version = "1.90.6";
+  version = "1.90.10";
 
   outputs = [
     "out"
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "upower";
     repo = "upower";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Y3MIB6a11P00B/6E3UyoyjLLP8TIT3vM2FDO7zlBz/w=";
+    hash = "sha256-08lAt91RJ/sFIGlq1gfn4wUiwNxWyTO+pX41HKzQTG8=";
   };
 
   patches =
@@ -63,18 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
     ]
     ++ [
       ./installed-tests-path.patch
-
-      # Fix a race condition in test_sibling_priority_no_overwrite
-      # Remove when updating to > 1.90.6
-      (fetchpatch {
-        url = "https://gitlab.freedesktop.org/upower/upower/-/commit/9ee76826bd41a5d3a377dfd6f5835f42ec50be9a.patch";
-        hash = "sha256-E56iz/iHn+VM7Opo0a13A5nhnB9nf6C7Y1kyWzk4ZnU=";
-      })
-      # Fix style issues in the udev rules file
-      (fetchpatch {
-        url = "https://gitlab.freedesktop.org/upower/upower/-/commit/6f9d84694da56b317989b8c34250b60d833a4b29.patch";
-        hash = "sha256-xBUbf4qz9Llmw7CuKKMp/uPk7JqwjB4+p7z9kMOVRuE=";
-      })
     ];
 
   strictDeps = true;

From 417a0b348ab9249d47eee1945918bd2aa6eb13b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 31 Aug 2025 19:06:46 +0000
Subject: [PATCH 0050/6226] rust-bindgen-unwrapped: 0.72.0 -> 0.72.1

---
 pkgs/development/tools/rust/bindgen/unwrapped.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/bindgen/unwrapped.nix b/pkgs/development/tools/rust/bindgen/unwrapped.nix
index 39b4de40b83b..c78eeb55be78 100644
--- a/pkgs/development/tools/rust/bindgen/unwrapped.nix
+++ b/pkgs/development/tools/rust/bindgen/unwrapped.nix
@@ -11,15 +11,15 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "rust-bindgen-unwrapped";
-  version = "0.72.0";
+  version = "0.72.1";
 
   src = fetchCrate {
     pname = "bindgen-cli";
     inherit version;
-    hash = "sha256-0hIxXKq7zu/gq0QAs2Ffuq584a9w1RWctPs9SBfc0/I=";
+    hash = "sha256-rhdQZcnlqVSUqvFDg0Scs1+DHGcKyazeS5H9HH7u8Fk=";
   };
 
-  cargoHash = "sha256-K/iM79RfNU+3f2ae6wy/FMFAD68vfqzSUebqALPJpJY=";
+  cargoHash = "sha256-YNpqVB+zdZ76Av2L+yQuBrxKvNML9+3H7ES4+7mED0E=";
 
   preConfigure = ''
     export LIBCLANG_PATH="${lib.getLib clang.cc}/lib"

From 1222e4300638ca2d2463d68547d94ba595c9d1a9 Mon Sep 17 00:00:00 2001
From: Gus <58223632+thegu5@users.noreply.github.com>
Date: Sun, 31 Aug 2025 22:45:17 -0400
Subject: [PATCH 0051/6226] maintainers: add thegu5

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 72f86e2996c6..8fd1404ca798 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -25506,6 +25506,11 @@
     github = "thefossguy";
     githubId = 44400303;
   };
+  thegu5 = {
+    name = "Gus";
+    github = "thegu5";
+    githubId = 58223632;
+  };
   thehans255 = {
     name = "Hans Jorgensen";
     email = "foss-contact@thehans255.com";

From 737ee71624003c5c96fed2075365bad3557e9050 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Tue, 2 Sep 2025 17:13:52 +0300
Subject: [PATCH 0052/6226] 9menu: modernize, add update script

---
 pkgs/by-name/_9/_9menu/package.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/_9/_9menu/package.nix b/pkgs/by-name/_9/_9menu/package.nix
index 2329c41eaac7..3afb96ec4bbe 100644
--- a/pkgs/by-name/_9/_9menu/package.nix
+++ b/pkgs/by-name/_9/_9menu/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  nix-update-script,
   pkg-config,
   meson,
   ninja,
@@ -9,7 +10,7 @@
   libXext,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "9menu";
   version = "unstable-2021-02-24";
 
@@ -30,6 +31,13 @@ stdenv.mkDerivation {
     libXext
   ];
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "9menu-release-([0-9.]+)"
+    ];
+  };
+
   meta = {
     homepage = "https://github.com/arnoldrobbins/9menu";
     description = "Simple X11 menu program for running commands";
@@ -38,4 +46,4 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [ ];
     platforms = libX11.meta.platforms;
   };
-}
+})

From c4cbd6cf79ae74d389c554d1782c8f61a9679392 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Tue, 2 Sep 2025 17:14:26 +0300
Subject: [PATCH 0053/6226] 9menu: unstable-2021-02-24 -> 1.11

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

diff --git a/pkgs/by-name/_9/_9menu/package.nix b/pkgs/by-name/_9/_9menu/package.nix
index 3afb96ec4bbe..bc7c3b9fc230 100644
--- a/pkgs/by-name/_9/_9menu/package.nix
+++ b/pkgs/by-name/_9/_9menu/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "9menu";
-  version = "unstable-2021-02-24";
+  version = "1.11";
 
   src = fetchFromGitHub {
     owner = "arnoldrobbins";
     repo = "9menu";
-    rev = "00cbf99c48dc580ca28f81ed66c89a98b7a182c8";
-    sha256 = "arca8Gbr4ytiCk43cifmNj7SUrDgn1XB26zAhZrVDs0=";
+    tag = "9menu-release-${finalAttrs.version}";
+    hash = "sha256-J0vHArLH8WDCOvbbF4TYd9b75+5UkhnVdhbbeiUJ4SM=";
   };
 
   nativeBuildInputs = [

From 33a9a6b27ef280aba56617b85ddf7b2708d647ba Mon Sep 17 00:00:00 2001
From: SteelPh0enix <wojciech_olech@hotmail.com>
Date: Tue, 2 Sep 2025 21:55:35 +0200
Subject: [PATCH 0054/6226] Updated stm32cubemx to 6.15.0

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

diff --git a/pkgs/by-name/st/stm32cubemx/package.nix b/pkgs/by-name/st/stm32cubemx/package.nix
index b8c9af298ff2..98c7ee39c83d 100644
--- a/pkgs/by-name/st/stm32cubemx/package.nix
+++ b/pkgs/by-name/st/stm32cubemx/package.nix
@@ -14,13 +14,13 @@ let
   iconame = "STM32CubeMX";
   package = stdenvNoCC.mkDerivation rec {
     pname = "stm32cubemx";
-    version = "6.14.0";
+    version = "6.15.0";
 
     src = fetchzip {
       url = "https://sw-center.st.com/packs/resource/library/stm32cube_mx_v${
         builtins.replaceStrings [ "." ] [ "" ] version
       }-lin.zip";
-      hash = "sha256-GOvoPyfPdQV/gjveuFpZjueTZD/BYuEWSHgQKBm3o3A=";
+      hash = "sha256-50P+/uvNH3NN1UN+T3RxGgR8QYBIgBDA56mAEU4BipI=";
       stripRoot = false;
     };
 

From e06204e572658eaf4e6f2f2ea0ad063ec491f2c8 Mon Sep 17 00:00:00 2001
From: SteelPh0enix <wojciech_olech@hotmail.com>
Date: Tue, 2 Sep 2025 22:25:11 +0200
Subject: [PATCH 0055/6226] Fixed icon extraction from STM32CubeMX package

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

diff --git a/pkgs/by-name/st/stm32cubemx/package.nix b/pkgs/by-name/st/stm32cubemx/package.nix
index 98c7ee39c83d..1e79086142a7 100644
--- a/pkgs/by-name/st/stm32cubemx/package.nix
+++ b/pkgs/by-name/st/stm32cubemx/package.nix
@@ -61,16 +61,15 @@ let
       EOF
       chmod +x $out/bin/${pname}
 
-      icotool --extract $out/opt/STM32CubeMX/help/${iconame}.ico
       fdupes -dN . > /dev/null
       ls
       for size in 16 24 32 48 64 128 256; do
         mkdir -pv $out/share/icons/hicolor/"$size"x"$size"/apps
         if [ $size -eq 256 ]; then
-          mv ${iconame}_*_"$size"x"$size"x32.png \
+          cp $out/opt/STM32CubeMX/help/${iconame}.png \
             $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png
         else
-          convert -resize "$size"x"$size" ${iconame}_*_256x256x32.png \
+          magick $out/opt/STM32CubeMX/help/${iconame}.png -resize "$size"x"$size" \
             $out/share/icons/hicolor/"$size"x"$size"/apps/${pname}.png
         fi
       done;

From bb58f7f46c966747bdec7a7b581c2cec2cc5b7c7 Mon Sep 17 00:00:00 2001
From: Quinn Edenfield <william.edenfield@neuralink.com>
Date: Sat, 14 Jun 2025 21:02:55 -0700
Subject: [PATCH 0056/6226] maintainers: add quinneden

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c45018a4b839..ad3fe96e89af 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -20581,6 +20581,12 @@
     githubId = 39039420;
     name = "Quinn Dougherty";
   };
+  quinneden = {
+    email = "quinn@qeden.dev";
+    github = "quinneden";
+    githubId = 125415641;
+    name = "Quinn Edenfield";
+  };
   QuiNzX = {
     name = "QuiNz-";
     github = "QuiNzX";

From e8f196e4f04e77670eb3becc485a756f67d1bd30 Mon Sep 17 00:00:00 2001
From: nobbele <realnobbele@gmail.com>
Date: Sun, 6 Apr 2025 16:54:58 +0200
Subject: [PATCH 0057/6226] mymake: init at 2.3.6

---
 pkgs/by-name/my/mymake/package.nix | 45 ++++++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 pkgs/by-name/my/mymake/package.nix

diff --git a/pkgs/by-name/my/mymake/package.nix b/pkgs/by-name/my/mymake/package.nix
new file mode 100644
index 000000000000..d30ec4f40f85
--- /dev/null
+++ b/pkgs/by-name/my/mymake/package.nix
@@ -0,0 +1,45 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mymake";
+  version = "2.3.6";
+
+  src = fetchFromGitHub {
+    owner = "fstromback";
+    repo = "mymake";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UQjvxdOvD9O6TrzBFJwh3CistDGZM9HZbcwVPx1n4+A=";
+  };
+
+  buildPhase = ''
+    runHook preBuild
+
+    ./compile.sh mm
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 mm $out/bin/mm
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Tool for compiling and running programs with minimal configuration";
+    homepage = "https://github.com/fstromback/mymake";
+    maintainers = [ lib.maintainers.nobbele ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    mainProgram = "mm";
+  };
+})

From 00e47b8ef86ac4815251c4ada42d8cbf8206a5f4 Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Thu, 4 Sep 2025 17:29:08 +0200
Subject: [PATCH 0058/6226] opentelemetry-cpp: add panicgh to maintainers

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

diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix
index 0210970b3bd1..59337b2d2598 100644
--- a/pkgs/by-name/op/opentelemetry-cpp/package.nix
+++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix
@@ -96,7 +96,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "OpenTelemetry C++ Client Library";
     homepage = "https://github.com/open-telemetry/opentelemetry-cpp";
     license = [ lib.licenses.asl20 ];
-    maintainers = with lib.maintainers; [ jfroche ];
+    maintainers = with lib.maintainers; [
+      jfroche
+      panicgh
+    ];
     platforms = lib.platforms.linux;
     # https://github.com/protocolbuffers/protobuf/issues/14492
     broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);

From ec3cd6c50e95ec41284196f234ee3877cac6fd43 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Mon, 8 Sep 2025 19:22:43 +0800
Subject: [PATCH 0059/6226] tlaplus-toolbox: 1.7.1 -> 1.7.4

---
 pkgs/by-name/tl/tlaplus-toolbox/package.nix | 94 +++++++++------------
 1 file changed, 42 insertions(+), 52 deletions(-)

diff --git a/pkgs/by-name/tl/tlaplus-toolbox/package.nix b/pkgs/by-name/tl/tlaplus-toolbox/package.nix
index 15e9e1857a14..35fe2d8ab99d 100644
--- a/pkgs/by-name/tl/tlaplus-toolbox/package.nix
+++ b/pkgs/by-name/tl/tlaplus-toolbox/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchzip,
+  fetchurl,
   makeShellWrapper,
   makeDesktopItem,
   stdenv,
@@ -9,63 +9,59 @@
   glib,
   zlib,
   wrapGAppsHook3,
+  copyDesktopItems,
+  bintools,
+  unzip,
 }:
 
-let
-  desktopItem = makeDesktopItem rec {
-    name = "TLA+Toolbox";
-    exec = "tla-toolbox";
-    icon = "tla-toolbox";
-    comment = "IDE for TLA+";
-    desktopName = name;
-    genericName = comment;
-    categories = [ "Development" ];
-    startupWMClass = "TLA+ Toolbox";
+stdenv.mkDerivation (finalAttrs: {
+  pname = "tlaplus-toolbox";
+  version = "1.7.4";
+
+  src = fetchurl {
+    url = "https://tla.msr-inria.inria.fr/tlatoolbox/branches/${finalAttrs.version}/products/TLAToolbox-${finalAttrs.version}-linux.gtk.x86_64.zip";
+    hash = "sha256-eYK2cXJvLIQfkK+onromwhNfAmzWSyCZXCsEORxkjaU=";
   };
 
-in
-stdenv.mkDerivation rec {
-  pname = "tla-toolbox";
-  version = "1.7.1";
-  src = fetchzip {
-    url = "https://tla.msr-inria.inria.fr/tlatoolbox/products/TLAToolbox-${version}-linux.gtk.x86_64.zip";
-    sha256 = "02a2y2mkfab5cczw8g604m61h4xr0apir49zbd1aq6mmgcgngw80";
-  };
+  nativeBuildInputs = [
+    copyDesktopItems
+    makeShellWrapper
+    wrapGAppsHook3
+    unzip
+  ];
 
   buildInputs = [ gtk3 ];
 
-  nativeBuildInputs = [
-    makeShellWrapper
-    wrapGAppsHook3
-  ];
-
   dontWrapGApps = true;
 
+  desktopItems = [
+    (makeDesktopItem {
+      name = "TLA+Toolbox";
+      exec = "tla-toolbox";
+      icon = "tla-toolbox";
+      comment = "IDE for TLA+";
+      desktopName = "TLA+Toolbox";
+      genericName = "IDE for TLA+";
+      categories = [ "Development" ];
+      startupWMClass = "TLA+ Toolbox";
+    })
+  ];
+
   installPhase = ''
     runHook preInstall
 
-    mkdir -p "$out/bin"
-    cp -r "$src" "$out/toolbox"
-    chmod -R +w "$out/toolbox"
+    mkdir -p "$out/bin" "$out/libexec"
+    cp -r . "$out/libexec/toolbox"
 
-    fixupPhase
-    gappsWrapperArgsHook
+    patchelf --set-interpreter ${bintools.dynamicLinker} "$out/libexec/toolbox/toolbox"
+    patchelf --set-interpreter ${bintools.dynamicLinker} \
+      --add-rpath "${lib.makeLibraryPath [ zlib ]}" \
+      "$(find "$out/libexec/toolbox" -name java)"
+    patchelf --set-interpreter ${bintools.dynamicLinker} \
+      "$(find "$out/libexec/toolbox" -name jspawnhelper)"
 
-    patchelf \
-      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      "$out/toolbox/toolbox"
-
-    patchelf \
-      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      --set-rpath "${lib.makeLibraryPath [ zlib ]}:$(patchelf --print-rpath $(find "$out/toolbox" -name java))" \
-      "$(find "$out/toolbox" -name java)"
-
-    patchelf \
-      --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \
-      "$(find "$out/toolbox" -name jspawnhelper)"
-
-    makeShellWrapper $out/toolbox/toolbox $out/bin/tla-toolbox \
-      --chdir "$out/toolbox" \
+    makeShellWrapper $out/libexec/toolbox/toolbox $out/bin/tla-toolbox \
+      --chdir "$out/libexec/toolbox" \
       --add-flags "-data ~/.tla-toolbox" \
       --prefix LD_LIBRARY_PATH : "${
         lib.makeLibraryPath [
@@ -78,18 +74,12 @@ stdenv.mkDerivation rec {
       "''${gappsWrapperArgs[@]}"
 
     echo -e "\nCreating TLA Toolbox icons..."
-    pushd "$src"
     for icon_in in $(find . -path "./plugins/*/icons/full/etool16/tla_launch_check_wiz_*.png")
     do
       icon_size=$(echo $icon_in | grep -Po "wiz_\K[0-9]+")
       icon_out="$out/share/icons/hicolor/$icon_size""x$icon_size/apps/tla-toolbox.png"
-      mkdir -p "$(dirname $icon_out)"
-      cp "$icon_in" "$icon_out"
+      install -D --mode=0644 "$icon_in" "$icon_out"
     done
-    popd
-
-    echo -e "\nCreating TLA Toolbox desktop entry..."
-    cp -r "${desktopItem}/share/applications"* "$out/share/applications"
 
     runHook postInstall
   '';
@@ -109,4 +99,4 @@ stdenv.mkDerivation rec {
     platforms = [ "x86_64-linux" ];
     maintainers = [ ];
   };
-}
+})

From 3b2a2eb1ce94241744d81efc98e75f8c2d8cc048 Mon Sep 17 00:00:00 2001
From: nat <nat@nekopon.pl>
Date: Mon, 8 Sep 2025 19:15:28 +0200
Subject: [PATCH 0060/6226] limine: disable zerocallusedregs on
 loongarch64/riscv64

---
 pkgs/by-name/li/limine/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index 0307263a1e47..70e48f53de7e 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -23,6 +23,13 @@ let
     || (if targets == [ ] then stdenv.hostPlatform.isx86_64 else (builtins.elem "x86_64" targets))
     || enableAll;
 
+  missingZerocallusedregs =
+    (
+      if targets == [ ] then stdenv.hostPlatform.isLoongArch64 else (builtins.elem "loongarch64" targets)
+    )
+    || (if targets == [ ] then stdenv.hostPlatform.isRiscV64 else (builtins.elem "riscv64" targets))
+    || enableAll;
+
   biosSupport' = biosSupport && hasX86;
   pxeSupport' = pxeSupport && hasX86;
 
@@ -54,6 +61,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   enableParallelBuilding = true;
 
+  hardeningDisable = lib.optionals missingZerocallusedregs [
+    "zerocallusedregs"
+  ];
+
   nativeBuildInputs = [
     llvmPackages.libllvm
     llvmPackages.lld

From b271bdef87f909ac437f3cc72aceed20198f23b3 Mon Sep 17 00:00:00 2001
From: nat <nat@nekopon.pl>
Date: Mon, 8 Sep 2025 20:42:15 +0200
Subject: [PATCH 0061/6226] limine-full: init

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

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 07f506fc4427..6de489a18584 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3329,6 +3329,8 @@ with pkgs;
     gtk3 = if stdenv.hostPlatform.isDarwin then gtk3-x11 else gtk3;
   };
 
+  limine-full = limine.override { enableAll = true; };
+
   liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix {
     ffmpeg = ffmpeg_6-full;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;

From ca4beaaf1cf89deb630987361fa824c785c894f3 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 20 Jul 2025 12:34:42 +0200
Subject: [PATCH 0062/6226] lib: Add splice structure utilities

---
 lib/customisation.nix | 121 ++++++++++++++++++++++++++++++++++++++++++
 lib/default.nix       |   3 ++
 lib/tests/misc.nix    |  78 +++++++++++++++++++++++++++
 3 files changed, 202 insertions(+)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index 16f248cd1b20..a20b352dfdf4 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -863,4 +863,125 @@ rec {
         transformDrv
         ;
     };
+
+  /**
+    Removes a prefix from the attribute names of a set of splices.
+
+    # Inputs
+
+    `prefix`
+    : The prefix to remove from splice attribute names
+
+    `splices`
+    : A set of splices with prefixed names
+
+    # Type
+
+    ```
+    renameSplicesFrom :: String -> AttrSet -> AttrSet
+    ```
+
+    # Examples
+
+    :::{.example}
+    ## `lib.customisation.renameSplicesFrom` usage example
+
+    ```nix
+    renameSplicesFrom "pkgs" { pkgsBuildBuild = ...; pkgsBuildHost = ...; ... }
+    => { buildBuild = ...; buildHost = ...; ... }
+    ```
+    :::
+  */
+  renameSplicesFrom = prefix: x: {
+    buildBuild = x."${prefix}BuildBuild";
+    buildHost = x."${prefix}BuildHost";
+    buildTarget = x."${prefix}BuildTarget";
+    hostHost = x."${prefix}HostHost";
+    hostTarget = x."${prefix}HostTarget";
+    targetTarget = x."${prefix}TargetTarget";
+  };
+
+  /**
+    Adds a prefix to the attribute names of a set of splices.
+
+    # Inputs
+
+    `prefix`
+    : The prefix to add to splice attribute names
+
+    `splices`
+    : A set of splices to be prefixed
+
+    # Type
+
+    ```
+    renameSplicesTo :: String -> AttrSet -> AttrSet
+    ```
+
+    # Examples
+
+    :::{.example}
+    ## `lib.customisation.renameSplicesTo` usage example
+
+    ```nix
+    renameSplicesTo "self" { buildBuild = ...; buildHost = ...; ... }
+    => { selfBuildBuild = ...; selfBuildHost = ...; ... }
+    ```
+    :::
+  */
+  renameSplicesTo = prefix: x: {
+    "${prefix}BuildBuild" = x.buildBuild;
+    "${prefix}BuildHost" = x.buildHost;
+    "${prefix}BuildTarget" = x.buildTarget;
+    "${prefix}HostHost" = x.hostHost;
+    "${prefix}HostTarget" = x.hostTarget;
+    "${prefix}TargetTarget" = x.targetTarget;
+  };
+
+  /**
+    Takes a function and applies it pointwise to each splice.
+
+    # Inputs
+
+    `f`
+    : Function to apply to each splice value
+
+    `splices`
+    : A set of splices to transform
+
+    # Type
+
+    ```
+    mapSplices :: (a -> b) -> AttrSet -> AttrSet
+    ```
+
+    # Examples
+
+    :::{.example}
+    ## `lib.customisation.mapSplices` usage example
+
+    ```nix
+    mapSplices (x: x * 10) { buildBuild = 1; buildHost = 2; ... }
+    => { buildBuild = 10; buildHost = 20; ... }
+    ```
+    :::
+  */
+  mapSplices =
+    f:
+    {
+      buildBuild,
+      buildHost,
+      buildTarget,
+      hostHost,
+      hostTarget,
+      targetTarget,
+    }:
+    {
+      buildBuild = f buildBuild;
+      buildHost = f buildHost;
+      buildTarget = f buildTarget;
+      hostHost = f hostHost;
+      hostTarget = f hostTarget;
+      targetTarget = f targetTarget;
+    };
 }
diff --git a/lib/default.nix b/lib/default.nix
index 009140f23047..9b9f8bcba1e8 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -398,6 +398,9 @@ let
         makeScopeWithSplicing
         makeScopeWithSplicing'
         extendMkDerivation
+        renameSplicesFrom
+        renameSplicesTo
+        mapSplices
         ;
       inherit (self.derivations) lazyDerivation optionalDrvAttr warnOnInstantiate;
       inherit (self.generators) mkLuaInline;
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index bb5603de75bd..4f321d2658e3 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -4432,4 +4432,82 @@ runTests {
     expected = "/non-existent/this/does/not/exist/for/real/please-dont-mess-with-your-local-fs/default.nix";
   };
 
+  # Tests for splicing utilities
+
+  testRenameSplicesFrom = {
+    expr = lib.renameSplicesFrom "pkgs" {
+      pkgsBuildBuild = "dummy-build-build";
+      pkgsBuildHost = "dummy-build-host";
+      pkgsBuildTarget = "dummy-build-target";
+      pkgsHostHost = "dummy-host-host";
+      pkgsHostTarget = "dummy-host-target";
+      pkgsTargetTarget = "dummy-target-target";
+    };
+    expected = {
+      buildBuild = "dummy-build-build";
+      buildHost = "dummy-build-host";
+      buildTarget = "dummy-build-target";
+      hostHost = "dummy-host-host";
+      hostTarget = "dummy-host-target";
+      targetTarget = "dummy-target-target";
+    };
+  };
+
+  testRenameSplicesTo = {
+    expr = lib.renameSplicesTo "self" {
+      buildBuild = "dummy-build-build";
+      buildHost = "dummy-build-host";
+      buildTarget = "dummy-build-target";
+      hostHost = "dummy-host-host";
+      hostTarget = "dummy-host-target";
+      targetTarget = "dummy-target-target";
+    };
+    expected = {
+      selfBuildBuild = "dummy-build-build";
+      selfBuildHost = "dummy-build-host";
+      selfBuildTarget = "dummy-build-target";
+      selfHostHost = "dummy-host-host";
+      selfHostTarget = "dummy-host-target";
+      selfTargetTarget = "dummy-target-target";
+    };
+  };
+
+  testMapSplices = {
+    expr = lib.mapSplices (x: x * 10) {
+      buildBuild = 1;
+      buildHost = 2;
+      buildTarget = 3;
+      hostHost = 4;
+      hostTarget = 5;
+      targetTarget = 6;
+    };
+    expected = {
+      buildBuild = 10;
+      buildHost = 20;
+      buildTarget = 30;
+      hostHost = 40;
+      hostTarget = 50;
+      targetTarget = 60;
+    };
+  };
+
+  testMapSplicesString = {
+    expr = lib.mapSplices (x: "prefix-${x}") {
+      buildBuild = "bb";
+      buildHost = "bh";
+      buildTarget = "bt";
+      hostHost = "hh";
+      hostTarget = "ht";
+      targetTarget = "tt";
+    };
+    expected = {
+      buildBuild = "prefix-bb";
+      buildHost = "prefix-bh";
+      buildTarget = "prefix-bt";
+      hostHost = "prefix-hh";
+      hostTarget = "prefix-ht";
+      targetTarget = "prefix-tt";
+    };
+  };
+
 }

From 7ba464154f85e44e4db3efb50008a62f58cea290 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sun, 20 Jul 2025 12:39:20 +0200
Subject: [PATCH 0063/6226] lib: Introduce Cross Index concept

A Cross Index, short for Cross Platform Pair Index, is the essential
shape of a splice, without the invoking the more mind bending concept
of adding variations of for these 6 pairings to an existing thing so
that it can be switched out for something else.

So the purpose of a Cross Index is to contain the result of `f`\
(which may be reified in code, or just an abstract concept):
 - f "build" "build"
 - f "build" "host"
 - ...

Splicing on the other hand refers not just to these six variants, but
to the idea of tacking them onto one of the variants. (hostTarget,
I believe)

Cross Indexes are a necessity for making cross compilation work, but
splicing is more than necessary.
---
 lib/customisation.nix | 62 ++++++++++++++++++++++++++-----------------
 lib/default.nix       |  6 ++---
 lib/tests/misc.nix    | 18 ++++++-------
 3 files changed, 50 insertions(+), 36 deletions(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index a20b352dfdf4..247891a1944e 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -865,34 +865,37 @@ rec {
     };
 
   /**
-    Removes a prefix from the attribute names of a set of splices.
+    Removes a prefix from the attribute names of a cross index.
+
+    A cross index (short for "Cross Platform Pair Index") is a 6-field structure
+    organizing values by cross-compilation platform relationships.
 
     # Inputs
 
     `prefix`
-    : The prefix to remove from splice attribute names
+    : The prefix to remove from cross index attribute names
 
-    `splices`
-    : A set of splices with prefixed names
+    `crossIndex`
+    : A cross index with prefixed names
 
     # Type
 
     ```
-    renameSplicesFrom :: String -> AttrSet -> AttrSet
+    renameCrossIndexFrom :: String -> AttrSet -> AttrSet
     ```
 
     # Examples
 
     :::{.example}
-    ## `lib.customisation.renameSplicesFrom` usage example
+    ## `lib.customisation.renameCrossIndexFrom` usage example
 
     ```nix
-    renameSplicesFrom "pkgs" { pkgsBuildBuild = ...; pkgsBuildHost = ...; ... }
+    renameCrossIndexFrom "pkgs" { pkgsBuildBuild = ...; pkgsBuildHost = ...; ... }
     => { buildBuild = ...; buildHost = ...; ... }
     ```
     :::
   */
-  renameSplicesFrom = prefix: x: {
+  renameCrossIndexFrom = prefix: x: {
     buildBuild = x."${prefix}BuildBuild";
     buildHost = x."${prefix}BuildHost";
     buildTarget = x."${prefix}BuildTarget";
@@ -902,34 +905,37 @@ rec {
   };
 
   /**
-    Adds a prefix to the attribute names of a set of splices.
+    Adds a prefix to the attribute names of a cross index.
+
+    A cross index (short for "Cross Platform Pair Index") is a 6-field structure
+    organizing values by cross-compilation platform relationships.
 
     # Inputs
 
     `prefix`
-    : The prefix to add to splice attribute names
+    : The prefix to add to cross index attribute names
 
-    `splices`
-    : A set of splices to be prefixed
+    `crossIndex`
+    : A cross index to be prefixed
 
     # Type
 
     ```
-    renameSplicesTo :: String -> AttrSet -> AttrSet
+    renameCrossIndexTo :: String -> AttrSet -> AttrSet
     ```
 
     # Examples
 
     :::{.example}
-    ## `lib.customisation.renameSplicesTo` usage example
+    ## `lib.customisation.renameCrossIndexTo` usage example
 
     ```nix
-    renameSplicesTo "self" { buildBuild = ...; buildHost = ...; ... }
+    renameCrossIndexTo "self" { buildBuild = ...; buildHost = ...; ... }
     => { selfBuildBuild = ...; selfBuildHost = ...; ... }
     ```
     :::
   */
-  renameSplicesTo = prefix: x: {
+  renameCrossIndexTo = prefix: x: {
     "${prefix}BuildBuild" = x.buildBuild;
     "${prefix}BuildHost" = x.buildHost;
     "${prefix}BuildTarget" = x.buildTarget;
@@ -939,34 +945,42 @@ rec {
   };
 
   /**
-    Takes a function and applies it pointwise to each splice.
+    Takes a function and applies it pointwise to each field of a cross index.
+
+    A cross index (short for "Cross Platform Pair Index") is a 6-field structure
+    organizing values by cross-compilation platform relationships.
 
     # Inputs
 
     `f`
-    : Function to apply to each splice value
+    : Function to apply to each cross index value
 
-    `splices`
-    : A set of splices to transform
+    `crossIndex`
+    : A cross index to transform
 
     # Type
 
     ```
-    mapSplices :: (a -> b) -> AttrSet -> AttrSet
+    mapCrossIndex :: (a -> b) -> AttrSet -> AttrSet
     ```
 
     # Examples
 
     :::{.example}
-    ## `lib.customisation.mapSplices` usage example
+    ## `lib.customisation.mapCrossIndex` usage example
 
     ```nix
-    mapSplices (x: x * 10) { buildBuild = 1; buildHost = 2; ... }
+    mapCrossIndex (x: x * 10) { buildBuild = 1; buildHost = 2; ... }
     => { buildBuild = 10; buildHost = 20; ... }
     ```
+
+    ```nix
+    # Extract a package from package sets
+    mapCrossIndex (pkgs: pkgs.hello) crossIndexedPackageSets
+    ```
     :::
   */
-  mapSplices =
+  mapCrossIndex =
     f:
     {
       buildBuild,
diff --git a/lib/default.nix b/lib/default.nix
index 9b9f8bcba1e8..52f363037b6a 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -398,9 +398,9 @@ let
         makeScopeWithSplicing
         makeScopeWithSplicing'
         extendMkDerivation
-        renameSplicesFrom
-        renameSplicesTo
-        mapSplices
+        renameCrossIndexFrom
+        renameCrossIndexTo
+        mapCrossIndex
         ;
       inherit (self.derivations) lazyDerivation optionalDrvAttr warnOnInstantiate;
       inherit (self.generators) mkLuaInline;
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 4f321d2658e3..19d3f8f1aa96 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -4432,10 +4432,10 @@ runTests {
     expected = "/non-existent/this/does/not/exist/for/real/please-dont-mess-with-your-local-fs/default.nix";
   };
 
-  # Tests for splicing utilities
+  # Tests for cross index utilities
 
-  testRenameSplicesFrom = {
-    expr = lib.renameSplicesFrom "pkgs" {
+  testRenameCrossIndexFrom = {
+    expr = lib.renameCrossIndexFrom "pkgs" {
       pkgsBuildBuild = "dummy-build-build";
       pkgsBuildHost = "dummy-build-host";
       pkgsBuildTarget = "dummy-build-target";
@@ -4453,8 +4453,8 @@ runTests {
     };
   };
 
-  testRenameSplicesTo = {
-    expr = lib.renameSplicesTo "self" {
+  testRenameCrossIndexTo = {
+    expr = lib.renameCrossIndexTo "self" {
       buildBuild = "dummy-build-build";
       buildHost = "dummy-build-host";
       buildTarget = "dummy-build-target";
@@ -4472,8 +4472,8 @@ runTests {
     };
   };
 
-  testMapSplices = {
-    expr = lib.mapSplices (x: x * 10) {
+  testMapCrossIndex = {
+    expr = lib.mapCrossIndex (x: x * 10) {
       buildBuild = 1;
       buildHost = 2;
       buildTarget = 3;
@@ -4491,8 +4491,8 @@ runTests {
     };
   };
 
-  testMapSplicesString = {
-    expr = lib.mapSplices (x: "prefix-${x}") {
+  testMapCrossIndexString = {
+    expr = lib.mapCrossIndex (x: "prefix-${x}") {
       buildBuild = "bb";
       buildHost = "bh";
       buildTarget = "bt";

From f8566d22c152baea486dfd69ca5d38ef1dd581a7 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Sat, 6 Sep 2025 16:59:20 +0200
Subject: [PATCH 0064/6226] pkgs/splice.nix: Refactor, use cross index helpers

---
 pkgs/top-level/splice.nix | 65 ++++++++++-----------------------------
 1 file changed, 16 insertions(+), 49 deletions(-)

diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix
index 6d3ad1174107..253cb2a6cc40 100644
--- a/pkgs/top-level/splice.nix
+++ b/pkgs/top-level/splice.nix
@@ -17,48 +17,30 @@
 lib: pkgs: actuallySplice:
 
 let
+  inherit (lib.customisation) mapCrossIndex renameCrossIndexFrom;
 
   spliceReal =
-    {
-      pkgsBuildBuild,
-      pkgsBuildHost,
-      pkgsBuildTarget,
-      pkgsHostHost,
-      pkgsHostTarget,
-      pkgsTargetTarget,
-    }:
+    inputs:
     let
       mash =
         # Other pkgs sets
-        pkgsBuildBuild
-        // pkgsBuildTarget
-        // pkgsHostHost
-        // pkgsTargetTarget
+        inputs.buildBuild
+        // inputs.buildTarget
+        // inputs.hostHost
+        // inputs.targetTarget
         # The same pkgs sets one probably intends
-        // pkgsBuildHost
-        // pkgsHostTarget;
+        // inputs.buildHost
+        // inputs.hostTarget;
       merge = name: {
         inherit name;
         value =
           let
             defaultValue = mash.${name};
             # `or {}` is for the non-derivation attsert splicing case, where `{}` is the identity.
-            valueBuildBuild = pkgsBuildBuild.${name} or { };
-            valueBuildHost = pkgsBuildHost.${name} or { };
-            valueBuildTarget = pkgsBuildTarget.${name} or { };
-            valueHostHost = pkgsHostHost.${name} or { };
-            valueHostTarget = pkgsHostTarget.${name} or { };
-            valueTargetTarget = pkgsTargetTarget.${name} or { };
+            value' = mapCrossIndex (x: x.${name} or { }) inputs;
+
             augmentedValue = defaultValue // {
-              __spliced =
-                (lib.optionalAttrs (pkgsBuildBuild ? ${name}) { buildBuild = valueBuildBuild; })
-                // (lib.optionalAttrs (pkgsBuildHost ? ${name}) { buildHost = valueBuildHost; })
-                // (lib.optionalAttrs (pkgsBuildTarget ? ${name}) { buildTarget = valueBuildTarget; })
-                // (lib.optionalAttrs (pkgsHostHost ? ${name}) { hostHost = valueHostHost; })
-                // (lib.optionalAttrs (pkgsHostTarget ? ${name}) { hostTarget = valueHostTarget; })
-                // (lib.optionalAttrs (pkgsTargetTarget ? ${name}) {
-                  targetTarget = valueTargetTarget;
-                });
+              __spliced = lib.filterAttrs (k: v: inputs.${k} ? ${name}) value';
             };
             # Get the set of outputs of a derivation. If one derivation fails to
             # evaluate we don't want to diverge the entire splice, so we fall back
@@ -76,27 +58,12 @@ let
           # on to splice them together.
           if lib.isDerivation defaultValue then
             augmentedValue
-            // spliceReal {
-              pkgsBuildBuild = tryGetOutputs valueBuildBuild;
-              pkgsBuildHost = tryGetOutputs valueBuildHost;
-              pkgsBuildTarget = tryGetOutputs valueBuildTarget;
-              pkgsHostHost = tryGetOutputs valueHostHost;
-              pkgsHostTarget = getOutputs valueHostTarget;
-              pkgsTargetTarget = tryGetOutputs valueTargetTarget;
-              # Just recur on plain attrsets
-            }
+            // spliceReal (mapCrossIndex tryGetOutputs value' // { hostTarget = getOutputs value'.hostTarget; })
           else if lib.isAttrs defaultValue then
-            spliceReal {
-              pkgsBuildBuild = valueBuildBuild;
-              pkgsBuildHost = valueBuildHost;
-              pkgsBuildTarget = valueBuildTarget;
-              pkgsHostHost = valueHostHost;
-              pkgsHostTarget = valueHostTarget;
-              pkgsTargetTarget = valueTargetTarget;
-              # Don't be fancy about non-derivations. But we could have used used
-              # `__functor__` for functions instead.
-            }
+            spliceReal value'
           else
+            # Don't be fancy about non-derivations. But we could have used used
+            # `__functor__` for functions instead.
             defaultValue;
       };
     in
@@ -111,7 +78,7 @@ let
       pkgsHostTarget,
       pkgsTargetTarget,
     }@args:
-    if actuallySplice then spliceReal args else pkgsHostTarget;
+    if actuallySplice then spliceReal (renameCrossIndexFrom "pkgs" args) else pkgsHostTarget;
 
   splicedPackages =
     splicePackages {

From d87ec61ac2f680e60a00118552e68d186ddf7081 Mon Sep 17 00:00:00 2001
From: Quozlet <git@quozlet.net>
Date: Tue, 9 Sep 2025 03:54:14 +0000
Subject: [PATCH 0065/6226] bazel_7: fix bazelBootstrap hash mismatch from
 prior version bump

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

diff --git a/pkgs/by-name/ba/bazel_7/package.nix b/pkgs/by-name/ba/bazel_7/package.nix
index 539b563e10aa..7952a07757c8 100644
--- a/pkgs/by-name/ba/bazel_7/package.nix
+++ b/pkgs/by-name/ba/bazel_7/package.nix
@@ -108,23 +108,23 @@ let
       if stdenv.hostPlatform.system == "x86_64-linux" then
         fetchurl {
           url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-x86_64";
-          hash = "sha256-CYL1paAtzTbfl7TfsqwJry/dkoTO/yZdHrX0NSA1+Ig=";
+          hash = "sha256-94KFvsS7fInXFTQZPzMq6DxnHQrRktljwACyAz8adSw=";
         }
       else if stdenv.hostPlatform.system == "aarch64-linux" then
         fetchurl {
           url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel_nojdk-${version}-linux-arm64";
-          hash = "sha256-6DzTEx218/Qq38eMWvXOX/t9VJDyPczz6Edh4eHdOfg=";
+          hash = "sha256-wfuZLSHa77wr0A4ZLF5DqH7qyOljYNXM2a5imoS+nGQ";
         }
       else if stdenv.hostPlatform.system == "x86_64-darwin" then
         fetchurl {
           url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-x86_64";
-          hash = "sha256-Ut00wXzJezqlvf49RcTjk4Im8j3Qv7R77t1iWpU/HwU=";
+          hash = "sha256-qAb9s6R5+EbqVfWHUT7sk1sOrbDEPv4EhgXH7nC46Zw=";
         }
       else
         fetchurl {
           # stdenv.hostPlatform.system == "aarch64-darwin"
           url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-darwin-arm64";
-          hash = "sha256-ArEXuX0JIa5NT04R0n4sCTA4HfQW43NDXV0EGcaibyQ=";
+          hash = "sha256-4bRp4OvkRIvhpZ2r/eFJdwrByECHy3rncDEM1tClFYo=";
         };
 
     nativeBuildInputs = defaultShellUtils;

From 0173b5c7aebc72d13b19532ce23f1a18e36728bd Mon Sep 17 00:00:00 2001
From: Gus <58223632+thegu5@users.noreply.github.com>
Date: Sun, 31 Aug 2025 22:49:30 -0400
Subject: [PATCH 0066/6226] shira: init at 1.7.1-unstable-2025-08-31

---
 pkgs/by-name/sh/shira/package.nix | 49 +++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 pkgs/by-name/sh/shira/package.nix

diff --git a/pkgs/by-name/sh/shira/package.nix b/pkgs/by-name/sh/shira/package.nix
new file mode 100644
index 000000000000..4fd7651f10de
--- /dev/null
+++ b/pkgs/by-name/sh/shira/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  ffmpeg,
+}:
+
+python3Packages.buildPythonApplication {
+  pname = "shira";
+  version = "1.7.1-unstable-2025-08-31";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "KraXen72";
+    repo = "shira";
+    rev = "a7478efa434597324458441f328c1b2f84c04dbc";
+    hash = "sha256-k15GaOmS0rlQBQldnLo1SzIyCkNQux6P5b7ZG2BIa90=";
+  };
+
+  build-system = [
+    python3Packages.flit-core
+  ];
+
+  dependencies = with python3Packages; [
+    click
+    mediafile
+    pillow
+    python-dateutil
+    requests-cache
+    yt-dlp
+    ytmusicapi
+  ];
+
+  makeWrapperArgs = [
+    "--prefix PATH : ${
+      lib.makeBinPath [
+        ffmpeg
+      ]
+    }"
+  ];
+
+  meta = {
+    description = "Download music from YouTube, YouTube Music and Soundcloud";
+    homepage = "https://github.com/KraXen72/shira/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ thegu5 ];
+    mainProgram = "shiradl";
+  };
+}

From ffbb3f889b449db9ebbae41b68cb11d1f6c77104 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 10 Sep 2025 00:55:33 +0000
Subject: [PATCH 0067/6226] libxfixes: 6.0.1 -> 6.0.2

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

diff --git a/pkgs/by-name/li/libxfixes/package.nix b/pkgs/by-name/li/libxfixes/package.nix
index cf51e21d9d1e..026a2d4259ec 100644
--- a/pkgs/by-name/li/libxfixes/package.nix
+++ b/pkgs/by-name/li/libxfixes/package.nix
@@ -10,7 +10,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "libxfixes";
-  version = "6.0.1";
+  version = "6.0.2";
 
   outputs = [
     "out"
@@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://xorg/individual/lib/libXfixes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-tpX5PNJJlCGrAtInREWOZQzMiMHUyBMNYCACE6vALVg=";
+    hash = "sha256-OfEV1y2cX4ER5GhBZNPWjMH9Ifmyf/JAGwj938D0Cbo=";
   };
 
   strictDeps = true;

From 35ae775d6b6b58f883f3aa584885d11b375ee652 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Wed, 10 Sep 2025 19:50:07 +0200
Subject: [PATCH 0068/6226] gelasio: unstable-2022-06-09 -> unstable-2025-06-30

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

diff --git a/pkgs/by-name/ge/gelasio/package.nix b/pkgs/by-name/ge/gelasio/package.nix
index 1a0ef4b5bcd0..bc3a91058b61 100644
--- a/pkgs/by-name/ge/gelasio/package.nix
+++ b/pkgs/by-name/ge/gelasio/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "gelasio";
-  version = "0-unstable-2022-06-09";
+  version = "0-unstable-2025-06-30";
 
   src = fetchFromGitHub {
     owner = "SorkinType";
     repo = "Gelasio";
-    rev = "a75c6d30a35f74cdbaea1813bdbcdb64bb11d3d5";
-    hash = "sha256-ncm0lSDPPPREdxTx3dGl6OGBn4FGAjFTlQpA6oDCdMI=";
+    rev = "4d7a1d2c662582095982a3851e50d7f1e034255b";
+    hash = "sha256-GfJjpiTBayNfGULf3vqFOvQw9rqXIe8JJmF3fI9Km+Y=";
   };
 
   dontBuild = true;

From 02eeaee65f59d8719d17d07ec0d326bf87880c3d Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 11 Sep 2025 07:03:42 +0100
Subject: [PATCH 0069/6226] btrfs-progs: 6.16 -> 6.16.1

Changes: https://github.com/kdave/btrfs-progs/releases/tag/v6.16.1
---
 pkgs/by-name/bt/btrfs-progs/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bt/btrfs-progs/package.nix b/pkgs/by-name/bt/btrfs-progs/package.nix
index fd8e3bce91c4..5527d82577c8 100644
--- a/pkgs/by-name/bt/btrfs-progs/package.nix
+++ b/pkgs/by-name/bt/btrfs-progs/package.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation rec {
   pname = "btrfs-progs";
-  version = "6.16";
+  version = "6.16.1";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    hash = "sha256-Makw+HN8JhioJK1L0f3YP1QQPg6qFaqtxIT/rjNGb8U=";
+    hash = "sha256-cKo/lUAXynQ1KYKN6yoQ3Oqy1BMhWDrRV+lnhH3bJPw=";
   };
 
   nativeBuildInputs = [

From 4fc541174f30d634b5bed5f20f4a941c82b5fc21 Mon Sep 17 00:00:00 2001
From: "vars.leha44581" <vars.leha55481@gmail.com>
Date: Thu, 11 Sep 2025 16:40:38 +0300
Subject: [PATCH 0070/6226] maintainers: added leha44581

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 4c763e3d157c..fc86e8b3352f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14345,6 +14345,12 @@
     githubId = 4701504;
     name = "James Robinson";
   };
+  leha44581 = {
+    email = "leha55481@gmail.com";
+    github = "Leha44581";
+    githubId = 70238465;
+    name = "Leha";
+  };
   leifhelm = {
     email = "jakob.leifhelm@gmail.com";
     github = "leifhelm";

From 87363e629ba411a91df8eb9171de6865fd2773a1 Mon Sep 17 00:00:00 2001
From: leha44581 <leha55481@gmail.com>
Date: Fri, 12 Sep 2025 14:27:37 +0300
Subject: [PATCH 0071/6226] audiomatch: init at 0.2.2

Co-authored-by: Eman Resu <78693624+quatquatt@users.noreply.github.com>
Co-authored-by: Notarin Steele <424c414e4b@gmail.com>
Co-authored-by: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
---
 pkgs/by-name/au/audiomatch/package.nix | 45 ++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 pkgs/by-name/au/audiomatch/package.nix

diff --git a/pkgs/by-name/au/audiomatch/package.nix b/pkgs/by-name/au/audiomatch/package.nix
new file mode 100644
index 000000000000..a813bc814fa5
--- /dev/null
+++ b/pkgs/by-name/au/audiomatch/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  chromaprint,
+  fetchFromGitHub,
+  python3Packages,
+}:
+python3Packages.buildPythonPackage rec {
+  version = "0.2.2";
+  pname = "audiomatch";
+  pyproject = true;
+  src = fetchFromGitHub {
+    owner = "unmade";
+    repo = "audiomatch";
+    tag = version;
+    hash = "sha256-I7gTP2lwg4EDNmI+tVmI721/nEDShb7q21tD9tRbskY=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+     --replace-fail 'poetry>=0.12,<1.0' "poetry-core" \
+     --replace-fail 'poetry.masonry.api' 'poetry.core.masonry.api'
+
+    substituteInPlace src/audiomatch/fingerprints.py \
+     --replace-fail 'fpcalc' '${lib.getExe chromaprint}'
+  '';
+
+  build-system = [
+    python3Packages.poetry-core
+    python3Packages.distutils
+  ];
+
+  nativeCheckInputs = [
+    python3Packages.pytestCheckHook
+  ];
+
+  meta = {
+    homepage = "https://github.com/unmade/audiomatch";
+    description = "A small command-line tool to find similar audio files";
+    changelog = "https://github.com/unmade/audiomatch/releases/tag/${version}";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    mainProgram = "audiomatch";
+    maintainers = with lib.maintainers; [ leha44581 ];
+  };
+}

From 0307f20d57587a2564d27be438a8ef80959f6863 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Sep 2025 21:51:07 +0000
Subject: [PATCH 0072/6226] cpuinfo: 0-unstable-2025-07-24 ->
 0-unstable-2025-09-05

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

diff --git a/pkgs/by-name/cp/cpuinfo/package.nix b/pkgs/by-name/cp/cpuinfo/package.nix
index fdde7e38af04..01f453bf1152 100644
--- a/pkgs/by-name/cp/cpuinfo/package.nix
+++ b/pkgs/by-name/cp/cpuinfo/package.nix
@@ -10,13 +10,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "cpuinfo";
-  version = "0-unstable-2025-07-24";
+  version = "0-unstable-2025-09-05";
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "cpuinfo";
-    rev = "33ed0be77d7767d0e2010e2c3cf972ef36c7c307";
-    hash = "sha256-0rZzbZkOo6DAt1YnH4rtx0FvmCuYH8M6X3DNJ0gURpU=";
+    rev = "877328f188a3c7d1fa855871a278eb48d530c4c0";
+    hash = "sha256-JW83AgI1cWv4TSpXNe9sv/hNYAA7MOdUeTHY8+0lHgc=";
   };
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };

From 0922a4b685bc61cd7ad8e31e7d6dd2c79a06418a Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 13 Sep 2025 20:57:51 +0200
Subject: [PATCH 0073/6226] font-bh-100dpi: refactor, migrate to pkgs/by-name &
 rename from xorg.fontbh100dpi

the package output doesn't change
---
 pkgs/by-name/fo/font-bh-100dpi/package.nix    | 51 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 43 +---------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 55 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-bh-100dpi/package.nix

diff --git a/pkgs/by-name/fo/font-bh-100dpi/package.nix b/pkgs/by-name/fo/font-bh-100dpi/package.nix
new file mode 100644
index 000000000000..d7e65f131f08
--- /dev/null
+++ b/pkgs/by-name/fo/font-bh-100dpi/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  font-util,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-bh-100dpi";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-bh-100dpi-${finalAttrs.version}.tar.xz";
+    hash = "sha256-/Y9e/oSR+qvdJ0SAjT1Or9rlyD5hcBfH/d0nFtBJqx4=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    bdftopcf
+    font-util
+    mkfontscale
+  ];
+
+  buildInputs = [ font-util ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Luxi 100dpi pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/bh-100dpi";
+    license = lib.licenses.unfreeRedistributable;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 15acd52e9e48..8e2759acc1cb 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -3,6 +3,7 @@
   lib,
   bdftopcf,
   font-alias,
+  font-bh-100dpi,
   font-bh-ttf,
   font-bh-type1,
   font-encodings,
@@ -118,6 +119,7 @@ self: with self; {
     ;
   encodings = font-encodings;
   fontalias = font-alias;
+  fontbh100dpi = font-bh-100dpi;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
   fontmuttmisc = font-mutt-misc;
@@ -534,47 +536,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontbh100dpi = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-bh-100dpi";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-bh-100dpi-1.0.4.tar.xz";
-        sha256 = "07mb9781c9yxzp3ifw317v4fbnmg9qyqv0244zfspylihkz5x3zx";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        fontutil
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontbh75dpi = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 0abd26780af1..08c557c60974 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -319,6 +319,7 @@ print OUT <<EOF;
   lib,
   bdftopcf,
   font-alias,
+  font-bh-100dpi,
   font-bh-ttf,
   font-bh-type1,
   font-encodings,
@@ -434,6 +435,7 @@ self: with self; {
     ;
   encodings = font-encodings;
   fontalias = font-alias;
+  fontbh100dpi = font-bh-100dpi;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
   fontmuttmisc = font-mutt-misc;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index df416c019038..afeb0a04ac44 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1023,7 +1023,6 @@ self: super:
       "fontadobeutopia100dpi"
       "fontadobeutopia75dpi"
       "fontibmtype1"
-      "fontbh100dpi"
       "fontbh75dpi"
 
       # Bigelow & Holmes fonts
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index c9e2c7583076..e1800e31eeed 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -100,7 +100,6 @@ mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.5.tar.xz
 mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.5.tar.xz
 mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bh-75dpi-1.0.4.tar.xz
-mirror://xorg/individual/font/font-bh-100dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bitstream-75dpi-1.0.4.tar.xz

From 14cf636039e48082bc98432798cc4ad9444f47dc Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 13 Sep 2025 21:01:59 +0200
Subject: [PATCH 0074/6226] font-bh-75dpi: refactor, move to pkgs/by-name &
 rename from xorg.fontbh75dpi

the package output doesn't change
---
 pkgs/by-name/fo/font-bh-75dpi/package.nix     | 51 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 43 +---------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 55 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-bh-75dpi/package.nix

diff --git a/pkgs/by-name/fo/font-bh-75dpi/package.nix b/pkgs/by-name/fo/font-bh-75dpi/package.nix
new file mode 100644
index 000000000000..f639da44cfbe
--- /dev/null
+++ b/pkgs/by-name/fo/font-bh-75dpi/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  font-util,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-bh-75dpi";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-bh-75dpi-${finalAttrs.version}.tar.xz";
+    hash = "sha256-YCbYwHNWPdPLtIeNAHbu2XDeur0hQjs7Yd2QRBuefNo=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    bdftopcf
+    font-util
+    mkfontscale
+  ];
+
+  buildInputs = [ font-util ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Luxi 75dpi pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/bh-75dpi";
+    license = lib.licenses.unfreeRedistributable;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 8e2759acc1cb..568ff545aafd 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -4,6 +4,7 @@
   bdftopcf,
   font-alias,
   font-bh-100dpi,
+  font-bh-75dpi,
   font-bh-ttf,
   font-bh-type1,
   font-encodings,
@@ -120,6 +121,7 @@ self: with self; {
   encodings = font-encodings;
   fontalias = font-alias;
   fontbh100dpi = font-bh-100dpi;
+  fontbh75dpi = font-bh-75dpi;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
   fontmuttmisc = font-mutt-misc;
@@ -536,47 +538,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontbh75dpi = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-bh-75dpi";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-bh-75dpi-1.0.4.tar.xz";
-        sha256 = "1nkwkqdl946xc4xknhi1pnxdww6rxrv013c7nk5x6ganfg0dh9k0";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        fontutil
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontbhlucidatypewriter100dpi = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 08c557c60974..f025450bddc9 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -320,6 +320,7 @@ print OUT <<EOF;
   bdftopcf,
   font-alias,
   font-bh-100dpi,
+  font-bh-75dpi,
   font-bh-ttf,
   font-bh-type1,
   font-encodings,
@@ -436,6 +437,7 @@ self: with self; {
   encodings = font-encodings;
   fontalias = font-alias;
   fontbh100dpi = font-bh-100dpi;
+  fontbh75dpi = font-bh-75dpi;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
   fontmuttmisc = font-mutt-misc;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index afeb0a04ac44..5c4ec3731aa5 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1023,7 +1023,6 @@ self: super:
       "fontadobeutopia100dpi"
       "fontadobeutopia75dpi"
       "fontibmtype1"
-      "fontbh75dpi"
 
       # Bigelow & Holmes fonts
       # https://www.x.org/releases/current/doc/xorg-docs/License.html#Bigelow_Holmes_Inc_and_URW_GmbH_Luxi_font_license
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index e1800e31eeed..8ca724bf04ce 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -99,7 +99,6 @@ mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz
 mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.5.tar.xz
 mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.5.tar.xz
 mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz
-mirror://xorg/individual/font/font-bh-75dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bitstream-75dpi-1.0.4.tar.xz

From 7abbe6b31ef74a20b96405abaf09c4a0773d3f44 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 13 Sep 2025 21:43:46 +0200
Subject: [PATCH 0075/6226] font-bh-lucidatypewriter-100dpi: refactor, move to
 pkgs/by-name & rename from xorg.fontbhlucidatypewriter100dpi

this doesn't change the package output'
---
 .../package.nix                               | 52 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 43 +--------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 56 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix

diff --git a/pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix b/pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix
new file mode 100644
index 000000000000..d25eabfe905a
--- /dev/null
+++ b/pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  font-util,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-bh-lucidatypewriter-100dpi";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-${finalAttrs.version}.tar.xz";
+    hash = "sha256-duwJ7aQJSinUe5HPWcProinI99HKa64qu7P5JeM96PI=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    bdftopcf
+    font-util
+    mkfontscale
+  ];
+
+  buildInputs = [ font-util ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Lucida Sans Typewriter 100dpi pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/bh-lucidatypewriter-100dpi";
+    # no license just a copyright notice
+    license = lib.licenses.unfree;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 568ff545aafd..685603d467a3 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -5,6 +5,7 @@
   font-alias,
   font-bh-100dpi,
   font-bh-75dpi,
+  font-bh-lucidatypewriter-100dpi,
   font-bh-ttf,
   font-bh-type1,
   font-encodings,
@@ -122,6 +123,7 @@ self: with self; {
   fontalias = font-alias;
   fontbh100dpi = font-bh-100dpi;
   fontbh75dpi = font-bh-75dpi;
+  fontbhlucidatypewriter100dpi = font-bh-lucidatypewriter-100dpi;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
   fontmuttmisc = font-mutt-misc;
@@ -538,47 +540,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontbhlucidatypewriter100dpi = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-bh-lucidatypewriter-100dpi";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz";
-        sha256 = "1wp87pijbydkpcmawsyas7vwhad2xg1mkkwigga2jjh9lknhkv3n";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        fontutil
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontbhlucidatypewriter75dpi = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index f025450bddc9..40b2c2ec1e4e 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -321,6 +321,7 @@ print OUT <<EOF;
   font-alias,
   font-bh-100dpi,
   font-bh-75dpi,
+  font-bh-lucidatypewriter-100dpi,
   font-bh-ttf,
   font-bh-type1,
   font-encodings,
@@ -438,6 +439,7 @@ self: with self; {
   fontalias = font-alias;
   fontbh100dpi = font-bh-100dpi;
   fontbh75dpi = font-bh-75dpi;
+  fontbhlucidatypewriter100dpi = font-bh-lucidatypewriter-100dpi;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
   fontmuttmisc = font-mutt-misc;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 5c4ec3731aa5..15c46a6434f8 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1026,7 +1026,6 @@ self: super:
 
       # Bigelow & Holmes fonts
       # https://www.x.org/releases/current/doc/xorg-docs/License.html#Bigelow_Holmes_Inc_and_URW_GmbH_Luxi_font_license
-      "fontbhlucidatypewriter100dpi"
       "fontbhlucidatypewriter75dpi"
     ];
 
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 8ca724bf04ce..09669e27ea1b 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -100,7 +100,6 @@ mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.5.tar.xz
 mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.5.tar.xz
 mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz
-mirror://xorg/individual/font/font-bh-lucidatypewriter-100dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bitstream-75dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bitstream-100dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bitstream-speedo-1.0.2.tar.gz

From 837e11d2c395a452d2a488142345a3229838338f Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Tue, 26 Aug 2025 16:17:39 +0200
Subject: [PATCH 0076/6226] font-bh-lucidatypewriter-75dpi: refactor, move to
 pkgs/by-name and rename from xorg.fontbhlucidatypewriter75dpi

relevant changes:
- license is now unfree instead of unfreeRedistributable because the
  COPYING file in the repo only has a copyright notice
  The link in overrides goes to the license of the Bigelow & Holmes Luxi
  fonts which are the font-bh-<...> packages

this doesn't change the package output
---
 .../package.nix                               | 52 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 43 +--------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  4 --
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 56 insertions(+), 46 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix

diff --git a/pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix b/pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix
new file mode 100644
index 000000000000..455fe1a6f326
--- /dev/null
+++ b/pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  font-util,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-bh-lucidatypewriter-75dpi";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-${finalAttrs.version}.tar.xz";
+    hash = "sha256-hk4sOaxh8E9pP8LIqq7SSymMLNQCg87BLu5FnFY16PU=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    bdftopcf
+    font-util
+    mkfontscale
+  ];
+
+  buildInputs = [ font-util ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Lucida Sans Typewriter 75dpi pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/bh-lucidatypewriter-75dpi";
+    # no license just a copyright notice
+    license = lib.licenses.unfree;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 685603d467a3..d0c01ca208ea 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -6,6 +6,7 @@
   font-bh-100dpi,
   font-bh-75dpi,
   font-bh-lucidatypewriter-100dpi,
+  font-bh-lucidatypewriter-75dpi,
   font-bh-ttf,
   font-bh-type1,
   font-encodings,
@@ -124,6 +125,7 @@ self: with self; {
   fontbh100dpi = font-bh-100dpi;
   fontbh75dpi = font-bh-75dpi;
   fontbhlucidatypewriter100dpi = font-bh-lucidatypewriter-100dpi;
+  fontbhlucidatypewriter75dpi = font-bh-lucidatypewriter-75dpi;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
   fontmuttmisc = font-mutt-misc;
@@ -540,47 +542,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontbhlucidatypewriter75dpi = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-bh-lucidatypewriter-75dpi";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz";
-        sha256 = "1xg86mb9qigf5v0wx0q2shn8qaabsapamj627xllzw31mhwjqkl6";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        fontutil
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontbitstream100dpi = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 40b2c2ec1e4e..fb4aee3cddfa 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -322,6 +322,7 @@ print OUT <<EOF;
   font-bh-100dpi,
   font-bh-75dpi,
   font-bh-lucidatypewriter-100dpi,
+  font-bh-lucidatypewriter-75dpi,
   font-bh-ttf,
   font-bh-type1,
   font-encodings,
@@ -440,6 +441,7 @@ self: with self; {
   fontbh100dpi = font-bh-100dpi;
   fontbh75dpi = font-bh-75dpi;
   fontbhlucidatypewriter100dpi = font-bh-lucidatypewriter-100dpi;
+  fontbhlucidatypewriter75dpi = font-bh-lucidatypewriter-75dpi;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
   fontmuttmisc = font-mutt-misc;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 15c46a6434f8..cf4e4d35c5a8 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1023,10 +1023,6 @@ self: super:
       "fontadobeutopia100dpi"
       "fontadobeutopia75dpi"
       "fontibmtype1"
-
-      # Bigelow & Holmes fonts
-      # https://www.x.org/releases/current/doc/xorg-docs/License.html#Bigelow_Holmes_Inc_and_URW_GmbH_Luxi_font_license
-      "fontbhlucidatypewriter75dpi"
     ];
 
     # unfree, possibly not redistributable
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 09669e27ea1b..852ccbe5e19f 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -99,7 +99,6 @@ mirror://xorg/individual/font/font-adobe-utopia-75dpi-1.0.5.tar.xz
 mirror://xorg/individual/font/font-adobe-utopia-100dpi-1.0.5.tar.xz
 mirror://xorg/individual/font/font-adobe-utopia-type1-1.0.5.tar.xz
 mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz
-mirror://xorg/individual/font/font-bh-lucidatypewriter-75dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bitstream-75dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bitstream-100dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bitstream-speedo-1.0.2.tar.gz

From ab33dd85d43a295dfc5777cbd778afff4d6cf0f3 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 13 Sep 2025 22:24:06 +0200
Subject: [PATCH 0077/6226] font-bh{,-lucidatypewriter}-{100,75}dpi: move font
 from $out/lib to $out/share

also fixes the paths in xdummy to point to the new font locations
---
 pkgs/by-name/fo/font-bh-100dpi/package.nix                  | 2 +-
 pkgs/by-name/fo/font-bh-75dpi/package.nix                   | 2 +-
 pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix | 2 +-
 pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix  | 2 +-
 pkgs/by-name/xd/xdummy/package.nix                          | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/fo/font-bh-100dpi/package.nix b/pkgs/by-name/fo/font-bh-100dpi/package.nix
index d7e65f131f08..7932de16aa13 100644
--- a/pkgs/by-name/fo/font-bh-100dpi/package.nix
+++ b/pkgs/by-name/fo/font-bh-100dpi/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ font-util ];
 
-  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+  configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
 
   passthru = {
     updateScript = writeScript "update-${finalAttrs.pname}" ''
diff --git a/pkgs/by-name/fo/font-bh-75dpi/package.nix b/pkgs/by-name/fo/font-bh-75dpi/package.nix
index f639da44cfbe..c970a3826f54 100644
--- a/pkgs/by-name/fo/font-bh-75dpi/package.nix
+++ b/pkgs/by-name/fo/font-bh-75dpi/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ font-util ];
 
-  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+  configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
 
   passthru = {
     updateScript = writeScript "update-${finalAttrs.pname}" ''
diff --git a/pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix b/pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix
index d25eabfe905a..7f80b188a61d 100644
--- a/pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix
+++ b/pkgs/by-name/fo/font-bh-lucidatypewriter-100dpi/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ font-util ];
 
-  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+  configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
 
   passthru = {
     updateScript = writeScript "update-${finalAttrs.pname}" ''
diff --git a/pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix b/pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix
index 455fe1a6f326..696a05e0e0e1 100644
--- a/pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix
+++ b/pkgs/by-name/fo/font-bh-lucidatypewriter-75dpi/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ font-util ];
 
-  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+  configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
 
   passthru = {
     updateScript = writeScript "update-${finalAttrs.pname}" ''
diff --git a/pkgs/by-name/xd/xdummy/package.nix b/pkgs/by-name/xd/xdummy/package.nix
index 399226c7fc85..eca25be27d56 100644
--- a/pkgs/by-name/xd/xdummy/package.nix
+++ b/pkgs/by-name/xd/xdummy/package.nix
@@ -34,9 +34,9 @@ let
       FontPath "${xorg.fontmiscmisc}/lib/X11/fonts/misc"
       FontPath "${xorg.fontcursormisc}/lib/X11/fonts/misc"
     ${lib.optionalString unfreeFonts ''
-      FontPath "${xorg.fontbhlucidatypewriter75dpi}/lib/X11/fonts/75dpi"
-      FontPath "${xorg.fontbhlucidatypewriter100dpi}/lib/X11/fonts/100dpi"
-      FontPath "${xorg.fontbh100dpi}/lib/X11/fonts/100dpi"
+      FontPath "${xorg.fontbhlucidatypewriter75dpi}/share/fonts/X11/75dpi"
+      FontPath "${xorg.fontbhlucidatypewriter100dpi}/share/fonts/X11/100dpi"
+      FontPath "${xorg.fontbh100dpi}/share/fonts/X11/100dpi"
     ''}
     EndSection
 

From 5e23f445e5d81021389cdae7449e143cd3811a5b Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 27 Aug 2025 05:07:03 +0200
Subject: [PATCH 0078/6226] font-cronyx-cyrillic: refactor, move to
 pkgs/by-name and rename from xorg.fontcronyxcyrillic

this doesn't change the output of the package
---
 .../fo/font-cronyx-cyrillic/package.nix       | 45 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +----------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 49 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-cronyx-cyrillic/package.nix

diff --git a/pkgs/by-name/fo/font-cronyx-cyrillic/package.nix b/pkgs/by-name/fo/font-cronyx-cyrillic/package.nix
new file mode 100644
index 000000000000..449f10bc3ae1
--- /dev/null
+++ b/pkgs/by-name/fo/font-cronyx-cyrillic/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-cronyx-cyrillic";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-cronyx-cyrillic-${finalAttrs.version}.tar.xz";
+    hash = "sha256-3AeBzg3L/9v2quGgAXOhNAP5Kw3pJbylqeEX5OLWt4k=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    bdftopcf
+    mkfontscale
+  ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Cronyx pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/cronyx-cyrillic";
+    license = lib.licenses.cronyx;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index c03863a205d9..cc42b60448d2 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -10,6 +10,7 @@
   font-alias,
   font-bh-ttf,
   font-bh-type1,
+  font-cronyx-cyrillic,
   font-encodings,
   font-mutt-misc,
   font-util,
@@ -140,6 +141,7 @@ self: with self; {
   fontalias = font-alias;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
+  fontcronyxcyrillic = font-cronyx-cyrillic;
   fontmuttmisc = font-mutt-misc;
   fontutil = font-util;
   libAppleWM = libapplewm;
@@ -672,46 +674,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontcronyxcyrillic = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-cronyx-cyrillic";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.4.tar.xz";
-        sha256 = "12dpsvif85z1m6jvq9g91lmzj0rll5rh3871mbvdpzyb1p7821yw";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontcursormisc = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 9975b4053e15..d44ac181bb5d 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -326,6 +326,7 @@ print OUT <<EOF;
   font-alias,
   font-bh-ttf,
   font-bh-type1,
+  font-cronyx-cyrillic,
   font-encodings,
   font-mutt-misc,
   font-util,
@@ -456,6 +457,7 @@ self: with self; {
   fontalias = font-alias;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
+  fontcronyxcyrillic = font-cronyx-cyrillic;
   fontmuttmisc = font-mutt-misc;
   fontutil = font-util;
   libAppleWM = libapplewm;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index b9f495cf71f5..242e07503291 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -97,7 +97,6 @@ mirror://xorg/individual/font/font-bitstream-75dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bitstream-100dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bitstream-speedo-1.0.2.tar.gz
 mirror://xorg/individual/font/font-bitstream-type1-1.0.4.tar.xz
-mirror://xorg/individual/font/font-cronyx-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-cursor-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-daewoo-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-dec-misc-1.0.4.tar.xz

From 191109e0d90ec68854a894499607ba1bd6945e9d Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 28 Aug 2025 01:18:57 +0200
Subject: [PATCH 0079/6226] font-isas-misc: refactor, move to pkgs/by-name and
 rename from xorg.fontisasmisc

relevant changes:
- remove some unneeded deps and configureFlags

the package output doesn't change
---
 pkgs/by-name/fo/font-isas-misc/package.nix    | 45 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +----------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 49 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-isas-misc/package.nix

diff --git a/pkgs/by-name/fo/font-isas-misc/package.nix b/pkgs/by-name/fo/font-isas-misc/package.nix
new file mode 100644
index 000000000000..e098e7d3857d
--- /dev/null
+++ b/pkgs/by-name/fo/font-isas-misc/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-isas-misc";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-isas-misc-${finalAttrs.version}.tar.xz";
+    hash = "sha256-R+WVu+baREufb8qiZTmrx7oZieI6+mzcSeIuSEzEOPw=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    bdftopcf
+    mkfontscale
+  ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Isas Fangsong ti & Song ti pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/isas-misc";
+    license = lib.licenses.hpnd;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index cc42b60448d2..4154351c639f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -12,6 +12,7 @@
   font-bh-type1,
   font-cronyx-cyrillic,
   font-encodings,
+  font-isas-misc,
   font-mutt-misc,
   font-util,
   gccmakedep,
@@ -142,6 +143,7 @@ self: with self; {
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
   fontcronyxcyrillic = font-cronyx-cyrillic;
+  fontisasmisc = font-isas-misc;
   fontmuttmisc = font-mutt-misc;
   fontutil = font-util;
   libAppleWM = libapplewm;
@@ -832,46 +834,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontisasmisc = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-isas-misc";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-isas-misc-1.0.4.tar.xz";
-        sha256 = "1z1qqi64hbp297f6ryiswa4ikfn7mcwnb8nadyglni6swsxrbra7";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontjismisc = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index d44ac181bb5d..8981b126406f 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -328,6 +328,7 @@ print OUT <<EOF;
   font-bh-type1,
   font-cronyx-cyrillic,
   font-encodings,
+  font-isas-misc,
   font-mutt-misc,
   font-util,
   gccmakedep,
@@ -458,6 +459,7 @@ self: with self; {
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
   fontcronyxcyrillic = font-cronyx-cyrillic;
+  fontisasmisc = font-isas-misc;
   fontmuttmisc = font-mutt-misc;
   fontutil = font-util;
   libAppleWM = libapplewm;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 242e07503291..709cc1c5d8a4 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -101,7 +101,6 @@ mirror://xorg/individual/font/font-cursor-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-daewoo-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-dec-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-ibm-type1-1.0.4.tar.xz
-mirror://xorg/individual/font/font-isas-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-jis-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-micro-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-cyrillic-1.0.4.tar.xz

From ce9e0b565a3a4db63f015bf605134efddba2d4b1 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 28 Aug 2025 02:01:54 +0200
Subject: [PATCH 0080/6226] font-micro-misc: refactor, move to pkgs/by-name and
 rename from xorg.fontmicromisc

relevant changes:
- remove some unneeded deps and configureFlags

the package output doesn't change
---
 pkgs/by-name/fo/font-micro-misc/package.nix   | 45 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +----------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 49 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-micro-misc/package.nix

diff --git a/pkgs/by-name/fo/font-micro-misc/package.nix b/pkgs/by-name/fo/font-micro-misc/package.nix
new file mode 100644
index 000000000000..411250811322
--- /dev/null
+++ b/pkgs/by-name/fo/font-micro-misc/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-micro-misc";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-micro-misc-${finalAttrs.version}.tar.xz";
+    hash = "sha256-LuC51r166Emv8b2C76tEobazaPu14R0S/38BWj32+UM=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    bdftopcf
+    mkfontscale
+  ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Micro pcf font";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/micro-misc";
+    license = lib.licenses.publicDomain;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 4154351c639f..e1b3a438d733 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -13,6 +13,7 @@
   font-cronyx-cyrillic,
   font-encodings,
   font-isas-misc,
+  font-micro-misc,
   font-mutt-misc,
   font-util,
   gccmakedep,
@@ -144,6 +145,7 @@ self: with self; {
   fontbhtype1 = font-bh-type1;
   fontcronyxcyrillic = font-cronyx-cyrillic;
   fontisasmisc = font-isas-misc;
+  fontmicromisc = font-micro-misc;
   fontmuttmisc = font-mutt-misc;
   fontutil = font-util;
   libAppleWM = libapplewm;
@@ -874,46 +876,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontmicromisc = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-micro-misc";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-micro-misc-1.0.4.tar.xz";
-        sha256 = "0hzryqyml0bzzw91vqdmzdlb7dm18jmyz0mxy6plks3sppbbkq1f";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontmisccyrillic = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 8981b126406f..a9e5e1faaeaf 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -329,6 +329,7 @@ print OUT <<EOF;
   font-cronyx-cyrillic,
   font-encodings,
   font-isas-misc,
+  font-micro-misc,
   font-mutt-misc,
   font-util,
   gccmakedep,
@@ -460,6 +461,7 @@ self: with self; {
   fontbhtype1 = font-bh-type1;
   fontcronyxcyrillic = font-cronyx-cyrillic;
   fontisasmisc = font-isas-misc;
+  fontmicromisc = font-micro-misc;
   fontmuttmisc = font-mutt-misc;
   fontutil = font-util;
   libAppleWM = libapplewm;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 709cc1c5d8a4..8b7d81e134f1 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -102,7 +102,6 @@ mirror://xorg/individual/font/font-daewoo-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-dec-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-ibm-type1-1.0.4.tar.xz
 mirror://xorg/individual/font/font-jis-misc-1.0.4.tar.xz
-mirror://xorg/individual/font/font-micro-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz
 mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz

From 62e6b67dd0d7165ba3a9abaeee06c1182db4b75c Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 28 Aug 2025 21:38:21 +0200
Subject: [PATCH 0081/6226] font-misc-cyrillic: refactor, move to pkgs/by-name
 and rename from xorg.fontmisccyrillic

relevant changes:
- remove some unneeded deps and configureFlags

the package output doesn't change
---
 .../by-name/fo/font-misc-cyrillic/package.nix | 51 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +--------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 55 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-misc-cyrillic/package.nix

diff --git a/pkgs/by-name/fo/font-misc-cyrillic/package.nix b/pkgs/by-name/fo/font-misc-cyrillic/package.nix
new file mode 100644
index 000000000000..2fa83f37b94f
--- /dev/null
+++ b/pkgs/by-name/fo/font-misc-cyrillic/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-misc-cyrillic";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-misc-cyrillic-${finalAttrs.version}.tar.xz";
+    hash = "sha256-dgIaf1MGQAGRSlf9CO+uV/draPCiTcqKsbJFR07o6ZM=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    bdftopcf
+    mkfontscale
+  ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Misc Cyrillic pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/misc-cyrillic";
+    license = with lib.licenses; [
+      publicDomain
+      cronyx
+      # misc free
+      # "May be distributed and modified without restrictions."
+      free
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index e1b3a438d733..adb118f47a1d 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -14,6 +14,7 @@
   font-encodings,
   font-isas-misc,
   font-micro-misc,
+  font-misc-cyrillic,
   font-mutt-misc,
   font-util,
   gccmakedep,
@@ -146,6 +147,7 @@ self: with self; {
   fontcronyxcyrillic = font-cronyx-cyrillic;
   fontisasmisc = font-isas-misc;
   fontmicromisc = font-micro-misc;
+  fontmisccyrillic = font-misc-cyrillic;
   fontmuttmisc = font-mutt-misc;
   fontutil = font-util;
   libAppleWM = libapplewm;
@@ -876,46 +878,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontmisccyrillic = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-misc-cyrillic";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-misc-cyrillic-1.0.4.tar.xz";
-        sha256 = "14z9x174fidjn65clkd2y1l6pxspmvphizap9a8h2h06adzil0kn";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontmiscethiopic = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index a9e5e1faaeaf..bd0b91424f51 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -330,6 +330,7 @@ print OUT <<EOF;
   font-encodings,
   font-isas-misc,
   font-micro-misc,
+  font-misc-cyrillic,
   font-mutt-misc,
   font-util,
   gccmakedep,
@@ -462,6 +463,7 @@ self: with self; {
   fontcronyxcyrillic = font-cronyx-cyrillic;
   fontisasmisc = font-isas-misc;
   fontmicromisc = font-micro-misc;
+  fontmisccyrillic = font-misc-cyrillic;
   fontmuttmisc = font-mutt-misc;
   fontutil = font-util;
   libAppleWM = libapplewm;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 8b7d81e134f1..ade9956c0439 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -102,7 +102,6 @@ mirror://xorg/individual/font/font-daewoo-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-dec-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-ibm-type1-1.0.4.tar.xz
 mirror://xorg/individual/font/font-jis-misc-1.0.4.tar.xz
-mirror://xorg/individual/font/font-misc-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz
 mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz

From e013f09554c54ac19c32d2ec2252c025c5a3dee0 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Thu, 28 Aug 2025 21:44:16 +0200
Subject: [PATCH 0082/6226] font-misc-ethiopic: refactor, move to pkgs/by-name
 and rename from xorg.fontmiscethiopic

relevant changes:
- remove some unneeded deps and configureFlags

the package output doesn't change
---
 .../by-name/fo/font-misc-ethiopic/package.nix | 41 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +-----------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 45 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-misc-ethiopic/package.nix

diff --git a/pkgs/by-name/fo/font-misc-ethiopic/package.nix b/pkgs/by-name/fo/font-misc-ethiopic/package.nix
new file mode 100644
index 000000000000..90c7b4afb63d
--- /dev/null
+++ b/pkgs/by-name/fo/font-misc-ethiopic/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-misc-ethiopic";
+  version = "1.0.5";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-misc-ethiopic-${finalAttrs.version}.tar.xz";
+    hash = "sha256-R0mn5uGh7vbJH8yaBOixwO0CfUDBWZ5abJMnDYRpthI=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ mkfontscale ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Ge'ez Frontiers Foundation's Zemen OpenType and TrueType fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/misc-ethiopic";
+    license = lib.licenses.mit;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index adb118f47a1d..fda98b12383d 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -15,6 +15,7 @@
   font-isas-misc,
   font-micro-misc,
   font-misc-cyrillic,
+  font-misc-ethiopic,
   font-mutt-misc,
   font-util,
   gccmakedep,
@@ -148,6 +149,7 @@ self: with self; {
   fontisasmisc = font-isas-misc;
   fontmicromisc = font-micro-misc;
   fontmisccyrillic = font-misc-cyrillic;
+  fontmiscethiopic = font-misc-ethiopic;
   fontmuttmisc = font-mutt-misc;
   fontutil = font-util;
   libAppleWM = libapplewm;
@@ -878,44 +880,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontmiscethiopic = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-misc-ethiopic";
-      version = "1.0.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz";
-        sha256 = "04mnd620s9wkdid9wnf181yh5vf0n7l096nc3z4zdvm1w7kafja7";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontmiscmeltho = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index bd0b91424f51..e45070709dfa 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -331,6 +331,7 @@ print OUT <<EOF;
   font-isas-misc,
   font-micro-misc,
   font-misc-cyrillic,
+  font-misc-ethiopic,
   font-mutt-misc,
   font-util,
   gccmakedep,
@@ -464,6 +465,7 @@ self: with self; {
   fontisasmisc = font-isas-misc;
   fontmicromisc = font-micro-misc;
   fontmisccyrillic = font-misc-cyrillic;
+  fontmiscethiopic = font-misc-ethiopic;
   fontmuttmisc = font-mutt-misc;
   fontutil = font-util;
   libAppleWM = libapplewm;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index ade9956c0439..fbc39d3176b9 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -102,7 +102,6 @@ mirror://xorg/individual/font/font-daewoo-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-dec-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-ibm-type1-1.0.4.tar.xz
 mirror://xorg/individual/font/font-jis-misc-1.0.4.tar.xz
-mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz
 mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
 mirror://xorg/individual/font/font-schumacher-misc-1.1.3.tar.xz

From 1f3e600d3c53582d446b93c72533462b343aec63 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 13 Sep 2025 22:29:01 +0200
Subject: [PATCH 0083/6226] 
 font-{cronyx-cyrillic,{isas,micro}-misc,misc-{cyrillic,ethiopic}}: move font
 from $out/lib to $out/share

---
 pkgs/by-name/fo/font-cronyx-cyrillic/package.nix | 2 --
 pkgs/by-name/fo/font-isas-misc/package.nix       | 2 --
 pkgs/by-name/fo/font-micro-misc/package.nix      | 2 --
 pkgs/by-name/fo/font-misc-cyrillic/package.nix   | 2 --
 pkgs/by-name/fo/font-misc-ethiopic/package.nix   | 2 --
 5 files changed, 10 deletions(-)

diff --git a/pkgs/by-name/fo/font-cronyx-cyrillic/package.nix b/pkgs/by-name/fo/font-cronyx-cyrillic/package.nix
index 449f10bc3ae1..ebc6e229669d 100644
--- a/pkgs/by-name/fo/font-cronyx-cyrillic/package.nix
+++ b/pkgs/by-name/fo/font-cronyx-cyrillic/package.nix
@@ -22,8 +22,6 @@ stdenv.mkDerivation (finalAttrs: {
     mkfontscale
   ];
 
-  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-
   passthru = {
     updateScript = writeScript "update-${finalAttrs.pname}" ''
       #!/usr/bin/env nix-shell
diff --git a/pkgs/by-name/fo/font-isas-misc/package.nix b/pkgs/by-name/fo/font-isas-misc/package.nix
index e098e7d3857d..d58c4fed6b00 100644
--- a/pkgs/by-name/fo/font-isas-misc/package.nix
+++ b/pkgs/by-name/fo/font-isas-misc/package.nix
@@ -22,8 +22,6 @@ stdenv.mkDerivation (finalAttrs: {
     mkfontscale
   ];
 
-  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-
   passthru = {
     updateScript = writeScript "update-${finalAttrs.pname}" ''
       #!/usr/bin/env nix-shell
diff --git a/pkgs/by-name/fo/font-micro-misc/package.nix b/pkgs/by-name/fo/font-micro-misc/package.nix
index 411250811322..4a11aa3d5bdf 100644
--- a/pkgs/by-name/fo/font-micro-misc/package.nix
+++ b/pkgs/by-name/fo/font-micro-misc/package.nix
@@ -22,8 +22,6 @@ stdenv.mkDerivation (finalAttrs: {
     mkfontscale
   ];
 
-  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-
   passthru = {
     updateScript = writeScript "update-${finalAttrs.pname}" ''
       #!/usr/bin/env nix-shell
diff --git a/pkgs/by-name/fo/font-misc-cyrillic/package.nix b/pkgs/by-name/fo/font-misc-cyrillic/package.nix
index 2fa83f37b94f..491326daf9c7 100644
--- a/pkgs/by-name/fo/font-misc-cyrillic/package.nix
+++ b/pkgs/by-name/fo/font-misc-cyrillic/package.nix
@@ -22,8 +22,6 @@ stdenv.mkDerivation (finalAttrs: {
     mkfontscale
   ];
 
-  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-
   passthru = {
     updateScript = writeScript "update-${finalAttrs.pname}" ''
       #!/usr/bin/env nix-shell
diff --git a/pkgs/by-name/fo/font-misc-ethiopic/package.nix b/pkgs/by-name/fo/font-misc-ethiopic/package.nix
index 90c7b4afb63d..863e1cc39045 100644
--- a/pkgs/by-name/fo/font-misc-ethiopic/package.nix
+++ b/pkgs/by-name/fo/font-misc-ethiopic/package.nix
@@ -18,8 +18,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ mkfontscale ];
 
-  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-
   passthru = {
     updateScript = writeScript "update-${finalAttrs.pname}" ''
       #!/usr/bin/env nix-shell

From 2dc1d4e9370144e4ef8ec84c33f05bea98feb452 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 30 Aug 2025 19:17:47 +0200
Subject: [PATCH 0084/6226] font-schumacher-misc: refactor, move to
 pkgs/by-name and rename from xorg.fontschumachermisc

the package output doesn't change
---
 .../fo/font-schumacher-misc/package.nix       | 51 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 43 +---------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 55 insertions(+), 42 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-schumacher-misc/package.nix

diff --git a/pkgs/by-name/fo/font-schumacher-misc/package.nix b/pkgs/by-name/fo/font-schumacher-misc/package.nix
new file mode 100644
index 000000000000..3b1534196914
--- /dev/null
+++ b/pkgs/by-name/fo/font-schumacher-misc/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  font-util,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-schumacher-misc";
+  version = "1.1.3";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-schumacher-misc-${finalAttrs.version}.tar.xz";
+    hash = "sha256-i4SfDNseVaNMw92LD7N0Q/q7wiTVukQIVWlYEkSmgHA=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    bdftopcf
+    font-util
+    mkfontscale
+  ];
+
+  buildInputs = [ font-util ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Schumacher pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/schumacher-misc";
+    license = lib.licenses.hpnd;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index c03863a205d9..6869bec8e643 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -12,6 +12,7 @@
   font-bh-type1,
   font-encodings,
   font-mutt-misc,
+  font-schumacher-misc,
   font-util,
   gccmakedep,
   ico,
@@ -141,6 +142,7 @@ self: with self; {
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
   fontmuttmisc = font-mutt-misc;
+  fontschumachermisc = font-schumacher-misc;
   fontutil = font-util;
   libAppleWM = libapplewm;
   libFS = libfs;
@@ -1147,47 +1149,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontschumachermisc = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-schumacher-misc";
-      version = "1.1.3";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-schumacher-misc-1.1.3.tar.xz";
-        sha256 = "0w40lr214n39al449fnm4k1bpyj3fjrhz2yxqd6a6m8yvc69z14b";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        fontutil
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontscreencyrillic = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 9975b4053e15..c088655e40b8 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -328,6 +328,7 @@ print OUT <<EOF;
   font-bh-type1,
   font-encodings,
   font-mutt-misc,
+  font-schumacher-misc,
   font-util,
   gccmakedep,
   ico,
@@ -457,6 +458,7 @@ self: with self; {
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
   fontmuttmisc = font-mutt-misc;
+  fontschumachermisc = font-schumacher-misc;
   fontutil = font-util;
   libAppleWM = libapplewm;
   libFS = libfs;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index b9f495cf71f5..344491857d20 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -109,7 +109,6 @@ mirror://xorg/individual/font/font-misc-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz
 mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
-mirror://xorg/individual/font/font-schumacher-misc-1.1.3.tar.xz
 mirror://xorg/individual/font/font-screen-cyrillic-1.0.5.tar.xz
 mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz

From d3a2b393f37c31683a25b2247297849166916c49 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 30 Aug 2025 21:39:40 +0200
Subject: [PATCH 0085/6226] font-screen-cyrillic: refactor, move to
 pkgs/by-name and rename from xorg.fontscreencyrillic

relevant changes:
- remove some unneeded deps and configureFlags

the package output doesn't change
---
 .../fo/font-screen-cyrillic/package.nix       | 45 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +----------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 49 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-screen-cyrillic/package.nix

diff --git a/pkgs/by-name/fo/font-screen-cyrillic/package.nix b/pkgs/by-name/fo/font-screen-cyrillic/package.nix
new file mode 100644
index 000000000000..217fab306ea7
--- /dev/null
+++ b/pkgs/by-name/fo/font-screen-cyrillic/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-screen-cyrillic";
+  version = "1.0.5";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-screen-cyrillic-${finalAttrs.version}.tar.xz";
+    hash = "sha256-j3WLuM1YDH5lVIfR0Ntp0xmsrlTZMrKV2W2dm4P95cA=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    bdftopcf
+    mkfontscale
+  ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Screen Cyrillic pcf font";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/screen-cyrillic";
+    license = lib.licenses.cronyx;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 6869bec8e643..30afa97e5cbf 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -13,6 +13,7 @@
   font-encodings,
   font-mutt-misc,
   font-schumacher-misc,
+  font-screen-cyrillic,
   font-util,
   gccmakedep,
   ico,
@@ -143,6 +144,7 @@ self: with self; {
   fontbhtype1 = font-bh-type1;
   fontmuttmisc = font-mutt-misc;
   fontschumachermisc = font-schumacher-misc;
+  fontscreencyrillic = font-screen-cyrillic;
   fontutil = font-util;
   libAppleWM = libapplewm;
   libFS = libfs;
@@ -1149,46 +1151,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontscreencyrillic = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-screen-cyrillic";
-      version = "1.0.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-screen-cyrillic-1.0.5.tar.xz";
-        sha256 = "1h75zn1rp7bdv6av4cnrajpaq6fkd7dx1lc7aijpw32qrnw8nxcg";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontsonymisc = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index c088655e40b8..a74215ae9d09 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -329,6 +329,7 @@ print OUT <<EOF;
   font-encodings,
   font-mutt-misc,
   font-schumacher-misc,
+  font-screen-cyrillic,
   font-util,
   gccmakedep,
   ico,
@@ -459,6 +460,7 @@ self: with self; {
   fontbhtype1 = font-bh-type1;
   fontmuttmisc = font-mutt-misc;
   fontschumachermisc = font-schumacher-misc;
+  fontscreencyrillic = font-screen-cyrillic;
   fontutil = font-util;
   libAppleWM = libapplewm;
   libFS = libfs;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 344491857d20..f70d1fcea193 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -109,7 +109,6 @@ mirror://xorg/individual/font/font-misc-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz
 mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
-mirror://xorg/individual/font/font-screen-cyrillic-1.0.5.tar.xz
 mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz

From 667074fff0bff5275b9c707ce965142a186d05f5 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 30 Aug 2025 21:46:47 +0200
Subject: [PATCH 0086/6226] font-sony-misc: refactor, move to pkgs/by-name and
 rename from xorg.fontsonymisc

relevant changes:
- remove some unneeded deps and configureFlags

the package output doesn't change
---
 pkgs/by-name/fo/font-sony-misc/package.nix    | 45 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +----------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 49 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-sony-misc/package.nix

diff --git a/pkgs/by-name/fo/font-sony-misc/package.nix b/pkgs/by-name/fo/font-sony-misc/package.nix
new file mode 100644
index 000000000000..6c9341b855bf
--- /dev/null
+++ b/pkgs/by-name/fo/font-sony-misc/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-sony-misc";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-sony-misc-${finalAttrs.version}.tar.xz";
+    hash = "sha256-5rCfgj/MsG4L0LIGIoO2UUFTMjvYp0hunC4/VauElGs=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    bdftopcf
+    mkfontscale
+  ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Sony pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/sony-misc";
+    license = lib.licenses.hpnd;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 30afa97e5cbf..1a72d2cf32ad 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -14,6 +14,7 @@
   font-mutt-misc,
   font-schumacher-misc,
   font-screen-cyrillic,
+  font-sony-misc,
   font-util,
   gccmakedep,
   ico,
@@ -145,6 +146,7 @@ self: with self; {
   fontmuttmisc = font-mutt-misc;
   fontschumachermisc = font-schumacher-misc;
   fontscreencyrillic = font-screen-cyrillic;
+  fontsonymisc = font-sony-misc;
   fontutil = font-util;
   libAppleWM = libapplewm;
   libFS = libfs;
@@ -1151,46 +1153,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontsonymisc = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-sony-misc";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz";
-        sha256 = "0swlhjmmagrfkip4i9yq7cr56hains1j41mjs05nxc6c7y19zc76";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontsunmisc = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index a74215ae9d09..c7db8fda7f05 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -330,6 +330,7 @@ print OUT <<EOF;
   font-mutt-misc,
   font-schumacher-misc,
   font-screen-cyrillic,
+  font-sony-misc,
   font-util,
   gccmakedep,
   ico,
@@ -461,6 +462,7 @@ self: with self; {
   fontmuttmisc = font-mutt-misc;
   fontschumachermisc = font-schumacher-misc;
   fontscreencyrillic = font-screen-cyrillic;
+  fontsonymisc = font-sony-misc;
   fontutil = font-util;
   libAppleWM = libapplewm;
   libFS = libfs;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index f70d1fcea193..3bde7ed57383 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -109,7 +109,6 @@ mirror://xorg/individual/font/font-misc-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz
 mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
-mirror://xorg/individual/font/font-sony-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz

From 154002f5a64ce55c07e2ced6cbfe65c80fac43f4 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 30 Aug 2025 21:52:08 +0200
Subject: [PATCH 0087/6226] font-sun-misc: refactor, move to pkgs/by-name and
 rename from xorg.fontsunmisc

relevant changes:
- remove some unneeded deps and configureFlags

the package output doesn't change
---
 pkgs/by-name/fo/font-sun-misc/package.nix     | 45 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +----------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 49 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-sun-misc/package.nix

diff --git a/pkgs/by-name/fo/font-sun-misc/package.nix b/pkgs/by-name/fo/font-sun-misc/package.nix
new file mode 100644
index 000000000000..25d701a489b0
--- /dev/null
+++ b/pkgs/by-name/fo/font-sun-misc/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-sun-misc";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-sun-misc-${finalAttrs.version}.tar.xz";
+    hash = "sha256-3YTdEW2Sev+k+g+ilyez7PwPBkI4gXwKHlUqCsOE258=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    bdftopcf
+    mkfontscale
+  ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Open Look Glyph and Cursor pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/sun-misc/";
+    license = lib.licenses.mit;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 1a72d2cf32ad..1166089e31a0 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -15,6 +15,7 @@
   font-schumacher-misc,
   font-screen-cyrillic,
   font-sony-misc,
+  font-sun-misc,
   font-util,
   gccmakedep,
   ico,
@@ -147,6 +148,7 @@ self: with self; {
   fontschumachermisc = font-schumacher-misc;
   fontscreencyrillic = font-screen-cyrillic;
   fontsonymisc = font-sony-misc;
+  fontsunmisc = font-sun-misc;
   fontutil = font-util;
   libAppleWM = libapplewm;
   libFS = libfs;
@@ -1153,46 +1155,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontsunmisc = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-sun-misc";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz";
-        sha256 = "17yvhk1hlajm3q57r09q8830zz7cnckrg8hgzajgyyljdl8xv16x";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fonttosfnt = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index c7db8fda7f05..20a0aecdc9ab 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -331,6 +331,7 @@ print OUT <<EOF;
   font-schumacher-misc,
   font-screen-cyrillic,
   font-sony-misc,
+  font-sun-misc,
   font-util,
   gccmakedep,
   ico,
@@ -463,6 +464,7 @@ self: with self; {
   fontschumachermisc = font-schumacher-misc;
   fontscreencyrillic = font-screen-cyrillic;
   fontsonymisc = font-sony-misc;
+  fontsunmisc = font-sun-misc;
   fontutil = font-util;
   libAppleWM = libapplewm;
   libFS = libfs;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 3bde7ed57383..776349d76dfb 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -109,7 +109,6 @@ mirror://xorg/individual/font/font-misc-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz
 mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
-mirror://xorg/individual/font/font-sun-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2

From a8c9ed2a405a0b5081108b6ff5c336090a9ca593 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 30 Aug 2025 21:59:00 +0200
Subject: [PATCH 0088/6226] font-winitzki-cyrillic: refactor, move to
 pkgs/by-name and rename from xorg.fontwinitzkicyrillic

relevant changes:
- remove some unneeded deps and configureFlags

the package output doesn't change
---
 .../fo/font-winitzki-cyrillic/package.nix     | 45 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +----------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 49 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-winitzki-cyrillic/package.nix

diff --git a/pkgs/by-name/fo/font-winitzki-cyrillic/package.nix b/pkgs/by-name/fo/font-winitzki-cyrillic/package.nix
new file mode 100644
index 000000000000..65a6b6e97d5f
--- /dev/null
+++ b/pkgs/by-name/fo/font-winitzki-cyrillic/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-winitzki-cyrillic";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-winitzki-cyrillic-${finalAttrs.version}.tar.xz";
+    hash = "sha256-O22CEi3BR3bjr82HeDOng04fkAxT/Bx7stZ8eBz6l6g=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    bdftopcf
+    mkfontscale
+  ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Winitzki Proof Cyrillic pcf font";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/winitzki-cyrillic";
+    license = lib.licenses.publicDomain;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 1166089e31a0..3e2ec060080f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -17,6 +17,7 @@
   font-sony-misc,
   font-sun-misc,
   font-util,
+  font-winitzki-cyrillic,
   gccmakedep,
   ico,
   imake,
@@ -150,6 +151,7 @@ self: with self; {
   fontsonymisc = font-sony-misc;
   fontsunmisc = font-sun-misc;
   fontutil = font-util;
+  fontwinitzkicyrillic = font-winitzki-cyrillic;
   libAppleWM = libapplewm;
   libFS = libfs;
   libICE = libice;
@@ -1193,46 +1195,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontwinitzkicyrillic = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-winitzki-cyrillic";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz";
-        sha256 = "1a4pz8f7hz6nn9xirz2k1j81ykl3lwrpi1ydmzipciy15l984v9v";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontxfree86type1 = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 20a0aecdc9ab..e3f4a7197169 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -333,6 +333,7 @@ print OUT <<EOF;
   font-sony-misc,
   font-sun-misc,
   font-util,
+  font-winitzki-cyrillic,
   gccmakedep,
   ico,
   imake,
@@ -466,6 +467,7 @@ self: with self; {
   fontsonymisc = font-sony-misc;
   fontsunmisc = font-sun-misc;
   fontutil = font-util;
+  fontwinitzkicyrillic = font-winitzki-cyrillic;
   libAppleWM = libapplewm;
   libFS = libfs;
   libICE = libice;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 776349d76dfb..2383dd1df7e6 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -109,7 +109,6 @@ mirror://xorg/individual/font/font-misc-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz
 mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
-mirror://xorg/individual/font/font-winitzki-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz

From 157a4e3863a766c9d7977002e911a976fcb92940 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 30 Aug 2025 23:16:02 +0200
Subject: [PATCH 0089/6226] font-xfree86-type1: refactor, move to pkgs/by-name
 and rename from xorg.fontxfree86type1

relevant changes:
- remove some unneeded deps and configureFlags

package output doesn't change
---
 .../by-name/fo/font-xfree86-type1/package.nix | 41 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +-----------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 45 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-xfree86-type1/package.nix

diff --git a/pkgs/by-name/fo/font-xfree86-type1/package.nix b/pkgs/by-name/fo/font-xfree86-type1/package.nix
new file mode 100644
index 000000000000..acb1a3167b05
--- /dev/null
+++ b/pkgs/by-name/fo/font-xfree86-type1/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-xfree86-type1";
+  version = "1.0.5";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-xfree86-type1-${finalAttrs.version}.tar.xz";
+    hash = "sha256-qTwseIpeocACr3yGYs+dmCH7HfUbjSssXgAm39/qSDc=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ mkfontscale ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "XFree86 Cusrsor Postscript Type 1 Font";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/xfree86-type1";
+    license = lib.licenses.x11;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 3e2ec060080f..3b669b315641 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -18,6 +18,7 @@
   font-sun-misc,
   font-util,
   font-winitzki-cyrillic,
+  font-xfree86-type1,
   gccmakedep,
   ico,
   imake,
@@ -152,6 +153,7 @@ self: with self; {
   fontsunmisc = font-sun-misc;
   fontutil = font-util;
   fontwinitzkicyrillic = font-winitzki-cyrillic;
+  fontxfree86type1 = font-xfree86-type1;
   libAppleWM = libapplewm;
   libFS = libfs;
   libICE = libice;
@@ -1195,44 +1197,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontxfree86type1 = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-xfree86-type1";
-      version = "1.0.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz";
-        sha256 = "0ds8xbgxy9h0bqn2p38vylfzn8cqkp7n51kwmw1c18ayi9w2qg59";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   iceauth = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index e3f4a7197169..6631d892a848 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -334,6 +334,7 @@ print OUT <<EOF;
   font-sun-misc,
   font-util,
   font-winitzki-cyrillic,
+  font-xfree86-type1,
   gccmakedep,
   ico,
   imake,
@@ -468,6 +469,7 @@ self: with self; {
   fontsunmisc = font-sun-misc;
   fontutil = font-util;
   fontwinitzkicyrillic = font-winitzki-cyrillic;
+  fontxfree86type1 = font-xfree86-type1;
   libAppleWM = libapplewm;
   libFS = libfs;
   libICE = libice;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 2383dd1df7e6..486a353c3bfb 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -109,7 +109,6 @@ mirror://xorg/individual/font/font-misc-cyrillic-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-ethiopic-1.0.5.tar.xz
 mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
-mirror://xorg/individual/font/font-xfree86-type1-1.0.5.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXcomposite-0.4.6.tar.xz
 mirror://xorg/individual/lib/libXdamage-1.1.6.tar.xz

From 45169f4be17f933977fe9ca9d9f3828af9ac4deb Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 13 Sep 2025 22:34:23 +0200
Subject: [PATCH 0090/6226] 
 font-{{screen,winitzki}-cyrillic,{schumacher,sony,sun}-misc,xfree86-type1}:
 move font from $out/lib to $out/share

for font-xfree86-type1 this fixes xorg nixos module accordingly
---
 nixos/modules/services/x11/xserver.nix             | 2 +-
 pkgs/by-name/fo/font-schumacher-misc/package.nix   | 2 +-
 pkgs/by-name/fo/font-screen-cyrillic/package.nix   | 2 --
 pkgs/by-name/fo/font-sony-misc/package.nix         | 2 --
 pkgs/by-name/fo/font-sun-misc/package.nix          | 2 --
 pkgs/by-name/fo/font-winitzki-cyrillic/package.nix | 2 --
 pkgs/by-name/fo/font-xfree86-type1/package.nix     | 2 --
 7 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix
index e90d51b19ffe..6be128f69f28 100644
--- a/nixos/modules/services/x11/xserver.nix
+++ b/nixos/modules/services/x11/xserver.nix
@@ -177,7 +177,7 @@ let
     {
       postInstall = ''
         alias='cursor -xfree86-cursor-medium-r-normal--0-${sizeString}-0-0-p-0-adobe-fontspecific'
-        echo "$alias" > $out/lib/X11/fonts/Type1/fonts.alias
+        echo "$alias" > $out/share/fonts/X11/Type1/fonts.alias
       '';
     }
   );
diff --git a/pkgs/by-name/fo/font-schumacher-misc/package.nix b/pkgs/by-name/fo/font-schumacher-misc/package.nix
index 3b1534196914..c83b593c16aa 100644
--- a/pkgs/by-name/fo/font-schumacher-misc/package.nix
+++ b/pkgs/by-name/fo/font-schumacher-misc/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ font-util ];
 
-  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+  configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
 
   passthru = {
     updateScript = writeScript "update-${finalAttrs.pname}" ''
diff --git a/pkgs/by-name/fo/font-screen-cyrillic/package.nix b/pkgs/by-name/fo/font-screen-cyrillic/package.nix
index 217fab306ea7..bea6992d9b24 100644
--- a/pkgs/by-name/fo/font-screen-cyrillic/package.nix
+++ b/pkgs/by-name/fo/font-screen-cyrillic/package.nix
@@ -22,8 +22,6 @@ stdenv.mkDerivation (finalAttrs: {
     mkfontscale
   ];
 
-  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-
   passthru = {
     updateScript = writeScript "update-${finalAttrs.pname}" ''
       #!/usr/bin/env nix-shell
diff --git a/pkgs/by-name/fo/font-sony-misc/package.nix b/pkgs/by-name/fo/font-sony-misc/package.nix
index 6c9341b855bf..8562279b8678 100644
--- a/pkgs/by-name/fo/font-sony-misc/package.nix
+++ b/pkgs/by-name/fo/font-sony-misc/package.nix
@@ -22,8 +22,6 @@ stdenv.mkDerivation (finalAttrs: {
     mkfontscale
   ];
 
-  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-
   passthru = {
     updateScript = writeScript "update-${finalAttrs.pname}" ''
       #!/usr/bin/env nix-shell
diff --git a/pkgs/by-name/fo/font-sun-misc/package.nix b/pkgs/by-name/fo/font-sun-misc/package.nix
index 25d701a489b0..bc8eb50a71c5 100644
--- a/pkgs/by-name/fo/font-sun-misc/package.nix
+++ b/pkgs/by-name/fo/font-sun-misc/package.nix
@@ -22,8 +22,6 @@ stdenv.mkDerivation (finalAttrs: {
     mkfontscale
   ];
 
-  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-
   passthru = {
     updateScript = writeScript "update-${finalAttrs.pname}" ''
       #!/usr/bin/env nix-shell
diff --git a/pkgs/by-name/fo/font-winitzki-cyrillic/package.nix b/pkgs/by-name/fo/font-winitzki-cyrillic/package.nix
index 65a6b6e97d5f..efbee8e3633e 100644
--- a/pkgs/by-name/fo/font-winitzki-cyrillic/package.nix
+++ b/pkgs/by-name/fo/font-winitzki-cyrillic/package.nix
@@ -22,8 +22,6 @@ stdenv.mkDerivation (finalAttrs: {
     mkfontscale
   ];
 
-  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-
   passthru = {
     updateScript = writeScript "update-${finalAttrs.pname}" ''
       #!/usr/bin/env nix-shell
diff --git a/pkgs/by-name/fo/font-xfree86-type1/package.nix b/pkgs/by-name/fo/font-xfree86-type1/package.nix
index acb1a3167b05..6d8e451f8594 100644
--- a/pkgs/by-name/fo/font-xfree86-type1/package.nix
+++ b/pkgs/by-name/fo/font-xfree86-type1/package.nix
@@ -18,8 +18,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ mkfontscale ];
 
-  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-
   passthru = {
     updateScript = writeScript "update-${finalAttrs.pname}" ''
       #!/usr/bin/env nix-shell

From e01473b65d80497b62abc9b05268420f32faea33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Sad=C5=82ocha?= <adrian@sadlocha.eu>
Date: Sat, 13 Sep 2025 22:47:40 +0100
Subject: [PATCH 0091/6226] taskwarrior2: add Necior to maintainers

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

diff --git a/pkgs/by-name/ta/taskwarrior2/package.nix b/pkgs/by-name/ta/taskwarrior2/package.nix
index db6eed2e2081..7cfe1b650b40 100644
--- a/pkgs/by-name/ta/taskwarrior2/package.nix
+++ b/pkgs/by-name/ta/taskwarrior2/package.nix
@@ -63,6 +63,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [
       marcweber
       oxalica
+      Necior
     ];
     mainProgram = "task";
     platforms = platforms.unix;

From a426acee1e48bbbcec5a623446f2df9654b5b937 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 14 Sep 2025 01:26:47 +0300
Subject: [PATCH 0092/6226] python313Packages.numpy: 2.3.2 -> 2.3.3

Changelog: https://github.com/numpy/numpy/releases/tag/v2.3.3
---
 pkgs/development/python-modules/numpy/2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix
index 397b071909e8..b6fd45abd961 100644
--- a/pkgs/development/python-modules/numpy/2.nix
+++ b/pkgs/development/python-modules/numpy/2.nix
@@ -59,7 +59,7 @@ let
 in
 buildPythonPackage rec {
   pname = "numpy";
-  version = "2.3.2";
+  version = "2.3.3";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -67,7 +67,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit pname version;
     extension = "tar.gz";
-    hash = "sha256-4EhqEewwzey1PxhNSW0caiB4bIHlXkFkAnATAFb47kg=";
+    hash = "sha256-3cfDlye6YrgN/b7fQA0cEN36ju+9fsjcsRi+i1bTECk=";
   };
 
   patches = lib.optionals python.hasDistutilsCxxPatch [

From f59036bf7543980c12ed56704f7943a444092778 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 14 Sep 2025 01:27:43 +0300
Subject: [PATCH 0093/6226] python313Packages.scipy: 1.16.1 -> 1.16.2

Diff: https://github.com/scipy/scipy/compare/v1.16.1...v1.16.2

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

diff --git a/pkgs/development/python-modules/scipy/default.nix b/pkgs/development/python-modules/scipy/default.nix
index 92151e468259..663389069579 100644
--- a/pkgs/development/python-modules/scipy/default.nix
+++ b/pkgs/development/python-modules/scipy/default.nix
@@ -50,8 +50,8 @@ let
   #     nix-shell maintainers/scripts/update.nix --argstr package python3.pkgs.scipy
   #
   # The update script uses sed regexes to replace them with the updated hashes.
-  version = "1.16.1";
-  srcHash = "sha256-/LgYQUMGoQjSWMCWBgnekNGzEc0LVg2qiN2tV399rQU=";
+  version = "1.16.2";
+  srcHash = "sha256-vWXJyLvOqCC5jwDawWHF6K2GVU2gnvW4a85lF/6tVYg=";
   datasetsHashes = {
     ascent = "1qjp35ncrniq9rhzb14icwwykqg2208hcssznn3hz27w39615kh3";
     ecg = "1bwbjp43b7znnwha5hv6wiz3g0bhwrpqpi75s12zidxrbwvd62pj";

From 7dfb06f65c47c634b510c392d4da1853ec4c6b97 Mon Sep 17 00:00:00 2001
From: kyehn <228304369+kyehn@users.noreply.github.com>
Date: Sun, 14 Sep 2025 13:31:41 +0800
Subject: [PATCH 0094/6226] gopeed: 1.8.0 -> 1.8.1

Diff: https://github.com/GopeedLab/gopeed/compare/v1.8.0...v1.8.1
---
 pkgs/by-name/go/gopeed/gitHashes.json      |  5 +++
 pkgs/by-name/go/gopeed/package.nix         | 15 +++----
 pkgs/by-name/go/gopeed/pubspec.lock.json   | 11 ++---
 pkgs/by-name/go/gopeed/update-gitHashes.py | 51 ++++++++++++++++++++++
 pkgs/by-name/go/gopeed/update.sh           | 12 ++---
 5 files changed, 75 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/by-name/go/gopeed/gitHashes.json
 create mode 100755 pkgs/by-name/go/gopeed/update-gitHashes.py

diff --git a/pkgs/by-name/go/gopeed/gitHashes.json b/pkgs/by-name/go/gopeed/gitHashes.json
new file mode 100644
index 000000000000..1e971195c634
--- /dev/null
+++ b/pkgs/by-name/go/gopeed/gitHashes.json
@@ -0,0 +1,5 @@
+{
+  "install_plugin": "sha256-3FM08D2pbtWmitf8R4pAylVqum7IfbWh6pOIEhJdySk=",
+  "permission_handler_windows": "sha256-MRTmuH0MfhGaMEb9bRotimAPRlFyl3ovtJUJ2WK7+DA=",
+  "tray_manager": "sha256-rsvykRadbCRNwJUEAcoFTywwqvx4qvzdUmz7TQFDYP4="
+}
diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix
index 5a892ad0a9b4..ae3eda6df8fb 100644
--- a/pkgs/by-name/go/gopeed/package.nix
+++ b/pkgs/by-name/go/gopeed/package.nix
@@ -1,24 +1,24 @@
 {
   lib,
   fetchFromGitHub,
-  flutter327,
+  flutter332,
   autoPatchelfHook,
   buildGoModule,
   libayatana-appindicator,
 }:
 
 let
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "GopeedLab";
     repo = "gopeed";
     tag = "v${version}";
-    hash = "sha256-GUCc6GK1yhVbk3Ss1XnT23wtz22uTgdSSDfEdr4mMpA=";
+    hash = "sha256-kG2e8shHpIuCKxv1/2uN23ldRNgoSvwPJcwxdxOBpqA=";
   };
 
   metaCommon = {
-    description = "Modern download manager that supports all platforms";
+    description = "Modern download manager";
     homepage = "https://github.com/GopeedLab/gopeed";
     license = with lib.licenses; [ gpl3Plus ];
     maintainers = with lib.maintainers; [ ];
@@ -44,7 +44,7 @@ let
     meta = metaCommon;
   };
 in
-flutter327.buildFlutterApplication {
+flutter332.buildFlutterApplication {
   inherit version src;
   pname = "gopeed";
 
@@ -52,10 +52,7 @@ flutter327.buildFlutterApplication {
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
-  gitHashes = {
-    install_plugin = "sha256-3FM08D2pbtWmitf8R4pAylVqum7IfbWh6pOIEhJdySk=";
-    permission_handler_windows = "sha256-MRTmuH0MfhGaMEb9bRotimAPRlFyl3ovtJUJ2WK7+DA=";
-  };
+  gitHashes = lib.importJSON ./gitHashes.json;
 
   nativeBuildInputs = [ autoPatchelfHook ];
 
diff --git a/pkgs/by-name/go/gopeed/pubspec.lock.json b/pkgs/by-name/go/gopeed/pubspec.lock.json
index fdb2017b279b..8088eb6ba106 100644
--- a/pkgs/by-name/go/gopeed/pubspec.lock.json
+++ b/pkgs/by-name/go/gopeed/pubspec.lock.json
@@ -1561,12 +1561,13 @@
     "tray_manager": {
       "dependency": "direct main",
       "description": {
-        "name": "tray_manager",
-        "sha256": "bdc3ac6c36f3d12d871459e4a9822705ce5a1165a17fa837103bc842719bf3f7",
-        "url": "https://pub.dev"
+        "path": "packages/tray_manager",
+        "ref": "main",
+        "resolved-ref": "91cdbdc12517d0d832aca715542b9d0329739d5d",
+        "url": "https://github.com/monkeyWie/tray_manager.git"
       },
-      "source": "hosted",
-      "version": "0.2.4"
+      "source": "git",
+      "version": "0.5.1"
     },
     "typed_data": {
       "dependency": "transitive",
diff --git a/pkgs/by-name/go/gopeed/update-gitHashes.py b/pkgs/by-name/go/gopeed/update-gitHashes.py
new file mode 100755
index 000000000000..ffa6feb66653
--- /dev/null
+++ b/pkgs/by-name/go/gopeed/update-gitHashes.py
@@ -0,0 +1,51 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i python3 -p python3 nix-prefetch-git
+
+import json
+import subprocess
+import sys
+from pathlib import Path
+
+THIS_FOLDER = Path(__file__).parent.resolve()
+PUBSPEC_LOCK = THIS_FOLDER / "pubspec.lock.json"
+GIT_HASHES = THIS_FOLDER / "gitHashes.json"
+
+
+def fetch_git_hash(url: str, rev: str) -> str:
+    result = subprocess.run(
+        ["nix-prefetch-git", "--url", url, "--rev", rev],
+        capture_output=True,
+        text=True,
+        check=True,
+    )
+    return json.loads(result.stdout)["hash"]
+
+
+def main() -> None:
+    if not PUBSPEC_LOCK.exists():
+        sys.exit(1)
+    try:
+        data = json.loads(PUBSPEC_LOCK.read_text())
+    except json.JSONDecodeError:
+        sys.exit(1)
+    output: dict[str, str] = {}
+    for name, info in data.get("packages", {}).items():
+        if info.get("source") != "git":
+            continue
+        desc = info.get("description")
+        if not isinstance(desc, dict):
+            continue
+        url = desc.get("url")
+        rev = desc.get("resolved-ref")
+        if not (isinstance(url, str) and isinstance(rev, str)):
+            continue
+        try:
+            package_hash = fetch_git_hash(url, rev)
+        except subprocess.CalledProcessError:
+            continue
+        output[name] = package_hash
+    GIT_HASHES.write_text(json.dumps(output, indent=2) + "\n")
+
+
+if __name__ == "__main__":
+    main()
diff --git a/pkgs/by-name/go/gopeed/update.sh b/pkgs/by-name/go/gopeed/update.sh
index 1bdf16913950..3f6a47799a47 100755
--- a/pkgs/by-name/go/gopeed/update.sh
+++ b/pkgs/by-name/go/gopeed/update.sh
@@ -1,14 +1,14 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils nix-update
+#!nix-shell -i bash -p curl gnused jq yq-go nix bash nix-update
 
 set -eou pipefail
 
-ROOT="$(dirname "$(readlink -f "$0")")"
+PACKAGE_DIR=$(realpath "$(dirname "$0")")
 
-latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/GopeedLab/gopeed/releases/latest | jq --raw-output .tag_name)
+latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} --fail --silent https://api.github.com/repos/GopeedLab/gopeed/releases/latest | jq --raw-output .tag_name)
 latestVersion=$(echo "$latestTag" | sed 's/^v//')
 
-currentVersion=$(nix-instantiate --eval -E "with import ./. {}; gopeed.version or (lib.getVersion gopeed)" | tr -d '"')
+currentVersion=$(nix eval --raw --file . gopeed.version)
 
 if [[ "$currentVersion" == "$latestVersion" ]]; then
     echo "package is up-to-date: $currentVersion"
@@ -17,4 +17,6 @@ fi
 
 nix-update gopeed.libgopeed
 
-curl https://raw.githubusercontent.com/GopeedLab/gopeed/${latestTag}/ui/flutter/pubspec.lock | yq . >$ROOT/pubspec.lock.json
+curl --fail --silent https://raw.githubusercontent.com/GopeedLab/gopeed/${latestTag}/ui/flutter/pubspec.lock | yq eval --output-format=json --prettyPrint >$PACKAGE_DIR/pubspec.lock.json
+
+$PACKAGE_DIR/update-gitHashes.py

From 963a04e217144b9addfaef99622ea343e54ba0bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 14 Sep 2025 20:03:29 +0200
Subject: [PATCH 0095/6226] python2: 2.7.18.8 -> 2.7.18.12

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

diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index 980ebdf2d582..4d0672faa816 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -36,9 +36,9 @@
         major = "2";
         minor = "7";
         patch = "18";
-        suffix = ".8"; # ActiveState's Python 2 extended support
+        suffix = ".12"; # ActiveState's Python 2 extended support
       };
-      hash = "sha256-HUOzu3uJbtd+3GbmGD35KOk/CDlwL4S7hi9jJGRFiqI=";
+      hash = "sha256-RuEgfpags9wJm9Xe0daotqUx4knABEUc7DvtgnQXEfE=";
       inherit passthruFun;
     };
 

From 148d76c0b953ac8ad323def0e2cc2e8c183c6363 Mon Sep 17 00:00:00 2001
From: Chet Gurevitch <chet@gurevitch.net>
Date: Thu, 5 Jun 2025 14:02:41 -0700
Subject: [PATCH 0096/6226] nixos/stage-1: always include util-linux mount

- respect X-mount.subdir option
- fix mount test redirection (1>&1 to 2>&1)
---
 nixos/modules/system/boot/stage-1.nix   | 32 ++-----------------------
 nixos/modules/tasks/filesystems/zfs.nix |  3 +++
 2 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix
index 7fa7f2ada404..c87b3ecef4da 100644
--- a/nixos/modules/system/boot/stage-1.nix
+++ b/nixos/modules/system/boot/stage-1.nix
@@ -34,9 +34,6 @@ let
   # mounting `/`, like `/` on a loopback).
   fileSystems = filter utils.fsNeededForBoot config.system.build.fileSystems;
 
-  # Determine whether zfs-mount(8) is needed.
-  zfsRequiresMountHelper = any (fs: lib.elem "zfsutil" fs.options) fileSystems;
-
   # A utility for enumerating the shared-library dependencies of a program
   findLibs = pkgs.buildPackages.writeShellScriptBin "find-libs" ''
     set -euo pipefail
@@ -118,24 +115,9 @@ let
           copy_bin_and_libs $BIN
         done
 
-        ${optionalString zfsRequiresMountHelper ''
-          # Filesystems using the "zfsutil" option are mounted regardless of the
-          # mount.zfs(8) helper, but it is required to ensure that ZFS properties
-          # are used as mount options.
-          #
-          # BusyBox does not use the ZFS helper in the first place.
-          # util-linux searches /sbin/ as last path for helpers (stage-1-init.sh
-          # must symlink it to the store PATH).
-          # Without helper program, both `mount`s silently fails back to internal
-          # code, using default options and effectively ignore security relevant
-          # ZFS properties such as `setuid=off` and `exec=off` (unless manually
-          # duplicated in `fileSystems.*.options`, defeating "zfsutil"'s purpose).
-          copy_bin_and_libs ${lib.getOutput "mount" pkgs.util-linux}/bin/mount
-          copy_bin_and_libs ${config.boot.zfs.package}/bin/mount.zfs
-        ''}
-
         # Copy some util-linux stuff.
         copy_bin_and_libs ${pkgs.util-linux}/sbin/blkid
+        copy_bin_and_libs ${lib.getOutput "mount" pkgs.util-linux}/bin/mount
 
         # Copy dmsetup and lvm.
         copy_bin_and_libs ${getBin pkgs.lvm2}/bin/dmsetup
@@ -225,17 +207,7 @@ let
         # Make sure that the patchelf'ed binaries still work.
         echo "testing patched programs..."
         $out/bin/ash -c 'echo hello world' | grep "hello world"
-        ${
-          if zfsRequiresMountHelper then
-            ''
-              $out/bin/mount -V 1>&1 | grep -q "mount from util-linux"
-              $out/bin/mount.zfs -h 2>&1 | grep -q "Usage: mount.zfs"
-            ''
-          else
-            ''
-              $out/bin/mount --help 2>&1 | grep -q "BusyBox"
-            ''
-        }
+        $out/bin/mount -V 2>&1 | grep -q "mount from util-linux"
         $out/bin/blkid -V 2>&1 | grep -q 'libblkid'
         $out/bin/udevadm --version
         $out/bin/dmsetup --version 2>&1 | tee -a log | grep -q "version:"
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index d070b5a4c0e0..fc3ce114df2c 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -717,6 +717,7 @@ in
         kernelModules = [ "zfs" ];
         extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) ''
           copy_bin_and_libs ${cfgZfs.package}/sbin/zfs
+          copy_bin_and_libs ${cfgZfs.package}/sbin/mount.zfs
           copy_bin_and_libs ${cfgZfs.package}/sbin/zdb
           copy_bin_and_libs ${cfgZfs.package}/sbin/zpool
           copy_bin_and_libs ${cfgZfs.package}/lib/udev/vdev_id
@@ -725,6 +726,7 @@ in
         extraUtilsCommandsTest = lib.mkIf (!config.boot.initrd.systemd.enable) ''
           $out/bin/zfs --help >/dev/null 2>&1
           $out/bin/zpool --help >/dev/null 2>&1
+          $out/bin/mount.zfs -h 2>&1 | grep -q "Usage: mount.zfs"
         '';
         postResumeCommands = lib.mkIf (!config.boot.initrd.systemd.enable) (
           lib.concatStringsSep "\n" (
@@ -796,6 +798,7 @@ in
           extraBin = {
             zpool = "${cfgZfs.package}/sbin/zpool";
             zfs = "${cfgZfs.package}/sbin/zfs";
+            mount.zfs = "${cfgZfs.package}/sbin/mount.zfs";
             awk = "${pkgs.gawk}/bin/awk";
           };
           storePaths = [

From 6747987a9f6c9312a3297e17fc31707443c11857 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Thu, 11 Sep 2025 21:00:31 +0200
Subject: [PATCH 0097/6226] python313Packages.tkinter: revert to building with
 tcl 8.6

Tcl 9.0 support in Tkinter is not quite there yet [1]. There is ongoing
work on improving support, though.

This fixes the build of `python310Packages.tkinter` and
`python311Packages.tkinter`.

[1] https://github.com/python/cpython/issues/124111
---
 pkgs/development/python-modules/tkinter/pyproject.toml | 3 +--
 pkgs/top-level/python-packages.nix                     | 7 +++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/tkinter/pyproject.toml b/pkgs/development/python-modules/tkinter/pyproject.toml
index 770331a7ef4f..a53ccd8c72a2 100644
--- a/pkgs/development/python-modules/tkinter/pyproject.toml
+++ b/pkgs/development/python-modules/tkinter/pyproject.toml
@@ -11,6 +11,5 @@ requires-python = ">=@python_version@"
 [tool.setuptools]
 packages = ["tkinter"]
 ext-modules = [
-  { name = "_tkinter", sources = ["_tkinter.c"], libraries = ["tcl9.0", "tcl9tk9.0"], include-dirs = ["@python_internal_dir@/"] }
+  { name = "_tkinter", sources = ["_tkinter.c"], libraries = ["tcl", "tk"], include-dirs = ["@python_internal_dir@/"] }
 ]
-
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9e7bfc8df7f1..e7e417363f0c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18388,8 +18388,11 @@ self: super: with self; {
       null
     else
       callPackage ../development/python-modules/tkinter {
-        tcl = pkgs.tcl-9_0;
-        tk = pkgs.tk-9_0;
+        # Tcl/Tk 9.0 support in Tkinter is not quite ready yet:
+        # - https://github.com/python/cpython/issues/124111
+        # - https://github.com/python/cpython/issues/104568
+        tcl = pkgs.tcl-8_6;
+        tk = pkgs.tk-8_6;
       };
 
   tkinter-gl = callPackage ../development/python-modules/tkinter-gl { };

From 0ff96eca9b5e0a70e4c7b2ea3d8788605ddd3285 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Thu, 11 Sep 2025 21:04:05 +0200
Subject: [PATCH 0098/6226] python313Packages.tkinter: enable tests by default

---
 pkgs/development/python-modules/tkinter/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix
index afc6d765a498..548c36625c4d 100644
--- a/pkgs/development/python-modules/tkinter/default.nix
+++ b/pkgs/development/python-modules/tkinter/default.nix
@@ -8,7 +8,6 @@
   tcl,
   tclPackages,
   tk,
-  tkinter,
   xvfb-run,
 }:
 
@@ -64,8 +63,6 @@ buildPythonPackage {
     ];
   };
 
-  doCheck = false;
-
   nativeCheckInputs = [ xvfb-run ];
 
   preCheck = ''
@@ -81,8 +78,6 @@ buildPythonPackage {
     runHook postCheck
   '';
 
-  passthru.tests.unittests = tkinter.overridePythonAttrs { doCheck = true; };
-
   pythonImportsCheck = [ "tkinter" ];
 
   meta = {

From d4b01227d4fdeacb65a00d18f42186191e90e02f Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Thu, 11 Sep 2025 21:10:04 +0200
Subject: [PATCH 0099/6226] python313Packages.tkinter: enable tests for tcl and
 ttk

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

diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix
index 548c36625c4d..560ebf766649 100644
--- a/pkgs/development/python-modules/tkinter/default.nix
+++ b/pkgs/development/python-modules/tkinter/default.nix
@@ -73,7 +73,7 @@ buildPythonPackage {
   checkPhase = ''
     runHook preCheck
     xvfb-run -w 10 -s "-screen 0 1920x1080x24" \
-      python -m unittest test.test_tkinter
+      python -m unittest test.test_tcl test.test_tkinter test.test_ttk test.test_ttk_textonly
 
     runHook postCheck
   '';

From 829b86801b3e432e466559a4cd0a8c652d461be5 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Thu, 11 Sep 2025 22:12:15 +0200
Subject: [PATCH 0100/6226] python313Packages.tkinter: fix test selection for
 darwin, older python

https://github.com/python/cpython/pull/94070
---
 .../python-modules/tkinter/default.nix        | 39 +++++++++++++++----
 1 file changed, 31 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix
index 560ebf766649..8d5807493977 100644
--- a/pkgs/development/python-modules/tkinter/default.nix
+++ b/pkgs/development/python-modules/tkinter/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   replaceVars,
   setuptools,
@@ -63,20 +64,42 @@ buildPythonPackage {
     ];
   };
 
-  nativeCheckInputs = [ xvfb-run ];
+  nativeCheckInputs = lib.optional stdenv.hostPlatform.isLinux xvfb-run;
 
   preCheck = ''
     cd $NIX_BUILD_TOP/Python-*/Lib
     export HOME=$TMPDIR
   '';
 
-  checkPhase = ''
-    runHook preCheck
-    xvfb-run -w 10 -s "-screen 0 1920x1080x24" \
-      python -m unittest test.test_tcl test.test_tkinter test.test_ttk test.test_ttk_textonly
-
-    runHook postCheck
-  '';
+  checkPhase =
+    let
+      testsNoGui = [
+        "test.test_tcl"
+        "test.test_ttk_textonly"
+      ];
+      testsGui =
+        if pythonOlder "3.12" then
+          [
+            "test.test_tk"
+            # "test.test_ttk_guionly"  # https://github.com/python/cpython/issues/124378
+          ]
+        else
+          [
+            "test.test_tkinter"
+            "test.test_ttk"
+          ];
+    in
+    ''
+      runHook preCheck
+      ${python.interpreter} -m unittest ${lib.concatStringsSep " " testsNoGui}
+    ''
+    + lib.optionalString stdenv.hostPlatform.isLinux ''
+      xvfb-run -w 10 -s "-screen 0 1920x1080x24" \
+        ${python.interpreter} -m unittest ${lib.concatStringsSep " " testsGui}
+    ''
+    + ''
+      runHook postCheck
+    '';
 
   pythonImportsCheck = [ "tkinter" ];
 

From 69b8cd945c645230ddf909784973d6c2136fac40 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Fri, 12 Sep 2025 14:15:21 +0200
Subject: [PATCH 0101/6226] python313Packages.tkinter: patch failing ttk test
 for python <3.12

https://github.com/python/cpython/issues/124378
https://github.com/python/cpython/pull/124542
---
 .../python-modules/tkinter/default.nix        | 15 ++++++++----
 .../tkinter/fix-ttk-notebook-test.patch       | 24 +++++++++++++++++++
 2 files changed, 34 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/python-modules/tkinter/fix-ttk-notebook-test.patch

diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix
index 8d5807493977..233b2b2b0e4a 100644
--- a/pkgs/development/python-modules/tkinter/default.nix
+++ b/pkgs/development/python-modules/tkinter/default.nix
@@ -27,23 +27,28 @@ buildPythonPackage {
     cp -rv Modules/clinic ../tkinter/
     cp -rv Lib/tkinter ../tkinter/
 
-    pushd $NIX_BUILD_TOP/tkinter
-
     # install our custom pyproject.toml
     cp ${
       replaceVars ./pyproject.toml {
         python_version = python.version;
         python_internal_dir = "${python}/include/${python.libPrefix}/internal";
       }
-    } ./pyproject.toml
+    } $NIX_BUILD_TOP/tkinter/pyproject.toml
 
   ''
   + lib.optionalString (pythonOlder "3.13") ''
-    substituteInPlace "tkinter/tix.py" --replace-fail \
+    substituteInPlace "$NIX_BUILD_TOP/tkinter/tkinter/tix.py" --replace-fail \
       "os.environ.get('TIX_LIBRARY')" \
       "os.environ.get('TIX_LIBRARY') or '${tclPackages.tix}/lib'"
   '';
 
+  # Adapted from https://github.com/python/cpython/pull/124542
+  patches = lib.optional (pythonOlder "3.12") ./fix-ttk-notebook-test.patch;
+
+  preConfigure = ''
+    pushd $NIX_BUILD_TOP/tkinter
+  '';
+
   build-system = [ setuptools ];
 
   buildInputs = [
@@ -81,7 +86,7 @@ buildPythonPackage {
         if pythonOlder "3.12" then
           [
             "test.test_tk"
-            # "test.test_ttk_guionly"  # https://github.com/python/cpython/issues/124378
+            "test.test_ttk_guionly"
           ]
         else
           [
diff --git a/pkgs/development/python-modules/tkinter/fix-ttk-notebook-test.patch b/pkgs/development/python-modules/tkinter/fix-ttk-notebook-test.patch
new file mode 100644
index 000000000000..cf2ca0f7acdf
--- /dev/null
+++ b/pkgs/development/python-modules/tkinter/fix-ttk-notebook-test.patch
@@ -0,0 +1,24 @@
+--- a/Lib/tkinter/test/test_ttk/test_widgets.py
++++ b/Lib/tkinter/test/test_ttk/test_widgets.py
+@@ -911,12 +911,20 @@ class ScrollbarTest(AbstractWidgetTest, unittest.TestCase):
+         return ttk.Scrollbar(self.root, **kwargs)
+ 
+ 
+-@add_standard_options(IntegerSizeTests, StandardTtkOptionsTests)
++@add_standard_options(StandardTtkOptionsTests)
+ class NotebookTest(AbstractWidgetTest, unittest.TestCase):
+     OPTIONS = (
+         'class', 'cursor', 'height', 'padding', 'style', 'takefocus', 'width',
+     )
+ 
++    def test_configure_height(self):
++        widget = self.create()
++        self.checkPixelsParam(widget, 'height', '10c', 402, -402, 0, conv=False)
++
++    def test_configure_width(self):
++        widget = self.create()
++        self.checkPixelsParam(widget, 'width', '10c', 402, -402, 0, conv=False)
++
+     def setUp(self):
+         super().setUp()
+         self.nb = self.create(padding=0)

From d8828896de09084ab1da69a805a219525322501c Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 16 Sep 2025 00:43:04 +0000
Subject: [PATCH 0102/6226] bundler: 2.7.1 -> 2.7.2

---
 pkgs/by-name/bu/bundler/package.nix                     | 4 ++--
 pkgs/development/interpreters/ruby/rubygems/default.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/bu/bundler/package.nix b/pkgs/by-name/bu/bundler/package.nix
index e1e5c1fdbc36..1789ef0c7203 100644
--- a/pkgs/by-name/bu/bundler/package.nix
+++ b/pkgs/by-name/bu/bundler/package.nix
@@ -13,8 +13,8 @@ buildRubyGem rec {
   inherit ruby;
   name = "${gemName}-${version}";
   gemName = "bundler";
-  version = "2.7.1";
-  source.sha256 = "sha256-CtWgAqh5d2sqmL5lL1V6yHMb4zU2EtY/pO8bJwbcHgs=";
+  version = "2.7.2";
+  source.sha256 = "sha256-Heyvni4ay5G2WGopJcjz9tojNKgnMaYv8t7RuDwoOHE=";
   dontPatchShebangs = true;
 
   postFixup = ''
diff --git a/pkgs/development/interpreters/ruby/rubygems/default.nix b/pkgs/development/interpreters/ruby/rubygems/default.nix
index 58295fb55547..0e676a64c2d3 100644
--- a/pkgs/development/interpreters/ruby/rubygems/default.nix
+++ b/pkgs/development/interpreters/ruby/rubygems/default.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rubygems";
-  version = "3.7.1";
+  version = "3.7.2";
 
   src = fetchurl {
     url = "https://rubygems.org/rubygems/rubygems-${version}.tgz";
-    hash = "sha256-dQyMdxGA1B7SNYNE5UYe3ugxWMCoG3eZaaEzmWG8EWM=";
+    hash = "sha256-7+zgEiWlMvS1LPh2TSCgDg0p7W+Fsz2TAt9IlqkPpas=";
   };
 
   patches = [

From d535ec48b8c35082fe861589f1e4c6ef67bdeaa9 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Tue, 2 Sep 2025 22:58:00 +0900
Subject: [PATCH 0103/6226] somo: 1.1.0 -> 1.2.0

Changelog: https://github.com/theopfr/somo/blob/v1.2.0/CHANGELOG.md?plain=1#L3-L10
Diff: https://github.com/theopfr/somo/compare/v1.1.0...v1.2.0
---
 pkgs/by-name/so/somo/package.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/so/somo/package.nix b/pkgs/by-name/so/somo/package.nix
index 5cee1579ced7..d4cc7c9c9903 100644
--- a/pkgs/by-name/so/somo/package.nix
+++ b/pkgs/by-name/so/somo/package.nix
@@ -5,21 +5,23 @@
   fetchFromGitHub,
   installShellFiles,
   versionCheckHook,
+  libredirect,
+  iana-etc,
   nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "somo";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "theopfr";
     repo = "somo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HUTaBSy3FemAQH1aKZYTJnUWiq0bU/H6c5Gz3yamPiA=";
+    hash = "sha256-QTW+hsoj8Wrv3BbFCB2aibR27Wu1MA/1gWzAXtPKWsM=";
   };
 
-  cargoHash = "sha256-e3NrEfbWz6h9q4TJnn8jnRmMJbeaEc4Yo3hFlaRLzzQ=";
+  cargoHash = "sha256-xlAdEo11UV1Y49D1LjxH5Oykf/RUoe1w6ZcQpGhfqkk=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -29,6 +31,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rustPlatform.bindgenHook
   ];
 
+  nativeCheckInputs = [
+    libredirect.hook
+  ];
+
+  preCheck = ''
+    export NIX_REDIRECTS=/etc/services=${iana-etc}/etc/services
+  '';
+
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd somo \
       --bash <("$out/bin/somo" generate-completions bash) \

From c5cb903e37dd55fdd406b2791ac64cff42d1adfa Mon Sep 17 00:00:00 2001
From: polyfloyd <floyd@polyfloyd.net>
Date: Tue, 16 Sep 2025 18:07:35 +0200
Subject: [PATCH 0104/6226] ycm-cmake-modules: init at 0.18.4

---
 pkgs/by-name/yc/ycm-cmake-modules/package.nix | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 pkgs/by-name/yc/ycm-cmake-modules/package.nix

diff --git a/pkgs/by-name/yc/ycm-cmake-modules/package.nix b/pkgs/by-name/yc/ycm-cmake-modules/package.nix
new file mode 100644
index 000000000000..8c532b714969
--- /dev/null
+++ b/pkgs/by-name/yc/ycm-cmake-modules/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "ycm-cmake-modules";
+  version = "0.18.4";
+  src = fetchFromGitHub {
+    owner = "robotology";
+    repo = "ycm-cmake-modules";
+    rev = "v${version}";
+    hash = "sha256-Xmc23r3hmwg9v620KGfUV/s7feJUVVZD1OaT3TAQBBY=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Collection of various useful CMake modules";
+    homepage = "https://robotology.github.io/ycm-cmake-modules/gh-pages/latest/index.html";
+    license = lib.licenses.bsd3;
+    platforms = lib.platforms.linux;
+    maintainers = [ ];
+  };
+}

From 7e425ae380942647568280db688c645259d889ec Mon Sep 17 00:00:00 2001
From: polyfloyd <floyd@polyfloyd.net>
Date: Tue, 16 Sep 2025 18:07:54 +0200
Subject: [PATCH 0105/6226] yarp: 2.3.70.2 -> 3.12.1

---
 .../by-name/ya/yarp/0001-format-security.patch | 13 +++++++++++++
 pkgs/by-name/ya/yarp/package.nix               | 18 +++++++++++++++---
 2 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/ya/yarp/0001-format-security.patch

diff --git a/pkgs/by-name/ya/yarp/0001-format-security.patch b/pkgs/by-name/ya/yarp/0001-format-security.patch
new file mode 100644
index 000000000000..dc5e55f8712e
--- /dev/null
+++ b/pkgs/by-name/ya/yarp/0001-format-security.patch
@@ -0,0 +1,13 @@
+diff --git i/src/libYARP_companion/src/yarp/companion/impl/Companion.cmdSplit.cpp w/src/libYARP_companion/src/yarp/companion/impl/Companion.cmdSplit.cpp
+index a9024cb03..f4860ac62 100644
+--- i/src/libYARP_companion/src/yarp/companion/impl/Companion.cmdSplit.cpp
++++ w/src/libYARP_companion/src/yarp/companion/impl/Companion.cmdSplit.cpp
+@@ -111,7 +111,7 @@ int Companion::cmdSplit(int argc, char *argv[])
+             inData->mutex.unlock();
+             if (siz != 0)
+             {
+-                yCInfo(COMPANION, std::string("Received a Bottle of "+std::to_string(siz)+" elements.").c_str());
++                yCInfo(COMPANION, "Received a Bottle of %z elements.", siz);
+                 outPort = new BufferedPort<Bottle> [siz];
+                 for (size_t i = 0; i < siz; i++)
+                 {
diff --git a/pkgs/by-name/ya/yarp/package.nix b/pkgs/by-name/ya/yarp/package.nix
index f14e40f931fa..71ef9b5dfc53 100644
--- a/pkgs/by-name/ya/yarp/package.nix
+++ b/pkgs/by-name/ya/yarp/package.nix
@@ -4,20 +4,30 @@
   fetchFromGitHub,
   cmake,
   ace,
+  ycm-cmake-modules,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
   pname = "yarp";
-  version = "2.3.70.2";
+  version = "3.12.1";
   src = fetchFromGitHub {
     owner = "robotology";
     repo = "yarp";
     rev = "v${version}";
-    sha256 = "0mphh899niy30xbjjwi9xpsliq8mladfldbbbjfngdrqfhiray1a";
+    hash = "sha256-6PyXMEUh0ENsRjbsXbwDr4ZqAulw8rgY5G0l/RewWys=";
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ ace ];
+  buildInputs = [
+    ace
+    ycm-cmake-modules
+  ];
+
+  patches = [
+    # Weird string interpolation causes compilation to fail due to -Wformat-security.
+    ./0001-format-security.patch
+  ];
 
   cmakeFlags = [
     "-DYARP_COMPILE_UNMAINTAINED:BOOL=ON"
@@ -28,6 +38,8 @@ stdenv.mkDerivation rec {
 
   postInstall = "mv ./$out/lib/*.so $out/lib/";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Yet Another Robot Platform";
     homepage = "http://yarp.it";

From 01371010e577b8efd25e91da4a7d8c7b3fc8d239 Mon Sep 17 00:00:00 2001
From: m1dugh <romain.le-miere@epita.fr>
Date: Wed, 17 Sep 2025 17:52:25 +0200
Subject: [PATCH 0106/6226] msi-ec: 0-unstable-2025-05-17 ->
 0-unstable-2025-09-17

---
 pkgs/os-specific/linux/msi-ec/default.nix            |  8 ++++----
 pkgs/os-specific/linux/msi-ec/patches/makefile.patch | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/msi-ec/default.nix b/pkgs/os-specific/linux/msi-ec/default.nix
index 9056e6132a92..81d2930a622d 100644
--- a/pkgs/os-specific/linux/msi-ec/default.nix
+++ b/pkgs/os-specific/linux/msi-ec/default.nix
@@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation {
   pname = "msi-ec-kmods";
-  version = "0-unstable-2025-05-17";
+  version = "0-unstable-2025-09-17";
 
   src = fetchFromGitHub {
     owner = "BeardOverflow";
     repo = "msi-ec";
-    rev = "796be9047b13c311ac4cdec33913775f4057f600";
-    hash = "sha256-npJbnWFBVb8TK9ynVD/kXWq2iqO0ACKF4UYsu5mQuok=";
+    rev = "ed92e2eb0005ab815f5492c8cb02495289263738";
+    hash = "sha256-9jynXUvSZT2smyciK8GqojC/4MtxtqfQvJcf5RgPXKY=";
   };
 
   dontMakeSourcesWritable = false;
@@ -44,6 +44,6 @@ stdenv.mkDerivation {
     license = lib.licenses.gpl2Plus;
     maintainers = [ lib.maintainers.m1dugh ];
     platforms = lib.platforms.linux;
-    broken = kernel.kernelOlder "5.5";
+    broken = kernel.kernelOlder "6.5";
   };
 }
diff --git a/pkgs/os-specific/linux/msi-ec/patches/makefile.patch b/pkgs/os-specific/linux/msi-ec/patches/makefile.patch
index 0ed29887b3d4..c54a649efe27 100644
--- a/pkgs/os-specific/linux/msi-ec/patches/makefile.patch
+++ b/pkgs/os-specific/linux/msi-ec/patches/makefile.patch
@@ -1,12 +1,12 @@
 diff --git a/Makefile b/Makefile
-index bffcbd4..fd1d8a3 100644
+index 9e598ea..0776132 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -1,6 +1,7 @@
- VERSION         := 0.08
+ VERSION         := 0.12
  DKMS_ROOT_PATH  := /usr/src/msi_ec-$(VERSION)
- TARGET ?= $(shell uname -r)
-+KERNELDIR ?= /lib/modules/$(TARGET)/build/
+ KERNELRELEASE ?= $(shell uname -r)
++KERNELDIR ?= /lib/modules/$(KERNELRELEASE)/build/
  
  ccflags-y := -std=gnu11 -Wno-declaration-after-statement
  
@@ -14,11 +14,11 @@ index bffcbd4..fd1d8a3 100644
  all: modules
  
  modules:
--	@$(MAKE) -C /lib/modules/$(TARGET)/build M=$(CURDIR) modules
+-	@$(MAKE) -C /lib/modules/$(KERNELRELEASE)/build M=$(CURDIR) modules
 +	@$(MAKE) -C $(KERNELDIR) M=$(CURDIR) modules
  
  clean:
- 	@$(MAKE) -C /lib/modules/$(TARGET)/build M=$(CURDIR) clean
+ 	@$(MAKE) -C /lib/modules/$(KERNELRELEASE)/build M=$(CURDIR) clean
  
 +modules_install:
 +	@$(MAKE) -C $(KERNELDIR) M=$(CURDIR) modules_install

From 82c23622c7232f8b57924d6d4ab59a6089b88d55 Mon Sep 17 00:00:00 2001
From: Victor Engmark <victor@engmark.name>
Date: Wed, 17 Sep 2025 15:11:01 +0200
Subject: [PATCH 0107/6226] rubyPackages: Add command to audit packages

For known security vulnerabilities.

Converts `pkgs/top-level/ruby-packages.nix` to a minimal `Gemfile.lock`
for `bundler-audit`.
---
 doc/languages-frameworks/ruby.section.md          |  2 ++
 .../audit-ruby-packages/audit-ruby-packages.bash  |  6 ++++++
 .../scripts/audit-ruby-packages/default.nix       | 15 +++++++++++++++
 3 files changed, 23 insertions(+)
 create mode 100755 maintainers/scripts/audit-ruby-packages/audit-ruby-packages.bash
 create mode 100644 maintainers/scripts/audit-ruby-packages/default.nix

diff --git a/doc/languages-frameworks/ruby.section.md b/doc/languages-frameworks/ruby.section.md
index 25c31de17e71..f1be5e04dd48 100644
--- a/doc/languages-frameworks/ruby.section.md
+++ b/doc/languages-frameworks/ruby.section.md
@@ -273,6 +273,8 @@ To test that it works, you can then try using the gem with:
 NIX_PATH=nixpkgs=$PWD nix-shell -p "ruby.withPackages (ps: with ps; [ name-of-your-gem ])"
 ```
 
+To check the gems for any security vulnerabilities, run `./maintainers/scripts/audit-ruby-packages/audit-ruby-packages.bash`.
+
 ### Packaging applications {#packaging-applications}
 
 A common task is to add a Ruby executable to Nixpkgs; popular examples would be `chef`, `jekyll`, or `sass`. A good way to do that is to use the `bundlerApp` function, that allows you to make a package that only exposes the listed executables. Otherwise, the package may cause conflicts through common paths like `bin/rake` or `bin/bundler` that aren't meant to be used.
diff --git a/maintainers/scripts/audit-ruby-packages/audit-ruby-packages.bash b/maintainers/scripts/audit-ruby-packages/audit-ruby-packages.bash
new file mode 100755
index 000000000000..6459e38d9842
--- /dev/null
+++ b/maintainers/scripts/audit-ruby-packages/audit-ruby-packages.bash
@@ -0,0 +1,6 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bundler-audit
+
+set -o errexit -o nounset -o pipefail
+
+bundle-audit check "$(nix-build --no-out-link maintainers/scripts/audit-ruby-packages/default.nix)"
diff --git a/maintainers/scripts/audit-ruby-packages/default.nix b/maintainers/scripts/audit-ruby-packages/default.nix
new file mode 100644
index 000000000000..47d394cb7875
--- /dev/null
+++ b/maintainers/scripts/audit-ruby-packages/default.nix
@@ -0,0 +1,15 @@
+let
+  pkgs = import ../../.. { };
+  lockFileBody = pkgs.lib.concatStringsSep "\n" (
+    pkgs.lib.mapAttrsToList (name: props: "    ${name} (${props.version})") (
+      pkgs.lib.filterAttrs (name: _props: name != "recurseForDerivations") pkgs.rubyPackages
+    )
+  );
+in
+pkgs.runCommand "bundle-audit" { } ''
+  mkdir "$out"
+  echo 'GEM' > "$out/Gemfile.lock"
+  echo '  remote: https://rubygems.org/' >> "$out/Gemfile.lock"
+  echo '  specs:' >> "$out/Gemfile.lock"
+  echo '${lockFileBody}' >> "$out/Gemfile.lock"
+''

From 15803a174832e8d00da07b387a2e548a651a5578 Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Thu, 18 Sep 2025 15:33:24 +0200
Subject: [PATCH 0108/6226] jasp-desktop: fix build by not depending on removed
 cran package

---
 pkgs/by-name/ja/jasp-desktop/modules.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ja/jasp-desktop/modules.nix b/pkgs/by-name/ja/jasp-desktop/modules.nix
index 040b3a258947..8b743c851d2b 100644
--- a/pkgs/by-name/ja/jasp-desktop/modules.nix
+++ b/pkgs/by-name/ja/jasp-desktop/modules.nix
@@ -176,6 +176,7 @@ let
     {
       pname,
       version,
+      rev ? "refs/tags/${version}",
       hash,
       deps,
     }:
@@ -185,8 +186,7 @@ let
         name = "${pname}-${version}-source";
         owner = "jasp-stats";
         repo = pname;
-        tag = "v${version}";
-        inherit hash;
+        inherit rev hash;
       };
       propagatedBuildInputs = deps;
       # some packages have a .Rprofile that tries to activate renv
@@ -713,8 +713,9 @@ in
     };
     jaspRegression = buildJaspModule {
       pname = "jaspRegression";
-      version = "0.95.0";
-      hash = "sha256-9Q5Ei9vjFaDte//1seCj9++ftbDctkHzP8ZpGVETXH0=";
+      version = "0.95.0-unstable-2025-08-27";
+      rev = "b0ecad26bb248964e778ee6d4486d671b83930b2";
+      hash = "sha256-wm/Fz/wA7B96bzj8UylZjFgrrZgwOTdGnCsmfaCPGp0=";
       deps = [
         BAS
         boot
@@ -723,7 +724,6 @@ in
         emmeans
         ggplot2
         ggrepel
-        hmeasure
         jaspAnova
         jaspBase
         jaspDescriptives

From a1180e40d32e45924680af7043cd429c5676bb60 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 18 Sep 2025 13:22:14 -0700
Subject: [PATCH 0109/6226] opencv: invalidate Nix store paths used in
 version_string.inc

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 ...s.cmake-invalidate-Nix-store-paths-b.patch | 34 +++++++++++++++++++
 pkgs/development/libraries/opencv/4.x.nix     |  6 +---
 2 files changed, 35 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/development/libraries/opencv/0001-cmake-OpenCVUtils.cmake-invalidate-Nix-store-paths-b.patch

diff --git a/pkgs/development/libraries/opencv/0001-cmake-OpenCVUtils.cmake-invalidate-Nix-store-paths-b.patch b/pkgs/development/libraries/opencv/0001-cmake-OpenCVUtils.cmake-invalidate-Nix-store-paths-b.patch
new file mode 100644
index 000000000000..03f912cef39a
--- /dev/null
+++ b/pkgs/development/libraries/opencv/0001-cmake-OpenCVUtils.cmake-invalidate-Nix-store-paths-b.patch
@@ -0,0 +1,34 @@
+From fcc689e1887bcbeb9d1c4441266a63ea2114ae9f Mon Sep 17 00:00:00 2001
+From: Connor Baker <ConnorBaker01@gmail.com>
+Date: Thu, 18 Sep 2025 13:15:43 -0700
+Subject: [PATCH] cmake/OpenCVUtils.cmake: invalidate Nix store paths before
+ including in version_string.inc
+
+Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
+---
+ cmake/OpenCVUtils.cmake | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+diff --git a/cmake/OpenCVUtils.cmake b/cmake/OpenCVUtils.cmake
+index 5886f4f3cb..9f3a3a74e9 100644
+--- a/cmake/OpenCVUtils.cmake
++++ b/cmake/OpenCVUtils.cmake
+@@ -956,6 +956,15 @@ function(ocv_output_status msg)
+     message(WARNING "String to be inserted to version_string.inc has an unexpected line break: '${msg}'")
+     string(REPLACE "\n" "\\n" msg "${msg}")
+   endif()
++  # The hash portion of Nix store paths are 32 characters long. Replace them with an invalid hash to avoid bloating
++  # the runtime closure by includnig references to the compiler and other build tools.
++  # https://fzakaria.com/2025/03/28/what-s-in-a-nix-store-path
++  # NOTE: This assumes the name of the Nix store is always /nix/store.
++  # NOTE: The regex [a-z0-9] is larger than Nix's base32, but it simplifies things.
++  # NOTE: This assumes all Nix store paths have additional characters after the hash.
++  # NOTE: CMake doesn't support fixed-length matching. See:
++  # https://cmake.org/cmake/help/latest/command/string.html#regex-specification
++  string(REGEX REPLACE "/nix/store/[a-z0-9]+-" "/nix/store/eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee-" msg "${msg}")
+   set(OPENCV_BUILD_INFO_STR "${OPENCV_BUILD_INFO_STR}\"${msg}\\n\"\n" CACHE INTERNAL "")
+ endfunction()
+ 
+-- 
+2.48.1
+
diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix
index 26a49c1ae1af..8c169864bab2 100644
--- a/pkgs/development/libraries/opencv/4.x.nix
+++ b/pkgs/development/libraries/opencv/4.x.nix
@@ -298,6 +298,7 @@ effectiveStdenv.mkDerivation {
   # Ensures that we use the system OpenEXR rather than the vendored copy of the source included with OpenCV.
   patches = [
     ./cmake-don-t-use-OpenCVFindOpenEXR.patch
+    ./0001-cmake-OpenCVUtils.cmake-invalidate-Nix-store-paths-b.patch
   ]
   ++ optionals enableCuda [
     ./cuda_opt_flow.patch
@@ -321,11 +322,6 @@ effectiveStdenv.mkDerivation {
       ${installExtraFiles wechat_qrcode}
     '');
 
-  postConfigure = ''
-    [ -e modules/core/version_string.inc ]
-    echo '"(build info elided)"' > modules/core/version_string.inc
-  '';
-
   buildInputs = [
     boost
     gflags

From 13568e4c6477caa5faa35b957f90aa92d242a177 Mon Sep 17 00:00:00 2001
From: griffi-gh <prasol258@gmail.com>
Date: Fri, 19 Sep 2025 00:21:24 +0200
Subject: [PATCH 0110/6226] garage-webui: init at 1.1.0

---
 pkgs/by-name/ga/garage-webui/package.nix | 74 ++++++++++++++++++++++++
 1 file changed, 74 insertions(+)
 create mode 100644 pkgs/by-name/ga/garage-webui/package.nix

diff --git a/pkgs/by-name/ga/garage-webui/package.nix b/pkgs/by-name/ga/garage-webui/package.nix
new file mode 100644
index 000000000000..ab70c5406b93
--- /dev/null
+++ b/pkgs/by-name/ga/garage-webui/package.nix
@@ -0,0 +1,74 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildGoModule,
+  nodejs,
+  pnpm_9,
+  nix-update-script,
+}:
+let
+  pnpm = pnpm_9;
+in
+buildGoModule (finalAttrs: {
+  pname = "garage-webui";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "khairul169";
+    repo = "garage-webui";
+    tag = finalAttrs.version;
+    hash = "sha256-bqUAhZBSQkWZ1QsgPslEUDwt8NOg25Os0NGlPoyjPL4=";
+  };
+
+  frontend = stdenv.mkDerivation (finalAttrs': {
+    pname = "${finalAttrs.pname}-frontend";
+    inherit (finalAttrs) version src;
+
+    nativeBuildInputs = [
+      nodejs
+      pnpm.configHook
+    ];
+
+    pnpmDeps = pnpm.fetchDeps {
+      inherit (finalAttrs') pname version src;
+      fetcherVersion = 2;
+      hash = "sha256-8eQhR/fuDFNL8W529Ev7piCaseVaFahgZJQk3AJA3ng=";
+    };
+
+    buildPhase = ''
+      runHook preBuild
+      pnpm run build
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+      cp -r dist $out/
+      runHook postInstall
+    '';
+  });
+
+  preBuild = ''
+    cp -r ${finalAttrs.frontend} ./ui/dist
+  '';
+
+  modRoot = "./backend";
+  tags = [ "prod" ];
+  env.CGO_ENABLED = 0;
+  vendorHash = "sha256-7z6r6w/SbBlYYHMxm11xFl/QEYZc2KebnOJZRgYRUYk=";
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "Simple admin web UI for Garage";
+    homepage = "https://github.com/khairul169/garage-webui";
+    changelog = "https://github.com/khairul169/garage-webui/releases/tag/${finalAttrs.version}";
+    mainProgram = "garage-webui";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ griffi-gh ];
+  };
+})

From e951c37b4745f86be845c9495649552aa73f4c03 Mon Sep 17 00:00:00 2001
From: Ludovico Piero <lewdovico@gnuweeb.org>
Date: Sat, 20 Sep 2025 01:44:15 +0900
Subject: [PATCH 0111/6226] samrewritten: 20250802.1 -> 20250919.1

Changelog: https://github.com/PaulCombal/SamRewritten/releases/tag/20250919.1

Signed-off-by: Ludovico Piero <lewdovico@gnuweeb.org>
---
 pkgs/by-name/sa/samrewritten/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sa/samrewritten/package.nix b/pkgs/by-name/sa/samrewritten/package.nix
index 34b345da0454..87bfbb9cf0a4 100644
--- a/pkgs/by-name/sa/samrewritten/package.nix
+++ b/pkgs/by-name/sa/samrewritten/package.nix
@@ -16,13 +16,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "samrewritten";
-  version = "20250802.1";
+  version = "20250919.1";
 
   src = fetchFromGitHub {
     owner = "PaulCombal";
     repo = "SamRewritten";
     tag = finalAttrs.version;
-    hash = "sha256-41fBafFmYW8uGICpIJtSnXDP+KV3uVInxm0op40V/tc=";
+    hash = "sha256-IbWURGWiCRjTJSD8qPc1TmJeOm/WdCAFuK57laIXfXY=";
   };
 
   cargoHash = "sha256-Px/TlR3BhiFCv73v06VNq0/W0bQM/ORRE/9ndv5hbpY=";

From 5881b5100a75ac9a65b1ce36e9e3634db7212cbd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 2 Sep 2025 22:45:57 +0200
Subject: [PATCH 0112/6226] python313Packages.pytest-rerunfailures: 15.1 ->
 16.0.1

Diff: https://github.com/pytest-dev/pytest-rerunfailures/compare/15.1...16.0.1
---
 .../python-modules/pytest-rerunfailures/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
index a219cb3752f4..572fbc3359ec 100644
--- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix
+++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pytest-rerunfailures";
-  version = "15.1";
+  version = "16.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "pytest-dev";
     repo = "pytest-rerunfailures";
     tag = version;
-    hash = "sha256-ab3n61zCf9ok2PWvKTwmaeoeGuMxl0sYE25djk/NDLk=";
+    hash = "sha256-4/BgvfVcs7MdULlhafZypNzzag4ITALStHI1tIoAPL4=";
   };
 
   build-system = [ setuptools ];

From 643f4f7e21f2459acb791a1d7fae74e6bd4c1e34 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 2 Sep 2025 22:49:18 +0200
Subject: [PATCH 0113/6226] python313Packages.pytest-rerunfailures: add
 changelog to meta

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

diff --git a/pkgs/development/python-modules/pytest-rerunfailures/default.nix b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
index 572fbc3359ec..afd0505c9dee 100644
--- a/pkgs/development/python-modules/pytest-rerunfailures/default.nix
+++ b/pkgs/development/python-modules/pytest-rerunfailures/default.nix
@@ -34,6 +34,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Pytest plugin to re-run tests to eliminate flaky failures";
     homepage = "https://github.com/pytest-dev/pytest-rerunfailures";
+    changelog = "https://github.com/pytest-dev/pytest-rerunfailures/blob/${src.tag}/CHANGES.rst";
     license = licenses.mpl20;
     maintainers = with maintainers; [ das-g ];
   };

From fef88af8e705a487ab4dedee77734b152be45c57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 20 Sep 2025 05:07:32 -0700
Subject: [PATCH 0114/6226] python3Packages.pytest-archon: 0.0.6 -> 0.0.7

Diff: https://github.com/jwbargsten/pytest-archon/compare/v0.0.6...v0.0.7
---
 pkgs/development/python-modules/pytest-archon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-archon/default.nix b/pkgs/development/python-modules/pytest-archon/default.nix
index 643d1ae988c7..9a5637f6bbc6 100644
--- a/pkgs/development/python-modules/pytest-archon/default.nix
+++ b/pkgs/development/python-modules/pytest-archon/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pytest-archon";
-  version = "0.0.6";
+  version = "0.0.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jwbargsten";
     repo = "pytest-archon";
     tag = "v${version}";
-    hash = "sha256-ZKs7ifqgazEywszPGxkcPCf2WD2tEpEsbh8kHN/PL7s=";
+    hash = "sha256-0YBujBUBpW/FSIlJDRjL5mvYZfirHW07bRyygyoapw8=";
   };
 
   build-system = [

From 78df37f04ddef8c19c99f847bae16559b1749159 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Sat, 20 Sep 2025 14:57:28 +0200
Subject: [PATCH 0115/6226] nixos/doas: add package option

---
 nixos/modules/security/doas.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/security/doas.nix b/nixos/modules/security/doas.nix
index 659499a24258..b470783126e7 100644
--- a/nixos/modules/security/doas.nix
+++ b/nixos/modules/security/doas.nix
@@ -7,8 +7,6 @@
 let
   cfg = config.security.doas;
 
-  inherit (pkgs) doas;
-
   mkUsrString = user: toString user;
 
   mkGrpString = group: ":${toString group}";
@@ -67,6 +65,8 @@ in
       '';
     };
 
+    package = lib.mkPackageOption pkgs "doas" { };
+
     wheelNeedsPassword = lib.mkOption {
       type = with lib.types; bool;
       default = true;
@@ -256,11 +256,11 @@ in
       setuid = true;
       owner = "root";
       group = "root";
-      source = "${doas}/bin/doas";
+      source = lib.getExe cfg.package;
     };
 
     environment.systemPackages = [
-      doas
+      cfg.package
     ];
 
     security.pam.services.doas = {

From ef3873099d532bd37f7075b882676e6366598a15 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 20 Sep 2025 10:49:44 +0100
Subject: [PATCH 0116/6226] libvdpau-va-gl: pull upstream `cmake-4` fix

Without the change the build fails on` staging` as:

       CMake Error at CMakeLists.txt:2 (cmake_minimum_required):
         Compatibility with CMake < 3.5 has been removed from CMake.

Co-authored-by: Grimmauld <soeren@benjos.de>
---
 pkgs/by-name/li/libvdpau-va-gl/package.nix | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/pkgs/by-name/li/libvdpau-va-gl/package.nix b/pkgs/by-name/li/libvdpau-va-gl/package.nix
index 7741308d9dc1..b55f73762ac2 100644
--- a/pkgs/by-name/li/libvdpau-va-gl/package.nix
+++ b/pkgs/by-name/li/libvdpau-va-gl/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   pkg-config,
   libX11,
@@ -26,6 +27,25 @@ stdenv.mkDerivation rec {
     sha256 = "0asndybfv8xb0fx73sjjw5kydqrahqkm6n04lh589pbf18s5qlld";
   };
 
+  patches = [
+    # cmake-4 compatibility
+    (fetchpatch {
+      name = "cmake-4-1.patch";
+      url = "https://github.com/i-rinat/libvdpau-va-gl/commit/30c8ac91f3aa2843f7dc1c1d167e09fad447fd91.patch?full_index=1";
+      hash = "sha256-PFEqBg3NE0fVFBAW4zdDbh8eBfKyPX3BZ8P2M15Qq5A=";
+    })
+    (fetchpatch {
+      name = "cmake-4-2.patch";
+      url = "https://github.com/i-rinat/libvdpau-va-gl/commit/38c7d8fddb092824cbcdf2b11af519775930cc8b.patch?full_index=1";
+      hash = "sha256-XsX/GLIS2Ce7obQJ4uVhLDtTI1TrDAGi3ECxEH6oOFI=";
+    })
+    (fetchpatch {
+      name = "cmake-4-3.patch";
+      url = "https://github.com/i-rinat/libvdpau-va-gl/commit/a845e8720d900e4bcc89e7ee16106ce63b44af0.patch?full_index=1";
+      hash = "sha256-lhiZFDR2ytDmo9hQUT35IJS4KL4+nYWAOnxZlj7u3tM=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config

From 0b24b2e6d9b47e09601485be7b9e2756421adbf6 Mon Sep 17 00:00:00 2001
From: griffi-gh <prasol258@gmail.com>
Date: Wed, 25 Jun 2025 22:49:37 +0200
Subject: [PATCH 0117/6226] pixieditor: init at 2.0.1.14

---
 pkgs/by-name/pi/pixieditor/deps.json    | 937 ++++++++++++++++++++++++
 pkgs/by-name/pi/pixieditor/mimeinfo.xml |   7 +
 pkgs/by-name/pi/pixieditor/package.nix  | 182 +++++
 3 files changed, 1126 insertions(+)
 create mode 100644 pkgs/by-name/pi/pixieditor/deps.json
 create mode 100644 pkgs/by-name/pi/pixieditor/mimeinfo.xml
 create mode 100644 pkgs/by-name/pi/pixieditor/package.nix

diff --git a/pkgs/by-name/pi/pixieditor/deps.json b/pkgs/by-name/pi/pixieditor/deps.json
new file mode 100644
index 000000000000..70c2bca2941e
--- /dev/null
+++ b/pkgs/by-name/pi/pixieditor/deps.json
@@ -0,0 +1,937 @@
+[
+  {
+    "pname": "AsyncImageLoader.Avalonia",
+    "version": "3.3.0",
+    "hash": "sha256-blhfKI+vX+ojT2cOvSHu3Kp2CuxvhW/l+as88Dia4bA="
+  },
+  {
+    "pname": "Avalonia",
+    "version": "11.3.0",
+    "hash": "sha256-Hot4dWkrP5x+JzaP2/7E1QOOiXfPGhkvK1nzBacHvzg="
+  },
+  {
+    "pname": "Avalonia.Angle.Windows.Natives",
+    "version": "2.1.22045.20230930",
+    "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc="
+  },
+  {
+    "pname": "Avalonia.BuildServices",
+    "version": "0.0.31",
+    "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA="
+  },
+  {
+    "pname": "Avalonia.Controls.ColorPicker",
+    "version": "11.3.0",
+    "hash": "sha256-ee3iLrn8OdWH6Mg01p93wYMMCPXS25VM/uZeQWEr+k0="
+  },
+  {
+    "pname": "Avalonia.Desktop",
+    "version": "11.3.0",
+    "hash": "sha256-XZXmsKrYCOEWzFUbnwNKvEz5OCD/1lAPi+wM4BiMB7I="
+  },
+  {
+    "pname": "Avalonia.Diagnostics",
+    "version": "11.3.0",
+    "hash": "sha256-jO8Fs9kfNGsoZ87zQCxPdn0tyWHcEdgBRIpzkZ0ceM0="
+  },
+  {
+    "pname": "Avalonia.FreeDesktop",
+    "version": "11.3.0",
+    "hash": "sha256-nWIW3aDPI/00/k52BNU4n43sS3ymuw+e97EBSsjjtU4="
+  },
+  {
+    "pname": "Avalonia.Headless",
+    "version": "11.3.0",
+    "hash": "sha256-GMO3gnygbeHAwz21v9yIRGOq1Y8mRIPIQW0jeD0fNao="
+  },
+  {
+    "pname": "Avalonia.Labs.Lottie",
+    "version": "11.3.1",
+    "hash": "sha256-+f1jIirOw9DZSb2Y7ppXYBOuAkZ72MzD/+7rP4xaLAc="
+  },
+  {
+    "pname": "Avalonia.Native",
+    "version": "11.3.0",
+    "hash": "sha256-l6gcCeGd422mLQgVLp2sxh4/+vZxOPoMrxyfjGyhYLs="
+  },
+  {
+    "pname": "Avalonia.Remote.Protocol",
+    "version": "11.3.0",
+    "hash": "sha256-7ytabxzTbPLR3vBCCb7Z6dYRZZVvqiDpvxweOYAqi7I="
+  },
+  {
+    "pname": "Avalonia.Skia",
+    "version": "11.3.0",
+    "hash": "sha256-p+mWsyrYsC9PPhNjOxPZwarGuwmIjxaQ4Ml/2XiEuEc="
+  },
+  {
+    "pname": "Avalonia.Themes.Fluent",
+    "version": "11.3.0",
+    "hash": "sha256-o5scZcwaflLKXQD6VLGZYe4vvQ322Xzgh7F3IvriMfk="
+  },
+  {
+    "pname": "Avalonia.Themes.Simple",
+    "version": "11.3.0",
+    "hash": "sha256-F2DMHskmrJw/KqpYLHGEEuQMVP8T4fXgq5q3tfwFqG0="
+  },
+  {
+    "pname": "Avalonia.Win32",
+    "version": "11.3.0",
+    "hash": "sha256-Ltf6EuL6aIG+YSqOqD/ecdqUDsuwhNuh+XilIn7pmlE="
+  },
+  {
+    "pname": "Avalonia.X11",
+    "version": "11.3.0",
+    "hash": "sha256-QOprHb0HjsggEMWOW7/U8pqlD8M4m97FeTMWlriYHaU="
+  },
+  {
+    "pname": "Avalonia.Xaml.Behaviors",
+    "version": "11.0.5",
+    "hash": "sha256-wS0clXNKAG4uy539dUjbrRdzHrdHsloivpY5SEBCNtY="
+  },
+  {
+    "pname": "Avalonia.Xaml.Behaviors",
+    "version": "11.2.0",
+    "hash": "sha256-I9aELyXkzLGX6T4HUFbCQxn+eWqLLPK0xqEiF+6hi5k="
+  },
+  {
+    "pname": "Avalonia.Xaml.Behaviors",
+    "version": "11.2.0.14",
+    "hash": "sha256-Ep/IOiZyLDoIKrymqXtFPw2hrXQBpu8Dn+4YZ3/3Z4I="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions",
+    "version": "11.0.5",
+    "hash": "sha256-s/o0416K/nZkVWcNPuKbqmwLKhWsMeEds/dT85QOp4c="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions",
+    "version": "11.2.0",
+    "hash": "sha256-Wnt4xra+TPRiAJ5TIyefwkRxxA999THBstm8QuLXZlU="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions",
+    "version": "11.2.0.14",
+    "hash": "sha256-7bk1zc2hZdTg+Y7LaDSb1CmL6yv0GeZAWKh3gf9bVm8="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Custom",
+    "version": "11.0.5",
+    "hash": "sha256-0HVVQTHD+D4q4IYjMJ6H90mMefBLr5pSKDy7JMq10cE="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Custom",
+    "version": "11.2.0",
+    "hash": "sha256-vLOTOHwy7RRrgrYFUetAIWSC+Pm6yxzb3Ko2BPtXGUo="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Custom",
+    "version": "11.2.0.14",
+    "hash": "sha256-RSIczkm9V/fKoOavXJQd931b9r/GBvuz0hR4HD6Wgd4="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.DragAndDrop",
+    "version": "11.0.5",
+    "hash": "sha256-iwchyONRjTbSSNxaGROeM62RL964KCs0fWz6VIO4O/k="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.DragAndDrop",
+    "version": "11.2.0",
+    "hash": "sha256-rAHnjsMnaZCf+dMWe3fZAsnwY2LKFJuTVzsyNzWnh2Q="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.DragAndDrop",
+    "version": "11.2.0.14",
+    "hash": "sha256-kRx4GMzoHZULJoUUptt9Xa7+UFYoiirI+wE6JuBBklc="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Draggable",
+    "version": "11.0.5",
+    "hash": "sha256-C8acIjqy8Akf1ZFVLBq+wKuGaP8YOlKEa+e2RaowKak="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Draggable",
+    "version": "11.2.0",
+    "hash": "sha256-WI3JZm+IuKpdlhw1XpgPXJs+e9P97l0odSHPM8SSrqw="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Draggable",
+    "version": "11.2.0.14",
+    "hash": "sha256-ywaaUhDqj+yHJjnRPCu3HXYr/sSPrrlwiqN30vYqRLk="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Events",
+    "version": "11.0.5",
+    "hash": "sha256-NbG4wOT5d4z6OkGMLdB7pZrRcu0BOK5PBGZ098iE3IU="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Events",
+    "version": "11.2.0",
+    "hash": "sha256-z1DGsetBjrzTP1pLWSqP748bl6tDWWOUlvuPc7WHb1k="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Events",
+    "version": "11.2.0.14",
+    "hash": "sha256-CE7nh1ld747CGoPYiu4KlQxwP9yiG9/OMHwq8GpL0so="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Reactive",
+    "version": "11.0.5",
+    "hash": "sha256-zrbr7MW+3LOyhIMi5VB8YRfr19vyWtcaxwqXjbkTDAA="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Responsive",
+    "version": "11.0.5",
+    "hash": "sha256-TfcYEdLMxYffBcBzcyoKWESrQltozigJKx+CLNCMz08="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Responsive",
+    "version": "11.2.0",
+    "hash": "sha256-V1YHBrPEKBgHYmEdhWmzz7NOSwExYMaz3J0N0s53Gl0="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactions.Responsive",
+    "version": "11.2.0.14",
+    "hash": "sha256-vyc/HXfDAEi1AbAwkphrlVpckrM5ykptXYp/l5ul8VQ="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactivity",
+    "version": "11.0.5",
+    "hash": "sha256-nNoI2rxJBFuYs1lg3O3rXeigJWoGjzGWdU8jsWGz7+4="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactivity",
+    "version": "11.2.0",
+    "hash": "sha256-N3maAwWG//4uHAEvux0/BwanQLviMm7uo6jxIj4kB8s="
+  },
+  {
+    "pname": "Avalonia.Xaml.Interactivity",
+    "version": "11.2.0.14",
+    "hash": "sha256-SZIVuXdT1PN3zBCpVv3F6Y5vaOp8CTsq0/HVHXrbc6Y="
+  },
+  {
+    "pname": "BmpSharp",
+    "version": "0.2.0",
+    "hash": "sha256-uUNpbOmeiOOkX5TQauqEF3yTo4puGh7/vgTTb7Eyg9s="
+  },
+  {
+    "pname": "ByteSize",
+    "version": "2.1.2",
+    "hash": "sha256-qAxJsWRRedraGr0VzvDEpzAWCZfwkMvcsC4WBEh+q6g="
+  },
+  {
+    "pname": "CLSEncoderDecoder",
+    "version": "1.0.0",
+    "hash": "sha256-RSfmfqUn+abzArefdWNT5pIS4hvMEa2abnrhnrKGiPk="
+  },
+  {
+    "pname": "CommunityToolkit.HighPerformance",
+    "version": "8.3.2",
+    "hash": "sha256-8wB8IwDi1u8WLxPHd+6cyAbhGUr1oSi1juULE1crSQc="
+  },
+  {
+    "pname": "CommunityToolkit.Mvvm",
+    "version": "8.4.0",
+    "hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI="
+  },
+  {
+    "pname": "DeviceId",
+    "version": "6.9.0",
+    "hash": "sha256-TZjWLotGLchmhvESXa4A0eUqKCPT89aXmqY7smc952I="
+  },
+  {
+    "pname": "DeviceId.Linux",
+    "version": "6.9.0",
+    "hash": "sha256-MwPAPFD/gs9WZ8gB5BQMEwYswd3EEIpLlvMN5vmz1Wc="
+  },
+  {
+    "pname": "DiscordRichPresence",
+    "version": "1.3.0.28",
+    "hash": "sha256-KdwSl5ysunAbC21cXRrSROO2XN/ZscIVdq6+IH+5Fbs="
+  },
+  {
+    "pname": "ExCSS",
+    "version": "4.3.0",
+    "hash": "sha256-7QGbwOlT1EEkgUULKWSJO3H8BzvV4KP/mUZE/9/3r6M="
+  },
+  {
+    "pname": "ExCSS",
+    "version": "4.3.1",
+    "hash": "sha256-nNn5+YEaqKSULhtDsImNEyndU/MHna7VpZNUExmo80o="
+  },
+  {
+    "pname": "FFMpegCore",
+    "version": "5.1.0",
+    "hash": "sha256-k6AOQjAAWiZI0g7wr32z+0kb48gfcQ1n2XhK4TL53xA="
+  },
+  {
+    "pname": "Hardware.Info",
+    "version": "101.0.1.1",
+    "hash": "sha256-Bjztcg1xtZFL+3BafHAS1PWelDLc1XTQjeyr69pO7dA="
+  },
+  {
+    "pname": "HarfBuzzSharp",
+    "version": "7.3.0.3",
+    "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
+  },
+  {
+    "pname": "HarfBuzzSharp",
+    "version": "8.3.0.1",
+    "hash": "sha256-ZQwyxpI6jB804Z3d1JAhLqyHIu42fo6mpmk5GVFbEzk="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Linux",
+    "version": "7.3.0.3",
+    "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.macOS",
+    "version": "7.3.0.3",
+    "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.macOS",
+    "version": "8.3.0.1",
+    "hash": "sha256-bpow26ydfzv9w6XCtZOcsGqMUVcfmvnIo5qPqtl9NQo="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
+    "version": "7.3.0.3",
+    "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Win32",
+    "version": "7.3.0.3",
+    "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Win32",
+    "version": "8.3.0.1",
+    "hash": "sha256-2+FA4EfAQ68q1nJlXUuqDcETwIA+6OvD0DB/lMnbKVY="
+  },
+  {
+    "pname": "Humanizer.Core",
+    "version": "2.14.1",
+    "hash": "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="
+  },
+  {
+    "pname": "Instances",
+    "version": "3.0.0",
+    "hash": "sha256-tqIbgABsgi8JgT5h+WkCehANUmCzK5/p0UZH5xjOy2Y="
+  },
+  {
+    "pname": "MessagePack",
+    "version": "2.5.192",
+    "hash": "sha256-M9QUEAIeSoSgO3whVkOou0F8kbKCNJ7HHAvTZgytkPU="
+  },
+  {
+    "pname": "MessagePack.Annotations",
+    "version": "2.5.192",
+    "hash": "sha256-DLtncnaQ9Sp5YmWm89+2w3InhdU1ZQxnJgbonAq/1aM="
+  },
+  {
+    "pname": "MessagePackAnalyzer",
+    "version": "2.5.192",
+    "hash": "sha256-4JU8K72WUCW26IcrustOCBotEGqjspnjgEZcJF3ZCl4="
+  },
+  {
+    "pname": "MicroCom.Runtime",
+    "version": "0.11.0",
+    "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
+  },
+  {
+    "pname": "Microsoft.Bcl.AsyncInterfaces",
+    "version": "6.0.0",
+    "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
+  },
+  {
+    "pname": "Microsoft.Bcl.AsyncInterfaces",
+    "version": "8.0.0",
+    "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
+  },
+  {
+    "pname": "Microsoft.Bcl.HashCode",
+    "version": "6.0.0",
+    "hash": "sha256-87myurC/jMcX1f32167j7FTjbZ6FvUE0esrhYTGcvWs="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Analyzers",
+    "version": "3.11.0",
+    "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Analyzers",
+    "version": "3.3.4",
+    "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.AnalyzerUtilities",
+    "version": "3.3.0",
+    "hash": "sha256-nzFs+H0FFEgZzjl/bcmWyQQVKS2PncS6kMYHOqrxXSw="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Common",
+    "version": "4.11.0",
+    "hash": "sha256-cX/xgM0VmS+Bsu63KZk2ofjFOOy1mzI+CCVEY6kI+Qk="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Common",
+    "version": "4.14.0",
+    "hash": "sha256-ne/zxH3GqoGB4OemnE8oJElG5mai+/67ASaKqwmL2BE="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.CSharp",
+    "version": "4.11.0",
+    "hash": "sha256-E9jEOjp9g/CFecsc5/QfRKOPXMRpSw0Tf79XsRgL+Mk="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.CSharp",
+    "version": "4.14.0",
+    "hash": "sha256-5Mzj3XkYYLkwDWh17r1NEXSbXwwWYQPiOmkSMlgo1JY="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.CSharp.Features",
+    "version": "4.11.0",
+    "hash": "sha256-/rQzc9HHR6h02Dm9rPsBlQyztgt4itmbTFOMV8rgWfc="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces",
+    "version": "4.11.0",
+    "hash": "sha256-A3hmUJzaqRcWndwGKCHXt3in9T5GeV6ypl/ka8dDQr0="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Elfie",
+    "version": "1.0.0",
+    "hash": "sha256-E/+PlegvWZ59e5Ti3TvKJBLa3qCnDKmi7+DcnOo1ufg="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Features",
+    "version": "4.11.0",
+    "hash": "sha256-W/R3JVuWfTTcW/GZjJzdTyxZVZpk1dAgaJPz+UGcgyU="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Scripting.Common",
+    "version": "4.11.0",
+    "hash": "sha256-2JC9TipfoAQ1ug4i+PexZemJHFhjnFNv/FqjBIsV6J0="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Workspaces.Common",
+    "version": "4.11.0",
+    "hash": "sha256-8+HxGPWrxOsvqFBnx4rrNQRDfeLbPU7DGcQYyNMq/pE="
+  },
+  {
+    "pname": "Microsoft.CSharp",
+    "version": "4.7.0",
+    "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
+  },
+  {
+    "pname": "Microsoft.DiaSymReader",
+    "version": "2.0.0",
+    "hash": "sha256-8hotZmh8Rb6Q6oD9Meb74SvAdbDo39Y/1m8h43HHjjw="
+  },
+  {
+    "pname": "Microsoft.DotNet.PlatformAbstractions",
+    "version": "3.1.6",
+    "hash": "sha256-RfM2qXiqdiamPkXr4IDkNc0IZSF9iTZv4uou/E7zNS0="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection",
+    "version": "9.0.0",
+    "hash": "sha256-dAH52PPlTLn7X+1aI/7npdrDzMEFPMXRv4isV1a+14k="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "9.0.0",
+    "hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyModel",
+    "version": "8.0.0",
+    "hash": "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="
+  },
+  {
+    "pname": "Microsoft.NET.StringTools",
+    "version": "17.6.3",
+    "hash": "sha256-H2Qw8x47WyFOd/VmgRmGMc+uXySgUv68UISgK8Frsjw="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "1.1.0",
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "2.0.0",
+    "hash": "sha256-IEvBk6wUXSdyCnkj6tHahOJv290tVVT8tyemYcR0Yro="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "5.0.0",
+    "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c="
+  },
+  {
+    "pname": "Microsoft.Win32.Registry",
+    "version": "4.5.0",
+    "hash": "sha256-WMBXsIb0DgPFPaFkNVxY9b9vcMxPqtgFgijKYMJfV/0="
+  },
+  {
+    "pname": "Microsoft.Win32.Registry",
+    "version": "5.0.0",
+    "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="
+  },
+  {
+    "pname": "NETStandard.Library",
+    "version": "2.0.3",
+    "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
+  },
+  {
+    "pname": "Newtonsoft.Json",
+    "version": "13.0.3",
+    "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
+  },
+  {
+    "pname": "OneOf",
+    "version": "3.0.271",
+    "hash": "sha256-tFWy8Jg/XVJfVOddjXeCAizq/AUljJrq6J8PF6ArYSU="
+  },
+  {
+    "pname": "protobuf-net",
+    "version": "3.2.52",
+    "hash": "sha256-phXeroBt5KbHYkApkkMa0mRCVkDY+dtOOXXNY+i50Ek="
+  },
+  {
+    "pname": "protobuf-net.Core",
+    "version": "3.2.52",
+    "hash": "sha256-/9Jj26tuSKeYJb9udwew5i5EVvaoeNu/vBCKS0VhSQQ="
+  },
+  {
+    "pname": "Qoi.NetStandard",
+    "version": "1.0.0",
+    "hash": "sha256-pjJUeRSKaU7NdFwi0gHfmRJUodzgUB4Amz8ERQso+nY="
+  },
+  {
+    "pname": "ShimSkiaSharp",
+    "version": "3.0.3",
+    "hash": "sha256-Nngzb1buTzSYvNBS5TUOiJcN71ySM8i6HrPskLEQttM="
+  },
+  {
+    "pname": "ShimSkiaSharp",
+    "version": "3.0.5",
+    "hash": "sha256-sjVmij064B96wC00JfTW9wsrK0/Uh1ewwvcw1qXxFMo="
+  },
+  {
+    "pname": "Silk.NET.Core",
+    "version": "2.22.0",
+    "hash": "sha256-1aBiBwifLel9aaGI97gxbvID/XKbFm1dpVv2zm0NSEc="
+  },
+  {
+    "pname": "Silk.NET.Maths",
+    "version": "2.22.0",
+    "hash": "sha256-wBydHf4R69A3dm8SnD82zjBd5QgwXbmipRqXtk+AjpE="
+  },
+  {
+    "pname": "Silk.NET.OpenGL",
+    "version": "2.22.0",
+    "hash": "sha256-1XWABfBzsSg1nJzbDJ/FH140WLzjpuNTxDHNZfV85xo="
+  },
+  {
+    "pname": "Silk.NET.Vulkan",
+    "version": "2.22.0",
+    "hash": "sha256-TxCjv6Q35PrJTs0SkiE1srJNZf1yh9k98Gfx8DWSWjY="
+  },
+  {
+    "pname": "Silk.NET.Vulkan.Extensions.EXT",
+    "version": "2.22.0",
+    "hash": "sha256-spbTFm5wHbVZqMNvAih6wexeZs61B8kbX4sKYSe5Syk="
+  },
+  {
+    "pname": "Silk.NET.Vulkan.Extensions.KHR",
+    "version": "2.22.0",
+    "hash": "sha256-aXgS8UxYlfBIrxmoAOuy6Z3NZuV+ruSibQPvLO1wL/U="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "2.88.8",
+    "hash": "sha256-rD5gc4SnlRTXwz367uHm8XG5eAIQpZloGqLRGnvNu0A="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "2.88.9",
+    "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "3.116.1",
+    "hash": "sha256-EQW/zjk+GsJbpJ3zqyGARh3oHep8XgneWXcSTNnYwuk="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "3.118.0-preview.1.2",
+    "hash": "sha256-3vy6mQ11MqelRv6j1eGJKkNgLkr/geT99m75xiYrVbM="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "3.119.0",
+    "hash": "sha256-G6T0E4Wl9NW9m/9HW1Rppuxs5icp04uvqkY+Ju/vvzM="
+  },
+  {
+    "pname": "SkiaSharp.HarfBuzz",
+    "version": "3.116.1",
+    "hash": "sha256-GYu9itkxAJUmj7Z4etHGUvPLdtdNr+y0mcUauArRnhE="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Linux",
+    "version": "2.88.9",
+    "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Linux",
+    "version": "3.119.0",
+    "hash": "sha256-ysHXGJeui4uji6bSBIzpqMRfKJXqj/08Zd0MIBeQH3s="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "2.88.8",
+    "hash": "sha256-CdcrzQHwCcmOCPtS8EGtwsKsgdljnH41sFytW7N9PmI="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "2.88.9",
+    "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "3.116.1",
+    "hash": "sha256-GntlOA+Blrh43l97gHP7sZl4HY0+Hx84xId3+YTXLCE="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "3.118.0-preview.1.2",
+    "hash": "sha256-Cgf2xL9Zmib61u+IBDSivMiTr0QjB6t6nZp9npNS5f8="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "3.119.0",
+    "hash": "sha256-BPkQ5hSDK4Nal36+31AAApEbDH+FdwZik5W22vYmVDI="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.WebAssembly",
+    "version": "2.88.9",
+    "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.WebAssembly",
+    "version": "3.119.0",
+    "hash": "sha256-bEWnEJJZ9E0MD688vOvEusJJRJbgpMCiG9u5Tj/BIkQ="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "2.88.8",
+    "hash": "sha256-b8Vb94rNjwPKSJDQgZ0Xv2dWV7gMVFl5GwTK/QiZPPM="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "2.88.9",
+    "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "3.116.1",
+    "hash": "sha256-oraulwAja3vee2T2n9sEveSTVI8/Kvku7r09yXLENI4="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "3.118.0-preview.1.2",
+    "hash": "sha256-UWMf4l1D0Q+RkTIQ0Aslf4zsL3XrsbZ15cy4ou42+34="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "3.119.0",
+    "hash": "sha256-YltsBRADV7b3qL3/YrgG2GTwJr8PL1STeaimQagSADo="
+  },
+  {
+    "pname": "SkiaSharp.Skottie",
+    "version": "2.88.8",
+    "hash": "sha256-+ldOojWMQi51wK88msauHBnzNqyRW6RRokF6+yn4nwo="
+  },
+  {
+    "pname": "Svg.Controls.Skia.Avalonia",
+    "version": "11.3.0.1",
+    "hash": "sha256-e+GW+mFWFvw/Dzhf7xVQnZMCCn1e9Po6XKtHCd11GfY="
+  },
+  {
+    "pname": "Svg.Controls.Skia.Avalonia",
+    "version": "11.3.0.3",
+    "hash": "sha256-X0Plwm75PMMjlSLV+qr25ye5g9jc93Dv1J7bcNW1m+g="
+  },
+  {
+    "pname": "Svg.Custom",
+    "version": "3.0.3",
+    "hash": "sha256-faH73+8y0A7p+koyd3Y4CcYI8U/cAbH1X566bMd3dI4="
+  },
+  {
+    "pname": "Svg.Custom",
+    "version": "3.0.5",
+    "hash": "sha256-OY5wMjwk++n41cRDJIBvsfSjLqLCqU5lwkCWNbqrm9w="
+  },
+  {
+    "pname": "Svg.Model",
+    "version": "3.0.3",
+    "hash": "sha256-ncQwRRi51A12bpZKjG2ZhaLUJ7MD9ny1lwKUYwr63LE="
+  },
+  {
+    "pname": "Svg.Model",
+    "version": "3.0.5",
+    "hash": "sha256-QLghW+2QFzAzCLE52oqt+NT/M3LxWFX7GVG6t84Ilw8="
+  },
+  {
+    "pname": "Svg.Skia",
+    "version": "3.0.3",
+    "hash": "sha256-tQ8a1Gt92IPAXhEY9osBZXUZk2sXM19CWf4zt71mwk8="
+  },
+  {
+    "pname": "Svg.Skia",
+    "version": "3.0.5",
+    "hash": "sha256-zfmwCIfDJKfFuXAR/fdmdK3xsficRFTIMoaeaBKF2hU="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.5.1",
+    "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.6.0",
+    "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc="
+  },
+  {
+    "pname": "System.CodeDom",
+    "version": "8.0.0",
+    "hash": "sha256-uwVhi3xcvX7eiOGQi7dRETk3Qx1EfHsUfchZsEto338="
+  },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "6.0.0",
+    "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="
+  },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "8.0.0",
+    "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="
+  },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "9.0.0",
+    "hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac="
+  },
+  {
+    "pname": "System.Composition",
+    "version": "8.0.0",
+    "hash": "sha256-rA118MFj6soKN++BvD3y9gXAJf0lZJAtGARuznG5+Xg="
+  },
+  {
+    "pname": "System.Composition.AttributedModel",
+    "version": "8.0.0",
+    "hash": "sha256-n3aXiBAFIlQicSRLiNtLh++URSUxRBLggsjJ8OMNRpo="
+  },
+  {
+    "pname": "System.Composition.Convention",
+    "version": "8.0.0",
+    "hash": "sha256-Z9HOAnH1lt1qc38P3Y0qCf5gwBwiLXQD994okcy53IE="
+  },
+  {
+    "pname": "System.Composition.Hosting",
+    "version": "8.0.0",
+    "hash": "sha256-axKJC71oKiNWKy66TVF/c3yoC81k03XHAWab3mGNbr0="
+  },
+  {
+    "pname": "System.Composition.Runtime",
+    "version": "8.0.0",
+    "hash": "sha256-AxwZ29+GY0E35Pa255q8AcMnJU52Txr5pBy86t6V1Go="
+  },
+  {
+    "pname": "System.Composition.TypedParts",
+    "version": "8.0.0",
+    "hash": "sha256-+ZJawThmiYEUNJ+cB9uJK+u/sCAVZarGd5ShZoSifGo="
+  },
+  {
+    "pname": "System.Configuration.ConfigurationManager",
+    "version": "8.0.0",
+    "hash": "sha256-xhljqSkNQk8DMkEOBSYnn9lzCSEDDq4yO910itptqiE="
+  },
+  {
+    "pname": "System.Data.DataSetExtensions",
+    "version": "4.5.0",
+    "hash": "sha256-qppO0L8BpI7cgaStqBhn6YJYFjFdSwpXlRih0XFsaT4="
+  },
+  {
+    "pname": "System.Diagnostics.EventLog",
+    "version": "8.0.0",
+    "hash": "sha256-rt8xc3kddpQY4HEdghlBeOK4gdw5yIj4mcZhAVtk2/Y="
+  },
+  {
+    "pname": "System.Diagnostics.PerformanceCounter",
+    "version": "8.0.0",
+    "hash": "sha256-CbTL+orc5YcEJfKbBtr/9p/0rNVVOQPz/fOEaA6Pu5k="
+  },
+  {
+    "pname": "System.IO.Pipelines",
+    "version": "8.0.0",
+    "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
+  },
+  {
+    "pname": "System.IO.Pipelines",
+    "version": "9.0.3",
+    "hash": "sha256-JV50VXnofGfL8lB/vNIpJstoBJper9tsXcjNFwGqL68="
+  },
+  {
+    "pname": "System.Management",
+    "version": "8.0.0",
+    "hash": "sha256-HwpfDb++q7/vxR6q57mGFgl5U0vxy+oRJ6orFKORfP0="
+  },
+  {
+    "pname": "System.Memory",
+    "version": "4.5.5",
+    "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
+  },
+  {
+    "pname": "System.Numerics.Vectors",
+    "version": "4.4.0",
+    "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
+  },
+  {
+    "pname": "System.Numerics.Vectors",
+    "version": "4.5.0",
+    "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
+  },
+  {
+    "pname": "System.Reactive",
+    "version": "5.0.0",
+    "hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="
+  },
+  {
+    "pname": "System.Reactive",
+    "version": "6.0.0",
+    "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="
+  },
+  {
+    "pname": "System.Reactive",
+    "version": "6.0.1",
+    "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="
+  },
+  {
+    "pname": "System.Reflection.Emit",
+    "version": "4.7.0",
+    "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="
+  },
+  {
+    "pname": "System.Reflection.Emit.ILGeneration",
+    "version": "4.7.0",
+    "hash": "sha256-GUnQeGo/DtvZVQpFnESGq7lJcjB30/KnDY7Kd2G/ElE="
+  },
+  {
+    "pname": "System.Reflection.Emit.Lightweight",
+    "version": "4.7.0",
+    "hash": "sha256-V0Wz/UUoNIHdTGS9e1TR89u58zJjo/wPUWw6VaVyclU="
+  },
+  {
+    "pname": "System.Reflection.Metadata",
+    "version": "8.0.0",
+    "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="
+  },
+  {
+    "pname": "System.Reflection.Metadata",
+    "version": "9.0.0",
+    "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ="
+  },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "4.5.3",
+    "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="
+  },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "6.0.0",
+    "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
+  },
+  {
+    "pname": "System.Security.AccessControl",
+    "version": "4.5.0",
+    "hash": "sha256-AFsKPb/nTk2/mqH/PYpaoI8PLsiKKimaXf+7Mb5VfPM="
+  },
+  {
+    "pname": "System.Security.AccessControl",
+    "version": "5.0.0",
+    "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54="
+  },
+  {
+    "pname": "System.Security.Cryptography.ProtectedData",
+    "version": "8.0.0",
+    "hash": "sha256-fb0pa9sQxN+mr0vnXg1Igbx49CaOqS+GDkTfWNboUvs="
+  },
+  {
+    "pname": "System.Security.Principal.Windows",
+    "version": "4.5.0",
+    "hash": "sha256-BkUYNguz0e4NJp1kkW7aJBn3dyH9STwB5N8XqnlCsmY="
+  },
+  {
+    "pname": "System.Security.Principal.Windows",
+    "version": "5.0.0",
+    "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y="
+  },
+  {
+    "pname": "System.Text.Encoding.CodePages",
+    "version": "7.0.0",
+    "hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="
+  },
+  {
+    "pname": "System.Text.Encodings.Web",
+    "version": "7.0.0",
+    "hash": "sha256-tF8qt9GZh/nPy0mEnj6nKLG4Lldpoi/D8xM5lv2CoYQ="
+  },
+  {
+    "pname": "System.Text.Encodings.Web",
+    "version": "8.0.0",
+    "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="
+  },
+  {
+    "pname": "System.Text.Encodings.Web",
+    "version": "9.0.3",
+    "hash": "sha256-ZGRcKnblIdt1fHZ4AehyyWCgM+/1FcZyxoGJFe4K3JE="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "7.0.2",
+    "hash": "sha256-bkfxuc3XPxtYcOJTGRMc/AkJiyIU+fTLK7PxtbuN3sQ="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "8.0.0",
+    "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "9.0.3",
+    "hash": "sha256-I7z6sRb2XbbXNZ2MyNbn2wysh1P2cnk4v6BM0zucj1w="
+  },
+  {
+    "pname": "System.Threading.Channels",
+    "version": "7.0.0",
+    "hash": "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="
+  },
+  {
+    "pname": "System.Threading.Tasks.Extensions",
+    "version": "4.5.4",
+    "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
+  },
+  {
+    "pname": "Tmds.DBus.Protocol",
+    "version": "0.21.2",
+    "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
+  },
+  {
+    "pname": "Wasmtime",
+    "version": "22.0.0",
+    "hash": "sha256-Q6NWraxWlVz5p/2rY6d9XZBv/VM6tRG2eCNRpMLAp6A="
+  }
+]
diff --git a/pkgs/by-name/pi/pixieditor/mimeinfo.xml b/pkgs/by-name/pi/pixieditor/mimeinfo.xml
new file mode 100644
index 000000000000..b1d0c9aece16
--- /dev/null
+++ b/pkgs/by-name/pi/pixieditor/mimeinfo.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+  <mime-type type="application/x-pixieditor">
+    <comment>PixiEditor project file</comment>
+    <glob pattern="*.pixi" />
+  </mime-type>
+</mime-info>
diff --git a/pkgs/by-name/pi/pixieditor/package.nix b/pkgs/by-name/pi/pixieditor/package.nix
new file mode 100644
index 000000000000..a358771d1315
--- /dev/null
+++ b/pkgs/by-name/pi/pixieditor/package.nix
@@ -0,0 +1,182 @@
+{
+  lib,
+  stdenv,
+  writeText,
+
+  fetchFromGitHub,
+
+  dotnetCorePackages,
+  buildDotnetModule,
+
+  ffmpeg-headless,
+
+  vulkan-loader,
+  openssl,
+  libGL,
+  libX11,
+  libICE,
+  libSM,
+  libXi,
+  libXcursor,
+  libXext,
+  libXrandr,
+
+  makeDesktopItem,
+  copyDesktopItems,
+}:
+let
+  inherit (dotnetCorePackages) fetchNupkg;
+
+  buildInfo = {
+    id = "NixOS";
+    name = "for NixOS";
+  };
+
+  appSettings = writeText "appsettings.json" (
+    lib.strings.toJSON {
+      PixiEditorApiUrl = "https://auth.pixieditor.net";
+      PixiEditorApiKey = "waIvElX0fPqaxnyD7Rh1SSEvdq8qfKUs";
+      AnalyticsUrl = "https://api.pixieditor.net/analytics/";
+    }
+  );
+in
+buildDotnetModule (finalAttrs: {
+  pname = "pixieditor";
+  version = "2.0.1.14";
+
+  src = fetchFromGitHub {
+    owner = "PixiEditor";
+    repo = "PixiEditor";
+    tag = finalAttrs.version;
+    hash = "sha256-wyqt5mpT4xmaTk7RidQOOZAgkgMfcKiz5/7Nle0/Tkg=";
+    fetchSubmodules = true;
+  };
+
+  postPatch = ''
+    substituteInPlace ./src/PixiEditor/Helpers/VersionHelpers.cs \
+      --replace-fail 'builder.Append(" Release Build");' 'builder.Append(" ${buildInfo.name}");' \
+      --replace-fail 'return "Release";' 'return "${buildInfo.id}";';
+
+    substituteInPlace ./src/PixiEditor/Models/ExceptionHandling/CrashReport.cs \
+      --replace-fail 'ShellExecute(fileName,' 'ShellExecute("${placeholder "out"}/bin/pixieditor",';
+
+    rm -rf ./src/PixiEditor.AnimationRenderer.FFmpeg/ThirdParty/{Linux,Macos,Windows}/*
+    substituteInPlace ./src/PixiEditor.AnimationRenderer.FFmpeg/FFMpegRenderer.cs \
+      --replace-fail 'new FFOptions() { BinaryFolder = binaryPath }' 'new FFOptions() { BinaryFolder = "${ffmpeg-headless}/bin" }' \
+      --replace-fail 'MakeExecutableIfNeeded(binaryPath);' ' ';
+  '';
+
+  nativeBuildInputs = [
+    copyDesktopItems
+  ];
+
+  buildInputs = [
+    (fetchNupkg {
+      pname = "protobuf-net.protogen";
+      version = "3.2.52";
+      hash = "sha256-sKVCXtd5qD86D2FOgjMXh37P6IrcmqmaoJregAhLFGY=";
+    })
+  ];
+
+  nugetDeps = ./deps.json;
+  linkNugetPackages = true;
+
+  dotnet-sdk = dotnetCorePackages.sdk_8_0;
+  dotnet-runtime = dotnetCorePackages.runtime_8_0;
+  dotnetFlags =
+    lib.optionals stdenv.hostPlatform.isx86_64 [ "-p:Runtimeidentifier=linux-x64" ]
+    ++ lib.optionals stdenv.hostPlatform.isAarch64 [ "-p:Runtimeidentifier=linux-arm64" ];
+
+  buildType = "ReleaseNoUpdate";
+  projectFile = [
+    "src/PixiEditor.Desktop/PixiEditor.Desktop.csproj"
+    "src/PixiEditor/PixiEditor.csproj"
+    "src/PixiEditor.Linux/PixiEditor.Linux.csproj"
+    "src/PixiEditor.Platform.Standalone/PixiEditor.Platform.Standalone.csproj"
+  ];
+  executables = [ "PixiEditor.Desktop" ];
+
+  runtimeDeps = [
+    vulkan-loader
+    openssl
+    libGL
+    libX11
+    libICE
+    libSM
+    libXi
+    libXcursor
+    libXext
+    libXrandr
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "pixieditor";
+      type = "Application";
+      desktopName = "PixiEditor";
+      genericName = "2D Editor";
+      comment = finalAttrs.meta.description;
+      icon = "pixieditor";
+      exec = "pixieditor %f";
+      tryExec = "pixieditor";
+      startupWMClass = "pixieditor";
+      terminal = false;
+      categories = [
+        "Graphics"
+        "2DGraphics"
+        "RasterGraphics"
+        "VectorGraphics"
+      ];
+      keywords = [
+        "editor"
+        "image"
+        "2d"
+        "graphics"
+        "design"
+        "vector"
+        "raster"
+      ];
+      mimeTypes = [
+        "application/x-pixieditor"
+      ];
+      extraConfig.SingleMainWindow = "true";
+    })
+  ];
+
+  postConfigure = ''
+    dotnet build -t:InstallProtogen \
+      src/PixiEditor.Extensions.CommonApi/PixiEditor.Extensions.CommonApi.csproj
+  '';
+
+  postInstall = ''
+    install -Dm644 ${appSettings} $out/lib/pixieditor/appsettings.json;
+
+    install -Dm644 ${./mimeinfo.xml} $out/share/mime/packages/pixieditor.xml;
+
+    install -Dm644 src/PixiEditor/Images/PixiEditorLogo.svg \
+      $out/share/icons/hicolor/scalable/apps/pixieditor.svg;
+  '';
+
+  postFixup = ''
+    mv $out/bin/PixiEditor.Desktop $out/bin/pixieditor
+  '';
+
+  meta = {
+    description = "Universal editor for all your 2D needs";
+    longDescription = ''
+      PixiEditor is a universal 2D platform that aims to provide you with tools and features for all your 2D needs.
+      Create beautiful sprites for your games, animations, edit images, create logos. All packed in an eye-friendly dark theme
+    '';
+    homepage = "https://pixieditor.com";
+    changelog = "https://github.com/PixiEditor/PixiEditor/releases/tag/${finalAttrs.version}";
+    mainProgram = "pixieditor";
+    license = lib.licenses.lgpl3Only;
+    maintainers = with lib.maintainers; [
+      griffi-gh
+    ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
+  };
+})

From 80925548d13a09b83f20942512e6ae471232d7b0 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Sun, 21 Sep 2025 12:47:58 +0200
Subject: [PATCH 0118/6226] lvm2: 2.03.34 -> 2.03.35

https://gitlab.com/lvmteam/lvm2/-/tags/v2_03_35
---
 pkgs/os-specific/linux/lvm2/2_03.nix   | 4 ++--
 pkgs/os-specific/linux/lvm2/common.nix | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/lvm2/2_03.nix b/pkgs/os-specific/linux/lvm2/2_03.nix
index 546913d7e88d..19e62bd4a2f7 100644
--- a/pkgs/os-specific/linux/lvm2/2_03.nix
+++ b/pkgs/os-specific/linux/lvm2/2_03.nix
@@ -1,4 +1,4 @@
 import ./common.nix {
-  version = "2.03.34";
-  hash = "sha256-P05459bEkii00XPqCOvhWIc9VEV/un0x0qvr3d0Odbk=";
+  version = "2.03.35";
+  hash = "sha256-6/KLNCdTXitavZmRzYObYWIqDb+4yG3w968fadyqg3E=";
 }
diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix
index cd75479ab652..e5c480935230 100644
--- a/pkgs/os-specific/linux/lvm2/common.nix
+++ b/pkgs/os-specific/linux/lvm2/common.nix
@@ -204,6 +204,7 @@ stdenv.mkDerivation rec {
       moveToOutput bin/blkdeactivate $scripts
       moveToOutput bin/lvmdump $scripts
       moveToOutput bin/lvm_import_vdo $scripts
+      moveToOutput bin/lvmpersist $scripts
       moveToOutput libexec/lvresize_fs_helper $scripts/lib
     ''
     + lib.optionalString (!enableCmdlib) ''

From a3902628008fb572f3a03f37912db43cfaeca70a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 21 Sep 2025 17:25:14 +0200
Subject: [PATCH 0119/6226] gss: properly autoreconf

Should let us drop the Darwin hack, and not have to apply it on other
platfomrs, like musl, too.

I used Nixpkgs' gnulib source because it works, but if it stops
working in future we could use fetchgit to get the gnulib submodule.

Fixes: 90805a436c47 ("gss: use autoreconfHook")
Closes: https://github.com/NixOS/nixpkgs/pull/436189
---
 pkgs/by-name/gs/gss/package.nix | 48 ++++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/gs/gss/package.nix b/pkgs/by-name/gs/gss/package.nix
index 8c45bf33b43b..cbe7445f7e2b 100644
--- a/pkgs/by-name/gs/gss/package.nix
+++ b/pkgs/by-name/gs/gss/package.nix
@@ -1,9 +1,17 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  autoreconfHook,
+  fetchzip,
+  autoconf,
+  automake,
+  gengetopt,
+  gettext,
+  gnulib,
   gtk-doc,
+  help2man,
+  libtool,
+  perl,
+  texinfo,
   withShishi ? !stdenv.hostPlatform.isDarwin,
   shishi,
 }:
@@ -12,9 +20,24 @@ stdenv.mkDerivation rec {
   pname = "gss";
   version = "1.0.4";
 
-  src = fetchurl {
-    url = "mirror://gnu/gss/gss-${version}.tar.gz";
-    hash = "sha256-7M6r3vTK4/znIYsuy4PrQifbpEtTthuMKy6IrgJBnHM=";
+  # The dist tarballs do not contain everything necessary to
+  # autoreconf.  Trying to use autoreconfHook with a dist tarball
+  # produces a broken result that fails to build for some platforms.
+  # If we want to autoreconf, we need to build from a git snapshot.
+  #
+  # See this explanation from the maintainer, about an existing
+  # package that exhibits the same problem (that we were able to
+  # produce when building for Darwin an musl.)
+  #
+  # https://lists.gnu.org/archive/html/help-libidn/2021-07/msg00009.html
+  src = fetchzip {
+    url = "https://gitweb.git.savannah.gnu.org/gitweb/?p=gss.git;a=snapshot;h=v${version};sf=tgz";
+    extension = "tar.gz";
+    hash = "sha256-yT19kwAhGzbIoMjRbrrsn6CyvkMH5v1nxxWpnGYmZUw=";
+  };
+
+  env = {
+    GNULIB_SRCDIR = gnulib.src;
   };
 
   # krb5context test uses certificates that expired on 2024-07-11.
@@ -24,15 +47,22 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    autoreconfHook
+    autoconf
+    automake
+    gengetopt
+    gettext
     gtk-doc
+    help2man
+    libtool
+    perl
+    texinfo
   ];
 
   buildInputs = lib.optional withShishi shishi;
 
-  # ./stdint.h:89:5: error: expected value in expression
-  preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    export GNULIBHEADERS_OVERRIDE_WINT_T=0
+  preConfigure = ''
+    patchShebangs doc/gdoc
+    ./autogen.sh
   '';
 
   configureFlags = [

From 1c1e833764018088e38bac0da10b01b3a86b734d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 14 Sep 2025 00:30:48 +0000
Subject: [PATCH 0120/6226] utf8cpp: 4.0.6 -> 4.0.8

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

diff --git a/pkgs/by-name/ut/utf8cpp/package.nix b/pkgs/by-name/ut/utf8cpp/package.nix
index ebaff9ecb83d..b609e22aab5a 100644
--- a/pkgs/by-name/ut/utf8cpp/package.nix
+++ b/pkgs/by-name/ut/utf8cpp/package.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation rec {
   pname = "utf8cpp";
-  version = "4.0.6";
+  version = "4.0.8";
 
   src = fetchFromGitHub {
     owner = "nemtrif";
     repo = "utfcpp";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-e8qH4eygLnQw7B8x+HN+vH8cr8fkxnTFz+PKtFJ8dGE=";
+    hash = "sha256-9lfs2tqsSDbf1appDC+S3qdmS4DipHhXoiJQluKytbM=";
   };
 
   nativeBuildInputs = [ cmake ];

From 0b2956ddcafe88e8c70ba180db4ff75df5d7de9f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 29 Jul 2025 00:16:52 +0000
Subject: [PATCH 0121/6226] harfbuzz: 11.2.1 -> 11.5.0

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

diff --git a/pkgs/by-name/ha/harfbuzz/package.nix b/pkgs/by-name/ha/harfbuzz/package.nix
index 080dac7b48ed..cf7198d79132 100644
--- a/pkgs/by-name/ha/harfbuzz/package.nix
+++ b/pkgs/by-name/ha/harfbuzz/package.nix
@@ -34,11 +34,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "harfbuzz${lib.optionalString withIcu "-icu"}";
-  version = "11.2.1";
+  version = "11.5.0";
 
   src = fetchurl {
     url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz";
-    hash = "sha256-CTcUyFSKKFCUaF8L3JmeIC1ma1nus98v+SGraLgzakk=";
+    hash = "sha256-LTC6RcTI7E3mYaEAK0+I0IQf8aMIfzRiknX1Q21yIQk=";
   };
 
   postPatch = ''
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
     # ApplicationServices.framework headers have cast-align warnings.
     substituteInPlace src/hb.hh \
-      --replace '#pragma GCC diagnostic error   "-Wcast-align"' ""
+      --replace-fail '#pragma GCC diagnostic error   "-Wcast-align"' ""
   '';
 
   outputs = [

From b58d799df9fb0cacc1095b1a0d3b63e512b86221 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 2 Sep 2025 20:55:28 +0100
Subject: [PATCH 0122/6226] libxcb-cursor: 0.1.5 -> 0.1.6

Changes: https://cgit.freedesktop.org/xcb/util-cursor/log/
---
 pkgs/by-name/li/libxcb-cursor/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libxcb-cursor/package.nix b/pkgs/by-name/li/libxcb-cursor/package.nix
index 8f8a61d6e5d7..0afb6ae53ea3 100644
--- a/pkgs/by-name/li/libxcb-cursor/package.nix
+++ b/pkgs/by-name/li/libxcb-cursor/package.nix
@@ -13,7 +13,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "libxcb-cursor";
-  version = "0.1.5";
+  version = "0.1.6";
 
   outputs = [
     "out"
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://xorg/individual/lib/xcb-util-cursor-${finalAttrs.version}.tar.xz";
-    hash = "sha256-DK+ZsNYJcPgc5Bx7ppTl6q+DMie7LLzbL23JZmpmPFc=";
+    hash = "sha256-/euL0SeHNRm+XMcNzQ07XTO2Z4dyAPmSWln9ytj3qTM=";
   };
 
   strictDeps = true;

From 2add359f94aa1e1825e6dfef6f155286013d325d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 9 Sep 2025 13:31:19 +0000
Subject: [PATCH 0123/6226] p11-kit: 0.25.5 -> 0.25.9

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

diff --git a/pkgs/by-name/p1/p11-kit/package.nix b/pkgs/by-name/p1/p11-kit/package.nix
index c00c752997c9..d770115b423d 100644
--- a/pkgs/by-name/p1/p11-kit/package.nix
+++ b/pkgs/by-name/p1/p11-kit/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "p11-kit";
-  version = "0.25.5";
+  version = "0.25.9";
 
   src = fetchFromGitHub {
     owner = "p11-glue";
     repo = "p11-kit";
     tag = version;
-    hash = "sha256-2xDUvXGsF8x42uezgnvOXLVUdNNHcaE042HDDEJeplc=";
+    hash = "sha256-lvm//lsG5xSz1dBuvp4bJvNS+zCYTuAqXC22Po95JJg=";
     fetchSubmodules = true;
   };
 

From 47cbdfb1c75d64fe9dbdff9951b5d25cc301d574 Mon Sep 17 00:00:00 2001
From: dotlambda <nix@dotlambda.de>
Date: Sun, 21 Sep 2025 12:02:52 -0700
Subject: [PATCH 0124/6226] python3Packages.arelle: 2.30.25 -> 2.37.59
 (#444607)

* python3Packages.arelle: 2.30.25 -> 2.37.59

Diff: https://github.com/Arelle/Arelle/compare/2.30.25...2.37.59

Changelog: https://github.com/Arelle/Arelle/releases/tag/2.37.59

* arelle: Add tests.cli

---------

Co-authored-by: Robert Hensing <robert@roberthensing.nl>
Co-authored-by: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
---
 .../python-modules/arelle/default.nix         | 236 ++++++++++--------
 .../python-modules/arelle/test-cli.nix        | 117 +++++++++
 2 files changed, 245 insertions(+), 108 deletions(-)
 create mode 100644 pkgs/development/python-modules/arelle/test-cli.nix

diff --git a/pkgs/development/python-modules/arelle/default.nix b/pkgs/development/python-modules/arelle/default.nix
index 36429cc7fd47..b7d147c411a8 100644
--- a/pkgs/development/python-modules/arelle/default.nix
+++ b/pkgs/development/python-modules/arelle/default.nix
@@ -1,21 +1,26 @@
 {
+  callPackage,
   lib,
   buildPythonPackage,
-  pythonAtLeast,
   fetchFromGitHub,
 
   setuptools,
   setuptools-scm,
 
+  bottle,
   certifi,
   filelock,
   isodate,
+  jsonschema,
   lxml,
   numpy,
   openpyxl,
+  pillow,
   pyparsing,
   python-dateutil,
   regex,
+  truststore,
+  typing-extensions,
 
   gui ? true,
   tkinter,
@@ -43,116 +48,131 @@
   boto3,
 }:
 
-buildPythonPackage rec {
-  pname = "arelle${lib.optionalString (!gui) "-headless"}";
-  version = "2.30.25";
-  pyproject = true;
+# ideally we'd use finalAttrs.finalPackage instead of lib.fix for self-reference,
+# but buildPythonPackage doesn't support it yet
+lib.fix (
+  self:
+  buildPythonPackage rec {
+    pname = "arelle${lib.optionalString (!gui) "-headless"}";
+    version = "2.37.59";
+    pyproject = true;
 
-  disabled = pythonAtLeast "3.13"; # Note: when updating, check if this is still needed
+    src = fetchFromGitHub {
+      owner = "Arelle";
+      repo = "Arelle";
+      tag = version;
+      hash = "sha256-ao4OKe3e1V3Df7396gVn4nqmpKNAbs5ny2y/GsxQwcE=";
+    };
 
-  src = fetchFromGitHub {
-    owner = "Arelle";
-    repo = "Arelle";
-    tag = version;
-    hash = "sha256-xzTrFie97HDIqPZ4nzCh+0p/w0bTK12cS0FSsuIi7tY=";
-  };
-
-  outputs = [
-    "out"
-    "doc"
-  ];
-
-  postPatch = ''
-    substituteInPlace pyproject.toml --replace-fail \
-        'requires = ["setuptools~=73.0", "wheel~=0.44", "setuptools_scm[toml]~=8.1"]' \
-        'requires = ["setuptools", "wheel", "setuptools_scm[toml]"]'
-  '';
-
-  build-system = [
-    setuptools
-    setuptools-scm
-  ];
-
-  dependencies = [
-    certifi
-    filelock
-    isodate
-    lxml
-    numpy
-    openpyxl
-    pyparsing
-    python-dateutil
-    regex
-  ]
-  ++ lib.optionals gui [ tkinter ];
-
-  optional-dependencies = {
-    crypto = [ pycryptodome ];
-    db = [
-      pg8000
-      pymysql
-      pyodbc
-      rdflib
+    outputs = [
+      "out"
+      "doc"
     ];
-    efm = [
-      holidays
-      pytz
-    ];
-    esef = [ tinycss2 ];
-    objectmaker = [ graphviz ];
-    webserver = [
-      cheroot
-      cherrypy
-      tornado
-    ];
-  };
 
-  nativeBuildInputs = [
-    # deps for docs
-    sphinxHook
-    sphinx-autodoc2
-    myst-parser
-    sphinx-copybutton
-    furo
-  ];
-
-  # the arelleGUI executable doesn't work when the gui option is false
-  postInstall = lib.optionalString (!gui) ''
-    find $out/bin -name "*arelleGUI*" -delete
-  '';
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    boto3
-  ]
-  ++ lib.flatten (lib.attrValues optional-dependencies);
-
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
-  disabledTestPaths = [
-    "tests/integration_tests"
-  ]
-  ++ lib.optionals (!gui) [
-    # these tests import tkinter
-    "tests/unit_tests/arelle/test_updater.py"
-    "tests/unit_tests/arelle/test_import.py"
-  ];
-
-  meta = {
-    description = "Open source XBRL platform";
-    longDescription = ''
-      An open source facility for XBRL, the eXtensible Business Reporting
-      Language supporting various standards, exposed through a Python or
-      REST API ${lib.optionalString gui " and a graphical user interface"}.
+    postPatch = ''
+      substituteInPlace pyproject.toml --replace-fail \
+          'requires = ["setuptools>=80.9,<81", "wheel>=0.45,<1", "setuptools_scm[toml]>=9.2,<10"]' \
+          'requires = ["setuptools", "wheel", "setuptools_scm[toml]"]'
     '';
-    mainProgram = "arelle";
-    homepage = "http://arelle.org/";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [
-      tomasajt
-      roberth
+
+    build-system = [
+      setuptools
+      setuptools-scm
     ];
-  };
-}
+
+    dependencies = [
+      bottle
+      certifi
+      filelock
+      isodate
+      jsonschema
+      lxml
+      numpy
+      openpyxl
+      pillow
+      pyparsing
+      python-dateutil
+      regex
+      truststore
+      typing-extensions
+    ]
+    ++ lib.optionals gui [ tkinter ];
+
+    optional-dependencies = {
+      crypto = [ pycryptodome ];
+      db = [
+        pg8000
+        pymysql
+        pyodbc
+        rdflib
+      ];
+      efm = [
+        holidays
+        pytz
+      ];
+      esef = [ tinycss2 ];
+      objectmaker = [ graphviz ];
+      webserver = [
+        cheroot
+        cherrypy
+        tornado
+      ];
+    };
+
+    nativeBuildInputs = [
+      # deps for docs
+      sphinxHook
+      sphinx-autodoc2
+      myst-parser
+      sphinx-copybutton
+      furo
+    ];
+
+    # the arelleGUI executable doesn't work when the gui option is false
+    postInstall = lib.optionalString (!gui) ''
+      find $out/bin -name "*arelleGUI*" -delete
+    '';
+
+    nativeCheckInputs = [
+      pytestCheckHook
+      boto3
+    ]
+    ++ lib.flatten (lib.attrValues optional-dependencies);
+
+    preCheck = ''
+      export HOME=$(mktemp -d)
+    '';
+
+    disabledTestPaths = [
+      "tests/integration_tests"
+    ]
+    ++ lib.optionals (!gui) [
+      # these tests import tkinter
+      "tests/unit_tests/arelle/test_updater.py"
+      "tests/unit_tests/arelle/test_import.py"
+    ];
+
+    passthru.hasGUI = gui;
+
+    passthru.tests = {
+      cli = callPackage ./test-cli.nix { arelle = self; };
+    };
+
+    meta = {
+      changelog = "https://github.com/Arelle/Arelle/releases/tag/${src.tag}";
+      description = "Open source XBRL platform";
+      longDescription = ''
+        An open source facility for XBRL, the eXtensible Business Reporting
+        Language supporting various standards, exposed through a Python or
+        REST API ${lib.optionalString gui " and a graphical user interface"}.
+      '';
+      mainProgram = "arelle";
+      homepage = "http://arelle.org/";
+      license = lib.licenses.asl20;
+      maintainers = with lib.maintainers; [
+        tomasajt
+        roberth
+      ];
+    };
+  }
+)
diff --git a/pkgs/development/python-modules/arelle/test-cli.nix b/pkgs/development/python-modules/arelle/test-cli.nix
new file mode 100644
index 000000000000..17a0ebc0b6ce
--- /dev/null
+++ b/pkgs/development/python-modules/arelle/test-cli.nix
@@ -0,0 +1,117 @@
+# Run with:
+#   cd nixpkgs
+#   nix-build -A python3Packages.arelle.passthru.tests.cli
+#
+# Note: These are uninteresting generated smoke tests to verify basic functionality
+{
+  lib,
+  runCommand,
+  arelle,
+}:
+
+runCommand "arelle-test-cli${lib.optionalString (!arelle.hasGUI) "-headless"}"
+  {
+    nativeBuildInputs = [ arelle ];
+  }
+  ''
+    # Set up temporary home directory
+    export HOME=$(mktemp -d)
+
+    # Test basic CLI commands work with proper assertions
+    arelleCmdLine --version --disablePersistentConfig 2>&1 | grep "Arelle(r) 2.37.59" > /dev/null
+    arelleCmdLine --help --disablePersistentConfig 2>&1 | grep "Usage: arelleCmdLine \[options\]" > /dev/null
+    arelleCmdLine --about --disablePersistentConfig 2>&1 | grep "An open source XBRL platform" > /dev/null
+
+    ${lib.optionalString arelle.hasGUI ''
+      # check if the arelleGUI command is available
+      command -v arelleGUI
+    ''}
+
+    # Create a simple but valid XBRL instance for testing validation functionality
+    cat > test-instance.xbrl << 'EOF'
+    <?xml version="1.0" encoding="UTF-8"?>
+    <xbrl xmlns="http://www.xbrl.org/2003/instance"
+          xmlns:link="http://www.xbrl.org/2003/linkbase"
+          xmlns:xlink="http://www.w3.org/1999/xlink">
+
+      <link:schemaRef xlink:href="http://www.xbrl.org/2003/xbrl-instance-2003-12-31.xsd" xlink:type="simple"/>
+
+      <context id="test_context">
+        <entity>
+          <identifier scheme="http://example.com/entities">TEST_ENTITY</identifier>
+        </entity>
+        <period>
+          <instant>2023-12-31</instant>
+        </period>
+      </context>
+
+    </xbrl>
+    EOF
+
+    # Also create a minimal test schema for more comprehensive testing
+    cat > test-schema.xsd << 'EOF'
+    <?xml version="1.0" encoding="UTF-8"?>
+    <schema xmlns="http://www.w3.org/2001/XMLSchema"
+            xmlns:xbrli="http://www.xbrl.org/2003/instance"
+            xmlns:link="http://www.xbrl.org/2003/linkbase"
+            xmlns:xlink="http://www.w3.org/1999/xlink"
+            xmlns:test="http://example.com/test"
+            targetNamespace="http://example.com/test"
+            elementFormDefault="qualified">
+
+      <import namespace="http://www.xbrl.org/2003/instance"
+              schemaLocation="http://www.xbrl.org/2003/xbrl-instance-2003-12-31.xsd"/>
+
+      <element name="TestElement" type="xbrli:stringItemType"
+                substitutionGroup="xbrli:item" xbrli:periodType="instant"/>
+
+    </schema>
+    EOF
+
+    # Test XBRL validation functionality
+    arelleCmdLine \
+      --file test-instance.xbrl \
+      --validate \
+      --disablePersistentConfig \
+      --internetConnectivity=offline \
+      --logLevel=info 2>&1 | grep "\[info\] validated in .* secs - .*test-instance.xbrl" > /dev/null
+
+    # Test with the built-in empty instance from arelle config
+    arelleCmdLine \
+      --file "${arelle}/lib/python3.13/site-packages/arelle/config/empty-instance.xml" \
+      --validate \
+      --disablePersistentConfig \
+      --internetConnectivity=offline \
+      --logLevel=info 2>&1 | grep "\[info\] validated in .* secs - .*empty-instance.xml" > /dev/null
+
+    # Test formula functionality (without running - just checking it loads)
+    arelleCmdLine \
+      --file test-instance.xbrl \
+      --formula=none \
+      --disablePersistentConfig \
+      --internetConnectivity=offline 2>&1 | grep "\[info\] loaded in .* secs.*test-instance.xbrl" > /dev/null
+
+    # Test facts output functionality
+    TEMP_DIR=$(mktemp -d)
+    arelleCmdLine \
+      --file test-instance.xbrl \
+      --facts="$TEMP_DIR/test-facts.csv" \
+      --disablePersistentConfig \
+      --internetConnectivity=offline 2>&1 | grep "\[info\] loaded in .* secs.*test-instance.xbrl" > /dev/null
+
+    # Test schema validation
+    arelleCmdLine \
+      --file test-schema.xsd \
+      --validate \
+      --disablePersistentConfig \
+      --internetConnectivity=offline \
+      --logLevel=info 2>&1 | grep "\[info\] validated in .* secs - .*test-schema.xsd" > /dev/null
+
+    # Test disclosure system validation option
+    arelleCmdLine \
+      --disclosureSystem=help \
+      --disablePersistentConfig 2>&1 | grep "Disclosure system choices:" > /dev/null
+
+    # Create success marker
+    touch $out
+  ''

From 213f7a3b1606f62de82634df4934961a967bc40b Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Fri, 5 Sep 2025 14:49:04 -0500
Subject: [PATCH 0125/6226] snowemu: init at 1.1.0

---
 pkgs/by-name/sn/snowemu/package.nix | 82 +++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 pkgs/by-name/sn/snowemu/package.nix

diff --git a/pkgs/by-name/sn/snowemu/package.nix b/pkgs/by-name/sn/snowemu/package.nix
new file mode 100644
index 000000000000..1659bb517991
--- /dev/null
+++ b/pkgs/by-name/sn/snowemu/package.nix
@@ -0,0 +1,82 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  makeWrapper,
+  makeDesktopItem,
+  SDL2,
+  pkg-config,
+  xorg,
+  wayland,
+  libxkbcommon,
+  libGL,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "snowemu";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "twvd";
+    repo = "snow";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-m3CPKswOB2j2r/BTf9RzCvwPVq3gbKemtk11HKS1nHk=";
+    fetchSubmodules = true;
+  };
+  cargoHash = "sha256-+FS5785F8iWPt6Db+IKRbOFAYNEfHC+jvPVdwkLZ5YI=";
+
+  nativeBuildInputs = [
+    pkg-config
+    makeWrapper
+  ];
+
+  buildInputs = [
+    SDL2.dev
+    xorg.libX11
+    xorg.libXcursor
+    xorg.libXrandr
+    xorg.libXi
+  ];
+
+  postInstall = ''
+    mv $out/bin/snow_frontend_egui $out/bin/snowemu
+
+    install -Dm644 docs/images/snow_icon.png $out/share/icons/hicolor/apps/snowemu.png
+
+    wrapProgram $out/bin/snowemu \
+      --prefix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath [
+          wayland
+          libxkbcommon
+          libGL
+        ]
+      }
+  '';
+
+  desktopItems = makeDesktopItem {
+    name = "snowemu";
+    exec = "snowemu";
+    icon = "snowemu";
+    desktopName = "Snow Emulator";
+    comment = finalAttrs.meta.description;
+    genericName = "Vintage Macintosh emulator";
+    categories = [
+      "Game"
+      "Emulator"
+    ];
+  };
+
+  meta = {
+    description = "Early Macintosh emulator";
+    longDescription = ''
+      Snow emulates classic (Motorola 680x0-based) Macintosh computers. It features a graphical user interface to operate the emulated machine and provides extensive debugging capabilities. The aim of this project is to emulate the Macintosh on a hardware-level as much as possible, as opposed to emulators that patch the ROM or intercept system calls.
+      It currently emulates the Macintosh 128K, Macintosh 512K, Macintosh Plus, Macintosh SE, Macintosh Classic and Macintosh II.
+    '';
+    homepage = "https://snowemu.com/";
+    changelog = "https://github.com/twvd/snow/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nulleric ];
+    platforms = lib.platforms.linux;
+    mainProgram = "snowemu";
+  };
+})

From 7ebfdde615d679b8227d0f174246e3fcf2e39957 Mon Sep 17 00:00:00 2001
From: "Matthieu C." <886074+teto@users.noreply.github.com>
Date: Sun, 23 Mar 2025 22:51:47 +0100
Subject: [PATCH 0126/6226] nixos/ssh: fewer empty lines in generated ssh and
 sshd config files

Co-authored-by: r-vdp <ramses@well-founded.dev>
Co-authored-by:  Marie <tabmeier12@gmail.com>
---
 nixos/modules/programs/ssh.nix                | 50 ++++++++---------
 .../modules/services/networking/ssh/sshd.nix  | 55 ++++++++-----------
 2 files changed, 48 insertions(+), 57 deletions(-)

diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index cbf1800e8e3b..88745a912521 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -339,37 +339,37 @@ in
 
     # SSH configuration. Slight duplication of the sshd_config
     # generation in the sshd service.
-    environment.etc."ssh/ssh_config".text = ''
+    environment.etc."ssh/ssh_config".text = lib.concatStringsSep "\n" (
       # Custom options from `extraConfig`, to override generated options
-      ${cfg.extraConfig}
-
-      # Generated options from other settings
-      Host *
-      ${lib.optionalString cfg.systemd-ssh-proxy.enable ''
+      lib.optional (cfg.extraConfig != "") cfg.extraConfig
+      ++ [
+        ''
+          # Generated options from other settings
+          Host *
+        ''
+      ]
+      ++ lib.optional cfg.systemd-ssh-proxy.enable ''
         # See systemd-ssh-proxy(1)
         Include ${config.systemd.package}/lib/systemd/ssh_config.d/20-systemd-ssh-proxy.conf
-      ''}
-
-      GlobalKnownHostsFile ${builtins.concatStringsSep " " knownHostsFiles}
-
-      ${lib.optionalString (!config.networking.enableIPv6) "AddressFamily inet"}
-      ${lib.optionalString cfg.setXAuthLocation "XAuthLocation ${pkgs.xorg.xauth}/bin/xauth"}
-      ${lib.optionalString (cfg.forwardX11 != null)
-        "ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}"
-      }
-
-      ${lib.optionalString (
+      ''
+      ++ [
+        "GlobalKnownHostsFile ${builtins.concatStringsSep " " knownHostsFiles}"
+      ]
+      ++ lib.optional (!config.networking.enableIPv6) "AddressFamily inet"
+      ++ lib.optional cfg.setXAuthLocation "XAuthLocation ${pkgs.xorg.xauth}/bin/xauth"
+      ++ lib.optional (cfg.forwardX11 != null) "ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}"
+      ++ lib.optional (
         cfg.pubkeyAcceptedKeyTypes != [ ]
-      ) "PubkeyAcceptedKeyTypes ${builtins.concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"}
-      ${lib.optionalString (
+      ) "PubkeyAcceptedKeyTypes ${builtins.concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"
+      ++ lib.optional (
         cfg.hostKeyAlgorithms != [ ]
-      ) "HostKeyAlgorithms ${builtins.concatStringsSep "," cfg.hostKeyAlgorithms}"}
-      ${lib.optionalString (
+      ) "HostKeyAlgorithms ${builtins.concatStringsSep "," cfg.hostKeyAlgorithms}"
+      ++ lib.optional (
         cfg.kexAlgorithms != null
-      ) "KexAlgorithms ${builtins.concatStringsSep "," cfg.kexAlgorithms}"}
-      ${lib.optionalString (cfg.ciphers != null) "Ciphers ${builtins.concatStringsSep "," cfg.ciphers}"}
-      ${lib.optionalString (cfg.macs != null) "MACs ${builtins.concatStringsSep "," cfg.macs}"}
-    '';
+      ) "KexAlgorithms ${builtins.concatStringsSep "," cfg.kexAlgorithms}"
+      ++ lib.optional (cfg.ciphers != null) "Ciphers ${builtins.concatStringsSep "," cfg.ciphers}"
+      ++ lib.optional (cfg.macs != null) "MACs ${builtins.concatStringsSep "," cfg.macs}"
+    );
 
     environment.etc."ssh/ssh_known_hosts".text = knownHostsText;
 
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index 4b3ab053be7d..c56193cb4f83 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -21,7 +21,6 @@ let
     let
       # reports boolean as yes / no
       mkValueString =
-        with lib;
         v:
         if lib.isInt v then
           toString v
@@ -456,7 +455,7 @@ in
                 default = "none"; # upstream default
                 description = ''
                   Specifies a file that lists principal names that are accepted for certificate authentication. The default
-                  is `"none"`, i.e. not to use	a principals file.
+                  is `"none"`, i.e. not to use a principals file.
                 '';
               };
               LogLevel = lib.mkOption {
@@ -825,37 +824,29 @@ in
       authPrincipalsFiles != { }
     ) "/etc/ssh/authorized_principals.d/%u";
 
-    services.openssh.extraConfig = lib.mkOrder 0 ''
-      Banner ${if cfg.banner == null then "none" else pkgs.writeText "ssh_banner" cfg.banner}
-
-      AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}
-      ${lib.concatMapStrings (port: ''
-        Port ${toString port}
-      '') cfg.ports}
-
-      ${lib.concatMapStrings (
-        { port, addr, ... }:
+    services.openssh.extraConfig = lib.mkOrder 0 (
+      lib.concatStringsSep "\n" (
+        [
+          "Banner ${if cfg.banner == null then "none" else pkgs.writeText "ssh_banner" cfg.banner}"
+          "AddressFamily ${if config.networking.enableIPv6 then "any" else "inet"}"
+        ]
+        ++ lib.map (port: ''Port ${toString port}'') cfg.ports
+        ++ lib.map (
+          { port, addr, ... }:
+          ''ListenAddress ${addr}${lib.optionalString (port != null) (":" + toString port)}''
+        ) cfg.listenAddresses
+        ++ lib.optional cfgc.setXAuthLocation "XAuthLocation ${lib.getExe pkgs.xorg.xauth}"
+        ++ lib.optional cfg.allowSFTP ''Subsystem sftp ${cfg.sftpServerExecutable} ${lib.concatStringsSep " " cfg.sftpFlags}''
+        ++ [
+          "AuthorizedKeysFile ${toString cfg.authorizedKeysFiles}"
+        ]
+        ++ lib.optional (cfg.authorizedKeysCommand != "none") ''
+          AuthorizedKeysCommand ${cfg.authorizedKeysCommand}
+          AuthorizedKeysCommandUser ${cfg.authorizedKeysCommandUser}
         ''
-          ListenAddress ${addr}${lib.optionalString (port != null) (":" + toString port)}
-        ''
-      ) cfg.listenAddresses}
-
-      ${lib.optionalString cfgc.setXAuthLocation ''
-        XAuthLocation ${pkgs.xorg.xauth}/bin/xauth
-      ''}
-      ${lib.optionalString cfg.allowSFTP ''
-        Subsystem sftp ${cfg.sftpServerExecutable} ${lib.concatStringsSep " " cfg.sftpFlags}
-      ''}
-      AuthorizedKeysFile ${toString cfg.authorizedKeysFiles}
-      ${lib.optionalString (cfg.authorizedKeysCommand != "none") ''
-        AuthorizedKeysCommand ${cfg.authorizedKeysCommand}
-        AuthorizedKeysCommandUser ${cfg.authorizedKeysCommandUser}
-      ''}
-
-      ${lib.flip lib.concatMapStrings cfg.hostKeys (k: ''
-        HostKey ${k.path}
-      '')}
-    '';
+        ++ lib.map (k: "HostKey ${k.path}") cfg.hostKeys
+      )
+    );
 
     system.checks = [
       (pkgs.runCommand "check-sshd-config"

From fc51e785a19e89b2f03551aa05ed9d10d8db0bf2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Sep 2025 03:08:03 +0000
Subject: [PATCH 0127/6226] inotify-tools: 4.23.9.0 -> 4.25.9.0

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

diff --git a/pkgs/by-name/in/inotify-tools/package.nix b/pkgs/by-name/in/inotify-tools/package.nix
index 10c48bffe7c0..4746fdf6b615 100644
--- a/pkgs/by-name/in/inotify-tools/package.nix
+++ b/pkgs/by-name/in/inotify-tools/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "inotify-tools";
-  version = "4.23.9.0";
+  version = "4.25.9.0";
 
   src = fetchFromGitHub {
     repo = "inotify-tools";
     owner = "inotify-tools";
     rev = finalAttrs.version;
-    hash = "sha256-6kM2JzxRcwUjUmbUWGnQ+gAvZcn7C32/enRwiYiuQGU=";
+    hash = "sha256-u7bnFmSEXNGVZTJ71kOTscQLymbjJblJCIY9Uj7/3mM=";
   };
 
   configureFlags = [

From 6d6efc8f329b128ebe13582d8695ec985dfda780 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Sep 2025 08:11:05 +0000
Subject: [PATCH 0128/6226] uclibc-ng: 1.0.54 -> 1.0.55

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

diff --git a/pkgs/by-name/uc/uclibc-ng/package.nix b/pkgs/by-name/uc/uclibc-ng/package.nix
index 9863c5d02c22..d2f7122840fd 100644
--- a/pkgs/by-name/uc/uclibc-ng/package.nix
+++ b/pkgs/by-name/uc/uclibc-ng/package.nix
@@ -63,11 +63,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "uclibc-ng";
-  version = "1.0.54";
+  version = "1.0.55";
 
   src = fetchurl {
     url = "https://downloads.uclibc-ng.org/releases/${finalAttrs.version}/uClibc-ng-${finalAttrs.version}.tar.xz";
-    hash = "sha256-0ez2XMIhfdQRik2vwavyfFhbXLV48715kfxkC3lkP/I=";
+    hash = "sha256-X386r92yygj7KVvkVWHAGIQHED10Rs/SZLm4Iv7T7S0=";
   };
 
   # 'ftw' needed to build acl, a coreutils dependency

From 6ea010d62fd6b38516b63caffefb1d1ec1c389ff Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Mon, 22 Sep 2025 12:43:39 +0200
Subject: [PATCH 0129/6226] python3Packages.arelle.tests.cli: Unhardcode
 version

---
 pkgs/development/python-modules/arelle/test-cli.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/arelle/test-cli.nix b/pkgs/development/python-modules/arelle/test-cli.nix
index 17a0ebc0b6ce..90b1572015a7 100644
--- a/pkgs/development/python-modules/arelle/test-cli.nix
+++ b/pkgs/development/python-modules/arelle/test-cli.nix
@@ -18,7 +18,7 @@ runCommand "arelle-test-cli${lib.optionalString (!arelle.hasGUI) "-headless"}"
     export HOME=$(mktemp -d)
 
     # Test basic CLI commands work with proper assertions
-    arelleCmdLine --version --disablePersistentConfig 2>&1 | grep "Arelle(r) 2.37.59" > /dev/null
+    arelleCmdLine --version --disablePersistentConfig 2>&1 | grep "Arelle(r) ${arelle.version}" > /dev/null
     arelleCmdLine --help --disablePersistentConfig 2>&1 | grep "Usage: arelleCmdLine \[options\]" > /dev/null
     arelleCmdLine --about --disablePersistentConfig 2>&1 | grep "An open source XBRL platform" > /dev/null
 

From 9a1da95d15e13a328fadd6de6f145e886c74e416 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Sun, 21 Sep 2025 16:33:07 +0200
Subject: [PATCH 0130/6226] haskellPackages: restrict darwin int ptr workaround
 to affected GHCs

A fix was merged for GHC >= 9.10 which has been backported to GHC 9.8.2
and 9.6.5.

- http://gitlab.haskell.org/ghc/ghc/-/commit/a5a7a0cead6de89648d3a7323c2dc64c59a830fc
- https://gitlab.haskell.org/ghc/ghc/-/commit/92239edecc9b5c7462f9d261742ae7c19f67e757
---
 pkgs/development/haskell-modules/generic-builder.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix
index f2ea85774d60..e4a846a28941 100644
--- a/pkgs/development/haskell-modules/generic-builder.nix
+++ b/pkgs/development/haskell-modules/generic-builder.nix
@@ -549,8 +549,10 @@ let
   }
   // env
   # Implicit pointer to integer conversions are errors by default since clang 15.
-  # Works around https://gitlab.haskell.org/ghc/ghc/-/issues/23456.
-  // optionalAttrs (stdenv.hasCC && stdenv.cc.isClang) {
+  # Works around https://gitlab.haskell.org/ghc/ghc/-/issues/23456. krank:ignore-line
+  # A fix was included in GHC 9.10.* and backported to 9.6.5 and 9.8.2 (but we no longer
+  # ship 9.8.1).
+  // optionalAttrs (lib.versionOlder ghc.version "9.6.5" && stdenv.hasCC && stdenv.cc.isClang) {
     NIX_CFLAGS_COMPILE =
       "-Wno-error=int-conversion"
       + lib.optionalString (env ? NIX_CFLAGS_COMPILE) (" " + env.NIX_CFLAGS_COMPILE);

From 2ea12938b987069eb884ea6df25d194c34e8127f Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Mon, 21 Apr 2025 18:51:52 -0400
Subject: [PATCH 0131/6226] apple-sdk: fix broken symlink check

---
 .../ap/apple-sdk/common/add-core-symbolication.nix        | 1 -
 pkgs/by-name/ap/apple-sdk/common/propagate-xcrun.nix      | 8 ++++++--
 pkgs/by-name/ap/apple-sdk/package.nix                     | 6 ------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ap/apple-sdk/common/add-core-symbolication.nix b/pkgs/by-name/ap/apple-sdk/common/add-core-symbolication.nix
index 68704a0d4a4c..10935377cd22 100644
--- a/pkgs/by-name/ap/apple-sdk/common/add-core-symbolication.nix
+++ b/pkgs/by-name/ap/apple-sdk/common/add-core-symbolication.nix
@@ -42,7 +42,6 @@ in
 self: super: {
   buildPhase = super.buildPhase or "" + ''
     mkdir -p System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/Headers
-    ln -s A System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/Current
     ln -s Versions/Current/Headers System/Library/PrivateFrameworks/CoreSymbolication.framework/Headers
     cp '${CoreSymbolication}/include/'*.h System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/Headers
   '';
diff --git a/pkgs/by-name/ap/apple-sdk/common/propagate-xcrun.nix b/pkgs/by-name/ap/apple-sdk/common/propagate-xcrun.nix
index f993441c757e..3a07fe78d803 100644
--- a/pkgs/by-name/ap/apple-sdk/common/propagate-xcrun.nix
+++ b/pkgs/by-name/ap/apple-sdk/common/propagate-xcrun.nix
@@ -38,11 +38,15 @@ self: super: {
     # Include `libtool` in the toolchain, so `xcrun -find libtool` can find it without requiring `cctools.libtool`
     # as a `nativeBuildInput`.
     mkdir -p "$toolchainsPath/usr/bin"
-    ln -s '${cctools.libtool}/bin/${stdenv.cc.targetPrefix}libtool' "$toolchainsPath/usr/bin/libtool"
+    if [ -e '${cctools.libtool}/bin/${stdenv.cc.targetPrefix}libtool' ]; then
+      ln -s '${cctools.libtool}/bin/${stdenv.cc.targetPrefix}libtool' "$toolchainsPath/usr/bin/libtool"
+    fi
 
     # Include additional binutils required by some packages (such as Chromium).
     for tool in lipo nm otool size strip; do
-      ln -s '${darwin.binutils-unwrapped}/bin/${stdenv.cc.targetPrefix}'$tool "$toolchainsPath/usr/bin/$tool"
+      if [ -e '${darwin.binutils-unwrapped}/bin/${stdenv.cc.targetPrefix}'$tool ]; then
+        ln -s '${darwin.binutils-unwrapped}/bin/${stdenv.cc.targetPrefix}'$tool "$toolchainsPath/usr/bin/$tool"
+      fi
     done
   '';
 }
diff --git a/pkgs/by-name/ap/apple-sdk/package.nix b/pkgs/by-name/ap/apple-sdk/package.nix
index 04b32f07a642..1633010d4f3d 100644
--- a/pkgs/by-name/ap/apple-sdk/package.nix
+++ b/pkgs/by-name/ap/apple-sdk/package.nix
@@ -58,12 +58,6 @@ stdenvNoCC.mkDerivation (
 
     dontConfigure = true;
 
-    # TODO(@connorbaker):
-    # This is a quick fix unblock builds broken by https://github.com/NixOS/nixpkgs/pull/370750.
-    # Fails due to a reflexive symlink:
-    # $out/Platforms/MacOSX.platform/Developer/SDKs/MacOSX11.3.sdk/System/Library/PrivateFrameworks/CoreSymbolication.framework/Versions/A/A
-    dontCheckForBrokenSymlinks = true;
-
     strictDeps = true;
 
     setupHooks = [

From 475f17b86511588080ce61cfcb2c36a9a243a868 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Mon, 21 Apr 2025 18:51:52 -0400
Subject: [PATCH 0132/6226] apple-sdk: link CUPS headers into the sysroot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Not having the CUPS headers in the sysroot causes problems for Swift’s
module importer when it tries to import AppKit, which depends on CUPS
headers. The module importer is effectively an unwrapped Clang, so the
headers need to be symlinked there instead of just propagated.
---
 pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix | 9 ++++++---
 pkgs/stdenv/darwin/default.nix                        | 1 +
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix b/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix
index fe58181980b6..f9551b5b9bad 100644
--- a/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix
+++ b/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix
@@ -56,16 +56,19 @@ self: super: {
       darwin.libsbuf
       # Shipped with the SDK only as a library with no headers
       (lib.getLib darwin.libutil)
-      # Required by some SDK headers
-      cupsHeaders
     ]
     # x86_64-darwin links the object files from Csu when targeting very old releases
     ++ lib.optionals stdenvNoCC.hostPlatform.isx86_64 [ darwin.Csu ];
 
   # The Darwin module for Swift requires certain headers to be included in the SDK (and not just be propagated).
   buildPhase = super.buildPhase or "" + ''
-    for header in '${lib.getDev libiconv}/include/'* '${lib.getDev ncurses}/include/'*; do
+    for header in '${lib.getDev libiconv}/include/'* '${lib.getDev ncurses}/include/'* '${cupsHeaders}/include/'*; do
       ln -s "$header" "usr/include/$(basename "$header")"
     done
   '';
+
+  # Exported to allow the headers to pass the requisites check in the stdenv bootstrap.
+  passthru = (super.passthru or { }) // {
+    cups-headers = cupsHeaders;
+  };
 }
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 0edf63dbc71e..0a5a29fad85b 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -1121,6 +1121,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
             with prevStage;
             [
               apple-sdk
+              apple-sdk.cups-headers
               bashNonInteractive
               bzip2.bin
               bzip2.out

From 8b9d58978473e168bf42f4a116fa514da2d20e10 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Mon, 21 Apr 2025 18:51:52 -0400
Subject: [PATCH 0133/6226] apple-sdk: improve compatibility with Swift Build
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Swift Build requires additional fields in `MacOSX.platform/Info.plist`,
or it won’t recognize the SDK as being from Xcode. Having it recognize
the SDK as from Xcode is required for it to use the SDK at all.
---
 pkgs/by-name/ap/apple-sdk/common/plists.nix   | 19 ++++++++++++++++---
 .../ap/apple-sdk/common/propagate-xcrun.nix   |  3 ++-
 pkgs/by-name/ap/apple-sdk/package.nix         |  2 +-
 3 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ap/apple-sdk/common/plists.nix b/pkgs/by-name/ap/apple-sdk/common/plists.nix
index 33bb1f134c12..70184d89429b 100644
--- a/pkgs/by-name/ap/apple-sdk/common/plists.nix
+++ b/pkgs/by-name/ap/apple-sdk/common/plists.nix
@@ -2,15 +2,28 @@
   lib,
   stdenvNoCC,
   xcodePlatform,
+  sdkVersion,
 }:
 
 let
   inherit (lib.generators) toPlist;
 
-  Info = {
-    CFBundleIdentifier = "com.apple.platform.${lib.toLower xcodePlatform}";
-    Type = "Platform";
+  Info = rec {
+    CFBundleIdentifier = "com.apple.platform.${Name}";
+    DefaultProperties = {
+      COMPRESS_PNG_FILES = "NO";
+      DEPLOYMENT_TARGET_SETTING_NAME = stdenvNoCC.hostPlatform.darwinMinVersionVariable;
+      STRIP_PNG_TEXT = "NO";
+    };
+    Description = if stdenvNoCC.hostPlatform.isMacOS then "macOS" else "iOS";
+    FamilyDisplayName = Description;
+    FamilyIdentifier = lib.toLower xcodePlatform;
+    FamilyName = Description;
+    Identifier = CFBundleIdentifier;
+    MinimumSDKVersion = stdenvNoCC.hostPlatform.darwinMinVersion;
     Name = lib.toLower xcodePlatform;
+    Type = "Platform";
+    Version = sdkVersion;
   };
 
   # These files are all based off of Xcode spec files found in
diff --git a/pkgs/by-name/ap/apple-sdk/common/propagate-xcrun.nix b/pkgs/by-name/ap/apple-sdk/common/propagate-xcrun.nix
index 3a07fe78d803..ff0094df60e0 100644
--- a/pkgs/by-name/ap/apple-sdk/common/propagate-xcrun.nix
+++ b/pkgs/by-name/ap/apple-sdk/common/propagate-xcrun.nix
@@ -3,11 +3,12 @@
   pkgsBuildHost,
   stdenv,
   stdenvNoCC,
+  sdkVersion,
 }:
 
 let
   plists = import ./plists.nix {
-    inherit lib stdenvNoCC;
+    inherit lib stdenvNoCC sdkVersion;
     xcodePlatform = if stdenvNoCC.hostPlatform.isMacOS then "MacOSX" else "iPhoneOS";
   };
   inherit (pkgsBuildHost) darwin cctools xcbuild;
diff --git a/pkgs/by-name/ap/apple-sdk/package.nix b/pkgs/by-name/ap/apple-sdk/package.nix
index 1633010d4f3d..f05b4c13d343 100644
--- a/pkgs/by-name/ap/apple-sdk/package.nix
+++ b/pkgs/by-name/ap/apple-sdk/package.nix
@@ -41,7 +41,7 @@ let
     # Avoid infinite recursions by not propagating certain packages, so they can themselves build with the SDK.
     ++ lib.optionals (!enableBootstrap) [
       (callPackage ./common/propagate-inputs.nix { })
-      (callPackage ./common/propagate-xcrun.nix { })
+      (callPackage ./common/propagate-xcrun.nix { inherit sdkVersion; })
     ]
     # This has to happen last.
     ++ [

From c93f6d5545b3c5615129173ab61a81982d64c725 Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Mon, 21 Apr 2025 18:51:52 -0400
Subject: [PATCH 0134/6226] apple-sdk: reduce spurious warnings when using
 SwiftPM

SwiftPM adds several SDK paths to the search path by default. Creating
empty paths in the SDK silences those warnings and reduces log spam.
---
 pkgs/by-name/ap/apple-sdk/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ap/apple-sdk/package.nix b/pkgs/by-name/ap/apple-sdk/package.nix
index f05b4c13d343..2a0dabd97ae0 100644
--- a/pkgs/by-name/ap/apple-sdk/package.nix
+++ b/pkgs/by-name/ap/apple-sdk/package.nix
@@ -90,6 +90,11 @@ stdenvNoCC.mkDerivation (
         ln -s "${sdkName}" "$sdkpath/MacOSX${sdkMajor}.sdk"
         ln -s "${sdkName}" "$sdkpath/MacOSX.sdk"
 
+        # Swift adds these locations to its search paths. Avoid spurious warnings by making sure they exist.
+        mkdir -p "$platformPath/Developer/Library/Frameworks"
+        mkdir -p "$platformPath/Developer/Library/PrivateFrameworks"
+        mkdir -p "$platformPath/Developer/usr/lib"
+
         runHook postInstall
       '';
 

From 3ef36b4fd0a27122b3fea10101d5605332da59ad Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 17 Sep 2025 21:08:00 +0200
Subject: [PATCH 0135/6226] buildNpmPackage: add support for
 `npm-shrinkwrap.json`

---
 .../node/build-npm-package/hooks/npm-config-hook.sh         | 6 +++++-
 pkgs/by-name/ar/ares-cli/package.nix                        | 4 ----
 pkgs/by-name/ba/balena-cli/package.nix                      | 3 ---
 pkgs/by-name/bt/btc-rpc-explorer/package.nix                | 4 ----
 pkgs/by-name/fi/firebase-tools/package.nix                  | 4 ----
 pkgs/by-name/pa/particle-cli/package.nix                    | 4 ----
 pkgs/by-name/re/redoc-cli/package.nix                       | 4 ----
 pkgs/by-name/si/sitespeed-io/package.nix                    | 4 ----
 pkgs/by-name/x2/x2t/package.nix                             | 4 ----
 9 files changed, 5 insertions(+), 32 deletions(-)

diff --git a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh
index 7fabd80eec1f..d954bb010df2 100644
--- a/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh
+++ b/pkgs/build-support/node/build-npm-package/hooks/npm-config-hook.sh
@@ -29,7 +29,11 @@ npmConfigHook() {
     fi
 
     local -r cacheLockfile="$npmDeps/package-lock.json"
-    local -r srcLockfile="$PWD/package-lock.json"
+    if [[ -f npm-shrinkwrap.json ]]; then
+        local -r srcLockfile="$PWD/npm-shrinkwrap.json"
+    else
+        local -r srcLockfile="$PWD/package-lock.json"
+    fi
 
     echo "Validating consistency between $srcLockfile and $cacheLockfile"
 
diff --git a/pkgs/by-name/ar/ares-cli/package.nix b/pkgs/by-name/ar/ares-cli/package.nix
index 8c5be1fea7eb..adb13af633d1 100644
--- a/pkgs/by-name/ar/ares-cli/package.nix
+++ b/pkgs/by-name/ar/ares-cli/package.nix
@@ -14,10 +14,6 @@ buildNpmPackage rec {
     hash = "sha256-L8suZDtXVchVyvp7KCv0UaceJqqGBdfopd5tZzwj3MY=";
   };
 
-  postPatch = ''
-    ln -s npm-shrinkwrap.json package-lock.json
-  '';
-
   dontNpmBuild = true;
   npmDepsHash = "sha256-ATIxe/sulfOpz5KiWauDAPZrlfUOFyiTa+5ECFbVd+0=";
 
diff --git a/pkgs/by-name/ba/balena-cli/package.nix b/pkgs/by-name/ba/balena-cli/package.nix
index e62e4be0a1b5..36aaef1667b0 100644
--- a/pkgs/by-name/ba/balena-cli/package.nix
+++ b/pkgs/by-name/ba/balena-cli/package.nix
@@ -33,9 +33,6 @@ buildNpmPackage' rec {
 
   npmDepsHash = "sha256-SWtWXvWUuIzMqLoEDRTqVJyWNK/FXOA/LF73kCWfuz4=";
 
-  postPatch = ''
-    ln -s npm-shrinkwrap.json package-lock.json
-  '';
   makeCacheWritable = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/bt/btc-rpc-explorer/package.nix b/pkgs/by-name/bt/btc-rpc-explorer/package.nix
index b8074f93fbc4..93e32a9f67f5 100644
--- a/pkgs/by-name/bt/btc-rpc-explorer/package.nix
+++ b/pkgs/by-name/bt/btc-rpc-explorer/package.nix
@@ -20,10 +20,6 @@ buildNpmPackage rec {
 
   npmDepsHash = "sha256-eYA2joO4wcV10xJeYLqCbvM2szWlqofmugoHHD9D30U=";
 
-  postPatch = ''
-    ln -s npm-shrinkwrap.json package-lock.json
-  '';
-
   makeCacheWritable = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix
index 412d32c9e8d0..30ad95639ac0 100644
--- a/pkgs/by-name/fi/firebase-tools/package.nix
+++ b/pkgs/by-name/fi/firebase-tools/package.nix
@@ -21,10 +21,6 @@ buildNpmPackage rec {
 
   npmDepsHash = "sha256-EhUJj1kSMslCXhgzCEiVn+4DSmRfvj/nh3OmaZCh/bk=";
 
-  postPatch = ''
-    ln -s npm-shrinkwrap.json package-lock.json
-  '';
-
   nativeBuildInputs = [
     python3
   ]
diff --git a/pkgs/by-name/pa/particle-cli/package.nix b/pkgs/by-name/pa/particle-cli/package.nix
index ce2d2164d7e6..5a1a482b7798 100644
--- a/pkgs/by-name/pa/particle-cli/package.nix
+++ b/pkgs/by-name/pa/particle-cli/package.nix
@@ -26,10 +26,6 @@ buildNpmPackage (finalAttrs: {
   dontNpmBuild = true;
   dontNpmPrune = true;
 
-  postPatch = ''
-    ln -s npm-shrinkwrap.json package-lock.json
-  '';
-
   postInstall = ''
     install -D -t $out/etc/udev/rules.d \
       $out/lib/node_modules/particle-cli/assets/50-particle.rules
diff --git a/pkgs/by-name/re/redoc-cli/package.nix b/pkgs/by-name/re/redoc-cli/package.nix
index 15d3e4f84dad..69d002db4bac 100644
--- a/pkgs/by-name/re/redoc-cli/package.nix
+++ b/pkgs/by-name/re/redoc-cli/package.nix
@@ -19,10 +19,6 @@ buildNpmPackage rec {
 
   npmDepsHash = "sha256-XL4D7+hb0zOxAr/aRo2UOg4UOip3oewbffsnkFddmWw=";
 
-  postPatch = ''
-    ln -s npm-shrinkwrap.json package-lock.json
-  '';
-
   dontNpmBuild = true;
 
   meta = {
diff --git a/pkgs/by-name/si/sitespeed-io/package.nix b/pkgs/by-name/si/sitespeed-io/package.nix
index 0da1a79be71e..63e79e1ed5fc 100644
--- a/pkgs/by-name/si/sitespeed-io/package.nix
+++ b/pkgs/by-name/si/sitespeed-io/package.nix
@@ -35,10 +35,6 @@ buildNpmPackage rec {
     hash = "sha256-S7XYDxKODK6R/O9kNVq04pponYfcwTwsyVQO8yh598w=";
   };
 
-  postPatch = ''
-    ln -s npm-shrinkwrap.json package-lock.json
-  '';
-
   # Don't try to download the browser drivers
   CHROMEDRIVER_SKIP_DOWNLOAD = true;
   GECKODRIVER_SKIP_DOWNLOAD = true;
diff --git a/pkgs/by-name/x2/x2t/package.nix b/pkgs/by-name/x2/x2t/package.nix
index e067a41fbe46..3fbc08b902e4 100644
--- a/pkgs/by-name/x2/x2t/package.nix
+++ b/pkgs/by-name/x2/x2t/package.nix
@@ -164,10 +164,6 @@ let
     };
     sourceRoot = "${finalAttrs.src.name}/build";
 
-    postPatch = ''
-      cp npm-shrinkwrap.json package-lock.json
-    '';
-
     npmDepsHash = "sha256-Hpf+z3RGqZ1LTdow6xP00hNmWf4xs+KnVBj4NbPW4uM=";
 
     dontNpmBuild = true;

From 96f7a260cc314ff3989625845fae549f3a282b13 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 22 Sep 2025 18:59:45 +0000
Subject: [PATCH 0136/6226] abseil-cpp: 20250814.0 -> 20250814.1

Diff: https://github.com/abseil/abseil-cpp/compare/20250814.0...20250814.1

Changelog: https://github.com/abseil/abseil-cpp/releases/tag/20250814.1
---
 pkgs/by-name/ab/abseil-cpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ab/abseil-cpp/package.nix b/pkgs/by-name/ab/abseil-cpp/package.nix
index 8fee318a4947..a264041af441 100644
--- a/pkgs/by-name/ab/abseil-cpp/package.nix
+++ b/pkgs/by-name/ab/abseil-cpp/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "abseil-cpp";
-  version = "20250814.0";
+  version = "20250814.1";
 
   src = fetchFromGitHub {
     owner = "abseil";
     repo = "abseil-cpp";
     tag = finalAttrs.version;
-    hash = "sha256-6Ro7miql9+wcArsOKTjlyDSyD91rmmPsIfO5auk9kiI=";
+    hash = "sha256-SCQDORhmJmTb0CYm15zjEa7dkwc+lpW2s1d4DsMRovI=";
   };
 
   cmakeFlags = [

From d90a011f78f8bee8c57a940b5422e2de06ac8454 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Mon, 22 Sep 2025 21:04:09 +0200
Subject: [PATCH 0137/6226] meson: 1.9.0 -> 1.9.1

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

diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix
index 52b186fcf432..77b4a8b6c203 100644
--- a/pkgs/by-name/me/meson/package.nix
+++ b/pkgs/by-name/me/meson/package.nix
@@ -16,14 +16,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "meson";
-  version = "1.9.0";
+  version = "1.9.1";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "mesonbuild";
     repo = "meson";
     tag = version;
-    hash = "sha256-VMLcGtyJIH3jsTkHrIUhCpjwm6ljsRSyRECYhaafjD8=";
+    hash = "sha256-t4a/Zp8rC+DMjskdwVvYIfYDAT57zGVfVu7IApwRNGA=";
   };
 
   patches = [

From a44ce7d370da14bd5f046546c1654e526704bbfb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Sep 2025 19:29:21 +0000
Subject: [PATCH 0138/6226] ocamlPackages.terminal: 0.4.0 -> 0.5.0

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

diff --git a/pkgs/development/ocaml-modules/terminal/default.nix b/pkgs/development/ocaml-modules/terminal/default.nix
index 0222690e2d5a..ac9ddd453970 100644
--- a/pkgs/development/ocaml-modules/terminal/default.nix
+++ b/pkgs/development/ocaml-modules/terminal/default.nix
@@ -12,13 +12,13 @@
 
 buildDunePackage rec {
   pname = "terminal";
-  version = "0.4.0";
+  version = "0.5.0";
 
   minimalOCamlVersion = "4.03";
 
   src = fetchurl {
     url = "https://github.com/CraigFe/progress/releases/download/${version}/progress-${version}.tbz";
-    hash = "sha256-i+RJVTN5uy3F6LeYBcgER2kKA9yj6a7pWf7PRtgnj7c=";
+    hash = "sha256-f4fwWXNjkoxFuoWa5aFDD2qjwp4lH/GlPPeG7Q4EWWE=";
   };
 
   propagatedBuildInputs = [

From 6159eb1078a0f9e7140000f9013481431946132a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 22 Sep 2025 22:42:48 +0000
Subject: [PATCH 0139/6226] python3Packages.harlequin-postgres: 1.2.0 -> 1.2.2

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

diff --git a/pkgs/development/python-modules/harlequin-postgres/default.nix b/pkgs/development/python-modules/harlequin-postgres/default.nix
index 28e59ce21a18..baa1d0d4b343 100644
--- a/pkgs/development/python-modules/harlequin-postgres/default.nix
+++ b/pkgs/development/python-modules/harlequin-postgres/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "harlequin-postgres";
-  version = "1.2.0";
+  version = "1.2.2";
   pyproject = true;
 
   src = fetchPypi {
     pname = "harlequin_postgres";
     inherit version;
-    hash = "sha256-9US0aaXP2F+UVM9pY43KpnB05KC0/uDxrpZAYOJ+RR0=";
+    hash = "sha256-u/x8Jx1yfUtFSYX6oyvOZJmdPWbaOkFn3OGQdqxyK8A=";
   };
 
   build-system = [

From ad431eef52870866bc8c02581d81ee80297cd6cd Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 23 Sep 2025 08:03:27 +0800
Subject: [PATCH 0140/6226] uv: 0.8.19 -> 0.8.20

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

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index f77377765b65..d6272d650891 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.8.19";
+  version = "0.8.20";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-TbCkkZQoRItBmzwn7B8JbXWs72lYiqWV5mOfkvRarsg=";
+    hash = "sha256-k0otsop9KjjChlUIKBJn4yQStOHmv/v8GLol3Pz/3yU=";
   };
 
-  cargoHash = "sha256-09A40qwbRex8WEgCFC2yRZoq+6UnxurJAX8e27G+Rhg=";
+  cargoHash = "sha256-f/2DHdNWdbQEYt7kmDsBPDgerGcjFGKyVgU+bQ9qdlg=";
 
   buildInputs = [
     rust-jemalloc-sys

From 7fd9bf85981164435481c199fca2b0fbd15f807c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Sep 2025 00:27:06 +0000
Subject: [PATCH 0141/6226] ada: 3.2.7 -> 3.2.8

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

diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix
index 7f641a452ad0..e21d071ec41b 100644
--- a/pkgs/by-name/ad/ada/package.nix
+++ b/pkgs/by-name/ad/ada/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ada";
-  version = "3.2.7";
+  version = "3.2.8";
 
   src = fetchFromGitHub {
     owner = "ada-url";
     repo = "ada";
     tag = "v${version}";
-    hash = "sha256-IDJgrjmIqhnIZuzBAckowpmhRypb1a1NB1P5YZz4E1A=";
+    hash = "sha256-ZqDuNV4LvVyCiUwnQqnq+BG5ZImqZg0Q01sjztMTdvc=";
   };
 
   nativeBuildInputs = [ cmake ];

From 003ccb5827aa438de264bfbec7cc57e03ffde51c Mon Sep 17 00:00:00 2001
From: Davis Schirmer <git@djds.dev>
Date: Tue, 23 Sep 2025 00:07:45 -0400
Subject: [PATCH 0142/6226] restic: Replace rec with finalAttrs; add djds@ to
 maintainers

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

diff --git a/pkgs/by-name/re/restic/package.nix b/pkgs/by-name/re/restic/package.nix
index 47d67bfbd56c..e94c4684fed8 100644
--- a/pkgs/by-name/re/restic/package.nix
+++ b/pkgs/by-name/re/restic/package.nix
@@ -10,14 +10,14 @@
   python3,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "restic";
   version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "restic";
     repo = "restic";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-lLinqZUOsZCPPybvVDB1f8o9Hl5qKYi0eHwJAaydsD8=";
   };
 
@@ -60,15 +60,16 @@ buildGoModule rec {
 
   meta = with lib; {
     homepage = "https://restic.net";
-    changelog = "https://github.com/restic/restic/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/restic/restic/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     description = "Backup program that is fast, efficient and secure";
     platforms = platforms.linux ++ platforms.darwin;
     license = licenses.bsd2;
     maintainers = with maintainers; [
       mbrgm
+      djds
       dotlambda
       ryan4yin
     ];
     mainProgram = "restic";
   };
-}
+})

From daaa0f2d902ea2c74e82b50c90472d7f615fd8ef Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Sat, 20 Sep 2025 19:41:48 +0300
Subject: [PATCH 0143/6226] python3Packages.setproctitle: 1.3.6 -> 1.3.7

---
 .../python-modules/setproctitle/default.nix   | 33 ++++++++++---------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix
index e9aeda152d3e..fdb412cb499e 100644
--- a/pkgs/development/python-modules/setproctitle/default.nix
+++ b/pkgs/development/python-modules/setproctitle/default.nix
@@ -1,35 +1,38 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
-  fetchPypi,
+  fetchFromGitHub,
   setuptools,
   pytestCheckHook,
+  procps,
 }:
 
 buildPythonPackage rec {
   pname = "setproctitle";
-  version = "1.3.6";
+  version = "1.3.7";
   pyproject = true;
 
-  disabled = pythonOlder "3.6";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-yfMrlscAuzhPM/fPB5VLtgnTXdgnUs71f7LuCWhAkWk=";
+  src = fetchFromGitHub {
+    owner = "dvarrazzo";
+    repo = "py-setproctitle";
+    tag = "version-${version}";
+    hash = "sha256-dfOdtfOXRAoCQLW307+YMsFIWRv4CupbKUxckev1oUw=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    procps
+  ];
 
-  # tries to compile programs with dependencies that aren't available
-  disabledTestPaths = [ "tests/setproctitle_test.py" ];
+  pythonImportsCheck = [ "setproctitle" ];
 
-  meta = with lib; {
+  meta = {
     description = "Allows a process to change its title (as displayed by system tools such as ps and top)";
     homepage = "https://github.com/dvarrazzo/py-setproctitle";
-    license = licenses.bsdOriginal;
-    maintainers = with maintainers; [ exi ];
+    changelog = "https://github.com/dvarrazzo/py-setproctitle/blob/${src.tag}/HISTORY.rst";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ exi ];
   };
 }

From fd5cb983e00ebeff085cd28a7da0264bc490634c Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Tue, 23 Sep 2025 10:36:25 +0300
Subject: [PATCH 0144/6226] searxng: relax setproctitle

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

diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix
index a4c214de36df..c97ce8b2c1fd 100644
--- a/pkgs/by-name/se/searxng/package.nix
+++ b/pkgs/by-name/se/searxng/package.nix
@@ -32,6 +32,7 @@ python.pkgs.toPythonModule (
       "httpx-socks"
       "lxml"
       "typer-slim"
+      "setproctitle"
     ];
 
     preBuild =

From fb37b13f54b5b7766158b2ea86082470c1bd9ffc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 23 Sep 2025 03:05:05 -0700
Subject: [PATCH 0145/6226] python3Packages.poetry-core: 2.2.0 -> 2.2.1

Diff: https://github.com/python-poetry/poetry-core/compare/2.2.0...2.2.1

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

diff --git a/pkgs/development/python-modules/poetry-core/default.nix b/pkgs/development/python-modules/poetry-core/default.nix
index c26bd164c72c..3cc932fa292f 100644
--- a/pkgs/development/python-modules/poetry-core/default.nix
+++ b/pkgs/development/python-modules/poetry-core/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "poetry-core";
-  version = "2.2.0";
+  version = "2.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python-poetry";
     repo = "poetry-core";
     tag = version;
-    hash = "sha256-WLPG8BiM+927qSC+ly5H2IAE2Htm8+wLEjK2AFnMJ58=";
+    hash = "sha256-l5WTjKa+A66QfWLmrjCQq7ZrSaeuylGIRZr8jsiYq+A=";
   };
 
   nativeCheckInputs = [

From 54a55469fbe1f64a65826282384e80efc1432f32 Mon Sep 17 00:00:00 2001
From: Lucy <git@lucy.giving>
Date: Tue, 23 Sep 2025 12:11:04 +0200
Subject: [PATCH 0146/6226] pango: 1.56.3 -> 1.56.4

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

diff --git a/pkgs/by-name/pa/pango/package.nix b/pkgs/by-name/pa/pango/package.nix
index a24383b6d805..aa2a81bfe635 100644
--- a/pkgs/by-name/pa/pango/package.nix
+++ b/pkgs/by-name/pa/pango/package.nix
@@ -29,7 +29,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pango";
-  version = "1.56.3";
+  version = "1.56.4";
 
   outputs = [
     "bin"
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/pango/${lib.versions.majorMinor finalAttrs.version}/pango-${finalAttrs.version}.tar.xz";
-    hash = "sha256-JgYlK8Jc2NJOG39+ksOicrN6zWc0NHtztHpIKDS6JJE=";
+    hash = "sha256-FwZeL8xfWlvb/8iEyVa/x8RRqW6MT7L4rYN8ZBPLWgE=";
   };
 
   depsBuildBuild = [

From 88a978dc5bb871107ca4f6fedfeddd572cfc29bb Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Tue, 23 Sep 2025 19:33:31 +0200
Subject: [PATCH 0147/6226] libxfont_2: add xorgproto to propagatedBuildInputs

i forgot it in #436179
---
 pkgs/by-name/li/libxfont_2/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/li/libxfont_2/package.nix b/pkgs/by-name/li/libxfont_2/package.nix
index 2902d682931f..9f1dbea7359e 100644
--- a/pkgs/by-name/li/libxfont_2/package.nix
+++ b/pkgs/by-name/li/libxfont_2/package.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
   ];
 
+  propagatedBuildInputs = [ xorgproto ];
+
   passthru = {
     updateScript = writeScript "update-${finalAttrs.pname}" ''
       #!/usr/bin/env nix-shell

From f8da5444ae47dbfcd376e19c420380fb29b2648a Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 23 Aug 2025 15:32:58 +0200
Subject: [PATCH 0148/6226] libxp: refactor, move to pkgs/by-name and rename
 from xorg.libXp

---
 pkgs/by-name/li/libxp/package.nix             | 69 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  7 --
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 74 insertions(+), 48 deletions(-)
 create mode 100644 pkgs/by-name/li/libxp/package.nix

diff --git a/pkgs/by-name/li/libxp/package.nix b/pkgs/by-name/li/libxp/package.nix
new file mode 100644
index 000000000000..076b7ddb5510
--- /dev/null
+++ b/pkgs/by-name/li/libxp/package.nix
@@ -0,0 +1,69 @@
+# TODO: remove this deprecated package
+# X.Org removed support for the Xprt server from the xorg-server releases in the 1.6.0 release in
+# 2009, and the standalone git repo it was moved to has been unmaintained since 2009, making it
+# difficult to actually use this library.
+# Some packages in nixpkgs still somehow depend on it tho.
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxau,
+  libxext,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxp";
+  version = "1.0.4";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXp-${finalAttrs.version}.tar.xz";
+    hash = "sha256-HxnjuOgqNKj9mImn2a8KvoWIywP7V8N8VpY0zzud8aQ=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxau
+    libxext
+  ];
+
+  propagatedBuildInputs = [ xorgproto ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXp \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X Print Client Library";
+    longDescription = ''
+      This library provides support for X11 clients to print via the X Print Extension, as
+      previously implemented in the Xprt server.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxp";
+    license = lib.licenses.x11;
+    maintainers = [ ];
+    pkgConfigModules = [ "xp" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 8d98269160a1..05a46b3329f4 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -63,6 +63,7 @@
   libxft,
   libxi,
   libxmu,
+  libxp,
   libxpm,
   libxrandr,
   libxrender,
@@ -229,6 +230,7 @@ self: with self; {
   libXft = libxft;
   libXi = libxi;
   libXmu = libxmu;
+  libXp = libxp;
   libXpm = libxpm;
   libXrandr = libxrandr;
   libXrender = libxrender;
@@ -1051,46 +1053,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXp = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXau,
-      libXext,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXp";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXp-1.0.4.tar.xz";
-        sha256 = "197iklxwyd4naryc6mzv0g5qi1dy1apxk9w9k3yshd1ax2wf668z";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXau
-        libXext
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xp" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXpresent = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 0eed02f53618..0e3d2e3123c3 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -74,6 +74,7 @@ $pcMap{"xft"} = "libXft";
 $pcMap{"xi"} = "libXi";
 $pcMap{"xmu"} = "libXmu";
 $pcMap{"xmuu"} = "libXmu";
+$pcMap{"xp"} = "libXp";
 $pcMap{"xpm"} = "libXpm";
 $pcMap{"xrandr"} = "libXrandr";
 $pcMap{"xrender"} = "libXrender";
@@ -386,6 +387,7 @@ print OUT <<EOF;
   libxft,
   libxi,
   libxmu,
+  libxp,
   libxpm,
   libxrandr,
   libxrender,
@@ -552,6 +554,7 @@ self: with self; {
   libXft = libxft;
   libXi = libxi;
   libXmu = libxmu;
+  libXp = libxp;
   libXpm = libxpm;
   libXrandr = libxrandr;
   libXrender = libxrender;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 717a4d81f91a..55330fbc087f 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -205,13 +205,6 @@ self: super:
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
   });
 
-  libXp = super.libXp.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ];
-  });
-
   libXpresent = super.libXpresent.overrideAttrs (attrs: {
     buildInputs = attrs.buildInputs ++ [
       xorg.libXext
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 273dacebc710..b1d1981dbe40 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -87,7 +87,6 @@ mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXinerama-1.1.5.tar.xz
 mirror://xorg/individual/lib/libxkbfile-1.1.3.tar.xz
-mirror://xorg/individual/lib/libXp-1.0.4.tar.xz
 mirror://xorg/individual/lib/libXpresent-1.0.2.tar.xz
 mirror://xorg/individual/lib/libXres-1.2.3.tar.xz
 mirror://xorg/individual/lib/libXScrnSaver-1.2.5.tar.xz

From dc3924074b2175db56982efa3f69b501c25bd970 Mon Sep 17 00:00:00 2001
From: Lucy <git@lucy.giving>
Date: Tue, 23 Sep 2025 12:01:43 +0200
Subject: [PATCH 0149/6226] python3Packages.psutil: 7.0.0 -> 7.1.0

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

diff --git a/pkgs/development/python-modules/psutil/default.nix b/pkgs/development/python-modules/psutil/default.nix
index 76f178a3d65f..20e3bf06c1d3 100644
--- a/pkgs/development/python-modules/psutil/default.nix
+++ b/pkgs/development/python-modules/psutil/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "psutil";
-  version = "7.0.0";
+  version = "7.1.0";
   pyproject = true;
 
   inherit stdenv;
@@ -20,7 +20,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-e+nD66OL7Mtkleozr9mCpEB0t48oxDSh9RzAf9MVxFY=";
+    hash = "sha256-ZVcIs8BpOHyLd7By/EKaV9DiFCIdAcCnct99/tyzvNI=";
   };
 
   postPatch = ''

From 512533926e3e93025da420bb444a88d080374db8 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 23 Aug 2025 15:48:45 +0200
Subject: [PATCH 0150/6226] libxpresent: refactor, move to pkgs/by-name and
 rename from xorg.libXpresent

relevant changes:
- add a few propagatedBuildInputs that are includes of libxpresents
  header file
---
 pkgs/by-name/li/libxpresent/package.nix       | 69 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 44 +-----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  9 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 74 insertions(+), 52 deletions(-)
 create mode 100644 pkgs/by-name/li/libxpresent/package.nix

diff --git a/pkgs/by-name/li/libxpresent/package.nix b/pkgs/by-name/li/libxpresent/package.nix
new file mode 100644
index 000000000000..10145497ef1d
--- /dev/null
+++ b/pkgs/by-name/li/libxpresent/package.nix
@@ -0,0 +1,69 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  libxfixes,
+  libxrandr,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxpresent";
+  version = "1.0.2";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXpresent-${finalAttrs.version}.tar.xz";
+    hash = "sha256-TlshtIEiBqSyIwE2Bq4xFwUCwQQwOHd6Hvj3DAnTdgI=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+    libxfixes
+    libxrandr
+  ];
+
+  propagatedBuildInputs = [
+    xorgproto
+    # header includes dependencies
+    libxfixes
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXpresent \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "library for the X Present Extension";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxpresent";
+    license = with lib.licenses; [
+      hpndSellVariant
+      mit
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "xpresent" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 05a46b3329f4..572f15f35773 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -65,6 +65,7 @@
   libxmu,
   libxp,
   libxpm,
+  libxpresent,
   libxrandr,
   libxrender,
   libxt,
@@ -232,6 +233,7 @@ self: with self; {
   libXmu = libxmu;
   libXp = libxp;
   libXpm = libxpm;
+  libXpresent = libxpresent;
   libXrandr = libxrandr;
   libXrender = libxrender;
   libXt = libxt;
@@ -1053,48 +1055,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXpresent = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXext,
-      libXfixes,
-      libXrandr,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXpresent";
-      version = "1.0.2";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXpresent-1.0.2.tar.xz";
-        sha256 = "00knsc4hrxzq3rx7ff1h0k0h418p66p0cdh14fra81i2h6s22nsf";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXext
-        libXfixes
-        libXrandr
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xpresent" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXres = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 0e3d2e3123c3..3df582b38470 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -76,6 +76,7 @@ $pcMap{"xmu"} = "libXmu";
 $pcMap{"xmuu"} = "libXmu";
 $pcMap{"xp"} = "libXp";
 $pcMap{"xpm"} = "libXpm";
+$pcMap{"xpresent"} = "libXpresent";
 $pcMap{"xrandr"} = "libXrandr";
 $pcMap{"xrender"} = "libXrender";
 $pcMap{"xt"} = "libXt";
@@ -389,6 +390,7 @@ print OUT <<EOF;
   libxmu,
   libxp,
   libxpm,
+  libxpresent,
   libxrandr,
   libxrender,
   libxt,
@@ -556,6 +558,7 @@ self: with self; {
   libXmu = libxmu;
   libXp = libxp;
   libXpm = libxpm;
+  libXpresent = libxpresent;
   libXrandr = libxrandr;
   libXrender = libxrender;
   libXt = libxt;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 55330fbc087f..a42f0b4e69eb 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -205,15 +205,6 @@ self: super:
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
   });
 
-  libXpresent = super.libXpresent.overrideAttrs (attrs: {
-    buildInputs = attrs.buildInputs ++ [
-      xorg.libXext
-      xorg.libXfixes
-      xorg.libXrandr
-    ];
-    propagatedBuildInputs = attrs.propagatedBuildInputs or [ ] ++ [ xorg.libXfixes ];
-  });
-
   libxkbfile = super.libxkbfile.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index b1d1981dbe40..91981e66bc43 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -87,7 +87,6 @@ mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXinerama-1.1.5.tar.xz
 mirror://xorg/individual/lib/libxkbfile-1.1.3.tar.xz
-mirror://xorg/individual/lib/libXpresent-1.0.2.tar.xz
 mirror://xorg/individual/lib/libXres-1.2.3.tar.xz
 mirror://xorg/individual/lib/libXScrnSaver-1.2.5.tar.xz
 mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz

From 741655d77aa56cd6d548d4300cabe714653de98e Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 23 Aug 2025 16:07:31 +0200
Subject: [PATCH 0151/6226] libxres: refactor, move to pkgs/by-name and rename
 from xorg.libXres

---
 pkgs/by-name/li/libxres/package.nix           | 62 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +-----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           | 10 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 67 insertions(+), 49 deletions(-)
 create mode 100644 pkgs/by-name/li/libxres/package.nix

diff --git a/pkgs/by-name/li/libxres/package.nix b/pkgs/by-name/li/libxres/package.nix
new file mode 100644
index 000000000000..1dbf4c937f6c
--- /dev/null
+++ b/pkgs/by-name/li/libxres/package.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxres";
+  version = "1.2.3";
+  outputs = [
+    "out"
+    "dev"
+    "devdoc"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXres-${finalAttrs.version}.tar.xz";
+    hash = "sha256-0t6PVAHWyGqJknkWVFR+uN71hd/cDAjMFuJO9q7radw=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+  ];
+
+  propagatedBuildInputs = [ xorgproto ];
+
+  configureFlags = lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--enable-malloc0returnsnull";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXres \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X-Resource extension client library";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxres";
+    license = lib.licenses.x11;
+    maintainers = [ ];
+    pkgConfigModules = [ "xres" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 572f15f35773..241955383f00 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -68,6 +68,7 @@
   libxpresent,
   libxrandr,
   libxrender,
+  libxres,
   libxt,
   libxv,
   libxvmc,
@@ -236,6 +237,7 @@ self: with self; {
   libXpresent = libxpresent;
   libXrandr = libxrandr;
   libXrender = libxrender;
+  libXres = libxres;
   libXt = libxt;
   libXv = libxv;
   libXvMC = libxvmc;
@@ -1055,44 +1057,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXres = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXext,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXres";
-      version = "1.2.3";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXres-1.2.3.tar.xz";
-        sha256 = "1p39xfpgckp22v60h36wvy2zbpmqgra585krja4nmj6n05a8zpnj";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXext
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xres" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXtst = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 3df582b38470..ff662e0f4be9 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -79,6 +79,7 @@ $pcMap{"xpm"} = "libXpm";
 $pcMap{"xpresent"} = "libXpresent";
 $pcMap{"xrandr"} = "libXrandr";
 $pcMap{"xrender"} = "libXrender";
+$pcMap{"xres"} = "libXres";
 $pcMap{"xt"} = "libXt";
 $pcMap{"xtrans"} = "xtrans";
 $pcMap{"xv"} = "libXv";
@@ -393,6 +394,7 @@ print OUT <<EOF;
   libxpresent,
   libxrandr,
   libxrender,
+  libxres,
   libxt,
   libxv,
   libxvmc,
@@ -561,6 +563,7 @@ self: with self; {
   libXpresent = libxpresent;
   libXrandr = libxrandr;
   libXrender = libxrender;
+  libXres = libxres;
   libXt = libxt;
   libXv = libxv;
   libXvMC = libxvmc;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index a42f0b4e69eb..c67a93cebc87 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -190,16 +190,6 @@ self: super:
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
   });
 
-  libXres = super.libXres.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-      "devdoc"
-    ];
-    buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ];
-    configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
-  });
-
   libXScrnSaver = super.libXScrnSaver.overrideAttrs (attrs: {
     buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ];
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 91981e66bc43..126b1507e7a7 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -87,7 +87,6 @@ mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXinerama-1.1.5.tar.xz
 mirror://xorg/individual/lib/libxkbfile-1.1.3.tar.xz
-mirror://xorg/individual/lib/libXres-1.2.3.tar.xz
 mirror://xorg/individual/lib/libXScrnSaver-1.2.5.tar.xz
 mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz
 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2

From ab945fb3310d1a61f5ac38d333441443179314ad Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 23 Aug 2025 21:13:14 +0200
Subject: [PATCH 0152/6226] libxscrnsaver: refactor, move to pkgs/by-name and
 rename from xorg.libxscrnsaver

---
 pkgs/by-name/li/libxscrnsaver/package.nix     | 57 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  5 --
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 62 insertions(+), 44 deletions(-)
 create mode 100644 pkgs/by-name/li/libxscrnsaver/package.nix

diff --git a/pkgs/by-name/li/libxscrnsaver/package.nix b/pkgs/by-name/li/libxscrnsaver/package.nix
new file mode 100644
index 000000000000..e6a716365638
--- /dev/null
+++ b/pkgs/by-name/li/libxscrnsaver/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxscrnsaver";
+  version = "1.2.5";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXScrnSaver-${finalAttrs.version}.tar.xz";
+    hash = "sha256-UFc2X4RyU+DidYcUQeEP94RsgyKl2I4eGH0ybeHNjQA=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+  ];
+
+  propagatedBuildInputs = [ xorgproto ];
+
+  configureFlags = lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--enable-malloc0returnsnull";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXScrnSaver \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "X11 Screen Saver extension client library";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxscrnsaver";
+    license = lib.licenses.x11;
+    maintainers = [ ];
+    pkgConfigModules = [ "xscrnsaver" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 241955383f00..36eeac74ab32 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -69,6 +69,7 @@
   libxrandr,
   libxrender,
   libxres,
+  libxscrnsaver,
   libxt,
   libxv,
   libxvmc,
@@ -238,6 +239,7 @@ self: with self; {
   libXrandr = libxrandr;
   libXrender = libxrender;
   libXres = libxres;
+  libXScrnSaver = libxscrnsaver;
   libXt = libxt;
   libXv = libxv;
   libXvMC = libxvmc;
@@ -941,44 +943,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXScrnSaver = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXext,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXScrnSaver";
-      version = "1.2.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXScrnSaver-1.2.5.tar.xz";
-        sha256 = "004drphnsckx30g8xn554a1nr17p1zhl2547fpif0lvjhigkcmsh";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXext
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xscrnsaver" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXTrap = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index ff662e0f4be9..958a76b60c98 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -80,6 +80,7 @@ $pcMap{"xpresent"} = "libXpresent";
 $pcMap{"xrandr"} = "libXrandr";
 $pcMap{"xrender"} = "libXrender";
 $pcMap{"xres"} = "libXres";
+$pcMap{"xscrnsaver"} = "libXScrnSaver";
 $pcMap{"xt"} = "libXt";
 $pcMap{"xtrans"} = "xtrans";
 $pcMap{"xv"} = "libXv";
@@ -395,6 +396,7 @@ print OUT <<EOF;
   libxrandr,
   libxrender,
   libxres,
+  libxscrnsaver,
   libxt,
   libxv,
   libxvmc,
@@ -564,6 +566,7 @@ self: with self; {
   libXrandr = libxrandr;
   libXrender = libxrender;
   libXres = libxres;
+  libXScrnSaver = libxscrnsaver;
   libXt = libxt;
   libXv = libxv;
   libXvMC = libxvmc;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index c67a93cebc87..0a3da33ecd2e 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -190,11 +190,6 @@ self: super:
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
   });
 
-  libXScrnSaver = super.libXScrnSaver.overrideAttrs (attrs: {
-    buildInputs = attrs.buildInputs ++ [ xorg.utilmacros ];
-    configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
-  });
-
   libxkbfile = super.libxkbfile.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 126b1507e7a7..1ea2ace0bf53 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -87,7 +87,6 @@ mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXinerama-1.1.5.tar.xz
 mirror://xorg/individual/lib/libxkbfile-1.1.3.tar.xz
-mirror://xorg/individual/lib/libXScrnSaver-1.2.5.tar.xz
 mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz
 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz

From b96325543a358a168dc1a7c0f2dcac02a7642dfd Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 27 Aug 2025 04:07:45 +0200
Subject: [PATCH 0153/6226] font-bitstream-100dpi: refactor, move to
 pkgs/by-name and rename from xorg.fontbitstream100dpi

the package output doesn't change
---
 .../fo/font-bitstream-100dpi/package.nix      | 56 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 60 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-bitstream-100dpi/package.nix

diff --git a/pkgs/by-name/fo/font-bitstream-100dpi/package.nix b/pkgs/by-name/fo/font-bitstream-100dpi/package.nix
new file mode 100644
index 000000000000..70bdb81636af
--- /dev/null
+++ b/pkgs/by-name/fo/font-bitstream-100dpi/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  font-util,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-bitstream-100dpi";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-bitstream-100dpi-${finalAttrs.version}.tar.xz";
+    hash = "sha256-LRzGgu/k9+vfX72Ilh2MoysnKZaHKGM96iChYnaQwac=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    bdftopcf
+    mkfontscale
+  ];
+
+  buildInputs = [ font-util ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Bitstream Charter and Terminal 100dpi pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/bitstream-100dpi";
+    license = with lib.licenses; [
+      hpnd
+      # TODO: change this license or remove this comment when
+      # https://github.com/spdx/license-list-XML/issues/2824
+      # gets resolved
+      xfig
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 8d98269160a1..a8b8c67d084f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -15,6 +15,7 @@
   font-bh-lucidatypewriter-75dpi,
   font-bh-ttf,
   font-bh-type1,
+  font-bitstream-100dpi,
   font-cronyx-cyrillic,
   font-encodings,
   font-isas-misc,
@@ -197,6 +198,7 @@ self: with self; {
   fontbhlucidatypewriter75dpi = font-bh-lucidatypewriter-75dpi;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
+  fontbitstream100dpi = font-bitstream-100dpi;
   fontcronyxcyrillic = font-cronyx-cyrillic;
   fontisasmisc = font-isas-misc;
   fontmicromisc = font-micro-misc;
@@ -390,46 +392,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontbitstream100dpi = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-bitstream-100dpi";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-bitstream-100dpi-1.0.4.tar.xz";
-        sha256 = "19y1j1v65890x8yn6a47jqljfax3ihfrd25xbzgypxz4xy1cc71d";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontbitstream75dpi = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 0eed02f53618..d6ab785a0067 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -338,6 +338,7 @@ print OUT <<EOF;
   font-bh-lucidatypewriter-75dpi,
   font-bh-ttf,
   font-bh-type1,
+  font-bitstream-100dpi,
   font-cronyx-cyrillic,
   font-encodings,
   font-isas-misc,
@@ -520,6 +521,7 @@ self: with self; {
   fontbhlucidatypewriter75dpi = font-bh-lucidatypewriter-75dpi;
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
+  fontbitstream100dpi = font-bitstream-100dpi;
   fontcronyxcyrillic = font-cronyx-cyrillic;
   fontisasmisc = font-isas-misc;
   fontmicromisc = font-micro-misc;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 273dacebc710..e6abe0602c9f 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -74,7 +74,6 @@ mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz
 mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2
 mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bitstream-75dpi-1.0.4.tar.xz
-mirror://xorg/individual/font/font-bitstream-100dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bitstream-speedo-1.0.2.tar.gz
 mirror://xorg/individual/font/font-bitstream-type1-1.0.4.tar.xz
 mirror://xorg/individual/font/font-cursor-misc-1.0.4.tar.xz

From e6a9281e35e2135f333717a1abcec32b939643f5 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 27 Aug 2025 04:12:56 +0200
Subject: [PATCH 0154/6226] font-bitstream-75dpi: refactor, move to
 pkgs/by-name and rename from xorg.fontbitstream75dpi

the package output doesn't change
---
 .../fo/font-bitstream-75dpi/package.nix       | 56 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 4 files changed, 60 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-bitstream-75dpi/package.nix

diff --git a/pkgs/by-name/fo/font-bitstream-75dpi/package.nix b/pkgs/by-name/fo/font-bitstream-75dpi/package.nix
new file mode 100644
index 000000000000..acdae17bca71
--- /dev/null
+++ b/pkgs/by-name/fo/font-bitstream-75dpi/package.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  font-util,
+  bdftopcf,
+  mkfontscale,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-bitstream-75dpi";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-bitstream-75dpi-${finalAttrs.version}.tar.xz";
+    hash = "sha256-qus02HQkqcKwzw6FkHBMkMtbQsajtqDvnkZ273c7+CY=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    bdftopcf
+    mkfontscale
+  ];
+
+  buildInputs = [ font-util ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Bitstream Charter and Terminal 75dpi pcf fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/bitstream-75dpi";
+    license = with lib.licenses; [
+      hpnd
+      # TODO: change this license or remove this comment when
+      # https://github.com/spdx/license-list-XML/issues/2824
+      # gets resolved
+      xfig
+    ];
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index a8b8c67d084f..01e94ad1bc94 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -16,6 +16,7 @@
   font-bh-ttf,
   font-bh-type1,
   font-bitstream-100dpi,
+  font-bitstream-75dpi,
   font-cronyx-cyrillic,
   font-encodings,
   font-isas-misc,
@@ -199,6 +200,7 @@ self: with self; {
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
   fontbitstream100dpi = font-bitstream-100dpi;
+  fontbitstream75dpi = font-bitstream-75dpi;
   fontcronyxcyrillic = font-cronyx-cyrillic;
   fontisasmisc = font-isas-misc;
   fontmicromisc = font-micro-misc;
@@ -392,46 +394,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontbitstream75dpi = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      bdftopcf,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-bitstream-75dpi";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-bitstream-75dpi-1.0.4.tar.xz";
-        sha256 = "09pq7dvyyxj6kvps1dm3qr15pjwh9iq9118fryqc5a94fkc39sxa";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        bdftopcf
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontbitstreamspeedo = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index d6ab785a0067..9e968dfb4c5a 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -339,6 +339,7 @@ print OUT <<EOF;
   font-bh-ttf,
   font-bh-type1,
   font-bitstream-100dpi,
+  font-bitstream-75dpi,
   font-cronyx-cyrillic,
   font-encodings,
   font-isas-misc,
@@ -522,6 +523,7 @@ self: with self; {
   fontbhttf = font-bh-ttf;
   fontbhtype1 = font-bh-type1;
   fontbitstream100dpi = font-bitstream-100dpi;
+  fontbitstream75dpi = font-bitstream-75dpi;
   fontcronyxcyrillic = font-cronyx-cyrillic;
   fontisasmisc = font-isas-misc;
   fontmicromisc = font-micro-misc;
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index e6abe0602c9f..a28379e51362 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -73,7 +73,6 @@ mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz
 mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2
 mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz
-mirror://xorg/individual/font/font-bitstream-75dpi-1.0.4.tar.xz
 mirror://xorg/individual/font/font-bitstream-speedo-1.0.2.tar.gz
 mirror://xorg/individual/font/font-bitstream-type1-1.0.4.tar.xz
 mirror://xorg/individual/font/font-cursor-misc-1.0.4.tar.xz

From 9549cb44ea45b23c94122e2239de804be92377fb Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 27 Aug 2025 04:21:19 +0200
Subject: [PATCH 0155/6226] xorg.fontbitstreamspeedo: drop

---
 pkgs/servers/x11/xorg/default.nix   | 38 -----------------------------
 pkgs/servers/x11/xorg/overrides.nix |  6 +++++
 pkgs/servers/x11/xorg/tarballs.list |  1 -
 3 files changed, 6 insertions(+), 39 deletions(-)

diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 01e94ad1bc94..1c2bdcede515 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -394,44 +394,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontbitstreamspeedo = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-bitstream-speedo";
-      version = "1.0.2";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-bitstream-speedo-1.0.2.tar.gz";
-        sha256 = "0wmy58cd3k7w2j4v20icnfs8z3b61qj3vqdx958z18w00h9mzsmf";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontbitstreamtype1 = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 717a4d81f91a..a805b53477e9 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -1,6 +1,7 @@
 {
   callPackage,
   lib,
+  config,
   stdenv,
   makeWrapper,
   fetchurl,
@@ -919,3 +920,8 @@ self: super:
   mapNamesToAttrs (setLicense lib.licenses.unfreeRedistributable) redist
   // mapNamesToAttrs (setLicense lib.licenses.unfree) unfree
 )
+
+# deprecate some packages
+// lib.optionalAttrs config.allowAliases {
+  fontbitstreamspeedo = throw "Bitstream Speedo is an obsolete font format that hasn't been supported by Xorg since 2005";
+}
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index a28379e51362..608ee10df38a 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -73,7 +73,6 @@ mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz
 mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2
 mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz
-mirror://xorg/individual/font/font-bitstream-speedo-1.0.2.tar.gz
 mirror://xorg/individual/font/font-bitstream-type1-1.0.4.tar.xz
 mirror://xorg/individual/font/font-cursor-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-daewoo-misc-1.0.4.tar.xz

From 4c4fd26ced7988897342f6386cc73af6d267c227 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 27 Aug 2025 04:43:53 +0200
Subject: [PATCH 0156/6226] font-bitstream-type1: refactor, move to
 pkgs/by-name and rename from xorg.fontbitstreamtype1

the package output doesn't change
---
 lib/licenses.nix                              |  5 ++
 .../fo/font-bitstream-type1/package.nix       | 60 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           | 21 -------
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 6 files changed, 69 insertions(+), 60 deletions(-)
 create mode 100644 pkgs/by-name/fo/font-bitstream-type1/package.nix

diff --git a/lib/licenses.nix b/lib/licenses.nix
index b736baf7c5fa..62796ef1963e 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -167,6 +167,11 @@ lib.mapAttrs mkLicense (
       fullName = "Apache License 2.0";
     };
 
+    bitstreamCharter = {
+      spdxId = "Bitstream-Charter";
+      fullName = "Bitstream Charter Font License";
+    };
+
     bitstreamVera = {
       spdxId = "Bitstream-Vera";
       fullName = "Bitstream Vera Font License";
diff --git a/pkgs/by-name/fo/font-bitstream-type1/package.nix b/pkgs/by-name/fo/font-bitstream-type1/package.nix
new file mode 100644
index 000000000000..3e3d1eb6c35e
--- /dev/null
+++ b/pkgs/by-name/fo/font-bitstream-type1/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  mkfontscale,
+  fontforge,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "font-bitstream-type1";
+  version = "1.0.4";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/font/font-bitstream-type1-${finalAttrs.version}.tar.xz";
+    hash = "sha256-3i8ji0zXLbQiigumeCnXait8A54imT1mpyLuOFJIxig=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    mkfontscale
+    fontforge
+  ];
+
+  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+
+  postBuild = ''
+    # convert Postscript (Type 1) font to otf
+    for i in $(find -type f -name '*.pfa' -o -name '*.pfb'); do
+        name=$(basename $i | cut -d. -f1)
+        fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$name.otf\")"
+    done
+  '';
+
+  postInstall = ''
+    # install the otf fonts
+    fontDir="$out/lib/X11/fonts/misc"
+    install -Dm444 -t "$fontDir" *.otf
+    mkfontscale "$fontDir"
+  '';
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/font/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Bitstream Charter PostScript Type 1 and OpenType fonts";
+    homepage = "https://gitlab.freedesktop.org/xorg/font/bitstream-type1";
+    license = lib.licenses.bitstreamCharter;
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 1c2bdcede515..dc45ac9dc183 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -17,6 +17,7 @@
   font-bh-type1,
   font-bitstream-100dpi,
   font-bitstream-75dpi,
+  font-bitstream-type1,
   font-cronyx-cyrillic,
   font-encodings,
   font-isas-misc,
@@ -201,6 +202,7 @@ self: with self; {
   fontbhtype1 = font-bh-type1;
   fontbitstream100dpi = font-bitstream-100dpi;
   fontbitstream75dpi = font-bitstream-75dpi;
+  fontbitstreamtype1 = font-bitstream-type1;
   fontcronyxcyrillic = font-cronyx-cyrillic;
   fontisasmisc = font-isas-misc;
   fontmicromisc = font-micro-misc;
@@ -394,44 +396,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  fontbitstreamtype1 = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      fontutil,
-      mkfontscale,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "font-bitstream-type1";
-      version = "1.0.4";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/font/font-bitstream-type1-1.0.4.tar.xz";
-        sha256 = "0a669193ivi2lxk3v692kq1pqavaswlpi9hbi8ib8bfp9j5j6byy";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        mkfontscale
-      ];
-      buildInputs = [ fontutil ];
-      configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-      postPatch = ''substituteInPlace configure --replace 'MAPFILES_PATH=`pkg-config' 'MAPFILES_PATH=`$PKG_CONFIG' '';
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   fontcursormisc = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 9e968dfb4c5a..6e3c4e8b748a 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -340,6 +340,7 @@ print OUT <<EOF;
   font-bh-type1,
   font-bitstream-100dpi,
   font-bitstream-75dpi,
+  font-bitstream-type1,
   font-cronyx-cyrillic,
   font-encodings,
   font-isas-misc,
@@ -524,6 +525,7 @@ self: with self; {
   fontbhtype1 = font-bh-type1;
   fontbitstream100dpi = font-bitstream-100dpi;
   fontbitstream75dpi = font-bitstream-75dpi;
+  fontbitstreamtype1 = font-bitstream-type1;
   fontcronyxcyrillic = font-cronyx-cyrillic;
   fontisasmisc = font-isas-misc;
   fontmicromisc = font-micro-misc;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index a805b53477e9..1952faf1bd14 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -866,27 +866,6 @@ self: super:
   });
 
   xwd = addMainProgram super.xwd { };
-
-  # convert Type1 vector fonts to OpenType fonts
-  fontbitstreamtype1 = super.fontbitstreamtype1.overrideAttrs (attrs: {
-    nativeBuildInputs = attrs.nativeBuildInputs ++ [ fontforge ];
-
-    postBuild = ''
-      # convert Postscript (Type 1) font to otf
-      for i in $(find -type f -name '*.pfa' -o -name '*.pfb'); do
-          name=$(basename $i | cut -d. -f1)
-          fontforge -lang=ff -c "Open(\"$i\"); Generate(\"$name.otf\")"
-      done
-    '';
-
-    postInstall = ''
-      # install the otf fonts
-      fontDir="$out/lib/X11/fonts/misc/"
-      install -D -m 644 -t "$fontDir" *.otf
-      mkfontscale "$fontDir"
-    '';
-  });
-
 }
 
 # mark some packages as unfree
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 608ee10df38a..72b4d6c32879 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -73,7 +73,6 @@ mirror://xorg/individual/driver/xf86-video-vmware-13.4.0.tar.xz
 mirror://xorg/individual/driver/xf86-video-voodoo-1.2.6.tar.xz
 mirror://xorg/individual/driver/xf86-video-wsfb-0.4.0.tar.bz2
 mirror://xorg/individual/font/font-arabic-misc-1.0.4.tar.xz
-mirror://xorg/individual/font/font-bitstream-type1-1.0.4.tar.xz
 mirror://xorg/individual/font/font-cursor-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-daewoo-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-dec-misc-1.0.4.tar.xz

From 137e0f3d5e9f2fca93632a39e452f3f32ab54e46 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 23 Sep 2025 22:26:27 +0100
Subject: [PATCH 0157/6226] coreutils: 9.7 -> 9.8

Changes: https://lists.gnu.org/archive/html/coreutils-announce/2025-09/msg00000.html
---
 pkgs/tools/misc/coreutils/CVE-2025-5278.patch |  69 ------
 pkgs/tools/misc/coreutils/default.nix         |  15 +-
 ...loat-h-tests-port-to-C23-PowerPC-GCC.patch | 230 ------------------
 3 files changed, 2 insertions(+), 312 deletions(-)
 delete mode 100644 pkgs/tools/misc/coreutils/CVE-2025-5278.patch
 delete mode 100644 pkgs/tools/misc/coreutils/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch

diff --git a/pkgs/tools/misc/coreutils/CVE-2025-5278.patch b/pkgs/tools/misc/coreutils/CVE-2025-5278.patch
deleted file mode 100644
index 197a77020fe2..000000000000
--- a/pkgs/tools/misc/coreutils/CVE-2025-5278.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 8c9602e3a145e9596dc1a63c6ed67865814b6633 Mon Sep 17 00:00:00 2001
-From: Pádraig Brady <P@draigBrady.com>
-Date: Tue, 20 May 2025 16:03:44 +0100
-Subject: sort: fix buffer under-read (CWE-127)
-
-* src/sort.c (begfield): Check pointer adjustment
-to avoid Out-of-range pointer offset (CWE-823).
-(limfield): Likewise.
-* tests/sort/sort-field-limit.sh: Add a new test,
-which triggers with ASAN or Valgrind.
-* tests/local.mk: Reference the new test.
-* NEWS: Mention bug fix introduced in v7.2 (2009).
-Fixes https://bugs.gnu.org/78507
----
- NEWS                           |  5 +++++
- src/sort.c                     | 12 ++++++++++--
- tests/local.mk                 |  1 +
- tests/sort/sort-field-limit.sh | 35 +++++++++++++++++++++++++++++++++++
- 4 files changed, 51 insertions(+), 2 deletions(-)
- create mode 100755 tests/sort/sort-field-limit.sh
-
-The new tests is NOT added in NixOS.
-
-diff --git a/NEWS b/NEWS
-index 6ff403206..923aa72f8 100644
---- a/NEWS
-+++ b/NEWS
-@@ -8,6 +8,11 @@ GNU coreutils NEWS                                    -*- outline -*-
-   copying to non-NFS files from NFSv4 files with trivial ACLs.
-   [bug introduced in coreutils-9.6]
- 
-+  sort with key character offsets of SIZE_MAX, could induce
-+  a read of 1 byte before an allocated heap buffer. For example:
-+  'sort +0.18446744073709551615R input' on 64 bit systems.
-+  [bug introduced in coreutils-7.2]
-+
- 
- * Noteworthy changes in release 9.7 (2025-04-09) [stable]
- 
-diff --git a/src/sort.c b/src/sort.c
-index b10183b6f..7af1a2512 100644
---- a/src/sort.c
-+++ b/src/sort.c
-@@ -1644,7 +1644,11 @@ begfield (struct line const *line, struct keyfield const *key)
-       ++ptr;
- 
-   /* Advance PTR by SCHAR (if possible), but no further than LIM.  */
--  ptr = MIN (lim, ptr + schar);
-+  size_t remaining_bytes = lim - ptr;
-+  if (schar < remaining_bytes)
-+    ptr += schar;
-+  else
-+    ptr = lim;
- 
-   return ptr;
- }
-@@ -1746,7 +1750,11 @@ limfield (struct line const *line, struct keyfield const *key)
-           ++ptr;
- 
-       /* Advance PTR by ECHAR (if possible), but no further than LIM.  */
--      ptr = MIN (lim, ptr + echar);
-+      size_t remaining_bytes = lim - ptr;
-+      if (echar < remaining_bytes)
-+        ptr += echar;
-+      else
-+        ptr = lim;
-     }
- 
-   return ptr;
diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 57fb400332af..07b17ff8ed55 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -48,24 +48,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "coreutils" + (optionalString (!minimal) "-full");
-  version = "9.7";
+  version = "9.8";
 
   src = fetchurl {
     url = "mirror://gnu/coreutils/coreutils-${version}.tar.xz";
-    hash = "sha256-6LsmrQKT+bWh/EP7QrqXDjEsZs6SwbCxZxPXUA2yUb8=";
+    hash = "sha256-5tT9LYUskUGhwqGKE9FGoM1+RRlfcik6TkwETsbMyhU=";
   };
 
-  patches = [
-    # Heap buffer overflow that's been here since coreutils 7.2 in 2009:
-    # https://www.openwall.com/lists/oss-security/2025/05/27/2
-    ./CVE-2025-5278.patch
-
-    # Fixes test-float-h failure on ppc64 with C23
-    # https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00021.html
-    # Multiple upstream commits squashed with adjustments, see header
-    ./gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch
-  ];
-
   postPatch = ''
     # The test tends to fail on btrfs, f2fs and maybe other unusual filesystems.
     sed '2i echo Skipping dd sparse test && exit 77' -i ./tests/dd/sparse.sh
diff --git a/pkgs/tools/misc/coreutils/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch b/pkgs/tools/misc/coreutils/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch
deleted file mode 100644
index 1b1e210efadd..000000000000
--- a/pkgs/tools/misc/coreutils/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch
+++ /dev/null
@@ -1,230 +0,0 @@
-Applies the following incremental gnulib commits:
-
-- 55a366a06fbd98bf13adc531579e3513cee97a32
-- 65ed9d3b24ad09fd61d326c83e7f1b05f6e9d65f
-- ce8e9de0bf34bc63dffc67ab384334c509175f64
-- 6164b4cb0887b5331a4e64449107decd37d32735
-
-With adjustments specific to the structure & differences in coreutils:
-
-- gnulib code is split across lib and gnulib-tests
-- A Makefile.in is used for the test flags instead of the fancy automake modules
-  in the upstream gnulib project, so we add -lm to the float test there.
-  Surrounding texts in this file are slightly different in every project.
----
-diff '--color=auto' -ruN a/gnulib-tests/Makefile.in b/gnulib-tests/Makefile.in
---- a/gnulib-tests/Makefile.in	2025-04-09 10:05:54.000000000 +0000
-+++ b/gnulib-tests/Makefile.in	2025-07-09 10:00:23.767927263 +0000
-@@ -1496,7 +1496,7 @@
- 	$(am__DEPENDENCIES_1)
- test_float_h_SOURCES = test-float-h.c
- test_float_h_OBJECTS = test-float-h.$(OBJEXT)
--test_float_h_LDADD = $(LDADD)
-+test_float_h_LDADD = $(LDADD) -lm
- test_float_h_DEPENDENCIES = libtests.a ../lib/libcoreutils.a \
- 	libtests.a ../lib/libcoreutils.a libtests.a \
- 	$(am__DEPENDENCIES_1)
-diff '--color=auto' -ruN a/gnulib-tests/test-float-h.c b/gnulib-tests/test-float-h.c
---- a/gnulib-tests/test-float-h.c	2025-01-01 09:32:30.000000000 +0000
-+++ b/gnulib-tests/test-float-h.c	2025-07-09 10:00:13.837937094 +0000
-@@ -101,6 +101,8 @@
- 
- /* ------------------------------------------------------------------------- */
- 
-+#include <math.h>
-+
- #include "fpucw.h"
- #include "isnanf-nolibm.h"
- #include "isnand-nolibm.h"
-@@ -396,6 +398,44 @@
- 
- /* -------------------- Check macros for 'long double' -------------------- */
- 
-+static int
-+test_isfinitel (long double volatile x)
-+{
-+  if (x != x)
-+    return 0;
-+  long double volatile zero = x * 0;
-+  return zero == 0;
-+}
-+
-+/* Return X after normalization.  This makes a difference on platforms
-+   where long double can represent unnormalized values.  For example,
-+   suppose x = 1 + 2**-106 on PowerPC with IBM long double where
-+   FLT_RADIX = 2, LDBL_MANT_DIG = 106, and LDBL_EPSILON = 2**-105.
-+   Then 1 < x < 1 + LDBL_EPSILON, and normalize_long_double (x) returns 1.  */
-+static long double
-+normalize_long_double (long double volatile x)
-+{
-+  if (FLT_RADIX == 2 && test_isfinitel (x))
-+    {
-+      int xexp;
-+      long double volatile
-+        frac = frexpl (x, &xexp),
-+        significand = frac * pow2l (LDBL_MANT_DIG),
-+        normalized_significand = truncl (significand),
-+        normalized_x = normalized_significand * pow2l (xexp - LDBL_MANT_DIG);
-+
-+      /* The test_isfinitel defends against PowerPC with IBM long double,
-+         which fritzes out near LDBL_MAX.  */
-+      if (test_isfinitel (normalized_x))
-+        x = normalized_x;
-+    }
-+  else
-+    {
-+      /* Hope that X is already normalized.  */
-+    }
-+  return x;
-+}
-+
- static void
- test_long_double (void)
- {
-@@ -455,7 +495,7 @@
-     for (n = 0; n <= 2 * LDBL_MANT_DIG; n++)
-       {
-         volatile long double half_n = pow2l (- n); /* 2^-n */
--        volatile long double x = me - half_n;
-+        volatile long double x = normalize_long_double (me - half_n);
-         if (x < me)
-           ASSERT (x <= 1.0L);
-       }
-@@ -483,8 +523,12 @@
-   ASSERT (!LDBL_IS_IEC_60559);
- #endif
- 
-+  printf("LDBL_NORM_MAX: %LF\n", LDBL_NORM_MAX);
-+  printf("LDBL_MAX: %LF\n", LDBL_MAX);
-+  printf("normalize_long_double(LDBL_MAX): %LF\n", normalize_long_double(LDBL_MAX));
-+
-   /* Check the value of LDBL_NORM_MAX.  */
--  ASSERT (LDBL_NORM_MAX == LDBL_MAX);
-+  ASSERT (LDBL_NORM_MAX == normalize_long_double (LDBL_MAX));
- 
-   /* Check the value of LDBL_SNAN.  */
-   ASSERT (isnanl (LDBL_SNAN));
-diff '--color=auto' -ruN a/lib/float.c b/lib/float.c
---- a/lib/float.c	2025-01-01 09:32:29.000000000 +0000
-+++ b/lib/float.c	2025-07-09 10:00:13.837937094 +0000
-@@ -23,7 +23,7 @@
- #if GNULIB_defined_long_double_union
- # if (defined _ARCH_PPC || defined _POWER) && (defined _AIX || defined __linux__) && (LDBL_MANT_DIG == 106) && defined __GNUC__
- const union gl_long_double_union gl_LDBL_MAX =
--  { { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL } };
-+  { { DBL_MAX, DBL_MAX / 0x1p53 } };
- # elif defined __i386__
- const union gl_long_double_union gl_LDBL_MAX =
-   { { 0xFFFFFFFF, 0xFFFFFFFF, 32766 } };
-diff '--color=auto' -ruN a/lib/float.in.h b/lib/float.in.h
---- a/lib/float.in.h	2025-01-01 09:32:29.000000000 +0000
-+++ b/lib/float.in.h	2025-07-09 10:00:13.837937094 +0000
-@@ -113,44 +113,38 @@
- # define LDBL_MAX_10_EXP 4932
- #endif
- 
--/* On AIX 7.1 with gcc 4.2, the values of LDBL_MIN_EXP, LDBL_MIN, LDBL_MAX are
--   wrong.
--   On Linux/PowerPC with gcc 4.4, the value of LDBL_MAX is wrong.  */
--#if (defined _ARCH_PPC || defined _POWER) && defined _AIX && (LDBL_MANT_DIG == 106) && defined __GNUC__
-+/* On PowerPC with gcc 15 when using __ibm128 long double, the value of
-+   LDBL_MIN_EXP, LDBL_MIN, LDBL_MAX, and LDBL_NORM_MAX are wrong.  */
-+#if ((defined _ARCH_PPC || defined _POWER) && LDBL_MANT_DIG == 106 \
-+     && defined __GNUC__)
- # undef LDBL_MIN_EXP
- # define LDBL_MIN_EXP DBL_MIN_EXP
- # undef LDBL_MIN_10_EXP
- # define LDBL_MIN_10_EXP DBL_MIN_10_EXP
- # undef LDBL_MIN
- # define LDBL_MIN 2.22507385850720138309023271733240406422e-308L /* DBL_MIN = 2^-1022 */
--#endif
--#if (defined _ARCH_PPC || defined _POWER) && (defined _AIX || defined __linux__) && (LDBL_MANT_DIG == 106) && defined __GNUC__
- # undef LDBL_MAX
--/* LDBL_MAX is represented as { 0x7FEFFFFF, 0xFFFFFFFF, 0x7C8FFFFF, 0xFFFFFFFF }.
--   It is not easy to define:
--     #define LDBL_MAX 1.79769313486231580793728971405302307166e308L
--   is too small, whereas
--     #define LDBL_MAX 1.79769313486231580793728971405302307167e308L
--   is too large.  Apparently a bug in GCC decimal-to-binary conversion.
--   Also, I can't get values larger than
--     #define LDBL63 ((long double) (1ULL << 63))
--     #define LDBL882 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
--     #define LDBL945 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
--     #define LDBL1008 (LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63 * LDBL63)
--     #define LDBL_MAX (LDBL1008 * 65535.0L + LDBL945 * (long double) 9223372036821221375ULL + LDBL882 * (long double) 4611686018427387904ULL)
--   which is represented as { 0x7FEFFFFF, 0xFFFFFFFF, 0x7C8FFFFF, 0xF8000000 }.
--   So, define it like this through a reference to an external variable
-+/* LDBL_MAX is 2**1024 - 2**918, represented as: { 0x7FEFFFFF, 0xFFFFFFFF,
-+                                                   0x7C9FFFFF, 0xFFFFFFFF }.
-+
-+   Do not write it as a constant expression, as GCC would likely treat
-+   that as infinity due to the vagaries of this platform's funky arithmetic.
-+   Instead, define it through a reference to an external variable.
-+   Like the following, but using a union to avoid type mismatches:
- 
--     const double LDBL_MAX[2] = { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL };
-+     const double LDBL_MAX[2] = { DBL_MAX, DBL_MAX / 0x1p53 };
-      extern const long double LDBL_MAX;
- 
--   or through a pointer cast
-+   The following alternative would not work as well when GCC is optimizing:
-+
-+     #define LDBL_MAX (*(long double const *) (double[])
-+                       { DBL_MAX, DBL_MAX / 0x1p53 })
- 
--     #define LDBL_MAX \
--       (*(const long double *) (double[]) { DBL_MAX, DBL_MAX / (double)134217728UL / (double)134217728UL })
-+   The following alternative would require GCC 6 or later:
- 
--   Unfortunately, this is not a constant expression, and the latter expression
--   does not work well when GCC is optimizing..  */
-+     #define LDBL_MAX __builtin_pack_longdouble (DBL_MAX, DBL_MAX / 0x1p53)
-+
-+   Unfortunately none of the alternatives are constant expressions.  */
- # if !GNULIB_defined_long_double_union
- union gl_long_double_union
-   {
-@@ -161,6 +155,8 @@
- # endif
- extern const union gl_long_double_union gl_LDBL_MAX;
- # define LDBL_MAX (gl_LDBL_MAX.ld)
-+# undef LDBL_NORM_MAX
-+# define LDBL_NORM_MAX LDBL_MAX
- #endif
- 
- /* On IRIX 6.5, with cc, the value of LDBL_MANT_DIG is wrong.
-@@ -181,6 +177,21 @@
- # endif
- #endif
- 
-+/* On PowerPC platforms, 'long double' has a double-double representation.
-+   Up to ISO C 17, this was outside the scope of ISO C because it can represent
-+   numbers with mantissas of the form 1.<52 bits><many zeroes><52 bits>, such as
-+   1.0L + 4.94065645841246544176568792868221e-324L = 1 + 2^-1074; see
-+   ISO C 17 § 5.2.4.2.2.(3).
-+   In ISO C 23, wording has been included that makes this 'long double'
-+   representation compliant; see ISO C 23 § 5.2.5.3.3.(8)-(9).  In this setting,
-+   numbers with mantissas of the form 1.<52 bits><many zeroes><52 bits> are
-+   called "unnormalized".  And since LDBL_EPSILON must be normalized (per
-+   ISO C 23 § 5.2.5.3.3.(33)), it must be 2^-105.  */
-+#if defined __powerpc__ && LDBL_MANT_DIG == 106
-+# undef LDBL_EPSILON
-+# define LDBL_EPSILON 2.46519032881566189191165176650870696773e-32L /* 2^-105 */
-+#endif
-+
- /* ============================ ISO C11 support ============================ */
- 
- /* 'float' properties */
-@@ -309,7 +320,11 @@
- # endif
- #endif
- #ifndef LDBL_NORM_MAX
--# define LDBL_NORM_MAX LDBL_MAX
-+# ifdef __LDBL_NORM_MAX__
-+#  define LDBL_NORM_MAX __LDBL_NORM_MAX__
-+# else
-+#  define LDBL_NORM_MAX LDBL_MAX
-+# endif
- #endif
- #ifndef LDBL_SNAN
- /* For sh, beware of <https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111814>.  */

From 8210e54dacdcaa6aa1f7081c381dc79d7eb38e7f Mon Sep 17 00:00:00 2001
From: azahi <azat@bahawi.net>
Date: Tue, 2 Sep 2025 00:15:09 +0300
Subject: [PATCH 0158/6226] tree-sitter: 0.25.6 -> 0.25.10

---
 .../tools/parsing/tree-sitter/default.nix          |  6 +++---
 .../grammars/tree-sitter-beancount.json            | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-bitbake.json  |  3 ++-
 .../tree-sitter/grammars/tree-sitter-bqn.json      |  3 ++-
 .../tree-sitter/grammars/tree-sitter-c-sharp.json  |  3 ++-
 .../tree-sitter/grammars/tree-sitter-clojure.json  | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-cmake.json    |  3 ++-
 .../grammars/tree-sitter-commonlisp.json           |  3 ++-
 .../tree-sitter/grammars/tree-sitter-cpp.json      |  3 ++-
 .../tree-sitter/grammars/tree-sitter-crystal.json  | 14 ++++++++------
 .../tree-sitter/grammars/tree-sitter-css.json      |  3 ++-
 .../tree-sitter/grammars/tree-sitter-cuda.json     | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-cue.json      |  3 ++-
 .../tree-sitter/grammars/tree-sitter-dart.json     |  3 ++-
 .../grammars/tree-sitter-devicetree.json           |  3 ++-
 .../grammars/tree-sitter-dockerfile.json           |  3 ++-
 .../tree-sitter/grammars/tree-sitter-dot.json      |  3 ++-
 .../grammars/tree-sitter-earthfile.json            |  3 ++-
 .../tree-sitter/grammars/tree-sitter-eex.json      |  3 ++-
 .../tree-sitter/grammars/tree-sitter-elisp.json    |  3 ++-
 .../tree-sitter/grammars/tree-sitter-elixir.json   |  3 ++-
 .../tree-sitter/grammars/tree-sitter-elm.json      |  3 ++-
 .../grammars/tree-sitter-embedded-template.json    | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-erlang.json   |  3 ++-
 .../tree-sitter/grammars/tree-sitter-factor.json   |  3 ++-
 .../tree-sitter/grammars/tree-sitter-fennel.json   | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-fish.json     | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-gdscript.json | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-gemini.json   |  3 ++-
 .../tree-sitter/grammars/tree-sitter-gleam.json    | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-glimmer.json  |  3 ++-
 .../tree-sitter/grammars/tree-sitter-glsl.json     |  3 ++-
 .../grammars/tree-sitter-go-template.json          | 10 +++++-----
 .../tree-sitter/grammars/tree-sitter-go.json       | 13 +++++++------
 .../grammars/tree-sitter-godot-resource.json       |  3 ++-
 .../tree-sitter/grammars/tree-sitter-gomod.json    |  3 ++-
 .../tree-sitter/grammars/tree-sitter-gowork.json   |  3 ++-
 .../tree-sitter/grammars/tree-sitter-graphql.json  |  3 ++-
 .../tree-sitter/grammars/tree-sitter-haskell.json  |  3 ++-
 .../tree-sitter/grammars/tree-sitter-heex.json     |  3 ++-
 .../tree-sitter/grammars/tree-sitter-hjson.json    |  3 ++-
 .../tree-sitter/grammars/tree-sitter-html.json     |  3 ++-
 .../tree-sitter/grammars/tree-sitter-http.json     |  3 ++-
 .../grammars/tree-sitter-janet-simple.json         |  3 ++-
 .../tree-sitter/grammars/tree-sitter-java.json     |  3 ++-
 .../grammars/tree-sitter-javascript.json           | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-jsdoc.json    | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-json.json     |  3 ++-
 .../tree-sitter/grammars/tree-sitter-json5.json    | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-jsonnet.json  |  3 ++-
 .../tree-sitter/grammars/tree-sitter-julia.json    |  3 ++-
 .../tree-sitter/grammars/tree-sitter-just.json     |  3 ++-
 .../tree-sitter/grammars/tree-sitter-kdl.json      |  3 ++-
 .../tree-sitter/grammars/tree-sitter-koka.json     | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-kotlin.json   |  3 ++-
 .../tree-sitter/grammars/tree-sitter-latex.json    | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-ledger.json   |  3 ++-
 .../tree-sitter/grammars/tree-sitter-lua.json      |  3 ++-
 .../tree-sitter/grammars/tree-sitter-make.json     |  3 ++-
 .../tree-sitter/grammars/tree-sitter-netlinx.json  |  3 ++-
 .../tree-sitter/grammars/tree-sitter-nickel.json   |  3 ++-
 .../tree-sitter/grammars/tree-sitter-nix.json      | 13 +++++++------
 .../grammars/tree-sitter-norg-meta.json            |  3 ++-
 .../tree-sitter/grammars/tree-sitter-norg.json     |  3 ++-
 .../tree-sitter/grammars/tree-sitter-nu.json       | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-ocaml.json    |  3 ++-
 .../tree-sitter/grammars/tree-sitter-org-nvim.json |  3 ++-
 .../tree-sitter/grammars/tree-sitter-perl.json     |  3 ++-
 .../tree-sitter/grammars/tree-sitter-pgn.json      | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-php.json      | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-pioasm.json   |  3 ++-
 .../tree-sitter/grammars/tree-sitter-prisma.json   |  3 ++-
 .../tree-sitter/grammars/tree-sitter-proto.json    |  3 ++-
 .../tree-sitter/grammars/tree-sitter-pug.json      |  3 ++-
 .../tree-sitter/grammars/tree-sitter-python.json   | 13 +++++++------
 .../grammars/tree-sitter-ql-dbscheme.json          |  3 ++-
 .../tree-sitter/grammars/tree-sitter-ql.json       |  3 ++-
 .../tree-sitter/grammars/tree-sitter-r.json        | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-regex.json    | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-rego.json     |  3 ++-
 .../tree-sitter/grammars/tree-sitter-river.json    |  3 ++-
 .../tree-sitter/grammars/tree-sitter-rst.json      |  3 ++-
 .../tree-sitter/grammars/tree-sitter-ruby.json     |  3 ++-
 .../tree-sitter/grammars/tree-sitter-scala.json    | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-scheme.json   | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-scss.json     |  3 ++-
 .../tree-sitter/grammars/tree-sitter-smithy.json   |  3 ++-
 .../tree-sitter/grammars/tree-sitter-solidity.json |  3 ++-
 .../tree-sitter/grammars/tree-sitter-sparql.json   |  3 ++-
 .../tree-sitter/grammars/tree-sitter-sql.json      | 13 +++++++------
 .../grammars/tree-sitter-supercollider.json        | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-surface.json  |  3 ++-
 .../tree-sitter/grammars/tree-sitter-svelte.json   |  3 ++-
 .../tree-sitter/grammars/tree-sitter-talon.json    |  3 ++-
 .../tree-sitter/grammars/tree-sitter-templ.json    | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-tera.json     | 13 +++++++------
 .../tree-sitter/grammars/tree-sitter-tiger.json    |  3 ++-
 .../tree-sitter/grammars/tree-sitter-tlaplus.json  |  3 ++-
 .../tree-sitter/grammars/tree-sitter-toml.json     |  3 ++-
 .../tree-sitter/grammars/tree-sitter-tsq.json      |  3 ++-
 .../tree-sitter/grammars/tree-sitter-turtle.json   |  3 ++-
 .../tree-sitter/grammars/tree-sitter-twig.json     |  3 ++-
 .../grammars/tree-sitter-typescript.json           |  3 ++-
 .../tree-sitter/grammars/tree-sitter-typst.json    |  3 ++-
 .../tree-sitter/grammars/tree-sitter-uiua.json     |  3 ++-
 .../tree-sitter/grammars/tree-sitter-verilog.json  |  3 ++-
 .../tree-sitter/grammars/tree-sitter-vim.json      |  3 ++-
 .../tree-sitter/grammars/tree-sitter-vue.json      |  3 ++-
 .../tree-sitter/grammars/tree-sitter-wgsl.json     |  3 ++-
 .../tree-sitter/grammars/tree-sitter-wing.json     |  3 ++-
 .../tree-sitter/grammars/tree-sitter-yaml.json     |  3 ++-
 .../tree-sitter/grammars/tree-sitter-yang.json     |  3 ++-
 .../tree-sitter/grammars/tree-sitter-zig.json      |  3 ++-
 113 files changed, 371 insertions(+), 259 deletions(-)

diff --git a/pkgs/development/tools/parsing/tree-sitter/default.nix b/pkgs/development/tools/parsing/tree-sitter/default.nix
index 499942477a8e..5d5447dbc32a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/default.nix
@@ -30,8 +30,8 @@ let
   # 2) nix-build -A tree-sitter.updater.update-all-grammars
   # 3) Set GITHUB_TOKEN env variable to avoid api rate limit (Use a Personal Access Token from https://github.com/settings/tokens It does not need any permissions)
   # 4) run the ./result script that is output by that (it updates ./grammars)
-  version = "0.25.6";
-  hash = "sha256-2/DF2xyiKi5HAqqeGt1TIMvAWFfZgcfVccK4zrTqq88=";
+  version = "0.25.10";
+  hash = "sha256-aHszbvLCLqCwAS4F4UmM3wbSb81QuG9FM7BDHTu1ZvM=";
 
   src = fetchFromGitHub {
     owner = "tree-sitter";
@@ -171,7 +171,7 @@ rustPlatform.buildRustPackage {
   pname = "tree-sitter";
   inherit src version;
 
-  cargoHash = "sha256-sGh16M7cbT5ct1sT2FcUUoIQFcoOftTuQ0aSCjtkTEs=";
+  cargoHash = "sha256-4R5Y9yancbg/w3PhACtsWq0+gieUd2j8YnmEj/5eqkg=";
 
   buildInputs = [
     installShellFiles
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json
index 36bccb90e009..2e65733a096f 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/polarmutex/tree-sitter-beancount",
-  "rev": "321b12d0b02923c36e8cd9768afe6db5ced98e33",
-  "date": "2024-07-19T21:09:17-04:00",
-  "path": "/nix/store/v8yv84fm0n134mr5vmwbpr4cpyl71vxz-tree-sitter-beancount",
-  "sha256": "1milrdb8ka5vkypl0b44xgfdn0haydg2fz7489djcwpjkx7gfrsg",
-  "hash": "sha256-T2f3Tp/yciZbQuR8J17zCgLb3OuELECvn7uoiVbLNNY=",
+  "rev": "07bfb0ec6d9e255d776cdd3362128364d2b0bb2f",
+  "date": "2025-07-20T21:33:46-04:00",
+  "path": "/nix/store/7q88wczdhi0ralm2fzdz7y42mxnsc34c-tree-sitter-beancount",
+  "sha256": "0r2ql0n4wkwbcdjpklxhsk91xm8q8dl9n9rdlqk585xagmxf1w4b",
+  "hash": "sha256-i/Dgen2qF1Qmpi0nm2hDGNUe0tSw03llY4tPTiygWGQ=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bitbake.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bitbake.json
index 582ed02c1412..cb8c9dbc93db 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bitbake.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bitbake.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json
index 65414bf90a02..13bb6ec8a2e4 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-bqn.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
index b29372cbc061..9d898a553715 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c-sharp.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
index e38432e27045..47467756a54b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-clojure.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/sogaiu/tree-sitter-clojure",
-  "rev": "40c5fc2e2a0f511a802a82002553c5de00feeaf4",
-  "date": "2025-05-26T17:10:02+09:00",
-  "path": "/nix/store/lkzsixjxwr6b2gwxsba0qah3k121axgi-tree-sitter-clojure",
-  "sha256": "163jm1qgrh9ha1xbjlbkcffcxkdbhsvj5kplknq4gcb080wlp6dp",
-  "hash": "sha256-t5lLOUBgsUewnfTOIreGq83OnGNzUbl6UDDB/HCocpg=",
+  "rev": "e43eff80d17cf34852dcd92ca5e6986d23a7040f",
+  "date": "2025-08-26T15:59:05+09:00",
+  "path": "/nix/store/gpvw9wn3mg5j7mzj91qvkxm8l5rlgid6-tree-sitter-clojure",
+  "sha256": "0bmclmbjk58w8092q52yra5axrr3q22v73yva9wvqh5fif81x2cf",
+  "hash": "sha256-jokekIuuQLx5UtuPs4XAI+euispeFCwSQByVKVelrC4=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
index 07b7b433cd5a..419cfe5c0ca4 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json
index a13d53821c8c..3b056e466f03 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-commonlisp.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
index b62ff93df2c3..ddee6bf64d8d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cpp.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-crystal.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-crystal.json
index eb5e7cb50ed3..0085e157c80f 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-crystal.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-crystal.json
@@ -1,12 +1,14 @@
 {
   "url": "https://github.com/crystal-lang-tools/tree-sitter-crystal",
-  "rev": "cf69a6504a82fecc55ee1680983744a94a9edfaa",
-  "date": "2025-03-28T11:48:18-04:00",
-  "path": "/nix/store/c20hqk12him4k0675y3l5f53lfnaa37d-tree-sitter-crystal",
-  "sha256": "0jzmkjfhrz1f5pw274dj0f7avazsyhx0h6vbg4p5xxzkqch19wah",
-  "hash": "sha256-UPEUIMPz914ueWsbCDr0+qutjgOykSP4LS78DJ2c9Us=",
+  "rev": "f0ada43161f77d5bad18c4ce0b21d1dc9310e408",
+  "date": "2025-09-08T23:42:35-04:00",
+  "path": "/nix/store/q97l67605207fyavx1kdsnfylf49aj44-tree-sitter-crystal",
+  "sha256": "0j3xb6j67v4i4wdn14y1ac2004r71v4m0r01qfzhfv4cqwad3lz4",
+  "hash": "sha256-5NPRFMeMbAe/wwFkUMkOJxMABFPBk2AbJ5HsY6RZfUg=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
-  "leaveDotGit": false
+  "fetchTags": false,
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
index e9e4a52ddf0c..4054f5f8b63a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-css.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json
index 36413eb77f40..753f05604b87 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cuda.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/thehamsta/tree-sitter-cuda",
-  "rev": "014628ae8d2df391b88ddb9fa0260fd97f770829",
-  "date": "2025-03-16T17:20:16+01:00",
-  "path": "/nix/store/w0cl4ga4bis992vyfmj8l0pq385z0cka-tree-sitter-cuda",
-  "sha256": "1qyh00rapch29czvnqs3364bx0bi4gyapfxb0v8m4r2m8kybnlff",
-  "hash": "sha256-zlG7/ERVZFLRBqu7q/wjcYG+iBlDY7s/SwKyqzIA0OM=",
+  "rev": "48b066f334f4cf2174e05a50218ce2ed98b6fd01",
+  "date": "2025-09-18T22:53:12+02:00",
+  "path": "/nix/store/01cw4243h6xyhg6nn8fgz7gjajkh0hjg-tree-sitter-cuda",
+  "sha256": "116fa26bjh6a88kdshqq5hp6fq4ik95dpaiidw8rn90xxwwl0zxi",
+  "hash": "sha256-sX9AOe8dJJsRbzGq20qakWBnLiwYQ90mQspAuYxQzoQ=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json
index f98691b115b0..96ddd49800cf 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cue.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
index d3424c21a17a..f65fae97f629 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dart.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json
index 069c8263f262..fe826138a3e0 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-devicetree.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json
index 045280a60371..def7d28b4a6b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dockerfile.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json
index 10d9408ec72d..96e220464cd5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-dot.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
index 945336f543ac..9117f8c0ae71 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-earthfile.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json
index 799c8f70ca52..0e7efcc84c04 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-eex.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json
index 0a784c3ab43b..b8eb1a40bfe2 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elisp.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json
index ea4fd28a9576..5af61d399026 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elixir.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json
index a0163c06c5fb..4ff1421304f5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-elm.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
index c60ca6e00877..6c6e366f9c6c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-embedded-template",
-  "rev": "332262529bc51abf5746317b2255ccc2fff778f8",
-  "date": "2024-11-11T01:51:07-05:00",
-  "path": "/nix/store/qfrdm02qnlllw3ric8pyv5gs0ahwnlbl-tree-sitter-embedded-template",
-  "sha256": "1vq9dywd9vcy59f6i5mk5n7vwk67g8j5x77czg7avpznskgfhqhb",
-  "hash": "sha256-C2Lo3tT2363O++ycXiR6x0y+jy2zlmhcKp7t1LhvCe8=",
+  "rev": "c70c1de07dedd532089c0c90835c8ed9fa694f5c",
+  "date": "2025-08-28T20:40:04-04:00",
+  "path": "/nix/store/l73zsvkpnrjpzncpwb4qcvhgqvx5zd35-tree-sitter-embedded-template",
+  "sha256": "0w1vkk1m2a52nqqx7agwcik7kbdb6bwpw18479inswqbgn51l54w",
+  "hash": "sha256-nBQain0Lc21jOgQFfvkyq615ZmT8qdMxtqIoUcOcO3A=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json
index 72ac83411a6e..1aac15dac9f8 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-erlang.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-factor.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-factor.json
index 5d8bd9e2b65d..c7cde5b69b2d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-factor.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-factor.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json
index 5364cadfcc4c..bc474c396b55 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/travonted/tree-sitter-fennel",
-  "rev": "15e4f8c417281768db17080c4447297f8ff5343a",
-  "date": "2024-02-02T09:37:06-05:00",
-  "path": "/nix/store/cjqnj1i2z7s3xwivba9vgpqrs0lcinil-tree-sitter-fennel",
-  "sha256": "059avw3yhadqbfallflc5xxfzla81d5mc9wrc3ag09xj5w6n1n05",
-  "hash": "sha256-BdhgDS+yJ/DUYJknVksLSNHvei+MOkqVW7gp6AffKhU=",
+  "rev": "36eb796a84b4f57bdf159d0a99267260d4960c89",
+  "date": "2025-09-06T23:17:11-04:00",
+  "path": "/nix/store/jz4l1j6yy6ly6pgjhmjrqq0lhab1gb8l-tree-sitter-fennel",
+  "sha256": "0pg76nby16i7wvvhc9n7ahbg4l4rlldzw7ggm8szlxx40lz16mv8",
+  "hash": "sha256-aFcTPgWkd/o1qu8d/hulmVDyFlTHJgb35iea4Jc1510=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json
index 907447c4ab30..a6744378376d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fish.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/ram02z/tree-sitter-fish",
-  "rev": "70640c0696abde32622afc43291a385681afbd32",
-  "date": "2025-01-18T10:06:56Z",
-  "path": "/nix/store/f3yngwj4xrr9v6nchnl9sj3q7bx2463y-tree-sitter-fish",
-  "sha256": "12gga8gm7dyfa6srvi5sympszy647qcw7a9warrld5z71vgziv3p",
-  "hash": "sha256-d+z43w7nl0ZzVjypwxk+xPivb/W6xJ21Uc63Ux9S74k=",
+  "rev": "aa074a0bacde8b5823c592574d7138f156a95776",
+  "date": "2025-06-13T20:17:14+01:00",
+  "path": "/nix/store/8z4vmmfhxbc529rkjs84aij12xa8ag1w-tree-sitter-fish",
+  "sha256": "1l8qmmligfcpf4amqghdv9c4nvs5wbhiifhl7016l7793rfzl235",
+  "hash": "sha256-ZQj6XR7pHGoCOBS6GOHiRW9LWNoNPlwVcZe5F2mtGNE=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json
index 5091a489397e..45f484e3fa86 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/prestonknopp/tree-sitter-gdscript",
-  "rev": "e964ce912b5b835f1caedb600df9d5be77e803a8",
-  "date": "2025-05-14T11:22:28-07:00",
-  "path": "/nix/store/ab2prhn6ckp7kyfnxnymx8zvbna4jda2-tree-sitter-gdscript",
-  "sha256": "19rdpyd05x29b7isv8jnc8jlawlpzh91b11yggiqgjz6il0vkdww",
-  "hash": "sha256-nLe5AY3my4fjez6EFRL8l3JFJWJWoq3jWUn0Apq/Lac=",
+  "rev": "c370d711dc9ead679d40bb7e9364ceed0b3bfc28",
+  "date": "2025-07-17T11:29:39-07:00",
+  "path": "/nix/store/yzmn7h0mqpphjnwmrnnrijz6dmhl2rmq-tree-sitter-gdscript",
+  "sha256": "0qma5ffmfwh81dk4wafz9qqkqw6pyk18bg20sg70v7s3r7m0bq2b",
+  "hash": "sha256-S+AF6slDnw3O00C8hcL013A8MU7fKU5mCwhyV50rqmI=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gemini.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gemini.json
index e63a56c69a16..f4206540b737 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gemini.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gemini.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json
index 1f4c1e5ab620..c8455e82214d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gleam.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/gleam-lang/tree-sitter-gleam",
-  "rev": "6ece453acf8b14568c10f629f8cd25d3dde3794f",
-  "date": "2025-05-17T12:51:15Z",
-  "path": "/nix/store/aahaa06y7w5in76pfp787k5gyamx7599-tree-sitter-gleam",
-  "sha256": "00f481cjn1mz0319jq89775a81nlmqnkc6fvv3qblpiq37fplzcz",
-  "hash": "sha256-n3163Rk4Xrrw2NsZNi2u1AakyjkJYZnCAL8GK1lAxAE=",
+  "rev": "dae1551a9911b24f41d876c23f2ab05ece0a9d4c",
+  "date": "2025-07-21T17:56:49Z",
+  "path": "/nix/store/v0dwdaqlr17b6jry9ysd15m342ha8hxb-tree-sitter-gleam",
+  "sha256": "0d7z5bk6x0qi3wy4d8174a69wxsc4287c7fcdfabkn8dixpa920q",
+  "hash": "sha256-GIikbo8N2bmUa8wddpAgTHeejCInoEY8HxGDbuYq/zQ=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json
index 83e5e7b9c1c4..2c04f80d2f1e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
index adb5bb72ba90..2263a37af864 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go-template.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go-template.json
index 4032f124945d..1ea8ff82bfa9 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go-template.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go-template.json
@@ -1,10 +1,10 @@
 {
   "url": "https://github.com/ngalaiko/tree-sitter-go-template",
-  "rev": "5f19a36bb1eebb30454e277b222b278ceafed0dd",
-  "date": "2025-01-29T18:19:22Z",
-  "path": "/nix/store/lcgn1hzzsf5jhliy7454lxx7phkmrjfb-tree-sitter-go-template",
-  "sha256": "1nm9ybwb4if6g7cs911i6msb3q2f1plbl70k2y4icbxk2p57k5ka",
-  "hash": "sha256-apZ5yhWzLxaJFxMcuugNTuCxdDUxhKTZecZFsvjyqdo=",
+  "rev": "65f4f86c3aaa9dabab36e3482584e8a111cf7db1",
+  "date": "2025-08-23T12:29:37Z",
+  "path": "/nix/store/f5palcms6bafi6yc77z2yqa3yhb0pbhz-tree-sitter-go-template",
+  "sha256": "1wf0fswkd1fd2f0x6xz2qqvr7sdyz3h93vac9z6jad41sqx4w9md",
+  "hash": "sha256-rSZOOtaBNCXNT0ztkeD4vumTN8bid9OBE82FNrl2wPE=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
index db3cc5ace052..bff23a280218 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-go.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-go",
-  "rev": "3c3775faa968158a8b4ac190a7fda867fd5fb748",
-  "date": "2024-11-24T14:34:38-05:00",
-  "path": "/nix/store/zqi5mm5lx2jq40650gljdvn3sq0y34c1-tree-sitter-go",
-  "sha256": "0yi8if9mqzzcs4qflflz90hhaxkzlq54wia3s0iiqzfqxk24a61g",
-  "hash": "sha256-LxhFxOzYfRwj0ENFTgqmf3YFIUifOuow0ex/XJOLKHo=",
+  "rev": "1547678a9da59885853f5f5cc8a99cc203fa2e2c",
+  "date": "2025-08-29T02:17:40-04:00",
+  "path": "/nix/store/nb47mmxl1lwd2bgnv8w1m7zr04rpp326-tree-sitter-go",
+  "sha256": "0ag5cksnvrb8fg7b05pg1rq31sv6l8k985bk7qrzg91j7w8x7dnb",
+  "hash": "sha256-y7bTET8ypPczPnMVlCaiZuswcA7vFrDOc2jlbfVk5Sk=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json
index dded3a02e446..cb0e4e446359 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json
index fdb0a4efeb8c..e03e7b89f738 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gomod.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json
index 92cff1e75067..4e5d2de4853c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json
index 55c44102e945..f90c78ea33f1 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-graphql.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
index 15f39a70a440..a78b0c4fe7e1 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json
index af406a845f16..9ac36a85bcb3 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hjson.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hjson.json
index e4c8d8263c4e..80b0b2a1f471 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hjson.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-hjson.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
index 23a679566782..57e69ad93101 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-html.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json
index 2e05e32a1b6d..66a8fdf28dfa 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-http.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json
index 0687cb404e24..99fa73b63fb5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-janet-simple.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
index b7aed2572e37..adad6e67b406 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-java.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
index a0290d215193..964acc360643 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-javascript.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-javascript",
-  "rev": "3a837b6f3658ca3618f2022f8707e29739c91364",
-  "date": "2024-11-10T00:38:27-05:00",
-  "path": "/nix/store/hpvzw8l06lbvxsh0szkj44gshiqrjb02-tree-sitter-javascript",
-  "sha256": "03v1gpr5lnifrk4lns690fviid8p02wn7hfdwp3ynp7lh1cid63a",
-  "hash": "sha256-apgWWYD0XOvH5c3BY7kAF7UYtwPJaEvJzC5aWvJ9YQ8=",
+  "rev": "44c892e0be055ac465d5eeddae6d3e194424e7de",
+  "date": "2025-09-01T03:10:57-04:00",
+  "path": "/nix/store/l0h8gv70fj33dqcpkpclbv0khjgnhk8z-tree-sitter-javascript",
+  "sha256": "1qdjpfxw9z1icx3jc3k006yj76lcqydkvbk4ji3wk4xy854zz66q",
+  "hash": "sha256-2Jj/SUG+k8lHlGSuPZvHjJojvQFgDiZHZzH8xLu7suE=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
index 5153927b22df..a3d1f78d20cd 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsdoc.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-jsdoc",
-  "rev": "b253abf68a73217b7a52c0ec254f4b6a7bb86665",
-  "date": "2024-11-11T01:54:33-05:00",
-  "path": "/nix/store/w2hks666pc8yb031ydclz0qn7k0qsfa1-tree-sitter-jsdoc",
-  "sha256": "0vpvy5hnnr9l4ggii6fp6svv35l659b3n13028dzq0b363dxng03",
-  "hash": "sha256-Azzb2zBjAfwbEmAEO1YqhpaxtzbXmRjfIzRla2Hx+24=",
+  "rev": "658d18dcdddb75c760363faa4963427a7c6b52db",
+  "date": "2025-09-13T00:24:14-04:00",
+  "path": "/nix/store/l7zh6vli87n3bj7cq9lnfklkcwsay1am-tree-sitter-jsdoc",
+  "sha256": "1qrgan1xpj717qmwdbgb3lqjgffyhsw0qxhjwhdhqfv2lgkw4cn6",
+  "hash": "sha256-xjLC56NiOwwb5BJ2DLiG3rknMR3rrcYrPuHI24NVL+M=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
index 10187c1f9699..ea3673775726 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json
index 28f4996486d0..5c8bcfa51b89 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-json5.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/joakker/tree-sitter-json5",
-  "rev": "ab0ba8229d639ec4f3fa5f674c9133477f4b77bd",
-  "date": "2024-04-30T19:40:01-04:00",
-  "path": "/nix/store/3ag1lv1h8wg3cvbjbigyqmvqr0jy1i48-tree-sitter-json5",
-  "sha256": "0n33v04d5q79j1qp1l26ygfqywl7vxfam38dap78g6i7ys78581d",
-  "hash": "sha256-LaCCjvYnmofOVQ2Nqlzfh3KP3fNG0HBxkOng0gjYY1g=",
+  "rev": "8cb4114a4d7e5bab75d74466422e032de31d83df",
+  "date": "2025-09-20T19:19:04-03:00",
+  "path": "/nix/store/gmjjsjdj4xrkw89zq1asva5pdw455dnd-tree-sitter-json5",
+  "sha256": "0ckxr80dbzaxkasn9dldwcl0klkyxs8kiiqibk82y9mx8x2ymz21",
+  "hash": "sha256-QfzqRUe9Ji/QXBHHOJHuftIJKOONtmS1ml391QDKfTI=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json
index a8bd511ad98b..5194ddd86da7 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-jsonnet.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
index 2d0e55210dca..c38a9d18fead 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-julia.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
index 961b173484ff..b84d6322d66f 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-just.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kdl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kdl.json
index e218e748c0ad..78b834fb5824 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kdl.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kdl.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-koka.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-koka.json
index ce53103c667c..7a61e28411f1 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-koka.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-koka.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/mtoohey31/tree-sitter-koka",
-  "rev": "33c333f7ff4cac4138c0786198481b33d2880656",
-  "date": "2025-01-26T11:30:06-05:00",
-  "path": "/nix/store/dh0v9y2qc9dz8lqqpspnwbxvpikfjzpv-tree-sitter-koka",
-  "sha256": "12vr8xdsy8gpgwzcnvc2p5mzd4fsgv0lgqdwmzhs1b9hy7bvdkd6",
-  "hash": "sha256-ps221/EwraDhr7zhR8F+2pH2a7mCbcs+f/chr1tHeYs=",
+  "rev": "6dce132911ac375ac1a3591c868c47a2a84b30aa",
+  "date": "2025-07-26T15:26:41-04:00",
+  "path": "/nix/store/xvk32hz6j2yidxq4sj78phs4i1mqlwv8-tree-sitter-koka",
+  "sha256": "1l50l8m3ql2j6q772pgb8x3v1awvng12fd9rpv6p3cva1mg9ywj1",
+  "hash": "sha256-QXKfXg1qs3HNvjk1J8Kzm6uwR0frXXEONlJQPCqioNA=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json
index 8b67459fe23d..304b38c8f162 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-kotlin.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json
index 810b0acc9964..87bac66f83d0 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-latex.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/latex-lsp/tree-sitter-latex",
-  "rev": "a834712c5e04029a451a262456bf6290b8ef6f37",
-  "date": "2024-04-01T14:31:04+02:00",
-  "path": "/nix/store/kn3vkfnysm170wc1dbjmb5y69hdlmyb4-tree-sitter-latex",
-  "sha256": "18dyda7299imb6i2jnjpr7z2jdrjn804c3958nkkpxzzfhbq39h7",
-  "hash": "sha256-B6aBF3T/9zunRSUNRgCyMjcp/slXWimiWTWmJI5qvqE=",
+  "rev": "7e0ecdc02926c7b9b2e0c76003d4fe7b0944f957",
+  "date": "2025-09-19T09:03:38+02:00",
+  "path": "/nix/store/jn7pw9992kbriq3z7nv27jh9yknqjsfq-tree-sitter-latex",
+  "sha256": "0sxxydq0lmfybvwfkzkvy5mp8hyqmadpl6pqxwqb5h6s44wnkgcx",
+  "hash": "sha256-nb1pOSHawLIw7/gaepuq2EN0a/F7/un4Xt5VCnDzvWs=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json
index 24ea0a0a6df7..840281cc9ac5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
index 6b29c432c482..443c60090119 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json
index 5fa65cec3ea8..46a604c4a472 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-make.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-netlinx.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-netlinx.json
index fc5819800286..c9793de08e6c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-netlinx.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-netlinx.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json
index 13d0c4d6e287..4e96fa190a1e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nickel.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
index 3db68fc6a0a6..7c69366c118c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nix.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/nix-community/tree-sitter-nix",
-  "rev": "ea1d87f7996be1329ef6555dcacfa63a69bd55c6",
-  "date": "2025-07-18T19:46:47+02:00",
-  "path": "/nix/store/mvq8m0v2cr2xns4807cby54h3wc7xjxr-tree-sitter-nix",
-  "sha256": "1aaq5yv1s8qq3abm0jm884hi4k6n2w0nzd1j3wizv1x1xk6qzlsl",
-  "hash": "sha256-VNOPzeyhh/0jHzK0bwEX1kwSIUGoSlCXGhgjHbYvWKk=",
+  "rev": "ff4e2b4c5a3598e8be3edf16bc69f6677af32145",
+  "date": "2025-08-11T14:30:35Z",
+  "path": "/nix/store/pv5yjrasf1k8pigwl0gnvbm7bwsg205q-tree-sitter-nix",
+  "sha256": "0bv38na2i53229lzkndbvchfgg8gmwdgpcw1ajq9rcqar8m1gyal",
+  "hash": "sha256-VPkXKsoKs5ywVIGz+xqvD73nINur2flpEmKUKJRFYy8=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json
index 93a878458f14..6c96638394e3 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg-meta.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
index b81123a662d8..d4cb96ea314e 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-norg.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
index a455eaf1e630..b07ea1915d63 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/nushell/tree-sitter-nu",
-  "rev": "100d06e29d13a8ebfc3f29173c07a5c4f2050586",
-  "date": "2025-06-03T11:43:38Z",
-  "path": "/nix/store/3a41rx3rs29c625ywqv0pw7s7am4gwn5-tree-sitter-nu",
-  "sha256": "07aa73flw0z56fqgqv4y7xyf0akh50ydavjyzyczwc7hyl15mak4",
-  "hash": "sha256-ZKpaAvXwMP6Z/15u1TwocCrgfD+ebPywM+UDTt04Sh0=",
+  "rev": "0e6c59c46db3c246eaf86ce5b325da1247e971a5",
+  "date": "2025-09-19T12:13:52-05:00",
+  "path": "/nix/store/hzys3qbx0162dma003g6n4wzl5j8b4d1-tree-sitter-nu",
+  "sha256": "1l6l4s6w5dc1yrdwz9k1l4xzdzbkch8q4fr69461piibsd6r0qm8",
+  "hash": "sha256-qGKQTdMrxhsMSSY7ghFkc/32O6Fhps9b9oG1wo0m1NA=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json
index a7d178462936..fe29aa1e29cc 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json
index 0dba72be49a3..792216e7f848 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json
index 35b384620faf..cdaf509a9ca8 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-perl.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json
index 7255f39b0e4a..56a78fac161a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pgn.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/rolandwalker/tree-sitter-pgn",
-  "rev": "f86a119d21d01f6bf0dcd3247a366554e98dbbe5",
-  "date": "2024-09-14T21:47:45Z",
-  "path": "/nix/store/09rxvhnmdq63n4ghk00ngbdgnmqqs1k4-tree-sitter-pgn",
-  "sha256": "1ahl979ika0pyq4glz6am71hq6y360hcmwhxikn2l2gl8415701k",
-  "hash": "sha256-M4BTAkH0CSrsjB3yyiAwwxsMw6nKfPoI9heoGdNJFKo=",
+  "rev": "c5de0ccc528e1c36d354c00df422ed39fc582073",
+  "date": "2025-07-29T11:58:18-04:00",
+  "path": "/nix/store/laqz0v4pk90hqiy6apbxjf2lhbrf9n2h-tree-sitter-pgn",
+  "sha256": "0mazy9y80pd20a3a76b0nfxswh7xxdsnya0y0lzl86sh4w95f52p",
+  "hash": "sha256-VxRXEidQG0Q/BR4ob3Xr/UCuu7NgmaOGAqJdgHzyX1U=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
index c64e2aedce34..86b2f91a6705 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-php",
-  "rev": "f7cf7348737d8cff1b13407a0bfedce02ee7b046",
-  "date": "2025-02-27T03:54:39-06:00",
-  "path": "/nix/store/6hwqa10mfcs32cqq5ab48c444yihm106-tree-sitter-php",
-  "sha256": "05qhz14vvqgwpxgdfr1skwgrv041zwc3wxjyx6y679965nn0lrji",
-  "hash": "sha256-UWYKrC0mpWO86V52Phj/gYCdH586ZNdev/zhvUn4EBc=",
+  "rev": "5b5627faaa290d89eb3d01b9bf47c3bb9e797dea",
+  "date": "2025-08-18T00:11:55-05:00",
+  "path": "/nix/store/sxyqch4xwnm2a1g5r7h9drp4x9bszzi8-tree-sitter-php",
+  "sha256": "1zf98g6zn29xci37scp3bmjl9dynhf3272aaqm6znjq7rb6z53lc",
+  "hash": "sha256-jI7yzcoHS/tNxUqJI4aD1rdEZV3jMn1GZD0J+81Dyf0=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json
index f9e43499a03a..040c110a9b17 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pioasm.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json
index bbdf72a731cc..e5229a3327c3 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-prisma.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-proto.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-proto.json
index 7d14348180b8..98175e48e9d3 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-proto.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-proto.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json
index e69c0abcd1c3..eccf11601570 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-pug.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
index 208f595116b1..91102dc7402b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-python",
-  "rev": "bffb65a8cfe4e46290331dfef0dbf0ef3679de11",
-  "date": "2024-12-22T18:06:13-05:00",
-  "path": "/nix/store/qr60c80rwd98hzbhlsfjbk0fninvbjr4-tree-sitter-python",
-  "sha256": "0a108sfqcsxrp54lapk7k3kq6fmz8745z5q99wpn3i1cqpi9slzg",
-  "hash": "sha256-71Od4sUsxGEvTwmXX8hBvzqD55hnXkVJublrhp1GICg=",
+  "rev": "293fdc02038ee2bf0e2e206711b69c90ac0d413f",
+  "date": "2025-09-11T02:45:17-04:00",
+  "path": "/nix/store/zka1fqm6l03k2z4ghiffkcisvcw96d5m-tree-sitter-python",
+  "sha256": "05kk1wlm5fgpgwqxw3m68sipkinw0gf2jq19cgq9cgp3agdwg58p",
+  "hash": "sha256-F5XH21PjPpbwYylgKdwD3MZ5o0amDt4xf/e5UikPcxY=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json
index 68fa4bd7f0da..6a433a1b517f 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql-dbscheme.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
index f00559186659..2741011aa215 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ql.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
index f7dda61658e5..76b2d4f83d4a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-r.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/r-lib/tree-sitter-r",
-  "rev": "ac939363ced63a5fd39a8bd5e7891bbe06b5738d",
-  "date": "2024-09-06T16:53:09-04:00",
-  "path": "/nix/store/qj9nyda5grkjqkh23m9a3q3sgkmkgcdh-tree-sitter-r",
-  "sha256": "1jf14nvrfcznsnmxmlkbnn59bdykpsawxm5grph65p8vghi4fik7",
-  "hash": "sha256-Z0ZHInwb3WLgza/UzpW+07eVirVr0tqr1fYzl7clwck=",
+  "rev": "e9944e9801595ad484f49be492daf0c4c81547ef",
+  "date": "2025-06-05T15:17:25-04:00",
+  "path": "/nix/store/qdqwb87naqr211y5zps16abnv97a3430-tree-sitter-r",
+  "sha256": "15g5bkndhqv8vbiakl1vvsarl4kcqz3k9fc9hgnn899ghla8nh2a",
+  "hash": "sha256-SkCLFIUvJWTtg4m5NMfHbBKald470Kni2mhj2Oxc5ZU=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
index 0ddb5f97a963..27aca2758514 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-regex.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-regex",
-  "rev": "4470c59041416e8a2a9fa343595ca28ed91f38b8",
-  "date": "2024-11-11T00:48:15-05:00",
-  "path": "/nix/store/2iwwqdj0zjxxqqc6aw2hwqi55aczbf5x-tree-sitter-regex",
-  "sha256": "098pkjicnw3a8bypb7f2xqwhqjlfvicibcmgx5nsb0icdyvagm8q",
-  "hash": "sha256-GNWntm8sgqVt6a+yFVncjkoMOe7CnXX9Qmpwy6KcFyU=",
+  "rev": "b2ac15e27fce703d2f37a79ccd94a5c0cbe9720b",
+  "date": "2025-09-13T00:57:50-04:00",
+  "path": "/nix/store/wx4xlyvffsgkvjy88r955f5lrps9r1iz-tree-sitter-regex",
+  "sha256": "0nhn94skvac3wid2xbxa456m1mgbi7h768imq280pxbm4klhl7bd",
+  "hash": "sha256-bR0K6SR19QuQwDUic+CJ69VQTSGqry5a5IOpPTVJFlo=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json
index 962eac562dad..df313c6d6f4c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rego.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json
index d58e72454870..87bf364f26d7 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-river.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json
index c2db9a7aedcc..bf815e548d2a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
index 6f6d6eb72802..b39f33c3a159 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ruby.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
index c4e47bf15191..1b06a4e99317 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scala.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/tree-sitter/tree-sitter-scala",
-  "rev": "d3b9553b47d7ab413a146c4b6498e527265b966e",
-  "date": "2024-12-26T23:42:00-05:00",
-  "path": "/nix/store/qzbrl51l89izishri72bjc59al88dy0a-tree-sitter-scala",
-  "sha256": "02awiraj5mmgyi31yzxyxarkkl41qksm3lm41pq9c6bmyqpir2y6",
-  "hash": "sha256-xoscL/Z1GZbwDaTSUfXEgdA5s+q+fx9G9K/WIlWOXAk=",
+  "rev": "2d55e74b0485fe05058ffe5e8155506c9710c767",
+  "date": "2025-06-08T14:05:03-04:00",
+  "path": "/nix/store/0ns5c1i34vlyrbvyajclw5dc0qyqmx0c-tree-sitter-scala",
+  "sha256": "16674bmcwp0r8y9xgfc0n5jmgk9bb0975kcqhkg1pnprjs7b6kv4",
+  "hash": "sha256-ZE+zjpb52hvehJjNchJYK81XZbGAudeTRxlczuoix5g=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json
index d03302900db6..c85551d0a92b 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scheme.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/6cdh/tree-sitter-scheme",
-  "rev": "e35b41a183164f4a12e10da3d0c430e837c3d75a",
-  "date": "2025-05-25T19:18:44+08:00",
-  "path": "/nix/store/lg0zvr4w9pryyz725vd5hdf7gvg7idx1-tree-sitter-scheme",
-  "sha256": "12dclaaj4snar68hcwfc1kmnbww4ykf1ab2q81r3k9989m7f1ckn",
-  "hash": "sha256-drLgTk0opTlyQFgsFdz0hPNl6wzMcQaRycpqIpWirIk=",
+  "rev": "67b5c8d6ce19fd5265f13204fec0a3efa9e095d9",
+  "date": "2025-09-17T19:40:43+08:00",
+  "path": "/nix/store/019pq24f1wpqi9n9z5h3ih4w83am5sp4-tree-sitter-scheme",
+  "sha256": "12z3grdc92cvdvkcbk981nn976fscmdbc4fhrsrq2q0h03wfqcwy",
+  "hash": "sha256-njPs+AAQYIGzztARtlpl2pmTrA0ozcXmbpuJxFp+44s=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json
index f25d2196fb47..512d80fbbb50 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-scss.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json
index f63a144843fd..787003e93392 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-smithy.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json
index 80e7839df85f..b0e2dea9eacb 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-solidity.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json
index a4d4f7bfe956..b9ad674d5f66 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sparql.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
index 9c3c7898b0cf..10de150ee9a7 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/derekstride/tree-sitter-sql",
-  "rev": "8a4578bd200fd1ed73e8cbecbe3c5053a4bcf2f8",
-  "date": "2025-02-13T11:02:24-05:00",
-  "path": "/nix/store/jd7y0qspfvy7sc01i7awjwkr8dl3cnj0-tree-sitter-sql",
-  "sha256": "0cp0iaryxmshqdc4x8xg98ck096bqpk1xjg34dycbvkw7mpmn1zj",
-  "hash": "sha256-8gdbbz187sV8I+PJHubFyyQwGUqvo05Yw1DX7rOK4DI=",
+  "rev": "64d6707541898bf17a306033050b1932524e215f",
+  "date": "2025-09-23T13:22:41-04:00",
+  "path": "/nix/store/hgby3annavhkca58d82ixd1i0dgb4a3g-tree-sitter-sql",
+  "sha256": "0qv5pyz7yzy8bnvs8sc1wdp6wgl1wq4imynzwsihjg8yrxkdqbhc",
+  "hash": "sha256-DC7cZs8ePQmj5t/6GgnmgT5ubuOBaaS3Xch/f76/ZWM=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json
index 7f47d64fd963..646b61115996 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/madskjeldgaard/tree-sitter-supercollider",
-  "rev": "1a8ee0da9a4f2df5a8a22f4d637ac863623a78a7",
-  "date": "2024-09-21T12:39:28+02:00",
-  "path": "/nix/store/c94cwr855ai3b48ajw7nkxgrk6bs2n88-tree-sitter-supercollider",
-  "sha256": "051m7anq0w14qaj271x5ic4ilamrijx5f8np2g8kpgbkxmjc0v8v",
-  "hash": "sha256-G23AZO1zvTvRE9ciV7qMuSoaCYulhyOkwiRwgK06NRQ=",
+  "rev": "76b3cab1773f08bb7d3a185420b0a44c6da8c294",
+  "date": "2025-09-17T20:52:30+02:00",
+  "path": "/nix/store/hmc2f1w3xzdhas9gf0m6yz9bbp6ivpqa-tree-sitter-supercollider",
+  "sha256": "1lb8fbx0hhd6lmhjvszm96hrd802mgq6phj4977ag6qdi15zbfbn",
+  "hash": "sha256-drn1S4gNm6fOSUTCa/CrAqCWoUn16y1hpaZBCPpyaNE=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json
index 4e693c88f96c..9e8861cc1f7d 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-surface.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json
index d7e1dce60b16..46825eab17b4 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-svelte.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json
index 967abcd46f39..826b26d04e41 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-talon.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
index 634c62d4e732..6ac7d582118c 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-templ.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/vrischmann/tree-sitter-templ",
-  "rev": "de35706f89beed5087670a9c4421b7794ef02411",
-  "date": "2025-06-01T21:02:54+02:00",
-  "path": "/nix/store/9m1jydr3j1m876dmazg9kzvs7878a7ly-tree-sitter-templ",
-  "sha256": "0vbhks5879b7bpygxr9zba142zsb760j4im1gzbgcl6yj6q59j30",
-  "hash": "sha256-YMhUsJHeUPbWf6FGIoE5S39Bglo/5f78XWelg4qecG0=",
+  "rev": "27a1fc62c8dd4c49669e03629491f66449c6c435",
+  "date": "2025-09-14T18:21:44+02:00",
+  "path": "/nix/store/zvhrnj22cjvykp2xpgs3dill5mb2p13x-tree-sitter-templ",
+  "sha256": "1lwvyvvdkyy2anckz284fqkl5w26v6ppdwm8ajfkkdbf1cyls7fs",
+  "hash": "sha256-2h1NPQtutTmdVKjydq/ZRvBCJ3YEiT+ZVcL72fb2m9M=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json
index eaa3810597b8..35a64f282e31 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tera.json
@@ -1,13 +1,14 @@
 {
   "url": "https://github.com/uncenter/tree-sitter-tera",
-  "rev": "d006172998fa8b81f96b0f2fc7fa2bf25207c46b",
-  "date": "2025-04-16T08:51:56-04:00",
-  "path": "/nix/store/364masbjrvf29v30h4hbzwds1j438k7a-tree-sitter-tera",
-  "sha256": "0cwihdzlm8jk8g006j234pjnw0apv3l8ixn4kmdc60hzh3bb9ypr",
-  "hash": "sha256-+fq01oAfAsNancT2iOjYVwFu5SVDSAPAQ1OiSn+DkTM=",
+  "rev": "692937d52c8dfd91ce0dde722b9b4febbc9bc712",
+  "date": "2025-07-22T07:31:49-04:00",
+  "path": "/nix/store/yk1s71npnbz0vvfkpl4q6gs26xbcfjh3-tree-sitter-tera",
+  "sha256": "0zqkxiybrqrkj55cnpp5xbpw82c99zr752qb4wk7yj159yp1m5fx",
+  "hash": "sha256-3ZUark8lSH8mJwuLcvJPiQnE7+rlXstKkTPjvHzsE38=",
   "fetchLFS": false,
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json
index f8c71de32cc2..624aeb633dd3 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tiger.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
index 31f805c26b87..d37e5a6b9f41 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tlaplus.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json
index 46c62e91c5ae..9e9bc79672da 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-toml.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json
index b38bdb4efa69..7076b788e36a 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-tsq.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json
index cf7e1a6389c6..48be60fc7096 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-turtle.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json
index d832cc784436..8bfe5d5eeafc 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-twig.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
index 1dedf08f9884..d0a0ed3fcea5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json
index ff9c3b0644a2..5ad8f460b6db 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typst.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json
index a6e730e442ed..1af3e2b44c60 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-uiua.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
index ee51cfb86568..e2327dcd4a51 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-verilog.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json
index fced9927e7c0..28989fd89ea5 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json
index e54a956a0316..4241e897b642 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vue.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json
index 5aaece48adf5..e01d33e4fc00 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wgsl.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
index 55c6653c18da..f0ad17112a21 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-wing.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json
index 94b8ac0f1cf3..0bb9817bf237 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yaml.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yang.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yang.json
index e9f5b2ba1e62..82e6259a3fe3 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yang.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-yang.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json
index 8363525841c7..52cd35bef573 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json
@@ -9,5 +9,6 @@
   "fetchSubmodules": false,
   "deepClone": false,
   "fetchTags": false,
-  "leaveDotGit": false
+  "leaveDotGit": false,
+  "rootDir": ""
 }

From fd1114a3b51539f32910afe9d44c397fd780694f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 24 Sep 2025 00:47:03 -0700
Subject: [PATCH 0159/6226] python3Packages.coverage: 7.10.6 -> 7.10.7

Diff: https://github.com/nedbat/coveragepy/compare/7.10.6...7.10.7

Changelog: https://github.com/nedbat/coveragepy/blob/7.10.7/CHANGES.rst
---
 pkgs/development/python-modules/coverage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/coverage/default.nix b/pkgs/development/python-modules/coverage/default.nix
index 030d2bad3028..7dd1e7d6fa5f 100644
--- a/pkgs/development/python-modules/coverage/default.nix
+++ b/pkgs/development/python-modules/coverage/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "coverage";
-  version = "7.10.6";
+  version = "7.10.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nedbat";
     repo = "coveragepy";
     tag = version;
-    hash = "sha256-16t29ftyYBkGvzlV6+imjO+HM1UD/Nrhn+n4pK3h5iU=";
+    hash = "sha256-u62kfYE1yk/cIfyklWJz8vehPe9PL9uN+03bZZraw/U=";
   };
 
   build-system = [ setuptools ];

From 45a1cbb1256e02f48c1fc0f82585da90d0b6a582 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 24 Sep 2025 12:30:04 +0200
Subject: [PATCH 0160/6226] krb5: fix build on FreeBSD

Failed with:

```
packet.c:481:16: error: use of undeclared identifier 'ENODATA'
  481 |         return ENODATA;
      |                ^
1 error generated.
```

Fixed by applying a patch from FreeBSD ports.
---
 pkgs/development/libraries/kerberos/krb5.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix
index 514fe0155826..ef1eeeeec289 100644
--- a/pkgs/development/libraries/kerberos/krb5.nix
+++ b/pkgs/development/libraries/kerberos/krb5.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   bootstrap_cmds,
   byacc, # can also use bison, but byacc has fewer dependencies
   keyutils,
@@ -42,6 +43,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-GogyuMrZI+u/E5T2fi789B46SfRgKFpm41reyPoAU68=";
   };
 
+  patches = lib.optionals stdenv.hostPlatform.isFreeBSD [
+    (fetchpatch {
+      name = "fix-missing-ENODATA.patch";
+      url = "https://cgit.freebsd.org/ports/plain/security/krb5-122/files/patch-lib_krad_packet.c?id=0501f716c4aff7880fde56e42d641ef504593b7d";
+      extraPrefix = "";
+      hash = "sha256-l8ev+WrDKbTqwgBRYhfJGELkCCE8mJTqVHFBvvCPvgE=";
+    })
+  ];
+
   outputs = [
     "out"
     "lib"

From dcb41fbcee185223ba2bb8c0135b75994a6494c8 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 24 Sep 2025 09:18:26 +0200
Subject: [PATCH 0161/6226] libpq: 17.6 -> 18.0

---
 pkgs/servers/sql/postgresql/libpq.nix | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/libpq.nix b/pkgs/servers/sql/postgresql/libpq.nix
index f71d254ae7b6..3048e467397b 100644
--- a/pkgs/servers/sql/postgresql/libpq.nix
+++ b/pkgs/servers/sql/postgresql/libpq.nix
@@ -20,6 +20,15 @@
   postgresql,
   buildPackages,
 
+  # Curl
+  curlSupport ?
+    lib.meta.availableOn stdenv.hostPlatform curl
+    # Building statically fails with:
+    # configure: error: library 'curl' does not provide curl_multi_init
+    # https://www.postgresql.org/message-id/487dacec-6d8d-46c0-a36f-d5b8c81a56f1%40technowledgy.de
+    && !stdenv.hostPlatform.isStatic,
+  curl,
+
   # GSSAPI
   gssSupport ? with stdenv.hostPlatform; !isWindows && !isStatic,
   libkrb5,
@@ -31,14 +40,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libpq";
-  version = "17.6";
+  version = "18.0";
 
   src = fetchFromGitHub {
     owner = "postgres";
     repo = "postgres";
     # rev, not tag, on purpose: see generic.nix.
-    rev = "refs/tags/REL_17_6";
-    hash = "sha256-/7C+bjmiJ0/CvoAc8vzTC50vP7OsrM6o0w+lmmHvKvU=";
+    rev = "refs/tags/REL_18_0";
+    hash = "sha256-xA6gbJe4tIV9bYRFrdI4Rfy20ZwTkvyyjt7ZxvCFEec=";
   };
 
   __structuredAttrs = true;
@@ -61,6 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
     openssl
   ]
+  ++ lib.optionals curlSupport [ curl ]
   ++ lib.optionals gssSupport [ libkrb5 ]
   ++ lib.optionals nlsSupport [ gettext ];
 
@@ -109,6 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--without-perl"
     "--without-readline"
   ]
+  ++ lib.optionals curlSupport [ "--with-libcurl" ]
   ++ lib.optionals gssSupport [ "--with-gssapi" ]
   ++ lib.optionals nlsSupport [ "--enable-nls" ];
 
@@ -134,6 +145,11 @@ stdenv.mkDerivation (finalAttrs: {
     make -C src/common install pg_config.env
     make -C src/include install
     make -C src/interfaces/libpq install
+  ''
+  + lib.optionalString curlSupport ''
+    make -C src/interfaces/libpq-oauth install
+  ''
+  + ''
     make -C src/port install
 
     substituteInPlace src/common/pg_config.env \

From 12146213adac15f7afe9c69cb41e0a7e48c5aff0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 14:20:23 +0000
Subject: [PATCH 0162/6226] heroku: 10.13.1 -> 10.13.2

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

diff --git a/pkgs/by-name/he/heroku/package.nix b/pkgs/by-name/he/heroku/package.nix
index 15210e20587f..d9e80ea96bcd 100644
--- a/pkgs/by-name/he/heroku/package.nix
+++ b/pkgs/by-name/he/heroku/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation {
   pname = "heroku";
-  version = "10.13.1";
+  version = "10.13.2";
 
   src = fetchzip {
-    url = "https://cli-assets.heroku.com/versions/10.13.1/cf943a6/heroku-v10.13.1-cf943a6-linux-x64.tar.xz";
-    hash = "sha256-2nxM1XE+gvIUoA/AQLXt73V+ZM+WP245qAkGilnCqMk=";
+    url = "https://cli-assets.heroku.com/versions/10.13.2/82c0564/heroku-v10.13.2-82c0564-linux-x64.tar.xz";
+    hash = "sha256-JfaOnVaN60MG4dDJ8IdmRucfCIb9EtWdJy+90fG6zuw=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 781cbbf25837da89eaf6bcca747d69fb648322f3 Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Sun, 8 Jun 2025 19:24:47 +0200
Subject: [PATCH 0163/6226] libwindowswm: refactor and migrate to pkgs/by-name
 from xorg.libWindowsWM

---
 pkgs/by-name/li/libwindowswm/package.nix      | 55 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  4 --
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 59 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/by-name/li/libwindowswm/package.nix

diff --git a/pkgs/by-name/li/libwindowswm/package.nix b/pkgs/by-name/li/libwindowswm/package.nix
new file mode 100644
index 000000000000..f195e4bbd76b
--- /dev/null
+++ b/pkgs/by-name/li/libwindowswm/package.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libwindowswm";
+  version = "1.0.1";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libWindowsWM-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-JfB8+EfL6R02wg80i0uUlMRQT+ApZujN9lz1YxanDtw=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+  ];
+
+  configureFlags = lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--enable-malloc0returnsnull";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libWindowsWM \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "library for Cygwin/X rootless window management extension";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libwindowswm";
+    license = lib.licenses.mit;
+    maintainers = [ ];
+    pkgConfigModules = [ "windowswm" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 36eeac74ab32..a7af923d1343 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -40,6 +40,7 @@
   libpciaccess,
   libpthread-stubs,
   libsm,
+  libwindowswm,
   libx11,
   libxau,
   libxaw,
@@ -219,6 +220,7 @@ self: with self; {
   libICE = libice;
   libpthreadstubs = libpthread-stubs;
   libSM = libsm;
+  libWindowsWM = libwindowswm;
   libX11 = libx11;
   libXau = libxau;
   libXaw = libxaw;
@@ -905,44 +907,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libWindowsWM = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXext,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libWindowsWM";
-      version = "1.0.1";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2";
-        sha256 = "1p0flwb67xawyv6yhri9w17m1i4lji5qnd0gq8v1vsfb8zw7rw15";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXext
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "windowswm" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXTrap = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 958a76b60c98..251889282998 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -367,6 +367,7 @@ print OUT <<EOF;
   libpciaccess,
   libpthread-stubs,
   libsm,
+  libwindowswm,
   libx11,
   libxau,
   libxaw,
@@ -546,6 +547,7 @@ self: with self; {
   libICE = libice;
   libpthreadstubs = libpthread-stubs;
   libSM = libsm;
+  libWindowsWM = libwindowswm;
   libX11 = libx11;
   libXau = libxau;
   libXaw = libxaw;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 0a3da33ecd2e..b6abd401a766 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -146,10 +146,6 @@ self: super:
     };
   });
 
-  libWindowsWM = super.libWindowsWM.overrideAttrs (attrs: {
-    configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
-  });
-
   xdpyinfo = super.xdpyinfo.overrideAttrs (attrs: {
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
     preConfigure =
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 1ea2ace0bf53..bb42a1636c50 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -84,7 +84,6 @@ mirror://xorg/individual/font/font-ibm-type1-1.0.4.tar.xz
 mirror://xorg/individual/font/font-jis-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
-mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXinerama-1.1.5.tar.xz
 mirror://xorg/individual/lib/libxkbfile-1.1.3.tar.xz
 mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz

From 67af63a0765d43a7eb08c62da06fecc61d31cc36 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sun, 31 Aug 2025 17:06:56 +0200
Subject: [PATCH 0164/6226] libxinerama: refactor, move to pkgs/by-name and
 rename from xorg.libXinerama

---
 pkgs/by-name/li/libxinerama/package.nix       | 69 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 40 +----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  8 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 74 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/by-name/li/libxinerama/package.nix

diff --git a/pkgs/by-name/li/libxinerama/package.nix b/pkgs/by-name/li/libxinerama/package.nix
new file mode 100644
index 000000000000..8708e49b3dec
--- /dev/null
+++ b/pkgs/by-name/li/libxinerama/package.nix
@@ -0,0 +1,69 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxinerama";
+  version = "1.1.5";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXinerama-${finalAttrs.version}.tar.xz";
+    hash = "sha256-UJTR8PzBgoyxaW0NOdnoZq4yUgxU0B9hjxo8HjDCCFw=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+  ];
+
+  propagatedBuildInputs = [ xorgproto ];
+
+  configureFlags = lib.optional (
+    stdenv.hostPlatform != stdenv.buildPlatform
+  ) "--enable-malloc0returnsnull";
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXinerama \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Library for Xinerama extension to X11 Protocol";
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxinerama";
+    license = with lib.licenses; [
+      mit
+      mitOpenGroup
+      # TODO: change this to a new license depending on if this
+      # https://github.com/spdx/license-list-XML/issues/2831
+      # actually creates a new license or just new markup for X11
+      x11
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "xinerama" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index a7af923d1343..792d8ffdd9da 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -63,6 +63,7 @@
   libxfont_2,
   libxft,
   libxi,
+  libxinerama,
   libxmu,
   libxp,
   libxpm,
@@ -234,6 +235,7 @@ self: with self; {
   libXfont = libxfont_1;
   libXft = libxft;
   libXi = libxi;
+  libXinerama = libxinerama;
   libXmu = libxmu;
   libXp = libxp;
   libXpm = libxpm;
@@ -947,44 +949,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXinerama = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libXext,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXinerama";
-      version = "1.1.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXinerama-1.1.5.tar.xz";
-        sha256 = "0p08q8q1wg0sixhizl2l1i935bk6x3ckj3bdd6qqr0n1zkqd352h";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        libXext
-        xorgproto
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xinerama" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libXtst = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 251889282998..eb998cb9c0b3 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -72,6 +72,7 @@ $pcMap{"xfont"} = "libXfont";
 $pcMap{"xfont2"} = "libXfont2";
 $pcMap{"xft"} = "libXft";
 $pcMap{"xi"} = "libXi";
+$pcMap{"xinerama"} = "libXinerama";
 $pcMap{"xmu"} = "libXmu";
 $pcMap{"xmuu"} = "libXmu";
 $pcMap{"xp"} = "libXp";
@@ -390,6 +391,7 @@ print OUT <<EOF;
   libxfont_2,
   libxft,
   libxi,
+  libxinerama,
   libxmu,
   libxp,
   libxpm,
@@ -561,6 +563,7 @@ self: with self; {
   libXfont = libxfont_1;
   libXft = libxft;
   libXi = libxi;
+  libXinerama = libxinerama;
   libXmu = libxmu;
   libXp = libxp;
   libXpm = libxpm;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index b6abd401a766..797ffeab5460 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -178,14 +178,6 @@ self: super:
     };
   });
 
-  libXinerama = super.libXinerama.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ];
-    configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
-  });
-
   libxkbfile = super.libxkbfile.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index bb42a1636c50..8658679b0368 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -84,7 +84,6 @@ mirror://xorg/individual/font/font-ibm-type1-1.0.4.tar.xz
 mirror://xorg/individual/font/font-jis-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
-mirror://xorg/individual/lib/libXinerama-1.1.5.tar.xz
 mirror://xorg/individual/lib/libxkbfile-1.1.3.tar.xz
 mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz
 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2

From dbdc0d8f06ca7201917501056d0c6cc8a1a4a0a4 Mon Sep 17 00:00:00 2001
From: Zitrone <general@dev.quantenzitrone.eu>
Date: Sun, 8 Jun 2025 23:33:49 +0200
Subject: [PATCH 0165/6226] libxkbfile: refactor and migrate to pkgs/by-name
 from xorg namespace

---
 pkgs/by-name/li/libxkbfile/package.nix        | 60 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 38 +-----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  7 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 65 insertions(+), 44 deletions(-)
 create mode 100644 pkgs/by-name/li/libxkbfile/package.nix

diff --git a/pkgs/by-name/li/libxkbfile/package.nix b/pkgs/by-name/li/libxkbfile/package.nix
new file mode 100644
index 000000000000..93cd9028b379
--- /dev/null
+++ b/pkgs/by-name/li/libxkbfile/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxkbfile";
+  version = "1.1.3";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libxkbfile-${finalAttrs.version}.tar.xz";
+    hash = "sha256-qbY+6pl6u57mqLT7tRWDHIQfRxr4RaCd5EOygAOHS+w=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "XKB file handling routines";
+    longDescription = ''
+      libxkbfile is used by the X servers and utilities to parse the XKB configuration data files.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxkbfile";
+    license = with lib.licenses; [
+      hpnd
+      mitOpenGroup
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "xkbfile" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 792d8ffdd9da..280ffcf34b1f 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -64,6 +64,7 @@
   libxft,
   libxi,
   libxinerama,
+  libxkbfile,
   libxmu,
   libxp,
   libxpm,
@@ -145,6 +146,7 @@ self: with self; {
     libpciaccess
     libxcb
     libxcvt
+    libxkbfile
     listres
     lndir
     luit
@@ -989,42 +991,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libxkbfile = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libxkbfile";
-      version = "1.1.3";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libxkbfile-1.1.3.tar.xz";
-        sha256 = "1v2bhw1q1cj3wjfs0igq393iz10whcavbyxlm3k9xfvsk7m3xdm9";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xkbfile" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   libxshmfence = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index eb998cb9c0b3..dda0433cf8a8 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -73,6 +73,7 @@ $pcMap{"xfont2"} = "libXfont2";
 $pcMap{"xft"} = "libXft";
 $pcMap{"xi"} = "libXi";
 $pcMap{"xinerama"} = "libXinerama";
+$pcMap{"xkbfile"} = "libxkbfile";
 $pcMap{"xmu"} = "libXmu";
 $pcMap{"xmuu"} = "libXmu";
 $pcMap{"xp"} = "libXp";
@@ -392,6 +393,7 @@ print OUT <<EOF;
   libxft,
   libxi,
   libxinerama,
+  libxkbfile,
   libxmu,
   libxp,
   libxpm,
@@ -473,6 +475,7 @@ self: with self; {
     libpciaccess
     libxcb
     libxcvt
+    libxkbfile
     listres
     lndir
     luit
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 797ffeab5460..c96906407fa7 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -178,13 +178,6 @@ self: super:
     };
   });
 
-  libxkbfile = super.libxkbfile.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ]; # mainly to avoid propagation
-  });
-
   libxshmfence = super.libxshmfence.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 8658679b0368..edac8733edcc 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -84,7 +84,6 @@ mirror://xorg/individual/font/font-ibm-type1-1.0.4.tar.xz
 mirror://xorg/individual/font/font-jis-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
-mirror://xorg/individual/lib/libxkbfile-1.1.3.tar.xz
 mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz
 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz

From b72cbd7789c88bf92c560514f8bc2f1ef62a50d7 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 10 Sep 2025 11:47:07 +0200
Subject: [PATCH 0166/6226] libxshmfence: refactor & move to pkgs/by-name from
 xorg namespace

---
 pkgs/by-name/li/libxshmfence/package.nix      | 57 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 34 +----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  7 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 62 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/by-name/li/libxshmfence/package.nix

diff --git a/pkgs/by-name/li/libxshmfence/package.nix b/pkgs/by-name/li/libxshmfence/package.nix
new file mode 100644
index 000000000000..1d771b05060b
--- /dev/null
+++ b/pkgs/by-name/li/libxshmfence/package.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxshmfence";
+  version = "1.3.3";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libxshmfence-${finalAttrs.version}.tar.xz";
+    hash = "sha256-1KTfCWq6lv6gLAKe46ROEaR+t/chPBpym+g+hew/3hA=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ xorgproto ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Shared memory 'SyncFence' synchronization primitive library";
+    longDescription = ''
+      This library offers a CPU-based synchronization primitive compatible with the X SyncFence
+      objects that can be shared between processes using file descriptor passing.
+      There are two underlying implementations:
+      - On Linux, the library uses futexes
+      - On other systems, the library uses posix mutexes and condition variables.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxshmfence";
+    license = lib.licenses.hpndSellVariant;
+    maintainers = [ ];
+    pkgConfigModules = [ "xshmfence" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 280ffcf34b1f..2690f84c6480 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -73,6 +73,7 @@
   libxrender,
   libxres,
   libxscrnsaver,
+  libxshmfence,
   libxt,
   libxv,
   libxvmc,
@@ -147,6 +148,7 @@ self: with self; {
     libxcb
     libxcvt
     libxkbfile
+    libxshmfence
     listres
     lndir
     luit
@@ -991,38 +993,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libxshmfence = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libxshmfence";
-      version = "1.3.3";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz";
-        sha256 = "046y7zn8agp8kdr1lg11yyvpx90i9sjf77h25jhgx5msd84xz96l";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [ xorgproto ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xshmfence" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   oclock = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index dda0433cf8a8..826f0c2aca43 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -83,6 +83,7 @@ $pcMap{"xrandr"} = "libXrandr";
 $pcMap{"xrender"} = "libXrender";
 $pcMap{"xres"} = "libXres";
 $pcMap{"xscrnsaver"} = "libXScrnSaver";
+$pcMap{"xshmfence"} = "libxshmfence";
 $pcMap{"xt"} = "libXt";
 $pcMap{"xtrans"} = "xtrans";
 $pcMap{"xv"} = "libXv";
@@ -402,6 +403,7 @@ print OUT <<EOF;
   libxrender,
   libxres,
   libxscrnsaver,
+  libxshmfence,
   libxt,
   libxv,
   libxvmc,
@@ -476,6 +478,7 @@ self: with self; {
     libxcb
     libxcvt
     libxkbfile
+    libxshmfence
     listres
     lndir
     luit
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index c96906407fa7..2cf3f4b3adb4 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -178,13 +178,6 @@ self: super:
     };
   });
 
-  libxshmfence = super.libxshmfence.overrideAttrs (attrs: {
-    outputs = [
-      "out"
-      "dev"
-    ]; # mainly to avoid propagation
-  });
-
   setxkbmap = super.setxkbmap.overrideAttrs (attrs: {
     postInstall = ''
       mkdir -p $out/share/man/man7
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index edac8733edcc..37432f01021b 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -84,7 +84,6 @@ mirror://xorg/individual/font/font-ibm-type1-1.0.4.tar.xz
 mirror://xorg/individual/font/font-jis-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
-mirror://xorg/individual/lib/libxshmfence-1.3.3.tar.xz
 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
 mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz
 mirror://xorg/individual/xserver/xorg-server-21.1.18.tar.xz

From 19d5fe041003703206072988771ebe0de2d8e275 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 10 Sep 2025 12:03:51 +0200
Subject: [PATCH 0167/6226] libxtst: refactor, move to pkgs/by-name and rename
 from xorg.libXtst

---
 pkgs/by-name/li/libxtst/package.nix           | 66 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 42 +-----------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  3 +
 pkgs/servers/x11/xorg/overrides.nix           |  6 --
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 71 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/by-name/li/libxtst/package.nix

diff --git a/pkgs/by-name/li/libxtst/package.nix b/pkgs/by-name/li/libxtst/package.nix
new file mode 100644
index 000000000000..6cd9ababca26
--- /dev/null
+++ b/pkgs/by-name/li/libxtst/package.nix
@@ -0,0 +1,66 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  libxi,
+  writeScript,
+  testers,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libxtst";
+  version = "1.2.5";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/lib/libXtst-${finalAttrs.version}.tar.xz";
+    hash = "sha256-tQ1MJblwCadEcGwQOcWY9NjmSRDJ/eOBmU4criNdkkI=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+    libxi
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname libXtst \
+        --url https://xorg.freedesktop.org/releases/individual/lib/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Library for the XTEST and RECORD X11 extensions";
+    longDescription = ''
+      The XTEST extension is a minimal set of client and server extensions required to completely
+      test the X11 server with no user intervention. This extension is not intended to support
+      general journaling and playback of user actions.
+      The RECORD extension supports the recording and reporting of all core X protocol and arbitrary
+      X extension protocol.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/lib/libxtst";
+    license = with lib.licenses; [
+      mitOpenGroup
+      hpndSellVariant
+      hpndDoc
+      x11
+      hpndDocSell
+    ];
+    maintainers = [ ];
+    pkgConfigModules = [ "xtst" ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 2690f84c6480..81c277c3cb89 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -75,6 +75,7 @@
   libxscrnsaver,
   libxshmfence,
   libxt,
+  libxtst,
   libxv,
   libxvmc,
   libxxf86dga,
@@ -249,6 +250,7 @@ self: with self; {
   libXres = libxres;
   libXScrnSaver = libxscrnsaver;
   libXt = libxt;
+  libXtst = libxtst;
   libXv = libxv;
   libXvMC = libxvmc;
   libXxf86dga = libxxf86dga;
@@ -953,46 +955,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  libXtst = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      xorgproto,
-      libX11,
-      libXext,
-      libXi,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "libXtst";
-      version = "1.2.5";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz";
-        sha256 = "0hljblisw72fk60y7zf9214ydn7lk32kj43cf12af2bhp4jlq3dm";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        xorgproto
-        libX11
-        libXext
-        libXi
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ "xtst" ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   oclock = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 826f0c2aca43..1b47a0645c69 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -86,6 +86,7 @@ $pcMap{"xscrnsaver"} = "libXScrnSaver";
 $pcMap{"xshmfence"} = "libxshmfence";
 $pcMap{"xt"} = "libXt";
 $pcMap{"xtrans"} = "xtrans";
+$pcMap{"xtst"} = "libXtst";
 $pcMap{"xv"} = "libXv";
 $pcMap{"xvmc"} = "libXvMC";
 $pcMap{"xvmc-wrapper"} = "libXvMC";
@@ -405,6 +406,7 @@ print OUT <<EOF;
   libxscrnsaver,
   libxshmfence,
   libxt,
+  libxtst,
   libxv,
   libxvmc,
   libxxf86dga,
@@ -579,6 +581,7 @@ self: with self; {
   libXres = libxres;
   libXScrnSaver = libxscrnsaver;
   libXt = libxt;
+  libXtst = libxtst;
   libXv = libxv;
   libXvMC = libxvmc;
   libXxf86dga = libxxf86dga;
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 2cf3f4b3adb4..a2da706b02d8 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -140,12 +140,6 @@ self: super:
 
   mkfontdir = xorg.mkfontscale;
 
-  libXtst = super.libXtst.overrideAttrs (attrs: {
-    meta = attrs.meta // {
-      pkgConfigModules = [ "xtst" ];
-    };
-  });
-
   xdpyinfo = super.xdpyinfo.overrideAttrs (attrs: {
     configureFlags = attrs.configureFlags or [ ] ++ malloc0ReturnsNullCrossFlag;
     preConfigure =
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 37432f01021b..5429bf15b1aa 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -85,5 +85,4 @@ mirror://xorg/individual/font/font-jis-misc-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-meltho-1.0.4.tar.xz
 mirror://xorg/individual/font/font-misc-misc-1.1.3.tar.xz
 mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2
-mirror://xorg/individual/lib/libXtst-1.2.5.tar.xz
 mirror://xorg/individual/xserver/xorg-server-21.1.18.tar.xz

From e9742cf527bd947cfbf6674430efdf74aee0f12c Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 13 Sep 2025 23:53:11 +0200
Subject: [PATCH 0168/6226] font-bitstream-{100dpi,75dpi,type1}: move font
 output from $out/lib to $out/share

---
 pkgs/by-name/fo/font-bitstream-100dpi/package.nix | 2 +-
 pkgs/by-name/fo/font-bitstream-75dpi/package.nix  | 2 +-
 pkgs/by-name/fo/font-bitstream-type1/package.nix  | 4 +---
 pkgs/servers/x11/xorg/overrides.nix               | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/fo/font-bitstream-100dpi/package.nix b/pkgs/by-name/fo/font-bitstream-100dpi/package.nix
index 70bdb81636af..380c99a83401 100644
--- a/pkgs/by-name/fo/font-bitstream-100dpi/package.nix
+++ b/pkgs/by-name/fo/font-bitstream-100dpi/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ font-util ];
 
-  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+  configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
 
   passthru = {
     updateScript = writeScript "update-${finalAttrs.pname}" ''
diff --git a/pkgs/by-name/fo/font-bitstream-75dpi/package.nix b/pkgs/by-name/fo/font-bitstream-75dpi/package.nix
index acdae17bca71..3dd6e249b0df 100644
--- a/pkgs/by-name/fo/font-bitstream-75dpi/package.nix
+++ b/pkgs/by-name/fo/font-bitstream-75dpi/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [ font-util ];
 
-  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
+  configureFlags = [ "--with-fontrootdir=$(out)/share/fonts/X11" ];
 
   passthru = {
     updateScript = writeScript "update-${finalAttrs.pname}" ''
diff --git a/pkgs/by-name/fo/font-bitstream-type1/package.nix b/pkgs/by-name/fo/font-bitstream-type1/package.nix
index 3e3d1eb6c35e..0fe3b97a951a 100644
--- a/pkgs/by-name/fo/font-bitstream-type1/package.nix
+++ b/pkgs/by-name/fo/font-bitstream-type1/package.nix
@@ -22,8 +22,6 @@ stdenv.mkDerivation (finalAttrs: {
     fontforge
   ];
 
-  configureFlags = [ "--with-fontrootdir=$(out)/lib/X11/fonts" ];
-
   postBuild = ''
     # convert Postscript (Type 1) font to otf
     for i in $(find -type f -name '*.pfa' -o -name '*.pfb'); do
@@ -34,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postInstall = ''
     # install the otf fonts
-    fontDir="$out/lib/X11/fonts/misc"
+    fontDir="$out/share/fonts/X11/otf"
     install -Dm444 -t "$fontDir" *.otf
     mkfontscale "$fontDir"
   '';
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 1952faf1bd14..215effdaa986 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -902,5 +902,5 @@ self: super:
 
 # deprecate some packages
 // lib.optionalAttrs config.allowAliases {
-  fontbitstreamspeedo = throw "Bitstream Speedo is an obsolete font format that hasn't been supported by Xorg since 2005";
+  fontbitstreamspeedo = throw "Bitstream Speedo is an obsolete font format that hasn't been supported by Xorg since 2005"; # added 2025-09-24
 }

From 201086487dc236e20a6164c3971e888b34bde684 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 24 Sep 2025 08:01:42 -0700
Subject: [PATCH 0169/6226] nghttp3: 1.11.0 -> 1.12.0

Diff: https://github.com/ngtcp2/nghttp3/compare/v1.11.0...v1.12.0

Changelog: https://github.com/ngtcp2/nghttp3/releases/tag/v1.12.0
---
 pkgs/by-name/ng/nghttp3/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ng/nghttp3/package.nix b/pkgs/by-name/ng/nghttp3/package.nix
index 784e5c3ecf6a..048a71bac340 100644
--- a/pkgs/by-name/ng/nghttp3/package.nix
+++ b/pkgs/by-name/ng/nghttp3/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nghttp3";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchurl {
     url = "https://github.com/ngtcp2/nghttp3/releases/download/v${finalAttrs.version}/nghttp3-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-AAKlyoVtsFmqbcac9zL7sA2aHnPteISPXUjyYh8gyoo=";
+    hash = "sha256-KFl4NTevIT1npc5Cd923nIlBrUXtv6XM3VLZz0/6Qi0=";
   };
 
   outputs = [

From 4cc11e680666d397cd24bf1dd82275e8664ecb57 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 10 Sep 2025 16:45:40 +0200
Subject: [PATCH 0170/6226] x11perf: 1.6.1 -> 1.7.0, refactor & move to
 pkgs/by-name from xorg namespace

relevant changes:
- fix x11perfcomp containing reference to /bin/cat
---
 pkgs/by-name/x1/x11perf/package.nix           | 64 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 46 +------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           | 10 ---
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 68 insertions(+), 55 deletions(-)
 create mode 100644 pkgs/by-name/x1/x11perf/package.nix

diff --git a/pkgs/by-name/x1/x11perf/package.nix b/pkgs/by-name/x1/x11perf/package.nix
new file mode 100644
index 000000000000..f707af8810e3
--- /dev/null
+++ b/pkgs/by-name/x1/x11perf/package.nix
@@ -0,0 +1,64 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxext,
+  libxft,
+  libxmu,
+  libxrender,
+  freetype,
+  fontconfig,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "x11perf";
+  version = "1.7.0";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/test/x11perf-${finalAttrs.version}.tar.xz";
+    hash = "sha256-JPgNhLDpYXGpmJMv8Adpj9F3bamXXtQuUdV7nPypGCg=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxext
+    libxft
+    libxmu
+    libxrender
+    freetype
+    fontconfig
+  ];
+
+  postInstall = ''
+    substituteInPlace $out/bin/x11perfcomp \
+      --replace-fail "/bin/cat" "cat"
+  '';
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/test/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "X11 server performance test program";
+    homepage = "https://gitlab.freedesktop.org/xorg/test/x11perf";
+    license = lib.licenses.hpnd;
+    mainProgram = "x11perf";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 36eeac74ab32..3c62b4ed54ac 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -88,6 +88,7 @@
   transset,
   util-macros,
   viewres,
+  x11perf,
   xauth,
   xbacklight,
   xbitmaps,
@@ -153,6 +154,7 @@ self: with self; {
     smproxy
     transset
     viewres
+    x11perf
     xauth
     xbacklight
     xbitmaps
@@ -1213,50 +1215,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  x11perf = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libXext,
-      libXft,
-      libXmu,
-      xorgproto,
-      libXrender,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "x11perf";
-      version = "1.6.1";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2";
-        sha256 = "0d3wh6z6znwhfdiv0zaggfj0xgish98xa10yy76b9517zj7hnzhw";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        libXext
-        libXft
-        libXmu
-        xorgproto
-        libXrender
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xcalc = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 958a76b60c98..b3f806abf926 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -415,6 +415,7 @@ print OUT <<EOF;
   transset,
   util-macros,
   viewres,
+  x11perf,
   xauth,
   xbacklight,
   xbitmaps,
@@ -480,6 +481,7 @@ self: with self; {
     smproxy
     transset
     viewres
+    x11perf
     xauth
     xbacklight
     xbitmaps
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 0a3da33ecd2e..f8b3c9bb3e55 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -217,16 +217,6 @@ self: super:
 
   oclock = addMainProgram super.oclock { };
 
-  x11perf = super.x11perf.overrideAttrs (attrs: {
-    buildInputs = attrs.buildInputs ++ [
-      freetype
-      fontconfig
-    ];
-    meta = attrs.meta // {
-      mainProgram = "x11perf";
-    };
-  });
-
   xcalc = addMainProgram super.xcalc { };
 
   xf86inputevdev = super.xf86inputevdev.overrideAttrs (attrs: {
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 1ea2ace0bf53..ca1f3a68fb23 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -4,7 +4,6 @@ mirror://xorg/individual/app/fonttosfnt-1.2.4.tar.xz
 mirror://xorg/individual/app/iceauth-1.0.10.tar.xz
 mirror://xorg/individual/app/oclock-1.0.6.tar.xz
 mirror://xorg/individual/app/setxkbmap-1.3.4.tar.xz
-mirror://xorg/individual/app/x11perf-1.6.1.tar.bz2
 mirror://xorg/individual/app/xcalc-1.1.2.tar.xz
 mirror://xorg/individual/app/xclock-1.1.1.tar.xz
 mirror://xorg/individual/app/xcompmgr-1.1.10.tar.xz

From 69c34bfba44abb1b5f12e7cc41443fbe337296fb Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Sat, 23 Aug 2025 00:20:25 +0200
Subject: [PATCH 0171/6226] xcalc: refactor and move to pkgs/by-name from xorg
 namespace

---
 pkgs/by-name/xc/xcalc/package.nix             | 60 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 46 +-------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  2 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 64 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/by-name/xc/xcalc/package.nix

diff --git a/pkgs/by-name/xc/xcalc/package.nix b/pkgs/by-name/xc/xcalc/package.nix
new file mode 100644
index 000000000000..a784ed745d13
--- /dev/null
+++ b/pkgs/by-name/xc/xcalc/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  wrapWithXFileSearchPathHook,
+  libx11,
+  libxaw,
+  libxt,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xcalc";
+  version = "1.1.2";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xcalc-${finalAttrs.version}.tar.xz";
+    hash = "sha256-hXjfoUV+lCifbW7WFGcUMH2Kc6G1TS9CrxMhtiX8HNQ=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    wrapWithXFileSearchPathHook
+  ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxaw
+    libxt
+  ];
+
+  installFlags = [ "appdefaultdir=$(out)/share/X11/app-defaults" ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Scientific calculator X11 client that can emulate a TI-30 or an HP-10C";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xcalc";
+    license = with lib.licenses; [
+      x11
+      hpndSellVariant
+    ];
+    mainProgram = "xcalc";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 3c62b4ed54ac..c46dffee19f9 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -92,6 +92,7 @@
   xauth,
   xbacklight,
   xbitmaps,
+  xcalc,
   xcb-proto,
   xcmsdb,
   xconsole,
@@ -158,6 +159,7 @@ self: with self; {
     xauth
     xbacklight
     xbitmaps
+    xcalc
     xcmsdb
     xconsole
     xcursorgen
@@ -1215,50 +1217,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xcalc = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libXaw,
-      xorgproto,
-      libXt,
-      wrapWithXFileSearchPathHook,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xcalc";
-      version = "1.1.2";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xcalc-1.1.2.tar.xz";
-        sha256 = "1m0wzhjvc88kmx12ykdml5rqlz9h2iki9mkfdngji53y8nhxyy45";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [
-        pkg-config
-        wrapWithXFileSearchPathHook
-      ];
-      buildInputs = [
-        libX11
-        libXaw
-        xorgproto
-        libXt
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xclock = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index b3f806abf926..ee8280999425 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -419,6 +419,7 @@ print OUT <<EOF;
   xauth,
   xbacklight,
   xbitmaps,
+  xcalc,
   xcb-proto,
   xcmsdb,
   xconsole,
@@ -485,6 +486,7 @@ self: with self; {
     xauth
     xbacklight
     xbitmaps
+    xcalc
     xcmsdb
     xconsole
     xcursorgen
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index f8b3c9bb3e55..c81b580849e5 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -217,8 +217,6 @@ self: super:
 
   oclock = addMainProgram super.oclock { };
 
-  xcalc = addMainProgram super.xcalc { };
-
   xf86inputevdev = super.xf86inputevdev.overrideAttrs (attrs: {
     outputs = [
       "out"
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index ca1f3a68fb23..beabc520243d 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -4,7 +4,6 @@ mirror://xorg/individual/app/fonttosfnt-1.2.4.tar.xz
 mirror://xorg/individual/app/iceauth-1.0.10.tar.xz
 mirror://xorg/individual/app/oclock-1.0.6.tar.xz
 mirror://xorg/individual/app/setxkbmap-1.3.4.tar.xz
-mirror://xorg/individual/app/xcalc-1.1.2.tar.xz
 mirror://xorg/individual/app/xclock-1.1.1.tar.xz
 mirror://xorg/individual/app/xcompmgr-1.1.10.tar.xz
 mirror://xorg/individual/app/xdm-1.1.17.tar.xz

From 63640282de5a4a32dfcbbaeb14b664d9287c1e60 Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 10 Sep 2025 17:27:35 +0200
Subject: [PATCH 0172/6226] xcompmgr: refactor & move to pkgs/by-name from xorg
 namespace

---
 pkgs/by-name/xc/xcompmgr/package.nix          | 59 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 46 +--------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  1 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 pkgs/top-level/all-packages.nix               |  2 -
 6 files changed, 63 insertions(+), 48 deletions(-)
 create mode 100644 pkgs/by-name/xc/xcompmgr/package.nix

diff --git a/pkgs/by-name/xc/xcompmgr/package.nix b/pkgs/by-name/xc/xcompmgr/package.nix
new file mode 100644
index 000000000000..e40cc7b807f3
--- /dev/null
+++ b/pkgs/by-name/xc/xcompmgr/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libxcomposite,
+  libxdamage,
+  libxext,
+  libxfixes,
+  libxrender,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xcompmgr";
+  version = "1.1.10";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xcompmgr-${finalAttrs.version}.tar.xz";
+    hash = "sha256-eCT3CcTyJDLq6nVC7JM4Tl3Uj2/LhcEv+C1yFCOwuY8=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libxcomposite
+    libxdamage
+    libxext
+    libxfixes
+    libxrender
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "Sample X11 compositing manager";
+    longDescription = ''
+      xcompmgr is a sample compositing manager for X servers supporting the XFIXES, DAMAGE, RENDER
+      and COMPOSITE extensions. It enables basic eye-candy effects.
+    '';
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xcompmgr";
+    license = lib.licenses.hpndSellVariant;
+    mainProgram = "xcompmgr";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index c46dffee19f9..9698be43cffa 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -95,6 +95,7 @@
   xcalc,
   xcb-proto,
   xcmsdb,
+  xcompmgr,
   xconsole,
   xcursorgen,
   xcursor-themes,
@@ -161,6 +162,7 @@ self: with self; {
     xbitmaps
     xcalc
     xcmsdb
+    xcompmgr
     xconsole
     xcursorgen
     xdriinfo
@@ -1269,50 +1271,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xcompmgr = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libXcomposite,
-      libXdamage,
-      libXext,
-      libXfixes,
-      xorgproto,
-      libXrender,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xcompmgr";
-      version = "1.1.10";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xcompmgr-1.1.10.tar.xz";
-        sha256 = "13xrn0ii8widz0pw31fbdy7x8paf729yqhkmxbm3497jqh4zf93q";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libXcomposite
-        libXdamage
-        libXext
-        libXfixes
-        xorgproto
-        libXrender
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xdm = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index ee8280999425..30fe7403d84d 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -422,6 +422,7 @@ print OUT <<EOF;
   xcalc,
   xcb-proto,
   xcmsdb,
+  xcompmgr,
   xconsole,
   xcursorgen,
   xcursor-themes,
@@ -488,6 +489,7 @@ self: with self; {
     xbitmaps
     xcalc
     xcmsdb
+    xcompmgr
     xconsole
     xcursorgen
     xdriinfo
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index c81b580849e5..1b1131727922 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -720,7 +720,6 @@ self: super:
   });
 
   xclock = addMainProgram super.xclock { };
-  xcompmgr = addMainProgram super.xcompmgr { };
 
   xinit =
     (super.xinit.override {
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index beabc520243d..69f7cc3e3e82 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -5,7 +5,6 @@ mirror://xorg/individual/app/iceauth-1.0.10.tar.xz
 mirror://xorg/individual/app/oclock-1.0.6.tar.xz
 mirror://xorg/individual/app/setxkbmap-1.3.4.tar.xz
 mirror://xorg/individual/app/xclock-1.1.1.tar.xz
-mirror://xorg/individual/app/xcompmgr-1.1.10.tar.xz
 mirror://xorg/individual/app/xdm-1.1.17.tar.xz
 mirror://xorg/individual/app/xdpyinfo-1.3.4.tar.xz
 mirror://xorg/individual/app/xeyes-1.3.0.tar.xz
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5b37605f35c3..677cc7f08e32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13357,8 +13357,6 @@ with pkgs;
 
   xca = qt6Packages.callPackage ../applications/misc/xca { };
 
-  inherit (xorg) xcompmgr;
-
   xdg-desktop-portal = callPackage ../development/libraries/xdg-desktop-portal { };
 
   xdg-desktop-portal-hyprland =

From 3ccc4089b6a1a9edd2be3ac472688e65be67b24c Mon Sep 17 00:00:00 2001
From: quantenzitrone <general@dev.quantenzitrone.eu>
Date: Wed, 10 Sep 2025 17:35:18 +0200
Subject: [PATCH 0173/6226] xeyes: 1.3.0 -> 1.3.1, refactor & move to
 pkgs/by-name from xorg namespace

---
 pkgs/by-name/xe/xeyes/package.nix             | 59 +++++++++++++++++++
 pkgs/servers/x11/xorg/default.nix             | 50 +---------------
 .../x11/xorg/generate-expr-from-tarballs.pl   |  2 +
 pkgs/servers/x11/xorg/overrides.nix           |  2 -
 pkgs/servers/x11/xorg/tarballs.list           |  1 -
 5 files changed, 63 insertions(+), 51 deletions(-)
 create mode 100644 pkgs/by-name/xe/xeyes/package.nix

diff --git a/pkgs/by-name/xe/xeyes/package.nix b/pkgs/by-name/xe/xeyes/package.nix
new file mode 100644
index 000000000000..b23c50e764ae
--- /dev/null
+++ b/pkgs/by-name/xe/xeyes/package.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  pkg-config,
+  xorgproto,
+  libx11,
+  libxcb,
+  libxext,
+  libxi,
+  libxmu,
+  libxrender,
+  libxt,
+  writeScript,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "xeyes";
+  version = "1.3.1";
+
+  src = fetchurl {
+    url = "mirror://xorg/individual/app/xeyes-${finalAttrs.version}.tar.xz";
+    hash = "sha256-VgjXa3sarF7X8i8ba1rXTvmMhpMiDzK0uH3M7kqVbqo=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [
+    xorgproto
+    libx11
+    libxcb
+    libxext
+    libxi
+    libxmu
+    libxrender
+    libxt
+  ];
+
+  passthru = {
+    updateScript = writeScript "update-${finalAttrs.pname}" ''
+      #!/usr/bin/env nix-shell
+      #!nix-shell -i bash -p common-updater-scripts
+      version="$(list-directory-versions --pname ${finalAttrs.pname} \
+        --url https://xorg.freedesktop.org/releases/individual/app/ \
+        | sort -V | tail -n1)"
+      update-source-version ${finalAttrs.pname} "$version"
+    '';
+  };
+
+  meta = {
+    description = "A \"follow the mouse\" X demo, using the X SHAPE extension";
+    homepage = "https://gitlab.freedesktop.org/xorg/app/xeyes";
+    license = lib.licenses.x11;
+    mainProgram = "xeyes";
+    maintainers = [ ];
+    platforms = lib.platforms.unix;
+  };
+})
diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix
index 9698be43cffa..7b1b67bd6429 100644
--- a/pkgs/servers/x11/xorg/default.nix
+++ b/pkgs/servers/x11/xorg/default.nix
@@ -101,6 +101,7 @@
   xcursor-themes,
   xdriinfo,
   xev,
+  xeyes,
   xfontsel,
   xfsinfo,
   xgamma,
@@ -167,6 +168,7 @@ self: with self; {
     xcursorgen
     xdriinfo
     xev
+    xeyes
     xfontsel
     xfsinfo
     xgamma
@@ -1389,54 +1391,6 @@ self: with self; {
     })
   ) { };
 
-  # THIS IS A GENERATED FILE.  DO NOT EDIT!
-  xeyes = callPackage (
-    {
-      stdenv,
-      pkg-config,
-      fetchurl,
-      libX11,
-      libxcb,
-      libXext,
-      libXi,
-      libXmu,
-      xorgproto,
-      libXrender,
-      libXt,
-      testers,
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "xeyes";
-      version = "1.3.0";
-      builder = ./builder.sh;
-      src = fetchurl {
-        url = "mirror://xorg/individual/app/xeyes-1.3.0.tar.xz";
-        sha256 = "08rhfp5xlmdbyxkvxhgjxdn6vwzrbrjyd7jkk8b7wi1kpw0ccl09";
-      };
-      hardeningDisable = [
-        "bindnow"
-        "relro"
-      ];
-      strictDeps = true;
-      nativeBuildInputs = [ pkg-config ];
-      buildInputs = [
-        libX11
-        libxcb
-        libXext
-        libXi
-        libXmu
-        xorgproto
-        libXrender
-        libXt
-      ];
-      passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-      meta = {
-        pkgConfigModules = [ ];
-        platforms = lib.platforms.unix;
-      };
-    })
-  ) { };
-
   # THIS IS A GENERATED FILE.  DO NOT EDIT!
   xf86inputevdev = callPackage (
     {
diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
index 30fe7403d84d..2c5a41fb9da2 100755
--- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
+++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl
@@ -428,6 +428,7 @@ print OUT <<EOF;
   xcursor-themes,
   xdriinfo,
   xev,
+  xeyes,
   xfontsel,
   xfsinfo,
   xgamma,
@@ -494,6 +495,7 @@ self: with self; {
     xcursorgen
     xdriinfo
     xev
+    xeyes
     xfontsel
     xfsinfo
     xgamma
diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix
index 1b1131727922..e8b86dc703aa 100644
--- a/pkgs/servers/x11/xorg/overrides.nix
+++ b/pkgs/servers/x11/xorg/overrides.nix
@@ -411,8 +411,6 @@ self: super:
     };
   });
 
-  xeyes = addMainProgram super.xeyes { };
-
   xkbcomp = super.xkbcomp.overrideAttrs (attrs: {
     configureFlags = [ "--with-xkb-config-root=${xorg.xkeyboardconfig}/share/X11/xkb" ];
     meta = attrs.meta // {
diff --git a/pkgs/servers/x11/xorg/tarballs.list b/pkgs/servers/x11/xorg/tarballs.list
index 69f7cc3e3e82..fe66e12856b9 100644
--- a/pkgs/servers/x11/xorg/tarballs.list
+++ b/pkgs/servers/x11/xorg/tarballs.list
@@ -7,7 +7,6 @@ mirror://xorg/individual/app/setxkbmap-1.3.4.tar.xz
 mirror://xorg/individual/app/xclock-1.1.1.tar.xz
 mirror://xorg/individual/app/xdm-1.1.17.tar.xz
 mirror://xorg/individual/app/xdpyinfo-1.3.4.tar.xz
-mirror://xorg/individual/app/xeyes-1.3.0.tar.xz
 mirror://xorg/individual/app/xfd-1.1.4.tar.xz
 mirror://xorg/individual/app/xfs-1.2.2.tar.xz
 mirror://xorg/individual/app/xinit-1.4.4.tar.xz

From 45439ecf584b1c6597f066109d17833e4d294b71 Mon Sep 17 00:00:00 2001
From: Alois Wohlschlager <alois1@gmx-topmail.de>
Date: Wed, 24 Sep 2025 18:35:23 +0200
Subject: [PATCH 0174/6226] nlohmann_json: make musl support patch
 unconditional

Mass rebuild cleanup after https://github.com/NixOS/nixpkgs/pull/445699 .
---
 pkgs/by-name/nl/nlohmann_json/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/nl/nlohmann_json/package.nix b/pkgs/by-name/nl/nlohmann_json/package.nix
index e11fa98c8373..23b36c48cffd 100644
--- a/pkgs/by-name/nl/nlohmann_json/package.nix
+++ b/pkgs/by-name/nl/nlohmann_json/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-cECvDOLxgX7Q9R3IE86Hj9JJUxraDQvhoyPDF03B2CY=";
   };
 
-  patches = lib.optionals stdenv.hostPlatform.isMusl [
+  patches = [
     # Musl does not support LC_NUMERIC, causing a test failure.
     # Turn the error into a warning to make the test succeed.
     # https://github.com/nlohmann/json/pull/4770

From 5b502715d2f49dc7a6caa29ed666d83c779cd822 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 24 Sep 2025 09:51:41 -0700
Subject: [PATCH 0175/6226] python3Packages.numpy: use fetchFromGitHub

---
 pkgs/development/python-modules/numpy/2.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/numpy/2.nix b/pkgs/development/python-modules/numpy/2.nix
index b6fd45abd961..46b338fb2ff1 100644
--- a/pkgs/development/python-modules/numpy/2.nix
+++ b/pkgs/development/python-modules/numpy/2.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchPypi,
+  fetchFromGitHub,
   python,
   numpy_2,
   pythonAtLeast,
@@ -64,10 +64,12 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.11";
 
-  src = fetchPypi {
-    inherit pname version;
-    extension = "tar.gz";
-    hash = "sha256-3cfDlye6YrgN/b7fQA0cEN36ju+9fsjcsRi+i1bTECk=";
+  src = fetchFromGitHub {
+    owner = "numpy";
+    repo = "numpy";
+    tag = "v${version}";
+    fetchSubmodules = true;
+    hash = "sha256-6RMzF5vOWSX7gL3mps9ECClJF3mNqL1mexM6j8/yfdc=";
   };
 
   patches = lib.optionals python.hasDistutilsCxxPatch [
@@ -176,7 +178,7 @@ buildPythonPackage rec {
   };
 
   meta = {
-    changelog = "https://github.com/numpy/numpy/releases/tag/v${version}";
+    changelog = "https://github.com/numpy/numpy/releases/tag/${src.tag}";
     description = "Scientific tools for Python";
     homepage = "https://numpy.org/";
     license = lib.licenses.bsd3;

From 045280cef58e6e9765004392500fcca16c124bad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 19:38:14 +0000
Subject: [PATCH 0176/6226] manifest-tool: 2.2.0 -> 2.2.1

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

diff --git a/pkgs/by-name/ma/manifest-tool/package.nix b/pkgs/by-name/ma/manifest-tool/package.nix
index a9ef6eb830b9..71190b146eba 100644
--- a/pkgs/by-name/ma/manifest-tool/package.nix
+++ b/pkgs/by-name/ma/manifest-tool/package.nix
@@ -10,14 +10,14 @@
 
 buildGoModule rec {
   pname = "manifest-tool";
-  version = "2.2.0";
+  version = "2.2.1";
   modRoot = "v2";
 
   src = fetchFromGitHub {
     owner = "estesp";
     repo = "manifest-tool";
     tag = "v${version}";
-    hash = "sha256-tEUsqrJGRhyirI8TEgG6r9crHX58webHO5v7JLLRQ30=";
+    hash = "sha256-3Vzeq81zLfJLV1XcnQLixL9+acjIegjspquvMsgtuXg=";
     leaveDotGit = true;
     postFetch = ''
       git -C $out rev-parse HEAD > $out/.git-revision

From 4553bdcc62b33811d230044c42bf3077d882d7a8 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Wed, 24 Sep 2025 17:10:44 -0400
Subject: [PATCH 0177/6226] ada: 3.2.8 -> 3.3.0

Diff: https://github.com/ada-url/ada/compare/v3.2.8...v3.3.0
---
 pkgs/by-name/ad/ada/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ad/ada/package.nix b/pkgs/by-name/ad/ada/package.nix
index e21d071ec41b..5f955f2f4b48 100644
--- a/pkgs/by-name/ad/ada/package.nix
+++ b/pkgs/by-name/ad/ada/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ada";
-  version = "3.2.8";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "ada-url";
     repo = "ada";
     tag = "v${version}";
-    hash = "sha256-ZqDuNV4LvVyCiUwnQqnq+BG5ZImqZg0Q01sjztMTdvc=";
+    hash = "sha256-MzQ8Tefwct4/LlTWA8BpnnHMSzWmKvnf0OO5exAzIfI=";
   };
 
   nativeBuildInputs = [ cmake ];

From e205e2baf6853e90079a834c59430210e5dde4ef Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 25 Sep 2025 00:06:07 +0200
Subject: [PATCH 0178/6226] expat: 2.7.2 -> 2.7.3

https://github.com/libexpat/libexpat/blob/R_2_7_3/expat/Changes
---
 pkgs/by-name/ex/expat/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ex/expat/package.nix b/pkgs/by-name/ex/expat/package.nix
index ba5a46d034f8..d650a64b19fc 100644
--- a/pkgs/by-name/ex/expat/package.nix
+++ b/pkgs/by-name/ex/expat/package.nix
@@ -18,7 +18,7 @@
 # files.
 
 let
-  version = "2.7.2";
+  version = "2.7.3";
   tag = "R_${lib.replaceStrings [ "." ] [ "_" ] version}";
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
     url =
       with finalAttrs;
       "https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz";
-    hash = "sha256-Ibd4s07IN8KsKFrvNA+ftfoGOoEbIepNJBKpcCyImVw=";
+    hash = "sha256-cd+PQHBqe7CoClNnB56nXZHaT4xlxY7Fm837997Nq58=";
   };
 
   strictDeps = true;

From eb0701c0379b56cb19f0eebb81f83de0d3537f03 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Mon, 1 Sep 2025 19:29:07 +0900
Subject: [PATCH 0179/6226] python3Packages.typing-extensions: 4.14.1 -> 4.15.0

https://github.com/python/typing_extensions/blob/4.15.0/CHANGELOG.md#release-4150-august-25-2025
Signed-off-by: misilelab <misileminecord@gmail.com>
---
 .../python-modules/typing-extensions/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/typing-extensions/default.nix b/pkgs/development/python-modules/typing-extensions/default.nix
index 662ad9c5eb9a..a85bb0348976 100644
--- a/pkgs/development/python-modules/typing-extensions/default.nix
+++ b/pkgs/development/python-modules/typing-extensions/default.nix
@@ -11,17 +11,17 @@
 
 buildPythonPackage rec {
   pname = "typing-extensions";
-  version = "4.14.1";
+  version = "4.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "python";
     repo = "typing_extensions";
     tag = version;
-    hash = "sha256-KzfxVUgPN1cLg73A3TC2zQjYfeLc8x9TtbLmOfmlOkY=";
+    hash = "sha256-3oAlwvNSJ7NhPiHekh4SJI99cPFh29KCCR9314QzsvQ=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  build-system = [ flit-core ];
 
   pythonImportsCheck = [ "typing_extensions" ];
 

From ef9f3abca92d6e5c56a58e009649cc421beda87c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 01:26:12 +0000
Subject: [PATCH 0180/6226] freerdp: 3.17.1 -> 3.17.2

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

diff --git a/pkgs/by-name/fr/freerdp/package.nix b/pkgs/by-name/fr/freerdp/package.nix
index cf914d822b30..07633d76f71b 100644
--- a/pkgs/by-name/fr/freerdp/package.nix
+++ b/pkgs/by-name/fr/freerdp/package.nix
@@ -63,13 +63,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "freerdp";
-  version = "3.17.1";
+  version = "3.17.2";
 
   src = fetchFromGitHub {
     owner = "FreeRDP";
     repo = "FreeRDP";
     rev = finalAttrs.version;
-    hash = "sha256-KAlxpoGOqvHTqKkb/yMrquSckFfMXgbEfxr2IuLPZFQ=";
+    hash = "sha256-r9a+tQ3QIBfF4Vtyo4F4dwqLloxJTTFUQFV8J53ITZ4=";
   };
 
   postPatch = ''

From 0714665a367c4ef1f855d6c47cb81afd9babd925 Mon Sep 17 00:00:00 2001
From: "git@71rd.net" <git@71rd.net>
Date: Wed, 24 Sep 2025 20:14:46 +0000
Subject: [PATCH 0181/6226] softhsm: switch backend to openssl

Switching softhsm to use OpenSSL instead of botan2 for cryptography.
Botan2 has been end-of-life since January 2025 and can not be built with gcc-15, and softhsm does not support botan3.
---
 pkgs/by-name/so/softhsm/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/so/softhsm/package.nix b/pkgs/by-name/so/softhsm/package.nix
index 9a7d3746d7cf..77a2e6a56f07 100644
--- a/pkgs/by-name/so/softhsm/package.nix
+++ b/pkgs/by-name/so/softhsm/package.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  botan2,
+  openssl,
   sqlite,
   autoreconfHook,
 }:
@@ -24,8 +24,8 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--with-crypto-backend=botan"
-    "--with-botan=${lib.getDev botan2}"
+    "--with-crypto-backend=openssl"
+    "--with-openssl=${lib.getDev openssl}"
     "--with-objectstore-backend-db"
     "--sysconfdir=$out/etc"
     "--localstatedir=$out/var"
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
-    botan2
+    openssl
     sqlite
   ];
 

From 3d60f7f7825836ce488d847f2ab2e3440b499608 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 04:50:51 +0000
Subject: [PATCH 0182/6226] quickjs: 2025-04-26 -> 2025-09-13-2

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

diff --git a/pkgs/by-name/qu/quickjs/package.nix b/pkgs/by-name/qu/quickjs/package.nix
index 339195f5db76..c687be6be8a2 100644
--- a/pkgs/by-name/qu/quickjs/package.nix
+++ b/pkgs/by-name/qu/quickjs/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quickjs";
-  version = "2025-04-26";
+  version = "2025-09-13-2";
 
   src = fetchurl {
     url = "https://bellard.org/quickjs/quickjs-${finalAttrs.version}.tar.xz";
-    hash = "sha256-LyAHTCUWbvb3gfOBxQ1XtQLLhdRw1jmrzOu+95VMg78=";
+    hash = "sha256-mWxrUBj8lVrU0GQm0OnLcTaFoAyCWqXAQYvVP334sLQ=";
   };
 
   outputs = [

From bf7a3cc12528f8d1bd3606149773ec39154ae17e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 07:31:12 +0000
Subject: [PATCH 0183/6226] kronosnet: 1.31 -> 1.32

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

diff --git a/pkgs/by-name/kr/kronosnet/package.nix b/pkgs/by-name/kr/kronosnet/package.nix
index 7bd2dd09ab6e..f319154c4ec7 100644
--- a/pkgs/by-name/kr/kronosnet/package.nix
+++ b/pkgs/by-name/kr/kronosnet/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "kronosnet";
-  version = "1.31";
+  version = "1.32";
 
   src = fetchFromGitHub {
     owner = "kronosnet";
     repo = "kronosnet";
     rev = "v${version}";
-    sha256 = "sha256-PZWaKrCy0S8d/x3GMh7X2wEiHwgiuEFpfCwKpbLvhsc=";
+    sha256 = "sha256-g2AgVAFEmRlMaqH7uRabSNJP0ehUQ6Iws4LT2iB8kTA=";
   };
 
   nativeBuildInputs = [

From 94a62b70da0de0a365e9998d1a7f8fc9e3f195cd Mon Sep 17 00:00:00 2001
From: Jacek Galowicz <jacek@galowicz.de>
Date: Wed, 24 Sep 2025 15:42:39 +0200
Subject: [PATCH 0184/6226] iproute2: Don't add python dependency by default

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

diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix
index ab399a44c343..c298e3452a35 100644
--- a/pkgs/by-name/ip/iproute2/package.nix
+++ b/pkgs/by-name/ip/iproute2/package.nix
@@ -57,6 +57,7 @@ stdenv.mkDerivation rec {
   outputs = [
     "out"
     "dev"
+    "scripts"
   ];
 
   configureFlags = [
@@ -87,6 +88,10 @@ stdenv.mkDerivation rec {
     "CONFDIR=$(out)/etc/iproute2"
   ];
 
+  postInstall = ''
+    moveToOutput sbin/routel "$scripts"
+  '';
+
   depsBuildBuild = [ buildPackages.stdenv.cc ]; # netem requires $HOSTCC
   nativeBuildInputs = [
     bison

From 51fbb3a0951f904a382549a413d797b76377f79d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 12:34:06 +0000
Subject: [PATCH 0185/6226] smartdns: 46.1 -> 47

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

diff --git a/pkgs/by-name/sm/smartdns/package.nix b/pkgs/by-name/sm/smartdns/package.nix
index dcb20ec7015d..44f3fe7ad31c 100644
--- a/pkgs/by-name/sm/smartdns/package.nix
+++ b/pkgs/by-name/sm/smartdns/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "smartdns";
-  version = "46.1";
+  version = "47";
 
   src = fetchFromGitHub {
     owner = "pymumu";
     repo = "smartdns";
     rev = "Release${version}";
-    hash = "sha256-IvaED1V1pP0/Qk2oND3fVr7PMXSnT9jFeuikEkndX0o=";
+    hash = "sha256-8OK1OV3Jvj/5nUOxnWTTQAa1Qe3RGxNwJhYEZ7O1RIE=";
   };
 
   buildInputs = [ openssl ];

From b7b1ce197f43b6b916ac8e8cc4b2cc736a5e8f05 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Wed, 24 Sep 2025 15:13:33 +0200
Subject: [PATCH 0186/6226] nodejs_22: 22.19.0 -> 22.20.0

---
 pkgs/development/web/nodejs/nodejs.nix |  4 ++++
 pkgs/development/web/nodejs/v22.nix    | 16 +++++++---------
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index fad46782599c..863be3a828f3 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -420,6 +420,10 @@ let
             ]
             # Those are annoyingly flaky, but not enough to be marked as such upstream.
             ++ lib.optional (majorVersion == "22") "test-child-process-stdout-flush-exit"
+            ++ lib.optionals (majorVersion == "22" && stdenv.buildPlatform.isDarwin) [
+              "test-cluster-dgram-1"
+              "test/sequential/test-http-server-request-timeouts-mixed.js"
+            ]
           )
         }"
       ];
diff --git a/pkgs/development/web/nodejs/v22.nix b/pkgs/development/web/nodejs/v22.nix
index 0a794f6e3e41..182103df4262 100644
--- a/pkgs/development/web/nodejs/v22.nix
+++ b/pkgs/development/web/nodejs/v22.nix
@@ -15,12 +15,16 @@ let
     python = python3;
   };
 
-  gypPatches = if stdenv.buildPlatform.isDarwin then callPackage ./gyp-patches.nix { } else [ ];
+  gypPatches =
+    if stdenv.buildPlatform.isDarwin then
+      callPackage ./gyp-patches.nix { patch_tools = false; }
+    else
+      [ ];
 in
 buildNodejs {
   inherit enableNpm;
-  version = "22.19.0";
-  sha256 = "0272acfce50ce9ad060288321b1092719a7f19966f81419835410c59c09daa46";
+  version = "22.20.0";
+  sha256 = "ff7a6a6e8a1312af5875e40058351c4f890d28ab64c32f12b2cc199afa22002d";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then
@@ -53,11 +57,5 @@ buildNodejs {
       ./use-correct-env-in-tests.patch
       ./bin-sh-node-run-v22.patch
       ./use-nix-codesign.patch
-
-      # TODO: remove when included in a release
-      (fetchpatch2 {
-        url = "https://github.com/nodejs/node/commit/499a5c345165f0d4a94b98d08f1ace7268781564.patch?full_index=1";
-        hash = "sha256-wF4+CytC1OB5egJGOfLm1USsYY12f9kADymVrxotezE=";
-      })
     ];
 }

From 8c4c81665c1bb81021539c483547ae2bf42afb88 Mon Sep 17 00:00:00 2001
From: ThinkChaos <ThinkChaos@users.noreply.github.com>
Date: Wed, 24 Sep 2025 21:51:22 -0400
Subject: [PATCH 0187/6226] feishin: 0.12.6 -> 0.20.1

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

diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix
index b831f522d769..400ac62181f7 100644
--- a/pkgs/by-name/fe/feishin/package.nix
+++ b/pkgs/by-name/fe/feishin/package.nix
@@ -4,31 +4,43 @@
   buildNpmPackage,
   fetchFromGitHub,
   electron_36,
+  dart-sass,
+  pnpm_10,
   darwin,
   copyDesktopItems,
   makeDesktopItem,
 }:
 let
   pname = "feishin";
-  version = "0.12.6";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "jeffvli";
     repo = "feishin";
-    rev = "v${version}";
-    hash = "sha256-cnlPks/sJdcxHdIppHn8Q8d2tkwVlPMofQxjdAlBreg=";
+    tag = "v${version}";
+    hash = "sha256-WJMaLMrv6LSw/wxn7EZOSYqwAlgW3UkeYvxV4vEkCfM=";
   };
 
   electron = electron_36;
+  pnpm = pnpm_10;
 in
 buildNpmPackage {
   inherit pname version;
 
   inherit src;
-  npmDepsHash = "sha256-lThh29prT/cHRrp2mEtUW4eeVfCtkk+54EPNUyGHyq8=";
 
-  npmFlags = [ "--legacy-peer-deps" ];
-  makeCacheWritable = true;
+  npmConfigHook = pnpm.configHook;
+
+  npmDeps = null;
+  pnpmDeps = pnpm.fetchDeps {
+    inherit
+      pname
+      version
+      src
+      ;
+    fetcherVersion = 2;
+    hash = "sha256-8di4WZ30oE4q3l8Nthgihk6q+ob/Mz/UrofrtsLFzhc=";
+  };
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 
@@ -39,40 +51,26 @@ buildNpmPackage {
   postPatch = ''
     # release/app dependencies are installed on preConfigure
     substituteInPlace package.json \
-      --replace-fail "electron-builder install-app-deps &&" ""
+      --replace-fail '"postinstall": "electron-builder install-app-deps",' ""
 
     # Don't check for updates.
-    substituteInPlace src/main/main.ts \
+    substituteInPlace src/main/index.ts \
       --replace-fail "autoUpdater.checkForUpdatesAndNotify();" ""
   ''
   + lib.optionalString stdenv.hostPlatform.isLinux ''
     # https://github.com/electron/electron/issues/31121
-    substituteInPlace src/main/main.ts \
+    substituteInPlace src/main/index.ts \
       --replace-fail "process.resourcesPath" "'$out/share/feishin/resources'"
   '';
 
-  preConfigure =
-    let
-      releaseAppDeps = buildNpmPackage {
-        pname = "${pname}-release-app";
-        inherit version;
+  preBuild = ''
+    rm -r node_modules/.pnpm/sass-embedded-*
 
-        src = "${src}/release/app";
-        npmDepsHash = "sha256-kEe5HH/oslH8vtAcJuWTOLc0ZQPxlDVMS4U0RpD8enE=";
-
-        npmFlags = [ "--ignore-scripts" ];
-        dontNpmBuild = true;
-
-        env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
-      };
-      releaseNodeModules = "${releaseAppDeps}/lib/node_modules/feishin/node_modules";
-    in
-    ''
-      for release_module_path in "${releaseNodeModules}"/*; do
-        rm -rf node_modules/"$(basename "$release_module_path")"
-        ln -s "$release_module_path" node_modules/
-      done
-    '';
+    test -d node_modules/.pnpm/sass-embedded@*
+    dir="$(echo node_modules/.pnpm/sass-embedded@*)/node_modules/sass-embedded/dist/lib/src/vendor/dart-sass"
+    mkdir -p "$dir"
+    ln -s ${dart-sass}/bin/dart-sass "$dir"/sass
+  '';
 
   postBuild =
     lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -103,7 +101,8 @@ buildNpmPackage {
   ''
   + lib.optionalString stdenv.hostPlatform.isLinux ''
     mkdir -p $out/share/feishin
-    pushd release/build/*/
+
+    pushd dist/*-unpacked/
     cp -r locales resources{,.pak} $out/share/feishin
     popd
 

From 6b7e5a5acac9d6a63dbc97e2fbadcea6545383cf Mon Sep 17 00:00:00 2001
From: Leona Maroni <lm@flyingcircus.io>
Date: Thu, 25 Sep 2025 16:28:46 +0200
Subject: [PATCH 0188/6226] nixos/nginx: remove deprecated vhost option
 enableSSL

The option services.nginx.virtualHost.<...>.enableSSL is deprecated for
8 years [^1]. It causes confusion for people who guess the option and
think it's the right one.
I think it's time to remove it for good.

^1: https://github.com/NixOS/nixpkgs/commit/a912a6a291eaa5f6a2ad9143c9e276779c357a41
---
 .../services/web-servers/nginx/default.nix       | 16 ++--------------
 .../services/web-servers/nginx/vhost-options.nix |  6 ------
 nixos/tests/matrix/conduit.nix                   |  2 +-
 3 files changed, 3 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 04495f81c165..3704634512eb 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -324,7 +324,7 @@ let
     mapAttrsToList (
       vhostName: vhost:
       let
-        onlySSL = vhost.onlySSL || vhost.enableSSL;
+        onlySSL = vhost.onlySSL;
         hasSSL = onlySSL || vhost.addSSL || vhost.forceSSL;
 
         # First evaluation of defaultListen based on a set of listen lines.
@@ -1324,18 +1324,6 @@ in
   ];
 
   config = mkIf cfg.enable {
-    warnings =
-      let
-        deprecatedSSL =
-          name: config:
-          optional config.enableSSL ''
-            config.services.nginx.virtualHosts.<name>.enableSSL is deprecated,
-            use config.services.nginx.virtualHosts.<name>.onlySSL instead.
-          '';
-
-      in
-      flatten (mapAttrsToList deprecatedSSL virtualHosts);
-
     assertions =
       let
         hostOrAliasIsNull = l: l.root == null || l.alias == null;
@@ -1352,7 +1340,7 @@ in
             with host;
             count id [
               addSSL
-              (onlySSL || enableSSL)
+              onlySSL
               forceSSL
               rejectSSL
             ] <= 1
diff --git a/nixos/modules/services/web-servers/nginx/vhost-options.nix b/nixos/modules/services/web-servers/nginx/vhost-options.nix
index 169c443d759a..547a85f5f700 100644
--- a/nixos/modules/services/web-servers/nginx/vhost-options.nix
+++ b/nixos/modules/services/web-servers/nginx/vhost-options.nix
@@ -170,12 +170,6 @@ with lib;
       '';
     };
 
-    enableSSL = mkOption {
-      type = types.bool;
-      visible = false;
-      default = false;
-    };
-
     forceSSL = mkOption {
       type = types.bool;
       default = false;
diff --git a/nixos/tests/matrix/conduit.nix b/nixos/tests/matrix/conduit.nix
index 874e7672812b..02bf00886ba4 100644
--- a/nixos/tests/matrix/conduit.nix
+++ b/nixos/tests/matrix/conduit.nix
@@ -18,7 +18,7 @@ in
         virtualHosts.${name} = {
           enableACME = false;
           forceSSL = false;
-          enableSSL = false;
+          onlySSL = false;
 
           locations."/_matrix" = {
             proxyPass = "http://[::1]:6167";

From b95b6d641ef6f188fc0bcf8f114fa7f6805e491d Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Tue, 16 Sep 2025 19:58:22 +0300
Subject: [PATCH 0189/6226] python27: fix build with gcc15

- add " -std=gnu17" to `env.NIX_CFLAGS_COMPILE`

Fixes build failure with gcc15:
```
In file included from Include/Python-ast.h:3,
                 from Python/bltinmodule.c:4:
Include/asdl.h:9:15: error: cannot use keyword 'false' as enumeration constant
    9 | typedef enum {false, true} bool;
      |               ^~~~~
Include/asdl.h:9:15: note: 'false' is a keyword with '-std=c23' onwards
Include/asdl.h:9:28: error: expected ';', identifier or '(' before 'bool'
    9 | typedef enum {false, true} bool;
      |                            ^~~~
Include/asdl.h:9:28: warning: useless type name in empty declaration
In file included from Include/Python-ast.h:3,
                 from Python/compile.c:26:
Include/asdl.h:9:15: error: cannot use keyword 'false' as enumeration constant
    9 | typedef enum {false, true} bool;
      |               ^~~~~
Include/asdl.h:9:15: note: 'false' is a keyword with '-std=c23' onwards
Include/asdl.h:9:28: error: expected ';', identifier or '(' before 'bool'
    9 | typedef enum {false, true} bool;
      |                            ^~~~
```
---
 pkgs/development/interpreters/python/cpython/2.7/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/cpython/2.7/default.nix b/pkgs/development/interpreters/python/cpython/2.7/default.nix
index 94ff0c97dfa8..2c2b3b597991 100644
--- a/pkgs/development/interpreters/python/cpython/2.7/default.nix
+++ b/pkgs/development/interpreters/python/cpython/2.7/default.nix
@@ -319,7 +319,8 @@ stdenv.mkDerivation (
 
     env.NIX_CFLAGS_COMPILE =
       lib.optionalString (stdenv.targetPlatform.system == "x86_64-darwin") "-msse2"
-      + lib.optionalString stdenv.hostPlatform.isMusl " -DTHREAD_STACK_SIZE=0x100000";
+      + lib.optionalString stdenv.hostPlatform.isMusl " -DTHREAD_STACK_SIZE=0x100000"
+      + " -std=gnu17";
     DETERMINISTIC_BUILD = 1;
 
     setupHook = python-setup-hook sitePackages;

From 27ad68cde0af3d74d5d0350f2d2776de41fa363e Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Tue, 16 Sep 2025 14:24:55 +0300
Subject: [PATCH 0190/6226] graphite2: fix build with gcc15

- add patch from fedora, that adds missing `#include <stdint.h>`

Fixes build failure with gcc15:
```
/build/graphite2-1.3.14/tests/featuremap/featuremaptest.cpp: In function 'void testFeatTable(const T&, const std::string&)':
/build/graphite2-1.3.14/tests/featuremap/featuremaptest.cpp:310:14: error: 'uint16_t' was not declared in this scope [-Wtemplate-body]
  310 |         for (uint16_t j = 0; j < table.m_defs[i].m_numFeatSettings; j++)
      |              ^~~~~~~~
/build/graphite2-1.3.14/tests/featuremap/featuremaptest.cpp:310:14: note: 'uint16_t' is defined in header '<cstdint>'; this is probably fixable by adding '#include <cstdint>'
/build/graphite2-1.3.14/tests/featuremap/featuremaptest.cpp:310:30: error: 'j' was not declared in this scope [-Wtemplate-body]
  310 |         for (uint16_t j = 0; j < table.m_defs[i].m_numFeatSettings; j++)
      |                              ^
```
---
 pkgs/development/libraries/silgraphite/graphite2.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix
index 5a25cb3571d7..768e4a0ec359 100644
--- a/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   llvmPackages,
+  fetchpatch,
   fetchurl,
   pkg-config,
   freetype,
@@ -39,7 +40,14 @@ stdenv.mkDerivation (finalAttrs: {
     }
   );
 
-  patches = lib.optionals stdenv.hostPlatform.isDarwin [ ./macosx.patch ];
+  patches = [
+    # Fix build with gcc15
+    (fetchpatch {
+      url = "https://src.fedoraproject.org/rpms/graphite2/raw/deba28323b0a3b7a3dcfd06df1efc2195b102ed7/f/graphite2-1.3.14-gcc15.patch";
+      hash = "sha256-vkkGkHkcsj1mD3OHCHLWWgpcmFDv8leC4YQm+TsbIUw=";
+    })
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./macosx.patch ];
   postPatch = ''
     # disable broken 'nametabletest' test, fails on gcc-13:
     #   https://github.com/silnrsi/graphite/pull/74

From 617a17e971a3c6bae01fd2b0ae55310172fb0462 Mon Sep 17 00:00:00 2001
From: SkohTV <contact@skoh.dev>
Date: Wed, 24 Sep 2025 14:08:25 -0400
Subject: [PATCH 0191/6226] vivify: 0.8.2 -> 0.10.0 Also fixed `--version`
 returning an empty string instead of the version Also added default
 `passthru.updateScript`

---
 pkgs/by-name/vi/vivify/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/vi/vivify/package.nix b/pkgs/by-name/vi/vivify/package.nix
index e943e0e15d36..32e76c26cb4c 100644
--- a/pkgs/by-name/vi/vivify/package.nix
+++ b/pkgs/by-name/vi/vivify/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  nix-update-script,
   fetchYarnDeps,
   fetchFromGitHub,
   yarnConfigHook,
@@ -12,18 +13,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vivify";
-  version = "0.8.2";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "jannis-baum";
     repo = "Vivify";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2lxf21T9y4GMFlk0+qbaJJ/twRffYEBoBXZXe/NRDQk=";
+    hash = "sha256-n2l0+CFQ7EXnTZXr+JO7NE1OVSzpphs6lUgHfjebX4M=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-mOgfwetiLMTDquw3f3+U1iEhBbvf0OC5lkNJHdrRSK0=";
+    hash = "sha256-rztQiOod7xI/gF9NQTCsfE7Wulm1eZHjyNLBI1YSNKk=";
   };
 
   installPhase = ''
@@ -40,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace node_modules/.bin/postject \
       --replace-fail '/usr/bin/env node' '${lib.getExe nodejs}'
 
-    make linux
+    make VIV_VERSION=${finalAttrs.version} linux
 
     mkdir -p $out/bin
     install -Dm755 ./build/linux/viv $out/bin/viv
@@ -68,6 +69,8 @@ stdenv.mkDerivation (finalAttrs: {
   # (segmentation fault)
   dontStrip = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Live Markdown viewer";
     longDescription = ''

From ab31528a5c2dfd91daa05eb70b13ea1be0c9ca19 Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Tue, 16 Sep 2025 15:14:31 +0300
Subject: [PATCH 0192/6226] botan2: fix build with gcc15

- add patch from fedora that adds `#include <cstdint.h>` to cli.h

Fixes build failure with gcc15:
```
In file included from src/cli/argon2.cpp:7:
src/cli/cli.h:125:71: error: 'uint8_t' does not name a type
  125 |       static std::string format_blob(const std::string& format, const uint8_t bits[], size_t len);
      |                                                                       ^~~~~~~
src/cli/cli.h:18:1: note: 'uint8_t' is defined in header '<cstdint>';
this is probably fixable by adding '#include <cstdint>'
   17 | #include "cli_exceptions.h"
  +++ |+#include <cstdint>
   18 |
```
---
 pkgs/development/libraries/botan/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
index acf68d135c38..9cfa9570b7f9 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchurl,
   pkgsStatic,
   python3,
@@ -172,5 +173,13 @@ in
   botan2 = common {
     version = "2.19.5";
     hash = "sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ=";
+    patches = [
+      # Fix build with gcc15
+      (fetchpatch {
+        name = "botan2-add-include-cstdint-gcc15.patch";
+        url = "https://src.fedoraproject.org/rpms/botan2/raw/c3fb7a3800df117e7ef8a7617ac8eacb31a4464a/f/f765f0b312f2998498f629d93369babfb2c975b4.patch";
+        hash = "sha256-8Yhxd5TCgxUMtRiv3iq5sQaVjDF+b9slppm38/6l6lw=";
+      })
+    ];
   };
 }

From c529f16459b0f725dc15d2d33bc0e012551bc1be Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Tue, 16 Sep 2025 15:25:37 +0300
Subject: [PATCH 0193/6226] assimp: fix build with gcc15

- add patch from merged upstream PR:
https://www.github.com/assimp/assimp/pull/6283

Fixes build failure with gcc15:
```
/build/source/code/AssetLib/X3D/X3DGeoHelper.cpp: In static member
function 'static void Assimp::X3DGeoHelper::coordIdx_str2lines_arr(const std::vector<int>&, std::vector<aiFace>&)':
/build/source/code/AssetLib/X3D/X3DGeoHelper.cpp:194:20: error: array
subscript -1 is outside array bounds of 'int [2305843009213693951]' [-Werror=array-bounds=]
  194 |     if (f_data.back() != (-1)) {
      |         ~~~~~~~~~~~^~
In file included from /nix/store/9jzssiinw6a2dib6k3hzd48j6ywck4iw-gcc-15.2.0/include/c++/15.2.0/x86_64-unknown-linux-gnu/bits/c++allocator.h:33,
                 from /nix/store/9jzssiinw6a2dib6k3hzd48j6ywck4iw-gcc-15.2.0/include/c++/15.2.0/bits/allocator.h:46,
                 from /nix/store/9jzssiinw6a2dib6k3hzd48j6ywck4iw-gcc-15.2.0/include/c++/15.2.0/string:45,
                 from /build/source/include/assimp/types.h:78,
                 from /build/source/code/AssetLib/X3D/X3DGeoHelper.h:6,
                 from /build/source/code/AssetLib/X3D/X3DGeoHelper.cpp:1:
```
---
 pkgs/by-name/as/assimp/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/as/assimp/package.nix b/pkgs/by-name/as/assimp/package.nix
index 183254f19388..98efe5c597ea 100644
--- a/pkgs/by-name/as/assimp/package.nix
+++ b/pkgs/by-name/as/assimp/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   zlib,
   nix-update-script,
@@ -23,6 +24,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ixtqK+3iiL17GEbEVHz5S6+gJDDQP7bVuSfRMJMGEOY=";
   };
 
+  patches = [
+    # Fix build with gcc15
+    # https://github.com/assimp/assimp/pull/6283
+    (fetchpatch {
+      name = "assimp-fix-invalid-vector-gcc15.patch";
+      url = "https://github.com/assimp/assimp/commit/59bc03d931270b6354690512d0c881eec8b97678.patch";
+      hash = "sha256-O+JPwcOdyFtmFE7eZojHo1DUavF5EhLYlUyxtYo/KF4=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [

From 2f755c315314e43e1ba705ba298c584c1577a594 Mon Sep 17 00:00:00 2001
From: dot-file <Random145@tutamail.com>
Date: Thu, 25 Sep 2025 21:37:26 +0300
Subject: [PATCH 0194/6226] nixos/ly: add types.nullOr in settings

Some options in ly's config.ini can have null as their value (for example, session_log), but the settings option in the NixOS module accepted only str, int and bool types.
---
 nixos/modules/services/display-managers/ly.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/display-managers/ly.nix b/nixos/modules/services/display-managers/ly.nix
index 3dded8ed0624..1141e4f5dfac 100644
--- a/nixos/modules/services/display-managers/ly.nix
+++ b/nixos/modules/services/display-managers/ly.nix
@@ -67,11 +67,13 @@ in
       settings = mkOption {
         type =
           with lib.types;
-          attrsOf (oneOf [
-            str
-            int
-            bool
-          ]);
+          attrsOf (
+            nullOr (oneOf [
+              str
+              int
+              bool
+            ])
+          );
         default = { };
         example = {
           load = false;

From a27f1f492e8d02477130d864a2e2d466a3770d02 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 25 Sep 2025 20:59:15 +0000
Subject: [PATCH 0195/6226] vuetorrent: 2.29.0 -> 2.30.1

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

diff --git a/pkgs/by-name/vu/vuetorrent/package.nix b/pkgs/by-name/vu/vuetorrent/package.nix
index b6c61902323d..3d0ba6b09ae5 100644
--- a/pkgs/by-name/vu/vuetorrent/package.nix
+++ b/pkgs/by-name/vu/vuetorrent/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "vuetorrent";
-  version = "2.29.0";
+  version = "2.30.1";
 
   src = fetchFromGitHub {
     owner = "VueTorrent";
     repo = "VueTorrent";
     tag = "v${version}";
-    hash = "sha256-EnyLMaLElgGUjwxpkhTxV7aVa8l5B5wpBBzg5qyagIQ=";
+    hash = "sha256-sek5kiO1T7s+PIIa0mBGj+9CfF56eRB3En9tsOcEK5Y=";
   };
 
-  npmDepsHash = "sha256-JA5nl+otuyloSi7JPRb8ZJe6PRAaYxuuEpqlmLE65yU=";
+  npmDepsHash = "sha256-vEgwEYVlyTJLOQ8j6hm1O4iTIXNPDZyrmvXyRBgEvQY=";
 
   installPhase = ''
     runHook preInstall

From 666a42cdf57e7d64d108b9ae96e013cebf3f6c02 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Thu, 25 Sep 2025 23:52:06 +0200
Subject: [PATCH 0196/6226] onetbb: build tbbbind

---
 pkgs/by-name/on/onetbb/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/on/onetbb/package.nix b/pkgs/by-name/on/onetbb/package.nix
index 6cebaf75422c..29e59fdb0512 100644
--- a/pkgs/by-name/on/onetbb/package.nix
+++ b/pkgs/by-name/on/onetbb/package.nix
@@ -4,7 +4,9 @@
   fetchFromGitHub,
   fetchpatch,
   cmake,
+  hwloc,
   ninja,
+  pkg-config,
   ctestCheckHook,
 }:
 
@@ -55,6 +57,11 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     ninja
     ctestCheckHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    hwloc
   ];
 
   doCheck = true;
@@ -74,6 +81,10 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail 'tbb_add_test(SUBDIR conformance NAME conformance_resumable_tasks DEPENDENCIES TBB::tbb)' ""
   '';
 
+  cmakeFlags = [
+    (lib.cmakeBool "TBB_DISABLE_HWLOC_AUTOMATIC_SEARCH" false)
+  ];
+
   env = {
     # Fix build with modern gcc
     # In member function 'void std::__atomic_base<_IntTp>::store(__int_type, std::memory_order) [with _ITp = bool]',

From 0ebbd32e66fc04407c0049a0c273d4fceccb92ca Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Fri, 26 Sep 2025 06:22:59 +0800
Subject: [PATCH 0197/6226] learn6502: add updateScript

---
 pkgs/by-name/le/learn6502/package.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/le/learn6502/package.nix b/pkgs/by-name/le/learn6502/package.nix
index cdb1c2bf935f..f2de4c55cad6 100644
--- a/pkgs/by-name/le/learn6502/package.nix
+++ b/pkgs/by-name/le/learn6502/package.nix
@@ -14,7 +14,8 @@
   writableTmpDirAsHomeHook,
   gjs,
   libadwaita,
-  nix-update-script,
+  writeShellScript,
+  nix-update,
 }:
 
 let
@@ -70,7 +71,18 @@ stdenv.mkDerivation (finalAttrs: {
     popd
   '';
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = writeShellScript "update-learn6502" ''
+    ${lib.getExe nix-update} learn6502 || true
+    export HOME=$(mktemp -d)
+    src=$(nix build --no-link --print-out-paths .#learn6502.src)
+    WORKDIR=$(mktemp -d)
+    cp --recursive --no-preserve=mode $src/* $WORKDIR
+    missingHashes=$(nix eval --file . learn6502.missingHashes)
+    pushd $WORKDIR
+    ${lib.getExe yarn-berry.yarn-berry-fetcher} missing-hashes yarn.lock >$missingHashes
+    popd
+    ${lib.getExe nix-update} learn6502 --version skip
+  '';
 
   meta = {
     description = "Modern 6502 Assembly Learning Environment for GNOME";

From 5ca7772aa23dc2225b07ff332bf9910e5669f47b Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Fri, 26 Sep 2025 06:26:26 +0800
Subject: [PATCH 0198/6226] learn6502: 0.3.0 -> 0.4.0

---
 pkgs/by-name/le/learn6502/missing-hashes.json | 52 +++++++++----------
 pkgs/by-name/le/learn6502/package.nix         |  6 +--
 2 files changed, 29 insertions(+), 29 deletions(-)

diff --git a/pkgs/by-name/le/learn6502/missing-hashes.json b/pkgs/by-name/le/learn6502/missing-hashes.json
index e1f0bbcb42c7..6e10eceee45f 100644
--- a/pkgs/by-name/le/learn6502/missing-hashes.json
+++ b/pkgs/by-name/le/learn6502/missing-hashes.json
@@ -1,55 +1,55 @@
 {
   "@esbuild/aix-ppc64@npm:0.25.0": "468ba76b20f43118a11fd589ef162ff12c3c9f988a861045cc421b3100f9ade27103a0743fa9e9882c54dfe2ec647ca9b209cfc17ef61b5c9bc48be95e5856c1",
-  "@esbuild/aix-ppc64@npm:0.25.9": "b5c49f119424bb3f7be30b652ef87bf881824ace02cc2327ba6f7e0f86d04d2afe2087086985f4220dfdbb816acb67e6dfcf00da9eb8b028babfac43df3adac8",
+  "@esbuild/aix-ppc64@npm:0.25.10": "e1a113d75c27f15756d18dc2a9257f07068c7b37a00ed3848c0d903f3e66f2df23156993fca7523422cf5be10417747a1e4faa2e93196f011faab606938174e5",
   "@esbuild/android-arm64@npm:0.25.0": "599fcb6b815a9bc8f83687663653c15ceb1c0f9ea0587da03976972281cd040c23b551a9f772d459809c22f7e218e04f1b159f8da1298b9c79b822f5636eff59",
-  "@esbuild/android-arm64@npm:0.25.9": "afe76da072b16e355f546d1d9023b814ead0487d9fa5e393eeb4bb3f6f76e5542e14b82396ca37c38e868ed64deef6b25f1c47e2564141fe5ecfe0eb7543f3f8",
+  "@esbuild/android-arm64@npm:0.25.10": "a2dd6b7ba7d3ab2b669bdc45dc7e306671ecbd89b251d3ad73191fc18fe07080525beadf0a9ead65f96d623d4e37172b2516dc1ce7ddc3c3224299926615b2a1",
   "@esbuild/android-arm@npm:0.25.0": "ff6124350b732afe0f59087d5a50afb0c05d0d3951b4fc0f7c52c19ccacef504d7998217d8d7594dcfd4872748350a49ba611e8f2de3fe9e47a3df4393cb67eb",
-  "@esbuild/android-arm@npm:0.25.9": "0d4c724b84043db6597736865a4fe86640c88f21dc0ebe93a2298b4a0e0f0a5d1530a821dd1c18a2b39a6ca9abe8ff714b8ed5de496045a67150ea47c86a39d7",
+  "@esbuild/android-arm@npm:0.25.10": "0d7b4d970f4793252396ca9b737a2c5b485a5f051827ba1cbcce23a76e9bb7bc6f73be3b5ebed73a15aca915534917d13aeef0ce14d214026a36f0f334eadb14",
   "@esbuild/android-x64@npm:0.25.0": "7015f561e36c4fe142a4047184776344def5f25369c0bce8abd1de3d623d84cf7ddc09e5f7bac8294a8aea457ec23414e169648579382e6fd1aa39590ffe6e01",
-  "@esbuild/android-x64@npm:0.25.9": "9da8b1ede5670c2c9e644e0fedf1dd0747081272b296d3f80b53b44b637744d836efee00dc767b81940eb285524a5e3149d8045787f6281ee2bd53f61a9c8717",
+  "@esbuild/android-x64@npm:0.25.10": "a2e49c045ea189ca6020a8c1baced2db4cf105848c1cc922931c8e3a11b26f1143078d3ee5c088bfbccab8e564039a5b6962513e45b41572614607dced92b03f",
   "@esbuild/darwin-arm64@npm:0.25.0": "ba18b48c2c652a930a436a872b40cb0999fc0c4788dcda908f467d47555b080043e9ba1f9a7f080eb8d91ea8a3a399216aeea95539829a58885c412131025597",
-  "@esbuild/darwin-arm64@npm:0.25.9": "84a88a8f72fcc66381518d5821e4ed276aeea17c76559bee4fcb472b19456da630ad84d8d74b3e4c297ef7b1ec5bd5037d55ac6ef5c515a77fb94a1bd891dece",
+  "@esbuild/darwin-arm64@npm:0.25.10": "a96d0821aa97cd0ce2fa35b525896fc9d878b492832be8a0cd22bdbb081d11209574e48ef8ce29f51a88a9cea33c5f6a8b4409bd0801eddeac5ef4ad4db2d88a",
   "@esbuild/darwin-x64@npm:0.25.0": "83470576dc815364e8f2a6f2ed9c62496fa8112ee4905ccc3b142e36d28c9c90310ad179055d87e2e880e1bf9a3be0e9eb2129d6a88fdacf38181bfab6cf75c0",
-  "@esbuild/darwin-x64@npm:0.25.9": "c500bcd0c1a8f66d19cf575299a7da7f29dbdb56beac95bb6ddc570291e3e9da4e7d31db6453fc19ea5ac7f85662f40c9a3965c3e1f49657efeb292a6f601a26",
+  "@esbuild/darwin-x64@npm:0.25.10": "0f358404778b8f36a2676181f8840139d7e5723a76e54683f0ada3d72572d8c864bc76084e1d23dd5605896329857ad15b598dedd141d160b64669253bfaee82",
   "@esbuild/freebsd-arm64@npm:0.25.0": "646f3abba09e87c4555359200af913bbda9fac43629f6ade6adefdbd0d915707a375314e1d25ed0d951e6024d7d19fe0ecdd10caf4ff6177f3f6450e7132a6a9",
-  "@esbuild/freebsd-arm64@npm:0.25.9": "fb4951968ad62e5316ffd08c037bb2396e8119a0c2289e968421bb277bdbffe23d89c92dcd2d7eb680f31be2b05e36406211b141b9b89378b424e4b5193c3d7f",
+  "@esbuild/freebsd-arm64@npm:0.25.10": "f82928e4a4beb95da3379b98c5088d017113c02e3f2ab54867e4f6974b21b25c68ed793cbb3e9a99a510fd58ad3c5dbc1f7ca5bd4ce6adc99627a25fc722178b",
   "@esbuild/freebsd-x64@npm:0.25.0": "4b769e23981e5ec010f9c4670b1194e26e8bf98cc0bb70962fe8c160da508b40561c0b97911072c5de82954a4164af9d885e45e597e39ae379b5cad2d0a8c69e",
-  "@esbuild/freebsd-x64@npm:0.25.9": "0c71856891d5cea255f9bcb4482c70347a39198da2769a273afbd16bc9db7176bc1d28c41dd569b8b8f98cfd14b10a728c79f54311037d702bb7dffd95f27740",
+  "@esbuild/freebsd-x64@npm:0.25.10": "08c9d830e43a3be5fdb4525d940b0cd069bd7e7e1f4d53a5475411351c07891343b3c009f37d47e10ae3bafcb9ed52b4b5bd5e7dbd0505723add21a09c08dae6",
   "@esbuild/linux-arm64@npm:0.25.0": "508ca15315c4d7b7db28fc8e17247ebe5c816c270496d1354f0d97baafdf774ec055c2d9ac51e06fb02fed93ce4f94d109b92fe80a62e42bf51a2c5046fc76c8",
-  "@esbuild/linux-arm64@npm:0.25.9": "6c64bf50dfb709d4000b022558293764a20ff8ba0b6638e8abb3bd0806cab25ac971f1910eaf2a4d73f92080afdb296d57175b2199647de019c2f419365f839d",
+  "@esbuild/linux-arm64@npm:0.25.10": "1b6f5a1ef9aef52210832f5dd4d55ddd0a880dfc0f832106374b56c5cd8fbb865d7d711bdd6ff7c94a0cc42a7c3e6cf91118bf5c4187cfbbe1eb4d1807afca37",
   "@esbuild/linux-arm@npm:0.25.0": "3756d3974f5b5a6453f2ece2fa012f530b32b6af78cc0b6466bf0582b3da718803dae41bdb5cc4cdc360882bd791b63bb79e5f4a6f8c44ee053fc93b8dd6ea7f",
-  "@esbuild/linux-arm@npm:0.25.9": "b9a473988dadbe98f1c6ade2597e5967371d929ac83bb9f888d726d4f0e5cc4b8fe5020332adb26d61748619bf3e62c831d9c80b3bf815a6dd90dab76283d533",
+  "@esbuild/linux-arm@npm:0.25.10": "023383ebb145fa2f93de674713c7e4725df2b3c910f43bc1b5488a3b1169005d46fcbcf84234aace04c799ee569ea7671f92205e42dda52bc9954e48b47d7a1d",
   "@esbuild/linux-ia32@npm:0.25.0": "d220829704167772688a93568738d0887fc45d88cce7a4f2e4de992f161e9aa679294bfdf2dd3d70fa6549b548a023d98a90f19270cd8ebd5b365efe04b7027c",
-  "@esbuild/linux-ia32@npm:0.25.9": "51f458a7038e2ee014b994f7f216821194b00716ae5abe78fe828d9cefd47575dc0ff703f95c18017e59b7bcb63c13ac6d551e8ab64522cce8af89bc33a689d6",
+  "@esbuild/linux-ia32@npm:0.25.10": "130136f141d0388ec249fa314848906fb8b45e554324b8a07c13b5bc2e7da94c6fc7ebd037af6b69655a542ec52515ea8f8bc3bfe6dfc0dab8bdf9954debfb0d",
   "@esbuild/linux-loong64@npm:0.25.0": "e7f1a54ea77c9307f54d7172a03b1e77ec18b3f6622077fe3dcb4d53435ea47fc60e82b9da7b8efe375c0e46f4c07169686262af2eaea6557cf033c973f6fbcd",
-  "@esbuild/linux-loong64@npm:0.25.9": "81478bff0f6d54e06fa96ec120c2dc92e47c3a1392397a121cf50a83496156f9abebd46f93e35a496f4f305c8af7cd430e4fe723474a2420cc21d39257852210",
+  "@esbuild/linux-loong64@npm:0.25.10": "0e076ba5ea9b2e6ad00c27b8ee530621ef4c356aba6d8c873f9f7c50fa2f54bd75f4bef57d209fc0af011c9748c64e9d5e281f13456fa9c8b71f79467bfc71ad",
   "@esbuild/linux-mips64el@npm:0.25.0": "d51dc06bc3da38fb046986019c6b1a8aa1b43a835089f1f8d8ce4242c9417e1d3d25fa593708cd61f66f8665be27829316b37ecf9e08dc48718aacc00608aac1",
-  "@esbuild/linux-mips64el@npm:0.25.9": "78709795d663461c54168719517c4c38b2a51861af0f97a91003ea6fe2c2b67dca77f57c2a2c4eb2c6481a8660b5fe477c72e46e90154cb72f1f235e683b2d0f",
+  "@esbuild/linux-mips64el@npm:0.25.10": "dc3ef7a524ef0d78030f088263735026c97e7be45f56a610c8849fca8c36b10969558bffb6c21b6d8a5819a33450e529e44c1a71a6fccb0ce69f23b01273bbc3",
   "@esbuild/linux-ppc64@npm:0.25.0": "a19514e5b21c5f70e6b5b6ccdacb09922e9c397e80e3b1ac8e55ed283f9f3a5325a9e4dcf284d033954f3c51a88411fa95473c83b2b69990e02e351fa971b63f",
-  "@esbuild/linux-ppc64@npm:0.25.9": "4a43e167f7f9659a5ca34678cb6fee53fbdba8b14a9a45f323abf33d9e141fd268984b0a18445db84cbada5ed2ac211ef318d5c44af0fbc0c7eea31c0c82321f",
+  "@esbuild/linux-ppc64@npm:0.25.10": "60088ee09f940e169e2073ee77972f22af78c9c1df9a8e7db45e3c3f9176d5ffd8006a4102f34783c7f3629e9c153797d9f493063e9bdedf6f676018cbe6445e",
   "@esbuild/linux-riscv64@npm:0.25.0": "4b275bb4d2442a68b62a93926a4da04bde06795fc7f5719555c7a9d2cf0e8a2cd6a50c0e574f1285e55e126f0be29cf6017d829c571c2fb31728fb1961c45f70",
-  "@esbuild/linux-riscv64@npm:0.25.9": "e71027660a884b5bbcb6e9e84ed439b3ef19466cd9f6d16c1bdfe2db6dbe9a40e8fc19ad429749102d1c15f015372f7f9f8ab7f82d506efffbd143fe8ab28aa9",
+  "@esbuild/linux-riscv64@npm:0.25.10": "3f194dfe0f2725d9a41b0ab127238ef271d0689f31a05ecae25d6df3aa8275261d6ba073373236fac3c6c8af2a4556736a8025e80d8a719a049d22b23c99464c",
   "@esbuild/linux-s390x@npm:0.25.0": "7bd0fefc75c72d6d657aa9fec2322f1b8744936fc77da7e32027f0f1aff4b5fdaa8ae19a060fa4d465a79f14e13a4e10f3eeaf1ca64dc4c3cf08494b3e26100b",
-  "@esbuild/linux-s390x@npm:0.25.9": "7004c5852a3cbd1bd1d727e13b2f2be0747861ceab840ab8492ddff80b3d34dd41398681016cda3748c697e1b384bf4d4c1ad588538df38eba599ba935ecbd09",
+  "@esbuild/linux-s390x@npm:0.25.10": "926a04be26ebf794dae6a6185e04f39d246b04f1b5cb40b41f5228228a87e3a785cfb6493f405a0dc7d9b6a96d9417453fdc291b7fb4bc4aaf785eaa44cf1806",
   "@esbuild/linux-x64@npm:0.25.0": "f9562d7e1d25b9a69faa40aaa7dd607b820836f88733b26b27a48b14b8a526cc5ec033c1869386419bd609c96442974c339ccbb03b4a23ea205927b2243d3b6c",
-  "@esbuild/linux-x64@npm:0.25.9": "3bab69aa63d5ef65e9eaa229963ee3a3c868a06badf019277af06d4f7c52ea3a30abafad361e5bcce71032abd8b6fb666607977a627fa2def8db6756cf99b2ee",
+  "@esbuild/linux-x64@npm:0.25.10": "ebe641e7b96af7dcefe629b4f34a4da9cd0b282e42e8efd0311c2ed631a40a143bb96eda5592b209c4eab295f45b2e3395c69412edb40d5689ffaa01aa276409",
   "@esbuild/netbsd-arm64@npm:0.25.0": "4f2502bbcf5967cf2a07c712f9fd87a0ec1e60356ea115dc8b69ea7364e88edae5758bb7cba4049065bb8e78d69d0f6bce09f42f146a50b2dcc6069e14ba66d5",
-  "@esbuild/netbsd-arm64@npm:0.25.9": "02b82c6773ad09082e3b18f01dbf4b9f72519a9e93995b479e4bd4bb28c8a4088972fd0e9304881d09775429dc388a3625249096426349dc3adc2208ee408a4a",
+  "@esbuild/netbsd-arm64@npm:0.25.10": "11f85ed4ade5c38fe8f2f3e78ee5c302a4f90d48a6bf93cf8917b13d52b03671c7742294785165cc70611eb0b085a4e9aa5a0f487f8e15f80200ff450549e19e",
   "@esbuild/netbsd-x64@npm:0.25.0": "82e3e256ac495620890867e85b63f4327e3f5cd5876c868dd4690094c7e4c233bc2359835e512443b8a44f44fc15d98ef3e63914efae8128d3a348d0ebaa66ec",
-  "@esbuild/netbsd-x64@npm:0.25.9": "51a576cb8ad7f43e43f76b25273735646eefa0d2a5bdaa3bd6387ab89512940bee49e91f7051b3d08d143d5cd6b4501f72a9462f30e242f0dff931c4ebe40363",
+  "@esbuild/netbsd-x64@npm:0.25.10": "322482debb21160769f7ee293c3e84e44293bb7c734082fac2857277038ab1087763a553697b8f20dc3a03b7a397936396cde8150c1cc6a0ad62941e7ee86845",
   "@esbuild/openbsd-arm64@npm:0.25.0": "6c8de60d94a53fa4c37f7cbfca04baf06a14bb4b4360ab711b2235ec33b624e268cd39aad84382648eabae4db5727495806221211d663c36f1710579f504f967",
-  "@esbuild/openbsd-arm64@npm:0.25.9": "9bf0e7a535304f0d3c700d6e4ef536fe94b17e05bf5f9a4cc308ffc8c3d3cd642ee7debcf7f649a845610b1c706675af903f785ef14f320ee918faa61bf79bb5",
+  "@esbuild/openbsd-arm64@npm:0.25.10": "4c68206360952d04fbafe32d3f4cf420f15c0a150f914d398746f1cf8241073fe9422cc0cc0de8b0b98b8158879dc5fd322eb8454d936457eab3dc9ba131584d",
   "@esbuild/openbsd-x64@npm:0.25.0": "ed2beae58658aa2146a9cae2152a38f52f34e2dd929e79a298f8ce4b3c2c6fcf8e2ac98b458fb0fe5baf87c08df12b162c74b52b4c95f5f54f5a073da1668ebe",
-  "@esbuild/openbsd-x64@npm:0.25.9": "bb9bb4c5f095575f267d30c9e65f8e64c3f425d24904f6e22112c305ee5f1503aea750f510252e4b862f366e5efac678b71cc848cda72c587be8af4119d28f80",
-  "@esbuild/openharmony-arm64@npm:0.25.9": "130f08d72a018aceef14b8534b9910bd2c0852fc074467ad0adf54d339584277326c7ffc8cd8126be08a530184c51d8de11d06971d1cc44545162bfb8428bcc3",
+  "@esbuild/openbsd-x64@npm:0.25.10": "70328d84e7954932d0fcd282bc2a16fdd31a899ef23f5214221e64bfebd80222b03a7629d9af55fea220df6a41cd51d0c068618f443dc37ad717dc6601a9445b",
+  "@esbuild/openharmony-arm64@npm:0.25.10": "ca11e8c30cddd7603235cf05185678f6aad7c40eccd8ef57a207325b8553e5481503cda7ae35d777eb5020b9426f2d13332aba147732a9abe0f5b3964a6c0d17",
   "@esbuild/sunos-x64@npm:0.25.0": "9a0d0569ea65171983b0daadbf8ec6dd31341db7bee50fc4c2b85521eb09ff7597279d9dda4b4f25c3bfd6f4f77d558b6a6f36dcfb6794e7fc2177df9770a17e",
-  "@esbuild/sunos-x64@npm:0.25.9": "a86fca2baaaffcaed419bdc6569cf4a88b4ae830034f8deb4d83ba781b989e25b03696cfe05a482e24710191abc53479b70491f3f157eff37ed2b486d88c897b",
+  "@esbuild/sunos-x64@npm:0.25.10": "46c205aa7a15d7b5d13553300f3d36593e7119a320672ac3c092f5a67db6cb91f9c59a235dfbe2947bd99f7653bb3be325a33c3474a00b90d39856ef9b05af48",
   "@esbuild/win32-arm64@npm:0.25.0": "5484d8ad74479f8cc8c7b5d14d5f8ced3e50d6ef7fc12a45406ae6c6e5199784267bfccbe0173b598c1b512ea20ecd5de20579cf04d3e07848df3db7ccffd8e6",
-  "@esbuild/win32-arm64@npm:0.25.9": "cd32c8fe88511e413f6161480ea3b6fc2ed7cb4bd2febb455e7bc45842880c752ba71772f289908ded50d8cfd3207e6730c8fdec2e811af1f65e97d1ee53b4ef",
+  "@esbuild/win32-arm64@npm:0.25.10": "ca2d057a874607013788fd3a161e8e25fcfb777a7aa6edd68662cff3869d1566541d61caab9b11e16515e2192673bf70c00f5efc38f67d1305f76b55bbe8febd",
   "@esbuild/win32-ia32@npm:0.25.0": "206eb14fd607c5a5116a49eaf4ed3ca7c34c0372729d7d34aa07bbc2a5792afabfd62873212213b17607165bd4ecbe4366066de0ddedd50a46a27a3c5cb830e5",
-  "@esbuild/win32-ia32@npm:0.25.9": "c374576d857dfa3c8dc5bdeef598ffc0e3adfcb8b7986a2b78ce61d2aa3c3d1f1cd15cb685f52b88411403d974f657c3fd44cf9b4fadb94e8ed69d75e9e3e0ef",
+  "@esbuild/win32-ia32@npm:0.25.10": "fa5efade9e9a1a01e65223f22304dd71a3d005a2b394309a652bb231bdbc14fe937ec7bf0ce1e117fed182731430e055828616d1c10abee2dfc80aee50fee13e",
   "@esbuild/win32-x64@npm:0.25.0": "a129e6ad07bbcc791fda365e71634aa45cf3989ded1f05ed1ecb99efa625b09081ef410d236fdd279037d001f2e5e5049c98bfbe6a2242c818463222df85cc54",
-  "@esbuild/win32-x64@npm:0.25.9": "41f2ba9101f4a9a28e3287026a32a05e8fdffcb4a4e41cfaf9f94b41093c6882f46ef80f12854b67b7ad78e47d1df492f3e8a71d41813a61500ace4a574af851",
+  "@esbuild/win32-x64@npm:0.25.10": "0f2cb29b001bf4a71035b37d42bcaeb48baef5a6b07be2c024593a18dcec87cd5829a0cc17acc7128cd251bd6232bdbd04d967d9c2bd7db9c1978effffe31671",
   "@rollup/rollup-android-arm-eabi@npm:4.46.2": "d7d021a87cd3504c8d71b00a94199e13c4e07c14fe20ed7300cf1e6436a5f3fe8496c9e5f206e023b15f9b6f8991b2d95a48b47fa41d5c00b44f37fe5f4d5eb8",
   "@rollup/rollup-android-arm64@npm:4.46.2": "ca901edbf95bbdd2505c979f777e2a01e2e885a597b6daeed5362dac523ea2a1eb9c0c0d22b9b436f3613c22abdd442bd2764491948890930333a9e40ade35be",
   "@rollup/rollup-darwin-arm64@npm:4.46.2": "ed2b07c4803915d46ff642abd659e179fae524dcd3cb88c810a5b71290d16b498e0371dcb91fe98f6301b8c6600d579a099be1e9450278326281002df4a80019",
diff --git a/pkgs/by-name/le/learn6502/package.nix b/pkgs/by-name/le/learn6502/package.nix
index f2de4c55cad6..6a042b932264 100644
--- a/pkgs/by-name/le/learn6502/package.nix
+++ b/pkgs/by-name/le/learn6502/package.nix
@@ -24,20 +24,20 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "learn6502";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "JumpLink";
     repo = "Learn6502";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Aoj4Z9uraBEH3BW0hrhuV3Hu7cnRxvjbpzm4pUziWS4=";
+    hash = "sha256-od6TzGbo9VrPFK/qEPnA7MUjgwJ1/RbquAqmkyIU1Bs=";
   };
 
   missingHashes = ./missing-hashes.json;
 
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-0r+SRVx8b238SVm+XM4+uw7Ge3rFtsNwD/+uNfBA7eM=";
+    hash = "sha256-Ko9aXHhL2FosAn6QHEaxtUpKo0aVP35YwM3tJEYuFAE=";
   };
 
   nativeBuildInputs = [

From ca8e98d584fbe2365be69e9c693a97eb1defc3ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 00:35:02 +0000
Subject: [PATCH 0199/6226] mdk: 1.3.0 -> 1.3.1

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

diff --git a/pkgs/by-name/md/mdk/package.nix b/pkgs/by-name/md/mdk/package.nix
index 9f2acbcdf266..533d250b21d3 100644
--- a/pkgs/by-name/md/mdk/package.nix
+++ b/pkgs/by-name/md/mdk/package.nix
@@ -9,10 +9,10 @@
 
 stdenv.mkDerivation rec {
   pname = "gnu-mdk";
-  version = "1.3.0";
+  version = "1.3.1";
   src = fetchurl {
     url = "mirror://gnu/mdk/v${version}/mdk-${version}.tar.gz";
-    sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb";
+    sha256 = "sha256-67ljk4xojBUP9qrtwp8w0JAgoeMdVbMMIQHwh3NRbRk=";
   };
   nativeBuildInputs = [
     pkg-config

From f274738717490314c1828bc79b85607b131e8aed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 00:37:21 +0000
Subject: [PATCH 0200/6226] libdatovka: 0.7.1 -> 0.7.2

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

diff --git a/pkgs/by-name/li/libdatovka/package.nix b/pkgs/by-name/li/libdatovka/package.nix
index ab55e106dd7f..ea2f021bc412 100644
--- a/pkgs/by-name/li/libdatovka/package.nix
+++ b/pkgs/by-name/li/libdatovka/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libdatovka";
-  version = "0.7.1";
+  version = "0.7.2";
 
   src = fetchurl {
     url = "https://gitlab.nic.cz/datovka/libdatovka/-/archive/v${version}/libdatovka-v${version}.tar.gz";
-    sha256 = "sha256-qVbSxPLYe+PjGwRH2U/V2Ku2X1fRPbDOUjFamCsYVgY=";
+    sha256 = "sha256-pct+COy7ibyNtwB8l/vDnEHBUEihlo5OaoXWXVRJBrQ=";
   };
 
   patches = [

From 0d3a9e16a7576a548c321aa47179274c31d47d37 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 01:17:47 +0000
Subject: [PATCH 0201/6226] glslang: 15.4.0 -> 16.0.0

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

diff --git a/pkgs/by-name/gl/glslang/package.nix b/pkgs/by-name/gl/glslang/package.nix
index a4e3e5a6987d..51a7e8699a67 100644
--- a/pkgs/by-name/gl/glslang/package.nix
+++ b/pkgs/by-name/gl/glslang/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "glslang";
-  version = "15.4.0";
+  version = "16.0.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "glslang";
     rev = version;
-    hash = "sha256-sPc+G7/ua7LQ7scuSvqWs7Q7Q+gFvXQ5wGQsEXbWH6w=";
+    hash = "sha256-/DwdyuSGCx22zsXZrcZGTECfsIqvzPQzTZ2mU8EkjxY=";
   };
 
   outputs = [

From 74dd1a10a1b29bdd4a71ce0b7e62bf6c5fcfc256 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 26 Sep 2025 06:22:47 +0100
Subject: [PATCH 0202/6226] ell: 0.79 -> 0.80

Changes: https://git.kernel.org/pub/scm/libs/ell/ell.git/tree/ChangeLog?h=0.80
---
 pkgs/by-name/el/ell/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/el/ell/package.nix b/pkgs/by-name/el/ell/package.nix
index 57ced639540a..85795193b0d9 100644
--- a/pkgs/by-name/el/ell/package.nix
+++ b/pkgs/by-name/el/ell/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation rec {
   pname = "ell";
-  version = "0.79";
+  version = "0.80";
 
   outputs = [
     "out"
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
   src = fetchgit {
     url = "https://git.kernel.org/pub/scm/libs/ell/ell.git";
     rev = version;
-    hash = "sha256-5NqzuUDimairQJjHsSy0sbpqiDfNDvrt3BEV9e1bF1E=";
+    hash = "sha256-B7Dz5H49d8kQaHfPQt7Y3f9D6EdqLOBMK+378g4E46U=";
   };
 
   nativeBuildInputs = [

From 5c81ed24ab3b6739d7063d2518a76864cb24c003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 26 Sep 2025 03:33:41 -0700
Subject: [PATCH 0203/6226] python3Packages.pyyaml: 6.0.2 -> 6.0.3

Diff: https://github.com/yaml/pyyaml/compare/6.0.2...6.0.3

Changelog: https://github.com/yaml/pyyaml/blob/refs/tags/6.0.3/CHANGES
---
 pkgs/development/python-modules/pyyaml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyyaml/default.nix b/pkgs/development/python-modules/pyyaml/default.nix
index 141fe5570f5b..51c2eecdacb8 100644
--- a/pkgs/development/python-modules/pyyaml/default.nix
+++ b/pkgs/development/python-modules/pyyaml/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "pyyaml";
-  version = "6.0.2";
+  version = "6.0.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "yaml";
     repo = "pyyaml";
     tag = version;
-    hash = "sha256-IQoZd9Lp0ZHLAQN3PFwMsZVTsIVJyIaT9D6fpkzA8IA=";
+    hash = "sha256-jUooIBp80cLxvdU/zLF0X8Yjrf0Yp9peYeiFjuV8AHA=";
   };
 
   build-system = [

From a6a095bc4665526e28eb219dd7d2f0e4a08228aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 26 Sep 2025 03:44:10 -0700
Subject: [PATCH 0204/6226] python3Packages.trove-classifiers: 2025.8.26.11 ->
 2025.9.11.17

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

diff --git a/pkgs/development/python-modules/trove-classifiers/default.nix b/pkgs/development/python-modules/trove-classifiers/default.nix
index 5cea96d34d29..2b5ec73544c3 100644
--- a/pkgs/development/python-modules/trove-classifiers/default.nix
+++ b/pkgs/development/python-modules/trove-classifiers/default.nix
@@ -10,13 +10,13 @@
 let
   self = buildPythonPackage rec {
     pname = "trove-classifiers";
-    version = "2025.8.26.11";
+    version = "2025.9.11.17";
     pyproject = true;
 
     src = fetchPypi {
       pname = "trove_classifiers";
       inherit version;
-      hash = "sha256-5z7/8xfEkqeZAJL5wSZ2xwW/bP5AolipP2P0tMmUFDI=";
+      hash = "sha256-kxyphBpenJQIvCrme1DSis+FvvViGbVoYIdt0fLQJN0=";
     };
 
     postPatch = ''

From 9cf2ff865b4648edf23ad13e320ecafaf2903efe Mon Sep 17 00:00:00 2001
From: Johan Thomsen <write@ownrisk.dk>
Date: Fri, 26 Sep 2025 12:54:09 +0200
Subject: [PATCH 0205/6226] kubernetes: don't hardcode kubeadm, make it an
 overridable component

---
 pkgs/by-name/ku/kubernetes/package.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ku/kubernetes/package.nix b/pkgs/by-name/ku/kubernetes/package.nix
index 8e817bff3632..02287b57bd73 100644
--- a/pkgs/by-name/ku/kubernetes/package.nix
+++ b/pkgs/by-name/ku/kubernetes/package.nix
@@ -12,6 +12,7 @@
   nix-update-script,
 
   components ? [
+    "cmd/kubeadm"
     "cmd/kubelet"
     "cmd/kube-apiserver"
     "cmd/kube-controller-manager"
@@ -50,12 +51,7 @@ buildGoModule (finalAttrs: {
 
   patches = [ ./fixup-addonmanager-lib-path.patch ];
 
-  WHAT = lib.concatStringsSep " " (
-    [
-      "cmd/kubeadm"
-    ]
-    ++ components
-  );
+  WHAT = lib.concatStringsSep " " components;
 
   buildPhase = ''
     runHook preBuild

From 4b90ae30ff87b210e9a7da58b449a2d33fe93ec9 Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Tue, 16 Sep 2025 17:19:32 +0300
Subject: [PATCH 0206/6226] hotdoc: fix build with gcc15
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- add patch from merged upstream commit:
https://github.com/hotdoc/hotdoc/commit/adf8518431fafb78c9b47862a0a9a58824b6a421

Fixes build failure with gcc15:
```
/build/hotdoc-0.17.4/hotdoc/parsers/c_comment_scanner/scanner.l: In function ‘yylex’:
/build/hotdoc-0.17.4/hotdoc/parsers/c_comment_scanner/scanner.l:49:10:
error: too many arguments to function ‘parse_comment’; expected 0, have 1
   49 | "/*"                            { return parse_comment (comments);}
      |          ^~~~~~~~~~~~~  ~~~~~~~~
/build/hotdoc-0.17.4/hotdoc/parsers/c_comment_scanner/scanner.l:37:12: note: declared here
   37 | static int parse_comment ();
      |            ^~~~~~~~~~~~~
/build/hotdoc-0.17.4/hotdoc/parsers/c_comment_scanner/scanner.l:50:10:
error: too many arguments to function ‘parse_define’; expected 0, have 1
   50 | {HASH}{SPACE}*"define"{SPACE}*  { return parse_define (comments); }
      |          ^~~~~~~~~~~~  ~~~~~~~~
/build/hotdoc-0.17.4/hotdoc/parsers/c_comment_scanner/scanner.l:38:12: note: declared here
   38 | static int parse_define ();
      |            ^~~~~~~~~~~~
/build/hotdoc-0.17.4/hotdoc/parsers/c_comment_scanner/scanner.l: At top level:
/build/hotdoc-0.17.4/hotdoc/parsers/c_comment_scanner/scanner.l:80:1:
error: conflicting types for ‘parse_define’; have ‘int(PyObject *)’ {aka ‘int(struct _object *)’}
   80 | parse_define (PyObject *comments)
      | ^~~~~~~~~~~~
/build/hotdoc-0.17.4/hotdoc/parsers/c_comment_scanner/scanner.l:38:12:
note: previous declaration of ‘parse_define’ with type ‘int(void)’
   38 | static int parse_define ();
      |            ^~~~~~~~~~~~
/build/hotdoc-0.17.4/hotdoc/parsers/c_comment_scanner/scanner.l:126:1:
error: conflicting types for ‘parse_comment’; have ‘int(PyObject *)’ {aka ‘int(struct _object *)’}
  126 | parse_comment (PyObject *comments)
      | ^~~~~~~~~~~~~
/build/hotdoc-0.17.4/hotdoc/parsers/c_comment_scanner/scanner.l:37:12:
note: previous declaration of ‘parse_comment’ with type ‘int(void)’
   37 | static int parse_comment ();
      |            ^~~~~~~~~~~~~
```
---
 pkgs/development/tools/hotdoc/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/tools/hotdoc/default.nix b/pkgs/development/tools/hotdoc/default.nix
index 505182bc06aa..b6ee390228d9 100644
--- a/pkgs/development/tools/hotdoc/default.nix
+++ b/pkgs/development/tools/hotdoc/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   buildPythonApplication,
+  fetchpatch,
   fetchPypi,
   replaceVars,
   clang,
@@ -45,6 +46,13 @@ buildPythonApplication rec {
       clang = lib.getExe clang;
       libclang = "${lib.getLib libclang}/lib/libclang${stdenv.hostPlatform.extensions.sharedLibrary}";
     })
+
+    # Fix build with gcc15
+    (fetchpatch {
+      name = "hotdoc-fix-c_comment_scanner-function-prototypes-gcc15.patch";
+      url = "https://github.com/hotdoc/hotdoc/commit/adf8518431fafb78c9b47862a0a9a58824b6a421.patch";
+      hash = "sha256-5y50Yk+AjV3aSk8H3k9od/Yvy09FyQQOcVOAcstQnw8=";
+    })
   ];
 
   build-system = [ setuptools ];

From 5fa08e42156e851baf018373320c45b338b3a3a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 26 Sep 2025 12:37:36 +0000
Subject: [PATCH 0207/6226] flat-remix-gnome: 20250413 -> 20250926

---
 pkgs/by-name/fl/flat-remix-gnome/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fl/flat-remix-gnome/package.nix b/pkgs/by-name/fl/flat-remix-gnome/package.nix
index a6eb2759aecc..0c2ed9709236 100644
--- a/pkgs/by-name/fl/flat-remix-gnome/package.nix
+++ b/pkgs/by-name/fl/flat-remix-gnome/package.nix
@@ -8,18 +8,18 @@
 let
   # make install will use dconf to find desktop background file uri.
   # consider adding an args to allow specify pictures manually.
-  # https://github.com/daniruiz/flat-remix-gnome/blob/20250413/Makefile#L38
+  # https://github.com/daniruiz/flat-remix-gnome/blob/20250926/Makefile#L38
   fake-dconf = writeScriptBin "dconf" "echo -n";
 in
 stdenv.mkDerivation rec {
   pname = "flat-remix-gnome";
-  version = "20250413";
+  version = "20250926";
 
   src = fetchFromGitHub {
     owner = "daniruiz";
     repo = "flat-remix-gnome";
     rev = version;
-    hash = "sha256-NgRqpL2bqdgiLfs08htqAsTFAbi7E+G/R0aBFpE9bmc=";
+    hash = "sha256-6K/BQqVOeDeJuUi0+NgCFeerX5sSy+nKapYxIQfbKFQ=";
   };
 
   nativeBuildInputs = [
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
   makeFlags = [ "PREFIX=$(out)" ];
 
   # make install will back up this file, it will fail if the file doesn't exist.
-  # https://github.com/daniruiz/flat-remix-gnome/blob/20250413/Makefile#L56
+  # https://github.com/daniruiz/flat-remix-gnome/blob/20250926/Makefile#L56
   preInstall = ''
     mkdir -p $out/share/gnome-shell/
     touch $out/share/gnome-shell/gnome-shell-theme.gresource

From 2484cbf8d8677f976a1852e41330ccea20e23ba5 Mon Sep 17 00:00:00 2001
From: euxane <euxane.trangirard@euxane.eu>
Date: Fri, 5 Sep 2025 22:09:55 +0200
Subject: [PATCH 0208/6226] maintainers/euxane: update email address

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 6cd8bcf8d305..95e441585c28 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7957,7 +7957,7 @@
   };
   euxane = {
     name = "euxane";
-    email = "r9uhdi.nixpkgs@euxane.net";
+    email = "r9uhdi.nixpkgs@euxane.eu";
     github = "pacien";
     githubId = 1449319;
   };

From efaef9f99689d58ea69b1e1622ce2887b4581365 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 26 Sep 2025 18:39:52 +0200
Subject: [PATCH 0209/6226] jdk11: 11.0.28+6 -> 11.0.29+5

---
 pkgs/development/compilers/openjdk/11/source.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/11/source.json b/pkgs/development/compilers/openjdk/11/source.json
index f6a4db45ee48..ab37d28ec1be 100644
--- a/pkgs/development/compilers/openjdk/11/source.json
+++ b/pkgs/development/compilers/openjdk/11/source.json
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-yJljuO6jflh6kbe4ipflPiNDbKvKyA4grMAFu4UCM+Y=",
+  "hash": "sha256-u8SWC0T4rmQVV3TKfEW1/rCT8KWNsL5hZtUW3pXBIfA=",
   "owner": "openjdk",
   "repo": "jdk11u",
-  "rev": "refs/tags/jdk-11.0.28+6"
+  "rev": "refs/tags/jdk-11.0.29+5"
 }

From 6488cc76a8ab3a31f3c357f93790922f4afff72a Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 26 Sep 2025 18:40:04 +0200
Subject: [PATCH 0210/6226] jdk17: 17.0.16+8 -> 17.0.17+8

---
 pkgs/development/compilers/openjdk/17/source.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/17/source.json b/pkgs/development/compilers/openjdk/17/source.json
index 5a27a56c4714..2b5813a3fd68 100644
--- a/pkgs/development/compilers/openjdk/17/source.json
+++ b/pkgs/development/compilers/openjdk/17/source.json
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-YN9mPfi3oMGjeRIren2cdWWySpYXsIcOnP29Zh3ym8c=",
+  "hash": "sha256-xwi7Co0DiEx9IohwiQHpislv/50NdGuHVQINJcasBdY=",
   "owner": "openjdk",
   "repo": "jdk17u",
-  "rev": "refs/tags/jdk-17.0.16+8"
+  "rev": "refs/tags/jdk-17.0.17+8"
 }

From b4325a34fa63f49a84e8d02d28b246659b813d8c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 26 Sep 2025 18:40:17 +0200
Subject: [PATCH 0211/6226] jdk21: 21.0.8+9 -> 21.0.9+8

---
 pkgs/development/compilers/openjdk/21/source.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/21/source.json b/pkgs/development/compilers/openjdk/21/source.json
index a514f2dc908e..438a484ff2b6 100644
--- a/pkgs/development/compilers/openjdk/21/source.json
+++ b/pkgs/development/compilers/openjdk/21/source.json
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-8wUwxjhAGIp1bzny2e86vPH9q4vw1kLDoTjO7FrJbx4=",
+  "hash": "sha256-NgunrSUchIlHkaXM9h75U4xcf44ukCuhhPPHHGVOKXo=",
   "owner": "openjdk",
   "repo": "jdk21u",
-  "rev": "refs/tags/jdk-21.0.8+9"
+  "rev": "refs/tags/jdk-21.0.9+8"
 }

From ad5e5a28280d37144509e5c4f228896f0b1475de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 Sep 2025 00:29:45 +0000
Subject: [PATCH 0212/6226] ocamlPackages.monolith: 20250314 -> 20250922

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

diff --git a/pkgs/development/ocaml-modules/monolith/default.nix b/pkgs/development/ocaml-modules/monolith/default.nix
index a5945600d140..0abedd3f39d5 100644
--- a/pkgs/development/ocaml-modules/monolith/default.nix
+++ b/pkgs/development/ocaml-modules/monolith/default.nix
@@ -4,7 +4,7 @@
   fetchFromGitLab,
   afl-persistent,
   pprint,
-  version ? "20250314",
+  version ? "20250922",
 }:
 
 buildDunePackage {
@@ -18,7 +18,7 @@ buildDunePackage {
     owner = "fpottier";
     repo = "monolith";
     tag = version;
-    hash = "sha256-hIB3QSOLARumRgpUroTFUzSreHw7kMikGde+mB28sGM=";
+    hash = "sha256-uYUbrWSE99556jiCgDUc8xDaob3rFPXLBMPM3lN6Xh8=";
   };
 
   propagatedBuildInputs = [

From f86b727ba6758e47a89a7600461a90a47aee3784 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 Sep 2025 00:52:40 +0000
Subject: [PATCH 0213/6226] cytoscape: 3.10.3 -> 3.10.4

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

diff --git a/pkgs/by-name/cy/cytoscape/package.nix b/pkgs/by-name/cy/cytoscape/package.nix
index 42b13f74000f..b255b3b03dbe 100644
--- a/pkgs/by-name/cy/cytoscape/package.nix
+++ b/pkgs/by-name/cy/cytoscape/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation rec {
   pname = "cytoscape";
-  version = "3.10.3";
+  version = "3.10.4";
 
   src = fetchurl {
     url = "https://github.com/cytoscape/cytoscape/releases/download/${version}/${pname}-unix-${version}.tar.gz";
-    sha256 = "sha256-62i3F6uGNoC8z55iUIYQDAimWcQocsZ52USdpruZRLQ=";
+    sha256 = "sha256-gHCU97AfBzo4r+F+Fc5lHd+kQtj/NsoCNipAhv5O7sE=";
   };
 
   patches = [

From b184a2fcd8fa0e59c1bab96ca8210cb9f20a1ec8 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sat, 27 Sep 2025 10:32:14 +0800
Subject: [PATCH 0214/6226] seqtk: 1.4 -> 1.5

Diff: https://github.com/lh3/seqtk/compare/v1.4...v1.5
---
 pkgs/by-name/se/seqtk/package.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/se/seqtk/package.nix b/pkgs/by-name/se/seqtk/package.nix
index 5e223163500b..362507734e6a 100644
--- a/pkgs/by-name/se/seqtk/package.nix
+++ b/pkgs/by-name/se/seqtk/package.nix
@@ -7,15 +7,15 @@
   isa-l,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "seqtk";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "lh3";
     repo = "seqtk";
-    rev = "v${version}";
-    hash = "sha256-W6IUn7R9tlnWrKe/qOHJL+43AL4EZB7zj7M5u9l83WE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-IQYBs3hUlV9fr8F2SL//houKKEq0nFViq9ulOppRMcM=";
   };
 
   buildInputs = [
@@ -29,16 +29,18 @@ stdenv.mkDerivation rec {
     "BINDIR=$(out)/bin"
   ];
 
+  hardeningDisable = [ "format" ];
+
   preInstall = ''
     mkdir -p "$out/bin"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Toolkit for processing sequences in FASTA/Q formats";
     mainProgram = "seqtk";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     homepage = "https://github.com/lh3/seqtk";
-    platforms = platforms.all;
-    maintainers = with maintainers; [ bwlang ];
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ bwlang ];
   };
-}
+})

From 42363e5193ebd1c35ad5c7796c0a2f2ea49f506b Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Tue, 23 Sep 2025 02:25:57 -0700
Subject: [PATCH 0215/6226] session-desktop: build from source

---
 pkgs/by-name/se/session-desktop/Info.plist  |  93 ++++++
 pkgs/by-name/se/session-desktop/fake-git.sh |  74 +++++
 pkgs/by-name/se/session-desktop/package.nix | 333 ++++++++++++++++++--
 pkgs/by-name/se/session-desktop/update.sh   |  33 ++
 4 files changed, 501 insertions(+), 32 deletions(-)
 create mode 100644 pkgs/by-name/se/session-desktop/Info.plist
 create mode 100644 pkgs/by-name/se/session-desktop/fake-git.sh
 create mode 100755 pkgs/by-name/se/session-desktop/update.sh

diff --git a/pkgs/by-name/se/session-desktop/Info.plist b/pkgs/by-name/se/session-desktop/Info.plist
new file mode 100644
index 000000000000..1be6514e846b
--- /dev/null
+++ b/pkgs/by-name/se/session-desktop/Info.plist
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>CFBundleDisplayName</key>
+    <string>Session</string>
+    <key>CFBundleExecutable</key>
+    <string>Session</string>
+    <key>CFBundleIconFile</key>
+    <string>icon.icns</string>
+    <key>CFBundleIdentifier</key>
+    <string>com.loki-project.messenger-desktop</string>
+    <key>CFBundleInfoDictionaryVersion</key>
+    <string>6.0</string>
+    <key>CFBundleName</key>
+    <string>Session</string>
+    <key>CFBundlePackageType</key>
+    <string>APPL</string>
+    <key>CFBundleShortVersionString</key>
+    <string>@version@</string>
+    <key>CFBundleVersion</key>
+    <string>refs/heads/master</string>
+    <key>LSApplicationCategoryType</key>
+    <string>public.app-category.social-networking</string>
+    <key>LSEnvironment</key>
+    <dict>
+      <key>MallocNanoZone</key>
+      <string>0</string>
+    </dict>
+    <key>LSMinimumSystemVersion</key>
+    <string>11.0</string>
+    <key>NSAppTransportSecurity</key>
+    <dict>
+      <key>NSAllowsArbitraryLoads</key>
+      <true/>
+      <key>NSAllowsLocalNetworking</key>
+      <true/>
+      <key>NSExceptionDomains</key>
+      <dict>
+        <key>127.0.0.1</key>
+        <dict>
+          <key>NSIncludesSubdomains</key>
+          <false/>
+          <key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
+          <true/>
+          <key>NSTemporaryExceptionAllowsInsecureHTTPSLoads</key>
+          <false/>
+          <key>NSTemporaryExceptionMinimumTLSVersion</key>
+          <string>1.0</string>
+          <key>NSTemporaryExceptionRequiresForwardSecrecy</key>
+          <false/>
+        </dict>
+        <key>localhost</key>
+        <dict>
+          <key>NSIncludesSubdomains</key>
+          <false/>
+          <key>NSTemporaryExceptionAllowsInsecureHTTPLoads</key>
+          <true/>
+          <key>NSTemporaryExceptionAllowsInsecureHTTPSLoads</key>
+          <false/>
+          <key>NSTemporaryExceptionMinimumTLSVersion</key>
+          <string>1.0</string>
+          <key>NSTemporaryExceptionRequiresForwardSecrecy</key>
+          <false/>
+        </dict>
+      </dict>
+    </dict>
+    <key>NSBluetoothAlwaysUsageDescription</key>
+    <string>This app needs access to Bluetooth</string>
+    <key>NSBluetoothPeripheralUsageDescription</key>
+    <string>This app needs access to Bluetooth</string>
+    <key>NSCameraUsageDescription</key>
+    <string>Session requires camera access to record video.</string>
+    <key>NSHighResolutionCapable</key>
+    <true/>
+    <key>NSHumanReadableCopyright</key>
+    <string>Copyright © 2025 Session Foundation</string>
+    <key>NSMainNibFile</key>
+    <string>MainMenu</string>
+    <key>NSMicrophoneUsageDescription</key>
+    <string>Session requires microphone access to record audio.</string>
+    <key>NSPrefersDisplaySafeAreaCompatibilityMode</key>
+    <false/>
+    <key>NSPrincipalClass</key>
+    <string>AtomApplication</string>
+    <key>NSQuitAlwaysKeepsWindows</key>
+    <false/>
+    <key>NSRequiresAquaSystemAppearance</key>
+    <false/>
+    <key>NSSupportsAutomaticGraphicsSwitching</key>
+    <true/>
+  </dict>
+</plist>
diff --git a/pkgs/by-name/se/session-desktop/fake-git.sh b/pkgs/by-name/se/session-desktop/fake-git.sh
new file mode 100644
index 000000000000..088c718c0f84
--- /dev/null
+++ b/pkgs/by-name/se/session-desktop/fake-git.sh
@@ -0,0 +1,74 @@
+if [ "$1" != "rev-parse" ]; then
+  echo "$@" >&2
+  exit 1
+fi
+shift
+
+short=0
+shortlen=7
+ref=
+while [ $# -gt 0 ]; do
+  case "$1" in
+    --short)
+      short=1
+      if [ $# -gt 1 ] && [ "$2" -eq "$2" ] 2>/dev/null; then
+        shortlen=$2
+        shift
+      else
+        shortlen=7
+      fi
+      ;;
+    --short=*)
+      short=1
+      shortlen=''${1#--short=}
+      ;;
+    --is-inside-work-tree)
+      echo true
+      exit 0
+      ;;
+    HEAD|HEAD:*)
+      ref=$1
+      ;;
+    *)
+      echo "rev-parse $@" >&2
+      exit 1
+      ;;
+  esac
+  shift
+done
+
+if [ -z "$ref" ]; then
+  echo "rev-parse" >&2
+  exit 1
+fi
+
+case "$ref" in
+  HEAD)
+    path=$(pwd)
+    hash=
+    while [ "$path" != "/" ]; do
+      if [ -f "$path/.gitrev" ]; then
+        hash=$(cat "$path/.gitrev")
+        break
+      fi
+      path=$(dirname "$path")
+    done
+    ;;
+  HEAD:*)
+    subpath=''${ref#HEAD:}
+    if [ -f "$PWD/$subpath/.gitrev" ]; then
+      hash=$(cat "$PWD/$subpath/.gitrev")
+    fi
+    ;;
+esac
+
+if [ -z "$hash" ]; then
+  echo "rev-parse $ref" >&2
+  exit 1
+fi
+
+if [ "$short" -eq 1 ]; then
+  printf '%s\n' "$(printf '%s' "$hash" | cut -c1-"$shortlen")"
+else
+  printf '%s\n' "$hash"
+fi
diff --git a/pkgs/by-name/se/session-desktop/package.nix b/pkgs/by-name/se/session-desktop/package.nix
index b9183d1da7e7..4e98a2f9c25c 100644
--- a/pkgs/by-name/se/session-desktop/package.nix
+++ b/pkgs/by-name/se/session-desktop/package.nix
@@ -1,67 +1,336 @@
 {
   lib,
+  fetchFromGitHub,
   makeDesktopItem,
+  writeShellScriptBin,
   copyDesktopItems,
-  stdenvNoCC,
-  fetchurl,
-  appimageTools,
+  stdenv,
   makeWrapper,
+  fetchpatch,
+  replaceVars,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  rustPlatform,
+  nodejs,
+  electron,
+  jq,
+  python3,
+  git,
+  cmake,
+  openssl,
+  tcl,
+  xcodebuild,
+  cctools,
+  darwin,
 }:
 
 let
-  version = "1.15.2";
-  pname = "session-desktop";
+  fake-git = writeShellScriptBin "git" (lib.readFile ./fake-git.sh);
+
+  sqlcipher-src = stdenv.mkDerivation (finalAttrs: {
+    pname = "sqlcipher-src";
+    # when updating: look for the version in deps/download.js of @signalapp/better-sqlite3, whose version is in turn found in yarn.lock
+    version = "4.6.1";
+    src = fetchFromGitHub {
+      owner = "signalapp";
+      repo = "sqlcipher";
+      tag = "v${finalAttrs.version}-f_barrierfsync";
+      hash = "sha256-3fGRPZpJmLbY95DLJ34BK53ZTzJ1dWEzislXsOrTc8k=";
+    };
+
+    patches = [
+      # Needed to reproduce the build artifact from Signal's CI.
+      # TODO: find the actual CI workflow that produces
+      # https://build-artifacts.signal.org/desktop/sqlcipher-v2-4.6.1-signal-patch2--0.2.1-asm2-6253f886c40e49bf892d5cdc92b2eb200b12cd8d80c48ce5b05967cfd01ee8c7.tar.gz
+      # See also: https://github.com/signalapp/better-sqlite3/blob/v9.0.13/deps/defines.gypi#L33
+      # Building @signalapp/better-sqlite3 will require openssl without this patch.
+      (fetchpatch {
+        name = "sqlcipher-crypto-custom.patch";
+        url = "https://github.com/sqlcipher/sqlcipher/commit/702af1ff87528a78f5a9b2091806d3a5642e1d4a.patch";
+        hash = "sha256-OKh6qCGHBQWZyzXfyEveAs71wrNwlWLuG9jNqDeKNG4=";
+      })
+    ];
+
+    buildInputs = [
+      openssl
+      tcl
+    ];
+
+    # see https://github.com/signalapp/node-sqlcipher/blob/v2.4.4/deps/sqlcipher/update.sh
+    configureFlags = [ "--enable-update-limit" ];
+    makeFlags = [
+      "sqlite3.h"
+      "sqlite3.c"
+      "sqlite3ext.h"
+      "shell.c"
+    ];
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out
+      cp sqlite3.h sqlite3.c sqlite3ext.h shell.c $out
+
+      runHook postInstall
+    '';
+
+    meta = {
+      homepage = "https://github.com/signalapp/sqlcipher";
+      license = lib.licenses.bsd3;
+    };
+  });
+
+  signal-sqlcipher-extension = rustPlatform.buildRustPackage (finalAttrs: {
+    pname = "signal-sqlcipher-extension";
+    # when updating: look for the version in deps/download.js of @signalapp/better-sqlite3, whose version is in turn found in yarn.lock
+    version = "0.2.1";
+    src = fetchFromGitHub {
+      owner = "signalapp";
+      repo = "Signal-Sqlcipher-Extension";
+      rev = "v${finalAttrs.version}";
+      hash = "sha256-INSkm7ZuetPASuIqezzzG/bXoEHClUb9XpxWbxLVXRc=";
+    };
+
+    cargoHash = "sha256-qT4HM/FRL8qugKKNlMYM/0zgUsC6cDOa9fgd1d4VIrc=";
+
+    postInstall = ''
+      mkdir -p $out/include
+      cp target/*.h $out/include
+    '';
+
+    meta = {
+      homepage = "https://github.com/signalapp/Signal-Sqlcipher-Extension";
+      license = lib.licenses.agpl3Only;
+    };
+  });
+
+  libsession-util-nodejs = stdenv.mkDerivation (finalAttrs: {
+    pname = "libsession-util-nodejs";
+    version = "0.5.5"; # find version in yarn.lock
+    src = fetchFromGitHub {
+      owner = "session-foundation";
+      repo = "libsession-util-nodejs";
+      tag = "v${finalAttrs.version}";
+      fetchSubmodules = true;
+      deepClone = true; # need git rev for all submodules
+      hash = "sha256-FmI9Xmml+sjXHJ+W6CfBC8QUrQR89H3HWEYlHE2Xsts=";
+      # fetchgit is not reproducible with deepClone + fetchSubmodules:
+      # https://github.com/NixOS/nixpkgs/issues/100498
+      postFetch = ''
+        find $out -name .git -type d -prune | while read -r gitdir; do
+          pushd "$(dirname "$gitdir")"
+          git rev-parse HEAD > .gitrev
+          popd
+        done
+        find $out -name .git -type d -prune -exec rm -rf {} +
+      '';
+    };
+
+    postPatch = ''
+      sed -i -E 's/--runtime-version=[^[:space:]]*/--runtime-version=${electron.version}/' package.json
+    '';
+
+    nativeBuildInputs = [
+      yarnConfigHook
+      yarnBuildHook
+      yarnInstallHook
+      nodejs
+      cmake
+      python3
+      fake-git # used in update_version.sh, libsession-util/external/oxen-libquic/cmake/check_submodule.cmake, etc.
+      jq
+    ];
+
+    dontUseCmakeConfigure = true;
+    yarnOfflineCache = fetchYarnDeps {
+      yarnLock = "${finalAttrs.src}/yarn.lock";
+      hash = "sha256-0pH88EOqxG/kg7edaWnaLEs3iqhIoRCJxDdBn4JxYeY=";
+    };
+
+    preBuild = ''
+      # prevent downloading; see https://github.com/cmake-js/cmake-js/blob/v7.3.1/lib/dist.js
+      mkdir -p "$HOME/.cmake-js/electron-${stdenv.hostPlatform.node.arch}"
+      ln -s ${electron.headers} "$HOME/.cmake-js/electron-${stdenv.hostPlatform.node.arch}/v${electron.version}"
+
+      # populate src/version.h
+      yarn update_version
+    '';
+
+    # The install script is the build script.
+    # `yarn install` may be better than `yarn run install`.
+    # However, the former seems to use /bin/bash while the latter uses stdenv.shell,
+    # and the former simply cannot find the cmake-js command, which is pretty weird,
+    # and using `yarn config set script-shell` does not help.
+    yarnBuildScript = "run";
+    yarnBuildFlags = "install";
+
+    postInstall = ''
+      # build is not installed by default because it is in .gitignore
+      cp -r build $out/lib/node_modules/libsession_util_nodejs
+    '';
+
+    meta = {
+      homepage = "https://github.com/session-foundation/libsession-util-nodejs";
+      # No license file, but gpl3Only makes sense because package.json says GPL-3.0,
+      # which is also consistent with session-desktop and libsession-util.
+      license = lib.licenses.gpl3Only;
+    };
+  });
 
-  src = fetchurl {
-    url = "https://github.com/session-foundation/session-desktop/releases/download/v${version}/session-desktop-linux-x86_64-${version}.AppImage";
-    hash = "sha256-xQ/Fjg04XgXUioCCU0+sOLaTWZV1z05EmzZCqEU++Ok=";
-  };
-  appimage = appimageTools.wrapType2 { inherit version pname src; };
-  appimage-contents = appimageTools.extractType2 { inherit version pname src; };
 in
-stdenvNoCC.mkDerivation {
-  inherit version pname;
-  src = appimage;
+stdenv.mkDerivation (finalAttrs: {
+  pname = "session-desktop";
+  version = "1.16.10";
+  src = fetchFromGitHub {
+    owner = "session-foundation";
+    repo = "session-desktop";
+    tag = "v${finalAttrs.version}";
+    leaveDotGit = true;
+    hash = "sha256-9l5AgG9YNz61lS/1Q/b46UgdyidHH7sQK7ZWz19XWr0=";
+    postFetch = ''
+      pushd $out
+      git rev-parse HEAD > .gitrev
+      rm -rf .git
+      popd
+    '';
+  };
+
+  postPatch = ''
+    jq '
+      del(.engines) # too restrictive Node version requirement
+      # control what files are packed in the install phase
+      + {files: ["**/*.js", "**/*.html", "**/*.node", "_locales", "config", "fonts", "images", "mmdb", "mnemonic_languages", "protos", "sound", "stylesheets"]}
+    ' package.json > package.json.new
+    mv package.json.new package.json
+  '';
 
   nativeBuildInputs = [
     copyDesktopItems
     makeWrapper
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+    jq
+    python3
+    fake-git # see build/updateLocalConfig.js
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools # provides libtool needed for better-sqlite3
+    xcodebuild
+    darwin.autoSignDarwinBinariesHook
   ];
 
+  env = {
+    npm_config_nodedir = electron.headers;
+    ELECTRON_SKIP_BINARY_DOWNLOAD = 1;
+  };
+
+  dontUseCmakeConfigure = true;
+  yarnOfflineCache = fetchYarnDeps {
+    # Future maintainers: keep in mind that sometimes the upstream deduplicates dependencies
+    # (see the `dedup` script in package.json) before committing yarn.lock,
+    # which may unfortunately break the offline cache (and may not).
+    # If that happens, clone the repo and run `yarn install --ignore-scripts` yourself,
+    # copy the modified yarn.lock here, and use `./yarn.lock` instead of `"${finalAttrs.src}/yarn.lock"`,
+    # and also add `cp ${./yarn.lock} yarn.lock` to postPatch.
+    yarnLock = "${finalAttrs.src}/yarn.lock";
+    hash = "sha256-A2AbKOXWx8+PN467DVpKVTorZDs/UFaxjc7VS0Xdo6k=";
+  };
+
+  preBuild = ''
+    # prevent downloading
+    pushd node_modules/@signalapp/better-sqlite3/deps
+    tar -czf sqlcipher.tar.gz \
+      -C ${signal-sqlcipher-extension} lib include \
+      -C ${sqlcipher-src} . \
+      --transform="s,^lib,./signal-sqlcipher-extension/${stdenv.targetPlatform.rust.cargoShortTarget}," \
+      --transform="s,^include,./signal-sqlcipher-extension/include,"
+    hash=$(sha256sum sqlcipher.tar.gz | cut -d' ' -f1)
+    sed -i "s/^const HASH = '.*';/const HASH = '$hash';/" download.js
+    popd
+
+    export NODE_ENV=production
+
+    # rebuild native modules except libsession_util_nodejs
+    rm -rf node_modules/libsession_util_nodejs
+    npm rebuild --verbose --offline --no-progress --release # why doesn't yarn have `rebuild`?
+    cp -r ${libsession-util-nodejs}/lib/node_modules/libsession_util_nodejs node_modules
+    chmod -R +w node_modules/libsession_util_nodejs
+    rm -rf node_modules/libsession_util_nodejs/node_modules
+
+    # some important things that did not run because of --ignore-scripts
+    yarn run postinstall
+  '';
+
+  preInstall = ''
+    # Do not want yarn prune to remove native modules that we just built.
+    mv node_modules node_modules.dev
+  '';
+
+  postInstall = ''
+    find node_modules.dev -mindepth 2 -maxdepth 3 -type d -name build  | while read -r buildDir; do
+      packageDir=$(dirname ''${buildDir#node_modules.dev/})
+      installPackageDir="$out/lib/node_modules/session-desktop/node_modules/$packageDir"
+      if [ -d "$installPackageDir" ]; then
+        cp -r "$buildDir" "$installPackageDir"
+      fi
+    done
+
+    makeWrapper ${lib.getExe electron} $out/bin/session-desktop \
+      --add-flags $out/lib/node_modules/session-desktop \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --set NODE_ENV production \
+      --inherit-argv0
+
+    for f in build/icons/icon_*.png; do
+      base=$(basename $f .png)
+      size=''${base#icon_}
+      install -Dm644 $f $out/share/icons/hicolor/$size/apps/session-desktop.png
+    done
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications/Session.app/Contents/{MacOS,Resources}
+    ln -s $out/bin/session-desktop $out/Applications/Session.app/Contents/MacOS/Session
+    install -Dm644 build/icon-mac.icns $out/Applications/Session.app/Contents/Resources/icon.icns
+    install -Dm644 ${
+      # Adapted from the dmg package from upstream:
+      # https://github.com/session-foundation/session-desktop/releases/download/v1.16.10/session-desktop-mac-arm64-1.16.10.dmg
+      replaceVars ./Info.plist { inherit (finalAttrs) version; }
+    } $out/Applications/Session.app/Contents/Info.plist
+  '';
+
   desktopItems = [
     (makeDesktopItem {
       name = "Session";
       desktopName = "Session";
       comment = "Onion routing based messenger";
       exec = "session-desktop";
-      icon = "${appimage-contents}/session-desktop.png";
+      icon = "session-desktop";
       terminal = false;
       type = "Application";
       categories = [ "Network" ];
     })
   ];
 
-  installPhase = ''
-    runHook preInstall
+  passthru = {
+    inherit sqlcipher-src signal-sqlcipher-extension libsession-util-nodejs;
+    updateScript = ./update.sh;
+  };
 
-    mkdir -p $out/
-    cp -r bin $out/bin
-
-    wrapProgram $out/bin/session-desktop \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
+  meta = {
     description = "Onion routing based messenger";
     mainProgram = "session-desktop";
     homepage = "https://getsession.org/";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
+    downloadPage = "https://getsession.org/download";
+    changelog = "https://github.com/session-foundation/session-desktop/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [
       alexnortung
+      ulysseszhan
     ];
-    platforms = [ "x86_64-linux" ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/se/session-desktop/update.sh b/pkgs/by-name/se/session-desktop/update.sh
new file mode 100755
index 000000000000..8f6cb10327a8
--- /dev/null
+++ b/pkgs/by-name/se/session-desktop/update.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq common-updater-scripts
+
+set -euo pipefail
+
+currentVersion="$(nix-instantiate --eval --raw -A session-desktop.version)"
+latestVersion="$(
+  curl -s https://api.github.com/repos/session-foundation/session-desktop/releases/latest \
+    ${GITHUB_TOKEN:+--user ":$GITHUB_TOKEN"} \
+  | jq -r .tag_name | sed 's/^v//'
+)"
+if [ "$currentVersion" = "$latestVersion" ]; then
+  echo "Already up-to-date"
+  exit 0
+fi
+
+yarnLock="$(curl -s https://raw.githubusercontent.com/session-foundation/session-desktop/v$latestVersion/yarn.lock)"
+depVersion() {
+  name="$(echo "$1" | sed 's/\//\\&/g')"
+  echo "$yarnLock" | awk '/^"?'"$name"'@/ {flag=1; next} flag && /^  version "[^"]+"/ {match($0, /^  version "([^"]+)"/, a); print a[1]; exit}' -
+}
+
+update-source-version session-desktop.passthru.libsession-util.nodejs "$(depVersion libsession_util_nodejs)"
+
+downloadJs="$(curl -s https://raw.githubusercontent.com/signalapp/better-sqlite3/v$(depVersion @signalapp/better-sqlite3)/deps/download.js)"
+sqlDepVersion() {
+  echo "$downloadJs" | awk "match(\$0, /^const ${1}_VERSION = '([0-9.]+)['-]/, a) {print a[1]}" -
+}
+
+update-source-version session-desktop.passthru.sqlcipher-src "$(sqlDepVersion SQLCIPHER)"
+update-source-version session-desktop.passthru.signal-sqlcipher-extension "$(sqlDepVersion EXTENSION)"
+
+update-source-version session-desktop "$latestVersion"

From 80487ae22424cb80545462068e6c099986f9d8c8 Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Tue, 16 Sep 2025 18:43:29 +0300
Subject: [PATCH 0216/6226] freeglut: fix build with gcc15

- add patch from merged upstream PR:
https://www.github.com/freeglut/freeglut/pull/187

Fixes build failure with gcc15:
```
/build/freeglut-3.6.0/src/x11/fg_init_x11.c:297:6: error: conflicting
types for 'fgPlatformDestroyContext'; have 'void(SFG_PlatformDisplay,
struct __GLXcontextRec *)' {aka 'void(struct tagSFG_PlatformDisplay,
struct __GLXcontextRec *)'}
  297 | void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext )
      |      ^~~~~~~~~~~~~~~~~~~~~~~~
In file included from /build/freeglut-3.6.0/src/x11/fg_init_x11.c:34:
/build/freeglut-3.6.0/src/egl/fg_init_egl.h:31:13: note: previous
declaration of 'fgPlatformDestroyContext' with type 'void(void)'
   31 | extern void fgPlatformDestroyContext();
      |             ^~~~~~~~~~~~~~~~~~~~~~~~
/build/freeglut-3.6.0/src/x11/fg_init_x11.c:297:6: error: conflicting
types for 'fgPlatformDestroyContext'; have 'void(SFG_PlatformDisplay,
struct __GLXcontextRec *)' {aka 'void(struct tagSFG_PlatformDisplay,
struct __GLXcontextRec *)'}
  297 | void fgPlatformDestroyContext ( SFG_PlatformDisplay pDisplay, SFG_WindowContextType MContext )
      |      ^~~~~~~~~~~~~~~~~~~~~~~~
In file included from /build/freeglut-3.6.0/src/x11/fg_init_x11.c:34:
/build/freeglut-3.6.0/src/egl/fg_init_egl.h:31:13: note: previous
declaration of 'fgPlatformDestroyContext' with type 'void(void)'
   31 | extern void fgPlatformDestroyContext();
      |             ^~~~~~~~~~~~~~~~~~~~~~~~
```
---
 pkgs/by-name/fr/freeglut/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/fr/freeglut/package.nix b/pkgs/by-name/fr/freeglut/package.nix
index e112d25a82fe..4397b47e08d5 100644
--- a/pkgs/by-name/fr/freeglut/package.nix
+++ b/pkgs/by-name/fr/freeglut/package.nix
@@ -29,6 +29,14 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/freeglut/freeglut/commit/2294389397912c9a6505a88221abb7dca0a4fb79.patch";
       hash = "sha256-buNhlVUbDekklnar6KFWN/GUKE+jMEqTGrY3LY0LwVs=";
     })
+
+    # Fix build with gcc15
+    # https://github.com/freeglut/freeglut/pull/187
+    (fetchpatch {
+      name = "freeglut-fix-fgPlatformDestroyContext-prototype-for-C23.patch";
+      url = "https://github.com/freeglut/freeglut/commit/800772e993a3ceffa01ccf3fca449d3279cde338.patch";
+      hash = "sha256-agXw3JHq81tx5514kkorvuU5mX4E3AV930hy1OJl4L0=";
+    })
   ];
 
   outputs = [

From be4ece34f3f761af90a333162d85be87b0a4b27a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 Sep 2025 07:38:07 +0000
Subject: [PATCH 0217/6226] makeself: 2.5.0 -> 2.6.0

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

diff --git a/pkgs/by-name/ma/makeself/package.nix b/pkgs/by-name/ma/makeself/package.nix
index 3c329f6fc0cd..de6d35c66c14 100644
--- a/pkgs/by-name/ma/makeself/package.nix
+++ b/pkgs/by-name/ma/makeself/package.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation rec {
   pname = "makeself";
-  version = "2.5.0";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "megastep";
     repo = "makeself";
     tag = "release-${version}";
     fetchSubmodules = true;
-    hash = "sha256-QPisihCGnzG9gaZyb/bUroWdPAoC2GdQiz1tSkoScjs=";
+    hash = "sha256-F5lx8B2C8CsEUXQPQTK1q8PAMf5yzIEAqq3zbYnseTs=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From c1896dd80ba20f72e2b7036bd4cbb582bf19714c Mon Sep 17 00:00:00 2001
From: scraptux <git@thomasjasny.de>
Date: Sat, 27 Sep 2025 13:13:42 +0200
Subject: [PATCH 0218/6226] grpc: 1.75.0 -> 1.75.1

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

diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix
index f52a2cdfb1a5..0e71063ec0b0 100644
--- a/pkgs/by-name/gr/grpc/package.nix
+++ b/pkgs/by-name/gr/grpc/package.nix
@@ -25,7 +25,7 @@
 # nixpkgs-update: no auto update
 stdenv.mkDerivation rec {
   pname = "grpc";
-  version = "1.75.0"; # N.B: if you change this, please update:
+  version = "1.75.1"; # N.B: if you change this, please update:
   # pythonPackages.grpcio
   # pythonPackages.grpcio-channelz
   # pythonPackages.grpcio-health-checking
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
     owner = "grpc";
     repo = "grpc";
     tag = "v${version}";
-    hash = "sha256-2SeL/O6FaAnrPXMHAPKCSzx3hlcKLuC5y+ljJ1gewkE=";
+    hash = "sha256-SnKK52VLO4MM/ftfmzRV/LeLfOucdIyHMyWk6EKRfvM=";
     fetchSubmodules = true;
   };
 

From d614f230f09fbe79cde5663c09aa8280444ea5f7 Mon Sep 17 00:00:00 2001
From: scraptux <git@thomasjasny.de>
Date: Sat, 27 Sep 2025 13:13:47 +0200
Subject: [PATCH 0219/6226] python3Packages.grpcio: 1.75.0 -> 1.75.1

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

diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix
index 81a5e604af72..f8d67db96e64 100644
--- a/pkgs/development/python-modules/grpcio/default.nix
+++ b/pkgs/development/python-modules/grpcio/default.nix
@@ -19,14 +19,14 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio";
-  version = "1.75.0";
+  version = "1.75.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uYnosJSJR4wtGf7MdEopiTD0DYsnw2OK+/6E0i82zk4=";
+    hash = "sha256-PoHYns6ZuaziOmkWiAusphPAOnmZJa+yhXiH76ixs9I=";
   };
 
   outputs = [

From 3ef539296933d80162f85dced711e85308f6cf51 Mon Sep 17 00:00:00 2001
From: scraptux <git@thomasjasny.de>
Date: Sat, 27 Sep 2025 13:14:10 +0200
Subject: [PATCH 0220/6226] python3Packages.grpcio-channelz: 1.75.0 -> 1.75.1

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

diff --git a/pkgs/development/python-modules/grpcio-channelz/default.nix b/pkgs/development/python-modules/grpcio-channelz/default.nix
index 8503cf2e76ce..012af3877b96 100644
--- a/pkgs/development/python-modules/grpcio-channelz/default.nix
+++ b/pkgs/development/python-modules/grpcio-channelz/default.nix
@@ -12,13 +12,13 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-channelz";
-  version = "1.75.0";
+  version = "1.75.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "grpcio_channelz";
     inherit version;
-    hash = "sha256-1SGXOjQ4Bqg4S/h86uk88unxD4+rAsEr56Lj1dDk5o8=";
+    hash = "sha256-4MqgbU3j62LT/cVOXJ3JADqj7iHpxQ9dNTiuqFTSdvI=";
   };
 
   build-system = [ setuptools ];

From 76c6a6a4cf7db4f0d7ba9fe036256530d2ea8393 Mon Sep 17 00:00:00 2001
From: scraptux <git@thomasjasny.de>
Date: Sat, 27 Sep 2025 13:14:13 +0200
Subject: [PATCH 0221/6226] python3Packages.grpcio-health-checking: 1.75.0 ->
 1.75.1

---
 .../python-modules/grpcio-health-checking/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/grpcio-health-checking/default.nix b/pkgs/development/python-modules/grpcio-health-checking/default.nix
index 419872582d45..fe84d0817569 100644
--- a/pkgs/development/python-modules/grpcio-health-checking/default.nix
+++ b/pkgs/development/python-modules/grpcio-health-checking/default.nix
@@ -11,13 +11,13 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-health-checking";
-  version = "1.75.0";
+  version = "1.75.1";
   format = "setuptools";
 
   src = fetchPypi {
     pname = "grpcio_health_checking";
     inherit version;
-    hash = "sha256-TeXrJwlihA9g4Ynr3b/P4jK17Pz2GN1TQRam9mhLQL8=";
+    hash = "sha256-iI6huGrWXALIVHSG6VJjVi4UU2Pj1UAPUkT38sUyPmM=";
   };
 
   propagatedBuildInputs = [

From 2b524f18a948d0ce40567d584c50bb1c6894b035 Mon Sep 17 00:00:00 2001
From: scraptux <git@thomasjasny.de>
Date: Sat, 27 Sep 2025 13:14:17 +0200
Subject: [PATCH 0222/6226] python3Packages.grpcio-reflection: 1.75.0 -> 1.75.1

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

diff --git a/pkgs/development/python-modules/grpcio-reflection/default.nix b/pkgs/development/python-modules/grpcio-reflection/default.nix
index 3d5886bfc494..4b6290afd791 100644
--- a/pkgs/development/python-modules/grpcio-reflection/default.nix
+++ b/pkgs/development/python-modules/grpcio-reflection/default.nix
@@ -12,13 +12,13 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-reflection";
-  version = "1.75.0";
+  version = "1.75.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "grpcio_reflection";
     inherit version;
-    hash = "sha256-YLuYZfVBGtWJQg6tzdfgwzjAqr7fXUzQc2PVv32pyXI=";
+    hash = "sha256-K+PyC3uT5uaRoLx2H9fpmWqUC0yWxo9spPf7xHw/S2Q=";
   };
 
   build-system = [ setuptools ];

From 9d63aed19a3b655e1ccd1d8cd1c93a2ff97fc20d Mon Sep 17 00:00:00 2001
From: scraptux <git@thomasjasny.de>
Date: Sat, 27 Sep 2025 13:14:20 +0200
Subject: [PATCH 0223/6226] python3Packages.grpcio-status: 1.75.0 -> 1.75.1

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

diff --git a/pkgs/development/python-modules/grpcio-status/default.nix b/pkgs/development/python-modules/grpcio-status/default.nix
index 4c26accf3eba..51294793b639 100644
--- a/pkgs/development/python-modules/grpcio-status/default.nix
+++ b/pkgs/development/python-modules/grpcio-status/default.nix
@@ -13,7 +13,7 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-status";
-  version = "1.75.0";
+  version = "1.75.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "grpcio_status";
     inherit version;
-    hash = "sha256-adW5G+G4uSbwhsHEg1GalowUZAdzoMzdbAQoJRXb7fc=";
+    hash = "sha256-gWKvohgzoghckQicw5WtiA+sE3ih1gIz2XZkntcky/g=";
   };
 
   postPatch = ''

From 85bfe3589496a7f6a3a121cc1ceb59fec17aac13 Mon Sep 17 00:00:00 2001
From: scraptux <git@thomasjasny.de>
Date: Sat, 27 Sep 2025 13:14:24 +0200
Subject: [PATCH 0224/6226] python3Packages.grpcio-testing: 1.75.0 -> 1.75.1

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

diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix
index 5537e6a1caca..6edd72430bfa 100644
--- a/pkgs/development/python-modules/grpcio-testing/default.nix
+++ b/pkgs/development/python-modules/grpcio-testing/default.nix
@@ -13,7 +13,7 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-testing";
-  version = "1.75.0";
+  version = "1.75.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "grpcio_testing";
     inherit version;
-    hash = "sha256-UuDE9gL6rQAK4a/PnZVDdyd+t8lhTMXJ+CspAHbEBbs=";
+    hash = "sha256-RUF4XosbetXbFVEyGsFE3WOM/z0fsC+St9ZRHFhLmKg=";
   };
 
   postPatch = ''

From e24e2e500e85f9d25487e47934c7a298dfca6937 Mon Sep 17 00:00:00 2001
From: scraptux <git@thomasjasny.de>
Date: Sat, 27 Sep 2025 13:14:27 +0200
Subject: [PATCH 0225/6226] python3Packages.grpcio-tools: 1.75.0 -> 1.75.1

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

diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix
index c8af7dfff691..254f2f94b5ed 100644
--- a/pkgs/development/python-modules/grpcio-tools/default.nix
+++ b/pkgs/development/python-modules/grpcio-tools/default.nix
@@ -12,13 +12,13 @@
 # nixpkgs-update: no auto update
 buildPythonPackage rec {
   pname = "grpcio-tools";
-  version = "1.75.0";
+  version = "1.75.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "grpcio_tools";
     inherit version;
-    hash = "sha256-615AJQNNkto8gf1eNGjDPVrnVxsHpyw4W17BdGZYVz8=";
+    hash = "sha256-u3iWDPPViUHh/scMvazPJVkYvu0Tw0ESppFabY+s69E=";
   };
 
   outputs = [

From a1d13231b14a4adff6f0225ae5453e0718d0ac13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 Sep 2025 12:00:12 +0000
Subject: [PATCH 0226/6226] level-zero: 1.24.2 -> 1.24.3

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

diff --git a/pkgs/by-name/le/level-zero/package.nix b/pkgs/by-name/le/level-zero/package.nix
index 1637b1bd1d68..2f036f5d56ef 100644
--- a/pkgs/by-name/le/level-zero/package.nix
+++ b/pkgs/by-name/le/level-zero/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "level-zero";
-  version = "1.24.2";
+  version = "1.24.3";
 
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "level-zero";
     tag = "v${version}";
-    hash = "sha256-5QkXWuMFNsYNsW8lgo9FQIZ5NuLiRZCFKGWedpddi8Y=";
+    hash = "sha256-1UwcH+7q2elpqlqafpytC+K0jTHYdyjRtUX9hpBq+EQ=";
   };
 
   nativeBuildInputs = [

From 1cc4f76aa7f7d12cf0d3a1b8125bad5c2b38900a Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Tue, 16 Sep 2025 18:32:32 +0300
Subject: [PATCH 0227/6226] ppp: fix build with gcc15

- add patch from merged upstream PR:
https://www.github.com/ppp-project/ppp/pull/548

Fixes build failure with gcc15:
```
pppdump.c:81:9: error: too many arguments to function 'dumplog'; expected 0, have 1
   81 |         dumplog(stdin);
      |         ^~~~~~~ ~~~~~
pppdump.c:45:6: note: declared here
   45 | void dumplog();
      |      ^~~~~~~
pppdump.c:90:17: error: too many arguments to function 'dumpppp'; expected 0, have 1
   90 |                 dumpppp(f);
      |                 ^~~~~~~ ~
pppdump.c:46:6: note: declared here
   46 | void dumpppp();
      |      ^~~~~~~
pppdump.c:92:17: error: too many arguments to function 'dumplog'; expected 0, have 1
   92 |                 dumplog(f);
      |                 ^~~~~~~ ~
pppdump.c:45:6: note: declared here
   45 | void dumplog();
      |      ^~~~~~~
pppdump.c: In function 'dumplog':
pppdump.c:102:1: error: number of arguments doesn't match prototype
  102 | {
      | ^
pppdump.c:45:6: error: prototype declaration
   45 | void dumplog();
      |      ^~~~~~~
pppdump.c:175:13: error: too many arguments to function 'show_time'; expected 0, have 2
  175 |             show_time(f, c);
      |             ^~~~~~~~~ ~
pppdump.c:47:6: note: declared here
   47 | void show_time();
      |      ^~~~~~~~~
pppdump.c: In function 'dumpppp':
pppdump.c:246:1: error: number of arguments doesn't match prototype
  246 | {
      | ^
pppdump.c:46:6: error: prototype declaration
   46 | void dumpppp();
      |      ^~~~~~~
pppdump.c:369:13: error: too many arguments to function 'show_time'; expected 0, have 2
  369 |             show_time(f, c);
      |             ^~~~~~~~~ ~
pppdump.c:47:6: note: declared here
   47 | void show_time();
      |      ^~~~~~~~~
pppdump.c: In function 'show_time':
pppdump.c:381:1: error: number of arguments doesn't match prototype
  381 | {
      | ^
pppdump.c:47:6: error: prototype declaration
   47 | void show_time();
      |      ^~~~~~~~~
```
---
 pkgs/by-name/pp/ppp/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/pp/ppp/package.nix b/pkgs/by-name/pp/ppp/package.nix
index 280fa0522e89..b49ba381d536 100644
--- a/pkgs/by-name/pp/ppp/package.nix
+++ b/pkgs/by-name/pp/ppp/package.nix
@@ -2,6 +2,7 @@
   autoreconfHook,
   bash,
   fetchFromGitHub,
+  fetchpatch,
   lib,
   libpcap,
   libxcrypt,
@@ -25,6 +26,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-NV8U0F8IhHXn0YuVbfFr992ATQZaXA16bb5hBIwm9Gs=";
   };
 
+  patches = [
+    # Fix build with gcc15
+    # https://github.com/ppp-project/ppp/pull/548
+    (fetchpatch {
+      url = "https://github.com/ppp-project/ppp/commit/05361692ee7d6260ce5c04c9fa0e5a1aa7565323.patch";
+      hash = "sha256-ybuWyA1t9IJ1Sg06a0b0tin4qssr0qzmenfGoA1X0BE=";
+    })
+  ];
+
   configureFlags = [
     "--localstatedir=/var"
     "--sysconfdir=/etc"

From fefbf95c6c6eb0fe5be524efcb8ebceac9807101 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 Sep 2025 14:13:31 +0000
Subject: [PATCH 0228/6226] mpvScripts.mpvacious: 0.40 -> 0.41

---
 pkgs/applications/video/mpv/scripts/mpvacious.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/mpv/scripts/mpvacious.nix b/pkgs/applications/video/mpv/scripts/mpvacious.nix
index 7c85120bcf6b..adb0d76f4159 100644
--- a/pkgs/applications/video/mpv/scripts/mpvacious.nix
+++ b/pkgs/applications/video/mpv/scripts/mpvacious.nix
@@ -10,13 +10,13 @@
 
 buildLua rec {
   pname = "mpvacious";
-  version = "0.40";
+  version = "0.41";
 
   src = fetchFromGitHub {
     owner = "Ajatt-Tools";
     repo = "mpvacious";
     rev = "v${version}";
-    sha256 = "sha256-PxLbv9aGVQV4Gea2H/GcWv/yuaRSqBRqbzRXu612kLE=";
+    sha256 = "sha256-bOW9hKDZ+S+/MJmZHN6N5rcZ9h6/s0bSPagYV7Zc2Yo=";
   };
   passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 

From cc7fa78411e2797cde7642c8f56586f05d9cd842 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 Sep 2025 14:48:07 +0000
Subject: [PATCH 0229/6226] clojure: 1.12.2.1565 -> 1.12.3.1577

---
 pkgs/development/interpreters/clojure/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix
index 438331140b41..03e8086c4bc1 100644
--- a/pkgs/development/interpreters/clojure/default.nix
+++ b/pkgs/development/interpreters/clojure/default.nix
@@ -12,12 +12,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "clojure";
-  version = "1.12.2.1565";
+  version = "1.12.3.1577";
 
   src = fetchurl {
     # https://github.com/clojure/brew-install/releases
     url = "https://github.com/clojure/brew-install/releases/download/${finalAttrs.version}/clojure-tools-${finalAttrs.version}.tar.gz";
-    hash = "sha256-qj0RqgIL+pgbqdMnG+vCfHirazBVA8ro2zCKOlDzYXk=";
+    hash = "sha256-u/hROuiLmHPpeBroaty1YLgSCcZv6Uy+ckKK85seusw=";
   };
 
   nativeBuildInputs = [

From aa4a715d84e3e65f1eae4b511e369f1c0a1e7da7 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 27 Sep 2025 17:54:16 +0200
Subject: [PATCH 0230/6226] expat: 2.7.2 -> 2.7.3

https://github.com/libexpat/libexpat/blob/R_2_7_3/expat/Changes
---
 pkgs/by-name/ex/expat/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ex/expat/package.nix b/pkgs/by-name/ex/expat/package.nix
index ba5a46d034f8..d650a64b19fc 100644
--- a/pkgs/by-name/ex/expat/package.nix
+++ b/pkgs/by-name/ex/expat/package.nix
@@ -18,7 +18,7 @@
 # files.
 
 let
-  version = "2.7.2";
+  version = "2.7.3";
   tag = "R_${lib.replaceStrings [ "." ] [ "_" ] version}";
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
     url =
       with finalAttrs;
       "https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz";
-    hash = "sha256-Ibd4s07IN8KsKFrvNA+ftfoGOoEbIepNJBKpcCyImVw=";
+    hash = "sha256-cd+PQHBqe7CoClNnB56nXZHaT4xlxY7Fm837997Nq58=";
   };
 
   strictDeps = true;

From d75645baa769264daaca223464052ed46c879234 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 27 Sep 2025 21:12:49 +0200
Subject: [PATCH 0231/6226] python3Packages.markupsafe: 3.0.2 -> 3.0.3

https://markupsafe.palletsprojects.com/page/changes/#version-3-0-3
---
 pkgs/development/python-modules/markupsafe/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/markupsafe/default.nix b/pkgs/development/python-modules/markupsafe/default.nix
index 96cee74b4ab8..3e9582f7fc31 100644
--- a/pkgs/development/python-modules/markupsafe/default.nix
+++ b/pkgs/development/python-modules/markupsafe/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "markupsafe";
-  version = "3.0.2";
+  version = "3.0.3";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "pallets";
     repo = "markupsafe";
     tag = version;
-    hash = "sha256-BqCkQqPhjEx3qB/k3d3fSirR/HDBa7e4kpx3/VSwXJM=";
+    hash = "sha256-2d64cItemqVM25WJIKrjExKz6v4UW2wVxM6phH1g1sE=";
   };
 
   build-system = [ setuptools ];

From be9d028251faa13e0ca0c1a17d34435b3cb06471 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 27 Sep 2025 19:27:50 +0000
Subject: [PATCH 0232/6226] node-problem-detector: 0.8.21 -> 1.34.0

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

diff --git a/pkgs/by-name/no/node-problem-detector/package.nix b/pkgs/by-name/no/node-problem-detector/package.nix
index cae72f0452f7..75776db35417 100644
--- a/pkgs/by-name/no/node-problem-detector/package.nix
+++ b/pkgs/by-name/no/node-problem-detector/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "node-problem-detector";
-  version = "0.8.21";
+  version = "1.34.0";
 
   src = fetchFromGitHub {
     owner = "kubernetes";
     repo = "node-problem-detector";
     rev = "v${version}";
-    sha256 = "sha256-byxj6EXKAmesFOBtBt0URcT0h1pYdrW8ewtITuEPFcs=";
+    sha256 = "sha256-titH2HHXxm8SpfisAWckwPSA11rsqssMCVmDbdPHDI8=";
   };
 
   vendorHash = null;

From 5c3433cf6a392c7af0211ea7012479bcd2fe2fe9 Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Tue, 16 Sep 2025 18:34:35 +0300
Subject: [PATCH 0233/6226] libsndfile: fix build with gcc15

- add patch from merged upstream PR:
https://www.github.com/libsndfile/libsndfile/pull/1055

Fixes build failure with gcc15:
```
src/ALAC/alac_decoder.c:42:9: error: cannot use keyword 'false' as enumeration constant
   42 | {       false = 0,
      |         ^~~~~
src/ALAC/alac_decoder.c:42:9: note: 'false' is a keyword with '-std=c23' onwards
src/ALAC/alac_decoder.c:44:3: error: expected ';', identifier or '(' before 'bool'
   44 | } bool ;
      |   ^~~~
src/ALAC/alac_decoder.c:44:3: warning: useless type name in empty declaration
make[2]: *** [Makefile:2615: src/ALAC/alac_decoder.lo] Error 1
make[2]: *** Waiting for unfinished jobs....
src/ALAC/alac_encoder.c:49:9: error: cannot use keyword 'false' as enumeration constant
   49 |         false = 0,
      |         ^~~~~
src/ALAC/alac_encoder.c:49:9: note: 'false' is a keyword with '-std=c23' onwards
src/ALAC/alac_encoder.c:51:3: error: expected ';', identifier or '(' before 'bool'
   51 | } bool ;
      |   ^~~~
```
---
 pkgs/by-name/li/libsndfile/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/li/libsndfile/package.nix b/pkgs/by-name/li/libsndfile/package.nix
index 3e894e8e40f4..4884e3480e49 100644
--- a/pkgs/by-name/li/libsndfile/package.nix
+++ b/pkgs/by-name/li/libsndfile/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   autoreconfHook,
   autogen,
   pkg-config,
@@ -35,6 +36,15 @@ stdenv.mkDerivation rec {
     hash = "sha256-MOOX/O0UaoeMaQPW9PvvE0izVp+6IoE5VbtTx0RvMkI=";
   };
 
+  patches = [
+    # Fix build with gcc15
+    # https://github.com/libsndfile/libsndfile/pull/1055
+    (fetchpatch {
+      url = "https://github.com/libsndfile/libsndfile/commit/2251737b3b175925684ec0d37029ff4cb521d302.patch";
+      hash = "sha256-LaeptEicnjpVBExlK4dNMlN8+AAJhW8dIvemF6S4W2M=";
+    })
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     autogen

From 954ac426c36fe8079c8411485c2073feea3cdb15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 19 Sep 2025 13:26:43 +0000
Subject: [PATCH 0234/6226] ocamlPackages.base64: 3.5.1 -> 3.5.2

---
 pkgs/development/ocaml-modules/base64/default.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/ocaml-modules/base64/default.nix b/pkgs/development/ocaml-modules/base64/default.nix
index 64fcbf8f93a8..08b028c874ee 100644
--- a/pkgs/development/ocaml-modules/base64/default.nix
+++ b/pkgs/development/ocaml-modules/base64/default.nix
@@ -11,14 +11,13 @@
 
 buildDunePackage rec {
   pname = "base64";
-  version = "3.5.1";
+  version = "3.5.2";
 
-  minimalOCamlVersion = "4.03";
-  duneVersion = "3";
+  minimalOCamlVersion = "4.07";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-base64/releases/download/v${version}/base64-${version}.tbz";
-    hash = "sha256-2P7apZvRL+rnrMCLWSjdR4qsUj9MqNJARw0lAGUcZe0=";
+    hash = "sha256-s/XOMBqnLHAy75C+IzLXL/OWKSLADuKuxryt4Yei9Zs=";
   };
 
   nativeBuildInputs = [ findlib ];

From f751823dce159c2f1507f1cbee9a909babf67f80 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 28 Sep 2025 03:18:47 +0200
Subject: [PATCH 0235/6226] python3Packages.trio: 0.30.0 -> 0.31.0

https://github.com/python-trio/trio/blob/v0.31.0/docs/source/history.rst
---
 pkgs/development/python-modules/trio/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/trio/default.nix b/pkgs/development/python-modules/trio/default.nix
index 0dc38d643bf3..99a6a5e5d221 100644
--- a/pkgs/development/python-modules/trio/default.nix
+++ b/pkgs/development/python-modules/trio/default.nix
@@ -21,6 +21,7 @@
   pyopenssl,
   pytestCheckHook,
   pytest-trio,
+  pyyaml,
   trustme,
 }:
 
@@ -35,7 +36,7 @@ let
 in
 buildPythonPackage rec {
   pname = "trio";
-  version = "0.30.0";
+  version = "0.31.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -44,7 +45,7 @@ buildPythonPackage rec {
     owner = "python-trio";
     repo = "trio";
     tag = "v${version}";
-    hash = "sha256-spYHwVq3iNhnZQf2z7aTyDuSCiSl3X5PD6siXqLC4EA=";
+    hash = "sha256-cl1GstWVHDD3nWx835k2hnswt/+AnoTLXjxVIfLP6Es=";
   };
 
   build-system = [ setuptools ];
@@ -66,6 +67,7 @@ buildPythonPackage rec {
     pyopenssl
     pytestCheckHook
     pytest-trio'
+    pyyaml
     trustme
   ];
 

From cde3cab7eed2dd4074d2e47f154a8dc17a7624a6 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 28 Sep 2025 03:19:46 +0200
Subject: [PATCH 0236/6226] python3Packages.anyio: 4.10.0 -> 4.11.0

https://github.com/agronholm/anyio/blob/4.11.0/docs/versionhistory.rst
---
 pkgs/development/python-modules/anyio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/anyio/default.nix b/pkgs/development/python-modules/anyio/default.nix
index 99fd7ff5dcab..f5e02b9d2067 100644
--- a/pkgs/development/python-modules/anyio/default.nix
+++ b/pkgs/development/python-modules/anyio/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "anyio";
-  version = "4.10.0";
+  version = "4.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     owner = "agronholm";
     repo = "anyio";
     tag = version;
-    hash = "sha256-9nOGQTqdO3VzA9c97BpZqqwpll5O5+3gRvF/l2Y2ars=";
+    hash = "sha256-TOXg9J/Z2S5/X7OBgU+J0HZNB3BDluaWTqDiqp3O4ek=";
   };
 
   build-system = [ setuptools-scm ];

From 8f3e743e2ee6695666737e8709bb593ef6fa4756 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Sep 2025 02:46:04 +0000
Subject: [PATCH 0237/6226] passt: 2025_09_11.6cbcccc -> 2025_09_19.623dbf6

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

diff --git a/pkgs/by-name/pa/passt/package.nix b/pkgs/by-name/pa/passt/package.nix
index cbd07119d048..43ba184ded98 100644
--- a/pkgs/by-name/pa/passt/package.nix
+++ b/pkgs/by-name/pa/passt/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "passt";
-  version = "2025_09_11.6cbcccc";
+  version = "2025_09_19.623dbf6";
 
   src = fetchurl {
     url = "https://passt.top/passt/snapshot/passt-${finalAttrs.version}.tar.gz";
-    hash = "sha256-9Byeb4gsP6Ai1lbET1DGcuUn/637ujrxYn70t2o59L4=";
+    hash = "sha256-3krWW/QKijgZsmHuelMjpcaL8OyRqmPKC/wUvag0ZHI=";
   };
 
   separateDebugInfo = true;

From 03e387632afa8a0f4cd39a89ce2494534a104feb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Sep 2025 04:35:16 +0000
Subject: [PATCH 0238/6226] whisparr: 2.0.0.1278 -> 2.0.0.1282

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

diff --git a/pkgs/by-name/wh/whisparr/package.nix b/pkgs/by-name/wh/whisparr/package.nix
index 2fcc319e5eb3..82ee0911960c 100644
--- a/pkgs/by-name/wh/whisparr/package.nix
+++ b/pkgs/by-name/wh/whisparr/package.nix
@@ -29,16 +29,16 @@ let
     ."${system}" or (throw "Unsupported system: ${system}");
   hash =
     {
-      arm64-linux-hash = "sha256-o2iZAgpKM/E9EL+jXpcJhQkyIfC3ytcW5erAuHsNNCo=";
-      arm64-osx-hash = "sha256-axa2VeieIdsjp09DG8vAlvYHX4PmqoLhiTe1OtAK8/k=";
-      x64-linux-hash = "sha256-bLmTovZrO3+8CrYM7h46k2TvGK0v7Mn3CXdkLgwCoD4=";
-      x64-osx-hash = "sha256-mExZSwmeSkssPRbRoXKN3htstPPyAju2Z7/cSZ8ZeU0=";
+      arm64-linux-hash = "sha256-AGERhD8EiTkaXw7GWVaWPFVuQkclSarNOGMgs+6zxfI=";
+      arm64-osx-hash = "sha256-AUZoAAEmgrb1A7OKLc7QOliGTgctD9MuM9rqNWQ3ySM=";
+      x64-linux-hash = "sha256-ZRbV1nxAIiHUL8DzmlAJRcFOnl5t8+ur3zXhw29mUfk=";
+      x64-osx-hash = "sha256-WfR0x89wQNAiLYX1Dg5AsEuiqHSX9IhhxEOoVuPjRH8=";
     }
     ."${arch}-${os}-hash";
 in
 stdenv.mkDerivation rec {
   pname = "whisparr";
-  version = "2.0.0.1278";
+  version = "2.0.0.1282";
 
   src = fetchurl {
     name = "${pname}-${arch}-${os}-${version}.tar.gz";

From 2fd97fb9b1cb5678ccc364f110202f56923aa9c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Sep 2025 04:35:57 +0000
Subject: [PATCH 0239/6226] xeus: 5.2.3 -> 5.2.4

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

diff --git a/pkgs/by-name/xe/xeus/package.nix b/pkgs/by-name/xe/xeus/package.nix
index d2bb4afed02a..6d42b94f8589 100644
--- a/pkgs/by-name/xe/xeus/package.nix
+++ b/pkgs/by-name/xe/xeus/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xeus";
-  version = "5.2.3";
+  version = "5.2.4";
 
   src = fetchFromGitHub {
     owner = "jupyter-xeus";
     repo = "xeus";
     tag = finalAttrs.version;
-    hash = "sha256-7hT2Ellgut25R3R28nRKd6/kKmfQf9NCoJ2BV9ZGt8I=";
+    hash = "sha256-siQzTu2IYHLbZrgLTbHPt8Ek8vLA/wXB0jx7oXC6d7k=";
   };
 
   nativeBuildInputs = [

From 2b1247d46653e40de3cb9f5ac43c5aa120f2ac34 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Sep 2025 08:54:32 +0000
Subject: [PATCH 0240/6226] syncstorage-rs: 0.21.0 -> 0.21.1

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

diff --git a/pkgs/by-name/sy/syncstorage-rs/package.nix b/pkgs/by-name/sy/syncstorage-rs/package.nix
index 46f6ed461417..8d91b26ae515 100644
--- a/pkgs/by-name/sy/syncstorage-rs/package.nix
+++ b/pkgs/by-name/sy/syncstorage-rs/package.nix
@@ -22,13 +22,13 @@ in
 
 rustPlatform.buildRustPackage rec {
   pname = "syncstorage-rs";
-  version = "0.21.0";
+  version = "0.21.1";
 
   src = fetchFromGitHub {
     owner = "mozilla-services";
     repo = "syncstorage-rs";
     tag = version;
-    hash = "sha256-B9eZmpNV7eOpnQZU7M6KSGgFjlCI7+Vh7rWsqKMNGm8=";
+    hash = "sha256-WkUU6013sdLMh3hq9CE/D5+ftpdisihVD6W+FvjwbP4=";
   };
 
   nativeBuildInputs = [
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
       --prefix PATH : ${lib.makeBinPath [ pyFxADeps ]}
   '';
 
-  cargoHash = "sha256-3JW0vaTSYDF5tfjDa6nzhKA58QDODhtMEZNK3bah1VQ=";
+  cargoHash = "sha256-V6shIxNpw+WHqypNgE02Sr7DO8l3H9tb72a1u2UHDfo=";
 
   # almost all tests need a DB to test against
   doCheck = false;

From 61965ae0d79fb88d4b6f995a07d9fc98dacad8c0 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 28 Sep 2025 10:16:09 +0100
Subject: [PATCH 0241/6226] libunistring: 1.3 -> 1.4

Changes: https://savannah.gnu.org/news/?id=10818
---
 pkgs/development/libraries/libunistring/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix
index 1d703fa5f89f..43db16eb28f6 100644
--- a/pkgs/development/libraries/libunistring/default.nix
+++ b/pkgs/development/libraries/libunistring/default.nix
@@ -22,11 +22,11 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libunistring";
-  version = "1.3";
+  version = "1.4";
 
   src = fetchurl {
     url = "mirror://gnu/libunistring/libunistring-${finalAttrs.version}.tar.gz";
-    hash = "sha256-jqjM+GwJ3YAcjKwZh46ATlT3B89piENxEw0gveaDhrc=";
+    hash = "sha256-9+Od3soYhY7N0Cxg0dU3T83LvNtraKOR+El8scss8/c=";
   };
 
   outputs = [

From 310a6343224bb8bdef3265987a5b6d07da0fa41d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 28 Sep 2025 15:04:33 +0200
Subject: [PATCH 0242/6226] python313Packages.dnspython: 2.7.0 -> 2.8.0

Changelog: https://github.com/rthalley/dnspython/blob/v2.8.0/doc/whatsnew.rst
---
 pkgs/development/python-modules/dnspython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dnspython/default.nix b/pkgs/development/python-modules/dnspython/default.nix
index 469838fe4f2b..6204b0dd25e3 100644
--- a/pkgs/development/python-modules/dnspython/default.nix
+++ b/pkgs/development/python-modules/dnspython/default.nix
@@ -15,12 +15,12 @@
 
 buildPythonPackage rec {
   pname = "dnspython";
-  version = "2.7.0";
+  version = "2.8.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-zpxDLtoNyRz2GKXO3xpOFCZRGWu80sgOie1akH5c+vE=";
+    hash = "sha256-GB08aZZFLLEYnEBGxhWZuEpahuCZVi/9530mmE/ybQ8=";
   };
 
   build-system = [ hatchling ];

From 990f560a45630d26b5e23edac9d655485dd7905b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Tue, 23 Sep 2025 09:24:52 +0200
Subject: [PATCH 0243/6226] dnsdiag: 2.6.0 -> 2.7.0

Diff: https://github.com/farrokhi/dnsdiag/compare/v2.6.0...v2.7.0

Changelog: https://github.com/farrokhi/dnsdiag/releases/tag/v2.7.0
---
 pkgs/by-name/dn/dnsdiag/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dn/dnsdiag/package.nix b/pkgs/by-name/dn/dnsdiag/package.nix
index 8ae326177f87..ae1da2edbd49 100644
--- a/pkgs/by-name/dn/dnsdiag/package.nix
+++ b/pkgs/by-name/dn/dnsdiag/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "dnsdiag";
-  version = "2.6.0";
+  version = "2.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "farrokhi";
     repo = "dnsdiag";
     tag = "v${version}";
-    hash = "sha256-6TDs+ncbVa7LWtGLlqEXJb9zzXZ+nAhbi4QGyCSu3ho=";
+    hash = "sha256-VTxIKqc7yFTLx7VLEjb4UwPKAmSD+4X+ZHrmriScVGA=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

From 418bdb760acce7b3d5c62f92ee48b4635d4c785e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dyego=20Aur=C3=A9lio?= <dyegoaurelio@gmail.com>
Date: Sun, 28 Sep 2025 10:14:11 -0300
Subject: [PATCH 0244/6226] maintainers: add dyegoaurelio

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 23700f6ede6e..94920726bea3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7113,6 +7113,12 @@
     githubId = 90563298;
     name = "Dovydas Kersys";
   };
+  dyegoaurelio = {
+    name = "Dyego Aurelio";
+    email = "d@dyego.email";
+    github = "dyegoaurelio";
+    githubId = 42411160;
+  };
   dylan-gonzalez = {
     email = "dylcg10@gmail.com";
     github = "dylan-gonzalez";

From 2f02ce3c5ca932d0bc1f098fe0e84fc389924c92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dyego=20Aur=C3=A9lio?= <dyegoaurelio@gmail.com>
Date: Sun, 28 Sep 2025 10:31:21 -0300
Subject: [PATCH 0245/6226] forge-mtg: deterministic update script

- ensuring that the patched files are sorted to avoid unnecessary large diffs such as #446810

- add myself as maintainer
---
 pkgs/by-name/fo/forge-mtg/package.nix | 5 ++++-
 pkgs/by-name/fo/forge-mtg/update.sh   | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fo/forge-mtg/package.nix b/pkgs/by-name/fo/forge-mtg/package.nix
index 30d32b82b259..c401a722fc76 100644
--- a/pkgs/by-name/fo/forge-mtg/package.nix
+++ b/pkgs/by-name/fo/forge-mtg/package.nix
@@ -129,6 +129,9 @@ maven.buildMavenPackage {
     description = "Magic: the Gathering card game with rules enforcement";
     homepage = "https://card-forge.github.io/forge";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ eigengrau ];
+    maintainers = with maintainers; [
+      dyegoaurelio
+      eigengrau
+    ];
   };
 }
diff --git a/pkgs/by-name/fo/forge-mtg/update.sh b/pkgs/by-name/fo/forge-mtg/update.sh
index f46eb254df24..e7d00310c4b4 100755
--- a/pkgs/by-name/fo/forge-mtg/update.sh
+++ b/pkgs/by-name/fo/forge-mtg/update.sh
@@ -109,7 +109,7 @@ update_patch() {
                 fi
             fi
         fi
-    done < <(find "$source_dir" -name "pom.xml" -print0)
+    done < <(find "$source_dir" -name "pom.xml" -print0 | sort -z)
 
     if [[ "$plugin_found" == "true" && -n "$patch_content" ]]; then
         echo "Updating $patch_file..."

From c6cf901e5287ed07d2e6e26664f9edbb52238440 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dyego=20Aur=C3=A9lio?= <dyegoaurelio@gmail.com>
Date: Sun, 28 Sep 2025 10:37:29 -0300
Subject: [PATCH 0246/6226] forge-mtg: 2.0.05 -> 2.0.06

---
 pkgs/by-name/fo/forge-mtg/no-launch4j.patch | 2 +-
 pkgs/by-name/fo/forge-mtg/package.nix       | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fo/forge-mtg/no-launch4j.patch b/pkgs/by-name/fo/forge-mtg/no-launch4j.patch
index a1bec7e67c7c..8d4524d43522 100644
--- a/pkgs/by-name/fo/forge-mtg/no-launch4j.patch
+++ b/pkgs/by-name/fo/forge-mtg/no-launch4j.patch
@@ -1,7 +1,7 @@
 diff --git a/forge-gui-desktop/pom.xml b/forge-gui-desktop/pom.xml
 --- a/forge-gui-desktop/pom.xml
 +++ b/forge-gui-desktop/pom.xml
-@@ -71,62 +71,6 @@
+@@ -69,62 +69,6 @@
                  </executions>
              </plugin>
              <plugin>
diff --git a/pkgs/by-name/fo/forge-mtg/package.nix b/pkgs/by-name/fo/forge-mtg/package.nix
index c401a722fc76..dba8c1a69e88 100644
--- a/pkgs/by-name/fo/forge-mtg/package.nix
+++ b/pkgs/by-name/fo/forge-mtg/package.nix
@@ -14,13 +14,13 @@
 }:
 
 let
-  version = "2.0.05";
+  version = "2.0.06";
 
   src = fetchFromGitHub {
     owner = "Card-Forge";
     repo = "forge";
     rev = "forge-${version}";
-    hash = "sha256-71CZBI4FvN5X7peDjhv+0cdTYv8hWwzM8ePdvQSb6QI=";
+    hash = "sha256-/V8Ce1r68Svf4TQ/zgIqSWjqIFr1uJOmv+aRNLm1qE4=";
   };
 
   # launch4j downloads and runs a native binary during the package phase.
@@ -31,7 +31,7 @@ maven.buildMavenPackage {
   pname = "forge-mtg";
   inherit version src patches;
 
-  mvnHash = "sha256-krPOUaJTo5i3imkDvEkBJH3W01y1KypdvitqmZ5JMMA=";
+  mvnHash = "sha256-DeYmCmsDdNOVMlD+SwvSB2VdqvCDwKghXlyaDuamHiY=";
 
   doCheck = false; # Needs a running Xorg
 

From 265d508336fbab0ff8264481bf3542f7023d59a0 Mon Sep 17 00:00:00 2001
From: rczb <rc-zb@outlook.com>
Date: Sun, 28 Sep 2025 20:31:29 +0800
Subject: [PATCH 0247/6226] racket: fix wrapGApp calls

---
 pkgs/by-name/ra/racket/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/ra/racket/package.nix b/pkgs/by-name/ra/racket/package.nix
index 82be2c38d614..03ed6377f94d 100644
--- a/pkgs/by-name/ra/racket/package.nix
+++ b/pkgs/by-name/ra/racket/package.nix
@@ -87,8 +87,19 @@ minimal.overrideAttrs (
         export XDG_CACHE_HOME=$(mktemp -d)
       '';
 
+    dontWrapGApps = true;
+
     preFixup = lib.optionalString (!isDarwin) ''
       gappsWrapperArgs+=("--set" "LOCALE_ARCHIVE" "${glibcLocales}/lib/locale/locale-archive")
+
+      find $out/bin -type f -executable -print0 |
+          while IFS= read -r -d ''' f; do
+              if test "$(file --brief --mime-type "$f")" = application/x-executable; then
+                  wrapGApp "$f"
+              fi
+          done
+
+      wrapGApp $out/lib/racket/gracket
     '';
 
     passthru =

From 92a7bc42ea4475cdfd3d0509e8b3207adead2572 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 28 Sep 2025 21:31:49 +0200
Subject: [PATCH 0248/6226] python3Packages.zlib-ng: 0.5.1 -> 1.0.0

https://github.com/pycompression/python-zlib-ng/blob/v1.0.0/CHANGELOG.rst
---
 .../python-modules/zlib-ng/default.nix           | 15 ++++-----------
 .../python-modules/zlib-ng/version.patch         | 16 ----------------
 2 files changed, 4 insertions(+), 27 deletions(-)
 delete mode 100644 pkgs/development/python-modules/zlib-ng/version.patch

diff --git a/pkgs/development/python-modules/zlib-ng/default.nix b/pkgs/development/python-modules/zlib-ng/default.nix
index 15380edc65fa..f17959460b61 100644
--- a/pkgs/development/python-modules/zlib-ng/default.nix
+++ b/pkgs/development/python-modules/zlib-ng/default.nix
@@ -2,12 +2,11 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  replaceVars,
 
   # build-system
   cmake,
   setuptools,
-  versioningit,
+  setuptools-scm,
 
   # native dependencies
   zlib-ng,
@@ -18,26 +17,20 @@
 
 buildPythonPackage rec {
   pname = "zlib-ng";
-  version = "0.5.1";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pycompression";
     repo = "python-zlib-ng";
     rev = "v${version}";
-    hash = "sha256-UsdZgpRI7h6GemT1+1g/cP/8uhLykZ//saH4JMwwlY4=";
+    hash = "sha256-t/PSby1LUTyp+7XXKZTWjRrPvAei1ZrGSGU2CIcAQBc=";
   };
 
-  patches = [
-    (replaceVars ./version.patch {
-      inherit version;
-    })
-  ];
-
   build-system = [
     cmake
     setuptools
-    versioningit
+    setuptools-scm
   ];
 
   dontUseCmakeConfigure = true;
diff --git a/pkgs/development/python-modules/zlib-ng/version.patch b/pkgs/development/python-modules/zlib-ng/version.patch
deleted file mode 100644
index e1f335525646..000000000000
--- a/pkgs/development/python-modules/zlib-ng/version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index 28ae41d..05ad409 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -2,9 +2,8 @@
- requires = ["setuptools>=64", "versioningit>=1.1.0"]
- build-backend = "setuptools.build_meta"
- 
--[tool.versioningit.vcs]
--method="git"
--default-tag = "v0.0.0"
-+[tool.versioningit]
-+default-version = "@version@"
- 
- [tool.versioningit.write]
- file = "src/zlib_ng/_version.py"

From 3e86adaa2530d528346a518dc80294595373eab2 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 28 Sep 2025 22:11:20 +0200
Subject: [PATCH 0249/6226] python3Packages.voluptuous-openapi: 0.1.0 -> 0.2.0

https://github.com/home-assistant-libs/voluptuous-openapi/releases/tag/0.2.0
---
 .../python-modules/voluptuous-openapi/default.nix           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/voluptuous-openapi/default.nix b/pkgs/development/python-modules/voluptuous-openapi/default.nix
index 98d29e05eece..215c495de805 100644
--- a/pkgs/development/python-modules/voluptuous-openapi/default.nix
+++ b/pkgs/development/python-modules/voluptuous-openapi/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "voluptuous-openapi";
-  version = "0.1.0";
+  version = "0.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "home-assistant-libs";
     repo = "voluptuous-openapi";
-    tag = "v${version}";
-    hash = "sha256-cfunRVEFz8gMLEtZ6nhH7w/rW5ea0JaaV+W/4gm4mwo=";
+    tag = version;
+    hash = "sha256-uIW+WyfSNdGxD7tA6ERf3nTp1tFhWd+lxFUNQM0O3nU=";
   };
 
   build-system = [ setuptools ];

From 754491f7c4d8af653d39bacbaa8dc13a7b793514 Mon Sep 17 00:00:00 2001
From: as3ii <as3ii777@gmail.com>
Date: Sun, 28 Sep 2025 22:03:55 +0200
Subject: [PATCH 0250/6226] lovely-injector: 0.7.1 -> 0.8.0

The version 0.8.0 changes the build process, now requiring cmake to build
'dobby' (source fetched as a git submodule).
This new version breaks the old way to check the library version
---
 pkgs/by-name/lo/lovely-injector/package.nix | 24 +++++++++------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/lo/lovely-injector/package.nix b/pkgs/by-name/lo/lovely-injector/package.nix
index 795b6fd48eeb..65c6d515bea4 100644
--- a/pkgs/by-name/lo/lovely-injector/package.nix
+++ b/pkgs/by-name/lo/lovely-injector/package.nix
@@ -4,10 +4,10 @@
   lib,
   versionCheckHook,
   writeShellScript,
-  lua,
+  cmake,
 }:
 let
-  version = "0.7.1";
+  version = "0.8.0";
 in
 rustPlatform.buildRustPackage {
   pname = "lovely-injector";
@@ -16,26 +16,22 @@ rustPlatform.buildRustPackage {
     owner = "ethangreen-dev";
     repo = "lovely-injector";
     tag = "v${version}";
-    hash = "sha256-j03/DOnLFfFYTwGGh+7BalS779jyg+p0UqtcTTyHgv4=";
+    hash = "sha256-leTe7j4RTqc6BkiS7W5e0viK8FEwJpPLNoyf4GLOI3E=";
+    fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-hHq26kSKcqEldxUb6bn1laTpKGFplP9/2uogsal8T5A=";
+  cargoHash = "sha256-MnXB2ho48VPYtFSnGHGkuSv1eprOhmj4wMG2YmFSGec=";
+  cargoBuildFlags = [
+    "--package"
+    "lovely-unix"
+  ];
   # no tests
   doCheck = false;
   # lovely-injector depends on nightly rust features
   env.RUSTC_BOOTSTRAP = 1;
   nativeBuildInputs = [
-    lua
+    cmake
   ];
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
-  doInstallCheck = true;
-  versionCheckProgramArg = [ "${placeholder "out"}" ];
-  versionCheckProgram = writeShellScript "lovely-version-check" ''
-    export LD_PRELOAD="$1/lib/liblovely.so"
-    exec ${lua}/bin/lua < /dev/null
-  '';
 
   meta = {
     description = "Runtime lua injector for games built with LÖVE";

From f74544ad9fdef30eb3665acd88c66c6e5317f1f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Sep 2025 20:18:29 +0000
Subject: [PATCH 0251/6226] vassal: 3.7.17 -> 3.7.18

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

diff --git a/pkgs/by-name/va/vassal/package.nix b/pkgs/by-name/va/vassal/package.nix
index 89eda9592ad6..cc8effc37674 100644
--- a/pkgs/by-name/va/vassal/package.nix
+++ b/pkgs/by-name/va/vassal/package.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation rec {
   pname = "VASSAL";
-  version = "3.7.17";
+  version = "3.7.18";
 
   src = fetchzip {
     url = "https://github.com/vassalengine/vassal/releases/download/${version}/${pname}-${version}-linux.tar.bz2";
-    sha256 = "sha256-UQ2Y6A1zPVqMSyNTWpfrqdeSLF4AbuAVm0A4jeZdsW8=";
+    sha256 = "sha256-Mf0zBXaATtk42W41LzOhT9TgqAEoQsE+QxndyRiV2dU=";
   };
 
   buildInputs = [

From c99339ea0f39abb0368e9f3f602c8c557704e5d8 Mon Sep 17 00:00:00 2001
From: Justinas Stankevicius <justinas@justinas.org>
Date: Sun, 28 Sep 2025 18:36:03 +0300
Subject: [PATCH 0252/6226] nixos/steam: add missing ports for
 remotePlay.openFirewall

---
 nixos/modules/programs/steam.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/steam.nix b/nixos/modules/programs/steam.nix
index a8d1b7aefc70..5a791d0cea0f 100644
--- a/nixos/modules/programs/steam.nix
+++ b/nixos/modules/programs/steam.nix
@@ -256,7 +256,16 @@ in
       })
 
       (lib.mkIf cfg.remotePlay.openFirewall {
-        allowedTCPPorts = [ 27036 ];
+        # https://help.steampowered.com/en/faqs/view/3E3D-BE6B-787D-A5D2
+        # https://help.steampowered.com/en/faqs/view/2EA8-4D75-DA21-31EB
+        allowedTCPPorts = [
+          27036
+          27037
+        ];
+        allowedUDPPorts = [
+          10400
+          10401
+        ];
         allowedUDPPortRanges = [
           {
             from = 27031;

From b61e00d75e12307b9ed23232ad51abe64c505feb Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 28 Sep 2025 22:31:11 -0400
Subject: [PATCH 0253/6226] lizardfs: drop

Has been marked broken for a full release cycle.

Dropping per RFC 180.
---
 pkgs/by-name/li/lizardfs/package.nix | 70 ----------------------------
 pkgs/top-level/aliases.nix           |  2 +
 2 files changed, 2 insertions(+), 70 deletions(-)
 delete mode 100644 pkgs/by-name/li/lizardfs/package.nix

diff --git a/pkgs/by-name/li/lizardfs/package.nix b/pkgs/by-name/li/lizardfs/package.nix
deleted file mode 100644
index a7aead761da0..000000000000
--- a/pkgs/by-name/li/lizardfs/package.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  makeWrapper,
-  python3,
-  db,
-  fuse,
-  asciidoc,
-  libxml2,
-  libxslt,
-  docbook_xml_dtd_412,
-  docbook_xsl,
-  boost,
-  pkg-config,
-  judy,
-  pam,
-  spdlog,
-  systemdMinimal,
-  zlib, # optional
-}:
-
-stdenv.mkDerivation rec {
-  pname = "lizardfs";
-  version = "3.13.0-rc3";
-
-  src = fetchFromGitHub {
-    owner = "lizardfs";
-    repo = "lizardfs";
-    rev = version;
-    sha256 = "sha256-rgaFhJvmA1RVDL4+vQLMC0GrdlgUlvJeZ5/JJ67C20Q=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    makeWrapper
-  ];
-
-  buildInputs = [
-    db
-    fuse
-    asciidoc
-    libxml2
-    libxslt
-    docbook_xml_dtd_412
-    docbook_xsl
-    zlib
-    boost
-    judy
-    pam
-    spdlog
-    python3
-    systemdMinimal
-  ];
-
-  meta = with lib; {
-    homepage = "https://lizardfs.com";
-    description = "Highly reliable, scalable and efficient distributed file system";
-    platforms = platforms.linux;
-    license = licenses.gpl3;
-    maintainers = with maintainers; [
-      rushmorem
-      shamilton
-    ];
-    # 'fprintf' was not declared in this scope
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9be2aa75960a..14fb18c9ac9e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1488,6 +1488,8 @@ mapAliases {
 
   lixVersions = lixPackageSets.renamedDeprecatedLixVersions; # Added 2025-03-20, warning in ../tools/package-management/lix/default.nix
 
+  lizardfs = throw "lizardfs has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
+
   llvmPackages_git = (callPackages ../development/compilers/llvm { }).git; # Added 2024-08-02
 
   llvmPackages_9 = throw "llvmPackages_9 has been removed from nixpkgs"; # Added 2024-04-08

From ddb8d0c236180cbe0e1e03519361d0fb0478ae22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 02:42:53 +0000
Subject: [PATCH 0254/6226] wasabiwallet: 2.7.0 -> 2.7.1

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

diff --git a/pkgs/by-name/wa/wasabiwallet/package.nix b/pkgs/by-name/wa/wasabiwallet/package.nix
index ba186067ffb9..77795b1e3194 100644
--- a/pkgs/by-name/wa/wasabiwallet/package.nix
+++ b/pkgs/by-name/wa/wasabiwallet/package.nix
@@ -27,11 +27,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "wasabiwallet";
-  version = "2.7.0";
+  version = "2.7.1";
 
   src = fetchurl {
     url = "https://github.com/WalletWasabi/WalletWasabi/releases/download/v${version}/Wasabi-${version}-linux-x64.tar.gz";
-    sha256 = "sha256-w2xLahVxeCxwM6LVS5Mtr7IAXoZ7ju9aeXGjHMO2GPE=";
+    sha256 = "sha256-o2e2NDG2aMrEYc/7x5iFex9oRlrQXeKIINuW80ZwWcI=";
   };
 
   dontBuild = true;

From f85d20b66517b3aa01ee8e20e98cb0faf03508c7 Mon Sep 17 00:00:00 2001
From: Luna <git@lunnova.dev>
Date: Sun, 28 Sep 2025 21:07:43 -0700
Subject: [PATCH 0255/6226] llvmPackages.openmp: clean up rebuild avoidance

---
 pkgs/development/compilers/llvm/common/openmp/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix
index ad4b485085ff..1dcf4fe50a7b 100644
--- a/pkgs/development/compilers/llvm/common/openmp/default.nix
+++ b/pkgs/development/compilers/llvm/common/openmp/default.nix
@@ -46,9 +46,6 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
-  # TODO: Remove on `staging`.
-  patchFlags = null;
-
   patches =
     lib.optional (lib.versionOlder release_version "19") (getVersionFile "openmp/fix-find-tool.patch")
     ++ [

From 35b7ec7f2dca74fcc2d38429a6a1bb4ec38f71c0 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@determinate.systems>
Date: Sun, 28 Sep 2025 21:08:38 -0700
Subject: [PATCH 0256/6226] llvmPackages_21: 21.1.1 -> 21.1.2

---
 pkgs/development/compilers/llvm/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index a508347ba23b..25b0efb1b781 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -25,7 +25,7 @@ let
     "18.1.8".officialRelease.sha256 = "sha256-iiZKMRo/WxJaBXct9GdAcAT3cz9d9pnAcO1mmR6oPNE=";
     "19.1.7".officialRelease.sha256 = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
     "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";
-    "21.1.1".officialRelease.sha256 = "sha256-IB9Z3bIMwfgw2W2Vxo89CmtCM9DfOyV2Ei64nqgHrgc=";
+    "21.1.2".officialRelease.sha256 = "sha256-SgZdBL0ivfv6/4EqmPQ+I57qT2t6i/rqnm20+T1BsFY=";
     "22.0.0-git".gitRelease = {
       rev = "e396dab01f3da49df16c710d105a409973df5a03";
       rev-version = "22.0.0-unstable-2025-09-21";

From 3e1f6d207f76f223a69259ab903d564b65c8a759 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Wed, 12 Mar 2025 11:38:06 -0700
Subject: [PATCH 0257/6226] vesta-viewer: init at 3.5.8

---
 pkgs/by-name/ve/vesta-viewer/package.nix | 122 +++++++++++++++++++++++
 1 file changed, 122 insertions(+)
 create mode 100644 pkgs/by-name/ve/vesta-viewer/package.nix

diff --git a/pkgs/by-name/ve/vesta-viewer/package.nix b/pkgs/by-name/ve/vesta-viewer/package.nix
new file mode 100644
index 000000000000..6ee005925662
--- /dev/null
+++ b/pkgs/by-name/ve/vesta-viewer/package.nix
@@ -0,0 +1,122 @@
+{
+  lib,
+  fetchzip,
+  fetchurl,
+  stdenvNoCC,
+  makeDesktopItem,
+  copyDesktopItems,
+  autoPatchelfHook,
+  _7zz,
+
+  glib,
+  libGL,
+  libGLU,
+  libgcc,
+  gtk3,
+  gtk2,
+  xorg,
+  temurin-jre-bin,
+}:
+
+let
+  pname = "vesta-viewer";
+  version = "3.5.8";
+  meta = {
+    description = "3D visualization program for structural models, volumetric data such as electron/nuclear densities, and crystal morphologies";
+    homepage = "https://jp-minerals.org/vesta/";
+    license = lib.licenses.unfree;
+    downloadPage = "https://jp-minerals.org/vesta/en/download.html";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    platforms = [
+      "x86_64-linux"
+      "x86_64-darwin"
+    ];
+    maintainers = with lib.maintainers; [ ulysseszhan ];
+    mainProgram = "VESTA";
+  };
+
+  linuxArgs = {
+    nativeBuildInputs = [
+      copyDesktopItems
+      autoPatchelfHook
+    ];
+    buildInputs = [
+      glib
+      libGL
+      libGLU
+      libgcc
+      gtk3
+      gtk2
+      temurin-jre-bin
+    ]
+    ++ (with xorg; [
+      libXxf86vm
+      libXtst
+    ]);
+
+    src = fetchzip {
+      url = "https://jp-minerals.org/vesta/archives/${version}/VESTA-gtk3.tar.bz2";
+      hash = "sha256-Dm4exMUgNZ6Sh8dVhsvLZGS38UXxe9t+9s3ttBQajGg=";
+    };
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/lib/VESTA
+      cp -r * $out/lib/VESTA
+
+      mkdir -p $out/bin
+      ln -s $out/lib/VESTA/VESTA{,-core,-gui} -t $out/bin
+
+      mkdir -p $out/share/icons/hicolor/{128x128,256x256}/apps
+      ln -s $out/lib/VESTA/img/logo.png $out/share/icons/hicolor/128x128/apps/VESTA.png
+      ln -s $out/lib/VESTA/img/logo@2x.png $out/share/icons/hicolor/256x256/apps/VESTA.png
+
+      runHook postInstall
+    '';
+
+    desktopItems = [
+      (makeDesktopItem {
+        name = "vesta";
+        comment = meta.description;
+        desktopName = "VESTA";
+        genericName = "VESTA";
+        exec = "VESTA %u";
+        icon = "VESTA";
+        categories = [ "Science" ];
+        mimeTypes = [ "application/x-vesta" ];
+      })
+    ];
+  };
+
+  darwinArgs = {
+    nativeBuildInputs = [
+      _7zz # instead of undmg because of APFS
+    ];
+    src = fetchurl {
+      url = "https://jp-minerals.org/vesta/archives/${version}/VESTA.dmg";
+      hash = "sha256-L8vj3MNwHo3m5wP1lByNjHZ4VTVOWSm0Aiw1ItosbSw=";
+    };
+    sourceRoot = "VESTA/VESTA";
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/Applications
+      cp -r *.app $out/Applications
+
+      runHook postInstall
+    '';
+  };
+in
+stdenvNoCC.mkDerivation (
+  {
+    inherit pname version meta;
+    # I could've written an update script here,
+    # but I didn't bother because the stable version hasn't been updated for years.
+  }
+  // {
+    "x86_64-linux" = linuxArgs;
+    "x86_64-darwin" = darwinArgs;
+  }
+  .${stdenvNoCC.hostPlatform.system} or { }
+)

From 68bd960456c1a8451e4993d3e0c87695b418351f Mon Sep 17 00:00:00 2001
From: Dimitar Nestorov <8790386+dimitarnestorov@users.noreply.github.com>
Date: Mon, 29 Sep 2025 11:05:58 +0300
Subject: [PATCH 0258/6226] darwin.xcode: add 26.0.1

---
 pkgs/os-specific/darwin/xcode/default.nix | 2 ++
 pkgs/top-level/darwin-packages.nix        | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/os-specific/darwin/xcode/default.nix b/pkgs/os-specific/darwin/xcode/default.nix
index 06b2ebd39234..1145498aa904 100644
--- a/pkgs/os-specific/darwin/xcode/default.nix
+++ b/pkgs/os-specific/darwin/xcode/default.nix
@@ -109,6 +109,8 @@ lib.makeExtensible (self: {
   xcode_16_4 = requireXcode "16.4" "sha256-voCEZlKrp9NYGmXAsf1FHxO69EgWZHDIWtQZ2qEzElA=";
   xcode_26 = requireXcode "26_Universal" "sha256-p4INqf85CSIzd7xHRCS9tCigQkOQPKnS/+D5nue3PsY=";
   xcode_26_Apple_silicon = requireXcode "26_Apple_silicon" "sha256-dlfZ2sM6a9pUPdukoMoqvQAj7EEUyj0a/VkXKwkkFT8=";
+  xcode_26_0_1 = requireXcode "26.0.1" "sha256-PsEIjrzxgXFqCWeHs/bsvrlxy8aN899jMhesczMbPfE=";
+  xcode_26_0_1_Apple_silicon = requireXcode "26.0.1_Apple_silicon" "sha256-UBDey19uBljjRw84bY4rzxetFEkHiXLEj39Q578jYL8=";
   xcode =
     self."xcode_${
       lib.replaceStrings [ "." ] [ "_" ] (
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 0bf52553d029..732202905a2b 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -174,6 +174,8 @@ makeScopeWithSplicing' {
           xcode_16_4
           xcode_26
           xcode_26_Apple_silicon
+          xcode_26_0_1
+          xcode_26_0_1_Apple_silicon
           xcode
           requireXcode
           ;

From 5b47e46becbe01740e8e219e7f4489f6168a1c0e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 21 Aug 2025 16:24:37 +0000
Subject: [PATCH 0259/6226] geos: 3.13.1 -> 3.14.0

---
 pkgs/development/libraries/geos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/geos/default.nix b/pkgs/development/libraries/geos/default.nix
index a11d8097b8e8..422269bea247 100644
--- a/pkgs/development/libraries/geos/default.nix
+++ b/pkgs/development/libraries/geos/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "geos";
-  version = "3.13.1";
+  version = "3.14.0";
 
   src = fetchFromGitHub {
     owner = "libgeos";
     repo = "geos";
     tag = finalAttrs.version;
-    hash = "sha256-zPVP01AMIBKMnKi6Sq++CIaVZb5JA1v8/QAdGzKdL8Y=";
+    hash = "sha256-tPuAYNi2Gfc/2hj8SFqnvuDztXkSAEoGPcvXVULrLKg=";
   };
 
   nativeBuildInputs = [ cmake ];

From 3a69acacdad1f2a648a36750923a9414e6c68e4e Mon Sep 17 00:00:00 2001
From: Ivan Mincik <ivan.mincik@gmail.com>
Date: Sat, 23 Aug 2025 11:50:23 +0200
Subject: [PATCH 0260/6226] python3Packages.shapely: fix tests for geos 3.14

---
 .../python-modules/shapely/default.nix          | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix
index ccad45bbac48..09b8911c172f 100644
--- a/pkgs/development/python-modules/shapely/default.nix
+++ b/pkgs/development/python-modules/shapely/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   pytestCheckHook,
   pythonOlder,
 
@@ -27,6 +28,22 @@ buildPythonPackage rec {
     hash = "sha256-qIITlPym92wfq0byqjRxofpmYYg7vohbi1qPVEu6hRg=";
   };
 
+  patches = [
+    # Fix tests for GEOS 3.14
+    (fetchpatch {
+      url = "https://github.com/shapely/shapely/commit/a561132c4e13c1fde597f56a8a7133c3c09b9928.patch";
+      hash = "sha256-a9gDfw2Dw+fd82T9f0BufYd/+gxE+ALvWyLm4vHygzU=";
+    })
+    (fetchpatch {
+      url = "https://github.com/shapely/shapely/commit/56e16e6eb27c54c6c24b9a251c12414e289fb7d0.patch";
+      hash = "sha256-JyjPVcJswEozF4C73QotKsPou55H41Ct9oVgkxhDhbk=";
+    })
+    (fetchpatch {
+      url = "https://github.com/shapely/shapely/commit/19f807961da0a14ac707e4540c91b8d60d52dd08.patch";
+      hash = "sha256-3NHNiIOf9tbhFS/RAsRw1Yp/Bxy957WpsT+R5Vwp8uU=";
+    })
+  ];
+
   nativeBuildInputs = [
     cython
     geos # for geos-config

From 9386ff26ad67bbe477a4d4b44a00455d0558f4fa Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Mon, 22 Sep 2025 11:51:18 +0200
Subject: [PATCH 0261/6226] pythonPackages.shapely: remove already applied
 patch

---
 pkgs/development/python-modules/shapely/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/python-modules/shapely/default.nix b/pkgs/development/python-modules/shapely/default.nix
index 09b8911c172f..ecfe86b2e352 100644
--- a/pkgs/development/python-modules/shapely/default.nix
+++ b/pkgs/development/python-modules/shapely/default.nix
@@ -38,10 +38,6 @@ buildPythonPackage rec {
       url = "https://github.com/shapely/shapely/commit/56e16e6eb27c54c6c24b9a251c12414e289fb7d0.patch";
       hash = "sha256-JyjPVcJswEozF4C73QotKsPou55H41Ct9oVgkxhDhbk=";
     })
-    (fetchpatch {
-      url = "https://github.com/shapely/shapely/commit/19f807961da0a14ac707e4540c91b8d60d52dd08.patch";
-      hash = "sha256-3NHNiIOf9tbhFS/RAsRw1Yp/Bxy957WpsT+R5Vwp8uU=";
-    })
   ];
 
   nativeBuildInputs = [

From 723c21585be774432e8accaf3e23fb269fa8d7b4 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@oslandia.com>
Date: Fri, 26 Sep 2025 18:22:54 +0000
Subject: [PATCH 0262/6226] python3Packages.geopandas: fix tests for geos 3.14

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

diff --git a/pkgs/development/python-modules/geopandas/default.nix b/pkgs/development/python-modules/geopandas/default.nix
index 3c9c36b0311b..a7f5a5012ac7 100644
--- a/pkgs/development/python-modules/geopandas/default.nix
+++ b/pkgs/development/python-modules/geopandas/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   pytestCheckHook,
   setuptools,
 
@@ -38,6 +39,15 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
+  patches = [
+    # fix tests for geos 3.14
+    # see https://github.com/geopandas/geopandas/pull/3645
+    (fetchpatch {
+      url = "https://patch-diff.githubusercontent.com/raw/geopandas/geopandas/pull/3645.patch";
+      hash = "sha256-TLJixFRR+g739PLgwhTGuwYTVJ4SRr2BMGD14CLgmcY=";
+    })
+  ];
+
   dependencies = [
     packaging
     pandas

From 722ba864ad6f9841eb86a277aee3f50a00a3dcac Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 29 Sep 2025 11:31:25 +0200
Subject: [PATCH 0263/6226] ffmpeg: Disable nvcodec on big-endian POWER

---
 pkgs/development/libraries/ffmpeg/generic.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index 271057d7cfa0..bc51ce177bc5 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -79,6 +79,7 @@
       && !isAarch32
       && !hostPlatform.isLoongArch64
       && !hostPlatform.isRiscV
+      && !(hostPlatform.isPower && hostPlatform.isBigEndian)
       && hostPlatform == buildPlatform
     ), # dynamically linked Nvidia code
   withFlite ? withFullDeps, # Voice Synthesis

From d38939069a387cbea93e0d5f41d492d66f059ee0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 29 Sep 2025 03:43:02 -0700
Subject: [PATCH 0264/6226] python3Packages.syrupy: 4.9.1 -> 5.0.0

Diff: https://github.com/syrupy-project/syrupy/compare/v4.9.1...v5.0.0

Changelog: https://github.com/syrupy-project/syrupy/blob/v5.0.0/CHANGELOG.md
---
 pkgs/development/python-modules/syrupy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/syrupy/default.nix b/pkgs/development/python-modules/syrupy/default.nix
index 36f4c0b81a71..a213f3a3f547 100644
--- a/pkgs/development/python-modules/syrupy/default.nix
+++ b/pkgs/development/python-modules/syrupy/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "syrupy";
-  version = "4.9.1";
+  version = "5.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "syrupy-project";
     repo = "syrupy";
     tag = "v${version}";
-    hash = "sha256-AK4cB7MiL52oRUV6ArNj94srMsEpk/YQdjJ5tnjrAYM=";
+    hash = "sha256-TRwU9+2RvZB2gbVm82DzLge8QoDflxjavcRdYZUgVfs=";
   };
 
   build-system = [ poetry-core ];
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/syrupy-project/syrupy/blob/${src.tag}/CHANGELOG.md";
     description = "Pytest Snapshot Test Utility";
     homepage = "https://github.com/syrupy-project/syrupy";
-    license = lib.licenses.asl20;
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ dotlambda ];
   };
 }

From adfbdea27e401e62fe60e313bf64f7215be2ef1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 11:23:54 +0000
Subject: [PATCH 0265/6226] duo-unix: 2.2.0 -> 2.2.1

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

diff --git a/pkgs/by-name/du/duo-unix/package.nix b/pkgs/by-name/du/duo-unix/package.nix
index 4f3330d6d576..9cce892d6dd4 100644
--- a/pkgs/by-name/du/duo-unix/package.nix
+++ b/pkgs/by-name/du/duo-unix/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "duo-unix";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchurl {
     url = "https://dl.duosecurity.com/duo_unix-${version}.tar.gz";
-    sha256 = "sha256-o5myAUg2tf+Yu7tB93EU/gZkGAHYtrEh6zyCiVJ2pmY=";
+    sha256 = "sha256-43a+BYWzw9ETpYjxlSXjV83uJG1prrjoYMv0/dv5AMo=";
   };
 
   buildInputs = [

From 245d2814468793cd2f4e557abc75edf0206b020e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 12:37:26 +0000
Subject: [PATCH 0266/6226] highlight: 4.16 -> 4.17

---
 pkgs/tools/text/highlight/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/text/highlight/default.nix b/pkgs/tools/text/highlight/default.nix
index e63584274cff..4cd623c77118 100644
--- a/pkgs/tools/text/highlight/default.nix
+++ b/pkgs/tools/text/highlight/default.nix
@@ -15,13 +15,13 @@
 let
   self = stdenv.mkDerivation rec {
     pname = "highlight";
-    version = "4.16";
+    version = "4.17";
 
     src = fetchFromGitLab {
       owner = "saalen";
       repo = "highlight";
       rev = "v${version}";
-      hash = "sha256-SAOlW2IaYY2GzQ+1FClqm62pcxdtf1cow2R4MRS/2Vg=";
+      hash = "sha256-XSfiQGMd7GtewyZ72VK/0D9Z9sYzVBWeO1CQXVk63Zc=";
     };
 
     enableParallelBuilding = true;

From 7a60d6b6ac4f5f141ba6adb802d845d7528a6895 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 12:38:12 +0000
Subject: [PATCH 0267/6226] intel-gpu-tools: 2.1 -> 2.2

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

diff --git a/pkgs/by-name/in/intel-gpu-tools/package.nix b/pkgs/by-name/in/intel-gpu-tools/package.nix
index 53055dc12416..4e7f83da01f1 100644
--- a/pkgs/by-name/in/intel-gpu-tools/package.nix
+++ b/pkgs/by-name/in/intel-gpu-tools/package.nix
@@ -43,14 +43,14 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-gpu-tools";
-  version = "2.1";
+  version = "2.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "drm";
     repo = "igt-gpu-tools";
     rev = "refs/tags/v${version}";
-    hash = "sha256-O//tL7AuYmrpTlZ61YzpSKOxbtM6u6zlcANzXWTTbhw=";
+    hash = "sha256-Lt/mqx13nHyD5QiDl8oWGiYIiK006uQvbbzHH44LB/0=";
   };
 
   nativeBuildInputs = [

From abc7e7f7e177c9e0ca0ca7079b5871129526e443 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Mon, 29 Sep 2025 16:42:14 +0200
Subject: [PATCH 0268/6226] pkgsMusl.mailutils: fix build (#436206)

---
 .../don-t-use-descrypt-password-in-the-test-suite.patch         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ma/mailutils/don-t-use-descrypt-password-in-the-test-suite.patch b/pkgs/by-name/ma/mailutils/don-t-use-descrypt-password-in-the-test-suite.patch
index ac85496018ad..7f224c73954b 100644
--- a/pkgs/by-name/ma/mailutils/don-t-use-descrypt-password-in-the-test-suite.patch
+++ b/pkgs/by-name/ma/mailutils/don-t-use-descrypt-password-in-the-test-suite.patch
@@ -31,7 +31,7 @@ index 930861d8a..3b67844d2 100644
  }
  
  set POP3D_ETC_DIR "$MU_DATA_DIR/etc"
-+set MU_PASSWD_HASH [exec mkpasswd --method=yescrypt guessme]
++set MU_PASSWD_HASH [exec mkpasswd -m yescrypt guessme]
  mu_makespool "$MU_RC_DIR" "$POP3D_ETC_DIR"
  mu_create_config pop3d
  

From a7dee2baa9993d6c6c4493cb3ad0cd28fc497ac3 Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Sun, 19 Jan 2025 15:49:36 +0100
Subject: [PATCH 0269/6226] linux_5_4.configfile: fix build for aarch64

Fixes: 37789d9eaa56 ("linuxManualConfig: forbid config errors on aarch64")
Closes: https://github.com/NixOS/nixpkgs/issues/446528
---
 .../linux/kernel/common-config.nix            | 59 ++++++++++++++++---
 1 file changed, 50 insertions(+), 9 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 069f4b6c94a3..2c8bbc8165e0 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -319,6 +319,7 @@ let
       IPV6_SEG6_LWTUNNEL = yes;
       IPV6_SEG6_HMAC = yes;
       IPV6_SEG6_BPF = yes;
+      NET_CLS_ACT = yes;
       NET_CLS_BPF = module;
       NET_ACT_BPF = module;
       NET_SCHED = yes;
@@ -486,7 +487,15 @@ let
 
     video =
       let
-        whenHasDevicePrivate = lib.mkIf (!stdenv.hostPlatform.isx86_32);
+        whenHasDevicePrivate = lib.mkIf (
+          with stdenv.hostPlatform;
+          isLoongArch64
+          || isPower64
+          || isS390x
+          || isx86_64
+          || (lib.versionAtLeast version "5.7" && isAarch64)
+          || (lib.versionAtLeast version "6.11" && isRiscV64)
+        );
       in
       {
         # compile in DRM so simpledrm can load before initrd if necessary
@@ -520,9 +529,9 @@ let
         DRM_DP_AUX_CHARDEV = whenOlder "6.10" yes;
         DRM_DISPLAY_DP_AUX_CHARDEV = whenAtLeast "6.10" yes;
         # amdgpu display core (DC) support
-        DRM_AMD_DC_DCN1_0 = whenOlder "5.6" yes;
-        DRM_AMD_DC_DCN2_0 = whenOlder "5.6" yes;
-        DRM_AMD_DC_DCN2_1 = whenOlder "5.6" yes;
+        DRM_AMD_DC_DCN1_0 = lib.mkIf stdenv.hostPlatform.isx86 (whenOlder "5.6" yes);
+        DRM_AMD_DC_DCN2_0 = lib.mkIf stdenv.hostPlatform.isx86 (whenOlder "5.6" yes);
+        DRM_AMD_DC_DCN2_1 = lib.mkIf stdenv.hostPlatform.isx86 (whenOlder "5.6" yes);
         DRM_AMD_DC_DCN3_0 = lib.mkIf (with stdenv.hostPlatform; isx86) (whenBetween "5.9" "5.11" yes);
         DRM_AMD_DC_DCN = lib.mkIf (with stdenv.hostPlatform; isx86 || isPower64) (
           whenBetween "5.11" "6.4" yes
@@ -800,7 +809,10 @@ let
 
       SECURITY_DMESG_RESTRICT = yes;
 
-      RANDOM_TRUST_CPU = whenOlder "6.2" yes; # allow RDRAND to seed the RNG
+      RANDOM_TRUST_CPU = lib.mkIf (
+        with stdenv.hostPlatform;
+        isPower64 || isS390 || isx86 || (lib.versionAtLeast version "5.6" && isAarch64)
+      ) (whenOlder "6.2" yes); # allow RDRAND to seed the RNG
       RANDOM_TRUST_BOOTLOADER = whenOlder "6.2" yes; # allow the bootloader to seed the RNG
 
       MODULE_SIG = no; # r13y, generates a random key during build and bakes it in
@@ -1073,7 +1085,11 @@ let
       {
         # stdenv.hostPlatform.linux-kernel.target assumes uncompressed on RISC-V.
         KERNEL_UNCOMPRESSED = lib.mkIf stdenv.hostPlatform.isRiscV yes;
-        KERNEL_XZ = lib.mkIf (!stdenv.hostPlatform.isRiscV && !useZstd) yes;
+
+        KERNEL_XZ = lib.mkIf (
+          with stdenv.hostPlatform; (isAarch32 || isMips || isPower || isS390 || isx86) && !useZstd
+        ) yes;
+
         KERNEL_ZSTD = lib.mkIf (
           with stdenv.hostPlatform;
           (isMips || isS390 || isx86 || (lib.versionAtLeast version "6.1" && isAarch64 || isLoongArch64))
@@ -1241,7 +1257,15 @@ let
         NVME_TARGET_AUTH = whenAtLeast "6.0" yes;
         NVME_TARGET_TCP_TLS = whenAtLeast "6.7" yes;
 
-        PCI_P2PDMA = lib.mkIf (stdenv.hostPlatform.is64bit) yes;
+        PCI_P2PDMA = lib.mkIf (
+          with stdenv.hostPlatform;
+          isLoongArch64
+          || isPower64
+          || isS390x
+          || isx86_64
+          || (lib.versionAtLeast version "5.7" && isAarch64)
+          || (lib.versionAtLeast version "6.11" && isRiscV64)
+        ) yes;
 
         PSI = yes;
 
@@ -1308,7 +1332,15 @@ let
 
         # Enable AMD's ROCm GPU compute stack
         HSA_AMD = lib.mkIf stdenv.hostPlatform.is64bit (yes);
-        ZONE_DEVICE = lib.mkIf stdenv.hostPlatform.is64bit (yes);
+        ZONE_DEVICE = lib.mkIf (
+          with stdenv.hostPlatform;
+          isLoongArch64
+          || isPower64
+          || isS390x
+          || isx86_64
+          || (lib.versionAtLeast version "5.7" && isAarch64)
+          || (lib.versionAtLeast version "6.11" && isRiscV64)
+        ) yes;
         HMM_MIRROR = yes;
         DRM_AMDGPU_USERPTR = yes;
 
@@ -1385,7 +1417,15 @@ let
             MEMORY_HOTPLUG = yes;
             MEMORY_HOTPLUG_DEFAULT_ONLINE = whenOlder "6.14" yes;
             MHP_DEFAULT_ONLINE_TYPE_ONLINE_AUTO = whenAtLeast "6.14" yes;
-            MEMORY_HOTREMOVE = yes;
+            MEMORY_HOTREMOVE = lib.mkIf (
+              with stdenv.hostPlatform;
+              isLoongArch64
+              || isPower
+              || isS390
+              || isx86
+              || (lib.versionAtLeast version "5.7" && isAarch64)
+              || (lib.versionAtLeast version "6.11" && isRiscV)
+            ) yes;
             HOTPLUG_CPU = yes;
             MIGRATION = yes;
             SPARSEMEM = yes;
@@ -1404,6 +1444,7 @@ let
             CROS_EC_I2C = module;
             CROS_EC_SPI = module;
             CROS_KBD_LED_BACKLIGHT = module;
+            MFD_CROS_EC = whenOlder "5.10" module;
             TCG_TIS_SPI_CR50 = whenAtLeast "5.5" yes;
           }
       //

From b8d1d3da9c992639dcb45a1e3084aeef426090c6 Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Fri, 19 Sep 2025 16:32:50 +0200
Subject: [PATCH 0270/6226] clj-kondo: 2025.07.28 -> 2025.09.22

release: https://github.com/clj-kondo/clj-kondo/releases/tag/v2025.09.22
---
 pkgs/by-name/cl/clj-kondo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/clj-kondo/package.nix b/pkgs/by-name/cl/clj-kondo/package.nix
index ba67056efcf5..8d477c1bf8de 100644
--- a/pkgs/by-name/cl/clj-kondo/package.nix
+++ b/pkgs/by-name/cl/clj-kondo/package.nix
@@ -6,11 +6,11 @@
 
 buildGraalvmNativeImage (finalAttrs: {
   pname = "clj-kondo";
-  version = "2025.07.28";
+  version = "2025.09.22";
 
   src = fetchurl {
     url = "https://github.com/clj-kondo/clj-kondo/releases/download/v${finalAttrs.version}/clj-kondo-${finalAttrs.version}-standalone.jar";
-    sha256 = "sha256-ioKRFkm+zBAAM7oyR4F6rTHEhViuRNuMXcr1xwnjcms=";
+    sha256 = "sha256-TD7GlvYfGbFaM3qIEngIRbBVKEQ2g2sdAjE/oO1ZlHw=";
   };
 
   extraNativeImageBuildArgs = [

From 4ab7fa1792ab4e021044a6481c23b1f65ee4c1d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 16:07:47 +0000
Subject: [PATCH 0271/6226] python3Packages.snowflake-core: 1.7.0 -> 1.8.0

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

diff --git a/pkgs/development/python-modules/snowflake-core/default.nix b/pkgs/development/python-modules/snowflake-core/default.nix
index 98a78511d16f..18698d5b0ca7 100644
--- a/pkgs/development/python-modules/snowflake-core/default.nix
+++ b/pkgs/development/python-modules/snowflake-core/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "snowflake-core";
-  version = "1.7.0";
+  version = "1.8.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "snowflake_core";
     inherit version;
-    hash = "sha256-hlWpTCEa4E0dgD28h2JJ3m0/gCHMVzjWia6oQtG2an8=";
+    hash = "sha256-ltbyxhpEvHLvoinDqM7y9KXU4sdWsA4BggyBR1M6i+w=";
   };
 
   build-system = [ hatchling ];

From 99ba88e825f3ac5196a81bb4ca705155769a36ff Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 29 Sep 2025 18:18:02 +0200
Subject: [PATCH 0272/6226] x265: Fix SIGILL on older POWER versions

---
 pkgs/by-name/x2/x265/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/x2/x265/package.nix b/pkgs/by-name/x2/x265/package.nix
index 54c93e9d7b69..4ac46a5b4bd7 100644
--- a/pkgs/by-name/x2/x265/package.nix
+++ b/pkgs/by-name/x2/x265/package.nix
@@ -96,6 +96,13 @@ stdenv.mkDerivation rec {
     (mkFlag vtuneSupport "ENABLE_VTUNE")
     (mkFlag werrorSupport "WARNINGS_AS_ERRORS")
   ]
+  ++ lib.optionals stdenv.hostPlatform.isPower [
+    # baseline for everything but ppc64le doesn't have AltiVec
+    # ppc64le: https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le
+    (lib.cmakeBool "ENABLE_ALTIVEC" false)
+    # baseline for everything but ppc64le is pre-POWER8
+    (lib.cmakeBool "CPU_POWER8" (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian))
+  ]
   # Clang does not support the endfunc directive so use GCC.
   ++ lib.optional (
     stdenv.cc.isClang && !stdenv.targetPlatform.isDarwin && !stdenv.targetPlatform.isFreeBSD
@@ -113,9 +120,6 @@ stdenv.mkDerivation rec {
     "-DENABLE_SHARED=OFF"
     "-DEXPORT_C_API=OFF"
   ]
-  ++ lib.optionals stdenv.hostPlatform.isPower [
-    "-DENABLE_ALTIVEC=OFF" # https://bitbucket.org/multicoreware/x265_git/issues/320/fail-to-build-on-power8-le
-  ]
   ++ lib.optionals isCross [
     (mkFlag stdenv.hostPlatform.isAarch32 "CROSS_COMPILE_ARM")
     (mkFlag stdenv.hostPlatform.isAarch64 "CROSS_COMPILE_ARM64")

From 1ee16b1900afa9b8071adcfd8a38702af9f026c2 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Mon, 29 Sep 2025 17:31:27 +0200
Subject: [PATCH 0273/6226] kbdVlock: split out of kbd

This removes a dependency cycle from systemd, removing a rebuild. At the
same time it is just as convenience for users. They need to include the
`kbdVlock` package now instead of the `vlock` output.
---
 doc/release-notes/rl-2511.section.md       |  2 ++
 pkgs/by-name/kb/kbd/package.nix            | 16 +++++-----------
 pkgs/os-specific/linux/systemd/default.nix |  9 +++------
 pkgs/top-level/all-packages.nix            |  2 ++
 4 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index b7ca5caa6555..1d6795a19bad 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -36,6 +36,8 @@
 
 - LLVM 12, 13, 14, 15, 16, and 17 have been removed, as they have reached end‐of‐life upstream and are no longer supported.
 
+- The `vlock` output from kbd has been removed. Instead a new package `kbdVlock` has been introduced. Use this package now instead of the output.
+
 - GHCJS 8.10, exposed via `haskell.compiler.ghcjs` and `haskell.compiler.ghcjs810`, has been removed. Downstream users should migrate their projects to the new JavaScript backend of GHC proper which can be used via `pkgsCross.ghcjs` from Nixpkgs. Haskell packaging code, like `haskellPackages.mkDerivation`, `ghcWithPackages` and `hoogleWithPackages`, also no longer supports GHCJS.
 
 - GHC 8.6, 8.10, 9.0, 9.2, and their package sets have been removed.
diff --git a/pkgs/by-name/kb/kbd/package.nix b/pkgs/by-name/kb/kbd/package.nix
index 5e89ce36d19b..4b0d29ed563e 100644
--- a/pkgs/by-name/kb/kbd/package.nix
+++ b/pkgs/by-name/kb/kbd/package.nix
@@ -20,11 +20,12 @@
   zstd,
   gitUpdater,
   pkgsCross,
-  withVlock ? true,
+  withVlock ? false,
+  kbdVlock,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "kbd";
+  pname = "kbd" + lib.optionalString withVlock "-vlock";
   version = "2.9.0";
 
   __structuredAttrs = true;
@@ -35,16 +36,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-uUECxFdm/UhoHKLHLFe6/ygCQ+4mrQOZExKl+ReaTNw=";
   };
 
-  # vlock is moved into its own output, since it depends on pam. This
-  # reduces closure size for most use cases.
   outputs = [
     "out"
     "dev"
     "scripts"
     "man"
-  ]
-  ++ lib.optionals withVlock [
-    "vlock"
   ];
 
   patches = [
@@ -112,10 +108,6 @@ stdenv.mkDerivation (finalAttrs: {
 
     moveToOutput bin/unicode_start $scripts
     moveToOutput bin/unicode_stop $scripts
-  ''
-  + lib.optionalString withVlock ''
-    moveToOutput bin/vlock $vlock
-    moveToOutput etc/pam.d/vlock $vlock
   '';
 
   outputChecks.out.disallowedRequisites = [
@@ -137,6 +129,8 @@ stdenv.mkDerivation (finalAttrs: {
         pkgsCross.${systemString}.kbd;
       inherit (nixosTests) keymap kbd-setfont-decompress kbd-update-search-paths-patch;
     };
+    # For backwards compatibility. Remove after 26.05.
+    vlock = kbdVlock;
   };
 
   meta = {
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 090da26ed77c..37b871f3c30b 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -200,8 +200,6 @@ let
   #  $ curl -s https://api.github.com/repos/systemd/systemd/releases/latest | \
   #     jq '.created_at|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime'
   releaseTimestamp = "1734643670";
-
-  kbd' = if withPam then kbd else kbd.override { withVlock = false; };
 in
 stdenv.mkDerivation (finalAttrs: {
   inherit pname;
@@ -475,8 +473,8 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "pkgconfigdatadir" "${placeholder "dev"}/share/pkgconfig")
 
     # Keyboard
-    (lib.mesonOption "loadkeys-path" "${kbd'}/bin/loadkeys")
-    (lib.mesonOption "setfont-path" "${kbd'}/bin/setfont")
+    (lib.mesonOption "loadkeys-path" "${kbd}/bin/loadkeys")
+    (lib.mesonOption "setfont-path" "${kbd}/bin/setfont")
 
     # SBAT
     (lib.mesonOption "sbat-distro" "nixos")
@@ -928,10 +926,9 @@ stdenv.mkDerivation (finalAttrs: {
       withUtmp
       util-linux
       kmod
+      kbd
       ;
 
-    kbd = kbd';
-
     # Many TPM2-related units are only installed if this trio of features are
     # enabled. See https://github.com/systemd/systemd/blob/876ee10e0eb4bbb0920bdab7817a9f06cc34910f/units/meson.build#L521
     withTpm2Units = withTpm2Tss && withBootloader && withOpenSSL;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 349ec204bb2e..623eebae49dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3265,6 +3265,8 @@ with pkgs;
 
   kbfs = callPackage ../tools/security/keybase/kbfs.nix { };
 
+  kbdVlock = callPackage ../../pkgs/by-name/kb/kbd/package.nix { withVlock = true; };
+
   keybase-gui = callPackage ../tools/security/keybase/gui.nix { };
 
   keystore-explorer = callPackage ../applications/misc/keystore-explorer {

From 4d3878153615a2276f924f455e747b1d4edc8217 Mon Sep 17 00:00:00 2001
From: Frank Moda <fmoda3@mac.com>
Date: Mon, 29 Sep 2025 12:55:32 -0400
Subject: [PATCH 0274/6226] homebridge-config-ui-x: 5.6.0 -> 5.8.0

---
 pkgs/by-name/ho/homebridge-config-ui-x/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix
index a00f0829a058..9861fce1a757 100644
--- a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix
+++ b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix
@@ -11,23 +11,23 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "homebridge-config-ui-x";
-  version = "5.6.0";
+  version = "5.8.0";
 
   src = fetchFromGitHub {
     owner = "homebridge";
     repo = "homebridge-config-ui-x";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RsUrJ6WR78yN+thKbrN53S32XNZ8N4pSDAzzhGso01A=";
+    hash = "sha256-pbE3s1MzZM8r29oJsZjHTCahRNuWExsvGfERue4RQv4=";
   };
 
   # Deps hash for the root package
-  npmDepsHash = "sha256-YFWbzhjUVMa9Do5TEVQPvXwwY9ap4j8kdbGVM2wCt4c=";
+  npmDepsHash = "sha256-L7sC/4iHSGE9H562pbtESkFpty6eGdmkU60dpUWPQaQ=";
 
   # Deps src and hash for ui subdirectory
   npmDeps_ui = fetchNpmDeps {
     name = "npm-deps-ui";
     src = "${finalAttrs.src}/ui";
-    hash = "sha256-Y4rB1GzsFX9Uw+UeiYJPcD5+u2kpmZw0tWhsmzaWo04=";
+    hash = "sha256-Yhk7cplZlmcChKPmwoI192MJujuq+v8+JXT08rwfL3Q=";
   };
 
   # Need to also run npm ci in the ui subdirectory

From 4904f13346f104051032c8737833fee59ebcf67c Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 29 Sep 2025 21:15:02 +0100
Subject: [PATCH 0275/6226] iproute2: 6.16.0 -> 6.17.0

Changes: https://lore.kernel.org/netdev/20250929095042.48200315@hermes.local/T/#u
---
 pkgs/by-name/ip/iproute2/package.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix
index ab399a44c343..79d4f3371836 100644
--- a/pkgs/by-name/ip/iproute2/package.nix
+++ b/pkgs/by-name/ip/iproute2/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch,
   buildPackages,
   bison,
   flex,
@@ -19,24 +18,14 @@
 
 stdenv.mkDerivation rec {
   pname = "iproute2";
-  version = "6.16.0";
+  version = "6.17.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz";
-    hash = "sha256-WQDMwV+aw797fq6B3rWTcSPfNemTR6fxGiKBhILwqNA=";
+    hash = "sha256-l4HllBCrfeqOn3m7EP8UiOY9EPy7cFA7lEJronqOLew=";
   };
 
   patches = [
-    (fetchpatch {
-      name = "color-assume-background-is-dark-if-unknown.patch";
-      url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/patch/?id=cc0f1109d2864686180ba2ce6fba5fcb3bf437bf";
-      hash = "sha256-BGD70cXKnDvk7IEU5RQA+pn1dErWjgr74GeSkYtFXoI=";
-    })
-    (fetchpatch {
-      name = "color-do-not-use-dark-blue-in-dark-background-palette.patch";
-      url = "https://git.kernel.org/pub/scm/network/iproute2/iproute2-next.git/patch/?id=46a4659313c2610427a088d8f03b731819f2b87a";
-      hash = "sha256-TXrmGZNsYWdYLsLoBXZEr3cd8HT4EhRg+jACRrC0gKE=";
-    })
     (fetchurl {
       name = "musl-endian.patch";
       url = "https://lore.kernel.org/netdev/20240712191209.31324-1-contact@hacktivis.me/raw";

From 6a5b509558aac269b529a3fd8db2fcebf60dd01d Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Mon, 29 Sep 2025 22:34:32 +0200
Subject: [PATCH 0276/6226] ffmpeg: Fix CPU-related settings on POWER

The defaults with the `generic` CPU target are somewhere between the ppc64 and ppc64le baseline.
More specific CPU targets don't have perfect settings either.

Just try to configure together a set of baseline-compatible settings.
---
 pkgs/development/libraries/ffmpeg/generic.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix
index bc51ce177bc5..d1c657eabf4e 100644
--- a/pkgs/development/libraries/ffmpeg/generic.nix
+++ b/pkgs/development/libraries/ffmpeg/generic.nix
@@ -795,6 +795,25 @@ stdenv.mkDerivation (
       (enableFeature withExtraWarnings "extra-warnings")
       (enableFeature withStripping "stripping")
     ]
+    ++ optionals (stdenv.hostPlatform.isPower) [
+      # FFmpeg expects us to pass `--cpu=` to pick a specific feature set to compile for. If unset, it defaults to `generic`.
+      # For POWER, the default doesn't produce baseline-compliant settings. Passing a baseline-like CPU as a target doesn't
+      # produce entirely correct settings either - POWER4 leaves AltiVec enabled, but that's only guaranteed with POWER6.
+      # Just configure together everything on our own.
+
+      # Easy: Only ppc64le's baseline is recent enough to guarantee all of these.
+      (enableFeature (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian) "altivec")
+      (enableFeature (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian) "vsx")
+      (enableFeature (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian) "power8")
+      (enableFeature (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isLittleEndian) "ldbrx")
+
+      # Instructions that are highly specific to that series of 32-bit embedded CPUs. Never try to enable them.
+      (enableFeature false "ppc4xx")
+
+      # I *think* enabling this on 64-bit POWER is correct? Struggling to find much info on when/where this was introduced.
+      # Definitely present on the Apple G5, and likely Freescale e5500/e6500 as well.
+      (enableFeature (stdenv.hostPlatform.isPower64) "dcbzl")
+    ]
     ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
       "--cross-prefix=${stdenv.cc.targetPrefix}"
       "--enable-cross-compile"

From 313a1003de146dc3ad0278b0cac5dc236b9ab608 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 00:51:22 +0000
Subject: [PATCH 0277/6226] groonga: 15.1.5 -> 15.1.7

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

diff --git a/pkgs/by-name/gr/groonga/package.nix b/pkgs/by-name/gr/groonga/package.nix
index 3a630129a926..513623136cd1 100644
--- a/pkgs/by-name/gr/groonga/package.nix
+++ b/pkgs/by-name/gr/groonga/package.nix
@@ -23,11 +23,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "groonga";
-  version = "15.1.5";
+  version = "15.1.7";
 
   src = fetchurl {
     url = "https://packages.groonga.org/source/groonga/groonga-${finalAttrs.version}.tar.gz";
-    hash = "sha256-dRO9QBQCIVJlFhNZjVZwoiEIesIBrkZWNSOwzgkOnkY=";
+    hash = "sha256-iZpBSgY291aNGhGEX+PddbcB9yEGp6JvMLyVCvWHZhY=";
   };
 
   patches = [

From 5fee04e7ac929e99e55757f4019c097ca871863f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 07:42:37 +0000
Subject: [PATCH 0278/6226] mdk-sdk: 0.34.0 -> 0.35.0

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

diff --git a/pkgs/by-name/md/mdk-sdk/package.nix b/pkgs/by-name/md/mdk-sdk/package.nix
index e5977fc5cda4..2530a5a7f7ca 100644
--- a/pkgs/by-name/md/mdk-sdk/package.nix
+++ b/pkgs/by-name/md/mdk-sdk/package.nix
@@ -33,11 +33,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "mdk-sdk";
-  version = "0.34.0";
+  version = "0.35.0";
 
   src = fetchurl {
     url = "https://github.com/wang-bin/mdk-sdk/releases/download/v${version}/mdk-sdk-linux.tar.xz";
-    hash = "sha256-qt17xZKuZIWmD8ck1IrHXa5i5tKElTYmbGQvqJTtTsY=";
+    hash = "sha256-PKECwms/JGJYsYIvUWU0UBSLwlsYikYw3IGleWXlbtg=";
   };
 
   nativeBuildInputs = [ autoPatchelfHook ];

From 73b6aa1940d884e2f6e6ccbc9ca06e923b30becc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 08:54:43 +0000
Subject: [PATCH 0279/6226] way-displays: 1.14.1 -> 1.15.0

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

diff --git a/pkgs/by-name/wa/way-displays/package.nix b/pkgs/by-name/wa/way-displays/package.nix
index c22df9c1a546..74570b6959e4 100644
--- a/pkgs/by-name/wa/way-displays/package.nix
+++ b/pkgs/by-name/wa/way-displays/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "way-displays";
-  version = "1.14.1";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "alex-courtis";
     repo = "way-displays";
     rev = version;
-    sha256 = "sha256-IW9LolTZaPn2W8IZ166RebQRIug0CyFz/Prgr34wNwM=";
+    sha256 = "sha256-M1d6o4mODnFNInSt0GL1aCUcRU9VBVhHFQuwTrw6zY4=";
   };
 
   strictDeps = true;

From 28b7ac2382f89fad4165dc5930d983274f15ed88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 30 Sep 2025 08:08:37 +0200
Subject: [PATCH 0280/6226] inetutils: clean up conditional patching

Fixes #423347
---
 pkgs/by-name/in/inetutils/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/in/inetutils/package.nix b/pkgs/by-name/in/inetutils/package.nix
index 655d43a187d3..ee1a08aee946 100644
--- a/pkgs/by-name/in/inetutils/package.nix
+++ b/pkgs/by-name/in/inetutils/package.nix
@@ -27,9 +27,7 @@ stdenv.mkDerivation rec {
   patches = [
     # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3
     ./inetutils-1_9-PATH_PROCNET_DEV.patch
-  ]
-  # FIXME: apply unconditionally
-  ++ lib.optionals (stdenv.isAarch64 && stdenv.isLinux) [
+
     ./tests-libls.sh.patch
   ];
 

From dc02d4a40cc853a5695efb4b79309b5d54c4dc34 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 30 Sep 2025 11:54:03 +0200
Subject: [PATCH 0281/6226] libwebp: Apply patch to fix behaviour on big-endian

---
 pkgs/by-name/li/libwebp/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/li/libwebp/package.nix b/pkgs/by-name/li/libwebp/package.nix
index b814308b8ae0..d20b25693a88 100644
--- a/pkgs/by-name/li/libwebp/package.nix
+++ b/pkgs/by-name/li/libwebp/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   threadingSupport ? true, # multi-threading
   openglSupport ? false,
@@ -44,6 +45,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-7i4fGBTsTjAkBzCjVqXqX4n22j6dLgF/0mz4ajNA45U=";
   };
 
+  patches = [
+    # Fixes endianness-related behaviour in build result when targeting big-endian via CMake
+    # https://groups.google.com/a/webmproject.org/g/webp-discuss/c/wvBsO8n8BKA/m/eKpxLuagAQAJ
+    (fetchpatch {
+      name = "0001-libwebp-Fix-endianness-with-CMake.patch";
+      url = "https://github.com/webmproject/libwebp/commit/0e5f4ee3deaba5c4381877764005d981f652791f.patch";
+      hash = "sha256-VNiLv1y3cjSDCNen9KxqbdrldI6EhshTSnsq8g9x8HA=";
+    })
+  ];
+
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" true)
     (lib.cmakeBool "WEBP_USE_THREAD" threadingSupport)

From d884c9a687031b3f28858dbcee9cc6493b7b865a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 30 Sep 2025 11:49:56 +0200
Subject: [PATCH 0282/6226] Reapply "linux: default
 stdenv.hostPlatform.linux-kernel"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit ddaa949afe18949396a1de532df60ffaea5bf2a3.

This was reverted as part of a bulk revert of all kernel changes in a
certain time period — as far as I know there was no actual
justification for reverting this change in particular.  The original
rationale for making this change stands: it's nice for new platforms
not to have to copy the defaults over and over in
lib/systems/platforms.nix.
---
 pkgs/os-specific/linux/kernel/generic.nix       |  7 +++----
 pkgs/os-specific/linux/kernel/manual-config.nix | 12 +++++-------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 5f6111e5f7fa..14ee7ac55a12 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -65,7 +65,7 @@ let
       # optionally be compressed with gzip or bzip2.
       kernelPatches ? [ ],
       ignoreConfigErrors ?
-        !lib.elem stdenv.hostPlatform.linux-kernel.name [
+        !lib.elem stdenv.hostPlatform.linux-kernel.name or "" [
           "aarch64-multiplatform"
           "pc"
         ],
@@ -78,7 +78,7 @@ let
       isHardened ? false,
 
       # easy overrides to stdenv.hostPlatform.linux-kernel members
-      autoModules ? stdenv.hostPlatform.linux-kernel.autoModules,
+      autoModules ? stdenv.hostPlatform.linux-kernel.autoModules or true,
       preferBuiltin ? stdenv.hostPlatform.linux-kernel.preferBuiltin or false,
       kernelArch ? stdenv.hostPlatform.linuxArch,
       kernelTests ? { },
@@ -205,10 +205,9 @@ let
 
         RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc;
 
-        platformName = stdenv.hostPlatform.linux-kernel.name;
         # e.g. "defconfig"
         kernelBaseConfig =
-          if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig;
+          if defconfig != null then defconfig else stdenv.hostPlatform.linux-kernel.baseConfig or "defconfig";
 
         makeFlags = import ./common-flags.nix {
           inherit
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index cd207f1d610c..42ee8450455c 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -160,6 +160,8 @@ lib.makeOverridable (
         isModular = config.isYes "MODULES";
         withRust = config.isYes "RUST";
 
+        target = kernelConf.target or "vmlinux";
+
         buildDTBs = kernelConf.DTB or false;
 
         # Dependencies that are required to build kernel modules
@@ -332,7 +334,7 @@ lib.makeOverridable (
 
         buildFlags = [
           "KBUILD_BUILD_VERSION=1-NixOS"
-          kernelConf.target
+          target
           "vmlinux" # for "perf" and things like that
           "scripts_gdb"
         ]
@@ -413,14 +415,10 @@ lib.makeOverridable (
         # Some image types need special install targets (e.g. uImage is installed with make uinstall on arm)
         installTargets = [
           (kernelConf.installTarget or (
-            if kernelConf.target == "uImage" && stdenv.hostPlatform.linuxArch == "arm" then
+            if target == "uImage" && stdenv.hostPlatform.linuxArch == "arm" then
               "uinstall"
             else if
-              (
-                kernelConf.target == "zImage"
-                || kernelConf.target == "Image.gz"
-                || kernelConf.target == "vmlinuz.efi"
-              )
+              (target == "zImage" || target == "Image.gz" || target == "vmlinuz.efi")
               && builtins.elem stdenv.hostPlatform.linuxArch [
                 "arm"
                 "arm64"

From b16d25f75b96c0076d6d8de5540d11e11056d388 Mon Sep 17 00:00:00 2001
From: Zsolt Dollenstein <zsol.zsol@gmail.com>
Date: Tue, 30 Sep 2025 10:56:15 +0100
Subject: [PATCH 0283/6226] uv: 0.8.20 -> 0.8.22

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

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index d6272d650891..41edda5835af 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.8.20";
+  version = "0.8.22";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-k0otsop9KjjChlUIKBJn4yQStOHmv/v8GLol3Pz/3yU=";
+    hash = "sha256-7/WOjsyfkDTZLNJY0+rNdRUmMabJsSFvKi2yh/WqViQ=";
   };
 
-  cargoHash = "sha256-f/2DHdNWdbQEYt7kmDsBPDgerGcjFGKyVgU+bQ9qdlg=";
+  cargoHash = "sha256-RubSyxQjWlkoHMItYLjiyJ5Whz3oMXgioqbuewi1fcM=";
 
   buildInputs = [
     rust-jemalloc-sys

From 358b87dde7c796aaa3c6693fbfc9d1d1d56a5585 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 30 Sep 2025 11:51:10 +0000
Subject: [PATCH 0284/6226] adminer: 5.4.0 -> 5.4.1

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

diff --git a/pkgs/by-name/ad/adminer/package.nix b/pkgs/by-name/ad/adminer/package.nix
index 6ee9594edb57..0b31e2d5449b 100644
--- a/pkgs/by-name/ad/adminer/package.nix
+++ b/pkgs/by-name/ad/adminer/package.nix
@@ -9,12 +9,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "adminer";
-  version = "5.4.0";
+  version = "5.4.1";
 
   # not using fetchFromGitHub as the git repo relies on submodules that are included in the tar file
   src = fetchurl {
     url = "https://github.com/vrana/adminer/releases/download/v${finalAttrs.version}/adminer-${finalAttrs.version}.zip";
-    hash = "sha256-n6bmvUIrIiOaNCPEA5L+frbesnircbm0mTqmWxYRpwM=";
+    hash = "sha256-+Ki46mR+E82F/spU0DBM7kWelY3zA9bdFad44HeZ5Lo=";
   };
 
   nativeBuildInputs = [

From b697572ab907c6c57702822ca8be4090b436d45c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 30 Sep 2025 17:21:45 +0200
Subject: [PATCH 0285/6226] strace: 6.16 -> 6.17

ChangeLog: https://github.com/strace/strace/releases/tag/v6.17
---
 pkgs/by-name/st/strace/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/strace/package.nix b/pkgs/by-name/st/strace/package.nix
index bb08112461f0..23b9b4b359e8 100644
--- a/pkgs/by-name/st/strace/package.nix
+++ b/pkgs/by-name/st/strace/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "strace";
-  version = "6.16";
+  version = "6.17";
 
   src = fetchurl {
     url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-PXrufk8ESy9n89UainbtoYB26fsndN5UrDUdd31Ov/o=";
+    hash = "sha256-Cnx77cfvwHbzJCoDEK8q5jwpKjbdQjbweeiKk+mMucA=";
   };
 
   separateDebugInfo = true;

From a398b4e09f0b6cee440cc77b881eec1f6939c106 Mon Sep 17 00:00:00 2001
From: Luna <git@lunnova.dev>
Date: Sun, 28 Sep 2025 21:07:53 -0700
Subject: [PATCH 0286/6226] llvmPackages.libclang: clean up rebuild avoidance

---
 .../compilers/llvm/common/clang/default.nix   | 38 ++++++-------------
 1 file changed, 11 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix
index 8950500ba1df..1df8a8204413 100644
--- a/pkgs/development/compilers/llvm/common/clang/default.nix
+++ b/pkgs/development/compilers/llvm/common/clang/default.nix
@@ -95,16 +95,17 @@ stdenv.mkDerivation (
       (lib.cmakeFeature "CLANG_INSTALL_PACKAGE_DIR" "${placeholder "dev"}/lib/cmake/clang")
       (lib.cmakeBool "CLANGD_BUILD_XPC" false)
       (lib.cmakeBool "LLVM_ENABLE_RTTI" true)
+      (lib.cmakeBool "LLVM_INCLUDE_TESTS" false)
       (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")
       (lib.cmakeFeature "CLANG_TABLEGEN" "${buildLlvmTools.tblgen}/bin/clang-tblgen")
+      (lib.cmakeFeature "CLANG_TIDY_CONFUSABLE_CHARS_GEN" "${buildLlvmTools.tblgen}/bin/clang-tidy-confusable-chars-gen")
     ]
+    ++ lib.optional (lib.versionAtLeast release_version "20") (
+      lib.cmakeFeature "LLVM_DIR" "${libllvm.dev}/lib/cmake/llvm"
+    )
     ++ lib.optionals (lib.versionAtLeast release_version "21") [
       (lib.cmakeFeature "CLANG_RESOURCE_DIR" "${placeholder "lib"}/lib/clang/${lib.versions.major release_version}")
     ]
-    # TODO: Clean up on `staging`.
-    ++ [
-      (lib.cmakeBool "LLVM_INCLUDE_TESTS" false)
-    ]
     ++ lib.optionals enableManpages [
       (lib.cmakeBool "CLANG_INCLUDE_DOCS" true)
       (lib.cmakeBool "LLVM_ENABLE_SPHINX" true)
@@ -112,20 +113,10 @@ stdenv.mkDerivation (
       (lib.cmakeBool "SPHINX_OUTPUT_HTML" false)
       (lib.cmakeBool "SPHINX_WARNINGS_AS_ERRORS" false)
     ]
-    # TODO: Clean up on `staging`.
-    ++ [
-      # Added in LLVM15:
-      # `clang-tidy-confusable-chars-gen`: https://github.com/llvm/llvm-project/commit/c3574ef739fbfcc59d405985a3a4fa6f4619ecdb
-      # `clang-pseudo-gen`: https://github.com/llvm/llvm-project/commit/cd2292ef824591cc34cc299910a3098545c840c7
-      (lib.cmakeFeature "CLANG_TIDY_CONFUSABLE_CHARS_GEN" "${buildLlvmTools.tblgen}/bin/clang-tidy-confusable-chars-gen")
-    ]
     ++ lib.optionals (lib.versionOlder release_version "20") [
       # clang-pseudo removed in LLVM20: https://github.com/llvm/llvm-project/commit/ed8f78827895050442f544edef2933a60d4a7935
       (lib.cmakeFeature "CLANG_PSEUDO_GEN" "${buildLlvmTools.tblgen}/bin/clang-pseudo-gen")
     ]
-    ++ lib.optional (lib.versionAtLeast release_version "20") (
-      lib.cmakeFeature "LLVM_DIR" "${libllvm.dev}/lib/cmake/llvm"
-    )
     ++ devExtraCmakeFlags;
 
     postPatch = ''
@@ -173,20 +164,13 @@ stdenv.mkDerivation (
       patchShebangs $python/bin
 
       mkdir -p $dev/bin
-    ''
-    # TODO(@LunNova): Clean up this rebuild avoidance in staging
-    + lib.optionalString enableClangToolsExtra (
-      if lib.versionOlder release_version "20" then
-        ''
-          cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen,clang-pseudo-gen} $dev/bin
-        ''
-      else
-        ''
-          cp bin/{clang-tblgen,clang-tidy-confusable-chars-gen} $dev/bin
-        ''
-    )
-    + lib.optionalString (!enableClangToolsExtra) ''
       cp bin/clang-tblgen $dev/bin
+    ''
+    + lib.optionalString enableClangToolsExtra ''
+      cp bin/clang-tidy-confusable-chars-gen $dev/bin
+    ''
+    + lib.optionalString (enableClangToolsExtra && lib.versionOlder release_version "20") ''
+      cp bin/clang-pseudo-gen $dev/bin
     '';
 
     env =

From 636157636f634c51cb4ca96d811fb2fdd9b9e7b2 Mon Sep 17 00:00:00 2001
From: Luna <git@lunnova.dev>
Date: Sun, 28 Sep 2025 21:07:58 -0700
Subject: [PATCH 0287/6226] llvmPackages.libllvm: clean up rebuild avoidance

---
 pkgs/development/compilers/llvm/common/llvm/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
index 279be22f7757..7715a7f2d2e8 100644
--- a/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -85,9 +85,6 @@ stdenv.mkDerivation (
     pname = "llvm";
     inherit version;
 
-    # TODO: Remove on `staging`.
-    shortVersion = lib.concatStringsSep "." (lib.take 1 (lib.splitString "." release_version));
-
     src =
       if monorepoSrc != null then
         runCommand "llvm-src-${version}" { inherit (monorepoSrc) passthru; } (

From 43135fcdc6febccb497ad7039571c9989fd6689e Mon Sep 17 00:00:00 2001
From: Luna <git@lunnova.dev>
Date: Sun, 28 Sep 2025 21:08:46 -0700
Subject: [PATCH 0288/6226] llvmPackages.libcxx: clean up rebuild avoidance

---
 pkgs/development/compilers/llvm/common/libcxx/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/libcxx/default.nix b/pkgs/development/compilers/llvm/common/libcxx/default.nix
index b59161683842..be38ae92d8ec 100644
--- a/pkgs/development/compilers/llvm/common/libcxx/default.nix
+++ b/pkgs/development/compilers/llvm/common/libcxx/default.nix
@@ -143,9 +143,6 @@ stdenv.mkDerivation (finalAttrs: {
     patchShebangs utils/cat_files.py
   '';
 
-  # TODO: Remove on `staging`.
-  patches = [ ];
-
   nativeBuildInputs = [
     cmake
     ninja

From 11f69a77db190f2eafd3d3e6ac4377011814e9f8 Mon Sep 17 00:00:00 2001
From: Luna <git@lunnova.dev>
Date: Sun, 28 Sep 2025 21:08:59 -0700
Subject: [PATCH 0289/6226] llvmPackages.libunwind: clean up rebuild avoidance

---
 .../compilers/llvm/common/libunwind/default.nix            | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/libunwind/default.nix b/pkgs/development/compilers/llvm/common/libunwind/default.nix
index cc73f02be4e6..cab7f978e3cd 100644
--- a/pkgs/development/compilers/llvm/common/libunwind/default.nix
+++ b/pkgs/development/compilers/llvm/common/libunwind/default.nix
@@ -21,9 +21,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   inherit version;
 
-  # TODO: Remove on `staging`.
-  patches = [ ];
-
   src =
     if monorepoSrc != null then
       runCommand "libunwind-src-${version}" { inherit (monorepoSrc) passthru; } ''
@@ -60,10 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ devExtraCmakeFlags;
 
-  # TODO: Remove on `staging`.
-  prePatch = "";
-  postPatch = "";
-
   postInstall =
     lib.optionalString (enableShared && !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isWindows)
       ''

From 1c2e2696ce12050cd1f2f34764e1f28612ed95e9 Mon Sep 17 00:00:00 2001
From: Luna <git@lunnova.dev>
Date: Sun, 28 Sep 2025 21:09:10 -0700
Subject: [PATCH 0290/6226] llvmPackages.lldb: clean up rebuild avoidance

---
 .../compilers/llvm/common/lldb/default.nix          | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/lldb/default.nix b/pkgs/development/compilers/llvm/common/lldb/default.nix
index 9fbcbb0f3839..f67da5042667 100644
--- a/pkgs/development/compilers/llvm/common/lldb/default.nix
+++ b/pkgs/development/compilers/llvm/common/lldb/default.nix
@@ -74,6 +74,7 @@ stdenv.mkDerivation (
 
     nativeBuildInputs = [
       cmake
+      ninja
       python3
       which
       swig
@@ -84,10 +85,6 @@ stdenv.mkDerivation (
     ++ lib.optionals enableManpages [
       python3.pkgs.sphinx
       python3.pkgs.myst-parser
-    ]
-    # TODO: Clean up on `staging`.
-    ++ [
-      ninja
     ];
 
     buildInputs = [
@@ -112,6 +109,7 @@ stdenv.mkDerivation (
       (lib.cmakeBool "LLVM_ENABLE_RTTI" false)
       (lib.cmakeFeature "Clang_DIR" "${lib.getDev libclang}/lib/cmake")
       (lib.cmakeFeature "LLVM_EXTERNAL_LIT" "${lit}/bin/lit")
+      (lib.cmakeFeature "CLANG_RESOURCE_DIR" "../../../../${lib.getLib libclang}")
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       (lib.cmakeBool "LLDB_USE_SYSTEM_DEBUGSERVER" true)
@@ -119,10 +117,6 @@ stdenv.mkDerivation (
     ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
       (lib.cmakeFeature "LLDB_CODESIGN_IDENTITY" "") # codesigning makes nondeterministic
     ]
-    # TODO: Clean up on `staging`.
-    ++ [
-      (lib.cmakeFeature "CLANG_RESOURCE_DIR" "../../../../${lib.getLib libclang}")
-    ]
     ++ lib.optionals enableManpages [
       (lib.cmakeBool "LLVM_ENABLE_SPHINX" true)
       (lib.cmakeBool "SPHINX_OUTPUT_MAN" true)
@@ -184,9 +178,6 @@ stdenv.mkDerivation (
   // lib.optionalAttrs enableManpages {
     pname = "lldb-manpages";
 
-    # TODO: Remove on `staging`.
-    buildPhase = "";
-
     ninjaFlags = [ "docs-lldb-man" ];
 
     propagatedBuildInputs = [ ];

From 3a4c1a332b60c5b5000921abfa8b0ba9bfc984e8 Mon Sep 17 00:00:00 2001
From: Luna <git@lunnova.dev>
Date: Sun, 28 Sep 2025 21:09:22 -0700
Subject: [PATCH 0291/6226] llvmPackages.lld: clean up rebuild avoidance

---
 pkgs/development/compilers/llvm/common/lld/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/lld/default.nix b/pkgs/development/compilers/llvm/common/lld/default.nix
index 13ed24cdc701..015e6e23e48d 100644
--- a/pkgs/development/compilers/llvm/common/lld/default.nix
+++ b/pkgs/development/compilers/llvm/common/lld/default.nix
@@ -63,9 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ devExtraCmakeFlags;
 
-  # TODO: Remove on `staging`.
-  postPatch = "";
-
   # Musl's default stack size is too small for lld to be able to link Firefox.
   LDFLAGS = lib.optionalString stdenv.hostPlatform.isMusl "-Wl,-z,stack-size=2097152";
 

From 957d7fea186e0d6488c8ab4192e41099fbdeb14e Mon Sep 17 00:00:00 2001
From: Luna <git@lunnova.dev>
Date: Sun, 28 Sep 2025 21:09:33 -0700
Subject: [PATCH 0292/6226] llvmPackages: clean up rebuild avoidance

---
 .../compilers/llvm/common/default.nix         | 20 ++++++++-----------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index e8c7f768267b..a09b7af98a49 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -374,18 +374,14 @@ let
 
       # This is an "oddly ordered" bootstrap just for Darwin. Probably
       # don't want it otherwise.
-      clangNoCompilerRtWithLibc =
-        wrapCCWith rec {
-          cc = tools.clang-unwrapped;
-          libcxx = null;
-          bintools = bintools';
-          extraPackages = [ ];
-          extraBuildCommands = mkExtraBuildCommands0 cc;
-        }
-        # FIXME: This should be inside the `wrapCCWith` call.
-        // lib.optionalAttrs stdenv.targetPlatform.isWasm {
-          nixSupport.cc-cflags = [ "-fno-exceptions" ];
-        };
+      clangNoCompilerRtWithLibc = wrapCCWith rec {
+        cc = tools.clang-unwrapped;
+        libcxx = null;
+        bintools = bintools';
+        extraPackages = [ ];
+        extraBuildCommands = mkExtraBuildCommands0 cc;
+        nixSupport.cc-cflags = lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
+      };
 
       # Aliases
       clangNoCompilerRt = tools.clangNoLibcNoRt;

From 02746ead92b6d56d02fb22efacd59402d1a95878 Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Tue, 16 Sep 2025 17:45:30 +0300
Subject: [PATCH 0293/6226] haskell.compiler.ghc{948,967,984,9101,9121,9122}:
 fix build with gcc15
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- add patch from fedora (rebase of latest fix from upstream):
https://gitlab.haskell.org/ghc/ghc/-/issues/25662
https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13863

ghc versions excluded from patch:
9.10.2 - has previous fix with `extern void* malloc(size_t);`
9.10.3 - has latest fix with `#include <stdlib.h>`
9.12.3 - has latest fix with `#include <stdlib.h>`

Fixes build failure with gcc15, building utils/hp2ps/Utilities.c:
```
utils/hp2ps/Utilities.c:6:14: error:
warning: conflicting types for built-in function ‘malloc’;
expected ‘void *(long unsigned int)’ [-Wbuiltin-declaration-mismatch]
        6 | extern void* malloc();
          |              ^~~~~~
...
utils/hp2ps/Utilities.c:92:18: error:
warning: conflicting types for built-in function ‘realloc’;
expected ‘void *(void *, long unsigned int)’ [-Wbuiltin-declaration-mismatch]
       92 |     extern void *realloc();
          |                  ^~~~~~~
```
---
 .../development/compilers/ghc/common-hadrian.nix | 16 ++++++++++++++++
 .../compilers/ghc/common-make-native-bignum.nix  | 11 +++++++++++
 2 files changed, 27 insertions(+)

diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index b8064fd4ee79..9d2c4afef217 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -261,6 +261,22 @@
           hash = "sha256-L3FQvcm9QB59BOiR2g5/HACAufIG08HiT53EIOjj64g=";
         })
       ]
+      # Fix build with gcc15
+      # https://gitlab.haskell.org/ghc/ghc/-/issues/25662
+      # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13863
+      ++
+        lib.optionals
+          (
+            lib.versionOlder version "9.12.3"
+            && !(lib.versionAtLeast version "9.10.2" && lib.versionOlder version "9.12")
+          )
+          [
+            (fetchpatch {
+              name = "ghc-hp2ps-c-gnu17.patch";
+              url = "https://src.fedoraproject.org/rpms/ghc/raw/9c26d7c3c3de73509a25806e5663b37bcf2e0b4e/f/hp2ps-C-gnu17.patch";
+              hash = "sha256-Vr5wkiSE1S5e+cJ8pWUvG9KFpxtmvQ8wAy08ElGNp5E=";
+            })
+          ]
       # Fixes stack overrun in rts which crashes an process whenever
       # freeHaskellFunPtr is called with nixpkgs' hardening flags.
       # https://gitlab.haskell.org/ghc/ghc/-/issues/25485
diff --git a/pkgs/development/compilers/ghc/common-make-native-bignum.nix b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
index 922875e6b4e1..cf9bd6e7e530 100644
--- a/pkgs/development/compilers/ghc/common-make-native-bignum.nix
+++ b/pkgs/development/compilers/ghc/common-make-native-bignum.nix
@@ -345,6 +345,17 @@ stdenv.mkDerivation (
       })
     ]
 
+    # Fix build with gcc15
+    # https://gitlab.haskell.org/ghc/ghc/-/issues/25662
+    # https://gitlab.haskell.org/ghc/ghc/-/merge_requests/13863
+    ++ lib.optionals (lib.versions.majorMinor version == "9.4") [
+      (fetchpatch {
+        name = "ghc-hp2ps-c-gnu17.patch";
+        url = "https://src.fedoraproject.org/rpms/ghc/raw/9c26d7c3c3de73509a25806e5663b37bcf2e0b4e/f/hp2ps-C-gnu17.patch";
+        hash = "sha256-Vr5wkiSE1S5e+cJ8pWUvG9KFpxtmvQ8wAy08ElGNp5E=";
+      })
+    ]
+
     ++ [
       # Don't generate code that doesn't compile when --enable-relocatable is passed to Setup.hs
       # Can be removed if the Cabal library included with ghc backports the linked fix

From a8464be051fe50849eceb315ddb83794b957927b Mon Sep 17 00:00:00 2001
From: Quinn Edenfield <william.edenfield@neuralink.com>
Date: Mon, 1 Sep 2025 19:33:13 -0700
Subject: [PATCH 0294/6226] libkrun-efi: init at 1.15.1

---
 pkgs/by-name/li/libkrun-efi/package.nix | 117 ++++++++++++++++++++++++
 1 file changed, 117 insertions(+)
 create mode 100644 pkgs/by-name/li/libkrun-efi/package.nix

diff --git a/pkgs/by-name/li/libkrun-efi/package.nix b/pkgs/by-name/li/libkrun-efi/package.nix
new file mode 100644
index 000000000000..e140e811a2ee
--- /dev/null
+++ b/pkgs/by-name/li/libkrun-efi/package.nix
@@ -0,0 +1,117 @@
+{
+  cargo,
+  fetchFromGitHub,
+  fetchurl,
+  fixDarwinDylibNames,
+  lib,
+  libepoxy,
+  libkrun-efi,
+  moltenvk,
+  pkg-config,
+  rustc,
+  rustPlatform,
+  rutabaga_gfx,
+  nix-update-script,
+  stdenv,
+  buildPackages,
+  meson,
+  ninja,
+  vulkan-headers,
+  withGpu ? true,
+}:
+let
+  virglrenderer = stdenv.mkDerivation (finalAttrs: {
+    pname = "virglrenderer";
+    version = "0.10.4d-krunkit";
+
+    src = fetchurl {
+      url = "https://gitlab.freedesktop.org/slp/virglrenderer/-/archive/${finalAttrs.version}/virglrenderer-${finalAttrs.version}.tar.bz2";
+      hash = "sha256-M/buj97QUeY6CYeW0VICD5F6FBPi9ATPGHpNA48xL3o=";
+    };
+
+    separateDebugInfo = true;
+
+    buildInputs = [
+      libepoxy
+      moltenvk
+      vulkan-headers
+    ];
+
+    nativeBuildInputs = [
+      meson
+      ninja
+      pkg-config
+      (buildPackages.python3.withPackages (ps: [ ps.pyyaml ]))
+    ];
+
+    mesonFlags = [
+      (lib.mesonBool "render-server" false)
+      (lib.mesonBool "venus" true)
+      (lib.mesonEnable "drm" false)
+    ];
+
+    meta = {
+      description = "Virtual 3D GPU library that allows a qemu guest to use the host GPU for accelerated 3D rendering";
+      mainProgram = "virgl_test_server";
+      homepage = "https://gitlab.freedesktop.org/slp/virglrenderer";
+      license = lib.licenses.mit;
+      platforms = lib.platforms.unix;
+      maintainers = [ lib.maintainers.quinneden ];
+    };
+  });
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "libkrun-efi";
+  version = "1.15.1";
+
+  src = fetchFromGitHub {
+    owner = "containers";
+    repo = "libkrun";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-VhlFyYJ/TH12I3dUq0JTus60rQEJq5H4Pm1puCnJV5A=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) src;
+    hash = "sha256-dK3V7HCCvTqmQhB5Op2zmBPa9FO3h9gednU9tpQk+1U=";
+  };
+
+  nativeBuildInputs = [
+    cargo
+    fixDarwinDylibNames
+    pkg-config
+    rustc
+    rustPlatform.bindgenHook
+    rustPlatform.cargoSetupHook
+  ];
+
+  buildInputs = [
+    libepoxy
+    rutabaga_gfx
+    virglrenderer
+  ];
+
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "EFI=1"
+  ]
+  ++ lib.optional withGpu "GPU=1";
+
+  passthru = {
+    tests.withoutGpu = libkrun-efi.override { withGpu = false; };
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
+    description = "EFI variant of Libkrun, a dynamic library providing Virtualization-based process isolation capabilities";
+    homepage = "https://github.com/containers/libkrun";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ quinneden ];
+    platforms = [ "aarch64-darwin" ];
+  };
+})

From 854b1ada11a6ce1b1a8e1ddbd73af3afc6bef288 Mon Sep 17 00:00:00 2001
From: Quinn Edenfield <william.edenfield@neuralink.com>
Date: Mon, 1 Sep 2025 19:33:13 -0700
Subject: [PATCH 0295/6226] krunkit: init at 1.0.0

---
 pkgs/by-name/kr/krunkit/package.nix | 58 +++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 pkgs/by-name/kr/krunkit/package.nix

diff --git a/pkgs/by-name/kr/krunkit/package.nix b/pkgs/by-name/kr/krunkit/package.nix
new file mode 100644
index 000000000000..230317284893
--- /dev/null
+++ b/pkgs/by-name/kr/krunkit/package.nix
@@ -0,0 +1,58 @@
+{
+  cargo,
+  darwin,
+  pkg-config,
+  rustc,
+  stdenv,
+  fetchFromGitHub,
+  libepoxy,
+  libkrun-efi,
+  rustPlatform,
+  lib,
+  nix-update-script,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "krunkit";
+  version = "1.0.0";
+
+  src = fetchFromGitHub {
+    owner = "containers";
+    repo = "krunkit";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-dsEZZiLgHyd6xeXZCdDd4zsxzwQeIhAK+lewY2ZfvpY=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) src;
+    hash = "sha256-i0cC3aOEqcvOcwTPbM6AazMzd8Q+QLwuhnvPGv3ntsc=";
+  };
+
+  nativeBuildInputs = [
+    cargo
+    darwin.sigtool
+    pkg-config
+    rustc
+    rustPlatform.bindgenHook
+    rustPlatform.cargoSetupHook
+  ];
+
+  buildInputs = [
+    libepoxy
+    libkrun-efi
+  ];
+
+  makeFlags = [ "PREFIX=${placeholder "out"}" ];
+
+  # This is necessary in order for the binary to keep its entitlements
+  dontStrip = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Launch configurable virtual machines with libkrun";
+    homepage = "https://github.com/containers/krunkit";
+    license = lib.licenses.asl20;
+    platforms = [ "aarch64-darwin" ];
+    maintainers = with lib.maintainers; [ quinneden ];
+  };
+})

From bcfe9e71f769ced3cc0d23d565f6dd2f43c4f91c Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 30 Sep 2025 21:37:22 +0100
Subject: [PATCH 0296/6226] btrfs-progs: 6.16.1 -> 6.17

Changes: https://github.com/kdave/btrfs-progs/releases/tag/v6.17
---
 pkgs/by-name/bt/btrfs-progs/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bt/btrfs-progs/package.nix b/pkgs/by-name/bt/btrfs-progs/package.nix
index 5527d82577c8..ffa5dac48db6 100644
--- a/pkgs/by-name/bt/btrfs-progs/package.nix
+++ b/pkgs/by-name/bt/btrfs-progs/package.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation rec {
   pname = "btrfs-progs";
-  version = "6.16.1";
+  version = "6.17";
 
   src = fetchurl {
     url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz";
-    hash = "sha256-cKo/lUAXynQ1KYKN6yoQ3Oqy1BMhWDrRV+lnhH3bJPw=";
+    hash = "sha256-J31pbJ15cT/1r7U8fv69zq0uamAHeJsXQuxBH05Moik=";
   };
 
   nativeBuildInputs = [

From 4d44f8fa53518ecf5e8eafd54f8151921c53f75a Mon Sep 17 00:00:00 2001
From: Alyssa Ross <hi@alyssa.is>
Date: Tue, 30 Sep 2025 21:54:06 +0200
Subject: [PATCH 0297/6226] llvmPackages.compiler-rt: clean up libxcrypt fix

This is unnecessary since LLVM commit d7bead833631 ("[sanitizer]
Remove crypt and crypt_r interceptors"), included in LLVM 18, the
oldest version we still have in Nixpkgs.
---
 .../compilers/llvm/common/compiler-rt/default.nix            | 4 ----
 pkgs/development/compilers/llvm/common/default.nix           | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
index dc097c02b50e..f9bfdbed62c1 100644
--- a/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
+++ b/pkgs/development/compilers/llvm/common/compiler-rt/default.nix
@@ -15,7 +15,6 @@
   libcxx,
   linuxHeaders,
   freebsd,
-  libxcrypt,
 
   # Some platforms have switched to using compiler-rt, but still want a
   # libgcc.a for ABI compat purposes. The use case would be old code that
@@ -123,9 +122,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "CMAKE_C_COMPILER_TARGET" stdenv.hostPlatform.config)
     (lib.cmakeFeature "CMAKE_ASM_COMPILER_TARGET" stdenv.hostPlatform.config)
   ]
-  ++ lib.optionals (haveLibc && stdenv.hostPlatform.libc == "glibc") [
-    (lib.cmakeFeature "SANITIZER_COMMON_CFLAGS" "-I${libxcrypt}/include")
-  ]
   ++ lib.optionals (useLLVM && haveLibc && stdenv.cc.libcxx == libcxx) [
     (lib.cmakeFeature "SANITIZER_CXX_ABI" "libcxxabi")
     (lib.cmakeFeature "SANITIZER_CXX_ABI_LIBNAME" "libcxxabi")
diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index a09b7af98a49..40250af95728 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -425,11 +425,6 @@ let
           {
             inherit stdenv;
           }
-          // lib.optionalAttrs (stdenv.hostPlatform.useLLVM or false) {
-            libxcrypt = (libxcrypt.override { inherit stdenv; }).overrideAttrs (old: {
-              configureFlags = old.configureFlags ++ [ "--disable-symvers" ];
-            });
-          }
         );
 
         compiler-rt-no-libc = callPackage ./compiler-rt {

From b8cf634aa1f64ff828a2fe5c729ddce490deab28 Mon Sep 17 00:00:00 2001
From: David McFarland <corngood@gmail.com>
Date: Tue, 30 Sep 2025 19:05:25 -0300
Subject: [PATCH 0298/6226] Revert "treewide: undo changes causing rebuilds"

This reverts commit e098bea39d9d1c15214aa026bb50893a7459b2b0.
---
 .../compilers/gcc/patches/default.nix         |  2 +-
 pkgs/stdenv/generic/make-derivation.nix       | 21 +++++++------------
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/compilers/gcc/patches/default.nix b/pkgs/development/compilers/gcc/patches/default.nix
index 2c0fa1b40852..619b3a922f31 100644
--- a/pkgs/development/compilers/gcc/patches/default.nix
+++ b/pkgs/development/compilers/gcc/patches/default.nix
@@ -224,7 +224,7 @@ in
   .${majorVersion} or [ ]
 )
 
-++ optional targetPlatform.isCygwin (fetchpatch {
+++ optional (targetPlatform.isWindows || targetPlatform.isCygwin) (fetchpatch {
   name = "libstdc-fix-compilation-in-freestanding-win32.patch";
   url = "https://inbox.sourceware.org/gcc-patches/20250922182808.2599390-2-corngood@gmail.com/raw";
   hash = "sha256-+EYW9lG8CviVX7RyNHp+iX+8BRHUjt5b07k940khbbY=";
diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index bbd4c0a14f65..8c291ccf4920 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -706,19 +706,14 @@ let
               __propagatedImpureHostDeps = computedPropagatedImpureHostDeps ++ __propagatedImpureHostDeps;
             }
           )
-          // optionalAttrs (isWindows || isCygwin) (
-            let
-              dlls =
-                allowedImpureDLLs
-                ++ lib.optionals isCygwin [
-                  "KERNEL32.dll"
-                  "cygwin1.dll"
-                ];
-            in
-            {
-              allowedImpureDLLs = if dlls != [ ] then dlls else null;
-            }
-          )
+          // optionalAttrs (isWindows || isCygwin) {
+            allowedImpureDLLs =
+              allowedImpureDLLs
+              ++ lib.optionals isCygwin [
+                "KERNEL32.dll"
+                "cygwin1.dll"
+              ];
+          }
           // (
             if !__structuredAttrs then
               makeOutputChecks attrs

From 3e441fceea5eaf57c831bd584e7c69084b4c6b77 Mon Sep 17 00:00:00 2001
From: etwas <ein@etwas.me>
Date: Wed, 1 Oct 2025 00:16:44 +0200
Subject: [PATCH 0299/6226] opendht: 3.4.0 -> 3.5.4

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

diff --git a/pkgs/by-name/op/opendht/package.nix b/pkgs/by-name/op/opendht/package.nix
index dd9da4bf934f..8bb5f61fd630 100644
--- a/pkgs/by-name/op/opendht/package.nix
+++ b/pkgs/by-name/op/opendht/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "opendht";
-  version = "3.4.0";
+  version = "3.5.4";
 
   src = fetchFromGitHub {
     owner = "savoirfairelinux";
     repo = "opendht";
     tag = "v${version}";
-    hash = "sha256-WNN4aCZiJuz9CgEKIzFmy50HBj0ZL/d1uU7L518lPhk=";
+    hash = "sha256-mnnd6yATIk/TEuFG/M98d+pfeh42IKWBBYjkTP52xeM=";
   };
 
   nativeBuildInputs = [

From ccbbeaa032818277e03ec9f28aeaef000d8b6cda Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 29 Sep 2025 21:12:43 +0100
Subject: [PATCH 0300/6226] libnotify: 0.8.6 -> 0.8.7

Changes: https://gitlab.gnome.org/GNOME/libnotify/-/blob/0.8.7/NEWS?ref_type=tags
Diff: https://gitlab.gnome.org/GNOME/libnotify/-/compare/0.8.6...0.8.7
---
 pkgs/by-name/li/libnotify/package.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libnotify/package.nix b/pkgs/by-name/li/libnotify/package.nix
index 8345b27ae222..5403b0d07218 100644
--- a/pkgs/by-name/li/libnotify/package.nix
+++ b/pkgs/by-name/li/libnotify/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch,
   meson,
   ninja,
   pkg-config,
@@ -19,7 +20,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libnotify";
-  version = "0.8.6";
+  version = "0.8.7";
 
   outputs = [
     "out"
@@ -29,11 +30,20 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-xVQKrvtg4dY7HFh8BfIoTr5y7OfQwOXkp3jP1YRLa1g=";
+    hash = "sha256-S+FSAuxBhPzhrBWZfs5VMNK+Mv6Vc4da6xDjtXOFh0g=";
   };
 
+  patches = [
+    # build: Do not use GDesktopAppInfo if not available
+    # https://gitlab.gnome.org/GNOME/libnotify/-/issues/62
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/libnotify/-/commit/13de65ad2a76255ffde5d6da91d246cd7226583b.patch";
+      hash = "sha256-a1wiUQnrncPqL2OTY1sUWyvVcoI54bXPvkIkZAcC6kI=";
+    })
+  ];
+
   mesonFlags = [
-    # disable tests as we don't need to depend on GTK (2/3)
+    # disable tests as we don't need to depend on GTK 4
     "-Dtests=false"
     "-Ddocbook_docs=disabled"
     "-Dgtk_doc=false"

From 31a736274bd9ccd60c3188af697eab3baac1b478 Mon Sep 17 00:00:00 2001
From: Martino Fontana <tinozzo123@gmail.com>
Date: Wed, 1 Oct 2025 11:32:50 +0200
Subject: [PATCH 0301/6226] dolphin-emu: Small fixups - Use SDL3 instead of
 SDL2: https://github.com/dolphin-emu/dolphin/pull/13694 - Dolphin forces
 XWayland by itself now: https://github.com/dolphin-emu/dolphin/pull/13846 -
 Set correct permissions for udev rules

---
 pkgs/by-name/do/dolphin-emu/package.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix
index ad023d50a0d6..d766cdc4b62e 100644
--- a/pkgs/by-name/do/dolphin-emu/package.nix
+++ b/pkgs/by-name/do/dolphin-emu/package.nix
@@ -31,7 +31,7 @@
   minizip-ng,
   openal,
   pugixml,
-  SDL2,
+  sdl3,
   sfml,
   xxHash,
   xz,
@@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: {
     pugixml
     qt6.qtbase
     qt6.qtsvg
-    SDL2
+    sdl3
     sfml
     xxHash
     xz
@@ -150,16 +150,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [
     "--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ vulkan-loader ]}"
-    # https://bugs.dolphin-emu.org/issues/11807
-    # The .desktop file should already set this, but Dolphin may be launched in other ways
-    "--set QT_QPA_PLATFORM xcb"
   ];
 
   doInstallCheck = true;
 
   postInstall =
     lib.optionalString stdenv.hostPlatform.isLinux ''
-      install -D $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules
+      install -Dm644 $src/Data/51-usb-device.rules $out/etc/udev/rules.d/51-usb-device.rules
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       # Only gets installed automatically if the standalone executable is used

From 96e5424f74a91b44c0d5ca3c02d59de802501ddf Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Mon, 15 Sep 2025 17:22:40 +0200
Subject: [PATCH 0302/6226] openssl: Enable tests

Makes the build take about 13 instead of 5 minutes
---
 pkgs/development/libraries/openssl/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 05207dd04f10..58550c8b4676 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -246,6 +246,11 @@ let
 
       enableParallelBuilding = true;
 
+      doCheck = true;
+      preCheck = ''
+        patchShebangs util
+      '';
+
       postInstall =
         (
           if static then

From 1453647d2294bdaa8942aa9ace7256ff4fa230af Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Mon, 15 Sep 2025 17:23:37 +0200
Subject: [PATCH 0303/6226] openssl: Add missing comments for patches

Markus Theil: Changed reference to NIX_SSL_CERT_FILE commit
---
 pkgs/development/libraries/openssl/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 58550c8b4676..1d114d12996c 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -375,12 +375,15 @@ in
     hash = "sha256-39135OobV/86bb3msL3D8x21rJnn/dTq+eH7tuwtuM4=";
 
     patches = [
+      # Support for NIX_SSL_CERT_FILE, motivation:
+      # https://github.com/NixOS/nixpkgs/commit/942dbf89c6120cb5b52fb2ab456855d1fbf2994e
       ./3.0/nix-ssl-cert-file.patch
 
       # openssl will only compile in KTLS if the current kernel supports it.
       # This patch disables build-time detection.
       ./3.0/openssl-disable-kernel-detection.patch
 
+      # Look up SSL certificates in /etc rather than the immutable installation directory
       (
         if stdenv.hostPlatform.isDarwin then ./use-etc-ssl-certs-darwin.patch else ./use-etc-ssl-certs.patch
       )
@@ -398,12 +401,15 @@ in
     hash = "sha256-xTpH5eRByTDDkoz3v2+wDl0Sm2MOCqhzsIJYZW5zRew=";
 
     patches = [
+      # Support for NIX_SSL_CERT_FILE, motivation:
+      # https://github.com/NixOS/nixpkgs/commit/942dbf89c6120cb5b52fb2ab456855d1fbf2994e
       ./3.0/nix-ssl-cert-file.patch
 
       # openssl will only compile in KTLS if the current kernel supports it.
       # This patch disables build-time detection.
       ./3.0/openssl-disable-kernel-detection.patch
 
+      # Look up SSL certificates in /etc rather than the immutable installation directory
       (
         if stdenv.hostPlatform.isDarwin then
           ./3.5/use-etc-ssl-certs-darwin.patch

From 9e4cf668a33a2478058b4b64b8e4ec1a88876645 Mon Sep 17 00:00:00 2001
From: Markus Theil <theil.markus@gmail.com>
Date: Wed, 1 Oct 2025 13:18:01 +0200
Subject: [PATCH 0304/6226] openssl_3: 3.0.17 -> 3.0.18

Changelog:
https://github.com/openssl/openssl/blob/openssl-3.0/CHANGES.md#changes-between-3017-and-3018-30-sep-2025

Fixed CVEs:
- CVE-2025-9230
- CVE-2025-9232

Signed-off-by: Markus Theil <theil.markus@gmail.com>
---
 pkgs/development/libraries/openssl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 1d114d12996c..963e223858b0 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -371,8 +371,8 @@ in
   };
 
   openssl_3 = common {
-    version = "3.0.17";
-    hash = "sha256-39135OobV/86bb3msL3D8x21rJnn/dTq+eH7tuwtuM4=";
+    version = "3.0.18";
+    hash = "sha256-2Aw09c+QLczx8bXfXruG0DkuNwSeXXPfGzq65y5P/os=";
 
     patches = [
       # Support for NIX_SSL_CERT_FILE, motivation:

From b82da17cd5e7ca51856b8975bafa9fc537a1c9e1 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Wed, 1 Oct 2025 20:18:25 +0200
Subject: [PATCH 0305/6226] python3Packages.pysmart: 1.4.1 -> 1.4.2

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

diff --git a/pkgs/development/python-modules/pysmart/default.nix b/pkgs/development/python-modules/pysmart/default.nix
index a9f460678924..b558d274f0e7 100644
--- a/pkgs/development/python-modules/pysmart/default.nix
+++ b/pkgs/development/python-modules/pysmart/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "pysmart";
-  version = "1.4.1";
+  version = "1.4.2";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "truenas";
     repo = "py-SMART";
     tag = "v${version}";
-    hash = "sha256-eVrJ83MTIlu7sDrOoaXwiWqxYmDJFU8tf+pb3ui9N5w=";
+    hash = "sha256-h9FBAoNYLs5XvLxSajyktCCcNgiT7mIp472C+fbqZFA=";
   };
 
   postPatch = ''

From 87c0c5e50cc5252a609a3e2445b7e67a8c822dff Mon Sep 17 00:00:00 2001
From: Markus Theil <theil.markus@gmail.com>
Date: Wed, 1 Oct 2025 13:18:18 +0200
Subject: [PATCH 0306/6226] openssl: 3.5.2 -> 3.6.0

Changelog (security fixes):
https://github.com/openssl/openssl/blob/openssl-3.5/CHANGES.md#changes-between-353-and-354-30-sep-2025

Changelog (features):
https://github.com/openssl/openssl/blob/openssl-3.6/CHANGES.md#changes-between-35-and-360-1-oct-2025

Notably:
- more work on PQC algorithms (LMS)
- performance improvements for some assembly implementations

Fixed CVEs:
- CVE-2025-9230
- CVE-2025-9231
- CVE-2025-9232

Signed-off-by: Markus Theil <theil.markus@gmail.com>
---
 pkgs/development/libraries/openssl/default.nix | 6 +++---
 pkgs/top-level/all-packages.nix                | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 963e223858b0..02805a54003b 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -396,9 +396,9 @@ in
     };
   };
 
-  openssl_3_5 = common {
-    version = "3.5.2";
-    hash = "sha256-xTpH5eRByTDDkoz3v2+wDl0Sm2MOCqhzsIJYZW5zRew=";
+  openssl_3_6 = common {
+    version = "3.6.0";
+    hash = "sha256-tqX0S362nj+jXb8VUkQFtEg3pIHUPYHa3d4/8h/LuOk=";
 
     patches = [
       # Support for NIX_SSL_CERT_FILE, motivation:
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 24b72e37e98c..3976f2e5cf6f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8462,7 +8462,7 @@ with pkgs;
 
   libressl = libressl_4_1;
 
-  openssl = openssl_3_5;
+  openssl = openssl_3_6;
 
   openssl_legacy = openssl.override {
     conf = ../development/libraries/openssl/3.0/legacy.cnf;
@@ -8471,7 +8471,7 @@ with pkgs;
   inherit (callPackages ../development/libraries/openssl { })
     openssl_1_1
     openssl_3
-    openssl_3_5
+    openssl_3_6
     ;
 
   pcre = callPackage ../development/libraries/pcre { };

From d954e11ca1a3444701fcc11bc9d4a2f98ec849d1 Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Wed, 17 Sep 2025 21:54:22 +0300
Subject: [PATCH 0307/6226] cups-filters: fix build with gcc15

- add patch from merged upstream PR:
https://www.github.com/OpenPrinting/cups-filters/pull/618
https://github.com/OpenPrinting/cups-filters/commit/9871a50b5c1f9c2caa2754aac1f5db70c886021b

Fixes build failure with gcc15:
```
filter/foomatic-rip/renderer.c: In function 'exec_kid3':
filter/foomatic-rip/renderer.c:456:32: error: passing argument 2 of
'start_process' from incompatible pointer type [-Wincompatible-pointer-types]
  456 |   kid4 = start_process("kid4", exec_kid4, NULL, &kid4in, NULL);
      |                                ^~~~~~~~~
      |                                |
      |                                int (*)(FILE *, FILE *, void *)
In file included from filter/foomatic-rip/renderer.c:21:
filter/foomatic-rip/process.h:21:45: note: expected 'int (*)(void)' but
argument is of type 'int (*)(FILE *, FILE *, void *)'
   21 | pid_t start_process(const char *name, int (*proc_func)(), void *user_arg,
      |                                       ~~~~~~^~~~~~~~~~~~
filter/foomatic-rip/renderer.c:384:1: note: 'exec_kid4' declared here
  384 | exec_kid4(FILE *in,
      | ^~~~~~~~~
filter/foomatic-rip/process.c:231:1: error: conflicting types for 'start_process';
have 'pid_t(const char *, int (*)(FILE *, FILE *, void *), void *, FILE **, FILE **)'
{aka 'int(const char *, int (*)(FILE *, FILE *, void *), void *, FILE **, FILE **)'}
  231 | start_process(const char *name,
      | ^~~~~~~~~~~~~
In file included from filter/foomatic-rip/process.c:14:
filter/foomatic-rip/process.h:21:7: note: previous declaration of 'start_process'
with type 'pid_t(const char *, int (*)(void), void *, FILE **, FILE **)'
{aka 'int(const char *, int (*)(void), void *, FILE **, FILE **)'}
   21 | pid_t start_process(const char *name, int (*proc_func)(), void *user_arg,
      |       ^~~~~~~~~~~~~
```
---
 pkgs/by-name/cu/cups-filters/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/cu/cups-filters/package.nix b/pkgs/by-name/cu/cups-filters/package.nix
index a5468f00fecc..0abca6114c34 100644
--- a/pkgs/by-name/cu/cups-filters/package.nix
+++ b/pkgs/by-name/cu/cups-filters/package.nix
@@ -6,6 +6,7 @@
   dbus,
   dejavu_fonts,
   fetchFromGitHub,
+  fetchpatch,
   fontconfig,
   gawk,
   ghostscript,
@@ -62,6 +63,16 @@
         hash = "sha256-bLOl64bdeZ10JLcQ7GbU+VffJu3Lzo0ves7O7GQIOWY=";
       };
 
+      patches = [
+        # Fix build with gcc15
+        # https://github.com/OpenPrinting/cups-filters/pull/618
+        (fetchpatch {
+          name = "cups-filters-fix-build-with-gcc15-c23.patch";
+          url = "https://github.com/OpenPrinting/cups-filters/commit/9871a50b5c1f9c2caa2754aac1f5db70c886021b.patch";
+          hash = "sha256-Hu3nCHzX6K4tD7T5XIt0dh6GPQxmgfuHqbBXWfdXxoA=";
+        })
+      ];
+
       strictDeps = true;
 
       nativeBuildInputs = [

From 11dfc21f233d30cb08a4709655f35df2c253458f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 19:27:19 +0000
Subject: [PATCH 0308/6226] ocamlPackages.unisim_archisec: 0.0.12 -> 0.0.13

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

diff --git a/pkgs/development/ocaml-modules/unisim_archisec/default.nix b/pkgs/development/ocaml-modules/unisim_archisec/default.nix
index df40282928bb..e214002f1273 100644
--- a/pkgs/development/ocaml-modules/unisim_archisec/default.nix
+++ b/pkgs/development/ocaml-modules/unisim_archisec/default.nix
@@ -6,11 +6,11 @@
 
 buildDunePackage {
   pname = "unisim_archisec";
-  version = "0.0.12";
+  version = "0.0.13";
 
   src = fetchurl {
-    url = "https://github.com/binsec/unisim_archisec/releases/download/0.0.12/unisim_archisec-0.0.12.tbz";
-    sha256 = "sha256-RJKyyrQy4zrI3S9e7q3W5UbwsGnSlItXq6X0n69UsL8=";
+    url = "https://github.com/binsec/unisim_archisec/releases/download/0.0.13/unisim_archisec-0.0.13.tbz";
+    sha256 = "sha256-pDLbsF6n4HSGQyWWEb7/RWK+nCWfS+p6Dy/G5jlnlk0=";
   };
 
   duneVersion = "3";

From 9ba559c8d90ac55b795f51bc6d0d6ec9fb2a7f9f Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 30 Sep 2025 21:07:54 +0100
Subject: [PATCH 0309/6226] nixosTests.installer.swraid: enable
 --bitmap=internal (fix interactive hang)

Co-authored-by: Philip Taron <philip.taron@gmail.com>
---
 nixos/tests/installer.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix
index e68b8eca5f21..893595ec2923 100644
--- a/nixos/tests/installer.nix
+++ b/nixos/tests/installer.nix
@@ -1451,9 +1451,9 @@ in
           "cat /proc/partitions >&2",
           "udevadm control --stop-exec-queue",
           "mdadm --create --force /dev/md0 --metadata 1.2 --level=raid1 "
-          + "--raid-devices=2 /dev/vda5 /dev/vda6",
+          + "--raid-devices=2 --bitmap=internal /dev/vda5 /dev/vda6",
           "mdadm --create --force /dev/md1 --metadata 1.2 --level=raid1 "
-          + "--raid-devices=2 /dev/vda7 /dev/vda8",
+          + "--raid-devices=2 --bitmap=internal /dev/vda7 /dev/vda8",
           "udevadm control --start-exec-queue",
           "udevadm settle",
           "mkswap -f /dev/md1 -L swap",

From 693d4474a35984967f4014c07e6c33b2f315df15 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 30 Sep 2025 21:09:00 +0100
Subject: [PATCH 0310/6226] nixosTests.systemd-initrd-swraid: enable
 --bitmap=internal (fix interactive hang)

---
 nixos/tests/systemd-initrd-swraid.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/systemd-initrd-swraid.nix b/nixos/tests/systemd-initrd-swraid.nix
index 933b2ad41056..1a504a4ae4e0 100644
--- a/nixos/tests/systemd-initrd-swraid.nix
+++ b/nixos/tests/systemd-initrd-swraid.nix
@@ -48,7 +48,7 @@
 
   testScript = ''
     # Create RAID
-    machine.succeed("mdadm --create --force /dev/md0 -n 2 --level=raid1 /dev/vdb /dev/vdc --metadata=0.90")
+    machine.succeed("mdadm --create --force /dev/md0 -n 2 --level=raid1 /dev/vdb /dev/vdc --metadata=0.90 --bitmap=internal")
     machine.succeed("mkfs.ext4 -L testraid /dev/md0")
     machine.succeed("mkdir -p /mnt && mount /dev/md0 /mnt && echo hello > /mnt/test && umount /mnt")
 

From 80ef20e21030152b8cf5ca32f7a446445808946e Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 29 Aug 2025 21:47:30 +0100
Subject: [PATCH 0311/6226] mdadm: 4.3 -> 4.4

While at it added trivial updater and `nixosTests`
broken by this `mdadm` update.

Changes: https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/tree/CHANGELOG.md?h=mdadm-4.4
---
 pkgs/by-name/md/mdadm4/package.nix | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/md/mdadm4/package.nix b/pkgs/by-name/md/mdadm4/package.nix
index 7806e313f583..f2d69266ac17 100644
--- a/pkgs/by-name/md/mdadm4/package.nix
+++ b/pkgs/by-name/md/mdadm4/package.nix
@@ -8,15 +8,17 @@
   system-sendmail,
   udev,
   udevCheckHook,
+  gitUpdater,
+  nixosTests,
 }:
 
 stdenv.mkDerivation rec {
   pname = "mdadm";
-  version = "4.3";
+  version = "4.4";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/raid/mdadm/mdadm-${version}.tar.xz";
-    sha256 = "sha256-QWcnrh8QgOpuMJDOo23QdoJvw2kVHjarc2VXupIZb58=";
+    sha256 = "sha256-m0iPNe0VPfmZJLX+Qe7TgOhRLejxihGGKMrN1oGx1XM=";
   };
 
   patches = [
@@ -32,10 +34,6 @@ stdenv.mkDerivation rec {
       url = "https://lore.kernel.org/linux-raid/20240220165158.3521874-1-raj.khem@gmail.com/raw";
       hash = "sha256-JOZ8n7zi+nq236NPpB4e2gUy8I3l3DbcoLhpeL73f98=";
     })
-    (fetchurl {
-      url = "https://github.com/md-raid-utilities/mdadm/commit/9dbd11e091f84eb0bf9d717283774816c4c4453d.patch";
-      hash = "sha256-8GdjP1ceVwejTOFXcHXG8wkIF9/D6hOUGD6btvuqs24=";
-    })
   ];
 
   makeFlags = [
@@ -80,6 +78,17 @@ stdenv.mkDerivation rec {
     grep -r $out $out/bin && false || true
   '';
 
+  passthru = {
+    tests = {
+      inherit (nixosTests) systemd-initrd-swraid;
+      installer-swraid = nixosTests.installer.swraid;
+    };
+    updateScript = gitUpdater {
+      url = "https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git";
+      rev-prefix = "mdadm-";
+    };
+  };
+
   meta = with lib; {
     description = "Programs for managing RAID arrays under Linux";
     homepage = "https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git";

From 273665be35cb1cc0e07fc38d9337b51f53944735 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 1 Oct 2025 21:26:40 +0100
Subject: [PATCH 0312/6226] libjodycode: 4.0.1 -> 4.1

Changes: https://codeberg.org/jbruchon/libjodycode/src/tag/v4.1/CHANGES.txt
---
 pkgs/by-name/li/libjodycode/package.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libjodycode/package.nix b/pkgs/by-name/li/libjodycode/package.nix
index 1313041f2f1b..072fd1519689 100644
--- a/pkgs/by-name/li/libjodycode/package.nix
+++ b/pkgs/by-name/li/libjodycode/package.nix
@@ -2,13 +2,14 @@
   lib,
   stdenv,
   fetchFromGitea,
+  fetchpatch,
   jdupes,
   fixDarwinDylibNames,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libjodycode";
-  version = "4.0.1";
+  version = "4.1";
 
   outputs = [
     "out"
@@ -21,9 +22,18 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "jbruchon";
     repo = "libjodycode";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-9YdDw7xIuAArQtPYhDeT4AhSwi5fhVJeBl3R+J7PaCw=";
+    hash = "sha256-IBOCl5iFxKwanA28JG4wEzy9tNb6TznKK8RJET8CtSY=";
   };
 
+  patches = [
+    # Fix linux build failure, drop after 4.1 release.
+    (fetchpatch {
+      name = "linux-build-fix.patch";
+      url = "https://codeberg.org/jbruchon/libjodycode/commit/07294bbfd6c3c4be42c40c9ed81eebb5cd3d83a0.patch";
+      hash = "sha256-qgP8MgGenGebM7n5zpPJ1WTsYUTCZwcWUloUKToc1eo=";
+    })
+  ];
+
   nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   env.PREFIX = placeholder "out";

From c9c144ddc171c37e1b8c3d5756600a439d23d6b2 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 1 Oct 2025 21:27:50 +0100
Subject: [PATCH 0313/6226] jdupes: 1.29.0 -> 1.31.1

Changes: https://codeberg.org/jbruchon/jdupes/src/tag/v1.31.1/CHANGES.txt
---
 pkgs/by-name/jd/jdupes/package.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/jd/jdupes/package.nix b/pkgs/by-name/jd/jdupes/package.nix
index a49d0c6c84c8..226e316306ad 100644
--- a/pkgs/by-name/jd/jdupes/package.nix
+++ b/pkgs/by-name/jd/jdupes/package.nix
@@ -7,14 +7,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jdupes";
-  version = "1.29.0";
+  version = "1.31.1";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "jbruchon";
     repo = "jdupes";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ddl1GCA96j5H6C9KTtJudQ4wSUeOGA6p4P8JPbsVr9o=";
+    hash = "sha256-I1DtJokp43K9nZt73od4esK705nosIWEHLw4lydufbE=";
     # Unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation. The testdir
     # directories have such files and will be removed.
@@ -29,8 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
     "PREFIX=${placeholder "out"}"
     # don't link with ../libjodycode
     "IGNORE_NEARBY_JC=1"
-    # link with system libjodycode (this case is erroneously missing in v1.29.0)
-    "LDFLAGS_EXTRA=-ljodycode"
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     "ENABLE_DEDUPE=1"

From 52e517715280b3bbe71e8a0ce4b1d968be7812b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 20:58:50 +0000
Subject: [PATCH 0314/6226] bazel_8: 8.4.1 -> 8.4.2

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

diff --git a/pkgs/by-name/ba/bazel_8/package.nix b/pkgs/by-name/ba/bazel_8/package.nix
index b9df5ed26eb1..03dca612360d 100644
--- a/pkgs/by-name/ba/bazel_8/package.nix
+++ b/pkgs/by-name/ba/bazel_8/package.nix
@@ -31,7 +31,7 @@
   cctools,
   # Allow to independently override the jdks used to build and run respectively
   jdk_headless,
-  version ? "8.4.1",
+  version ? "8.4.2",
 }:
 
 let
@@ -45,7 +45,7 @@ let
 
   src = fetchzip {
     url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip";
-    hash = "sha256-DqJqW7C1QODOS+vJrs/+ixsP3coZh80VdpPM4g0vxFI=";
+    hash = "sha256-5oNYKHPaDkpunl6oC104Rh1wAEMWfLfvCFdGHlXZn4o=";
     stripRoot = false;
   };
 

From fddc3385c5cde20933f6228bc6d9d475f7c687c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 1 Oct 2025 21:39:28 +0000
Subject: [PATCH 0315/6226] python3Packages.ollama: 0.5.3 -> 0.6.0

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

diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix
index 684091aa6049..cee610f3b5ba 100644
--- a/pkgs/development/python-modules/ollama/default.nix
+++ b/pkgs/development/python-modules/ollama/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "ollama";
-  version = "0.5.3";
+  version = "0.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama-python";
     tag = "v${version}";
-    hash = "sha256-QpG8bo6tarhW4NpdD4MQ9DWR/w8KjT2zEQyirYtTjJ0=";
+    hash = "sha256-4GvONxyv3/+mago/AHp5zbfoiKskKxiDZR1h+OhVbPU=";
   };
 
   pythonRelaxDeps = [ "httpx" ];

From bf08457bd10357977e402db44a11570776164fe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 1 Oct 2025 14:48:24 -0700
Subject: [PATCH 0316/6226] python3Packages.libpass: 1.9.1.post0 -> 1.9.2

Diff: https://github.com/ThirVondukr/passlib/compare/1.9.1.post0...1.9.2

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

diff --git a/pkgs/development/python-modules/libpass/default.nix b/pkgs/development/python-modules/libpass/default.nix
index 80480c9e22c8..834d0b512b9e 100644
--- a/pkgs/development/python-modules/libpass/default.nix
+++ b/pkgs/development/python-modules/libpass/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "libpass";
-  version = "1.9.1.post0";
+  version = "1.9.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ThirVondukr";
     repo = "passlib";
     tag = version;
-    hash = "sha256-4J18UktqllRA8DVdHL4AJUuAkjZRdUjiql9a71XXhCA=";
+    hash = "sha256-xL+92LdZxCH+yu2vz2AC44b4EYiGJbWfPkoSO3mSSjw=";
   };
 
   build-system = [ hatchling ];

From 9329f75aa91299620b4621f8cbdd0cd7257b66b8 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 1 Oct 2025 20:45:49 -0400
Subject: [PATCH 0317/6226] syncall: drop

Has been marked broken for at least a full release cycle.

Dropping per RFC 180.
---
 pkgs/by-name/sy/syncall/package.nix | 77 -----------------------------
 pkgs/top-level/aliases.nix          |  1 +
 2 files changed, 1 insertion(+), 77 deletions(-)
 delete mode 100644 pkgs/by-name/sy/syncall/package.nix

diff --git a/pkgs/by-name/sy/syncall/package.nix b/pkgs/by-name/sy/syncall/package.nix
deleted file mode 100644
index 9cfcd9599b05..000000000000
--- a/pkgs/by-name/sy/syncall/package.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  lib,
-  python3,
-  fetchFromGitHub,
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "syncall";
-  version = "1.8.5";
-  format = "pyproject";
-
-  src = fetchFromGitHub {
-    owner = "bergercookie";
-    repo = "syncall";
-    rev = "v${version}";
-    hash = "sha256-f9WVZ1gpVG0wvIqoAkeaYBE4QsGXSqrYS4KyHy6S+0Q=";
-  };
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-    --replace-fail 'loguru = "^0.5.3"' 'loguru = "^0.7"' \
-    --replace-fail 'PyYAML = "~5.3.1"' 'PyYAML = "^6.0"' \
-    --replace-fail 'bidict = "^0.21.2"' 'bidict = "^0.23"' \
-    --replace-fail 'typing = "^3.7.4"' '''
-  '';
-
-  nativeBuildInputs = [
-    python3.pkgs.poetry-core
-    python3.pkgs.poetry-dynamic-versioning
-  ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    bidict
-    bubop
-    click
-    item-synchronizer
-    loguru
-    python-dateutil
-    pyyaml
-    rfc3339
-    typing
-
-    # asana optional-dep
-    asana
-    # caldav optional-dep
-    caldav
-    icalendar
-    # fs optional-dep
-    xattr
-    # gkeep optional-dep
-    # gkeepapi is unavailable in nixpkgs
-    # google optional-dep
-    google-api-python-client
-    google-auth-oauthlib
-    # notion optional-dep
-    # FIXME: notion-client -- broken, doesn't build.
-    # taskwarrior optional-dep
-    taskw-ng
-  ];
-
-  postInstall = ''
-    # We do not support gkeep
-    rm $out/bin/tw_gkeep_sync
-  '';
-
-  pythonImportsCheck = [ "syncall" ];
-
-  meta = with lib; {
-    description = "Bi-directional synchronization between services such as Taskwarrior, Google Calendar, Notion, Asana, and more";
-    homepage = "https://github.com/bergercookie/syncall";
-    license = licenses.mit;
-    maintainers = with maintainers; [ raitobezarius ];
-    # Upstream issue making it practically unusable:
-    # https://github.com/bergercookie/syncall/issues/99
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1911c58b7e7c..0bdbfeda8d6d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2449,6 +2449,7 @@ mapAliases {
   symbiyosys = sby; # Added 2024-08-18
   syn2mas = throw "'syn2mas' has been removed. It has been integrated into the main matrix-authentication-service CLI as a subcommand: 'mas-cli syn2mas'."; # Added 2025-07-07
   sync = taler-sync; # Added 2024-09-04
+  syncall = "'syncall' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   syncthing-cli = throw "'syncthing-cli' has been renamed to/replaced by 'syncthing'"; # Converted to throw 2024-10-17
   syncthingtray-qt6 = syncthingtray; # Added 2024-03-06
   syncthing-tray = throw "syncthing-tray has been removed because it is broken and unmaintained"; # Added 2025-05-18

From b8f1d99ca276591e469301b2b7fda2acaf0c43c6 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 1 Oct 2025 22:07:07 -0400
Subject: [PATCH 0318/6226] python3Packages.tree-sitter-zeek: init at 0.2.9

---
 .../tree-sitter-zeek/default.nix              | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/tree-sitter-zeek/default.nix

diff --git a/pkgs/development/python-modules/tree-sitter-zeek/default.nix b/pkgs/development/python-modules/tree-sitter-zeek/default.nix
new file mode 100644
index 000000000000..6cf9524de186
--- /dev/null
+++ b/pkgs/development/python-modules/tree-sitter-zeek/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  tree-sitter,
+}:
+
+buildPythonPackage rec {
+  pname = "tree-sitter-zeek";
+  version = "0.2.9";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "zeek";
+    repo = "tree-sitter-zeek";
+    tag = "v${version}";
+    hash = "sha256-0ixZAJ940mYIPD//RJVJ3PAVdY/jtYNJ5+WIlq+zfnY=";
+  };
+
+  build-system = [ setuptools ];
+
+  optional-dependencies = {
+    core = [ tree-sitter ];
+  };
+
+  pythonImportsCheck = [ "tree_sitter_zeek" ];
+
+  meta = {
+    description = "Tree-sitter grammar for the Zeek scripting language";
+    homepage = "https://github.com/zeek/tree-sitter-zeek";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
+      mdaniels5757
+    ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9cf17237c5b1..c4fc4b16a77e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18715,6 +18715,8 @@ self: super: with self; {
 
   tree-sitter-yaml = callPackage ../development/python-modules/tree-sitter-yaml { };
 
+  tree-sitter-zeek = callPackage ../development/python-modules/tree-sitter-zeek { };
+
   treelib = callPackage ../development/python-modules/treelib { };
 
   treelog = callPackage ../development/python-modules/treelog { };

From 5d91f7b013cd8cadb481abf2fa3cdfe892e04c5e Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 2 Oct 2025 06:56:28 +0100
Subject: [PATCH 0319/6226] libdrm: 2.4.125 -> 2.4.126

Changes: https://lists.x.org/archives/xorg-announce/2025-October/003632.html
---
 pkgs/by-name/li/libdrm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libdrm/package.nix b/pkgs/by-name/li/libdrm/package.nix
index ccd9f305f564..748ff4e811dc 100644
--- a/pkgs/by-name/li/libdrm/package.nix
+++ b/pkgs/by-name/li/libdrm/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libdrm";
-  version = "2.4.125";
+  version = "2.4.126";
 
   src = fetchurl {
     url = "https://dri.freedesktop.org/${pname}/${pname}-${version}.tar.xz";
-    hash = "sha256-1LrpJ5elD4GpNSR2LgQQpJzYTPoPmXeVvAFyrI+x2Wo=";
+    hash = "sha256-bKsW1NJZtqvJ9IUjOGNFQRSjwwfsqAZnmq0+2+lnv0I=";
   };
 
   outputs = [

From 02720349e3a57029e0baff510f5a5b44a9a8313d Mon Sep 17 00:00:00 2001
From: blenderfreaky <blenderfreaky@mailbox.org>
Date: Sun, 24 Aug 2025 14:40:41 +0200
Subject: [PATCH 0320/6226] python3Packages.color-matcher: init at 0.6.0

---
 .../python-modules/color-matcher/default.nix  | 51 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/python-modules/color-matcher/default.nix

diff --git a/pkgs/development/python-modules/color-matcher/default.nix b/pkgs/development/python-modules/color-matcher/default.nix
new file mode 100644
index 000000000000..330c3adba7a7
--- /dev/null
+++ b/pkgs/development/python-modules/color-matcher/default.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchPypi,
+  setuptools,
+  numpy,
+  imageio,
+  docutils,
+  ddt,
+  matplotlib,
+}:
+let
+  pname = "color-matcher";
+  version = "0.6.0";
+in
+buildPythonPackage {
+  inherit pname version;
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-e6igB4LD5eWTHdp7H7nFcqzoLeDGyXZUQyt8/gqnSEM=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    numpy
+    imageio
+    docutils
+    ddt
+    matplotlib
+  ];
+
+  postPatch = ''
+    ln -s */requires.txt requirements.txt
+  '';
+
+  # Some tests are broken and many require internet access
+  doCheck = false;
+
+  meta = {
+    description = "Package enabling color transfer across images";
+    homepage = "https://github.com/hahnec/color-matcher";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ blenderfreaky ];
+    # requires py2app which is not packaged for darwin
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6d8c838dba4f..2d33c22e5de2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2835,6 +2835,8 @@ self: super: with self; {
 
   collidoscope = callPackage ../development/python-modules/collidoscope { };
 
+  color-matcher = callPackage ../development/python-modules/color-matcher { };
+
   color-operations = callPackage ../development/python-modules/color-operations { };
 
   color-parser-py = callPackage ../development/python-modules/color-parser-py { };

From 685f0347ce824bae281065c3678206c26be46afc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 15 Jul 2025 21:19:51 -0700
Subject: [PATCH 0321/6226] python3Packages.pytest-xdist: use fetchFromGitHub

---
 .../python-modules/pytest-xdist/default.nix   | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-xdist/default.nix b/pkgs/development/python-modules/pytest-xdist/default.nix
index 3fd5f57fc93c..55fcd3b06162 100644
--- a/pkgs/development/python-modules/pytest-xdist/default.nix
+++ b/pkgs/development/python-modules/pytest-xdist/default.nix
@@ -1,8 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  pythonOlder,
+  fetchFromGitHub,
   setuptools,
   setuptools-scm,
   pytestCheckHook,
@@ -16,14 +15,13 @@
 buildPythonPackage rec {
   pname = "pytest-xdist";
   version = "3.8.0";
-  disabled = pythonOlder "3.7";
-
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "pytest_xdist";
-    inherit version;
-    hash = "sha256-fleBJeybxgUIYaqT8tWfHY0IVZXWVRwskLb0+tjTqfE=";
+  src = fetchFromGitHub {
+    owner = "pytest-dev";
+    repo = "pytest-xdist";
+    tag = "v${version}";
+    hash = "sha256-2x3znm92wo8DCshf5sYK0stnESg0oVXbxsWRAaTj6oQ=";
   };
 
   build-system = [
@@ -66,11 +64,11 @@ buildPythonPackage rec {
 
   setupHook = ./setup-hook.sh;
 
-  meta = with lib; {
-    changelog = "https://github.com/pytest-dev/pytest-xdist/blob/v${version}/CHANGELOG.rst";
-    description = "Pytest xdist plugin for distributed testing and loop-on-failing modes";
+  meta = {
+    changelog = "https://github.com/pytest-dev/pytest-xdist/blob/${src.tag}/CHANGELOG.rst";
+    description = "Pytest plugin for distributed testing";
     homepage = "https://github.com/pytest-dev/pytest-xdist";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }

From cf01a2caf8547c96545348637b0a62dc527617ca Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 1 Oct 2025 22:11:43 -0400
Subject: [PATCH 0322/6226] zeekscript: 1.2.8 -> 1.3.2-unstable-2025-09-29;
 unbreak; modernize

Diff: https://github.com/zeek/zeekscript/compare/v1.2.8...f0fa5746633a709759a94695fcc81b43feb8e2d9

Changelog: https://github.com/zeek/zeekscript/blob/f0fa5746633a709759a94695fcc81b43feb8e2d9/CHANGES
---
 pkgs/by-name/ze/zeekscript/package.nix | 37 ++++++++++++++------------
 1 file changed, 20 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/ze/zeekscript/package.nix b/pkgs/by-name/ze/zeekscript/package.nix
index fc81ec1b707c..1570a8149ee9 100644
--- a/pkgs/by-name/ze/zeekscript/package.nix
+++ b/pkgs/by-name/ze/zeekscript/package.nix
@@ -1,32 +1,36 @@
 {
   lib,
   python3,
-  fetchPypi,
+  fetchFromGitHub,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "zeekscript";
-  version = "1.2.8";
+  version = "1.3.2-unstable-2025-09-29";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-v0PJY0Ahxa4k011AwtWSIAWBXvt3Aybrd382j1SIT6M=";
+  src = fetchFromGitHub {
+    owner = "zeek";
+    repo = "zeekscript";
+    rev = "f0fa5746633a709759a94695fcc81b43feb8e2d9";
+    hash = "sha256-g4Iv9xw6Owuqi+UudRzWatK09mjNDWdp0cBvH7iuV+U=";
   };
 
-  postPatch = ''
-    sed -i '/name = "zeekscript"/a version = "${version}"' pyproject.toml
-  '';
+  build-system = with python3.pkgs; [ setuptools ];
 
-  nativeBuildInputs = with python3.pkgs; [
-    setuptools
-    wheel
-  ];
-
-  propagatedBuildInputs = with python3.pkgs; [
+  dependencies = with python3.pkgs; [
+    argcomplete
     tree-sitter
+    tree-sitter-zeek
   ];
 
+  nativeCheckInputs = with python3.pkgs; [
+    pytestCheckHook
+    pytest-cov-stub
+  ];
+
+  checkInputs = with python3.pkgs; [ syrupy ];
+
   pythonImportsCheck = [
     "zeekscript"
   ];
@@ -34,13 +38,12 @@ python3.pkgs.buildPythonApplication rec {
   meta = {
     description = "Zeek script formatter and analyzer";
     homepage = "https://github.com/zeek/zeekscript";
-    changelog = "https://github.com/zeek/zeekscript/blob/v${version}/CHANGES";
+    changelog = "https://github.com/zeek/zeekscript/blob/${src.rev}/CHANGES";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       fab
       tobim
+      mdaniels5757
     ];
-    # Incompatible with tree-sitter > 0.21.
-    broken = true;
   };
 }

From 12db2344c7d68571d2b9cebb6e396a724b897e6f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 2 Oct 2025 17:41:32 +0200
Subject: [PATCH 0323/6226] python3Packages.django_4: 4.2.24 -> 4.2.25
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://docs.djangoproject.com/en/4.2/releases/4.2.25/
https://www.djangoproject.com/weblog/2025/oct/01/security-releases/

Fixes: CVE-2025-59681, CVE-2025-59682
---
 pkgs/development/python-modules/django/4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix
index 6cba9d6d9b65..a661b22f939f 100644
--- a/pkgs/development/python-modules/django/4.nix
+++ b/pkgs/development/python-modules/django/4.nix
@@ -45,7 +45,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "4.2.24";
+  version = "4.2.25";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -54,7 +54,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-zDPK30u2QFbHCqnlTMqF1w9iN2sPDphhyKU1u+Mp5ho=";
+    hash = "sha256-HUNKvLDLZ1VmcyIN0QVMUJZgmd1zBulhzGzGgkZ/84E=";
   };
 
   patches = [

From 3741d17b7172e142aee2e6a3cb9fe87c4ac9d86f Mon Sep 17 00:00:00 2001
From: Dmitry Ivankov <boltzmannrain@gmail.com>
Date: Thu, 2 Oct 2025 19:44:39 +0200
Subject: [PATCH 0324/6226] bazel_8: fix update for darwin

---
 pkgs/by-name/ba/bazel_8/package.nix                    |  2 --
 .../ba/bazel_8/patches/apple_cc_toolchain.patch        |  4 ++--
 pkgs/by-name/ba/bazel_8/patches/xcode.patch            | 10 +++-------
 3 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ba/bazel_8/package.nix b/pkgs/by-name/ba/bazel_8/package.nix
index 03dca612360d..f378d1cd2be9 100644
--- a/pkgs/by-name/ba/bazel_8/package.nix
+++ b/pkgs/by-name/ba/bazel_8/package.nix
@@ -144,9 +144,7 @@ stdenv.mkDerivation rec {
     # Nixpkgs toolcahins do not support that (yet?) and get confused.
     # Also add an explicit /usr/bin prefix that will be patched below.
     (replaceVars ./patches/xcode.patch {
-      usrBinEnv = "${coreutils}/bin/env";
       clangDarwin = "${stdenv.cc}/bin/clang";
-      codesign = "${darwin.sigtool}/bin/codesign";
     })
 
     # Revert preference for apple_support over rules_cc toolchain for now
diff --git a/pkgs/by-name/ba/bazel_8/patches/apple_cc_toolchain.patch b/pkgs/by-name/ba/bazel_8/patches/apple_cc_toolchain.patch
index 4a72bbd5e6f5..9dcd1ba1ac12 100644
--- a/pkgs/by-name/ba/bazel_8/patches/apple_cc_toolchain.patch
+++ b/pkgs/by-name/ba/bazel_8/patches/apple_cc_toolchain.patch
@@ -8,11 +8,11 @@ index b3dde1c838..a54bf8141d 100644
  
 -# Depend on apple_support first and then rules_cc so that the Xcode toolchain
 -# from apple_support wins over the generic Unix toolchain from rules_cc.
--bazel_dep(name = "apple_support", version = "1.18.1")
+-bazel_dep(name = "apple_support", version = "1.23.1")
 +# Not Depend on apple_support first and then rules_cc so that the Xcode toolchain
 +# from apple_support not wins over the generic Unix toolchain from rules_cc.
  bazel_dep(name = "rules_cc", version = "0.1.1")
-+bazel_dep(name = "apple_support", version = "1.18.1")
++bazel_dep(name = "apple_support", version = "1.23.1")
  
  # repo_name needs to be used, until WORKSPACE mode is to be supported in bazel_tools
  bazel_dep(name = "protobuf", version = "29.0", repo_name = "com_google_protobuf")
diff --git a/pkgs/by-name/ba/bazel_8/patches/xcode.patch b/pkgs/by-name/ba/bazel_8/patches/xcode.patch
index 52931a34f354..1dd1ad2cb33d 100644
--- a/pkgs/by-name/ba/bazel_8/patches/xcode.patch
+++ b/pkgs/by-name/ba/bazel_8/patches/xcode.patch
@@ -12,20 +12,16 @@ index 1bad14cba7..d312fe08bb 100755
    cp tools/osx/xcode_locator_stub.sh ${ARCHIVE_DIR}/xcode-locator
  fi
 diff --git a/tools/osx/BUILD b/tools/osx/BUILD
-index 0358fb0ffe..1e6eae1f33 100644
+index 5b99589ad4..3d3269772b 100644
 --- a/tools/osx/BUILD
 +++ b/tools/osx/BUILD
-@@ -27,9 +27,9 @@ exports_files([
+@@ -27,7 +27,7 @@ exports_files([
  ])
  
  DARWIN_XCODE_LOCATOR_COMPILE_COMMAND = """
 -  /usr/bin/xcrun --sdk macosx clang -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \
--      -framework Foundation -arch arm64 -arch x86_64 -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \
--  env -i codesign --identifier $@ --force --sign - $@
 +  @clangDarwin@ -mmacosx-version-min=10.13 -fobjc-arc -framework CoreServices \
-+      -framework Foundation -Wl,-no_adhoc_codesign -Wl,-no_uuid -o $@ $< && \
-+  @usrBinEnv@ @codesign@ --identifier $@ --force --sign - $@
+       -framework Foundation -arch arm64 -arch x86_64 -o $@ $<
  """
  
- genrule(
 

From c017fa968d5d83c443e172c9dbfe3b3cf8dcff51 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 20 Sep 2025 13:03:27 +0200
Subject: [PATCH 0325/6226] libxml2: 2.14.6 -> 2.15.0

Rel notes: https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.15.0

closes https://github.com/NixOS/nixpkgs/issues/444172
---
 pkgs/development/libraries/libxml2/common.nix | 47 +++++++++----------
 .../development/libraries/libxml2/default.nix | 11 ++++-
 2 files changed, 32 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/common.nix b/pkgs/development/libraries/libxml2/common.nix
index eb16734eede4..4b2f04bbc8f0 100644
--- a/pkgs/development/libraries/libxml2/common.nix
+++ b/pkgs/development/libraries/libxml2/common.nix
@@ -5,19 +5,11 @@
   pkg-config,
   autoreconfHook,
   python3,
+  doxygen,
   ncurses,
   findXMLCatalogs,
   libiconv,
-  # Python limits cross-compilation to an allowlist of host OSes.
-  # https://github.com/python/cpython/blob/dfad678d7024ab86d265d84ed45999e031a03691/configure.ac#L534-L562
-  pythonSupport ?
-    enableShared
-    && (
-      stdenv.hostPlatform == stdenv.buildPlatform
-      || stdenv.hostPlatform.isCygwin
-      || stdenv.hostPlatform.isLinux
-      || stdenv.hostPlatform.isWasi
-    ),
+  pythonSupport ? false,
   icuSupport ? false,
   icu,
   zlibSupport ? false,
@@ -52,27 +44,21 @@ stdenv'.mkDerivation (finalAttrs: {
     "bin"
     "dev"
     "out"
-    "devdoc"
   ]
   ++ lib.optional pythonSupport "py"
   ++ lib.optional (enableStatic && enableShared) "static";
   outputMan = "bin";
 
-  patches = [
-    # Unmerged ABI-breaking patch required to fix the following security issues:
-    # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/139
-    # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/140
-    # See also https://gitlab.gnome.org/GNOME/libxml2/-/issues/906
-    # Source: https://github.com/chromium/chromium/blob/4fb4ae8ce3daa399c3d8ca67f2dfb9deffcc7007/third_party/libxml/chromium/xml-attr-extra.patch
-    ./xml-attr-extra.patch
-  ]
-  ++ extraPatches;
+  patches = [ ] ++ extraPatches;
 
   strictDeps = true;
 
   nativeBuildInputs = [
     pkg-config
     autoreconfHook
+  ]
+  ++ lib.optionals pythonSupport [
+    doxygen
   ];
 
   buildInputs =
@@ -101,10 +87,10 @@ stdenv'.mkDerivation (finalAttrs: {
     (lib.withFeature icuSupport "icu")
     (lib.withFeature pythonSupport "python")
     (lib.optionalString pythonSupport "PYTHON=${python3.pythonOnBuildForHost.interpreter}")
-  ]
-  # avoid rebuilds, can be merged into list in version bumps
-  ++ lib.optional enableHttp "--with-http"
-  ++ lib.optional zlibSupport "--with-zlib";
+    (lib.withFeature enableHttp "http")
+    (lib.withFeature zlibSupport "zlib")
+    (lib.withFeature false "docs") # docs are built with xsltproc, which would be a cyclic dependency
+  ];
 
   installFlags = lib.optionals pythonSupport [
     "pythondir=\"${placeholder "py"}/${python3.sitePackages}\""
@@ -159,6 +145,19 @@ stdenv'.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     platforms = lib.platforms.all;
     pkgConfigModules = [ "libxml-2.0" ];
+    # Python limits cross-compilation to an allowlist of host OSes.
+    # https://github.com/python/cpython/blob/dfad678d7024ab86d265d84ed45999e031a03691/configure.ac#L534-L562
+    broken =
+      pythonSupport
+      && !(
+        enableShared
+        && (
+          stdenv.hostPlatform == stdenv.buildPlatform
+          || stdenv.hostPlatform.isCygwin
+          || stdenv.hostPlatform.isLinux
+          || stdenv.hostPlatform.isWasi
+        )
+      );
   }
   // extraMeta;
 })
diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 08c1cbe5fd03..bcd56ff6e54d 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -34,6 +34,13 @@ let
         # same as upstream, fixed conflicts
         # https://gitlab.gnome.org/GNOME/libxml2/-/commit/c340e419505cf4bf1d9ed7019a87cc00ec200434
         ./CVE-2025-6170.patch
+
+        # Unmerged ABI-breaking patch required to fix the following security issues:
+        # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/139
+        # - https://gitlab.gnome.org/GNOME/libxslt/-/issues/140
+        # See also https://gitlab.gnome.org/GNOME/libxml2/-/issues/906
+        # Source: https://github.com/chromium/chromium/blob/4fb4ae8ce3daa399c3d8ca67f2dfb9deffcc7007/third_party/libxml/chromium/xml-attr-extra.patch
+        ./xml-attr-extra.patch
       ];
       freezeUpdateScript = true;
       extraMeta = {
@@ -43,13 +50,13 @@ let
       };
     };
     libxml2 = callPackage ./common.nix {
-      version = "2.14.6";
+      version = "2.15.0";
       src = fetchFromGitLab {
         domain = "gitlab.gnome.org";
         owner = "GNOME";
         repo = "libxml2";
         tag = "v${packages.libxml2.version}";
-        hash = "sha256-EIcNL5B/o74hyc1N+ShrlKsPL5tHhiGgkCR1D7FcDjw=";
+        hash = "sha256-jumHSiIMDzqG2hvPUdcBP8LsszcU+loOY+vqEh/0Yqo=";
       };
       extraMeta = {
         maintainers = with lib.maintainers; [

From d462677dc758ec8a23d6c8e70b6d756f598fe13a Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 20 Sep 2025 13:04:57 +0200
Subject: [PATCH 0326/6226] libxslt: remove broken patch (was fixed in libxml)

---
 pkgs/development/libraries/libxslt/default.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix
index 8427fe49597d..d31337777f26 100644
--- a/pkgs/development/libraries/libxslt/default.nix
+++ b/pkgs/development/libraries/libxslt/default.nix
@@ -39,16 +39,6 @@ stdenv.mkDerivation (finalAttrs: {
     # https://gitlab.gnome.org/GNOME/libxslt/-/issues/144
     # Source: https://gitlab.gnome.org/GNOME/libxslt/-/merge_requests/77
     ./77-Use-a-dedicated-node-type-to-maintain-the-list-of-cached-rv-ts.patch
-
-    # Fix type confusion in xmlNode.psvi between stylesheet and source nodes
-    # https://gitlab.gnome.org/GNOME/libxslt/-/issues/139
-    # Fix heap-use-after-free in xmlFreeID caused by `atype` corruption
-    # https://gitlab.gnome.org/GNOME/libxslt/-/issues/140
-    #
-    # Depends on unmerged libxml2 patch that breaks ABI.
-    #
-    # Source: https://github.com/chromium/chromium/blob/4fb4ae8ce3daa399c3d8ca67f2dfb9deffcc7007/third_party/libxslt/chromium/new-unified-atype-extra.patch
-    ./new-unified-atype-extra.patch
   ];
 
   strictDeps = true;

From f6d8ba3220b0952ed8000f59eae809e25a9d37b2 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 20 Sep 2025 13:05:40 +0200
Subject: [PATCH 0327/6226] python3Packages.lxml: 6.0.1 -> 6.0.2

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

diff --git a/pkgs/development/python-modules/lxml/default.nix b/pkgs/development/python-modules/lxml/default.nix
index fee77d75aa2e..8780137b1c04 100644
--- a/pkgs/development/python-modules/lxml/default.nix
+++ b/pkgs/development/python-modules/lxml/default.nix
@@ -17,16 +17,21 @@
 
 buildPythonPackage rec {
   pname = "lxml";
-  version = "6.0.1";
+  version = "6.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lxml";
     repo = "lxml";
     tag = "lxml-${version}";
-    hash = "sha256-iY47nhAbA8ScnjmK2/7lVCBP8f65v1zOs3TcgQULlQ0=";
+    hash = "sha256-Ri5SzfQJFghRcMAKHS5QKD365OZlio895fSlumq83vs=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'Cython>=3.1.4' 'Cython'
+  '';
+
   build-system = [
     cython
     setuptools

From 0d73b69f003641339874bcac4fcbdab9678a133f Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 20 Sep 2025 23:26:49 +0200
Subject: [PATCH 0328/6226] xmlsec: fix bad const qualifier

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

diff --git a/pkgs/by-name/xm/xmlsec/package.nix b/pkgs/by-name/xm/xmlsec/package.nix
index f1b8f9b472e3..2a2b52ee337a 100644
--- a/pkgs/by-name/xm/xmlsec/package.nix
+++ b/pkgs/by-name/xm/xmlsec/package.nix
@@ -1,6 +1,7 @@
 {
   stdenv,
   fetchurl,
+  fetchpatch,
   libxml2,
   gnutls,
   libxslt,
@@ -33,6 +34,11 @@ lib.fix (
     patches = [
       ./lt_dladdsearchdir.patch
       ./remove_bsd_base64_decode_flag.patch
+      (fetchpatch {
+        # xmlDoc.encoding is no longer const in libxml 2.15, so fetch the fix
+        url = "https://github.com/lsh123/xmlsec/commit/ef0e3b5cac04db13ce070b1e5bcad7dd7b0eb49b.patch?full_index=1";
+        hash = "sha256-Hv8PaJXkXLq++NuCAJ4IvsYBPj8wkN7dBTniYucq18o=";
+      })
     ];
 
     postPatch = ''

From 31da2a9ab0fe45bc521a7aa8b09f2615c7078f75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Oct 2025 18:39:01 +0000
Subject: [PATCH 0329/6226] roadrunner: 2025.1.3 -> 2025.1.4

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

diff --git a/pkgs/by-name/ro/roadrunner/package.nix b/pkgs/by-name/ro/roadrunner/package.nix
index 52f0886d0ede..9798e59f4075 100644
--- a/pkgs/by-name/ro/roadrunner/package.nix
+++ b/pkgs/by-name/ro/roadrunner/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "roadrunner";
-  version = "2025.1.3";
+  version = "2025.1.4";
 
   src = fetchFromGitHub {
     repo = "roadrunner";
     owner = "roadrunner-server";
     tag = "v${version}";
-    hash = "sha256-+TA0ClPrmfksMchc4WgX2nMZetDuw8Q0xtbiHm2OMa4=";
+    hash = "sha256-OlwMlGe2EEXTWbp5fMhZkUX00l15vvtJ6fc3tSkmlVc=";
   };
 
   nativeBuildInputs = [
@@ -49,7 +49,7 @@ buildGoModule rec {
 
   __darwinAllowLocalNetworking = true;
 
-  vendorHash = "sha256-/u2so1/WXuQvLZhfRSYdG1QZasrA6xoZTE6lYXg9RWs=";
+  vendorHash = "sha256-7C5B8ChIxaqCJhywITV7v3o/49fFp8eaVeZ6ZJNxi20=";
 
   meta = {
     changelog = "https://github.com/roadrunner-server/roadrunner/blob/v${version}/CHANGELOG.md";

From 30f67da31523894ad850c28baf062f5d0a512ea0 Mon Sep 17 00:00:00 2001
From: Alois Wohlschlager <alois1@gmx-topmail.de>
Date: Thu, 2 Oct 2025 20:59:25 +0200
Subject: [PATCH 0330/6226] nghttp3: simplify static conditionals

Mass-rebuild cleanup after https://github.com/NixOS/nixpkgs/pull/445602 .
---
 pkgs/by-name/ng/nghttp3/package.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ng/nghttp3/package.nix b/pkgs/by-name/ng/nghttp3/package.nix
index 9652a25a7ce8..cff35f454d3a 100644
--- a/pkgs/by-name/ng/nghttp3/package.nix
+++ b/pkgs/by-name/ng/nghttp3/package.nix
@@ -23,16 +23,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  cmakeFlags =
-    if stdenv.hostPlatform.isStatic then
-      [
-        (lib.cmakeBool "ENABLE_SHARED_LIB" false)
-        (lib.cmakeBool "ENABLE_STATIC_LIB" true)
-      ]
-    else
-      [
-        (lib.cmakeBool "ENABLE_STATIC_LIB" false)
-      ];
+  cmakeFlags = [
+    (lib.cmakeBool "ENABLE_SHARED_LIB" (!stdenv.hostPlatform.isStatic))
+    (lib.cmakeBool "ENABLE_STATIC_LIB" stdenv.hostPlatform.isStatic)
+  ];
 
   doCheck = true;
 

From 28b566547ea43bdff051a0e173c3f76a1021c49e Mon Sep 17 00:00:00 2001
From: Alois Wohlschlager <alois1@gmx-topmail.de>
Date: Thu, 2 Oct 2025 20:59:25 +0200
Subject: [PATCH 0331/6226] ngtcp2: simplify static conditionals

Mass-rebuild cleanup after https://github.com/NixOS/nixpkgs/pull/445602 .
---
 pkgs/development/libraries/ngtcp2/default.nix | 20 +++++++------------
 1 file changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix
index 9de9314dc37d..1f88deb6363f 100644
--- a/pkgs/development/libraries/ngtcp2/default.nix
+++ b/pkgs/development/libraries/ngtcp2/default.nix
@@ -36,19 +36,13 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optional withJemalloc jemalloc;
 
-  cmakeFlags =
-    if stdenv.hostPlatform.isStatic then
-      [
-        # The examples try to link against `ngtcp2_crypto_ossl` and `ngtcp2` libraries.
-        # This works in the dynamic case where the targets have the same name, but not here where they're suffixed with `_static`.
-        (lib.cmakeBool "ENABLE_LIB_ONLY" true)
-        (lib.cmakeBool "ENABLE_SHARED_LIB" false)
-        (lib.cmakeBool "ENABLE_STATIC_LIB" true)
-      ]
-    else
-      [
-        (lib.cmakeBool "ENABLE_STATIC_LIB" false)
-      ];
+  cmakeFlags = [
+    # The examples try to link against `ngtcp2_crypto_ossl` and `ngtcp2` libraries.
+    # This works in the dynamic case where the targets have the same name, but not here where they're suffixed with `_static`.
+    (lib.cmakeBool "ENABLE_LIB_ONLY" stdenv.hostPlatform.isStatic)
+    (lib.cmakeBool "ENABLE_SHARED_LIB" (!stdenv.hostPlatform.isStatic))
+    (lib.cmakeBool "ENABLE_STATIC_LIB" stdenv.hostPlatform.isStatic)
+  ];
 
   doCheck = true;
 

From 93a611e793d606f9f2bb74a06f1cd39fc4b9f505 Mon Sep 17 00:00:00 2001
From: Albert Larsan <albertlarsan@albertlarsan.fr>
Date: Tue, 9 Sep 2025 15:02:02 +0200
Subject: [PATCH 0332/6226] ionic-cli: init at 7.2.1

It was dropped in #250282, but not replaced.
---
 pkgs/by-name/io/ionic-cli/package-lock.json | 8268 +++++++++++++++++++
 pkgs/by-name/io/ionic-cli/package.nix       |   32 +
 2 files changed, 8300 insertions(+)
 create mode 100644 pkgs/by-name/io/ionic-cli/package-lock.json
 create mode 100644 pkgs/by-name/io/ionic-cli/package.nix

diff --git a/pkgs/by-name/io/ionic-cli/package-lock.json b/pkgs/by-name/io/ionic-cli/package-lock.json
new file mode 100644
index 000000000000..e2571af5412a
--- /dev/null
+++ b/pkgs/by-name/io/ionic-cli/package-lock.json
@@ -0,0 +1,8268 @@
+{
+  "name": "@ionic/cli",
+  "version": "7.2.1",
+  "lockfileVersion": 3,
+  "requires": true,
+  "packages": {
+    "": {
+      "name": "@ionic/cli",
+      "version": "7.2.1",
+      "license": "MIT",
+      "dependencies": {
+        "@ionic/cli-framework": "6.0.1",
+        "@ionic/cli-framework-output": "2.2.8",
+        "@ionic/cli-framework-prompts": "2.1.13",
+        "@ionic/utils-array": "2.1.6",
+        "@ionic/utils-fs": "3.1.7",
+        "@ionic/utils-network": "2.1.7",
+        "@ionic/utils-process": "2.1.12",
+        "@ionic/utils-stream": "3.1.7",
+        "@ionic/utils-subprocess": "3.0.1",
+        "@ionic/utils-terminal": "2.3.5",
+        "chalk": "^4.0.0",
+        "debug": "^4.0.0",
+        "diff": "^4.0.1",
+        "elementtree": "^0.1.7",
+        "leek": "0.0.24",
+        "lodash": "^4.17.5",
+        "open": "^7.0.4",
+        "os-name": "^4.0.0",
+        "proxy-agent": "^6.3.0",
+        "semver": "^7.1.1",
+        "split2": "^3.0.0",
+        "ssh-config": "^1.1.1",
+        "stream-combiner2": "^1.1.1",
+        "superagent": "^9.0.2",
+        "tar": "^6.0.1",
+        "tslib": "^2.0.1"
+      },
+      "bin": {
+        "ionic": "bin/ionic"
+      },
+      "devDependencies": {
+        "@types/debug": "^4.1.1",
+        "@types/diff": "^4.0.0",
+        "@types/elementtree": "^0.1.0",
+        "@types/jest": "^26.0.10",
+        "@types/lodash": "^4.14.104",
+        "@types/node": "~16.0.0",
+        "@types/semver": "^7.1.0",
+        "@types/split2": "^2.1.6",
+        "@types/superagent": "4.1.3",
+        "@types/tar": "^6.1.2",
+        "jest": "^26.4.2",
+        "jest-cli": "^26.0.1",
+        "lint-staged": "^10.0.2",
+        "rimraf": "^3.0.0",
+        "source-map": "^0.7.0",
+        "ts-jest": "~26.3.0",
+        "typescript": "~4.8.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@babel/code-frame": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "js-tokens": "^4.0.0",
+        "picocolors": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/compat-data": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.4.tgz",
+      "integrity": "sha512-YsmSKC29MJwf0gF8Rjjrg5LQCmyh+j/nD8/eP7f+BeoQTKYqs9RoWbjGOdy0+1Ekr68RJZMUOPVQaQisnIo4Rw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/core": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.4.tgz",
+      "integrity": "sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.3",
+        "@babel/helper-compilation-targets": "^7.27.2",
+        "@babel/helper-module-transforms": "^7.28.3",
+        "@babel/helpers": "^7.28.4",
+        "@babel/parser": "^7.28.4",
+        "@babel/template": "^7.27.2",
+        "@babel/traverse": "^7.28.4",
+        "@babel/types": "^7.28.4",
+        "@jridgewell/remapping": "^2.3.5",
+        "convert-source-map": "^2.0.0",
+        "debug": "^4.1.0",
+        "gensync": "^1.0.0-beta.2",
+        "json5": "^2.2.3",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/babel"
+      }
+    },
+    "node_modules/@babel/core/node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@babel/core/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/generator": {
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.3.tgz",
+      "integrity": "sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.28.3",
+        "@babel/types": "^7.28.2",
+        "@jridgewell/gen-mapping": "^0.3.12",
+        "@jridgewell/trace-mapping": "^0.3.28",
+        "jsesc": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets": {
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz",
+      "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/compat-data": "^7.27.2",
+        "@babel/helper-validator-option": "^7.27.1",
+        "browserslist": "^4.24.0",
+        "lru-cache": "^5.1.1",
+        "semver": "^6.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-compilation-targets/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/@babel/helper-globals": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
+      "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-imports": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz",
+      "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/traverse": "^7.27.1",
+        "@babel/types": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-module-transforms": {
+      "version": "7.28.3",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz",
+      "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-module-imports": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1",
+        "@babel/traverse": "^7.28.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/@babel/helper-plugin-utils": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz",
+      "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-string-parser": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-identifier": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
+      "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helper-validator-option": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz",
+      "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/helpers": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz",
+      "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.28.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/parser": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.4.tgz",
+      "integrity": "sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.28.4"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-async-generators": {
+      "version": "7.8.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz",
+      "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-bigint": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz",
+      "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-properties": {
+      "version": "7.12.13",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz",
+      "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.12.13"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-class-static-block": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz",
+      "integrity": "sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-attributes": {
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-attributes/-/plugin-syntax-import-attributes-7.27.1.tgz",
+      "integrity": "sha512-oFT0FrKHgF53f4vOsZGi2Hh3I35PfSmVs4IBFLFj4dnafP+hIWDLg3VyKmUHfLoLHlyxY4C7DGtmHuJgn+IGww==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-import-meta": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz",
+      "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-json-strings": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz",
+      "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-logical-assignment-operators": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz",
+      "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz",
+      "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-numeric-separator": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz",
+      "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.10.4"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-object-rest-spread": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
+      "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-catch-binding": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz",
+      "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-optional-chaining": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz",
+      "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.8.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-private-property-in-object": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz",
+      "integrity": "sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-syntax-top-level-await": {
+      "version": "7.14.5",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz",
+      "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.14.5"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/template": {
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
+      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@babel/parser": "^7.27.2",
+        "@babel/types": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/traverse": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.4.tgz",
+      "integrity": "sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.3",
+        "@babel/helper-globals": "^7.28.0",
+        "@babel/parser": "^7.28.4",
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.28.4",
+        "debug": "^4.3.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@babel/types": {
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.4.tgz",
+      "integrity": "sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.27.1"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "node_modules/@bcoe/v8-coverage": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
+      "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@cnakazawa/watch": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz",
+      "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "exec-sh": "^0.3.2",
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "watch": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.1.95"
+      }
+    },
+    "node_modules/@ionic/cli-framework": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework/-/cli-framework-6.0.1.tgz",
+      "integrity": "sha512-Fyix4eQt2HKTV+GoeoiziQGZyqIA8RfoMqjGyAS5XgNXLOYW0P27Ph348hQZh9Mphjf+m0lOYa6dWQTEPzUHiQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@ionic/cli-framework-output": "2.2.8",
+        "@ionic/utils-array": "2.1.6",
+        "@ionic/utils-fs": "3.1.7",
+        "@ionic/utils-object": "2.1.6",
+        "@ionic/utils-process": "2.1.12",
+        "@ionic/utils-stream": "3.1.7",
+        "@ionic/utils-subprocess": "3.0.1",
+        "@ionic/utils-terminal": "2.3.5",
+        "chalk": "^4.0.0",
+        "debug": "^4.0.0",
+        "lodash": "^4.17.5",
+        "minimist": "^1.2.0",
+        "rimraf": "^3.0.0",
+        "tslib": "^2.0.1",
+        "write-file-atomic": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/cli-framework-output": {
+      "version": "2.2.8",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework-output/-/cli-framework-output-2.2.8.tgz",
+      "integrity": "sha512-TshtaFQsovB4NWRBydbNFawql6yul7d5bMiW1WYYf17hd99V6xdDdk3vtF51bw6sLkxON3bDQpWsnUc9/hVo3g==",
+      "license": "MIT",
+      "dependencies": {
+        "@ionic/utils-terminal": "2.3.5",
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/cli-framework-prompts": {
+      "version": "2.1.13",
+      "resolved": "https://registry.npmjs.org/@ionic/cli-framework-prompts/-/cli-framework-prompts-2.1.13.tgz",
+      "integrity": "sha512-Yj1fz6p7OehreQ8C70bd9+M6tYP/rvzLw5JVj8pT/N9s0kQSjqEFRbs96LKr3lfd3TADZaS8OlZrQIqenFIUpg==",
+      "license": "MIT",
+      "dependencies": {
+        "@ionic/utils-terminal": "2.3.5",
+        "debug": "^4.0.0",
+        "inquirer": "^7.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-array": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-array/-/utils-array-2.1.6.tgz",
+      "integrity": "sha512-0JZ1Zkp3wURnv8oq6Qt7fMPo5MpjbLoUoa9Bu2Q4PJuSDWM8H8gwF3dQO7VTeUj3/0o1IB1wGkFWZZYgUXZMUg==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-fs": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-fs/-/utils-fs-3.1.7.tgz",
+      "integrity": "sha512-2EknRvMVfhnyhL1VhFkSLa5gOcycK91VnjfrTB0kbqkTFCOXyXgVLI5whzq7SLrgD9t1aqos3lMMQyVzaQ5gVA==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/fs-extra": "^8.0.0",
+        "debug": "^4.0.0",
+        "fs-extra": "^9.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-network": {
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-network/-/utils-network-2.1.7.tgz",
+      "integrity": "sha512-5Q3NdZtSLiLs7ufuX9X293BvAwo8CxaD93Hkp3ODPgctLYErv3nFibhq3j+eguEqUh2um9WNXEUOuQ8x+Sd1fw==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-object": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-object/-/utils-object-2.1.6.tgz",
+      "integrity": "sha512-vCl7sl6JjBHFw99CuAqHljYJpcE88YaH2ZW4ELiC/Zwxl5tiwn4kbdP/gxi2OT3MQb1vOtgAmSNRtusvgxI8ww==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-process": {
+      "version": "2.1.12",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-process/-/utils-process-2.1.12.tgz",
+      "integrity": "sha512-Jqkgyq7zBs/v/J3YvKtQQiIcxfJyplPgECMWgdO0E1fKrrH8EF0QGHNJ9mJCn6PYe2UtHNS8JJf5G21e09DfYg==",
+      "license": "MIT",
+      "dependencies": {
+        "@ionic/utils-object": "2.1.6",
+        "@ionic/utils-terminal": "2.3.5",
+        "debug": "^4.0.0",
+        "signal-exit": "^3.0.3",
+        "tree-kill": "^1.2.2",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-stream": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-stream/-/utils-stream-3.1.7.tgz",
+      "integrity": "sha512-eSELBE7NWNFIHTbTC2jiMvh1ABKGIpGdUIvARsNPMNQhxJB3wpwdiVnoBoTYp+5a6UUIww4Kpg7v6S7iTctH1w==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-subprocess": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-subprocess/-/utils-subprocess-3.0.1.tgz",
+      "integrity": "sha512-cT4te3AQQPeIM9WCwIg8ohroJ8TjsYaMb2G4ZEgv9YzeDqHZ4JpeIKqG2SoaA3GmVQ3sOfhPM6Ox9sxphV/d1A==",
+      "license": "MIT",
+      "dependencies": {
+        "@ionic/utils-array": "2.1.6",
+        "@ionic/utils-fs": "3.1.7",
+        "@ionic/utils-process": "2.1.12",
+        "@ionic/utils-stream": "3.1.7",
+        "@ionic/utils-terminal": "2.3.5",
+        "cross-spawn": "^7.0.3",
+        "debug": "^4.0.0",
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@ionic/utils-terminal": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/@ionic/utils-terminal/-/utils-terminal-2.3.5.tgz",
+      "integrity": "sha512-3cKScz9Jx2/Pr9ijj1OzGlBDfcmx7OMVBt4+P1uRR0SSW4cm1/y3Mo4OY3lfkuaYifMNBW8Wz6lQHbs1bihr7A==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/slice-ansi": "^4.0.0",
+        "debug": "^4.0.0",
+        "signal-exit": "^3.0.3",
+        "slice-ansi": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "tslib": "^2.0.1",
+        "untildify": "^4.0.0",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=16.0.0"
+      }
+    },
+    "node_modules/@istanbuljs/load-nyc-config": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+      "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "camelcase": "^5.3.1",
+        "find-up": "^4.1.0",
+        "get-package-type": "^0.1.0",
+        "js-yaml": "^3.13.1",
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@istanbuljs/schema": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+      "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/@jest/console": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz",
+      "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "jest-message-util": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/core": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz",
+      "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/console": "^26.6.2",
+        "@jest/reporters": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-changed-files": "^26.6.2",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-resolve-dependencies": "^26.6.3",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "jest-watcher": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "p-each-series": "^2.1.0",
+        "rimraf": "^3.0.0",
+        "slash": "^3.0.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/environment": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz",
+      "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "jest-mock": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/fake-timers": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz",
+      "integrity": "sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "@sinonjs/fake-timers": "^6.0.1",
+        "@types/node": "*",
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/globals": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz",
+      "integrity": "sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "expect": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/reporters": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz",
+      "integrity": "sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@bcoe/v8-coverage": "^0.2.3",
+        "@jest/console": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.2",
+        "graceful-fs": "^4.2.4",
+        "istanbul-lib-coverage": "^3.0.0",
+        "istanbul-lib-instrument": "^4.0.3",
+        "istanbul-lib-report": "^3.0.0",
+        "istanbul-lib-source-maps": "^4.0.0",
+        "istanbul-reports": "^3.0.2",
+        "jest-haste-map": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.0",
+        "string-length": "^4.0.1",
+        "terminal-link": "^2.0.0",
+        "v8-to-istanbul": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "optionalDependencies": {
+        "node-notifier": "^8.0.0"
+      }
+    },
+    "node_modules/@jest/reporters/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@jest/source-map": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz",
+      "integrity": "sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "callsites": "^3.0.0",
+        "graceful-fs": "^4.2.4",
+        "source-map": "^0.6.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/source-map/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@jest/test-result": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz",
+      "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/console": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "collect-v8-coverage": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/test-sequencer": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz",
+      "integrity": "sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/test-result": "^26.6.2",
+        "graceful-fs": "^4.2.4",
+        "jest-haste-map": "^26.6.2",
+        "jest-runner": "^26.6.3",
+        "jest-runtime": "^26.6.3"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/transform": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz",
+      "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/types": "^26.6.2",
+        "babel-plugin-istanbul": "^6.0.0",
+        "chalk": "^4.0.0",
+        "convert-source-map": "^1.4.0",
+        "fast-json-stable-stringify": "^2.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-haste-map": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-util": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "pirates": "^4.0.1",
+        "slash": "^3.0.0",
+        "source-map": "^0.6.1",
+        "write-file-atomic": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jest/transform/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/@jest/types": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.5.0",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "node_modules/@jridgewell/remapping": {
+      "version": "2.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
+      "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.5",
+        "@jridgewell/trace-mapping": "^0.3.24"
+      }
+    },
+    "node_modules/@jridgewell/resolve-uri": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
+      "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@jridgewell/sourcemap-codec": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@jridgewell/trace-mapping": {
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/resolve-uri": "^3.1.0",
+        "@jridgewell/sourcemap-codec": "^1.4.14"
+      }
+    },
+    "node_modules/@noble/hashes": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz",
+      "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==",
+      "license": "MIT",
+      "engines": {
+        "node": "^14.21.3 || >=16"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
+    "node_modules/@paralleldrive/cuid2": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@paralleldrive/cuid2/-/cuid2-2.2.2.tgz",
+      "integrity": "sha512-ZOBkgDwEdoYVlSeRbYYXs0S9MejQofiVYoTbKzy/6GQa39/q5tQU2IX46+shYnUkpEl3wc+J6wRlar7r2EK2xA==",
+      "license": "MIT",
+      "dependencies": {
+        "@noble/hashes": "^1.1.5"
+      }
+    },
+    "node_modules/@sinonjs/commons": {
+      "version": "1.8.6",
+      "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.6.tgz",
+      "integrity": "sha512-Ky+XkAkqPZSm3NLBeUng77EBQl3cmeJhITaGHdYH8kjVB+aun3S4XBRti2zt17mtt0mIUDiNxYeoJm6drVvBJQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "type-detect": "4.0.8"
+      }
+    },
+    "node_modules/@sinonjs/fake-timers": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz",
+      "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@sinonjs/commons": "^1.7.0"
+      }
+    },
+    "node_modules/@tootallnate/once": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz",
+      "integrity": "sha512-RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/@tootallnate/quickjs-emscripten": {
+      "version": "0.23.0",
+      "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz",
+      "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==",
+      "license": "MIT"
+    },
+    "node_modules/@types/babel__core": {
+      "version": "7.20.5",
+      "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz",
+      "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.20.7",
+        "@babel/types": "^7.20.7",
+        "@types/babel__generator": "*",
+        "@types/babel__template": "*",
+        "@types/babel__traverse": "*"
+      }
+    },
+    "node_modules/@types/babel__generator": {
+      "version": "7.27.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz",
+      "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__template": {
+      "version": "7.4.4",
+      "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz",
+      "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.1.0",
+        "@babel/types": "^7.0.0"
+      }
+    },
+    "node_modules/@types/babel__traverse": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.28.0.tgz",
+      "integrity": "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.28.2"
+      }
+    },
+    "node_modules/@types/cookiejar": {
+      "version": "2.1.5",
+      "resolved": "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.5.tgz",
+      "integrity": "sha512-he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/debug": {
+      "version": "4.1.12",
+      "resolved": "https://registry.npmjs.org/@types/debug/-/debug-4.1.12.tgz",
+      "integrity": "sha512-vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/ms": "*"
+      }
+    },
+    "node_modules/@types/diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-mIenTfsIe586/yzsyfql69KRnA75S8SVXQbTLpDejRrjH0QSJcpu3AUOi/Vjnt9IOsXKxPhJfGpQUNMueIU1fQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/elementtree": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/@types/elementtree/-/elementtree-0.1.5.tgz",
+      "integrity": "sha512-sDPG9iHzbN7Cvf0FLVzmaRiNMCYPQXh+xt0QI/I9P/sPdPX0veG/gvxA4eMuOq6tReg4cpXVH3356y2Qzdl+5g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/fs-extra": {
+      "version": "8.1.5",
+      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-8.1.5.tgz",
+      "integrity": "sha512-0dzKcwO+S8s2kuF5Z9oUWatQJj5Uq/iqphEtE3GQJVRRYm/tD1LglU2UnXi2A8jLq5umkGouOXOR9y0n613ZwQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/graceful-fs": {
+      "version": "4.1.9",
+      "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
+      "integrity": "sha512-olP3sd1qOEe5dXTSaFvQG+02VdRXcdytWLAZsAq1PecU8uqQAhkrnbli7DagjtXKW/Bl7YJbUsa8MPcuc8LHEQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/istanbul-lib-coverage": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
+      "integrity": "sha512-2QF/t/auWm0lsy8XtKVPG19v3sSOQlJe/YHZgfjb/KBBHOGSV+J2q/S671rcq9uTBrLAXmZpqJiaQbMT+zNU1w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/istanbul-lib-report": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.3.tgz",
+      "integrity": "sha512-NQn7AHQnk/RSLOxrBbGyJM/aVQ+pjj5HCgasFxc0K/KhoATfQ/47AyUl15I2yBUpihjmas+a+VJBOqecrFH+uA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "*"
+      }
+    },
+    "node_modules/@types/istanbul-reports": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz",
+      "integrity": "sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/istanbul-lib-report": "*"
+      }
+    },
+    "node_modules/@types/jest": {
+      "version": "26.0.24",
+      "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.24.tgz",
+      "integrity": "sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "jest-diff": "^26.0.0",
+        "pretty-format": "^26.0.0"
+      }
+    },
+    "node_modules/@types/lodash": {
+      "version": "4.17.20",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
+      "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/ms": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@types/ms/-/ms-2.1.0.tgz",
+      "integrity": "sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/node": {
+      "version": "16.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.0.3.tgz",
+      "integrity": "sha512-QhhSbE1wJMbh+lDsb9G6UFmyojhEgoO7dFVDBkli80sp3sPFojGh6TJXsht9Qbe2VWi91pbj08+1Kvue61RwsQ==",
+      "license": "MIT"
+    },
+    "node_modules/@types/normalize-package-data": {
+      "version": "2.4.4",
+      "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz",
+      "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/parse-json": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz",
+      "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/prettier": {
+      "version": "2.7.3",
+      "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.7.3.tgz",
+      "integrity": "sha512-+68kP9yzs4LMp7VNh8gdzMSPZFL44MLGqiHWvttYJe+6qnuVr4Ek9wSBQoveqY/r+LwjCcU29kNVkidwim+kYA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-FmgJfu+MOcQ370SD0ev7EI8TlCAfKYU+B4m5T3yXc1CiRN94g/SZPtsCkk506aUDtlMnFZvasDwHHUcZUEaYuA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-+OpjSaq85gvlZAYINyzKpLeiFkSC4EsC6IIiT6v6TLSU5k5U83fHGj9Lel8oKEXM0HqgrMVCjXPDPVICtxF7EQ==",
+      "license": "MIT"
+    },
+    "node_modules/@types/split2": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@types/split2/-/split2-2.1.6.tgz",
+      "integrity": "sha512-ddaFSOMuy2Rp97l6q/LEteQygvTQJuEZ+SRhxFKR0uXGsdbFDqX/QF2xoGcOqLQ8XV91v01SnAv2vpgihNgW/Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/@types/superagent": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/@types/superagent/-/superagent-4.1.3.tgz",
+      "integrity": "sha512-vy2licJQwOXrTAe+yz9SCyUVXAkMgCeDq9VHzS5CWJyDU1g6CI4xKb4d5sCEmyucjw5sG0y4k2/afS0iv/1D0Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/cookiejar": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/tar": {
+      "version": "6.1.13",
+      "resolved": "https://registry.npmjs.org/@types/tar/-/tar-6.1.13.tgz",
+      "integrity": "sha512-IznnlmU5f4WcGTh2ltRu/Ijpmk8wiWXfF0VA4s+HPjHZgvFggk1YaIkbo5krX/zUCzWF8N/l4+W/LNxnvAJ8nw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "minipass": "^4.0.0"
+      }
+    },
+    "node_modules/@types/yargs": {
+      "version": "15.0.19",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.19.tgz",
+      "integrity": "sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/@types/yargs-parser": {
+      "version": "21.0.3",
+      "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.3.tgz",
+      "integrity": "sha512-I4q9QU9MQv4oEOz4tAHJtNz1cwuLxn2F3xcc2iV5WdqLPpUnj30aUuxt1mAxYTG+oe8CZMV/+6rU4S4gRDzqtQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/abab": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
+      "integrity": "sha512-j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==",
+      "deprecated": "Use your platform's native atob() and btoa() methods instead",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/acorn": {
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-globals": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz",
+      "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "^7.1.1",
+        "acorn-walk": "^7.1.1"
+      }
+    },
+    "node_modules/acorn-globals/node_modules/acorn": {
+      "version": "7.4.1",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz",
+      "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "acorn": "bin/acorn"
+      },
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/acorn-walk": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz",
+      "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/agent-base": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz",
+      "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6.0.0"
+      }
+    },
+    "node_modules/aggregate-error": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+      "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "clean-stack": "^2.0.0",
+        "indent-string": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ansi-colors": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz",
+      "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/ansi-escapes": {
+      "version": "4.3.2",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz",
+      "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==",
+      "license": "MIT",
+      "dependencies": {
+        "type-fest": "^0.21.3"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "normalize-path": "^3.0.0",
+        "picomatch": "^2.0.4"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "sprintf-js": "~1.0.2"
+      }
+    },
+    "node_modules/arr-diff": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz",
+      "integrity": "sha512-YVIQ82gZPGBebQV/a8dar4AitzCQs0jjXwMPZllpXMaGjXPYVUawSxQrRsjhjupyVxEvbHgUmIhKVlND+j02kA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/arr-union": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz",
+      "integrity": "sha512-sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/array-unique": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz",
+      "integrity": "sha512-SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/asap": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
+      "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==",
+      "license": "MIT"
+    },
+    "node_modules/assign-symbols": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz",
+      "integrity": "sha512-Q+JC7Whu8HhmTdBph/Tq59IoRtoy6KAm5zzPv00WdujX82lbAL8K7WVjne7vdCsAmbF4AYaDOPyO3k0kl8qIrw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/ast-types": {
+      "version": "0.13.4",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.13.4.tgz",
+      "integrity": "sha512-x1FCFnFifvYDDzTaLII71vG5uvDwgtmDTEVWAxrgeiR8VjMONcCXJx7E+USjDtHlwFmt9MysbqgF9b9Vjr6w+w==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/astral-regex": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz",
+      "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+      "license": "MIT"
+    },
+    "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/atob": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz",
+      "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==",
+      "dev": true,
+      "license": "(MIT OR Apache-2.0)",
+      "bin": {
+        "atob": "bin/atob.js"
+      },
+      "engines": {
+        "node": ">= 4.5.0"
+      }
+    },
+    "node_modules/babel-jest": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz",
+      "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/babel__core": "^7.1.7",
+        "babel-plugin-istanbul": "^6.0.0",
+        "babel-preset-jest": "^26.6.2",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "node_modules/babel-plugin-istanbul": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
+      "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@istanbuljs/load-nyc-config": "^1.0.0",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-instrument": "^5.0.4",
+        "test-exclude": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-plugin-istanbul/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/babel-plugin-jest-hoist": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz",
+      "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/template": "^7.3.3",
+        "@babel/types": "^7.3.3",
+        "@types/babel__core": "^7.0.0",
+        "@types/babel__traverse": "^7.0.6"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/babel-preset-current-node-syntax": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.2.0.tgz",
+      "integrity": "sha512-E/VlAEzRrsLEb2+dv8yp3bo4scof3l9nR4lrld+Iy5NyVqgVYUJnDAmunkhPMisRI32Qc4iRiz425d8vM++2fg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/plugin-syntax-async-generators": "^7.8.4",
+        "@babel/plugin-syntax-bigint": "^7.8.3",
+        "@babel/plugin-syntax-class-properties": "^7.12.13",
+        "@babel/plugin-syntax-class-static-block": "^7.14.5",
+        "@babel/plugin-syntax-import-attributes": "^7.24.7",
+        "@babel/plugin-syntax-import-meta": "^7.10.4",
+        "@babel/plugin-syntax-json-strings": "^7.8.3",
+        "@babel/plugin-syntax-logical-assignment-operators": "^7.10.4",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.10.4",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3",
+        "@babel/plugin-syntax-optional-chaining": "^7.8.3",
+        "@babel/plugin-syntax-private-property-in-object": "^7.14.5",
+        "@babel/plugin-syntax-top-level-await": "^7.14.5"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0 || ^8.0.0-0"
+      }
+    },
+    "node_modules/babel-preset-jest": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz",
+      "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "babel-plugin-jest-hoist": "^26.6.2",
+        "babel-preset-current-node-syntax": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0"
+      }
+    },
+    "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/base": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz",
+      "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cache-base": "^1.0.1",
+        "class-utils": "^0.3.5",
+        "component-emitter": "^1.2.1",
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.1",
+        "mixin-deep": "^1.2.0",
+        "pascalcase": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/base/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/baseline-browser-mapping": {
+      "version": "2.8.6",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.6.tgz",
+      "integrity": "sha512-wrH5NNqren/QMtKUEEJf7z86YjfqW/2uw3IL3/xpqZUC95SSVIFXYQeeGjL6FT/X68IROu6RMehZQS5foy2BXw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "baseline-browser-mapping": "dist/cli.js"
+      }
+    },
+    "node_modules/basic-ftp": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/basic-ftp/-/basic-ftp-5.0.5.tgz",
+      "integrity": "sha512-4Bcg1P8xhUuqcii/S0Z9wiHIrQVPMermM1any+MX5GeGD7faD3/msQUDGLol9wOcz4/jbg/WJnGqoJF6LiBdtg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/brace-expansion": {
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fill-range": "^7.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/browser-process-hrtime": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz",
+      "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==",
+      "dev": true,
+      "license": "BSD-2-Clause"
+    },
+    "node_modules/browserslist": {
+      "version": "4.26.2",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.26.2.tgz",
+      "integrity": "sha512-ECFzp6uFOSB+dcZ5BK/IBaGWssbSYBHvuMeMt3MMFyhI0Z8SqGgEkBLARgpRH3hutIgPVsALcMwbDrJqPxQ65A==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "baseline-browser-mapping": "^2.8.3",
+        "caniuse-lite": "^1.0.30001741",
+        "electron-to-chromium": "^1.5.218",
+        "node-releases": "^2.0.21",
+        "update-browserslist-db": "^1.1.3"
+      },
+      "bin": {
+        "browserslist": "cli.js"
+      },
+      "engines": {
+        "node": "^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7"
+      }
+    },
+    "node_modules/bs-logger": {
+      "version": "0.2.6",
+      "resolved": "https://registry.npmjs.org/bs-logger/-/bs-logger-0.2.6.tgz",
+      "integrity": "sha512-pd8DCoxmbgc7hyPKOvxtqNcjYoOsABPQdcCUjGp3d42VR2CX1ORhk2A87oqqu5R1kk+76nsxZupkmyd+MVtCog==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "fast-json-stable-stringify": "2.x"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/bser": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz",
+      "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "node-int64": "^0.4.0"
+      }
+    },
+    "node_modules/buffer-from": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
+      "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cache-base": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz",
+      "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "collection-visit": "^1.0.0",
+        "component-emitter": "^1.2.1",
+        "get-value": "^2.0.6",
+        "has-value": "^1.0.0",
+        "isobject": "^3.0.1",
+        "set-value": "^2.0.0",
+        "to-object-path": "^0.3.0",
+        "union-value": "^1.0.0",
+        "unset-value": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/call-bind-apply-helpers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz",
+      "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/call-bound": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz",
+      "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "get-intrinsic": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/camelcase": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
+      "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/caniuse-lite": {
+      "version": "1.0.30001743",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001743.tgz",
+      "integrity": "sha512-e6Ojr7RV14Un7dz6ASD0aZDmQPT/A+eZU+nuTNfjqmRrmkmQlnTNWH0SKmqagx9PeW87UVqapSurtAXifmtdmw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/caniuse-lite"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "CC-BY-4.0"
+    },
+    "node_modules/capture-exit": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
+      "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "rsvp": "^4.8.4"
+      },
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/capture-exit/node_modules/rsvp": {
+      "version": "4.8.5",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz",
+      "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "6.* || >= 7.*"
+      }
+    },
+    "node_modules/chalk": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
+      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/chalk?sponsor=1"
+      }
+    },
+    "node_modules/char-regex": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz",
+      "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/chardet": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz",
+      "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==",
+      "license": "MIT"
+    },
+    "node_modules/chownr": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+      "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cjs-module-lexer": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz",
+      "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/class-utils": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz",
+      "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "define-property": "^0.2.5",
+        "isobject": "^3.0.0",
+        "static-extend": "^0.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/class-utils/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/clean-stack": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
+      "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cli-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
+      "license": "MIT",
+      "dependencies": {
+        "restore-cursor": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cli-truncate": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-2.1.0.tgz",
+      "integrity": "sha512-n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "slice-ansi": "^3.0.0",
+        "string-width": "^4.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/cli-truncate/node_modules/slice-ansi": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-3.0.0.tgz",
+      "integrity": "sha512-pSyv7bSTC7ig9Dcgbw9AuRNUb5k5V6oDudjZoMBSr13qpLBG7tB+zgCkARjq7xIUgdz5P1Qe8u+rSGdouOOIyQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cli-width": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz",
+      "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==",
+      "license": "ISC",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/cliui": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz",
+      "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "string-width": "^4.2.0",
+        "strip-ansi": "^6.0.0",
+        "wrap-ansi": "^6.2.0"
+      }
+    },
+    "node_modules/cliui/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/collect-v8-coverage": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/collection-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz",
+      "integrity": "sha512-lNkKvzEeMBBjUGHZ+q6z9pSJla0KWAQPvtzhEV9+iGyQYG+pBpl7xKDhxoNSOZH2hhv0v5k0y2yAM4o4SjoSkw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "map-visit": "^1.0.0",
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.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/colorette": {
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+      "license": "MIT",
+      "dependencies": {
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/commander": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz",
+      "integrity": "sha512-U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/component-emitter": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz",
+      "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
+      "license": "MIT"
+    },
+    "node_modules/convert-source-map": {
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz",
+      "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cookiejar": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz",
+      "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==",
+      "license": "MIT"
+    },
+    "node_modules/copy-descriptor": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz",
+      "integrity": "sha512-XgZ0pFcakEUlbwQEVNg3+QAis1FyTL3Qel9FYy8pSkQqoG3PNoT0bOCQtOXcOkur21r2Eq2kI+IE+gsmAEVlYw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==",
+      "license": "MIT"
+    },
+    "node_modules/cosmiconfig": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz",
+      "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/parse-json": "^4.0.0",
+        "import-fresh": "^3.2.1",
+        "parse-json": "^5.0.0",
+        "path-type": "^4.0.0",
+        "yaml": "^1.10.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "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/cssom": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz",
+      "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssom": "~0.3.6"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/data-uri-to-buffer": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-6.0.2.tgz",
+      "integrity": "sha512-7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/data-urls": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz",
+      "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "abab": "^2.0.3",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "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/decamelize": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz",
+      "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/decimal.js": {
+      "version": "10.6.0",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz",
+      "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/decode-uri-component": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/dedent": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz",
+      "integrity": "sha512-Q6fKUPqnAHAyhiUgFU7BUzLiv0kd8saH9al7tnu5Q/okj6dnupxyTgFIBjVzJATdfIAm9NAsvXNzjaKa+bxVyA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/define-property": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz",
+      "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^1.0.2",
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/degenerator": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-5.0.1.tgz",
+      "integrity": "sha512-TllpMR/t0M5sqCXfj85i4XaAzxmS5tVA16dqvdkMwGmzI+dXLXnw3J+3Vdv7VKw+ThlTMboK6i9rnZ6Nntj5CQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ast-types": "^0.13.4",
+        "escodegen": "^2.1.0",
+        "esprima": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/dezalgo": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz",
+      "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==",
+      "license": "ISC",
+      "dependencies": {
+        "asap": "^2.0.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/diff": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz",
+      "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==",
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.3.1"
+      }
+    },
+    "node_modules/diff-sequences": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz",
+      "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/domexception": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz",
+      "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==",
+      "deprecated": "Use your platform's native DOMException instead",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "webidl-conversions": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/domexception/node_modules/webidl-conversions": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz",
+      "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/duplexer2": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/duplexer2/-/duplexer2-0.1.4.tgz",
+      "integrity": "sha512-asLFVfWWtJ90ZyOUHMqk7/S2w2guQKxUI2itj3d92ADHhxUSbCMGi1f1cBcJ7xM1To+pE/Khbwo1yuNbMEPKeA==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/duplexer2/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "license": "MIT",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/duplexer2/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
+    },
+    "node_modules/duplexer2/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.222",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.222.tgz",
+      "integrity": "sha512-gA7psSwSwQRE60CEoLz6JBCQPIxNeuzB2nL8vE03GK/OHxlvykbLyeiumQy1iH5C2f3YbRAZpGCMT12a/9ih9w==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/elementtree": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/elementtree/-/elementtree-0.1.7.tgz",
+      "integrity": "sha512-wkgGT6kugeQk/P6VZ/f4T+4HB41BVgNBq5CDIZVbQ02nvTVqAiVTbskxxu3eA/X96lMlfYOwnLQpN2v5E1zDEg==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "sax": "1.1.4"
+      },
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/emittery": {
+      "version": "0.7.2",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz",
+      "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+      }
+    },
+    "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/enquirer": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz",
+      "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-colors": "^4.1.1",
+        "strip-ansi": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.4",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz",
+      "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
+      }
+    },
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/escodegen": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
+      }
+    },
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "license": "BSD-3-Clause",
+      "optional": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "license": "BSD-2-Clause",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/exec-sh": {
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz",
+      "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/execa": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz",
+      "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==",
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^7.0.0",
+        "get-stream": "^5.0.0",
+        "human-signals": "^1.1.1",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.0",
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/expand-brackets": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz",
+      "integrity": "sha512-w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^2.3.3",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "posix-character-classes": "^0.1.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/expand-brackets/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/expect": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz",
+      "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "ansi-styles": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-regex-util": "^26.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/extend-shallow": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz",
+      "integrity": "sha512-BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "assign-symbols": "^1.0.0",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/external-editor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz",
+      "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==",
+      "license": "MIT",
+      "dependencies": {
+        "chardet": "^0.7.0",
+        "iconv-lite": "^0.4.24",
+        "tmp": "^0.0.33"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/extglob": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz",
+      "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "array-unique": "^0.3.2",
+        "define-property": "^1.0.0",
+        "expand-brackets": "^2.1.4",
+        "extend-shallow": "^2.0.1",
+        "fragment-cache": "^0.2.1",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/extglob/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/fast-safe-stringify": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz",
+      "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==",
+      "license": "MIT"
+    },
+    "node_modules/fb-watchman": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "bser": "2.1.1"
+      }
+    },
+    "node_modules/figures": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz",
+      "integrity": "sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg==",
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha512-7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/form-data": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.4.tgz",
+      "integrity": "sha512-f0cRzm6dkyVYV3nPoooP8XlccPQukegwhAnpoLcXy+X+A8KfpGOoXwDr9FLZd3wzgLaBGQBE3lY93Zm/i1JvIQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
+        "mime-types": "^2.1.35"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/formidable": {
+      "version": "3.5.4",
+      "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.4.tgz",
+      "integrity": "sha512-YikH+7CUTOtP44ZTnUhR7Ic2UASBPOqmaRkRKxRbywPTe5VxF7RRCck4af9wutiZ/QKM5nME9Bie2fFaPz5Gug==",
+      "license": "MIT",
+      "dependencies": {
+        "@paralleldrive/cuid2": "^2.2.2",
+        "dezalgo": "^1.0.4",
+        "once": "^1.4.0"
+      },
+      "engines": {
+        "node": ">=14.0.0"
+      },
+      "funding": {
+        "url": "https://ko-fi.com/tunnckoCore/commissions"
+      }
+    },
+    "node_modules/fragment-cache": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz",
+      "integrity": "sha512-GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "map-cache": "^0.2.2"
+      },
+      "engines": {
+        "node": ">=0.10.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/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "license": "ISC",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/fs-minipass/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/fs-minipass/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "license": "ISC"
+    },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
+      "license": "ISC"
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "dev": true,
+      "hasInstallScript": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
+    },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/get-intrinsic": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/get-own-enumerable-property-symbols": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz",
+      "integrity": "sha512-I0UBV/XOz1XkIJHEUDMZAbzCThU/H8DxmSfmdGcKPnVhu2VfFqr34jr9777IyaTYvxjedWhqVIilEDsCdP5G6g==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+      "license": "MIT",
+      "dependencies": {
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/get-stream": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
+      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+      "license": "MIT",
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/get-uri": {
+      "version": "6.0.5",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.5.tgz",
+      "integrity": "sha512-b1O07XYq8eRuVzBNgJLstU6FYc1tS6wnMtF1I1D9lE8LxZSOGZ7LhxN54yPP6mGw5f2CkXY2BQUL9Fx41qvcIg==",
+      "license": "MIT",
+      "dependencies": {
+        "basic-ftp": "^5.0.2",
+        "data-uri-to-buffer": "^6.0.2",
+        "debug": "^4.3.4"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/get-value": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz",
+      "integrity": "sha512-Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "license": "ISC",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "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/growly": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz",
+      "integrity": "sha512-+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "license": "MIT",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz",
+      "integrity": "sha512-IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-value": "^2.0.6",
+        "has-values": "^1.0.0",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz",
+      "integrity": "sha512-ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "kind-of": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/has-values/node_modules/kind-of": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz",
+      "integrity": "sha512-24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "license": "MIT",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/hosted-git-info": {
+      "version": "2.8.9",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.9.tgz",
+      "integrity": "sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/html-encoding-sniffer": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz",
+      "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "whatwg-encoding": "^1.0.5"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz",
+      "integrity": "sha512-k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@tootallnate/once": "1",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/human-signals": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz",
+      "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=8.12.0"
+      }
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "license": "MIT",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "parent-module": "^1.0.0",
+        "resolve-from": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-fresh/node_modules/resolve-from": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
+      "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+      "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "license": "ISC",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "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/inquirer": {
+      "version": "7.3.3",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz",
+      "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-width": "^3.0.0",
+        "external-editor": "^3.0.3",
+        "figures": "^3.0.0",
+        "lodash": "^4.17.19",
+        "mute-stream": "0.0.8",
+        "run-async": "^2.4.0",
+        "rxjs": "^6.6.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0",
+        "through": "^2.3.6"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/ip-address": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.0.1.tgz",
+      "integrity": "sha512-NWv9YLW4PoW2B7xtzaS3NCot75m6nK7Icdv0o3lfMceJVRfSoQwqD4wEH5rLwoKJwUiZ/rfpiVBhnaF0FK4HoA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/is-accessor-descriptor": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.1.tgz",
+      "integrity": "sha512-YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-ci": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
+      "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ci-info": "^2.0.0"
+      },
+      "bin": {
+        "is-ci": "bin.js"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-data-descriptor": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.1.tgz",
+      "integrity": "sha512-bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hasown": "^2.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-descriptor": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.3.tgz",
+      "integrity": "sha512-JCNNGbwWZEVaSPtS45mdtrneRWJFp07LLmykxeFV5F6oBvNF8vHSfJuJgoT472pSfk+Mf8VnlrspaFBHWM8JAw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "license": "MIT",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-extendable": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz",
+      "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-plain-object": "^2.0.4"
+      },
+      "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-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-obj": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz",
+      "integrity": "sha512-l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/is-regexp": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz",
+      "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==",
+      "license": "MIT"
+    },
+    "node_modules/is-unicode-supported": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz",
+      "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-windows": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz",
+      "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "license": "MIT",
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==",
+      "license": "MIT"
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+      "license": "ISC"
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+      "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "@babel/core": "^7.7.5",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.0.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz",
+      "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz",
+      "integrity": "sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/core": "^26.6.3",
+        "import-local": "^3.0.2",
+        "jest-cli": "^26.6.3"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-changed-files": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz",
+      "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "execa": "^4.0.0",
+        "throat": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-cli": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz",
+      "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/core": "^26.6.3",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "import-local": "^3.0.2",
+        "is-ci": "^2.0.0",
+        "jest-config": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "prompts": "^2.0.1",
+        "yargs": "^15.4.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-config": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz",
+      "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/core": "^7.1.0",
+        "@jest/test-sequencer": "^26.6.3",
+        "@jest/types": "^26.6.2",
+        "babel-jest": "^26.6.3",
+        "chalk": "^4.0.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.1",
+        "graceful-fs": "^4.2.4",
+        "jest-environment-jsdom": "^26.6.2",
+        "jest-environment-node": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "jest-jasmine2": "^26.6.3",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "peerDependencies": {
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-diff": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz",
+      "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-docblock": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz",
+      "integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-each": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz",
+      "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-environment-jsdom": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz",
+      "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jsdom": "^16.4.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-environment-node": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz",
+      "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "jest-mock": "^26.6.2",
+        "jest-util": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-get-type": {
+      "version": "26.3.0",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz",
+      "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-haste-map": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz",
+      "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "@types/graceful-fs": "^4.1.2",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-regex-util": "^26.0.0",
+        "jest-serializer": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
+        "micromatch": "^4.0.2",
+        "sane": "^4.0.3",
+        "walker": "^1.0.7"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.1.2"
+      }
+    },
+    "node_modules/jest-jasmine2": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz",
+      "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/traverse": "^7.1.0",
+        "@jest/environment": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "expect": "^26.6.2",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "pretty-format": "^26.6.2",
+        "throat": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-leak-detector": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz",
+      "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-matcher-utils": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz",
+      "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-message-util": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz",
+      "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "@jest/types": "^26.6.2",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.2",
+        "pretty-format": "^26.6.2",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-mock": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz",
+      "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "@types/node": "*"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-regex-util": {
+      "version": "26.0.0",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz",
+      "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-resolve": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz",
+      "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^26.6.2",
+        "read-pkg-up": "^7.0.1",
+        "resolve": "^1.18.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-resolve-dependencies": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz",
+      "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-snapshot": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-runner": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz",
+      "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.7.1",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.4",
+        "jest-config": "^26.6.3",
+        "jest-docblock": "^26.0.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-leak-detector": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "jest-runtime": "^26.6.3",
+        "jest-util": "^26.6.2",
+        "jest-worker": "^26.6.2",
+        "source-map-support": "^0.5.6",
+        "throat": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-runtime": {
+      "version": "26.6.3",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz",
+      "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/console": "^26.6.2",
+        "@jest/environment": "^26.6.2",
+        "@jest/fake-timers": "^26.6.2",
+        "@jest/globals": "^26.6.2",
+        "@jest/source-map": "^26.6.2",
+        "@jest/test-result": "^26.6.2",
+        "@jest/transform": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^0.6.0",
+        "collect-v8-coverage": "^1.0.0",
+        "exit": "^0.1.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.4",
+        "jest-config": "^26.6.3",
+        "jest-haste-map": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-mock": "^26.6.2",
+        "jest-regex-util": "^26.0.0",
+        "jest-resolve": "^26.6.2",
+        "jest-snapshot": "^26.6.2",
+        "jest-util": "^26.6.2",
+        "jest-validate": "^26.6.2",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0",
+        "yargs": "^15.4.1"
+      },
+      "bin": {
+        "jest-runtime": "bin/jest-runtime.js"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-serializer": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz",
+      "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "graceful-fs": "^4.2.4"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-snapshot": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz",
+      "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^7.0.0",
+        "@jest/types": "^26.6.2",
+        "@types/babel__traverse": "^7.0.4",
+        "@types/prettier": "^2.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^26.6.2",
+        "graceful-fs": "^4.2.4",
+        "jest-diff": "^26.6.2",
+        "jest-get-type": "^26.3.0",
+        "jest-haste-map": "^26.6.2",
+        "jest-matcher-utils": "^26.6.2",
+        "jest-message-util": "^26.6.2",
+        "jest-resolve": "^26.6.2",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^26.6.2",
+        "semver": "^7.3.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-util": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz",
+      "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.4",
+        "is-ci": "^2.0.0",
+        "micromatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-validate": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz",
+      "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "camelcase": "^6.0.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^26.3.0",
+        "leven": "^3.1.0",
+        "pretty-format": "^26.6.2"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-validate/node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-watcher": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz",
+      "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/test-result": "^26.6.2",
+        "@jest/types": "^26.6.2",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "jest-util": "^26.6.2",
+        "string-length": "^4.0.1"
+      },
+      "engines": {
+        "node": ">= 10.14.2"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz",
+      "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">= 10.13.0"
+      }
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsdom": {
+      "version": "16.7.0",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz",
+      "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "abab": "^2.0.5",
+        "acorn": "^8.2.4",
+        "acorn-globals": "^6.0.0",
+        "cssom": "^0.4.4",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^2.0.0",
+        "decimal.js": "^10.2.1",
+        "domexception": "^2.0.1",
+        "escodegen": "^2.0.0",
+        "form-data": "^3.0.0",
+        "html-encoding-sniffer": "^2.0.1",
+        "http-proxy-agent": "^4.0.1",
+        "https-proxy-agent": "^5.0.0",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.0",
+        "parse5": "6.0.1",
+        "saxes": "^5.0.1",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.0.0",
+        "w3c-hr-time": "^1.0.2",
+        "w3c-xmlserializer": "^2.0.0",
+        "webidl-conversions": "^6.1.0",
+        "whatwg-encoding": "^1.0.5",
+        "whatwg-mimetype": "^2.3.0",
+        "whatwg-url": "^8.5.0",
+        "ws": "^7.4.6",
+        "xml-name-validator": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.2.0.tgz",
+      "integrity": "sha512-FGuPw30AdOIUTRMC2OMRtQV+jkVj2cfPqSeWXv1NEAJ1qZ5zb1X6z1mFhbfOB/iy3ssJCD+3KuZ8r8C3uVFlAg==",
+      "license": "MIT",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/leek": {
+      "version": "0.0.24",
+      "resolved": "https://registry.npmjs.org/leek/-/leek-0.0.24.tgz",
+      "integrity": "sha512-6PVFIYXxlYF0o6hrAsHtGpTmi06otkwNrMcmQ0K96SeSRHPREPa9J3nJZ1frliVH7XT0XFswoJFQoXsDukzGNQ==",
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^2.1.0",
+        "lodash.assign": "^3.2.0",
+        "rsvp": "^3.0.21"
+      }
+    },
+    "node_modules/leek/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/leek/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "license": "MIT"
+    },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lint-staged": {
+      "version": "10.5.4",
+      "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.5.4.tgz",
+      "integrity": "sha512-EechC3DdFic/TdOPgj/RB3FicqE6932LTHCUm0Y2fsD9KGlLB+RwJl2q1IYBIvEsKzDOgn0D4gll+YxG5RsrKg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "cli-truncate": "^2.1.0",
+        "commander": "^6.2.0",
+        "cosmiconfig": "^7.0.0",
+        "debug": "^4.2.0",
+        "dedent": "^0.7.0",
+        "enquirer": "^2.3.6",
+        "execa": "^4.1.0",
+        "listr2": "^3.2.2",
+        "log-symbols": "^4.0.0",
+        "micromatch": "^4.0.2",
+        "normalize-path": "^3.0.0",
+        "please-upgrade-node": "^3.2.0",
+        "string-argv": "0.3.1",
+        "stringify-object": "^3.3.0"
+      },
+      "bin": {
+        "lint-staged": "bin/lint-staged.js"
+      },
+      "funding": {
+        "url": "https://opencollective.com/lint-staged"
+      }
+    },
+    "node_modules/listr2": {
+      "version": "3.14.0",
+      "resolved": "https://registry.npmjs.org/listr2/-/listr2-3.14.0.tgz",
+      "integrity": "sha512-TyWI8G99GX9GjE54cJ+RrNMcIFBfwMPxc3XTFiAYGN4s10hWROGtOg7+O6u6LE3mNkyld7RSLE6nrKBvTfcs3g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cli-truncate": "^2.1.0",
+        "colorette": "^2.0.16",
+        "log-update": "^4.0.0",
+        "p-map": "^4.0.0",
+        "rfdc": "^1.3.0",
+        "rxjs": "^7.5.1",
+        "through": "^2.3.8",
+        "wrap-ansi": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "enquirer": ">= 2.3.0 < 3"
+      },
+      "peerDependenciesMeta": {
+        "enquirer": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/listr2/node_modules/rxjs": {
+      "version": "7.8.2",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
+      "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^2.1.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "license": "MIT"
+    },
+    "node_modules/lodash._baseassign": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz",
+      "integrity": "sha512-t3N26QR2IdSN+gqSy9Ds9pBu/J1EAFEshKlUHpJG3rvyJOYgcELIxcIeKKfZk7sjOz11cFfzJRsyFry/JyabJQ==",
+      "license": "MIT",
+      "dependencies": {
+        "lodash._basecopy": "^3.0.0",
+        "lodash.keys": "^3.0.0"
+      }
+    },
+    "node_modules/lodash._basecopy": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz",
+      "integrity": "sha512-rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==",
+      "license": "MIT"
+    },
+    "node_modules/lodash._bindcallback": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/lodash._bindcallback/-/lodash._bindcallback-3.0.1.tgz",
+      "integrity": "sha512-2wlI0JRAGX8WEf4Gm1p/mv/SZ+jLijpj0jyaE/AXeuQphzCgD8ZQW4oSpoN8JAopujOFGU3KMuq7qfHBWlGpjQ==",
+      "license": "MIT"
+    },
+    "node_modules/lodash._createassigner": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/lodash._createassigner/-/lodash._createassigner-3.1.1.tgz",
+      "integrity": "sha512-LziVL7IDnJjQeeV95Wvhw6G28Z8Q6da87LWKOPWmzBLv4u6FAT/x5v00pyGW0u38UoogNF2JnD3bGgZZDaNEBw==",
+      "license": "MIT",
+      "dependencies": {
+        "lodash._bindcallback": "^3.0.0",
+        "lodash._isiterateecall": "^3.0.0",
+        "lodash.restparam": "^3.0.0"
+      }
+    },
+    "node_modules/lodash._getnative": {
+      "version": "3.9.1",
+      "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz",
+      "integrity": "sha512-RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==",
+      "license": "MIT"
+    },
+    "node_modules/lodash._isiterateecall": {
+      "version": "3.0.9",
+      "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz",
+      "integrity": "sha512-De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.assign": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-3.2.0.tgz",
+      "integrity": "sha512-/VVxzgGBmbphasTg51FrztxQJ/VgAUpol6zmJuSVSGcNg4g7FA4z7rQV8Ovr9V3vFBNWZhvKWHfpAytjTVUfFA==",
+      "license": "MIT",
+      "dependencies": {
+        "lodash._baseassign": "^3.0.0",
+        "lodash._createassigner": "^3.0.0",
+        "lodash.keys": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.isarguments": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz",
+      "integrity": "sha512-chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.isarray": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz",
+      "integrity": "sha512-JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==",
+      "license": "MIT"
+    },
+    "node_modules/lodash.keys": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz",
+      "integrity": "sha512-CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==",
+      "license": "MIT",
+      "dependencies": {
+        "lodash._getnative": "^3.0.0",
+        "lodash.isarguments": "^3.0.0",
+        "lodash.isarray": "^3.0.0"
+      }
+    },
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/lodash.restparam": {
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz",
+      "integrity": "sha512-L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==",
+      "license": "MIT"
+    },
+    "node_modules/log-symbols": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz",
+      "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "is-unicode-supported": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-update/-/log-update-4.0.0.tgz",
+      "integrity": "sha512-9fkkDevMefjg0mmzWFBW8YkFP91OrizzkW3diF7CpG+S2EYdy4+TVfGwz1zeF8x7hCx1ovSPTOE9Ngib74qqUg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-escapes": "^4.3.0",
+        "cli-cursor": "^3.1.0",
+        "slice-ansi": "^4.0.0",
+        "wrap-ansi": "^6.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/log-update/node_modules/wrap-ansi": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz",
+      "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "string-width": "^4.1.0",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/macos-release": {
+      "version": "2.5.1",
+      "resolved": "https://registry.npmjs.org/macos-release/-/macos-release-2.5.1.tgz",
+      "integrity": "sha512-DXqXhEM7gW59OjZO8NIjBCz9AQ1BEMrfiOAl4AYByHCtVHRF4KoGNO8mqQeM8lRCtQe/UnJ4imO/d2HdkKsd+A==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/make-error": {
+      "version": "1.3.6",
+      "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz",
+      "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/makeerror": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "tmpl": "1.0.5"
+      }
+    },
+    "node_modules/map-cache": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz",
+      "integrity": "sha512-8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/map-visit": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz",
+      "integrity": "sha512-4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "object-visit": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==",
+      "license": "MIT"
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
+      },
+      "engines": {
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/mime": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+      "license": "MIT",
+      "bin": {
+        "mime": "cli.js"
+      },
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+      "license": "MIT",
+      "dependencies": {
+        "mime-db": "1.52.0"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "license": "ISC",
+      "dependencies": {
+        "brace-expansion": "^1.1.7"
+      },
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "license": "MIT",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/minipass": {
+      "version": "4.2.8",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz",
+      "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "license": "MIT",
+      "dependencies": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/minizlib/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "license": "ISC",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/minizlib/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "license": "ISC"
+    },
+    "node_modules/mixin-deep": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz",
+      "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "for-in": "^1.0.2",
+        "is-extendable": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "license": "MIT",
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "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/mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "license": "ISC"
+    },
+    "node_modules/nanomatch": {
+      "version": "1.2.13",
+      "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz",
+      "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "fragment-cache": "^0.2.1",
+        "is-windows": "^1.0.2",
+        "kind-of": "^6.0.2",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/netmask": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-2.0.2.tgz",
+      "integrity": "sha512-dBpDMdxv9Irdq66304OLfEmQ9tbNRFnFTuZiLo+bD+r332bBmMJ8GBLXklIXXgxd3+v9+KUnZaUR5PJMa75Gsg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4.0"
+      }
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/node-notifier": {
+      "version": "8.0.2",
+      "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.2.tgz",
+      "integrity": "sha512-oJP/9NAdd9+x2Q+rfphB2RJCHjod70RcRLjosiPMMu5gjIfwVnOUGq2nbTjTUbmy0DJ/tFIVT30+Qe3nzl4TJg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "dependencies": {
+        "growly": "^1.3.0",
+        "is-wsl": "^2.2.0",
+        "semver": "^7.3.2",
+        "shellwords": "^0.1.1",
+        "uuid": "^8.3.0",
+        "which": "^2.0.2"
+      }
+    },
+    "node_modules/node-releases": {
+      "version": "2.0.21",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.21.tgz",
+      "integrity": "sha512-5b0pgg78U3hwXkCM8Z9b2FJdPZlr9Psr9V2gQPESdGHqbntyFJKFW4r5TeWGFzafGY3hzs1JC62VEQMbl1JFkw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/normalize-package-data": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz",
+      "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "hosted-git-info": "^2.1.4",
+        "resolve": "^1.10.0",
+        "semver": "2 || 3 || 4 || 5",
+        "validate-npm-package-license": "^3.0.1"
+      }
+    },
+    "node_modules/normalize-package-data/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/nwsapi": {
+      "version": "2.2.22",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.22.tgz",
+      "integrity": "sha512-ujSMe1OWVn55euT1ihwCI1ZcAaAU3nxUiDwfDQldc51ZXaB9m2AyOn6/jh1BLe2t/G8xd6uKG1UBF2aZJeg2SQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/object-copy": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz",
+      "integrity": "sha512-79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "copy-descriptor": "^0.1.0",
+        "define-property": "^0.2.5",
+        "kind-of": "^3.0.3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-copy/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/object-copy/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object-inspect": {
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/object-visit": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
+      "integrity": "sha512-GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/object.pick": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
+      "integrity": "sha512-tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.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/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "license": "MIT",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/open": {
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
+      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
+      "license": "MIT",
+      "dependencies": {
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/os-name": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-4.0.1.tgz",
+      "integrity": "sha512-xl9MAoU97MH1Xt5K9ERft2YfCAoaO6msy1OBA0ozxEC0x0TmIoE6K3QvgJMMZA9yKGLmHXNY/YZoDbiGDj4zYw==",
+      "license": "MIT",
+      "dependencies": {
+        "macos-release": "^2.5.0",
+        "windows-release": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/p-each-series": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz",
+      "integrity": "sha512-ycIL2+1V32th+8scbpTvyHNaHe02z0sjgh91XXjAk+ZeXoPN4Z46DVUnzdso0aX4KckKw0FNNFHdjZ2UsZvxiA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/pac-proxy-agent": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-7.2.0.tgz",
+      "integrity": "sha512-TEB8ESquiLMc0lV8vcd5Ql/JAKAoyzHFXaStwjkzpOpC5Yv+pIzLfHvjTSdf3vpa2bMiUQrg9i6276yn8666aA==",
+      "license": "MIT",
+      "dependencies": {
+        "@tootallnate/quickjs-emscripten": "^0.23.0",
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "get-uri": "^6.0.1",
+        "http-proxy-agent": "^7.0.0",
+        "https-proxy-agent": "^7.0.6",
+        "pac-resolver": "^7.0.1",
+        "socks-proxy-agent": "^8.0.5"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/pac-proxy-agent/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/pac-proxy-agent/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/pac-proxy-agent/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/pac-resolver": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-7.0.1.tgz",
+      "integrity": "sha512-5NPgf87AT2STgwa2ntRMr45jTKrYBGkVU36yT0ig/n/GMAa3oPqhZfIQ2kMEimReg0+t9kZViDVZ83qfVUlckg==",
+      "license": "MIT",
+      "dependencies": {
+        "degenerator": "^5.0.0",
+        "netmask": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/parse5": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz",
+      "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/pascalcase": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz",
+      "integrity": "sha512-XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pirates": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
+      "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/please-upgrade-node": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz",
+      "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "semver-compare": "^1.0.0"
+      }
+    },
+    "node_modules/posix-character-classes": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz",
+      "integrity": "sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/pretty-format": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@jest/types": "^26.6.2",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
+        "react-is": "^17.0.1"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
+      "license": "MIT"
+    },
+    "node_modules/prompts": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
+      "integrity": "sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kleur": "^3.0.3",
+        "sisteransi": "^1.0.5"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/proxy-agent": {
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-6.5.0.tgz",
+      "integrity": "sha512-TmatMXdr2KlRiA2CyDu8GqR8EjahTG3aY3nXjdzFyoZbmB8hrBsTyMezhULIXKnC0jpfjlmiZ3+EaCzoInSu/A==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "http-proxy-agent": "^7.0.1",
+        "https-proxy-agent": "^7.0.6",
+        "lru-cache": "^7.14.1",
+        "pac-proxy-agent": "^7.1.0",
+        "proxy-from-env": "^1.1.0",
+        "socks-proxy-agent": "^8.0.5"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/proxy-agent/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/proxy-agent/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/proxy-agent/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/proxy-agent/node_modules/lru-cache": {
+      "version": "7.18.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-7.18.3.tgz",
+      "integrity": "sha512-jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/proxy-from-env": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
+      "license": "MIT"
+    },
+    "node_modules/psl": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
+      "integrity": "sha512-JZd3gMVBAVQkSs6HdNZo9Sdo0LNcQeMNP3CozBJb3JYC/QUYZTnKxP+f8oWRX4rHP5EurWxqAHTSwUCjlNKa1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "punycode": "^2.3.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/lupomontero"
+      }
+    },
+    "node_modules/pump": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.3.tgz",
+      "integrity": "sha512-todwxLMY7/heScKmntwQG8CXVkWUOdYxIvY2s0VWAAMh/nd8SoYiRaKjlr7+iCs984f2P8zvrfWcDDYVb73NfA==",
+      "license": "MIT",
+      "dependencies": {
+        "end-of-stream": "^1.1.0",
+        "once": "^1.3.1"
+      }
+    },
+    "node_modules/punycode": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
+      "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/qs": {
+      "version": "6.14.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.0.tgz",
+      "integrity": "sha512-YWWTjgABSKcvs/nWBi9PycY/JiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "side-channel": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/querystringify": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
+      "integrity": "sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/read-pkg": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz",
+      "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/normalize-package-data": "^2.4.0",
+        "normalize-package-data": "^2.5.0",
+        "parse-json": "^5.0.0",
+        "type-fest": "^0.6.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg-up": {
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz",
+      "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "find-up": "^4.1.0",
+        "read-pkg": "^5.2.0",
+        "type-fest": "^0.8.1"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/read-pkg-up/node_modules/type-fest": {
+      "version": "0.8.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz",
+      "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/read-pkg/node_modules/type-fest": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz",
+      "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==",
+      "dev": true,
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "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/regex-not": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz",
+      "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "extend-shallow": "^3.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha512-/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/repeat-element": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.4.tgz",
+      "integrity": "sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha512-PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/require-main-filename": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+      "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/resolve": {
+      "version": "1.22.10",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
+      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-core-module": "^2.16.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/resolve-cwd": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz",
+      "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "resolve-from": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-from": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz",
+      "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/resolve-url": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz",
+      "integrity": "sha512-ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg==",
+      "deprecated": "https://github.com/lydell/resolve-url#deprecated",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/restore-cursor": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
+      "license": "MIT",
+      "dependencies": {
+        "onetime": "^5.1.0",
+        "signal-exit": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/ret": {
+      "version": "0.1.15",
+      "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz",
+      "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12"
+      }
+    },
+    "node_modules/rfdc": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz",
+      "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/rimraf": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz",
+      "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "license": "ISC",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/rsvp": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-3.6.2.tgz",
+      "integrity": "sha512-OfWGQTb9vnwRjwtA2QwpG2ICclHC3pgXZO5xt8H2EfgDquO0qVdSb5T88L4qJVAEugbS56pAuV4XZM58UX8ulw==",
+      "license": "MIT",
+      "engines": {
+        "node": "0.12.* || 4.* || 6.* || >= 7.*"
+      }
+    },
+    "node_modules/run-async": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz",
+      "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/rxjs": {
+      "version": "6.6.7",
+      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz",
+      "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "tslib": "^1.9.0"
+      },
+      "engines": {
+        "npm": ">=2.0.0"
+      }
+    },
+    "node_modules/rxjs/node_modules/tslib": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz",
+      "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==",
+      "license": "0BSD"
+    },
+    "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/safe-regex": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz",
+      "integrity": "sha512-aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ret": "~0.1.10"
+      }
+    },
+    "node_modules/safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "license": "MIT"
+    },
+    "node_modules/sane": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz",
+      "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==",
+      "deprecated": "some dependency vulnerabilities fixed, support for node < 10 dropped, and newer ECMAScript syntax/features added",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cnakazawa/watch": "^1.0.3",
+        "anymatch": "^2.0.0",
+        "capture-exit": "^2.0.0",
+        "exec-sh": "^0.3.2",
+        "execa": "^1.0.0",
+        "fb-watchman": "^2.0.0",
+        "micromatch": "^3.1.4",
+        "minimist": "^1.1.1",
+        "walker": "~1.0.5"
+      },
+      "bin": {
+        "sane": "src/cli.js"
+      },
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
+      }
+    },
+    "node_modules/sane/node_modules/anymatch": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz",
+      "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "micromatch": "^3.1.4",
+        "normalize-path": "^2.1.1"
+      }
+    },
+    "node_modules/sane/node_modules/braces": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz",
+      "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "arr-flatten": "^1.1.0",
+        "array-unique": "^0.3.2",
+        "extend-shallow": "^2.0.1",
+        "fill-range": "^4.0.0",
+        "isobject": "^3.0.1",
+        "repeat-element": "^1.1.2",
+        "snapdragon": "^0.8.1",
+        "snapdragon-node": "^2.0.1",
+        "split-string": "^3.0.2",
+        "to-regex": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/braces/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/cross-spawn": {
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz",
+      "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
+      },
+      "engines": {
+        "node": ">=4.8"
+      }
+    },
+    "node_modules/sane/node_modules/execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/sane/node_modules/fill-range": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz",
+      "integrity": "sha512-VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1",
+        "to-regex-range": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/fill-range/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "pump": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/sane/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/is-number": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz",
+      "integrity": "sha512-4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/is-number/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/micromatch": {
+      "version": "3.1.10",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz",
+      "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "arr-diff": "^4.0.0",
+        "array-unique": "^0.3.2",
+        "braces": "^2.3.1",
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "extglob": "^2.0.4",
+        "fragment-cache": "^0.2.1",
+        "kind-of": "^6.0.2",
+        "nanomatch": "^1.2.9",
+        "object.pick": "^1.3.0",
+        "regex-not": "^1.0.0",
+        "snapdragon": "^0.8.1",
+        "to-regex": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha512-3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "remove-trailing-separator": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "path-key": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/sane/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/sane/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "dev": true,
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/sane/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/to-regex-range": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz",
+      "integrity": "sha512-ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^3.0.0",
+        "repeat-string": "^1.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/sane/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "isexe": "^2.0.0"
+      },
+      "bin": {
+        "which": "bin/which"
+      }
+    },
+    "node_modules/sax": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/sax/-/sax-1.1.4.tgz",
+      "integrity": "sha512-5f3k2PbGGp+YtKJjOItpg3P99IMD84E4HOvcfleTb5joCHNXYLsR9yWFPOYGgaeMPDubQILTCMdsFb2OMeOjtg==",
+      "license": "ISC"
+    },
+    "node_modules/saxes": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz",
+      "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "xmlchars": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver": {
+      "version": "7.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
+      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/semver-compare": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz",
+      "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/set-blocking": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz",
+      "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/set-value": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz",
+      "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "extend-shallow": "^2.0.1",
+        "is-extendable": "^0.1.1",
+        "is-plain-object": "^2.0.3",
+        "split-string": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/set-value/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/set-value/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "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/shellwords": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz",
+      "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true
+    },
+    "node_modules/side-channel": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
+      "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3",
+        "side-channel-list": "^1.0.0",
+        "side-channel-map": "^1.0.1",
+        "side-channel-weakmap": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-list": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
+      "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "license": "MIT",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-map": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
+      "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/side-channel-weakmap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
+      "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "license": "MIT",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.5",
+        "object-inspect": "^1.13.3",
+        "side-channel-map": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==",
+      "license": "ISC"
+    },
+    "node_modules/sisteransi": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/slash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
+      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/slice-ansi": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz",
+      "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-styles": "^4.0.0",
+        "astral-regex": "^2.0.0",
+        "is-fullwidth-code-point": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/slice-ansi?sponsor=1"
+      }
+    },
+    "node_modules/smart-buffer": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz",
+      "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 6.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/snapdragon": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz",
+      "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "base": "^0.11.1",
+        "debug": "^2.2.0",
+        "define-property": "^0.2.5",
+        "extend-shallow": "^2.0.1",
+        "map-cache": "^0.2.2",
+        "source-map": "^0.5.6",
+        "source-map-resolve": "^0.5.0",
+        "use": "^3.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz",
+      "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-property": "^1.0.0",
+        "isobject": "^3.0.0",
+        "snapdragon-util": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-node/node_modules/define-property": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz",
+      "integrity": "sha512-cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz",
+      "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^3.2.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon-util/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/extend-shallow": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz",
+      "integrity": "sha512-zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-extendable": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/snapdragon/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/snapdragon/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/snapdragon/node_modules/source-map": {
+      "version": "0.5.7",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
+      "integrity": "sha512-LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/socks": {
+      "version": "2.8.7",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz",
+      "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==",
+      "license": "MIT",
+      "dependencies": {
+        "ip-address": "^10.0.1",
+        "smart-buffer": "^4.2.0"
+      },
+      "engines": {
+        "node": ">= 10.0.0",
+        "npm": ">= 3.0.0"
+      }
+    },
+    "node_modules/socks-proxy-agent": {
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz",
+      "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==",
+      "license": "MIT",
+      "dependencies": {
+        "agent-base": "^7.1.2",
+        "debug": "^4.3.4",
+        "socks": "^2.8.3"
+      },
+      "engines": {
+        "node": ">= 14"
+      }
+    },
+    "node_modules/socks-proxy-agent/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/source-map": {
+      "version": "0.7.6",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.6.tgz",
+      "integrity": "sha512-i5uvt8C3ikiWeNZSVZNWcfZPItFQOsYTUAOkcUPGd8DqDy1uOUikjt5dG+uRlwyvR108Fb9DOd4GvXfT0N2/uQ==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">= 12"
+      }
+    },
+    "node_modules/source-map-resolve": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz",
+      "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==",
+      "deprecated": "See https://github.com/lydell/source-map-resolve#deprecated",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "atob": "^2.1.2",
+        "decode-uri-component": "^0.2.0",
+        "resolve-url": "^0.2.1",
+        "source-map-url": "^0.4.0",
+        "urix": "^0.1.0"
+      }
+    },
+    "node_modules/source-map-support": {
+      "version": "0.5.21",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
+      "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/source-map-support/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/source-map-url": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.1.tgz",
+      "integrity": "sha512-cPiFOTLUKvJFIg4SKVScy4ilPPW6rFgMgfuZJPNoDuMs3nC1HbMUycBoJw77xFIp6z1UJQJOfx6C9GMH80DiTw==",
+      "deprecated": "See https://github.com/lydell/source-map-url#deprecated",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/spdx-correct": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz",
+      "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "spdx-expression-parse": "^3.0.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-exceptions": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz",
+      "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==",
+      "dev": true,
+      "license": "CC-BY-3.0"
+    },
+    "node_modules/spdx-expression-parse": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz",
+      "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "spdx-exceptions": "^2.1.0",
+        "spdx-license-ids": "^3.0.0"
+      }
+    },
+    "node_modules/spdx-license-ids": {
+      "version": "3.0.22",
+      "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz",
+      "integrity": "sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==",
+      "dev": true,
+      "license": "CC0-1.0"
+    },
+    "node_modules/split-string": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
+      "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "extend-shallow": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/split2": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/split2/-/split2-3.2.2.tgz",
+      "integrity": "sha512-9NThjpgZnifTkJpzTZ7Eue85S49QwpNhZTq6GRJwObb6jnLFNGB7Qm73V5HewTROPyxD0C29xqmaI68bQtV+hg==",
+      "license": "ISC",
+      "dependencies": {
+        "readable-stream": "^3.0.0"
+      }
+    },
+    "node_modules/sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/ssh-config": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/ssh-config/-/ssh-config-1.1.6.tgz",
+      "integrity": "sha512-ZPO9rECxzs5JIQ6G/2EfL1I9ho/BVZkx9HRKn8+0af7QgwAmumQ7XBFP1ggMyPMo+/tUbmv0HFdv4qifdO/9JA==",
+      "license": "MIT"
+    },
+    "node_modules/stack-utils": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz",
+      "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "escape-string-regexp": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/stack-utils/node_modules/escape-string-regexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz",
+      "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/static-extend": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz",
+      "integrity": "sha512-72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-property": "^0.2.5",
+        "object-copy": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/define-property": {
+      "version": "0.2.5",
+      "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz",
+      "integrity": "sha512-Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-descriptor": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/static-extend/node_modules/is-descriptor": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.7.tgz",
+      "integrity": "sha512-C3grZTvObeN1xud4cRWl366OMXZTj0+HGyk4hvfpx4ZHt1Pb60ANSXqCK7pdOTeUQpRzECBSTphqvD7U+l22Eg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-accessor-descriptor": "^1.0.1",
+        "is-data-descriptor": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/stream-combiner2": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/stream-combiner2/-/stream-combiner2-1.1.1.tgz",
+      "integrity": "sha512-3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw==",
+      "license": "MIT",
+      "dependencies": {
+        "duplexer2": "~0.1.0",
+        "readable-stream": "^2.0.2"
+      }
+    },
+    "node_modules/stream-combiner2/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "license": "MIT",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/stream-combiner2/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "license": "MIT"
+    },
+    "node_modules/stream-combiner2/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "license": "MIT",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "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-argv": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/string-argv/-/string-argv-0.3.1.tgz",
+      "integrity": "sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.6.19"
+      }
+    },
+    "node_modules/string-length": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
+      "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "char-regex": "^1.0.2",
+        "strip-ansi": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "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/stringify-object": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-3.3.0.tgz",
+      "integrity": "sha512-rHqiFh1elqCQ9WPLIC8I0Q/g/wj5J1eMkyoiD6eoQApWHP0FtlK7rqnhmabL5VUY9JQCcqwwvlOaSuutekgyrw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "get-own-enumerable-property-symbols": "^3.0.0",
+        "is-obj": "^1.0.1",
+        "is-regexp": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "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-bom": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz",
+      "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-eof": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz",
+      "integrity": "sha512-7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/strip-final-newline": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz",
+      "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/superagent": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/superagent/-/superagent-9.0.2.tgz",
+      "integrity": "sha512-xuW7dzkUpcJq7QnhOsnNUgtYp3xRwpt2F7abdRYIpCsAt0hhUqia0EdxyXZQQpNmGtsCzYHryaKSV3q3GJnq7w==",
+      "deprecated": "Please upgrade to superagent v10.2.2+, see release notes at https://github.com/forwardemail/superagent/releases/tag/v10.2.2 - maintenance is supported by Forward Email @ https://forwardemail.net",
+      "license": "MIT",
+      "dependencies": {
+        "component-emitter": "^1.3.0",
+        "cookiejar": "^2.1.4",
+        "debug": "^4.3.4",
+        "fast-safe-stringify": "^2.1.1",
+        "form-data": "^4.0.0",
+        "formidable": "^3.5.1",
+        "methods": "^1.1.2",
+        "mime": "2.6.0",
+        "qs": "^6.11.0"
+      },
+      "engines": {
+        "node": ">=14.18.0"
+      }
+    },
+    "node_modules/superagent/node_modules/form-data": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
+      "license": "MIT",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/supports-color": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-hyperlinks": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.3.0.tgz",
+      "integrity": "sha512-RpsAZlpWcDwOPQA22aCH4J0t7L8JmAvsCxfOSEwm7cQs3LshN36QaTkwd70DnBOXDWGssw2eUoc8CaRWT0XunA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-flag": "^4.0.0",
+        "supports-color": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/supports-preserve-symlinks-flag": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
+      "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/symbol-tree": {
+      "version": "3.2.4",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz",
+      "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/tar": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+      "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+      "license": "ISC",
+      "dependencies": {
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "minipass": "^5.0.0",
+        "minizlib": "^2.1.1",
+        "mkdirp": "^1.0.3",
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/tar/node_modules/minipass": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+      "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+      "license": "ISC",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tar/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+      "license": "ISC"
+    },
+    "node_modules/terminal-link": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz",
+      "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "ansi-escapes": "^4.2.1",
+        "supports-hyperlinks": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/test-exclude": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz",
+      "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@istanbuljs/schema": "^0.1.2",
+        "glob": "^7.1.4",
+        "minimatch": "^3.0.4"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/throat": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz",
+      "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==",
+      "license": "MIT"
+    },
+    "node_modules/tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "license": "MIT",
+      "dependencies": {
+        "os-tmpdir": "~1.0.2"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/tmpl": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz",
+      "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==",
+      "dev": true,
+      "license": "BSD-3-Clause"
+    },
+    "node_modules/to-object-path": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz",
+      "integrity": "sha512-9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "kind-of": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-object-path/node_modules/kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha512-NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-buffer": "^1.1.5"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/to-regex": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz",
+      "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "define-property": "^2.0.2",
+        "extend-shallow": "^3.0.2",
+        "regex-not": "^1.0.2",
+        "safe-regex": "^1.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "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==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "is-number": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=8.0"
+      }
+    },
+    "node_modules/tough-cookie": {
+      "version": "4.1.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz",
+      "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==",
+      "dev": true,
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "psl": "^1.1.33",
+        "punycode": "^2.1.1",
+        "universalify": "^0.2.0",
+        "url-parse": "^1.5.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/tough-cookie/node_modules/universalify": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
+      "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz",
+      "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/tree-kill": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/tree-kill/-/tree-kill-1.2.2.tgz",
+      "integrity": "sha512-L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==",
+      "license": "MIT",
+      "bin": {
+        "tree-kill": "cli.js"
+      }
+    },
+    "node_modules/ts-jest": {
+      "version": "26.3.0",
+      "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-26.3.0.tgz",
+      "integrity": "sha512-Jq2uKfx6bPd9+JDpZNMBJMdMQUC3sJ08acISj8NXlVgR2d5OqslEHOR2KHMgwymu8h50+lKIm0m0xj/ioYdW2Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@types/jest": "26.x",
+        "bs-logger": "0.x",
+        "buffer-from": "1.x",
+        "fast-json-stable-stringify": "2.x",
+        "jest-util": "26.x",
+        "json5": "2.x",
+        "lodash.memoize": "4.x",
+        "make-error": "1.x",
+        "mkdirp": "1.x",
+        "semver": "7.x",
+        "yargs-parser": "18.x"
+      },
+      "bin": {
+        "ts-jest": "cli.js"
+      },
+      "engines": {
+        "node": ">= 10"
+      },
+      "peerDependencies": {
+        "jest": ">=26 <27",
+        "typescript": ">=3.8 <5.0"
+      }
+    },
+    "node_modules/tslib": {
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "license": "0BSD"
+    },
+    "node_modules/type-detect": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
+      "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/type-fest": {
+      "version": "0.21.3",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz",
+      "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==",
+      "license": "(MIT OR CC0-1.0)",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/typedarray-to-buffer": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz",
+      "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==",
+      "license": "MIT",
+      "dependencies": {
+        "is-typedarray": "^1.0.0"
+      }
+    },
+    "node_modules/typescript": {
+      "version": "4.8.4",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.8.4.tgz",
+      "integrity": "sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "tsc": "bin/tsc",
+        "tsserver": "bin/tsserver"
+      },
+      "engines": {
+        "node": ">=4.2.0"
+      }
+    },
+    "node_modules/union-value": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz",
+      "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "arr-union": "^3.1.0",
+        "get-value": "^2.0.6",
+        "is-extendable": "^0.1.1",
+        "set-value": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/union-value/node_modules/is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha512-5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "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/unset-value": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz",
+      "integrity": "sha512-PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "has-value": "^0.3.1",
+        "isobject": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz",
+      "integrity": "sha512-gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "get-value": "^2.0.3",
+        "has-values": "^0.1.4",
+        "isobject": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-value/node_modules/isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "isarray": "1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/unset-value/node_modules/has-values": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz",
+      "integrity": "sha512-J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.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/update-browserslist-db": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
+      "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
+      "dev": true,
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/browserslist"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/browserslist"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
+      "dependencies": {
+        "escalade": "^3.2.0",
+        "picocolors": "^1.1.1"
+      },
+      "bin": {
+        "update-browserslist-db": "cli.js"
+      },
+      "peerDependencies": {
+        "browserslist": ">= 4.21.0"
+      }
+    },
+    "node_modules/urix": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz",
+      "integrity": "sha512-Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg==",
+      "deprecated": "Please see https://github.com/lydell/urix#deprecated",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/url-parse": {
+      "version": "1.5.10",
+      "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
+      "integrity": "sha512-WypcfiRhfeUP9vvF0j6rw0J3hrWrw6iZv3+22h6iRMJ/8z1Tj6XfLP4DsUix5MhMPnXpiHDoKyoZ/bdCkwBCiQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "querystringify": "^2.1.1",
+        "requires-port": "^1.0.0"
+      }
+    },
+    "node_modules/use": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz",
+      "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "license": "MIT"
+    },
+    "node_modules/uuid": {
+      "version": "8.3.2",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+      "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "bin": {
+        "uuid": "dist/bin/uuid"
+      }
+    },
+    "node_modules/v8-to-istanbul": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz",
+      "integrity": "sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.1",
+        "convert-source-map": "^1.6.0",
+        "source-map": "^0.7.3"
+      },
+      "engines": {
+        "node": ">=10.10.0"
+      }
+    },
+    "node_modules/validate-npm-package-license": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz",
+      "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "spdx-correct": "^3.0.0",
+        "spdx-expression-parse": "^3.0.0"
+      }
+    },
+    "node_modules/w3c-hr-time": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz",
+      "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==",
+      "deprecated": "Use your platform's native performance.now() and performance.timeOrigin.",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "browser-process-hrtime": "^1.0.0"
+      }
+    },
+    "node_modules/w3c-xmlserializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz",
+      "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "xml-name-validator": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/walker": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.8.tgz",
+      "integrity": "sha512-ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "makeerror": "1.0.12"
+      }
+    },
+    "node_modules/webidl-conversions": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
+      "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "engines": {
+        "node": ">=10.4"
+      }
+    },
+    "node_modules/whatwg-encoding": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz",
+      "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "iconv-lite": "0.4.24"
+      }
+    },
+    "node_modules/whatwg-mimetype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz",
+      "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/whatwg-url": {
+      "version": "8.7.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz",
+      "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "lodash": "^4.7.0",
+        "tr46": "^2.1.0",
+        "webidl-conversions": "^6.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "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/which-module": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz",
+      "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/windows-release": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/windows-release/-/windows-release-4.0.0.tgz",
+      "integrity": "sha512-OxmV4wzDKB1x7AZaZgXMVsdJ1qER1ed83ZrTYd5Bwq2HfJVg3DJS8nqlAG4sMoJ7mu8cuRmLEYyU13BKwctRAg==",
+      "license": "MIT",
+      "dependencies": {
+        "execa": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "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/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/write-file-atomic": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz",
+      "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==",
+      "license": "ISC",
+      "dependencies": {
+        "imurmurhash": "^0.1.4",
+        "is-typedarray": "^1.0.0",
+        "signal-exit": "^3.0.2",
+        "typedarray-to-buffer": "^3.1.5"
+      }
+    },
+    "node_modules/ws": {
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/xml-name-validator": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
+      "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
+      "dev": true,
+      "license": "Apache-2.0"
+    },
+    "node_modules/xmlchars": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
+      "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/y18n": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz",
+      "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/yallist": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz",
+      "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==",
+      "dev": true,
+      "license": "ISC"
+    },
+    "node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
+      "dev": true,
+      "license": "ISC",
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/yargs": {
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+      "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cliui": "^6.0.0",
+        "decamelize": "^1.2.0",
+        "find-up": "^4.1.0",
+        "get-caller-file": "^2.0.1",
+        "require-directory": "^2.1.1",
+        "require-main-filename": "^2.0.0",
+        "set-blocking": "^2.0.0",
+        "string-width": "^4.2.0",
+        "which-module": "^2.0.0",
+        "y18n": "^4.0.0",
+        "yargs-parser": "^18.1.2"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/yargs-parser": {
+      "version": "18.1.3",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz",
+      "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==",
+      "dev": true,
+      "license": "ISC",
+      "dependencies": {
+        "camelcase": "^5.0.0",
+        "decamelize": "^1.2.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    }
+  }
+}
diff --git a/pkgs/by-name/io/ionic-cli/package.nix b/pkgs/by-name/io/ionic-cli/package.nix
new file mode 100644
index 000000000000..585af96cbcdd
--- /dev/null
+++ b/pkgs/by-name/io/ionic-cli/package.nix
@@ -0,0 +1,32 @@
+{
+  buildNpmPackage,
+  fetchzip,
+  lib,
+}:
+buildNpmPackage (finalAttrs: {
+  pname = "ionic-cli";
+  version = "7.2.1";
+
+  src = fetchzip {
+    url = "https://registry.npmjs.org/@ionic/cli/-/cli-${finalAttrs.version}.tgz";
+    hash = "sha256-nrZMMyzoiO7ZJbNrPSRA1sOEy3OpgEXdyNS0JzAaTjY=";
+  };
+
+  postPatch = ''
+    cp ${./package-lock.json} package-lock.json
+  '';
+
+  npmDepsHash = "sha256-Nu4AWwFaGBakGAxUNllx4etUm4H5ygxAeMs1RWhzRQQ=";
+
+  dontNpmBuild = true;
+
+  meta = {
+    description = "Your go-to tool for developing Ionic apps";
+    homepage = "https://ionicframework.com/";
+    license = lib.licenses.mit;
+    mainProgram = "ionic";
+    maintainers = with lib.maintainers; [
+      albertlarsan68
+    ];
+  };
+})

From d4c44593f006f146cd87021f527a8a3255aa1615 Mon Sep 17 00:00:00 2001
From: Dmitry Ivankov <boltzmannrain@gmail.com>
Date: Thu, 2 Oct 2025 21:31:17 +0200
Subject: [PATCH 0333/6226] bazel_8.examples.rust: update FOD hashes

---
 pkgs/by-name/ba/bazel_8/examples.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ba/bazel_8/examples.nix b/pkgs/by-name/ba/bazel_8/examples.nix
index 1dc491c51398..d859784b4714 100644
--- a/pkgs/by-name/ba/bazel_8/examples.nix
+++ b/pkgs/by-name/ba/bazel_8/examples.nix
@@ -108,10 +108,10 @@ in
     bazelVendorDepsFOD = {
       outputHash =
         {
-          aarch64-darwin = "sha256-D5bwW35QuLLhVE22FDyV9Nl8N7ULx71wCHbzB81+Xx0=";
-          aarch64-linux = "sha256-F5X/cwtHR6sVFe1DzNDaEnGMIPR0SnXq2iIxhQeqIV8=";
-          x86_64-darwin = "sha256-DXuPy68m3p6hlgEid7tpY8fGgvJWQTXth6h2kMSNFCc=";
-          x86_64-linux = "sha256-oNLDccQ/XPg1Nl/9V14NdgiQsRoTvpaA6hyynMb414A=";
+          aarch64-darwin = "sha256-0QtaPtcBljyhiJGwA8ctSpi+UQp/9q/ZoHUHORizmlY=";
+          aarch64-linux = "sha256-zpiwQ8OB8KhY+kxSXlSOd/zmoH1VGYDGgojf4Or04pQ=";
+          x86_64-darwin = "sha256-+tCDSuYkon1DEARwWTYABJbmysSNAK9vy0tCm8YsGjQ=";
+          x86_64-linux = "sha256-wCWSRc20Yr/hdXn8szbhLAX7Oy3G5keyHTTdO0msnks=";
         }
         .${stdenv.hostPlatform.system};
       outputHashAlgo = "sha256";

From 4cee2f4e9c565d0cf01d5355b119f911df34777a Mon Sep 17 00:00:00 2001
From: Philipp Bartsch <phil@grmr.de>
Date: Fri, 19 Sep 2025 19:34:21 +0200
Subject: [PATCH 0334/6226] nixos/apparmor: add abstraction for golang

Since "Container-aware GOMAXPROCS" was introduced in golang version
1.25.0, there are new paths accessed on every go runtime startup.

Release notes: https://tip.golang.org/doc/go1.25#container-aware-gomaxprocs

> At startup (defaultGOMAXPROCSInit), we read /proc/self/cgroup and
> /proc/self/mountinfo to find our current CPU cgroup and open its
> limit file(s), which remain open for the entire process lifetime. We
> periodically read the current limit by  rereading the limit file(s)
> from the beginning.
>
> https://github.com/golang/go/blob/go1.25.0/src/runtime/cgroup_linux.go#L13
---
 nixos/modules/security/apparmor/includes.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/security/apparmor/includes.nix b/nixos/modules/security/apparmor/includes.nix
index 03f8f5df9d5f..4b759e1d94f9 100644
--- a/nixos/modules/security/apparmor/includes.nix
+++ b/nixos/modules/security/apparmor/includes.nix
@@ -431,6 +431,13 @@ in
     "abstractions/python" = ''
       include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/python"
     '';
+    "abstractions/golang" = ''
+      # Container-aware GOMAXPROCS
+      owner @{PROC}/@{pid}/mountinfo r,
+      owner @{PROC}/@{pid}/cgroup r,
+      @{sys}/fs/cgroup/**/{cpu.cfs_quota_us,cpu.cfs_period_us} r, # V1
+      @{sys}/fs/cgroup/**/cpu.max r, # V2
+    '';
     "abstractions/qt5" = ''
       include "${pkgs.apparmor-profiles}/etc/apparmor.d/abstractions/qt5"
     ''

From 00a6cc5bc104fbda703aa402101eb39d88da8e14 Mon Sep 17 00:00:00 2001
From: Philipp Bartsch <phil@grmr.de>
Date: Fri, 19 Sep 2025 21:54:28 +0200
Subject: [PATCH 0335/6226] nixos/miniflux: use golang apparmor abstraction

This patch fixes "DENIED" audit log entries of `nixosTests.miniflux`.
---
 nixos/modules/services/web-apps/miniflux.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix
index 8b89c03b24bc..db51ee10e263 100644
--- a/nixos/modules/services/web-apps/miniflux.nix
+++ b/nixos/modules/services/web-apps/miniflux.nix
@@ -186,6 +186,7 @@ in
         include <abstractions/base>
         include <abstractions/nameservice>
         include <abstractions/ssl_certs>
+        include <abstractions/golang>
         include "${pkgs.apparmorRulesFromClosure { name = "miniflux"; } cfg.package}"
         r ${cfg.package}/bin/miniflux,
         r @{sys}/kernel/mm/transparent_hugepage/hpage_pmd_size,

From 2bda2d98a5284e66dae006ebc0e7ddbcc823934f Mon Sep 17 00:00:00 2001
From: Philipp Bartsch <phil@grmr.de>
Date: Fri, 19 Sep 2025 21:55:14 +0200
Subject: [PATCH 0336/6226] nixos/miniflux: cleanup apparmor profile

Since apparmor 4.0 support for transparent hugepage is included via the
base abstraction.

https://gitlab.com/apparmor/apparmor/-/commit/3844e4522086897fa0ff2f5f049c61cffb845d80
---
 nixos/modules/services/web-apps/miniflux.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix
index db51ee10e263..a2ed4c5f6f46 100644
--- a/nixos/modules/services/web-apps/miniflux.nix
+++ b/nixos/modules/services/web-apps/miniflux.nix
@@ -189,7 +189,6 @@ in
         include <abstractions/golang>
         include "${pkgs.apparmorRulesFromClosure { name = "miniflux"; } cfg.package}"
         r ${cfg.package}/bin/miniflux,
-        r @{sys}/kernel/mm/transparent_hugepage/hpage_pmd_size,
         rw /run/miniflux/**,
       }
     '';

From 228c3debccab2070acc63e94878bc5a6201b73ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Oct 2025 19:55:14 +0000
Subject: [PATCH 0337/6226] flannel: 0.27.3 -> 0.27.4

---
 pkgs/tools/networking/flannel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
index f43f4bbf474e..3ef641264350 100644
--- a/pkgs/tools/networking/flannel/default.nix
+++ b/pkgs/tools/networking/flannel/default.nix
@@ -7,7 +7,7 @@
 
 buildGoModule rec {
   pname = "flannel";
-  version = "0.27.3";
+  version = "0.27.4";
   rev = "v${version}";
 
   vendorHash = "sha256-JchHjQh1ZP6wdpgUwfNyhD93Wlf4FvCD0h4Tte47z3U=";
@@ -16,7 +16,7 @@ buildGoModule rec {
     inherit rev;
     owner = "flannel-io";
     repo = "flannel";
-    sha256 = "sha256-r+9pII4zlPJ7UNdE0sR6Aul7p0sK+BRHq71S+NEekvM=";
+    sha256 = "sha256-wsblDh/xAXycq85spBezGZU1vikQD5wDhtFQSrCm4SI=";
   };
 
   ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ];

From 2327daa4b65a3e915365407dadae38d72f83235f Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Thu, 2 Oct 2025 20:16:06 +0000
Subject: [PATCH 0338/6226] learn6502: 0.4.0 -> 0.5.0

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

diff --git a/pkgs/by-name/le/learn6502/package.nix b/pkgs/by-name/le/learn6502/package.nix
index 6a042b932264..a52a6ac55989 100644
--- a/pkgs/by-name/le/learn6502/package.nix
+++ b/pkgs/by-name/le/learn6502/package.nix
@@ -24,20 +24,20 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "learn6502";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "JumpLink";
     repo = "Learn6502";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-od6TzGbo9VrPFK/qEPnA7MUjgwJ1/RbquAqmkyIU1Bs=";
+    hash = "sha256-4u9+VrGDhVd6tPi7KyuW8vfHba2iXp8yar8euN+qFXg=";
   };
 
   missingHashes = ./missing-hashes.json;
 
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-Ko9aXHhL2FosAn6QHEaxtUpKo0aVP35YwM3tJEYuFAE=";
+    hash = "sha256-LomdUWcNziqyn0ty40p+RzZ4Paejs9g0AOaUQUOd2yY=";
   };
 
   nativeBuildInputs = [

From 60d7923ecec0a1db1df48d6df57695ab17156707 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Thu, 2 Oct 2025 22:50:17 +0200
Subject: [PATCH 0339/6226] libressl_4_0: 4.0.0 -> 4.0.1

Includes a fix for CVE-2025-9230, see the release notes at
https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-4.0.1-relnotes.txt
---
 pkgs/development/libraries/libressl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index fe8731c0a38f..ac528cfcfa01 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -133,8 +133,8 @@ in
   };
 
   libressl_4_0 = generic {
-    version = "4.0.0";
-    hash = "sha256-TYQZVfCsw9/HHQ49018oOvRhIiNQ4mhD/qlzHAJGoeQ=";
+    version = "4.0.1";
+    hash = "sha256-IClLh3eMJidIk4Y5Q8hjWJebSZ03tJl31r+Gj3tZfL0=";
     # Fixes build on loongarch64
     # https://github.com/libressl/portable/pull/1146
     patches = [

From a0b7ed298ac2965639eb7eb2f82946d702e47962 Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Thu, 2 Oct 2025 22:50:50 +0200
Subject: [PATCH 0340/6226] libressl_4_1: 4.1.0 -> 4.1.1

Includes a fix for CVE-2025-9230, see the release notes at
https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-4.1.1-relnotes.txt
---
 pkgs/development/libraries/libressl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index ac528cfcfa01..e85a06aefff7 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -153,8 +153,8 @@ in
   };
 
   libressl_4_1 = generic {
-    version = "4.1.0";
-    hash = "sha256-D3HBa9NL2qzNy5al2UpJIb+2EuxuDrp6gNiFTu/Yu2E=";
+    version = "4.1.1";
+    hash = "sha256-x/96fWddX1dzCUDlzP8dvi3NW3QFtTl+D3/9ZqXtVnk=";
     # Fixes build on loongarch64
     # https://github.com/libressl/portable/pull/1184
     postPatch = ''

From 2277092388c1d317e05a8948a2657a42db0fbd7b Mon Sep 17 00:00:00 2001
From: Ruud van Asseldonk <dev@veniogames.com>
Date: Thu, 2 Oct 2025 22:57:58 +0200
Subject: [PATCH 0341/6226] libressl_3_9: remove unsupported package

The current supported versions are 4.0 and 4.1. 3.9 is no longer
supported, and has not received the fix for CVE-2025-9230 that 4.0 and
4.1 did receive. I think it's better to remove it at this point.
---
 pkgs/development/libraries/libressl/default.nix | 14 --------------
 pkgs/top-level/all-packages.nix                 |  1 -
 2 files changed, 15 deletions(-)

diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix
index e85a06aefff7..af6fcb0d0672 100644
--- a/pkgs/development/libraries/libressl/default.nix
+++ b/pkgs/development/libraries/libressl/default.nix
@@ -118,20 +118,6 @@ let
     };
 in
 {
-  libressl_3_9 = generic {
-    version = "3.9.2";
-    hash = "sha256-ewMdrGSlnrbuMwT3/7ddrTOrjJ0nnIR/ksifuEYGj5c=";
-
-    patches = [
-      # Fixes build on ppc64
-      # https://github.com/libressl/portable/pull/1073
-      (fetchpatch {
-        url = "https://github.com/libressl/portable/commit/e6c7de3f03c51fbdcf5ad88bf12fe9e128521f0d.patch";
-        hash = "sha256-LJy3fjbnc9h5DG3/+8bLECwJeBpPxy3hU8sPuhovmcw=";
-      })
-    ];
-  };
-
   libressl_4_0 = generic {
     version = "4.0.1";
     hash = "sha256-IClLh3eMJidIk4Y5Q8hjWJebSZ03tJl31r+Gj3tZfL0=";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8e36b72bd8a..40ebcf37fc32 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8489,7 +8489,6 @@ with pkgs;
   zunclient = with python313Packages; toPythonApplication python-zunclient;
 
   inherit (callPackages ../development/libraries/libressl { })
-    libressl_3_9
     libressl_4_0
     libressl_4_1
     ;

From ecd55fb26a14252b32a82e70db7dcf57c4c0d6cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 2 Oct 2025 21:32:23 +0000
Subject: [PATCH 0342/6226] pyright: 1.1.403 -> 1.1.406

---
 pkgs/by-name/py/pyright/package-lock.json | 51 +++++++----------------
 pkgs/by-name/py/pyright/package.nix       | 10 ++---
 2 files changed, 21 insertions(+), 40 deletions(-)

diff --git a/pkgs/by-name/py/pyright/package-lock.json b/pkgs/by-name/py/pyright/package-lock.json
index 221d0e3ff742..4505415580bf 100644
--- a/pkgs/by-name/py/pyright/package-lock.json
+++ b/pkgs/by-name/py/pyright/package-lock.json
@@ -6,7 +6,7 @@
     "": {
       "name": "pyright-root",
       "devDependencies": {
-        "glob": "^7.2.3",
+        "glob": "^8.1.0",
         "jsonc-parser": "^3.3.1"
       }
     },
@@ -18,23 +18,15 @@
       "license": "MIT"
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.12",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
-      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
-        "balanced-match": "^1.0.0",
-        "concat-map": "0.0.1"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true,
-      "license": "MIT"
-    },
     "node_modules/fs.realpath": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
@@ -43,9 +35,9 @@
       "license": "ISC"
     },
     "node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz",
+      "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==",
       "deprecated": "Glob versions prior to v9 are no longer supported",
       "dev": true,
       "license": "ISC",
@@ -53,12 +45,11 @@
         "fs.realpath": "^1.0.0",
         "inflight": "^1.0.4",
         "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "minimatch": "^5.0.1",
+        "once": "^1.3.0"
       },
       "engines": {
-        "node": "*"
+        "node": ">=12"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
@@ -91,16 +82,16 @@
       "license": "MIT"
     },
     "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
+      "version": "5.1.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz",
+      "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==",
       "dev": true,
       "license": "ISC",
       "dependencies": {
-        "brace-expansion": "^1.1.7"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": "*"
+        "node": ">=10"
       }
     },
     "node_modules/once": {
@@ -113,16 +104,6 @@
         "wrappy": "1"
       }
     },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
-      "dev": true,
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
diff --git a/pkgs/by-name/py/pyright/package.nix b/pkgs/by-name/py/pyright/package.nix
index 9e649914c0bd..dea2ba75cea0 100644
--- a/pkgs/by-name/py/pyright/package.nix
+++ b/pkgs/by-name/py/pyright/package.nix
@@ -7,13 +7,13 @@
 }:
 
 let
-  version = "1.1.403";
+  version = "1.1.406";
 
   src = fetchFromGitHub {
     owner = "Microsoft";
     repo = "pyright";
     tag = version;
-    hash = "sha256-vqE/3wK0rtFT9f399djm4QElRccXdOXyODsQMQySa9k=";
+    hash = "sha256-hSPnUjIZf9od1u7PwgEFDXGWmizjdqSiXjb45wZIM9Q=";
   };
 
   patchedPackageJSON = runCommand "package.json" { } ''
@@ -27,7 +27,7 @@ let
     pname = "pyright-root";
     inherit version src;
     sourceRoot = "${src.name}"; # required for update.sh script
-    npmDepsHash = "sha256-1OrUBARwNvT8pTH66W7GAKG8B5fX8/6jtOOYVU6IgSw=";
+    npmDepsHash = "sha256-4DVWWoLnNXoJ6eWeQuOzAVjcvo75Y2nM/HwQvAEN4ME=";
     dontNpmBuild = true;
     postPatch = ''
       cp ${patchedPackageJSON} ./package.json
@@ -44,7 +44,7 @@ let
     pname = "pyright-internal";
     inherit version src;
     sourceRoot = "${src.name}/packages/pyright-internal";
-    npmDepsHash = "sha256-Tc7v6sDu0PR//ukvw9hULX0KGpRkA0hEaeuKlPnpYl4=";
+    npmDepsHash = "sha256-BzyZEJUOEqPBpPrVNhf/kDOBS3Q4Hgkpfz+JDccHr4g=";
     dontNpmBuild = true;
     installPhase = ''
       runHook preInstall
@@ -58,7 +58,7 @@ buildNpmPackage rec {
   inherit version src;
 
   sourceRoot = "${src.name}/packages/pyright";
-  npmDepsHash = "sha256-wzjdeZr6tbaBuOWDJXeTFkQRUHnxYryvI7sfGsSEpVQ=";
+  npmDepsHash = "sha256-Ye8r7m4755GfU74G8Neetu+BlrHQWoQe7y2TyOjvBOo=";
 
   postPatch = ''
     chmod +w ../../

From 1c5d47dd782dd7e63d16978d4bc0c6065361bcd8 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Wed, 23 Jul 2025 18:31:22 -0400
Subject: [PATCH 0343/6226] systemd: v257.9 -> v258

---
 nixos/modules/services/hardware/udev.nix      |  3 +-
 ...ts-for-uninitialised-encrypted-devic.patch |  8 +--
 ...on-t-try-to-unmount-nix-or-nix-store.patch |  8 +--
 .../systemd/0003-Fix-NixOS-containers.patch   |  8 +--
 ...some-NixOS-specific-unit-directories.patch | 22 +++----
 ...f-a-useless-message-in-user-sessions.patch |  4 +-
 ...d-timedated-disable-methods-that-cha.patch | 22 +++----
 ...e-usr-share-zoneinfo-to-etc-zoneinfo.patch | 59 ++++++++++++-------
 ...calectl-use-etc-X11-xkb-for-list-x11.patch |  6 +-
 ...9-add-rootprefix-to-lookup-dir-paths.patch |  4 +-
 ...-execute-scripts-in-etc-systemd-syst.patch |  2 +-
 ...ecute-scripts-in-etc-systemd-system-.patch |  4 +-
 ...-placeholder-for-DEFAULT_PATH_NORMAL.patch |  4 +-
 ...-environment-when-calling-generators.patch |  4 +-
 ...014-core-don-t-taint-on-unmerged-usr.patch |  4 +-
 ...ontext_init-fix-driver-name-checking.patch |  4 +-
 ...uggest-systemdctl-edit-runtime-on-sy.patch |  4 +-
 ....build-do-not-create-systemdstatedir.patch |  4 +-
 .../0018-meson-Don-t-link-ssh-dropins.patch   |  4 +-
 ...nit_file_exists_full-follow-symlinks.patch |  4 +-
 ...e-NSCD-when-DNSSEC-validation-is-dis.patch |  6 +-
 pkgs/os-specific/linux/systemd/default.nix    | 14 +++--
 22 files changed, 112 insertions(+), 90 deletions(-)

diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index ca9464d091c1..9370fb0bf207 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -179,7 +179,8 @@ let
         for i in $packages; do
           echo "Adding hwdb files for package $i"
           for j in $i/{etc,lib}/udev/hwdb.d/*; do
-            ln -s $j etc/udev/hwdb.d/$(basename $j)
+            # This must be a copy, not a symlink, because --root below will chase links within the root argument.
+            cp $j etc/udev/hwdb.d/$(basename $j)
           done
         done
 
diff --git a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
index d242ff7c9287..02845eb126f6 100644
--- a/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
+++ b/pkgs/os-specific/linux/systemd/0001-Start-device-units-for-uninitialised-encrypted-devic.patch
@@ -13,7 +13,7 @@ unit.  (However, this ignores the fsck unit, so it's not perfect...)
  1 file changed, 4 deletions(-)
 
 diff --git a/rules.d/99-systemd.rules.in b/rules.d/99-systemd.rules.in
-index 882cda0dcd..8e8d1f04ce 100644
+index bebc4d7d09..60278a0da7 100644
 --- a/rules.d/99-systemd.rules.in
 +++ b/rules.d/99-systemd.rules.in
 @@ -30,10 +30,6 @@ SUBSYSTEM=="block", ACTION=="add", KERNEL=="dm-*", ENV{DM_NAME}!="?*", ENV{SYSTE
@@ -24,6 +24,6 @@ index 882cda0dcd..8e8d1f04ce 100644
 -# we are probably still calling mke2fs or mkswap on it.
 -SUBSYSTEM=="block", ENV{DM_UUID}=="CRYPT-*", ENV{ID_PART_TABLE_TYPE}=="", ENV{ID_FS_USAGE}=="", ENV{SYSTEMD_READY}="0"
 -
- # add symlink to GPT root disk
- SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}!="crypto_LUKS", SYMLINK+="gpt-auto-root"
- SUBSYSTEM=="block", ENV{ID_PART_GPT_AUTO_ROOT}=="1", ENV{ID_FS_TYPE}=="crypto_LUKS", SYMLINK+="gpt-auto-root-luks"
+ # Ignore raid devices that are not yet assembled and started
+ SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0"
+ SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0"
diff --git a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
index 9e3496986859..d1dcbfd37a0f 100644
--- a/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
+++ b/pkgs/os-specific/linux/systemd/0002-Don-t-try-to-unmount-nix-or-nix-store.patch
@@ -14,10 +14,10 @@ Original-Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
  2 files changed, 6 insertions(+), 2 deletions(-)
 
 diff --git a/src/shared/fstab-util.c b/src/shared/fstab-util.c
-index d6a256c4a7..f74d5198f1 100644
+index 57ab68deb6..8e281b8f2c 100644
 --- a/src/shared/fstab-util.c
 +++ b/src/shared/fstab-util.c
-@@ -66,6 +66,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) {
+@@ -72,6 +72,8 @@ bool fstab_is_extrinsic(const char *mount, const char *opts) {
          /* Don't bother with the OS data itself */
          if (PATH_IN_SET(mount,
                          "/",
@@ -27,10 +27,10 @@ index d6a256c4a7..f74d5198f1 100644
                          "/etc"))
                  return true;
 diff --git a/src/shutdown/umount.c b/src/shutdown/umount.c
-index 84da5eed63..d6e2f36d52 100644
+index 45c6db9245..d7283b7fa6 100644
 --- a/src/shutdown/umount.c
 +++ b/src/shutdown/umount.c
-@@ -175,8 +175,10 @@ int mount_points_list_get(const char *mountinfo, MountPoint **head) {
+@@ -178,8 +178,10 @@ int mount_points_list_get(FILE *f, MountPoint **head) {
  static bool nonunmountable_path(const char *path) {
          assert(path);
  
diff --git a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
index 7cc2804a05bb..3815c140d495 100644
--- a/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
+++ b/pkgs/os-specific/linux/systemd/0003-Fix-NixOS-containers.patch
@@ -10,10 +10,10 @@ container, so checking early whether it exists will fail.
  1 file changed, 2 insertions(+)
 
 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 6f90f2f418..74b2a237d3 100644
+index ab8746c442..480a9c55c6 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
-@@ -6189,6 +6189,7 @@ static int run(int argc, char *argv[]) {
+@@ -6165,6 +6165,7 @@ static int run(int argc, char *argv[]) {
                                  goto finish;
                          }
                  } else {
@@ -21,11 +21,11 @@ index 6f90f2f418..74b2a237d3 100644
                          _cleanup_free_ char *p = NULL;
  
                          if (arg_pivot_root_new)
-@@ -6208,6 +6209,7 @@ static int run(int argc, char *argv[]) {
+@@ -6184,6 +6185,7 @@ static int run(int argc, char *argv[]) {
                                  log_error_errno(r, "Unable to determine if %s looks like it has an OS tree (i.e. whether /usr/ exists): %m", arg_directory);
                                  goto finish;
                          }
 +#endif
                  }
  
-         } else {
+                 if (arg_userns_mode == USER_NAMESPACE_MANAGED) {
diff --git a/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch b/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch
index 2657eb9089d1..81d17a57fb2f 100644
--- a/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch
+++ b/pkgs/os-specific/linux/systemd/0004-Add-some-NixOS-specific-unit-directories.patch
@@ -16,10 +16,10 @@ Original-Author: Eelco Dolstra <eelco.dolstra@logicblox.com>
  2 files changed, 7 insertions(+), 21 deletions(-)
 
 diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in
-index f3b85b0190..f7aa5fca50 100644
+index 58f2463104..0c263430a7 100644
 --- a/src/core/systemd.pc.in
 +++ b/src/core/systemd.pc.in
-@@ -43,10 +43,10 @@ systemdsystemconfdir=${systemd_system_conf_dir}
+@@ -46,10 +46,10 @@ systemdsystemconfdir=${systemd_system_conf_dir}
  systemd_user_conf_dir=${sysconfdir}/systemd/user
  systemduserconfdir=${systemd_user_conf_dir}
  
@@ -32,7 +32,7 @@ index f3b85b0190..f7aa5fca50 100644
  systemduserunitpath=${systemd_user_unit_path}
  
  systemd_system_generator_dir=${prefix}/lib/systemd/system-generators
-@@ -55,10 +55,10 @@ systemdsystemgeneratordir=${systemd_system_generator_dir}
+@@ -58,10 +58,10 @@ systemdsystemgeneratordir=${systemd_system_generator_dir}
  systemd_user_generator_dir=${prefix}/lib/systemd/user-generators
  systemdusergeneratordir=${systemd_user_generator_dir}
  
@@ -46,10 +46,10 @@ index f3b85b0190..f7aa5fca50 100644
  
  systemd_sleep_dir=${prefix}/lib/systemd/system-sleep
 diff --git a/src/libsystemd/sd-path/path-lookup.c b/src/libsystemd/sd-path/path-lookup.c
-index a3b09208cb..91a085c6bc 100644
+index 3ddbda0e9f..3eddc80c90 100644
 --- a/src/libsystemd/sd-path/path-lookup.c
 +++ b/src/libsystemd/sd-path/path-lookup.c
-@@ -69,11 +69,7 @@ int runtime_directory(RuntimeScope scope, const char *suffix, char **ret) {
+@@ -64,11 +64,7 @@ int runtime_directory(RuntimeScope scope, const char *suffix, char **ret) {
  }
  
  static const char* const user_data_unit_paths[] = {
@@ -61,7 +61,7 @@ index a3b09208cb..91a085c6bc 100644
          NULL
  };
  
-@@ -481,16 +477,13 @@ int lookup_paths_init(
+@@ -476,16 +472,13 @@ int lookup_paths_init(
                                         persistent_config,
                                         SYSTEM_CONFIG_UNIT_DIR,
                                         "/etc/systemd/system",
@@ -79,7 +79,7 @@ index a3b09208cb..91a085c6bc 100644
                                         STRV_IFNOTNULL(generator_late));
                          break;
  
-@@ -508,13 +501,10 @@ int lookup_paths_init(
+@@ -503,13 +496,10 @@ int lookup_paths_init(
                          add = strv_new(persistent_config,
                                         USER_CONFIG_UNIT_DIR,
                                         "/etc/systemd/user",
@@ -95,7 +95,7 @@ index a3b09208cb..91a085c6bc 100644
                          break;
  
                  case RUNTIME_SCOPE_USER:
-@@ -653,7 +643,6 @@ void lookup_paths_log(LookupPaths *lp) {
+@@ -648,7 +638,6 @@ void lookup_paths_log(LookupPaths *lp) {
  static const char* const system_generator_paths[] = {
          "/run/systemd/system-generators",
          "/etc/systemd/system-generators",
@@ -103,7 +103,7 @@ index a3b09208cb..91a085c6bc 100644
          SYSTEM_GENERATOR_DIR,
          NULL,
  };
-@@ -661,7 +650,6 @@ static const char* const system_generator_paths[] = {
+@@ -656,7 +645,6 @@ static const char* const system_generator_paths[] = {
  static const char* const user_generator_paths[] = {
          "/run/systemd/user-generators",
          "/etc/systemd/user-generators",
@@ -111,7 +111,7 @@ index a3b09208cb..91a085c6bc 100644
          USER_GENERATOR_DIR,
          NULL,
  };
-@@ -669,7 +657,6 @@ static const char* const user_generator_paths[] = {
+@@ -664,7 +652,6 @@ static const char* const user_generator_paths[] = {
  static const char* const system_env_generator_paths[] = {
          "/run/systemd/system-environment-generators",
          "/etc/systemd/system-environment-generators",
@@ -119,7 +119,7 @@ index a3b09208cb..91a085c6bc 100644
          SYSTEM_ENV_GENERATOR_DIR,
          NULL,
  };
-@@ -677,7 +664,6 @@ static const char* const system_env_generator_paths[] = {
+@@ -672,7 +659,6 @@ static const char* const system_env_generator_paths[] = {
  static const char* const user_env_generator_paths[] = {
          "/run/systemd/user-environment-generators",
          "/etc/systemd/user-environment-generators",
diff --git a/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch b/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch
index 6c4a41ab0609..2f7139911220 100644
--- a/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch
+++ b/pkgs/os-specific/linux/systemd/0005-Get-rid-of-a-useless-message-in-user-sessions.patch
@@ -13,10 +13,10 @@ in containers.
  1 file changed, 2 insertions(+), 1 deletion(-)
 
 diff --git a/src/core/manager.c b/src/core/manager.c
-index 4ccaba9054..9577b89783 100644
+index d85896577f..2a4782a55e 100644
 --- a/src/core/manager.c
 +++ b/src/core/manager.c
-@@ -1672,7 +1672,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {
+@@ -1575,7 +1575,8 @@ static unsigned manager_dispatch_stop_when_bound_queue(Manager *m) {
                  if (!unit_is_bound_by_inactive(u, &culprit))
                          continue;
  
diff --git a/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch b/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch
index 44bd2263ddf0..b43dddb3d420 100644
--- a/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch
+++ b/pkgs/os-specific/linux/systemd/0006-hostnamed-localed-timedated-disable-methods-that-cha.patch
@@ -11,10 +11,10 @@ Subject: [PATCH] hostnamed, localed, timedated: disable methods that change
  3 files changed, 25 insertions(+)
 
 diff --git a/src/hostname/hostnamed.c b/src/hostname/hostnamed.c
-index ba50b59f92..9827487453 100644
+index 06fb3f2878..b656e511b7 100644
 --- a/src/hostname/hostnamed.c
 +++ b/src/hostname/hostnamed.c
-@@ -1115,6 +1115,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
+@@ -1388,6 +1388,9 @@ static int method_set_static_hostname(sd_bus_message *m, void *userdata, sd_bus_
          if (r < 0)
                  return r;
  
@@ -24,7 +24,7 @@ index ba50b59f92..9827487453 100644
          name = empty_to_null(name);
  
          context_read_etc_hostname(c);
-@@ -1177,6 +1180,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
+@@ -1454,6 +1457,9 @@ static int set_machine_info(Context *c, sd_bus_message *m, int prop, sd_bus_mess
          if (r < 0)
                  return r;
  
@@ -35,10 +35,10 @@ index ba50b59f92..9827487453 100644
  
          context_read_machine_info(c);
 diff --git a/src/locale/localed.c b/src/locale/localed.c
-index 062744519d..95bde4b1c3 100644
+index 11d9130bbc..dd4d9e59ea 100644
 --- a/src/locale/localed.c
 +++ b/src/locale/localed.c
-@@ -226,6 +226,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
+@@ -221,6 +221,9 @@ static int method_set_locale(sd_bus_message *m, void *userdata, sd_bus_error *er
  
          use_localegen = locale_gen_check_available();
  
@@ -48,7 +48,7 @@ index 062744519d..95bde4b1c3 100644
          /* If single locale without variable name is provided, then we assume it is LANG=. */
          if (strv_length(l) == 1 && !strchr(l[0], '=')) {
                  if (!locale_is_valid(l[0]))
-@@ -343,6 +346,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro
+@@ -338,6 +341,9 @@ static int method_set_vc_keyboard(sd_bus_message *m, void *userdata, sd_bus_erro
          if (r < 0)
                  return bus_log_parse_error(r);
  
@@ -58,7 +58,7 @@ index 062744519d..95bde4b1c3 100644
          vc_context_empty_to_null(&in);
  
          r = vc_context_verify_and_warn(&in, LOG_ERR, error);
-@@ -460,6 +466,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err
+@@ -455,6 +461,9 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err
          if (r < 0)
                  return bus_log_parse_error(r);
  
@@ -69,10 +69,10 @@ index 062744519d..95bde4b1c3 100644
  
          r = x11_context_verify_and_warn(&in, LOG_ERR, error);
 diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index c79bb864df..cbd30214b7 100644
+index 662cc29ac5..57f3413dc6 100644
 --- a/src/timedate/timedated.c
 +++ b/src/timedate/timedated.c
-@@ -676,6 +676,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
+@@ -678,6 +678,10 @@ static int method_set_timezone(sd_bus_message *m, void *userdata, sd_bus_error *
          if (r < 0)
                  return r;
  
@@ -83,7 +83,7 @@ index c79bb864df..cbd30214b7 100644
          if (!timezone_is_valid(z, LOG_DEBUG))
                  return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid or not installed time zone '%s'", z);
  
-@@ -754,6 +758,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error
+@@ -756,6 +760,9 @@ static int method_set_local_rtc(sd_bus_message *m, void *userdata, sd_bus_error
          if (r < 0)
                  return r;
  
@@ -93,7 +93,7 @@ index c79bb864df..cbd30214b7 100644
          if (lrtc == c->local_rtc && !fix_system)
                  return sd_bus_reply_method_return(m, NULL);
  
-@@ -948,6 +955,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
+@@ -954,6 +961,9 @@ static int method_set_ntp(sd_bus_message *m, void *userdata, sd_bus_error *error
          if (r < 0)
                  return r;
  
diff --git a/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch b/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
index 1f4184e92836..21589efdd849 100644
--- a/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
+++ b/pkgs/os-specific/linux/systemd/0007-Change-usr-share-zoneinfo-to-etc-zoneinfo.patch
@@ -7,10 +7,10 @@ NixOS uses this path.
 ---
  man/localtime.xml         | 4 ++--
  src/basic/time-util.c     | 8 ++++----
- src/firstboot/firstboot.c | 2 +-
+ src/firstboot/firstboot.c | 9 +++------
  src/nspawn/nspawn.c       | 4 ++--
  src/timedate/timedated.c  | 8 ++++----
- 5 files changed, 13 insertions(+), 13 deletions(-)
+ 5 files changed, 15 insertions(+), 18 deletions(-)
 
 diff --git a/man/localtime.xml b/man/localtime.xml
 index 3a13e04a27..4fd58068a1 100644
@@ -35,10 +35,10 @@ index 3a13e04a27..4fd58068a1 100644
      <literal>Etc/UTC</literal>. The resulting link should lead to the
      corresponding binary
 diff --git a/src/basic/time-util.c b/src/basic/time-util.c
-index 29afb08ebc..398ff340cd 100644
+index 55931a2546..2e00bd7539 100644
 --- a/src/basic/time-util.c
 +++ b/src/basic/time-util.c
-@@ -1418,7 +1418,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) {
+@@ -1410,7 +1410,7 @@ static int get_timezones_from_zone1970_tab(char ***ret) {
  
          assert(ret);
  
@@ -47,7 +47,7 @@ index 29afb08ebc..398ff340cd 100644
          if (!f)
                  return -errno;
  
-@@ -1459,7 +1459,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) {
+@@ -1451,7 +1451,7 @@ static int get_timezones_from_tzdata_zi(char ***ret) {
  
          assert(ret);
  
@@ -56,7 +56,7 @@ index 29afb08ebc..398ff340cd 100644
          if (!f)
                  return -errno;
  
-@@ -1570,7 +1570,7 @@ int verify_timezone(const char *name, int log_level) {
+@@ -1562,7 +1562,7 @@ int verify_timezone(const char *name, int log_level) {
          if (p - name >= PATH_MAX)
                  return -ENAMETOOLONG;
  
@@ -65,7 +65,7 @@ index 29afb08ebc..398ff340cd 100644
  
          fd = open(t, O_RDONLY|O_CLOEXEC);
          if (fd < 0)
-@@ -1622,7 +1622,7 @@ int get_timezone(char **ret) {
+@@ -1614,7 +1614,7 @@ int get_timezone(char **ret) {
          if (r < 0)
                  return r; /* Return EINVAL if not a symlink */
  
@@ -75,23 +75,38 @@ index 29afb08ebc..398ff340cd 100644
                  return -EINVAL;
          if (!timezone_is_valid(e, LOG_DEBUG))
 diff --git a/src/firstboot/firstboot.c b/src/firstboot/firstboot.c
-index a389eeae10..c817e91991 100644
+index 5ed6d3a9d2..f922d91a9d 100644
 --- a/src/firstboot/firstboot.c
 +++ b/src/firstboot/firstboot.c
-@@ -598,7 +598,7 @@ static int process_timezone(int rfd) {
+@@ -618,7 +618,7 @@ static int prompt_timezone(int rfd) {
+ 
+ static int process_timezone(int rfd) {
+         _cleanup_close_ int pfd = -EBADF;
+-        _cleanup_free_ char *f = NULL, *relpath = NULL;
++        _cleanup_free_ char *f = NULL;
+         const char *e;
+         int r;
+ 
+@@ -664,12 +664,9 @@ static int process_timezone(int rfd) {
          if (isempty(arg_timezone))
                  return 0;
  
--        e = strjoina("../usr/share/zoneinfo/", arg_timezone);
+-        e = strjoina("/usr/share/zoneinfo/", arg_timezone);
+-        r = path_make_relative_parent(etc_localtime(), e, &relpath);
+-        if (r < 0)
+-                return r;
 +        e = strjoina("zoneinfo/", arg_timezone);
  
-         r = symlinkat_atomic_full(e, pfd, f, /* make_relative= */ false);
+-        r = symlinkat_atomic_full(relpath, pfd, f, SYMLINK_LABEL);
++        r = symlinkat_atomic_full(e, pfd, f, SYMLINK_LABEL);
          if (r < 0)
+                 return log_error_errno(r, "Failed to create /etc/localtime symlink: %m");
+ 
 diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c
-index 74b2a237d3..cf9eabf0f2 100644
+index 480a9c55c6..02c9ae6608 100644
 --- a/src/nspawn/nspawn.c
 +++ b/src/nspawn/nspawn.c
-@@ -1851,8 +1851,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
+@@ -1821,8 +1821,8 @@ int userns_mkdir(const char *root, const char *path, mode_t mode, uid_t uid, gid
  static const char *timezone_from_path(const char *path) {
          return PATH_STARTSWITH_SET(
                          path,
@@ -103,10 +118,10 @@ index 74b2a237d3..cf9eabf0f2 100644
  
  static bool etc_writable(void) {
 diff --git a/src/timedate/timedated.c b/src/timedate/timedated.c
-index cbd30214b7..b9b2f533a4 100644
+index 57f3413dc6..6a456fe601 100644
 --- a/src/timedate/timedated.c
 +++ b/src/timedate/timedated.c
-@@ -280,7 +280,7 @@ static int context_read_data(Context *c) {
+@@ -266,7 +266,7 @@ static int context_read_data(Context *c) {
  
          r = get_timezone(&t);
          if (r == -EINVAL)
@@ -115,24 +130,24 @@ index cbd30214b7..b9b2f533a4 100644
          else if (r < 0)
                  log_warning_errno(r, "Failed to get target of /etc/localtime: %m");
  
-@@ -304,7 +304,7 @@ static int context_write_data_timezone(Context *c) {
+@@ -290,7 +290,7 @@ static int context_write_data_timezone(Context *c) {
  
          if (isempty(c->zone) || streq(c->zone, "UTC")) {
  
 -                if (access("/usr/share/zoneinfo/UTC", F_OK) < 0) {
 +                if (access("/etc/zoneinfo/UTC", F_OK) < 0) {
  
-                         if (unlink("/etc/localtime") < 0 && errno != ENOENT)
+                         if (unlink(etc_localtime()) < 0 && errno != ENOENT)
                                  return -errno;
-@@ -312,9 +312,9 @@ static int context_write_data_timezone(Context *c) {
+@@ -298,9 +298,9 @@ static int context_write_data_timezone(Context *c) {
                          return 0;
                  }
  
--                source = "../usr/share/zoneinfo/UTC";
-+                source = "../etc/zoneinfo/UTC";
+-                source = "/usr/share/zoneinfo/UTC";
++                source = "/etc/zoneinfo/UTC";
          } else {
--                p = path_join("../usr/share/zoneinfo", c->zone);
-+                p = path_join("../etc/zoneinfo", c->zone);
+-                p = path_join("/usr/share/zoneinfo", c->zone);
++                p = path_join("/etc/zoneinfo", c->zone);
                  if (!p)
                          return -ENOMEM;
  
diff --git a/pkgs/os-specific/linux/systemd/0008-localectl-use-etc-X11-xkb-for-list-x11.patch b/pkgs/os-specific/linux/systemd/0008-localectl-use-etc-X11-xkb-for-list-x11.patch
index c670f076c34a..6c348219872f 100644
--- a/pkgs/os-specific/linux/systemd/0008-localectl-use-etc-X11-xkb-for-list-x11.patch
+++ b/pkgs/os-specific/linux/systemd/0008-localectl-use-etc-X11-xkb-for-list-x11.patch
@@ -10,15 +10,15 @@ NixOS has an option to link the xkb data files to /etc/X11, but not to
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/locale/localectl.c b/src/locale/localectl.c
-index 36dbeb9daa..265eda2751 100644
+index c595f81b40..90033f6566 100644
 --- a/src/locale/localectl.c
 +++ b/src/locale/localectl.c
-@@ -301,7 +301,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {
+@@ -302,7 +302,7 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) {
          } state = NONE, look_for;
          int r;
  
 -        f = fopen("/usr/share/X11/xkb/rules/base.lst", "re");
 +        f = fopen("/etc/X11/xkb/rules/base.lst", "re");
          if (!f)
-                 return log_error_errno(errno, "Failed to open keyboard mapping list. %m");
+                 return log_error_errno(errno, "Failed to open keyboard mapping list: %m");
  
diff --git a/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch b/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch
index bf9f028d6300..beb8acc61732 100644
--- a/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch
+++ b/pkgs/os-specific/linux/systemd/0009-add-rootprefix-to-lookup-dir-paths.patch
@@ -12,10 +12,10 @@ files that I might have missed.
  1 file changed, 4 insertions(+), 2 deletions(-)
 
 diff --git a/src/basic/constants.h b/src/basic/constants.h
-index 5aaf8f535c..934175fb51 100644
+index 7a09fbf878..ee3378f109 100644
 --- a/src/basic/constants.h
 +++ b/src/basic/constants.h
-@@ -62,13 +62,15 @@
+@@ -40,13 +40,15 @@
          "/etc/" n "\0"                          \
          "/run/" n "\0"                          \
          "/usr/local/lib/" n "\0"                \
diff --git a/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch b/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
index 20b4641ac000..b05fc609d6ed 100644
--- a/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
+++ b/pkgs/os-specific/linux/systemd/0010-systemd-shutdown-execute-scripts-in-etc-systemd-syst.patch
@@ -10,7 +10,7 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
  1 file changed, 1 insertion(+)
 
 diff --git a/src/shutdown/shutdown.c b/src/shutdown/shutdown.c
-index e26a8579c5..af814cd551 100644
+index 3317068e47..021a3c0699 100644
 --- a/src/shutdown/shutdown.c
 +++ b/src/shutdown/shutdown.c
 @@ -358,6 +358,7 @@ static void notify_supervisor(void) {
diff --git a/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch b/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
index 13578115a014..bfded1bba554 100644
--- a/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
+++ b/pkgs/os-specific/linux/systemd/0011-systemd-sleep-execute-scripts-in-etc-systemd-system-.patch
@@ -9,10 +9,10 @@ This is needed for NixOS to use such scripts as systemd directory is immutable.
  1 file changed, 1 insertion(+)
 
 diff --git a/src/sleep/sleep.c b/src/sleep/sleep.c
-index 181bb4ccef..2b1410d8a1 100644
+index 3390ebe0c0..affc823bc4 100644
 --- a/src/sleep/sleep.c
 +++ b/src/sleep/sleep.c
-@@ -218,6 +218,7 @@ static int execute(
+@@ -248,6 +248,7 @@ static int execute(
          };
          static const char* const dirs[] = {
                  SYSTEM_SLEEP_PATH,
diff --git a/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch b/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
index 9e29c34efcd7..1168d1249858 100644
--- a/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
+++ b/pkgs/os-specific/linux/systemd/0012-path-util.h-add-placeholder-for-DEFAULT_PATH_NORMAL.patch
@@ -10,10 +10,10 @@ systemd itself uses extensively.
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/src/basic/path-util.h b/src/basic/path-util.h
-index dff5a3a549..01344e5cf6 100644
+index 45518c07e5..94bef2f4b4 100644
 --- a/src/basic/path-util.h
 +++ b/src/basic/path-util.h
-@@ -17,10 +17,10 @@
+@@ -9,10 +9,10 @@
  #define PATH_MERGED_BIN(x) x "bin"
  #define PATH_MERGED_BIN_NULSTR(x) x "bin\0"
  
diff --git a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
index 856fdee93475..1c4ce37dde34 100644
--- a/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
+++ b/pkgs/os-specific/linux/systemd/0013-inherit-systemd-environment-when-calling-generators.patch
@@ -16,10 +16,10 @@ executables that are being called from managers.
  1 file changed, 8 insertions(+)
 
 diff --git a/src/core/manager.c b/src/core/manager.c
-index 9577b89783..9cfd2798b9 100644
+index 2a4782a55e..8dfdc227a1 100644
 --- a/src/core/manager.c
 +++ b/src/core/manager.c
-@@ -4158,9 +4158,17 @@ static int build_generator_environment(Manager *m, char ***ret) {
+@@ -3977,9 +3977,17 @@ static int build_generator_environment(Manager *m, char ***ret) {
           * adjust generated units to that. Let's pass down some bits of information that are easy for us to
           * determine (but a bit harder for generator scripts to determine), as environment variables. */
  
diff --git a/pkgs/os-specific/linux/systemd/0014-core-don-t-taint-on-unmerged-usr.patch b/pkgs/os-specific/linux/systemd/0014-core-don-t-taint-on-unmerged-usr.patch
index fbaaed99cb61..445b08d2289f 100644
--- a/pkgs/os-specific/linux/systemd/0014-core-don-t-taint-on-unmerged-usr.patch
+++ b/pkgs/os-specific/linux/systemd/0014-core-don-t-taint-on-unmerged-usr.patch
@@ -17,10 +17,10 @@ See also: https://github.com/systemd/systemd/issues/24191
  1 file changed, 8 deletions(-)
 
 diff --git a/src/core/taint.c b/src/core/taint.c
-index b7a1c647a2..c04864c478 100644
+index 8872a224b2..bc736e2ef8 100644
 --- a/src/core/taint.c
 +++ b/src/core/taint.c
-@@ -41,14 +41,6 @@ char** taint_strv(void) {
+@@ -42,14 +42,6 @@ char** taint_strv(void) {
  
          _cleanup_free_ char *bin = NULL, *usr_sbin = NULL, *var_run = NULL;
  
diff --git a/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch b/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch
index fe8ac0ddd913..9f73ff0de547 100644
--- a/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch
+++ b/pkgs/os-specific/linux/systemd/0015-tpm2_context_init-fix-driver-name-checking.patch
@@ -27,10 +27,10 @@ filename_is_valid with path_is_valid.
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/shared/tpm2-util.c b/src/shared/tpm2-util.c
-index 5b6b3ea93c..8ab04241b6 100644
+index 57e7a91f93..faf45e4807 100644
 --- a/src/shared/tpm2-util.c
 +++ b/src/shared/tpm2-util.c
-@@ -721,7 +721,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) {
+@@ -724,7 +724,7 @@ int tpm2_context_new(const char *device, Tpm2Context **ret_context) {
                  fn = strjoina("libtss2-tcti-", driver, ".so.0");
  
                  /* Better safe than sorry, let's refuse strings that cannot possibly be valid driver early, before going to disk. */
diff --git a/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch b/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
index 50dd842cc221..de846e9410b3 100644
--- a/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
+++ b/pkgs/os-specific/linux/systemd/0016-systemctl-edit-suggest-systemdctl-edit-runtime-on-sy.patch
@@ -30,10 +30,10 @@ are written into `$XDG_CONFIG_HOME/systemd/user`.
  1 file changed, 3 insertions(+)
 
 diff --git a/src/systemctl/systemctl-edit.c b/src/systemctl/systemctl-edit.c
-index 7165fa1cf7..7498cf9f4c 100644
+index 53bc57186a..0ed12ce931 100644
 --- a/src/systemctl/systemctl-edit.c
 +++ b/src/systemctl/systemctl-edit.c
-@@ -323,6 +323,9 @@ int verb_edit(int argc, char *argv[], void *userdata) {
+@@ -330,6 +330,9 @@ int verb_edit(int argc, char *argv[], void *userdata) {
          sd_bus *bus;
          int r;
  
diff --git a/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch b/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch
index 65cd257a8a41..2e3ada02a901 100644
--- a/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch
+++ b/pkgs/os-specific/linux/systemd/0017-meson.build-do-not-create-systemdstatedir.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] meson.build: do not create systemdstatedir
  1 file changed, 1 deletion(-)
 
 diff --git a/meson.build b/meson.build
-index a4730f0570..b5aaecd669 100644
+index 238b935372..b0b67c9b99 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -2815,7 +2815,6 @@ install_data('LICENSE.GPL2',
+@@ -2791,7 +2791,6 @@ install_data('LICENSE.GPL2',
  install_subdir('LICENSES',
                 install_dir : docdir)
  
diff --git a/pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch b/pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch
index da170d869ad7..472bd260caf3 100644
--- a/pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch
+++ b/pkgs/os-specific/linux/systemd/0018-meson-Don-t-link-ssh-dropins.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] meson: Don't link ssh dropins
  1 file changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/meson.build b/meson.build
-index b5aaecd669..91b23f2d72 100644
+index b0b67c9b99..4721b7482b 100644
 --- a/meson.build
 +++ b/meson.build
-@@ -207,13 +207,13 @@ sshconfdir = get_option('sshconfdir')
+@@ -219,13 +219,13 @@ sshconfdir = get_option('sshconfdir')
  if sshconfdir == ''
          sshconfdir = sysconfdir / 'ssh/ssh_config.d'
  endif
diff --git a/pkgs/os-specific/linux/systemd/0019-install-unit_file_exists_full-follow-symlinks.patch b/pkgs/os-specific/linux/systemd/0019-install-unit_file_exists_full-follow-symlinks.patch
index 4d7ceedcbab0..7372b5214e59 100644
--- a/pkgs/os-specific/linux/systemd/0019-install-unit_file_exists_full-follow-symlinks.patch
+++ b/pkgs/os-specific/linux/systemd/0019-install-unit_file_exists_full-follow-symlinks.patch
@@ -8,10 +8,10 @@ Subject: [PATCH] install: unit_file_exists_full: follow symlinks
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/src/shared/install.c b/src/shared/install.c
-index 6d87858a3c..8da022eb64 100644
+index 8195436564..dfbc35f357 100644
 --- a/src/shared/install.c
 +++ b/src/shared/install.c
-@@ -3226,7 +3226,7 @@ int unit_file_exists_full(RuntimeScope scope, const LookupPaths *lp, const char
+@@ -3227,7 +3227,7 @@ int unit_file_exists_full(RuntimeScope scope, const LookupPaths *lp, const char
                          &c,
                          lp,
                          name,
diff --git a/pkgs/os-specific/linux/systemd/0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch b/pkgs/os-specific/linux/systemd/0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
index a1b1575a51d2..be03316306b6 100644
--- a/pkgs/os-specific/linux/systemd/0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
+++ b/pkgs/os-specific/linux/systemd/0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
@@ -13,10 +13,10 @@ directly.
  1 file changed, 11 insertions(+)
 
 diff --git a/src/timesync/timesyncd.c b/src/timesync/timesyncd.c
-index d002501d29..9b835dc031 100644
+index 40305c046b..c3ed57c54e 100644
 --- a/src/timesync/timesyncd.c
 +++ b/src/timesync/timesyncd.c
-@@ -23,6 +23,11 @@
+@@ -25,6 +25,11 @@
  #include "timesyncd-conf.h"
  #include "timesyncd-manager.h"
  #include "user-util.h"
@@ -28,7 +28,7 @@ index d002501d29..9b835dc031 100644
  
  static int advance_tstamp(int fd, usec_t epoch) {
          assert(fd >= 0);
-@@ -201,6 +206,12 @@ static int run(int argc, char *argv[]) {
+@@ -203,6 +208,12 @@ static int run(int argc, char *argv[]) {
          if (r < 0)
                  return log_error_errno(r, "Failed to parse fallback server strings: %m");
  
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 090da26ed77c..07fe2194d044 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -56,7 +56,6 @@
   elfutils,
   linuxHeaders ? stdenv.cc.libc.linuxHeaders,
   gnutls,
-  iptables,
   withSelinux ? false,
   libselinux,
   withLibseccomp ? lib.meta.availableOn stdenv.hostPlatform libseccomp,
@@ -205,7 +204,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   inherit pname;
-  version = "257.9";
+  version = "258";
 
   # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly
   # This has proven to be less error-prone than the previous systemd fork.
@@ -213,7 +212,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "systemd";
     repo = "systemd";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-3Ig5TXhK99iOu41k4c5CgC4R3HhBftSAb9UbXvFY6lo=";
+    hash = "sha256-xtGZaVNsBNxkidgfVBu8xtvj0SxpY6OyJCUE+gq59qE=";
   };
 
   # On major changes, or when otherwise required, you *must* :
@@ -225,6 +224,12 @@ stdenv.mkDerivation (finalAttrs: {
   # Use `find . -name "*.patch" | sort` to get an up-to-date listing of all
   # patches
   patches = [
+    # https://github.com/systemd/systemd/pull/39094
+    (fetchpatch {
+      url = "https://github.com/systemd/systemd/commit/0f44a6c64aebc64a0611a605831206afee9cb730.patch";
+      hash = "sha256-DO6q17mE2U8iLezMYt4PX5Ror20N1gCrUbXeQmrW1is=";
+    })
+
     ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch
     ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch
     ./0003-Fix-NixOS-containers.patch
@@ -373,6 +378,7 @@ stdenv.mkDerivation (finalAttrs: {
         jinja2
       ]
       ++ lib.optional withEfi ps.pyelftools
+      ++ lib.optional (withUkify && finalAttrs.finalPackage.doCheck) ps.pefile
     ))
   ]
   ++ lib.optionals withLibBPF [
@@ -854,7 +860,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     ${lib.optionalString (
       !buildLibsOnly
-    ) "$out/bin/udevadm verify --resolve-names=never --no-style $out/lib/udev/rules.d"}
+    ) "$out/bin/udevadm verify --resolve-names=late --no-style $out/lib/udev/rules.d"}
 
     runHook postInstallCheck
   '';

From 5da25f9301751108d30562b4e86561a36f3cebcf Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 25 Sep 2025 18:27:54 -0400
Subject: [PATCH 0344/6226] systemd: Patch journald's Audit setting

https://github.com/systemd/systemd/pull/39069
---
 nixos/modules/system/boot/systemd/journald.nix | 7 +++++--
 pkgs/os-specific/linux/systemd/default.nix     | 6 ++++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/system/boot/systemd/journald.nix b/nixos/modules/system/boot/systemd/journald.nix
index 4d2ca7f11f21..279da8f47c0b 100644
--- a/nixos/modules/system/boot/systemd/journald.nix
+++ b/nixos/modules/system/boot/systemd/journald.nix
@@ -79,8 +79,11 @@ in
     };
 
     services.journald.audit = lib.mkOption {
-      default = null;
-      type = lib.types.nullOr lib.types.bool;
+      default = "keep";
+      type = lib.types.oneOf [
+        lib.types.bool
+        (lib.types.enum [ "keep" ])
+      ];
       description = ''
         If enabled systemd-journald will turn on auditing on start-up.
         If disabled it will turn it off. If unset it will neither enable nor disable it, leaving the previous state unchanged.
diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 07fe2194d044..72f9de346231 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -230,6 +230,12 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-DO6q17mE2U8iLezMYt4PX5Ror20N1gCrUbXeQmrW1is=";
     })
 
+    # https://github.com/systemd/systemd/pull/39069
+    (fetchpatch {
+      url = "https://github.com/systemd/systemd/commit/b5fdfedf729712b9824a5cb457a07d5699d2946c.patch";
+      hash = "sha256-0SvAn9Dl4z80PRIvDbIVIjKp5DsT/IUoHa5IiH1HHFY=";
+    })
+
     ./0001-Start-device-units-for-uninitialised-encrypted-devic.patch
     ./0002-Don-t-try-to-unmount-nix-or-nix-store.patch
     ./0003-Fix-NixOS-containers.patch

From 2203cd2a7c9f18f55f1bb9e1c5466433dfe8c93e Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 2 Oct 2025 17:10:41 -0400
Subject: [PATCH 0345/6226] udevCheckHook: Use `--resolve-names=late`

With systemd 258, `--resolve-names=never` causes any udev rules such
as `ENV{FOO}=="*?", GROUP=foo` to fail due to name resolution. Restore
old behvaior using the new `late` option.
---
 pkgs/by-name/ud/udevCheckHook/hook.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ud/udevCheckHook/hook.sh b/pkgs/by-name/ud/udevCheckHook/hook.sh
index bdb8e9c1f746..06740394a277 100644
--- a/pkgs/by-name/ud/udevCheckHook/hook.sh
+++ b/pkgs/by-name/ud/udevCheckHook/hook.sh
@@ -12,7 +12,7 @@ udevCheckHook() {
     for output in $(getAllOutputNames); do
         for path in etc lib ; do
             if [ -d "${!output}/$path/udev/rules.d" ]; then
-                @udevadm@ verify --resolve-names=never --no-style "${!output}/$path/udev/rules.d"
+                @udevadm@ verify --resolve-names=late --no-style "${!output}/$path/udev/rules.d"
             fi
         done
     done

From 4d813741b522a9faea4ca12c21e8e891642e014e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 3 Oct 2025 01:22:16 +0200
Subject: [PATCH 0346/6226] python3Packages.cython: 3.1.2 -> 3.1.4

https://github.com/cython/cython/blob/3.1.4/CHANGES.rst
---
 pkgs/development/python-modules/cython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cython/default.nix b/pkgs/development/python-modules/cython/default.nix
index f62acbab3b90..decea832cb46 100644
--- a/pkgs/development/python-modules/cython/default.nix
+++ b/pkgs/development/python-modules/cython/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "cython";
-  version = "3.1.2";
+  version = "3.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cython";
     repo = "cython";
     tag = version;
-    hash = "sha256-lP8ILCzAZuoPzFhCqGXwIpifN8XoWz93SJ7c3XVe69Y=";
+    hash = "sha256-qFj7w0fQY6X1oADLsAgwFefzx92/Pmgv9j5S6v0sdPg=";
   };
 
   build-system = [

From 09ad3f26f5f94b75edf1590ea2b713ea115ece7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Oct 2025 01:33:17 +0000
Subject: [PATCH 0347/6226] grpc-gateway: 2.27.2 -> 2.27.3

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

diff --git a/pkgs/by-name/gr/grpc-gateway/package.nix b/pkgs/by-name/gr/grpc-gateway/package.nix
index 6c6ea6a78097..b3bcce67aa8a 100644
--- a/pkgs/by-name/gr/grpc-gateway/package.nix
+++ b/pkgs/by-name/gr/grpc-gateway/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "grpc-gateway";
-  version = "2.27.2";
+  version = "2.27.3";
 
   src = fetchFromGitHub {
     owner = "grpc-ecosystem";
     repo = "grpc-gateway";
     tag = "v${version}";
-    sha256 = "sha256-NWMpCPtZZVa53SR8NqSaDpo6fauB3hHb1PeqNs0OO+M=";
+    sha256 = "sha256-NXcfr/+VZnYlK5A/RuTboB33WadoutG7GnACfrWBvwg=";
   };
 
-  vendorHash = "sha256-NYiHnarNAndE3QIKPI51plWNNB9kP2DlpYgW43Uw/gw=";
+  vendorHash = "sha256-EgFB5ADytn9h8P2CrM9mr5siX5G4+8HGyWt/upp3yHg=";
 
   ldflags = [
     "-X=main.version=${version}"

From 9d8455e23154927cd99c85fdf3f22ce045af83d8 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Wed, 1 Oct 2025 20:32:43 -0400
Subject: [PATCH 0348/6226] shadered: drop

Has been marked broken for at least a full release cycle.

Dropping per RFC 180.
---
 .../sh/shadered/install_path_fix.patch        | 13 -----
 pkgs/by-name/sh/shadered/package.nix          | 52 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 3 files changed, 1 insertion(+), 65 deletions(-)
 delete mode 100644 pkgs/by-name/sh/shadered/install_path_fix.patch
 delete mode 100644 pkgs/by-name/sh/shadered/package.nix

diff --git a/pkgs/by-name/sh/shadered/install_path_fix.patch b/pkgs/by-name/sh/shadered/install_path_fix.patch
deleted file mode 100644
index 6b39ca696b90..000000000000
--- a/pkgs/by-name/sh/shadered/install_path_fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 55eb05c..18f7fc3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -234,7 +234,7 @@ endif()
- 
- set(BINARY_INST_DESTINATION "bin")
- set(RESOURCE_INST_DESTINATION "share/shadered")
--install(PROGRAMS bin/SHADERed DESTINATION "${BINARY_INST_DESTINATION}" RENAME shadered)
-+install(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/bin/SHADERed DESTINATION "${BINARY_INST_DESTINATION}" RENAME shadered)
- install(DIRECTORY bin/data bin/templates bin/themes bin/plugins DESTINATION "${RESOURCE_INST_DESTINATION}")
- 
- if (UNIX AND NOT APPLE)
diff --git a/pkgs/by-name/sh/shadered/package.nix b/pkgs/by-name/sh/shadered/package.nix
deleted file mode 100644
index 032b363ddf7e..000000000000
--- a/pkgs/by-name/sh/shadered/package.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  sfml,
-  glm,
-  python3,
-  glew,
-  pkg-config,
-  SDL2,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "SHADERed";
-  version = "1.5.6";
-
-  src = fetchFromGitHub {
-    owner = "dfranx";
-    repo = "SHADERed";
-    tag = "v${version}";
-    fetchSubmodules = true;
-    sha256 = "0drf8wwx0gcmi22jq2yyjy7ppxynfq172wqakchscm313j248fjr";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    SDL2
-    glew
-    glm
-    python3
-    sfml
-  ];
-
-  patches = [
-    ./install_path_fix.patch
-  ];
-
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=format-security";
-
-  meta = with lib; {
-    description = "Lightweight, cross-platform & full-featured shader IDE";
-    homepage = "https://github.com/dfranx/SHADERed";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ Scriptkiddi ];
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1ad33906f1d2..556fdfd64b75 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2341,6 +2341,7 @@ mapAliases {
   siproxd = throw "'siproxd' has been removed as it was unmaintained and incompatible with newer libosip versions"; # Added 2025-05-18
   sisco.lv2 = throw "'sisco.lv2' has been removed as it was unmaintained and broken"; # Added 2025-08-26
   sipwitch = throw "'sipwitch' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
+  shadered = throw "shadered has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   sheesy-cli = throw "'sheesy-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
   shout = nodePackages.shout; # Added unknown; moved 2024-10-19
   sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21

From 280f6acc409676ae8b4ec35d3ddde1b8489eaee2 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 2 Oct 2025 23:58:25 -0400
Subject: [PATCH 0349/6226] nixos/systemd-stage-1: Add `dmi_memory_id`

It's unclear why we didn't get the error message about this binary not
existing before, because the udev rule requiring it has always been in
systemd initrd.
---
 nixos/modules/services/hardware/udev.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index 9370fb0bf207..efc9b486149b 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -462,6 +462,7 @@ in
       "${config.boot.initrd.systemd.package}/lib/systemd/systemd-udevd"
       "${config.boot.initrd.systemd.package}/lib/udev/ata_id"
       "${config.boot.initrd.systemd.package}/lib/udev/cdrom_id"
+      "${config.boot.initrd.systemd.package}/lib/udev/dmi_memory_id"
       "${config.boot.initrd.systemd.package}/lib/udev/scsi_id"
       "${config.boot.initrd.systemd.package}/lib/udev/rules.d"
     ]

From c9115a3792c31b50cae5561ab324cd863a509429 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Wed, 17 Sep 2025 21:10:44 -0400
Subject: [PATCH 0350/6226] nixos/tests/machinectl: Slightly changed ID shift
 message

---
 nixos/tests/systemd-machinectl.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/systemd-machinectl.nix b/nixos/tests/systemd-machinectl.nix
index 03ffc25b9113..6a3a47d938bc 100644
--- a/nixos/tests/systemd-machinectl.nix
+++ b/nixos/tests/systemd-machinectl.nix
@@ -171,7 +171,7 @@ in
     machine.succeed("ping -n -c 1 ${containerName}");
 
     # Test systemd-nspawn uses a user namespace
-    machine.succeed("test $(machinectl status ${containerName} | grep 'UID Shift: ' | wc -l) = 1")
+    machine.succeed("test $(machinectl status ${containerName} | grep 'ID Shift: ' | wc -l) = 1")
 
     # Test systemd-nspawn reboot
     machine.succeed("machinectl shell ${containerName} /run/current-system/sw/bin/reboot");

From 95ec87adcbff90ca8f011406a325a6e5dfce1b29 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 18 Sep 2025 12:01:37 -0400
Subject: [PATCH 0351/6226] nixos/tests/systemd: Slightly changed IP accounting
 message

---
 nixos/tests/systemd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix
index fbece2a73dfc..f0bbdef76c61 100644
--- a/nixos/tests/systemd.nix
+++ b/nixos/tests/systemd.nix
@@ -244,7 +244,7 @@
           assert "0B read, 0B written" not in output
 
       with subtest("systemd per-unit accounting works"):
-          assert "IP traffic received: 84B sent: 84B" in output_ping
+          assert "IP Traffic: received 84B, sent 84B" in output_ping
 
       with subtest("systemd environment is properly set"):
           machine.systemctl("daemon-reexec")  # Rewrites /proc/1/environ

From f75a8b7e9a613ff37fa3d84b2ce0f85dde433de6 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Wed, 23 Jul 2025 18:03:05 -0400
Subject: [PATCH 0352/6226] nixos/users-groups: New clock system group

---
 nixos/modules/config/users-groups.nix | 2 ++
 nixos/modules/misc/ids.nix            | 1 +
 2 files changed, 3 insertions(+)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index 59f1b44483df..ad61a4116ef1 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -871,6 +871,7 @@ in
         render.gid = ids.gids.render;
         sgx.gid = ids.gids.sgx;
         shadow.gid = ids.gids.shadow;
+        clock.gid = ids.gids.clock;
       };
 
       system.activationScripts.users =
@@ -1033,6 +1034,7 @@ in
           cdrom = { };
           tape = { };
           kvm = { };
+          clock = { };
         };
       };
 
diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix
index 949531d9a83c..b3cf6a063356 100644
--- a/nixos/modules/misc/ids.nix
+++ b/nixos/modules/misc/ids.nix
@@ -690,6 +690,7 @@ in
       rstudio-server = 324;
       localtimed = 325;
       automatic-timezoned = 326;
+      clock = 327;
 
       # When adding a gid, make sure it doesn't match an existing
       # uid. Users and groups with the same name should have equal

From 107893c8f366230a9297dcb27fa7e646293d861e Mon Sep 17 00:00:00 2001
From: Ali Rizvi <contact@frontear.dev>
Date: Wed, 10 Sep 2025 19:59:22 -0400
Subject: [PATCH 0353/6226] nixos/systemd-oomd: drop old `After=` dependency

---
 nixos/modules/system/boot/systemd/oomd.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd/oomd.nix b/nixos/modules/system/boot/systemd/oomd.nix
index 82a87f00e97b..b69cfd472165 100644
--- a/nixos/modules/system/boot/systemd/oomd.nix
+++ b/nixos/modules/system/boot/systemd/oomd.nix
@@ -52,7 +52,6 @@ in
 
     systemd.services.systemd-oomd.after = [
       "swap.target" # TODO: drop after systemd v258
-      "systemd-sysusers.service" # TODO: drop after systemd v257.8
     ];
     systemd.services.systemd-oomd.wantedBy = [ "multi-user.target" ];
 

From 6160af2a3605afa9ffe7c322199cfbdd53215764 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Fri, 3 Oct 2025 01:35:50 -0400
Subject: [PATCH 0354/6226] nixos/systemd-oomd: Drop swap ordering

This ordering is present in the upstream unit in 258
---
 nixos/modules/system/boot/systemd/oomd.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/nixos/modules/system/boot/systemd/oomd.nix b/nixos/modules/system/boot/systemd/oomd.nix
index b69cfd472165..90c786ec5c22 100644
--- a/nixos/modules/system/boot/systemd/oomd.nix
+++ b/nixos/modules/system/boot/systemd/oomd.nix
@@ -50,9 +50,6 @@ in
       "systemd-oomd.socket"
     ];
 
-    systemd.services.systemd-oomd.after = [
-      "swap.target" # TODO: drop after systemd v258
-    ];
     systemd.services.systemd-oomd.wantedBy = [ "multi-user.target" ];
 
     environment.etc."systemd/oomd.conf".text = utils.systemdUtils.lib.settingsToSections cfg.settings;

From ba18d8224ce1ca6ced12b21f1a497944322916db Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 3 Oct 2025 06:41:30 +0100
Subject: [PATCH 0355/6226] sdl3: 3.2.22 -> 3.2.24

Changes: https://github.com/libsdl-org/SDL/releases/tag/release-3.2.24
---
 pkgs/by-name/sd/sdl3/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sd/sdl3/package.nix b/pkgs/by-name/sd/sdl3/package.nix
index b03ebd819ddd..8488b5345258 100644
--- a/pkgs/by-name/sd/sdl3/package.nix
+++ b/pkgs/by-name/sd/sdl3/package.nix
@@ -62,7 +62,7 @@ assert lib.assertMsg (ibusSupport -> dbusSupport) "SDL3 requires dbus support to
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sdl3";
-  version = "3.2.22";
+  version = "3.2.24";
 
   outputs = [
     "lib"
@@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "libsdl-org";
     repo = "SDL";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-4jGfw2hNZTGuae2DMLz8xJBtfNu5abIN5GlNIKDOUpw=";
+    hash = "sha256-LUkj9Rrf+zOW0IdV7aGccb/5bKh3TWf1IGtQkCDHd4k=";
   };
 
   postPatch =

From 66f6beb0023761968c6ed9d10d904212514940c9 Mon Sep 17 00:00:00 2001
From: Sebastian Rieger <sebastian.rieger@informatik.hs-fulda.de>
Date: Tue, 30 Sep 2025 14:44:19 +0200
Subject: [PATCH 0356/6226] containerlab: 0.69.3 -> 0.70.2

https://github.com/srl-labs/containerlab/releases/tag/v0.70.2
---
 pkgs/by-name/co/containerlab/package.nix | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix
index cf3a9f78c8f2..cebb6b6cf5c7 100644
--- a/pkgs/by-name/co/containerlab/package.nix
+++ b/pkgs/by-name/co/containerlab/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "containerlab";
-  version = "0.69.3";
+  version = "0.70.2";
 
   src = fetchFromGitHub {
     owner = "srl-labs";
     repo = "containerlab";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RJNJ5LUCGaARn5NOSepTL/0Owr/ozFUYAvlynDTyqfY=";
+    hash = "sha256-QBv0SZ7XxVc0yWbOxPKdfzk9AKYlMJyeZwpAx1jbamk=";
   };
 
-  vendorHash = "sha256-28Q1R6P2rpER5RxagnsKy9W3b4FUeRRbkPPovzag//U=";
+  vendorHash = "sha256-XttJ/GXhNKVHLR33A/o3N3OYHsyKWHBhD5QOz0AlfFk=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -27,9 +27,9 @@ buildGoModule (finalAttrs: {
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/srl-labs/containerlab/cmd/version.Version=${finalAttrs.version}"
-    "-X github.com/srl-labs/containerlab/cmd/version.commit=${finalAttrs.src.rev}"
-    "-X github.com/srl-labs/containerlab/cmd/version.date=1970-01-01T00:00:00Z"
+    "-X github.com/srl-labs/containerlab/cmd.Version=${finalAttrs.version}"
+    "-X github.com/srl-labs/containerlab/cmd.commit=${finalAttrs.src.rev}"
+    "-X github.com/srl-labs/containerlab/cmd.date=1970-01-01T00:00:00Z"
   ];
 
   preCheck = ''
@@ -37,9 +37,10 @@ buildGoModule (finalAttrs: {
     export USER="runner"
   '';
 
-  # TestVerifyLinks wants to use docker.sock, which is not available in the Nix build environment.
+  # TestVerifyLinks wants to use docker.sock which is not available in the Nix build env
+  # KernelModulesLoaded wants to use /proc/modules which is not available in Nix build env
   checkFlags = [
-    "-skip=^TestVerifyLinks$"
+    "-skip=^TestVerifyLinks$|^TestIsKernelModuleLoaded$"
   ];
 
   postInstall = ''

From 494ae4daffc46f68c97cfd25c83aac6830a25ab6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Oct 2025 08:01:07 +0000
Subject: [PATCH 0357/6226] python3Packages.textual-autocomplete: 4.0.5 ->
 4.0.6

---
 .../python-modules/textual-autocomplete/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/textual-autocomplete/default.nix b/pkgs/development/python-modules/textual-autocomplete/default.nix
index 5b2768f33090..e4f2195ba502 100644
--- a/pkgs/development/python-modules/textual-autocomplete/default.nix
+++ b/pkgs/development/python-modules/textual-autocomplete/default.nix
@@ -9,13 +9,13 @@
 }:
 buildPythonPackage rec {
   pname = "textual-autocomplete";
-  version = "4.0.5";
+  version = "4.0.6";
   pyproject = true;
 
   src = fetchPypi {
     pname = "textual_autocomplete";
     inherit version;
-    hash = "sha256-24Bm/H2Hx0r9CDZ/j8IUS87F3b3qY6Y3JJdU6dH9h1U=";
+    hash = "sha256-K6Lw12e+RIDsrLPksTDPBzQOAzw1APxCT+2RJdJ6RYY=";
   };
 
   build-system = [

From 2e6b498101477d203b5a5475cf78f3a14dc35828 Mon Sep 17 00:00:00 2001
From: bubblepipe42 <bubblepipe42@gmail.com>
Date: Fri, 3 Oct 2025 16:30:06 +0800
Subject: [PATCH 0358/6226] wamrc: init at 2.3.1

---
 pkgs/by-name/wa/wamrc/package.nix | 50 +++++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 pkgs/by-name/wa/wamrc/package.nix

diff --git a/pkgs/by-name/wa/wamrc/package.nix b/pkgs/by-name/wa/wamrc/package.nix
new file mode 100644
index 000000000000..f2143da08c18
--- /dev/null
+++ b/pkgs/by-name/wa/wamrc/package.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  llvmPackages,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "wamrc";
+  version = "2.3.1";
+
+  src = fetchFromGitHub {
+    owner = "bytecodealliance";
+    repo = "wasm-micro-runtime";
+    tag = "WAMR-${finalAttrs.version}";
+    hash = "sha256-Rhn26TRyjkR30+zyosfooOGjhvG+ztYtJVQlRfzWEFo=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    llvmPackages.llvm
+  ];
+
+  cmakeFlags =
+    lib.optionals stdenv.hostPlatform.isDarwin [
+      "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinSdkVersion}"
+    ]
+    ++ [
+      "-DWAMR_BUILD_WITH_CUSTOM_LLVM=ON"
+      "-DLLVM_DIR=${llvmPackages.llvm.dev}/lib/cmake/llvm"
+    ];
+
+  sourceRoot = "${finalAttrs.src.name}/wamr-compiler";
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex=WAMR-(.*)" ]; };
+
+  meta = {
+    description = "WebAssembly Micro Runtime AOT compiler";
+    homepage = "https://github.com/bytecodealliance/wasm-micro-runtime";
+    license = lib.licenses.asl20;
+    mainProgram = "wamrc";
+    maintainers = with lib.maintainers; [ bubblepipe ];
+    platforms = lib.platforms.unix;
+  };
+})

From a5823575a8e0825fa1ab37481adbafb14abd5b91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Oct 2025 04:55:50 -0700
Subject: [PATCH 0359/6226] python3Packages.typing-inspection: 0.4.1 -> 0.4.2

Diff: https://github.com/pydantic/typing-inspection/compare/v0.4.1...v0.4.2

Changelog: https://github.com/pydantic/typing-inspection/blob/v0.4.2/HISTORY.md
---
 pkgs/development/python-modules/typing-inspection/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/typing-inspection/default.nix b/pkgs/development/python-modules/typing-inspection/default.nix
index 9c09a8fdcfec..ce85c5b0d5b6 100644
--- a/pkgs/development/python-modules/typing-inspection/default.nix
+++ b/pkgs/development/python-modules/typing-inspection/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "typing-inspection";
-  version = "0.4.1";
+  version = "0.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pydantic";
     repo = "typing-inspection";
     tag = "v${version}";
-    hash = "sha256-MzOXl1i+rmr08TSH3Nxc0fFkcjATY6i9dFRLsYp+5m0=";
+    hash = "sha256-aGScO+FLEJ5IyI6hBqdsiKJRN7vEG36V5131nhVZEbc=";
   };
 
   build-system = [ hatchling ];

From 27881cdb9be21e0f9d5d4ecb4b2c4be867bd88a4 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 3 Oct 2025 08:39:20 -0400
Subject: [PATCH 0360/6226] python3Packages.amazon-kclpy: drop

Has been marked broken for at least a full release cycle.

Dropping per RFC 180.
---
 .../python-modules/amazon-kclpy/default.nix   | 50 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 pkgs/development/python-modules/amazon-kclpy/default.nix

diff --git a/pkgs/development/python-modules/amazon-kclpy/default.nix b/pkgs/development/python-modules/amazon-kclpy/default.nix
deleted file mode 100644
index 3c039de4dbab..000000000000
--- a/pkgs/development/python-modules/amazon-kclpy/default.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  fetchpatch,
-  setuptools,
-  mock,
-  boto3,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "amazon-kclpy";
-  version = "3.1.0";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "awslabs";
-    repo = "amazon-kinesis-client-python";
-    tag = "v${version}";
-    hash = "sha256-nboEZwRlhbr176H4b6ESm3LfVZCoKz3yKrQptERsLgg=";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "remove-deprecated-boto.patch";
-      url = "https://github.com/awslabs/amazon-kinesis-client-python/commit/bd2c442cdd1b0e2c99d3471c1d3ffcc9161a7c42.patch";
-      hash = "sha256-5W0qItDGjx1F6IllzLH57XCpToKrAu9mTbzv/1wMXuY=";
-    })
-  ];
-
-  build-system = [ setuptools ];
-
-  dependencies = [
-    mock
-    boto3
-  ];
-
-  pythonImportsCheck = [ "amazon_kclpy" ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  meta = with lib; {
-    description = "Amazon Kinesis Client Library for Python";
-    homepage = "https://github.com/awslabs/amazon-kinesis-client-python";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ psyanticy ];
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index f17434b17512..567736c2b08c 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -73,6 +73,7 @@ mapAliases ({
   aiosenseme = throw "aiosenseme has been removed, because it does no longer work with the latest firmware and has become unmaintained"; # Added 2023-07-05
   aioquic-mitmproxy = throw "aioquic-mitmproxy has been removed because mitmproxy no longer uses it"; # Added 2024-01-16
   amazon_kclpy = amazon-kclpy; # added 2023-08-08
+  amazon-kclpy = throw "amazon-kclpy has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
   ambiclimate = throw "ambiclimate has been removed, because the service has been terminated after 2024-03-31."; # Added 2024-06-07
   ambee = throw "ambee has been removed because the upstream repository was archived in 2022"; # Added 2024-10-04
   amiibo-py = throw "amiibo-py has been removed because the upstream repository was removed"; # Added 2025-01-13
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1dd003ebee66..73ecf522b38d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -651,8 +651,6 @@ self: super: with self; {
 
   amazon-ion = callPackage ../development/python-modules/amazon-ion { };
 
-  amazon-kclpy = callPackage ../development/python-modules/amazon-kclpy { };
-
   amberelectric = callPackage ../development/python-modules/amberelectric { };
 
   amcrest = callPackage ../development/python-modules/amcrest { };

From 84160ebefaa0dae5e82833a2852a80797ffc5b1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Oct 2025 12:40:33 +0000
Subject: [PATCH 0361/6226] commonsIo: 2.19.0 -> 2.20.0

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

diff --git a/pkgs/by-name/co/commonsIo/package.nix b/pkgs/by-name/co/commonsIo/package.nix
index ef7dc20cfcd8..06eaa4e96a6b 100644
--- a/pkgs/by-name/co/commonsIo/package.nix
+++ b/pkgs/by-name/co/commonsIo/package.nix
@@ -5,12 +5,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.19.0";
+  version = "2.20.0";
   pname = "commons-io";
 
   src = fetchurl {
     url = "mirror://apache/commons/io/binaries/${pname}-${version}-bin.tar.gz";
-    sha256 = "sha256-zhS4nMCrwL2w2qNXco5oRkXSiOzzepD6EiZzmCgfnNI=";
+    sha256 = "sha256-+hNGq8TV4g8w9Q2df9kpYniBg1h8dOX6mF/1kk4VLcw=";
   };
 
   installPhase = ''

From f9bc32d77373853e1ab1750603155dc751e1f69b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Oct 2025 12:52:15 +0000
Subject: [PATCH 0362/6226] packagekit: 1.3.1 -> 1.3.2

---
 pkgs/tools/package-management/packagekit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix
index 379ca62ac758..e96438dd4f23 100644
--- a/pkgs/tools/package-management/packagekit/default.nix
+++ b/pkgs/tools/package-management/packagekit/default.nix
@@ -30,7 +30,7 @@
 
 stdenv.mkDerivation rec {
   pname = "packagekit";
-  version = "1.3.1";
+  version = "1.3.2";
 
   outputs = [
     "out"
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     owner = "PackageKit";
     repo = "PackageKit";
     rev = "v${version}";
-    hash = "sha256-8sgvD6pZ2n4Du44kTPsvYtSYpkMKCpfxeSrGjWeSw50=";
+    hash = "sha256-oQuJpn9G/V8CrrEs2agbKVS9xZnS1MgHa8B8P1nFmiw=";
   };
 
   buildInputs = [

From 1a6d066d7ba3ff1886b007a314241195982b838c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Oct 2025 13:28:21 +0000
Subject: [PATCH 0363/6226] kdePackages.packagekit-qt: 1.1.3 -> 1.1.4

---
 pkgs/tools/package-management/packagekit/qt.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/packagekit/qt.nix b/pkgs/tools/package-management/packagekit/qt.nix
index ff156cf8559b..59e81df66a30 100644
--- a/pkgs/tools/package-management/packagekit/qt.nix
+++ b/pkgs/tools/package-management/packagekit/qt.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "packagekit-qt";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchFromGitHub {
     owner = "hughsie";
     repo = "PackageKit-Qt";
     tag = "v${version}";
-    hash = "sha256-ZHkOFPaOMLCectYKzQs9oQ70kv8APOdkjDRimHgld+c=";
+    hash = "sha256-D1LsEaxc6lA0ULmYQ9n2KEs6NpoHeTgOJsKzdEnImUM=";
   };
 
   buildInputs = [ packagekit ];

From 6f339bd25bac4e81634db7f70af1a3b379d1d63e Mon Sep 17 00:00:00 2001
From: definfo <hjsdbb1@gmail.com>
Date: Sun, 28 Sep 2025 10:25:34 +0800
Subject: [PATCH 0364/6226] nixos/virtualisation/podman: add shell completions
 for podman dockerCompat

This can fix shell completion for `podman.dockerCompat`.
---
 nixos/modules/virtualisation/podman/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/virtualisation/podman/default.nix b/nixos/modules/virtualisation/podman/default.nix
index b6ab82b1acb5..8145c099eead 100644
--- a/nixos/modules/virtualisation/podman/default.nix
+++ b/nixos/modules/virtualisation/podman/default.nix
@@ -10,11 +10,13 @@ let
   json = pkgs.formats.json { };
 
   inherit (lib) mkOption types;
+  inherit (pkgs) stdenv;
 
   # Provides a fake "docker" binary mapping to podman
   dockerCompat =
     pkgs.runCommand "${cfg.package.pname}-docker-compat-${cfg.package.version}"
       {
+        nativeBuildInputs = [ pkgs.installShellFiles ];
         outputs = [
           "out"
           "man"
@@ -31,7 +33,14 @@ let
           basename=$(basename $f | sed s/podman/docker/g)
           ln -s $f $man/share/man/man1/$basename
         done
-      '';
+      ''
+    + lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      export HOME=$(mktemp -d) # work around `docker <cmd>`
+      installShellCompletion --cmd docker \
+        --bash <($out/bin/docker completion bash) \
+        --zsh <($out/bin/docker completion zsh) \
+        --fish <($out/bin/docker completion fish)
+    '';
 
 in
 {

From 27de0b7d40ee96775729316bf644d0b93ab9b0fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Oct 2025 13:39:03 +0000
Subject: [PATCH 0365/6226] yaru-theme: 25.10.2 -> 25.10.3

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

diff --git a/pkgs/by-name/ya/yaru-theme/package.nix b/pkgs/by-name/ya/yaru-theme/package.nix
index c074527301c5..89f29151af47 100644
--- a/pkgs/by-name/ya/yaru-theme/package.nix
+++ b/pkgs/by-name/ya/yaru-theme/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "yaru";
-  version = "25.10.2";
+  version = "25.10.3";
 
   src = fetchFromGitHub {
     owner = "ubuntu";
     repo = "yaru";
     rev = version;
-    hash = "sha256-3NTqRmAdO3+9e9B7Fe0B9PPeMUBAmin+51cfqAijV0w=";
+    hash = "sha256-3cSVPObfmr62S6yTD2c8AO3s7lxb9KFVuYSydTIJ1jE=";
   };
 
   nativeBuildInputs = [

From 06c673e201c0841ee75fcbd68966c413a70331c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Oct 2025 19:06:38 +0000
Subject: [PATCH 0366/6226] questdb: 9.0.3 -> 9.1.0

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

diff --git a/pkgs/by-name/qu/questdb/package.nix b/pkgs/by-name/qu/questdb/package.nix
index 90d33fe895fb..897e32a43797 100644
--- a/pkgs/by-name/qu/questdb/package.nix
+++ b/pkgs/by-name/qu/questdb/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "questdb";
-  version = "9.0.3";
+  version = "9.1.0";
 
   src = fetchurl {
     url = "https://github.com/questdb/questdb/releases/download/${finalAttrs.version}/questdb-${finalAttrs.version}-no-jre-bin.tar.gz";
-    hash = "sha256-/EkqBK/mero219VUylNLVGD1ZzxBMAYpJ7NcU7BC+aw=";
+    hash = "sha256-bgeNZi0VonO+L9Vww5n6e0ZOLl9MTXnNe2kPLttbw1c=";
   };
 
   nativeBuildInputs = [

From 4dd4e54e2ce4a669d1bc139ae2783f24fa18c580 Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Fri, 3 Oct 2025 21:17:19 +0200
Subject: [PATCH 0367/6226] nixos/tests/systemd-initrd-luks-tpm2: Fix on
 aarch64-linux

Systemd wants you to run tpm unlock on a machine with the TCG
bits of OVMF enabled. If not it just bails out with

No TPM2 hardware discovered and EFI firmware does not see it either, falling back to traditional unlocking
---
 nixos/tests/systemd-initrd-luks-tpm2.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/tests/systemd-initrd-luks-tpm2.nix b/nixos/tests/systemd-initrd-luks-tpm2.nix
index 20e203b0e86b..6cc42bbbda73 100644
--- a/nixos/tests/systemd-initrd-luks-tpm2.nix
+++ b/nixos/tests/systemd-initrd-luks-tpm2.nix
@@ -11,6 +11,7 @@
         useBootLoader = true;
         # Booting off the TPM2-encrypted device requires an available init script
         mountHostNixStore = true;
+        efi.OVMF = pkgs.OVMFFull; # this really should be the default. Only OVMFFull contains TCG
         useEFIBoot = true;
         tpm.enable = true;
       };

From 506887da094540d9891dd21d03fc10c846fca893 Mon Sep 17 00:00:00 2001
From: Arian van Putten <arian.vanputten@gmail.com>
Date: Fri, 3 Oct 2025 21:22:37 +0200
Subject: [PATCH 0368/6226] systemd: remove systemd-lock-handler from
 passthru.tests

it's not an official systemd thing and we're not the maintainers of it.
Also the test is broken. But that is not our problem
---
 pkgs/os-specific/linux/systemd/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 72f9de346231..bb477c9e34b9 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -1004,7 +1004,6 @@ stdenv.mkDerivation (finalAttrs: {
             systemd-journal
             systemd-journal-gateway
             systemd-journal-upload
-            systemd-lock-handler
             systemd-machinectl
             systemd-networkd
             systemd-networkd-bridge

From c8ddc0d1ca26c95796606272d7436d71310d994c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 3 Oct 2025 19:50:21 +0000
Subject: [PATCH 0369/6226] jsign: 7.2 -> 7.3

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

diff --git a/pkgs/by-name/js/jsign/package.nix b/pkgs/by-name/js/jsign/package.nix
index 82e5ca98ede3..2106244bd447 100644
--- a/pkgs/by-name/js/jsign/package.nix
+++ b/pkgs/by-name/js/jsign/package.nix
@@ -18,13 +18,13 @@ maven.buildMavenPackage rec {
   pname = "jsign";
   # For build from non-release, increment version by one and add -SNAPSHOT
   # e.g. 7.3-SNAPSHOT
-  version = "7.2";
+  version = "7.3";
 
   src = fetchFromGitHub {
     owner = "ebourg";
     repo = "jsign";
     tag = version;
-    hash = "sha256-ngAwtd4C3KeLq9sM15B8tWS34AH81azYEjXg3+Gy5NA=";
+    hash = "sha256-FlVTKM1swdNP3kht8MELgUAHPv+FBpwt23WNl/moGjI=";
   };
 
   mvnHash = "sha256-N91gwM3vsDZQM/BptF5RgRQ/A8g56NOJ6bc2SkxLnBs=";

From ba9c67999d7ce0a4c85a5cbf335d27becab80683 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Fri, 3 Oct 2025 22:47:06 +0200
Subject: [PATCH 0370/6226] awf: drop

---
 pkgs/by-name/aw/awf/package.nix | 52 ---------------------------------
 pkgs/top-level/aliases.nix      |  1 +
 2 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 pkgs/by-name/aw/awf/package.nix

diff --git a/pkgs/by-name/aw/awf/package.nix b/pkgs/by-name/aw/awf/package.nix
deleted file mode 100644
index 9423dda218c6..000000000000
--- a/pkgs/by-name/aw/awf/package.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoreconfHook,
-  gtk2,
-  gtk3,
-  pkg-config,
-  wrapGAppsHook3,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "awf";
-  version = "1.4.0";
-
-  src = fetchFromGitHub {
-    owner = "valr";
-    repo = "awf";
-    rev = "v${version}";
-    sha256 = "0jl2kxwpvf2n8974zzyp69mqhsbjnjcqm39y0jvijvjb1iy8iman";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
-    wrapGAppsHook3
-  ];
-
-  buildInputs = [
-    gtk2
-    gtk3
-  ];
-
-  autoreconfPhase = ''
-    patchShebangs ./autogen.sh
-    ./autogen.sh
-  '';
-
-  meta = with lib; {
-    description = "Widget Factory";
-    longDescription = ''
-      A widget factory is a theme preview application for gtk2 and
-      gtk3. It displays the various widget types provided by gtk2/gtk3
-      in a single window allowing to see the visual effect of the
-      applied theme.
-    '';
-    homepage = "https://github.com/valr/awf";
-    license = licenses.gpl3;
-    platforms = platforms.all;
-    maintainers = with maintainers; [ michalrus ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5b26bca0c40d..9aec1ed62831 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -493,6 +493,7 @@ mapAliases {
   avr-sim = throw "'avr-sim' has been removed as it was broken and unmaintained. Possible alternatives are 'simavr', SimulAVR and AVRStudio."; # Added 2025-05-31
   axmldec = throw "'axmldec' has been removed as it was broken and unmaintained for 8 years"; # Added 2025-05-17
   awesome-4-0 = awesome; # Added 2022-05-05
+  awf = throw "'awf' has been removed as the upstream project was archived in 2021"; # Added 2025-10-03
   aws-env = throw "aws-env has been removed as the upstream project was unmaintained"; # Added 2024-06-11
   aws-google-auth = throw "aws-google-auth has been removed as the upstream project was unmaintained"; # Added 2024-07-31
 

From 521c833c169df2962d0f6a9c16dcff0225306572 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sun, 21 Sep 2025 23:53:22 +0200
Subject: [PATCH 0371/6226] librsvg: patch too_many_elements test to accept any
 error

libxml 2.15 no longer updates the element count
before throwing an error in case of too many elements.
This makes librsvg unable to report `TooManyLoadedElements`,
instead failing with a generic error.
---
 .../expect-any-error-too-many-elements.patch  | 23 +++++++++++++++++++
 pkgs/by-name/li/librsvg/package.nix           | 11 +++++++++
 2 files changed, 34 insertions(+)
 create mode 100644 pkgs/by-name/li/librsvg/expect-any-error-too-many-elements.patch

diff --git a/pkgs/by-name/li/librsvg/expect-any-error-too-many-elements.patch b/pkgs/by-name/li/librsvg/expect-any-error-too-many-elements.patch
new file mode 100644
index 000000000000..94f145bb744c
--- /dev/null
+++ b/pkgs/by-name/li/librsvg/expect-any-error-too-many-elements.patch
@@ -0,0 +1,23 @@
+diff --git a/rsvg/tests/errors.rs b/rsvg/tests/errors.rs
+index 02b134bee..46391fa5d 100644
+--- a/rsvg/tests/errors.rs
++++ b/rsvg/tests/errors.rs
+@@ -14,15 +14,12 @@ use rsvg::{CairoRenderer, ImplementationLimit, Loader, LoadingError, RenderingEr
+ 
+ #[ignore]
+ #[test]
++#[should_panic]
+ fn too_many_elements() {
+     let name = "tests/fixtures/errors/bug515-too-many-elements.svgz";
+ 
+-    assert!(matches!(
+-        Loader::new().read_path(name),
+-        Err(LoadingError::LimitExceeded(
+-            ImplementationLimit::TooManyLoadedElements
+-        ))
+-    ));
++    // libxml2 might return an error without updating the element count, so just expect any error, not specifically too many elements
++    Loader::new().read_path(name).unwrap();
+ }
+ 
+ fn rendering_instancing_limit(name: &str) {
diff --git a/pkgs/by-name/li/librsvg/package.nix b/pkgs/by-name/li/librsvg/package.nix
index fde58ccc80a4..4317c8cbb319 100644
--- a/pkgs/by-name/li/librsvg/package.nix
+++ b/pkgs/by-name/li/librsvg/package.nix
@@ -64,6 +64,17 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-vBu81BkSCwmNsovqVTNdneJHDU5qn27pcge0EPwVhn0=";
   };
 
+  patches = [
+    # too_many_elements test fails with libxml 2.15.0,
+    # because libxml2 no longer updates the element count
+    # before erroring out, which breaks the librsvg limit check.
+    #
+    # This is okay, because the error is still detected.
+    # The error is simply not reported accurately.
+    # https://gitlab.gnome.org/GNOME/librsvg/-/issues/1201
+    ./expect-any-error-too-many-elements.patch
+  ];
+
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
     name = "librsvg-deps-${finalAttrs.version}";

From d580f9d1475db223aa628f901180f8991662e27e Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <kaction.cc@gmail.com>
Date: Fri, 3 Oct 2025 21:25:32 +0000
Subject: [PATCH 0372/6226] tree-sitter-grammars.tree-sitter-todotxt: init at
 2024-01-15

---
 .../tools/parsing/tree-sitter/grammars/default.nix   |  1 +
 .../tree-sitter/grammars/tree-sitter-todotxt.json    | 12 ++++++++++++
 2 files changed, 13 insertions(+)
 create mode 100644 pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-todotxt.json

diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
index b16e98289a50..ed605f2436b2 100644
--- a/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix
@@ -109,6 +109,7 @@
   tree-sitter-tera = lib.importJSON ./tree-sitter-tera.json;
   tree-sitter-tiger = lib.importJSON ./tree-sitter-tiger.json;
   tree-sitter-tlaplus = lib.importJSON ./tree-sitter-tlaplus.json;
+  tree-sitter-todotxt = lib.importJSON ./tree-sitter-todotxt.json;
   tree-sitter-toml = lib.importJSON ./tree-sitter-toml.json;
   tree-sitter-tsq = lib.importJSON ./tree-sitter-tsq.json;
   tree-sitter-turtle = lib.importJSON ./tree-sitter-turtle.json;
diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-todotxt.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-todotxt.json
new file mode 100644
index 000000000000..39541800305f
--- /dev/null
+++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-todotxt.json
@@ -0,0 +1,12 @@
+{
+  "url": "https://github.com/arnarg/tree-sitter-todotxt",
+  "rev": "3937c5cd105ec4127448651a21aef45f52d19609",
+  "date": "2024-01-15T09:45:57+01:00",
+  "path": "/nix/store/37nxnr79ylm1g1myx2zvhzrymy5z0pw4-tree-sitter-todotxt",
+  "sha256": "0551fdv77bdrxsc04gsi3zrc07si34r4gnhaqjg3h5fwbbkj3q1r",
+  "hash": "sha256-OeAh51rcFTiexAraRzIZUR/A8h9RPwKY7rmtc3ZzoRQ=",
+  "fetchLFS": false,
+  "fetchSubmodules": false,
+  "deepClone": false,
+  "leaveDotGit": false
+}

From d7fc821c29cb332b36adc27fb6c024ec31e3a050 Mon Sep 17 00:00:00 2001
From: Hleb Shauchenka <me@marleb.org>
Date: Fri, 3 Oct 2025 23:43:06 +0200
Subject: [PATCH 0373/6226] xcodes: 1.6.0 -> 1.6.2

Diff: https://github.com/XcodesOrg/xcodes/compare/1.6.0...1.6.2

Changelog: https://github.com/XcodesOrg/xcodes/releases/tag/1.6.2
---
 pkgs/by-name/xc/xcodes/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xc/xcodes/package.nix b/pkgs/by-name/xc/xcodes/package.nix
index bd5a56ce145d..1fad5edafa02 100644
--- a/pkgs/by-name/xc/xcodes/package.nix
+++ b/pkgs/by-name/xc/xcodes/package.nix
@@ -14,13 +14,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "xcodes";
-  version = "1.6.0";
+  version = "1.6.2";
 
   src = fetchFromGitHub {
     owner = "XcodesOrg";
     repo = "xcodes";
     rev = finalAttrs.version;
-    hash = "sha256-TwPfASRU98rifyA/mINFfoY0MbbwmAh8JneVpJa38CA=";
+    hash = "sha256-eH6AdboJsGQ0iWoRllOMzhjM/1t43DB1U0bOu6J/uo4=";
   };
 
   nativeBuildInputs = [

From 5f76ca70fa5981fd3d15250e7d421a24dac47ab5 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Sat, 4 Oct 2025 00:18:11 +0200
Subject: [PATCH 0374/6226] systemdLibs: disable nspawn build

`nspawn` is not installed in `systemdLibs`, so building
it is unnecessary and can be skipped.
---
 pkgs/os-specific/linux/systemd/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index be02ac358833..5e0fe8846540 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -587,7 +587,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonEnable "gnutls" false)
     (lib.mesonEnable "xkbcommon" false)
     (lib.mesonEnable "man" true)
-    # (lib.mesonEnable "nspawn" withNspawn) # nspawn build can be turned off on systemd 258, on 257.x it will just not be installed in systemdLibs but the build is unconditional
+    (lib.mesonEnable "nspawn" withNspawn)
 
     (lib.mesonBool "analyze" withAnalyze)
     (lib.mesonBool "logind" withLogind)

From da17ce8811d84a704bcdb2a2513623702d6f93cd Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 4 Oct 2025 01:24:18 +0200
Subject: [PATCH 0375/6226] python3Packages.pytest: 8.4.1 -> 8.4.2

https://github.com/pytest-dev/pytest/releases/tag/8.4.2
---
 pkgs/development/python-modules/pytest/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest/default.nix b/pkgs/development/python-modules/pytest/default.nix
index 17d42090876c..edd68ff232b8 100644
--- a/pkgs/development/python-modules/pytest/default.nix
+++ b/pkgs/development/python-modules/pytest/default.nix
@@ -29,12 +29,12 @@
 
 buildPythonPackage rec {
   pname = "pytest";
-  version = "8.4.1";
+  version = "8.4.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-fGf9aRdIdzWe2Tcew6+KPSsEdBgYxR5emcwXQiUfqTw=";
+    hash = "sha256-hsDQuTMGuWHVjWKk20h58n/iVRPUuWnfNRq93bPDDgE=";
   };
 
   outputs = [

From a869e162298d4c45e042c766d1997dbfe512fd6b Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 2 Sep 2025 13:03:54 +0800
Subject: [PATCH 0376/6226] toxic: 0.16.0 -> 0.16.1

Diff: https://github.com/TokTok/toxic/compare/v0.16.0...v0.16.1
---
 pkgs/by-name/to/toxic/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/to/toxic/package.nix b/pkgs/by-name/to/toxic/package.nix
index 8f4decacdda3..feff10598d92 100644
--- a/pkgs/by-name/to/toxic/package.nix
+++ b/pkgs/by-name/to/toxic/package.nix
@@ -17,15 +17,15 @@
   libnotify,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "toxic";
-  version = "0.16.0";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "TokTok";
     repo = "toxic";
-    rev = "v${version}";
-    hash = "sha256-qwMkqPTONtG+LnH6a/Debp+n39dJpbUMoy1nIukYjKo=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-HNZKQPNwKLvtT/0EJlDaJnGI04gpJqXHKjd/85H3zH8=";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];
@@ -51,11 +51,11 @@ stdenv.mkDerivation rec {
     libconfig
   ];
 
-  meta = src.meta // {
+  meta = finalAttrs.src.meta // {
     description = "Reference CLI for Tox";
     mainProgram = "toxic";
     homepage = "https://github.com/TokTok/toxic";
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
   };
-}
+})

From e0cf6be048601bcad8eb756a6667376723daf9cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Oct 2025 00:30:52 +0000
Subject: [PATCH 0377/6226] snooze: 0.5 -> 0.5.1

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

diff --git a/pkgs/by-name/sn/snooze/package.nix b/pkgs/by-name/sn/snooze/package.nix
index d57f48e36a0e..05e2a9dc4f6c 100644
--- a/pkgs/by-name/sn/snooze/package.nix
+++ b/pkgs/by-name/sn/snooze/package.nix
@@ -5,12 +5,12 @@
 }:
 stdenv.mkDerivation rec {
   pname = "snooze";
-  version = "0.5";
+  version = "0.5.1";
   src = fetchFromGitHub {
     owner = "leahneukirchen";
     repo = "snooze";
     rev = "v${version}";
-    sha256 = "sha256-K77axli/mapUr3yxpmUfFq4iWwgRmEVUlP6+/0Iezwo=";
+    sha256 = "sha256-ghWQ/bslWJCcsQ8OqS3MHZiiuGzbgzat6mkG2avSbEk=";
   };
   makeFlags = [
     "DESTDIR=$(out)"

From 6fca17bde19532e736092018449f062d0143a909 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Oct 2025 02:34:02 +0000
Subject: [PATCH 0378/6226] python3Packages.ipv8-rust-tunnels: 0.1.34 -> 0.1.44

---
 .../python-modules/ipv8-rust-tunnels/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/ipv8-rust-tunnels/default.nix b/pkgs/development/python-modules/ipv8-rust-tunnels/default.nix
index 78e0d729842a..10d83e315c42 100644
--- a/pkgs/development/python-modules/ipv8-rust-tunnels/default.nix
+++ b/pkgs/development/python-modules/ipv8-rust-tunnels/default.nix
@@ -7,18 +7,18 @@
 
 buildPythonPackage rec {
   pname = "ipv8-rust-tunnels";
-  version = "0.1.34";
+  version = "0.1.44";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "ipv8_rust_tunnels";
-    hash = "sha256-YXIfAXwcbWGq/CSMrTslpbkmj8AryzsinWK8kAWF90k=";
+    hash = "sha256-eHk8aCrcnyVGd3JRGQ950Bwryqt+TYx84MHAM2kWTis=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-C2LLiEpD0Gk39XSuwqQJ/l2olFL2HSktdZCJp5WG0pk=";
+    hash = "sha256-axWG5cJtNaoZl7cG+Zyo1k+eA8pXHDWFgHqpTmQNHlo=";
   };
 
   nativeBuildInputs = with rustPlatform; [

From 90747f59d0a7c7eceea2b4be1dbb7da5c2fe78f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Oct 2025 04:19:25 +0000
Subject: [PATCH 0379/6226] fishPlugins.pure: 4.11.3 -> 4.12.0

---
 pkgs/shells/fish/plugins/pure.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/shells/fish/plugins/pure.nix b/pkgs/shells/fish/plugins/pure.nix
index f6d0fc894f44..e4ce0bba041c 100644
--- a/pkgs/shells/fish/plugins/pure.nix
+++ b/pkgs/shells/fish/plugins/pure.nix
@@ -8,13 +8,13 @@
 
 buildFishPlugin rec {
   pname = "pure";
-  version = "4.11.3";
+  version = "4.12.0";
 
   src = fetchFromGitHub {
     owner = "pure-fish";
     repo = "pure";
     rev = "v${version}";
-    hash = "sha256-mMUFR/n4aLsmZNbVAYmx57AMXT6U2P+wTuuN3opCeqs=";
+    hash = "sha256-QG/saZReqpYiSXTG+nPmkJ5ETAAdo0mVrUqyepu7Pvs=";
   };
 
   nativeCheckInputs = [ git ];

From ec255bbab1ad631c3c25348d05bd4dc0d41163ec Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 4 Oct 2025 00:18:22 -0400
Subject: [PATCH 0380/6226] {worldengine-cli,python3Packages.worldengine}: drop

Has been marked broken for at least a full release cycle.

Dropping per RFC 180.
---
 .../python-modules/worldengine/default.nix    | 77 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 5 files changed, 2 insertions(+), 81 deletions(-)
 delete mode 100644 pkgs/development/python-modules/worldengine/default.nix

diff --git a/pkgs/development/python-modules/worldengine/default.nix b/pkgs/development/python-modules/worldengine/default.nix
deleted file mode 100644
index f1d47ef83cb8..000000000000
--- a/pkgs/development/python-modules/worldengine/default.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  gdal,
-  h5py,
-  noise,
-  numpy,
-  protobuf,
-  purepng,
-  pyplatec,
-  six,
-  isPy27,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "worldengine";
-  version = "0.19.0";
-  format = "setuptools";
-
-  src = fetchFromGitHub {
-    owner = "Mindwerks";
-    repo = "worldengine";
-    rev = "v${version}";
-    sha256 = "1xrckb0dn2841gvp32n18gib14bpi77hmjw3r9jiyhg402iip7ry";
-  };
-
-  src-data = fetchFromGitHub {
-    owner = "Mindwerks";
-    repo = "worldengine-data";
-    rev = "029051e707f4702cb2af1a23b8222cca7dc88930";
-    sha256 = "06xbf8gj3ljgr11v1n8jbs2q8pdf9wz53xdgkhpm8hdnjahgdxdm";
-  };
-
-  postUnpack = ''
-    ln -s ${src-data} worldengine-data
-  '';
-
-  propagatedBuildInputs = [
-    gdal
-    h5py
-    noise
-    numpy
-    protobuf
-    purepng
-    pyplatec
-    six
-  ];
-
-  prePatch = ''
-    substituteInPlace setup.py \
-      --replace pypng>=0.0.18 purepng \
-      --replace 'numpy>=1.9.2, <= 1.10.0.post2' 'numpy' \
-      --replace 'argparse==1.2.1' "" \
-      --replace 'protobuf==3.0.0a3' 'protobuf' \
-      --replace 'noise==1.2.2' 'noise' \
-      --replace 'PyPlatec==1.4.0' 'PyPlatec' \
-
-    substituteInPlace \
-      worldengine/{draw.py,hdf5_serialization.py} \
-      --replace numpy.float float
-  '';
-
-  doCheck = !isPy27; # google namespace clash
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  disabledTests = [ "TestSerialization" ];
-
-  meta = with lib; {
-    broken = true;
-    homepage = "https://github.com/mindwerks/worldengine";
-    description = "World generator using simulation of plates, rain shadow, erosion, etc";
-    license = licenses.mit;
-    maintainers = with maintainers; [ rardiol ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1ad33906f1d2..2b08c2f30edf 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2693,6 +2693,7 @@ mapAliases {
   wordpress6_5 = wordpress_6_5; # Added 2024-08-03
   wordpress_6_5 = throw "'wordpress_6_5' has been removed in favor of the latest version"; # Added 2024-11-11
   wordpress_6_6 = throw "'wordpress_6_6' has been removed in favor of the latest version"; # Added 2024-11-17
+  worldengine-cli = throw "'worldengine-cli' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
   wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name
   wpa_supplicant_ro_ssids = lib.warnOnInstantiate "Deprecated package: Please use wpa_supplicant instead. Read-only SSID patches are now upstream!" wpa_supplicant;
   wrapLisp_old = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f7965364e78..006f3e3ea494 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13219,8 +13219,6 @@ with pkgs;
 
   wofi-pass = callPackage ../../pkgs/tools/security/pass/wofi-pass.nix { };
 
-  worldengine-cli = python3Packages.worldengine;
-
   wrapFirefox = callPackage ../applications/networking/browsers/firefox/wrapper.nix { };
 
   wrapThunderbird = callPackage ../applications/networking/mailreaders/thunderbird/wrapper.nix { };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index f17434b17512..e55c4925eb01 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -870,6 +870,7 @@ mapAliases ({
   webhelpers = throw "webhelpers has been removed because it is unmaintained and upstream is gone"; # added 2024-07-27
   websocket_client = websocket-client; # added 2021-06-15
   word2vec = throw "word2vec has been removed because it is abandoned"; # added 2023-05-22
+  worldengine = throw "worldengine has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
   wsnsimpy = throw "wsnsimpy has been removed, it was unmaintained and no more compatible with Python 3.12"; # added 2025-04-01
   wxPython_4_0 = throw "wxPython_4_0 has been removed, use wxpython instead"; # added 2023-03-19
   wxPython_4_1 = throw "wxPython_4_1 has been removed, use wxpython instead"; # added 2023-03-19
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1dd003ebee66..74c02dfb9a90 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20156,8 +20156,6 @@ self: super: with self; {
 
   world-bank-data = callPackage ../development/python-modules/world-bank-data { };
 
-  worldengine = callPackage ../development/python-modules/worldengine { };
-
   wrapcco = callPackage ../development/python-modules/wrapcco { };
 
   wrapio = callPackage ../development/python-modules/wrapio { };

From 3de7af93a564800c009959ae78a7761eaf8ff7fb Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 4 Oct 2025 10:57:08 +0300
Subject: [PATCH 0381/6226] qt6: 6.9.2 -> 6.9.3

---
 pkgs/development/libraries/qt-6/fetch.sh      |   2 +-
 .../libraries/qt-6/modules/qtmqtt.nix         |   4 +-
 pkgs/development/libraries/qt-6/srcs.nix      | 312 +++++++++---------
 3 files changed, 159 insertions(+), 159 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh
index 87d5916f3e38..b5a099e31755 100644
--- a/pkgs/development/libraries/qt-6/fetch.sh
+++ b/pkgs/development/libraries/qt-6/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.qt.io/official_releases/qt/6.9/6.9.2/submodules/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.qt.io/official_releases/qt/6.9/6.9.3/submodules/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
index 6b7385bd8e71..1339e43f52bf 100644
--- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
@@ -6,13 +6,13 @@
 
 qtModule rec {
   pname = "qtmqtt";
-  version = "6.9.2";
+  version = "6.9.3";
 
   src = fetchFromGitHub {
     owner = "qt";
     repo = "qtmqtt";
     tag = "v${version}";
-    hash = "sha256-/qz93JmMkJW3+lzT+QKvb/VL+xmbg5H8kKaXK+XN2nE=";
+    hash = "sha256-xzh2cNPlGe0VlCdNN1u8vBi+Uq+U2oa2bskAJQTt0ik=";
   };
 
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix
index 190e64e037d9..9cabeda26816 100644
--- a/pkgs/development/libraries/qt-6/srcs.nix
+++ b/pkgs/development/libraries/qt-6/srcs.nix
@@ -4,315 +4,315 @@
 
 {
   qt3d = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qt3d-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0ndn5fbsfj2vbcq3siq1gnk2rgblicd6ri2jrh9g41anicxh4vma";
-      name = "qt3d-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qt3d-everywhere-src-6.9.3.tar.xz";
+      sha256 = "1zvzc88gykbqmks5q06zl9113lvy07gxsxmzmvpd8y8sybfn91ky";
+      name = "qt3d-everywhere-src-6.9.3.tar.xz";
     };
   };
   qt5compat = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qt5compat-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0q2vly836wgs462czw7lg0ysf2h48iwbdy43wwf2gz49qq2rja6b";
-      name = "qt5compat-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qt5compat-everywhere-src-6.9.3.tar.xz";
+      sha256 = "0qa4s1m9f0qzs6msrilpi12wv5hpkgw211s0cqsiqaf24hhsq789";
+      name = "qt5compat-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtactiveqt = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtactiveqt-everywhere-src-6.9.2.tar.xz";
-      sha256 = "003vgfxswi6cpdp9i8kdzm1n34cbrbzlap4sg9h1ap0i9is51s1w";
-      name = "qtactiveqt-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtactiveqt-everywhere-src-6.9.3.tar.xz";
+      sha256 = "1kzc0pqwyi1h1s8qk8agplfkrib2s9cg7bwpl41z8icngwj76h6v";
+      name = "qtactiveqt-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtbase = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtbase-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0h149x8l2ywfr5m034n20z6cjxnldary39x0vv22jhg0ryg9rgj4";
-      name = "qtbase-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtbase-everywhere-src-6.9.3.tar.xz";
+      sha256 = "0vnwp12wvsab1vsn8zhi4mcvrpg5iacq59xzzs0w0vimc3va58f5";
+      name = "qtbase-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtcharts = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtcharts-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0jzzlh0jq5fidgs9r4aqpilyj0nan30r1d0pigp1hgz7cigz20cz";
-      name = "qtcharts-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtcharts-everywhere-src-6.9.3.tar.xz";
+      sha256 = "0lsckms5s0av6dy8mll7bnspsigz6hpvbddm79n2wshxnfywpmr9";
+      name = "qtcharts-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtconnectivity = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtconnectivity-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0qq4d8hn6s8bb9r2gglb6gzq6isbb13knqh7n2s2wsnx8rqwdzwa";
-      name = "qtconnectivity-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtconnectivity-everywhere-src-6.9.3.tar.xz";
+      sha256 = "1xfp3p5xkypxfgzvq2a5zcnyc7ms5gav99z5qmb48k0pzdgbl6z2";
+      name = "qtconnectivity-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtdatavis3d = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtdatavis3d-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0p6bvia085hx3jb1la06c2q48m9i897r1a1mf6bi2hbmm2hirzsx";
-      name = "qtdatavis3d-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtdatavis3d-everywhere-src-6.9.3.tar.xz";
+      sha256 = "1v5zdwjpz8j7s1nrkg7sp452vmdmhq09kdxvbsya2ad6jsw4ajxa";
+      name = "qtdatavis3d-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtdeclarative = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtdeclarative-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0r16qima008y2999r1djvwry01l295nmwwhqg081d2fr1cn2szs7";
-      name = "qtdeclarative-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtdeclarative-everywhere-src-6.9.3.tar.xz";
+      sha256 = "0q52z2iiqdchsvvcs7w6mq38v0ahv2h5jyvbjxfbzbr9f8i1n1ss";
+      name = "qtdeclarative-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtdoc = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtdoc-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0qng2lsqmrrj8n85aqh8vl4nlzc23va9hynvvf6gqr35anvbpniz";
-      name = "qtdoc-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtdoc-everywhere-src-6.9.3.tar.xz";
+      sha256 = "0am13lnmfxqj8ayx9ml5sm2qagl5s6hrki3bvdxfmzfkl07ds694";
+      name = "qtdoc-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtgraphs = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtgraphs-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0wsa4iar52dhiilyl053j7lmsw3xdn47b0pjrylb5a0ij1izp057";
-      name = "qtgraphs-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtgraphs-everywhere-src-6.9.3.tar.xz";
+      sha256 = "13041r244h3mgs95zcyw5x7lfginf4gxs59spz030p0jap867p2h";
+      name = "qtgraphs-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtgrpc = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtgrpc-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0r1z6lbjcsgxhvzylpr8z8wl44ql14ajf99n1hfvf4gy4f43qgd4";
-      name = "qtgrpc-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtgrpc-everywhere-src-6.9.3.tar.xz";
+      sha256 = "00py189v3ihpy9cj51sxapl2dp3ci7k04ikjl6zbxmbjrdwwhqvr";
+      name = "qtgrpc-everywhere-src-6.9.3.tar.xz";
     };
   };
   qthttpserver = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qthttpserver-everywhere-src-6.9.2.tar.xz";
-      sha256 = "06a0f7j1b309xffw3rwydz8lpzxnf5jg67savswskzbd3lfzlhqk";
-      name = "qthttpserver-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qthttpserver-everywhere-src-6.9.3.tar.xz";
+      sha256 = "13rfvmh42h4zd2slb2d0xqdy7wgsy05q8jqy3ldbikx5vf9qg9vs";
+      name = "qthttpserver-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtimageformats = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtimageformats-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0fciahs4i0nn5z0j624gkfncqg6byxswj45bw81drpjp5xz3y0la";
-      name = "qtimageformats-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtimageformats-everywhere-src-6.9.3.tar.xz";
+      sha256 = "1zigaz2418sy6m3na91rddxvlfn3257535kq120f9f6lzgdnpcjg";
+      name = "qtimageformats-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtlanguageserver = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtlanguageserver-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1vlb0qn53y1b4zf7zkpxdvdh5ikr1cidq5gv8blvf6pyw6pnw6vq";
-      name = "qtlanguageserver-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtlanguageserver-everywhere-src-6.9.3.tar.xz";
+      sha256 = "0cwx6rlp9nm0qbzjamfcqhhylbmh2f5kk3z749ln49fbz32ads68";
+      name = "qtlanguageserver-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtlocation = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtlocation-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1ybk3ig69p6zyrxabcfkb4pcyc251gy1m2brkf4q52cmcwcysias";
-      name = "qtlocation-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtlocation-everywhere-src-6.9.3.tar.xz";
+      sha256 = "018nwyr1idh3rfp22w86pw3i25xbj7mv49wir5s1akmgzp8jf4hl";
+      name = "qtlocation-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtlottie = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtlottie-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1iiigsb4p1zwkxm1x9c4pbx5rgwz35krdqi3vkql4nawvp997px4";
-      name = "qtlottie-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtlottie-everywhere-src-6.9.3.tar.xz";
+      sha256 = "0cyzj0xhdhlgkra1pqb4vdazxjfii05sc7r5h0ml9fzhfiai0vhi";
+      name = "qtlottie-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtmultimedia = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtmultimedia-everywhere-src-6.9.2.tar.xz";
-      sha256 = "04mbwl1mg4rjgai027chldslpjnqrx52c3jxn20j2hx7ayda3y3v";
-      name = "qtmultimedia-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtmultimedia-everywhere-src-6.9.3.tar.xz";
+      sha256 = "1xc6kgqm88rkzr8qzdi8yj8dm4dqfsfzkkba4d8iijb0xbkvwxd2";
+      name = "qtmultimedia-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtnetworkauth = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtnetworkauth-everywhere-src-6.9.2.tar.xz";
-      sha256 = "114c65gyg56v70byyl3if1q7mzhp5kkv1g8sp4y9zaxqirbdjr91";
-      name = "qtnetworkauth-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtnetworkauth-everywhere-src-6.9.3.tar.xz";
+      sha256 = "1ivyrha9ibc2iz4lvrz5309pdqxyccwzbpmyg2m24ghkxm3xrnb7";
+      name = "qtnetworkauth-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtpositioning = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtpositioning-everywhere-src-6.9.2.tar.xz";
-      sha256 = "06mwzlyprwz11ks6fsvzh03ilk5fxy3scr1gqqb4p85xzw0ri6j8";
-      name = "qtpositioning-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtpositioning-everywhere-src-6.9.3.tar.xz";
+      sha256 = "1d1mb1fni42vgfyj9ghk0g6602nx8lwa1y0bmynpmh84yy0ck1qc";
+      name = "qtpositioning-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtquick3d = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtquick3d-everywhere-src-6.9.2.tar.xz";
-      sha256 = "002888xfnkxmvn8413fllidl3mm2fcwc4gbzdnbvpjlysaq9f3ig";
-      name = "qtquick3d-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtquick3d-everywhere-src-6.9.3.tar.xz";
+      sha256 = "0wyfran9vwl6fm2i9nc149fpvv8r5k3yvrn2f1rjpb9qkw271cli";
+      name = "qtquick3d-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtquick3dphysics = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtquick3dphysics-everywhere-src-6.9.2.tar.xz";
-      sha256 = "12yc0lswcmyaw19yyxzy73j95ncgqw8mlx8svhrwsllgcf2n9z47";
-      name = "qtquick3dphysics-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtquick3dphysics-everywhere-src-6.9.3.tar.xz";
+      sha256 = "0vjs7calgc0vc7fv6hnbghhi37cfiapxim650av9w92xfhnv5myw";
+      name = "qtquick3dphysics-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtquickeffectmaker = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtquickeffectmaker-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1yfq1pp0k2d6438x8pn2y73y29bqwg45bjh6msiy64fldr4z31br";
-      name = "qtquickeffectmaker-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtquickeffectmaker-everywhere-src-6.9.3.tar.xz";
+      sha256 = "04lrlp1fakn8kv160ln8j1fsqsfdcjf1dzwlknx5r1m04hfkdw3b";
+      name = "qtquickeffectmaker-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtquicktimeline = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtquicktimeline-everywhere-src-6.9.2.tar.xz";
-      sha256 = "09n51qw0y8v1q83xs1ybwwm4a49j2qhshqrasdkzz25mij6nhrdw";
-      name = "qtquicktimeline-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtquicktimeline-everywhere-src-6.9.3.tar.xz";
+      sha256 = "1xqidk7njn1xiiz3i27ddzwd568caigq8p2ja4ks67x7bsk4nkr8";
+      name = "qtquicktimeline-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtremoteobjects = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtremoteobjects-everywhere-src-6.9.2.tar.xz";
-      sha256 = "09lby6dqc2sfig1krcszg6fkypgxlz2r7hgjjfi95g7g9gqlwqnz";
-      name = "qtremoteobjects-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtremoteobjects-everywhere-src-6.9.3.tar.xz";
+      sha256 = "0nyqmapypw0y745zg58rq9183vcrbm2c71dc3p9sdqflal07r64q";
+      name = "qtremoteobjects-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtscxml = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtscxml-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1dpb687zbw4akx42kfpbb5cpdlq3hcqn8l3l0x7sd5i9061z2sp0";
-      name = "qtscxml-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtscxml-everywhere-src-6.9.3.tar.xz";
+      sha256 = "1drlbdgicqx76gyqi79ri1gy2vrya6l99gig76p8x46za70c12gk";
+      name = "qtscxml-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtsensors = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtsensors-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0qj4674vim2p34mq3kp99spjyf82qvs75w625namzqp274pshk4n";
-      name = "qtsensors-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtsensors-everywhere-src-6.9.3.tar.xz";
+      sha256 = "0s1gz66nar27c3l5cbqqdnza1pxbd7nylz88mnj32xpkwml53nx2";
+      name = "qtsensors-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtserialbus = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtserialbus-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0xia9xcz7sjrbf1c4m63qnhz3ggdxr06pycslmsnqizlzb10f7lm";
-      name = "qtserialbus-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtserialbus-everywhere-src-6.9.3.tar.xz";
+      sha256 = "1ksvfwfk0az47sgfcaqbac936y75lcaga5fip5lbgz0s0zd3k08a";
+      name = "qtserialbus-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtserialport = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtserialport-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0sz2dkas4qjdd6lkfb9g89vi94q18aiq9xdchlqb2yn0qbqb544b";
-      name = "qtserialport-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtserialport-everywhere-src-6.9.3.tar.xz";
+      sha256 = "16427sa9qhk8hsyxjr69fhqmvzlg9n4pdizmqfc4cr7j1w1yq62b";
+      name = "qtserialport-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtshadertools = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtshadertools-everywhere-src-6.9.2.tar.xz";
-      sha256 = "158lpzb1nqspwm0n48d3nfr81q85zka1igrjp6xj8cjlv7wqlrqp";
-      name = "qtshadertools-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtshadertools-everywhere-src-6.9.3.tar.xz";
+      sha256 = "0rs553abb8sdla4cywfpgfh3vvyafm8spy8nnvj06md3hvp09632";
+      name = "qtshadertools-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtspeech = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtspeech-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1cc8l2h1frlraay0m40r5a91nsc7b53n6vksa52pwqqia4vngdmj";
-      name = "qtspeech-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtspeech-everywhere-src-6.9.3.tar.xz";
+      sha256 = "0gmbr65s4j2bka13iln3fmjrhl1i46lp5vlhdv66rf1gfi65lvzq";
+      name = "qtspeech-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtsvg = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtsvg-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1985asvnkd2ar30nh2zyi490qz0vkz6z1f752lfald33yawcm16r";
-      name = "qtsvg-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtsvg-everywhere-src-6.9.3.tar.xz";
+      sha256 = "1qi6f3lvp0r7n79m1iw80690366bd53gyxm5gp76zgnbb0rslxnv";
+      name = "qtsvg-everywhere-src-6.9.3.tar.xz";
     };
   };
   qttools = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qttools-everywhere-src-6.9.2.tar.xz";
-      sha256 = "12d4czfwvh9rfjwnkpsiwzrpx4ga69c6vz85aabhpk3hx7lggdyq";
-      name = "qttools-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qttools-everywhere-src-6.9.3.tar.xz";
+      sha256 = "1sdla2blvk9r4g7v67dhwqjxx7kflyh7cm9pw5f7ziazjw7apxqc";
+      name = "qttools-everywhere-src-6.9.3.tar.xz";
     };
   };
   qttranslations = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qttranslations-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1mky3xj2yhcsrmpz8m28v7pky6ryn7hvdcglakww0rfk3qlbcfy7";
-      name = "qttranslations-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qttranslations-everywhere-src-6.9.3.tar.xz";
+      sha256 = "18chqjzy7ji76crfisl1rya8ds3my97bgsxkg7yldcc1crg58vgk";
+      name = "qttranslations-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtvirtualkeyboard = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtvirtualkeyboard-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1qqizh7kyqbqqnrm1mmlf2709rm1rnflbqdl1bi75yms07d00hbv";
-      name = "qtvirtualkeyboard-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtvirtualkeyboard-everywhere-src-6.9.3.tar.xz";
+      sha256 = "0d2m87fvd11ckjjzy3lj1mbfisig4x9c263phq4fczwy3k4xb851";
+      name = "qtvirtualkeyboard-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtwayland = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtwayland-everywhere-src-6.9.2.tar.xz";
-      sha256 = "10bpxwpam56gvymz9vjxkppbqsj1369ddzl3k4pz2s2maq39imya";
-      name = "qtwayland-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtwayland-everywhere-src-6.9.3.tar.xz";
+      sha256 = "1pfsfdjqw985d8220jw13sqacyiip26bzpk1ax30ms33jayd84z4";
+      name = "qtwayland-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtwebchannel = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtwebchannel-everywhere-src-6.9.2.tar.xz";
-      sha256 = "0rcf7i1wamdf1qynq3yi88r77ch5dg1jinxywlfjlb2dmlvn72l7";
-      name = "qtwebchannel-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtwebchannel-everywhere-src-6.9.3.tar.xz";
+      sha256 = "01d3dy0fjz4vfy8s1yzpmd31b8mhvqf15z61fzr9qgd1wp0vnmwl";
+      name = "qtwebchannel-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtwebengine = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtwebengine-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1aq35nkgbvhlsmglnjizbkavr7kb0ymf5n3kkllrpqy2mf90gjwr";
-      name = "qtwebengine-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtwebengine-everywhere-src-6.9.3.tar.xz";
+      sha256 = "0rl9v936sq6spvb3sfkpmc51wwmljrn4ssy3ii0pdn0xsl8kn2ym";
+      name = "qtwebengine-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtwebsockets = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtwebsockets-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1vh82w96436pqrp4daf324mqs2zjvn51z78b3ksc5mnqgrk3z0xy";
-      name = "qtwebsockets-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtwebsockets-everywhere-src-6.9.3.tar.xz";
+      sha256 = "1i428awzws4x4cmv6zpdgb27c2m71cs8dqcjbwiwqcfbyf6dlzg2";
+      name = "qtwebsockets-everywhere-src-6.9.3.tar.xz";
     };
   };
   qtwebview = {
-    version = "6.9.2";
+    version = "6.9.3";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.2/submodules/qtwebview-everywhere-src-6.9.2.tar.xz";
-      sha256 = "1w8z3d7w7z2xjfb5l15gb37v9w6pa7d71jalkrqda8l2wr5d3ksc";
-      name = "qtwebview-everywhere-src-6.9.2.tar.xz";
+      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtwebview-everywhere-src-6.9.3.tar.xz";
+      sha256 = "1j1cqj2hq0c8r9lxb1h6mdhnf9clqb95jw2p0nn81jzin701ypn6";
+      name = "qtwebview-everywhere-src-6.9.3.tar.xz";
     };
   };
 }

From 631c6a2ff2f69bdeb5fad7f33f90d8a02374bb1d Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 4 Oct 2025 10:57:17 +0300
Subject: [PATCH 0382/6226] qt6.qtwebengine: replace revert with better patch
 from upstream

---
 .../libraries/qt-6/modules/qtwebengine/default.nix     | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
index 43c7aea86f15..332240e50b14 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -113,13 +113,11 @@ qtModule {
     # Reproducibility QTBUG-136068
     ./gn-object-sorted.patch
 
-    # Revert "Create EGLImage with eglCreateDRMImageMESA() for exporting dma_buf"
-    # Mesa 25.2 dropped eglCreateDRMImageMESA, so this no longer works.
-    # There are better ways to do this, but this is the easy fix for now.
+    # Fix GPU rendering with Mesa 25.2
+    # https://bugreports.qt.io/browse/QTBUG-139424
     (fetchpatch {
-      url = "https://invent.kde.org/qt/qt/qtwebengine/-/commit/ddcd30454aa6338d898c9d20c8feb48f36632e16.diff";
-      revert = true;
-      hash = "sha256-ht7C3GIEaPtmMGLzQKOtMqE9sLKdqqYCgi/W6b430YU=";
+      url = "https://invent.kde.org/qt/qt/qtwebengine/-/commit/3cc88e0f85113e38ccb1bfdadb7d150c2389b1bc.diff";
+      hash = "sha256-5tKZ6b93VP4mKVc7jctrbW5Ktl+4Mjxw6bK1ajY62zQ=";
     })
   ];
 

From cd7c4411238fe52f06b397a15c7ae8710a73968a Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 4 Oct 2025 10:57:37 +0300
Subject: [PATCH 0383/6226] qt6.qtdeclarative: backport fix for common crash in
 Plasma

---
 .../qt-6/modules/qtdeclarative/default.nix    |   5 +
 .../qtdeclarative/stackview-crash.patch       | 473 ++++++++++++++++++
 2 files changed, 478 insertions(+)
 create mode 100644 pkgs/development/libraries/qt-6/modules/qtdeclarative/stackview-crash.patch

diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
index 4cdc80a4090a..97f306afb3e0 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
@@ -37,6 +37,11 @@ qtModule {
     })
     # add version specific QML import path
     ./use-versioned-import-path.patch
+
+    # Fix common crash
+    # Manual backport of https://invent.kde.org/qt/qt/qtdeclarative/-/commit/b1ee7061ba77a7f5dc4148129bb2083f5c28e039
+    # https://bugreports.qt.io/browse/QTBUG-140018
+    ./stackview-crash.patch
   ];
 
   preConfigure =
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/stackview-crash.patch b/pkgs/development/libraries/qt-6/modules/qtdeclarative/stackview-crash.patch
new file mode 100644
index 000000000000..19c7c0648634
--- /dev/null
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/stackview-crash.patch
@@ -0,0 +1,473 @@
+diff --git a/src/quicktemplates/qquickstackelement.cpp b/src/quicktemplates/qquickstackelement.cpp
+index f6a5ffdd74..304bafe4ef 100644
+--- a/src/quicktemplates/qquickstackelement.cpp
++++ b/src/quicktemplates/qquickstackelement.cpp
+@@ -39,7 +39,10 @@ protected:
+     void setInitialState(QObject *object) override
+     {
+         auto privIncubator = QQmlIncubatorPrivate::get(this);
+-        element->incubate(object, privIncubator->requiredProperties());
++        if (QQmlEnginePrivate *enginePriv = privIncubator->enginePriv) {
++            element->incubate(enginePriv->v4engine(), object,
++                              privIncubator->requiredProperties());
++        }
+     }
+ 
+ private:
+@@ -90,7 +93,8 @@ QQuickStackElement::~QQuickStackElement()
+ #endif
+ }
+ 
+-QQuickStackElement *QQuickStackElement::fromString(const QString &str, QQuickStackView *view, QString *error)
++QQuickStackElement *QQuickStackElement::fromString(
++        QQmlEngine *engine, const QString &str, QQuickStackView *view, QString *error)
+ {
+     QUrl url(str);
+     if (!url.isValid()) {
+@@ -102,7 +106,7 @@ QQuickStackElement *QQuickStackElement::fromString(const QString &str, QQuickSta
+         url = qmlContext(view)->resolvedUrl(url);
+ 
+     QQuickStackElement *element = new QQuickStackElement;
+-    element->component = new QQmlComponent(qmlEngine(view), url, view);
++    element->component = new QQmlComponent(engine, url, view);
+     element->ownComponent = true;
+     return element;
+ }
+@@ -127,7 +131,8 @@ QQuickStackElement *QQuickStackElement::fromObject(QObject *object, QQuickStackV
+     return element;
+ }
+ 
+-QQuickStackElement *QQuickStackElement::fromStackViewArg(QQuickStackView *view, QQuickStackViewArg arg)
++QQuickStackElement *QQuickStackElement::fromStackViewArg(
++        QQmlEngine *engine, QQuickStackView *view, QQuickStackViewArg arg)
+ {
+     QQuickStackElement *element = new QQuickStackElement;
+ #if QT_CONFIG(quick_viewtransitions)
+@@ -144,7 +149,7 @@ QQuickStackElement *QQuickStackElement::fromStackViewArg(QQuickStackView *view,
+ 
+         Q_ASSERT(!arg.mUrl.isValid());
+     } else if (arg.mUrl.isValid()) {
+-        element->component = new QQmlComponent(qmlEngine(view), arg.mUrl, view);
++        element->component = new QQmlComponent(engine, arg.mUrl, view);
+         element->ownComponent = true;
+     } else {
+         qFatal("No Item, Component or URL set on arg passed to fromStrictArg");
+@@ -152,7 +157,7 @@ QQuickStackElement *QQuickStackElement::fromStackViewArg(QQuickStackView *view,
+     return element;
+ }
+ 
+-bool QQuickStackElement::load(QQuickStackView *parent)
++bool QQuickStackElement::load(QV4::ExecutionEngine *v4, QQuickStackView *parent)
+ {
+     setView(parent);
+     if (!item) {
+@@ -161,7 +166,7 @@ bool QQuickStackElement::load(QQuickStackView *parent)
+         if (component->isLoading()) {
+             QObject::connect(component, &QQmlComponent::statusChanged, [this](QQmlComponent::Status status) {
+                 if (status == QQmlComponent::Ready)
+-                    load(view);
++                    load(component->engine()->handle(), view);
+                 else if (status == QQmlComponent::Error)
+                     QQuickStackViewPrivate::get(view)->warn(component->errorString().trimmed());
+             });
+@@ -177,22 +182,24 @@ bool QQuickStackElement::load(QQuickStackView *parent)
+         if (component->isError())
+             QQuickStackViewPrivate::get(parent)->warn(component->errorString().trimmed());
+     } else {
+-        initialize(/*required properties=*/nullptr);
++        initialize(v4, /*required properties=*/nullptr);
+     }
+     return item;
+ }
+ 
+-void QQuickStackElement::incubate(QObject *object, RequiredProperties *requiredProperties)
++void QQuickStackElement::incubate(
++        QV4::ExecutionEngine *v4, QObject *object, RequiredProperties *requiredProperties)
+ {
+     item = qmlobject_cast<QQuickItem *>(object);
+     if (item) {
+         QQmlEngine::setObjectOwnership(item, QQmlEngine::CppOwnership);
+         item->setParent(view);
+-        initialize(requiredProperties);
++        initialize(v4, requiredProperties);
+     }
+ }
+ 
+-void QQuickStackElement::initialize(RequiredProperties *requiredProperties)
++void QQuickStackElement::initialize(
++        QV4::ExecutionEngine *v4, RequiredProperties *requiredProperties)
+ {
+     if (!item || init)
+         return;
+@@ -205,11 +212,8 @@ void QQuickStackElement::initialize(RequiredProperties *requiredProperties)
+     item->setParentItem(view);
+ 
+     if (!properties.isUndefined()) {
+-        QQmlEngine *engine = qmlEngine(view);
+-        Q_ASSERT(engine);
+-        QV4::ExecutionEngine *v4 = QQmlEnginePrivate::getV4Engine(engine);
+-        Q_ASSERT(v4);
+         QV4::Scope scope(v4);
++        Q_ASSERT(scope.engine);
+         QV4::ScopedValue ipv(scope, properties.value());
+         QV4::Scoped<QV4::QmlContext> qmlContext(scope, qmlCallingContext.value());
+         QV4::ScopedValue qmlObject(scope, QV4::QObjectWrapper::wrap(v4, item));
+diff --git a/src/quicktemplates/qquickstackelement_p_p.h b/src/quicktemplates/qquickstackelement_p_p.h
+index 5af8149d91..2986a78569 100644
+--- a/src/quicktemplates/qquickstackelement_p_p.h
++++ b/src/quicktemplates/qquickstackelement_p_p.h
+@@ -43,13 +43,14 @@ class QQuickStackElement :
+ public:
+     ~QQuickStackElement();
+ 
+-    static QQuickStackElement *fromString(const QString &str, QQuickStackView *view, QString *error);
++    static QQuickStackElement *fromString(QQmlEngine *engine, const QString &str, QQuickStackView *view, QString *error);
+     static QQuickStackElement *fromObject(QObject *object, QQuickStackView *view, QString *error);
+-    static QQuickStackElement *fromStackViewArg(QQuickStackView *view, QQuickStackViewArg arg);
++    static QQuickStackElement *fromStackViewArg(QQmlEngine *engine, QQuickStackView *view, QQuickStackViewArg arg);
+ 
+-    bool load(QQuickStackView *parent);
+-    void incubate(QObject *object, RequiredProperties *requiredProperties);
+-    void initialize(RequiredProperties *requiredProperties);
++    bool load(QV4::ExecutionEngine *v4, QQuickStackView *parent);
++    void incubate(
++            QV4::ExecutionEngine *v4, QObject *object, RequiredProperties *requiredProperties);
++    void initialize(QV4::ExecutionEngine *v4, RequiredProperties *requiredProperties);
+ 
+     void setIndex(int index);
+     void setView(QQuickStackView *view);
+diff --git a/src/quicktemplates/qquickstackview.cpp b/src/quicktemplates/qquickstackview.cpp
+index cb8854dca8..a0909b7fcb 100644
+--- a/src/quicktemplates/qquickstackview.cpp
++++ b/src/quicktemplates/qquickstackview.cpp
+@@ -457,8 +457,12 @@ QQuickItem *QQuickStackView::get(int index, LoadBehavior behavior)
+     Q_D(QQuickStackView);
+     QQuickStackElement *element = d->elements.value(index);
+     if (element) {
+-        if (behavior == ForceLoad)
+-            element->load(this);
++        if (behavior == ForceLoad) {
++            // It's possible for a slot to still be connected during destruction of the receiver's
++            // parent (QTBUG-140018), so only try to load new things if our engine is alive.
++            if (QQmlEngine *engine = qmlEngine(this))
++                element->load(engine->handle(), this);
++        }
+         return element->item;
+     }
+     return nullptr;
+@@ -492,7 +496,7 @@ QQuickItem *QQuickStackView::find(const QJSValue &callback, LoadBehavior behavio
+     for (int i = d->elements.size() - 1; i >= 0; --i) {
+         QQuickStackElement *element = d->elements.at(i);
+         if (behavior == ForceLoad)
+-            element->load(this);
++            element->load(engine->handle(), this);
+         if (element->item) {
+             QJSValue rv = func.call(QJSValueList() << engine->newQObject(element->item) << i);
+             if (rv.toBool())
+@@ -624,7 +628,7 @@ void QQuickStackView::push(QQmlV4FunctionPtr args)
+ #endif
+ 
+     int oldDepth = d->elements.size();
+-    if (d->pushElements(elements)) {
++    if (d->pushElements(v4, elements)) {
+         d->depthChange(d->elements.size(), oldDepth);
+         QQuickStackElement *enter = d->elements.top();
+ #if QT_CONFIG(quick_viewtransitions)
+@@ -737,7 +741,7 @@ void QQuickStackView::pop(QQmlV4FunctionPtr args)
+ 
+     QPointer<QQuickItem> previousItem;
+ 
+-    if (d->popElements(enter)) {
++    if (d->popElements(v4, enter)) {
+         if (exit) {
+             exit->removal = true;
+             d->removing.insert(exit);
+@@ -907,7 +911,7 @@ void QQuickStackView::replace(QQmlV4FunctionPtr args)
+     if (!d->elements.isEmpty())
+         exit = d->elements.pop();
+ 
+-    if (exit != target ? d->replaceElements(target, elements) : d->pushElements(elements)) {
++    if (exit != target ? d->replaceElements(v4, target, elements) : d->pushElements(v4, elements)) {
+         d->depthChange(d->elements.size(), oldDepth);
+         if (exit) {
+             exit->removal = true;
+@@ -991,10 +995,14 @@ QQuickItem *QQuickStackView::pushItems(QList<QQuickStackViewArg> args, Operation
+         return nullptr;
+     }
+ 
++    QQmlEngine *engine = qmlEngine(this);
++    if (!engine)
++        return nullptr;
++
+     QScopedValueRollback<bool> modifyingElements(d->modifyingElements, true);
+     QScopedValueRollback<QString> operationNameRollback(d->operation, operationName);
+ 
+-    const QList<QQuickStackElement *> stackElements = d->parseElements(args);
++    const QList<QQuickStackElement *> stackElements = d->parseElements(engine, args);
+ 
+ #if QT_CONFIG(quick_viewtransitions)
+     QQuickStackElement *exit = nullptr;
+@@ -1003,7 +1011,7 @@ QQuickItem *QQuickStackView::pushItems(QList<QQuickStackViewArg> args, Operation
+ #endif
+ 
+     const int oldDepth = d->elements.size();
+-    if (d->pushElements(stackElements)) {
++    if (d->pushElements(engine->handle(), stackElements)) {
+         d->depthChange(d->elements.size(), oldDepth);
+         QQuickStackElement *enter = d->elements.top();
+ #if QT_CONFIG(quick_viewtransitions)
+@@ -1109,7 +1117,11 @@ QQuickItem *QQuickStackView::pushItem(const QUrl &url, const QVariantMap &proper
+ QQuickItem *QQuickStackView::popToItem(QQuickItem *item, Operation operation)
+ {
+     Q_D(QQuickStackView);
+-    return d->popToItem(item, operation, QQuickStackViewPrivate::CurrentItemPolicy::DoNotPop);
++    QQmlEngine *engine = qmlEngine(this);
++    if (!engine)
++        return nullptr;
++    return d->popToItem(
++            engine->handle(), item, operation, QQuickStackViewPrivate::CurrentItemPolicy::DoNotPop);
+ }
+ 
+ /*!
+@@ -1149,8 +1161,13 @@ QQuickItem *QQuickStackView::popToIndex(int index, Operation operation)
+     }
+ 
+     QQuickStackElement *element = d->elements.at(index);
+-    element->load(this);
+-    return d->popToItem(element->item, operation, QQuickStackViewPrivate::CurrentItemPolicy::Pop);
++    QQmlEngine *engine = qmlEngine(this);
++    if (!engine)
++        return nullptr;
++    QV4::ExecutionEngine *v4 = engine->handle();
++    element->load(v4, this);
++    return d->popToItem(
++            v4, element->item, operation, QQuickStackViewPrivate::CurrentItemPolicy::Pop);
+ }
+ 
+ /*!
+@@ -1178,7 +1195,13 @@ QQuickItem *QQuickStackView::popCurrentItem(Operation operation)
+         clear(operation);
+         return lastItemRemoved;
+     }
+-    return d->popToItem(d->currentItem, operation, QQuickStackViewPrivate::CurrentItemPolicy::Pop);
++
++    QQmlEngine *engine = qmlEngine(this);
++    if (!engine)
++        return nullptr;
++    return d->popToItem(
++            engine->handle(), d->currentItem, operation,
++            QQuickStackViewPrivate::CurrentItemPolicy::Pop);
+ }
+ 
+ /*!
+@@ -1232,12 +1255,16 @@ QQuickItem *QQuickStackView::replaceCurrentItem(const QList<QQuickStackViewArg>
+         return nullptr;
+     }
+ 
++    QQmlEngine *engine = qmlEngine(this);
++    if (!engine)
++        return nullptr;
++
+     QScopedValueRollback<bool> modifyingElements(d->modifyingElements, true);
+     QScopedValueRollback<QString> operationNameRollback(d->operation, operationName);
+ 
+     QQuickStackElement *currentElement = !d->elements.isEmpty() ? d->elements.top() : nullptr;
+ 
+-    const QList<QQuickStackElement *> stackElements = d->parseElements(args);
++    const QList<QQuickStackElement *> stackElements = d->parseElements(engine, args);
+ 
+     int oldDepth = d->elements.size();
+     QQuickStackElement* exit = nullptr;
+@@ -1245,8 +1272,8 @@ QQuickItem *QQuickStackView::replaceCurrentItem(const QList<QQuickStackViewArg>
+         exit = d->elements.pop();
+ 
+     const bool successfullyReplaced = exit != currentElement
+-        ? d->replaceElements(currentElement, stackElements)
+-        : d->pushElements(stackElements);
++        ? d->replaceElements(engine->handle(), currentElement, stackElements)
++        : d->pushElements(engine->handle(), stackElements);
+     if (successfullyReplaced) {
+         d->depthChange(d->elements.size(), oldDepth);
+         if (exit) {
+@@ -1607,14 +1634,19 @@ void QQuickStackView::componentComplete()
+     QQuickStackElement *element = nullptr;
+     QString error;
+     int oldDepth = d->elements.size();
++
++    QQmlEngine *engine = qmlEngine(this);
++    if (!engine)
++        return;
++
+     if (QObject *o = d->initialItem.toQObject())
+         element = QQuickStackElement::fromObject(o, this, &error);
+     else if (d->initialItem.isString())
+-        element = QQuickStackElement::fromString(d->initialItem.toString(), this, &error);
++        element = QQuickStackElement::fromString(engine, d->initialItem.toString(), this, &error);
+     if (!error.isEmpty()) {
+         d->warn(error);
+         delete element;
+-    } else if (d->pushElement(element)) {
++    } else if (d->pushElement(engine->handle(), element)) {
+         d->depthChange(d->elements.size(), oldDepth);
+         d->setCurrentItem(element);
+         element->setStatus(QQuickStackView::Active);
+diff --git a/src/quicktemplates/qquickstackview_p.cpp b/src/quicktemplates/qquickstackview_p.cpp
+index 0288ff1f4b..8f08f29168 100644
+--- a/src/quicktemplates/qquickstackview_p.cpp
++++ b/src/quicktemplates/qquickstackview_p.cpp
+@@ -109,7 +109,8 @@ QList<QQuickStackElement *> QQuickStackViewPrivate::parseElements(int from, QQml
+     return elements;
+ }
+ 
+-QList<QQuickStackElement *> QQuickStackViewPrivate::parseElements(const QList<QQuickStackViewArg> &args)
++QList<QQuickStackElement *> QQuickStackViewPrivate::parseElements(
++        QQmlEngine *engine, const QList<QQuickStackViewArg> &args)
+ {
+     Q_Q(QQuickStackView);
+     QList<QQuickStackElement *> stackElements;
+@@ -141,8 +142,8 @@ QList<QQuickStackElement *> QQuickStackViewPrivate::parseElements(const QList<QQ
+             return {};
+         }
+ 
+-        QQuickStackElement *element = QQuickStackElement::fromStackViewArg(q, arg);
+-        QV4::ExecutionEngine *v4Engine = qmlEngine(q)->handle();
++        QQuickStackElement *element = QQuickStackElement::fromStackViewArg(engine, q, arg);
++        QV4::ExecutionEngine *v4Engine = engine->handle();
+         element->properties.set(v4Engine, v4Engine->fromVariant(properties));
+         element->qmlCallingContext.set(v4Engine, v4Engine->qmlContext());
+         stackElements.append(element);
+@@ -183,28 +184,33 @@ static QString resolvedUrl(const QString &str, const QQmlRefPointer<QQmlContextD
+     return str;
+ }
+ 
+-QQuickStackElement *QQuickStackViewPrivate::createElement(const QV4::Value &value, const QQmlRefPointer<QQmlContextData> &context, QString *error)
++QQuickStackElement *QQuickStackViewPrivate::createElement(
++        const QV4::Value &value, const QQmlRefPointer<QQmlContextData> &context, QString *error)
+ {
+     Q_Q(QQuickStackView);
+     if (const QV4::String *s = value.as<QV4::String>())
+-        return QQuickStackElement::fromString(resolvedUrl(s->toQString(), context), q, error);
++        return QQuickStackElement::fromString(
++                s->engine()->qmlEngine(), resolvedUrl(s->toQString(), context), q, error);
+     if (const QV4::QObjectWrapper *o = value.as<QV4::QObjectWrapper>())
+         return QQuickStackElement::fromObject(o->object(), q, error);
+     if (const QV4::UrlObject *u = value.as<QV4::UrlObject>())
+-        return QQuickStackElement::fromString(resolvedUrl(u->href(), context), q, error);
++        return QQuickStackElement::fromString(
++                u->engine()->qmlEngine(), resolvedUrl(u->href(), context), q, error);
+ 
+-    if (value.as<QV4::Object>()) {
++    if (const QV4::Object *o = value.as<QV4::Object>()) {
+         const QVariant data = QV4::ExecutionEngine::toVariant(value, QMetaType::fromType<QUrl>());
+         if (data.typeId() == QMetaType::QUrl) {
+-            return QQuickStackElement::fromString(resolvedUrl(data.toUrl(), context).toString(), q,
+-                                                  error);
++            return QQuickStackElement::fromString(
++                    o->engine()->qmlEngine(), resolvedUrl(data.toUrl(), context).toString(), q,
++                    error);
+         }
+     }
+ 
+     return nullptr;
+ }
+ 
+-bool QQuickStackViewPrivate::pushElements(const QList<QQuickStackElement *> &elems)
++bool QQuickStackViewPrivate::pushElements(
++        QV4::ExecutionEngine *v4, const QList<QQuickStackElement *> &elems)
+ {
+     Q_Q(QQuickStackView);
+     if (!elems.isEmpty()) {
+@@ -212,19 +218,19 @@ bool QQuickStackViewPrivate::pushElements(const QList<QQuickStackElement *> &ele
+             e->setIndex(elements.size());
+             elements += e;
+         }
+-        return elements.top()->load(q);
++        return elements.top()->load(v4, q);
+     }
+     return false;
+ }
+ 
+-bool QQuickStackViewPrivate::pushElement(QQuickStackElement *element)
++bool QQuickStackViewPrivate::pushElement(QV4::ExecutionEngine *v4, QQuickStackElement *element)
+ {
+     if (element)
+-        return pushElements(QList<QQuickStackElement *>() << element);
++        return pushElements(v4, QList<QQuickStackElement *>() << element);
+     return false;
+ }
+ 
+-bool QQuickStackViewPrivate::popElements(QQuickStackElement *element)
++bool QQuickStackViewPrivate::popElements(QV4::ExecutionEngine *v4, QQuickStackElement *element)
+ {
+     Q_Q(QQuickStackView);
+     while (elements.size() > 1 && elements.top() != element) {
+@@ -232,10 +238,12 @@ bool QQuickStackViewPrivate::popElements(QQuickStackElement *element)
+         if (!element)
+             break;
+     }
+-    return elements.top()->load(q);
++    return elements.top()->load(v4, q);
+ }
+ 
+-bool QQuickStackViewPrivate::replaceElements(QQuickStackElement *target, const QList<QQuickStackElement *> &elems)
++bool QQuickStackViewPrivate::replaceElements(
++        QV4::ExecutionEngine *v4, QQuickStackElement *target,
++        const QList<QQuickStackElement *> &elems)
+ {
+     if (target) {
+         while (!elements.isEmpty()) {
+@@ -245,10 +253,12 @@ bool QQuickStackViewPrivate::replaceElements(QQuickStackElement *target, const Q
+                 break;
+         }
+     }
+-    return pushElements(elems);
++    return pushElements(v4, elems);
+ }
+ 
+-QQuickItem *QQuickStackViewPrivate::popToItem(QQuickItem *item, QQuickStackView::Operation operation, CurrentItemPolicy currentItemPolicy)
++QQuickItem *QQuickStackViewPrivate::popToItem(
++        QV4::ExecutionEngine *v4, QQuickItem *item, QQuickStackView::Operation operation,
++        CurrentItemPolicy currentItemPolicy)
+ {
+     const QString operationName = QStringLiteral("pop");
+     if (modifyingElements) {
+@@ -301,7 +311,7 @@ QQuickItem *QQuickStackViewPrivate::popToItem(QQuickItem *item, QQuickStackView:
+     }
+ 
+     QQuickItem *previousItem = nullptr;
+-    if (popElements(enter)) {
++    if (popElements(v4, enter)) {
+         if (exit) {
+             exit->removal = true;
+             removing.insert(exit);
+diff --git a/src/quicktemplates/qquickstackview_p_p.h b/src/quicktemplates/qquickstackview_p_p.h
+index 4ae849aa20..8bb95760a4 100644
+--- a/src/quicktemplates/qquickstackview_p_p.h
++++ b/src/quicktemplates/qquickstackview_p_p.h
+@@ -50,20 +50,20 @@ public:
+     void setCurrentItem(QQuickStackElement *element);
+ 
+     QList<QQuickStackElement *> parseElements(int from, QQmlV4FunctionPtr args, QStringList *errors);
+-    QList<QQuickStackElement *> parseElements(const QList<QQuickStackViewArg> &args);
++    QList<QQuickStackElement *> parseElements(QQmlEngine *engine, const QList<QQuickStackViewArg> &args);
+     QQuickStackElement *findElement(QQuickItem *item) const;
+     QQuickStackElement *findElement(const QV4::Value &value) const;
+     QQuickStackElement *createElement(const QV4::Value &value, const QQmlRefPointer<QQmlContextData> &context, QString *error);
+-    bool pushElements(const QList<QQuickStackElement *> &elements);
+-    bool pushElement(QQuickStackElement *element);
+-    bool popElements(QQuickStackElement *element);
+-    bool replaceElements(QQuickStackElement *element, const QList<QQuickStackElement *> &elements);
++    bool pushElements(QV4::ExecutionEngine *v4, const QList<QQuickStackElement *> &elements);
++    bool pushElement(QV4::ExecutionEngine *v4, QQuickStackElement *element);
++    bool popElements(QV4::ExecutionEngine *v4, QQuickStackElement *element);
++    bool replaceElements(QV4::ExecutionEngine *v4, QQuickStackElement *element, const QList<QQuickStackElement *> &elements);
+ 
+     enum class CurrentItemPolicy {
+         DoNotPop,
+         Pop
+     };
+-    QQuickItem *popToItem(QQuickItem *item, QQuickStackView::Operation operation, CurrentItemPolicy currentItemPolicy);
++    QQuickItem *popToItem(QV4::ExecutionEngine *v4, QQuickItem *item, QQuickStackView::Operation operation, CurrentItemPolicy currentItemPolicy);
+ 
+ #if QT_CONFIG(quick_viewtransitions)
+     void ensureTransitioner();

From cb4a36487c8bfb7a0ac51117cb821f16b2f3c787 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 4 Oct 2025 10:57:57 +0300
Subject: [PATCH 0384/6226] kdePackages.plasma-workspace: drop workaround for
 Qt crash

---
 pkgs/kde/plasma/plasma-workspace/default.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix
index a7cd8fc5388f..90b76badce64 100644
--- a/pkgs/kde/plasma/plasma-workspace/default.nix
+++ b/pkgs/kde/plasma/plasma-workspace/default.nix
@@ -2,7 +2,6 @@
   lib,
   mkKdeDerivation,
   replaceVars,
-  fetchpatch,
   dbus,
   fontconfig,
   xorg,
@@ -34,12 +33,6 @@ mkKdeDerivation {
       # @QtBinariesDir@ only appears in the *removed* lines of the diff
       QtBinariesDir = null;
     })
-    # Fixes https://github.com/NixOS/nixpkgs/issues/442630, next upstream release should already contain this patch
-    (fetchpatch {
-      name = "fix-media-applet-crash.diff";
-      url = "https://invent.kde.org/plasma/plasma-workspace/-/commit/30273fb2afcc6e304951c8895bb17d38255fed39.diff";
-      sha256 = "sha256-1p1CjxRioCDm5ugoI8l6kDlOse5FbDJ71tTAY9LPvRc=";
-    })
   ];
 
   postInstall = ''

From 3480dcebd5e0788be8ad50dd71f5b916987751d3 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 4 Oct 2025 13:20:36 +0300
Subject: [PATCH 0385/6226] python313Packages.pyside6: 6.9.2 -> 6.9.3

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

diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix
index 778a88a397b4..6fece11bb0db 100644
--- a/pkgs/development/python-modules/shiboken6/default.nix
+++ b/pkgs/development/python-modules/shiboken6/default.nix
@@ -13,11 +13,11 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "shiboken6";
-  version = "6.9.2";
+  version = "6.9.3";
 
   src = fetchurl {
     url = "mirror://qt/official_releases/QtForPython/pyside6/PySide6-${finalAttrs.version}-src/pyside-setup-everywhere-src-${finalAttrs.version}.tar.xz";
-    hash = "sha256-nsCHRlNCvcnb5JKjDlj9u8VEhlXerPWYKg/nEj9ZIi0=";
+    hash = "sha256-fNLVq7mPLm9EKw5B9fz5MOcxKuSxf2gTFrGtx7Y7sXI=";
   };
 
   sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/shiboken6";

From b538e81bb4a1c48cc5e01e108f6c8f3145418728 Mon Sep 17 00:00:00 2001
From: Matt Leon <ml@mattleon.com>
Date: Sun, 28 Sep 2025 15:32:25 -0400
Subject: [PATCH 0386/6226] python-matter-server: bundle dashboard

Fixes https://github.com/NixOS/nixpkgs/issues/446702.

Signed-off-by: Matt Leon <ml@mattleon.com>
---
 .../manual/release-notes/rl-2511.section.md   |  2 +
 .../home-automation/matter-server.nix         |  8 ++
 nixos/tests/matter-server.nix                 |  4 +
 .../python-matter-server/default.nix          | 80 ++++++++++++++++---
 4 files changed, 83 insertions(+), 11 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 517beed6d0a4..7c21d8bb8513 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -364,6 +364,8 @@
 
 - `services.xserver.desktopManager.deepin` and associated packages have been removed due to being unmaintained. See issue [#422090](https://github.com/NixOS/nixpkgs/issues/422090) for more details.
 
+- `services.matter-server` now hosts a debug dashboard on the configured port. Open the port on the firewall with `services.matter-server.openFirewall`.
+
 - The new option [networking.ipips](#opt-networking.ipips) has been added to create IP within IP kind of tunnels (including 4in6, ip6ip6 and ipip).
   With the existing [networking.sits](#opt-networking.sits) option (6in4), it is now possible to create all combinations of IPv4 and IPv6 encapsulation.
 
diff --git a/nixos/modules/services/home-automation/matter-server.nix b/nixos/modules/services/home-automation/matter-server.nix
index a0ff6ad33490..8231d108d135 100644
--- a/nixos/modules/services/home-automation/matter-server.nix
+++ b/nixos/modules/services/home-automation/matter-server.nix
@@ -25,6 +25,12 @@ in
       description = "Port to expose the matter-server service on.";
     };
 
+    openFirewall = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Whether to open the port in the firewall.";
+    };
+
     logLevel = lib.mkOption {
       type = lib.types.enum [
         "critical"
@@ -48,6 +54,8 @@ in
   };
 
   config = lib.mkIf cfg.enable {
+    networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.port ];
+
     systemd.services.matter-server = {
       after = [ "network-online.target" ];
       before = [ "home-assistant.service" ];
diff --git a/nixos/tests/matter-server.nix b/nixos/tests/matter-server.nix
index 167cee21e07b..6d919850f3ce 100644
--- a/nixos/tests/matter-server.nix
+++ b/nixos/tests/matter-server.nix
@@ -16,6 +16,7 @@ in
         services.matter-server = {
           enable = true;
           port = 1234;
+          openFirewall = true;
         };
       };
   };
@@ -43,6 +44,9 @@ in
         with subtest("Check storage directory is created"):
             machine.succeed("ls /var/lib/matter-server/chip.json")
 
+        with subtest("Check dashboard loads"):
+            machine.succeed("curl -f 127.0.0.1:1234")
+
         with subtest("Check systemd hardening"):
             _, output = machine.execute("systemd-analyze security matter-server.service | grep -v '✓'")
             machine.log(output)
diff --git a/pkgs/development/python-modules/python-matter-server/default.nix b/pkgs/development/python-modules/python-matter-server/default.nix
index 6a7e0ca388a3..cd72b8277920 100644
--- a/pkgs/development/python-modules/python-matter-server/default.nix
+++ b/pkgs/development/python-modules/python-matter-server/default.nix
@@ -5,6 +5,8 @@
   pythonOlder,
   stdenvNoCC,
   replaceVars,
+  buildNpmPackage,
+  python,
 
   # build
   setuptools,
@@ -24,14 +26,25 @@
 
   # tests
   aioresponses,
-  python,
   pytest,
   pytest-aiohttp,
   pytest-cov-stub,
   pytestCheckHook,
+
+  # build options
+  withDashboard ? true,
 }:
 
 let
+  version = "8.1.1";
+
+  src = fetchFromGitHub {
+    owner = "home-assistant-libs";
+    repo = "python-matter-server";
+    tag = version;
+    hash = "sha256-vTJGe6OGFM+q9+iovsQMPwkrHNg2l4pw9BFEtSA/vmA=";
+  };
+
   paaCerts = stdenvNoCC.mkDerivation rec {
     pname = "matter-server-paa-certificates";
     version = "1.4.0.0";
@@ -52,22 +65,63 @@ let
       runHook postInstall
     '';
   };
-in
 
+  # Maintainer note: building the dashboard requires a python environment with a
+  # built version of python-matter-server. To support bundling the dashboard
+  # with the python-matter-server, the build is parameterized to build without
+  # a dependency on the dashboard, breaking a cyclical dependency. First,
+  # python-matter-server is built without the dashboard, then the dashboard is
+  # built, then python-matter-server is built again with the dashboard.
+  matterServerDashboard =
+    let
+      pythonWithChip = python.withPackages (ps: [
+        ps.home-assistant-chip-clusters
+        (ps.python-matter-server.override { withDashboard = false; })
+      ]);
+    in
+    buildNpmPackage {
+      pname = "python-matter-server-dashboard";
+      inherit src version;
+
+      npmDepsHash = "sha256-IgI1H3VlTq66duplVQqL67SpgxPF2MOowDn+ICMXCik=";
+
+      prePatch = ''
+        ${pythonWithChip.interpreter} scripts/generate_descriptions.py
+
+        # cd before the patch phase sets up the npm install hook to find the
+        # package.json. The script would need to be patched in order to be used
+        # with sourceRoot.
+        cd "dashboard"
+      '';
+
+      # This package does not contain a normal `npm build` step.
+      buildPhase = ''
+        env NODE_ENV=production npm exec -- tsc
+        env NODE_ENV=production npm exec -- rollup -c
+      '';
+
+      installPhase = ''
+        runHook preInstall
+
+        install -Dt "$out/" public/*
+        # Copy recursive directory structure, which install does not do.
+        cp -r dist/web/* "$out/"
+
+        runHook postInstall
+      '';
+    };
+in
 buildPythonPackage rec {
-  pname = "python-matter-server";
-  version = "8.1.1";
+  pname = if withDashboard then "python-matter-server" else "python-matter-server-without-dashboard";
+  inherit
+    src
+    version
+    ;
+
   pyproject = true;
 
   disabled = pythonOlder "3.12";
 
-  src = fetchFromGitHub {
-    owner = "home-assistant-libs";
-    repo = "python-matter-server";
-    tag = version;
-    hash = "sha256-vTJGe6OGFM+q9+iovsQMPwkrHNg2l4pw9BFEtSA/vmA=";
-  };
-
   patches = [
     (replaceVars ./link-paa-root-certs.patch {
       paacerts = paaCerts;
@@ -77,6 +131,10 @@ buildPythonPackage rec {
   postPatch = ''
     substituteInPlace pyproject.toml \
       --replace-fail 'version = "0.0.0"' 'version = "${version}"'
+  ''
+  + lib.optionalString withDashboard ''
+    substituteInPlace "matter_server/server/server.py" \
+      --replace-fail 'Path(__file__).parent.joinpath("../dashboard/")' 'Path("${matterServerDashboard}")'
   '';
 
   build-system = [

From 3e4b64a501f421b30ed8e6dbc5a6af7d5f62bbd6 Mon Sep 17 00:00:00 2001
From: EarthenGarland <>
Date: Wed, 24 Sep 2025 11:38:22 +0300
Subject: [PATCH 0387/6226] python3Packages.cffi: 1.17.1 -> 2.0.0

---
 .../python-modules/cffi/default.nix           | 91 +++++++------------
 pkgs/top-level/python-packages.nix            |  2 +-
 2 files changed, 32 insertions(+), 61 deletions(-)

diff --git a/pkgs/development/python-modules/cffi/default.nix b/pkgs/development/python-modules/cffi/default.nix
index b7a5c901435a..0c837d51ffce 100644
--- a/pkgs/development/python-modules/cffi/default.nix
+++ b/pkgs/development/python-modules/cffi/default.nix
@@ -1,75 +1,46 @@
 {
-  lib,
-  stdenv,
   buildPythonPackage,
-  isPyPy,
-  fetchPypi,
-  setuptools,
-  pytestCheckHook,
+  fetchFromGitHub,
+  lib,
   libffi,
   pkg-config,
   pycparser,
+  pytestCheckHook,
+  setuptools,
+  stdenv,
 }:
 
-let
-  version = "1.17.1";
-in
-if isPyPy then
-  buildPythonPackage {
-    pname = "cffi";
-    inherit version;
-    pyproject = false;
+buildPythonPackage rec {
+  pname = "cffi";
+  version = "2.0.0";
+  pyproject = true;
 
-    # cffi is bundled with PyPy.
-    dontUnpack = true;
+  src = fetchFromGitHub {
+    owner = "python-cffi";
+    repo = "cffi";
+    tag = "v${version}";
+    hash = "sha256-7Mzz3KmmmE2xQru1GA4aY0DZqn6vxykWiExQvnA1bjM=";
+  };
 
-    # Some dependent packages expect to have pycparser available when using cffi.
-    dependencies = [ pycparser ];
+  nativeBuildInputs = [ pkg-config ];
 
-    meta = {
-      description = "Foreign Function Interface for Python calling C code (bundled with PyPy, placeholder package)";
-      homepage = "https://cffi.readthedocs.org/";
-      license = lib.licenses.mit;
-      teams = [ lib.teams.python ];
-    };
-  }
-else
-  buildPythonPackage rec {
-    pname = "cffi";
-    inherit version;
-    pyproject = true;
+  build-system = [ setuptools ];
 
-    src = fetchPypi {
-      inherit pname version;
-      hash = "sha256-HDnGAWwyvEjdVFYZUOvWg24WcPKuRhKPZ89J54nFKCQ=";
-    };
+  buildInputs = [ libffi ];
 
-    nativeBuildInputs = [ pkg-config ];
+  # Some dependent packages expect to have pycparser available when using cffi.
+  dependencies = [ pycparser ];
 
-    build-system = [ setuptools ];
+  doCheck = !(stdenv.hostPlatform.isMusl || stdenv.hostPlatform.useLLVM or false);
 
-    buildInputs = [ libffi ];
+  nativeCheckInputs = [ pytestCheckHook ];
 
-    dependencies = [ pycparser ];
-
-    # The tests use -Werror but with python3.6 clang detects some unreachable code.
-    env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-unused-command-line-argument -Wno-unreachable-code -Wno-c++11-narrowing";
-
-    doCheck = !(stdenv.hostPlatform.isMusl || stdenv.hostPlatform.useLLVM or false);
-
-    nativeCheckInputs = [ pytestCheckHook ];
-
-    disabledTests = lib.optionals stdenv.hostPlatform.isFreeBSD [
-      # https://github.com/python-cffi/cffi/pull/144
-      "test_dlopen_handle"
-    ];
-
-    meta = with lib; {
-      changelog = "https://github.com/python-cffi/cffi/releases/tag/v${version}";
-      description = "Foreign Function Interface for Python calling C code";
-      downloadPage = "https://github.com/python-cffi/cffi";
-      homepage = "https://cffi.readthedocs.org/";
-      license = licenses.mit;
-      teams = [ teams.python ];
-    };
-  }
+  meta = {
+    changelog = "https://github.com/python-cffi/cffi/releases/tag/v${version}";
+    description = "Foreign Function Interface for Python calling C code";
+    downloadPage = "https://github.com/python-cffi/cffi";
+    homepage = "https://cffi.readthedocs.org/";
+    license = lib.licenses.mit0;
+    teams = [ lib.teams.python ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index db7b4e220692..c03ec4824a11 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2474,7 +2474,7 @@ self: super: with self; {
 
   cffconvert = callPackage ../development/python-modules/cffconvert { };
 
-  cffi = callPackage ../development/python-modules/cffi { };
+  cffi = if isPyPy then null else callPackage ../development/python-modules/cffi { };
 
   cffsubr = callPackage ../development/python-modules/cffsubr { };
 

From 9d4bbcda3a043d64546b6179a8fd5584bc46d03c Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Fri, 18 Jul 2025 16:48:35 -0700
Subject: [PATCH 0388/6226] phira{,-unwrapped,-free}: init at 0.6.7

---
 pkgs/by-name/ph/phira-free/package.nix        |  32 +++++
 pkgs/by-name/ph/phira-unwrapped/assets.patch  |  19 +++
 pkgs/by-name/ph/phira-unwrapped/ffmpeg.patch  | 119 ++++++++++++++++++
 pkgs/by-name/ph/phira-unwrapped/package.nix   |  87 +++++++++++++
 .../ph/phira-unwrapped/stable-features.patch  |  10 ++
 pkgs/by-name/ph/phira-unwrapped/tracing.patch |  24 ++++
 pkgs/by-name/ph/phira/package.nix             |  51 ++++++++
 7 files changed, 342 insertions(+)
 create mode 100644 pkgs/by-name/ph/phira-free/package.nix
 create mode 100644 pkgs/by-name/ph/phira-unwrapped/assets.patch
 create mode 100644 pkgs/by-name/ph/phira-unwrapped/ffmpeg.patch
 create mode 100644 pkgs/by-name/ph/phira-unwrapped/package.nix
 create mode 100644 pkgs/by-name/ph/phira-unwrapped/stable-features.patch
 create mode 100644 pkgs/by-name/ph/phira-unwrapped/tracing.patch
 create mode 100644 pkgs/by-name/ph/phira/package.nix

diff --git a/pkgs/by-name/ph/phira-free/package.nix b/pkgs/by-name/ph/phira-free/package.nix
new file mode 100644
index 000000000000..3cc205396a2e
--- /dev/null
+++ b/pkgs/by-name/ph/phira-free/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  stdenvNoCC,
+  phira,
+  phira-unwrapped,
+  imagemagick,
+  ubuntu-classic,
+}:
+
+phira.override {
+  overrideAssets = stdenvNoCC.mkDerivation {
+    pname = "phira-assets";
+    version = phira.version;
+
+    nativeBuildInputs = [ imagemagick ];
+
+    dontUnpack = true;
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out
+      cp -r ${phira-unwrapped.src}/assets $out
+      chmod -R +w $out/assets
+
+      magick -size 4000x2000 canvas:'rgb(128,162,206)' $out/assets/background.jpg
+      cp ${ubuntu-classic}/share/fonts/truetype/ubuntu/Ubuntu-R.ttf $out/assets/font.ttf
+
+      runHook postInstall
+    '';
+  };
+}
diff --git a/pkgs/by-name/ph/phira-unwrapped/assets.patch b/pkgs/by-name/ph/phira-unwrapped/assets.patch
new file mode 100644
index 000000000000..eeb26be0b563
--- /dev/null
+++ b/pkgs/by-name/ph/phira-unwrapped/assets.patch
@@ -0,0 +1,19 @@
+diff --git a/prpr/src/core.rs b/prpr/src/core.rs
+index 7f9d4db..33c44bb 100644
+--- a/prpr/src/core.rs
++++ b/prpr/src/core.rs
+@@ -68,6 +68,14 @@ thread_local! {
+ }
+ 
+ pub fn init_assets() {
++    if let Ok(root_path) = std::env::var("PHIRA_ROOT") {
++        let path = std::path::Path::new(&root_path);
++        if path.exists() {
++            std::env::set_current_dir(path).unwrap();
++            set_pc_assets_folder("assets");
++            return;
++        }
++    }
+     if let Ok(mut exe) = std::env::current_exe() {
+         while exe.pop() {
+             if exe.join("assets").exists() {
diff --git a/pkgs/by-name/ph/phira-unwrapped/ffmpeg.patch b/pkgs/by-name/ph/phira-unwrapped/ffmpeg.patch
new file mode 100644
index 000000000000..70912ebdb111
--- /dev/null
+++ b/pkgs/by-name/ph/phira-unwrapped/ffmpeg.patch
@@ -0,0 +1,119 @@
+diff --git a/prpr-avc/Cargo.toml b/prpr-avc/Cargo.toml
+index 257c575..bf35b10 100644
+--- a/prpr-avc/Cargo.toml
++++ b/prpr-avc/Cargo.toml
+@@ -9,3 +9,6 @@ edition = "2021"
+ sasa = { git = "https://github.com/Mivik/sasa", default-features = false }
+ thiserror = "1.0.56"
+ tracing = "0.1.37"
++
++[build-dependencies]
++pkg-config = "0.3"
+diff --git a/prpr-avc/build.rs b/prpr-avc/build.rs
+index 961b032..6d0b714 100644
+--- a/prpr-avc/build.rs
++++ b/prpr-avc/build.rs
+@@ -1,10 +1,7 @@
+ use std::path::Path;
+ 
+ fn main() {
+-    let libs_dir = std::env::var("PRPR_AVC_LIBS").unwrap_or_else(|_| format!("{}/static-lib", std::env::var("CARGO_MANIFEST_DIR").unwrap()));
+-    let libs_path = Path::new(&libs_dir).join(std::env::var("TARGET").unwrap());
+-    let libs_path = libs_path.display();
+-    println!("cargo:rustc-link-search={libs_path}");
+-    println!("cargo:rustc-link-lib=z");
+-    println!("cargo:rerun-if-changed={libs_path}");
++    for lib in ["libavformat", "libavcodec", "libavutil", "libswscale", "libswresample"] {
++        let _ = pkg_config::Config::new().statik(false).probe(lib);
++    }
+ }
+diff --git a/prpr-avc/src/ffi.rs b/prpr-avc/src/ffi.rs
+index 8218ef3..a2c7f6a 100644
+--- a/prpr-avc/src/ffi.rs
++++ b/prpr-avc/src/ffi.rs
+@@ -6,7 +6,6 @@ pub const AV_SAMPLE_FMT_FLT: AVSampleFormat = 3;
+ 
+ pub const AV_ROUND_UP: AVRounding = 0;
+ 
+-#[link(name = "avformat", kind = "static")]
+ extern "C" {
+     pub fn avformat_alloc_context() -> *mut AVFormatContext;
+     pub fn avformat_free_context(s: *mut AVFormatContext);
+@@ -20,7 +19,6 @@ extern "C" {
+     pub fn av_read_frame(s: *mut AVFormatContext, pkt: *mut AVPacket) -> ::std::os::raw::c_int;
+ }
+ 
+-#[link(name = "avutil", kind = "static")]
+ extern "C" {
+     pub fn av_strerror(errnum: ::std::os::raw::c_int, errbuf: *mut ::std::os::raw::c_char, errbuf_size: usize) -> ::std::os::raw::c_int;
+     pub fn av_frame_alloc() -> *mut AVFrame;
+@@ -29,7 +27,6 @@ extern "C" {
+     pub fn av_rescale_rnd(a: i64, b: i64, c: i64, r: AVRounding) -> i64;
+ }
+ 
+-#[link(name = "avcodec", kind = "static")]
+ extern "C" {
+     pub fn avcodec_find_decoder(id: AVCodecID) -> *mut AVCodec;
+     pub fn avcodec_alloc_context3(codec: *const AVCodec) -> *mut AVCodecContext;
+@@ -43,7 +40,6 @@ extern "C" {
+     pub fn avcodec_default_get_format(s: *mut AVCodecContext, fmt: *const AVPixelFormat) -> AVPixelFormat;
+ }
+ 
+-#[link(name = "swscale", kind = "static")]
+ extern "C" {
+     pub fn sws_getContext(
+         srcW: ::std::os::raw::c_int,
+@@ -68,10 +64,9 @@ extern "C" {
+     ) -> ::std::os::raw::c_int;
+ }
+ 
+-#[link(name = "swresample", kind = "static")]
+ extern "C" {
+-    pub fn swr_alloc_set_opts(
+-        s: *mut SwrContext,
++    pub fn swr_alloc_set_opts2(
++        ps: *mut *mut SwrContext,
+         out_ch_layout: i64,
+         out_sample_fmt: AVSampleFormat,
+         out_sample_rate: ::std::os::raw::c_int,
+@@ -80,7 +75,7 @@ extern "C" {
+         in_sample_rate: ::std::os::raw::c_int,
+         log_offset: ::std::os::raw::c_int,
+         log_ctx: *mut ::std::os::raw::c_void,
+-    ) -> *mut SwrContext;
++    ) -> ::std::os::raw::c_int;
+     pub fn swr_init(s: *mut SwrContext) -> ::std::os::raw::c_int;
+     pub fn swr_get_delay(s: *const SwrContext, base: ::std::os::raw::c_int) -> i64;
+     pub fn swr_convert(
+diff --git a/prpr-avc/src/swr.rs b/prpr-avc/src/swr.rs
+index 7288a51..c00b874 100644
+--- a/prpr-avc/src/swr.rs
++++ b/prpr-avc/src/swr.rs
+@@ -5,8 +5,9 @@ pub struct SwrContext(OwnedPtr<ffi::SwrContext>);
+ impl SwrContext {
+     pub fn new(in_format: &AudioStreamFormat, out_format: &AudioStreamFormat) -> Result<Self> {
+         unsafe {
+-            OwnedPtr::new(ffi::swr_alloc_set_opts(
+-                null_mut(),
++            let mut raw: *mut ffi::SwrContext = null_mut();
++            let ret = ffi::swr_alloc_set_opts2(
++                &mut raw,
+                 out_format.channel_layout as _,
+                 out_format.sample_fmt,
+                 out_format.sample_rate,
+@@ -15,9 +16,12 @@ impl SwrContext {
+                 in_format.sample_rate,
+                 0,
+                 null_mut(),
+-            ))
+-            .map(|ctx| Self(ctx))
+-            .ok_or(Error::AllocationFailed)
++            );
++            if ret < 0 || raw.is_null() {
++                Err(Error::AllocationFailed)
++            } else {
++                OwnedPtr::new(raw).map(|ctx| Self(ctx)).ok_or(Error::AllocationFailed)
++            }
+         }
+     }
+ 
diff --git a/pkgs/by-name/ph/phira-unwrapped/package.nix b/pkgs/by-name/ph/phira-unwrapped/package.nix
new file mode 100644
index 000000000000..0aaeb78b1638
--- /dev/null
+++ b/pkgs/by-name/ph/phira-unwrapped/package.nix
@@ -0,0 +1,87 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  makeDesktopItem,
+  copyDesktopItems,
+  rustPlatform,
+  pkg-config,
+  perl,
+  ffmpeg,
+  alsa-lib,
+  gtk3,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "phira-unwrapped";
+  version = "0.6.7";
+
+  src = fetchFromGitHub {
+    owner = "TeamFlos";
+    repo = "phira";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-4WIvLfKeh+quu7dHKMlUKt+NQnui2/txlFYZoU3voPA=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    perl
+    copyDesktopItems
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    rustPlatform.bindgenHook # for crate coreaudio-sys
+  ];
+
+  buildInputs = [
+    ffmpeg
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    alsa-lib # for crate alsa-sys
+    gtk3 # for crate gtk-sys
+  ];
+
+  patches = [
+    # use dynamically linked ffmpeg instead of expecting static lib
+    ./ffmpeg.patch
+
+    # error[E0554]: `#![feature]` may not be used on the stable release channel
+    ./stable-features.patch
+
+    # missing macro from tracing crate
+    ./tracing.patch
+
+    # allow using env var to specify location of assets and data
+    ./assets.patch
+  ];
+
+  cargoHash = "sha256-6mRb3M56G20fA+px1cZyrGpel0v54qoVAQK2ZgTzkmI=";
+
+  # The developer put assets necessary for this test in gitignore, so it cannot run.
+  checkFlags = [ "--skip test_parse_chart" ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "phira";
+      desktopName = "Phira";
+      exec = "phira-main";
+      icon = "phira";
+      comment = finalAttrs.meta.description;
+      categories = [ "Game" ];
+    })
+  ];
+
+  postInstall = ''
+    install -Dm644 assets/icon.png $out/share/icons/hicolor/128x128/apps/phira.png
+  '';
+
+  meta = {
+    description = "Rhythm game with custom charts and multiplayer";
+    homepage = "https://github.com/TeamFlos/phira";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ ulysseszhan ];
+    changelog = "https://github.com/TeamFlos/phira/releases/tag/v${finalAttrs.version}";
+    platforms = lib.platforms.unix;
+    mainProgram = "phira-main";
+  };
+
+})
diff --git a/pkgs/by-name/ph/phira-unwrapped/stable-features.patch b/pkgs/by-name/ph/phira-unwrapped/stable-features.patch
new file mode 100644
index 000000000000..9aac943305b1
--- /dev/null
+++ b/pkgs/by-name/ph/phira-unwrapped/stable-features.patch
@@ -0,0 +1,10 @@
+diff --git a/prpr/src/lib.rs b/prpr/src/lib.rs
+index 15a139f..6b4e469 100644
+--- a/prpr/src/lib.rs
++++ b/prpr/src/lib.rs
+@@ -1,5 +1,3 @@
+-#![feature(local_key_cell_methods)]
+-
+ pub mod bin;
+ pub mod config;
+ pub mod core;
diff --git a/pkgs/by-name/ph/phira-unwrapped/tracing.patch b/pkgs/by-name/ph/phira-unwrapped/tracing.patch
new file mode 100644
index 000000000000..d1366f439f73
--- /dev/null
+++ b/pkgs/by-name/ph/phira-unwrapped/tracing.patch
@@ -0,0 +1,24 @@
+diff --git a/phira-monitor/Cargo.toml b/phira-monitor/Cargo.toml
+index 722a022..899b7db 100644
+--- a/phira-monitor/Cargo.toml
++++ b/phira-monitor/Cargo.toml
+@@ -15,6 +15,7 @@ serde = { version = "*", features = ["derive"] }
+ serde_yaml = "*"
+ tokio = { workspace = true }
+ uuid = { version = "1.4.0", features = ["v4"] }
++tracing = "0.1"
+ 
+ phira-mp-client = { git = "https://github.com/TeamFlos/phira-mp" }
+ phira-mp-common = { git = "https://github.com/TeamFlos/phira-mp" }
+diff --git a/phira-monitor/src/main.rs b/phira-monitor/src/main.rs
+index 61bcfba..a4bf8af 100644
+--- a/phira-monitor/src/main.rs
++++ b/phira-monitor/src/main.rs
+@@ -14,6 +14,7 @@ use prpr::{
+ use scene::MainScene;
+ use serde::Deserialize;
+ use std::fs::File;
++use tracing::warn;
+ 
+ mod dir {
+     use anyhow::Result;
diff --git a/pkgs/by-name/ph/phira/package.nix b/pkgs/by-name/ph/phira/package.nix
new file mode 100644
index 000000000000..3fb1d9098adc
--- /dev/null
+++ b/pkgs/by-name/ph/phira/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenv,
+  symlinkJoin,
+  fetchzip,
+  phira-unwrapped,
+  makeWrapper,
+  libGL,
+  # A derivation or a path that contains a dir `assets`.
+  overrideAssets ? fetchzip {
+    url = "https://github.com/TeamFlos/phira/releases/download/v${phira-unwrapped.version}/Phira-windows-v${phira-unwrapped.version}.zip";
+    hash = "sha256-kgmIIIzg+wxyspQTyW1GucW0RVPfBhIRlK5DEGXK1Qs=";
+    stripRoot = false;
+    meta.license = lib.licenses.unfree;
+  },
+}:
+
+symlinkJoin {
+  pname = "phira";
+  version = phira-unwrapped.version;
+
+  paths = [ phira-unwrapped ];
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  postBuild = ''
+    phira_root=$out/share/phira
+    mkdir -p $phira_root
+    cp -r ${overrideAssets}/assets $phira_root
+
+    wrapper_options=(
+      ${lib.optionalString stdenv.hostPlatform.isLinux "--suffix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}"}
+      --run '
+        export PHIRA_ROOT=''${PHIRA_ROOT-"''${XDG_DATA_HOME-"$HOME/.local/share"}/phira"}
+        if [[ ! -d "$PHIRA_ROOT/assets" ]]; then
+          mkdir -p "$PHIRA_ROOT"
+          cp -r "'$phira_root/assets'" "$PHIRA_ROOT"
+          chmod -R +w "$PHIRA_ROOT/assets"
+        fi
+      '
+    )
+
+    wrapProgram $out/bin/phira-main "''${wrapper_options[@]}"
+    wrapProgram $out/bin/phira-monitor "''${wrapper_options[@]}"
+  '';
+
+  passthru.assets = overrideAssets;
+
+  meta = phira-unwrapped.meta;
+
+}

From 5c2b3c07b3e80096bed19f4c9122db1ad80415b9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 28 Sep 2025 21:37:53 +0200
Subject: [PATCH 0389/6226] python3Packages.isal: 1.7.2 -> 1.8.0

https://github.com/pycompression/python-isal/blob/v1.8.0/CHANGELOG.rst
---
 .../development/python-modules/isal/default.nix | 17 +++++------------
 .../python-modules/isal/version.patch           | 16 ----------------
 2 files changed, 5 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/development/python-modules/isal/version.patch

diff --git a/pkgs/development/python-modules/isal/default.nix b/pkgs/development/python-modules/isal/default.nix
index bd3f11ac014b..d1344d106f54 100644
--- a/pkgs/development/python-modules/isal/default.nix
+++ b/pkgs/development/python-modules/isal/default.nix
@@ -2,11 +2,10 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  replaceVars,
 
   # build-system
   setuptools,
-  versioningit,
+  setuptools-scm,
 
   # native dependencies
   isa-l,
@@ -18,25 +17,19 @@
 
 buildPythonPackage rec {
   pname = "isal";
-  version = "1.7.2";
+  version = "1.8.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pycompression";
     repo = "python-isal";
-    rev = "v${version}";
-    hash = "sha256-gvUVSGarPA4KupQTd61x75CfqNVqZfFC1zq0R21Clf8=";
+    tag = "v${version}";
+    hash = "sha256-703uXty3a0N+yXfv/7nVIAnU7PaqMtNO0ScltNLJq3g=";
   };
 
-  patches = [
-    (replaceVars ./version.patch {
-      inherit version;
-    })
-  ];
-
   build-system = [
     setuptools
-    versioningit
+    setuptools-scm
   ];
 
   buildInputs = [ isa-l ];
diff --git a/pkgs/development/python-modules/isal/version.patch b/pkgs/development/python-modules/isal/version.patch
deleted file mode 100644
index 9a8500a12d46..000000000000
--- a/pkgs/development/python-modules/isal/version.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/pyproject.toml b/pyproject.toml
-index bf5fe99..b559255 100644
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -2,9 +2,8 @@
- requires = ["setuptools>=64", "versioningit>=1.1.0"]
- build-backend = "setuptools.build_meta"
- 
--[tool.versioningit.vcs]
--method="git"
--default-tag = "v0.0.0"
-+[tool.versioningit]
-+default-version = "@version@"
- 
- [tool.versioningit.write]
- file = "src/isal/_version.py"

From 923dd5a6b52c28bf89fa330efb2cd33b4dc08f16 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Oct 2025 17:26:28 +0000
Subject: [PATCH 0390/6226] slumber: 4.0.1 -> 4.1.0

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

diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix
index ccd231a3a3c3..79d12bfbe85c 100644
--- a/pkgs/by-name/sl/slumber/package.nix
+++ b/pkgs/by-name/sl/slumber/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "slumber";
-  version = "4.0.1";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "LucasPickering";
     repo = "slumber";
     tag = "v${version}";
-    hash = "sha256-Xr4jAQ3G5El9FU6qOJJARjkZmTZly8pb//ElQizOHSg=";
+    hash = "sha256-JPKzubGwtXV7CmuPqEIvFKPoug17Z4Jeg+dgIBMTOU4=";
   };
 
-  cargoHash = "sha256-Di3Kqwa63AWwZE1VOal+mqmYe/nzPFqis1MnawW9uZo=";
+  cargoHash = "sha256-1ReNwfV1M8k5pGeXBvd28UEKfys0ylraP4Q0AoL/L5Y=";
 
   meta = {
     description = "Terminal-based HTTP/REST client";

From 57be8089acfeaaec8ea2d164e9830bc78d0b38ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Oct 2025 18:26:52 +0000
Subject: [PATCH 0391/6226] kent: 486 -> 488

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

diff --git a/pkgs/by-name/ke/kent/package.nix b/pkgs/by-name/ke/kent/package.nix
index 8c0c9d8bf0f8..ed04394e21a1 100644
--- a/pkgs/by-name/ke/kent/package.nix
+++ b/pkgs/by-name/ke/kent/package.nix
@@ -19,13 +19,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "kent";
-  version = "486";
+  version = "488";
 
   src = fetchFromGitHub {
     owner = "ucscGenomeBrowser";
     repo = "kent";
     tag = "v${finalAttrs.version}_base";
-    hash = "sha256-NffQ04+5rMtG/VI7YFK4Ff39DDhdh9Wlc0i1iVbg8Js=";
+    hash = "sha256-7iapTrQBq0VvbSe+lEdf9lISRJ/uPGdnfjJiSA0NLN8=";
   };
 
   nativeBuildInputs = [ writableTmpDirAsHomeHook ];

From 2965af4b5b40e7e2cc55605673674fece856dc62 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Oct 2025 19:19:54 +0000
Subject: [PATCH 0392/6226] lilypond-unstable: 2.25.27 -> 2.25.29

---
 pkgs/misc/lilypond/unstable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/lilypond/unstable.nix b/pkgs/misc/lilypond/unstable.nix
index 748b3fd81e76..f8e7c2ecc1d7 100644
--- a/pkgs/misc/lilypond/unstable.nix
+++ b/pkgs/misc/lilypond/unstable.nix
@@ -5,10 +5,10 @@
 }:
 
 lilypond.overrideAttrs (oldAttrs: rec {
-  version = "2.25.27";
+  version = "2.25.29";
   src = fetchzip {
     url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor version}/lilypond-${version}.tar.gz";
-    hash = "sha256-cZ6XZt1y646Kke3wdJ5Jo9ieOejbojsEBSkAvLDXNPw=";
+    hash = "sha256-t6EnGCD0QMARK1/yJBjtLFzVaBWiiut8KWrtzmzHgCM=";
   };
 
   passthru.updateScript = {

From 0c87aed8aa26591634cd96b9de3d942802545aa3 Mon Sep 17 00:00:00 2001
From: Rhys Davies <rhys@memes.nz>
Date: Wed, 13 Nov 2024 13:40:45 +1300
Subject: [PATCH 0393/6226] deterministic-zip: init at 5.2.0

---
 pkgs/by-name/de/deterministic-zip/package.nix | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/de/deterministic-zip/package.nix

diff --git a/pkgs/by-name/de/deterministic-zip/package.nix b/pkgs/by-name/de/deterministic-zip/package.nix
new file mode 100644
index 000000000000..527ea94d2025
--- /dev/null
+++ b/pkgs/by-name/de/deterministic-zip/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+}:
+buildGoModule (finalAttrs: {
+  pname = "deterministic-zip";
+  version = "5.2.0";
+
+  src = fetchFromGitHub {
+    owner = "timo-reymann";
+    repo = "deterministic-zip";
+    tag = "${finalAttrs.version}";
+    hash = "sha256-rvheo/DkQTfpVy8fVRRwRA4G9mdMNArptxNT0sxdqnc=";
+  };
+
+  vendorHash = "sha256-qLVeliB2+qRhF+iRE0zHyhBOTB7q31ZGCEH7kbSLSBA=";
+
+  ldflags = [
+    "-s"
+    "-X github.com/timo-reymann/deterministic-zip/pkg/buildinfo.GitSha=${finalAttrs.src.rev}"
+    "-X github.com/timo-reymann/deterministic-zip/pkg/buildinfo.Version=${finalAttrs.version}"
+  ];
+
+  versionCheckProgramArg = "--version";
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  meta = {
+    description = "Simple (almost drop-in) replacement for zip that produces deterministic files";
+    mainProgram = "deterministic-zip";
+    homepage = "https://github.com/timo-reymann/deterministic-zip";
+    license = lib.licenses.unfreeRedistributable;
+    maintainers = with lib.maintainers; [ rhysmdnz ];
+  };
+})

From b2f39c776e16a25d02a6b377da698d1ee30b3926 Mon Sep 17 00:00:00 2001
From: kyehn <228304369+kyehn@users.noreply.github.com>
Date: Sat, 4 Oct 2025 13:35:42 +0800
Subject: [PATCH 0394/6226] scap-security-guide: 0.1.76 -> 0.1.78

---
 pkgs/by-name/sc/scap-security-guide/package.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/sc/scap-security-guide/package.nix b/pkgs/by-name/sc/scap-security-guide/package.nix
index 3c7c1a1c8a33..28da1073caa4 100644
--- a/pkgs/by-name/sc/scap-security-guide/package.nix
+++ b/pkgs/by-name/sc/scap-security-guide/package.nix
@@ -15,15 +15,15 @@
   yamllint,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "scap-security-guide";
-  version = "0.1.76";
+  version = "0.1.78";
 
   src = fetchFromGitHub {
     owner = "ComplianceAsCode";
     repo = "content";
-    tag = "v${version}";
-    hash = "sha256-M1o9UG2pKtkFByp37UP++am8lJFfnoDBkRh1fos+ED0=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-4A/nM2aJcmWMxvK8/3isyDn/wPS9V+1CHO6Pfy+0FTc=";
   };
 
   postPatch = ''
@@ -54,7 +54,6 @@ stdenv.mkDerivation rec {
       myst-parser
       mypy
       openpyxl
-      pcre2-py
       pygithub
       pyyaml
       pandas
@@ -82,4 +81,4 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [ tochiaha ];
     platforms = lib.platforms.all;
   };
-}
+})

From 392f7c843bf68ee8de87921d69068ee83a9a332b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Oct 2025 00:34:03 +0000
Subject: [PATCH 0395/6226] kphotoalbum: 6.0.1 -> 6.1.0

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

diff --git a/pkgs/by-name/kp/kphotoalbum/package.nix b/pkgs/by-name/kp/kphotoalbum/package.nix
index 41792f04b475..72020cfba7b5 100644
--- a/pkgs/by-name/kp/kphotoalbum/package.nix
+++ b/pkgs/by-name/kp/kphotoalbum/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kphotoalbum";
-  version = "6.0.1";
+  version = "6.1.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/kphotoalbum/${finalAttrs.version}/kphotoalbum-${finalAttrs.version}.tar.xz";
-    hash = "sha256-LLsQ66wKDg77nZUIxjcfzvC3AwLOtojuuDgkJm2dsww=";
+    hash = "sha256-fznB/B2VriB+Wt6ZxrPrNoJP45AuK1vV4ONpAHYwUlY=";
   };
 
   env.LANG = "C.UTF-8";

From d856e74723c9162028ed5b498c0d6eee9ef4479b Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 4 Oct 2025 21:55:59 +0100
Subject: [PATCH 0396/6226] hwdata: 0.398 -> 0.400

Changes: https://github.com/vcrhonek/hwdata/compare/v0.399...v0.400
---
 pkgs/by-name/hw/hwdata/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix
index b0a26d17b091..28440ad5a0be 100644
--- a/pkgs/by-name/hw/hwdata/package.nix
+++ b/pkgs/by-name/hw/hwdata/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hwdata";
-  version = "0.399";
+  version = "0.400";
 
   src = fetchFromGitHub {
     owner = "vcrhonek";
     repo = "hwdata";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-7IhOMl0o5dyevklvOSZrTbNMkMy/Sp/MtxaPdeqpHJg=";
+    hash = "sha256-X3LL3PZjEiGrkntegcSWNW2Wsx/IpdTowSVp/F4ov+E=";
   };
 
   doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus)

From 4eb4a0d387408d9096ac500c3a5654fcfafef152 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 5 Oct 2025 06:25:39 +0100
Subject: [PATCH 0397/6226] maturin: 1.9.4 -> 1.9.5

Changes: https://github.com/PyO3/maturin/releases/tag/v1.9.5
---
 pkgs/by-name/ma/maturin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix
index 7defb66efee7..abb2695d21a1 100644
--- a/pkgs/by-name/ma/maturin/package.nix
+++ b/pkgs/by-name/ma/maturin/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "maturin";
-  version = "1.9.4";
+  version = "1.9.5";
 
   src = fetchFromGitHub {
     owner = "PyO3";
     repo = "maturin";
     rev = "v${version}";
-    hash = "sha256-dZIcUaHPdXNgzUhSUld2TAKJVfktRahc7OtOwYRlKSQ=";
+    hash = "sha256-2WiQtNuhuCJfKIoRKNFaX50Jah4nn2aqlAGrRq/+kww=";
   };
 
-  cargoHash = "sha256-tmImZOGERNvAI4I8H4nuJAdrMrMyOYza43+SVdyjFNc=";
+  cargoHash = "sha256-lLWQy9f7vQ+8K0gOCcantAf5644v6Y6MDRvaBvJZJKA=";
 
   buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
     libiconv

From 735d1ae1fc1fb1bce660aa65a3aece9c2002f486 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Oct 2025 07:01:09 +0000
Subject: [PATCH 0398/6226] publii: 0.46.5 -> 0.47.1

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

diff --git a/pkgs/by-name/pu/publii/package.nix b/pkgs/by-name/pu/publii/package.nix
index 546632649cdc..9ac9e5231919 100644
--- a/pkgs/by-name/pu/publii/package.nix
+++ b/pkgs/by-name/pu/publii/package.nix
@@ -28,11 +28,11 @@
 
 stdenv.mkDerivation rec {
   pname = "publii";
-  version = "0.46.5";
+  version = "0.47.1";
 
   src = fetchurl {
     url = "https://getpublii.com/download/Publii-${version}.deb";
-    hash = "sha256-VymAHQNv3N7Mqe8wiUfYawi1BooczLFClxuwaW8NetA=";
+    hash = "sha256-X2rN/inGAxQWYg8OxTLtGzr4q4vUgCYCz3xuxCyCwkQ=";
   };
 
   dontConfigure = true;

From 0778597c69efdd5ce54853993094ba8f163553c0 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 5 Oct 2025 15:18:28 +0800
Subject: [PATCH 0399/6226] uv: 0.8.22 -> 0.8.23

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

diff --git a/pkgs/by-name/uv/uv/package.nix b/pkgs/by-name/uv/uv/package.nix
index 41edda5835af..8122b1afea86 100644
--- a/pkgs/by-name/uv/uv/package.nix
+++ b/pkgs/by-name/uv/uv/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "uv";
-  version = "0.8.22";
+  version = "0.8.23";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "uv";
     tag = finalAttrs.version;
-    hash = "sha256-7/WOjsyfkDTZLNJY0+rNdRUmMabJsSFvKi2yh/WqViQ=";
+    hash = "sha256-5L/FipR5MPsscpWfpDURbC5qwn6XB5KoOrjedk1HzDo=";
   };
 
-  cargoHash = "sha256-RubSyxQjWlkoHMItYLjiyJ5Whz3oMXgioqbuewi1fcM=";
+  cargoHash = "sha256-JHfqsT/W7RvoHx9WbA4fdQZw2/+BOSRuGV3mcMx1FN4=";
 
   buildInputs = [
     rust-jemalloc-sys

From 4813fb439b9727c02ee5c9ac640bfd1f0938ddef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Oct 2025 07:51:30 +0000
Subject: [PATCH 0400/6226] otto-matic: 4.0.1-unstable-2025-04-27 ->
 4.0.1-unstable-2025-09-28

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

diff --git a/pkgs/by-name/ot/otto-matic/package.nix b/pkgs/by-name/ot/otto-matic/package.nix
index f58ce12e8bd4..5f0718b2b430 100644
--- a/pkgs/by-name/ot/otto-matic/package.nix
+++ b/pkgs/by-name/ot/otto-matic/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "OttoMatic";
-  version = "4.0.1-unstable-2025-04-27";
+  version = "4.0.1-unstable-2025-09-28";
 
   src = fetchFromGitHub {
     owner = "jorio";
     repo = "OttoMatic";
-    rev = "69f0111d1768abe56498bf8121f0f9cbc85aedd3";
-    hash = "sha256-7RpEVL3tNhEhkZYVjgsI6S+CQfyiz/ukroldrtohA4k=";
+    rev = "636056a92c1f276a5af5c3dc7df5c3cb952fd47a";
+    hash = "sha256-nSLa/g1irZY9uU7lZkeT9C0iNPgBuD5wm1AxIrIzG54=";
     fetchSubmodules = true;
   };
 

From c5cdad7dd4ccc09f3cd42814ec973faa0da2f21a Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Thu, 9 Jan 2025 00:43:42 +0100
Subject: [PATCH 0401/6226] pkgs-lib.formats: add mkStructuredType

---
 pkgs/pkgs-lib/formats.nix | 161 ++++++++++----------------------------
 1 file changed, 41 insertions(+), 120 deletions(-)

diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index f83a00b9e610..bbafa42f8ae6 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -126,27 +126,42 @@ optionalAttrs allowAliases aliases
 
   php = (import ./formats/php/default.nix { inherit lib pkgs; }).format;
 
+  /*
+    Creates a structured value type suitable for serialization formats.
+
+    Parameters:
+    - typeName: String describing the format (e.g. "JSON", "YAML", "XML")
+
+    Returns a type suitable for structured data formats that supports:
+    - Basic types: boolean, integer, float, string, path
+    - Complex types: attribute sets and lists
+  */
+  mkStructuredType =
+    {
+      typeName,
+      nullable ? true,
+    }:
+    let
+      baseType = oneOf [
+        bool
+        int
+        float
+        str
+        path
+        (attrsOf valueType)
+        (listOf valueType)
+      ];
+      valueType = (if nullable then nullOr baseType else baseType) // {
+        description = "${typeName} value";
+      };
+    in
+    valueType;
+
   json =
     { }:
     {
 
-      type =
-        let
-          valueType =
-            nullOr (oneOf [
-              bool
-              int
-              float
-              str
-              path
-              (attrsOf valueType)
-              (listOf valueType)
-            ])
-            // {
-              description = "JSON value";
-            };
-        in
-        valueType;
+      type = mkStructuredType { typeName = "JSON"; };
 
       generate =
         name: value:
@@ -160,7 +175,7 @@ optionalAttrs allowAliases aliases
               preferLocalBuild = true;
             }
             ''
-              jq . "$valuePath"> $out
+              jq . "$valuePath" > $out
             ''
         ) { };
 
@@ -187,23 +202,7 @@ optionalAttrs allowAliases aliases
             ''
         ) { };
 
-      type =
-        let
-          valueType =
-            nullOr (oneOf [
-              bool
-              int
-              float
-              str
-              path
-              (attrsOf valueType)
-              (listOf valueType)
-            ])
-            // {
-              description = "YAML 1.1 value";
-            };
-        in
-        valueType;
+      type = mkStructuredType { typeName = "YAML 1.1"; };
 
     };
 
@@ -226,23 +225,7 @@ optionalAttrs allowAliases aliases
             ''
         ) { };
 
-      type =
-        let
-          valueType =
-            nullOr (oneOf [
-              bool
-              int
-              float
-              str
-              path
-              (attrsOf valueType)
-              (listOf valueType)
-            ])
-            // {
-              description = "YAML 1.2 value";
-            };
-        in
-        valueType;
+      type = mkStructuredType { typeName = "YAML 1.2"; };
 
     };
 
@@ -491,23 +474,7 @@ optionalAttrs allowAliases aliases
     { }:
     json { }
     // {
-      type =
-        let
-          valueType =
-            oneOf [
-              bool
-              int
-              float
-              str
-              path
-              (attrsOf valueType)
-              (listOf valueType)
-            ]
-            // {
-              description = "TOML value";
-            };
-        in
-        valueType;
+      type = mkStructuredType { typeName = "TOML"; };
 
       generate =
         name: value:
@@ -540,23 +507,7 @@ optionalAttrs allowAliases aliases
     { }:
     json { }
     // {
-      type =
-        let
-          valueType =
-            nullOr (oneOf [
-              bool
-              int
-              float
-              str
-              path
-              (attrsOf valueType)
-              (listOf valueType)
-            ])
-            // {
-              description = "CDN value";
-            };
-        in
-        valueType;
+      type = mkStructuredType { typeName = "CDN"; };
 
       generate =
         name: value:
@@ -971,23 +922,9 @@ optionalAttrs allowAliases aliases
   pythonVars =
     { }:
     {
-      type =
-        let
-          valueType =
-            nullOr (oneOf [
-              bool
-              float
-              int
-              path
-              str
-              (attrsOf valueType)
-              (listOf valueType)
-            ])
-            // {
-              description = "Python value";
-            };
-        in
-        attrsOf valueType;
+      type = attrsOf (mkStructuredType {
+        typeName = "Python";
+      });
 
       lib = {
         mkRaw = value: {
@@ -1067,23 +1004,7 @@ optionalAttrs allowAliases aliases
     }:
     if format == "badgerfish" then
       {
-        type =
-          let
-            valueType =
-              nullOr (oneOf [
-                bool
-                int
-                float
-                str
-                path
-                (attrsOf valueType)
-                (listOf valueType)
-              ])
-              // {
-                description = "XML value";
-              };
-          in
-          valueType;
+        type = mkStructuredType { typeName = "XML"; };
 
         generate =
           name: value:

From bbe152dcfe1c45585a312cf597fc10e6dd3c82fe Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 5 Oct 2025 13:07:29 +0200
Subject: [PATCH 0402/6226] glibcLocales: use substituteInPlace for Makefile
 fix

That way we'll notice if the code changes to examine if this either
needs to be updated or removed.
---
 pkgs/development/libraries/glibc/locales.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix
index bd61f72fc28e..8b1a4df4838f 100644
--- a/pkgs/development/libraries/glibc/locales.nix
+++ b/pkgs/development/libraries/glibc/locales.nix
@@ -54,7 +54,8 @@
           echo 'C.UTF-8/UTF-8 \' >> ../glibc-2*/localedata/SUPPORTED
 
           # Hack to allow building of the locales (needed since glibc-2.12)
-          sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef $(LOCALEDEF_FLAGS),' ../glibc-2*/localedata/Makefile
+          substituteInPlace ../glibc-2*/localedata/Makefile \
+            --replace-fail '$(rtld-prefix) $(common-objpfx)locale/localedef' 'localedef $(LOCALEDEF_FLAGS)'
         ''
         + lib.optionalString (!allLocales) ''
           # Check that all locales to be built are supported

From 9da1bc57fd287a5aa54c39eccb247fded4c6b4f3 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 5 Oct 2025 13:08:33 +0200
Subject: [PATCH 0403/6226] postgresql_{17,18}: fix build

After a recent update of libxml2 the build fails with

    /nix/store/casz7al9kpkg52sn156h6slqijwkybqj-libxml2-2.15.0-bin/bin/xmllint --nonet --path . --path . --output postgres-full.xml --noent --valid postgres.sgml
    ref/pg_combinebackup.sgml:287: validity error : standalone: normalization of attribute linkend on xref by external subset declaration
   state of the cluster using <xref linkend="app-pgchecksums "/> is

Reported in #448752 (not closing on purpose since the issue is actually
about another problem).
---
 pkgs/servers/sql/postgresql/generic.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/servers/sql/postgresql/generic.nix b/pkgs/servers/sql/postgresql/generic.nix
index d07f97e9840c..836b48664aa5 100644
--- a/pkgs/servers/sql/postgresql/generic.nix
+++ b/pkgs/servers/sql/postgresql/generic.nix
@@ -6,6 +6,7 @@ let
       stdenv,
       fetchFromGitHub,
       fetchurl,
+      fetchpatch2,
       lib,
       replaceVars,
       writeShellScriptBin,
@@ -424,6 +425,12 @@ let
       ]
       ++ lib.optionals (stdenv'.hostPlatform.isDarwin && olderThan "16") [
         ./patches/export-dynamic-darwin-15-.patch
+      ]
+      ++ lib.optionals (atLeast "17") [
+        (fetchpatch2 {
+          url = "https://github.com/postgres/postgres/commit/a48d1ef58652229521ba4b5070e19f857608b22e.patch";
+          hash = "sha256-3FKQS1Vpu+p6z6c1GWs6GlrLl2Bgm9paEU/z81LrEus=";
+        })
       ];
 
       installTargets = [ "install-world" ];

From 79d136ae82fc099a44bf158fddbd2dce12354e60 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 5 Oct 2025 09:05:52 +0200
Subject: [PATCH 0404/6226] x42-plugins: remove gtk2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

see: Tracking issue: Remove long end-of-life GTK 2 #410814
---
 pkgs/by-name/x4/x42-plugins/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/x4/x42-plugins/package.nix b/pkgs/by-name/x4/x42-plugins/package.nix
index f235f1babda8..f66107cd786b 100644
--- a/pkgs/by-name/x4/x42-plugins/package.nix
+++ b/pkgs/by-name/x4/x42-plugins/package.nix
@@ -11,7 +11,6 @@
   libjack2,
   libGLU,
   lv2,
-  gtk2,
   cairo,
   pango,
   fftwFloat,
@@ -37,7 +36,6 @@ stdenv.mkDerivation rec {
     libsndfile
     libsamplerate
     lv2
-    gtk2
     cairo
     pango
     fftwFloat

From a22dc98a36aaf7fe31d652d6a12e61d43ee42805 Mon Sep 17 00:00:00 2001
From: sadorowo <me@sador.me>
Date: Sun, 5 Oct 2025 13:17:12 +0000
Subject: [PATCH 0405/6226] invidious: use YAML configuration by default
 (#448476)

---
 nixos/modules/services/web-apps/invidious.nix | 103 +++++++++++-------
 1 file changed, 62 insertions(+), 41 deletions(-)

diff --git a/nixos/modules/services/web-apps/invidious.nix b/nixos/modules/services/web-apps/invidious.nix
index 2b93e942896c..17f3b0940649 100644
--- a/nixos/modules/services/web-apps/invidious.nix
+++ b/nixos/modules/services/web-apps/invidious.nix
@@ -7,11 +7,25 @@
 }:
 let
   cfg = config.services.invidious;
-  # To allow injecting secrets with jq, json (instead of yaml) is used
-  settingsFormat = pkgs.formats.json { };
+  isNew = lib.versionAtLeast config.system.stateVersion "25.11";
+
   inherit (lib) types;
 
-  settingsFile = settingsFormat.generate "invidious-settings" cfg.settings;
+  settingsFormat = pkgs.formats.yaml { };
+  yamlSettingsFile = settingsFormat.generate "invidious-settings" cfg.settings;
+
+  # This needs to stay here for backwards compatibility
+  # with pre-25.11 configs
+  convertSettings = file: lib.escapeShellArg (
+    if isNew then
+      file
+    else
+      pkgs.runCommand "converted-settings.yaml" {
+        nativeBuildInputs = [ pkgs.yq-go ];
+      } ''
+        ${pkgs.yq-go}/bin/yq -o=yaml < ${lib.escapeShellArg file} > $out
+      ''
+  );
 
   generatedHmacKeyFile = "/var/lib/invidious/hmac_key";
   generateHmac = cfg.hmacKeyFile == null;
@@ -59,6 +73,50 @@ let
       RuntimeRandomizedExtraSec = lib.mkDefault "5min";
     };
   };
+
+  configScript = scaleIndex:
+    ''
+      configParts=()
+    ''
+    # autogenerated hmac_key
+    + lib.optionalString generateHmac ''
+      configParts+=("$(${pkgs.jq}/bin/jq -R '{"hmac_key":.}' <"${generatedHmacKeyFile}")")
+    ''
+    # generated settings file
+    + ''
+      configParts+=("$(< ${convertSettings yamlSettingsFile})")
+    ''
+    # optional database password file
+    + lib.optionalString (cfg.database.host != null) ''
+      configParts+=("$(${pkgs.jq}/bin/jq -R '{"db":{"password":.}}' ${cfg.database.passwordFile})")
+    ''
+    # optional extra settings file
+    + lib.optionalString (cfg.extraSettingsFile != null) ''
+      configParts+=("$(< ${convertSettings cfg.extraSettingsFile})")
+    ''
+    # explicitly specified hmac key file
+    + lib.optionalString (cfg.hmacKeyFile != null) ''
+      configParts+=("$(< ${cfg.hmacKeyFile})")
+    ''
+    # configure threads for secondary instances
+    + lib.optionalString (scaleIndex > 0) ''
+      configParts+=('{"channel_threads":0, "feed_threads":0}')
+    ''
+    # configure different ports for the instances
+    + ''
+      configParts+=('{"port":${toString (cfg.port + scaleIndex)}}')
+    ''
+    # merge all parts into a single configuration with later elements overriding previous elements
+    + ''
+      export INVIDIOUS_CONFIG="$(${if isNew then
+        "${pkgs.yq-go}/bin/yq ea '. as $item ireduce ({}; . * $item)'"
+      else
+        "${pkgs.jq}/bin/jq -s 'reduce .[] as $item ({}; . * $item)'"
+      } <<<"''${configParts[*]}")"
+
+      exec ${cfg.package}/bin/invidious
+    '';
+
   mkInvidiousService =
     scaleIndex:
     lib.foldl' lib.recursiveUpdate commonInvidousServiceConfig [
@@ -76,44 +134,7 @@ let
         after = commonInvidousServiceConfig.after ++ [ "invidious.service" ];
         wants = commonInvidousServiceConfig.wants ++ [ "invidious.service" ];
       })
-      {
-        script = ''
-          configParts=()
-        ''
-        # autogenerated hmac_key
-        + lib.optionalString generateHmac ''
-          configParts+=("$(${pkgs.jq}/bin/jq -R '{"hmac_key":.}' <"${generatedHmacKeyFile}")")
-        ''
-        # generated settings file
-        + ''
-          configParts+=("$(< ${lib.escapeShellArg settingsFile})")
-        ''
-        # optional database password file
-        + lib.optionalString (cfg.database.host != null) ''
-          configParts+=("$(${pkgs.jq}/bin/jq -R '{"db":{"password":.}}' ${lib.escapeShellArg cfg.database.passwordFile})")
-        ''
-        # optional extra settings file
-        + lib.optionalString (cfg.extraSettingsFile != null) ''
-          configParts+=("$(< ${lib.escapeShellArg cfg.extraSettingsFile})")
-        ''
-        # explicitly specified hmac key file
-        + lib.optionalString (cfg.hmacKeyFile != null) ''
-          configParts+=("$(< ${lib.escapeShellArg cfg.hmacKeyFile})")
-        ''
-        # configure threads for secondary instances
-        + lib.optionalString (scaleIndex > 0) ''
-          configParts+=('{"channel_threads":0, "feed_threads":0}')
-        ''
-        # configure different ports for the instances
-        + ''
-          configParts+=('{"port":${toString (cfg.port + scaleIndex)}}')
-        ''
-        # merge all parts into a single configuration with later elements overriding previous elements
-        + ''
-          export INVIDIOUS_CONFIG="$(${pkgs.jq}/bin/jq -s 'reduce .[] as $item ({}; . * $item)' <<<"''${configParts[*]}")"
-          exec ${cfg.package}/bin/invidious
-        '';
-      }
+      { script = configScript scaleIndex; }
     ];
 
   serviceConfig = {

From 8fd62521538d361ed5a3c43a4bc152e8091e03ee Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 23:27:20 +0900
Subject: [PATCH 0406/6226] pkgs-lib.formats: move `mkStructuredType` to
 let-block

---
 pkgs/pkgs-lib/formats.nix | 62 +++++++++++++++++++--------------------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index bbafa42f8ae6..25d13d367d99 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -58,6 +58,37 @@ let
     submodule
     ;
 
+  /*
+    Creates a structured value type suitable for serialization formats.
+
+    Parameters:
+    - typeName: String describing the format (e.g. "JSON", "YAML", "XML")
+
+    Returns a type suitable for structured data formats that supports:
+    - Basic types: boolean, integer, float, string, path
+    - Complex types: attribute sets and lists
+  */
+  mkStructuredType =
+    {
+      typeName,
+      nullable ? true,
+    }:
+    let
+      baseType = oneOf [
+        bool
+        int
+        float
+        str
+        path
+        (attrsOf valueType)
+        (listOf valueType)
+      ];
+      valueType = (if nullable then nullOr baseType else baseType) // {
+        description = "${typeName} value";
+      };
+    in
+    valueType;
+
   # Attributes added accidentally in https://github.com/NixOS/nixpkgs/pull/335232 (2024-08-18)
   # Deprecated in https://github.com/NixOS/nixpkgs/pull/415666 (2025-06)
   allowAliases = pkgs.config.allowAliases or false;
@@ -126,37 +157,6 @@ optionalAttrs allowAliases aliases
 
   php = (import ./formats/php/default.nix { inherit lib pkgs; }).format;
 
-  /*
-    Creates a structured value type suitable for serialization formats.
-
-    Parameters:
-    - typeName: String describing the format (e.g. "JSON", "YAML", "XML")
-
-    Returns a type suitable for structured data formats that supports:
-    - Basic types: boolean, integer, float, string, path
-    - Complex types: attribute sets and lists
-  */
-  mkStructuredType =
-    {
-      typeName,
-      nullable ? true,
-    }:
-    let
-      baseType = oneOf [
-        bool
-        int
-        float
-        str
-        path
-        (attrsOf valueType)
-        (listOf valueType)
-      ];
-      valueType = (if nullable then nullOr baseType else baseType) // {
-        description = "${typeName} value";
-      };
-    in
-    valueType;
-
   json =
     { }:
     {

From f2636ab9403a72c98264ffd2f550b5a6e17b95e0 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 23:27:36 +0900
Subject: [PATCH 0407/6226] pkgs-lib.formats: add missing parameter comment for
 `mkStructuredType`

---
 pkgs/pkgs-lib/formats.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/pkgs-lib/formats.nix b/pkgs/pkgs-lib/formats.nix
index 25d13d367d99..740d3f783834 100644
--- a/pkgs/pkgs-lib/formats.nix
+++ b/pkgs/pkgs-lib/formats.nix
@@ -63,6 +63,7 @@ let
 
     Parameters:
     - typeName: String describing the format (e.g. "JSON", "YAML", "XML")
+    - nullable: Whether the structured value type allows `null` values.
 
     Returns a type suitable for structured data formats that supports:
     - Basic types: boolean, integer, float, string, path

From d493d7ecb74eae048d90268b1904e5b1045623a9 Mon Sep 17 00:00:00 2001
From: dramforever <dramforever@live.com>
Date: Sun, 5 Oct 2025 22:21:04 +0800
Subject: [PATCH 0408/6226] qt5.qtdeclarative: Make "RegisterID" patch
 unconditional

The patch was conditional to x86_64-darwin to fix staging-next without
rebuilding too much. Now that the cycle is done, make it unconditional.
---
 pkgs/development/libraries/qt-5/5.15/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 9c34451b9e84..fae48eeea230 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -65,9 +65,6 @@ let
       ./qtdeclarative-default-disable-qmlcache.patch
       # add version specific QML import path
       ./qtdeclarative-qml-paths.patch
-    ]
-    # FIXME: Make unconditional on next staging cycle
-    ++ lib.optionals (stdenv.hostPlatform.isx86_64 && stdenv.hostPlatform.isDarwin) [
       # Fix an undefined behavior, and fix random-seeming build error with Clang. See:
       # - https://codereview.qt-project.org/c/qt/qtdeclarative/+/354847
       # - https://github.com/llvm/llvm-project/issues/74070

From 372b1b3f23c9c522c22a7d890982c7d1020f945e Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Sat, 4 Oct 2025 22:20:48 +0200
Subject: [PATCH 0409/6226] python3Packages.rendercanvas: init at 2.2.1

---
 .../python-modules/rendercanvas/default.nix   | 71 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/development/python-modules/rendercanvas/default.nix

diff --git a/pkgs/development/python-modules/rendercanvas/default.nix b/pkgs/development/python-modules/rendercanvas/default.nix
new file mode 100644
index 000000000000..336bac33a7d8
--- /dev/null
+++ b/pkgs/development/python-modules/rendercanvas/default.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildPythonPackage,
+
+  # build-system
+  flit-core,
+
+  # dependencies
+  sniffio,
+
+  # nativeCheckInputs
+  pytestCheckHook,
+  imageio,
+  glfw,
+  numpy,
+  trio,
+  wgpu-py,
+
+  nix-update-script,
+}:
+buildPythonPackage rec {
+  pname = "rendercanvas";
+  version = "2.2.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pygfx";
+    repo = "rendercanvas";
+    tag = "v${version}";
+    hash = "sha256-6vvPIu+Zi+9ndcWHP43X0Qd+XCO7+tr8XCFm+bwCazE=";
+  };
+
+  postPatch = ''
+    rm -r rendercanvas/__pyinstaller
+  '';
+
+  build-system = [ flit-core ];
+
+  dependencies = [ sniffio ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    glfw
+    imageio
+    numpy
+    trio
+    # break circular dependency cycle
+    (wgpu-py.overrideAttrs { doInstallCheck = false; })
+  ];
+
+  # flaky timing and / or interrupt based tests
+  disabledTests = [ "test_offscreen_event_loop" ];
+  disabledTestPaths = [
+    "tests/test_loop.py"
+    "tests/test_scheduling.py"
+  ];
+
+  pythonImportsCheck = [ "rendercanvas" ];
+
+  meta = {
+    description = "One canvas API, multiple backends";
+    homepage = "https://github.com/pygfx/rendercanvas";
+    changelog = "https://github.com/pygfx/rendercanvas/releases/tag/${src.tag}";
+
+    platforms = lib.platforms.all;
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.bengsparks ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6e3aefcf48cf..32d6293de63a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15841,6 +15841,8 @@ self: super: with self; {
 
   rencode = callPackage ../development/python-modules/rencode { };
 
+  rendercanvas = callPackage ../development/python-modules/rendercanvas { };
+
   rendercv-fonts = callPackage ../development/python-modules/rendercv-fonts { };
 
   reno = callPackage ../development/python-modules/reno { };

From 59f3789f45371fe301fd6c3bea2a93cb15c87729 Mon Sep 17 00:00:00 2001
From: Franek <me@sador.me>
Date: Sun, 5 Oct 2025 17:36:58 +0200
Subject: [PATCH 0410/6226] chore: reformat and fix typo

---
 nixos/modules/services/web-apps/invidious.nix | 44 +++++++++++--------
 1 file changed, 25 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/web-apps/invidious.nix b/nixos/modules/services/web-apps/invidious.nix
index 17f3b0940649..f028e40a5008 100644
--- a/nixos/modules/services/web-apps/invidious.nix
+++ b/nixos/modules/services/web-apps/invidious.nix
@@ -16,21 +16,25 @@ let
 
   # This needs to stay here for backwards compatibility
   # with pre-25.11 configs
-  convertSettings = file: lib.escapeShellArg (
-    if isNew then
-      file
-    else
-      pkgs.runCommand "converted-settings.yaml" {
-        nativeBuildInputs = [ pkgs.yq-go ];
-      } ''
-        ${pkgs.yq-go}/bin/yq -o=yaml < ${lib.escapeShellArg file} > $out
-      ''
-  );
+  convertSettings =
+    file:
+    lib.escapeShellArg (
+      if isNew then
+        file
+      else
+        pkgs.runCommand "converted-settings.yaml"
+          {
+            nativeBuildInputs = [ pkgs.yq-go ];
+          }
+          ''
+          ${pkgs.yq-go}/bin/yq -o=yaml < ${lib.escapeShellArg file} > $out
+          ''
+    );
 
   generatedHmacKeyFile = "/var/lib/invidious/hmac_key";
   generateHmac = cfg.hmacKeyFile == null;
 
-  commonInvidousServiceConfig = {
+  commonInvidiousServiceConfig = {
     description = "Invidious (An alternative YouTube front-end)";
     wants = [ "network-online.target" ];
     after = [ "network-online.target" ] ++ lib.optional cfg.database.createLocally "postgresql.target";
@@ -74,7 +78,8 @@ let
     };
   };
 
-  configScript = scaleIndex:
+  configScript =
+    scaleIndex:
     ''
       configParts=()
     ''
@@ -108,10 +113,11 @@ let
     ''
     # merge all parts into a single configuration with later elements overriding previous elements
     + ''
-      export INVIDIOUS_CONFIG="$(${if isNew then
-        "${pkgs.yq-go}/bin/yq ea '. as $item ireduce ({}; . * $item)'"
-      else
-        "${pkgs.jq}/bin/jq -s 'reduce .[] as $item ({}; . * $item)'"
+      export INVIDIOUS_CONFIG="$(${
+        if isNew then
+          "${pkgs.yq-go}/bin/yq ea '. as $item ireduce ({}; . * $item)'"
+        else
+          "${pkgs.jq}/bin/jq -s 'reduce .[] as $item ({}; . * $item)'"
       } <<<"''${configParts[*]}")"
 
       exec ${cfg.package}/bin/invidious
@@ -119,7 +125,7 @@ let
 
   mkInvidiousService =
     scaleIndex:
-    lib.foldl' lib.recursiveUpdate commonInvidousServiceConfig [
+    lib.foldl' lib.recursiveUpdate commonInvidiousServiceConfig [
       # only generate the hmac file in the first service
       (lib.optionalAttrs (scaleIndex == 0) {
         preStart = lib.optionalString generateHmac ''
@@ -131,8 +137,8 @@ let
       })
       # configure the secondary services to run after the first service
       (lib.optionalAttrs (scaleIndex > 0) {
-        after = commonInvidousServiceConfig.after ++ [ "invidious.service" ];
-        wants = commonInvidousServiceConfig.wants ++ [ "invidious.service" ];
+        after = commonInvidiousServiceConfig.after ++ [ "invidious.service" ];
+        wants = commonInvidiousServiceConfig.wants ++ [ "invidious.service" ];
       })
       { script = configScript scaleIndex; }
     ];

From 3fd6717c2207fd9cae2049c634432e3bbaf1e06c Mon Sep 17 00:00:00 2001
From: Franek <me@sador.me>
Date: Sun, 5 Oct 2025 17:41:05 +0200
Subject: [PATCH 0411/6226] chore: reformat file properly

---
 nixos/modules/services/web-apps/invidious.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/invidious.nix b/nixos/modules/services/web-apps/invidious.nix
index f028e40a5008..0261f3c06b8b 100644
--- a/nixos/modules/services/web-apps/invidious.nix
+++ b/nixos/modules/services/web-apps/invidious.nix
@@ -27,7 +27,7 @@ let
             nativeBuildInputs = [ pkgs.yq-go ];
           }
           ''
-          ${pkgs.yq-go}/bin/yq -o=yaml < ${lib.escapeShellArg file} > $out
+            ${pkgs.yq-go}/bin/yq -o=yaml < ${lib.escapeShellArg file} > $out
           ''
     );
 

From 0f184e75b2d48084b8094cc888c10ced87fe0de8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Oct 2025 16:57:31 +0000
Subject: [PATCH 0412/6226] altair: 8.2.5 -> 8.3.0

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

diff --git a/pkgs/by-name/al/altair/package.nix b/pkgs/by-name/al/altair/package.nix
index e36add0cc407..42fa7a0d2381 100644
--- a/pkgs/by-name/al/altair/package.nix
+++ b/pkgs/by-name/al/altair/package.nix
@@ -7,11 +7,11 @@
 
 let
   pname = "altair";
-  version = "8.2.5";
+  version = "8.3.0";
 
   src = fetchurl {
     url = "https://github.com/imolorhe/altair/releases/download/v${version}/altair_${version}_x86_64_linux.AppImage";
-    sha256 = "sha256-P0CVJFafrsvWzDWyJZEds812m3yUDpo4eocysEIQqrw=";
+    sha256 = "sha256-uLqtrF5WWJ5+6bN/h4u/vdvTlbQtZID1osujfuJad4U=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };

From e9b91d0f2dc4da2556525632838d395193d06db6 Mon Sep 17 00:00:00 2001
From: Franek <me@sador.me>
Date: Sun, 5 Oct 2025 19:27:48 +0200
Subject: [PATCH 0413/6226] fix: use JSON and then convert to YAML for
 backwards compatibility

---
 nixos/modules/services/web-apps/invidious.nix | 36 +++++--------------
 1 file changed, 9 insertions(+), 27 deletions(-)

diff --git a/nixos/modules/services/web-apps/invidious.nix b/nixos/modules/services/web-apps/invidious.nix
index 0261f3c06b8b..83f41602a670 100644
--- a/nixos/modules/services/web-apps/invidious.nix
+++ b/nixos/modules/services/web-apps/invidious.nix
@@ -11,25 +11,11 @@ let
 
   inherit (lib) types;
 
-  settingsFormat = pkgs.formats.yaml { };
-  yamlSettingsFile = settingsFormat.generate "invidious-settings" cfg.settings;
-
-  # This needs to stay here for backwards compatibility
-  # with pre-25.11 configs
-  convertSettings =
-    file:
-    lib.escapeShellArg (
-      if isNew then
-        file
-      else
-        pkgs.runCommand "converted-settings.yaml"
-          {
-            nativeBuildInputs = [ pkgs.yq-go ];
-          }
-          ''
-            ${pkgs.yq-go}/bin/yq -o=yaml < ${lib.escapeShellArg file} > $out
-          ''
-    );
+  # This need to be JSON to reduce number of
+  # breaking changes, for backwards
+  # compatibility with pre-25.11
+  settingsFormat = pkgs.formats.json { };
+  settingsFile = settingsFormat.generate "invidious-settings" cfg.settings;
 
   generatedHmacKeyFile = "/var/lib/invidious/hmac_key";
   generateHmac = cfg.hmacKeyFile == null;
@@ -89,7 +75,7 @@ let
     ''
     # generated settings file
     + ''
-      configParts+=("$(< ${convertSettings yamlSettingsFile})")
+      configParts+=("$(< ${settingsFile})")
     ''
     # optional database password file
     + lib.optionalString (cfg.database.host != null) ''
@@ -97,7 +83,7 @@ let
     ''
     # optional extra settings file
     + lib.optionalString (cfg.extraSettingsFile != null) ''
-      configParts+=("$(< ${convertSettings cfg.extraSettingsFile})")
+      configParts+=("$(< ${cfg.extraSettingsFile})")
     ''
     # explicitly specified hmac key file
     + lib.optionalString (cfg.hmacKeyFile != null) ''
@@ -113,12 +99,8 @@ let
     ''
     # merge all parts into a single configuration with later elements overriding previous elements
     + ''
-      export INVIDIOUS_CONFIG="$(${
-        if isNew then
-          "${pkgs.yq-go}/bin/yq ea '. as $item ireduce ({}; . * $item)'"
-        else
-          "${pkgs.jq}/bin/jq -s 'reduce .[] as $item ({}; . * $item)'"
-      } <<<"''${configParts[*]}")"
+      mergedConfig="$(${pkgs.jq}/bin/jq -s 'reduce .[] as $item ({}; . * $item)' <<<"''${configParts[*]}")"
+      export INVIDIOUS_CONFIG=$(echo "$mergedConfig" | ${pkgs.yq-go}/bin/yq -P)
 
       exec ${cfg.package}/bin/invidious
     '';

From 3e5de98fc82f319cccba2371f3647ea89e6cf98e Mon Sep 17 00:00:00 2001
From: Franek <me@sador.me>
Date: Sun, 5 Oct 2025 19:29:53 +0200
Subject: [PATCH 0414/6226] chore: remove dead code

---
 nixos/modules/services/web-apps/invidious.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/invidious.nix b/nixos/modules/services/web-apps/invidious.nix
index 83f41602a670..126dd1fab506 100644
--- a/nixos/modules/services/web-apps/invidious.nix
+++ b/nixos/modules/services/web-apps/invidious.nix
@@ -7,7 +7,6 @@
 }:
 let
   cfg = config.services.invidious;
-  isNew = lib.versionAtLeast config.system.stateVersion "25.11";
 
   inherit (lib) types;
 

From c718169b9e1680829c50e4ed9e8a10e70ac65b2b Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 5 Oct 2025 19:34:03 +0200
Subject: [PATCH 0415/6226] qgit: 2.11 -> 2.12

---
 .../version-management/qgit/default.nix       | 22 +++++++++++++------
 pkgs/top-level/all-packages.nix               |  2 +-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/version-management/qgit/default.nix b/pkgs/applications/version-management/qgit/default.nix
index 444adfbdab90..9955932b340a 100644
--- a/pkgs/applications/version-management/qgit/default.nix
+++ b/pkgs/applications/version-management/qgit/default.nix
@@ -1,25 +1,33 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
   cmake,
   qtbase,
+  qt5compat,
+  wrapQtAppsHook,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "qgit";
-  version = "2.11";
+  version = "2.12";
 
   src = fetchFromGitHub {
     owner = "tibirna";
     repo = "qgit";
-    rev = "${pname}-${version}";
-    sha256 = "sha256-DmwxOy71mIklLQ7V/qMzi8qCMtKa9nWHlkjEr/9HJIU=";
+    rev = "qgit-${version}";
+    hash = "sha256-q81nY9D/8riMTFP8gDRbY2PjVo+NwRu/XEN1Yn0P/pk=";
   };
 
-  buildInputs = [ qtbase ];
+  buildInputs = [
+    qtbase
+    qt5compat
+  ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    wrapQtAppsHook
+  ];
 
   meta = with lib; {
     license = licenses.gpl2Only;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba932e007ef6..f6c6376cb551 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1261,7 +1261,7 @@ with pkgs;
     python3Packages.callPackage ../applications/version-management/pass-git-helper
       { };
 
-  qgit = qt5.callPackage ../applications/version-management/qgit { };
+  qgit = qt6Packages.callPackage ../applications/version-management/qgit { };
 
   silver-platter = python3Packages.callPackage ../applications/version-management/silver-platter { };
 

From d36ea036bee6d2ae01b55e0571c17b9f155e178e Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Sun, 5 Oct 2025 19:35:25 +0200
Subject: [PATCH 0416/6226] qgit: refactor, cleanup

---
 .../version-management/qgit/default.nix       | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/version-management/qgit/default.nix b/pkgs/applications/version-management/qgit/default.nix
index 9955932b340a..cc946a3e78d1 100644
--- a/pkgs/applications/version-management/qgit/default.nix
+++ b/pkgs/applications/version-management/qgit/default.nix
@@ -8,36 +8,36 @@
   wrapQtAppsHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qgit";
   version = "2.12";
 
   src = fetchFromGitHub {
     owner = "tibirna";
     repo = "qgit";
-    rev = "qgit-${version}";
+    rev = "qgit-${finalAttrs.version}";
     hash = "sha256-q81nY9D/8riMTFP8gDRbY2PjVo+NwRu/XEN1Yn0P/pk=";
   };
 
-  buildInputs = [
-    qtbase
-    qt5compat
-  ];
-
   nativeBuildInputs = [
     cmake
     wrapQtAppsHook
   ];
 
-  meta = with lib; {
-    license = licenses.gpl2Only;
+  buildInputs = [
+    qtbase
+    qt5compat
+  ];
+
+  meta = {
+    license = lib.licenses.gpl2Only;
     homepage = "https://github.com/tibirna/qgit";
     description = "Graphical front-end to Git";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       peterhoeg
       markuskowa
     ];
     inherit (qtbase.meta) platforms;
     mainProgram = "qgit";
   };
-}
+})

From cfb771c8a5a7b13e3d4f0ea48ca155d100c3e687 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 5 Oct 2025 13:14:36 +0200
Subject: [PATCH 0417/6226] glibcLocales: remove builder

There's no particular reason to have a special builder. Fold all the
changes it made into the derivation.
---
 .../libraries/glibc/locales-builder.sh        | 15 -------------
 pkgs/development/libraries/glibc/locales.nix  | 22 ++++++++++++++-----
 2 files changed, 17 insertions(+), 20 deletions(-)
 delete mode 100644 pkgs/development/libraries/glibc/locales-builder.sh

diff --git a/pkgs/development/libraries/glibc/locales-builder.sh b/pkgs/development/libraries/glibc/locales-builder.sh
deleted file mode 100644
index 6f10476f1089..000000000000
--- a/pkgs/development/libraries/glibc/locales-builder.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-# Glibc cannot have itself in its RPATH.
-export NIX_NO_SELF_RPATH=1
-
-postConfigure() {
-    # Hack: get rid of the `-static' flag set by the bootstrap stdenv.
-    # This has to be done *after* `configure' because it builds some
-    # test binaries.
-    export NIX_CFLAGS_LINK=
-    export NIX_LDFLAGS_BEFORE=
-
-    export NIX_DONT_SET_RPATH=1
-    unset CFLAGS
-}
-
-genericBuild
diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix
index 8b1a4df4838f..e8c5565ab30a 100644
--- a/pkgs/development/libraries/glibc/locales.nix
+++ b/pkgs/development/libraries/glibc/locales.nix
@@ -31,13 +31,25 @@
   (
     finalAttrs: previousAttrs: {
 
-      builder = ./locales-builder.sh;
-
       outputs = [ "out" ];
 
-      LOCALEDEF_FLAGS = [
-        (if stdenv.hostPlatform.isLittleEndian then "--little-endian" else "--big-endian")
-      ];
+      env = (previousAttrs.env or { }) // {
+        LOCALEDEF_FLAGS = if stdenv.hostPlatform.isLittleEndian then "--little-endian" else "--big-endian";
+
+        # Glibc cannot have itself in its RPATH.
+        NIX_NO_SELF_RPATH = 1;
+      };
+
+      postConfigure = (previousAttrs.postConfigure or "") + ''
+        # Hack: get rid of the `-static' flag set by the bootstrap stdenv.
+        # This has to be done *after* `configure' because it builds some
+        # test binaries.
+        export NIX_CFLAGS_LINK=
+        export NIX_LDFLAGS_BEFORE=
+
+        export NIX_DONT_SET_RPATH=1
+        unset CFLAGS
+      '';
 
       preBuild =
         (previousAttrs.preBuild or "")

From 700d7ec879f4bce893aa14e0ba880ed99fe1fb29 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 5 Oct 2025 13:17:27 +0200
Subject: [PATCH 0418/6226] glibcLocales: re-enable parallel build

This was originally turned off in #245360 because the approach was
non-reproducible, i.e. all N concurrent jobs were racing to update
`locale-archive`.

glibc's localedef allows to separate the build from the install, i.e.
`localedef --no-archive` allows to only perform the build of the locale
which can be parallelized again. After that, a single process adds all
newly built locales into the archive.

This isn't supported by the Makefiles in upstream glibc yet[1], hence
the additional patches.

For me, this reduces the build-time of `pkgs.glibcLocales` from ~7min to
slightly under 1min.

[1] https://sourceware.org/pipermail/libc-alpha/2025-October/170803.html
---
 ...-reproducible-parallel-install-of-lo.patch | 50 +++++++++++++++++++
 ...-make-inst_complocaledir-overridable.patch | 42 ++++++++++++++++
 pkgs/development/libraries/glibc/common.nix   |  4 ++
 pkgs/development/libraries/glibc/locales.nix  |  9 +---
 4 files changed, 98 insertions(+), 7 deletions(-)
 create mode 100644 pkgs/development/libraries/glibc/0001-localedata-allow-reproducible-parallel-install-of-lo.patch
 create mode 100644 pkgs/development/libraries/glibc/0002-Makeconfig-make-inst_complocaledir-overridable.patch

diff --git a/pkgs/development/libraries/glibc/0001-localedata-allow-reproducible-parallel-install-of-lo.patch b/pkgs/development/libraries/glibc/0001-localedata-allow-reproducible-parallel-install-of-lo.patch
new file mode 100644
index 000000000000..276e9cc0bf32
--- /dev/null
+++ b/pkgs/development/libraries/glibc/0001-localedata-allow-reproducible-parallel-install-of-lo.patch
@@ -0,0 +1,50 @@
+From 38e9742ed794febbc8caa4177df14d097607a2d9 Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Sun, 5 Oct 2025 12:45:25 +0200
+Subject: [PATCH 1/2] localedata: allow reproducible & parallel install of
+ locale-archive
+
+The problem with the current approach is that N processes are compiling
+a locale and updating the locale-archive at the same time. Hence,
+there's a race which process gets to update the archive first and thus
+the build is not reproducible[1].
+
+This patch changes that by adding the `--no-archive` flag to the
+`$(LOCALEDEF)` invocation in `build-one-locale` to parallelize the build
+process in a race-free manner. A single `localedef --add-to-archive`
+then adds all previously built locales to the archive.
+
+[1] https://github.com/NixOS/nixpkgs/issues/245360
+---
+ localedata/Makefile | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/localedata/Makefile b/localedata/Makefile
+index 01b32348d4..13f7d3a2c4 100644
+--- a/localedata/Makefile
++++ b/localedata/Makefile
+@@ -538,8 +538,13 @@ LOCALEDEF=I18NPATH=. GCONV_PATH=$(common-objpfx)iconvdata LC_ALL=C \
+ $(rtld-prefix) $(common-objpfx)locale/localedef
+ install-locales: install-locale-archive
+ 
++define install-all-locales
++  $(LOCALEDEF) $$flags --add-to-archive `find $(inst_complocaledir) -maxdepth 1 -mindepth 1 -type d | sort`
++endef
++
+ # Create and install the locale-archive file.
+ install-locale-archive: $(INSTALL-SUPPORTED-LOCALE-ARCHIVE)
++	$(install-all-locales)
+ # Create and install the locales individually (no archive).
+ install-locale-files: $(INSTALL-SUPPORTED-LOCALE-FILES)
+ 
+@@ -565,6 +570,7 @@ define build-one-locale
+ 	$(LOCALEDEF) $$flags --alias-file=../intl/locale.alias \
+ 		     -i locales/$$input -f charmaps/$$charset \
+ 		     $(addprefix --prefix=,$(install_root)) $$locale \
++		     --no-archive \
+ 	&& echo ' done';
+ endef
+ 
+-- 
+2.50.1
+
diff --git a/pkgs/development/libraries/glibc/0002-Makeconfig-make-inst_complocaledir-overridable.patch b/pkgs/development/libraries/glibc/0002-Makeconfig-make-inst_complocaledir-overridable.patch
new file mode 100644
index 000000000000..c727912a6d84
--- /dev/null
+++ b/pkgs/development/libraries/glibc/0002-Makeconfig-make-inst_complocaledir-overridable.patch
@@ -0,0 +1,42 @@
+From 887cb6906afa2b2d8abf35ccfc33ce7b8dc902f8 Mon Sep 17 00:00:00 2001
+From: Maximilian Bosch <maximilian@mbosch.me>
+Date: Sun, 5 Oct 2025 12:48:43 +0200
+Subject: [PATCH 2/2] Makeconfig: make inst_complocaledir overridable
+
+On NixOS, we build the locales in a separate package from glibc itself.
+Also, packages aren't installed into a common location such as `/usr`,
+but each package has its own unique prefix below `/nix/store`.
+
+For us, the current state is a problem because `localedef` is built
+in a different package and expects DESTDIR to be the unique
+package-prefix of `glibc` itself. Our current workaround is to
+invoke `localedef` with `--prefix=$TMPDIR` and copy the contents
+to the correct prefix. This was doable without patching when
+`localedef` was doing build & locale-archive creation at the
+same time.
+
+With the previous patch, the Makefile uses `$(inst_complocaledir)` to
+tell localedef where the previously built locales are. In NixOS, we now
+need to override `$(inst_complocaledir)` to point to
+`$TMPDIR/$(glibc.out)`. Hence, this patch makes the variable overridable
+from env.
+---
+ Makeconfig | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makeconfig b/Makeconfig
+index 9eda4fa528..43d88325bc 100644
+--- a/Makeconfig
++++ b/Makeconfig
+@@ -197,7 +197,7 @@ inst_zonedir = $(install_root)$(zonedir)
+ ifndef complocaledir
+ complocaledir = $(libdir)/locale
+ endif
+-inst_complocaledir = $(install_root)$(complocaledir)
++inst_complocaledir ?= $(install_root)$(complocaledir)
+ 
+ # Where to install the message catalog data files (which are
+ # machine-independent).
+-- 
+2.50.1
+
diff --git a/pkgs/development/libraries/glibc/common.nix b/pkgs/development/libraries/glibc/common.nix
index a35e5085f87c..5293c6579c5d 100644
--- a/pkgs/development/libraries/glibc/common.nix
+++ b/pkgs/development/libraries/glibc/common.nix
@@ -111,6 +111,10 @@ stdenv.mkDerivation (
         & https://github.com/NixOS/nixpkgs/pull/188492#issuecomment-1233802991
       */
       ./reenable_DT_HASH.patch
+
+      # enable parallel & reproducible build of glibcLocales
+      ./0001-localedata-allow-reproducible-parallel-install-of-lo.patch
+      ./0002-Makeconfig-make-inst_complocaledir-overridable.patch
     ]
     /*
       NVCC does not support ARM intrinsics. Since <math.h> is pulled in by almost
diff --git a/pkgs/development/libraries/glibc/locales.nix b/pkgs/development/libraries/glibc/locales.nix
index e8c5565ab30a..98f04f22dbcd 100644
--- a/pkgs/development/libraries/glibc/locales.nix
+++ b/pkgs/development/libraries/glibc/locales.nix
@@ -61,7 +61,8 @@
           # $TMPDIR/nix/store/...-glibc-.../lib/locale/locale-archive.
           LOCALEDEF_FLAGS+=" --prefix=$TMPDIR"
 
-          mkdir -p $TMPDIR/"${buildPackages.glibc.out}/lib/locale"
+          export inst_complocaledir="$TMPDIR/"${buildPackages.glibc.out}/lib/locale
+          mkdir -p "$inst_complocaledir"
 
           echo 'C.UTF-8/UTF-8 \' >> ../glibc-2*/localedata/SUPPORTED
 
@@ -88,12 +89,6 @@
           echo SUPPORTED-LOCALES='${toString locales}' > ../glibc-2*/localedata/SUPPORTED
         '';
 
-      # Current `nixpkgs` way of building locales is not compatible with
-      # parallel install. `locale-archive` is updated in parallel with
-      # multiple `localedef` processes and causes non-deterministic result:
-      #   https://github.com/NixOS/nixpkgs/issues/245360
-      enableParallelBuilding = false;
-
       makeFlags = (previousAttrs.makeFlags or [ ]) ++ [
         "localedata/install-locales"
         "localedir=${placeholder "out"}/lib/locale"

From f65d25cd1cc4bef52855259abb3c1a3a2b3ab2b4 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Fri, 26 Sep 2025 22:26:16 -0400
Subject: [PATCH 0419/6226] python3Packages.cryptography: 45.0.4 -> 46.0.1;
 adopt

Diff: https://github.com/pyca/cryptography/compare/refs/tags/45.0.4...refs/tags/46.0.1

Changelog: https://cryptography.io/en/latest/changelog/#v46-0-1
---
 .../python-modules/cryptography/default.nix           | 11 +++++++----
 .../python-modules/cryptography/vectors.nix           | 11 +++++++----
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index 074a18526902..ff97aec223ad 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "cryptography";
-  version = "45.0.4"; # Also update the hash in vectors.nix
+  version = "46.0.1"; # Also update the hash in vectors.nix
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -31,12 +31,12 @@ buildPythonPackage rec {
     owner = "pyca";
     repo = "cryptography";
     tag = version;
-    hash = "sha256-rKgMUVj5IdeWIdLWQ4E6zhC6dwJMi+BRHCh2JG73Zgc=";
+    hash = "sha256-saTHFKSJa9gjtEp6uGAHsvzFE3yPeck1WGdIE1+9kgs=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-dKwNnWBzBM9QEcRbbvkNhFJnFxFakqZ/MS7rqE8/tNQ=";
+    hash = "sha256-aCQzY2gBjVVwiqlqAxkH4y6yf4lqdQuSEnQSIjLPRJg=";
   };
 
   postPatch = ''
@@ -98,6 +98,9 @@ buildPythonPackage rec {
       bsd3
       psfl
     ];
-    maintainers = with maintainers; [ SuperSandro2000 ];
+    maintainers = with maintainers; [
+      SuperSandro2000
+      mdaniels5757
+    ];
   };
 }
diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix
index 73e4f2c75f70..9b962a886784 100644
--- a/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/pkgs/development/python-modules/cryptography/vectors.nix
@@ -3,7 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   cryptography,
-  flit-core,
+  uv-build,
 }:
 
 buildPythonPackage rec {
@@ -15,10 +15,10 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "cryptography_vectors";
     inherit version;
-    hash = "sha256-+7BAjfj/LSs9vSkovFt/7r/dNvsJL6h5DVd4qbmh+e8=";
+    hash = "sha256-B40Sh84rRdJGtCxs+545Dh96+hdsGZsL1t6p1s6Jou4=";
   };
 
-  build-system = [ flit-core ];
+  build-system = [ uv-build ];
 
   # No tests included
   doCheck = false;
@@ -33,6 +33,9 @@ buildPythonPackage rec {
       asl20
       bsd3
     ];
-    maintainers = with maintainers; [ SuperSandro2000 ];
+    maintainers = with maintainers; [
+      SuperSandro2000
+      mdaniels5757
+    ];
   };
 }

From 0c6b081e66c17c90b65369c099073f47b22a4714 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 28 Sep 2025 09:41:43 -0400
Subject: [PATCH 0420/6226] python3Packages.cryptography: remove
 SuperSandro2000 as maintainer

Per their request: https://github.com/NixOS/nixpkgs/pull/446515#discussion_r2385813367
---
 pkgs/development/python-modules/cryptography/default.nix | 5 +----
 pkgs/development/python-modules/cryptography/vectors.nix | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/cryptography/default.nix b/pkgs/development/python-modules/cryptography/default.nix
index ff97aec223ad..11f6406d4238 100644
--- a/pkgs/development/python-modules/cryptography/default.nix
+++ b/pkgs/development/python-modules/cryptography/default.nix
@@ -98,9 +98,6 @@ buildPythonPackage rec {
       bsd3
       psfl
     ];
-    maintainers = with maintainers; [
-      SuperSandro2000
-      mdaniels5757
-    ];
+    maintainers = with maintainers; [ mdaniels5757 ];
   };
 }
diff --git a/pkgs/development/python-modules/cryptography/vectors.nix b/pkgs/development/python-modules/cryptography/vectors.nix
index 9b962a886784..0a9a1a5d5894 100644
--- a/pkgs/development/python-modules/cryptography/vectors.nix
+++ b/pkgs/development/python-modules/cryptography/vectors.nix
@@ -33,9 +33,6 @@ buildPythonPackage rec {
       asl20
       bsd3
     ];
-    maintainers = with maintainers; [
-      SuperSandro2000
-      mdaniels5757
-    ];
+    maintainers = with maintainers; [ mdaniels5757 ];
   };
 }

From 0c356b913f4116c72c81283586d3cba09e24a62a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 5 Oct 2025 22:20:47 +0000
Subject: [PATCH 0421/6226] argocd-autopilot: 0.4.19 -> 0.4.20

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

diff --git a/pkgs/by-name/ar/argocd-autopilot/package.nix b/pkgs/by-name/ar/argocd-autopilot/package.nix
index 3121f2648aa1..6a4ff5e379b7 100644
--- a/pkgs/by-name/ar/argocd-autopilot/package.nix
+++ b/pkgs/by-name/ar/argocd-autopilot/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "argocd-autopilot";
-  version = "0.4.19";
+  version = "0.4.20";
 
   src = fetchFromGitHub {
     owner = "argoproj-labs";
     repo = "argocd-autopilot";
     rev = "v${version}";
-    sha256 = "sha256-ZJVlmZX/eQnOM2mlAe7DOyvykjgi5DHMqHoPAHPZlXM=";
+    sha256 = "sha256-JLh41ZWiDcDrUtd8d+Ak5TFca4L6VHzUguS55P9lmj0=";
   };
 
-  vendorHash = "sha256-GzSkA8JO0LEVeGIRKkr1Ff1P8WhNIEvRmry91agYJRo=";
+  vendorHash = "sha256-Ur0BfIg4lZakjx01UOL4n5/O1yjTJJcGuDxWVDqUOyY=";
 
   proxyVendor = true;
 

From 55c1dc7eb4464b948f63131f47d30941b6c2a8f7 Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 6 Oct 2025 03:49:09 +0000
Subject: [PATCH 0422/6226] wvkbd: remove unnecessary `PKG_CONFIG` patch

upstream Makefile reads `PKG_CONFIG` from the environment,
we don't need any extra patching for it to be found.

<https://github.com/jjsullivan5196/wvkbd/blob/ed702f956216b5c638121763687ac5aa305bfba0/Makefile#L13>
---
 pkgs/by-name/wv/wvkbd/package.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/by-name/wv/wvkbd/package.nix b/pkgs/by-name/wv/wvkbd/package.nix
index 8977315072c0..98b86183f38e 100644
--- a/pkgs/by-name/wv/wvkbd/package.nix
+++ b/pkgs/by-name/wv/wvkbd/package.nix
@@ -24,11 +24,6 @@ stdenv.mkDerivation rec {
     hash = "sha256-RfZbPAaf8UB4scUZ9XSL12QZ4UkYMzXqfmNt9ObOgQ0=";
   };
 
-  postPatch = ''
-    substituteInPlace Makefile \
-      --replace-fail "pkg-config" "$PKG_CONFIG"
-  '';
-
   nativeBuildInputs = [
     pkg-config
     scdoc

From 732ed2c2b8e36bc88c30e5c3120c2b3c50d3e22b Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Mon, 6 Oct 2025 03:55:33 +0000
Subject: [PATCH 0423/6226] wvkbd: add colinsane as maintainer

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

diff --git a/pkgs/by-name/wv/wvkbd/package.nix b/pkgs/by-name/wv/wvkbd/package.nix
index 98b86183f38e..91701392b304 100644
--- a/pkgs/by-name/wv/wvkbd/package.nix
+++ b/pkgs/by-name/wv/wvkbd/package.nix
@@ -47,5 +47,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.gpl3Plus;
     mainProgram = "wvkbd-mobintl";
+    maintainers = with lib.maintainers; [ colinsane ];
   };
 }

From d5db8235741ed4aae160f405e152243c907166d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Oct 2025 05:01:08 +0000
Subject: [PATCH 0424/6226] ogen: 1.14.0 -> 1.16.0

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

diff --git a/pkgs/by-name/og/ogen/package.nix b/pkgs/by-name/og/ogen/package.nix
index e31e52fe3db8..d467070f7ec6 100644
--- a/pkgs/by-name/og/ogen/package.nix
+++ b/pkgs/by-name/og/ogen/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "ogen";
-  version = "1.14.0";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "ogen-go";
     repo = "ogen";
     tag = "v${version}";
-    hash = "sha256-w3h65MNXBgsH8PCHfoPqY+XNI6TMbLUAMI4Y3WWLEJM=";
+    hash = "sha256-rZO6jdOzdayXnEEWxNE9gKkt0coi8pNfq+LT8JC8LiQ=";
   };
 
-  vendorHash = "sha256-PQ2ZrigS9jZY1oL3Dsuc2RZwedZLzLKUqhMYfWiZ854=";
+  vendorHash = "sha256-mL3xw0huTyLz33ja59/mJ+R2+KRIFOfKRUPrk5txJtA=";
 
   patches = [ ./modify-version-handling.patch ];
 

From 6fe0bb189ff708e5bff9c3d7964d8dcebbe119c7 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 5 Oct 2025 22:36:28 -0700
Subject: [PATCH 0425/6226] util-linux: 2.41.1 -> 2.41.2

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

diff --git a/pkgs/by-name/ut/util-linux/package.nix b/pkgs/by-name/ut/util-linux/package.nix
index 70303a99050e..ac034405d500 100644
--- a/pkgs/by-name/ut/util-linux/package.nix
+++ b/pkgs/by-name/ut/util-linux/package.nix
@@ -41,11 +41,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "util-linux" + lib.optionalString isMinimal "-minimal";
-  version = "2.41.1";
+  version = "2.41.2";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/util-linux/v${lib.versions.majorMinor finalAttrs.version}/util-linux-${finalAttrs.version}.tar.xz";
-    hash = "sha256-vprZonb0MFq33S9SJci+H/VDUvVl/03t6WKMGqp97Fc=";
+    hash = "sha256-YGKh2JtXGmGTLm/AIR82BgxBg1aLge6GbPNjvOn2WD4=";
   };
 
   patches = [

From 4fa721ac4e789e5b5dcd8df75318738443e96017 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Oct 2025 08:19:37 +0000
Subject: [PATCH 0426/6226] hayagriva: 0.8.1 -> 0.9.1

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

diff --git a/pkgs/by-name/ha/hayagriva/package.nix b/pkgs/by-name/ha/hayagriva/package.nix
index 527f274affa1..3a7bad181bcf 100644
--- a/pkgs/by-name/ha/hayagriva/package.nix
+++ b/pkgs/by-name/ha/hayagriva/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "hayagriva";
-  version = "0.8.1";
+  version = "0.9.1";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-JZfkYrb4Gn6oP+kcFj7kC10r1aSddigGZPRx18pr5Gg=";
+    hash = "sha256-9PGo/TPk5QuiVoa5wUGyHufW/VaxqhinxS+u2JMPZBY=";
   };
 
-  cargoHash = "sha256-2KlZTOp78HITJMRLNzw1bTUQSYeg5SmquRJWwwG3Xfw=";
+  cargoHash = "sha256-Ectd93B2yn/fn+N86LxGbUvtENsgjXTSCg06lHM8Xi0=";
 
   buildFeatures = [ "cli" ];
 

From 1e3e005a5f9ec6591010901082a78d889ca13908 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 30 Sep 2025 08:05:43 -0700
Subject: [PATCH 0427/6226] python3Packages.pycparser: 2.22 -> 2.23

Diff: https://github.com/eliben/pycparser/compare/release_v2.22...release_v2.23

Changelog: https://github.com/eliben/pycparser/releases/tag/release_v2.23
---
 .../python-modules/pycparser/default.nix      | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix
index fb2e5cbda0e0..ee58976384d7 100644
--- a/pkgs/development/python-modules/pycparser/default.nix
+++ b/pkgs/development/python-modules/pycparser/default.nix
@@ -1,36 +1,44 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+  gitUpdater,
   setuptools,
   unittestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "pycparser";
-  version = "2.22";
+  version = "2.23";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-SRyL6cBA9TkPW/RKWwd1K9B/Vu35kjgbBccBQ57sEPY=";
+  src = fetchFromGitHub {
+    owner = "eliben";
+    repo = "pycparser";
+    tag = "release_v${version}";
+    hash = "sha256-dkteM8VizYf9ZLPOe8od5CZgg7a3fs4Hy+t8bGLV/GI=";
   };
 
   build-system = [ setuptools ];
 
+  pythonImportsCheck = [ "pycparser" ];
+
   nativeCheckInputs = [ unittestCheckHook ];
-  disabled = pythonOlder "3.8";
 
   unittestFlagsArray = [
     "-s"
     "tests"
   ];
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "release_v";
+  };
+
+  meta = {
+    changelog = "https://github.com/eliben/pycparser/releases/tag/${src.tag}";
     description = "C parser in Python";
     homepage = "https://github.com/eliben/pycparser";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     maintainers = [ ];
   };
 }

From 8a7d22e0c4622763d83d0be0484944df2fb4dd23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 30 Sep 2025 08:12:23 -0700
Subject: [PATCH 0428/6226] python3Packages.pycparser: add dotlambda to
 maintainers

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

diff --git a/pkgs/development/python-modules/pycparser/default.nix b/pkgs/development/python-modules/pycparser/default.nix
index ee58976384d7..9f2068a0e72f 100644
--- a/pkgs/development/python-modules/pycparser/default.nix
+++ b/pkgs/development/python-modules/pycparser/default.nix
@@ -39,6 +39,6 @@ buildPythonPackage rec {
     description = "C parser in Python";
     homepage = "https://github.com/eliben/pycparser";
     license = lib.licenses.bsd3;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.dotlambda ];
   };
 }

From ee30db440a806c0bd37ad69349081308f42edad7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Oct 2025 09:46:00 +0000
Subject: [PATCH 0429/6226] ibus-engines.table: 1.17.15 -> 1.17.16

---
 pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
index ea4bcda399b1..ed9198747ce8 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table/default.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ibus-table";
-  version = "1.17.15";
+  version = "1.17.16";
 
   src = fetchFromGitHub {
     owner = "kaio";
     repo = "ibus-table";
     rev = version;
-    sha256 = "sha256-g3UyGbS/gtUQ54PQ0u7xRfInG+T5dkv4vF79bhXoQdY=";
+    sha256 = "sha256-QGuzEQxP9RSO0Ch+tTvC6cchH+jtilujxScYTb900BY=";
   };
 
   postPatch = ''

From 70b13187027011175bda58c8c57e37810da57aad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Mon, 6 Oct 2025 12:10:23 +0200
Subject: [PATCH 0430/6226] openssh: 10.0p2 -> 10.1p1

---
 pkgs/tools/networking/openssh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index c1e78916e3d9..47f215c6e7f9 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -25,11 +25,11 @@ in
 {
   openssh = common rec {
     pname = "openssh";
-    version = "10.0p2";
+    version = "10.1p1";
 
     src = fetchurl {
       url = urlFor version;
-      hash = "sha256-AhoucJoO30JQsSVr1anlAEEakN3avqgw7VnO+Q652Fw=";
+      hash = "sha256-ufx6K4JXlGem8vQ+SoHI4d/aYU3bT5slWq/XAgu/B1g=";
     };
 
     extraPatches = [

From 8a96db4d77b6b1661ee897768655912fa35bc759 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Oct 2025 11:22:15 +0000
Subject: [PATCH 0431/6226] livepeer: 0.8.6 -> 0.8.8

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

diff --git a/pkgs/by-name/li/livepeer/package.nix b/pkgs/by-name/li/livepeer/package.nix
index 5b6f2c779e16..f64ce89481af 100644
--- a/pkgs/by-name/li/livepeer/package.nix
+++ b/pkgs/by-name/li/livepeer/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "livepeer";
-  version = "0.8.6";
+  version = "0.8.8";
 
   proxyVendor = true;
-  vendorHash = "sha256-gPaMatH/C1Tbxi4fBeD+722UtYBeq+p7hJn+kIeEC+Y=";
+  vendorHash = "sha256-cEpRLnLR0ia5vvoJ8Fwk/0qgvsnYw7vSpyS9BJQ8UfY=";
 
   src = fetchFromGitHub {
     owner = "livepeer";
     repo = "go-livepeer";
     tag = "v${version}";
-    hash = "sha256-KVxUyMX4Q3kWcjObaTTuZf3pqMHbUeNzjdxQIWJZaYk=";
+    hash = "sha256-DVgB/pE3nq6oHzLi+g/WUMQqrmXvJhPub7bmeLgyEDQ=";
   };
 
   nativeBuildInputs = [

From 84fadb88ccb7cde45f39914866ae480fae9dfaa9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Oct 2025 11:47:16 +0000
Subject: [PATCH 0432/6226] build(deps): bump korthout/backport-action from
 3.3.0 to 3.4.1

Bumps [korthout/backport-action](https://github.com/korthout/backport-action) from 3.3.0 to 3.4.1.
- [Release notes](https://github.com/korthout/backport-action/releases)
- [Commits](https://github.com/korthout/backport-action/compare/ca4972adce8039ff995e618f5fc02d1b7961f27a...d07416681cab29bf2661702f925f020aaa962997)

---
updated-dependencies:
- dependency-name: korthout/backport-action
  dependency-version: 3.4.1
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/backport.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index fc2b80041ce7..011e09a0023e 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -48,7 +48,7 @@ jobs:
 
       - name: Create backport PRs
         id: backport
-        uses: korthout/backport-action@ca4972adce8039ff995e618f5fc02d1b7961f27a # v3.3.0
+        uses: korthout/backport-action@d07416681cab29bf2661702f925f020aaa962997 # v3.4.1
         with:
           # Config README: https://github.com/korthout/backport-action#backport-action
           copy_labels_pattern: 'severity:\ssecurity'

From 58ad4b43211b114c2c4812ca6ed8dfe7802ab51b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Oct 2025 12:31:52 +0000
Subject: [PATCH 0433/6226] flrig: 2.0.08 -> 2.0.09

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

diff --git a/pkgs/by-name/fl/flrig/package.nix b/pkgs/by-name/fl/flrig/package.nix
index 84db6d5f18ac..de57d3647394 100644
--- a/pkgs/by-name/fl/flrig/package.nix
+++ b/pkgs/by-name/fl/flrig/package.nix
@@ -9,12 +9,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2.0.08";
+  version = "2.0.09";
   pname = "flrig";
 
   src = fetchurl {
     url = "mirror://sourceforge/fldigi/${pname}-${version}.tar.gz";
-    sha256 = "sha256-+erxQBZKHzMOQPM/VAk+Iw9ItPZnW9Ndiu0HQ08Szm8=";
+    sha256 = "sha256-dvUh7PEGKvJ21aw4BFBLKDosE4RVtZPWb9XVHJRk9Z0=";
   };
 
   buildInputs = [

From e21604eee66305df3e3856ebe5c1cfde0659313d Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Mon, 6 Oct 2025 15:23:42 +0200
Subject: [PATCH 0434/6226] wine-staging: 10.15 -> 10.16

---
 pkgs/applications/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix
index c8ca0ec983ab..5759fee637a8 100644
--- a/pkgs/applications/emulators/wine/sources.nix
+++ b/pkgs/applications/emulators/wine/sources.nix
@@ -133,9 +133,9 @@ rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the hash for staging as well.
-    version = "10.15";
+    version = "10.16";
     url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz";
-    hash = "sha256-MH4hI3xui96iZvlG0x8J7SexlX35oDUW2Ccf0T4cJh0=";
+    hash = "sha256-xe0nQr/yCMY7AFvPuRovxsxJr2xmlbyMDPD+b02mBEY=";
 
     patches = [
       # Also look for root certificates at $NIX_SSL_CERT_FILE
@@ -145,7 +145,7 @@ rec {
     # see https://gitlab.winehq.org/wine/wine-staging
     staging = fetchFromGitLab {
       inherit version;
-      hash = "sha256-VzHM4Qm0XDP7suCT5dmJgoDJmZ1DLg6qqOUVQzNc0g4=";
+      hash = "sha256-XknbKTQtIS0J6L/k3dEFQbxEIEYAdToVpigwISZX+ts=";
       domain = "gitlab.winehq.org";
       owner = "wine";
       repo = "wine-staging";

From 63da2caa10ec7ddbe3775b8db6fe826af0193489 Mon Sep 17 00:00:00 2001
From: sadorowo <me@sador.me>
Date: Mon, 6 Oct 2025 13:58:53 +0000
Subject: [PATCH 0435/6226] fix: add missing lib.escapeShellArg

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

diff --git a/nixos/modules/services/web-apps/invidious.nix b/nixos/modules/services/web-apps/invidious.nix
index 126dd1fab506..29ec8c8ef9b1 100644
--- a/nixos/modules/services/web-apps/invidious.nix
+++ b/nixos/modules/services/web-apps/invidious.nix
@@ -82,11 +82,11 @@ let
     ''
     # optional extra settings file
     + lib.optionalString (cfg.extraSettingsFile != null) ''
-      configParts+=("$(< ${cfg.extraSettingsFile})")
+      configParts+=("$(< ${lib.escapeShellArg cfg.extraSettingsFile})")
     ''
     # explicitly specified hmac key file
     + lib.optionalString (cfg.hmacKeyFile != null) ''
-      configParts+=("$(< ${cfg.hmacKeyFile})")
+      configParts+=("$(< ${lib.escapeShellArg cfg.hmacKeyFile})")
     ''
     # configure threads for secondary instances
     + lib.optionalString (scaleIndex > 0) ''

From 58441cd09e5521a7923db939c1a60f1f7ddead80 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Oct 2025 14:23:14 +0000
Subject: [PATCH 0436/6226] gnote: 48.2 -> 49.0

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

diff --git a/pkgs/by-name/gn/gnote/package.nix b/pkgs/by-name/gn/gnote/package.nix
index fe7eae9a508d..20b5fd96f3d1 100644
--- a/pkgs/by-name/gn/gnote/package.nix
+++ b/pkgs/by-name/gn/gnote/package.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gnote";
-  version = "48.2";
+  version = "49.0";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.major version}/${pname}-${version}.tar.xz";
-    hash = "sha256-PIFooZ3mWJ+56O4RmkRUISOUHB6XSK79NooCjmclx4E=";
+    hash = "sha256-GXUaLyN3Kb+fSElVQKNeNG5FwbobAW25y3VNReztCl0=";
   };
 
   buildInputs = [

From 59011787de6d841fcc5e3c0fd7f5d3247ff37a18 Mon Sep 17 00:00:00 2001
From: Cobalt <cobalt@cobalt.rocks>
Date: Mon, 6 Oct 2025 18:39:18 +0200
Subject: [PATCH 0437/6226] cmake: 4.1.1 -> 4.1.2

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

diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix
index 7e3b689f4567..3f099d56c7f9 100644
--- a/pkgs/by-name/cm/cmake/package.nix
+++ b/pkgs/by-name/cm/cmake/package.nix
@@ -50,11 +50,11 @@ stdenv.mkDerivation (finalAttrs: {
     + lib.optionalString isMinimalBuild "-minimal"
     + lib.optionalString cursesUI "-cursesUI"
     + lib.optionalString qt5UI "-qt5UI";
-  version = "4.1.1";
+  version = "4.1.2";
 
   src = fetchurl {
     url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz";
-    hash = "sha256-sp9vGXM6oiS3djUHoQikJ+1Ixojh+vIrKcROHDBUkoI=";
+    hash = "sha256-ZD8EGCt7oyOrMfUm94UTT7ecujGIqFIgbvBHP+4oKhU=";
   };
 
   patches = [
@@ -80,9 +80,6 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ]
   ++ [
-    # Backport of https://gitlab.kitware.com/cmake/cmake/-/merge_requests/11134
-    ./fix-curl-8.16.patch
-
     # Remove references to non‐Nix search paths.
     ./remove-impure-search-paths.patch
   ];

From 6923418913b7d3c9a5cfd81a251a1de27004de84 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Mon, 6 Oct 2025 19:00:47 +0200
Subject: [PATCH 0438/6226] teleport: make teleport_18 default version

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

diff --git a/pkgs/by-name/te/teleport/package.nix b/pkgs/by-name/te/teleport/package.nix
index 93697b54bc97..64af74563365 100644
--- a/pkgs/by-name/te/teleport/package.nix
+++ b/pkgs/by-name/te/teleport/package.nix
@@ -1,5 +1,5 @@
 {
-  teleport_17,
+  teleport_18,
 }:
 
-teleport_17
+teleport_18

From 3de456148f75c5910c66659d04e35e055ba9482b Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Mon, 6 Oct 2025 19:02:50 +0200
Subject: [PATCH 0439/6226] nixos/rl-2511: update of teleport default version

---
 nixos/doc/manual/release-notes/rl-2511.section.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index adc084518d04..c517936bd1ec 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -188,6 +188,10 @@
 
 - `services.gateone` has been removed as the package was removed such that it does not work.
 
+- `teleport` has been upgraded from major version 17 to major version 18.
+Refer to [upstream upgrade instructions](https://goteleport.com/docs/upgrading/overview/)
+and [release notes for v18](https://goteleport.com/docs/changelog/#1800-070325).
+
 - `services.dwm-status.extraConfig` was replaced by [RFC0042](https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md)-compliant [](#opt-services.dwm-status.settings), which is used to generate the config file. `services.dwm-status.order` is now moved to [](#opt-services.dwm-status.settings.order), as it's a part of the config file.
 
 - `gitversion` was updated to 6.3.0, which includes a number of breaking changes, old configurations may need updating or they will cause the tool to fail to run.

From 25e606dd64db47e01d80544285e352522dbed02d Mon Sep 17 00:00:00 2001
From: Tyler Langlois <tjl@byu.net>
Date: Mon, 6 Oct 2025 10:16:46 -0600
Subject: [PATCH 0440/6226] binutils: fix CVE-2025-5244

---
 .../tools/misc/binutils/CVE-2025-5244.diff          | 13 +++++++++++++
 pkgs/development/tools/misc/binutils/default.nix    |  4 ++++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/development/tools/misc/binutils/CVE-2025-5244.diff

diff --git a/pkgs/development/tools/misc/binutils/CVE-2025-5244.diff b/pkgs/development/tools/misc/binutils/CVE-2025-5244.diff
new file mode 100644
index 000000000000..947172f2866a
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/CVE-2025-5244.diff
@@ -0,0 +1,13 @@
+Backported patch originally targeted against 2.45.
+--- a/bfd/elflink.c
++++ b/bfd/elflink.c
+@@ -14356,5 +14356,6 @@ elf_gc_sweep (bfd *abfd, struct bfd_link_info *info)
+	  if (o->flags & SEC_GROUP)
+	    {
+	      asection *first = elf_next_in_group (o);
+-	      o->gc_mark = first->gc_mark;
++	      if (first != NULL)
++	        o->gc_mark = first->gc_mark;
+	    }
+
+	  if (o->gc_mark)
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 04e311bf38a1..2e3941d17f51 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -118,6 +118,10 @@ stdenv.mkDerivation (finalAttrs: {
     ./avr-size.patch
 
     ./windres-locate-gcc.patch
+
+    # Backported against CVE patched in the 2.45 series. See:
+    # https://nvd.nist.gov/vuln/detail/CVE-2025-5244
+    ./CVE-2025-5244.diff
   ];
 
   outputs = [

From d2780ecd0cb861fe8af527179a26a11ae960bbfe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Oct 2025 20:07:35 +0000
Subject: [PATCH 0441/6226] xnec2c: 4.4.16 -> 4.4.17

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

diff --git a/pkgs/by-name/xn/xnec2c/package.nix b/pkgs/by-name/xn/xnec2c/package.nix
index 5daa9c72b5f4..ea2e3a0076ba 100644
--- a/pkgs/by-name/xn/xnec2c/package.nix
+++ b/pkgs/by-name/xn/xnec2c/package.nix
@@ -16,13 +16,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xnec2c";
-  version = "4.4.16";
+  version = "4.4.17";
 
   src = fetchFromGitHub {
     owner = "KJ7LNW";
     repo = "xnec2c";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-W8JwbCSXt5cjgncOzV1wltPnJxwWC6B29eaT8emIU9Y=";
+    hash = "sha256-ZxKpClB5IBfcpIOJsGVSiZU8WGu/8Yzeru96uCKkCGQ=";
   };
 
   nativeBuildInputs = [

From 88ceb91bdfeab0552e6a57c578a4d286a7c49ecd Mon Sep 17 00:00:00 2001
From: Tyler Langlois <tjl@byu.net>
Date: Mon, 6 Oct 2025 14:35:12 -0600
Subject: [PATCH 0442/6226] binutils: fix CVE-2025-5245

Backport derived from upstream commit; see:
https://nvd.nist.gov/vuln/detail/CVE-2025-5245
---
 .../tools/misc/binutils/CVE-2025-5245.diff    | 26 +++++++++++++++++++
 .../tools/misc/binutils/default.nix           |  4 +++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/tools/misc/binutils/CVE-2025-5245.diff

diff --git a/pkgs/development/tools/misc/binutils/CVE-2025-5245.diff b/pkgs/development/tools/misc/binutils/CVE-2025-5245.diff
new file mode 100644
index 000000000000..27592a8d0e87
--- /dev/null
+++ b/pkgs/development/tools/misc/binutils/CVE-2025-5245.diff
@@ -0,0 +1,26 @@
+Backported patch originally targeted against 2.45.
+--- a/binutils/debug.c
++++ b/binutils/debug.c
+@@ -2554,9 +2554,6 @@ debug_write_type (struct debug_handle *info,
+     case DEBUG_KIND_UNION_CLASS:
+       return debug_write_class_type (info, fns, fhandle, type, tag);
+     case DEBUG_KIND_ENUM:
+-      if (type->u.kenum == NULL)
+-	return (*fns->enum_type) (fhandle, tag, (const char **) NULL,
+-				  (bfd_signed_vma *) NULL);
+       return (*fns->enum_type) (fhandle, tag, type->u.kenum->names,
+ 				type->u.kenum->values);
+     case DEBUG_KIND_POINTER:
+@@ -3097,9 +3094,9 @@ debug_type_samep (struct debug_handle *info, struct debug_type_s *t1,
+       break;
+
+     case DEBUG_KIND_ENUM:
+-      if (t1->u.kenum == NULL)
+-	ret = t2->u.kenum == NULL;
+-      else if (t2->u.kenum == NULL)
++      if (t1->u.kenum->names == NULL)
++	ret = t2->u.kenum->names == NULL;
++      else if (t2->u.kenum->names == NULL)
+ 	ret = false;
+       else
+ 	{
diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix
index 2e3941d17f51..2dee9eb4f572 100644
--- a/pkgs/development/tools/misc/binutils/default.nix
+++ b/pkgs/development/tools/misc/binutils/default.nix
@@ -122,6 +122,10 @@ stdenv.mkDerivation (finalAttrs: {
     # Backported against CVE patched in the 2.45 series. See:
     # https://nvd.nist.gov/vuln/detail/CVE-2025-5244
     ./CVE-2025-5244.diff
+
+    # Backported against CVE patched in the 2.45 series. See:
+    # https://nvd.nist.gov/vuln/detail/CVE-2025-5245
+    ./CVE-2025-5245.diff
   ];
 
   outputs = [

From ae403040077b9d084cef8e7474428690ec3b02c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Oct 2025 20:55:15 +0000
Subject: [PATCH 0443/6226] ibmcloud-cli: 2.36.0 -> 2.37.1

---
 pkgs/tools/admin/ibmcloud-cli/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/tools/admin/ibmcloud-cli/default.nix b/pkgs/tools/admin/ibmcloud-cli/default.nix
index c5777c1c999a..6527ce2cd014 100644
--- a/pkgs/tools/admin/ibmcloud-cli/default.nix
+++ b/pkgs/tools/admin/ibmcloud-cli/default.nix
@@ -30,19 +30,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ibmcloud-cli";
-  version = "2.36.0";
+  version = "2.37.1";
 
   src = fetchurl {
     url = "https://download.clis.cloud.ibm.com/ibm-cloud-cli/${finalAttrs.version}/binaries/IBM_Cloud_CLI_${finalAttrs.version}_${platform}.tgz";
     hash =
       {
-        "x86_64-darwin" = "sha256-hIHFfUxAhpA+YIN7Bq65khFFj+3BCuYRtMq2WjQwqYQ=";
-        "aarch64-darwin" = "sha256-ZZ500RWagqhf63zwiQpV8y+gtCxGfbA36F97x67coUE=";
-        "x86_64-linux" = "sha256-+ZKlFvrDPm3ERq8/r7cjgsJWjUr8+sGFqYXdiSUPeXo=";
-        "aarch64-linux" = "sha256-ER/Ey3Jux3i8tC30/65awHdEd6efscUVjX/bFAk1b7c=";
-        "i686-linux" = "sha256-5A0kUegKVHSTZ+jRg5+07wvV4PkCvOPddvyC1ZLCbmI=";
-        "powerpc64le-linux" = "sha256-XcHrdA9i3Euc0yIjUtFrmIFMJi+onXRK+tHzNxmQwHg=";
-        "s390x-linux" = "sha256-loGQxvUqp9ngieVOVuZ6IhOKgyrVGBd+y9LdZtKEPwc=";
+        "x86_64-darwin" = "sha256-NqohbUj+FcReQr3ouq7QNdZOREk0nyCTug2bC4G2kOw=";
+        "aarch64-darwin" = "sha256-SYGela1vfxohcqPzk2DtqBNGaubHFoIgK14L/jwX0gc=";
+        "x86_64-linux" = "sha256-8W3QMLNcDDgb0V8j2HH0iNO+XqVHUsFw7Mmw7WCHsVY=";
+        "aarch64-linux" = "sha256-VtXLIPqDDovptQ83fjxQ4Ggk6WjTN18Z4hWwPuaY/dU=";
+        "i686-linux" = "sha256-qqlumSDuhD9G7dpVx9BCrA1wK96tqGvxDAvgtb4fW1o=";
+        "powerpc64le-linux" = "sha256-oyX2j55ywJdR4lOGSjfI/OcISGJXO7g2t1LI5/89y9w=";
+        "s390x-linux" = "sha256-XC8bMrDlR3dFFpMx/zjjMZz3d37jr9sNRWJEe56IqjE=";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From c31720ca7dfcc0192f0f9fb65514c732433680b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Oct 2025 21:08:55 +0000
Subject: [PATCH 0444/6226] morgen: 3.6.18 -> 3.6.19

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

diff --git a/pkgs/by-name/mo/morgen/package.nix b/pkgs/by-name/mo/morgen/package.nix
index d9529c76e3bb..dda652605dfa 100644
--- a/pkgs/by-name/mo/morgen/package.nix
+++ b/pkgs/by-name/mo/morgen/package.nix
@@ -16,12 +16,12 @@
 
 stdenv.mkDerivation rec {
   pname = "morgen";
-  version = "3.6.18";
+  version = "3.6.19";
 
   src = fetchurl {
     name = "morgen-${version}.deb";
     url = "https://dl.todesktop.com/210203cqcj00tw1/versions/${version}/linux/deb";
-    hash = "sha256-OvV+GNKQBzUpHEOfaBV6SGRxA/gvRWFkP5D7CihY7pU=";
+    hash = "sha256-9zIs5Z6o9cH7dcVGGCKfCBr/9rR9wvQbs6BZJC3KFiQ=";
   };
 
   nativeBuildInputs = [

From 918084080efce213440050d8445a09ef983cb83f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Oct 2025 21:39:06 +0000
Subject: [PATCH 0445/6226] opam-publish: 2.6.0 -> 2.7.0

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

diff --git a/pkgs/by-name/op/opam-publish/package.nix b/pkgs/by-name/op/opam-publish/package.nix
index 96d4165bba75..e8014588aa33 100644
--- a/pkgs/by-name/op/opam-publish/package.nix
+++ b/pkgs/by-name/op/opam-publish/package.nix
@@ -19,13 +19,13 @@ in
 
 buildDunePackage rec {
   pname = "opam-publish";
-  version = "2.6.0";
+  version = "2.7.0";
 
   src = fetchFromGitHub {
     owner = "ocaml-opam";
     repo = "opam-publish";
     rev = version;
-    hash = "sha256-HEmeY3k1sHMNhIUD0GmVlUKKRxC+z/tMAqHGQNT48LA=";
+    hash = "sha256-Li7Js8mrxOrRNNuu8z4X+VXbuECfk7Gsgpy4d6R3RwU=";
   };
 
   buildInputs = [

From fe94082c9d470949170ee5473e266803236624be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 6 Oct 2025 22:54:14 +0000
Subject: [PATCH 0446/6226] chsrc: 0.2.2 -> 0.2.3

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

diff --git a/pkgs/by-name/ch/chsrc/package.nix b/pkgs/by-name/ch/chsrc/package.nix
index 4a6cf1ce92ae..f43c48e79fed 100644
--- a/pkgs/by-name/ch/chsrc/package.nix
+++ b/pkgs/by-name/ch/chsrc/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "chsrc";
-  version = "0.2.2";
+  version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "RubyMetric";
     repo = "chsrc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-W59c78U7fZ4nlSm4Yn7sySYdMqS848aGAzqHh+BVEpA=";
+    hash = "sha256-AgyaaKPCyqivCMd6VrV1Fiu6D/bvgW/faztVByjghiQ=";
   };
 
   nativeBuildInputs = [ texinfo ];

From 28214b33c961eeab908d65e7acf30b99ba6826ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Oct 2025 00:28:19 +0000
Subject: [PATCH 0447/6226] marst: 2.7 -> 2.8

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

diff --git a/pkgs/by-name/ma/marst/package.nix b/pkgs/by-name/ma/marst/package.nix
index 70f3f3f8cfdb..a68dead275c1 100644
--- a/pkgs/by-name/ma/marst/package.nix
+++ b/pkgs/by-name/ma/marst/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "marst";
-  version = "2.7";
+  version = "2.8";
 
   src = fetchurl {
     url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";
-    hash = "sha256-Pue50cvjzZ+19iJxfae7VQbxpto7MPgS4jhLh7zk2lA=";
+    hash = "sha256-139HA7C0S1C+V5CPnVVu5sO+3ZfWOMQpSdauyE+AcLo=";
   };
 
   nativeBuildInputs = [

From 03b87b1783ab68c5303428b3eb335b2104f03e1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Oct 2025 00:38:06 +0000
Subject: [PATCH 0448/6226] sqlcl: 25.2.2.199.0918 -> 25.3.0.274.1210

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

diff --git a/pkgs/by-name/sq/sqlcl/package.nix b/pkgs/by-name/sq/sqlcl/package.nix
index f9c639a4bfe9..7252b94f43ed 100644
--- a/pkgs/by-name/sq/sqlcl/package.nix
+++ b/pkgs/by-name/sq/sqlcl/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sqlcl";
-  version = "25.2.2.199.0918";
+  version = "25.3.0.274.1210";
 
   src = fetchurl {
     url = "https://download.oracle.com/otn_software/java/sqldeveloper/sqlcl-${finalAttrs.version}.zip";
-    hash = "sha256-YsIEJkQXeVIABsCXNBfT6WZbrXur1hoEZFj97JvGHV8=";
+    hash = "sha256-TOKTvBFoUFDqN7qjq6yYYBh0bfS66kks243q6+5+i6c=";
   };
 
   nativeBuildInputs = [

From 58dafa63001e26917046914a687ba92cc7789d4d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Oct 2025 02:05:42 +0000
Subject: [PATCH 0449/6226] iio-hyprland: 0-unstable-2025-08-21 ->
 0-unstable-2025-10-06

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

diff --git a/pkgs/by-name/ii/iio-hyprland/package.nix b/pkgs/by-name/ii/iio-hyprland/package.nix
index 137dff309b13..95f364565ceb 100644
--- a/pkgs/by-name/ii/iio-hyprland/package.nix
+++ b/pkgs/by-name/ii/iio-hyprland/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation {
   pname = "iio-hyprland";
-  version = "0-unstable-2025-08-21";
+  version = "0-unstable-2025-10-06";
 
   src = fetchFromGitHub {
     owner = "JeanSchoeller";
     repo = "iio-hyprland";
-    rev = "282f38c700ebf0b69df5aae40134d56e4cd67775";
-    hash = "sha256-mzp2KV9SAsZL/exXSZHFPArcTV8uh3LXufADKX4ppEU=";
+    rev = "801c4722ea678ddf103fc0ff4c3c0211d13ad046";
+    hash = "sha256-asLtzpUbwr+Wq2uQvITORBnrxh/mIZneYyfhdsElTeI=";
   };
 
   buildInputs = [ dbus ];

From d590b03970fd7fffb6824f690016d4e9966a9c0c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Oct 2025 04:39:33 +0000
Subject: [PATCH 0450/6226] dart: 3.9.3 -> 3.9.4

---
 pkgs/development/compilers/dart/sources.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/compilers/dart/sources.nix b/pkgs/development/compilers/dart/sources.nix
index a2ec3318e443..7c0989f1eb2a 100644
--- a/pkgs/development/compilers/dart/sources.nix
+++ b/pkgs/development/compilers/dart/sources.nix
@@ -1,23 +1,23 @@
 let
-  version = "3.9.3";
+  version = "3.9.4";
 in
 { fetchurl }:
 {
   versionUsed = version;
   "${version}-x86_64-darwin" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-x64-release.zip";
-    hash = "sha256-QnY9KG/zFj+5o/4wdR0lETHhRn3a6l340s/ybuNWxx0=";
+    hash = "sha256-8nkG1hUPn0B3r5xxBnGMjgOa66Ax3LQgVqMx+3Tj3S8=";
   };
   "${version}-aarch64-darwin" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-macos-arm64-release.zip";
-    hash = "sha256-aMSMOV5kzd48z5aQgjjpQoJNWznz4slrXSdC8LRe8u8=";
+    hash = "sha256-2gqn816Usv8l69QrfJsh1DCu5ljibaBfZQn4ThUBlIA=";
   };
   "${version}-aarch64-linux" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-arm64-release.zip";
-    hash = "sha256-iEfEhHv3eu2VjAYrzPjVlXle1ISHZxJoC69MbIMXw1Y=";
+    hash = "sha256-IXkJWLbGXLV6Gjw/tQj0Tdz7d7gioJADnuR+WD/N4Og=";
   };
   "${version}-x86_64-linux" = fetchurl {
     url = "https://storage.googleapis.com/dart-archive/channels/stable/release/${version}/sdk/dartsdk-linux-x64-release.zip";
-    hash = "sha256-0ZMR3rNRBKQaQNt642xJaxUDdFpcrtWkFdMitMJz8ds=";
+    hash = "sha256-YbS5SI4bQlW5S+F61Iri3bI8b75ngkz4ED0LKPqKuBY=";
   };
 }

From 2ed2d2860dcb709ac844d284ac717a09200f4a67 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 7 Oct 2025 06:10:56 +0100
Subject: [PATCH 0451/6226] mpg123: 1.33.2 -> 1.33.3

Changes: https://www.mpg123.de/#2025-10-05
---
 pkgs/applications/audio/mpg123/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/applications/audio/mpg123/default.nix
index 8403a57e5fb5..20175c813f8a 100644
--- a/pkgs/applications/audio/mpg123/default.nix
+++ b/pkgs/applications/audio/mpg123/default.nix
@@ -21,11 +21,11 @@ assert withConplay -> !libOnly;
 
 stdenv.mkDerivation rec {
   pname = "${lib.optionalString libOnly "lib"}mpg123";
-  version = "1.33.2";
+  version = "1.33.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/mpg123/mpg123-${version}.tar.bz2";
-    hash = "sha256-LFT6u/ppbc6PmxN8jvekKaBh+P5jPNfQpRGAmFXywhk=";
+    hash = "sha256-agxkct0VbiE8IGj0ARXru3OXjC2HPma64qJQ4tIZjSY=";
   };
 
   outputs = [

From 7fc750a3752bfb06f5544e2b1e8389a0ea10a3b7 Mon Sep 17 00:00:00 2001
From: Cobalt <cobalt@cobalt.rocks>
Date: Tue, 7 Oct 2025 09:10:35 +0200
Subject: [PATCH 0452/6226] harfbuzz: 11.5.0 -> 12.1.0

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

diff --git a/pkgs/by-name/ha/harfbuzz/package.nix b/pkgs/by-name/ha/harfbuzz/package.nix
index cf7198d79132..3742ae131312 100644
--- a/pkgs/by-name/ha/harfbuzz/package.nix
+++ b/pkgs/by-name/ha/harfbuzz/package.nix
@@ -34,11 +34,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "harfbuzz${lib.optionalString withIcu "-icu"}";
-  version = "11.5.0";
+  version = "12.1.0";
 
   src = fetchurl {
     url = "https://github.com/harfbuzz/harfbuzz/releases/download/${finalAttrs.version}/harfbuzz-${finalAttrs.version}.tar.xz";
-    hash = "sha256-LTC6RcTI7E3mYaEAK0+I0IQf8aMIfzRiknX1Q21yIQk=";
+    hash = "sha256-5cgbf24LEC37AAz6QkU4uOiWq3ii9Lil7IyuYqtDNp4=";
   };
 
   postPatch = ''

From 875a8088a14f11cfab94ba961e36270d471ed172 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Oct 2025 07:16:31 +0000
Subject: [PATCH 0453/6226] nss: 3.112.1 -> 3.112.2

---
 pkgs/development/libraries/nss/esr.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/nss/esr.nix b/pkgs/development/libraries/nss/esr.nix
index 88b97a28d545..c7e53ae11ab6 100644
--- a/pkgs/development/libraries/nss/esr.nix
+++ b/pkgs/development/libraries/nss/esr.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "3.112.1";
-  hash = "sha256-NpvE/WH+oY231uDKxXJptDojfU4rNsXySpOduWszzjQ=";
+  version = "3.112.2";
+  hash = "sha256-hK0TovR0LrVkB96BwCnhwaljDSElR85fnobzCa9+uKo=";
   filename = "esr.nix";
   versionRegex = "NSS_(3)_(112)(?:_(\\d+))?_RTM";
 }

From 4b368ec103b776448c42a6eb34e22242916f3e7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 7 Oct 2025 09:38:33 +0200
Subject: [PATCH 0454/6226] diffutils: unconditionalize a patch

---
 pkgs/tools/text/diffutils/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/tools/text/diffutils/default.nix
index d82686d98c3e..aa42eeaf0b9f 100644
--- a/pkgs/tools/text/diffutils/default.nix
+++ b/pkgs/tools/text/diffutils/default.nix
@@ -31,8 +31,7 @@ stdenv.mkDerivation rec {
     # https://lists.gnu.org/archive/html/bug-gnulib/2025-07/msg00021.html
     # Multiple upstream commits squashed with adjustments, see header
     ./gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch
-  ]
-  ++ lib.optionals stdenv.hostPlatform.useLLVM [
+
     ./musl-llvm.patch
   ];
 

From d0c091bca3c8500651223c60d3122d237324bb63 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Oct 2025 09:35:35 +0000
Subject: [PATCH 0455/6226] yourkit-java: 2025.3-b154 -> 2025.9-b161

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

diff --git a/pkgs/by-name/yo/yourkit-java/package.nix b/pkgs/by-name/yo/yourkit-java/package.nix
index b19d6e752f6d..4cb7bc2b8394 100644
--- a/pkgs/by-name/yo/yourkit-java/package.nix
+++ b/pkgs/by-name/yo/yourkit-java/package.nix
@@ -12,7 +12,7 @@ let
 
   vPath = v: lib.elemAt (lib.splitString "-" v) 0;
 
-  version = "2025.3-b154";
+  version = "2025.9-b161";
 
   arches = {
     aarch64-linux = "arm64";
@@ -22,8 +22,8 @@ let
   arch = arches.${stdenvNoCC.targetPlatform.system} or (throw "Unsupported system");
 
   hashes = {
-    arm64 = "sha256-X9YQy12rfTWOVKX2ufmS4GxLGp/I6jhZAZyRBfLuOuk=";
-    x64 = "sha256-BuEfpMEgkOcbUra6eT/sTiVhXpheMaCe55M/CuG0kHE=";
+    arm64 = "sha256-8fBe6evrCdbobx7tvWw+zqKBSLrnksib/EQmskmKiZc=";
+    x64 = "sha256-h+8BHW6Y1Km2iHyONA4DPyUWxrA9R66322lPFBz/bGw=";
   };
 
   desktopItem = makeDesktopItem {

From b1ad5d6b5ff2b2c4381888c5fdbd1c80bc1d9e06 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Oct 2025 10:03:49 +0000
Subject: [PATCH 0456/6226] wallabag: 2.6.13 -> 2.6.14

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

diff --git a/pkgs/by-name/wa/wallabag/package.nix b/pkgs/by-name/wa/wallabag/package.nix
index 78b12de61204..70ae86324662 100644
--- a/pkgs/by-name/wa/wallabag/package.nix
+++ b/pkgs/by-name/wa/wallabag/package.nix
@@ -16,7 +16,7 @@
 
 let
   pname = "wallabag";
-  version = "2.6.13";
+  version = "2.6.14";
 in
 stdenv.mkDerivation {
   inherit pname version;
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   # Release tarball includes vendored files
   src = fetchurl {
     url = "https://github.com/wallabag/wallabag/releases/download/${version}/wallabag-${version}.tar.gz";
-    hash = "sha256-GnnXAnn8jqndy3GCrovuS5dddzZbS/RnX8JL5yNVppY=";
+    hash = "sha256-AEk0WuxZfazo4r4shcK453RCF/4V/VMDvKs4EXGe/w0=";
   };
 
   patches = [

From 8d0a521e5100abaa4dcd0b77a05a15ea10ba67b3 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Tue, 7 Oct 2025 12:24:13 +0200
Subject: [PATCH 0457/6226] libxml2: fix attribute normalization regression

---
 pkgs/development/libraries/libxml2/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index bcd56ff6e54d..3c1632ea8273 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -58,6 +58,15 @@ let
         tag = "v${packages.libxml2.version}";
         hash = "sha256-jumHSiIMDzqG2hvPUdcBP8LsszcU+loOY+vqEh/0Yqo=";
       };
+      extraPatches = [
+        # Fixes a regression in attribute normalization.
+        # Also see https://www.postgresql.org/message-id/flat/0756AC61-FBA3-46E2-B3C2-19B58B65EBDC%2540yesql.se
+        # To be removed with 2.15.1.
+        (fetchpatch2 {
+          url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/da45a190f718e8e2f0e3d2a6325ffa23abc8b90c.patch";
+          hash = "sha256-dE5DxkP+LBZ8N5V3x02Q1xOU9IXDvvr64xzcln0QH0E=";
+        })
+      ];
       extraMeta = {
         maintainers = with lib.maintainers; [
           jtojnar

From fdf2edc77549330268724e89497f0512df075fff Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Tue, 7 Oct 2025 13:02:04 +0200
Subject: [PATCH 0458/6226] coreutils: ignore format-security warnings on clang

As raised by https://lists.gnu.org/r/bug-gnulib/2025-06/msg00325.html
and https://lists.gnu.org/r/bug-gnulib/2025-06/msg00327.html on the
upstream mailing list, gnulib does not consider clang-specific warnings
to be bugs.
GCC itself works around present instances of this warning by treating
gettext as a built-in.
---
 pkgs/tools/misc/coreutils/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix
index 4f6b61521dec..4f94c41dcf42 100644
--- a/pkgs/tools/misc/coreutils/default.nix
+++ b/pkgs/tools/misc/coreutils/default.nix
@@ -207,6 +207,9 @@ stdenv.mkDerivation rec {
     # Work around a bogus warning in conjunction with musl.
     ++ optional stdenv.hostPlatform.isMusl "-Wno-error"
     ++ optional stdenv.hostPlatform.isAndroid "-D__USE_FORTIFY_LEVEL=0"
+    # gnulib does not consider Clang-specific warnings to be bugs:
+    # https://lists.gnu.org/r/bug-gnulib/2025-06/msg00325.html
+    ++ optional stdenv.cc.isClang "-Wno-error=format-security"
   );
 
   # Works around a bug with 8.26:

From 5f9ce80281be5de3947a74889e08959a3adca4cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 2 Oct 2025 08:34:45 -0700
Subject: [PATCH 0459/6226] python3Packages.click: 8.1.8 -> 8.2.1

Diff: https://github.com/pallets/click/compare/8.1.8...8.2.1

Changelog: https://github.com/pallets/click/blob/8.2.1/CHANGES.rst
---
 .../python-modules/click/default.nix           | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/click/default.nix b/pkgs/development/python-modules/click/default.nix
index ec105f1ef7d5..e028343fbb65 100644
--- a/pkgs/development/python-modules/click/default.nix
+++ b/pkgs/development/python-modules/click/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   importlib-metadata,
   pytestCheckHook,
@@ -17,24 +16,24 @@
 
 buildPythonPackage rec {
   pname = "click";
-  version = "8.1.8";
+  version = "8.2.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "pallets";
     repo = "click";
     tag = version;
-    hash = "sha256-pAAqf8jZbDfVZUoltwIFpov/1ys6HSYMyw3WV2qcE/M=";
+    hash = "sha256-3FfLKwpfkiGfY2+H2fQoZwLBqfPlV46xw2Bc4YEsyps=";
   };
 
   build-system = [ flit-core ];
-  dependencies = lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
 
   nativeCheckInputs = [ pytestCheckHook ];
 
   disabledTests = [
+    # for some reason the tests fail to execute cat, even though they run with less just fine,
+    # even adding coreutils to nativeCheckInputs explicitly does not change anything
+    "test_echo_via_pager"
     # test fails with filename normalization on zfs
     "test_file_surrogates"
   ];
@@ -49,14 +48,15 @@ buildPythonPackage rec {
       ;
   };
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/pallets/click/blob/${src.tag}/CHANGES.rst";
     homepage = "https://click.palletsprojects.com/";
     description = "Create beautiful command line interfaces in Python";
     longDescription = ''
       A Python package for creating beautiful command line interfaces in a
       composable way, with as little code as necessary.
     '';
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ nickcao ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ nickcao ];
   };
 }

From cb4b56a03343852027f9c52a14589e892076aaf8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Oct 2025 02:02:41 -0700
Subject: [PATCH 0460/6226] python3Packages.click-repl: mark broken

---
 pkgs/development/python-modules/click-repl/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/click-repl/default.nix b/pkgs/development/python-modules/click-repl/default.nix
index 201e0d8d4253..00b8221e3bc9 100644
--- a/pkgs/development/python-modules/click-repl/default.nix
+++ b/pkgs/development/python-modules/click-repl/default.nix
@@ -42,6 +42,8 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
+    # https://github.com/click-contrib/click-repl/issues/128
+    broken = lib.versionAtLeast click.version "8.2.0";
     homepage = "https://github.com/click-contrib/click-repl";
     description = "Subcommand REPL for click apps";
     license = licenses.mit;

From f5445b5bb5e6102ba535f0f1f94a05e9a58acdf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Oct 2025 02:33:57 -0700
Subject: [PATCH 0461/6226] python3Packages.celery: don't include AMQP REPL by
 default

The REPL depends on click-repl, which doesn't support click >= 8.2.0.
---
 .../python-modules/celery/default.nix         | 11 ++++++-
 .../celery/remove-amqp-repl.patch             | 32 +++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/celery/remove-amqp-repl.patch

diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index 99ff9c25fb95..17c6e9c0f84d 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -29,6 +29,9 @@
   pyyaml,
   setuptools,
   vine,
+  # The AMQP REPL depends on click-repl, which is incompatible with our version
+  # of click.
+  withAmqpRepl ? false,
 }:
 
 buildPythonPackage rec {
@@ -43,6 +46,10 @@ buildPythonPackage rec {
     hash = "sha256-+sickqRfSkBxhcO0W9na6Uov4kZ7S5oqpXXKX0iRQ0w=";
   };
 
+  patches = lib.optionals (!withAmqpRepl) [
+    ./remove-amqp-repl.patch
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -50,10 +57,12 @@ buildPythonPackage rec {
     click
     click-didyoumean
     click-plugins
-    click-repl
     kombu
     python-dateutil
     vine
+  ]
+  ++ lib.optionals withAmqpRepl [
+    click-repl
   ];
 
   optional-dependencies = {
diff --git a/pkgs/development/python-modules/celery/remove-amqp-repl.patch b/pkgs/development/python-modules/celery/remove-amqp-repl.patch
new file mode 100644
index 000000000000..6a9dcd641bf4
--- /dev/null
+++ b/pkgs/development/python-modules/celery/remove-amqp-repl.patch
@@ -0,0 +1,32 @@
+diff --git a/celery/bin/celery.py b/celery/bin/celery.py
+index e1fae1a77..cf05a927a 100644
+--- a/celery/bin/celery.py
++++ b/celery/bin/celery.py
+@@ -12,7 +12,6 @@ from click_plugins import with_plugins
+ 
+ from celery import VERSION_BANNER
+ from celery.app.utils import find_app
+-from celery.bin.amqp import amqp
+ from celery.bin.base import CeleryCommand, CeleryOption, CLIContext
+ from celery.bin.beat import beat
+ from celery.bin.call import call
+@@ -186,7 +185,6 @@ celery.add_command(control)
+ celery.add_command(graph)
+ celery.add_command(upgrade)
+ celery.add_command(logtool)
+-celery.add_command(amqp)
+ celery.add_command(shell)
+ celery.add_command(multi)
+ 
+diff --git a/requirements/default.txt b/requirements/default.txt
+index 185b6eddd..fbfc59fd7 100644
+--- a/requirements/default.txt
++++ b/requirements/default.txt
+@@ -3,7 +3,6 @@ kombu>=5.6.0rc1,<5.7
+ vine>=5.1.0,<6.0
+ click>=8.1.2,<9.0
+ click-didyoumean>=0.3.0
+-click-repl>=0.2.0
+ click-plugins>=1.1.1
+ backports.zoneinfo[tzdata]>=0.2.1; python_version < '3.9'
+ python-dateutil>=2.8.2

From c4bfb3f7d7f46a15daf50c44ce8bb01d82954656 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Oct 2025 03:12:00 -0700
Subject: [PATCH 0462/6226] todoman: make click-repl an optional dependency

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

diff --git a/pkgs/by-name/to/todoman/package.nix b/pkgs/by-name/to/todoman/package.nix
index 49c38c8b9210..6460fdd606a8 100644
--- a/pkgs/by-name/to/todoman/package.nix
+++ b/pkgs/by-name/to/todoman/package.nix
@@ -32,18 +32,20 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   dependencies = with python3.pkgs; [
-    atomicwrites
     click
     click-log
-    click-repl
     humanize
     icalendar
     parsedatetime
+    python-dateutil
     pyxdg
-    tabulate
     urwid
   ];
 
+  optional-dependencies = with python3.pkgs; {
+    repl = [ click-repl ];
+  };
+
   nativeCheckInputs = with python3.pkgs; [
     freezegun
     hypothesis

From 86b774ab394d71f066f7245154ece57fffa38a2c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Oct 2025 03:51:17 -0700
Subject: [PATCH 0463/6226] python3Packages.pytest-celery: fix typo

---
 pkgs/development/python-modules/pytest-celery/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix
index 568159010c9d..0249bc8dbfe8 100644
--- a/pkgs/development/python-modules/pytest-celery/default.nix
+++ b/pkgs/development/python-modules/pytest-celery/default.nix
@@ -42,7 +42,7 @@ buildPythonPackage rec {
 
   build-system = [ poetry-core ];
 
-  buildInput = [ pytest ];
+  buildInputs = [ pytest ];
 
   dependencies = [
     (celery.overridePythonAttrs { doCheck = false; })

From e801416c3e0b0d2f6f2c23b46b7f00f87e263d83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Oct 2025 04:00:08 -0700
Subject: [PATCH 0464/6226] python3Packages.pytest-celery: don't depend on
 celery and setuptools

---
 .../development/python-modules/pytest-celery/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-celery/default.nix b/pkgs/development/python-modules/pytest-celery/default.nix
index 0249bc8dbfe8..524388907301 100644
--- a/pkgs/development/python-modules/pytest-celery/default.nix
+++ b/pkgs/development/python-modules/pytest-celery/default.nix
@@ -11,7 +11,6 @@
   pytest-docker-tools,
   pytest,
   pythonOlder,
-  setuptools,
   tenacity,
 }:
 
@@ -37,7 +36,11 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [
     "debugpy"
-    "setuptools"
+  ];
+
+  pythonRemoveDeps = [
+    "celery" # cyclic dependency
+    "setuptools" # https://github.com/celery/pytest-celery/pull/464
   ];
 
   build-system = [ poetry-core ];
@@ -45,13 +48,11 @@ buildPythonPackage rec {
   buildInputs = [ pytest ];
 
   dependencies = [
-    (celery.overridePythonAttrs { doCheck = false; })
     debugpy
     docker
     kombu
     psutil
     pytest-docker-tools
-    setuptools
     tenacity
   ];
 

From 669813e0d27fd1e8dfccd9d60fa64a91b743d61c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 3 Oct 2025 04:03:52 -0700
Subject: [PATCH 0465/6226] python3Packages.celery: add
 optional-dependencies.auth

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

diff --git a/pkgs/development/python-modules/celery/default.nix b/pkgs/development/python-modules/celery/default.nix
index 17c6e9c0f84d..afd13b3844d2 100644
--- a/pkgs/development/python-modules/celery/default.nix
+++ b/pkgs/development/python-modules/celery/default.nix
@@ -9,6 +9,7 @@
   click-plugins,
   click-repl,
   click,
+  cryptography,
   fetchFromGitHub,
   gevent,
   google-cloud-firestore,
@@ -66,6 +67,7 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
+    auth = [ cryptography ];
     azureblockblob = [
       azure-identity
       azure-storage-blob

From 8bb2e841bd04d2bf6d09202c768402b1dd3adb49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 6 Oct 2025 07:48:49 -0700
Subject: [PATCH 0466/6226] python3Packages.greynoise: don't include REPL by
 default

The REPL depends on click-repl, which doesn't support click >= 8.2.0.
---
 .../python-modules/greynoise/default.nix      | 15 +++++++-
 .../greynoise/remove-repl.patch               | 37 +++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/python-modules/greynoise/remove-repl.patch

diff --git a/pkgs/development/python-modules/greynoise/default.nix b/pkgs/development/python-modules/greynoise/default.nix
index 0b9631179569..2ffdbcc4c8de 100644
--- a/pkgs/development/python-modules/greynoise/default.nix
+++ b/pkgs/development/python-modules/greynoise/default.nix
@@ -17,6 +17,9 @@
   pytestCheckHook,
   mock,
   pythonOlder,
+  # The REPL depends on click-repl, which is incompatible with our version of
+  # click.
+  withRepl ? false,
 }:
 
 buildPythonPackage rec {
@@ -33,22 +36,32 @@ buildPythonPackage rec {
     hash = "sha256-wJDO666HC3EohfR+LbG5F0Cp/eL7q4kXniWhJfc7C3s=";
   };
 
+  patches = lib.optionals (!withRepl) [
+    ./remove-repl.patch
+  ];
+
   build-system = [
     hatchling
   ];
 
+  pythonRelaxDeps = [
+    "click"
+  ];
+
   dependencies = [
     click
     ansimarkup
     cachetools
     colorama
     click-default-group
-    click-repl
     dict2xml
     jinja2
     more-itertools
     requests
     six
+  ]
+  ++ lib.optionals withRepl [
+    click-repl
   ];
 
   nativeCheckInputs = [
diff --git a/pkgs/development/python-modules/greynoise/remove-repl.patch b/pkgs/development/python-modules/greynoise/remove-repl.patch
new file mode 100644
index 000000000000..88f46af3bdc3
--- /dev/null
+++ b/pkgs/development/python-modules/greynoise/remove-repl.patch
@@ -0,0 +1,37 @@
+diff --git a/pyproject.toml b/pyproject.toml
+index 9c5950e..f19a5db 100644
+--- a/pyproject.toml
++++ b/pyproject.toml
+@@ -33,7 +33,6 @@ dependencies = [
+     "cachetools",
+     "colorama",
+     "click-default-group",
+-    "click-repl",
+     "dict2xml",
+     "jinja2",
+     "more-itertools>=8.14.0",
+@@ -53,4 +52,4 @@ greynoise = "greynoise.cli:main"
+ packages = ["src/greynoise"]
+ 
+ [tool.hatch.build.targets.wheel.shared-data]
+-"src/greynoise/cli/templates/*.j2" = "greynoise/cli/templates" 
+\ No newline at end of file
++"src/greynoise/cli/templates/*.j2" = "greynoise/cli/templates"
+diff --git a/src/greynoise/cli/__init__.py b/src/greynoise/cli/__init__.py
+index a7c22ea..9d26d3e 100644
+--- a/src/greynoise/cli/__init__.py
++++ b/src/greynoise/cli/__init__.py
+@@ -2,7 +2,6 @@
+ 
+ import click
+ from click_default_group import DefaultGroup
+-from click_repl import register_repl
+ 
+ from greynoise.cli import subcommand
+ 
+@@ -24,5 +23,3 @@ SUBCOMMAND_FUNCTIONS = [
+ 
+ for subcommand_function in SUBCOMMAND_FUNCTIONS:
+     main.add_command(subcommand_function)
+-
+-register_repl(main)

From dbef4cf7a096e9db7540778a94a1040d242a4a20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 7 Oct 2025 05:46:11 -0700
Subject: [PATCH 0467/6226] python3Packages.flasgger: fix tests with Click 8.2

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

diff --git a/pkgs/development/python-modules/flasgger/default.nix b/pkgs/development/python-modules/flasgger/default.nix
index 1cc0d1fb7648..7cd1174589c9 100644
--- a/pkgs/development/python-modules/flasgger/default.nix
+++ b/pkgs/development/python-modules/flasgger/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   # build-system
   setuptools,
@@ -31,6 +32,15 @@ buildPythonPackage rec {
     hash = "sha256-ULEf9DJiz/S2wKlb/vjGto8VCI0QDcm0pkU5rlOwtiE=";
   };
 
+  patches = [
+    # https://github.com/flasgger/flasgger/pull/633
+    (fetchpatch {
+      name = "fix-tests-with-click-8.2.patch";
+      url = "https://github.com/flasgger/flasgger/commit/08591b60e988c0002fcf1b1e9f98b78e041d2732.patch";
+      hash = "sha256-DHaaY9W+cta3M2VA8S+ZQWacmgSpeyP03SKTiIlfBRM=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [

From f6a4509bfb4785a844b98f043f738dc553c33d37 Mon Sep 17 00:00:00 2001
From: sweenu <contact@sweenu.xyz>
Date: Mon, 22 Sep 2025 11:17:10 +0200
Subject: [PATCH 0468/6226] nixos/n8n: use env vars instead of config file

---
 nixos/modules/services/misc/n8n.nix | 98 ++++++++++++++++++-----------
 nixos/tests/n8n.nix                 |  4 +-
 2 files changed, 65 insertions(+), 37 deletions(-)

diff --git a/nixos/modules/services/misc/n8n.nix b/nixos/modules/services/misc/n8n.nix
index f3e9f698e35f..60c4e1cfd3f7 100644
--- a/nixos/modules/services/misc/n8n.nix
+++ b/nixos/modules/services/misc/n8n.nix
@@ -6,10 +6,17 @@
 }:
 let
   cfg = config.services.n8n;
-  format = pkgs.formats.json { };
-  configFile = format.generate "n8n.json" cfg.settings;
 in
 {
+  imports = [
+    (lib.mkRemovedOptionModule [ "services" "n8n" "settings" ] "Use services.n8n.environment instead.")
+    (lib.mkRemovedOptionModule [
+      "services"
+      "n8n"
+      "webhookUrl"
+    ] "Use services.n8n.environment.WEBHOOK_URL instead.")
+  ];
+
   options.services.n8n = {
     enable = lib.mkEnableOption "n8n server";
 
@@ -19,47 +26,66 @@ in
       description = "Open ports in the firewall for the n8n web interface.";
     };
 
-    settings = lib.mkOption {
-      type = format.type;
+    environment = lib.mkOption {
+      description = ''
+        Environment variables to pass to the n8n service.
+        See <https://docs.n8n.io/hosting/configuration/environment-variables/> for available options.
+      '';
+      type = lib.types.submodule {
+        freeformType = with lib.types; attrsOf str;
+        options = {
+          GENERIC_TIMEZONE = lib.mkOption {
+            type = with lib.types; nullOr str;
+            default = config.time.timeZone;
+            defaultText = lib.literalExpression "config.time.timeZone";
+            description = ''
+              The n8n instance timezone. Important for schedule nodes (such as Cron).
+            '';
+          };
+          N8N_PORT = lib.mkOption {
+            type = with lib.types; coercedTo port toString str;
+            default = 5678;
+            description = "The HTTP port n8n runs on.";
+          };
+          N8N_USER_FOLDER = lib.mkOption {
+            type = lib.types.path;
+            # This folder must be writeable as the application is storing
+            # its data in it, so the StateDirectory is a good choice
+            default = "/var/lib/n8n";
+            description = ''
+              Provide the path where n8n will create the .n8n folder.
+              This directory stores user-specific data, such as database file and encryption key.
+            '';
+            readOnly = true;
+          };
+          N8N_DIAGNOSTICS_ENABLED = lib.mkOption {
+            type = with lib.types; coercedTo bool toString str;
+            default = false;
+            description = ''
+              Whether to share selected, anonymous telemetry with n8n.
+              Note that if you set this to false, you can't enable Ask AI in the Code node.
+            '';
+          };
+          N8N_VERSION_NOTIFICATIONS_ENABLED = lib.mkOption {
+            type = with lib.types; coercedTo bool toString str;
+            default = false;
+            description = ''
+              When enabled, n8n sends notifications of new versions and security updates.
+            '';
+          };
+        };
+      };
       default = { };
-      description = ''
-        Configuration for n8n, see <https://docs.n8n.io/hosting/environment-variables/configuration-methods/>
-        for supported values.
-      '';
     };
-
-    webhookUrl = lib.mkOption {
-      type = lib.types.str;
-      default = "";
-      description = ''
-        WEBHOOK_URL for n8n, in case we're running behind a reverse proxy.
-        This cannot be set through configuration and must reside in an environment variable.
-      '';
-    };
-
   };
 
   config = lib.mkIf cfg.enable {
-    services.n8n.settings = {
-      # We use this to open the firewall, so we need to know about the default at eval time
-      port = lib.mkDefault 5678;
-    };
-
     systemd.services.n8n = {
-      description = "N8N service";
+      description = "n8n service";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      environment = {
-        # This folder must be writeable as the application is storing
-        # its data in it, so the StateDirectory is a good choice
-        N8N_USER_FOLDER = "/var/lib/n8n";
-        HOME = "/var/lib/n8n";
-        N8N_CONFIG_FILES = "${configFile}";
-        WEBHOOK_URL = "${cfg.webhookUrl}";
-
-        # Don't phone home
-        N8N_DIAGNOSTICS_ENABLED = "false";
-        N8N_VERSION_NOTIFICATIONS_ENABLED = "false";
+      environment = cfg.environment // {
+        HOME = config.services.n8n.environment.N8N_USER_FOLDER;
       };
       serviceConfig = {
         Type = "simple";
@@ -88,7 +114,7 @@ in
     };
 
     networking.firewall = lib.mkIf cfg.openFirewall {
-      allowedTCPPorts = [ cfg.settings.port ];
+      allowedTCPPorts = [ (lib.toInt cfg.environment.N8N_PORT) ];
     };
   };
 }
diff --git a/nixos/tests/n8n.nix b/nixos/tests/n8n.nix
index 56ffabaca1ed..673e322f786b 100644
--- a/nixos/tests/n8n.nix
+++ b/nixos/tests/n8n.nix
@@ -23,7 +23,7 @@ in
 
       services.n8n = {
         enable = true;
-        webhookUrl = webhookUrl;
+        environment.WEBHOOK_URL = webhookUrl;
       };
     };
 
@@ -32,5 +32,7 @@ in
     machine.wait_for_console_text("Editor is now accessible via")
     machine.succeed("curl --fail -vvv http://localhost:${toString port}/")
     machine.succeed("grep -qF ${webhookUrl} /etc/systemd/system/n8n.service")
+    machine.succeed("grep -qF 'HOME=/var/lib/n8n' /etc/systemd/system/n8n.service")
+    machine.fail("grep -qF 'GENERIC_TIMEZONE=' /etc/systemd/system/n8n.service")
   '';
 }

From 349bee348ece8acf571603f6cd3d0432cbd3bcbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 7 Oct 2025 06:00:16 -0700
Subject: [PATCH 0469/6226] python3Packages.typer: 0.17.4 -> 0.19.2

Diff: https://github.com/fastapi/typer/compare/0.17.4...0.19.2

Changelog: https://github.com/tiangolo/typer/releases/tag/0.19.2
---
 pkgs/development/python-modules/typer/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/typer/default.nix b/pkgs/development/python-modules/typer/default.nix
index 7b8d2a1b2289..c8ee4e01a9ef 100644
--- a/pkgs/development/python-modules/typer/default.nix
+++ b/pkgs/development/python-modules/typer/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = package;
-  version = "0.17.4";
+  version = "0.19.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fastapi";
     repo = "typer";
     tag = version;
-    hash = "sha256-gd4GgoRnQVVmwmW5DprmNRxgjFiRRa8HB6xO9U9wHI8=";
+    hash = "sha256-mMsOEI4FpLkLkpjxjnUdmKdWD65Zx3Z1+L+XsS79k44=";
   };
 
   env.TIANGOLO_BUILD_PACKAGE = package;
@@ -80,12 +80,6 @@ buildPythonPackage rec {
     "test_install_completion"
   ];
 
-  disabledTestPaths = [
-    # likely click 8.2 compat issue
-    "tests/test_tutorial/test_parameter_types/test_bool/test_tutorial002_an.py"
-    "tests/test_tutorial/test_parameter_types/test_bool/test_tutorial002.py"
-  ];
-
   pythonImportsCheck = [ "typer" ];
 
   meta = {

From dedd3c3f5344c6659eb85dc79a0588765950cd9b Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Tue, 7 Oct 2025 15:08:14 +0200
Subject: [PATCH 0470/6226] libxml2: use fetchpatch instead of fetchpatch2

---
 pkgs/development/libraries/libxml2/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index 3c1632ea8273..8c4c1c653092 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/pkgs/development/libraries/libxml2/default.nix
@@ -2,7 +2,7 @@
   lib,
   callPackage,
   fetchFromGitLab,
-  fetchpatch2,
+  fetchpatch,
 }:
 
 let
@@ -20,15 +20,15 @@ let
         # same as upstream patch but fixed conflict and added required import:
         # https://gitlab.gnome.org/GNOME/libxml2/-/commit/acbbeef9f5dcdcc901c5f3fa14d583ef8cfd22f0.diff
         ./CVE-2025-6021.patch
-        (fetchpatch2 {
+        (fetchpatch {
           name = "CVE-2025-49794-49796.patch";
           url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/f7ebc65f05bffded58d1e1b2138eb124c2e44f21.patch";
-          hash = "sha256-k+IGq6pbv9EA7o+uDocEAUqIammEjLj27Z+2RF5EMrs=";
+          hash = "sha256-p5Vc/lkakHKsxuFNnCQtFczjqFJBeLnCwIwv2GnrQco=";
         })
-        (fetchpatch2 {
+        (fetchpatch {
           name = "CVE-2025-49795.patch";
           url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/c24909ba2601848825b49a60f988222da3019667.patch";
-          hash = "sha256-r7PYKr5cDDNNMtM3ogNLsucPFTwP/uoC7McijyLl4kU=";
+          hash = "sha256-vICVSb+X89TTE4QY92/v/6fRk77Hy9vzEWWsADHqMlk=";
           excludes = [ "runtest.c" ]; # tests were rewritten in C and are on schematron for 2.13.x, meaning this does not apply
         })
         # same as upstream, fixed conflicts
@@ -62,9 +62,9 @@ let
         # Fixes a regression in attribute normalization.
         # Also see https://www.postgresql.org/message-id/flat/0756AC61-FBA3-46E2-B3C2-19B58B65EBDC%2540yesql.se
         # To be removed with 2.15.1.
-        (fetchpatch2 {
+        (fetchpatch {
           url = "https://gitlab.gnome.org/GNOME/libxml2/-/commit/da45a190f718e8e2f0e3d2a6325ffa23abc8b90c.patch";
-          hash = "sha256-dE5DxkP+LBZ8N5V3x02Q1xOU9IXDvvr64xzcln0QH0E=";
+          hash = "sha256-wqmFszr7w1Lte12YR6Ug7Ng7fXABzizwUsJU1EhylgU=";
         })
       ];
       extraMeta = {

From 8e4e42d0a0a36db5a5ae11e0afdc5e88130524e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Oct 2025 14:11:27 +0000
Subject: [PATCH 0471/6226] vim: 9.1.1765 -> 9.1.1833

---
 pkgs/applications/editors/vim/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix
index 11875eaac7e1..de4362946baa 100644
--- a/pkgs/applications/editors/vim/common.nix
+++ b/pkgs/applications/editors/vim/common.nix
@@ -1,6 +1,6 @@
 { lib, fetchFromGitHub }:
 rec {
-  version = "9.1.1765";
+  version = "9.1.1833";
 
   outputs = [
     "out"
@@ -11,7 +11,7 @@ rec {
     owner = "vim";
     repo = "vim";
     rev = "v${version}";
-    hash = "sha256-bL6mqnke0uE0Bk7oYjJPiPtl/9Qk8fvCXrQVqAb7pPM=";
+    hash = "sha256-bcHTwrJt7ERsIYydCj+Um4AY7sREtkdkqlEA0OdgnuM=";
   };
 
   enableParallelBuilding = true;

From 7ed13b337fb01882901de595c117fd261e4c9a62 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Oct 2025 14:36:11 +0000
Subject: [PATCH 0472/6226] lefthook: 1.13.4 -> 1.13.6

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

diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix
index acea00b9b3c0..38d2ec6c1814 100644
--- a/pkgs/by-name/le/lefthook/package.nix
+++ b/pkgs/by-name/le/lefthook/package.nix
@@ -8,7 +8,7 @@
 
 let
   pname = "lefthook";
-  version = "1.13.4";
+  version = "1.13.6";
 in
 buildGoModule {
   inherit pname version;
@@ -17,10 +17,10 @@ buildGoModule {
     owner = "evilmartians";
     repo = "lefthook";
     rev = "v${version}";
-    hash = "sha256-/ZZ+eFHKQoqOzUNpTZ1Ef2A0EQbgT+CWau/q9hhuTHU=";
+    hash = "sha256-R9Cj2mXgAZFZMvEFF7ky1bAhy6L6Z4fcYPHY0CGVBr0=";
   };
 
-  vendorHash = "sha256-HQ6xpHYAOkT48UvOIf0g49jp5dt/4zuwmy8r/9KAZUk=";
+  vendorHash = "sha256-Md2VTvcbSMQ8ce96wyoS4Uw90MERGEeHSZc9iL0pRNs=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From eb590fd24136f81d40385813e021c4740438d654 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Tue, 7 Oct 2025 11:38:26 -0400
Subject: [PATCH 0473/6226] python313: 3.13.7 -> 3.13.8

https://docs.python.org/release/3.13.8/whatsnew/changelog.html#python-3-13-8
---
 pkgs/development/interpreters/python/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/default.nix b/pkgs/development/interpreters/python/default.nix
index ae70e475b739..926c90db8261 100644
--- a/pkgs/development/interpreters/python/default.nix
+++ b/pkgs/development/interpreters/python/default.nix
@@ -20,10 +20,10 @@
         sourceVersion = {
           major = "3";
           minor = "13";
-          patch = "7";
+          patch = "8";
           suffix = "";
         };
-        hash = "sha256-VGL5CZ39MOI43vg8cdkYl9jKpf9uvHpQ8U1IAs2qp5o=";
+        hash = "sha256-uZEHMFJrKYKZtGs1WVztkFVyLfYMBq1jAfak4scoolI=";
       };
     };
 

From 1f6865500b9876d387029efbfdf422ee3174f495 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 7 Oct 2025 20:16:03 +0300
Subject: [PATCH 0474/6226] vulkan-headers: 1.4.321.0 -> 1.4.328.0

Diff: https://github.com/KhronosGroup/Vulkan-Headers/compare/vulkan-sdk-1.4.321.0...vulkan-sdk-1.4.328.0
---
 pkgs/by-name/vu/vulkan-headers/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vulkan-headers/package.nix b/pkgs/by-name/vu/vulkan-headers/package.nix
index c1b118fc6cef..cd719a2021ce 100644
--- a/pkgs/by-name/vu/vulkan-headers/package.nix
+++ b/pkgs/by-name/vu/vulkan-headers/package.nix
@@ -7,7 +7,7 @@
 }:
 stdenv.mkDerivation rec {
   pname = "vulkan-headers";
-  version = "1.4.321.0";
+  version = "1.4.328.0";
 
   # Adding `ninja` here to enable Ninja backend. Otherwise on gcc-14 or
   # later the build fails as:
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     owner = "KhronosGroup";
     repo = "Vulkan-Headers";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-Yznjiiu/EEW7B37hbO0aw8Lvc6aVxOy7J/zSwmGxVc0=";
+    hash = "sha256-Sg/zp6UhRC5wqBS3vdfs0sQL8cBgLiwvfG0oY0v9MWU=";
   };
 
   passthru.updateScript = ./update.sh;

From b526de4b89f3d252c39a983c2508130490c729cc Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 7 Oct 2025 20:16:07 +0300
Subject: [PATCH 0475/6226] vulkan-loader: 1.4.321.0 -> 1.4.328.0

Diff: https://github.com/KhronosGroup/Vulkan-Loader/compare/vulkan-sdk-1.4.321.0...vulkan-sdk-1.4.328.0
---
 pkgs/by-name/vu/vulkan-loader/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vulkan-loader/package.nix b/pkgs/by-name/vu/vulkan-loader/package.nix
index 323dbd95dcbe..97cfc1168acf 100644
--- a/pkgs/by-name/vu/vulkan-loader/package.nix
+++ b/pkgs/by-name/vu/vulkan-loader/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vulkan-loader";
-  version = "1.4.321.0";
+  version = "1.4.328.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-Loader";
     rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-i06il1GRkjSlhY36XpIUCcd1Wy+If+Eennzbb//1dzk=";
+    hash = "sha256-+cuKdhdCMIL4b+GzIpCNrDBmC7cVX0iX2QW7BQIj9Tc=";
   };
 
   patches = [ ./fix-pkgconfig.patch ];

From 522da385565e73731e67b1f35dfc1dab05b9ca29 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 7 Oct 2025 20:16:22 +0300
Subject: [PATCH 0476/6226] vulkan-validation-layers: 1.4.321.0 -> 1.4.328.0

Diff: https://github.com/KhronosGroup/Vulkan-ValidationLayers/compare/vulkan-sdk-1.4.321.0...vulkan-sdk-1.4.328.0
---
 pkgs/by-name/vu/vulkan-validation-layers/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vulkan-validation-layers/package.nix b/pkgs/by-name/vu/vulkan-validation-layers/package.nix
index 5ec68fa4c0b1..9a363aacc58d 100644
--- a/pkgs/by-name/vu/vulkan-validation-layers/package.nix
+++ b/pkgs/by-name/vu/vulkan-validation-layers/package.nix
@@ -25,13 +25,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "vulkan-validation-layers";
-  version = "1.4.321.0";
+  version = "1.4.328.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-ValidationLayers";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-aTO8AIwN6/oOcxu6AgYBoOQiUHQkT6MJGAYNgP5js9I=";
+    hash = "sha256-iz6kWvnfVnznn78XNHJqSvIW4TYkp2KgEFT302VAiaY=";
   };
 
   strictDeps = true;

From 8d94d383c7006e49c9274f09a9e5fb3527360209 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 7 Oct 2025 20:16:28 +0300
Subject: [PATCH 0477/6226] vulkan-tools: 1.4.321.0 -> 1.4.328.0

Diff: https://github.com/KhronosGroup/Vulkan-Tools/compare/vulkan-sdk-1.4.321.0...vulkan-sdk-1.4.328.0
---
 pkgs/by-name/vu/vulkan-tools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vulkan-tools/package.nix b/pkgs/by-name/vu/vulkan-tools/package.nix
index dfd2fc523697..ee60fd444174 100644
--- a/pkgs/by-name/vu/vulkan-tools/package.nix
+++ b/pkgs/by-name/vu/vulkan-tools/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-tools";
-  version = "1.4.321.0";
+  version = "1.4.328.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-Tools";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-cd7aLDhXiZ4Wlnrx2dfCQG3j+9vosM3SeohhCNvVN48=";
+    hash = "sha256-QoqlHrhgaV1SRLAxmYUXaKxH1IdbnxqkcJklDy20ORg=";
   };
 
   patches = [ ./wayland-scanner.patch ];

From 5a4d09406ba385bcf81decb42bffc0f63e382423 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 7 Oct 2025 20:16:47 +0300
Subject: [PATCH 0478/6226] vulkan-tools-lunarg: 1.4.321.0 -> 1.4.328.0

Diff: https://github.com/LunarG/VulkanTools/compare/vulkan-sdk-1.4.321.0...vulkan-sdk-1.4.328.0
---
 pkgs/by-name/vu/vulkan-tools-lunarg/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
index 47bd85ab67b8..b4ec722ca336 100644
--- a/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
+++ b/pkgs/by-name/vu/vulkan-tools-lunarg/package.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-tools-lunarg";
-  version = "1.4.321.0";
+  version = "1.4.328.0";
 
   src = fetchFromGitHub {
     owner = "LunarG";
     repo = "VulkanTools";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-Wd37AYfZ8Ia5kXS9Nvxyj7s+W2DPHUONtqD+tX45XGk=";
+    hash = "sha256-kywAcpBYLSlhEbgssXGwMoXQC03QUEz4dwsvI0I8Nh4=";
   };
 
   nativeBuildInputs = [

From cd6f521e0031bc17c017c666a0db27d1dc530686 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 7 Oct 2025 20:16:56 +0300
Subject: [PATCH 0479/6226] vulkan-extension-layer: 1.4.321.0 -> 1.4.328.0

Diff: https://github.com/KhronosGroup/Vulkan-ExtensionLayer/compare/vulkan-sdk-1.4.321.0...vulkan-sdk-1.4.328.0
---
 pkgs/by-name/vu/vulkan-extension-layer/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vulkan-extension-layer/package.nix b/pkgs/by-name/vu/vulkan-extension-layer/package.nix
index b64bfb519150..057589a9a18c 100644
--- a/pkgs/by-name/vu/vulkan-extension-layer/package.nix
+++ b/pkgs/by-name/vu/vulkan-extension-layer/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-extension-layer";
-  version = "1.4.321.0";
+  version = "1.4.328.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-ExtensionLayer";
     rev = "vulkan-sdk-${version}";
-    hash = "sha256-tWUi+yCI7wNLVeGg/h5a+yvKWAu8KZqtgEujfCUtYQ4=";
+    hash = "sha256-J9l20abn7meSF0WnCh3cepYKQh10ezb0mAKzc0HAo1w=";
   };
 
   nativeBuildInputs = [

From 7d5c22627991ac40c61ec8ec33f3001420e49e54 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 7 Oct 2025 20:17:03 +0300
Subject: [PATCH 0480/6226] vulkan-utility-libraries: 1.4.321.0 -> 1.4.328.0

Diff: https://github.com/KhronosGroup/Vulkan-Utility-Libraries/compare/vulkan-sdk-1.4.321.0...vulkan-sdk-1.4.328.0
---
 pkgs/by-name/vu/vulkan-utility-libraries/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix
index 71601060ee97..03066b567ef5 100644
--- a/pkgs/by-name/vu/vulkan-utility-libraries/package.nix
+++ b/pkgs/by-name/vu/vulkan-utility-libraries/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vulkan-utility-libraries";
-  version = "1.4.321.0";
+  version = "1.4.328.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "Vulkan-Utility-Libraries";
     rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-MaEn0qVTnhp5kKCbyMhFXysIcAnZF+ba4+KaVD4wSPY=";
+    hash = "sha256-qcCATZWM0YJ02Dl5VxjvbFYoE2b0r7Ku+ELr2is2VIg=";
   };
 
   nativeBuildInputs = [

From dd0412bdf34094dae5b06a0398401e7a844fc3e8 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 7 Oct 2025 20:17:09 +0300
Subject: [PATCH 0481/6226] vulkan-volk: 1.4.321.0 -> 1.4.328.0

Diff: https://github.com/zeux/volk/compare/vulkan-sdk-1.4.321.0...vulkan-sdk-1.4.328.0
---
 pkgs/by-name/vu/vulkan-volk/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vulkan-volk/package.nix b/pkgs/by-name/vu/vulkan-volk/package.nix
index 22be9032106e..5168ba77f452 100644
--- a/pkgs/by-name/vu/vulkan-volk/package.nix
+++ b/pkgs/by-name/vu/vulkan-volk/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "volk";
-  version = "1.4.321.0";
+  version = "1.4.328.0";
 
   src = fetchFromGitHub {
     owner = "zeux";
     repo = "volk";
     rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-Revi0OVvLI23yh1R6mNfcUCo1DXlACLjIw+k6EZQb/U=";
+    hash = "sha256-7JhTLhCqdn/zDIYdIb2xJnjJVk57i+6M5OXk0KvfpDk=";
   };
 
   nativeBuildInputs = [ cmake ];

From 742f250090206c3a553011e869509606cc3aee19 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 7 Oct 2025 20:17:13 +0300
Subject: [PATCH 0482/6226] spirv-headers: 1.4.321.0-unstable-2025-06-24 ->
 1.4.328.0

Diff: https://github.com/KhronosGroup/SPIRV-Headers/compare/9e3836d7d6023843a72ecd3fbf3f09b1b6747a9e...vulkan-sdk-1.4.328.0
---
 pkgs/by-name/sp/spirv-headers/package.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/sp/spirv-headers/package.nix b/pkgs/by-name/sp/spirv-headers/package.nix
index 8a4f92e9dfb2..400c8244a344 100644
--- a/pkgs/by-name/sp/spirv-headers/package.nix
+++ b/pkgs/by-name/sp/spirv-headers/package.nix
@@ -5,18 +5,15 @@
   cmake,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "spirv-headers";
-  version = "1.4.321.0-unstable-2025-06-24";
+  version = "1.4.328.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Headers";
-    # The release for Vulkan SDK 1.4.321.0 is missing a PR required for
-    # LLVM 21 support in SPIRV-LLVM-Translator; return to the
-    # `vulkan-sdk-*` tags on the next stable release.
-    rev = "9e3836d7d6023843a72ecd3fbf3f09b1b6747a9e";
-    hash = "sha256-N8NBAkkpOcbgap4loPJJW6E5bjG+TixCh/HN259RyjI=";
+    rev = "vulkan-sdk-${finalAttrs.version}";
+    hash = "sha256-gewCQvcVRw+qdWPWRlYUMTt/aXrZ7Lea058WyqL5c08=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -27,4 +24,4 @@ stdenv.mkDerivation {
     license = licenses.mit;
     maintainers = [ maintainers.ralith ];
   };
-}
+})

From b71e1949d5b016ab222a072b7bf002ab3465079a Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 7 Oct 2025 20:17:28 +0300
Subject: [PATCH 0483/6226] spirv-cross: 1.4.321.0 -> 1.4.328.0

Diff: https://github.com/KhronosGroup/SPIRV-Cross/compare/vulkan-sdk-1.4.321.0...vulkan-sdk-1.4.328.0

Changelog: https://github.com/KhronosGroup/SPIRV-Cross/releases/tag/1.4.328.0
---
 pkgs/by-name/sp/spirv-cross/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sp/spirv-cross/package.nix b/pkgs/by-name/sp/spirv-cross/package.nix
index 20b464dd5ea0..738ebfc4dcad 100644
--- a/pkgs/by-name/sp/spirv-cross/package.nix
+++ b/pkgs/by-name/sp/spirv-cross/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "spirv-cross";
-  version = "1.4.321.0";
+  version = "1.4.328.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Cross";
     rev = "vulkan-sdk-${finalAttrs.version}";
-    hash = "sha256-qmJK29PtjDE4+6uF8Mj6noAcRoeM3rHWRbUvcr6JzI0=";
+    hash = "sha256-Fq2Kw8KOlh35hRZy5EnPtWAjazun4vdTk/HyhY76GRM=";
   };
 
   nativeBuildInputs = [

From ebe9c88c7bc9ea47dd9bb998fb1fd16c28e1d3e7 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 7 Oct 2025 20:17:37 +0300
Subject: [PATCH 0484/6226] spirv-tools: 1.4.321.0-unstable-2025-06-25 ->
 1.4.328.0

Diff: https://github.com/KhronosGroup/SPIRV-Tools/compare/28a883ba4c67f58a9540fb0651c647bb02883622...vulkan-sdk-1.4.328.0
---
 pkgs/by-name/sp/spirv-tools/package.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/sp/spirv-tools/package.nix b/pkgs/by-name/sp/spirv-tools/package.nix
index afd55c4dc742..03b10d0abcd9 100644
--- a/pkgs/by-name/sp/spirv-tools/package.nix
+++ b/pkgs/by-name/sp/spirv-tools/package.nix
@@ -7,18 +7,15 @@
   spirv-headers,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "spirv-tools";
-  version = "1.4.321.0-unstable-2025-06-25";
+  version = "1.4.328.0";
 
   src = fetchFromGitHub {
     owner = "KhronosGroup";
     repo = "SPIRV-Tools";
-    # The SPIRV-Headers release for Vulkan SDK 1.4.321.0 is missing
-    # a PR required for LLVM 21 support in SPIRV-LLVM-Translator;
-    # return to the `vulkan-sdk-*` tags on the next stable release.
-    rev = "28a883ba4c67f58a9540fb0651c647bb02883622";
-    hash = "sha256-yRzpEBGyTr9oovsh3TUnJsR/luHNAPkotcJFWh7R1Fc=";
+    rev = "vulkan-sdk-${finalAttrs.version}";
+    hash = "sha256-NXxC5XLvEEIAlA0sym6l7vWj+g8pJ4trsJI3pmZwRxU=";
   };
 
   # The cmake options are sufficient for turning on static building, but not
@@ -60,4 +57,4 @@ stdenv.mkDerivation {
     platforms = with platforms; unix ++ windows;
     maintainers = [ maintainers.ralith ];
   };
-}
+})

From d5a9b6b70c53ee2e7ecb236d3273745021964fdf Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 7 Oct 2025 20:25:57 +0300
Subject: [PATCH 0485/6226] vulkan-tools: bring back the cube

Praise the cube.
---
 pkgs/by-name/vu/vulkan-tools/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/vu/vulkan-tools/package.nix b/pkgs/by-name/vu/vulkan-tools/package.nix
index ee60fd444174..122e75d0e40b 100644
--- a/pkgs/by-name/vu/vulkan-tools/package.nix
+++ b/pkgs/by-name/vu/vulkan-tools/package.nix
@@ -70,9 +70,6 @@ stdenv.mkDerivation rec {
   env.PKG_CONFIG_WAYLAND_SCANNER_WAYLAND_SCANNER = lib.getExe buildPackages.wayland-scanner;
 
   cmakeFlags = [
-    # Temporarily disabled, see https://github.com/KhronosGroup/Vulkan-Tools/issues/1130
-    # FIXME: remove when fixed upstream
-    "-DBUILD_CUBE=OFF"
     # Don't build the mock ICD as it may get used instead of other drivers, if installed
     "-DBUILD_ICD=OFF"
     # vulkaninfo loads libvulkan using dlopen, so we have to add it manually to RPATH

From 33c5fd0a77fd32b7801ac33d609390ee1526e0d9 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 7 Oct 2025 14:21:23 +0300
Subject: [PATCH 0486/6226] qt6.qtbase: be more verbose when configuring

---
 pkgs/development/libraries/qt-6/modules/qtbase/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index df8286ee8f46..5b5e987d9ef7 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -251,6 +251,9 @@ stdenv.mkDerivation rec {
   qtQmlPrefix = "lib/qt-6/qml";
 
   cmakeFlags = [
+    # makes Qt print the configure summary
+    "--log-level=STATUS"
+
     "-DQT_EMBED_TOOLCHAIN_COMPILER=OFF"
     "-DINSTALL_PLUGINSDIR=${qtPluginPrefix}"
     "-DINSTALL_QMLDIR=${qtQmlPrefix}"

From 745d05cff5a8e51c7fdeae39de24478aab093e3d Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 7 Oct 2025 14:22:09 +0300
Subject: [PATCH 0487/6226] qt6.qtModule: be more verbose everywhere else too

---
 pkgs/development/libraries/qt-6/qtModule.nix | 23 +++++++++++---------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/qtModule.nix b/pkgs/development/libraries/qt-6/qtModule.nix
index ac37bfd4f96e..07aa27e13abf 100644
--- a/pkgs/development/libraries/qt-6/qtModule.nix
+++ b/pkgs/development/libraries/qt-6/qtModule.nix
@@ -37,18 +37,21 @@ stdenv.mkDerivation (
       (lib.warnIf (args ? qtInputs) "qt6.qtModule's qtInputs argument is deprecated" args.qtInputs or [ ])
       ++ (args.propagatedBuildInputs or [ ]);
 
-    cmakeFlags =
+    cmakeFlags = [
+      # be more verbose
+      "--log-level=STATUS"
       # don't leak OS version into the final output
       # https://bugreports.qt.io/browse/QTBUG-136060
-      [ "-DCMAKE_SYSTEM_VERSION=" ]
-      ++ lib.optionals stdenv.hostPlatform.isDarwin [
-        "-DQT_NO_XCODE_MIN_VERSION_CHECK=ON"
-        # This is only used for the min version check, which we disabled above.
-        # When this variable is not set, cmake tries to execute xcodebuild
-        # to query the version.
-        "-DQT_INTERNAL_XCODE_VERSION=0.1"
-      ]
-      ++ args.cmakeFlags or [ ];
+      "-DCMAKE_SYSTEM_VERSION="
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      "-DQT_NO_XCODE_MIN_VERSION_CHECK=ON"
+      # This is only used for the min version check, which we disabled above.
+      # When this variable is not set, cmake tries to execute xcodebuild
+      # to query the version.
+      "-DQT_INTERNAL_XCODE_VERSION=0.1"
+    ]
+    ++ args.cmakeFlags or [ ];
 
     moveToDev = false;
 

From 60e9798ba5e36c7c7e6baafc8dad7b146bc06639 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 7 Oct 2025 14:20:56 +0300
Subject: [PATCH 0488/6226] qt6.qtbase: add libgbm dependency

Used for EGLFS GBM backend.
---
 pkgs/development/libraries/qt-6/modules/qtbase/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index 5b5e987d9ef7..41884d523fc3 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -29,6 +29,7 @@
   vulkan-loader,
   libthai,
   libdrm,
+  libgbm,
   libdatrie,
   lttng-ust,
   libepoxy,
@@ -133,6 +134,7 @@ stdenv.mkDerivation rec {
     lttng-ust
     libthai
     libdrm
+    libgbm
     libdatrie
     udev
     # Text rendering

From 2c70074deffafb7a7ad4f1c3318679d5d6bd0389 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 7 Oct 2025 16:19:17 +0300
Subject: [PATCH 0489/6226] qt6.qtconnectivity: enable pcsclite, fix silly typo

---
 pkgs/development/libraries/qt-6/modules/qtconnectivity.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix
index 627454f85a51..7fc3c4ca3c5d 100644
--- a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix
@@ -5,15 +5,20 @@
   qtbase,
   qtdeclarative,
   bluez,
+  pcsclite,
   pkg-config,
 }:
 
 qtModule {
   pname = "qtconnectivity";
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ bluez ];
+  buildInputs = [ pcsclite ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez ];
   propagatedBuildInputs = [
     qtbase
     qtdeclarative
   ];
+
+  postPatch = ''
+    substituteInPlace src/nfc/configure.cmake --replace-fail "qt_configure_add_summary_entry(ARGS pcslite)" "qt_configure_add_summary_entry(ARGS pcsclite)"
+  '';
 }

From 5c43e78b605be1338e8de2c30770d5ce268064fd Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 7 Oct 2025 16:44:40 +0300
Subject: [PATCH 0490/6226] qt6.qtwebengine: enable VA-API support

Requires vendored libvpx, but the end user experience is much better for it.
---
 .../libraries/qt-6/modules/qtwebengine/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
index c2bcba370bb3..7278281774d5 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -37,7 +37,6 @@
   libopus,
   jsoncpp,
   protobuf,
-  libvpx,
   srtp,
   snappy,
   nss,
@@ -59,6 +58,7 @@
   lcms2,
   libkrb5,
   libgbm,
+  libva,
   enableProprietaryCodecs ? true,
   # darwin
   bootstrap_cmds,
@@ -208,7 +208,6 @@ qtModule {
 
     # Video formats
     srtp
-    libvpx
 
     # Audio formats
     libopus
@@ -267,6 +266,7 @@ qtModule {
 
     libkrb5
     libgbm
+    libva
   ];
 
   buildInputs = [

From 13fda0b4b2bf5f672b96d5409a588a4f918127bf Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 7 Oct 2025 14:33:53 +0300
Subject: [PATCH 0491/6226] qt6: 6.9.3 -> 6.10.0

---
 pkgs/development/libraries/qt-6/fetch.sh      |   2 +-
 .../libraries/qt-6/modules/qtbase/default.nix |  18 +-
 .../qt-6/modules/qtdeclarative/default.nix    |  25 +-
 .../dont-cache-nix-store-paths.patch          |  17 +
 ...e-caches-from-mismatched-store-paths.patch | 112 -----
 .../qtdeclarative/stackview-crash.patch       | 473 ------------------
 .../use-versioned-import-path.patch           |  12 +-
 .../libraries/qt-6/modules/qtmqtt.nix         |   4 +-
 .../qt-6/modules/qttools/default.nix          |   7 +-
 .../qt-6/modules/qttools/paths.patch          |   4 +-
 .../libraries/qt-6/modules/qtwayland.nix      |  13 +-
 .../qt-6/modules/qtwebengine/default.nix      |   9 -
 pkgs/development/libraries/qt-6/srcs.nix      | 312 ++++++------
 13 files changed, 213 insertions(+), 795 deletions(-)
 create mode 100644 pkgs/development/libraries/qt-6/modules/qtdeclarative/dont-cache-nix-store-paths.patch
 delete mode 100644 pkgs/development/libraries/qt-6/modules/qtdeclarative/invalidate-caches-from-mismatched-store-paths.patch
 delete mode 100644 pkgs/development/libraries/qt-6/modules/qtdeclarative/stackview-crash.patch

diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh
index b5a099e31755..9c161baa005d 100644
--- a/pkgs/development/libraries/qt-6/fetch.sh
+++ b/pkgs/development/libraries/qt-6/fetch.sh
@@ -1 +1 @@
-WGET_ARGS=( https://download.qt.io/official_releases/qt/6.9/6.9.3/submodules/ -A '*.tar.xz' )
+WGET_ARGS=( https://download.qt.io/official_releases/qt/6.10/6.10.0/submodules/ -A '*.tar.xz' )
diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index 41884d523fc3..ab35d1906f73 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -79,6 +79,9 @@
   gtk3,
   withLibinput ? false,
   libinput,
+  withWayland ? lib.meta.availableOn stdenv.hostPlatform wayland,
+  wayland,
+  wayland-scanner,
   # options
   qttranslations ? null,
 }:
@@ -158,7 +161,11 @@ stdenv.mkDerivation rec {
     xorg.xcbutilcursor
     libepoxy
   ]
-  ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups;
+  ++ lib.optional (cups != null && lib.meta.availableOn stdenv.hostPlatform cups) cups
+  ++ lib.optionals withWayland [
+    wayland
+    wayland-scanner
+  ];
 
   buildInputs =
     lib.optionals (lib.meta.availableOn stdenv.hostPlatform at-spi2-core) [
@@ -188,7 +195,14 @@ stdenv.mkDerivation rec {
   ]
   # I’m not sure if this is necessary, but the macOS mkspecs stuff
   # tries to call `xcrun xcodebuild`, so better safe than sorry.
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ];
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]
+  # wayland-scanner needs to be propagated as both build
+  # (for the wayland-scanner binary) and host (for the
+  # actual wayland.xml protocol definition)
+  ++ lib.optionals withWayland [
+    wayland
+    wayland-scanner
+  ];
 
   strictDeps = true;
 
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
index 22ce9f733cf6..5578dc8a8236 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
@@ -1,4 +1,5 @@
 {
+  fetchpatch,
   qtModule,
   qtbase,
   qtlanguageserver,
@@ -29,32 +30,20 @@ qtModule {
   ];
 
   patches = [
-    # invalidates qml caches created from nix applications at different
-    # store paths and disallows saving caches of bare qml files in the store.
-    (replaceVars ./invalidate-caches-from-mismatched-store-paths.patch {
+    # don't cache bytecode of bare qml files in the store, as that never gets cleaned up
+    (replaceVars ./dont-cache-nix-store-paths.patch {
       nixStore = builtins.storeDir;
-      nixStoreLength = toString ((builtins.stringLength builtins.storeDir) + 1); # trailing /
     })
     # add version specific QML import path
     ./use-versioned-import-path.patch
-
     # Fix common crash
-    # Manual backport of https://invent.kde.org/qt/qt/qtdeclarative/-/commit/b1ee7061ba77a7f5dc4148129bb2083f5c28e039
     # https://bugreports.qt.io/browse/QTBUG-140018
-    ./stackview-crash.patch
+    (fetchpatch {
+      url = "https://invent.kde.org/qt/qt/qtdeclarative/-/commit/2b7f93da38d41ffaeb5322a7dca40ec26fc091a1.diff";
+      hash = "sha256-AOXey18lJlswpZ8tpTTZeFb0VE9k1louXy8TPPGNiA4=";
+    })
   ];
 
-  preConfigure =
-    let
-      storePrefixLen = toString ((builtins.stringLength builtins.storeDir) + 1);
-    in
-    ''
-      # "NIX:" is reserved for saved qmlc files in patch 0001, "QTDHASH:" takes the place
-      # of the old tag, which is otherwise the qt version, invalidating caches from other
-      # qtdeclarative store paths.
-      echo "QTDHASH:''${out:${storePrefixLen}:32}" > .tag
-    '';
-
   cmakeFlags = [
     "-DQt6ShaderToolsTools_DIR=${pkgsBuildBuild.qt6.qtshadertools}/lib/cmake/Qt6ShaderTools"
     # for some reason doesn't get found automatically on Darwin
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/dont-cache-nix-store-paths.patch b/pkgs/development/libraries/qt-6/modules/qtdeclarative/dont-cache-nix-store-paths.patch
new file mode 100644
index 000000000000..ef5d108db10c
--- /dev/null
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/dont-cache-nix-store-paths.patch
@@ -0,0 +1,17 @@
+--- a/src/qml/common/qv4compileddata.cpp
++++ b/src/qml/common/qv4compileddata.cpp
+@@ -178,6 +178,14 @@ bool CompilationUnit::saveToDisk(const QUrl &unitUrl, QString *errorString)
+         return false;
+     }
+ 
++    if (unitUrl.path().startsWith(QStringLiteral("@nixStore@"))) {
++        // We don't store bytecode for bare QML files in the nix store as the
++        // paths will change every time the application updates, filling caches
++        // endlessly with junk.
++        *errorString = QStringLiteral("Refusing to save bytecode for bare @nixStore@ path.");
++        return false;
++    }
++
+     return SaveableUnitPointer(unitData()).saveToDisk<char>(
+             [&unitUrl, errorString](const char *data, quint32 size) {
+                 const QString cachePath = localCacheFilePath(unitUrl);
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/invalidate-caches-from-mismatched-store-paths.patch b/pkgs/development/libraries/qt-6/modules/qtdeclarative/invalidate-caches-from-mismatched-store-paths.patch
deleted file mode 100644
index 364c3ed838e6..000000000000
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/invalidate-caches-from-mismatched-store-paths.patch
+++ /dev/null
@@ -1,112 +0,0 @@
-diff --git a/src/qml/common/qv4compileddata.cpp b/src/qml/common/qv4compileddata.cpp
-index 9dee91f713..9dec5cae67 100644
---- a/src/qml/common/qv4compileddata.cpp
-+++ b/src/qml/common/qv4compileddata.cpp
-@@ -15,6 +15,8 @@
- #include <QtCore/qscopeguard.h>
- #include <QtCore/qstandardpaths.h>
- 
-+#include <QtCore/qcoreapplication.h>
-+
- static_assert(QV4::CompiledData::QmlCompileHashSpace > QML_COMPILE_HASH_LENGTH);
- 
- #if defined(QML_COMPILE_HASH) && defined(QML_COMPILE_HASH_LENGTH) && QML_COMPILE_HASH_LENGTH > 0
-@@ -26,6 +28,35 @@ __attribute__((section(".qml_compile_hash")))
- const char qml_compile_hash[QV4::CompiledData::QmlCompileHashSpace] = QML_COMPILE_HASH;
- static_assert(sizeof(QV4::CompiledData::Unit::libraryVersionHash) > QML_COMPILE_HASH_LENGTH,
-               "Compile hash length exceeds reserved size in data structure. Please adjust and bump the format version");
-+
-+bool nix__isNixApplication() {
-+    static const bool value = QCoreApplication::applicationFilePath().startsWith(QStringLiteral("@nixStore@"));
-+    return value;
-+}
-+
-+static_assert(sizeof(QV4::CompiledData::Unit::libraryVersionHash) >
-+                  /*sha1*/ 20 + /*NIX:*/ 4,
-+              "Nix compile hash length exceeds the reserved space in data "
-+              "structure. Please review the patch.");
-+
-+const QByteArray &nix__applicationHash() {
-+    static const QByteArray value = [](){
-+        QCryptographicHash applicationHash(QCryptographicHash::Sha1);
-+        applicationHash.addData(QByteArrayView(qml_compile_hash, QML_COMPILE_HASH_LENGTH));
-+
-+        // We only care about the package, not the specific file path.
-+        auto view = QCoreApplication::applicationFilePath().sliced(@nixStoreLength@);
-+        auto pkgEndIdx = view.indexOf(QStringLiteral("/"));
-+        if (pkgEndIdx != -1) view = view.sliced(0, pkgEndIdx);
-+
-+        applicationHash.addData(view.toUtf8());
-+
-+        return QByteArray("NIX:") + applicationHash.result();
-+    }();
-+
-+    return value;
-+}
-+
- #else
- #  error "QML_COMPILE_HASH must be defined for the build of QtDeclarative to ensure version checking for cache files"
- #endif
-@@ -69,13 +100,29 @@ bool Unit::verifyHeader(QDateTime expectedSourceTimeStamp, QString *errorString)
-     }
- 
- #if defined(QML_COMPILE_HASH) && defined(QML_COMPILE_HASH_LENGTH) && QML_COMPILE_HASH_LENGTH > 0
--    if (qstrncmp(qml_compile_hash, libraryVersionHash, QML_COMPILE_HASH_LENGTH) != 0) {
-+    const bool nixUnit = qstrncmp("NIX:", this->libraryVersionHash, 4) == 0;
-+
-+    if (nixUnit && !nix__isNixApplication()) {
-+        *errorString = QStringLiteral("QML compile hash is for a nix store application.");
-+        return false;
-+    }
-+
-+    const char *targetHash = qml_compile_hash;
-+    size_t targetHashLength = QML_COMPILE_HASH_LENGTH;
-+
-+    if (nixUnit) {
-+        const auto &applicationHash = nix__applicationHash();
-+        targetHash = applicationHash.constData();
-+        targetHashLength = applicationHash.length();
-+    }
-+
-+    if (qstrncmp(targetHash, this->libraryVersionHash, targetHashLength) != 0) {
-         *errorString = QStringLiteral("QML compile hashes don't match. Found %1 expected %2")
-                                .arg(QString::fromLatin1(
--                                            QByteArray(libraryVersionHash, QML_COMPILE_HASH_LENGTH)
-+                                            QByteArray(this->libraryVersionHash, targetHashLength)
-                                                     .toPercentEncoding()),
-                                     QString::fromLatin1(
--                                            QByteArray(qml_compile_hash, QML_COMPILE_HASH_LENGTH)
-+                                            QByteArray(targetHash, targetHashLength)
-                                                     .toPercentEncoding()));
-         return false;
-     }
-@@ -213,6 +260,29 @@ bool CompilationUnit::saveToDisk(const QUrl &unitUrl, QString *errorString)
-         return false;
-     }
- 
-+#if defined(QML_COMPILE_HASH) && defined(QML_COMPILE_HASH_LENGTH) && QML_COMPILE_HASH_LENGTH > 0
-+    if (nix__isNixApplication() && unitUrl.scheme() == QStringLiteral("qrc")) {
-+        // If the application is running from the nix store, we can safely save
-+        // bytecode for its embedded QML files as long as we hash the
-+        // application path into the version. This will invalidate the caches
-+        // when the store path changes.
-+        const auto &applicationHash = nix__applicationHash();
-+
-+        memcpy(const_cast<char *>(unitData()->libraryVersionHash),
-+               applicationHash.constData(), applicationHash.length());
-+    } else if (unitUrl.path().startsWith(QStringLiteral("@nixStore@"))) {
-+        // We don't store bytecode for bare QML files in the nix store as the
-+        // paths will change every time the application updates, filling caches
-+        // endlessly with junk.
-+        *errorString = QStringLiteral("Refusing to save bytecode for bare @nixStore@ path.");
-+        return false;
-+    } else {
-+        // If the QML file is loaded from a normal file path it doesn't matter
-+        // if the application itself is running from a nix path, so we fall back
-+        // to the default Qt behavior.
-+    }
-+#endif
-+
-     return SaveableUnitPointer(unitData()).saveToDisk<char>(
-             [&unitUrl, errorString](const char *data, quint32 size) {
-                 const QString cachePath = localCacheFilePath(unitUrl);
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/stackview-crash.patch b/pkgs/development/libraries/qt-6/modules/qtdeclarative/stackview-crash.patch
deleted file mode 100644
index 19c7c0648634..000000000000
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/stackview-crash.patch
+++ /dev/null
@@ -1,473 +0,0 @@
-diff --git a/src/quicktemplates/qquickstackelement.cpp b/src/quicktemplates/qquickstackelement.cpp
-index f6a5ffdd74..304bafe4ef 100644
---- a/src/quicktemplates/qquickstackelement.cpp
-+++ b/src/quicktemplates/qquickstackelement.cpp
-@@ -39,7 +39,10 @@ protected:
-     void setInitialState(QObject *object) override
-     {
-         auto privIncubator = QQmlIncubatorPrivate::get(this);
--        element->incubate(object, privIncubator->requiredProperties());
-+        if (QQmlEnginePrivate *enginePriv = privIncubator->enginePriv) {
-+            element->incubate(enginePriv->v4engine(), object,
-+                              privIncubator->requiredProperties());
-+        }
-     }
- 
- private:
-@@ -90,7 +93,8 @@ QQuickStackElement::~QQuickStackElement()
- #endif
- }
- 
--QQuickStackElement *QQuickStackElement::fromString(const QString &str, QQuickStackView *view, QString *error)
-+QQuickStackElement *QQuickStackElement::fromString(
-+        QQmlEngine *engine, const QString &str, QQuickStackView *view, QString *error)
- {
-     QUrl url(str);
-     if (!url.isValid()) {
-@@ -102,7 +106,7 @@ QQuickStackElement *QQuickStackElement::fromString(const QString &str, QQuickSta
-         url = qmlContext(view)->resolvedUrl(url);
- 
-     QQuickStackElement *element = new QQuickStackElement;
--    element->component = new QQmlComponent(qmlEngine(view), url, view);
-+    element->component = new QQmlComponent(engine, url, view);
-     element->ownComponent = true;
-     return element;
- }
-@@ -127,7 +131,8 @@ QQuickStackElement *QQuickStackElement::fromObject(QObject *object, QQuickStackV
-     return element;
- }
- 
--QQuickStackElement *QQuickStackElement::fromStackViewArg(QQuickStackView *view, QQuickStackViewArg arg)
-+QQuickStackElement *QQuickStackElement::fromStackViewArg(
-+        QQmlEngine *engine, QQuickStackView *view, QQuickStackViewArg arg)
- {
-     QQuickStackElement *element = new QQuickStackElement;
- #if QT_CONFIG(quick_viewtransitions)
-@@ -144,7 +149,7 @@ QQuickStackElement *QQuickStackElement::fromStackViewArg(QQuickStackView *view,
- 
-         Q_ASSERT(!arg.mUrl.isValid());
-     } else if (arg.mUrl.isValid()) {
--        element->component = new QQmlComponent(qmlEngine(view), arg.mUrl, view);
-+        element->component = new QQmlComponent(engine, arg.mUrl, view);
-         element->ownComponent = true;
-     } else {
-         qFatal("No Item, Component or URL set on arg passed to fromStrictArg");
-@@ -152,7 +157,7 @@ QQuickStackElement *QQuickStackElement::fromStackViewArg(QQuickStackView *view,
-     return element;
- }
- 
--bool QQuickStackElement::load(QQuickStackView *parent)
-+bool QQuickStackElement::load(QV4::ExecutionEngine *v4, QQuickStackView *parent)
- {
-     setView(parent);
-     if (!item) {
-@@ -161,7 +166,7 @@ bool QQuickStackElement::load(QQuickStackView *parent)
-         if (component->isLoading()) {
-             QObject::connect(component, &QQmlComponent::statusChanged, [this](QQmlComponent::Status status) {
-                 if (status == QQmlComponent::Ready)
--                    load(view);
-+                    load(component->engine()->handle(), view);
-                 else if (status == QQmlComponent::Error)
-                     QQuickStackViewPrivate::get(view)->warn(component->errorString().trimmed());
-             });
-@@ -177,22 +182,24 @@ bool QQuickStackElement::load(QQuickStackView *parent)
-         if (component->isError())
-             QQuickStackViewPrivate::get(parent)->warn(component->errorString().trimmed());
-     } else {
--        initialize(/*required properties=*/nullptr);
-+        initialize(v4, /*required properties=*/nullptr);
-     }
-     return item;
- }
- 
--void QQuickStackElement::incubate(QObject *object, RequiredProperties *requiredProperties)
-+void QQuickStackElement::incubate(
-+        QV4::ExecutionEngine *v4, QObject *object, RequiredProperties *requiredProperties)
- {
-     item = qmlobject_cast<QQuickItem *>(object);
-     if (item) {
-         QQmlEngine::setObjectOwnership(item, QQmlEngine::CppOwnership);
-         item->setParent(view);
--        initialize(requiredProperties);
-+        initialize(v4, requiredProperties);
-     }
- }
- 
--void QQuickStackElement::initialize(RequiredProperties *requiredProperties)
-+void QQuickStackElement::initialize(
-+        QV4::ExecutionEngine *v4, RequiredProperties *requiredProperties)
- {
-     if (!item || init)
-         return;
-@@ -205,11 +212,8 @@ void QQuickStackElement::initialize(RequiredProperties *requiredProperties)
-     item->setParentItem(view);
- 
-     if (!properties.isUndefined()) {
--        QQmlEngine *engine = qmlEngine(view);
--        Q_ASSERT(engine);
--        QV4::ExecutionEngine *v4 = QQmlEnginePrivate::getV4Engine(engine);
--        Q_ASSERT(v4);
-         QV4::Scope scope(v4);
-+        Q_ASSERT(scope.engine);
-         QV4::ScopedValue ipv(scope, properties.value());
-         QV4::Scoped<QV4::QmlContext> qmlContext(scope, qmlCallingContext.value());
-         QV4::ScopedValue qmlObject(scope, QV4::QObjectWrapper::wrap(v4, item));
-diff --git a/src/quicktemplates/qquickstackelement_p_p.h b/src/quicktemplates/qquickstackelement_p_p.h
-index 5af8149d91..2986a78569 100644
---- a/src/quicktemplates/qquickstackelement_p_p.h
-+++ b/src/quicktemplates/qquickstackelement_p_p.h
-@@ -43,13 +43,14 @@ class QQuickStackElement :
- public:
-     ~QQuickStackElement();
- 
--    static QQuickStackElement *fromString(const QString &str, QQuickStackView *view, QString *error);
-+    static QQuickStackElement *fromString(QQmlEngine *engine, const QString &str, QQuickStackView *view, QString *error);
-     static QQuickStackElement *fromObject(QObject *object, QQuickStackView *view, QString *error);
--    static QQuickStackElement *fromStackViewArg(QQuickStackView *view, QQuickStackViewArg arg);
-+    static QQuickStackElement *fromStackViewArg(QQmlEngine *engine, QQuickStackView *view, QQuickStackViewArg arg);
- 
--    bool load(QQuickStackView *parent);
--    void incubate(QObject *object, RequiredProperties *requiredProperties);
--    void initialize(RequiredProperties *requiredProperties);
-+    bool load(QV4::ExecutionEngine *v4, QQuickStackView *parent);
-+    void incubate(
-+            QV4::ExecutionEngine *v4, QObject *object, RequiredProperties *requiredProperties);
-+    void initialize(QV4::ExecutionEngine *v4, RequiredProperties *requiredProperties);
- 
-     void setIndex(int index);
-     void setView(QQuickStackView *view);
-diff --git a/src/quicktemplates/qquickstackview.cpp b/src/quicktemplates/qquickstackview.cpp
-index cb8854dca8..a0909b7fcb 100644
---- a/src/quicktemplates/qquickstackview.cpp
-+++ b/src/quicktemplates/qquickstackview.cpp
-@@ -457,8 +457,12 @@ QQuickItem *QQuickStackView::get(int index, LoadBehavior behavior)
-     Q_D(QQuickStackView);
-     QQuickStackElement *element = d->elements.value(index);
-     if (element) {
--        if (behavior == ForceLoad)
--            element->load(this);
-+        if (behavior == ForceLoad) {
-+            // It's possible for a slot to still be connected during destruction of the receiver's
-+            // parent (QTBUG-140018), so only try to load new things if our engine is alive.
-+            if (QQmlEngine *engine = qmlEngine(this))
-+                element->load(engine->handle(), this);
-+        }
-         return element->item;
-     }
-     return nullptr;
-@@ -492,7 +496,7 @@ QQuickItem *QQuickStackView::find(const QJSValue &callback, LoadBehavior behavio
-     for (int i = d->elements.size() - 1; i >= 0; --i) {
-         QQuickStackElement *element = d->elements.at(i);
-         if (behavior == ForceLoad)
--            element->load(this);
-+            element->load(engine->handle(), this);
-         if (element->item) {
-             QJSValue rv = func.call(QJSValueList() << engine->newQObject(element->item) << i);
-             if (rv.toBool())
-@@ -624,7 +628,7 @@ void QQuickStackView::push(QQmlV4FunctionPtr args)
- #endif
- 
-     int oldDepth = d->elements.size();
--    if (d->pushElements(elements)) {
-+    if (d->pushElements(v4, elements)) {
-         d->depthChange(d->elements.size(), oldDepth);
-         QQuickStackElement *enter = d->elements.top();
- #if QT_CONFIG(quick_viewtransitions)
-@@ -737,7 +741,7 @@ void QQuickStackView::pop(QQmlV4FunctionPtr args)
- 
-     QPointer<QQuickItem> previousItem;
- 
--    if (d->popElements(enter)) {
-+    if (d->popElements(v4, enter)) {
-         if (exit) {
-             exit->removal = true;
-             d->removing.insert(exit);
-@@ -907,7 +911,7 @@ void QQuickStackView::replace(QQmlV4FunctionPtr args)
-     if (!d->elements.isEmpty())
-         exit = d->elements.pop();
- 
--    if (exit != target ? d->replaceElements(target, elements) : d->pushElements(elements)) {
-+    if (exit != target ? d->replaceElements(v4, target, elements) : d->pushElements(v4, elements)) {
-         d->depthChange(d->elements.size(), oldDepth);
-         if (exit) {
-             exit->removal = true;
-@@ -991,10 +995,14 @@ QQuickItem *QQuickStackView::pushItems(QList<QQuickStackViewArg> args, Operation
-         return nullptr;
-     }
- 
-+    QQmlEngine *engine = qmlEngine(this);
-+    if (!engine)
-+        return nullptr;
-+
-     QScopedValueRollback<bool> modifyingElements(d->modifyingElements, true);
-     QScopedValueRollback<QString> operationNameRollback(d->operation, operationName);
- 
--    const QList<QQuickStackElement *> stackElements = d->parseElements(args);
-+    const QList<QQuickStackElement *> stackElements = d->parseElements(engine, args);
- 
- #if QT_CONFIG(quick_viewtransitions)
-     QQuickStackElement *exit = nullptr;
-@@ -1003,7 +1011,7 @@ QQuickItem *QQuickStackView::pushItems(QList<QQuickStackViewArg> args, Operation
- #endif
- 
-     const int oldDepth = d->elements.size();
--    if (d->pushElements(stackElements)) {
-+    if (d->pushElements(engine->handle(), stackElements)) {
-         d->depthChange(d->elements.size(), oldDepth);
-         QQuickStackElement *enter = d->elements.top();
- #if QT_CONFIG(quick_viewtransitions)
-@@ -1109,7 +1117,11 @@ QQuickItem *QQuickStackView::pushItem(const QUrl &url, const QVariantMap &proper
- QQuickItem *QQuickStackView::popToItem(QQuickItem *item, Operation operation)
- {
-     Q_D(QQuickStackView);
--    return d->popToItem(item, operation, QQuickStackViewPrivate::CurrentItemPolicy::DoNotPop);
-+    QQmlEngine *engine = qmlEngine(this);
-+    if (!engine)
-+        return nullptr;
-+    return d->popToItem(
-+            engine->handle(), item, operation, QQuickStackViewPrivate::CurrentItemPolicy::DoNotPop);
- }
- 
- /*!
-@@ -1149,8 +1161,13 @@ QQuickItem *QQuickStackView::popToIndex(int index, Operation operation)
-     }
- 
-     QQuickStackElement *element = d->elements.at(index);
--    element->load(this);
--    return d->popToItem(element->item, operation, QQuickStackViewPrivate::CurrentItemPolicy::Pop);
-+    QQmlEngine *engine = qmlEngine(this);
-+    if (!engine)
-+        return nullptr;
-+    QV4::ExecutionEngine *v4 = engine->handle();
-+    element->load(v4, this);
-+    return d->popToItem(
-+            v4, element->item, operation, QQuickStackViewPrivate::CurrentItemPolicy::Pop);
- }
- 
- /*!
-@@ -1178,7 +1195,13 @@ QQuickItem *QQuickStackView::popCurrentItem(Operation operation)
-         clear(operation);
-         return lastItemRemoved;
-     }
--    return d->popToItem(d->currentItem, operation, QQuickStackViewPrivate::CurrentItemPolicy::Pop);
-+
-+    QQmlEngine *engine = qmlEngine(this);
-+    if (!engine)
-+        return nullptr;
-+    return d->popToItem(
-+            engine->handle(), d->currentItem, operation,
-+            QQuickStackViewPrivate::CurrentItemPolicy::Pop);
- }
- 
- /*!
-@@ -1232,12 +1255,16 @@ QQuickItem *QQuickStackView::replaceCurrentItem(const QList<QQuickStackViewArg>
-         return nullptr;
-     }
- 
-+    QQmlEngine *engine = qmlEngine(this);
-+    if (!engine)
-+        return nullptr;
-+
-     QScopedValueRollback<bool> modifyingElements(d->modifyingElements, true);
-     QScopedValueRollback<QString> operationNameRollback(d->operation, operationName);
- 
-     QQuickStackElement *currentElement = !d->elements.isEmpty() ? d->elements.top() : nullptr;
- 
--    const QList<QQuickStackElement *> stackElements = d->parseElements(args);
-+    const QList<QQuickStackElement *> stackElements = d->parseElements(engine, args);
- 
-     int oldDepth = d->elements.size();
-     QQuickStackElement* exit = nullptr;
-@@ -1245,8 +1272,8 @@ QQuickItem *QQuickStackView::replaceCurrentItem(const QList<QQuickStackViewArg>
-         exit = d->elements.pop();
- 
-     const bool successfullyReplaced = exit != currentElement
--        ? d->replaceElements(currentElement, stackElements)
--        : d->pushElements(stackElements);
-+        ? d->replaceElements(engine->handle(), currentElement, stackElements)
-+        : d->pushElements(engine->handle(), stackElements);
-     if (successfullyReplaced) {
-         d->depthChange(d->elements.size(), oldDepth);
-         if (exit) {
-@@ -1607,14 +1634,19 @@ void QQuickStackView::componentComplete()
-     QQuickStackElement *element = nullptr;
-     QString error;
-     int oldDepth = d->elements.size();
-+
-+    QQmlEngine *engine = qmlEngine(this);
-+    if (!engine)
-+        return;
-+
-     if (QObject *o = d->initialItem.toQObject())
-         element = QQuickStackElement::fromObject(o, this, &error);
-     else if (d->initialItem.isString())
--        element = QQuickStackElement::fromString(d->initialItem.toString(), this, &error);
-+        element = QQuickStackElement::fromString(engine, d->initialItem.toString(), this, &error);
-     if (!error.isEmpty()) {
-         d->warn(error);
-         delete element;
--    } else if (d->pushElement(element)) {
-+    } else if (d->pushElement(engine->handle(), element)) {
-         d->depthChange(d->elements.size(), oldDepth);
-         d->setCurrentItem(element);
-         element->setStatus(QQuickStackView::Active);
-diff --git a/src/quicktemplates/qquickstackview_p.cpp b/src/quicktemplates/qquickstackview_p.cpp
-index 0288ff1f4b..8f08f29168 100644
---- a/src/quicktemplates/qquickstackview_p.cpp
-+++ b/src/quicktemplates/qquickstackview_p.cpp
-@@ -109,7 +109,8 @@ QList<QQuickStackElement *> QQuickStackViewPrivate::parseElements(int from, QQml
-     return elements;
- }
- 
--QList<QQuickStackElement *> QQuickStackViewPrivate::parseElements(const QList<QQuickStackViewArg> &args)
-+QList<QQuickStackElement *> QQuickStackViewPrivate::parseElements(
-+        QQmlEngine *engine, const QList<QQuickStackViewArg> &args)
- {
-     Q_Q(QQuickStackView);
-     QList<QQuickStackElement *> stackElements;
-@@ -141,8 +142,8 @@ QList<QQuickStackElement *> QQuickStackViewPrivate::parseElements(const QList<QQ
-             return {};
-         }
- 
--        QQuickStackElement *element = QQuickStackElement::fromStackViewArg(q, arg);
--        QV4::ExecutionEngine *v4Engine = qmlEngine(q)->handle();
-+        QQuickStackElement *element = QQuickStackElement::fromStackViewArg(engine, q, arg);
-+        QV4::ExecutionEngine *v4Engine = engine->handle();
-         element->properties.set(v4Engine, v4Engine->fromVariant(properties));
-         element->qmlCallingContext.set(v4Engine, v4Engine->qmlContext());
-         stackElements.append(element);
-@@ -183,28 +184,33 @@ static QString resolvedUrl(const QString &str, const QQmlRefPointer<QQmlContextD
-     return str;
- }
- 
--QQuickStackElement *QQuickStackViewPrivate::createElement(const QV4::Value &value, const QQmlRefPointer<QQmlContextData> &context, QString *error)
-+QQuickStackElement *QQuickStackViewPrivate::createElement(
-+        const QV4::Value &value, const QQmlRefPointer<QQmlContextData> &context, QString *error)
- {
-     Q_Q(QQuickStackView);
-     if (const QV4::String *s = value.as<QV4::String>())
--        return QQuickStackElement::fromString(resolvedUrl(s->toQString(), context), q, error);
-+        return QQuickStackElement::fromString(
-+                s->engine()->qmlEngine(), resolvedUrl(s->toQString(), context), q, error);
-     if (const QV4::QObjectWrapper *o = value.as<QV4::QObjectWrapper>())
-         return QQuickStackElement::fromObject(o->object(), q, error);
-     if (const QV4::UrlObject *u = value.as<QV4::UrlObject>())
--        return QQuickStackElement::fromString(resolvedUrl(u->href(), context), q, error);
-+        return QQuickStackElement::fromString(
-+                u->engine()->qmlEngine(), resolvedUrl(u->href(), context), q, error);
- 
--    if (value.as<QV4::Object>()) {
-+    if (const QV4::Object *o = value.as<QV4::Object>()) {
-         const QVariant data = QV4::ExecutionEngine::toVariant(value, QMetaType::fromType<QUrl>());
-         if (data.typeId() == QMetaType::QUrl) {
--            return QQuickStackElement::fromString(resolvedUrl(data.toUrl(), context).toString(), q,
--                                                  error);
-+            return QQuickStackElement::fromString(
-+                    o->engine()->qmlEngine(), resolvedUrl(data.toUrl(), context).toString(), q,
-+                    error);
-         }
-     }
- 
-     return nullptr;
- }
- 
--bool QQuickStackViewPrivate::pushElements(const QList<QQuickStackElement *> &elems)
-+bool QQuickStackViewPrivate::pushElements(
-+        QV4::ExecutionEngine *v4, const QList<QQuickStackElement *> &elems)
- {
-     Q_Q(QQuickStackView);
-     if (!elems.isEmpty()) {
-@@ -212,19 +218,19 @@ bool QQuickStackViewPrivate::pushElements(const QList<QQuickStackElement *> &ele
-             e->setIndex(elements.size());
-             elements += e;
-         }
--        return elements.top()->load(q);
-+        return elements.top()->load(v4, q);
-     }
-     return false;
- }
- 
--bool QQuickStackViewPrivate::pushElement(QQuickStackElement *element)
-+bool QQuickStackViewPrivate::pushElement(QV4::ExecutionEngine *v4, QQuickStackElement *element)
- {
-     if (element)
--        return pushElements(QList<QQuickStackElement *>() << element);
-+        return pushElements(v4, QList<QQuickStackElement *>() << element);
-     return false;
- }
- 
--bool QQuickStackViewPrivate::popElements(QQuickStackElement *element)
-+bool QQuickStackViewPrivate::popElements(QV4::ExecutionEngine *v4, QQuickStackElement *element)
- {
-     Q_Q(QQuickStackView);
-     while (elements.size() > 1 && elements.top() != element) {
-@@ -232,10 +238,12 @@ bool QQuickStackViewPrivate::popElements(QQuickStackElement *element)
-         if (!element)
-             break;
-     }
--    return elements.top()->load(q);
-+    return elements.top()->load(v4, q);
- }
- 
--bool QQuickStackViewPrivate::replaceElements(QQuickStackElement *target, const QList<QQuickStackElement *> &elems)
-+bool QQuickStackViewPrivate::replaceElements(
-+        QV4::ExecutionEngine *v4, QQuickStackElement *target,
-+        const QList<QQuickStackElement *> &elems)
- {
-     if (target) {
-         while (!elements.isEmpty()) {
-@@ -245,10 +253,12 @@ bool QQuickStackViewPrivate::replaceElements(QQuickStackElement *target, const Q
-                 break;
-         }
-     }
--    return pushElements(elems);
-+    return pushElements(v4, elems);
- }
- 
--QQuickItem *QQuickStackViewPrivate::popToItem(QQuickItem *item, QQuickStackView::Operation operation, CurrentItemPolicy currentItemPolicy)
-+QQuickItem *QQuickStackViewPrivate::popToItem(
-+        QV4::ExecutionEngine *v4, QQuickItem *item, QQuickStackView::Operation operation,
-+        CurrentItemPolicy currentItemPolicy)
- {
-     const QString operationName = QStringLiteral("pop");
-     if (modifyingElements) {
-@@ -301,7 +311,7 @@ QQuickItem *QQuickStackViewPrivate::popToItem(QQuickItem *item, QQuickStackView:
-     }
- 
-     QQuickItem *previousItem = nullptr;
--    if (popElements(enter)) {
-+    if (popElements(v4, enter)) {
-         if (exit) {
-             exit->removal = true;
-             removing.insert(exit);
-diff --git a/src/quicktemplates/qquickstackview_p_p.h b/src/quicktemplates/qquickstackview_p_p.h
-index 4ae849aa20..8bb95760a4 100644
---- a/src/quicktemplates/qquickstackview_p_p.h
-+++ b/src/quicktemplates/qquickstackview_p_p.h
-@@ -50,20 +50,20 @@ public:
-     void setCurrentItem(QQuickStackElement *element);
- 
-     QList<QQuickStackElement *> parseElements(int from, QQmlV4FunctionPtr args, QStringList *errors);
--    QList<QQuickStackElement *> parseElements(const QList<QQuickStackViewArg> &args);
-+    QList<QQuickStackElement *> parseElements(QQmlEngine *engine, const QList<QQuickStackViewArg> &args);
-     QQuickStackElement *findElement(QQuickItem *item) const;
-     QQuickStackElement *findElement(const QV4::Value &value) const;
-     QQuickStackElement *createElement(const QV4::Value &value, const QQmlRefPointer<QQmlContextData> &context, QString *error);
--    bool pushElements(const QList<QQuickStackElement *> &elements);
--    bool pushElement(QQuickStackElement *element);
--    bool popElements(QQuickStackElement *element);
--    bool replaceElements(QQuickStackElement *element, const QList<QQuickStackElement *> &elements);
-+    bool pushElements(QV4::ExecutionEngine *v4, const QList<QQuickStackElement *> &elements);
-+    bool pushElement(QV4::ExecutionEngine *v4, QQuickStackElement *element);
-+    bool popElements(QV4::ExecutionEngine *v4, QQuickStackElement *element);
-+    bool replaceElements(QV4::ExecutionEngine *v4, QQuickStackElement *element, const QList<QQuickStackElement *> &elements);
- 
-     enum class CurrentItemPolicy {
-         DoNotPop,
-         Pop
-     };
--    QQuickItem *popToItem(QQuickItem *item, QQuickStackView::Operation operation, CurrentItemPolicy currentItemPolicy);
-+    QQuickItem *popToItem(QV4::ExecutionEngine *v4, QQuickItem *item, QQuickStackView::Operation operation, CurrentItemPolicy currentItemPolicy);
- 
- #if QT_CONFIG(quick_viewtransitions)
-     void ensureTransitioner();
diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/use-versioned-import-path.patch b/pkgs/development/libraries/qt-6/modules/qtdeclarative/use-versioned-import-path.patch
index 7efd9c9cdb70..6de31fae7a77 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/use-versioned-import-path.patch
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/use-versioned-import-path.patch
@@ -1,10 +1,14 @@
---- a/src/qml/qml/qqmlimport.cpp
-+++ b/src/qml/qml/qqmlimport.cpp
-@@ -1520,6 +1520,7 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)
+diff --git a/src/qml/qml/qqmltypeloader.cpp b/src/qml/qml/qqmltypeloader.cpp
+index 5d09bf21c6..eacc8ccaea 100644
+--- a/src/qml/qml/qqmltypeloader.cpp
++++ b/src/qml/qml/qqmltypeloader.cpp
+@@ -1235,7 +1235,8 @@ QQmlTypeLoader::QQmlTypeLoader(QQmlEngine *engine)
      // env import paths
      addEnvImportPath("QML_IMPORT_PATH");
      addEnvImportPath("QML2_IMPORT_PATH");
+-
 +    addEnvImportPath("NIXPKGS_QT6_QML_IMPORT_PATH");
- 
++ 
      addImportPath(QStringLiteral("qrc:/qt/qml"));
      addImportPath(QStringLiteral("qrc:/qt-project.org/imports"));
+ 
diff --git a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
index 1339e43f52bf..eec3ee8f7a8d 100644
--- a/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtmqtt.nix
@@ -6,13 +6,13 @@
 
 qtModule rec {
   pname = "qtmqtt";
-  version = "6.9.3";
+  version = "6.10.0";
 
   src = fetchFromGitHub {
     owner = "qt";
     repo = "qtmqtt";
     tag = "v${version}";
-    hash = "sha256-xzh2cNPlGe0VlCdNN1u8vBi+Uq+U2oa2bskAJQTt0ik=";
+    hash = "sha256-0o0zC8SUlug5xOV5AX9PiTim1td8NA4fq6WfBR5aSXA=";
   };
 
   propagatedBuildInputs = [ qtbase ];
diff --git a/pkgs/development/libraries/qt-6/modules/qttools/default.nix b/pkgs/development/libraries/qt-6/modules/qttools/default.nix
index 4fb69db29359..58ef182fff2c 100644
--- a/pkgs/development/libraries/qt-6/modules/qttools/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qttools/default.nix
@@ -6,7 +6,7 @@
   qtbase,
   qtdeclarative,
   cups,
-  llvmPackages_20,
+  llvmPackages,
   # clang-based c++ parser for qdoc and lupdate
   withClang ? false,
 }:
@@ -30,10 +30,9 @@ qtModule {
     "-DNIX_OUTPUT_OUT=\"${placeholder "out"}\""
   ];
 
-  # FIXME: update to LLVM 21 with Qt 6.10
   buildInputs = lib.optionals withClang [
-    llvmPackages_20.libclang
-    llvmPackages_20.llvm
+    llvmPackages.libclang
+    llvmPackages.llvm
   ];
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/libraries/qt-6/modules/qttools/paths.patch b/pkgs/development/libraries/qt-6/modules/qttools/paths.patch
index ec306ecc480a..6b1eca682c59 100644
--- a/pkgs/development/libraries/qt-6/modules/qttools/paths.patch
+++ b/pkgs/development/libraries/qt-6/modules/qttools/paths.patch
@@ -18,8 +18,8 @@
 +
  static QString qtToolFilePath(const QString &toolName, QLibraryInfo::LibraryPath location)
  {
--    QString filePath = QLibraryInfo::path(location) + QLatin1Char('/') + toolName;
-+    QString filePath = qtBasePath(location) + QLatin1Char('/') + toolName;
+-    QString filePath = QLibraryInfo::path(location) + u'/' + toolName;
++    QString filePath = qtBasePath(location) + u'/' + toolName;
  #ifdef Q_OS_WIN
      filePath.append(QLatin1String(".exe"));
  #endif
diff --git a/pkgs/development/libraries/qt-6/modules/qtwayland.nix b/pkgs/development/libraries/qt-6/modules/qtwayland.nix
index ae34492453c5..54fc9cac7e3c 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwayland.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwayland.nix
@@ -5,8 +5,6 @@
   qtModule,
   qtbase,
   qtdeclarative,
-  wayland,
-  wayland-scanner,
   pkg-config,
   libdrm,
 }:
@@ -14,24 +12,15 @@
 qtModule {
   pname = "qtwayland";
 
-  # wayland-scanner needs to be propagated as both build
-  # (for the wayland-scanner binary) and host (for the
-  # actual wayland.xml protocol definition)
   propagatedBuildInputs = [
     qtbase
     qtdeclarative
-    wayland
-    wayland-scanner
-  ];
-  propagatedNativeBuildInputs = [
-    wayland
-    wayland-scanner
   ];
   buildInputs = [ libdrm ];
   nativeBuildInputs = [ pkg-config ];
 
   cmakeFlags = lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
-    "-DQt6WaylandScannerTools_DIR=${pkgsBuildBuild.qt6.qtwayland}/lib/cmake/Qt6WaylandScannerTools"
+    "-DQt6WaylandScannerTools_DIR=${pkgsBuildBuild.qt6.qtbase}/lib/cmake/Qt6WaylandScannerTools"
   ];
 
   meta = {
diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
index 7278281774d5..d06abd2441b9 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -64,8 +64,6 @@
   bootstrap_cmds,
   cctools,
   xcbuild,
-
-  fetchpatch,
 }:
 
 qtModule {
@@ -112,13 +110,6 @@ qtModule {
 
     # Reproducibility QTBUG-136068
     ./gn-object-sorted.patch
-
-    # Fix GPU rendering with Mesa 25.2
-    # https://bugreports.qt.io/browse/QTBUG-139424
-    (fetchpatch {
-      url = "https://invent.kde.org/qt/qt/qtwebengine/-/commit/3cc88e0f85113e38ccb1bfdadb7d150c2389b1bc.diff";
-      hash = "sha256-5tKZ6b93VP4mKVc7jctrbW5Ktl+4Mjxw6bK1ajY62zQ=";
-    })
   ];
 
   postPatch = ''
diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix
index 9cabeda26816..58d46a69ea56 100644
--- a/pkgs/development/libraries/qt-6/srcs.nix
+++ b/pkgs/development/libraries/qt-6/srcs.nix
@@ -4,315 +4,315 @@
 
 {
   qt3d = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qt3d-everywhere-src-6.9.3.tar.xz";
-      sha256 = "1zvzc88gykbqmks5q06zl9113lvy07gxsxmzmvpd8y8sybfn91ky";
-      name = "qt3d-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qt3d-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1dz9g3nlwgwfycwl5a0c7h339s7azq2xvq99kd76wjqzfkrmz25x";
+      name = "qt3d-everywhere-src-6.10.0.tar.xz";
     };
   };
   qt5compat = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qt5compat-everywhere-src-6.9.3.tar.xz";
-      sha256 = "0qa4s1m9f0qzs6msrilpi12wv5hpkgw211s0cqsiqaf24hhsq789";
-      name = "qt5compat-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qt5compat-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0zibn0kq8grlpkvfasjciz71bv6x4cgz02v5l5giyplbcnfwa9fh";
+      name = "qt5compat-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtactiveqt = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtactiveqt-everywhere-src-6.9.3.tar.xz";
-      sha256 = "1kzc0pqwyi1h1s8qk8agplfkrib2s9cg7bwpl41z8icngwj76h6v";
-      name = "qtactiveqt-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtactiveqt-everywhere-src-6.10.0.tar.xz";
+      sha256 = "15m7g4h4aa3fk5q4an3apd0bdqkxdknnx64p72brrmah773mmlpm";
+      name = "qtactiveqt-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtbase = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtbase-everywhere-src-6.9.3.tar.xz";
-      sha256 = "0vnwp12wvsab1vsn8zhi4mcvrpg5iacq59xzzs0w0vimc3va58f5";
-      name = "qtbase-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtbase-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0v84f9pw387m0ghd4n6s9ipwjvniqspabqxkqmbj58slrcxn5m7a";
+      name = "qtbase-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtcharts = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtcharts-everywhere-src-6.9.3.tar.xz";
-      sha256 = "0lsckms5s0av6dy8mll7bnspsigz6hpvbddm79n2wshxnfywpmr9";
-      name = "qtcharts-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtcharts-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0svz8frryxv811xyg8cawn5icjcin6909mw4k6hlvgz7429m5zqv";
+      name = "qtcharts-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtconnectivity = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtconnectivity-everywhere-src-6.9.3.tar.xz";
-      sha256 = "1xfp3p5xkypxfgzvq2a5zcnyc7ms5gav99z5qmb48k0pzdgbl6z2";
-      name = "qtconnectivity-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtconnectivity-everywhere-src-6.10.0.tar.xz";
+      sha256 = "16gs86zyaq8rvzd9jribgg51hanas15gpy8zh45n58004v7xa2jn";
+      name = "qtconnectivity-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtdatavis3d = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtdatavis3d-everywhere-src-6.9.3.tar.xz";
-      sha256 = "1v5zdwjpz8j7s1nrkg7sp452vmdmhq09kdxvbsya2ad6jsw4ajxa";
-      name = "qtdatavis3d-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtdatavis3d-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1qinrrk1j9qknwq2x7rl9aw8ajrp1h7kpfg29wcvaklbz9jj5xpx";
+      name = "qtdatavis3d-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtdeclarative = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtdeclarative-everywhere-src-6.9.3.tar.xz";
-      sha256 = "0q52z2iiqdchsvvcs7w6mq38v0ahv2h5jyvbjxfbzbr9f8i1n1ss";
-      name = "qtdeclarative-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtdeclarative-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1c7nar7q92w8l7wkmwbl0f6j4g1c8kw8jbn1bf35sf821593bzbf";
+      name = "qtdeclarative-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtdoc = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtdoc-everywhere-src-6.9.3.tar.xz";
-      sha256 = "0am13lnmfxqj8ayx9ml5sm2qagl5s6hrki3bvdxfmzfkl07ds694";
-      name = "qtdoc-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtdoc-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0fvx690kap3s2h9lg4d4w3nsiks6h2idggskisg1r1gpwks2brgc";
+      name = "qtdoc-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtgraphs = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtgraphs-everywhere-src-6.9.3.tar.xz";
-      sha256 = "13041r244h3mgs95zcyw5x7lfginf4gxs59spz030p0jap867p2h";
-      name = "qtgraphs-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtgraphs-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1shllyk4f5lidw0hij9zhgapck3rf3hm6qw4m1nn79mynfrz3j3f";
+      name = "qtgraphs-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtgrpc = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtgrpc-everywhere-src-6.9.3.tar.xz";
-      sha256 = "00py189v3ihpy9cj51sxapl2dp3ci7k04ikjl6zbxmbjrdwwhqvr";
-      name = "qtgrpc-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtgrpc-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0id4j4xgamx9wndc3cgnf5m42ax257xyfy2khq4aw0b10s4j4wpv";
+      name = "qtgrpc-everywhere-src-6.10.0.tar.xz";
     };
   };
   qthttpserver = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qthttpserver-everywhere-src-6.9.3.tar.xz";
-      sha256 = "13rfvmh42h4zd2slb2d0xqdy7wgsy05q8jqy3ldbikx5vf9qg9vs";
-      name = "qthttpserver-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qthttpserver-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1i8z4l1is5xashh5lq9afj1syhvvz15zgcr5f27mwhjzvc0mfw74";
+      name = "qthttpserver-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtimageformats = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtimageformats-everywhere-src-6.9.3.tar.xz";
-      sha256 = "1zigaz2418sy6m3na91rddxvlfn3257535kq120f9f6lzgdnpcjg";
-      name = "qtimageformats-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtimageformats-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1shcghzjn3v9mbgms0ykk5d91q7hdm8mxv8n6vjhsm3wa190lib4";
+      name = "qtimageformats-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtlanguageserver = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtlanguageserver-everywhere-src-6.9.3.tar.xz";
-      sha256 = "0cwx6rlp9nm0qbzjamfcqhhylbmh2f5kk3z749ln49fbz32ads68";
-      name = "qtlanguageserver-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtlanguageserver-everywhere-src-6.10.0.tar.xz";
+      sha256 = "19i151qxh2fw2h5w6082bh0myk6skz3dihhs4mahhb1rkzh077jc";
+      name = "qtlanguageserver-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtlocation = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtlocation-everywhere-src-6.9.3.tar.xz";
-      sha256 = "018nwyr1idh3rfp22w86pw3i25xbj7mv49wir5s1akmgzp8jf4hl";
-      name = "qtlocation-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtlocation-everywhere-src-6.10.0.tar.xz";
+      sha256 = "007qbni20qajdq6villwp7bc7hqzjlppc30yw3ccqb2bzf3kxm6b";
+      name = "qtlocation-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtlottie = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtlottie-everywhere-src-6.9.3.tar.xz";
-      sha256 = "0cyzj0xhdhlgkra1pqb4vdazxjfii05sc7r5h0ml9fzhfiai0vhi";
-      name = "qtlottie-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtlottie-everywhere-src-6.10.0.tar.xz";
+      sha256 = "09bvm3jr2s0hg14dq8b7604hfgxj3cm1i93lkkbjh2n2bfpi793h";
+      name = "qtlottie-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtmultimedia = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtmultimedia-everywhere-src-6.9.3.tar.xz";
-      sha256 = "1xc6kgqm88rkzr8qzdi8yj8dm4dqfsfzkkba4d8iijb0xbkvwxd2";
-      name = "qtmultimedia-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtmultimedia-everywhere-src-6.10.0.tar.xz";
+      sha256 = "09hixwp8sq771rfp4c8bvmpzl6jd906k2rsrkxwij78drwhl0hh4";
+      name = "qtmultimedia-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtnetworkauth = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtnetworkauth-everywhere-src-6.9.3.tar.xz";
-      sha256 = "1ivyrha9ibc2iz4lvrz5309pdqxyccwzbpmyg2m24ghkxm3xrnb7";
-      name = "qtnetworkauth-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtnetworkauth-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1j5k6dn0zc5rq82k89nyz5w0ny89mg1pg5aw0h41ybg2f5fqaq04";
+      name = "qtnetworkauth-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtpositioning = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtpositioning-everywhere-src-6.9.3.tar.xz";
-      sha256 = "1d1mb1fni42vgfyj9ghk0g6602nx8lwa1y0bmynpmh84yy0ck1qc";
-      name = "qtpositioning-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtpositioning-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1q8yd9sjbm1vzcda1i21x0qf0n4md0k6wwbmr5jrvqbbcf8brgzc";
+      name = "qtpositioning-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtquick3d = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtquick3d-everywhere-src-6.9.3.tar.xz";
-      sha256 = "0wyfran9vwl6fm2i9nc149fpvv8r5k3yvrn2f1rjpb9qkw271cli";
-      name = "qtquick3d-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtquick3d-everywhere-src-6.10.0.tar.xz";
+      sha256 = "126lxiizd4pxxp43zzwv3k4i73806bgg329qsygz5qbnm0g8q9cq";
+      name = "qtquick3d-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtquick3dphysics = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtquick3dphysics-everywhere-src-6.9.3.tar.xz";
-      sha256 = "0vjs7calgc0vc7fv6hnbghhi37cfiapxim650av9w92xfhnv5myw";
-      name = "qtquick3dphysics-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtquick3dphysics-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0hj90pdxh6x6zm1b4iflhr89sy13qrbwc79pv9z9m7gdwyzhid62";
+      name = "qtquick3dphysics-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtquickeffectmaker = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtquickeffectmaker-everywhere-src-6.9.3.tar.xz";
-      sha256 = "04lrlp1fakn8kv160ln8j1fsqsfdcjf1dzwlknx5r1m04hfkdw3b";
-      name = "qtquickeffectmaker-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtquickeffectmaker-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0vmr5s6b4cqxpw5kl5shzydj3if89znm3izj5nrhzsgbic11vhk4";
+      name = "qtquickeffectmaker-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtquicktimeline = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtquicktimeline-everywhere-src-6.9.3.tar.xz";
-      sha256 = "1xqidk7njn1xiiz3i27ddzwd568caigq8p2ja4ks67x7bsk4nkr8";
-      name = "qtquicktimeline-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtquicktimeline-everywhere-src-6.10.0.tar.xz";
+      sha256 = "182bn72mifx8s867hsmramjfl9qr8szpla9fqw7bi3ywb1fiig6z";
+      name = "qtquicktimeline-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtremoteobjects = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtremoteobjects-everywhere-src-6.9.3.tar.xz";
-      sha256 = "0nyqmapypw0y745zg58rq9183vcrbm2c71dc3p9sdqflal07r64q";
-      name = "qtremoteobjects-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtremoteobjects-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1616dagpzs68rhi1wiq1dwl1kbgf2c1mmrb3c7ni204k0rcjsh5i";
+      name = "qtremoteobjects-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtscxml = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtscxml-everywhere-src-6.9.3.tar.xz";
-      sha256 = "1drlbdgicqx76gyqi79ri1gy2vrya6l99gig76p8x46za70c12gk";
-      name = "qtscxml-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtscxml-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1r1ic7kr3xzrg0vyrj4smj2vzyidazwrb5jqn2l6irg1bx06r55m";
+      name = "qtscxml-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtsensors = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtsensors-everywhere-src-6.9.3.tar.xz";
-      sha256 = "0s1gz66nar27c3l5cbqqdnza1pxbd7nylz88mnj32xpkwml53nx2";
-      name = "qtsensors-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtsensors-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0fc7cq067sddfwcn43j5v4h6xzjrvj5gvi08l9bfag43s4d5wlk7";
+      name = "qtsensors-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtserialbus = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtserialbus-everywhere-src-6.9.3.tar.xz";
-      sha256 = "1ksvfwfk0az47sgfcaqbac936y75lcaga5fip5lbgz0s0zd3k08a";
-      name = "qtserialbus-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtserialbus-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0c7cljc555vcs7jkm63mczxxpg085b161b6vpd9vnrz2zyzv49y6";
+      name = "qtserialbus-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtserialport = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtserialport-everywhere-src-6.9.3.tar.xz";
-      sha256 = "16427sa9qhk8hsyxjr69fhqmvzlg9n4pdizmqfc4cr7j1w1yq62b";
-      name = "qtserialport-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtserialport-everywhere-src-6.10.0.tar.xz";
+      sha256 = "01gqv6hc2ycd877jhq6ffnfgizh9pgnzc1gn6m6cfp8ximwa07jg";
+      name = "qtserialport-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtshadertools = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtshadertools-everywhere-src-6.9.3.tar.xz";
-      sha256 = "0rs553abb8sdla4cywfpgfh3vvyafm8spy8nnvj06md3hvp09632";
-      name = "qtshadertools-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtshadertools-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1xpvzmpisglbk3nnczqvj0n1dv6zd79phvczqwpqc9yq7y64gfl7";
+      name = "qtshadertools-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtspeech = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtspeech-everywhere-src-6.9.3.tar.xz";
-      sha256 = "0gmbr65s4j2bka13iln3fmjrhl1i46lp5vlhdv66rf1gfi65lvzq";
-      name = "qtspeech-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtspeech-everywhere-src-6.10.0.tar.xz";
+      sha256 = "07m59akg31010khz82lvbrgjwwacavra5qsi17jqpk0chdk300qk";
+      name = "qtspeech-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtsvg = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtsvg-everywhere-src-6.9.3.tar.xz";
-      sha256 = "1qi6f3lvp0r7n79m1iw80690366bd53gyxm5gp76zgnbb0rslxnv";
-      name = "qtsvg-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtsvg-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0cr5vaz485n23fvw4kvh1ykqny61bpdr5vd2q9szywsy9phc1ljy";
+      name = "qtsvg-everywhere-src-6.10.0.tar.xz";
     };
   };
   qttools = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qttools-everywhere-src-6.9.3.tar.xz";
-      sha256 = "1sdla2blvk9r4g7v67dhwqjxx7kflyh7cm9pw5f7ziazjw7apxqc";
-      name = "qttools-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qttools-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0anhvd7yqs9l3dryl43f0f7zq22rwrvz93g16ygmjgiyryc50vfq";
+      name = "qttools-everywhere-src-6.10.0.tar.xz";
     };
   };
   qttranslations = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qttranslations-everywhere-src-6.9.3.tar.xz";
-      sha256 = "18chqjzy7ji76crfisl1rya8ds3my97bgsxkg7yldcc1crg58vgk";
-      name = "qttranslations-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qttranslations-everywhere-src-6.10.0.tar.xz";
+      sha256 = "1pkc0a5kigcp0jcq3ny1ykl0rqw0vabz45w14d2mgjyhrx9q4vij";
+      name = "qttranslations-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtvirtualkeyboard = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtvirtualkeyboard-everywhere-src-6.9.3.tar.xz";
-      sha256 = "0d2m87fvd11ckjjzy3lj1mbfisig4x9c263phq4fczwy3k4xb851";
-      name = "qtvirtualkeyboard-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtvirtualkeyboard-everywhere-src-6.10.0.tar.xz";
+      sha256 = "108klc6cr2ihaka9gnqaqv9i8r4lr8m39yviic3nviibd3r6gcmb";
+      name = "qtvirtualkeyboard-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtwayland = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtwayland-everywhere-src-6.9.3.tar.xz";
-      sha256 = "1pfsfdjqw985d8220jw13sqacyiip26bzpk1ax30ms33jayd84z4";
-      name = "qtwayland-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtwayland-everywhere-src-6.10.0.tar.xz";
+      sha256 = "07vnfd0xmzg8vc68g9j2i88lilmic5vhv22gn47vs94v4l52ngv0";
+      name = "qtwayland-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtwebchannel = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtwebchannel-everywhere-src-6.9.3.tar.xz";
-      sha256 = "01d3dy0fjz4vfy8s1yzpmd31b8mhvqf15z61fzr9qgd1wp0vnmwl";
-      name = "qtwebchannel-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtwebchannel-everywhere-src-6.10.0.tar.xz";
+      sha256 = "02ahm7cz8wgvfcgyq85sc2v566x4ihymalmv5xi0wn5zz9j5h5kl";
+      name = "qtwebchannel-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtwebengine = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtwebengine-everywhere-src-6.9.3.tar.xz";
-      sha256 = "0rl9v936sq6spvb3sfkpmc51wwmljrn4ssy3ii0pdn0xsl8kn2ym";
-      name = "qtwebengine-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtwebengine-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0765a5kfkxxi7rq58pivi32xwb17pvg3h2ix88dx3y9h3jqpfk64";
+      name = "qtwebengine-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtwebsockets = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtwebsockets-everywhere-src-6.9.3.tar.xz";
-      sha256 = "1i428awzws4x4cmv6zpdgb27c2m71cs8dqcjbwiwqcfbyf6dlzg2";
-      name = "qtwebsockets-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtwebsockets-everywhere-src-6.10.0.tar.xz";
+      sha256 = "0vl091wnzqjpnp0i0l2dqlbhlwcfzw2ry1p48aifxf63lmyjw2fi";
+      name = "qtwebsockets-everywhere-src-6.10.0.tar.xz";
     };
   };
   qtwebview = {
-    version = "6.9.3";
+    version = "6.10.0";
     src = fetchurl {
-      url = "${mirror}/official_releases/qt/6.9/6.9.3/submodules/qtwebview-everywhere-src-6.9.3.tar.xz";
-      sha256 = "1j1cqj2hq0c8r9lxb1h6mdhnf9clqb95jw2p0nn81jzin701ypn6";
-      name = "qtwebview-everywhere-src-6.9.3.tar.xz";
+      url = "${mirror}/official_releases/qt/6.10/6.10.0/submodules/qtwebview-everywhere-src-6.10.0.tar.xz";
+      sha256 = "03rszbcr3lnf9cnk7hz99ibxx8na4l3i98q19fahj36ilpk68dd9";
+      name = "qtwebview-everywhere-src-6.10.0.tar.xz";
     };
   };
 }

From 292790f7c75d75d640c21abe0b02aa7afc901932 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 7 Oct 2025 18:11:06 +0300
Subject: [PATCH 0492/6226] python313Packages.{shiboken6,pyside6}: 6.9.3 ->
 6.10.0

---
 .../python-modules/pyside6/default.nix        | 14 +++++++++-
 .../python-modules/shiboken6/default.nix      | 20 +++++++++-----
 .../shiboken6/fix-include-qt-headers.patch    | 26 ++++++++-----------
 3 files changed, 38 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/pyside6/default.nix b/pkgs/development/python-modules/pyside6/default.nix
index bcd90f6b0475..0a9621aaa2d2 100644
--- a/pkgs/development/python-modules/pyside6/default.nix
+++ b/pkgs/development/python-modules/pyside6/default.nix
@@ -10,6 +10,7 @@
   shiboken6,
   llvmPackages,
   symlinkJoin,
+  fetchpatch,
 }:
 let
   packages = with python.pkgs.qt6; [
@@ -56,7 +57,17 @@ stdenv.mkDerivation (finalAttrs: {
 
   inherit (shiboken6) version src;
 
-  sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/pyside6";
+  sourceRoot = "${finalAttrs.src.name}/sources/pyside6";
+
+  patches = [
+    # revert commit that breaks generated cmake files
+    (fetchpatch {
+      url = "https://code.qt.io/cgit/pyside/pyside-setup.git/patch/?id=05e328476f2d6ef8a0f3f44aca1e5b1cdb7499fc";
+      revert = true;
+      stripLen = 2;
+      hash = "sha256-PPLV5K+xp7ZdG0Tah1wpBdNWN7fsXvZh14eBzO0R55c=";
+    })
+  ];
 
   # Qt Designer plugin moved to a separate output to reduce closure size
   # for downstream things
@@ -115,6 +126,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   postInstall = ''
     cd ../../..
+    chmod +w .
     ${python.pythonOnBuildForHost.interpreter} setup.py egg_info --build-type=pyside6
     cp -r PySide6.egg-info $out/${python.sitePackages}/
 
diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix
index 837daf16c7a7..2ac75ab8a09d 100644
--- a/pkgs/development/python-modules/shiboken6/default.nix
+++ b/pkgs/development/python-modules/shiboken6/default.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  fetchurl,
+  fetchgit,
   llvmPackages,
   python,
   cmake,
@@ -13,14 +13,15 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "shiboken6";
-  version = "6.9.3";
+  version = "6.10.0";
 
-  src = fetchurl {
-    url = "mirror://qt/official_releases/QtForPython/pyside6/PySide6-${finalAttrs.version}-src/pyside-setup-everywhere-src-${finalAttrs.version}.tar.xz";
-    hash = "sha256-fNLVq7mPLm9EKw5B9fz5MOcxKuSxf2gTFrGtx7Y7sXI=";
+  src = fetchgit {
+    url = "https://code.qt.io/pyside/pyside-setup.git";
+    rev = "97af685d5b777323690704fb9848f50aa2728ce9";
+    hash = "sha256-zJV4rrqr2bzWFEG1CWOI+y6wbfQDvWAst6T3aSssj6M=";
   };
 
-  sourceRoot = "pyside-setup-everywhere-src-${finalAttrs.version}/sources/shiboken6";
+  sourceRoot = "${finalAttrs.src.name}/sources/shiboken6";
 
   patches = [ ./fix-include-qt-headers.patch ];
 
@@ -48,10 +49,17 @@ stdenv'.mkDerivation (finalAttrs: {
   # variable available in this file.
   postPatch = ''
     substituteInPlace cmake/ShibokenHelpers.cmake --replace-fail '#!/bin/bash' '#!''${BASH}'
+
+    # raise ValueError('ZIP does not support timestamps before 1980')
+    find \
+      shibokenmodule/files.dir/shibokensupport/ \
+      libshiboken/embed/signature_bootstrap.py \
+      -exec touch -d "1980-01-01T00:00Z" {} \;
   '';
 
   postInstall = ''
     cd ../../..
+    chmod +w .
     ${python.pythonOnBuildForHost.interpreter} setup.py egg_info --build-type=shiboken6
     cp -r shiboken6.egg-info $out/${python.sitePackages}/
   '';
diff --git a/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch b/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch
index bfa035b92b52..c9b2d51a94df 100644
--- a/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch
+++ b/pkgs/development/python-modules/shiboken6/fix-include-qt-headers.patch
@@ -1,14 +1,14 @@
 --- a/ApiExtractor/clangparser/compilersupport.cpp
 +++ b/ApiExtractor/clangparser/compilersupport.cpp
-@@ -16,6 +16,7 @@
+@@ -18,6 +18,7 @@
+ #include <QtCore/qprocess.h>
  #include <QtCore/qstandardpaths.h>
  #include <QtCore/qstringlist.h>
- #include <QtCore/qversionnumber.h>
 +#include <QtCore/qregularexpression.h>
  
  #include <clang-c/Index.h>
  
-@@ -341,6 +342,13 @@ QByteArrayList emulatedCompilerOptions()
+@@ -638,6 +639,13 @@ QByteArrayList emulatedCompilerOptions(LanguageLevel level)
  {
      QByteArrayList result;
      HeaderPaths headerPaths;
@@ -21,20 +21,18 @@
 +
      switch (compiler()) {
      case Compiler::Msvc:
-         result.append(QByteArrayLiteral("-fms-compatibility-version=19.26.28806"));
-@@ -352,9 +360,30 @@ QByteArrayList emulatedCompilerOptions()
+         result.append("-fms-compatibility-version="_ba + msvcCompatVersion());
+@@ -651,10 +659,27 @@ QByteArrayList emulatedCompilerOptions(LanguageLevel level)
              appendClangBuiltinIncludes(&headerPaths);
          break;
      case Compiler::Clang:
--        headerPaths.append(gppInternalIncludePaths(compilerFromCMake(u"clang++"_s)));
-+    // fix: error: cannot jump from switch statement to this case label: case Compiler::Gpp
-+    // note: jump bypasses variable initialization: const HeaderPaths clangPaths =
+-        headerPaths.append(gppInternalIncludePaths(compilerFromCMake(u"clang++"_s),
+-                                                   _compilerArguments));
 +    {
-+        //headerPaths.append(gppInternalIncludePaths(compilerFromCMake(u"clang++"_s)));
 +        // fix: qt.shiboken: x is specified in typesystem, but not defined. This could potentially lead to compilation errors.
 +        // PySide requires that Qt headers are not -isystem
 +        // https://bugreports.qt.io/browse/PYSIDE-787
-+        const HeaderPaths clangPaths = gppInternalIncludePaths(compilerFromCMake(u"clang++"_qs));
++        const HeaderPaths clangPaths = gppInternalIncludePaths(compilerFromCMake(u"clang++"_s), _compilerArguments);
 +        for (const HeaderPath &h : clangPaths) {
 +            auto match = qtHeaderRegex.match(QString::fromUtf8(h.path));
 +            if (!match.hasMatch()) {
@@ -54,9 +52,9 @@
      case Compiler::Gpp:
          if (needsClangBuiltinIncludes())
              appendClangBuiltinIncludes(&headerPaths);
-@@ -363,8 +392,20 @@ QByteArrayList emulatedCompilerOptions()
-         // <type_traits> etc (g++ 11.3).
-         const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(u"g++"_qs));
+@@ -664,8 +689,20 @@ QByteArrayList emulatedCompilerOptions(LanguageLevel level)
+         const HeaderPaths gppPaths = gppInternalIncludePaths(compilerFromCMake(u"g++"_s),
+                                                              _compilerArguments);
          for (const HeaderPath &h : gppPaths) {
 -            if (h.path.contains("c++") || h.path.contains("sysroot"))
 +            // fix: qt.shiboken: x is specified in typesystem, but not defined. This could potentially lead to compilation errors.
@@ -76,5 +74,3 @@
          }
          break;
      }
--- 
-2.39.0

From 13d9d908dbf8cfe8333d31eb67252fb5d2f17678 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 7 Oct 2025 21:22:48 +0300
Subject: [PATCH 0493/6226] telegram-desktop: 6.1.3 -> 6.1.4

---
 .../telegram/telegram-desktop/unwrapped.nix                   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
index 0c57e6909195..e592193e1f4a 100644
--- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
+++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix
@@ -42,14 +42,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "telegram-desktop-unwrapped";
-  version = "6.1.3";
+  version = "6.1.4";
 
   src = fetchFromGitHub {
     owner = "telegramdesktop";
     repo = "tdesktop";
     rev = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-ElbKzv+QMqH62BGAvNjDDNp7NSJYIEvoDzxKCbEdwqM=";
+    hash = "sha256-AmGYLRVkAmhpj22+ILAL7O2jQj6AzwdZdNaAESI9m5c=";
   };
 
   nativeBuildInputs = [

From dc8a174778efde6cdf53091946df3f646c55055b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Oct 2025 19:55:03 +0000
Subject: [PATCH 0494/6226] go-swagger: 0.32.3 -> 0.33.1

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

diff --git a/pkgs/by-name/go/go-swagger/package.nix b/pkgs/by-name/go/go-swagger/package.nix
index f92e86b05839..5762f0be11cf 100644
--- a/pkgs/by-name/go/go-swagger/package.nix
+++ b/pkgs/by-name/go/go-swagger/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "go-swagger";
-  version = "0.32.3";
+  version = "0.33.1";
 
   src = fetchFromGitHub {
     owner = "go-swagger";
     repo = "go-swagger";
     tag = "v${version}";
-    hash = "sha256-L6EfHNwykqGtA1CZd/Py6QqeCz10VGjX/lEVHs6VB6g=";
+    hash = "sha256-CVfGKkqneNgSJZOptQrywCioSZwJP0XGspVM3S45Q/k=";
   };
 
-  vendorHash = "sha256-UQbPVrLehl2jwGXdJPrRo6JsAd/2A+NKEQwkRr3reOY=";
+  vendorHash = "sha256-x3fTIXmI5NnOKph1D84MHzf1Kod+WLYn1JtnWLr4x+U=";
 
   doCheck = false;
 

From 5610c0b7b4db566545b89cbe42d94dfac3015481 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Oct 2025 20:10:55 +0000
Subject: [PATCH 0495/6226] az-pim-cli: 1.7.0 -> 1.10.0

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

diff --git a/pkgs/by-name/az/az-pim-cli/package.nix b/pkgs/by-name/az/az-pim-cli/package.nix
index 441aed3cd297..8451ca93bac7 100644
--- a/pkgs/by-name/az/az-pim-cli/package.nix
+++ b/pkgs/by-name/az/az-pim-cli/package.nix
@@ -10,13 +10,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "az-pim-cli";
-  version = "1.7.0";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "netr0m";
     repo = "az-pim-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-X7+/2pXbpHFm22lwWy6LvyjIy6sxmYSiMrYV3faAZl4=";
+    hash = "sha256-1MJVU1YhjIpY4C3cpmXKVTg/vFdCEgQZoOALLQW/7LM=";
   };
 
   patches = [
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
     ./version-build-info.patch
   ];
 
-  vendorHash = "sha256-PHrpUlAG/PBe3NKUGBQ1U7dCcqkSlErWX2dp9ZPB3+8=";
+  vendorHash = "sha256-ucsTrouw0/MAVzrXb2mot9ccD5v6scu8SJMJR51R48E=";
 
   nativeBuildInputs = [
     installShellFiles

From 95ead6d497513f80646da927d1d86390ade713ed Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Tue, 7 Oct 2025 22:15:59 +0200
Subject: [PATCH 0496/6226] borgmatic: 2.0.7 -> 2.0.9

---
 pkgs/by-name/bo/borgmatic/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix
index 48dc20d37d26..26a9b78ba809 100644
--- a/pkgs/by-name/bo/borgmatic/package.nix
+++ b/pkgs/by-name/bo/borgmatic/package.nix
@@ -15,12 +15,12 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "borgmatic";
-  version = "2.0.7";
+  version = "2.0.9";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-HunKXVuDGTdH+CzIQbtkN0oRMocQ7gVh6Mf6L7wlhAY=";
+    hash = "sha256-St4ZaZOgJhdMWr75V5OJAt/4JgOkvkCMmpYpn2mbxh0=";
   };
 
   passthru.updateScript = nix-update-script { };
@@ -67,10 +67,10 @@ python3Packages.buildPythonApplication rec {
       # there is another "sleep", so choose the one with the space after it
       # due to https://github.com/borgmatic-collective/borgmatic/commit/2e9f70d49647d47fb4ca05f428c592b0e4319544
       substitute sample/systemd/borgmatic.service \
-                 $out/lib/systemd/system/borgmatic.service \
-                 --replace /root/.local/bin/borgmatic $out/bin/borgmatic \
-                 --replace systemd-inhibit ${systemd}/bin/systemd-inhibit \
-                 --replace "sleep " "${coreutils}/bin/sleep "
+        $out/lib/systemd/system/borgmatic.service \
+        --replace-fail /root/.local/bin/borgmatic $out/bin/borgmatic \
+        --replace-fail systemd-inhibit ${systemd}/bin/systemd-inhibit \
+        --replace-fail "sleep " "${coreutils}/bin/sleep "
     '';
 
   passthru.tests = {

From a6ae7b820376eb7c1c8b4c13e958292ee5f10e9d Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Tue, 7 Oct 2025 21:21:33 +0000
Subject: [PATCH 0497/6226] mbedtls_2: fix build against Clang >= 20

---
 pkgs/development/libraries/mbedtls/2.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/development/libraries/mbedtls/2.nix b/pkgs/development/libraries/mbedtls/2.nix
index 22d30398fed9..773f2eb75d40 100644
--- a/pkgs/development/libraries/mbedtls/2.nix
+++ b/pkgs/development/libraries/mbedtls/2.nix
@@ -10,5 +10,20 @@ callPackage ./generic.nix {
       url = "https://github.com/Mbed-TLS/mbedtls/commit/be4af04fcffcfebe44fa12d39388817d9949a9f3.patch";
       hash = "sha256-CbDm6CchzoTia7Wbpbe3bo9CmHPOsxY2d055AfbCS0g=";
     })
+    # fix build against Clang >= 20 (https://github.com/Mbed-TLS/mbedtls-framework/pull/173)
+    (fetchpatch {
+      name = "Add-__attribute__-nonstring-to-remove-unterminated-s.patch";
+      url = "https://github.com/Mbed-TLS/mbedtls-framework/commit/e811994babf84e29e56ebf97265f5fefdf18050f.patch";
+      hash = "sha256-PGXh7tMnl7VqBOWVZP3UqT5pEd0yh4oszEJNMiVOcGo=";
+    })
+    # fix build against Clang >= 20 (https://github.com/Mbed-TLS/mbedtls/pull/10215)
+    (fetchpatch {
+      name = "Add-__attribute__-nonstring-to-remove-unterminated-s.patch";
+      url = "https://github.com/Mbed-TLS/mbedtls/commit/2e1399f1e1ed6fa1072cf9584f5771322b0d001b.patch";
+      includes = [ "tests/*" ];
+      # drop some context in order to apply the backported patch cleanly
+      decode = "interdiff -U1 /dev/null -";
+      hash = "sha256-OTRnYw7Og6eAsB9pue1jkxO1xnkR48efz5QKjN9H0I8=";
+    })
   ];
 }

From 9c8c6e5bbdd919ae6b196b1d6c4909a88907df9e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 7 Oct 2025 21:33:16 +0000
Subject: [PATCH 0498/6226] symfony-cli: 5.14.2 -> 5.15.1

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

diff --git a/pkgs/by-name/sy/symfony-cli/package.nix b/pkgs/by-name/sy/symfony-cli/package.nix
index cfeeafc81675..4c35cfbe4f2f 100644
--- a/pkgs/by-name/sy/symfony-cli/package.nix
+++ b/pkgs/by-name/sy/symfony-cli/package.nix
@@ -12,14 +12,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "symfony-cli";
-  version = "5.14.2";
-  vendorHash = "sha256-SGD8jFRvdJ5GOeQiW3Whe6EnybQ60wOsC/OureOCn7k=";
+  version = "5.15.1";
+  vendorHash = "sha256-tAaTgcZMvpw1a6sSu86gbgP66Wzkvga1FIIGZHCFSQA=";
 
   src = fetchFromGitHub {
     owner = "symfony-cli";
     repo = "symfony-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qgCuerKn7R4bn3YgzpMprIUDfn2SJdIiXC+9avnzDm4=";
+    hash = "sha256-sjiGHIwCI2W/hN/+b3SPiSANtZyOnv110E9Dgi0qr70=";
     leaveDotGit = true;
     postFetch = ''
       git --git-dir $out/.git log -1 --pretty=%cd --date=format:'%Y-%m-%dT%H:%M:%SZ' > $out/SOURCE_DATE

From 62fd52a2f1ca2d118a77fad0e5837d8916035674 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Oct 2025 01:33:27 +0000
Subject: [PATCH 0499/6226] home-assistant-custom-components.xiaomi_gateway3:
 4.1.3 -> 4.1.4

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

diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix
index 72989c472b1d..fda6c22cee4c 100644
--- a/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/xiaomi_gateway3/package.nix
@@ -9,13 +9,13 @@
 buildHomeAssistantComponent rec {
   owner = "AlexxIT";
   domain = "xiaomi_gateway3";
-  version = "4.1.3";
+  version = "4.1.4";
 
   src = fetchFromGitHub {
     owner = "AlexxIT";
     repo = "XiaomiGateway3";
     rev = "v${version}";
-    hash = "sha256-CcJoXD60z91Gahv5pVrWaIpUNhetW0BN1Nd4DAVRPJs=";
+    hash = "sha256-pa9B2c1QeQ3DR2qjttP0c/44pERGtune+4nlnzPBSYo=";
   };
 
   dependencies = [ zigpy ];

From f76ecd846862beef2c19fff2c79a02b59ba29cd9 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Wed, 8 Oct 2025 12:34:55 +0800
Subject: [PATCH 0500/6226] maintainers: add qzylinra

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e0eb9d8ca1ee..a4cbb6d9c86b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -21271,6 +21271,11 @@
     matrix = "@qyriad:katesiria.org";
     name = "Qyriad";
   };
+  qzylinra = {
+    github = "qzylinra";
+    githubId = 225773816;
+    name = "qzylinra";
+  };
   r-aizawa = {
     github = "Xantibody";
     githubId = 109563705;

From 9df2dc28d73c083ba79045af30809cd595b56db8 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Wed, 8 Oct 2025 12:35:07 +0800
Subject: [PATCH 0501/6226] e-search: init at 15.2.1

---
 pkgs/by-name/e-/e-search/package.nix | 180 +++++++++++++++++++++++++++
 1 file changed, 180 insertions(+)
 create mode 100644 pkgs/by-name/e-/e-search/package.nix

diff --git a/pkgs/by-name/e-/e-search/package.nix b/pkgs/by-name/e-/e-search/package.nix
new file mode 100644
index 000000000000..3bebf70e99db
--- /dev/null
+++ b/pkgs/by-name/e-/e-search/package.nix
@@ -0,0 +1,180 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchurl,
+  fetchzip,
+  autoPatchelfHook,
+  gitMinimal,
+  gobject-introspection,
+  makeWrapper,
+  nodejs_20,
+  pnpm_10,
+  electron,
+  atk,
+  atkmm,
+  cairo,
+  cairomm,
+  gdk-pixbuf,
+  glib,
+  glibmm,
+  gtk3,
+  gtkmm3,
+  harfbuzz,
+  libsForQt5,
+  pango,
+  pangomm,
+  xorg,
+  zlib,
+  nix-update-script,
+  commandLineArgs ? "",
+}:
+
+let
+  eSearch-OCR-ch = fetchzip {
+    url = "https://github.com/xushengfeng/eSearch-OCR/releases/download/4.0.0/ch.zip";
+    hash = "sha256-0NCXuy8k9/AdpK4ie49S8032u37gNhX6Jc6bOGufrV4=";
+    stripRoot = false;
+  };
+  eSearch-OCR-doc_cls = fetchurl {
+    url = "https://github.com/xushengfeng/eSearch-OCR/releases/download/8.1.0/doc_cls.onnx";
+    hash = "sha256-9VFoIq+SYnEeGX/yJKip2IT4BGpjIbdi40+MvwgsRe8=";
+  };
+  eSearch-seg = fetchurl {
+    url = "https://github.com/xushengfeng/eSearch-seg/releases/download/1.0.0/seg.onnx";
+    hash = "sha256-IJSPX4Kg7wIPjdXVmpGbeSk2y98OS+tJrIth9W+J/Q8=";
+  };
+  eSearch-migan_pipeline_v2 = fetchurl {
+    url = "https://github.com/xushengfeng/eSearch/releases/download/13.1.6/migan_pipeline_v2.onnx";
+    hash = "sha256-bx81MKGiMksZdSAYznVgiLB5c82o19iQA0rOXIpIxAs=";
+  };
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "e-search";
+  version = "15.2.1";
+
+  src = fetchFromGitHub {
+    owner = "xushengfeng";
+    repo = "eSearch";
+    tag = finalAttrs.version;
+    hash = "sha256-K4GFLUeq/IbJC3FZBgvKnZq7JrXkqe6eVGsUxxlpWF0=";
+  };
+
+  pnpmDeps = pnpm_10.fetchDeps {
+    inherit (finalAttrs) pname version src;
+    fetcherVersion = 2;
+    prePnpmInstall = ''
+      export PATH=$PATH:${gitMinimal}/bin
+    '';
+    hash = "sha256-wPwsFY7wvbE1LW5PMwMZKejELtqmdsYO2RVrEuOzdcg=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    gobject-introspection
+    pnpm_10.configHook
+    makeWrapper
+    nodejs_20
+  ];
+
+  buildInputs = [
+    atk
+    atkmm
+    cairo
+    cairomm
+    gdk-pixbuf
+    glib
+    glibmm
+    gtk3
+    gtkmm3
+    harfbuzz
+    (lib.getLib stdenv.cc.cc)
+    libsForQt5.kauth
+    libsForQt5.kcodecs
+    libsForQt5.kcompletion
+    libsForQt5.kconfigwidgets
+    libsForQt5.kcoreaddons
+    libsForQt5.kitemviews
+    libsForQt5.kjobwidgets
+    libsForQt5.kservice
+    libsForQt5.kwidgetsaddons
+    libsForQt5.kio
+    libsForQt5.qt5.qtbase
+    libsForQt5.qt5.qtnetworkauth
+    libsForQt5.qt5.qttools
+    libsForQt5.qt5.qtxmlpatterns
+    pango
+    pangomm
+    xorg.libX11
+    xorg.libXrandr
+    xorg.libXt
+    xorg.libXtst
+    xorg.libxcb
+    zlib
+  ];
+
+  env = {
+    ELECTRON_OVERRIDE_DIST_PATH = "${electron}/libexec/electron";
+    ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
+  };
+
+  preBuild = ''
+    mkdir -p assets/onnx/ppocr assets/onnx/seg assets/onnx/inpaint
+    cp --recursive --no-preserve=mode ${eSearch-OCR-ch}/* assets/onnx/ppocr
+    cp --no-preserve=mode ${eSearch-OCR-doc_cls} assets/onnx/ppocr/doc_cls.onnx
+    cp --no-preserve=mode ${eSearch-seg} assets/onnx/seg/seg.onnx
+    cp --no-preserve=mode ${eSearch-migan_pipeline_v2} assets/onnx/inpaint/migan_pipeline_v2.onnx
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    npm run build
+    npm exec electron-builder -- \
+      --linux \
+      --dir \
+      -p never \
+      --config electron-builder.config.js \
+      --config.electronDist=${electron.dist} \
+      --config.electronVersion=${electron.version}
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/eSearch
+    ${
+      if stdenv.hostPlatform.isAarch64 then
+        "cp -r build/linux-arm64-unpacked/{resources,LICENSE*} $out/share/eSearch"
+      else
+        "cp -r build/linux-unpacked/{resources,LICENSE*} $out/share/eSearch"
+    }
+    makeWrapper ${lib.getExe electron} $out/bin/e-search \
+      --inherit-argv0 \
+      --add-flags $out/share/eSearch/resources/app \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \
+      --add-flags ${lib.escapeShellArg commandLineArgs}
+    for icon_size in 16x16 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024; do
+      install -Dm0644 assets/logo/$icon_size.png $out/share/icons/hicolor/$icon_size/apps/e-search.png
+    done
+    install -Dm0644 assets/e-search.desktop $out/share/applications/e-search.desktop
+
+    runHook postInstall
+  '';
+
+  dontWrapQtApps = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Screenshot OCR search translate search for picture paste the picture on the screen screen recorder";
+    homepage = "https://github.com/xushengfeng/eSearch";
+    changelog = "https://github.com/xushengfeng/eSearch/releases/tag/${finalAttrs.version}";
+    mainProgram = "e-search";
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ qzylinra ];
+  };
+})

From 78a56791825f27d974e9f9f858d5a27283a56bea Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 8 Oct 2025 08:28:41 +0300
Subject: [PATCH 0502/6226] nodejs: skip tests that fail on latest Ope

---
 pkgs/development/web/nodejs/nodejs.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 863be3a828f3..758f9314947a 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -380,6 +380,10 @@ let
               "test-runner-run"
               "test-runner-watch-mode"
               "test-watch-mode-files_watcher"
+
+              # fail on openssl 3.6.0
+              "test-http2-server-unknown-protocol"
+              "test-tls-ocsp-callback"
             ]
             ++ lib.optionals (!lib.versionAtLeast version "22") [
               "test-tls-multi-key"

From c6c7abead4f4ecceae28e64b036a787035cdf7d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Oct 2025 07:01:55 +0000
Subject: [PATCH 0503/6226] zwave-js-server: 3.2.1 -> 3.4.0

---
 pkgs/by-name/zw/zwave-js-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zw/zwave-js-server/package.nix b/pkgs/by-name/zw/zwave-js-server/package.nix
index b1d2591220bb..48c39bf3d9ef 100644
--- a/pkgs/by-name/zw/zwave-js-server/package.nix
+++ b/pkgs/by-name/zw/zwave-js-server/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "zwave-js-server";
-  version = "3.2.1";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "zwave-js";
     repo = "zwave-js-server";
     rev = version;
-    hash = "sha256-oZA+tMYxiWc+PiPiqGEJpEa434CqNjPbutBWjXBgmhw=";
+    hash = "sha256-JmPO1faJgpJ+RjocvauP0EQGken61G59CLqQAZiRSUU=";
   };
 
-  npmDepsHash = "sha256-1JgfXF3kNuUj0jprKBsJSPeFH6ZpqpU4lceTQm5FBgg=";
+  npmDepsHash = "sha256-lCJ4dcLIv+PQkoNdaP9FsXbWIzy2sdooQw08ZVbESCM=";
 
   # For some reason the zwave-js dependency is in devDependencies
   npmFlags = [ "--include=dev" ];

From b997b9093d8f8aa685a46b246242403d9e32f0ef Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 8 Oct 2025 09:52:47 +1000
Subject: [PATCH 0504/6226] go_1_25: 1.25.1 -> 1.25.2

Changelog: https://go.dev/doc/devel/release#go1.25
(cherry picked from commit c27d4b0b745774e5ee1d7f23201b430726c18d6a)
---
 pkgs/development/compilers/go/1.25.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.25.nix b/pkgs/development/compilers/go/1.25.nix
index b25f60b3d5ae..0908ef39dec9 100644
--- a/pkgs/development/compilers/go/1.25.nix
+++ b/pkgs/development/compilers/go/1.25.nix
@@ -28,11 +28,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.25.1";
+  version = "1.25.2";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-0BDBCc7pTYDv5oHqtGvepJGskGv0ZYPDLp8NuwvRpZQ=";
+    hash = "sha256-NxEUDPuH/Oj3oT982GDfBB5sEvdhD0DKxuxvorZeluQ=";
   };
 
   strictDeps = true;

From cb8b359b5fadbb54dd9186001c3e9c4f32b49ff7 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 8 Oct 2025 13:14:21 +0300
Subject: [PATCH 0505/6226] python313Packages.pip-tools: 7.4.1 -> 7.5.1

- switch to github source (pypi artifacts are named weird now)
- update test skips
---
 .../python-modules/pip-tools/default.nix      | 37 ++++++-------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index a5a04a886480..f73dbc454550 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -4,7 +4,7 @@
   buildPythonPackage,
   build,
   click,
-  fetchPypi,
+  fetchFromGitHub,
   pep517,
   pip,
   pytest-xdist,
@@ -19,14 +19,16 @@
 
 buildPythonPackage rec {
   pname = "pip-tools";
-  version = "7.4.1";
+  version = "7.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-hkgm9Qc4ZEUOJNvuuFzjkgzfsJhIo9aev1N7Uh8UvMk=";
+  src = fetchFromGitHub {
+    owner = "jazzband";
+    repo = "pip-tools";
+    tag = "v${version}";
+    hash = "sha256-o2qpaiy+oL3QzfVaGaaRa+2drCjzc6YwNsJlK8NBICY=";
   };
 
   patches = [ ./fix-setup-py-bad-syntax-detection.patch ];
@@ -59,29 +61,12 @@ buildPythonPackage rec {
   disabledTests = [
     # Tests require network access
     "network"
-    "test_direct_reference_with_extras"
-    "test_local_duplicate_subdependency_combined"
     "test_bad_setup_file"
-    # Assertion error
-    "test_compile_recursive_extras"
-    "test_combine_different_extras_of_the_same_package"
-    "test_diff_should_not_uninstall"
-    "test_cli_compile_all_extras_with_multiple_packages"
-    # Deprecations
+    "test_compile_build_targets_setuptools_no_wheel_dep"
+    "test_compile_recursive_extras_build_targets"
+    "test_direct_reference_with_extras"
     "test_error_in_pyproject_toml"
-
-    # pip 25.0 compat issues
-    # https://github.com/jazzband/pip-tools/issues/2112
-    # requirement doesn't end with semicolon
-    "test_resolver"
-    "test_resolver__custom_unsafe_deps"
-    # constraints.txt is now in a tmpdir
-    "test_preserve_via_requirements_constrained_dependencies_when_run_twice"
-    "test_annotate_option"
-    # TypeError("'<' not supported between instances of 'InstallationCandidate' and 'InstallationCandidate'")>.exit_code
-    "test_no_candidates"
-    "test_no_candidates_pre"
-    "test_failure_of_legacy_resolver_prompts_for_backtracking"
+    "test_local_duplicate_subdependency_combined"
   ];
 
   pythonImportsCheck = [ "piptools" ];

From 697c16364fee72d3ccd81db2a6efe53e6b284c11 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 8 Oct 2025 13:25:47 +0300
Subject: [PATCH 0506/6226] python313Packages.pyopenssl: skip test broken by
 openssl 3.6.0

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

diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix
index ebbfcaff6c1f..aab03cea1990 100644
--- a/pkgs/development/python-modules/pyopenssl/default.nix
+++ b/pkgs/development/python-modules/pyopenssl/default.nix
@@ -64,6 +64,8 @@ buildPythonPackage rec {
     "test_wantWriteError"
     # https://github.com/pyca/pyopenssl/issues/1043
     "test_alpn_call_failure"
+    # https://github.com/pyca/pyopenssl/issues/1455
+    "test_client_receives_servers_data"
   ]
   ++ lib.optionals (lib.hasPrefix "libressl" openssl.meta.name) [
     # https://github.com/pyca/pyopenssl/issues/791

From 19d426681272b83a9c8c6215b6a80b7351d7cf6c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 8 Oct 2025 13:54:34 +0300
Subject: [PATCH 0507/6226] python313Packages.py-vapid: pick patch to fix tests
 with latest cryptography

---
 .../py-vapid/cryptography.patch               | 270 ++++++++++++++++++
 .../python-modules/py-vapid/default.nix       |   6 +
 2 files changed, 276 insertions(+)
 create mode 100644 pkgs/development/python-modules/py-vapid/cryptography.patch

diff --git a/pkgs/development/python-modules/py-vapid/cryptography.patch b/pkgs/development/python-modules/py-vapid/cryptography.patch
new file mode 100644
index 000000000000..d38088931b44
--- /dev/null
+++ b/pkgs/development/python-modules/py-vapid/cryptography.patch
@@ -0,0 +1,270 @@
+--- a/py_vapid/__init__.py
++++ b/py_vapid/__init__.py
+@@ -25,6 +25,7 @@
+ 
+ class VapidException(Exception):
+     """An exception wrapper for Vapid."""
++
+     pass
+ 
+ 
+@@ -34,6 +35,7 @@ class Vapid01(object):
+     https://tools.ietf.org/html/draft-ietf-webpush-vapid-01
+ 
+     """
++
+     _private_key = None
+     _public_key = None
+     _schema = "WebPush"
+@@ -65,14 +67,14 @@ def from_raw(cls, private_raw):
+         key = ec.derive_private_key(
+             int(binascii.hexlify(b64urldecode(private_raw)), 16),
+             curve=ec.SECP256R1(),
+-            backend=default_backend())
++            backend=default_backend(),
++        )
+         return cls(key)
+ 
+     @classmethod
+     def from_raw_public(cls, public_raw):
+         key = ec.EllipticCurvePublicKey.from_encoded_point(
+-            curve=ec.SECP256R1(),
+-            data=b64urldecode(public_raw)
++            curve=ec.SECP256R1(), data=b64urldecode(public_raw)
+         )
+         ss = cls()
+         ss._public_key = key
+@@ -87,8 +89,7 @@ def from_pem(cls, private_key):
+ 
+         """
+         # not sure why, but load_pem_private_key fails to deserialize
+-        return cls.from_der(
+-            b''.join(private_key.splitlines()[1:-1]))
++        return cls.from_der(b"".join(private_key.splitlines()[1:-1]))
+ 
+     @classmethod
+     def from_der(cls, private_key):
+@@ -98,9 +99,9 @@ def from_der(cls, private_key):
+         :type private_key: bytes
+ 
+         """
+-        key = serialization.load_der_private_key(b64urldecode(private_key),
+-                                                 password=None,
+-                                                 backend=default_backend())
++        key = serialization.load_der_private_key(
++            b64urldecode(private_key), password=None, backend=default_backend()
++        )
+         return cls(key)
+ 
+     @classmethod
+@@ -118,13 +119,13 @@ def from_file(cls, private_key_file=None):
+             vapid.generate_keys()
+             vapid.save_key(private_key_file)
+             return vapid
+-        with open(private_key_file, 'r') as file:
++        with open(private_key_file, "r") as file:
+             private_key = file.read()
+         try:
+             if "-----BEGIN" in private_key:
+-                vapid = cls.from_pem(private_key.encode('utf8'))
++                vapid = cls.from_pem(private_key.encode("utf8"))
+             else:
+-                vapid = cls.from_der(private_key.encode('utf8'))
++                vapid = cls.from_der(private_key.encode("utf8"))
+             return vapid
+         except Exception as exc:
+             logging.error("Could not open private key file: %s", repr(exc))
+@@ -156,11 +157,10 @@ def verify(cls, key, auth):
+         type key: str
+ 
+         """
+-        tokens = auth.rsplit(' ', 1)[1].rsplit('.', 1)
++        tokens = auth.rsplit(" ", 1)[1].rsplit(".", 1)
+         kp = cls().from_raw_public(key.encode())
+         return kp.verify_token(
+-            validation_token=tokens[0].encode(),
+-            verification_token=tokens[1]
++            validation_token=tokens[0].encode(), verification_token=tokens[1]
+         )
+ 
+     @property
+@@ -197,20 +197,19 @@ def public_key(self):
+ 
+     def generate_keys(self):
+         """Generate a valid ECDSA Key Pair."""
+-        self.private_key = ec.generate_private_key(ec.SECP256R1,
+-                                                   default_backend())
++        self.private_key = ec.generate_private_key(curve=ec.SECP256R1(), backend=default_backend())
+ 
+     def private_pem(self):
+         return self.private_key.private_bytes(
+             encoding=serialization.Encoding.PEM,
+             format=serialization.PrivateFormat.PKCS8,
+-            encryption_algorithm=serialization.NoEncryption()
++            encryption_algorithm=serialization.NoEncryption(),
+         )
+ 
+     def public_pem(self):
+         return self.public_key.public_bytes(
+             encoding=serialization.Encoding.PEM,
+-            format=serialization.PublicFormat.SubjectPublicKeyInfo
++            format=serialization.PublicFormat.SubjectPublicKeyInfo,
+         )
+ 
+     def save_key(self, key_file):
+@@ -245,14 +244,14 @@ def verify_token(self, validation_token, verification_token):
+         :rtype: boolean
+ 
+         """
+-        hsig = b64urldecode(verification_token.encode('utf8'))
++        hsig = b64urldecode(verification_token.encode("utf8"))
+         r = int(binascii.hexlify(hsig[:32]), 16)
+         s = int(binascii.hexlify(hsig[32:]), 16)
+         try:
+             self.public_key.verify(
+                 ecutils.encode_dss_signature(r, s),
+                 validation_token,
+-                signature_algorithm=ec.ECDSA(hashes.SHA256())
++                signature_algorithm=ec.ECDSA(hashes.SHA256()),
+             )
+             return True
+         except InvalidSignature:
+@@ -260,23 +259,25 @@ def verify_token(self, validation_token, verification_token):
+ 
+     def _base_sign(self, claims):
+         cclaims = copy.deepcopy(claims)
+-        if not cclaims.get('exp'):
+-            cclaims['exp'] = int(time.time()) + 86400
+-        if not self.conf.get('no-strict', False):
+-            valid = _check_sub(cclaims.get('sub', ''))
++        if not cclaims.get("exp"):
++            cclaims["exp"] = int(time.time()) + 86400
++        if not self.conf.get("no-strict", False):
++            valid = _check_sub(cclaims.get("sub", ""))
+         else:
+-            valid = cclaims.get('sub') is not None
++            valid = cclaims.get("sub") is not None
+         if not valid:
+             raise VapidException(
+                 "Missing 'sub' from claims. "
+-                "'sub' is your admin email as a mailto: link.")
+-        if not re.match(r"^https?://[^/:]+(:\d+)?$",
+-                        cclaims.get("aud", ""),
+-                        re.IGNORECASE):
++                "'sub' is your admin email as a mailto: link."
++            )
++        if not re.match(
++            r"^https?://[^/:]+(:\d+)?$", cclaims.get("aud", ""), re.IGNORECASE
++        ):
+             raise VapidException(
+                 "Missing 'aud' from claims. "
+                 "'aud' is the scheme, host and optional port for this "
+-                "transaction e.g. https://example.com:8080")
++                "transaction e.g. https://example.com:8080"
++            )
+         return cclaims
+ 
+     def sign(self, claims, crypto_key=None):
+@@ -292,19 +293,22 @@ def sign(self, claims, crypto_key=None):
+ 
+         """
+         sig = sign(self._base_sign(claims), self.private_key)
+-        pkey = 'p256ecdsa='
++        pkey = "p256ecdsa="
+         pkey += b64urlencode(
+             self.public_key.public_bytes(
+                 serialization.Encoding.X962,
+-                serialization.PublicFormat.UncompressedPoint
+-            ))
++                serialization.PublicFormat.UncompressedPoint,
++            )
++        )
+         if crypto_key:
+-            crypto_key = crypto_key + ';' + pkey
++            crypto_key = crypto_key + ";" + pkey
+         else:
+             crypto_key = pkey
+ 
+-        return {"Authorization": "{} {}".format(self._schema, sig.strip('=')),
+-                "Crypto-Key": crypto_key}
++        return {
++            "Authorization": "{} {}".format(self._schema, sig.strip("=")),
++            "Crypto-Key": crypto_key,
++        }
+ 
+ 
+ class Vapid02(Vapid01):
+@@ -313,6 +317,7 @@ class Vapid02(Vapid01):
+     https://tools.ietf.org/html/rfc8292
+ 
+     """
++
+     _schema = "vapid"
+ 
+     def sign(self, claims, crypto_key=None):
+@@ -329,14 +334,11 @@ def sign(self, claims, crypto_key=None):
+         """
+         sig = sign(self._base_sign(claims), self.private_key)
+         pkey = self.public_key.public_bytes(
+-                serialization.Encoding.X962,
+-                serialization.PublicFormat.UncompressedPoint
+-            )
+-        return{
++            serialization.Encoding.X962, serialization.PublicFormat.UncompressedPoint
++        )
++        return {
+             "Authorization": "{schema} t={t},k={k}".format(
+-                schema=self._schema,
+-                t=sig,
+-                k=b64urlencode(pkey)
++                schema=self._schema, t=sig, k=b64urlencode(pkey)
+             )
+         }
+ 
+@@ -349,27 +351,23 @@ def verify(cls, auth):
+         :rtype: bool
+ 
+         """
+-        pref_tok = auth.rsplit(' ', 1)
+-        assert pref_tok[0].lower() == cls._schema, (
+-                "Incorrect schema specified")
++        pref_tok = auth.rsplit(" ", 1)
++        assert pref_tok[0].lower() == cls._schema, "Incorrect schema specified"
+         parts = {}
+-        for tok in pref_tok[1].split(','):
+-            kv = tok.split('=', 1)
++        for tok in pref_tok[1].split(","):
++            kv = tok.split("=", 1)
+             parts[kv[0]] = kv[1]
+-        assert 'k' in parts.keys(), (
+-                "Auth missing public key 'k' value")
+-        assert 't' in parts.keys(), (
+-                "Auth missing token set 't' value")
+-        kp = cls().from_raw_public(parts['k'].encode())
+-        tokens = parts['t'].rsplit('.', 1)
++        assert "k" in parts.keys(), "Auth missing public key 'k' value"
++        assert "t" in parts.keys(), "Auth missing token set 't' value"
++        kp = cls().from_raw_public(parts["k"].encode())
++        tokens = parts["t"].rsplit(".", 1)
+         return kp.verify_token(
+-            validation_token=tokens[0].encode(),
+-            verification_token=tokens[1]
++            validation_token=tokens[0].encode(), verification_token=tokens[1]
+         )
+ 
+ 
+ def _check_sub(sub):
+-    """ Check to see if the `sub` is a properly formatted `mailto:`
++    """Check to see if the `sub` is a properly formatted `mailto:`
+ 
+     a `mailto:` should be a SMTP mail address. Mind you, since I run
+     YouFailAtEmail.com, you have every right to yell about how terrible
+@@ -382,9 +380,7 @@ def _check_sub(sub):
+     :rtype: bool
+ 
+     """
+-    pattern = (
+-        r"^(mailto:.+@((localhost|[%\w-]+(\.[%\w-]+)+|([0-9a-f]{1,4}):+([0-9a-f]{1,4})?)))|https:\/\/(localhost|[\w-]+\.[\w\.-]+|([0-9a-f]{1,4}:+)+([0-9a-f]{1,4})?)$" # noqa
+-        )
++    pattern = r"^(mailto:.+@((localhost|[%\w-]+(\.[%\w-]+)+|([0-9a-f]{1,4}):+([0-9a-f]{1,4})?)))|https:\/\/(localhost|[\w-]+\.[\w\.-]+|([0-9a-f]{1,4}:+)+([0-9a-f]{1,4})?)$"  # noqa
+     return re.match(pattern, sub, re.IGNORECASE) is not None
diff --git a/pkgs/development/python-modules/py-vapid/default.nix b/pkgs/development/python-modules/py-vapid/default.nix
index 494afb7008d3..83042bf54525 100644
--- a/pkgs/development/python-modules/py-vapid/default.nix
+++ b/pkgs/development/python-modules/py-vapid/default.nix
@@ -22,6 +22,12 @@ buildPythonPackage rec {
     hash = "sha256-PIlzts+DhK0MmuZNYnDMxIDguSxwLY9eoswD5rUSR/k=";
   };
 
+  patches = [
+    # Fix tests with latest cryptography
+    # Upstream PR: https://github.com/web-push-libs/vapid/pull/110
+    ./cryptography.patch
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [ cryptography ];

From 84b586af72066183d3be71aa04043e8ac7acda3d Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 8 Oct 2025 13:57:32 +0300
Subject: [PATCH 0508/6226] python313Packages.parsel: skip test broken by error
 message format change

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

diff --git a/pkgs/development/python-modules/parsel/default.nix b/pkgs/development/python-modules/parsel/default.nix
index 750b61b13d48..e78c495f90c5 100644
--- a/pkgs/development/python-modules/parsel/default.nix
+++ b/pkgs/development/python-modules/parsel/default.nix
@@ -42,6 +42,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "parsel" ];
 
+  disabledTests = [
+    # asserts on the exact output format of an error message
+    "test_set_xpathfunc"
+  ];
+
   meta = with lib; {
     description = "Python library to extract data from HTML and XML using XPath and CSS selectors";
     homepage = "https://github.com/scrapy/parsel";

From f49ca9070b8cf209d6b1c6f35b0c31a5e5ad7672 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 8 Oct 2025 14:17:04 +0300
Subject: [PATCH 0509/6226] python313Packages.uvloop: skip test broken by error
 message wording change

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

diff --git a/pkgs/development/python-modules/uvloop/default.nix b/pkgs/development/python-modules/uvloop/default.nix
index bde90d49d258..9c4be78c1c72 100644
--- a/pkgs/development/python-modules/uvloop/default.nix
+++ b/pkgs/development/python-modules/uvloop/default.nix
@@ -80,6 +80,8 @@ buildPythonPackage rec {
     "tests/test_base.py::TestBaseUV.test_call_at"
     # Pointless and flaky (at least on darwin, depending on the sandbox perhaps)
     "tests/test_dns.py"
+    # Asserts on exact wording of error message
+    "tests/test_tcp.py::Test_AIO_TCP::test_create_connection_open_con_addr"
   ]
   ++ lib.optionals (pythonOlder "3.11") [
     "tests/test_tcp.py::Test_UV_TCPSSL::test_create_connection_ssl_failed_certificat"

From ffb621e0f18b8c3b5951d1a4d6c215833780223c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Oct 2025 12:59:13 +0000
Subject: [PATCH 0510/6226] satty: 0.19.0 -> 0.20.0

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

diff --git a/pkgs/by-name/sa/satty/package.nix b/pkgs/by-name/sa/satty/package.nix
index a3c4d3c7bfb9..3ca9de3f53b6 100644
--- a/pkgs/by-name/sa/satty/package.nix
+++ b/pkgs/by-name/sa/satty/package.nix
@@ -17,16 +17,16 @@
 rustPlatform.buildRustPackage rec {
 
   pname = "satty";
-  version = "0.19.0";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "gabm";
     repo = "Satty";
     rev = "v${version}";
-    hash = "sha256-AKzTDBKqZuZfEgPJqv8I5IuCeDkD2+fBY44aAPFaYvI=";
+    hash = "sha256-4RVah6yo4cJyE6qUbDJbcmFpi7xsKNpHJFrzSs1yJcg=";
   };
 
-  cargoHash = "sha256-hvJOjWD5TRXlDr5KfpFlzAi44Xd6VuaFexXziXgDLCk=";
+  cargoHash = "sha256-RPj6ZVtDWPMt4jrmU750b7zLVHwqk+SWr2OskDAQFYI=";
 
   nativeBuildInputs = [
     copyDesktopItems

From 2d6ad405b0a354e6c255261c03d614933f0eb67d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Oct 2025 13:46:56 +0000
Subject: [PATCH 0511/6226] filebeat8: 8.19.4 -> 8.19.5

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

diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix
index 000e13f985f3..7049466c32a5 100644
--- a/pkgs/by-name/fi/filebeat8/package.nix
+++ b/pkgs/by-name/fi/filebeat8/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule rec {
   pname = "filebeat";
-  version = "8.19.4";
+  version = "8.19.5";
 
   src = fetchFromGitHub {
     owner = "elastic";
     repo = "beats";
     tag = "v${version}";
-    hash = "sha256-qY6itgYoAL93HoVDvADayjfRtsZcxTQbOVJZsFeU1Zk=";
+    hash = "sha256-0s0ZGVEPl8NsNj6uWDXsTn0COwexmNNTPt85dk2Xi80=";
   };
 
   proxyVendor = true; # darwin/linux hash mismatch
 
-  vendorHash = "sha256-kDlYPnAXohmPHbeRlhrjcDwDkd0AB5VYKhpe99o/XIA=";
+  vendorHash = "sha256-dr7jtXx5+51JOvLgasNWdjwaPaOMKBWSHiGYZBOAuMs=";
 
   subPackages = [ "filebeat" ];
 

From 52e4b103d122382153513284ae3656aa52cef058 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Oct 2025 14:45:50 +0000
Subject: [PATCH 0512/6226] chart-testing: 3.13.0 -> 3.14.0

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

diff --git a/pkgs/by-name/ch/chart-testing/package.nix b/pkgs/by-name/ch/chart-testing/package.nix
index 976e0c9c48fa..de3c2d68332a 100644
--- a/pkgs/by-name/ch/chart-testing/package.nix
+++ b/pkgs/by-name/ch/chart-testing/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule rec {
   pname = "chart-testing";
-  version = "3.13.0";
+  version = "3.14.0";
 
   src = fetchFromGitHub {
     owner = "helm";
     repo = "chart-testing";
     rev = "v${version}";
-    hash = "sha256-59a86yR/TDAWGCsj3pbDjXJGMvyHYnjsnxzjWr61PuU=";
+    hash = "sha256-wdUUo19bFf3ov+Rd+JV6CtbH9TWGC73lWRrNLOfNGR8=";
   };
 
-  vendorHash = "sha256-aVXISRthJxxvtrfC0DpewLHCiJPh4tO+SKl3Q9uP14k=";
+  vendorHash = "sha256-29rGyStJsnhJiO01DIFf/ROaYsXGg3YRJatdzC6A7JU=";
 
   postPatch = ''
     substituteInPlace pkg/config/config.go \

From b8d40f903b01289d585af2f34e5d838700486f12 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Oct 2025 15:59:54 +0000
Subject: [PATCH 0513/6226] nncp: 8.12.1 -> 8.13.0

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

diff --git a/pkgs/by-name/nn/nncp/package.nix b/pkgs/by-name/nn/nncp/package.nix
index 28a7609bc8da..4efa9bf5778f 100644
--- a/pkgs/by-name/nn/nncp/package.nix
+++ b/pkgs/by-name/nn/nncp/package.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nncp";
-  version = "8.12.1";
+  version = "8.13.0";
   outputs = [
     "out"
     "doc"
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "http://www.nncpgo.org/download/nncp-${finalAttrs.version}.tar.xz";
-    hash = "sha256-yTwndQ43aBCned7iKPZm70zCC3zMapf2GXtornjiZos=";
+    hash = "sha256-jONoDpgAUZjYl14DF2CzqbM75tLWGETHmfd4yiM9BfQ=";
   };
 
   nativeBuildInputs = [

From 1d584e3a90dc2154eba1edbd57e1dfc754e31697 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 8 Oct 2025 19:24:33 +0300
Subject: [PATCH 0514/6226] xwaylandvideobridge: drop

Unmaintained upstream, buggy, not really necessary anymore.
---
 .../services/desktop-managers/plasma6.nix     |  1 -
 .../wayland/xwaylandvideobridge/default.nix   | 62 -------------------
 pkgs/top-level/qt6-packages.nix               |  2 -
 3 files changed, 65 deletions(-)
 delete mode 100644 pkgs/tools/wayland/xwaylandvideobridge/default.nix

diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix
index 529734bd503f..26507d2887f7 100644
--- a/nixos/modules/services/desktop-managers/plasma6.nix
+++ b/nixos/modules/services/desktop-managers/plasma6.nix
@@ -166,7 +166,6 @@ in
           spectacle
           ffmpegthumbs
           krdp
-          xwaylandvideobridge # exposes Wayland windows to X11 screen capture
         ]
         ++ lib.optionals config.hardware.sensor.iio.enable [
           # This is required for autorotation in Plasma 6
diff --git a/pkgs/tools/wayland/xwaylandvideobridge/default.nix b/pkgs/tools/wayland/xwaylandvideobridge/default.nix
deleted file mode 100644
index fcc46987c74a..000000000000
--- a/pkgs/tools/wayland/xwaylandvideobridge/default.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  cmake,
-  extra-cmake-modules,
-  pkg-config,
-  qtbase,
-  qtdeclarative,
-  qtx11extras ? null, # qt5 only
-  kcoreaddons,
-  ki18n,
-  knotifications,
-  kpipewire,
-  kstatusnotifieritem ? null, # qt6 only
-  kwindowsystem,
-  wrapQtAppsHook,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "xwaylandvideobridge";
-  version = "0.4.0";
-
-  src = fetchurl {
-    url = "mirror://kde/stable/xwaylandvideobridge/xwaylandvideobridge-${finalAttrs.version}.tar.xz";
-    hash = "sha256-6nKseypnV46ZlNywYZYC6tMJekb7kzZmHaIA5jkn6+Y=";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    extra-cmake-modules
-    pkg-config
-    wrapQtAppsHook
-  ];
-
-  buildInputs = [
-    qtbase
-    qtdeclarative
-    qtx11extras
-    kcoreaddons
-    ki18n
-    knotifications
-    kpipewire
-    kstatusnotifieritem
-    kwindowsystem
-  ];
-
-  cmakeFlags = [ "-DQT_MAJOR_VERSION=${lib.versions.major qtbase.version}" ];
-
-  meta = {
-    description = "Utility to allow streaming Wayland windows to X applications";
-    homepage = "https://invent.kde.org/system/xwaylandvideobridge";
-    license = with lib.licenses; [
-      bsd3
-      cc0
-      gpl2Plus
-    ];
-    maintainers = with lib.maintainers; [ stepbrobd ];
-    platforms = lib.platforms.linux;
-    mainProgram = "xwaylandvideobridge";
-  };
-})
diff --git a/pkgs/top-level/qt6-packages.nix b/pkgs/top-level/qt6-packages.nix
index 6aae3abf5efd..1f47e74579e3 100644
--- a/pkgs/top-level/qt6-packages.nix
+++ b/pkgs/top-level/qt6-packages.nix
@@ -151,8 +151,6 @@ makeScopeWithSplicing' {
       waylib = callPackage ../development/libraries/waylib { };
 
       wayqt = callPackage ../development/libraries/wayqt { };
-
-      xwaylandvideobridge = kdePackages.callPackage ../tools/wayland/xwaylandvideobridge { };
     }
   );
 }

From ec56981b571018123ead90160a47d9595f529895 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 8 Oct 2025 19:57:30 +0300
Subject: [PATCH 0515/6226] kdePackages: clean up outdated qtwaylandscanner
 references

---
 pkgs/kde/gear/kdeconnect-kde/default.nix  | 5 ++---
 pkgs/kde/gear/krfb/default.nix            | 5 ++---
 pkgs/kde/plasma/plasma-dialer/default.nix | 5 ++---
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/kde/gear/kdeconnect-kde/default.nix b/pkgs/kde/gear/kdeconnect-kde/default.nix
index d81c487e452f..a9c95f7b6fb5 100644
--- a/pkgs/kde/gear/kdeconnect-kde/default.nix
+++ b/pkgs/kde/gear/kdeconnect-kde/default.nix
@@ -3,9 +3,9 @@
   mkKdeDerivation,
   replaceVars,
   sshfs,
+  qtbase,
   qtconnectivity,
   qtmultimedia,
-  qtwayland,
   pkg-config,
   wayland,
   wayland-protocols,
@@ -30,13 +30,12 @@ mkKdeDerivation {
   extraBuildInputs = [
     qtconnectivity
     qtmultimedia
-    qtwayland
     wayland
     wayland-protocols
     libfakekey
   ];
 
   extraCmakeFlags = [
-    "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner"
+    "-DQtWaylandScanner_EXECUTABLE=${qtbase}/libexec/qtwaylandscanner"
   ];
 }
diff --git a/pkgs/kde/gear/krfb/default.nix b/pkgs/kde/gear/krfb/default.nix
index 808067fb0000..d2be34808082 100644
--- a/pkgs/kde/gear/krfb/default.nix
+++ b/pkgs/kde/gear/krfb/default.nix
@@ -1,7 +1,7 @@
 {
   mkKdeDerivation,
   pkg-config,
-  qtwayland,
+  qtbase,
   libvncserver,
   pipewire,
   xorg,
@@ -10,12 +10,11 @@ mkKdeDerivation {
   pname = "krfb";
 
   extraCmakeFlags = [
-    "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner"
+    "-DQtWaylandScanner_EXECUTABLE=${qtbase}/libexec/qtwaylandscanner"
   ];
 
   extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
-    qtwayland
     libvncserver
     pipewire
     xorg.libXdamage
diff --git a/pkgs/kde/plasma/plasma-dialer/default.nix b/pkgs/kde/plasma/plasma-dialer/default.nix
index ca5a7cc22182..8a595c98a8f8 100644
--- a/pkgs/kde/plasma/plasma-dialer/default.nix
+++ b/pkgs/kde/plasma/plasma-dialer/default.nix
@@ -1,7 +1,7 @@
 {
   mkKdeDerivation,
   pkg-config,
-  qtwayland,
+  qtbase,
   callaudiod,
   libphonenumber,
   protobuf,
@@ -11,13 +11,12 @@ mkKdeDerivation {
 
   extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
-    qtwayland
     callaudiod
     libphonenumber
     protobuf
   ];
 
   extraCmakeFlags = [
-    "-DQtWaylandScanner_EXECUTABLE=${qtwayland}/libexec/qtwaylandscanner"
+    "-DQtWaylandScanner_EXECUTABLE=${qtbase}/libexec/qtwaylandscanner"
   ];
 }

From b158d3e44400fbc01cbb33dbc8014bb780c10779 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 8 Oct 2025 21:08:46 +0300
Subject: [PATCH 0516/6226] python313Packages.mozilla-django-oidc: fix tests
 with latest cryptography

---
 .../mozilla-django-oidc/cryptography.patch          | 13 +++++++++++++
 .../python-modules/mozilla-django-oidc/default.nix  |  6 ++++++
 2 files changed, 19 insertions(+)
 create mode 100644 pkgs/development/python-modules/mozilla-django-oidc/cryptography.patch

diff --git a/pkgs/development/python-modules/mozilla-django-oidc/cryptography.patch b/pkgs/development/python-modules/mozilla-django-oidc/cryptography.patch
new file mode 100644
index 000000000000..a8f5de24f104
--- /dev/null
+++ b/pkgs/development/python-modules/mozilla-django-oidc/cryptography.patch
@@ -0,0 +1,13 @@
+diff --git a/tests/test_auth.py b/tests/test_auth.py
+index 345de64..a78dab4 100644
+--- a/tests/test_auth.py
++++ b/tests/test_auth.py
+@@ -1219,7 +1219,7 @@ def test_es256_alg_verification(self, mock_requests):
+         self.backend = OIDCAuthenticationBackend()
+ 
+         # Generate a private key to create a test token with
+-        private_key = ec.generate_private_key(ec.SECP256R1, default_backend())
++        private_key = ec.generate_private_key(ec.SECP256R1(), default_backend())
+ 
+         # Make the public key available through the JWKS response
+         public_numbers = private_key.public_key().public_numbers()
diff --git a/pkgs/development/python-modules/mozilla-django-oidc/default.nix b/pkgs/development/python-modules/mozilla-django-oidc/default.nix
index cd44808efc57..d3eb5ead33d9 100644
--- a/pkgs/development/python-modules/mozilla-django-oidc/default.nix
+++ b/pkgs/development/python-modules/mozilla-django-oidc/default.nix
@@ -22,6 +22,12 @@ buildPythonPackage rec {
     hash = "sha256-72F1aLLIId+YClTrpOz3bL8LSq6ZhZjjtv8V/GJGkqs=";
   };
 
+  # Fix test with latest cryptography
+  # Upstream PR: https://github.com/mozilla/mozilla-django-oidc/pull/556
+  patches = [
+    ./cryptography.patch
+  ];
+
   nativeBuildInputs = [
     setuptools
   ];

From b77ddfdb649c8488afbdd556107a665843f207f9 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 8 Oct 2025 21:55:38 +0300
Subject: [PATCH 0517/6226] python313Packages.mozilla-django-oidc: fix patch

---
 .../mozilla-django-oidc/cryptography.patch             | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/mozilla-django-oidc/cryptography.patch b/pkgs/development/python-modules/mozilla-django-oidc/cryptography.patch
index a8f5de24f104..2217168cc026 100644
--- a/pkgs/development/python-modules/mozilla-django-oidc/cryptography.patch
+++ b/pkgs/development/python-modules/mozilla-django-oidc/cryptography.patch
@@ -1,13 +1,11 @@
-diff --git a/tests/test_auth.py b/tests/test_auth.py
-index 345de64..a78dab4 100644
 --- a/tests/test_auth.py
 +++ b/tests/test_auth.py
-@@ -1219,7 +1219,7 @@ def test_es256_alg_verification(self, mock_requests):
+@@ -1234,7 +1234,7 @@ class OIDCAuthenticationBackendES256WithJwksEndpointTestCase(TestCase):
          self.backend = OIDCAuthenticationBackend()
  
          # Generate a private key to create a test token with
 -        private_key = ec.generate_private_key(ec.SECP256R1, default_backend())
 +        private_key = ec.generate_private_key(ec.SECP256R1(), default_backend())
- 
-         # Make the public key available through the JWKS response
-         public_numbers = private_key.public_key().public_numbers()
+         private_key_pem = private_key.private_bytes(
+             serialization.Encoding.PEM,
+             serialization.PrivateFormat.PKCS8,

From 73f3c6395273a5966c8a09834fb12869b193a7d0 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 8 Oct 2025 22:14:17 +0300
Subject: [PATCH 0518/6226] python313Packages.pip-tools: 7.5.1 -> 7.4.1

This reverts commit cb8b359b5fadbb54dd9186001c3e9c4f32b49ff7.

7.5.x breaks home-assistant-chip-wheels.
Revert to 7.4.1 and add patches to fix Click compatibility instead.
---
 .../python-modules/pip-tools/default.nix      | 55 +++++++++++++++----
 1 file changed, 43 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/pip-tools/default.nix b/pkgs/development/python-modules/pip-tools/default.nix
index f73dbc454550..594d00194db2 100644
--- a/pkgs/development/python-modules/pip-tools/default.nix
+++ b/pkgs/development/python-modules/pip-tools/default.nix
@@ -4,7 +4,8 @@
   buildPythonPackage,
   build,
   click,
-  fetchFromGitHub,
+  fetchPypi,
+  fetchpatch,
   pep517,
   pip,
   pytest-xdist,
@@ -19,19 +20,32 @@
 
 buildPythonPackage rec {
   pname = "pip-tools";
-  version = "7.5.1";
+  version = "7.4.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
-  src = fetchFromGitHub {
-    owner = "jazzband";
-    repo = "pip-tools";
-    tag = "v${version}";
-    hash = "sha256-o2qpaiy+oL3QzfVaGaaRa+2drCjzc6YwNsJlK8NBICY=";
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-hkgm9Qc4ZEUOJNvuuFzjkgzfsJhIo9aev1N7Uh8UvMk=";
   };
 
-  patches = [ ./fix-setup-py-bad-syntax-detection.patch ];
+  patches = [
+    ./fix-setup-py-bad-syntax-detection.patch
+
+    # Backport click 8.2 + 8.3 compatibility from 7.5.1
+    # We can't update to 7.5.1 because of https://github.com/jazzband/pip-tools/issues/2231,
+    # which breaks home-assisstant-chip-wheels.
+    (fetchpatch {
+      url = "https://github.com/jazzband/pip-tools/commit/c7f128e7c533033c2436b52c972eee521fe3890c.diff";
+      excludes = [ "pyproject.toml" ];
+      hash = "sha256-cIFAE/VKyyDWVQktPtPPuxY85DtTvH6pK539WD2cDn4=";
+    })
+    (fetchpatch {
+      url = "https://github.com/jazzband/pip-tools/commit/816ee196c543be53ddba0ea33fb4c7e84217b3b3.diff";
+      hash = "sha256-3GTUNWoy/AmpWv7NUCWIZ+coxb1vUgg6CZhwh6FehZo=";
+    })
+  ];
 
   build-system = [ setuptools-scm ];
 
@@ -61,12 +75,29 @@ buildPythonPackage rec {
   disabledTests = [
     # Tests require network access
     "network"
-    "test_bad_setup_file"
-    "test_compile_build_targets_setuptools_no_wheel_dep"
-    "test_compile_recursive_extras_build_targets"
     "test_direct_reference_with_extras"
-    "test_error_in_pyproject_toml"
     "test_local_duplicate_subdependency_combined"
+    "test_bad_setup_file"
+    # Assertion error
+    "test_compile_recursive_extras"
+    "test_combine_different_extras_of_the_same_package"
+    "test_diff_should_not_uninstall"
+    "test_cli_compile_all_extras_with_multiple_packages"
+    # Deprecations
+    "test_error_in_pyproject_toml"
+
+    # pip 25.0 compat issues
+    # https://github.com/jazzband/pip-tools/issues/2112
+    # requirement doesn't end with semicolon
+    "test_resolver"
+    "test_resolver__custom_unsafe_deps"
+    # constraints.txt is now in a tmpdir
+    "test_preserve_via_requirements_constrained_dependencies_when_run_twice"
+    "test_annotate_option"
+    # TypeError("'<' not supported between instances of 'InstallationCandidate' and 'InstallationCandidate'")>.exit_code
+    "test_no_candidates"
+    "test_no_candidates_pre"
+    "test_failure_of_legacy_resolver_prompts_for_backtracking"
   ];
 
   pythonImportsCheck = [ "piptools" ];

From d5ea371e34d90627edabcbf76feac7e44cd4f745 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Wed, 8 Oct 2025 13:24:32 +0800
Subject: [PATCH 0519/6226] navicat-premium: 17.3.1 -> 17.3.3

---
 pkgs/by-name/na/navicat-premium/package.nix | 145 ++++++++++++++++----
 1 file changed, 120 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/na/navicat-premium/package.nix b/pkgs/by-name/na/navicat-premium/package.nix
index cc42ed4057d7..22a419a60da1 100644
--- a/pkgs/by-name/na/navicat-premium/package.nix
+++ b/pkgs/by-name/na/navicat-premium/package.nix
@@ -3,35 +3,130 @@
   stdenv,
   fetchurl,
   appimageTools,
+  autoPatchelfHook,
+  qt6,
+  cjson,
+  curl,
+  e2fsprogs,
+  expat,
+  fontconfig,
+  freetype,
+  glib,
+  glibc,
+  harfbuzz,
+  libGL,
+  libX11,
+  libgpg-error,
+  libselinux,
+  libxcb,
+  libxcrypt,
+  libxcrypt-legacy,
+  libxkbcommon,
+  p11-kit,
+  pango,
 }:
-let
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "navicat-premium";
-  version = "17.3.1";
+  version = "17.3.3";
 
-  src =
-    {
-      x86_64-linux = fetchurl {
-        url = "https://web.archive.org/web/20250904095427/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage";
-        hash = "sha256-5vGctpbAg3mVhalr+Yg3iFZNCyY+0+a98sldhUcHkm0=";
-      };
-      aarch64-linux = fetchurl {
-        url = "https://web.archive.org/web/20250904095643/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage";
-        hash = "sha256-r31u/b/3HO9PEQtIr9AZ/5NVrRcgJ+GACHPWCICZYec=";
-      };
-    }
-    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-
-  appimageContents = appimageTools.extractType2 {
-    inherit pname version src;
+  src = appimageTools.extractType2 {
+    inherit (finalAttrs) pname version;
+    src =
+      {
+        x86_64-linux = fetchurl {
+          url = "https://web.archive.org/web/20251008050849/https://dn.navicat.com/download/navicat17-premium-en-x86_64.AppImage";
+          hash = "sha256-gXXj2FXOw2OHUTaX5XYtd0/nL/E/hNmcmvc0TDaOCUQ=";
+        };
+        aarch64-linux = fetchurl {
+          url = "https://web.archive.org/web/20251008051000/https://dn.navicat.com/download/navicat17-premium-en-aarch64.AppImage";
+          hash = "sha256-18JbUJV8jAXRiVVerfYZLsjy+5K2DjwqAY+Hqjtlnfg=";
+        };
+      }
+      .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };
-in
-appimageTools.wrapType2 {
-  inherit pname version src;
 
-  extraInstallCommands = ''
-    cp -r ${appimageContents}/usr/share $out/share
-    substituteInPlace $out/share/applications/navicat.desktop \
-      --replace-fail "Exec=navicat" "Exec=navicat-premium"
+  nativeBuildInputs = [
+    autoPatchelfHook
+    qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    cjson
+    curl
+    e2fsprogs
+    expat
+    fontconfig
+    freetype
+    glib
+    glibc
+    harfbuzz
+    libGL
+    libX11
+    libgpg-error
+    libselinux
+    libxcb
+    libxcrypt
+    libxcrypt-legacy
+    libxkbcommon
+    p11-kit
+    pango
+    qt6.qtbase
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    cp -r --no-preserve=mode usr $out
+    chmod +x $out/bin/navicat
+    mkdir -p $out/usr
+    ln -s $out/lib $out/usr/lib
+
+    runHook postInstall
+  '';
+
+  autoPatchelfIgnoreMissingDeps = lib.optionals stdenv.hostPlatform.isAarch64 [
+    "libgs_ktool.so"
+    "libkmc.so"
+  ];
+
+  dontWrapQtApps = true;
+
+  preFixup = ''
+    rm $out/lib/libselinux.so.1
+    ln -s ${libselinux.out}/lib/libselinux.so.1 $out/lib/libselinux.so.1
+    rm $out/lib/glib/libglib-2.0.so.0
+    ln -s ${glib.out}/lib/libglib-2.0.so.0 $out/lib/glib/libglib-2.0.so.0
+    patchelf --replace-needed libcrypt.so.1 \
+      ${libxcrypt}/lib/libcrypt.so.2 $out/lib/pq-g/libpq.so.5.5
+    patchelf --replace-needed libcrypt.so.1 \
+      ${libxcrypt}/lib/libcrypt.so.2 $out/lib/pq-g/libpq_ce.so.5.5
+    patchelf --replace-needed libselinux.so.1 \
+      ${libselinux.out}/lib/libselinux.so.1 $out/lib/pq-g/libpq.so.5.5
+    wrapQtApp $out/bin/navicat \
+      --prefix LD_LIBRARY_PATH : ${
+        lib.makeLibraryPath [
+          e2fsprogs
+          expat
+          fontconfig
+          freetype
+          glib
+          glibc
+          harfbuzz
+          libGL
+          libX11
+          libgpg-error
+          libselinux
+          libxcb
+          libxkbcommon
+          p11-kit
+          pango
+        ]
+      }:$out/lib \
+      --set QT_PLUGIN_PATH $out/plugins \
+      --set QT_QPA_PLATFORM xcb \
+      --set QT_STYLE_OVERRIDE Fusion \
+      --chdir $out
   '';
 
   meta = {
@@ -47,4 +142,4 @@ appimageTools.wrapType2 {
     ];
     mainProgram = "navicat-premium";
   };
-}
+})

From bb932da42b4a87a706f0c56a3e2448a67c8f0aef Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 9 Oct 2025 01:22:53 +0200
Subject: [PATCH 0520/6226] python3Packages.unicode-rbnf: 2.3.0 -> 2.4.0

https://github.com/rhasspy/unicode-rbnf/blob/v2.4.0/CHANGELOG.md
---
 pkgs/development/python-modules/unicode-rbnf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/unicode-rbnf/default.nix b/pkgs/development/python-modules/unicode-rbnf/default.nix
index 5aa7c84604de..ed03f3a89ace 100644
--- a/pkgs/development/python-modules/unicode-rbnf/default.nix
+++ b/pkgs/development/python-modules/unicode-rbnf/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "unicode-rbnf";
-  version = "2.3.0";
+  version = "2.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rhasspy";
     repo = "unicode-rbnf";
     tag = "v${version}";
-    hash = "sha256-RRPQHU8UMVspbhqKVR165czbYY42JopF6Nrhm0up3hw=";
+    hash = "sha256-t5QHZVBIRVyhqmgVno3Nql6W0Q91DZ8sJA+nFBdKkj4=";
   };
 
   build-system = [ setuptools ];

From f4cbd1fbc9f61d4e86e02cd2b0b646f4b8a50270 Mon Sep 17 00:00:00 2001
From: Louis Orleans <louis@orleans.io>
Date: Tue, 7 Oct 2025 15:26:28 -0700
Subject: [PATCH 0521/6226] maintainers: add dudeofawesome

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e0eb9d8ca1ee..2509427e5518 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7020,6 +7020,13 @@
     name = "Will Dietz";
     keys = [ { fingerprint = "389A 78CB CD88 5E0C 4701  DEB9 FD42 C7D0 D414 94C8"; } ];
   };
+  dudeofawesome = {
+    email = "tourist-04.iced@icloud.com";
+    github = "dudeofawesome";
+    githubId = 1683595;
+    name = "Louis Orleans";
+    keys = [ { fingerprint = "llSOkL8Tn5+LOmWa4PDci+dQXZIRy11NSumDiFzNkAM"; } ];
+  };
   dudymas = {
     email = "jeremy.white@cloudposse.com";
     github = "dudymas";

From d3bf47068738d13ebc3b39b5380a2c2daecbdf45 Mon Sep 17 00:00:00 2001
From: Louis Orleans <louis@orleans.io>
Date: Tue, 7 Oct 2025 15:27:37 -0700
Subject: [PATCH 0522/6226] git-fork: init at 2.57.1

---
 pkgs/by-name/gi/git-fork/package.nix | 42 ++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/gi/git-fork/package.nix

diff --git a/pkgs/by-name/gi/git-fork/package.nix b/pkgs/by-name/gi/git-fork/package.nix
new file mode 100644
index 000000000000..c52162dc663e
--- /dev/null
+++ b/pkgs/by-name/gi/git-fork/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  undmg,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "git-fork";
+  version = "2.57.1";
+  src = fetchurl {
+    url = "https://cdn.fork.dev/mac/Fork-${finalAttrs.version}.dmg";
+    hash = "sha256-hIrR655lCKBDkZS6cF7BD+WMvX13T9180rpAfUYc8YA=";
+  };
+
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ undmg ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/"{bin,Applications}
+    mv Fork.app "$out/Applications/"
+    ln -s "$out/Applications/Fork.app/Contents/MacOS/Fork" "$out/bin/fork"
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Git client";
+    homepage = "https://git-fork.com";
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ dudeofawesome ];
+    platforms = lib.platforms.darwin;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    mainProgram = "fork";
+  };
+})

From 1326e84023fcca2aa696acab4675790bd73a61d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Oct 2025 23:50:55 +0000
Subject: [PATCH 0523/6226] eccodes: 2.42.0 -> 2.44.0

---
 pkgs/development/libraries/eccodes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix
index 2d24a8d749e2..32f26c8c639d 100644
--- a/pkgs/development/libraries/eccodes/default.nix
+++ b/pkgs/development/libraries/eccodes/default.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation rec {
   pname = "eccodes";
-  version = "2.42.0";
+  version = "2.44.0";
 
   src = fetchurl {
     url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz";
-    hash = "sha256-YDcbNXywEd7lRtsuq6zlt+J/D4fT6kpa3eeJE3GzwSg=";
+    hash = "sha256-x1+x+Rt2W2uLR3RjKopvvOyWk02wFftjwq0lYK7dRDs=";
   };
 
   postPatch = ''

From 2834cb85802f5e6cc33eb95150cd3ea90793517a Mon Sep 17 00:00:00 2001
From: dramforever <dramforever@live.com>
Date: Thu, 9 Oct 2025 06:08:12 +0800
Subject: [PATCH 0524/6226] onetbb: Fix tests on !isx86 by setting
 HWLOC_SYNTHETIC

Getting core info fails on non-x86 because there's no /sys in the build
sandbox, which causes a few tests to fail.  Provide fake topology data
to satisfy those tests.
---
 pkgs/by-name/on/onetbb/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/on/onetbb/package.nix b/pkgs/by-name/on/onetbb/package.nix
index 29e59fdb0512..ad181f1464ca 100644
--- a/pkgs/by-name/on/onetbb/package.nix
+++ b/pkgs/by-name/on/onetbb/package.nix
@@ -94,6 +94,11 @@ stdenv.mkDerivation (finalAttrs: {
     NIX_LDFLAGS = lib.optionalString (
       stdenv.cc.bintools.isLLVM && lib.versionAtLeast stdenv.cc.bintools.version "17"
     ) "--undefined-version";
+
+    # Some test fail because hwloc tries to read /sys on non-x86, which doesn't
+    # work in the build sandbox, so provide fake data to satisfy it
+    # See: https://www-lb.open-mpi.org/projects/hwloc/doc/v2.12.2/synthetic.html
+    HWLOC_SYNTHETIC = "node:1 core:1 pu:1";
   };
 
   meta = {

From 1e6b2f451858d4929898856b5345a742aefd879c Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 23 Sep 2025 08:27:04 +0000
Subject: [PATCH 0525/6226] flclash: 0.8.87 -> 0.8.88

---
 pkgs/by-name/fl/flclash/package.nix       |  10 +-
 pkgs/by-name/fl/flclash/pubspec.lock.json | 496 ++++++++++++----------
 2 files changed, 288 insertions(+), 218 deletions(-)

diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix
index 807b3dba5f57..32ba400d8a09 100644
--- a/pkgs/by-name/fl/flclash/package.nix
+++ b/pkgs/by-name/fl/flclash/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   fetchFromGitHub,
-  flutter332,
+  flutter335,
   keybinder3,
   libayatana-appindicator,
   buildGoModule,
@@ -12,14 +12,14 @@
 
 let
   pname = "flclash";
-  version = "0.8.87";
+  version = "0.8.88";
 
   src =
     (fetchFromGitHub {
       owner = "chen08209";
       repo = "FlClash";
       tag = "v${version}";
-      hash = "sha256-vGRq9Kc6XU6r3huIGAKoh5x46fFS8jmXgus9WgpvG3A=";
+      hash = "sha256-yhIaYIlAyc2+oHkMRA9ybBQ+14URBY2kUp9wqTgFrwI=";
       fetchSubmodules = true;
     }).overrideAttrs
       (_: {
@@ -41,7 +41,7 @@ let
 
     modRoot = "core";
 
-    vendorHash = "sha256-Uc+RvpW3vndPFnM7yhqrNTEexAPaolCk8YK8u/+55RQ=";
+    vendorHash = "sha256-ekNuZ3Uv6TDfyZ4hVvXA3Wft4fetaXzddKIpis4ER1g=";
 
     env.CGO_ENABLED = 0;
 
@@ -57,7 +57,7 @@ let
     meta = metaCommon;
   };
 in
-flutter332.buildFlutterApplication {
+flutter335.buildFlutterApplication {
   inherit pname version src;
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/fl/flclash/pubspec.lock.json b/pkgs/by-name/fl/flclash/pubspec.lock.json
index bb49e16c8c88..dfa865af4231 100644
--- a/pkgs/by-name/fl/flclash/pubspec.lock.json
+++ b/pkgs/by-name/fl/flclash/pubspec.lock.json
@@ -4,31 +4,41 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "dc27559385e905ad30838356c5f5d574014ba39872d732111cd07ac0beff4c57",
+        "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "80.0.0"
+      "version": "85.0.0"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "192d1c5b944e7e53b24b5586db760db934b177d4147c42fbca8c8c5f1eb8d11e",
+        "sha256": "f4ad0fea5f102201015c9aae9d93bc02f75dd9491529a8c21f88d17a8523d44c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.3.0"
+      "version": "7.6.0"
+    },
+    "analyzer_buffer": {
+      "dependency": "transitive",
+      "description": {
+        "name": "analyzer_buffer",
+        "sha256": "f7833bee67c03c37241c67f8741b17cc501b69d9758df7a5a4a13ed6c947be43",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.10"
     },
     "analyzer_plugin": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer_plugin",
-        "sha256": "1d460d14e3c2ae36dc2b32cef847c4479198cf87704f63c3c3c8150ee50c3916",
+        "sha256": "a5ab7590c27b779f3d4de67f31c4109dbe13dd7339f86461a6f2a8ab2594d8ce",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.0"
+      "version": "0.13.4"
     },
     "animations": {
       "dependency": "direct main",
@@ -44,11 +54,11 @@
       "dependency": "direct main",
       "description": {
         "name": "app_links",
-        "sha256": "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba",
+        "sha256": "5f88447519add627fe1cbcab4fd1da3d4fed15b9baf29f28b22535c95ecee3e8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.4.0"
+      "version": "6.4.1"
     },
     "app_links_linux": {
       "dependency": "transitive",
@@ -84,11 +94,11 @@
       "dependency": "direct main",
       "description": {
         "name": "archive",
-        "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
+        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.6.1"
+      "version": "4.0.7"
     },
     "args": {
       "dependency": "direct dev",
@@ -124,21 +134,21 @@
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0",
+        "sha256": "ce76b1d48875e3233fde17717c23d1f60a91cc631597e49a400c89b475395b1d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "3.1.0"
     },
     "build_config": {
       "dependency": "transitive",
       "description": {
         "name": "build_config",
-        "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33",
+        "sha256": "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.2.0"
     },
     "build_daemon": {
       "dependency": "transitive",
@@ -154,31 +164,31 @@
       "dependency": "transitive",
       "description": {
         "name": "build_resolvers",
-        "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0",
+        "sha256": "d1d57f7807debd7349b4726a19fd32ec8bc177c71ad0febf91a20f84cd2d4b46",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.4"
+      "version": "3.0.3"
     },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99",
+        "sha256": "b24597fceb695969d47025c958f3837f9f0122e237c6a22cb082a5ac66c3ca30",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.15"
+      "version": "2.7.1"
     },
     "build_runner_core": {
       "dependency": "transitive",
       "description": {
         "name": "build_runner_core",
-        "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021",
+        "sha256": "066dda7f73d8eb48ba630a55acb50c4a84a2e6b453b1cb4567f581729e794f7b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.0.0"
+      "version": "9.3.1"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -194,11 +204,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4",
+        "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.9.5"
+      "version": "8.12.0"
     },
     "characters": {
       "dependency": "transitive",
@@ -214,11 +224,11 @@
       "dependency": "transitive",
       "description": {
         "name": "checked_yaml",
-        "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
+        "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.3"
+      "version": "2.0.4"
     },
     "ci": {
       "dependency": "transitive",
@@ -230,6 +240,16 @@
       "source": "hosted",
       "version": "0.1.0"
     },
+    "cli_config": {
+      "dependency": "transitive",
+      "description": {
+        "name": "cli_config",
+        "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
     "cli_util": {
       "dependency": "transitive",
       "description": {
@@ -254,11 +274,11 @@
       "dependency": "transitive",
       "description": {
         "name": "code_builder",
-        "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e",
+        "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.10.1"
+      "version": "4.11.0"
     },
     "collection": {
       "dependency": "direct main",
@@ -274,11 +294,11 @@
       "dependency": "direct main",
       "description": {
         "name": "connectivity_plus",
-        "sha256": "051849e2bd7c7b3bc5844ea0d096609ddc3a859890ec3a9ac4a65a2620cc1f99",
+        "sha256": "b5e72753cf63becce2c61fd04dfe0f1c430cc5278b53a1342dc5ad839eab29ec",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.4"
+      "version": "6.1.5"
     },
     "connectivity_plus_platform_interface": {
       "dependency": "transitive",
@@ -300,6 +320,16 @@
       "source": "hosted",
       "version": "3.1.2"
     },
+    "coverage": {
+      "dependency": "transitive",
+      "description": {
+        "name": "coverage",
+        "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.15.0"
+    },
     "cross_file": {
       "dependency": "transitive",
       "description": {
@@ -321,54 +351,54 @@
       "version": "3.0.6"
     },
     "custom_lint": {
-      "dependency": "direct dev",
+      "dependency": "transitive",
       "description": {
         "name": "custom_lint",
-        "sha256": "021897cce2b6c783b2521543e362e7fe1a2eaab17bf80514d8de37f99942ed9e",
+        "sha256": "78085fbe842de7c5bef92de811ca81536968dbcbbcdac5c316711add2d15e796",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.3"
+      "version": "0.8.0"
     },
     "custom_lint_builder": {
       "dependency": "transitive",
       "description": {
         "name": "custom_lint_builder",
-        "sha256": "e4235b9d8cef59afe621eba086d245205c8a0a6c70cd470be7cb17494d6df32d",
+        "sha256": "cc5532d5733d4eccfccaaec6070a1926e9f21e613d93ad0927fad020b95c9e52",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.3"
+      "version": "0.8.0"
     },
     "custom_lint_core": {
       "dependency": "transitive",
       "description": {
         "name": "custom_lint_core",
-        "sha256": "6dcee8a017181941c51a110da7e267c1d104dc74bec8862eeb8c85b5c8759a9e",
+        "sha256": "cc4684d22ca05bf0a4a51127e19a8aea576b42079ed2bc9e956f11aaebe35dd1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.1"
+      "version": "0.8.0"
     },
     "custom_lint_visitor": {
       "dependency": "transitive",
       "description": {
         "name": "custom_lint_visitor",
-        "sha256": "36282d85714af494ee2d7da8c8913630aa6694da99f104fb2ed4afcf8fc857d8",
+        "sha256": "4a86a0d8415a91fbb8298d6ef03e9034dc8e323a599ddc4120a0e36c433983a2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0+7.3.0"
+      "version": "1.0.0+7.7.0"
     },
     "dart_style": {
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "5b236382b47ee411741447c1f1e111459c941ea1b3f2b540dde54c210a3662af",
+        "sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.0"
+      "version": "3.1.1"
     },
     "dbus": {
       "dependency": "transitive",
@@ -394,31 +424,31 @@
       "dependency": "direct main",
       "description": {
         "name": "device_info_plus",
-        "sha256": "0c6396126421b590089447154c5f98a5de423b70cfb15b1578fd018843ee6f53",
+        "sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.4.0"
+      "version": "11.5.0"
     },
     "device_info_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "device_info_plus_platform_interface",
-        "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2",
+        "sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.2"
+      "version": "7.0.3"
     },
     "dio": {
       "dependency": "direct main",
       "description": {
         "name": "dio",
-        "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9",
+        "sha256": "d90ee57923d1828ac14e492ca49440f65477f4bb1263575900be731a3dac66a9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.8.0+1"
+      "version": "5.9.0"
     },
     "dio_web_adapter": {
       "dependency": "transitive",
@@ -434,11 +464,11 @@
       "dependency": "direct main",
       "description": {
         "name": "dynamic_color",
-        "sha256": "eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d",
+        "sha256": "43a5a6679649a7731ab860334a5812f2067c2d9ce6452cf069c5e0c25336c17c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.7.0"
+      "version": "1.8.1"
     },
     "emoji_regex": {
       "dependency": "direct main",
@@ -480,16 +510,6 @@
       "source": "hosted",
       "version": "2.1.4"
     },
-    "ffigen": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "ffigen",
-        "sha256": "72d732c33557fc0ca9b46379d3deff2dadbdc539696dc0b270189e2989be20ef",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "18.1.0"
-    },
     "file": {
       "dependency": "transitive",
       "description": {
@@ -504,11 +524,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810",
+        "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.3.7"
+      "version": "10.3.3"
     },
     "file_selector_linux": {
       "dependency": "transitive",
@@ -524,11 +544,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_macos",
-        "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc",
+        "sha256": "19124ff4a3d8864fdc62072b6a2ef6c222d55a3404fe14893a3c02744907b60c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.4+2"
+      "version": "0.9.4+4"
     },
     "file_selector_platform_interface": {
       "dependency": "transitive",
@@ -566,16 +586,6 @@
       "source": "sdk",
       "version": "0.0.0"
     },
-    "flutter_acrylic": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_acrylic",
-        "sha256": "b3996dbde5abf5823cc9ead4cf2e5267c3181f15585fe47ce4dc4472e7ec827a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.4"
-    },
     "flutter_cache_manager": {
       "dependency": "direct main",
       "description": {
@@ -617,31 +627,31 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e",
+        "sha256": "b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.28"
+      "version": "2.0.30"
     },
     "flutter_riverpod": {
       "dependency": "direct main",
       "description": {
         "name": "flutter_riverpod",
-        "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1",
+        "sha256": "ca2480512a8e840291325249f4857e363ffa5d1b77b132e189c9313a9d9fb9e0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.1"
+      "version": "3.0.0"
     },
     "flutter_svg": {
       "dependency": "direct main",
       "description": {
         "name": "flutter_svg",
-        "sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1",
+        "sha256": "b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.2.1"
     },
     "flutter_test": {
       "dependency": "direct dev",
@@ -659,21 +669,21 @@
       "dependency": "direct dev",
       "description": {
         "name": "freezed",
-        "sha256": "59a584c24b3acdc5250bb856d0d3e9c0b798ed14a4af1ddb7dc1c7b41df91c9c",
+        "sha256": "13065f10e135263a4f5a4391b79a8efc5fb8106f8dd555a9e49b750b45393d77",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.8"
+      "version": "3.2.3"
     },
     "freezed_annotation": {
       "dependency": "direct main",
       "description": {
         "name": "freezed_annotation",
-        "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2",
+        "sha256": "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.4"
+      "version": "3.1.0"
     },
     "frontend_server_client": {
       "dependency": "transitive",
@@ -779,11 +789,11 @@
       "dependency": "transitive",
       "description": {
         "name": "http",
-        "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
+        "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.5.0"
     },
     "http_multi_server": {
       "dependency": "transitive",
@@ -809,81 +819,81 @@
       "dependency": "direct main",
       "description": {
         "name": "image_picker",
-        "sha256": "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a",
+        "sha256": "736eb56a911cf24d1859315ad09ddec0b66104bc41a7f8c5b96b4e2620cf5041",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.2.0"
     },
     "image_picker_android": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_android",
-        "sha256": "317a5d961cec5b34e777b9252393f2afbd23084aa6e60fcf601dcf6341b9ebeb",
+        "sha256": "8dfe08ea7fcf7467dbaf6889e72eebd5e0d6711caae201fdac780eb45232cd02",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+23"
+      "version": "0.8.13+3"
     },
     "image_picker_for_web": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_for_web",
-        "sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83",
+        "sha256": "40c2a6a0da15556dc0f8e38a3246064a971a9f512386c3339b89f76db87269b6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.6"
+      "version": "3.1.0"
     },
     "image_picker_ios": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_ios",
-        "sha256": "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100",
+        "sha256": "eb06fe30bab4c4497bad449b66448f50edcc695f1c59408e78aa3a8059eb8f0e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+2"
+      "version": "0.8.13"
     },
     "image_picker_linux": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_linux",
-        "sha256": "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9",
+        "sha256": "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+2"
+      "version": "0.2.2"
     },
     "image_picker_macos": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_macos",
-        "sha256": "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1",
+        "sha256": "d58cd9d67793d52beefd6585b12050af0a7663c0c2a6ece0fb110a35d6955e04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+2"
+      "version": "0.2.2"
     },
     "image_picker_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_platform_interface",
-        "sha256": "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0",
+        "sha256": "9f143b0dba3e459553209e20cc425c9801af48e6dfa4f01a0fcf927be3f41665",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.10.1"
+      "version": "2.11.0"
     },
     "image_picker_windows": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_windows",
-        "sha256": "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb",
+        "sha256": "d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.2"
     },
     "intl": {
       "dependency": "direct main",
@@ -949,11 +959,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "json_serializable",
-        "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c",
+        "sha256": "33a040668b31b320aafa4822b7b1e177e163fc3c1e835c6750319d4ab23aa6fe",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.9.5"
+      "version": "6.11.1"
     },
     "launch_at_startup": {
       "dependency": "direct main",
@@ -969,31 +979,31 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
+        "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.9"
+      "version": "11.0.2"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
+        "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.9"
+      "version": "3.0.10"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_testing",
-        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+        "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.2"
     },
     "lints": {
       "dependency": "transitive",
@@ -1015,26 +1025,6 @@
       "source": "hosted",
       "version": "1.3.0"
     },
-    "lpinyin": {
-      "dependency": "direct main",
-      "description": {
-        "name": "lpinyin",
-        "sha256": "0bb843363f1f65170efd09fbdfc760c7ec34fc6354f9fcb2f89e74866a0d814a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.3"
-    },
-    "macos_window_utils": {
-      "dependency": "transitive",
-      "description": {
-        "name": "macos_window_utils",
-        "sha256": "4e683da162825018580c7341d9e926a6fa39a869a3504c2e5471618553bd55cd",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.8.2"
-    },
     "matcher": {
       "dependency": "transitive",
       "description": {
@@ -1089,11 +1079,21 @@
       "dependency": "direct main",
       "description": {
         "name": "mobile_scanner",
-        "sha256": "72f06a071aa8b14acea3ab43ea7949eefe4a2469731ae210e006ba330a033a8c",
+        "sha256": "54005bdea7052d792d35b4fef0f84ec5ddc3a844b250ecd48dc192fb9b4ebc95",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.0"
+      "version": "7.0.1"
+    },
+    "mockito": {
+      "dependency": "transitive",
+      "description": {
+        "name": "mockito",
+        "sha256": "2314cbe9165bcd16106513df9cf3c3224713087f09723b128928dc11a4379f99",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "5.5.0"
     },
     "nm": {
       "dependency": "transitive",
@@ -1105,6 +1105,16 @@
       "source": "hosted",
       "version": "0.5.0"
     },
+    "node_preamble": {
+      "dependency": "transitive",
+      "description": {
+        "name": "node_preamble",
+        "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.0.2"
+    },
     "package_config": {
       "dependency": "transitive",
       "description": {
@@ -1119,21 +1129,21 @@
       "dependency": "direct main",
       "description": {
         "name": "package_info_plus",
-        "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191",
+        "sha256": "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.3.0"
+      "version": "8.3.1"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "package_info_plus_platform_interface",
-        "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c",
+        "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.0"
+      "version": "3.2.1"
     },
     "path": {
       "dependency": "direct main",
@@ -1169,21 +1179,21 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
+        "sha256": "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.17"
+      "version": "2.2.18"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_foundation",
-        "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
+        "sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2"
     },
     "path_provider_linux": {
       "dependency": "transitive",
@@ -1219,11 +1229,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
+        "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.0"
+      "version": "7.0.1"
     },
     "platform": {
       "dependency": "transitive",
@@ -1249,11 +1259,21 @@
       "dependency": "transitive",
       "description": {
         "name": "pool",
-        "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
+        "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.1"
+      "version": "1.5.2"
+    },
+    "posix": {
+      "dependency": "transitive",
+      "description": {
+        "name": "posix",
+        "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.3"
     },
     "proxy": {
       "dependency": "direct main",
@@ -1284,16 +1304,6 @@
       "source": "hosted",
       "version": "1.5.0"
     },
-    "quiver": {
-      "dependency": "transitive",
-      "description": {
-        "name": "quiver",
-        "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.2.2"
-    },
     "re_editor": {
       "dependency": "direct main",
       "description": {
@@ -1319,51 +1329,51 @@
       "dependency": "direct main",
       "description": {
         "name": "riverpod",
-        "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959",
+        "sha256": "135723ec44dfba141bc4696224048a408336e794228a0117439e7ad0a8be6d05",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.1"
+      "version": "3.0.0"
     },
     "riverpod_analyzer_utils": {
       "dependency": "transitive",
       "description": {
         "name": "riverpod_analyzer_utils",
-        "sha256": "837a6dc33f490706c7f4632c516bcd10804ee4d9ccc8046124ca56388715fdf3",
+        "sha256": "c971e50f678d55c87d9e3b5015df7fcaadb2302a84ea101247cf99387b4554fe",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.9"
+      "version": "1.0.0-dev.6"
     },
     "riverpod_annotation": {
       "dependency": "direct main",
       "description": {
         "name": "riverpod_annotation",
-        "sha256": "e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8",
+        "sha256": "1f9c1bc10b13f68ebc83ab391e77a865ff796880461d2a60c5ce301e1fb65f51",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.1"
+      "version": "3.0.0"
     },
     "riverpod_generator": {
       "dependency": "direct dev",
       "description": {
         "name": "riverpod_generator",
-        "sha256": "120d3310f687f43e7011bb213b90a436f1bbc300f0e4b251a72c39bccb017a4f",
+        "sha256": "178d6bfa6de66d7db97db2466e5fad2da91a678ab376a7309235eec731755046",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.4"
+      "version": "3.0.0"
     },
     "riverpod_lint": {
       "dependency": "direct dev",
       "description": {
         "name": "riverpod_lint",
-        "sha256": "b05408412b0f75dec954e032c855bc28349eeed2d2187f94519e1ddfdf8b3693",
+        "sha256": "89bce8d40bed52aa89b43ef45cfe473a9c7736629d61fc659c95e4e9f4d571a6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.4"
+      "version": "3.0.0"
     },
     "rxdart": {
       "dependency": "transitive",
@@ -1439,11 +1449,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
+        "sha256": "a2608114b1ffdcbc9c120eb71a0e207c71da56202852d4aab8a5e30a82269e74",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.10"
+      "version": "2.4.12"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -1505,6 +1515,26 @@
       "source": "hosted",
       "version": "1.4.2"
     },
+    "shelf_packages_handler": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_packages_handler",
+        "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.0.2"
+    },
+    "shelf_static": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shelf_static",
+        "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.1.3"
+    },
     "shelf_web_socket": {
       "dependency": "transitive",
       "description": {
@@ -1535,21 +1565,41 @@
       "dependency": "transitive",
       "description": {
         "name": "source_gen",
-        "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b",
+        "sha256": "7b19d6ba131c6eb98bfcbf8d56c1a7002eba438af2e7ae6f8398b2b0f4f381e3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.0"
+      "version": "3.1.0"
     },
     "source_helper": {
       "dependency": "transitive",
       "description": {
         "name": "source_helper",
-        "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c",
+        "sha256": "6a3c6cc82073a8797f8c4dc4572146114a39652851c157db37e964d9c7038723",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.5"
+      "version": "1.3.8"
+    },
+    "source_map_stack_trace": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_map_stack_trace",
+        "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.1.2"
+    },
+    "source_maps": {
+      "dependency": "transitive",
+      "description": {
+        "name": "source_maps",
+        "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.10.13"
     },
     "source_span": {
       "dependency": "transitive",
@@ -1585,21 +1635,21 @@
       "dependency": "transitive",
       "description": {
         "name": "sqflite_android",
-        "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b",
+        "sha256": "ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2+2"
     },
     "sqflite_common": {
       "dependency": "transitive",
       "description": {
         "name": "sqflite_common",
-        "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b",
+        "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.5"
+      "version": "2.5.6"
     },
     "sqflite_darwin": {
       "dependency": "transitive",
@@ -1685,11 +1735,11 @@
       "dependency": "transitive",
       "description": {
         "name": "synchronized",
-        "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6",
+        "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.3.1"
+      "version": "3.4.0"
     },
     "term_glyph": {
       "dependency": "transitive",
@@ -1701,15 +1751,35 @@
       "source": "hosted",
       "version": "1.2.2"
     },
+    "test": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test",
+        "sha256": "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.26.2"
+    },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
+        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.4"
+      "version": "0.7.6"
+    },
+    "test_core": {
+      "dependency": "transitive",
+      "description": {
+        "name": "test_core",
+        "sha256": "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.6.11"
     },
     "timing": {
       "dependency": "transitive",
@@ -1725,11 +1795,11 @@
       "dependency": "direct main",
       "description": {
         "name": "tray_manager",
-        "sha256": "ad18c4cd73003097d182884bacb0578ad2865f3ab842a0ad00f6d043ed49eaf0",
+        "sha256": "537e539f48cd82d8ee2240d4330158c7b44c7e043e8e18b5811f2f8f6b7df25a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.0"
+      "version": "0.5.1"
     },
     "typed_data": {
       "dependency": "transitive",
@@ -1755,31 +1825,31 @@
       "dependency": "direct main",
       "description": {
         "name": "url_launcher",
-        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
+        "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.1"
+      "version": "6.3.2"
     },
     "url_launcher_android": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
+        "sha256": "199bc33e746088546a39cc5f36bac5a278c5e53b40cb3196f99e7345fdcfae6b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.16"
+      "version": "6.3.22"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
+        "sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.3"
+      "version": "6.3.4"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
@@ -1795,11 +1865,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_macos",
-        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
+        "sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.2"
+      "version": "3.2.3"
     },
     "url_launcher_platform_interface": {
       "dependency": "transitive",
@@ -1845,11 +1915,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics",
-        "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de",
+        "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.18"
+      "version": "1.1.19"
     },
     "vector_graphics_codec": {
       "dependency": "transitive",
@@ -1865,41 +1935,41 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331",
+        "sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.17"
+      "version": "1.1.19"
     },
     "vector_math": {
       "dependency": "transitive",
       "description": {
         "name": "vector_math",
-        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+        "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "vm_service": {
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
+        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.0.0"
+      "version": "15.0.2"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104",
+        "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.3"
     },
     "web": {
       "dependency": "transitive",
@@ -1941,15 +2011,25 @@
       "source": "hosted",
       "version": "1.2.2"
     },
+    "webkit_inspection_protocol": {
+      "dependency": "transitive",
+      "description": {
+        "name": "webkit_inspection_protocol",
+        "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.2.1"
+    },
     "win32": {
       "dependency": "direct main",
       "description": {
         "name": "win32",
-        "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba",
+        "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.13.0"
+      "version": "5.14.0"
     },
     "win32_registry": {
       "dependency": "direct main",
@@ -1974,11 +2054,11 @@
       "dependency": "direct main",
       "description": {
         "name": "window_manager",
-        "sha256": "51d50168ab267d344b975b15390426b1243600d436770d3f13de67e55b05ec16",
+        "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.0"
+      "version": "0.5.1"
     },
     "xdg_directories": {
       "dependency": "transitive",
@@ -1994,11 +2074,11 @@
       "dependency": "transitive",
       "description": {
         "name": "xml",
-        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+        "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.5.0"
+      "version": "6.6.1"
     },
     "yaml": {
       "dependency": "transitive",
@@ -2009,20 +2089,10 @@
       },
       "source": "hosted",
       "version": "3.1.3"
-    },
-    "yaml_edit": {
-      "dependency": "transitive",
-      "description": {
-        "name": "yaml_edit",
-        "sha256": "fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.2"
     }
   },
   "sdks": {
-    "dart": ">=3.8.0 <4.0.0",
-    "flutter": ">=3.29.0"
+    "dart": ">=3.9.0 <4.0.0",
+    "flutter": ">=3.35.0"
   }
 }

From b3836bf54c9c75708110f39e3762346fc0eb2d50 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Thu, 25 Sep 2025 11:24:59 +0800
Subject: [PATCH 0526/6226] flclash: refactor

---
 pkgs/by-name/fl/flclash/package.nix | 20 +++++++++-----------
 pkgs/by-name/fl/flclash/update.sh   | 12 ++++++------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix
index 32ba400d8a09..84add28784b9 100644
--- a/pkgs/by-name/fl/flclash/package.nix
+++ b/pkgs/by-name/fl/flclash/package.nix
@@ -28,16 +28,16 @@ let
         GIT_CONFIG_VALUE_0 = "git@github.com:";
       });
 
-  metaCommon = {
-    description = "Multi-platform proxy client based on ClashMeta, simple and easy to use, open-source and ad-free";
+  meta = {
+    description = "Proxy client based on ClashMeta, simple and easy to use";
     homepage = "https://github.com/chen08209/FlClash";
     license = with lib.licenses; [ gpl3Plus ];
     maintainers = [ ];
   };
 
-  libclash = buildGoModule {
-    inherit version src;
-    pname = "libclash";
+  core = buildGoModule {
+    pname = "core";
+    inherit version src meta;
 
     modRoot = "core";
 
@@ -53,8 +53,6 @@ let
 
       runHook postBuild
     '';
-
-    meta = metaCommon;
   };
 in
 flutter335.buildFlutterApplication {
@@ -98,19 +96,19 @@ flutter335.buildFlutterApplication {
 
   preBuild = ''
     mkdir -p libclash/linux
-    cp ${libclash}/bin/FlClashCore libclash/linux/FlClashCore
+    cp ${core}/bin/FlClashCore libclash/linux/FlClashCore
   '';
 
   postInstall = ''
-    install -Dm644 assets/images/icon.png $out/share/pixmaps/flclash.png
+    install -D --mode=0644 assets/images/icon.png $out/share/pixmaps/flclash.png
   '';
 
   passthru = {
-    inherit libclash;
+    inherit core;
     updateScript = ./update.sh;
   };
 
-  meta = metaCommon // {
+  meta = meta // {
     mainProgram = "FlClash";
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/fl/flclash/update.sh b/pkgs/by-name/fl/flclash/update.sh
index b2fea37f8187..37627d5043b6 100755
--- a/pkgs/by-name/fl/flclash/update.sh
+++ b/pkgs/by-name/fl/flclash/update.sh
@@ -1,20 +1,20 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -I nixpkgs=./. -i bash -p curl gnused jq yq nix bash coreutils nix-update
+#!nix-shell -i bash -p curl gnused jq yq-go nix bash nix-update
 
 set -eou pipefail
 
-ROOT="$(dirname "$(readlink -f "$0")")"
+PACKAGE_DIR=$(realpath "$(dirname "$0")")
 
-latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/chen08209/FlClash/releases/latest | jq --raw-output .tag_name)
+latestTag=$(curl --fail --location --silent ${GITHUB_TOKEN:+--user ":$GITHUB_TOKEN"} https://api.github.com/repos/chen08209/FlClash/releases/latest | jq --raw-output .tag_name)
 latestVersion=$(echo "$latestTag" | sed 's/^v//')
 
-currentVersion=$(nix-instantiate --eval -E "with import ./. {}; flclash.version or (lib.getVersion flclash)" | tr -d '"')
+currentVersion=$(nix eval --file . --raw flclash.version)
 
 if [[ "$currentVersion" == "$latestVersion" ]]; then
     echo "package is up-to-date: $currentVersion"
     exit 0
 fi
 
-nix-update --subpackage libclash flclash
+nix-update --subpackage core --use-github-releases flclash
 
-curl https://raw.githubusercontent.com/chen08209/FlClash/${latestTag}/pubspec.lock | yq . >$ROOT/pubspec.lock.json
+curl --fail --location --silent https://raw.githubusercontent.com/chen08209/FlClash/${latestTag}/pubspec.lock | yq eval --output-format=json --prettyPrint >$PACKAGE_DIR/pubspec.lock.json

From f0b3f5c365e36f1b93bffb42d592a5d491128a36 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sat, 27 Sep 2025 07:48:09 +0000
Subject: [PATCH 0527/6226] flclash: 0.8.88 -> 0.8.90

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

diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix
index 84add28784b9..dfe911fd2de5 100644
--- a/pkgs/by-name/fl/flclash/package.nix
+++ b/pkgs/by-name/fl/flclash/package.nix
@@ -12,14 +12,14 @@
 
 let
   pname = "flclash";
-  version = "0.8.88";
+  version = "0.8.90";
 
   src =
     (fetchFromGitHub {
       owner = "chen08209";
       repo = "FlClash";
       tag = "v${version}";
-      hash = "sha256-yhIaYIlAyc2+oHkMRA9ybBQ+14URBY2kUp9wqTgFrwI=";
+      hash = "sha256-wEgWjzdP7HeWgDacaP9fYNczG9BrTN790AQ5aj9scwM=";
       fetchSubmodules = true;
     }).overrideAttrs
       (_: {
@@ -41,7 +41,7 @@ let
 
     modRoot = "core";
 
-    vendorHash = "sha256-ekNuZ3Uv6TDfyZ4hVvXA3Wft4fetaXzddKIpis4ER1g=";
+    vendorHash = "sha256-5oYJMcyKh8CpMLOLch5/svwa148hY4rnSR5inTRNK4M=";
 
     env.CGO_ENABLED = 0;
 

From 4349f1b9a90c3f37f46f27494bec4f2988b24c6e Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Thu, 9 Oct 2025 01:48:45 +0000
Subject: [PATCH 0528/6226] dart.hotkey_manager_linux: init

---
 .../dart/package-source-builders/default.nix  |  1 +
 .../hotkey_manager_linux/default.nix          | 27 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/development/compilers/dart/package-source-builders/hotkey_manager_linux/default.nix

diff --git a/pkgs/development/compilers/dart/package-source-builders/default.nix b/pkgs/development/compilers/dart/package-source-builders/default.nix
index c19832506b78..16e70b9ec0ba 100644
--- a/pkgs/development/compilers/dart/package-source-builders/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/default.nix
@@ -7,6 +7,7 @@
   flutter_vodozemac = callPackage ./flutter_vodozemac { };
   flutter_volume_controller = callPackage ./flutter_volume_controller { };
   handy_window = callPackage ./handy-window { };
+  hotkey_manager_linux = callPackage ./hotkey_manager_linux { };
   matrix = callPackage ./matrix { };
   media_kit_libs_linux = callPackage ./media_kit_libs_linux { };
   olm = callPackage ./olm { };
diff --git a/pkgs/development/compilers/dart/package-source-builders/hotkey_manager_linux/default.nix b/pkgs/development/compilers/dart/package-source-builders/hotkey_manager_linux/default.nix
new file mode 100644
index 000000000000..51b2d8d69847
--- /dev/null
+++ b/pkgs/development/compilers/dart/package-source-builders/hotkey_manager_linux/default.nix
@@ -0,0 +1,27 @@
+{
+  stdenv,
+}:
+
+{ version, src, ... }:
+
+stdenv.mkDerivation {
+  pname = "hotkey_manager_linux";
+  inherit version src;
+  inherit (src) passthru;
+
+  postPatch = ''
+    pushd ${src.passthru.packageRoot}
+    substituteInPlace linux/hotkey_manager_linux_plugin.cc \
+      --replace-fail "const char* identifier;" "const char* identifier = nullptr;" \
+      --replace-fail "const char* keystring;" "const char* keystring = nullptr;"
+    popd
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    cp --recursive . "$out"
+
+    runHook postInstall
+  '';
+}

From 2e2079fd6eb1f15322559d4d68f29c089930631d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Oct 2025 06:26:24 +0000
Subject: [PATCH 0529/6226] grafanaPlugins.grafana-lokiexplore-app: 1.0.26 ->
 1.0.29

---
 .../grafana/plugins/grafana-lokiexplore-app/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
index 321fe4e51cd4..95c4b0b184e6 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-lokiexplore-app";
-  version = "1.0.26";
-  zipHash = "sha256-7EztpeZIpDu/ner9EOiOjoh3J/GBgYWpZoh3usXyPqo=";
+  version = "1.0.29";
+  zipHash = "sha256-YgEMK79KRW3r8rVel+JVf5nWsT1XzYm0L+t5NA2rrdA=";
   meta = with lib; {
     description = "Browse Loki logs without the need for writing complex queries";
     license = licenses.agpl3Only;

From 64bf0c2cada67d4959409d664ca8797e583b7a85 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Wed, 8 Oct 2025 13:46:19 +0200
Subject: [PATCH 0530/6226] armTrustedFirmwareRK3399 fix compilation

The failure was introduced by ccc56d1a79ff2a0f528cecf5e36eb76beaacc8c0.
---
 pkgs/misc/arm-trusted-firmware/default.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix
index b3b43b9a78c8..c813e6e94b10 100644
--- a/pkgs/misc/arm-trusted-firmware/default.nix
+++ b/pkgs/misc/arm-trusted-firmware/default.nix
@@ -98,8 +98,19 @@ let
         hardeningDisable = [ "all" ];
         dontStrip = true;
 
-        # breaks secondary CPU bringup on at least RK3588, maybe others
-        env.NIX_CFLAGS_COMPILE = "-fomit-frame-pointer";
+        env.NIX_CFLAGS_COMPILE = lib.concatStringsSep " " [
+          # breaks secondary CPU bringup on at least RK3588, maybe others
+          "-fomit-frame-pointer"
+
+          # Breaks compilation of armTrustedFirmwareRK3399:
+          # /nix/store/hash-arm-none-eabi-binutils-2.44/bin/arm-none-eabi-ld: /build/source/build/rk3399/release/m0/rk3399m0.elf: error: PHDR segment not covered by LOAD segment
+          #
+          # This was caused by ccc56d1a79ff2a0f528cecf5e36eb76beaacc8c0 adding the flag `--enable-default-pie`.
+          # According to https://trustedfirmware-a.readthedocs.io/en/v2.2/getting_started/user-guide.html,
+          # Trusted Firmware-A has an option called ENABLE_PIE, which is turned off by default.
+          # Someone with more knowledge of the implications can try using that option instead.
+          "-no-pie"
+        ];
 
         meta =
           with lib;

From 3b680a275ecb4931c5b2e667a391d00f43e97bff Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Tue, 7 Oct 2025 16:22:52 +0200
Subject: [PATCH 0531/6226] uboot: 2025.07 -> 2025.10

---
 pkgs/misc/uboot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 559da3d2c48d..b88fb6bc6b35 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -34,10 +34,10 @@
 }@pkgs:
 
 let
-  defaultVersion = "2025.07";
+  defaultVersion = "2025.10";
   defaultSrc = fetchurl {
     url = "https://ftp.denx.de/pub/u-boot/u-boot-${defaultVersion}.tar.bz2";
-    hash = "sha256-D5M/bFpCaJW/MG6T5qxTxghw5LVM2lbZUhG+yZ5jvsc=";
+    hash = "sha256-tPAyhI5WzI8hOtWfkTLAhNu7YyvCkXbQJOWCIODv30o=";
   };
 
   # Dependencies for the tools need to be included as either native or cross,

From 82cdb3b6efa3456ac0ae0941e3df5f208482a448 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Oct 2025 08:35:37 +0000
Subject: [PATCH 0532/6226] babashka-unwrapped: 1.12.208 -> 1.12.209

---
 pkgs/development/interpreters/babashka/clojure-tools.nix | 4 ++--
 pkgs/development/interpreters/babashka/default.nix       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/interpreters/babashka/clojure-tools.nix b/pkgs/development/interpreters/babashka/clojure-tools.nix
index 2ee6a96572d5..82a508f9453d 100644
--- a/pkgs/development/interpreters/babashka/clojure-tools.nix
+++ b/pkgs/development/interpreters/babashka/clojure-tools.nix
@@ -7,10 +7,10 @@
 }:
 clojure.overrideAttrs (previousAttrs: {
   pname = "babashka-clojure-tools";
-  version = "1.12.2.1565";
+  version = "1.12.3.1577";
 
   src = fetchurl {
     url = previousAttrs.src.url;
-    hash = "sha256-qj0RqgIL+pgbqdMnG+vCfHirazBVA8ro2zCKOlDzYXk=";
+    hash = "sha256-u/hROuiLmHPpeBroaty1YLgSCcZv6Uy+ckKK85seusw=";
   };
 })
diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix
index 70e275887ec9..487aefa8a341 100644
--- a/pkgs/development/interpreters/babashka/default.nix
+++ b/pkgs/development/interpreters/babashka/default.nix
@@ -8,11 +8,11 @@
 
 buildGraalvmNativeImage (finalAttrs: {
   pname = "babashka-unwrapped";
-  version = "1.12.208";
+  version = "1.12.209";
 
   src = fetchurl {
     url = "https://github.com/babashka/babashka/releases/download/v${finalAttrs.version}/babashka-${finalAttrs.version}-standalone.jar";
-    sha256 = "sha256-2tr+MM4CNYaLpVw2q5Hx4hXnUkV4fl5T3znmq8mFycU=";
+    sha256 = "sha256-Br8e011Iy+fr+MrIIRtcga98VSDKDeyRfgVTPnjBMII=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 571f524f69c6c13ea61a43a62e7e0d60bf2a5e97 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Thu, 9 Oct 2025 10:54:56 +0000
Subject: [PATCH 0533/6226] learn6502: 0.5.0 -> 0.6.0

---
 pkgs/by-name/le/learn6502/missing-hashes.json | 21 ++++++++++---------
 pkgs/by-name/le/learn6502/package.nix         |  6 +++---
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/le/learn6502/missing-hashes.json b/pkgs/by-name/le/learn6502/missing-hashes.json
index 6e10eceee45f..992abb31eaef 100644
--- a/pkgs/by-name/le/learn6502/missing-hashes.json
+++ b/pkgs/by-name/le/learn6502/missing-hashes.json
@@ -70,14 +70,15 @@
   "@rollup/rollup-win32-arm64-msvc@npm:4.46.2": "b59089cddf652e3da278744f6b8b2105360d1219833e54791380322913d40073ed4197ccd06d6091e83e1e12a5290d7a2e4aeae7947ff20c45943d07d1f0af0c",
   "@rollup/rollup-win32-ia32-msvc@npm:4.46.2": "d0aae1f80a64d9148426a7ff25b9df7f3abf7aca912c358a952f4b3bc541e030b5959f52e0b67abe01b9c8c8fb6567d1bbd30e31daabb7e2c4dc0488faf875f7",
   "@rollup/rollup-win32-x64-msvc@npm:4.46.2": "740ca3c1d07f5af76fc9c2db917edbf6d0c1cf3eeee8330a0c571db4990ec44f0b272696a215ab118e8a32d7529f84bd47225e85dfab458a989b4b18d0bbea49",
-  "lightningcss-darwin-arm64@npm:1.30.1": "bbdce4ee14b3952699e6d07c539cf4bd678853bfd974e3107742198dac38dfa6d40c6ea80163a7026aff662dd7d3a462a2bee9a18448c75c788659ceebe2746a",
-  "lightningcss-darwin-x64@npm:1.30.1": "6b88c182be0de82858983ec374093c2cb13cd58139456e25be215fc55a7a8cbfcd6f7487bee1507fc024988a1f324d7cb26b3f195893d5a69ccaf252dc9094eb",
-  "lightningcss-freebsd-x64@npm:1.30.1": "731a96282db6afff3f57e8cbb73f51d06455231868b3b311a772ee11ead9c57538fc217d0956df4f177dbb805fa4fc761734440f6d2bb8965963b21f06bf63c1",
-  "lightningcss-linux-arm-gnueabihf@npm:1.30.1": "fcf07f54c4d7d056f9b57d39e6df1c6f60c02ef4ebd51eda76056d35d89b1307af8737e44076d2b1f85348d2b1b9c61bf2220c5347389a6d40ad8bb12f34b5cf",
-  "lightningcss-linux-arm64-gnu@npm:1.30.1": "bc82ce2e96ffab4b0ba1f9adacf63f461c3f6221bcbc955104c05e6e8c2c6ed8863421663e0e4148a682b143868d07190c38e9f990915a80ce9692f963132320",
-  "lightningcss-linux-arm64-musl@npm:1.30.1": "2ae25a764b8ed9fcc1977dc1786011e68db23bf3343168fa2d4a9a4bcbb73c7aae258cdcb879d68a3a28e22343705ee435517d3f045e49b15fbb65816d74a91d",
-  "lightningcss-linux-x64-gnu@npm:1.30.1": "190ac9ba1b9a4bf658a9e5b3c5702546ec779a7a5ccf5a4e06e5d46012ce6cad1842a9b1e717498bc759e103ba7390f42c9b8ba3e67157adec8e7162225633b4",
-  "lightningcss-linux-x64-musl@npm:1.30.1": "fab6ed75d747024fcf46212b9edc7d1daccfbe4e7a06dcd0f9e841c6a023e61e716751747f9e8aecba18495adc9ef6bc20b24616d5c15c87f5dc1ff9ce1fd859",
-  "lightningcss-win32-arm64-msvc@npm:1.30.1": "2cc285e89f66323ecae5ec41a6b1a57500d74a549fb392829c99708d5a5254d709c0ccd2d8fef4f6c1fc9a55c5bd51eca633fa1f2228563f884545668adc1b17",
-  "lightningcss-win32-x64-msvc@npm:1.30.1": "60bd930e71fab0fbf0250406d4791bf27f0b9c8daf095c8d5fce9f3e120d24753e309eb6fed956043fc6a6cbb6d1da30fb0862acb54fa046b5f9a2e69908b6f9"
+  "lightningcss-android-arm64@npm:1.30.2": "7b8a62c7aa787251381e9e082fc19991e8bca696f17be4dad0a5c3a31483d1452e6f8b04713b9c9221ef8d9b011510ee10d69c34005294be92ba2e57ad075a90",
+  "lightningcss-darwin-arm64@npm:1.30.2": "fe4f6eb4af66f95a0f83a9b4970f863417ae9ac394b5c963a20cda24ae08ae0ce6ebdc6f8e664d8b53717afb936242b9a73394584b55ecf2978babab50364e93",
+  "lightningcss-darwin-x64@npm:1.30.2": "b2d82add63e88d77dbd08508a32c1c28a12de826d4dd70f6ec17ffae9d3c5bf1be7a7c35f154bf98bca4164b7390ba515202884e4cabaa83ed7f1727baaa08fa",
+  "lightningcss-freebsd-x64@npm:1.30.2": "cea6113555ed6fd69e10c67a8616d3b4c743eacd817e93d290b7d85d1c2eb29386466e55f61890f4aee87cafe062ef037b92824160418dd1c299bb7d15796cec",
+  "lightningcss-linux-arm-gnueabihf@npm:1.30.2": "93119a9476759aff2a1a3fe35dfdfd39b0eab320b76725b36bddfc11f258f80140831169ed10f5528349863f7c6497358ec73d3c13054e6dc72ef5b26a22bd26",
+  "lightningcss-linux-arm64-gnu@npm:1.30.2": "c52236dd9777f150b849e0ed4ec1a4d17dc2bbe1ffa802286483d9c71e868eef16b54e348e410d44921262beb4474d2b4c90c268aa2c1109e55899d7cf8294c8",
+  "lightningcss-linux-arm64-musl@npm:1.30.2": "85b54252172367c9b15be312c55f982d0541063b0626faa370c26d5eb8bedc36e036b6081374aba35f68d9e82c729239fb7af52f997004df715b09a6f7c5d453",
+  "lightningcss-linux-x64-gnu@npm:1.30.2": "658f54482728885541331184a5fefc3df76e1f4d691ad28d70b559dc391d552837bc95676449e48cbdcda8d63165f0f56c921a09ec2c6fc591b427c566e0b9ed",
+  "lightningcss-linux-x64-musl@npm:1.30.2": "6b046d57dab2237729953f1350a922844fafd16bdbae3a9ee17b04abdc2e2d2392ccd61932e7210276bf18938165d900517d2079ec57d866fd288b8bba28dbd4",
+  "lightningcss-win32-arm64-msvc@npm:1.30.2": "f8383d06fe81494ba34b9bd7eb713ad91dbd84d4f321526b5190d7908e95591e462159acf71f6d3a0c33ea1251d5e80c012d255d94e9aa4187a476a810a249bc",
+  "lightningcss-win32-x64-msvc@npm:1.30.2": "ab86748b46ca851d29c387cb349cd35ca9da6fc73082b759ef84d358ec08ece6491e0eb137ea8b30b85419c20075c59f44620ab026d9a0aa0e86d3e0a610a960"
 }
diff --git a/pkgs/by-name/le/learn6502/package.nix b/pkgs/by-name/le/learn6502/package.nix
index a52a6ac55989..66bb499bf5b5 100644
--- a/pkgs/by-name/le/learn6502/package.nix
+++ b/pkgs/by-name/le/learn6502/package.nix
@@ -24,20 +24,20 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "learn6502";
-  version = "0.5.0";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "JumpLink";
     repo = "Learn6502";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4u9+VrGDhVd6tPi7KyuW8vfHba2iXp8yar8euN+qFXg=";
+    hash = "sha256-Vk8IbTv7fivBrPeZ1Psvvym68F5lA1XV7p4kMfSqNrU=";
   };
 
   missingHashes = ./missing-hashes.json;
 
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-LomdUWcNziqyn0ty40p+RzZ4Paejs9g0AOaUQUOd2yY=";
+    hash = "sha256-0kKC0KCxiigk7LPLmCRaoJnz/rVg8/Tvkcae4XU/97w=";
   };
 
   nativeBuildInputs = [

From 418d76c79247c20a86a8fb01a09fe1c1e9a62dca Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 9 Oct 2025 15:10:37 +0300
Subject: [PATCH 0534/6226] python313Packages.{shiboken6,pyside6}: fetch
 sources by tag

There wasn't a tag before, but there is one now. It's the same actual commit.
---
 pkgs/development/python-modules/shiboken6/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/shiboken6/default.nix b/pkgs/development/python-modules/shiboken6/default.nix
index 2ac75ab8a09d..0267a3ad2974 100644
--- a/pkgs/development/python-modules/shiboken6/default.nix
+++ b/pkgs/development/python-modules/shiboken6/default.nix
@@ -17,7 +17,7 @@ stdenv'.mkDerivation (finalAttrs: {
 
   src = fetchgit {
     url = "https://code.qt.io/pyside/pyside-setup.git";
-    rev = "97af685d5b777323690704fb9848f50aa2728ce9";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-zJV4rrqr2bzWFEG1CWOI+y6wbfQDvWAst6T3aSssj6M=";
   };
 

From e8cc1edaac99a43f3c862319adc9bf5000b37e5c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 9 Oct 2025 15:13:53 +0300
Subject: [PATCH 0535/6226] pipewire: 1.4.8 -> 1.4.9

Diff: https://gitlab.freedesktop.org/pipewire/pipewire/-/compare/1.4.8...1.4.9

Changelog: https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/1.4.9
---
 pkgs/development/libraries/pipewire/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index ae018111a2c3..bb889da7ea81 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -77,7 +77,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pipewire";
-  version = "1.4.8";
+  version = "1.4.9";
 
   outputs = [
     "out"
@@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "pipewire";
     repo = "pipewire";
     rev = finalAttrs.version;
-    sha256 = "sha256-o4puApKXW4pQ0DRcLgZTDor8CAxKehn7Zi56/PzrSLU=";
+    sha256 = "sha256-380KY17l6scVchZAoSHswTvceYl427e79eU11JQallc=";
   };
 
   patches = [

From 17d55ed6cb9db62234ef000557fde0aa58d4a150 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Tue, 7 Oct 2025 16:16:32 +0200
Subject: [PATCH 0536/6226] newsboat: use mkDerivation + cargoSetupHook

---
 pkgs/by-name/ne/newsboat/package.nix | 45 +++++++++++-----------------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix
index e98d0b26141c..76d3185bdfee 100644
--- a/pkgs/by-name/ne/newsboat/package.nix
+++ b/pkgs/by-name/ne/newsboat/package.nix
@@ -3,6 +3,9 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
+  fetchpatch,
+  cargo,
+  rustc,
   stfl,
   sqlite,
   curl,
@@ -17,7 +20,7 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "newsboat";
   version = "2.41";
 
@@ -28,19 +31,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
     hash = "sha256-LhEhbK66OYwAD/pel81N7Hgh/xEvnFR8GlZzgqZIe5M=";
   };
 
-  cargoHash = "sha256-CyhyzNw2LXwIVf/SX2rQRvEex5LmjZfZKgCe88jthz0=";
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-CyhyzNw2LXwIVf/SX2rQRvEex5LmjZfZKgCe88jthz0=";
+  };
 
-  # TODO: Check if that's still needed
+  # allow other ncurses versions on Darwin
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    # Allow other ncurses versions on Darwin
-    substituteInPlace config.sh \
-      --replace "ncurses5.4" "ncurses"
+    substituteInPlace config.sh --replace-fail "ncurses5.4" "ncurses"
   '';
 
   nativeBuildInputs = [
     pkg-config
     asciidoctor
     gettext
+    cargo
+    rustc
+    rustPlatform.cargoSetupHook
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     makeWrapper
@@ -60,12 +67,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     gettext
   ];
 
-  env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" ];
-
-  postBuild = ''
-    make -j $NIX_BUILD_CORES prefix="$out"
-  '';
-
   # https://github.com/NixOS/nixpkgs/pull/98471#issuecomment-703100014 . We set
   # these for all platforms, since upstream's gettext crate behavior might
   # change in the future.
@@ -73,16 +74,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
   GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include";
   GETTEXT_BIN_DIR = "${lib.getBin gettext}/bin";
 
+  makeFlags = [ "prefix=$(out)" ];
+  enableParallelBuilding = true;
+
   doCheck = true;
+  checkTarget = "test";
 
-  preCheck = ''
-    make -j $NIX_BUILD_CORES test
-  '';
-
-  postInstall = ''
-    make -j $NIX_BUILD_CORES prefix="$out" install
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     for prog in $out/bin/*; do
       wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "${stfl}/lib"
     done
@@ -92,13 +90,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     updateScript = nix-update-script { };
   };
 
-  installPhase = ''
-    runHook preInstall
-    install -Dm755 newsboat $out/bin/newsboat
-    install -Dm755 podboat $out/bin/podboat
-    runHook postInstall
-  '';
-
   meta = {
     homepage = "https://newsboat.org/";
     changelog = "https://github.com/newsboat/newsboat/blob/${finalAttrs.src.tag}/CHANGELOG.md";

From f3ba0f816cb7144f736a914e99abdabb476f81c7 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 9 Oct 2025 15:46:15 +0200
Subject: [PATCH 0537/6226] sofia_sip: Enable tests, speed up build

---
 .../2001-sofia-sip-Disable-some-tests.patch   | 109 ++++++++++++++++++
 pkgs/by-name/so/sofia_sip/package.nix         |  55 ++++++++-
 2 files changed, 160 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/by-name/so/sofia_sip/2001-sofia-sip-Disable-some-tests.patch

diff --git a/pkgs/by-name/so/sofia_sip/2001-sofia-sip-Disable-some-tests.patch b/pkgs/by-name/so/sofia_sip/2001-sofia-sip-Disable-some-tests.patch
new file mode 100644
index 000000000000..169bcfea6949
--- /dev/null
+++ b/pkgs/by-name/so/sofia_sip/2001-sofia-sip-Disable-some-tests.patch
@@ -0,0 +1,109 @@
+diff --git a/libsofia-sip-ua-glib/su-glib/Makefile.am b/libsofia-sip-ua-glib/su-glib/Makefile.am
+index 6f54d34..c5bfd82 100644
+--- a/libsofia-sip-ua-glib/su-glib/Makefile.am
++++ b/libsofia-sip-ua-glib/su-glib/Makefile.am
+@@ -20,12 +20,12 @@ AM_CPPFLAGS =		-I$(S_BASE)/su -I$(B_BASE)/su $(GLIB_CFLAGS) \
+ 
+ noinst_LTLIBRARIES = 	libsu-glib.la
+ 
+-check_PROGRAMS = 	su_source_test torture_su_glib_timer
++check_PROGRAMS =
+ 
+ # ----------------------------------------------------------------------
+ # Tests
+ 
+-TESTS = 		su_source_test torture_su_glib_timer
++TESTS =
+ 
+ # ----------------------------------------------------------------------
+ # Rules for building the targets
+diff --git a/libsofia-sip-ua/nta/Makefile.am b/libsofia-sip-ua/nta/Makefile.am
+index c450fd1..4f322c3 100644
+--- a/libsofia-sip-ua/nta/Makefile.am
++++ b/libsofia-sip-ua/nta/Makefile.am
+@@ -26,9 +26,9 @@ AM_CPPFLAGS = 		-I$(srcdir)/../ipt -I../ipt \
+ noinst_LTLIBRARIES = 	libnta.la
+ 
+ check_PROGRAMS = 	check_nta test_nta_api test_nta portbind
+-dist_noinst_SCRIPTS =	run_test_nta_api run_test_nta
++dist_noinst_SCRIPTS =	run_test_nta_api
+ 
+-TESTS =			run_check_nta run_test_nta_api run_test_nta
++TESTS =			run_test_nta_api
+ 
+ TESTS_ENVIRONMENT =	$(SHELL)
+ 
+diff --git a/libsofia-sip-ua/nua/Makefile.am b/libsofia-sip-ua/nua/Makefile.am
+index 6b6dfaa..73ffd70 100644
+--- a/libsofia-sip-ua/nua/Makefile.am
++++ b/libsofia-sip-ua/nua/Makefile.am
+@@ -17,8 +17,8 @@ check_PROGRAMS =
+ TESTS =
+ 
+ if HAVE_CHECK
+-check_PROGRAMS +=	check_nua
+-TESTS += 		check_nua
++check_PROGRAMS +=
++TESTS +=
+ endif
+ 
+ # ----------------------------------------------------------------------
+diff --git a/libsofia-sip-ua/su/Makefile.am b/libsofia-sip-ua/su/Makefile.am
+index db3a331..0a31c72 100644
+--- a/libsofia-sip-ua/su/Makefile.am
++++ b/libsofia-sip-ua/su/Makefile.am
+@@ -20,7 +20,7 @@ check_PROGRAMS = 	torture_su torture_su_port \
+ 			torture_su_alloc torture_su_time torture_su_tag \
+ 			test_htable test_htable2 torture_rbtree torture_heap \
+ 			test_memmem torture_su_bm \
+-			torture_su_root torture_su_timer \
++			torture_su_timer \
+ 			test_su su_proxy test_poll $(OSXPROGS)
+ 
+ # ----------------------------------------------------------------------
+@@ -30,8 +30,8 @@ TESTS = 		torture_su torture_su_port \
+ 			torture_su_alloc torture_su_time torture_su_tag \
+ 			test_htable test_htable2 torture_rbtree torture_heap \
+ 			test_memmem torture_su_bm \
+-			torture_su_root torture_su_timer \
+-			run_addrinfo run_localinfo run_test_su \
++			torture_su_timer \
++			run_localinfo run_test_su \
+ 			$(OSXTESTS)
+ 
+ # ----------------------------------------------------------------------
+@@ -98,7 +98,7 @@ LDADD = 		libsu.la
+ # Install and distribution rules
+ 
+ EXTRA_DIST += 		su.docs \
+-			run_addrinfo run_localinfo run_test_su
++			run_localinfo run_test_su
+ 
+ dist_pkgdata_SCRIPTS = 	tag_dll.awk
+ 
+diff --git a/tests/Makefile.am b/tests/Makefile.am
+index cabc2b5..0184017 100644
+--- a/tests/Makefile.am
++++ b/tests/Makefile.am
+@@ -5,8 +5,8 @@
+ # Contact: Pekka Pessi <pekka.pessi@nokia.com>
+ # Licensed under LGPL. See file COPYING.
+ 
+-TESTS = test_nua
+-check_PROGRAMS = test_nua
++TESTS =
++check_PROGRAMS =
+ 
+ EXTRA_DIST = check_sofia.h check_sofia.c suite_for_nua.c
+ 
+@@ -33,8 +33,8 @@ libtestproxy_a_SOURCES = test_proxy.h test_proxy.c
+ libtestnat_a_SOURCES =	test_nat.h test_nat.c test_nat_tags.c
+ 
+ if HAVE_CHECK
+-TESTS += check_dlopen_sofia check_sofia
+-check_PROGRAMS += check_dlopen_sofia check_sofia
++TESTS += check_dlopen_sofia
++check_PROGRAMS += check_dlopen_sofia
+ endif
+ 
+ check_sofia_CFLAGS = @CHECK_CFLAGS@
diff --git a/pkgs/by-name/so/sofia_sip/package.nix b/pkgs/by-name/so/sofia_sip/package.nix
index 05c37421286b..07cea5843029 100644
--- a/pkgs/by-name/so/sofia_sip/package.nix
+++ b/pkgs/by-name/so/sofia_sip/package.nix
@@ -3,10 +3,15 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch2,
+  autoconf,
+  automake,
+  check,
   glib,
+  libtool,
   openssl,
   pkg-config,
-  autoreconfHook,
+  valgrind,
+  zlib,
 }:
 
 stdenv.mkDerivation rec {
@@ -27,17 +32,59 @@ stdenv.mkDerivation rec {
       url = "https://github.com/freeswitch/sofia-sip/commit/46b02f0655af0a9594e805f09a8ee99278f84777.diff";
       hash = "sha256-4uZVtKnXG+BPW8byjd7tu4uEZo9SYq9EzTEvMwG0Bak=";
     })
+
+    # Disable some failing tests
+    # https://github.com/freeswitch/sofia-sip/issues/234
+    # run_addrinfo: Fails due to limited networking during build
+    # torture_su_root: Aborts with: bit out of range 0 - FD_SETSIZE on fd_set
+    # run_check_nta: Times out in client_2_1_1 test, which seems to test some connection protocol fallback thing
+    # run_test_nta: "no valid IPv6 addresses available", likely due to no networking in sandbox
+    # check_nua, check_sofia, test_nua: Times out no matter how much time is given to it
+    ./2001-sofia-sip-Disable-some-tests.patch
+  ];
+
+  # This actually breaks these tests, leading to bash trying to execute itself
+  # https://github.com/freeswitch/sofia-sip/issues/234
+  postPatch = ''
+    substituteInPlace libsofia-sip-ua/nta/Makefile.am \
+      --replace-fail 'TESTS_ENVIRONMENT =' '#TESTS_ENVIRONMENT ='
+  '';
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    libtool
+    pkg-config
   ];
 
   buildInputs = [
     glib
     openssl
   ];
-  nativeBuildInputs = [
-    autoreconfHook
-    pkg-config
+
+  nativeCheckInputs = [
+    valgrind
   ];
 
+  checkInputs = [
+    check
+    zlib
+  ];
+
+  preConfigure = ''
+    ./bootstrap.sh
+  '';
+
+  configureFlags = [
+    (lib.strings.enableFeature true "expensive-checks")
+  ];
+
+  enableParallelBuilding = true;
+
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
   meta = with lib; {
     description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification";
     homepage = "https://github.com/freeswitch/sofia-sip";

From e861184584c23d274a2b410c04ce641041ec71eb Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 9 Oct 2025 15:47:40 +0200
Subject: [PATCH 0538/6226] sofia_sip: Adopt by NGI team

BigBlueButton uses this, and it is currently unmaintained.
---
 pkgs/by-name/so/sofia_sip/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/so/sofia_sip/package.nix b/pkgs/by-name/so/sofia_sip/package.nix
index 07cea5843029..3b9229c8af57 100644
--- a/pkgs/by-name/so/sofia_sip/package.nix
+++ b/pkgs/by-name/so/sofia_sip/package.nix
@@ -90,5 +90,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/freeswitch/sofia-sip";
     platforms = platforms.unix;
     license = licenses.lgpl2;
+    teams = [ lib.teams.ngi ];
   };
 }

From 7469f463da761ab0e20d4a4eabdca4bd4f86f7ef Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 9 Oct 2025 16:03:45 +0200
Subject: [PATCH 0539/6226] sofia_sip: Modernise

- rec -> finalAttrs
- src.sha256 -> src.hash
- drop meta-wide "with lib"
- correct license to LGPL 2.1+
- use patch url with full indices, known issue with fetchpatch2
- add pkg-config information + test
- add passthru.updateScript
---
 pkgs/by-name/so/sofia_sip/package.nix | 34 ++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/so/sofia_sip/package.nix b/pkgs/by-name/so/sofia_sip/package.nix
index 3b9229c8af57..98b4dc63220a 100644
--- a/pkgs/by-name/so/sofia_sip/package.nix
+++ b/pkgs/by-name/so/sofia_sip/package.nix
@@ -3,6 +3,8 @@
   stdenv,
   fetchFromGitHub,
   fetchpatch2,
+  gitUpdater,
+  testers,
   autoconf,
   automake,
   check,
@@ -14,23 +16,23 @@
   zlib,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sofia-sip";
   version = "1.13.17";
 
   src = fetchFromGitHub {
     owner = "freeswitch";
     repo = "sofia-sip";
-    rev = "v${version}";
-    sha256 = "sha256-7QmK2UxEO5lC0KBDWB3bwKTy0Nc7WrdTLjoQYzezoaY=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-7QmK2UxEO5lC0KBDWB3bwKTy0Nc7WrdTLjoQYzezoaY=";
   };
 
   patches = [
     # Fix build with gcc 14 from https://github.com/freeswitch/sofia-sip/pull/249
     (fetchpatch2 {
       name = "sofia-sip-fix-incompatible-pointer-type.patch";
-      url = "https://github.com/freeswitch/sofia-sip/commit/46b02f0655af0a9594e805f09a8ee99278f84777.diff";
-      hash = "sha256-4uZVtKnXG+BPW8byjd7tu4uEZo9SYq9EzTEvMwG0Bak=";
+      url = "https://github.com/freeswitch/sofia-sip/commit/46b02f0655af0a9594e805f09a8ee99278f84777.patch?full_index=1";
+      hash = "sha256-bZzjg7GBxR2wSlPH81krZRCK43OirGLWH/lrLRZ0L0k=";
     })
 
     # Disable some failing tests
@@ -85,11 +87,25 @@ stdenv.mkDerivation rec {
 
   doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
 
-  meta = with lib; {
+  passthru = {
+    tests.pkg-config = testers.hasPkgConfigModules {
+      package = finalAttrs.finalPackage;
+      versionCheck = true;
+    };
+    updateScript = gitUpdater {
+      rev-prefix = "v";
+    };
+  };
+
+  meta = {
     description = "Open-source SIP User-Agent library, compliant with the IETF RFC3261 specification";
     homepage = "https://github.com/freeswitch/sofia-sip";
-    platforms = platforms.unix;
-    license = licenses.lgpl2;
+    platforms = lib.platforms.unix;
+    license = lib.licenses.lgpl2Plus;
     teams = [ lib.teams.ngi ];
+    pkgConfigModules = [
+      "sofia-sip-ua"
+      "sofia-sip-ua-glib"
+    ];
   };
-}
+})

From f3532534239cefd4d932a959b3465479bc473666 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Oct 2025 16:49:46 +0000
Subject: [PATCH 0540/6226] yatto: 0.18.1 -> 0.20.1

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

diff --git a/pkgs/by-name/ya/yatto/package.nix b/pkgs/by-name/ya/yatto/package.nix
index 4ce3cba28c97..496e8aa4df98 100644
--- a/pkgs/by-name/ya/yatto/package.nix
+++ b/pkgs/by-name/ya/yatto/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "yatto";
-  version = "0.18.1";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "handlebargh";
     repo = "yatto";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GI/Q9lI6SqIOSYi5shMKlgegS8WdlWSFsPs7WLCB6Qg=";
+    hash = "sha256-ZIGtRPy2DfMzCK0WHJcv75d2oeHd2Sh3twrV6G/m5SI=";
   };
 
-  vendorHash = "sha256-BqOuZUtyA7a8imzj3Oj1SUZ4k3kNjDYWiPlQRG9I0m8=";
+  vendorHash = "sha256-e+xv1mr8F3ODSsk67shJ+vI3isWcN3vaaqElUoDnvs0=";
 
   ldflags = [
     "-s"

From a867e5c24a87db1b576e592688893d7bad85cf36 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Oct 2025 19:49:07 +0000
Subject: [PATCH 0541/6226] kaniko: 1.25.2 -> 1.25.3

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

diff --git a/pkgs/by-name/ka/kaniko/package.nix b/pkgs/by-name/ka/kaniko/package.nix
index bd54ad7e5cc5..58a28848c36e 100644
--- a/pkgs/by-name/ka/kaniko/package.nix
+++ b/pkgs/by-name/ka/kaniko/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kaniko";
-  version = "1.25.2";
+  version = "1.25.3";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "kaniko";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-4P/NKwC32/hW4goUelnx28zY9bBD5Hbbz/y+S00rt7k=";
+    hash = "sha256-5KKRBAzyzmRbP/A5kOV6amUljLNCAmOMwp4jGg73fY8=";
   };
 
   vendorHash = null;

From 9d52e9b87a93db6ee5a21a91b042f185bee7c933 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Fri, 10 Oct 2025 05:05:10 +0900
Subject: [PATCH 0542/6226] somo: 1.2.0 -> 1.3.0

Diff: https://github.com/theopfr/somo/compare/v1.2.0...v1.3.0
---
 pkgs/by-name/so/somo/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/so/somo/package.nix b/pkgs/by-name/so/somo/package.nix
index d4cc7c9c9903..b12fd045d89b 100644
--- a/pkgs/by-name/so/somo/package.nix
+++ b/pkgs/by-name/so/somo/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "somo";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "theopfr";
     repo = "somo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QTW+hsoj8Wrv3BbFCB2aibR27Wu1MA/1gWzAXtPKWsM=";
+    hash = "sha256-k7PDCylA6KR/S1dQDSMIoOELPYwJ25dz1u+PM6ITGKg=";
   };
 
-  cargoHash = "sha256-xlAdEo11UV1Y49D1LjxH5Oykf/RUoe1w6ZcQpGhfqkk=";
+  cargoHash = "sha256-i3GmdBqCWPeslpr2zzOR4r8PgMP7EkC1mNFI7jSWO34=";
 
   nativeBuildInputs = [
     installShellFiles

From 6425c775651557988c0eab077bdc1240e0e8883e Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 9 Oct 2025 23:52:50 +0200
Subject: [PATCH 0543/6226] mkcal: 0.7.28 -> 0.7.29

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

diff --git a/pkgs/by-name/mk/mkcal/package.nix b/pkgs/by-name/mk/mkcal/package.nix
index c0ba8cd527f1..75c728dc95ae 100644
--- a/pkgs/by-name/mk/mkcal/package.nix
+++ b/pkgs/by-name/mk/mkcal/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mkcal";
-  version = "0.7.28";
+  version = "0.7.29";
 
   src = fetchFromGitHub {
     owner = "sailfishos";
     repo = "mkcal";
     tag = finalAttrs.version;
-    hash = "sha256-tL42f8egP/anB4jOaAjmIh7C2pQyR3fgTDJ1E9t8EWk=";
+    hash = "sha256-H7TWu6tTh1vBmFx7kRpyijLCg0xs+dYIEJAERBEGh8g=";
   };
 
   outputs = [

From 05d44c9629563c2abaec6bb4bb67e1ec9002d1fd Mon Sep 17 00:00:00 2001
From: Kylie McClain <kylie@somas.is>
Date: Thu, 9 Oct 2025 19:00:48 -0400
Subject: [PATCH 0544/6226] trurl: add upstream patch for tests failing with
 libcurl >= 8.15.0

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

diff --git a/pkgs/by-name/tr/trurl/package.nix b/pkgs/by-name/tr/trurl/package.nix
index 053e58c8b29d..8d0dcad7b22e 100644
--- a/pkgs/by-name/tr/trurl/package.nix
+++ b/pkgs/by-name/tr/trurl/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   curl,
   python3,
   perl,
@@ -20,6 +21,13 @@ stdenv.mkDerivation rec {
     hash = "sha256-VCMT4WgZ6LG7yiKaRy7KTgTkbACVXb4rw62lWnVAuP0=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/curl/trurl/commit/f22a2c45956f35702e437fb83ac05376f1956ec5.patch";
+      hash = "sha256-7CkUs5tMk77WKc7SlgE2NslHtU5cViKSGhHj3IBlpWo=";
+    })
+  ];
+
   postPatch = ''
     patchShebangs scripts/*
   '';

From 4512db9e451f81b70ac9787868b9b7dc5d0d939c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Oct 2025 23:13:43 +0000
Subject: [PATCH 0545/6226] nwjs-ffmpeg-prebuilt: 0.103.1 -> 0.104.1

---
 pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
index 914de43f062b..f36d41334af3 100644
--- a/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
+++ b/pkgs/by-name/nw/nwjs-ffmpeg-prebuilt/package.nix
@@ -7,7 +7,7 @@
 
 let
   bits = if stdenv.hostPlatform.is64bit then "x64" else "ia32";
-  version = "0.103.1";
+  version = "0.104.1";
 in
 stdenv.mkDerivation {
   pname = "nwjs-ffmpeg-prebuilt";
@@ -16,8 +16,8 @@ stdenv.mkDerivation {
   src =
     let
       hashes = {
-        "x64" = "sha256-/PN83C3i2wzxl76YuMXfPK5jsS+D04qMTWTgXoplv+E=";
-        "ia32" = "sha256-/PN83C3i2wzxl76YuMXfPK5jsS+D04qMTWTgXoplv+E=";
+        "x64" = "sha256-01hdumuWRAi1KdvwBDQJqUSk+NV5gYnn6QWQYj2FDUE=";
+        "ia32" = "sha256-01hdumuWRAi1KdvwBDQJqUSk+NV5gYnn6QWQYj2FDUE=";
       };
     in
     fetchurl {

From 7305fe5138268a5ffe3e10e5f92ebc57284fbd2a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Oct 2025 00:13:35 +0000
Subject: [PATCH 0546/6226] trelby: 2.4.15 -> 2.4.16.2

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

diff --git a/pkgs/by-name/tr/trelby/package.nix b/pkgs/by-name/tr/trelby/package.nix
index bce17334a878..d135f1c589a7 100644
--- a/pkgs/by-name/tr/trelby/package.nix
+++ b/pkgs/by-name/tr/trelby/package.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "trelby";
-  version = "2.4.15";
+  version = "2.4.16.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "trelby";
     repo = "trelby";
     tag = version;
-    hash = "sha256-CTasd+YlRHjYUVepZf2RDOuw1p0OdQfJENZamSmXXFw=";
+    hash = "sha256-YblilPQXjlSgkBstewfiuW0DZCnJw4dk6vZfEhdBGbk=";
   };
 
   build-system = [

From 9baf121641586a3a57e86599420e806f5bde2304 Mon Sep 17 00:00:00 2001
From: "Winterer, Mathis Aaron" <mrmagic223325@fedora.email>
Date: Fri, 10 Oct 2025 02:42:00 +0200
Subject: [PATCH 0547/6226] ibus-engines.table-chinese: 1.8.12 -> 1.8.14

---
 .../ibus-table-chinese/default.nix            | 24 ++++++-------------
 1 file changed, 7 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
index c87a32d9715d..da38f195e10d 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-table-chinese/default.nix
@@ -10,26 +10,16 @@
   writableTmpDirAsHomeHook,
 }:
 
-let
+stdenv.mkDerivation {
+  pname = "ibus-table-chinese";
+  version = "1.8.14";
+
   src = fetchFromGitHub {
     owner = "mike-fabian";
     repo = "ibus-table-chinese";
-    rev = "3a416012f3b898fe17225925f59d0672a8a0c0db";
-    sha256 = "sha256-KA4jRSlQ78IeP7od3VtgdR58Z/6psNkMCVwvg3vhFIM=";
+    rev = "44301450e681c23d60301747856c74b5b9d1312e";
+    sha256 = "sha256-CvODJhQTzqR58IlaL8cIP9Z1gcC8PfkfU0HWdq0Jjms=";
   };
-in
-stdenv.mkDerivation {
-  pname = "ibus-table-chinese";
-  version = "1.8.12";
-
-  inherit src;
-
-  postConfigure = ''
-    substituteInPlace cmake_install.cmake --replace-fail /var/empty $out
-    substituteInPlace CMakeLists.txt --replace-fail /var/empty $out
-  '';
-  # Fails otherwise with "no such file or directory: <table>.txt"
-  dontUseCmakeBuildDir = true;
 
   nativeBuildInputs = [
     cmake
@@ -46,7 +36,7 @@ stdenv.mkDerivation {
   meta = {
     isIbusEngine = true;
     description = "Chinese tables for IBus-Table";
-    homepage = "https://github.com/definite/ibus-table-chinese";
+    homepage = "https://github.com/mike-fabian/ibus-table-chinese";
     license = lib.licenses.gpl3;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ pneumaticat ];

From 71926b9fb9f4273e604a91f1aa6126a5e277ceae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Oct 2025 02:25:52 +0000
Subject: [PATCH 0548/6226] heimdall-proxy: 0.16.7 -> 0.17.2

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

diff --git a/pkgs/by-name/he/heimdall-proxy/package.nix b/pkgs/by-name/he/heimdall-proxy/package.nix
index f8ef29960c67..53d16ea56497 100644
--- a/pkgs/by-name/he/heimdall-proxy/package.nix
+++ b/pkgs/by-name/he/heimdall-proxy/package.nix
@@ -4,7 +4,7 @@
   lib,
 }:
 let
-  version = "0.16.7";
+  version = "0.17.2";
 in
 buildGoModule {
   pname = "heimdall-proxy";
@@ -15,10 +15,10 @@ buildGoModule {
     owner = "dadrus";
     repo = "heimdall";
     tag = "v${version}";
-    hash = "sha256-YFqaCXx/x2LfdqaJZFTGkK/k7qIRWKXA1t/KZeWLDGw=";
+    hash = "sha256-mSjxcf7Sbj6IVtO3ShVe/nrZgE+cJlx6JvOZ23WM7zQ=";
   };
 
-  vendorHash = "sha256-E/tdRS96rPWZHwtG22TFB1p7CUaFsya7nI8cAEuYvJo=";
+  vendorHash = "sha256-3DOuDZh1rLuBaNnEJTDw/DXtEv8jhPk4kq2dvX4Scp0=";
 
   tags = [ "sqlite" ];
 

From 0ba4f435e4d3a1e941d7d4eee667fb6b2032e91e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Oct 2025 07:51:42 +0000
Subject: [PATCH 0549/6226] benthos: 4.56.0 -> 4.57.1

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

diff --git a/pkgs/by-name/be/benthos/package.nix b/pkgs/by-name/be/benthos/package.nix
index 3ad7b9e939d0..ff134c25206c 100644
--- a/pkgs/by-name/be/benthos/package.nix
+++ b/pkgs/by-name/be/benthos/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "benthos";
-  version = "4.56.0";
+  version = "4.57.1";
 
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "benthos";
     tag = "v${version}";
-    hash = "sha256-TayHN6Vsp1mkDNqa6mc5HWGPIfyeJQdzOGBnE6SioZ0=";
+    hash = "sha256-OiXdeoxaik+ynoLSR/fWieLIhcx5Y/G1fY2aTL2yBFM=";
   };
 
   proxyVendor = true;

From 3cb9ae95839d79ade94123bf3ff22a2485f9a9ff Mon Sep 17 00:00:00 2001
From: dramforever <dramforever@live.com>
Date: Fri, 10 Oct 2025 15:47:09 +0800
Subject: [PATCH 0550/6226] python3Packages.inkex: Skip .inx file related tests

These fail on libxml2 >= 2.15 because schematron support is disabled.
These should not affect runtime functionality since it's just testing
that files in inkex are well-formed.
---
 pkgs/development/python-modules/inkex/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/inkex/default.nix b/pkgs/development/python-modules/inkex/default.nix
index 534aa8ae551d..2a77286bd94d 100644
--- a/pkgs/development/python-modules/inkex/default.nix
+++ b/pkgs/development/python-modules/inkex/default.nix
@@ -72,6 +72,9 @@ buildPythonPackage {
     "tests/test_inkex_gui_window.py"
     # Failed to find pixmap 'image-missing' in /build/source/tests/data/
     "tests/test_inkex_gui_pixmaps.py"
+    # Fails with libxml2 >= 2.15 with "lxml.etree was compiled without Schematron support"
+    "inkex/tester/test_inx_file.py"
+    "tests/test_inkex_inx.py"
   ];
 
   postPatch = ''

From e5161a15c9cf7584e38e81be60668e7ec02f9b90 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Fri, 10 Oct 2025 16:20:24 +0800
Subject: [PATCH 0551/6226] gpt-box: 1.0.385 -> 1.0.395

---
 pkgs/by-name/gp/gpt-box/gitHashes.json      |   7 +
 pkgs/by-name/gp/gpt-box/package.nix         |  46 +-
 pkgs/by-name/gp/gpt-box/pubspec.lock.json   | 452 +++++++-------------
 pkgs/by-name/gp/gpt-box/update-gitHashes.py |  51 +++
 4 files changed, 234 insertions(+), 322 deletions(-)
 create mode 100644 pkgs/by-name/gp/gpt-box/gitHashes.json
 create mode 100755 pkgs/by-name/gp/gpt-box/update-gitHashes.py

diff --git a/pkgs/by-name/gp/gpt-box/gitHashes.json b/pkgs/by-name/gp/gpt-box/gitHashes.json
new file mode 100644
index 000000000000..4057674c0541
--- /dev/null
+++ b/pkgs/by-name/gp/gpt-box/gitHashes.json
@@ -0,0 +1,7 @@
+{
+  "computer": "sha256-qaD6jn78zDyZBktwJ4WTQa8oCvCWQJOBDaozBVsXNb8=",
+  "fl_build": "sha256-CSKe2yEIisftM0q79HbDTghShirWg02zi9v+hD5R57g=",
+  "fl_lib": "sha256-GFgDSkAI5alBxngm8y8A5oXfWgyuleNjnM4bsgYUlSs=",
+  "flutter_highlight": "sha256-jSATD4Ww5FHEscGNiTN/FE1+iQHzg/XMbsC9f5XcNGw=",
+  "openai_dart": "sha256-FP8J8ul8F68vrEdEZAmzNS921evtRfCIOlV2Aubifaw="
+}
diff --git a/pkgs/by-name/gp/gpt-box/package.nix b/pkgs/by-name/gp/gpt-box/package.nix
index da5a0cf3dae0..1ff42ea9d5b5 100644
--- a/pkgs/by-name/gp/gpt-box/package.nix
+++ b/pkgs/by-name/gp/gpt-box/package.nix
@@ -6,33 +6,28 @@
   copyDesktopItems,
   makeDesktopItem,
   runCommand,
-  yq,
-  gpt-box,
+  yq-go,
   _experimental-update-script-combinators,
-  gitUpdater,
+  nix-update-script,
 }:
 
-flutter329.buildFlutterApplication rec {
-  pname = "gpt-box";
-  version = "1.0.385";
+let
+  version = "1.0.395";
 
   src = fetchFromGitHub {
     owner = "lollipopkit";
     repo = "flutter_gpt_box";
     tag = "v${version}";
-    hash = "sha256-gl8kANxZLNXSuZxcK9WqfXxVWsCpZCbV+qmSt2ZnI6E=";
+    hash = "sha256-YtrsN8CdbCvbzfex8bCUUfqfTfyhhZfmweydaRSn1J4=";
   };
+in
+flutter329.buildFlutterApplication {
+  pname = "gpt-box";
+  inherit version src;
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
-  gitHashes = {
-    computer = "sha256-qaD6jn78zDyZBktwJ4WTQa8oCvCWQJOBDaozBVsXNb8=";
-    fl_build = "sha256-CSKe2yEIisftM0q79HbDTghShirWg02zi9v+hD5R57g=";
-    fl_lib = "sha256-gAZqxPOBMXfy0mHEd7Jud0QJwyRbqC4nIRDIA81TZxM=";
-    flutter_highlight = "sha256-jSATD4Ww5FHEscGNiTN/FE1+iQHzg/XMbsC9f5XcNGw=";
-    openai_dart = "sha256-FP8J8ul8F68vrEdEZAmzNS921evtRfCIOlV2Aubifaw=";
-    webdav_client = "sha256-aTkMcrXksHLEG4UpeE1MBmCKpX5l11+y/p4tICrOTGk=";
-  };
+  gitHashes = lib.importJSON ./gitHashes.json;
 
   nativeBuildInputs = [
     copyDesktopItems
@@ -57,22 +52,31 @@ flutter329.buildFlutterApplication rec {
   ];
 
   postInstall = ''
-    install -Dm0644 assets/app_icon.png $out/share/pixmaps/gpt-box.png
+    install -D --mode=0644 assets/app_icon.png $out/share/pixmaps/gpt-box.png
   '';
 
   passthru = {
     pubspecSource =
       runCommand "pubspec.lock.json"
         {
-          nativeBuildInputs = [ yq ];
-          inherit (gpt-box) src;
+          inherit src;
+          nativeBuildInputs = [ yq-go ];
         }
         ''
-          cat $src/pubspec.lock | yq > $out
+          yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out"
         '';
     updateScript = _experimental-update-script-combinators.sequence [
-      (gitUpdater { rev-prefix = "v"; })
-      (_experimental-update-script-combinators.copyAttrOutputToFile "gpt-box.pubspecSource" ./pubspec.lock.json)
+      (nix-update-script { })
+      (
+        (_experimental-update-script-combinators.copyAttrOutputToFile "gpt-box.pubspecSource" ./pubspec.lock.json)
+        // {
+          supportedFeatures = [ ];
+        }
+      )
+      {
+        command = [ ./update-gitHashes.py ];
+        supportedFeatures = [ ];
+      }
     ];
   };
 
diff --git a/pkgs/by-name/gp/gpt-box/pubspec.lock.json b/pkgs/by-name/gp/gpt-box/pubspec.lock.json
index a8439eea8bfd..a81fb020dc8a 100644
--- a/pkgs/by-name/gp/gpt-box/pubspec.lock.json
+++ b/pkgs/by-name/gp/gpt-box/pubspec.lock.json
@@ -1,15 +1,5 @@
 {
   "packages": {
-    "_discoveryapis_commons": {
-      "dependency": "transitive",
-      "description": {
-        "name": "_discoveryapis_commons",
-        "sha256": "113c4100b90a5b70a983541782431b82168b3cae166ab130649c36eb3559d498",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.7"
-    },
     "_fe_analyzer_shared": {
       "dependency": "transitive",
       "description": {
@@ -90,31 +80,31 @@
       "dependency": "transitive",
       "description": {
         "name": "archive",
-        "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
+        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.6.1"
+      "version": "4.0.7"
     },
     "args": {
       "dependency": "transitive",
       "description": {
         "name": "args",
-        "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.0"
+      "version": "2.7.0"
     },
     "asn1lib": {
       "dependency": "transitive",
       "description": {
         "name": "asn1lib",
-        "sha256": "1c296cd268f486cabcc3930e9b93a8133169305f18d722916e675959a88f6d2c",
+        "sha256": "0511d6be23b007e95105ae023db599aea731df604608978dada7f9faf2637623",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.9"
+      "version": "1.6.4"
     },
     "async": {
       "dependency": "transitive",
@@ -210,11 +200,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2",
+        "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.9.3"
+      "version": "8.9.5"
     },
     "camera": {
       "dependency": "transitive",
@@ -230,31 +220,31 @@
       "dependency": "transitive",
       "description": {
         "name": "camera_android_camerax",
-        "sha256": "7cc6adf1868bdcf4e63a56b24b41692dfbad2bec1cdceea451c77798f6a605c3",
+        "sha256": "f0dcbce91623f75030840609de9b64d0d73f86df279c6e9588c1501245a05eb2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.13"
+      "version": "0.6.15+2"
     },
     "camera_avfoundation": {
       "dependency": "transitive",
       "description": {
         "name": "camera_avfoundation",
-        "sha256": "1eeb9ce7c9a397e312343fd7db337d95f35c3e65ad5a62ff637c8abce5102b98",
+        "sha256": "a33cd9a250296271cdf556891b7c0986a93772426f286595eccd5f45b185933c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.18+8"
+      "version": "0.9.18+14"
     },
     "camera_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "camera_platform_interface",
-        "sha256": "953e7baed3a7c8fae92f7200afeb2be503ff1a17c3b4e4ed7b76f008c2810a31",
+        "sha256": "2f757024a48696ff4814a789b0bd90f5660c0fb25f393ab4564fb483327930e2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.9.0"
+      "version": "2.10.0"
     },
     "camera_web": {
       "dependency": "transitive",
@@ -306,16 +296,6 @@
       "source": "hosted",
       "version": "2.3.2"
     },
-    "cli_util": {
-      "dependency": "transitive",
-      "description": {
-        "name": "cli_util",
-        "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.2"
-    },
     "clock": {
       "dependency": "transitive",
       "description": {
@@ -330,11 +310,11 @@
       "dependency": "transitive",
       "description": {
         "name": "cloudflare_turnstile",
-        "sha256": "c7f37c7327d3f03b528a2334a5131c352ce62a545254e557693227a207801dc7",
+        "sha256": "d13cbec55a1c4916bca1d4dbd84fbe7b655ae35a264513750fdb8250486269e0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.3.1"
     },
     "code_builder": {
       "dependency": "transitive",
@@ -367,16 +347,6 @@
       "source": "git",
       "version": "3.2.1"
     },
-    "console": {
-      "dependency": "transitive",
-      "description": {
-        "name": "console",
-        "sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.1.0"
-    },
     "convert": {
       "dependency": "transitive",
       "description": {
@@ -441,11 +411,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dio_web_adapter",
-        "sha256": "e485c7a39ff2b384fa1d7e09b4e25f755804de8384358049124830b04fc4f93a",
+        "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.1.1"
     },
     "encrypt": {
       "dependency": "transitive",
@@ -471,21 +441,21 @@
       "dependency": "direct main",
       "description": {
         "name": "extended_image",
-        "sha256": "85199f9233e03abc2ce2e68cbb2991648666af4a527ae4e6250935be8edfddae",
+        "sha256": "f6cbb1d798f51262ed1a3d93b4f1f2aa0d76128df39af18ecb77fa740f88b2e0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.1.0"
+      "version": "10.0.1"
     },
     "extended_image_library": {
       "dependency": "transitive",
       "description": {
         "name": "extended_image_library",
-        "sha256": "e61dafd94400fff6ef7ed1523d445ff3af137f198f3228e4a3107bc5b4bec5d1",
+        "sha256": "ae468c31c375064964de11cbb31310a58c4462df6e3bae1a0bc0066f586795d5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.6"
+      "version": "5.0.0"
     },
     "fake_async": {
       "dependency": "transitive",
@@ -497,26 +467,6 @@
       "source": "hosted",
       "version": "1.3.2"
     },
-    "fetch_api": {
-      "dependency": "transitive",
-      "description": {
-        "name": "fetch_api",
-        "sha256": "97f46c25b480aad74f7cc2ad7ccba2c5c6f08d008e68f95c1077286ce243d0e6",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.2.0"
-    },
-    "fetch_client": {
-      "dependency": "transitive",
-      "description": {
-        "name": "fetch_client",
-        "sha256": "9666ee14536778474072245ed5cba07db81ae8eb5de3b7bf4a2d1e2c49696092",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.2"
-    },
     "ffi": {
       "dependency": "transitive",
       "description": {
@@ -541,11 +491,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "ab13ae8ef5580a411c458d6207b6774a6c237d77ac37011b13994879f68a8810",
+        "sha256": "09b474c0c8117484b80cbebc043801ff91e05cfbd2874d512825c899e1754694",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.3.7"
+      "version": "9.2.3"
     },
     "file_selector_linux": {
       "dependency": "transitive",
@@ -612,8 +562,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "v1.0.244",
-        "resolved-ref": "5104bf4a32003ef76877555f58a2986c0646ead3",
+        "ref": "v1.0.268",
+        "resolved-ref": "88908c4e838b15e1bde5b2685ccd016b7578e8a4",
         "url": "https://github.com/lppcg/fl_lib"
       },
       "source": "git",
@@ -625,46 +575,6 @@
       "source": "sdk",
       "version": "0.0.0"
     },
-    "flutter_app_builder": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_app_builder",
-        "sha256": "74018c0e2da3ae33073e7417b5c8e900fdc7b5ebc3bdacd2dd05244d9b5e54cb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.5"
-    },
-    "flutter_app_packager": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_app_packager",
-        "sha256": "3925c4e2ac53f4a5ce3bae1a5f54966620504d6c28725b112074cfbdf227a36b",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.5"
-    },
-    "flutter_app_publisher": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_app_publisher",
-        "sha256": "bbb1953ef723fc98a7f974ae9499194999f570194c6d856182518e6e73b51ff2",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.5"
-    },
-    "flutter_distributor": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "flutter_distributor",
-        "sha256": "45d27526a5de93370e322da5314b0a1c07c024b79031a8ad44435046915fa0e8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.5"
-    },
     "flutter_highlight": {
       "dependency": "direct main",
       "description": {
@@ -776,11 +686,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_markdown",
-        "sha256": "e7bbc718adc9476aa14cfddc1ef048d2e21e4e8f18311aaac723266db9f9e7b5",
+        "sha256": "634622a3a826d67cb05c0e3e576d1812c430fa98404e95b60b131775c73d76ec",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.6+2"
+      "version": "0.7.7"
     },
     "flutter_markdown_latex": {
       "dependency": "transitive",
@@ -806,31 +716,41 @@
       "dependency": "direct dev",
       "description": {
         "name": "flutter_native_splash",
-        "sha256": "7062602e0dbd29141fb8eb19220b5871ca650be5197ab9c1f193a28b17537bc7",
+        "sha256": "8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.4"
+      "version": "2.4.6"
     },
     "flutter_plugin_android_lifecycle": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e",
+        "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.24"
+      "version": "2.0.28"
+    },
+    "flutter_riverpod": {
+      "dependency": "transitive",
+      "description": {
+        "name": "flutter_riverpod",
+        "sha256": "9532ee6db4a943a1ed8383072a2e3eeda041db5657cdf6d2acecf3c21ecbe7e1",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.6.1"
     },
     "flutter_svg": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_svg",
-        "sha256": "c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b",
+        "sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.17"
+      "version": "2.1.0"
     },
     "flutter_test": {
       "dependency": "direct dev",
@@ -844,8 +764,18 @@
       "source": "sdk",
       "version": "0.0.0"
     },
+    "freezed": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "freezed",
+        "sha256": "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.5.7"
+    },
     "freezed_annotation": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "freezed_annotation",
         "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2",
@@ -864,16 +794,6 @@
       "source": "hosted",
       "version": "4.0.0"
     },
-    "get_it": {
-      "dependency": "transitive",
-      "description": {
-        "name": "get_it",
-        "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.7.0"
-    },
     "glob": {
       "dependency": "transitive",
       "description": {
@@ -894,36 +814,6 @@
       "source": "hosted",
       "version": "6.2.1"
     },
-    "google_identity_services_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "google_identity_services_web",
-        "sha256": "55580f436822d64c8ff9a77e37d61f5fb1e6c7ec9d632a43ee324e2a05c3c6c9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.3.3"
-    },
-    "googleapis": {
-      "dependency": "transitive",
-      "description": {
-        "name": "googleapis",
-        "sha256": "864f222aed3f2ff00b816c675edf00a39e2aaf373d728d8abec30b37bee1a81c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "13.2.0"
-    },
-    "googleapis_auth": {
-      "dependency": "transitive",
-      "description": {
-        "name": "googleapis_auth",
-        "sha256": "befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.6.0"
-    },
     "graphs": {
       "dependency": "transitive",
       "description": {
@@ -988,11 +878,11 @@
       "dependency": "direct main",
       "description": {
         "name": "html",
-        "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec",
+        "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.15.5"
+      "version": "0.15.6"
     },
     "http": {
       "dependency": "transitive",
@@ -1058,11 +948,11 @@
       "dependency": "direct main",
       "description": {
         "name": "image",
-        "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d",
+        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.3.0"
+      "version": "4.5.4"
     },
     "image_picker": {
       "dependency": "direct main",
@@ -1078,11 +968,11 @@
       "dependency": "transitive",
       "description": {
         "name": "image_picker_android",
-        "sha256": "82652a75e3dd667a91187769a6a2cc81bd8c111bbead698d8e938d2b63e5e89a",
+        "sha256": "317a5d961cec5b34e777b9252393f2afbd23084aa6e60fcf601dcf6341b9ebeb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+21"
+      "version": "0.8.12+23"
     },
     "image_picker_for_web": {
       "dependency": "transitive",
@@ -1108,11 +998,11 @@
       "dependency": "transitive",
       "description": {
         "name": "image_picker_linux",
-        "sha256": "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa",
+        "sha256": "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.1+2"
     },
     "image_picker_macos": {
       "dependency": "transitive",
@@ -1234,16 +1124,6 @@
       "source": "hosted",
       "version": "5.1.1"
     },
-    "liquid_engine": {
-      "dependency": "transitive",
-      "description": {
-        "name": "liquid_engine",
-        "sha256": "41ae12d5a72451c3efb8d4e7b901cdf0537917597bc7e7376e9b0a237f92df29",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.2"
-    },
     "local_auth": {
       "dependency": "transitive",
       "description": {
@@ -1258,11 +1138,11 @@
       "dependency": "transitive",
       "description": {
         "name": "local_auth_android",
-        "sha256": "6763aaf8965f21822624cb2fd3c03d2a8b3791037b5efb0fe4b13e110f5afc92",
+        "sha256": "63ad7ca6396290626dc0cb34725a939e4cfe965d80d36112f08d49cf13a8136e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.46"
+      "version": "1.0.49"
     },
     "local_auth_darwin": {
       "dependency": "transitive",
@@ -1374,26 +1254,6 @@
       "source": "hosted",
       "version": "2.0.0"
     },
-    "msix": {
-      "dependency": "transitive",
-      "description": {
-        "name": "msix",
-        "sha256": "c50d6bd1aafe0d071a3c1e5a5ccb056404502935cb0a549e3178c4aae16caf33",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.16.8"
-    },
-    "mustache_template": {
-      "dependency": "transitive",
-      "description": {
-        "name": "mustache_template",
-        "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.0"
-    },
     "nested": {
       "dependency": "transitive",
       "description": {
@@ -1407,32 +1267,23 @@
     "openai_dart": {
       "dependency": "direct main",
       "description": {
-        "name": "openai_dart",
-        "sha256": "1cc5ed0915fa7572b943de01cfa7a3e5cfe1e6a7f4d0d9a9374d046518e84575",
-        "url": "https://pub.dev"
+        "path": "packages/openai_dart",
+        "ref": "v1.0.744",
+        "resolved-ref": "ceb38486df0a49fddb4cb5a3283e566d4462f8ac",
+        "url": "https://github.com/lollipopkit/langchain_dart"
       },
-      "source": "hosted",
+      "source": "git",
       "version": "0.4.5"
     },
     "package_config": {
       "dependency": "transitive",
       "description": {
         "name": "package_config",
-        "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
-    },
-    "parse_app_package": {
-      "dependency": "transitive",
-      "description": {
-        "name": "parse_app_package",
-        "sha256": "69f313fbadf457576015333a8da2e99018763dce88df248febcfb8883da8aedb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.4.5"
+      "version": "2.2.0"
     },
     "path": {
       "dependency": "transitive",
@@ -1468,11 +1319,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2",
+        "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.15"
+      "version": "2.2.17"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
@@ -1534,16 +1385,6 @@
       "source": "hosted",
       "version": "3.1.6"
     },
-    "plist_parser": {
-      "dependency": "transitive",
-      "description": {
-        "name": "plist_parser",
-        "sha256": "e2a6f9abfa0c45c0253656b7360abb0dfb84af9937bace74605b93d2aad2bf0c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.0.11"
-    },
     "plugin_platform_interface": {
       "dependency": "transitive",
       "description": {
@@ -1574,35 +1415,45 @@
       "source": "hosted",
       "version": "1.5.1"
     },
+    "posix": {
+      "dependency": "transitive",
+      "description": {
+        "name": "posix",
+        "sha256": "f0d7856b6ca1887cfa6d1d394056a296ae33489db914e365e2044fdada449e62",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.2"
+    },
     "pretty_qr_code": {
       "dependency": "transitive",
       "description": {
         "name": "pretty_qr_code",
-        "sha256": "cbdb4af29da1c1fa21dd76f809646c591320ab9e435d3b0eab867492d43607d5",
+        "sha256": "b078bd5d51956dea4342378af1b092ad962b81bdbb55b10fffce03461da8db74",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.3.0"
+      "version": "3.4.0"
     },
     "provider": {
       "dependency": "transitive",
       "description": {
         "name": "provider",
-        "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c",
+        "sha256": "489024f942069c2920c844ee18bb3d467c69e48955a4f32d1677f71be103e310",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.2"
+      "version": "6.1.4"
     },
     "pub_semver": {
       "dependency": "transitive",
       "description": {
         "name": "pub_semver",
-        "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.5"
+      "version": "2.2.0"
     },
     "pubspec_parse": {
       "dependency": "transitive",
@@ -1614,16 +1465,6 @@
       "source": "hosted",
       "version": "1.5.0"
     },
-    "qiniu_sdk_base": {
-      "dependency": "transitive",
-      "description": {
-        "name": "qiniu_sdk_base",
-        "sha256": "2506c6372512f81cfbddf162ea6da1ad7b1c6521dee1d10e9da6847c92e13349",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.5.2"
-    },
     "qr": {
       "dependency": "transitive",
       "description": {
@@ -1644,15 +1485,25 @@
       "source": "hosted",
       "version": "0.9.11"
     },
-    "recase": {
+    "riverpod": {
       "dependency": "transitive",
       "description": {
-        "name": "recase",
-        "sha256": "e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213",
+        "name": "riverpod",
+        "sha256": "59062512288d3056b2321804332a13ffdd1bf16df70dcc8e506e411280a72959",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.1.0"
+      "version": "2.6.1"
+    },
+    "riverpod_annotation": {
+      "dependency": "transitive",
+      "description": {
+        "name": "riverpod_annotation",
+        "sha256": "e14b0bf45b71326654e2705d462f21b958f987087be850afd60578fcd502d1b8",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.6.1"
     },
     "screen_retriever": {
       "dependency": "transitive",
@@ -1738,21 +1589,21 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences",
-        "sha256": "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a",
+        "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.2"
+      "version": "2.5.3"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "a768fc8ede5f0c8e6150476e14f38e2417c0864ca36bb4582be8e21925a03c22",
+        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.6"
+      "version": "2.4.10"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -1824,26 +1675,6 @@
       "source": "hosted",
       "version": "3.0.0"
     },
-    "shell_executor": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shell_executor",
-        "sha256": "9c024546fc96470a6b96be9902f0bc05347a017a7638ed8d93c77e8d77eb3c3c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.6"
-    },
-    "shell_uikit": {
-      "dependency": "transitive",
-      "description": {
-        "name": "shell_uikit",
-        "sha256": "03703090807091514ace2f9c8dc5d9b2d18c42a248c767220167825fbc3d2747",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.1"
-    },
     "shortid": {
       "dependency": "direct main",
       "description": {
@@ -1890,6 +1721,16 @@
       "source": "hosted",
       "version": "1.10.1"
     },
+    "sprintf": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sprintf",
+        "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "7.0.0"
+    },
     "stack_trace": {
       "dependency": "transitive",
       "description": {
@@ -1900,6 +1741,16 @@
       "source": "hosted",
       "version": "1.12.1"
     },
+    "state_notifier": {
+      "dependency": "transitive",
+      "description": {
+        "name": "state_notifier",
+        "sha256": "b8677376aa54f2d7c58280d5a007f9e8774f1968d1fb1c096adcb4792fba29bb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
     "stream_channel": {
       "dependency": "transitive",
       "description": {
@@ -2004,21 +1855,21 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193",
+        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.14"
+      "version": "6.3.16"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626",
+        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.2"
+      "version": "6.3.3"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
@@ -2054,11 +1905,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9",
+        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.1"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
@@ -2074,11 +1925,11 @@
       "dependency": "transitive",
       "description": {
         "name": "uuid",
-        "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313",
+        "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.7"
+      "version": "4.5.1"
     },
     "vector_graphics": {
       "dependency": "transitive",
@@ -2144,52 +1995,51 @@
       "dependency": "transitive",
       "description": {
         "name": "web",
-        "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "web_socket": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket",
-        "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
+        "sha256": "bfe6f435f6ec49cb6c01da1e275ae4228719e59a6b067048c51e72d9d63bcc4b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.6"
+      "version": "1.0.0"
     },
     "web_socket_channel": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket_channel",
-        "sha256": "0b8e2457400d8a859b7b2030786835a28a8e80836ef64402abef392ff4f1d0e5",
+        "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.2"
+      "version": "3.0.3"
     },
-    "webdav_client": {
+    "webdav_client_plus": {
       "dependency": "direct main",
       "description": {
-        "path": ".",
-        "ref": "v1.0.66",
-        "resolved-ref": "1908cd0f4909730d9ae4d4fc4c05fb2576b3f674",
-        "url": "https://github.com/lollipopkit/webdav_client"
+        "name": "webdav_client_plus",
+        "sha256": "0f992fe05a46674a800d9fd8fdc5c54952ff739da155c558776a62ca0c2bed3a",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "1.2.2"
+      "source": "hosted",
+      "version": "1.0.2"
     },
     "win32": {
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "b89e6e24d1454e149ab20fbb225af58660f0c0bf4475544650700d8e2da54aef",
+        "sha256": "dc6ecaa00a7c708e5b4d10ee7bec8c270e9276dfcab1783f57e9962d7884305f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.11.0"
+      "version": "5.12.0"
     },
     "window_manager": {
       "dependency": "transitive",
@@ -2244,6 +2094,6 @@
   },
   "sdks": {
     "dart": ">=3.7.0 <4.0.0",
-    "flutter": ">=3.27.0"
+    "flutter": ">=3.29.0"
   }
 }
diff --git a/pkgs/by-name/gp/gpt-box/update-gitHashes.py b/pkgs/by-name/gp/gpt-box/update-gitHashes.py
new file mode 100755
index 000000000000..ffa6feb66653
--- /dev/null
+++ b/pkgs/by-name/gp/gpt-box/update-gitHashes.py
@@ -0,0 +1,51 @@
+#! /usr/bin/env nix-shell
+#! nix-shell -i python3 -p python3 nix-prefetch-git
+
+import json
+import subprocess
+import sys
+from pathlib import Path
+
+THIS_FOLDER = Path(__file__).parent.resolve()
+PUBSPEC_LOCK = THIS_FOLDER / "pubspec.lock.json"
+GIT_HASHES = THIS_FOLDER / "gitHashes.json"
+
+
+def fetch_git_hash(url: str, rev: str) -> str:
+    result = subprocess.run(
+        ["nix-prefetch-git", "--url", url, "--rev", rev],
+        capture_output=True,
+        text=True,
+        check=True,
+    )
+    return json.loads(result.stdout)["hash"]
+
+
+def main() -> None:
+    if not PUBSPEC_LOCK.exists():
+        sys.exit(1)
+    try:
+        data = json.loads(PUBSPEC_LOCK.read_text())
+    except json.JSONDecodeError:
+        sys.exit(1)
+    output: dict[str, str] = {}
+    for name, info in data.get("packages", {}).items():
+        if info.get("source") != "git":
+            continue
+        desc = info.get("description")
+        if not isinstance(desc, dict):
+            continue
+        url = desc.get("url")
+        rev = desc.get("resolved-ref")
+        if not (isinstance(url, str) and isinstance(rev, str)):
+            continue
+        try:
+            package_hash = fetch_git_hash(url, rev)
+        except subprocess.CalledProcessError:
+            continue
+        output[name] = package_hash
+    GIT_HASHES.write_text(json.dumps(output, indent=2) + "\n")
+
+
+if __name__ == "__main__":
+    main()

From fc413468e2462df619f56865dfe6babdac55b453 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Oct 2025 08:54:46 +0000
Subject: [PATCH 0552/6226] jbang: 0.131.0 -> 0.132.1

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

diff --git a/pkgs/by-name/jb/jbang/package.nix b/pkgs/by-name/jb/jbang/package.nix
index e9dccd39497f..06d7246a7a37 100644
--- a/pkgs/by-name/jb/jbang/package.nix
+++ b/pkgs/by-name/jb/jbang/package.nix
@@ -9,12 +9,12 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "0.131.0";
+  version = "0.132.1";
   pname = "jbang";
 
   src = fetchzip {
     url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar";
-    sha256 = "sha256-Vp7iCO77JWQzPHcF0i5st5TBv1bqjbwnhGHk3+sIr2A=";
+    sha256 = "sha256-+JqToH2DHfExu0HtGK1M/YobgjTApWxyp9Hp6VjdRvI=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 3ae1d01a8049103ffebfd1a8463341a0ecce756d Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Fri, 10 Oct 2025 17:22:58 +0800
Subject: [PATCH 0553/6226] alisthelper: 0.2.0-unstable-2025-01-04 ->
 0.2.0-unstable-2025-08-05

---
 pkgs/by-name/al/alisthelper/package.nix       |  52 +--
 pkgs/by-name/al/alisthelper/pubspec.lock.json | 394 ++++++++----------
 2 files changed, 211 insertions(+), 235 deletions(-)

diff --git a/pkgs/by-name/al/alisthelper/package.nix b/pkgs/by-name/al/alisthelper/package.nix
index beb88f6738b6..e13e899ed337 100644
--- a/pkgs/by-name/al/alisthelper/package.nix
+++ b/pkgs/by-name/al/alisthelper/package.nix
@@ -1,37 +1,34 @@
 {
   lib,
+  flutter332,
   fetchFromGitHub,
-  flutter327,
-  libayatana-appindicator,
   copyDesktopItems,
+  libayatana-appindicator,
   makeDesktopItem,
   runCommand,
-  yq,
-  alisthelper,
+  yq-go,
   _experimental-update-script-combinators,
-  gitUpdater,
+  nix-update-script,
 }:
 
-flutter327.buildFlutterApplication {
-  pname = "alisthelper";
-  version = "0.2.0-unstable-2025-01-04";
-
+let
   src = fetchFromGitHub {
     owner = "Xmarmalade";
     repo = "alisthelper";
-    rev = "181a1207df0c9eb8336097b9a9249342dd9df097";
-    hash = "sha256-6FJd+8eJoRK3cEdkLCgr7q4L6kEeSsMMkiVRx6Pa5jk=";
+    rev = "84a4f025ce184eb9cd910b90397eef8edaa95127";
+    hash = "sha256-Ju7AnUq59sk15YCvXhunr5r2/e2i26lWF3+pVY3oWzo=";
   };
+in
+flutter332.buildFlutterApplication {
+  pname = "alisthelper";
+  version = "0.2.0-unstable-2025-08-05";
+  inherit src;
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
-  nativeBuildInputs = [
-    copyDesktopItems
-  ];
+  nativeBuildInputs = [ copyDesktopItems ];
 
-  buildInputs = [
-    libayatana-appindicator
-  ];
+  buildInputs = [ libayatana-appindicator ];
 
   preBuild = ''
     packageRun build_runner build
@@ -47,30 +44,35 @@ flutter327.buildFlutterApplication {
   ];
 
   postInstall = ''
-    install -Dm644 assets/alisthelper.png -t $out/share/pixmaps
+    install -D --mode=0644 assets/alisthelper.png -t $out/share/pixmaps
   '';
 
   passthru = {
     pubspecSource =
       runCommand "pubspec.lock.json"
         {
-          buildInputs = [ yq ];
-          inherit (alisthelper) src;
+          inherit src;
+          nativeBuildInputs = [ yq-go ];
         }
         ''
-          cat $src/pubspec.lock | yq > $out
+          yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out"
         '';
     updateScript = _experimental-update-script-combinators.sequence [
-      (gitUpdater { rev-prefix = "v"; })
-      (_experimental-update-script-combinators.copyAttrOutputToFile "alisthelper.pubspecSource" ./pubspec.lock.json)
+      (nix-update-script { extraArgs = [ "--version=branch" ]; })
+      (
+        (_experimental-update-script-combinators.copyAttrOutputToFile "alisthelper.pubspecSource" ./pubspec.lock.json)
+        // {
+          supportedFeatures = [ ];
+        }
+      )
     ];
   };
 
   meta = {
-    description = "Designed to simplify the use of the desktop version of alist";
+    description = "Designed to simplify the use of the desktop version of alist/openlist";
     homepage = "https://github.com/Xmarmalade/alisthelper";
     mainProgram = "alisthelper";
-    license = with lib.licenses; [ gpl3Plus ];
+    license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/al/alisthelper/pubspec.lock.json b/pkgs/by-name/al/alisthelper/pubspec.lock.json
index 44d75b9d3915..593c5f3943b6 100644
--- a/pkgs/by-name/al/alisthelper/pubspec.lock.json
+++ b/pkgs/by-name/al/alisthelper/pubspec.lock.json
@@ -4,87 +4,81 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab",
+        "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "76.0.0"
-    },
-    "_macros": {
-      "dependency": "transitive",
-      "description": "dart",
-      "source": "sdk",
-      "version": "0.3.3"
+      "version": "85.0.0"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e",
+        "sha256": "f4ad0fea5f102201015c9aae9d93bc02f75dd9491529a8c21f88d17a8523d44c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.11.0"
+      "version": "7.6.0"
     },
     "analyzer_plugin": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer_plugin",
-        "sha256": "9661b30b13a685efaee9f02e5d01ed9f2b423bd889d28a304d02d704aee69161",
+        "sha256": "a5ab7590c27b779f3d4de67f31c4109dbe13dd7339f86461a6f2a8ab2594d8ce",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.11.3"
+      "version": "0.13.4"
     },
     "archive": {
       "dependency": "direct main",
       "description": {
         "name": "archive",
-        "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
+        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.6.1"
+      "version": "4.0.7"
     },
     "args": {
       "dependency": "transitive",
       "description": {
         "name": "args",
-        "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.0"
+      "version": "2.7.0"
     },
     "async": {
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.11.0"
+      "version": "2.13.0"
     },
     "boolean_selector": {
       "dependency": "transitive",
       "description": {
         "name": "boolean_selector",
-        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.1.2"
     },
     "build": {
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0",
+        "sha256": "7d95cbbb1526ab5ae977df9b4cc660963b9b27f6d1075c0b34653868911385e4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "3.0.0"
     },
     "build_config": {
       "dependency": "transitive",
@@ -100,41 +94,41 @@
       "dependency": "transitive",
       "description": {
         "name": "build_daemon",
-        "sha256": "294a2edaf4814a378725bfe6358210196f5ea37af89ecd81bfa32960113d4948",
+        "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.3"
+      "version": "4.0.4"
     },
     "build_resolvers": {
       "dependency": "transitive",
       "description": {
         "name": "build_resolvers",
-        "sha256": "99d3980049739a985cf9b21f30881f46db3ebc62c5b8d5e60e27440876b1ba1e",
+        "sha256": "38c9c339333a09b090a638849a4c56e70a404c6bdd3b511493addfbc113b60c2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.3"
+      "version": "3.0.0"
     },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "74691599a5bc750dc96a6b4bfd48f7d9d66453eab04c7f4063134800d6a5c573",
+        "sha256": "b971d4a1c789eba7be3e6fe6ce5e5b50fd3719e3cb485b3fad6d04358304351d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.14"
+      "version": "2.6.0"
     },
     "build_runner_core": {
       "dependency": "transitive",
       "description": {
         "name": "build_runner_core",
-        "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021",
+        "sha256": "c04e612ca801cd0928ccdb891c263a2b1391cb27940a5ea5afcf9ba894de5d62",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.0.0"
+      "version": "9.2.0"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -150,31 +144,31 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "28a712df2576b63c6c005c465989a348604960c0958d28be5303ba9baa841ac2",
+        "sha256": "0b1b12a0a549605e5f04476031cd0bc91ead1d7c8e830773a18ee54179b3cb62",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.9.3"
+      "version": "8.11.0"
     },
     "characters": {
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
+        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.0"
     },
     "checked_yaml": {
       "dependency": "transitive",
       "description": {
         "name": "checked_yaml",
-        "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
+        "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.3"
+      "version": "2.0.4"
     },
     "ci": {
       "dependency": "transitive",
@@ -200,11 +194,11 @@
       "dependency": "transitive",
       "description": {
         "name": "clock",
-        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+        "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "code_builder": {
       "dependency": "transitive",
@@ -220,11 +214,11 @@
       "dependency": "direct main",
       "description": {
         "name": "collection",
-        "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.19.0"
+      "version": "1.19.1"
     },
     "convert": {
       "dependency": "transitive",
@@ -270,81 +264,81 @@
       "dependency": "transitive",
       "description": {
         "name": "custom_lint",
-        "sha256": "3486c470bb93313a9417f926c7dd694a2e349220992d7b9d14534dc49c15bba9",
+        "sha256": "9656925637516c5cf0f5da018b33df94025af2088fe09c8ae2ca54c53f2d9a84",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.0"
+      "version": "0.7.6"
     },
     "custom_lint_builder": {
       "dependency": "transitive",
       "description": {
         "name": "custom_lint_builder",
-        "sha256": "42cdc41994eeeddab0d7a722c7093ec52bd0761921eeb2cbdbf33d192a234759",
+        "sha256": "6cdc8e87e51baaaba9c43e283ed8d28e59a0c4732279df62f66f7b5984655414",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.0"
+      "version": "0.7.6"
     },
     "custom_lint_core": {
       "dependency": "transitive",
       "description": {
         "name": "custom_lint_core",
-        "sha256": "02450c3e45e2a6e8b26c4d16687596ab3c4644dd5792e3313aa9ceba5a49b7f5",
+        "sha256": "31110af3dde9d29fb10828ca33f1dce24d2798477b167675543ce3d208dee8be",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.0"
+      "version": "0.7.5"
     },
     "custom_lint_visitor": {
       "dependency": "transitive",
       "description": {
         "name": "custom_lint_visitor",
-        "sha256": "bfe9b7a09c4775a587b58d10ebb871d4fe618237639b1e84d5ec62d7dfef25f9",
+        "sha256": "4a86a0d8415a91fbb8298d6ef03e9034dc8e323a599ddc4120a0e36c433983a2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0+6.11.0"
+      "version": "1.0.0+7.7.0"
     },
     "dart_style": {
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab",
+        "sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.7"
+      "version": "3.1.1"
     },
     "dio": {
       "dependency": "direct main",
       "description": {
         "name": "dio",
-        "sha256": "5598aa796bbf4699afd5c67c0f5f6e2ed542afc956884b9cd58c306966efc260",
+        "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.7.0"
+      "version": "5.8.0+1"
     },
     "dio_web_adapter": {
       "dependency": "transitive",
       "description": {
         "name": "dio_web_adapter",
-        "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8",
+        "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.0"
+      "version": "2.1.1"
     },
     "fake_async": {
       "dependency": "transitive",
       "description": {
         "name": "fake_async",
-        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
+        "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.1"
+      "version": "1.3.3"
     },
     "fast_gbk": {
       "dependency": "direct main",
@@ -360,11 +354,11 @@
       "dependency": "transitive",
       "description": {
         "name": "ffi",
-        "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
+        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.1.4"
     },
     "file": {
       "dependency": "transitive",
@@ -390,11 +384,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_android",
-        "sha256": "98ac58e878b05ea2fdb204e7f4fc4978d90406c9881874f901428e01d3b18fbc",
+        "sha256": "6bba3d590ee9462758879741abc132a19133600dd31832f55627442f1ebd7b54",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.1+12"
+      "version": "0.5.1+14"
     },
     "file_selector_ios": {
       "dependency": "transitive",
@@ -420,11 +414,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_macos",
-        "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc",
+        "sha256": "8c9250b2bd2d8d4268e39c82543bacbaca0fda7d29e0728c3c4bbb7c820fd711",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.4+2"
+      "version": "0.9.4+3"
     },
     "file_selector_platform_interface": {
       "dependency": "transitive",
@@ -450,11 +444,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_windows",
-        "sha256": "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4",
+        "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.3+3"
+      "version": "0.9.3+4"
     },
     "fixnum": {
       "dependency": "transitive",
@@ -476,21 +470,21 @@
       "dependency": "direct dev",
       "description": {
         "name": "flutter_launcher_icons",
-        "sha256": "31cd0885738e87c72d6f055564d37fabcdacee743b396b78c7636c169cac64f5",
+        "sha256": "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.14.2"
+      "version": "0.14.4"
     },
     "flutter_lints": {
       "dependency": "direct dev",
       "description": {
         "name": "flutter_lints",
-        "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1",
+        "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.0"
+      "version": "6.0.0"
     },
     "flutter_localizations": {
       "dependency": "direct main",
@@ -524,21 +518,21 @@
       "dependency": "direct dev",
       "description": {
         "name": "freezed",
-        "sha256": "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e",
+        "sha256": "da32f8ba8cfcd4ec71d9decc8cbf28bd2c31b5283d9887eb51eb4a0659d8110c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.7"
+      "version": "3.2.0"
     },
     "freezed_annotation": {
       "dependency": "direct main",
       "description": {
         "name": "freezed_annotation",
-        "sha256": "c2e2d632dd9b8a2b7751117abcfc2b4888ecfe181bd9fca7170d9ef02e595fe2",
+        "sha256": "7294967ff0a6d98638e7acb774aac3af2550777accd8149c90af5b014e6d44d8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.4"
+      "version": "3.1.0"
     },
     "frontend_server_client": {
       "dependency": "transitive",
@@ -554,11 +548,11 @@
       "dependency": "transitive",
       "description": {
         "name": "glob",
-        "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
+        "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.3"
     },
     "graphs": {
       "dependency": "transitive",
@@ -574,21 +568,21 @@
       "dependency": "transitive",
       "description": {
         "name": "hotreloader",
-        "sha256": "ed56fdc1f3a8ac924e717257621d09e9ec20e308ab6352a73a50a1d7a4d9158e",
+        "sha256": "bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.0"
+      "version": "4.3.0"
     },
     "http": {
       "dependency": "direct main",
       "description": {
         "name": "http",
-        "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
+        "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.2"
+      "version": "1.4.0"
     },
     "http_multi_server": {
       "dependency": "transitive",
@@ -604,31 +598,31 @@
       "dependency": "transitive",
       "description": {
         "name": "http_parser",
-        "sha256": "76d306a1c3afb33fe82e2bbacad62a61f409b5634c915fceb0d799de1a913360",
+        "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.1.1"
+      "version": "4.1.2"
     },
     "image": {
       "dependency": "transitive",
       "description": {
         "name": "image",
-        "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d",
+        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.3.0"
+      "version": "4.5.4"
     },
     "intl": {
       "dependency": "transitive",
       "description": {
         "name": "intl",
-        "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
+        "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.19.0"
+      "version": "0.20.2"
     },
     "io": {
       "dependency": "transitive",
@@ -640,26 +634,6 @@
       "source": "hosted",
       "version": "1.0.5"
     },
-    "js": {
-      "dependency": "transitive",
-      "description": {
-        "name": "js",
-        "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.7.1"
-    },
-    "json2yaml": {
-      "dependency": "transitive",
-      "description": {
-        "name": "json2yaml",
-        "sha256": "da94630fbc56079426fdd167ae58373286f603371075b69bf46d848d63ba3e51",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "3.0.1"
-    },
     "json_annotation": {
       "dependency": "direct main",
       "description": {
@@ -674,41 +648,41 @@
       "dependency": "direct dev",
       "description": {
         "name": "json_serializable",
-        "sha256": "c2fcb3920cf2b6ae6845954186420fca40bc0a8abcc84903b7801f17d7050d7c",
+        "sha256": "ce2cf974ccdee13be2a510832d7fba0b94b364e0b0395dee42abaa51b855be27",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.9.0"
+      "version": "6.10.0"
     },
     "launch_at_startup": {
       "dependency": "direct main",
       "description": {
         "name": "launch_at_startup",
-        "sha256": "1f8a75520913d1038630049e6c44a2575a23ffd28cc8b14fdf37401d1d21de84",
+        "sha256": "7db33398b76ec0ed9e27f9f4640553e239977437564046625e215be89c91f084",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.3.1"
+      "version": "0.5.1"
     },
     "leak_tracker": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06",
+        "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.7"
+      "version": "10.0.9"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379",
+        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.8"
+      "version": "3.0.9"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
@@ -724,21 +698,21 @@
       "dependency": "transitive",
       "description": {
         "name": "lints",
-        "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7",
+        "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.1.1"
+      "version": "6.0.0"
     },
     "logger": {
       "dependency": "direct main",
       "description": {
         "name": "logger",
-        "sha256": "be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1",
+        "sha256": "55d6c23a6c15db14920e037fe7e0dc32e7cdaf3b64b4b25df2d541b5b6b81c0c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.0"
+      "version": "2.6.1"
     },
     "logging": {
       "dependency": "transitive",
@@ -750,25 +724,15 @@
       "source": "hosted",
       "version": "1.3.0"
     },
-    "macros": {
-      "dependency": "transitive",
-      "description": {
-        "name": "macros",
-        "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3-main.0"
-    },
     "matcher": {
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
+        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.16+1"
+      "version": "0.12.17"
     },
     "material_color_utilities": {
       "dependency": "transitive",
@@ -794,11 +758,11 @@
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.15.0"
+      "version": "1.16.0"
     },
     "mime": {
       "dependency": "transitive",
@@ -814,41 +778,41 @@
       "dependency": "transitive",
       "description": {
         "name": "package_config",
-        "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.2.0"
     },
     "package_info_plus": {
       "dependency": "direct main",
       "description": {
         "name": "package_info_plus",
-        "sha256": "70c421fe9d9cc1a9a7f3b05ae56befd469fe4f8daa3b484823141a55442d858d",
+        "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.1.2"
+      "version": "8.3.0"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "package_info_plus_platform_interface",
-        "sha256": "a5ef9986efc7bf772f2696183a3992615baa76c1ffb1189318dd8803778fb05b",
+        "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.2"
+      "version": "3.2.0"
     },
     "path": {
       "dependency": "transitive",
       "description": {
         "name": "path",
-        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.9.0"
+      "version": "1.9.1"
     },
     "path_provider": {
       "dependency": "direct main",
@@ -864,11 +828,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2",
+        "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.15"
+      "version": "2.2.17"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
@@ -914,11 +878,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.2"
+      "version": "6.1.0"
     },
     "platform": {
       "dependency": "transitive",
@@ -950,25 +914,35 @@
       "source": "hosted",
       "version": "1.5.1"
     },
+    "posix": {
+      "dependency": "transitive",
+      "description": {
+        "name": "posix",
+        "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.3"
+    },
     "pub_semver": {
       "dependency": "transitive",
       "description": {
         "name": "pub_semver",
-        "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.5"
+      "version": "2.2.0"
     },
     "pubspec_parse": {
       "dependency": "transitive",
       "description": {
         "name": "pubspec_parse",
-        "sha256": "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0",
+        "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.5.0"
     },
     "riverpod": {
       "dependency": "transitive",
@@ -984,21 +958,21 @@
       "dependency": "transitive",
       "description": {
         "name": "riverpod_analyzer_utils",
-        "sha256": "c6b8222b2b483cb87ae77ad147d6408f400c64f060df7a225b127f4afef4f8c8",
+        "sha256": "03a17170088c63aab6c54c44456f5ab78876a1ddb6032ffde1662ddab4959611",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.8"
+      "version": "0.5.10"
     },
     "riverpod_lint": {
       "dependency": "direct dev",
       "description": {
         "name": "riverpod_lint",
-        "sha256": "83e4caa337a9840469b7b9bd8c2351ce85abad80f570d84146911b32086fbd99",
+        "sha256": "89a52b7334210dbff8605c3edf26cfe69b15062beed5cbfeff2c3812c33c9e35",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.3"
+      "version": "2.6.5"
     },
     "rxdart": {
       "dependency": "transitive",
@@ -1064,21 +1038,21 @@
       "dependency": "direct main",
       "description": {
         "name": "shared_preferences",
-        "sha256": "3c7e73920c694a436afaf65ab60ce3453d91f84208d761fbd83fc21182134d93",
+        "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.4"
+      "version": "2.5.3"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d",
+        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.10"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -1114,11 +1088,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_web",
-        "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e",
+        "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.3"
     },
     "shared_preferences_windows": {
       "dependency": "transitive",
@@ -1144,11 +1118,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shelf_web_socket",
-        "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67",
+        "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.1"
+      "version": "3.0.0"
     },
     "shortid": {
       "dependency": "transitive",
@@ -1170,61 +1144,61 @@
       "dependency": "direct main",
       "description": {
         "name": "slang",
-        "sha256": "a466773de768eb95bdf681e0a92e7c8010d44bb247b62130426c83ece33aeaed",
+        "sha256": "b02c531f453c328a1343818c64d730357ac140860147c9a29030fdfc82039266",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.32.0"
+      "version": "4.8.1"
     },
     "slang_build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "slang_build_runner",
-        "sha256": "b2e0c63f3c801a4aa70b4ca43173893d6eb7d5a421fc9d97ad983527397631b3",
+        "sha256": "3679d6ab1373a9e5c0894d29d612abd2f75f969b0ef2f19cafaed2d1b9e49d39",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.32.0"
+      "version": "4.8.0"
     },
     "slang_flutter": {
       "dependency": "direct main",
       "description": {
         "name": "slang_flutter",
-        "sha256": "1a98e878673996902fa5ef0b61ce5c245e41e4d25640d18af061c6aab917b0c7",
+        "sha256": "7a5e55f2b1ec99e06354a5213b992d34017efacccba8ffc6066cfc5517cc0282",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.32.0"
+      "version": "4.8.0"
     },
     "source_gen": {
       "dependency": "transitive",
       "description": {
         "name": "source_gen",
-        "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832",
+        "sha256": "fc787b1f89ceac9580c3616f899c9a447413cbdac1df071302127764c023a134",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.0"
+      "version": "3.0.0"
     },
     "source_helper": {
       "dependency": "transitive",
       "description": {
         "name": "source_helper",
-        "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c",
+        "sha256": "4f81479fe5194a622cdd1713fe1ecb683a6e6c85cd8cec8e2e35ee5ab3fdf2a1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.5"
+      "version": "1.3.6"
     },
     "source_span": {
       "dependency": "transitive",
       "description": {
         "name": "source_span",
-        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
+        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.10.0"
+      "version": "1.10.1"
     },
     "sprintf": {
       "dependency": "transitive",
@@ -1240,11 +1214,11 @@
       "dependency": "transitive",
       "description": {
         "name": "stack_trace",
-        "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
+        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.12.0"
+      "version": "1.12.1"
     },
     "state_notifier": {
       "dependency": "transitive",
@@ -1260,11 +1234,11 @@
       "dependency": "transitive",
       "description": {
         "name": "stream_channel",
-        "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.4"
     },
     "stream_transform": {
       "dependency": "transitive",
@@ -1280,31 +1254,31 @@
       "dependency": "transitive",
       "description": {
         "name": "string_scanner",
-        "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3",
+        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.1"
     },
     "term_glyph": {
       "dependency": "transitive",
       "description": {
         "name": "term_glyph",
-        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.1"
+      "version": "1.2.2"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
+        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.3"
+      "version": "0.7.4"
     },
     "timing": {
       "dependency": "transitive",
@@ -1320,11 +1294,11 @@
       "dependency": "direct main",
       "description": {
         "name": "tray_manager",
-        "sha256": "f231031c5c0eb4ad514e18ddaab27a912ddbe50335c594bc28fb0f9972ab6a84",
+        "sha256": "ad18c4cd73003097d182884bacb0578ad2865f3ab842a0ad00f6d043ed49eaf0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.3.1"
+      "version": "0.5.0"
     },
     "typed_data": {
       "dependency": "transitive",
@@ -1340,31 +1314,31 @@
       "dependency": "direct main",
       "description": {
         "name": "url_launcher",
-        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
+        "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.1"
+      "version": "6.3.2"
     },
     "url_launcher_android": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193",
+        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.14"
+      "version": "6.3.16"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626",
+        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.2"
+      "version": "6.3.3"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
@@ -1400,21 +1374,21 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
+        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3"
+      "version": "2.4.1"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_windows",
-        "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4",
+        "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.3"
+      "version": "3.1.4"
     },
     "uuid": {
       "dependency": "transitive",
@@ -1440,81 +1414,81 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b",
+        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.3.0"
+      "version": "15.0.0"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104",
+        "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "web": {
       "dependency": "transitive",
       "description": {
         "name": "web",
-        "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "web_socket": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket",
-        "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
+        "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.6"
+      "version": "1.0.1"
     },
     "web_socket_channel": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket_channel",
-        "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f",
+        "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.3"
     },
     "win32": {
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "8b338d4486ab3fbc0ba0db9f9b4f5239b6697fcee427939a40e720cbb9ee0a69",
+        "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.9.0"
+      "version": "5.14.0"
     },
     "win32_registry": {
       "dependency": "transitive",
       "description": {
         "name": "win32_registry",
-        "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852",
+        "sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.5"
+      "version": "2.1.0"
     },
     "window_manager": {
       "dependency": "direct main",
       "description": {
         "name": "window_manager",
-        "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059",
+        "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.3"
+      "version": "0.5.1"
     },
     "xdg_directories": {
       "dependency": "transitive",
@@ -1548,7 +1522,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.6.0 <4.0.0",
-    "flutter": ">=3.24.0"
+    "dart": ">=3.8.0 <4.0.0",
+    "flutter": ">=3.27.0"
   }
 }

From 578d9b2794f8d5d1de6cc5e730e96c5cc382ad11 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Oct 2025 11:37:13 +0000
Subject: [PATCH 0554/6226] autobrr: 1.66.1 -> 1.68.0

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

diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix
index 0bf929f6b0c7..c407155b262e 100644
--- a/pkgs/by-name/au/autobrr/package.nix
+++ b/pkgs/by-name/au/autobrr/package.nix
@@ -13,12 +13,12 @@
 
 let
   pname = "autobrr";
-  version = "1.66.1";
+  version = "1.68.0";
   src = fetchFromGitHub {
     owner = "autobrr";
     repo = "autobrr";
     tag = "v${version}";
-    hash = "sha256-4vfcSkTEFPqQ0r6uLg3o2pa1xcPuWn54+zYpWS/JEKE=";
+    hash = "sha256-BURejp9ncaSfUw7dq80rFECjWwNSGcRxOTHRBXon67k=";
   };
 
   autobrr-web = stdenvNoCC.mkDerivation {
@@ -41,7 +41,7 @@ let
         sourceRoot
         ;
       fetcherVersion = 1;
-      hash = "sha256-kbLdXF5pAVIha07MCgq1yUShQwxj8xLt2mKzU4NYhwU=";
+      hash = "sha256-59CNJq0D5TJBL9zccBOjZif+xbNibWDiAQq51BqqQhg=";
     };
 
     postBuild = ''
@@ -61,7 +61,7 @@ buildGoModule rec {
     src
     ;
 
-  vendorHash = "sha256-hQXXBx4pACKqwG0ctkymZpCv3VLzFx2JCHuKzqumWbg=";
+  vendorHash = "sha256-6K//pt5xg1wEHAVe+vP7wicWQ8L/ty3f1PkZhBm8mCE=";
 
   preBuild = ''
     cp -r ${autobrr-web}/* web/dist

From b85201bee480ff70ac1c48948448bcebbfa1baec Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 10 Oct 2025 16:42:57 +0200
Subject: [PATCH 0555/6226] python3Packages.sqlalchemy: 2.0.43 -> 2.0.44

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

diff --git a/pkgs/development/python-modules/sqlalchemy/default.nix b/pkgs/development/python-modules/sqlalchemy/default.nix
index a784a3f7a542..41b2294acfe1 100644
--- a/pkgs/development/python-modules/sqlalchemy/default.nix
+++ b/pkgs/development/python-modules/sqlalchemy/default.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "sqlalchemy";
-  version = "2.0.43";
+  version = "2.0.44";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     owner = "sqlalchemy";
     repo = "sqlalchemy";
     tag = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    hash = "sha256-yZIYcJ6gI1oUsQ/vRd5yz6Tgcl7ARpjxnjZNsfeXinM=";
+    hash = "sha256-XjmSMgFOMYzJ5IR7tDImj37mM7qhiesKsaBerfzxL4g=";
   };
 
   postPatch = ''

From 3bf68389cd4bbacfed8185b8d5d0a489e6ffa447 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 10 Oct 2025 16:22:37 +0000
Subject: [PATCH 0556/6226] irpf: 2025-1.6 -> 2025-1.7

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

diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix
index cbeab7c8d75a..b732787210f1 100644
--- a/pkgs/by-name/ir/irpf/package.nix
+++ b/pkgs/by-name/ir/irpf/package.nix
@@ -13,7 +13,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "irpf";
-  version = "2025-1.6";
+  version = "2025-1.7";
 
   # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf
   # Para outros sistemas operacionais -> Multi
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     in
     fetchzip {
       url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip";
-      hash = "sha256-U2HweRi6acrmMT+9B1263mhGIn/84Z6JeqKP6XvTeXE=";
+      hash = "sha256-VLB/Ni+sZ0Xugh3v7vb4rqTlAZz3eHU33lbljCX3Yic=";
     };
 
   passthru.updateScript = writeScript "update-irpf" ''

From 624e6b1ec6042c8bf68c491f236d4cfbf8129921 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Fri, 10 Oct 2025 21:24:26 +0000
Subject: [PATCH 0557/6226] learn6502: 0.6.0 -> 0.6.2

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

diff --git a/pkgs/by-name/le/learn6502/package.nix b/pkgs/by-name/le/learn6502/package.nix
index 66bb499bf5b5..dc37902b7622 100644
--- a/pkgs/by-name/le/learn6502/package.nix
+++ b/pkgs/by-name/le/learn6502/package.nix
@@ -24,20 +24,20 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "learn6502";
-  version = "0.6.0";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "JumpLink";
     repo = "Learn6502";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Vk8IbTv7fivBrPeZ1Psvvym68F5lA1XV7p4kMfSqNrU=";
+    hash = "sha256-YWbq0r6OEZpg4l633Y/1+r1Ik42ldoBH1ZjszRKNjRY=";
   };
 
   missingHashes = ./missing-hashes.json;
 
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-0kKC0KCxiigk7LPLmCRaoJnz/rVg8/Tvkcae4XU/97w=";
+    hash = "sha256-5wwpB4iDw/J7nUnb/qdSP+M0LLmHVU4/Zr+Ohl6Q4vk=";
   };
 
   nativeBuildInputs = [

From f5ec4b277fd5f86bfcbcd91b47cce013e2f0bcf6 Mon Sep 17 00:00:00 2001
From: Thane Gill <me@thanegill.com>
Date: Tue, 23 Sep 2025 16:21:51 -0700
Subject: [PATCH 0558/6226] python3Packages.panzi-json-logic: init at 1.0.1

Apply suggestion from @uninsane

Co-authored-by: Colin <accounts.github@uninsane.org>
---
 .../panzi-json-logic/default.nix              | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/python-modules/panzi-json-logic/default.nix

diff --git a/pkgs/development/python-modules/panzi-json-logic/default.nix b/pkgs/development/python-modules/panzi-json-logic/default.nix
new file mode 100644
index 000000000000..292c42f14a1d
--- /dev/null
+++ b/pkgs/development/python-modules/panzi-json-logic/default.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  unittestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "panzi-json-logic";
+  version = "1.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "panzi";
+    repo = "panzi-json-logic";
+    tag = "v${version}";
+    hash = "sha256-P34+7SckMtiCTZbdKsjztNam+/HWtcVQEnGPMoPBw3g=";
+  };
+
+  build-system = [ setuptools ];
+
+  nativeCheckInputs = [ unittestCheckHook ];
+
+  pythonImportsCheck = [ "json_logic" ];
+
+  meta = {
+    description = "Pure Python 3 JsonLogic and CertLogic implementation.";
+    homepage = "https://github.com/panzi/panzi-json-logic";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ thanegill ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9cf17237c5b1..84a5c26d774b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11407,6 +11407,8 @@ self: super: with self; {
 
   panphon = callPackage ../development/python-modules/panphon { };
 
+  panzi-json-logic = callPackage ../development/python-modules/panzi-json-logic { };
+
   paperbush = callPackage ../development/python-modules/paperbush { };
 
   papermill = callPackage ../development/python-modules/papermill { };

From dcbdd66331ba18e0354183ef8df554ee3ed819d0 Mon Sep 17 00:00:00 2001
From: Thane Gill <me@thanegill.com>
Date: Tue, 23 Sep 2025 16:24:45 -0700
Subject: [PATCH 0559/6226] python3Packages.price-parser: init at 0.4.0

Apply suggestion from @uninsane

Co-authored-by: Colin <accounts.github@uninsane.org>
---
 .../python-modules/price-parser/default.nix   | 39 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/development/python-modules/price-parser/default.nix

diff --git a/pkgs/development/python-modules/price-parser/default.nix b/pkgs/development/python-modules/price-parser/default.nix
new file mode 100644
index 000000000000..c2baaced3afb
--- /dev/null
+++ b/pkgs/development/python-modules/price-parser/default.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  pytestCheckHook,
+  setuptools,
+  pytest-cov,
+  attrs,
+}:
+
+buildPythonPackage rec {
+  pname = "price-parser";
+  version = "0.4.0";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "scrapinghub";
+    repo = "price-parser";
+    tag = version;
+    hash = "sha256-9f/+Yw94SVvg9fl9zYR9YEMwAgKHwySG5cysPMomnA0=";
+  };
+
+  dependencies = [ attrs ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov
+  ];
+
+  pythonImportsCheck = [ "price_parser" ];
+
+  meta = {
+    description = "Extract price amount and currency symbol from a raw text string";
+    homepage = "https://github.com/scrapinghub/price-parser";
+    changelog = "https://github.com/scrapinghub/price-parser/blob/${version}/CHANGES.rst";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ thanegill ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 84a5c26d774b..f03edcc57ae6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12151,6 +12151,8 @@ self: super: with self; {
 
   prettytable = callPackage ../development/python-modules/prettytable { };
 
+  price-parser = callPackage ../development/python-modules/price-parser { };
+
   primecountpy = callPackage ../development/python-modules/primecountpy { };
 
   primepy = callPackage ../development/python-modules/primepy { };

From 682d91c1cf0a4032cec5853d754618e4742ebde0 Mon Sep 17 00:00:00 2001
From: Thane Gill <me@thanegill.com>
Date: Tue, 23 Sep 2025 16:26:13 -0700
Subject: [PATCH 0560/6226] python3packages.pyppeteer-ng: init at 2.0.0rc10

Apply suggestion from @uninsane

Co-authored-by: Colin <accounts.github@uninsane.org>
---
 .../python-modules/pyppeteer-ng/default.nix   | 160 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 2 files changed, 162 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyppeteer-ng/default.nix

diff --git a/pkgs/development/python-modules/pyppeteer-ng/default.nix b/pkgs/development/python-modules/pyppeteer-ng/default.nix
new file mode 100644
index 000000000000..b4674d023e26
--- /dev/null
+++ b/pkgs/development/python-modules/pyppeteer-ng/default.nix
@@ -0,0 +1,160 @@
+{
+  lib,
+  aenum,
+  aiohttp,
+  appdirs,
+  buildPythonPackage,
+  certifi,
+  diff-match-patch,
+  fetchFromGitHub,
+  flake8,
+  importlib-metadata,
+  livereload,
+  mypy,
+  networkx,
+  ordered-set,
+  pillow,
+  pixelmatch,
+  poetry-core,
+  pre-commit,
+  pydocstyle,
+  pyee,
+  pylint,
+  pytest,
+  pytest-cov,
+  pytest-timeout,
+  pytest-xdist,
+  pytestCheckHook,
+  pythonOlder,
+  readme-renderer,
+  sphinx,
+  sphinxcontrib-asyncio,
+  syncer,
+  tox,
+  tqdm,
+  typing-extensions,
+  typing-inspect,
+  urllib3,
+  websockets,
+}:
+
+buildPythonPackage rec {
+  pname = "pyppeteer-ng";
+  version = "2.0.0rc10";
+  pyproject = true;
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "dgtlmoon";
+    repo = "pyppeteer-ng";
+    tag = version;
+    hash = "sha256-NpxjKsh12pr/MCZ4gfoaa+3jTYyvQzHgSno1+rw2Wk0=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'aenum = "^2.2.3"' 'aenum = "*"' \
+      --replace-fail 'typing_inspect = { version ="^0.5.0"' 'typing_inspect = { version ="*"' \
+      --replace-fail 'urllib3 = "^1.25.8"' 'urllib3 = "*"' \
+      --replace-fail 'websockets = "^10.1"' 'websockets = "*"' \
+      --replace-fail 'requires = ["poetry>=0.12"]' 'requires = ["poetry-core"]' \
+      --replace-fail 'build-backend = "poetry.masonry.api"' 'build-backend = "poetry.core.masonry.api"'
+
+    substituteInPlace tests/conftest.py \
+      --replace-fail '_port = get_free_port()' ""
+
+    substituteInPlace tests/utils/server.py \
+      --replace-fail '_Middleware' '_Middlewares' \
+  '';
+
+  nativeBuildInputs = [ poetry-core ];
+
+  propagatedBuildInputs = [
+    aenum
+    appdirs
+    certifi
+    ordered-set
+    pillow
+    pyee
+    tqdm
+    typing-inspect
+    typing-extensions
+    urllib3
+    websockets
+  ];
+
+  nativeCheckInputs = [
+    aiohttp
+    diff-match-patch
+    flake8
+    livereload
+    mypy
+    networkx
+    pixelmatch
+    pre-commit
+    pydocstyle
+    pylint
+    pytest
+    pytest-cov
+    pytest-timeout
+    pytest-xdist
+    readme-renderer
+    sphinx
+    sphinxcontrib-asyncio
+    syncer
+    tox
+    pytestCheckHook
+  ];
+
+  disabledTestPaths = [
+    # Requires network access
+    "tests/test_abnormal_crash.py"
+    "tests/test_accessibility.py"
+    "tests/test_browser.py"
+    "tests/test_browser_context.py"
+    "tests/test_browser_fetcher.py"
+    "tests/test_click.py"
+    "tests/test_connection.py"
+    "tests/test_coverage.py"
+    "tests/test_dialog.py"
+    "tests/test_element_handle.py"
+    "tests/test_emulation.py"
+    "tests/test_execution_context.py"
+    "tests/test_frame.py"
+    "tests/test_input.py"
+    "tests/test_jshandle.py"
+    "tests/test_keyboard.py"
+    "tests/test_launcher.py"
+    "tests/test_mouse.py"
+    "tests/test_navigation.py"
+    "tests/test_page.py"
+    "tests/test_pyppeteer.py"
+    "tests/test_queryselector.py"
+    "tests/test_requestinterception.py"
+    "tests/test_screenshot.py"
+    "tests/test_target.py"
+    "tests/test_touchscreen.py"
+    "tests/test_tracing.py"
+    "tests/test_worker.py"
+
+    # Failing
+    "pyee12-compat/connection_stability_test.py"
+    "pyee12-compat/pyee_compatibility_test.py"
+    "pyee12-compat/real_websocket_test.py"
+    "pyee12-compat/simple_connection_test.py"
+    "pyee12-compat/simplified_test.py"
+    "tests/test_misc.py"
+  ];
+
+  pythonImportsCheck = [ "pyppeteer" ];
+
+  meta = with lib; {
+    description = "Headless chrome/chromium automation library (unofficial port of puppeteer)";
+    mainProgram = "pyppeteer-install";
+    homepage = "https://github.com/dgtlmoon/pyppeteer-ng";
+    changelog = "https://github.com/dgtlmoon/pyppeteer-ng/blob/${version}/CHANGELOG.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ thanegill ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f03edcc57ae6..50b85227dcb8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13822,6 +13822,8 @@ self: super: with self; {
 
   pyppeteer = callPackage ../development/python-modules/pyppeteer { };
 
+  pyppeteer-ng = callPackage ../development/python-modules/pyppeteer-ng { };
+
   pyppmd = callPackage ../development/python-modules/pyppmd { };
 
   pyprecice = callPackage ../development/python-modules/pyprecice {

From 8bef5b5978e91f64594530bed7cbe60525804d87 Mon Sep 17 00:00:00 2001
From: Thane Gill <me@thanegill.com>
Date: Tue, 23 Sep 2025 16:30:28 -0700
Subject: [PATCH 0561/6226] changedetection-io: 0.49.4 -> 0.50.14

Apply suggestion from @uninsane

Co-authored-by: Colin <accounts.github@uninsane.org>
---
 .../by-name/ch/changedetection-io/package.nix | 57 ++++++++++++-------
 1 file changed, 37 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/ch/changedetection-io/package.nix b/pkgs/by-name/ch/changedetection-io/package.nix
index 918a95f10788..8148e58cef54 100644
--- a/pkgs/by-name/ch/changedetection-io/package.nix
+++ b/pkgs/by-name/ch/changedetection-io/package.nix
@@ -2,18 +2,19 @@
   lib,
   fetchFromGitHub,
   python3,
+  gitUpdater,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "changedetection-io";
-  version = "0.49.4";
+  version = "0.50.14";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "dgtlmoon";
     repo = "changedetection.io";
     tag = version;
-    hash = "sha256-EmtJ8XXPb75W4VPj4Si9fdzVLDKVfm+8P6UZZlMpMdI=";
+    hash = "sha256-zxCb2mmCicjDxilj/l8HabJm2FsFQB0yLNaRiIDltwI=";
   };
 
   pythonRelaxDeps = true;
@@ -22,14 +23,13 @@ python3.pkgs.buildPythonApplication rec {
     with python3.pkgs;
     [
       apprise
-      beautifulsoup4
-      brotli
       babel
+      beautifulsoup4
+      blinker
+      brotli
       chardet
       cryptography
-      dnspython
       elementpath
-      eventlet
       extruct
       feedgen
       flask
@@ -39,45 +39,62 @@ python3.pkgs.buildPythonApplication rec {
       flask-login
       flask-paginate
       flask-restful
+      flask-socketio
       flask-wtf
+      gevent
       greenlet
       inscriptis
+      janus
       jinja2
       jinja2-time
-      jsonpath-ng
       jq
+      jsonpath-ng
+      jsonschema
+      levenshtein
       loguru
       lxml
+      openapi-core
+      openpyxl
       paho-mqtt
-      playwright
-      pyee
-      pyppeteer
+      panzi-json-logic
+      pluggy
+      price-parser
+      psutil
+      pyppeteer-ng
+      # pyppeteerstealth
+      python-engineio
+      python-magic
+      python-socketio
       pytz
+      referencing
       requests
+      requests-file
       selenium
-      setuptools
       timeago
-      urllib3
+      tzdata
       validators
       werkzeug
       wtforms
     ]
-    ++ requests.optional-dependencies.socks;
+    ++ requests.optional-dependencies.socks
+    ++ openapi-core.optional-dependencies.flask;
 
   # tests can currently not be run in one pytest invocation and without docker
   doCheck = false;
 
-  nativeCheckInputs = with python3.pkgs; [
-    pytest-flask
-    pytestCheckHook
-  ];
+  pythonImportsCheck = [ "changedetectionio" ];
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater { };
+
+  meta = {
     description = "Self-hosted free open source website change detection tracking, monitoring and notification service";
     homepage = "https://github.com/dgtlmoon/changedetection.io";
     changelog = "https://github.com/dgtlmoon/changedetection.io/releases/tag/${src.tag}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ mikaelfangel ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
+      mikaelfangel
+      thanegill
+    ];
     mainProgram = "changedetection.io";
   };
 }

From c160e4dc58b22590813a23062b338dade59e5f9d Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 10 Oct 2025 20:20:37 -0300
Subject: [PATCH 0562/6226] mountain-duck: 5.0.2.28022 -> 5.0.4.28064

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

diff --git a/pkgs/by-name/mo/mountain-duck/package.nix b/pkgs/by-name/mo/mountain-duck/package.nix
index 903147d09706..b2c928db3105 100644
--- a/pkgs/by-name/mo/mountain-duck/package.nix
+++ b/pkgs/by-name/mo/mountain-duck/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "mountain-duck";
-  version = "5.0.2.28022";
+  version = "5.0.4.28064";
 
   src = fetchurl {
     url = "https://dist.mountainduck.io/Mountain%20Duck-${finalAttrs.version}.zip";
-    sha256 = "sha256-QismxRiDN6AfzaR8/WZq4O9Wj7knMXhGtIWjkhg/rAQ=";
+    sha256 = "sha256-f69DBNj15dxkNxmFtoxA3d/bSpagpOX7l84fE4a/VWw=";
   };
   dontUnpack = true;
 

From 69972cd34d8e074d8c0d8d74eceb3d193023fc8c Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 10 Oct 2025 17:06:15 -0700
Subject: [PATCH 0563/6226] distro-info-data: init at 0.67

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/by-name/di/distro-info-data/package.nix | 29 ++++++++++++++++++++
 1 file changed, 29 insertions(+)
 create mode 100644 pkgs/by-name/di/distro-info-data/package.nix

diff --git a/pkgs/by-name/di/distro-info-data/package.nix b/pkgs/by-name/di/distro-info-data/package.nix
new file mode 100644
index 000000000000..bb8f4edc7747
--- /dev/null
+++ b/pkgs/by-name/di/distro-info-data/package.nix
@@ -0,0 +1,29 @@
+{
+  fetchFromGitLab,
+  lib,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "distro-info-data";
+  version = "0.67";
+
+  src = fetchFromGitLab {
+    domain = "salsa.debian.org";
+    owner = "debian";
+    repo = "distro-info-data";
+    tag = "debian/${finalAttrs.version}";
+    hash = "sha256-xm/ajsPKtnmuyEkVxM1AxV7Tl0njkqjOmhE5rKRQ36Q=";
+  };
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = {
+    description = "Information about Debian and Ubuntu releases";
+    homepage = "https://salsa.debian.org/debian/distro-info-data";
+    changelog = "https://salsa.debian.org/debian/distro-info-data/-/blob/${finalAttrs.src.tag}/debian/changelog";
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ andersk ];
+    platforms = lib.platforms.all;
+  };
+})

From 96eca034d0b7b397ad4c89c299f07e2d5f738a91 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Fri, 10 Oct 2025 17:04:39 -0700
Subject: [PATCH 0564/6226] python3Packages.distro-info: init at 1.14

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 .../python-modules/distro-info/default.nix    | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/distro-info/default.nix

diff --git a/pkgs/development/python-modules/distro-info/default.nix b/pkgs/development/python-modules/distro-info/default.nix
new file mode 100644
index 000000000000..debef819aef3
--- /dev/null
+++ b/pkgs/development/python-modules/distro-info/default.nix
@@ -0,0 +1,45 @@
+{
+  buildPythonPackage,
+  distro-info-data,
+  fetchurl,
+  lib,
+  setuptools,
+  unittestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "distro-info";
+  version = "1.14";
+  pyproject = true;
+
+  # Not using fetchFromGitLab because it incorrectly sets
+  # SOURCE_DATE_EPOCH=315619200 (1980-01-02) and breaks tests.
+  src = fetchurl {
+    url = "https://salsa.debian.org/debian/distro-info/-/archive/debian/${version}/distro-info-debian-${version}.tar.gz";
+    hash = "sha256-nRLTlDPnll1jvwfg9FSxs9TmImvQkn9DVqSRSOKTAGI=";
+  };
+
+  postPatch = ''
+    substituteInPlace python/distro_info.py \
+      --replace-fail /usr/share/distro-info ${distro-info-data}/share/distro-info
+  '';
+
+  build-system = [ setuptools ];
+  pypaBuildFlags = "python";
+  nativeCheckInputs = [
+    unittestCheckHook
+  ];
+  preCheck = ''
+    cd python
+    rm distro_info_test/test_flake8.py distro_info_test/test_pylint.py
+  '';
+
+  meta = {
+    description = "Information about Debian and Ubuntu releases";
+    homepage = "https://salsa.debian.org/debian/distro-info";
+    changelog = "https://salsa.debian.org/debian/distro-info/-/blob/debian/${version}/debian/changelog";
+    license = lib.licenses.isc;
+    maintainers = with lib.maintainers; [ andersk ];
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4ee283b41fc4..44fa60ab8683 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3645,6 +3645,8 @@ self: super: with self; {
 
   distro = callPackage ../development/python-modules/distro { };
 
+  distro-info = callPackage ../development/python-modules/distro-info { };
+
   distutils =
     if pythonOlder "3.12" then null else callPackage ../development/python-modules/distutils { };
 

From a47c384c31e79bc80bc695ba121d407f8b82d3ef Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Mon, 16 Jun 2025 13:01:52 -0700
Subject: [PATCH 0565/6226] dput-ng: Add missing dependency
 python3Packages.distro-info

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/by-name/dp/dput-ng/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/dp/dput-ng/package.nix b/pkgs/by-name/dp/dput-ng/package.nix
index c73978a3f496..e5f65a71bfa8 100644
--- a/pkgs/by-name/dp/dput-ng/package.nix
+++ b/pkgs/by-name/dp/dput-ng/package.nix
@@ -31,6 +31,7 @@ python3.pkgs.buildPythonApplication {
     coverage
     xdg
     python-debian
+    distro-info
   ];
 
   postInstall = ''

From ffdcfb6c5ccfb29f2c279ba998581ce6e3108c6c Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Mon, 16 Jun 2025 13:02:34 -0700
Subject: [PATCH 0566/6226] dput-ng: Install required configuration files

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/by-name/dp/dput-ng/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/dp/dput-ng/package.nix b/pkgs/by-name/dp/dput-ng/package.nix
index e5f65a71bfa8..60ea99b969a3 100644
--- a/pkgs/by-name/dp/dput-ng/package.nix
+++ b/pkgs/by-name/dp/dput-ng/package.nix
@@ -20,6 +20,10 @@ python3.pkgs.buildPythonApplication {
     hash = "sha256-zrH4h4C4y3oTiOXsidFv/rIJNzCdV2lqzNEg0SOkX4w=";
   };
 
+  postPatch = ''
+    substituteInPlace dput/core.py --replace-fail /usr/share/dput-ng "$out/share/dput-ng"
+  '';
+
   build-system = with python3.pkgs; [
     setuptools
   ];
@@ -36,6 +40,8 @@ python3.pkgs.buildPythonApplication {
 
   postInstall = ''
     cp -r bin $out/
+    mkdir -p "$out/share/dput-ng"
+    cp -r skel/* "$out/share/dput-ng/"
   '';
 
   pythonImportsCheck = [ "dput" ];

From e86e8207b767a25dbacfdac5da025583ebf70864 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 00:41:27 +0000
Subject: [PATCH 0567/6226] okteta: 0.26.23 -> 0.26.24

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

diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix
index 546b6e2600b3..9a8bbfae3208 100644
--- a/pkgs/applications/editors/okteta/default.nix
+++ b/pkgs/applications/editors/okteta/default.nix
@@ -19,11 +19,11 @@
 
 mkDerivation rec {
   pname = "okteta";
-  version = "0.26.23";
+  version = "0.26.24";
 
   src = fetchurl {
     url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz";
-    sha256 = "sha256-sExQmI6sJsUHaKtb1A9bNaNIxE1uDmqNVgVjzw6xo7E=";
+    sha256 = "sha256-MbIyPwL01PyHLD/BNdVLuQklglaB5ZHdJfSmgMDSZWo=";
   };
 
   nativeBuildInputs = [

From 47a791000e01b3d1e7510144149db143a683a0d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 00:49:14 +0000
Subject: [PATCH 0568/6226] LycheeSlicer: 7.4.4 -> 7.4.5

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

diff --git a/pkgs/by-name/ly/LycheeSlicer/package.nix b/pkgs/by-name/ly/LycheeSlicer/package.nix
index 26b490a0551b..a8237fbd249b 100644
--- a/pkgs/by-name/ly/LycheeSlicer/package.nix
+++ b/pkgs/by-name/ly/LycheeSlicer/package.nix
@@ -9,11 +9,11 @@
 }:
 let
   pname = "LycheeSlicer";
-  version = "7.4.4";
+  version = "7.4.5";
 
   src = fetchurl {
     url = "https://mango-lychee.nyc3.cdn.digitaloceanspaces.com/LycheeSlicer-${version}.AppImage";
-    hash = "sha256-ZbKMCbTKqdjcTefEfrhovRQSRydKf3QBsXHi/XwXuUc=";
+    hash = "sha256-UY8bS3nPhUqyBeMD7Ou6OJZ2LKFi3QbNGeTSmtC1Sbg=";
   };
 
   desktopItem = makeDesktopItem {

From 192545a4d0719a90421303d7ae70f2e7631ebf3c Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Fri, 10 Oct 2025 21:12:17 -0400
Subject: [PATCH 0569/6226] pkgsStatic.openssh: fix build

Fixes #445548
---
 pkgs/tools/networking/openssh/common.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix
index 5b672b6d6b7a..f78882293b7b 100644
--- a/pkgs/tools/networking/openssh/common.nix
+++ b/pkgs/tools/networking/openssh/common.nix
@@ -18,6 +18,7 @@
   fetchurl,
   fetchpatch,
   autoreconfHook,
+  audit,
   zlib,
   openssl,
   softhsm,
@@ -36,7 +37,7 @@
   nixosTests,
   withSecurityKey ? !stdenv.hostPlatform.isStatic,
   withFIDO ? stdenv.hostPlatform.isUnix && !stdenv.hostPlatform.isMusl && withSecurityKey,
-  withPAM ? stdenv.hostPlatform.isLinux,
+  withPAM ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isStatic,
   # Attempts to mlock the entire sshd process on startup to prevent swapping.
   # Currently disabled when PAM support is enabled due to crashes
   # See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1103418
@@ -87,7 +88,8 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional withFIDO libfido2
   ++ lib.optional withKerberos krb5
   ++ lib.optional withLdns ldns
-  ++ lib.optional withPAM pam;
+  ++ lib.optional withPAM pam
+  ++ lib.optional stdenv.hostPlatform.isStatic audit;
 
   preConfigure = ''
     # Setting LD causes `configure' and `make' to disagree about which linker
@@ -163,9 +165,7 @@ stdenv.mkDerivation (finalAttrs: {
       # invoked directly and those invoked by the "remote" session
       cat > ~/.ssh/environment.base <<EOF
       NIX_REDIRECTS=/etc/passwd=$DUMMY_PASSWD
-      ${lib.optionalString (
-        !stdenv.buildPlatform.isStatic
-      ) "LD_PRELOAD=${libredirect}/lib/libredirect.so"}
+      ${lib.optionalString (!stdenv.hostPlatform.isStatic) "LD_PRELOAD=${libredirect}/lib/libredirect.so"}
       EOF
 
       # use an ssh environment file to ensure environment is set

From 26512729f6d7484b4442c474f1434d3fa12b1ff6 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 11 Oct 2025 00:15:35 -0400
Subject: [PATCH 0570/6226] khoj: drop

Has been marked broken for at least a full release cycle.

Dropping per RFC 180.
---
 pkgs/by-name/kh/khoj/package.nix | 145 -------------------------------
 pkgs/top-level/aliases.nix       |   1 +
 2 files changed, 1 insertion(+), 145 deletions(-)
 delete mode 100644 pkgs/by-name/kh/khoj/package.nix

diff --git a/pkgs/by-name/kh/khoj/package.nix b/pkgs/by-name/kh/khoj/package.nix
deleted file mode 100644
index ec9e03b13835..000000000000
--- a/pkgs/by-name/kh/khoj/package.nix
+++ /dev/null
@@ -1,145 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  python3,
-  postgresql,
-  postgresqlTestHook,
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "khoj";
-  version = "1.0.1";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "debanjum";
-    repo = "khoj";
-    tag = version;
-    hash = "sha256-lvOeYTrvW5MfhuJ3lj9n9TRlvpRwVP2vFeaEeJdqIec=";
-  };
-
-  env = {
-    DJANGO_SETTINGS_MODULE = "khoj.app.settings";
-    postgresqlEnableTCP = 1;
-  };
-
-  nativeBuildInputs = with python3.pkgs; [
-    hatch-vcs
-    hatchling
-  ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    aiohttp
-    anyio
-    authlib
-    beautifulsoup4
-    dateparser
-    defusedxml
-    django
-    fastapi
-    google-auth
-    # gpt4all
-    gunicorn
-    httpx
-    itsdangerous
-    jinja2
-    langchain
-    lxml
-    openai
-    openai-whisper
-    pgvector
-    pillow
-    psycopg2
-    pydantic
-    pymupdf
-    python-multipart
-    pyyaml
-    # rapidocr-onnxruntime
-    requests
-    rich
-    schedule
-    sentence-transformers
-    stripe
-    tenacity
-    tiktoken
-    torch
-    transformers
-    tzdata
-    uvicorn
-  ];
-
-  nativeCheckInputs =
-    with python3.pkgs;
-    [
-      freezegun
-      factory-boy
-      pytest-xdist
-      trio
-      psutil
-      pytest-django
-      pytestCheckHook
-    ]
-    ++ [
-      (postgresql.withPackages (p: with p; [ pgvector ]))
-      postgresqlTestHook
-    ];
-
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
-  pythonImportsCheck = [
-    "khoj"
-  ];
-
-  disabledTests = [
-    # Tests require network access
-    "test_different_user_data_not_accessed"
-    "test_get_api_config_types"
-    "test_get_configured_types_via_api"
-    "test_image_metadata"
-    "test_image_search"
-    "test_image_search_by_filepath"
-    "test_image_search_query_truncated"
-    "test_index_update"
-    "test_index_update_with_no_auth_key"
-    "test_notes_search"
-    "test_notes_search_with_exclude_filter"
-    "test_notes_search_with_include_filter"
-    "test_parse_html_plaintext_file"
-    "test_regenerate_index_with_new_entry"
-    "test_regenerate_with_github_fails_without_pat"
-    "test_regenerate_with_invalid_content_type"
-    "test_regenerate_with_valid_content_type"
-    "test_search_for_user2_returns_empty"
-    "test_search_with_invalid_auth_key"
-    "test_search_with_invalid_content_type"
-    "test_search_with_no_auth_key"
-    "test_search_with_valid_content_type"
-    "test_text_index_same_if_content_unchanged"
-    "test_text_indexer_deletes_embedding_before_regenerate"
-    "test_text_search"
-    "test_text_search_setup_batch_processes"
-    "test_update_with_invalid_content_type"
-    "test_user_no_data_returns_empty"
-
-    # Tests require rapidocr-onnxruntime
-    "test_multi_page_pdf_to_jsonl"
-    "test_single_page_pdf_to_jsonl"
-    "test_ocr_page_pdf_to_jsonl"
-  ];
-
-  disabledTestPaths = [
-    # Tests require network access
-    "tests/test_conversation_utils.py"
-  ];
-
-  meta = {
-    description = "Natural Language Search Assistant for your Org-Mode and Markdown notes, Beancount transactions and Photos";
-    homepage = "https://github.com/debanjum/khoj";
-    changelog = "https://github.com/debanjum/khoj/releases/tag/${version}";
-    license = lib.licenses.agpl3Plus;
-    maintainers = with lib.maintainers; [ dit7ya ];
-    broken = true; # last successful build 2024-01-10
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8880d26a6e64..618d8058503b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1295,6 +1295,7 @@ mapAliases {
   keyfinger = throw "keyfinder has been removed as it was abandoned upstream and did not build; consider using mixxx or keyfinder-cli"; # Addd 2024-08-25
   keysmith = throw "'keysmith' has been renamed to/replaced by 'libsForQt5.kdeGear.keysmith'"; # Converted to throw 2024-10-17
   kgx = gnome-console; # Added 2022-02-19
+  khoj = throw "khoj has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
   kibana7 = throw "Kibana 7.x has been removed from nixpkgs as it depends on an end of life Node.js version and received no maintenance in time."; # Added 2023-10-30
   kibana = kibana7; # Added 2023-10-30
   kio-admin = makePlasma5Throw "kio-admin"; # Added 2023-03-18

From 99ea56813bc5ef79283ba9a16ca234887290e866 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 05:40:28 +0000
Subject: [PATCH 0571/6226] fluent-bit: 4.0.10 -> 4.1.1

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

diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix
index 8a2a154b4d3c..61d88c37e69d 100644
--- a/pkgs/by-name/fl/fluent-bit/package.nix
+++ b/pkgs/by-name/fl/fluent-bit/package.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fluent-bit";
-  version = "4.0.10";
+  version = "4.1.1";
 
   src = fetchFromGitHub {
     owner = "fluent";
     repo = "fluent-bit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fYgZULGGlvuxgI5qOQ83AxcpEQQlw3ZpYLpu3hDJiSc=";
+    hash = "sha256-mu6WPp4jUAnLpZzFwy8HoKosCiYPxejsKEEnBRKodr4=";
   };
 
   # The source build documentation covers some dependencies and CMake options.

From e147c326e95ba7932cf9068f8435f2fb5fd8c2e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 07:15:46 +0000
Subject: [PATCH 0572/6226] nextcloud-whiteboard-server: 1.1.3 -> 1.3.0

---
 pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix b/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix
index a94f01778c3d..ae2a1842615a 100644
--- a/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix
+++ b/pkgs/by-name/ne/nextcloud-whiteboard-server/package.nix
@@ -8,16 +8,16 @@
 }:
 buildNpmPackage rec {
   pname = "nextcloud-whiteboard-server";
-  version = "1.1.3";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "nextcloud";
     repo = "whiteboard";
     tag = "v${version}";
-    hash = "sha256-4qk6mAFz7bYWtrlqiVPiyWF4ub4Ks9RhS5oODlOYRvA=";
+    hash = "sha256-fk+BiQ6jM/SvBioz56WHIhWGErgroCvagQq6/vMWCyk=";
   };
 
-  npmDepsHash = "sha256-WHSMK7s6vohphHoNh96yejdwXHBxdkQSpMMNiFS15E4=";
+  npmDepsHash = "sha256-x6ccAOq0yZ8DfZLIp2ZNpT8HMAjBr+e4gsEOUOskABs=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 10646b26a4816f284c73de3347b80005db49a62c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 10:21:06 +0000
Subject: [PATCH 0573/6226] sea-orm-cli: 1.1.16 -> 1.1.17

---
 pkgs/by-name/se/sea-orm-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/sea-orm-cli/package.nix b/pkgs/by-name/se/sea-orm-cli/package.nix
index 9a0226ea1e60..18d89bda4ff6 100644
--- a/pkgs/by-name/se/sea-orm-cli/package.nix
+++ b/pkgs/by-name/se/sea-orm-cli/package.nix
@@ -9,18 +9,18 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "sea-orm-cli";
-  version = "1.1.16";
+  version = "1.1.17";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-L8x7+yz/d03yOoWKWCtV1U+37JkTb28sH9OMxzrIsE4=";
+    hash = "sha256-qf0SPFOfp180j6IHds6aQ2y0oYcwQWq7VrO8iyi7LXo=";
   };
 
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = [ openssl ];
 
-  cargoHash = "sha256-efgzVuv9Lm8T+05Z0WAaux/l7hRdJdVPfpknKt22d50=";
+  cargoHash = "sha256-AqrS+5y3bKuqAVvbmWDO3V0OBVSkW6212WQeY1hixsk=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";

From d3256e3e9c761e48fb9fd2240ed95e32ace7bd42 Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Tue, 2 Sep 2025 20:09:17 +0200
Subject: [PATCH 0574/6226] shattered-pixel-dungeon: 3.1.1 -> 3.2.5

---
 .../games/shattered-pixel-dungeon/default.nix |   8 +-
 pkgs/games/shattered-pixel-dungeon/deps.json  | 121 ++++++++++++------
 2 files changed, 84 insertions(+), 45 deletions(-)

diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/default.nix
index 4ebd508dac9e..c37d7606ae92 100644
--- a/pkgs/games/shattered-pixel-dungeon/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/default.nix
@@ -6,15 +6,17 @@
 
 callPackage ./generic.nix rec {
   pname = "shattered-pixel-dungeon";
-  version = "3.1.1";
+  version = "3.2.5";
 
   src = fetchFromGitHub {
     owner = "00-Evan";
     repo = "shattered-pixel-dungeon";
-    rev = "v${version}";
-    hash = "sha256-MUpQdH8RMzZtI6e2duSRWHK1gPJDhMRKsm5kIKDcFuk=";
+    tag = "v${version}";
+    hash = "sha256-ltCKM46nzZZVJqHzo3V0Igyd4q+uD95fuLMWCi18jbQ=";
   };
 
+  patches = [ ];
+
   depsPath = ./deps.json;
 
   passthru.tests = {
diff --git a/pkgs/games/shattered-pixel-dungeon/deps.json b/pkgs/games/shattered-pixel-dungeon/deps.json
index 76260aee3636..bd67d4f5150f 100644
--- a/pkgs/games/shattered-pixel-dungeon/deps.json
+++ b/pkgs/games/shattered-pixel-dungeon/deps.json
@@ -1,60 +1,97 @@
 {
  "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
  "!version": 1,
- "https://oss.sonatype.org/content/repositories/snapshots/com/badlogicgames": {
-  "gdx-controllers#gdx-controllers-core/2.2.4-20231021.200112-6/SNAPSHOT": {
-   "jar": "sha256-Gdz2J1IvDJFktUD2XeGNS0SIrOyym19X/+dCbbbe3/U=",
-   "pom": "sha256-90QW/Mtz1jbDUhKjdJ88ekhulZR2a7eCaEJoswmeny4="
+ "https://central.sonatype.com/repository/maven-snapshots/com/badlogicgames": {
+  "gdx#gdx-backend-lwjgl3/1.13.6-20251003.170113-33/SNAPSHOT": {
+   "jar": "sha256-T2/VHXjfySwA+IjO2Bm0h29WvyoJsKyLmx2lkkBVJRw=",
+   "module": "sha256-JNBWxVhzTj4LFBGT/kZc36chXJ2uqwaUtcMUGQFLn2I=",
+   "pom": "sha256-P7DA/UDAWmA+/t4H3EJkktKK/e9+pX0gH4fpljqZXWQ="
   },
-  "gdx-controllers#gdx-controllers-desktop/2.2.4-20231021.200114-6/SNAPSHOT": {
-   "jar": "sha256-4mhLijZwQHk2pP5qXIIzrsO9CwNC3CDti/5szclkVa8=",
-   "pom": "sha256-10+zD8flpKIPzji5NFgtYcwE5O74hSzzvvqBh84wLf4="
+  "gdx#gdx-freetype-platform/1.13.6-20251003.170113-34/SNAPSHOT": {
+   "pom": "sha256-kTnggHqjEcoBlUTM+K15WHCqKodiKvGPrgnTHuTKU4o="
   },
-  "gdx-controllers/gdx-controllers-core/2.2.4-SNAPSHOT/maven-metadata": {
+  "gdx#gdx-freetype-platform/1.13.6-20251003.170113-34/SNAPSHOT/natives-desktop": {
+   "jar": "sha256-oHueMYiUcjnj/Ub6rxlyvLcqXRCVNlqGlV27aYHBqAs="
+  },
+  "gdx#gdx-freetype/1.13.6-20251003.170113-34/SNAPSHOT": {
+   "jar": "sha256-S6xHm1D4e5bWdtozqD1fwHe86HZAfnZ6KhzlIxXFf7s=",
+   "module": "sha256-gqUIFknNKRsg9HMnX0Gis0IEvIpJW8kphcjtwCAoLo4=",
+   "pom": "sha256-wi92v9kAtTv++AZjKT3wJYBeISF98NLNy26X9kEVFSk="
+  },
+  "gdx#gdx-platform/1.13.6-20251003.170113-33/SNAPSHOT": {
+   "pom": "sha256-UW0w1+UTHDD4HaYruY6QVmd/ur/0vHS4wYDZ5hDCEuQ="
+  },
+  "gdx#gdx-platform/1.13.6-20251003.170113-33/SNAPSHOT/natives-desktop": {
+   "jar": "sha256-yBteE7BAK+MEG1e43PjmQZy03S6LIcvJt4W41bGp34s="
+  },
+  "gdx#gdx/1.13.6-20251003.170113-33/SNAPSHOT": {
+   "jar": "sha256-GUbkm354hjSxjlPFsfQmTQi5FDcGEQUEry+avKWhsxI=",
+   "module": "sha256-t9BpvisJ2P37hHmwRUGxAKbCwhH6faZXL9AZ9V4T8Hw=",
+   "pom": "sha256-aDtJJZT/VHJyxd5RKFrQbc32IFT2wk9R7LeDvhBt8v4="
+  },
+  "gdx/gdx-backend-lwjgl3/1.13.6-SNAPSHOT/maven-metadata": {
    "xml": {
-    "groupId": "com.badlogicgames.gdx-controllers",
-    "lastUpdated": "20231021200112"
+    "groupId": "com.badlogicgames.gdx",
+    "lastUpdated": "20251003191628"
    }
   },
-  "gdx-controllers/gdx-controllers-desktop/2.2.4-SNAPSHOT/maven-metadata": {
+  "gdx/gdx-freetype-platform/1.13.6-SNAPSHOT/maven-metadata": {
    "xml": {
-    "groupId": "com.badlogicgames.gdx-controllers",
-    "lastUpdated": "20231021200114"
+    "groupId": "com.badlogicgames.gdx",
+    "lastUpdated": "20251003191640"
+   }
+  },
+  "gdx/gdx-freetype/1.13.6-SNAPSHOT/maven-metadata": {
+   "xml": {
+    "groupId": "com.badlogicgames.gdx",
+    "lastUpdated": "20251003191639"
+   }
+  },
+  "gdx/gdx-platform/1.13.6-SNAPSHOT/maven-metadata": {
+   "xml": {
+    "groupId": "com.badlogicgames.gdx",
+    "lastUpdated": "20251010022949"
+   }
+  },
+  "gdx/gdx/1.13.6-SNAPSHOT/maven-metadata": {
+   "xml": {
+    "groupId": "com.badlogicgames.gdx",
+    "lastUpdated": "20251003191624"
    }
   }
  },
+ "https://plugins.gradle.org/m2/org": {
+  "beryx#badass-runtime-plugin/1.13.1": {
+   "jar": "sha256-IW3RL1SacHD31B2wTupXAaF5Z0mzVerAzkMVLs0DGBc=",
+   "module": "sha256-Jf4I7QwECTJuc38vDJ/7BhyFQihl53ATdMOVyjpy9PA=",
+   "pom": "sha256-qZgenE/Me3hqUL+/IW93EBgs27ECjqsGiavMYeS37XI="
+  },
+  "beryx/runtime#org.beryx.runtime.gradle.plugin/1.13.1": {
+   "pom": "sha256-7SsiPX22wuiujLyvq8E96b0kKfwfNMtEFVh0jJCBu+U="
+  },
+  "slf4j#slf4j-api/1.7.32": {
+   "jar": "sha256-NiT4R0wa9G11+YvAl9eGSjI8gbOAiqQ2iabhxgHAJ74=",
+   "pom": "sha256-ABzeWzxrqRBwQlz+ny5pXkrri8KQotTNllMRJ6skT+U="
+  },
+  "slf4j#slf4j-parent/1.7.32": {
+   "pom": "sha256-WrNJ0PTHvAjtDvH02ThssZQKL01vFSFQ4W277MC4PHA="
+  }
+ },
  "https://repo.maven.apache.org/maven2": {
-  "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.12.1": {
-   "jar": "sha256-B3OwjHfBoHcJPFlyy4u2WJuRe4ZF/+tKh7gKsDg41o0=",
-   "module": "sha256-9O7d2ip5+E6OiwN47WWxC8XqSX/mT+b0iDioCRTTyqc=",
-   "pom": "sha256-IRSihaCUPC2d0QzB0MVDoOWM1DXjcisTYtnaaxR9SRo="
+  "com/badlogicgames/gdx#gdx-jnigen-loader/2.5.2": {
+   "jar": "sha256-34HyPP1nhcUtNeEI7qo5MPVZ1NJ3CmEC51ynv6b58no=",
+   "module": "sha256-jwtii5G9Ez24XxUuFZMprPf0tmeDvR32AcNZfcJRIiQ=",
+   "pom": "sha256-i0dgu2bbPz+ZuEBj7z6ZDWOhzZx81XSlatf07kvRdoc="
   },
-  "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1": {
-   "pom": "sha256-cAGFUunqi4o21kDX8V86OT6aMmXjJUqyMHLHhUWLBm4="
+  "com/badlogicgames/gdx-controllers#gdx-controllers-core/2.2.4": {
+   "jar": "sha256-BNpnYnsaNkbvjyFMkdKWdCp8BVl9vCFnqqsJy9zHdHA=",
+   "module": "sha256-dxOP5TsOdeRf4dOROsublicWFxCuVPJUR0sizmp6pIA=",
+   "pom": "sha256-k7HO3nAet8GNZfFei7eds5zzGk6u5pMceIl84NgOMlQ="
   },
-  "com/badlogicgames/gdx#gdx-freetype-platform/1.12.1/natives-desktop": {
-   "jar": "sha256-1g5ZN21QWpk+yLogowR3rwaQKx4pJ/8uN17/2/Ql2UE="
-  },
-  "com/badlogicgames/gdx#gdx-freetype/1.12.1": {
-   "jar": "sha256-rbjskAa7YdrW0pdslaHeGN5eGmUULRilgH0OUkyL8WU=",
-   "module": "sha256-HG9UGDxQFjSvGqLrKEkE7YnVvqtURs7FyqWwunHdXKE=",
-   "pom": "sha256-pLaMZBcEufzo+xszIlcUPJSYJJQg1uY6rm7tb6fHyT8="
-  },
-  "com/badlogicgames/gdx#gdx-jnigen-loader/2.3.1": {
-   "jar": "sha256-ZJDdoiWmHHYCwnu+xOSBE3/1lfjOCy3bpBTww0Bq7mA=",
-   "module": "sha256-nNWFK9nlHTbRJxrypGzZfOwk5XEHblQTbsmtNxhGua8=",
-   "pom": "sha256-7e2XZPzSpbw8peeAUEHppiAZ+ovkNLWZ8D1JR+KkQng="
-  },
-  "com/badlogicgames/gdx#gdx-platform/1.12.1": {
-   "pom": "sha256-bZhlcVVYfr/+qIAG20v12CgcyUetGduKZP28TnOzkZc="
-  },
-  "com/badlogicgames/gdx#gdx-platform/1.12.1/natives-desktop": {
-   "jar": "sha256-P+utqUwiNjYQkXufuMJLD55h4+bGnHO9DTUDhYTA4e0="
-  },
-  "com/badlogicgames/gdx#gdx/1.12.1": {
-   "jar": "sha256-jTIJ6UghH96c2swrAfrO0yPlSKpS73jlx2CEWoh0aXA=",
-   "module": "sha256-7Th6fCSDcEBGAyOsXYZIZwKAPw88K1h448x4If03n6o=",
-   "pom": "sha256-Qg9vfLMYtQsglKsHYme67w6bBlI0yHqWCqkvtCEYpZY="
+  "com/badlogicgames/gdx-controllers#gdx-controllers-desktop/2.2.4": {
+   "jar": "sha256-jjkOWcYhHtI+Cm/UAYzvo3+LmGXe5pmVaZBTSWuAHWw=",
+   "module": "sha256-zhrDRlPnkWGq8Nycm+vdDb1zQW0pHSz8ljavonod9mU=",
+   "pom": "sha256-2pO01ZTa8EMd+Q7bPPEOHjpGnCgCDHZb5P+fYKD6bTY="
   },
   "com/badlogicgames/jamepad#jamepad/2.26.5.0": {
    "jar": "sha256-sO+RC6Uxyt/gQYSWow2Hy6xGAhsGJUf1tZR+A1Q1cRo=",

From a4d09cbbb7e0b9f2c1fd284b3630ae1f86dcb7fb Mon Sep 17 00:00:00 2001
From: Francesco Gazzetta <fgaz@fgaz.me>
Date: Sat, 11 Oct 2025 12:53:51 +0200
Subject: [PATCH 0575/6226] tower-pixel-dungeon: 0.5.4 -> 1.0.0

---
 .../tower-pixel-dungeon/default.nix           |  7 ++--
 .../tower-pixel-dungeon/deps.json             | 39 +++++++++++++++++++
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix b/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix
index c17d6d1507b9..936bfa00758d 100644
--- a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix
+++ b/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix
@@ -6,23 +6,24 @@
 
 callPackage ../generic.nix rec {
   pname = "tower-pixel-dungeon";
-  version = "0.5.4";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "FixAkaTheFix";
     repo = "Tower-Pixel-Dungeon";
     tag = "TPDv${lib.replaceStrings [ "." ] [ "" ] version}";
-    hash = "sha256-6b7EC7rye7nSevMJhRwSKJU7zuzta6KUCgzizWPFk8I=";
+    hash = "sha256-8q1Wt+FXhw58+fK9WMiAcwNrwJfBa5oRBztFmfQz0Uk=";
   };
 
   sourceRoot = src.name + "/pixel-towers-master";
 
   desktopName = "Tower Pixel Dungeon";
 
+  patches = [ ];
+
   # Sprite sources (Paint.NET files) and other files interfere with the build process.
   postPatch = ''
     rm core/src/main/assets/{levelsplashes,sprites}/*.pdn
-    rm core/src/main/assets/environment/*.lnk
   '';
 
   meta = {
diff --git a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json b/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json
index 1448fe4b65f8..c4ba3f9b408d 100644
--- a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json
+++ b/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json
@@ -1,6 +1,45 @@
 {
  "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.",
  "!version": 1,
+ "https://plugins.gradle.org/m2/org": {
+  "beryx#badass-runtime-plugin/1.12.7": {
+   "jar": "sha256-N3Mx2VyxIFb6U6Qt9/RfF4svqG1sWF9w74TRIz0RB0U=",
+   "pom": "sha256-9vIy9OpH3sXV5y4jWaQG+pMd8/M2fiVdMmkkCAPBtkk="
+  },
+  "beryx/runtime#org.beryx.runtime.gradle.plugin/1.12.7": {
+   "pom": "sha256-95lWpL5pLmiBvaBnA0zUDOOqFX8ti9VWS5wAKWxrK3M="
+  },
+  "ow2#ow2/1.5": {
+   "pom": "sha256-D4obEW52C4/mOJxRuE5LB6cPwRCC1Pk25FO1g91QtDs="
+  },
+  "ow2/asm#asm-analysis/9.1": {
+   "jar": "sha256-gaiAQbG4vtpaiplkYJgEbEhwlTgnDEne9oq/8lrDvjQ=",
+   "pom": "sha256-rFRUwRsDQxypUd9x+06GyMTIDfaXn5W3V8rtOrD0cVY="
+  },
+  "ow2/asm#asm-commons/9.1": {
+   "jar": "sha256-r8sm3B/BLAxKma2mcJCN2C4Y38SIyvXuklRplrRwwAw=",
+   "pom": "sha256-oPZRsnuK/pwOYS16Ambqy197HHh7xLWsgkXz16EYG38="
+  },
+  "ow2/asm#asm-tree/9.1": {
+   "jar": "sha256-/QCvpJ6VlddkYgWwnOy0p3ao/wugby1ZuPe/nHBLSnM=",
+   "pom": "sha256-tqANkgfANUYPgcfXDtQSU/DSFmUr7UX6GjBS/81QuUw="
+  },
+  "ow2/asm#asm-util/9.1": {
+   "jar": "sha256-OA4uzRb3zA8adrqboEkXm1dgpXsoKoekxlPK7/LNW9Y=",
+   "pom": "sha256-jd108aHiuTxwnZdtAgXnT7850AVwPJYmpe1cxXTK+88="
+  },
+  "ow2/asm#asm/9.1": {
+   "jar": "sha256-zaTeRV+rSP8Ly3xItGOUR9TehZp6/DCglKmG8JNr66I=",
+   "pom": "sha256-xoOpDdaPKxeIy9/EZH6pQF71kls3HBmfj9OdRNPO3o0="
+  },
+  "slf4j#slf4j-api/1.7.25": {
+   "jar": "sha256-GMSgCV1cHaa4F1kudnuyPSndL1YK1033X/OWHb3iW3k=",
+   "pom": "sha256-fNnXoLXZPf1GGhSIkbQ1Cc9AOpx/n7SQYNNVTfHIHh4="
+  },
+  "slf4j#slf4j-parent/1.7.25": {
+   "pom": "sha256-GPXFISDbA26I1hNviDnIMtB0vdqVx1bG9CkknS21SsY="
+  }
+ },
  "https://repo.maven.apache.org/maven2": {
   "com/badlogicgames/gdx#gdx-backend-lwjgl3/1.11.0": {
    "jar": "sha256-my0CJorGB5QwSi4E5ep1H62fX5bsyvFdgCOm4LF6994=",

From 71cf1fcec1e3c69662739c00995c2809076934f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 12:32:41 +0000
Subject: [PATCH 0576/6226] freeciv: 3.2.0 -> 3.2.1

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

diff --git a/pkgs/by-name/fr/freeciv/package.nix b/pkgs/by-name/fr/freeciv/package.nix
index 8e25266351cb..3cca181c3b42 100644
--- a/pkgs/by-name/fr/freeciv/package.nix
+++ b/pkgs/by-name/fr/freeciv/package.nix
@@ -34,13 +34,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "freeciv";
-  version = "3.2.0";
+  version = "3.2.1";
 
   src = fetchFromGitHub {
     owner = "freeciv";
     repo = "freeciv";
     tag = "R${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
-    hash = "sha256-IlJ51ryoQ7qzIY9n8dmPQdwH8aPjXvRXXO2COOxWRcc=";
+    hash = "sha256-Rl/B71pp5PA6mtRaKs8TbOya18cYxlNmMzVJ4ySVmhY=";
   };
 
   postPatch = ''

From da41efc0e310e19cbbca1e223b0261c3ddc2666e Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 11 Oct 2025 10:01:23 -0400
Subject: [PATCH 0577/6226] opae: drop

Corresponding package has been marked broken for at least a full release cycle.

Dropping per RFC 180.
---
 pkgs/by-name/op/opae/package.nix | 67 --------------------------------
 pkgs/top-level/aliases.nix       |  1 +
 2 files changed, 1 insertion(+), 67 deletions(-)
 delete mode 100644 pkgs/by-name/op/opae/package.nix

diff --git a/pkgs/by-name/op/opae/package.nix b/pkgs/by-name/op/opae/package.nix
deleted file mode 100644
index 1606a77b60d8..000000000000
--- a/pkgs/by-name/op/opae/package.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  libuuid,
-  json_c,
-  doxygen,
-  perl,
-  python3,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "opae";
-  version = "1.0.0";
-
-  # the tag has a silly name for some reason. drop this in the future if
-  # possible
-  tver = "${version}-5";
-
-  src = fetchFromGitHub {
-    owner = "opae";
-    repo = "opae-sdk";
-    tag = tver;
-    sha256 = "1dmkpnr9dqxwjhbdzx2r3fdfylvinda421yyg319am5gzlysxwi8";
-  };
-
-  doCheck = false;
-
-  env.NIX_CFLAGS_COMPILE = toString [
-    "-Wno-error=format-truncation"
-    "-Wno-error=address-of-packed-member"
-    "-Wno-array-bounds"
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    doxygen
-    perl
-    python3.pkgs.sphinx
-  ];
-  buildInputs = [
-    libuuid
-    json_c
-    python3
-  ];
-
-  # Set the Epoch to 1980; otherwise the Python wheel/zip code
-  # gets very angry
-  preConfigure = ''
-    find . -type f | while read file; do
-      touch -d @315532800 $file;
-    done
-  '';
-
-  cmakeFlags = [ "-DBUILD_ASE=1" ];
-
-  meta = with lib; {
-    description = "Open Programmable Acceleration Engine SDK";
-    homepage = "https://01.org/opae";
-    license = licenses.bsd3;
-    platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ thoughtpolice ];
-    # Needs a major update, not compatible with gcc-11.
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8880d26a6e64..39f7e0163407 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1981,6 +1981,7 @@ mapAliases {
   oneDNN_2 = throw "oneDNN_2 has been removed as it was only used by rocmPackages.migraphx"; # added 2025-07-18
   onevpl-intel-gpu = lib.warnOnInstantiate "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04
   onthespot = throw "onethespot has been removed due to lack of upstream maintenance"; # Added 2025-09-26
+  opae = throw "opae has been removed because it has been marked as broken since June 2023."; # Added 2025-10-11
   openai-triton-llvm = triton-llvm; # added 2024-07-18
   openai-whisper-cpp = whisper-cpp; # Added 2024-12-13
   openbabel2 = throw "openbabel2 has been removed, as it was unused and unmaintained upstream; please use openbabel"; # Added 2025-09-17

From 22a2102bcbcc4f05f4075605df7b1e1545d2ca5a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 14:36:35 +0000
Subject: [PATCH 0578/6226] weasis: 4.6.3 -> 4.6.5

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

diff --git a/pkgs/by-name/we/weasis/package.nix b/pkgs/by-name/we/weasis/package.nix
index f3c7fbdecbb8..149ee390d12c 100644
--- a/pkgs/by-name/we/weasis/package.nix
+++ b/pkgs/by-name/we/weasis/package.nix
@@ -22,12 +22,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "weasis";
-  version = "4.6.3";
+  version = "4.6.5";
 
   # Their build instructions indicate to use the packaging script
   src = fetchzip {
     url = "https://github.com/nroduit/Weasis/releases/download/v${finalAttrs.version}/weasis-native.zip";
-    hash = "sha256-1dvBKxInuk8FpZjo59+LkIuEBTr57wkLaHfvvvT6bOg=";
+    hash = "sha256-wUkHHbqlFl4L0l4Bd6iXXjEgDwVay2zCJ7ucSvfAGWw=";
     stripRoot = false;
   };
 

From 0bf9809d48c2282a7ee1e4bf9984ad42e24ebfbe Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 11 Oct 2025 16:44:53 +0200
Subject: [PATCH 0579/6226] gcovr: 8.3 -> 8.4

---
 pkgs/by-name/gc/gcovr/package.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/gc/gcovr/package.nix b/pkgs/by-name/gc/gcovr/package.nix
index 22f796de7838..e56391df68d6 100644
--- a/pkgs/by-name/gc/gcovr/package.nix
+++ b/pkgs/by-name/gc/gcovr/package.nix
@@ -6,22 +6,26 @@
 
 python3Packages.buildPythonPackage rec {
   pname = "gcovr";
-  version = "8.3";
+  version = "8.4";
   pyproject = true;
 
   disabled = python3Packages.pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-+qNx+cSn94yYANplUQfU+Z8EtxjRwNn0jK/cvvAEkHk=";
+    hash = "sha256-jqDPIxdrECnyjbZ51xLKZHezgHCXw3VcE1vcU7Uc+nI=";
   };
 
-  build-system = [ python3Packages.hatchling ];
+  build-system = with python3Packages; [
+    hatchling
+    hatch-fancy-pypi-readme
+    hatch-vcs
+  ];
 
   # pythonRelaxDeps do not work on pyproject.toml
   preBuild = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "hatchling==1.26.1" "hatchling"
+      --replace-fail "hatchling==1.26.3" "hatchling"
     substituteInPlace pyproject.toml \
       --replace-fail "hatch-fancy-pypi-readme==24.1.0" "hatch-fancy-pypi-readme>=24.1.0"
     substituteInPlace pyproject.toml \
@@ -36,8 +40,6 @@ python3Packages.buildPythonPackage rec {
         jinja2
         lxml
         pygments
-        hatch-fancy-pypi-readme
-        hatch-vcs
       ]
       ++ lib.optionals (pythonOlder "3.11") [ tomli ]
     );

From dadd5e3cd29ab6f874616f9e6cf1a0247ce1c301 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 14:45:31 +0000
Subject: [PATCH 0580/6226] actionlint: 1.7.7 -> 1.7.8

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

diff --git a/pkgs/by-name/ac/actionlint/package.nix b/pkgs/by-name/ac/actionlint/package.nix
index 72cda1076f42..ff6a634f47b4 100644
--- a/pkgs/by-name/ac/actionlint/package.nix
+++ b/pkgs/by-name/ac/actionlint/package.nix
@@ -11,7 +11,7 @@
 
 buildGoModule rec {
   pname = "actionlint";
-  version = "1.7.7";
+  version = "1.7.8";
 
   subPackages = [ "cmd/actionlint" ];
 
@@ -19,10 +19,10 @@ buildGoModule rec {
     owner = "rhysd";
     repo = "actionlint";
     tag = "v${version}";
-    hash = "sha256-dmd6AWL96sG+Cb+CVtCUhaStfsx8qRnvpcB2OjfLenU=";
+    hash = "sha256-0bUWsEBfIZdl+wPt4nysZ5SbSz8AaRg1WutqMxCqdfk=";
   };
 
-  vendorHash = "sha256-4SkhMRDXHKYxKK3POqtti/esj2cqx0Dl92q/qzzaqH0=";
+  vendorHash = "sha256-JWdVcX1wAituPb0N4Sg6tM9gsygEPFUblBPH2YcpBvE=";
 
   nativeBuildInputs = [
     makeWrapper

From 4f8a51f26e9792d8274b7a546a03f91d8b90a50c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 11 Oct 2025 08:36:25 -0700
Subject: [PATCH 0581/6226] Revert "python311Packages.tkinter: mark broken"

This reverts commit 2c574b9c4c6f97074c24d4019cf1279a5613134b because
python311Packages.tkinter was fixed in https://github.com/NixOS/nixpkgs/pull/442184.
---
 pkgs/development/python-modules/tkinter/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/tkinter/default.nix b/pkgs/development/python-modules/tkinter/default.nix
index 9918d40969c4..233b2b2b0e4a 100644
--- a/pkgs/development/python-modules/tkinter/default.nix
+++ b/pkgs/development/python-modules/tkinter/default.nix
@@ -109,7 +109,6 @@ buildPythonPackage {
   pythonImportsCheck = [ "tkinter" ];
 
   meta = {
-    broken = pythonOlder "3.12"; # tommath.h: No such file or directory
     # Based on first sentence from https://docs.python.org/3/library/tkinter.html
     description = "Standard Python interface to the Tcl/Tk GUI toolkit";
     longDescription = ''

From c3dd2c7888dc536a31bb31b540c92ae6cb1fb72f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 11 Oct 2025 08:37:23 -0700
Subject: [PATCH 0582/6226] Revert "python311Packages.matplotlib: disable Tk on
 Python 3.11"

This reverts commit 22412a6ab0448c78663d60277cc0a47a3f1987f4.
---
 pkgs/development/python-modules/matplotlib/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/matplotlib/default.nix b/pkgs/development/python-modules/matplotlib/default.nix
index 926dd2467971..4c23466b9880 100644
--- a/pkgs/development/python-modules/matplotlib/default.nix
+++ b/pkgs/development/python-modules/matplotlib/default.nix
@@ -4,7 +4,6 @@
   fetchPypi,
   buildPythonPackage,
   isPyPy,
-  pythonAtLeast,
   pythonOlder,
 
   # build-system
@@ -53,8 +52,7 @@
 
   # Tk
   # Darwin has its own "MacOSX" backend, PyPy has tkagg backend and does not support tkinter
-  # tkinter fails to build on Python 3.11
-  enableTk ? (!stdenv.hostPlatform.isDarwin && !isPyPy && pythonAtLeast "3.12"),
+  enableTk ? (!stdenv.hostPlatform.isDarwin && !isPyPy),
   tkinter,
 
   # Qt

From 4732cb854ebd87eebd05d2b47de46aff7d0e5aac Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 11 Oct 2025 17:27:22 +0200
Subject: [PATCH 0583/6226] yaxmldiff: init at 0.2.0

---
 .../python-modules/yaxmldiff/default.nix      | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/python-modules/yaxmldiff/default.nix

diff --git a/pkgs/development/python-modules/yaxmldiff/default.nix b/pkgs/development/python-modules/yaxmldiff/default.nix
new file mode 100644
index 000000000000..f018e3785189
--- /dev/null
+++ b/pkgs/development/python-modules/yaxmldiff/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  # build-system
+  hatchling,
+  hatch-fancy-pypi-readme,
+  # dependencies
+  lxml,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "yaxmldiff";
+  version = "0.2.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "latk";
+    repo = "yaxmldiff.py";
+    tag = "v${version}";
+    hash = "sha256-AOXnK1d+b/ae50ofBfgxiDS6Dj6TIeHMrE9ME95Yj1Q=";
+  };
+
+  build-system = [
+    hatchling
+    hatch-fancy-pypi-readme
+  ];
+
+  dependencies = [ lxml ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  meta = {
+    description = "Yet Another XML Differ";
+    homepage = "https://github.com/latk/yaxmldiff.py";
+    changelog = "https://https://github.com/latk/yaxmldiff.py/blob/v${src.tag}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ sigmanificient ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3ffc11747bd0..473a638394d2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20442,6 +20442,8 @@ self: super: with self; {
 
   yattag = callPackage ../development/python-modules/yattag { };
 
+  yaxmldiff = callPackage ../development/python-modules/yaxmldiff { };
+
   ydata-profiling = callPackage ../development/python-modules/ydata-profiling { };
 
   ydiff = callPackage ../development/python-modules/ydiff { };

From 5d4b03cf8457eb801fa24e4ae19d8ca3ee6d98c1 Mon Sep 17 00:00:00 2001
From: NullCube <nullcub3@gmail.com>
Date: Sat, 11 Oct 2025 09:33:53 -0700
Subject: [PATCH 0584/6226] orca-slicer: fix version number

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

diff --git a/pkgs/by-name/or/orca-slicer/package.nix b/pkgs/by-name/or/orca-slicer/package.nix
index 3af7a88fe49a..03e490f8e0b4 100644
--- a/pkgs/by-name/or/orca-slicer/package.nix
+++ b/pkgs/by-name/or/orca-slicer/package.nix
@@ -58,12 +58,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "orca-slicer";
-  version = "v2.3.1";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "SoftFever";
     repo = "OrcaSlicer";
-    tag = finalAttrs.version;
+    tag = "v${finalAttrs.version}";
     hash = "sha256-RdMBx/onLq58oI1sL0cHmF2SGDfeI9KkPPCbjyMqECI=";
   };
 

From 4b86bd8064d50e6479cc4890b7fb4134b25b4db9 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 11 Oct 2025 12:58:33 -0400
Subject: [PATCH 0585/6226] python3Packages.pyvoro: drop

Has been marked broken for at least a full release cycle.

Dropping per RFC 180.
---
 .../python-modules/pyvoro/default.nix         | 36 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pyvoro/default.nix

diff --git a/pkgs/development/python-modules/pyvoro/default.nix b/pkgs/development/python-modules/pyvoro/default.nix
deleted file mode 100644
index 403f61571b46..000000000000
--- a/pkgs/development/python-modules/pyvoro/default.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-}:
-
-buildPythonPackage rec {
-  version = "1.3.2";
-  format = "setuptools";
-  pname = "pyvoro";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "f31c047f6e4fc5f66eb0ab43afd046ba82ce247e18071141791364c4998716fc";
-  };
-
-  # No tests in package
-  doCheck = false;
-
-  meta = with lib; {
-    homepage = "https://github.com/joe-jordan/pyvoro";
-    description = "2D and 3D Voronoi tessellations: a python entry point for the voro++ library";
-    license = licenses.mit;
-    maintainers = [ ];
-
-    # Cython generated code is vendored directly and no longer compatible with
-    # newer versions of the CPython C API.
-    #
-    # Upstream explicitly removed the Cython source files from the source
-    # distribution, making it impossible for us to force-compile them:
-    # https://github.com/joe-jordan/pyvoro/commit/922bba6db32d44c2e1825228627a25aa891f9bc1
-    #
-    # No upstream activity since 2014.
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 0521f9bc947b..8b86eb6f6f78 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -706,6 +706,7 @@ mapAliases {
   pyvicare-neo = pyvicare; # Added 2024-11-06
   pyvcf = throw "pyvcf has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-05-19
   PyVirtualDisplay = pyvirtualdisplay; # added 2023-02-19
+  pyvoro = throw "pyvoro has been removed because it is unmaintained upstream and has been marked as broken since 2023."; # Added 2025-10-11
   pywick = throw "pywick has been removed, since it is no longer maintained"; # added 2023-07-01
   pyxb = throw "pyxb has been removed, its last release was in 2017 and it has finally been archived in April 2023."; # added 2024-01-05
   pyzufall = throw "pyzufall was removed, because it is no longer maintained"; # added 2024-05-14
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3ffc11747bd0..ade9930b20b7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15398,8 +15398,6 @@ self: super: with self; {
 
   pyvolumio = callPackage ../development/python-modules/pyvolumio { };
 
-  pyvoro = callPackage ../development/python-modules/pyvoro { };
-
   pyvows = callPackage ../development/python-modules/pyvows { };
 
   pyw215 = callPackage ../development/python-modules/pyw215 { };

From c2a221e0191031f6076fe8c80b16c36ec4e1653f Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 11 Oct 2025 13:12:14 -0400
Subject: [PATCH 0586/6226] python3Packages.schemainspect: drop

Has transitively been marked broken for at least a full release cycle.

Dropping per RFC 180.
---
 .../python-modules/schemainspect/default.nix  | 117 ------------------
 pkgs/top-level/python-aliases.nix             |   1 +
 pkgs/top-level/python-packages.nix            |   2 -
 3 files changed, 1 insertion(+), 119 deletions(-)
 delete mode 100644 pkgs/development/python-modules/schemainspect/default.nix

diff --git a/pkgs/development/python-modules/schemainspect/default.nix b/pkgs/development/python-modules/schemainspect/default.nix
deleted file mode 100644
index 7a3c322168f0..000000000000
--- a/pkgs/development/python-modules/schemainspect/default.nix
+++ /dev/null
@@ -1,117 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  fetchpatch,
-  pythonOlder,
-  sqlalchemy,
-  sqlbag,
-  setuptools,
-  poetry-core,
-  pytestCheckHook,
-  pytest-xdist,
-  pytest-sugar,
-  postgresql,
-  postgresqlTestHook,
-}:
-buildPythonPackage {
-  pname = "schemainspect";
-  version = "3.1.1663587362";
-  format = "pyproject";
-  disabled = pythonOlder "3.7";
-
-  src = fetchFromGitHub {
-    owner = "djrobstep";
-    repo = "schemainspect";
-    # no tags on github, version patch number is unix time.
-    rev = "066262d6fb4668f874925305a0b7dbb3ac866882";
-    hash = "sha256-SYpQQhlvexNc/xEgSIk8L8J+Ta+3OZycGLeZGQ6DWzk=";
-  };
-
-  patches = [
-    # https://github.com/djrobstep/schemainspect/pull/87
-    (fetchpatch {
-      name = "specify_poetry.patch";
-      url = "https://github.com/djrobstep/schemainspect/commit/bdcd001ef7798236fe0ff35cef52f34f388bfe68.patch";
-      hash = "sha256-/SEmcV9GjjvzfbszeGPkfd2DvYenl7bZyWdC0aI3M4M=";
-    })
-  ];
-
-  nativeBuildInputs = [ poetry-core ];
-  propagatedBuildInputs = [
-    setuptools # needed for 'pkg_resources'
-    sqlalchemy
-  ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    pytest-xdist
-    pytest-sugar
-
-    postgresql
-    postgresqlTestHook
-
-    sqlbag
-  ];
-
-  preCheck = ''
-    export PGUSER="nixbld";
-    export postgresqlEnableTCP=1;
-  '';
-  disabledTests = [
-    # These all fail with "List argument must consist only of tuples or dictionaries":
-    # Related issue: https://github.com/djrobstep/schemainspect/issues/88
-    "test_can_replace"
-    "test_collations"
-    "test_constraints"
-    "test_dep_order"
-    "test_enum_deps"
-    "test_exclusion_constraint"
-    "test_fk_col_order"
-    "test_fk_info"
-    "test_generated_columns"
-    "test_identity_columns"
-    "test_indexes"
-    "test_inherit"
-    "test_kinds"
-    "test_lineendings"
-    "test_long_identifiers"
-    "test_partitions"
-    "test_postgres_inspect"
-    "test_postgres_inspect_excludeschema"
-    "test_postgres_inspect_sigleschema"
-    "test_raw_connection"
-    "test_relationship"
-    "test_replica_trigger"
-    "test_rls"
-    "test_separate_validate"
-    "test_sequences"
-    "test_table_dependency_order"
-    "test_types_and_domains"
-    "test_view_trigger"
-    "test_weird_names"
-  ];
-
-  pytestFlags = [
-    "-x"
-    "-svv"
-  ];
-
-  enabledTestPaths = [
-    "tests"
-  ];
-
-  pythonImportsCheck = [ "schemainspect" ];
-
-  postUnpack = ''
-    # this dir is used to bump the version number, having it here fails the build
-    rm -r ./source/deploy
-  '';
-
-  meta = with lib; {
-    description = "Schema inspection for PostgreSQL, and potentially others";
-    homepage = "https://github.com/djrobstep/schemainspect";
-    license = with licenses; [ unlicense ];
-    maintainers = with maintainers; [ bpeetz ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 0521f9bc947b..4eddced45fea 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -761,6 +761,7 @@ mapAliases {
   sabyenc = throw "sabyenc has been removed, due to no updates since June 2019 and being superseded by sabyenc3"; # added 2025-05-03
   sampledata = throw "sampledata has been removed, it was unmaintained since 2017"; # added 2024-07-27
   sapi-python-client = kbcstorage; # added 2022-04-20
+  schemainspect = throw "schemainspect has been removed because it has transitively been marked broken since May 2024, and is unmaintained upstream."; # Added 2025-10-11
   scikitimage = scikit-image; # added 2023-05-14
   scikitlearn = scikit-learn; # added 2021-07-21
   scikit-optimize = throw "scikit-optimize has been removed because it is abandoned"; # added 2024-09-30
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5f5db002b880..6c7753ea9a20 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16430,8 +16430,6 @@ self: super: with self; {
 
   schema-salad = callPackage ../development/python-modules/schema-salad { };
 
-  schemainspect = callPackage ../development/python-modules/schemainspect { };
-
   schemdraw = callPackage ../development/python-modules/schemdraw { };
 
   schiene = callPackage ../development/python-modules/schiene { };

From f36935002e6676d3a2eeef13731d62e7e515a0a8 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 11 Oct 2025 13:16:41 -0400
Subject: [PATCH 0587/6226] migra: drop

Has transitively been marked broken for at least a full release cycle.

Dropping per RFC 180.
---
 pkgs/by-name/mi/migra/package.nix | 62 -------------------------------
 pkgs/top-level/aliases.nix        |  1 +
 2 files changed, 1 insertion(+), 62 deletions(-)
 delete mode 100644 pkgs/by-name/mi/migra/package.nix

diff --git a/pkgs/by-name/mi/migra/package.nix b/pkgs/by-name/mi/migra/package.nix
deleted file mode 100644
index 0829c79e0493..000000000000
--- a/pkgs/by-name/mi/migra/package.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  lib,
-  python3,
-  fetchFromGitHub,
-  postgresql,
-  postgresqlTestHook,
-}:
-python3.pkgs.buildPythonApplication rec {
-  pname = "migra";
-  version = "3.0.1647431138";
-  format = "pyproject";
-
-  src = fetchFromGitHub {
-    owner = "djrobstep";
-    repo = "migra";
-    rev = version;
-    hash = "sha256-LSCJA5Ym1LuV3EZl6gnl9jTHGc8A1LXmR1fj0ZZc+po=";
-  };
-
-  nativeBuildInputs = [
-    python3.pkgs.poetry-core
-  ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    schemainspect
-    six
-    sqlbag
-  ];
-
-  nativeCheckInputs = with python3.pkgs; [
-    pytestCheckHook
-    postgresql
-    postgresqlTestHook
-  ];
-  preCheck = ''
-    export PGUSER="nixbld";
-  '';
-  disabledTests = [
-    # These all fail with "List argument must consist only of tuples or dictionaries":
-    # See this issue: https://github.com/djrobstep/migra/issues/232
-    "test_excludeschema"
-    "test_fixtures"
-    "test_rls"
-    "test_singleschema"
-  ];
-
-  pytestFlags = [
-    "-x"
-    "-svv"
-  ];
-
-  enabledTestPaths = [
-    "tests"
-  ];
-
-  meta = with lib; {
-    description = "Like diff but for PostgreSQL schemas";
-    homepage = "https://github.com/djrobstep/migra";
-    license = with licenses; [ unlicense ];
-    maintainers = with maintainers; [ bpeetz ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8880d26a6e64..e4c1eb9ed5ae 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1743,6 +1743,7 @@ mapAliases {
   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 = midori; # Added 2025-05-19
   MIDIVisualizer = midivisualizer; # Added 2024-06-12
+  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
   mikutter = throw "'mikutter' has been removed because the package was broken and had no maintainers"; # Added 2024-10-01
   mime-types = mailcap; # Added 2022-01-21

From de619debe565a43f49a42501b6dabe734bc291e2 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 11 Oct 2025 13:19:58 -0400
Subject: [PATCH 0588/6226] python3Packages.sqlbag: drop

Has been marked broken for at least a full release cycle.

Dropping per RFC 180.
---
 .../python-modules/sqlbag/default.nix         | 92 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 94 deletions(-)
 delete mode 100644 pkgs/development/python-modules/sqlbag/default.nix

diff --git a/pkgs/development/python-modules/sqlbag/default.nix b/pkgs/development/python-modules/sqlbag/default.nix
deleted file mode 100644
index f3cf77bbb993..000000000000
--- a/pkgs/development/python-modules/sqlbag/default.nix
+++ /dev/null
@@ -1,92 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  psycopg2,
-  pymysql,
-  sqlalchemy,
-  six,
-  flask,
-  pendulum,
-  packaging,
-  setuptools,
-  poetry-core,
-  pytestCheckHook,
-  pytest-xdist,
-  pytest-sugar,
-  postgresql,
-  postgresqlTestHook,
-}:
-buildPythonPackage {
-  pname = "sqlbag";
-  version = "0.1.1617247075";
-  format = "pyproject";
-
-  src = fetchFromGitHub {
-    owner = "djrobstep";
-    repo = "sqlbag";
-    # no tags on github, version patch number is unix time.
-    rev = "eaaeec4158ffa139fba1ec30d7887f4d836f4120";
-    hash = "sha256-lipgnkqrzjzqwbhtVcWDQypBNzq6Dct/qoM8y/FNiNs=";
-  };
-
-  nativeBuildInputs = [ poetry-core ];
-
-  propagatedBuildInputs = [
-    sqlalchemy
-    six
-    packaging
-
-    psycopg2
-    pymysql
-
-    setuptools # needed for 'pkg_resources'
-  ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    pytest-xdist
-    pytest-sugar
-
-    postgresql
-    postgresqlTestHook
-
-    flask
-    pendulum
-  ];
-
-  preCheck = ''
-    export PGUSER="nixbld";
-  '';
-
-  enabledTestPaths = [
-    "tests"
-  ];
-
-  disabledTests = [
-    # These all fail with "List argument must consist only of tuples or dictionaries":
-    # Related issue: https://github.com/djrobstep/sqlbag/issues/14
-    "test_basic"
-    "test_createdrop"
-    "test_errors_and_messages"
-    "test_flask_integration"
-    "test_orm_stuff"
-    "test_pendulum_for_time_types"
-    "test_transaction_separation"
-  ];
-
-  pytestFlags = [
-    "-x"
-    "-svv"
-  ];
-
-  pythonImportsCheck = [ "sqlbag" ];
-
-  meta = with lib; {
-    description = "Handy python code for doing database things";
-    homepage = "https://github.com/djrobstep/sqlbag";
-    license = with licenses; [ unlicense ];
-    maintainers = with maintainers; [ bpeetz ];
-    broken = true; # Fails to build against the current flask version
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e4c1eb9ed5ae..c9d0816d57b7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2489,6 +2489,7 @@ mapAliases {
   spring = throw "spring has been removed, as it had been broken since 2023 (it was a game; maybe you’re thinking of spring-boot-cli?)"; # Added 2025-09-16
   springLobby = throw "springLobby has been removed, as it had been broken since 2023"; # Added 2025-09-16
   spring-boot = throw "'spring-boot' has been renamed to/replaced by 'spring-boot-cli'"; # Converted to throw 2024-10-17
+  sqlbag = throw "sqlbag has been removed because it has been marked as broken since May 2024."; # Added 2025-10-11
   sqldeveloper = throw "sqldeveloper was dropped due to being severely out-of-date and having a dependency on JavaFX for Java 8, which we do not support"; # Added 2024-11-02
   srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09
   ssm-agent = amazon-ssm-agent; # Added 2023-10-17
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 6c7753ea9a20..07252b28a3b7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17512,8 +17512,6 @@ self: super: with self; {
 
   sqlalchemy_1_4 = callPackage ../development/python-modules/sqlalchemy/1_4.nix { };
 
-  sqlbag = callPackage ../development/python-modules/sqlbag { };
-
   sqlcipher3 = callPackage ../development/python-modules/sqlcipher3 { };
 
   sqlcipher3-binary = callPackage ../development/python-modules/sqlcipher3-binary { };

From 2b5981c5c79b351611c705b11d56f20bbb27c5fa Mon Sep 17 00:00:00 2001
From: Nicolas Benes <nbenes.gh@xandea.de>
Date: Mon, 21 Nov 2022 21:02:11 +0100
Subject: [PATCH 0589/6226] fetchgitlab: pass private tokens/passwords

Allow the fetcher to authenticate with user name and password.
Note: as of now, GitLab ignores the user name (it must be set, but the
value does not matter) but this may change in the future:
https://gitlab.com/gitlab-org/gitlab/-/issues/212953

Credentials can be passed to the nix-daemon, for example, via a
read-protected `EnvironmentFile`:

```console
$ ls -l /to/secrets.txt
-rw------- 1 root root 100 Nov  1 10:42 /to/secrets.txt
```

In /to/secrets.txt:

```
 # for `fetchFromGitLab { private=true; ... }`
NIX_GITLAB_PRIVATE_USERNAME=whatever
NIX_GITLAB_PRIVATE_PASSWORD=glpat-the-access-token
 # for `fetchFromGitLab { private=true; varPrefix="EXAMPLE"; ... }`
NIX_EXAMPLE_GITLAB_PRIVATE_USERNAME=whatever
NIX_EXAMPLE_GITLAB_PRIVATE_PASSWORD=glpat-another-access-token
```

In /etc/nixos/configuration.nix:

```nix
{ config, pkgs, ... }:
{
  systemd.services.nix-daemon.serviceConfig.EnvironmentFile =
    "/to/secrets.txt";
}
```

GitLab supports HTTP Basic Authentication (credentials in `.netrc` file)
only if accessed via Git. Access via the GitLab API requires a custom
header (e.g. `PRIVATE-TOKEN`) instead. See:

* https://docs.gitlab.com/ee/user/project/settings/project_access_tokens.html#project-access-tokens
* https://docs.gitlab.com/ee/api/rest/authentication.html#personalprojectgroup-access-tokens
---
 pkgs/build-support/fetchgitlab/default.nix | 46 ++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/pkgs/build-support/fetchgitlab/default.nix b/pkgs/build-support/fetchgitlab/default.nix
index 822c3991fa29..8a2b0ffa31d6 100644
--- a/pkgs/build-support/fetchgitlab/default.nix
+++ b/pkgs/build-support/fetchgitlab/default.nix
@@ -21,6 +21,8 @@ lib.makeOverridable (
     deepClone ? false,
     forceFetchGit ? false,
     sparseCheckout ? [ ],
+    private ? false,
+    varPrefix ? null,
     ... # For hash agility
   }@args:
 
@@ -51,14 +53,57 @@ lib.makeOverridable (
       "tag"
       "fetchSubmodules"
       "forceFetchGit"
+      "private"
+      "varPrefix"
       "leaveDotGit"
       "deepClone"
     ];
 
+    varBase = "NIX${lib.optionalString (varPrefix != null) "_${varPrefix}"}_GITLAB_PRIVATE_";
     useFetchGit =
       fetchSubmodules || leaveDotGit || deepClone || forceFetchGit || (sparseCheckout != [ ]);
     fetcher = if useFetchGit then fetchgit else fetchzip;
 
+    privateAttrs = lib.optionalAttrs private (
+      lib.throwIfNot (protocol == "https") "private token login is only supported for https" {
+        netrcPhase = ''
+          if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then
+            echo "Error: Private fetchFromGitLab requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2
+            exit 1
+          fi
+        ''
+        + (
+          if useFetchGit then
+            # GitLab supports HTTP Basic Authentication only when Git is used:
+            # https://docs.gitlab.com/ee/user/project/settings/project_access_tokens.html#project-access-tokens
+            ''
+              cat > netrc <<EOF
+              machine ${domain}
+                      login ''$${varBase}USERNAME
+                      password ''$${varBase}PASSWORD
+              EOF
+            ''
+          else
+            # Access via the GitLab API requires a custom header and does not work
+            # with HTTP Basic Authentication:
+            # https://docs.gitlab.com/ee/api/#personalprojectgroup-access-tokens
+            ''
+              # needed because fetchurl always sets --netrc-file if a netrcPhase is present
+              touch netrc
+
+              cat > private-token <<EOF
+              PRIVATE-TOKEN: ''$${varBase}PASSWORD
+              EOF
+              curlOpts="$curlOpts --header @./private-token"
+            ''
+        );
+        netrcImpureEnvVars = [
+          "${varBase}USERNAME"
+          "${varBase}PASSWORD"
+        ];
+      }
+    );
+
     gitRepoUrl = "${protocol}://${domain}/${slug}.git";
 
     fetcherArgs =
@@ -84,6 +129,7 @@ lib.makeOverridable (
             };
           }
       )
+      // privateAttrs
       // passthruAttrs
       // {
         inherit name;

From 8b06bf875c0e494d59430cdf108656debc45f224 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 11 Oct 2025 20:48:52 +0200
Subject: [PATCH 0590/6226] lib.systems: Simplify ABI on POWER for
 rust.rustcTarget

Rust does not know how to parse "gnuabielfv{1,2}", so simplify those down to just "gnu".
This obsoletes the manual rustcTarget fix in the ppc64-elfv1 example.
---
 lib/systems/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/systems/default.nix b/lib/systems/default.nix
index 7e78ceb4827a..96bde04151ae 100644
--- a/lib/systems/default.nix
+++ b/lib/systems/default.nix
@@ -491,6 +491,13 @@ let
                 }
                 .${cpu.name} or cpu.name;
               vendor_ = final.rust.platform.vendor;
+              abi_ =
+                # We're very explicit about the POWER ELF ABI w/ glibc in our parsing, while Rust is not.
+                # TODO: Somehow ensure that Rust actually *uses* the correct ABI, and not just a libc-based default.
+                if (lib.strings.hasPrefix "powerpc" cpu.name) && (lib.strings.hasPrefix "gnuabielfv" abi.name) then
+                  "gnu"
+                else
+                  abi.name;
             in
             # TODO: deprecate args.rustc in favour of args.rust after 23.05 is EOL.
             args.rust.rustcTarget or args.rustc.config or (
@@ -501,7 +508,7 @@ let
               if final.isWasi then
                 "${cpu_}-wasip1"
               else
-                "${cpu_}-${vendor_}-${kernel.name}${optionalString (abi.name != "unknown") "-${abi.name}"}"
+                "${cpu_}-${vendor_}-${kernel.name}${optionalString (abi.name != "unknown") "-${abi_}"}"
             );
 
           # The name of the rust target if it is standard, or the json file

From 8448c289197007e00b41c42999c3472c8ffa9e44 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 11 Oct 2025 20:50:02 +0200
Subject: [PATCH 0591/6226] lib.systems.examples.ppc64-elfv1: Drop manual fix
 of rust.rustcTarget

ABI is now simplified automatically.
---
 lib/systems/examples.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index cdd28b1ddde1..47c3cf0c9558 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -23,7 +23,6 @@ rec {
 
   ppc64-elfv1 = {
     config = "powerpc64-unknown-linux-gnuabielfv1";
-    rust.rustcTarget = "powerpc64-unknown-linux-gnu";
   };
   ppc64-elfv2 = {
     config = "powerpc64-unknown-linux-gnuabielfv2";

From 37492033ebaca346bc3d16ac02b18170378105a6 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 11 Oct 2025 21:00:33 +0200
Subject: [PATCH 0592/6226] lib.systems.parse: Default glibc ppc64 to ELFv1 ABI

---
 lib/systems/parse.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix
index bbb0fa9d5582..c76aa592fc28 100644
--- a/lib/systems/parse.nix
+++ b/lib/systems/parse.nix
@@ -919,9 +919,9 @@ rec {
           else if isLinux parsed || isWindows parsed then
             if isAarch32 parsed then
               if versionAtLeast (parsed.cpu.version or "0") "6" then abis.gnueabihf else abis.gnueabi
-            # Default ppc64 BE to ELFv2
+            # Default ppc64 BE to ELFv1
             else if isPower64 parsed && isBigEndian parsed then
-              abis.gnuabielfv2
+              abis.gnuabielfv1
             else
               abis.gnu
           else

From 5708c68c25842413066e679dd1aad34569b46315 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 11 Oct 2025 15:15:50 -0400
Subject: [PATCH 0593/6226] python3Packages.elegy: drop

Has been marked broken for at least a full release cycle.

Dropping per RFC 180.
---
 .../python-modules/elegy/default.nix          | 100 ------------------
 pkgs/top-level/python-aliases.nix             |   1 +
 pkgs/top-level/python-packages.nix            |   2 -
 3 files changed, 1 insertion(+), 102 deletions(-)
 delete mode 100644 pkgs/development/python-modules/elegy/default.nix

diff --git a/pkgs/development/python-modules/elegy/default.nix b/pkgs/development/python-modules/elegy/default.nix
deleted file mode 100644
index 08e93d47802d..000000000000
--- a/pkgs/development/python-modules/elegy/default.nix
+++ /dev/null
@@ -1,100 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  cloudpickle,
-  deepdish,
-  deepmerge,
-  dm-haiku,
-  fetchFromGitHub,
-  fetchpatch,
-  jaxlib,
-  poetry-core,
-  pytestCheckHook,
-  pythonOlder,
-  pyyaml,
-  sh,
-  tables,
-  tabulate,
-  tensorboardx,
-  tensorflow,
-  toolz,
-  torch,
-  treex,
-  typing-extensions,
-}:
-
-buildPythonPackage rec {
-  pname = "elegy";
-  version = "0.8.6";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
-
-  src = fetchFromGitHub {
-    owner = "poets-ai";
-    repo = "elegy";
-    tag = version;
-    hash = "sha256-FZmLriYhsX+zyQKCtCjbOy6MH+AvjzHRNUyaDSXGlLI=";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "use-poetry-core.patch";
-      url = "https://github.com/poets-ai/elegy/commit/0ed472882f470ed9eb7a63b8a537ffabe7e19aa7.patch";
-      hash = "sha256-nO/imHo7tEsiZh+64CF/M4eXQ1so3IunVhv8CvYP1ks=";
-    })
-  ];
-
-  # The cloudpickle constraint is too strict. wandb is marked as an optional
-  # dependency but `buildPythonPackage` doesn't seem to respect that setting.
-  # Python constraint: https://github.com/poets-ai/elegy/issues/244
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'python = ">=3.7,<3.10"' 'python = ">=3.7"' \
-      --replace 'cloudpickle = "^1.5.0"' 'cloudpickle = "*"' \
-      --replace 'wandb = { version = "^0.12.10", optional = true }' ""
-  '';
-
-  nativeBuildInputs = [ poetry-core ];
-
-  buildInputs = [ jaxlib ];
-
-  propagatedBuildInputs = [
-    cloudpickle
-    deepdish
-    deepmerge
-    dm-haiku
-    pyyaml
-    tables
-    tabulate
-    tensorboardx
-    toolz
-    treex
-    typing-extensions
-  ];
-
-  pythonImportsCheck = [ "elegy" ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    sh
-    tensorflow
-    torch
-  ];
-
-  disabledTests = [
-    # Fails with `Could not find compiler for platform Host: NOT_FOUND: could not find registered compiler for platform Host -- check target linkage`.
-    # Runs fine in docker with Ubuntu 22.04. I suspect the issue is the sandboxing in `nixpkgs` but not sure.
-    "test_saved_model_poly"
-    # AttributeError: module 'jax' has no attribute 'tree_multimap'
-    "DataLoaderTestCase"
-  ];
-
-  meta = with lib; {
-    description = "Neural Networks framework based on Jax inspired by Keras and Haiku";
-    homepage = "https://github.com/poets-ai/elegy";
-    changelog = "https://github.com/poets-ai/elegy/releases/tag/${version}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ ndl ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 0521f9bc947b..ef1478fcfe39 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -247,6 +247,7 @@ mapAliases {
   enhancements = throw "enhancements is unmaintained upstream and has therefore been removed"; # added 2023-10-27
   enum-compat = throw "enum-compat is a virtual package providing enum34, which does not do anything since Python 3.4"; # added 2025-02-15
   enum34 = throw "enum34 is no longer needed since Python 3.4"; # added 2025-03-06
+  elegy = throw "elegy has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11
   eris = throw "eris has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   et_xmlfile = et-xmlfile; # added 2023-10-16
   etebase-server = throw "pkgs.python3.etebase-server has been removed, use pkgs.etebase-server"; # added 2024-07-16
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5f5db002b880..e7d1eb23f942 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4665,8 +4665,6 @@ self: super: with self; {
 
   electrum-ecc = callPackage ../development/python-modules/electrum-ecc { };
 
-  elegy = callPackage ../development/python-modules/elegy { };
-
   elementpath = callPackage ../development/python-modules/elementpath { };
 
   elevate = callPackage ../development/python-modules/elevate { };

From 70b22d92d5edd35682571e078961727f1aabda24 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 11 Oct 2025 15:17:55 -0400
Subject: [PATCH 0594/6226] python3Packages.treex: drop

Has transitively been marked broken for at least a full release cycle.

Dropping per RFC 180.
---
 .../python-modules/treex/default.nix          | 77 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 79 deletions(-)
 delete mode 100644 pkgs/development/python-modules/treex/default.nix

diff --git a/pkgs/development/python-modules/treex/default.nix b/pkgs/development/python-modules/treex/default.nix
deleted file mode 100644
index 3f76b078f17f..000000000000
--- a/pkgs/development/python-modules/treex/default.nix
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  buildPythonPackage,
-  cloudpickle,
-  dm-haiku,
-  einops,
-  fetchFromGitHub,
-  flax,
-  hypothesis,
-  jaxlib,
-  keras,
-  lib,
-  poetry-core,
-  pytestCheckHook,
-  pyyaml,
-  rich,
-  tensorflow,
-  treeo,
-  torchmetrics,
-  torch,
-}:
-
-buildPythonPackage rec {
-  pname = "treex";
-  version = "0.6.11";
-  format = "pyproject";
-
-  src = fetchFromGitHub {
-    owner = "cgarciae";
-    repo = "treex";
-    tag = version;
-    hash = "sha256-ObOnbtAT4SlrwOms1jtn7/XKZorGISGY6VuhQlC3DaQ=";
-  };
-
-  # At the time of writing (2022-03-29), rich is currently at version 11.0.0.
-  # The treeo dependency is compatible with a patch, but not marked as such in
-  # treex. See https://github.com/cgarciae/treex/issues/68.
-  pythonRelaxDeps = [
-    "certifi"
-    "flax"
-    "rich"
-    "treeo"
-  ];
-
-  nativeBuildInputs = [
-    poetry-core
-  ];
-
-  buildInputs = [ jaxlib ];
-
-  propagatedBuildInputs = [
-    einops
-    flax
-    pyyaml
-    rich
-    treeo
-    torch
-  ];
-
-  nativeCheckInputs = [
-    cloudpickle
-    dm-haiku
-    hypothesis
-    keras
-    pytestCheckHook
-    tensorflow
-    torchmetrics
-  ];
-
-  pythonImportsCheck = [ "treex" ];
-
-  meta = with lib; {
-    description = "Pytree Module system for Deep Learning in JAX";
-    homepage = "https://github.com/cgarciae/treex";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ndl ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index ef1478fcfe39..c171810b57bf 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -838,6 +838,7 @@ mapAliases {
   transip = throw "transip has been removed because it is no longer maintained. TransIP SOAP V5 API was marked as deprecated"; # added 2023-02-27
   py-tree-sitter = throw "Was merged with tree-sitter."; # added 2024-03-20
   transmissionrpc = throw "transmissionrpc has been removed because it no longer builds and is unmaintained"; # added 2024-10-12
+  treex = throw "treex has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11
   trezor_agent = trezor-agent; # Added 2024-01-07
   tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19
   tvdb_api = tvdb-api; # added 2023-10-20
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e7d1eb23f942..e0b79cbcf6c0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18751,8 +18751,6 @@ self: super: with self; {
 
   treescope = callPackage ../development/python-modules/treescope { };
 
-  treex = callPackage ../development/python-modules/treex { };
-
   treq = callPackage ../development/python-modules/treq { };
 
   trevorproxy = callPackage ../development/python-modules/trevorproxy { };

From f320beeea56ae02fc9a85b95504d151a4c19db4f Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 11 Oct 2025 15:19:12 -0400
Subject: [PATCH 0595/6226] python3Packages.treeo: drop

Has been marked broken for at least a full release cycle.

Dropping per RFC 180.
---
 .../python-modules/treeo/default.nix          | 54 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 pkgs/development/python-modules/treeo/default.nix

diff --git a/pkgs/development/python-modules/treeo/default.nix b/pkgs/development/python-modules/treeo/default.nix
deleted file mode 100644
index 27716b9fd31e..000000000000
--- a/pkgs/development/python-modules/treeo/default.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{
-  buildPythonPackage,
-  fetchFromGitHub,
-  fetchpatch,
-  jax,
-  jaxlib,
-  lib,
-  poetry-core,
-}:
-
-buildPythonPackage rec {
-  pname = "treeo";
-  # Note that there is a version 0.4.0, but it was released in error. At the
-  # time of writing (2022-03-29), v0.0.11 is the latest as reported on GitHub
-  # and PyPI.
-  version = "0.4.0";
-  format = "pyproject";
-
-  src = fetchFromGitHub {
-    owner = "cgarciae";
-    repo = "treeo";
-    tag = version;
-    hash = "sha256-0py7sKjq6WqdsZwTq61jqaIbULTfwtpz29TTpt8M2Zw=";
-  };
-
-  # See https://github.com/cgarciae/treex/issues/68.
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/cgarciae/treeo/pull/14/commits/022915da2b3bf76406a7c79d1b4593bee7956f16.patch";
-      hash = "sha256-WGxJqqrf2g0yZe30RyG1xxbloiqj1awuf1Y4eh5y+z0=";
-    })
-    (fetchpatch {
-      url = "https://github.com/cgarciae/treeo/pull/14/commits/99f9488bd0c977780844fd79743167b0010d359b.patch";
-      hash = "sha256-oKDYs+Ah0QXkhiJysIudQ6VLIiUiIcnQisxYp6GJuTc=";
-    })
-  ];
-
-  nativeBuildInputs = [ poetry-core ];
-
-  # jax is not declared in the dependencies, but is necessary.
-  propagatedBuildInputs = [ jax ];
-
-  nativeCheckInputs = [ jaxlib ];
-  pythonImportsCheck = [ "treeo" ];
-
-  meta = with lib; {
-    description = "Small library for creating and manipulating custom JAX Pytree classes";
-    homepage = "https://github.com/cgarciae/treeo";
-    license = licenses.mit;
-    maintainers = with maintainers; [ ndl ];
-    # obsolete as of 2023-02-27 and not updated for more than a year as of 2023-08
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index c171810b57bf..bc295da5d9e6 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -838,6 +838,7 @@ mapAliases {
   transip = throw "transip has been removed because it is no longer maintained. TransIP SOAP V5 API was marked as deprecated"; # added 2023-02-27
   py-tree-sitter = throw "Was merged with tree-sitter."; # added 2024-03-20
   transmissionrpc = throw "transmissionrpc has been removed because it no longer builds and is unmaintained"; # added 2024-10-12
+  treeo = throw "treeo has been removed because it has been marked as broken since 2023."; # Added 2025-10-11
   treex = throw "treex has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11
   trezor_agent = trezor-agent; # Added 2024-01-07
   tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e0b79cbcf6c0..d5c763515b94 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18747,8 +18747,6 @@ self: super: with self; {
 
   treelog = callPackage ../development/python-modules/treelog { };
 
-  treeo = callPackage ../development/python-modules/treeo { };
-
   treescope = callPackage ../development/python-modules/treescope { };
 
   treq = callPackage ../development/python-modules/treq { };

From 016dbc4330c4c7da88c9c777cca0eeb31b8dc449 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 20:12:27 +0000
Subject: [PATCH 0596/6226] i-pi: 3.1.6 -> 3.1.7

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

diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix
index 319c08577afc..5a12b999a900 100644
--- a/pkgs/development/python-modules/i-pi/default.nix
+++ b/pkgs/development/python-modules/i-pi/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "i-pi";
-  version = "3.1.6";
+  version = "3.1.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "i-pi";
     repo = "i-pi";
     tag = "v${version}";
-    hash = "sha256-S7UagXjltyy2E9s5yoq95KjMfpy/Pb0zoGl6z6yv2sA=";
+    hash = "sha256-AeHZWzgV0pqlKNdDCuAglpTDm3M8PWKDGvPw3lyQdF8=";
   };
 
   build-system = [

From 08f7f4b8b7e172aa37dd799e6b2e76656b94dcd0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 20:43:51 +0000
Subject: [PATCH 0597/6226] vals: 0.42.2 -> 0.42.4

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

diff --git a/pkgs/by-name/va/vals/package.nix b/pkgs/by-name/va/vals/package.nix
index dce3c9bdbd4f..e8191271ee92 100644
--- a/pkgs/by-name/va/vals/package.nix
+++ b/pkgs/by-name/va/vals/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "vals";
-  version = "0.42.2";
+  version = "0.42.4";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "helmfile";
     repo = "vals";
-    sha256 = "sha256-NdK7toICK9NJ6H8trCYJCEFE0weYH1Ban7dSlG1SM/c=";
+    sha256 = "sha256-a81U6AOzgD4GwQ1vhfFD2CquvmWOyvIzVMDIFg4rXgE=";
   };
 
-  vendorHash = "sha256-FjTxef9LHQopxiJYJFcAWcGJk5byVcEBlQFUssbfYwY=";
+  vendorHash = "sha256-O2lW3hs16osGSTcj3rc4tmK4YjCZZkYzEtcJP2uxa/A=";
 
   proxyVendor = true;
 

From b908eb6a0c36bb38c758e2be02623a1b13e8be0b Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 11 Oct 2025 23:13:10 +0200
Subject: [PATCH 0598/6226] python313Packages.kajiki: fix build

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

diff --git a/pkgs/development/python-modules/kajiki/default.nix b/pkgs/development/python-modules/kajiki/default.nix
index e801f49aca4a..e7a0978bb415 100644
--- a/pkgs/development/python-modules/kajiki/default.nix
+++ b/pkgs/development/python-modules/kajiki/default.nix
@@ -6,12 +6,13 @@
   linetable,
   pytestCheckHook,
   pythonOlder,
+  hatchling,
 }:
 
 buildPythonPackage rec {
   pname = "kajiki";
   version = "1.0.1";
-  format = "setuptools";
+  pyproject = true;
 
   disabled = pythonOlder "3.7";
 
@@ -24,6 +25,8 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ linetable ];
 
+  build-system = [ hatchling ];
+
   nativeCheckInputs = [
     babel
     pytestCheckHook

From 70e4355b7390a9672db63c44fbe10d9b09aa8e1d Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 12 Oct 2025 00:03:03 +0200
Subject: [PATCH 0599/6226] python313Packages.prosemirror: fix build

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

diff --git a/pkgs/development/python-modules/prosemirror/default.nix b/pkgs/development/python-modules/prosemirror/default.nix
index 030a989f9573..4586fb355b1a 100644
--- a/pkgs/development/python-modules/prosemirror/default.nix
+++ b/pkgs/development/python-modules/prosemirror/default.nix
@@ -1,7 +1,8 @@
 {
   lib,
   buildPythonPackage,
-  setuptools-scm,
+  hatchling,
+  hatch-vcs,
   pytestCheckHook,
   fetchPypi,
   lxml,
@@ -18,7 +19,10 @@ buildPythonPackage rec {
     hash = "sha256-cZwqoKQ+B7d07R20dXTiDsiBIYYTyaWa2SnGs8o8Hl8=";
   };
 
-  build-system = [ setuptools-scm ];
+  build-system = [
+    hatchling
+    hatch-vcs
+  ];
 
   dependencies = [
     lxml

From dfe2466ce3c0fc7535e45d9124ff79c42a25f971 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 11 Oct 2025 22:21:09 +0000
Subject: [PATCH 0600/6226] termsvg: 0.9.3 -> 0.10.0

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

diff --git a/pkgs/by-name/te/termsvg/package.nix b/pkgs/by-name/te/termsvg/package.nix
index 7e984c2c5406..7a14d7112c58 100644
--- a/pkgs/by-name/te/termsvg/package.nix
+++ b/pkgs/by-name/te/termsvg/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "termsvg";
-  version = "0.9.3";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "mrmarble";
     repo = "termsvg";
     rev = "v${version}";
-    hash = "sha256-ejrg1UywPQDCeaymkGzU+xZoPXME6XEP/SBe3Yxf4YU=";
+    hash = "sha256-tNvr8ptMortP7iI6GwT4AGbqTvNFposca8I2JribGnk=";
   };
 
   vendorHash = "sha256-BoXRLWhQmfvMIN658MiXGCFMbnvuXfv/H/jCE6h4aWk=";

From 5dc30db6f495b03c46148074948b0e929384f777 Mon Sep 17 00:00:00 2001
From: Sam <30577766+Samasaur1@users.noreply.github.com>
Date: Mon, 29 Sep 2025 13:15:35 -0700
Subject: [PATCH 0601/6226] xcodegen: 2.42.0 -> 2.44.1

---
 pkgs/by-name/xc/xcodegen/nix/default.nix          | 4 ++--
 pkgs/by-name/xc/xcodegen/nix/workspace-state.json | 8 ++++----
 pkgs/by-name/xc/xcodegen/package.nix              | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/xc/xcodegen/nix/default.nix b/pkgs/by-name/xc/xcodegen/nix/default.nix
index e9d58741591f..10ffd303aaf4 100644
--- a/pkgs/by-name/xc/xcodegen/nix/default.nix
+++ b/pkgs/by-name/xc/xcodegen/nix/default.nix
@@ -2,7 +2,7 @@
 {
   workspaceStateFile = ./workspace-state.json;
   hashes = {
-    "AEXML" = "sha256-bQcXq1aS76sOjW8yYCOlGVZ2tStDvzRQSyj9VrAj6nI=";
+    "AEXML" = "sha256-6KvO8zT667Td+4qOeYzHbd51hDzFJFrxcVyYr2h5igc=";
     "ArtifactBundleGen" = "sha256-mSXJiRGFIm2RtzBG8l6s4RJ2BzSbPZKUZIqWM4vDIhc=";
     "JSONUtilities" = "sha256-jl8XfgoB5IX0qwwDtzcWgK0u3SNG2HfrPoEb2a6/mlA=";
     "PathKit" = "sha256-ewxTC1kpu6PXhwamCxYfI50ooYO1SIU0+IXH2tc/uv4=";
@@ -10,7 +10,7 @@
     "Spectre" = "sha256-fipGRIgw+jV7Wrxa+xivRk7YMyxDhGFB6SHIHscrmV8=";
     "SwiftCLI" = "sha256-PmjzLss0D12iy6YKsudFa8i63NQAssyCBqqq8VjRiH4=";
     "Version" = "sha256-4IwQlexWtIH9M0sSai1a+ITTAKkD2zJtbYoV4Cg+Snw=";
-    "XcodeProj" = "sha256-ycHDzay37YtT/3QqUpG6XPjRh32P5iU/I5GpfjrXs/I=";
+    "XcodeProj" = "sha256-UMnSV/kdRlUxp23Rd70xCHzJeP6Vh1viyHNERo3haRE=";
     "Yams" = "sha256-5qxuCkmopm3uFcoYJKQA8ofW98f53H1gZaPiOh2DS4U=";
   };
 }
diff --git a/pkgs/by-name/xc/xcodegen/nix/workspace-state.json b/pkgs/by-name/xc/xcodegen/nix/workspace-state.json
index 0f95461da6e0..ab48b77ec269 100644
--- a/pkgs/by-name/xc/xcodegen/nix/workspace-state.json
+++ b/pkgs/by-name/xc/xcodegen/nix/workspace-state.json
@@ -12,8 +12,8 @@
         },
         "state": {
           "checkoutState": {
-            "revision": "38f7d00b23ecd891e1ee656fa6aeebd6ba04ecc3",
-            "version": "4.6.1"
+            "revision": "db806756c989760b35108146381535aec231092b",
+            "version": "4.7.0"
           },
           "name": "sourceControlCheckout"
         },
@@ -148,8 +148,8 @@
         },
         "state": {
           "checkoutState": {
-            "revision": "447c159b0c5fb047a024fd8d942d4a76cf47dde0",
-            "version": "8.16.0"
+            "revision": "b1caa062d4aaab3e3d2bed5fe0ac5f8ce9bf84f4",
+            "version": "8.27.7"
           },
           "name": "sourceControlCheckout"
         },
diff --git a/pkgs/by-name/xc/xcodegen/package.nix b/pkgs/by-name/xc/xcodegen/package.nix
index 24dda3eb9c97..17ace827e11b 100644
--- a/pkgs/by-name/xc/xcodegen/package.nix
+++ b/pkgs/by-name/xc/xcodegen/package.nix
@@ -16,13 +16,13 @@ in
 
 swiftPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "xcodegen";
-  version = "2.42.0";
+  version = "2.44.1";
 
   src = fetchFromGitHub {
     owner = "yonaskolb";
     repo = "XcodeGen";
     tag = finalAttrs.version;
-    hash = "sha256-wcjmADG+XnS2kR8BHe6ijApomucS9Tx7ZRjWZmTCUiI=";
+    hash = "sha256-RQlmQfmrLZRrgIA09fE84JuqmYkkrz4KSw2dvYXw0Rs=";
   };
 
   # Including SwiftPM as a nativeBuildInput provides a buildPhase for you.

From 7dcdee8d0a533df341de3609d891e0800e88657f Mon Sep 17 00:00:00 2001
From: hotburger <33610620+hotburger@users.noreply.github.com>
Date: Sat, 11 Oct 2025 17:33:04 -0700
Subject: [PATCH 0602/6226] nixos/nextcloud: prevent nextcloud-occ arguments
 being parsed by wrapper

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

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index da5e02e27479..6cc3c96d360b 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -166,6 +166,7 @@ let
             --setenv OC_PASS \
             --setenv NC_PASS \
             --quiet \
+            -- \
             ${command}
         elif [[ "$USER" != nextcloud ]]; then
           if [[ -x /run/wrappers/bin/sudo ]]; then
@@ -174,6 +175,7 @@ let
               --preserve-env=OC_PASS \
               --preserve-env=NC_PASS \
               --user=nextcloud \
+              -- \
               ${command}
           else
             exec ${lib.getExe' pkgs.util-linux "runuser"} \
@@ -181,6 +183,7 @@ let
               --whitelist-environment=OC_PASS \
               --whitelist-environment=NC_PASS \
               --user=nextcloud \
+              -- \
               ${command}
           fi
         else

From dcfff00787517a4a6412cb394bce4faaa052f7e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Oct 2025 00:35:22 +0000
Subject: [PATCH 0603/6226] uwsgi: 2.0.30 -> 2.0.31

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

diff --git a/pkgs/by-name/uw/uwsgi/package.nix b/pkgs/by-name/uw/uwsgi/package.nix
index 6886ba53cae8..61d4fa0a49d9 100644
--- a/pkgs/by-name/uw/uwsgi/package.nix
+++ b/pkgs/by-name/uw/uwsgi/package.nix
@@ -81,13 +81,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uwsgi";
-  version = "2.0.30";
+  version = "2.0.31";
 
   src = fetchFromGitHub {
     owner = "unbit";
     repo = "uwsgi";
     tag = finalAttrs.version;
-    hash = "sha256-I03AshxZyxrRmtYUH1Q+B6ISykjYRMGG+ZQSHRS7vDs=";
+    hash = "sha256-WWZ+ClLWoUFi64xsiyuLXcxQsYdOv1DVhG+4oVYJJMI=";
   };
 
   patches = [

From 0e6b17ec94a5efbfe02cc3da1301c37e1ab1016b Mon Sep 17 00:00:00 2001
From: Bazinga9000 <bazonkidonk@gmail.com>
Date: Sat, 20 Sep 2025 23:55:49 -0400
Subject: [PATCH 0604/6226] jugglinglab: add desktop entry

---
 pkgs/by-name/ju/jugglinglab/package.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/by-name/ju/jugglinglab/package.nix b/pkgs/by-name/ju/jugglinglab/package.nix
index a391cac9205b..38b3c9eabfe0 100644
--- a/pkgs/by-name/ju/jugglinglab/package.nix
+++ b/pkgs/by-name/ju/jugglinglab/package.nix
@@ -34,6 +34,13 @@ maven.buildMavenPackage rec {
     ./fix-default-maven-plugin-versions.patch
   ];
 
+  # use non-absolute paths for Exec and Icon fields in the desktop item
+  postPatch = ''
+    substituteInPlace "bin/packaging/debian/Juggling Lab.desktop" \
+      --replace-fail "/opt/juggling-lab/bin/Juggling\ Lab" "jugglinglab" \
+      --replace-fail "/opt/juggling-lab/lib/Juggling_Lab.png" "jugglinglab"
+  '';
+
   mvnHash = "sha256-1Uzo9nRw+YR/sd7CC9MTPe/lttkRX6BtmcsHaagP1Do=";
 
   # fix jar timestamps for reproducibility
@@ -54,6 +61,14 @@ maven.buildMavenPackage rec {
       install -Dm755 bin/ortools-lib/ortools-${platformName}/* -t $out/lib/ortools-lib
     ''}
 
+    install -Dm644 \
+      "bin/packaging/debian/Juggling Lab.png" \
+      "$out/share/icons/hicolor/256x256/apps/jugglinglab.png"
+
+    install -Dm644 \
+      "bin/packaging/debian/Juggling Lab.desktop" \
+      "$out/share/applications/jugglinglab.desktop"
+
     runHook postInstall
   '';
 

From 24e51445cccbff57f6c152000f5fe3313767e9e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Oct 2025 03:44:36 +0000
Subject: [PATCH 0605/6226] localstack: 4.9.1 -> 4.9.2

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

diff --git a/pkgs/by-name/lo/localstack/package.nix b/pkgs/by-name/lo/localstack/package.nix
index 11be38a157de..94fad26e2c00 100644
--- a/pkgs/by-name/lo/localstack/package.nix
+++ b/pkgs/by-name/lo/localstack/package.nix
@@ -6,7 +6,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "localstack";
-  version = "4.9.1";
+  version = "4.9.2";
   pyproject = true;
 
   src = fetchFromGitHub {

From fc2902e627fb25a27400f26b4c7d1ca6fa0efb69 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sun, 12 Oct 2025 07:59:31 +0200
Subject: [PATCH 0606/6226] windows: fix eval of some packages on linux

This makes those packages appear in search
---
 pkgs/os-specific/windows/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix
index 98f438554ac0..137a948960b7 100644
--- a/pkgs/os-specific/windows/default.nix
+++ b/pkgs/os-specific/windows/default.nix
@@ -28,8 +28,12 @@ lib.makeScope newScope (
         buildPackages.gccWithoutTargetLibc.override (old: {
           bintools = old.bintools.override {
             libc = pkgs.libc;
+            noLibc = pkgs.libc == null;
+            nativeLibc = false;
           };
           libc = pkgs.libc;
+          noLibc = pkgs.libc == null;
+          nativeLibc = false;
         })
     );
 

From 2e667d8bf97325b548394485b9d8d800b058f0d8 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Sun, 12 Oct 2025 09:31:41 +0200
Subject: [PATCH 0607/6226] nodejs_24: skip failing test on darwin

---
 pkgs/development/web/nodejs/nodejs.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix
index 758f9314947a..208ded114973 100644
--- a/pkgs/development/web/nodejs/nodejs.nix
+++ b/pkgs/development/web/nodejs/nodejs.nix
@@ -428,6 +428,8 @@ let
               "test-cluster-dgram-1"
               "test/sequential/test-http-server-request-timeouts-mixed.js"
             ]
+            # This is failing on newer macOS versions, no fix has yet been provided upstream:
+            ++ lib.optional (majorVersion == "24" && stdenv.buildPlatform.isDarwin) "test-cluster-dgram-1"
           )
         }"
       ];

From 658bef2d9ca0d28f5355b047cb40148914371f67 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Oct 2025 09:35:52 +0000
Subject: [PATCH 0608/6226] tideways-cli: 1.2.12 -> 1.2.14

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

diff --git a/pkgs/by-name/ti/tideways-cli/package.nix b/pkgs/by-name/ti/tideways-cli/package.nix
index 438805baf9d7..742878db7449 100644
--- a/pkgs/by-name/ti/tideways-cli/package.nix
+++ b/pkgs/by-name/ti/tideways-cli/package.nix
@@ -11,7 +11,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tideways-cli";
-  version = "1.2.12";
+  version = "1.2.14";
 
   nativeBuildInputs = [ installShellFiles ];
 
@@ -38,19 +38,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sources = {
       "x86_64-linux" = fetchurl {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_amd64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-SsXVDNXaxppF9E9CGJBwdWoseV7YXbuWfsVrkB+R5To=";
+        hash = "sha256-fx8h/JmVS+s2Gzk2bUQre+MfOBCuXlVHekaskIdk1c8=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_linux_arm64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-MUUsDNN03i3+ZrKLKptex+P7SWjZ+YIUkXHkZf21Q+0=";
+        hash = "sha256-8inyaKajz3OAegXOevNfrMYFmH9shCvtCM4OEpgi6UE=";
       };
       "x86_64-darwin" = fetchurl {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_amd64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-ue0RV57rpL5KIhCEVy6/J3cwZKOEg5Kq+490ABJrxXE=";
+        hash = "sha256-tLN4B4JNKr7+V1ZgVKZEcRpfYwLNB84D3ix2vGINnXg=";
       };
       "aarch64-darwin" = fetchurl {
         url = "https://s3-eu-west-1.amazonaws.com/tideways/cli/${finalAttrs.version}/tideways-cli_macos_arm64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-OEtEjo8/qFt/iQlUBho7G5uBdCqFrHWpoTXrCzyO/oo=";
+        hash = "sha256-fcpN/YvpmZA/EFxfqWWVTfF6RcwgePf0JZ4430bPLTU=";
       };
     };
 

From 9322fb64c601bee770e894b49c5ac2c4cac69ff9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Oct 2025 09:49:20 +0000
Subject: [PATCH 0609/6226] svelte-language-server: 0.17.19 -> 0.17.21

---
 .../svelte-language-server/package-lock.json  | 102 +++++++-----------
 .../sv/svelte-language-server/package.nix     |   6 +-
 2 files changed, 41 insertions(+), 67 deletions(-)

diff --git a/pkgs/by-name/sv/svelte-language-server/package-lock.json b/pkgs/by-name/sv/svelte-language-server/package-lock.json
index 14e6cbbb2e17..803047ea156f 100644
--- a/pkgs/by-name/sv/svelte-language-server/package-lock.json
+++ b/pkgs/by-name/sv/svelte-language-server/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "svelte-language-server",
-  "version": "0.17.19",
+  "version": "0.17.21",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "svelte-language-server",
-      "version": "0.17.19",
+      "version": "0.17.21",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.25",
@@ -19,7 +19,7 @@
         "prettier": "~3.3.3",
         "prettier-plugin-svelte": "^3.4.0",
         "svelte": "^4.2.19",
-        "svelte2tsx": "~0.7.35",
+        "svelte2tsx": "~0.7.45",
         "typescript": "^5.9.2",
         "typescript-auto-import-cache": "^0.3.6",
         "vscode-css-languageservice": "~6.3.5",
@@ -135,9 +135,9 @@
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.30",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.30.tgz",
-      "integrity": "sha512-GQ7Nw5G2lTu/BtHTKfXhKHok2WGetd4XYcVKGx00SjAk8GMwgJM3zr6zORiPGuOE+/vkc90KtTosSSvaCjKb2Q==",
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
       "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
@@ -240,9 +240,9 @@
       "license": "MIT"
     },
     "node_modules/@types/node": {
-      "version": "18.19.122",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.122.tgz",
-      "integrity": "sha512-yzegtT82dwTNEe/9y+CM8cgb42WrUfMMCg2QqSddzO1J6uPmBD7qKCZ7dOHZP2Yrpm/kb0eqdNMn2MUyEiqBmA==",
+      "version": "18.19.130",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-18.19.130.tgz",
+      "integrity": "sha512-GRaXQx6jGfL8sKfaIDD6OupbIHBr9jv7Jnaml9tB7l4v068PAOXqfcujMMo5PhbIs6ggR1XODELqahT2R8v0fg==",
       "dev": true,
       "license": "MIT",
       "dependencies": {
@@ -733,10 +733,13 @@
       "license": "MIT"
     },
     "node_modules/fdir": {
-      "version": "6.4.6",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
-      "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
+      "version": "6.5.0",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+      "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
       "license": "MIT",
+      "engines": {
+        "node": ">=12.0.0"
+      },
       "peerDependencies": {
         "picomatch": "^3 || ^4"
       },
@@ -1101,22 +1104,13 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/lower-case": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.0.3"
-      }
-    },
     "node_modules/magic-string": {
-      "version": "0.30.17",
-      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.17.tgz",
-      "integrity": "sha512-sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==",
+      "version": "0.30.19",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.19.tgz",
+      "integrity": "sha512-2N21sPY9Ws53PZvsEpVtNuSW+ScYbQdp4b9qUaL+9QkHUrGFKo56Lg9Emg5s9V/qrtNBmiR01sYhUOwu3H+VOw==",
       "license": "MIT",
       "dependencies": {
-        "@jridgewell/sourcemap-codec": "^1.5.0"
+        "@jridgewell/sourcemap-codec": "^1.5.5"
       }
     },
     "node_modules/make-error": {
@@ -1284,16 +1278,6 @@
         "@sinonjs/commons": "^3.0.1"
       }
     },
-    "node_modules/no-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-      "license": "MIT",
-      "dependencies": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
-      }
-    },
     "node_modules/normalize-path": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@@ -1346,16 +1330,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/pascal-case": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-      "license": "MIT",
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
-    },
     "node_modules/path-exists": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
@@ -1511,10 +1485,16 @@
       ],
       "license": "MIT"
     },
+    "node_modules/scule": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/scule/-/scule-1.3.0.tgz",
+      "integrity": "sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==",
+      "license": "MIT"
+    },
     "node_modules/semver": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
@@ -1696,13 +1676,13 @@
       }
     },
     "node_modules/svelte2tsx": {
-      "version": "0.7.42",
-      "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.42.tgz",
-      "integrity": "sha512-PSNrKS16aVdAajoFjpF5M0t6TA7ha7GcKbBajD9RG3M+vooAuvLnWAGUSC6eJL4zEOVbOWKtcS2BuY4rxPljoA==",
+      "version": "0.7.45",
+      "resolved": "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.7.45.tgz",
+      "integrity": "sha512-cSci+mYGygYBHIZLHlm/jYlEc1acjAHqaQaDFHdEBpUueM9kSTnPpvPtSl5VkJOU1qSJ7h1K+6F/LIUYiqC8VA==",
       "license": "MIT",
       "dependencies": {
         "dedent-js": "^1.0.1",
-        "pascal-case": "^3.1.1"
+        "scule": "^1.3.0"
       },
       "peerDependencies": {
         "svelte": "^3.55 || ^4.0.0-next.0 || ^4.0 || ^5.0.0-next.0",
@@ -1776,12 +1756,6 @@
         "node": ">=0.3.1"
       }
     },
-    "node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "license": "0BSD"
-    },
     "node_modules/type-detect": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz",
@@ -1793,9 +1767,9 @@
       }
     },
     "node_modules/typescript": {
-      "version": "5.9.2",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz",
-      "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
+      "version": "5.9.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+      "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
       "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
@@ -1829,9 +1803,9 @@
       "license": "MIT"
     },
     "node_modules/vscode-css-languageservice": {
-      "version": "6.3.7",
-      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.7.tgz",
-      "integrity": "sha512-5TmXHKllPzfkPhW4UE9sODV3E0bIOJPOk+EERKllf2SmAczjfTmYeq5txco+N3jpF8KIZ6loj/JptpHBQuVQRA==",
+      "version": "6.3.8",
+      "resolved": "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-6.3.8.tgz",
+      "integrity": "sha512-dBk/9ullEjIMbfSYAohGpDOisOVU1x2MQHOeU12ohGJQI7+r0PCimBwaa/pWpxl/vH4f7ibrBfxIZY3anGmHKQ==",
       "license": "MIT",
       "dependencies": {
         "@vscode/l10n": "^0.0.18",
diff --git a/pkgs/by-name/sv/svelte-language-server/package.nix b/pkgs/by-name/sv/svelte-language-server/package.nix
index 7ed2dfa682b1..fd6f70afe676 100644
--- a/pkgs/by-name/sv/svelte-language-server/package.nix
+++ b/pkgs/by-name/sv/svelte-language-server/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
 }:
 let
-  version = "0.17.19";
+  version = "0.17.21";
 in
 buildNpmPackage {
   pname = "svelte-language-server";
@@ -12,10 +12,10 @@ buildNpmPackage {
 
   src = fetchurl {
     url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-${version}.tgz";
-    hash = "sha256-5Jap4dZzVWZxrIQSWUnTXG63re4T2mjcSvSilM7EReI=";
+    hash = "sha256-zRUeAocuEyoaBUrCDkqxJhMY7ryv9y7hYQC5/CsL2NM=";
   };
 
-  npmDepsHash = "sha256-stE8uno/Oc/LvEWvD8KqoQ/mfNJHWa4PatGDwE+ix7E=";
+  npmDepsHash = "sha256-0nad0gdQhl3nwHbmDyLCfnIfgn4ixBbZn/oy3THDniw=";
 
   postPatch = ''
     ln -s ${./package-lock.json} package-lock.json

From 182e3dbef16de08150f09072a377ec499cba9dfc Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 12 Oct 2025 18:50:38 +0900
Subject: [PATCH 0610/6226] nixos/tests: remove leftover file for removed mpich
 nixos test

This file is not used anymore, the test was disabled in
c044375a0a765a92925a83ba7d78718ffb469512 and removed in
bb8b48c794f8c0517b4aded06616771a84d1b518 (#19963).
---
 nixos/tests/mpich-example.c | 21 ---------------------
 1 file changed, 21 deletions(-)
 delete mode 100644 nixos/tests/mpich-example.c

diff --git a/nixos/tests/mpich-example.c b/nixos/tests/mpich-example.c
deleted file mode 100644
index c48e3c45b72e..000000000000
--- a/nixos/tests/mpich-example.c
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <mpi.h>
-
-int
-main (int argc, char *argv[])
-{
-  int rank, size, length;
-  char name[BUFSIZ];
-
-  MPI_Init (&argc, &argv);
-  MPI_Comm_rank (MPI_COMM_WORLD, &rank);
-  MPI_Comm_size (MPI_COMM_WORLD, &size);
-  MPI_Get_processor_name (name, &length);
-
-  printf ("%s: hello world from process %d of %d\n", name, rank, size);
-
-  MPI_Finalize ();
-
-  return EXIT_SUCCESS;
-}

From 40214c2103ff5f94a78ba8e370bac6c50794b614 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Oct 2025 10:21:55 +0000
Subject: [PATCH 0611/6226] keymapper: 5.0.0 -> 5.1.0

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

diff --git a/pkgs/by-name/ke/keymapper/package.nix b/pkgs/by-name/ke/keymapper/package.nix
index bda1cd85fd01..f3c5dfbfabda 100644
--- a/pkgs/by-name/ke/keymapper/package.nix
+++ b/pkgs/by-name/ke/keymapper/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "keymapper";
-  version = "5.0.0";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "houmain";
     repo = "keymapper";
     tag = finalAttrs.version;
-    hash = "sha256-3cUfgOuZ3GKSKbUI2k/MwvSmHtqvqiUvqUem3Nh/YuQ=";
+    hash = "sha256-y1EVF3IwGzDy32ywo9LSzkQNki/HuKC40DySIme8nTc=";
   };
 
   # all the following must be in nativeBuildInputs

From 87bdbb61f9c81d8d5d246962d5e3402b2b3fde39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Oct 2025 11:28:25 +0000
Subject: [PATCH 0612/6226] promptfoo: 0.118.11 -> 0.118.14

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

diff --git a/pkgs/by-name/pr/promptfoo/package.nix b/pkgs/by-name/pr/promptfoo/package.nix
index 8c7ed3172a23..d8e0ef7e37fa 100644
--- a/pkgs/by-name/pr/promptfoo/package.nix
+++ b/pkgs/by-name/pr/promptfoo/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "promptfoo";
-  version = "0.118.11";
+  version = "0.118.14";
 
   src = fetchFromGitHub {
     owner = "promptfoo";
     repo = "promptfoo";
     tag = finalAttrs.version;
-    hash = "sha256-py85AvOnge5KAOwsCUVCgwVhbNMn6kqNpQ5w6KA60LM=";
+    hash = "sha256-MyK533JOVCuO613XWFc2tHLdc4v4IEF8H1xCpS/XxUE=";
   };
 
-  npmDepsHash = "sha256-J/wVq10sgLFZiPuiXie3oi2I9uCycyRP/19AQdGLmF4=";
+  npmDepsHash = "sha256-mpe00J5iRwaH7hJIDP3fDuJSUOKk01COpOOvF1YJMyg=";
 
   # don't fetch playwright binary
   env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1";

From 7500b79a6f47b74e6f48152d4bd585c8375327a3 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Sun, 12 Oct 2025 11:01:51 +0200
Subject: [PATCH 0613/6226] openssl: disable failing test on cross to musl

---
 pkgs/development/libraries/openssl/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index b3a5a654494d..0d4e99a4394b 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -87,7 +87,15 @@ let
         substituteInPlace Configurations/unix-Makefile.tmpl \
           --replace 'ENGINESDIR=$(libdir)/engines-{- $sover_dirname -}' \
                     'ENGINESDIR=$(OPENSSLDIR)/engines-{- $sover_dirname -}'
-      '';
+      ''
+      # This test will fail if the error strings between the build libc and host
+      # libc mismatch, e.g. when cross-compiling from glibc to musl
+      +
+        lib.optionalString
+          (finalAttrs.finalPackage.doCheck && stdenv.hostPlatform.libc != stdenv.buildPlatform.libc)
+          ''
+            rm test/recipes/02-test_errstr.t
+          '';
 
       outputs = [
         "bin"

From f262c870a5092574aa26e99fc14d8487ffa7f588 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Oct 2025 11:42:48 +0000
Subject: [PATCH 0614/6226] drawterm: 0-unstable-2025-09-11 ->
 0-unstable-2025-10-11

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

diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix
index ea7893024b3c..5086ad03fdec 100644
--- a/pkgs/by-name/dr/drawterm/package.nix
+++ b/pkgs/by-name/dr/drawterm/package.nix
@@ -23,13 +23,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "drawterm";
-  version = "0-unstable-2025-09-11";
+  version = "0-unstable-2025-10-11";
 
   src = fetchFrom9Front {
     owner = "plan9front";
     repo = "drawterm";
-    rev = "7523180ec9e5210e28eb0191268066188cdf91ab";
-    hash = "sha256-IOZCpNXJcTpqCRsNp8aaP2vORvusLktLtyoQ7gykJB8=";
+    rev = "48d53278a8273bb39ca295e8f163563ab04b3530";
+    hash = "sha256-SReZ6A5xEpi0vL2bchVszRl3Dvm4Rw8e/5TQa+8TPto=";
   };
 
   enableParallelBuilding = true;

From 2f196e9bab8407386ac9e0d8a3d09b07d0083f1e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Oct 2025 12:05:36 +0000
Subject: [PATCH 0615/6226] xpra: 6.3.3 -> 6.3.4

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

diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix
index 3c4db4ba3d84..e8fa28a857d8 100644
--- a/pkgs/by-name/xp/xpra/package.nix
+++ b/pkgs/by-name/xp/xpra/package.nix
@@ -89,7 +89,7 @@ let
 in
 buildPythonApplication rec {
   pname = "xpra";
-  version = "6.3.3";
+  version = "6.3.4";
   format = "setuptools";
 
   stdenv = if withNvenc then cudaPackages.backendStdenv else args.stdenv;
@@ -98,7 +98,7 @@ buildPythonApplication rec {
     owner = "Xpra-org";
     repo = "xpra";
     tag = "v${version}";
-    hash = "sha256-hk+C6I/QS6ihwmuNlnoNFipJ98SW6LO+Qa3Uh1h1Ji8=";
+    hash = "sha256-Wx8s1e0nhFyNrwHYD2aVutudjNSc8ukTLPqaiYHp8n8=";
   };
 
   patches = [

From faa7b805f243bf0d3d0d7ffaa7052401e6dccb93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Oct 2025 12:34:43 +0000
Subject: [PATCH 0616/6226] snd: 25.7 -> 25.8

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

diff --git a/pkgs/by-name/sn/snd/package.nix b/pkgs/by-name/sn/snd/package.nix
index d40715a59c13..f4c30e3d0381 100644
--- a/pkgs/by-name/sn/snd/package.nix
+++ b/pkgs/by-name/sn/snd/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "snd";
-  version = "25.7";
+  version = "25.8";
 
   src = fetchurl {
     url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
-    hash = "sha256-tkPb5gkeyFAJ2kAflZXUiR7langzn9NEUyjgEGDH+9w=";
+    hash = "sha256-ha8f7vBRUNEHXc0/E0L714jPFDVhMSCluKPrrdQYOTM=";
   };
 
   nativeBuildInputs = [

From 9887db7091afd5fcef99bb8c574e84b9a0ad6d0a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Oct 2025 12:51:25 +0000
Subject: [PATCH 0617/6226] python3Packages.govee-ble: 0.45.0 -> 1.0.0

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

diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix
index 3413143a8fc2..493a791ef42e 100644
--- a/pkgs/development/python-modules/govee-ble/default.nix
+++ b/pkgs/development/python-modules/govee-ble/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "govee-ble";
-  version = "0.45.0";
+  version = "1.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "Bluetooth-Devices";
     repo = "govee-ble";
     tag = "v${version}";
-    hash = "sha256-SUxK4H0Vo8C4GykIv8duFhhiGBA860QofVQDO37Ubdw=";
+    hash = "sha256-CYxPb5v7T+sp+2HJojGEVPIIaC0ySobiSK8qtHeuv7s=";
   };
 
   build-system = [ poetry-core ];

From 33c1d09f22ccd920ab86645ce0a39085bc6da8fe Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sun, 12 Oct 2025 14:41:05 +0800
Subject: [PATCH 0618/6226] libultrahdr: init at 1.4.0

---
 pkgs/by-name/li/libultrahdr/gtest.patch | 39 ++++++++++
 pkgs/by-name/li/libultrahdr/package.nix | 97 +++++++++++++++++++++++++
 2 files changed, 136 insertions(+)
 create mode 100644 pkgs/by-name/li/libultrahdr/gtest.patch
 create mode 100644 pkgs/by-name/li/libultrahdr/package.nix

diff --git a/pkgs/by-name/li/libultrahdr/gtest.patch b/pkgs/by-name/li/libultrahdr/gtest.patch
new file mode 100644
index 000000000000..50f70c38a5b5
--- /dev/null
+++ b/pkgs/by-name/li/libultrahdr/gtest.patch
@@ -0,0 +1,39 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5128335..bacf495 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -536,16 +536,6 @@ if(UHDR_BUILD_TESTS)
+     set(GTEST_LIB_PREFIX ${GTEST_BINARY_DIR}/lib/)
+   endif()
+   set(GTEST_BOTH_LIBRARIES ${GTEST_LIB_PREFIX}${GTEST_LIB} ${GTEST_LIB_PREFIX}${GTEST_LIB_MAIN})
+-  ExternalProject_Add(${GTEST_TARGET_NAME}
+-      GIT_REPOSITORY https://github.com/google/googletest
+-      GIT_TAG v1.14.0
+-      PREFIX ${GTEST_PREFIX_DIR}
+-      SOURCE_DIR ${GTEST_SOURCE_DIR}
+-      BINARY_DIR ${GTEST_BINARY_DIR}
+-      CMAKE_ARGS ${UHDR_CMAKE_ARGS}
+-      BUILD_BYPRODUCTS ${GTEST_BOTH_LIBRARIES}
+-      INSTALL_COMMAND ""
+-  )
+ endif()
+ 
+ if(UHDR_BUILD_BENCHMARK)
+@@ -675,16 +665,15 @@ endif()
+ 
+ if(UHDR_BUILD_TESTS)
+   add_executable(ultrahdr_unit_test ${UHDR_TEST_SRCS_LIST})
+-  add_dependencies(ultrahdr_unit_test ${GTEST_TARGET_NAME} ${UHDR_CORE_LIB_NAME})
+   target_compile_options(ultrahdr_unit_test PRIVATE ${UHDR_WERROR_FLAGS})
+   target_include_directories(ultrahdr_unit_test PRIVATE
+     ${PRIVATE_INCLUDE_DIR}
+-    ${GTEST_INCLUDE_DIRS}
++    @GTEST_INCLUDE_DIRS@
+   )
+   if(UHDR_BUILD_FUZZERS)
+     target_link_options(ultrahdr_unit_test PRIVATE -fsanitize=fuzzer-no-link)
+   endif()
+-  target_link_libraries(ultrahdr_unit_test ${UHDR_CORE_LIB_NAME} ${GTEST_BOTH_LIBRARIES})
++  target_link_libraries(ultrahdr_unit_test ${UHDR_CORE_LIB_NAME} -lgtest -lgtest_main)
+   add_test(NAME UHDRUnitTests, COMMAND ultrahdr_unit_test)
+ endif()
diff --git a/pkgs/by-name/li/libultrahdr/package.nix b/pkgs/by-name/li/libultrahdr/package.nix
new file mode 100644
index 000000000000..4bf5fa1563a9
--- /dev/null
+++ b/pkgs/by-name/li/libultrahdr/package.nix
@@ -0,0 +1,97 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  replaceVars,
+  cmake,
+  ninja,
+  pkg-config,
+  libjpeg,
+  gtest,
+  ctestCheckHook,
+  versionCheckHook,
+  testers,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  version = "1.4.0";
+  pname = "libultrahdr";
+
+  src = fetchFromGitHub {
+    owner = "google";
+    repo = "libultrahdr";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-SLhHiwuyHzVx/Kv+eBy8LzHTnShKXlJoszxZNPATbhs=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  patches = [
+    (replaceVars ./gtest.patch {
+      GTEST_INCLUDE_DIRS = "${lib.getDev gtest}/include";
+    })
+  ];
+
+  # CMake incorrect absolute include/lib paths: https://github.com/NixOS/nixpkgs/issues/144170
+  postPatch = ''
+    substituteInPlace cmake/libuhdr.pc.in \
+      --replace-fail \
+        'libdir=''${prefix}/@CMAKE_INSTALL_LIBDIR@' \
+        'libdir=@CMAKE_INSTALL_FULL_LIBDIR@' \
+      --replace-fail \
+        'includedir=''${prefix}/@CMAKE_INSTALL_INCLUDEDIR@' \
+        'includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@'
+  '';
+
+  cmakeFlags = [
+    (lib.cmakeBool "UHDR_BUILD_TESTS" true)
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    pkg-config
+    libjpeg
+    gtest
+  ];
+
+  nativeCheckInputs = [
+    ctestCheckHook
+  ];
+
+  doCheck = true;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  doInstallCheck = true;
+
+  passthru.tests = {
+    pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    description = "Reference codec for the Ultra HDR format";
+    longDescription = ''
+      Ultra HDR is a true HDR image format, and is backcompatible. libultrahdr
+      is the reference codec for the Ultra HDR format. The codecs that support
+      the format can render the HDR intent of the image on HDR displays; other
+      codecs can still decode and display the SDR intent of the image.
+    '';
+    homepage = "https://developer.android.com/media/platform/hdr-image-format";
+    changelog = "https://github.com/google/libultrahdr/releases/tag/v${finalAttrs.version}";
+    pkgConfigModules = [ "libuhdr" ];
+    maintainers = with lib.maintainers; [
+      yzx9
+    ];
+    platforms = lib.platforms.all;
+    license = with lib.licenses; [
+      asl20
+    ];
+    mainProgram = "ultrahdr_app";
+  };
+})

From 45190990743719250463bb7bfbdb20eb6e170d59 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sun, 12 Oct 2025 17:04:23 +0800
Subject: [PATCH 0619/6226] openimageio: add libultrahdr

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

diff --git a/pkgs/by-name/op/openimageio/package.nix b/pkgs/by-name/op/openimageio/package.nix
index ce8842e2bcb1..f8ff843e92bb 100644
--- a/pkgs/by-name/op/openimageio/package.nix
+++ b/pkgs/by-name/op/openimageio/package.nix
@@ -11,6 +11,7 @@
   libwebp,
   libjxl,
   libheif,
+  libultrahdr,
   opencolorio,
   openexr,
   openjph,
@@ -53,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpng
     libtiff
     libwebp
+    libultrahdr
     opencolorio
     openexr
     openjph

From cdb57da081701af98fcc5944dc8e174548f5584f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 12 Oct 2025 15:59:55 +0100
Subject: [PATCH 0620/6226] ruby_{3_3,3_4}: backport patches for GCC 15 and
 LLVM 21
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Ruby 3.5.0-preview1 is also affected, but it’s several months old
and the patches do not apply cleanly to it. Hopefully that won’t
be a big deal, since the fixes will be picked up on the next update.

Closes: #449970
---
 .../development/interpreters/ruby/default.nix | 36 +++++++++++++++----
 1 file changed, 29 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index d01980ee3a91..4b1ccdd4fdfa 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -183,13 +183,35 @@ let
           # make: *** [uncommon.mk:373: do-install-all] Error 1
           enableParallelInstalling = false;
 
-          patches = op useBaseRuby ./do-not-update-gems-baseruby-3.2.patch ++ [
-            # When using a baseruby, ruby always sets "libdir" to the build
-            # directory, which nix rejects due to a reference in to /build/ in
-            # the final product. Removing this reference doesn't seem to break
-            # anything and fixes cross compilation.
-            ./dont-refer-to-build-dir.patch
-          ];
+          patches =
+            op useBaseRuby ./do-not-update-gems-baseruby-3.2.patch
+            ++ [
+              # When using a baseruby, ruby always sets "libdir" to the build
+              # directory, which nix rejects due to a reference in to /build/ in
+              # the final product. Removing this reference doesn't seem to break
+              # anything and fixes cross compilation.
+              ./dont-refer-to-build-dir.patch
+            ]
+            ++ ops (lib.versionOlder ver.majMin "3.4") [
+              (fetchpatch {
+                name = "ruby-3.3-fix-llvm-21.patch";
+                url = "https://github.com/ruby/ruby/commit/5a8d7642168f4ea0d9331fded3033c225bbc36c5.patch";
+                excludes = [ "version.h" ];
+                hash = "sha256-dV98gXXTSKM2ZezTvhVXNaKaXJxiWKEeUbqqL360cWw=";
+              })
+            ]
+            ++ ops (lib.versionAtLeast ver.majMin "3.4" && lib.versionOlder ver.majMin "3.5") [
+              (fetchpatch {
+                name = "ruby-3.4-fix-gcc-15-llvm-21-1.patch";
+                url = "https://github.com/ruby/ruby/commit/846bb760756a3bf1ab12d56d8909e104f16e6940.patch";
+                hash = "sha256-+f0mzHsGAe9FT9NWE345BxzaB6vmWzMTvEfWF84uFOs=";
+              })
+              (fetchpatch {
+                name = "ruby-3.4-fix-gcc-15-llvm-21-2.patch";
+                url = "https://github.com/ruby/ruby/commit/18e176659e8afe402cab7d39972f2d56f2cf378f.patch";
+                hash = "sha256-TKPG1hcC1G2WmUkvNV6QSnvUpTEDqrYKrIk/4fAS8QE=";
+              })
+            ];
 
           cargoRoot = opString yjitSupport "yjit";
 

From e8842bd6946846f1f112e20d97f90264b84550c5 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sun, 12 Oct 2025 13:25:20 -0400
Subject: [PATCH 0621/6226] nixos/udev: Resolve names late

See: 2203cd2a7c9f18f55f1bb9e1c5466433dfe8c93e
---
 nixos/modules/services/hardware/udev.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix
index efc9b486149b..2a76e1a8b26f 100644
--- a/nixos/modules/services/hardware/udev.nix
+++ b/nixos/modules/services/hardware/udev.nix
@@ -156,7 +156,7 @@ let
 
         # Verify all the udev rules
         echo "Verifying udev rules using udevadm verify..."
-        udevadm verify --resolve-names=never --no-style $out
+        udevadm verify --resolve-names=late --no-style $out
         echo "OK"
 
         # If auto-configuration is disabled, then remove

From fa84c57f2774424c1236976a5c5928b97f4001ba Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sun, 12 Oct 2025 18:29:12 +0000
Subject: [PATCH 0622/6226] gopeed: 1.8.1 -> 1.8.2

---
 pkgs/by-name/go/gopeed/package.nix       |  6 +++---
 pkgs/by-name/go/gopeed/pubspec.lock.json | 14 ++++++++++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix
index ae3eda6df8fb..e59b50e6bdef 100644
--- a/pkgs/by-name/go/gopeed/package.nix
+++ b/pkgs/by-name/go/gopeed/package.nix
@@ -8,13 +8,13 @@
 }:
 
 let
-  version = "1.8.1";
+  version = "1.8.2";
 
   src = fetchFromGitHub {
     owner = "GopeedLab";
     repo = "gopeed";
     tag = "v${version}";
-    hash = "sha256-kG2e8shHpIuCKxv1/2uN23ldRNgoSvwPJcwxdxOBpqA=";
+    hash = "sha256-KezASQIqyu4GsKaGAhge7gEYMe57GMgzjXlAbmyDI3Y=";
   };
 
   metaCommon = {
@@ -29,7 +29,7 @@ let
     inherit version src;
     pname = "libgopeed";
 
-    vendorHash = "sha256-7SPTMeaHvqTZJQYPoGUGRudNRTcsEl/8AKgI6W/XCJQ=";
+    vendorHash = "sha256-x9M9zwS5FhsIyGGBi0szWHMfLXCFVgqv8bfSxhHZT2Y=";
 
     buildPhase = ''
       runHook preBuild
diff --git a/pkgs/by-name/go/gopeed/pubspec.lock.json b/pkgs/by-name/go/gopeed/pubspec.lock.json
index 8088eb6ba106..c737f6ecfe51 100644
--- a/pkgs/by-name/go/gopeed/pubspec.lock.json
+++ b/pkgs/by-name/go/gopeed/pubspec.lock.json
@@ -356,6 +356,16 @@
       "source": "hosted",
       "version": "1.0.8"
     },
+    "dart_ipc": {
+      "dependency": "direct main",
+      "description": {
+        "name": "dart_ipc",
+        "sha256": "6cad558cda5304017c1f581df4c96fd4f8e4ee212aae7bfa4357716236faa9ba",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.1"
+    },
     "dart_style": {
       "dependency": "transitive",
       "description": {
@@ -1763,11 +1773,11 @@
       "dependency": "transitive",
       "description": {
         "name": "web_socket_channel",
-        "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f",
+        "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.3"
     },
     "win32": {
       "dependency": "transitive",

From 176bc28fb1c1ebfe4080546b44985c052216ca8a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Oct 2025 18:56:47 +0000
Subject: [PATCH 0623/6226] openlinkhub: 0.6.5 -> 0.6.6

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

diff --git a/pkgs/by-name/op/openlinkhub/package.nix b/pkgs/by-name/op/openlinkhub/package.nix
index d9c6358bdc1d..6f5935c5b491 100644
--- a/pkgs/by-name/op/openlinkhub/package.nix
+++ b/pkgs/by-name/op/openlinkhub/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "openlinkhub";
-  version = "0.6.5";
+  version = "0.6.6";
 
   src = fetchFromGitHub {
     owner = "jurkovic-nikola";
     repo = "OpenLinkHub";
     tag = version;
-    hash = "sha256-ouSk+yi5DEeZEUNQsy2UpRi80lxlXnRFyjeP+vd/Yl0=";
+    hash = "sha256-WQKWuzf8iYD0DEivdFmiduwegOwLfYcKPPKxdMmn46E=";
   };
 
   proxyVendor = true;

From b38f14f58b2ca404c958f90d8313f0a2887d227c Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Sun, 12 Oct 2025 18:59:38 +0200
Subject: [PATCH 0624/6226] iproute2: add patch for redefinition error musl

Fixes pkgsMusl.iproute2 after the update to 6.17.0
---
 pkgs/by-name/ip/iproute2/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix
index 645d8b07fd0d..ea44bacf92f2 100644
--- a/pkgs/by-name/ip/iproute2/package.nix
+++ b/pkgs/by-name/ip/iproute2/package.nix
@@ -36,6 +36,15 @@ stdenv.mkDerivation rec {
       url = "https://lore.kernel.org/netdev/20240804161054.942439-1-dilfridge@gentoo.org/raw";
       hash = "sha256-47obv6mIn/HO47lt47slpTAFDxiQ3U/voHKzIiIGCTM=";
     })
+  ]
+  # Temporarily gated to keep rebuild counts under control.
+  # The proper fix (targeted to staging) is done in https://github.com/NixOS/nixpkgs/pull/451397
+  ++ lib.optionals stdenv.hostPlatform.isMusl [
+    (fetchurl {
+      name = "musl-redefinition.patch";
+      url = "https://lore.kernel.org/netdev/20251012124002.296018-1-yureka@cyberchaos.dev/raw";
+      hash = "sha256-8gSpZb/B5sMd2OilUQqg0FqM9y3GZd5Ch5AXV5wrCZQ=";
+    })
   ];
 
   postPatch = ''

From 074e9d87bb0f4c1580be516d0fedadba6cd27eef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 12 Oct 2025 21:32:21 +0000
Subject: [PATCH 0625/6226] zashboard: 1.103.1 -> 1.107.0

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

diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix
index ddc05c1236a8..bb5cde3b09f1 100644
--- a/pkgs/by-name/za/zashboard/package.nix
+++ b/pkgs/by-name/za/zashboard/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zashboard";
-  version = "1.103.1";
+  version = "1.107.0";
 
   src = fetchFromGitHub {
     owner = "Zephyruso";
     repo = "zashboard";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xZg0ca11TfiB2rRFONDTBv8kX25JR9kSelwPqS/HvhI=";
+    hash = "sha256-VcRMy05vgdJC1eCfHFyxlLB1yR/gRmZv7gvlhC62KjE=";
   };
 
   nativeBuildInputs = [
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-O4MayQ9r+++0XvRmXnuVnw4nHx66jVahs0sm221wfV0=";
+    hash = "sha256-0qoyN46DDdj9vy7qMRGtNrWKZVsBRv22NQBhB7sz1+U=";
   };
 
   buildPhase = ''

From 4b1c77fd4e5137799e482e9ff21065c377a2ea43 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Sun, 12 Oct 2025 00:30:06 +0200
Subject: [PATCH 0626/6226] systemd: new musl patchset

---
 pkgs/os-specific/linux/systemd/default.nix    |  83 ++--
 ...-allow-to-choose-libc-implementation.patch |  96 ++++
 ...-meson-do-not-use-libcrypt-libxcrypt.patch |  38 ++
 ...citly-link-with-libintl-when-necessa.patch |  56 +++
 ...n-explicitly-set-_LARGEFILE64_SOURCE.patch |  32 ++
 ...musl-not-define-wchar_t-in-their-hea.patch |  31 ++
 ...l-meson-check-existence-of-renameat2.patch |  91 ++++
 ...fully-disable-gshadow-idn-nss-and-ut.patch |  91 ++++
 ...dummy-gshadow-header-file-for-userdb.patch |  44 ++
 ...k-parse_printf_format-implementation.patch | 447 ++++++++++++++++++
 ...e-GNU-specific-version-of-strerror_r.patch |  74 +++
 .../0011-musl-make-strptime-accept-z.patch    | 137 ++++++
 ...trtoll-accept-strings-start-with-dot.patch |  69 +++
 .../0013-musl-introduce-strerrorname_np.patch |  86 ++++
 ...ummy-functions-for-mallinfo-malloc_i.patch |  60 +++
 ...ummy-function-for-gnu_get_libc_versi.patch |  86 ++++
 ...musl-define-__THROW-when-not-defined.patch |  30 ++
 ...-prctl.h-with-our-own-implementation.patch |  29 ++
 ...inet-if_ether.h-with-our-own-impleme.patch |  72 +++
 ...-musl-add-missing-FTW_CONTINUE-macro.patch |  35 ++
 ...usl-add-several-missing-statx-macros.patch |  90 ++++
 ...ict-between-fcntl.h-and-our-forward..patch |  36 ++
 ...22-musl-redefine-HOST_NAME_MAX-as-64.patch |  29 ++
 ...ple-evaluations-in-CPU_ISSET_S-macro.patch |  62 +++
 ...is-one-less-usable-signal-when-built.patch |  57 +++
 ...h-fix-reading-DT_RUNPATH-or-DT_RPATH.patch |  33 ++
 ...t-util-use-llu-for-formatting-rlim_t.patch |  57 +++
 ...musl-time-util-skip-tm.tm_wday-check.patch |  47 ++
 ...ilter-out-.-and-.-even-if-GLOB_ALTDI.patch | 205 ++++++++
 ...everal-random-fixlets-for-unit-tests.patch | 380 +++++++++++++++
 ...usl-ci-add-build-test-and-unit-tests.patch | 352 ++++++++++++++
 31 files changed, 2986 insertions(+), 49 deletions(-)
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0001-musl-meson-allow-to-choose-libc-implementation.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0002-musl-meson-do-not-use-libcrypt-libxcrypt.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0003-musl-meson-explicitly-link-with-libintl-when-necessa.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0004-musl-meson-explicitly-set-_LARGEFILE64_SOURCE.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0005-musl-meson-make-musl-not-define-wchar_t-in-their-hea.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0006-musl-meson-check-existence-of-renameat2.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0007-musl-meson-gracefully-disable-gshadow-idn-nss-and-ut.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0008-musl-introduce-dummy-gshadow-header-file-for-userdb.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0009-musl-add-fallback-parse_printf_format-implementation.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0010-musl-introduce-GNU-specific-version-of-strerror_r.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0011-musl-make-strptime-accept-z.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0012-musl-make-strtoll-accept-strings-start-with-dot.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0013-musl-introduce-strerrorname_np.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0014-musl-introduce-dummy-functions-for-mallinfo-malloc_i.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0015-musl-introduce-dummy-function-for-gnu_get_libc_versi.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0016-musl-define-__THROW-when-not-defined.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0017-musl-replace-sys-prctl.h-with-our-own-implementation.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0018-musl-replace-netinet-if_ether.h-with-our-own-impleme.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0019-musl-add-missing-FTW_CONTINUE-macro.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0020-musl-add-several-missing-statx-macros.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0021-musl-avoid-conflict-between-fcntl.h-and-our-forward..patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0022-musl-redefine-HOST_NAME_MAX-as-64.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0023-musl-avoid-multiple-evaluations-in-CPU_ISSET_S-macro.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0024-musl-core-there-is-one-less-usable-signal-when-built.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0025-musl-build-path-fix-reading-DT_RUNPATH-or-DT_RPATH.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0026-musl-format-util-use-llu-for-formatting-rlim_t.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0027-musl-time-util-skip-tm.tm_wday-check.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0028-musl-glob-util-filter-out-.-and-.-even-if-GLOB_ALTDI.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0029-musl-test-several-random-fixlets-for-unit-tests.patch
 create mode 100644 pkgs/os-specific/linux/systemd/musl/0030-musl-ci-add-build-test-and-unit-tests.patch

diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix
index 5c140453a81f..964ebdf07d2b 100644
--- a/pkgs/os-specific/linux/systemd/default.nix
+++ b/pkgs/os-specific/linux/systemd/default.nix
@@ -262,55 +262,39 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isGnu) [
     ./0020-timesyncd-disable-NSCD-when-DNSSEC-validation-is-dis.patch
   ]
-  ++ lib.optionals stdenv.hostPlatform.isMusl (
-    let
-      # NOTE: the master-next branch does not have stable URLs.
-      # If we need patches that aren't in master yet, they'll have to be
-      # vendored.
-      oe-core = fetchzip {
-        url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-4891f47cdaf919033bf1c02cc12e4805e5db99a0.tar.gz";
-        hash = "sha256-YKL/oC+rPZ2EEVNidEV+pJihZgUv7vLb0OASplgktn4=";
-      };
-    in
-    map (patch: "${oe-core}/meta/recipes-core/systemd/systemd/${patch}") [
-      "0003-missing_type.h-add-comparison_fn_t.patch"
-      "0004-add-fallback-parse_printf_format-implementation.patch"
-      "0005-don-t-fail-if-GLOB_BRACE-and-GLOB_ALTDIRFUNC-is-not-.patch"
-      "0006-add-missing-FTW_-macros-for-musl.patch"
-      "0007-Use-uintmax_t-for-handling-rlim_t.patch"
-      "0008-Define-glibc-compatible-basename-for-non-glibc-syste.patch"
-      "0009-Do-not-disable-buffering-when-writing-to-oom_score_a.patch"
-      "0010-distinguish-XSI-compliant-strerror_r-from-GNU-specif.patch"
-      "0011-avoid-redefinition-of-prctl_mm_map-structure.patch"
-      "0012-do-not-disable-buffer-in-writing-files.patch"
-      "0013-Handle-__cpu_mask-usage.patch"
-      "0014-Handle-missing-gshadow.patch"
-      "0015-missing_syscall.h-Define-MIPS-ABI-defines-for-musl.patch"
-      "0016-pass-correct-parameters-to-getdents64.patch"
-      "0017-Adjust-for-musl-headers.patch"
-      "0018-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch"
-      "0019-errno-util-Make-STRERROR-portable-for-musl.patch"
-      "0020-sd-event-Make-malloc_trim-conditional-on-glibc.patch"
-      "0021-shared-Do-not-use-malloc_info-on-musl.patch"
-      "0022-avoid-missing-LOCK_EX-declaration.patch"
-      "0023-include-signal.h-to-avoid-the-undeclared-error.patch"
-      "0024-undef-stdin-for-references-using-stdin-as-a-struct-m.patch"
-      "0025-adjust-header-inclusion-order-to-avoid-redeclaration.patch"
-      "0026-build-path.c-avoid-boot-time-segfault-for-musl.patch"
-    ]
-    ++ [
-      # add a missing include
-      (fetchpatch {
-        url = "https://github.com/systemd/systemd/commit/34fcd3638817060c79e1186b370e46d9b3a7409f.patch";
-        hash = "sha256-Uaewo3jPrZGJttlLcqO6cCj1w3IGZmvbur4+TBdIPxc=";
-        excludes = [ "src/udev/udevd.c" ];
-      })
-      (fetchpatch {
-        url = "https://gitlab.postmarketos.org/postmarketOS/systemd/-/commit/5760be33bd26d7e7c66a7294c5f6fd6c7044683f.patch";
-        hash = "sha256-Om+OhGyZJfZNpbtMInm3vGagLbbtOY71fDMZXj6pbPY=";
-      })
-    ]
-  );
+  ++ lib.optionals stdenv.hostPlatform.isMusl [
+    # Patchset to build with musl by an upstream systemd contributor:
+    # https://github.com/systemd/systemd/pull/37788
+    # This is vendored here because of the lack of permanent patch urls for the unmerged PR
+    ./musl/0001-musl-meson-allow-to-choose-libc-implementation.patch
+    ./musl/0002-musl-meson-do-not-use-libcrypt-libxcrypt.patch
+    ./musl/0003-musl-meson-explicitly-link-with-libintl-when-necessa.patch
+    ./musl/0004-musl-meson-explicitly-set-_LARGEFILE64_SOURCE.patch
+    ./musl/0005-musl-meson-make-musl-not-define-wchar_t-in-their-hea.patch
+    ./musl/0006-musl-meson-check-existence-of-renameat2.patch
+    ./musl/0007-musl-meson-gracefully-disable-gshadow-idn-nss-and-ut.patch
+    ./musl/0008-musl-introduce-dummy-gshadow-header-file-for-userdb.patch
+    ./musl/0009-musl-add-fallback-parse_printf_format-implementation.patch
+    ./musl/0010-musl-introduce-GNU-specific-version-of-strerror_r.patch
+    ./musl/0011-musl-make-strptime-accept-z.patch
+    ./musl/0012-musl-make-strtoll-accept-strings-start-with-dot.patch
+    ./musl/0013-musl-introduce-strerrorname_np.patch
+    ./musl/0014-musl-introduce-dummy-functions-for-mallinfo-malloc_i.patch
+    ./musl/0015-musl-introduce-dummy-function-for-gnu_get_libc_versi.patch
+    ./musl/0016-musl-define-__THROW-when-not-defined.patch
+    ./musl/0017-musl-replace-sys-prctl.h-with-our-own-implementation.patch
+    ./musl/0018-musl-replace-netinet-if_ether.h-with-our-own-impleme.patch
+    ./musl/0019-musl-add-missing-FTW_CONTINUE-macro.patch
+    ./musl/0020-musl-add-several-missing-statx-macros.patch
+    ./musl/0021-musl-avoid-conflict-between-fcntl.h-and-our-forward..patch
+    ./musl/0022-musl-redefine-HOST_NAME_MAX-as-64.patch
+    ./musl/0023-musl-avoid-multiple-evaluations-in-CPU_ISSET_S-macro.patch
+    ./musl/0024-musl-core-there-is-one-less-usable-signal-when-built.patch
+    ./musl/0025-musl-build-path-fix-reading-DT_RUNPATH-or-DT_RPATH.patch
+    ./musl/0026-musl-format-util-use-llu-for-formatting-rlim_t.patch
+    ./musl/0027-musl-time-util-skip-tm.tm_wday-check.patch
+    ./musl/0028-musl-glob-util-filter-out-.-and-.-even-if-GLOB_ALTDI.patch
+  ];
 
   postPatch = ''
     substituteInPlace src/basic/path-util.h --replace "@defaultPathNormal@" "${placeholder "out"}/bin/"
@@ -622,6 +606,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.mesonOption "zshcompletiondir" "no")
   ]
   ++ lib.optionals stdenv.hostPlatform.isMusl [
+    (lib.mesonOption "libc" "musl")
     (lib.mesonBool "gshadow" false)
     (lib.mesonBool "idn" false)
   ];
diff --git a/pkgs/os-specific/linux/systemd/musl/0001-musl-meson-allow-to-choose-libc-implementation.patch b/pkgs/os-specific/linux/systemd/musl/0001-musl-meson-allow-to-choose-libc-implementation.patch
new file mode 100644
index 000000000000..a40515f9ec29
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0001-musl-meson-allow-to-choose-libc-implementation.patch
@@ -0,0 +1,96 @@
+From 0e2b9909fed24a682c8566f9df8bbac4e9347186 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 7 Jul 2025 14:11:19 +0900
+Subject: [PATCH 01/30] musl: meson: allow to choose libc implementation
+
+This also introduces skelton directories for storing musl specific code.
+---
+ meson.build               | 17 +++++++++++++++--
+ meson_options.txt         |  2 ++
+ src/libc/meson.build      |  2 ++
+ src/libc/musl/meson.build |  5 +++++
+ 4 files changed, 24 insertions(+), 2 deletions(-)
+ create mode 100644 src/libc/musl/meson.build
+
+diff --git a/meson.build b/meson.build
+index 238b935372..bea62f0eb6 100644
+--- a/meson.build
++++ b/meson.build
+@@ -72,7 +72,10 @@ conf.set10('SD_BOOT', false)
+ 
+ # Create a title-less summary section early, so it ends up first in the output.
+ # More items are added later after they have been detected.
+-summary({'build mode' : get_option('mode')})
++summary({
++        'libc'       : get_option('libc'),
++        'build mode' : get_option('mode'),
++})
+ 
+ #####################################################################
+ 
+@@ -2042,7 +2045,14 @@ dbus_programs = []
+ boot_stubs = []
+ 
+ # This is similar to system_includes below, but for passing custom_target().
+-system_include_args = [
++system_include_args = []
++if get_option('libc') == 'musl'
++        system_include_args += [
++                '-isystem', meson.project_build_root()  / 'src/include/musl',
++                '-isystem', meson.project_source_root() / 'src/include/musl',
++        ]
++endif
++system_include_args += [
+         '-isystem', meson.project_build_root()  / 'src/include/override',
+         '-isystem', meson.project_source_root() / 'src/include/override',
+         '-isystem', meson.project_build_root()  / 'src/include/uapi',
+@@ -2060,6 +2070,9 @@ system_includes = [
+                 is_system : true,
+         ),
+ ]
++if get_option('libc') == 'musl'
++        system_includes += include_directories('src/include/musl', is_system : true)
++endif
+ 
+ basic_includes = [
+         include_directories(
+diff --git a/meson_options.txt b/meson_options.txt
+index d8dec33ec4..ad203ba301 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -397,6 +397,8 @@ option('ima', type : 'boolean',
+ option('ipe', type : 'boolean',
+        description : 'IPE support')
+ 
++option('libc', type : 'combo', choices : ['glibc', 'musl'],
++       description : 'libc implementation to be used')
+ option('acl', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
+        description : 'libacl support')
+ option('audit', type : 'feature', deprecated : { 'true' : 'enabled', 'false' : 'disabled' },
+diff --git a/src/libc/meson.build b/src/libc/meson.build
+index eeee98c9d6..306512ffd7 100644
+--- a/src/libc/meson.build
++++ b/src/libc/meson.build
+@@ -16,6 +16,8 @@ libc_wrapper_sources = files(
+         'xattr.c',
+ )
+ 
++subdir('musl')
++
+ sources += libc_wrapper_sources
+ 
+ libc_wrapper_static = static_library(
+diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build
+new file mode 100644
+index 0000000000..a876230c67
+--- /dev/null
++++ b/src/libc/musl/meson.build
+@@ -0,0 +1,5 @@
++# SPDX-License-Identifier: LGPL-2.1-or-later
++
++if get_option('libc') != 'musl'
++        subdir_done()
++endif
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0002-musl-meson-do-not-use-libcrypt-libxcrypt.patch b/pkgs/os-specific/linux/systemd/musl/0002-musl-meson-do-not-use-libcrypt-libxcrypt.patch
new file mode 100644
index 000000000000..b59b77dd7712
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0002-musl-meson-do-not-use-libcrypt-libxcrypt.patch
@@ -0,0 +1,38 @@
+From 03010a0716f509b448c84a35bc2723a6f08e0c09 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Wed, 23 Jul 2025 10:24:14 +0900
+Subject: [PATCH 02/30] musl: meson: do not use libcrypt/libxcrypt
+
+Otherwise, when both glibc and musl are installed, libxcrypt or glibc's
+libcrypt may be picked even when we are building systemd with musl.
+Let's not use libcrypt/libxcrypt in that case.
+---
+ meson.build | 12 ++++++++----
+ 1 file changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index bea62f0eb6..06be36409f 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1013,10 +1013,14 @@ else
+         libatomic = []
+ endif
+ 
+-libcrypt = dependency('libcrypt', 'libxcrypt', required : false)
+-if not libcrypt.found()
+-        # fallback to use find_library() if libcrypt is provided by glibc, e.g. for LibreELEC.
+-        libcrypt = cc.find_library('crypt')
++if get_option('libc') == 'musl'
++        libcrypt = []
++else
++        libcrypt = dependency('libcrypt', 'libxcrypt', required : false)
++        if not libcrypt.found()
++                # fallback to use find_library() if libcrypt is provided by glibc, e.g. for LibreELEC.
++                libcrypt = cc.find_library('crypt')
++        endif
+ endif
+ 
+ foreach func : [
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0003-musl-meson-explicitly-link-with-libintl-when-necessa.patch b/pkgs/os-specific/linux/systemd/musl/0003-musl-meson-explicitly-link-with-libintl-when-necessa.patch
new file mode 100644
index 000000000000..000c6c65d6f6
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0003-musl-meson-explicitly-link-with-libintl-when-necessa.patch
@@ -0,0 +1,56 @@
+From bf4cb5aeeef23c5f12e6d2258bb8f3d12059f59f Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sat, 6 Sep 2025 16:25:41 +0900
+Subject: [PATCH 03/30] musl: meson: explicitly link with libintl when
+ necessary
+
+On some musl based distributions provides dgettext() by libintl.so.
+Hence, we need to add dependency in that case.
+---
+ meson.build          | 17 +++++++++++++++++
+ src/home/meson.build |  1 +
+ 2 files changed, 18 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 06be36409f..054752c339 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1002,6 +1002,23 @@ libm = cc.find_library('m')
+ libdl = cc.find_library('dl')
+ libcap = dependency('libcap')
+ 
++# On some distributions that uses musl (e.g. Alpine), libintl.h may be provided by gettext rather than musl.
++# In that case, we need to explicitly link with libintl.so.
++if get_option('libc') == 'musl'
++        if cc.has_function('dgettext', prefix : '''#include <libintl.h>''', args : '-D_GNU_SOURCE')
++                libintl = []
++        else
++                libintl = cc.find_library('intl')
++                if not cc.has_function('dgettext', prefix : '''#include <libintl.h>''', args : '-D_GNU_SOURCE',
++                                       dependencies : libintl)
++                        error('dgettext() not found.')
++                endif
++        endif
++else
++        # When building with glibc, we assume that libintl.h is provided by glibc.
++        libintl = []
++endif
++
+ # On some architectures, libatomic is required. But on some installations,
+ # it is found, but actual linking fails. So let's try to use it opportunistically.
+ # If it is installed, but not needed, it will be dropped because of --as-needed.
+diff --git a/src/home/meson.build b/src/home/meson.build
+index 1937e6f56c..3305334707 100644
+--- a/src/home/meson.build
++++ b/src/home/meson.build
+@@ -115,6 +115,7 @@ modules += [
+                 'sources' : pam_systemd_home_sources,
+                 'dependencies' : [
+                         libcrypt,
++                        libintl,
+                         libpam_misc,
+                         libpam,
+                         threads,
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0004-musl-meson-explicitly-set-_LARGEFILE64_SOURCE.patch b/pkgs/os-specific/linux/systemd/musl/0004-musl-meson-explicitly-set-_LARGEFILE64_SOURCE.patch
new file mode 100644
index 000000000000..17de4bd3b5dd
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0004-musl-meson-explicitly-set-_LARGEFILE64_SOURCE.patch
@@ -0,0 +1,32 @@
+From 59f993d1acb069f3f2b7d6c71b91696388692702 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Tue, 10 Jun 2025 00:29:46 +0900
+Subject: [PATCH 04/30] musl: meson: explicitly set _LARGEFILE64_SOURCE
+
+glibc sets it when _GNU_SOURCE is defined, however, musl does not.
+Let's explicitly define it to make getdents64() and struct dirent64
+available even when building with musl.
+---
+ meson.build | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/meson.build b/meson.build
+index 054752c339..37fb1c2765 100644
+--- a/meson.build
++++ b/meson.build
+@@ -560,6 +560,12 @@ conf.set10('HAVE_WARNING_ZERO_AS_NULL_POINTER_CONSTANT', have)
+ conf.set('_GNU_SOURCE', 1)
+ conf.set('__SANE_USERSPACE_TYPES__', true)
+ 
++if get_option('libc') == 'musl'
++        # glibc always defines _LARGEFILE64_SOURCE when _GNU_SOURCE is set, but musl does not do that,
++        # and it is necessary for making getdents64() and struct dirent64 exist.
++        conf.set('_LARGEFILE64_SOURCE', 1)
++endif
++
+ conf.set('SIZEOF_DEV_T', cc.sizeof('dev_t', prefix : '#include <sys/types.h>'))
+ conf.set('SIZEOF_INO_T', cc.sizeof('ino_t', prefix : '#include <sys/types.h>'))
+ conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include <sys/resource.h>'))
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0005-musl-meson-make-musl-not-define-wchar_t-in-their-hea.patch b/pkgs/os-specific/linux/systemd/musl/0005-musl-meson-make-musl-not-define-wchar_t-in-their-hea.patch
new file mode 100644
index 000000000000..faab7be7ca92
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0005-musl-meson-make-musl-not-define-wchar_t-in-their-hea.patch
@@ -0,0 +1,31 @@
+From a8cc582e42dd9fd6b2304003f3e5ab7637c21b73 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 9 Jun 2025 13:37:38 +0900
+Subject: [PATCH 05/30] musl: meson: make musl not define wchar_t in their
+ header
+
+Otherwise, musl defines wchar_t as int, which conflicts with the
+assumption by sd-boot, i.e. wchar_t is 2 bytes.
+---
+ src/boot/meson.build | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/src/boot/meson.build b/src/boot/meson.build
+index ba0b309acf..bea96bb2e3 100644
+--- a/src/boot/meson.build
++++ b/src/boot/meson.build
+@@ -179,6 +179,11 @@ if get_option('mode') == 'developer' and get_option('debug')
+         efi_c_args += '-DEFI_DEBUG'
+ endif
+ 
++if get_option('libc') == 'musl'
++        # To make musl not define wchar_t as int, rather than short.
++        efi_c_args += '-D__DEFINED_wchar_t'
++endif
++
+ efi_c_ld_args = [
+         '-nostdlib',
+         '-static-pie',
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0006-musl-meson-check-existence-of-renameat2.patch b/pkgs/os-specific/linux/systemd/musl/0006-musl-meson-check-existence-of-renameat2.patch
new file mode 100644
index 000000000000..9109275b4eb8
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0006-musl-meson-check-existence-of-renameat2.patch
@@ -0,0 +1,91 @@
+From b9904ed6818232d9ad9bb496747b79a6c9606819 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 9 Jun 2025 13:00:37 +0900
+Subject: [PATCH 06/30] musl: meson: check existence of renameat2()
+
+musl-1.2.5 does not provide renameat2(). Note, it is added by
+https://github.com/kraj/musl/commit/05ce67fea99ca09cd4b6625cff7aec9cc222dd5a,
+hence hopefully it will be provided by musl-1.2.6 or newer.
+---
+ meson.build               |  5 +++++
+ src/include/musl/stdio.h  | 13 +++++++++++++
+ src/libc/musl/meson.build |  4 ++++
+ src/libc/musl/stdio.c     | 11 +++++++++++
+ 4 files changed, 33 insertions(+)
+ create mode 100644 src/include/musl/stdio.h
+ create mode 100644 src/libc/musl/stdio.c
+
+diff --git a/meson.build b/meson.build
+index 37fb1c2765..71e422f545 100644
+--- a/meson.build
++++ b/meson.build
+@@ -581,6 +581,7 @@ assert(long_max > 100000)
+ conf.set_quoted('LONG_MAX_STR', '@0@'.format(long_max))
+ 
+ foreach ident : [
++        ['renameat2',         '''#include <stdio.h>''',         get_option('libc') == 'musl'], # since musl-1.2.6
+         ['set_mempolicy',     '''#include <sys/syscall.h>'''],  # declared at numaif.h provided by libnuma, which we do not use
+         ['get_mempolicy',     '''#include <sys/syscall.h>'''],  # declared at numaif.h provided by libnuma, which we do not use
+         ['strerrorname_np',   '''#include <string.h>'''],       # since glibc-2.32
+@@ -614,6 +615,10 @@ foreach ident : [
+         ['pivot_root',        '''#include <unistd.h>'''],       # no known header declares pivot_root
+ ]
+ 
++        if ident.length() >= 3 and not ident[2]
++                continue
++        endif
++
+         have = cc.has_function(ident[0], prefix : ident[1], args : '-D_GNU_SOURCE')
+         conf.set10('HAVE_' + ident[0].to_upper(), have)
+ endforeach
+diff --git a/src/include/musl/stdio.h b/src/include/musl/stdio.h
+new file mode 100644
+index 0000000000..d677201f45
+--- /dev/null
++++ b/src/include/musl/stdio.h
+@@ -0,0 +1,13 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include_next <stdio.h>
++
++#if !HAVE_RENAMEAT2
++#  define RENAME_NOREPLACE (1 << 0)
++#  define RENAME_EXCHANGE  (1 << 1)
++#  define RENAME_WHITEOUT  (1 << 2)
++
++int missing_renameat2(int __oldfd, const char *__old, int __newfd, const char *__new, unsigned __flags);
++#  define renameat2 missing_renameat2
++#endif
+diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build
+index a876230c67..8d06d919ef 100644
+--- a/src/libc/musl/meson.build
++++ b/src/libc/musl/meson.build
+@@ -3,3 +3,7 @@
+ if get_option('libc') != 'musl'
+         subdir_done()
+ endif
++
++libc_wrapper_sources += files(
++        'stdio.c',
++)
+diff --git a/src/libc/musl/stdio.c b/src/libc/musl/stdio.c
+new file mode 100644
+index 0000000000..102a22cd5c
+--- /dev/null
++++ b/src/libc/musl/stdio.c
+@@ -0,0 +1,11 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++
++#include <stdio.h>
++#include <sys/syscall.h>
++#include <unistd.h>
++
++#if !HAVE_RENAMEAT2
++int missing_renameat2(int __oldfd, const char *__old, int __newfd, const char *__new, unsigned __flags) {
++        return syscall(__NR_renameat2, __oldfd, __old, __newfd, __new, __flags);
++}
++#endif
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0007-musl-meson-gracefully-disable-gshadow-idn-nss-and-ut.patch b/pkgs/os-specific/linux/systemd/musl/0007-musl-meson-gracefully-disable-gshadow-idn-nss-and-ut.patch
new file mode 100644
index 000000000000..8f3d16510d20
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0007-musl-meson-gracefully-disable-gshadow-idn-nss-and-ut.patch
@@ -0,0 +1,91 @@
+From 1a5f752e2a80e206474f04fe5c1990fdb08742bd Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sun, 22 Jun 2025 02:16:25 +0900
+Subject: [PATCH 07/30] musl: meson: gracefully disable gshadow, idn, nss, and
+ utmp support
+
+- musl does not support gshadow, and does not provide gshadow.h,
+- musl does not provide NI_IDN flag,
+- musl does not support nss, and does not provide nss.h which is necessary
+  for each nss modules,
+- musl does not support utmp, and all utmp related functions do nothing,
+  see https://github.com/kraj/musl/blob/v1.2.5/src/legacy/utmpx.c
+---
+ meson.build | 33 ++++++++++++++++++++++++---------
+ 1 file changed, 24 insertions(+), 9 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 71e422f545..5f235d5113 100644
+--- a/meson.build
++++ b/meson.build
+@@ -1638,11 +1638,9 @@ foreach term : ['analyze',
+                 'efi',
+                 'environment-d',
+                 'firstboot',
+-                'gshadow',
+                 'hibernate',
+                 'hostnamed',
+                 'hwdb',
+-                'idn',
+                 'ima',
+                 'ipe',
+                 'initrd',
+@@ -1654,8 +1652,6 @@ foreach term : ['analyze',
+                 'mountfsd',
+                 'networkd',
+                 'nsresourced',
+-                'nss-myhostname',
+-                'nss-systemd',
+                 'oomd',
+                 'portabled',
+                 'pstore',
+@@ -1671,7 +1667,6 @@ foreach term : ['analyze',
+                 'tmpfiles',
+                 'tpm',
+                 'userdb',
+-                'utmp',
+                 'vconsole',
+                 'xdg-autostart']
+         have = get_option(term)
+@@ -1681,14 +1676,34 @@ endforeach
+ 
+ enable_sysusers = conf.get('ENABLE_SYSUSERS') == 1
+ 
++foreach term : ['gshadow',
++                'idn',
++                'nss-myhostname',
++                'nss-systemd',
++                'utmp']
++
++        have = get_option(term)
++        if have and get_option('libc') == 'musl'
++                warning('@0@ support is requested but it is not supported when building with musl, disabling it.'.format(term))
++                have = false
++        endif
++        name = 'ENABLE_' + term.underscorify().to_upper()
++        conf.set10(name, have)
++endforeach
++
+ foreach tuple : [['nss-mymachines', 'machined'],
+                  ['nss-resolve',    'resolve']]
+         want = get_option(tuple[0])
+-        if want.allowed()
+-                have = get_option(tuple[1])
+-                if want.enabled() and not have
+-                        error('@0@ is requested but @1@ is disabled'.format(tuple[0], tuple[1]))
++        if want.enabled()
++                if get_option('libc') == 'musl'
++                        error('@0@ is requested but it is not supported when building with musl.'.format(tuple[0]))
+                 endif
++                if not get_option(tuple[1])
++                        error('@0@ is requested but @1@ is disabled.'.format(tuple[0], tuple[1]))
++                endif
++                have = true
++        elif want.allowed()
++                have = get_option(tuple[1]) and get_option('libc') != 'musl'
+         else
+                 have = false
+         endif
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0008-musl-introduce-dummy-gshadow-header-file-for-userdb.patch b/pkgs/os-specific/linux/systemd/musl/0008-musl-introduce-dummy-gshadow-header-file-for-userdb.patch
new file mode 100644
index 000000000000..50bc22cfe678
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0008-musl-introduce-dummy-gshadow-header-file-for-userdb.patch
@@ -0,0 +1,44 @@
+From 7e023763fb7f56b7c1ea6fa139d79ec2c3e0164f Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sun, 21 Sep 2025 15:24:06 +0900
+Subject: [PATCH 08/30] musl: introduce dummy gshadow header file for userdb
+
+Even 'gshadow' meson option is disabled, src/shared/userdb.c and
+src/shared/user-record-nss.c include gshadow.h unconditionally.
+Let's introduce dummy header to make them compiled gracefully.
+---
+ src/include/musl/gshadow.h | 22 ++++++++++++++++++++++
+ 1 file changed, 22 insertions(+)
+ create mode 100644 src/include/musl/gshadow.h
+
+diff --git a/src/include/musl/gshadow.h b/src/include/musl/gshadow.h
+new file mode 100644
+index 0000000000..b57c74ca83
+--- /dev/null
++++ b/src/include/musl/gshadow.h
+@@ -0,0 +1,22 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include <errno.h>
++#include <stddef.h>
++
++struct sgrp {
++        char *sg_namp;
++        char *sg_passwd;
++        char **sg_adm;
++        char **sg_mem;
++};
++
++static inline int getsgnam_r(
++                const char *__name,
++                struct sgrp *__result_buf,
++                char *__buffer,
++                size_t __buflen,
++                struct sgrp **__result) {
++
++        return EOPNOTSUPP; /* this function returns positive errno in case of error. */
++}
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0009-musl-add-fallback-parse_printf_format-implementation.patch b/pkgs/os-specific/linux/systemd/musl/0009-musl-add-fallback-parse_printf_format-implementation.patch
new file mode 100644
index 000000000000..d4347746067e
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0009-musl-add-fallback-parse_printf_format-implementation.patch
@@ -0,0 +1,447 @@
+From 444acef17881cbc27057bd85b7dc07b332c03d67 Mon Sep 17 00:00:00 2001
+From: Emil Renner Berthing <systemd@esmil.dk>
+Date: Sat, 22 May 2021 20:26:24 +0200
+Subject: [PATCH 09/30] musl: add fallback parse_printf_format() implementation
+
+musl does not provide parse_printf_format(). Let's introduce a fallback
+method.
+
+Co-authored-by: Yu Watanabe <watanabe.yu+github@gmail.com>
+---
+ src/include/musl/printf.h |  35 +++++
+ src/libc/musl/meson.build |   1 +
+ src/libc/musl/printf.c    | 276 ++++++++++++++++++++++++++++++++++++++
+ src/test/meson.build      |   6 +
+ src/test/test-printf.c    |  67 +++++++++
+ 5 files changed, 385 insertions(+)
+ create mode 100644 src/include/musl/printf.h
+ create mode 100644 src/libc/musl/printf.c
+ create mode 100644 src/test/test-printf.c
+
+diff --git a/src/include/musl/printf.h b/src/include/musl/printf.h
+new file mode 100644
+index 0000000000..4242392c89
+--- /dev/null
++++ b/src/include/musl/printf.h
+@@ -0,0 +1,35 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++/* Copyright 2014 Emil Renner Berthing <systemd@esmil.dk> */
++#pragma once
++
++#include <features.h>
++#include <stddef.h>
++
++#ifdef __GLIBC__
++#include_next <printf.h>
++#else
++
++enum {              /* C type: */
++        PA_INT,     /* int */
++        PA_CHAR,    /* int, cast to char */
++        PA_WCHAR,   /* wide char */
++        PA_STRING,  /* const char *, a '\0'-terminated string */
++        PA_WSTRING, /* const wchar_t *, wide character string */
++        PA_POINTER, /* void * */
++        PA_FLOAT,   /* float */
++        PA_DOUBLE,  /* double */
++        PA_LAST,
++};
++
++/* Flag bits that can be set in a type returned by `parse_printf_format'.  */
++#  define PA_FLAG_MASK        0xff00
++#  define PA_FLAG_LONG_LONG   (1 << 8)
++#  define PA_FLAG_LONG_DOUBLE PA_FLAG_LONG_LONG
++#  define PA_FLAG_LONG        (1 << 9)
++#  define PA_FLAG_SHORT       (1 << 10)
++#  define PA_FLAG_PTR         (1 << 11)
++
++#  define parse_printf_format missing_parse_printf_format
++#endif
++
++size_t missing_parse_printf_format(const char *fmt, size_t n, int *types);
+diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build
+index 8d06d919ef..3e205e1eb1 100644
+--- a/src/libc/musl/meson.build
++++ b/src/libc/musl/meson.build
+@@ -5,5 +5,6 @@ if get_option('libc') != 'musl'
+ endif
+ 
+ libc_wrapper_sources += files(
++        'printf.c',
+         'stdio.c',
+ )
+diff --git a/src/libc/musl/printf.c b/src/libc/musl/printf.c
+new file mode 100644
+index 0000000000..33c4acd27f
+--- /dev/null
++++ b/src/libc/musl/printf.c
+@@ -0,0 +1,276 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++/* Copyright 2014 Emil Renner Berthing <systemd@esmil.dk> */
++
++#include <limits.h>
++#include <../musl/printf.h> /* This file is also compiled when built with glibc. */
++#include <stdint.h>
++#include <string.h>
++
++static const char* consume_nonarg(const char *fmt) {
++        do {
++                if (*fmt == '\0')
++                        return fmt;
++        } while (*fmt++ != '%');
++        return fmt;
++}
++
++static const char* consume_num(const char *fmt) {
++        for (;*fmt >= '0' && *fmt <= '9'; fmt++)
++                /* do nothing */;
++        return fmt;
++}
++
++static const char* consume_argn(const char *fmt, size_t *arg) {
++        const char *p = fmt;
++        size_t val = 0;
++
++        if (*p < '1' || *p > '9')
++                return fmt;
++        do {
++                val = 10*val + (*p++ - '0');
++        } while (*p >= '0' && *p <= '9');
++
++        if (*p != '$')
++                return fmt;
++        *arg = val;
++        return p+1;
++}
++
++static const char* consume_flags(const char *fmt) {
++        for (;;)
++                switch (*fmt) {
++                case '#':
++                case '0':
++                case '-':
++                case ' ':
++                case '+':
++                case '\'':
++                case 'I':
++                        fmt++;
++                        continue;
++                default:
++                        return fmt;
++                }
++}
++
++enum state {
++        BARE,
++        LPRE,
++        LLPRE,
++        HPRE,
++        HHPRE,
++        BIGLPRE,
++        ZTPRE,
++        JPRE,
++        STOP,
++};
++
++enum type {
++        NONE,
++        PTR,
++        STR,
++        WSTR,
++        INT,
++        LONG,
++        LLONG,
++        SHORT,
++        IMAX,
++        SIZET,
++        CHAR,
++        WCHAR,
++        PDIFF,
++        DBL,
++        LDBL,
++        NPTR,
++        MAXTYPE,
++};
++
++static const short pa_types[MAXTYPE] = {
++        [NONE]   = PA_INT,
++        [PTR]    = PA_POINTER,
++        [STR]    = PA_STRING,
++        [WSTR]   = PA_WSTRING,
++        [INT]    = PA_INT,
++        [SHORT]  = PA_INT | PA_FLAG_SHORT,
++        [LONG]   = PA_INT | PA_FLAG_LONG,
++        [CHAR]   = PA_CHAR,
++        [WCHAR]  = PA_WCHAR,
++        [DBL]    = PA_DOUBLE,
++        [LDBL]   = PA_DOUBLE | PA_FLAG_LONG_DOUBLE,
++        [NPTR]   = PA_FLAG_PTR,
++};
++
++static int state_to_pa_type(unsigned state) {
++        switch (state) {
++        case LLONG:
++#if LONG_MAX != LLONG_MAX
++                return PA_INT | PA_FLAG_LONG_LONG;
++#else
++                return PA_INT | PA_FLAG_LONG;
++#endif
++
++        case IMAX:
++#if LONG_MAX != LLONG_MAX
++                if (sizeof(intmax_t) > sizeof(long))
++                        return PA_INT | PA_FLAG_LONG_LONG;
++#endif
++                if (sizeof(intmax_t) > sizeof(int))
++                        return PA_INT | PA_FLAG_LONG;
++                return PA_INT;
++
++        case SIZET:
++#if LONG_MAX != LLONG_MAX
++                if (sizeof(size_t) > sizeof(long))
++                        return PA_INT | PA_FLAG_LONG_LONG;
++#endif
++                if (sizeof(size_t) > sizeof(int))
++                        return PA_INT | PA_FLAG_LONG;
++                return PA_INT;
++        default:
++                return pa_types[state];
++        }
++}
++
++#define S(x) [(x)-'A']
++#define E(x) (STOP + (x))
++
++static const unsigned char states[]['z'-'A'+1] = {
++        { /* 0: bare types */
++                S('d') = E(INT),    S('i') = E(INT),
++                S('o') = E(INT),    S('u') = E(INT),    S('x') = E(INT),    S('X') = E(INT),
++                S('e') = E(DBL),    S('f') = E(DBL),    S('g') = E(DBL),    S('a') = E(DBL),
++                S('E') = E(DBL),    S('F') = E(DBL),    S('G') = E(DBL),    S('A') = E(DBL),
++                S('c') = E(CHAR),   S('C') = E(WCHAR),
++                S('s') = E(STR),    S('S') = E(WSTR),   S('p') = E(PTR),
++                S('n') = E(NPTR),
++                S('m') = E(NONE),
++                S('l') = LPRE,      S('q') = LLPRE,     S('h') = HPRE,      S('L') = BIGLPRE,
++                S('z') = ZTPRE,     S('Z') = ZTPRE,     S('j') = JPRE,      S('t') = ZTPRE,
++        },
++        { /* 1: l-prefixed */
++                S('d') = E(LONG),   S('i') = E(LONG),
++                S('o') = E(LONG),   S('u') = E(LONG),   S('x') = E(LONG),   S('X') = E(LONG),
++                S('e') = E(DBL),    S('f') = E(DBL),    S('g') = E(DBL),    S('a') = E(DBL),
++                S('E') = E(DBL),    S('F') = E(DBL),    S('G') = E(DBL),    S('A') = E(DBL),
++                S('c') = E(CHAR),   S('s') = E(STR),
++                S('n') = E(NPTR),
++                S('l') = LLPRE,
++        },
++        { /* 2: ll-prefixed */
++                S('d') = E(LLONG),  S('i') = E(LLONG),
++                S('o') = E(LLONG),  S('u') = E(LLONG),  S('x') = E(LLONG),  S('X') = E(LLONG),
++                S('n') = E(NPTR),
++        },
++        { /* 3: h-prefixed */
++                S('d') = E(SHORT),  S('i') = E(SHORT),
++                S('o') = E(SHORT),  S('u') = E(SHORT),  S('x') = E(SHORT),  S('X') = E(SHORT),
++                S('n') = E(NPTR),
++                S('h') = HHPRE,
++        },
++        { /* 4: hh-prefixed */
++                S('d') = E(CHAR),   S('i') = E(CHAR),
++                S('o') = E(CHAR),   S('u') = E(CHAR),   S('x') = E(CHAR),   S('X') = E(CHAR),
++                S('n') = E(NPTR),
++        },
++        { /* 5: L-prefixed */
++                S('e') = E(LDBL),   S('f') = E(LDBL),   S('g') = E(LDBL),   S('a') = E(LDBL),
++                S('E') = E(LDBL),   S('F') = E(LDBL),   S('G') = E(LDBL),   S('A') = E(LDBL),
++        },
++        { /* 6: z- or t-prefixed (assumed to be same size) */
++                S('d') = E(SIZET),  S('i') = E(SIZET),
++                S('o') = E(SIZET),  S('u') = E(SIZET),  S('x') = E(SIZET),  S('X') = E(SIZET),
++                S('n') = E(NPTR),
++        },
++        { /* 7: j-prefixed */
++                S('d') = E(IMAX),   S('i') = E(IMAX),
++                S('o') = E(IMAX),   S('u') = E(IMAX),   S('x') = E(IMAX),   S('X') = E(IMAX),
++                S('n') = E(NPTR),
++        },
++};
++
++size_t missing_parse_printf_format(const char *fmt, size_t n, int *types) {
++        size_t i = 0;
++        size_t last = 0;
++
++        memset(types, 0, n);
++
++        for (;;) {
++                size_t arg;
++
++                fmt = consume_nonarg(fmt);
++                if (*fmt == '\0')
++                        break;
++                if (*fmt == '%') {
++                        fmt++;
++                        continue;
++                }
++                arg = 0;
++                fmt = consume_argn(fmt, &arg);
++                /* flags */
++                fmt = consume_flags(fmt);
++                /* width */
++                if (*fmt == '*') {
++                        size_t warg = 0;
++                        fmt = consume_argn(fmt+1, &warg);
++                        if (warg == 0)
++                                warg = ++i;
++                        if (warg > last)
++                                last = warg;
++                        if (warg <= n && types[warg-1] == NONE)
++                                types[warg-1] = INT;
++                } else
++                        fmt = consume_num(fmt);
++                /* precision */
++                if (*fmt == '.') {
++                        fmt++;
++                        if (*fmt == '*') {
++                                size_t parg = 0;
++                                fmt = consume_argn(fmt+1, &parg);
++                                if (parg == 0)
++                                        parg = ++i;
++                                if (parg > last)
++                                        last = parg;
++                                if (parg <= n && types[parg-1] == NONE)
++                                        types[parg-1] = INT;
++                        } else {
++                                if (*fmt == '-')
++                                        fmt++;
++                                fmt = consume_num(fmt);
++                        }
++                }
++                /* length modifier and conversion specifier */
++                unsigned state = BARE;
++                for (;;) {
++                        unsigned char c = *fmt;
++
++                        if (c == '\0')
++                                break;
++
++                        fmt++;
++
++                        if (c < 'A' || c > 'z')
++                                break;
++
++                        state = states[state]S(c);
++                        if (state == 0 || state >= STOP)
++                                break;
++                }
++
++                if (state <= STOP) /* %m or invalid format */
++                        continue;
++
++                if (arg == 0)
++                        arg = ++i;
++                if (arg > last)
++                        last = arg;
++                if (arg <= n)
++                        types[arg-1] = state - STOP;
++        }
++
++        if (last > n)
++                last = n;
++        for (i = 0; i < last; i++)
++                types[i] = state_to_pa_type(types[i]);
++
++        return last;
++}
+diff --git a/src/test/meson.build b/src/test/meson.build
+index da04b82d47..1dd61effc0 100644
+--- a/src/test/meson.build
++++ b/src/test/meson.build
+@@ -403,6 +403,12 @@ executables += [
+                 'dependencies' : libacl,
+                 'type' : 'manual',
+         },
++        test_template + {
++                'sources' : files(
++                        'test-printf.c',
++                        '../libc/musl/printf.c'
++                ),
++        },
+         test_template + {
+                 'sources' : files('test-process-util.c'),
+                 'dependencies' : threads,
+diff --git a/src/test/test-printf.c b/src/test/test-printf.c
+new file mode 100644
+index 0000000000..28497e902d
+--- /dev/null
++++ b/src/test/test-printf.c
+@@ -0,0 +1,67 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++
++#include <../musl/printf.h>
++
++#include "memory-util.h"
++#include "strv.h"
++#include "tests.h"
++
++static void test_parse_printf_format_one(const char *fmt) {
++        int arg_types_x[128] = {}, arg_types_y[128] = {};
++        size_t x, y;
++
++        log_debug("/* %s(%s) */", __func__, fmt);
++
++        x = parse_printf_format(fmt, ELEMENTSOF(arg_types_x), arg_types_x);
++        y = missing_parse_printf_format(fmt, ELEMENTSOF(arg_types_y), arg_types_y);
++
++        for (size_t i = 0; i < x; i++)
++                log_debug("x[%zu]=%i", i, arg_types_x[i]);
++        for (size_t i = 0; i < y; i++)
++                log_debug("y[%zu]=%i", i, arg_types_y[i]);
++
++        ASSERT_EQ(memcmp_nn(arg_types_x, x * sizeof(int), arg_types_y, y * sizeof(int)), 0);
++}
++
++TEST(parse_printf_format) {
++        FOREACH_STRING(s, "d", "i", "o", "u", "x", "X", "n")
++                FOREACH_STRING(p, "", "hh", "h", "l", "ll", "j", "z", "Z", "t") {
++                        _cleanup_free_ char *fmt = NULL;
++
++                        ASSERT_NOT_NULL(fmt = strjoin("%", p, s));
++                        test_parse_printf_format_one(fmt);
++                }
++
++        FOREACH_STRING(s, "e", "E", "f", "F", "g", "G", "a", "A")
++                FOREACH_STRING(p, "", "L") {
++                        _cleanup_free_ char *fmt = NULL;
++
++                        ASSERT_NOT_NULL(fmt = strjoin("%", p, s));
++                        test_parse_printf_format_one(fmt);
++                }
++
++        FOREACH_STRING(s, "c", "s")
++                FOREACH_STRING(p, "", "l") {
++                        _cleanup_free_ char *fmt = NULL;
++
++                        ASSERT_NOT_NULL(fmt = strjoin("%", p, s));
++                        test_parse_printf_format_one(fmt);
++                }
++
++        FOREACH_STRING(s, "C", "S", "p", "m", "%") {
++                _cleanup_free_ char *fmt = NULL;
++
++                ASSERT_NOT_NULL(fmt = strjoin("%", s));
++                test_parse_printf_format_one(fmt);
++        }
++
++        test_parse_printf_format_one("asfhghejmlahpgakdmsalc");
++        test_parse_printf_format_one("%d%i%o%u%x%X");
++        test_parse_printf_format_one("%e%E%f%F%g%G%a%A");
++        test_parse_printf_format_one("%c%s%C%S%p%n%m%%");
++        test_parse_printf_format_one("%03d%-05d%+i%hhu%hu%hx%lx");
++        test_parse_printf_format_one("%llx%x%LE%ji%zi%zu%zi%zu%Zi%Zu%tu");
++        test_parse_printf_format_one("%l");
++}
++
++DEFINE_TEST_MAIN(LOG_DEBUG);
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0010-musl-introduce-GNU-specific-version-of-strerror_r.patch b/pkgs/os-specific/linux/systemd/musl/0010-musl-introduce-GNU-specific-version-of-strerror_r.patch
new file mode 100644
index 000000000000..dd09c69ce95f
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0010-musl-introduce-GNU-specific-version-of-strerror_r.patch
@@ -0,0 +1,74 @@
+From 8fd471ff028cd3d5df5ee944fdbcefc7e77abc3d Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 23 Jan 2023 23:39:46 -0800
+Subject: [PATCH 10/30] musl: introduce GNU specific version of strerror_r()
+
+musl provides XSI compliant strerror_r(), and it is slightly different
+from the one by glibc.
+Let's introduce a tiny wrapper to convert XSI strerror_r() to GNU one.
+---
+ src/include/musl/string.h |  7 +++++++
+ src/libc/musl/meson.build |  1 +
+ src/libc/musl/string.c    | 26 ++++++++++++++++++++++++++
+ 3 files changed, 34 insertions(+)
+ create mode 100644 src/include/musl/string.h
+ create mode 100644 src/libc/musl/string.c
+
+diff --git a/src/include/musl/string.h b/src/include/musl/string.h
+new file mode 100644
+index 0000000000..cc3da63012
+--- /dev/null
++++ b/src/include/musl/string.h
+@@ -0,0 +1,7 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include_next <string.h>
++
++char* strerror_r_gnu(int errnum, char *buf, size_t buflen);
++#define strerror_r strerror_r_gnu
+diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build
+index 3e205e1eb1..a64f292081 100644
+--- a/src/libc/musl/meson.build
++++ b/src/libc/musl/meson.build
+@@ -7,4 +7,5 @@ endif
+ libc_wrapper_sources += files(
+         'printf.c',
+         'stdio.c',
++        'string.c',
+ )
+diff --git a/src/libc/musl/string.c b/src/libc/musl/string.c
+new file mode 100644
+index 0000000000..c2a9f4a169
+--- /dev/null
++++ b/src/libc/musl/string.c
+@@ -0,0 +1,26 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++
++#include <errno.h>
++#include <stdio.h>
++#include <string.h>
++
++/* The header errno.h overrides strerror_r with strerror_r_gnu, hence we need to undef it here. */
++#undef strerror_r
++
++char* strerror_r_gnu(int errnum, char *buf, size_t buflen) {
++        int saved_errno = errno;
++        const char *msg = strerror(errnum);
++        size_t l = strlen(msg);
++        if (l >= buflen) {
++                if (buflen > 0) {
++                        if (buflen > 1)
++                                memcpy(buf, msg, buflen - 1);
++                        buf[buflen - 1] = '\0';
++                }
++                errno = ERANGE;
++        } else {
++                memcpy(buf, msg, l + 1);
++                errno = saved_errno;
++        }
++        return buf;
++}
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0011-musl-make-strptime-accept-z.patch b/pkgs/os-specific/linux/systemd/musl/0011-musl-make-strptime-accept-z.patch
new file mode 100644
index 000000000000..bbffbc8c8a53
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0011-musl-make-strptime-accept-z.patch
@@ -0,0 +1,137 @@
+From bf670a5af2a78f81ee9396b5b5da49b2df07fcfd Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Tue, 9 Sep 2025 08:31:22 +0900
+Subject: [PATCH 11/30] musl: make strptime() accept "%z"
+
+musl v1.2.5 does not support %z specifier in strptime(). Since
+https://github.com/kraj/musl/commit/fced99e93daeefb0192fd16304f978d4401d1d77
+%z is supported, but it only supports strict RFC-822/ISO 8601 format,
+that is, 4 digits with sign (e.g. +0900 or -1400), but does not support
+extended format: 2 digits or colon separated 4 digits (e.g. +09 or -14:00).
+Let's add fallback logic to make it support the extended timezone spec.
+---
+ src/include/musl/time.h   |  7 ++++
+ src/libc/musl/meson.build |  1 +
+ src/libc/musl/time.c      | 86 +++++++++++++++++++++++++++++++++++++++
+ 3 files changed, 94 insertions(+)
+ create mode 100644 src/include/musl/time.h
+ create mode 100644 src/libc/musl/time.c
+
+diff --git a/src/include/musl/time.h b/src/include/musl/time.h
+new file mode 100644
+index 0000000000..349f9a3577
+--- /dev/null
++++ b/src/include/musl/time.h
+@@ -0,0 +1,7 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include_next <time.h>
++
++char* strptime_fallback(const char *s, const char *format, struct tm *tm);
++#define strptime strptime_fallback
+diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build
+index a64f292081..5fb590e868 100644
+--- a/src/libc/musl/meson.build
++++ b/src/libc/musl/meson.build
+@@ -8,4 +8,5 @@ libc_wrapper_sources += files(
+         'printf.c',
+         'stdio.c',
+         'string.c',
++        'time.c',
+ )
+diff --git a/src/libc/musl/time.c b/src/libc/musl/time.c
+new file mode 100644
+index 0000000000..12108166b2
+--- /dev/null
++++ b/src/libc/musl/time.c
+@@ -0,0 +1,86 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++
++#include <stdbool.h>
++#include <string.h>
++#include <time.h>
++
++/* The header time.h overrides strptime with strerror_fallback, hence we need to undef it here. */
++#undef strptime
++
++char* strptime_fallback(const char *s, const char *format, struct tm *tm) {
++        /* First try native strptime() as is, and if it succeeds, return the resuit as is. */
++        char *k = strptime(s, format, tm);
++        if (k)
++                return k;
++
++        /* Check inputs for safety. */
++        if (!s || !format || !tm)
++                return NULL;
++
++        /* We only fallback if the format is exactly "%z". */
++        if (strcmp(format, "%z") != 0)
++                return NULL;
++
++        /* In the below, we parse timezone specifiction compatible with RFC-822/ISO 8601 and its extensions
++         * (e.g. +06, +0900, or -03:00). */
++
++        bool positive;
++        switch (*s) {
++        case '+':
++                positive = true;
++                break;
++        case '-':
++                positive = false;
++                break;
++        default:
++                return NULL;
++        }
++
++        s++;
++
++        if (*s < '0' || *s > '9')
++                return NULL;
++        long t = (*s - '0') * 10 * 60 * 60;
++
++        s++;
++
++        if (*s < '0' || *s > '9')
++                return NULL;
++        t += (*s - '0') * 60 * 60;
++
++        s++;
++
++        if (*s == '\0') /* 2 digits case */
++                goto finalize;
++
++        if (*s == ':') /* skip colon */
++                s++;
++
++        if (*s < '0' || *s >= '6') /* refuse minutes equal to or larger than 60 */
++                return NULL;
++        t += (*s - '0') * 10 * 60;
++
++        s++;
++
++        if (*s < '0' || *s > '9')
++                return NULL;
++        t += (*s - '0') * 60;
++
++        s++;
++
++        if (*s != '\0')
++                return NULL;
++
++finalize:
++        if (t > 24 * 60 * 60) /* refuse larger than 24 hours */
++                return NULL;
++
++        if (!positive)
++                t = -t;
++
++        *tm = (struct tm) {
++                .tm_gmtoff = t,
++        };
++
++        return (char*) s;
++}
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0012-musl-make-strtoll-accept-strings-start-with-dot.patch b/pkgs/os-specific/linux/systemd/musl/0012-musl-make-strtoll-accept-strings-start-with-dot.patch
new file mode 100644
index 000000000000..2833a951a3d2
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0012-musl-make-strtoll-accept-strings-start-with-dot.patch
@@ -0,0 +1,69 @@
+From d97f38a2ffd0aca2a1d7b8a5bbbd1994e786c7bc Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Tue, 9 Sep 2025 09:10:44 +0900
+Subject: [PATCH 12/30] musl: make strtoll() accept strings start with dot
+
+glibc accepts strings start with '.' and returns 0, but musl refuses
+them. Let's accept them, as our code assumes the function accept such
+strings.
+---
+ src/include/musl/stdlib.h |  7 +++++++
+ src/libc/musl/meson.build |  1 +
+ src/libc/musl/stdlib.c    | 19 +++++++++++++++++++
+ 3 files changed, 27 insertions(+)
+ create mode 100644 src/include/musl/stdlib.h
+ create mode 100644 src/libc/musl/stdlib.c
+
+diff --git a/src/include/musl/stdlib.h b/src/include/musl/stdlib.h
+new file mode 100644
+index 0000000000..ecfd6ccb43
+--- /dev/null
++++ b/src/include/musl/stdlib.h
+@@ -0,0 +1,7 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include_next <stdlib.h>
++
++long long strtoll_fallback(const char *nptr, char **endptr, int base);
++#define strtoll strtoll_fallback
+diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build
+index 5fb590e868..ea09af9fa5 100644
+--- a/src/libc/musl/meson.build
++++ b/src/libc/musl/meson.build
+@@ -7,6 +7,7 @@ endif
+ libc_wrapper_sources += files(
+         'printf.c',
+         'stdio.c',
++        'stdlib.c',
+         'string.c',
+         'time.c',
+ )
+diff --git a/src/libc/musl/stdlib.c b/src/libc/musl/stdlib.c
+new file mode 100644
+index 0000000000..d4e2714217
+--- /dev/null
++++ b/src/libc/musl/stdlib.c
+@@ -0,0 +1,19 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++
++#include <stdlib.h>
++
++/* The header stdlib.h overrides strtoll with strtoll_fallback, hence we need to undef it here. */
++#undef strtoll
++
++long long strtoll_fallback(const char *nptr, char **endptr, int base) {
++        /* glibc returns 0 if the first character is '.' without error, but musl returns as an error.
++         * As our code assumes the glibc behavior, let's accept string starts with '.'. */
++        if (nptr && *nptr == '.') {
++                if (endptr)
++                        *endptr = (char*) nptr;
++                return 0;
++        }
++
++        /* Otherwise, use the native strtoll(). */
++        return strtoll(nptr, endptr, base);
++}
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0013-musl-introduce-strerrorname_np.patch b/pkgs/os-specific/linux/systemd/musl/0013-musl-introduce-strerrorname_np.patch
new file mode 100644
index 000000000000..5203caf09f3d
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0013-musl-introduce-strerrorname_np.patch
@@ -0,0 +1,86 @@
+From 96b9f85d08be6f60768d1ebcdaf77e8e5dafebf6 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Fri, 5 Sep 2025 09:20:50 +0900
+Subject: [PATCH 13/30] musl: introduce strerrorname_np()
+
+musl does not provide strerrorname_np(). Thus, we need to implement it.
+---
+ src/include/musl/string.h                 |  2 ++
+ src/libc/musl/generate-strerrorname_np.sh | 39 +++++++++++++++++++++++
+ src/libc/musl/meson.build                 |  7 ++++
+ 3 files changed, 48 insertions(+)
+ create mode 100755 src/libc/musl/generate-strerrorname_np.sh
+
+diff --git a/src/include/musl/string.h b/src/include/musl/string.h
+index cc3da63012..7317c8dea0 100644
+--- a/src/include/musl/string.h
++++ b/src/include/musl/string.h
+@@ -5,3 +5,5 @@
+ 
+ char* strerror_r_gnu(int errnum, char *buf, size_t buflen);
+ #define strerror_r strerror_r_gnu
++
++const char* strerrorname_np(int errnum);
+diff --git a/src/libc/musl/generate-strerrorname_np.sh b/src/libc/musl/generate-strerrorname_np.sh
+new file mode 100755
+index 0000000000..0e0fb8b187
+--- /dev/null
++++ b/src/libc/musl/generate-strerrorname_np.sh
+@@ -0,0 +1,39 @@
++#!/usr/bin/env bash
++# SPDX-License-Identifier: LGPL-2.1-or-later
++set -eu
++set -o pipefail
++
++# This is based on src/basic/generate-errno-list.sh.
++
++# ECANCELLED, EDEADLOCK, ENOTSUP, EREFUSED, and EWOULDBLOCK are defined as aliases of
++# ECANCELED, EDEADLK, EOPNOTSUPP, ECONNREFUSED, and EAGAIN, respectively. Let's drop them.
++
++CC=${1:?}
++shift
++
++cat <<'EOF'
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++
++#include <errno.h>
++#include <stddef.h>
++#include <string.h>
++
++static const char * const errno_table[] = {
++EOF
++
++$CC -dM -include errno.h - </dev/null | \
++    grep -Ev '^#define[[:space:]]+(ECANCELLED|EDEADLOCK|ENOTSUP|EREFUSED|EWOULDBLOCK)' | \
++    awk '/^#define[ \t]+E[^ _]+[ \t]+/ { printf "        [%s] = \"%s\",\n", $2, $2; }' | \
++    sort
++
++cat <<'EOF'
++};
++
++const char* strerrorname_np(int errnum) {
++        if (errnum < 0)
++                errnum = -errnum;
++        if ((size_t) errnum >= sizeof(errno_table) / sizeof(errno_table[0]))
++                return NULL;
++        return errno_table[errnum];
++}
++EOF
+diff --git a/src/libc/musl/meson.build b/src/libc/musl/meson.build
+index ea09af9fa5..1cb6bf28c1 100644
+--- a/src/libc/musl/meson.build
++++ b/src/libc/musl/meson.build
+@@ -11,3 +11,10 @@ libc_wrapper_sources += files(
+         'string.c',
+         'time.c',
+ )
++
++generator= files('generate-strerrorname_np.sh')
++libc_wrapper_sources += custom_target(
++        input : generator,
++        output : 'strerrorname_np.c',
++        command : [env, 'bash', generator, cpp],
++        capture : true)
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0014-musl-introduce-dummy-functions-for-mallinfo-malloc_i.patch b/pkgs/os-specific/linux/systemd/musl/0014-musl-introduce-dummy-functions-for-mallinfo-malloc_i.patch
new file mode 100644
index 000000000000..41a8c6b4e2aa
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0014-musl-introduce-dummy-functions-for-mallinfo-malloc_i.patch
@@ -0,0 +1,60 @@
+From 331e8b9158f1bb3b4ff5db2c17a16a60640e0c12 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Tue, 10 Jun 2025 00:40:59 +0900
+Subject: [PATCH 14/30] musl: introduce dummy functions for mallinfo(),
+ malloc_info(), and malloc_trim()
+
+These functions are not provided by musl.
+---
+ src/include/musl/malloc.h | 39 +++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 39 insertions(+)
+ create mode 100644 src/include/musl/malloc.h
+
+diff --git a/src/include/musl/malloc.h b/src/include/musl/malloc.h
+new file mode 100644
+index 0000000000..9d15d4bf91
+--- /dev/null
++++ b/src/include/musl/malloc.h
+@@ -0,0 +1,39 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include <errno.h>
++#include <stdio.h>
++
++/* struct mallinfo2 will be defined and struct mallinfo is converted to struct mallinfo2 in
++ * override/malloc.h. Hence, here we define struct mallinfo. */
++
++struct mallinfo {
++        int arena;    /* non-mmapped space allocated from system */
++        int ordblks;  /* number of free chunks */
++        int smblks;   /* number of fastbin blocks */
++        int hblks;    /* number of mmapped regions */
++        int hblkhd;   /* space in mmapped regions */
++        int usmblks;  /* always 0, preserved for backwards compatibility */
++        int fsmblks;  /* space available in freed fastbin blocks */
++        int uordblks; /* total allocated space */
++        int fordblks; /* total free space */
++        int keepcost; /* top-most, releasable (via malloc_trim) space */
++};
++
++static inline struct mallinfo mallinfo(void) {
++        return (struct mallinfo) {};
++}
++
++static inline int malloc_info(int options, FILE *stream) {
++        if (options != 0)
++                errno = EINVAL;
++        else
++                errno = EOPNOTSUPP;
++        return -1;
++}
++
++static inline int malloc_trim(size_t pad) {
++        return 0;
++}
++
++#include_next <malloc.h>
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0015-musl-introduce-dummy-function-for-gnu_get_libc_versi.patch b/pkgs/os-specific/linux/systemd/musl/0015-musl-introduce-dummy-function-for-gnu_get_libc_versi.patch
new file mode 100644
index 000000000000..4ec71eb7e25a
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0015-musl-introduce-dummy-function-for-gnu_get_libc_versi.patch
@@ -0,0 +1,86 @@
+From 5067b1cfac07dbb50d7813b2a900b1b6f8e6e4bd Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sun, 8 Jun 2025 10:07:54 +0900
+Subject: [PATCH 15/30] musl: introduce dummy function for
+ gnu_get_libc_version()
+
+As the header gnu/libc-version.h and gnu_get_libc_version() function
+are glibc specific, and musl does not provide them.
+---
+ src/include/musl/gnu/libc-version.h | 8 ++++++++
+ src/shared/condition.c              | 9 +++++++--
+ src/test/test-condition.c           | 8 +++++---
+ 3 files changed, 20 insertions(+), 5 deletions(-)
+ create mode 100644 src/include/musl/gnu/libc-version.h
+
+diff --git a/src/include/musl/gnu/libc-version.h b/src/include/musl/gnu/libc-version.h
+new file mode 100644
+index 0000000000..8ad0ed16b8
+--- /dev/null
++++ b/src/include/musl/gnu/libc-version.h
+@@ -0,0 +1,8 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include <stddef.h>
++
++static inline const char* gnu_get_libc_version(void) {
++        return NULL;
++}
+diff --git a/src/shared/condition.c b/src/shared/condition.c
+index b09eff1bfb..b27b24aba7 100644
+--- a/src/shared/condition.c
++++ b/src/shared/condition.c
+@@ -255,8 +255,13 @@ static int condition_test_version(Condition *c, char **env) {
+         if (streq(word, "systemd"))
+                 return condition_test_version_cmp(p, STRINGIFY(PROJECT_VERSION));
+ 
+-        if (streq(word, "glibc"))
+-                return condition_test_version_cmp(p, gnu_get_libc_version());
++        if (streq(word, "glibc")) {
++                const char *v = gnu_get_libc_version();
++                if (!v)
++                        return false; /* built with musl */
++
++                return condition_test_version_cmp(p, v);
++        }
+ 
+         /* if no predicate has been set, default to "kernel" and use the whole parameter as condition */
+         if (!streq(word, "kernel"))
+diff --git a/src/test/test-condition.c b/src/test/test-condition.c
+index 11b3a42418..898c111ffe 100644
+--- a/src/test/test-condition.c
++++ b/src/test/test-condition.c
+@@ -669,8 +669,10 @@ TEST(condition_test_version) {
+         condition_free(condition);
+ 
+         /* Test glibc version */
++        bool expected = !!gnu_get_libc_version();
++
+         ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, "glibc > 1", false, false)));
+-        ASSERT_OK_POSITIVE(condition_test(condition, environ));
++        ASSERT_OK_EQ(condition_test(condition, environ), expected);
+         condition_free(condition);
+ 
+         ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, "glibc < 2", false, false)));
+@@ -678,7 +680,7 @@ TEST(condition_test_version) {
+         condition_free(condition);
+ 
+         ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, "glibc < 9999", false, false)));
+-        ASSERT_OK_POSITIVE(condition_test(condition, environ));
++        ASSERT_OK_EQ(condition_test(condition, environ), expected);
+         condition_free(condition);
+ 
+         ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, "glibc > 9999", false, false)));
+@@ -688,7 +690,7 @@ TEST(condition_test_version) {
+         v = strjoina("glibc = ", gnu_get_libc_version());
+ 
+         ASSERT_NOT_NULL((condition = condition_new(CONDITION_VERSION, v, false, false)));
+-        ASSERT_OK_POSITIVE(condition_test(condition, environ));
++        ASSERT_OK_EQ(condition_test(condition, environ), expected);
+         condition_free(condition);
+ 
+         v = strjoina("glibc != ", gnu_get_libc_version());
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0016-musl-define-__THROW-when-not-defined.patch b/pkgs/os-specific/linux/systemd/musl/0016-musl-define-__THROW-when-not-defined.patch
new file mode 100644
index 000000000000..16fc6570320a
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0016-musl-define-__THROW-when-not-defined.patch
@@ -0,0 +1,30 @@
+From 65a6110f75e3bcf980aa4138ad18c06f351b78f5 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 9 Jun 2025 14:00:55 +0900
+Subject: [PATCH 16/30] musl: define __THROW when not defined
+
+__THROW is internally used by glibc headers, hence our implementation of
+net/if.h and sys/mount.h also use it. However, musl does not provide
+the macro. Let's define it when not defined.
+---
+ src/include/musl/features.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+ create mode 100644 src/include/musl/features.h
+
+diff --git a/src/include/musl/features.h b/src/include/musl/features.h
+new file mode 100644
+index 0000000000..bd6d00a9d4
+--- /dev/null
++++ b/src/include/musl/features.h
+@@ -0,0 +1,8 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include_next <features.h>
++
++#ifndef __THROW
++#define __THROW
++#endif
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0017-musl-replace-sys-prctl.h-with-our-own-implementation.patch b/pkgs/os-specific/linux/systemd/musl/0017-musl-replace-sys-prctl.h-with-our-own-implementation.patch
new file mode 100644
index 000000000000..4d733f000d47
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0017-musl-replace-sys-prctl.h-with-our-own-implementation.patch
@@ -0,0 +1,29 @@
+From 75aa46c9399664d2a1cdabefcad2899ebfabc741 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 23 Jun 2025 16:00:21 +0900
+Subject: [PATCH 17/30] musl: replace sys/prctl.h with our own implementation
+
+To avoid conflicts between musl's sys/prctl.h and linux/prctl.h.
+---
+ src/include/musl/sys/prctl.h | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+ create mode 100644 src/include/musl/sys/prctl.h
+
+diff --git a/src/include/musl/sys/prctl.h b/src/include/musl/sys/prctl.h
+new file mode 100644
+index 0000000000..2c830d2649
+--- /dev/null
++++ b/src/include/musl/sys/prctl.h
+@@ -0,0 +1,9 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++/* This is for avoiding conflicts between musl's sys/prctl.h and linux/prctl.h. */
++
++#include <features.h>
++#include <linux/prctl.h>        /* IWYU pragma: export */
++
++int prctl(int, ...);
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0018-musl-replace-netinet-if_ether.h-with-our-own-impleme.patch b/pkgs/os-specific/linux/systemd/musl/0018-musl-replace-netinet-if_ether.h-with-our-own-impleme.patch
new file mode 100644
index 000000000000..c0044956ad0f
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0018-musl-replace-netinet-if_ether.h-with-our-own-impleme.patch
@@ -0,0 +1,72 @@
+From 6e77a74ca91e689a43651d9eeb5f8f40893eed76 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 23 Jun 2025 16:08:37 +0900
+Subject: [PATCH 18/30] musl: replace netinet/if_ether.h with our own
+ implementation
+
+musl's netinet/if_ether.h conflicts with linux/if_ether.h.
+The reimplementation is mostly equivalent with what glibc does.
+
+This also unset __UAPI_DEF_ETHHDR before including linux/if_ether.h,
+otherwise struct ethhdr may not be defined by the header when it is
+defined.
+---
+ src/include/musl/linux/if_ether.h   |  5 +++++
+ src/include/musl/netinet/if_ether.h | 33 +++++++++++++++++++++++++++++
+ 2 files changed, 38 insertions(+)
+ create mode 100644 src/include/musl/linux/if_ether.h
+ create mode 100644 src/include/musl/netinet/if_ether.h
+
+diff --git a/src/include/musl/linux/if_ether.h b/src/include/musl/linux/if_ether.h
+new file mode 100644
+index 0000000000..e28cd4a014
+--- /dev/null
++++ b/src/include/musl/linux/if_ether.h
+@@ -0,0 +1,5 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#undef __UAPI_DEF_ETHHDR
++#include_next <linux/if_ether.h>
+diff --git a/src/include/musl/netinet/if_ether.h b/src/include/musl/netinet/if_ether.h
+new file mode 100644
+index 0000000000..62f4ac03b3
+--- /dev/null
++++ b/src/include/musl/netinet/if_ether.h
+@@ -0,0 +1,33 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++/* glibc's netinet/if_ether.h does the following:
++ * - include linux/if_ether.h, net/ethernet.h, and net/if_arp.h,
++ * - define struct ether_arp, and relevant macros,
++ * - define ETHER_MAP_IP_MULTICAST() macro (currently we do not use it).
++ * However, musl's netinet/if_ether.h conflicts with linux/if_ether.h.
++ * Let's use the same way that glibc uses. */
++
++#include <linux/if_ether.h>     /* IWYU pragma: export */
++#include <net/ethernet.h>       /* IWYU pragma: export */
++#include <net/if_arp.h>         /* IWYU pragma: export */
++
++/*
++ * Ethernet Address Resolution Protocol.
++ *
++ * See RFC 826 for protocol description.  Structure below is adapted
++ * to resolving internet addresses.  Field names used correspond to
++ * RFC 826.
++ */
++struct  ether_arp {
++        struct  arphdr ea_hdr;          /* fixed-size header */
++        uint8_t arp_sha[ETH_ALEN];      /* sender hardware address */
++        uint8_t arp_spa[4];             /* sender protocol address */
++        uint8_t arp_tha[ETH_ALEN];      /* target hardware address */
++        uint8_t arp_tpa[4];             /* target protocol address */
++};
++#define arp_hrd ea_hdr.ar_hrd
++#define arp_pro ea_hdr.ar_pro
++#define arp_hln ea_hdr.ar_hln
++#define arp_pln ea_hdr.ar_pln
++#define arp_op  ea_hdr.ar_op
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0019-musl-add-missing-FTW_CONTINUE-macro.patch b/pkgs/os-specific/linux/systemd/musl/0019-musl-add-missing-FTW_CONTINUE-macro.patch
new file mode 100644
index 000000000000..24855be78c21
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0019-musl-add-missing-FTW_CONTINUE-macro.patch
@@ -0,0 +1,35 @@
+From 7d4b4e49729f7c7d5164ba2c5040ed522d68ee7a Mon Sep 17 00:00:00 2001
+From: Chen Qi <Qi.Chen@windriver.com>
+Date: Mon, 25 Feb 2019 15:00:06 +0800
+Subject: [PATCH 19/30] musl: add missing FTW_CONTINUE macro
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This is to avoid build failures like below for musl.
+
+  test-recurse-dir.c:23:24: error: ‘FTW_CONTINUE’ undeclared
+
+Co-authored-by: Yu Watanabe <watanabe.yu+github@gmail.com>
+---
+ src/include/musl/ftw.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+ create mode 100644 src/include/musl/ftw.h
+
+diff --git a/src/include/musl/ftw.h b/src/include/musl/ftw.h
+new file mode 100644
+index 0000000000..fd153734d0
+--- /dev/null
++++ b/src/include/musl/ftw.h
+@@ -0,0 +1,8 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include_next <ftw.h>
++
++#ifndef FTW_CONTINUE
++#define FTW_CONTINUE 0
++#endif
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0020-musl-add-several-missing-statx-macros.patch b/pkgs/os-specific/linux/systemd/musl/0020-musl-add-several-missing-statx-macros.patch
new file mode 100644
index 000000000000..6dd1589019b0
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0020-musl-add-several-missing-statx-macros.patch
@@ -0,0 +1,90 @@
+From c306693ac26aef3d5fb06fa0981d911bda9b93d7 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sun, 22 Jun 2025 00:38:58 +0900
+Subject: [PATCH 20/30] musl: add several missing statx macros
+
+glibc's sys/stat.h includes linux/stat.h, and we have copy of it from
+the latest kernel, hence all new flags are always defined.
+However, musl's sys/stat.h does not include linux/stat.h, and moreover,
+they conflict with each other, hence we cannot include both header
+simultaneously. Let's define missing macros to support musl.
+---
+ src/include/musl/sys/stat.h | 66 +++++++++++++++++++++++++++++++++++++
+ 1 file changed, 66 insertions(+)
+ create mode 100644 src/include/musl/sys/stat.h
+
+diff --git a/src/include/musl/sys/stat.h b/src/include/musl/sys/stat.h
+new file mode 100644
+index 0000000000..610dd3e699
+--- /dev/null
++++ b/src/include/musl/sys/stat.h
+@@ -0,0 +1,66 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include_next <sys/stat.h>
++
++#include <assert.h>
++#include <stddef.h>
++
++/* musl's sys/stat.h does not include linux/stat.h, and unfortunately they conflict with each other.
++ * Hence, some relatively new macros need to be explicitly defined here. */
++
++/* Before 23ab04a8630225371455d5f4538fd078665bb646, statx.stx_mnt_id is not defined. */
++#ifndef STATX_MNT_ID
++static_assert(offsetof(struct statx, __pad1) == offsetof(struct statx, stx_dev_minor) + sizeof(uint32_t), "");
++#define stx_mnt_id __pad1[0]
++#endif
++
++#ifndef STATX_MNT_ID
++#define STATX_MNT_ID            0x00001000U
++#endif
++#ifndef STATX_DIOALIGN
++#define STATX_DIOALIGN          0x00002000U
++#endif
++#ifndef STATX_MNT_ID_UNIQUE
++#define STATX_MNT_ID_UNIQUE     0x00004000U
++#endif
++#ifndef STATX_SUBVOL
++#define STATX_SUBVOL            0x00008000U
++#endif
++#ifndef STATX_WRITE_ATOMIC
++#define STATX_WRITE_ATOMIC      0x00010000U
++#endif
++#ifndef STATX_DIO_READ_ALIGN
++#define STATX_DIO_READ_ALIGN    0x00020000U
++#endif
++
++#ifndef STATX_ATTR_COMPRESSED
++#define STATX_ATTR_COMPRESSED   0x00000004
++#endif
++#ifndef STATX_ATTR_IMMUTABLE
++#define STATX_ATTR_IMMUTABLE    0x00000010
++#endif
++#ifndef STATX_ATTR_APPEND
++#define STATX_ATTR_APPEND       0x00000020
++#endif
++#ifndef STATX_ATTR_NODUMP
++#define STATX_ATTR_NODUMP       0x00000040
++#endif
++#ifndef STATX_ATTR_ENCRYPTED
++#define STATX_ATTR_ENCRYPTED    0x00000800
++#endif
++#ifndef STATX_ATTR_AUTOMOUNT
++#define STATX_ATTR_AUTOMOUNT    0x00001000
++#endif
++#ifndef STATX_ATTR_MOUNT_ROOT
++#define STATX_ATTR_MOUNT_ROOT   0x00002000
++#endif
++#ifndef STATX_ATTR_VERITY
++#define STATX_ATTR_VERITY       0x00100000
++#endif
++#ifndef STATX_ATTR_DAX
++#define STATX_ATTR_DAX          0x00200000
++#endif
++#ifndef STATX_ATTR_WRITE_ATOMIC
++#define STATX_ATTR_WRITE_ATOMIC 0x00400000
++#endif
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0021-musl-avoid-conflict-between-fcntl.h-and-our-forward..patch b/pkgs/os-specific/linux/systemd/musl/0021-musl-avoid-conflict-between-fcntl.h-and-our-forward..patch
new file mode 100644
index 000000000000..a024e58f2d25
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0021-musl-avoid-conflict-between-fcntl.h-and-our-forward..patch
@@ -0,0 +1,36 @@
+From a8209a45e73f4c8b1f4e4e174d2d5fbc8a9ac4df Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Tue, 22 Jul 2025 03:37:37 +0900
+Subject: [PATCH 21/30] musl: avoid conflict between fcntl.h and our forward.h
+
+glibc defines AT_FDCWD as -100, but musl defines it as (-100).
+In forward.h, we also define AT_FDCWD as -100, hence musl's fcntl.h
+conflicts with forward.h. This is for avoiding the conflict.
+---
+ src/include/musl/fcntl.h | 14 ++++++++++++++
+ 1 file changed, 14 insertions(+)
+ create mode 100644 src/include/musl/fcntl.h
+
+diff --git a/src/include/musl/fcntl.h b/src/include/musl/fcntl.h
+new file mode 100644
+index 0000000000..e69f13087d
+--- /dev/null
++++ b/src/include/musl/fcntl.h
+@@ -0,0 +1,14 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++/* glibc defines AT_FDCWD as -100, but musl defines it as (-100). Hence, musl's fcntl.h conflicts with
++ * forward.h. To avoid the conflict, here temporary undef AT_FDCWD before including fcntl.h. */
++#ifdef AT_FDCWD
++#undef AT_FDCWD
++#endif
++
++#include_next <fcntl.h>
++
++/* Then, undef AT_FDCWD by fcntl.h and redefine it as consistent with forward.h */
++#undef AT_FDCWD
++#define AT_FDCWD -100
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0022-musl-redefine-HOST_NAME_MAX-as-64.patch b/pkgs/os-specific/linux/systemd/musl/0022-musl-redefine-HOST_NAME_MAX-as-64.patch
new file mode 100644
index 000000000000..4e47c4c14e1d
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0022-musl-redefine-HOST_NAME_MAX-as-64.patch
@@ -0,0 +1,29 @@
+From 4a06464ea72d06859c54fca4d7bc361e2f4b069c Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sun, 7 Sep 2025 06:16:02 +0900
+Subject: [PATCH 22/30] musl: redefine HOST_NAME_MAX as 64
+
+glibc defines HOST_NAME_MAX as 64 and our code rely on that, but musl
+defines the constant as 255. Let's redefine it.
+---
+ src/include/musl/limits.h | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+ create mode 100644 src/include/musl/limits.h
+
+diff --git a/src/include/musl/limits.h b/src/include/musl/limits.h
+new file mode 100644
+index 0000000000..fadf71d66f
+--- /dev/null
++++ b/src/include/musl/limits.h
+@@ -0,0 +1,8 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include_next <limits.h>
++
++/* HOST_NAME_MAX should be 64 on linux, but musl uses the one by POSIX (255). */
++#undef HOST_NAME_MAX
++#define HOST_NAME_MAX 64
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0023-musl-avoid-multiple-evaluations-in-CPU_ISSET_S-macro.patch b/pkgs/os-specific/linux/systemd/musl/0023-musl-avoid-multiple-evaluations-in-CPU_ISSET_S-macro.patch
new file mode 100644
index 000000000000..a397f554fb89
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0023-musl-avoid-multiple-evaluations-in-CPU_ISSET_S-macro.patch
@@ -0,0 +1,62 @@
+From 1aecd86536aef53e92a4903794259300815a9e62 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Tue, 1 Jul 2025 12:53:14 +0900
+Subject: [PATCH 23/30] musl: avoid multiple evaluations in CPU_ISSET_S() macro
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+musl's CPU_ISSET_S() macro does not avoid multiple evaluations, and it
+only accepts simple variable or constant.
+
+Fixes the following error.
+```
+../src/shared/cpu-set-util.c: In function ‘cpu_set_to_mask_string’:
+../src/shared/cpu-set-util.c:101:41: warning: operation on ‘i’ may be undefined [-Werror=sequence-point]
+  101 |                         if (CPU_ISSET_S(--i, c->allocated, c->set))
+      |                                         ^
+```
+---
+ src/include/musl/sched.h | 30 ++++++++++++++++++++++++++++++
+ 1 file changed, 30 insertions(+)
+ create mode 100644 src/include/musl/sched.h
+
+diff --git a/src/include/musl/sched.h b/src/include/musl/sched.h
+new file mode 100644
+index 0000000000..d6e7100ee4
+--- /dev/null
++++ b/src/include/musl/sched.h
+@@ -0,0 +1,30 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include_next <sched.h>
++
++/* This is for avoiding multiple evaluations in musl's __CPU_op_S() macro. */
++
++#undef __CPU_op_S
++#undef CPU_SET_S
++#undef CPU_CLR_S
++#undef CPU_ISSET_S
++#undef CPU_SET
++#undef CPU_CLR
++#undef CPU_ISSET
++
++#define __CPU_op_S(i, size, set, op) \
++        ({                           \
++                typeof(i) _i = (i);                                     \
++                                                                        \
++                _i / 8U >= (size) ? 0 :                                 \
++                        (((unsigned long*) (set))[_i / 8 / sizeof(long)] op (1UL << (_i % (8 * sizeof(long))))); \
++        })
++
++#define CPU_SET_S(i, size, set) __CPU_op_S(i, size, set, |=)
++#define CPU_CLR_S(i, size, set) __CPU_op_S(i, size, set, &=~)
++#define CPU_ISSET_S(i, size, set) __CPU_op_S(i, size, set, &)
++
++#define CPU_SET(i, set) CPU_SET_S(i, sizeof(cpu_set_t), set)
++#define CPU_CLR(i, set) CPU_CLR_S(i, sizeof(cpu_set_t), set)
++#define CPU_ISSET(i, set) CPU_ISSET_S(i, sizeof(cpu_set_t), set)
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0024-musl-core-there-is-one-less-usable-signal-when-built.patch b/pkgs/os-specific/linux/systemd/musl/0024-musl-core-there-is-one-less-usable-signal-when-built.patch
new file mode 100644
index 000000000000..5a173be962be
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0024-musl-core-there-is-one-less-usable-signal-when-built.patch
@@ -0,0 +1,57 @@
+From c00d31373a8f5b922dd947a6d6d6098df0429762 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sun, 7 Sep 2025 08:53:07 +0900
+Subject: [PATCH 24/30] musl: core: there is one less usable signal when built
+ with musl
+
+musl internally reserves one more signal, hence we can only use 29
+signals.
+---
+ src/core/manager.c          | 4 ++--
+ src/test/test-signal-util.c | 7 ++++++-
+ 2 files changed, 8 insertions(+), 3 deletions(-)
+
+diff --git a/src/core/manager.c b/src/core/manager.c
+index d85896577f..86cb11905f 100644
+--- a/src/core/manager.c
++++ b/src/core/manager.c
+@@ -526,7 +526,7 @@ static int manager_setup_signals(Manager *m) {
+         assert_se(sigaction(SIGCHLD, &sa, NULL) == 0);
+ 
+         /* We make liberal use of realtime signals here. On Linux/glibc we have 30 of them, between
+-         * SIGRTMIN+0 ... SIGRTMIN+30 (aka SIGRTMAX). */
++         * SIGRTMIN+0 ... SIGRTMIN+30 (aka SIGRTMAX). When musl is used SIGRTMAX is SIGRTMIN+29. */
+ 
+         assert_se(sigemptyset(&mask) == 0);
+         sigset_add_many(&mask,
+@@ -571,7 +571,7 @@ static int manager_setup_signals(Manager *m) {
+                         SIGRTMIN+28, /* systemd: set log target to kmsg */
+                         SIGRTMIN+29, /* systemd: set log target to syslog-or-kmsg (obsolete) */
+ 
+-                        /* ... one free signal here SIGRTMIN+30 ... */
++                        /* ... one free signal here SIGRTMIN+30 (glibc only) ... */
+                         -1);
+         assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0);
+ 
+diff --git a/src/test/test-signal-util.c b/src/test/test-signal-util.c
+index 7d069a7fb2..f26b48f3f2 100644
+--- a/src/test/test-signal-util.c
++++ b/src/test/test-signal-util.c
+@@ -13,8 +13,13 @@ TEST(rt_signals) {
+         info(SIGRTMIN);
+         info(SIGRTMAX);
+ 
+-        /* We use signals SIGRTMIN+0 to SIGRTMIN+30 unconditionally */
++        /* We use signals SIGRTMIN+0 to SIGRTMIN+29 unconditionally. SIGRTMIN+30 can be used only when
++         * built with glibc. */
++#ifdef __GLIBC__
+         assert_se(SIGRTMAX - SIGRTMIN >= 30);
++#else
++        assert_se(SIGRTMAX - SIGRTMIN >= 29);
++#endif
+ }
+ 
+ static void test_signal_to_string_one(int val) {
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0025-musl-build-path-fix-reading-DT_RUNPATH-or-DT_RPATH.patch b/pkgs/os-specific/linux/systemd/musl/0025-musl-build-path-fix-reading-DT_RUNPATH-or-DT_RPATH.patch
new file mode 100644
index 000000000000..4a78440837ed
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0025-musl-build-path-fix-reading-DT_RUNPATH-or-DT_RPATH.patch
@@ -0,0 +1,33 @@
+From 7cade54777e9b715ca5b1023dd8fead64d1f4b3e Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Sat, 6 Sep 2025 12:06:06 +0900
+Subject: [PATCH 25/30] musl: build-path: fix reading DT_RUNPATH or DT_RPATH
+
+musl records DT_STRTAB as offset, rather than address. So, need to add
+obtained bias to read runpath or rpath.
+---
+ src/basic/build-path.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/basic/build-path.c b/src/basic/build-path.c
+index 577ff72bce..3212089379 100644
+--- a/src/basic/build-path.c
++++ b/src/basic/build-path.c
+@@ -34,11 +34,11 @@ static int get_runpath_from_dynamic(const ElfW(Dyn) *d, ElfW(Addr) bias, const c
+                         break;
+ 
+                 case DT_STRTAB:
+-                        /* On MIPS and RISC-V DT_STRTAB records an offset, not a valid address, so it has to be adjusted
+-                         * using the bias calculated earlier. */
++                        /* On MIPS, RISC-V, or with musl, DT_STRTAB records an offset, not a valid address,
++                         * so it has to be adjusted using the bias calculated earlier. */
+                         if (d->d_un.d_val != 0)
+                                 strtab = (const char *) ((uintptr_t) d->d_un.d_val
+-#if defined(__mips__) || defined(__riscv)
++#if defined(__mips__) || defined(__riscv) || !defined(__GLIBC__)
+                                          + bias
+ #endif
+                                 );
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0026-musl-format-util-use-llu-for-formatting-rlim_t.patch b/pkgs/os-specific/linux/systemd/musl/0026-musl-format-util-use-llu-for-formatting-rlim_t.patch
new file mode 100644
index 000000000000..e59e6aeae62c
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0026-musl-format-util-use-llu-for-formatting-rlim_t.patch
@@ -0,0 +1,57 @@
+From 65cd003563fe1b8f1f1b3e1c1198b3d63f993820 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 9 Jun 2025 12:00:01 +0900
+Subject: [PATCH 26/30] musl: format-util: use %llu for formatting rlim_t
+
+glibc uses uint32_t or uint64_t for rlim_t, while musl uses unsigned long long.
+---
+ meson.build             |  7 +++++++
+ src/basic/format-util.h | 14 ++++++++------
+ 2 files changed, 15 insertions(+), 6 deletions(-)
+
+diff --git a/meson.build b/meson.build
+index 5f235d5113..66579b9182 100644
+--- a/meson.build
++++ b/meson.build
+@@ -572,6 +572,13 @@ conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include <sys/resource.h
+ conf.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix : '#include <sys/time.h>'))
+ conf.set('SIZEOF_TIMEX_MEMBER', cc.sizeof('typeof(((struct timex *)0)->freq)', prefix : '#include <sys/timex.h>'))
+ 
++if get_option('libc') == 'musl'
++        if conf.get('SIZEOF_RLIM_T') != 8
++                error('Unexpected size of rlim_t: @0@'.format(conf.get('SIZEOF_RLIM_T')))
++        endif
++        conf.set_quoted('RLIM_FMT', '%llu')
++endif
++
+ long_max = cc.compute_int(
+         'LONG_MAX',
+         prefix : '#include <limits.h>',
+diff --git a/src/basic/format-util.h b/src/basic/format-util.h
+index e42f788ce6..d40ca5818a 100644
+--- a/src/basic/format-util.h
++++ b/src/basic/format-util.h
+@@ -39,12 +39,14 @@ assert_cc(sizeof(gid_t) == sizeof(uint32_t));
+ #  error Unknown timex member size
+ #endif
+ 
+-#if SIZEOF_RLIM_T == 8
+-#  define RLIM_FMT "%" PRIu64
+-#elif SIZEOF_RLIM_T == 4
+-#  define RLIM_FMT "%" PRIu32
+-#else
+-#  error Unknown rlim_t size
++#ifndef RLIM_FMT
++#  if SIZEOF_RLIM_T == 8
++#    define RLIM_FMT "%" PRIu64
++#  elif SIZEOF_RLIM_T == 4
++#    define RLIM_FMT "%" PRIu32
++#  else
++#    error Unknown rlim_t size
++#  endif
+ #endif
+ 
+ #if SIZEOF_DEV_T == 8
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0027-musl-time-util-skip-tm.tm_wday-check.patch b/pkgs/os-specific/linux/systemd/musl/0027-musl-time-util-skip-tm.tm_wday-check.patch
new file mode 100644
index 000000000000..fd9a00fb3b5d
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0027-musl-time-util-skip-tm.tm_wday-check.patch
@@ -0,0 +1,47 @@
+From 524396a3058a08955683038dae86cf5aaaf10847 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 8 Sep 2025 15:08:49 +0900
+Subject: [PATCH 27/30] musl: time-util: skip tm.tm_wday check
+
+musl does not set tm_wday when it is explicitly requested.
+The check is not necessary at all, it is just for safety.
+Let's skip it when built with musl.
+---
+ src/basic/time-util.c | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/basic/time-util.c b/src/basic/time-util.c
+index 38591b0604..c890141a99 100644
+--- a/src/basic/time-util.c
++++ b/src/basic/time-util.c
+@@ -668,10 +668,14 @@ static int parse_timestamp_impl(
+         _cleanup_free_ char *t_alloc = NULL;
+         usec_t usec, plus = 0, minus = 0;
+         bool with_tz = false;
+-        int r, weekday = -1;
+         unsigned fractional = 0;
+         const char *k;
+         struct tm tm, copy;
++        int r;
++#ifndef __GLIBC__
++        _unused_
++#endif
++        int weekday = -1;
+ 
+         /* Allowed syntaxes:
+          *
+@@ -921,8 +925,11 @@ from_tm:
+         assert(plus == 0);
+         assert(minus == 0);
+ 
++#ifdef __GLIBC__
++        /* musl does not set tm_wday field and set 0 unless it is explicitly requested by %w or so. */
+         if (weekday >= 0 && tm.tm_wday != weekday)
+                 return -EINVAL;
++#endif
+ 
+         if (gmtoff < 0) {
+                 plus = -gmtoff * USEC_PER_SEC;
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0028-musl-glob-util-filter-out-.-and-.-even-if-GLOB_ALTDI.patch b/pkgs/os-specific/linux/systemd/musl/0028-musl-glob-util-filter-out-.-and-.-even-if-GLOB_ALTDI.patch
new file mode 100644
index 000000000000..de2b0a251f02
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0028-musl-glob-util-filter-out-.-and-.-even-if-GLOB_ALTDI.patch
@@ -0,0 +1,205 @@
+From d59cd7edd78901db8fd88c86258f6830e35e91df Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Mon, 25 Feb 2019 14:56:21 +0800
+Subject: [PATCH 28/30] musl: glob-util: filter out . and .. even if
+ GLOB_ALTDIRFUNC is not supported
+
+musl neither support GLOB_ALTDIRFUNC nor GLOB_BRACE.
+Let's make safe_glob() work even when GLOB_ALTDIRFUNC is not supported.
+Currently, GLOB_BRACE is simply ignored when it is not supported.
+---
+ src/basic/glob-util.c     | 75 +++++++++++++++++++++++++++++++++++++--
+ src/basic/glob-util.h     |  9 ++++-
+ src/include/musl/glob.h   | 21 +++++++++++
+ src/test/test-glob-util.c | 10 ++++++
+ 4 files changed, 112 insertions(+), 3 deletions(-)
+ create mode 100644 src/include/musl/glob.h
+
+diff --git a/src/basic/glob-util.c b/src/basic/glob-util.c
+index 5843ef088f..84b369be87 100644
+--- a/src/basic/glob-util.c
++++ b/src/basic/glob-util.c
+@@ -9,9 +9,42 @@
+ #include "string-util.h"
+ #include "strv.h"
+ 
++static bool safe_glob_verify(const char *p, const char *prefix) {
++        if (isempty(p))
++                return false; /* should not happen, but for safey. */
++
++        if (prefix) {
++                /* Skip the prefix, as we allow dots in prefix.
++                 * Note, glob() does not normalize paths, hence do not use path_startswith(). */
++                p = startswith(p, prefix);
++                if (!p)
++                        return false; /* should not happen, but for safety. */
++        }
++
++        for (;;) {
++                p += strspn(p, "/");
++                if (*p == '\0')
++                        return true;
++                if (*p == '.') {
++                        p++;
++                        if (IN_SET(*p, '/', '\0'))
++                                return false; /* refuse dot */
++                        if (*p == '.') {
++                                p++;
++                                if (IN_SET(*p, '/', '\0'))
++                                        return false; /* refuse dot dot */
++                        }
++                }
++
++                p += strcspn(p, "/");
++                if (*p == '\0')
++                        return true;
++        }
++}
++
+ DEFINE_TRIVIAL_DESTRUCTOR(closedir_wrapper, void, closedir);
+ 
+-int safe_glob_full(const char *path, int flags, opendir_t opendir_func, char ***ret) {
++int safe_glob_internal(const char *path, int flags, bool use_gnu_extension, opendir_t opendir_func, char ***ret) {
+         _cleanup_(globfree) glob_t g = {
+                 .gl_closedir = closedir_wrapper,
+                 .gl_readdir = (struct dirent* (*)(void *)) readdir_no_dot,
+@@ -23,8 +56,16 @@ int safe_glob_full(const char *path, int flags, opendir_t opendir_func, char ***
+ 
+         assert(path);
+ 
++        // TODO: expand braces if GLOB_BRACE is specified but not supported.
++
++#if GLOB_ALTDIRFUNC == 0
++        use_gnu_extension = false;
++#else
++        SET_FLAG(flags, GLOB_ALTDIRFUNC, use_gnu_extension);
++#endif
++
+         errno = 0;
+-        r = glob(path, flags | GLOB_ALTDIRFUNC, NULL, &g);
++        r = glob(path, flags, NULL, &g);
+         if (r == GLOB_NOMATCH)
+                 return -ENOENT;
+         if (r == GLOB_NOSPACE)
+@@ -32,6 +73,36 @@ int safe_glob_full(const char *path, int flags, opendir_t opendir_func, char ***
+         if (r != 0)
+                 return errno_or_else(EIO);
+ 
++        if (!use_gnu_extension) {
++                _cleanup_free_ char *prefix = NULL;
++                r = glob_non_glob_prefix(path, &prefix);
++                if (r < 0 && r != -ENOENT)
++                        return r;
++
++                _cleanup_strv_free_ char **filtered = NULL;
++                size_t n_filtered = 0;
++                STRV_FOREACH(p, g.gl_pathv) {
++                        if (!safe_glob_verify(*p, prefix))
++                                continue;
++
++                        if (!ret)
++                                return 0; /* Found at least one entry, let's return earlier. */
++
++                        /* When musl is used, each entry is not a head of allocated memory. Hence, it is
++                         * necessary to copy the string. */
++                        r = strv_extend_with_size(&filtered, &n_filtered, *p);
++                        if (r < 0)
++                                return r;
++                }
++
++                if (n_filtered == 0)
++                        return -ENOENT;
++
++                assert(ret);
++                *ret = TAKE_PTR(filtered);
++                return 0;
++        }
++
+         if (strv_isempty(g.gl_pathv))
+                 return -ENOENT;
+ 
+diff --git a/src/basic/glob-util.h b/src/basic/glob-util.h
+index ea3e869319..36bfd6716c 100644
+--- a/src/basic/glob-util.h
++++ b/src/basic/glob-util.h
+@@ -7,7 +7,14 @@
+ 
+ typedef DIR* (*opendir_t)(const char *);
+ 
+-int safe_glob_full(const char *path, int flags, opendir_t opendir_func, char ***ret);
++int safe_glob_internal(const char *path, int flags, bool use_gnu_extension, opendir_t opendir_func, char ***ret);
++static inline int safe_glob_test(const char *path, int flags, char ***ret) {
++        /* This is for testing the fallback logic for the case GLOB_ALTDIRFUNC is not supported. */
++        return safe_glob_internal(path, flags, false, NULL, ret);
++}
++static inline int safe_glob_full(const char *path, int flags, opendir_t opendir_func, char ***ret) {
++        return safe_glob_internal(path, flags, true, opendir_func, ret);
++}
+ static inline int safe_glob(const char *path, int flags, char ***ret) {
+         return safe_glob_full(path, flags, NULL, ret);
+ }
+diff --git a/src/include/musl/glob.h b/src/include/musl/glob.h
+new file mode 100644
+index 0000000000..58e6c50678
+--- /dev/null
++++ b/src/include/musl/glob.h
+@@ -0,0 +1,21 @@
++/* SPDX-License-Identifier: LGPL-2.1-or-later */
++#pragma once
++
++#include_next <glob.h>
++
++/* Here, we set 0 to GLOB_ALTDIRFUNC and GLOB_BRACE, rather than the values used by glibc,
++ * to indicate that glob() does not support these flags. */
++
++#ifndef GLOB_ALTDIRFUNC
++#define GLOB_ALTDIRFUNC 0
++#define gl_flags    __dummy1
++#define gl_closedir __dummy2[0]
++#define gl_readdir  __dummy2[1]
++#define gl_opendir  __dummy2[2]
++#define gl_lstat    __dummy2[3]
++#define gl_stat     __dummy2[4]
++#endif
++
++#ifndef GLOB_BRACE
++#define GLOB_BRACE 0
++#endif
+diff --git a/src/test/test-glob-util.c b/src/test/test-glob-util.c
+index a9880f15c8..730961d172 100644
+--- a/src/test/test-glob-util.c
++++ b/src/test/test-glob-util.c
+@@ -61,20 +61,30 @@ TEST(safe_glob) {
+ 
+         fn = strjoina(template, "/*");
+         ASSERT_ERROR(safe_glob(fn, /* flags = */ 0, &v), ENOENT);
++        ASSERT_ERROR(safe_glob_test(fn, /* flags = */ 0, &v), ENOENT);
+ 
+         fn2 = strjoina(template, "/.*");
+         ASSERT_ERROR(safe_glob(fn2, GLOB_NOSORT|GLOB_BRACE, &v), ENOENT);
++        ASSERT_ERROR(safe_glob_test(fn2, GLOB_NOSORT|GLOB_BRACE, &v), ENOENT);
+ 
+         fname = strjoina(template, "/.foobar");
+         ASSERT_OK(touch(fname));
+ 
+         ASSERT_ERROR(safe_glob(fn, /* flags = */ 0, &v), ENOENT);
++        ASSERT_ERROR(safe_glob_test(fn, /* flags = */ 0, &v), ENOENT);
+ 
+         ASSERT_OK(safe_glob(fn2, GLOB_NOSORT|GLOB_BRACE, &v));
+         ASSERT_EQ(strv_length(v), 1u);
+         ASSERT_STREQ(v[0], fname);
+         ASSERT_NULL(v[1]);
+ 
++        v = strv_free(v);
++
++        ASSERT_OK(safe_glob_test(fn2, GLOB_NOSORT|GLOB_BRACE, &v));
++        ASSERT_EQ(strv_length(v), 1u);
++        ASSERT_STREQ(v[0], fname);
++        ASSERT_NULL(v[1]);
++
+         (void) rm_rf(template, REMOVE_ROOT|REMOVE_PHYSICAL);
+ }
+ 
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0029-musl-test-several-random-fixlets-for-unit-tests.patch b/pkgs/os-specific/linux/systemd/musl/0029-musl-test-several-random-fixlets-for-unit-tests.patch
new file mode 100644
index 000000000000..4e8fa289dd41
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0029-musl-test-several-random-fixlets-for-unit-tests.patch
@@ -0,0 +1,380 @@
+From 2c3c84939b930986b31bc0f28e9a08bf43786255 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Tue, 9 Sep 2025 13:34:31 +0900
+Subject: [PATCH 29/30] musl: test: several random fixlets for unit tests
+
+---
+ src/boot/test-efi-string.c             | 36 ++++++++++++++++++++------
+ src/libsystemd/sd-bus/test-bus-error.c |  6 +++++
+ src/test/meson.build                   |  1 +
+ src/test/test-errno-util.c             | 12 ++++++++-
+ src/test/test-fileio.c                 | 10 ++++++-
+ src/test/test-locale-util.c            |  7 ++++-
+ src/test/test-os-util.c                |  6 ++++-
+ src/test/test-seccomp.c                |  8 ++++--
+ src/test/test-time-util.c              | 24 +++++++++++++++++
+ test/meson.build                       |  2 ++
+ test/test-sysusers.sh.in               | 22 +++++++++++++++-
+ 11 files changed, 119 insertions(+), 15 deletions(-)
+
+diff --git a/src/boot/test-efi-string.c b/src/boot/test-efi-string.c
+index e0d3bd9b71..af6dd1fb64 100644
+--- a/src/boot/test-efi-string.c
++++ b/src/boot/test-efi-string.c
+@@ -410,13 +410,27 @@ TEST(startswith8) {
+         ASSERT_NULL(startswith8(NULL, ""));
+ }
+ 
+-#define TEST_FNMATCH_ONE(pattern, haystack, expect)                                     \
+-        ({                                                                              \
+-                ASSERT_EQ(fnmatch(pattern, haystack, 0), expect ? 0 : FNM_NOMATCH);     \
+-                ASSERT_EQ(efi_fnmatch(u##pattern, u##haystack), expect);                \
++#define TEST_FNMATCH_ONE_FULL(pattern, haystack, expect, skip_libc)     \
++        ({                                                              \
++                if (!skip_libc)                                         \
++                        ASSERT_EQ(fnmatch(pattern, haystack, 0), expect ? 0 : FNM_NOMATCH); \
++                ASSERT_EQ(efi_fnmatch(u##pattern, u##haystack), expect); \
+         })
+ 
++#define TEST_FNMATCH_ONE(pattern, haystack, expect)             \
++        TEST_FNMATCH_ONE_FULL(pattern, haystack, expect, false)
++
+ TEST(efi_fnmatch) {
++        bool skip_libc;
++
++#ifdef __GLIBC__
++        skip_libc = false;
++#else
++        /* It seems musl is too strict in handling "[]" (or has a bug?). Anyway, let's skip some test cases
++         * when built with musl. The behavior of efi_fnmatch() does not need to match musl's fnmatch(). */
++        skip_libc = true;
++#endif
++
+         TEST_FNMATCH_ONE("", "", true);
+         TEST_FNMATCH_ONE("abc", "abc", true);
+         TEST_FNMATCH_ONE("aBc", "abc", false);
+@@ -447,18 +461,18 @@ TEST(efi_fnmatch) {
+         TEST_FNMATCH_ONE("[abc", "a", false);
+         TEST_FNMATCH_ONE("[][!] [][!] [][!]", "[ ] !", true);
+         TEST_FNMATCH_ONE("[]-] []-]", "] -", true);
+-        TEST_FNMATCH_ONE("[1\\]] [1\\]]", "1 ]", true);
++        TEST_FNMATCH_ONE_FULL("[1\\]] [1\\]]", "1 ]", true, skip_libc);
+         TEST_FNMATCH_ONE("[$-\\+]", "&", true);
+         TEST_FNMATCH_ONE("[1-3A-C] [1-3A-C]", "2 B", true);
+         TEST_FNMATCH_ONE("[3-5] [3-5] [3-5]", "3 4 5", true);
+         TEST_FNMATCH_ONE("[f-h] [f-h] [f-h]", "f g h", true);
+-        TEST_FNMATCH_ONE("[a-c-f] [a-c-f] [a-c-f] [a-c-f] [a-c-f]", "a b c - f", true);
+-        TEST_FNMATCH_ONE("[a-c-f]", "e", false);
++        TEST_FNMATCH_ONE_FULL("[a-c-f] [a-c-f] [a-c-f] [a-c-f] [a-c-f]", "a b c - f", true, skip_libc);
++        TEST_FNMATCH_ONE_FULL("[a-c-f]", "e", false, skip_libc);
+         TEST_FNMATCH_ONE("[--0] [--0] [--0]", "- . 0", true);
+         TEST_FNMATCH_ONE("[+--] [+--] [+--]", "+ , -", true);
+         TEST_FNMATCH_ONE("[f-l]", "m", false);
+         TEST_FNMATCH_ONE("[b]", "z-a", false);
+-        TEST_FNMATCH_ONE("[a\\-z]", "b", false);
++        TEST_FNMATCH_ONE_FULL("[a\\-z]", "b", false, skip_libc);
+         TEST_FNMATCH_ONE("?a*b[.-0]c", "/a/b/c", true);
+         TEST_FNMATCH_ONE("debian-*-*-*.*", "debian-jessie-2018-06-17-kernel-image-5.10.0-16-amd64.efi", true);
+ 
+@@ -674,8 +688,14 @@ TEST(xvasprintf_status) {
+         test_printf_one("string");
+         test_printf_one("%%-%%%%");
+ 
++#ifdef __GLIBC__
+         test_printf_one("%p %p %32p %*p %*p", NULL, (void *) 0xF, &errno, 0, &saved_argc, 20, &saved_argv);
+         test_printf_one("%-10p %-32p %-*p %-*p", NULL, &errno, 0, &saved_argc, 20, &saved_argv);
++#else
++        /* musl prints NULL as 0, while glibc and our implementation print it as (nil). */
++        test_printf_one("%p %32p %*p %*p", (void *) 0xF, &errno, 0, &saved_argc, 20, &saved_argv);
++        test_printf_one("%-32p %-*p %-*p", &errno, 0, &saved_argc, 20, &saved_argv);
++#endif
+ 
+         test_printf_one("%c %3c %*c %*c %-8c", '1', '!', 0, 'a', 9, '_', '>');
+ 
+diff --git a/src/libsystemd/sd-bus/test-bus-error.c b/src/libsystemd/sd-bus/test-bus-error.c
+index c6b86be621..d69eb984dc 100644
+--- a/src/libsystemd/sd-bus/test-bus-error.c
++++ b/src/libsystemd/sd-bus/test-bus-error.c
+@@ -232,7 +232,13 @@ TEST(sd_bus_error_set_errnof) {
+         errno = EACCES;
+         assert_se(asprintf(&str, "%m") >= 0);
+         assert_se(streq(error.message, str));
++#ifdef __GLIBC__
+         assert_se(error._need_free == 0);
++#else
++        /* musl's strerror_l() always writes error message in the given buffer, hence the we need to
++         * free it. */
++        assert_se(error._need_free == 1);
++#endif
+ 
+         str = mfree(str);
+         sd_bus_error_free(&error);
+diff --git a/src/test/meson.build b/src/test/meson.build
+index 1dd61effc0..4bdfc65f04 100644
+--- a/src/test/meson.build
++++ b/src/test/meson.build
+@@ -16,6 +16,7 @@ test_env = {
+         'PROJECT_BUILD_ROOT' : meson.project_build_root(),
+         'SYSTEMD_SLOW_TESTS' : want_slow_tests ? '1' : '0',
+         'PYTHONDONTWRITEBYTECODE' : '1',
++        'SYSTEMD_LIBC' : get_option('libc'),
+ }
+ if conf.get('ENABLE_LOCALED') == 1
+         test_env += {'SYSTEMD_LANGUAGE_FALLBACK_MAP' : language_fallback_map}
+diff --git a/src/test/test-errno-util.c b/src/test/test-errno-util.c
+index 1a0154fb05..1ad067b2c7 100644
+--- a/src/test/test-errno-util.c
++++ b/src/test/test-errno-util.c
+@@ -26,18 +26,28 @@ TEST(STRERROR) {
+         log_info("STRERROR(%d), STRERROR(%d) → %s, %s", 200, 201, STRERROR(200), STRERROR(201));
+ 
+         const char *a = STRERROR(200), *b = STRERROR(201);
++#ifdef __GLIBC__
+         ASSERT_NOT_NULL(strstr(a, "200"));
+         ASSERT_NOT_NULL(strstr(b, "201"));
++#else
++        /* musl provides catch all error message for unknown error number. */
++        ASSERT_STREQ(a, "No error information");
++        ASSERT_STREQ(b, "No error information");
++#endif
+ 
+         /* Check with negative values */
+         ASSERT_STREQ(a, STRERROR(-200));
+         ASSERT_STREQ(b, STRERROR(-201));
+ 
+         const char *c = STRERROR(INT_MAX);
++        log_info("STRERROR(%d) → %s", INT_MAX, c);
++#ifdef __GLIBC__
+         char buf[DECIMAL_STR_MAX(int)];
+         xsprintf(buf, "%d", INT_MAX);  /* INT_MAX is hexadecimal, use printf to convert to decimal */
+-        log_info("STRERROR(%d) → %s", INT_MAX, c);
+         ASSERT_NOT_NULL(strstr(c, buf));
++#else
++        ASSERT_STREQ(c, "No error information");
++#endif
+ }
+ 
+ TEST(STRERROR_OR_ELSE) {
+diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
+index e0ae30bbb9..ad572056c2 100644
+--- a/src/test/test-fileio.c
++++ b/src/test/test-fileio.c
+@@ -400,7 +400,15 @@ TEST(write_string_stream) {
+ 
+         f = fdopen(fd, "r");
+         assert_se(f);
+-        assert_se(write_string_stream(f, "boohoo", 0) < 0);
++#ifdef __GLIBC__
++        ASSERT_ERROR(write_string_stream(f, "boohoo", 0), EBADF);
++#else
++        /* Even the file is opened with the read-only mode, fputs() and fputc() by musl succeed but nothing
++         * actually written, thus write_string_stream() also succeeds. */
++        ASSERT_OK(write_string_stream(f, "boohoo", 0));
++        rewind(f);
++        ASSERT_NULL(fgets(buf, sizeof(buf), f));
++#endif
+         f = safe_fclose(f);
+ 
+         f = fopen(fn, "r+");
+diff --git a/src/test/test-locale-util.c b/src/test/test-locale-util.c
+index e264cff5dd..faa7ac4211 100644
+--- a/src/test/test-locale-util.c
++++ b/src/test/test-locale-util.c
+@@ -50,7 +50,12 @@ TEST(locale_is_installed) {
+         assert_se(locale_is_installed("\x01gar\x02 bage\x03") == 0);
+ 
+         /* Definitely not installed */
+-        assert_se(locale_is_installed("zz_ZZ") == 0);
++#ifdef __GLIBC__
++        ASSERT_OK_ZERO(locale_is_installed("zz_ZZ"));
++#else
++        /* musl seems to return a non-null locale object even if it is not installed. */
++        ASSERT_OK_POSITIVE(locale_is_installed("zz_ZZ"));
++#endif
+ }
+ 
+ TEST(keymaps) {
+diff --git a/src/test/test-os-util.c b/src/test/test-os-util.c
+index fcab1139c2..902062560f 100644
+--- a/src/test/test-os-util.c
++++ b/src/test/test-os-util.c
+@@ -127,7 +127,11 @@ TEST(os_release_support_ended) {
+ 
+         ASSERT_TRUE(os_release_support_ended("1999-01-01", false, NULL));
+         ASSERT_FALSE(os_release_support_ended("2037-12-31", false, NULL));
+-        assert_se(os_release_support_ended("-1-1-1", true, NULL) == -EINVAL);
++#ifdef __GLIBC__
++        ASSERT_ERROR(os_release_support_ended("-1-1-1", true, NULL), EINVAL);
++#else
++        ASSERT_ERROR(os_release_support_ended("-1-1-1", true, NULL), ERANGE);
++#endif
+ 
+         r = os_release_support_ended(NULL, false, NULL);
+         if (r < 0)
+diff --git a/src/test/test-seccomp.c b/src/test/test-seccomp.c
+index 13c65a93cd..a9953b2c98 100644
+--- a/src/test/test-seccomp.c
++++ b/src/test/test-seccomp.c
+@@ -553,9 +553,13 @@ TEST(memory_deny_write_execute_mmap) {
+                 assert_se(seccomp_memory_deny_write_execute() >= 0);
+ 
+                 p = mmap(NULL, page_size(), PROT_WRITE|PROT_EXEC, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
+-#if defined(__x86_64__) || defined(__i386__) || defined(__powerpc64__) || defined(__arm__) || defined(__aarch64__) || defined(__loongarch_lp64)
++#if defined(__x86_64__) || defined(__i386__) || defined(__powerpc64__) || defined(__arm__) || defined(__aarch64__) || defined(__loongarch_lp64) || !defined(__GLIBC__)
+                 assert_se(p == MAP_FAILED);
+-                assert_se(errno == EPERM);
++#  ifdef __GLIBC__
++                ASSERT_EQ(errno, EPERM);
++#  else
++                ASSERT_EQ(errno, ENOMEM);
++#  endif
+ #endif
+                 /* Depending on kernel, libseccomp, and glibc versions, other architectures
+                  * might fail or not. Let's not assert success. */
+diff --git a/src/test/test-time-util.c b/src/test/test-time-util.c
+index 7569f89ca0..203f8a148d 100644
+--- a/src/test/test-time-util.c
++++ b/src/test/test-time-util.c
+@@ -406,6 +406,25 @@ static void test_format_timestamp_impl(usec_t x) {
+         const char *xx = FORMAT_TIMESTAMP(x);
+         ASSERT_NOT_NULL(xx);
+ 
++#ifndef __GLIBC__
++        /* Because of the timezone change, format_timestamp() may set timezone that is currently unused.
++         * E.g. Africa/Juba may set EAT, but currently it uses CAT/CAST. */
++        const char *space;
++        ASSERT_NOT_NULL(space = strrchr(xx, ' '));
++        const char *tz = space + 1;
++        if (!streq_ptr(tz, tzname[0]) &&
++            !streq_ptr(tz, tzname[1]) &&
++            parse_gmtoff(tz, NULL) < 0) {
++
++                log_warning("@" USEC_FMT " → %s, timezone '%s' is currently unused, ignoring.", x, xx, tz);
++
++                /* Verify the generated string except for the timezone part. Of course, in most cases, parsed
++                 * time does not match with the input, hence only check if it is parsable. */
++                ASSERT_OK(parse_timestamp(strndupa_safe(xx, space - xx), NULL));
++                return;
++        }
++#endif
++
+         usec_t y;
+         ASSERT_OK(parse_timestamp(xx, &y));
+         const char *yy = FORMAT_TIMESTAMP(y);
+@@ -1116,7 +1135,12 @@ TEST(in_utc_timezone) {
+         assert_se(setenv("TZ", ":UTC", 1) >= 0);
+         assert_se(in_utc_timezone());
+         ASSERT_STREQ(tzname[0], "UTC");
++#ifdef __GLIBC__
+         ASSERT_STREQ(tzname[1], "UTC");
++#else
++        /* musl sets an empty string to tzname[1] when DST is not used by the timezone. */
++        ASSERT_STREQ(tzname[1], "");
++#endif
+         assert_se(timezone == 0);
+         assert_se(daylight == 0);
+ 
+diff --git a/test/meson.build b/test/meson.build
+index 505a14aa81..1f1ec0a0e1 100644
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -13,6 +13,7 @@ if conf.get('ENABLE_SYSUSERS') == 1
+                      # https://github.com/mesonbuild/meson/issues/2681
+                      args : exe.full_path(),
+                      depends : exe,
++                     env : test_env,
+                      suite : 'sysusers')
+ 
+                 if have_standalone_binaries
+@@ -22,6 +23,7 @@ if conf.get('ENABLE_SYSUSERS') == 1
+                              # https://github.com/mesonbuild/meson/issues/2681
+                              args : exe.full_path(),
+                              depends : exe,
++                             env : test_env,
+                              suite : 'sysusers')
+                 endif
+         endif
+diff --git a/test/test-sysusers.sh.in b/test/test-sysusers.sh.in
+index 3218923590..ae7bfee2fe 100755
+--- a/test/test-sysusers.sh.in
++++ b/test/test-sysusers.sh.in
+@@ -13,6 +13,12 @@ TESTDIR=$(mktemp --tmpdir --directory "test-sysusers.XXXXXXXXXX")
+ # shellcheck disable=SC2064
+ trap "rm -rf '$TESTDIR'" EXIT INT QUIT PIPE
+ 
++skip_nis() {
++    # musl seems to not support NIS entries. Let's skip the test case for NIS entries.
++    local path=${1:?}
++    [[ "${SYSTEMD_LIBC:-}" == musl && "${path##*/}" == "test-11.input" ]]
++}
++
+ prepare_testdir() {
+     mkdir -p "$TESTDIR/etc/sysusers.d/"
+     mkdir -p "$TESTDIR/usr/lib/sysusers.d/"
+@@ -50,6 +56,7 @@ rm -f "$TESTDIR"/etc/sysusers.d/* "$TESTDIR"/usr/lib/sysusers.d/*
+ 
+ # happy tests
+ for f in $(find "$SOURCE"/test-*.input | sort -V); do
++    skip_nis "$f" && continue
+     echo "*** Running $f"
+     prepare_testdir "${f%.input}"
+     cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf"
+@@ -59,6 +66,7 @@ for f in $(find "$SOURCE"/test-*.input | sort -V); do
+ done
+ 
+ for f in $(find "$SOURCE"/test-*.input | sort -V); do
++    skip_nis "$f" && continue
+     echo "*** Running $f on stdin"
+     prepare_testdir "${f%.input}"
+     touch "$TESTDIR/etc/sysusers.d/test.conf"
+@@ -68,6 +76,7 @@ for f in $(find "$SOURCE"/test-*.input | sort -V); do
+ done
+ 
+ for f in $(find "$SOURCE"/test-*.input | sort -V); do
++    skip_nis "$f" && continue
+     echo "*** Running $f on stdin with --replace"
+     prepare_testdir "${f%.input}"
+     touch "$TESTDIR/etc/sysusers.d/test.conf"
+@@ -133,6 +142,7 @@ SYS_GID_MAX999
+ EOF
+ 
+ for f in $(find "$SOURCE"/test-*.input | sort -V); do
++    skip_nis "$f" && continue
+     echo "*** Running $f (with login.defs)"
+     prepare_testdir "${f%.input}"
+     cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf"
+@@ -149,6 +159,7 @@ mv "$TESTDIR/etc/login.defs" "$TESTDIR/etc/login.defs.moved"
+ ln -s ../../../../../etc/login.defs.moved "$TESTDIR/etc/login.defs"
+ 
+ for f in $(find "$SOURCE"/test-*.input | sort -V); do
++    skip_nis "$f" && continue
+     echo "*** Running $f (with login.defs symlinked)"
+     prepare_testdir "${f%.input}"
+     cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf"
+@@ -161,13 +172,22 @@ done
+ 
+ rm -f "$TESTDIR"/etc/sysusers.d/* "$TESTDIR"/usr/lib/sysusers.d/*
+ 
++preprocess_error() {
++    # Convert error message for ERANGE from glibc to musl.
++    if [[ "${SYSTEMD_LIBC:-}" == musl ]]; then
++        sed -e 's/Numerical result out of range/Result not representable/' "${1:?}"
++    else
++        cat "${1:?}"
++    fi
++}
++
+ # tests for error conditions
+ for f in $(find "$SOURCE"/unhappy-*.input | sort -V); do
+     echo "*** Running test $f"
+     prepare_testdir "${f%.input}"
+     cp "$f" "$TESTDIR/usr/lib/sysusers.d/test.conf"
+     SYSTEMD_LOG_LEVEL=info "$SYSUSERS" --root="$TESTDIR" 2>&1 | tail -n1 | sed -r 's/^[^:]+:[^:]+://' >"$TESTDIR/err"
+-    if ! diff -u "$TESTDIR/err"  "${f%.*}.expected-err" >&2; then
++    if ! diff -u "$TESTDIR/err"  <(preprocess_error "${f%.*}.expected-err") >&2; then
+         echo >&2 "**** Unexpected error output for $f"
+         cat >&2 "$TESTDIR/err"
+         exit 1
+-- 
+2.51.0
+
diff --git a/pkgs/os-specific/linux/systemd/musl/0030-musl-ci-add-build-test-and-unit-tests.patch b/pkgs/os-specific/linux/systemd/musl/0030-musl-ci-add-build-test-and-unit-tests.patch
new file mode 100644
index 000000000000..51eec7e78ac3
--- /dev/null
+++ b/pkgs/os-specific/linux/systemd/musl/0030-musl-ci-add-build-test-and-unit-tests.patch
@@ -0,0 +1,352 @@
+From b9a6cd49a4d4c6a40968224f5aac20586273b171 Mon Sep 17 00:00:00 2001
+From: Yu Watanabe <watanabe.yu+github@gmail.com>
+Date: Tue, 9 Sep 2025 13:42:24 +0900
+Subject: [PATCH 30/30] musl: ci: add build test and unit tests
+
+---
+ .github/workflows/build-test-musl.sh  | 125 ++++++++++++++++++++++++++
+ .github/workflows/linter.yml          |   9 ++
+ .github/workflows/unit-tests-musl.sh  |  55 ++++++++++++
+ .github/workflows/unit-tests-musl.yml | 112 +++++++++++++++++++++++
+ 4 files changed, 301 insertions(+)
+ create mode 100755 .github/workflows/build-test-musl.sh
+ create mode 100755 .github/workflows/unit-tests-musl.sh
+ create mode 100644 .github/workflows/unit-tests-musl.yml
+
+diff --git a/.github/workflows/build-test-musl.sh b/.github/workflows/build-test-musl.sh
+new file mode 100755
+index 0000000000..bc38924666
+--- /dev/null
++++ b/.github/workflows/build-test-musl.sh
+@@ -0,0 +1,125 @@
++#!/bin/bash
++# SPDX-License-Identifier: LGPL-2.1-or-later
++
++set -eux
++
++if ! command -v musl-gcc 2>/dev/null; then
++    echo "musl-gcc is not installed, skipping the test."
++    exit 0
++fi
++
++. /etc/os-release
++
++TMPDIR=$(mktemp -d)
++
++cleanup() (
++    set +e
++
++    if [[ -d "$TMPDIR" ]]; then
++        rm -rf "$TMPDIR"
++    fi
++)
++
++trap cleanup EXIT ERR INT TERM
++
++mkdir -p "${TMPDIR}/build"
++mkdir -p "${TMPDIR}/include"
++
++CFLAGS="-idirafter ${TMPDIR}/include"
++
++LINKS=(
++    acl
++    archive.h
++    archive_entry.h
++    asm-generic
++    audit-records.h
++    audit_logging.h
++    bpf
++    bzlib.h
++    dwarf.h
++    elfutils
++    fido.h
++    gcrypt.h
++    gelf.h
++    gnutls
++    idn2.h
++    libaudit.h
++    libcryptsetup.h
++    libelf.h
++    libkmod.h
++    lz4.h
++    lz4frame.h
++    lz4hc.h
++    lzma
++    lzma.h
++    microhttpd.h
++    mtd
++    openssl
++    pcre2.h
++    pwquality.h
++    qrencode.h
++    seccomp-syscalls.h
++    seccomp.h
++    security
++    sys/acl.h
++    sys/capability.h
++    tss2
++    xen
++    xkbcommon
++    zconf.h
++    zlib.h
++    zstd.h
++    zstd_errors.h
++)
++
++if [[ "$ID" == arch ]]; then
++    LINKS+=(
++        asm
++        curl
++        gpg-error.h
++        libiptc
++        linux
++    )
++elif [[ "$ID" == centos ]]; then
++    LINKS+=(
++        asm
++        curl
++        gpg-error.h
++        linux
++        selinux
++    )
++elif [[ "$ID" == fedora ]]; then
++    LINKS+=(
++        asm
++        curl
++        gpg-error.h
++        libiptc
++        linux
++        selinux
++    )
++elif [[ "$ID" == debian ]] || [[ "$ID" == ubuntu ]]; then
++    # Currently, debian/ubuntu does not provide crypt.h for musl. Hence, this does not work.
++
++    CFLAGS="$CFLAGS -idirafter /usr/include/$(uname -m)-linux-gnu"
++
++    LINKS+=(
++        linux
++        selinux
++        sys/apparmor.h
++    )
++fi
++
++for t in "${LINKS[@]}"; do
++    [[ -e "/usr/include/$t" ]]
++    link="${TMPDIR}/include/${t}"
++    mkdir -p "${link%/*}"
++    ln -s "/usr/include/$t" "$link"
++done
++
++env CC=musl-gcc \
++    CXX=musl-gcc \
++    CFLAGS="$CFLAGS" \
++    CXXFLAGS="$CFLAGS" \
++    meson setup --werror -Ddbus-interfaces-dir=no -Dlibc=musl "${TMPDIR}/build"
++
++ninja -v -C "${TMPDIR}/build"
+diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
+index c107b2da1e..b92a00478c 100644
+--- a/.github/workflows/linter.yml
++++ b/.github/workflows/linter.yml
+@@ -49,6 +49,12 @@ jobs:
+           [Build]
+           ToolsTreeDistribution=fedora
+           ToolsTreeRelease=rawhide
++
++          [Content]
++          Packages=
++                libgcrypt-devel
++                libgpg-error-devel
++                musl-gcc
+           EOF
+ 
+           mkosi -f box -- true
+@@ -77,3 +83,6 @@ jobs:
+ 
+       - name: Run clang-tidy
+         run: mkosi box -- meson test -C build --suite=clang-tidy --print-errorlogs --no-stdsplit
++
++      - name: Build with musl
++        run: mkosi box -- .github/workflows/build-test-musl.sh
+diff --git a/.github/workflows/unit-tests-musl.sh b/.github/workflows/unit-tests-musl.sh
+new file mode 100755
+index 0000000000..f6e2b2f536
+--- /dev/null
++++ b/.github/workflows/unit-tests-musl.sh
+@@ -0,0 +1,55 @@
++#!/usr/bin/env bash
++# SPDX-License-Identifier: LGPL-2.1-or-later
++
++# shellcheck disable=SC2206
++PHASES=(${@:-SETUP BUILD RUN CLEANUP})
++
++function info() {
++    echo -e "\033[33;1m$1\033[0m"
++}
++function run_meson() {
++    if ! meson "$@"; then
++        find . -type f -name meson-log.txt -exec cat '{}' +
++        return 1
++    fi
++}
++
++set -ex
++
++for phase in "${PHASES[@]}"; do
++    case $phase in
++        SETUP)
++            info "Setup phase"
++            # Alpine still uses split-usr.
++            for i in /bin/* /sbin/*; do
++                ln -rs "$i" "/usr/$i";
++            done
++            ;;
++        BUILD)
++            info "Build phase"
++            run_meson setup --werror -Dtests=unsafe -Dslow-tests=true -Dfuzz-tests=true -Dlibc=musl build
++            ninja -C build -v
++            ;;
++        RUN)
++            info "Run phase"
++            # Create dummy machine ID.
++            echo '052e58f661f94bd080e258b96aea3f7b' > /etc/machine-id
++
++            # Start dbus for several unit tests.
++            mkdir -p /var/run/dbus
++            /usr/bin/dbus-daemon --system || :
++
++            # Here, we explicitly set SYSTEMD_IN_CHROOT=yes as unfortunately runnin_in_chroot() does not
++            # correctly detect the environment.
++            env \
++                SYSTEMD_IN_CHROOT=yes \
++                meson test -C build -v
++            ;;
++        CLEANUP)
++            info "Cleanup phase"
++            ;;
++        *)
++            echo >&2 "Unknown phase '$phase'"
++            exit 1
++    esac
++done
+diff --git a/.github/workflows/unit-tests-musl.yml b/.github/workflows/unit-tests-musl.yml
+new file mode 100644
+index 0000000000..e30974254c
+--- /dev/null
++++ b/.github/workflows/unit-tests-musl.yml
+@@ -0,0 +1,112 @@
++---
++# vi: ts=2 sw=2 et:
++# SPDX-License-Identifier: LGPL-2.1-or-later
++#
++name: Unit tests (musl)
++on:
++  pull_request:
++    paths:
++      - '**/meson.build'
++      - '.github/workflows/**'
++      - 'meson_options.txt'
++      - 'src/**'
++      - 'test/fuzz/**'
++
++permissions:
++  contents: read
++
++jobs:
++  build:
++    runs-on: ubuntu-latest
++    steps:
++      - name: Repository checkout
++        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
++
++      - name: Install build dependencies
++        uses: jirutka/setup-alpine@v1
++        with:
++          arch: x86_64
++          branch: edge
++          packages: >
++            acl
++            acl-dev
++            audit-dev
++            bash
++            bash-completion-dev
++            bpftool
++            build-base
++            bzip2-dev
++            coreutils
++            cryptsetup-dev
++            curl-dev
++            dbus
++            dbus-dev
++            elfutils-dev
++            gettext-dev
++            git
++            glib-dev
++            gnutls-dev
++            gperf
++            grep
++            iproute2
++            iptables-dev
++            kbd
++            kexec-tools
++            kmod
++            kmod-dev
++            libapparmor-dev
++            libarchive-dev
++            libbpf-dev
++            libcap-dev
++            libcap-utils
++            libfido2-dev
++            libgcrypt-dev
++            libidn2-dev
++            libmicrohttpd-dev
++            libpwquality-dev
++            libqrencode-dev
++            libseccomp-dev
++            libselinux-dev
++            libxkbcommon-dev
++            linux-pam-dev
++            lz4-dev
++            meson
++            openssl
++            openssl-dev
++            p11-kit-dev
++            pcre2-dev
++            pkgconf
++            polkit-dev
++            py3-elftools
++            py3-jinja2
++            py3-pefile
++            py3-pytest
++            py3-lxml
++            quota-tools
++            rsync
++            sfdisk
++            tpm2-tss-dev
++            tpm2-tss-esys
++            tpm2-tss-rc
++            tpm2-tss-tcti-device
++            tzdata
++            util-linux-dev
++            util-linux-login
++            util-linux-misc
++            valgrind-dev
++            xen-dev
++            zlib-dev
++            zstd-dev
++
++      - name: Setup
++        run: .github/workflows/unit-tests-musl.sh SETUP
++        shell: alpine.sh --root {0}
++      - name: Build
++        run: .github/workflows/unit-tests-musl.sh BUILD
++        shell: alpine.sh {0}
++      - name: Run
++        run: .github/workflows/unit-tests-musl.sh RUN
++        shell: alpine.sh --root {0}
++      - name: Cleanup
++        run: .github/workflows/unit-tests-musl.sh CLEANUP
++        shell: alpine.sh --root {0}
+-- 
+2.51.0
+

From 19815be96024310837e7fcafaf43bc22264a9f0c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 00:02:33 +0000
Subject: [PATCH 0627/6226] v2raya: 2.2.7.1 -> 2.2.7.3

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

diff --git a/pkgs/by-name/v2/v2raya/package.nix b/pkgs/by-name/v2/v2raya/package.nix
index 42f4d34710d6..a56633d319eb 100644
--- a/pkgs/by-name/v2/v2raya/package.nix
+++ b/pkgs/by-name/v2/v2raya/package.nix
@@ -18,13 +18,13 @@
 }:
 let
   pname = "v2raya";
-  version = "2.2.7.1";
+  version = "2.2.7.3";
 
   src = fetchFromGitHub {
     owner = "v2rayA";
     repo = "v2rayA";
     tag = "v${version}";
-    hash = "sha256-yKXtohZVmeeIaHIjdGIGQ7aIREIjup/bOpozjw9cmEw=";
+    hash = "sha256-tgSZJGHkpQGhja5C62w6QpflYBBtt3rPCCPT+3yTzm4=";
     postFetch = "sed -i -e 's/npmmirror/yarnpkg/g' $out/gui/yarn.lock";
   };
 

From 013db3d8ada2ba9a909ebff12d98e79212ecd64d Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 12 Oct 2025 20:37:10 -0400
Subject: [PATCH 0628/6226] hyprlandPlugins.hycov: drop

Has been marked broken for at least a full release cycle.

Dropping per RFC 180.
---
 .../hyprwm/hyprland-plugins/default.nix       |  2 +-
 .../hyprwm/hyprland-plugins/hycov.nix         | 32 -------------------
 2 files changed, 1 insertion(+), 33 deletions(-)
 delete mode 100644 pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix
index 1219059e4aad..64d49a770e5e 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/default.nix
@@ -37,7 +37,6 @@ let
 
   plugins = lib.mergeAttrsList [
     { hy3 = import ./hy3.nix; }
-    { hycov = import ./hycov.nix; }
     { hypr-dynamic-cursors = import ./hypr-dynamic-cursors.nix; }
     { hyprfocus = import ./hyprfocus.nix; }
     { hyprgrass = import ./hyprgrass.nix; }
@@ -45,6 +44,7 @@ let
     { hyprsplit = import ./hyprsplit.nix; }
     (import ./hyprland-plugins.nix)
     (lib.optionalAttrs config.allowAliases {
+      hycov = throw "hyprlandPlugins.hycov has been removed because it has been marked as broken since September 2024."; # Added 2025-10-12
       hyprscroller = throw "hyprlandPlugins.hyprscroller has been removed as the upstream project is deprecated. Consider using `hyprlandPlugins.hyprscrolling`."; # Added 2025-05-09
     })
   ];
diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix
deleted file mode 100644
index 51da0e82573e..000000000000
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hycov.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  lib,
-  mkHyprlandPlugin,
-  cmake,
-  fetchFromGitHub,
-  nix-update-script,
-}:
-
-mkHyprlandPlugin (finalAttrs: {
-  pluginName = "hycov";
-  version = "0.41.2.1";
-
-  src = fetchFromGitHub {
-    owner = "DreamMaoMao";
-    repo = "hycov";
-    tag = finalAttrs.version;
-    hash = "sha256-NRnxbkuiq1rQ+uauo7D+CEe73iGqxsWxTQa+1SEPnXQ=";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Clients overview for Hyprland plugin";
-    homepage = "https://github.com/DreamMaoMao/hycov";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ donovanglover ];
-    platforms = lib.platforms.linux;
-    broken = true; # Doesn't work after Hyprland v0.41.2 https://gitee.com/DreamMaoMao/hycov/issues/IANYC8#note_31512295_link
-  };
-})

From b47d31568d21cd5c9cfa9623aa861aad6a29120b Mon Sep 17 00:00:00 2001
From: Mio <mio@mio19.uk>
Date: Mon, 13 Oct 2025 11:41:59 +1100
Subject: [PATCH 0629/6226] nixos/netbird: correct document

---
 nixos/modules/services/networking/netbird.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/modules/services/networking/netbird.nix b/nixos/modules/services/networking/netbird.nix
index 7b9b7183394c..a39e81a5a5ec 100644
--- a/nixos/modules/services/networking/netbird.nix
+++ b/nixos/modules/services/networking/netbird.nix
@@ -92,7 +92,6 @@ in
         services.netbird.clients.default = {
           port = 51820;
           name = "netbird";
-          systemd.name = "netbird";
           interface = "wt0";
           hardened = false;
         };

From 8b988b43647eaed0a29aaa855b0bebf217c20592 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 01:56:37 +0000
Subject: [PATCH 0630/6226] termius: 9.28.0 -> 9.32.2

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

diff --git a/pkgs/by-name/te/termius/package.nix b/pkgs/by-name/te/termius/package.nix
index 8ed3f8939cab..a53e2d224ef2 100644
--- a/pkgs/by-name/te/termius/package.nix
+++ b/pkgs/by-name/te/termius/package.nix
@@ -17,8 +17,8 @@
 
 stdenv.mkDerivation rec {
   pname = "termius";
-  version = "9.28.0";
-  revision = "234";
+  version = "9.32.2";
+  revision = "240";
 
   src = fetchurl {
     # find the latest version with
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     # and the sha512 with
     # curl -H 'X-Ubuntu-Series: 16' https://api.snapcraft.io/api/v1/snaps/details/termius-app | jq '.download_sha512' -r
     url = "https://api.snapcraft.io/api/v1/snaps/download/WkTBXwoX81rBe3s3OTt3EiiLKBx2QhuS_${revision}.snap";
-    hash = "sha512-2zGt4nL8E99s4J9vmzKoOGgEI3XnEx3m7JwFkWuT5wYv/JWoJWnh9dNWlHzRHPpLU8/lAZUG2F4AVYCmPGa96A==";
+    hash = "sha512-TPfQ413zbnuKAhflLZPvLeVdrqdUEi+I/inWAs8SJ1j8rYW1TrHDyMB8S/HpWboRWXmUhPHulNXfGpHKUu453Q==";
   };
 
   desktopItem = makeDesktopItem {

From ed849688fae70894368cab216c612c301b85549d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 02:09:22 +0000
Subject: [PATCH 0631/6226] rofi-calc: 2.4.1 -> 2.5.0

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

diff --git a/pkgs/by-name/ro/rofi-calc/package.nix b/pkgs/by-name/ro/rofi-calc/package.nix
index f6369c1c77b0..be8e7838038c 100644
--- a/pkgs/by-name/ro/rofi-calc/package.nix
+++ b/pkgs/by-name/ro/rofi-calc/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rofi-calc";
-  version = "2.4.1";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "svenstaro";
     repo = "rofi-calc";
     rev = "v${version}";
-    sha256 = "sha256-E0C5hlrZGRGHT/yb4J2qFquf3AuB0T1zqbFPZdT1UxE=";
+    sha256 = "sha256-/UKOyJfCsV/+kZDndHZmrPdE2MjVlQWSiWQRIUPGz/I=";
   };
 
   nativeBuildInputs = [

From 11e5da73d4f07837b4b8756816ae07f88049d0fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 02:55:34 +0000
Subject: [PATCH 0632/6226] plasma-panel-spacer-extended: 1.11.1 -> 1.11.2

---
 pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix
index 5c92df60d720..47b177d49265 100644
--- a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix
+++ b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "plasma-panel-spacer-extended";
-  version = "1.11.1";
+  version = "1.11.2";
 
   src = fetchFromGitHub {
     owner = "luisbocanegra";
     repo = "plasma-panel-spacer-extended";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TQx9J10qfjCaolq/mpSjhV13uYxK/wBGIXH1sQFaLRA=";
+    hash = "sha256-sSor6ZjYgjVzrC0leqpj+GZuj8ybpPb4lcBPhcXG+Nc=";
   };
 
   nativeBuildInputs = [

From 31464936bc24f86e928fdba7ff2c263840419e75 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 13 Oct 2025 11:56:28 +0800
Subject: [PATCH 0633/6226] keyguard: 1.15.0 -> 1.15.1

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

diff --git a/pkgs/by-name/ke/keyguard/package.nix b/pkgs/by-name/ke/keyguard/package.nix
index 23451e2f7db3..812db254a1b9 100644
--- a/pkgs/by-name/ke/keyguard/package.nix
+++ b/pkgs/by-name/ke/keyguard/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "keyguard";
-  version = "1.15.0";
+  version = "1.15.1";
 
   src = fetchFromGitHub {
     owner = "AChep";
     repo = "keyguard-app";
-    tag = "r20250915";
-    hash = "sha256-WAD8cZkaZbv3tyzKYEBH25g7x7xmdIWAnvMxnNKYpME=";
+    tag = "r20251012";
+    hash = "sha256-f3dKdoyosE7Ech1eB03XK/PPILAeLzF0XXo2oHa0oRI=";
   };
 
   postPatch = ''

From 0c2accfe08d38630835e9632b59d5b9c9905b4f0 Mon Sep 17 00:00:00 2001
From: qzylinra <225773816+qzylinra@users.noreply.github.com>
Date: Mon, 13 Oct 2025 14:42:18 +0800
Subject: [PATCH 0634/6226] keyguard: fix arm64

---
 pkgs/by-name/ke/keyguard/deps.json | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/ke/keyguard/deps.json b/pkgs/by-name/ke/keyguard/deps.json
index 7640def133e9..f415b42ae892 100644
--- a/pkgs/by-name/ke/keyguard/deps.json
+++ b/pkgs/by-name/ke/keyguard/deps.json
@@ -2984,6 +2984,9 @@
   "org/jetbrains/compose/desktop#desktop-jvm-linux-x64/1.10.0-alpha01": {
    "pom": "sha256-z/keLG8RTFwJQ18qs4xUqSRxNNn5W66oJs/bw//iIeM="
   },
+  "org/jetbrains/compose/desktop#desktop-jvm-linux-arm64/1.10.0-alpha01": {
+   "pom": "sha256-LYKUvZ6EGJuIId5UNmy+JMQen0t2sXwl6I+daQJ6uUE="
+  },
   "org/jetbrains/compose/desktop#desktop-jvm-macos-arm64/1.8.2": {
    "pom": "sha256-S290UtIXCU0UQhfHocanMKEPZ2oLfu/nhdcmMuotNMQ="
   },
@@ -3709,6 +3712,10 @@
    "jar": "sha256-ZkuW2kLSLxpjppvDLkPG0eX+nGL5VES7Xx9TWlwRqAI=",
    "pom": "sha256-k4MjXDsckFvkgEtVEzOCITOQh1nZT+XVzGsBX45c6Po="
   },
+  "org/jetbrains/skiko#skiko-awt-runtime-linux-arm64/0.9.24": {
+   "jar": "sha256-hlWrRjir6GTuM0NqJWWN5b1mA4VlHHmB6vlxohDEVLg=",
+   "pom": "sha256-ab52bpJggnFqrd+F4hKWCcbM3DQEV38//yvdc6TCjoQ="
+  },
   "org/jetbrains/skiko#skiko-awt-runtime-macos-arm64/0.9.4.2": {
    "jar": "sha256-bi6GlwC5lL5fRjFIDmdTNXmXETE0iyrlUjbddNJyIWE=",
    "pom": "sha256-k6Jnui8eKqWK/PvEZXpogmQnbXPYBOI1pzhcO1lEVMk="

From f0166da268940ec4a78504a83a15b61871eb1552 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 13 Oct 2025 08:59:35 +0200
Subject: [PATCH 0635/6226] ruby: avoid rebuilding default ruby on linux for
 now

---
 pkgs/development/interpreters/ruby/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/ruby/default.nix b/pkgs/development/interpreters/ruby/default.nix
index 4b1ccdd4fdfa..348708f573a0 100644
--- a/pkgs/development/interpreters/ruby/default.nix
+++ b/pkgs/development/interpreters/ruby/default.nix
@@ -192,7 +192,8 @@ let
               # anything and fixes cross compilation.
               ./dont-refer-to-build-dir.patch
             ]
-            ++ ops (lib.versionOlder ver.majMin "3.4") [
+            # TODO: drop the isClang condition
+            ++ ops (lib.versionOlder ver.majMin "3.4" && stdenv.cc.isClang) [
               (fetchpatch {
                 name = "ruby-3.3-fix-llvm-21.patch";
                 url = "https://github.com/ruby/ruby/commit/5a8d7642168f4ea0d9331fded3033c225bbc36c5.patch";

From 67376f68ba418ca384c68920254a4f5654a465f6 Mon Sep 17 00:00:00 2001
From: t4ccer <t4ccer@gmail.com>
Date: Mon, 13 Oct 2025 04:59:55 -0230
Subject: [PATCH 0636/6226] logseq: 0.10.12 -> 0.10.14

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

diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix
index fb7785ede426..57be3cd1eb3e 100644
--- a/pkgs/by-name/lo/logseq/package.nix
+++ b/pkgs/by-name/lo/logseq/package.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "logseq";
-  version = "0.10.12";
+  version = "0.10.14";
 
   src = fetchFromGitHub {
     owner = "logseq";
     repo = "logseq";
     tag = finalAttrs.version;
-    hash = "sha256-SUzt4hYHE6XJOEMxFp2a0om2oVUk1MHQUteGFiM9Lkc=";
+    hash = "sha256-jIkAiSCYIO5w/jM/Bv/odTuluRi3W/w4tTaUTmaYvEA=";
   };
 
   patches = [
@@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
   yarnOfflineCacheRoot = fetchYarnDeps {
     name = "logseq-${finalAttrs.version}-yarn-deps-root";
     inherit (finalAttrs) src;
-    hash = "sha256-sbC6WQLjEHIKTuejSQXplQOWZwUmBJdGXuAkilQGjYs=";
+    hash = "sha256-eSMtHA4Ob7EVb5qEzAj+WjGyyFjA0ZEvTsaoMx0bgjc=";
   };
 
   # ./static and ./resources are combined into ./static by the build process

From f994581e1007dc1549260112a757463bde437fb7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 07:37:56 +0000
Subject: [PATCH 0637/6226] gearlever: 3.4.2 -> 3.4.5

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

diff --git a/pkgs/by-name/ge/gearlever/package.nix b/pkgs/by-name/ge/gearlever/package.nix
index 4ca18b384bf7..48c3a2765706 100644
--- a/pkgs/by-name/ge/gearlever/package.nix
+++ b/pkgs/by-name/ge/gearlever/package.nix
@@ -23,14 +23,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gearlever";
-  version = "3.4.2";
+  version = "3.4.5";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "mijorus";
     repo = "gearlever";
     tag = version;
-    hash = "sha256-IC3ueAplQc5McGoJkHjjCAGvnLCH9+DUrB3cuKfwMno=";
+    hash = "sha256-C/YNnpLlA+5xzgLRLWEWAhDGLZP42N/uCbCPg3owgBk=";
   };
 
   postPatch =

From a094cc5b8a2e9579ed51d2ea5e8c09f972979c2c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 08:26:29 +0000
Subject: [PATCH 0638/6226] dwarf-fortress-packages.dwarf-fortress-original:
 52.04 -> 52.05

---
 pkgs/games/dwarf-fortress/df.lock.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/games/dwarf-fortress/df.lock.json b/pkgs/games/dwarf-fortress/df.lock.json
index 4e4c5f3e8bc8..f27b80fea6c5 100644
--- a/pkgs/games/dwarf-fortress/df.lock.json
+++ b/pkgs/games/dwarf-fortress/df.lock.json
@@ -1,28 +1,28 @@
 {
   "game": {
     "latest": {
-      "linux": "52.04",
+      "linux": "52.05",
       "darwin": "0.47.05"
     },
     "versions": {
-      "52.04": {
+      "52.05": {
         "df": {
-          "version": "52.04",
+          "version": "52.05",
           "urls": {
             "linux": {
-              "url": "https://www.bay12games.com/dwarves/df_52_04_linux.tar.bz2",
-              "outputHash": "sha256-x/v4yWuojnbea0N7KUAINBdhPBjl0DoWy8Pi/eDCpec="
+              "url": "https://www.bay12games.com/dwarves/df_52_05_linux.tar.bz2",
+              "outputHash": "sha256-LPbkt9s/Lx/0tvN5bac6d0r7+nr4P+u3xmDNo+EXHkw="
             }
           }
         },
         "hack": {
-          "version": "52.04-r1",
+          "version": "52.05-r2",
           "git": {
             "url": "https://github.com/DFHack/dfhack.git",
-            "revision": "52.04-r1",
-            "outputHash": "sha256-DPW+fvurUYnwfGrEqV3JEN1TfllOJPHqGIlNJ3Wha90="
+            "revision": "52.05-r2",
+            "outputHash": "sha256-wv/4sRAIkb90uStGJ6eMdd/cAMVX5Uqtoe0BR+CDy7s="
           },
-          "xmlRev": "7b691d256f9427036e7ff24fa795a0f9334739e7"
+          "xmlRev": "df0ec27701a2aeaa1ccfb81323f4be55b78e1c10"
         }
       },
       "51.13": {
@@ -116,12 +116,12 @@
     }
   },
   "therapist": {
-    "version": "42.1.18",
-    "maxDfVersion": "52.03",
+    "version": "42.1.20",
+    "maxDfVersion": "52.05",
     "git": {
       "url": "https://github.com/Dwarf-Therapist/Dwarf-Therapist.git",
-      "revision": "v42.1.18",
-      "outputHash": "sha256-RdBUpVkjvsNjTowHpQ2FQUCtJiwfqls4dnoUIwKoXGg="
+      "revision": "v42.1.20",
+      "outputHash": "sha256-nKMQSDrxhqRRaCDUK7GbexFHdxeD/P9c2UDkiMdWsyU="
     }
   }
 }

From ab71c0d2835b88bb53b99dd99ee27be049a594cc Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Mon, 13 Oct 2025 13:01:45 +0100
Subject: [PATCH 0639/6226] protoc-gen-connect-go: 1.19.0 -> 1.19.1

Diff: https://github.com/connectrpc/connect-go/compare/v1.19.0...v1.19.1

Changelog: https://github.com/connectrpc/connect-go/releases/tag/v1.19.1
---
 pkgs/by-name/pr/protoc-gen-connect-go/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
index 168ac172cfc1..7b9fb38b4713 100644
--- a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "protoc-gen-connect-go";
-  version = "1.19.0";
+  version = "1.19.1";
 
   src = fetchFromGitHub {
     owner = "connectrpc";
     repo = "connect-go";
     tag = "v${version}";
-    hash = "sha256-pxG2f54m01tC9YhpN9zQ8M5KiP4gyt019klqnBPHHrw=";
+    hash = "sha256-VW7FHZk7FAux2Jn03gGm9gdkjCzvofC/ukXOWaplWBo=";
   };
 
   vendorHash = "sha256-oAcAE9t4mz0HrkqO8lh5Ex2nakKj5FKy2lKTP8X/9Gg=";

From c58a7d1789bf830329518787a89b28d7d7684010 Mon Sep 17 00:00:00 2001
From: ZeStig <69384921+zstg@users.noreply.github.com>
Date: Mon, 13 Oct 2025 19:12:57 +0530
Subject: [PATCH 0640/6226] Add self to maintainer list

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 913ad6e09d50..13fe420f2c3b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -29071,6 +29071,12 @@
     githubId = 332534;
     name = "Zach Shipko";
   };
+  zstg = {
+    email = "zestig@duck.com";
+    github = "zstg";
+    githubId = 69384921;
+    name = "ZeStig";
+  };
   ztzg = {
     email = "dd@crosstwine.com";
     github = "ztzg";

From 64ec7db460c49dce061ce2cefe98807b97f83ff0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 14:12:33 +0000
Subject: [PATCH 0641/6226] python3Packages.tree-sitter-yaml: 0.7.1 -> 0.7.2

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

diff --git a/pkgs/development/python-modules/tree-sitter-yaml/default.nix b/pkgs/development/python-modules/tree-sitter-yaml/default.nix
index 261118b68894..cc48a319bb92 100644
--- a/pkgs/development/python-modules/tree-sitter-yaml/default.nix
+++ b/pkgs/development/python-modules/tree-sitter-yaml/default.nix
@@ -12,19 +12,19 @@
 
 buildPythonPackage rec {
   pname = "tree-sitter-yaml";
-  version = "0.7.1";
+  version = "0.7.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tree-sitter-grammars";
     repo = "tree-sitter-yaml";
     tag = "v${version}";
-    hash = "sha256-Z2L/aQWIyZ8cSqbfjm/i10fJP++yZ2tZgho0U3asA0g=";
+    hash = "sha256-BX6TOfAZLW+0h2TNsgsLC9K2lfirraCWlBN2vCKiXQ4=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
-    hash = "sha256-QvqvyjnCgSuSiiY4SB5nB9S7LnGP1F+tySxue359SWY=";
+    hash = "sha256-mrLuGmauboKHHk0zADPXpwgZfc83syXk0jmD93Y9Jq4=";
   };
 
   build-system = [

From 16c98ed19d1d6e4c266bbb69a8c9419661291fb5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 14:22:23 +0000
Subject: [PATCH 0642/6226] vscode-extensions.ms-dotnettools.csdevkit: 1.50.51
 -> 1.70.3

---
 .../extensions/ms-dotnettools.csdevkit/default.nix     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
index 0b8b3e68b430..787ae0f892e9 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix
@@ -16,19 +16,19 @@ let
     {
       x86_64-linux = {
         arch = "linux-x64";
-        hash = "sha256-4yljDypIsx2bFKgCe0nL7Ljnzq6+efMRMBlpl1T6mU0=";
+        hash = "sha256-ZAw/n+JmsH/F8VwQzLfB3oPuofeiL6dtHXLiVMxxvCc=";
       };
       aarch64-linux = {
         arch = "linux-arm64";
-        hash = "sha256-heiercuubJUhzOiRNPRvcBQfvbOtM6albpWvOkHlgsI=";
+        hash = "sha256-qxytVpmDpHEc1bjEpKPrnINKbh/qNiG5vD3KdQ7vwGs=";
       };
       x86_64-darwin = {
         arch = "darwin-x64";
-        hash = "sha256-U3VA9GjyP00bhZid3mdODLfmFW5WmtXmikPByDjELXA=";
+        hash = "sha256-/FK16O23iZgEc9bnvyquf0TcbCuraG9jVverlcWZymU=";
       };
       aarch64-darwin = {
         arch = "darwin-arm64";
-        hash = "sha256-uCOQnQ8x5OGPl/139jAZ12PdbWczS2KOQHLFxjEQnL4=";
+        hash = "sha256-1BQ0YXQNd8yjGxA6NLxsfZZemwYNqRzyGQCZln9ChJA=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
@@ -38,7 +38,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "csdevkit";
     publisher = "ms-dotnettools";
-    version = "1.50.51";
+    version = "1.70.3";
     inherit (extInfo) hash arch;
   };
   sourceRoot = "extension"; # This has more than one folder.

From 49a85593d6bdd75b30fa02a415e6dfad7b739b7b Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Mon, 13 Oct 2025 15:49:04 +0100
Subject: [PATCH 0643/6226] protoc-gen-connect-go: skip test to fix build

---
 pkgs/by-name/pr/protoc-gen-connect-go/package.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
index 7b9fb38b4713..6e9f03184e86 100644
--- a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
@@ -26,6 +26,18 @@ buildGoModule rec {
     unset subPackages
   '';
 
+  checkFlags =
+    let
+      skippedTests = [
+        # other tests work, could be related to sandboxing or timings
+        # got:  unavailable
+        # want: deadline_exceeded
+        # client_ext_test.go:789: actual receive error from /connect.ping.v1.PingService/Sum: unavailable: io: read/write on closed pipe
+        "TestClientDeadlineHandling/read-write"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
   meta = {
     description = "Simple, reliable, interoperable, better gRPC";
     mainProgram = "protoc-gen-connect-go";

From 8410064ee9cc8a821a4b6a8627a6b31e3bd46e6a Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Mon, 13 Oct 2025 18:46:59 +0200
Subject: [PATCH 0644/6226] qadwaitadecorations: fix build with Qt 6.10

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/qa/qadwaitadecorations/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/qa/qadwaitadecorations/package.nix b/pkgs/by-name/qa/qadwaitadecorations/package.nix
index 7a1f1abb2037..0517d0a13cbd 100644
--- a/pkgs/by-name/qa/qadwaitadecorations/package.nix
+++ b/pkgs/by-name/qa/qadwaitadecorations/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   cmake,
   qt5,
   qt6,
@@ -30,6 +31,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Zg2G3vuRD/kK5C2fFq6Cft218uFyBvfXtO1DHKQECFQ=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      # https://github.com/FedoraQt/QAdwaitaDecorations/pull/88
+      name = "Fix build with Qt 6.10";
+      url = "https://github.com/FedoraQt/QAdwaitaDecorations/commit/e6da80a440218b87e441c8a698014ef3962af98b.patch?full_index=1";
+      hash = "sha256-7ZmceoOzUDHvvCX+8SwuX+DIi65d6hYIYfpikMiN0wM=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
   ];

From ca122e0bb57ba90ac241a1633930b80d66a8eebc Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 12 Oct 2025 04:09:38 +0800
Subject: [PATCH 0645/6226] coin3d: 4.0.5 -> 4.0.6

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

diff --git a/pkgs/by-name/co/coin3d/package.nix b/pkgs/by-name/co/coin3d/package.nix
index 3e3d42799c5c..aa362b81e5e9 100644
--- a/pkgs/by-name/co/coin3d/package.nix
+++ b/pkgs/by-name/co/coin3d/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "coin";
-  version = "4.0.5";
+  version = "4.0.6";
 
   src = fetchFromGitHub {
     owner = "coin3d";
     repo = "coin";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2lfy33Qx0AjKDfwwRn7hjaz7mPQsr7MRB9v75qshGjM=";
+    hash = "sha256-XBkb8CbfAXBwOO9JkExpsy8HxtbZo3/fnU6cReuSETI=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -29,8 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux libX11;
 
-  cmakeFlags = [ "-DCOIN_USE_CPACK=OFF" ];
-
   meta = with lib; {
     homepage = "https://github.com/coin3d/coin";
     description = "High-level, retained-mode toolkit for effective 3D graphics development";

From aee49ac9acc63c424534e21e2f806c46651dac7a Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 12 Oct 2025 01:24:38 +0800
Subject: [PATCH 0646/6226] freecad: remove redundant cmakeFlags

---
 pkgs/by-name/fr/freecad/package.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index 23323780e849..da621c72a08c 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -133,15 +133,6 @@ freecad-utils.makeCustomizable (
       "-DFREECAD_USE_PYBIND11=ON"
       "-DBUILD_QT5=OFF"
       "-DBUILD_QT6=ON"
-      "-DSHIBOKEN_INCLUDE_DIR=${python3Packages.shiboken6}/include"
-      "-DSHIBOKEN_LIBRARY=Shiboken6::libshiboken"
-      (
-        "-DPYSIDE_INCLUDE_DIR=${python3Packages.pyside6}/include"
-        + ";${python3Packages.pyside6}/include/PySide6/QtCore"
-        + ";${python3Packages.pyside6}/include/PySide6/QtWidgets"
-        + ";${python3Packages.pyside6}/include/PySide6/QtGui"
-      )
-      "-DPYSIDE_LIBRARY=PySide6::pyside6"
     ];
 
     # This should work on both x86_64, and i686 linux

From a30c74876a101a6e71ba4b80eddf042c8bedb466 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 12 Oct 2025 01:26:26 +0800
Subject: [PATCH 0647/6226] freecad: inherit python from python3Pacakges in
 makeCustomizable

---
 pkgs/by-name/fr/freecad/freecad-utils.nix | 4 ++--
 pkgs/by-name/fr/freecad/package.nix       | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fr/freecad/freecad-utils.nix b/pkgs/by-name/fr/freecad/freecad-utils.nix
index 8d440540d7bf..61705c11ec8e 100644
--- a/pkgs/by-name/fr/freecad/freecad-utils.nix
+++ b/pkgs/by-name/fr/freecad/freecad-utils.nix
@@ -3,7 +3,7 @@
   buildEnv,
   makeWrapper,
   lib,
-  python311,
+  python,
   writeShellScript,
 }:
 let
@@ -36,7 +36,7 @@ let
     if builtins.isString pyt then
       pyt
     else if builtins.isFunction pyt then
-      "${(python311.withPackages pyt)}/lib/python3.11/site-packages"
+      "${(python.withPackages pyt)}/${python.sitePackages}"
     else
       throw "Expected string or function as python paths for freecad"
   );
diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index da621c72a08c..233a3d6d8b87 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -52,7 +52,7 @@ let
     shiboken6
   ];
 
-  freecad-utils = callPackage ./freecad-utils.nix { };
+  freecad-utils = callPackage ./freecad-utils.nix { inherit (python3Packages) python; };
 in
 freecad-utils.makeCustomizable (
   stdenv.mkDerivation (finalAttrs: {

From 0067a449865dcd42f697ddb939c7f737bfff9779 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 13 Oct 2025 11:01:39 -0700
Subject: [PATCH 0648/6226] python3Packages.langchain-tests: unpin syrupy

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

diff --git a/pkgs/development/python-modules/langchain-tests/default.nix b/pkgs/development/python-modules/langchain-tests/default.nix
index c9c3659a7ae3..e27b6900b30f 100644
--- a/pkgs/development/python-modules/langchain-tests/default.nix
+++ b/pkgs/development/python-modules/langchain-tests/default.nix
@@ -49,6 +49,7 @@ buildPythonPackage rec {
     # That prevents us from updating individual components.
     "langchain-core"
     "numpy"
+    "syrupy"
   ];
 
   dependencies = [

From e739c5d78db4ad1be56706cbaa3965aa0857aa24 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Wed, 4 Jun 2025 09:52:04 +0200
Subject: [PATCH 0649/6226] nixos/nextcloud: Allow disabling initial admin user
 creation on Nextcloud >= 32

With https://github.com/nextcloud/server/pull/53212 it is not longer necessary to specify a username and password for an initial admin account during installation.
---
 nixos/modules/services/web-apps/nextcloud.nix | 60 +++++++++++++------
 nixos/tests/nextcloud/default.nix             | 21 ++++---
 nixos/tests/nextcloud/without-admin-user.nix  | 48 +++++++++++++++
 3 files changed, 103 insertions(+), 26 deletions(-)
 create mode 100644 nixos/tests/nextcloud/without-admin-user.nix

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index da5e02e27479..995d9a2a8f56 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -644,7 +644,7 @@ in
         '';
       };
       adminuser = lib.mkOption {
-        type = lib.types.str;
+        type = lib.types.nullOr lib.types.str;
         default = "root";
         description = ''
           Username for the admin account. The username is only set during the
@@ -653,7 +653,7 @@ in
         '';
       };
       adminpassFile = lib.mkOption {
-        type = lib.types.str;
+        type = lib.types.nullOr lib.types.str;
         description = ''
           The full path to a file that contains the admin's password. The password is
           set only in the initial setup of Nextcloud by the systemd service `nextcloud-setup.service`.
@@ -1125,6 +1125,26 @@ in
               https://docs.nextcloud.com/server/latest/admin_manual/configuration_database/db_conversion.html
             '';
           }
+          {
+            assertion =
+              lib.versionAtLeast overridePackage.version "32.0.0"
+              || (cfg.config.adminuser != null && cfg.config.adminpassFile != null);
+            message = ''
+              Disabling initial admin user creation is only available on Nextcloud >= 32.0.0.
+            '';
+          }
+          {
+            assertion = cfg.config.adminuser == null -> cfg.config.adminpassFile == null;
+            message = ''
+              If `services.nextcloud.config.adminuser` is null, `services.nextcloud.config.adminpassFile` must be null as well in order to disable initial admin user creation.
+            '';
+          }
+          {
+            assertion = cfg.config.adminpassFile == null -> cfg.config.adminuser == null;
+            message = ''
+              If `services.nextcloud.config.adminpassFile` is null, `services.nextcloud.config.adminuser` must be null as well in order to disable initial admin user creation.
+            '';
+          }
         ];
       }
 
@@ -1168,10 +1188,14 @@ in
                     arg = "DBPASS";
                     value = if c.dbpassFile != null then ''"$(<"$CREDENTIALS_DIRECTORY/dbpass")"'' else ''""'';
                   };
-                  adminpass = {
-                    arg = "ADMINPASS";
-                    value = ''"$(<"$CREDENTIALS_DIRECTORY/adminpass")"'';
-                  };
+                  adminpass =
+                    if c.adminpassFile != null then
+                      {
+                        arg = "ADMINPASS";
+                        value = ''"$(<"$CREDENTIALS_DIRECTORY/adminpass")"'';
+                      }
+                    else
+                      null;
                   installFlags = lib.concatStringsSep " \\\n    " (
                     lib.mapAttrsToList (k: v: "${k} ${toString v}") {
                       "--database" = ''"${c.dbtype}"'';
@@ -1182,15 +1206,16 @@ in
                       ${if c.dbhost != null then "--database-host" else null} = ''"${c.dbhost}"'';
                       ${if c.dbuser != null then "--database-user" else null} = ''"${c.dbuser}"'';
                       "--database-pass" = "\"\$${dbpass.arg}\"";
-                      "--admin-user" = ''"${c.adminuser}"'';
-                      "--admin-pass" = "\"\$${adminpass.arg}\"";
+                      ${if c.adminuser != null then "--admin-user" else null} = ''"${c.adminuser}"'';
+                      ${if adminpass != null then "--admin-pass" else null} = "\"\$${adminpass.arg}\"";
+                      ${if c.adminuser == null && adminpass == null then "--disable-admin-user" else null} = "";
                       "--data-dir" = ''"${datadir}/data"'';
                     }
                   );
                 in
                 ''
                   ${mkExport dbpass}
-                  ${mkExport adminpass}
+                  ${lib.optionalString (adminpass != null) (mkExport adminpass)}
                   ${lib.getExe occ} maintenance:install \
                       ${installFlags}
                 '';
@@ -1217,10 +1242,12 @@ in
                     exit 1
                   fi
                 ''}
-                if [ -z "$(<"$CREDENTIALS_DIRECTORY/adminpass")" ]; then
-                  echo "adminpassFile ${c.adminpassFile} is empty!"
-                  exit 1
-                fi
+                ${lib.optionalString (c.adminpassFile != null) ''
+                  if [ -z "$(<"$CREDENTIALS_DIRECTORY/adminpass")" ]; then
+                    echo "adminpassFile ${c.adminpassFile} is empty!"
+                    exit 1
+                  fi
+                ''}
 
                 # Check if systemd-tmpfiles setup worked correctly
                 if [[ ! -O "${datadir}/config" ]]; then
@@ -1262,10 +1289,9 @@ in
               '';
               serviceConfig.Type = "oneshot";
               serviceConfig.User = "nextcloud";
-              serviceConfig.LoadCredential = [
-                "adminpass:${cfg.config.adminpassFile}"
-              ]
-              ++ runtimeSystemdCredentials;
+              serviceConfig.LoadCredential =
+                lib.optional (cfg.config.adminpassFile != null) "adminpass:${cfg.config.adminpassFile}"
+                ++ runtimeSystemdCredentials;
               # On Nextcloud ≥ 26, it is not necessary to patch the database files to prevent
               # an automatic creation of the database user.
               environment.NC_setup_create_db_user = "false";
diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix
index b69a520bf544..f452a4bf1218 100644
--- a/nixos/tests/nextcloud/default.nix
+++ b/nixos/tests/nextcloud/default.nix
@@ -30,8 +30,8 @@ let
         }
       ];
 
-      adminuser = "root";
-      adminpass = "hunter2";
+      adminuser = pkgs.lib.mkDefault "root";
+      adminpass = pkgs.lib.mkDefault "hunter2";
 
       test-helpers.rclone = "${pkgs.writeShellScript "rclone" ''
         set -euo pipefail
@@ -129,13 +129,16 @@ let
           }
         );
     in
-    map callNextcloudTest [
-      ./basic.nix
-      ./with-declarative-redis-and-secrets.nix
-      ./with-mysql-and-memcached.nix
-      ./with-postgresql-and-redis.nix
-      ./with-objectstore.nix
-    ];
+    map callNextcloudTest (
+      [
+        ./basic.nix
+        ./with-declarative-redis-and-secrets.nix
+        ./with-mysql-and-memcached.nix
+        ./with-postgresql-and-redis.nix
+        ./with-objectstore.nix
+      ]
+      ++ (pkgs.lib.optional (version >= 32) ./without-admin-user.nix)
+    );
 in
 listToAttrs (
   concatMap genTests [
diff --git a/nixos/tests/nextcloud/without-admin-user.nix b/nixos/tests/nextcloud/without-admin-user.nix
new file mode 100644
index 000000000000..260d3dfc6fea
--- /dev/null
+++ b/nixos/tests/nextcloud/without-admin-user.nix
@@ -0,0 +1,48 @@
+{
+  name,
+  pkgs,
+  testBase,
+  system,
+  ...
+}:
+
+with import ../../lib/testing-python.nix { inherit system pkgs; };
+runTest (
+  {
+    config,
+    lib,
+    ...
+  }:
+  rec {
+    inherit name;
+
+    meta.maintainers = lib.teams.nextcloud.members;
+
+    imports = [ testBase ];
+
+    nodes = {
+      nextcloud =
+        { config, pkgs, ... }:
+        {
+          services.nextcloud = {
+            config = {
+              dbtype = "sqlite";
+              adminuser = null;
+              adminpassFile = lib.mkForce null;
+            };
+          };
+        };
+    };
+
+    adminuser = "root";
+    # This needs to be a "secure" password, since the password_policy app is enabled after installation and will forbid "simple" passwords.
+    adminpass = "+CVpTwaOEktxsFc6";
+
+    # Manually create the adminuser to make the default set of tests pass.
+    # If adminuser was already created during the installation this command would not succeed.
+    # This user name must always match the default value in services.nextcloud.config.adminuser!
+    test-helpers.init = ''
+      nextcloud.succeed("OC_PASS=${adminpass} nextcloud-occ user:add ${adminuser} --password-from-env")
+    '';
+  }
+)

From 5da7186e17fa182382f0935ffff00e995bd0ad6c Mon Sep 17 00:00:00 2001
From: John Garcia <jgarcia3788@yahoo.co.uk>
Date: Mon, 13 Oct 2025 20:10:46 +0100
Subject: [PATCH 0650/6226] await: 2.1.0 -> 2.3.0

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

diff --git a/pkgs/by-name/aw/await/package.nix b/pkgs/by-name/aw/await/package.nix
index f1e60d1a16c2..836d04605c63 100644
--- a/pkgs/by-name/aw/await/package.nix
+++ b/pkgs/by-name/aw/await/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "await";
-  version = "2.1.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "slavaGanzin";
     repo = "await";
     tag = version;
-    hash = "sha256-p0rB1fPfBL1Vj4p7IZtmLhfB5LwwyRaiCVSeDZAXJAo=";
+    hash = "sha256-UfEjcf8NuLRzu/57aS738Do/lXzYX5lrus1xgZ7dask=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 57835c7cd4e71600435bab566e1500220fb2a72b Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Mon, 13 Oct 2025 13:12:42 +0200
Subject: [PATCH 0651/6226] linuxPackages.broadcom_sta: 6.30.223.271-57 ->
 6.30.223.271-59

---
 pkgs/os-specific/linux/broadcom-sta/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix
index b2ca5dca7cf9..54b0c8de54a9 100644
--- a/pkgs/os-specific/linux/broadcom-sta/default.nix
+++ b/pkgs/os-specific/linux/broadcom-sta/default.nix
@@ -11,7 +11,7 @@ let
   # Patchset release number from rpmfusion, to more easily differentiate
   # versions and updates. See `wl-kmod.spec` file:
   # https://github.com/rpmfusion/wl-kmod/blob/master/wl-kmod.spec#L19
-  release = "57";
+  release = "59";
   hashes = {
     i686-linux = "sha256-T4twspOsjMXHDlca1dGHjQ8p0TOkb+eGmGjZwZtQWM0=";
     x86_64-linux = "sha256-X3l3TVvuyPdja1nA+wegMQju8eP9MkVjiyCFjHFBRL4=";
@@ -24,8 +24,8 @@ let
   rpmFusionPatches = fetchFromGitHub {
     owner = "rpmfusion";
     repo = "wl-kmod";
-    rev = "b0d19578ebd0daae9c5b7f9e9511a6d73ac4d957";
-    hash = "sha256-v7mZ2S/eVfGTEXrxpdiemHhrC+P3/sPOZqTBhRtins4=";
+    rev = "7786b3a3e54962124d24b4b61a6472bb0c4bbd94";
+    hash = "sha256-yEMsFaGBVs/rtDZLG8j8ZW1CV9SDtt00avoWxkJdLAU=";
   };
   patchset = [
     "wl-kmod-001_wext_workaround.patch"
@@ -62,6 +62,7 @@ let
     "wl-kmod-032_add_MODULE_DESCRIPTION_macro.patch"
     "wl-kmod-033_disable_objtool_add_warning_unmaintained.patch"
     "wl-kmod-034_kernel_6.15_adaptation_replace_del_timer_with_timer_delete.patch"
+    "wl-kmod-035_kernel_6.17_adaptation_fix_functions_prototypes.patch"
   ];
 in
 stdenv.mkDerivation {

From a3edb2443ecf4f1317ff708c9099c07f2b393e72 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 4 Sep 2025 16:43:52 +0300
Subject: [PATCH 0652/6226] ee: 1.5.2 -> 1.5.2-unstable-2024-06-20, fix update
 script

---
 pkgs/by-name/ee/ee/package.nix | 20 ++++++++++----------
 pkgs/by-name/ee/ee/update.sh   | 30 ++++++++++++++++++++++++++++++
 2 files changed, 40 insertions(+), 10 deletions(-)
 create mode 100755 pkgs/by-name/ee/ee/update.sh

diff --git a/pkgs/by-name/ee/ee/package.nix b/pkgs/by-name/ee/ee/package.nix
index 8be454f4b069..efe71101b186 100644
--- a/pkgs/by-name/ee/ee/package.nix
+++ b/pkgs/by-name/ee/ee/package.nix
@@ -1,23 +1,23 @@
 {
   lib,
   stdenv,
-  nix-update-script,
-  fetchgit,
+  fetchFromGitHub,
   ncurses,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation {
   pname = "ee";
-  version = "1.5.2";
+  version = "1.5.2-unstable-2024-06-20";
 
-  src = fetchgit {
-    url = "https://git.freebsd.org/src.git";
-    tag = "release/14.3.0";
-    outputHash = "sha256-nMhHXeoam9VtUuhhi0eoGZfcW9zZhpYQKVYbkAbfgc0=";
+  src = fetchFromGitHub {
+    owner = "freebsd";
+    repo = "freebsd-src";
+    rev = "0667538b888c1171932c6cf28b62fc19d393e119";
+    hash = "sha256-nMhHXeoam9VtUuhhi0eoGZfcW9zZhpYQKVYbkAbfgc0=";
     rootDir = "contrib/ee";
   };
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = ./update.sh;
 
   buildInputs = [ ncurses ];
 
@@ -49,4 +49,4 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.unix;
     mainProgram = "ee";
   };
-})
+}
diff --git a/pkgs/by-name/ee/ee/update.sh b/pkgs/by-name/ee/ee/update.sh
new file mode 100755
index 000000000000..29a5460e7daf
--- /dev/null
+++ b/pkgs/by-name/ee/ee/update.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p curl jq common-updater-scripts
+set -euo pipefail
+
+owner=freebsd
+repo=freebsd-src
+path=contrib/ee
+pkg_file=./pkgs/by-name/ee/ee/package.nix
+
+api_url_latest="https://api.github.com/repos/$owner/$repo/commits?path=$path&per_page=1"
+json_latest=$(curl -sSfL -H "Accept: application/vnd.github+json" ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "$api_url_latest")
+latest_rev=$(printf '%s' "$json_latest" | jq -r '.[0].sha')
+latest_date=$(printf '%s' "$json_latest" | jq -r '.[0].commit.committer.date' | cut -dT -f1)
+
+if [[ -z "${latest_rev:-}" || "$latest_rev" == "null" ]]; then
+  echo "Failed to fetch latest commit for path $path" >&2
+  exit 1
+fi
+
+# Fetch EE_VERSION from that commit
+raw_url="https://raw.githubusercontent.com/$owner/$repo/$latest_rev/$path/ee_version.h"
+ee_version=$(curl -sSfL ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "$raw_url" | sed -n 's/^#define[[:space:]]*EE_VERSION[[:space:]]*"\([^"]*\)".*/\1/p')
+if [[ -z "${ee_version:-}" ]]; then
+  echo "Failed to parse EE_VERSION from ee_version.h at $latest_rev" >&2
+  exit 1
+fi
+
+new_version="${ee_version}-unstable-${latest_date}"
+
+update-source-version ee "$new_version" --rev="$latest_rev" --file="$pkg_file" --ignore-same-version --print-changes

From 500ec2fc673da5e0d670129dff04b50c94c4038d Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Mon, 13 Oct 2025 23:05:40 +0300
Subject: [PATCH 0653/6226] ee: adopt

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

diff --git a/pkgs/by-name/ee/ee/package.nix b/pkgs/by-name/ee/ee/package.nix
index efe71101b186..0b4707c79499 100644
--- a/pkgs/by-name/ee/ee/package.nix
+++ b/pkgs/by-name/ee/ee/package.nix
@@ -48,5 +48,6 @@ stdenv.mkDerivation {
     license = lib.licenses.bsd2;
     platforms = lib.platforms.unix;
     mainProgram = "ee";
+    maintainers = with lib.maintainers; [ qweered ];
   };
 }

From 815bc05c78357c035f77d22dd6bf88f075373d29 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 13 Oct 2025 22:03:44 +0100
Subject: [PATCH 0654/6226] fheroes2: drop `FHEROES2_STRICT_COMPILATION=1`

The only effect `FHEROES2_STRICT_COMPILATION=1` on `fheroes2`
is to add `-Werror` to the compiler flags. Unfortunately
blanket `-Werror` usually breaks the builds with every major
compiler update.

For example right now `fheroes2` currently fails on `gcc-16`
from `gcc` `master` as:

```
fheroes2> In file included from /nix/store/nq52d716cprkic7kvb68izz590lyznjf-gcc-16.0.0.99999999/include/c++/16.0.0.99999999/memory:80,
fheroes2>                  from ../../fheroes2/gui/ui_button.h:26,
fheroes2>                  from ../../fheroes2/gui/ui_button.cpp:21:
fheroes2> In member function 'std::__uniq_ptr_impl<_Tp, _Dp>::pointer std::__uniq_ptr_impl<_Tp, _Dp>::_M_ptr() const [with _Tp = unsigned char; _Dp = std::default_delete<unsigned char []>]',
fheroes2>     inlined from 'std::unique_ptr<_Tp [], _Dp>::pointer std::unique_ptr<_Tp [], _Dp>::get() const [with _Tp = unsigned char; _Dp = std::default_delete<unsigned char []>]' at /nix/store/nq52d716cprkic7kvb68izz590lyznjf-gcc-16.0.0.99999999/include/c++/16.0.0.99999999/bits/unique_ptr.h:742:27,
fheroes2>     inlined from 'std::unique_ptr<_Tp [], _Dp>::operator bool() const [with _Tp = unsigned char; _Dp = std::default_delete<unsigned char []>]' at /nix/store/nq52d716cprkic7kvb68izz590lyznjf-gcc-16.0.0.99999999/include/c++/16.0.0.99999999/bits/unique_ptr.h:759:19,
fheroes2>     inlined from 'bool fheroes2::Image::empty() const' at ../../engine/image.h:86:21,
fheroes2>     inlined from 'virtual const fheroes2::Sprite& fheroes2::ButtonSprite::_getDisabled() const' at ../../fheroes2/gui/ui_button.cpp:524:29,
fheroes2>     inlined from 'void fheroes2::ButtonBase::_updateReleasedArea()' at ../../fheroes2/gui/ui_button.h:171:82,
fheroes2>     inlined from 'void fheroes2::ButtonBase::_updateButtonAreas()' at ../../fheroes2/gui/ui_button.h:149:32,
fheroes2>     inlined from 'fheroes2::Button::Button(int32_t, int32_t, int, uint32_t, uint32_t)' at ../../fheroes2/gui/ui_button.h:194:31,
fheroes2>     inlined from 'std::__detail::__unique_ptr_t<_Tp> std::make_unique(_Args&& ...) [with _Tp = fheroes2::Button; _Args = {const int&, const int&, const int&, const unsigned int&, const unsigned int&}]' at /nix/store/nq52d716cprkic7kvb68izz590lyznjf-gcc-16.0.0.99999999/include/c++/16.0.0.99999999/bits/unique_ptr.h:1086:30,
fheroes2>     inlined from 'void fheroes2::ButtonGroup::createButton(int32_t, int32_t, int, uint32_t, uint32_t, int)' at ../../fheroes2/gui/ui_button.cpp:626:52:
fheroes2> /nix/store/nq52d716cprkic7kvb68izz590lyznjf-gcc-16.0.0.99999999/include/c++/16.0.0.99999999/bits/unique_ptr.h:192:67: error: array subscript 22 is outside array bounds of 'void [96]' [-Werror=array-bounds=]
fheroes2>   192 |       pointer    _M_ptr() const noexcept { return std::get<0>(_M_t); }
fheroes2>       |                                                                   ^
fheroes2> In function 'std::__detail::__unique_ptr_t<_Tp> std::make_unique(_Args&& ...) [with _Tp = fheroes2::Button; _Args = {const int&, const int&, const int&, const unsigned int&, const unsigned int&}]',
fheroes2>     inlined from 'void fheroes2::ButtonGroup::createButton(int32_t, int32_t, int, uint32_t, uint32_t, int)' at ../../fheroes2/gui/ui_button.cpp:626:52:
fheroes2> /nix/store/nq52d716cprkic7kvb68izz590lyznjf-gcc-16.0.0.99999999/include/c++/16.0.0.99999999/bits/unique_ptr.h:1086:30: note: at offset 176 into object of size 96 allocated by 'operator new'
fheroes2>  1086 |     { return unique_ptr<_Tp>(new _Tp(std::forward<_Args>(__args)...)); }
fheroes2>       |                              ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
```

While these errors are useful for developers they
usualllly do more harm than good for distributions.
---
 pkgs/by-name/fh/fheroes2/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/fh/fheroes2/package.nix b/pkgs/by-name/fh/fheroes2/package.nix
index 111eded615a4..377879cadda5 100644
--- a/pkgs/by-name/fh/fheroes2/package.nix
+++ b/pkgs/by-name/fh/fheroes2/package.nix
@@ -42,7 +42,6 @@ stdenv.mkDerivation rec {
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
 
   makeFlags = [
-    "FHEROES2_STRICT_COMPILATION=1"
     "FHEROES2_DATA=\"${placeholder "out"}/share/fheroes2\""
   ];
 

From 97ce1f6750a2b56a792f60ea7e8221015e028b38 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 21:05:24 +0000
Subject: [PATCH 0655/6226] tomcat: 11.0.12 -> 11.0.13

---
 pkgs/servers/http/tomcat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/tomcat/default.nix b/pkgs/servers/http/tomcat/default.nix
index 3877e627adcf..b1ec66f28fc3 100644
--- a/pkgs/servers/http/tomcat/default.nix
+++ b/pkgs/servers/http/tomcat/default.nix
@@ -70,7 +70,7 @@ in
   };
 
   tomcat11 = common {
-    version = "11.0.12";
-    hash = "sha256-GmW8ga7V1ME60iUlj110bC1jaZ3JagT/4z4W4y9CDFU=";
+    version = "11.0.13";
+    hash = "sha256-8XTIrrttJ4ZLpAgjzrBZGR0nzA7iSii2kczUFoObjs8=";
   };
 }

From d146a5b5aaee611bad91028603d9bb6e5812dcab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 22:41:48 +0000
Subject: [PATCH 0656/6226] python3Packages.livekit-api: 1.0.6 -> 1.0.7

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

diff --git a/pkgs/development/python-modules/livekit-api/default.nix b/pkgs/development/python-modules/livekit-api/default.nix
index 601095a58b82..e7f406ac979f 100644
--- a/pkgs/development/python-modules/livekit-api/default.nix
+++ b/pkgs/development/python-modules/livekit-api/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "livekit-api";
-  version = "1.0.6";
+  version = "1.0.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "python-sdks";
     tag = "api-v${version}";
-    hash = "sha256-AsTJC0j8dztua7B6JvAYQlHGsE1RCIGoCzfGgbHSnGU=";
+    hash = "sha256-yS7Nzzrgyo3Q/O4z9acIfPXzS/SRv27BEiO4cMP11Z0=";
   };
 
   pypaBuildFlags = [ "livekit-api" ];

From cc0affd861598e71ac7cb26ad1e167259dfa3a44 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 23:50:06 +0000
Subject: [PATCH 0657/6226] ocamlPackages.qcheck-multicoretests-util: 0.9 ->
 0.11

---
 pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix
index c80b7484d0c2..f9466470cd3d 100644
--- a/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix
+++ b/pkgs/development/ocaml-modules/qcheck/multicoretests-util.nix
@@ -7,13 +7,13 @@
 
 buildDunePackage rec {
   pname = "qcheck-multicoretests-util";
-  version = "0.9";
+  version = "0.11";
 
   src = fetchFromGitHub {
     owner = "ocaml-multicore";
     repo = "multicoretests";
     rev = version;
-    hash = "sha256-ekHit4MaDb6lUZzGGZ1bm7brUlUgpfIBSpsOvDSxNhw=";
+    hash = "sha256-QABh33C1k5AAYkOa5zDIExwwJFlhgdvSuxShJt4ESM8=";
   };
 
   propagatedBuildInputs = [ qcheck-core ];

From e1e44f9d0f5cff48f72f484609aed0435f85df88 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 13 Oct 2025 23:53:33 +0000
Subject: [PATCH 0658/6226] ocamlPackages.ocaml-version: 4.0.1 -> 4.0.3

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

diff --git a/pkgs/development/ocaml-modules/ocaml-version/default.nix b/pkgs/development/ocaml-modules/ocaml-version/default.nix
index 335ad7611030..8c85239ee914 100644
--- a/pkgs/development/ocaml-modules/ocaml-version/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-version/default.nix
@@ -7,11 +7,11 @@
 
 buildDunePackage rec {
   pname = "ocaml-version";
-  version = "4.0.1";
+  version = "4.0.3";
 
   src = fetchurl {
     url = "https://github.com/ocurrent/ocaml-version/releases/download/v${version}/ocaml-version-${version}.tbz";
-    hash = "sha256-uZ7c47uaHpTt1XyCcsxo/E7P2grk09UzRTEnUBKYKNA=";
+    hash = "sha256-GM5e7fTKWhx6tSJ9xfNdW2fy8wYWhmbf3uGvqGKQm7M=";
   };
 
   checkInputs = [ alcotest ];

From 28d66871964689d7abeaff1cbf0d774820722823 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Oct 2025 00:40:53 +0000
Subject: [PATCH 0659/6226] doomretro: 5.7.2 -> 5.8

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

diff --git a/pkgs/by-name/do/doomretro/package.nix b/pkgs/by-name/do/doomretro/package.nix
index c2b4a281da2a..51f8808963c1 100644
--- a/pkgs/by-name/do/doomretro/package.nix
+++ b/pkgs/by-name/do/doomretro/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "doomretro";
-  version = "5.7.2";
+  version = "5.8";
 
   src = fetchFromGitHub {
     owner = "bradharding";
     repo = "doomretro";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ShzZMmUwPB8IHhaA/7U4CEE7qcEjxfQDXVZkAVuEgtw=";
+    hash = "sha256-UCLIQEeKNJ0qTZQdzybdBxt/6catf8y3lnWKsjg2Mf8=";
   };
 
   nativeBuildInputs = [

From 908590149f5fdd558a608412a94519f4cd7b5212 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Tue, 14 Oct 2025 02:40:59 +0200
Subject: [PATCH 0660/6226] binaryninja-free: 5.1.8005 -> 5.1.8104

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

diff --git a/pkgs/by-name/bi/binaryninja-free/package.nix b/pkgs/by-name/bi/binaryninja-free/package.nix
index 2dc8abf92679..bfe4d355766d 100644
--- a/pkgs/by-name/bi/binaryninja-free/package.nix
+++ b/pkgs/by-name/bi/binaryninja-free/package.nix
@@ -20,11 +20,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "binaryninja-free";
-  version = "5.1.8005";
+  version = "5.1.8104";
 
   src = fetchurl {
     url = "https://github.com/Vector35/binaryninja-api/releases/download/stable/${finalAttrs.version}/binaryninja_free_linux.zip";
-    hash = "sha256-vXR0TXcQwEoYz1qiGO3TYajUt+QR9wfV0es6yTZvYLs=";
+    hash = "sha256-s7lRvQhegW/bgZc6XnAowTl1ZZPIN0/BJe+u3p9qHsE=";
   };
 
   icon = fetchurl {

From 51481b1eb2f0c44969ef81b24669e05ad3e49c87 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Oct 2025 00:46:08 +0000
Subject: [PATCH 0661/6226] qxmpp: 1.11.2 -> 1.11.3

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

diff --git a/pkgs/by-name/qx/qxmpp/package.nix b/pkgs/by-name/qx/qxmpp/package.nix
index a35ced9b5764..95845b49ffff 100644
--- a/pkgs/by-name/qx/qxmpp/package.nix
+++ b/pkgs/by-name/qx/qxmpp/package.nix
@@ -13,14 +13,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qxmpp";
-  version = "1.11.2";
+  version = "1.11.3";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "libraries";
     repo = "qxmpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OR/rBp84pXv286Vd0I6IRzeUdC/+nnlRCZMAMXKgyxo=";
+    hash = "sha256-93P4rKBSbs31uofl4AuVQQWVSRVOsKsykIG13p8zIkI=";
   };
 
   nativeBuildInputs = [

From cdf60ddfcfe85bb558a8e1a6c7d1328fc93646bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Oct 2025 01:18:50 +0000
Subject: [PATCH 0662/6226] git-town: 22.0.0 -> 22.1.0

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

diff --git a/pkgs/by-name/gi/git-town/package.nix b/pkgs/by-name/gi/git-town/package.nix
index b1e7acd4a5c1..5270a47e3e06 100644
--- a/pkgs/by-name/gi/git-town/package.nix
+++ b/pkgs/by-name/gi/git-town/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule rec {
   pname = "git-town";
-  version = "22.0.0";
+  version = "22.1.0";
 
   src = fetchFromGitHub {
     owner = "git-town";
     repo = "git-town";
     tag = "v${version}";
-    hash = "sha256-yLDzMKyg9t5VNFXRS+FDD6W0Z80eNNywfZAMOhxNSZU=";
+    hash = "sha256-hM6aEH4xiMgRWvIzja9QQUZvwdufG1FYooeUO1qJpbU=";
   };
 
   vendorHash = null;

From 3a09871f1a354330820250f6278543f7564af9b7 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 14 Oct 2025 11:13:44 +0800
Subject: [PATCH 0663/6226] sameboy: 1.0.1 -> 1.0.2

Diff: https://github.com/LIJI32/SameBoy/compare/v1.0.1...v1.0.2
---
 pkgs/by-name/sa/sameboy/package.nix           | 22 +++++++++----------
 .../by-name/sa/sameboy/xdg-install-patch.diff | 10 ++++-----
 2 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/sa/sameboy/package.nix b/pkgs/by-name/sa/sameboy/package.nix
index a242b5e6af42..680e0b6ecc61 100644
--- a/pkgs/by-name/sa/sameboy/package.nix
+++ b/pkgs/by-name/sa/sameboy/package.nix
@@ -11,15 +11,15 @@
   pkg-config,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sameboy";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "LIJI32";
     repo = "SameBoy";
-    rev = "v${version}";
-    sha256 = "sha256-rNP1jGnGqZG5jz8vQzqDNEKticg51uCcZQaUteawlPU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Sk5/Wojl9rFkTuBFSGN/W8oq8OJNrV5W3E8PdsaMll8=";
   };
 
   enableParallelBuilding = true;
@@ -45,14 +45,13 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace OpenDialog/gtk.c \
-      --replace '"libgtk-3.so"' '"${gtk3}/lib/libgtk-3.so"'
+      --replace-fail '"libgtk-3.so"' '"${gtk3}/lib/libgtk-3.so"'
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://sameboy.github.io";
     description = "Game Boy, Game Boy Color, and Super Game Boy emulator";
     mainProgram = "sameboy";
-
     longDescription = ''
       SameBoy is a user friendly Game Boy, Game Boy Color and Super
       Game Boy emulator for macOS, Windows and Unix-like platforms.
@@ -62,9 +61,8 @@ stdenv.mkDerivation rec {
       capabilities, SameBoy has all the features one would expect from
       an emulator – from save states to scaling filters.
     '';
-
-    license = licenses.mit;
-    maintainers = with maintainers; [ NieDzejkob ];
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ NieDzejkob ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/by-name/sa/sameboy/xdg-install-patch.diff b/pkgs/by-name/sa/sameboy/xdg-install-patch.diff
index 91e09f5fa12e..d367c618b873 100644
--- a/pkgs/by-name/sa/sameboy/xdg-install-patch.diff
+++ b/pkgs/by-name/sa/sameboy/xdg-install-patch.diff
@@ -1,8 +1,6 @@
-diff --git a/Makefile b/Makefile
-index 3377b3f..4492f96 100644
 --- a/Makefile
 +++ b/Makefile
-@@ -788,15 +788,7 @@ install: $(BIN)/XdgThumbnailer/sameboy-thumbnailer sdl $(shell find FreeDesktop)
+@@ -796,15 +796,7 @@
  	install -m 755 $(BIN)/SDL/sameboy $(DESTDIR)$(PREFIX)/bin/sameboy
  	install -m 755 $(BIN)/XdgThumbnailer/sameboy-thumbnailer $(DESTDIR)$(PREFIX)/bin/sameboy-thumbnailer
  	install -m 644 XdgThumbnailer/sameboy.thumbnailer $(DESTDIR)$(PREFIX)/share/thumbnailers/sameboy.thumbnailer
@@ -16,14 +14,14 @@ index 3377b3f..4492f96 100644
 -	done
 -else
 +
- 	install -m 644 FreeDesktop/sameboy.xml $(DESTDIR)$(PREFIX)/share/mime/sameboy.xml
+ 	install -m 644 FreeDesktop/sameboy.xml $(DESTDIR)$(PREFIX)/share/mime/packages/sameboy.xml
  	install -m 644 FreeDesktop/sameboy.desktop $(DESTDIR)$(PREFIX)/share/applications/sameboy.desktop
  	for size in 16x16 32x32 64x64 128x128 256x256 512x512; do \
-@@ -807,7 +799,6 @@ else
+@@ -815,7 +807,6 @@
  		install -m 644 FreeDesktop/ColorCartridge/$$size.png $(DESTDIR)$(PREFIX)/share/icons/hicolor/$$size/mimetypes/x-gameboy-color-rom.png; \
  	done
  endif
 -endif
- 
+
  ios: bootroms
  	@$(MAKE) _ios

From da13b48f15cafd7ba57049eb4a5965e88da1560a Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Tue, 14 Oct 2025 12:17:49 +0800
Subject: [PATCH 0664/6226] rtags: 2.38 -> 2.41-unstable-2025-09-23

---
 pkgs/by-name/rt/rtags/package.nix | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/rt/rtags/package.nix b/pkgs/by-name/rt/rtags/package.nix
index a5ebc016da6e..67bae281880e 100644
--- a/pkgs/by-name/rt/rtags/package.nix
+++ b/pkgs/by-name/rt/rtags/package.nix
@@ -2,17 +2,17 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   llvmPackages,
   openssl,
   emacs,
   pkg-config,
+  nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rtags";
-  version = "2.38";
+  version = "2.41-unstable-2025-09-23";
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -22,15 +22,15 @@ stdenv.mkDerivation rec {
     llvmPackages.llvm
     llvmPackages.libclang
     openssl
-    emacs
+    (emacs.override { withNativeCompilation = false; })
   ]
   ++ lib.optionals stdenv.cc.isGNU [ llvmPackages.clang-unwrapped ];
 
   src = fetchFromGitHub {
     owner = "andersbakken";
     repo = "rtags";
-    tag = "v${version}";
-    hash = "sha256-EJ5pC53S36Uu7lM6KuLvLN6MAyrQW/Yk5kPqZNS5m8c=";
+    rev = "836e4f30ea51ef2074d3231d2118f43e8e32042f";
+    hash = "sha256-dPCXGDDK3sC0oYCTX3Ph3MYxAZqOSaRG7c4+LB/n+Rs=";
     fetchSubmodules = true;
     # unicode file names lead to different checksums on HFS+ vs. other
     # filesystems because of unicode normalisation
@@ -39,25 +39,19 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  # This should be fixed with the next version bump
-  # https://github.com/Andersbakken/rtags/issues/1411
-  patches = [
-    (fetchpatch {
-      name = "define-obsolete-function-alias.patch";
-      url = "https://github.com/Andersbakken/rtags/commit/63f18acb21e664fd92fbc19465f0b5df085b5e93.patch";
-      sha256 = "sha256-dmEPtnk8Pylmf5479ovHKItRZ+tJuOWuYOQbWB/si/Y=";
-    })
-  ];
-
   preConfigure = ''
     export LIBCLANG_CXXFLAGS="-isystem ${llvmPackages.clang.cc}/include $(llvm-config --cxxflags) -fexceptions" \
            LIBCLANG_LIBDIR="${llvmPackages.clang.cc}/lib"
   '';
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
   meta = {
     description = "C/C++ client-server indexer based on clang";
     homepage = "https://github.com/andersbakken/rtags";
-    license = lib.licenses.gpl3;
+    license = lib.licenses.gpl3Plus;
     platforms = with lib.platforms; x86_64 ++ aarch64;
   };
-}
+})

From 0eac131a55a50edc242d8f744a2fe1f713f1754f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Oct 2025 05:18:02 +0000
Subject: [PATCH 0665/6226] alibuild: 1.17.30 -> 1.17.31

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

diff --git a/pkgs/by-name/al/alibuild/package.nix b/pkgs/by-name/al/alibuild/package.nix
index 9011e7e30b26..f189ed911464 100644
--- a/pkgs/by-name/al/alibuild/package.nix
+++ b/pkgs/by-name/al/alibuild/package.nix
@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "alibuild";
-  version = "1.17.30";
+  version = "1.17.31";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-gLJQnQgFrB/4YTB8rpYicC97avuw0EhO4hUaxYYwvbE=";
+    hash = "sha256-agAWJaaaHGN2oQaaIkMNEeU712bkWXEPH3jP8oH5Qjs=";
   };
 
   build-system = with python3Packages; [

From 011ec1ccdc5dca81e05c2e82f7eb468be969007f Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Tue, 7 Oct 2025 16:16:55 +0200
Subject: [PATCH 0666/6226] newsboat: fix build on darwin

---
 pkgs/by-name/ne/newsboat/package.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix
index 76d3185bdfee..477fdd0d8a7f 100644
--- a/pkgs/by-name/ne/newsboat/package.nix
+++ b/pkgs/by-name/ne/newsboat/package.nix
@@ -36,6 +36,18 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-CyhyzNw2LXwIVf/SX2rQRvEex5LmjZfZKgCe88jthz0=";
   };
 
+  # fix macOS build
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/newsboat/newsboat/commit/4139a0ba1ec87e442ef1408823b07fc739742f9d.patch";
+      hash = "sha256-zdtdpUQGATq/9w+hAY/Va9Ob95c8VT2D9aKFmAF+O0c=";
+    })
+    (fetchpatch {
+      url = "https://github.com/newsboat/newsboat/commit/4eb748b6b6b63acddb3582e012442e519e8704ea.patch";
+      hash = "sha256-A/0WbuMIapTsLoziUPr95ZctIr2hW7JOJSdMVaWayYI=";
+    })
+  ];
+
   # allow other ncurses versions on Darwin
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace config.sh --replace-fail "ncurses5.4" "ncurses"

From 5935251faebb6795f2c5054fcd5074ea472d3f90 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Mon, 13 Oct 2025 15:50:08 +0100
Subject: [PATCH 0667/6226] protoc-gen-connect-go: move to finalAttrs pattern

---
 pkgs/by-name/pr/protoc-gen-connect-go/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
index 6e9f03184e86..d3697ac75b90 100644
--- a/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-connect-go/package.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "protoc-gen-connect-go";
   version = "1.19.1";
 
   src = fetchFromGitHub {
     owner = "connectrpc";
     repo = "connect-go";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-VW7FHZk7FAux2Jn03gGm9gdkjCzvofC/ukXOWaplWBo=";
   };
 
@@ -42,11 +42,11 @@ buildGoModule rec {
     description = "Simple, reliable, interoperable, better gRPC";
     mainProgram = "protoc-gen-connect-go";
     homepage = "https://github.com/connectrpc/connect-go";
-    changelog = "https://github.com/connectrpc/connect-go/releases/tag/v${version}";
+    changelog = "https://github.com/connectrpc/connect-go/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       kilimnik
       jk
     ];
   };
-}
+})

From d30c263096c695ef258b0f5e715a8ab01c7fcead Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Tue, 14 Oct 2025 09:18:16 +0000
Subject: [PATCH 0668/6226] python3Packages.msgspec: add
 'optional-dependencies'

---
 .../python-modules/msgspec/default.nix        | 45 +++++++++++++++++++
 1 file changed, 45 insertions(+)

diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix
index 44bc828d3625..9ed38523bc29 100644
--- a/pkgs/development/python-modules/msgspec/default.nix
+++ b/pkgs/development/python-modules/msgspec/default.nix
@@ -3,7 +3,22 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
+  attrs,
+  coverage,
+  furo,
+  ipython,
+  msgpack,
+  mypy,
+  pre-commit,
+  pyright,
+  pytest,
+  pyyaml,
   setuptools,
+  sphinx,
+  sphinx-copybutton,
+  sphinx-design,
+  tomli,
+  tomli-w,
 }:
 
 buildPythonPackage rec {
@@ -26,6 +41,36 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
+  optional-dependencies = {
+    dev = [
+      coverage
+      mypy
+      pre-commit
+      pyright
+    ]
+    ++ optional-dependencies.doc
+    ++ optional-dependencies.test;
+    doc = [
+      furo
+      ipython
+      sphinx
+      sphinx-copybutton
+      sphinx-design
+    ];
+    test = [
+      attrs
+      msgpack
+      pytest
+    ]
+    ++ optional-dependencies.yaml
+    ++ optional-dependencies.toml;
+    toml = [
+      tomli-w
+    ]
+    ++ lib.optional (pythonOlder 3.11) tomli;
+    yaml = [ pyyaml ];
+  };
+
   # Requires libasan to be accessible
   doCheck = false;
 

From fdb77670d937a2b1e2755084b761e72b87e3b320 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Tue, 14 Oct 2025 09:29:03 +0000
Subject: [PATCH 0669/6226] python3Packages.reflink-copy: init at 0.3.3

---
 .../python-modules/reflink-copy/default.nix   | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/python-modules/reflink-copy/default.nix

diff --git a/pkgs/development/python-modules/reflink-copy/default.nix b/pkgs/development/python-modules/reflink-copy/default.nix
new file mode 100644
index 000000000000..6c55782c880c
--- /dev/null
+++ b/pkgs/development/python-modules/reflink-copy/default.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  rustPlatform,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "reflink-copy";
+  version = "0.3.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "iterative";
+    repo = "reflink-copy";
+    tag = version;
+    hash = "sha256-HxUAsqV5kjstfBfY/nEGJ3epUVT5WXoTqKerUggKDyo=";
+  };
+
+  cargoDeps = rustPlatform.fetchCargoVendor {
+    inherit pname version src;
+    hash = "sha256-TBKVf0kRRYn+1aYvhQHCHmJEsT0khFxp8iuyEWX9xyI=";
+  };
+
+  nativeBuildInputs = with rustPlatform; [
+    cargoSetupHook
+    maturinBuildHook
+  ];
+
+  nativeCheckInputs = [ pytestCheckHook ];
+
+  pythonImportsCheck = [ "reflink_copy" ];
+
+  meta = with lib; {
+    description = "Python wrapper for reflink_copy Rust library";
+    homepage = "https://github.com/iterative/reflink-copy";
+    license = licenses.asl20;
+    maintainers = with maintainers; [ ambroisie ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 4703021f89a8..d7ef12ad99d1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -15833,6 +15833,8 @@ self: super: with self; {
 
   reflink = callPackage ../development/python-modules/reflink { };
 
+  reflink-copy = callPackage ../development/python-modules/reflink-copy { };
+
   refoss-ha = callPackage ../development/python-modules/refoss-ha { };
 
   regenmaschine = callPackage ../development/python-modules/regenmaschine { };

From 292b7d39d95d43fa80886884fd4126b0687a0aa4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Oct 2025 12:42:01 +0000
Subject: [PATCH 0670/6226] lune: 0.10.3 -> 0.10.4

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

diff --git a/pkgs/by-name/lu/lune/package.nix b/pkgs/by-name/lu/lune/package.nix
index df7bf3ce6753..d053e32bc244 100644
--- a/pkgs/by-name/lu/lune/package.nix
+++ b/pkgs/by-name/lu/lune/package.nix
@@ -7,17 +7,17 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "lune";
-  version = "0.10.3";
+  version = "0.10.4";
 
   src = fetchFromGitHub {
     owner = "filiptibell";
     repo = "lune";
     tag = "v${version}";
-    hash = "sha256-pWOGaVugfnwaA4alFP85ha+/iaN8x6KOVnx38vfFk78=";
+    hash = "sha256-AbviyCy2nn6WHC575JKl/t3bM/4Myb+Wx5/buTvB4MY=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-cq7Sgq9f2XpVTgEOMfR/G7sTqcWLwuJBgG9U+h4IMWQ=";
+  cargoHash = "sha256-QSQ+SsvLa7f9EVGi6i/SlpL8yWXVP47zkw4beDy5UIQ=";
 
   # error: linker `aarch64-linux-gnu-gcc` not found
   postPatch = ''

From 2e758513fc20987f281af1e27e5d455c6ffa6542 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <24027+bbigras@users.noreply.github.com>
Date: Tue, 14 Oct 2025 09:50:36 -0400
Subject: [PATCH 0671/6226] diffedit3: 0.6.0 -> 0.6.1

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

diff --git a/pkgs/by-name/di/diffedit3/package.nix b/pkgs/by-name/di/diffedit3/package.nix
index 9a6ed5917b05..c7678e5ae251 100644
--- a/pkgs/by-name/di/diffedit3/package.nix
+++ b/pkgs/by-name/di/diffedit3/package.nix
@@ -9,14 +9,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "diffedit3";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-o3Y3SQLkMxYMepGyvK6m/8aA5ZDwCAYdYUhGplkckjU=";
+    hash = "sha256-tlrP97XMAAnk5H5wTHPsP1DMSmDqV9wJp1n+22jUtnM=";
   };
 
-  cargoHash = "sha256-XAtp5pCKFQRqyF9Y0udrcudgF5i3vWxk//kZ/hRsFaA=";
+  cargoHash = "sha256-Hv3T0pxNUwp7No5tmFopMGjNdxfje4gRODj3B7sDVcg=";
 
   passthru = {
     updateScript = nix-update-script { };

From 6216062a32087c21a66e24a80718ff1eec6c8ba8 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Mon, 13 Oct 2025 15:43:07 -0700
Subject: [PATCH 0672/6226] drat: init at 0.1.3-unstable-2024-01-07

> Drat is a tool for analysing and recovering data from [APFS (Apple File System)](https://en.wikipedia.org/wiki/Apple_File_System) partitions. Its creation was inspired by a [personal data loss incident](https://apple.stackexchange.com/questions/373718) and [Jonathan Levin's](https://twitter.com/Morpheus______) closed-source `fsleuth` tool, which he demonstrated in [this lecture](http://docs.macsysadmin.se/2018/video/Day4Session2.mp4).
>
> The name "Drat" is a loose acronym for "Disaster Recovery APFS Tools", and a bad pun on how one might say "drat!" after discovering that their data is corrupted.
---
 pkgs/by-name/dr/drat/package.nix | 46 ++++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/by-name/dr/drat/package.nix

diff --git a/pkgs/by-name/dr/drat/package.nix b/pkgs/by-name/dr/drat/package.nix
new file mode 100644
index 000000000000..41911e8ef407
--- /dev/null
+++ b/pkgs/by-name/dr/drat/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "drat";
+  version = "0.1.3-unstable-2024-01-07";
+
+  src = fetchFromGitHub {
+    owner = "jivanpal";
+    repo = "drat";
+    rev = "af573b9e067e8b6cbcc4825946e7e636b30c748f";
+    hash = "sha256-1NmqG73sP25Uqf7DiSPgt7drONOg9ZkrtCS0tYVjSU0=";
+  };
+
+  # Don't blow up on warnings; it makes upgrading the compiler difficult.
+  postPatch = ''
+    substituteInPlace Makefile --replace-fail "-Werror" ""
+  '';
+
+  makeFlags = [
+    "CC=${stdenv.cc.targetPrefix}cc"
+    "LD=${stdenv.cc.targetPrefix}cc"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    install drat $out/bin
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Utility for performing data recovery and analysis of APFS partitions/containers";
+    homepage = "https://github.com/jivanpal/drat";
+    changelog = "https://github.com/jivanpal/drat/blob/main/CHANGELOG.md";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ philiptaron ];
+    mainProgram = "drat";
+    platforms = lib.platforms.all;
+  };
+})

From b3cba645ef052ab8c31d3608972ee0ee395a6c4c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Oct 2025 15:27:25 +0000
Subject: [PATCH 0673/6226] zuban: 0.0.23 -> 0.1.0

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

diff --git a/pkgs/by-name/zu/zuban/package.nix b/pkgs/by-name/zu/zuban/package.nix
index a1ba2288f0d2..f072b38cec86 100644
--- a/pkgs/by-name/zu/zuban/package.nix
+++ b/pkgs/by-name/zu/zuban/package.nix
@@ -8,18 +8,18 @@
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zuban";
 
-  version = "0.0.23";
+  version = "0.1.0";
 
   src = fetchFromGitHub {
     owner = "zubanls";
     repo = "zuban";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EPF1HW/oqUKHLTorkO3C+X+ziq6i1lCxGY5y1ioKg6A=";
+    hash = "sha256-nSQf3I9O5TP1V8kwJrcBRREqS/47UlILx3IZMmt5ljQ=";
   };
 
   buildAndTestSubdir = "crates/zuban";
 
-  cargoHash = "sha256-TAFdS4NmXchmhqVRcsckz6GhZG35IE2fukDlZiRF8Ms=";
+  cargoHash = "sha256-Q09ZUBVa52fXIKiL6aC9VZB+4Rt/hI045CIjb/t3Xyg=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From dfbc452cd643bae4b5647e781209054eb932dd19 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Tue, 14 Oct 2025 08:48:37 -0700
Subject: [PATCH 0674/6226] rocmPackages.meta: inline attrPaths json binding

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

diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index c57c0dbbea2d..17dbee3eb545 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -251,15 +251,15 @@ let
       # Don't put these into `propagatedBuildInputs` unless you want PATH/PYTHONPATH issues!
       # See: https://rocm.docs.amd.com/en/docs-5.7.1/_images/image.004.png
       # See: https://rocm.docs.amd.com/en/docs-5.7.1/deploy/linux/os-native/package_manager_integration.html
-      meta = with self; rec {
+      meta = {
         # eval all pkgsRocm release attrs with
         # nix-eval-jobs --force-recurse pkgs/top-level/release.nix -I . --select "p: p.pkgsRocm" --no-instantiate
-        release-attrPaths = (builtins.fromJSON (builtins.readFile ./release-attrPaths.json)).attrPaths;
         release-packagePlatforms =
           let
             platforms = [
               "x86_64-linux"
             ];
+            attrPaths = (builtins.fromJSON (builtins.readFile ./release-attrPaths.json)).attrPaths;
           in
           lib.foldl' (
             acc: path:
@@ -267,7 +267,7 @@ let
               lib.recursiveUpdate acc (lib.setAttrByPath (lib.splitString "." path) platforms)
             else
               acc
-          ) { } self.meta.release-attrPaths;
+          ) { } attrPaths;
 
         rocm-developer-tools = symlinkJoin {
           name = "rocm-developer-tools-meta";

From 220b77c19c55122ac0e93659fd0a4a324359d782 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Tue, 14 Oct 2025 08:49:23 -0700
Subject: [PATCH 0675/6226] rocmPackages.meta: remove symlinkJoins pile

These symlinkJoins emulated various possible sets of ROCM_PATH contents,
they were not for use in nixpkgs and for use outside of nixpkgs
it makes more sense to make a symlinkJoin with exactly the packages you
need anyway.
---
 pkgs/development/rocm-modules/6/default.nix | 161 --------------------
 1 file changed, 161 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index 17dbee3eb545..e81b1c07f8f1 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -245,12 +245,6 @@ let
       );
       mpi = self.openmpi;
 
-      ## Meta ##
-      # Emulate common ROCm meta layout
-      # These are mainly for users. I strongly suggest NOT using these in nixpkgs derivations
-      # Don't put these into `propagatedBuildInputs` unless you want PATH/PYTHONPATH issues!
-      # See: https://rocm.docs.amd.com/en/docs-5.7.1/_images/image.004.png
-      # See: https://rocm.docs.amd.com/en/docs-5.7.1/deploy/linux/os-native/package_manager_integration.html
       meta = {
         # eval all pkgsRocm release attrs with
         # nix-eval-jobs --force-recurse pkgs/top-level/release.nix -I . --select "p: p.pkgsRocm" --no-instantiate
@@ -268,161 +262,6 @@ let
             else
               acc
           ) { } attrPaths;
-
-        rocm-developer-tools = symlinkJoin {
-          name = "rocm-developer-tools-meta";
-          paths = [
-            aqlprofile
-            rocm-core
-            rocr-debug-agent
-            roctracer
-            rocdbgapi
-            rocprofiler
-            rocgdb
-            rocm-language-runtime
-          ];
-        };
-        rocm-ml-sdk = symlinkJoin {
-          name = "rocm-ml-sdk-meta";
-          paths = [
-            rocm-core
-            miopen-hip
-            rocm-hip-sdk
-            rocm-ml-libraries
-          ];
-        };
-        rocm-ml-libraries = symlinkJoin {
-          name = "rocm-ml-libraries-meta";
-          paths = [
-            llvm.clang
-            llvm.openmp
-            rocm-core
-            miopen-hip
-            rocm-hip-libraries
-          ];
-        };
-        rocm-hip-sdk = symlinkJoin {
-          name = "rocm-hip-sdk-meta";
-          paths = [
-            rocprim
-            rocalution
-            hipfft
-            hiprt
-            rocm-core
-            hipcub
-            hipblas
-            hipblaslt
-            rocrand
-            rocfft
-            rocsparse
-            rccl
-            rocthrust
-            rocblas
-            hipsparse
-            hipfort
-            rocwmma
-            hipsolver
-            rocsolver
-            rocm-hip-libraries
-            rocm-hip-runtime-devel
-          ];
-        };
-        rocm-hip-libraries = symlinkJoin {
-          name = "rocm-hip-libraries-meta";
-          paths = [
-            rocblas
-            hipfort
-            rocm-core
-            rocsolver
-            rocalution
-            rocrand
-            hipblas
-            hipblaslt
-            rocfft
-            hipfft
-            hiprt
-            rccl
-            rocsparse
-            hipsparse
-            hipsolver
-            rocm-hip-runtime
-          ];
-        };
-        rocm-openmp-sdk = symlinkJoin {
-          name = "rocm-openmp-sdk-meta";
-          paths = [
-            rocm-core
-            llvm.clang
-            llvm.openmp # openmp-extras-devel (https://github.com/ROCm/aomp)
-            rocm-language-runtime
-          ];
-        };
-        rocm-opencl-sdk = symlinkJoin {
-          name = "rocm-opencl-sdk-meta";
-          paths = [
-            rocm-core
-            rocm-runtime
-            clr
-            clr.icd
-            rocm-opencl-runtime
-          ];
-        };
-        rocm-opencl-runtime = symlinkJoin {
-          name = "rocm-opencl-runtime-meta";
-          paths = [
-            rocm-core
-            clr
-            clr.icd
-            rocm-language-runtime
-          ];
-        };
-        rocm-hip-runtime-devel = symlinkJoin {
-          name = "rocm-hip-runtime-devel-meta";
-          paths = [
-            clr
-            rocm-core
-            hipify
-            rocm-cmake
-            llvm.clang
-            llvm.openmp
-            rocm-runtime
-            rocm-hip-runtime
-          ];
-        };
-        rocm-hip-runtime = symlinkJoin {
-          name = "rocm-hip-runtime-meta";
-          paths = [
-            rocm-core
-            rocminfo
-            clr
-            rocm-language-runtime
-          ];
-        };
-        rocm-language-runtime = symlinkJoin {
-          name = "rocm-language-runtime-meta";
-          paths = [
-            rocm-runtime
-            rocm-core
-            rocm-comgr
-            llvm.openmp # openmp-extras-runtime (https://github.com/ROCm/aomp)
-          ];
-        };
-        rocm-all = symlinkJoin {
-          name = "rocm-all-meta";
-          paths = [
-            rocm-developer-tools
-            rocm-ml-sdk
-            rocm-ml-libraries
-            rocm-hip-sdk
-            rocm-hip-libraries
-            rocm-openmp-sdk
-            rocm-opencl-sdk
-            rocm-opencl-runtime
-            rocm-hip-runtime-devel
-            rocm-hip-runtime
-            rocm-language-runtime
-          ];
-        };
       };
 
       rocm-bandwidth-test = self.callPackage ./rocm-bandwidth-test {

From efabf4ba678ec521a84489a93eb7bcc9096aada3 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Tue, 14 Oct 2025 09:01:30 -0700
Subject: [PATCH 0676/6226] rocmPackages.rocm-tests: add linkFarm of all
 available rocmPackages

is this a good idea? I sometimes used the meta join as a fast way to
kick off a build of rocmPackages.*
---
 .../rocm-modules/6/rocm-tests/default.nix     | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/pkgs/development/rocm-modules/6/rocm-tests/default.nix b/pkgs/development/rocm-modules/6/rocm-tests/default.nix
index 84762ff70e73..794915893917 100644
--- a/pkgs/development/rocm-modules/6/rocm-tests/default.nix
+++ b/pkgs/development/rocm-modules/6/rocm-tests/default.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  linkFarm,
   clr,
   ollama,
   python3Packages,
@@ -8,6 +10,22 @@
   stdenv,
 }:
 # This package exists purely to have a bunch of passthru.tests attrs
+let
+  availableRocmDrvs = lib.pipe rocmPackages [
+    (lib.mapAttrsToList (
+      name: value: {
+        inherit name;
+        evaluated = builtins.tryEval value;
+      }
+    ))
+    (builtins.filter (x: x.evaluated.success))
+    (map (x: {
+      inherit (x) name;
+      value = x.evaluated.value;
+    }))
+    (builtins.filter (x: lib.isDerivation x.value && (x.value.meta.available or true)))
+  ];
+in
 stdenv.mkDerivation {
   name = "rocm-tests";
   nativeBuildInputs = [
@@ -20,6 +38,12 @@ stdenv.mkDerivation {
       inherit rocmPackages;
       acceleration = "rocm";
     };
+    rocmPackagesDerivations = linkFarm "rocmPackagesDerivations" (
+      map (x: {
+        name = x.name;
+        path = x.value;
+      }) availableRocmDrvs
+    );
     torch = python3Packages.torch.override {
       inherit rocmPackages;
       rocmSupport = true;

From b6cecb88b5448f21c8f4f7b4eeac8ef12960991c Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Tue, 14 Oct 2025 19:13:37 +0200
Subject: [PATCH 0677/6226] vintagestory: 1.21.4 -> 1.21.5

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

diff --git a/pkgs/by-name/vi/vintagestory/package.nix b/pkgs/by-name/vi/vintagestory/package.nix
index 2a72ca017194..2590f2cc3eb8 100644
--- a/pkgs/by-name/vi/vintagestory/package.nix
+++ b/pkgs/by-name/vi/vintagestory/package.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation rec {
   pname = "vintagestory";
-  version = "1.21.4";
+  version = "1.21.5";
 
   src = fetchurl {
     url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz";
-    hash = "sha256-npffJgxgUMefX9OiveNk1r4kVqsMaVCC1jcWaibz9l8=";
+    hash = "sha256-dG1D2Buqht+bRyxx2ie34Z+U1bdKgi5R3w29BG/a5jg=";
   };
 
   nativeBuildInputs = [

From c689bfd9b2c0ab994d1fa9925e6229359b172451 Mon Sep 17 00:00:00 2001
From: Tomodachi94 <tomodachi94@protonmail.com>
Date: Tue, 14 Oct 2025 11:36:03 -0700
Subject: [PATCH 0678/6226] gradle_7: mark as insecure

I do not think that #358845 will be finished by the
planned release date for 25.11, so let's mark is as
insecure to make it explicit that Gradle 7 is unsupported.
---
 pkgs/development/tools/build-managers/gradle/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index 082b55c4c698..c18b542fa7b4 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -342,6 +342,9 @@ rec {
     version = "7.6.6";
     hash = "sha256-Zz2XdvMDvHBI/DMp0jLW6/EFGweJO9nRFhb62ahnO+A=";
     defaultJava = jdk17;
+    meta.knownVulnerabilities = [
+      "Gradle 7 no longer receives security updates with the release of Gradle 9 on 31 July 2025. https://endoflife.date/gradle"
+    ];
   };
 
   # Default version of Gradle in nixpkgs.

From a533c70cb7a2ef0c32deece8079d65abb08612df Mon Sep 17 00:00:00 2001
From: t4ccer <t4ccer@gmail.com>
Date: Tue, 14 Oct 2025 16:29:11 -0230
Subject: [PATCH 0679/6226] logseq: fix build on darwin

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

diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix
index 57be3cd1eb3e..49f7a2b467a3 100644
--- a/pkgs/by-name/lo/logseq/package.nix
+++ b/pkgs/by-name/lo/logseq/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  clang_20,
 
   fetchFromGitHub,
   fetchYarnDeps,
@@ -153,6 +154,7 @@ stdenv.mkDerivation (finalAttrs: {
       cctools
       darwin.autoSignDarwinBinariesHook
       xcbuild
+      clang_20 # newer clang breaks node-addon-api on darwin
     ];
 
   # we'll run the hook manually multiple times

From 60a6cbf561cb12f4455a6bf63553dbf6e60b3799 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Oct 2025 19:57:19 +0000
Subject: [PATCH 0680/6226] hasura-cli: 2.48.5 -> 2.48.6

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

diff --git a/pkgs/by-name/ha/hasura-cli/package.nix b/pkgs/by-name/ha/hasura-cli/package.nix
index 0410c9b6b207..32ab0574f716 100644
--- a/pkgs/by-name/ha/hasura-cli/package.nix
+++ b/pkgs/by-name/ha/hasura-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "hasura";
-  version = "2.48.5";
+  version = "2.48.6";
 
   src = fetchFromGitHub {
     owner = "hasura";
     repo = "graphql-engine";
     rev = "v${version}";
-    sha256 = "sha256-3mKwhRDmsI2fo5hd6DM3/+Nmf4eOswE2RUcOieOeSCE=";
+    sha256 = "sha256-99HxAjqZQ4GtUR4F7EbVNKT7BI9AHm0uj54XgZZC2Lc=";
   };
   modRoot = "./cli";
 

From 27db13c60745454a58f03d676d0234fb85ea9b88 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 14 Oct 2025 21:00:51 +0100
Subject: [PATCH 0681/6226] astromenace: backport upstream fix for cmake-4

Without the change the build fails on `master` as
https://hydra.nixos.org/build/308956481:

    CMake Error at CMakeLists.txt:1 (CMAKE_MINIMUM_REQUIRED):
      Compatibility with CMake < 3.5 has been removed from CMake.
---
 pkgs/by-name/as/astromenace/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/as/astromenace/package.nix b/pkgs/by-name/as/astromenace/package.nix
index d59a9d6f0c9e..72aea1f8232d 100644
--- a/pkgs/by-name/as/astromenace/package.nix
+++ b/pkgs/by-name/as/astromenace/package.nix
@@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
       url = "https://src.fedoraproject.org/rpms/astromenace/raw/5e6bc02d115a53007dc47ef8223d8eaa25607588/f/astromenace-gcc13.patch";
       hash = "sha256-pkmTVR86vS+KCICxAp+d7upNWVnSNxwdKmxnbtqIvgU=";
     })
+
+    (fetchpatch {
+      name = "cmake-4.patch";
+      url = "https://github.com/viewizard/astromenace/commit/eb42ddb1e86a3e67787bfd5e33ff2afdd6307142.patch";
+      hash = "sha256-TQVcnDrKBFvcyYhWeeEQSRjuirtJ7wYFQV+f3bHikdA=";
+    })
   ];
 
   nativeBuildInputs = [

From b9a31d8862e82ca142074045958c0ac7c665575f Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Tue, 14 Oct 2025 12:00:00 +0000
Subject: [PATCH 0682/6226] nixseparatedebuginfod2: 0.1.0 -> 1.0.0

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

diff --git a/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix b/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix
index 2cffac191eef..548618f311a5 100644
--- a/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix
+++ b/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nixseparatedebuginfod2";
-  version = "0.1.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "symphorien";
     repo = "nixseparatedebuginfod2";
     tag = "v${version}";
-    hash = "sha256-bk+l/oWAPuWV6mnh9Pr/mru3BZjos08IfzEGUEFSW1E=";
+    hash = "sha256-r/lmnYdnqyc0Mx1ZVzebiz8V04bmKb8lJBv/ndIzQYM=";
   };
 
-  cargoHash = "sha256-HmtFso6uF2GsjIA0FPVL4S3S+lwQUrg7N576UaekXpU=";
+  cargoHash = "sha256-bj5OOj/PpoBU745hbhN1YqiVBikNIzT6/WrNGklRqy4=";
 
   buildInputs = [
     libarchive

From 09ac18fbd346dac4b14a29102b69eed3f195f59e Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Tue, 14 Oct 2025 12:00:00 +0000
Subject: [PATCH 0683/6226] nixos/nixseparatedebuginfod2: adapt to v1

several substituters are supported at the same time
---
 .../development/nixseparatedebuginfod2.nix    | 39 ++++++++++++-------
 nixos/tests/nixseparatedebuginfod2.nix        |  2 +-
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/nixos/modules/services/development/nixseparatedebuginfod2.nix b/nixos/modules/services/development/nixseparatedebuginfod2.nix
index 3cea2261ca1a..3fb49cea4f67 100644
--- a/nixos/modules/services/development/nixseparatedebuginfod2.nix
+++ b/nixos/modules/services/development/nixseparatedebuginfod2.nix
@@ -10,6 +10,11 @@ let
   url = "127.0.0.1:${toString cfg.port}";
 in
 {
+  imports = [
+    (lib.mkRemovedOptionModule [ "services" "nixseparatedebuginfod2" "substituter" ] ''
+      Instead of `services.nixseparatedebuginfod2.substituter = "foo"`, set `services.nixseparatedebuginfod2.substituters = [ "foo" ]` (possibly with mkForce to override the default value).
+    '')
+  ];
   options = {
     services.nixseparatedebuginfod2 = {
       enable = lib.mkEnableOption "nixseparatedebuginfod2, a debuginfod server providing source and debuginfo for nix packages";
@@ -19,11 +24,13 @@ in
         type = lib.types.port;
       };
       package = lib.mkPackageOption pkgs "nixseparatedebuginfod2" { };
-      substituter = lib.mkOption {
-        description = "nix substituter to fetch debuginfo from. Either http/https substituters, or `local:` to use debuginfo present in the local store.";
-        default = "https://cache.nixos.org";
-        example = "local:";
-        type = lib.types.str;
+      substituters = lib.mkOption {
+        description = "nix substituter to fetch debuginfo from. Either http/https/file substituters, or `local:` to use debuginfo present in the local store.";
+        default = [
+          "local:"
+          "https://cache.nixos.org"
+        ];
+        type = lib.types.listOf lib.types.str;
       };
       cacheExpirationDelay = lib.mkOption {
         description = "keep unused cache entries for this long. A number followed by a unit";
@@ -38,15 +45,19 @@ in
       path = [ config.nix.package ];
       serviceConfig = {
         ExecStart = [
-          (utils.escapeSystemdExecArgs [
-            (lib.getExe cfg.package)
-            "--listen-address"
-            url
-            "--substituter"
-            cfg.substituter
-            "--expiration"
-            cfg.cacheExpirationDelay
-          ])
+          (utils.escapeSystemdExecArgs (
+            [
+              (lib.getExe cfg.package)
+              "--listen-address"
+              url
+              "--expiration"
+              cfg.cacheExpirationDelay
+            ]
+            ++ (lib.lists.concatMap (s: [
+              "--substituter"
+              s
+            ]) cfg.substituters)
+          ))
         ];
         Restart = "on-failure";
         CacheDirectory = "nixseparatedebuginfod2";
diff --git a/nixos/tests/nixseparatedebuginfod2.nix b/nixos/tests/nixseparatedebuginfod2.nix
index 34741ac2fa71..a74f24bf2f22 100644
--- a/nixos/tests/nixseparatedebuginfod2.nix
+++ b/nixos/tests/nixseparatedebuginfod2.nix
@@ -32,7 +32,7 @@
   nodes.machine = {
     services.nixseparatedebuginfod2 = {
       enable = true;
-      substituter = "http://cache";
+      substituters = [ "http://cache" ];
     };
     environment.systemPackages = [
       pkgs.valgrind

From 7a131bebe7a54143739fbb717a31ed3353b96d45 Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Tue, 14 Oct 2025 12:00:00 +0000
Subject: [PATCH 0684/6226] nixseparatedebuginfod: remove

in favor of nixseparatedebuginfod2

Reuse the same port so that rebuilding to the new module does not need a
reboot to update the env var.
---
 nixos/modules/module-list.nix                 |   1 -
 nixos/modules/rename.nix                      |   3 +
 .../development/nixseparatedebuginfod.nix     | 106 ------------------
 .../development/nixseparatedebuginfod2.nix    |   2 +-
 nixos/tests/nixseparatedebuginfod.nix         |  83 --------------
 nixos/tests/nixseparatedebuginfod2.nix        |   2 +-
 .../ni/nixseparatedebuginfod/package.nix      |  52 ---------
 7 files changed, 5 insertions(+), 244 deletions(-)
 delete mode 100644 nixos/modules/services/development/nixseparatedebuginfod.nix
 delete mode 100644 nixos/tests/nixseparatedebuginfod.nix
 delete mode 100644 pkgs/by-name/ni/nixseparatedebuginfod/package.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 8f7f8ea44854..63f3fc1f67fc 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -598,7 +598,6 @@
   ./services/development/livebook.nix
   ./services/development/lorri.nix
   ./services/development/nixseparatedebuginfod2.nix
-  ./services/development/nixseparatedebuginfod.nix
   ./services/development/rstudio-server/default.nix
   ./services/development/vsmartcard-vpcd.nix
   ./services/development/zammad.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index a4ed680bd552..8db787e826c5 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -228,6 +228,9 @@ in
       "services.morty has been removed from NixOS. As the morty package was unmaintained and removed and searxng, its main consumer, dropped support for it."
     )
     (mkRemovedOptionModule [ "services" "mwlib" ] "The corresponding package was removed from nixpkgs.")
+    (mkRemovedOptionModule [ "services" "nixseparatedebuginfod" ]
+      "Use `services.nixseparatedebuginfod2.enable = true;` instead. If you only use the official binary cache, no additional configuration should be needed."
+    )
     (mkRemovedOptionModule [ "services" "pantheon" "files" ] ''
       This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly.
     '')
diff --git a/nixos/modules/services/development/nixseparatedebuginfod.nix b/nixos/modules/services/development/nixseparatedebuginfod.nix
deleted file mode 100644
index db16b052c65f..000000000000
--- a/nixos/modules/services/development/nixseparatedebuginfod.nix
+++ /dev/null
@@ -1,106 +0,0 @@
-{
-  pkgs,
-  lib,
-  config,
-  ...
-}:
-let
-  cfg = config.services.nixseparatedebuginfod;
-  url = "127.0.0.1:${toString cfg.port}";
-in
-{
-  options = {
-    services.nixseparatedebuginfod = {
-      enable = lib.mkEnableOption "separatedebuginfod, a debuginfod server providing source and debuginfo for nix packages";
-      port = lib.mkOption {
-        description = "port to listen";
-        default = 1949;
-        type = lib.types.port;
-      };
-      nixPackage = lib.mkOption {
-        type = lib.types.package;
-        default = pkgs.nix;
-        defaultText = lib.literalExpression "pkgs.nix";
-        description = ''
-          The version of nix that nixseparatedebuginfod should use as client for the nix daemon. It is strongly advised to use nix version >= 2.18, otherwise some debug info may go missing.
-        '';
-      };
-      allowOldNix = lib.mkOption {
-        type = lib.types.bool;
-        default = false;
-        description = ''
-          Do not fail evaluation when {option}`services.nixseparatedebuginfod.nixPackage` is older than nix 2.18.
-        '';
-      };
-    };
-  };
-  config = lib.mkIf cfg.enable {
-    assertions = [
-      {
-        assertion = cfg.allowOldNix || (lib.versionAtLeast cfg.nixPackage.version "2.18");
-        message = "nixseparatedebuginfod works better when `services.nixseparatedebuginfod.nixPackage` is set to nix >= 2.18 (instead of ${cfg.nixPackage.name}). Set `services.nixseparatedebuginfod.allowOldNix` to bypass.";
-      }
-    ];
-
-    systemd.services.nixseparatedebuginfod = {
-      wantedBy = [ "multi-user.target" ];
-      wants = [ "nix-daemon.service" ];
-      after = [ "nix-daemon.service" ];
-      path = [ cfg.nixPackage ];
-      serviceConfig = {
-        ExecStart = [ "${pkgs.nixseparatedebuginfod}/bin/nixseparatedebuginfod -l ${url}" ];
-        Restart = "on-failure";
-        CacheDirectory = "nixseparatedebuginfod";
-        # nix does not like DynamicUsers in allowed-users
-        User = "nixseparatedebuginfod";
-        Group = "nixseparatedebuginfod";
-
-        # hardening
-        # Filesystem stuff
-        ProtectSystem = "strict"; # Prevent writing to most of /
-        ProtectHome = true; # Prevent accessing /home and /root
-        PrivateTmp = true; # Give an own directory under /tmp
-        PrivateDevices = true; # Deny access to most of /dev
-        ProtectKernelTunables = true; # Protect some parts of /sys
-        ProtectControlGroups = true; # Remount cgroups read-only
-        RestrictSUIDSGID = true; # Prevent creating SETUID/SETGID files
-        PrivateMounts = true; # Give an own mount namespace
-        RemoveIPC = true;
-        UMask = "0077";
-
-        # Capabilities
-        CapabilityBoundingSet = ""; # Allow no capabilities at all
-        NoNewPrivileges = true; # Disallow getting more capabilities. This is also implied by other options.
-
-        # Kernel stuff
-        ProtectKernelModules = true; # Prevent loading of kernel modules
-        SystemCallArchitectures = "native"; # Usually no need to disable this
-        ProtectKernelLogs = true; # Prevent access to kernel logs
-        ProtectClock = true; # Prevent setting the RTC
-
-        # Networking
-        RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6";
-
-        # Misc
-        LockPersonality = true; # Prevent change of the personality
-        ProtectHostname = true; # Give an own UTS namespace
-        RestrictRealtime = true; # Prevent switching to RT scheduling
-        MemoryDenyWriteExecute = true; # Maybe disable this for interpreters like python
-        RestrictNamespaces = true;
-      };
-    };
-
-    users.users.nixseparatedebuginfod = {
-      isSystemUser = true;
-      group = "nixseparatedebuginfod";
-    };
-
-    users.groups.nixseparatedebuginfod = { };
-
-    nix.settings = lib.optionalAttrs (lib.versionAtLeast config.nix.package.version "2.4") {
-      extra-allowed-users = [ "nixseparatedebuginfod" ];
-    };
-
-    environment.debuginfodServers = [ "http://${url}" ];
-  };
-}
diff --git a/nixos/modules/services/development/nixseparatedebuginfod2.nix b/nixos/modules/services/development/nixseparatedebuginfod2.nix
index 3fb49cea4f67..c9174f61b1be 100644
--- a/nixos/modules/services/development/nixseparatedebuginfod2.nix
+++ b/nixos/modules/services/development/nixseparatedebuginfod2.nix
@@ -20,7 +20,7 @@ in
       enable = lib.mkEnableOption "nixseparatedebuginfod2, a debuginfod server providing source and debuginfo for nix packages";
       port = lib.mkOption {
         description = "port to listen";
-        default = 1950;
+        default = 1949;
         type = lib.types.port;
       };
       package = lib.mkPackageOption pkgs "nixseparatedebuginfod2" { };
diff --git a/nixos/tests/nixseparatedebuginfod.nix b/nixos/tests/nixseparatedebuginfod.nix
deleted file mode 100644
index 7399cb405c07..000000000000
--- a/nixos/tests/nixseparatedebuginfod.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{ pkgs, lib, ... }:
-let
-  secret-key = "key-name:/COlMSRbehSh6YSruJWjL+R0JXQUKuPEn96fIb+pLokEJUjcK/2Gv8Ai96D7JGay5gDeUTx5wdpPgNvum9YtwA==";
-  public-key = "key-name:BCVI3Cv9hr/AIveg+yRmsuYA3lE8ecHaT4Db7pvWLcA=";
-in
-{
-  name = "nixseparatedebuginfod";
-  # A binary cache with debug info and source for gnumake
-  nodes.cache =
-    { pkgs, ... }:
-    {
-      services.nix-serve = {
-        enable = true;
-        secretKeyFile = builtins.toFile "secret-key" secret-key;
-        openFirewall = true;
-      };
-      system.extraDependencies = [
-        pkgs.gnumake.debug
-        pkgs.gnumake.src
-        pkgs.sl
-      ];
-    };
-  # the machine where we need the debuginfo
-  nodes.machine = {
-    imports = [
-      ../modules/installer/cd-dvd/channel.nix
-    ];
-    services.nixseparatedebuginfod.enable = true;
-    nix.settings = {
-      substituters = lib.mkForce [ "http://cache:5000" ];
-      trusted-public-keys = [ public-key ];
-    };
-    environment.systemPackages = [
-      pkgs.valgrind
-      pkgs.gdb
-      pkgs.gnumake
-      (pkgs.writeShellScriptBin "wait_for_indexation" ''
-        set -x
-        while debuginfod-find debuginfo /run/current-system/sw/bin/make |& grep 'File too large'; do
-          sleep 1;
-        done
-      '')
-    ];
-  };
-  testScript = ''
-    start_all()
-    cache.wait_for_unit("nix-serve.service")
-    cache.wait_for_open_port(5000)
-    machine.wait_for_unit("nixseparatedebuginfod.service")
-    machine.wait_for_open_port(1949)
-
-    with subtest("show the config to debug the test"):
-      machine.succeed("nix --extra-experimental-features nix-command show-config |& logger")
-      machine.succeed("cat /etc/nix/nix.conf |& logger")
-    with subtest("check that the binary cache works"):
-      machine.succeed("nix-store -r ${pkgs.sl}")
-
-    # nixseparatedebuginfod needs .drv to associate executable -> source
-    # on regular systems this would be provided by nixos-rebuild
-    machine.succeed("nix-instantiate '<nixpkgs>' -A gnumake")
-
-    machine.succeed("timeout 600 wait_for_indexation")
-
-    # test debuginfod-find
-    machine.succeed("debuginfod-find debuginfo /run/current-system/sw/bin/make")
-
-    # test that gdb can fetch source
-    out = machine.succeed("gdb /run/current-system/sw/bin/make --batch -x ${builtins.toFile "commands" ''
-      start
-      l
-    ''}")
-    print(out)
-    assert 'main (int argc, char **argv, char **envp)' in out
-
-    # test that valgrind can display location information
-    # this relies on the fact that valgrind complains about gnumake
-    # because we also ask valgrind to show leak kinds
-    # which are usually false positives.
-    out = machine.succeed("valgrind --leak-check=full --show-leak-kinds=all make --version 2>&1")
-    print(out)
-    assert 'main.c' in out
-  '';
-}
diff --git a/nixos/tests/nixseparatedebuginfod2.nix b/nixos/tests/nixseparatedebuginfod2.nix
index a74f24bf2f22..aa35a91971e8 100644
--- a/nixos/tests/nixseparatedebuginfod2.nix
+++ b/nixos/tests/nixseparatedebuginfod2.nix
@@ -45,7 +45,7 @@
     cache.wait_for_unit("nginx.service")
     cache.wait_for_open_port(80)
     machine.wait_for_unit("nixseparatedebuginfod2.service")
-    machine.wait_for_open_port(1950)
+    machine.wait_for_open_port(1949)
 
     with subtest("check that the binary cache works"):
       machine.succeed("nix-store --extra-substituters http://cache --option require-sigs false -r ${pkgs.sl}")
diff --git a/pkgs/by-name/ni/nixseparatedebuginfod/package.nix b/pkgs/by-name/ni/nixseparatedebuginfod/package.nix
deleted file mode 100644
index 6d518ff985f4..000000000000
--- a/pkgs/by-name/ni/nixseparatedebuginfod/package.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  rustPlatform,
-  libarchive,
-  openssl,
-  rust-jemalloc-sys,
-  sqlite,
-  pkg-config,
-  nixosTests,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "nixseparatedebuginfod";
-  version = "0.4.0";
-
-  src = fetchFromGitHub {
-    owner = "symphorien";
-    repo = "nixseparatedebuginfod";
-    rev = "v${version}";
-    hash = "sha256-sVQ6UgQvSTEIxXPxISeTI9tqAdJlxQpLxq1h4I31r6k=";
-  };
-
-  cargoHash = "sha256-vaCmRr1hXF0BSg/dl3LYyd7c1MdPKIv6KgDgGEzqqJQ=";
-
-  # tests need a working nix install with access to the internet
-  doCheck = false;
-
-  buildInputs = [
-    libarchive
-    openssl
-    rust-jemalloc-sys
-    sqlite
-  ];
-
-  nativeBuildInputs = [ pkg-config ];
-
-  passthru = {
-    tests = {
-      inherit (nixosTests) nixseparatedebuginfod;
-    };
-  };
-
-  meta = with lib; {
-    description = "Downloads and provides debug symbols and source code for nix derivations to gdb and other debuginfod-capable debuggers as needed";
-    homepage = "https://github.com/symphorien/nixseparatedebuginfod";
-    license = licenses.gpl3Only;
-    maintainers = [ maintainers.symphorien ];
-    platforms = platforms.linux;
-    mainProgram = "nixseparatedebuginfod";
-  };
-}

From de8de87be2596a05803360f4ca9db86920651c7c Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Tue, 14 Oct 2025 12:00:00 +0000
Subject: [PATCH 0685/6226] add release notes for the migration
 nixseparatedebuginfod{,2}

---
 nixos/doc/manual/release-notes/rl-2511.section.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index c652b9f2b6ab..d98862b37b6c 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -228,6 +228,8 @@
 
 - The `yeahwm` package and `services.xserver.windowManager.yeahwm` module were removed due to the package being broken and unmaintained upstream.
 
+- `services.nixseparatedebuginfod.enable = true;` has been replaced by `services.nixseparatedebuginfod2.enable = true`. If you only use the official binary cache `https://cache.nixos.org` then no further configuration should be needed. If you have other https substituters, you can add them to `services.nixseparatedebuginfod2.subsituters`. SSH substituters are not supported by nixseparatedebuginfod2. Consider running nixseparatedebuginfod2 on the substituter instead, and pointing to it with the new option `environment.debuginfodServers`.
+
 - The `services.snapserver` module has been migrated to use the settings option and render a configuration file instead of passing every option over the command line.
 
 - The `services.meilisearch` module now always defaults to the latest version of meilisearch, as the previous `meilisearch_1_11` package was removed. This is only an issue if you were using the old version.

From 19d4e0f4b3ae9e1d9fdddaf4ee55ab22f006b7ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Oct 2025 20:43:01 +0000
Subject: [PATCH 0686/6226] phpPackages.phpstan: 2.1.29 -> 2.1.31

---
 pkgs/development/php-packages/phpstan/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/php-packages/phpstan/default.nix b/pkgs/development/php-packages/phpstan/default.nix
index 85e6dbd38bb9..b4126b588bb6 100644
--- a/pkgs/development/php-packages/phpstan/default.nix
+++ b/pkgs/development/php-packages/phpstan/default.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpstan";
-  version = "2.1.29";
+  version = "2.1.31";
 
   src = fetchFromGitHub {
     owner = "phpstan";
     repo = "phpstan-src";
     tag = finalAttrs.version;
-    hash = "sha256-8HPMXJ64qkV6fXfdr6fZTp2m1EhcWiq0cE51VQHuyro=";
+    hash = "sha256-vQTZ59qEqZYLoh8eAX+wqBvLTHKTvMIOkFDfuEG9k9M=";
   };
 
-  vendorHash = "sha256-mSlxWkqhniphYUOjE0zucOqN9gKe3Th0GEikB7DyYVY=";
+  vendorHash = "sha256-ysGcIpsYpZSuysG5Fw5IVSyO/GSnAkF79GnPF8Dttpk=";
   composerStrictValidation = false;
 
   doInstallCheck = true;

From 9daa17df884ec37a4ce843084c55e49ca08418b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Oct 2025 22:03:04 +0000
Subject: [PATCH 0687/6226] python3Packages.livekit-protocol: 1.0.6 -> 1.0.8

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

diff --git a/pkgs/development/python-modules/livekit-protocol/default.nix b/pkgs/development/python-modules/livekit-protocol/default.nix
index 744f9fe7dc49..3b2f521e066d 100644
--- a/pkgs/development/python-modules/livekit-protocol/default.nix
+++ b/pkgs/development/python-modules/livekit-protocol/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "livekit-protocol";
-  version = "1.0.6";
+  version = "1.0.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "python-sdks";
     tag = "protocol-v${version}";
-    hash = "sha256-Sl/pAwiCS7sAY8VHJzSqm/Mj92NsO5NLuxQ/Y5GnaAw=";
+    hash = "sha256-3RdUvxGOopgakwkoWc+IMW2QUZuZLF908KtFo1f0Nqo=";
   };
 
   pypaBuildFlags = [ "livekit-protocol" ];

From 4b7f1548ed2432b172dc33a195216ca537301a5c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Oct 2025 22:05:59 +0000
Subject: [PATCH 0688/6226] upcloud-cli: 3.23.0 -> 3.24.1

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

diff --git a/pkgs/by-name/up/upcloud-cli/package.nix b/pkgs/by-name/up/upcloud-cli/package.nix
index 7d5240c0c754..de250cc13890 100644
--- a/pkgs/by-name/up/upcloud-cli/package.nix
+++ b/pkgs/by-name/up/upcloud-cli/package.nix
@@ -9,16 +9,16 @@
 
 buildGo125Module (finalAttrs: {
   pname = "upcloud-cli";
-  version = "3.23.0";
+  version = "3.24.1";
 
   src = fetchFromGitHub {
     owner = "UpCloudLtd";
     repo = "upcloud-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oATz3ZvOeFT0wJ7R69cleGdpD9ICWQVOINKelJguBR4=";
+    hash = "sha256-D9IF3yS0c4QxLbEE1ix8ann69Bhsbs24W79crVe//XI=";
   };
 
-  vendorHash = "sha256-Q/FokLGjc65ptbouRT5L0bxPIzzctTo87oFu9qd/NHs=";
+  vendorHash = "sha256-biRfhrlCI1JvXx9739yNlYXPgTaBslZ7OSleWLAaOzA=";
 
   ldflags = [
     "-s -w -X github.com/UpCloudLtd/upcloud-cli/v3/internal/config.Version=${finalAttrs.version}"

From b4f154a7589b4db611f05fbc5740a70ab44a200e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 14 Oct 2025 23:07:20 +0000
Subject: [PATCH 0689/6226] schismtracker: 20250825 -> 20251014

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

diff --git a/pkgs/by-name/sc/schismtracker/package.nix b/pkgs/by-name/sc/schismtracker/package.nix
index 71b91caff5ec..20aebff2afff 100644
--- a/pkgs/by-name/sc/schismtracker/package.nix
+++ b/pkgs/by-name/sc/schismtracker/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "schismtracker";
-  version = "20250825";
+  version = "20251014";
 
   src = fetchFromGitHub {
     owner = "schismtracker";
     repo = "schismtracker";
     tag = version;
-    hash = "sha256-R1u0ZIWt4sG9cVhG9WhLdYVwAy7u62AT7E4ZwiTw1rY=";
+    hash = "sha256-N1wCOR7Su3PllzrffkwB6LfhZlol1/4dVegySzJlH28=";
   };
 
   # If we let it try to get the version from git, it will fail and fall back

From fbe127d6418372cfcfbd080fe0a2ecc0e7aeb626 Mon Sep 17 00:00:00 2001
From: Spencer Heywood <github@heywoodlh.io>
Date: Tue, 14 Oct 2025 14:12:17 -0600
Subject: [PATCH 0690/6226] k3s: add intel gpu docs

---
 .../networking/cluster/k3s/README.md          |   1 +
 .../cluster/k3s/docs/examples/INTEL.md        | 168 ++++++++++++++++++
 2 files changed, 169 insertions(+)
 create mode 100644 pkgs/applications/networking/cluster/k3s/docs/examples/INTEL.md

diff --git a/pkgs/applications/networking/cluster/k3s/README.md b/pkgs/applications/networking/cluster/k3s/README.md
index dcc2bffcc69e..7ad2a4be131f 100644
--- a/pkgs/applications/networking/cluster/k3s/README.md
+++ b/pkgs/applications/networking/cluster/k3s/README.md
@@ -9,6 +9,7 @@ K3s is a simplified [Kubernetes](https://wiki.nixos.org/wiki/Kubernetes) version
 ## Configuration Examples
 
 * [Nvidia GPU Passthru](docs/examples/NVIDIA.md)
+* [Intel GPU Passthru](docs/examples/INTEL.md)
 * [Storage Examples](docs/examples/STORAGE.md)
 
 ## Cluster Maintenance and Troubleshooting
diff --git a/pkgs/applications/networking/cluster/k3s/docs/examples/INTEL.md b/pkgs/applications/networking/cluster/k3s/docs/examples/INTEL.md
new file mode 100644
index 000000000000..467208b44457
--- /dev/null
+++ b/pkgs/applications/networking/cluster/k3s/docs/examples/INTEL.md
@@ -0,0 +1,168 @@
+# Intel GPU Support in k3s
+
+This article makes the following assumptions:
+1. `services.k3s.enable` is already set to true
+2. The Linux kernel running is modern enough to support your GPU out of the box
+3. The desired driver is `i915` -- modify as needed for other drivers
+
+> Note: at the time of writing, the author was using an Intel Arc A770 in k3s. The majority of this guide likely should work on other Kubernetes distributions, and will likely work identically for integrated graphics capabilities.
+
+### Enable the Intel driver in NixOS
+
+Add the following NixOS configuration to enable the Intel driver (necessary on headless deployments):
+
+```
+services.xserver.videoDrivers = [ "i915" ];
+```
+
+After rebuilding the configuration, reboot the host for the GPU driver to be assigned to the GPU. Use the following command to ensure the GPU is using the i915 kernel:
+
+```
+sudo lspci -k
+```
+
+i.e. the output looks like this on a host with the Intel Arc A770:
+
+```
+❯ sudo lspci -k | grep -A 3 'Arc'
+03:00.0 VGA compatible controller: Intel Corporation DG2 [Arc A770] (rev 08)
+        Subsystem: ASRock Incorporation Device 6010
+        Kernel driver in use: i915
+        Kernel modules: i915, xe
+```
+
+## Install Intel Node Feature Discovery (NFD) in k3s
+
+Intel's device plugin for kubernetes provides Node Feature Discovery (NFD). NFD allows for GPU capabilities on a node to be automatically discovered if a discrete GPU is installed and the Intel drivers have been properly assigned.
+
+> Documentation for Intel NFD installation is here for reference: [Install with NFD](https://intel.github.io/intel-device-plugins-for-kubernetes/cmd/gpu_plugin/README.html#install-with-nfd)
+
+The following commands will install NFD in the cluster (assumes `curl`, `jq` and `kubectl` are all installed/configured):
+
+```
+# Use the latest release
+export LATEST_RELEASE=$(curl -s https://api.github.com/repos/intel/intel-device-plugins-for-kubernetes/releases/latest | jq -r '.tag_name')
+
+# Use Kustomize to deploy the configuration
+kubectl apply -k "https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/nfd?ref=$LATEST_RELEASE"
+kubectl apply -k "https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/nfd/overlays/node-feature-rules?ref=$LATEST_RELEASE"
+kubectl apply -k "https://github.com/intel/intel-device-plugins-for-kubernetes/deployments/gpu_plugin/overlays/nfd_labeled_nodes?ref=$LATEST_RELEASE"
+```
+
+NFD should automatically apply relevant labels to your node. This can be verified with the following command:
+
+```
+kubectl get nodes -o yaml | grep gpu.intel.com | sort -u
+```
+
+Output should look similar to the following:
+
+```
+❯ kubectl get nodes -o yaml | grep gpu.intel.com | sort -u
+      gpu.intel.com/device-id.0300-56a0.count: "1"
+      gpu.intel.com/device-id.0300-56a0.present: "true"
+      gpu.intel.com/family: A_Series
+      gpu.intel.com/i915: "1"
+      gpu.intel.com/i915_monitoring: "0"
+      nfd.node.kubernetes.io/feature-labels: gpu.intel.com/device-id.0300-56a0.count,gpu.intel.com/device-id.0300-56a0.present,gpu.intel.com/family,intel.feature.node.kubernetes.io/gpu
+```
+
+> Note: `gpu.intel.com/i915: "1"` indicates only one pod can use the GPU -- see below for a fix.
+
+Now, GPU-enabled pods can be run with this configuration:
+
+```
+spec:
+  containers:
+    resources:
+      requests:
+        gpu.intel.com/i915: "1"
+      limits:
+        gpu.intel.com/i915: "1"
+```
+
+### Allowing more than one pod to use the GPU
+
+In the default configuration, only one pod can use the GPU. To enable multiple pods to use the GPU, apply the following Kustomize patch:
+
+```
+patches:
+- target:
+    kind: DaemonSet
+    name: intel-gpu-plugin
+  patch: |
+    - op: add
+      path: /spec/template/spec/containers/0/args
+      value:
+        - -shared-dev-num=10
+```
+
+Or, manually edit the `intel-gpu-plugin` DaemonSet to run with `-shared-dev-num=10` (or however many max pods can access the GPU), like so:
+
+```
+apiVersion: apps/v1
+kind: DaemonSet
+metadata:
+  name: intel-gpu-plugin
+spec:
+    spec:
+      containers:
+      - args:
+        - -shared-dev-num=10
+```
+
+Verify the number has been applied like so:
+
+```
+kubectl get nodes -o yaml | grep gpu.intel.com/i915 | sort -u
+```
+
+i.e. in this configuration, up to 10 pods can use the GPU:
+
+```
+❯ kubectl get nodes -o yaml | grep gpu.intel.com/i915 | sort -u
+    gpu.intel.com/i915: "10"
+```
+
+### Test pod
+
+This is a complete pod configuration for reference/testing:
+
+```
+---
+apiVersion: v1
+kind: Pod
+metadata:
+  name: intel-gpu-test
+  namespace: default
+spec:
+  containers:
+  - name: intel-gpu-test
+    image: docker.io/ubuntu:24.04
+    command: [ "/bin/bash", "-c", "--" ]
+    args: [ "while true; do sleep 30; done;" ]
+    resources:
+      requests:
+        gpu.intel.com/i915: "1"
+      limits:
+        gpu.intel.com/i915: "1"
+```
+
+Once the pod is running, use the following command to test that the GPU is available:
+
+```
+kubectl exec -n default -it pod/intel-gpu-test -- ls /dev/dri
+```
+
+If the GPU is available, the output will look like the following:
+
+```
+❯ kubectl exec -n default -it pod/intel-gpu-test -- ls /dev/dri
+by-path  card1  renderD128
+```
+
+Delete the pod so as to not count against the GPU limit:
+
+```
+kubectl delete -n default pod/intel-gpu-test
+```

From 644fa8a22e430448dde1f7fd43b2df47b9032503 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Oct 2025 00:28:15 +0000
Subject: [PATCH 0691/6226] rsyslog: 8.2508.0 -> 8.2510.0

---
 pkgs/tools/system/rsyslog/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/system/rsyslog/default.nix b/pkgs/tools/system/rsyslog/default.nix
index 92bfd09fef2a..d5e18a1a8c2a 100644
--- a/pkgs/tools/system/rsyslog/default.nix
+++ b/pkgs/tools/system/rsyslog/default.nix
@@ -62,11 +62,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rsyslog";
-  version = "8.2508.0";
+  version = "8.2510.0";
 
   src = fetchurl {
     url = "https://www.rsyslog.com/files/download/rsyslog/${pname}-${version}.tar.gz";
-    hash = "sha256-yJsedNNtDKSpW3Shq+Nu0LH6rIt8i+RxqEFc+ndiBv0=";
+    hash = "sha256-pwqYNBhoWVOaak0cez9owjiX6AWCm3ZKRekssMyV5mo=";
   };
 
   nativeBuildInputs = [

From 51d178588a4f74315fffa592e3b237597d37b231 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Oct 2025 02:36:34 +0000
Subject: [PATCH 0692/6226] kazumi: 1.7.8 -> 1.8.4

---
 pkgs/by-name/ka/kazumi/gitHashes.json    | 18 ++++----
 pkgs/by-name/ka/kazumi/package.nix       |  4 +-
 pkgs/by-name/ka/kazumi/pubspec.lock.json | 52 ++++++++++++------------
 3 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/pkgs/by-name/ka/kazumi/gitHashes.json b/pkgs/by-name/ka/kazumi/gitHashes.json
index 8bd6c1ed1720..86b1353b07cd 100644
--- a/pkgs/by-name/ka/kazumi/gitHashes.json
+++ b/pkgs/by-name/ka/kazumi/gitHashes.json
@@ -1,12 +1,12 @@
 {
   "desktop_webview_window": "sha256-l5n57iKLgsH4TaBYRaTDEPznzljI0jfOGcvxyYcIW6M=",
-  "media_kit": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
-  "media_kit_libs_android_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
-  "media_kit_libs_ios_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
-  "media_kit_libs_linux": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
-  "media_kit_libs_macos_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
-  "media_kit_libs_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
-  "media_kit_libs_windows_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
-  "media_kit_video": "sha256-N6QoktM8u9NYF8MAXLsxM9RlV8nICM4NbnmABHTRkZg=",
-  "webview_windows": "sha256-9oWTvEoFeF7djEVA3PSM72rOmOMUhV8ZYuV6+RreNzE="
+  "media_kit": "sha256-Z/VqTp3ch1G8TvTw0lxhaGN8peK0X2kulPgPFvjWjt8=",
+  "media_kit_libs_android_video": "sha256-Z/VqTp3ch1G8TvTw0lxhaGN8peK0X2kulPgPFvjWjt8=",
+  "media_kit_libs_ios_video": "sha256-Z/VqTp3ch1G8TvTw0lxhaGN8peK0X2kulPgPFvjWjt8=",
+  "media_kit_libs_linux": "sha256-Z/VqTp3ch1G8TvTw0lxhaGN8peK0X2kulPgPFvjWjt8=",
+  "media_kit_libs_macos_video": "sha256-Z/VqTp3ch1G8TvTw0lxhaGN8peK0X2kulPgPFvjWjt8=",
+  "media_kit_libs_video": "sha256-Z/VqTp3ch1G8TvTw0lxhaGN8peK0X2kulPgPFvjWjt8=",
+  "media_kit_libs_windows_video": "sha256-Z/VqTp3ch1G8TvTw0lxhaGN8peK0X2kulPgPFvjWjt8=",
+  "media_kit_video": "sha256-Z/VqTp3ch1G8TvTw0lxhaGN8peK0X2kulPgPFvjWjt8=",
+  "webview_windows": "sha256-4QUctMjeu4fPPJz4X37ZpPn4aHrPuctX0U+wSufQGsQ="
 }
diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix
index eac537c20731..e1e6162582bd 100644
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@@ -17,13 +17,13 @@
 }:
 
 let
-  version = "1.7.8";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "Predidit";
     repo = "Kazumi";
     tag = version;
-    hash = "sha256-EHrTI+jy8ryvGwLUJNVbYlinKsBxh12zboHqpiGuRk0=";
+    hash = "sha256-Porwr8lrw8jRfpCF2vyWvk+CpO2rWmnBftoV42OCqCY=";
   };
 in
 flutter335.buildFlutterApplication {
diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json
index adde10461b70..723fc6bce211 100644
--- a/pkgs/by-name/ka/kazumi/pubspec.lock.json
+++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json
@@ -969,8 +969,8 @@
       "dependency": "direct main",
       "description": {
         "path": "media_kit",
-        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
-        "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
+        "ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
+        "resolved-ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -980,8 +980,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/android/media_kit_libs_android_video",
-        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
-        "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
+        "ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
+        "resolved-ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -991,8 +991,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/ios/media_kit_libs_ios_video",
-        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
-        "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
+        "ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
+        "resolved-ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1002,8 +1002,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/linux/media_kit_libs_linux",
-        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
-        "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
+        "ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
+        "resolved-ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1013,8 +1013,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/macos/media_kit_libs_macos_video",
-        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
-        "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
+        "ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
+        "resolved-ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1024,8 +1024,8 @@
       "dependency": "direct main",
       "description": {
         "path": "libs/universal/media_kit_libs_video",
-        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
-        "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
+        "ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
+        "resolved-ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1035,8 +1035,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/windows/media_kit_libs_windows_video",
-        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
-        "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
+        "ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
+        "resolved-ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1046,8 +1046,8 @@
       "dependency": "direct main",
       "description": {
         "path": "media_kit_video",
-        "ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
-        "resolved-ref": "ad84c59faa2b871926cb31516bdeec65d7676884",
+        "ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
+        "resolved-ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1417,11 +1417,11 @@
       "dependency": "transitive",
       "description": {
         "name": "screen_brightness_android",
-        "sha256": "fb5fa43cb89d0c9b8534556c427db1e97e46594ac5d66ebdcf16063b773d54ed",
+        "sha256": "d34f5321abd03bc3474f4c381f53d189117eba0b039eac1916aa92cca5fd0a96",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.3"
     },
     "screen_brightness_ios": {
       "dependency": "transitive",
@@ -2013,21 +2013,21 @@
       "dependency": "transitive",
       "description": {
         "name": "volume_controller",
-        "sha256": "c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e",
+        "sha256": "d75039e69c0d90e7810bfd47e3eedf29ff8543ea7a10392792e81f9bded7edf5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.8"
+      "version": "3.4.0"
     },
     "wakelock_plus": {
       "dependency": "transitive",
       "description": {
         "name": "wakelock_plus",
-        "sha256": "a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678",
+        "sha256": "61713aa82b7f85c21c9f4cd0a148abd75f38a74ec645fcb1e446f882c82fd09b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.3.3"
     },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
@@ -2134,7 +2134,7 @@
       "description": {
         "path": ".",
         "ref": "main",
-        "resolved-ref": "a32d483f4416628f1f6630592c0633f1f7c1d625",
+        "resolved-ref": "0ce605b21d2389b1d35d86d052b756aab2fdb9e7",
         "url": "https://github.com/Predidit/flutter-webview-windows.git"
       },
       "source": "git",
@@ -2164,11 +2164,11 @@
       "dependency": "direct main",
       "description": {
         "name": "window_manager",
-        "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059",
+        "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.3"
+      "version": "0.5.1"
     },
     "xdg_directories": {
       "dependency": "transitive",
@@ -2223,6 +2223,6 @@
   },
   "sdks": {
     "dart": ">=3.8.0 <4.0.0",
-    "flutter": ">=3.35.3"
+    "flutter": ">=3.35.5"
   }
 }

From 7710fa4df366a0f2e0ac723a375d0872123cba98 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Oct 2025 02:48:06 +0000
Subject: [PATCH 0693/6226] zsv: 0.4.4-alpha -> 1.0.0

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

diff --git a/pkgs/by-name/zs/zsv/package.nix b/pkgs/by-name/zs/zsv/package.nix
index b057b2d47c2a..238adbef4db5 100644
--- a/pkgs/by-name/zs/zsv/package.nix
+++ b/pkgs/by-name/zs/zsv/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zsv";
-  version = "0.4.4-alpha";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "liquidaty";
     repo = "zsv";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-XZE7jMQaPP2B1OIlkHucNrtiJy8wMEVY9gcc5X4FyNI=";
+    hash = "sha256-o5n6pUMdirtNsLAi17+sp0xteFCfFUcr2k8q57pTW2A=";
   };
 
   nativeBuildInputs = [ perl ];

From 511029823177b7b8334c1f4dd9473d00816e2e13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Oct 2025 04:14:57 +0000
Subject: [PATCH 0694/6226] gitkraken: 11.5.0 -> 11.5.1

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

diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix
index 7c3be78fd642..f5eaf100d71d 100644
--- a/pkgs/by-name/gi/gitkraken/package.nix
+++ b/pkgs/by-name/gi/gitkraken/package.nix
@@ -56,24 +56,24 @@
 
 let
   pname = "gitkraken";
-  version = "11.5.0";
+  version = "11.5.1";
 
   throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}";
 
   srcs = {
     x86_64-linux = fetchzip {
       url = "https://api.gitkraken.dev/releases/production/linux/x64/${version}/gitkraken-amd64.tar.gz";
-      hash = "sha256-QNFNUVuslQ8ezDakqIPLMx6oSqS3K7VKu+Sm99d2d1E=";
+      hash = "sha256-ctwkU8AWCuOKFetgCIPp6npk1ZO8ozfELrRp4PR3Xjs=";
     };
 
     x86_64-darwin = fetchzip {
       url = "https://api.gitkraken.dev/releases/production/darwin/x64/${version}/GitKraken-v${version}.zip";
-      hash = "sha256-NEy7hssChI3F62XQwHq3ENbTUrhXdtovCYxQQp4NLEU=";
+      hash = "sha256-7wXpMwFGQeLgT7ObrZ5nUd84jzVArAIQ8vgp+fYDgsw=";
     };
 
     aarch64-darwin = fetchzip {
       url = "https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip";
-      hash = "sha256-ANHz+C5XMNEWy4x1btdg4XnhTOvWBVVoS/XpE5beW0w=";
+      hash = "sha256-YkY6izRicIapNF9yMCL+YHJoxrWDdVwrcpj8N99tQCs=";
     };
   };
 

From 53eb2ecc5472edff2620a35ddf75210412d91cde Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Oct 2025 05:03:47 +0000
Subject: [PATCH 0695/6226] networkmanager-iodine: 1.2.0-unstable-2025-09-06 ->
 1.2.0-unstable-2025-10-11

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

diff --git a/pkgs/by-name/ne/networkmanager-iodine/package.nix b/pkgs/by-name/ne/networkmanager-iodine/package.nix
index 423a68a9392b..084775b41a6f 100644
--- a/pkgs/by-name/ne/networkmanager-iodine/package.nix
+++ b/pkgs/by-name/ne/networkmanager-iodine/package.nix
@@ -18,14 +18,14 @@
 
 stdenv.mkDerivation {
   pname = "NetworkManager-iodine${lib.optionalString withGnome "-gnome"}";
-  version = "1.2.0-unstable-2025-09-06";
+  version = "1.2.0-unstable-2025-10-11";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "network-manager-iodine";
-    rev = "2a630d5c492521378160882864eb88277f6315cb";
-    sha256 = "vSvvJVWtV+BHM3rDtgUWYlIOfhP80J3uDHPMwd0vvbM=";
+    rev = "ad266003aa74ddba1d22259b213a7f9c996e1cd4";
+    sha256 = "OoJRkU4POW9RajwW05xYPlkodXqytq89GTbJuoLxebY=";
   };
 
   patches = [

From 9d8f8d668c094527948b209741d99cffccc1ef6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Wed, 15 Oct 2025 07:40:56 +0200
Subject: [PATCH 0696/6226] python3Packages.setproctitle: fix darwin build

Some tests got re-enabled in https://github.com/NixOS/nixpkgs/pull/444696, but one of them fails on Darwin: https://github.com/dvarrazzo/py-setproctitle/blob/master/tests/setproctitle_test.py#L73C5-L73C29

I couldn't figure out the root cause, maybe it has to do with the Nix builder environment or the nixbld user running the tests? I verified that the library works when invoked from a Nix shell by a regular user.
---
 pkgs/development/python-modules/setproctitle/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix
index fdb412cb499e..aa1211029abb 100644
--- a/pkgs/development/python-modules/setproctitle/default.nix
+++ b/pkgs/development/python-modules/setproctitle/default.nix
@@ -5,6 +5,7 @@
   setuptools,
   pytestCheckHook,
   procps,
+  stdenv,
 }:
 
 buildPythonPackage rec {
@@ -26,6 +27,9 @@ buildPythonPackage rec {
     procps
   ];
 
+  # Setting the process title fails on macOS in the Nix builder environment (regardless of sandboxing)
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_setproctitle_darwin" ];
+
   pythonImportsCheck = [ "setproctitle" ];
 
   meta = {

From 9b88db68bc77399211bbe0730d9632e2ac0b7d3d Mon Sep 17 00:00:00 2001
From: xbreak <xbreak@users.noreply.github.com>
Date: Thu, 9 Oct 2025 16:13:09 +0200
Subject: [PATCH 0697/6226] cfitsio: 4.6.2 -> 4.6.3

---
 pkgs/by-name/cf/cfitsio/package.nix | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/cf/cfitsio/package.nix b/pkgs/by-name/cf/cfitsio/package.nix
index 7d97bb020849..e26469e27af1 100644
--- a/pkgs/by-name/cf/cfitsio/package.nix
+++ b/pkgs/by-name/cf/cfitsio/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   gitUpdater,
   cmake,
   bzip2,
@@ -12,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cfitsio";
-  version = "4.6.2";
+  version = "4.6.3";
 
   src = fetchFromGitHub {
     owner = "HEASARC";
-    repo = finalAttrs.pname;
-    tag = "${finalAttrs.pname}-${finalAttrs.version}";
-    hash = "sha256-WLsX23hNhaITjCvMEV7NUEvyDfQiObSJt1qFC12z7wY=";
+    repo = "cfitsio";
+    tag = "cfitsio-${finalAttrs.version}";
+    hash = "sha256-nKxX3YNRJZpmcP8/0O2pMsYjcH6vzAWMpqaHYO+HoUo=";
   };
 
   outputs = [
@@ -30,12 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./cfitsio-pc-cmake.patch
-
-    (fetchpatch {
-      name = "cfitsio-fix-cmake-4.patch";
-      url = "https://github.com/HEASARC/cfitsio/commit/101e0880fca41e2223df7eec56d9e84e90b9ed56.patch";
-      hash = "sha256-rufuqOBfE7ItTYwsGdu9G4BXSz4vZd52XmJi09kqrCM=";
-    })
   ];
 
   nativeBuildInputs = [

From 37b28dcc9d68879202797b04d9293a97b3b432a1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 15 Oct 2025 08:15:28 +0000
Subject: [PATCH 0698/6226] singularity: 4.3.3 -> 4.3.4

Diff: https://github.com/sylabs/singularity/compare/v4.3.3...v4.3.4

Changelog: https://github.com/sylabs/singularity/releases/tag/v4.3.4
---
 pkgs/applications/virtualization/singularity/packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix
index a554dbc68ea4..4b2bc23b0200 100644
--- a/pkgs/applications/virtualization/singularity/packages.nix
+++ b/pkgs/applications/virtualization/singularity/packages.nix
@@ -46,19 +46,19 @@ let
     callPackage
       (import ./generic.nix rec {
         pname = "singularity-ce";
-        version = "4.3.3";
+        version = "4.3.4";
         projectName = "singularity";
 
         src = fetchFromGitHub {
           owner = "sylabs";
           repo = "singularity";
           tag = "v${version}";
-          hash = "sha256-gQuakfQgB5gLVYLmmThy06CyGBhlBOCJI9jaEm7ucf0=";
+          hash = "sha256-+KW9XaYXNzOpUier8FJ4lbKx7uJ8jNKHkt2QX2Kiehs=";
         };
 
         # Override vendorHash with overrideAttrs.
         # See https://nixos.org/manual/nixpkgs/unstable/#buildGoModule-vendorHash
-        vendorHash = "sha256-z8bLbudm1b5xFCAUpL/m90vxwLJlBqpQCjAEjSYOQH8=";
+        vendorHash = "sha256-JCRUhY00Zj6rlmyDW+RKoGNKhmxesgHn9XdO8h2DAj4=";
 
         extraConfigureFlags = [
           # Do not build squashfuse from the Git submodule sources, use Nixpkgs provided version

From a95be49673155a1f4244eb00ed4d3d215c7781bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Oct 2025 08:40:01 +0000
Subject: [PATCH 0699/6226] grafanaPlugins.grafana-pyroscope-app: 1.8.1 ->
 1.10.1

---
 .../grafana/plugins/grafana-pyroscope-app/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix
index fd2ec7dbff1e..93d24f61d4e5 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-pyroscope-app";
-  version = "1.8.1";
-  zipHash = "sha256-dAjvcWUtk518lx4eHalJJxUVSna9+A/Ow9mmsrBX+nQ=";
+  version = "1.10.1";
+  zipHash = "sha256-Q9dzJGXLKGVVDwDF/D4FkrZb4ri6RmUW7usB7eYXcBo=";
   meta = with lib; {
     description = "Integrate seamlessly with Pyroscope, the open-source continuous profiling platform, providing a smooth, query-less experience for browsing and analyzing profiling data";
     license = licenses.agpl3Only;

From f994ecf6482d4acfb08098f5945b417606db0b80 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Oct 2025 08:48:55 +0000
Subject: [PATCH 0700/6226] gcs: 5.39.0 -> 5.41.1

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

diff --git a/pkgs/by-name/gc/gcs/package.nix b/pkgs/by-name/gc/gcs/package.nix
index b08444957347..3a8641224673 100644
--- a/pkgs/by-name/gc/gcs/package.nix
+++ b/pkgs/by-name/gc/gcs/package.nix
@@ -19,13 +19,13 @@
 
 buildGoModule rec {
   pname = "gcs";
-  version = "5.39.0";
+  version = "5.41.1";
 
   src = fetchFromGitHub {
     owner = "richardwilkes";
     repo = "gcs";
     tag = "v${version}";
-    hash = "sha256-R0IFIGDSpKxNmcDUMVdtKV+M3I8tglBhyHj5XXe2rjg=";
+    hash = "sha256-PPlz3DRwkKN0nZSFKJvl/axow6LxqyA3JPzZmfEkIsM=";
   };
 
   modPostBuild = ''
@@ -33,7 +33,7 @@ buildGoModule rec {
     sed -i 's|-lmupdf[^ ]* |-lmupdf |g' vendor/github.com/richardwilkes/pdf/pdf.go
   '';
 
-  vendorHash = "sha256-llbBYO1dNPm+k8WEfao6qyDtQZbcmueNwFBuIpaMvFQ=";
+  vendorHash = "sha256-LfRzNmjJe6hBhWuN5fUfFpB3nKmURZhM/wpdrcYr9jU=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 72a533422c2257f50cf240d8ba21339b4eb09dd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 15 Oct 2025 11:38:20 +0200
Subject: [PATCH 0701/6226] python3Packages.setproctitle: avoid rebuild on
 linux for now

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

diff --git a/pkgs/development/python-modules/setproctitle/default.nix b/pkgs/development/python-modules/setproctitle/default.nix
index aa1211029abb..e99a26990139 100644
--- a/pkgs/development/python-modules/setproctitle/default.nix
+++ b/pkgs/development/python-modules/setproctitle/default.nix
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   ];
 
   # Setting the process title fails on macOS in the Nix builder environment (regardless of sandboxing)
-  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_setproctitle_darwin" ];
+  disabledTests = if stdenv.hostPlatform.isDarwin then [ "test_setproctitle_darwin" ] else null;
 
   pythonImportsCheck = [ "setproctitle" ];
 

From df72136acd7c2dc8db4ce4ba8badc7bde4649422 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Oct 2025 10:18:27 +0000
Subject: [PATCH 0702/6226] bevelbar: 24.07 -> 25.08

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

diff --git a/pkgs/by-name/be/bevelbar/package.nix b/pkgs/by-name/be/bevelbar/package.nix
index 9463954c82e5..fbc3bf55cddb 100644
--- a/pkgs/by-name/be/bevelbar/package.nix
+++ b/pkgs/by-name/be/bevelbar/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bevelbar";
-  version = "24.07";
+  version = "25.08";
 
   src = fetchurl {
     url = "https://www.uninformativ.de/git/bevelbar/archives/bevelbar-v${finalAttrs.version}.tar.gz";
-    hash = "sha256-PUYgbJCII0JecetoY3dMBUgrtaVhlLKeaJY27JJ78RQ=";
+    hash = "sha256-XGnvpPNonMVCaMgSqJIiklBMLam/k4XLHUrgnhxoxNI=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 98c1b23f3dca2a1b1b9d3510b8b93990627544c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Wed, 15 Oct 2025 13:48:34 +0200
Subject: [PATCH 0703/6226] bmake: avoid a bad test on darwin

https://hydra.nixos.org/build/309555861/nixlog/2/tail
Feel free to do deeper investigation and/or better fix.
---
 pkgs/by-name/bm/bmake/package.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix
index 6cdfb11e2954..ad3ed152731b 100644
--- a/pkgs/by-name/bm/bmake/package.nix
+++ b/pkgs/by-name/bm/bmake/package.nix
@@ -57,13 +57,17 @@ stdenv.mkDerivation (finalAttrs: {
   # * directive-export{,-gmake}: another failure related to TZ variables
   # * opt-keep-going-indirect: not yet known
   # * varmod-localtime: musl doesn't support TZDIR and this test relies on impure, implicit paths
-  env.BROKEN_TESTS = lib.concatStringsSep " " [
-    "cmd-interrupt"
-    "directive-export"
-    "directive-export-gmake"
-    "opt-keep-going-indirect"
-    "varmod-localtime"
-  ];
+  env.BROKEN_TESTS = lib.concatStringsSep " " (
+    [
+      "cmd-interrupt"
+      "directive-export"
+      "directive-export-gmake"
+      "opt-keep-going-indirect"
+      "varmod-localtime"
+    ]
+    # TODO: drop the name-conditioning on stdenv rebuild
+    ++ lib.optional (stdenv.isDarwin && lib.getName stdenv != "bootstrap-stage1-stdenv-darwin") "export"
+  );
 
   strictDeps = true;
 

From 1e419dfc64a046d136bb1d162b7bf0fe59f1ca06 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Oct 2025 12:24:25 +0000
Subject: [PATCH 0704/6226] glm: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/by-name/gl/glm/package.nix b/pkgs/by-name/gl/glm/package.nix
index 1cda3e6bf26b..d9daa49d4f4c 100644
--- a/pkgs/by-name/gl/glm/package.nix
+++ b/pkgs/by-name/gl/glm/package.nix
@@ -6,14 +6,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.0.1";
+  version = "1.0.2";
   pname = "glm";
 
   src = fetchFromGitHub {
     owner = "g-truc";
     repo = "glm";
     rev = version;
-    sha256 = "sha256-GnGyzNRpzuguc3yYbEFtYLvG+KiCtRAktiN+NvbOICE=";
+    sha256 = "sha256-2xKv1nO+OdwA0r+I9OZ+OCL9dJFg/LJsQfIvIF76vc0=";
   };
 
   outputs = [

From 40ba62814add4bf949225ae60fe3ffed68f1e41e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Oct 2025 12:27:26 +0000
Subject: [PATCH 0705/6226] partclone: 0.3.37 -> 0.3.38

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

diff --git a/pkgs/by-name/pa/partclone/package.nix b/pkgs/by-name/pa/partclone/package.nix
index 014f70123f4b..f404340d332f 100644
--- a/pkgs/by-name/pa/partclone/package.nix
+++ b/pkgs/by-name/pa/partclone/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "partclone";
-  version = "0.3.37";
+  version = "0.3.38";
 
   src = fetchFromGitHub {
     owner = "Thomas-Tsai";
     repo = "partclone";
     rev = version;
-    sha256 = "sha256-VqPCj2DjWux17vgLb13AJd0EAHkqRGdIL0aPxkT3JlY=";
+    sha256 = "sha256-lWnGi8giz7vzdBnuth55h0VMuNyCQaCclRqPJdm0I14=";
   };
 
   nativeBuildInputs = [

From 80212588ccb1fed84f3f6c67e58a11e373c96941 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Oct 2025 13:09:01 +0000
Subject: [PATCH 0706/6226] templ: 0.3.943 -> 0.3.960

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

diff --git a/pkgs/by-name/te/templ/package.nix b/pkgs/by-name/te/templ/package.nix
index 51f159f4eb42..8e7202fa05aa 100644
--- a/pkgs/by-name/te/templ/package.nix
+++ b/pkgs/by-name/te/templ/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "templ";
-  version = "0.3.943";
+  version = "0.3.960";
 
   src = fetchFromGitHub {
     owner = "a-h";
     repo = "templ";
     rev = "v${version}";
-    hash = "sha256-7owKjFrIHi5+RhWXzUTWwwxFLu9RNmq2g3SUf9RuDDc=";
+    hash = "sha256-GCbqaRC9KipGdGfgnGjJu04/rJlg+2lgi2vluP05EV4=";
   };
 
   vendorHash = "sha256-pVZjZCXT/xhBCMyZdR7kEmB9jqhTwRISFp63bQf6w5A=";

From 6dc29424d0c136e0ec921864d8800e360f630d1f Mon Sep 17 00:00:00 2001
From: jasonxue <jason@xuechunxi.com>
Date: Wed, 15 Oct 2025 22:20:04 +0800
Subject: [PATCH 0707/6226] cargo-binstall: 1.15.6 -> 1.15.7

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

diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix
index 2802095cff1d..5d4da28fb530 100644
--- a/pkgs/by-name/ca/cargo-binstall/package.nix
+++ b/pkgs/by-name/ca/cargo-binstall/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-binstall";
-  version = "1.15.6";
+  version = "1.15.7";
 
   src = fetchFromGitHub {
     owner = "cargo-bins";
     repo = "cargo-binstall";
     rev = "v${version}";
-    hash = "sha256-TzO7xz58nvuT6r8SN0cUKdW0x1yR1FlpsnGhU67SNOA=";
+    hash = "sha256-EQhEI4MqYNwjqb8awROTLfxjGsoPKeT7VHt642uSgCc=";
   };
 
-  cargoHash = "sha256-cYjsSPHcWYobosSlB2tLda3NSGUTxE5DyA4AxAF8C/8=";
+  cargoHash = "sha256-a9X8L4AZWhlcQ5lVo0I1GL2wpCjOClNuZLy+GwHJDcA=";
 
   nativeBuildInputs = [
     pkg-config

From 619cf9eeae37e0cee6999d111beebece5a9b5aea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Oct 2025 14:20:50 +0000
Subject: [PATCH 0708/6226] mssql_jdbc: 13.2.0 -> 13.2.1

---
 pkgs/servers/sql/mssql/jdbc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mssql/jdbc/default.nix b/pkgs/servers/sql/mssql/jdbc/default.nix
index 548630c1f9c0..b3cee0fa68a2 100644
--- a/pkgs/servers/sql/mssql/jdbc/default.nix
+++ b/pkgs/servers/sql/mssql/jdbc/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mssql-jdbc";
-  version = "13.2.0";
+  version = "13.2.1";
 
   src = fetchurl {
     url = "https://github.com/Microsoft/mssql-jdbc/releases/download/v${version}/mssql-jdbc-${version}.jre8.jar";
-    sha256 = "sha256-zC6aTII/79PMJvLY9wEw7EhaUwhZ4F6H2N7zcr7mzKc=";
+    sha256 = "sha256-dgOW6pYXDM7p60FoQjFBdbZUoUhDmjSmH+0Ud2SFsBk=";
   };
 
   dontUnpack = true;

From e959031f9bc34b5e1a0cc149687c0381dcd94b0e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Oct 2025 14:26:48 +0000
Subject: [PATCH 0709/6226] nvidia-container-toolkit: 1.17.8 -> 1.17.9

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

diff --git a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
index 11bd87d34ed8..72e377fd7f42 100644
--- a/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
+++ b/pkgs/by-name/nv/nvidia-container-toolkit/package.nix
@@ -13,13 +13,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "nvidia-container-toolkit";
-  version = "1.17.8";
+  version = "1.17.9";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "nvidia-container-toolkit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-B17cPxdrQ8qMNgFh4XcDwwKryukMrn0GV2LNPHM7kBo=";
+    hash = "sha256-kcE4yDoj+CFbMy0N5v8ImxjZMJ/o5/LaAVVV1M7qGiw=";
 
   };
 

From f3ebfd40852c3c8acef193672128d254c64f0d52 Mon Sep 17 00:00:00 2001
From: Yaya <github@uwu.is>
Date: Wed, 15 Oct 2025 16:36:14 +0200
Subject: [PATCH 0710/6226] pocket-casts: 0.10.5 -> 0.11.0

- Changelog: https://github.com/FelicianoTech/pocket-casts-desktop-app/releases/tag/v0.11.0
- Diff: https://github.com/FelicianoTech/pocket-casts-desktop-app/compare/v0.10.5...v0.11.0

Includes a bump to Electron 38.
---
 pkgs/by-name/po/pocket-casts/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/po/pocket-casts/package.nix b/pkgs/by-name/po/pocket-casts/package.nix
index 4e1c109f8a35..a358441430f5 100644
--- a/pkgs/by-name/po/pocket-casts/package.nix
+++ b/pkgs/by-name/po/pocket-casts/package.nix
@@ -5,23 +5,23 @@
   makeDesktopItem,
   copyDesktopItems,
   makeWrapper,
-  electron_36,
+  electron_38,
 }:
 let
-  electron = electron_36;
+  electron = electron_38;
 in
 buildNpmPackage rec {
   pname = "pocket-casts";
-  version = "0.10.5";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "felicianotech";
     repo = "pocket-casts-desktop-app";
     rev = "v${version}";
-    hash = "sha256-LB0SOAcgCZuNKOWhL9m4cDF9q+voVd+2OYVeKTq7OB0=";
+    hash = "sha256-ZOOJAChKCLfwI8olQ2NSk8OaoEQ9wXNS6jwotc6fdnQ=";
   };
 
-  npmDepsHash = "sha256-i8IKH3sacYWLa2GtcJSoWCy5eV9vC79dP9WVN2Iy7DE=";
+  npmDepsHash = "sha256-hSSo2Wv5UXoowt+1JuUQPWO4vI/FiICtscIFttOgniA=";
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 

From cc27c6f2b8238b22ceede2f59f33e6c068a1d631 Mon Sep 17 00:00:00 2001
From: Scott Stephens <stephens.js@gmail.com>
Date: Tue, 14 Oct 2025 13:24:26 -0400
Subject: [PATCH 0711/6226] tpm2-abrmd: add scottstephens to maintainers

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

diff --git a/pkgs/by-name/tp/tpm2-abrmd/package.nix b/pkgs/by-name/tp/tpm2-abrmd/package.nix
index 28e9069d983c..9b1275ab4f59 100644
--- a/pkgs/by-name/tp/tpm2-abrmd/package.nix
+++ b/pkgs/by-name/tp/tpm2-abrmd/package.nix
@@ -65,6 +65,9 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/tpm2-software/tpm2-tools";
     license = licenses.bsd3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ matthiasbeyer ];
+    maintainers = with maintainers; [
+      matthiasbeyer
+      scottstephens
+    ];
   };
 }

From 7f6efaf59cfc0269ff2181b1eaa3b638616eb118 Mon Sep 17 00:00:00 2001
From: Scott Stephens <stephens.js@gmail.com>
Date: Tue, 14 Oct 2025 13:24:49 -0400
Subject: [PATCH 0712/6226] tpm2-tss: add scottstephens to maintainers

---
 pkgs/development/libraries/tpm2-tss/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/tpm2-tss/default.nix b/pkgs/development/libraries/tpm2-tss/default.nix
index 524a3c1a8657..87a13c7fc75b 100644
--- a/pkgs/development/libraries/tpm2-tss/default.nix
+++ b/pkgs/development/libraries/tpm2-tss/default.nix
@@ -171,6 +171,9 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/tpm2-software/tpm2-tss";
     license = licenses.bsd2;
     platforms = platforms.unix;
-    maintainers = with maintainers; [ baloo ];
+    maintainers = with maintainers; [
+      baloo
+      scottstephens
+    ];
   };
 })

From e28950323af0b0eb6e58eaa1b93eb584cf7901ff Mon Sep 17 00:00:00 2001
From: Scott Stephens <stephens.js@gmail.com>
Date: Tue, 14 Oct 2025 13:25:15 -0400
Subject: [PATCH 0713/6226] tpm2-tools: add scottstephens to maintainers

---
 pkgs/by-name/tp/tpm2-tools/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/tp/tpm2-tools/package.nix b/pkgs/by-name/tp/tpm2-tools/package.nix
index 363ba53c7b00..9c19a654a637 100644
--- a/pkgs/by-name/tp/tpm2-tools/package.nix
+++ b/pkgs/by-name/tp/tpm2-tools/package.nix
@@ -57,6 +57,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/tpm2-software/tpm2-tools";
     license = licenses.bsd3;
     platforms = platforms.linux;
-    maintainers = [ ];
+    maintainers = with maintainers; [ scottstephens ];
   };
 }

From b80b0500c08caa5fa22e151f9711d7e8c280aef0 Mon Sep 17 00:00:00 2001
From: Scott Stephens <stephens.js@gmail.com>
Date: Tue, 14 Oct 2025 13:25:37 -0400
Subject: [PATCH 0714/6226] tpm2-pytss: add scottstephens to maintainers

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

diff --git a/pkgs/development/python-modules/tpm2-pytss/default.nix b/pkgs/development/python-modules/tpm2-pytss/default.nix
index 35899915eb67..3f62db31b9db 100644
--- a/pkgs/development/python-modules/tpm2-pytss/default.nix
+++ b/pkgs/development/python-modules/tpm2-pytss/default.nix
@@ -107,6 +107,9 @@ buildPythonPackage rec {
     changelog = "https://github.com/tpm2-software/tpm2-pytss/blob/${version}/CHANGELOG.md";
     description = "TPM2 TSS Python bindings for Enhanced System API (ESYS)";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ baloo ];
+    maintainers = with maintainers; [
+      baloo
+      scottstephens
+    ];
   };
 }

From 86e6d056b681e45557825e3137831a495b57ed83 Mon Sep 17 00:00:00 2001
From: Hendrik Sokolowski <hensoko@gssws.de>
Date: Tue, 30 Sep 2025 15:15:27 +0200
Subject: [PATCH 0715/6226] owntone: 28.12 -> 29.0

---
 pkgs/by-name/ow/owntone/gettext-0.25.patch | 13 +++++++++++++
 pkgs/by-name/ow/owntone/package.nix        |  8 ++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/ow/owntone/gettext-0.25.patch

diff --git a/pkgs/by-name/ow/owntone/gettext-0.25.patch b/pkgs/by-name/ow/owntone/gettext-0.25.patch
new file mode 100644
index 000000000000..7df3cbdd2204
--- /dev/null
+++ b/pkgs/by-name/ow/owntone/gettext-0.25.patch
@@ -0,0 +1,13 @@
+diff --git a/configure.ac b/configure.ac
+index 66d92954..05e81c52 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -10,6 +10,9 @@ AC_CONFIG_HEADERS([config.h])
+ AM_INIT_AUTOMAKE([foreign subdir-objects 1.11])
+ AM_SILENT_RULES([yes])
+
++AM_GNU_GETTEXT_VERSION([0.25])
++AM_GNU_GETTEXT([external])
++
+ dnl Requires autoconf 2.60
+ AC_USE_SYSTEM_EXTENSIONS
diff --git a/pkgs/by-name/ow/owntone/package.nix b/pkgs/by-name/ow/owntone/package.nix
index 7e755a54a027..49a4df588b4a 100644
--- a/pkgs/by-name/ow/owntone/package.nix
+++ b/pkgs/by-name/ow/owntone/package.nix
@@ -37,14 +37,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "28.12";
+  version = "29.0";
   pname = "owntone";
 
   src = fetchFromGitHub {
     owner = "owntone";
     repo = "owntone-server";
     tag = finalAttrs.version;
-    hash = "sha256-Mj3G1+Hwa/zl0AM4SO6TcB4W3WJkpIDzrSPEFx0vaEk=";
+    hash = "sha256-Z9u5clC6m5gDAKkvyvrQs9muNK/P0ipHgQUmTHLRumE=";
   };
 
   nativeBuildInputs = [
@@ -83,6 +83,10 @@ stdenv.mkDerivation (finalAttrs: {
     lib.optionals chromecastSupport [ "--enable-chromecast" ]
     ++ lib.optionals pulseSupport [ "--with-pulseaudio" ];
 
+  patches = [
+    ./gettext-0.25.patch
+  ];
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 8eb559de30f26afe8a8d329a1311eb9799392ea2 Mon Sep 17 00:00:00 2001
From: andre4ik3 <andre4ik3@fastmail.com>
Date: Thu, 9 Oct 2025 01:26:12 +0000
Subject: [PATCH 0716/6226] fex: 2509.1 -> 2510, patch to build with LLVM 21

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

diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix
index 235b4260282c..25858a8a4a05 100644
--- a/pkgs/by-name/fe/fex/package.nix
+++ b/pkgs/by-name/fe/fex/package.nix
@@ -26,6 +26,7 @@
   xorg,
   withQt ? true,
   qt6,
+  fetchpatch,
 }:
 
 let
@@ -95,13 +96,13 @@ let
 in
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "fex";
-  version = "2509.1";
+  version = "2510";
 
   src = fetchFromGitHub {
     owner = "FEX-Emu";
     repo = "FEX";
     tag = "FEX-${finalAttrs.version}";
-    hash = "sha256-eTm1ee8eS+OwzEUoklrrQDRIAJVX0FWBaWi2/TJrx48=";
+    hash = "sha256-C6Yeqo+KqA6OezxnpBAncTekOrPTgIq0vikQOmxaORA=";
 
     leaveDotGit = true;
     postFetch = ''
@@ -127,6 +128,16 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     '';
   };
 
+  patches = [
+    # Backported fix of unit test build with LLVM 21.
+    # TODO: drop after next release
+    (fetchpatch {
+      name = "unittests-thunklibs-fix-build-with-llvm-21.patch";
+      url = "https://github.com/FEX-Emu/FEX/commit/5af2477d005bb0ab8b11633a678ed5f6121f81b6.patch";
+      hash = "sha256-QdJaexzBSOVaKc3h2uwPbX4iysqvGBDmWH938ZeXcdE=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace ThunkLibs/GuestLibs/CMakeLists.txt ThunkLibs/HostLibs/CMakeLists.txt \
       --replace-fail "/usr/include/libdrm" "${devRootFS}/include/libdrm" \

From 2125681310250755fed85334fb201b80d6334758 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 13:46:34 -0300
Subject: [PATCH 0717/6226] cosmic-applibrary: 1.0.0-beta.1.1 -> 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-applibrary/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-applibrary/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix
index 2f60f0f352b0..72a3013a0e6e 100644
--- a/pkgs/by-name/co/cosmic-applibrary/package.nix
+++ b/pkgs/by-name/co/cosmic-applibrary/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-applibrary";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-applibrary";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-LVNOUOVeX8QpTbUG3bOhMkdrjkF3M0sZg+agSQyWAfA=";
+    hash = "sha256-Y0fohkNV9C78rGK+uoofQBDdK6Fb7XzmAdY1SorKFxA=";
   };
 
-  cargoHash = "sha256-f5uMgscentTlcPXFSan1kKcKh1nk88/3kQPTSuc0wz4=";
+  cargoHash = "sha256-s2YiB4U/pVAul2YC5/6bCVwKd18odoTAua4YhUJDN3U=";
 
   nativeBuildInputs = [
     just

From d1bc199bdf7c6398dd42dafb0b2a2055d29d7442 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 13:46:51 -0300
Subject: [PATCH 0718/6226] cosmic-applets: 1.0.0-beta.1.1 -> 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-applets/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-applets/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix
index 670fff08479b..eb3e8993e527 100644
--- a/pkgs/by-name/co/cosmic-applets/package.nix
+++ b/pkgs/by-name/co/cosmic-applets/package.nix
@@ -20,17 +20,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-applets";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-applets";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-uUcEwa9rGHLzmlutmLl/e38ZqybfYMU0Dhe+FsT5V/E=";
+    hash = "sha256-Vs6sNf6nbOqxlHq3NTFyRltiWVdPmumvuAq8nlWZEkc=";
   };
 
-  cargoHash = "sha256-RnkyIlTJMxMGu+EsmZwvSIapSqdng+t8bqMVsDXprlU=";
+  cargoHash = "sha256-uTKHCrgy3URLvqO96CJ0jORZF9/KPDf59iEsdrK1tY4=";
 
   nativeBuildInputs = [
     just

From fedde2a2fbbee4b40ee4c994cffa9c74a1e5916d Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 13:47:44 -0300
Subject: [PATCH 0719/6226] cosmic-bg: 1.0.0-beta.1.1 -> 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-bg/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-bg/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix
index 719f4650bde2..05cf6292d191 100644
--- a/pkgs/by-name/co/cosmic-bg/package.nix
+++ b/pkgs/by-name/co/cosmic-bg/package.nix
@@ -13,14 +13,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-bg";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-bg";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-t5tY7Axiz39lCDhDC/lKSRCURfHspeaP49kNXJvCLC4=";
+    hash = "sha256-mF6W/RND9cNfS27lQNZRcXY4OUMS+UUMMcEalBQ59Yg=";
   };
 
   postPatch = ''

From 828bdd0fe56a2af84e4a8d98af9642faaadf4258 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 13:48:59 -0300
Subject: [PATCH 0720/6226] cosmic-comp: 1.0.0-beta.1.1 -> 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-comp/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-comp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix
index a18d018a1ba1..705bd550c322 100644
--- a/pkgs/by-name/co/cosmic-comp/package.nix
+++ b/pkgs/by-name/co/cosmic-comp/package.nix
@@ -20,17 +20,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-comp";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-comp";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-RHeQk1yBNnDN/efuDDWNLn9O7FQTYLBsbs+h+gxi+Xo=";
+    hash = "sha256-VMM26rSO1ldM5WgoSJ5z89UgEK2GFNyDbqwdN53p8J8=";
   };
 
-  cargoHash = "sha256-Jaw2v+02lA5wWRAhRNW/lcLnTI7beJIZ43dqcJ60EP0=";
+  cargoHash = "sha256-hqw5nGKP0nw00qQoHyrcryVg2Kkdnx6yyJIERbh3DFE=";
 
   separateDebugInfo = true;
 

From d10643755fb997e315852323e206559f1ce5ddc6 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 13:51:16 -0300
Subject: [PATCH 0721/6226] cosmic-edit: 1.0.0-beta.1.1 -> 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-edit/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-edit/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix
index c861f9a5ead8..a81a49b959b1 100644
--- a/pkgs/by-name/co/cosmic-edit/package.nix
+++ b/pkgs/by-name/co/cosmic-edit/package.nix
@@ -16,17 +16,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-edit";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-edit";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-Zd/vTNZt9tPXryOwo2U68FtIul7xiRcz5N4Heuyicoc=";
+    hash = "sha256-AIx7lZSWApdNMETVxTXmAeMcDlPFitG5lLlhAi+NUF0=";
   };
 
-  cargoHash = "sha256-YfD06RAQPZRwapd0fhNsZ0tx+0JMNDXiPJIWwDhmG0M=";
+  cargoHash = "sha256-RwBrZ6cgr/7qmZZ+680otWQSWZyW04QE/102l+bKtpc=";
 
   postPatch = ''
     substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"

From cc592071b6e12ec26d3878e3787ea54eb8273b56 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 13:52:37 -0300
Subject: [PATCH 0722/6226] cosmic-files: 1.0.0-beta.1.1 -> 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-files/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-files/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix
index f931d3df52e6..5ecdbe58e6ef 100644
--- a/pkgs/by-name/co/cosmic-files/package.nix
+++ b/pkgs/by-name/co/cosmic-files/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-files";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-files";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-pSjmsWsGGhjCekMTX8iiNVbF5X33zg5YVDWtemjIDWU=";
+    hash = "sha256-D4oyuNSGMGRLRkPmKYIXUCTZh94QJuUYBbpiLA4szKk=";
   };
 
-  cargoHash = "sha256-7RANj+aXdmBVO66QDgcNrrU4qEGK4Py4+ZctYWU1OO8=";
+  cargoHash = "sha256-GLO5d+NRaKIlc7K1CZ0YH9kp6Q0rVfh0sJRjMLqPTBY=";
 
   nativeBuildInputs = [
     just

From 4438277825b6a2634978a5f614bf9b9815a8b1e6 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 13:54:22 -0300
Subject: [PATCH 0723/6226] cosmic-greeter: 1.0.0-beta.1.1 -> 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-greeter/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-greeter/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix
index 77ef71a8dace..271b99b99640 100644
--- a/pkgs/by-name/co/cosmic-greeter/package.nix
+++ b/pkgs/by-name/co/cosmic-greeter/package.nix
@@ -19,20 +19,22 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-greeter";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-greeter";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-rMZ+UbHarnvPaVAI5XeBfLduWEZHthguRSKLv3d/Eo0=";
+    hash = "sha256-Q4JrqyZbqdRk9nYk+u61CCHIucUOP4VjNALJRGaCfn4=";
   };
 
   cargoHash = "sha256-qioWGfg+cMaRNX6H6IWdcAU2py7oq9eNaxzKWw0H4R4=";
 
-  env.VERGEN_GIT_COMMIT_DATE = "2025-09-16";
-  env.VERGEN_GIT_SHA = finalAttrs.src.tag;
+  env = {
+    VERGEN_GIT_COMMIT_DATE = "2025-10-14";
+    VERGEN_GIT_SHA = finalAttrs.src.tag;
+  };
 
   cargoBuildFlags = [ "--all" ];
 

From f467c8a8920d4770afd198c8a52ee696ff56e6fa Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 13:54:35 -0300
Subject: [PATCH 0724/6226] cosmic-icons: 1.0.0-beta.1.1 -> 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-icons/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-icons/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix
index 5a40a5269324..579b417c2a56 100644
--- a/pkgs/by-name/co/cosmic-icons/package.nix
+++ b/pkgs/by-name/co/cosmic-icons/package.nix
@@ -9,7 +9,7 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cosmic-icons";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From ae33381cecb405a5b46ad17cb5fd3eb29e5adb5c Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 13:55:48 -0300
Subject: [PATCH 0725/6226] cosmic-idle: 1.0.0-beta.1.1 -> 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-idle/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-idle/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix
index 9847ce7966f0..ba6778cc2154 100644
--- a/pkgs/by-name/co/cosmic-idle/package.nix
+++ b/pkgs/by-name/co/cosmic-idle/package.nix
@@ -16,7 +16,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-idle";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 196978d33e4085ea469d6925bc7b1b21ecb1c894 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Oct 2025 19:13:33 +0000
Subject: [PATCH 0726/6226] symbolicator: 25.9.0 -> 25.10.0

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

diff --git a/pkgs/by-name/sy/symbolicator/package.nix b/pkgs/by-name/sy/symbolicator/package.nix
index d0093c4ffaf2..e4056c3e158e 100644
--- a/pkgs/by-name/sy/symbolicator/package.nix
+++ b/pkgs/by-name/sy/symbolicator/package.nix
@@ -10,17 +10,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "symbolicator";
-  version = "25.9.0";
+  version = "25.10.0";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "symbolicator";
     rev = version;
-    hash = "sha256-1pjp2ryzoiI/brXv/clrseh0LPs1ZW67vk5QT1l6KCk=";
+    hash = "sha256-bXoLhQVOzCic/n6/YlmFEpvN1lBD9sFDKzwi7VxW8iM=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-L3+ZQC9rVUpkkQs1KzdCtYA/hj1F6K8mf7aJpxfRh+0=";
+  cargoHash = "sha256-r7HtHvizA/NoJI496db5ahQ/6Qwp+KwQRmYQ7S72cqQ=";
 
   nativeBuildInputs = [
     pkg-config

From cffd64b94f4c8c7969d6316e62b3f6bb635d11e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Oct 2025 19:19:24 +0000
Subject: [PATCH 0727/6226] mattermostLatest: 10.12.0 -> 10.12.1

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

diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix
index 72f9a283389f..726da1dfb70c 100644
--- a/pkgs/by-name/ma/mattermostLatest/package.nix
+++ b/pkgs/by-name/ma/mattermostLatest/package.nix
@@ -11,9 +11,9 @@ mattermost.override {
     # and make sure the version regex is up to date here.
     # Ensure you also check ../mattermost/package.nix for ESR releases.
     regex = "^v(10\\.[0-9]+\\.[0-9]+)$";
-    version = "10.12.0";
-    srcHash = "sha256-oVZlXprw0NddHrtx1g2WRoGm1ATq/pqncD0mewN12nw=";
-    vendorHash = "sha256-Lqa463LLy41aaRbrtJFclfOj55vLjK4pWFAFLzX3TJE=";
+    version = "10.12.1";
+    srcHash = "sha256-PL55NKypsLA+H19cS99iIsMI3IBb6vLvAbAVLZyg+sE=";
+    vendorHash = "sha256-DS4OC3eQffD/8yLE01gnTJXwV77G7rWk4kqA/rTCtJw=";
     npmDepsHash = "sha256-O9iX6hnwkEHK0kkHqWD6RYXqoSEW6zs+utiYHnt54JY=";
     lockfileOverlay = ''
       unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")

From a648fa17bdaba9eadc52edd064702c27f3870a10 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 15 Oct 2025 21:14:59 +0100
Subject: [PATCH 0728/6226] libmanette: 0.2.12 -> 0.2.13

Changes: https://gitlab.gnome.org/GNOME/libmanette/-/blob/0.2.13/NEWS
---
 pkgs/by-name/li/libmanette/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libmanette/package.nix b/pkgs/by-name/li/libmanette/package.nix
index 4baaa27c7178..de3ac59a1065 100644
--- a/pkgs/by-name/li/libmanette/package.nix
+++ b/pkgs/by-name/li/libmanette/package.nix
@@ -22,7 +22,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmanette";
-  version = "0.2.12";
+  version = "0.2.13";
 
   outputs = [
     "out"
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "mirror://gnome/sources/libmanette/${lib.versions.majorMinor finalAttrs.version}/libmanette-${finalAttrs.version}.tar.xz";
-    hash = "sha256-SLNJJnGA8dw01AWp4ekLoW8FShnOkHkw5nlJPZEeodg=";
+    hash = "sha256-KHzC/eDeCSkZNmr3V9heezoCSOsbOVNEcm6XlVp32K4=";
   };
 
   depsBuildBuild = lib.optionals withIntrospection [

From 62784a041c36f6bdb55685171f2f1f8b6198452d Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 13:57:27 -0300
Subject: [PATCH 0729/6226] cosmic-initial-setup: 1.0.0-beta.1.1 ->
 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-initial-setup/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 .../disable-language-page.patch               | 74 -------------------
 .../disable-timezone-page.patch               | 64 ----------------
 .../co/cosmic-initial-setup/package.nix       | 23 ++----
 3 files changed, 8 insertions(+), 153 deletions(-)
 delete mode 100644 pkgs/by-name/co/cosmic-initial-setup/disable-language-page.patch
 delete mode 100644 pkgs/by-name/co/cosmic-initial-setup/disable-timezone-page.patch

diff --git a/pkgs/by-name/co/cosmic-initial-setup/disable-language-page.patch b/pkgs/by-name/co/cosmic-initial-setup/disable-language-page.patch
deleted file mode 100644
index 1276c39cd0ce..000000000000
--- a/pkgs/by-name/co/cosmic-initial-setup/disable-language-page.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/src/main.rs b/src/main.rs
-index a0e8f2e..07cf8b9 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -194,19 +194,19 @@ impl Application for App {
-                         }
-                     }
- 
--                    page::Message::Language(message) => {
--                        if let Some(page) =
--                            self.pages.get_mut(&TypeId::of::<page::language::Page>())
--                        {
--                            return page
--                                .as_any()
--                                .downcast_mut::<page::language::Page>()
--                                .unwrap()
--                                .update(message)
--                                .map(Message::PageMessage)
--                                .map(cosmic::Action::App);
--                        }
--                    }
-+                    // page::Message::Language(message) => {
-+                    //     if let Some(page) =
-+                    //         self.pages.get_mut(&TypeId::of::<page::language::Page>())
-+                    //     {
-+                    //         return page
-+                    //             .as_any()
-+                    //             .downcast_mut::<page::language::Page>()
-+                    //             .unwrap()
-+                    //             .update(message)
-+                    //             .map(Message::PageMessage)
-+                    //             .map(cosmic::Action::App);
-+                    //     }
-+                    // }
- 
-                     page::Message::Layout(message) => {
-                         if let Some(page) = self.pages.get_mut(&TypeId::of::<page::layout::Page>())
-diff --git a/src/page/mod.rs b/src/page/mod.rs
-index 389728c..937a1b3 100644
---- a/src/page/mod.rs
-+++ b/src/page/mod.rs
-@@ -4,7 +4,7 @@ use std::any::{Any, TypeId};
- 
- pub mod appearance;
- pub mod keyboard;
--pub mod language;
-+// pub mod language;
- pub mod launcher;
- pub mod layout;
- pub mod location;
-@@ -34,10 +34,10 @@ pub fn pages(mode: AppMode) -> IndexMap<TypeId, Box<dyn Page>> {
-     if let AppMode::NewInstall { create_user } = mode {
-         pages.insert(TypeId::of::<wifi::Page>(), Box::new(wifi::Page::default()));
- 
--        pages.insert(
--            TypeId::of::<language::Page>(),
--            Box::new(language::Page::new()),
--        );
-+        // pages.insert(
-+        //     TypeId::of::<language::Page>(),
-+        //     Box::new(language::Page::new()),
-+        // );
- 
-         pages.insert(
-             TypeId::of::<keyboard::Page>(),
-@@ -95,7 +95,7 @@ pub fn pages(mode: AppMode) -> IndexMap<TypeId, Box<dyn Page>> {
- pub enum Message {
-     Appearance(appearance::Message),
-     Keyboard(keyboard::Message),
--    Language(language::Message),
-+    // Language(language::Message),
-     Layout(layout::Message),
-     Location(location::Message),
-     SetTheme(cosmic::Theme),
diff --git a/pkgs/by-name/co/cosmic-initial-setup/disable-timezone-page.patch b/pkgs/by-name/co/cosmic-initial-setup/disable-timezone-page.patch
deleted file mode 100644
index 5af92f16d5bb..000000000000
--- a/pkgs/by-name/co/cosmic-initial-setup/disable-timezone-page.patch
+++ /dev/null
@@ -1,64 +0,0 @@
-diff --git a/src/main.rs b/src/main.rs
-index a0e8f2e..b6ff8dc 100644
---- a/src/main.rs
-+++ b/src/main.rs
-@@ -221,7 +221,7 @@ impl Application for App {
-                         }
-                     }
- 
--                    page::Message::Location(message) => {
-+                    /* page::Message::Location(message) => {
-                         if let Some(page) =
-                             self.pages.get_mut(&TypeId::of::<page::location::Page>())
-                         {
-@@ -233,7 +233,7 @@ impl Application for App {
-                                 .map(Message::PageMessage)
-                                 .map(cosmic::Action::App);
-                         }
--                    }
-+                    } */
- 
-                     page::Message::User(message) => {
-                         if let Some(page) = self.pages.get_mut(&TypeId::of::<page::user::Page>()) {
-diff --git a/src/page/mod.rs b/src/page/mod.rs
-index 389728c..38ced5e 100644
---- a/src/page/mod.rs
-+++ b/src/page/mod.rs
-@@ -7,7 +7,7 @@ pub mod keyboard;
- pub mod language;
- pub mod launcher;
- pub mod layout;
--pub mod location;
-+// pub mod location;
- pub mod new_apps;
- pub mod new_shortcuts;
- pub mod user;
-@@ -48,10 +48,10 @@ pub fn pages(mode: AppMode) -> IndexMap<TypeId, Box<dyn Page>> {
-             pages.insert(TypeId::of::<user::Page>(), Box::new(user::Page::default()));
-         }
- 
--        pages.insert(
-+        /* pages.insert(
-             TypeId::of::<location::Page>(),
-             Box::new(location::Page::new()),
--        );
-+        ); */
-     }
- 
-     pages.insert(
-@@ -97,7 +97,7 @@ pub enum Message {
-     Keyboard(keyboard::Message),
-     Language(language::Message),
-     Layout(layout::Message),
--    Location(location::Message),
-+    // Location(location::Message),
-     SetTheme(cosmic::Theme),
-     User(user::Message),
-     Welcome(welcome::Message),
-@@ -150,4 +150,4 @@ pub trait Page {
-     fn view(&self) -> Element<'_, Message> {
-         widget::text::body("TODO").into()
-     }
--}
-+}
-\ No newline at end of file
diff --git a/pkgs/by-name/co/cosmic-initial-setup/package.nix b/pkgs/by-name/co/cosmic-initial-setup/package.nix
index 63558e905a57..eb300279a439 100644
--- a/pkgs/by-name/co/cosmic-initial-setup/package.nix
+++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix
@@ -3,8 +3,8 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
-  fetchpatch2,
   just,
+  killall,
   libcosmicAppHook,
   libinput,
   openssl,
@@ -14,13 +14,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-initial-setup";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-initial-setup";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-kjJqGNcIlnzEsfA4eQ9D23ZGgRcmWQyWheAlwpjfALA=";
+    hash = "sha256-sgtZioUvBDSqlBVWbqGc2iVpZKF0fn/Mr1qo1qlzdlA=";
   };
 
   cargoHash = "sha256-orwK9gcFXK4/+sfwRubcz0PP6YAFqsENRHnlSLttLxM=";
@@ -41,23 +41,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   buildInputs = [
+    killall
     libinput
     openssl
     udev
   ];
 
-  # These are not needed for NixOS
-  patches = [
-    ./disable-language-page.patch
-    ./disable-timezone-page.patch
-    # TODO: Remove in next update
-    (fetchpatch2 {
-      name = "fix-layout-and-themes-page.patch";
-      url = "https://patch-diff.githubusercontent.com/raw/pop-os/cosmic-initial-setup/pull/53.diff?full_index=1";
-      hash = "sha256-081qyQnPhh+FRPU/JKJVCK+l3SKjHAIV5b6/7WN6lb8=";
-    })
-  ];
-
   postPatch = ''
     # Installs in $out/etc/xdg/autostart instead of /etc/xdg/autostart
     substituteInPlace justfile \
@@ -66,6 +55,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
       "autostart-dst := prefix / 'etc' / 'xdg' / 'autostart' / desktop-entry"
   '';
 
+  preFixup = ''
+    libcosmicAppWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ killall ]})
+  '';
+
   dontUseJustBuild = true;
   dontUseJustCheck = true;
 

From 312d90bf1fe2b4dac157702a01f399693c55ca56 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 14:00:50 -0300
Subject: [PATCH 0730/6226] cosmic-launcher: 1.0.0-beta.1.1 -> 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-launcher/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-launcher/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix
index f2617f151cc7..d44e097bdf89 100644
--- a/pkgs/by-name/co/cosmic-launcher/package.nix
+++ b/pkgs/by-name/co/cosmic-launcher/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-launcher";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-launcher";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-vAuWH9qmstPcfPvcKoM/2VjGxAfdtO9hhOPaZ5Ft4Y0=";
+    hash = "sha256-V4FShr8kTf3lsYpPoU3hfeLgR4iQXmo+BxNOBko8pN0=";
   };
 
-  cargoHash = "sha256-57rkCufJPWm844/iMIfULfaGR9770q8VgZgnqCM57Zg=";
+  cargoHash = "sha256-bW6XtdK+AZiuwfzBUWmUi00RJXeuzgzGKoL35lyDBfM=";
 
   nativeBuildInputs = [
     just

From 443aacabb01e630614a649154b579d8b62e577ca Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 14:02:02 -0300
Subject: [PATCH 0731/6226] cosmic-notifications: 1.0.0-beta.1.1 ->
 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-notifications/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-notifications/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix
index 9ff3f7ac8299..e25b2fb5a2e1 100644
--- a/pkgs/by-name/co/cosmic-notifications/package.nix
+++ b/pkgs/by-name/co/cosmic-notifications/package.nix
@@ -12,14 +12,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-notifications";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-notifications";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-wgOjaiKJ1KYdYsynQV5+KKGhdneELiLTHYqjMEWaxt0=";
+    hash = "sha256-HMs08kAS+dC8GsznmQveZczwYtlSKxS4MU3BEKLgxjY=";
   };
 
   cargoHash = "sha256-CL8xvj57yq0qzK3tyYh3YXh+fM4ZDsmL8nP1mcqTqeQ=";

From edf3920564d59cf4b35084dee74b156ee811f84f Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 14:03:17 -0300
Subject: [PATCH 0732/6226] cosmic-osd: 1.0.0-beta.1.1 -> 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-osd/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-osd/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix
index 0dcc4b8dc4b5..32ae263c5019 100644
--- a/pkgs/by-name/co/cosmic-osd/package.nix
+++ b/pkgs/by-name/co/cosmic-osd/package.nix
@@ -13,17 +13,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-osd";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-osd";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-tsP4dlHmzuf5QgByDWbuigMrpgnJAjuNsYwWDSutCoI=";
+    hash = "sha256-xGVB1RGbraTUORcEE5I70wxwnUpe/itMQyNaxCh1bfY=";
   };
 
-  cargoHash = "sha256-YcNvvK+Zf8nSS5YjS5iaoipogstiyBdNY7LhWPsz9xQ=";
+  cargoHash = "sha256-v6/lWqGG3uFSFgw77M0kGM+cK9wSiuaGaciPqz/wFIQ=";
 
   nativeBuildInputs = [
     libcosmicAppHook

From d8cfd5d22056bf5d8febc2e325a950b773258d00 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 14:04:39 -0300
Subject: [PATCH 0733/6226] cosmic-panel: 1.0.0-beta.1.1 -> 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-panel/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-panel/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix
index ff40a8512385..3c8e1265058f 100644
--- a/pkgs/by-name/co/cosmic-panel/package.nix
+++ b/pkgs/by-name/co/cosmic-panel/package.nix
@@ -11,14 +11,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-panel";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-panel";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-gSTvF6Zcixh5/uYZuUiCIdBlXJj31+lISBwLujTuOfo=";
+    hash = "sha256-d21/ydBbT/lWudx9+hEDu7PlbIbORr3tqWcvMzenxr8=";
   };
 
   cargoHash = "sha256-8KOl581VmsfE7jiVFXy3ZDIfAqnaJuiDd7paqiFI/mk=";

From 14485dcfd29f874ea955fcf8ee3f03a5a2a4ed70 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 14:05:53 -0300
Subject: [PATCH 0734/6226] cosmic-player: 1.0.0-beta.1.1 -> 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-player/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-player/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix
index a213b228531a..fc42c3570653 100644
--- a/pkgs/by-name/co/cosmic-player/package.nix
+++ b/pkgs/by-name/co/cosmic-player/package.nix
@@ -18,17 +18,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-player";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-player";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-oTTVVQkSkON5NTgO5+eUD2wVpiW5MvW3MZyeyqqc3qk=";
+    hash = "sha256-jf9KSgA94SL6JX7Nh1BQiumOYBJjjt5O5DRCjeBHovo=";
   };
 
-  cargoHash = "sha256-DodFIfthiGFSvXWfPsPjFhNY6G7z3lb6pfc5HtUXhMo=";
+  cargoHash = "sha256-fnX5BkzRAetKxHZ9XyWdmG6TSxFqGJsmg16zlpYG9Ag=";
 
   nativeBuildInputs = [
     just

From 72aa56e624a6cbf16890c51a6b90792e94f4933e Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 14:06:27 -0300
Subject: [PATCH 0735/6226] cosmic-randr: 1.0.0-beta.1.1 -> 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-randr/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-randr/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix
index 95f1be48c2fc..90791bfb918f 100644
--- a/pkgs/by-name/co/cosmic-randr/package.nix
+++ b/pkgs/by-name/co/cosmic-randr/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-randr";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 2c2275add623df250c6e9eb1c158eed4afbf7d9e Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 14:06:58 -0300
Subject: [PATCH 0736/6226] cosmic-screenshot: 1.0.0-beta.1.1 -> 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-screenshot/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-screenshot/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix
index 19e6b35a9007..b04fe70ea437 100644
--- a/pkgs/by-name/co/cosmic-screenshot/package.nix
+++ b/pkgs/by-name/co/cosmic-screenshot/package.nix
@@ -10,14 +10,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-screenshot";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-screenshot";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-TKR8EDXZwKKC1WSZhlcf5U6tiM4cWCdb24U74vVKTaU=";
+    hash = "sha256-ZvbYb3gkA5cLcIulUQID8lj9USu6EurPUUMEdaGnZak=";
   };
 
   cargoHash = "sha256-O8fFeg1TkKCg+QbTnNjsH52xln4+ophh/BW/b4zQs9o=";

From c7e44a5f184d301ad08796b3e9a1872c317f0caa Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 14:07:27 -0300
Subject: [PATCH 0737/6226] cosmic-session: 1.0.0-beta.1.1 -> 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-session/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-session/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix
index b097d249adbc..71a7f7bae081 100644
--- a/pkgs/by-name/co/cosmic-session/package.nix
+++ b/pkgs/by-name/co/cosmic-session/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-session";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 84fbfaf52b5cc4d8b311ed39f57c556c453b568d Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 14:09:02 -0300
Subject: [PATCH 0738/6226] cosmic-settings: 1.0.0-beta.1.1 -> 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-settings/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-settings/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix
index 31c4217cca33..9efa293f3f58 100644
--- a/pkgs/by-name/co/cosmic-settings/package.nix
+++ b/pkgs/by-name/co/cosmic-settings/package.nix
@@ -27,17 +27,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-Yn5CSp/vsLMbkcQ7mCDw/ErgkSCyEvkwNvWqupVUkZ4=";
+    hash = "sha256-ziA9dy3wZHhpgBNgjC/Uq8M7R5B62k3PGzFiC+rrPpI=";
   };
 
-  cargoHash = "sha256-dHyUTV5txSLWEDE7Blplz8CBvyuUmYNNr1kbifujHKk=";
+  cargoHash = "sha256-mMfKY+ouszbN2rEf6zvv1Sc1FEZ/ZVuQ6RXGMBFDwIE=";
 
   nativeBuildInputs = [
     cmake

From e7bef170dad5fd6c26f54e480a3bf700ad5989e7 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 14:10:08 -0300
Subject: [PATCH 0739/6226] cosmic-settings-daemon: 1.0.0-beta.1.1 ->
 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-settings-daemon/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-settings-daemon/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
index 8e3e29e75f6c..13dfde98f513 100644
--- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix
+++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
@@ -15,14 +15,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings-daemon";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings-daemon";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-tHG/VoaP1tcns6AyedkkVUpWFlcOclWijsHYQ3vOIjs=";
+    hash = "sha256-CtHy8qy7CatbErNZKu1pLFC9aUWLj0r87+lvRB16oSE=";
   };
 
   postPatch = ''

From 982046f198d839a0250946fcf6d8c89c4655c2d2 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 14:11:35 -0300
Subject: [PATCH 0740/6226] cosmic-store: 1.0.0-beta.1.1 -> 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-store/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-store/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix
index 234b522ceb37..ddfcfa9d06da 100644
--- a/pkgs/by-name/co/cosmic-store/package.nix
+++ b/pkgs/by-name/co/cosmic-store/package.nix
@@ -15,17 +15,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-store";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-store";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-KlXFFoUEa0YTQDEJHMrbWOIEsSnXvJNzzaEFYR83t9s=";
+    hash = "sha256-t27WA/q+RFyjGpmpgJCGmen67h4NMAkyHbObpaJiSz4=";
   };
 
-  cargoHash = "sha256-xdNYQB/zmndnMAkstwJ6Z2uk0fXli3gIYHchUq/3u6k=";
+  cargoHash = "sha256-7FvelbsXa3ya6EY2irfCxwjAr9o3VWJ9/vJutFTjYpQ=";
 
   nativeBuildInputs = [
     just

From 9a7a5f6844984f9acb7026d5f60d8f304c878bd3 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 14:12:56 -0300
Subject: [PATCH 0741/6226] cosmic-term: 1.0.0-beta.1.1 -> 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-term/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-term/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix
index cbd95303c28d..c3571b9cdd93 100644
--- a/pkgs/by-name/co/cosmic-term/package.nix
+++ b/pkgs/by-name/co/cosmic-term/package.nix
@@ -15,17 +15,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-term";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-term";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-1kQuPMaLXq+V1fTplXKoXAVOtyuD4Sh8diljHgTDbdI=";
+    hash = "sha256-Gf5C135I3MBxyYBvgbOcY4USa75BeD7sPhFjq5BIM1s=";
   };
 
-  cargoHash = "sha256-mpuVSHb9YcDZB+eyyD+5ZNzUeEgx8T25IFjsD/Q/quU=";
+  cargoHash = "sha256-qXAgmVsjhr3aqEQRGjsK2JM8YwpkRK5Y+XYJRSZ8Swc=";
 
   nativeBuildInputs = [
     just

From 8f39a6d087555cab487e8fc2bdd7b92b718d1647 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 14:13:27 -0300
Subject: [PATCH 0742/6226] cosmic-wallpapers: 1.0.0-beta.1.1 -> 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-wallpapers/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-wallpapers/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix
index 888b41c96a9b..158f18977f0f 100644
--- a/pkgs/by-name/co/cosmic-wallpapers/package.nix
+++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix
@@ -7,7 +7,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cosmic-wallpapers";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From cf672d2a9e54fdcfe7a9ad83343d8b3f671dd04b Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 14:14:40 -0300
Subject: [PATCH 0743/6226] cosmic-workspaces-epoch: 1.0.0-beta.1.1 ->
 1.0.0-beta.2

Diff: https://github.com/pop-os/cosmic-workspaces-epoch/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/co/cosmic-workspaces-epoch/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
index c2831c0b3a93..879a62516599 100644
--- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
+++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
@@ -14,14 +14,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-workspaces-epoch";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-workspaces-epoch";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-gcS8Q9SR7Dj1FH2Dtdd6jUMX8u5kHJBMvlgqJGw+rjA=";
+    hash = "sha256-WHMOA7fNPIAwaQmzqyo+XlBYl+13cz0LrRpT0GUa8Vs=";
   };
 
   cargoHash = "sha256-BE6s2dmbgXlFXrtd8b9k2LltLnegLzWbIUlaEQvv+5o=";

From 4558c3fe8f929ae0dee66ca35d54997ab9e6b9eb Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 15 Oct 2025 14:17:17 -0300
Subject: [PATCH 0744/6226] xdg-desktop-portal-cosmic: 1.0.0-beta.1.1 ->
 1.0.0-beta.2

Diff: https://github.com/pop-os/xdg-desktop-portal-cosmic/compare/epoch-1.0.0-beta.1.1...epoch-1.0.0-beta.2
---
 pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
index d82a321cd69c..3264cf67b9e8 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
@@ -17,17 +17,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xdg-desktop-portal-cosmic";
-  version = "1.0.0-beta.1.1";
+  version = "1.0.0-beta.2";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "xdg-desktop-portal-cosmic";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-EkhOa1Tircgyta98Zf4ZaV/tR4zZh4/bU35xjn3xU8c=";
+    hash = "sha256-3FmNaT9tfDttINSbkwEaNW5i5hk9jH+fmMAg0UagttA=";
   };
 
-  cargoHash = "sha256-uJKwwESkzqweM4JunnMIsDE8xhCyjFFZs1GiJAwnbG8=";
+  cargoHash = "sha256-gaDVt/0QPFZHnt9veUo5bvZECxKZcIrja/QdLBn/Xi4=";
 
   separateDebugInfo = true;
 

From 63fba75ad0c731c1611fae9b47b6eec163c7ea21 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Oct 2025 21:57:00 +0000
Subject: [PATCH 0745/6226] ecs-agent: 1.99.1 -> 1.100.0

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

diff --git a/pkgs/by-name/ec/ecs-agent/package.nix b/pkgs/by-name/ec/ecs-agent/package.nix
index fcb115afdc95..e55c09fbf067 100644
--- a/pkgs/by-name/ec/ecs-agent/package.nix
+++ b/pkgs/by-name/ec/ecs-agent/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "amazon-ecs-agent";
-  version = "1.99.1";
+  version = "1.100.0";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "aws";
     repo = "amazon-ecs-agent";
-    hash = "sha256-aGmXu+ho5H6vPTBWR5OvqDcmFQN87BOl99HGIek24CE=";
+    hash = "sha256-U5Rvo1m3JuJTF+gvkbgyS+PDouR3Z0WcO4YQ95GUTic=";
   };
 
   vendorHash = null;

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

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

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

From 3906bb583454ae3c83b3d84401b9a91b2c515a4e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 15 Oct 2025 23:34:53 +0000
Subject: [PATCH 0747/6226] python3Packages.tree-sitter-language-pack: 0.9.1 ->
 0.10.0

---
 .../python-modules/tree-sitter-language-pack/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tree-sitter-language-pack/default.nix b/pkgs/development/python-modules/tree-sitter-language-pack/default.nix
index 89e27908b5e2..2ba55fd2e30e 100644
--- a/pkgs/development/python-modules/tree-sitter-language-pack/default.nix
+++ b/pkgs/development/python-modules/tree-sitter-language-pack/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "tree-sitter-language-pack";
-  version = "0.9.1";
+  version = "0.10.0";
   pyproject = true;
 
   # Using the GitHub sources necessitates fetching the treesitter grammar parsers by using a vendored script.
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "tree_sitter_language_pack";
     inherit version;
-    hash = "sha256-LaU5dR7MULnmu/yji1dQGjxV5nGGqTnVvxSdnLciCXQ=";
+    hash = "sha256-oWGLKYKLZEIu1rKhEYdZnFUheBNI/t2EIPAfb1A5ofw=";
   };
 
   # Upstream bumped dependencies aggressively, but we can still use older

From c0820b297170aebd85e5499599419a8f31af1bd6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Oct 2025 00:26:35 +0000
Subject: [PATCH 0748/6226] avro-c: 1.12.0 -> 1.12.1

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

diff --git a/pkgs/by-name/av/avro-c/package.nix b/pkgs/by-name/av/avro-c/package.nix
index ad598d511e08..a50794c48e62 100644
--- a/pkgs/by-name/av/avro-c/package.nix
+++ b/pkgs/by-name/av/avro-c/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation rec {
   pname = "avro-c";
-  version = "1.12.0";
+  version = "1.12.1";
 
   src = fetchurl {
     url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz";
-    sha256 = "sha256-dDM9QxB5w113DO9plstN4EBY0Z6BvQuaNjvP04V1A38=";
+    sha256 = "sha256-tk4xuUcZSZVJYiqpLx2W0XQpZ87SYaCTG2O+O76Qfyw=";
   };
 
   postPatch = ''

From 0c8ced8a737294b0ada8d4ad91f859be48240a45 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Thu, 9 Oct 2025 19:34:17 -0700
Subject: [PATCH 0749/6226] piliplus: 1.1.4.4 -> 1.1.4.10

---
 .../pi/piliplus/disable-auto-update.patch     |  12 +
 pkgs/by-name/pi/piliplus/git-hashes.json      |  16 +-
 pkgs/by-name/pi/piliplus/package.nix          | 148 +++---
 pkgs/by-name/pi/piliplus/pubspec.lock.json    | 492 ++++++++----------
 pkgs/by-name/pi/piliplus/src-info.json        |   7 +
 pkgs/by-name/pi/piliplus/update.rb            |  33 +-
 6 files changed, 328 insertions(+), 380 deletions(-)
 create mode 100644 pkgs/by-name/pi/piliplus/disable-auto-update.patch
 create mode 100644 pkgs/by-name/pi/piliplus/src-info.json

diff --git a/pkgs/by-name/pi/piliplus/disable-auto-update.patch b/pkgs/by-name/pi/piliplus/disable-auto-update.patch
new file mode 100644
index 000000000000..6f745b7bed0a
--- /dev/null
+++ b/pkgs/by-name/pi/piliplus/disable-auto-update.patch
@@ -0,0 +1,12 @@
+diff --git a/lib/utils/update.dart b/lib/utils/update.dart
+index cb35c3bd..52e01d53 100644
+--- a/lib/utils/update.dart
++++ b/lib/utils/update.dart
+@@ -19,7 +19,6 @@ import 'package:flutter_smart_dialog/flutter_smart_dialog.dart';
+ abstract class Update {
+   // 检查更新
+   static Future<void> checkUpdate([bool isAuto = true]) async {
+-    if (kDebugMode) return;
+     SmartDialog.dismiss();
+     try {
+       final res = await Request().get(
diff --git a/pkgs/by-name/pi/piliplus/git-hashes.json b/pkgs/by-name/pi/piliplus/git-hashes.json
index d4929bd9b9dc..6f154a0f9e57 100644
--- a/pkgs/by-name/pi/piliplus/git-hashes.json
+++ b/pkgs/by-name/pi/piliplus/git-hashes.json
@@ -1,12 +1,18 @@
 {
   "auto_orientation": "sha256-0QOEW8+0PpBIELmzilZ8+z7ozNRxKgI0BzuBS8c1Fng=",
-  "canvas_danmaku": "sha256-3cBsQCvXuc5XvSRNY4QX33+t8aF2AfOQhRt+MCQWdOA=",
+  "canvas_danmaku": "sha256-V7o8NonNWo07PvWu8BI/ZugLZU6i3u45DuALg9UYtTE=",
   "chat_bottom_container": "sha256-um9KwZUDxWBhFsGHfv00TjPzxDHmp43TLRF0GwuV1xs=",
-  "extended_nested_scroll_view": "sha256-5X8ghUlEO/lvz/3PmYuipCjcs+QrIciaH5wgWp9i+24=",
+  "extended_nested_scroll_view": "sha256-Vjv5zp5c0Xob1H8/U0+lUueLqOKo7qwusOCchdt3Z7M=",
   "floating": "sha256-TJ2i3hTOQ4euHWr+lfQU44L3vVehmWVdZuAzNyVaEfA=",
   "flutter_sortable_wrap": "sha256-Qj9Lzh+pJy+vHznGt5M3xwoJtaVtt00fxm4JJXL4bFI=",
   "material_design_icons_flutter": "sha256-KMwjnzJJj8nemCqUCSwYafPOwTYbtoHNenxstocJtz4=",
-  "media_kit_libs_android_video": "sha256-o5qsqJe4TjOhwtgnc20Ga1y4IyxdhC/VmeAsFMDoHuo=",
-  "media_kit_video": "sha256-TPYmT5Muv98wuZUO9evd40uIWp/XDk0+GIfEgd/m4mg=",
-  "webdav_client": "sha256-euNF7HdDtZ68BqSEq9BvO10BK09MxX2wWGoElFS0yeE="
+  "media_kit": "sha256-9tGeTDXX3L5/xdyZMnVCbiCa6LYV+ELcpU/Ro5wg1Lc=",
+  "media_kit_libs_android_video": "sha256-9tGeTDXX3L5/xdyZMnVCbiCa6LYV+ELcpU/Ro5wg1Lc=",
+  "media_kit_libs_video": "sha256-9tGeTDXX3L5/xdyZMnVCbiCa6LYV+ELcpU/Ro5wg1Lc=",
+  "media_kit_libs_windows_video": "sha256-9tGeTDXX3L5/xdyZMnVCbiCa6LYV+ELcpU/Ro5wg1Lc=",
+  "media_kit_native_event_loop": "sha256-9tGeTDXX3L5/xdyZMnVCbiCa6LYV+ELcpU/Ro5wg1Lc=",
+  "media_kit_video": "sha256-9tGeTDXX3L5/xdyZMnVCbiCa6LYV+ELcpU/Ro5wg1Lc=",
+  "super_sliver_list": "sha256-G24uRql1aIc1TDJwKqwQ72Pi4YbJybMn6lxOUySSDwk=",
+  "webdav_client": "sha256-euNF7HdDtZ68BqSEq9BvO10BK09MxX2wWGoElFS0yeE=",
+  "window_manager": "sha256-UAN3uOXKMfWk+G9GTHyhD2dGDojKA76mGbUR+EFc2Qo="
 }
diff --git a/pkgs/by-name/pi/piliplus/package.nix b/pkgs/by-name/pi/piliplus/package.nix
index 6b772cc1d0ea..be6706c00a97 100644
--- a/pkgs/by-name/pi/piliplus/package.nix
+++ b/pkgs/by-name/pi/piliplus/package.nix
@@ -2,103 +2,93 @@
   lib,
   fetchFromGitHub,
   flutter335,
-  makeShellWrapper,
   makeDesktopItem,
   copyDesktopItems,
   alsa-lib,
   mpv-unwrapped,
   libplacebo,
+  libappindicator,
 }:
 
 let
-  version = "1.1.4.4";
-  rev = "f0f52246777f2640025048f561e908cf1d3c3ead";
-
+  srcInfo = lib.importJSON ./src-info.json;
   description = "Third-party Bilibili client developed in Flutter";
 in
-flutter335.buildFlutterApplication.override
-  {
-    # makeBinaryWrapper does not support `--run`.
-    makeWrapper = makeShellWrapper;
-  }
-  {
-    pname = "piliplus";
-    inherit version;
+flutter335.buildFlutterApplication {
+  pname = "piliplus";
+  inherit (srcInfo) version;
 
-    src = fetchFromGitHub {
-      owner = "bggRGjQaUbCoE";
-      repo = "PiliPlus";
-      inherit rev;
-      hash = "sha256-5ISSlYMbP0SaSP0SLIHXC3VRXrVZ78kfl07ekgzFhNA=";
-    };
+  src = fetchFromGitHub {
+    owner = "bggRGjQaUbCoE";
+    repo = "PiliPlus";
+    inherit (srcInfo) rev hash;
+  };
 
-    # Disable update check.
-    postPatch = ''
-      substituteInPlace lib/utils/update.dart \
-        --replace-fail "if (kDebugMode) " ""
-    '';
+  patches = [ ./disable-auto-update.patch ];
 
-    pubspecLock = lib.importJSON ./pubspec.lock.json;
-    gitHashes = lib.importJSON ./git-hashes.json;
+  pubspecLock = lib.importJSON ./pubspec.lock.json;
+  gitHashes = lib.importJSON ./git-hashes.json;
 
-    nativeBuildInputs = [ copyDesktopItems ];
+  nativeBuildInputs = [ copyDesktopItems ];
 
-    buildInputs = [
-      alsa-lib
-      mpv-unwrapped
-      libplacebo
-    ];
+  buildInputs = [
+    alsa-lib
+    mpv-unwrapped
+    libplacebo
+    libappindicator
+  ];
 
-    # See lib/scripts/build.sh.
-    preBuild = ''
-      cat <<EOL > lib/build_config.dart
-      class BuildConfig {
-        static const int buildTime = $SOURCE_DATE_EPOCH;
-        static const String commitHash = '${rev}';
-      }
-      EOL
-    '';
+  # See lib/scripts/build.sh.
+  preBuild = ''
+    cat <<EOL > lib/build_config.dart
+    class BuildConfig {
+      static const int versionCode = ${toString srcInfo.revCount};
+      static const String versionName = '${srcInfo.version}';
 
-    # The app attempts to get the total size of TMPDIR at startup.
-    extraWrapProgramArgs = ''
-      --run 'export TMPDIR="$(mktemp -d)"'
-    '';
+      static const int buildTime = ${toString srcInfo.commitDate};
+      static const String commitHash = '${srcInfo.rev}';
+    }
+    EOL
+  '';
 
-    postInstall = ''
-      declare -A sizes=(
-        [mdpi]=128
-        [hdpi]=192
-        [xhdpi]=256
-        [xxhdpi]=384
-        [xxxhdpi]=512
-      )
-      for var in "''${!sizes[@]}"; do
-        width=''${sizes[$var]}
-        install -Dm644 "android/app/src/main/res/drawable-$var/splash.png" \
-          "$out/share/icons/hicolor/$widthx$width/apps/piliplus.png"
-      done
-    '';
+  postInstall = ''
+    declare -A sizes=(
+      [mdpi]=128
+      [hdpi]=192
+      [xhdpi]=256
+      [xxhdpi]=384
+      [xxxhdpi]=512
+    )
+    for var in "''${!sizes[@]}"; do
+      width=''${sizes[$var]}
+      install -Dm644 "android/app/src/main/res/drawable-$var/splash.png" \
+        "$out/share/icons/hicolor/''${width}x$width/apps/piliplus.png"
+    done
+  '';
 
-    desktopItems = [
-      (makeDesktopItem {
-        name = "piliplus";
-        exec = "piliplus";
-        icon = "piliplus";
-        desktopName = "PiliPlus";
-        categories = [ "Video" ];
-        comment = description;
-      })
-    ];
+  desktopItems = [
+    (makeDesktopItem {
+      name = "piliplus";
+      exec = "piliplus";
+      icon = "piliplus";
+      desktopName = "PiliPlus";
+      categories = [
+        "Video"
+        "AudioVideo"
+      ];
+      comment = description;
+    })
+  ];
 
-    passthru.updateScript = ./update.rb;
+  passthru.updateScript = ./update.rb;
 
-    meta = {
-      inherit description;
-      homepage = "https://github.com/bggRGjQaUbCoE/PiliPlus";
-      changelog = "https://github.com/bggRGjQaUbCoE/PiliPlus/releases/tag/${version}";
-      license = lib.licenses.gpl3Plus;
-      maintainers = with lib.maintainers; [ ulysseszhan ];
-      platforms = lib.platforms.linux;
-      mainProgram = "piliplus";
-    };
-  }
+  meta = {
+    inherit description;
+    homepage = "https://github.com/bggRGjQaUbCoE/PiliPlus";
+    changelog = "https://github.com/bggRGjQaUbCoE/PiliPlus/releases/tag/${srcInfo.version}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ulysseszhan ];
+    platforms = lib.platforms.linux;
+    mainProgram = "piliplus";
+  };
+}
diff --git a/pkgs/by-name/pi/piliplus/pubspec.lock.json b/pkgs/by-name/pi/piliplus/pubspec.lock.json
index 49c381ab8e1e..50e6eec4085d 100644
--- a/pkgs/by-name/pi/piliplus/pubspec.lock.json
+++ b/pkgs/by-name/pi/piliplus/pubspec.lock.json
@@ -4,31 +4,21 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "0b2f2bd91ba804e53a61d757b986f89f1f9eaed5b11e4b2f5a2468d86d6c9fc7",
+        "sha256": "0eb33edbbe99a02e73b8bbeb6f2b65972023d902117ee8d1bf0ea1a79f83aa7b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "67.0.0"
+      "version": "90.0.0"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "37577842a27e4338429a1cbc32679d508836510b056f1eedf0c8d20e39c1383d",
+        "sha256": "711e3a890bb529bf55f07d73b8706f4b7504ad77e90d2f205626b116c048583f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.4.1"
-    },
-    "animations": {
-      "dependency": "direct main",
-      "description": {
-        "name": "animations",
-        "sha256": "d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.11"
+      "version": "8.3.0"
     },
     "ansicolor": {
       "dependency": "transitive",
@@ -195,21 +185,21 @@
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0",
+        "sha256": "dfb67ccc9a78c642193e0c2d94cb9e48c2c818b3178a86097d644acdcde6a8d9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "4.0.2"
     },
     "build_config": {
       "dependency": "transitive",
       "description": {
         "name": "build_config",
-        "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33",
+        "sha256": "4f64382b97504dc2fcdf487d5aae33418e08b4703fc21249e4db6d804a4d0187",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.2.0"
     },
     "build_daemon": {
       "dependency": "transitive",
@@ -221,35 +211,15 @@
       "source": "hosted",
       "version": "4.0.4"
     },
-    "build_resolvers": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_resolvers",
-        "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.4.2"
-    },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d",
+        "sha256": "4e54dbeefdc70691ba80b3bce3976af63b5425c8c07dface348dfee664a0edc1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.13"
-    },
-    "build_runner_core": {
-      "dependency": "transitive",
-      "description": {
-        "name": "build_runner_core",
-        "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "7.3.2"
+      "version": "2.9.0"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -265,11 +235,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "1b3b173f3379c8f941446267868548b6fc67e9134d81f4842eb98bb729451359",
+        "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.11.2"
+      "version": "8.12.0"
     },
     "cached_network_image": {
       "dependency": "direct main",
@@ -301,22 +271,12 @@
       "source": "hosted",
       "version": "1.3.1"
     },
-    "cached_network_svg_image": {
-      "dependency": "direct main",
-      "description": {
-        "name": "cached_network_svg_image",
-        "sha256": "fe9df0217c12e3903558dad14e1bb938c51296a1d96faa080415c6146bbd7a7d",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.2.0"
-    },
     "canvas_danmaku": {
       "dependency": "direct main",
       "description": {
         "path": ".",
         "ref": "main",
-        "resolved-ref": "1c8cd0bb44f4883fe0a37d06aa11f9bfd1da6379",
+        "resolved-ref": "454790117e05e96782b05ee3d28d0283741b3cde",
         "url": "https://github.com/bggRGjQaUbCoE/canvas_danmaku.git"
       },
       "source": "git",
@@ -326,11 +286,11 @@
       "dependency": "direct main",
       "description": {
         "name": "catcher_2",
-        "sha256": "ffdad9d314a91d2baabd90b3332bccda00b5f2fabd9d6afa4f988479b9bc3eca",
+        "sha256": "45070a33cf072bed4b45f6141bb2be98a804a76d27e2d0fa9e4319af5fa12195",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.1.5"
     },
     "characters": {
       "dependency": "transitive",
@@ -387,11 +347,11 @@
       "dependency": "transitive",
       "description": {
         "name": "code_builder",
-        "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e",
+        "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.10.1"
+      "version": "4.11.0"
     },
     "collection": {
       "dependency": "direct main",
@@ -407,11 +367,11 @@
       "dependency": "direct main",
       "description": {
         "name": "connectivity_plus",
-        "sha256": "b5e72753cf63becce2c61fd04dfe0f1c430cc5278b53a1342dc5ad839eab29ec",
+        "sha256": "33bae12a398f841c6cda09d1064212957265869104c478e5ad51e2fb26c3973c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.5"
+      "version": "7.0.0"
     },
     "connectivity_plus_platform_interface": {
       "dependency": "transitive",
@@ -497,11 +457,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "99e066ce75c89d6b29903d788a7bb9369cf754f7b24bf70bf4b6d6d6b26853b9",
+        "sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.6"
+      "version": "3.1.2"
     },
     "dbus": {
       "dependency": "transitive",
@@ -517,11 +477,11 @@
       "dependency": "direct main",
       "description": {
         "name": "device_info_plus",
-        "sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a",
+        "sha256": "49413c8ca514dea7633e8def233b25efdf83ec8522955cc2c0e3ad802927e7c6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.5.0"
+      "version": "12.1.0"
     },
     "device_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -563,16 +523,6 @@
       "source": "hosted",
       "version": "2.1.1"
     },
-    "document_file_save_plus": {
-      "dependency": "direct main",
-      "description": {
-        "name": "document_file_save_plus",
-        "sha256": "ff05c6a3b072377566e8e92666db38eb277786f90c0ac267ea47dc22725c1df3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.0"
-    },
     "dynamic_color": {
       "dependency": "direct main",
       "description": {
@@ -638,7 +588,7 @@
       "description": {
         "path": ".",
         "ref": "mod",
-        "resolved-ref": "8289673adc2b0485ab2abda49bea42ef8b899bf0",
+        "resolved-ref": "4bb4e827628b3b7ccc88a4b98ef76a036a5a51ac",
         "url": "https://github.com/bggRGjQaUbCoE/extended_nested_scroll_view.git"
       },
       "source": "git",
@@ -674,6 +624,16 @@
       "source": "hosted",
       "version": "7.0.1"
     },
+    "file_picker": {
+      "dependency": "direct main",
+      "description": {
+        "name": "file_picker",
+        "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "10.3.3"
+    },
     "file_selector_linux": {
       "dependency": "transitive",
       "description": {
@@ -728,11 +688,11 @@
       "dependency": "direct main",
       "description": {
         "name": "fl_chart",
-        "sha256": "d3f82f4a38e33ba23d05a08ff304d7d8b22d2a59a5503f20bd802966e915db89",
+        "sha256": "7ca9a40f4eb85949190e54087be8b4d6ac09dc4c54238d782a34cf1f7c011de9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "flex_seed_scheme": {
       "dependency": "direct main",
@@ -775,11 +735,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_displaymode",
-        "sha256": "42c5e9abd13d28ed74f701b60529d7f8416947e58256e6659c5550db719c57ef",
+        "sha256": "ecd44b1e902b0073b42ff5b55bf283f38e088270724cdbb7f7065ccf54aa60a8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.0"
+      "version": "0.7.0"
     },
     "flutter_html": {
       "dependency": "direct main",
@@ -921,11 +881,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31",
+        "sha256": "c2fe1001710127dfa7da89977a08d591398370d099aacdaa6d44da7eb14b8476",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.30"
+      "version": "2.0.31"
     },
     "flutter_smart_dialog": {
       "dependency": "direct main",
@@ -984,11 +944,11 @@
       "dependency": "transitive",
       "description": {
         "name": "fluttertoast",
-        "sha256": "25e51620424d92d3db3832464774a6143b5053f15e382d8ffbfd40b6e795dcf1",
+        "sha256": "144ddd74d49c865eba47abe31cbc746c7b311c82d6c32e571fd73c4264b740e2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.2.12"
+      "version": "9.0.0"
     },
     "font_awesome_flutter": {
       "dependency": "direct main",
@@ -1000,16 +960,6 @@
       "source": "hosted",
       "version": "10.9.0"
     },
-    "frontend_server_client": {
-      "dependency": "transitive",
-      "description": {
-        "name": "frontend_server_client",
-        "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "4.0.0"
-    },
     "get": {
       "dependency": "direct main",
       "description": {
@@ -1080,16 +1030,6 @@
       "source": "hosted",
       "version": "1.1.0"
     },
-    "hive_generator": {
-      "dependency": "direct dev",
-      "description": {
-        "name": "hive_generator",
-        "sha256": "06cb8f58ace74de61f63500564931f9505368f45f98958bd7a6c35ba24159db4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.1"
-    },
     "html": {
       "dependency": "direct main",
       "description": {
@@ -1154,31 +1094,31 @@
       "dependency": "direct main",
       "description": {
         "name": "image_cropper",
-        "sha256": "4e9c96c029eb5a23798da1b6af39787f964da6ffc78fd8447c140542a9f7c6fc",
+        "sha256": "46c8f9aae51c8350b2a2982462f85a129e77b04675d35b09db5499437d7a996b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.1.0"
+      "version": "11.0.0"
     },
     "image_cropper_for_web": {
       "dependency": "transitive",
       "description": {
         "name": "image_cropper_for_web",
-        "sha256": "fd81ebe36f636576094377aab32673c4e5d1609b32dec16fad98d2b71f1250a9",
+        "sha256": "e09749714bc24c4e3b31fbafa2e5b7229b0ff23e8b14d4ba44bd723b77611a0f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.0"
+      "version": "7.0.0"
     },
     "image_cropper_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "image_cropper_platform_interface",
-        "sha256": "6ca6b81769abff9a4dcc3bbd3d75f5dfa9de6b870ae9613c8cd237333a4283af",
+        "sha256": "886a30ec199362cdcc2fbb053b8e53347fbfb9dbbdaa94f9ff85622609f5e7ff",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.1.0"
+      "version": "8.0.0"
     },
     "image_picker": {
       "dependency": "direct main",
@@ -1194,11 +1134,11 @@
       "dependency": "transitive",
       "description": {
         "name": "image_picker_android",
-        "sha256": "28f3987ca0ec702d346eae1d90eda59603a2101b52f1e234ded62cff1d5cfa6e",
+        "sha256": "dd7a61daaa5896cc34b7bc95f66c60225ae6bee0d167dde0e21a9d9016cac0dc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.13+1"
+      "version": "0.8.13+4"
     },
     "image_picker_for_web": {
       "dependency": "transitive",
@@ -1284,11 +1224,11 @@
       "dependency": "transitive",
       "description": {
         "name": "js",
-        "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3",
+        "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.7"
+      "version": "0.7.2"
     },
     "json_annotation": {
       "dependency": "direct main",
@@ -1304,11 +1244,11 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0",
+        "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.0.1"
+      "version": "11.0.2"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
@@ -1364,11 +1304,11 @@
       "dependency": "direct main",
       "description": {
         "name": "logger",
-        "sha256": "55d6c23a6c15db14920e037fe7e0dc32e7cdaf3b64b4b25df2d541b5b6b81c0c",
+        "sha256": "a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.1"
+      "version": "2.6.2"
     },
     "logging": {
       "dependency": "transitive",
@@ -1424,11 +1364,12 @@
     "media_kit": {
       "dependency": "direct main",
       "description": {
-        "name": "media_kit",
-        "sha256": "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62",
-        "url": "https://pub.dev"
+        "path": "media_kit",
+        "ref": "version_1.2.5",
+        "resolved-ref": "8f15c273f3e5c05476d8b19881719a1bd906c4f2",
+        "url": "https://github.com/bggRGjQaUbCoE/media-kit.git"
       },
-      "source": "hosted",
+      "source": "git",
       "version": "1.1.11"
     },
     "media_kit_libs_android_video": {
@@ -1436,8 +1377,8 @@
       "description": {
         "path": "libs/android/media_kit_libs_android_video",
         "ref": "version_1.2.5",
-        "resolved-ref": "f89452bc27af26324a83961c8286d4f41432a5f9",
-        "url": "https://github.com/My-Responsitories/media-kit.git"
+        "resolved-ref": "8f15c273f3e5c05476d8b19881719a1bd906c4f2",
+        "url": "https://github.com/bggRGjQaUbCoE/media-kit.git"
       },
       "source": "git",
       "version": "1.3.7"
@@ -1475,31 +1416,34 @@
     "media_kit_libs_video": {
       "dependency": "direct main",
       "description": {
-        "name": "media_kit_libs_video",
-        "sha256": "20bb4aefa8fece282b59580e1cd8528117297083a6640c98c2e98cfc96b93288",
-        "url": "https://pub.dev"
+        "path": "libs/universal/media_kit_libs_video",
+        "ref": "version_1.2.5",
+        "resolved-ref": "8f15c273f3e5c05476d8b19881719a1bd906c4f2",
+        "url": "https://github.com/bggRGjQaUbCoE/media-kit.git"
       },
-      "source": "hosted",
+      "source": "git",
       "version": "1.0.5"
     },
     "media_kit_libs_windows_video": {
-      "dependency": "transitive",
+      "dependency": "direct overridden",
       "description": {
-        "name": "media_kit_libs_windows_video",
-        "sha256": "dff76da2778729ab650229e6b4ec6ec111eb5151431002cbd7ea304ff1f112ab",
-        "url": "https://pub.dev"
+        "path": "libs/windows/media_kit_libs_windows_video",
+        "ref": "version_1.2.5",
+        "resolved-ref": "8f15c273f3e5c05476d8b19881719a1bd906c4f2",
+        "url": "https://github.com/bggRGjQaUbCoE/media-kit.git"
       },
-      "source": "hosted",
-      "version": "1.0.11"
+      "source": "git",
+      "version": "1.0.10"
     },
     "media_kit_native_event_loop": {
       "dependency": "direct overridden",
       "description": {
-        "name": "media_kit_native_event_loop",
-        "sha256": "7d82e3b3e9ded5c35c3146c5ba1da3118d1dd8ac3435bac7f29f458181471b40",
-        "url": "https://pub.dev"
+        "path": "media_kit_native_event_loop",
+        "ref": "version_1.2.5",
+        "resolved-ref": "8f15c273f3e5c05476d8b19881719a1bd906c4f2",
+        "url": "https://github.com/bggRGjQaUbCoE/media-kit.git"
       },
-      "source": "hosted",
+      "source": "git",
       "version": "1.0.9"
     },
     "media_kit_video": {
@@ -1507,12 +1451,22 @@
       "description": {
         "path": "media_kit_video",
         "ref": "version_1.2.5",
-        "resolved-ref": "c4655bfb4bf81b6bb450d252184da20e2fbba292",
+        "resolved-ref": "8f15c273f3e5c05476d8b19881719a1bd906c4f2",
         "url": "https://github.com/bggRGjQaUbCoE/media-kit.git"
       },
       "source": "git",
       "version": "1.2.5"
     },
+    "menu_base": {
+      "dependency": "transitive",
+      "description": {
+        "name": "menu_base",
+        "sha256": "820368014a171bd1241030278e6c2617354f492f5c703d7b7d4570a6b8b84405",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.1"
+    },
     "meta": {
       "dependency": "transitive",
       "description": {
@@ -1567,11 +1521,11 @@
       "dependency": "direct main",
       "description": {
         "name": "package_info_plus",
-        "sha256": "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968",
+        "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.3.1"
+      "version": "9.0.0"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -1617,11 +1571,11 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db",
+        "sha256": "3b4c1fc3aa55ddc9cd4aa6759984330d5c8e66aa7702a6223c61540dc6380c37",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.18"
+      "version": "2.2.19"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
@@ -1663,18 +1617,8 @@
       "source": "hosted",
       "version": "2.3.0"
     },
-    "permission_handler": {
-      "dependency": "direct main",
-      "description": {
-        "name": "permission_handler",
-        "sha256": "bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "12.0.1"
-    },
     "permission_handler_android": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "permission_handler_android",
         "sha256": "1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6",
@@ -1684,7 +1628,7 @@
       "version": "13.0.1"
     },
     "permission_handler_apple": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "permission_handler_apple",
         "sha256": "f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023",
@@ -1693,18 +1637,8 @@
       "source": "hosted",
       "version": "9.4.7"
     },
-    "permission_handler_html": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_html",
-        "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.3+5"
-    },
     "permission_handler_platform_interface": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "permission_handler_platform_interface",
         "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878",
@@ -1713,16 +1647,6 @@
       "source": "hosted",
       "version": "4.3.0"
     },
-    "permission_handler_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "permission_handler_windows",
-        "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.1"
-    },
     "petitparser": {
       "dependency": "transitive",
       "description": {
@@ -1767,11 +1691,11 @@
       "dependency": "transitive",
       "description": {
         "name": "pool",
-        "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
+        "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.1"
+      "version": "1.5.2"
     },
     "posix": {
       "dependency": "transitive",
@@ -1797,11 +1721,11 @@
       "dependency": "direct main",
       "description": {
         "name": "protobuf",
-        "sha256": "de9c9eb2c33f8e933a42932fe1dc504800ca45ebc3d673e6ed7f39754ee4053e",
+        "sha256": "826d6a306be26f29e5cd9faeb0c97aad5897270341dab6dbd7b8acd675937006",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.0"
+      "version": "5.0.0"
     },
     "pub_semver": {
       "dependency": "transitive",
@@ -1857,11 +1781,11 @@
       "dependency": "transitive",
       "description": {
         "name": "safe_local_storage",
-        "sha256": "ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440",
+        "sha256": "e9a21b6fec7a8aa62cc2585ff4c1b127df42f3185adbd2aca66b47abe2e80236",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.2"
+      "version": "2.0.1"
     },
     "saver_gallery": {
       "dependency": "direct main",
@@ -1873,18 +1797,8 @@
       "source": "hosted",
       "version": "4.0.1"
     },
-    "screen_brightness": {
-      "dependency": "direct main",
-      "description": {
-        "name": "screen_brightness",
-        "sha256": "5f70754028f169f059fdc61112a19dcbee152f8b293c42c848317854d650cba3",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.7"
-    },
     "screen_brightness_android": {
-      "dependency": "transitive",
+      "dependency": "direct overridden",
       "description": {
         "name": "screen_brightness_android",
         "sha256": "d34f5321abd03bc3474f4c381f53d189117eba0b039eac1916aa92cca5fd0a96",
@@ -1894,7 +1808,7 @@
       "version": "2.1.3"
     },
     "screen_brightness_ios": {
-      "dependency": "transitive",
+      "dependency": "direct overridden",
       "description": {
         "name": "screen_brightness_ios",
         "sha256": "2493953340ecfe8f4f13f61db50ce72533a55b0bbd58ba1402893feecf3727f5",
@@ -1903,28 +1817,8 @@
       "source": "hosted",
       "version": "2.1.2"
     },
-    "screen_brightness_macos": {
-      "dependency": "transitive",
-      "description": {
-        "name": "screen_brightness_macos",
-        "sha256": "4edf330ad21078686d8bfaf89413325fbaf571dcebe1e89254d675a3f288b5b9",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.1"
-    },
-    "screen_brightness_ohos": {
-      "dependency": "transitive",
-      "description": {
-        "name": "screen_brightness_ohos",
-        "sha256": "a93a263dcd39b5c56e589eb495bcd001ce65cdd96ff12ab1350683559d5c5bb7",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.2"
-    },
     "screen_brightness_platform_interface": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "screen_brightness_platform_interface",
         "sha256": "737bd47b57746bc4291cab1b8a5843ee881af499514881b0247ec77447ee769c",
@@ -1933,45 +1827,75 @@
       "source": "hosted",
       "version": "2.1.0"
     },
-    "screen_brightness_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "screen_brightness_windows",
-        "sha256": "d3518bf0f5d7a884cee2c14449ae0b36803802866de09f7ef74077874b6b2448",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.1.0"
-    },
-    "scrollable_positioned_list": {
+    "screen_retriever": {
       "dependency": "direct main",
       "description": {
-        "name": "scrollable_positioned_list",
-        "sha256": "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287",
+        "name": "screen_retriever",
+        "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.3.8"
+      "version": "0.2.0"
+    },
+    "screen_retriever_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_linux",
+        "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_macos",
+        "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_platform_interface",
+        "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_windows",
+        "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
     },
     "sentry": {
       "dependency": "transitive",
       "description": {
         "name": "sentry",
-        "sha256": "d9f3dcf1ecdd600cf9ce134f622383adde5423ecfdaf0ca9b20fbc1c44849337",
+        "sha256": "0a3a1e6b3b3873070d4dbefc6968f0d31e698ed55b4eb8ee185b230f35733b59",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.6.0"
+      "version": "9.7.0"
     },
     "share_plus": {
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "d7dc0630a923883c6328ca31b89aa682bacbf2f8304162d29f7c6aaff03a27a1",
+        "sha256": "3424e9d5c22fd7f7590254ba09465febd6f8827c8b19a44350de4ac31d92d3a6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.1.0"
+      "version": "12.0.0"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
@@ -1997,11 +1921,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "a2608114b1ffdcbc9c120eb71a0e207c71da56202852d4aab8a5e30a82269e74",
+        "sha256": "34266009473bf71d748912da4bf62d439185226c03e01e2d9687bc65bbfcb713",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.12"
+      "version": "2.4.15"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -2067,11 +1991,21 @@
       "dependency": "transitive",
       "description": {
         "name": "shelf_web_socket",
-        "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67",
+        "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.1"
+      "version": "3.0.0"
+    },
+    "shortid": {
+      "dependency": "transitive",
+      "description": {
+        "name": "shortid",
+        "sha256": "d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.1.2"
     },
     "sky_engine": {
       "dependency": "transitive",
@@ -2079,26 +2013,6 @@
       "source": "sdk",
       "version": "0.0.0"
     },
-    "source_gen": {
-      "dependency": "transitive",
-      "description": {
-        "name": "source_gen",
-        "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.5.0"
-    },
-    "source_helper": {
-      "dependency": "transitive",
-      "description": {
-        "name": "source_helper",
-        "sha256": "86d247119aedce8e63f4751bd9626fc9613255935558447569ad42f9f5b48b3c",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.3.5"
-    },
     "source_span": {
       "dependency": "transitive",
       "description": {
@@ -2209,6 +2123,17 @@
       "source": "hosted",
       "version": "1.4.1"
     },
+    "super_sliver_list": {
+      "dependency": "direct main",
+      "description": {
+        "path": ".",
+        "ref": "mod",
+        "resolved-ref": "71f34fa179e2d05818004e22e632dd59f2a223be",
+        "url": "https://github.com/bggRGjQaUbCoE/super_sliver_list.git"
+      },
+      "source": "git",
+      "version": "0.4.1"
+    },
     "synchronized": {
       "dependency": "direct main",
       "description": {
@@ -2239,15 +2164,15 @@
       "source": "hosted",
       "version": "0.7.6"
     },
-    "timing": {
-      "dependency": "transitive",
+    "tray_manager": {
+      "dependency": "direct main",
       "description": {
-        "name": "timing",
-        "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe",
+        "name": "tray_manager",
+        "sha256": "537e539f48cd82d8ee2240d4330158c7b44c7e043e8e18b5811f2f8f6b7df25a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.2"
+      "version": "0.5.1"
     },
     "tuple": {
       "dependency": "transitive",
@@ -2279,25 +2204,15 @@
       "source": "hosted",
       "version": "2.2.2"
     },
-    "universal_platform": {
-      "dependency": "direct main",
-      "description": {
-        "name": "universal_platform",
-        "sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.1.0"
-    },
     "uri_parser": {
       "dependency": "transitive",
       "description": {
         "name": "uri_parser",
-        "sha256": "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835",
+        "sha256": "ff4d2c720aca3f4f7d5445e23b11b2d15ef8af5ddce5164643f38ff962dcb270",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.2"
+      "version": "3.0.0"
     },
     "url_launcher": {
       "dependency": "direct main",
@@ -2313,11 +2228,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "69ee86740f2847b9a4ba6cffa74ed12ce500bbe2b07f3dc1e643439da60637b7",
+        "sha256": "5c8b6c2d89a78f5a1cca70a73d9d5f86c701b36b42f9c9dac7bad592113c28e9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.18"
+      "version": "6.3.24"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
@@ -2453,31 +2368,31 @@
       "dependency": "direct main",
       "description": {
         "name": "wakelock_plus",
-        "sha256": "a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678",
+        "sha256": "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.4.0"
     },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "wakelock_plus_platform_interface",
-        "sha256": "e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207",
+        "sha256": "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.3"
+      "version": "1.3.0"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c",
+        "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.3"
+      "version": "1.1.4"
     },
     "waterfall_flow": {
       "dependency": "direct main",
@@ -2534,11 +2449,11 @@
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03",
+        "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.14.0"
+      "version": "5.15.0"
     },
     "win32_registry": {
       "dependency": "transitive",
@@ -2550,6 +2465,17 @@
       "source": "hosted",
       "version": "2.1.0"
     },
+    "window_manager": {
+      "dependency": "direct main",
+      "description": {
+        "path": "packages/window_manager",
+        "ref": "main",
+        "resolved-ref": "974ab0a71d37cfca9d9bd5b295d7bd1df80b790b",
+        "url": "https://github.com/bggRGjQaUbCoE/window_manager.git"
+      },
+      "source": "git",
+      "version": "0.5.1"
+    },
     "xdg_directories": {
       "dependency": "transitive",
       "description": {
@@ -2583,6 +2509,6 @@
   },
   "sdks": {
     "dart": ">=3.9.0 <4.0.0",
-    "flutter": ">=3.35.3"
+    "flutter": "3.35.5"
   }
 }
diff --git a/pkgs/by-name/pi/piliplus/src-info.json b/pkgs/by-name/pi/piliplus/src-info.json
new file mode 100644
index 000000000000..320d88eef710
--- /dev/null
+++ b/pkgs/by-name/pi/piliplus/src-info.json
@@ -0,0 +1,7 @@
+{
+  "version": "1.1.4.10",
+  "rev": "4cf1c25b36d2d3bb7b1efa1b00b1d33c593ce4b0",
+  "revCount": 4215,
+  "commitDate": 1760358940,
+  "hash": "sha256-sToT5saB/cPSvyrOG4XfMianXXLfg3iQlvJvwtAf6b8="
+}
diff --git a/pkgs/by-name/pi/piliplus/update.rb b/pkgs/by-name/pi/piliplus/update.rb
index 0789a465f35d..638a4c5b9b71 100755
--- a/pkgs/by-name/pi/piliplus/update.rb
+++ b/pkgs/by-name/pi/piliplus/update.rb
@@ -17,7 +17,7 @@ def package_attr attr_path
   JSON.parse stdout rescue abort "Failed to parse JSON output from nix-instantiate when reading attr #{attr_path}"
 end
 
-def github_api path, token: ENV['GITHUB_TOKEN']
+def github_api path, token: ENV['GITHUB_TOKEN'], headers: []
   uri = URI.join 'https://api.github.com', path
   res = Net::HTTP.start uri.host, uri.port, use_ssl: true do |http|
     req = Net::HTTP::Get.new uri
@@ -25,7 +25,10 @@ def github_api path, token: ENV['GITHUB_TOKEN']
     http.request req
   end
   abort "Failed to fetch #{path}: #{res.code} #{res.message}" unless res.is_a? Net::HTTPSuccess
-  JSON.parse res.body rescue abort "Failed to parse JSON response from GitHub"
+  body = JSON.parse res.body rescue abort "Failed to parse JSON response from GitHub"
+  return body if headers.empty?
+  header_values = headers.map { res[_1] }
+  [body, *header_values]
 end
 
 def prefetch_git url, rev
@@ -34,14 +37,6 @@ def prefetch_git url, rev
   JSON.parse stdout rescue abort "Failed to parse JSON output from nix-prefetch-git"
 end
 
-def replace_in_file filename, searches, replacements
-  contents = File.read filename
-  searches.zip replacements do |search, replacement|
-    contents.sub! search, replacement or abort "Failed to replace #{search} -> #{replacement} in #{filename}"
-  end
-  File.write filename, contents
-end
-
 def json_write filename, object
   File.open(filename, 'w') { _1.puts JSON.pretty_generate object }
 end
@@ -57,13 +52,25 @@ log "Current version: #{old_version} #{old_rev} #{old_hash}"
 
 new_version = github_api("/repos/#{owner}/#{repo}/releases/latest")['tag_name'] or abort "No `tag_name` field in GitHub response"
 finish "Already up-to-date" if new_version == old_version
-new_rev, new_hash, src_path = prefetch_git(git_url, new_version).values_at 'rev', 'hash', 'path'
+new_rev, new_hash, src_path, date = prefetch_git(git_url, new_version).values_at 'rev', 'hash', 'path', 'date'
+date = Time.new(date).to_i
 log "New version: #{new_version} #{new_rev} #{new_hash}"
 
+_, commit_links = github_api "/repos/#{owner}/#{repo}/commits?sha=#{new_rev}&per_page=1", headers: ['link']
+git_count = commit_links[/[&?]page=(\d+)>; rel="last"/, 1]&.to_i
+abort "Cannot determine git commit count from GitHub response" unless git_count
+
 nix_filename = package_attr('meta.position')[/([^:]+):\d+/, 1] or abort "Failed to find the Nix file to be updated"
 nix_dir = File.dirname nix_filename
-replace_in_file nix_filename, [old_version, old_rev, old_hash], [new_version, new_rev, new_hash]
-log "Updated #{nix_filename}"
+src_info_path = File.join nix_dir, 'src-info.json'
+json_write src_info_path, {
+  version: new_version,
+  rev: new_rev,
+  revCount: git_count,
+  commitDate: date,
+  hash: new_hash
+}
+log "Updated #{src_info_path}"
 
 pubspec_lock_path = File.join nix_dir, 'pubspec.lock.json'
 old_pubspec_lock = JSON.load_file pubspec_lock_path rescue abort "Failed to read #{pubspec_lock_path}"

From 7e4e682ad47d44c73b0e70d6f3928cd4feb28c20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Oct 2025 00:38:34 +0000
Subject: [PATCH 0750/6226] clightning: 25.09 -> 25.09.1

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

diff --git a/pkgs/by-name/cl/clightning/package.nix b/pkgs/by-name/cl/clightning/package.nix
index 28b59322c36e..59cd5fcd1516 100644
--- a/pkgs/by-name/cl/clightning/package.nix
+++ b/pkgs/by-name/cl/clightning/package.nix
@@ -29,11 +29,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "clightning";
-  version = "25.09";
+  version = "25.09.1";
 
   src = fetchurl {
     url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
-    hash = "sha256-qX9EZHuDtEcYCU8YOMbHTo3JDAAJ8nc6N7F/+AAEpn4=";
+    hash = "sha256-maH+SSMunXH43Hl9FFvk5L6n4e06vgsL3T8W3ydy+hQ=";
   };
 
   # when building on darwin we need cctools to provide the correct libtool

From 497ee3c70707fd71b45c37d48ae1d45e79751047 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Oct 2025 01:40:26 +0000
Subject: [PATCH 0751/6226] davinci-resolve: 20.2.1 -> 20.2.2

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

diff --git a/pkgs/by-name/da/davinci-resolve/package.nix b/pkgs/by-name/da/davinci-resolve/package.nix
index fd90be690af0..44c8fdb3cf59 100644
--- a/pkgs/by-name/da/davinci-resolve/package.nix
+++ b/pkgs/by-name/da/davinci-resolve/package.nix
@@ -35,7 +35,7 @@ let
   davinci = (
     stdenv.mkDerivation rec {
       pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}";
-      version = "20.2.1";
+      version = "20.2.2";
 
       nativeBuildInputs = [
         (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; })
@@ -57,9 +57,9 @@ let
             outputHashAlgo = "sha256";
             outputHash =
               if studioVariant then
-                "sha256-emAVfA9mclwJSiT9oVvLVhCy2GXGQVsvg4pj3vodxk8="
+                "sha256-4TpB0kFQpWLkfLFo5txe4km/TjxJ+ajYnJ28UdQvncA="
               else
-                "sha256-/OQhi4y07TOyeIdD18URBr4qAfuPhd2mr0giqgTEfk0=";
+                "sha256-A70WknvKE35AI+U0drSTFpM5T7gJVf2EYtWdxaxbbA0=";
 
             impureEnvVars = lib.fetchers.proxyImpureEnvVars;
 

From 250b2094fb9a4361dce9c392bbe642c7835801eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Oct 2025 02:23:21 +0000
Subject: [PATCH 0752/6226] python3Packages.blake3: 1.0.7 -> 1.0.8

---
 .../python-modules/blake3/Cargo.lock           | 18 +++++++++---------
 .../python-modules/blake3/default.nix          |  4 ++--
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/blake3/Cargo.lock b/pkgs/development/python-modules/blake3/Cargo.lock
index 51c44b074a00..2900a83a5108 100644
--- a/pkgs/development/python-modules/blake3/Cargo.lock
+++ b/pkgs/development/python-modules/blake3/Cargo.lock
@@ -22,7 +22,7 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "blake3"
-version = "1.0.7"
+version = "1.0.8"
 dependencies = [
  "blake3 1.8.2",
  "hex",
@@ -47,9 +47,9 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.39"
+version = "1.2.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1354349954c6fc9cb0deab020f27f783cf0b604e8bb754dc4658ecf0d29c35f"
+checksum = "ac9fe6cdbb24b6ade63616c0a0688e45bb56732262c158df3c0c4bea4ca47cb7"
 dependencies = [
  "find-msvc-tools",
  "shlex",
@@ -57,9 +57,9 @@ dependencies = [
 
 [[package]]
 name = "cfg-if"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "constant_time_eq"
@@ -100,9 +100,9 @@ checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 
 [[package]]
 name = "find-msvc-tools"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ced73b1dacfc750a6db6c0a0c3a3853c8b41997e2e2c563dc90804ae6867959"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
 
 [[package]]
 name = "heck"
@@ -124,9 +124,9 @@ checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
 
 [[package]]
 name = "libc"
-version = "0.2.176"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
 name = "memmap2"
diff --git a/pkgs/development/python-modules/blake3/default.nix b/pkgs/development/python-modules/blake3/default.nix
index ff6dfe06ceb3..64e17f626b31 100644
--- a/pkgs/development/python-modules/blake3/default.nix
+++ b/pkgs/development/python-modules/blake3/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "blake3";
-  version = "1.0.7";
+  version = "1.0.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "oconnor663";
     repo = "blake3-py";
     tag = version;
-    hash = "sha256-km4vN/xKvjNd/bdHEIsUR9+Hmi0K5ju+wlQ2kuuDzzI=";
+    hash = "sha256-gwPGSah9qzApDwsBNABRLPZGrpaO3WArHoK6Jj6WJzo=";
   };
 
   postPatch = ''

From 4a7701a2f3208a0cb02c0b0fef3a2ddf00894a5a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Oct 2025 02:27:16 +0000
Subject: [PATCH 0753/6226] rhythmbox: 3.4.8 -> 3.4.9

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

diff --git a/pkgs/by-name/rh/rhythmbox/package.nix b/pkgs/by-name/rh/rhythmbox/package.nix
index 1bdd2929bb7a..12696be0fd5f 100644
--- a/pkgs/by-name/rh/rhythmbox/package.nix
+++ b/pkgs/by-name/rh/rhythmbox/package.nix
@@ -39,11 +39,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rhythmbox";
-  version = "3.4.8";
+  version = "3.4.9";
 
   src = fetchurl {
     url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "IBaoqNKpWcB6RnrJaCxu1gW6iIP7dgQQ1otoq4ON+fI=";
+    sha256 = "5CKRoY33oh/+azUr9z8F1+KYu04FvOWWf5jujO5ECPE=";
   };
 
   nativeBuildInputs = [

From a8ff1279630df65f1bbd2127ac8609dcd6ecfaea Mon Sep 17 00:00:00 2001
From: qzylinra <225773816+qzylinra@users.noreply.github.com>
Date: Thu, 16 Oct 2025 11:26:57 +0800
Subject: [PATCH 0754/6226] keyguard: 1.15.1 -> 1.15.2

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

diff --git a/pkgs/by-name/ke/keyguard/package.nix b/pkgs/by-name/ke/keyguard/package.nix
index 812db254a1b9..1eb8649a530a 100644
--- a/pkgs/by-name/ke/keyguard/package.nix
+++ b/pkgs/by-name/ke/keyguard/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "keyguard";
-  version = "1.15.1";
+  version = "1.15.2";
 
   src = fetchFromGitHub {
     owner = "AChep";
     repo = "keyguard-app";
-    tag = "r20251012";
-    hash = "sha256-f3dKdoyosE7Ech1eB03XK/PPILAeLzF0XXo2oHa0oRI=";
+    tag = "r20251015";
+    hash = "sha256-1e3AZ07CfRFj6b3hiJFcypsHFwhedRdQ3+StEHXSacU=";
   };
 
   postPatch = ''

From d37ee6e262a53eee2b813d1a6d2ede457d82995a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Oct 2025 03:39:09 +0000
Subject: [PATCH 0755/6226] libcava: 0.10.4 -> 0.10.6

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

diff --git a/pkgs/by-name/li/libcava/package.nix b/pkgs/by-name/li/libcava/package.nix
index cd0516a98fe4..0067bd5e99df 100644
--- a/pkgs/by-name/li/libcava/package.nix
+++ b/pkgs/by-name/li/libcava/package.nix
@@ -8,13 +8,13 @@
 cava.overrideAttrs (old: rec {
   pname = "libcava";
   # fork may not be updated when we update upstream
-  version = "0.10.4";
+  version = "0.10.6";
 
   src = fetchFromGitHub {
     owner = "LukashonakV";
     repo = "cava";
     tag = version;
-    hash = "sha256-9eTDqM+O1tA/3bEfd1apm8LbEcR9CVgELTIspSVPMKM=";
+    hash = "sha256-63be1wypMiqhPA6sjMebmFE6yKpTj/bUE53sMWun554=";
   };
 
   nativeBuildInputs = old.nativeBuildInputs ++ [

From 7a2d3558b4c7d605dfc84cd5197a55bbb47106f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Oct 2025 04:14:29 +0000
Subject: [PATCH 0756/6226] gui-for-singbox: 1.9.9 -> 1.13.0

---
 pkgs/by-name/gu/gui-for-singbox/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix
index af8eab5f403b..9e0b4fcf0533 100644
--- a/pkgs/by-name/gu/gui-for-singbox/package.nix
+++ b/pkgs/by-name/gu/gui-for-singbox/package.nix
@@ -16,13 +16,13 @@
 
 let
   pname = "gui-for-singbox";
-  version = "1.9.9";
+  version = "1.13.0";
 
   src = fetchFromGitHub {
     owner = "GUI-for-Cores";
     repo = "GUI.for.SingBox";
     tag = "v${version}";
-    hash = "sha256-6Y0eEJmPBp+J1r6LCxYEM6i3fdCYSo4LrimpqwOCVT8=";
+    hash = "sha256-oReDI6w+N82f+DSv1mPvr0hPG7CJ7CbIFljhSNQ86cI=";
   };
 
   metaCommon = {
@@ -50,7 +50,7 @@ let
         sourceRoot
         ;
       fetcherVersion = 2;
-      hash = "sha256-kSIPkXD0Wxe8TaKDd4DUAL7pkQeU8xyLY9K3lFSAODI=";
+      hash = "sha256-gSgryNui5uXuJEKoojz+knZ8rlJpjaR2+XF3xTwV5YI=";
     };
 
     buildPhase = ''
@@ -87,7 +87,7 @@ buildGoModule {
       --subst-var out
   '';
 
-  vendorHash = "sha256-UArCB5U2bF5HXFDU1oCfm+SaURe6e9gyCx+UjtWI/ug=";
+  vendorHash = "sha256-3kQWCjxCom/Sb4RzRF55NsDfSA9F9mOLy9sYVFUaevY=";
 
   nativeBuildInputs = [
     autoPatchelfHook

From 15d63fdcb7f981ffc5d18c200d21acb5363a0499 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Thu, 16 Oct 2025 08:09:20 +0200
Subject: [PATCH 0757/6226] python3Packages.commoncode: 32.2.1 -> 32.3.0 Fixes
 build after click 8.2 upgrade

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

diff --git a/pkgs/development/python-modules/commoncode/default.nix b/pkgs/development/python-modules/commoncode/default.nix
index 5a90c3bd3a4a..a107a6fd888d 100644
--- a/pkgs/development/python-modules/commoncode/default.nix
+++ b/pkgs/development/python-modules/commoncode/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "commoncode";
-  version = "32.2.1";
+  version = "32.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "nexB";
     repo = "commoncode";
     tag = "v${version}";
-    hash = "sha256-dCiERdNVup95UnvmJEzkpQsRvpk2eKqvwD6jkEBrXfE=";
+    hash = "sha256-FL9t8r53AJLR5D2XSEOq7qVHgvvHIbtPW5iVpSQCVsQ=";
   };
 
   dontConfigure = true;

From 8a7504fc15498862cd06ee67960f51fed5933ddf Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Thu, 16 Oct 2025 10:41:43 +0200
Subject: [PATCH 0758/6226] mastodon: make updateScript generate a yarnHash
 again

---
 pkgs/servers/mastodon/update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/mastodon/update.sh b/pkgs/servers/mastodon/update.sh
index 6874b8223c3b..75d7e9b74540 100755
--- a/pkgs/servers/mastodon/update.sh
+++ b/pkgs/servers/mastodon/update.sh
@@ -113,6 +113,6 @@ echo "" >> gemset.nix  # Create trailing newline to please EditorConfig checks
 
 echo "Updating yarnHash"
 yarn-berry-fetcher missing-hashes "$SOURCE_DIR/yarn.lock" > missing-hashes.json
-YARN_HASH="$(yarn-berry-fetcher prefetch "$SOURCE_DIR/yarn.lock" 2>/dev/null)"
+YARN_HASH="$(yarn-berry-fetcher prefetch "$SOURCE_DIR/yarn.lock" ./missing-hashes.json 2>/dev/null)"
 sed -i "s;sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=;$YARN_HASH;g" source.nix
 

From bc4cf3302482440a17766c7ea0122a328c70d5ba Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Thu, 16 Oct 2025 10:56:45 +0200
Subject: [PATCH 0759/6226] protonvpn-cli: remove

protonvpn-cli source code was removed from upstream.
Use protonvpn-gui instead.

https://github.com/protonvpn/linux-cli is now 404
---
 .../networking/protonvpn-cli/default.nix      | 60 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 1 insertion(+), 61 deletions(-)
 delete mode 100644 pkgs/applications/networking/protonvpn-cli/default.nix

diff --git a/pkgs/applications/networking/protonvpn-cli/default.nix b/pkgs/applications/networking/protonvpn-cli/default.nix
deleted file mode 100644
index 1d77b76825ea..000000000000
--- a/pkgs/applications/networking/protonvpn-cli/default.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  lib,
-  buildPythonApplication,
-  pythonOlder,
-  fetchFromGitHub,
-  protonvpn-nm-lib,
-  pythondialog,
-  dialog,
-  wrapGAppsNoGuiHook,
-  gobject-introspection,
-  glib,
-}:
-
-buildPythonApplication rec {
-  pname = "protonvpn-cli";
-  version = "3.13.0";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.5";
-
-  src = fetchFromGitHub {
-    owner = "protonvpn";
-    repo = "linux-cli";
-    tag = version;
-    sha256 = "sha256-KhfogC23i7THe6YZJ6Sy1+q83vZupHsS69NurHCeo8I=";
-  };
-
-  nativeBuildInputs = [
-    wrapGAppsNoGuiHook
-    gobject-introspection
-  ];
-
-  buildInputs = [
-    glib
-  ];
-
-  propagatedBuildInputs = [
-    protonvpn-nm-lib
-    pythondialog
-    dialog
-  ];
-
-  dontWrapGApps = true;
-
-  makeWrapperArgs = [
-    "\${gappsWrapperArgs[@]}"
-  ];
-
-  # Project has a dummy test
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Linux command-line client for ProtonVPN";
-    homepage = "https://github.com/protonvpn/linux-cli";
-    maintainers = [ ];
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    mainProgram = "protonvpn-cli";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 100178208b70..a21bca701ad7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2209,6 +2209,7 @@ mapAliases {
   protobuf3_21 = protobuf_21; # Added 2023-10-05
   protoc-gen-connect-es = throw "'protoc-gen-connect-es' has been removed because it is deprecated upstream. Functionality has been integrated into 'protoc-gen-es' v2."; # Added 2025-02-18
   protonup = protonup-ng; # Added 2022-11-06
+  protonvpn-cli = throw "protonvpn-cli source code was removed from upstream. Use protonvpn-gui instead."; # Added 2025-10-16
   protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12
   proton-caller = throw "'proton-caller' has been removed from nixpkgs due to being unmaintained and lack of upstream maintenance."; # Added 2025-09-25
   proton-vpn-local-agent = lib.warnOnInstantiate "'proton-vpn-local-agent' has been renamed to 'python3Packages.proton-vpn-local-agent'" (
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5634a13c2734..000e2a936724 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12213,7 +12213,6 @@ with pkgs;
     // (config.profanity or { })
   );
 
-  protonvpn-cli = python3Packages.callPackage ../applications/networking/protonvpn-cli { };
   protonvpn-cli_2 = python3Packages.callPackage ../applications/networking/protonvpn-cli/2.nix { };
 
   protonvpn-gui = python3Packages.callPackage ../applications/networking/protonvpn-gui { };

From 033c5ebaf65147c8bd9511f30153ad725b3e8bdc Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Thu, 16 Oct 2025 10:55:50 +0200
Subject: [PATCH 0760/6226] python3Packages.protonvpn-nm-lib: remove

Project has been removed from upstream:
https://github.com/ProtonVPN/protonvpn-nm-lib is now 404
---
 .../0001-Patching-GIRepository.patch          | 22 -----
 .../protonvpn-nm-lib/default.nix              | 81 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  4 -
 4 files changed, 1 insertion(+), 107 deletions(-)
 delete mode 100644 pkgs/development/python-modules/protonvpn-nm-lib/0001-Patching-GIRepository.patch
 delete mode 100644 pkgs/development/python-modules/protonvpn-nm-lib/default.nix

diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/0001-Patching-GIRepository.patch b/pkgs/development/python-modules/protonvpn-nm-lib/0001-Patching-GIRepository.patch
deleted file mode 100644
index bb34dff0b5a6..000000000000
--- a/pkgs/development/python-modules/protonvpn-nm-lib/0001-Patching-GIRepository.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From 2867f022aad754fe54d95222b3ae52f6e7f14c2f Mon Sep 17 00:00:00 2001
-From: "P. R. d. O" <d.ol.rod@tutanota.com>
-Date: Wed, 27 Apr 2022 21:49:12 -0600
-Subject: [PATCH] Patching GIRepository
-
----
- protonvpn_nm_lib/__init__.py | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/protonvpn_nm_lib/__init__.py b/protonvpn_nm_lib/__init__.py
-index e69de29..00b95f4 100644
---- a/protonvpn_nm_lib/__init__.py
-+++ b/protonvpn_nm_lib/__init__.py
-@@ -0,0 +1,5 @@
-+import gi
-+gi.require_version('GIRepository', '2.0')
-+from gi.repository import GIRepository
-+repo = GIRepository.Repository.get_default()
-+repo.prepend_search_path('@networkmanager_path@')
--- 
-2.35.1
-
diff --git a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix b/pkgs/development/python-modules/protonvpn-nm-lib/default.nix
deleted file mode 100644
index 43784048fdd3..000000000000
--- a/pkgs/development/python-modules/protonvpn-nm-lib/default.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pythonOlder,
-  replaceVars,
-  dbus-python,
-  distro,
-  jinja2,
-  keyring,
-  proton-client,
-  pygobject3,
-  pyxdg,
-  systemd,
-  ncurses,
-  networkmanager,
-  pkgs-systemd,
-  python,
-  xdg-utils,
-}:
-
-buildPythonPackage rec {
-  pname = "protonvpn-nm-lib";
-  version = "3.16.0";
-  format = "setuptools";
-  disabled = pythonOlder "3.7";
-
-  src = fetchFromGitHub {
-    owner = "ProtonVPN";
-    repo = "protonvpn-nm-lib";
-    tag = version;
-    hash = "sha256-n3jfBHMYqyQZgvFFJcylNbTWZ3teuqhdelTfpNrwWuA=";
-  };
-
-  propagatedBuildInputs = [
-    dbus-python
-    distro
-    jinja2
-    keyring
-    proton-client
-    pygobject3
-    pyxdg
-    systemd
-    ncurses
-    networkmanager
-    pkgs-systemd
-    xdg-utils
-  ];
-
-  patches = [
-    (replaceVars ./0001-Patching-GIRepository.patch {
-      networkmanager_path = "${networkmanager}/lib/girepository-1.0";
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace protonvpn_nm_lib/core/dbus/dbus_reconnect.py \
-      --replace "exec_start = python_interpreter_path + \" \" + python_service_path" "exec_start = \"$out/bin/protonvpn_reconnector.py\""
-  '';
-
-  postInstall = ''
-    makeWrapper ${python.interpreter} $out/bin/protonvpn_reconnector.py \
-      --add-flags $out/${python.sitePackages}/protonvpn_nm_lib/daemon/dbus_daemon_reconnector.py \
-      --prefix PYTHONPATH : "$PYTHONPATH"
-  '';
-
-  # Checks cannot be run in the sandbox
-  # "Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory"
-  doCheck = false;
-
-  pythonImportsCheck = [ "protonvpn_nm_lib" ];
-
-  meta = with lib; {
-    description = "ProtonVPN NetworkManager Library intended for every ProtonVPN service user";
-    mainProgram = "protonvpn_reconnector.py";
-    homepage = "https://github.com/ProtonVPN/protonvpn-nm-lib";
-    license = licenses.gpl3Only;
-    maintainers = [ ];
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index b0802068b303..96dd8384c176 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -545,6 +545,7 @@ mapAliases {
   prometheus_client = prometheus-client; # added 2021-06-10
   prompt_toolkit = prompt-toolkit; # added 2021-07-22
   protonup = protonup-ng; # Added 2022-11-06
+  protonvpn-nm-lib = throw "protonvpn-nm-lib source code was removed from upstream"; # Added 2025-10-16
   proton-keyring-linux-secretservice = throw "proton-keyring-linux-secretservice functionality was integrated in the proton-keyring-linux module"; # added 2024-10-16
   proton-vpn-connection = throw "proton-vpn-connection functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16
   proton-vpn-killswitch = throw "proton-vpn-killswitch functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 59c777b281b3..9c5631d559ff 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12287,10 +12287,6 @@ self: super: with self; {
 
   protonup-ng = callPackage ../development/python-modules/protonup-ng { };
 
-  protonvpn-nm-lib = callPackage ../development/python-modules/protonvpn-nm-lib {
-    pkgs-systemd = pkgs.systemd;
-  };
-
   prov = callPackage ../development/python-modules/prov { };
 
   prox-tv = callPackage ../development/python-modules/prox-tv { };

From f5bcdb19517ebec1b3f74e01a25c25c27c193995 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Thu, 16 Oct 2025 10:59:44 +0200
Subject: [PATCH 0761/6226] protonvpn-cli_2: remove

Package has been removed due to being deprecated upstream.
---
 .../networking/protonvpn-cli/2.nix            | 57 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 59 deletions(-)
 delete mode 100644 pkgs/applications/networking/protonvpn-cli/2.nix

diff --git a/pkgs/applications/networking/protonvpn-cli/2.nix b/pkgs/applications/networking/protonvpn-cli/2.nix
deleted file mode 100644
index a707832771a6..000000000000
--- a/pkgs/applications/networking/protonvpn-cli/2.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{
-  lib,
-  buildPythonApplication,
-  fetchFromGitHub,
-  pythonOlder,
-  requests,
-  docopt,
-  pythondialog,
-  jinja2,
-  distro,
-  dialog,
-  iptables,
-  openvpn,
-}:
-
-buildPythonApplication rec {
-  pname = "protonvpn-cli_2";
-  version = "2.2.12";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.5";
-
-  src = fetchFromGitHub {
-    owner = "Rafficer";
-    repo = "linux-cli-community";
-    # There is a tag and branch with the same name
-    rev = "refs/tags/v${version}";
-    sha256 = "sha256-vNbqjdkIRK+MkYRKUUe7W5Ytc1PU1t5ZLr9fPDOZXUs=";
-  };
-
-  propagatedBuildInputs = [
-    requests
-    docopt
-    pythondialog
-    jinja2
-    distro
-    dialog
-    openvpn
-    iptables
-  ];
-
-  # No tests
-  doCheck = false;
-
-  meta = with lib; {
-    description = "Linux command-line client for ProtonVPN using Openvpn";
-    homepage = "https://github.com/Rafficer/linux-cli-community";
-    maintainers = with maintainers; [
-      jtcoolen
-      jefflabonte
-      shamilton
-    ];
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    mainProgram = "protonvpn";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a21bca701ad7..313205e6fd86 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2210,6 +2210,7 @@ mapAliases {
   protoc-gen-connect-es = throw "'protoc-gen-connect-es' has been removed because it is deprecated upstream. Functionality has been integrated into 'protoc-gen-es' v2."; # Added 2025-02-18
   protonup = protonup-ng; # Added 2022-11-06
   protonvpn-cli = throw "protonvpn-cli source code was removed from upstream. Use protonvpn-gui instead."; # Added 2025-10-16
+  protonvpn-cli_2 = throw "protonvpn-cli_2 has been removed due to being deprecated. Use protonvpn-gui instead."; # Added 2025-10-16
   protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12
   proton-caller = throw "'proton-caller' has been removed from nixpkgs due to being unmaintained and lack of upstream maintenance."; # Added 2025-09-25
   proton-vpn-local-agent = lib.warnOnInstantiate "'proton-vpn-local-agent' has been renamed to 'python3Packages.proton-vpn-local-agent'" (
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 000e2a936724..050382f775b6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12213,8 +12213,6 @@ with pkgs;
     // (config.profanity or { })
   );
 
-  protonvpn-cli_2 = python3Packages.callPackage ../applications/networking/protonvpn-cli/2.nix { };
-
   protonvpn-gui = python3Packages.callPackage ../applications/networking/protonvpn-gui { };
 
   psi = libsForQt5.callPackage ../applications/networking/instant-messengers/psi { };

From aff8623e5354e77fd01f1889d75aa7639ac05052 Mon Sep 17 00:00:00 2001
From: bstanderline <153822813+bstanderline@users.noreply.github.com>
Date: Thu, 16 Oct 2025 10:10:32 +0100
Subject: [PATCH 0762/6226] zabbix: 6.0.41 -> 6.0.42

---
 pkgs/servers/monitoring/zabbix/versions.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/zabbix/versions.nix b/pkgs/servers/monitoring/zabbix/versions.nix
index 2332e8dbfb2f..0930b0e983f2 100644
--- a/pkgs/servers/monitoring/zabbix/versions.nix
+++ b/pkgs/servers/monitoring/zabbix/versions.nix
@@ -12,7 +12,7 @@ generic: {
     hash = "sha256-ML7wFzSTsZk3fJBhs06KLhaijrDW9+nHuUJDPkt1Nn8=";
   };
   v60 = generic {
-    version = "6.0.41";
-    hash = "sha256-E5dtwTdSMV4RIR90eEqh+2keDYmeKWeEDRM0PuA4dxM=";
+    version = "6.0.42";
+    hash = "sha256-Ale517dbuqzjmBMYqJlAtY01F9Bd+W7spegjTHyTJWA=";
   };
 }

From ac63851b91746a1286a73554bba29bcbcbc2e14c Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss@proton.me>
Date: Thu, 16 Oct 2025 13:11:41 +0300
Subject: [PATCH 0763/6226] cargo-hakari: 0.9.35 -> 0.9.36

---
 pkgs/by-name/ca/cargo-hakari/package.nix | 25 ++++++++++--------------
 1 file changed, 10 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-hakari/package.nix b/pkgs/by-name/ca/cargo-hakari/package.nix
index 8f18dc31b309..e46cbf453230 100644
--- a/pkgs/by-name/ca/cargo-hakari/package.nix
+++ b/pkgs/by-name/ca/cargo-hakari/package.nix
@@ -6,46 +6,40 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-hakari";
-  version = "0.9.35";
+  version = "0.9.36";
 
   src = fetchFromGitHub {
     owner = "guppy-rs";
     repo = "guppy";
-    tag = "cargo-hakari-${version}";
-    hash = "sha256-+IjtK4kSm2vThgIxDsBLpoh0j9cDhhEqI6Hr2BmC7hc=";
+    tag = "cargo-hakari-${finalAttrs.version}";
+    hash = "sha256-qEYdJhLt4f3+RZz3/T6/vlQgrQYK6S5dNEmu8QH/wj0=";
   };
 
-  cargoHash = "sha256-yAk0hMB3OEaaIuNqiJtl1K5P19pOGtiyt4cvU+Nb814=";
+  cargoHash = "sha256-NrPfdVAi0QblJKFsHTL0BGQWUnqQEpIJwW3HBVHFZpE=";
 
   cargoBuildFlags = [
     "-p"
     "cargo-hakari"
   ];
-  cargoTestFlags = [
-    "-p"
-    "cargo-hakari"
-  ];
+  cargoTestFlags = finalAttrs.cargoBuildFlags;
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
   versionCheckProgramArg = "--version";
 
-  passthru = {
-    updateScript = nix-update-script { };
-  };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Manage workspace-hack packages to speed up builds in large workspaces";
-    mainProgram = "cargo-hakari";
     longDescription = ''
       cargo hakari is a command-line application to manage workspace-hack crates.
       Use it to speed up local cargo build and cargo check commands by 15-95%,
       and cumulatively by 20-25% or more.
     '';
     homepage = "https://crates.io/crates/cargo-hakari";
-    changelog = "https://github.com/guppy-rs/guppy/blob/cargo-hakari-${version}/tools/cargo-hakari/CHANGELOG.md";
+    changelog = "https://github.com/guppy-rs/guppy/blob/cargo-hakari-${finalAttrs.version}/tools/cargo-hakari/CHANGELOG.md";
     license = with lib.licenses; [
       mit
       asl20
@@ -55,5 +49,6 @@ rustPlatform.buildRustPackage rec {
       macalinao
       nartsiss
     ];
+    mainProgram = "cargo-hakari";
   };
-}
+})

From cfc9f8808746119226fefd0afdbffaa7e42eb2e9 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Thu, 16 Oct 2025 12:19:43 +0200
Subject: [PATCH 0764/6226] magnetophonDSP.Constant-Detune-Chorus: un-break

---
 .../audio/magnetophonDSP/ConstantDetuneChorus/default.nix       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
index b10cb501e12e..24dda36ca000 100644
--- a/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
+++ b/pkgs/applications/audio/magnetophonDSP/ConstantDetuneChorus/default.nix
@@ -42,7 +42,5 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/magnetophon/constant-detune-chorus";
     license = lib.licenses.gpl3;
     maintainers = [ lib.maintainers.magnetophon ];
-    # ERROR3 : n is NaN in an Interval
-    broken = true;
   };
 }

From fd9654e451166b1e14ddc4d39cd464ec067542fe Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Thu, 16 Oct 2025 12:22:29 +0200
Subject: [PATCH 0765/6226] aws-encryption-sdk-cli: fix urllib3 override

https://hydra.nixos.org/build/308804984
---
 pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix b/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix
index dce0c6a561c0..b5a07237c8b9 100644
--- a/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix
+++ b/pkgs/by-name/aw/aws-encryption-sdk-cli/package.nix
@@ -12,9 +12,11 @@ let
     self = localPython;
     packageOverrides = final: prev: {
       urllib3 = prev.urllib3.overridePythonAttrs (prev: rec {
-        pyproject = true;
         version = "1.26.18";
-        nativeBuildInputs = with final; [ setuptools ];
+        build-system = with final; [
+          setuptools
+        ];
+        postPatch = null;
         src = prev.src.override {
           inherit version;
           hash = "sha256-+OzBu6VmdBNFfFKauVW/jGe0XbeZ0VkGYmFxnjKFgKA=";

From f5db7b5943a576f29694e8d8d87eb35a118cc135 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Oct 2025 10:30:53 +0000
Subject: [PATCH 0766/6226] kiro: 0.3.9 -> 0.4.0

---
 pkgs/by-name/ki/kiro/package.nix  |  2 +-
 pkgs/by-name/ki/kiro/sources.json | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ki/kiro/package.nix b/pkgs/by-name/ki/kiro/package.nix
index 4921d202bb15..d186b24ecdd4 100644
--- a/pkgs/by-name/ki/kiro/package.nix
+++ b/pkgs/by-name/ki/kiro/package.nix
@@ -15,7 +15,7 @@ in
   inherit useVSCodeRipgrep;
   commandLineArgs = extraCommandLineArgs;
 
-  version = "0.3.9";
+  version = "0.4.0";
   pname = "kiro";
 
   # You can find the current VSCode version in the About dialog:
diff --git a/pkgs/by-name/ki/kiro/sources.json b/pkgs/by-name/ki/kiro/sources.json
index 152efbf82274..b58ceb2c1e24 100644
--- a/pkgs/by-name/ki/kiro/sources.json
+++ b/pkgs/by-name/ki/kiro/sources.json
@@ -1,14 +1,14 @@
 {
   "x86_64-linux": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/202510022241--distro-linux-x64-tar-gz/202510022241-distro-linux-x64.tar.gz",
-    "hash": "sha256-1XdGN4Pp8EwDqQNQxfPT6mpV8uZLDqtCS/m3EUtGkeI="
+    "url": "https://prod.download.desktop.kiro.dev/releases/202510142329--distro-linux-x64-tar-gz/202510142329-distro-linux-x64.tar.gz",
+    "hash": "sha256-Pi96jAd2qZNCk/LSv9f5n08VzOS3WwaW+eI+8PIwM9I="
   },
   "x86_64-darwin": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/202510022241-Kiro-dmg-darwin-x64.dmg",
-    "hash": "sha256-VsXbpChRMyJBb1JTJivY5Tr+bi2Aita97f3RduaU8xE="
+    "url": "https://prod.download.desktop.kiro.dev/releases/202510142329-Kiro-dmg-darwin-x64.dmg",
+    "hash": "sha256-wjUyT9KF3Tg5M6Ad01sxhZlin1WySF0Tci1dAPlvh04="
   },
   "aarch64-darwin": {
-    "url": "https://prod.download.desktop.kiro.dev/releases/202510022241-Kiro-dmg-darwin-arm64.dmg",
-    "hash": "sha256-nUXtIb3WxJrr1Q4XpGXbP9k9r4vBboZq5YWBUNFgIIk="
+    "url": "https://prod.download.desktop.kiro.dev/releases/202510142329-Kiro-dmg-darwin-arm64.dmg",
+    "hash": "sha256-Bsul3QLJ9qbDPBnhUu7Stk4wz1yJkYk9eMrtUyQ4rbU="
   }
 }

From a873d826836ed27ae48b3b3af30d9401ef1c297e Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss@proton.me>
Date: Thu, 16 Oct 2025 13:29:37 +0300
Subject: [PATCH 0767/6226] codesnap: 0.10.9 -> 0.12.10

---
 pkgs/by-name/co/codesnap/package.nix | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/co/codesnap/package.nix b/pkgs/by-name/co/codesnap/package.nix
index fd1422621570..061b3b816509 100644
--- a/pkgs/by-name/co/codesnap/package.nix
+++ b/pkgs/by-name/co/codesnap/package.nix
@@ -4,25 +4,32 @@
   fetchFromGitHub,
   versionCheckHook,
   nix-update-script,
+  openssl,
+  pkg-config,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codesnap";
-  version = "0.10.9";
+  version = "0.12.10";
 
   src = fetchFromGitHub {
-    owner = "mistricky";
-    repo = "CodeSnap";
-    tag = "v${version}";
-    hash = "sha256-EtMEUtLSgYrb0izPPCh432uX2p/8Ykf2caAR+8ZdxhU=";
+    owner = "codesnap-rs";
+    repo = "codesnap";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-BIdqSEsQIV5Z2mYMgoW0gtBaMNxhEsAbZbs/KDJEK4E=";
   };
 
-  cargoHash = "sha256-atvSygt1Xi+rPxcJb0zdRBnL6SpSkyCcGxs1z2hWXGA=";
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ openssl ];
+
+  cargoHash = "sha256-xenMTuCy3ABEBddH759m0AgMJUlsS0eFj473Y6qjzkY=";
 
   cargoBuildFlags = [
     "-p"
     "codesnap-cli"
   ];
-  cargoTestFlags = cargoBuildFlags;
+  cargoTestFlags = finalAttrs.cargoBuildFlags;
+
+  OPENSSL_NO_VENDOR = true;
 
   nativeInstallCheckInputs = [
     versionCheckHook
@@ -35,9 +42,9 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Command-line tool for generating beautiful code snippets";
     homepage = "https://github.com/mistricky/CodeSnap";
-    changelog = "https://github.com/mistricky/CodeSnap/releases/tag/v${version}";
+    changelog = "https://github.com/mistricky/CodeSnap/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ nartsiss ];
     mainProgram = "codesnap";
   };
-}
+})

From 936baadc02eb5f094c3ac1d1e1af2036d18a5967 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Thu, 16 Oct 2025 13:26:56 +0200
Subject: [PATCH 0768/6226] graphite-gtk-theme: drop gnome-themes-extra
 dependency

This does not change the output of the build.
---
 pkgs/by-name/gr/graphite-gtk-theme/package.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/by-name/gr/graphite-gtk-theme/package.nix b/pkgs/by-name/gr/graphite-gtk-theme/package.nix
index e91f3485181b..7c87ce9a3d71 100644
--- a/pkgs/by-name/gr/graphite-gtk-theme/package.nix
+++ b/pkgs/by-name/gr/graphite-gtk-theme/package.nix
@@ -3,7 +3,6 @@
   stdenvNoCC,
   fetchFromGitHub,
   gitUpdater,
-  gnome-themes-extra,
   gtk-engine-murrine,
   jdupes,
   sassc,
@@ -76,10 +75,6 @@ lib.checkListOfEnum "${pname}: theme variants"
       sassc
     ];
 
-    buildInputs = [
-      gnome-themes-extra
-    ];
-
     propagatedUserEnvPkgs = [
       gtk-engine-murrine
     ];

From f3682348cf647ab9504238faeb1cd5dc6965b782 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Oct 2025 11:49:37 +0000
Subject: [PATCH 0769/6226] sitespeed-io: 38.3.0 -> 38.4.1

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

diff --git a/pkgs/by-name/si/sitespeed-io/package.nix b/pkgs/by-name/si/sitespeed-io/package.nix
index e273ba9ce236..40ae19639e26 100644
--- a/pkgs/by-name/si/sitespeed-io/package.nix
+++ b/pkgs/by-name/si/sitespeed-io/package.nix
@@ -26,13 +26,13 @@ assert
   (!withFirefox && !withChromium) -> throw "Either `withFirefox` or `withChromium` must be enabled.";
 buildNpmPackage rec {
   pname = "sitespeed-io";
-  version = "38.3.0";
+  version = "38.4.1";
 
   src = fetchFromGitHub {
     owner = "sitespeedio";
     repo = "sitespeed.io";
     tag = "v${version}";
-    hash = "sha256-45lvEM8vkoXdbZNJamUR94PD0EwtoNEhWSNyV68yzPo=";
+    hash = "sha256-7aqZ63q+17MmUjHwh5Z9yqvwRq/Av+UOswIlSA2V14E=";
   };
 
   postPatch = ''
@@ -50,7 +50,7 @@ buildNpmPackage rec {
 
   dontNpmBuild = true;
   npmInstallFlags = [ "--omit=dev" ];
-  npmDepsHash = "sha256-rXGoIIbKNZCBhhuRM/0WcaciH/bLQamipmOIh1EXJlU=";
+  npmDepsHash = "sha256-2v/3Ygy6pAyfoQKcbJphIExcU46xc9c6+yXP2JbX11Y=";
 
   postInstall = ''
     mv $out/bin/sitespeed{.,-}io

From 9f9b758873448063c24c405f899a6b1c98122264 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Oct 2025 12:08:29 +0000
Subject: [PATCH 0770/6226] python3Packages.pip-system-certs: 5.2 -> 5.3

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

diff --git a/pkgs/development/python-modules/pip-system-certs/default.nix b/pkgs/development/python-modules/pip-system-certs/default.nix
index 3503ba4d8405..aeb92eb61f01 100644
--- a/pkgs/development/python-modules/pip-system-certs/default.nix
+++ b/pkgs/development/python-modules/pip-system-certs/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "pip-system-certs";
-  version = "5.2";
+  version = "5.3";
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "pip_system_certs";
-    hash = "sha256-gLd2tc8XGRv5nTE2mbf84v24Tre7siX9E0EJqCcGQG8=";
+    hash = "sha256-Gci/mVe8zn1pxNvC0LLvE94ZhNU/UKWQEubbutCvZ8Y=";
   };
 
   build-system = [

From 9b52866c7cde23f57d962805b912cdb849c46578 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Oct 2025 12:26:12 +0000
Subject: [PATCH 0771/6226] toybox: 0.8.12 -> 0.8.13

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

diff --git a/pkgs/by-name/to/toybox/package.nix b/pkgs/by-name/to/toybox/package.nix
index 416ccc2d5ada..2d6570e0baa8 100644
--- a/pkgs/by-name/to/toybox/package.nix
+++ b/pkgs/by-name/to/toybox/package.nix
@@ -17,13 +17,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "toybox";
-  version = "0.8.12";
+  version = "0.8.13";
 
   src = fetchFromGitHub {
     owner = "landley";
     repo = "toybox";
     rev = version;
-    sha256 = "sha256-D+tf2bJQlf2pLMNZdMUOoUdE3ea/KgkqoXGsnl1MVOE=";
+    sha256 = "sha256-b5sigIxyg4T4wVc5z8Das+RdEXmNBPFsXpWwXxU/ERE=";
   };
 
   depsBuildBuild = optionals (stdenv.hostPlatform != stdenv.buildPlatform) [

From 775ce27666ed8e3014cf18f6819c6ab1398b21e7 Mon Sep 17 00:00:00 2001
From: Jeremy Fleischman <jeremyfleischman@gmail.com>
Date: Thu, 16 Oct 2025 08:21:59 -0400
Subject: [PATCH 0772/6226] lib.customisation: fix error message when running
 in `nix repl`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This code was more careful before
<https://github.com/NixOS/nixpkgs/commit/dd435697b31467d6b0f4112ed519aafc140bb6de>
(it didn't assume that `unsafeGetAttrPos` always returns a non-null
location). Unfortunately, `unsafeGetAttrPos` *does* return `null` when
dealing with `nix repl`:

```
nix-repl> f = {foo}: foo

nix-repl> builtins.unsafeGetAttrPos "foo" (builtins.functionArgs f)
null
```

Here's how to reproduce the issue.

*Before* this fix:

```
nix-repl> f = {foo}: foo

nix-repl> myCallPackage = lib.callPackageWith {}

nix-repl> myCallPackage f {}
error:
       … while calling the 'abort' builtin
         at /home/jeremy/src/github.com/NixOS/nixpkgs/lib/customisation.nix:323:7:
          322|     else
          323|       abort "lib.customisation.callPackageWith: ${error}";
             |       ^
          324|

       … while selecting an attribute
         at /home/jeremy/src/github.com/NixOS/nixpkgs/lib/customisation.nix:310:14:
          309|         "Function called without required argument \"${arg}\" at "
          310|         + "${loc.file}:${toString loc.line}${prettySuggestions (getSuggestions arg)}";
             |              ^
          311|

       error: expected a set but found null: null

```

*After*:

```
nix-repl> f = {foo}: foo

nix-repl> myCallPackage = lib.callPackageWith {}

nix-repl> myCallPackage f {}
error:
       … while calling the 'abort' builtin
         at /home/jeremy/src/github.com/NixOS/nixpkgs/lib/customisation.nix:332:7:
          331|     # Inputs
          332|
             |       ^
          333|     `autoArgs`

       error: evaluation aborted with the following error message: 'lib.customisation.callPackageWith: Function called without required argument "foo" at <unknown location>'
```
---
 lib/customisation.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index 5fb39fdfe1d2..39b59d7cdf6f 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -305,9 +305,10 @@ rec {
         arg:
         let
           loc = unsafeGetAttrPos arg fargs;
+          loc' = if loc != null then loc.file + ":" + toString loc.line else "<unknown location>";
         in
         "Function called without required argument \"${arg}\" at "
-        + "${loc.file}:${toString loc.line}${prettySuggestions (getSuggestions arg)}";
+        + "${loc'}${prettySuggestions (getSuggestions arg)}";
 
       # Only show the error for the first missing argument
       error = errorForArg (head (attrNames missingArgs));

From c5413c6277ee682cd04bafd3f87802bcb447a85b Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Fri, 10 Oct 2025 18:48:09 +0200
Subject: [PATCH 0773/6226] sdrpp: 1.1.0-unstable-2024-01-22 ->
 1.2.1-unstable-2025-10-09

---
 pkgs/by-name/sd/sdrpp/package.nix | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/sd/sdrpp/package.nix b/pkgs/by-name/sd/sdrpp/package.nix
index 847fea651aae..50f4db7b9528 100644
--- a/pkgs/by-name/sd/sdrpp/package.nix
+++ b/pkgs/by-name/sd/sdrpp/package.nix
@@ -69,15 +69,18 @@ stdenv.mkDerivation rec {
   # SDR++ uses a rolling release model.
   # Choose a git hash from head and use the date from that commit as
   # version qualifier
-  git_hash = "27ab5bf3c194169ddf60ca312723fce96149cc8e";
-  git_date = "2024-01-22";
-  version = "1.1.0-unstable-" + git_date;
+  git_rev = "4658a1ade6707dee6f2ae09ba9eb71097223ea93";
+  git_hash = "sha256-UxYAcqOMPQYdUbL2636LpOGbCaxHjLiJhsH62s+0AZU=";
+  git_date = "2025-10-09";
+  version_number = "1.2.1";
+
+  version = "${version_number}-unstable-" + git_date;
 
   src = fetchFromGitHub {
     owner = "AlexandreRouma";
     repo = "SDRPlusPlus";
-    rev = git_hash;
-    hash = "sha256-R4xWeqdHEAaje37VQaGlg+L2iYIOH4tXMHvZkZq4SDU=";
+    rev = git_rev;
+    hash = git_hash;
   };
 
   patches = [ ./runtime-prefix.patch ];
@@ -90,7 +93,7 @@ stdenv.mkDerivation rec {
       --replace "codec2.h" "codec2/codec2.h"
     # Since the __TIME_ and __DATE__ is canonicalized in the build,
     # use our qualified version shown in the programs window title.
-    substituteInPlace core/src/version.h --replace "1.1.0" "$version"
+    substituteInPlace core/src/version.h --replace-fail "${version_number}" "$version"
   '';
 
   nativeBuildInputs = [

From 67b4fb02ab376d670bfb4b1cc91cce08d02bcb51 Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Fri, 10 Oct 2025 18:58:13 +0200
Subject: [PATCH 0774/6226] sdrpp: fix cmake 4 compatibility

---
 pkgs/by-name/sd/sdrpp/cmake4.patch | 27 +++++++++++++++++++++++++++
 pkgs/by-name/sd/sdrpp/package.nix  |  7 ++++++-
 2 files changed, 33 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/sd/sdrpp/cmake4.patch

diff --git a/pkgs/by-name/sd/sdrpp/cmake4.patch b/pkgs/by-name/sd/sdrpp/cmake4.patch
new file mode 100644
index 000000000000..c40373d99f6b
--- /dev/null
+++ b/pkgs/by-name/sd/sdrpp/cmake4.patch
@@ -0,0 +1,27 @@
+diff --git a/core/libcorrect/CMakeLists.txt b/core/libcorrect/CMakeLists.txt
+index 7fce281d..b709255f 100644
+--- a/core/libcorrect/CMakeLists.txt
++++ b/core/libcorrect/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.13)
+ project(Correct C)
+ include(CheckLibraryExists)
+ include(CheckIncludeFiles)
+diff --git a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt
+index 1dc1c913..e9924677 100644
+--- a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt
++++ b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required (VERSION 3.2.0)
++cmake_minimum_required (VERSION 3.13)
+ project (DiscordRPC)
+ 
+ include(GNUInstallDirs)
+@@ -11,4 +11,4 @@ file(GLOB_RECURSE ALL_SOURCE_FILES
+ 
+ # add subdirs
+ 
+-add_subdirectory(src)
+\ No newline at end of file
++add_subdirectory(src)
diff --git a/pkgs/by-name/sd/sdrpp/package.nix b/pkgs/by-name/sd/sdrpp/package.nix
index 50f4db7b9528..19bba205f0b5 100644
--- a/pkgs/by-name/sd/sdrpp/package.nix
+++ b/pkgs/by-name/sd/sdrpp/package.nix
@@ -83,7 +83,12 @@ stdenv.mkDerivation rec {
     hash = git_hash;
   };
 
-  patches = [ ./runtime-prefix.patch ];
+  patches = [
+    ./runtime-prefix.patch
+    # CMake 4 dropped support of versions lower than 3.5,
+    # versions lower than 3.10 are deprecated.
+    ./cmake4.patch
+  ];
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \

From d56912319471fbb6c2668cc99b84cd4f5db796cd Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Thu, 16 Oct 2025 14:38:39 +0200
Subject: [PATCH 0775/6226] signal-desktop-bin: update copy-noto-emoji.py and
 emoji sheets

---
 .../si/signal-desktop-bin/copy-noto-emoji.py  | 25 +++----------------
 .../by-name/si/signal-desktop-bin/generic.nix | 11 ++++----
 2 files changed, 8 insertions(+), 28 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop-bin/copy-noto-emoji.py b/pkgs/by-name/si/signal-desktop-bin/copy-noto-emoji.py
index 8acaebcb23d7..c873c0b0db4d 100644
--- a/pkgs/by-name/si/signal-desktop-bin/copy-noto-emoji.py
+++ b/pkgs/by-name/si/signal-desktop-bin/copy-noto-emoji.py
@@ -18,24 +18,6 @@ import sys
 from pathlib import Path
 
 
-def signal_name_to_emoji(signal_emoji_name: str) -> str:
-    r"""Return the emoji corresponding to a Signal emoji name.
-
-    Signal emoji names are concatenations of UTF‐16 code units,
-    represented in lowercase big‐endian hex padded to four digits.
-
-    >>> signal_name_to_emoji("d83dde36200dd83cdf2bfe0f")
-    '😶‍🌫️'
-    >>> b"\xd8\x3d\xde\x36\x20\x0d\xd8\x3c\xdf\x2b\xfe\x0f".decode("utf-16-be")
-    '😶‍🌫️'
-    """
-    hex_bytes = zip(signal_emoji_name[::2], signal_emoji_name[1::2])
-    emoji_utf_16_be = bytes(
-        int("".join(hex_pair), 16) for hex_pair in hex_bytes
-    )
-    return emoji_utf_16_be.decode("utf-16-be")
-
-
 def emoji_to_noto_name(emoji: str) -> str:
     r"""Return the Noto emoji name of an emoji.
 
@@ -68,16 +50,15 @@ def _main() -> None:
 
     for signal_emoji_names in jumbomoji_packs.values():
         for signal_emoji_name in signal_emoji_names:
-            emoji = signal_name_to_emoji(signal_emoji_name)
 
             try:
                 shutil.copy(
-                    noto_png_path / f"emoji_u{emoji_to_noto_name(emoji)}.png",
-                    out_path / emoji,
+                    noto_png_path / f"emoji_u{emoji_to_noto_name(signal_emoji_name)}.png",
+                    out_path / signal_emoji_name,
                 )
             except FileNotFoundError:
                 print(
-                    f"Missing Noto emoji: {emoji} {signal_emoji_name}",
+                    f"Missing Noto emoji: {signal_emoji_name}",
                     file=sys.stderr,
                 )
                 continue
diff --git a/pkgs/by-name/si/signal-desktop-bin/generic.nix b/pkgs/by-name/si/signal-desktop-bin/generic.nix
index 4f5e80da95ac..98b6d389f467 100644
--- a/pkgs/by-name/si/signal-desktop-bin/generic.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/generic.nix
@@ -92,12 +92,12 @@ let
   });
 
   noto-emoji-sheet-32 = fetchurl {
-    url = "https://raw.githubusercontent.com/iamcal/emoji-data/refs/tags/v15.1.2/sheet_google_32.png";
-    hash = "sha256-S03NCTbvB5yeQl62WpLNjNGhjNErtgaOB6tAj/X8vPc=";
+    url = "https://raw.githubusercontent.com/iamcal/emoji-data/refs/tags/v16.0.0/sheet_google_32.png";
+    hash = "sha256-tBfp9s1LvBBla7/V4TtumiVFtV5qTPcxLXW+H6qjSVI=";
   };
   noto-emoji-sheet-64 = fetchurl {
-    url = "https://raw.githubusercontent.com/iamcal/emoji-data/refs/tags/v15.1.2/sheet_google_64.png";
-    hash = "sha256-kZYStR5xAuausSpOD6wJZRJZ1K6nPpweE3aYSgWntS4=";
+    url = "https://raw.githubusercontent.com/iamcal/emoji-data/refs/tags/v16.0.0/sheet_google_64.png";
+    hash = "sha256-eVoMWY0WLJpKriPyGIxge4ybwZEst9hDgkWfjekaOuE=";
   };
 in
 stdenv.mkDerivation rec {
@@ -263,8 +263,7 @@ stdenv.mkDerivation rec {
 
     # Fix the desktop link
     substituteInPlace $out/share/applications/signal-desktop.desktop \
-      --replace-fail "/${bindir}/signal-desktop" ${meta.mainProgram} \
-      --replace-fail "StartupWMClass=Signal" "StartupWMClass=signal"
+      --replace-fail "/${bindir}/signal-desktop" ${meta.mainProgram}
 
     mv $out/share/applications/signal{-desktop,}.desktop
 

From 6035553020ebc29538d068648701080094034d97 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Thu, 16 Oct 2025 14:38:54 +0200
Subject: [PATCH 0776/6226] signal-desktop-bin: 7.71.0 -> 7.77.1

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

diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
index 197937c49e05..9a24b9586266 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop.nix
@@ -1,12 +1,12 @@
 { callPackage, commandLineArgs }:
 callPackage ./generic.nix { inherit commandLineArgs; } rec {
   pname = "signal-desktop-bin";
-  version = "7.71.0";
+  version = "7.77.1";
 
   libdir = "opt/Signal";
   bindir = libdir;
   extractPkg = "dpkg-deb -x $downloadedFile $out";
 
   url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb";
-  hash = "sha256-y7ONN6VBVFH8zyXJNM3+cY4JegSolXfhH3T85WiM2Dk=";
+  hash = "sha256-57sm6wmtp0eXWCv7LviCiBEi5/IysubiuBYSP7eVkkU=";
 }

From f13458f7b8e1393fa73aacaf9153850b8b95bc3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Oct 2025 14:39:08 +0000
Subject: [PATCH 0777/6226] sing-box: 1.12.9 -> 1.12.10

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

diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix
index 285cadf26edb..b7db2b8d0f35 100644
--- a/pkgs/by-name/si/sing-box/package.nix
+++ b/pkgs/by-name/si/sing-box/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "sing-box";
-  version = "1.12.9";
+  version = "1.12.10";
 
   src = fetchFromGitHub {
     owner = "SagerNet";
     repo = "sing-box";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1sN1VE+3CMI/rDiADpPJFv9NsxOvulLjGTE38CQOJzo=";
+    hash = "sha256-ZnpvE/x2+kKlKYuez1VaVx7qkybYhRTqfg7yorZpxfc=";
   };
 
-  vendorHash = "sha256-Cx9SD5FTiyISRpWxlUsxeGP1M39YJQrWpRPaK1o6H08=";
+  vendorHash = "sha256-D4nfi5PzcL9CcgLvm09DmF2Ws1o4wIH0zjgv1qDP7Nw=";
 
   tags = [
     "with_quic"

From 7d15ad223147c3a54f087a3f0a7ec222563a204a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Oct 2025 15:50:25 +0000
Subject: [PATCH 0778/6226] datadog-agent: 7.70.2 -> 7.71.2

---
 pkgs/tools/networking/dd-agent/datadog-agent.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/networking/dd-agent/datadog-agent.nix b/pkgs/tools/networking/dd-agent/datadog-agent.nix
index edd4ed74468f..94261b7be1ce 100644
--- a/pkgs/tools/networking/dd-agent/datadog-agent.nix
+++ b/pkgs/tools/networking/dd-agent/datadog-agent.nix
@@ -23,12 +23,12 @@ let
   owner = "DataDog";
   repo = "datadog-agent";
   goPackagePath = "github.com/${owner}/${repo}";
-  version = "7.70.2";
+  version = "7.71.2";
 
   src = fetchFromGitHub {
     inherit owner repo;
     tag = version;
-    hash = "sha256-yXtybHWrm+6kWW396FLlRZI0YVuThGuLfSYzoNXAEBU=";
+    hash = "sha256-WERO2vs0x5w+9L68BucvcuBWF2qoYU6qP7FvCYrnfrc=";
   };
   rtloader = stdenv.mkDerivation {
     pname = "datadog-agent-rtloader";
@@ -49,7 +49,7 @@ buildGoModule rec {
 
   doCheck = false;
 
-  vendorHash = "sha256-iWOwhfSI7mLmDy6yewV0h9Y4pjYAV6Tz6TxsINOxYMg=";
+  vendorHash = "sha256-lL31RZqSQy3iqdJ/07pxjeMMFCK9HOX2TI7xvIa2Z3s=";
 
   subPackages = [
     "cmd/agent"

From 2df77ff05868b1b7e5a7c7ceaec8589d4ed1b735 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 15 Oct 2025 18:15:43 +0000
Subject: [PATCH 0779/6226] python312Packages.scalene: 1.5.52 -> 1.5.55

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

diff --git a/pkgs/development/python-modules/scalene/default.nix b/pkgs/development/python-modules/scalene/default.nix
index b33764932a98..a97bc531585e 100644
--- a/pkgs/development/python-modules/scalene/default.nix
+++ b/pkgs/development/python-modules/scalene/default.nix
@@ -38,7 +38,7 @@ in
 
 buildPythonPackage rec {
   pname = "scalene";
-  version = "1.5.52";
+  version = "1.5.55";
   pyproject = true;
   disabled = pythonOlder "3.9";
 
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     owner = "plasma-umass";
     repo = "scalene";
     tag = "v${version}";
-    hash = "sha256-8WE/tR0tGwdNSPtieS90QAOFlS66h/JxaV2LvpZjx2E=";
+    hash = "sha256-aO7l/paYqbneDArAbXxptIlMGfvc1dAaFLucEj/7xbk=";
   };
 
   patches = [
@@ -95,6 +95,8 @@ buildPythonPackage rec {
   disabledTests = [
     # Flaky -- socket collision
     "test_show_browser"
+    # File not found
+    "test_nested_package_relative_import"
   ];
 
   # remove scalene directory to prevent pytest import confusion

From 632d7f7d02e52b2920adeb839833d56b346f8985 Mon Sep 17 00:00:00 2001
From: Minionflo <git@minionflo.net>
Date: Thu, 16 Oct 2025 18:52:30 +0200
Subject: [PATCH 0780/6226] mjpg-streamer: fix for CMake 4

---
 pkgs/by-name/mj/mjpg-streamer/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/mj/mjpg-streamer/package.nix b/pkgs/by-name/mj/mjpg-streamer/package.nix
index 27addc586a7f..d94775bf61dc 100644
--- a/pkgs/by-name/mj/mjpg-streamer/package.nix
+++ b/pkgs/by-name/mj/mjpg-streamer/package.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation {
 
   prePatch = ''
     cd mjpg-streamer-experimental
+    substituteInPlace ./CMakeLists.txt --replace-fail "cmake_minimum_required(VERSION 2.8.3)" "cmake_minimum_required(VERSION 2.8.3...3.10)"
   '';
 
   nativeBuildInputs = [ cmake ];

From 84ad49bfa2d62b26c83772bfa6266ec2d014ddfb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Thu, 16 Oct 2025 12:02:56 -0700
Subject: [PATCH 0781/6226] blitz: fix build failure with cmake 4

- CMake 4 is no longer retro compatible with versions < 3.5
  cmake_minimum_required was already to an upper version, but not cmake_policy
---
 pkgs/by-name/bl/blitz/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/bl/blitz/package.nix b/pkgs/by-name/bl/blitz/package.nix
index e5e44fddc2f2..4929a9ac66e3 100644
--- a/pkgs/by-name/bl/blitz/package.nix
+++ b/pkgs/by-name/bl/blitz/package.nix
@@ -44,6 +44,14 @@ stdenv.mkDerivation rec {
     })
   ];
 
+  # CMake 4 is no longer retro compatible with versions < 3.5
+  # cmake_minimum_required was already to an upper version, but not cmake_policy
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_policy(VERSION 3.1)" \
+      ""
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config

From eb8c425e18863a464425050a2ddc0a4f1f44842c Mon Sep 17 00:00:00 2001
From: Sam <30577766+Samasaur1@users.noreply.github.com>
Date: Thu, 16 Oct 2025 12:15:04 -0700
Subject: [PATCH 0782/6226] sentry-cli: partial fix

---
 .../se/sentry-cli/fix-swift-lib-path.patch     | 13 +++++++++++++
 pkgs/by-name/se/sentry-cli/package.nix         | 18 +++++++++++++++++-
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch

diff --git a/pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch b/pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch
new file mode 100644
index 000000000000..9d3b0dedd16d
--- /dev/null
+++ b/pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch
@@ -0,0 +1,13 @@
+diff --git a/apple-catalog-parsing/build.rs b/apple-catalog-parsing/build.rs
+index 2ab4c71b..80301b1a 100644
+--- a/apple-catalog-parsing/build.rs
++++ b/apple-catalog-parsing/build.rs
+@@ -30,7 +30,7 @@ fn main() {
+     // Add necessary libraries to the linker search path. Without this line, compiling fails
+     // on systems without Xcode installed (xcode-select is still required).
+     println!(
+-        "cargo:rustc-link-search=native=/Library/Developer/CommandLineTools/usr/lib/swift/macosx"
++        "cargo:rustc-link-search=native=/usr/lib/swift/macosx"
+     );
+ 
+     let out_dir = env::var("OUT_DIR").expect("OUT_DIR is set for build scripts");
diff --git a/pkgs/by-name/se/sentry-cli/package.nix b/pkgs/by-name/se/sentry-cli/package.nix
index 4011acc62608..16b0547b0ca1 100644
--- a/pkgs/by-name/se/sentry-cli/package.nix
+++ b/pkgs/by-name/se/sentry-cli/package.nix
@@ -6,6 +6,9 @@
   openssl,
   pkg-config,
   stdenv,
+  swift,
+  swiftpm,
+  writeShellScriptBin,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "sentry-cli";
@@ -22,11 +25,24 @@ rustPlatform.buildRustPackage rec {
   # Needed to get openssl-sys to use pkgconfig.
   OPENSSL_NO_VENDOR = 1;
 
+  patches = [
+    ./fix-swift-lib-path.patch
+  ];
+
   buildInputs = [ openssl ];
   nativeBuildInputs = [
     installShellFiles
     pkg-config
-  ];
+  ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [
+      swift
+      swiftpm
+      (writeShellScriptBin "xcode-select" ''
+        echo $DEVELOPER_DIR
+      '')
+  ]);
+
+  # By default including `swiftpm` in `nativeBuildInputs` will take over `buildPhase`
+  dontUseSwiftpmBuild = true;
 
   cargoHash = "sha256-6AM1oGX4q6kHePiS0fsoXPt0b89O9WItIBukPIwapJQ=";
 

From e2085a6a62a61f836b1f5c51082dfd91aaf74217 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Oct 2025 19:43:55 +0000
Subject: [PATCH 0783/6226] python3Packages.openstep-parser: 2.0.1 -> 2.0.3

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

diff --git a/pkgs/development/python-modules/openstep-parser/default.nix b/pkgs/development/python-modules/openstep-parser/default.nix
index dbdbcc081e59..9375a5c16c34 100644
--- a/pkgs/development/python-modules/openstep-parser/default.nix
+++ b/pkgs/development/python-modules/openstep-parser/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "openstep-parser";
-  version = "2.0.1";
+  version = "2.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kronenthaler";
     repo = "openstep-parser";
     tag = version;
-    hash = "sha256-gvfzBLLaal0Vad3C4m4wIKwJpmlhewsK4A5yeN8l6qU=";
+    hash = "sha256-ivPvkvVWXw5ftaGvwBR+JxBIlisI0p6k3i/8V2HlaqQ=";
   };
 
   build-system = [ setuptools ];

From 0b49e53d16e87d500cf62c3faebfab32e5c6c90f Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Thu, 16 Oct 2025 21:57:49 +0200
Subject: [PATCH 0784/6226] rure: 0.2.3 -> 0.2.4

---
 pkgs/by-name/ru/rure/Cargo.lock | 24 ++++++++++++------------
 pkgs/by-name/ru/rure/pin.json   |  4 ++--
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/ru/rure/Cargo.lock b/pkgs/by-name/ru/rure/Cargo.lock
index 112698c1c39c..e467ee4229ca 100644
--- a/pkgs/by-name/ru/rure/Cargo.lock
+++ b/pkgs/by-name/ru/rure/Cargo.lock
@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 4
+version = 3
 
 [[package]]
 name = "aho-corasick"
@@ -13,21 +13,21 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.175"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a82ae493e598baaea5209805c49bbf2ea7de956d50d7da0da1164f9c6d28543"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
 name = "memchr"
-version = "2.7.5"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
 name = "regex"
-version = "1.11.2"
+version = "1.12.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -37,9 +37,9 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.10"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 dependencies = [
  "aho-corasick",
  "memchr",
@@ -48,13 +48,13 @@ dependencies = [
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.6"
+version = "0.8.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 
 [[package]]
 name = "rure"
-version = "0.2.3"
+version = "0.2.4"
 dependencies = [
  "libc",
  "regex",
diff --git a/pkgs/by-name/ru/rure/pin.json b/pkgs/by-name/ru/rure/pin.json
index 5078676c08ca..7fc7680099f9 100644
--- a/pkgs/by-name/ru/rure/pin.json
+++ b/pkgs/by-name/ru/rure/pin.json
@@ -1,5 +1,5 @@
 {
   "pname": "rure",
-  "version": "0.2.3",
-  "hash": "sha256:0d8r0fv93ganqi9iyrgljbkvrvys33n0zrkaf11zsb23b2hwcsxa"
+  "version": "0.2.4",
+  "hash": "sha256:02wgpjllvlqhcpj8w59qwfjhxch3qy5i2qg3a1v1555dhhzqnnwl"
 }

From 9475509014b30e7e11e18a62c938db63f5b630d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Wed, 15 Oct 2025 18:23:12 -0700
Subject: [PATCH 0785/6226] leatherman: fix build failure with cmake 4

- CMake 4 is no longer retro compatible with versions < 3.5
---
 pkgs/by-name/le/leatherman/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/le/leatherman/package.nix b/pkgs/by-name/le/leatherman/package.nix
index b73192f0b788..f4171ddfa62a 100644
--- a/pkgs/by-name/le/leatherman/package.nix
+++ b/pkgs/by-name/le/leatherman/package.nix
@@ -21,6 +21,14 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DLEATHERMAN_ENABLE_TESTING=OFF" ];
 
+  # CMake4 3.2.2 is deprecated and no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 3.2.2)" \
+      "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   env.NIX_CFLAGS_COMPILE = "-Wno-error";
 
   nativeBuildInputs = [ cmake ];

From 6ce88cf89ffbf4ebebdb287876376fe224d817d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Wed, 15 Oct 2025 18:41:29 -0700
Subject: [PATCH 0786/6226] cpp-hocon: fix build failure with cmake 4

- CMake 4 is no longer retro compatible with versions < 3.5
---
 pkgs/by-name/cp/cpp-hocon/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/cp/cpp-hocon/package.nix b/pkgs/by-name/cp/cpp-hocon/package.nix
index 7d6a65aa61c9..dcaab234db10 100644
--- a/pkgs/by-name/cp/cpp-hocon/package.nix
+++ b/pkgs/by-name/cp/cpp-hocon/package.nix
@@ -21,6 +21,12 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -i -e '/add_subdirectory(tests)/d' lib/CMakeLists.txt
+
+    # CMake 3.2.2 is deprecated and no longer supported by CMake > 4
+    # https://github.com/NixOS/nixpkgs/issues/445447
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 3.2.2)" \
+      "cmake_minimum_required(VERSION 3.10)"
   '';
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error";

From e0e6288837dca9720dfdcbd9ab516ab02e8c14ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Wed, 15 Oct 2025 18:43:57 -0700
Subject: [PATCH 0787/6226] libwhereami: fix build failure with cmake 4

- CMake 4 is no longer retro compatible with versions < 3.5
---
 pkgs/by-name/li/libwhereami/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/li/libwhereami/package.nix b/pkgs/by-name/li/libwhereami/package.nix
index f21551ca0242..84774a19f4f4 100644
--- a/pkgs/by-name/li/libwhereami/package.nix
+++ b/pkgs/by-name/li/libwhereami/package.nix
@@ -19,6 +19,14 @@ stdenv.mkDerivation rec {
     owner = "puppetlabs";
   };
 
+  # CMake 2.2.2 is deprecated and no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 3.2.2)" \
+      "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   env.NIX_CFLAGS_COMPILE = "-Wno-error";
 
   nativeBuildInputs = [ cmake ];

From b45f1ad676635ff4bf9f72997ed42a056418e4af Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Thu, 16 Oct 2025 16:12:35 -0400
Subject: [PATCH 0788/6226] devbox: modernize

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/development/tools/devbox/default.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/tools/devbox/default.nix b/pkgs/development/tools/devbox/default.nix
index f96af31e73b6..bd844c1b73af 100644
--- a/pkgs/development/tools/devbox/default.nix
+++ b/pkgs/development/tools/devbox/default.nix
@@ -5,21 +5,21 @@
   lib,
   stdenv,
 }:
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "devbox";
   version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "jetify-com";
-    repo = pname;
-    rev = version;
+    repo = "devbox";
+    tag = finalAttrs.version;
     hash = "sha256-+OsFKBtc4UkkI37YJM9uKIJZC1+KkuDJJKjipRzyF7k=";
   };
 
   ldflags = [
     "-s"
     "-w"
-    "-X go.jetify.com/devbox/internal/build.Version=${version}"
+    "-X go.jetify.com/devbox/internal/build.Version=${finalAttrs.version}"
   ];
 
   subPackages = [ "cmd/devbox" ];
@@ -38,14 +38,14 @@ buildGoModule rec {
       --zsh <($out/bin/devbox completion zsh)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Instant, easy, predictable shells and containers";
     homepage = "https://www.jetify.com/devbox";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       urandom
       lagoja
       madeddie
     ];
   };
-}
+})

From 10dda58229fddb6ac849c95b70bb48148bb355b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Thu, 16 Oct 2025 10:30:54 -0700
Subject: [PATCH 0789/6226] luabind: fix build failure with cmake 4

- CMake 4 is no longer retro compatible with versions < 3.5
- Should fix `luabind`, `luabind_luajit` & `osrm-backend`
---
 pkgs/development/libraries/luabind/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/development/libraries/luabind/default.nix b/pkgs/development/libraries/luabind/default.nix
index eb002cf895a6..d79515d18ded 100644
--- a/pkgs/development/libraries/luabind/default.nix
+++ b/pkgs/development/libraries/luabind/default.nix
@@ -28,6 +28,14 @@ stdenv.mkDerivation {
     inherit lua;
   };
 
+  # CMake 2.8.3 is deprecated and is no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.8.3)" \
+      "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   patches = [ ./0.9.1-discover-luajit.patch ];
 
   meta = {

From e6406ba156febfe473933d1f80236d8333e13033 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Thu, 16 Oct 2025 10:37:42 -0700
Subject: [PATCH 0790/6226] eigen2: fix build failure with cmake 4

- CMake 4 is no longer retro compatible with versions < 3.5
- CMake Error at doc/snippets/CMakeLists.txt:17 (GET_TARGET_PROPERTY):
  The LOCATION property may not be read from target "compile_class_LU".  Use
  the target name directly with add_custom_command, or use the generator
  expression $<TARGET_FILE>, as appropriate.
- CMake Error at doc/examples/CMakeLists.txt:11 (GET_TARGET_PROPERTY):
  The LOCATION property may not be read from target
  "Tutorial_simple_example_dynamic_size".  Use the target name directly with
  add_custom_command, or use the generator expression $<TARGET_FILE>, as
  appropriate.
---
 pkgs/by-name/ei/eigen2/cmake-4-build.patch | 47 ++++++++++++++++++++++
 pkgs/by-name/ei/eigen2/package.nix         |  4 ++
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/by-name/ei/eigen2/cmake-4-build.patch

diff --git a/pkgs/by-name/ei/eigen2/cmake-4-build.patch b/pkgs/by-name/ei/eigen2/cmake-4-build.patch
new file mode 100644
index 000000000000..2fa18bbfc9d3
--- /dev/null
+++ b/pkgs/by-name/ei/eigen2/cmake-4-build.patch
@@ -0,0 +1,47 @@
+diff --git i/CMakeLists.txt w/CMakeLists.txt
+index bb12a7cf5..932187427 100644
+--- i/CMakeLists.txt
++++ w/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ project(Eigen)
+-cmake_minimum_required(VERSION 2.6.2)
++cmake_minimum_required(VERSION 3.10)
+ 
+ set(INCLUDE_INSTALL_DIR
+     "${CMAKE_INSTALL_PREFIX}/include/eigen2"
+diff --git i/doc/examples/CMakeLists.txt w/doc/examples/CMakeLists.txt
+index 9db5b1f58..b535ae80e 100644
+--- i/doc/examples/CMakeLists.txt
++++ w/doc/examples/CMakeLists.txt
+@@ -8,12 +8,10 @@ ADD_EXECUTABLE(${example} ${example_src})
+ if(EIGEN_STANDARD_LIBRARIES_TO_LINK_TO)
+   target_link_libraries(${example} ${EIGEN_STANDARD_LIBRARIES_TO_LINK_TO})
+ endif()
+-GET_TARGET_PROPERTY(example_executable
+-                    ${example} LOCATION)
+ ADD_CUSTOM_COMMAND(
+   TARGET ${example}
+   POST_BUILD
+-  COMMAND ${example_executable}
++  COMMAND ${example}
+   ARGS >${CMAKE_CURRENT_BINARY_DIR}/${example}.out
+ )
+ ADD_DEPENDENCIES(all_examples ${example})
+diff --git i/doc/snippets/CMakeLists.txt w/doc/snippets/CMakeLists.txt
+index 7458830b0..153dbfc68 100644
+--- i/doc/snippets/CMakeLists.txt
++++ w/doc/snippets/CMakeLists.txt
+@@ -14,12 +14,10 @@ ADD_EXECUTABLE(${compile_snippet_target}
+ if(EIGEN_STANDARD_LIBRARIES_TO_LINK_TO)
+   target_link_libraries(${compile_snippet_target} ${EIGEN_STANDARD_LIBRARIES_TO_LINK_TO})
+ endif()
+-GET_TARGET_PROPERTY(compile_snippet_executable
+-                    ${compile_snippet_target} LOCATION)
+ ADD_CUSTOM_COMMAND(
+   TARGET ${compile_snippet_target}
+   POST_BUILD
+-  COMMAND ${compile_snippet_executable}
++  COMMAND ${compile_snippet_target}
+   ARGS >${CMAKE_CURRENT_BINARY_DIR}/${snippet}.out
+ )
+ ADD_DEPENDENCIES(all_snippets ${compile_snippet_target})
diff --git a/pkgs/by-name/ei/eigen2/package.nix b/pkgs/by-name/ei/eigen2/package.nix
index 2df45c985510..961879811827 100644
--- a/pkgs/by-name/ei/eigen2/package.nix
+++ b/pkgs/by-name/ei/eigen2/package.nix
@@ -18,6 +18,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
+  # CMake 2.6.2 is deprecated and is no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  patches = [ ./cmake-4-build.patch ];
+
   meta = with lib; {
     homepage = "https://eigen.tuxfamily.org";
     description = "C++ template library for linear algebra: vectors, matrices, and related algorithms";

From 070599299c38343820616f1a3e8c9a9f0af0bd00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Thu, 16 Oct 2025 11:20:25 -0700
Subject: [PATCH 0791/6226] soi: fix build failure with cmake 4

- CMake 4 is no longer retro compatible with versions < 3.5
- PROJECT_VERSION variable was now overwritten by the call to project()
  function so updating how the version was set has been needed.
---
 pkgs/games/soi/cmake-4-build.patch | 60 ++++++++++++++++++++++++++++++
 pkgs/games/soi/default.nix         |  4 ++
 2 files changed, 64 insertions(+)
 create mode 100644 pkgs/games/soi/cmake-4-build.patch

diff --git a/pkgs/games/soi/cmake-4-build.patch b/pkgs/games/soi/cmake-4-build.patch
new file mode 100644
index 000000000000..e0d18c3a70cd
--- /dev/null
+++ b/pkgs/games/soi/cmake-4-build.patch
@@ -0,0 +1,60 @@
+diff --git i/CMakeLists.txt w/CMakeLists.txt
+index 1298088..73a5c2d 100644
+--- i/CMakeLists.txt
++++ w/CMakeLists.txt
+@@ -1,11 +1,11 @@
+ #CMake script for Spheres of Influence
+ #Run 'cmake <source_directory>' to generate a makefile
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 3.10)
+ 
+ #definitions
+ set(PROJECT_NAME "Spheres\ of\ Influence")
+ set(APP_NAME soi)
+-set(PROJECT_VERSION 0 1 2)
++set(PROJECT_VERSION "0.1.2")
+ set(DESCRIPTION "A physics-based 3D puzzle game")
+ set(README README.txt)
+ set(LICENSE ${README})
+@@ -52,7 +52,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH}
+     "${CMAKE_SOURCE_DIR}/${EXTRA_MODULES_IN}")
+ 
+ #declare the project
+-project(${PROJECT_NAME})
++project(${PROJECT_NAME} VERSION ${PROJECT_VERSION})
+ 
+ #grab source files
+ file(GLOB_RECURSE HEADERS ${CMAKE_SOURCE_DIR}/src/*.h)
+@@ -105,18 +105,13 @@ endif()
+ #declare the target program
+ add_executable(${APP_NAME} ${SOURCES} ${EXTRA_SOURCES} ${HEADERS})
+ 
+-#extract the proper versioning breakdown
+-list(GET PROJECT_VERSION 0 VERSION_MAJOR )
+-list(GET PROJECT_VERSION 1 VERSION_MINOR )
+-list(GET PROJECT_VERSION 2 VERSION_PATCH )
+-
+ #add some useful preprocessor defines
+ set_property(
+     TARGET ${APP_NAME} PROPERTY COMPILE_DEFINITIONS
+     ${COMPILEDEFS}
+ #     PROJECT_NAME="${PROJECT_NAME}"
+ #     AUTHOR_NAMES="${AUTHORS}"
+-#     PROJECT_VERSION="${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}"
++#     PROJECT_VERSION="${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}"
+ )
+ 
+ #pass on the flags
+@@ -168,9 +163,9 @@ set(CPACK_PACKAGE_INSTALL_DIRECTORY ${PROJECT_NAME})
+ set(CPACK_PACKAGE_DESCRIPTION_FILE ${README})
+ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY ${DESCRIPTION})
+ set(CPACK_PACKAGE_DESCRIPTION ${DESCRIPTION})
+-set(CPACK_PACKAGE_VERSION_MAJOR ${VERSION_MAJOR})
+-set(CPACK_PACKAGE_VERSION_MINOR ${VERSION_MINOR})
+-set(CPACK_PACKAGE_VERSION_PATCH ${VERSION_PATCH})
++set(CPACK_PACKAGE_PROJECT_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
++set(CPACK_PACKAGE_PROJECT_VERSION_MINOR ${PROJECT_VERSION_MINOR})
++set(CPACK_PACKAGE_PROJECT_VERSION_PATCH ${PROJECT_VERSION_PATCH})
+ #set(CPACK_PACKAGE_EXECUTABLES "${APP_NAME}";${PROJECT_NAME})
+ set(CPACK_RESOURCE_FILE_README ${README})
+ set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/${LICENSE})
diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix
index c99a422fe27d..d46f093092e1 100644
--- a/pkgs/games/soi/default.nix
+++ b/pkgs/games/soi/default.nix
@@ -37,6 +37,10 @@ stdenv.mkDerivation rec {
     "-DLUABIND_LIBRARY=${luabind}/lib/libluabind09.a"
   ];
 
+  # CMake 2.6 is deprecated and is no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  patches = [ ./cmake-4-build.patch ];
+
   meta = with lib; {
     description = "Physics-based puzzle game";
     mainProgram = "soi";

From 872489c82b11c3d06dea821b2d19abeded783a6e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 16 Oct 2025 20:59:32 +0000
Subject: [PATCH 0792/6226] calico-apiserver: 3.30.3 -> 3.30.4

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

diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix
index caa60413028a..61f6526bab8e 100644
--- a/pkgs/applications/networking/cluster/calico/default.nix
+++ b/pkgs/applications/networking/cluster/calico/default.nix
@@ -14,16 +14,16 @@ builtins.mapAttrs
     }:
     buildGoModule rec {
       inherit pname;
-      version = "3.30.3";
+      version = "3.30.4";
 
       src = fetchFromGitHub {
         owner = "projectcalico";
         repo = "calico";
         rev = "v${version}";
-        hash = "sha256-Z2kYUak/zzO0IsKQyQ6sb3UD4QUZ9+9vGGVfl4qdPF8=";
+        hash = "sha256-WhEdSmJxTLOYke7Jszca+P7dWCLs9tZF074Okl4vDpw=";
       };
 
-      vendorHash = "sha256-C9sge+xNTsW30PF2wJhRUNI1YEmXInD+xcboCtcC9kc=";
+      vendorHash = "sha256-W+rHPYCuP9rK/f8yYutP4Cac8cJ6XKtoVAxCeqPtpsM=";
 
       inherit doCheck subPackages;
 

From 5bb16a45aca523a45ff5c7c879ec26d7591ab5ca Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Thu, 16 Oct 2025 23:10:47 +0200
Subject: [PATCH 0793/6226] xautoclick: fix build with cmake4

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

diff --git a/pkgs/by-name/xa/xautoclick/package.nix b/pkgs/by-name/xa/xautoclick/package.nix
index be79532cef07..f79f0f95aea2 100644
--- a/pkgs/by-name/xa/xautoclick/package.nix
+++ b/pkgs/by-name/xa/xautoclick/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   xorg,
   pkg-config,
   cmake,
@@ -28,6 +29,14 @@ stdenv.mkDerivation rec {
     sha256 = "GN3zI5LQnVmRC0KWffzUTHKrxcqnstiL55hopwTTwpE=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "bump-cmake-required-version.patch";
+      url = "https://github.com/qarkai/xautoclick/commit/a6cd4058fa7d8579bf4ada3f48441f333fca9dab.patch?full_index=1";
+      hash = "sha256-4ovcaVrXQqFZX85SnewtfjZpipcGTw52ZrTkT6iWZQM=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config

From 2c198eddd602e141962c4d3e98729092821d738c Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Thu, 16 Oct 2025 23:58:59 +0200
Subject: [PATCH 0794/6226] udpreplay: fix build with cmake4

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

diff --git a/pkgs/by-name/ud/udpreplay/package.nix b/pkgs/by-name/ud/udpreplay/package.nix
index 3367597e688c..766b180082f8 100644
--- a/pkgs/by-name/ud/udpreplay/package.nix
+++ b/pkgs/by-name/ud/udpreplay/package.nix
@@ -3,6 +3,7 @@
   cmake,
   libpcap,
   fetchFromGitHub,
+  fetchpatch,
   lib,
 }:
 stdenv.mkDerivation rec {
@@ -17,6 +18,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-kF9a3pjQbFKf25NKyK7uSq0AAO6JK7QeChLhm9Z3wEA=";
   };
 
+  patches = [
+    # Increase minimum CMake required to 3.5
+    (fetchpatch {
+      url = "https://github.com/rigtorp/udpreplay/commit/52bd71d6c004cd69899dbe8d529f3ce0a8154e7f.patch?full_index=1";
+      hash = "sha256-nWtC77SNpNDDkEli5loc8eVJ1ll0AdgEKQ4pV84JoSk=";
+    })
+  ];
+
   meta = with lib; {
     description = "Replay UDP packets from a pcap file";
     longDescription = ''

From 716201e481a49089d5ab0906e735ec3ed26b8719 Mon Sep 17 00:00:00 2001
From: Galen Huntington <galen.huntington@gmail.com>
Date: Thu, 16 Oct 2025 15:58:23 -0700
Subject: [PATCH 0795/6226] xv: fix build, add xrandr support

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

diff --git a/pkgs/by-name/xv/xv/package.nix b/pkgs/by-name/xv/xv/package.nix
index 999634c8a9b1..a88e1e764391 100644
--- a/pkgs/by-name/xv/xv/package.nix
+++ b/pkgs/by-name/xv/xv/package.nix
@@ -7,7 +7,9 @@
   libpng,
   libwebp,
   libtiff,
+  libjpeg,
   jasper,
+  libxrandr,
 }:
 
 stdenv.mkDerivation rec {
@@ -28,7 +30,9 @@ stdenv.mkDerivation rec {
     libpng
     libwebp
     libtiff
+    libjpeg
     jasper
+    libxrandr
   ];
 
   meta = {

From 1c0ce51b141dcffac818d3e53a3c145f1326bce2 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Fri, 17 Oct 2025 01:26:54 +0200
Subject: [PATCH 0796/6226] pn: drop

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

diff --git a/pkgs/by-name/pn/pn/package.nix b/pkgs/by-name/pn/pn/package.nix
deleted file mode 100644
index 91adda540acf..000000000000
--- a/pkgs/by-name/pn/pn/package.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  libphonenumber,
-  icu,
-  protobuf,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "pn";
-  version = "0.9.0";
-
-  src = fetchFromGitHub {
-    owner = "Orange-OpenSource";
-    repo = "pn";
-    rev = "v${version}";
-    sha256 = "sha256-vRF9MPcw/hCreHVLD6QB7g1r0wQiZv1xrfzIHj1Yf9M=";
-  };
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [
-    libphonenumber
-    icu
-    protobuf
-  ];
-
-  meta = with lib; {
-    description = "Libphonenumber command-line wrapper";
-    mainProgram = "pn";
-    homepage = "https://github.com/Orange-OpenSource/pn";
-    license = licenses.asl20;
-    platforms = platforms.unix;
-    maintainers = [ maintainers.McSinyx ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f7633dfb2ee1..adf73d978d67 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2100,6 +2100,7 @@ mapAliases {
   platypus = throw "platypus is unmaintained and has not merged Python3 support"; # Added 2025-03-20
   pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17
   plex-media-player = throw "'plex-media-player' has been discontinued, the new official client is available as 'plex-desktop'"; # Added 2025-05-28
+  pn = throw "'pn' has been removed as upstream was archived in 2020"; # Added 2025-10-17
   plots = throw "'plots' has been replaced by 'gnome-graphs'"; # Added 2025-02-05
   pltScheme = racket; # Added 2013-02-24
   poac = cabinpkg; # Added 2025-01-22

From 0c7e14e68880b6274c8e7dd171efbcbd04757555 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Thu, 16 Oct 2025 18:09:55 -0700
Subject: [PATCH 0797/6226] gcc: disable enableDefaultPie when
 !hasSharedLibraries

In discussion on #439314 conditionalizing this seemed unnecessary
as pkgsStatic's gcc kept working. However, some less typical
!hasSharedLibraries stdenvs for embedded platforms broke.

It seems simplest to make this conditional on hasSharedLibraries for
now. We may need to revisit this if we want to enable static-pie by
default with gcc spec file changes.
---
 pkgs/development/compilers/gcc/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/gcc/default.nix b/pkgs/development/compilers/gcc/default.nix
index e6acca591005..74d482bea205 100644
--- a/pkgs/development/compilers/gcc/default.nix
+++ b/pkgs/development/compilers/gcc/default.nix
@@ -19,7 +19,7 @@
   cargo,
   staticCompiler ? false,
   enableShared ? stdenv.targetPlatform.hasSharedLibraries,
-  enableDefaultPie ? true,
+  enableDefaultPie ? stdenv.targetPlatform.hasSharedLibraries,
   enableLTO ? stdenv.hostPlatform.hasSharedLibraries,
   texinfo ? null,
   perl ? null, # optional, for texi2pod (then pod2man)

From d83289ecb03360fc648f635ee974647aa7a8a6b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 01:12:56 +0000
Subject: [PATCH 0798/6226] fh: 0.1.25 -> 0.1.26

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

diff --git a/pkgs/by-name/fh/fh/package.nix b/pkgs/by-name/fh/fh/package.nix
index 754e226bd150..fa6531c1a897 100644
--- a/pkgs/by-name/fh/fh/package.nix
+++ b/pkgs/by-name/fh/fh/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fh";
-  version = "0.1.25";
+  version = "0.1.26";
 
   src = fetchFromGitHub {
     owner = "DeterminateSystems";
     repo = "fh";
     rev = "v${version}";
-    hash = "sha256-YVtFzJMdHpshtRqBDVw3Kr88psAPfcdOI0XVDGnFkq0=";
+    hash = "sha256-cHXpTe5tAXrAwVu5+ZTb3pzHIqAk353GnNFPvComIfQ=";
   };
 
-  cargoHash = "sha256-D/8YYv9V1ny9AWFkVPgcE9doq+OxN+yiCCt074FKgn0=";
+  cargoHash = "sha256-HwFehxL01pwT93jjVvCU9BXhaHhCDbox50ecXpod3Mo=";
 
   nativeBuildInputs = [
     installShellFiles

From 3a15cd8077c787b5ca8d96fda1ec717f00011459 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 01:31:51 +0000
Subject: [PATCH 0799/6226] libremines: 2.2.0 -> 2.2.1

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

diff --git a/pkgs/by-name/li/libremines/package.nix b/pkgs/by-name/li/libremines/package.nix
index 96b030dbc339..29747c8becd3 100644
--- a/pkgs/by-name/li/libremines/package.nix
+++ b/pkgs/by-name/li/libremines/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libremines";
-  version = "2.2.0";
+  version = "2.2.1";
 
   src = fetchFromGitHub {
     owner = "Bollos00";
     repo = "libremines";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JLA+QpPhhEiv75jpzKncBHsC5WGK0dht5jVJx56pz88=";
+    hash = "sha256-DscpRqXho+bZnXDLyii/cZjuL4MRTAQOuX6PUfwXCx8=";
   };
 
   nativeBuildInputs = [

From 98a73f380288893341099991a4c4885e2b5caddc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Thu, 16 Oct 2025 18:32:18 -0700
Subject: [PATCH 0800/6226] capstone_4: fix build failure with cmake 4

- CMake 4 is no longer retro compatible with versions < 3.5
---
 pkgs/development/libraries/capstone/4.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/libraries/capstone/4.nix b/pkgs/development/libraries/capstone/4.nix
index a6e0b2a6a738..adb245c9b40e 100644
--- a/pkgs/development/libraries/capstone/4.nix
+++ b/pkgs/development/libraries/capstone/4.nix
@@ -26,6 +26,17 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  # CMake 2.6 is deprecated and is no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.6)"  \
+      "cmake_minimum_required(VERSION 3.10)" \
+    --replace-fail \
+      "cmake_policy (SET CMP0048 OLD)" \
+      "cmake_policy (SET CMP0048 NEW)"
+  '';
+
   meta = {
     description = "Advanced disassembly library";
     homepage = "http://www.capstone-engine.org";

From 0a186c61618c84b75c887a9e8a3d59e712c04109 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 01:42:18 +0000
Subject: [PATCH 0801/6226] mieru: 3.20.1 -> 3.21.0

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

diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix
index 6f4445aee9ab..e4ec674222c4 100644
--- a/pkgs/by-name/mi/mieru/package.nix
+++ b/pkgs/by-name/mi/mieru/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "mieru";
-  version = "3.20.1";
+  version = "3.21.0";
 
   src = fetchFromGitHub {
     owner = "enfein";
     repo = "mieru";
     rev = "v${version}";
-    hash = "sha256-r4QMETKt8EMSX9BsSizlvlMdlJ+SjlLScNfOxSm84Ec=";
+    hash = "sha256-9e2V+WwcBp16DsMf31IzANdMlc/r3KFDYjSCKvKKGwM=";
   };
 
   vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM=";

From 8831c62bfdde1f1a91b810bd2b9600e37108a7df Mon Sep 17 00:00:00 2001
From: Sam <30577766+Samasaur1@users.noreply.github.com>
Date: Thu, 16 Oct 2025 23:17:20 -0500
Subject: [PATCH 0802/6226] sentry-cli: fix linking issues

Co-authored-by: Randy Eckenrode <randy@largeandhighquality.com>
---
 .../se/sentry-cli/fix-swift-lib-path.patch    | 31 +++++++++++++++++--
 pkgs/by-name/se/sentry-cli/package.nix        |  9 +++---
 2 files changed, 33 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch b/pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch
index 9d3b0dedd16d..04274f374a8f 100644
--- a/pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch
+++ b/pkgs/by-name/se/sentry-cli/fix-swift-lib-path.patch
@@ -1,8 +1,8 @@
 diff --git a/apple-catalog-parsing/build.rs b/apple-catalog-parsing/build.rs
-index 2ab4c71b..80301b1a 100644
+index 2ab4c71b59..6bcf003c0a 100644
 --- a/apple-catalog-parsing/build.rs
 +++ b/apple-catalog-parsing/build.rs
-@@ -30,7 +30,7 @@ fn main() {
+@@ -30,7 +30,7 @@
      // Add necessary libraries to the linker search path. Without this line, compiling fails
      // on systems without Xcode installed (xcode-select is still required).
      println!(
@@ -11,3 +11,30 @@ index 2ab4c71b..80301b1a 100644
      );
  
      let out_dir = env::var("OUT_DIR").expect("OUT_DIR is set for build scripts");
+@@ -87,17 +87,14 @@
+     println!("cargo:rustc-link-search=framework=/System/Library/PrivateFrameworks");
+     println!("cargo:rustc-link-lib=framework=CoreUI");
+ 
+-    // Link to swift macOS support libraries for Swift runtime support on older macOS versions
+-    let developer_dir = Command::new("xcode-select")
+-        .args(["-p"])
+-        .output()
+-        .expect("Failed to get developer directory, please ensure Xcode is installed.");
+-    let developer_dir_path = String::from_utf8(developer_dir.stdout)
+-        .expect("Failed to convert developer directory to UTF-8")
+-        .trim()
+-        .to_owned();
+-
+-    println!(
+-        "cargo:rustc-link-search={developer_dir_path}/Toolchains/XcodeDefault.xctoolchain/usr/lib/swift/macosx"
++    // Link libobjc to avoid the following error: ld: can't find ordinal for imported symbol '___objc_personality_v0'
++    println!("cargo:rustc-link-lib=objc");
++
++    println!(
++        "cargo:rustc-link-search=/usr/lib/swift"
++    );
++
++    println!(
++        "cargo:rustc-link-search=@swiftLib@/lib/swift/macosx"
+     );
+ }
\ No newline at end of file
diff --git a/pkgs/by-name/se/sentry-cli/package.nix b/pkgs/by-name/se/sentry-cli/package.nix
index 16b0547b0ca1..084115cfe1a4 100644
--- a/pkgs/by-name/se/sentry-cli/package.nix
+++ b/pkgs/by-name/se/sentry-cli/package.nix
@@ -8,7 +8,7 @@
   stdenv,
   swift,
   swiftpm,
-  writeShellScriptBin,
+  replaceVars,
 }:
 rustPlatform.buildRustPackage rec {
   pname = "sentry-cli";
@@ -26,7 +26,9 @@ rustPlatform.buildRustPackage rec {
   OPENSSL_NO_VENDOR = 1;
 
   patches = [
-    ./fix-swift-lib-path.patch
+    (replaceVars ./fix-swift-lib-path.patch {
+      swiftLib = lib.getLib swift;
+    })
   ];
 
   buildInputs = [ openssl ];
@@ -36,9 +38,6 @@ rustPlatform.buildRustPackage rec {
   ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [
       swift
       swiftpm
-      (writeShellScriptBin "xcode-select" ''
-        echo $DEVELOPER_DIR
-      '')
   ]);
 
   # By default including `swiftpm` in `nativeBuildInputs` will take over `buildPhase`

From 0ff315567c2703895e28b3a8c2a5bb931cc9b2f5 Mon Sep 17 00:00:00 2001
From: Sam <30577766+Samasaur1@users.noreply.github.com>
Date: Thu, 16 Oct 2025 23:36:45 -0500
Subject: [PATCH 0803/6226] sentry-cli: fix formatting

---
 pkgs/by-name/se/sentry-cli/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/sentry-cli/package.nix b/pkgs/by-name/se/sentry-cli/package.nix
index 084115cfe1a4..e6e44db0eca4 100644
--- a/pkgs/by-name/se/sentry-cli/package.nix
+++ b/pkgs/by-name/se/sentry-cli/package.nix
@@ -35,9 +35,10 @@ rustPlatform.buildRustPackage rec {
   nativeBuildInputs = [
     installShellFiles
     pkg-config
-  ] ++ (lib.optionals stdenv.hostPlatform.isDarwin [
-      swift
-      swiftpm
+  ]
+  ++ (lib.optionals stdenv.hostPlatform.isDarwin [
+    swift
+    swiftpm
   ]);
 
   # By default including `swiftpm` in `nativeBuildInputs` will take over `buildPhase`

From 386415a44fedb9774b50f21f47eabb722578889e Mon Sep 17 00:00:00 2001
From: Linda Siemons <linda@catbrained.dev>
Date: Fri, 17 Oct 2025 08:39:54 +0200
Subject: [PATCH 0804/6226] teamspeak6-client: 6.0.0-beta2 -> 6.0.0-beta3.1

Teamspeak now supports screenshare on Wayland, which requires Pipewire.

Release notes (6.0.0-beta3): https://community.teamspeak.com/t/teamspeak-6-0-0-beta3-foundation-i-update/62417
Release notes (6.0.0-beta3.1): https://community.teamspeak.com/t/hotfix-teamspeak-6-0-0-beta3-1-foundation-i-hotfix/62449
---
 pkgs/by-name/te/teamspeak6-client/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/te/teamspeak6-client/package.nix b/pkgs/by-name/te/teamspeak6-client/package.nix
index a05263c1353d..3f3b138a948f 100644
--- a/pkgs/by-name/te/teamspeak6-client/package.nix
+++ b/pkgs/by-name/te/teamspeak6-client/package.nix
@@ -22,6 +22,7 @@
   libxkbcommon,
   libgbm,
   nss,
+  pipewire,
   udev,
   libGL,
   xorg,
@@ -29,11 +30,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "teamspeak6-client";
-  version = "6.0.0-beta2";
+  version = "6.0.0-beta3.1";
 
   src = fetchurl {
     url = "https://files.teamspeak-services.com/pre_releases/client/${finalAttrs.version}/teamspeak-client.tar.gz";
-    hash = "sha256-3jNPv3uQ2RztR1p4XQNLUg5IVrvW/dcdtqXdiGJKVSs=";
+    hash = "sha256-CWKyn49DSWgrkJyYcPwKUz2PBykvFQc1f7G/yvrHbWU=";
   };
 
   sourceRoot = ".";
@@ -55,6 +56,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     libxkbcommon
     libgbm
     nss
+    pipewire
     xorg.libX11
     xorg.libXScrnSaver
     xorg.libXdamage
@@ -102,6 +104,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
           udev
           libGL
           libpulseaudio
+          pipewire
         ]
       }"
 

From b9562bb8f96660864290aebb5c6aee05f1557f5f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 07:29:43 +0000
Subject: [PATCH 0805/6226] kuma: 2.12.0 -> 2.12.1

---
 pkgs/applications/networking/cluster/kuma/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/kuma/default.nix b/pkgs/applications/networking/cluster/kuma/default.nix
index b43c63ecef0d..490b926c7e27 100644
--- a/pkgs/applications/networking/cluster/kuma/default.nix
+++ b/pkgs/applications/networking/cluster/kuma/default.nix
@@ -17,14 +17,14 @@
 
 buildGoModule rec {
   inherit pname;
-  version = "2.12.0";
+  version = "2.12.1";
   tags = lib.optionals enableGateway [ "gateway" ];
 
   src = fetchFromGitHub {
     owner = "kumahq";
     repo = "kuma";
     tag = version;
-    hash = "sha256-5syQFcYBY/xKipIsAJdjVrXYXt7NNjjCeXiDVNO9NTo=";
+    hash = "sha256-9s89fiBFIP6azB1SDCZkTlQWAQ2C6htQXRMvyWrNch0=";
   };
 
   vendorHash = "sha256-KgZYKopW+FOdwBIGxa2RLiEbefZ/1vAhcsWtcYhgdFs=";

From b5b6abac33177e2a186feda59e7a39b0e0548703 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 17 Oct 2025 17:31:07 +0900
Subject: [PATCH 0806/6226] nixos/tests/dictd: init

---
 nixos/tests/all-tests.nix     |  1 +
 nixos/tests/dictd.nix         | 29 +++++++++++++++++++++++++++++
 pkgs/servers/dict/default.nix |  3 +++
 3 files changed, 33 insertions(+)
 create mode 100644 nixos/tests/dictd.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 1f1f5ae5e043..933135a19533 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -449,6 +449,7 @@ in
   devpi-server = runTest ./devpi-server.nix;
   dex-oidc = runTest ./dex-oidc.nix;
   dhparams = runTest ./dhparams.nix;
+  dictd = runTest ./dictd.nix;
   disable-installer-tools = runTest ./disable-installer-tools.nix;
   discourse = runTest {
     imports = [ ./discourse.nix ];
diff --git a/nixos/tests/dictd.nix b/nixos/tests/dictd.nix
new file mode 100644
index 000000000000..83faf870711f
--- /dev/null
+++ b/nixos/tests/dictd.nix
@@ -0,0 +1,29 @@
+{ lib, pkgs, ... }:
+{
+  name = "dictd";
+  meta.maintainers = with lib.maintainers; [
+    h7x4
+  ];
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      services.dictd = {
+        enable = true;
+        DBs = with pkgs.dictdDBs; [
+          jpn2eng
+          eng2jpn
+        ];
+      };
+    };
+
+  testScript = ''
+    machine.wait_for_unit("dictd.service")
+    machine.wait_for_open_port(2628)
+
+    machine.succeed("dict --serverinfo | grep 'On machine: up'")
+    machine.succeed("dict --dbs | grep '${pkgs.dictdDBs.jpn2eng.name}'")
+    machine.succeed("dict -d '${pkgs.dictdDBs.jpn2eng.name}' 例え | grep example")
+    machine.succeed("dict -d '${pkgs.dictdDBs.eng2jpn.name}' example | grep 例え")
+  '';
+}
diff --git a/pkgs/servers/dict/default.nix b/pkgs/servers/dict/default.nix
index d3c74dfab9be..0deed5dcc609 100644
--- a/pkgs/servers/dict/default.nix
+++ b/pkgs/servers/dict/default.nix
@@ -8,6 +8,7 @@
   libmaa,
   zlib,
   libtool,
+  nixosTests,
 }:
 
 stdenv.mkDerivation rec {
@@ -47,6 +48,8 @@ stdenv.mkDerivation rec {
     install -Dm444 -t $out/share/doc/${pname} NEWS README
   '';
 
+  passthru.tests.nixos = nixosTests.dictd;
+
   meta = {
     description = "Dict protocol server and client";
     homepage = "http://www.dict.org";

From 5f57d602dc9dca13d1a209f3ad8b91ddea6de448 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 09:24:19 +0000
Subject: [PATCH 0807/6226] whisper-cpp: 1.8.1 -> 1.8.2

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

diff --git a/pkgs/by-name/wh/whisper-cpp/package.nix b/pkgs/by-name/wh/whisper-cpp/package.nix
index 109db97b9eda..1d10f2ee5c9d 100644
--- a/pkgs/by-name/wh/whisper-cpp/package.nix
+++ b/pkgs/by-name/wh/whisper-cpp/package.nix
@@ -73,13 +73,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "whisper-cpp";
-  version = "1.8.1";
+  version = "1.8.2";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "whisper.cpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lE25O/C55INo4xufCSzrPFX2kyodXiKwf80kknIy1Os=";
+    hash = "sha256-OU5mDnLZHmtdSEN5u0syJcU91L+NCO45f9eG6OsgFfU=";
   };
 
   # The upstream download script tries to download the models to the

From 8635298c2e511ab45a1ae9dcc3e404c9b4c3ca28 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 09:50:11 +0000
Subject: [PATCH 0808/6226] phpExtensions.relay: 0.12.0 -> 0.12.1

---
 .../php-packages/relay/default.nix            | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/php-packages/relay/default.nix b/pkgs/development/php-packages/relay/default.nix
index 104d66bdf3df..605d88b41637 100644
--- a/pkgs/development/php-packages/relay/default.nix
+++ b/pkgs/development/php-packages/relay/default.nix
@@ -15,36 +15,36 @@
 }:
 
 let
-  version = "0.12.0";
+  version = "0.12.1";
   hashes = {
     "aarch64-darwin" = {
       platform = "darwin-arm64";
       hash = {
-        "8.1" = "sha256-AH8FzXjIPojCxTQqDChuZPUTDnVPeOeS5a0wNXjlyEk=";
-        "8.2" = "sha256-SdivilTHbr28fHaYxK7o1QIT+sWZGHQDjWC2EgtkBbM=";
-        "8.3" = "RUnmwI5q4jXHkiRuR/PwqnztEX/7y59DA/L7BelreVk=";
-        "8.4" = "sha256-y76rICDyrA/ogRxK+4C3JvJ4ch1fNLBrY01zMmcldnw=";
-        "8.5" = "W7BwODGEcRc6E7jpX1nojak7jDV5X+0tjgk32F82wvQ=";
+        "8.1" = "sha256-a9FLBAYX3hSHcR0AqScKNlpIK36V3FXK3w8Oq3m+VSQ=";
+        "8.2" = "sha256-1pJI38OKV4ER4m6bGfMjQIXfSjwBgz6+YsBfVlGE3g8=";
+        "8.3" = "G82BIJ5ha5hBq/zlZfxwC2HVgBuih+wvSUe2e3fUqcg=";
+        "8.4" = "sha256-MDn49LuXMR66TjTLdKYodPSya37m7LEZSAJRi6h+fTQ=";
+        "8.5" = "4BihkHnZIJ+lExoYzE/LcMTQp/IQOexzVsUQQkczYOQ=";
       };
     };
     "aarch64-linux" = {
       platform = "debian-aarch64+libssl3";
       hash = {
-        "8.1" = "sha256-Zg1DdzJKfovGwA+cTR5hDQ1Or8oPRrtsyBu3Zt+/6yg=";
-        "8.2" = "sha256-tV7aoi9aiUrpOufmN4pQKi0Q0Ad6wrajq9SnaeZGlKg=";
-        "8.3" = "sha256-zJN+RSzFXjOB3Uajk1Adrphbz7NAbWMcuB88RRK7SlY=";
-        "8.4" = "qvXUg3GqqN3UUtDPQz1H2BiG/b8SomGLyIPR1NIkFUA=";
-        "8.5" = "GZZa4a+MfoQPlpIA6zOEnD4UdErh/9fLhMp20rOmGIE=";
+        "8.1" = "sha256-zYOckcqgarf3a/dbnv6dj3fq8l2eKO08DnkjAqoGUAE=";
+        "8.2" = "sha256-TrObjYHv0n5XjR7y1VnL5ROTZYKd9WKM4Sb0ToMk+qc=";
+        "8.3" = "sha256-m5wJcskJSDn1C+6X2D7wv5qyiq4MDMZgNo6l/w56hUw=";
+        "8.4" = "3dFTZUm9g+kzIcQtbILa+ETnNCEmg/03O7gcIPBpils=";
+        "8.5" = "PFhnzciKFD62y48BY2wOP9aOMQL6JC69qPqZNQpEVDY=";
       };
     };
     "x86_64-linux" = {
       platform = "debian-x86-64+libssl3";
       hash = {
-        "8.1" = "sha256-NTCRrTuiPDbKBauY+9nQm4oJn9TwHQvNfynSKk/bZ7w=";
-        "8.2" = "sha256-9GwMHf0GIErr0vZieCH5D5tvJiekpOdBo/u1P30L9lc=";
-        "8.3" = "sha256-180n5Naz6dQRCQCj7r0CJhRqfmEHjM7jgkmWRAvyFaY=";
-        "8.4" = "nGgvhtuita+rTtns+33xDDEaIXcd3aYiCAClizWtE1E=";
-        "8.5" = "wvxZ7jUrqXImzH1LEUmvxpxKL4NE0tAtu9M25P82d0w=";
+        "8.1" = "sha256-qJcMtjoQ4iej70SjqnSPF2sNbhMDdTQ6ThX/J4bgZuo=";
+        "8.2" = "sha256-/lIDyQue7Azgx12A4nx3baFbOjHV+ubX6u0wELPhPyI=";
+        "8.3" = "sha256-Jh17Gg1r7/yjX7aJxKSRQdptH6Nf1p3rPlIzqhpp7tQ=";
+        "8.4" = "y+KBe+6gCJ9bdkCIgUDeQLsBE/AsydHULBwjEhjdDAk=";
+        "8.5" = "+wTZw3w55viegnGGQWw55gRx2Hv/XsIDlkVVemklpro=";
       };
     };
   };

From 936aa39307a68f70b824d4807736986139767451 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 14 Oct 2025 13:33:39 +0200
Subject: [PATCH 0809/6226] signal-desktop: 7.73.0 -> 7.74.0

Co-authored-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/si/signal-desktop/package.nix    |  16 +--
 .../replace-apple-emoji-with-noto-emoji.patch |  80 ++++++-----
 pkgs/by-name/si/signal-desktop/ringrtc.nix    |  11 +-
 .../si/signal-desktop/webrtc-sources.json     | 132 ++++++++----------
 pkgs/by-name/si/signal-desktop/webrtc.nix     |   3 +-
 5 files changed, 122 insertions(+), 120 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 27295d8335fb..2ce968f1c577 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -52,13 +52,13 @@ let
     '';
   });
 
-  version = "7.73.0";
+  version = "7.74.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-5cwGV0WPOS7O/xnQZ38t/hiQppqFFtVQmGuniGsD6H8=";
+    hash = "sha256-ahFc/AOBfgW34S1zcLZYj9pie/2aAK/tdZzC7An4lNU=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -69,7 +69,7 @@ let
     pnpmDeps = pnpm.fetchDeps {
       inherit (finalAttrs) pname src version;
       fetcherVersion = 1;
-      hash = "sha256-cT7Ixl/V/mesPHvJUsG63Y/wXwKjbjkjdjP3S7uEOa0=";
+      hash = "sha256-WUwclz7dJl+s5zRjWu/HTJ5eZroAFA6vR8mZzwib6Po=";
     };
 
     strictDeps = true;
@@ -134,15 +134,15 @@ stdenv.mkDerivation (finalAttrs: {
     fetcherVersion = 1;
     hash =
       if withAppleEmojis then
-        "sha256-9YvNs925xBUYEpF429rHfMXIGPapVYd8j1jZa/yBuhA="
+        "sha256-h1F9/lKtcT8Gce+EVj8RrPzHtjqp11ycHAkf7xldHeM="
       else
-        "sha256-lcr8EeL+wd6VihKcBgfXNRny8VskX8g7I7WTAkLuBss=";
+        "sha256-tDlQTOSUkCjRXtA7NIUgI+ax+GCPFXK+eZLe0fXVhJY=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1759413120;
+    SOURCE_DATE_EPOCH = 1759960657;
   };
 
   preBuild = ''
@@ -218,12 +218,10 @@ stdenv.mkDerivation (finalAttrs: {
       install -Dm644 $icon $out/share/icons/hicolor/`basename ''${icon%.png}`/apps/signal-desktop.png
     done
 
-    # TODO: Remove --ozone-platform=wayland after next electron update,
-    # see https://github.com/electron/electron/pull/48309
     makeWrapper '${lib.getExe electron}' "$out/bin/signal-desktop" \
       --add-flags "$out/share/signal-desktop/app.asar" \
       --set-default ELECTRON_FORCE_IS_PACKAGED 1 \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform=wayland --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \
       --add-flags ${lib.escapeShellArg commandLineArgs}
 
     runHook postInstall
diff --git a/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch
index 5d235dc80041..4f7f0bebcf26 100644
--- a/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch
+++ b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch
@@ -49,11 +49,11 @@ diff --git a/package.json b/package.json
 index 5755fec..86125ba 100644
 --- a/package.json
 +++ b/package.json
-@@ -137,7 +137,6 @@
+@@ -154,7 +154,6 @@
      "dashdash": "2.0.0",
      "direction": "1.0.4",
-     "emoji-datasource": "15.1.2",
--    "emoji-datasource-apple": "15.1.2",
+     "emoji-datasource": "16.0.0",
+-    "emoji-datasource-apple": "16.0.0",
      "emoji-regex": "10.4.0",
      "encoding": "0.1.13",
      "fabric": "4.6.0",
@@ -64,46 +64,46 @@ index 5755fec..86125ba 100644
 -}
 +}
 \ No newline at end of file
-diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
-index f04b2b1..070fa0f 100644
---- a/pnpm-lock.yaml
-+++ b/pnpm-lock.yaml
-@@ -184,9 +184,6 @@ importers:
+diff --git i/pnpm-lock.yaml w/pnpm-lock.yaml
+index b162101a8..82ee9d67e 100644
+--- i/pnpm-lock.yaml
++++ w/pnpm-lock.yaml
+@@ -197,9 +197,6 @@ importers:
        emoji-datasource:
-         specifier: 15.1.2
-         version: 15.1.2
+         specifier: 16.0.0
+         version: 16.0.0
 -      emoji-datasource-apple:
--        specifier: 15.1.2
--        version: 15.1.2
+-        specifier: 16.0.0
+-        version: 16.0.0
        emoji-regex:
          specifier: 10.4.0
          version: 10.4.0
-@@ -4817,9 +4814,6 @@ packages:
+@@ -5814,9 +5811,6 @@ packages:
      resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
      engines: {node: '>=12'}
- 
--  emoji-datasource-apple@15.1.2:
--    resolution: {integrity: sha512-32UZTK36x4DlvgD1smkmBlKmmJH7qUr5Qut4U/on2uQLGqNXGbZiheq6/LEA8xRQEUrmNrGEy25wpEI6wvYmTg==}
+
+-  emoji-datasource-apple@16.0.0:
+-    resolution: {integrity: sha512-dVYjsK0FnCry9F+PBtnivhG2K0xdwlmqYaSgiUtztUdAGPYiHYhZcVKvNBqC791g2qyEcFNTBO6utg4eQ3uLTw==}
 -
-   emoji-datasource@15.1.2:
-     resolution: {integrity: sha512-tXAqGsrDVhgCRpFePtaD9P4Z8Ro2SUQSL/4MIJBG0SxqQJaMslEbin8J53OaFwEBu6e7JxFaIF6s4mw9+8acAQ==}
- 
-@@ -14990,8 +14984,6 @@ snapshots:
- 
+   emoji-datasource@16.0.0:
+     resolution: {integrity: sha512-/qHKqK5Nr3+8zhgO6kHmF43Fm5C8HNn0AaFRIpgw8HF3+uF0Vfc8jgLI1ZQS5ba1vBzksS8NBCjHejwLb2D/Sg==}
+
+@@ -17037,8 +17031,6 @@ snapshots:
+
    emittery@0.13.1: {}
- 
--  emoji-datasource-apple@15.1.2: {}
+
+-  emoji-datasource-apple@16.0.0: {}
 -
-   emoji-datasource@15.1.2: {}
- 
+   emoji-datasource@16.0.0: {}
+
    emoji-regex@10.4.0: {}
 diff --git a/stylesheets/components/fun/FunEmoji.scss b/stylesheets/components/fun/FunEmoji.scss
-index 78c7563..83d196c 100644
---- a/stylesheets/components/fun/FunEmoji.scss
-+++ b/stylesheets/components/fun/FunEmoji.scss
+index ea029fd5b..0e3563b4f 100644
+--- i/stylesheets/components/fun/FunEmoji.scss
++++ w/stylesheets/components/fun/FunEmoji.scss
 @@ -5,19 +5,9 @@
  $emoji-sprite-sheet-grid-item-count: 62;
- 
+
  @mixin emoji-sprite($sheet, $margin, $scale) {
 -  $size: calc($sheet * 1px * $scale);
 -  $margin-start: calc($margin * $scale);
@@ -123,16 +123,22 @@ index 78c7563..83d196c 100644
 +  background-position: center;
    background-repeat: no-repeat;
  }
- 
+
 diff --git a/ts/components/fun/FunEmoji.tsx b/ts/components/fun/FunEmoji.tsx
-index 08785e8..d25b868 100644
+index ddb30bf6d..5fc39339b 100644
 --- a/ts/components/fun/FunEmoji.tsx
 +++ b/ts/components/fun/FunEmoji.tsx
-@@ -10,7 +10,14 @@ export const FUN_STATIC_EMOJI_CLASS = 'FunStaticEmoji';
- export const FUN_INLINE_EMOJI_CLASS = 'FunInlineEmoji';
- 
- function getEmojiJumboUrl(emoji: EmojiVariantData): string {
--  return `emoji://jumbo?emoji=${encodeURIComponent(emoji.value)}`;
+@@ -20,13 +20,14 @@ function getEmojiJumboBackground(
+   emoji: EmojiVariantData,
+   size: number | undefined
+ ): string | null {
+-  if (size != null && size < MIN_JUMBOMOJI_SIZE) {
+-    return null;
+-  }
+-  if (KNOWN_JUMBOMOJI.has(emoji.value)) {
+-    return `url(emoji://jumbo?emoji=${encodeURIComponent(emoji.value)})`;
+-  }
+-  return null;
 +  const emojiToNotoName = (emoji: string): string =>
 +    `emoji_u${
 +      [...emoji]
@@ -140,7 +146,7 @@ index 08785e8..d25b868 100644
 +        .map(c => c.codePointAt(0)?.toString(16).padStart(4, "0"))
 +        .join("_")
 +    }.png`;
-+  return `file://@noto-emoji-pngs@/${emojiToNotoName(emoji.value)}`;
++  return `url(file://@noto-emoji-pngs@/${emojiToNotoName(emoji.value)})`;
  }
  
  export type FunStaticEmojiSize =
diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix
index b1cf5cbe4644..bd81befd9330 100644
--- a/pkgs/by-name/si/signal-desktop/ringrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix
@@ -19,16 +19,21 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ringrtc";
-  version = "2.58.1";
+  version = "2.59.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "ringrtc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HI+HVDv+nuJp2BPIAVY+PI6Pof1pnB8L6CIAgBT+tJA=";
+    hash = "sha256-zgDXkkKJrcD357DxbPq/sL/c4AG8xyMPY5IpcBtvATY=";
   };
 
-  cargoHash = "sha256-n+1pe202U2lljisSRBWeVvuBLyp7jhXG+ovDDi5WV8Q=";
+  cargoHash = "sha256-uwMNJ+PQa/Q7XZ9QONo+vm2wMqGwOEB97Kl/RFQkdhU=";
+
+  preConfigure = ''
+    # Check for matching webrtc version
+    grep 'webrtc.version=${webrtc.version}' config/version.properties
+  '';
 
   cargoBuildFlags = [
     "-p"
diff --git a/pkgs/by-name/si/signal-desktop/webrtc-sources.json b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
index d9b28f488ad7..80abcfd66ea1 100644
--- a/pkgs/by-name/si/signal-desktop/webrtc-sources.json
+++ b/pkgs/by-name/si/signal-desktop/webrtc-sources.json
@@ -1,33 +1,25 @@
 {
     "src": {
         "args": {
-            "hash": "sha256-Qj0UFRWfZrBG9WUX4zkyiatIekNSYXsneP5aLvufNh4=",
+            "hash": "sha256-mNj4Sw7EROc2Cn4nPSm789h1je7EOjNAg2s6fQ19Dcc=",
             "owner": "signalapp",
             "repo": "webrtc",
-            "tag": "7204c"
+            "tag": "7339c"
         },
         "fetcher": "fetchFromGitHub"
     },
-    "src/base": {
-        "args": {
-            "hash": "sha256-wKFvb28LeB7/YVGmWKhcvXCEeNB6HaxMgZJLpC5a1Zk=",
-            "rev": "4ba67f727a84a10e32a417dc7e194f4fc6a23390",
-            "url": "https://chromium.googlesource.com/chromium/src/base"
-        },
-        "fetcher": "fetchFromGitiles"
-    },
     "src/build": {
         "args": {
-            "hash": "sha256-Bfd3paXVGon4p85V2UO6vEHG/t1g8EAxvYQ+DdPcuI8=",
-            "rev": "7adbc7e3263f3ab427ba7c5ac7839a69082ff7fb",
+            "hash": "sha256-BFKseH/tEQcQ1UF2YPBcfMLY54qBmM7OboC15NFO9e0=",
+            "rev": "66d076c7ab192991f67891b062b35404f3cb0739",
             "url": "https://chromium.googlesource.com/chromium/src/build"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/buildtools": {
         "args": {
-            "hash": "sha256-adtGyo+wm8+keR0um1fOdChABdBYboGBawD0LfcY00w=",
-            "rev": "1fc7350e65e9d7848c083b83aaf67611e74a5654",
+            "hash": "sha256-c1I0yBRDb9JUkywmJJy0IZp802qJRsoQV72ydinzxVs=",
+            "rev": "0c4bbb0f8a874de0a2a15d196031c7303d04fbb3",
             "url": "https://chromium.googlesource.com/chromium/src/buildtools"
         },
         "fetcher": "fetchFromGitiles"
@@ -43,40 +35,40 @@
     },
     "src/testing": {
         "args": {
-            "hash": "sha256-CQg6fxDz0dk4fD+X53stTwJJ25feYoU9KdsgjTAzbp8=",
-            "rev": "44b0a8d794b28dbd74614e5f5e7da2b407030647",
+            "hash": "sha256-PkTTET3CB1pQLipi0e6m+fVhf7S3MSEqiYeLFg9Pbjs=",
+            "rev": "305de9533d3ee2840af0b3f2c8ed0b32802b0a5d",
             "url": "https://chromium.googlesource.com/chromium/src/testing"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party": {
         "args": {
-            "hash": "sha256-KfIQS+FrzFDAS0B3yfzPj4PqD16H0dBE6z1JgFag/20=",
-            "rev": "8a150db896356cd9b47f8c1a6d916347393f90f2",
+            "hash": "sha256-P0fhs0vabiD7+C2ILX6gE62RKXfXbLmHRjbWLpqY48g=",
+            "rev": "e30091e8987ee0bb0cd30bc467250a96a7614762",
             "url": "https://chromium.googlesource.com/chromium/src/third_party"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/boringssl/src": {
         "args": {
-            "hash": "sha256-+Gs+efB1ZizjMYRSRTQrMDPZsDC+dgNJ9+yHXkzm/ZM=",
-            "rev": "9295969e1dad2c31d0d99481734c1c68dcbc6403",
+            "hash": "sha256-bpsZTEQ2/TE7xxhOtDz5PKzkOClImHtCTgOaINzg8Vk=",
+            "rev": "ddb2ca4b48fca9a1c468d83dc513b837331843ac",
             "url": "https://boringssl.googlesource.com/boringssl.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/breakpad/breakpad": {
         "args": {
-            "hash": "sha256-+Z7KphmQYCeN0aJkqyMrJ4tIi3BhqN16KoPNLb/bMGo=",
-            "rev": "2625edb085169e92cf036c236ac79ab594a7b1cc",
+            "hash": "sha256-8OfbSe+ly/5FFYk8NubAV39ACMr5S4wbLBVdiQHWeok=",
+            "rev": "ff252ff6faf5e3a52dc4955aab0d84831697dc94",
             "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/catapult": {
         "args": {
-            "hash": "sha256-xHe9WoAq1FElMSnu5mlEzrH+EzKiwWXeXMCH69KL5a0=",
-            "rev": "5477c6dfde1132b685c73edc16e1bc71449a691d",
+            "hash": "sha256-khxdFV6fxbTazz195MlxktLlihXytpNYCykLrI8nftM=",
+            "rev": "0fd1415f0cf3219ba097d37336141897fab7c5e9",
             "url": "https://chromium.googlesource.com/catapult.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -107,8 +99,8 @@
     },
     "src/third_party/compiler-rt/src": {
         "args": {
-            "hash": "sha256-FVdcKGwRuno3AzS6FUvI8OTj3mBMRfFR2A8GzYcwIU4=",
-            "rev": "57196dd146582915c955f6d388e31aea93220c51",
+            "hash": "sha256-TANkUmIqP+MirWFmegENuJEFK+Ve/o0A0azuxTzeAo8=",
+            "rev": "dc425afb37a69b60c8c02fef815af29e91b61773",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -123,24 +115,24 @@
     },
     "src/third_party/dav1d/libdav1d": {
         "args": {
-            "hash": "sha256-+DY4p41VuAlx7NvOfXjWzgEhvtpebjkjbFwSYOzSjv4=",
-            "rev": "8d956180934f16244bdb58b39175824775125e55",
+            "hash": "sha256-2J4M6EkfVtPLUpRWwzXdLkvJio4gskC0ihZnM5H3qYc=",
+            "rev": "716164239ad6e6b11c5dcdaa3fb540309d499833",
             "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/depot_tools": {
         "args": {
-            "hash": "sha256-1avxBlK0WLHTru5wUecbiGpSEYv8Epobsl4EfCaWX9A=",
-            "rev": "a8900cc0f023d6a662eb66b317e8ddceeb113490",
+            "hash": "sha256-+jbfCtruv6MR+A/uzw5WaSj2u92W6bB/vmLBCzL39mM=",
+            "rev": "d85491b0a1dcb82dd8e124a876ecd7e3d50dc5e8",
             "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/ffmpeg": {
         "args": {
-            "hash": "sha256-noc3iZ1yCEgkwWyznx48rXC8JuKxla9QgC/CIjRL/y8=",
-            "rev": "dcdd0fa51b65a0b1688ff6b8f0cc81908f09ded2",
+            "hash": "sha256-c5w8CuyE1J0g79lrNq1stdqc1JaAkMbtscdcywmAEMY=",
+            "rev": "d2d06b12c22d27af58114e779270521074ff1f85",
             "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -155,24 +147,24 @@
     },
     "src/third_party/fontconfig/src": {
         "args": {
-            "hash": "sha256-Kz7KY+evfOciKFHIBLG1JxIRgHRTzuBLgxXHv3m/Y1Y=",
-            "rev": "8cf0ce700a8abe0d97ace4bf7efc7f9534b729ba",
+            "hash": "sha256-6HLV0U/MA1XprKJ70TKvwUBdkGQPwgqP4Oj5dINsKp0=",
+            "rev": "86b48ec01ece451d5270d0c5181a43151e45a042",
             "url": "https://chromium.googlesource.com/external/fontconfig.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/freetype/src": {
         "args": {
-            "hash": "sha256-Mt6uJGGHiGYNNLx2xrooYirynL9DW0s05G1GJiqzhi8=",
-            "rev": "e07e56c7f106b600262ab653d696b7b57f320127",
+            "hash": "sha256-oiezGGrPlHVGi24IpLr6UfUs7gT+Epzw37TtAkEixek=",
+            "rev": "08805be530d6820d2bf8a1b7685826de40f06812",
             "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/fuzztest/src": {
         "args": {
-            "hash": "sha256-MHli8sadgC3OMesBGhkjPM/yW49KFOtdFuBII1bcFas=",
-            "rev": "f03aafb7516050ea73f617bf969f03eac641aefc",
+            "hash": "sha256-uWPhInzuidI4smFRjRF95aaVNTsehKd/1y4uRzr12mk=",
+            "rev": "7bab06ff5fbbf8b8cce05a8661369dc2e11cde66",
             "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -187,24 +179,24 @@
     },
     "src/third_party/googletest/src": {
         "args": {
-            "hash": "sha256-md/jPkFrs/0p0BYGyquh57Zxh+1dKaK26PDtUN1+Ce0=",
-            "rev": "09ffd0015395354774c059a17d9f5bee36177ff9",
+            "hash": "sha256-07pEo2gj3n/IOipqz7UpZkBOywZt7FkfZFCnVyp3xYw=",
+            "rev": "373af2e3df71599b87a40ce0e37164523849166b",
             "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/grpc/src": {
         "args": {
-            "hash": "sha256-z96goSSgBUvTjNse/LO88zNIzg+SWEYgVDaoA/elkLU=",
-            "rev": "cadf3c8329377e93b1f5e2d6a43d91f7a4becc28",
+            "hash": "sha256-5vv8V/hEKalfHa2Qo8QIxLvXoamcLxNQ/bcqY8vCvjk=",
+            "rev": "806e186735cc3bf4375f43d2d6a9483c607e4278",
             "url": "https://chromium.googlesource.com/external/github.com/grpc/grpc.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/gtest-parallel": {
         "args": {
-            "hash": "sha256-VUuk5tBTh+aU2dxVWUF1FePWlKUJaWSiGSXk/J5zgHw=",
-            "rev": "96f4f904922f9bf66689e749c40f314845baaac8",
+            "hash": "sha256-uVq+oDrue4sf1JPoeymIIDe79Fv7rcJAVOjxUF42Xo0=",
+            "rev": "cd488bdedc1d2cffb98201a17afc1b298b0b90f1",
             "url": "https://chromium.googlesource.com/external/github.com/google/gtest-parallel"
         },
         "fetcher": "fetchFromGitiles"
@@ -219,8 +211,8 @@
     },
     "src/third_party/icu": {
         "args": {
-            "hash": "sha256-/T7uyzwTCDaamLwSvutvbn6BJuoG1RqeR+xhXI5jmJw=",
-            "rev": "b929596baebf0ab4ac7ec07f38365db4c50a559d",
+            "hash": "sha256-k3z31DhDPoqjcZdUL4vjyUMVpUiNk44+7rCMTDVPH8Q=",
+            "rev": "1b2e3e8a421efae36141a7b932b41e315b089af8",
             "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -243,32 +235,32 @@
     },
     "src/third_party/libFuzzer/src": {
         "args": {
-            "hash": "sha256-Lb+HczYax0T7qvC0/Nwhc5l2szQTUYDouWRMD/Qz7sA=",
-            "rev": "e31b99917861f891308269c36a32363b120126bb",
+            "hash": "sha256-TDi1OvYClJKmEDikanKVTmy8uxUXJ95nuVKo5u+uFPM=",
+            "rev": "bea408a6e01f0f7e6c82a43121fe3af4506c932e",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libaom/source/libaom": {
         "args": {
-            "hash": "sha256-pyLKjLG83Jlx6I+0M8Ah94ku4NIFcrHNYswfVHMvdrc=",
-            "rev": "2cca4aba034f99842c2e6cdc173f83801d289764",
+            "hash": "sha256-cER77Q9cM5rh+oeh1LDyKDZyQK5VbtE/ANNTN2cYzMo=",
+            "rev": "e91b7aa26d6d0979bba2bee5e1c27a7a695e0226",
             "url": "https://aomedia.googlesource.com/aom.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libc++/src": {
         "args": {
-            "hash": "sha256-36ulJk/YTfP5k1sDeA/WQyIO8xaplRKK4cQhfTZdpko=",
-            "rev": "a01c02c9d4acbdae3b7e8a2f3ee58579a9c29f96",
+            "hash": "sha256-34+xTZqWpm+1aks2b4nPD3WRJTkTxNj6ZjTuMveiQ+M=",
+            "rev": "adbb4a5210ae2a8a4e27fa6199221156c02a9b1a",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libc++abi/src": {
         "args": {
-            "hash": "sha256-DkCvfFjMztFTzKf081XyiefW6tMBSZ1AdzcPzXAVPnk=",
-            "rev": "9810fb23f6ba666f017c2b67c67de2bcac2b44bd",
+            "hash": "sha256-wO64dyP1O3mCBh/iiRkSzaWMkiDkb7B98Avd4SpnY70=",
+            "rev": "a6c815c69d55ec59d020abde636754d120b402ad",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -291,32 +283,32 @@
     },
     "src/third_party/libunwind/src": {
         "args": {
-            "hash": "sha256-O1S3ijnoVrTHmZDGmgQQe0MVGsSZL7usXAPflGFmMXY=",
-            "rev": "8575f4ae4fcf8892938bd9766cf1a5c90a0ed04e",
+            "hash": "sha256-GmLreEtoyHMXr6mZgZ7NS1ZaS9leB9eMbISeN7qmfqw=",
+            "rev": "84c5262b57147e9934c0a8f2302d989b44ec7093",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libvpx/source/libvpx": {
         "args": {
-            "hash": "sha256-SFdYF8vnwNHQbZ1N/ZHr4kxfi9o+BAtuqbak80m9uP4=",
-            "rev": "b84ca9b63730e7d4563573a56a66317eb0087ebf",
+            "hash": "sha256-BbXiBbnGwdsbZCZIpurfTzYvDUCysdt+ocRh6xvuUI8=",
+            "rev": "a985e5e847a2fe69bef3e547cf25088132194e39",
             "url": "https://chromium.googlesource.com/webm/libvpx.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/libyuv": {
         "args": {
-            "hash": "sha256-J9Wi3aCc6OjtQCP8JnrY7PYrY587dKLaa1KGAMWmE0c=",
-            "rev": "61bdaee13a701d2b52c6dc943ccc5c888077a591",
+            "hash": "sha256-ievGlutmOuuEEhWS82vMqxwqXCq8PF3508N0MCMPQus=",
+            "rev": "cdd3bae84818e78466fec1ce954eead8f403d10c",
             "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/third_party/llvm-libc/src": {
         "args": {
-            "hash": "sha256-BsoHIvdqgYzBUkd23++enEHIhq5GeVWrWdVdhXrHh9A=",
-            "rev": "9c3ae3120fe83b998d0498dcc9ad3a56c29fad0c",
+            "hash": "sha256-MgOyCveySgpUoIj6jJGbDjzMVpPDbeKtvpFUC+ocdsY=",
+            "rev": "8ec6b26421b5fa7aa876fdab486fa1decc558326",
             "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -331,8 +323,8 @@
     },
     "src/third_party/nasm": {
         "args": {
-            "hash": "sha256-neYrS4kQ76ihUh22Q3uPR67Ld8+yerA922YSZU1KxJs=",
-            "rev": "9f916e90e6fc34ec302573f6ce147e43e33d68ca",
+            "hash": "sha256-TxzAcp+CoKnnM0lCGjm+L3h6M30vYHjM07vW6zUe/vY=",
+            "rev": "e2c93c34982b286b27ce8b56dd7159e0b90869a2",
             "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -347,8 +339,8 @@
     },
     "src/third_party/perfetto": {
         "args": {
-            "hash": "sha256-kzVsti2tygOMgT61TmCz26AByMd3gIXA6xz8RE0iCz4=",
-            "rev": "dd35b295cd359ba094404218414955f961a0d6ae",
+            "hash": "sha256-JwoqF2VWrkwcokaGY6bo73YJWtO7lDnvOqFCBmIEBXY=",
+            "rev": "0c893ed6bf6b42e3fee58daf3380d301c72550ed",
             "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git"
         },
         "fetcher": "fetchFromGitiles"
@@ -363,16 +355,16 @@
     },
     "src/third_party/re2/src": {
         "args": {
-            "hash": "sha256-f/k2rloV2Nwb0KuJGUX4SijFxAx69EXcsXOG4vo+Kis=",
-            "rev": "c84a140c93352cdabbfb547c531be34515b12228",
+            "hash": "sha256-vjh4HI4JKCMAf5SZeqstb0M01w8ssaTwwrLAUsrFkkQ=",
+            "rev": "8451125897dd7816a5c118925e8e42309d598ecc",
             "url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
         },
         "fetcher": "fetchFromGitiles"
     },
     "src/tools": {
         "args": {
-            "hash": "sha256-j95oiK5+hhKC+NNQ27EVZugZI/n2QZJNRyz2QE4pVXc=",
-            "rev": "901b847deda65d44f1bba16a9f47e2ea68a805be",
+            "hash": "sha256-9CYGP9LI/fSHUAjqvXxyNZZVwxkr5TdEZME4l/7fizM=",
+            "rev": "ec8f1c6113753a31c55b6d6bddfbe198046029a8",
             "url": "https://chromium.googlesource.com/chromium/src/tools"
         },
         "fetcher": "fetchFromGitiles"
diff --git a/pkgs/by-name/si/signal-desktop/webrtc.nix b/pkgs/by-name/si/signal-desktop/webrtc.nix
index 2e586d52cbf7..b0f3968145b0 100644
--- a/pkgs/by-name/si/signal-desktop/webrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/webrtc.nix
@@ -34,7 +34,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "signal-webrtc";
-  version = finalAttrs.gclientDeps."src".path.rev;
+  version = finalAttrs.gclientDeps."src".path.tag;
 
   gclientDeps = gclient2nix.importGclientDeps ./webrtc-sources.json;
   sourceRoot = "src";
@@ -87,6 +87,7 @@ stdenv.mkDerivation (finalAttrs: {
     "is_clang=false"
     "treat_warnings_as_errors=false"
     "use_llvm_libatomic=false"
+    "use_custom_libcxx=false"
 
     # https://github.com/signalapp/ringrtc/blob/main/bin/build-desktop
     "rtc_build_examples=false"

From 8f53ef33326c5e98d779be598bcaa85ee99fbe42 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 16 Oct 2025 13:33:52 +0200
Subject: [PATCH 0810/6226] signal-desktop: 7.74.0 -> 7.75.0

---
 .../signal-desktop/dont-strip-absolute-paths.patch | 14 +++++++-------
 pkgs/by-name/si/signal-desktop/libsignal-node.nix  |  8 ++++----
 pkgs/by-name/si/signal-desktop/package.nix         | 10 +++++-----
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch b/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch
index 103ee8af45b6..ddbc406aa7cc 100644
--- a/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch
+++ b/pkgs/by-name/si/signal-desktop/dont-strip-absolute-paths.patch
@@ -1,14 +1,14 @@
 diff --git a/node/build_node_bridge.py b/node/build_node_bridge.py
-index c983fc3..2ab06dc 100755
---- a/node/build_node_bridge.py
-+++ b/node/build_node_bridge.py
-@@ -138,9 +138,6 @@ def main(args: Optional[List[str]] = None) -> int:
-     cargo_env['CARGO_PROFILE_RELEASE_LTO'] = 'thin'
-     # Enable ARMv8 cryptography acceleration when available
+index a2da3c8b..cb5d475f 100755
+--- i/node/build_node_bridge.py
++++ w/node/build_node_bridge.py
+@@ -154,9 +154,6 @@ def main(args: Optional[List[str]] = None) -> int:
      cargo_env['RUSTFLAGS'] += ' --cfg aes_armv8'
+     # Access tokio's unstable metrics
+     cargo_env['RUSTFLAGS'] += ' --cfg tokio_unstable'
 -    # Strip absolute paths
 -    for path in build_helpers.rust_paths_to_remap():
 -        cargo_env['RUSTFLAGS'] += f' --remap-path-prefix {path}='
- 
+
      # If set (below), will post-process the build library using this instead of just `cp`-ing it.
      objcopy = None
diff --git a/pkgs/by-name/si/signal-desktop/libsignal-node.nix b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
index 326ea8906e86..599530664cb3 100644
--- a/pkgs/by-name/si/signal-desktop/libsignal-node.nix
+++ b/pkgs/by-name/si/signal-desktop/libsignal-node.nix
@@ -24,23 +24,23 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "libsignal-node";
-  version = "0.81.1";
+  version = "0.83.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "libsignal";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uhxfVFsoB+c1R5MUOgpJFm8ZD3vgU8BIn35QSfbEp5w=";
+    hash = "sha256-lSk9C2RIRsAlSUr8folhdHkHkpAfPM+vwJ/rZ6mys3Q=";
   };
 
-  cargoHash = "sha256-Q3GSeaW3YveLxLeJPpPXUVwlJ0QLRkAmRGSJetxKl4Y=";
+  cargoHash = "sha256-0P89+p0WlQaa48wpgsaapIhEzlAnWVPl9qD+jnBw9mM=";
 
   npmRoot = "node";
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-npm-deps";
     inherit (finalAttrs) version src;
     sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}";
-    hash = "sha256-6Mr3SJn4pO0p6PISXvEOhN9uPk1TIEU03ssclNUg2No=";
+    hash = "sha256-4sd8JVQfCC4dAkksICbb3e4JjNcgplOW26TyRkAFWp0=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 2ce968f1c577..96ae5d2a1cb1 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -52,13 +52,13 @@ let
     '';
   });
 
-  version = "7.74.0";
+  version = "7.75.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-ahFc/AOBfgW34S1zcLZYj9pie/2aAK/tdZzC7An4lNU=";
+    hash = "sha256-Abt0Rh+6hDLIfHtiTZZCZuKf4SCBLu917wopV6H7n+I=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -134,15 +134,15 @@ stdenv.mkDerivation (finalAttrs: {
     fetcherVersion = 1;
     hash =
       if withAppleEmojis then
-        "sha256-h1F9/lKtcT8Gce+EVj8RrPzHtjqp11ycHAkf7xldHeM="
+        "sha256-b13di3TdaS6CT8gAZfBqlu4WheIHL+X8LvAo148H8kI="
       else
-        "sha256-tDlQTOSUkCjRXtA7NIUgI+ax+GCPFXK+eZLe0fXVhJY=";
+        "sha256-/Yy9R+MRN5e5vGU0XgwJa7oFpHn8bi8B0y89aaT2LQI=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1759960657;
+    SOURCE_DATE_EPOCH = 1760562217;
   };
 
   preBuild = ''

From faa0cd70272f3a2f76d88647fee53892e05d8329 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 11:49:19 +0000
Subject: [PATCH 0811/6226] zpaqfranz: 63.1 -> 63.5

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

diff --git a/pkgs/by-name/zp/zpaqfranz/package.nix b/pkgs/by-name/zp/zpaqfranz/package.nix
index 7e833921b438..d9e449a4e57f 100644
--- a/pkgs/by-name/zp/zpaqfranz/package.nix
+++ b/pkgs/by-name/zp/zpaqfranz/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zpaqfranz";
-  version = "63.1";
+  version = "63.5";
 
   src = fetchFromGitHub {
     owner = "fcorbelli";
     repo = "zpaqfranz";
     rev = finalAttrs.version;
-    hash = "sha256-j8UmKCiwlFPmrlBA7rr9qlejxYKkXrH1i3Qd0MhO3YU=";
+    hash = "sha256-hgT11teZQOzaJ89zg0dOLcEgJRrdSUpKpEwyQwULhPg=";
   };
 
   nativeBuildInputs = [

From 7af9db4c34027d128c7646bfab94507166a417bd Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Fri, 17 Oct 2025 12:00:00 +0000
Subject: [PATCH 0812/6226] dsniff: 2.4b1+debian-34 -> 2.4b1+debian-35

Fixes: https://github.com/NixOS/nixpkgs/issues/444046
---
 pkgs/by-name/ds/dsniff/package.nix | 22 +++++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ds/dsniff/package.nix b/pkgs/by-name/ds/dsniff/package.nix
index 316b728868d3..a37d81216eaf 100644
--- a/pkgs/by-name/ds/dsniff/package.nix
+++ b/pkgs/by-name/ds/dsniff/package.nix
@@ -34,11 +34,23 @@ let
   };
   pcap = symlinkJoin {
     inherit (libpcap) name;
-    paths = [ (libpcap.overrideAttrs { dontDisableStatic = true; }) ];
+    paths =
+      let
+        staticlibpcap = libpcap.overrideAttrs { dontDisableStatic = true; };
+      in
+      [
+        (lib.getInclude staticlibpcap)
+        (lib.getLib staticlibpcap)
+      ];
     postBuild = ''
       cp -rs $out/include/pcap $out/include/net
-      # prevent references to libpcap
-      rm $out/lib/*.so*
+      # check the presence of the files that ./configure expects
+      for i in $out/lib/libpcap.a $out/include/pcap.h $out/include/net/bpf.h; do
+        if ! test -f $i; then
+          echo $i is missing from output
+          exit 1
+        fi
+      done
     '';
   };
   net = symlinkJoin {
@@ -71,8 +83,8 @@ stdenv.mkDerivation rec {
     domain = "salsa.debian.org";
     owner = "pkg-security-team";
     repo = "dsniff";
-    rev = "debian/${version}+debian-34";
-    sha256 = "sha256-CY0+G09KZXtAwKuaYh5/qcmZjuNhdGis3zCG14hWtqw=";
+    tag = "debian/${version}+debian-35";
+    hash = "sha256-RVv9USAHTVYnGgKygIPgfXpfjCYigJvScuzc2+1Uzfw=";
     name = "dsniff.tar.gz";
   };
 

From cdeec81a567f40c5842ac241285231d47fc71c4f Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 17 Oct 2025 14:16:20 +0200
Subject: [PATCH 0813/6226] signal-desktop: 7.75.0 -> 7.75.1

Changelog: https://github.com/signalapp/Signal-Desktop/releases/tag/v7.75.1
---
 pkgs/by-name/si/signal-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 96ae5d2a1cb1..e4f94e63f7c7 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -52,13 +52,13 @@ let
     '';
   });
 
-  version = "7.75.0";
+  version = "7.75.1";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-Abt0Rh+6hDLIfHtiTZZCZuKf4SCBLu917wopV6H7n+I=";
+    hash = "sha256-l5fMVXwuXHaGcBuemkwzUcEuktTseGL2k13oxoo81+0=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1760562217;
+    SOURCE_DATE_EPOCH = 1760633959;
   };
 
   preBuild = ''

From aefa4a320a7b919b69ccc1e2928ab52e6179cd7d Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Fri, 17 Oct 2025 14:02:18 +0200
Subject: [PATCH 0814/6226] jenkins: 2.516.3 -> 2.528.1

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/je/jenkins/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix
index 1f26162ba92a..c0e4d591da6c 100644
--- a/pkgs/by-name/je/jenkins/package.nix
+++ b/pkgs/by-name/je/jenkins/package.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jenkins";
-  version = "2.516.3";
+  version = "2.528.1";
 
   src = fetchurl {
     url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war";
-    hash = "sha256-gbOrzA8kzqSOdO/+FS9p3F8NiA7cDCc3xhRGs8WZLAA=";
+    hash = "sha256-1jDcomX3Wo1YHxJ6kjTxZ51LCACo83DQOtShVM63KVs=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 300ee06a95ba04db85d2591b5e1a4d5ac97d5335 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 12:30:37 +0000
Subject: [PATCH 0815/6226] livekit: 1.9.1 -> 1.9.2

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

diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix
index c9b1672d534c..182dc31997ef 100644
--- a/pkgs/by-name/li/livekit/package.nix
+++ b/pkgs/by-name/li/livekit/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "livekit";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "livekit";
     rev = "v${version}";
-    hash = "sha256-seh7LXxHGsdXZFy1I/XukvOS9XTO+OxGycPNxJmaIm0=";
+    hash = "sha256-a0WaF9myP0xjTjfum+K7Wk86HOZP00kvjOYLmeEQdxk=";
   };
 
-  vendorHash = "sha256-EbxiiCpl/txIrnKpqP8EI4UZGZMyUt9bcTIAiUl64sk=";
+  vendorHash = "sha256-hYetTszLS/zYQ39wOv+sP8HlIiyBoKI3Z7XpOrffHa8=";
 
   subPackages = [ "cmd/server" ];
 

From 3344728058da75257cd18bd5cf286cea48fcc2ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 13:22:00 +0000
Subject: [PATCH 0816/6226] vscode-extensions.eamodio.gitlens: 17.6.1 -> 17.6.2

---
 .../editors/vscode/extensions/eamodio.gitlens/default.nix   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix b/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix
index d75c424fd981..a4fb9a86b9bf 100644
--- a/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/eamodio.gitlens/default.nix
@@ -13,19 +13,19 @@ let
   vsix = stdenvNoCC.mkDerivation (finalAttrs: {
     name = "gitlens-${finalAttrs.version}.zip";
     pname = "gitlens-vsix";
-    version = "17.6.1";
+    version = "17.6.2";
 
     src = fetchFromGitHub {
       owner = "gitkraken";
       repo = "vscode-gitlens";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-D0huUzjvyJTLxGgtTl1ZUQVwJx2uwO/uWGvcGfT8MyA=";
+      hash = "sha256-RN5PH8OvMUSqvVqt00VhfYQyazBBU5YLxzUEXaVB0+A=";
     };
 
     pnpmDeps = pnpm.fetchDeps {
       inherit (finalAttrs) pname version src;
       fetcherVersion = 2;
-      hash = "sha256-ZJAXjG1OF3Ey0LKJ4zadoRmbJg+qX2wAZCV4Ozrbyyg=";
+      hash = "sha256-R8E25vkc9kLjAEQ8UqxFhfvVbW5qMCWQUt3iWqJoSPE=";
     };
 
     postPatch = ''

From c0c3f3c0887571195fb4880ea25b67f627f5bd05 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 13:43:35 +0000
Subject: [PATCH 0817/6226] lego: 4.26.0 -> 4.27.0

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

diff --git a/pkgs/by-name/le/lego/package.nix b/pkgs/by-name/le/lego/package.nix
index bf4b2409359d..cef96732f65f 100644
--- a/pkgs/by-name/le/lego/package.nix
+++ b/pkgs/by-name/le/lego/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "lego";
-  version = "4.26.0";
+  version = "4.27.0";
 
   src = fetchFromGitHub {
     owner = "go-acme";
     repo = "lego";
     tag = "v${version}";
-    hash = "sha256-wSTymGprdoXxBRlGDapF5H8SMbBRTI24PMgakGetABI=";
+    hash = "sha256-mc/aWjYvgF5PSl6Ng9oLNWAlGDjnhzEouo9LXh/PFsE=";
   };
 
-  vendorHash = "sha256-BdOS4BNWtonLoZO4YA85VdB6MRbMqoO8MGb4XNEwfCk=";
+  vendorHash = "sha256-648FrZqSatEYONzj03x8z8pV0WIvfYnIOcxERxYxSPw=";
 
   doCheck = false;
 

From 30bbbfe439c2f126cb56f379944a448e4f1b1043 Mon Sep 17 00:00:00 2001
From: sgt0 <140186177+sgt0@users.noreply.github.com>
Date: Fri, 17 Oct 2025 13:55:25 +0000
Subject: [PATCH 0818/6226] vapoursynth: require macOS 13.3

Otherwise the build fails with:

    src/vspipe/vspipe.cpp:285:21: error: 'to_chars' is unavailable: introduced in macOS 13.3
      285 |     auto res = std::to_chars(buffer, buffer + sizeof(buffer), v, std::chars_format::fixed);
          |                     ^
    /nix/store/zzn2cvbh4gs4zvyv9p52kclqqvqrfb5x-libcxx-19.1.2+apple-sdk-15.5/include/c++/v1/__charconv/to_chars_floating_point.h:38:1: note: 'to_chars' has been explicitly marked unavailable here
       38 | to_chars(char* __first, char* __last, double __value, chars_format __fmt);
          | ^
    1 error generated.
---
 pkgs/by-name/va/vapoursynth/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/va/vapoursynth/package.nix b/pkgs/by-name/va/vapoursynth/package.nix
index b16a2a12cafe..1396767e3f7b 100644
--- a/pkgs/by-name/va/vapoursynth/package.nix
+++ b/pkgs/by-name/va/vapoursynth/package.nix
@@ -13,6 +13,7 @@
   libass,
   python3,
   testers,
+  darwinMinVersionHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -40,6 +41,9 @@ stdenv.mkDerivation rec {
         cython
       ]
     ))
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    (darwinMinVersionHook "13.3")
   ];
 
   enableParallelBuilding = true;

From d3cbbf7007e0c590b3c1059b37c4625b5447b6be Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Thu, 16 Oct 2025 22:36:10 +0200
Subject: [PATCH 0819/6226] xkb-switch-i3: fix build with cmake4

---
 pkgs/by-name/xk/xkb-switch-i3/package.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/by-name/xk/xkb-switch-i3/package.nix b/pkgs/by-name/xk/xkb-switch-i3/package.nix
index 2b65df932864..d7746e165c85 100644
--- a/pkgs/by-name/xk/xkb-switch-i3/package.nix
+++ b/pkgs/by-name/xk/xkb-switch-i3/package.nix
@@ -9,6 +9,7 @@
   libX11,
   libxkbfile,
   pkg-config,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation rec {
@@ -23,6 +24,20 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
+  patches = [
+    (fetchpatch {
+      name = "bump-cmake-required-version.patch";
+      url = "https://github.com/Zebradil/xkb-switch-i3/commit/95f6ff96c77fc17891d57332f6d3a014500396eb.patch?full_index=1";
+      hash = "sha256-J8EITYxi5EpYwROmFrAXgqFgbnFh8/fy9nxEKNhBvek=";
+    })
+  ];
+
+  postPatch = ''
+    substituteInPlace i3ipc++/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0 FATAL_ERROR)" \
+        "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config

From 15b4f4e10eebac4c762967972717f654eae3544f Mon Sep 17 00:00:00 2001
From: etwas <ein@etwas.me>
Date: Fri, 17 Oct 2025 16:35:43 +0200
Subject: [PATCH 0820/6226] jami: 20250718.0 -> 20251003.0

---
 pkgs/by-name/ja/jami/package.nix | 48 +++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/ja/jami/package.nix b/pkgs/by-name/ja/jami/package.nix
index e520810a67bc..d3505139e1ac 100644
--- a/pkgs/by-name/ja/jami/package.nix
+++ b/pkgs/by-name/ja/jami/package.nix
@@ -3,8 +3,10 @@
   lib,
   pkg-config,
   fetchFromGitLab,
+  fetchpatch,
   gitUpdater,
   ffmpeg_6,
+  ninja,
 
   # for daemon
   autoreconfHook,
@@ -12,7 +14,7 @@
   alsa-lib,
   asio,
   dbus,
-  sdbus-cpp,
+  sdbus-cpp_2,
   fmt,
   gmp,
   gnutls,
@@ -62,25 +64,32 @@
 
 stdenv.mkDerivation rec {
   pname = "jami";
-  version = "20250718.0";
+  version = "20251003.0";
 
   src = fetchFromGitLab {
     domain = "git.jami.net";
     owner = "savoirfairelinux";
     repo = "jami-client-qt";
     rev = "stable/${version}";
-    hash = "sha256-EEiuymfu28bJ6pfBKwlsCGDq7XlKGZYK+2WjPJ+tcxw=";
+    hash = "sha256-CYKrIWGTmGvHIhNdyEhDKE1Rm84O7X3yPVLkF6qakwU=";
     fetchSubmodules = true;
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/jami-qt/-/raw/0ecbaf3b101bbdd0d4a06b06f3ce1ff654abf0b5/fix-link.patch";
+      hash = "sha256-VsQbOPHyNFcRhpae+9UCaUJdHH8bMGf3ZIAW3RKiu6k=";
+    })
+  ];
+
   pjsip-jami = pjsip.overrideAttrs (old: {
-    version = "sfl-2.15-unstable-2025-02-24";
+    version = "sfl-2.15-unstable-2025-09-18";
 
     src = fetchFromGitHub {
       owner = "savoirfairelinux";
       repo = "pjproject";
-      rev = "37130c943d59f25a71935803ea2d84515074a237";
-      hash = "sha256-7gAiriuooqqF38oajAuD/Lj5trn/9VMkCGOumcV45NA=";
+      rev = "93dc96918bb6ba74e1e1d00c40c80402e856f2ac";
+      hash = "sha256-wsbKa3TXqj+nQMtAaEAD0Zh248QdNMhKnIOnq08MPI0=";
     };
 
     configureFlags = [
@@ -118,14 +127,14 @@ stdenv.mkDerivation rec {
 
   dhtnet = stdenv.mkDerivation {
     pname = "dhtnet";
-    version = "unstable-2025-05-26";
+    version = "unstable-2025-09-15";
 
     src = fetchFromGitLab {
       domain = "git.jami.net";
       owner = "savoirfairelinux";
       repo = "dhtnet";
-      rev = "6c5ee3a21556d668d047cdedb5c4b746c3c6bdb2";
-      hash = "sha256-uweYSEysVMUC7DhI9BhS1TDZ6ZY7WQ9JS3ZF9lKA4Fo=";
+      rev = "7861b4620b4cec5fa34c5d1bb2b304912730f638";
+      hash = "sha256-nhGB4u12Ubmc7lLVOAwycRsP+cWzn4A9bYH0+sSBQTg=";
     };
 
     postPatch = ''
@@ -177,12 +186,6 @@ stdenv.mkDerivation rec {
     inherit src version meta;
     sourceRoot = "${src.name}/daemon";
 
-    # Fix for libgit2 breaking changes
-    postPatch = ''
-      substituteInPlace src/jamidht/conversationrepository.cpp \
-        --replace-fail "git_commit* const" "const git_commit*"
-    '';
-
     nativeBuildInputs = [
       autoreconfHook
       pkg-config
@@ -194,7 +197,7 @@ stdenv.mkDerivation rec {
       asio
       dbus
       dhtnet
-      sdbus-cpp
+      sdbus-cpp_2
       fmt
       ffmpeg_6
       gmp
@@ -233,7 +236,6 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -i -e '/GIT_REPOSITORY/,+1c SOURCE_DIR ''${CMAKE_CURRENT_SOURCE_DIR}/qwindowkit' extras/build/cmake/contrib_tools.cmake
-    sed -i -e 's/if(DISTRO_NEEDS_QMSETUP_PATCH)/if(TRUE)/' CMakeLists.txt
     cp -R --no-preserve=mode,ownership ${qwindowkit-src} qwindowkit
     substituteInPlace CMakeLists.txt \
       --replace-fail 'add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL)' 'find_package(ZXing)'
@@ -257,6 +259,7 @@ stdenv.mkDerivation rec {
     git
     python3
     qt6Packages.qttools # for translations
+    ninja
   ];
 
   buildInputs = [
@@ -284,7 +287,11 @@ stdenv.mkDerivation rec {
     ++ lib.optionals withWebengine [ qtwebengine ]
   );
 
-  cmakeFlags = lib.optionals (!withWebengine) [ "-DWITH_WEBENGINE=false" ];
+  cmakeFlags = [
+    (lib.cmakeBool "JAMICORE_AS_SUBDIR" false)
+    (lib.cmakeBool "DWITH_WEBENGINE" withWebengine)
+    "-DLIBJAMI_INCLUDE_DIRS=${daemon}/include/jami"
+  ];
 
   qtWrapperArgs = [
     # With wayland the titlebar is not themed and the wmclass is wrong.
@@ -295,7 +302,10 @@ stdenv.mkDerivation rec {
     qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
   '';
 
-  passthru.updateScript = gitUpdater { rev-prefix = "stable/"; };
+  passthru = {
+    updateScript = gitUpdater { rev-prefix = "stable/"; };
+    inherit daemon pjsip dhtnet;
+  };
 
   meta = with lib; {
     homepage = "https://jami.net/";

From 635fa3d7ee1231185b452ef6ac46c31fbcdb09d2 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 17 Oct 2025 23:41:50 +0900
Subject: [PATCH 0821/6226] nixos/tests/svnserve: init

---
 nixos/tests/all-tests.nix                     |  1 +
 nixos/tests/svnserve.nix                      | 60 +++++++++++++++++++
 .../version-management/subversion/default.nix |  3 +
 3 files changed, 64 insertions(+)
 create mode 100644 nixos/tests/svnserve.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 1f1f5ae5e043..7d81f706bf23 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1405,6 +1405,7 @@ in
     inherit runTest;
     lib = pkgs.lib;
   };
+  svnserve = runTest ./svnserve.nix;
   swap-file-btrfs = runTest ./swap-file-btrfs.nix;
   swap-partition = runTest ./swap-partition.nix;
   swap-random-encryption = runTest ./swap-random-encryption.nix;
diff --git a/nixos/tests/svnserve.nix b/nixos/tests/svnserve.nix
new file mode 100644
index 000000000000..4a537bbdd657
--- /dev/null
+++ b/nixos/tests/svnserve.nix
@@ -0,0 +1,60 @@
+{ pkgs, ... }:
+{
+  name = "svnserve";
+
+  nodes = {
+    server = {
+      virtualisation.vlans = [ 1 ];
+
+      networking = {
+        useNetworkd = true;
+        useDHCP = false;
+        firewall.allowedTCPPorts = [ 3690 ];
+      };
+
+      systemd.network.networks."01-eth1" = {
+        name = "eth1";
+        networkConfig.Address = "10.0.0.1/24";
+      };
+
+      services.svnserve.enable = true;
+
+      environment.systemPackages = [ pkgs.subversion ];
+    };
+
+    client =
+      { pkgs, ... }:
+      {
+        virtualisation.vlans = [ 1 ];
+
+        networking = {
+          useNetworkd = true;
+          useDHCP = false;
+        };
+
+        systemd.network.networks."01-eth1" = {
+          name = "eth1";
+          networkConfig.Address = "10.0.0.2/24";
+        };
+
+        environment.systemPackages = [ pkgs.subversion ];
+      };
+  };
+
+  testScript =
+    { nodes, ... }:
+    ''
+      start_all()
+
+      server.wait_for_unit("svnserve")
+      server.wait_for_open_port(3690)
+      server.succeed("svnadmin create '${nodes.server.services.svnserve.svnBaseDir}/project'")
+      server.succeed("sed -i 's/# anon-access = read/anon-access = write/' '${nodes.server.services.svnserve.svnBaseDir}/project/conf/svnserve.conf'")
+
+      client.succeed("svn checkout svn://10.0.0.1/project")
+      client.succeed("cd ./project && echo hello > ./file.txt && svn add ./file.txt && svn commit -m 'Added file.txt'")
+
+      client.succeed("svn checkout svn://10.0.0.1/project project-copy")
+      client.succeed("grep hello project-copy/file.txt")
+    '';
+}
diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix
index 4a87cbd4f308..d99296d0c509 100644
--- a/pkgs/applications/version-management/subversion/default.nix
+++ b/pkgs/applications/version-management/subversion/default.nix
@@ -27,6 +27,7 @@
   perl ? null,
   sasl ? null,
   serf ? null,
+  nixosTests,
 }:
 
 assert bdbSupport -> aprutil.bdbSupport;
@@ -156,6 +157,8 @@ let
         nativeCheckInputs = [ python3 ];
         doCheck = false; # fails 10 out of ~2300 tests
 
+        passthru.tests = { inherit (nixosTests) svnserve; };
+
         meta = with lib; {
           description = "Version control system intended to be a compelling replacement for CVS in the open source community";
           license = licenses.asl20;

From f202d28478ffe433d099c89a1726c95ede659380 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 14:52:40 +0000
Subject: [PATCH 0822/6226] art: 1.25.9 -> 1.25.10

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

diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix
index f2965d965d20..e3f226194dcc 100644
--- a/pkgs/by-name/ar/art/package.nix
+++ b/pkgs/by-name/ar/art/package.nix
@@ -40,13 +40,13 @@
 
 stdenv.mkDerivation rec {
   pname = "art";
-  version = "1.25.9";
+  version = "1.25.10";
 
   src = fetchFromGitHub {
     owner = "artpixls";
     repo = "ART";
     tag = version;
-    hash = "sha256-dg0msZ0aeyl4L7RqqGur9Lalu1QtE0igEc54WT5F+SQ=";
+    hash = "sha256-qGrkRsdQppfIolxAhxWnJrbYotELKga6X7CFY55xCKk=";
   };
 
   # Fix the build with CMake 4.

From 42aeba2244d7580e157a7bec8dc59214f6c80df3 Mon Sep 17 00:00:00 2001
From: matthiasdotsh <git@matthias.sh>
Date: Fri, 17 Oct 2025 14:21:35 +0200
Subject: [PATCH 0823/6226] kaldi: fix cmake 4 compatibility

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

diff --git a/pkgs/by-name/ka/kaldi/package.nix b/pkgs/by-name/ka/kaldi/package.nix
index 0ca19505bd0a..aa3508733945 100644
--- a/pkgs/by-name/ka/kaldi/package.nix
+++ b/pkgs/by-name/ka/kaldi/package.nix
@@ -34,6 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
     "-DBLAS_LIBRARIES=-lblas"
     "-DLAPACK_LIBRARIES=-llapack"
     "-DFETCHCONTENT_SOURCE_DIR_OPENFST:PATH=${finalAttrs.passthru.sources.openfst}"
+    # Fix the build with CMake 4 (openfst does not contain cmake_minimum_required)
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.10"
   ];
 
   buildInputs = [

From 6a4709ac652096e78c8a56247edf1492f37f1aa0 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Fri, 17 Oct 2025 13:37:58 +0200
Subject: [PATCH 0824/6226] gitlab: 18.4.2 -> 18.5.0

https://about.gitlab.com/releases/2025/10/16/gitlab-18-5-released/
---
 pkgs/by-name/gi/gitaly/package.nix            |   6 +-
 .../gi/gitlab-container-registry/package.nix  |   6 +-
 .../code-parser.nix                           |   6 +-
 .../gitlab-elasticsearch-indexer/package.nix  |   6 +-
 pkgs/by-name/gi/gitlab-pages/package.nix      |   6 +-
 pkgs/by-name/gi/gitlab-shell/package.nix      |   4 +-
 pkgs/by-name/gi/gitlab/data.json              |  19 +-
 .../gi/gitlab/gitlab-workhorse/default.nix    |   4 +-
 pkgs/by-name/gi/gitlab/package.nix            |  27 +-
 pkgs/by-name/gi/gitlab/rubyEnv/Gemfile        |  35 +--
 pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock   | 166 ++++++------
 pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix     | 246 ++++++++++--------
 pkgs/by-name/gi/gitlab/update.py              |   5 +-
 13 files changed, 300 insertions(+), 236 deletions(-)

diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index 87017cbbc429..c17b59e72158 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "18.4.2";
+  version = "18.5.0";
   package_version = "v${lib.versions.major version}";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
 
@@ -21,10 +21,10 @@ let
       owner = "gitlab-org";
       repo = "gitaly";
       rev = "v${version}";
-      hash = "sha256-jwImYofmGfpnj43FinFmo9SQP6vpM0C4K6fmUECifG0=";
+      hash = "sha256-kVFO8brtXWWGU2nWTtHR1q5RrTIXy2ssra9YjtWsglU=";
     };
 
-    vendorHash = "sha256-DNZgdP7juELUX0cs0tnyqdf1yiUJ0S17nm0xqTk3KHQ=";
+    vendorHash = "sha256-I2YMn84wEAY+Z02bmkyP/b0eix7FW3hP/noyEKYsEaQ=";
 
     ldflags = [
       "-X ${gitaly_package}/internal/version.version=${version}"
diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix
index 524e46299197..a460c4c5de58 100644
--- a/pkgs/by-name/gi/gitlab-container-registry/package.nix
+++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix
@@ -6,7 +6,7 @@
 
 buildGo124Module rec {
   pname = "gitlab-container-registry";
-  version = "4.28.0";
+  version = "4.29.0";
   rev = "v${version}-gitlab";
 
   # nixpkgs-update: no auto update
@@ -14,10 +14,10 @@ buildGo124Module rec {
     owner = "gitlab-org";
     repo = "container-registry";
     inherit rev;
-    hash = "sha256-0v39mQ0wLq2VUYNeDU6E2M8Ny/e/A3VrE8+pmpwJgug=";
+    hash = "sha256-SUhlJi0LEDXl9pwnT2JATtEBIUnCA2yyEaMzDpL/QCM=";
   };
 
-  vendorHash = "sha256-tCOXSZjJOWHTIdWYxdBaH6STKAwqlHsuDfhGd2KPx1Q=";
+  vendorHash = "sha256-Ee9OmKkFrm00BN/V5kuLFbFV/6HkJ4hk7AAXMptTyxs=";
 
   checkFlags =
     let
diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/code-parser.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/code-parser.nix
index 62188e2a805e..862e2bc81056 100644
--- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/code-parser.nix
+++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/code-parser.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "gitlab-code-parser";
-  version = "0.16.1";
+  version = "0.19.3";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "rust/gitlab-code-parser";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GskOPKv1Jp3eqd+a9nEwZPfHfOw6luyglPXzJZAPvBc=";
+    hash = "sha256-gwldgZsiHjNafebtgiy5mVAmNNAj0Mz+krz4sI18zj4=";
   };
 
-  cargoHash = "sha256-g6FV8kX3/9wk692FJLNyGNzv3ffE8RWmMYmvmUIqzVs=";
+  cargoHash = "sha256-h6JWOhdjN4Ikwzvuv7PIYmsk1KxJyGHbjibJKVWtExY=";
 
   nativeBuildInputs = [
     pkg-config
diff --git a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
index af33bad7e8b5..f0c06277b1dc 100644
--- a/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
+++ b/pkgs/by-name/gi/gitlab-elasticsearch-indexer/package.nix
@@ -11,17 +11,17 @@ let
 in
 buildGoModule rec {
   pname = "gitlab-elasticsearch-indexer";
-  version = "5.9.1";
+  version = "5.9.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-elasticsearch-indexer";
     rev = "v${version}";
-    hash = "sha256-Xt22fyTM4rfqUpNE6Q3yfT9r4vqME3KmqxYCqUKmnLQ=";
+    hash = "sha256-Vj3QqskgrQIMF9mNY8WzvHL0KCU9Ebr3eDm4mUwQJL0=";
   };
 
-  vendorHash = "sha256-pY8hHFy0AxMwol00BN85jPR0ZnHVgno10Tp+Opz65tQ=";
+  vendorHash = "sha256-nmgRQwjf6F7IkED0S7Q03T6Wad5sEmYLbBHLyA33WjU=";
 
   buildInputs = [ icu ];
   nativeBuildInputs = [ pkg-config ];
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index a4902b0c87f0..e9ebdcf15885 100644
--- a/pkgs/by-name/gi/gitlab-pages/package.nix
+++ b/pkgs/by-name/gi/gitlab-pages/package.nix
@@ -6,17 +6,17 @@
 
 buildGoModule rec {
   pname = "gitlab-pages";
-  version = "18.4.2";
+  version = "18.5.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-21VCBUE6wGU7DT98YYPuEz7lw6EMqCfe14mofbai0lk=";
+    hash = "sha256-7jMiKN2L4rF4YyqoJW8pzj5rP5g6ScwZ3qkY+OCZOZ8=";
   };
 
-  vendorHash = "sha256-FdmozSo/eWTnAxrO+/TZOKataLwDkKfwGOXymkRBVCI=";
+  vendorHash = "sha256-VWD/AXqEVWo7G9p1q1BM2LUNwAFmkPm+Gm2s9EPu6nM=";
   subPackages = [ "." ];
 
   ldflags = [
diff --git a/pkgs/by-name/gi/gitlab-shell/package.nix b/pkgs/by-name/gi/gitlab-shell/package.nix
index e93dcc6819c8..4fb8a47b40e2 100644
--- a/pkgs/by-name/gi/gitlab-shell/package.nix
+++ b/pkgs/by-name/gi/gitlab-shell/package.nix
@@ -8,14 +8,14 @@
 
 buildGoModule rec {
   pname = "gitlab-shell";
-  version = "14.45.2";
+  version = "14.45.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-shell";
     rev = "v${version}";
-    hash = "sha256-FxtqTRCa1sYSeTR+V2UKEsb480llU6cHWVwNiNFtUmE=";
+    hash = "sha256-S8LtWQgzyDKr4Jnk7Qn/pfLzZYYnVfZNVqNBFyqr5cM=";
   };
 
   buildInputs = [
diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json
index b7d743bae841..59c57336b8f2 100644
--- a/pkgs/by-name/gi/gitlab/data.json
+++ b/pkgs/by-name/gi/gitlab/data.json
@@ -1,15 +1,16 @@
 {
-  "version": "18.4.2",
-  "repo_hash": "053fw6g1rrqlmgr22phbsv57pg04iy20yv3yvgz1hm4jn2jm0zln",
-  "yarn_hash": "1s9fz2apb7wkpppq14b3020b2pqdah917wblvzk32np8s2dqqc14",
+  "version": "18.5.0",
+  "repo_hash": "0r1q6byqv3zziwsw63z7km5jjap7q6222j91lnr048w6cf425n1w",
+  "yarn_hash": "16f7r4v4mjjdsfbzy5vy1g18p0l3gnjvfvzrl2xrxdibx7a3b4xs",
+  "frontend_islands_yarn_hash": "0kks9hzm5fq3fss9ys8zxls3d3860l1fvsfcrbhf9rccmwvmjn3l",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v18.4.2-ee",
+  "rev": "v18.5.0-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "18.4.2",
-    "GITLAB_PAGES_VERSION": "18.4.2",
-    "GITLAB_SHELL_VERSION": "14.45.2",
-    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.9.1",
-    "GITLAB_WORKHORSE_VERSION": "18.4.2"
+    "GITALY_SERVER_VERSION": "18.5.0",
+    "GITLAB_PAGES_VERSION": "18.5.0",
+    "GITLAB_SHELL_VERSION": "14.45.3",
+    "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.9.4",
+    "GITLAB_WORKHORSE_VERSION": "18.5.0"
   }
 }
diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
index 777e5d397bb6..1e3add758495 100644
--- a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
@@ -10,7 +10,7 @@ in
 buildGoModule rec {
   pname = "gitlab-workhorse";
 
-  version = "18.4.2";
+  version = "18.5.0";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
@@ -22,7 +22,7 @@ buildGoModule rec {
 
   sourceRoot = "${src.name}/workhorse";
 
-  vendorHash = "sha256-R9hI+y4n+6YM0dXIRvNZWwy1gAasdKHBWmFBXJaI1G0=";
+  vendorHash = "sha256-wO+QuWptrcpqy3K3tvYpQQFzlr7A2m2rhPM64Or3qaY=";
   buildInputs = [ git ];
   ldflags = [ "-X main.Version=${version}" ];
   doCheck = false;
diff --git a/pkgs/by-name/gi/gitlab/package.nix b/pkgs/by-name/gi/gitlab/package.nix
index 525e3338416e..f95125a94964 100644
--- a/pkgs/by-name/gi/gitlab/package.nix
+++ b/pkgs/by-name/gi/gitlab/package.nix
@@ -83,7 +83,7 @@ let
               cp Cargo.lock $out
             '';
           };
-          hash = "sha256-NJLpfIgVgqbf1fHIzEKxzpHOKvtY9QHXVQPpRdvH0Uo=";
+          hash = "sha256-IPVpUj0ixYKQg8ZUKLGcS9RcR2zOWCrqkwJFUF1cmdI=";
         };
 
         dontBuild = false;
@@ -146,6 +146,10 @@ let
       yarnLock = src + "/yarn.lock";
       sha256 = data.yarn_hash;
     };
+    frontendIslandsYarnOfflineCache = fetchYarnDeps {
+      yarnLock = src + "/ee/frontend_islands/apps/duo_next/yarn.lock";
+      sha256 = data.frontend_islands_yarn_hash;
+    };
 
     nativeBuildInputs = [
       rubyEnv.wrappedRuby
@@ -171,6 +175,7 @@ let
     # of rake tasks fails.
     GITLAB_LOG_PATH = "log";
     FOSS_ONLY = !gitlabEnterprise;
+    SKIP_FRONTEND_ISLANDS_BUILD = lib.optionalString (!gitlabEnterprise) "true";
 
     SKIP_YARN_INSTALL = 1;
     NODE_OPTIONS = "--max-old-space-size=8192";
@@ -184,6 +189,26 @@ let
       mv config/gitlab.yml.example config/gitlab.yml
 
       patchShebangs scripts/frontend/
+      patchShebangs scripts/
+    ''
+    + lib.optionalString gitlabEnterprise ''
+      # Get node modules for frontend islands
+      export HOME=$(mktemp -d)
+      pushd ee/frontend_islands/apps/duo_next
+      yarn config --offline set yarn-offline-mirror "$frontendIslandsYarnOfflineCache"
+      fixup-yarn-lock yarn.lock
+      yarn install \
+          --frozen-lockfile \
+          --force \
+          --production=false \
+          --ignore-engines \
+          --ignore-platform \
+          --ignore-scripts \
+          --no-progress \
+          --non-interactive \
+          --offline
+      patchShebangs node_modules
+      popd
     '';
 
     buildPhase = ''
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
index 2452d9f209ce..49c314934630 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
@@ -161,6 +161,7 @@ gem 'grape-entity', '~> 1.0.1', feature_category: :api
 gem 'grape-swagger', '~> 2.1.2', group: [:development, :test], feature_category: :api
 gem 'grape-swagger-entity', '~> 0.5.5', group: [:development, :test], feature_category: :api
 gem 'grape-path-helpers', '~> 2.0.1', feature_category: :api
+gem 'gitlab-grape-openapi', path: 'gems/gitlab-grape-openapi', feature_category: :api
 gem 'rack-cors', '~> 2.0.1', require: 'rack/cors', feature_category: :shared
 
 # GraphQL API
@@ -175,7 +176,7 @@ gem 'gitlab-topology-service-client', '~> 0.1',
   feature_category: :cell
 
 # Duo Workflow
-gem 'gitlab-duo-workflow-service-client', '~> 0.3',
+gem 'gitlab-duo-workflow-service-client', '~> 0.4',
   path: 'vendor/gems/gitlab-duo-workflow-service-client',
   feature_category: :agent_foundations
 
@@ -223,9 +224,9 @@ gem 'google-cloud-storage', '~> 1.57.0', feature_category: :shared
 gem 'google-apis-core', '~> 0.18.0', '>= 0.18.0', feature_category: :shared
 gem 'google-apis-compute_v1', '~> 0.129.0', feature_category: :shared
 gem 'google-apis-container_v1', '~> 0.100.0', feature_category: :shared
-gem 'google-apis-container_v1beta1', '~> 0.90.0', feature_category: :shared
+gem 'google-apis-container_v1beta1', '~> 0.91.0', feature_category: :shared
 gem 'google-apis-cloudbilling_v1', '~> 0.22.0', feature_category: :shared
-gem 'google-apis-cloudresourcemanager_v1', '~> 0.31.0', feature_category: :shared
+gem 'google-apis-cloudresourcemanager_v1', '~> 0.44.0', feature_category: :shared
 gem 'google-apis-iam_v1', '~> 0.73.0', feature_category: :shared
 gem 'google-apis-serviceusage_v1', '~> 0.28.0', feature_category: :shared
 gem 'google-apis-sqladmin_v1beta4', '~> 0.41.0', feature_category: :shared
@@ -267,10 +268,10 @@ gem 'asciidoctor', '~> 2.0.18', feature_category: :markdown
 gem 'asciidoctor-include-ext', '~> 0.4.0', require: false, feature_category: :markdown
 gem 'asciidoctor-plantuml', '~> 0.0.16', feature_category: :markdown
 gem 'asciidoctor-kroki', '~> 0.10.0', require: false, feature_category: :markdown
-gem 'rouge', '~> 4.6.0', feature_category: :shared
+gem 'rouge', '~> 4.6.1', feature_category: :shared
 gem 'truncato', '~> 0.7.13', feature_category: :team_planning
 gem 'nokogiri', '~> 1.18', feature_category: :shared
-gem 'gitlab-glfm-markdown', '~> 0.0.33', feature_category: :markdown
+gem 'gitlab-glfm-markdown', '~> 0.0.36', feature_category: :markdown
 gem 'tanuki_emoji', '~> 0.13', feature_category: :markdown
 gem 'unicode-emoji', '~> 4.0', feature_category: :markdown
 
@@ -380,7 +381,7 @@ gem 'rack-proxy', '~> 0.7.7', feature_category: :shared
 gem 'cssbundling-rails', '1.4.3', feature_category: :shared
 gem 'terser', '1.0.2', feature_category: :shared
 
-gem 'click_house-client', '0.5.1', feature_category: :database
+gem 'click_house-client', '0.8.0', feature_category: :database
 gem 'addressable', '~> 2.8', feature_category: :shared
 gem 'gon', '~> 6.5.0', feature_category: :shared
 gem 'request_store', '~> 1.7.0', feature_category: :shared
@@ -403,7 +404,7 @@ gem 'gitlab-schema-validation', path: 'gems/gitlab-schema-validation', feature_c
 gem 'gitlab-http', path: 'gems/gitlab-http', feature_category: :shared
 
 gem 'premailer-rails', '~> 1.12.0', feature_category: :notifications
-gem 'gitlab-labkit', '~> 0.40.0', feature_category: :shared
+gem 'gitlab-labkit', '~> 0.42.0', feature_category: :shared
 gem 'thrift', '~> 0.22.0', feature_category: :shared
 
 # I18n
@@ -430,7 +431,7 @@ gem 'prometheus-client-mmap', '~> 1.2.9', require: 'prometheus/client', feature_
 
 # Event-driven reactor for Ruby
 # Required manually in config/initializers/require_async_gem
-gem 'async', '~> 2.28.0', require: false, feature_category: :shared
+gem 'async', '~> 2.32.0', require: false, feature_category: :shared
 gem 'io-event', '~> 1.12', require: false, feature_category: :shared
 
 # Security report schemas used to validate CI job artifacts of security jobs
@@ -473,7 +474,7 @@ end
 gem 'warning', '~> 1.5.0', feature_category: :shared
 
 group :development do
-  gem 'lefthook', '~> 1.12.0', require: false, feature_category: :tooling
+  gem 'lefthook', '~> 1.13.0', require: false, feature_category: :tooling
   gem 'rubocop', feature_category: :tooling, require: false
   gem 'debug', '~> 1.11.0', feature_category: :shared
 
@@ -490,11 +491,11 @@ group :development do
 
   gem 'listen', '~> 3.7', feature_category: :shared
 
-  gem 'ruby-lsp', "~> 0.23.0", require: false, feature_category: :tooling
+  gem 'ruby-lsp', "~> 0.26.0", require: false, feature_category: :tooling
 
-  gem 'ruby-lsp-rails', "~> 0.3.6", feature_category: :tooling
+  gem 'ruby-lsp-rails', "~> 0.4.8", feature_category: :tooling
 
-  gem 'ruby-lsp-rspec', "~> 0.1.10", require: false, feature_category: :tooling
+  gem 'ruby-lsp-rspec', "~> 0.1.27", require: false, feature_category: :tooling
 
   gem 'gdk-toogle', '~> 0.9', '>= 0.9.5', require: 'toogle', feature_category: :tooling
 
@@ -512,7 +513,7 @@ group :development, :test do
   gem 'pry-rails', '~> 0.3.9', feature_category: :shared
   gem 'pry-shell', '~> 0.6.4', feature_category: :shared
 
-  gem 'awesome_print', require: false, feature_category: :shared
+  gem 'amazing_print', require: false, feature_category: :shared
 
   gem 'database_cleaner-active_record', '~> 2.2.0', feature_category: :database
   gem 'rspec-rails', '~> 7.1.0', feature_category: :shared
@@ -634,7 +635,7 @@ gem 'sys-filesystem', '~> 1.4.3', feature_category: :shared
 gem 'net-ntp', feature_category: :shared
 
 # SSH keys support
-gem 'ssh_data', '~> 1.3', feature_category: :shared
+gem 'ssh_data', '~> 2.0', feature_category: :shared
 
 # Spamcheck GRPC protocol definitions
 gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
@@ -643,9 +644,9 @@ gem 'spamcheck', '~> 1.3.0', feature_category: :insider_threat
 gem 'gitaly', '~> 18.4.0.pre.rc1', feature_category: :gitaly
 
 # KAS GRPC protocol definitions
-gem 'gitlab-kas-grpc', '~> 18.3.0', feature_category: :deployment_management
+gem 'gitlab-kas-grpc', '~> 18.5.0-rc4', feature_category: :deployment_management
 
-gem 'grpc', '~> 1.74.0', feature_category: :shared
+gem 'grpc', '~> 1.75.0', feature_category: :shared
 
 gem 'google-protobuf', '~> 3.25', '>= 3.25.3', feature_category: :shared
 
@@ -656,7 +657,7 @@ gem 'flipper', '~> 0.28.0', feature_category: :shared
 gem 'flipper-active_record', '~> 0.28.0', feature_category: :shared
 gem 'flipper-active_support_cache_store', '~> 0.28.0', feature_category: :shared
 gem 'unleash', '~> 3.2.2', feature_category: :shared
-gem 'gitlab-experiment', '~> 0.9.1', feature_category: :shared
+gem 'gitlab-experiment', '~> 1.0.0', feature_category: :shared
 
 # Structured logging
 gem 'lograge', '~> 0.5', feature_category: :shared
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
index fe11d3cd5bce..cf4481484644 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
@@ -49,7 +49,7 @@ PATH
       google-cloud-storage_transfer (~> 1.2.0)
       google-protobuf (~> 3.25, >= 3.25.3)
       googleauth (~> 1.14)
-      grpc (~> 1.74.0)
+      grpc (~> 1.75)
       json (~> 2.7)
       jwt (~> 2.5)
       logger (~> 1.5)
@@ -62,12 +62,19 @@ PATH
       rexml (~> 3.4.0)
       thor (~> 1.3)
 
+PATH
+  remote: gems/gitlab-grape-openapi
+  specs:
+    gitlab-grape-openapi (0.1.0)
+      grape (~> 2.0.0)
+      grape-entity (~> 1.0.1)
+
 PATH
   remote: gems/gitlab-housekeeper
   specs:
     gitlab-housekeeper (0.1.0)
       activesupport
-      awesome_print
+      amazing_print
       httparty
       rubocop
 
@@ -149,7 +156,7 @@ PATH
 PATH
   remote: vendor/gems/gitlab-duo-workflow-service-client
   specs:
-    gitlab-duo-workflow-service-client (0.3)
+    gitlab-duo-workflow-service-client (0.5)
       grpc
 
 PATH
@@ -203,7 +210,7 @@ GEM
       nkf
       rexml
     RedCloth (4.3.4)
-    acme-client (2.0.25)
+    acme-client (2.0.26)
       base64 (~> 0.2)
       faraday (>= 1.0, < 3.0.0)
       faraday-retry (>= 1.0, < 3.0.0)
@@ -294,6 +301,7 @@ GEM
     amatch (0.4.1)
       mize
       tins (~> 1.0)
+    amazing_print (1.8.1)
     android_key_attestation (0.3.0)
     apollo_upload_server (2.1.6)
       actionpack (>= 6.1.6)
@@ -311,7 +319,7 @@ GEM
     asciidoctor-plantuml (0.0.16)
       asciidoctor (>= 2.0.17, < 3.0.0)
     ast (2.4.2)
-    async (2.28.0)
+    async (2.32.0)
       console (~> 1.29)
       fiber-annotation
       io-event (~> 1.11)
@@ -364,7 +372,7 @@ GEM
     base64 (0.2.0)
     batch-loader (2.0.5)
     bcrypt (3.1.20)
-    benchmark (0.4.0)
+    benchmark (0.4.1)
     benchmark-ips (2.14.0)
     benchmark-malloc (0.2.0)
     benchmark-memory (0.2.0)
@@ -375,14 +383,14 @@ GEM
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.1.7)
+    bigdecimal (3.2.3)
     bindata (2.4.11)
     binding_of_caller (1.0.0)
       debug_inspector (>= 0.0.1)
     bootsnap (1.18.6)
       msgpack (~> 1.2)
     browser (5.3.1)
-    builder (3.2.4)
+    builder (3.3.0)
     bullet (8.0.8)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
@@ -424,7 +432,7 @@ GEM
       cork
       nap
       open4 (~> 1.3)
-    click_house-client (0.5.1)
+    click_house-client (0.8.0)
       activerecord (>= 7.0, < 9.0)
       activesupport (>= 7.0, < 9.0)
       addressable (~> 2.8)
@@ -433,7 +441,7 @@ GEM
     coercible (1.0.0)
       descendants_tracker (~> 0.0.1)
     colored2 (3.1.2)
-    commonmarker (0.23.11)
+    commonmarker (0.23.12)
     concurrent-ruby (1.3.5)
     connection_pool (2.5.4)
     console (1.29.2)
@@ -477,9 +485,9 @@ GEM
     danger-gitlab (8.0.0)
       danger
       gitlab (~> 4.2, >= 4.2.0)
-    database_cleaner-active_record (2.2.1)
+    database_cleaner-active_record (2.2.2)
       activerecord (>= 5.a)
-      database_cleaner-core (~> 2.0.0)
+      database_cleaner-core (~> 2.0)
     database_cleaner-core (2.0.1)
     date (3.4.1)
     deb_version (1.0.2)
@@ -545,15 +553,18 @@ GEM
     dotenv (2.7.6)
     drb (2.2.3)
     dry-cli (1.0.0)
-    dry-core (1.0.1)
+    dry-core (1.1.0)
       concurrent-ruby (~> 1.0)
+      logger
       zeitwerk (~> 2.6)
-    dry-inflector (1.0.0)
-    dry-logic (1.5.0)
+    dry-inflector (1.2.0)
+    dry-logic (1.6.0)
+      bigdecimal
       concurrent-ruby (~> 1.0)
-      dry-core (~> 1.0, < 2)
+      dry-core (~> 1.1)
       zeitwerk (~> 2.6)
-    dry-types (1.7.1)
+    dry-types (1.8.3)
+      bigdecimal (~> 3.0)
       concurrent-ruby (~> 1.0)
       dry-core (~> 1.0)
       dry-inflector (~> 1.0)
@@ -630,7 +641,7 @@ GEM
     fast_gettext (4.1.0)
       prime
       racc
-    ffaker (2.24.0)
+    ffaker (2.25.0)
     ffi (1.17.2)
     ffi-compiler (1.0.1)
       ffi (>= 1.0.0)
@@ -719,14 +730,14 @@ GEM
     git (1.19.1)
       addressable (~> 2.8)
       rchardet (~> 1.8)
-    gitaly (18.4.0.pre.rc1)
+    gitaly (18.4.1)
       grpc (~> 1.0)
     gitlab (4.19.0)
       httparty (~> 0.20)
       terminal-table (>= 1.5.1)
     gitlab-chronic (0.10.6)
       numerizer (~> 0.2)
-    gitlab-cloud-connector (1.32.0)
+    gitlab-cloud-connector (1.33.0)
       activesupport (~> 7.0)
       jwt (~> 2.9)
     gitlab-crystalball (1.1.1)
@@ -736,7 +747,7 @@ GEM
       danger (>= 9.3.0)
       danger-gitlab (>= 8.0.0)
       rake (~> 13.0)
-    gitlab-experiment (0.9.1)
+    gitlab-experiment (1.0.0)
       activesupport (>= 3.0)
       request_store (>= 1.0)
     gitlab-fog-azure-rm (2.4.0)
@@ -748,11 +759,11 @@ GEM
       mime-types
       net-http-persistent (~> 4.0)
       nokogiri (~> 1, >= 1.10.8)
-    gitlab-glfm-markdown (0.0.33)
+    gitlab-glfm-markdown (0.0.36)
       rb_sys (~> 0.9.109)
-    gitlab-kas-grpc (18.3.2)
+    gitlab-kas-grpc (18.5.0.pre.rc4)
       grpc (~> 1.0)
-    gitlab-labkit (0.40.0)
+    gitlab-labkit (0.42.0)
       actionpack (>= 5.0.0, < 8.1.0)
       activesupport (>= 5.0.0, < 8.1.0)
       google-protobuf (~> 3)
@@ -777,7 +788,7 @@ GEM
       activesupport (>= 5.2.0)
       rake (~> 13.0)
       snowplow-tracker (~> 0.8.0)
-    gitlab-secret_detection (0.33.3)
+    gitlab-secret_detection (0.35.1)
       grpc (>= 1.63.0, < 2)
       grpc_reflection (~> 0.1)
       parallel (~> 1)
@@ -805,7 +816,7 @@ GEM
       omniauth (>= 1.3, < 3)
       pyu-ruby-sasl (>= 0.0.3.3, < 0.1)
       rubyntlm (~> 0.5)
-    gitlab_quality-test_tooling (2.20.0)
+    gitlab_quality-test_tooling (2.20.3)
       activesupport (>= 7.0, < 7.3)
       amatch (~> 0.4.1)
       fog-google (~> 1.24, >= 1.24.1)
@@ -831,13 +842,13 @@ GEM
       google-apis-core (>= 0.15.0, < 2.a)
     google-apis-cloudbilling_v1 (0.22.0)
       google-apis-core (>= 0.9.1, < 2.a)
-    google-apis-cloudresourcemanager_v1 (0.31.0)
-      google-apis-core (>= 0.9.1, < 2.a)
+    google-apis-cloudresourcemanager_v1 (0.44.0)
+      google-apis-core (>= 0.15.0, < 2.a)
     google-apis-compute_v1 (0.129.0)
       google-apis-core (>= 0.15.0, < 2.a)
     google-apis-container_v1 (0.100.0)
       google-apis-core (>= 0.15.0, < 2.a)
-    google-apis-container_v1beta1 (0.90.0)
+    google-apis-container_v1beta1 (0.91.0)
       google-apis-core (>= 0.15.0, < 2.a)
     google-apis-core (0.18.0)
       addressable (~> 2.5, >= 2.5.1)
@@ -964,7 +975,7 @@ GEM
       logger (~> 1.6)
       ostruct (~> 0.6)
       sass-embedded (~> 1.58)
-    grpc (1.74.1)
+    grpc (1.75.0)
       google-protobuf (>= 3.25, < 5.0)
       googleapis-common-protos-types (~> 1.0)
     grpc-google-iam-v1 (1.5.0)
@@ -992,7 +1003,7 @@ GEM
     haml (5.2.2)
       temple (>= 0.8.0)
       tilt
-    haml_lint (0.64.0)
+    haml_lint (0.66.0)
       haml (>= 5.0)
       parallel (~> 1.10)
       rainbow
@@ -1003,7 +1014,7 @@ GEM
       thor
       tilt
     hana (1.3.7)
-    hashdiff (1.2.0)
+    hashdiff (1.2.1)
     hashie (5.0.0)
     health_check (3.1.0)
       railties (>= 5.0)
@@ -1030,7 +1041,7 @@ GEM
       mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
     httpclient (2.8.3)
-    i18n (1.14.4)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
     i18n_data (0.13.1)
     icalendar (2.10.3)
@@ -1112,10 +1123,10 @@ GEM
       jsonpath (~> 1.0)
       recursive-open-struct (~> 1.1, >= 1.1.1)
       rest-client (~> 2.0)
-    language_server-protocol (3.17.0.3)
+    language_server-protocol (3.17.0.5)
     launchy (2.5.2)
       addressable (~> 2.8)
-    lefthook (1.12.3)
+    lefthook (1.13.0)
     letter_opener (1.10.0)
       launchy (>= 2.2, < 4)
     letter_opener_web (3.0.0)
@@ -1188,7 +1199,7 @@ GEM
     mini_histogram (0.3.1)
     mini_magick (4.13.2)
     mini_mime (1.1.2)
-    mini_portile2 (2.8.8)
+    mini_portile2 (2.8.9)
     minitest (5.11.3)
     mixlib-cli (2.1.8)
     mixlib-config (3.0.27)
@@ -1203,7 +1214,7 @@ GEM
     multi_xml (0.6.0)
     multipart-post (2.2.3)
     murmurhash3 (0.1.7)
-    mustermann (3.0.0)
+    mustermann (3.0.4)
       ruby2_keywords (~> 0.0.1)
     mustermann-grape (1.0.2)
       mustermann (>= 1.0.0)
@@ -1232,7 +1243,7 @@ GEM
     nio4r (2.7.0)
     nkf (0.2.0)
     no_proxy_fix (0.1.2)
-    nokogiri (1.18.9)
+    nokogiri (1.18.10)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
     notiffany (0.1.3)
@@ -1270,8 +1281,9 @@ GEM
       ostruct (>= 0.2)
     oj-introspect (0.8.0)
       oj (>= 3.16.10)
-    omniauth (2.1.3)
+    omniauth (2.1.4)
       hashie (>= 3.4.6)
+      logger
       rack (>= 2.2.3)
       rack-protection
     omniauth-alicloud (3.0.0)
@@ -1323,7 +1335,7 @@ GEM
     opensearch-ruby (3.4.0)
       faraday (>= 1.0, < 3)
       multi_json (>= 1.0)
-    openssl (3.3.0)
+    openssl (3.3.1)
     openssl-signature_algorithm (1.3.0)
       openssl (> 2.0)
     opentelemetry-api (1.2.5)
@@ -1496,7 +1508,7 @@ GEM
     prime (0.1.3)
       forwardable
       singleton
-    prism (1.2.0)
+    prism (1.4.0)
     proc_to_ast (0.1.0)
       coderay
       parser
@@ -1527,7 +1539,7 @@ GEM
     pyu-ruby-sasl (0.0.3.3)
     raabro (1.4.0)
     racc (1.8.1)
-    rack (2.2.17)
+    rack (2.2.18)
     rack-accept (0.4.5)
       rack (>= 0.4)
     rack-attack (6.7.0)
@@ -1597,7 +1609,7 @@ GEM
       ffi (~> 1.0)
     rb_sys (0.9.110)
       rake-compiler-dock (= 1.9.1)
-    rbs (3.6.1)
+    rbs (3.9.5)
       logger
     rbtrace (0.5.2)
       ffi (>= 1.0.6)
@@ -1606,8 +1618,8 @@ GEM
     rchardet (1.8.0)
     rdoc (6.13.0)
       psych (>= 4.0.0)
-    re2 (2.19.0)
-      mini_portile2 (~> 2.8.7)
+    re2 (2.20.0)
+      mini_portile2 (~> 2.8.9)
     recaptcha (5.12.3)
       json
     recursive-open-struct (1.1.3)
@@ -1618,7 +1630,7 @@ GEM
       actionpack (>= 5)
       redis-rack (>= 2.1.0, < 4)
       redis-store (>= 1.1.0, < 2)
-    redis-client (0.25.3)
+    redis-client (0.26.1)
       connection_pool
     redis-cluster-client (0.13.5)
       redis-client (~> 0.24)
@@ -1653,10 +1665,10 @@ GEM
     retriable (3.1.2)
     reverse_markdown (3.0.0)
       nokogiri
-    rexml (3.4.2)
+    rexml (3.4.4)
     rinku (2.0.0)
     rotp (6.3.0)
-    rouge (4.6.0)
+    rouge (4.6.1)
     rqrcode (2.2.0)
       chunky_png (~> 1.0)
       rqrcode_core (~> 1.0)
@@ -1737,15 +1749,14 @@ GEM
     rubocop-rspec_rails (2.30.0)
       rubocop (~> 1.61)
       rubocop-rspec (~> 3, >= 3.0.1)
-    ruby-lsp (0.23.20)
+    ruby-lsp (0.26.1)
       language_server-protocol (~> 3.17.0)
       prism (>= 1.2, < 2.0)
-      rbs (>= 3, < 4)
-      sorbet-runtime (>= 0.5.10782)
-    ruby-lsp-rails (0.3.31)
-      ruby-lsp (>= 0.23.0, < 0.24.0)
-    ruby-lsp-rspec (0.1.24)
-      ruby-lsp (~> 0.23.19)
+      rbs (>= 3, < 5)
+    ruby-lsp-rails (0.4.8)
+      ruby-lsp (>= 0.26.0, < 0.27.0)
+    ruby-lsp-rspec (0.1.27)
+      ruby-lsp (~> 0.26.0)
     ruby-magic (0.6.0)
       mini_portile2 (~> 2.8)
     ruby-progressbar (1.11.0)
@@ -1853,9 +1864,8 @@ GEM
       tilt (~> 2.0)
       yard (~> 0.9, >= 0.9.24)
       yard-solargraph (~> 0.1)
-    solargraph-rspec (0.5.2)
-      solargraph (~> 0.52, >= 0.52.0)
-    sorbet-runtime (0.5.11647)
+    solargraph-rspec (0.5.4)
+      solargraph (>= 0.52.0)
     spamcheck (1.3.3)
       grpc (~> 1.63)
     spring (4.3.0)
@@ -1870,7 +1880,8 @@ GEM
       actionpack (>= 6.1)
       activesupport (>= 6.1)
       sprockets (>= 3.0.0)
-    ssh_data (1.3.0)
+    ssh_data (2.0.0)
+      base64 (~> 0.1)
     ssrf_filter (1.0.8)
     stackprof (0.2.27)
     state_machines (0.5.0)
@@ -2060,7 +2071,7 @@ GEM
     yard (0.9.37)
     yard-solargraph (0.1.0)
       yard (~> 0.9)
-    zeitwerk (2.6.7)
+    zeitwerk (2.7.3)
 
 PLATFORMS
   ruby
@@ -2072,6 +2083,7 @@ DEPENDENCIES
   activerecord-gitlab!
   addressable (~> 2.8)
   akismet (~> 3.0)
+  amazing_print
   apollo_upload_server (~> 2.1.6)
   app_store_connect
   arr-pm (~> 0.0.12)
@@ -2079,10 +2091,9 @@ DEPENDENCIES
   asciidoctor-include-ext (~> 0.4.0)
   asciidoctor-kroki (~> 0.10.0)
   asciidoctor-plantuml (~> 0.0.16)
-  async (~> 2.28.0)
+  async (~> 2.32.0)
   atlassian-jwt (~> 0.2.1)
   attr_encrypted (~> 4.2)
-  awesome_print
   aws-sdk-cloudformation (~> 1)
   aws-sdk-core (~> 3.226.0)
   aws-sdk-s3 (~> 1.193.0)
@@ -2104,7 +2115,7 @@ DEPENDENCIES
   carrierwave (~> 1.3)
   charlock_holmes (~> 0.7.9)
   circuitbox (= 2.0.0)
-  click_house-client (= 0.5.1)
+  click_house-client (= 0.8.0)
   commonmarker (~> 0.23.10)
   concurrent-ruby (~> 1.1)
   connection_pool (~> 2.5.3)
@@ -2168,14 +2179,15 @@ DEPENDENCIES
   gitlab-cloud-connector (~> 1.26)
   gitlab-crystalball (~> 1.1.0)
   gitlab-dangerfiles (~> 4.10.0)
-  gitlab-duo-workflow-service-client (~> 0.3)!
-  gitlab-experiment (~> 0.9.1)
+  gitlab-duo-workflow-service-client (~> 0.4)!
+  gitlab-experiment (~> 1.0.0)
   gitlab-fog-azure-rm (~> 2.4.0)
-  gitlab-glfm-markdown (~> 0.0.33)
+  gitlab-glfm-markdown (~> 0.0.36)
+  gitlab-grape-openapi!
   gitlab-housekeeper!
   gitlab-http!
-  gitlab-kas-grpc (~> 18.3.0)
-  gitlab-labkit (~> 0.40.0)
+  gitlab-kas-grpc (~> 18.5.0.pre.rc4)
+  gitlab-labkit (~> 0.42.0)
   gitlab-license (~> 2.6)
   gitlab-mail_room (~> 0.0.24)
   gitlab-markup (~> 2.0.0)
@@ -2197,10 +2209,10 @@ DEPENDENCIES
   gon (~> 6.5.0)
   google-apis-androidpublisher_v3 (~> 0.86.0)
   google-apis-cloudbilling_v1 (~> 0.22.0)
-  google-apis-cloudresourcemanager_v1 (~> 0.31.0)
+  google-apis-cloudresourcemanager_v1 (~> 0.44.0)
   google-apis-compute_v1 (~> 0.129.0)
   google-apis-container_v1 (~> 0.100.0)
-  google-apis-container_v1beta1 (~> 0.90.0)
+  google-apis-container_v1beta1 (~> 0.91.0)
   google-apis-core (~> 0.18.0, >= 0.18.0)
   google-apis-iam_v1 (~> 0.73.0)
   google-apis-serviceusage_v1 (~> 0.28.0)
@@ -2222,7 +2234,7 @@ DEPENDENCIES
   graphlyte (~> 1.0.0)
   graphql (= 2.5.11)
   graphql-docs (~> 5.2.0)
-  grpc (~> 1.74.0)
+  grpc (~> 1.75.0)
   gssapi (~> 1.3.1)
   guard-rspec
   haml_lint (~> 0.58)
@@ -2249,7 +2261,7 @@ DEPENDENCIES
   knapsack (~> 4.0.0)
   kramdown (~> 2.5.0)
   kubeclient (~> 4.12.0)
-  lefthook (~> 1.12.0)
+  lefthook (~> 1.13.0)
   letter_opener_web (~> 3.0.0)
   license_finder (~> 7.0)
   licensee (~> 9.16)
@@ -2361,7 +2373,7 @@ DEPENDENCIES
   responders (~> 3.0)
   retriable (~> 3.1.2)
   rexml (~> 3.4.0)
-  rouge (~> 4.6.0)
+  rouge (~> 4.6.1)
   rqrcode (~> 2.2)
   rspec-benchmark (~> 0.6.0)
   rspec-parameterized (~> 1.0, >= 1.0.2)
@@ -2370,9 +2382,9 @@ DEPENDENCIES
   rspec_junit_formatter
   rspec_profiling (~> 0.0.9)
   rubocop
-  ruby-lsp (~> 0.23.0)
-  ruby-lsp-rails (~> 0.3.6)
-  ruby-lsp-rspec (~> 0.1.10)
+  ruby-lsp (~> 0.26.0)
+  ruby-lsp-rails (~> 0.4.8)
+  ruby-lsp-rspec (~> 0.1.27)
   ruby-magic (~> 0.6)
   ruby-progressbar (~> 1.10)
   ruby-saml (~> 1.18)
@@ -2404,7 +2416,7 @@ DEPENDENCIES
   sprite-factory (~> 1.7)
   sprockets (~> 3.7.0)
   sprockets-rails (~> 3.5.1)
-  ssh_data (~> 1.3)
+  ssh_data (~> 2.0)
   stackprof (~> 0.2.26)
   state_machines-activerecord (~> 0.8.0)
   state_machines-rspec (~> 0.6)
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
index 7d093a838c87..1f5b15a95a5a 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
@@ -9,10 +9,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0c8gxs7vhsl0hi7wnyd9wi3aqmqkm0y77y1k17z9zzc5yywsgfz0";
+      sha256 = "1g93cpxhk3n0lp42accb7b76km2di300lw9zpsrb2rigvnjmw3h6";
       type = "gem";
     };
-    version = "2.0.25";
+    version = "2.0.26";
   };
   actioncable = {
     dependencies = [
@@ -336,6 +336,19 @@ src: {
     };
     version = "0.4.1";
   };
+  amazing_print = {
+    groups = [
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0s3d1nf5afapjrk8746c8qfydl17l33l0a12rdircgzmh4c4wfzm";
+      type = "gem";
+    };
+    version = "1.8.1";
+  };
   android_key_attestation = {
     groups = [ "default" ];
     platforms = [ ];
@@ -454,10 +467,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0vhmmn7n92ilvkvbdbav85hyg8w047zm20vbfzk502g0j495sv4n";
+      sha256 = "11s733zhjvriqbzca85ry29j33p3y7n24xjwwvjyga4rba5brzvr";
       type = "gem";
     };
-    version = "2.28.0";
+    version = "2.32.0";
   };
   atlassian-jwt = {
     dependencies = [ "jwt" ];
@@ -734,10 +747,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
+      sha256 = "1kicilpma5l0lwayqjb5577bm0hbjndj2gh150xz09xsgc1l1vyl";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "0.4.1";
   };
   benchmark-ips = {
     groups = [
@@ -821,14 +834,20 @@ src: {
     version = "2.10.1";
   };
   bigdecimal = {
-    groups = [ "default" ];
+    groups = [
+      "coverage"
+      "default"
+      "development"
+      "monorepo"
+      "test"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0cq1c29zbkcxgdihqisirhcw76xc768z2zpd5vbccpq0l1lv76g7";
+      sha256 = "06sfv80bmxfczkqi3pb3yc9zicqhf94adh5f8hpkn3bsqqd1vlgz";
       type = "gem";
     };
-    version = "3.1.7";
+    version = "3.2.3";
   };
   bindata = {
     groups = [ "default" ];
@@ -879,15 +898,16 @@ src: {
     groups = [
       "default"
       "development"
+      "monorepo"
       "test"
     ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr";
+      sha256 = "0pw3r2lyagsxkm71bf44v5b74f7l9r7di22brbyji9fwz791hya9";
       type = "gem";
     };
-    version = "3.2.4";
+    version = "3.3.0";
   };
   bullet = {
     dependencies = [
@@ -1128,10 +1148,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0s9dgq9k6caappqr6y6vbzx3d8pmcb58cbp37am9slmfyvq2l0hh";
+      sha256 = "166j9r2pn6hbqqhgjx37c245yhd60dz00jphp18snrsfcxx841ds";
       type = "gem";
     };
-    version = "0.5.1";
+    version = "0.8.0";
   };
   coderay = {
     groups = [
@@ -1190,10 +1210,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gyjwd7in1nlf8zai2fxazxi8cy6xjzswdcjway520blb39ka7cx";
+      sha256 = "1k9wa8fnfz08lyn86vpqhdv4jffznlxcx6p6qr11rdf7qy4jybfs";
       type = "gem";
     };
-    version = "0.23.11";
+    version = "0.23.12";
   };
   concurrent-ruby = {
     groups = [
@@ -1451,10 +1471,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1jxzgg3yccp3gjncl5ih0y13dcappmy0y8pq85wgjj0yx5fh0ixy";
+      sha256 = "1203q6zdw14vwmnr2hw0d6b1rdz4d07w3kjg1my1zhw862gnnac8";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.2.2";
   };
   database_cleaner-core = {
     groups = [
@@ -1821,6 +1841,7 @@ src: {
   dry-core = {
     dependencies = [
       "concurrent-ruby"
+      "logger"
       "zeitwerk"
     ];
     groups = [
@@ -1831,10 +1852,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "03a5qn74c4lk2rpy6wlhv66synjlyzc4wn086xzphkpmw12l4bzk";
+      sha256 = "15di39ssfkwigyyqla65n4x6cfhgwa4cv8j5lmyrlr07jwd840q9";
       type = "gem";
     };
-    version = "1.0.1";
+    version = "1.1.0";
   };
   dry-inflector = {
     groups = [
@@ -1845,13 +1866,14 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "09hnvna3lg2x36li63988kv664d0zvy7y0z33803yvrdr9hj7lka";
+      sha256 = "0blgyg9l4gpzhb7rs9hqq9j7br80ngiigjp2ayp78w6m1ysx1x92";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.2.0";
   };
   dry-logic = {
     dependencies = [
+      "bigdecimal"
       "concurrent-ruby"
       "dry-core"
       "zeitwerk"
@@ -1864,13 +1886,14 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05nldkc154r0qzlhss7n5klfiyyz05x2fkq08y13s34py6023vcr";
+      sha256 = "18nf8mbnhgvkw34drj7nmvpx2afmyl2nyzncn3wl3z4h1yyfsvys";
       type = "gem";
     };
-    version = "1.5.0";
+    version = "1.6.0";
   };
   dry-types = {
     dependencies = [
+      "bigdecimal"
       "concurrent-ruby"
       "dry-core"
       "dry-inflector"
@@ -1885,10 +1908,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1f6dz0hm67rhybh6xq2s3vvr700cp43kf50z2lids62s2i0mh5hj";
+      sha256 = "1g61cnmmwzff05sf8bh95qjd3hikasgvrmf3q0qk29zdw12pmndm";
       type = "gem";
     };
-    version = "1.7.1";
+    version = "1.8.3";
   };
   dumb_delegator = {
     groups = [
@@ -2346,10 +2369,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ljxb9kqssp70waz0an1ppm33821r0dbvs4b75qbqbv05p0ziqs3";
+      sha256 = "0h7crcdqddlds3kx0q3vsx3cm6s62psvfx98crasqnhrz2nwb1g4";
       type = "gem";
     };
-    version = "2.24.0";
+    version = "2.25.0";
   };
   ffi = {
     groups = [
@@ -2762,10 +2785,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0677zbflbjvmxbf6riczscjl6g3pqdh5xb1f783d4lfhdi43rbg4";
+      sha256 = "1qg3kc103v767hjw77wcx5mwx5dg2b6vlhxk3bb4hpbsjqgm4mf3";
       type = "gem";
     };
-    version = "18.4.0.pre.rc1";
+    version = "18.4.1";
   };
   gitlab = {
     dependencies = [
@@ -2859,10 +2882,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0h9kfc8ni6lc0jy5r8hvs1768130adq75pnn4vy7jfl7fk7683yp";
+      sha256 = "0bvjvc2yvc2sjn4f6lgww46gw39pb1ripsl5a6rq6wldfahvp7mw";
       type = "gem";
     };
-    version = "1.32.0";
+    version = "1.33.0";
   };
   gitlab-crystalball = {
     dependencies = [
@@ -2908,7 +2931,7 @@ src: {
       path = "${src}/vendor/gems/gitlab-duo-workflow-service-client";
       type = "path";
     };
-    version = "0.3";
+    version = "0.5";
   };
   gitlab-experiment = {
     dependencies = [
@@ -2919,10 +2942,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0j0zs29izmhqc1jvgfsvikqdyg6r8kf3j9azbmsmm02l45sfwc7j";
+      sha256 = "1fgar7p0rpi0ycqdccrzxz8lvxzm78zi95xy642jy09hbpjnzxwz";
       type = "gem";
     };
-    version = "0.9.1";
+    version = "1.0.0";
   };
   gitlab-fog-azure-rm = {
     dependencies = [
@@ -2950,15 +2973,28 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pr1lqa5s4xrl5lxqw2sq5c3kdqlrlpxl9x9ybvf1lmpygkbcnmc";
+      sha256 = "12r3g7fb7wbhykmjn1n6b0jiyb26bma0x89wcm8ac4phz8aqhm6j";
       type = "gem";
     };
-    version = "0.0.33";
+    version = "0.0.36";
+  };
+  gitlab-grape-openapi = {
+    dependencies = [
+      "grape"
+      "grape-entity"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      path = "${src}/gems/gitlab-grape-openapi";
+      type = "path";
+    };
+    version = "0.1.0";
   };
   gitlab-housekeeper = {
     dependencies = [
       "activesupport"
-      "awesome_print"
+      "amazing_print"
       "httparty"
       "rubocop"
     ];
@@ -2996,10 +3032,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1k0jbpfycg23pm8gddwzxj8b1wpvqisxc6dd33xxr2f7canr8bx8";
+      sha256 = "1imwvsfzd040pjkwid8xb5s5bdjy51mq68hcx4pasaspaz4qpzlf";
       type = "gem";
     };
-    version = "18.3.2";
+    version = "18.5.0.pre.rc4";
   };
   gitlab-labkit = {
     dependencies = [
@@ -3018,10 +3054,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0awcb5bb9y1y61yzzvj5gkm03w232njym7cdw0s2gpgwh37q6pyg";
+      sha256 = "07xbjd5vap486vspzz164hf2j5x0v9g4q6j0whzlh3ak1svqb22j";
       type = "gem";
     };
-    version = "0.40.0";
+    version = "0.42.0";
   };
   gitlab-license = {
     groups = [ "default" ];
@@ -3161,10 +3197,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0h7wf8p369zqw51ikychqsii2kh9f920jwhr4b352p1sd1a59qf8";
+      sha256 = "0s9akkxm69i9mlcl5n3ikv9dy678cqqa3jl3cq785653gcx8p8ww";
       type = "gem";
     };
-    version = "0.33.3";
+    version = "0.35.1";
   };
   gitlab-security_report_schemas = {
     dependencies = [
@@ -3291,10 +3327,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1xxi1grl13663cwmpqvyq75carn05nd8ns26aq34xjqmk0gc8j9c";
+      sha256 = "0b3db3p68b8h2089rhi5z3m927xkv4vcxa998v17lmspj2496wra";
       type = "gem";
     };
-    version = "2.20.0";
+    version = "2.20.3";
   };
   globalid = {
     dependencies = [ "activesupport" ];
@@ -3369,10 +3405,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gzv5svbj62qcdw5ljva0sh8wifjx9wwx00kfj9bbff052i7597h";
+      sha256 = "1y05cy0h486lrdbl5vv3vpv2nh6pkizqa937v1yl0r46y8zp55my";
       type = "gem";
     };
-    version = "0.31.0";
+    version = "0.44.0";
   };
   google-apis-compute_v1 = {
     dependencies = [ "google-apis-core" ];
@@ -3405,10 +3441,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jbb5zqv7krxy60iylrnwb9qz0brbgj2m66w5kdhq040ww0760lx";
+      sha256 = "16f2ylvlyby4vzxn03ajqd4bnd6gcz5gxqs4gdi5jq47yi5ncfcn";
       type = "gem";
     };
-    version = "0.90.0";
+    version = "0.91.0";
   };
   google-apis-core = {
     dependencies = [
@@ -3946,10 +3982,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "12qy6yga90hs2pdzkxwm80d38dbmjdxmf2szqwb40ky1jr4klfp7";
+      sha256 = "1na1h7nkc9s9s33g1pliml1nm3dq56ffwp9ajs95kpazbplbcd79";
       type = "gem";
     };
-    version = "1.74.1";
+    version = "1.75.0";
   };
   grpc-google-iam-v1 = {
     dependencies = [
@@ -4072,10 +4108,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gvkhb18inkwkf9ja1i774975l259dzlvcvjii3zfyzmzylki5qb";
+      sha256 = "1v64nbbckmfgi7b5c5j609mpcdyhbf7gav3n99xjy5fpyca7hpab";
       type = "gem";
     };
-    version = "0.64.0";
+    version = "0.66.0";
   };
   hamlit = {
     dependencies = [
@@ -4110,10 +4146,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1da0w5v7ppxrgvh58bafjklzv73nknyq73if6d9rkz2v24zg3169";
+      sha256 = "1lbw8lqzjv17vnwb9vy5ki4jiyihybcc5h2rmcrqiz1xa6y9s1ww";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.2.1";
   };
   hashie = {
     groups = [ "default" ];
@@ -4293,10 +4329,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0lbm33fpb3w06wd2231sg58dwlwgjsvym93m548ajvl6s3mfvpn7";
+      sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf";
       type = "gem";
     };
-    version = "1.14.4";
+    version = "1.14.7";
   };
   i18n_data = {
     groups = [ "default" ];
@@ -4746,10 +4782,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x";
+      sha256 = "1k0311vah76kg5m6zr7wmkwyk5p2f9d9hyckjpn3xgr83ajkj7px";
       type = "gem";
     };
-    version = "3.17.0.3";
+    version = "3.17.0.5";
   };
   launchy = {
     dependencies = [ "addressable" ];
@@ -4771,10 +4807,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pqam7p5f72ic1x16jmgvydjxgqd0lddq4pnkxjmwn174yk2k778";
+      sha256 = "0wl9bskb500gw0l2f1bm8rnv3xa2564lw6294pw6qnldz5zm2mx2";
       type = "gem";
     };
-    version = "1.12.3";
+    version = "1.13.0";
   };
   letter_opener = {
     dependencies = [ "launchy" ];
@@ -5209,10 +5245,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0x8asxl83msn815lwmb2d7q5p29p7drhjv5va0byhk60v9n16iwf";
+      sha256 = "12f2830x7pq3kj0v8nz0zjvaw02sv01bqs1zwdrc04704kwcgmqc";
       type = "gem";
     };
-    version = "2.8.8";
+    version = "2.8.9";
   };
   minitest = {
     groups = [
@@ -5352,10 +5388,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0rwbq20s2gdh8dljjsgj5s6wqqfmnbclhvv2c2608brv7jm6jdbd";
+      sha256 = "08ma2fmxlm6i7lih4mc3har2fzsbj1pl4hhva65kljf6nfvdryl5";
       type = "gem";
     };
-    version = "3.0.0";
+    version = "3.0.4";
   };
   mustermann-grape = {
     dependencies = [ "mustermann" ];
@@ -5603,10 +5639,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0czsh9d738kj0bmpkjnczq9j924hg103gc00i0wfyg0fzn9psnmc";
+      sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m";
       type = "gem";
     };
-    version = "1.18.9";
+    version = "1.18.10";
   };
   notiffany = {
     dependencies = [
@@ -5748,6 +5784,7 @@ src: {
   omniauth = {
     dependencies = [
       "hashie"
+      "logger"
       "rack"
       "rack-protection"
     ];
@@ -5755,10 +5792,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1hjnb5b5m549irs0h1455ipzsv82pikdagx9wjb6r4j1bkjy494d";
+      sha256 = "0g3n12k5npmmgai2cs3snimy6r7h0bvalhjxv0fjxlphjq25p822";
       type = "gem";
     };
-    version = "2.1.3";
+    version = "2.1.4";
   };
   omniauth-alicloud = {
     dependencies = [ "omniauth-oauth2" ];
@@ -6003,10 +6040,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ygfbbs3c61d32ymja2k6sznj5pr540cip9z91lhzcvsr4zmffpz";
+      sha256 = "0dzq3k5hmqlav2mwf7bc10mr1mlmlnpin498g7jhbhpdpa324s6n";
       type = "gem";
     };
-    version = "3.3.0";
+    version = "3.3.1";
   };
   openssl-signature_algorithm = {
     dependencies = [ "openssl" ];
@@ -6846,10 +6883,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0bvdq2jsn1jj8vgp9xrmi6ljw0hqlv4i97v5aa0fcii34g9rrzr4";
+      sha256 = "0gkhpdjib9zi9i27vd9djrxiwjia03cijmd6q8yj2q1ix403w3nw";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.4.0";
   };
   proc_to_ast = {
     dependencies = [
@@ -7043,10 +7080,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1pcr8sn02lwzv3z6vx5n41b6ybcnw9g9h05s3lkv4vqdm0f2mq2z";
+      sha256 = "0kvz20sxih8f976ry45b6c8srkh4km0cw4ilc5ynlmyk2nkywkya";
       type = "gem";
     };
-    version = "2.2.17";
+    version = "2.2.18";
   };
   rack-accept = {
     dependencies = [ "rack" ];
@@ -7382,10 +7419,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1h1jal1sv47saxyk33nnjk2ywrsf35aar18p7mc48s2m33876wpd";
+      sha256 = "1c0r26dhdr4jiklc0g7wjmr5q56dp7hwcfa8z75khkp8mrhazfpa";
       type = "gem";
     };
-    version = "3.6.1";
+    version = "3.9.5";
   };
   rbtrace = {
     dependencies = [
@@ -7436,10 +7473,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1rvf0yyff2anyfnmx6csx7fai8dk727b843hzz1bm2nqcmm9asv7";
+      sha256 = "1hpkh647ffsqhnj4ps85n2v4d116fg3250m9y7pcnc55lxl6nda5";
       type = "gem";
     };
-    version = "2.19.0";
+    version = "2.20.0";
   };
   recaptcha = {
     dependencies = [ "json" ];
@@ -7517,10 +7554,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0l2fsgfzzrspgrg6x3s38hws5clgbn1aaxcmiyz5jz6xd3dpkxdz";
+      sha256 = "0wx0v68lh924x544mkpydcrkkbr7i386xvkpyxgsf5j55j3d4f8y";
       type = "gem";
     };
-    version = "0.25.3";
+    version = "0.26.1";
   };
   redis-cluster-client = {
     dependencies = [ "redis-client" ];
@@ -7714,10 +7751,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05y4lwzci16c2xgckmpxkzq4czgkyaiiqhvrabdgaym3aj2jd10k";
+      sha256 = "0hninnbvqd2pn40h863lbrn9p11gvdxp928izkag5ysx8b1s5q0r";
       type = "gem";
     };
-    version = "3.4.2";
+    version = "3.4.4";
   };
   rinku = {
     groups = [ "default" ];
@@ -7748,10 +7785,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ynxxmvzczn9a6wd87jyh209590nq6f6ls55dmwiky8fvwi8c68h";
+      sha256 = "1pkp5icgm7s10b2n6b2pzbdsfiv0l5sxqyizx55qdmlpaxnk8xah";
       type = "gem";
     };
-    version = "4.6.0";
+    version = "4.6.1";
   };
   rqrcode = {
     dependencies = [
@@ -8151,16 +8188,15 @@ src: {
       "language_server-protocol"
       "prism"
       "rbs"
-      "sorbet-runtime"
     ];
     groups = [ "development" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0s97zck9v2c1awk4lbj5ccsnn6p0jp018mrq12fvh5hp00sn3586";
+      sha256 = "050qg73g4qs3xza441nafy7610daa3k4ra0pbi3sdlawy9fwfh6i";
       type = "gem";
     };
-    version = "0.23.20";
+    version = "0.26.1";
   };
   ruby-lsp-rails = {
     dependencies = [ "ruby-lsp" ];
@@ -8168,10 +8204,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0xlcpxsz2sk57l0kwla2gj8l9cfqj7dxxf0794p67daldr3fs2k7";
+      sha256 = "1bj4bj35l9jas2yf6w93j5ngw3f24lck2j9h5zmxwqs0dn91z7gh";
       type = "gem";
     };
-    version = "0.3.31";
+    version = "0.4.8";
   };
   ruby-lsp-rspec = {
     dependencies = [ "ruby-lsp" ];
@@ -8179,10 +8215,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "08m2fw4f784lkbyz5rbzdhj57p0x2pfygk66ls0qsn5avnv7izs1";
+      sha256 = "09wqhrrkfhbjy8yxkp1bn9rmrdcjp85j3lisvwp1qp7jz18yk0bm";
       type = "gem";
     };
-    version = "0.1.24";
+    version = "0.1.27";
   };
   ruby-magic = {
     dependencies = [ "mini_portile2" ];
@@ -8776,23 +8812,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1wxzz7580h6k2sghj9p1ss33i6nlmpmwqawi6ilr87si233rwgxc";
+      sha256 = "073ymwmn028lgzs62yfghdlgarndr3a972j8733dqkk9k2pcapr9";
       type = "gem";
     };
-    version = "0.5.2";
-  };
-  sorbet-runtime = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1dpxyhph8rp0bwiacqjsvsm67gm6v7bw16na20rk59g6y8953dk4";
-      type = "gem";
-    };
-    version = "0.5.11647";
+    version = "0.5.4";
   };
   spamcheck = {
     dependencies = [ "grpc" ];
@@ -8873,14 +8896,15 @@ src: {
     version = "3.5.2";
   };
   ssh_data = {
+    dependencies = [ "base64" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1h5aiqqlk51z12kgvanhdvd0ajvv2i68z6a7450yxgmflfaiwz7c";
+      sha256 = "1nsv1411dp5c13sbfzncf9kn3shf302gqqg8g7vmvvpzj5x35s1a";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "2.0.0";
   };
   ssrf_filter = {
     groups = [ "default" ];
@@ -10073,9 +10097,9 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "028ld9qmgdllxrl7d0qkl65s58wb1n3gv8yjs28g43a8b1hplxk1";
+      sha256 = "119ypabas886gd0n9kiid3q41w76gz60s8qmiak6pljpkd56ps5j";
       type = "gem";
     };
-    version = "2.6.7";
+    version = "2.7.3";
   };
 }
diff --git a/pkgs/by-name/gi/gitlab/update.py b/pkgs/by-name/gi/gitlab/update.py
index 6c171c981682..4904884510e4 100755
--- a/pkgs/by-name/gi/gitlab/update.py
+++ b/pkgs/by-name/gi/gitlab/update.py
@@ -62,10 +62,10 @@ class GitLabRepo:
             .strip()
         )
 
-    def get_yarn_hash(self, rev: str):
+    def get_yarn_hash(self, rev: str, yarn_lock_path="yarn.lock"):
         with tempfile.TemporaryDirectory() as tmp_dir:
             with open(tmp_dir + "/yarn.lock", "w") as f:
-                f.write(self.get_file("yarn.lock", rev))
+                f.write(self.get_file(yarn_lock_path, rev))
             return (
                 subprocess.check_output(["prefetch-yarn-deps", tmp_dir + "/yarn.lock"])
                 .decode("utf-8")
@@ -112,6 +112,7 @@ class GitLabRepo:
             version=self.rev2version(rev),
             repo_hash=self.get_git_hash(rev),
             yarn_hash=self.get_yarn_hash(rev),
+            frontend_islands_yarn_hash=self.get_yarn_hash(rev, "/ee/frontend_islands/apps/duo_next/yarn.lock"),
             owner=self.owner,
             repo=self.repo,
             rev=rev,

From 6c30e9c9937694ee15415f9537313166d5b688b5 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Fri, 17 Oct 2025 17:51:12 +0200
Subject: [PATCH 0825/6226] gitlab-runner: 18.4.0 -> 18.5.0

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

diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix
index 19db034432a6..0592229902ec 100644
--- a/pkgs/by-name/gi/gitlab-runner/package.nix
+++ b/pkgs/by-name/gi/gitlab-runner/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gitlab-runner";
-  version = "18.4.0";
+  version = "18.5.0";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kLUQTxj4t6H/by6lzsLmG8S3Ft1QFdUjTa4Y9aCT88o=";
+    hash = "sha256-xuRYnK5Ev2M/vrVWMHcTcK7LLwlQ30MVadMjA67fHpY=";
   };
 
-  vendorHash = "sha256-zXyyfJ3VBBcB3Qfsex2pDcDJIRg/HRgFAytWloHHUnM=";
+  vendorHash = "sha256-5Gh9jQ4GkvtN8inEUphehbsnmfyQldvxjbxBkXQ63wc=";
 
   # For patchShebangs
   buildInputs = [ bash ];

From 6c1296c39c35de29d741e735b611218e92d33125 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 16:23:04 +0000
Subject: [PATCH 0826/6226] crush: 0.9.2 -> 0.11.2

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

diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix
index 10165ff07454..24285d6948df 100644
--- a/pkgs/by-name/cr/crush/package.nix
+++ b/pkgs/by-name/cr/crush/package.nix
@@ -9,16 +9,16 @@
 
 buildGo125Module (finalAttrs: {
   pname = "crush";
-  version = "0.9.2";
+  version = "0.11.2";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "crush";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VFAGjNtXKNjkv8Ryi28oFN/uLomXXdw6NFtyjT3pMEY=";
+    hash = "sha256-vBjyykNSQ6Mq7OMRS0cCSHa8LUrIcfk9cr66ViU9z54=";
   };
 
-  vendorHash = "sha256-ktF3kIr143uPwiEbgafladZRqIsmG6jI2BeumGSu82U=";
+  vendorHash = "sha256-KaEPF4h5XqCjh91/KmB+AoiQK+fUmGEP0Lnyfe2qEZc=";
 
   # rename TestMain to prevent it from running, as it panics in the sandbox.
   postPatch = ''

From 993f4cdecc81cd516c5281624345498bb7a8090d Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sat, 18 Oct 2025 01:33:11 +0900
Subject: [PATCH 0827/6226] nixos/tests/sks: init

---
 nixos/tests/all-tests.nix    |  1 +
 nixos/tests/sks.nix          | 57 ++++++++++++++++++++++++++++++++++++
 pkgs/servers/sks/default.nix |  3 ++
 3 files changed, 61 insertions(+)
 create mode 100644 nixos/tests/sks.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 1f1f5ae5e043..f54418db494c 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1359,6 +1359,7 @@ in
   silverbullet = runTest ./silverbullet.nix;
   simple = runTest ./simple.nix;
   sing-box = runTest ./sing-box.nix;
+  sks = runTest ./sks.nix;
   slimserver = runTest ./slimserver.nix;
   slipshow = runTest ./slipshow.nix;
   slurm = runTest ./slurm.nix;
diff --git a/nixos/tests/sks.nix b/nixos/tests/sks.nix
new file mode 100644
index 000000000000..d56da6e8fe9e
--- /dev/null
+++ b/nixos/tests/sks.nix
@@ -0,0 +1,57 @@
+{ lib, pkgs, ... }:
+let
+  gpgKeyring = (
+    pkgs.runCommand "gpg-keyring" { buildInputs = [ pkgs.gnupg ]; } ''
+      mkdir -p $out
+      export GNUPGHOME=$out
+      cat > foo <<EOF
+        %echo Generating a basic OpenPGP key
+        %no-protection
+        Key-Type: DSA
+        Key-Length: 1024
+        Subkey-Type: ELG-E
+        Subkey-Length: 1024
+        Name-Real: Foo Example
+        Name-Email: foo@example.org
+        Expire-Date: 0
+        # Do a commit here, so that we can later print "done"
+        %commit
+        %echo done
+      EOF
+      gpg --batch --generate-key foo
+      rm $out/S.gpg-agent $out/S.gpg-agent.*
+    ''
+  );
+in
+{
+  name = "sks";
+  meta.maintainers = with lib.maintainers; [ h7x4 ];
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      environment.systemPackages = [ pkgs.gnupg ];
+
+      services.sks.enable = true;
+    };
+
+  testScript = ''
+    machine.wait_for_unit("sks-db.service")
+    machine.wait_for_open_port(11371)
+
+    response = machine.succeed("curl -f -s http://127.0.0.1:11371/")
+    assert "<title>SKS OpenPGP Public Key Server</title>" in response, "HTML title not found"
+
+    # Copy the keyring
+    machine.succeed("cp -R ${gpgKeyring} /tmp/GNUPGHOME")
+
+    # Extract our GPG key id
+    keyId = machine.succeed("GNUPGHOME=/tmp/GNUPGHOME gpg --list-keys | grep dsa1024 --after-context=1 | grep -v dsa1024").strip()
+
+    # Send the key to our local keyserver
+    machine.succeed("GNUPGHOME=/tmp/GNUPGHOME gpg --keyserver hkp://127.0.0.1:11371 --send-keys " + keyId)
+
+    # Receive the key from our local keyserver to a separate directory
+    machine.succeed("GNUPGHOME=$(mktemp -d) gpg --keyserver hkp://127.0.0.1:11371 --recv-keys " + keyId)
+  '';
+}
diff --git a/pkgs/servers/sks/default.nix b/pkgs/servers/sks/default.nix
index e93d3e4cd950..7042b1d6c015 100644
--- a/pkgs/servers/sks/default.nix
+++ b/pkgs/servers/sks/default.nix
@@ -6,6 +6,7 @@
   perl,
   zlib,
   db,
+  nixosTests,
 }:
 
 let
@@ -69,6 +70,8 @@ stdenv.mkDerivation rec {
   # Copy the web examples for the NixOS module
   postInstall = "cp -R sampleWeb $webSamples";
 
+  passthru.tests.nixos = nixosTests.sks;
+
   meta = with lib; {
     description = "Easily deployable & decentralized OpenPGP keyserver";
     longDescription = ''

From 7832e97746d6409bc29fc22477aef7faa5d34d54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 16:52:35 +0000
Subject: [PATCH 0828/6226] firebase-tools: 14.18.0 -> 14.20.0

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

diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix
index c0ca27b3ac6c..60a8cb55c8d8 100644
--- a/pkgs/by-name/fi/firebase-tools/package.nix
+++ b/pkgs/by-name/fi/firebase-tools/package.nix
@@ -10,16 +10,16 @@
 
 buildNpmPackage rec {
   pname = "firebase-tools";
-  version = "14.18.0";
+  version = "14.20.0";
 
   src = fetchFromGitHub {
     owner = "firebase";
     repo = "firebase-tools";
     tag = "v${version}";
-    hash = "sha256-1yTcMzyznr0b/ObVEECdJuBUi03aiTAwgcTdJ1QFcWY=";
+    hash = "sha256-CX/2luy78Du6gsGG3ex0Q5amu93MqebTUF9of7D6H4M=";
   };
 
-  npmDepsHash = "sha256-VJquJ7mDBHeclgd/jsAPyRLEFOQp27tUXGAQJX3bXyQ=";
+  npmDepsHash = "sha256-laYq6NNGsJ2YGhg6i0iFCVk+qyRqYdZPSSWzVHailcc=";
 
   postPatch = ''
     ln -s npm-shrinkwrap.json package-lock.json

From 43b3ad8ff8da42adee7507996798eb01fd05b1af Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sat, 18 Oct 2025 01:57:29 +0900
Subject: [PATCH 0829/6226] nixos/tests/munge: init

---
 nixos/tests/all-tests.nix         |  1 +
 nixos/tests/munge.nix             | 28 ++++++++++++++++++++++++++++
 pkgs/by-name/mu/munge/package.nix |  3 +++
 3 files changed, 32 insertions(+)
 create mode 100644 nixos/tests/munge.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 1f1f5ae5e043..0ce035e57a61 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -954,6 +954,7 @@ in
   mtp = runTest ./mtp.nix;
   multipass = runTest ./multipass.nix;
   mumble = runTest ./mumble.nix;
+  munge = runTest ./munge.nix;
   munin = runTest ./munin.nix;
   # Fails on aarch64-linux at the PDF creation step - need to debug this on an
   # aarch64 machine..
diff --git a/nixos/tests/munge.nix b/nixos/tests/munge.nix
new file mode 100644
index 000000000000..38c47224b959
--- /dev/null
+++ b/nixos/tests/munge.nix
@@ -0,0 +1,28 @@
+{ lib, ... }:
+{
+  name = "munge";
+  meta.maintainers = with lib.maintainers; [ h7x4 ];
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      imports = [ ./common/user-account.nix ];
+
+      services.munge.enable = true;
+    };
+
+  testScript =
+    { nodes }:
+    let
+      aliceUid = toString nodes.machine.users.users.alice.uid;
+    in
+    ''
+      machine.succeed("mkdir -p /etc/munge && echo '${lib.strings.replicate 5 "hunter2"}' > /etc/munge/munge.key && chown munge: /etc/munge/munge.key")
+      machine.systemctl("restart munged.service")
+      machine.wait_for_unit("munged.service")
+
+      machine.succeed("sudo -u bob -- munge -u ${aliceUid} -s 'top secret' -o ./secret.txt")
+      machine.succeed("grep -v 'top secret' ./secret.txt")
+      machine.succeed("sudo -u alice unmunge -i ./secret.txt | grep 'top secret'")
+    '';
+}
diff --git a/pkgs/by-name/mu/munge/package.nix b/pkgs/by-name/mu/munge/package.nix
index f21a9e17add3..ecfd36396afd 100644
--- a/pkgs/by-name/mu/munge/package.nix
+++ b/pkgs/by-name/mu/munge/package.nix
@@ -6,6 +6,7 @@
   libgcrypt,
   zlib,
   bzip2,
+  nixosTests,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -62,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
     rmdir "$out"/{var{/{lib,log}{/munge,},},etc/munge}
   '';
 
+  passthru.tests.nixos = nixosTests.munge;
+
   meta = with lib; {
     description = ''
       An authentication service for creating and validating credentials

From 32398d846eeff9288917348b7b39dc4a06fdecb7 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Fri, 17 Oct 2025 19:18:55 +0200
Subject: [PATCH 0830/6226] httraqt: fix build with cmake4

---
 pkgs/tools/backup/httrack/qt.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/backup/httrack/qt.nix b/pkgs/tools/backup/httrack/qt.nix
index bc9eba0b923b..389ef9ad734d 100644
--- a/pkgs/tools/backup/httrack/qt.nix
+++ b/pkgs/tools/backup/httrack/qt.nix
@@ -33,6 +33,12 @@ mkDerivation rec {
   ];
 
   prePatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6 FATAL_ERROR)" \
+        "CMAKE_MINIMUM_REQUIRED(VERSION 3.10 FATAL_ERROR)" \
+      --replace-fail "CMAKE_POLICY(SET CMP0003 OLD)" "" \
+      --replace-fail "CMAKE_POLICY(SET CMP0015 OLD)" ""
+
     substituteInPlace cmake/HTTRAQTFindHttrack.cmake \
       --replace /usr/include/httrack/ ${httrack}/include/httrack/
 

From fd0c349b37922b6a37be60775b9b5e4119362218 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 18:14:54 +0000
Subject: [PATCH 0831/6226] feishu: 7.50.13 -> 7.50.14

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

diff --git a/pkgs/by-name/fe/feishu/package.nix b/pkgs/by-name/fe/feishu/package.nix
index acc5593e92a1..a4a945fa3b67 100644
--- a/pkgs/by-name/fe/feishu/package.nix
+++ b/pkgs/by-name/fe/feishu/package.nix
@@ -65,12 +65,12 @@
 let
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/1d078929/Feishu-linux_x64-7.50.13.deb";
-      sha256 = "sha256-wP3Uyz3KiWLADzUhZnPJori2gqdzEm5azUcGv8w1BXM=";
+      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/e91d15e2/Feishu-linux_x64-7.50.14.deb";
+      sha256 = "sha256-Ywlf3qi4q5nT3gC9r4ymtFYIrg8xmxapIfO2oQoBdC8=";
     };
     aarch64-linux = fetchurl {
-      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/05ade0ea/Feishu-linux_arm64-7.50.13.deb";
-      sha256 = "sha256-9YTk3Jx1Ap5ym2N/GiN8YcB6XfyVElSWZV3/O6gJWNE=";
+      url = "https://sf3-cn.feishucdn.com/obj/ee-appcenter/f247fca9/Feishu-linux_arm64-7.50.14.deb";
+      sha256 = "sha256-ecpaw0n6jRq1hdDY3rTzRiN8Ck3BTLt+K1DcxrPI4TE=";
     };
   };
 
@@ -133,7 +133,7 @@ let
   ];
 in
 stdenv.mkDerivation {
-  version = "7.50.13";
+  version = "7.50.14";
   pname = "feishu";
 
   src =

From 71e744cf162d10219e2105a4856bf96d0545614a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 18:22:06 +0000
Subject: [PATCH 0832/6226] xlights: 2025.10.2 -> 2025.11

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

diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix
index b70bb479b640..98d31d1a47c1 100644
--- a/pkgs/by-name/xl/xlights/package.nix
+++ b/pkgs/by-name/xl/xlights/package.nix
@@ -6,11 +6,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "xlights";
-  version = "2025.10.2";
+  version = "2025.11";
 
   src = fetchurl {
     url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage";
-    hash = "sha256-LfT1AQktBklN1IUiJdqxFY4bM/CQEBg/5sxEvWUQkGQ=";
+    hash = "sha256-k5HGk5t/ujPuOU/GlxhA+yKKXy0lq8YkxcQkTUVBYXM=";
   };
 
   meta = {

From 81064dd5a5b70e900d16d544df09a156c6b7ac75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 18:22:23 +0000
Subject: [PATCH 0833/6226] webdav: 5.8.0 -> 5.8.1

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

diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix
index 075254605ab4..282d07125868 100644
--- a/pkgs/by-name/we/webdav/package.nix
+++ b/pkgs/by-name/we/webdav/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "webdav";
-  version = "5.8.0";
+  version = "5.8.1";
 
   src = fetchFromGitHub {
     owner = "hacdias";
     repo = "webdav";
     tag = "v${version}";
-    hash = "sha256-6G9NlQVYFDLuIxKJXq0Rcixx1AiDhTHUekumMNqXi44=";
+    hash = "sha256-byAfcJTzbt2o0vwxKHks6FgrBBlIZY1iKeaWFir5hMU=";
   };
 
-  vendorHash = "sha256-B78O13FPpkcuE808c2hLiIDPQdS5qlaw1dWLc9T7hvM=";
+  vendorHash = "sha256-BHSkSGgL6Ns4kjQV5OaiViIVhnOg1qpdvv4LPhkeAnw=";
 
   __darwinAllowLocalNetworking = true;
 

From 7f2565b48b570b224081b5cf3f70c6025b0e2bba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 18:52:43 +0000
Subject: [PATCH 0834/6226] spacectl: 1.16.1 -> 1.17.0

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

diff --git a/pkgs/by-name/sp/spacectl/package.nix b/pkgs/by-name/sp/spacectl/package.nix
index e80d27277d94..19ad551ca32d 100644
--- a/pkgs/by-name/sp/spacectl/package.nix
+++ b/pkgs/by-name/sp/spacectl/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "spacectl";
-  version = "1.16.1";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner = "spacelift-io";
     repo = "spacectl";
     rev = "v${version}";
-    hash = "sha256-elr7SG8naxz5w15Advr2tcQxPJ1tBL4G7Do7LNT4kqY=";
+    hash = "sha256-j9c8RZfm5RWcXAy8LUtIZrztfVhXiAWmCJ/Rwq5IiKo=";
   };
 
   vendorHash = "sha256-g5Y6NuG8z2Pnh3Ng690FcwOrEU2EOhftZbM8oUFj4B4=";

From 9796a5b984ae659eb2275c395d5997392415fc61 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 19:05:22 +0000
Subject: [PATCH 0835/6226] prometheus-script-exporter: 3.0.1 -> 3.1.0

---
 pkgs/servers/monitoring/prometheus/script-exporter.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/script-exporter.nix b/pkgs/servers/monitoring/prometheus/script-exporter.nix
index 34ee532cc939..8c5ca2884e30 100644
--- a/pkgs/servers/monitoring/prometheus/script-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/script-exporter.nix
@@ -11,13 +11,13 @@ buildGoModule rec {
   '';
 
   pname = "script_exporter";
-  version = "3.0.1";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "ricoberger";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-09WpxXPNk2Pza9RrD3OLru4aY0LR98KgsHK7It/qRgs=";
+    hash = "sha256-fewhI47nfO95PXYUndaPFAXVyfQPWsoYy1J1pwd4SNs=";
   };
 
   postPatch = ''
@@ -26,7 +26,7 @@ buildGoModule rec {
     sed -i '/func TestHandler/a\\    t.Skip("skipped in Nix build")' prober/handler_test.go
   '';
 
-  vendorHash = "sha256-Rs7P7uVvfhWteiR10LeG4fWZqbNqDf3QQotgNvTMTX4=";
+  vendorHash = "sha256-kzt84Zu24HJNaQeerx8M1YpMF4808K+/K6kVw5AbqVY=";
 
   passthru.tests = { inherit (nixosTests.prometheus-exporters) script; };
 

From 0f33a176cae0b9bffa38a76066c27b239b935fa3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 19:31:02 +0000
Subject: [PATCH 0836/6226] micromdm: 1.13.0 -> 1.13.1

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

diff --git a/pkgs/by-name/mi/micromdm/package.nix b/pkgs/by-name/mi/micromdm/package.nix
index 05cb4e691b6e..176f7c7ae946 100644
--- a/pkgs/by-name/mi/micromdm/package.nix
+++ b/pkgs/by-name/mi/micromdm/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "micromdm";
-  version = "1.13.0";
+  version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "micromdm";
     repo = "micromdm";
     rev = "v${version}";
-    hash = "sha256-o/HK1bjaUwsSQG7QbYe0gFnD/OKV00cHXLXpftNa3iY=";
+    hash = "sha256-b0ST2krDY4avvcdcpUInTH1On0cGKTsdwPpL9HbSPig=";
   };
 
-  vendorHash = "sha256-aKm8a/PS+1ozImh1aL2EliALyUqjPMMBh4NTbL0H/ng=";
+  vendorHash = "sha256-NxjxHKEB1+d2BsVImL405anuMcKF+DlpnRPvKkGNMAQ=";
 
   meta = {
     description = "Mobile Device Management server for Apple Devices, focused on giving you all the power through an API";

From 2e4ae00a23c524ff0b0f11366cb61118baebcd1a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 19:32:08 +0000
Subject: [PATCH 0837/6226] luwen: 0.7.13 -> 0.7.14

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

diff --git a/pkgs/by-name/lu/luwen/package.nix b/pkgs/by-name/lu/luwen/package.nix
index 545910442f5a..0a075faf559e 100644
--- a/pkgs/by-name/lu/luwen/package.nix
+++ b/pkgs/by-name/lu/luwen/package.nix
@@ -6,13 +6,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "luwen";
-  version = "0.7.13";
+  version = "0.7.14";
 
   src = fetchFromGitHub {
     owner = "tenstorrent";
     repo = "luwen";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2l+rcWP9Ms0bvvSvZIA4DjH6bIloQGxzRTE1ShP6hEE=";
+    hash = "sha256-KhkABISkR37MjEwgroVtywYNCxgfwXyM5LG2CIJhu3M=";
   };
 
   postUnpack = ''

From af0f607f1cad50b45c99d97834fd8db9efac9bec Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 17 Oct 2025 21:42:38 +0200
Subject: [PATCH 0838/6226] mir: 2.22.2 -> 2.23.0

---
 pkgs/servers/mir/common.nix  | 3 +++
 pkgs/servers/mir/default.nix | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mir/common.nix b/pkgs/servers/mir/common.nix
index ce14d98b2c8d..944242dceed3 100644
--- a/pkgs/servers/mir/common.nix
+++ b/pkgs/servers/mir/common.nix
@@ -149,6 +149,9 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (lib.strings.versionAtLeast version "2.22.0") [
     mesa.llvmpipeHook
+  ]
+  ++ lib.optionals (lib.strings.versionAtLeast version "2.23.0") [
+    xwayland
   ];
 
   checkInputs = [
diff --git a/pkgs/servers/mir/default.nix b/pkgs/servers/mir/default.nix
index afbe51c40186..bf354a75dd68 100644
--- a/pkgs/servers/mir/default.nix
+++ b/pkgs/servers/mir/default.nix
@@ -5,8 +5,8 @@ let
 in
 {
   mir = common {
-    version = "2.22.2";
-    hash = "sha256-AZUdj/ctBeBa3BUnmaC6NdyCO0XXBx5xMG7zPoh6ARc=";
+    version = "2.23.0";
+    hash = "sha256-Sib2dxNDxyJCJwxuP8TVphdZvnkrn+8/t7cnEjfXIsw=";
   };
 
   mir_2_15 = common {

From 0caab036269db873320f1fc3e63405a51178961a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 19:46:17 +0000
Subject: [PATCH 0839/6226] kubedb-cli: 0.58.0 -> 0.59.0

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

diff --git a/pkgs/by-name/ku/kubedb-cli/package.nix b/pkgs/by-name/ku/kubedb-cli/package.nix
index 43a4a543ed98..f4ad59ffdf8a 100644
--- a/pkgs/by-name/ku/kubedb-cli/package.nix
+++ b/pkgs/by-name/ku/kubedb-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "kubedb-cli";
-  version = "0.58.0";
+  version = "0.59.0";
 
   src = fetchFromGitHub {
     owner = "kubedb";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-DfvYWA2D+TuIz5nQnzFHatR9yl8nos7byMz7uK+q7w0=";
+    hash = "sha256-gM61Om1qNbzeHWAzLbgUlHsZPzBNzyFN8r9PoS3Pf1c=";
   };
 
   vendorHash = null;

From 4fe3273e1fa0af53014d951831f285f781a3948d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 16 Oct 2025 17:57:56 +0200
Subject: [PATCH 0840/6226] prometheus-rasdaemon-exporter:
 0-unstable-2023-03-15 -> 0-unstable-2025-01-02

https://github.com/sanecz/prometheus-rasdaemon-exporter/compare/e37084edeb4d397dd360298cb22f18f83a35ff46...06cf02a4fa277fdc422275d9c4fe930786fc3f78
---
 .../prometheus-rasdaemon-exporter/package.nix | 33 +++++--------------
 1 file changed, 8 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/pr/prometheus-rasdaemon-exporter/package.nix b/pkgs/by-name/pr/prometheus-rasdaemon-exporter/package.nix
index 7963850902e5..b9ada6bf1d9c 100644
--- a/pkgs/by-name/pr/prometheus-rasdaemon-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-rasdaemon-exporter/package.nix
@@ -2,46 +2,27 @@
   lib,
   python3Packages,
   fetchFromGitHub,
-  fetchpatch2,
+  unstableGitUpdater,
 }:
 
-python3Packages.buildPythonApplication {
+python3Packages.buildPythonApplication rec {
   pname = "prometheus-rasdaemon-exporter";
-  version = "0-unstable-2023-03-15";
+  version = "0-unstable-2025-01-02";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sanecz";
     repo = "prometheus-rasdaemon-exporter";
-    rev = "e37084edeb4d397dd360298cb22f18f83a35ff46";
-    hash = "sha256-O0Zzog+5jDixFRGbqmjPYi6JDpHbxpU4hKfsqTnexS8=";
+    rev = "06cf02a4fa277fdc422275d9c4fe930786fc3f78";
+    hash = "sha256-QPbCwEpbG7gDPOSRcgu82QEqKkmW0uRhmSOWGgwVMDI=";
   };
 
-  patches = [
-    # Normalization of metric names
-    # https://github.com/sanecz/prometheus-rasdaemon-exporter/pull/1
-    (fetchpatch2 {
-      url = "https://github.com/sanecz/prometheus-rasdaemon-exporter/commit/46d379ba205c2340a0b266bf3cd48ec88ce025d0.patch";
-      hash = "sha256-kqo1Tjn51M1FzArS4K0ylQ2/rFDOAiZU3OUt/oBhGhM=";
-    })
-    (fetchpatch2 {
-      url = "https://github.com/sanecz/prometheus-rasdaemon-exporter/commit/c9ab08e8918497edb8f1ab0f933fa270cb7860a8.patch";
-      hash = "sha256-QtjzXuxPG7e+cgUDVbAVNY4VyBp3W5+vQDAvFJ9t92I=";
-    })
-    # Fix sqlite3.connect URI passing
-    # https://github.com/sanecz/prometheus-rasdaemon-exporter/pull/2
-    (fetchpatch2 {
-      url = "https://github.com/sanecz/prometheus-rasdaemon-exporter/commit/52f6c47b77f480cd7f83853a2baffffb45f77b37.patch";
-      hash = "sha256-XYeWMkAhWJIOUKLeTstIJr3P37Jwt8tzRURCvlrrxVs=";
-    })
-  ];
-
   build-system = with python3Packages; [
     setuptools
     setuptools-scm
   ];
 
-  env.SETUPTOOLS_SCM_PRETEND_VERSION = "0.1.dev9+ge37084e";
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = "0.1.dev+g${lib.substring 0 7 src.rev}";
 
   dependencies = with python3Packages; [
     prometheus-client
@@ -53,6 +34,8 @@ python3Packages.buildPythonApplication {
 
   doCheck = false; # no tests
 
+  passthru.updateScript = unstableGitUpdater { };
+
   meta = {
     description = "Rasdaemon exporter for Prometheus";
     homepage = "https://github.com/sanecz/prometheus-rasdaemon-exporter";

From ae05b5dbc7d9353f307528c4aeb2b91ae1da2aec Mon Sep 17 00:00:00 2001
From: Xinyang Li <lixinyang411@gmail.com>
Date: Fri, 17 Oct 2025 23:00:24 +0300
Subject: [PATCH 0841/6226] hdrmerge: 0.5.0-unstable-2024-08-02 ->
 0.5.0-unstable-2025-04-26

---
 pkgs/by-name/hd/hdrmerge/package.nix | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/hd/hdrmerge/package.nix b/pkgs/by-name/hd/hdrmerge/package.nix
index c743ba7196b8..9e2bd1865945 100644
--- a/pkgs/by-name/hd/hdrmerge/package.nix
+++ b/pkgs/by-name/hd/hdrmerge/package.nix
@@ -15,14 +15,20 @@
 
 stdenv.mkDerivation rec {
   pname = "hdrmerge";
-  version = "0.5.0-unstable-2024-08-02";
+  version = "0.5.0-unstable-2025-04-26";
   src = fetchFromGitHub {
     owner = "jcelaya";
     repo = "hdrmerge";
-    rev = "e2a46f97498b321b232cc7f145461212677200f1";
-    hash = "sha256-471gJtF9M36pAId9POG8ZIpNk9H/157EdHqXSAPlhN0=";
+    rev = "3bbe43771ba15b899151721bc14aa57e86b60f2f";
+    hash = "sha256-4FIGchwROXe8qLRBaYih2k9zDll2YoYGDj06SrIqK9Q=";
   };
 
+  # Disable find_package(ALGLIB REQUIRED) in the CMake file by providing a empty
+  # FindALGLIB.cmake, and provide ALGLIB_INCLUDES and ALGLIB_LIBRARIES ourselves
+  preConfigure = ''
+    touch cmake/FindALGLIB.cmake
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -39,12 +45,8 @@ stdenv.mkDerivation rec {
   ];
 
   cmakeFlags = [
-    "-DALGLIB_DIR:PATH=${alglib}"
-  ];
-
-  CXXFLAGS = [
-    # GCC 13: error: 'uint32_t' does not name a type
-    "-include cstdint"
+    (lib.cmakeFeature "ALGLIB_INCLUDES" "${alglib}/include/alglib")
+    (lib.cmakeFeature "ALGLIB_LIBRARIES" "alglib3")
   ];
 
   desktopItems = [

From 72e993be3b88699560728ca1402e66041b944e69 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 20:21:24 +0000
Subject: [PATCH 0842/6226] python3Packages.avro: 1.12.0 -> 1.12.1

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

diff --git a/pkgs/development/python-modules/avro/default.nix b/pkgs/development/python-modules/avro/default.nix
index 512377ff053c..80cd0de5213b 100644
--- a/pkgs/development/python-modules/avro/default.nix
+++ b/pkgs/development/python-modules/avro/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "avro";
-  version = "1.12.0";
+  version = "1.12.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-ytnFOyPO7Wmceva93O1C4sVy/WtAjCV6fU/E6M8uLWs=";
+    hash = "sha256-xbjdLdTBCBbw3BJ8wpz9Q7XkBc9+aEDolGCgJL89CY0=";
   };
 
   build-system = [ setuptools ];

From 7f4e302f7d53852cca8b95765bd4ff8d45bebb2c Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Tue, 14 Oct 2025 20:37:12 -0700
Subject: [PATCH 0843/6226] sv-lang: 7.0 -> 9.1

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

diff --git a/pkgs/by-name/sv/sv-lang/package.nix b/pkgs/by-name/sv/sv-lang/package.nix
index b72ba3e6316b..b04eca78a498 100644
--- a/pkgs/by-name/sv/sv-lang/package.nix
+++ b/pkgs/by-name/sv/sv-lang/package.nix
@@ -13,18 +13,18 @@
 
 stdenv.mkDerivation rec {
   pname = "sv-lang";
-  version = "7.0";
+  version = "9.1";
 
   src = fetchFromGitHub {
     owner = "MikePopoloski";
     repo = "slang";
     rev = "v${version}";
-    sha256 = "sha256-msSc6jw2xbEZfOwtqwFEDIKcwf5SDKp+j15lVbNO98g=";
+    sha256 = "sha256-IfRh6F6vA+nFa+diPKD2aMv9kRbvVIY80IqX0d+d5JA=";
   };
 
   postPatch = ''
     substituteInPlace external/CMakeLists.txt \
-      --replace-fail 'set(mimalloc_min_version "2.1")' 'set(mimalloc_min_version "${lib.versions.majorMinor mimalloc.version}")'
+      --replace-fail 'set(mimalloc_min_version "2.2")' 'set(mimalloc_min_version "${lib.versions.majorMinor mimalloc.version}")'
   '';
 
   cmakeFlags = [

From f18df57364f4d89ba08968774eba0c649748f6b4 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Wed, 15 Oct 2025 14:05:07 -0700
Subject: [PATCH 0844/6226] sv-lang: cleanup

---
 pkgs/by-name/sv/sv-lang/package.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/sv/sv-lang/package.nix b/pkgs/by-name/sv/sv-lang/package.nix
index b04eca78a498..ee4ef1d3c843 100644
--- a/pkgs/by-name/sv/sv-lang/package.nix
+++ b/pkgs/by-name/sv/sv-lang/package.nix
@@ -11,20 +11,21 @@
   python3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sv-lang";
   version = "9.1";
 
   src = fetchFromGitHub {
     owner = "MikePopoloski";
     repo = "slang";
-    rev = "v${version}";
-    sha256 = "sha256-IfRh6F6vA+nFa+diPKD2aMv9kRbvVIY80IqX0d+d5JA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-IfRh6F6vA+nFa+diPKD2aMv9kRbvVIY80IqX0d+d5JA=";
   };
 
   postPatch = ''
-    substituteInPlace external/CMakeLists.txt \
-      --replace-fail 'set(mimalloc_min_version "2.2")' 'set(mimalloc_min_version "${lib.versions.majorMinor mimalloc.version}")'
+    substituteInPlace external/CMakeLists.txt --replace-fail \
+      'set(mimalloc_min_version "2.2")' \
+      'set(mimalloc_min_version "${lib.versions.majorMinor mimalloc.version}")'
   '';
 
   cmakeFlags = [
@@ -32,7 +33,7 @@ stdenv.mkDerivation rec {
     "-DCMAKE_INSTALL_INCLUDEDIR=include"
     "-DCMAKE_INSTALL_LIBDIR=lib"
 
-    "-DSLANG_INCLUDE_TESTS=${if doCheck then "ON" else "OFF"}"
+    "-DSLANG_INCLUDE_TESTS=${if finalAttrs.finalPackage.doCheck then "ON" else "OFF"}"
   ];
 
   nativeBuildInputs = [
@@ -41,6 +42,8 @@ stdenv.mkDerivation rec {
     ninja
   ];
 
+  strictDeps = true;
+
   buildInputs = [
     boost
     fmt
@@ -62,4 +65,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     broken = stdenv.hostPlatform.isDarwin;
   };
-}
+})

From 6208ef8f6a43c8f88815732a122e2b9ef94cb9a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 20:47:45 +0000
Subject: [PATCH 0845/6226] netbird: 0.59.5 -> 0.59.7

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

diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index 4938520f0f1e..a2a71085d428 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -68,16 +68,16 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "netbird-${componentName}";
-  version = "0.59.5";
+  version = "0.59.7";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-raJXFBApLb17jiDdia60gchqayDVDbgC+hztXjz0Ofs=";
+    hash = "sha256-qOb4viLMZme6sJzWxJuYkubQ3D67j5gkkLTRkcL2QKI=";
   };
 
-  vendorHash = "sha256-hg9vzosB6yVS0e0McekIuchWaByYS02kbbtilKjCo7s=";
+  vendorHash = "sha256-JMynPCH5Zvzz8nYI7DPu9TzU+rWJemPwyDdlPkFiqds=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config;
 

From 000b7bd881b3387c412d549d2f389f483a6b560e Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Fri, 17 Oct 2025 22:51:16 +0200
Subject: [PATCH 0846/6226] amule-gui: fix build with cmake4

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

diff --git a/pkgs/by-name/am/amule/package.nix b/pkgs/by-name/am/amule/package.nix
index c75658b642e2..efb0627dc95a 100644
--- a/pkgs/by-name/am/amule/package.nix
+++ b/pkgs/by-name/am/amule/package.nix
@@ -79,6 +79,9 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     echo "find_package(Threads)" >> cmake/options.cmake
+
+    substituteInPlace src/libs/ec/abstracts/CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED (VERSION 2.8)" "CMAKE_MINIMUM_REQUIRED (VERSION 3.10)"
   '';
 
   # aMule will try to `dlopen' libupnp and libixml, so help it

From e41a5aeeb4fdb684406cc2eb9a47c7e565c39f75 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 17 Oct 2025 18:48:47 -0300
Subject: [PATCH 0847/6226] flightgear: move to by-name and modernize

---
 .../flightgear/openscenegraph-flightgear.nix  |  0
 .../fl/flightgear/package.nix}                | 21 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 9 insertions(+), 14 deletions(-)
 rename pkgs/{games => by-name/fl}/flightgear/openscenegraph-flightgear.nix (100%)
 rename pkgs/{games/flightgear/default.nix => by-name/fl/flightgear/package.nix} (86%)

diff --git a/pkgs/games/flightgear/openscenegraph-flightgear.nix b/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix
similarity index 100%
rename from pkgs/games/flightgear/openscenegraph-flightgear.nix
rename to pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix
diff --git a/pkgs/games/flightgear/default.nix b/pkgs/by-name/fl/flightgear/package.nix
similarity index 86%
rename from pkgs/games/flightgear/default.nix
rename to pkgs/by-name/fl/flightgear/package.nix
index 42c793c335b6..e7dff70ac77d 100644
--- a/pkgs/games/flightgear/default.nix
+++ b/pkgs/by-name/fl/flightgear/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  wrapQtAppsHook,
   callPackage,
   libglut,
   freealut,
@@ -28,9 +27,7 @@
   udev,
   fltk13,
   apr,
-  qtbase,
-  qtquickcontrols2,
-  qtdeclarative,
+  qt5,
   glew,
   curl,
 }:
@@ -71,7 +68,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
   buildInputs = [
     libglut
@@ -98,21 +95,21 @@ stdenv.mkDerivation rec {
     udev
     fltk13
     apr
-    qtbase
-    qtquickcontrols2
+    qt5.qtbase
+    qt5.qtquickcontrols2
     glew
-    qtdeclarative
+    qt5.qtdeclarative
     curl
   ];
 
   qtWrapperArgs = [ "--set FG_ROOT ${data}/share/FlightGear" ];
 
-  meta = with lib; {
+  meta = {
     description = "Flight simulator";
-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ raskin ];
+    platforms = lib.platforms.linux;
     hydraPlatforms = [ ]; # disabled from hydra because it's so big
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     mainProgram = "fgfs";
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bfb14a45b91d..e27102d88118 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13382,8 +13382,6 @@ with pkgs;
 
   factorio-utils = callPackage ../by-name/fa/factorio/utils.nix { };
 
-  flightgear = libsForQt5.callPackage ../games/flightgear { };
-
   freeciv = callPackage ../by-name/fr/freeciv/package.nix {
     sdl2Client = false;
     gtkClient = true;

From c4d5904e1269ee70d20b728c5fcd90b884cf77fd Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 17 Oct 2025 18:52:45 -0300
Subject: [PATCH 0848/6226] flightgear: add maintainer iedame

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

diff --git a/pkgs/by-name/fl/flightgear/package.nix b/pkgs/by-name/fl/flightgear/package.nix
index e7dff70ac77d..056b3269774a 100644
--- a/pkgs/by-name/fl/flightgear/package.nix
+++ b/pkgs/by-name/fl/flightgear/package.nix
@@ -106,7 +106,10 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Flight simulator";
-    maintainers = with lib.maintainers; [ raskin ];
+    maintainers = with lib.maintainers; [
+      raskin
+      iedame
+    ];
     platforms = lib.platforms.linux;
     hydraPlatforms = [ ]; # disabled from hydra because it's so big
     license = lib.licenses.gpl2Plus;

From bd017ce242a3ca8866036d0f80aaafebd0d9c55b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 22:03:26 +0000
Subject: [PATCH 0849/6226] hyperrogue: 13.1e -> 13.1f

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

diff --git a/pkgs/by-name/hy/hyperrogue/package.nix b/pkgs/by-name/hy/hyperrogue/package.nix
index c613d8b8f22f..7992aa8dddfa 100644
--- a/pkgs/by-name/hy/hyperrogue/package.nix
+++ b/pkgs/by-name/hy/hyperrogue/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hyperrogue";
-  version = "13.1e";
+  version = "13.1f";
 
   src = fetchFromGitHub {
     owner = "zenorogue";
     repo = "hyperrogue";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-teoSI6JrqDAkyNhVaIVZcfM93LxjQah0+eJFKfI5iP4=";
+    sha256 = "sha256-HJer4CUtpJDI0aRbays9vhNTnmOYHl3eODDaLdxwjyE=";
   };
 
   env = {

From 3e00b2897e99a733664cdd2dd48f8dcadda7ac7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 22:53:47 +0000
Subject: [PATCH 0850/6226] wezterm: 0-unstable-2025-10-05 ->
 0-unstable-2025-10-14

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

diff --git a/pkgs/by-name/we/wezterm/package.nix b/pkgs/by-name/we/wezterm/package.nix
index a729c9b9bfe4..2e37932cc914 100644
--- a/pkgs/by-name/we/wezterm/package.nix
+++ b/pkgs/by-name/we/wezterm/package.nix
@@ -28,14 +28,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wezterm";
-  version = "0-unstable-2025-10-05";
+  version = "0-unstable-2025-10-14";
 
   src = fetchFromGitHub {
     owner = "wezterm";
     repo = "wezterm";
-    rev = "db5d7437389eac5f63ad32e3b50d95b2b86065d1";
+    rev = "64f2907c635b7bab407ac300b2261c77a85c1c8e";
     fetchSubmodules = true;
-    hash = "sha256-4OzgrXsSq68CP6iImhqW896X6ekv2seg4kaH3md6QLs=";
+    hash = "sha256-o/SSN18DmoN5LsB9RvWuAw7voGevOR5DqPBheqmq7AI=";
   };
 
   postPatch = ''

From 8d0cc49c49da65fd67bc511367e29095dfac0267 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 17 Oct 2025 23:02:59 +0000
Subject: [PATCH 0851/6226] proton-pass: 1.32.6 -> 1.32.10

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

diff --git a/pkgs/by-name/pr/proton-pass/package.nix b/pkgs/by-name/pr/proton-pass/package.nix
index 2e3d7faf7bd6..fd6bf34a994d 100644
--- a/pkgs/by-name/pr/proton-pass/package.nix
+++ b/pkgs/by-name/pr/proton-pass/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-pass";
-  version = "1.32.6";
+  version = "1.32.10";
 
   src = fetchurl {
     url = "https://proton.me/download/pass/linux/x64/proton-pass_${finalAttrs.version}_amd64.deb";
-    hash = "sha256-xtptEi/H15fEABrlPE854uSWagr2kt2/h33SuegVab8=";
+    hash = "sha256-FeU7ubjT1WqtviCPA78SW8zZi1h6gnj7erFebg2mgg4=";
   };
 
   dontConfigure = true;

From e7276a6fe41b7c135d0a4c68e6d4f59be40a8c56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 00:26:03 +0000
Subject: [PATCH 0852/6226] liblognorm: 2.0.6 -> 2.0.7

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

diff --git a/pkgs/by-name/li/liblognorm/package.nix b/pkgs/by-name/li/liblognorm/package.nix
index 0075d0fe5a85..08fef652993f 100644
--- a/pkgs/by-name/li/liblognorm/package.nix
+++ b/pkgs/by-name/li/liblognorm/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "liblognorm";
-  version = "2.0.6";
+  version = "2.0.7";
 
   src = fetchurl {
     url = "http://www.liblognorm.com/files/download/liblognorm-${finalAttrs.version}.tar.gz";
-    hash = "sha256-z/BX6FwiA4mS+e0S641OY8Ra31OlpR+qoyefYFgJ9vI=";
+    hash = "sha256-vp2OekIHAu2NPFvK1zBsLZxs9UtZx3FcYbCIoGDgiUM=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From f4bb20607f302e804bf0d51c43055342107a2470 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 00:39:47 +0000
Subject: [PATCH 0853/6226] python3Packages.copier: 9.10.2 -> 9.10.3

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

diff --git a/pkgs/development/python-modules/copier/default.nix b/pkgs/development/python-modules/copier/default.nix
index af924d10e4ca..ccfd20310fb3 100644
--- a/pkgs/development/python-modules/copier/default.nix
+++ b/pkgs/development/python-modules/copier/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "copier";
-  version = "9.10.2";
+  version = "9.10.3";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -39,7 +39,7 @@ buildPythonPackage rec {
     postFetch = ''
       rm $out/tests/demo/doc/ma*ana.txt
     '';
-    hash = "sha256-vO807Jzl04DkiHPBhu3cGK0bhn2Cd2dT1nKznQKP/p0=";
+    hash = "sha256-ZBRJ4FrdhtKr273D2amwA3dJhISZAORqFqoh//963Fg=";
   };
 
   POETRY_DYNAMIC_VERSIONING_BYPASS = version;

From 40c0bbc6b59f534879d5f7608b038f8f8029dd0f Mon Sep 17 00:00:00 2001
From: Alexis Williams <alexis@typedr.at>
Date: Fri, 17 Oct 2025 16:49:04 -0700
Subject: [PATCH 0854/6226] fakeredis: 2.30.3 -> 2.32.0

---
 .../python-modules/fakeredis/default.nix           | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix
index 0a475eccd8ec..99893382c7b9 100644
--- a/pkgs/development/python-modules/fakeredis/default.nix
+++ b/pkgs/development/python-modules/fakeredis/default.nix
@@ -14,11 +14,12 @@
   redis,
   redisTestHook,
   sortedcontainers,
+  valkey,
 }:
 
 buildPythonPackage rec {
   pname = "fakeredis";
-  version = "2.30.3";
+  version = "2.32.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -27,7 +28,7 @@ buildPythonPackage rec {
     owner = "dsoftwareinc";
     repo = "fakeredis-py";
     tag = "v${version}";
-    hash = "sha256-SQVLuO5cA+XO7hEBph7XGlnomTcysB3ye9jZ8sy9GAI=";
+    hash = "sha256-esouWM32qe4iO5AcRC0HuUF+lwEDHnyXoknwqsZhr+o=";
   };
 
   build-system = [ hatchling ];
@@ -35,6 +36,7 @@ buildPythonPackage rec {
   dependencies = [
     redis
     sortedcontainers
+    valkey
   ];
 
   optional-dependencies = {
@@ -60,6 +62,14 @@ buildPythonPackage rec {
   disabledTests = [
     "test_init_args" # AttributeError: module 'fakeredis' has no attribute 'FakeValkey'
     "test_async_init_kwargs" # AttributeError: module 'fakeredis' has no attribute 'FakeAsyncValkey'"
+
+    # KeyError: 'tot-mem'
+    "test_acl_log_auth_exist"
+    "test_acl_log_invalid_channel"
+    "test_acl_log_invalid_key"
+    "test_client_id"
+    "test_client_info"
+    "test_client_list"
   ];
 
   preCheck = ''

From 68f71ff8f5c49222b34d5f460ffa1bb5e242d5a8 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 18 Oct 2025 02:28:14 +0100
Subject: [PATCH 0855/6226] darwin.mkAppleDerivation: drop support for `noCC`
 and `noBootstrap`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was only used by `darwin.AvailabilityVersions` setting `noCC`, and
is fundamentally incompatible with `finalAttrs.finalPackage`. Better
would be to specify `stdenv` outside the derivation attributes, or
ideally move this stuff into hooks and helper functions, I think,
but for just the one package it doesn’t seem worthwhile.
---
 .../AvailabilityVersions/package.nix                  |  2 --
 .../apple-source-releases/mkAppleDerivation.nix       | 11 +----------
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix
index 2625f276923e..dadafd43edcb 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/AvailabilityVersions/package.nix
@@ -19,8 +19,6 @@ mkAppleDerivation (finalAttrs: {
     ./patches/0001-Support-setting-an-upper-bound-on-versions.patch
   ];
 
-  noCC = true;
-
   nativeBuildInputs = [ unifdef ];
 
   buildPhase = ''
diff --git a/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix b/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix
index d42357f6b245..538b92d32637 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix
@@ -8,8 +8,6 @@ in
   fetchFromGitHub,
   meson,
   ninja,
-  stdenv,
-  stdenvNoCC,
   xcodeProjectCheckHook,
 }:
 
@@ -21,15 +19,8 @@ lib.makeOverridable (
   let
     attrs' = if lib.isFunction attrs then attrs else _: attrs;
     attrsFixed = lib.fix attrs';
-    stdenv' =
-      if attrsFixed.noCC or false then
-        stdenvNoCC
-      else if attrsFixed.noBootstrap or false then
-        stdenv
-      else
-        bootstrapStdenv;
   in
-  stdenv'.mkDerivation (
+  bootstrapStdenv.mkDerivation (
     lib.extends (
       self: super:
       assert super ? releaseName;

From 442ded4e97ced8442f1154e6151267864e5f7cfe Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 17 Oct 2025 21:48:40 +0100
Subject: [PATCH 0856/6226] darwin.mkAppleDerivation: use
 `lib.extendMkDerivation`

---
 .../mkAppleDerivation.nix                     | 109 ++++++++----------
 1 file changed, 51 insertions(+), 58 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix b/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix
index 538b92d32637..35131914f120 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix
@@ -14,68 +14,61 @@ in
 let
   hasBasenamePrefix = prefix: file: lib.hasPrefix prefix (baseNameOf file);
 in
-lib.makeOverridable (
-  attrs:
-  let
-    attrs' = if lib.isFunction attrs then attrs else _: attrs;
-    attrsFixed = lib.fix attrs';
-  in
-  bootstrapStdenv.mkDerivation (
-    lib.extends (
-      self: super:
-      assert super ? releaseName;
-      let
-        inherit (super) releaseName;
-        info = versions.${releaseName};
-        files = lib.filesystem.listFilesRecursive (lib.path.append ./. releaseName);
-        mesonFiles = lib.filter (hasBasenamePrefix "meson") files;
-      in
-      # You have to have at least `meson.build.in` when using xcodeHash to trigger the Meson
-      # build support in `mkAppleDerivation`.
-      assert super ? xcodeHash -> lib.length mesonFiles > 0;
-      {
-        pname = super.pname or releaseName;
-        inherit (info) version;
+lib.extendMkDerivation {
+  constructDrv = bootstrapStdenv.mkDerivation;
+  extendDrvArgs =
+    self: super:
+    assert super ? releaseName;
+    let
+      inherit (super) releaseName;
+      info = versions.${releaseName};
+      files = lib.filesystem.listFilesRecursive (lib.path.append ./. releaseName);
+      mesonFiles = lib.filter (hasBasenamePrefix "meson") files;
+    in
+    # You have to have at least `meson.build.in` when using xcodeHash to trigger the Meson
+    # build support in `mkAppleDerivation`.
+    assert super ? xcodeHash -> lib.length mesonFiles > 0;
+    {
+      pname = super.pname or releaseName;
+      inherit (info) version;
 
-        src = super.src or fetchFromGitHub {
-          owner = "apple-oss-distributions";
-          repo = releaseName;
-          rev = info.rev or "${releaseName}-${info.version}";
-          inherit (info) hash;
-        };
+      src = super.src or fetchFromGitHub {
+        owner = "apple-oss-distributions";
+        repo = releaseName;
+        rev = info.rev or "${releaseName}-${info.version}";
+        inherit (info) hash;
+      };
 
-        strictDeps = true;
-        __structuredAttrs = true;
+      strictDeps = true;
+      __structuredAttrs = true;
 
-        meta = {
-          homepage = "https://opensource.apple.com/releases/";
-          license = lib.licenses.apple-psl20;
-          teams = [ lib.teams.darwin ];
-          platforms = lib.platforms.darwin;
-        }
-        // super.meta or { };
+      meta = {
+        homepage = "https://opensource.apple.com/releases/";
+        license = lib.licenses.apple-psl20;
+        teams = [ lib.teams.darwin ];
+        platforms = lib.platforms.darwin;
       }
-      // lib.optionalAttrs (super ? xcodeHash) {
-        postUnpack =
-          super.postUnpack or ""
-          + lib.concatMapStrings (
-            file:
-            if baseNameOf file == "meson.build.in" then
-              "substitute ${lib.escapeShellArg "${file}"} \"$sourceRoot/meson.build\" --subst-var version\n"
-            else
-              "cp ${lib.escapeShellArg "${file}"} \"$sourceRoot/\"${lib.escapeShellArg (baseNameOf file)}\n"
-          ) mesonFiles;
+      // super.meta or { };
+    }
+    // lib.optionalAttrs (super ? xcodeHash) {
+      postUnpack =
+        super.postUnpack or ""
+        + lib.concatMapStrings (
+          file:
+          if baseNameOf file == "meson.build.in" then
+            "substitute ${lib.escapeShellArg "${file}"} \"$sourceRoot/meson.build\" --subst-var version\n"
+          else
+            "cp ${lib.escapeShellArg "${file}"} \"$sourceRoot/\"${lib.escapeShellArg (baseNameOf file)}\n"
+        ) mesonFiles;
 
-        xcodeProject = super.xcodeProject or "${releaseName}.xcodeproj";
+      xcodeProject = super.xcodeProject or "${releaseName}.xcodeproj";
 
-        nativeBuildInputs = super.nativeBuildInputs or [ ] ++ [
-          meson
-          ninja
-          xcodeProjectCheckHook
-        ];
+      nativeBuildInputs = super.nativeBuildInputs or [ ] ++ [
+        meson
+        ninja
+        xcodeProjectCheckHook
+      ];
 
-        mesonBuildType = "release";
-      }
-    ) attrs'
-  )
-)
+      mesonBuildType = "release";
+    };
+}

From a7f89aca060a6f96359be62f9fa7b44ae85e4e9f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 18 Oct 2025 02:11:47 +0100
Subject: [PATCH 0857/6226] darwin.mkAppleDerivation: use conventional argument
 names

---
 .../mkAppleDerivation.nix                     | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix b/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix
index 35131914f120..9feabef5265d 100644
--- a/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix
+++ b/pkgs/os-specific/darwin/apple-source-releases/mkAppleDerivation.nix
@@ -17,22 +17,22 @@ in
 lib.extendMkDerivation {
   constructDrv = bootstrapStdenv.mkDerivation;
   extendDrvArgs =
-    self: super:
-    assert super ? releaseName;
+    finalAttrs: args:
+    assert args ? releaseName;
     let
-      inherit (super) releaseName;
+      inherit (args) releaseName;
       info = versions.${releaseName};
       files = lib.filesystem.listFilesRecursive (lib.path.append ./. releaseName);
       mesonFiles = lib.filter (hasBasenamePrefix "meson") files;
     in
     # You have to have at least `meson.build.in` when using xcodeHash to trigger the Meson
     # build support in `mkAppleDerivation`.
-    assert super ? xcodeHash -> lib.length mesonFiles > 0;
+    assert args ? xcodeHash -> lib.length mesonFiles > 0;
     {
-      pname = super.pname or releaseName;
+      pname = args.pname or releaseName;
       inherit (info) version;
 
-      src = super.src or fetchFromGitHub {
+      src = args.src or fetchFromGitHub {
         owner = "apple-oss-distributions";
         repo = releaseName;
         rev = info.rev or "${releaseName}-${info.version}";
@@ -48,11 +48,11 @@ lib.extendMkDerivation {
         teams = [ lib.teams.darwin ];
         platforms = lib.platforms.darwin;
       }
-      // super.meta or { };
+      // args.meta or { };
     }
-    // lib.optionalAttrs (super ? xcodeHash) {
+    // lib.optionalAttrs (args ? xcodeHash) {
       postUnpack =
-        super.postUnpack or ""
+        args.postUnpack or ""
         + lib.concatMapStrings (
           file:
           if baseNameOf file == "meson.build.in" then
@@ -61,9 +61,9 @@ lib.extendMkDerivation {
             "cp ${lib.escapeShellArg "${file}"} \"$sourceRoot/\"${lib.escapeShellArg (baseNameOf file)}\n"
         ) mesonFiles;
 
-      xcodeProject = super.xcodeProject or "${releaseName}.xcodeproj";
+      xcodeProject = args.xcodeProject or "${releaseName}.xcodeproj";
 
-      nativeBuildInputs = super.nativeBuildInputs or [ ] ++ [
+      nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [
         meson
         ninja
         xcodeProjectCheckHook

From 1ecadfe2a997189764a4719cf3e7c1e3bb825b68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 02:06:22 +0000
Subject: [PATCH 0858/6226] httm: 0.48.6 -> 0.49.9

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

diff --git a/pkgs/by-name/ht/httm/package.nix b/pkgs/by-name/ht/httm/package.nix
index 855773eb8328..191c7d3db444 100644
--- a/pkgs/by-name/ht/httm/package.nix
+++ b/pkgs/by-name/ht/httm/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "httm";
-  version = "0.48.6";
+  version = "0.49.9";
 
   src = fetchFromGitHub {
     owner = "kimono-koans";
     repo = "httm";
     rev = version;
-    hash = "sha256-A/4nf5DKGf8IjQvvNSJMONoRmEBul8/RS+e4OLU1VYQ=";
+    hash = "sha256-Y0WYgi/VdGjE70XZcJD7G+ONCSq2YXpX9/RyijPW3kc=";
   };
 
-  cargoHash = "sha256-/iAeR0HmIaoSX03bvTypyvKWgjhfhAzc/ikpiCuXEcs=";
+  cargoHash = "sha256-CSwfwW5ChnvrtN+zl2DdAPHDJCL3RSQHlBT2xWt+KCc=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 88e1756bc9ef9faa4a495f92012c6375d52cde61 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 18 Oct 2025 02:53:06 +0100
Subject: [PATCH 0859/6226] darwin.{ditto,sudo}: drop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These were added in <https://github.com/NixOS/nixpkgs/pull/109626> in
2021, and used to provide the definition of `sudo`. That was reverted
shortly after, in <https://github.com/NixOS/nixpkgs/pull/112006>.

While embedding these paths in the output of a derivation is
potentially legitimate, using them as build inputs to other
derivations is not so much; they won’t work in the sandbox, and
using `sudo(8)` in a build especially doesn’t seem like a great
idea. Using `/usr/bin/ditto` directly along with `sandboxProfile` or
`__impureHostDeps` is a better mechanism than a wrapper package if
a build really needs `ditto(1)`.
---
 .../darwin/impure-cmds/default.nix            | 38 -------------------
 pkgs/top-level/darwin-aliases.nix             |  2 +
 pkgs/top-level/darwin-packages.nix            |  6 +--
 3 files changed, 3 insertions(+), 43 deletions(-)
 delete mode 100644 pkgs/os-specific/darwin/impure-cmds/default.nix

diff --git a/pkgs/os-specific/darwin/impure-cmds/default.nix b/pkgs/os-specific/darwin/impure-cmds/default.nix
deleted file mode 100644
index eac4f6b97fd2..000000000000
--- a/pkgs/os-specific/darwin/impure-cmds/default.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{ lib, runCommandLocal }:
-
-# On darwin, there are some commands neither opensource nor able to build in nixpkgs.
-# We have no choice but to use those system-shipped impure ones.
-
-let
-  commands = {
-    ditto = "/usr/bin/ditto"; # ditto is not opensource
-    sudo = "/usr/bin/sudo"; # sudo must be owned by uid 0 and have the setuid bit set
-  };
-
-  mkImpureDrv =
-    name: path:
-    runCommandLocal "${name}-impure-darwin"
-      {
-        __impureHostDeps = [ path ];
-
-        meta = {
-          platforms = lib.platforms.darwin;
-        };
-      }
-      ''
-        if ! [ -x ${path} ]; then
-          echo Cannot find command ${path}
-          exit 1
-        fi
-
-        mkdir -p $out/bin
-        ln -s ${path} $out/bin
-
-        manpage="/usr/share/man/man1/${name}.1"
-        if [ -f $manpage ]; then
-          mkdir -p $out/share/man/man1
-          ln -s $manpage $out/share/man/man1
-        fi
-      '';
-in
-lib.mapAttrs mkImpureDrv commands
diff --git a/pkgs/top-level/darwin-aliases.nix b/pkgs/top-level/darwin-aliases.nix
index 717f2f58763a..cb0f6d7c6d47 100644
--- a/pkgs/top-level/darwin-aliases.nix
+++ b/pkgs/top-level/darwin-aliases.nix
@@ -116,6 +116,7 @@ stubs
   ### D ###
 
   discrete-scroll = pkgs.discrete-scroll; # added 2024-11-27
+  ditto = throw "'darwin.ditto' has been removed, because it was impure and unused"; # added 2025-10-18
 
   ### I ###
 
@@ -150,5 +151,6 @@ stubs
 
   stdenvNoCF = throw "darwin.stdenvNoCF has been removed; use `stdenv` or `stdenvNoCC`"; # converted to throw 2025-07-29
   stubs = throw "'darwin.stubs.*' have been removed as they were unused"; # added 2025-04-20
+  sudo = throw "'darwin.sudo' has been removed, because it was impure and unused"; # added 2025-10-18
   swift-corelibs-foundation = throw "'darwin.swift-corelibs-foundation' has been removed, as it was broken and is no longer used"; # added 2025-04-20
 }
diff --git a/pkgs/top-level/darwin-packages.nix b/pkgs/top-level/darwin-packages.nix
index 9adaebefedc5..d107ba471187 100644
--- a/pkgs/top-level/darwin-packages.nix
+++ b/pkgs/top-level/darwin-packages.nix
@@ -39,14 +39,10 @@ makeScopeWithSplicing' {
         callPackage = self.callPackage;
         directory = ../os-specific/darwin/apple-source-releases;
       };
-
-      # Must use pkgs.callPackage to avoid infinite recursion.
-      impure-cmds = pkgs.callPackage ../os-specific/darwin/impure-cmds { };
     in
 
     lib.recurseIntoAttrs (
-      impure-cmds
-      // apple-source-packages
+      apple-source-packages
       // {
 
         inherit (self.adv_cmds) ps;

From f95da8eaac7d640a2365c9fda23c7fc4ebae42a7 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sat, 18 Oct 2025 04:01:17 +0000
Subject: [PATCH 0860/6226] rectangle-pro: 3.0.37 -> 3.62

Changelog: https://rectangleapp.com/pro/versions
---
 pkgs/by-name/re/rectangle-pro/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/rectangle-pro/package.nix b/pkgs/by-name/re/rectangle-pro/package.nix
index bbb74cbb57fd..23fc1665feac 100644
--- a/pkgs/by-name/re/rectangle-pro/package.nix
+++ b/pkgs/by-name/re/rectangle-pro/package.nix
@@ -7,11 +7,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rectangle-pro";
-  version = "3.0.37";
+  version = "3.62";
 
   src = fetchurl {
     url = "https://rectangleapp.com/pro/downloads/Rectangle%20Pro%20${finalAttrs.version}.dmg";
-    hash = "sha256-1/guAVppL6AwC9luqPZZscz38U4irN1vyGesN8q2leM=";
+    hash = "sha256-0pJ2vhBaxNRYu40IjlzY4P6LS/TyvxalodcdKV0eqA4=";
   };
 
   sourceRoot = ".";

From 6842e9363e645af40600cd1391838a7381300a3c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 05:01:05 +0000
Subject: [PATCH 0861/6226] go-ethereum: 1.16.3 -> 1.16.5

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

diff --git a/pkgs/by-name/go/go-ethereum/package.nix b/pkgs/by-name/go/go-ethereum/package.nix
index fd3f655978c7..9c6c53173b12 100644
--- a/pkgs/by-name/go/go-ethereum/package.nix
+++ b/pkgs/by-name/go/go-ethereum/package.nix
@@ -15,17 +15,17 @@ let
 in
 buildGoModule rec {
   pname = "go-ethereum";
-  version = "1.16.3";
+  version = "1.16.5";
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "go-ethereum";
     rev = "v${version}";
-    hash = "sha256-9g+RlOnV3DMLkak+RbSm8RgFB14Yuap8CT1w6kuZRv0=";
+    hash = "sha256-f9MBHO3oh1Nh+YI1E8cPPaNRj4T12063YLqTDrdZWWA=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-GEPSkuEdrYvPGXEGhAT3U765rjY6w6kwOVYOMCgOaCo=";
+  vendorHash = "sha256-6tGSyx4OXMXUjhIvLJo+vyRkNzHmwiikzrLL0cQPBLo=";
 
   doCheck = false;
 

From 4beb01a9cb7f3f5c65d0afa950d7a19d31b47118 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sat, 18 Oct 2025 13:05:27 +0800
Subject: [PATCH 0862/6226] radian: 0.6.13 -> 0.6.15

Changelog: https://github.com/randy3k/radian/blob/v0.6.15/CHANGELOG.md
---
 pkgs/by-name/ra/radian/package.nix | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ra/radian/package.nix b/pkgs/by-name/ra/radian/package.nix
index 07b1bc68d156..ede83464621c 100644
--- a/pkgs/by-name/ra/radian/package.nix
+++ b/pkgs/by-name/ra/radian/package.nix
@@ -2,28 +2,24 @@
   lib,
   python3Packages,
   fetchFromGitHub,
-  git,
+  gitMinimal,
   R,
   rPackages,
+  writableTmpDirAsHomeHook,
 }:
 
 python3Packages.buildPythonApplication rec {
   pname = "radian";
-  version = "0.6.13";
+  version = "0.6.15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "randy3k";
     repo = "radian";
     tag = "v${version}";
-    hash = "sha256-gz2VczAgVbvISzvY/v0GvZ/Erv6ipZwPU61r6OJ+3Fo=";
+    hash = "sha256-9dpLQ3QRppvwOw4THASfF8kCkIVZmWLALLRwy1LRPiE=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace '"pytest-runner"' ""
-  '';
-
   build-system = with python3Packages; [
     setuptools
     setuptools-scm
@@ -53,23 +49,25 @@ python3Packages.buildPythonApplication rec {
       ptyprocess
       jedi
     ])
-    ++ [ git ];
+    ++ [
+      gitMinimal
+      writableTmpDirAsHomeHook
+    ];
 
   makeWrapperArgs = [ "--set R_HOME ${R}/lib/R" ];
 
   preCheck = ''
-    export HOME=$TMPDIR
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${R}/lib/R/lib
   '';
 
   pythonImportsCheck = [ "radian" ];
 
-  meta = with lib; {
+  meta = {
     description = "21 century R console";
     mainProgram = "radian";
     homepage = "https://github.com/randy3k/radian";
     changelog = "https://github.com/randy3k/radian/blob/v${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ savyajha ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ savyajha ];
   };
 }

From 4acf339a5d00d020c058528b9f2b4911878a44ab Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sat, 18 Oct 2025 13:01:18 +0800
Subject: [PATCH 0863/6226] raffi: 0.8.2 -> 0.9.0

Diff: https://github.com/chmouel/raffi/compare/v0.8.2...v0.9.0

Changelog: https://github.com/chmouel/raffi/releases/tag/v0.9.0
---
 pkgs/by-name/ra/raffi/package.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ra/raffi/package.nix b/pkgs/by-name/ra/raffi/package.nix
index 815440dd5145..edebe08a30fe 100644
--- a/pkgs/by-name/ra/raffi/package.nix
+++ b/pkgs/by-name/ra/raffi/package.nix
@@ -7,23 +7,25 @@
   additionalPrograms ? [ ],
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "raffi";
-  version = "0.8.2";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "chmouel";
     repo = "raffi";
-    rev = "v${version}";
-    hash = "sha256-97gZZp2taX800Izhya4mYzS4PtCNCBbRnrn6cm1w8zY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-k0NJEv76f33yd+mtCJ7bxzaT3UAn0TOaLC/HlzEXUyo=";
   };
 
-  cargoHash = "sha256-1n0JQdeExszuGFbpkBRT44eMov/x3BrIeofObdPNNdU=";
+  cargoHash = "sha256-udXVIV6qDmpLR2QNF+/h69WNGbe7QRDD5YWQ3Sl5Ol0=";
 
   nativeBuildInputs = [
     makeBinaryWrapper
   ];
 
+  checkFlags = [ "--skip=tests::test_read_config_from_reader" ];
+
   postFixup = ''
     wrapProgram $out/bin/raffi \
       --prefix PATH : ${lib.makeBinPath ([ fuzzel ] ++ additionalPrograms)}
@@ -32,10 +34,10 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Fuzzel launcher based on yaml configuration";
     homepage = "https://github.com/chmouel/raffi";
-    changelog = "https://github.com/chmouel/raffi/releases/tag/v${version}";
+    changelog = "https://github.com/chmouel/raffi/releases/tag/v${finalAttrs.version}";
     license = with lib.licenses; [ asl20 ];
     maintainers = with lib.maintainers; [ aos ];
     mainProgram = "raffi";
     platforms = lib.platforms.linux;
   };
-}
+})

From 00d247dcfc683f0b10db0de8ee009ff6998d8b5e Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sat, 18 Oct 2025 01:24:53 -0400
Subject: [PATCH 0864/6226] vangers: fix build for cmake 4

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

diff --git a/pkgs/by-name/va/vangers/package.nix b/pkgs/by-name/va/vangers/package.nix
index 0143ae4261b9..eb17bb7618c9 100644
--- a/pkgs/by-name/va/vangers/package.nix
+++ b/pkgs/by-name/va/vangers/package.nix
@@ -26,6 +26,12 @@ stdenv.mkDerivation {
     hash = "sha256-IhCQh60wBzaRsj72Y8NUHrv9lvss0fmgHjzrO/subOI=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0)" \
+      "CMAKE_MINIMUM_REQUIRED(VERSION 4.0)"
+  '';
+
   buildInputs = [
     SDL2
     SDL2_net

From 9b4585dea5e5d96fb818bb3f3caec24033e9c0db Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sat, 18 Oct 2025 01:27:55 -0400
Subject: [PATCH 0865/6226] vangers: modernize

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/va/vangers/package.nix | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/va/vangers/package.nix b/pkgs/by-name/va/vangers/package.nix
index eb17bb7618c9..b4a06d427bca 100644
--- a/pkgs/by-name/va/vangers/package.nix
+++ b/pkgs/by-name/va/vangers/package.nix
@@ -4,6 +4,7 @@
   callPackage,
   stdenv,
   cmake,
+  installShellFiles,
   SDL2,
   SDL2_net,
   libogg,
@@ -32,6 +33,8 @@ stdenv.mkDerivation {
       "CMAKE_MINIMUM_REQUIRED(VERSION 4.0)"
   '';
 
+  strictDeps = true;
+
   buildInputs = [
     SDL2
     SDL2_net
@@ -41,13 +44,20 @@ stdenv.mkDerivation {
     clunk
     zlib
   ];
-  nativeBuildInputs = [ cmake ];
+
+  nativeBuildInputs = [
+    cmake
+    installShellFiles
+  ];
 
   installPhase = ''
-    mkdir -p $out/bin
-    install -T -m755 server/vangers_server $out/bin/vangers_server
-    install -T -m755 src/vangers $out/bin/vangers
-    install -T -m755 surmap/surmap $out/bin/surmap
+    runHook preInstall
+
+    installBin server/vangers_server
+    installBin src/vangers
+    installBin surmap/surmap
+
+    runHook postInstall
   '';
 
   meta = {

From 1cdf4ba1c81820e16043bf21f26423b434f68e98 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sat, 18 Oct 2025 15:00:59 +0900
Subject: [PATCH 0866/6226] treewide: ensure `ExecReload` kill fields has
 absolute path

---
 nixos/modules/services/networking/opengfw.nix         | 2 +-
 nixos/modules/services/web-apps/open-web-calendar.nix | 2 +-
 nixos/modules/services/web-apps/weblate.nix           | 2 +-
 nixos/modules/virtualisation/cri-o.nix                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/opengfw.nix b/nixos/modules/services/networking/opengfw.nix
index 3cb1e9c63d7d..4b92a230842d 100644
--- a/nixos/modules/services/networking/opengfw.nix
+++ b/nixos/modules/services/networking/opengfw.nix
@@ -390,7 +390,7 @@ in
 
         serviceConfig = rec {
           WorkingDirectory = cfg.dir;
-          ExecReload = "kill -HUP $MAINPID";
+          ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -HUP $MAINPID";
           Restart = "always";
           User = cfg.user;
           StandardOutput = mkIf (cfg.logFile != null) "append:${cfg.logFile}";
diff --git a/nixos/modules/services/web-apps/open-web-calendar.nix b/nixos/modules/services/web-apps/open-web-calendar.nix
index 525c9eb8c28c..f136ef8b75f5 100644
--- a/nixos/modules/services/web-apps/open-web-calendar.nix
+++ b/nixos/modules/services/web-apps/open-web-calendar.nix
@@ -130,7 +130,7 @@ in
             open_web_calendar.app:app
         '';
         EnvironmentFile = settingsFormat.generate "open-web-calendar.env" cfg.settings;
-        ExecReload = "kill -s HUP $MAINPID";
+        ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -s HUP $MAINPID";
         KillMode = "mixed";
         PrivateTmp = true;
         RuntimeDirectory = "open-web-calendar";
diff --git a/nixos/modules/services/web-apps/weblate.nix b/nixos/modules/services/web-apps/weblate.nix
index 17c470ffaf99..36346ab5e012 100644
--- a/nixos/modules/services/web-apps/weblate.nix
+++ b/nixos/modules/services/web-apps/weblate.nix
@@ -374,7 +374,7 @@ in
               --bind='unix:///run/weblate.socket' \
               weblate.wsgi
           '';
-        ExecReload = "kill -s HUP $MAINPID";
+        ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -s HUP $MAINPID";
         KillMode = "mixed";
         PrivateTmp = true;
         WorkingDirectory = dataDir;
diff --git a/nixos/modules/virtualisation/cri-o.nix b/nixos/modules/virtualisation/cri-o.nix
index 973bccc83891..ddaccf8199a1 100644
--- a/nixos/modules/virtualisation/cri-o.nix
+++ b/nixos/modules/virtualisation/cri-o.nix
@@ -166,7 +166,7 @@ in
       serviceConfig = {
         Type = "notify";
         ExecStart = "${cfg.package}/bin/crio";
-        ExecReload = "/bin/kill -s HUP $MAINPID";
+        ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -s HUP $MAINPID";
         TasksMax = "infinity";
         LimitNOFILE = "1048576";
         LimitNPROC = "1048576";

From 75de7cb4cfbbf1c5d7a9e2f808e3b68116bd73f2 Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Sat, 18 Oct 2025 16:44:10 +0900
Subject: [PATCH 0867/6226] zsync2: 2.0.0-alpha-1-20230304 ->
 2.0.0-alpha-1-20250926

* This update also fixes the cmake 4 issue outlined in
  https://github.com/nixos/nixpkgs/issues/445447.
---
 pkgs/by-name/zs/zsync2/package.nix | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/zs/zsync2/package.nix b/pkgs/by-name/zs/zsync2/package.nix
index c39eee9baa76..ead4189ad33a 100644
--- a/pkgs/by-name/zs/zsync2/package.nix
+++ b/pkgs/by-name/zs/zsync2/package.nix
@@ -2,33 +2,24 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   pkg-config,
   libgcrypt,
   libcpr,
   libargs,
+  zlib,
 }:
-
 stdenv.mkDerivation (finalAttrs: {
   pname = "zsync2";
-  version = "2.0.0-alpha-1-20230304";
+  version = "2.0.0-alpha-1-20250926";
 
   src = fetchFromGitHub {
     owner = "AppImageCommunity";
     repo = "zsync2";
     rev = finalAttrs.version;
-    hash = "sha256-OCeMEXQmbc34MZ1NyOfAASdrUyeSQqqfvWqAszJN4x0=";
+    hash = "sha256-dbIe47cDaQJAOiHcLRwEbLgvrDUHOnPkYqDbkX74gZk=";
   };
 
-  patches = [
-    # Add missing cstdint includes
-    (fetchpatch {
-      url = "https://github.com/AppImageCommunity/zsync2/commit/e57e1fce68194fa920542fd334488de5123e4832.patch";
-      hash = "sha256-iLXxD6v+pSwFKmwAEyzbYUJ3DmtpvV/DYr8kcD+t5Cg=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace CMakeLists.txt \
       --replace-fail 'VERSION "2.0.0-alpha-1"' 'VERSION "${finalAttrs.version}"' \
@@ -46,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     libgcrypt
     libcpr
     libargs
+    zlib
   ];
 
   cmakeFlags = [
@@ -53,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "USE_SYSTEM_ARGS" true)
   ];
 
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+  env.NIX_CFLAGS_COMPILE = "-lz -Wno-error=incompatible-pointer-types";
 
   meta = {
     description = "Rewrite of the advanced file download/sync tool zsync";

From fa311c7bb99ad70525f2a9c31bd3bddbad57b286 Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Sat, 18 Oct 2025 17:05:30 +0900
Subject: [PATCH 0868/6226] openambit: fix build with cmake-4

* As noted in https://github.com/nixos/nixpkgs/issues/445447.
---
 pkgs/applications/misc/openambit/default.nix | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/misc/openambit/default.nix b/pkgs/applications/misc/openambit/default.nix
index cfdbd309ba45..4c27e2d95981 100644
--- a/pkgs/applications/misc/openambit/default.nix
+++ b/pkgs/applications/misc/openambit/default.nix
@@ -11,7 +11,6 @@
   udev,
   zlib,
 }:
-
 mkDerivation rec {
   pname = "openambit";
   version = "0.5";
@@ -33,6 +32,20 @@ mkDerivation rec {
     })
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 'cmake_minimum_required(VERSION 3.0)' 'cmake_minimum_required(VERSION 3.10)'
+
+    substituteInPlace src/libambit/CMakeLists.txt \
+      --replace-fail 'cmake_minimum_required (VERSION 3.1.3)' 'cmake_minimum_required(VERSION 3.10)'
+
+    substituteInPlace src/movescount/CMakeLists.txt \
+      --replace-fail 'cmake_minimum_required(VERSION 2.8.5)' 'cmake_minimum_required(VERSION 3.10)'
+
+    substituteInPlace src/openambit/CMakeLists.txt \
+      --replace-fail 'cmake_minimum_required(VERSION 2.8.5)' 'cmake_minimum_required(VERSION 3.10)'
+  '';
+
   nativeBuildInputs = [
     cmake
     qttools

From 17496ddbb7529f57f06fa6ee1487dde87c54a24d Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Sat, 18 Oct 2025 17:29:06 +0900
Subject: [PATCH 0869/6226] enyo-launcher: 2.0.6 -> 2.0.7

* This also fixes the build issue with cmake 4, as noted in
  https://github.com/nixos/nixpkgs/issues/445447.
---
 .../doom-ports/enyo-launcher/default.nix      | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/games/doom-ports/enyo-launcher/default.nix b/pkgs/games/doom-ports/enyo-launcher/default.nix
index b8e38af270aa..7db29bca5f6a 100644
--- a/pkgs/games/doom-ports/enyo-launcher/default.nix
+++ b/pkgs/games/doom-ports/enyo-launcher/default.nix
@@ -1,25 +1,26 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitLab,
   cmake,
-  qtbase,
+  qt6,
 }:
-
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "enyo-launcher";
-  version = "2.0.6";
+  version = "2.0.7";
 
   src = fetchFromGitLab {
     owner = "sdcofer70";
     repo = "enyo-launcher";
     rev = version;
-    hash = "sha256-k6Stc1tQOcdS//j+bFUNfnOUlwuhIPKxf9DHU+ng164=";
+    hash = "sha256-Ig1b+JylRlxhl5k5ys9SOGMYw3eUxXyoVXt3YNeWNqI=";
   };
 
-  nativeBuildInputs = [ cmake ];
-
-  buildInputs = [ qtbase ];
+  nativeBuildInputs = [
+    cmake
+    qt6.wrapQtAppsHook
+  ];
+  buildInputs = [ qt6.qtbase ];
 
   meta = {
     homepage = "https://gitlab.com/sdcofer70/enyo-launcher";

From 00984e968eb499cd71feedd91f8640bb367e6645 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Sat, 18 Oct 2025 11:45:02 +0200
Subject: [PATCH 0870/6226] pgadmin: 9.8 -> 9.9

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 pkgs/by-name/pg/pgadmin4/missing-hashes.json | 44 ++++++++++----------
 pkgs/by-name/pg/pgadmin4/package.nix         | 20 +++++++--
 2 files changed, 39 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/pg/pgadmin4/missing-hashes.json b/pkgs/by-name/pg/pgadmin4/missing-hashes.json
index ad60429537cd..bfe2a66960c2 100644
--- a/pkgs/by-name/pg/pgadmin4/missing-hashes.json
+++ b/pkgs/by-name/pg/pgadmin4/missing-hashes.json
@@ -1,26 +1,26 @@
 {
-  "@img/sharp-darwin-arm64@npm:0.34.3": "c5ed848f3cecaced50be6d1805cfb23586299f119a9917880c3f590b7ddd54b930e493c73480d13452503101168f92a0dc85ccc5b19b330470a5fe69e1fcf206",
-  "@img/sharp-darwin-x64@npm:0.34.3": "7e892ca052c8eb9002fb6e86e0a7893aff909e0f203f6ada7a67f4ca7e189631203189700a498ab3401280f5c042f5b08c3f7bc713192a97228864e9c4527743",
-  "@img/sharp-libvips-darwin-arm64@npm:1.2.0": "35d0d475da11fdfd7f5b5f7f1de4376ac04de6d6e0879833f71b2fa305b9d58c96ee464cf234060506ef9b1e2eabe5c09c302e818f8899b2ced1fcb7f85c01eb",
-  "@img/sharp-libvips-darwin-x64@npm:1.2.0": "e853f3b8a19d815af553b703e1d6d70abec525c61f3f19cc8a9d50d3749bc563b7f255307709b7c0836f76b110948489d3a9a3932d2fbc1775a083a56979bf56",
-  "@img/sharp-libvips-linux-arm64@npm:1.2.0": "ec53e3e62c9351e28ea0e4c26a1d8ab257ac003e8184b1757b79c2a240baecec2452e0dbca08c8227fd01c498801c428230261fdb86198e873e07347d741c3c7",
-  "@img/sharp-libvips-linux-arm@npm:1.2.0": "a2f9822cb2ac5b315f2a02c59ebdb235f6c45251207795f83f1a92db696a9deced882dc752bdddd1eab98da5d7d1d1e9968ae142313ff09960b7ae30b760ba07",
-  "@img/sharp-libvips-linux-ppc64@npm:1.2.0": "e90e1c46e6020f3a96562dd526549af2fabff46a1576f2e7af003be4b5efeb6fc8caa8e303e2eeb58129c938be31e0bf067736072479f2298152230cecd5fce4",
-  "@img/sharp-libvips-linux-s390x@npm:1.2.0": "2cf62c8b285effd3a3ec8854bc5fd78af162459294a6d9847af33d6bdeacfbad81cb0bec68b76889b148306a8a28492b4d44e6c96b778d0879349180191d758d",
-  "@img/sharp-libvips-linux-x64@npm:1.2.0": "ca342d07d1f0d22559f26bdcc0354f87a845ef19c69c22e37d9e23d71de15159f50d01183e8e7ea75e0ccfb6c7be9406741414a1f3534ec4aba10e51f0d7dffd",
-  "@img/sharp-libvips-linuxmusl-arm64@npm:1.2.0": "aa248f0c8602b0a17fdb5c1b00ce7dbb09f05b94a45ee7f226eaebfa459d4ee3fd407c62244902e15699927943c511a7fe045b575185ecc9b585987b64ae6cb1",
-  "@img/sharp-libvips-linuxmusl-x64@npm:1.2.0": "811071647c5129a1ead1e54b8f4672061bbbc1177d1d49127c755848e81f21bcbf5bf438c0e53118e731be5e000235904de3b5cf305053de015b56609a059371",
-  "@img/sharp-linux-arm64@npm:0.34.3": "3e8d53f54789b3d98dc14bf696917ff50f8c8c355aedc0dc90890ca764259bafec7390eabe262ce843eab8b74e0c128858128ce614e0b85dcba28d6b9ce3ea3f",
-  "@img/sharp-linux-arm@npm:0.34.3": "563c48ee129e5f3c6afed71ffba9c79a4369e7967e7b3a4a97d9b1e5aefa511873d3cd7a568ec42cd5968ea76f89ab93ee65c1363170af50559b620bfdb89d5b",
-  "@img/sharp-linux-ppc64@npm:0.34.3": "5973f8c522f33f826efff4052e253ec554882db54421a00f2636594e9ccc27e16dfb865f8de101678cb07b1a2d31b516ce4a88b65132ecc1101d07b6cc1bd571",
-  "@img/sharp-linux-s390x@npm:0.34.3": "284d2fcd9cc297b27ec135b0c63d5a6170cb17be378d92c75ec19b6034e7ed5801cab04ca17d445a80b073d67c4f9fe809334f5d4edf533c2d81d66d5d882ef3",
-  "@img/sharp-linux-x64@npm:0.34.3": "a370c04ca6d4145e6d6529d84b133d80e88d408e4483ba168e5993e5b4c0cbd2db57d4e53aca0bfa43320b571ff8bd70c22d8d7f5fadb5e5df1ded91393ae71d",
-  "@img/sharp-linuxmusl-arm64@npm:0.34.3": "c63d8afda1a7d4810bdc19473b6235313d923f8763a8dfc182465b63b8e4805769a9e92a8b2136f0235e07ae1b1ab63adfa904bb833d64f0495108dfc180a475",
-  "@img/sharp-linuxmusl-x64@npm:0.34.3": "9500e8f5d0ab96395a8d522920f25d4376d928ec58e88b3a5dbce5249c26efec046d20845bee8e9233fbff5287cfa979cfc079bc608342d257a6827be6cc0322",
-  "@img/sharp-wasm32@npm:0.34.3": "840dd97d3151b2189c3d0ee0746c139cbdd0441d5d5dfc87d2dd9970fc2c5448a3815c3110c64009998d165ca6dc7b5d58811b98b2c1e4ab0a1eb5ad97275f1e",
-  "@img/sharp-win32-arm64@npm:0.34.3": "adc7d18a8334ca1fea09c877dc9493e75a9018f73dc63038c8ccef7535a272c0aa3c2a9867a49a223703747149fb1fe57ef8580dd6098f0f33c602a876a48e1b",
-  "@img/sharp-win32-ia32@npm:0.34.3": "eef220adf1240429f72d9a9aadc22ccb741889785fa025396cfed41603364990b5f3841cee4d60525b22e65f36c7416297581300c873268fe2b7bb67087ada73",
-  "@img/sharp-win32-x64@npm:0.34.3": "5a5d2624bea7a31393b5a89738ad22a2b020a67f5e5b9eb40063510b514e8516b0fb4e320ff9eb1d32fa2ee3b4c3a0387333d051da28d93957116cbbd63b5fe0",
+  "@img/sharp-darwin-arm64@npm:0.34.4": "43ac812bf5fb459f119f1a723166e914b0f285cf5a90c4d67bbe649b8f3028d6488fd2e3d1c253ab2fac41fdc50844fd525588ba0fc4513eab27b8f8a6c44b0d",
+  "@img/sharp-darwin-x64@npm:0.34.4": "e305f46134463844415f66d51940436a0017dbaea7f41b975f858d84d8d760d44c7c7418332c53ef2a199cc30268d3480cd03ae146d77b69355814f77984f1a9",
+  "@img/sharp-libvips-darwin-arm64@npm:1.2.3": "7d12bfb6a5a7d9a08b429996f9bcbe26b916abf383660e9f4a563eb4043cfd7c81bc2e098d392ef849469db784fbd2ec0f5cb77196f6751f754cc5e9c9dfe26b",
+  "@img/sharp-libvips-darwin-x64@npm:1.2.3": "72b155a5a84ea90c03f861ef0388038bd283c8884694a46620b284ca8daa91a2bf2170d352972bbd4238fa7ffe54f75f5305d960e74c2594a25040c73eaa8e3b",
+  "@img/sharp-libvips-linux-arm64@npm:1.2.3": "ad294d5736174b4e654ab1c0e2f4259828cafd5355ce48a66bbffe551b2d28ec36501a1f8756403e8b224c732bf2bf1ddde4879f595c7a71d24041064584c763",
+  "@img/sharp-libvips-linux-arm@npm:1.2.3": "e7d1b2fa70b92d1bfa5fc96a1caf44fb9148ff968614ef7c2580e7afc6b934f1959baa73c8b1d1928cd44d0e0f6ce80da53876ceea305178819149068614fc96",
+  "@img/sharp-libvips-linux-ppc64@npm:1.2.3": "d19699afba86ab6cbb341a94de26f42ed7a4fa49a63c04cde1a0b5083c763f6d44d3c776ce44418e23d2baf54fb938ee1cb9c801d08af983d953e374416a25cf",
+  "@img/sharp-libvips-linux-s390x@npm:1.2.3": "cac0cb0435dbe3a14f9a16e600ad578b6ec0eb31ea11e57bac1e2d04aa0cb48abe6784924fd93dd1f369d6b2066767666dfa16cc1d0f1b39f8cf3e04f8279391",
+  "@img/sharp-libvips-linux-x64@npm:1.2.3": "71b34ce6b907503350610be0a7bd6f6508af88e9c6580b9ade4e6e4e682d46777302f3dfa2dece87c1ebfb6dde35a90fa9cb8028f7beb4b74a6ece3a5e4bfeff",
+  "@img/sharp-libvips-linuxmusl-arm64@npm:1.2.3": "8d11423632b7ce6237604258609aa2bfcf0b1c13f3680260b37c5633a417ed9160c22b34e285a8bf34073ccd3d3a12ff2c1f3523eee45be2a7ff9ea6c77ccf05",
+  "@img/sharp-libvips-linuxmusl-x64@npm:1.2.3": "a71df40da0f563450ba15c5e1b32fa6ac648243aecf435dd2dd063d9d9b886eda38e33446465d5a600b98fcc6bac130e322d88504c16d1f452746c20a2910dbd",
+  "@img/sharp-linux-arm64@npm:0.34.4": "a2480a94b8b55c55f000e5d21d0d0413f4db16c9b7fbed431936f996d13a6f38214a4f04f016a89171c07fd995650483bc3ba0caaa204abddcd644bbf47d850f",
+  "@img/sharp-linux-arm@npm:0.34.4": "232ac951134af96d3c3a862db40639f174afe26b4d589fe97374d03d215237b99defbbfc7210af7a711893c881fc152032c32fd841afca05c493f127d0e6f7ca",
+  "@img/sharp-linux-ppc64@npm:0.34.4": "b872204fe0f3684a27a2931d3aef306837012f2a52225e057a1e28828c0c0668e21306e2dd1e459d2e91146ddac44b34ec59a10d446e4212ed667b859a424a43",
+  "@img/sharp-linux-s390x@npm:0.34.4": "f621a97fa238d54ad6db42ab14beba8605ee3335da06e1a72125bd2697dc363a66167c6191d9c0f2621cfed170528e131349992689ffcf6dd7ee387e16513c4a",
+  "@img/sharp-linux-x64@npm:0.34.4": "64dc5c8ee5432036428ade596b9daaa17ac343303d8b40f7e53e1253f9b598a55a1928b89b1d77ac54fc4a1cb871c472264d3bd36bdbc6828cc51b079a4d7080",
+  "@img/sharp-linuxmusl-arm64@npm:0.34.4": "8b555d30463f8312f44a15a528cbc9493a21925ee748519926cbf4157c752c5d4f23bed78d66fb4dbc3206e07fc0ce4a96d2aab709fd8fffe4568e89d3882706",
+  "@img/sharp-linuxmusl-x64@npm:0.34.4": "0bbcd14be148b629b483a38461d42276cf48b4f469bffa7319860abb636f12bb65a33d8e50590b659665293e1eff12bafd71256b36c137d78327422197b8dae9",
+  "@img/sharp-wasm32@npm:0.34.4": "e6b03a6339504592aaa645cc8a8471488e816672c255108c04ec0df802647a75b505fac229b72db3120beb6714ff763c49af6df26d2842d36a8a6a4731590024",
+  "@img/sharp-win32-arm64@npm:0.34.4": "e79bd3184c798d7623afb045ba49846e02355b8c589abf62f67c63cd341912e17cb799ba0f61bc59e3583f4c42e1f1ca860c97c6093d36d9be4be6a9dcaa8095",
+  "@img/sharp-win32-ia32@npm:0.34.4": "0d8cbd0419cf7671875491922ee0e3af11592ac234eb370688342e3f245cd98f54d029c323f9c48fee357f8b5de12c4155427805f28cebe2d87928006fb99b36",
+  "@img/sharp-win32-x64@npm:0.34.4": "6185e60fe69290d1a1c828f5540215e9b8f171f93623f3e7498c1dbb0c5d27a8bc989b57ade72a88eff1b7c48423fcc8a96b1680c2794b02fa3d157ffb49dcc8",
   "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "04dd38b694c1680bfec192b499e188700398a414886a08a8a7c72815db56ac147df03d88c73ff6fff7ac3e0a01dc41978054b3622b49463e0d684c5168557fcc",
   "@unrs/resolver-binding-android-arm64@npm:1.11.1": "763626adc34dd2b4af677b5ced6493e7b2b1935351a5c9137f1c9561d11faf97b94015e6876e57e85c33ff563564314c92c0882a4780a57f2225cbbd779a695d",
   "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "03b477fdfec55dbabe488fe0962417bddaa38b028d2670053469f1d24163907b097aac15b565f6974449bee398a38d5e3e1525f2b515ce57e243149021b7aa2f",
diff --git a/pkgs/by-name/pg/pgadmin4/package.nix b/pkgs/by-name/pg/pgadmin4/package.nix
index adf9b1543aea..f9894e25a9da 100644
--- a/pkgs/by-name/pg/pgadmin4/package.nix
+++ b/pkgs/by-name/pg/pgadmin4/package.nix
@@ -20,14 +20,14 @@
 
 let
   pname = "pgadmin";
-  version = "9.8";
-  yarnHash = "sha256-NvQlrDXn9sa4MpytFYPsC4bKO8Thx/MuqG8M6VIa2ig=";
+  version = "9.9";
+  yarnHash = "sha256-QInOfpgQgx4i/gTyWG40Sl7Me5ynC/nOfjik82ltwLM=";
 
   src = fetchFromGitHub {
     owner = "pgadmin-org";
     repo = "pgadmin4";
     rev = "REL-${lib.versions.major version}_${lib.versions.minor version}";
-    hash = "sha256-gnVrMuxWV7lAol1gyONbhtuUL4EEOfOPkRUM2esMgi0=";
+    hash = "sha256-XzjotJt02mZ0Se/bZMqAl8KL6egIVqqkbiEdcRuHcuE=";
   };
 
   # keep the scope, as it is used throughout the derivation and tests
@@ -219,6 +219,8 @@ pythonPackages.buildPythonApplication rec {
   # sandboxing issues on aarch64-darwin, see https://github.com/NixOS/nixpkgs/issues/198495
   doCheck = !postgresqlTestHook.meta.broken;
 
+  # for replication testing in regression tests for PostgreSql >= 17
+  env.postgresqlExtraSettings = "wal_level = logical";
   checkPhase = ''
     runHook preCheck
 
@@ -236,6 +238,18 @@ pythonPackages.buildPythonApplication rec {
     substituteInPlace regression/test_config.json --replace-fail "localhost" "$PGHOST"
     substituteInPlace regression/runtests.py --replace-fail "builtins.SERVER_MODE = None" "builtins.SERVER_MODE = False"
 
+    # test cases hardcode ports and host in subscription replication tests
+    for files in pgadmin/browser/server_groups/servers/databases/subscriptions/tests/17_plus/*
+    do
+      substituteInPlace $files --replace-quiet "5917" "5432"
+      substituteInPlace $files --replace-quiet "localhost" "$PGHOST"
+    done
+    for files in pgadmin/browser/server_groups/servers/databases/subscriptions/tests/18_plus/*
+    do
+      substituteInPlace $files --replace-quiet "5434" "5432"
+      substituteInPlace $files --replace-quiet "localhost" "$PGHOST"
+    done
+
     ## Browser test ##
     python regression/runtests.py --pkg browser --exclude ${skippedTests}
 

From aa6072f8a6f0dee0a36be7b3bedf010be2ea35f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 09:59:36 +0000
Subject: [PATCH 0871/6226] albert: 0.32.1 -> 33.0.1

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

diff --git a/pkgs/by-name/al/albert/package.nix b/pkgs/by-name/al/albert/package.nix
index 3ad42236da59..e6a9f06ee7eb 100644
--- a/pkgs/by-name/al/albert/package.nix
+++ b/pkgs/by-name/al/albert/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "albert";
-  version = "0.32.1";
+  version = "33.0.1";
 
   src = fetchFromGitHub {
     owner = "albertlauncher";
     repo = "albert";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-v2SMY0KGFwwybsiMu1W1wBWdyoDEFF3hWd4LeaT8Nts=";
+    hash = "sha256-zHLyvFzLR7Ryk6eoD+Lp+w4bIj7MAeREK0YzRXYnx6c=";
     fetchSubmodules = true;
   };
 

From b5012be0584634f0823c764a95a1e5150b1e895e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Thu, 16 Oct 2025 12:57:26 +0200
Subject: [PATCH 0872/6226] crystal_1_18: init at 1.18.1

---
 pkgs/development/compilers/crystal/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 367a08aa87cb..53d51fb3e810 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -325,5 +325,13 @@ rec {
     doCheck = false;
   };
 
-  crystal = crystal_1_16;
+  crystal_1_18 = generic {
+    version = "1.18.1";
+    sha256 = "sha256-6bJnonQyPtWIl1ex1tw3QercDl4ZQcvuVNYiWzMpGZ0=";
+    binary = binaryCrystal_1_10;
+    llvmPackages = llvmPackages_21;
+    doCheck = false;
+  };
+
+  crystal = crystal_1_18;
 }

From c704ac02d881640919c4be1032e7176c288798a3 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 18 Oct 2025 14:16:06 +0200
Subject: [PATCH 0873/6226] previewqt: fix build

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

diff --git a/pkgs/by-name/pr/previewqt/package.nix b/pkgs/by-name/pr/previewqt/package.nix
index cf11c5a3b3aa..ce17ed00c8b3 100644
--- a/pkgs/by-name/pr/previewqt/package.nix
+++ b/pkgs/by-name/pr/previewqt/package.nix
@@ -54,6 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
 
   cmakeFlags = [
+    (lib.cmakeBool "WITH_DEVIL" false)
     (lib.cmakeBool "WITH_FREEIMAGE" false)
   ];
 

From 4ff8ad3a145bf64fc7e9c0869f825ba35a591a42 Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sat, 18 Oct 2025 14:18:45 +0200
Subject: [PATCH 0874/6226] wine-staging: 10.16 -> 10.17

wine-mono: 10.2.0 -> 10.3.0
---
 pkgs/applications/emulators/wine/sources.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix
index 5759fee637a8..d253fc5e1235 100644
--- a/pkgs/applications/emulators/wine/sources.nix
+++ b/pkgs/applications/emulators/wine/sources.nix
@@ -133,9 +133,9 @@ rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the hash for staging as well.
-    version = "10.16";
+    version = "10.17";
     url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz";
-    hash = "sha256-xe0nQr/yCMY7AFvPuRovxsxJr2xmlbyMDPD+b02mBEY=";
+    hash = "sha256-u/jn3jLOqf4wU2HUr4XjBJIlTEvwIDnuJtrHpmcBtOY=";
 
     patches = [
       # Also look for root certificates at $NIX_SSL_CERT_FILE
@@ -145,7 +145,7 @@ rec {
     # see https://gitlab.winehq.org/wine/wine-staging
     staging = fetchFromGitLab {
       inherit version;
-      hash = "sha256-XknbKTQtIS0J6L/k3dEFQbxEIEYAdToVpigwISZX+ts=";
+      hash = "sha256-fTEzj3o7A9H9jIh3yhw8SCfNsnVeJ6pyL3jERqhVbr8=";
       domain = "gitlab.winehq.org";
       owner = "wine";
       repo = "wine-staging";
@@ -168,9 +168,9 @@ rec {
 
     ## see http://wiki.winehq.org/Mono
     mono = fetchurl rec {
-      version = "10.2.0";
+      version = "10.3.0";
       url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi";
-      hash = "sha256-Th7T8C6S0FMTPQPd++/PbbSk3CMamu0zZ7FxF6iIR9g=";
+      hash = "sha256-zs5cYxgAlN/98B0PvjYqS2BuUoC5jN/RuFaM35tXL5g=";
     };
 
     updateScript = writeShellScript "update-wine-unstable" ''

From 49249eceb500b7688f6fd07287780572e3eb6438 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 12:25:01 +0000
Subject: [PATCH 0875/6226] cloudlog: 2.7.1 -> 2.7.5

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

diff --git a/pkgs/by-name/cl/cloudlog/package.nix b/pkgs/by-name/cl/cloudlog/package.nix
index e930b812b59a..ac2d3346ef86 100644
--- a/pkgs/by-name/cl/cloudlog/package.nix
+++ b/pkgs/by-name/cl/cloudlog/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "cloudlog";
-  version = "2.7.1";
+  version = "2.7.5";
 
   src = fetchFromGitHub {
     owner = "magicbug";
     repo = "Cloudlog";
     rev = version;
-    hash = "sha256-My0z4MW/9O0+ErIh7SEWU3KGJ4UQDmhwJICtBgQ4+q8=";
+    hash = "sha256-Lb20SrwFQybMNmxgmztAm2/9PBcukgt03W93C743oM8=";
   };
 
   postPatch = ''

From 114875cf07ef5498cb525371ded75ab106ebaea9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 12:26:50 +0000
Subject: [PATCH 0876/6226] groovy: 5.0.1 -> 5.0.2

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

diff --git a/pkgs/by-name/gr/groovy/package.nix b/pkgs/by-name/gr/groovy/package.nix
index f42e3044250e..d61f411f2fb9 100644
--- a/pkgs/by-name/gr/groovy/package.nix
+++ b/pkgs/by-name/gr/groovy/package.nix
@@ -15,11 +15,11 @@
 
 stdenv.mkDerivation rec {
   pname = "groovy";
-  version = "5.0.1";
+  version = "5.0.2";
 
   src = fetchurl {
     url = "mirror://apache/groovy/${version}/distribution/apache-groovy-binary-${version}.zip";
-    sha256 = "sha256-vmahfzT2n0c7I5WOvuB3Doiq9zXXm6liRUN1w40oVKU=";
+    sha256 = "sha256-cPgvEbG3ZOIH3PVWiILHjcdyk/MHgWJCOUo/enTyDoE=";
   };
 
   nativeBuildInputs = [

From 6f4b5b0b0915c03ea913b6c58b50b3acaed5d680 Mon Sep 17 00:00:00 2001
From: jasonxue <jason@xuechunxi.com>
Date: Sat, 18 Oct 2025 19:37:06 +0800
Subject: [PATCH 0877/6226] yaml-language-server: 1.18.0 -> 1.19.2

---
 .../ya/yaml-language-server/package.nix       | 29 ++++---------------
 1 file changed, 5 insertions(+), 24 deletions(-)

diff --git a/pkgs/by-name/ya/yaml-language-server/package.nix b/pkgs/by-name/ya/yaml-language-server/package.nix
index b597cd02b5ad..8445ab4f7421 100644
--- a/pkgs/by-name/ya/yaml-language-server/package.nix
+++ b/pkgs/by-name/ya/yaml-language-server/package.nix
@@ -1,39 +1,20 @@
 {
   lib,
-  stdenv,
   fetchFromGitHub,
-  fetchYarnDeps,
-  nodejs,
-  yarnConfigHook,
-  yarnBuildHook,
-  yarnInstallHook,
+  buildNpmPackage,
 }:
-
-stdenv.mkDerivation (finalAttrs: {
+buildNpmPackage (finalAttrs: {
   pname = "yaml-language-server";
-  version = "1.18.0";
+  version = "1.19.2";
 
   src = fetchFromGitHub {
     owner = "redhat-developer";
     repo = "yaml-language-server";
     tag = finalAttrs.version;
-    hash = "sha256-HBhoadWIebeuHZXSdnFiPMSmDla77yhrTNMdz8si88c=";
+    hash = "sha256-wy6+aOtDaWnIU4vyzrOxCZnFWtrn58+zkeU/1Kt6SLs=";
   };
 
-  offlineCache = fetchYarnDeps {
-    yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-2OVxvvijnfB8Bytgoaybyx4p66nD/aahtyjxLf8womE=";
-  };
-
-  nativeBuildInputs = [
-    nodejs
-    yarnConfigHook
-    yarnBuildHook
-    yarnInstallHook
-  ];
-
-  # NodeJS is also needed here so that script interpreter get patched
-  buildInputs = [ nodejs ];
+  npmDepsHash = "sha256-8PBVVgVghZvEpxj6E2imfNbAe8f4//43oioaLnlKOE0=";
 
   strictDeps = true;
 

From 45024cb1c160ef5b5b8e4df2c9b73ddef1b311dd Mon Sep 17 00:00:00 2001
From: jasonxue <jason@xuechunxi.com>
Date: Sat, 18 Oct 2025 19:51:57 +0800
Subject: [PATCH 0878/6226] mermaid-cli: 11.6.0 -> 11.12.0

---
 pkgs/by-name/me/mermaid-cli/package.nix                   | 8 ++++----
 .../me/mermaid-cli/remove-puppeteer-from-dev-deps.patch   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/me/mermaid-cli/package.nix b/pkgs/by-name/me/mermaid-cli/package.nix
index 00f4667861ae..b1f24fc59e28 100644
--- a/pkgs/by-name/me/mermaid-cli/package.nix
+++ b/pkgs/by-name/me/mermaid-cli/package.nix
@@ -7,24 +7,24 @@
   nix-update-script,
 }:
 let
-  version = "11.6.0";
+  version = "11.12.0";
 in
 buildNpmPackage {
   pname = "mermaid-cli";
-  version = version;
+  inherit version;
 
   src = fetchFromGitHub {
     owner = "mermaid-js";
     repo = "mermaid-cli";
     rev = version;
-    hash = "sha256-9Ozi5mAeFVdwGMjvlLG4hMWnCGi552SsT5RuvRiF9ww=";
+    hash = "sha256-OpYq0nOYCGTorzDxybsEjJmhL646wMBbQw3eHVxTuqU=";
   };
 
   patches = [
     ./remove-puppeteer-from-dev-deps.patch # https://github.com/mermaid-js/mermaid-cli/issues/830
   ];
 
-  npmDepsHash = "sha256-SHGYv/IwrCB02M8w5HsEsB7BwWVRFYNDYJFRDgG3a14=";
+  npmDepsHash = "sha256-Ex+tEm13feR/Vru0CHlvM3xS5wgGlYyqANeIquvRHwM=";
 
   env = {
     PUPPETEER_SKIP_DOWNLOAD = true;
diff --git a/pkgs/by-name/me/mermaid-cli/remove-puppeteer-from-dev-deps.patch b/pkgs/by-name/me/mermaid-cli/remove-puppeteer-from-dev-deps.patch
index 30f751fc7b4c..7c58948b97f6 100644
--- a/pkgs/by-name/me/mermaid-cli/remove-puppeteer-from-dev-deps.patch
+++ b/pkgs/by-name/me/mermaid-cli/remove-puppeteer-from-dev-deps.patch
@@ -9,7 +9,7 @@ diff --git a/package.json b/package.json
 @@ -45,7 +45,6 @@
      "@tsconfig/node18": "^18.2.4",
      "@types/node": "~18.19.31",
-     "jest": "^29.0.1",
+     "jest": "^30.0.5",
 -    "puppeteer": "^23.1.1",
      "standard": "^17.0.0",
      "typescript": "^5.0.1-rc",

From 7851a6a1fc8ea8a97d15822b1a368b04b46c6279 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Sat, 18 Oct 2025 10:06:29 -0300
Subject: [PATCH 0879/6226] k3s: k3s_1_33 -> k3s_1_34

https://github.com/kubernetes/kubernetes/blob/master/CHANGELOG/CHANGELOG-1.34.md

https://github.com/k3s-io/k3s/releases/tag/v1.34.1%2Bk3s1
---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9266d2b415ba..227b1b693499 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11642,7 +11642,7 @@ with pkgs;
     k3s_1_33
     k3s_1_34
     ;
-  k3s = k3s_1_33;
+  k3s = k3s_1_34;
 
   kapow = libsForQt5.callPackage ../applications/misc/kapow { };
 

From 253a0165f072ce797c28da2dae9bd9610fd07069 Mon Sep 17 00:00:00 2001
From: matthewcroughan <matt@croughan.sh>
Date: Thu, 16 Oct 2025 21:18:28 +0000
Subject: [PATCH 0880/6226] nixos/systemd-initrd: only include glibc nss
 modules on glibc systems

---
 nixos/modules/system/boot/systemd/initrd.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index f2b1b4fc7ede..ba5f67058bd9 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -568,9 +568,6 @@ in
         "${cfg.package.util-linux}/bin/umount"
         "${cfg.package.util-linux}/bin/sulogin"
 
-        # so NSS can look up usernames
-        "${pkgs.glibc}/lib/libnss_files.so.2"
-
         # Resolving sysroot symlinks without code exec
         "${config.system.nixos-init.package}/bin/chroot-realpath"
         # Find the etc paths
@@ -586,7 +583,8 @@ in
         "${pkgs.bashNonInteractive}/bin"
       ]
       ++ jobScripts
-      ++ map (c: builtins.removeAttrs c [ "text" ]) (builtins.attrValues cfg.contents);
+      ++ map (c: builtins.removeAttrs c [ "text" ]) (builtins.attrValues cfg.contents)
+      ++ lib.optional (pkgs.hostPlatform.libc == "glibc") "${pkgs.glibc}/lib/libnss_files.so.2";
 
       targets.initrd.aliases = [ "default.target" ];
       units =

From 0389c50709cc208546250be3079fe48dd6beafab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 14:05:57 +0000
Subject: [PATCH 0881/6226] graphite-cli: 1.7.1 -> 1.7.2

---
 pkgs/by-name/gr/graphite-cli/package-lock.json | 4 ++--
 pkgs/by-name/gr/graphite-cli/package.nix       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json
index d9695307c659..e69d407354b0 100644
--- a/pkgs/by-name/gr/graphite-cli/package-lock.json
+++ b/pkgs/by-name/gr/graphite-cli/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@withgraphite/graphite-cli",
-  "version": "1.7.1",
+  "version": "1.7.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@withgraphite/graphite-cli",
-      "version": "1.7.1",
+      "version": "1.7.2",
       "hasInstallScript": true,
       "license": "None",
       "dependencies": {
diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix
index 526dc0518f76..6ca571867814 100644
--- a/pkgs/by-name/gr/graphite-cli/package.nix
+++ b/pkgs/by-name/gr/graphite-cli/package.nix
@@ -9,14 +9,14 @@
 
 buildNpmPackage rec {
   pname = "graphite-cli";
-  version = "1.7.1";
+  version = "1.7.2";
 
   src = fetchurl {
     url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz";
-    hash = "sha256-kRXL88ZtOhO2pW9VuMfKPvW9pPJ5RsBKDxPDBzbd8zo=";
+    hash = "sha256-FoQvtywam4AXAavRtwfoTMaaMijW67hp317VLupCaCI=";
   };
 
-  npmDepsHash = "sha256-3nr5Q7OyKAVwoG8znf4YT8U0U0nkrvE6M/peKuNtMcw=";
+  npmDepsHash = "sha256-POWRxgrny27+7ymrhP5iFPBYzCmjCDWB8jGmOSieq0k=";
 
   postPatch = ''
     ln -s ${./package-lock.json} package-lock.json

From ebf1a00044315c6a932c47a6b04a9bf4e37021ca Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sat, 18 Oct 2025 16:23:00 +0200
Subject: [PATCH 0882/6226] lomiri.lomiri-download-manager: 0.2.1 -> 0.2.2

---
 .../services/lomiri-download-manager/default.nix   | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
index 509e569123c1..c6504c7e8d42 100644
--- a/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
+++ b/pkgs/desktops/lomiri/services/lomiri-download-manager/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  fetchpatch,
   gitUpdater,
   testers,
   boost,
@@ -29,13 +28,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lomiri-download-manager";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchFromGitLab {
     owner = "ubports";
     repo = "development/core/lomiri-download-manager";
     tag = finalAttrs.version;
-    hash = "sha256-dVyel4NL5LFORNTQzOyeTFkt9Wn23+4uwHsKcj+/0rk=";
+    hash = "sha256-e4HyUi8GXImEtM5I7dH27cDceUn+VCFpb9xgbMpQBJU=";
   };
 
   outputs = [
@@ -44,15 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals withDocumentation [ "doc" ];
 
-  patches = [
-    # Remove when version > 0.2.1
-    (fetchpatch {
-      name = "0001-lomiri-download-manager-treewide-Make-pkg-config-includedir-values-reasonable.patch";
-      url = "https://gitlab.com/ubports/development/core/lomiri-download-manager/-/commit/230aa1965917f90d235f55477a257eca1f5eaf46.patch";
-      hash = "sha256-Kdmu4U98Yc213pHS0o4DjpG8T5p50Q5hijRgdvscA/c=";
-    })
-  ];
-
   postPatch = ''
     # Substitute systemd's prefix in pkg-config call
     substituteInPlace CMakeLists.txt \

From 59c63d279f2a37aa9d8ea2a552715dbdfb9bde05 Mon Sep 17 00:00:00 2001
From: jasonxue <jason@xuechunxi.com>
Date: Sat, 18 Oct 2025 22:23:47 +0800
Subject: [PATCH 0883/6226] eas-cli: 16.4.0 -> 16.23.1

---
 pkgs/by-name/ea/eas-cli/package.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ea/eas-cli/package.nix b/pkgs/by-name/ea/eas-cli/package.nix
index 2221fae577e6..42b49c8c0576 100644
--- a/pkgs/by-name/ea/eas-cli/package.nix
+++ b/pkgs/by-name/ea/eas-cli/package.nix
@@ -10,18 +10,18 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "eas-cli";
-  version = "16.4.0";
+  version = "16.23.1";
 
   src = fetchFromGitHub {
     owner = "expo";
     repo = "eas-cli";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-cHayMBhqiLY//t/ljjwJm4qMuVn531z7x2cqJE4z6hQ=";
+    hash = "sha256-hMUDtl5lMAZzlvPdzO7J3JTw0B5/fjssuqQlg1MUO3w=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock"; # Point to the root lockfile
-    hash = "sha256-qDUwAdShpKjIUyYvtA6/hgGdO1z1xLqdsJkL3oqkMSw=";
+    hash = "sha256-ybctj6TgW9JluDIsSaNm18wUXSBPuIT45te5HoQuz5s=";
   };
 
   nativeBuildInputs = [
@@ -31,6 +31,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     jq
   ];
 
+  postPatch = ''
+    # Disable Nx integration in Lerna to avoid the native pseudo terminal panic in the sandbox.
+    tmpfile="$(mktemp)"
+    jq '.useNx = false' lerna.json > "$tmpfile"
+    mv "$tmpfile" lerna.json
+  '';
+
   # yarnInstallHook strips out build outputs within packages/eas-cli resulting in most commands missing from eas-cli.
   installPhase = ''
     runHook preInstall

From 5c5c689522aebc5f922c01db3a2839abffbb377c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 14:59:03 +0000
Subject: [PATCH 0884/6226] peergos: 1.12.0 -> 1.13.0

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

diff --git a/pkgs/by-name/pe/peergos/package.nix b/pkgs/by-name/pe/peergos/package.nix
index c0ac21fe07ac..49bbfd223761 100644
--- a/pkgs/by-name/pe/peergos/package.nix
+++ b/pkgs/by-name/pe/peergos/package.nix
@@ -41,12 +41,12 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "peergos";
-  version = "1.12.0";
+  version = "1.13.0";
   src = fetchFromGitHub {
     owner = "Peergos";
     repo = "web-ui";
     rev = "v${version}";
-    hash = "sha256-PwjSMW5d/M/IShclyFqAZJ75+dq0xSCnZmYsdKN5/O0=";
+    hash = "sha256-gyhNb68W3UF9t0AvQULQp3aEIjRUzss9XgQbHrrrsk8=";
     fetchSubmodules = true;
   };
 

From ef6525467d291b962e8c47b5d640c94e3cb73ec4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 15:42:13 +0000
Subject: [PATCH 0885/6226] mmctl: 10.5.11 -> 10.5.12

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

diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index 2447cb920604..1b8e7e4ab3a6 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -19,9 +19,9 @@
     #
     # Ensure you also check ../mattermostLatest/package.nix.
     regex = "^v(10\\.5\\.[0-9]+)$";
-    version = "10.5.11";
-    srcHash = "sha256-2XX6SNWlu+2Kh0rJodp0Ipzu8/gdjygCxeD2BVYDcTc=";
-    vendorHash = "sha256-uryErnXPVd/gmiAk0F2DVaqz368H6j97nBn0eNW7DFk=";
+    version = "10.5.12";
+    srcHash = "sha256-VaW+rA0UeIZhGU9BlYZgyznAOtLN+JI7UPbMRPCwTww=";
+    vendorHash = "sha256-vxUxSkj1EwgMtPpCGJSA9jCDBeLrWhecdwq4KBThhj4=";
     npmDepsHash = "sha256-tIeuDUZbqgqooDm5TRfViiTT5OIyN0BPwvJdI+wf7p0=";
     lockfileOverlay = ''
       unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")

From bb74cb9d6d077e9cb7d47dc39ea209708d73b515 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 15:50:45 +0000
Subject: [PATCH 0886/6226] ibus-engines.typing-booster-unwrapped: 2.27.74 ->
 2.28.1

---
 .../inputmethods/ibus-engines/ibus-typing-booster/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
index 1302ad7b7476..85ef39776850 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-typing-booster/default.nix
@@ -25,13 +25,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "ibus-typing-booster";
-  version = "2.27.74";
+  version = "2.28.1";
 
   src = fetchFromGitHub {
     owner = "mike-fabian";
     repo = "ibus-typing-booster";
     rev = version;
-    hash = "sha256-yAa/U1pL7KnJAuxaQkzbtOvdVhIgQiYCMlPnjHmoFEM=";
+    hash = "sha256-2gt3cEn+THr2hYv6XpEBcetMZmiBQlMEa9X64UglaQo=";
   };
 
   nativeBuildInputs = [

From fe1ba330ead05a62a8758af0604b0fb4cfd7b7cb Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 17 Oct 2025 19:12:15 +0200
Subject: [PATCH 0887/6226] frozen-containers: init at
 1.2.0-unstable-2025-07-29

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/fr/frozen-containers/package.nix | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/fr/frozen-containers/package.nix

diff --git a/pkgs/by-name/fr/frozen-containers/package.nix b/pkgs/by-name/fr/frozen-containers/package.nix
new file mode 100644
index 000000000000..89ff0ad6c745
--- /dev/null
+++ b/pkgs/by-name/fr/frozen-containers/package.nix
@@ -0,0 +1,35 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  nix-update-script,
+}:
+stdenv.mkDerivation {
+  pname = "frozen-containers";
+  version = "1.2.0-unstable-2025-07-29";
+
+  src = fetchFromGitHub {
+    owner = "serge-sans-paille";
+    repo = "frozen";
+    rev = "61dce5ae18ca59931e27675c468e64118aba8744";
+    hash = "sha256-zIczBSRDWjX9hcmYWYkbWY3NAAQwQtKhMTeHlYp4BKk=";
+  };
+
+  nativeBuildInputs = [ cmake ];
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [ "--version=branch" ];
+  };
+
+  meta = {
+    description = "Header-only library that provides 0 cost initialization for immutable containers, fixed-size containers, and various algorithms";
+    homepage = "https://github.com/serge-sans-paille/frozen";
+    maintainers = with lib.maintainers; [
+      marcin-serwin
+      szanko
+    ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.all;
+  };
+}

From 757a78e2e08d3e882526c43b1b7a0b717fcb0f76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Sat, 18 Oct 2025 18:20:09 +0200
Subject: [PATCH 0888/6226] Add to `all-packages.nix`

---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 659b705ee86a..869093ed4e4b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4524,6 +4524,7 @@ with pkgs;
     crystal_1_15
     crystal_1_16
     crystal_1_17
+    crystal_1_18
     crystal
     ;
 

From f7633dafceb6164c8ba5d858938f8c70852c514c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 16:29:44 +0000
Subject: [PATCH 0889/6226] steam-devices-udev-rules:
 1.0.0.61-unstable-2025-09-26 -> 1.0.0.61-unstable-2025-10-18

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

diff --git a/pkgs/by-name/st/steam-devices-udev-rules/package.nix b/pkgs/by-name/st/steam-devices-udev-rules/package.nix
index a276442ea802..d0e429dac3b9 100644
--- a/pkgs/by-name/st/steam-devices-udev-rules/package.nix
+++ b/pkgs/by-name/st/steam-devices-udev-rules/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "steam-devices-udev-rules";
-  version = "1.0.0.61-unstable-2025-09-26";
+  version = "1.0.0.61-unstable-2025-10-18";
 
   src = fetchFromGitHub {
     owner = "ValveSoftware";
     repo = "steam-devices";
-    rev = "d3f7cd6a955d2191800f01d6d2efb2ee196127c5";
-    hash = "sha256-IMrKU6zyR+oTc4Wqca8JBvxoslKUuz8peHMudfwewf0=";
+    rev = "4d7e6c1d8c54ec10fdb29daca679307ac5194825";
+    hash = "sha256-KzDzZ03g1xil4G6yw67KGEHnWIWg6VZIkMy8n/kSgMs=";
   };
 
   nativeBuildInputs = [

From a93e29f2c74ea8c8c9d8a8ef5785cd772b425af5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 16:30:25 +0000
Subject: [PATCH 0890/6226] dpt-rp1-py: 0.1.16 -> 0.1.18

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

diff --git a/pkgs/by-name/dp/dpt-rp1-py/package.nix b/pkgs/by-name/dp/dpt-rp1-py/package.nix
index e3b1f84af9b0..363b6ba695c2 100644
--- a/pkgs/by-name/dp/dpt-rp1-py/package.nix
+++ b/pkgs/by-name/dp/dpt-rp1-py/package.nix
@@ -5,14 +5,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "dpt-rp1-py";
-  version = "0.1.16";
+  version = "0.1.18";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "janten";
     repo = "dpt-rp1-py";
     rev = "v${version}";
-    sha256 = "0zvf09b9rzpx5b0w81ziqd7v321hfhgsgvshdx23karj2hf75bvj";
+    sha256 = "sha256-5Ny62Kp1GHH9vmPSZ6smNqyEt9PZYPHAiungHZQMB/A=";
   };
 
   doCheck = false;

From 534ea34012a62a9e9d48ac95329417ecfe019f78 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 16:54:16 +0000
Subject: [PATCH 0891/6226] systemd-lsp: 2025.07.14 -> 2025.10.16

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

diff --git a/pkgs/by-name/sy/systemd-lsp/package.nix b/pkgs/by-name/sy/systemd-lsp/package.nix
index 219cf112c3b0..ab0b87c851c8 100644
--- a/pkgs/by-name/sy/systemd-lsp/package.nix
+++ b/pkgs/by-name/sy/systemd-lsp/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "systemd-lsp";
-  version = "2025.07.14";
+  version = "2025.10.16";
 
   src = fetchFromGitHub {
     owner = "JFryy";
     repo = "systemd-lsp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-JjrPgpQ94C01nZ3E1NE88TBzI03YFs+x37edtYStlnc=";
+    hash = "sha256-xhk1jUAA81Rkq9Nmcw+XyWrSbq3ygRvS615Z56j0WBM=";
   };
 
-  cargoHash = "sha256-G1cQWOgtx+Bmi05ji9Z4TBj5pnhglNcfLRoq2zSmyK0=";
+  cargoHash = "sha256-6hePUny2iBjslkIk8wVXHnuAHzG3WpBdcj8D5FM9Bc4=";
 
   passthru.updateScript = nix-update-script { };
 

From 60ba321180b07a92b9fc65cdd5ccf00ab18976ce Mon Sep 17 00:00:00 2001
From: dot-file <Random145@tutamail.com>
Date: Sat, 18 Oct 2025 20:06:42 +0300
Subject: [PATCH 0892/6226] nixos/ly: use iniFmt.lib.types.atom in settings

Co-authored-by: h7x4 <h7x4@nani.wtf>
---
 nixos/modules/services/display-managers/ly.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/nixos/modules/services/display-managers/ly.nix b/nixos/modules/services/display-managers/ly.nix
index 1141e4f5dfac..07e3dd25dd5b 100644
--- a/nixos/modules/services/display-managers/ly.nix
+++ b/nixos/modules/services/display-managers/ly.nix
@@ -67,13 +67,7 @@ in
       settings = mkOption {
         type =
           with lib.types;
-          attrsOf (
-            nullOr (oneOf [
-              str
-              int
-              bool
-            ])
-          );
+          attrsOf iniFmt.lib.types.atom;
         default = { };
         example = {
           load = false;

From 28f63f4facc56871e3cf70257d55c1fd59833e6b Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sat, 18 Oct 2025 12:26:53 +0200
Subject: [PATCH 0893/6226] photoprism: 250426-27ec7a128 -> 250707-d28b3101e

---
 pkgs/by-name/ph/photoprism/backend.nix  | 2 +-
 pkgs/by-name/ph/photoprism/frontend.nix | 6 +++++-
 pkgs/by-name/ph/photoprism/package.nix  | 6 +++---
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ph/photoprism/backend.nix b/pkgs/by-name/ph/photoprism/backend.nix
index 0946372fd42a..057e323ed057 100644
--- a/pkgs/by-name/ph/photoprism/backend.nix
+++ b/pkgs/by-name/ph/photoprism/backend.nix
@@ -45,7 +45,7 @@ buildGoModule {
     substituteInPlace internal/commands/passwd.go --replace-fail '/bin/stty' "${coreutils}/bin/stty"
   '';
 
-  vendorHash = "sha256-8uy0uLhGOyedqi3AvMsEdDQnFvGgeeZcL4tFgI6bzU8=";
+  vendorHash = "sha256-yLzIjoN1csyNpounvbQ6r1nudPypwjabAbdhyjna2+s=";
 
   subPackages = [ "cmd/photoprism" ];
 
diff --git a/pkgs/by-name/ph/photoprism/frontend.nix b/pkgs/by-name/ph/photoprism/frontend.nix
index 8ac445889867..d0acfedb72b4 100644
--- a/pkgs/by-name/ph/photoprism/frontend.nix
+++ b/pkgs/by-name/ph/photoprism/frontend.nix
@@ -13,7 +13,11 @@ buildNpmPackage {
     cd frontend
   '';
 
-  npmDepsHash = "sha256-rfZ6VE3JRR8MrB61DqueXWNoOjDE+GJnyrNujGyc8wc=";
+  npmDepsHash = "sha256-IC92WESUAp+P0MbFasCTwpo0GcGoTfO8IkLbHfnrnNY=";
+
+  # Some dependencies are fetched from git repositories
+  forceGitDeps = true;
+  makeCacheWritable = true;
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/by-name/ph/photoprism/package.nix b/pkgs/by-name/ph/photoprism/package.nix
index 6d91f69bb35e..7104628e31c4 100644
--- a/pkgs/by-name/ph/photoprism/package.nix
+++ b/pkgs/by-name/ph/photoprism/package.nix
@@ -17,14 +17,14 @@
 }:
 
 let
-  version = "250426-27ec7a128";
+  version = "250707-d28b3101e";
   pname = "photoprism";
 
   src = fetchFromGitHub {
     owner = "photoprism";
     repo = "photoprism";
     rev = version;
-    hash = "sha256-wsSWCTFfKQ+8aE8GKvXpA49LbBLMTE1lsJMYFLvquBM=";
+    hash = "sha256-KT50tjgM3b3edRB3R8dR3tIF9sXFr+Cm0BMsFqBJG6s=";
   };
 
   backend = callPackage ./backend.nix { inherit src version; };
@@ -34,7 +34,7 @@ let
     { name, hash }:
     fetchzip {
       inherit hash;
-      url = "https://dl.photoprism.org/tensorflow/${name}.zip";
+      url = "https://dl.photoprism.app/tensorflow/${name}.zip";
       stripRoot = false;
     };
 

From f9bbb5f0d8885ca9b67ce537082c2a1f7643c094 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 17:37:09 +0000
Subject: [PATCH 0894/6226] venera: 1.5.0 -> 1.5.3

---
 pkgs/by-name/ve/venera/package.nix       |  4 ++--
 pkgs/by-name/ve/venera/pubspec.lock.json | 26 +++++++++++++++++++++---
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ve/venera/package.nix b/pkgs/by-name/ve/venera/package.nix
index d2ffcedfd8e4..99de216280d7 100644
--- a/pkgs/by-name/ve/venera/package.nix
+++ b/pkgs/by-name/ve/venera/package.nix
@@ -12,13 +12,13 @@
 }:
 
 let
-  version = "1.5.0";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "venera-app";
     repo = "venera";
     tag = "v${version}";
-    hash = "sha256-LhPtoMD7IjxbTFTSzP+vtflDUixUoN9eqE1AQyWhJzg=";
+    hash = "sha256-yjO7nQ3F+DLudjqXUp0N13lhBZSAKwAeKXRAKxPxDVQ=";
   };
 in
 flutter335.buildFlutterApplication {
diff --git a/pkgs/by-name/ve/venera/pubspec.lock.json b/pkgs/by-name/ve/venera/pubspec.lock.json
index 5891ffafb0f0..d170ac3807a2 100644
--- a/pkgs/by-name/ve/venera/pubspec.lock.json
+++ b/pkgs/by-name/ve/venera/pubspec.lock.json
@@ -40,6 +40,16 @@
       "source": "hosted",
       "version": "1.0.4"
     },
+    "archive": {
+      "dependency": "direct dev",
+      "description": {
+        "name": "archive",
+        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "4.0.7"
+    },
     "args": {
       "dependency": "transitive",
       "description": {
@@ -505,11 +515,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_memory_info",
-        "sha256": "1f112f1d7503aa1681fc8e923f6cd0e847bb2fbeec3753ed021cf1e5f7e9cd74",
+        "sha256": "eacfd0dd01ff596b4e5bf022442769a1807a73f2af43d62802436f0a5de99137",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.0.1"
+      "version": "0.0.3"
     },
     "flutter_plugin_android_lifecycle": {
       "dependency": "transitive",
@@ -957,6 +967,16 @@
       "source": "hosted",
       "version": "4.0.0"
     },
+    "posix": {
+      "dependency": "transitive",
+      "description": {
+        "name": "posix",
+        "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.3"
+    },
     "rhttp": {
       "dependency": "direct main",
       "description": {
@@ -1389,6 +1409,6 @@
   },
   "sdks": {
     "dart": ">=3.8.0 <4.0.0",
-    "flutter": ">=3.35.2"
+    "flutter": ">=3.35.5"
   }
 }

From 60f54791bbe0e45f34dc5b1b653e3840252e7ffa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 17:44:23 +0000
Subject: [PATCH 0895/6226] graphhopper: 10.2 -> 11.0

---
 pkgs/by-name/gr/graphhopper/version.toml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/gr/graphhopper/version.toml b/pkgs/by-name/gr/graphhopper/version.toml
index 3bd74b1906c9..64b95b5ab207 100644
--- a/pkgs/by-name/gr/graphhopper/version.toml
+++ b/pkgs/by-name/gr/graphhopper/version.toml
@@ -1,8 +1,8 @@
-major = "10.0"
-patch = "10.2"
-mapsBundle = "0.0.0-4718098d1db1798841a4d12f1727e8e8f7eab202"
+major = "11.0"
+patch = "11.0"
+mapsBundle = "0.0.0-f171bcf55e447bf494348dd274cd377b73c951f6"
 
 [hash]
-src = "sha256-E6G9JR1lrXhNJ4YgMM0n0RsQcMZQM2QldGc74f5FALo="
-mapsBundle = "sha256-jZTNJfmMWJQHpJ8um3yTBx/KtIfdr0EwKJ9kSFalWJQ="
-mvnDeps = "sha256-KidbIBnW//IiKPFy3plFWOED8gP/ZCg4buwMgzttaY8="
+src = "sha256-tK8zEX2szcU77ydHW+ak/GTjKKC6C5xlG0Uum7a/76I="
+mapsBundle = "sha256-ehwWBIuYBwXu7W7uHYYuGl0lS4s6Tm5c4BfKPkY+w0A="
+mvnDeps = "sha256-0B38C37QbkOhxd5e4SHfMg9SqcUZkuIf1g1S9SnCu7U="

From cea3bdb9c4b96b4d04a1832a9cffa1004ed31780 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 18:33:19 +0000
Subject: [PATCH 0896/6226] metabase: 0.56.6 -> 0.56.10

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

diff --git a/pkgs/by-name/me/metabase/package.nix b/pkgs/by-name/me/metabase/package.nix
index f1102925c3bc..96805b04df27 100644
--- a/pkgs/by-name/me/metabase/package.nix
+++ b/pkgs/by-name/me/metabase/package.nix
@@ -12,11 +12,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "metabase";
-  version = "0.56.6";
+  version = "0.56.10";
 
   src = fetchurl {
     url = "https://downloads.metabase.com/v${finalAttrs.version}/metabase.jar";
-    hash = "sha256-OQ9B1KpuYrtTL46cKJtKyuiHEwGSkF+PlAjb8FOv4zo=";
+    hash = "sha256-otpNh9TJnUoHjAVVCkrsJO93nIeEfaNC8amZdTvreIE=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 4346c7fd575b283b0ba3fd7783e1d68e1dd98373 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 18:33:50 +0000
Subject: [PATCH 0897/6226] draupnir: 2.7.0 -> 2.7.1

---
 pkgs/by-name/dr/draupnir/hashes.json  | 2 +-
 pkgs/by-name/dr/draupnir/package.json | 6 +++---
 pkgs/by-name/dr/draupnir/package.nix  | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/dr/draupnir/hashes.json b/pkgs/by-name/dr/draupnir/hashes.json
index 966c14f84fa1..33fee0206f5a 100644
--- a/pkgs/by-name/dr/draupnir/hashes.json
+++ b/pkgs/by-name/dr/draupnir/hashes.json
@@ -1,3 +1,3 @@
 {
-  "yarn_offline_cache_hash": "sha256-jzBjZAqvEVGlk+5ii5s8aWvoYJKVBsh+RGcp63oim5Y="
+  "yarn_offline_cache_hash": "sha256-EZ8dVRfzAFr8wepLuS90YHvAi9BA+4etVz+Vji+bQVA="
 }
diff --git a/pkgs/by-name/dr/draupnir/package.json b/pkgs/by-name/dr/draupnir/package.json
index e7d6335d04ce..6df29ee41a44 100644
--- a/pkgs/by-name/dr/draupnir/package.json
+++ b/pkgs/by-name/dr/draupnir/package.json
@@ -1,6 +1,6 @@
 {
   "name": "draupnir",
-  "version": "2.7.0",
+  "version": "2.7.1",
   "description": "A moderation tool for Matrix",
   "main": "lib/index.js",
   "repository": "https://github.com/the-draupnir-project/Draupnir.git",
@@ -54,7 +54,7 @@
     "@sinclair/typebox": "0.34.13",
     "@the-draupnir-project/interface-manager": "4.2.5",
     "@the-draupnir-project/matrix-basic-types": "1.4.1",
-    "@the-draupnir-project/mps-interface-adaptor": "0.5.1",
+    "@the-draupnir-project/mps-interface-adaptor": "0.5.2",
     "better-sqlite3": "^9.4.3",
     "body-parser": "^1.20.2",
     "config": "^3.3.9",
@@ -65,7 +65,7 @@
     "matrix-appservice-bridge": "^10.3.1",
     "matrix-bot-sdk": "npm:@vector-im/matrix-bot-sdk@^0.7.1-element.6",
     "matrix-protection-suite": "npm:@gnuxie/matrix-protection-suite@4.1.0",
-    "matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@4.0.0",
+    "matrix-protection-suite-for-matrix-bot-sdk": "npm:@gnuxie/matrix-protection-suite-for-matrix-bot-sdk@4.0.2",
     "pg": "^8.8.0",
     "yaml": "^2.3.2"
   },
diff --git a/pkgs/by-name/dr/draupnir/package.nix b/pkgs/by-name/dr/draupnir/package.nix
index 740e75eb9732..5d0a5b02e3de 100644
--- a/pkgs/by-name/dr/draupnir/package.nix
+++ b/pkgs/by-name/dr/draupnir/package.nix
@@ -22,13 +22,13 @@ let
 in
 mkYarnPackage rec {
   pname = "draupnir";
-  version = "2.7.0";
+  version = "2.7.1";
 
   src = fetchFromGitHub {
     owner = "the-draupnir-project";
     repo = "Draupnir";
     tag = "v${version}";
-    hash = "sha256-ZzwZg7sevX0qKnlZ4snCcwSejWqA6JHCx3e6vWucO8U=";
+    hash = "sha256-PJg+ybWe7mtLgqrBZP0xKeKWc2FPv7koyjsHyK5uRKs=";
   };
 
   nativeBuildInputs = [

From 683c3773a13383ebd4cd0611d03a7fe4b9618bf3 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 18 Oct 2025 12:27:34 +0200
Subject: [PATCH 0898/6226] lp_solve: do not include binutils on darwin

---
 .../science/math/lp_solve/default.nix         | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/applications/science/math/lp_solve/default.nix b/pkgs/applications/science/math/lp_solve/default.nix
index 891dd15194f4..bd38d90accc6 100644
--- a/pkgs/applications/science/math/lp_solve/default.nix
+++ b/pkgs/applications/science/math/lp_solve/default.nix
@@ -19,16 +19,17 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-bUq/9cxqqpM66ObBeiJt8PwLZxxDj2lxXUHQn+gfkC8=";
   };
 
-  nativeBuildInputs = [
-    binutils
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    cctools
-    fixDarwinDylibNames
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-    autoSignDarwinBinariesHook
-  ];
+  nativeBuildInputs =
+    lib.optionals (!stdenv.hostPlatform.isDarwin) [
+      binutils
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      cctools
+      fixDarwinDylibNames
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+      autoSignDarwinBinariesHook
+    ];
 
   env = {
     NIX_CFLAGS_COMPILE = "-Wno-error=implicit-int";

From ff3d1ad09101cf0ac246879f7f80e0effc1e3da1 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 18 Oct 2025 12:27:45 +0200
Subject: [PATCH 0899/6226] scalp: fix build with cmake 4

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

diff --git a/pkgs/by-name/sc/scalp/package.nix b/pkgs/by-name/sc/scalp/package.nix
index 44adf8c0dd87..643fe77fd49d 100644
--- a/pkgs/by-name/sc/scalp/package.nix
+++ b/pkgs/by-name/sc/scalp/package.nix
@@ -25,6 +25,7 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.3.2)" "cmake_minimum_required (VERSION 3.5)" \
       --replace-fail "\''$ORIGIN" "\''${CMAKE_INSTALL_PREFIX}/lib" \
       --replace-fail "-m64" ""
     substituteInPlace src/tests/CMakeLists.txt \

From 0bef84258f28c3d23bc7c6b6eddde0f805253c88 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 19:27:30 +0000
Subject: [PATCH 0900/6226] normaliz: 3.10.5 -> 3.11.0

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

diff --git a/pkgs/by-name/no/normaliz/package.nix b/pkgs/by-name/no/normaliz/package.nix
index 66e5671f83c5..bcfddfda396f 100644
--- a/pkgs/by-name/no/normaliz/package.nix
+++ b/pkgs/by-name/no/normaliz/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "normaliz";
-  version = "3.10.5";
+  version = "3.11.0";
 
   src = fetchFromGitHub {
     owner = "normaliz";
     repo = "normaliz";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Ku5OTtRxrs9qaSE0mle17eJSE2yKZUUsflEZk4k91jM=";
+    hash = "sha256-O8zUhuR+e9yNxj9jC2xK7UZ2aUHoEWjwxn3XxTyP8hQ=";
   };
 
   buildInputs = [

From 18a2d0fffb692af674ca17f56873d8be1da39ac2 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 18 Oct 2025 21:33:06 +0200
Subject: [PATCH 0901/6226] pagsuite: 1.80 -> 1.80-unstable-2025-05-03

---
 pkgs/by-name/pa/pagsuite/package.nix | 33 ++++++++++------------------
 1 file changed, 12 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/pa/pagsuite/package.nix b/pkgs/by-name/pa/pagsuite/package.nix
index 850732275cb3..273a728c2e8d 100644
--- a/pkgs/by-name/pa/pagsuite/package.nix
+++ b/pkgs/by-name/pa/pagsuite/package.nix
@@ -1,38 +1,26 @@
 {
   lib,
   stdenv,
-  fetchurl,
-  fetchpatch,
+  fetchFromGitLab,
   cmake,
-  unzip,
   gmp,
   scalp,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "pagsuite";
-  version = "1.80";
+  version = "1.80-unstable-2025-05-03";
 
-  src = fetchurl {
-    url = "https://gitlab.com/kumm/pagsuite/-/raw/master/releases/pagsuite_${
-      lib.replaceStrings [ "." ] [ "_" ] version
-    }.zip";
-    hash = "sha256-TYd+dleVPWEWU9Cb3XExd7ixJZyiUAp9QLtorYJSIbQ=";
+  src = fetchFromGitLab {
+    domain = "gitlab.com";
+    owner = "kumm";
+    repo = "pagsuite";
+    rev = "1cc657765658cb2eb622d4a9c656ab9854150e7d";
+    hash = "sha256-jyp3h5n6SkyTpLzqMezvu2nri6rDkX3ACcCO9r4/bBA=";
   };
 
-  patches = [
-    # Fix issue with latest ScaLP update
-    (fetchpatch {
-      url = "https://gitlab.com/kumm/pagsuite/-/commit/cae9f78bec93a7f197461358f2f796f6b5778781.patch";
-      hash = "sha256-12IisS6oGYLRicORTemHB7bw9EB9cuQjxG8f6X0WMrU=";
-    })
-  ];
-
-  sourceRoot = "pagsuite_${lib.replaceStrings [ "." ] [ "_" ] version}";
-
   nativeBuildInputs = [
     cmake
-    unzip
   ];
 
   buildInputs = [
@@ -40,6 +28,9 @@ stdenv.mkDerivation rec {
     scalp
   ];
 
+  # make[2]: ***  No rule to make target 'lib/libpag.dylib', needed by 'bin/osr'.  Stop.
+  enableParallelBuilding = false;
+
   meta = with lib; {
     description = "Optimization tools for the (P)MCM problem";
     homepage = "https://gitlab.com/kumm/pagsuite";

From 4d8e8a4c91ef3791d18163bc65290d2e6f0d7170 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Sat, 18 Oct 2025 12:36:38 -0700
Subject: [PATCH 0902/6226] edb: fix build failure with cmake 4

- CMake 4 is no longer retro compatible with versions < 3.5
---
 pkgs/development/tools/misc/edb/default.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/tools/misc/edb/default.nix b/pkgs/development/tools/misc/edb/default.nix
index 786209cb74f4..f41b4324d6e9 100644
--- a/pkgs/development/tools/misc/edb/default.nix
+++ b/pkgs/development/tools/misc/edb/default.nix
@@ -53,6 +53,18 @@ stdenv.mkDerivation (finalAttrs: {
     # submodules were fetched and will throw an error if it's not there.
     # Avoid using leaveDotGit in the fetchFromGitHub options as it is non-deterministic.
     mkdir -p src/qhexview/.git lib/gdtoa-desktop/.git
+
+    # CMake 3.1 is deprecated and is no longer supported by CMake > 4
+    # https://github.com/NixOS/nixpkgs/issues/445447
+    substituteInPlace CMakeLists.txt src/CMakeLists.txt src/test/CMakeLists.txt plugins/CMakeLists.txt plugins/*/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required (VERSION 3.1)" \
+      "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace lib/CMakeLists.txt lib/libELF/CMakeLists.txt lib/libPE/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 3.1)" \
+      "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace lib/gdtoa-desktop/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required (VERSION 3.0)" \
+      "cmake_minimum_required (VERSION 3.10)"
   '';
 
   passthru = {

From eb5df35ae579d0aa68db43e9be6d524165adfbf2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 29 Sep 2025 00:40:15 +0000
Subject: [PATCH 0903/6226] gap: 4.14.0 -> 4.15.1

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

diff --git a/pkgs/by-name/ga/gap/package.nix b/pkgs/by-name/ga/gap/package.nix
index 73df812a7cc2..4de64b7a4c7f 100644
--- a/pkgs/by-name/ga/gap/package.nix
+++ b/pkgs/by-name/ga/gap/package.nix
@@ -71,11 +71,11 @@ in
 stdenv.mkDerivation rec {
   pname = "gap";
   # https://www.gap-system.org/Releases/
-  version = "4.14.0";
+  version = "4.15.1";
 
   src = fetchurl {
     url = "https://github.com/gap-system/gap/releases/download/v${version}/gap-${version}.tar.gz";
-    sha256 = "sha256-hF9ScsJv6xuOue8pS/BUXyZMH+WhmwYBu8ZdedlQZIc=";
+    hash = "sha256-YEnVPpmxLiXC2EjbIaxKBjgKRv5MQVckPVVv4GkwBCw=";
   };
 
   # remove all non-essential packages (which take up a lot of space)

From a9eee7c2e13f49f59b15cdf3e4ce84f1533e330f Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 18 Oct 2025 21:42:19 +0200
Subject: [PATCH 0904/6226] flopoco: fix build with cmake 4

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

diff --git a/pkgs/by-name/fl/flopoco/package.nix b/pkgs/by-name/fl/flopoco/package.nix
index b2e81c17764c..6d32636b1098 100644
--- a/pkgs/by-name/fl/flopoco/package.nix
+++ b/pkgs/by-name/fl/flopoco/package.nix
@@ -74,6 +74,10 @@ stdenv.mkDerivation {
     ./flopoco BuildAutocomplete
   '';
 
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
+  ];
+
   installPhase = ''
     runHook preInstall
 

From d21cad5e6291f86ac458fdd75534feee0c2d725e Mon Sep 17 00:00:00 2001
From: Olivier Bitter <olibitter@gmail.com>
Date: Sat, 18 Oct 2025 22:06:21 +0200
Subject: [PATCH 0905/6226] nixos/homepage-dashboard: prefix path

By prefixing path we keep implicit binaries such as 'df'
in path which are needed for displaying the 'disk' usage
in the resources widget.
---
 pkgs/by-name/ho/homepage-dashboard/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ho/homepage-dashboard/package.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix
index a8aee6571366..495f99d32624 100644
--- a/pkgs/by-name/ho/homepage-dashboard/package.nix
+++ b/pkgs/by-name/ho/homepage-dashboard/package.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
       --set-default HOMEPAGE_CONFIG_DIR /var/lib/homepage-dashboard \
       --set-default NIXPKGS_HOMEPAGE_CACHE_DIR /var/cache/homepage-dashboard \
       --add-flags "$out/share/homepage/server.js" \
-      --set PATH "${lib.makeBinPath [ unixtools.ping ]}"
+      --prefix PATH : "${lib.makeBinPath [ unixtools.ping ]}"
 
     ${if enableLocalIcons then installLocalIcons else ""}
 

From 6559d5a41f1b8f3370a0fc850dfc6097e129a421 Mon Sep 17 00:00:00 2001
From: dawnofmidnight <dawnofmidnight@duck.com>
Date: Sat, 18 Oct 2025 16:08:03 -0400
Subject: [PATCH 0906/6226] nixos/snowflake-proxy: add extraFlags option

---
 nixos/modules/services/networking/snowflake-proxy.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/nixos/modules/services/networking/snowflake-proxy.nix b/nixos/modules/services/networking/snowflake-proxy.nix
index 046ca5c7b5fc..a8e86bcde0d4 100644
--- a/nixos/modules/services/networking/snowflake-proxy.nix
+++ b/nixos/modules/services/networking/snowflake-proxy.nix
@@ -38,6 +38,13 @@ in
         type = with types; nullOr str;
         default = null;
       };
+
+      extraFlags = mkOption {
+        description = "Extra flags to pass to snowflake-proxy";
+        type = with types; listOf str;
+        default = [ ];
+        example = [ "-metrics" ];
+      };
     };
   };
 
@@ -52,6 +59,7 @@ in
             ++ optional (cfg.capacity != null) "-capacity ${builtins.toString cfg.capacity}"
             ++ optional (cfg.relay != null) "-relay ${cfg.relay}"
             ++ optional (cfg.stun != null) "-stun ${cfg.stun}"
+            ++ cfg.extraFlags
           );
 
         # Security Hardening

From 618d1b6163ea49e62cf12849281e7da8e59b0fd5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 20:23:20 +0000
Subject: [PATCH 0907/6226] iosevka: 33.3.1 -> 33.3.2

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

diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix
index 6bbd714f5f05..f41c80aa8e9a 100644
--- a/pkgs/by-name/io/iosevka/package.nix
+++ b/pkgs/by-name/io/iosevka/package.nix
@@ -56,16 +56,16 @@ assert (extraParameters != null) -> set != null;
 
 buildNpmPackage rec {
   pname = "Iosevka${toString set}";
-  version = "33.3.1";
+  version = "33.3.2";
 
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
     rev = "v${version}";
-    hash = "sha256-qbC1FVhnkVlsT+lOSeM6wDbKV2c5iTHgBxZENGEBnUI=";
+    hash = "sha256-qJfywH5rwfgTy8k7Db3vC09Lx+UP50iWSsXnTIQWJQo=";
   };
 
-  npmDepsHash = "sha256-/HxMh5v3CfCpPCF8cf8Z2NXDBovJFvMaQfYFZvuyNX0=";
+  npmDepsHash = "sha256-MzeUHVJXmtLWNh2iNA0RiXw1fi5Cf/sWeCQG2YCMxvU=";
 
   nativeBuildInputs = [
     remarshal

From fa302a210d1291dbd48351c0a56cf4070dfb444f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 20:27:24 +0000
Subject: [PATCH 0908/6226] dotenv-linter: 3.3.0 -> 4.0.0

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

diff --git a/pkgs/by-name/do/dotenv-linter/package.nix b/pkgs/by-name/do/dotenv-linter/package.nix
index f45187e59121..49a261a6fcee 100644
--- a/pkgs/by-name/do/dotenv-linter/package.nix
+++ b/pkgs/by-name/do/dotenv-linter/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dotenv-linter";
-  version = "3.3.0";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "dotenv-linter";
     repo = "dotenv-linter";
     rev = "v${version}";
-    sha256 = "sha256-HCP1OUWm/17e73TbinmDxYUi18/KXxppstyUSixjlSo=";
+    sha256 = "sha256-H4a/JM2CFrELmP4w4vrFxbvmvdTQk8k7g3QjQKm++Uk=";
   };
 
-  cargoHash = "sha256-lBHqvwZrnkSfmMXBmnhovbDn+pf5iLJepJjO/FKT1wY=";
+  cargoHash = "sha256-11u3a4W3vrGJQXjSMcDAS5D9mqG+XJ0L5FYmqqH/McM=";
 
   meta = with lib; {
     description = "Lightning-fast linter for .env files. Written in Rust";

From 988ff8bbfbf8c429a73b0872e5158d08bedc4822 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 20:42:49 +0000
Subject: [PATCH 0909/6226] ngtcp2-gnutls: 1.16.0 -> 1.17.0

---
 pkgs/development/libraries/ngtcp2/gnutls.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix
index ce17fcefade6..fce288b44b58 100644
--- a/pkgs/development/libraries/ngtcp2/gnutls.nix
+++ b/pkgs/development/libraries/ngtcp2/gnutls.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ngtcp2";
-  version = "1.16.0";
+  version = "1.17.0";
 
   src = fetchFromGitHub {
     owner = "ngtcp2";
     repo = "ngtcp2";
     rev = "v${version}";
-    hash = "sha256-01Z2PyQDY0L38jsTjIIMcghALMyL/it0lAweKTZ5e0k=";
+    hash = "sha256-+mSVhUF1ZZJqm2HEp99BevY1yKm2jPIkkTcx7akyfro=";
   };
 
   outputs = [

From eae9d7a6b5d217f3d51f70ea1f6e0eb6e23554c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Zavala=20Villag=C3=B3mez?=
 <sebaszv@proton.me>
Date: Sat, 18 Oct 2025 14:57:46 -0400
Subject: [PATCH 0910/6226] nixos/plasma6: check `$XDG_CACHE_HOME` before
 `$HOME/.cache` for ksycoca cache wipe

The previous implementation breaks if `$XDG_CACHE_HOME` is set to
anything other than what is expected, since KDE will now write the cache
there instead. Some users set `$XDG_CACHE_HOME` to something like
`$HOME/.local/cache` to de-clutter `$HOME`. In such case, the cache won't
be found and removed, which will cause the KDE runner to not be able to
launch anything. It will now work regardless.
---
 doc/release-notes/rl-2511.section.md                | 2 ++
 nixos/modules/services/desktop-managers/plasma6.nix | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 4862081c6529..4c44f3df3821 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -298,6 +298,8 @@
 
 - `buildPythonPackage` and `buildPythonApplication` now default to `nix-update-script` as their default `updateScript`. This should improve automated updates, since nix-update is better maintained than the in-tree update script and has more robust fetcher support.
 
+- `plasma6`: Fixed the `ksycoca` cache not being re-built when `$XDG_CACHE_HOME` is set to something that isn't `$HOME/.cache`.
+
 ## Nixpkgs Library {#sec-nixpkgs-release-25.11-lib}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix
index 529734bd503f..fea0428f36d1 100644
--- a/nixos/modules/services/desktop-managers/plasma6.nix
+++ b/nixos/modules/services/desktop-managers/plasma6.nix
@@ -20,7 +20,7 @@ let
 
   activationScript = ''
     # will be rebuilt automatically
-    rm -fv "$HOME/.cache/ksycoca"*
+    rm -fv "''${XDG_CACHE_HOME:-$HOME/.cache}/ksycoca"*
   '';
 in
 {

From 932e4fee6474e2cd152d180f105a868acb9b6c6c Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 18 Oct 2025 22:36:30 +0100
Subject: [PATCH 0911/6226] isl_0_24: remove unused

Latest version is `isl_0_27`. Let's drop intermediate unused version.
---
 pkgs/development/libraries/isl/0.24.0.nix | 11 -----------
 pkgs/top-level/aliases.nix                |  1 +
 pkgs/top-level/all-packages.nix           |  2 --
 3 files changed, 1 insertion(+), 13 deletions(-)
 delete mode 100644 pkgs/development/libraries/isl/0.24.0.nix

diff --git a/pkgs/development/libraries/isl/0.24.0.nix b/pkgs/development/libraries/isl/0.24.0.nix
deleted file mode 100644
index 90eb5ec0fac2..000000000000
--- a/pkgs/development/libraries/isl/0.24.0.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-import ./generic.nix rec {
-  version = "0.24";
-  urls = [
-    "mirror://sourceforge/libisl/isl-${version}.tar.xz"
-    "https://libisl.sourceforge.io/isl-${version}.tar.xz"
-  ];
-  sha256 = "1bgbk6n93qqn7w8v21kxf4x6dc3z0ypqrzvgfd46nhagak60ac84";
-  configureFlags = [
-    "--with-gcc-arch=generic" # don't guess -march=/mtune=
-  ];
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 41e17ec60aff..61b6b840967d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1242,6 +1242,7 @@ mapAliases {
   isl_0_11 = throw "isl_0_11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
   isl_0_14 = throw "isl_0_14 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
   isl_0_17 = throw "isl_0_17 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
+  isl_0_24 = throw "isl_0_24 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-10-18
   istatmenus = throw "istatmenus has beend renamed to istat-menus"; # Added 2025-05-05
   iso-flags-png-320x420 = lib.warnOnInstantiate "iso-flags-png-320x420 has been renamed to iso-flags-png-320x240" iso-flags-png-320x240; # Added 2024-07-17
   itktcl = tclPackages.itktcl; # Added 2024-10-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73835d9e9cd7..522b7fd2bede 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3138,13 +3138,11 @@ with pkgs;
       isl = isl_0_20;
       isl_0_20 = callPackage ../development/libraries/isl/0.20.0.nix { };
       isl_0_23 = callPackage ../development/libraries/isl/0.23.0.nix { };
-      isl_0_24 = callPackage ../development/libraries/isl/0.24.0.nix { };
       isl_0_27 = callPackage ../development/libraries/isl/0.27.0.nix { };
     })
     isl
     isl_0_20
     isl_0_23
-    isl_0_24
     isl_0_27
     ;
 

From fd6c3ab7b8260be85d8a6a38fc509d098d1341d4 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sat, 18 Oct 2025 22:24:23 +0000
Subject: [PATCH 0912/6226] libxls: fix build against gettext >= 0.25

---
 pkgs/by-name/li/libxls/package.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/by-name/li/libxls/package.nix b/pkgs/by-name/li/libxls/package.nix
index ab020551d986..ac0e763e341c 100644
--- a/pkgs/by-name/li/libxls/package.nix
+++ b/pkgs/by-name/li/libxls/package.nix
@@ -17,6 +17,21 @@ stdenv.mkDerivation rec {
     hash = "sha256-KbITHQ9s2RUeo8zR53R9s4WUM6z8zzddz1k47So0Mlw=";
   };
 
+  # workaround required to build against gettext >= 0.25
+  # https://savannah.gnu.org/support/index.php?111272
+  preAutoreconf = ''
+    autopoint --force
+  '';
+
+  # workaround required to build against gettext >= 0.25
+  # https://savannah.gnu.org/support/index.php?111273
+  autoreconfFlags = [
+    "--include=m4"
+    "--install"
+    "--force"
+    "--verbose"
+  ];
+
   nativeBuildInputs = [
     autoreconfHook
     autoconf-archive

From f12bc4f119999c91aed02fbccd861c24441d28aa Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sat, 18 Oct 2025 22:24:23 +0000
Subject: [PATCH 0913/6226] libxls: enable checks

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

diff --git a/pkgs/by-name/li/libxls/package.nix b/pkgs/by-name/li/libxls/package.nix
index ac0e763e341c..5a2eeda71610 100644
--- a/pkgs/by-name/li/libxls/package.nix
+++ b/pkgs/by-name/li/libxls/package.nix
@@ -39,6 +39,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  doCheck = true;
+
   meta = with lib; {
     description = "Extract Cell Data From Excel xls files";
     homepage = "https://github.com/libxls/libxls";

From ced6225c49d2abe66b550b5e83ebc970b7744d80 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sat, 18 Oct 2025 22:24:23 +0000
Subject: [PATCH 0914/6226] libxls: modernize

---
 pkgs/by-name/li/libxls/package.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/li/libxls/package.nix b/pkgs/by-name/li/libxls/package.nix
index 5a2eeda71610..2b05808ea436 100644
--- a/pkgs/by-name/li/libxls/package.nix
+++ b/pkgs/by-name/li/libxls/package.nix
@@ -6,14 +6,14 @@
   autoconf-archive,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libxls";
   version = "1.6.3";
 
   src = fetchFromGitHub {
     owner = "libxls";
     repo = "libxls";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-KbITHQ9s2RUeo8zR53R9s4WUM6z8zzddz1k47So0Mlw=";
   };
 
@@ -41,12 +41,13 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Extract Cell Data From Excel xls files";
+    changelog = "https://github.com/libxls/libxls/releases/tag/v${finalAttrs.version}";
     homepage = "https://github.com/libxls/libxls";
-    license = licenses.bsd2;
+    license = lib.licenses.bsd2;
     maintainers = [ ];
     mainProgram = "xls2csv";
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
-}
+})

From ece31170f2692391629935dfcc3284c844c63f36 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 4 Oct 2025 16:56:01 +0200
Subject: [PATCH 0915/6226] freedv: 2.0.1 -> 2.0.2

---
 pkgs/by-name/fr/freedv/package.nix | 27 ++++++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix
index 59e81b9cc729..b558288d28d7 100644
--- a/pkgs/by-name/fr/freedv/package.nix
+++ b/pkgs/by-name/fr/freedv/package.nix
@@ -25,6 +25,18 @@
 }:
 
 let
+  ebur128Src = fetchFromGitHub {
+    owner = "jiixyj";
+    repo = "libebur128";
+    rev = "v1.2.6";
+    hash = "sha256-UKO2k+kKH/dwt2xfaYMrH/GXjEkIrnxh1kGG/3P5d3Y=";
+  };
+  mimallocSrc = fetchFromGitHub {
+    owner = "microsoft";
+    repo = "mimalloc";
+    tag = "v2.2.4";
+    hash = "sha256-+8xZT+mVEqlqabQc+1buVH/X6FZxvCd0rWMyjPu9i4o=";
+  };
   radaeSrc = fetchFromGitHub {
     owner = "drowe67";
     repo = "radae";
@@ -34,13 +46,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "freedv";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "drowe67";
     repo = "freedv-gui";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+hVh5GgSz8MWib10dVV6gx9EvocvLAJm2Eid/4y//2E=";
+    hash = "sha256-awWeq0ueKAK+4mAM0Nv3SsSv/mIFQ+/TqCPw9wjed1w=";
   };
 
   patches = [
@@ -48,11 +60,20 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postPatch = ''
+    cp -R ${ebur128Src} ebur128
+    cp -R ${mimallocSrc} mimalloc
     cp -R ${radaeSrc} radae
-    chmod -R u+w radae
+    chmod -R u+w ebur128 mimalloc radae
     substituteInPlace radae/cmake/BuildOpus.cmake \
       --replace-fail "https://gitlab.xiph.org/xiph/opus/-/archive/main/opus-main.tar.gz" "${libopus.src}" \
       --replace-fail "./autogen.sh && " ""
+    substituteInPlace cmake/BuildEbur128.cmake \
+      --replace-fail "GIT_REPOSITORY https://github.com/jiixyj/libebur128.git" "URL $(realpath ebur128)" \
+      --replace-fail 'GIT_TAG "v''${EBUR128_VERSION}"' "" \
+      --replace-fail "git apply" "patch -p1 <"
+    substituteInPlace cmake/BuildMimalloc.cmake \
+      --replace-fail "GIT_REPOSITORY https://github.com/microsoft/mimalloc.git" "URL $(realpath mimalloc)" \
+      --replace-fail "GIT_TAG        v2.2.4" ""
     substituteInPlace cmake/BuildRADE.cmake \
       --replace-fail "GIT_REPOSITORY https://github.com/drowe67/radae.git" "URL $(realpath radae)" \
       --replace-fail "GIT_TAG main" ""

From 9b7a288947451982c405279f0a78474cc5cc85ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Sat, 18 Oct 2025 15:41:57 -0700
Subject: [PATCH 0916/6226] cpp-redis: fix build failure with cmake 4

- CMake 4 is no longer retro compatible with versions < 3.5
---
 pkgs/by-name/cp/cpp-redis/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/cp/cpp-redis/package.nix b/pkgs/by-name/cp/cpp-redis/package.nix
index 0d99b8069179..88b099eb0f0e 100644
--- a/pkgs/by-name/cp/cpp-redis/package.nix
+++ b/pkgs/by-name/cp/cpp-redis/package.nix
@@ -27,6 +27,14 @@ stdenv.mkDerivation rec {
     ./01-fix-sleep_for.patch
   ];
 
+  # CMake 2.8.7 is deprecated and is no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt tacopie/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.8.7)" \
+      "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "C++11 Lightweight Redis client: async, thread-safe, no dependency, pipelining, multi-platform";
     homepage = "https://github.com/cpp-redis/cpp_redis";

From 05bb626476e6bc0661302c0a58da293fe77deacf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 18 Oct 2025 23:12:44 +0000
Subject: [PATCH 0917/6226] codebuff: 1.0.501 -> 1.0.502

---
 pkgs/by-name/co/codebuff/package-lock.json | 8 ++++----
 pkgs/by-name/co/codebuff/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/co/codebuff/package-lock.json b/pkgs/by-name/co/codebuff/package-lock.json
index 28635eaee437..583fda7eb3e0 100644
--- a/pkgs/by-name/co/codebuff/package-lock.json
+++ b/pkgs/by-name/co/codebuff/package-lock.json
@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "codebuff": "^1.0.501"
+        "codebuff": "^1.0.502"
       }
     },
     "node_modules/chownr": {
@@ -18,9 +18,9 @@
       }
     },
     "node_modules/codebuff": {
-      "version": "1.0.501",
-      "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.501.tgz",
-      "integrity": "sha512-ZTvQce7Qj5tjWt63AJujjGkCDLLWAXm3vrKOKlfUKXPXJQfbM8TYljB2+fnMEkjgShZ3Fg+nSEIb1q7hcuBTbQ==",
+      "version": "1.0.502",
+      "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.502.tgz",
+      "integrity": "sha512-gI1e7Hf+gnZux9O+NjhkGrR9kXltycLEvwMmULJ+2t72mk1bvDrCjRuzIZ5AFWxUeZsCj/rVtBpoJail9Qz7Og==",
       "cpu": [
         "x64",
         "arm64"
diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix
index 63eb9948803e..8cb7214c6d23 100644
--- a/pkgs/by-name/co/codebuff/package.nix
+++ b/pkgs/by-name/co/codebuff/package.nix
@@ -6,14 +6,14 @@
 
 buildNpmPackage rec {
   pname = "codebuff";
-  version = "1.0.501";
+  version = "1.0.502";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz";
-    hash = "sha256-WW599dxu7LdL2pU0nb4zZb3ek67MlTpJ/H9aa7SWhi8=";
+    hash = "sha256-2bskaDG7T/27Re1X4ZXsUrcu1WBb1+iuVcAOqWBRw8w=";
   };
 
-  npmDepsHash = "sha256-M8BD9XMnn6ETifLl0j4fe2+UDaAGOA9mN2SsmXSfMPM=";
+  npmDepsHash = "sha256-zqtV6AB2N8M9WqVc1JpfEOIoAyxoVEY3zO7WQiwwpQc=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 8c20972bbdcb001b37d34d21c7c68fc00a33adb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Sat, 18 Oct 2025 16:15:38 -0700
Subject: [PATCH 0918/6226] uri: fix build failure with cmake 4

- CMake 4 is no longer retro compatible with versions < 3.5
---
 pkgs/by-name/ur/uri/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/ur/uri/package.nix b/pkgs/by-name/ur/uri/package.nix
index 5b788d8d424a..fadb45516731 100644
--- a/pkgs/by-name/ur/uri/package.nix
+++ b/pkgs/by-name/ur/uri/package.nix
@@ -41,6 +41,14 @@ stdenv.mkDerivation rec {
     "-DBUILD_SHARED_LIBS=ON"
   ];
 
+  # CMake 2.8 is deprecated and is no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.8)" \
+      "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postBuild = "make doc";
 
   postInstall = ''

From ac0da8e80f9e724677f3ab2d3eb071b03f766629 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 11 Oct 2025 11:01:45 -0300
Subject: [PATCH 0919/6226] legendary-gl: move to by-name, modernize

---
 .../le/legendary-gl/package.nix}              | 29 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 15 insertions(+), 16 deletions(-)
 rename pkgs/{games/legendary-gl/default.nix => by-name/le/legendary-gl/package.nix} (58%)

diff --git a/pkgs/games/legendary-gl/default.nix b/pkgs/by-name/le/legendary-gl/package.nix
similarity index 58%
rename from pkgs/games/legendary-gl/default.nix
rename to pkgs/by-name/le/legendary-gl/package.nix
index 30b58df3f040..cf0c0dc8bb79 100644
--- a/pkgs/games/legendary-gl/default.nix
+++ b/pkgs/by-name/le/legendary-gl/package.nix
@@ -2,43 +2,44 @@
   lib,
   gitUpdater,
   fetchFromGitHub,
-  buildPythonApplication,
-  pythonOlder,
-  requests,
-  filelock,
+  python3Packages,
 }:
 
-buildPythonApplication {
+python3Packages.buildPythonApplication {
   pname = "legendary-gl"; # Name in pypi
   version = "0.20.34";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "derrod";
     repo = "legendary";
     rev = "56d439ed2d3d9f34e2b08fa23e627c23a487b8d6";
-    sha256 = "sha256-yCHeeEGw+9gtRMGyIhbStxJhmSM/1Fqly7HSRDkZILQ=";
+    hash = "sha256-yCHeeEGw+9gtRMGyIhbStxJhmSM/1Fqly7HSRDkZILQ=";
   };
 
-  propagatedBuildInputs = [
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
     requests
     filelock
   ];
 
-  disabled = pythonOlder "3.8";
+  disabled = python3Packages.pythonOlder "3.8";
 
   # no tests
   doCheck = false;
 
   pythonImportsCheck = [ "legendary" ];
 
-  meta = with lib; {
+  passthru.updateScript = gitUpdater { };
+
+  meta = {
     description = "Free and open-source Epic Games Launcher alternative";
     homepage = "https://github.com/derrod/legendary";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ equirosa ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ equirosa ];
     mainProgram = "legendary";
   };
-
-  passthru.updateScript = gitUpdater { };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7929573bb49d..77eb4aee9fb5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13485,8 +13485,6 @@ with pkgs;
 
   leela-zero = libsForQt5.callPackage ../games/leela-zero { };
 
-  legendary-gl = python3Packages.callPackage ../games/legendary-gl { };
-
   liquidwar = callPackage ../games/liquidwar {
     guile = guile_2_0;
   };

From 604f19efd7a7cad5a6a7471d8d108ee75bc72105 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 19 Oct 2025 01:46:11 +0200
Subject: [PATCH 0920/6226] plotinus: fix build with cmake4

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

diff --git a/pkgs/by-name/pl/plotinus/package.nix b/pkgs/by-name/pl/plotinus/package.nix
index 4d66711a3220..1fdc8b31177f 100644
--- a/pkgs/by-name/pl/plotinus/package.nix
+++ b/pkgs/by-name/pl/plotinus/package.nix
@@ -24,6 +24,14 @@ stdenv.mkDerivation rec {
     sha256 = "19k6f6ivg4ab57m62g6fkg85q9sv049snmzq1fyqnqijggwshxfz";
   };
 
+  postPatch = ''
+    # CMake 2.8 is deprecated and is no longer supported by CMake > 4
+    # https://github.com/NixOS/nixpkgs/issues/445447
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" \
+        "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [
     pkg-config
     wrapGAppsHook3

From 704a1c0564125a2415f9a0902f3f8954d5fcae50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Sat, 18 Oct 2025 16:46:50 -0700
Subject: [PATCH 0921/6226] bio-gappa: fix build failure with cmake 4

- CMake 4 is no longer retro compatible with versions < 3.5
---
 pkgs/by-name/bi/bio-gappa/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/bi/bio-gappa/package.nix b/pkgs/by-name/bi/bio-gappa/package.nix
index 334afeff26f7..f619ad313517 100644
--- a/pkgs/by-name/bi/bio-gappa/package.nix
+++ b/pkgs/by-name/bi/bio-gappa/package.nix
@@ -34,6 +34,17 @@ stdenv.mkDerivation (finalAttrs: {
     xz
   ];
 
+  # CMake 2.8.7 is deprecated and is no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required (VERSION 2.8.7 FATAL_ERROR)" \
+      "cmake_minimum_required (VERSION 3.10  FATAL_ERROR)"
+    substituteInPlace libs/genesis/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)" \
+      "cmake_minimum_required (VERSION 3.10   FATAL_ERROR)"
+  '';
+
   installPhase = ''
     runHook preInstall
     mkdir -p $out/bin

From b48f60307545e6e888769827cd6b1381508ec1e2 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 19 Oct 2025 02:17:41 +0200
Subject: [PATCH 0922/6226] pdfslicer: fix build with cmake4

---
 pkgs/by-name/pd/pdfslicer/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/pd/pdfslicer/package.nix b/pkgs/by-name/pd/pdfslicer/package.nix
index 9af9f541b486..27ac7fb33c5d 100644
--- a/pkgs/by-name/pd/pdfslicer/package.nix
+++ b/pkgs/by-name/pd/pdfslicer/package.nix
@@ -29,6 +29,16 @@ stdenv.mkDerivation rec {
     # Don't build tests, vendored catch doesn't build with latest glibc.
     substituteInPlace CMakeLists.txt \
       --replace "add_subdirectory (tests)" ""
+
+    # Replace deprecated and now unsupported old cmake version
+    # https://github.com/NixOS/nixpkgs/issues/445447
+
+    substituteInPlace third-party/fmtlib/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1.0)" \
+        "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace third-party/GSL/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1.3)" \
+        "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [

From 1f3f8aed59dec7c8e9f414b2f0cd7d7775a86cdc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 00:31:59 +0000
Subject: [PATCH 0923/6226] skrooge: 25.4.0 -> 25.10.0

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

diff --git a/pkgs/by-name/sk/skrooge/package.nix b/pkgs/by-name/sk/skrooge/package.nix
index 6bd4487b1531..631cfa06e1af 100644
--- a/pkgs/by-name/sk/skrooge/package.nix
+++ b/pkgs/by-name/sk/skrooge/package.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation rec {
   pname = "skrooge";
-  version = "25.4.0";
+  version = "25.10.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/skrooge/skrooge-${version}.tar.xz";
-    hash = "sha256-HNui/SjCN9LWxUxHDae59n5qPIwYWHX1uFSlVnwBlL8=";
+    hash = "sha256-kECWi5/q2reBOs9DrubOz5Vol3AkA7lXzOLtbgx2HlE=";
   };
 
   nativeBuildInputs = with kdePackages; [

From 023e7f419ba8343d54d1fdf65be482ead7febc1b Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 19 Oct 2025 02:34:06 +0200
Subject: [PATCH 0924/6226] kronometer: fix build with cmake4

---
 pkgs/tools/misc/kronometer/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/tools/misc/kronometer/default.nix b/pkgs/tools/misc/kronometer/default.nix
index f8442ecd6c46..a3c5818a4933 100644
--- a/pkgs/tools/misc/kronometer/default.nix
+++ b/pkgs/tools/misc/kronometer/default.nix
@@ -1,6 +1,7 @@
 {
   mkDerivation,
   fetchurl,
+  fetchpatch,
   lib,
   extra-cmake-modules,
   kdoctools,
@@ -18,6 +19,13 @@ mkDerivation rec {
     sha256 = "sha256-dbnhom8PRo0Bay3DzS2P0xQSrJaMXD51UadQL3z6xHY=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://invent.kde.org/utilities/kronometer/-/commit/949f1dccd48f4a1e3068e24d241c5ce73fe2ab8f.patch";
+      hash = "sha256-zv9ty25vQXr3xB1S7QmXx3YIouOVUoMpdZ9gHBD1gMQ=";
+    })
+  ];
+
   meta = with lib; {
     homepage = "https://kde.org/applications/utilities/kronometer/";
     description = "Stopwatch application";

From d89867c8e7bb611cbab37a91960f2bfc1dc1f88e Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 19 Oct 2025 02:45:54 +0200
Subject: [PATCH 0925/6226] osmid: fix build with cmake4

---
 pkgs/by-name/os/osmid/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/os/osmid/package.nix b/pkgs/by-name/os/osmid/package.nix
index 57257882b810..8cd51e0149fe 100644
--- a/pkgs/by-name/os/osmid/package.nix
+++ b/pkgs/by-name/os/osmid/package.nix
@@ -18,6 +18,16 @@ stdenv.mkDerivation rec {
     sha256 = "1s1wsrp6g6wb0y61xzxvaj59mwycrgy52r4h456086zkz10ls6hw";
   };
 
+  postPatch = ''
+    # replace deprecated cmake version that are no longer supported by CMake > 4
+    # https://github.com/NixOS/nixpkgs/issues/445447
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.0)" "cmake_minimum_required (VERSION 3.10)"
+    substituteInPlace external_libs/oscpack_1_1_0/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required (VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [

From 0b110885408c251afde49b756ec88821b0fc4ca8 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 19 Oct 2025 02:57:01 +0200
Subject: [PATCH 0926/6226] orocos-kdl: 1.5.1 -> 1.5.3

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

diff --git a/pkgs/by-name/or/orocos-kdl/package.nix b/pkgs/by-name/or/orocos-kdl/package.nix
index e2ea39a3a8eb..1353be09928f 100644
--- a/pkgs/by-name/or/orocos-kdl/package.nix
+++ b/pkgs/by-name/or/orocos-kdl/package.nix
@@ -8,14 +8,14 @@
 
 stdenv.mkDerivation rec {
   pname = "orocos-kdl";
-  version = "1.5.1";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "orocos";
     repo = "orocos_kinematics_dynamics";
-    tag = "v${version}";
-    sha256 = "15ky7vw461005axx96d0f4zxdnb9dxl3h082igyd68sbdb8r1419";
+    tag = "${version}";
     # Needed to build Python bindings
+    hash = "sha256-4pPU+6uMMYLGq2V46wmg6lHFVhwFXrEg7PfnWGAI2is=";
     fetchSubmodules = true;
   };
 

From 4b6da520f711f9680536c3bd0b5a22738a25577e Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 19 Oct 2025 03:04:04 +0200
Subject: [PATCH 0927/6226] opentracing-cpp: drop

---
 pkgs/by-name/op/opentracing-cpp/package.nix | 26 ---------------------
 pkgs/top-level/aliases.nix                  |  1 +
 2 files changed, 1 insertion(+), 26 deletions(-)
 delete mode 100644 pkgs/by-name/op/opentracing-cpp/package.nix

diff --git a/pkgs/by-name/op/opentracing-cpp/package.nix b/pkgs/by-name/op/opentracing-cpp/package.nix
deleted file mode 100644
index 8f125e2bcbf4..000000000000
--- a/pkgs/by-name/op/opentracing-cpp/package.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-}:
-stdenv.mkDerivation rec {
-  pname = "opentracing-cpp";
-  version = "1.6.0";
-  src = fetchFromGitHub {
-    owner = "opentracing";
-    repo = "opentracing-cpp";
-    rev = "v${version}";
-    sha256 = "09wdwbz8gbjgyqi764cyb6aw72wng6hwk44xpl432gl7whrrysvi";
-  };
-
-  nativeBuildInputs = [ cmake ];
-
-  meta = {
-    description = "C++ implementation of the OpenTracing API";
-    homepage = "https://opentracing.io";
-    license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ rob ];
-  };
-
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 909f5afde9a1..98a9577a799b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2004,6 +2004,7 @@ mapAliases {
   opensyclWithRocm = lib.warnOnInstantiate "'opensyclWithRocm' has been renamed to 'adaptivecppWithRocm'" adaptivecppWithRocm; # Added 2024-12-04
   open-timeline-io = lib.warnOnInstantiate "'open-timeline-io' has been renamed to 'opentimelineio'" opentimelineio; # Added 2025-08-10
   opentofu-ls = lib.warnOnInstantiate "'opentofu-ls' has been renamed to 'tofu-ls'" tofu-ls; # Added 2025-06-10
+  opentracing-cpp = throw "'opentracingc-cpp' has been removed as it was archived upstream in 2024"; # Added 2025-10-19
   openvdb_11 = throw "'openvdb_11' has been removed in favor of the latest version'"; # Added 2025-05-03
   opera = throw "'opera' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-05-19
   orchis = throw "'orchis' has been renamed to/replaced by 'orchis-theme'"; # Converted to throw 2024-10-17

From 638cb0185756b64d3a0a9c63c29a5f173937cec0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 01:11:42 +0000
Subject: [PATCH 0928/6226] phpExtensions.memcached: 3.3.0 -> 3.4.0

---
 pkgs/development/php-packages/memcached/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/memcached/default.nix b/pkgs/development/php-packages/memcached/default.nix
index f8201fcd2dc9..59132f26cbfb 100644
--- a/pkgs/development/php-packages/memcached/default.nix
+++ b/pkgs/development/php-packages/memcached/default.nix
@@ -11,13 +11,13 @@
 
 buildPecl rec {
   pname = "memcached";
-  version = "3.3.0";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "php-memcached-dev";
     repo = "php-memcached";
     rev = "v${version}";
-    sha256 = "sha256-V4d6bY0m1nuEfjZjt3qio4/HOBcSlD9+XMEl1GPfbhs=";
+    sha256 = "sha256-sweEM4TVId+6ySffulmebZpz390dZXb+G3zFZvc45L8=";
   };
 
   internalDeps = [ php.extensions.session ];

From 37f7e563507226c6875152de5eb06d96bab00b71 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 19 Oct 2025 03:29:09 +0200
Subject: [PATCH 0929/6226] nginxModules.opentracing: drop

---
 pkgs/servers/http/nginx/modules.nix | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index 45e7740ad8de..ded98d770493 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -28,7 +28,6 @@
   luajit_openresty,
   msgpuck,
   openssl,
-  opentracing-cpp,
   pam,
   psol,
   which,
@@ -559,30 +558,6 @@ let
       };
     };
 
-    opentracing = {
-      name = "opentracing";
-      src =
-        let
-          src' = fetchFromGitHub {
-            name = "opentracing";
-            owner = "opentracing-contrib";
-            repo = "nginx-opentracing";
-            rev = "v0.10.0";
-            sha256 = "1q234s3p55xv820207dnh4fcxkqikjcq5rs02ai31ylpmfsf0kkb";
-          };
-        in
-        "${src'}/opentracing";
-
-      inputs = [ opentracing-cpp ];
-
-      meta = with lib; {
-        description = "Enable requests served by nginx for distributed tracing via The OpenTracing Project";
-        homepage = "https://github.com/opentracing-contrib/nginx-opentracing";
-        license = with licenses; [ asl20 ];
-        maintainers = [ ];
-      };
-    };
-
     pagespeed = {
       name = "pagespeed";
       src =
@@ -1115,4 +1090,5 @@ self
   modsecurity-nginx = self.modsecurity;
   fastcgi-cache-purge = throw "fastcgi-cache-purge was renamed to cache-purge";
   ngx_aws_auth = throw "ngx_aws_auth was renamed to aws-auth";
+  opentracing = throw "opentracing-cpp was removed because opentracing as been archived upstream"; # Added 2025-10-19
 }

From 7997be85a28f51c8fc295238625ce9e5d3eddad6 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sat, 18 Oct 2025 03:48:20 +0800
Subject: [PATCH 0930/6226] mmg: 5.7.3-unstable-2024-05-31 -> 5.8.0

---
 pkgs/by-name/mm/mmg/package.nix | 59 +++++++++++++++++++++++----------
 1 file changed, 41 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/mm/mmg/package.nix b/pkgs/by-name/mm/mmg/package.nix
index f9587f9670f5..5ee5814cfd14 100644
--- a/pkgs/by-name/mm/mmg/package.nix
+++ b/pkgs/by-name/mm/mmg/package.nix
@@ -1,43 +1,66 @@
 {
-  stdenv,
   lib,
+  stdenv,
   fetchFromGitHub,
-  unstableGitUpdater,
   cmake,
   perl,
+  scotch,
+  vtk,
+  withVtk ? false,
+  testers,
 }:
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mmg";
-  version = "5.7.3-unstable-2024-05-31";
+  version = "5.8.0";
 
   src = fetchFromGitHub {
     owner = "MmgTools";
     repo = "mmg";
-    rev = "5a73683f84fe422031921bef4ced8905d8b9eb7e";
-    hash = "sha256-8m4iDsJdjlzuXatfIIZCY8RgrEp4BQihhmQfytu8aaU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-jiOScvzyO+bN2wYwcQmWhLkLSkTWVplMrXKRFttGisw=";
   };
 
-  passthru.updateScript = unstableGitUpdater { };
+  outputs = [
+    "out"
+    "dev"
+    "man"
+  ];
+
+  postPatch = ''
+    patchShebangs --build scripts
+  '';
 
   nativeBuildInputs = [
     cmake
-    perl
+    perl # required for generating fortran headers
   ];
 
-  preConfigure = ''
-    patchShebangs ./
-  '';
+  propagatedBuildInputs = [
+    scotch
+  ]
+  ++ lib.optional withVtk vtk;
 
   cmakeFlags = [
-    "-DBUILD_SHARED_LIBS:BOOL=TRUE"
-    "-DMMG_INSTALL_PRIVATE_HEADERS=ON"
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+    (lib.cmakeBool "MMG_INSTALL_PRIVATE_HEADERS" true) # required by downstream parmmg
+    (lib.cmakeBool "USE_ELAS" false)
+    (lib.cmakeBool "USE_SCOTCH" true)
+    (lib.cmakeBool "USE_VTK" withVtk)
+    (lib.cmakeBool "PMMG_CALL" vtk.mpiSupport)
   ];
 
-  meta = with lib; {
+  passthru.tests = {
+    cmake-config = testers.hasCmakeConfigModules {
+      moduleNames = [ "mmg" ];
+      package = finalAttrs.finalPackage;
+    };
+  };
+
+  meta = {
     description = "Open source software for bidimensional and tridimensional remeshing";
     homepage = "http://www.mmgtools.org/";
-    platforms = platforms.unix;
-    license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ mkez ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ mkez ];
   };
-}
+})

From 7c75b858fba0c2f5e1947da87affe0d10e1678e3 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sat, 18 Oct 2025 04:37:24 +0800
Subject: [PATCH 0931/6226] parmmg: 1.4.0-unstable-2024-04-22 -> 1.5.0

---
 pkgs/by-name/pa/parmmg/package.nix | 75 ++++++++++++++++++++----------
 1 file changed, 50 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/pa/parmmg/package.nix b/pkgs/by-name/pa/parmmg/package.nix
index 529acf6828a9..0d1681c04f2c 100644
--- a/pkgs/by-name/pa/parmmg/package.nix
+++ b/pkgs/by-name/pa/parmmg/package.nix
@@ -1,59 +1,84 @@
 {
-  stdenv,
   lib,
+  stdenv,
+  fetchpatch2,
   fetchFromGitHub,
-  unstableGitUpdater,
   cmake,
   gfortran,
   perl,
   mpi,
   metis,
   mmg,
+  scotch,
+  vtk-full,
+  withVtk ? true,
+  testers,
 }:
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "parmmg";
-  version = "1.4.0-unstable-2024-04-22";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "MmgTools";
     repo = "ParMmg";
-    rev = "f8a5338ea1bb2c778bfb4559c2c3974ba15b4730";
-    hash = "sha256-ieFHREAVeD7IwDUCtsMG5UKxahxM+wzNCAqCOHIHwu8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-LDbfGuTRd2wzmNHxXd381qVuOlWqqDdP8+Y/v1H68uM=";
   };
 
-  passthru.updateScript = unstableGitUpdater { };
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/MmgTools/ParMmg/commit/a9551c502c58a1f8a109fb17d8f45cb9370f8fc6.patch?full_index=1";
+      hash = "sha256-i0KwzseffeI9UYIYuyNYmdF9eTZ+nQQfSI6ukSowIYs=";
+    })
+  ];
+
+  postPatch = ''
+    patchShebangs --build scripts
+  '';
 
   nativeBuildInputs = [
     cmake
     gfortran
-    mpi
     perl
   ];
 
   buildInputs = [
     mpi
     metis
-    mmg
-  ];
-
-  strictDeps = true;
-
-  preConfigure = ''
-    patchShebangs --build ./
-  '';
+    scotch
+    (mmg.override {
+      inherit withVtk;
+      vtk = vtk-full;
+    })
+  ]
+  ++ lib.optional withVtk vtk-full;
 
   cmakeFlags = [
-    "-DBUILD_SHARED_LIBS:BOOL=TRUE"
-    "-DDOWNLOAD_MMG=OFF"
-    "-DDOWNLOAD_METIS=OFF"
-    "-Wno-dev"
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+    (lib.cmakeBool "DOWNLOAD_MMG" false)
+    (lib.cmakeBool "DOWNLOAD_METIS" false)
+    (lib.cmakeBool "USE_ELAS" false)
+    (lib.cmakeBool "USE_SCOTCH" true)
+    (lib.cmakeBool "USE_VTK" withVtk)
   ];
 
-  meta = with lib; {
+  passthru.tests = {
+    cmake-config = testers.hasCmakeConfigModules {
+      moduleNames = [ "ParMmg" ];
+      package = finalAttrs.finalPackage;
+    };
+  };
+
+  meta = {
     description = "Distributed parallelization of 3D volume mesh adaptation";
     homepage = "http://www.mmgtools.org/";
-    platforms = platforms.unix;
-    license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ mkez ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.lgpl3Plus;
+    maintainers = with lib.maintainers; [ mkez ];
   };
-}
+})

From dced4c3dafc28cb3717e44e3ceb7d69078f3e3b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 05:15:10 +0000
Subject: [PATCH 0932/6226] astal.source: 0-unstable-2025-10-09 ->
 0-unstable-2025-10-18

---
 pkgs/development/libraries/astal/source.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/astal/source.nix b/pkgs/development/libraries/astal/source.nix
index 7c121da0a806..68184fc380ae 100644
--- a/pkgs/development/libraries/astal/source.nix
+++ b/pkgs/development/libraries/astal/source.nix
@@ -7,15 +7,15 @@ let
   originalDrv = fetchFromGitHub {
     owner = "Aylur";
     repo = "astal";
-    rev = "71b008e5fb59e0a992724db78d54a5ddcf234515";
-    hash = "sha256-vMhDAwwSrwMd5xWcTiA56fsk7LRz4tHOsKhrt2hXi48=";
+    rev = "0b57af330086ee9492f63d2cb77b993b1ce38b6f";
+    hash = "sha256-fXJFoYjjiqkAXfiadshGrABuZ2VxmINKjXFbYtWBHiY=";
   };
 in
 originalDrv.overrideAttrs (
   final: prev: {
     name = "${final.pname}-${final.version}"; # fetchFromGitHub already defines name
     pname = "astal-source";
-    version = "0-unstable-2025-10-09";
+    version = "0-unstable-2025-10-18";
 
     meta = prev.meta // {
       description = "Building blocks for creating custom desktop shells (source)";

From 649e76f77a6f553009560a68503fcbadfc65fa95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Sat, 18 Oct 2025 16:15:56 -0700
Subject: [PATCH 0933/6226] cppcodec: fix build failure with cmake 4

- CMake 4 is no longer retro compatible with versions < 3.5
---
 pkgs/by-name/cp/cppcodec/package.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/by-name/cp/cppcodec/package.nix b/pkgs/by-name/cp/cppcodec/package.nix
index 0f08e3ee636d..e8f9910398c5 100644
--- a/pkgs/by-name/cp/cppcodec/package.nix
+++ b/pkgs/by-name/cp/cppcodec/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -16,6 +17,17 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-k4EACtDOSkTXezTeFtVdM1EVJjvGga/IQSrvDzhyaXw=";
   };
 
+  patches = [
+    # CMake 2.8 is deprecated and is no longer supported by CMake > 4
+    # https://github.com/NixOS/nixpkgs/issues/445447
+    # Luckily, this has been fixed on master.
+    (fetchpatch {
+      name = "modernize-cmake.patch";
+      url = "https://github.com/tplgy/cppcodec/commit/8019b8b580f8573c33c50372baec7039dfe5a8ce.patch";
+      hash = "sha256-0MCx3nTsey4Qonx+lyexbcxut0qIHOJZbkJ9u23Zuv8=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   meta = with lib; {

From c5c6917336ff7830b708ac52b67a04b494a7aeca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Sat, 18 Oct 2025 16:25:12 -0700
Subject: [PATCH 0934/6226] nitrokey-app: fix build failure with cmake 4

- CMake 4 is no longer retro compatible with versions < 3.5
---
 pkgs/tools/security/nitrokey-app/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/tools/security/nitrokey-app/default.nix b/pkgs/tools/security/nitrokey-app/default.nix
index 7ec4a4577ebb..cdb837262499 100644
--- a/pkgs/tools/security/nitrokey-app/default.nix
+++ b/pkgs/tools/security/nitrokey-app/default.nix
@@ -38,6 +38,17 @@ stdenv.mkDerivation rec {
     cppcodec
   ];
 
+  # CMake 3.1 is deprecated and is no longer supported by CMake > 4
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "CMAKE_MINIMUM_REQUIRED(VERSION 3.1.0 FATAL_ERROR)" \
+      "cmake_minimum_required(VERSION 3.10  FATAL_ERROR)" \
+    --replace-fail \
+      "cmake_policy(SET CMP0043 OLD)" \
+      "cmake_policy(SET CMP0043 NEW)"
+  '';
+
   meta = with lib; {
     description = "Provides extra functionality for the Nitrokey Pro and Storage";
     mainProgram = "nitrokey-app";

From 72536a4910531a2c7ed2bd6818f5002a98ad037a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 07:20:20 +0000
Subject: [PATCH 0935/6226] zarf: 0.62.0 -> 0.64.0

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

diff --git a/pkgs/by-name/za/zarf/package.nix b/pkgs/by-name/za/zarf/package.nix
index 3bb48a577497..326e7f5b7fe4 100644
--- a/pkgs/by-name/za/zarf/package.nix
+++ b/pkgs/by-name/za/zarf/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "zarf";
-  version = "0.62.0";
+  version = "0.64.0";
 
   src = fetchFromGitHub {
     owner = "zarf-dev";
     repo = "zarf";
     tag = "v${version}";
-    hash = "sha256-mabp4G7LbtOmIVEmOK/YhjTX/RRM8ObAS6YXTJe2P/U=";
+    hash = "sha256-0QauJONX31g3XB8pObS9SuxSBo/R610sdDU1ZyfQMFE=";
   };
 
-  vendorHash = "sha256-As7xDEo+bMslv9Xd6CbHTqvf2XaXmO6Gp3f9+xD3kNU=";
+  vendorHash = "sha256-0IAD7wa/ycgwVTa9r33kLFvIzTL/C1UUeQxRHQ/5c1g=";
   proxyVendor = true;
 
   nativeBuildInputs = [

From 9b31e2ddd55f7d37fd6dfc2456289fba858d83ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 07:30:57 +0000
Subject: [PATCH 0936/6226] thunderbird-esr-bin-unwrapped: 140.3.1esr ->
 140.4.0esr

---
 .../thunderbird-bin/release_esr_sources.nix   | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
index e17dac25316c..e93ffbfa246e 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix
@@ -1,1193 +1,1193 @@
 {
-  version = "140.3.1esr";
+  version = "140.4.0esr";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/af/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/af/thunderbird-140.4.0esr.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "e956f9633664fbea309bfaa7e61be6e393f8cd9f15c282f2c6489c2664e8162f";
+      sha256 = "9e7479434b4c228b3305b9f199aa986f454b7dc3c016a8290779d897d2bf2ca4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ar/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ar/thunderbird-140.4.0esr.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "9ed23fd8154194da58dfa601a1d582645151ddfa8261fb29882bc6df960d289f";
+      sha256 = "9b1bfa25f5e30974332e21541b4d481b53440a08b885f04e77a1e63c822553b0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ast/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ast/thunderbird-140.4.0esr.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "0b352e82a6ff35dc7f5cc733f8bd27913a145665eefc5cc073b055699e55ea1f";
+      sha256 = "b73fca0ffbeef0cab7fe709f7ac36ff885e04cac141a03f574a37660f31061fd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/be/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/be/thunderbird-140.4.0esr.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "acf154e3aac9ba3476a7eb66eb8acd661fdd6bc8a3a14f3df45b9e84f413684c";
+      sha256 = "5c8cf71aeed0930901b777e3af2be05f8539d4b5572272b96d064ca6c5cfbb43";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/bg/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/bg/thunderbird-140.4.0esr.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "2d6fe53a1c65a722e469e4c2951c32e9b6d549f6684e72d9622e9a0de13e88d2";
+      sha256 = "0fdd856a077c9bd05f9d0db1b51e9cbcbb63cc18aeca91eace69f2bb2e6962f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/br/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/br/thunderbird-140.4.0esr.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "ba866ad75eebbbb857f487949a5b3e94ae801f24a1a101c6f68d2e03cf7d33f4";
+      sha256 = "c99f08fb9ef698bee4776c49e596a9eb1087df0a898b4171a7e694c97ffff7b4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ca/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ca/thunderbird-140.4.0esr.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "953e7d88493c83fd7069fb9a2c2b40108f9c7b80dc87eabba447f018fe8789fd";
+      sha256 = "d330bd3366c25b8e4fe25c1b09a666bed678df72a53c7932dc091f65e9f8a728";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/cak/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/cak/thunderbird-140.4.0esr.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "bb8766aa96bf876b7c594c3a454baa12d1e3006f6d7d99b05a540e7689ef63a0";
+      sha256 = "e57ec80db6d5c8237d888d51a3b064bb395c3409be2fbf553f51025782c199aa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/cs/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/cs/thunderbird-140.4.0esr.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "f8ec6daa98ebdbcf0386c3e3637101b06c6641f1e7bd9ddb43f27d5839a21712";
+      sha256 = "1d2067204a024a99cfe8b7684860caf6f74d64dbe63c6535026aebd8bd4c85a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/cy/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/cy/thunderbird-140.4.0esr.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "2a6958a2333335d29a3d52b374792b11562efd080f72a90b8c764aa930165c5d";
+      sha256 = "34831a0cffd3bb229edb880ac5790437cd0f6e7797936b90f7d744f8e37fd88e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/da/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/da/thunderbird-140.4.0esr.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "dc68ab3c693832d16bb5e4ef6bf4cdddef3002c908ad8d89f92f7c1c8af059dd";
+      sha256 = "73e4e88d6780b1c833895ac95b9cbba958dd94f9c2ecac47019bbf3ab7975fc7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/de/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/de/thunderbird-140.4.0esr.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "d4c0f68036223d0d07615239fc11261a0b55369c449f93b5e6e1388a33bb521e";
+      sha256 = "f490462e072b9ed530c1d40c0ad897dca0edac3d470d9c113d936bb0c4d80ae7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/dsb/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/dsb/thunderbird-140.4.0esr.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "d8c1a6caf6f133f38bb3b8fd1ef6dc0e8c73e9ba1c026da6806896ed6bb2800f";
+      sha256 = "ab3816f52bf003c0423359b558ef1d3716e151937cfcee860bab294bc2abf9f5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/el/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/el/thunderbird-140.4.0esr.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "09cfaa0bdd0dca490dac907823be0f4904280bd465be8f372befd0a40198f98c";
+      sha256 = "ef27570d7c9598df0b05c178cd976b48b68ab97973cca97ff5fba485b94b5023";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/en-CA/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/en-CA/thunderbird-140.4.0esr.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "429cce649039c4cdfe7d7191a0fc5d63505ae62fbdf6052280850d0a5ce09f75";
+      sha256 = "7144e845b5322773b1bc83374b65a5949b977ab1514584902360e8bf48d3b9cf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/en-GB/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/en-GB/thunderbird-140.4.0esr.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "e5334909c6d9e994890930c68d16af1bc87c2a919edd1ddcbf94dfa248587280";
+      sha256 = "82da909b7beff292511a5cf5dfa1d1abd48736c32b320853771c6bec8b45954e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/en-US/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/en-US/thunderbird-140.4.0esr.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "c83d482d6319b52f37145398de4968eca2088f5ba9e1da0797fff8534c8ceaac";
+      sha256 = "86b461f0f53969e0da2e097ae7b353e90728c7064bddf1740d3548ca36f8d679";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/es-AR/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/es-AR/thunderbird-140.4.0esr.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "2e4d597b016d7644f2833fe90166fb19987fca8a3b7a7919de12d166fb1cf9d8";
+      sha256 = "f26300b57e09dc77dddb528c3567fd3e3e3862308b64548f0e8ef764ad8e00ad";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/es-ES/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/es-ES/thunderbird-140.4.0esr.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "f164b261572c8b0dccc01353a7a4c8548272cd58c76a55387b9f573e8586d6e8";
+      sha256 = "784091614b011ee33cc77e447724605982b1a51ad9742e9fa42b379c65feccdc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/es-MX/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/es-MX/thunderbird-140.4.0esr.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "28623be55dc8636b3d41cae572e5c34c1ec743fbb939a9989ff61852add1c258";
+      sha256 = "a6f84d6d512a4fa29966d6f4e834e63239bd2cb19915aebef3a04b09a0fc6ade";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/et/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/et/thunderbird-140.4.0esr.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "3ffe29447c94c79d16930a1be2ca274e3d65e729e830d5b304b2d3ad727ecb3f";
+      sha256 = "2022fb0653d798484ca7facdcbe51cdd0f1246a57ee4586e3a15e3347295a822";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/eu/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/eu/thunderbird-140.4.0esr.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "1eabcd128257ba2f97218b43653c7a8269a686961bb579599fb3fdcdbaa2d706";
+      sha256 = "8246129b0f728f910c7213893251e4b9ae3a82a6044e586a9899ed642cb53c4e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/fi/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/fi/thunderbird-140.4.0esr.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "dfbde834b2827c71e911b389786c809f7c05801b1bbbbd824ab9db4cdbeb1e50";
+      sha256 = "76daa6d966fbc65e7e88fd85c9cd6d04e9a7391baa9c260f2d2f28dbac2af242";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/fr/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/fr/thunderbird-140.4.0esr.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "5fd7c4b0711a78f9087095e528402f0fe5a6e770da74d7dd4884f5d0da9006a9";
+      sha256 = "77ce1cb334889472a9d2a8c1c5e448d0a3e3bf68767bc4e21b9e1b1f4e276427";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/fy-NL/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/fy-NL/thunderbird-140.4.0esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "e373fbc067f55f1c26a3874607499e3b0c7e32896d5e644f40a8b201951224a4";
+      sha256 = "703c98a57f0bcc603c0cfdee4af06a9fcfd37f0770f93fd2036b78d98736fe98";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ga-IE/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ga-IE/thunderbird-140.4.0esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "1693d0f2a785f6d07dc3c6c6e7a6185366b879841230e6203f6a641f4f87adea";
+      sha256 = "d2b0141eaa64ed130f9098edc5671d02cf1abc16f6636a49b9a72ce334a7639c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/gd/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/gd/thunderbird-140.4.0esr.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "838fd1a6af7326ea8554b08d5b9f5b2626687b35ef317cb9e6a491d4c9c41acb";
+      sha256 = "23bc5c1f4aa6125c80b7a09ca20dd2d572004b7627d9c7cf08eb4053a1d45dd0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/gl/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/gl/thunderbird-140.4.0esr.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "f50487f1bbbd2929e373cdbc157b46ee1807eb688e7ae39de93d6ded24a0b0f4";
+      sha256 = "185ba84a675a4556209e3ac4d59c5bc29c9aca27f27a72df21ca772eb4f12d0b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/he/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/he/thunderbird-140.4.0esr.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "e8c0d2e8732cad25cc59920416babae37e41a203ca0403e34b47f451cef75326";
+      sha256 = "565c4cbbca17a804021d8bebd27d4a5359456dabdaed546b7511c3436f72f6a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/hr/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/hr/thunderbird-140.4.0esr.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "6a7f0a9e1699439a95359d1308f53a65ca6c43c6fde7a783869ca7f485095f1a";
+      sha256 = "de2c998771fe24a62d3b9ebc7d731e4953a2cbd9b6c2cfa5e704af1ebc14276f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/hsb/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/hsb/thunderbird-140.4.0esr.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "5cdf82e0cc6481080e9d4462908158032f12b6968da3afb2e20db7c3b6802d87";
+      sha256 = "012bdb4197d09e61b2c439cef50d3bf63b87efd4dc515d78b0740c51bd0e998b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/hu/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/hu/thunderbird-140.4.0esr.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "662d03dd63318d1cd387d63c3451992b0f86d54c8ca362e722301db9a1419d03";
+      sha256 = "d7ac0038cc7ecf98450af9d84b029b80501e6c380d2d93f3c75f7fe66c04050a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/hy-AM/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/hy-AM/thunderbird-140.4.0esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "eb7296de57519701feae045894777714a52bb0993bdae7b540d4e88153978b2d";
+      sha256 = "b987dfa97aabc384aeac5ee2c9863742bc50c284298a915713b15ded16b061ae";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/id/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/id/thunderbird-140.4.0esr.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "41d80326c0b7b1ca341ddd2dfa1e61d61f962e47680da37970945253f5664d7b";
+      sha256 = "99f372091e98e94c6694eb68e0524d7df574b3c46a642ee48cfa3a08dffb1f99";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/is/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/is/thunderbird-140.4.0esr.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "b51fb83ed7711b9f57780839ddfcb785b31640d7b5d3a6a9f43e9d6a9ce8a52a";
+      sha256 = "b4d093d0c594dfffde08d61ad00903d1823d0f017e438c214d1dec6d371aa55c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/it/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/it/thunderbird-140.4.0esr.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "f9b65a59c9f3b86d357a12dffb5839e5db51a62ec274e78e0919fd3f6964bf17";
+      sha256 = "34777daa70b34d0f1bccb960c5f533013ab6a21f573035b7de272ad037b6896d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ja/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ja/thunderbird-140.4.0esr.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "d37693281d5a3d0eedca544f119b3dd77aae3b0d7d15c162336e6d7aa6619a33";
+      sha256 = "80c9e021d4becaef8445b4c07d3d4ab5a24801399be682424b6c9008b53e8b1d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ka/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ka/thunderbird-140.4.0esr.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "c5d56da1151b5f1e1bbfe6f80b3c60531a053ef15f7cf01205fbdb6b0599c0e4";
+      sha256 = "6860257e57a462300a7c12a6e38da9486cb7aaf2d98fd8f1ed784297d0b8ae75";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/kab/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/kab/thunderbird-140.4.0esr.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "136ba1746163a811136d9e3b220039e74b4d987027e693a5c387a8f9491bdfbc";
+      sha256 = "f5c7736d8d5241a639cfb0d07745851e41abb06b63ced06f43a89625e1070da7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/kk/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/kk/thunderbird-140.4.0esr.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "d3f34e5a7f45bd6c8915964faaf62dbd0bba3affe14ed3e690ec225f34067b2c";
+      sha256 = "e706c43bab79837b9fcc86db23280be1deab36c64bfa63ea8bdd39165967799b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ko/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ko/thunderbird-140.4.0esr.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "ff13e6ba995f2178e60d6d6a3ef18733945319f7be5dde45520f9c8c48131547";
+      sha256 = "951515b4b0ea6c1d08762bfbfca898e0a03a679dad307ffbe7fa38de1339dd2e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/lt/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/lt/thunderbird-140.4.0esr.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "e061e0e159bc68f623b0f8f80faed4ef069d3855f32b546dccb8ef9c9017bc3f";
+      sha256 = "6f3d25bac59daaf3d32f4a067eedc0a8ea62f425eba8647eca68bb88b6e4b75a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/lv/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/lv/thunderbird-140.4.0esr.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "3b678a9dade8e7e5e99d6cd14abb79b9873a7df5522a224386f0f72ed1c02c0e";
+      sha256 = "83cec3a24afbec3f8f800b4f1598ca541541129a553275c9315473b2461c2679";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ms/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ms/thunderbird-140.4.0esr.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "50b1c3e4143dbba8369836854d002e044c0735562b990e2dcf34e9c25e25c27d";
+      sha256 = "6ea0e003d0303f627d8adfc698ef654e03e678d982bd90b643b6c242c00872c1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/nb-NO/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/nb-NO/thunderbird-140.4.0esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "8acf2090a3e4b116826069ece232538eeb84fa519d9060536950044f5fd9c353";
+      sha256 = "9b2079b576b66ceea88b3d973fa2e6bf7568c208eaab6e2f6a8a1d6f842300ff";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/nl/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/nl/thunderbird-140.4.0esr.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "dfd2f250932a5fa400dd808b0b2afcef244976744389f7e68113a279d9ed6953";
+      sha256 = "9d81daccda08998bc4a50f66b9b5be13a9c2e9a68f424d15e51284095df74726";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/nn-NO/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/nn-NO/thunderbird-140.4.0esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "136229be6bcaa7d306a6796ee947be4dcb85d16423581fb22485bfdb803e6991";
+      sha256 = "24c5a0c63e00014d880d4a6127f27da8205f5b78f1788bee61babef7c0e2028e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/pa-IN/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/pa-IN/thunderbird-140.4.0esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "788312b3105bbb376b8d5fa634c22a7e67a6b18535ffc29566c8ab94622222a4";
+      sha256 = "65117032aaf4733dde8b9aa4666d59b67c2edd67a9966d37020d0f710fbd62e6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/pl/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/pl/thunderbird-140.4.0esr.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "13de91e131bc03c7e223e6d4e3dc0f751898029e8dee122d668487ab2beed46a";
+      sha256 = "3937967a1e9af3626b201f55c755a9191ecef2db4ab787dca680e972cda4da8c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/pt-BR/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/pt-BR/thunderbird-140.4.0esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "b0be7c8d1093ce5bb4188b7f29e138b415a5b981b86ef4b7d61ff1ffbe4d2fa3";
+      sha256 = "5fa0ca3c8791b422990e6313504d7f2ca770df87509a3ede2eac24f3b33cceda";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/pt-PT/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/pt-PT/thunderbird-140.4.0esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "fc72f8be624ea97ab3df23f96d9060117c4599a0b150df9e52f6fc8cf5e52f57";
+      sha256 = "b2e8c123afad95ce3c6b874329ac8331273dc94d68636b77c975f17af9585527";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/rm/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/rm/thunderbird-140.4.0esr.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "d5833f037c0fe6a058660d5b20974690ac95666125e621b66154f523f2994bb1";
+      sha256 = "3188d7d85179f4a967ddd8d5ea07bbfe0332ed29a55dea8e7d06326b91333e09";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ro/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ro/thunderbird-140.4.0esr.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "2d92168df1964adddb4ebdbd4631c2518a2726a877f072a9893c962d3d6188f9";
+      sha256 = "72945101d3ec5c4e5c5f15a3cb15ea701299bf435f42ca524262e8c8df1032f3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/ru/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/ru/thunderbird-140.4.0esr.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "54d31a257426a014ccf389db7ce828262fae25672259ffadb41831bc90572640";
+      sha256 = "2bffef84ce47c2c11c90b02bbb2513ad7b350dcc4de46f44feef953341311104";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/sk/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/sk/thunderbird-140.4.0esr.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "335d00c141b40803163407b8901eb02d1770b2d9e26a7f04268482cd11135ca4";
+      sha256 = "6effb978b4531ce8f895921442ec297643a9764ced9499f0ff145e67af0778e9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/sl/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/sl/thunderbird-140.4.0esr.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "02f5d100993b535eb9797125e18bcd8b019d5932b7939633d04c50cf92f57513";
+      sha256 = "ed6b0be98a5c2ae8da73d461ff1bc1c99870720a6ab700208a5923fec10d0c6c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/sq/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/sq/thunderbird-140.4.0esr.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "acc27f3458cc19087985ef1f1c404f98eca8b2c8c799f13fdbe0b9e121e2cbc6";
+      sha256 = "49d04626241932d1b34528bde9e906a080c1472cd9f4d577e3fd603cb2539377";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/sr/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/sr/thunderbird-140.4.0esr.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "5b377c0df4d23cf93d8b8dca9fd4c62089f4dcf5122885b93043765fd41ee479";
+      sha256 = "d73974341c4a43f858671860b77e1db26068755f664e51f8338b21a229ffa4a3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/sv-SE/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/sv-SE/thunderbird-140.4.0esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "e124daec978a8bcf3fa42241e1cf8deacb375da6a4278535f23e7c9c4cad1bdc";
+      sha256 = "6c56554d7d649a45f126e841637f7c3582e01b764856c17735b8f64c8643012c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/th/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/th/thunderbird-140.4.0esr.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "e736d9238bc6b4080c48cc8f0e261d044f7684b8d868a17f759c672bd473cdbc";
+      sha256 = "81c03a0e3e17bec6141515532782e5cb5cd7e109bb6c612b28bb68e4b659ed45";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/tr/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/tr/thunderbird-140.4.0esr.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "a8d79f5317d042679dd0bce602a0b719f6883b02b76f5ec69e2b6dae84c99fc8";
+      sha256 = "28dc594425f84da8494b612dca6cae0dbee934b41a741a1f95e0163cf0e9c9a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/uk/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/uk/thunderbird-140.4.0esr.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "a8876dda0a5a79b58ee2e4fbf9c429c6a050b9e399b4a2f467425ebc9d0e7b1f";
+      sha256 = "a892ff9e2adad8118f3cb88ec4775d36d30b96472069e9db43f29a094d590c40";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/uz/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/uz/thunderbird-140.4.0esr.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "99a143e3cd7da83ca51ed31cb517430206c86dcd747e7ded3ea4454f29dd9f04";
+      sha256 = "5427a8bdaedcd7c25a84c1ec516185930ceb2c20cb5be812a302d9681702f2f9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/vi/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/vi/thunderbird-140.4.0esr.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "beac93fff89368f9e5f70e26efac6491034212e7ebcbb40e397ab5e6b227b31a";
+      sha256 = "64bca02a6d78136c71048701eaf62f7211f2765c0f5de2a810f8662097388ec6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/zh-CN/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/zh-CN/thunderbird-140.4.0esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "32795b0feb937927c80bb5c62b4587b13103cab00d25f7b1f57ad53af145540d";
+      sha256 = "bca2b193a249b7915457fd0a39020ba7edf559ec5d48339b890824c072b6c275";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-x86_64/zh-TW/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-x86_64/zh-TW/thunderbird-140.4.0esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "7e57b8ffec05080c1ccd6f329660790aa8eec84679c768a0a7b7b40ed098aaaf";
+      sha256 = "135a64f9dca152b1553990824d04acf1240f60f8b2039fdd1095ae3402c7143e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/af/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/af/thunderbird-140.4.0esr.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "141cbcdc5d7f1d5c45de0614f25c0001232f250ae039e2a029d7b721a1822632";
+      sha256 = "653a06ca6cee5dec110a4a091230655f5d94b04d78841c27b6c4049da824da9a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ar/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ar/thunderbird-140.4.0esr.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "2e2c0d221e19b930e617e93e63d5a11a86bcaca7b3ba667beb0b924ff0ddd6fb";
+      sha256 = "62a7e19b6574354979510de8f953da0a0dbf25f17a4a89ff3192afe04e0e8123";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ast/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ast/thunderbird-140.4.0esr.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "24261039a298823db9a9513ba3579118cb1b780234716236454714e3ad9242b0";
+      sha256 = "35ecadc31d5edb35749265ab6169be8f6733d17d9b6d03cde182c046a12bad53";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/be/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/be/thunderbird-140.4.0esr.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "f07f276975c2353ffe69c037568d79396bbd0d9c0c3d6e9047936ded98dfa059";
+      sha256 = "c6abcf864f94c02af2417aeee4858edaf886baa1911a90aed80aa63f9d2c8059";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/bg/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/bg/thunderbird-140.4.0esr.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "f31880553d9bc597d7d5009e0d10cfca2f7170f5c0bdd7f41e10be53ccc8c2d2";
+      sha256 = "7d827acbc34d41dd0385c5b1a2d8ffeb744f67dadbf8f66dc5b00bb2c2b4d151";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/br/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/br/thunderbird-140.4.0esr.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "e56f2e56aee20a094d5362b56a455d0a3531df6ca1e5069d891b0635d16a0e26";
+      sha256 = "02d56833bb8d8d8f008c0bafcd712c78239781254c1233a08f99a12b8c65c3f0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ca/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ca/thunderbird-140.4.0esr.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "d963a7daf319f196fb799aadc605c4927fe40795754fc8d7ecc26254d1ca376f";
+      sha256 = "b55449b13271a1ca31fe33dd185eb96edcef8ac633b0abd9d1b9d5b7e060765f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/cak/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/cak/thunderbird-140.4.0esr.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "215e52a11c0f5fb8563ad9432c3578002cbfa840998b7419db09644f898e6ca3";
+      sha256 = "374afe03f3bdf66a4d97aff966186f481353e166176df7336a656a4f27b0f76c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/cs/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/cs/thunderbird-140.4.0esr.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "71405c6a56bfb7b46d646199ff82109ef75c25f1e2b7e07ade7428c5ebfece07";
+      sha256 = "b044018ee411e306f050b1f04decc11497b8002b302684452c2dce295f5ae004";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/cy/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/cy/thunderbird-140.4.0esr.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "96db58c3fc25f8196932fa11defe3c5a4a59682a8214a80691b09c9b0d5892eb";
+      sha256 = "142a974d535c452f37c05b3f7a114341985c570372d336c37562c61cfc28d3c4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/da/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/da/thunderbird-140.4.0esr.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "69242a3c5cc752142291db634c92286266d4460d020471d12f1ea02baaf391d3";
+      sha256 = "8561acea814f0e538dcaef45b41b97d00db11bc9bd4770c029c9ea0b57e87cca";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/de/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/de/thunderbird-140.4.0esr.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "8f36f835c7347c68267f620b3fa976c2708374447b2e9739452954023b94646c";
+      sha256 = "c756bfe660c3a55b48f5dfc5718a54e2715052319c0ea080bf46d66f724429d7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/dsb/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/dsb/thunderbird-140.4.0esr.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "2d18cdf766b28b78293f6f49ba92956504669c04490e5ae8421727032fb0c698";
+      sha256 = "b45b5d8ccab07292e81e402c957f0a33b81dfe4b3c79f5d9fa338dd8e4aa8447";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/el/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/el/thunderbird-140.4.0esr.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "93f112a14887a4afdd0a33794c60c3b3cef2f2ed04019219b0994e534744c561";
+      sha256 = "085798ab3239a5bf6cfc2c3305f2aabb5f9257635b18ac00daf702dfa053c4da";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/en-CA/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/en-CA/thunderbird-140.4.0esr.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "096c889f4b020b48c2a4ef1e7f66b5b401b30f3d9304e74cdd8c75737bf781f5";
+      sha256 = "8b85baac387d996b715a17640ebba501ac604f153821d8d545360b6fcaaf25aa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/en-GB/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/en-GB/thunderbird-140.4.0esr.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "3ac3ae104e943e18522a21454328b4c89a8b4b626564aea82ec1b9306819e561";
+      sha256 = "0d38e70b450c8b22f9105351992f3a6c445f814d7a3ecd75a66284d128ed9896";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/en-US/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/en-US/thunderbird-140.4.0esr.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "978c2831a7b5e913d4d261cfa97af0c5900ba32e60a7cccf5425c8ff23f11c95";
+      sha256 = "3ba3abc8e65bc421a35708aeb5daa8a8d8d8940c51808eeaf64abf120b62f7aa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/es-AR/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/es-AR/thunderbird-140.4.0esr.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "6182bec17e34784998c7e4cd76bfdc9712653f30a94331dfdb61d38b1540bf7b";
+      sha256 = "eb4e6fb7219056961a9d6d8c3ab085fccf6c54c13ff401c9c72dd2f1155aedb5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/es-ES/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/es-ES/thunderbird-140.4.0esr.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "16416a0317dd208aac9e1d44067ec5f0ba609399033324d736f980f08409d1be";
+      sha256 = "31b1e812bc548265acde111fb0130b7000e03d9569f0270d417979684ddc5f99";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/es-MX/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/es-MX/thunderbird-140.4.0esr.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "9cad4cf6d2efefecd36236b407b7a2204c02319cb673ac05921ed1afef0f0f4e";
+      sha256 = "a80db313e50fed30f82e372390e74a742fc2a1697ba85f7a268bf482459c340a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/et/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/et/thunderbird-140.4.0esr.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "bd9fdece5679755582a058a3b8dee9bbe47f12b6264e08c3a977bb395c72248b";
+      sha256 = "043b7ff50a97880cf5206462456188028ab752b745b3a320ad8b06d8576a7a32";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/eu/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/eu/thunderbird-140.4.0esr.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "6799ed256d553d1ba2338811a31cd47ee57a9d54c7db597062391f95b669921d";
+      sha256 = "62d37c6a5f0f3d059156b8a0c74a4714a1c03ed333ecb49896662ceca30095d9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/fi/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/fi/thunderbird-140.4.0esr.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "c862d5bdf205a75b0304ccbee85ecb725cdfad848b75d99a6f6567ae59ef7cc7";
+      sha256 = "29ed3c3e8f268dcbac74f2d2b5bb678ca820ce23719c50da783774d172deb484";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/fr/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/fr/thunderbird-140.4.0esr.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "196d1972c9f71cd8152f0dccf6642961b8b360423ad74a3facb40ca10b095b3a";
+      sha256 = "befe452b31cb658e8aba6c0daa57c7dfcd1eaf8ce55763527351e3954ad6863b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/fy-NL/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/fy-NL/thunderbird-140.4.0esr.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "a2f7a4dc94fb17c0ceed511c6e591feb1894e1d707d4d74d69729f621690cd11";
+      sha256 = "9acd83439e772bf06dd4db587e55c5489a172206a68683466d33f528004bebf1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ga-IE/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ga-IE/thunderbird-140.4.0esr.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "1786bc27d6849b482192dd2d2054f8a04ebf804399e8a99ddb67c98cbd57cdf7";
+      sha256 = "7d7535c2ab59093c16277c0fc890288d08475b9004f738422eccb059a24acc32";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/gd/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/gd/thunderbird-140.4.0esr.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "35dbb7deab2e51d189dc2403f0b07b033c0d02d2208759a0469e530851576922";
+      sha256 = "3a8880b124ee76086376e0467244397e4fe89c6761da929a11b54067d9f117cc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/gl/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/gl/thunderbird-140.4.0esr.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "92112627e51a1475b2d99e5db525de0c5584008411f41651f66078cefe0124ef";
+      sha256 = "d26d3a80c189f4c96b25ce921b5b818b71976d4d9aa15aff65a860ad7f6969f5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/he/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/he/thunderbird-140.4.0esr.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "809376eebee2424dc7642f659a394269d143030faf5d29e9e76f548d68dbc1e2";
+      sha256 = "91a8eb69c96c29c8e285444bacfa433e53203745de0d0515fa37a42d76d52e6f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/hr/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/hr/thunderbird-140.4.0esr.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "68463819531333131e3d160acf4c52a02914cbde0213da1f9337e98d5206057c";
+      sha256 = "017e8f5acdc15ca9c54b3563797584a45bf35597b40f081764576e1c163cc3c1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/hsb/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/hsb/thunderbird-140.4.0esr.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "dbd7bc581ffdc9a00028ccc4582582371518f001bbe25856177d5477907cd69a";
+      sha256 = "77ef3bf47873f02ba8dc4f71da5b2dc6688aa8fbeafaeb14e5e1cd2c24ce9cb3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/hu/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/hu/thunderbird-140.4.0esr.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "6a4fe0caeec91ef7a28bb3c958de33d4aecfa67ba80b7227e1bae6a2d9a25b41";
+      sha256 = "5a3e5da48dbd8e70487466eafc47af1dacfe1d87927c78d95c9c3cb472c9793e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/hy-AM/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/hy-AM/thunderbird-140.4.0esr.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "65f58458b447a59000d3e5ab32af9c95bb3b58857ec7501631f7e7b44f378aee";
+      sha256 = "0fdd8e334e60b37cfd16b6809bf0c44c593092f2ba4b4bbdb02a6f9b1d00b513";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/id/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/id/thunderbird-140.4.0esr.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "d8ddd3f21ae3917649ec55a6509596dc4aa83cbb8f90ac0faace100f06b87bd3";
+      sha256 = "b96547d1a2f5ccf89a993c716304da0956d0b4661bd09fb2e3cc829fb22d9642";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/is/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/is/thunderbird-140.4.0esr.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "fc75b9242bfb4b8d7688c0ff0f8426924b9376ef9e989725c971bcf39fde47b8";
+      sha256 = "2cb684532b4e2d90a521a6313878b0c0a492c3570ff60ebf7a865c11f54bca57";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/it/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/it/thunderbird-140.4.0esr.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "de12e0c38756d5ece677d773bb3674b125b918644d6eb58de347404363067332";
+      sha256 = "2956dc8fa8608e7aa39bb7af0c818a30d87ed3ca7d17827511c0802173f71d2a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ja/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ja/thunderbird-140.4.0esr.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "2262dcf37e3742b580e86f0dacc077e1a855879b8ca2056888f6817f7c0376c0";
+      sha256 = "577c6c2050e266937ecf63844ae2c82809593ceb0a78673a4590a18703258a92";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ka/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ka/thunderbird-140.4.0esr.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "86bebe321ee191f714626b48fe9650e5b5eab11683b428312ba5e6d405fc236e";
+      sha256 = "87087c07a1fa4f1dbc0b7cd13f1a601e001f159091d00532acaea0a1a561a88b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/kab/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/kab/thunderbird-140.4.0esr.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "7bee584e9c44edf6b86e329deed33dddbf43f9c427c9bf499754829d166eba8e";
+      sha256 = "1f92f15bbddc682785023f47c1ae9d53c7a67eb28ec2ad976d44e94a127455c3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/kk/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/kk/thunderbird-140.4.0esr.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "909190b3e17f1b52e5c0512b5385d71cfd14cc0be92899f27ea07c41f4fc8351";
+      sha256 = "d53cb8293321e123e89da7515d255673d141f93c476890eec91fd677fa221994";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ko/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ko/thunderbird-140.4.0esr.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "2c931f1ddcc65e5020f978e4a5cb49583e170bcb48cc72dff6697770430ad6fe";
+      sha256 = "830b77adc70c000ab9646d737323134b94da7537643ee552a9dd802628b0b0cb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/lt/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/lt/thunderbird-140.4.0esr.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "06c55ea902253d74c648a957c048ab921edf706539b1adcb3a63e4046efa687e";
+      sha256 = "64a00d688166d6ee20be52c863bc401da8170de84dc72e9860eab430b36eca99";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/lv/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/lv/thunderbird-140.4.0esr.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "636dd4ddfc78815789b7952ebfce1445690d121fc841fc386da9c5bd59db4f28";
+      sha256 = "77e843c6d3c54d770f110e8b00e930b035992403ee7577fc497419bb32ca1832";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ms/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ms/thunderbird-140.4.0esr.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "8b571092ddf88999761e6da188e6521d0880db20f1ae3b1958ae624f6c447f4e";
+      sha256 = "96fc422bd79875357fe766fc7813505c358310d9a7c6c67a14e9a0468d7e56a8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/nb-NO/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/nb-NO/thunderbird-140.4.0esr.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "f061ffcfef6a56898cf66bf2261f74408b0d01e89dc5e6ff53dc94a9554f243f";
+      sha256 = "4c6d1624e3e0fd78b59ef4fad8ffa05347e071123ae285ca91c5cc1df7fb2f0a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/nl/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/nl/thunderbird-140.4.0esr.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "531298208ce88fcd05cbcd9bc03de473714f2c77f11a8485b97bdaf271834b92";
+      sha256 = "3f8b5bbc97b22763509c9df58a350b79acbf06ab7b7547256d3e59b4a4207f98";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/nn-NO/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/nn-NO/thunderbird-140.4.0esr.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "bc55ecda12d0dc53a6704d6229536003f4a720ae9c787b50d4e6f6bb4445a61a";
+      sha256 = "71398757f66e9a302928a885e51e5992ef644717f0b187e78fd7d26186a8ee20";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/pa-IN/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/pa-IN/thunderbird-140.4.0esr.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "abfdaa63bcbd4428530df6459a108f0a7c8bc6e80f3fbafa8e4899e8f05eb39a";
+      sha256 = "16d133a601befc0487e0b801ee2228859b332b97fd63ba53f3b309d94b9bf394";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/pl/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/pl/thunderbird-140.4.0esr.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "08f5fdbeb52a6cdcd9969fa233e2c985a640c9c0a59df61ae2fd7b0004f1fe46";
+      sha256 = "b3de96dcfa150a834347d247a6aedcf8ebd4207ad1026db65471a0b27343c32f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/pt-BR/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/pt-BR/thunderbird-140.4.0esr.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "c866a05e3c72d6e05073d1373cd7bdfb3fb8faf746375ec4f51e3946caa22f46";
+      sha256 = "a3261296ac9c53cbf2a512dfb0a1c3f76a47dbfa1318ccfeec72c441fec11b78";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/pt-PT/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/pt-PT/thunderbird-140.4.0esr.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "3936990bc963741ad780721dad715ba958c71818614523fb46621fb0dec147c6";
+      sha256 = "3f04c4c9089a2879110a25494c367f8536938ac46dfb0da7773e9fba969b6484";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/rm/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/rm/thunderbird-140.4.0esr.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "ca044dc761fe2bebec563a37757b563cdfe2eec18e4cf2d451a1b7bd0e03a46f";
+      sha256 = "960901f039310fc784e40a18aa9df2c9a4c1aaa1dd1e2644fa73aaf38245f262";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ro/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ro/thunderbird-140.4.0esr.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "13b98157852329a91240498112f841f03d90c239c41c57d0a31eec6a2eb01ad0";
+      sha256 = "950bad41fa8870f96d96a6ca02978284485177247e0d001ed892b65d15043567";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/ru/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/ru/thunderbird-140.4.0esr.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "461a8c8433a5f49b979f03377f0ac7f2a81307660a83c4727b677a1487fd2a15";
+      sha256 = "5e91ee670f3b7f7c6583df05f32178340ce1661b7cd55133b55567c94507dd36";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/sk/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/sk/thunderbird-140.4.0esr.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "a24ccc5a44a459a5c15d9dd59ba4395a31abccd0bf9238c9ca1c0f229716d5ee";
+      sha256 = "8a542d2341ea2a6021f0e06e348a0863fd8b4740804c20993158fde498052db1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/sl/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/sl/thunderbird-140.4.0esr.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "0c5fc0afeb40f6bf238e541e56ce414a43ef54fa195888c3862aa78f5c371326";
+      sha256 = "9bc0da52da2a2eca87ffbe7c88abded935d40050693b9f2197d9d804e4edca3b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/sq/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/sq/thunderbird-140.4.0esr.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "429bcc3349926e2ff220320092bfa0e24babb315dca3dc61a66f1f7a6b54c9c4";
+      sha256 = "70bb5a66dff94c7c3a3466d6c56d099c0afdec01cc417799d2e84554dad16d25";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/sr/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/sr/thunderbird-140.4.0esr.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "442d0363c258c61cdb1690380181712f9159d1b3a3a9a12df62efe403f145797";
+      sha256 = "f454f8a278f4b74d2488b0633d87a97c85afec2f92d4a5746f4b883609f2c921";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/sv-SE/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/sv-SE/thunderbird-140.4.0esr.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "055c4212a3650e53f43ab6fa859e03e7475fe0b6da1b4a87c5671dec827f53eb";
+      sha256 = "2d82dce3eb19d242321cc1f0d693f26007f87e5150ca1326d3a470e317a1df02";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/th/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/th/thunderbird-140.4.0esr.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "37a9840af005b2aca0e024223bdc388f19b6e9d8ab381519266667b01eda8eac";
+      sha256 = "7993bd083a6ad9dd278197feecec87a8b912287b8e75d4ec4db1732b99f19a7d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/tr/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/tr/thunderbird-140.4.0esr.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "dbc8ae7228249b490dc845e3030e1c625facd625f322b6c1ba1b5201038a7f2c";
+      sha256 = "ba88ee6a56e2fec8ac64349ddcf94376c2c6f2bd20cec079d677fc6b1f92f3c9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/uk/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/uk/thunderbird-140.4.0esr.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "5436eca8f68ee7833c2e3a3bcee56db0d3d66b3bd3a98059c07508181f4c8116";
+      sha256 = "a178dcf466e3f68d3f4538939079e3ecf04b9d504eaa27d9c6722f272a511c12";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/uz/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/uz/thunderbird-140.4.0esr.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "af154fd7ec1c00bf8b5e0f8c2d8a03050caf5030923fa579736507cadc60f9d4";
+      sha256 = "99ed1858ff772bd1ea99bbe56dd5d631317e1849d7bfee3b288345b6579d3742";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/vi/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/vi/thunderbird-140.4.0esr.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "2c0310ea5985ef44a8edf9cbb2505e14f79f18d88852a1d6830b150daf4bdae9";
+      sha256 = "495f013bc162106a4cf15710c8c52fb22ab9c8983aa44e3371d9e99d1cc0c517";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/zh-CN/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/zh-CN/thunderbird-140.4.0esr.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "d20df69fe34109f124e939af4dc52234c9e36e106491dac8f1fa8b82bd638871";
+      sha256 = "f744c06612923b08fff2de9a5bb978b8da1a0dc0512a84b14beca5d449779e94";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/linux-i686/zh-TW/thunderbird-140.3.1esr.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/linux-i686/zh-TW/thunderbird-140.4.0esr.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "d837f2211c60a8d9c14cf2ce125806631061f6bab758247d8baec0797207ef42";
+      sha256 = "d7693ba6cfd087d370276ad062404a7cf62b6ed20cff20f48cfdac354945e4b4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/af/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/af/Thunderbird%20140.4.0esr.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "20f115cd2954afbaceeef193405212e80711cf76d0e0b6199a7edfd292bac237";
+      sha256 = "2b9f86934b94ab0341ac43f3ff668012f46e12630df25ead6597f150aafd25e5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ar/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ar/Thunderbird%20140.4.0esr.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "63a4e846d880eb81fb2a8fb81face1dd9ac0a0815a82a14f0e5c3cde898d33aa";
+      sha256 = "cfa4570ad1891a744cfd51415cdc3c0ec95523f73a9827623c3633cc80c05986";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ast/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ast/Thunderbird%20140.4.0esr.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "4338e715e946f662471891008b5bc6e7adc8393cf5a96ab86a382ce04cbce6c5";
+      sha256 = "d51481eaa3c4b2a055d666fdd7f345ffa6dea80400548ee63cec74eda1285547";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/be/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/be/Thunderbird%20140.4.0esr.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "c4210d35120f742302b26db54acb8a6310c8c287908f996de72914010324786b";
+      sha256 = "6be488c6788b722285db1fca3ae6ac470f08a3a6878303d836e789b516fbd203";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/bg/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/bg/Thunderbird%20140.4.0esr.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "edbbda1f4982b1730b0f722bbf17cc05ad8b70e66c16af7812885e40e3606098";
+      sha256 = "93594488a516d5056589ba103394dde8b43fd70e9cbf8559ca5d91d3de56b321";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/br/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/br/Thunderbird%20140.4.0esr.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "f1fa61c3db825155265371a382ce9fc3ea07fcdf375a6b0d10035afcd4f9aac2";
+      sha256 = "6ce35f02916b1ec15d7a386ac1426a2014cbc0750f4a6dfdf5f0c22278ec7be4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ca/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ca/Thunderbird%20140.4.0esr.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "75f5bf743b9d1fafa3f7f2ddf8689ed01ac507e8d4b896e3177f4c995f59706f";
+      sha256 = "0252b5b1415ae3e5fe6293ca43c250d7481b1bf0076686ca7bf64e21743b3a6f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/cak/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/cak/Thunderbird%20140.4.0esr.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "79c78160253c67a3e3429806703a9840ee9b5df047b6b4c0095ad4eeb683af66";
+      sha256 = "6c49a96f648868f795fbe435f069a8efbef15c63a6d65b3e3dc2cf7bfbc79d1e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/cs/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/cs/Thunderbird%20140.4.0esr.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "115c1e9acd7dc63b8ef5b3d47d53d4b061137a2bb2d9d5cb015f098de6222b85";
+      sha256 = "ce445f8af666fc8cb34cd0df92e327a60138f63567803453b6ecc291e97959fb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/cy/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/cy/Thunderbird%20140.4.0esr.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "6f690c8e1fa4465a147045c8f4b5f0e0bdc29723d69677a5fc29a66653954da2";
+      sha256 = "fb5f92217bd85a29ed1a75c799cf4b14bd980c3166c9aff829180c443bce6ab6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/da/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/da/Thunderbird%20140.4.0esr.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "ef54483cab54bfa8d00577c3741ab3c856190798ddfd154bd355822f7af7df8e";
+      sha256 = "cbda1405b9280bfc344a8ea9e225cdfe9e5c9c12bed22183a34d76a9fee6de59";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/de/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/de/Thunderbird%20140.4.0esr.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "a2972ac2e3227e05b95b34df8ea9dbd46c3d8b6164bddba830af562b1c87ce1e";
+      sha256 = "fb8b7f3c43f10ddab84719f5df783e412cbcdd4e3e524b4e617d331339243491";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/dsb/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/dsb/Thunderbird%20140.4.0esr.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "9bc1a18d9987eb3a99767a6479cec05a8e3427a59235c3e0ddd585584cff915e";
+      sha256 = "a095527bb12b1934118531e031afc98f1f4872381c9b5ff0f5c31d255484698a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/el/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/el/Thunderbird%20140.4.0esr.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "c97bfbf95583470c947478a4c97d8cc92702e7ec8ceda7f633b1acd0ef08ab61";
+      sha256 = "7d8e522a227219a7eb911a5fe505f05d2c8796c6455cb84da46a149ef0299ffe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/en-CA/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/en-CA/Thunderbird%20140.4.0esr.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "1a8f768a30315f0c5014d859b32ed0f5c5c1c72811b81c18a89fba9df7ed6d09";
+      sha256 = "ece5a57536fa76d3aabcb4b762fd6d546d5e90c9a4deaf3449435b74786b26bb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/en-GB/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/en-GB/Thunderbird%20140.4.0esr.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "00930cbc380314c64919c41efaeff5ac236f1828ac8f8fef7611c857da29a860";
+      sha256 = "e530d5a57bd3ba2425656c8f71682251533d099436d03da5ac5fdeff55033f82";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/en-US/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/en-US/Thunderbird%20140.4.0esr.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "9b44c8ad3bfba131ab62d67c3a5af11ba73dd37edd19f9ed299380aa6d1ce9b0";
+      sha256 = "eb0a1bc6ddbeb9cfdafa51098608d3f5eb4ad5a4ac6d8000d10bc8d0c4f1f1de";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/es-AR/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/es-AR/Thunderbird%20140.4.0esr.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "32686eb688f3a732acc6401b0e0883ee21860e0395808ef876fe39016e161952";
+      sha256 = "375de958e67df4c3ea923e22cc8d3f6a927849c454c1172a032d00287a12b537";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/es-ES/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/es-ES/Thunderbird%20140.4.0esr.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "b515957a2a876f7d2fab1007c52746909abaacd221a894014291f4baa46a75bc";
+      sha256 = "64eb6e25c5f67b0051778b461b5ec0f61cd4a3daf66daaa5dd718dfe47a6677f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/es-MX/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/es-MX/Thunderbird%20140.4.0esr.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "ad97b8b7cac5028d315e9b003600aeaaa16046545e58b5d7d825c1ce5ff958ac";
+      sha256 = "0c1ba25c421ac64c125c322c546388f1b73e0276460a0256ff140ee4cb8230fe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/et/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/et/Thunderbird%20140.4.0esr.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "77d9cf797a1a5df00634178b672dea6227025d4d0919a1f42254421e9ab72468";
+      sha256 = "ff8c80fdf745473cb4c1ca1b7751d03849138c32ba72eb94ad2919505497556f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/eu/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/eu/Thunderbird%20140.4.0esr.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "e9665feb488e63a974c5e137685856dd46ae74d9d09b3db32ca623366b019a82";
+      sha256 = "24dc4be9dfc2342c9b649d9fdb5ecd5dfd98b109c5f57aa2d7517269924e36df";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/fi/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/fi/Thunderbird%20140.4.0esr.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "75083a46cb5b4fc0a5beba54fc8c96d54473fdfd58dcf48ca9f29f7e9006d236";
+      sha256 = "87343610642c8314d104f6bb97524660be3fdbfaa3b138fc247b1d4bcbdd5aa0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/fr/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/fr/Thunderbird%20140.4.0esr.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "4d37be8922dccf766c6c04b15823de2f8f30b9c9ef0816b9f464ba25b2edf5c1";
+      sha256 = "5ae2035849c929f9b565ef69849b902d6e81dca34dd06f5d91ae491cd6bdda19";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/fy-NL/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/fy-NL/Thunderbird%20140.4.0esr.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "5346cb9a49fa822940000dea8401f537f02af2ea4fd97f377ca2ec8286b7e056";
+      sha256 = "a20274e0ed2581ae4435266f24653ee8d00982133ad7f7eb7fc2c11b0e64cd9d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ga-IE/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ga-IE/Thunderbird%20140.4.0esr.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "ba48461b4db3b3994487f7bc85f5e0e7c279afa85a07ce29c8713d618e08b24e";
+      sha256 = "f4b61cebd660abce11dbfa62291aa8b0067b4b64515c4dff54619dc33330bf3c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/gd/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/gd/Thunderbird%20140.4.0esr.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "f60a683e321af703876c0db82d8a0688f6b1c6ad973f131c81d69dd92d23cb8e";
+      sha256 = "57e511186cff193c0872e45a2f3a5948351f2c1c01edf6b09b4ad3e63965da49";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/gl/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/gl/Thunderbird%20140.4.0esr.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "0a912b86029f48d9398a44cd003700d91c718e221e755d842a5747493faaa799";
+      sha256 = "893b8013605c2046e7e8cde74ce1c094b06163235ea25de5d0cd8716b9c58606";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/he/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/he/Thunderbird%20140.4.0esr.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "ba7b5793af2091ec563ff56fe3583b0d60a4f3a11bd9dd12acc158e2e08609e4";
+      sha256 = "87087c308b4850153bf8dbd23282437973842595a5cc39c5cba975f2a5d8ed88";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/hr/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/hr/Thunderbird%20140.4.0esr.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "c4cdd8c36b112eb9a7740323ee1afc86b4b60b78f15a8b38740f6cb7d7234c94";
+      sha256 = "5a0bed361a38af3bbce176f7f5c84a16eaa0d0077ef79ac10878da7173a8f4e0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/hsb/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/hsb/Thunderbird%20140.4.0esr.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "d76cd753cbc5476b7c1c9b9089a800ad703b79e9f00a5b411c533bd4e12e9864";
+      sha256 = "560e2af4758eea43cc3e91947d9bcac1d229df45c980bb5b3037b6b91cce799c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/hu/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/hu/Thunderbird%20140.4.0esr.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "7fecb8178db42fb1624847991a88197cb7a25ad0b5b43da3c0ec5dd5e9ef7ed4";
+      sha256 = "2cd75e419d4e5ed054e761cb908eb7376b01faccf2535447b11fcf8d50d79939";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/hy-AM/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/hy-AM/Thunderbird%20140.4.0esr.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "7cb89e818872a645d5f427dcfedde9b9be60c8770dc346875f634a50f124e7ee";
+      sha256 = "4f39be919b15d2b36b22003bb4aed0fb9b48ee517d60a9cadcbe0cfcdc759903";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/id/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/id/Thunderbird%20140.4.0esr.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "df77301b219a03897931bf94c9c6e677149f7c02dabacbea080a43f47d5e2e08";
+      sha256 = "5d8915b78bd539e87011a585c6e439ad27ccb40188f3999a30fff53e79d71263";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/is/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/is/Thunderbird%20140.4.0esr.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "47aac46979211e862345d767f22a0739ac1adb385e11cdc7f53bda47f3f59d92";
+      sha256 = "4cad9a68ea2e713a81376caaa85335b5dd8d3febfc06b9fec04f2f49861be88f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/it/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/it/Thunderbird%20140.4.0esr.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "7844c40d0cf241bcc6dc3e5f695f0aee540500ca23b62d43d3a65acb2b3fe1e0";
+      sha256 = "b5c8bb87de852fd8d45ec09c366de6a939cc020bf4c56bcbe74ae862c854cddc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ja-JP-mac/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ja-JP-mac/Thunderbird%20140.4.0esr.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "6773857a1d1e275c19616a00d859cb122a0bb62bf2edf3809e81ad3ecf837e0c";
+      sha256 = "76d516e46a3f2bd5fc0da7ee0d6c73f8ec14685fc1fce7cfd18ee408c6c0fa30";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ka/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ka/Thunderbird%20140.4.0esr.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "a5d6516204d4dceed0dd2fe5a021a30bbae66e3f0c8743749179fb1119e1d3f7";
+      sha256 = "ed617ed9ac2a7c68d116dffa9b7ecc0f359968d1d3663ab461367158e8d0a004";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/kab/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/kab/Thunderbird%20140.4.0esr.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "67f8fc4a908d1a93fc8d3338c887569d3eb17bd2f177bf430b309bd954f9718f";
+      sha256 = "a79feaef4fb690c9a56d139921676475f3cf8ce259e9d1f201d005437ecedaec";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/kk/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/kk/Thunderbird%20140.4.0esr.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "97a00e5a3b9fa2a93ea74f0fdf6a4a6d85cd97701e064eeb28fb288f09a4b7f1";
+      sha256 = "55872e2ab16ab4af4267b137a6f54029c34e34828109cacf8b21b45add5b123a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ko/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ko/Thunderbird%20140.4.0esr.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "8626dae3c88f63bbf7b4d324279102240ed26cebf53ff5a794f48fe218fb84e5";
+      sha256 = "1ef3cb988025f9e638c7ecbe5e90d839ed1135c99db12432b5a4e955799287b3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/lt/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/lt/Thunderbird%20140.4.0esr.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "17b6759a5671eb94feed2481fc80f211b37d95f89879f71ddefa74da5ab9f245";
+      sha256 = "f9d6057adb85028064b00cf7f10cd8338b2130ecf491b2195e65af3e797f0d41";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/lv/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/lv/Thunderbird%20140.4.0esr.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "fec5316838fcb3d5c08381bd425c7b3395baf836b43c14c988862138fa7f7856";
+      sha256 = "8d544eaa938ea79d6268748bb283bd92b1448c059ca646fdaf36c4471c8acd00";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ms/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ms/Thunderbird%20140.4.0esr.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "b086d9eab3043be43fccb8c86635ab205f267df86e7e711c5378e9652e4666a0";
+      sha256 = "b1112f7b01008a9c968a7880842f1650b6d8b15b74ae196d481422ce46d8f775";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/nb-NO/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/nb-NO/Thunderbird%20140.4.0esr.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "fff8619e734a0e1d2445e2a1b5f483f16acc7821fcd4a4e362de1de5e2f966dc";
+      sha256 = "daa01be94e6b2a830d606795563a24e68fe60990b9c9cb71231653cea29767b5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/nl/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/nl/Thunderbird%20140.4.0esr.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "33dc51ec3b5bc0791df31c84883c8e246fa8a477a251359b0200b40a0f5eeadd";
+      sha256 = "a7f000a5241c94142d6386f69a886a3736493a5702ad5ff647abec6a5fd90c6c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/nn-NO/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/nn-NO/Thunderbird%20140.4.0esr.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "7f8b72cc02e6162713ed05c0b2bf80057ed935604b45241f4638dcf2c095969c";
+      sha256 = "6494f87cde0f105ae0b3d051ece6c92dfd3e878853410e29f25d6a70ee928f74";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/pa-IN/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/pa-IN/Thunderbird%20140.4.0esr.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "858a024b316f96b629f1042c2cfad47c54da571887e5600d57b05856420bfdd6";
+      sha256 = "704d3065d7a47a9c7af2d45c0139811c2e168c4d8a501fc45a36ed06b170eb12";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/pl/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/pl/Thunderbird%20140.4.0esr.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "20124dc0ffda461f68ae1efc1e7277f439126d73d02f0c659961591853b7eadd";
+      sha256 = "c305ee51b4e0d3ff187d729f7841586e3f17e28430918f9c93e15bea9e3121c6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/pt-BR/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/pt-BR/Thunderbird%20140.4.0esr.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "d9691bc4f1fa9c95ec2b140ea005eb292293de90cf70d30700f10c63b430c41a";
+      sha256 = "014d2e9b86a455e7666ca53fc1f7ce3f65f97404d9c2a3232e0c688ca1cfe8ce";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/pt-PT/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/pt-PT/Thunderbird%20140.4.0esr.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "4b3a13d53f3c5042db0ee51df9d830e3f4fcb3f5beb76d08a4d7e879c33f752d";
+      sha256 = "df1b3fc88b7fdd32a6d43dcd4bfa73bdf3ba7480f7318800eeac410c4d9e29b3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/rm/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/rm/Thunderbird%20140.4.0esr.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "7e1b52adac3cfd0f99251d6d50eb4db7537d65cd2728f7e6ff318cef1388b34a";
+      sha256 = "03387e02dc528c23603759a063e56aa4d1beef35124cb62bb0d826fdfe3a8135";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ro/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ro/Thunderbird%20140.4.0esr.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "e671f0073aa33f92ab9d8876d105dd03bc2127d0ad9e27f450e9c40436780d67";
+      sha256 = "0a65227549c1f1db305d96b8bd55670f6cb5d81c174f919f8dd255d190aa13e1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/ru/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/ru/Thunderbird%20140.4.0esr.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "4402f6f45c5e187cbe324f078439cb8638cdd66128e667761b7c494f363e6306";
+      sha256 = "7e7c650538d825081b56dd77a1f8274e5df2583657a0b15fb44956b1c1b98f91";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/sk/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/sk/Thunderbird%20140.4.0esr.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "515a38a46266d3e3da73dcd530a8d503194e6107b2a600c5592fcc0f57408181";
+      sha256 = "7af96995e67e314cd278623abf9af23778af25323cae3dcfa8fa9af7b8165c7e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/sl/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/sl/Thunderbird%20140.4.0esr.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "bd1b726a9246a8100b3205568c727e7d1f63a7d383b8b9453af7a15ecd236261";
+      sha256 = "7d659882c6a9270ebc6cacf396db2735bab463b0cd69b551946a6a95c08f53c9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/sq/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/sq/Thunderbird%20140.4.0esr.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "766cd20dc1f533a398cb360681833ba48e11f6fe6929503082ab2c6ec2c76d3a";
+      sha256 = "d50e1e2cffefb92e708bf6f32864d34fda53e03046a22015fa945a9dabbfca5f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/sr/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/sr/Thunderbird%20140.4.0esr.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "f7573ef1e846ebc0b32025e948a261602278f49eadb94b4d925f57ea50bf15f0";
+      sha256 = "ca5afcb5032e9072d94ebbb3542213785e8e3402384b6ef6298a948faa2841f6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/sv-SE/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/sv-SE/Thunderbird%20140.4.0esr.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "2a17943aa5793632c0659cdc900392e350eea8e9610787923e75ba6d962ba6c4";
+      sha256 = "65e2775d6c2f3c95928889c3faae8a03412eba5f0f4cca0d9fa28ca6f853b879";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/th/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/th/Thunderbird%20140.4.0esr.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "c76af30c8339fe81ba5f1a96ab3975943377ecf01bb862a3f2806ba4a35ed7cb";
+      sha256 = "38f9ed2272ddf921886546d8be2db62a24e9e4c8fad4073806fb47fde589017b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/tr/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/tr/Thunderbird%20140.4.0esr.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "b23c300baa227ee40d580498437cb68444e49a6e5006ade9eca64e49f4bf04f7";
+      sha256 = "2e6ddd14745d0577c553166791323a8b83e571900b56eeccb65f4358abb5b2a0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/uk/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/uk/Thunderbird%20140.4.0esr.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "54f58b050f72a98143bc6ed14a64723879a76986d113bcd95ee7e6c8a27ad82b";
+      sha256 = "9986d7cd69b8e6561ad72af8bd3096e7df0ae5710f0c0ea2a8d995730e881665";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/uz/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/uz/Thunderbird%20140.4.0esr.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "15711d642b42cb5e75a4b7bc5e8de929f296d7dff14ff17225b5ff54ea028896";
+      sha256 = "4b9ef669d6899b0353cddcfa0589285cd12bb45ede26604c2aaf176e8cc9fe55";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/vi/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/vi/Thunderbird%20140.4.0esr.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "b9499aaa463763e4bd1970d73e33bfef0fbadcf2e2d04689b8c45ac22d4959cd";
+      sha256 = "f749a2f83d2ce179e485cb93ee2b71313924adfadda0786d6b0de77abee3a7c6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/zh-CN/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/zh-CN/Thunderbird%20140.4.0esr.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "5b0ed3b9d0f0efc6ea79012e78a0f23a522d81e9efcff9f9a53fed4819184cc0";
+      sha256 = "14cc428227819eff46e6d4a28c530a72afa7b795c897d194bbb1fb130ed734f8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.3.1esr/mac/zh-TW/Thunderbird%20140.3.1esr.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/140.4.0esr/mac/zh-TW/Thunderbird%20140.4.0esr.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "c98421d56e8b46ab9768a45d2d55d0b7657671184abaf8b6834b359b48ef76ec";
+      sha256 = "d7eb52fe22b210177bd27f8a10da57f510bb37ab62d5c0deaff2a21ba5c0e734";
     }
   ];
 }

From 4ff5ea973dd1b0ddd95142878587fb1e7ca1145b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 07:54:44 +0000
Subject: [PATCH 0937/6226] openttd-jgrpp: 0.66.1 -> 0.67.1

---
 pkgs/games/openttd/jgrpp.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/openttd/jgrpp.nix b/pkgs/games/openttd/jgrpp.nix
index 4363e21b2eac..e875fcf8956b 100644
--- a/pkgs/games/openttd/jgrpp.nix
+++ b/pkgs/games/openttd/jgrpp.nix
@@ -7,13 +7,13 @@
 
 openttd.overrideAttrs (oldAttrs: rec {
   pname = "openttd-jgrpp";
-  version = "0.66.1";
+  version = "0.67.1";
 
   src = fetchFromGitHub {
     owner = "JGRennison";
     repo = "OpenTTD-patches";
     rev = "jgrpp-${version}";
-    hash = "sha256-Bw5/fy3duMQDCDfAF6hGE7eQiNo0d9Ag/afG9zM+d30=";
+    hash = "sha256-GMkcf3XBotPXjZC4TdtOXzutyyIiW4haE+jNIfgozbg=";
   };
   patches = [ ];
 

From 6a5410fd1cf18318a2261866eef3f25c64957ce2 Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Sun, 19 Oct 2025 17:44:45 +0900
Subject: [PATCH 0938/6226] foma: 0.10.0alpha-unstable-2024-03-13 ->
 0.10.0alpha-unstable-2025-09-10

* As noted in https://github.com/NixOS/nixpkgs/issues/445447.
---
 pkgs/by-name/fo/foma/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fo/foma/package.nix b/pkgs/by-name/fo/foma/package.nix
index 54a756a21b5e..12b0823e703b 100644
--- a/pkgs/by-name/fo/foma/package.nix
+++ b/pkgs/by-name/fo/foma/package.nix
@@ -9,16 +9,15 @@
   readline,
   zlib,
 }:
-
 stdenv.mkDerivation rec {
   pname = "foma";
-  version = "0.10.0alpha-unstable-2024-03-13";
+  version = "0.10.0alpha-unstable-2025-09-10";
 
   src = fetchFromGitHub {
     owner = "mhulden";
     repo = "foma";
-    rev = "e0d8122bda4bbd56f18510bdfe840617f9736ae7";
-    hash = "sha256-UbwuHTilKWo4sVD3igcSlTqH78N6JQFvRD35QwfoX10=";
+    rev = "91f91866af843aec487313d028dbd1f76b5fb1a5";
+    hash = "sha256-CXRZNcEgsjD/9PowNynPyfLVbk8KDe3T52UetYMwC6w=";
   };
 
   sourceRoot = "${src.name}/foma";

From fc95bb3c638781aa062490b837f4cd14892892bf Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Sun, 19 Oct 2025 17:59:58 +0900
Subject: [PATCH 0939/6226] foxotron: fix build issue due to cmake 4

* As noted in https://github.com/NixOS/nixpkgs/issues/445447.
---
 pkgs/by-name/fo/foxotron/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fo/foxotron/package.nix b/pkgs/by-name/fo/foxotron/package.nix
index 3f297e76c125..1236aef59a3f 100644
--- a/pkgs/by-name/fo/foxotron/package.nix
+++ b/pkgs/by-name/fo/foxotron/package.nix
@@ -18,7 +18,6 @@
   alsa-lib,
   fontconfig,
 }:
-
 stdenv.mkDerivation rec {
   pname = "foxotron";
   version = "2024-09-23";
@@ -43,12 +42,17 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace CMakeLists.txt \
-      --replace "set(CMAKE_OSX_ARCHITECTURES x86_64)" ""
+      --replace-fail "set(CMAKE_OSX_ARCHITECTURES x86_64)" "" \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+
+    substituteInPlace externals/glm/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_policy(VERSION 3.2)" "cmake_policy(VERSION 3.10)"
 
     # Outdated vendored assimp, many warnings with newer compilers, too old for CMake option to control this
     # Note that this -Werror caused issues on darwin, so make sure to re-check builds there before removing this
     substituteInPlace externals/assimp/code/CMakeLists.txt \
-      --replace 'TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror)' ""
+      --replace-fail 'TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror)' ""
   '';
 
   nativeBuildInputs = [

From 985946b91261a5acd0cbe1ab7fab963e9b611645 Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Sun, 19 Oct 2025 18:11:55 +0900
Subject: [PATCH 0940/6226] galario: fix build issue related to cmake 4.

* As noted in https://github.com/NixOS/nixpkgs/issues/445447.
---
 pkgs/by-name/ga/galario/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ga/galario/package.nix b/pkgs/by-name/ga/galario/package.nix
index 7dcfafe08f3e..6b6a54c61d6f 100644
--- a/pkgs/by-name/ga/galario/package.nix
+++ b/pkgs/by-name/ga/galario/package.nix
@@ -10,7 +10,6 @@
   pythonPackages ? null,
   llvmPackages,
 }:
-
 let
   # CMake recipes are needed to build galario
   # Build process would usually download them
@@ -50,6 +49,9 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace python/utils.py \
       --replace-fail "trapz" "trapezoid" \
       --replace-fail "np.int" "int"
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeCheckInputs = lib.optionals enablePython [

From 117bf34d44f73d005a48405ba404db2b36a6ad93 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 09:24:14 +0000
Subject: [PATCH 0941/6226] terragrunt: 0.90.0 -> 0.91.1

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

diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix
index 43e53782e93c..569231fc8773 100644
--- a/pkgs/by-name/te/terragrunt/package.nix
+++ b/pkgs/by-name/te/terragrunt/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGo125Module (finalAttrs: {
   pname = "terragrunt";
-  version = "0.90.0";
+  version = "0.91.1";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = "terragrunt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tc+3+H/u/6IpkmvlwObzVjUnJzBzElme0tT+zktGfkw=";
+    hash = "sha256-GbPPBEl41p3sI31WuGquvnI+pVQ5zXpGey7zHjsKfw8=";
   };
 
   nativeBuildInputs = [
@@ -25,7 +25,7 @@ buildGo125Module (finalAttrs: {
     make generate-mocks
   '';
 
-  vendorHash = "sha256-+4mDmC1B4YmExOJqS/vlTxBiI5/rKcn3Vyw53BfvAxA=";
+  vendorHash = "sha256-iMzoee3MkOgU0Or0F+FVxNs1g5+306W4vC5wOh61mzw=";
 
   doCheck = false;
 

From 28e43000dbfb5fea8593ca3d07b62d3f7d0b605d Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sun, 19 Oct 2025 17:28:46 +0800
Subject: [PATCH 0942/6226] qt6.qtwebengine: fix build

---
 .../libraries/qt-6/modules/qtwebengine/default.nix     | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
index d06abd2441b9..df88eb6d473e 100644
--- a/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtwebengine/default.nix
@@ -7,6 +7,7 @@
   buildPackages,
   bison,
   coreutils,
+  fetchpatch2,
   flex,
   gperf,
   ninja,
@@ -110,6 +111,15 @@ qtModule {
 
     # Reproducibility QTBUG-136068
     ./gn-object-sorted.patch
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    # https://chromium-review.googlesource.com/c/chromium/src/+/6633292
+    (fetchpatch2 {
+      url = "https://github.com/chromium/chromium/commit/b0ff8c3b258a8816c05bdebf472dbba719d3c491.patch?full_index=1";
+      stripLen = 1;
+      extraPrefix = "src/3rdparty/chromium/";
+      hash = "sha256-zDIlHd8bBtrThkFnrcyA13mhXYIQt6sKsi6qAyQ34yo=";
+    })
   ];
 
   postPatch = ''

From f4946c7db746d1144928946e782c6c848f91bf02 Mon Sep 17 00:00:00 2001
From: ElXreno <elxreno@gmail.com>
Date: Tue, 23 Sep 2025 14:58:59 +0300
Subject: [PATCH 0943/6226] linux_xanmod: Sync config with upstream

---
 .../linux/kernel/xanmod-kernels.nix           | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 80beae4c400d..b4d8ee066198 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -52,18 +52,26 @@ let
           CPU_FREQ_DEFAULT_GOV_PERFORMANCE = lib.mkOverride 60 yes;
           CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = lib.mkOverride 60 no;
 
-          # Full preemption
-          PREEMPT = lib.mkOverride 60 yes;
+          # Lazy preemption
+          PREEMPT_LAZY = yes;
           PREEMPT_VOLUNTARY = lib.mkOverride 60 no;
+          PREEMPTIRQ_DELAY_TEST = unset;
 
           # Google's BBRv3 TCP congestion Control
           TCP_CONG_BBR = yes;
           DEFAULT_BBR = yes;
 
-          # Preemptive Full Tickless Kernel at 250Hz
+          # Preemptive tickless idle kernel
           HZ = freeform "250";
           HZ_250 = yes;
-          HZ_1000 = no;
+          NO_HZ = no;
+          NO_HZ_FULL = lib.mkOverride 60 no;
+          NO_HZ_IDLE = yes;
+
+          # CPU idle governors favored
+          CPU_IDLE_GOV_HALTPOLL = yes; # Already enabled
+          CPU_IDLE_GOV_LADDER = yes;
+          CPU_IDLE_GOV_TEO = yes;
 
           # RCU_BOOST and RCU_EXP_KTHREAD
           RCU_EXPERT = yes;
@@ -72,6 +80,12 @@ let
           RCU_BOOST = yes;
           RCU_BOOST_DELAY = freeform "0";
           RCU_EXP_KTHREAD = yes;
+          RCU_NOCB_CPU = yes;
+          RCU_DOUBLE_CHECK_CB_TIME = yes;
+
+          # x86 features
+          X86_FRED = yes;
+          X86_POSTED_MSI = yes;
         };
 
         extraPassthru.updateScript = {

From 32a1561a8b5b2f8d860fa4d3d7ed861f0c3dcb6e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 19 Oct 2025 11:55:38 +0200
Subject: [PATCH 0944/6226] pkgs/README: clarify active committer role for
 browsers

A small carification of what "active committer" actually means for
security-critical, fast-moving packages.
---
 pkgs/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/README.md b/pkgs/README.md
index 55c28934440f..4118b92c2e14 100644
--- a/pkgs/README.md
+++ b/pkgs/README.md
@@ -58,7 +58,7 @@ Because entries in the Nix store are inert and do nothing by themselves, package
   For example:
   * Any package which does not follow upstream security policies should be considered vulnerable.
     In particular, packages that vendor or fork web engines like Blink, Gecko or Webkit need to keep up with the frequent updates of those projects.
-  * Any security-critical fast-moving package such as Chrome or Firefox (or their forks) must have at least one active committer among the maintainers.
+  * Any security-critical fast-moving package such as Chrome or Firefox (or their forks) must have at least one committer among the maintainers, who actively reviews, merges and backports updates.
     This ensures no critical fixes are delayed unnecessarily, endangering unsuspecting users.
   * Services which typically work on web traffic are working on untrusted input.
   * Data (such as archives or rich documents) commonly shared over untrusted channels (e.g. email) is untrusted.

From ad0a9d2fd544b923eef617245d62509d2a1edc18 Mon Sep 17 00:00:00 2001
From: ElXreno <elxreno@gmail.com>
Date: Sun, 19 Oct 2025 13:56:58 +0300
Subject: [PATCH 0945/6226] linux_xanmod: Conditionally enable lazy preemption

---
 .../linux/kernel/xanmod-kernels.nix           | 74 ++++++++++---------
 1 file changed, 40 insertions(+), 34 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index b4d8ee066198..1cf9b2ead31d 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -47,46 +47,52 @@ let
           inherit hash;
         };
 
-        structuredExtraConfig = with lib.kernel; {
-          # CPUFreq governor Performance
-          CPU_FREQ_DEFAULT_GOV_PERFORMANCE = lib.mkOverride 60 yes;
-          CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = lib.mkOverride 60 no;
+        structuredExtraConfig =
+          with lib.kernel;
+          {
+            # CPUFreq governor Performance
+            CPU_FREQ_DEFAULT_GOV_PERFORMANCE = lib.mkOverride 60 yes;
+            CPU_FREQ_DEFAULT_GOV_SCHEDUTIL = lib.mkOverride 60 no;
 
-          # Lazy preemption
-          PREEMPT_LAZY = yes;
-          PREEMPT_VOLUNTARY = lib.mkOverride 60 no;
-          PREEMPTIRQ_DELAY_TEST = unset;
+            # Preemption
+            PREEMPT = lib.mkOverride 60 yes;
+            PREEMPT_VOLUNTARY = lib.mkOverride 60 no;
 
-          # Google's BBRv3 TCP congestion Control
-          TCP_CONG_BBR = yes;
-          DEFAULT_BBR = yes;
+            # Google's BBRv3 TCP congestion Control
+            TCP_CONG_BBR = yes;
+            DEFAULT_BBR = yes;
 
-          # Preemptive tickless idle kernel
-          HZ = freeform "250";
-          HZ_250 = yes;
-          NO_HZ = no;
-          NO_HZ_FULL = lib.mkOverride 60 no;
-          NO_HZ_IDLE = yes;
+            # Preemptive tickless idle kernel
+            HZ = freeform "250";
+            HZ_250 = yes;
+            NO_HZ = no;
+            NO_HZ_FULL = lib.mkOverride 60 no;
+            NO_HZ_IDLE = yes;
 
-          # CPU idle governors favored
-          CPU_IDLE_GOV_HALTPOLL = yes; # Already enabled
-          CPU_IDLE_GOV_LADDER = yes;
-          CPU_IDLE_GOV_TEO = yes;
+            # CPU idle governors favored
+            CPU_IDLE_GOV_HALTPOLL = yes; # Already enabled
+            CPU_IDLE_GOV_LADDER = yes;
+            CPU_IDLE_GOV_TEO = yes;
 
-          # RCU_BOOST and RCU_EXP_KTHREAD
-          RCU_EXPERT = yes;
-          RCU_FANOUT = freeform "64";
-          RCU_FANOUT_LEAF = freeform "16";
-          RCU_BOOST = yes;
-          RCU_BOOST_DELAY = freeform "0";
-          RCU_EXP_KTHREAD = yes;
-          RCU_NOCB_CPU = yes;
-          RCU_DOUBLE_CHECK_CB_TIME = yes;
+            # RCU_BOOST and RCU_EXP_KTHREAD
+            RCU_EXPERT = yes;
+            RCU_FANOUT = freeform "64";
+            RCU_FANOUT_LEAF = freeform "16";
+            RCU_BOOST = yes;
+            RCU_BOOST_DELAY = freeform "0";
+            RCU_EXP_KTHREAD = yes;
+            RCU_NOCB_CPU = yes;
+            RCU_DOUBLE_CHECK_CB_TIME = yes;
 
-          # x86 features
-          X86_FRED = yes;
-          X86_POSTED_MSI = yes;
-        };
+            # x86 features
+            X86_FRED = yes;
+            X86_POSTED_MSI = yes;
+          }
+          // lib.optionalAttrs (lib.versionAtLeast (lib.versions.majorMinor version) "6.13") {
+            # Lazy preemption
+            PREEMPT = lib.mkOverride 70 no;
+            PREEMPT_LAZY = yes;
+          };
 
         extraPassthru.updateScript = {
           command = [

From a3dbd9ed85e397212d49819e6722769e622e4304 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 19 Oct 2025 08:27:23 -0300
Subject: [PATCH 0946/6226] cutecom: move to by-name

---
 .../cutecom/default.nix => by-name/cu/cutecom/package.nix} | 7 +++----
 pkgs/top-level/all-packages.nix                            | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)
 rename pkgs/{tools/misc/cutecom/default.nix => by-name/cu/cutecom/package.nix} (92%)

diff --git a/pkgs/tools/misc/cutecom/default.nix b/pkgs/by-name/cu/cutecom/package.nix
similarity index 92%
rename from pkgs/tools/misc/cutecom/default.nix
rename to pkgs/by-name/cu/cutecom/package.nix
index 2ef00647be52..ce246c196ce0 100644
--- a/pkgs/tools/misc/cutecom/default.nix
+++ b/pkgs/by-name/cu/cutecom/package.nix
@@ -2,9 +2,8 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  qtserialport,
+  qt5,
   cmake,
-  wrapQtAppsHook,
 }:
 
 stdenv.mkDerivation {
@@ -23,10 +22,10 @@ stdenv.mkDerivation {
       --replace "/Applications" "$out/Applications"
   '';
 
-  buildInputs = [ qtserialport ];
+  buildInputs = [ qt5.qtserialport ];
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
 
   postInstall =
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 486b519307ce..50de8068e28a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10920,8 +10920,6 @@ with pkgs;
     hamlib = hamlib_4;
   };
 
-  cutecom = libsForQt5.callPackage ../tools/misc/cutecom { };
-
   darcs = haskell.lib.compose.disableCabalFlag "library" (
     haskell.lib.compose.justStaticExecutables haskellPackages.darcs
   );

From 0611726bb387ca000fa24134901f4fa6ef9fdd63 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 19 Oct 2025 08:29:55 -0300
Subject: [PATCH 0947/6226] cutecom: 0.51.0+patch -> 0.60.0-RC1

---
 pkgs/by-name/cu/cutecom/package.nix | 25 +++++++++++++------------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/cu/cutecom/package.nix b/pkgs/by-name/cu/cutecom/package.nix
index ce246c196ce0..969ab97b2451 100644
--- a/pkgs/by-name/cu/cutecom/package.nix
+++ b/pkgs/by-name/cu/cutecom/package.nix
@@ -2,19 +2,19 @@
   stdenv,
   lib,
   fetchFromGitLab,
-  qt5,
+  qt6,
   cmake,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "cutecom";
-  version = "0.51.0+patch";
+  version = "0.60.0-RC1";
 
   src = fetchFromGitLab {
     owner = "cutecom";
     repo = "cutecom";
-    rev = "70d0c497acf8f298374052b2956bcf142ed5f6ca";
-    sha256 = "X8jeESt+x5PxK3rTNC1h1Tpvue2WH09QRnG2g1eMoEE=";
+    tag = "v${finalAttrs.version}";
+    sha256 = "sha256-Co0bUW7klSPf1VfBt7oT2DlQmf6CLELS0oapIyjpx8w=";
   };
 
   postPatch = ''
@@ -22,10 +22,11 @@ stdenv.mkDerivation {
       --replace "/Applications" "$out/Applications"
   '';
 
-  buildInputs = [ qt5.qtserialport ];
+  buildInputs = [ qt6.qtserialport ];
+
   nativeBuildInputs = [
     cmake
-    qt5.wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   postInstall =
@@ -42,12 +43,12 @@ stdenv.mkDerivation {
         cp cutecom.1 "$out/share/man/man1"
       '';
 
-  meta = with lib; {
+  meta = {
     description = "Graphical serial terminal";
     homepage = "https://gitlab.com/cutecom/cutecom/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ bennofs ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ bennofs ];
+    platforms = lib.platforms.unix;
     mainProgram = "cutecom";
   };
-}
+})

From 8a44a2742892f36f1661347e1c704f571c7d34f5 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 19 Oct 2025 08:48:01 -0300
Subject: [PATCH 0948/6226] duckx: fix build with cmake4

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

diff --git a/pkgs/by-name/du/duckx/package.nix b/pkgs/by-name/du/duckx/package.nix
index 70133b9813e3..e6aa2433c7bb 100644
--- a/pkgs/by-name/du/duckx/package.nix
+++ b/pkgs/by-name/du/duckx/package.nix
@@ -27,6 +27,13 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "CMAKE_CXX_STANDARD" "14")
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+    # CMake 3.0 is deprecated and is no longer supported by CMake > 4
+    # https://github.com/NixOS/nixpkgs/issues/445447
+  '';
+
   passthru = {
     updateScript = gitUpdater { rev-prefix = "v"; };
   };

From 5252726226bc6762f983cbb2a12812bbba579256 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 19 Oct 2025 21:21:24 +0900
Subject: [PATCH 0949/6226] nixos/rngd: remove file, move warning to
 `rename.nix`

---
 nixos/modules/module-list.nix   |  1 -
 nixos/modules/rename.nix        |  6 ++++++
 nixos/modules/security/rngd.nix | 21 ---------------------
 3 files changed, 6 insertions(+), 22 deletions(-)
 delete mode 100644 nixos/modules/security/rngd.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 457d7923fd63..3b925039ebc7 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -397,7 +397,6 @@
   ./security/pam_mount.nix
   ./security/please.nix
   ./security/polkit.nix
-  ./security/rngd.nix
   ./security/rtkit.nix
   ./security/soteria.nix
   ./security/sudo-rs.nix
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index aede85d7eee8..ec42bfbeb022 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -411,6 +411,12 @@ in
     (mkRemovedOptionModule [ "services" "simplesamlphp" ] ''
       services.simplesamlphp has been vulnerable and unmaintained in nixpkgs.
     '')
+    (mkRemovedOptionModule [ "security" "rngd" ] ''
+      rngd is not necessary for any device that the kernel recognises
+      as an hardware RNG, as it will automatically run the krngd task
+      to periodically collect random data from the device and mix it
+      into the kernel's RNG.
+    '')
     # Do NOT add any option renames here, see top of the file
   ];
 }
diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix
deleted file mode 100644
index 63636da4b290..000000000000
--- a/nixos/modules/security/rngd.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ lib, ... }:
-let
-  removed =
-    k:
-    lib.mkRemovedOptionModule [
-      "security"
-      "rngd"
-      k
-    ];
-in
-{
-  imports = [
-    (removed "enable" ''
-      rngd is not necessary for any device that the kernel recognises
-      as an hardware RNG, as it will automatically run the krngd task
-      to periodically collect random data from the device and mix it
-      into the kernel's RNG.
-    '')
-    (removed "debug" "The rngd module was removed, so its debug option does nothing.")
-  ];
-}

From 5bed2a00ee6a170ab5e4ff30c92e09b4cf018833 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 12:28:35 +0000
Subject: [PATCH 0950/6226] regex-cli: 0.2.1 -> 0.2.3

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

diff --git a/pkgs/by-name/re/regex-cli/package.nix b/pkgs/by-name/re/regex-cli/package.nix
index 5cb960dcac1c..09857a40045d 100644
--- a/pkgs/by-name/re/regex-cli/package.nix
+++ b/pkgs/by-name/re/regex-cli/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "regex-cli";
-  version = "0.2.1";
+  version = "0.2.3";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-lHjChrjjqO7pApj7OA8BM2XvmU3iS+kEMPYSfb/C61U=";
+    hash = "sha256-ytI1C2QRUfInIChwtSaHze7VJnP9UIcO93e2wjz2/I0=";
   };
 
-  cargoHash = "sha256-9KLvVgmUun8tuAfxYMvAa5qpeXiOKe9JndZ81PmPpjA=";
+  cargoHash = "sha256-7fPoH6I8Okz8Oby45MIDdKBkbPgUPsaXd6XS3r3cRO8=";
 
   meta = with lib; {
     description = "Command line tool for debugging, ad hoc benchmarking and generating regular expressions";

From 8b7154e4a5b80bcd2809afde658cf43764de8424 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Sun, 19 Oct 2025 14:29:42 +0200
Subject: [PATCH 0951/6226] swiftshader: fix CMake 4.0 build

---
 pkgs/by-name/sw/swiftshader/package.nix | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sw/swiftshader/package.nix b/pkgs/by-name/sw/swiftshader/package.nix
index 238e214c382f..ef288e5aae0d 100644
--- a/pkgs/by-name/sw/swiftshader/package.nix
+++ b/pkgs/by-name/sw/swiftshader/package.nix
@@ -24,6 +24,17 @@ stdenv.mkDerivation {
     '';
   };
 
+  postPatch = ''
+    substituteInPlace third_party/googletest/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.5)"
+    substituteInPlace third_party/googletest/googlemock/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.5)"
+    substituteInPlace third_party/googletest/googletest/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.5)"
+    substituteInPlace third_party/marl/CMakeLists.txt \
+      --replace-fail  "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.5)"
+  '';
+
   nativeBuildInputs = [
     cmake
     python3
@@ -49,13 +60,13 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "High-performance CPU-based implementation of the Vulkan 1.3 graphics API";
     homepage = "https://opensource.google/projects/swiftshader";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     # Should be possible to support Darwin by changing the install phase with
     # 's/Linux/Darwin/' and 's/so/dylib/' or something similar.
-    platforms = with platforms; linux;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
   };
 }

From d62d487e8861624ea9281d704952721d959f06fa Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Sun, 19 Oct 2025 14:34:08 +0200
Subject: [PATCH 0952/6226] swiftshader: 2023-09-11 -> 2025-10-15

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

diff --git a/pkgs/by-name/sw/swiftshader/package.nix b/pkgs/by-name/sw/swiftshader/package.nix
index ef288e5aae0d..2add2ab01753 100644
--- a/pkgs/by-name/sw/swiftshader/package.nix
+++ b/pkgs/by-name/sw/swiftshader/package.nix
@@ -9,12 +9,12 @@
 
 stdenv.mkDerivation {
   pname = "swiftshader";
-  version = "2023-09-11";
+  version = "2025-10-15";
 
   src = fetchgit {
     url = "https://swiftshader.googlesource.com/SwiftShader";
-    rev = "4e40d502c440cc59b25fa3a5fee0eadbab7442aa";
-    hash = "sha256-YtbTaOkFhVMKdu3jiRHQsPmoEu3KDzIQXLZ5HFBSmWI=";
+    rev = "3d536c0fc62b1cdea0f78c3c38d79be559855b88";
+    hash = "sha256-RLc9ZJeq/97mi4/5vRnPPOPBHK2lc9/6Y7p1YVwxWkc=";
     # Remove 1GB of test files to get under Hydra output limit
     postFetch = ''
       rm -r $out/third_party/llvm-project/llvm/test

From 6badac486f3c914dcca8f49c5aff35a3e4b0ef07 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sat, 18 Oct 2025 16:08:29 +0900
Subject: [PATCH 0953/6226] nixos/tests/logkeys: init

---
 nixos/tests/all-tests.nix           |  1 +
 nixos/tests/logkeys.nix             | 34 +++++++++++++++++++++++++++++
 pkgs/by-name/lo/logkeys/package.nix |  3 +++
 3 files changed, 38 insertions(+)
 create mode 100644 nixos/tests/logkeys.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 66a599383a95..1f9c38680cbd 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -853,6 +853,7 @@ in
   localsend = runTest ./localsend.nix;
   locate = runTest ./locate.nix;
   login = runTest ./login.nix;
+  logkeys = runTest ./logkeys.nix;
   logrotate = runTest ./logrotate.nix;
   loki = runTest ./loki.nix;
   #logstash = handleTest ./logstash.nix {};
diff --git a/nixos/tests/logkeys.nix b/nixos/tests/logkeys.nix
new file mode 100644
index 000000000000..eeb4c27ee2b0
--- /dev/null
+++ b/nixos/tests/logkeys.nix
@@ -0,0 +1,34 @@
+{ lib, ... }:
+{
+  name = "logkeys";
+  meta.maintainers = with lib.maintainers; [ h7x4 ];
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      imports = [ ./common/user-account.nix ];
+
+      services.getty.autologinUser = "alice";
+
+      services.logkeys = {
+        enable = true;
+        device = "virtio-kbd";
+      };
+
+      # logkeys doesn't support specifying a device in `by-path`.
+      # In order not to make the test dependend on the ordering of the input event devices,
+      # we'll create a custom symlink before starting the service.
+      systemd.services.logkeys.serviceConfig.ExecStartPre = [
+        "+${lib.getExe' pkgs.coreutils "ln"} -s /dev/input/by-path/pci-0000:00:0a.0-event-kbd /dev/input/virtio-kbd"
+      ];
+    };
+
+  testScript = ''
+    machine.wait_for_unit("getty@tty1.service")
+    machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'")
+    machine.wait_for_unit("logkeys.service")
+
+    machine.send_chars("hello world\n")
+    machine.wait_until_succeeds("grep 'hello world' /var/log/logkeys.log")
+  '';
+}
diff --git a/pkgs/by-name/lo/logkeys/package.nix b/pkgs/by-name/lo/logkeys/package.nix
index 16bb1c6ba666..812028117977 100644
--- a/pkgs/by-name/lo/logkeys/package.nix
+++ b/pkgs/by-name/lo/logkeys/package.nix
@@ -7,6 +7,7 @@
   which,
   procps,
   kbd,
+  nixosTests,
 }:
 
 stdenv.mkDerivation {
@@ -38,6 +39,8 @@ stdenv.mkDerivation {
 
   preConfigure = "./autogen.sh";
 
+  passthru.tests.nixos = nixosTests.logkeys;
+
   meta = with lib; {
     description = "GNU/Linux keylogger that works";
     license = licenses.gpl3;

From c77cae84d119886fb24a5747776a0e5b6b8d8a2e Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Sun, 19 Oct 2025 23:03:55 +0900
Subject: [PATCH 0954/6226] mydumper: fix build issue due to cmake 4

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

diff --git a/pkgs/by-name/my/mydumper/package.nix b/pkgs/by-name/my/mydumper/package.nix
index b283d864ecbc..f9edcc2c83a8 100644
--- a/pkgs/by-name/my/mydumper/package.nix
+++ b/pkgs/by-name/my/mydumper/package.nix
@@ -20,7 +20,6 @@
   versionCheckHook,
   mydumper,
 }:
-
 stdenv.mkDerivation rec {
   pname = "mydumper";
   version = "0.20.1-2";
@@ -82,7 +81,8 @@ stdenv.mkDerivation rec {
   postPatch = ''
     # as of mydumper v0.14.5-1, mydumper tries to install its config to /etc
     substituteInPlace CMakeLists.txt\
-      --replace-fail "/etc" "$out/etc"
+      --replace-fail "/etc" "$out/etc" \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   # copy man files & docs over

From 99efb27fc1db2d29603df182e8dbf35bd281b779 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 16:44:26 +0200
Subject: [PATCH 0955/6226] sunvox: 2.1.2b -> 2.1.3

Co-authored-by: OPNA2608 <opna2608@protonmail.com>
---
 pkgs/by-name/su/sunvox/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/su/sunvox/package.nix b/pkgs/by-name/su/sunvox/package.nix
index 5759285e91d7..41d80a042a91 100644
--- a/pkgs/by-name/su/sunvox/package.nix
+++ b/pkgs/by-name/su/sunvox/package.nix
@@ -27,15 +27,15 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sunvox";
-  version = "2.1.2b";
+  version = "2.1.3";
 
   src = fetchzip {
     urls = [
       "https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
       # Upstream removes downloads of older versions, please save bumped versions to archive.org
-      "https://web.archive.org/web/20250831231045/https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
+      "https://web.archive.org/web/20251019141206/https://www.warmplace.ru/soft/sunvox/sunvox-${finalAttrs.version}.zip"
     ];
-    hash = "sha256-4GcSNu6ikAGNcPWz5ghrL78U6xrcIUqjFabs26LACRM=";
+    hash = "sha256-egOaIZEyI5x2VV660qbO+pan22BFRaa4d+8sOpJhpBM=";
   };
 
   nativeBuildInputs =

From 118d43a22a97991bc713d1b91b104717edfbc73f Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Sun, 19 Oct 2025 17:36:14 +0200
Subject: [PATCH 0956/6226] asterisk: drop v18, bump `asterisk-lts` and
 `asterisk` alias

---
 pkgs/servers/asterisk/default.nix | 14 +++++++-------
 pkgs/top-level/aliases.nix        |  1 +
 pkgs/top-level/all-packages.nix   |  1 -
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/servers/asterisk/default.nix b/pkgs/servers/asterisk/default.nix
index bf048d5f4bda..9187ddc4a6b4 100644
--- a/pkgs/servers/asterisk/default.nix
+++ b/pkgs/servers/asterisk/default.nix
@@ -209,20 +209,20 @@ let
 
 in
 {
-  # Supported releases (as of 2023-04-19).
-  # v16 and v19 have been dropped because they go EOL before the NixOS 23.11 release.
+  # Supported releases (as of 2025-10-19).
   # Source: https://wiki.asterisk.org/wiki/display/AST/Asterisk+Versions
   # Exact version can be found at https://www.asterisk.org/downloads/asterisk/all-asterisk-versions/
   #
   # Series  Type       Rel. Date   Sec. Fixes  EOL
-  # 16.x    LTS        2018-10-09  2022-10-09  2023-10-09 (dropped)
-  # 18.x    LTS        2020-10-20  2024-10-20  2025-10-20
+  # 18.x    LTS        2020-10-20  2024-10-20  2025-10-20 (dropped)
   # 19.x    Standard   2021-11-02  2022-11-02  2023-11-02 (dropped)
   # 20.x    LTS        2022-11-02  2026-10-19  2027-10-19
-  # 21.x    Standard   2023-10-18  2025-10-18  2026-10-18 (unreleased)
-  asterisk-lts = versions.asterisk_18;
+  # 21.x    Standard   2023-10-18  2025-10-18  2026-10-18
+  # 22.x    LTS        2024-10-16  2028-10-16  2029-10-16
+  # 23.x    Standard   2025-10-15  2026-10-15  2027-10-15
+  asterisk-lts = versions.asterisk_22;
   asterisk-stable = versions.asterisk_20;
-  asterisk = versions.asterisk_20.overrideAttrs (o: {
+  asterisk = versions.asterisk_22.overrideAttrs (o: {
     passthru = (o.passthru or { }) // {
       inherit updateScript;
     };
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 909f5afde9a1..dd19de2cb63a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -478,6 +478,7 @@ mapAliases {
   armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11
   aseprite-unfree = aseprite; # Added 2023-08-26
   asitop = macpm; # 'macpm' is a better-maintained downstream; keep 'asitop' for backwards-compatibility
+  asterisk_18 = throw "asterisk_18: Asterisk 18 is end of life and has been removed"; # Added 2025-10-19
   async = throw "'async' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
   atlassian-bamboo = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02
   atlassian-confluence = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 486b519307ce..85b866519098 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9275,7 +9275,6 @@ with pkgs;
     asterisk
     asterisk-stable
     asterisk-lts
-    asterisk_18
     asterisk_20
     asterisk_22
     ;

From 0bc3da7591eedb282d32fe2e10467eb54ee44540 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Sun, 19 Oct 2025 17:37:00 +0200
Subject: [PATCH 0957/6226] asterisk_23: add

---
 pkgs/top-level/all-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85b866519098..523a084cb4a9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9277,6 +9277,7 @@ with pkgs;
     asterisk-lts
     asterisk_20
     asterisk_22
+    asterisk_23
     ;
 
   asterisk-ldap = lowPrio (asterisk.override { ldapSupport = true; });

From 349068aee2f0052077bc3e46399889e4cd14ab87 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Sun, 19 Oct 2025 17:37:20 +0200
Subject: [PATCH 0958/6226] doc/release-notes: document asterisk-lts bump

---
 nixos/doc/manual/release-notes/rl-2511.section.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 16ce699c53f2..3880ce9c5bed 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -296,6 +296,8 @@
 
 - [private-gpt](https://github.com/zylon-ai/private-gpt) service has been removed by lack of maintenance upstream.
 
+- The `asterisk-lts` package was changed to v22 from v18. The default `asterisk` package was changed to v22 from v20. Asterisk version 18 has been dropped due to being EOL. The `asterisk-stable` (v20) package was unchanged. You may need to update /var/lib/asterisk to match the template files in `${asterisk-...}/var/lib/asterisk`.
+
 - NixOS display manager modules now strictly use tty1, where many of them previously used tty7. Options to configure display managers' VT have been dropped. A configuration with a display manager enabled will not start `getty@tty1.service`, even if the system is forced to boot into `multi-user.target` instead of `graphical.target`.
 
 - `river` 0.3.x has been renamed to `river-classic` upstream, and the package renamed accordingly. `programs.river` has been renamed to `programs.river-classic`.

From a0816fc3641d3527c03908fb89d1aace8c9178be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Lima?= <me@limwa.pt>
Date: Sat, 18 Oct 2025 16:17:47 +0100
Subject: [PATCH 0959/6226] ceph.python.pkgs.cryptography: disable mem leak
 tests on all platforms

---
 .../filesystems/ceph/old-python-packages/cryptography.nix   | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix
index 38d7e112fa61..f10d285617a7 100644
--- a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix
+++ b/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix
@@ -109,10 +109,12 @@ buildPythonPackage rec {
   disabledTestPaths = [
     # save compute time by not running benchmarks
     "tests/bench"
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
     # aarch64-darwin forbids W+X memory, but this tests depends on it:
     # * https://cffi.readthedocs.io/en/latest/using.html#callbacks
+    # furthermore, this test fails with OpenSSL 3.6.0, probably due to:
+    # * https://github.com/openssl/openssl/issues/28757
+    # * https://github.com/openssl/openssl/issues/28770
+    # * https://github.com/openssl/openssl/issues/28888
     "tests/hazmat/backends/test_openssl_memleak.py"
   ];
 

From e5a307a1cae706fb56c096fee7d414d7c76eb1ae Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sun, 19 Oct 2025 12:42:44 -0400
Subject: [PATCH 0960/6226] minc_tools: 2.3.06-unstable-2023-08-12 ->
 2.3.06-unstable-2024-11-28

---
 .../science/biology/minc-tools/default.nix         | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix
index 16f9a3e64db2..31fa46837c2e 100644
--- a/pkgs/applications/science/biology/minc-tools/default.nix
+++ b/pkgs/applications/science/biology/minc-tools/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation {
   pname = "minc-tools";
-  version = "2.3.06-unstable-2023-08-12";
+  version = "2.3.06-unstable-2024-11-28";
 
   src = fetchFromGitHub {
     owner = "BIC-MNI";
     repo = "minc-tools";
-    rev = "c86a767dbb63aaa05ee981306fa09f6133bde427";
-    hash = "sha256-PLNcuDU0ht1PcjloDhrPzpOpE42gbhPP3rfHtP7WnM4=";
+    rev = "a72077d92266f9ea4c49b6dd3efd5766b81a104c";
+    hash = "sha256-YafO5UjeADO/658Xm973JtqldRYkGQ4v8m1oNJoZrbM=";
   };
 
   nativeBuildInputs = [
@@ -58,12 +58,12 @@ stdenv.mkDerivation {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/BIC-MNI/minc-tools";
     description = "Command-line utilities for working with MINC files";
-    maintainers = with maintainers; [ bcdarwin ];
-    platforms = platforms.unix;
-    license = licenses.free;
+    maintainers = with lib.maintainers; [ bcdarwin ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.free;
     broken = stdenv.hostPlatform.isDarwin;
   };
 }

From 36a6c1d35ca52799db829dec24973cddb47aed82 Mon Sep 17 00:00:00 2001
From: matthewcroughan <matt@croughan.sh>
Date: Sun, 19 Oct 2025 18:09:46 +0100
Subject: [PATCH 0961/6226] rkdeveloptool: fix build on darwin

---
 pkgs/by-name/rk/rkdeveloptool/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/rk/rkdeveloptool/package.nix b/pkgs/by-name/rk/rkdeveloptool/package.nix
index 9b319231ad05..4b9047484665 100644
--- a/pkgs/by-name/rk/rkdeveloptool/package.nix
+++ b/pkgs/by-name/rk/rkdeveloptool/package.nix
@@ -26,7 +26,9 @@ stdenv.mkDerivation {
   buildInputs = [ libusb1 ];
 
   # main.cpp:1568:36: error: '%s' directive output may be truncated writing up to 557 bytes into a region of size 5
-  CPPFLAGS = lib.optionals stdenv.cc.isGNU [ "-Wno-error=format-truncation" ];
+  CPPFLAGS =
+    lib.optionals stdenv.cc.isGNU [ "-Wno-error=format-truncation" ]
+    ++ lib.optionals stdenv.isDarwin [ "-Wno-error=vla-cxx-extension" ];
 
   meta = with lib; {
     homepage = "https://github.com/rockchip-linux/rkdeveloptool";

From da7a28f476bcc778d7ec0f80204f82c227347cbb Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sun, 19 Oct 2025 12:52:20 -0400
Subject: [PATCH 0962/6226] minc_tools: CMake 4.x compatibility

---
 pkgs/applications/science/biology/minc-tools/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/science/biology/minc-tools/default.nix b/pkgs/applications/science/biology/minc-tools/default.nix
index 31fa46837c2e..a5d60ed8cae6 100644
--- a/pkgs/applications/science/biology/minc-tools/default.nix
+++ b/pkgs/applications/science/biology/minc-tools/default.nix
@@ -25,6 +25,13 @@ stdenv.mkDerivation {
     hash = "sha256-YafO5UjeADO/658Xm973JtqldRYkGQ4v8m1oNJoZrbM=";
   };
 
+  # Fix for CMake > 4 in which the old policy for CMP0026 was removed.
+  # Note this breaks the tests, but they are not enabled anyway.
+  # Upstream issue: https://github.com/BIC-MNI/minc-tools/issues/123
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail "SET CMP0026 OLD" "SET CMP0026 NEW"
+  '';
+
   nativeBuildInputs = [
     cmake
     flex

From 51f26c975c1f889bda51edfc6359775e3deae944 Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Mon, 20 Oct 2025 02:44:04 +0900
Subject: [PATCH 0963/6226] fish-irssi: unstable-2021-04-16 ->
 unstable-2023-08-05

---
 pkgs/by-name/fi/fish-irssi/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fi/fish-irssi/package.nix b/pkgs/by-name/fi/fish-irssi/package.nix
index bac04b17db67..d22321d75aaa 100644
--- a/pkgs/by-name/fi/fish-irssi/package.nix
+++ b/pkgs/by-name/fi/fish-irssi/package.nix
@@ -8,16 +8,15 @@
   openssl,
   irssi,
 }:
-
 stdenv.mkDerivation {
   pname = "fish-irssi";
-  version = "unstable-2021-04-16";
+  version = "unstable-2023-08-05";
 
   src = fetchFromGitHub {
     owner = "falsovsky";
     repo = "FiSH-irssi";
-    rev = "fcc484f09ce6941ba2e499605270593ddd13b81a";
-    hash = "sha256-KIPnz17a0CFfoPO2dZz90j+wG/dR4pv5d0iZMRf7Vkc=";
+    rev = "75f754fbcc3c68a078d23ae3e2baab71acc8ed9b";
+    hash = "sha256-fFu0E9uLQXPYrbBjEneXSEKm2uipwRE4A3D54XYLczE=";
   };
 
   patches = [ ./irssi-include-dir.patch ];

From b8af8f2e3d726fb4e942fe459c922ec71338b8d1 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Mon, 20 Oct 2025 02:25:10 +0800
Subject: [PATCH 0964/6226] limine: convert boolean values

---
 .../boot/loader/limine/limine-install.py      | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py
index f4a4245f141c..a64f34eaefc3 100644
--- a/nixos/modules/system/boot/loader/limine/limine-install.py
+++ b/nixos/modules/system/boot/loader/limine/limine-install.py
@@ -51,6 +51,11 @@ def config(*path: str) -> Optional[Any]:
         result = result[component]
     return result
 
+
+def bool_to_yes_no(value: bool) -> str:
+    return 'yes' if value else 'no'
+
+
 def get_system_path(profile: str = 'system', gen: Optional[str] = None, spec: Optional[str] = None) -> str:
     basename = f'{profile}-{gen}-link' if gen is not None else profile
     profiles_dir = '/nix/var/nix/profiles'
@@ -377,10 +382,14 @@ def copy_file(from_path: str, to_path: str):
 
     paths[to_path] = True
 
-def option_from_config(name: str, config_path: List[str], conversion: Callable[[str], str] | None = None) -> str:
-    if config(*config_path):
-        return f'{name}: {conversion(config(*config_path)) if conversion else config(*config_path)}\n'
-    return ''
+
+def option_from_config(name: str, config_path: List[str]) -> str:
+    value = config(*config_path)
+    if value is None:
+        return ""
+    if isinstance(value, bool):
+        value = bool_to_yes_no(value)
+    return f"{name}: {config(*config_path)}\n"
 
 
 def install_bootloader() -> None:
@@ -439,8 +448,8 @@ def install_bootloader() -> None:
         profiles += [(profile, get_gens(profile))]
 
     timeout = config('timeout')
-    editor_enabled = 'yes' if config('enableEditor') else 'no'
-    hash_mismatch_panic = 'yes' if config('panicOnChecksumMismatch') else 'no'
+    editor_enabled = bool_to_yes_no(config('enableEditor'))
+    hash_mismatch_panic = bool_to_yes_no(config('panicOnChecksumMismatch'))
 
     last_gen = get_gens()[-1]
     last_gen_json = json.load(open(os.path.join(get_system_path('system', last_gen), 'boot.json'), 'r'))

From 514da3ac5bc54f0db0ebc347d78b1bb5262a8fdb Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 19 Oct 2025 20:39:15 +0200
Subject: [PATCH 0965/6226] infamousPlugins: fix build with cmake 4

---
 pkgs/by-name/in/infamousPlugins/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/in/infamousPlugins/package.nix b/pkgs/by-name/in/infamousPlugins/package.nix
index 29df008ab9da..96d78ddcaccc 100644
--- a/pkgs/by-name/in/infamousPlugins/package.nix
+++ b/pkgs/by-name/in/infamousPlugins/package.nix
@@ -42,6 +42,17 @@ stdenv.mkDerivation rec {
     zita-resampler
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 2.8)' \
+      'cmake_minimum_required(VERSION 4.0)'
+    find src -name "CMakeLists.txt" -type f | while read -r file; do
+      substituteInPlace "$file" --replace-fail \
+        'cmake_minimum_required(VERSION 2.8)' \
+        'cmake_minimum_required(VERSION 4.0)'
+    done
+  '';
+
   meta = with lib; {
     homepage = "https://ssj71.github.io/infamousPlugins";
     description = "Collection of open-source LV2 plugins";

From 9a39fa94b285212625a1e948ad47560f8534fe04 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Sun, 19 Oct 2025 18:42:55 +0000
Subject: [PATCH 0966/6226] grafanaPlugins.victoriametrics-metrics-datasource:
 0.19.4 -> 0.19.5

---
 .../plugins/victoriametrics-metrics-datasource/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix
index 7159eb0747d2..fb1eb86c3063 100644
--- a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-metrics-datasource/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "victoriametrics-metrics-datasource";
-  version = "0.19.4";
-  zipHash = "sha256-gpbBPyzWWiz9cENBWEHyDqBRMXypiEDDgdYFuQnsD5o=";
+  version = "0.19.5";
+  zipHash = "sha256-wKLtfCI/onYPFrtP1EUrCbZ+OCHicshRZkZtltH6LzI=";
   meta = {
     description = "VictoriaMetrics metrics datasource for Grafana";
     license = lib.licenses.agpl3Only;

From 20f67e0bd8500200909df307b59be09933fc5b20 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Sun, 19 Oct 2025 18:43:43 +0000
Subject: [PATCH 0967/6226] grafanaPlugins.victoriametrics-logs-datasource:
 0.21.0 -> 0.21.1

---
 .../plugins/victoriametrics-logs-datasource/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix
index a6e0f428b585..bf240083f806 100644
--- a/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/victoriametrics-logs-datasource/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "victoriametrics-logs-datasource";
-  version = "0.21.0";
-  zipHash = "sha256-KesSzORt243WS9sR+iinq+wRI6q+8MPn8o9Bj2ic6E0=";
+  version = "0.21.1";
+  zipHash = "sha256-mhGxUt+JWX4i/CYcJOAYpCszF4F2ieaosERVoFUg/mU=";
   meta = {
     description = "Grafana datasource for VictoriaLogs";
     license = lib.licenses.asl20;

From 57d14289a605a0844aa4aebf61ec135f2979c123 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 19 Oct 2025 09:39:03 -0300
Subject: [PATCH 0968/6226] zed-open-capture: fix build with cmake4, modernize

---
 pkgs/by-name/ze/zed-open-capture/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ze/zed-open-capture/package.nix b/pkgs/by-name/ze/zed-open-capture/package.nix
index ece760178aa8..7d3d6b2f77df 100644
--- a/pkgs/by-name/ze/zed-open-capture/package.nix
+++ b/pkgs/by-name/ze/zed-open-capture/package.nix
@@ -38,10 +38,16 @@ stdenv.mkDerivation {
     "-DBUILD_EXAMPLES=OFF"
   ];
 
-  meta = with lib; {
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
+  meta = {
     description = "Platform-agnostic camera and sensor capture API for the ZED 2, ZED 2i, and ZED Mini stereo cameras";
     homepage = "https://github.com/stereolabs/zed-open-capture";
-    license = licenses.mit;
-    maintainers = with maintainers; [ marius851000 ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ marius851000 ];
+    platforms = lib.platforms.linux;
   };
 }

From 37e986ab273da2e3d7e4e9ce0830b70b9e764260 Mon Sep 17 00:00:00 2001
From: Pamplemousse <git@xaviermaso.com>
Date: Sun, 19 Oct 2025 21:32:38 +0200
Subject: [PATCH 0969/6226] selfoss: Fix module

Documented way of running with `nginx` require the `.nginx.conf` to be
present.
_c.f._ https://github.com/fossar/selfoss/issues/1535
---
 nixos/modules/services/web-apps/selfoss.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/selfoss.nix b/nixos/modules/services/web-apps/selfoss.nix
index c3dceb859fea..f4aa61a4c910 100644
--- a/nixos/modules/services/web-apps/selfoss.nix
+++ b/nixos/modules/services/web-apps/selfoss.nix
@@ -148,7 +148,11 @@ in
         ls | grep -v data | while read line; do rm -rf $line; done || true
 
         # Create the files
-        cp -r "${pkgs.selfoss}/"* "${dataDir}"
+        cp -r \
+          "${pkgs.selfoss}/.htaccess" \
+          "${pkgs.selfoss}/.nginx.conf" \
+          "${pkgs.selfoss}/"* \
+          "${dataDir}"
         ln -sf "${selfoss-config}" "${dataDir}/config.ini"
         chown -R "${cfg.user}" "${dataDir}"
         chmod -R 755 "${dataDir}"

From b2bb98561a98806f391c427bf46531b14c45a52f Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Mon, 13 Oct 2025 20:56:40 -0700
Subject: [PATCH 0970/6226] python3Packages.correctionlib: reduce churn on
 compiler updates

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

diff --git a/pkgs/development/python-modules/correctionlib/default.nix b/pkgs/development/python-modules/correctionlib/default.nix
index 957f5da7ed79..96ea87b952fd 100644
--- a/pkgs/development/python-modules/correctionlib/default.nix
+++ b/pkgs/development/python-modules/correctionlib/default.nix
@@ -41,6 +41,10 @@ buildPythonPackage rec {
     hash = "sha256-aLTeyDOo80p8xzl/IPnpT3BOjS2qOYn/Z7pidcLoEY8=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail "-Wall -Wextra -Wpedantic -Werror" ""
+  '';
+
   build-system = [
     pybind11
     scikit-build-core

From 67e1598f9133bfa73e6641dd37607d14b7cfc993 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sun, 19 Oct 2025 16:16:01 -0400
Subject: [PATCH 0971/6226] nixos/test/login: Fix uaccess test.

This PR https://github.com/systemd/systemd/pull/36444 caused this bug
https://github.com/systemd/systemd/issues/39043, which is fixed in
this PR https://github.com/systemd/systemd/pull/39071. In short,
`uaccess` doesn't work with `OPTIONS+="static_node=..."` udev rules,
and `/dev/snd/timer` is a static node. 258.1 needs to wait for the
next staging cycle, so for now let's just use a non-static node.
---
 nixos/tests/login.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/login.nix b/nixos/tests/login.nix
index bd0d3b7bc005..ab80b8aaabf0 100644
--- a/nixos/tests/login.nix
+++ b/nixos/tests/login.nix
@@ -48,12 +48,13 @@
         machine.wait_for_file("/home/alice/done")
 
     with subtest("Systemd gives and removes device ownership as needed"):
-        machine.succeed("getfacl /dev/snd/timer | grep -q alice")
+        # Change back to /dev/snd/timer after systemd-258.1
+        machine.succeed("getfacl /dev/dri/card0 | grep -q alice")
         machine.send_key("alt-f1")
         machine.wait_until_succeeds("[ $(fgconsole) = 1 ]")
-        machine.fail("getfacl /dev/snd/timer | grep -q alice")
+        machine.fail("getfacl /dev/dri/card0 | grep -q alice")
         machine.succeed("chvt 2")
-        machine.wait_until_succeeds("getfacl /dev/snd/timer | grep -q alice")
+        machine.wait_until_succeeds("getfacl /dev/dri/card0 | grep -q alice")
 
     with subtest("Virtual console logout"):
         machine.send_chars("exit\n")

From 36114230deea73ad204d0972fc16de69808c458f Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sun, 12 Oct 2025 22:40:44 -0400
Subject: [PATCH 0972/6226] miniupnpd: Fix cross compilation

---
 pkgs/tools/networking/miniupnpd/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/tools/networking/miniupnpd/default.nix b/pkgs/tools/networking/miniupnpd/default.nix
index 19b9dbc95e14..c78d310d2781 100644
--- a/pkgs/tools/networking/miniupnpd/default.nix
+++ b/pkgs/tools/networking/miniupnpd/default.nix
@@ -4,6 +4,7 @@
   fetchurl,
   iptables-legacy,
   libuuid,
+  linuxHeaders,
   openssl,
   pkg-config,
   which,
@@ -71,7 +72,12 @@ stdenv.mkDerivation rec {
   # ./configure is not a standard configure file, errors with:
   # Option not recognized : --prefix=
   dontAddPrefix = true;
+  # Similar for cross flags --host/--build
+  configurePlatforms = [ ];
   configureFlags = [
+    "--host-os=${stdenv.hostPlatform.uname.system}"
+    "--host-os-version=${linuxHeaders.version}"
+    "--host-machine=${stdenv.hostPlatform.uname.processor}"
     "--firewall=${firewall}"
     # allow using various config options
     "--ipv6"

From ece812ce6d45de7ce5d76ed2a005d0b1a7ca9853 Mon Sep 17 00:00:00 2001
From: Tomas Leypold <tomas@leypold.cz>
Date: Sun, 19 Oct 2025 22:38:13 +0200
Subject: [PATCH 0973/6226] k3s: fix containerd-shim process matching in
 killall script

---
 pkgs/applications/networking/cluster/k3s/builder.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix
index f4f3dff1d4f3..aa4814fc3d3c 100644
--- a/pkgs/applications/networking/cluster/k3s/builder.nix
+++ b/pkgs/applications/networking/cluster/k3s/builder.nix
@@ -203,8 +203,9 @@ let
 
     # Let killall expect "containerd-shim" in the Nix store
     substituteInPlace install.sh \
+      --replace-fail '"''${K3S_DATA_DIR}"' "" \
       --replace-fail '/data/[^/]*/bin/containerd-shim' \
-        '/nix/store/.*k3s-containerd.*/bin/containerd-shim'
+        '/nix/store/[^/]*k3s-containerd[^/]*/bin/containerd-shim'
 
     remove_matching_line() {
       line_to_delete=$(grep -n "$1" install.sh | cut -d : -f 1 || true)

From 1e08e699f04769aebdd31a1a1eaee20ac97a6784 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 20:50:35 +0000
Subject: [PATCH 0974/6226] airwindows: 0-unstable-2025-10-05 ->
 0-unstable-2025-10-18

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

diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix
index 767d6522c18d..9cc03af3642f 100644
--- a/pkgs/by-name/ai/airwindows/package.nix
+++ b/pkgs/by-name/ai/airwindows/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation {
   pname = "airwindows";
-  version = "0-unstable-2025-10-05";
+  version = "0-unstable-2025-10-18";
 
   src = fetchFromGitHub {
     owner = "airwindows";
     repo = "airwindows";
-    rev = "5889ed48beefd556adca76ed3e4b1b4982531dbd";
-    hash = "sha256-zpuzKpuYGe0xpUrBeWpaCYEBy9mGOX5R3LAeiWPCQ3s=";
+    rev = "1b0b4d56623e464db038e88cb87d1703b5aa0c63";
+    hash = "sha256-u83unbD3qf3OudMeOq20Iw2K3SOsKrGLekYCiVZTzF8=";
   };
 
   # we patch helpers because honestly im spooked out by where those variables

From cc822e88adcec87682d0cf024b4d2381a1345647 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 20:56:02 +0000
Subject: [PATCH 0975/6226] chirpstack-rest-api: 4.14.1 -> 4.15.0

---
 pkgs/by-name/ch/chirpstack-rest-api/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chirpstack-rest-api/package.nix b/pkgs/by-name/ch/chirpstack-rest-api/package.nix
index f1f69318444c..45acd2ff014d 100644
--- a/pkgs/by-name/ch/chirpstack-rest-api/package.nix
+++ b/pkgs/by-name/ch/chirpstack-rest-api/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule rec {
   pname = "chirpstack-rest-api";
-  version = "4.14.1";
+  version = "4.15.0";
 
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-rest-api";
     rev = "v${version}";
-    hash = "sha256-DHDrnChRikVDJhdCcoHlFn3sYfjEvWpzUsMkuIoqQiw=";
+    hash = "sha256-YSMdE0f3usedyUItSvdtJ77L/x4rwrgIJa1TTg9ODek=";
   };
 
-  vendorHash = "sha256-BthdLFhzrAiZTI/afsNgKhgCj1QQHabU37sH9ovIDdU=";
+  vendorHash = "sha256-+lAfgFb45WxZYh5fzONECRwTlXA64nl58rfstOPsDEg=";
 
   ldflags = [
     "-s"

From e76e2ea51d4b40a9fbafacfc79f1444ecee0d940 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Sun, 19 Oct 2025 22:57:20 +0200
Subject: [PATCH 0976/6226] m1n1: 1.5.0 -> 1.5.2

Diff: https://github.com/AsahiLinux/m1n1/compare/v1.5.0...v1.5.2

Changelog: https://github.com/AsahiLinux/m1n1/releases/tag/v1.5.2
---
 pkgs/by-name/m1/m1n1/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/m1/m1n1/package.nix b/pkgs/by-name/m1/m1n1/package.nix
index 868003eaaa35..960f27cef605 100644
--- a/pkgs/by-name/m1/m1n1/package.nix
+++ b/pkgs/by-name/m1/m1n1/package.nix
@@ -11,13 +11,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "m1n1";
-  version = "1.5.0";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "AsahiLinux";
     repo = "m1n1";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-J1PZVaEdI6gx/qzsoVW1ehRQ/ZDKzdC1NgIGgBqxQ+0=";
+    hash = "sha256-/TQpR/3OUM4OIrfv6cBgZigyLR0VKw6Rd1v9465wy3o=";
   };
 
   postPatch = lib.optionalString (customLogo != null) ''

From babb70ddac84ea94404563a8947f7271c4de6233 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 21:12:39 +0000
Subject: [PATCH 0977/6226] grafanactl: 0.1.5 -> 0.1.6

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

diff --git a/pkgs/by-name/gr/grafanactl/package.nix b/pkgs/by-name/gr/grafanactl/package.nix
index 28ee2c72b09b..784ce3cdf36a 100644
--- a/pkgs/by-name/gr/grafanactl/package.nix
+++ b/pkgs/by-name/gr/grafanactl/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "grafanactl";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "grafanactl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XHcNyPSN01CGkuj9p54yAAWFlwoWLF6cm5Q2f8iZtVM=";
+    hash = "sha256-elCTtsBkPthlDnUDWSOmM+JMBh/ms2+30b4hVsiJU6Q=";
   };
 
-  vendorHash = "sha256-fHlktADqw3p377g3vXr2LZdBfWfNZOHxnp9H8/C31Gg=";
+  vendorHash = "sha256-WmMkLMxkfGWq8dGjVfME86hEI76Rlp5aWqbNKatUZ80=";
 
   ldflags = [
     "-X main.version=v${finalAttrs.version}"

From 97fd0fa611d550b3aed15cf06c80347001af394a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 21:29:01 +0000
Subject: [PATCH 0978/6226] vcpkg-tool: 2025-10-10 -> 2025-10-16

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

diff --git a/pkgs/by-name/vc/vcpkg-tool/package.nix b/pkgs/by-name/vc/vcpkg-tool/package.nix
index 9e8059e3c2ad..66f16a27dd51 100644
--- a/pkgs/by-name/vc/vcpkg-tool/package.nix
+++ b/pkgs/by-name/vc/vcpkg-tool/package.nix
@@ -24,13 +24,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vcpkg-tool";
-  version = "2025-10-10";
+  version = "2025-10-16";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "vcpkg-tool";
     rev = finalAttrs.version;
-    hash = "sha256-u88yjYhBKo8uX/jVQypYzOqWeE6PSM+GJD5v5qZyjC4=";
+    hash = "sha256-Qu7e2cb4fDAiJ4PXRzgdsvTMM8eo6dwRCNpd/w3vWLw=";
   };
 
   nativeBuildInputs = [

From 6055cc71797991dd105a937d210e60c4cc9b9e07 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 19 Oct 2025 22:00:13 +0000
Subject: [PATCH 0979/6226] zwave-js-ui: 11.4.1 -> 11.5.2

---
 pkgs/by-name/zw/zwave-js-ui/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix
index f7b03c41bcc0..2d9c065f454b 100644
--- a/pkgs/by-name/zw/zwave-js-ui/package.nix
+++ b/pkgs/by-name/zw/zwave-js-ui/package.nix
@@ -7,15 +7,15 @@
 
 buildNpmPackage rec {
   pname = "zwave-js-ui";
-  version = "11.4.1";
+  version = "11.5.2";
 
   src = fetchFromGitHub {
     owner = "zwave-js";
     repo = "zwave-js-ui";
     tag = "v${version}";
-    hash = "sha256-28FaP8T5TllbibUPJIQBgmnR8Bc4dXWyIS2AGSY0YtE=";
+    hash = "sha256-G/ZHp5JmCpFCsjbgHyAS4+5eihyzqVtkcZT5vj6Pxos=";
   };
-  npmDepsHash = "sha256-OEewVf9CL17Koq2bFE0rOjPaBIgotSo8iHWl3Lp/chk=";
+  npmDepsHash = "sha256-amw6eVKWCIuF/XcY1dHb9/qMADGkUANT4WmQNx3O+NY=";
 
   passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
 

From e72bb189e2dca9293601205e2fa6e13c8878b94b Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 19 Oct 2025 18:01:02 -0400
Subject: [PATCH 0980/6226] rkrlv2: fix build with cmake 4

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

diff --git a/pkgs/by-name/rk/rkrlv2/package.nix b/pkgs/by-name/rk/rkrlv2/package.nix
index adb25975d7cc..52553a23a1eb 100644
--- a/pkgs/by-name/rk/rkrlv2/package.nix
+++ b/pkgs/by-name/rk/rkrlv2/package.nix
@@ -24,6 +24,12 @@ stdenv.mkDerivation rec {
     sha256 = "WjpPNUEYw4aGrh57J+7kkxKFXgCJWNaWAmueFbNUJJo=";
   };
 
+  postPatch = ''
+    substituteInPlace ./CMakeLists.txt lv2/CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 2.6)" \
+      "cmake_minimum_required(VERSION 4.0)"
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config

From c28b163fb5690502c383c71ef82fd0e206513485 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 19 Oct 2025 18:03:27 -0400
Subject: [PATCH 0981/6226] rkrlv2: modernize

Signed-off-by: Ethan Carter Edwards <ethan@ethancedwards.com>
---
 pkgs/by-name/rk/rkrlv2/package.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/rk/rkrlv2/package.nix b/pkgs/by-name/rk/rkrlv2/package.nix
index 52553a23a1eb..8035b400dbfd 100644
--- a/pkgs/by-name/rk/rkrlv2/package.nix
+++ b/pkgs/by-name/rk/rkrlv2/package.nix
@@ -13,15 +13,15 @@
   libsndfile,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rkrlv2";
   version = "beta_3";
 
   src = fetchFromGitHub {
     owner = "ssj71";
     repo = "rkrlv2";
-    rev = version;
-    sha256 = "WjpPNUEYw4aGrh57J+7kkxKFXgCJWNaWAmueFbNUJJo=";
+    tag = finalAttrs.version;
+    hash = "sha256-WjpPNUEYw4aGrh57J+7kkxKFXgCJWNaWAmueFbNUJJo=";
   };
 
   postPatch = ''
@@ -30,10 +30,13 @@ stdenv.mkDerivation rec {
       "cmake_minimum_required(VERSION 4.0)"
   '';
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     cmake
     pkg-config
   ];
+
   buildInputs = [
     libXft
     libXpm
@@ -44,12 +47,12 @@ stdenv.mkDerivation rec {
     libsndfile
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Rakarrak effects ported to LV2";
     homepage = "https://github.com/ssj71/rkrlv2";
-    license = licenses.gpl2Only;
-    maintainers = [ maintainers.joelmo ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Only;
+    maintainers = [ lib.maintainers.joelmo ];
+    platforms = lib.platforms.unix;
     broken = stdenv.hostPlatform.isAarch64; # g++: error: unrecognized command line option '-mfpmath=sse'
   };
-}
+})

From ead4b1d4e4d107e0a329b3bbb84ab4407db3d2e2 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 19 Oct 2025 19:24:18 -0300
Subject: [PATCH 0982/6226] zandronum, zandronum-server: 3.1.0 -> 3.2.1

---
 .../doom-ports/zandronum/add_gitinfo.patch    | 15 --------
 pkgs/games/doom-ports/zandronum/default.nix   | 34 +++++++++----------
 .../zandronum/dont_update_gitinfo.patch       | 19 -----------
 .../zandronum/zan_configure_impurity.patch    |  2 --
 4 files changed, 16 insertions(+), 54 deletions(-)
 delete mode 100644 pkgs/games/doom-ports/zandronum/add_gitinfo.patch
 delete mode 100644 pkgs/games/doom-ports/zandronum/dont_update_gitinfo.patch

diff --git a/pkgs/games/doom-ports/zandronum/add_gitinfo.patch b/pkgs/games/doom-ports/zandronum/add_gitinfo.patch
deleted file mode 100644
index 33f51ecb125d..000000000000
--- a/pkgs/games/doom-ports/zandronum/add_gitinfo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -r 4178904d7698 src/gitinfo.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/gitinfo.h	Fri Dec 01 13:02:42 2023 -0300
-@@ -0,0 +1,11 @@
-+// 4178904d769879e6c2919fb647ee6dd2736399e9
-+//
-+// This file was automatically generated by the
-+// updaterevision tool. Do not edit by hand.
-+
-+#define GIT_DESCRIPTION "ZA_3.0.1-572-4178904d7698"
-+#define GIT_HASH "4178904d769879e6c2919fb647ee6dd2736399e9"
-+#define GIT_TIME "2021-12-11 16:35:55 -0500"
-+#define HG_REVISION_NUMBER 1639258555
-+#define HG_REVISION_HASH_STRING "4178904d7698"
-+#define HG_TIME "211211-2135"
diff --git a/pkgs/games/doom-ports/zandronum/default.nix b/pkgs/games/doom-ports/zandronum/default.nix
index 837339921bb5..eaeddab5c79a 100644
--- a/pkgs/games/doom-ports/zandronum/default.nix
+++ b/pkgs/games/doom-ports/zandronum/default.nix
@@ -1,7 +1,7 @@
 {
   stdenv,
   lib,
-  fetchhg,
+  fetchFromGitLab,
   cmake,
   pkg-config,
   makeWrapper,
@@ -9,6 +9,7 @@
   soundfont-fluid,
   SDL_compat,
   libGL,
+  libopus,
   glew,
   bzip2,
   zlib,
@@ -29,25 +30,21 @@ let
   clientLibPath = lib.makeLibraryPath [ fluidsynth ];
 
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "zandronum${suffix}";
-  version = "3.1.0";
+  version = "3.2.1";
 
-  src = fetchhg {
-    # expired ssl certificate
-    url = "http://hg.osdn.net/view/zandronum/zandronum-stable";
-    rev = "4178904d7698";
-    hash = "sha256-5t36CoRPPjDKQE0DVSv2Qqpqko6JAXBI53tuAYiylHQ=";
+  src = fetchFromGitLab {
+    domain = "foss.heptapod.net";
+    owner = "zandronum";
+    repo = "zandronum-stable";
+    tag = "ZA_${finalAttrs.version}";
+    hash = "sha256-A5sfZMiCypBxAUOsoB8yuinZf7b9D7+HH9rpVs3esgA=";
   };
 
   # zandronum tries to download sqlite now when running cmake, don't let it
-  # it also needs the current mercurial revision info embedded in gitinfo.h
-  # otherwise, the client will fail to connect to servers because the
-  # protocol version doesn't match.
   patches = [
     ./zan_configure_impurity.patch
-    ./dont_update_gitinfo.patch
-    ./add_gitinfo.patch
   ];
 
   # I have no idea why would SDL and libjpeg be needed for the server part!
@@ -66,6 +63,7 @@ stdenv.mkDerivation {
     glew
     fmod
     fluidsynth
+    libopus
     gtk2
   ];
 
@@ -117,12 +115,12 @@ stdenv.mkDerivation {
     inherit fmod sqlite;
   };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://zandronum.com/";
     description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software";
     mainProgram = "zandronum-server";
-    maintainers = with maintainers; [ lassulus ];
-    license = licenses.sleepycat;
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ lassulus ];
+    license = lib.licenses.sleepycat;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/games/doom-ports/zandronum/dont_update_gitinfo.patch b/pkgs/games/doom-ports/zandronum/dont_update_gitinfo.patch
deleted file mode 100644
index d1cf831819c3..000000000000
--- a/pkgs/games/doom-ports/zandronum/dont_update_gitinfo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -r 4178904d7698 src/CMakeLists.txt
---- a/src/CMakeLists.txt	Sat Dec 11 16:35:55 2021 -0500
-+++ b/src/CMakeLists.txt	Fri Dec 01 13:00:32 2023 -0300
-@@ -642,15 +642,6 @@
- 	add_definitions( -DBACKPATCH )
- endif( BACKPATCH )
- 
--# Update gitinfo.h
--
--get_target_property( UPDATEREVISION_EXE updaterevision LOCATION )
--
--add_custom_target( revision_check ALL
--	COMMAND ${UPDATEREVISION_EXE} src/gitinfo.h
--	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
--	DEPENDS updaterevision )
--
- # Libraries ZDoom needs
- 
- message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" )
diff --git a/pkgs/games/doom-ports/zandronum/zan_configure_impurity.patch b/pkgs/games/doom-ports/zandronum/zan_configure_impurity.patch
index 9dafc6219d29..b0cef1c8f91e 100644
--- a/pkgs/games/doom-ports/zandronum/zan_configure_impurity.patch
+++ b/pkgs/games/doom-ports/zandronum/zan_configure_impurity.patch
@@ -2,8 +2,6 @@ diff -r 4178904d7698 sqlite/CMakeLists.txt
 --- a/sqlite/CMakeLists.txt	Sat Dec 11 16:35:55 2021 -0500
 +++ b/sqlite/CMakeLists.txt	Fri Dec 01 12:57:55 2023 -0300
 @@ -1,65 +1,5 @@
- cmake_minimum_required( VERSION 2.4 )
- 
 -# [BB/EP] Download SQLite archive and extract the sources if necessary.
 -set( ZAN_SQLITE_VERSION 3360000 ) # SQL version 3.36.0
 -set( ZAN_SQLITE_YEAR 2021 )

From 69b1583520e8c1878819a0ab0b7f431793552509 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 12 Oct 2025 01:20:01 +0800
Subject: [PATCH 0983/6226] freecad: cleanup dependencies

---
 pkgs/by-name/fr/freecad/README.md   |  7 -------
 pkgs/by-name/fr/freecad/package.nix | 22 +++++-----------------
 2 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 pkgs/by-name/fr/freecad/README.md

diff --git a/pkgs/by-name/fr/freecad/README.md b/pkgs/by-name/fr/freecad/README.md
deleted file mode 100644
index f3fdae03e150..000000000000
--- a/pkgs/by-name/fr/freecad/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-This package supports the following parameters:
-
-- withWayland (default: true): when false, set QT_QPA_PLATFORM to xcb
-- spaceNavSupport (enabled by default on Linux): whether to enable
-  [spacenavd support](https://spacenav.sourceforge.net/)
-- ifcSupport (default: false): whether to enable ifc support through
-  ifcopenshell
diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix
index 233a3d6d8b87..c98d0a4cd32d 100644
--- a/pkgs/by-name/fr/freecad/package.nix
+++ b/pkgs/by-name/fr/freecad/package.nix
@@ -8,7 +8,6 @@
   fetchFromGitHub,
   fetchpatch,
   fmt,
-  gfortran,
   gts,
   hdf5,
   libGLU,
@@ -19,13 +18,11 @@
   ninja,
   ode,
   opencascade-occt,
+  microsoft-gsl,
   pkg-config,
   python3Packages,
-  spaceNavSupport ? stdenv.hostPlatform.isLinux,
   stdenv,
   swig,
-  vtk,
-  wrapGAppsHook3,
   xercesc,
   yaml-cpp,
   zlib,
@@ -50,6 +47,7 @@ let
     pyyaml # (at least for) PyrateWorkbench
     scipy
     shiboken6
+    vtk
   ];
 
   freecad-utils = callPackage ./freecad-utils.nix { inherit (python3Packages) python; };
@@ -71,10 +69,8 @@ freecad-utils.makeCustomizable (
       cmake
       ninja
       pkg-config
-      gfortran
       swig
       doxygen
-      wrapGAppsHook3
       qt6.wrapQtAppsHook
     ];
 
@@ -86,21 +82,21 @@ freecad-utils.makeCustomizable (
       hdf5
       libGLU
       libXmu
+      libspnav
       medfile
       ode
-      vtk
       xercesc
       yaml-cpp
       zlib
       opencascade-occt
+      microsoft-gsl
       qt6.qtbase
       qt6.qtsvg
       qt6.qttools
       qt6.qtwayland
       qt6.qtwebengine
     ]
-    ++ pythonDeps
-    ++ lib.optionals spaceNavSupport [ libspnav ];
+    ++ pythonDeps;
 
     patches = [
       ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch
@@ -135,13 +131,6 @@ freecad-utils.makeCustomizable (
       "-DBUILD_QT6=ON"
     ];
 
-    # This should work on both x86_64, and i686 linux
-    preBuild = ''
-      export NIX_LDFLAGS="-L${gfortran.cc.lib}/lib64 -L${gfortran.cc.lib}/lib $NIX_LDFLAGS";
-    '';
-
-    dontWrapGApps = true;
-
     qtWrapperArgs =
       let
         binPath = lib.makeBinPath [
@@ -153,7 +142,6 @@ freecad-utils.makeCustomizable (
         "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1"
         "--prefix PATH : ${binPath}"
         "--prefix PYTHONPATH : ${python3Packages.makePythonPath pythonDeps}"
-        "\${gappsWrapperArgs[@]}"
       ];
 
     postFixup = ''

From 0708f349688ab88d89897e7ce91efb20aec6202c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 20 Oct 2025 02:15:05 +0200
Subject: [PATCH 0984/6226] =?UTF-8?q?ocamlPackages.ppx=5Fderive=5Fat=5Frun?=
 =?UTF-8?q?time:=200.17.0=20=E2=86=92=200.17.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/janestreet/0.17.nix         | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix
index c7ec05e6b1bf..6e0f48a1d9d1 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.17.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix
@@ -1217,18 +1217,30 @@ with self;
     ];
   };
 
-  ppx_derive_at_runtime = janePackage {
-    pname = "ppx_derive_at_runtime";
-    hash = "sha256-Y/z4BKFRt3z1lUGdc7SznIv/ys//dZHoPSnsouj1GtI=";
-    meta.description = "Define a new ppx deriver by naming a runtime module";
-    propagatedBuildInputs = [
-      base
-      expect_test_helpers_core
-      ppx_jane
-      ppxlib
-    ];
-    meta.broken = lib.versionAtLeast ppxlib.version "0.36";
-  };
+  ppx_derive_at_runtime = janePackage (
+    {
+      pname = "ppx_derive_at_runtime";
+      meta.description = "Define a new ppx deriver by naming a runtime module";
+      propagatedBuildInputs = [
+        base
+        expect_test_helpers_core
+        ppx_jane
+        ppxlib
+      ];
+    }
+    // (
+      if lib.versionAtLeast ppxlib.version "0.36" then
+        {
+          version = "0.17.1";
+          hash = "sha256-bbUV2t8MhqDCHDJp7fqJTnRrfZdYO8DLnygqQF0+ouY=";
+        }
+      else
+        {
+          version = "0.17.0";
+          hash = "sha256-Y/z4BKFRt3z1lUGdc7SznIv/ys//dZHoPSnsouj1GtI=";
+        }
+    )
+  );
 
   ppx_diff = janePackage (
     {

From 4b255a27d300e766e07a853a421b08ce537acf24 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 20 Oct 2025 02:15:09 +0200
Subject: [PATCH 0985/6226] =?UTF-8?q?ocamlPackages.ppx=5Fjsonaf=5Fconv:=20?=
 =?UTF-8?q?0.17.0=20=E2=86=92=200.17.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/janestreet/0.17.nix         | 36 ++++++++++++-------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix
index 6e0f48a1d9d1..8613ef5b780e 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.17.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix
@@ -1437,18 +1437,30 @@ with self;
     ];
   };
 
-  ppx_jsonaf_conv = janePackage {
-    pname = "ppx_jsonaf_conv";
-    hash = "sha256-v7CYOJ1g4LkqIv5De5tQjjkBWXqKHbvqfSr0X5jBUuM=";
-    meta.description = "[@@deriving] plugin to generate Jsonaf conversion functions";
-    propagatedBuildInputs = [
-      base
-      jsonaf
-      ppx_jane
-      ppxlib
-    ];
-    meta.broken = lib.versionAtLeast ppxlib.version "0.36";
-  };
+  ppx_jsonaf_conv = janePackage (
+    {
+      pname = "ppx_jsonaf_conv";
+      meta.description = "[@@deriving] plugin to generate Jsonaf conversion functions";
+      propagatedBuildInputs = [
+        base
+        jsonaf
+        ppx_jane
+        ppxlib
+      ];
+    }
+    // (
+      if lib.versionAtLeast ppxlib.version "0.36" then
+        {
+          version = "0.17.1";
+          hash = "sha256-BnkYY+Td9zV++PuPs/gm5U58rCZjew1OJQ2k8KE+dfA=";
+        }
+      else
+        {
+          version = "0.17.0";
+          hash = "sha256-v7CYOJ1g4LkqIv5De5tQjjkBWXqKHbvqfSr0X5jBUuM=";
+        }
+    )
+  );
 
   ppx_js_style = janePackage (
     {

From 1e1c10488f5987c8b02677f3bbc8c0419b186e0f Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 20 Oct 2025 02:15:11 +0200
Subject: [PATCH 0986/6226] =?UTF-8?q?ocamlPackages.ppx=5Fpattern=5Fbind:?=
 =?UTF-8?q?=200.17.0=20=E2=86=92=200.17.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/janestreet/0.17.nix         | 26 ++++++++++++++-----
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix
index 8613ef5b780e..f5789a5209a7 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.17.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix
@@ -1567,13 +1567,25 @@ with self;
     ];
   };
 
-  ppx_pattern_bind = janePackage {
-    pname = "ppx_pattern_bind";
-    hash = "sha256-IVDvFU9ERB2YFJOgP/glYcO4KhEH5VdQ7wCCfreboqA=";
-    meta.description = "PPX for writing fast incremental bind nodes in a pattern match";
-    propagatedBuildInputs = [ ppx_let ];
-    meta.broken = lib.versionAtLeast ppxlib.version "0.36";
-  };
+  ppx_pattern_bind = janePackage (
+    {
+      pname = "ppx_pattern_bind";
+      meta.description = "PPX for writing fast incremental bind nodes in a pattern match";
+      propagatedBuildInputs = [ ppx_let ];
+    }
+    // (
+      if lib.versionAtLeast ppxlib.version "0.36" then
+        {
+          version = "0.17.1";
+          hash = "sha256-O3FtpXrFoyMI3iPL3BUwquREy+8TygOlyaTUGBUPk4Q=$";
+        }
+      else
+        {
+          version = "0.17.0";
+          hash = "sha256-IVDvFU9ERB2YFJOgP/glYcO4KhEH5VdQ7wCCfreboqA=";
+        }
+    )
+  );
 
   ppx_pipebang = janePackage {
     pname = "ppx_pipebang";

From f2c975bca02b6e751d961a9aba2abf63431096a2 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 20 Oct 2025 02:15:14 +0200
Subject: [PATCH 0987/6226] =?UTF-8?q?ocamlPackages.ppx=5Fquick=5Ftest:=200?=
 =?UTF-8?q?.17.0=20=E2=86=92=200.17.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/janestreet/0.17.nix         | 52 ++++++++++++-------
 1 file changed, 32 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix
index f5789a5209a7..23443f5553f9 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.17.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix
@@ -1606,26 +1606,38 @@ with self;
     doCheck = false; # test rules broken
   };
 
-  ppx_quick_test = janePackage {
-    pname = "ppx_quick_test";
-    hash = "sha256-Kxb0IJcosC4eYlUjEfZE9FhY8o1/gDHHLWD5Cby5hXY=";
-    meta.description = "Spiritual equivalent of let%expect_test, but for property based tests";
-    propagatedBuildInputs = [
-      async
-      async_kernel
-      base
-      base_quickcheck
-      core
-      core_kernel
-      expect_test_helpers_core
-      ppx_expect
-      ppx_here
-      ppx_jane
-      ppx_sexp_conv
-      ppx_sexp_message
-    ];
-    meta.broken = lib.versionAtLeast ppxlib.version "0.36";
-  };
+  ppx_quick_test = janePackage (
+    {
+      pname = "ppx_quick_test";
+      meta.description = "Spiritual equivalent of let%expect_test, but for property based tests";
+      propagatedBuildInputs = [
+        async
+        async_kernel
+        base
+        base_quickcheck
+        core
+        core_kernel
+        expect_test_helpers_core
+        ppx_expect
+        ppx_here
+        ppx_jane
+        ppx_sexp_conv
+        ppx_sexp_message
+      ];
+    }
+    // (
+      if lib.versionAtLeast ppxlib.version "0.36" then
+        {
+          version = "0.17.1";
+          hash = "sha256-nSgi0MAmOWhk53x6U5Wmv/5zTxBiErWQqoT6ATBOv3w=";
+        }
+      else
+        {
+          version = "0.17.0";
+          hash = "sha256-Kxb0IJcosC4eYlUjEfZE9FhY8o1/gDHHLWD5Cby5hXY=";
+        }
+    )
+  );
 
   ppx_sexp_conv = janePackage (
     {

From 80e35e85394cb6dab6cb6ee964e3567b107ddbf7 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 20 Oct 2025 02:15:17 +0200
Subject: [PATCH 0988/6226] =?UTF-8?q?ocamlPackages.ppx=5Ftyped=5Ffields:?=
 =?UTF-8?q?=200.17.0=20=E2=86=92=200.17.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/janestreet/0.17.nix         | 34 +++++++++++++------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix
index 23443f5553f9..0b3514ea3486 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.17.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix
@@ -1759,17 +1759,29 @@ with self;
     )
   );
 
-  ppx_typed_fields = janePackage {
-    pname = "ppx_typed_fields";
-    hash = "sha256-aTPEBBc1zniZkEmzubGkU064bwGnefBOjVDqTdPm2w8=";
-    meta.description = "GADT-based field accessors and utilities";
-    propagatedBuildInputs = [
-      core
-      ppx_jane
-      ppxlib
-    ];
-    meta.broken = lib.versionAtLeast ppxlib.version "0.36";
-  };
+  ppx_typed_fields = janePackage (
+    {
+      pname = "ppx_typed_fields";
+      meta.description = "GADT-based field accessors and utilities";
+      propagatedBuildInputs = [
+        core
+        ppx_jane
+        ppxlib
+      ];
+    }
+    // (
+      if lib.versionAtLeast ppxlib.version "0.36" then
+        {
+          version = "0.17.1";
+          hash = "sha256-M+UhZst98gRg6pVg828UZn8AEFK2a/KAzGkuUkWoBaI=";
+        }
+      else
+        {
+          version = "0.17.0";
+          hash = "sha256-aTPEBBc1zniZkEmzubGkU064bwGnefBOjVDqTdPm2w8=";
+        }
+    )
+  );
 
   ppx_typerep_conv = janePackage (
     {

From e1d816b18a12d4efbf7b0f8d0efc8f9d6d7e9f53 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 20 Oct 2025 02:15:20 +0200
Subject: [PATCH 0989/6226] =?UTF-8?q?ocamlPackages.streamable:=200.17.0=20?=
 =?UTF-8?q?=E2=86=92=200.17.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/janestreet/0.17.nix         | 42 ++++++++++++-------
 1 file changed, 27 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/ocaml-modules/janestreet/0.17.nix b/pkgs/development/ocaml-modules/janestreet/0.17.nix
index 0b3514ea3486..43db542b5a1f 100644
--- a/pkgs/development/ocaml-modules/janestreet/0.17.nix
+++ b/pkgs/development/ocaml-modules/janestreet/0.17.nix
@@ -2100,21 +2100,33 @@ with self;
     ];
   };
 
-  streamable = janePackage {
-    pname = "streamable";
-    hash = "sha256-FtrAX4nsacCO5HTVxwLgwwT8R2sASJ05qu4gT2ZVSDg=";
-    meta.description = "Collection of types suitable for incremental serialization";
-    propagatedBuildInputs = [
-      async_kernel
-      async_rpc_kernel
-      base
-      core
-      core_kernel
-      ppx_jane
-      ppxlib
-    ];
-    meta.broken = lib.versionAtLeast ppxlib.version "0.36";
-  };
+  streamable = janePackage (
+    {
+      pname = "streamable";
+      meta.description = "Collection of types suitable for incremental serialization";
+      propagatedBuildInputs = [
+        async_kernel
+        async_rpc_kernel
+        base
+        core
+        core_kernel
+        ppx_jane
+        ppxlib
+      ];
+    }
+    // (
+      if lib.versionAtLeast ppxlib.version "0.36" then
+        {
+          version = "0.17.1";
+          hash = "sha256-3d7tByQCOfA44wSBKbHXDvyomenWVaEDMHujlK++n8Y=";
+        }
+      else
+        {
+          version = "0.17.0";
+          hash = "sha256-FtrAX4nsacCO5HTVxwLgwwT8R2sASJ05qu4gT2ZVSDg=";
+        }
+    )
+  );
 
   textutils = janePackage {
     pname = "textutils";

From 43f03d0f95370a6ed99946c1640d693578802d68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 19 Oct 2025 17:16:38 -0700
Subject: [PATCH 0990/6226] python3Packages.python-bsblan: don't depend on
 async-timeout

---
 pkgs/development/python-modules/python-bsblan/default.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix
index 4e654bbbc2c4..754df9394172 100644
--- a/pkgs/development/python-modules/python-bsblan/default.nix
+++ b/pkgs/development/python-modules/python-bsblan/default.nix
@@ -14,7 +14,6 @@
   pytest-cov-stub,
   pytest-mock,
   pytestCheckHook,
-  pythonOlder,
   yarl,
 }:
 
@@ -23,8 +22,6 @@ buildPythonPackage rec {
   version = "2.2.5";
   pyproject = true;
 
-  disabled = pythonOlder "3.12";
-
   src = fetchFromGitHub {
     owner = "liudger";
     repo = "python-bsblan";
@@ -32,10 +29,6 @@ buildPythonPackage rec {
     hash = "sha256-kPkKgjze3ohaIaDax3h66JWw5tY+3S0N+lPqXSFFcRY=";
   };
 
-  postPatch = ''
-    sed -i "/ruff/d" pyproject.toml
-  '';
-
   env.PACKAGE_VERSION = version;
 
   build-system = [ hatchling ];
@@ -44,7 +37,6 @@ buildPythonPackage rec {
 
   dependencies = [
     aiohttp
-    async-timeout
     backoff
     mashumaro
     orjson

From fc11c525369f5c4c23d00ad18613b3f7a6f32d1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 19 Oct 2025 17:21:07 -0700
Subject: [PATCH 0991/6226] python3Packages.python-bsblan: fix version metadata

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

diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix
index 754df9394172..572447f69c36 100644
--- a/pkgs/development/python-modules/python-bsblan/default.nix
+++ b/pkgs/development/python-modules/python-bsblan/default.nix
@@ -29,7 +29,10 @@ buildPythonPackage rec {
     hash = "sha256-kPkKgjze3ohaIaDax3h66JWw5tY+3S0N+lPqXSFFcRY=";
   };
 
-  env.PACKAGE_VERSION = version;
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'version = "0.0.0"' 'version = "${version}"'
+  '';
 
   build-system = [ hatchling ];
 

From bd549e426e4f80d63a0dd93efcd35285d42e3ac6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 00:22:50 +0000
Subject: [PATCH 0992/6226] asm-lsp: 0.10.0 -> 0.10.1

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

diff --git a/pkgs/by-name/as/asm-lsp/package.nix b/pkgs/by-name/as/asm-lsp/package.nix
index 20e3a2019d04..226d4ddf51eb 100644
--- a/pkgs/by-name/as/asm-lsp/package.nix
+++ b/pkgs/by-name/as/asm-lsp/package.nix
@@ -8,7 +8,7 @@
 }:
 let
   pname = "asm-lsp";
-  version = "0.10.0";
+  version = "0.10.1";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -17,14 +17,14 @@ rustPlatform.buildRustPackage {
     owner = "bergercookie";
     repo = "asm-lsp";
     rev = "v${version}";
-    hash = "sha256-RAyiE+Msmr/Qt5v7rWuUTAji383XLKxeMQJove2b1NE=";
+    hash = "sha256-vEilIoIK6fxZBhmyDueP2zvbh1/t2wd4cnq/0y6p+TI=";
   };
 
   nativeBuildInputs = [ pkg-config ];
 
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ];
 
-  cargoHash = "sha256-41iWqgywfFdqf3TzZT5peh39jiSZw8FRTI1AeL5CroY=";
+  cargoHash = "sha256-D91n+sx8qwkn/rEWP5ftS/mhmRru43TmKZUyvAc47H0=";
 
   # tests expect ~/.cache/asm-lsp to be writable
   preCheck = ''

From d0c13bcaa12722af2cf90046f09ab2fca2cda675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 19 Oct 2025 17:37:18 -0700
Subject: [PATCH 0993/6226] python3Packages.grpclib: replace async-timeout with
 asyncio.timeout

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

diff --git a/pkgs/development/python-modules/grpclib/default.nix b/pkgs/development/python-modules/grpclib/default.nix
index e1c167319a32..e4964bee1541 100644
--- a/pkgs/development/python-modules/grpclib/default.nix
+++ b/pkgs/development/python-modules/grpclib/default.nix
@@ -1,10 +1,10 @@
 {
   lib,
-  async-timeout,
   buildPythonPackage,
   certifi,
   faker,
   fetchFromGitHub,
+  fetchpatch,
   googleapis-common-protos,
   h2,
   multidict,
@@ -28,6 +28,15 @@ buildPythonPackage rec {
     hash = "sha256-Z+DMwGMUxNTQ7ABd4q/FgMHEZ/NCOtst+6QfQJm3jVU=";
   };
 
+  patches = [
+    # https://github.com/vmagamedov/grpclib/pull/209
+    (fetchpatch {
+      name = "replace-async-timeout-with-asyncio-timeout-patch";
+      url = "https://github.com/vmagamedov/grpclib/commit/36b23ce3ca3f1742e39b50f939d13cd08b4f28ac.patch";
+      hash = "sha256-3ztLBOFpTK8CFIp8a6suhWXY5kIBCBRWBX/oAyYU4yI=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [
@@ -38,7 +47,6 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     pytest-asyncio_0
-    async-timeout
     faker
     googleapis-common-protos
     certifi

From 89f16e1ef36b7c13dcb58e888980d41608af0c39 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 19 Oct 2025 21:40:52 -0300
Subject: [PATCH 0994/6226] xygrib: fix build with cmake4

---
 pkgs/applications/misc/xygrib/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix
index a721ebfa285f..fa6eabd52df1 100644
--- a/pkgs/applications/misc/xygrib/default.nix
+++ b/pkgs/applications/misc/xygrib/default.nix
@@ -42,6 +42,11 @@ stdenv.mkDerivation {
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DLIBNOVA_LIBRARY=${libnova}/lib/libnova.dylib" ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.1.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall =
     if stdenv.hostPlatform.isDarwin then
       ''

From f756d8f6d7d46b8ae95249acd7c398f0f67418d5 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 19 Oct 2025 20:05:22 +0200
Subject: [PATCH 0995/6226] ChowKick: fix build with cmake 4

---
 pkgs/by-name/ch/chow-kick/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix
index a5fc34ebfda2..cbb4ecce74be 100644
--- a/pkgs/by-name/ch/chow-kick/package.nix
+++ b/pkgs/by-name/ch/chow-kick/package.nix
@@ -88,6 +88,12 @@ stdenv.mkDerivation (finalAttrs: {
     "-DCMAKE_RANLIB=${stdenv.cc.cc}/bin/gcc-ranlib"
   ];
 
+  postPatch = ''
+    substituteInPlace modules/chowdsp_wdf/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 3.1)' \
+      'cmake_minimum_required(VERSION 4.0)'
+  '';
+
   installPhase = ''
     mkdir -p $out/lib/lv2 $out/lib/vst3 $out/bin
     cp -r ChowKick_artefacts/Release/LV2/ChowKick.lv2 $out/lib/lv2

From 76564c7e631a36136e0b7822acc41f8fa47b6120 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 19 Oct 2025 19:40:34 +0200
Subject: [PATCH 0996/6226] chow-tape-model: fix build with cmake 4

---
 pkgs/by-name/ch/chow-tape-model/package.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix
index b3a80202c92c..02d631076bb6 100644
--- a/pkgs/by-name/ch/chow-tape-model/package.nix
+++ b/pkgs/by-name/ch/chow-tape-model/package.nix
@@ -97,7 +97,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeBuildType = "Release";
 
-  postPatch = "cd Plugin";
+  postPatch = ''
+    cd Plugin
+    substituteInPlace modules/RTNeural/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 3.1)' \
+      'cmake_minimum_required(VERSION 4.0)'
+  '';
 
   installPhase = ''
     mkdir -p $out/lib/lv2 $out/lib/vst3 $out/lib/clap $out/bin $out/share/doc/CHOWTapeModel/

From a0a29aaac4ffaba555ddc7f13ff15dbc56372213 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 19 Oct 2025 22:08:55 -0300
Subject: [PATCH 0997/6226] xsuspender: fix build with cmake4

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

diff --git a/pkgs/by-name/xs/xsuspender/package.nix b/pkgs/by-name/xs/xsuspender/package.nix
index 2d4c230ee712..3084617a5522 100644
--- a/pkgs/by-name/xs/xsuspender/package.nix
+++ b/pkgs/by-name/xs/xsuspender/package.nix
@@ -37,6 +37,11 @@ stdenv.mkDerivation rec {
     libwnck
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = ''
     wrapProgram $out/bin/xsuspender \
       --prefix PATH : "${lib.makeBinPath [ procps ]}"

From c087d089cdefca28a7bd1c407381ee5b0aada3e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 02:31:17 +0000
Subject: [PATCH 0998/6226] repomix: 1.6.0 -> 1.8.0

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

diff --git a/pkgs/by-name/re/repomix/package.nix b/pkgs/by-name/re/repomix/package.nix
index 01c090029ea1..4146d536b211 100644
--- a/pkgs/by-name/re/repomix/package.nix
+++ b/pkgs/by-name/re/repomix/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "repomix";
-  version = "1.6.0";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "yamadashy";
     repo = "repomix";
     tag = "v${version}";
-    hash = "sha256-177G2IhGZ1pQwxtJ2gozG0vEGEkcBmtOR6AbYxs4N+M=";
+    hash = "sha256-o7C6Y9GDeodKViuo6gd5GbYH1isgLDoiyqmMvyo8rUM=";
   };
 
-  npmDepsHash = "sha256-KzOjpWRpvQ9P2vajhHdAVlKdoYAvw0vncmVyh24v0g0=";
+  npmDepsHash = "sha256-S9s1SeqW9vcpz9XTLRjYH9ChNngg9h3HkWz8Nmxaygs=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

From 66da7d06eed11e4e986fbb3c30f206189b95dff8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 02:42:11 +0000
Subject: [PATCH 0999/6226] maestro: 2.0.3 -> 2.0.6

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

diff --git a/pkgs/by-name/ma/maestro/package.nix b/pkgs/by-name/ma/maestro/package.nix
index 75df27fe80be..2a3c004b978f 100644
--- a/pkgs/by-name/ma/maestro/package.nix
+++ b/pkgs/by-name/ma/maestro/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "maestro";
-  version = "2.0.3";
+  version = "2.0.6";
 
   src = fetchurl {
     url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${finalAttrs.version}/maestro.zip";
-    hash = "sha256-J15cSuxSVOyPLEPPVAbL35/JTbBRlb8+1bA9QE3eNeQ=";
+    hash = "sha256-v7AzQzYmhvqBdAK5wXd0tIe18y/BVeJP3Jp1eqfBmcE=";
   };
 
   dontUnpack = true;

From 2f6877f8ea8d9a81978ec5509f234adb00995204 Mon Sep 17 00:00:00 2001
From: Alexis Williams <alexis@typedr.at>
Date: Wed, 3 Sep 2025 18:58:59 -0700
Subject: [PATCH 1000/6226] prometheus-qbittorrent-exporter: init at 1.12.1

---
 .../package.nix                               | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 pkgs/by-name/pr/prometheus-qbittorrent-exporter/package.nix

diff --git a/pkgs/by-name/pr/prometheus-qbittorrent-exporter/package.nix b/pkgs/by-name/pr/prometheus-qbittorrent-exporter/package.nix
new file mode 100644
index 000000000000..f3ddde0e40e4
--- /dev/null
+++ b/pkgs/by-name/pr/prometheus-qbittorrent-exporter/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildGoModule,
+  nix-update-script,
+}:
+buildGoModule (finalAttrs: {
+  pname = "prometheus-qbittorrent-exporter";
+  version = "1.12.1";
+
+  src = fetchFromGitHub {
+    owner = "martabal";
+    repo = "qbittorrent-exporter";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-9J4nGG52M7SSeXigLBJK/dqXRvSpPqOGRJ8BQx7+1eU=";
+  };
+  sourceRoot = "${finalAttrs.src.name}/src";
+
+  vendorHash = "sha256-jJmhRnjioeTq9Uol0lYLChPi4O1D9JnGqN7q1XK36yE=";
+
+  ldflags = [
+    "-s"
+    "-X 'qbit-exp/app.version=v${finalAttrs.version}'"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Prometheus exporter for qBittorrent";
+    homepage = "https://github.com/martabal/qbittorrent-exporter";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [
+      typedrat
+      undefined-landmark
+    ];
+    mainProgram = "qbit-exp";
+  };
+})

From bfa8487e98c4f70ed354f3c914d0544594ece905 Mon Sep 17 00:00:00 2001
From: Ethan Carter Edwards <ethan@ethancedwards.com>
Date: Sun, 19 Oct 2025 23:05:44 -0400
Subject: [PATCH 1001/6226] localproxy: fix build with cmake 4

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

diff --git a/pkgs/by-name/lo/localproxy/package.nix b/pkgs/by-name/lo/localproxy/package.nix
index 2a46d8501291..94aac1acb208 100644
--- a/pkgs/by-name/lo/localproxy/package.nix
+++ b/pkgs/by-name/lo/localproxy/package.nix
@@ -51,6 +51,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     sed -i '/set(OPENSSL_USE_STATIC_LIBS TRUE)/d' CMakeLists.txt
+    substituteInPlace ./CMakeLists.txt --replace-fail \
+      "cmake_minimum_required(VERSION 3.2 FATAL_ERROR)" \
+      "cmake_minimum_required(VERSION 4.0)"
   '';
 
   # causes redefinition of _FORTIFY_SOURCE

From 253afe61e73af858367b53d60d7ecc0ffdf8f28f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 03:17:03 +0000
Subject: [PATCH 1002/6226] cljfmt: 0.13.4 -> 0.14.0

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

diff --git a/pkgs/by-name/cl/cljfmt/package.nix b/pkgs/by-name/cl/cljfmt/package.nix
index a1cbf19d55bc..0cf64938e770 100644
--- a/pkgs/by-name/cl/cljfmt/package.nix
+++ b/pkgs/by-name/cl/cljfmt/package.nix
@@ -8,11 +8,11 @@
 
 buildGraalvmNativeImage (finalAttrs: {
   pname = "cljfmt";
-  version = "0.13.4";
+  version = "0.14.0";
 
   src = fetchurl {
     url = "https://github.com/weavejester/cljfmt/releases/download/${finalAttrs.version}/cljfmt-${finalAttrs.version}-standalone.jar";
-    hash = "sha256-i6ZUhN7gwADw0tZFPOjiGpC/po8us5QSAJAW7n3LgIU=";
+    hash = "sha256-A12co+7Ux9rGCcBMRMqwTH7s4hllfs0Ku/+HFQJ4XGE=";
   };
 
   extraNativeImageBuildArgs = [

From 490b6fc73c12b56beccf4d227abafc8d51709538 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Sun, 19 Oct 2025 13:34:03 -0400
Subject: [PATCH 1003/6226] minc_widgets: CMake 4.x compatibility

---
 pkgs/by-name/mi/minc_widgets/package.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mi/minc_widgets/package.nix b/pkgs/by-name/mi/minc_widgets/package.nix
index 535433ea41d1..7cfeb7437535 100644
--- a/pkgs/by-name/mi/minc_widgets/package.nix
+++ b/pkgs/by-name/mi/minc_widgets/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   makeWrapper,
   perlPackages,
@@ -22,6 +23,14 @@ stdenv.mkDerivation {
     sha256 = "1b9g6lf37wpp211ikaji4rf74rl9xcmrlyqcw1zq3z12ji9y33bm";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "cmake4-fix.patch";
+      url = "https://github.com/BIC-MNI/minc-widgets/commit/9f5bc1996d2f9b4702efdb010834e2c7f1e3fbf1.patch";
+      hash = "sha256-qqMKbxQS+HTRQaOP2DH/m8Z3DqoCMGLFp1AEKaQ6l5s=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     makeWrapper
@@ -50,11 +59,11 @@ stdenv.mkDerivation {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/BIC-MNI/minc-widgets";
     description = "Collection of Perl and shell scripts for processing MINC files";
-    maintainers = with maintainers; [ bcdarwin ];
-    platforms = platforms.unix;
-    license = licenses.free;
+    maintainers = with lib.maintainers; [ bcdarwin ];
+    platforms = lib.platforms.unix;
+    license = lib.licenses.free;
   };
 }

From f34440f6f200c4e240f1566a84afa0de58079a7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 03:43:35 +0000
Subject: [PATCH 1004/6226] oh-my-zsh: 2025-09-27 -> 2025-10-15

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

diff --git a/pkgs/by-name/oh/oh-my-zsh/package.nix b/pkgs/by-name/oh/oh-my-zsh/package.nix
index 0a867bf501f3..352805263d4b 100644
--- a/pkgs/by-name/oh/oh-my-zsh/package.nix
+++ b/pkgs/by-name/oh/oh-my-zsh/package.nix
@@ -19,14 +19,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2025-09-27";
+  version = "2025-10-15";
   pname = "oh-my-zsh";
 
   src = fetchFromGitHub {
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    rev = "242e2faa51675494cbfa78a81f3ff47d81039863";
-    sha256 = "sha256-xYwo5/ONf5nRgfVSnEadPUkPDaOsJhk7doqRs4zp39E=";
+    rev = "d1c04d8a33f9127d03b69617c5367db5ceebc8a7";
+    sha256 = "sha256-Nt/7UZJl+7Kw7trMByuyhjE7RnccgAzW1oNwKsIx3Jw=";
   };
 
   strictDeps = true;

From 921f8747bc33569976bca5d3858e0d1720270fa4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 19 Oct 2025 20:50:54 -0700
Subject: [PATCH 1005/6226] python3Packages.pysmhi: 1.0.2 -> 1.1.0

Diff: https://github.com/gjohansson-ST/pysmhi/compare/v1.0.2...v1.1.0

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

diff --git a/pkgs/development/python-modules/pysmhi/default.nix b/pkgs/development/python-modules/pysmhi/default.nix
index 067c290f0d3f..da449ca28eaa 100644
--- a/pkgs/development/python-modules/pysmhi/default.nix
+++ b/pkgs/development/python-modules/pysmhi/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pysmhi";
-  version = "1.0.2";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gjohansson-ST";
     repo = "pysmhi";
     tag = "v${version}";
-    hash = "sha256-9jsSvitxcjH2oFCdSm1203UwG5xjOwQDTaU4Z9Cqs+A=";
+    hash = "sha256-n2eDQ9fbELGvO/SYqdrwT+lZNIZs5GgihmrimvI3a1w=";
   };
 
   build-system = [ poetry-core ];

From e916df2d972f270b27903245030653f59d617bde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 19 Oct 2025 20:57:26 -0700
Subject: [PATCH 1006/6226] python3Packages.colorlog: 6.9.0 -> 6.10.1

Diff: https://github.com/borntyping/python-colorlog/compare/v6.9.0...v6.10.1

Changelog: https://github.com/borntyping/python-colorlog/releases/tag/v6.10.1
---
 .../python-modules/colorlog/default.nix       | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/colorlog/default.nix b/pkgs/development/python-modules/colorlog/default.nix
index ab09f5896b4a..83397f73215d 100644
--- a/pkgs/development/python-modules/colorlog/default.nix
+++ b/pkgs/development/python-modules/colorlog/default.nix
@@ -1,19 +1,21 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   setuptools,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "colorlog";
-  version = "6.9.0";
+  version = "6.10.1";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-v7pUobk7lPVOH0/kg5VyWj2S/SpK9wL2vXCUa9wMasI=";
+  src = fetchFromGitHub {
+    owner = "borntyping";
+    repo = "python-colorlog";
+    tag = "v${version}";
+    hash = "sha256-vb7OzIVcEIfnhJGpO0DgeEdhL6NCKlrynoNMxNp8Yg4=";
   };
 
   build-system = [ setuptools ];
@@ -22,10 +24,11 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/borntyping/python-colorlog/releases/tag/${src.tag}";
     description = "Log formatting with colors";
     homepage = "https://github.com/borntyping/python-colorlog";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }

From b314ecc729ed152ecbbca12c482e0cc0eab44553 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 04:23:07 +0000
Subject: [PATCH 1007/6226] flyway: 11.13.0 -> 11.14.1

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

diff --git a/pkgs/by-name/fl/flyway/package.nix b/pkgs/by-name/fl/flyway/package.nix
index 28cadddb8c98..09551a6b88fa 100644
--- a/pkgs/by-name/fl/flyway/package.nix
+++ b/pkgs/by-name/fl/flyway/package.nix
@@ -9,10 +9,10 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flyway";
-  version = "11.13.0";
+  version = "11.14.1";
   src = fetchurl {
     url = "https://github.com/flyway/flyway/releases/download/flyway-${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-yIptnNIt76qYer9AhLRZ0hhuUhx56PWXU3jjkLBz11M=";
+    sha256 = "sha256-NWxt7qOiANk847cHbs916jNaZlUZynRlrVP321MkqOs=";
   };
   nativeBuildInputs = [ makeWrapper ];
   dontBuild = true;

From 72618038521eb9a97f44261443b4f006a917fc36 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 20 Oct 2025 06:26:48 +0200
Subject: [PATCH 1008/6226] ocamlPackages.dolmen_model: init at 0.10

---
 .../ocaml-modules/dolmen/model.nix            | 25 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 ++
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/ocaml-modules/dolmen/model.nix

diff --git a/pkgs/development/ocaml-modules/dolmen/model.nix b/pkgs/development/ocaml-modules/dolmen/model.nix
new file mode 100644
index 000000000000..7c299fbc7cfb
--- /dev/null
+++ b/pkgs/development/ocaml-modules/dolmen/model.nix
@@ -0,0 +1,25 @@
+{
+  buildDunePackage,
+  dolmen,
+  dolmen_loop,
+  farith,
+  ppx_deriving,
+  zarith,
+}:
+
+buildDunePackage {
+  pname = "dolmen_model";
+  inherit (dolmen) src version;
+
+  propagatedBuildInputs = [
+    dolmen
+    dolmen_loop
+    farith
+    ppx_deriving
+    zarith
+  ];
+
+  meta = dolmen.meta // {
+    description = "Dolmen library for verifying models generated by automated theorem provers and SMT solvers";
+  };
+}
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 86e4c306066e..290ed9741029 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -424,6 +424,8 @@ let
 
         dolmen_lsp = callPackage ../development/ocaml-modules/dolmen/lsp.nix { };
 
+        dolmen_model = callPackage ../development/ocaml-modules/dolmen/model.nix { };
+
         dolmen_type = callPackage ../development/ocaml-modules/dolmen/type.nix { };
 
         dolog = callPackage ../development/ocaml-modules/dolog { };

From 79fef7e3b56b4aa2946a46f0c3b1adc81e53cf56 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 20 Oct 2025 06:26:55 +0200
Subject: [PATCH 1009/6226] =?UTF-8?q?ocamlPackages.smtml:=200.10.0=20?=
 =?UTF-8?q?=E2=86=92=200.12.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/smtml/default.nix           | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/ocaml-modules/smtml/default.nix b/pkgs/development/ocaml-modules/smtml/default.nix
index 2ec614fbb543..d8426a8fc52b 100644
--- a/pkgs/development/ocaml-modules/smtml/default.nix
+++ b/pkgs/development/ocaml-modules/smtml/default.nix
@@ -7,10 +7,12 @@
   menhir,
   bos,
   cmdliner,
+  dolmen_model,
   dolmen_type,
   fpath,
   hc,
   menhirLib,
+  mtime,
   # fix eval on legacy ocaml versions
   ocaml_intrinsics ? null,
   patricia-tree,
@@ -23,15 +25,15 @@
   ounit2,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "smtml";
-  version = "0.10.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "formalsec";
     repo = "smtml";
-    tag = "v${version}";
-    hash = "sha256-WXGYk/zJnW6QzHKCHl0lkmYb/pG90/sAOK40wYzK35U=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-WETSvhy5OfztOTqJimym0OaZLo053nl8pcoQlyyP8I0=";
   };
 
   nativeBuildInputs = [
@@ -41,10 +43,12 @@ buildDunePackage rec {
   propagatedBuildInputs = [
     bos
     cmdliner
+    dolmen_model
     dolmen_type
     fpath
     hc
     menhirLib
+    mtime
     ocaml_intrinsics
     patricia-tree
     prelude
@@ -63,14 +67,19 @@ buildDunePackage rec {
     mdx.bin
   ];
 
-  doCheck = !(lib.versions.majorMinor ocaml.version == "5.0" || stdenv.hostPlatform.isDarwin);
+  doCheck =
+    !(
+      lib.versions.majorMinor ocaml.version == "5.0"
+      || lib.versions.majorMinor ocaml.version == "5.4"
+      || stdenv.hostPlatform.isDarwin
+    );
 
   meta = {
     description = "SMT solver frontend for OCaml";
     homepage = "https://formalsec.github.io/smtml/smtml/";
     downloadPage = "https://github.com/formalsec/smtml";
-    changelog = "https://github.com/formalsec/smtml/releases/tag/v${version}";
+    changelog = "https://github.com/formalsec/smtml/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.ethancedwards8 ];
   };
-}
+})

From 68f2d23b9a47ad03c7ded184e1cedf6353be1903 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sun, 19 Oct 2025 18:45:14 +0530
Subject: [PATCH 1010/6226] scx.cscheds: switch to make packaging

Upstream deprecated meson builds.

This also switches libbpf and bpftool dependencies to nixpkgs provided ones.
Please report if this causes any issues.
---
 pkgs/os-specific/linux/scx/scx_cscheds.nix    | 82 ++-----------------
 pkgs/os-specific/linux/scx/scx_full.nix       |  2 +-
 pkgs/os-specific/linux/scx/scx_rustscheds.nix |  1 -
 pkgs/os-specific/linux/scx/update.sh          | 20 +----
 pkgs/os-specific/linux/scx/version.json       |  8 --
 5 files changed, 10 insertions(+), 103 deletions(-)

diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix
index a487493bad5b..8b59bcb9aab5 100644
--- a/pkgs/os-specific/linux/scx/scx_cscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix
@@ -1,19 +1,12 @@
 {
-  lib,
   llvmPackages,
-  fetchFromGitHub,
-  writeShellScript,
-  bash,
-  meson,
-  ninja,
-  jq,
+  libbpf,
   pkg-config,
   bpftools,
   elfutils,
   zlib,
   zstd,
   scx-common,
-  protobuf,
   libseccomp,
 }:
 
@@ -21,56 +14,17 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "scx_cscheds";
   inherit (scx-common) version src;
 
-  # scx needs specific commits of bpftool and libbpf
-  # can be found in meson.build of scx src
-  # grep 'bpftool_commit =' ./meson.build
-  bpftools_src = fetchFromGitHub {
-    owner = "libbpf";
-    repo = "bpftool";
-    inherit (scx-common.versionInfo.bpftool) rev hash;
-    fetchSubmodules = true;
-  };
-  # grep 'libbpf_commit = ' ./meson.build
-  libbpf_src = fetchFromGitHub {
-    owner = "libbpf";
-    repo = "libbpf";
-    inherit (scx-common.versionInfo.libbpf) rev hash;
-    fetchSubmodules = true;
-  };
-
-  # this imitates the fetch_bpftool and fetch_libbpf script in src/meson-scripts
-  fetchBpftool = writeShellScript "fetch_bpftool" ''
-    [ "$2" == '${finalAttrs.bpftools_src.rev}' ] || exit 1
-    cd "$1"
-    cp --no-preserve=mode,owner -r "${finalAttrs.bpftools_src}/" ./bpftool
-  '';
-  fetchLibbpf = writeShellScript "fetch_libbpf" ''
-    [ "$2" == '${finalAttrs.libbpf_src.rev}' ] || exit 1
-    cd "$1"
-    cp --no-preserve=mode,owner -r "${finalAttrs.libbpf_src}/" ./libbpf
-    mkdir -p ./libbpf/src/usr/include
-  '';
-
   postPatch = ''
-    rm meson-scripts/fetch_bpftool meson-scripts/fetch_libbpf
-    patchShebangs ./meson-scripts
-    cp ${finalAttrs.fetchBpftool} meson-scripts/fetch_bpftool
-    cp ${finalAttrs.fetchLibbpf} meson-scripts/fetch_libbpf
-    substituteInPlace ./meson-scripts/build_bpftool \
-      --replace-fail '/bin/bash' '${lib.getExe bash}'
+    substituteInPlace ./scheds/c/Makefile \
+      --replace-fail '/usr/local' '${placeholder "out"}'
   '';
 
   nativeBuildInputs = [
-    meson
-    ninja
-    jq
     pkg-config
     zstd
-    protobuf
-    llvmPackages.libllvm
-  ]
-  ++ bpftools.buildInputs
-  ++ bpftools.nativeBuildInputs;
+    bpftools
+    libbpf
+  ];
 
   buildInputs = [
     elfutils
@@ -78,34 +32,14 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     libseccomp
   ];
 
-  mesonFlags = [
-    (lib.mapAttrsToList lib.mesonEnable {
-      # systemd unit is implemented in the nixos module
-      # upstream systemd files are a hassle to patch
-      "systemd" = false;
-      # not for nix
-      "openrc" = false;
-    })
-    (lib.mapAttrsToList lib.mesonBool {
-      # needed libs are already fetched as FOD
-      "offline" = true;
-      # rust based schedulers are built separately
-      "enable_rust" = false;
-    })
-    # Clang to use when compiling .bpf.c
-    (lib.mesonOption "bpf_clang" (lib.getExe llvmPackages.clang))
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
   ];
 
   hardeningDisable = [
-    "stackprotector"
     "zerocallusedregs"
   ];
 
-  outputs = [
-    "bin"
-    "out"
-  ];
-
   doCheck = true;
 
   meta = scx-common.meta // {
diff --git a/pkgs/os-specific/linux/scx/scx_full.nix b/pkgs/os-specific/linux/scx/scx_full.nix
index f47e92e8b96e..c7a2a86e5329 100644
--- a/pkgs/os-specific/linux/scx/scx_full.nix
+++ b/pkgs/os-specific/linux/scx/scx_full.nix
@@ -8,7 +8,7 @@
 scx.cscheds.overrideAttrs (oldAttrs: {
   pname = "scx_full";
   postInstall = (oldAttrs.postInstall or "") + ''
-    cp ${scx.rustscheds}/bin/* ${placeholder "bin"}/bin/
+    cp ${lib.getBin scx.rustscheds}/bin/* ${placeholder "out"}/bin/
   '';
 
   passthru.tests.basic = nixosTests.scx;
diff --git a/pkgs/os-specific/linux/scx/scx_rustscheds.nix b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
index c43bfee59861..3aca28e3812f 100644
--- a/pkgs/os-specific/linux/scx/scx_rustscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
@@ -39,7 +39,6 @@ rustPlatform.buildRustPackage {
   };
 
   hardeningDisable = [
-    "stackprotector"
     "zerocallusedregs"
   ];
 
diff --git a/pkgs/os-specific/linux/scx/update.sh b/pkgs/os-specific/linux/scx/update.sh
index dd516aebaefd..f76c4c4fa78f 100755
--- a/pkgs/os-specific/linux/scx/update.sh
+++ b/pkgs/os-specific/linux/scx/update.sh
@@ -18,32 +18,14 @@ fi
 
 latestHash=$(nix-prefetch-git https://github.com/sched-ext/scx.git --rev refs/tags/v$latestVer --quiet | jq -r .hash)
 
-tmp=$(mktemp -d)
-trap 'rm -rf -- "${tmp}"' EXIT
-
-git clone --depth 1 --branch "v$latestVer" https://github.com/sched-ext/scx.git "$tmp/scx"
-
-pushd "$tmp/scx"
-
-bpftoolRev=$(grep 'bpftool_commit =' ./meson.build | awk -F"'" '{print $2}')
-bpftoolHash=$(nix-prefetch-git https://github.com/libbpf/bpftool.git --rev $bpftoolRev --fetch-submodules --quiet | jq -r .hash)
-
-libbpfRev=$(grep 'libbpf_commit =' ./meson.build | awk -F"'" '{print $2}')
-libbpfHash=$(nix-prefetch-git https://github.com/libbpf/libbpf.git --rev $libbpfRev --fetch-submodules --quiet | jq -r .hash)
-
 jq \
   --arg latestVer "$latestVer" --arg latestHash "$latestHash" \
-  --arg bpftoolRev "$bpftoolRev" --arg bpftoolHash "$bpftoolHash" \
-  --arg libbpfRev "$libbpfRev" --arg libbpfHash "$libbpfHash" \
-  ".scx.version = \$latestVer | .scx.hash = \$latestHash |\
-  .bpftool.rev = \$bpftoolRev | .bpftool.hash = \$bpftoolHash |\
-  .libbpf.rev = \$libbpfRev | .libbpf.hash = \$libbpfHash" \
+  ".scx.version = \$latestVer | .scx.hash = \$latestHash" \
   "$versionJson" | sponge $versionJson
 
 echo "scx: $localVer -> $latestVer"
 
 echo "Updating cargoHash. This may take a while..."
-popd
 cargoHash=$((nix-build --attr scx.rustscheds 2>&1 || true) | awk '/got/{print $2}')
 
 if [ -z "$cargoHash" ]; then
diff --git a/pkgs/os-specific/linux/scx/version.json b/pkgs/os-specific/linux/scx/version.json
index f655beec2bb9..f9334629755c 100644
--- a/pkgs/os-specific/linux/scx/version.json
+++ b/pkgs/os-specific/linux/scx/version.json
@@ -3,13 +3,5 @@
     "version": "1.0.17",
     "hash": "sha256-UhFHT8cSrdjhSqjj4qFzn5UvfPOLPwrBh1ytL2gFhzU=",
     "cargoHash": "sha256-yQM2zx1IzGjegwLK4epsluWl8m5RSP3jB00Lpd8+TLE="
-  },
-  "bpftool": {
-    "rev": "183e7010387d1fc9f08051426e9a9fbd5f8d409e",
-    "hash": "sha256-ZZly6csVWOmtLmld1fhSDUqyRgZx2gSMGXTaSASGv7c="
-  },
-  "libbpf": {
-    "rev": "b4fa3e39a77fd65574fb5f899486795fc3d89bd9",
-    "hash": "sha256-wlymVgcLlGCUOC92CkYU6QZZnqx8nidSfhr1pTiS8aM="
   }
 }

From ae3862e0620329ebbdf2d5ae8b3a237d573e8e92 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Tue, 14 Oct 2025 23:13:11 -0700
Subject: [PATCH 1011/6226] nano-wallet: 25.1 -> 28.2

---
 .../blockchains/nano-wallet/default.nix         | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/blockchains/nano-wallet/default.nix b/pkgs/applications/blockchains/nano-wallet/default.nix
index f0080a1150da..4e986699d220 100644
--- a/pkgs/applications/blockchains/nano-wallet/default.nix
+++ b/pkgs/applications/blockchains/nano-wallet/default.nix
@@ -15,24 +15,23 @@
 stdenv.mkDerivation rec {
 
   pname = "nano-wallet";
-  version = "25.1";
+  version = "28.2";
 
   src = fetchFromGitHub {
     owner = "nanocurrency";
     repo = "nano-node";
-    rev = "V${version}";
+    tag = "V${version}";
     fetchSubmodules = true;
-    hash = "sha256-YvYEXHC8kxviZLQwINs+pS61wITSfqfrrPmlR+zNRoE=";
+    hash = "sha256-Wo1Gd6dOnCoPiGmuJQhZmKKSg7LrKpfdvLNNKBYTUWI=";
   };
 
+  env.NIX_CFLAGS_COMPILE = "-Wno-error";
+
   patches = [
-    # Fix gcc-13 build failure due to missing <cstdint> includes.
+    # fix issue with <algorithm> include
     (fetchpatch {
-      name = "gcc-13.patch";
-      url = "https://github.com/facebook/rocksdb/commit/88edfbfb5e1cac228f7cc31fbec24bb637fe54b1.patch";
-      stripLen = 1;
-      extraPrefix = "submodules/rocksdb/";
-      hash = "sha256-HhlIYyPzIZFuyzHTUPz3bXgXiaFSQ8pVrLLMzegjTgE=";
+      url = "https://github.com/nanocurrency/nano-node/commit/1835a04dbbd1f6970649d7f72c454831432dd01f.patch";
+      hash = "sha256-IpC4yaIbJzQWYIC0QGXYQ345g6JnD2+xZG30qAQ1ubo=";
     })
   ];
 

From c340d451df28b68ef0bb036d1e686fe017456755 Mon Sep 17 00:00:00 2001
From: PhiliPdB <phlpdbrn@gmail.com>
Date: Mon, 20 Oct 2025 07:59:47 +0200
Subject: [PATCH 1012/6226] digikam: 8.7.0 -> 8.8.0

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

diff --git a/pkgs/by-name/di/digikam/package.nix b/pkgs/by-name/di/digikam/package.nix
index d322d8b807bf..122288e15f51 100644
--- a/pkgs/by-name/di/digikam/package.nix
+++ b/pkgs/by-name/di/digikam/package.nix
@@ -62,14 +62,14 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "digikam";
-  version = "8.7.0";
+  version = "8.8.0";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "graphics";
     repo = "digikam";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9t6tXrege3A5x5caUEfho23Pin7dON+e6x94rXC8XYE=";
+    hash = "sha256-yUrB0FXUcm+6QtlB7HMqdPpdhrV2iAo1oRkjgsHJiCU=";
   };
 
   patches = [

From b2ae47cd19c814e24b6427fd7de128c9da1cdec4 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Mon, 20 Oct 2025 14:33:20 +0800
Subject: [PATCH 1013/6226] quiet: 6.0.0 -> 6.3.0

---
 pkgs/by-name/qu/quiet/package.nix | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/qu/quiet/package.nix b/pkgs/by-name/qu/quiet/package.nix
index 44e661d7c1c9..ecf3371104b7 100644
--- a/pkgs/by-name/qu/quiet/package.nix
+++ b/pkgs/by-name/qu/quiet/package.nix
@@ -5,11 +5,15 @@
   appimageTools,
   makeWrapper,
   _7zz,
+  writeShellScript,
+  curl,
+  jq,
+  common-updater-scripts,
 }:
 
 let
   pname = "quiet";
-  version = "6.0.0";
+  version = "6.3.0";
 
   meta = {
     description = "Private, p2p alternative to Slack and Discord built on Tor & IPFS";
@@ -19,25 +23,36 @@ let
     maintainers = with lib.maintainers; [ kashw2 ];
   };
 
+  passthru.updateScript = writeShellScript "update-quiet" ''
+    latestVersion=$(${lib.getExe curl} --fail --location --silent https://api.github.com/repos/TryQuiet/quiet/releases/latest | ${lib.getExe jq} '.tag_name | ltrimstr("@quiet/desktop@")' --raw-output)
+    currentVersion=$(nix eval --raw --file . quiet.version)
+    if [[ "$latestVersion" == "$currentVersion" ]]; then
+      exit 0
+    fi
+    ${lib.getExe' common-updater-scripts "update-source-version"} quiet $latestVersion --system=x86_64-linux --ignore-same-hash
+    hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix eval --raw --file . quiet.src.url --system aarch64-darwin)))
+    ${lib.getExe' common-updater-scripts "update-source-version"} quiet $latestVersion $hash --system=aarch64-darwin --ignore-same-version --ignore-same-hash
+  '';
+
   linux = appimageTools.wrapType2 {
-    inherit pname version;
+    inherit pname version passthru;
 
     src = fetchurl {
       url = "https://github.com/TryQuiet/quiet/releases/download/@quiet/desktop@${version}/Quiet-${version}.AppImage";
-      hash = "sha256-YIkbS3L6DIof9gsgHKaguHIwGggVLjQXPM8o7810Wgs=";
+      hash = "sha256-LRUm2QMYg2oD6USOUYRyNUDf1VHu2txsaCUhbi1Ar5o=";
     };
 
     meta = meta // {
-      platforms = lib.platforms.linux;
+      platforms = [ "x86_64-linux" ];
     };
   };
 
   darwin = stdenv.mkDerivation {
-    inherit pname version;
+    inherit pname version passthru;
 
     src = fetchurl {
       url = "https://github.com/TryQuiet/quiet/releases/download/@quiet/desktop@${version}/Quiet-${version}.dmg";
-      hash = "sha256-B1rT+6U0gjScr1FPuh3xGxkpfumT/8feTJbEbCgXPpo=";
+      hash = "sha256-T3EDgQ2DhYttbRjAklhw/C4paUzkdEx6i6Gi+Jx1N+w=";
     };
 
     nativeBuildInputs = [

From d6177ed00b3e537e5c4bc3410fcf9e08561f6eff Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Mon, 20 Oct 2025 08:42:01 +0200
Subject: [PATCH 1014/6226] asterisk-module-sscp: mark as broken on version
 >=21

---
 pkgs/by-name/as/asterisk-module-sccp/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/as/asterisk-module-sccp/package.nix b/pkgs/by-name/as/asterisk-module-sccp/package.nix
index 6c9af1bc9d09..3c99f0030cc5 100644
--- a/pkgs/by-name/as/asterisk-module-sccp/package.nix
+++ b/pkgs/by-name/as/asterisk-module-sccp/package.nix
@@ -40,5 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Replacement for the SCCP channel driver in Asterisk";
     license = lib.licenses.gpl1Only;
     maintainers = with lib.maintainers; [ das_j ];
+    # https://github.com/chan-sccp/chan-sccp/issues/609
+    broken = lib.versionAtLeast (lib.getVersion asterisk) "21";
   };
 })

From 9a7d7da7a7cad643582f81c936813f6d665b9627 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 21 Aug 2025 17:05:47 -0400
Subject: [PATCH 1015/6226] moar: rename to moor

---
 pkgs/by-name/mo/{moar => moor}/package.nix | 6 +++---
 pkgs/top-level/aliases.nix                 | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)
 rename pkgs/by-name/mo/{moar => moor}/package.nix (89%)

diff --git a/pkgs/by-name/mo/moar/package.nix b/pkgs/by-name/mo/moor/package.nix
similarity index 89%
rename from pkgs/by-name/mo/moar/package.nix
rename to pkgs/by-name/mo/moor/package.nix
index b231f30b2c5b..c050e255dd2e 100644
--- a/pkgs/by-name/mo/moar/package.nix
+++ b/pkgs/by-name/mo/moor/package.nix
@@ -6,12 +6,12 @@
 }:
 
 buildGoModule rec {
-  pname = "moar";
+  pname = "moor";
   version = "1.33.0";
 
   src = fetchFromGitHub {
     owner = "walles";
-    repo = "moar";
+    repo = "moor";
     rev = "v${version}";
     hash = "sha256-+06cup9iG+iMyluQPzUQ7vrnFHoeU4KNHGra3AsRRw0=";
   };
@@ -33,7 +33,7 @@ buildGoModule rec {
 
   meta = with lib; {
     description = "Nice-to-use pager for humans";
-    homepage = "https://github.com/walles/moar";
+    homepage = "https://github.com/walles/moor";
     license = licenses.bsd2WithViews;
     mainProgram = "moar";
     maintainers = with maintainers; [ foo-dogsquared ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c6286ab8bdbe..0980dc41be0c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1761,6 +1761,7 @@ mapAliases {
   miru = throw "'miru' has been removed due to lack maintenance"; # Added 2025-08-21
   mmsd = throw "'mmsd' has been removed due to being unmaintained upstream. Consider using 'mmsd-tng' instead"; # Added 2025-06-07
   mmutils = throw "'mmutils' has been removed due to being unmaintained upstream"; # Added 2025-08-29
+  moar = lib.warnOnInstantiate "`moar` has been renamed to `moor` by upstream in v2.0.0. See https://github.com/walles/moor/pull/305 for more." pkgs.moor; # Added 2025-09-02
   mod_dnssd = throw "'mod_dnssd' has been renamed to/replaced by 'apacheHttpdPackages.mod_dnssd'"; # Converted to throw 2024-10-17
   mod_fastcgi = throw "'mod_fastcgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_fastcgi'"; # Converted to throw 2024-10-17
   mod_python = throw "'mod_python' has been renamed to/replaced by 'apacheHttpdPackages.mod_python'"; # Converted to throw 2024-10-17

From c217cdd3a2d5c7fc70d1a2675ae10db31d50da20 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 21 Aug 2025 17:08:04 -0400
Subject: [PATCH 1016/6226] moor: 1.33.0 -> 2.6.1

Diff: https://github.com/walles/moor/compare/v1.33.0...v2.6.1
Changelog: https://github.com/walles/moor/releases/tag/v2.6.1
---
 doc/release-notes/rl-2511.section.md |  2 ++
 pkgs/by-name/mo/moor/package.nix     | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 658135c92af7..184927d1a70f 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -196,6 +196,8 @@
 
 - `sail-riscv` 0.8 follows [upstream](https://github.com/riscv/sail-riscv/blob/7cc4620eb1a57bfe04832baccdcf5727e9459bd4/doc/ChangeLog.md) and provides only a single binary, `sail_riscv_sim`.
 
+- `moar` has been updated from `1.33.0` to `2.0.0`, and renamed to `moor` following an upstream decision. See the [release notes](https://github.com/walles/moor/releases/tag/v2.0.0) for more.
+
 - `podofo` has been updated from `0.9.8` to `1.0.0`. These releases are by nature very incompatible due to major API changes. The legacy versions can be found under `podofo_0_10` and `podofo_0_9`.
   Changelog: https://github.com/podofo/podofo/blob/1.0.0/CHANGELOG.md, API-Migration-Guide: https://github.com/podofo/podofo/blob/1.0.0/API-MIGRATION.md.
 
diff --git a/pkgs/by-name/mo/moor/package.nix b/pkgs/by-name/mo/moor/package.nix
index c050e255dd2e..9de11015a140 100644
--- a/pkgs/by-name/mo/moor/package.nix
+++ b/pkgs/by-name/mo/moor/package.nix
@@ -7,21 +7,21 @@
 
 buildGoModule rec {
   pname = "moor";
-  version = "1.33.0";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "walles";
     repo = "moor";
     rev = "v${version}";
-    hash = "sha256-+06cup9iG+iMyluQPzUQ7vrnFHoeU4KNHGra3AsRRw0=";
+    hash = "sha256-5MiTxspdNTFfLnif5C3gcQ0suxRrjerlZl2+kPAjiBM=";
   };
 
-  vendorHash = "sha256-ComKeqnw1PvDaCRVXfInRjSzhyZWGkD/hp5piwhwxds=";
+  vendorHash = "sha256-ve8QT2dIUZGTFYESt9vIllGTan22ciZr8SQzfqtqQfw=";
 
   nativeBuildInputs = [ installShellFiles ];
 
   postInstall = ''
-    installManPage ./moar.1
+    installManPage ./moor.1
   '';
 
   ldflags = [
@@ -35,7 +35,7 @@ buildGoModule rec {
     description = "Nice-to-use pager for humans";
     homepage = "https://github.com/walles/moor";
     license = licenses.bsd2WithViews;
-    mainProgram = "moar";
+    mainProgram = "moor";
     maintainers = with maintainers; [ foo-dogsquared ];
   };
 }

From b1144748e95e3e8b1bf54cd3ba1e082a0a58d8e5 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 04:39:05 -0300
Subject: [PATCH 1017/6226] lincity-ng: 2.13.1 -> 2.14.2

---
 pkgs/by-name/li/lincity-ng/package.nix | 23 ++++++++---------------
 1 file changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/li/lincity-ng/package.nix b/pkgs/by-name/li/lincity-ng/package.nix
index 7232f1c1dcd4..734b8868105c 100644
--- a/pkgs/by-name/li/lincity-ng/package.nix
+++ b/pkgs/by-name/li/lincity-ng/package.nix
@@ -1,22 +1,19 @@
 {
   stdenv,
   SDL2,
-  SDL2_gfx,
   SDL2_image,
   SDL2_mixer,
   SDL2_ttf,
   cmake,
   fetchFromGitHub,
+  fmt,
   lib,
-  libGL,
-  libGLU,
   libwebp,
   libtiff,
   libX11,
   libxml2,
   libxmlxx5,
   libxslt,
-  physfs_2,
   pkg-config,
   xorgproto,
   zlib,
@@ -24,47 +21,42 @@
   include-what-you-use,
 }:
 
-let
-  # https://github.com/lincity-ng/lincity-ng/issues/25
-  physfs = physfs_2;
-in
-
 stdenv.mkDerivation (finalAttrs: {
   pname = "lincity-ng";
-  version = "2.13.1";
+  version = "2.14.2";
 
   src = fetchFromGitHub {
     owner = "lincity-ng";
     repo = "lincity-ng";
     tag = "lincity-ng-${finalAttrs.version}";
-    hash = "sha256-ACJVhMq2IEJNrbAdmkgHxQV0uKSXpwR8a/5jcrQS+oI=";
+    hash = "sha256-HW+bB9xnrok8tWKIJJUt3Qgo5e9HmI6NZORG4PazmEM=";
   };
 
   hardeningDisable = [ "format" ];
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     cmake
     pkg-config
     gettext
     include-what-you-use
     libxml2
+    libxslt
   ];
 
   buildInputs = [
+    fmt
     SDL2
-    SDL2_gfx
     SDL2_image
     SDL2_mixer
     SDL2_ttf
-    libGL
-    libGLU
     libX11
     libwebp
     libtiff
     libxmlxx5
     libxml2
     libxslt
-    physfs
     xorgproto
     zlib
   ];
@@ -81,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
   ";
 
   meta = {
+    homepage = "https://github.com/lincity-ng/lincity-ng";
     description = "City building game";
     mainProgram = "lincity-ng";
     license = lib.licenses.gpl2Plus;

From 42c080834788083b60f1399b52de944f2564e998 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Mon, 20 Oct 2025 08:47:05 +0200
Subject: [PATCH 1018/6226] jellyfin-web: 10.10.7 -> 10.11.0

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

diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix
index 326745272fd5..9b2adf43eef9 100644
--- a/pkgs/by-name/je/jellyfin-web/package.nix
+++ b/pkgs/by-name/je/jellyfin-web/package.nix
@@ -13,7 +13,7 @@
 }:
 buildNpmPackage rec {
   pname = "jellyfin-web";
-  version = "10.10.7";
+  version = "10.11.0";
 
   src =
     assert version == jellyfin.version;
@@ -21,7 +21,7 @@ buildNpmPackage rec {
       owner = "jellyfin";
       repo = "jellyfin-web";
       rev = "v${version}";
-      hash = "sha256-jX9Qut8YsJRyKI2L7Aww4+6G8z741WzN37CUx3KWQfY=";
+      hash = "sha256-LcZNfFXM2dFHeUheSnri1t4eBYvlCfF2wlaqWlh+U7A=";
     };
 
   nodejs = nodejs_20; # does not build with 22
@@ -31,7 +31,7 @@ buildNpmPackage rec {
       --replace-fail "git describe --always --dirty" "echo ${src.rev}" \
   '';
 
-  npmDepsHash = "sha256-nfvqVByD3Kweq+nFJQY4R2uRX3mx/qJvGFiKiOyMUdw=";
+  npmDepsHash = "sha256-w3xMbkxNGFEBR2K1PhJW6pr943DfJvyQvILiF0VuLlw=";
 
   preBuild = ''
     # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart

From 37743688ccc5b044667ae1a79f8d70a6f158183c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 07:56:40 +0000
Subject: [PATCH 1019/6226] vscode-extensions.ltex-plus.vscode-ltex-plus:
 15.5.1 -> 15.6.1

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 4cf6570771c5..83077534b37c 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2847,8 +2847,8 @@ let
         mktplcRef = {
           name = "vscode-ltex-plus";
           publisher = "ltex-plus";
-          version = "15.5.1";
-          hash = "sha256-BzIJ7gsjcMimLYeVxcvdP0fyIEmwCXxTxqil5o+810w=";
+          version = "15.6.1";
+          hash = "sha256-UOiYjA11P7xqPFgdR7eS63wOQl9dqWAqBxz3nklapqo=";
         };
         meta = {
           description = "VS Code extension for grammar/spell checking using LanguageTool with support for LaTeX, Markdown, and others";

From 4957a9976f96ff95e4adad5c693433cefb361d3e Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Mon, 20 Oct 2025 09:54:16 +0200
Subject: [PATCH 1020/6226] jellyfin: 10.10.7 -> 10.11.0

adapt the test due to slower start and small API change
---
 doc/release-notes/rl-2511.section.md     |   4 +
 nixos/tests/jellyfin.nix                 |  15 +-
 pkgs/by-name/je/jellyfin/nuget-deps.json | 620 +++++++++++++----------
 pkgs/by-name/je/jellyfin/package.nix     |   8 +-
 4 files changed, 376 insertions(+), 271 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 658135c92af7..94d617907142 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -271,6 +271,10 @@
 - `searx` was updated to use `envsubst` instead of `sed` for parsing secrets from environment variables.
   If your previous configuration included a secret reference like `server.secret_key = "@SEARX_SECRET_KEY@"`, you must migrate to the new envsubst syntax: `server.secret_key = "$SEARX_SECRET_KEY"`.
 
+- `jellyfin` was updated to `10.11.x`, which includes heavy backend changes.
+  Make sure to backup your data and configuration directories
+  and read the [Jellyfin 10.11.0 release announcement](https://jellyfin.org/posts/jellyfin-release-10.11.0/).
+
 - A new hardening flag, `glibcxxassertions` was made available, corresponding to the glibc `_GLIBCXX_ASSERTIONS` option.
 
 - `versionCheckHook`: Packages that previously relied solely on `pname` to locate the program used to version check, but have a differing `meta.mainProgram` entry, might now fail.
diff --git a/nixos/tests/jellyfin.nix b/nixos/tests/jellyfin.nix
index 6b4a962e029f..e8fb233bccd5 100644
--- a/nixos/tests/jellyfin.nix
+++ b/nixos/tests/jellyfin.nix
@@ -4,12 +4,12 @@
   name = "jellyfin";
   meta.maintainers = with lib.maintainers; [ minijackson ];
 
-  nodes.machine =
-    { ... }:
-    {
-      services.jellyfin.enable = true;
-      environment.systemPackages = with pkgs; [ ffmpeg ];
-    };
+  nodes.machine = {
+    services.jellyfin.enable = true;
+    environment.systemPackages = with pkgs; [ ffmpeg ];
+    # Jellyfin fails to start if the data dir doesn't have at least 2GiB of free space
+    virtualisation.diskSize = 3 * 1024;
+  };
 
   # Documentation of the Jellyfin API: https://api.jellyfin.org/
   # Beware, this link can be resource intensive
@@ -30,6 +30,7 @@
 
       machine.wait_for_unit("jellyfin.service")
       machine.wait_for_open_port(8096)
+      machine.wait_until_succeeds("journalctl --since -1m --unit jellyfin --grep 'Startup complete'")
       machine.succeed("curl --fail http://localhost:8096/")
 
       machine.wait_until_succeeds("curl --fail http://localhost:8096/health | grep Healthy")
@@ -105,7 +106,7 @@
           folders_str = machine.succeed(api_get("/Library/VirtualFolders"))
           folders = json.loads(folders_str)
           print(folders)
-          return all(folder["RefreshStatus"] == "Idle" for folder in folders)
+          return all(folder.get("RefreshStatus") == "Idle" for folder in folders)
 
 
       retry(is_refreshed)
diff --git a/pkgs/by-name/je/jellyfin/nuget-deps.json b/pkgs/by-name/je/jellyfin/nuget-deps.json
index 36a1b036aea9..c82b74619fea 100644
--- a/pkgs/by-name/je/jellyfin/nuget-deps.json
+++ b/pkgs/by-name/je/jellyfin/nuget-deps.json
@@ -1,23 +1,28 @@
 [
   {
     "pname": "AsyncKeyedLock",
-    "version": "7.0.2",
-    "hash": "sha256-UFPta8yWtuFhpfy7OpBkUDQnyO8TODXEE0zA6ubz1QM="
+    "version": "7.1.7",
+    "hash": "sha256-gXITMqewgmts75I2SHzZ/AyihFihQ0Vo/JSletxz+r4="
   },
   {
     "pname": "BDInfo",
     "version": "0.8.0",
     "hash": "sha256-r6Q+rRTbHyFqiWeaUDfw0eS8D/U1FZckNzAaU4ibLhQ="
   },
+  {
+    "pname": "BitFaster.Caching",
+    "version": "2.5.4",
+    "hash": "sha256-PWuVT1kKjL8ulMtv9hWmg0nMChFh8skr34xUl3mQ0Y8="
+  },
   {
     "pname": "BlurHashSharp",
-    "version": "1.3.4",
-    "hash": "sha256-xBTjBMTrN8M4gsPJSW3YIuu6Zi44xBkDHJF4FudOIts="
+    "version": "1.4.0-pre.1",
+    "hash": "sha256-QNx5Ix+a5DWNrJegpH3Qj56aaoAct0W2pBWMPda7zyI="
   },
   {
     "pname": "BlurHashSharp.SkiaSharp",
-    "version": "1.3.4",
-    "hash": "sha256-P0ObHZ6/lSwLjG7+uTgzmTcwCfDGisz8GFzlnDjctgY="
+    "version": "1.4.0-pre.1",
+    "hash": "sha256-NmulKfYfa/dupnOweGUoLxf8Jba/ThW615vi4IDNc90="
   },
   {
     "pname": "CommandLineParser",
@@ -26,8 +31,8 @@
   },
   {
     "pname": "Diacritics",
-    "version": "3.3.29",
-    "hash": "sha256-sIbdJ3yMthnmJHly3WheUdYjtwPakcczTJx9ycxtgrY="
+    "version": "4.0.17",
+    "hash": "sha256-O1pOeOV7c+dfD/EjwiOmqYhP5RDZyosVOk0OjVuK5Eg="
   },
   {
     "pname": "DiscUtils.Core",
@@ -51,8 +56,8 @@
   },
   {
     "pname": "dotnet-ef",
-    "version": "8.0.11",
-    "hash": "sha256-LxLA79aQCxhNPU3fTw6w2aFCo5S2vqmkCeaGdMY3c9Y="
+    "version": "9.0.10",
+    "hash": "sha256-ySEiSCUsZnosL/aHA4zCWW0YEdUjHhluMzwDmYNDsj4="
   },
   {
     "pname": "DotNet.Glob",
@@ -61,28 +66,28 @@
   },
   {
     "pname": "ExCSS",
-    "version": "4.2.3",
-    "hash": "sha256-M/H6P5p7qqdFz/fgAI2MMBWQ7neN/GIieYSSxxjsM9I="
+    "version": "4.3.1",
+    "hash": "sha256-nNn5+YEaqKSULhtDsImNEyndU/MHna7VpZNUExmo80o="
   },
   {
     "pname": "HarfBuzzSharp",
-    "version": "7.3.0.3",
-    "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
+    "version": "8.3.0.1",
+    "hash": "sha256-ZQwyxpI6jB804Z3d1JAhLqyHIu42fo6mpmk5GVFbEzk="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Linux",
-    "version": "7.3.0.3",
-    "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM="
+    "version": "8.3.1.1",
+    "hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.macOS",
-    "version": "7.3.0.3",
-    "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
+    "version": "8.3.0.1",
+    "hash": "sha256-bpow26ydfzv9w6XCtZOcsGqMUVcfmvnIo5qPqtl9NQo="
   },
   {
     "pname": "HarfBuzzSharp.NativeAssets.Win32",
-    "version": "7.3.0.3",
-    "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
+    "version": "8.3.0.1",
+    "hash": "sha256-2+FA4EfAQ68q1nJlXUuqDcETwIA+6OvD0DB/lMnbKVY="
   },
   {
     "pname": "Humanizer.Core",
@@ -104,6 +109,11 @@
     "version": "4.0.8",
     "hash": "sha256-OikeX+tNhbMoYDUYZl5YeSWaODgLLzR0S1xcwjpmmOg="
   },
+  {
+    "pname": "Ignore",
+    "version": "0.2.1",
+    "hash": "sha256-VHlsd3Va9IN5EbAHFiEHDvJXWhbyUXxZnGrMmh/1kPU="
+  },
   {
     "pname": "J2N",
     "version": "2.0.0",
@@ -116,13 +126,13 @@
   },
   {
     "pname": "libse",
-    "version": "4.0.8",
-    "hash": "sha256-A17k5GpMtY3RSqZADeP4Ri9LKXkVa9jHo4+Tipn7Bs8="
+    "version": "4.0.12",
+    "hash": "sha256-l7ai5a+1BD4LMU5X7f4ZcLZA2QUjpTCCP8XCrRQ0fhk="
   },
   {
     "pname": "LrcParser",
-    "version": "2025.228.1",
-    "hash": "sha256-1p471WX25rYpb0P/q3sEj35vLLa8QvokAbLO47D7wTM="
+    "version": "2025.623.0",
+    "hash": "sha256-f3+6qpPxQOdwAX1OuNiHoobk38lY+9Udyvubhg989MQ="
   },
   {
     "pname": "MetaBrainz.Common",
@@ -141,98 +151,133 @@
   },
   {
     "pname": "Microsoft.AspNetCore.Authorization",
-    "version": "8.0.11",
-    "hash": "sha256-LHkaXHgK1aHl6sk+6fZralNRsY0GEoALkyRspJP0nyE="
+    "version": "9.0.10",
+    "hash": "sha256-jhjTkNSo7vFuPMit1jun/QJ1+Yb6o5XdYCaUelX1g/M="
   },
   {
     "pname": "Microsoft.AspNetCore.Metadata",
-    "version": "8.0.11",
-    "hash": "sha256-P7U4DkTNjG8m2s/tVqWLJ6hm9LJhThBRi1hsp4JPecc="
+    "version": "9.0.10",
+    "hash": "sha256-lrCmI+moPjThyWVX6xtQvRZZ+b5pCLUSpQmm8Q47pM0="
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
-    "version": "6.0.0",
-    "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
+    "version": "7.0.0",
+    "hash": "sha256-1e031E26iraIqun84ad0fCIR4MJZ1hcQo4yFN+B7UfE="
+  },
+  {
+    "pname": "Microsoft.Build.Framework",
+    "version": "16.10.0",
+    "hash": "sha256-Sj41LE1YQ/NfOdiDf5YnZgWSwGOzQ2uVvP1LgF/HSJ0="
+  },
+  {
+    "pname": "Microsoft.Build.Framework",
+    "version": "17.8.3",
+    "hash": "sha256-Rp4dN8ejOXqclIKMUXYvIliM6IYB7WMckMLwdCbVZ34="
+  },
+  {
+    "pname": "Microsoft.Build.Locator",
+    "version": "1.7.8",
+    "hash": "sha256-VhZ4jiJi17Cd5AkENXL1tjG9dV/oGj0aY67IGYd7vNs="
   },
   {
     "pname": "Microsoft.CodeAnalysis.Analyzers",
-    "version": "3.3.3",
-    "hash": "sha256-pkZiggwLw8k+CVSXKTzsVGsT+K49LxXUS3VH5PNlpCY="
+    "version": "3.11.0",
+    "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Analyzers",
+    "version": "3.3.4",
+    "hash": "sha256-qDzTfZBSCvAUu9gzq2k+LOvh6/eRvJ9++VCNck/ZpnE="
   },
   {
     "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
-    "version": "3.3.4",
-    "hash": "sha256-YPTHTZ8xRPMLADdcVYRO/eq3O9uZjsD+OsGRZE+0+e8="
+    "version": "4.14.0",
+    "hash": "sha256-f7svtnkq4xLTjGVj6kNZ1ZGFCV/RESsM+GJZmEpezh4="
   },
   {
     "pname": "Microsoft.CodeAnalysis.Common",
-    "version": "4.5.0",
-    "hash": "sha256-qo1oVNTB9JIMEPoiIZ+02qvF/O8PshQ/5gTjsY9iX0I="
+    "version": "4.14.0",
+    "hash": "sha256-ne/zxH3GqoGB4OemnE8oJElG5mai+/67ASaKqwmL2BE="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Common",
+    "version": "4.8.0",
+    "hash": "sha256-3IEinVTZq6/aajMVA8XTRO3LTIEt0PuhGyITGJLtqz4="
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp",
-    "version": "4.5.0",
-    "hash": "sha256-5dZTS9PYtY83vyVa5bdNG3XKV5EjcnmddfUqWmIE29A="
+    "version": "4.14.0",
+    "hash": "sha256-5Mzj3XkYYLkwDWh17r1NEXSbXwwWYQPiOmkSMlgo1JY="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.CSharp",
+    "version": "4.8.0",
+    "hash": "sha256-MmOnXJvd/ezs5UPcqyGLnbZz5m+VedpRfB+kFZeeqkU="
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces",
-    "version": "4.5.0",
-    "hash": "sha256-Kmyt1Xfcs0rSZHvN9PH94CKAooqMS9abZQY7EpEqb2o="
+    "version": "4.8.0",
+    "hash": "sha256-WNzc+6mKqzPviOI0WMdhKyrWs8u32bfGj2XwmfL7bwE="
   },
   {
     "pname": "Microsoft.CodeAnalysis.Workspaces.Common",
-    "version": "4.5.0",
-    "hash": "sha256-WM7AXJYHagaPx2waj2E32gG0qXq6Kx4Zhiq7Ym3WXPI="
+    "version": "4.8.0",
+    "hash": "sha256-X8R4SpWVO/gpip5erVZf5jCCx8EX3VzIRtNrQiLDIoM="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Workspaces.MSBuild",
+    "version": "4.8.0",
+    "hash": "sha256-hxpMKC6OF8OaIiSZhAgJ+Rw7M8nqS6xHdUURnRRxJmU="
   },
   {
     "pname": "Microsoft.Data.Sqlite",
-    "version": "8.0.11",
-    "hash": "sha256-55TQhpJDkL7I4GH1cWYNEr1gNJ7pqHhmXzPGoseWsFg="
+    "version": "9.0.10",
+    "hash": "sha256-53z+zRrlVxzwELr9C+VSHcqGK/cjKvuilaD/2BJA28Y="
   },
   {
     "pname": "Microsoft.Data.Sqlite.Core",
-    "version": "8.0.11",
-    "hash": "sha256-bYyxOTss74EVz+3ybmgl11fzX0Co3CVZbCDxv24y0/E="
+    "version": "9.0.10",
+    "hash": "sha256-prsCR2WzQAhbhdZ30xk+/wvLt6rDj0M3k1tvyoD6uYM="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore",
-    "version": "8.0.11",
-    "hash": "sha256-uvcAmj7ob2X/JKLleNwanpNs0X3PkJl3je6ZsHeWooE="
+    "version": "9.0.10",
+    "hash": "sha256-Zm4oMVeloK2WmPskzg4l3SXjJuC+sRg3O5aiTK5rHvw="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Abstractions",
-    "version": "8.0.11",
-    "hash": "sha256-qKe+WBIlyZ1CS2H9JGWsYiWxkUzGjwIHtx/q3FPCDr8="
+    "version": "9.0.10",
+    "hash": "sha256-FB+8WtFYKn1PH9R3pgKw7dNJiJDCcS78UkeRkxdOuCk="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Analyzers",
-    "version": "8.0.11",
-    "hash": "sha256-eKhcGqCN34F2i7/FeKSq1gyMjNq3ikq+UpE/1SbXecY="
+    "version": "9.0.10",
+    "hash": "sha256-q6w0uQ4qMAe2EuA65a3rk18rhGXuGVYMrdrIzD5Z+tw="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Design",
-    "version": "8.0.11",
-    "hash": "sha256-in7Ppl/tEEM/2r+l+uuSjWLXk7fHbJRVmLzskYfAhMQ="
+    "version": "9.0.10",
+    "hash": "sha256-Zb5u2PySq+VuISn4bSTTDp6sN05ml94eK5O3dZAGO9g="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Relational",
-    "version": "8.0.11",
-    "hash": "sha256-st6V0S7j+FyK7r9X6uObpuhSoac/z5QOF1DUPnhffgE="
+    "version": "9.0.10",
+    "hash": "sha256-2XHQOKvs4mAXwl8vEZpdi6ZtDFhK2hPusRMFemu3Shw="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Sqlite",
-    "version": "8.0.11",
-    "hash": "sha256-DFAJxCxJeJghYL1Zl4d78i7/o8RFhLeCS+QFXvZulV4="
+    "version": "9.0.10",
+    "hash": "sha256-LunzXQSLdZZL1aTlg8E8Jj58oKXniJwYx9zQasPbM2I="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Sqlite.Core",
-    "version": "8.0.11",
-    "hash": "sha256-GUWuE0ZycKiOha8wq7qklol9KfiSB4WSCF3/OwiSiAQ="
+    "version": "9.0.10",
+    "hash": "sha256-3uBgFul0W3+7MaxwRjZoowQ9iSw58jYPUChyWG/3UF4="
   },
   {
     "pname": "Microsoft.EntityFrameworkCore.Tools",
-    "version": "8.0.11",
-    "hash": "sha256-i5BbbWFUTQmPRGhof/4DbwzKGFHmZaNAJhGZf6+2PpI="
+    "version": "9.0.10",
+    "hash": "sha256-qZhy83X+adNfhJwJcDoxn1R9pfU4Iq8PP+JB9anqArA="
   },
   {
     "pname": "Microsoft.Extensions.ApiDescription.Server",
@@ -246,8 +291,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Caching.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-xGpKrywQvU1Wm/WolYIxgHYEFfgkNGeJ+GGc5DT3phI="
+    "version": "9.0.10",
+    "hash": "sha256-W/9WhAG5t/hWPZxIL5+ILMsPKO/DjprHRymZUmU5YOA="
   },
   {
     "pname": "Microsoft.Extensions.Caching.Memory",
@@ -256,73 +301,58 @@
   },
   {
     "pname": "Microsoft.Extensions.Caching.Memory",
-    "version": "8.0.1",
-    "hash": "sha256-5Q0vzHo3ZvGs4nPBc/XlBF4wAwYO8pxq6EGdYjjXZps="
+    "version": "9.0.10",
+    "hash": "sha256-HIXNiUnBJaYN+QGzpTlHzkvkBwYmcU0QUlIgQDhVG5g="
   },
   {
     "pname": "Microsoft.Extensions.Configuration",
-    "version": "3.1.0",
-    "hash": "sha256-KI1WXvnF/Xe9cKTdDjzm0vd5h9bmM+3KinuWlsF/X+c="
-  },
-  {
-    "pname": "Microsoft.Extensions.Configuration",
-    "version": "8.0.0",
-    "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="
+    "version": "9.0.10",
+    "hash": "sha256-K16pSHfb71WhGqD7mzjrYaNBihU4tga90c6IOHsgRxw="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "3.1.0",
-    "hash": "sha256-GMxvf0iAiWUWo0awlDczzcxNo8+MITBLp0/SqqYo8Lg="
+    "version": "9.0.0",
+    "hash": "sha256-xtG2USC9Qm0f2Nn6jkcklpyEDT3hcEZOxOwTc0ep7uc="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="
+    "version": "9.0.10",
+    "hash": "sha256-sRv0yS2sbyli7eejtnpmd7UIAz4PwSt5/Po5Irc1j98="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "3.1.0",
-    "hash": "sha256-/B7WjPZPvRM+CPgfaCQunSi2mpclH4orrFxHGLs8Uo4="
+    "version": "9.0.0",
+    "hash": "sha256-6ajYWcNOQX2WqftgnoUmVtyvC1kkPOtTCif4AiKEffU="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "8.0.0",
-    "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="
-  },
-  {
-    "pname": "Microsoft.Extensions.Configuration.Binder",
-    "version": "8.0.2",
-    "hash": "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE="
+    "version": "9.0.10",
+    "hash": "sha256-4NEBx28byvjjIzo0wQPIUUymk9AzSgPS4fu5IRxkIt4="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables",
-    "version": "8.0.0",
-    "hash": "sha256-+bjFZvqCsMf2FRM2olqx/fub+QwfM1kBhjGVOT5HC48="
+    "version": "9.0.10",
+    "hash": "sha256-D4Myt5rp8jxOvuQ4zwo/1bfNfLDZHrBYx7+UDOnhWgA="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.FileExtensions",
-    "version": "8.0.1",
-    "hash": "sha256-iRA8L7BX/fe5LHCVOhzBSk30GfshP7V2Qj2nxpEvStA="
+    "version": "9.0.10",
+    "hash": "sha256-I8ywPAfg7GPQgOuA5TPXuseurWKk7BmXsnaowF80XEQ="
   },
   {
     "pname": "Microsoft.Extensions.Configuration.Json",
-    "version": "8.0.1",
-    "hash": "sha256-J8EK/yhsfTpeSUY8F81ZTBV9APHiPUliN7d+n2OX9Ig="
+    "version": "9.0.10",
+    "hash": "sha256-ykcnGdvnx19q3dpwZ9A09k+6iIGNurVebe4nUaOBtng="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "3.1.0",
-    "hash": "sha256-S72hzDAYWzrfCH5JLJBRtwPEM/Xjh17HwcKuA3wLhvU="
+    "version": "3.0.0",
+    "hash": "sha256-RyT+m4OsHb1csXt5OYtjdx8LIsRlOKEWzSbAm4jfCzM="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "8.0.0",
-    "hash": "sha256-+qIDR8hRzreCHNEDtUcPfVHQdurzWPo/mqviCH78+EQ="
-  },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "8.0.1",
-    "hash": "sha256-O9g0jWS+jfGoT3yqKwZYJGL+jGSIeSbwmvomKDC3hTU="
+    "version": "9.0.10",
+    "hash": "sha256-f3r2msA/oV9gGdFn9OEr5bPAfINR17P+sS6/2/NnCuk="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
@@ -336,73 +366,73 @@
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="
+    "version": "9.0.0",
+    "hash": "sha256-CncVwkKZ5CsIG2O0+OM9qXuYXh3p6UGyueTHSLDVL+c="
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "8.0.2",
-    "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
+    "version": "9.0.10",
+    "hash": "sha256-5rwFXG+Wjbf+TkXeWrkGVKV4wfvOryTPadEkEyPyKj4="
   },
   {
     "pname": "Microsoft.Extensions.DependencyModel",
-    "version": "8.0.2",
-    "hash": "sha256-PyuO/MyCR9JtYqpA1l/nXGh+WLKCq34QuAXN9qNza9Q="
+    "version": "9.0.0",
+    "hash": "sha256-xirwlMWM0hBqgTneQOGkZ8l45mHT08XuSSRIbprgq94="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyModel",
+    "version": "9.0.10",
+    "hash": "sha256-isJHVIKcWkwi+CqwNBVlz2ISKzZj+TilVpmVNOonNWo="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics",
-    "version": "8.0.1",
-    "hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc="
+    "version": "9.0.10",
+    "hash": "sha256-QOjI52VFJne2OpvSPeoep/AcPXvwtr9AtvU0xdCIWog="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-USD5uZOaahMqi6u7owNWx/LR4EDrOwqPrAAim7iRpJY="
-  },
-  {
-    "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
-    "version": "8.0.1",
-    "hash": "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0="
+    "version": "9.0.10",
+    "hash": "sha256-FXJrBpG4UieCn9MLcNX25WbPycfZWdPg38/ZLckmAI0="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics.HealthChecks",
-    "version": "8.0.11",
-    "hash": "sha256-wS+5kN0lREre+gv7//VuVb9oVkEzWHxKGiZJukj4Z30="
+    "version": "9.0.10",
+    "hash": "sha256-mp8r8G8V/Fu+SoZ2a1/cyFTfIF0x+HXeg7++5m3aRE4="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics.HealthChecks.Abstractions",
-    "version": "8.0.11",
-    "hash": "sha256-JjWYaK5c+w8GUkNudYQKf2m3NwOQLYEeSFwL8kgTWC0="
+    "version": "9.0.10",
+    "hash": "sha256-7EHvrP6i4Wm0xPkp4S8O2dSHgnYEvU086irf6EzK8Xw="
   },
   {
     "pname": "Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore",
-    "version": "8.0.11",
-    "hash": "sha256-4fON6hI6uBeb/AWROYLgbbfxce1wazIt9WQbTUqwfi0="
+    "version": "9.0.10",
+    "hash": "sha256-E2+7dq0TvGcGuiJChyB4EsDEe8yySIvdB4XAH0q1zFQ="
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="
+    "version": "9.0.10",
+    "hash": "sha256-NJUg0fFe+djIUkdYhJDCG5A1JU9hhQ5GXGsz+gBEaFo="
   },
   {
     "pname": "Microsoft.Extensions.FileProviders.Physical",
-    "version": "8.0.0",
-    "hash": "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="
+    "version": "9.0.10",
+    "hash": "sha256-fqh0OzyoSouNpJkVp/stjqD2NInnBKX9n6JPx+HD5Q0="
   },
   {
     "pname": "Microsoft.Extensions.FileSystemGlobbing",
-    "version": "8.0.0",
-    "hash": "sha256-+Oz41JR5jdcJlCJOSpQIL5OMBNi+1Hl2d0JUHfES7sU="
+    "version": "9.0.10",
+    "hash": "sha256-m3gjvbPKl36XlrOzCjNHEhWjQcG8agZ5REc/EIOExmQ="
   },
   {
     "pname": "Microsoft.Extensions.Hosting.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="
+    "version": "9.0.0",
+    "hash": "sha256-NhEDqZGnwCDFyK/NKn1dwLQExYE82j1YVFcrhXVczqY="
   },
   {
     "pname": "Microsoft.Extensions.Hosting.Abstractions",
-    "version": "8.0.1",
-    "hash": "sha256-/bIVL9uvBQhV/KQmjA1ZjR74sMfaAlBb15sVXsGDEVA="
+    "version": "9.0.10",
+    "hash": "sha256-CrysJ8NO0kx9smoGIk0Oz05RnISTUcPVjTLpRKeVBgQ="
   },
   {
     "pname": "Microsoft.Extensions.Http",
@@ -411,8 +441,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Http",
-    "version": "8.0.1",
-    "hash": "sha256-ScPwhBvD3Jd4S0E7JQ18+DqY3PtQvdFLbkohUBbFd3o="
+    "version": "9.0.10",
+    "hash": "sha256-cDC63R943sHVw34V64A3weVY1KgrjhE3dCtDJfGLaQA="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
@@ -421,28 +451,23 @@
   },
   {
     "pname": "Microsoft.Extensions.Logging",
-    "version": "8.0.0",
-    "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="
+    "version": "9.0.0",
+    "hash": "sha256-kR16c+N8nQrWeYLajqnXPg7RiXjZMSFLnKLEs4VfjcM="
   },
   {
     "pname": "Microsoft.Extensions.Logging",
-    "version": "8.0.1",
-    "hash": "sha256-vkfVw4tQEg86Xg18v6QO0Qb4Ysz0Njx57d1XcNuj6IU="
+    "version": "9.0.10",
+    "hash": "sha256-/Et36NBhpMoxQzI+p/moW7knwYDfjI7Ma7DF7KIYn+Q="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "3.1.0",
-    "hash": "sha256-D3GHIGN0r6zLHHP2/5jt6hB0oMvRyl5ysvVrPVmmyv8="
+    "version": "9.0.0",
+    "hash": "sha256-iBTs9twjWXFeERt4CErkIIcoJZU1jrd1RWCI8V5j7KU="
   },
   {
     "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "8.0.0",
-    "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
-  },
-  {
-    "pname": "Microsoft.Extensions.Logging.Abstractions",
-    "version": "8.0.2",
-    "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
+    "version": "9.0.10",
+    "hash": "sha256-PtYXXHi+mbdQMh2QtA57NbWlt+JEpXiey36zLzbKTmo="
   },
   {
     "pname": "Microsoft.Extensions.ObjectPool",
@@ -461,18 +486,13 @@
   },
   {
     "pname": "Microsoft.Extensions.Options",
-    "version": "8.0.0",
-    "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="
-  },
-  {
-    "pname": "Microsoft.Extensions.Options",
-    "version": "8.0.2",
-    "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="
+    "version": "9.0.10",
+    "hash": "sha256-QTNhi83xhjJuIQ/3QffzQs/KY7avNyBMvnkuuSr3pBo="
   },
   {
     "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
-    "version": "8.0.0",
-    "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="
+    "version": "9.0.10",
+    "hash": "sha256-4YxwQH66IhJiJP53/Fy/lGBIEkVo4k+o/5QxzFQLhfQ="
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
@@ -481,13 +501,8 @@
   },
   {
     "pname": "Microsoft.Extensions.Primitives",
-    "version": "3.1.0",
-    "hash": "sha256-K/cDq+LMfK4cBCvKWkmWAC+IB6pEWolR1J5zL60QPvA="
-  },
-  {
-    "pname": "Microsoft.Extensions.Primitives",
-    "version": "8.0.0",
-    "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
+    "version": "9.0.10",
+    "hash": "sha256-It7NQ+Ap/hrqFX3LXDVJqVz1Xl3j8QIapYDcG2MQ/7w="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
@@ -526,39 +541,59 @@
   },
   {
     "pname": "Microsoft.Win32.SystemEvents",
-    "version": "8.0.0",
-    "hash": "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ="
+    "version": "9.0.2",
+    "hash": "sha256-WXgu8y2LT8OtQSVRojumtlTkJVjfvXeZ8N9iRKIW/lI="
   },
   {
     "pname": "MimeTypes",
-    "version": "2.4.0",
-    "hash": "sha256-M35eTCoLiWv7PlBgsTltTvW7TOROf2AYB9nSl2NAsQA="
-  },
-  {
-    "pname": "Mono.Nat",
-    "version": "3.0.4",
-    "hash": "sha256-NdOquU2NaKtCv0p1+eY6awjOBwwzf92CwAJ4Dgz2+4M="
+    "version": "2.5.2",
+    "hash": "sha256-S3aYTBXc/7Qi75CO9+2iBrI5tRFkdM5Q3VB5q6MthQo="
   },
   {
     "pname": "Mono.TextTemplating",
-    "version": "2.2.1",
-    "hash": "sha256-4TYsfc8q74P8FuDwkIWPO+VYY0mh4Hs4ZL8v0lMaBsY="
+    "version": "3.0.0",
+    "hash": "sha256-VlgGDvgNZb7MeBbIZ4DE2Nn/j2aD9k6XqNHnASUSDr0="
+  },
+  {
+    "pname": "Morestachio",
+    "version": "5.0.1.631",
+    "hash": "sha256-L7ZA1l+61nZEj49DOTSp0bHsfCOBTYNmPJMv1mTIIvM="
   },
   {
     "pname": "NEbml",
-    "version": "0.12.0",
-    "hash": "sha256-Ij6p0bfCagTCxcKBppCQAqZMmxARJMCGsktyPSDGoFc="
+    "version": "1.1.0.5",
+    "hash": "sha256-MrQLekP6z5y6rfqnCbLefkYv4Fm8di4HqZ/AiYTzBQ4="
+  },
+  {
+    "pname": "NETStandard.Library",
+    "version": "2.0.3",
+    "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo="
   },
   {
     "pname": "Newtonsoft.Json",
     "version": "13.0.3",
     "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
   },
+  {
+    "pname": "Newtonsoft.Json",
+    "version": "13.0.4",
+    "hash": "sha256-8JCB1FdAW681qXP6DFDWvycu1oPyVoxaYgpJ2pUvZSk="
+  },
   {
     "pname": "PlaylistsNET",
     "version": "1.4.1",
     "hash": "sha256-Hei2R5S4p0jWhmUNtjL8qbTR1X120GlBeEQBj3tRHH4="
   },
+  {
+    "pname": "Polly",
+    "version": "8.6.4",
+    "hash": "sha256-Z+ZbhnHWMu55qgQkxvw3yMiMd+zIMzzQiFhvn/PeQ3I="
+  },
+  {
+    "pname": "Polly.Core",
+    "version": "8.6.4",
+    "hash": "sha256-4Xrg/H481Y/WOHk1sGvFNEOfgaGrdKi+4U54PTXhh9I="
+  },
   {
     "pname": "prometheus-net",
     "version": "3.1.2",
@@ -679,6 +714,11 @@
     "version": "4.3.0",
     "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="
   },
+  {
+    "pname": "runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="
+  },
   {
     "pname": "runtime.native.System.Security.Cryptography.OpenSsl",
     "version": "4.3.2",
@@ -754,11 +794,6 @@
     "version": "4.3.0",
     "hash": "sha256-l8S9gt6dk3qYG6HYonHtdlYtBKyPb29uQ6NDjmrt3V4="
   },
-  {
-    "pname": "Serilog",
-    "version": "3.1.1",
-    "hash": "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI="
-  },
   {
     "pname": "Serilog",
     "version": "4.0.0",
@@ -769,35 +804,45 @@
     "version": "4.1.0",
     "hash": "sha256-r89nJ5JE5uZlsRrfB8QJQ1byVVfCWQbySKQ/m9PYj0k="
   },
+  {
+    "pname": "Serilog",
+    "version": "4.2.0",
+    "hash": "sha256-7f3EpCsEbDxXgsuhE430KVI14p7oDUuCtwRpOCqtnbs="
+  },
   {
     "pname": "Serilog.AspNetCore",
-    "version": "8.0.3",
-    "hash": "sha256-ZyBlauyG/7CLTqrbhRalmayFd99d7bimNTMw4hXDR2I="
+    "version": "9.0.0",
+    "hash": "sha256-h58CFtXBRvwhTCrhQPHQMKbp98YiK02o+cOyOmktVpQ="
   },
   {
     "pname": "Serilog.Enrichers.Thread",
     "version": "4.0.0",
     "hash": "sha256-lo+3ohNHKe/hTq9vGbk29p/OWcNlcyJToGL6EpCJQm8="
   },
+  {
+    "pname": "Serilog.Expressions",
+    "version": "5.0.0",
+    "hash": "sha256-xpAT8U0pzTvRGa/qBd2M3YOQDD1xgAHCMVN9NEz0L4E="
+  },
   {
     "pname": "Serilog.Extensions.Hosting",
-    "version": "8.0.0",
-    "hash": "sha256-OEVkEQoONawJF+SXeyqqgU0OGp9ubtt9aXT+rC25j4E="
+    "version": "9.0.0",
+    "hash": "sha256-bidr2foe7Dp4BJOlkc7ko0q6vt9ITG3IZ8b2BKRa0pw="
   },
   {
     "pname": "Serilog.Extensions.Logging",
-    "version": "8.0.0",
-    "hash": "sha256-GoWxCpkdahMvYd7ZrhwBxxTyjHGcs9ENNHJCp0la6iA="
+    "version": "9.0.0",
+    "hash": "sha256-aGkz1V4HVl0rWC1BkcnLhG1EC7WLBoT3tdLdUUTFXaw="
   },
   {
     "pname": "Serilog.Formatting.Compact",
-    "version": "2.0.0",
-    "hash": "sha256-c3STGleyMijY4QnxPuAz/NkJs1r+TZAPjlmAKLF4+3g="
+    "version": "3.0.0",
+    "hash": "sha256-nejEYqJEMG9P2iFZvbsCUPr5LZRtxbdUTLCI9N71jHY="
   },
   {
     "pname": "Serilog.Settings.Configuration",
-    "version": "8.0.4",
-    "hash": "sha256-00abT3H5COh5/A/tMYJwAZ37Mwa6jafVvW/nysLIbNQ="
+    "version": "9.0.0",
+    "hash": "sha256-Q/q5UiSrcxoy5a/orod20E2RfiRtHDhxjjGMe1dW35I="
   },
   {
     "pname": "Serilog.Sinks.Async",
@@ -811,13 +856,13 @@
   },
   {
     "pname": "Serilog.Sinks.Debug",
-    "version": "2.0.0",
-    "hash": "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="
+    "version": "3.0.0",
+    "hash": "sha256-7/LmoRF1rUDFhJ47bTRQQFRgSHnZDO8484r3sCGqYvE="
   },
   {
     "pname": "Serilog.Sinks.File",
-    "version": "6.0.0",
-    "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="
+    "version": "7.0.0",
+    "hash": "sha256-LxZYUoUPkCjIIVarJilnXnqQiMrFNJtoRilmzTNtUjo="
   },
   {
     "pname": "Serilog.Sinks.Graylog",
@@ -831,33 +876,38 @@
   },
   {
     "pname": "ShimSkiaSharp",
-    "version": "2.0.0.1",
-    "hash": "sha256-nnuebZfFeOHcyRsGKsqM1wmmN6sI1VXr7mbIep02AcA="
+    "version": "3.2.1",
+    "hash": "sha256-tWuNa23TYcJBttT2ajQiLowD3toEiIKw0uTqvAQvP58="
   },
   {
     "pname": "SkiaSharp",
     "version": "2.88.9",
     "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
   },
+  {
+    "pname": "SkiaSharp",
+    "version": "3.116.1",
+    "hash": "sha256-EQW/zjk+GsJbpJ3zqyGARh3oHep8XgneWXcSTNnYwuk="
+  },
   {
     "pname": "SkiaSharp.HarfBuzz",
-    "version": "2.88.9",
-    "hash": "sha256-JH8Jr25eftPfq0BztamvxfDcAZtnx/jLRj5DGCS5/G8="
+    "version": "3.116.1",
+    "hash": "sha256-GYu9itkxAJUmj7Z4etHGUvPLdtdNr+y0mcUauArRnhE="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Linux",
-    "version": "2.88.9",
-    "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
+    "version": "3.116.1",
+    "hash": "sha256-7u4tHVbYG4QhxatQf2g1Rkw0hmA+Ajy/7/6O4TRuUpo="
   },
   {
     "pname": "SkiaSharp.NativeAssets.macOS",
-    "version": "2.88.9",
-    "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
+    "version": "3.116.1",
+    "hash": "sha256-GntlOA+Blrh43l97gHP7sZl4HY0+Hx84xId3+YTXLCE="
   },
   {
     "pname": "SkiaSharp.NativeAssets.Win32",
-    "version": "2.88.9",
-    "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
+    "version": "3.116.1",
+    "hash": "sha256-oraulwAja3vee2T2n9sEveSTVI8/Kvku7r09yXLENI4="
   },
   {
     "pname": "SmartAnalyzers.MultithreadingAnalyzer",
@@ -866,23 +916,23 @@
   },
   {
     "pname": "SQLitePCLRaw.bundle_e_sqlite3",
-    "version": "2.1.6",
-    "hash": "sha256-dZD/bZsYXjOu46ZH5Y/wgh0uhHOqIxC+S+0ecKhr718="
+    "version": "2.1.10",
+    "hash": "sha256-kZIWjH/TVTXRIsHPZSl7zoC4KAMBMWmgFYGLrQ15Occ="
   },
   {
     "pname": "SQLitePCLRaw.core",
-    "version": "2.1.6",
-    "hash": "sha256-RxWjm52PdmMV98dgDy0BCpF988+BssRZUgALLv7TH/E="
+    "version": "2.1.10",
+    "hash": "sha256-gpZcYwiJVCVwCyJu0R6hYxyMB39VhJDmYh9LxcIVAA8="
   },
   {
     "pname": "SQLitePCLRaw.lib.e_sqlite3",
-    "version": "2.1.6",
-    "hash": "sha256-uHt5d+SFUkSd6WD7Tg0J3e8eVoxy/FM/t4PAkc9PJT0="
+    "version": "2.1.10",
+    "hash": "sha256-m2v2RQWol+1MNGZsx+G2N++T9BNtQGLLHXUjcwkdCnc="
   },
   {
     "pname": "SQLitePCLRaw.provider.e_sqlite3",
-    "version": "2.1.6",
-    "hash": "sha256-zHc/YZsd72eXlI8ba1tv58HZWUIiyjJaxq2CCP1hQe8="
+    "version": "2.1.10",
+    "hash": "sha256-MLs3jiETLZ7k/TgkHynZegCWuAbgHaDQKTPB0iNv7Fg="
   },
   {
     "pname": "StyleCop.Analyzers",
@@ -896,18 +946,18 @@
   },
   {
     "pname": "Svg.Custom",
-    "version": "2.0.0.1",
-    "hash": "sha256-ljkiz8xEaIMatjiGe49/LKBaPWR5D2/EY8CCNHZO4j4="
+    "version": "3.2.1",
+    "hash": "sha256-wp0BA9O/TBYbyEktdx//4Qs9J/EdzA4re/xyqBeVJKc="
   },
   {
     "pname": "Svg.Model",
-    "version": "2.0.0.1",
-    "hash": "sha256-ICYIWmoBMM+nuUPQQSbwM2xggPDL+VZUG2UsnotU8Qw="
+    "version": "3.2.1",
+    "hash": "sha256-eUK486QLBAv6x+oaoZmwdhwXI+9bEgmWSXMyJczN4Bw="
   },
   {
     "pname": "Svg.Skia",
-    "version": "2.0.0.1",
-    "hash": "sha256-3kGK9hc9BjaQu6u5mQ9heGKCDLpBDblgQ4VxRFLMa0Q="
+    "version": "3.2.1",
+    "hash": "sha256-XuMuYto6eVGu8kPybY4EbPmRS7xbA+6j5W6pyZFKMxc="
   },
   {
     "pname": "Swashbuckle.AspNetCore",
@@ -939,10 +989,15 @@
     "version": "4.3.0",
     "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
   },
+  {
+    "pname": "System.Buffers",
+    "version": "4.5.1",
+    "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI="
+  },
   {
     "pname": "System.CodeDom",
-    "version": "4.4.0",
-    "hash": "sha256-L1xyspJ8pDJNVPYKl+FMGf4Zwm0tlqtAyQCNW6pT6/0="
+    "version": "6.0.0",
+    "hash": "sha256-uPetUFZyHfxjScu5x4agjk9pIhbCkt5rG4Axj25npcQ="
   },
   {
     "pname": "System.Collections",
@@ -956,38 +1011,43 @@
   },
   {
     "pname": "System.Collections.Immutable",
-    "version": "6.0.0",
-    "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="
+    "version": "7.0.0",
+    "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk="
+  },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "9.0.0",
+    "hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac="
   },
   {
     "pname": "System.Composition",
-    "version": "6.0.0",
-    "hash": "sha256-H5TnnxOwihI0VyRuykbOWuKFSCWNN+MUEYyloa328Nw="
+    "version": "7.0.0",
+    "hash": "sha256-YjhxuzuVdAzRBHNQy9y/1ES+ll3QtLcd2o+o8wIyMao="
   },
   {
     "pname": "System.Composition.AttributedModel",
-    "version": "6.0.0",
-    "hash": "sha256-03DR8ecEHSKfgzwuTuxtsRW0Gb7aQtDS4LAYChZdGdc="
+    "version": "7.0.0",
+    "hash": "sha256-3s52Dyk2J66v/B4LLYFBMyXl0I8DFDshjE+sMjW4ubM="
   },
   {
     "pname": "System.Composition.Convention",
-    "version": "6.0.0",
-    "hash": "sha256-a3DZS8CT2kV8dVpGxHKoP5wHVKsT+kiPJixckpYfdQo="
+    "version": "7.0.0",
+    "hash": "sha256-N4MkkBXSQkcFKsEdcSe6zmyFyMmFOHmI2BNo3wWxftk="
   },
   {
     "pname": "System.Composition.Hosting",
-    "version": "6.0.0",
-    "hash": "sha256-fpoh6WBNmaHEHszwlBR/TNjd85lwesfM7ZkQhqYtLy4="
+    "version": "7.0.0",
+    "hash": "sha256-7liQGMaVKNZU1iWTIXvqf0SG8zPobRoLsW7q916XC3M="
   },
   {
     "pname": "System.Composition.Runtime",
-    "version": "6.0.0",
-    "hash": "sha256-nGZvg2xYhhazAjOjhWqltBue+hROKP0IOiFGP8yMBW8="
+    "version": "7.0.0",
+    "hash": "sha256-Oo1BxSGLETmdNcYvnkGdgm7JYAnQmv1jY0gL0j++Pd0="
   },
   {
     "pname": "System.Composition.TypedParts",
-    "version": "6.0.0",
-    "hash": "sha256-4uAETfmL1CvGjHajzWowsEmJgTKnuFC8u9lbYPzAN3k="
+    "version": "7.0.0",
+    "hash": "sha256-6ZzNdk35qQG3ttiAi4OXrihla7LVP+y2fL3bx40/32s="
   },
   {
     "pname": "System.Diagnostics.Debug",
@@ -999,11 +1059,6 @@
     "version": "4.3.0",
     "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
   },
-  {
-    "pname": "System.Diagnostics.DiagnosticSource",
-    "version": "8.0.0",
-    "hash": "sha256-+aODaDEQMqla5RYZeq0Lh66j+xkPYxykrVvSCmJQ+Vs="
-  },
   {
     "pname": "System.Diagnostics.Tracing",
     "version": "4.3.0",
@@ -1011,8 +1066,8 @@
   },
   {
     "pname": "System.Drawing.Common",
-    "version": "8.0.8",
-    "hash": "sha256-u/u0US7c0dfB8TmIdN+AI2GKrWUguuEmEKMGx7NLIKE="
+    "version": "9.0.2",
+    "hash": "sha256-S7IMV4R/nWbZs/YCwI9UwwLHDP57NkfSEIaoYNbRq54="
   },
   {
     "pname": "System.Globalization",
@@ -1046,8 +1101,8 @@
   },
   {
     "pname": "System.IO.Pipelines",
-    "version": "6.0.3",
-    "hash": "sha256-v+FOmjRRKlDtDW6+TfmyMiiki010YGVTa0EwXu9X7ck="
+    "version": "7.0.0",
+    "hash": "sha256-W2181khfJUTxLqhuAVRhCa52xZ3+ePGOLIPwEN8WisY="
   },
   {
     "pname": "System.Linq",
@@ -1056,14 +1111,19 @@
   },
   {
     "pname": "System.Linq.Async",
-    "version": "6.0.1",
-    "hash": "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI="
+    "version": "6.0.3",
+    "hash": "sha256-i+2XnsOJnD7R/vCFtadp+lwrkDNAscANes2Ur0MSTl8="
   },
   {
     "pname": "System.Memory",
     "version": "4.5.3",
     "hash": "sha256-Cvl7RbRbRu9qKzeRBWjavUkseT2jhZBUWV1SPipUWFk="
   },
+  {
+    "pname": "System.Memory",
+    "version": "4.5.5",
+    "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
+  },
   {
     "pname": "System.Net.Http",
     "version": "4.3.4",
@@ -1074,6 +1134,16 @@
     "version": "4.3.0",
     "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="
   },
+  {
+    "pname": "System.Numerics.Vectors",
+    "version": "4.4.0",
+    "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
+  },
+  {
+    "pname": "System.Numerics.Vectors",
+    "version": "4.5.0",
+    "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
+  },
   {
     "pname": "System.Private.Uri",
     "version": "4.3.0",
@@ -1086,8 +1156,13 @@
   },
   {
     "pname": "System.Reflection.Metadata",
-    "version": "6.0.1",
-    "hash": "sha256-id27sU4qIEIpgKenO5b4IHt6L1XuNsVe4TR9TKaLWDo="
+    "version": "7.0.0",
+    "hash": "sha256-GwAKQhkhPBYTqmRdG9c9taqrKSKDwyUgOEhWLKxWNPI="
+  },
+  {
+    "pname": "System.Reflection.Metadata",
+    "version": "9.0.0",
+    "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ="
   },
   {
     "pname": "System.Reflection.Primitives",
@@ -1109,6 +1184,11 @@
     "version": "4.4.0",
     "hash": "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig="
   },
+  {
+    "pname": "System.Runtime.CompilerServices.Unsafe",
+    "version": "4.5.3",
+    "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="
+  },
   {
     "pname": "System.Runtime.CompilerServices.Unsafe",
     "version": "6.0.0",
@@ -1186,14 +1266,19 @@
   },
   {
     "pname": "System.Text.Encoding.CodePages",
-    "version": "6.0.0",
-    "hash": "sha256-nGc2A6XYnwqGcq8rfgTRjGr+voISxNe/76k2K36coj4="
+    "version": "7.0.0",
+    "hash": "sha256-eCKTVwumD051ZEcoJcDVRGnIGAsEvKpfH3ydKluHxmo="
   },
   {
     "pname": "System.Text.Encoding.CodePages",
     "version": "8.0.0",
     "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="
   },
+  {
+    "pname": "System.Text.Encoding.CodePages",
+    "version": "9.0.10",
+    "hash": "sha256-Y0flSC4lgyKW9VulNCal1VBzt80LFuPEK3DRWKgPsjA="
+  },
   {
     "pname": "System.Text.Encoding.Extensions",
     "version": "4.3.0",
@@ -1201,8 +1286,13 @@
   },
   {
     "pname": "System.Text.Json",
-    "version": "8.0.5",
-    "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="
+    "version": "7.0.3",
+    "hash": "sha256-aSJZ17MjqaZNQkprfxm/09LaCoFtpdWmqU9BTROzWX4="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "9.0.10",
+    "hash": "sha256-wqeobpRw3PqOw21q8oGvauj5BkX1pS02Cm78E6c742w="
   },
   {
     "pname": "System.Threading",
@@ -1211,8 +1301,8 @@
   },
   {
     "pname": "System.Threading.Channels",
-    "version": "6.0.0",
-    "hash": "sha256-klGYnsyrjvXaGeqgfnMf/dTAMNtcHY+zM4Xh6v2JfuE="
+    "version": "7.0.0",
+    "hash": "sha256-Cu0gjQsLIR8Yvh0B4cOPJSYVq10a+3F9pVz/C43CNeM="
   },
   {
     "pname": "System.Threading.Tasks",
@@ -1221,8 +1311,13 @@
   },
   {
     "pname": "System.Threading.Tasks.Dataflow",
-    "version": "8.0.1",
-    "hash": "sha256-hgCfF91BDd/eOtLEd5jhjzgJdvwmVv4/b42fXRr3nvo="
+    "version": "9.0.10",
+    "hash": "sha256-V3UjIEGn9Yrl/DQoKeEVg9pDpp4iNz8r9+WmQ09R1bg="
+  },
+  {
+    "pname": "System.Threading.Tasks.Extensions",
+    "version": "4.5.4",
+    "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng="
   },
   {
     "pname": "TagLibSharp",
@@ -1231,8 +1326,8 @@
   },
   {
     "pname": "TMDbLib",
-    "version": "2.2.0",
-    "hash": "sha256-r4yV7t/biDORVYP0Go6KSSmNIVRn6IuFQ+Okt8GPvbY="
+    "version": "2.3.0",
+    "hash": "sha256-PVlZ+6dSLxrE4+QOTfXofK6gaU22eAVuh0lC3I96cKE="
   },
   {
     "pname": "Ude.NetStandard",
@@ -1244,10 +1339,15 @@
     "version": "2.5.1",
     "hash": "sha256-9D6TqKSPsjzSly0mtUGZJbrNAJ7ftz9LJjWNwnnQMz4="
   },
+  {
+    "pname": "UTF.Unknown",
+    "version": "2.6.0",
+    "hash": "sha256-cm3anHxu/tL+xMJ55vDoISmCTJUwIiP+jMFTbl0pR5s="
+  },
   {
     "pname": "z440.atl.core",
-    "version": "6.20.0",
-    "hash": "sha256-8LdLU2wgdR21bEXTBw7+RdbLYBM0vHRZhKv2ZpiVL44="
+    "version": "7.5.0",
+    "hash": "sha256-denTZd9A4zV2Plg7PtRf6bc1gzXzxgTWPp1bs1NShwA="
   },
   {
     "pname": "zlib.net-mutliplatform",
diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix
index 8c241d5f237a..53dbebbb2b56 100644
--- a/pkgs/by-name/je/jellyfin/package.nix
+++ b/pkgs/by-name/je/jellyfin/package.nix
@@ -13,13 +13,13 @@
 
 buildDotnetModule rec {
   pname = "jellyfin";
-  version = "10.10.7"; # ensure that jellyfin-web has matching version
+  version = "10.11.0"; # ensure that jellyfin-web has matching version
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin";
     rev = "v${version}";
-    hash = "sha256-GWpzX8DvCafHb5V9it0ZPTXKm+NbLS7Oepe/CcMiFuI=";
+    hash = "sha256-8kvN2ZugmjjgSMepDdP9tc48362b6w+RpIsp/IXaivM=";
   };
 
   propagatedBuildInputs = [ sqlite ];
@@ -32,8 +32,8 @@ buildDotnetModule rec {
     fontconfig
     freetype
   ];
-  dotnet-sdk = dotnetCorePackages.sdk_8_0;
-  dotnet-runtime = dotnetCorePackages.aspnetcore_8_0;
+  dotnet-sdk = dotnetCorePackages.sdk_9_0;
+  dotnet-runtime = dotnetCorePackages.aspnetcore_9_0;
   dotnetBuildFlags = [ "--no-self-contained" ];
 
   makeWrapperArgs = [

From a905b1d8e129c3af9317f73e826b487f86e176dc Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 20 Oct 2025 11:19:41 +0300
Subject: [PATCH 1021/6226] nixos/systemd-initrd: fix eval under allowAliases =
 false

---
 nixos/modules/system/boot/systemd/initrd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix
index ba5f67058bd9..04c814b7ec6e 100644
--- a/nixos/modules/system/boot/systemd/initrd.nix
+++ b/nixos/modules/system/boot/systemd/initrd.nix
@@ -584,7 +584,7 @@ in
       ]
       ++ jobScripts
       ++ map (c: builtins.removeAttrs c [ "text" ]) (builtins.attrValues cfg.contents)
-      ++ lib.optional (pkgs.hostPlatform.libc == "glibc") "${pkgs.glibc}/lib/libnss_files.so.2";
+      ++ lib.optional (pkgs.stdenv.hostPlatform.libc == "glibc") "${pkgs.glibc}/lib/libnss_files.so.2";
 
       targets.initrd.aliases = [ "default.target" ];
       units =

From fa66960c3a66fd70e52e1510a37fae357921c0ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 08:39:23 +0000
Subject: [PATCH 1022/6226] pyenv: 2.6.8 -> 2.6.11

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

diff --git a/pkgs/by-name/py/pyenv/package.nix b/pkgs/by-name/py/pyenv/package.nix
index 028ee095e689..2b665619c36a 100644
--- a/pkgs/by-name/py/pyenv/package.nix
+++ b/pkgs/by-name/py/pyenv/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pyenv";
-  version = "2.6.8";
+  version = "2.6.11";
 
   src = fetchFromGitHub {
     owner = "pyenv";
     repo = "pyenv";
     tag = "v${version}";
-    hash = "sha256-/rIuFjClGqpZUm91G2fCe05KamlTEHqPs7BUgC+Fgbk=";
+    hash = "sha256-8k4R7Ctxa+9tb2fcfls4mqrTUR4wmP4zxJJInr0Q+oo=";
   };
 
   nativeBuildInputs = [

From 2a834de6bed7aa92bc06443beed6b2bdd39a7aee Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Wed, 1 Oct 2025 19:36:52 +0200
Subject: [PATCH 1023/6226] harper: 0.65.0 -> 0.66.0

Changelog: https://github.com/Automattic/harper/releases/tag/v0.66.0
Diff: https://github.com/Automattic/harper/compare/v0.65.0...v0.66.0
---
 pkgs/by-name/ha/harper/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index fea0e094595c..16a0272d38bb 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "harper";
-  version = "0.65.0";
+  version = "0.66.0";
 
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
     rev = "v${version}";
-    hash = "sha256-y2oYEJTZWZ7Rc7ZLjYUh3Cy9dtznGLhIXzJ6D0JUIGw=";
+    hash = "sha256-b4KGpW+Axtd0JMxdGuW7UK8GD2WxiDQpjQo1qnzMI0Q=";
   };
 
   buildAndTestSubdir = "harper-ls";
 
-  cargoHash = "sha256-o6RFBCvPn3AH3mMI3guHziqOcYN99o8yk5b6VXWoepI=";
+  cargoHash = "sha256-5zs4jh7o0ROl82eIOyscmaQv42kKJSVO0LD/VkmzQw4=";
 
   passthru.updateScript = nix-update-script { };
 

From 15686a5fadc9ca1171380c54936988c797107d84 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Tue, 7 Oct 2025 09:04:20 +0200
Subject: [PATCH 1024/6226] harper: 0.66.0 -> 0.67.0

Changelog: https://github.com/Automattic/harper/releases/tag/v0.67.0
Diff: https://github.com/Automattic/harper/compare/v0.66.0...v0.67.0
---
 pkgs/by-name/ha/harper/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index 16a0272d38bb..8a7195ae1107 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "harper";
-  version = "0.66.0";
+  version = "0.67.0";
 
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
     rev = "v${version}";
-    hash = "sha256-b4KGpW+Axtd0JMxdGuW7UK8GD2WxiDQpjQo1qnzMI0Q=";
+    hash = "sha256-PqMThAZyImufW6i+OBzUPGIGyKwX9F6dNCoVPsjFom0=";
   };
 
   buildAndTestSubdir = "harper-ls";
 
-  cargoHash = "sha256-5zs4jh7o0ROl82eIOyscmaQv42kKJSVO0LD/VkmzQw4=";
+  cargoHash = "sha256-0ksfMkDUIwSSKaNQZAb+tZYes2YoAih6niBJ4mm0icE=";
 
   passthru.updateScript = nix-update-script { };
 

From 3671f9ddb7a87951b9d61a679d1b971ef0488494 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Thu, 16 Oct 2025 09:57:35 +0200
Subject: [PATCH 1025/6226] harper: 0.67.0 -> 0.68.0

Changelog: https://github.com/Automattic/harper/releases/tag/v0.68.0
Diff: https://github.com/Automattic/harper/compare/v0.67.0...v0.68.0
---
 .../vscode/extensions/elijah-potter.harper/default.nix      | 2 +-
 pkgs/by-name/ha/harper/package.nix                          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix
index 93e87a47131c..b080f2fa1ad2 100644
--- a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix
@@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     name = "harper";
     publisher = "elijah-potter";
     version = harper.version;
-    hash = "sha256-m9PN1BZf6rLrNnX8meX2TjGx8zGLl0GgnHEgQirh9Oc=";
+    hash = "sha256-kWO3Gd2g5IsMCg+rvlQ3LpU/g5hUrpCsg3+vmOO0mnA=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index 8a7195ae1107..4fd9bff2db9a 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "harper";
-  version = "0.67.0";
+  version = "0.68.0";
 
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
     rev = "v${version}";
-    hash = "sha256-PqMThAZyImufW6i+OBzUPGIGyKwX9F6dNCoVPsjFom0=";
+    hash = "sha256-NYbTz/+APVGU8P0edXz84YBbBWBc8k7rhDXpRxH7Pjc=";
   };
 
   buildAndTestSubdir = "harper-ls";
 
-  cargoHash = "sha256-0ksfMkDUIwSSKaNQZAb+tZYes2YoAih6niBJ4mm0icE=";
+  cargoHash = "sha256-3Vk8nQPUxD1D6AG6PjJwju5xolvfVucfYL9i6l9atOk=";
 
   passthru.updateScript = nix-update-script { };
 

From 5ef307306dd0d4228347e30f7be38b4820ac4f04 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 09:06:47 +0000
Subject: [PATCH 1026/6226] vscode-extensions.ms-python.debugpy: 2025.10.0 ->
 2025.14.1

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

diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix
index 9e7d22319a7d..8f1704c5f510 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "debugpy";
     publisher = "ms-python";
-    version = "2025.10.0";
-    hash = "sha256-NDCNiKLCU7/2VH43eTyOMBTZ3oxzA7JwCBit9+JHfmY=";
+    version = "2025.14.1";
+    hash = "sha256-zmIv93uKBxgyI1cYh9WeF2g8ujm0Z++eoLN01aXaDF8=";
   };
 
   meta = {

From 478092acd73a7f35b7fac3fbd4808bf4d6763462 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 09:20:43 +0000
Subject: [PATCH 1027/6226] code-cursor: 1.7.38 -> 1.7.52

---
 pkgs/by-name/co/code-cursor/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix
index 553c3235aaa0..c0b420dc2d94 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -16,20 +16,20 @@ let
 
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/fe5d1728063e86edeeda5bebd2c8e14bf4d0f96a/linux/x64/Cursor-1.7.38-x86_64.AppImage";
-      hash = "sha256-52QJVbXO3CYeL4vVZ249xabS7AoYFDOxKCQ6m3vB+vE=";
+      url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/linux/x64/Cursor-1.7.52-x86_64.AppImage";
+      hash = "sha256-nhDDdXE5/m9uASiQUJ4GHfApkzkf9ju5b8s0h6BhpjQ=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/fe5d1728063e86edeeda5bebd2c8e14bf4d0f96a/linux/arm64/Cursor-1.7.38-aarch64.AppImage";
-      hash = "sha256-4yUjLAiC7wZYYmAnVNUbRuvLBrpAfC/Kb9y/nONtwkM=";
+      url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/linux/arm64/Cursor-1.7.52-aarch64.AppImage";
+      hash = "sha256-96zL0pmcrEyDEy8oW2qWk6RM8XGE4Gd2Aa3Hhq0qvk0=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/fe5d1728063e86edeeda5bebd2c8e14bf4d0f96a/darwin/x64/Cursor-darwin-x64.dmg";
-      hash = "sha256-x56I8XaOvFK7GDlfyAHD18DdUwZrKf7hlXAROplqKU0=";
+      url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/darwin/x64/Cursor-darwin-x64.dmg";
+      hash = "sha256-0//Sv57iEgRm/exnUnKVpdyk6fwxAnx0PDg2mVaB9J8=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/fe5d1728063e86edeeda5bebd2c8e14bf4d0f96a/darwin/arm64/Cursor-darwin-arm64.dmg";
-      hash = "sha256-14H1jvVmSsywkFm6M3BFLAwUzorehrbVvo9OJo6cEdk=";
+      url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/darwin/arm64/Cursor-darwin-arm64.dmg";
+      hash = "sha256-g8Fk9+MDwzLTNitxJMApypfiLWEjze0PR2OIPC774j8=";
     };
   };
 
@@ -39,7 +39,7 @@ in
   inherit useVSCodeRipgrep;
   commandLineArgs = finalCommandLineArgs;
 
-  version = "1.7.38";
+  version = "1.7.52";
   pname = "cursor";
 
   # You can find the current VSCode version in the About dialog:

From 568016064be73a08fa2e2926bd5370be97736291 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 06:28:34 -0300
Subject: [PATCH 1028/6226] xpwn: fix build with cmake4

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

diff --git a/pkgs/by-name/xp/xpwn/package.nix b/pkgs/by-name/xp/xpwn/package.nix
index 24f2e9eb1e52..31c4d8d825c6 100644
--- a/pkgs/by-name/xp/xpwn/package.nix
+++ b/pkgs/by-name/xp/xpwn/package.nix
@@ -51,6 +51,11 @@ stdenv.mkDerivation {
     openssl
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     broken = stdenv.hostPlatform.isDarwin;
     homepage = "http://planetbeing.lighthouseapp.com/projects/15246-xpwn";

From 991737f6e9845340ce6bdaccaa485fd36b5da656 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 06:38:47 -0300
Subject: [PATCH 1029/6226] xeus-cling: fix build with cmake4

---
 .../editors/jupyter-kernels/xeus-cling/xeus-cling.nix          | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix
index 843f4a07b71d..6c3d0acd67d4 100644
--- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix
+++ b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix
@@ -94,6 +94,9 @@ clangStdenv.mkDerivation rec {
       --replace-fail "simplisticCastAs" "castAs"
     substituteInPlace src/xmime_internal.hpp \
       --replace-fail "code.str()" "code.str().str()"
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.4.3)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   dontStrip = debug;

From d0125c4ba1deaa10e78e64b39a937f8267fd94fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 09:47:57 +0000
Subject: [PATCH 1030/6226] immich-public-proxy: 1.13.2 -> 1.13.7

---
 pkgs/by-name/im/immich-public-proxy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix
index b8efe38c1b14..66bdb472f9e3 100644
--- a/pkgs/by-name/im/immich-public-proxy/package.nix
+++ b/pkgs/by-name/im/immich-public-proxy/package.nix
@@ -8,17 +8,17 @@
 }:
 buildNpmPackage rec {
   pname = "immich-public-proxy";
-  version = "1.13.2";
+  version = "1.13.7";
   src = fetchFromGitHub {
     owner = "alangrainger";
     repo = "immich-public-proxy";
     tag = "v${version}";
-    hash = "sha256-AoRqlTEwcS+RhN59/opqlYAftihmN20mW6Vn6RbLzSw=";
+    hash = "sha256-XENy/zmH4UzUaqE4doiSNmTrbrsTMrd/hlhbanEhg6k=";
   };
 
   sourceRoot = "${src.name}/app";
 
-  npmDepsHash = "sha256-ZH1D0Q5SCoOwr8CLe2HLMy4xJoO3VLha4MfE9fBmhec=";
+  npmDepsHash = "sha256-T3YPIvK5h3XmCTLybzY1fhjlB2u2fLdeOHiGbT3Xgd4=";
 
   # patch in absolute nix store paths so the process doesn't need to cwd in $out
   postPatch = ''

From 82d86e6b79fc89eb6c64922f716d090ebdf6b926 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 09:58:14 +0000
Subject: [PATCH 1031/6226] python3Packages.docling-core: 2.48.4 -> 2.49.0

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

diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix
index 946c08e01cab..e50704fd8598 100644
--- a/pkgs/development/python-modules/docling-core/default.nix
+++ b/pkgs/development/python-modules/docling-core/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "docling-core";
-  version = "2.48.4";
+  version = "2.49.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "docling-project";
     repo = "docling-core";
     tag = "v${version}";
-    hash = "sha256-nGV0/8lL+JCGml8TF8+wBRax4WsAXQ0+f8fzy5k2gZI=";
+    hash = "sha256-c/uU5qeoCXNuMJwsG/Z2+M4N+M8j66fuiSr461on8Aw=";
   };
 
   build-system = [

From 15221dae1f4f8bdcf9caa7564eaaf2eea8e75884 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Wed, 8 Oct 2025 18:53:36 -0600
Subject: [PATCH 1032/6226] comaps: 2025.08.31-15 -> 2025.10.16-1

https://codeberg.org/comaps/comaps/releases/tag/v2025.10.16-1
Diff: https://codeberg.org/comaps/comaps/compare/v2025.08.31-15...v2025.10.16-1
---
 pkgs/by-name/co/comaps/package.nix            | 29 ++++++++++------
 pkgs/by-name/co/comaps/remove-lto.patch       |  8 ++---
 .../co/comaps/use-vendored-protobuf.patch     | 34 +++++++++++++++++--
 3 files changed, 55 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/co/comaps/package.nix b/pkgs/by-name/co/comaps/package.nix
index dd96be7b040b..be08d8e2d773 100644
--- a/pkgs/by-name/co/comaps/package.nix
+++ b/pkgs/by-name/co/comaps/package.nix
@@ -15,28 +15,35 @@
   nix-update-script,
 }:
 let
-  mapRev = 250822;
+  # https://codeberg.org/comaps/comaps/src/branch/main/data/countries.txt
+  mapRev = 250906;
 
   worldMap = fetchurl {
     url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/World.mwm";
-    hash = "sha256-OksUAix8yw0WQiJUwfMrjOCd/OwuRjdCOUjjGpnG2S8=";
+    hash = "sha256-0LjCDVk3vShmn+yHc/SvfJzrj170pO52CqbdKWqTsI4=";
   };
 
   worldCoasts = fetchurl {
     url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/WorldCoasts.mwm";
-    hash = "sha256-1OvKZJ3T/YJu6t/qTYliIVkwsT8toBSqGHUpDEk9i2k=";
+    hash = "sha256-2BP6ET8DM3v0KMlzYx+lS0l26WSONQpb4fCMri8Aj2o=";
   };
+
+  pythonEnv = python3.withPackages (
+    ps: with ps; [
+      protobuf
+    ]
+  );
 in
 organicmaps.overrideAttrs (oldAttrs: rec {
   pname = "comaps";
-  version = "2025.08.31-15";
+  version = "2025.10.16-1";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "comaps";
     repo = "comaps";
     tag = "v${version}";
-    hash = "sha256-uRShcyMevNb/UE5+l8UabiGSr9TccVWp5xVoqI7+Oh8=";
+    hash = "sha256-2pnAYc5Ru1OK7ecCN1kKryAPPdxUIGQp9x2y4MosRl8=";
     fetchSubmodules = true;
   };
 
@@ -50,14 +57,16 @@ organicmaps.overrideAttrs (oldAttrs: rec {
 
   postPatch = (oldAttrs.postPatch or "") + ''
     rm -f 3party/boost/b2
+    substituteInPlace configure.sh \
+      --replace-fail "git submodule update --init --recursive --depth 1" ""
+
+    patchShebangs tools/unix/generate_categories.sh
+    substituteInPlace tools/python/categories/json_to_txt.py \
+      --replace-fail "/usr/bin/env python3" "${pythonEnv.interpreter}"
   '';
 
   nativeBuildInputs = (builtins.filter (x: x != python3) oldAttrs.nativeBuildInputs or [ ]) ++ [
-    (python3.withPackages (
-      ps: with ps; [
-        protobuf
-      ]
-    ))
+    pythonEnv
     optipng
   ];
 
diff --git a/pkgs/by-name/co/comaps/remove-lto.patch b/pkgs/by-name/co/comaps/remove-lto.patch
index 8959eed2af12..a894f0079e8b 100644
--- a/pkgs/by-name/co/comaps/remove-lto.patch
+++ b/pkgs/by-name/co/comaps/remove-lto.patch
@@ -1,8 +1,8 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c559bf5..42ed617 100644
+index 3ba193a9..01e696e3 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -106,7 +106,7 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+@@ -104,7 +104,7 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "Debug")
  elseif (${CMAKE_BUILD_TYPE} MATCHES "Rel")
    add_definitions(-DRELEASE)
    if (NOT MSVC)
@@ -11,7 +11,7 @@ index c559bf5..42ed617 100644
    endif()
  else()
    message(FATAL_ERROR "Unknown build type: " ${CMAKE_BUILD_TYPE})
-@@ -116,19 +116,6 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
+@@ -114,19 +114,6 @@ if (${CMAKE_BUILD_TYPE} STREQUAL "RelWithDebInfo")
    add_compile_options(-fno-omit-frame-pointer)
  endif()
  
@@ -21,7 +21,7 @@ index c559bf5..42ed617 100644
 -  add_compile_options(-fno-fat-lto-objects)
 -  # To fix ar and ranlib "plugin needed to handle lto object".
 -  string(REGEX MATCH "[0-9]+" GCC_MAJOR_VERSION ${CMAKE_CXX_COMPILER_VERSION})
--  file(GLOB_RECURSE plugin /usr/lib/gcc/*/${GCC_MAJOR_VERSION}/liblto_plugin.so)
+-  file(GLOB_RECURSE plugin /usr/lib/gcc/*/${GCC_MAJOR_VERSION}*/liblto_plugin.so)
 -  set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
 -  set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> --plugin ${plugin} <TARGET>")
 -  set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> --plugin ${plugin} qcs <TARGET> <OBJECTS>")
diff --git a/pkgs/by-name/co/comaps/use-vendored-protobuf.patch b/pkgs/by-name/co/comaps/use-vendored-protobuf.patch
index 01527c53b2a8..01634f925256 100644
--- a/pkgs/by-name/co/comaps/use-vendored-protobuf.patch
+++ b/pkgs/by-name/co/comaps/use-vendored-protobuf.patch
@@ -1,5 +1,5 @@
 diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt
-index 5178ae0..abe103f 100644
+index dd851d7d..1b4e3ed3 100644
 --- a/3party/CMakeLists.txt
 +++ b/3party/CMakeLists.txt
 @@ -41,9 +41,6 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY)
@@ -21,4 +21,34 @@ index 5178ae0..abe103f 100644
 +
  add_subdirectory(agg)
  add_subdirectory(bsdiff-courgette)
- add_subdirectory(minizip)
+ add_subdirectory(glaze)
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 3ba193a9..dd2df855 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -225,25 +225,6 @@ endif()
+ # Used in qt/ and shaders/
+ find_package(Python3 REQUIRED COMPONENTS Interpreter)
+
+-execute_process(
+-    COMMAND ${Python3_EXECUTABLE} -c "import google.protobuf; 
+-print(google.protobuf.__version__)"
+-    RESULT_VARIABLE PROTOBUF_CHECK
+-    OUTPUT_VARIABLE PROTOBUF_VERSION
+-    OUTPUT_STRIP_TRAILING_WHITESPACE
+-    ERROR_QUIET
+-)
+-
+-if(PROTOBUF_CHECK EQUAL 0)
+-    if(PROTOBUF_VERSION VERSION_LESS "4.0.0")
+-        message(STATUS "Python protobuf ${PROTOBUF_VERSION} found (< 4.0)")
+-    else()
+-        message(FATAL_ERROR "Python protobuf ${PROTOBUF_VERSION} found, but version < 4.0 required")
+-    endif()
+-else()
+-    message(FATAL_ERROR "Python protobuf not found. Install version <4.0")
+-endif()
+-
+
+ add_subdirectory(libs)
+

From 470d48fc2db23e93cd5161bb5758b318a99fdd7a Mon Sep 17 00:00:00 2001
From: zapashcanon <leo@ndrs.fr>
Date: Wed, 8 Oct 2025 00:05:38 +0200
Subject: [PATCH 1033/6226] team/ocaml: add redianthus

---
 maintainers/team-list.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index cb0c001ccd8b..5ef3b72ab671 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -982,7 +982,10 @@ with lib.maintainers;
   };
 
   ocaml = {
-    members = [ alizter ];
+    members = [
+      alizter
+      redianthus
+    ];
     github = "ocaml";
     scope = "Maintain the OCaml compiler and package set.";
     shortName = "OCaml";

From a0b0d45405afccfbc30663dfefc1b10a250712cf Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 08:07:44 -0300
Subject: [PATCH 1034/6226] vobsub2srt: fix build with cmake4

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

diff --git a/pkgs/by-name/vo/vobsub2srt/package.nix b/pkgs/by-name/vo/vobsub2srt/package.nix
index 71ec2ceb2d68..753617b8ad91 100644
--- a/pkgs/by-name/vo/vobsub2srt/package.nix
+++ b/pkgs/by-name/vo/vobsub2srt/package.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation {
   buildInputs = [ libtiff ];
   propagatedBuildInputs = [ tesseract3 ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6.4 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     homepage = "https://github.com/ruediger/VobSub2SRT";
     description = "Converts VobSub subtitles into SRT subtitles";

From 3f97ef02c809c90ed58b0eb004fd9d04caff4cc5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 20 Oct 2025 13:32:26 +0200
Subject: [PATCH 1035/6226] python313Packages.iamdata: 0.1.202510191 ->
 0.1.202510201

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202510191...v0.1.202510201

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

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index f1ba73092291..986d4bd3711b 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202510191";
+  version = "0.1.202510201";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-sMKlZGaEkzoOhpAOsKBqSUDRe6j7iL2sBivABSCAEA8=";
+    hash = "sha256-E9yFns1sRSyiFqQA3jXTSvMK7a7nj/UfUFUzh1PlUhM=";
   };
 
   build-system = [ hatchling ];

From 0591610ec595a48d14e2d801d498c1a7029a6375 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 11:35:07 +0000
Subject: [PATCH 1036/6226] ollama: 0.12.5 -> 0.12.6

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

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

From d30922c2f19452944308d823c37a08784f176ba4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 11:36:59 +0000
Subject: [PATCH 1037/6226] linyaps-box: 2.1.1 -> 2.1.2

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

diff --git a/pkgs/by-name/li/linyaps-box/package.nix b/pkgs/by-name/li/linyaps-box/package.nix
index b57881eec8bb..00bb109c0759 100644
--- a/pkgs/by-name/li/linyaps-box/package.nix
+++ b/pkgs/by-name/li/linyaps-box/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "linyaps-box";
-  version = "2.1.1";
+  version = "2.1.2";
 
   src = fetchFromGitHub {
     owner = "OpenAtom-Linyaps";
     repo = "linyaps-box";
     rev = finalAttrs.version;
-    hash = "sha256-h7tbjIcVgwTw3SLGzJzG17WpDdsCqHD4AXvAFEiwesw=";
+    hash = "sha256-i4wSddstCosDpBEcunoVsV464PTHmuvDDEFrsPQKnxU=";
   };
 
   nativeBuildInputs = [

From e8acdb2a18494f9303fa486843040fbfa6bf0152 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 11:39:22 +0000
Subject: [PATCH 1038/6226] netbird-dashboard: 2.19.2 -> 2.20.1

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

diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix
index f9e0aa17698e..f07f06a96b5b 100644
--- a/pkgs/by-name/ne/netbird-dashboard/package.nix
+++ b/pkgs/by-name/ne/netbird-dashboard/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "netbird-dashboard";
-  version = "2.19.2";
+  version = "2.20.1";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "dashboard";
     rev = "v${version}";
-    hash = "sha256-3rHNk/rc0j5mWF2jbrMOtFrDkosph1YWnFoh1lLHTPs=";
+    hash = "sha256-RvnoQRVJlZNqfmOa2c1s/ZuA0Ej7pZ7WcXM+31t22eY=";
   };
 
-  npmDepsHash = "sha256-pC4Vvkb+NAGyhd090LAeGZTLVGufnC9LylJGQt8aEZg=";
+  npmDepsHash = "sha256-93w0ZWtrLfYRBa5Ps4duSRoiI4hu9AoK7GZRRH4zmL0=";
   npmFlags = [ "--legacy-peer-deps" ];
 
   installPhase = ''

From 24d95540e1c48087d3d6fc5b5f78c57729ec73d0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Mon, 20 Oct 2025 13:48:07 +0200
Subject: [PATCH 1039/6226] trufflehog: 3.90.9 -> 3.90.11

Diff: https://github.com/trufflesecurity/trufflehog/compare/v3.90.9...v3.90.11

Changelog: https://github.com/trufflesecurity/trufflehog/releases/tag/v3.90.11
---
 pkgs/by-name/tr/trufflehog/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix
index 4d5a074dc4f9..fd83c2e7ef11 100644
--- a/pkgs/by-name/tr/trufflehog/package.nix
+++ b/pkgs/by-name/tr/trufflehog/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "trufflehog";
-  version = "3.90.9";
+  version = "3.90.11";
 
   src = fetchFromGitHub {
     owner = "trufflesecurity";
     repo = "trufflehog";
     tag = "v${version}";
-    hash = "sha256-XxFgki6haUbfHkhOMuYJW8zNBsJ6a8Rir7s6GqLTbho=";
+    hash = "sha256-X2mqmUjdKHIp/w393hLvD6k7LTBIY9FEb1fI+SckIe4=";
   };
 
-  vendorHash = "sha256-pP8dT211fq/y5Z0poLqJngCY45ba1vJilmkpgnCUHhY=";
+  vendorHash = "sha256-XTjKaRNqSnyLVag5/nBMmKZ6XeTDmd03ujeeMCJCB9Y=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 8a9fa0f5e3d37ec8330d175bdf384949ffff69b7 Mon Sep 17 00:00:00 2001
From: sugar <sugar@sugar.lgbt>
Date: Mon, 8 Sep 2025 09:50:30 +0200
Subject: [PATCH 1040/6226] iocaine: init at 2.5.1

---
 pkgs/by-name/io/iocaine/package.nix | 32 +++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pkgs/by-name/io/iocaine/package.nix

diff --git a/pkgs/by-name/io/iocaine/package.nix b/pkgs/by-name/io/iocaine/package.nix
new file mode 100644
index 000000000000..94d2822207dd
--- /dev/null
+++ b/pkgs/by-name/io/iocaine/package.nix
@@ -0,0 +1,32 @@
+{
+  stdenv,
+  lib,
+  rustPlatform,
+  fetchFromGitea,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "iocaine";
+  version = "2.5.1";
+
+  src = fetchFromGitea {
+    domain = "git.madhouse-project.org";
+    owner = "iocaine";
+    repo = "iocaine";
+    tag = "iocaine-${version}";
+    hash = "sha256-213QLpGBKSsT9r8O27PyMom5+OGPz0VtRBevxswISZA=";
+  };
+
+  cargoHash = "sha256-EgPGDlJX/m+v3f/tGIO+saGHoYrtiWLZuMlXEvsgnxE=";
+
+  meta = {
+    description = "Deadliest poison known to AI";
+    homepage = "https://iocaine.madhouse-project.org/";
+    changelog = "https://git.madhouse-project.org/iocaine/iocaine/src/tag/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sugar700 ];
+    mainProgram = "iocaine";
+    # Lacking OS access to fix, and upstream doesn't support macOS.
+    broken = stdenv.hostPlatform.isDarwin;
+  };
+}

From f420087133046d2e2f30c0906cdae41a466c1595 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 09:28:35 -0300
Subject: [PATCH 1041/6226] uvcdynctrl: fix build with cmake4

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

diff --git a/pkgs/by-name/uv/uvcdynctrl/package.nix b/pkgs/by-name/uv/uvcdynctrl/package.nix
index a369d9941bc9..33afb27143e7 100644
--- a/pkgs/by-name/uv/uvcdynctrl/package.nix
+++ b/pkgs/by-name/uv/uvcdynctrl/package.nix
@@ -39,6 +39,15 @@ stdenv.mkDerivation {
     done
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace libwebcam/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace uvcdynctrl/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   doInstallCheck = true;
 
   meta = with lib; {

From 15e6ddd530669fbe5d5be67106ad9c00d2b494db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 12:56:27 +0000
Subject: [PATCH 1042/6226] armadillo: 15.0.3 -> 15.2.0

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

diff --git a/pkgs/by-name/ar/armadillo/package.nix b/pkgs/by-name/ar/armadillo/package.nix
index f81a7db70d85..6129fd149edf 100644
--- a/pkgs/by-name/ar/armadillo/package.nix
+++ b/pkgs/by-name/ar/armadillo/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "armadillo";
-  version = "15.0.3";
+  version = "15.2.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    hash = "sha256-n1XsEPCpH7ZHmrTtKzelJEWu6RdwaiONFwtSIMAi/kM=";
+    hash = "sha256-L3HAZh/EpG4t1Wt2Uc87tZKLSZpLEN8x78GkJB7fAEM=";
   };
 
   nativeBuildInputs = [ cmake ];

From 7e0958e5b51d0160d41fd9f659b3f7369be26c46 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 13:13:07 +0000
Subject: [PATCH 1043/6226] pmtiles: 1.28.1 -> 1.28.2

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

diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix
index cca23b28c474..d5c616ba726f 100644
--- a/pkgs/by-name/pm/pmtiles/package.nix
+++ b/pkgs/by-name/pm/pmtiles/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "pmtiles";
-  version = "1.28.1";
+  version = "1.28.2";
 
   src = fetchFromGitHub {
     owner = "protomaps";
     repo = "go-pmtiles";
     tag = "v${version}";
-    hash = "sha256-Ti6ljJeC6hqA5edzyUqOShBIbdmrsz4TDnQ44TMJQ8Q=";
+    hash = "sha256-JGsbgBB2T+4SWKQmiSmuMqQ8gw0qhM5c5eFDF/+sndA=";
   };
 
-  vendorHash = "sha256-kfEzpaFMf0W8Ygtl40LBy3AZQSL+9Uo+n2x9OTOavqk=";
+  vendorHash = "sha256-XRx9Qe7tTQAPJJdj9yEU0YAFjvl+4jW/XQy2MYFApds=";
 
   ldflags = [
     "-s"

From e5f1910c0a0185a7ad54a1dca1e27bfc3b67239f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 13:56:59 +0000
Subject: [PATCH 1044/6226] jwx: 3.0.11 -> 3.0.12

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

diff --git a/pkgs/by-name/jw/jwx/package.nix b/pkgs/by-name/jw/jwx/package.nix
index a8e329064aac..1916fb6a4e54 100644
--- a/pkgs/by-name/jw/jwx/package.nix
+++ b/pkgs/by-name/jw/jwx/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "jwx";
-  version = "3.0.11";
+  version = "3.0.12";
 
   src = fetchFromGitHub {
     owner = "lestrrat-go";
     repo = "jwx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TGB6dMybvMH/mXlNwnj63kOrj56mbEFTQSVfphnQJfY=";
+    hash = "sha256-8TUme6YezwVkRYenSNaVZjC4TNq7kUV7wbIhWFQ/AR0=";
   };
 
   vendorHash = "sha256-7lMvSwLi588UBI31YDi/VqyAqwUjWUwjOZbxE3fZQWU=";

From fedfddc5c4d4d801035f11c35150a20e7b168b83 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 21 Aug 2025 17:17:05 -0400
Subject: [PATCH 1045/6226] moor: modernize

---
 pkgs/by-name/mo/moor/package.nix | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/mo/moor/package.nix b/pkgs/by-name/mo/moor/package.nix
index 9de11015a140..e44e9e25334f 100644
--- a/pkgs/by-name/mo/moor/package.nix
+++ b/pkgs/by-name/mo/moor/package.nix
@@ -3,16 +3,17 @@
   buildGoModule,
   fetchFromGitHub,
   installShellFiles,
+  nix-update-script,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "moor";
   version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "walles";
     repo = "moor";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-5MiTxspdNTFfLnif5C3gcQ0suxRrjerlZl2+kPAjiBM=";
   };
 
@@ -20,22 +21,27 @@ buildGoModule rec {
 
   nativeBuildInputs = [ installShellFiles ];
 
-  postInstall = ''
-    installManPage ./moor.1
-  '';
-
   ldflags = [
     "-s"
     "-w"
     "-X"
-    "main.versionString=v${version}"
+    "main.versionString=v${finalAttrs.version}"
   ];
 
-  meta = with lib; {
+  postInstall = ''
+    installManPage ./moor.1
+  '';
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
     description = "Nice-to-use pager for humans";
     homepage = "https://github.com/walles/moor";
-    license = licenses.bsd2WithViews;
+    changelog = "https://github.com/walles/moor/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.bsd2WithViews;
     mainProgram = "moor";
-    maintainers = with maintainers; [ foo-dogsquared ];
+    maintainers = with lib.maintainers; [ foo-dogsquared ];
   };
-}
+})

From 2635b4753942236b1c36a7367bde3ecb2ac5f100 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 21 Aug 2025 17:19:15 -0400
Subject: [PATCH 1046/6226] moor: add versionCheckHook

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

diff --git a/pkgs/by-name/mo/moor/package.nix b/pkgs/by-name/mo/moor/package.nix
index e44e9e25334f..961553ccca7e 100644
--- a/pkgs/by-name/mo/moor/package.nix
+++ b/pkgs/by-name/mo/moor/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   installShellFiles,
   nix-update-script,
+  versionCheckHook,
 }:
 
 buildGoModule (finalAttrs: {
@@ -28,6 +29,9 @@ buildGoModule (finalAttrs: {
     "main.versionString=v${finalAttrs.version}"
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   postInstall = ''
     installManPage ./moor.1
   '';

From 266fdd33fc8b887618b8e047eb31aba40cefbd4f Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 21 Aug 2025 17:21:33 -0400
Subject: [PATCH 1047/6226] moor: add cross package to tests

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

diff --git a/pkgs/by-name/mo/moor/package.nix b/pkgs/by-name/mo/moor/package.nix
index 961553ccca7e..1841e54fabcc 100644
--- a/pkgs/by-name/mo/moor/package.nix
+++ b/pkgs/by-name/mo/moor/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   installShellFiles,
   nix-update-script,
+  pkgsCross,
   versionCheckHook,
 }:
 
@@ -37,6 +38,7 @@ buildGoModule (finalAttrs: {
   '';
 
   passthru = {
+    tests.cross-aarch64 = pkgsCross.aarch64-multiplatform.moor;
     updateScript = nix-update-script { };
   };
 

From ccb8f2abccd2af5be25cc7c29d42922a690dfaf5 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 21 Aug 2025 17:20:08 -0400
Subject: [PATCH 1048/6226] moor: add getchoo to maintainers

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

diff --git a/pkgs/by-name/mo/moor/package.nix b/pkgs/by-name/mo/moor/package.nix
index 1841e54fabcc..15300c423454 100644
--- a/pkgs/by-name/mo/moor/package.nix
+++ b/pkgs/by-name/mo/moor/package.nix
@@ -48,6 +48,9 @@ buildGoModule (finalAttrs: {
     changelog = "https://github.com/walles/moor/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd2WithViews;
     mainProgram = "moor";
-    maintainers = with lib.maintainers; [ foo-dogsquared ];
+    maintainers = with lib.maintainers; [
+      foo-dogsquared
+      getchoo
+    ];
   };
 })

From 210ab3ef7e51007629abc6130db43a40a7975edc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 14:19:46 +0000
Subject: [PATCH 1049/6226] go-jet: 2.13.0 -> 2.14.0

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

diff --git a/pkgs/by-name/go/go-jet/package.nix b/pkgs/by-name/go/go-jet/package.nix
index e4e3e054ab96..f934e7b8e2ca 100644
--- a/pkgs/by-name/go/go-jet/package.nix
+++ b/pkgs/by-name/go/go-jet/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "go-jet";
-  version = "2.13.0";
+  version = "2.14.0";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = "jet";
     rev = "v${version}";
-    sha256 = "sha256-abk/mcukxIgAD9Oxh3H4+xrSoY30aW7EXZxEXXlriHA=";
+    sha256 = "sha256-6cFkLnZGSAlwvsewxXaKeNoeDaILqLo02vkzqjruhxU=";
   };
 
-  vendorHash = "sha256-KheXtpbmW8GoD7nHE7vg8qOsg5sRXfrFuBJbDEXOTBs=";
+  vendorHash = "sha256-fgYZULAz3orhK637cJNYK7bw9hsQ9PuLH1nMDLVwoGM=";
 
   subPackages = [ "cmd/jet" ];
 

From ec0d4948c90c1a5ec6ec8e9cc08763a8fe8ba4ec Mon Sep 17 00:00:00 2001
From: Mathew Polzin <matt.polzin@gmail.com>
Date: Mon, 20 Oct 2025 09:55:20 -0500
Subject: [PATCH 1050/6226] bruno-cli: fix Darwin build

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

diff --git a/pkgs/by-name/br/bruno-cli/package.nix b/pkgs/by-name/br/bruno-cli/package.nix
index 9088460b5ffd..811fb768f17d 100644
--- a/pkgs/by-name/br/bruno-cli/package.nix
+++ b/pkgs/by-name/br/bruno-cli/package.nix
@@ -1,5 +1,7 @@
 {
   lib,
+  stdenv,
+  clang_20,
   buildNpmPackage,
   bruno,
   pkg-config,
@@ -24,7 +26,8 @@ buildNpmPackage {
 
   nativeBuildInputs = [
     pkg-config
-  ];
+  ]
+  ++ lib.optional stdenv.isDarwin clang_20; # clang_21 breaks gyp builds
 
   buildInputs = [
     pango

From 3c7b8ac5079614892b6b28f04f0f4199260363eb Mon Sep 17 00:00:00 2001
From: jasonxue <jason@xuechunxi.com>
Date: Mon, 20 Oct 2025 22:17:52 +0800
Subject: [PATCH 1051/6226] mdsf: add shell completions

---
 pkgs/by-name/md/mdsf/package.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/by-name/md/mdsf/package.nix b/pkgs/by-name/md/mdsf/package.nix
index 6287cb4e821d..cfe185d988f4 100644
--- a/pkgs/by-name/md/mdsf/package.nix
+++ b/pkgs/by-name/md/mdsf/package.nix
@@ -1,9 +1,11 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
   versionCheckHook,
   nix-update-script,
+  installShellFiles,
 }:
 let
   pname = "mdsf";
@@ -24,6 +26,17 @@ rustPlatform.buildRustPackage {
   # many tests fail for various reasons of which most depend on the build sandbox
   doCheck = false;
 
+  nativeBuildInputs = [
+    installShellFiles
+  ];
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd mdsf \
+      --bash <($out/bin/mdsf completions bash) \
+      --zsh <($out/bin/mdsf completions zsh) \
+      --fish <($out/bin/mdsf completions fish) \
+      --nushell <($out/bin/mdsf completions nushell)
+  '';
+
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
   passthru.updateScript = nix-update-script { };

From d81da59b334287de21cf11eb3bf6a420716db506 Mon Sep 17 00:00:00 2001
From: Grisha Shipunov <blame@oxapentane.com>
Date: Mon, 20 Oct 2025 17:25:41 +0200
Subject: [PATCH 1052/6226] multimon-ng: fix build with cmake4

---
 pkgs/by-name/mu/multimon-ng/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/mu/multimon-ng/package.nix b/pkgs/by-name/mu/multimon-ng/package.nix
index ce1289e9a50c..fea28eb14143 100644
--- a/pkgs/by-name/mu/multimon-ng/package.nix
+++ b/pkgs/by-name/mu/multimon-ng/package.nix
@@ -7,6 +7,7 @@
   libX11,
   makeWrapper,
   sox,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,6 +21,13 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-/2NHUlAojDamNq/EVs8hoBYVikPLAFFFu/2syG4Xo4U=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/EliasOenal/multimon-ng/commit/1c111e83053e9e78ba568463cc015edadf77ed5f.diff";
+      hash = "sha256-gW9ihUn3rZcyurbu7+IhkWSotqWlJsHdeFHu12oVld4=";
+    })
+  ];
+
   buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     libpulseaudio
     libX11

From 03ef8276f6c423fabec7cc521c6e937949707a63 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 15:49:11 +0000
Subject: [PATCH 1053/6226] cef-binary: 140.1.14 -> 141.0.7

---
 pkgs/development/libraries/libcef/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/libraries/libcef/default.nix b/pkgs/development/libraries/libcef/default.nix
index c809df245d09..51033edff513 100644
--- a/pkgs/development/libraries/libcef/default.nix
+++ b/pkgs/development/libraries/libcef/default.nix
@@ -92,14 +92,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "libcef";
-  version = "140.1.14";
-  gitRevision = "eb1c06e";
-  chromiumVersion = "140.0.7339.185";
+  version = "141.0.7";
+  gitRevision = "a5714cc";
+  chromiumVersion = "141.0.7390.108";
   buildType = "Release";
 
   srcHash = selectSystem {
-    aarch64-linux = "sha256-psgs+RcEYWKN4NneU4eVIaV2b7y+doxdPs9QWsN8dTA=";
-    x86_64-linux = "sha256-CDVzU+GIAU6hEutot90GMlAS8xEqD3uNLppgGq9d4mE=";
+    aarch64-linux = "sha256-2A0hVzUVMBemhjnFE/CrKs4CU96Qkxy8S/SieaEJjwE=";
+    x86_64-linux = "sha256-tZzUxeXxbYP8YfIQLbiSyihPcjZM9cd2Ad8gGCSvdGk=";
   };
 
   src = fetchurl {

From 331c859dea93ae613486e0e0268e52192e223648 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Mon, 20 Oct 2025 18:05:51 +0200
Subject: [PATCH 1054/6226] rubyPackages.sinatra: 4.1.1 -> 4.2.1

Fixes CVE-2025-61921

https://github.com/sinatra/sinatra/blob/v4.2.1/CHANGELOG.md
---
 pkgs/top-level/ruby-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix
index 7d5d53b82af6..0c1aa36b17ae 100644
--- a/pkgs/top-level/ruby-packages.nix
+++ b/pkgs/top-level/ruby-packages.nix
@@ -3701,10 +3701,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "002dkzdc1xqhvz5sdnj4vb0apczhs07mnpgq4kkd5dd1ka2pp6af";
+      sha256 = "103h6wjpcqp3i034hi44za2v365yz7qk9s5df8lmasq43nqvkbmp";
       type = "gem";
     };
-    version = "4.1.1";
+    version = "4.2.1";
   };
   singleton = {
     groups = [ "default" ];

From b4c8ca622b156c860872775125df218e5546798e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 16:18:09 +0000
Subject: [PATCH 1055/6226] amazon-cloudwatch-agent: 1.300059.0 -> 1.300061.0

---
 pkgs/by-name/am/amazon-cloudwatch-agent/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix b/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix
index cdaf829d7581..e7b0af1bea7f 100644
--- a/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix
+++ b/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "amazon-cloudwatch-agent";
-  version = "1.300059.0";
+  version = "1.300061.0";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-cloudwatch-agent";
     tag = "v${version}";
-    hash = "sha256-xon1M3xusoFngeZ2CJprS1z4fcrWeKCKaAtAfv4SBWw=";
+    hash = "sha256-Qt17JyD9zW914nVcxcpY3af42CqKJtKBEISSMy6/ong=";
   };
 
-  vendorHash = "sha256-79BaMjl1bzQcl3FUvpwRsPneQRyfabU481eLgWA1U6Y=";
+  vendorHash = "sha256-g06fRyuCRypOP6AvHTp73ml5JycAdp2OeceU4GAesvA=";
 
   # See the list in https://github.com/aws/amazon-cloudwatch-agent/blob/v1.300049.1/Makefile#L68-L77.
   subPackages = [

From a28041998dae16918a589991b8fa83c8456f4f5d Mon Sep 17 00:00:00 2001
From: Jasper Chan <jasperchan515@gmail.com>
Date: Fri, 5 Sep 2025 16:05:24 -0700
Subject: [PATCH 1056/6226] nixos/trackpoint: add missing settings and update
 descriptions

Settings and descriptions pulled from:
https://www.kernel.org/doc/Documentation/ABI/testing/sysfs-devices-platform-trackpoint

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 nixos/modules/tasks/trackpoint.nix | 190 +++++++++++++++++++++++------
 1 file changed, 155 insertions(+), 35 deletions(-)

diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix
index 4d4dc73bd5cb..76c538e080a2 100644
--- a/nixos/modules/tasks/trackpoint.nix
+++ b/nixos/modules/tasks/trackpoint.nix
@@ -1,53 +1,158 @@
-{ config, lib, ... }:
-
-with lib;
-
 {
-  ###### interface
-
+  config,
+  lib,
+  ...
+}:
+{
   options = {
-
     hardware.trackpoint = {
-
-      enable = mkOption {
+      enable = lib.mkOption {
         default = false;
-        type = types.bool;
+        type = lib.types.bool;
         description = ''
           Enable sensitivity and speed configuration for trackpoints.
         '';
       };
 
-      sensitivity = mkOption {
+      sensitivity = lib.mkOption {
         default = 128;
         example = 255;
-        type = types.int;
+        type = lib.types.int;
         description = ''
-          Configure the trackpoint sensitivity. By default, the kernel
-          configures 128.
+          Trackpoint sensitivity.
         '';
       };
 
-      speed = mkOption {
+      inertia = lib.mkOption {
+        default = 6;
+        example = 10;
+        type = lib.types.int;
+        description = ''
+          Negative inertia factor. High values cause the cursor to snap backward when the trackpoint is released.
+        '';
+      };
+
+      reach = lib.mkOption {
+        default = 10;
+        example = 20;
+        type = lib.types.int;
+        description = ''
+          Backup range for z-axis press.
+        '';
+      };
+
+      draghys = lib.mkOption {
+        default = 255;
+        example = 200;
+        type = lib.types.int;
+        description = ''
+          The drag hysteresis controls how hard it is to drag with z-axis pressed.
+        '';
+      };
+
+      mindrag = lib.mkOption {
+        default = 20;
+        example = 30;
+        type = lib.types.int;
+        description = ''
+          Minimum amount of force needed to trigger dragging.
+        '';
+      };
+
+      speed = lib.mkOption {
         default = 97;
         example = 255;
-        type = types.int;
+        type = lib.types.int;
         description = ''
-          Configure the trackpoint speed. By default, the kernel
-          configures 97.
+          Speed of the trackpoint cursor.
         '';
       };
 
-      emulateWheel = mkOption {
+      thresh = lib.mkOption {
+        default = 8;
+        example = 10;
+        type = lib.types.int;
+        description = ''
+          Minimum value for z-axis force required to trigger a press or release, relative to the running average.
+        '';
+      };
+
+      upthresh = lib.mkOption {
+        default = 255;
+        example = 250;
+        type = lib.types.int;
+        description = ''
+          The offset from the running average required to generate a select (click) on z-axis on release.
+        '';
+      };
+
+      ztime = lib.mkOption {
+        default = 38;
+        example = 50;
+        type = lib.types.int;
+        description = ''
+          This attribute determines how sharp a press has to be in order to be recognized.
+        '';
+      };
+
+      jenks = lib.mkOption {
+        default = 135;
+        example = 100;
+        type = lib.types.int;
+        description = ''
+          Minimum curvature in degrees required to generate a double click without a release.
+        '';
+      };
+
+      skipback = lib.mkOption {
         default = false;
-        type = types.bool;
+        example = true;
+        type = lib.types.bool;
+        description = ''
+          When the skipback bit is set, backup cursor movement during releases from drags will be suppressed. The default value for this bit is 0.
+        '';
+      };
+
+      ext_dev = lib.mkOption {
+        default = true;
+        example = false;
+        type = lib.types.bool;
+        description = ''
+          Disable or enable external pointing device.
+        '';
+      };
+
+      press_to_select = lib.mkOption {
+        default = false;
+        example = true;
+        type = lib.types.bool;
+        description = ''
+          Setting this to true will enable the Press to Select functions like tapping the control stick to simulate a left click, and setting false will disable it.
+        '';
+      };
+
+      drift_time = lib.mkOption {
+        default = 5;
+        example = 100;
+        type = lib.types.int;
+        description = ''
+          This parameter controls the period of time to test for a 'hands off' condition (i.e. when no force is applied) before a drift (noise) calibration occurs.
+
+          IBM Trackpoints have a feature to compensate for drift by recalibrating themselves periodically. By default, if for 0.5 seconds there is no change in position, it's used as the new zero. This duration is too low. Often, the calibration happens when the trackpoint is in fact being used.
+        '';
+      };
+
+      emulateWheel = lib.mkOption {
+        default = false;
+        type = lib.types.bool;
         description = ''
           Enable scrolling while holding the middle mouse button.
         '';
       };
 
-      fakeButtons = mkOption {
+      fakeButtons = lib.mkOption {
         default = false;
-        type = types.bool;
+        type = lib.types.bool;
         description = ''
           Switch to "bare" PS/2 mouse support in case Trackpoint buttons are not recognized
           properly. This can happen for example on models like the L430, T450, T450s, on
@@ -55,30 +160,45 @@ with lib;
         '';
       };
 
-      device = mkOption {
+      device = lib.mkOption {
         default = "TPPS/2 IBM TrackPoint";
-        type = types.str;
+        type = lib.types.str;
         description = ''
           The device name of the trackpoint. You can check with xinput.
           Some newer devices (example x1c6) use "TPPS/2 Elan TrackPoint".
         '';
       };
-
     };
-
   };
 
-  ###### implementation
-
   config =
     let
       cfg = config.hardware.trackpoint;
+      boolToStr = val: if val then "1" else "0";
     in
-    mkMerge [
-      (mkIf cfg.enable {
-        services.udev.extraRules = ''
-          ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="${cfg.device}", ATTR{device/speed}="${toString cfg.speed}", ATTR{device/sensitivity}="${toString cfg.sensitivity}"
-        '';
+    lib.mkMerge [
+      (lib.mkIf cfg.enable {
+        services.udev.extraRules = (
+          builtins.concatStringsSep ", " [
+            "ACTION==\"add|change\""
+            "SUBSYSTEM==\"input\""
+            "ATTR{name}==\"${cfg.device}\""
+            "ATTR{device/sensitivity}=\"${toString cfg.sensitivity}\""
+            "ATTR{device/inertia}=\"${toString cfg.inertia}\""
+            "ATTR{device/reach}=\"${toString cfg.reach}\""
+            "ATTR{device/draghys}=\"${toString cfg.draghys}\""
+            "ATTR{device/mindrag}=\"${toString cfg.mindrag}\""
+            "ATTR{device/speed}=\"${toString cfg.speed}\""
+            "ATTR{device/thresh}=\"${toString cfg.thresh}\""
+            "ATTR{device/upthresh}=\"${toString cfg.upthresh}\""
+            "ATTR{device/ztime}=\"${toString cfg.ztime}\""
+            "ATTR{device/jenks}=\"${toString cfg.jenks}\""
+            "ATTR{device/skipback}=\"${boolToStr cfg.skipback}\""
+            "ATTR{device/ext_dev}=\"${boolToStr cfg.ext_dev}\""
+            "ATTR{device/press_to_select}=\"${boolToStr cfg.press_to_select}\""
+            "ATTR{device/drift_time}=\"${toString cfg.drift_time}\""
+          ]
+        );
 
         systemd.services.trackpoint = {
           wantedBy = [ "sysinit.target" ];
@@ -96,7 +216,7 @@ with lib;
         };
       })
 
-      (mkIf (cfg.emulateWheel) {
+      (lib.mkIf (cfg.emulateWheel) {
         services.xserver.inputClassSections = [
           ''
             Identifier "Trackpoint Wheel Emulation"
@@ -116,7 +236,7 @@ with lib;
         ];
       })
 
-      (mkIf cfg.fakeButtons {
+      (lib.mkIf cfg.fakeButtons {
         boot.extraModprobeConfig = "options psmouse proto=bare";
       })
     ];

From 106676ccddc32e24a93b4b6caf225c7ed28014c2 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Mon, 20 Oct 2025 18:43:20 +0200
Subject: [PATCH 1057/6226] python3Packages.stringzilla: add aciceri to
 maintainers

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

diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix
index b3d093d603ee..05edc2fdf6c5 100644
--- a/pkgs/development/python-modules/stringzilla/default.nix
+++ b/pkgs/development/python-modules/stringzilla/default.nix
@@ -46,6 +46,9 @@ buildPythonPackage rec {
     description = "SIMD-accelerated string search, sort, hashes, fingerprints, & edit distances";
     homepage = "https://github.com/ashvardanian/stringzilla";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ dotlambda ];
+    maintainers = with lib.maintainers; [
+      aciceri
+      dotlambda
+    ];
   };
 }

From 247b6e5a462de5f4df5848fc13f7eab692cf1076 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 20 Oct 2025 12:57:30 -0400
Subject: [PATCH 1058/6226] edk2: 202508 -> 202508.01

Changelog: https://github.com/tianocore/edk2/releases/tag/edk2-stable202508.01
---
 pkgs/by-name/ed/edk2/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix
index 781d71ef3078..9adad1a48c13 100644
--- a/pkgs/by-name/ed/edk2/package.nix
+++ b/pkgs/by-name/ed/edk2/package.nix
@@ -33,14 +33,14 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "edk2";
-  version = "202508";
+  version = "202508.01";
 
   srcWithVendoring = fetchFromGitHub {
     owner = "tianocore";
     repo = "edk2";
     tag = "edk2-stable${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-YZcjPGPkUQ9CeJS9JxdHBmpdHsAj7T0ifSZWZKyNPMk=";
+    hash = "sha256-BgNNKA+YFeaZDm1mLzBN3VA7RAwNT9MXV3JX5ZLrFOo=";
   };
 
   src = applyPatches {
@@ -133,7 +133,7 @@ stdenv.mkDerivation (finalAttrs: {
       #!nix-shell -i bash -p common-updater-scripts coreutils gnused
       set -eu -o pipefail
       version="$(list-git-tags --url="${finalAttrs.srcWithVendoring.url}" |
-                 sed -E --quiet 's/^edk2-stable([0-9]{6})$/\1/p' |
+                 sed -E --quiet 's/^edk2-stable([0-9\\.]+)$/\1/p' |
                  sort --reverse --numeric-sort |
                  head -n 1)"
       if [[ "x$UPDATE_NIX_OLD_VERSION" != "x$version" ]]; then

From 233fb37ac3da64c8b80a38f789ad49a5dc92b264 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 20 Oct 2025 10:02:32 -0700
Subject: [PATCH 1059/6226] python3Packages.restrictedpython: 8.0 -> 8.1

Diff: https://github.com/zopefoundation/RestrictedPython/compare/8.0...8.1

Changelog: https://github.com/zopefoundation/RestrictedPython/blob/8.1/CHANGES.rst
---
 .../restrictedpython/default.nix              | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/restrictedpython/default.nix b/pkgs/development/python-modules/restrictedpython/default.nix
index 5cf21f66d6f2..043c8047a3dc 100644
--- a/pkgs/development/python-modules/restrictedpython/default.nix
+++ b/pkgs/development/python-modules/restrictedpython/default.nix
@@ -1,29 +1,27 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   pytest-mock,
   pytestCheckHook,
-  pythonAtLeast,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "restrictedpython";
-  version = "8.0";
+  version = "8.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-OvIxK8Z+X87Yh/uFsAbImGHackiBKLFVvuqB62oKmyQ=";
+  src = fetchFromGitHub {
+    owner = "zopefoundation";
+    repo = "RestrictedPython";
+    tag = version;
+    hash = "sha256-UcmH1I2p+XmQm4Y5M+Ms/LMSchor6GD6V9dxippa4HI=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools <= 75.6.0" setuptools
+      --replace-fail "setuptools >= 78.1.1,< 81" setuptools
   '';
 
   build-system = [ setuptools ];
@@ -33,15 +31,13 @@ buildPythonPackage rec {
     pytest-mock
   ];
 
-  disabledTests = lib.optionals (pythonAtLeast "3.11") [ "test_compile__compile_restricted_exec__5" ];
-
   pythonImportsCheck = [ "RestrictedPython" ];
 
-  meta = with lib; {
+  meta = {
     description = "Restricted execution environment for Python to run untrusted code";
     homepage = "https://github.com/zopefoundation/RestrictedPython";
-    changelog = "https://github.com/zopefoundation/RestrictedPython/blob/${version}/CHANGES.rst";
-    license = licenses.zpl21;
-    maintainers = with maintainers; [ juaningan ];
+    changelog = "https://github.com/zopefoundation/RestrictedPython/blob/${src.tag}/CHANGES.rst";
+    license = lib.licenses.zpl21;
+    maintainers = with lib.maintainers; [ juaningan ];
   };
 }

From 5f3c43df70bf4b0eac72180a50529f7c1dfc8eb9 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 20 Oct 2025 21:04:36 +0400
Subject: [PATCH 1060/6226] pmtiles: fix sandbox build on darwin

---
 .../pm/pmtiles/darwin-sandbox-fix.patch       | 20 +++++++++++++++++++
 pkgs/by-name/pm/pmtiles/package.nix           |  9 ++++++++-
 2 files changed, 28 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/pm/pmtiles/darwin-sandbox-fix.patch

diff --git a/pkgs/by-name/pm/pmtiles/darwin-sandbox-fix.patch b/pkgs/by-name/pm/pmtiles/darwin-sandbox-fix.patch
new file mode 100644
index 000000000000..b390d492467c
--- /dev/null
+++ b/pkgs/by-name/pm/pmtiles/darwin-sandbox-fix.patch
@@ -0,0 +1,20 @@
+--- vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go
++++ vendor/modernc.org/libc/honnef.co/go/netdb/netdb.go
+@@ -696,7 +696,7 @@ func init() {
+ 	// Load protocols
+ 	data, err := ioutil.ReadFile("/etc/protocols")
+ 	if err != nil {
+-		if !os.IsNotExist(err) {
++		if !os.IsNotExist(err) && !os.IsPermission(err) {
+ 			panic(err)
+ 		}
+ 
+@@ -732,7 +732,7 @@ func init() {
+ 	// Load services
+ 	data, err = ioutil.ReadFile("/etc/services")
+ 	if err != nil {
+-		if !os.IsNotExist(err) {
++		if !os.IsNotExist(err) && !os.IsPermission(err) {
+ 			panic(err)
+ 		}
+ 
diff --git a/pkgs/by-name/pm/pmtiles/package.nix b/pkgs/by-name/pm/pmtiles/package.nix
index d5c616ba726f..554fea30290e 100644
--- a/pkgs/by-name/pm/pmtiles/package.nix
+++ b/pkgs/by-name/pm/pmtiles/package.nix
@@ -14,7 +14,14 @@ buildGoModule rec {
     hash = "sha256-JGsbgBB2T+4SWKQmiSmuMqQ8gw0qhM5c5eFDF/+sndA=";
   };
 
-  vendorHash = "sha256-XRx9Qe7tTQAPJJdj9yEU0YAFjvl+4jW/XQy2MYFApds=";
+  vendorHash = "sha256-6zsX7rU+D+RUHwXfFZzLQftQ6nSYJhvKIDdsO2vow4A=";
+
+  overrideModAttrs = old: {
+    # https://gitlab.com/cznic/libc/-/merge_requests/10
+    postBuild = ''
+      patch -p0 < ${./darwin-sandbox-fix.patch}
+    '';
+  };
 
   ldflags = [
     "-s"

From 7e74f12c36b134d955305b472b38739b0c807780 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Mon, 20 Oct 2025 17:05:01 +0000
Subject: [PATCH 1061/6226] linux_xanmod: 6.12.53 -> 6.12.54

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

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 80beae4c400d..61683ba1860c 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -15,8 +15,8 @@ let
   variants = {
     # ./update-xanmod.sh lts
     lts = {
-      version = "6.12.53";
-      hash = "sha256-BhaWUdfCgIvD0LA69I1NVIW0rv6JWQs+7HNLxOkrmGc=";
+      version = "6.12.54";
+      hash = "sha256-8ZeVHP8voR4GJfBB1iM8ZDx4QgCd83tJ7IkpJNW63ME=";
       isLTS = true;
     };
     # ./update-xanmod.sh main

From 7246a08cd73a8285d6fa8c65a15e1c5c1db7d982 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Mon, 20 Oct 2025 19:04:34 +0200
Subject: [PATCH 1062/6226] wasmtime: 37.0.2 -> 38.0.1

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

diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix
index 45f0b5a3cd60..28e6b2958b4f 100644
--- a/pkgs/by-name/wa/wasmtime/package.nix
+++ b/pkgs/by-name/wa/wasmtime/package.nix
@@ -13,20 +13,20 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wasmtime";
-  version = "37.0.2";
+  version = "38.0.1";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wasmtime";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OQyGcxWMOxxzBHyOg2LUVsFuBEow6NIJCfrnsYWZtzk=";
+    hash = "sha256-Arb4wUIJx3OyE8wbshotpy5Br7ZHHA7zXP98uGm/gyo=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
 
-  cargoHash = "sha256-PXvhwnfGvGF4D6U+2dKp3wg6cbk/i+0bWRAMSkyd6i8=";
+  cargoHash = "sha256-ZF+uaMjhBMdLPp8TP4DnPB23igOE92YuhQ1US65NNRk=";
   cargoBuildFlags = [
     "--package"
     "wasmtime-cli"

From 22c0bb9dddce6d4d61ccf04f3c15340f686deadf Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Mon, 20 Oct 2025 17:08:04 +0000
Subject: [PATCH 1063/6226] linux_xanmod_latest: 6.17.3 -> 6.17.4

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

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 61683ba1860c..edc5aa9fc5f2 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -21,8 +21,8 @@ let
     };
     # ./update-xanmod.sh main
     main = {
-      version = "6.17.3";
-      hash = "sha256-VL1SCMB89P0UcCbtPdkjxcCZqQZpnSTlzzf9e8uzkyA=";
+      version = "6.17.4";
+      hash = "sha256-UHfZwK0qIVhiKw8OpE8i+V2BRav6Fsju8E5rO5WRwVA=";
     };
   };
 

From 88fe3b2f1fe0d85307bc3990185b5297fec1ebb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 20 Oct 2025 10:07:58 -0700
Subject: [PATCH 1064/6226] python3Packages.bring-api: 1.1.0 -> 1.1.1

Diff: https://github.com/miaucl/bring-api/compare/1.1.0...1.1.1

Changelog: https://github.com/miaucl/bring-api/releases/tag/1.1.1
---
 pkgs/development/python-modules/bring-api/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/bring-api/default.nix b/pkgs/development/python-modules/bring-api/default.nix
index 336d56fc8491..54a0053847b7 100644
--- a/pkgs/development/python-modules/bring-api/default.nix
+++ b/pkgs/development/python-modules/bring-api/default.nix
@@ -9,7 +9,6 @@
   pytest-asyncio,
   pytestCheckHook,
   python-dotenv,
-  pythonOlder,
   setuptools,
   syrupy,
   yarl,
@@ -17,16 +16,14 @@
 
 buildPythonPackage rec {
   pname = "bring-api";
-  version = "1.1.0";
+  version = "1.1.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "miaucl";
     repo = "bring-api";
     tag = version;
-    hash = "sha256-OxY9G7zy5VSpTOARoManJNvMg6ghIK0KJunanSgXKm0=";
+    hash = "sha256-BslU1ekbQIZh1f1zRYXbZdbOepB2+NWIuWZI4L/oxSg=";
   };
 
   build-system = [ setuptools ];

From f037a5f4d152661216b9b5e4b003c7268b50c309 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Tue, 21 Oct 2025 01:12:06 +0800
Subject: [PATCH 1065/6226] ipopt: remove unused CXXDEFS

---
 pkgs/by-name/ip/ipopt/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/ip/ipopt/package.nix b/pkgs/by-name/ip/ipopt/package.nix
index 3470e43be4f4..5e7ca10778d3 100644
--- a/pkgs/by-name/ip/ipopt/package.nix
+++ b/pkgs/by-name/ip/ipopt/package.nix
@@ -28,12 +28,6 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-85fUBMwQtG+RWQYk9YzdZYK3CYcDKgWroo4blhVWBzE=";
   };
 
-  CXXDEFS = [
-    "-DHAVE_RAND"
-    "-DHAVE_CSTRING"
-    "-DHAVE_CSTDIO"
-  ];
-
   configureFlags =
     lib.optionals enableAMPL [
       "--with-asl-cflags=-I${libamplsolver}/include"

From e1cb832da812c807bf60ece9a1ac5b2df6f2b130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 20 Oct 2025 10:13:20 -0700
Subject: [PATCH 1066/6226] python3Packages.python-bring-api: drop

---
 .../python-bring-api/default.nix              | 40 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 pkgs/development/python-modules/python-bring-api/default.nix

diff --git a/pkgs/development/python-modules/python-bring-api/default.nix b/pkgs/development/python-modules/python-bring-api/default.nix
deleted file mode 100644
index 5c42edbea208..000000000000
--- a/pkgs/development/python-modules/python-bring-api/default.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  aiohttp,
-  buildPythonPackage,
-  fetchFromGitHub,
-  pythonOlder,
-  setuptools,
-}:
-
-buildPythonPackage {
-  pname = "python-bring-api";
-  version = "3.0.0-unstable-2024-02-03";
-  pyproject = true;
-
-  disabled = pythonOlder "3.8";
-
-  src = fetchFromGitHub {
-    owner = "eliasball";
-    repo = "python-bring-api";
-    # https://github.com/eliasball/python-bring-api/issues/16
-    rev = "8043562b22be1f6421a8771774868b105b6ca375";
-    hash = "sha256-VCGCm9N6pMhEYT9WuWh7qKacZEf6bcIpEsILfCC6his=";
-  };
-
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [ aiohttp ];
-
-  # Module has no tests
-  doCheck = false;
-
-  pythonImportsCheck = [ "python_bring_api" ];
-
-  meta = with lib; {
-    description = "Module to access the Bring! shopping lists API";
-    homepage = "https://github.com/eliasball/python-bring-api";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index eeeface4a7bc..4b1c3b427a92 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -614,6 +614,7 @@ mapAliases {
   PyMVGLive = pymvglive; # added 2023-02-19
   pymyq = python-myq; # added 2023-10-20
   pynose = throw "pynose was removed, because it violates the license of nose, by redistributing modified LGPL code under MIT.";
+  python-bring-api = throw "python-bring-api was removed because Home Assistant switched to bring-api"; # added 2025-10-03
   python-ethtool = ethtool; # added 2024-07-23
   python-myq = throw "python-myq has been removed, as the service provider has decided to block its API requests"; # added 2023-12-07
   python-picnic-api = throw "python-picnic-api was removed because Home Assistant switched to python-picnic-api2"; # added 2025-03-05
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fb31006dc940..51d6a680531e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14768,8 +14768,6 @@ self: super: with self; {
 
   python-box = callPackage ../development/python-modules/python-box { };
 
-  python-bring-api = callPackage ../development/python-modules/python-bring-api { };
-
   python-bsblan = callPackage ../development/python-modules/python-bsblan { };
 
   python-bugzilla = callPackage ../development/python-modules/python-bugzilla { };

From f07fbf473d9c780c6b1decc0b7f5601e3123e1dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?L=C3=A1szl=C3=B3=20Kupcsik?= <dev@biobits.be>
Date: Wed, 15 Oct 2025 16:35:16 +0200
Subject: [PATCH 1067/6226] quantlib: 1.39 -> 1.40

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

diff --git a/pkgs/by-name/qu/quantlib/package.nix b/pkgs/by-name/qu/quantlib/package.nix
index 978bd6a8ecd1..865eb860f44c 100644
--- a/pkgs/by-name/qu/quantlib/package.nix
+++ b/pkgs/by-name/qu/quantlib/package.nix
@@ -4,11 +4,12 @@
   fetchFromGitHub,
   cmake,
   boost,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quantlib";
-  version = "1.39";
+  version = "1.40";
 
   outputs = [
     "out"
@@ -19,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "lballabio";
     repo = "QuantLib";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-UrFamEIeFTR0finNGESlDYbvrmD8jtv73tDUJ17P7WA=";
+    hash = "sha256-cyri+kCwIFO/ccnqWhO8qOXNPIV0g6iiNvBYtN667pA=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -33,6 +34,8 @@ stdenv.mkDerivation (finalAttrs: {
     cp ./quantlib-config $out/bin/
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Free/open-source library for quantitative finance";
     homepage = "https://quantlib.org";

From de48af3709b743d20aa8cc9368b7418a0165d2a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 17:19:23 +0000
Subject: [PATCH 1068/6226] firezone-gateway: 1.4.16 -> 1.4.17

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

diff --git a/pkgs/by-name/fi/firezone-gateway/package.nix b/pkgs/by-name/fi/firezone-gateway/package.nix
index 5309ebd379e2..48bac722dc86 100644
--- a/pkgs/by-name/fi/firezone-gateway/package.nix
+++ b/pkgs/by-name/fi/firezone-gateway/package.nix
@@ -6,15 +6,15 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "firezone-gateway";
-  version = "1.4.16";
+  version = "1.4.17";
   src = fetchFromGitHub {
     owner = "firezone";
     repo = "firezone";
     tag = "gateway-${version}";
-    hash = "sha256-Tu0Bq/Axj05dCRCd1eB7CiOXQ5n4i8hnE3ZiGCQ5ZdY=";
+    hash = "sha256-dVqZs5Xie9lc3F6wVMdxRHeoM7y/e9TvwjzfikenQ6w=";
   };
 
-  cargoHash = "sha256-wlf+TtrRG7hHNav7WqLn2DSX9QkKFVzyiKP5CRdXlNY=";
+  cargoHash = "sha256-J2IqqFBuoTkbO0nMJbY680G2HTAtC1To/nMra2PCopY=";
   sourceRoot = "${src.name}/rust";
   buildAndTestSubdir = "gateway";
   RUSTFLAGS = "--cfg system_certs";

From d6d9fdd74279f8910b6bf83989b460d4d8a05ece Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 14:21:35 -0300
Subject: [PATCH 1069/6226] toxvpn: fix build with cmake4

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

diff --git a/pkgs/by-name/to/toxvpn/package.nix b/pkgs/by-name/to/toxvpn/package.nix
index 971d533404ef..60cab8acab30 100644
--- a/pkgs/by-name/to/toxvpn/package.nix
+++ b/pkgs/by-name/to/toxvpn/package.nix
@@ -37,6 +37,11 @@ stdenv.mkDerivation {
 
   cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-DSYSTEMD=1" ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = "cp ${./bootstrap.json} $out/share/toxvpn/";
 
   installCheckPhase = "$out/bin/toxvpn -h";

From 92d2293392c812dcb895d41fa8becca986f63740 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Tue, 21 Oct 2025 01:14:47 +0800
Subject: [PATCH 1070/6226] ipopt: use mpi.h provided by mumps

---
 pkgs/by-name/ip/ipopt/package.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ip/ipopt/package.nix b/pkgs/by-name/ip/ipopt/package.nix
index 5e7ca10778d3..e20214342f17 100644
--- a/pkgs/by-name/ip/ipopt/package.nix
+++ b/pkgs/by-name/ip/ipopt/package.nix
@@ -10,12 +10,12 @@
   libamplsolver,
   enableMUMPS ? true,
   mumps,
-  mpi,
   enableSPRAL ? true,
   spral,
 }:
 
 assert (!blas.isILP64) && (!lapack.isILP64);
+assert !mumps.mpiSupport;
 
 stdenv.mkDerivation rec {
   pname = "ipopt";
@@ -30,15 +30,13 @@ stdenv.mkDerivation rec {
 
   configureFlags =
     lib.optionals enableAMPL [
-      "--with-asl-cflags=-I${libamplsolver}/include"
       "--with-asl-lflags=-lamplsolver"
     ]
     ++ lib.optionals enableMUMPS [
-      "--with-mumps-cflags=-I${mumps}/include"
+      "--with-mumps-cflags=-I${lib.getDev mumps}/include/mumps_seq"
       "--with-mumps-lflags=-ldmumps"
     ]
     ++ lib.optionals enableSPRAL [
-      "--with-spral-cflags=-I${spral}/include"
       "--with-spral-lflags=-lspral"
     ];
 
@@ -51,10 +49,7 @@ stdenv.mkDerivation rec {
     lapack
   ]
   ++ lib.optionals enableAMPL [ libamplsolver ]
-  ++ lib.optionals enableMUMPS [
-    mumps
-    mpi
-  ]
+  ++ lib.optionals enableMUMPS [ mumps ]
   ++ lib.optionals enableSPRAL [ spral ];
 
   enableParallelBuilding = true;

From 607493570f44d0c71fbef058d4e21034c7ca3dfb Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Tue, 21 Oct 2025 01:24:37 +0800
Subject: [PATCH 1071/6226] ipopt: remove enable* options

---
 pkgs/by-name/ip/ipopt/package.nix | 33 ++++++++++++-------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/ip/ipopt/package.nix b/pkgs/by-name/ip/ipopt/package.nix
index e20214342f17..8bd1e2c3e0a5 100644
--- a/pkgs/by-name/ip/ipopt/package.nix
+++ b/pkgs/by-name/ip/ipopt/package.nix
@@ -6,12 +6,9 @@
   blas,
   lapack,
   gfortran,
-  enableAMPL ? true,
-  libamplsolver,
-  enableMUMPS ? true,
   mumps,
-  enableSPRAL ? true,
   spral,
+  libamplsolver,
 }:
 
 assert (!blas.isILP64) && (!lapack.isILP64);
@@ -28,29 +25,25 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-85fUBMwQtG+RWQYk9YzdZYK3CYcDKgWroo4blhVWBzE=";
   };
 
-  configureFlags =
-    lib.optionals enableAMPL [
-      "--with-asl-lflags=-lamplsolver"
-    ]
-    ++ lib.optionals enableMUMPS [
-      "--with-mumps-cflags=-I${lib.getDev mumps}/include/mumps_seq"
-      "--with-mumps-lflags=-ldmumps"
-    ]
-    ++ lib.optionals enableSPRAL [
-      "--with-spral-lflags=-lspral"
-    ];
-
   nativeBuildInputs = [
     pkg-config
     gfortran
   ];
+
   buildInputs = [
     blas
     lapack
-  ]
-  ++ lib.optionals enableAMPL [ libamplsolver ]
-  ++ lib.optionals enableMUMPS [ mumps ]
-  ++ lib.optionals enableSPRAL [ spral ];
+    mumps
+    spral
+    libamplsolver
+  ];
+
+  configureFlags = [
+    "--with-mumps-cflags=-I${lib.getDev mumps}/include/mumps_seq"
+    "--with-mumps-lflags=-ldmumps"
+    "--with-spral-lflags=-lspral"
+    "--with-asl-lflags=-lamplsolver"
+  ];
 
   enableParallelBuilding = true;
 

From 3df467885865c2ad140cbb76c3cba4e0bcdc2880 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Tue, 21 Oct 2025 01:33:39 +0800
Subject: [PATCH 1072/6226] ipopt: split outputs

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

diff --git a/pkgs/by-name/ip/ipopt/package.nix b/pkgs/by-name/ip/ipopt/package.nix
index 8bd1e2c3e0a5..5d8eb4b9da52 100644
--- a/pkgs/by-name/ip/ipopt/package.nix
+++ b/pkgs/by-name/ip/ipopt/package.nix
@@ -25,6 +25,13 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-85fUBMwQtG+RWQYk9YzdZYK3CYcDKgWroo4blhVWBzE=";
   };
 
+  outputs = [
+    "bin"
+    "dev"
+    "out"
+    "doc"
+  ];
+
   nativeBuildInputs = [
     pkg-config
     gfortran

From 9dad938c5872a230e4e276fc3e1a891c446e4964 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 14:03:13 -0300
Subject: [PATCH 1073/6226] tracefilegen: fix build with cmake4

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

diff --git a/pkgs/by-name/tr/tracefilegen/package.nix b/pkgs/by-name/tr/tracefilegen/package.nix
index df37c0d8256e..d67b26451c2a 100644
--- a/pkgs/by-name/tr/tracefilegen/package.nix
+++ b/pkgs/by-name/tr/tracefilegen/package.nix
@@ -27,6 +27,11 @@ stdenv.mkDerivation rec {
     cp -ar $src/Documentation/html $out/share/doc/${pname}-${version}/.
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Automatically generate all types of basic memory management operations and write into trace files";
     mainProgram = "TraceFileGen";

From c630f97390d65bcf25e61347f08ad9f1017352de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 20 Oct 2025 10:32:22 -0700
Subject: [PATCH 1074/6226] python3Packages.standard-sndhdr: init at 3.13.0

---
 .../standard-sndhdr/default.nix               | 42 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  6 +++
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/standard-sndhdr/default.nix

diff --git a/pkgs/development/python-modules/standard-sndhdr/default.nix b/pkgs/development/python-modules/standard-sndhdr/default.nix
new file mode 100644
index 000000000000..6fefd2146c00
--- /dev/null
+++ b/pkgs/development/python-modules/standard-sndhdr/default.nix
@@ -0,0 +1,42 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  setuptools,
+  standard-aifc,
+}:
+
+buildPythonPackage rec {
+  pname = "standard-sndhdr";
+  version = "3.13.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "youknowone";
+    repo = "python-deadlib";
+    tag = "v${version}";
+    hash = "sha256-vhGFTd1yXL4Frqli5D1GwOatwByDjvcP8sxgkdu6Jqg=";
+  };
+
+  sourceRoot = "${src.name}/sndhdr";
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    standard-aifc
+  ];
+
+  pythonImportsCheck = [ "sndhdr" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Standard library sndhdr redistribution";
+    homepage = "https://github.com/youknowone/python-deadlib/tree/main/sndhdr";
+    license = lib.licenses.psfl;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index fb31006dc940..1f3d5e5a277d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17652,6 +17652,12 @@ self: super: with self; {
   standard-pipes =
     if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-pipes { } else null;
 
+  standard-sndhdr =
+    if pythonAtLeast "3.13" then
+      callPackage ../development/python-modules/standard-sndhdr { }
+    else
+      null;
+
   standard-sunau =
     if pythonAtLeast "3.13" then callPackage ../development/python-modules/standard-sunau { } else null;
 

From f6736fe5220e1fa51c6546dfb09f3d0c34413a96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 20 Oct 2025 10:21:21 -0700
Subject: [PATCH 1075/6226] python3Packages.type-infer: 0.0.23 -> 0.0.25

Diff: https://github.com/mindsdb/type_infer/compare/v0.0.23...v0.0.25

Changelog: https://github.com/mindsdb/type_infer/releases/tag/v0.0.25
---
 .../python-modules/type-infer/default.nix     | 21 +++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/type-infer/default.nix b/pkgs/development/python-modules/type-infer/default.nix
index 5bc50ccf9e45..a59301e884ec 100644
--- a/pkgs/development/python-modules/type-infer/default.nix
+++ b/pkgs/development/python-modules/type-infer/default.nix
@@ -1,9 +1,8 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
-  pythonAtLeast,
   fetchFromGitHub,
+  fetchpatch,
   poetry-core,
   colorlog,
   dataclasses-json,
@@ -14,6 +13,8 @@
   py3langid,
   pytestCheckHook,
   python-dateutil,
+  standard-imghdr,
+  standard-sndhdr,
   scipy,
   toml,
 }:
@@ -24,7 +25,7 @@ let
     d.stopwords
   ]);
 
-  version = "0.0.23";
+  version = "0.0.25";
   tag = "v${version}";
 in
 buildPythonPackage {
@@ -32,15 +33,21 @@ buildPythonPackage {
   inherit version;
   pyproject = true;
 
-  disabled = pythonOlder "3.8" || pythonAtLeast "3.13";
-
   src = fetchFromGitHub {
     owner = "mindsdb";
     repo = "type_infer";
     inherit tag;
-    hash = "sha256-tqT/MTcSHcKGoPUUzjPLFpOTchannFsCd2VMC+8kVZ8=";
+    hash = "sha256-WL/2WSy3e2Mg/jNS8afUEnCt10wpXho4uOPAkVdzHWA=";
   };
 
+  patches = [
+    # https://github.com/mindsdb/type_infer/pull/83
+    (fetchpatch {
+      url = "https://github.com/mindsdb/type_infer/commit/d09f88d5ddbe55125b1fff4506b03165d019d88b.patch";
+      hash = "sha256-wNBzb+RxoZC8zn5gdOrtJeXJIIH3DTt1gTZfgN/WnQQ=";
+    })
+  ];
+
   pythonRelaxDeps = [
     "psutil"
     "py3langid"
@@ -59,6 +66,8 @@ buildPythonPackage {
     py3langid
     python-dateutil
     scipy
+    standard-imghdr
+    standard-sndhdr
     toml
   ];
 

From 4c1c308aacb82fe90aece6f4bdde26c5e4aac0d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 20 Oct 2025 10:33:35 -0700
Subject: [PATCH 1076/6226] python3Packages.mindsdb-evaluator: 0.0.18 -> 0.0.20

Diff: https://github.com/mindsdb/mindsdb_evaluator/compare/v0.0.18...v0.0.20

Changelog: https://github.com/mindsdb/mindsdb_evaluator/releases/tag/v0.0.19
           https://github.com/mindsdb/mindsdb_evaluator/releases/tag/v0.0.20
---
 .../mindsdb-evaluator/default.nix             | 33 +++++++++++--------
 1 file changed, 19 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/mindsdb-evaluator/default.nix b/pkgs/development/python-modules/mindsdb-evaluator/default.nix
index 2f7b18a34653..e9c11be20c46 100644
--- a/pkgs/development/python-modules/mindsdb-evaluator/default.nix
+++ b/pkgs/development/python-modules/mindsdb-evaluator/default.nix
@@ -1,34 +1,34 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  pythonOlder,
+  fetchFromGitHub,
   poetry-core,
   dataprep-ml,
   numpy,
   pandas,
   scikit-learn,
   type-infer,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "mindsdb-evaluator";
-  version = "0.0.18";
+  version = "0.0.20";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
-  # using PyPI as git repository does not have release tags or branches
-  src = fetchPypi {
-    pname = "mindsdb_evaluator";
-    inherit version;
-    hash = "sha256-UGg7P/OKmRi70z2roRBsA95FAXm7CG+TdPzTRy7+p4w=";
+  src = fetchFromGitHub {
+    owner = "mindsdb";
+    repo = "mindsdb_evaluator";
+    tag = "v${version}";
+    hash = "sha256-ZeJABMbyRdGrZGkWWXcjleOeDQBSicGR06hZAPUKvgI=";
   };
 
   build-system = [ poetry-core ];
 
   pythonRelaxDeps = [
+    "dataprep-ml"
     "numpy"
+    "scikit-learn"
   ];
 
   dependencies = [
@@ -41,10 +41,15 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "mindsdb_evaluator" ];
 
-  meta = with lib; {
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/mindsdb/mindsdb_evaluator/releases/tag/${src.tag}";
     description = "Model evaluation for Machine Learning pipelines";
-    homepage = "https://pypi.org/project/mindsdb-evaluator/";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ mbalatsko ];
+    homepage = "https://github.com/mindsdb/mindsdb_evaluator";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ mbalatsko ];
   };
 }

From aa5768a27e7f7d7ad224935630e5f201aae91cdd Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Tue, 21 Oct 2025 01:56:34 +0800
Subject: [PATCH 1077/6226] ipopt: licenses.epl10 -> licenses.epl20

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

diff --git a/pkgs/by-name/ip/ipopt/package.nix b/pkgs/by-name/ip/ipopt/package.nix
index 5d8eb4b9da52..80953aa13174 100644
--- a/pkgs/by-name/ip/ipopt/package.nix
+++ b/pkgs/by-name/ip/ipopt/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "Software package for large-scale nonlinear optimization";
     homepage = "https://projects.coin-or.org/Ipopt";
-    license = lib.licenses.epl10;
+    license = lib.licenses.epl20;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       nim65s

From 2edff408a75971353a9e3c5f7af3a61fba126a06 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 15:10:37 -0300
Subject: [PATCH 1078/6226] tinyalsa: fix build with cmake4

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

diff --git a/pkgs/by-name/ti/tinyalsa/package.nix b/pkgs/by-name/ti/tinyalsa/package.nix
index c1d2c67a0b3c..2f911bc7014e 100644
--- a/pkgs/by-name/ti/tinyalsa/package.nix
+++ b/pkgs/by-name/ti/tinyalsa/package.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation {
     "-Wno-error=sign-compare"
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/tinyalsa/tinyalsa";
     description = "Tiny library to interface with ALSA in the Linux kernel";

From 3de337e9edb35942a8581561ef38115f7bc57613 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 20 Oct 2025 19:11:37 +0100
Subject: [PATCH 1079/6226] maintainers/scripts/pluginupdate-py: fix linter
 errors

---
 .../scripts/pluginupdate-py/pluginupdate.py   | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/maintainers/scripts/pluginupdate-py/pluginupdate.py b/maintainers/scripts/pluginupdate-py/pluginupdate.py
index c65a27b16cd7..d42ec2709470 100644
--- a/maintainers/scripts/pluginupdate-py/pluginupdate.py
+++ b/maintainers/scripts/pluginupdate-py/pluginupdate.py
@@ -104,7 +104,7 @@ class Repo:
         self._branch = branch
         # Redirect is the new Repo to use
         self.redirect: "Repo | None" = None
-        self.token = "dummy_token"
+        self.token: str | None = "dummy_token"
 
     @property
     def name(self):
@@ -141,7 +141,7 @@ class Repo:
         loaded = json.loads(data)
         return loaded
 
-    def prefetch(self, ref: str | None) -> str:
+    def prefetch(self, ref: str) -> str:
         log.info("Prefetching %s", self.uri)
         loaded = self._prefetch(ref)
         return loaded["sha256"]
@@ -202,12 +202,12 @@ class RepoGitHub(Repo):
             latest_entry = root.find(ATOM_ENTRY)
             assert latest_entry is not None, f"No commits found in repository {self}"
             commit_link = latest_entry.find(ATOM_LINK)
-            assert commit_link is not None, f"No link tag found feed entry {xml}"
+            assert commit_link is not None, f"No link tag found feed entry {xml!r}"
             url = urlparse(commit_link.get("href"))
             updated_tag = latest_entry.find(ATOM_UPDATED)
             assert (
                 updated_tag is not None and updated_tag.text is not None
-            ), f"No updated tag found feed entry {xml}"
+            ), f"No updated tag found feed entry {xml!r}"
             updated = datetime.strptime(updated_tag.text, "%Y-%m-%dT%H:%M:%SZ")
             return Path(str(url.path)).name, updated
 
@@ -372,7 +372,7 @@ class Editor:
         self.default_out = default_out or root.joinpath("generated.nix")
         self.deprecated = deprecated or root.joinpath("deprecated.json")
         self.cache_file = cache_file or f"{name}-plugin-cache.json"
-        self.nixpkgs_repo = None
+        self.nixpkgs_repo: git.Repo | None = None
 
     def add(self, args):
         """CSV spec"""
@@ -403,6 +403,7 @@ class Editor:
 
             autocommit = not args.no_commit
             if autocommit:
+                assert editor.nixpkgs_repo is not None
                 commit(
                     editor.nixpkgs_repo,
                     "{drv_name}: init at {version}".format(
@@ -788,11 +789,10 @@ def make_repo(uri: str, branch) -> Repo:
     # dumb check to see if it's of the form owner/repo (=> github) or https://...
     res = urlparse(uri)
     if res.netloc in ["github.com", ""]:
-        res = res.path.strip("/").split("/")
-        repo = RepoGitHub(res[0], res[1], branch)
+        owner, repo = res.path.strip("/").split("/")
+        return RepoGitHub(owner, repo, branch)
     else:
-        repo = Repo(uri.strip(), branch)
-    return repo
+        return Repo(uri.strip(), branch)
 
 
 def get_cache_path(cache_file_name: str) -> Path | None:
@@ -928,7 +928,7 @@ def update_plugins(editor: Editor, args):
     All input arguments are grouped in the `Editor`."""
 
     log.info("Start updating plugins")
-    if args.proc > 1 and args.github_token == None:
+    if args.proc > 1 and args.github_token is None:
         log.warning(
             "You have enabled parallel updates but haven't set a github token.\n"
             "You may be hit with `HTTP Error 429: too many requests` as a consequence."
@@ -966,6 +966,7 @@ def update_plugins(editor: Editor, args):
     if redirects:
         update()
         if autocommit:
+            assert editor.nixpkgs_repo is not None
             commit(
                 editor.nixpkgs_repo,
                 f"{editor.attr_path}: resolve github repository redirects",

From 90b876fd1f9f35f28f1430ee86613c21583709e3 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 15:21:06 -0300
Subject: [PATCH 1080/6226] tetgen: fix build with cmake4

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

diff --git a/pkgs/by-name/te/tetgen/package.nix b/pkgs/by-name/te/tetgen/package.nix
index 56b6bcbe9297..d2b307a24b56 100644
--- a/pkgs/by-name/te/tetgen/package.nix
+++ b/pkgs/by-name/te/tetgen/package.nix
@@ -27,6 +27,11 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator";
     mainProgram = "tetgen";

From 63711753e634ced9b7631af90ab2ba57b2e35661 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 15:27:46 -0300
Subject: [PATCH 1081/6226] teensy-cmake-macros: fix build with cmake4

---
 pkgs/by-name/te/teensy-cmake-macros/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/te/teensy-cmake-macros/package.nix b/pkgs/by-name/te/teensy-cmake-macros/package.nix
index 45098cb5ffb5..0461db32c00f 100644
--- a/pkgs/by-name/te/teensy-cmake-macros/package.nix
+++ b/pkgs/by-name/te/teensy-cmake-macros/package.nix
@@ -29,6 +29,11 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "CMake macros for building teensy projects";
     platforms = platforms.all;

From 00c40f106941764b01cb394a276e04134e15796d Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 20 Oct 2025 18:28:41 +0100
Subject: [PATCH 1082/6226] python313Packages.nixpkgs-plugin-update: init from
 maintainer script
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We have machinery for Python packaging, so let’s make use of
it. This also helps unblock moving `by-name` overrides out of
`all-packages.nix`, as it was previously being used to work around
`nixpkgs-vet` forbidding the direct reference to the path.
---
 .../editors/kakoune/plugins/update-shell.nix  |  2 +-
 .../editors/kakoune/plugins/update.py         | 13 +++---
 .../editors/vim/plugins/utils/update.py       | 17 ++++----
 .../editors/vim/plugins/utils/updater.nix     |  6 +--
 .../lu/luarocks-packages-updater/package.nix  |  6 +--
 .../lu/luarocks-packages-updater/updater.py   |  6 +--
 .../nixpkgs-plugin-update/default.nix         | 42 +++++++++++++++++++
 .../nixpkgs-plugin-update/.gitignore          | 14 +++++++
 .../nixpkgs-plugin-update/pyproject.toml      | 20 +++++++++
 .../src/nixpkgs_plugin_update/__init__.py     |  7 ----
 .../src/nixpkgs_plugin_update/py.typed        |  0
 pkgs/top-level/all-packages.nix               |  4 --
 pkgs/top-level/python-packages.nix            |  2 +
 13 files changed, 99 insertions(+), 40 deletions(-)
 create mode 100644 pkgs/development/python-modules/nixpkgs-plugin-update/default.nix
 create mode 100644 pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/.gitignore
 create mode 100644 pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/pyproject.toml
 rename maintainers/scripts/pluginupdate-py/pluginupdate.py => pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py (99%)
 rename maintainers/scripts/pluginupdate-py/__init__.py => pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/py.typed (100%)

diff --git a/pkgs/applications/editors/kakoune/plugins/update-shell.nix b/pkgs/applications/editors/kakoune/plugins/update-shell.nix
index 787891309237..761ed6aad3ca 100644
--- a/pkgs/applications/editors/kakoune/plugins/update-shell.nix
+++ b/pkgs/applications/editors/kakoune/plugins/update-shell.nix
@@ -4,7 +4,7 @@
 
 with pkgs;
 let
-  pyEnv = python3.withPackages (ps: [ ps.gitpython ]);
+  pyEnv = python3.withPackages (ps: [ ps.nixpkgs-plugin-update ]);
 in
 
 mkShell {
diff --git a/pkgs/applications/editors/kakoune/plugins/update.py b/pkgs/applications/editors/kakoune/plugins/update.py
index 9b06d0c06e9c..169304c9aa4e 100755
--- a/pkgs/applications/editors/kakoune/plugins/update.py
+++ b/pkgs/applications/editors/kakoune/plugins/update.py
@@ -13,12 +13,9 @@ import os
 import sys
 from pathlib import Path
 
-# Import plugin update library from maintainers/scripts/pluginupdate.py
+import nixpkgs_plugin_update
+
 ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))  # type: ignore
-sys.path.insert(
-    0, os.path.join(ROOT.parent.parent.parent.parent.parent, "maintainers", "scripts")
-)
-import pluginupdate
 
 GET_PLUGINS = f"""with import <localpkgs> {{ }};
 let
@@ -53,10 +50,10 @@ lib.mapAttrs parse generated"""
 HEADER = "# This file has been @generated by ./pkgs/applications/editors/kakoune/plugins/update.py. Do not edit!"
 
 
-class KakouneEditor(pluginupdate.Editor):
+class KakouneEditor(nixpkgs_plugin_update.Editor):
     def generate_nix(
         self,
-        plugins: list[tuple[pluginupdate.PluginDesc, pluginupdate.Plugin]],
+        plugins: list[tuple[nixpkgs_plugin_update.PluginDesc, nixpkgs_plugin_update.Plugin]],
         outfile: str,
     ):
         with open(outfile, "w+") as f:
@@ -88,7 +85,7 @@ in lib.fix' (lib.extends overrides packages)
         print(f"updated {outfile}")
 
     def update(self, args):
-        pluginupdate.update_plugins(self, args)
+        nixpkgs_plugin_update.update_plugins(self, args)
 
 
 def main():
diff --git a/pkgs/applications/editors/vim/plugins/utils/update.py b/pkgs/applications/editors/vim/plugins/utils/update.py
index 9458b8f074d7..c167f0a92386 100755
--- a/pkgs/applications/editors/vim/plugins/utils/update.py
+++ b/pkgs/applications/editors/vim/plugins/utils/update.py
@@ -27,12 +27,11 @@ from typing import List, Tuple
 
 log = logging.getLogger("vim-updater")
 
-# Import plugin update library from maintainers/scripts/pluginupdate.py
 ROOT = Path(os.path.dirname(os.path.abspath(inspect.getfile(inspect.currentframe()))))
 import importlib
 
-import pluginupdate
-from pluginupdate import PluginDesc, run_nix_expr
+import nixpkgs_plugin_update
+from nixpkgs_plugin_update import PluginDesc, run_nix_expr
 
 treesitter = importlib.import_module("nvim-treesitter.update")
 
@@ -44,15 +43,15 @@ HEADER = (
 NIXPKGS_NVIMTREESITTER_FOLDER = "pkgs/applications/editors/vim/plugins/nvim-treesitter"
 
 
-class VimEditor(pluginupdate.Editor):
+class VimEditor(nixpkgs_plugin_update.Editor):
     nvim_treesitter_updated = False
 
     def generate_nix(
-        self, plugins: List[Tuple[PluginDesc, pluginupdate.Plugin]], outfile: str
+        self, plugins: List[Tuple[PluginDesc, nixpkgs_plugin_update.Plugin]], outfile: str
     ):
         log.info("Generating nix code")
         log.debug("Loading nvim-treesitter revision from nix...")
-        nvim_treesitter_rev = pluginupdate.run_nix_expr(
+        nvim_treesitter_rev = nixpkgs_plugin_update.run_nix_expr(
             "(import <localpkgs> { }).vimPlugins.nvim-treesitter.src.rev",
             self.nixpkgs,
             timeout=10,
@@ -64,7 +63,7 @@ class VimEditor(pluginupdate.Editor):
         log.debug("Loading list of lua plugins...")
         luaPlugins = run_nix_expr(GET_PLUGINS_LUA, self.nixpkgs, timeout=30)
 
-        def _isNeovimPlugin(plug: pluginupdate.Plugin) -> bool:
+        def _isNeovimPlugin(plug: nixpkgs_plugin_update.Plugin) -> bool:
             """
             Whether it's a neovim-only plugin
             We can check if it's available in lua packages
@@ -103,7 +102,7 @@ class VimEditor(pluginupdate.Editor):
         print(f"updated {outfile}")
 
     def plugin2nix(
-        self, pdesc: PluginDesc, plugin: pluginupdate.Plugin, isNeovim: bool
+        self, pdesc: PluginDesc, plugin: nixpkgs_plugin_update.Plugin, isNeovim: bool
     ) -> str:
         if isNeovim:
             raise RuntimeError(f"Plugin {plugin.name} is already packaged in `luaPackages`, please use that")
@@ -129,7 +128,7 @@ class VimEditor(pluginupdate.Editor):
         return content
 
     def update(self, args):
-        pluginupdate.update_plugins(self, args)
+        nixpkgs_plugin_update.update_plugins(self, args)
 
         # TODO this should probably be skipped when running outside a nixpkgs checkout
         if self.nvim_treesitter_updated:
diff --git a/pkgs/applications/editors/vim/plugins/utils/updater.nix b/pkgs/applications/editors/vim/plugins/utils/updater.nix
index 9560708fbb0e..369b1b79e9b6 100644
--- a/pkgs/applications/editors/vim/plugins/utils/updater.nix
+++ b/pkgs/applications/editors/vim/plugins/utils/updater.nix
@@ -24,8 +24,8 @@ buildPythonApplication {
   ];
 
   pythonPath = [
-    python3Packages.gitpython
     python3Packages.requests
+    python3Packages.nixpkgs-plugin-update
   ];
 
   dontUnpack = true;
@@ -43,12 +43,12 @@ buildPythonApplication {
         neovim-unwrapped
         nurl
       ]
-    }" --prefix PYTHONPATH : "${./.}:${../../../../../../maintainers/scripts/pluginupdate-py}" )
+    }" --prefix PYTHONPATH : "${./.}" )
     wrapPythonPrograms
   '';
 
   shellHook = ''
-    export PYTHONPATH=pkgs/applications/editors/vim/plugins:maintainers/scripts/pluginupdate-py:$PYTHONPATH
+    export PYTHONPATH=pkgs/applications/editors/vim/plugins:$PYTHONPATH
   '';
 
   passthru.updateScript = writeShellScript "updateScript" ''
diff --git a/pkgs/by-name/lu/luarocks-packages-updater/package.nix b/pkgs/by-name/lu/luarocks-packages-updater/package.nix
index cf41d472435e..d597834c7bc0 100644
--- a/pkgs/by-name/lu/luarocks-packages-updater/package.nix
+++ b/pkgs/by-name/lu/luarocks-packages-updater/package.nix
@@ -5,7 +5,6 @@
   lib,
   nix-prefetch-scripts,
   luarocks-nix,
-  pluginupdate,
   lua5_1,
   lua5_2,
   lua5_3,
@@ -41,18 +40,15 @@ python3Packages.buildPythonApplication {
   ];
 
   dependencies = [
-    python3Packages.gitpython
+    python3Packages.nixpkgs-plugin-update
   ];
 
   postFixup = ''
-    echo "pluginupdate folder ${pluginupdate}"
     wrapProgram $out/bin/luarocks-packages-updater \
-     --prefix PYTHONPATH : "${pluginupdate}" \
      --prefix PATH : "${path}"
   '';
 
   shellHook = ''
-    export PYTHONPATH="maintainers/scripts/pluginupdate-py:$PYTHONPATH"
     export PATH="${path}:$PATH"
   '';
 
diff --git a/pkgs/by-name/lu/luarocks-packages-updater/updater.py b/pkgs/by-name/lu/luarocks-packages-updater/updater.py
index 4aa7ea6b9db0..555cde43ec55 100755
--- a/pkgs/by-name/lu/luarocks-packages-updater/updater.py
+++ b/pkgs/by-name/lu/luarocks-packages-updater/updater.py
@@ -18,8 +18,8 @@ from dataclasses import dataclass
 from multiprocessing.dummy import Pool
 from pathlib import Path
 
-import pluginupdate
-from pluginupdate import FetchConfig, update_plugins
+import nixpkgs_plugin_update
+from nixpkgs_plugin_update import FetchConfig, update_plugins
 
 
 class ColoredFormatter(logging.Formatter):
@@ -88,7 +88,7 @@ class LuaPlugin:
 
 
 # rename Editor to LangUpdate/ EcosystemUpdater
-class LuaEditor(pluginupdate.Editor):
+class LuaEditor(nixpkgs_plugin_update.Editor):
     def create_parser(self):
         parser = super().create_parser()
         parser.set_defaults(proc=1)
diff --git a/pkgs/development/python-modules/nixpkgs-plugin-update/default.nix b/pkgs/development/python-modules/nixpkgs-plugin-update/default.nix
new file mode 100644
index 000000000000..ddba0da26cbb
--- /dev/null
+++ b/pkgs/development/python-modules/nixpkgs-plugin-update/default.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  buildPythonPackage,
+  uv-build,
+  gitpython,
+  ruff,
+  mypy,
+}:
+
+buildPythonPackage {
+  pname = "nixpkgs-plugin-update";
+  version = "0.1.0";
+  format = "pyproject";
+
+  src = ./nixpkgs-plugin-update;
+
+  build-system = [ uv-build ];
+
+  dependencies = [
+    gitpython
+  ];
+
+  nativeCheckInputs = [
+    ruff
+    mypy
+  ];
+
+  postInstallCheck = ''
+    ruff check
+    mypy
+  '';
+
+  meta = {
+    description = "Library for updating plugin collections in Nixpkgs";
+    license = lib.licenses.mit;
+    maintainers = [
+      lib.maintainers.teto
+      lib.maintainers.perchun
+      lib.maintainers.khaneliman
+    ];
+  };
+}
diff --git a/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/.gitignore b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/.gitignore
new file mode 100644
index 000000000000..688db6151f29
--- /dev/null
+++ b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/.gitignore
@@ -0,0 +1,14 @@
+uv.lock
+.ruff_cache/
+.mypy_cache/
+
+# Python-generated files
+__pycache__/
+*.py[oc]
+build/
+dist/
+wheels/
+*.egg-info
+
+# Virtual environments
+.venv
diff --git a/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/pyproject.toml b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/pyproject.toml
new file mode 100644
index 000000000000..4c55bbb015b7
--- /dev/null
+++ b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/pyproject.toml
@@ -0,0 +1,20 @@
+[project]
+name = "nixpkgs-plugin-update"
+version = "0.1.0"
+requires-python = ">=3.12"
+dependencies = [
+    "gitpython>=3.1.45",
+]
+
+[build-system]
+requires = ["uv_build>=0.8.19"]
+build-backend = "uv_build"
+
+[dependency-groups]
+dev = [
+    "mypy>=1.18.2",
+    "ruff>=0.14.1",
+]
+
+[tool.mypy]
+packages = ["nixpkgs_plugin_update"]
diff --git a/maintainers/scripts/pluginupdate-py/pluginupdate.py b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py
similarity index 99%
rename from maintainers/scripts/pluginupdate-py/pluginupdate.py
rename to pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py
index d42ec2709470..299d5a056a99 100644
--- a/maintainers/scripts/pluginupdate-py/pluginupdate.py
+++ b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/__init__.py
@@ -3,13 +3,6 @@
 # - pkgs/applications/editors/kakoune/plugins/update.py
 # - pkgs/development/lua-modules/updater/updater.py
 
-# format:
-# $ nix run nixpkgs#ruff maintainers/scripts/pluginupdate.py
-# type-check:
-# $ nix run nixpkgs#python3.pkgs.mypy maintainers/scripts/pluginupdate.py
-# linted:
-# $ nix run nixpkgs#python3.pkgs.flake8 -- --ignore E501,E265 maintainers/scripts/pluginupdate.py
-
 import argparse
 import csv
 import functools
diff --git a/maintainers/scripts/pluginupdate-py/__init__.py b/pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/py.typed
similarity index 100%
rename from maintainers/scripts/pluginupdate-py/__init__.py
rename to pkgs/development/python-modules/nixpkgs-plugin-update/nixpkgs-plugin-update/src/nixpkgs_plugin_update/py.typed
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a2c59749b7bc..ff1e9554de01 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5830,10 +5830,6 @@ with pkgs;
   luarocks = luaPackages.luarocks;
   luarocks-nix = luaPackages.luarocks-nix;
 
-  luarocks-packages-updater = callPackage ../by-name/lu/luarocks-packages-updater/package.nix {
-    pluginupdate = ../../maintainers/scripts/pluginupdate-py;
-  };
-
   toluapp = callPackage ../development/tools/toluapp {
     lua = lua5_1; # doesn't work with any other :(
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8eb2ed8fda8a..25f943dce4ea 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10602,6 +10602,8 @@ self: super: with self; {
 
   nix-prefetch-github = callPackage ../development/python-modules/nix-prefetch-github { };
 
+  nixpkgs-plugin-update = callPackage ../development/python-modules/nixpkgs-plugin-update { };
+
   nixpkgs-pytools = callPackage ../development/python-modules/nixpkgs-pytools { };
 
   nixpkgs-updaters-library = callPackage ../development/python-modules/nixpkgs-updaters-library { };

From 93c494f7d2d39dbde52048a132f75d9466b054fb Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 15:36:59 -0300
Subject: [PATCH 1083/6226] teapot: fix build with cmake4

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

diff --git a/pkgs/by-name/te/teapot/package.nix b/pkgs/by-name/te/teapot/package.nix
index 0fee424811fb..7bfa9a9f6f8e 100644
--- a/pkgs/by-name/te/teapot/package.nix
+++ b/pkgs/by-name/te/teapot/package.nix
@@ -46,6 +46,11 @@ stdenv.mkDerivation (finalAttrs: {
     "-DENABLE_HELP=OFF"
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "Table Editor And Planner, Or: Teapot";
     longDescription = ''

From eced5cf47d1f438e433290cec692ce16a1e32fee Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Mon, 20 Oct 2025 11:34:07 -0700
Subject: [PATCH 1084/6226] woodpecker: remove deprecated subcommands of nix
 hash

---
 .../tools/continuous-integration/woodpecker/update.sh           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/continuous-integration/woodpecker/update.sh b/pkgs/development/tools/continuous-integration/woodpecker/update.sh
index 98c2888c27de..10b16d9f5062 100755
--- a/pkgs/development/tools/continuous-integration/woodpecker/update.sh
+++ b/pkgs/development/tools/continuous-integration/woodpecker/update.sh
@@ -28,5 +28,5 @@ sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix
 
 # Woodpecker repository
 src_hash=$(nix-prefetch-url --type sha256 --unpack "https://github.com/woodpecker-ci/woodpecker/releases/download/v$version/woodpecker-src.tar.gz")
-src_hash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 "$src_hash")
+src_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$src_hash")
 sed -i -E -e "s#srcHash = \".*\"#srcHash = \"$src_hash\"#" common.nix

From 6e8317c620e07acfe9342393874c057df1ffebb4 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Mon, 20 Oct 2025 11:42:17 -0700
Subject: [PATCH 1085/6226] woodpecker: cleanup

---
 .../tools/continuous-integration/woodpecker/common.nix   | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/woodpecker/common.nix b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
index ee8f8106657a..aaae68d75956 100644
--- a/pkgs/development/tools/continuous-integration/woodpecker/common.nix
+++ b/pkgs/development/tools/continuous-integration/woodpecker/common.nix
@@ -2,8 +2,7 @@
 let
   version = "3.11.0";
   srcHash = "sha256-mLyEHNMePVZI6MOSyeD9NMp9QXRXQ7h3LFSxHxpf878=";
-  # The tarball contains vendored dependencies
-  vendorHash = null;
+  vendorHash = null; # The tarball contains vendored dependencies
 in
 {
   inherit version vendorHash;
@@ -38,11 +37,11 @@ in
     "-X go.woodpecker-ci.org/woodpecker/v3/version.Version=${version}"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://woodpecker-ci.org/";
     changelog = "https://github.com/woodpecker-ci/woodpecker/blob/v${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       ambroisie
       marcusramberg
       techknowlogick

From 084df7a420e6ecf4bee407001bfbd88f32894577 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Fri, 29 Aug 2025 12:34:49 -0400
Subject: [PATCH 1086/6226] television: Refactor, add wrapper helper

---
 pkgs/by-name/te/television/package.nix | 133 ++++++++++++++++---------
 pkgs/by-name/te/television/wrapper.nix |  33 ++++++
 2 files changed, 119 insertions(+), 47 deletions(-)
 create mode 100644 pkgs/by-name/te/television/wrapper.nix

diff --git a/pkgs/by-name/te/television/package.nix b/pkgs/by-name/te/television/package.nix
index ee92352468e8..55a1b4ad9517 100644
--- a/pkgs/by-name/te/television/package.nix
+++ b/pkgs/by-name/te/television/package.nix
@@ -1,60 +1,99 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
-  makeWrapper,
-  testers,
-  television,
+  callPackage,
+  installShellFiles,
   nix-update-script,
-  extraPackages ? [ ],
+  testers,
+  targetPackages,
+  extraPackages ? null,
 }:
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "television";
-  version = "0.13.5";
 
-  src = fetchFromGitHub {
-    owner = "alexpasmantier";
-    repo = "television";
-    tag = finalAttrs.version;
-    hash = "sha256-IlFOYnZ9xPQaRheielKqAckyVlSVQMhnO4wCtVixlNQ=";
-  };
+assert
+  (extraPackages == null)
+  || lib.warn "Overriding television with the 'extraPackages' attribute is deprecated. Please use `television.withPackages (p: [ p.fd ...])` instead.";
 
-  cargoHash = "sha256-QKUspbC1bmSeZP0n/O5roEqQkrja+fVKLhAvgzqNS9E=";
+let
+  television = rustPlatform.buildRustPackage (finalAttrs: {
+    pname = "television";
 
-  nativeBuildInputs = [ makeWrapper ];
+    version = "0.13.5";
 
-  postInstall = lib.optionalString (extraPackages != [ ]) ''
-    wrapProgram $out/bin/tv \
-      --prefix PATH : ${lib.makeBinPath extraPackages}
-  '';
-
-  # TODO(@getchoo): Investigate selectively disabling some tests, or fixing them
-  # https://github.com/NixOS/nixpkgs/pull/423662#issuecomment-3156362941
-  doCheck = false;
-
-  passthru = {
-    tests.version = testers.testVersion {
-      package = television;
-      command = "XDG_DATA_HOME=$TMPDIR tv --version";
+    src = fetchFromGitHub {
+      owner = "alexpasmantier";
+      repo = "television";
+      tag = finalAttrs.version;
+      hash = "sha256-IlFOYnZ9xPQaRheielKqAckyVlSVQMhnO4wCtVixlNQ=";
     };
-    updateScript = nix-update-script { };
-  };
 
-  meta = {
-    description = "Blazingly fast general purpose fuzzy finder TUI";
-    longDescription = ''
-      Television is a fast and versatile fuzzy finder TUI.
-      It lets you quickly search through any kind of data source (files, git
-      repositories, environment variables, docker images, you name it) using a
-      fuzzy matching algorithm and is designed to be easily extensible.
-    '';
-    homepage = "https://github.com/alexpasmantier/television";
-    changelog = "https://github.com/alexpasmantier/television/releases/tag/${finalAttrs.version}";
-    license = lib.licenses.mit;
-    mainProgram = "tv";
-    maintainers = with lib.maintainers; [
-      louis-thevenet
-      getchoo
+    cargoHash = "sha256-QKUspbC1bmSeZP0n/O5roEqQkrja+fVKLhAvgzqNS9E=";
+
+    strictDeps = true;
+    nativeBuildInputs = [
+      installShellFiles
     ];
-  };
-})
+
+    # TODO(@getchoo): Investigate selectively disabling some tests, or fixing them
+    # https://github.com/NixOS/nixpkgs/pull/423662#issuecomment-3156362941
+    doCheck = false;
+
+    postInstall = ''
+      installManPage target/${stdenv.hostPlatform.rust.cargoShortTarget}/assets/tv.1
+
+      installShellCompletion --cmd tv \
+        television/utils/shell/completion.bash \
+        television/utils/shell/completion.fish \
+        television/utils/shell/completion.nu \
+        television/utils/shell/completion.zsh
+    '';
+
+    passthru = {
+      updateScript = nix-update-script { };
+
+      withPackages =
+        f:
+        callPackage ./wrapper.nix {
+          television = finalAttrs.finalPackage;
+          extraPackages = f targetPackages;
+        };
+
+      tests = {
+        version = testers.testVersion {
+          package = finalAttrs.finalPackage;
+          command = "XDG_DATA_HOME=$TMPDIR tv --version";
+        };
+        wrapper = testers.testVersion {
+          package = finalAttrs.finalPackage.withPackages (pkgs: [
+            pkgs.fd
+            pkgs.git
+          ]);
+
+          command = "XDG_DATA_HOME=$TMPDIR tv --version";
+        };
+      };
+    };
+
+    meta = {
+      description = "Blazingly fast general purpose fuzzy finder TUI";
+      longDescription = ''
+        Television is a fast and versatile fuzzy finder TUI.
+        It lets you quickly search through any kind of data source (files, git
+        repositories, environment variables, docker images, you name it) using a
+        fuzzy matching algorithm and is designed to be easily extensible.
+      '';
+      homepage = "https://github.com/alexpasmantier/television";
+      changelog = "https://github.com/alexpasmantier/television/releases/tag/${finalAttrs.version}";
+      license = lib.licenses.mit;
+      mainProgram = "tv";
+      maintainers = with lib.maintainers; [
+        louis-thevenet
+        getchoo
+        RossSmyth
+      ];
+    };
+  });
+in
+
+if extraPackages == null then television else television.withPackages (lib.const extraPackages)
diff --git a/pkgs/by-name/te/television/wrapper.nix b/pkgs/by-name/te/television/wrapper.nix
new file mode 100644
index 000000000000..75725f0051df
--- /dev/null
+++ b/pkgs/by-name/te/television/wrapper.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  symlinkJoin,
+  television,
+  makeBinaryWrapper,
+  extraPackages,
+}:
+
+symlinkJoin {
+  inherit (television) version;
+  pname = "${television.pname}-with-pkgs";
+
+  paths = [ television ];
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  postBuild = ''
+    wrapProgram $out/bin/tv \
+      --prefix PATH : "${lib.makeBinPath extraPackages}"
+  '';
+
+  meta = {
+    inherit (television.meta)
+      description
+      longDescription
+      homepage
+      changelog
+      license
+      mainProgram
+      maintainers
+      ;
+  };
+}

From adc720421b965f9dddc1033be26bfa7aa02e3405 Mon Sep 17 00:00:00 2001
From: adeci <alex.decious@gmail.com>
Date: Sun, 19 Oct 2025 19:49:32 -0400
Subject: [PATCH 1087/6226] python3Packages.chromadb: anonymized telemetry
 opt-in

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

diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix
index 6f7605e74ae5..ad01ae1680f7 100644
--- a/pkgs/development/python-modules/chromadb/default.nix
+++ b/pkgs/development/python-modules/chromadb/default.nix
@@ -93,6 +93,11 @@ buildPythonPackage rec {
     # Nixpkgs is taking the version from `chromadb_rust_bindings` which is versioned independently
     substituteInPlace pyproject.toml \
       --replace-fail "dynamic = [\"version\"]" "version = \"${version}\""
+
+    # Flip anonymized telemetry to opt in versus current opt-in out for privacy
+    substituteInPlace chromadb/config.py \
+      --replace-fail "anonymized_telemetry: bool = True" \
+                     "anonymized_telemetry: bool = False"
   '';
 
   pythonRelaxDeps = [

From d6c47de4c65fd1d87817b9671f1643af2af2c293 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 15:54:17 -0300
Subject: [PATCH 1088/6226] tangerine: fix build with cmake4

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

diff --git a/pkgs/by-name/ta/tangerine/package.nix b/pkgs/by-name/ta/tangerine/package.nix
index 394c5bb331ed..98d324d770b3 100644
--- a/pkgs/by-name/ta/tangerine/package.nix
+++ b/pkgs/by-name/ta/tangerine/package.nix
@@ -37,6 +37,14 @@ stdenv.mkDerivation {
     libX11
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.24)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace third_party/glm-0.9.9.8/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_policy(VERSION 3.2)" "cmake_policy(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "System for creating 3D models procedurally from a set of Signed Distance Function (SDF) primitive shapes and combining operators";
     homepage = "https://github.com/Aeva/tangerine";

From 95f063d9fb8b2f847f70ef52b80b2774c0309a4f Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 20 Oct 2025 21:01:52 +0200
Subject: [PATCH 1089/6226] fparser: 0-unstable-2015-09-25 ->
 0-unstable-2025-06-23

fix for CMake v4
Part of https://github.com/NixOS/nixpkgs/issues/445447
---
 pkgs/by-name/fp/fparser/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/fp/fparser/package.nix b/pkgs/by-name/fp/fparser/package.nix
index 69506dcb38dc..ba6b540bcbc2 100644
--- a/pkgs/by-name/fp/fparser/package.nix
+++ b/pkgs/by-name/fp/fparser/package.nix
@@ -7,22 +7,22 @@
 
 stdenv.mkDerivation {
   pname = "fparser";
-  version = "0-unstable-2015-09-25";
+  version = "0-unstable-2025-06-23";
 
   src = fetchFromGitHub {
     owner = "thliebig";
     repo = "fparser";
-    rev = "a59e1f51e32096bfe2a0a2640d5dffc7ae6ba37b";
-    sha256 = "0wayml1mlyi922gp6am3fsidhzsilziksdn5kbnpcln01h8555ad";
+    rev = "ee15c675514e53b37304179b4a91319d44ba9a85";
+    hash = "sha256-YlkaJlZ60EAsaejdyaV7OK3zF7pnkhyr+PssuToFplA=";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with lib; {
+  meta = {
     description = "C++ Library for Evaluating Mathematical Functions";
     homepage = "https://github.com/thliebig/fparser";
-    license = licenses.lgpl3;
-    maintainers = with maintainers; [ matthuszagh ];
-    platforms = platforms.linux;
+    license = lib.licenses.lgpl3;
+    maintainers = with lib.maintainers; [ matthuszagh ];
+    platforms = lib.platforms.linux;
   };
 }

From bd8004d72646c60d8e315e0ec34dc6d7e7821408 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Thu, 16 Oct 2025 19:19:18 -0700
Subject: [PATCH 1090/6226] miro: init at 0.6.2

Co-authored-by: winston <hey@winston.sh>
---
 pkgs/by-name/mi/miro/package.nix | 60 ++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 pkgs/by-name/mi/miro/package.nix

diff --git a/pkgs/by-name/mi/miro/package.nix b/pkgs/by-name/mi/miro/package.nix
new file mode 100644
index 000000000000..5324949a7278
--- /dev/null
+++ b/pkgs/by-name/mi/miro/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  fontconfig,
+  wayland,
+  libxkbcommon,
+  libglvnd,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "miro";
+  version = "0.6.2";
+
+  src = fetchFromGitHub {
+    owner = "vincent-uden";
+    repo = "miro";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-znrbAufYM+YIPm0oSZ8i4vHHrhlgSQWMzKfqdF8qaow=";
+  };
+
+  cargoHash = "sha256-VP2RUKTQM2AkXY/KgN0tjWXF7SQ24geAvxEQJitH23I=";
+
+  nativeBuildInputs = [
+    rustPlatform.bindgenHook
+    pkg-config
+  ];
+
+  buildInputs = [
+    wayland
+    fontconfig
+    libxkbcommon
+    libglvnd
+  ];
+
+  RUSTFLAGS = map (a: "-C link-arg=${a}") [
+    "-Wl,--push-state,--no-as-needed"
+    "-lEGL"
+    "-lwayland-client"
+    "-lxkbcommon"
+    "-Wl,--pop-state"
+  ];
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Native PDF viewer (Wayland/X11) with configurable keybindings";
+    homepage = "https://github.com/vincent-uden/miro";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ yiyu ];
+    mainProgram = "miro-pdf";
+  };
+})

From 6154148eb4a37bf95d700c55c8829cdcf39ee5e8 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 16:14:36 -0300
Subject: [PATCH 1091/6226] surge: fix build with cmake4

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

diff --git a/pkgs/by-name/su/surge/package.nix b/pkgs/by-name/su/surge/package.nix
index f5496d621092..af14e136c846 100644
--- a/pkgs/by-name/su/surge/package.nix
+++ b/pkgs/by-name/su/surge/package.nix
@@ -77,6 +77,9 @@ stdenv.mkDerivation (finalAttrs: {
       --replace '"zenity' '"${zenity}/bin/zenity'
     patchShebangs scripts/linux/
     cp -r $extraContent/Skins/ resources/data/skins
+
+    substituteInPlace libs/libsamplerate/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1..3.18)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   installPhase = ''

From 9227e50841ab9e67a14bdfa5d8a214ffbafa3319 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Mon, 20 Oct 2025 13:38:23 -0400
Subject: [PATCH 1092/6226] nodePackages.keyoxide: migrate from nodePackages

---
 pkgs/by-name/ke/keyoxide-cli/package.nix      |   48 +
 pkgs/development/node-packages/aliases.nix    |    1 +
 .../node-packages/node-packages.json          |    1 -
 .../node-packages/node-packages.nix           | 2002 -----------------
 pkgs/development/node-packages/overrides.nix  |    9 -
 5 files changed, 49 insertions(+), 2012 deletions(-)
 create mode 100644 pkgs/by-name/ke/keyoxide-cli/package.nix

diff --git a/pkgs/by-name/ke/keyoxide-cli/package.nix b/pkgs/by-name/ke/keyoxide-cli/package.nix
new file mode 100644
index 000000000000..6e91da843c38
--- /dev/null
+++ b/pkgs/by-name/ke/keyoxide-cli/package.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitea,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "keyoxide-cli";
+  version = "0.4.4";
+
+  src = fetchFromGitea {
+    domain = "codeberg.org";
+    owner = "keyoxide";
+    repo = "keyoxide-cli";
+    tag = finalAttrs.version;
+    hash = "sha256-lQEvtqFq3OBlXdYdrhMsAns4kimR2RfRx3VFNy4nEu8=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-UxP5NkmA3MsrXhoa+JviDdW19HKE6Xpj1dkN7h0ggck=";
+  };
+
+  yarnBuildScript = "prettier";
+  yarnBuildFlags = "src/commands.js";
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    # Needed for executing package.json scripts
+    nodejs
+  ];
+
+  meta = {
+    changelog = "https://codeberg.org/keyoxide/keyoxide-cli/releases/tag/${finalAttrs.version}";
+    description = "Command-line interface to locally verify decentralized identities";
+    homepage = "https://codeberg.org/keyoxide/keyoxide-cli";
+    license = lib.licenses.agpl3Plus;
+    maintainers = [ lib.maintainers.pyrox0 ];
+    mainProgram = "keyoxide";
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index cb854d38bf89..e6456bc89b8f 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -146,6 +146,7 @@ mapAliases {
   inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
   inherit (pkgs) kaput-cli; # added 2024-12-03
   karma = pkgs.karma-runner; # added 2023-07-29
+  keyoxide = pkgs.keyoxide-cli; # Added 2025-10-20
   leetcode-cli = self.vsc-leetcode-cli; # added 2023-08-31
   inherit (pkgs) lerna; # added 2025-02-12
   less = pkgs.lessc; # added 2024-06-15
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 8c65f3108b44..c6743bde031b 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -96,7 +96,6 @@
 , "jsonlint"
 , "jsonplaceholder"
 , "katex"
-, "keyoxide"
 , "lcov-result-merger"
 , "live-server"
 , "livedown"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 4ea05e93a096..886f6c396768 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -1479,15 +1479,6 @@ let
         sha512 = "SriLPKezypIsiZ+TtlFfE46uuBIap2HeaQVS78e1P7rz5OSbq0rsd52WE1mC5f7vAeLiXqv7I7oRhL3WFZEw3Q==";
       };
     };
-    "@babel/cli-7.26.4" = {
-      name = "_at_babel_slash_cli";
-      packageName = "@babel/cli";
-      version = "7.26.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/cli/-/cli-7.26.4.tgz";
-        sha512 = "+mORf3ezU3p3qr+82WvJSnQNE1GAYeoCfEv4fik6B5/2cvKZ75AX8oawWQdXtM9MmndooQj15Jr9kelRFWsuRw==";
-      };
-    };
     "@babel/code-frame-7.26.2" = {
       name = "_at_babel_slash_code-frame";
       packageName = "@babel/code-frame";
@@ -1515,15 +1506,6 @@ let
         sha512 = "vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==";
       };
     };
-    "@babel/generator-7.18.2" = {
-      name = "_at_babel_slash_generator";
-      packageName = "@babel/generator";
-      version = "7.18.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz";
-        sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw==";
-      };
-    };
     "@babel/generator-7.26.10" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
@@ -1668,24 +1650,6 @@ let
         sha512 = "UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==";
       };
     };
-    "@babel/node-7.26.0" = {
-      name = "_at_babel_slash_node";
-      packageName = "@babel/node";
-      version = "7.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/node/-/node-7.26.0.tgz";
-        sha512 = "5ASMjh42hbnqyCOK68Q5chh1jKAqn91IswFTN+niwt4FLABhEWCT1tEuuo6mlNQ4WG/oFQLvJ71PaHAKtWtJyA==";
-      };
-    };
-    "@babel/parser-7.18.4" = {
-      name = "_at_babel_slash_parser";
-      packageName = "@babel/parser";
-      version = "7.18.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.4.tgz";
-        sha512 = "FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow==";
-      };
-    };
     "@babel/parser-7.26.10" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
@@ -1722,15 +1686,6 @@ let
         sha512 = "MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==";
       };
     };
-    "@babel/plugin-transform-react-jsx-7.25.9" = {
-      name = "_at_babel_slash_plugin-transform-react-jsx";
-      packageName = "@babel/plugin-transform-react-jsx";
-      version = "7.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.25.9.tgz";
-        sha512 = "s5XwpQYCqGerXl+Pu6VDL3x0j2d82eiV77UJ8a2mDHAW7j9SWRqQ2y1fNo1Z74CdcYipl5Z41zvjj4Nfzq36rw==";
-      };
-    };
     "@babel/plugin-transform-typescript-7.26.8" = {
       name = "_at_babel_slash_plugin-transform-typescript";
       packageName = "@babel/plugin-transform-typescript";
@@ -1749,15 +1704,6 @@ let
         sha512 = "NMk1IGZ5I/oHhoXEElcm+xUnL/szL6xflkFZmoEU9xj1qSJXpiS7rsspYo92B4DRCDvZn2erT5LdsCeXAKNCkg==";
       };
     };
-    "@babel/register-7.25.9" = {
-      name = "_at_babel_slash_register";
-      packageName = "@babel/register";
-      version = "7.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/register/-/register-7.25.9.tgz";
-        sha512 = "8D43jXtGsYmEeDvm4MWHYUpWf8iiXgWYx3fW7E7Wb7Oe6FWqJPl5K6TuFW0dOwNZzEE5rjlaSJYH9JjrUKJszA==";
-      };
-    };
     "@babel/runtime-7.26.10" = {
       name = "_at_babel_slash_runtime";
       packageName = "@babel/runtime";
@@ -1794,15 +1740,6 @@ let
         sha512 = "k8NuDrxr0WrPH5Aupqb2LCVURP/S0vBEn5mK6iH+GIYob66U5EtoZvcdudR2jQ4cmTwhEwW1DLB+Yyas9zjF6A==";
       };
     };
-    "@babel/types-7.19.0" = {
-      name = "_at_babel_slash_types";
-      packageName = "@babel/types";
-      version = "7.19.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz";
-        sha512 = "YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==";
-      };
-    };
     "@babel/types-7.26.10" = {
       name = "_at_babel_slash_types";
       packageName = "@babel/types";
@@ -3929,24 +3866,6 @@ let
         sha512 = "XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==";
       };
     };
-    "@openpgp/hkp-client-0.0.2" = {
-      name = "_at_openpgp_slash_hkp-client";
-      packageName = "@openpgp/hkp-client";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@openpgp/hkp-client/-/hkp-client-0.0.2.tgz";
-        sha512 = "hA71RhqfLfNltZsy/USTQehE2QAVB3eK4xx8p76XtFJy5Zg6gK2XbZvOC/x/yG8i2Ipbyul1DMTMxH9v8rfPKw==";
-      };
-    };
-    "@openpgp/wkd-client-0.0.3" = {
-      name = "_at_openpgp_slash_wkd-client";
-      packageName = "@openpgp/wkd-client";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@openpgp/wkd-client/-/wkd-client-0.0.3.tgz";
-        sha512 = "qe+uWtCJetuG78KhfiQyEA+ZciC/qeECXRj+LCm4m0s98qR2wPwYHRI1u8aFbtkN6G4ZMyKN+opY++fJS5l3vg==";
-      };
-    };
     "@opentelemetry/api-1.9.0" = {
       name = "_at_opentelemetry_slash_api";
       packageName = "@opentelemetry/api";
@@ -4037,33 +3956,6 @@ let
         sha512 = "h5DiQG/bQL0lEGMRVvVb/FNfrN1Zx3LZSPA+XvF6EpgPiAqzZVcZ+YhYh9YzDAZg0BLsVyS9jBQzANOgoKc7yQ==";
       };
     };
-    "@peculiar/asn1-schema-2.3.15" = {
-      name = "_at_peculiar_slash_asn1-schema";
-      packageName = "@peculiar/asn1-schema";
-      version = "2.3.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@peculiar/asn1-schema/-/asn1-schema-2.3.15.tgz";
-        sha512 = "QPeD8UA8axQREpgR5UTAfu2mqQmm97oUqahDtNdBcfj3qAnoXzFdQW+aNf/tD2WVXF8Fhmftxoj0eMIT++gX2w==";
-      };
-    };
-    "@peculiar/json-schema-1.1.12" = {
-      name = "_at_peculiar_slash_json-schema";
-      packageName = "@peculiar/json-schema";
-      version = "1.1.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@peculiar/json-schema/-/json-schema-1.1.12.tgz";
-        sha512 = "coUfuoMeIB7B8/NMekxaDzLhaYmp0HZNPEjYRm9goRou8UZIC3z21s0sL9AWoCw4EG876QyO3kYrc61WNF9B/w==";
-      };
-    };
-    "@peculiar/webcrypto-1.5.0" = {
-      name = "_at_peculiar_slash_webcrypto";
-      packageName = "@peculiar/webcrypto";
-      version = "1.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@peculiar/webcrypto/-/webcrypto-1.5.0.tgz";
-        sha512 = "BRs5XUAwiyCDQMsVA9IDvDa7UBR9gAvPHgugOeGng3YN6vJ9JYonyDc0lNczErgtCWtucjR5N7VtaonboD/ezg==";
-      };
-    };
     "@pnpm/config.env-replace-1.1.0" = {
       name = "_at_pnpm_slash_config.env-replace";
       packageName = "@pnpm/config.env-replace";
@@ -7241,249 +7133,6 @@ let
         sha512 = "p96FSY54r+WJ50FIOsCOjyj/wavs8921hG5+kVMmZgKcvIKxMXHTrjNJvRgWa/zuX3B6t2lijLNFaOyuxUH+2A==";
       };
     };
-    "@xmpp/base64-0.13.2" = {
-      name = "_at_xmpp_slash_base64";
-      packageName = "@xmpp/base64";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/base64/-/base64-0.13.2.tgz";
-        sha512 = "RDEq66sW/jqj2HZKoRvnIvlRJMRLEGa0EGyJ0yPCF1+KijmTqrWr1PxZAol850QizXlqpvo8MS8OCFWMryX7RQ==";
-      };
-    };
-    "@xmpp/client-0.13.4" = {
-      name = "_at_xmpp_slash_client";
-      packageName = "@xmpp/client";
-      version = "0.13.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/client/-/client-0.13.4.tgz";
-        sha512 = "reCdmmDkXjlEXLmMB8tGLyi+2u5KJScAg2l5c0WcwwqlXFMvmIQf5Nf4boXW6rsiLnUwWyAovtx9OzMiLuODIg==";
-      };
-    };
-    "@xmpp/client-core-0.13.3" = {
-      name = "_at_xmpp_slash_client-core";
-      packageName = "@xmpp/client-core";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/client-core/-/client-core-0.13.3.tgz";
-        sha512 = "pOtCozET4BxJZU7aWykT+PFBGaxT/Sl8mC0E3X6QgL7/2Vo39lz2KIhkcvtSwMC8myuaB+klOBrifuKLo3IajA==";
-      };
-    };
-    "@xmpp/connection-0.13.3" = {
-      name = "_at_xmpp_slash_connection";
-      packageName = "@xmpp/connection";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/connection/-/connection-0.13.3.tgz";
-        sha512 = "EM6/wLUJ6MFJl7Kb+qwQut1gLDp7G107KTOB1W/GljGMd7ydD2Bn0BJt2AAx8EGPve9G2jjhV3+jJmu7KwK4rQ==";
-      };
-    };
-    "@xmpp/connection-tcp-0.13.3" = {
-      name = "_at_xmpp_slash_connection-tcp";
-      packageName = "@xmpp/connection-tcp";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/connection-tcp/-/connection-tcp-0.13.3.tgz";
-        sha512 = "6MMUSM265eBtHeLOYIe5UP1ld3oZaQMso6Cq7KJ0Xe7qC6zDy3YYaRHAe3Z+bdoJxpgmfiN8jvDM+QfypcTpKg==";
-      };
-    };
-    "@xmpp/debug-0.13.3" = {
-      name = "_at_xmpp_slash_debug";
-      packageName = "@xmpp/debug";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/debug/-/debug-0.13.3.tgz";
-        sha512 = "ccN7j/nQoDJh4VG9FKxoadRzIGMv2DjrneGu07IyZM7uwWiEiGlqiblxzYZT+PtUDBMzfFa6sumg8vIqD5lFkA==";
-      };
-    };
-    "@xmpp/error-0.13.2" = {
-      name = "_at_xmpp_slash_error";
-      packageName = "@xmpp/error";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/error/-/error-0.13.2.tgz";
-        sha512 = "bjbxwF8s6jfQNI+ZHV9Jwcb7K2kBeTlD60QHjMJlxIUrjTH1ZsJoDQh9tMdq1mBu/h/bm2SX7yZUqUb1wY6gMw==";
-      };
-    };
-    "@xmpp/events-0.13.2" = {
-      name = "_at_xmpp_slash_events";
-      packageName = "@xmpp/events";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/events/-/events-0.13.2.tgz";
-        sha512 = "fXaAMChvLnP9vEQIatFKWoAm/F9U122hShfRfVw4xS6pympThygWVPIuRuAznMt5tOyTVFWBuPge6hgGousT0g==";
-      };
-    };
-    "@xmpp/id-0.13.2" = {
-      name = "_at_xmpp_slash_id";
-      packageName = "@xmpp/id";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/id/-/id-0.13.2.tgz";
-        sha512 = "LhSzcaPvjddvL+u/xNAuu6tNtxWR7HZPTyMUck8tyYnbwsXaJQ6sDoS8AEQE8o7iW5E31xJUTOktYd/s6HMo3w==";
-      };
-    };
-    "@xmpp/iq-0.13.3" = {
-      name = "_at_xmpp_slash_iq";
-      packageName = "@xmpp/iq";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/iq/-/iq-0.13.3.tgz";
-        sha512 = "sGeyGF4OnYGTZw3PhQaYLYlE8+LRZfYijT/ESGqhY2ed9gm0U4TCR8C8s5oT7Puu6S6smdHehcvYCrcFEeQyBw==";
-      };
-    };
-    "@xmpp/jid-0.13.2" = {
-      name = "_at_xmpp_slash_jid";
-      packageName = "@xmpp/jid";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/jid/-/jid-0.13.2.tgz";
-        sha512 = "OuYrxiNdlmXgMFPJqnbZSKe/bdn1wxtc1ASEadrizI9h6T1y7tAEl5YpXFWYb+fdAL9vRD+bGCxrDUrm1er/LQ==";
-      };
-    };
-    "@xmpp/middleware-0.13.3" = {
-      name = "_at_xmpp_slash_middleware";
-      packageName = "@xmpp/middleware";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/middleware/-/middleware-0.13.3.tgz";
-        sha512 = "zZTsqLaHnfTqMBDyZh01HLYUgcHLmbalVfC32CsEcjPG5/bIete9sOUVPaiGH1cicMgi3O7WZK512RvQFcBbwA==";
-      };
-    };
-    "@xmpp/reconnect-0.13.2" = {
-      name = "_at_xmpp_slash_reconnect";
-      packageName = "@xmpp/reconnect";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/reconnect/-/reconnect-0.13.2.tgz";
-        sha512 = "FWCC+dzi23N7H99PYPqWZa7oRPNp9G7yYzMZwOpeiVporbNy+op3yUbCszo3YA3XVEsuLRQ1aQJ8evLo+GD5ow==";
-      };
-    };
-    "@xmpp/resolve-0.13.3" = {
-      name = "_at_xmpp_slash_resolve";
-      packageName = "@xmpp/resolve";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/resolve/-/resolve-0.13.3.tgz";
-        sha512 = "HL86p0a2CI0ILFYUR8vPR77ZXwxQ0xXLLRnyb88TjQ/eNbYsc1gmdXjELE0xRCfQblXZsETvUwWv5RofTYAgrQ==";
-      };
-    };
-    "@xmpp/resource-binding-0.13.3" = {
-      name = "_at_xmpp_slash_resource-binding";
-      packageName = "@xmpp/resource-binding";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/resource-binding/-/resource-binding-0.13.3.tgz";
-        sha512 = "cph/8vJ5sRHVg7Njx8rR27xAVmKWACSx95jlOw7LmUSTRSxZDw2wHsqie76HxUD5fPszOsTh/Ph7Fw1532aRUQ==";
-      };
-    };
-    "@xmpp/sasl-0.13.4" = {
-      name = "_at_xmpp_slash_sasl";
-      packageName = "@xmpp/sasl";
-      version = "0.13.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/sasl/-/sasl-0.13.4.tgz";
-        sha512 = "craijUkSSrYB43YgqHRigVe8JYFLTBdC1eiIlQRAhN37QMTCb0zz3AAgcoxYccrZDStHXNC7WMi149A4AKp6RA==";
-      };
-    };
-    "@xmpp/sasl-anonymous-0.13.2" = {
-      name = "_at_xmpp_slash_sasl-anonymous";
-      packageName = "@xmpp/sasl-anonymous";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/sasl-anonymous/-/sasl-anonymous-0.13.2.tgz";
-        sha512 = "0fI9+A+Vptcyv8+o8J2veRnodtnKahJDy5fappIZbmXLrv4JcrVBChQDWULyta0Hez9M3XWoIyuhp4pyz0IU/Q==";
-      };
-    };
-    "@xmpp/sasl-plain-0.13.2" = {
-      name = "_at_xmpp_slash_sasl-plain";
-      packageName = "@xmpp/sasl-plain";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/sasl-plain/-/sasl-plain-0.13.2.tgz";
-        sha512 = "zwS/q+Vd4YsLdnZjmCuS1JCacWWg2Vd3ecqpBmIV3S394s1Mgiwdnd2bVRen5S0kl/de+VzHg/DRLuYvC94SUg==";
-      };
-    };
-    "@xmpp/sasl-scram-sha-1-0.13.2" = {
-      name = "_at_xmpp_slash_sasl-scram-sha-1";
-      packageName = "@xmpp/sasl-scram-sha-1";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/sasl-scram-sha-1/-/sasl-scram-sha-1-0.13.2.tgz";
-        sha512 = "qHwooR3m8/BsuG17tK50ZKO97HITG+k6Chjk/pSjRfKG5Fm3mWh2U8K98QWNpJYbgVm9amkIQ0tbTaw+/kMjvQ==";
-      };
-    };
-    "@xmpp/session-establishment-0.13.3" = {
-      name = "_at_xmpp_slash_session-establishment";
-      packageName = "@xmpp/session-establishment";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/session-establishment/-/session-establishment-0.13.3.tgz";
-        sha512 = "dQhH7aIzsqyMRsjMIuER4UBCxQgvDUHjkmNoeIbUZX5bYJuGeET90tZ4eNAq6yXnpSGJiKoXVfVBxNoiXovfgA==";
-      };
-    };
-    "@xmpp/starttls-0.13.3" = {
-      name = "_at_xmpp_slash_starttls";
-      packageName = "@xmpp/starttls";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/starttls/-/starttls-0.13.3.tgz";
-        sha512 = "FjKrpahL/yBiRlMUL4d88I5N5PxQN2Mirx39Q0kyo479Nj1OY4dTA78Iy5+tsbsBYO3j5aE2tRoLhUQaMPGvBQ==";
-      };
-    };
-    "@xmpp/stream-features-0.13.2" = {
-      name = "_at_xmpp_slash_stream-features";
-      packageName = "@xmpp/stream-features";
-      version = "0.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/stream-features/-/stream-features-0.13.2.tgz";
-        sha512 = "eyxFEEDSfNvG4ybvAYTYkjaUcaytu8sAqT8DfWwrWzCkPgfRzpexsxb9yhe8hAVrvPLavOyr+zh4raUQf4Ogkg==";
-      };
-    };
-    "@xmpp/stream-management-0.13.3" = {
-      name = "_at_xmpp_slash_stream-management";
-      packageName = "@xmpp/stream-management";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/stream-management/-/stream-management-0.13.3.tgz";
-        sha512 = "hdQAyp6FldEkBktou/mbb7MPOe/EzBxP3sIjWvNQXwRMV8AJxAXyi+DhnW5sigRQoeTJJB0FGTxOlFDeXWGhPg==";
-      };
-    };
-    "@xmpp/tcp-0.13.3" = {
-      name = "_at_xmpp_slash_tcp";
-      packageName = "@xmpp/tcp";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/tcp/-/tcp-0.13.3.tgz";
-        sha512 = "WUjAsPVQAr/DTNJGxXOqXEviFvI5Gzp/18TuCJEssAjyHv1Pr7Qn6PjAersIPidEKqVfapNyHOmgyLePh1kAqQ==";
-      };
-    };
-    "@xmpp/tls-0.13.3" = {
-      name = "_at_xmpp_slash_tls";
-      packageName = "@xmpp/tls";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/tls/-/tls-0.13.3.tgz";
-        sha512 = "oeXbkzu2i2LkpvPQ4B3RourYnktoUpkWeUS7jRB4wHvdy6ecEli593R+DYVCWr3Hvj+3l40MkyRQSmZp4S7tVg==";
-      };
-    };
-    "@xmpp/websocket-0.13.3" = {
-      name = "_at_xmpp_slash_websocket";
-      packageName = "@xmpp/websocket";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/websocket/-/websocket-0.13.3.tgz";
-        sha512 = "RXZJFecaAlotqhAdNohO0SoP8Rx3eJrl18c78gxybAhNaCexFbuMJIvSj91L/b8bOErJtFMTwreWeMfzP6Ijiw==";
-      };
-    };
-    "@xmpp/xml-0.13.3" = {
-      name = "_at_xmpp_slash_xml";
-      packageName = "@xmpp/xml";
-      version = "0.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@xmpp/xml/-/xml-0.13.3.tgz";
-        sha512 = "lYXBg/VlpUeavGgQE8LADfZUzMFUnWFVYgvKUcx97AqjiEJUuo40ijdRcGmkAVtTg0RBkml5WB+Mo+JqynMk7Q==";
-      };
-    };
     "@xstate/fsm-1.6.5" = {
       name = "_at_xstate_slash_fsm";
       packageName = "@xstate/fsm";
@@ -7592,15 +7241,6 @@ let
         sha512 = "ZJ6wx9xaKJ3yFUhq5/sk82PJMuUyLk277I8mQeyDgCTjGdjWJIvPfaU5LIXaMuaN2UO1X3kZH4+lgphublZUHw==";
       };
     };
-    "abab-2.0.6" = {
-      name = "abab";
-      packageName = "abab";
-      version = "2.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz";
-        sha512 = "j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA==";
-      };
-    };
     "abbrev-1.1.1" = {
       name = "abbrev";
       packageName = "abbrev";
@@ -7691,15 +7331,6 @@ let
         sha512 = "OvQ/2pUDKmgfCg++xsTX1wGxfTaszcHVcTctW4UJB4hibJx2HXxxO5UmVgyjMa+ZDsiaf5wWLXYpRWMmBI0QHg==";
       };
     };
-    "acorn-globals-6.0.0" = {
-      name = "acorn-globals";
-      packageName = "acorn-globals";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz";
-        sha512 = "ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==";
-      };
-    };
     "acorn-import-attributes-1.9.5" = {
       name = "acorn-import-attributes";
       packageName = "acorn-import-attributes";
@@ -8690,24 +8321,6 @@ let
         sha512 = "SleRWjh9JUud2wH1hPs9rZBZ33H6T9HOiL0uwGnGx9FpE6wKGyfWugmbkEOIs6qWrZhg0LWeLziLrEwQJhs5mQ==";
       };
     };
-    "array.prototype.reduce-1.0.7" = {
-      name = "array.prototype.reduce";
-      packageName = "array.prototype.reduce";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array.prototype.reduce/-/array.prototype.reduce-1.0.7.tgz";
-        sha512 = "mzmiUCVwtiD4lgxYP8g7IYy8El8p2CSMePvIbTS7gchKir/L1fgJrk0yDKmAX6mnRQFKNADYIk8nNlTris5H1Q==";
-      };
-    };
-    "arraybuffer.prototype.slice-1.0.4" = {
-      name = "arraybuffer.prototype.slice";
-      packageName = "arraybuffer.prototype.slice";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz";
-        sha512 = "BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==";
-      };
-    };
     "arraybuffer.slice-0.0.7" = {
       name = "arraybuffer.slice";
       packageName = "arraybuffer.slice";
@@ -8780,24 +8393,6 @@ let
         sha512 = "p32cOF5q0Zqs9uBiONKYLm6BClCoBCM5O9JfeUSlnQLBTxYdTK+pW+nXflm8UkKd2UYlEbYz5qEi0JuZR9ckSw==";
       };
     };
-    "asn1.js-5.4.1" = {
-      name = "asn1.js";
-      packageName = "asn1.js";
-      version = "5.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz";
-        sha512 = "+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA==";
-      };
-    };
-    "asn1js-3.0.5" = {
-      name = "asn1js";
-      packageName = "asn1js";
-      version = "3.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/asn1js/-/asn1js-3.0.5.tgz";
-        sha512 = "FVnvrKJwpt9LP2lAMl8qZswRNm3T4q9CON+bxldk2iwk3FFpuwhx2FfinyitizWHsVYyaY+y5JzDR0rCMV5yTQ==";
-      };
-    };
     "assert-1.5.1" = {
       name = "assert";
       packageName = "assert";
@@ -8978,15 +8573,6 @@ let
         sha512 = "p4jj6Fws4Iy2m0iCmI2am2ZNZCgbdgE+P8F/8csmn2vx7ixXrO2zGcuNsD46X5uZSVecmkEy/M06X2vG8KD6dQ==";
       };
     };
-    "async-function-1.0.0" = {
-      name = "async-function";
-      packageName = "async-function";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz";
-        sha512 = "hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==";
-      };
-    };
     "async-listen-1.2.0" = {
       name = "async-listen";
       packageName = "async-listen";
@@ -9185,15 +8771,6 @@ let
         sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==";
       };
     };
-    "axios-0.25.0" = {
-      name = "axios";
-      packageName = "axios";
-      version = "0.25.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz";
-        sha512 = "cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g==";
-      };
-    };
     "axios-1.8.3" = {
       name = "axios";
       packageName = "axios";
@@ -9230,24 +8807,6 @@ let
         sha512 = "XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==";
       };
     };
-    "babel-plugin-jsx-pragmatic-1.0.2" = {
-      name = "babel-plugin-jsx-pragmatic";
-      packageName = "babel-plugin-jsx-pragmatic";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-jsx-pragmatic/-/babel-plugin-jsx-pragmatic-1.0.2.tgz";
-        sha512 = "+qeGXSbHZwinZzO6R3wP+6XDKup83Pgg2B3TQt2zwfDdgC7NqT9Kd3ws7iqk53zAO/8iOIRU6VUyUzt2LDE3Eg==";
-      };
-    };
-    "babel-plugin-syntax-jsx-6.18.0" = {
-      name = "babel-plugin-syntax-jsx";
-      packageName = "babel-plugin-syntax-jsx";
-      version = "6.18.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz";
-        sha512 = "qrPaCSo9c8RHNRHIotaufGbuOBN8rtdC4QrrFFc43vyWCCz7Kl7GL1PGaXtMGQZUXrkCjNEgxDfmAuAabr/rlw==";
-      };
-    };
     "babybird-0.0.1" = {
       name = "babybird";
       packageName = "babybird";
@@ -9878,15 +9437,6 @@ let
         sha512 = "cKV8tMCEpQs4hK/ik71d6LrPOnpkpGBR0wzxqr68g2m/LB2GxVYQroAjMJZRVM1Y4BCjCKc3vAamxSzOY2RP+w==";
       };
     };
-    "browser-or-node-1.3.0" = {
-      name = "browser-or-node";
-      packageName = "browser-or-node";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browser-or-node/-/browser-or-node-1.3.0.tgz";
-        sha512 = "0F2z/VSnLbmEeBcUrSuDH5l0HxTXdQQzLjkmBR4cYfvg1zJrKSlmIZFqyFR8oX0NrwPhy3c3HQ6i3OxMbew4Tg==";
-      };
-    };
     "browser-pack-6.1.0" = {
       name = "browser-pack";
       packageName = "browser-pack";
@@ -9896,15 +9446,6 @@ let
         sha512 = "erYug8XoqzU3IfcU8fUgyHqyOXqIE4tUTTQ+7mqUjQlvnXkOO6OlT9c/ZoJVHYoAaqGxr09CN53G7XIsO4KtWA==";
       };
     };
-    "browser-process-hrtime-1.0.0" = {
-      name = "browser-process-hrtime";
-      packageName = "browser-process-hrtime";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz";
-        sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==";
-      };
-    };
     "browser-resolve-2.0.0" = {
       name = "browser-resolve";
       packageName = "browser-resolve";
@@ -10967,15 +10508,6 @@ let
         sha512 = "mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==";
       };
     };
-    "chardet-1.6.1" = {
-      name = "chardet";
-      packageName = "chardet";
-      version = "1.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chardet/-/chardet-1.6.1.tgz";
-        sha512 = "RHP0lMTBsIhM/RxxoOzuTsY7IMNE6/XQ7FKGch0D/aluQzgah0BS4i9ND8wPJdIu7WvMMjk88EXcNi6j8Tdung==";
-      };
-    };
     "charenc-0.0.2" = {
       name = "charenc";
       packageName = "charenc";
@@ -11534,15 +11066,6 @@ let
         sha512 = "3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==";
       };
     };
-    "clone-deep-4.0.1" = {
-      name = "clone-deep";
-      packageName = "clone-deep";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz";
-        sha512 = "neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==";
-      };
-    };
     "clone-regexp-2.2.0" = {
       name = "clone-regexp";
       packageName = "clone-regexp";
@@ -12002,15 +11525,6 @@ let
         sha512 = "gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==";
       };
     };
-    "commondir-1.0.1" = {
-      name = "commondir";
-      packageName = "commondir";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz";
-        sha512 = "W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==";
-      };
-    };
     "commonmark-0.31.2" = {
       name = "commonmark";
       packageName = "commonmark";
@@ -12714,15 +12228,6 @@ let
         sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==";
       };
     };
-    "core-js-3.41.0" = {
-      name = "core-js";
-      packageName = "core-js";
-      version = "3.41.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/core-js/-/core-js-3.41.0.tgz";
-        sha512 = "SJ4/EHwS36QMJd6h/Rg+GyR4A5xE0FSI3eZ+iBVpfqf1x0eTSg1smWLHrA+2jQThZSh97fmSgFSU8B61nxosxA==";
-      };
-    };
     "core-util-is-1.0.2" = {
       name = "core-util-is";
       packageName = "core-util-is";
@@ -13083,33 +12588,6 @@ let
         sha512 = "0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==";
       };
     };
-    "cssom-0.3.8" = {
-      name = "cssom";
-      packageName = "cssom";
-      version = "0.3.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz";
-        sha512 = "b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==";
-      };
-    };
-    "cssom-0.4.4" = {
-      name = "cssom";
-      packageName = "cssom";
-      version = "0.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz";
-        sha512 = "p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==";
-      };
-    };
-    "cssstyle-2.3.0" = {
-      name = "cssstyle";
-      packageName = "cssstyle";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz";
-        sha512 = "AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==";
-      };
-    };
     "cssstyle-4.3.0" = {
       name = "cssstyle";
       packageName = "cssstyle";
@@ -13479,15 +12957,6 @@ let
         sha512 = "7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==";
       };
     };
-    "data-urls-2.0.0" = {
-      name = "data-urls";
-      packageName = "data-urls";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz";
-        sha512 = "X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==";
-      };
-    };
     "data-urls-5.0.0" = {
       name = "data-urls";
       packageName = "data-urls";
@@ -13497,33 +12966,6 @@ let
         sha512 = "ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==";
       };
     };
-    "data-view-buffer-1.0.2" = {
-      name = "data-view-buffer";
-      packageName = "data-view-buffer";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz";
-        sha512 = "EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==";
-      };
-    };
-    "data-view-byte-length-1.0.2" = {
-      name = "data-view-byte-length";
-      packageName = "data-view-byte-length";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz";
-        sha512 = "tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==";
-      };
-    };
-    "data-view-byte-offset-1.0.1" = {
-      name = "data-view-byte-offset";
-      packageName = "data-view-byte-offset";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz";
-        sha512 = "BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==";
-      };
-    };
     "datauri-4.1.0" = {
       name = "datauri";
       packageName = "datauri";
@@ -14442,15 +13884,6 @@ let
         sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==";
       };
     };
-    "doipjs-0.15.7" = {
-      name = "doipjs";
-      packageName = "doipjs";
-      version = "0.15.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/doipjs/-/doipjs-0.15.7.tgz";
-        sha512 = "EtgFvcLZKw2JogMJ3zG4YRtsKP9tSwdbcG5dYoDBvzG8U1zI7MH0lQdJnETdNamqY/LfpN3rzJwecFjq60rd6w==";
-      };
-    };
     "dom-converter-0.2.0" = {
       name = "dom-converter";
       packageName = "dom-converter";
@@ -14532,15 +13965,6 @@ let
         sha512 = "OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==";
       };
     };
-    "domexception-2.0.1" = {
-      name = "domexception";
-      packageName = "domexception";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz";
-        sha512 = "yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==";
-      };
-    };
     "domhandler-2.3.0" = {
       name = "domhandler";
       packageName = "domhandler";
@@ -15171,15 +14595,6 @@ let
         sha512 = "ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==";
       };
     };
-    "enquirer-2.4.1" = {
-      name = "enquirer";
-      packageName = "enquirer";
-      version = "2.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz";
-        sha512 = "rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==";
-      };
-    };
     "entities-1.0.0" = {
       name = "entities";
       packageName = "entities";
@@ -15306,15 +14721,6 @@ let
         sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A==";
       };
     };
-    "es-abstract-1.23.9" = {
-      name = "es-abstract";
-      packageName = "es-abstract";
-      version = "1.23.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz";
-        sha512 = "py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==";
-      };
-    };
     "es-aggregate-error-1.0.13" = {
       name = "es-aggregate-error";
       packageName = "es-aggregate-error";
@@ -15324,15 +14730,6 @@ let
         sha512 = "KkzhUUuD2CUMqEc8JEqsXEMDHzDPE8RCjZeUBitsnB1eNcAJWQPiciKsMXe3Yytj4Flw1XLl46Qcf9OxvZha7A==";
       };
     };
-    "es-array-method-boxes-properly-1.0.0" = {
-      name = "es-array-method-boxes-properly";
-      packageName = "es-array-method-boxes-properly";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz";
-        sha512 = "wd6JXUmyHmt8T5a2xreUwKcGPq6f1f+WwIJkijUqiGcJz1qqnZgP6XIK+QyIWU5lT7imeNxUll48bziG+TSYcA==";
-      };
-    };
     "es-define-property-1.0.1" = {
       name = "es-define-property";
       packageName = "es-define-property";
@@ -15405,15 +14802,6 @@ let
         sha512 = "j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==";
       };
     };
-    "es-to-primitive-1.3.0" = {
-      name = "es-to-primitive";
-      packageName = "es-to-primitive";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz";
-        sha512 = "w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==";
-      };
-    };
     "es-toolkit-1.33.0" = {
       name = "es-toolkit";
       packageName = "es-toolkit";
@@ -16377,15 +15765,6 @@ let
         sha512 = "a5mtTqEaZvBCL9A9aqkrtfz+3SMDhOVUnjafjo+s7A9Txkq+SVX2DLvSp1Zrv4uCXa3lMSK3viWnh9Gg07PBUA==";
       };
     };
-    "express-validator-6.15.0" = {
-      name = "express-validator";
-      packageName = "express-validator";
-      version = "6.15.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express-validator/-/express-validator-6.15.0.tgz";
-        sha512 = "r05VYoBL3i2pswuehoFSy+uM8NBuVaY7avp5qrYjQBDzagx2Z5A77FZqPT8/gNLF3HopWkIzaTFaC4JysWXLqg==";
-      };
-    };
     "ext-1.7.0" = {
       name = "ext";
       packageName = "ext";
@@ -17034,15 +16413,6 @@ let
         sha512 = "6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==";
       };
     };
-    "find-cache-dir-2.1.0" = {
-      name = "find-cache-dir";
-      packageName = "find-cache-dir";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz";
-        sha512 = "Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==";
-      };
-    };
     "find-up-1.1.2" = {
       name = "find-up";
       packageName = "find-up";
@@ -17430,15 +16800,6 @@ let
         sha512 = "XHIrMD0NpDrNM/Ckf7XJiBbLl57KEhT3+i3yY+eWm+cqYZJQTZrKo8Y8AWKnuV5GT4scfuUGt9LzNoIx3dU1nQ==";
       };
     };
-    "form-data-3.0.3" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-3.0.3.tgz";
-        sha512 = "q5YBMeWy6E2Un0nMGWMgI65MAKtaylxfNJGJxpGh45YDciZB4epbWpaAfImil6CPAPTYB4sh0URQNDRIZG5F2w==";
-      };
-    };
     "form-data-4.0.0" = {
       name = "form-data";
       packageName = "form-data";
@@ -17538,15 +16899,6 @@ let
         sha512 = "twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==";
       };
     };
-    "from2-2.3.0" = {
-      name = "from2";
-      packageName = "from2";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz";
-        sha512 = "OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==";
-      };
-    };
     "fs-chunk-store-1.7.0" = {
       name = "fs-chunk-store";
       packageName = "fs-chunk-store";
@@ -17727,15 +17079,6 @@ let
         sha512 = "7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==";
       };
     };
-    "function.prototype.name-1.1.8" = {
-      name = "function.prototype.name";
-      packageName = "function.prototype.name";
-      version = "1.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz";
-        sha512 = "e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==";
-      };
-    };
     "functions-have-names-1.2.3" = {
       name = "functions-have-names";
       packageName = "functions-have-names";
@@ -18087,15 +17430,6 @@ let
         sha512 = "kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==";
       };
     };
-    "get-symbol-description-1.1.0" = {
-      name = "get-symbol-description";
-      packageName = "get-symbol-description";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz";
-        sha512 = "w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==";
-      };
-    };
     "get-tsconfig-4.10.0" = {
       name = "get-tsconfig";
       packageName = "get-tsconfig";
@@ -18906,15 +18240,6 @@ let
         sha512 = "55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==";
       };
     };
-    "has-proto-1.2.0" = {
-      name = "has-proto";
-      packageName = "has-proto";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz";
-        sha512 = "KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==";
-      };
-    };
     "has-symbol-support-x-1.4.2" = {
       name = "has-symbol-support-x";
       packageName = "has-symbol-support-x";
@@ -19023,15 +18348,6 @@ let
         sha512 = "vXm0l45VbcHEVlTCzs8M+s0VeYsB2lnlAaThoLKGXr3bE/VWDOelNUnycUPEhKEaXARL2TEFjBOyUiM6+55KBg==";
       };
     };
-    "hash-base-3.1.0" = {
-      name = "hash-base";
-      packageName = "hash-base";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hash-base/-/hash-base-3.1.0.tgz";
-        sha512 = "1nmYp/rhMDiE7AYkDw+lLwlAzz0AntGIe51F3RfFfEqyQ3feY2eI/NcwC6umIQVOASPMsWJLJScWKSSvzL9IVA==";
-      };
-    };
     "hash-wasm-4.12.0" = {
       name = "hash-wasm";
       packageName = "hash-wasm";
@@ -19383,15 +18699,6 @@ let
         sha512 = "A91dYTeIB6NoXG+PxTQpCCDDnfHsW9kc06Lvpu1TEe9gnd6ZFeiBoRO9JvzEv6xK7EX97/dUE8g/vBMTqTS3CA==";
       };
     };
-    "html-encoding-sniffer-2.0.1" = {
-      name = "html-encoding-sniffer";
-      packageName = "html-encoding-sniffer";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz";
-        sha512 = "D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==";
-      };
-    };
     "html-encoding-sniffer-4.0.0" = {
       name = "html-encoding-sniffer";
       packageName = "html-encoding-sniffer";
@@ -20517,15 +19824,6 @@ let
         sha512 = "6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==";
       };
     };
-    "into-stream-6.0.0" = {
-      name = "into-stream";
-      packageName = "into-stream";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/into-stream/-/into-stream-6.0.0.tgz";
-        sha512 = "XHbaOAvP+uFKUFsOgoNPRjLkwB+I22JFPFe5OjTkQ0nwgj6+pSjb4NmB6VMxaPshLiOf+zcpOCBQuLwC1KHhZA==";
-      };
-    };
     "inversify-5.1.1" = {
       name = "inversify";
       packageName = "inversify";
@@ -20625,24 +19923,6 @@ let
         sha512 = "Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==";
       };
     };
-    "irc-colors-1.5.0" = {
-      name = "irc-colors";
-      packageName = "irc-colors";
-      version = "1.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/irc-colors/-/irc-colors-1.5.0.tgz";
-        sha512 = "HtszKchBQTcqw1DC09uD7i7vvMayHGM1OCo6AHt5pkgZEyo99ClhHTMJdf+Ezc9ovuNNxcH89QfyclGthjZJOw==";
-      };
-    };
-    "irc-upd-0.11.0" = {
-      name = "irc-upd";
-      packageName = "irc-upd";
-      version = "0.11.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/irc-upd/-/irc-upd-0.11.0.tgz";
-        sha512 = "A1hV5cUkl5HZsKWRYcszD2Usfz33hB8igSSox8dEmrMyfy8/Ra6T/o4jwzs7jYMZ7ljLquSIWzcvSZHZ/bEAZA==";
-      };
-    };
     "irregular-plurals-3.5.0" = {
       name = "irregular-plurals";
       packageName = "irregular-plurals";
@@ -20742,15 +20022,6 @@ let
         sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==";
       };
     };
-    "is-async-function-2.1.1" = {
-      name = "is-async-function";
-      packageName = "is-async-function";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz";
-        sha512 = "9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==";
-      };
-    };
     "is-bigint-1.1.0" = {
       name = "is-bigint";
       packageName = "is-bigint";
@@ -20841,15 +20112,6 @@ let
         sha512 = "UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==";
       };
     };
-    "is-core-module-2.9.0" = {
-      name = "is-core-module";
-      packageName = "is-core-module";
-      version = "2.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz";
-        sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A==";
-      };
-    };
     "is-data-descriptor-1.0.1" = {
       name = "is-data-descriptor";
       packageName = "is-data-descriptor";
@@ -20859,15 +20121,6 @@ let
         sha512 = "bc4NlCDiCr28U4aEsQ3Qs2491gVq4V8G7MQyws968ImqjKuYtTJXrl7Vq7jsN7Ly/C3xj5KWFrY7sHNeDkAzXw==";
       };
     };
-    "is-data-view-1.0.2" = {
-      name = "is-data-view";
-      packageName = "is-data-view";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz";
-        sha512 = "RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==";
-      };
-    };
     "is-date-object-1.1.0" = {
       name = "is-date-object";
       packageName = "is-date-object";
@@ -21003,15 +20256,6 @@ let
         sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==";
       };
     };
-    "is-finalizationregistry-1.1.1" = {
-      name = "is-finalizationregistry";
-      packageName = "is-finalizationregistry";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz";
-        sha512 = "1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==";
-      };
-    };
     "is-finite-1.1.0" = {
       name = "is-finite";
       packageName = "is-finite";
@@ -21777,15 +21021,6 @@ let
         sha512 = "K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==";
       };
     };
-    "is-weakref-1.1.1" = {
-      name = "is-weakref";
-      packageName = "is-weakref";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz";
-        sha512 = "6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==";
-      };
-    };
     "is-weakset-2.0.4" = {
       name = "is-weakset";
       packageName = "is-weakset";
@@ -22209,15 +21444,6 @@ let
         sha512 = "4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==";
       };
     };
-    "jsdom-16.7.0" = {
-      name = "jsdom";
-      packageName = "jsdom";
-      version = "16.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz";
-        sha512 = "u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==";
-      };
-    };
     "jsdom-24.1.1" = {
       name = "jsdom";
       packageName = "jsdom";
@@ -22236,15 +21462,6 @@ let
         sha512 = "B7qPcEVE3NVkmSJbaYxvv4cHkVW7DQsZz13pUMrfS8z8Q/BuShN+gcTXrUlPiGqM2/t/EEaI030bpxMqY8gMlw==";
       };
     };
-    "jsesc-2.5.2" = {
-      name = "jsesc";
-      packageName = "jsesc";
-      version = "2.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz";
-        sha512 = "OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==";
-      };
-    };
     "jsesc-3.1.0" = {
       name = "jsesc";
       packageName = "jsesc";
@@ -22965,15 +22182,6 @@ let
         sha512 = "sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==";
       };
     };
-    "koa-compose-4.2.0" = {
-      name = "koa-compose";
-      packageName = "koa-compose";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/koa-compose/-/koa-compose-4.2.0.tgz";
-        sha512 = "/Io2dpt3uU/wWkn2pkRBj3vudzsi6hMssGkREZCxLIczAIvLWy5Jw9PW7ctTxvcfXKCisbgsMLsgE1BvSZB6Kw==";
-      };
-    };
     "kuler-2.0.0" = {
       name = "kuler";
       packageName = "kuler";
@@ -24432,24 +23640,6 @@ let
         sha512 = "jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==";
       };
     };
-    "ltx-3.0.0" = {
-      name = "ltx";
-      packageName = "ltx";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ltx/-/ltx-3.0.0.tgz";
-        sha512 = "bu3/4/ApUmMqVNuIkHaRhqVtEi6didYcBDIF56xhPRCzVpdztCipZ62CUuaxMlMBUzaVL93+4LZRqe02fuAG6A==";
-      };
-    };
-    "ltx-3.1.2" = {
-      name = "ltx";
-      packageName = "ltx";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ltx/-/ltx-3.1.2.tgz";
-        sha512 = "tFSKojN92FqNK6eRTmKK/ROUTUYVWKAxgohz523TPhF1G3nR3DXQS/I7/705rEPrDSloKDgMdRlh0qgMFQoVYw==";
-      };
-    };
     "luaparse-git+https://github.com/oxyc/luaparse#ac42a00ebf4020b8c9d3219e4b0f84bf7ce6e802" = {
       name = "luaparse";
       packageName = "luaparse";
@@ -25369,15 +24559,6 @@ let
         sha512 = "gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==";
       };
     };
-    "merge-options-3.0.4" = {
-      name = "merge-options";
-      packageName = "merge-options";
-      version = "3.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/merge-options/-/merge-options-3.0.4.tgz";
-        sha512 = "2Sug1+knBjkaMsMgf1ctR1Ujx+Ayku4EdJN4Z+C2+JzoeF7A3OZ9KM2GY0CpQS51NR61LTurMJrRKPhSs3ZRTQ==";
-      };
-    };
     "merge-stream-2.0.0" = {
       name = "merge-stream";
       packageName = "merge-stream";
@@ -26692,15 +25873,6 @@ let
         sha512 = "7ZxrUybYv9NonoXgwoOqtStIu18D1c3eFZj27hqgf5kBrBF8Q+tE8V0MW8dKM5QLkQPh1JhhbKgHLY9kifov4Q==";
       };
     };
-    "multistream-4.1.0" = {
-      name = "multistream";
-      packageName = "multistream";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/multistream/-/multistream-4.1.0.tgz";
-        sha512 = "J1XDiAmmNpRCBfIWJv+n0ymC4ABcf/Pl+5YvC5B/D2f/2+8PtHvCNxMPKiQcZyi922Hq69J2YOpb1pTywfifyw==";
-      };
-    };
     "mustache-4.2.0" = {
       name = "mustache";
       packageName = "mustache";
@@ -26827,15 +25999,6 @@ let
         sha512 = "fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==";
       };
     };
-    "napi-build-utils-1.0.2" = {
-      name = "napi-build-utils";
-      packageName = "napi-build-utils";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/napi-build-utils/-/napi-build-utils-1.0.2.tgz";
-        sha512 = "ONmRUqK7zj7DWX0D9ADe03wbwOBZxNAfF20PlGfCWQcD3+/MakShIHrMqx9YwPTfxDdF1zLeL+RGZiR9kGMLdg==";
-      };
-    };
     "napi-build-utils-2.0.0" = {
       name = "napi-build-utils";
       packageName = "napi-build-utils";
@@ -27233,15 +26396,6 @@ let
         sha512 = "wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==";
       };
     };
-    "node-environment-flags-1.0.6" = {
-      name = "node-environment-flags";
-      packageName = "node-environment-flags";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.6.tgz";
-        sha512 = "5Evy2epuL+6TM0lCQGpFIj6KwiEsGh1SrHUhTbNX+sLbBtjidPZFAnVK9y5yU1+h//RitLbRHTIMyxQPtxMdHw==";
-      };
-    };
     "node-fetch-2.6.1" = {
       name = "node-fetch";
       packageName = "node-fetch";
@@ -28088,15 +27242,6 @@ let
         sha512 = "c/K0mw/F11k4dEUBMW8naXUuBuhxRCfG7W+yFy8EcijU/rSmazOUd1XAEEe6bC0OuXY4HUKjTJv7xbxIMqdxrA==";
       };
     };
-    "object.getownpropertydescriptors-2.1.8" = {
-      name = "object.getownpropertydescriptors";
-      packageName = "object.getownpropertydescriptors";
-      version = "2.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.8.tgz";
-        sha512 = "qkHIGe4q0lSYMv0XI4SsBTJz3WaURhLvd0lKSgtVuOsJ2krg4SgMw3PIRQFMp07yi++UR3se2mkcLqsBNpBb/A==";
-      };
-    };
     "object.map-1.0.1" = {
       name = "object.map";
       packageName = "object.map";
@@ -28340,15 +27485,6 @@ let
         sha512 = "9asTNB9IkKEzWMcHmVZE7Ts3kC9G7AFHfs8i7caD8HbI76gEjdkId4z/AkP83xdZsH7PLAnnbl47qZkXuxpArw==";
       };
     };
-    "openpgp-5.11.2" = {
-      name = "openpgp";
-      packageName = "openpgp";
-      version = "5.11.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/openpgp/-/openpgp-5.11.2.tgz";
-        sha512 = "f8dJFVLwdkvPvW3VPFs6q9Vs2+HNhdvwls7a/MIFcQUB+XiQzRe7alfa3RtwfGJU7oUDDMAWPZ0nYsHa23Az+A==";
-      };
-    };
     "opentracing-0.14.7" = {
       name = "opentracing";
       packageName = "opentracing";
@@ -28547,15 +27683,6 @@ let
         sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==";
       };
     };
-    "own-keys-1.0.1" = {
-      name = "own-keys";
-      packageName = "own-keys";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz";
-        sha512 = "qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==";
-      };
-    };
     "p-cancelable-1.1.0" = {
       name = "p-cancelable";
       packageName = "p-cancelable";
@@ -28628,15 +27755,6 @@ let
         sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==";
       };
     };
-    "p-is-promise-3.0.0" = {
-      name = "p-is-promise";
-      packageName = "p-is-promise";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz";
-        sha512 = "Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ==";
-      };
-    };
     "p-limit-1.3.0" = {
       name = "p-limit";
       packageName = "p-limit";
@@ -29762,15 +28880,6 @@ let
         sha512 = "6Rtbp7criZRwedlvWbUYxqlqJoAlMvYHo2UcRWq79xZ54vZcaNHpVBOcWkX3ErT2aUA69tv+uiv4zKJbhD/Wgg==";
       };
     };
-    "pirates-4.0.6" = {
-      name = "pirates";
-      packageName = "pirates";
-      version = "4.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz";
-        sha512 = "saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==";
-      };
-    };
     "pixelmatch-4.0.2" = {
       name = "pixelmatch";
       packageName = "pixelmatch";
@@ -29780,24 +28889,6 @@ let
         sha512 = "J8B6xqiO37sU/gkcMglv6h5Jbd9xNER7aHzpfRdNmV4IbQBzBpe4l9XmbG+xPF/znacgu2jfEw+wHffaq/YkXA==";
       };
     };
-    "pkg-5.8.1" = {
-      name = "pkg";
-      packageName = "pkg";
-      version = "5.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pkg/-/pkg-5.8.1.tgz";
-        sha512 = "CjBWtFStCfIiT4Bde9QpJy0KeH19jCfwZRJqHFDFXfhUklCx8JoFmMj3wgnEYIwGmZVNkhsStPHEOnrtrQhEXA==";
-      };
-    };
-    "pkg-dir-3.0.0" = {
-      name = "pkg-dir";
-      packageName = "pkg-dir";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz";
-        sha512 = "/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==";
-      };
-    };
     "pkg-dir-4.2.0" = {
       name = "pkg-dir";
       packageName = "pkg-dir";
@@ -29825,15 +28916,6 @@ let
         sha512 = "4peoBq4Wks0riS0z8741NVv+/8IiTvqnZAr8QGgtdifrtpdXbNw/FxRS1l6NFqm4EMzuS0EDqNNx4XGaz8cuyQ==";
       };
     };
-    "pkg-fetch-3.4.2" = {
-      name = "pkg-fetch";
-      packageName = "pkg-fetch";
-      version = "3.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pkg-fetch/-/pkg-fetch-3.4.2.tgz";
-        sha512 = "0+uijmzYcnhC0hStDjm/cl2VYdrmVVBpe7Q8k9YBojxmR5tG8mvR9/nooQq3QSXiQqORDVOTY3XqMEqJVIzkHA==";
-      };
-    };
     "pkg-up-3.1.0" = {
       name = "pkg-up";
       packageName = "pkg-up";
@@ -30140,15 +29222,6 @@ let
         sha512 = "b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A==";
       };
     };
-    "prebuild-install-7.1.1" = {
-      name = "prebuild-install";
-      packageName = "prebuild-install";
-      version = "7.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.1.tgz";
-        sha512 = "jAXscXWMcCK8GgCoHOfIr0ODh5ai8mj63L2nWrjuAgXE6tDyYGnx4/8o/rCgU+B4JSyZBKbeZqzhtwtC3ovxjw==";
-      };
-    };
     "prebuild-install-7.1.3" = {
       name = "prebuild-install";
       packageName = "prebuild-install";
@@ -30707,24 +29780,6 @@ let
         sha512 = "cHArnywCiAAVXa3t4GGL2vttNxh7GqXtIYGym99egkNJ3oG//wL9LkvO4WE8W1TJe95t1F1ocu9X4xWaGsOKOA==";
       };
     };
-    "pvtsutils-1.3.6" = {
-      name = "pvtsutils";
-      packageName = "pvtsutils";
-      version = "1.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pvtsutils/-/pvtsutils-1.3.6.tgz";
-        sha512 = "PLgQXQ6H2FWCaeRak8vvk1GW462lMxB5s3Jm673N82zI4vqtVUPuZdffdZbPDFRoU8kAhItWFtPCWiPpp4/EDg==";
-      };
-    };
-    "pvutils-1.1.3" = {
-      name = "pvutils";
-      packageName = "pvutils";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pvutils/-/pvutils-1.1.3.tgz";
-        sha512 = "pMpnA0qRdFp32b1sJl1wOJNxZLQ2cbQx+k6tjNtZ8CpvVhNqEPRgivZ2WOUev2YMajecdH7ctUPDvEe87nariQ==";
-      };
-    };
     "qs-3.1.0" = {
       name = "qs";
       packageName = "qs";
@@ -30761,15 +29816,6 @@ let
         sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==";
       };
     };
-    "query-string-6.14.1" = {
-      name = "query-string";
-      packageName = "query-string";
-      version = "6.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/query-string/-/query-string-6.14.1.tgz";
-        sha512 = "XDxAeVmpfu1/6IjyT/gXHOl+S0vQ9owggJ30hhWKdHAsNPOcasn5o9BW0eejZqL2e4vMjhAxoW3jVHcD6mbcYw==";
-      };
-    };
     "query-string-7.1.3" = {
       name = "query-string";
       packageName = "query-string";
@@ -31535,15 +30581,6 @@ let
         sha512 = "ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==";
       };
     };
-    "reflect.getprototypeof-1.0.10" = {
-      name = "reflect.getprototypeof";
-      packageName = "reflect.getprototypeof";
-      version = "1.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz";
-        sha512 = "00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==";
-      };
-    };
     "reftools-1.1.9" = {
       name = "reftools";
       packageName = "reftools";
@@ -33137,15 +32174,6 @@ let
         sha512 = "xal3CZX1Xlo/k4ApwCFrHVACi9fBqJ7V+mwhBsuf/1IOKbBy098Fex+Wa/5QMubw09pSZ/u8EY8PWgevJsXp1A==";
       };
     };
-    "safe-array-concat-1.1.3" = {
-      name = "safe-array-concat";
-      packageName = "safe-array-concat";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz";
-        sha512 = "AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==";
-      };
-    };
     "safe-buffer-5.0.1" = {
       name = "safe-buffer";
       packageName = "safe-buffer";
@@ -33191,15 +32219,6 @@ let
         sha512 = "gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==";
       };
     };
-    "safe-push-apply-1.0.0" = {
-      name = "safe-push-apply";
-      packageName = "safe-push-apply";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz";
-        sha512 = "iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==";
-      };
-    };
     "safe-regex-1.1.0" = {
       name = "safe-regex";
       packageName = "safe-regex";
@@ -33254,42 +32273,6 @@ let
         sha512 = "3lVqBir7WuKDHGrKRDn/1Ye3kwpXaDOMsiRP1wd6wpZW56gJhsbp5RqQpA6JG/P+pkXizygnr1dKR8vzWaVsfA==";
       };
     };
-    "sasl-anonymous-0.1.0" = {
-      name = "sasl-anonymous";
-      packageName = "sasl-anonymous";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sasl-anonymous/-/sasl-anonymous-0.1.0.tgz";
-        sha512 = "x+0sdsV0Gie2EexxAUsx6ZoB+X6OCthlNBvAQncQxreEWQJByAPntj0EAgTlJc2kZicoc+yFzeR6cl8VfsQGfA==";
-      };
-    };
-    "sasl-plain-0.1.0" = {
-      name = "sasl-plain";
-      packageName = "sasl-plain";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sasl-plain/-/sasl-plain-0.1.0.tgz";
-        sha512 = "X8mCSfR8y0NryTu0tuVyr4IS2jBunBgyG+3a0gEEkd0nlHGiyqJhlc4EIkzmSwaa7F8S4yo+LS6Cu5qxRkJrmg==";
-      };
-    };
-    "sasl-scram-sha-1-1.3.0" = {
-      name = "sasl-scram-sha-1";
-      packageName = "sasl-scram-sha-1";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sasl-scram-sha-1/-/sasl-scram-sha-1-1.3.0.tgz";
-        sha512 = "hJE3eUCEx0aK+9jwHu6VVrQwb9qxv8RMc3ZciGF/ZzXgxptCX9QbfJT45nloJGxrR9AfBU6GiVNYKA5mrqu2KQ==";
-      };
-    };
-    "saslmechanisms-0.1.1" = {
-      name = "saslmechanisms";
-      packageName = "saslmechanisms";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/saslmechanisms/-/saslmechanisms-0.1.1.tgz";
-        sha512 = "pVlvK5ysevz8MzybRnDIa2YMxn0OJ7b9lDiWhMoaKPoJ7YkAg/7YtNjUgaYzElkwHxsw8dBMhaEn7UP6zxEwPg==";
-      };
-    };
     "sax-1.2.1" = {
       name = "sax";
       packageName = "sax";
@@ -33308,15 +32291,6 @@ let
         sha512 = "+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==";
       };
     };
-    "saxes-5.0.1" = {
-      name = "saxes";
-      packageName = "saxes";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz";
-        sha512 = "5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==";
-      };
-    };
     "saxes-6.0.0" = {
       name = "saxes";
       packageName = "saxes";
@@ -33632,15 +32606,6 @@ let
         sha512 = "Li5AOqrZWCVA2n5kryzEmqai6bKSIvpz5oUJHPVj6+dsbD3X1ixtsY5tEnsaNpH3pFAHmG8eIHUrtEtohrg+UQ==";
       };
     };
-    "set-proto-1.0.0" = {
-      name = "set-proto";
-      packageName = "set-proto";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz";
-        sha512 = "RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==";
-      };
-    };
     "set-value-2.0.1" = {
       name = "set-value";
       packageName = "set-value";
@@ -33713,15 +32678,6 @@ let
         sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==";
       };
     };
-    "shallow-clone-3.0.1" = {
-      name = "shallow-clone";
-      packageName = "shallow-clone";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz";
-        sha512 = "/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==";
-      };
-    };
     "sharp-0.33.4" = {
       name = "sharp";
       packageName = "sharp";
@@ -35117,15 +34073,6 @@ let
         sha512 = "uWkjJ+2Nt/LO9Z/JyKZbMusL8Dkh97uUBTv3AJQ74y07lVahLY4eEFsPsE97pxYBwr8nnjMAIch5eqI0gPShyw==";
       };
     };
-    "stream-meter-1.0.4" = {
-      name = "stream-meter";
-      packageName = "stream-meter";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-meter/-/stream-meter-1.0.4.tgz";
-        sha512 = "4sOEtrbgFotXwnEuzzsQBYEV1elAeFSO8rSGeTwabuX1RRn/kEq9JVH7I0MRBhKVRR0sJkr0M0QCH7yOLf9fhQ==";
-      };
-    };
     "stream-shift-1.0.3" = {
       name = "stream-shift";
       packageName = "stream-shift";
@@ -35324,33 +34271,6 @@ let
         sha512 = "wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==";
       };
     };
-    "string.prototype.trim-1.2.10" = {
-      name = "string.prototype.trim";
-      packageName = "string.prototype.trim";
-      version = "1.2.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz";
-        sha512 = "Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==";
-      };
-    };
-    "string.prototype.trimend-1.0.9" = {
-      name = "string.prototype.trimend";
-      packageName = "string.prototype.trimend";
-      version = "1.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz";
-        sha512 = "G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==";
-      };
-    };
-    "string.prototype.trimstart-1.0.8" = {
-      name = "string.prototype.trimstart";
-      packageName = "string.prototype.trimstart";
-      version = "1.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz";
-        sha512 = "UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==";
-      };
-    };
     "string2compact-1.3.2" = {
       name = "string2compact";
       packageName = "string2compact";
@@ -36422,15 +35342,6 @@ let
         sha512 = "lx9B5iv7msuFYE3dytT+KE5tap+rNYw+K4jVkb9R/asAb+pbBSM17jtunHplhBe6RRJdZx3Pn2Jph24O32mOVg==";
       };
     };
-    "to-fast-properties-2.0.0" = {
-      name = "to-fast-properties";
-      packageName = "to-fast-properties";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz";
-        sha512 = "/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==";
-      };
-    };
     "to-object-path-0.3.0" = {
       name = "to-object-path";
       packageName = "to-object-path";
@@ -36611,15 +35522,6 @@ let
         sha512 = "N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==";
       };
     };
-    "tr46-2.1.0" = {
-      name = "tr46";
-      packageName = "tr46";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz";
-        sha512 = "15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==";
-      };
-    };
     "tr46-5.0.0" = {
       name = "tr46";
       packageName = "tr46";
@@ -37016,42 +35918,6 @@ let
         sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==";
       };
     };
-    "typed-array-buffer-1.0.3" = {
-      name = "typed-array-buffer";
-      packageName = "typed-array-buffer";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz";
-        sha512 = "nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==";
-      };
-    };
-    "typed-array-byte-length-1.0.3" = {
-      name = "typed-array-byte-length";
-      packageName = "typed-array-byte-length";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz";
-        sha512 = "BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==";
-      };
-    };
-    "typed-array-byte-offset-1.0.4" = {
-      name = "typed-array-byte-offset";
-      packageName = "typed-array-byte-offset";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz";
-        sha512 = "bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==";
-      };
-    };
-    "typed-array-length-1.0.7" = {
-      name = "typed-array-length";
-      packageName = "typed-array-length";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz";
-        sha512 = "3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==";
-      };
-    };
     "typedarray-0.0.6" = {
       name = "typedarray";
       packageName = "typedarray";
@@ -37250,15 +36116,6 @@ let
         sha512 = "4IcGSufhFshvLNcMCV80UnQVlZ5pMOC8mvNPForqwA4+lzYQuetTESLDQkeLmihq8bRcnpbQa48Wb8Lh16/xow==";
       };
     };
-    "unbox-primitive-1.1.0" = {
-      name = "unbox-primitive";
-      packageName = "unbox-primitive";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz";
-        sha512 = "nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==";
-      };
-    };
     "unbzip2-stream-1.4.3" = {
       name = "unbzip2-stream";
       packageName = "unbzip2-stream";
@@ -38474,15 +37331,6 @@ let
         sha512 = "wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==";
       };
     };
-    "v8flags-3.2.0" = {
-      name = "v8flags";
-      packageName = "v8flags";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz";
-        sha512 = "mH8etigqMfiGWdeXpaaqGfs6BndypxusHHcv2qSHyZkGEznCd/qAXCWWRzeowtL54147cktFOC4P5y+kl8d8Jg==";
-      };
-    };
     "v8flags-4.0.1" = {
       name = "v8flags";
       packageName = "v8flags";
@@ -38492,15 +37340,6 @@ let
         sha512 = "fcRLaS4H/hrZk9hYwbdRM35D0U8IYMfEClhXxCivOojl+yTRAZH3Zy2sSy6qVCiGbV9YAtPssP6jaChqC9vPCg==";
       };
     };
-    "valid-url-1.0.9" = {
-      name = "valid-url";
-      packageName = "valid-url";
-      version = "1.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz";
-        sha512 = "QQDsV8OnSf5Uc30CKSwG9lnhMPe6exHtTXLRYX8uMwKENy640pU+2BgBL0LRbDh/eYRahNCS7aewCx0wf3NYVA==";
-      };
-    };
     "validate-glob-opts-1.0.2" = {
       name = "validate-glob-opts";
       packageName = "validate-glob-opts";
@@ -39347,24 +38186,6 @@ let
         sha512 = "/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==";
       };
     };
-    "w3c-hr-time-1.0.2" = {
-      name = "w3c-hr-time";
-      packageName = "w3c-hr-time";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz";
-        sha512 = "z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==";
-      };
-    };
-    "w3c-xmlserializer-2.0.0" = {
-      name = "w3c-xmlserializer";
-      packageName = "w3c-xmlserializer";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz";
-        sha512 = "4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==";
-      };
-    };
     "w3c-xmlserializer-5.0.0" = {
       name = "w3c-xmlserializer";
       packageName = "w3c-xmlserializer";
@@ -39473,15 +38294,6 @@ let
         sha512 = "WkwV9qJLZZm1ygrryt4+6hAKbk4jLSVCpE92RYk/MOtLSpxq/2S1U0JFyKgsASXhYU5hqHQRiXvFBoNQhfCHyg==";
       };
     };
-    "webcrypto-core-1.8.1" = {
-      name = "webcrypto-core";
-      packageName = "webcrypto-core";
-      version = "1.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webcrypto-core/-/webcrypto-core-1.8.1.tgz";
-        sha512 = "P+x1MvlNCXlKbLSOY4cYrdreqPG5hbzkmawbcXLKN/mf6DZW0SdNNkZ+sjwsqVkI4A4Ko2sPZmkZtCKY58w83A==";
-      };
-    };
     "webdav-5.7.1" = {
       name = "webdav";
       packageName = "webdav";
@@ -39500,24 +38312,6 @@ let
         sha512 = "2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==";
       };
     };
-    "webidl-conversions-5.0.0" = {
-      name = "webidl-conversions";
-      packageName = "webidl-conversions";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz";
-        sha512 = "VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==";
-      };
-    };
-    "webidl-conversions-6.1.0" = {
-      name = "webidl-conversions";
-      packageName = "webidl-conversions";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz";
-        sha512 = "qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==";
-      };
-    };
     "webidl-conversions-7.0.0" = {
       name = "webidl-conversions";
       packageName = "webidl-conversions";
@@ -39563,15 +38357,6 @@ let
         sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==";
       };
     };
-    "whatwg-encoding-1.0.5" = {
-      name = "whatwg-encoding";
-      packageName = "whatwg-encoding";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz";
-        sha512 = "b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==";
-      };
-    };
     "whatwg-encoding-3.1.1" = {
       name = "whatwg-encoding";
       packageName = "whatwg-encoding";
@@ -39581,15 +38366,6 @@ let
         sha512 = "6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==";
       };
     };
-    "whatwg-mimetype-2.3.0" = {
-      name = "whatwg-mimetype";
-      packageName = "whatwg-mimetype";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz";
-        sha512 = "M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==";
-      };
-    };
     "whatwg-mimetype-4.0.0" = {
       name = "whatwg-mimetype";
       packageName = "whatwg-mimetype";
@@ -39617,15 +38393,6 @@ let
         sha512 = "saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==";
       };
     };
-    "whatwg-url-8.7.0" = {
-      name = "whatwg-url";
-      packageName = "whatwg-url";
-      version = "8.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz";
-        sha512 = "gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==";
-      };
-    };
     "when-exit-2.1.4" = {
       name = "when-exit";
       packageName = "when-exit";
@@ -39680,15 +38447,6 @@ let
         sha512 = "TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==";
       };
     };
-    "which-builtin-type-1.2.1" = {
-      name = "which-builtin-type";
-      packageName = "which-builtin-type";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz";
-        sha512 = "6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==";
-      };
-    };
     "which-collection-1.0.2" = {
       name = "which-collection";
       packageName = "which-collection";
@@ -40193,15 +38951,6 @@ let
         sha512 = "7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==";
       };
     };
-    "xml-name-validator-3.0.0" = {
-      name = "xml-name-validator";
-      packageName = "xml-name-validator";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz";
-        sha512 = "A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==";
-      };
-    };
     "xml-name-validator-5.0.0" = {
       name = "xml-name-validator";
       packageName = "xml-name-validator";
@@ -53014,757 +51763,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  keyoxide = nodeEnv.buildNodePackage {
-    name = "keyoxide";
-    packageName = "keyoxide";
-    version = "0.4.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/keyoxide/-/keyoxide-0.4.4.tgz";
-      sha512 = "RUV9keqP/XK49OiVC4l5N5NxjYDPoDJFkr5OLa7rlFd/6JYah7YkqMfzm7Q9iw2ig9GKiQI9KgtR2IixzwEJnw==";
-    };
-    dependencies = [
-      sources."@ampproject/remapping-2.3.0"
-      (
-        sources."@babel/cli-7.26.4"
-        // {
-          dependencies = [
-            sources."make-dir-2.1.0"
-            sources."semver-5.7.2"
-          ];
-        }
-      )
-      sources."@babel/code-frame-7.26.2"
-      sources."@babel/compat-data-7.26.8"
-      (
-        sources."@babel/core-7.26.10"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      sources."@babel/generator-7.26.10"
-      sources."@babel/helper-annotate-as-pure-7.25.9"
-      (
-        sources."@babel/helper-compilation-targets-7.26.5"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      sources."@babel/helper-module-imports-7.25.9"
-      sources."@babel/helper-module-transforms-7.26.0"
-      sources."@babel/helper-plugin-utils-7.26.5"
-      sources."@babel/helper-string-parser-7.25.9"
-      sources."@babel/helper-validator-identifier-7.25.9"
-      sources."@babel/helper-validator-option-7.25.9"
-      sources."@babel/helpers-7.26.10"
-      sources."@babel/node-7.26.0"
-      sources."@babel/parser-7.26.10"
-      sources."@babel/plugin-syntax-jsx-7.25.9"
-      sources."@babel/plugin-transform-react-jsx-7.25.9"
-      (
-        sources."@babel/register-7.25.9"
-        // {
-          dependencies = [
-            sources."make-dir-2.1.0"
-            sources."semver-5.7.2"
-          ];
-        }
-      )
-      sources."@babel/template-7.26.9"
-      sources."@babel/traverse-7.26.10"
-      sources."@babel/types-7.26.10"
-      sources."@jridgewell/gen-mapping-0.3.8"
-      sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.5.0"
-      sources."@jridgewell/trace-mapping-0.3.25"
-      sources."@mapbox/node-pre-gyp-1.0.11"
-      sources."@nodelib/fs.scandir-2.1.5"
-      sources."@nodelib/fs.stat-2.0.5"
-      sources."@nodelib/fs.walk-1.2.8"
-      sources."@openpgp/hkp-client-0.0.2"
-      sources."@openpgp/wkd-client-0.0.3"
-      sources."@peculiar/asn1-schema-2.3.15"
-      sources."@peculiar/json-schema-1.1.12"
-      sources."@peculiar/webcrypto-1.5.0"
-      sources."@tootallnate/once-1.1.2"
-      sources."@xmpp/base64-0.13.2"
-      sources."@xmpp/client-0.13.4"
-      sources."@xmpp/client-core-0.13.3"
-      sources."@xmpp/connection-0.13.3"
-      sources."@xmpp/connection-tcp-0.13.3"
-      sources."@xmpp/debug-0.13.3"
-      sources."@xmpp/error-0.13.2"
-      sources."@xmpp/events-0.13.2"
-      sources."@xmpp/id-0.13.2"
-      sources."@xmpp/iq-0.13.3"
-      sources."@xmpp/jid-0.13.2"
-      sources."@xmpp/middleware-0.13.3"
-      sources."@xmpp/reconnect-0.13.2"
-      (
-        sources."@xmpp/resolve-0.13.3"
-        // {
-          dependencies = [
-            sources."node-fetch-3.3.2"
-          ];
-        }
-      )
-      sources."@xmpp/resource-binding-0.13.3"
-      sources."@xmpp/sasl-0.13.4"
-      sources."@xmpp/sasl-anonymous-0.13.2"
-      sources."@xmpp/sasl-plain-0.13.2"
-      sources."@xmpp/sasl-scram-sha-1-0.13.2"
-      sources."@xmpp/session-establishment-0.13.3"
-      sources."@xmpp/starttls-0.13.3"
-      sources."@xmpp/stream-features-0.13.2"
-      sources."@xmpp/stream-management-0.13.3"
-      sources."@xmpp/tcp-0.13.3"
-      sources."@xmpp/tls-0.13.3"
-      (
-        sources."@xmpp/websocket-0.13.3"
-        // {
-          dependencies = [
-            sources."ws-8.18.1"
-          ];
-        }
-      )
-      (
-        sources."@xmpp/xml-0.13.3"
-        // {
-          dependencies = [
-            sources."ltx-3.1.2"
-          ];
-        }
-      )
-      sources."abab-2.0.6"
-      sources."abbrev-1.1.1"
-      sources."accepts-1.3.8"
-      sources."acorn-8.14.1"
-      (
-        sources."acorn-globals-6.0.0"
-        // {
-          dependencies = [
-            sources."acorn-7.4.1"
-          ];
-        }
-      )
-      sources."acorn-walk-7.2.0"
-      sources."agent-base-6.0.2"
-      sources."ansi-colors-4.1.3"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."aproba-2.0.0"
-      sources."are-we-there-yet-2.0.0"
-      sources."array-buffer-byte-length-1.0.2"
-      sources."array-flatten-1.1.1"
-      sources."array-union-2.1.0"
-      sources."array.prototype.reduce-1.0.7"
-      sources."arraybuffer.prototype.slice-1.0.4"
-      sources."asn1.js-5.4.1"
-      sources."asn1js-3.0.5"
-      sources."async-function-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."at-least-node-1.0.0"
-      sources."available-typed-arrays-1.0.7"
-      sources."axios-0.25.0"
-      sources."babel-plugin-jsx-pragmatic-1.0.2"
-      sources."babel-plugin-syntax-jsx-6.18.0"
-      sources."balanced-match-1.0.2"
-      sources."base-64-1.0.0"
-      sources."base64-js-1.5.1"
-      sources."bl-4.1.0"
-      sources."bn.js-4.12.1"
-      (
-        sources."body-parser-1.20.3"
-        // {
-          dependencies = [
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      sources."brace-expansion-1.1.11"
-      sources."braces-3.0.3"
-      sources."browser-or-node-1.3.0"
-      sources."browser-process-hrtime-1.0.0"
-      sources."browserslist-4.24.4"
-      sources."buffer-5.7.1"
-      sources."buffer-from-1.1.2"
-      sources."bufferutil-4.0.9"
-      sources."bytes-3.1.2"
-      sources."call-bind-1.0.8"
-      sources."call-bind-apply-helpers-1.0.2"
-      sources."call-bound-1.0.4"
-      sources."caniuse-lite-1.0.30001704"
-      sources."canvas-2.11.2"
-      sources."chalk-4.1.2"
-      sources."chardet-1.6.1"
-      sources."chownr-2.0.0"
-      sources."cipher-base-1.0.6"
-      sources."cliui-7.0.4"
-      sources."clone-deep-4.0.1"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."color-support-1.1.3"
-      sources."combined-stream-1.0.8"
-      sources."commander-6.2.1"
-      sources."commondir-1.0.1"
-      sources."concat-map-0.0.1"
-      sources."console-control-strings-1.1.0"
-      sources."content-disposition-0.5.4"
-      sources."content-type-1.0.5"
-      sources."convert-source-map-2.0.0"
-      sources."cookie-0.7.1"
-      sources."cookie-signature-1.0.6"
-      sources."core-js-3.41.0"
-      sources."core-util-is-1.0.3"
-      sources."cors-2.8.5"
-      sources."create-hash-1.2.0"
-      sources."create-hmac-1.1.7"
-      sources."cssom-0.4.4"
-      (
-        sources."cssstyle-2.3.0"
-        // {
-          dependencies = [
-            sources."cssom-0.3.8"
-          ];
-        }
-      )
-      sources."data-uri-to-buffer-4.0.1"
-      sources."data-urls-2.0.0"
-      sources."data-view-buffer-1.0.2"
-      sources."data-view-byte-length-1.0.2"
-      sources."data-view-byte-offset-1.0.1"
-      sources."debug-4.4.0"
-      sources."decimal.js-10.5.0"
-      sources."decode-uri-component-0.2.2"
-      sources."decompress-response-4.2.1"
-      sources."deep-extend-0.6.0"
-      sources."define-data-property-1.1.4"
-      sources."define-properties-1.2.1"
-      sources."delayed-stream-1.0.0"
-      sources."delegates-1.0.0"
-      sources."depd-2.0.0"
-      sources."destroy-1.2.0"
-      sources."detect-libc-2.0.3"
-      sources."dir-glob-3.0.1"
-      sources."doipjs-0.15.7"
-      (
-        sources."domexception-2.0.1"
-        // {
-          dependencies = [
-            sources."webidl-conversions-5.0.0"
-          ];
-        }
-      )
-      sources."dotenv-8.6.0"
-      sources."dunder-proto-1.0.1"
-      sources."ee-first-1.1.1"
-      sources."electron-to-chromium-1.5.118"
-      sources."emoji-regex-8.0.0"
-      sources."encodeurl-2.0.0"
-      (
-        sources."encoding-0.1.13"
-        // {
-          dependencies = [
-            sources."iconv-lite-0.6.3"
-          ];
-        }
-      )
-      sources."end-of-stream-1.4.4"
-      sources."enquirer-2.4.1"
-      sources."es-abstract-1.23.9"
-      sources."es-array-method-boxes-properly-1.0.0"
-      sources."es-define-property-1.0.1"
-      sources."es-errors-1.3.0"
-      sources."es-object-atoms-1.1.1"
-      sources."es-set-tostringtag-2.1.0"
-      sources."es-to-primitive-1.3.0"
-      sources."escalade-3.2.0"
-      sources."escape-html-1.0.3"
-      sources."escodegen-2.1.0"
-      sources."esprima-4.0.1"
-      sources."estraverse-5.3.0"
-      sources."esutils-2.0.3"
-      sources."etag-1.8.1"
-      sources."events-3.3.0"
-      sources."expand-template-2.0.3"
-      (
-        sources."express-4.21.2"
-        // {
-          dependencies = [
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      sources."express-validator-6.15.0"
-      sources."fast-glob-3.3.3"
-      sources."fastq-1.19.1"
-      sources."fetch-blob-3.2.0"
-      sources."fill-range-7.1.1"
-      sources."filter-obj-1.1.0"
-      (
-        sources."finalhandler-1.3.1"
-        // {
-          dependencies = [
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      (
-        sources."find-cache-dir-2.1.0"
-        // {
-          dependencies = [
-            sources."make-dir-2.1.0"
-            sources."semver-5.7.2"
-          ];
-        }
-      )
-      sources."find-up-3.0.0"
-      sources."follow-redirects-1.15.9"
-      sources."for-each-0.3.5"
-      sources."form-data-3.0.3"
-      sources."formdata-polyfill-4.0.10"
-      sources."forwarded-0.2.0"
-      sources."fresh-0.5.2"
-      (
-        sources."from2-2.3.0"
-        // {
-          dependencies = [
-            sources."isarray-1.0.0"
-            sources."readable-stream-2.3.8"
-            sources."safe-buffer-5.1.2"
-            sources."string_decoder-1.1.1"
-          ];
-        }
-      )
-      sources."fs-constants-1.0.0"
-      (
-        sources."fs-extra-9.1.0"
-        // {
-          dependencies = [
-            sources."universalify-2.0.1"
-          ];
-        }
-      )
-      (
-        sources."fs-minipass-2.1.0"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      sources."fs-readdir-recursive-1.1.0"
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.2"
-      sources."function.prototype.name-1.1.8"
-      sources."functions-have-names-1.2.3"
-      sources."gauge-3.0.2"
-      sources."gensync-1.0.0-beta.2"
-      sources."get-caller-file-2.0.5"
-      sources."get-intrinsic-1.3.0"
-      sources."get-proto-1.0.1"
-      sources."get-symbol-description-1.1.0"
-      sources."github-from-package-0.0.0"
-      sources."glob-7.2.3"
-      sources."glob-parent-5.1.2"
-      sources."globals-11.12.0"
-      sources."globalthis-1.0.4"
-      (
-        sources."globby-11.1.0"
-        // {
-          dependencies = [
-            sources."slash-3.0.0"
-          ];
-        }
-      )
-      sources."gopd-1.2.0"
-      sources."graceful-fs-4.2.11"
-      sources."growly-1.3.0"
-      sources."has-1.0.4"
-      sources."has-bigints-1.1.0"
-      sources."has-flag-4.0.0"
-      sources."has-property-descriptors-1.0.2"
-      sources."has-proto-1.2.0"
-      sources."has-symbols-1.1.0"
-      sources."has-tostringtag-1.0.2"
-      sources."has-unicode-2.0.1"
-      sources."hash-base-3.1.0"
-      sources."hasown-2.0.2"
-      sources."homedir-polyfill-1.0.3"
-      sources."html-encoding-sniffer-2.0.1"
-      sources."http-errors-2.0.0"
-      sources."http-proxy-agent-4.0.1"
-      sources."https-proxy-agent-5.0.1"
-      sources."iconv-lite-0.4.24"
-      sources."ieee754-1.2.1"
-      sources."ignore-5.3.2"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ini-1.3.8"
-      sources."internal-slot-1.1.0"
-      sources."into-stream-6.0.0"
-      sources."ipaddr.js-1.9.1"
-      sources."irc-colors-1.5.0"
-      (
-        sources."irc-upd-0.11.0"
-        // {
-          dependencies = [
-            sources."iconv-lite-0.6.3"
-          ];
-        }
-      )
-      sources."is-array-buffer-3.0.5"
-      sources."is-async-function-2.1.1"
-      sources."is-bigint-1.1.0"
-      sources."is-boolean-object-1.2.2"
-      sources."is-callable-1.2.7"
-      sources."is-core-module-2.9.0"
-      sources."is-data-view-1.0.2"
-      sources."is-date-object-1.1.0"
-      sources."is-docker-2.2.1"
-      sources."is-extglob-2.1.1"
-      sources."is-finalizationregistry-1.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-generator-function-1.1.0"
-      sources."is-glob-4.0.3"
-      sources."is-map-2.0.3"
-      sources."is-number-7.0.0"
-      sources."is-number-object-1.1.1"
-      sources."is-plain-obj-2.1.0"
-      sources."is-plain-object-2.0.4"
-      sources."is-potential-custom-element-name-1.0.1"
-      sources."is-regex-1.2.1"
-      sources."is-set-2.0.3"
-      sources."is-shared-array-buffer-1.0.4"
-      sources."is-string-1.1.1"
-      sources."is-symbol-1.1.1"
-      sources."is-typed-array-1.1.15"
-      sources."is-weakmap-2.0.2"
-      sources."is-weakref-1.1.1"
-      sources."is-weakset-2.0.4"
-      sources."is-wsl-2.2.0"
-      sources."isarray-2.0.5"
-      sources."isexe-2.0.0"
-      sources."isobject-3.0.1"
-      sources."js-tokens-4.0.0"
-      sources."jsdom-16.7.0"
-      sources."jsesc-3.1.0"
-      sources."json5-2.2.3"
-      (
-        sources."jsonfile-6.1.0"
-        // {
-          dependencies = [
-            sources."universalify-2.0.1"
-          ];
-        }
-      )
-      sources."kind-of-6.0.3"
-      sources."koa-compose-4.2.0"
-      sources."locate-path-3.0.0"
-      sources."lodash-4.17.21"
-      (
-        sources."lru-cache-5.1.1"
-        // {
-          dependencies = [
-            sources."yallist-3.1.1"
-          ];
-        }
-      )
-      sources."ltx-3.0.0"
-      (
-        sources."make-dir-3.1.0"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      sources."math-intrinsics-1.1.0"
-      sources."md5.js-1.3.5"
-      sources."media-typer-0.3.0"
-      sources."merge-descriptors-1.0.3"
-      sources."merge-options-3.0.4"
-      sources."merge2-1.4.1"
-      sources."methods-1.1.2"
-      sources."micromatch-4.0.8"
-      sources."mime-1.6.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."mimic-response-2.1.0"
-      sources."minimalistic-assert-1.0.1"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."minipass-5.0.0"
-      (
-        sources."minizlib-2.1.2"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      sources."mkdirp-1.0.4"
-      sources."mkdirp-classic-0.5.3"
-      sources."ms-2.1.3"
-      sources."multistream-4.1.0"
-      sources."nan-2.22.2"
-      sources."napi-build-utils-1.0.2"
-      sources."negotiator-0.6.3"
-      sources."node-abi-3.74.0"
-      sources."node-domexception-1.0.0"
-      (
-        sources."node-environment-flags-1.0.6"
-        // {
-          dependencies = [
-            sources."semver-5.7.2"
-          ];
-        }
-      )
-      (
-        sources."node-fetch-2.7.0"
-        // {
-          dependencies = [
-            sources."tr46-0.0.3"
-            sources."webidl-conversions-3.0.1"
-            sources."whatwg-url-5.0.0"
-          ];
-        }
-      )
-      sources."node-gyp-build-4.8.4"
-      sources."node-notifier-10.0.1"
-      sources."node-releases-2.0.19"
-      sources."nopt-5.0.0"
-      sources."npmlog-5.0.1"
-      sources."nwsapi-2.2.18"
-      sources."object-assign-4.1.1"
-      sources."object-inspect-1.13.4"
-      sources."object-keys-1.1.1"
-      sources."object.assign-4.1.7"
-      sources."object.getownpropertydescriptors-2.1.8"
-      sources."on-finished-2.4.1"
-      sources."once-1.4.0"
-      sources."openpgp-5.11.2"
-      sources."own-keys-1.0.1"
-      sources."p-is-promise-3.0.0"
-      sources."p-limit-2.3.0"
-      sources."p-locate-3.0.0"
-      sources."p-try-2.2.0"
-      sources."parse-passwd-1.0.0"
-      sources."parse5-6.0.1"
-      sources."parseurl-1.3.3"
-      sources."path-exists-3.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-parse-1.0.7"
-      sources."path-to-regexp-0.1.12"
-      sources."path-type-4.0.0"
-      sources."picocolors-1.1.1"
-      sources."picomatch-2.3.1"
-      sources."pify-4.0.1"
-      sources."pirates-4.0.6"
-      (
-        sources."pkg-5.8.1"
-        // {
-          dependencies = [
-            sources."@babel/generator-7.18.2"
-            sources."@babel/parser-7.18.4"
-            sources."@babel/types-7.19.0"
-            sources."jsesc-2.5.2"
-          ];
-        }
-      )
-      sources."pkg-dir-3.0.0"
-      sources."pkg-fetch-3.4.2"
-      sources."possible-typed-array-names-1.1.0"
-      (
-        sources."prebuild-install-7.1.1"
-        // {
-          dependencies = [
-            sources."decompress-response-6.0.0"
-            sources."mimic-response-3.1.0"
-            sources."simple-get-4.0.1"
-          ];
-        }
-      )
-      sources."process-nextick-args-2.0.1"
-      sources."progress-2.0.3"
-      sources."proxy-addr-2.0.7"
-      sources."psl-1.15.0"
-      sources."pump-3.0.2"
-      sources."punycode-2.3.1"
-      sources."pvtsutils-1.3.6"
-      sources."pvutils-1.1.3"
-      sources."qs-6.13.0"
-      sources."query-string-6.14.1"
-      sources."querystringify-2.2.0"
-      sources."queue-microtask-1.2.3"
-      sources."randombytes-2.1.0"
-      sources."range-parser-1.2.1"
-      sources."raw-body-2.5.2"
-      sources."rc-1.2.8"
-      sources."readable-stream-3.6.2"
-      sources."reflect.getprototypeof-1.0.10"
-      sources."regenerator-runtime-0.14.1"
-      sources."regexp.prototype.flags-1.5.4"
-      sources."require-directory-2.1.1"
-      sources."requires-port-1.0.0"
-      (
-        sources."resolve-1.22.10"
-        // {
-          dependencies = [
-            sources."is-core-module-2.16.1"
-          ];
-        }
-      )
-      sources."reusify-1.1.0"
-      sources."rimraf-3.0.2"
-      sources."ripemd160-2.0.2"
-      sources."run-parallel-1.2.0"
-      sources."safe-array-concat-1.1.3"
-      sources."safe-buffer-5.2.1"
-      sources."safe-push-apply-1.0.0"
-      sources."safe-regex-test-1.1.0"
-      sources."safer-buffer-2.1.2"
-      sources."sasl-anonymous-0.1.0"
-      sources."sasl-plain-0.1.0"
-      sources."sasl-scram-sha-1-1.3.0"
-      sources."saslmechanisms-0.1.1"
-      sources."saxes-5.0.1"
-      sources."semver-7.7.1"
-      (
-        sources."send-0.19.0"
-        // {
-          dependencies = [
-            (
-              sources."debug-2.6.9"
-              // {
-                dependencies = [
-                  sources."ms-2.0.0"
-                ];
-              }
-            )
-            sources."encodeurl-1.0.2"
-          ];
-        }
-      )
-      sources."serve-static-1.16.2"
-      sources."set-blocking-2.0.0"
-      sources."set-function-length-1.2.2"
-      sources."set-function-name-2.0.2"
-      sources."set-proto-1.0.0"
-      sources."setprototypeof-1.2.0"
-      sources."sha.js-2.4.11"
-      sources."shallow-clone-3.0.1"
-      sources."shellwords-0.1.1"
-      sources."side-channel-1.1.0"
-      sources."side-channel-list-1.0.0"
-      sources."side-channel-map-1.0.1"
-      sources."side-channel-weakmap-1.0.2"
-      sources."signal-exit-3.0.7"
-      sources."simple-concat-1.0.1"
-      sources."simple-get-3.1.1"
-      sources."slash-2.0.0"
-      sources."source-map-0.6.1"
-      sources."source-map-support-0.5.21"
-      sources."split-on-first-1.1.0"
-      sources."statuses-2.0.1"
-      (
-        sources."stream-meter-1.0.4"
-        // {
-          dependencies = [
-            sources."isarray-1.0.0"
-            sources."readable-stream-2.3.8"
-            sources."safe-buffer-5.1.2"
-            sources."string_decoder-1.1.1"
-          ];
-        }
-      )
-      sources."strict-uri-encode-2.0.0"
-      sources."string-width-4.2.3"
-      sources."string.prototype.trim-1.2.10"
-      sources."string.prototype.trimend-1.0.9"
-      sources."string.prototype.trimstart-1.0.8"
-      sources."string_decoder-1.3.0"
-      sources."strip-ansi-6.0.1"
-      sources."strip-json-comments-2.0.1"
-      sources."supports-color-7.2.0"
-      sources."supports-preserve-symlinks-flag-1.0.0"
-      sources."symbol-tree-3.2.4"
-      sources."tar-6.2.1"
-      (
-        sources."tar-fs-2.1.2"
-        // {
-          dependencies = [
-            sources."chownr-1.1.4"
-          ];
-        }
-      )
-      sources."tar-stream-2.2.0"
-      sources."to-fast-properties-2.0.0"
-      sources."to-regex-range-5.0.1"
-      sources."toidentifier-1.0.1"
-      sources."tough-cookie-4.1.4"
-      sources."tr46-2.1.0"
-      sources."tslib-2.8.1"
-      sources."tunnel-agent-0.6.0"
-      sources."type-is-1.6.18"
-      sources."typed-array-buffer-1.0.3"
-      sources."typed-array-byte-length-1.0.3"
-      sources."typed-array-byte-offset-1.0.4"
-      sources."typed-array-length-1.0.7"
-      sources."unbox-primitive-1.1.0"
-      sources."universalify-0.2.0"
-      sources."unpipe-1.0.0"
-      sources."update-browserslist-db-1.1.3"
-      sources."url-parse-1.5.10"
-      sources."utf-8-validate-5.0.10"
-      sources."util-deprecate-1.0.2"
-      sources."utils-merge-1.0.1"
-      sources."uuid-8.3.2"
-      sources."v8flags-3.2.0"
-      sources."valid-url-1.0.9"
-      sources."validator-13.12.0"
-      sources."vary-1.1.2"
-      sources."w3c-hr-time-1.0.2"
-      sources."w3c-xmlserializer-2.0.0"
-      sources."web-streams-polyfill-3.3.3"
-      sources."webcrypto-core-1.8.1"
-      sources."webidl-conversions-6.1.0"
-      sources."whatwg-encoding-1.0.5"
-      sources."whatwg-mimetype-2.3.0"
-      sources."whatwg-url-8.7.0"
-      sources."which-2.0.2"
-      sources."which-boxed-primitive-1.1.1"
-      sources."which-builtin-type-1.2.1"
-      sources."which-collection-1.0.2"
-      sources."which-typed-array-1.1.19"
-      sources."wide-align-1.1.5"
-      sources."wrap-ansi-7.0.0"
-      sources."wrappy-1.0.2"
-      sources."ws-7.5.10"
-      sources."xml-name-validator-3.0.0"
-      sources."xmlchars-2.2.0"
-      sources."y18n-5.0.8"
-      sources."yallist-4.0.0"
-      sources."yargs-16.2.0"
-      sources."yargs-parser-20.2.9"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "CLI for Keyoxide";
-      homepage = "https://keyoxide.org";
-      license = "AGPL-3.0-or-later";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   lcov-result-merger = nodeEnv.buildNodePackage {
     name = "lcov-result-merger";
     packageName = "lcov-result-merger";
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index dfc2f74ac83e..805f464bd465 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -111,15 +111,6 @@ final: prev: {
     '';
   };
 
-  keyoxide = prev.keyoxide.override {
-    nativeBuildInputs = [ pkgs.pkg-config ];
-    buildInputs = with pkgs; [
-      pixman
-      cairo
-      pango
-    ];
-  };
-
   makam = prev.makam.override {
     nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
     postFixup = ''

From fd7ff5ba20bfe3c27a1b83d3341ed7ffaf001ede Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 16:23:04 -0300
Subject: [PATCH 1093/6226] stxxl: fix build with cmake4

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

diff --git a/pkgs/by-name/st/stxxl/package.nix b/pkgs/by-name/st/stxxl/package.nix
index d045a889a016..324e0c76115b 100644
--- a/pkgs/by-name/st/stxxl/package.nix
+++ b/pkgs/by-name/st/stxxl/package.nix
@@ -34,6 +34,11 @@ stdenv.mkDerivation rec {
     inherit parallelSupport;
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6.2 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Implementation of the C++ standard template library STL for external memory (out-of-core) computations";
     homepage = "https://github.com/stxxl/stxxl";

From 728ae37c74608ff9d324e244f39a135a85691322 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 19:25:15 +0000
Subject: [PATCH 1094/6226] yamlfmt: 0.18.0 -> 0.19.0

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

diff --git a/pkgs/by-name/ya/yamlfmt/package.nix b/pkgs/by-name/ya/yamlfmt/package.nix
index c48d98d630ab..d94724591543 100644
--- a/pkgs/by-name/ya/yamlfmt/package.nix
+++ b/pkgs/by-name/ya/yamlfmt/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "yamlfmt";
-  version = "0.18.0";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "yamlfmt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ifrRqa6GRwzwr9ORsmvDaLmznDp3KVtFyEzaG3EqEhY=";
+    hash = "sha256-SIjWBXhi5uy34KySxMCTrTDdXXvtVCWWj4LhYcXq5MU=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > "$out/.git_head"

From af531ccbb8923c85aa348bbb21153817ec0e01c3 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 20 Oct 2025 16:29:21 +0000
Subject: [PATCH 1095/6226] python3Packages.docling-parse: mark as broken

See https://github.com/docling-project/docling-parse/issues/172
---
 pkgs/development/python-modules/docling-parse/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/docling-parse/default.nix b/pkgs/development/python-modules/docling-parse/default.nix
index 6f4ec7aeeaa1..ab1a5f14f32a 100644
--- a/pkgs/development/python-modules/docling-parse/default.nix
+++ b/pkgs/development/python-modules/docling-parse/default.nix
@@ -102,5 +102,8 @@ buildPythonPackage rec {
     homepage = "https://github.com/DS4SD/docling-parse";
     license = lib.licenses.mit;
     maintainers = [ ];
+    # error: no matching conversion for functional-style cast from 'bool' to 'nlohmann::basic_json<>'
+    # See https://github.com/docling-project/docling-parse/issues/172 for context
+    broken = true;
   };
 }

From cc1b18a19990c1d3989e7782e11403789f75466a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Mon, 20 Oct 2025 21:29:46 +0200
Subject: [PATCH 1096/6226] mullvad-browser: 14.5.7 -> 14.5.8

https://github.com/mullvad/mullvad-browser/releases/tag/14.5.8
---
 pkgs/by-name/mu/mullvad-browser/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix
index f6646986ea2d..9df5af7ed192 100644
--- a/pkgs/by-name/mu/mullvad-browser/package.nix
+++ b/pkgs/by-name/mu/mullvad-browser/package.nix
@@ -97,7 +97,7 @@ let
     ++ lib.optionals mediaSupport [ ffmpeg ]
   );
 
-  version = "14.5.7";
+  version = "14.5.8";
 
   sources = {
     x86_64-linux = fetchurl {
@@ -109,7 +109,7 @@ let
         "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
       ];
-      hash = "sha256-/PR0CDQByiUWlU5lP8QlJ7IQUWiXGTwrZbn9Cbe5xEg=";
+      hash = "sha256-82Y1QpnvXFKEXQtgUHCGh+2KYytbA+B1YwF0OtfvtSA=";
     };
   };
 

From ffd02e61c467661cd5e684964267a1a963e7a100 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 19:39:27 +0000
Subject: [PATCH 1097/6226] python3Packages.clarifai: 11.8.3 -> 11.8.5

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

diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix
index 56e2a74ca67f..0fcfba2485f5 100644
--- a/pkgs/development/python-modules/clarifai/default.nix
+++ b/pkgs/development/python-modules/clarifai/default.nix
@@ -32,7 +32,7 @@
 
 buildPythonPackage rec {
   pname = "clarifai";
-  version = "11.8.3";
+  version = "11.8.5";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     owner = "Clarifai";
     repo = "clarifai-python";
     tag = version;
-    hash = "sha256-sl9x8VqGGgUfPSRZiMP6edLeUUTpASp8kdRLl0Kxclc=";
+    hash = "sha256-c0lCbkHOIbzgaVLyGfJ8mbgtePTpv+PbsmErI4ZuLq4=";
   };
 
   pythonRelaxDeps = [

From 04ec0afe1c8c446771101163f8cacae0846204a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 19:40:08 +0000
Subject: [PATCH 1098/6226] lint-staged: 16.2.4 -> 16.2.5

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

diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix
index a7dd006a657f..0dc439ea64c9 100644
--- a/pkgs/by-name/li/lint-staged/package.nix
+++ b/pkgs/by-name/li/lint-staged/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "lint-staged";
-  version = "16.2.4";
+  version = "16.2.5";
 
   src = fetchFromGitHub {
     owner = "okonet";
     repo = "lint-staged";
     rev = "v${version}";
-    hash = "sha256-r4BJVY4PoBItIpCOQO5eTVyOGnIqV1fJ/cbrNyjvhAs=";
+    hash = "sha256-9SsdcF294v6/PAsz/cJXsqUbloSy24HHG7z7bCKUHaw=";
   };
 
-  npmDepsHash = "sha256-0lVx2s58XFa9xj2fiP6P5jCfVeUZ8pFkmdy/J6yDK9A=";
+  npmDepsHash = "sha256-/hknNGUG02jFEYfYNM/eShiNptktJcc4XGAG3klfryA=";
 
   dontNpmBuild = true;
 

From 3cd0ff85e5cc65c276bcf722270763c6196f9960 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Mon, 20 Oct 2025 21:42:29 +0200
Subject: [PATCH 1099/6226] mullvad-browser: remove with lib

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

diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix
index 9df5af7ed192..dae3483f249a 100644
--- a/pkgs/by-name/mu/mullvad-browser/package.nix
+++ b/pkgs/by-name/mu/mullvad-browser/package.nix
@@ -296,12 +296,12 @@ stdenv.mkDerivation rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Privacy-focused browser made in a collaboration between The Tor Project and Mullvad";
     mainProgram = "mullvad-browser";
     homepage = "https://mullvad.net/en/browser";
-    platforms = attrNames sources;
-    maintainers = with maintainers; [
+    platforms = lib.attrNames sources;
+    maintainers = with lib.maintainers; [
       felschr
       panicgh
       sigmasquadron
@@ -309,12 +309,12 @@ stdenv.mkDerivation rec {
     # MPL2.0+, GPL+, &c.  While it's not entirely clear whether
     # the compound is "libre" in a strict sense (some components place certain
     # restrictions on redistribution), it's free enough for our purposes.
-    license = with licenses; [
+    license = with lib.licenses; [
       mpl20
       lgpl21Plus
       lgpl3Plus
       free
     ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 }

From fb06ba194b26c902e5b65e775ed08e1273f7e566 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 19:44:15 +0000
Subject: [PATCH 1100/6226] libdnf: 0.74.0 -> 0.75.0

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

diff --git a/pkgs/by-name/li/libdnf/package.nix b/pkgs/by-name/li/libdnf/package.nix
index 8a19697e882a..ab7827cfa43f 100644
--- a/pkgs/by-name/li/libdnf/package.nix
+++ b/pkgs/by-name/li/libdnf/package.nix
@@ -25,7 +25,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libdnf";
-  version = "0.74.0";
+  version = "0.75.0";
 
   outputs = [
     "out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     owner = "rpm-software-management";
     repo = "libdnf";
     tag = version;
-    hash = "sha256-NAnE8VPz2j7h/gB1A4FDwG/x7ki7QEmBjcfvOb6/+VY=";
+    hash = "sha256-ujkJVeI6wgapTW1DBIhj4F/rXJFBb+KdREpc5jfU124=";
   };
 
   nativeBuildInputs = [

From 7ce090a1de1f3596c44f0f62222f57a553a06ebe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 19:51:13 +0000
Subject: [PATCH 1101/6226] istioctl: 1.27.2 -> 1.27.3

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

diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix
index 7b9533563912..bee109171146 100644
--- a/pkgs/by-name/is/istioctl/package.nix
+++ b/pkgs/by-name/is/istioctl/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "istioctl";
-  version = "1.27.2";
+  version = "1.27.3";
 
   src = fetchFromGitHub {
     owner = "istio";
     repo = "istio";
     rev = version;
-    hash = "sha256-o+rKTm1Yc2J+/uDp1DCkCpmOrODpfQ7bQ/FB62UyKfk=";
+    hash = "sha256-MgicdVRYHdp38lHY7VjAH+4xKD9sgEroEIwNkSmbfjU=";
   };
   vendorHash = "sha256-AJzEAFZZe4QtuYRcIJ8GwosbBi5gWn+DAOpVS8JnAdQ=";
 

From cc72bd2c2379cd8e451a3623b63438b597fded73 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 16 Oct 2025 22:09:29 +0200
Subject: [PATCH 1102/6226] libsForQt5.full: drop

It was broken after qtwebengine (and qtwebview) got tagged
insecure in https://github.com/NixOS/nixpkgs/pull/435067
---
 .../libraries/qt-5/5.15/default.nix           | 39 ++-----------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  1 -
 3 files changed, 4 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/libraries/qt-5/5.15/default.nix b/pkgs/development/libraries/qt-5/5.15/default.nix
index 9c34451b9e84..dcc9226993b2 100644
--- a/pkgs/development/libraries/qt-5/5.15/default.nix
+++ b/pkgs/development/libraries/qt-5/5.15/default.nix
@@ -352,42 +352,6 @@ let
       qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix { };
 
       env = callPackage ../qt-env.nix { };
-      full =
-        callPackage ({ env, qtbase }: env "qt-full-${qtbase.version}") { }
-          # `with self` is ok to use here because having these spliced is unnecessary
-          (
-            with self;
-            [
-              qt3d
-              qtcharts
-              qtconnectivity
-              qtdeclarative
-              qtdoc
-              qtgraphicaleffects
-              qtimageformats
-              qtlocation
-              qtmultimedia
-              qtquickcontrols
-              qtquickcontrols2
-              qtscript
-              qtsensors
-              qtserialport
-              qtsvg
-              qttools
-              qttranslations
-              qtvirtualkeyboard
-              qtwebchannel
-              qtwebengine
-              qtwebsockets
-              qtwebview
-              qtx11extras
-              qtxmlpatterns
-              qtlottie
-              qtdatavis3d
-            ]
-            ++ lib.optional (!stdenv.hostPlatform.isDarwin) qtwayland
-            ++ lib.optional (stdenv.hostPlatform.isDarwin) qtmacextras
-          );
 
       qmake = callPackage (
         { qtbase }:
@@ -422,6 +386,9 @@ let
           ++ lib.optional stdenv.hostPlatform.isLinux qtwayland.dev;
         } ../hooks/wrap-qt-apps-hook.sh
       ) { };
+    }
+    // lib.optionalAttrs config.allowAliases {
+      full = throw "libsForQt5.full has been removed. Please use individual packages instead."; # Added 2025-10-18
     };
 
   baseScope = makeScopeWithSplicing' {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f7633dfb2ee1..b8e4b359fbdb 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2255,6 +2255,7 @@ mapAliases {
   qt-video-wlr = throw "'qt-video-wlr' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
   qt515 = qt5; # Added 2022-11-24
   qt5ct = throw "'qt5ct' has been renamed to/replaced by 'libsForQt5.qt5ct'"; # Converted to throw 2024-10-17
+  qt5Full = throw "qt5Full has been removed. Please use individual packages instead."; # Added 2025-10-18
   qt6ct = qt6Packages.qt6ct; # Added 2023-03-07
   qtchan = throw "'qtchan' has been removed due to lack of maintenance upstream"; # Added 2025-07-01
   qtcurve = throw "'qtcurve' has been renamed to/replaced by 'libsForQt5.qtcurve'"; # Converted to throw 2024-10-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 659b705ee86a..b583186615ec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8493,7 +8493,6 @@ with pkgs;
   plasma5Packages = libsForQt5;
 
   qtEnv = qt5.env;
-  qt5Full = qt5.full;
 
   qt6 = recurseIntoAttrs (callPackage ../development/libraries/qt-6 { });
 

From 91ef0478c98baa99c6edf6acf44e81d9fd3a1e78 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Mon, 20 Oct 2025 20:07:30 +0000
Subject: [PATCH 1103/6226] proton-ge-bin: GE-Proton10-20 -> GE-Proton10-21

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

diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix
index 11749bbc3444..976f85ba7c0f 100644
--- a/pkgs/by-name/pr/proton-ge-bin/package.nix
+++ b/pkgs/by-name/pr/proton-ge-bin/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-ge-bin";
-  version = "GE-Proton10-20";
+  version = "GE-Proton10-21";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-sJkaDEnfAuEqcLDBtAfU6Rny3P3lOCnG1DusWfvv2Fg=";
+    hash = "sha256-Oa9+DjEeZZiJEr9H7wnUtGb6v/JXHk0qt0GAGcp3JFQ=";
   };
 
   dontUnpack = true;

From c79ada33c752f459ea6fbe1a5403e701334044fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Mon, 20 Oct 2025 22:06:33 +0200
Subject: [PATCH 1104/6226] tor-browser: remove deprecated useHardenedMalloc

The option been deprecated since NixOS 23.05:
https://github.com/NixOS/nixpkgs/pull/248040
---
 pkgs/by-name/to/tor-browser/package.nix | 609 ++++++++++++------------
 1 file changed, 297 insertions(+), 312 deletions(-)

diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index e5d139bd6453..75f6988c6454 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -55,11 +55,6 @@
   libvaSupport ? mediaSupport,
   libva,
 
-  # Hardening
-  graphene-hardened-malloc,
-  # Whether to use graphene-hardened-malloc
-  useHardenedMalloc ? null,
-
   # Whether to use IPC for communicating with Tor
   useIPCTorService ? false,
   # Whether to disable multiprocess support
@@ -69,317 +64,307 @@
   extraPrefs ? "",
 }:
 
-lib.warnIf (useHardenedMalloc != null)
-  "tor-browser: useHardenedMalloc is deprecated and enabling it can cause issues"
+let
+  libPath = lib.makeLibraryPath (
+    [
+      alsa-lib
+      atk
+      cairo
+      dbus
+      dbus-glib
+      fontconfig
+      freetype
+      gdk-pixbuf
+      glib
+      gtk3
+      libxcb
+      libX11
+      libXext
+      libXrender
+      libXt
+      libXtst
+      libgbm
+      pango
+      pciutils
+      stdenv.cc.cc
+      stdenv.cc.libc
+      zlib
+    ]
+    ++ lib.optionals libnotifySupport [ libnotify ]
+    ++ lib.optionals waylandSupport [
+      libxkbcommon
+      libdrm
+      libGL
+    ]
+    ++ lib.optionals pipewireSupport [ pipewire ]
+    ++ lib.optionals pulseaudioSupport [ libpulseaudio ]
+    ++ lib.optionals libvaSupport [ libva ]
+    ++ lib.optionals mediaSupport [ ffmpeg ]
+  );
 
-  (
-    let
-      libPath = lib.makeLibraryPath (
-        [
-          alsa-lib
-          atk
-          cairo
-          dbus
-          dbus-glib
-          fontconfig
-          freetype
-          gdk-pixbuf
-          glib
-          gtk3
-          libxcb
-          libX11
-          libXext
-          libXrender
-          libXt
-          libXtst
-          libgbm
-          pango
-          pciutils
-          stdenv.cc.cc
-          stdenv.cc.libc
-          zlib
-        ]
-        ++ lib.optionals libnotifySupport [ libnotify ]
-        ++ lib.optionals waylandSupport [
-          libxkbcommon
-          libdrm
-          libGL
-        ]
-        ++ lib.optionals pipewireSupport [ pipewire ]
-        ++ lib.optionals pulseaudioSupport [ libpulseaudio ]
-        ++ lib.optionals libvaSupport [ libva ]
-        ++ lib.optionals mediaSupport [ ffmpeg ]
-      );
+  version = "14.5.8";
 
-      version = "14.5.8";
-
-      sources = {
-        x86_64-linux = fetchurl {
-          urls = [
-            "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
-            "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
-            "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
-            "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
-          ];
-          hash = "sha256-hf3pkl+J9Hs28XSyNoXCZM0B9A7g4/n6F7WFkD/hl/o=";
-        };
-
-        i686-linux = fetchurl {
-          urls = [
-            "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
-            "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
-            "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
-            "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
-          ];
-          hash = "sha256-iSHeHCyBg66pbGw8glmViTFMvys3EArOkXVpqJBXEfc=";
-        };
-      };
-
-      distributionIni = writeText "distribution.ini" (
-        lib.generators.toINI { } {
-          # Some light branding indicating this build uses our distro preferences
-          Global = {
-            id = "nixos";
-            version = "1.0";
-            about = "Tor Browser for NixOS";
-          };
-        }
-      );
-
-      policiesJson = writeText "policies.json" (
-        builtins.toJSON {
-          policies.DisableAppUpdate = true;
-        }
-      );
-    in
-    stdenv.mkDerivation rec {
-      pname = "tor-browser";
-      inherit version;
-
-      src =
-        sources.${stdenv.hostPlatform.system}
-          or (throw "unsupported system: ${stdenv.hostPlatform.system}");
-
-      nativeBuildInputs = [
-        autoPatchelfHook
-        patchelfUnstable
-        copyDesktopItems
-        makeWrapper
-        wrapGAppsHook3
+  sources = {
+    x86_64-linux = fetchurl {
+      urls = [
+        "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
+        "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
+        "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
+        "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
       ];
-      buildInputs = [
-        gtk3
-        alsa-lib
-        dbus-glib
-        libXtst
+      hash = "sha256-hf3pkl+J9Hs28XSyNoXCZM0B9A7g4/n6F7WFkD/hl/o=";
+    };
+
+    i686-linux = fetchurl {
+      urls = [
+        "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
+        "https://dist.torproject.org/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
+        "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
+        "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
       ];
+      hash = "sha256-iSHeHCyBg66pbGw8glmViTFMvys3EArOkXVpqJBXEfc=";
+    };
+  };
 
-      # Firefox uses "relrhack" to manually process relocations from a fixed offset
-      patchelfFlags = [ "--no-clobber-old-sections" ];
-
-      preferLocalBuild = true;
-      allowSubstitutes = false;
-
-      desktopItems = [
-        (makeDesktopItem {
-          name = "torbrowser";
-          exec = "tor-browser %U";
-          icon = "tor-browser";
-          desktopName = "Tor Browser";
-          genericName = "Web Browser";
-          comment = meta.description;
-          categories = [
-            "Network"
-            "WebBrowser"
-            "Security"
-          ];
-          mimeTypes = [
-            "text/html"
-            "text/xml"
-            "application/xhtml+xml"
-            "application/vnd.mozilla.xul+xml"
-            "x-scheme-handler/http"
-            "x-scheme-handler/https"
-          ];
-          startupWMClass = "Tor Browser";
-        })
-      ];
-
-      buildPhase = ''
-        runHook preBuild
-
-        # For convenience ...
-        TBB_IN_STORE=$out/share/tor-browser
-
-        # Unpack & enter
-        mkdir -p "$TBB_IN_STORE"
-        tar xf "$src" -C "$TBB_IN_STORE" --strip-components=2
-        pushd "$TBB_IN_STORE"
-
-        # Set ELF interpreter
-        autoPatchelf firefox.real TorBrowser/Tor
-
-        # firefox is a wrapper that checks for a more recent libstdc++ & appends it to the ld path
-        mv firefox.real firefox
-
-        # store state at `~/.tor browser` instead of relative to executable
-        touch "$TBB_IN_STORE/system-install"
-
-        # The final libPath.  Note, we could split this into firefoxLibPath
-        # and torLibPath for accuracy, but this is more convenient ...
-        libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor
-
-        # apulse uses a non-standard library path.  For now special-case it.
-        ${lib.optionalString (audioSupport && !pulseaudioSupport) ''
-          libPath=${apulse}/lib/apulse:$libPath
-        ''}
-
-        # Fixup paths to pluggable transports.
-        substituteInPlace TorBrowser/Data/Tor/torrc-defaults \
-          --replace-fail './TorBrowser' "$TBB_IN_STORE/TorBrowser"
-
-        # Prepare for autoconfig.
-        #
-        # See https://developer.mozilla.org/en-US/Firefox/Enterprise_deployment
-        cat >defaults/pref/autoconfig.js <<EOF
-        //
-        pref("general.config.filename", "mozilla.cfg");
-        pref("general.config.obscure_value", 0);
-        EOF
-
-        # Hard-coded Firefox preferences.
-        cat >mozilla.cfg <<EOF
-        // First line must be a comment
-
-        // Reset pref that captures store paths.
-        clearPref("extensions.xpiState");
-
-        // Stop obnoxious first-run redirection.
-        lockPref("noscript.firstRunRedirection", false);
-
-        // User should never change these.  Locking prevents these
-        // values from being written to prefs.js, avoiding Store
-        // path capture.
-        lockPref("extensions.torlauncher.torrc-defaults_path", "$TBB_IN_STORE/TorBrowser/Data/Tor/torrc-defaults");
-        lockPref("extensions.torlauncher.tor_path", "$TBB_IN_STORE/TorBrowser/Tor/tor");
-
-        // Optionally use IPC for communicating with Tor
-        //
-        // Sockets are created at \$XDG_RUNTIME_DIR/Tor/{socks,control}.socket
-        ${lib.optionalString useIPCTorService ''
-          lockPref("extensions.torlauncher.control_port_use_ipc", true);
-          lockPref("extensions.torlauncher.socks_port_use_ipc", true);
-        ''}
-
-        // Optionally disable multiprocess support.  We always set this to ensure that
-        // toggling the pref takes effect.
-        lockPref("browser.tabs.remote.autostart.2", ${if disableContentSandbox then "false" else "true"});
-
-        // Allow sandbox access to sound devices if using ALSA directly
-        ${
-          if (audioSupport && !pulseaudioSupport) then
-            ''
-              pref("security.sandbox.content.write_path_whitelist", "/dev/snd/");
-            ''
-          else
-            ''
-              clearPref("security.sandbox.content.write_path_whitelist");
-            ''
-        }
-
-        ${lib.optionalString (extraPrefs != "") ''
-          ${extraPrefs}
-        ''}
-        EOF
-
-        # FONTCONFIG_FILE is required to make fontconfig read the TBB
-        # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024
-        # indicates the system fonts.conf being used instead.
-        FONTCONFIG_FILE=$TBB_IN_STORE/fonts/fonts.conf
-        substituteInPlace "$FONTCONFIG_FILE" \
-          --replace-fail '<dir prefix="cwd">fonts</dir>' "<dir>$TBB_IN_STORE/fonts</dir>"
-
-        # Hard-code paths to geoip data files.  TBB resolves the geoip files
-        # relative to torrc-defaults_path but if we do not hard-code them
-        # here, these paths end up being written to the torrc in the user's
-        # state dir.
-        cat >>TorBrowser/Data/Tor/torrc-defaults <<EOF
-        GeoIPFile $TBB_IN_STORE/TorBrowser/Data/Tor/geoip
-        GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6
-        EOF
-
-        mkdir -p $out/bin
-
-        makeWrapper "$TBB_IN_STORE/firefox" "$out/bin/tor-browser" \
-          --prefix LD_PRELOAD : "${
-            lib.optionalString (
-              useHardenedMalloc == true
-            ) "${graphene-hardened-malloc}/lib/libhardened_malloc.so"
-          }" \
-          --prefix LD_LIBRARY_PATH : "$libPath" \
-          --set FONTCONFIG_FILE "$FONTCONFIG_FILE" \
-          --set-default MOZ_ENABLE_WAYLAND 1
-
-        # Easier access to docs
-        mkdir -p $out/share/doc
-        ln -s $TBB_IN_STORE/TorBrowser/Docs $out/share/doc/tor-browser
-
-        # Install icons
-        for i in 16 32 48 64 128; do
-          mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps/
-          ln -s $out/share/tor-browser/browser/chrome/icons/default/default$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/tor-browser.png
-        done
-
-        # Check installed apps
-        echo "Checking bundled Tor ..."
-        LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null
-
-        echo "Checking tor-browser wrapper ..."
-        $out/bin/tor-browser --version >/dev/null
-
-        runHook postBuild
-      '';
-
-      installPhase = ''
-        runHook preInstall
-
-        # Install distribution customizations
-        install -Dvm644 ${distributionIni} $out/share/tor-browser/distribution/distribution.ini
-        install -Dvm644 ${policiesJson} $out/share/tor-browser/distribution/policies.json
-
-        runHook postInstall
-      '';
-
-      passthru = {
-        inherit sources;
-        updateScript = callPackage ./update.nix {
-          inherit pname version meta;
-        };
-      };
-
-      meta = {
-        description = "Privacy-focused browser routing traffic through the Tor network";
-        mainProgram = "tor-browser";
-        homepage = "https://www.torproject.org/";
-        changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}";
-        platforms = lib.attrNames sources;
-        maintainers = with lib.maintainers; [
-          c4patino
-          felschr
-          hax404
-          joachifm
-          panicgh
-        ];
-        # MPL2.0+, GPL+, &c.  While it's not entirely clear whether
-        # the compound is "libre" in a strict sense (some components place certain
-        # restrictions on redistribution), it's free enough for our purposes.
-        license = with lib.licenses; [
-          mpl20
-          lgpl21Plus
-          lgpl3Plus
-          free
-        ];
-        sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  distributionIni = writeText "distribution.ini" (
+    lib.generators.toINI { } {
+      # Some light branding indicating this build uses our distro preferences
+      Global = {
+        id = "nixos";
+        version = "1.0";
+        about = "Tor Browser for NixOS";
       };
     }
-  )
+  );
+
+  policiesJson = writeText "policies.json" (
+    builtins.toJSON {
+      policies.DisableAppUpdate = true;
+    }
+  );
+in
+stdenv.mkDerivation rec {
+  pname = "tor-browser";
+  inherit version;
+
+  src =
+    sources.${stdenv.hostPlatform.system}
+      or (throw "unsupported system: ${stdenv.hostPlatform.system}");
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    patchelfUnstable
+    copyDesktopItems
+    makeWrapper
+    wrapGAppsHook3
+  ];
+  buildInputs = [
+    gtk3
+    alsa-lib
+    dbus-glib
+    libXtst
+  ];
+
+  # Firefox uses "relrhack" to manually process relocations from a fixed offset
+  patchelfFlags = [ "--no-clobber-old-sections" ];
+
+  preferLocalBuild = true;
+  allowSubstitutes = false;
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "torbrowser";
+      exec = "tor-browser %U";
+      icon = "tor-browser";
+      desktopName = "Tor Browser";
+      genericName = "Web Browser";
+      comment = meta.description;
+      categories = [
+        "Network"
+        "WebBrowser"
+        "Security"
+      ];
+      mimeTypes = [
+        "text/html"
+        "text/xml"
+        "application/xhtml+xml"
+        "application/vnd.mozilla.xul+xml"
+        "x-scheme-handler/http"
+        "x-scheme-handler/https"
+      ];
+      startupWMClass = "Tor Browser";
+    })
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    # For convenience ...
+    TBB_IN_STORE=$out/share/tor-browser
+
+    # Unpack & enter
+    mkdir -p "$TBB_IN_STORE"
+    tar xf "$src" -C "$TBB_IN_STORE" --strip-components=2
+    pushd "$TBB_IN_STORE"
+
+    # Set ELF interpreter
+    autoPatchelf firefox.real TorBrowser/Tor
+
+    # firefox is a wrapper that checks for a more recent libstdc++ & appends it to the ld path
+    mv firefox.real firefox
+
+    # store state at `~/.tor browser` instead of relative to executable
+    touch "$TBB_IN_STORE/system-install"
+
+    # The final libPath.  Note, we could split this into firefoxLibPath
+    # and torLibPath for accuracy, but this is more convenient ...
+    libPath=${libPath}:$TBB_IN_STORE:$TBB_IN_STORE/TorBrowser/Tor
+
+    # apulse uses a non-standard library path.  For now special-case it.
+    ${lib.optionalString (audioSupport && !pulseaudioSupport) ''
+      libPath=${apulse}/lib/apulse:$libPath
+    ''}
+
+    # Fixup paths to pluggable transports.
+    substituteInPlace TorBrowser/Data/Tor/torrc-defaults \
+      --replace-fail './TorBrowser' "$TBB_IN_STORE/TorBrowser"
+
+    # Prepare for autoconfig.
+    #
+    # See https://developer.mozilla.org/en-US/Firefox/Enterprise_deployment
+    cat >defaults/pref/autoconfig.js <<EOF
+    //
+    pref("general.config.filename", "mozilla.cfg");
+    pref("general.config.obscure_value", 0);
+    EOF
+
+    # Hard-coded Firefox preferences.
+    cat >mozilla.cfg <<EOF
+    // First line must be a comment
+
+    // Reset pref that captures store paths.
+    clearPref("extensions.xpiState");
+
+    // Stop obnoxious first-run redirection.
+    lockPref("noscript.firstRunRedirection", false);
+
+    // User should never change these.  Locking prevents these
+    // values from being written to prefs.js, avoiding Store
+    // path capture.
+    lockPref("extensions.torlauncher.torrc-defaults_path", "$TBB_IN_STORE/TorBrowser/Data/Tor/torrc-defaults");
+    lockPref("extensions.torlauncher.tor_path", "$TBB_IN_STORE/TorBrowser/Tor/tor");
+
+    // Optionally use IPC for communicating with Tor
+    //
+    // Sockets are created at \$XDG_RUNTIME_DIR/Tor/{socks,control}.socket
+    ${lib.optionalString useIPCTorService ''
+      lockPref("extensions.torlauncher.control_port_use_ipc", true);
+      lockPref("extensions.torlauncher.socks_port_use_ipc", true);
+    ''}
+
+    // Optionally disable multiprocess support.  We always set this to ensure that
+    // toggling the pref takes effect.
+    lockPref("browser.tabs.remote.autostart.2", ${if disableContentSandbox then "false" else "true"});
+
+    // Allow sandbox access to sound devices if using ALSA directly
+    ${
+      if (audioSupport && !pulseaudioSupport) then
+        ''
+          pref("security.sandbox.content.write_path_whitelist", "/dev/snd/");
+        ''
+      else
+        ''
+          clearPref("security.sandbox.content.write_path_whitelist");
+        ''
+    }
+
+    ${lib.optionalString (extraPrefs != "") ''
+      ${extraPrefs}
+    ''}
+    EOF
+
+    # FONTCONFIG_FILE is required to make fontconfig read the TBB
+    # fonts.conf; upstream uses FONTCONFIG_PATH, but FC_DEBUG=1024
+    # indicates the system fonts.conf being used instead.
+    FONTCONFIG_FILE=$TBB_IN_STORE/fonts/fonts.conf
+    substituteInPlace "$FONTCONFIG_FILE" \
+      --replace-fail '<dir prefix="cwd">fonts</dir>' "<dir>$TBB_IN_STORE/fonts</dir>"
+
+    # Hard-code paths to geoip data files.  TBB resolves the geoip files
+    # relative to torrc-defaults_path but if we do not hard-code them
+    # here, these paths end up being written to the torrc in the user's
+    # state dir.
+    cat >>TorBrowser/Data/Tor/torrc-defaults <<EOF
+    GeoIPFile $TBB_IN_STORE/TorBrowser/Data/Tor/geoip
+    GeoIPv6File $TBB_IN_STORE/TorBrowser/Data/Tor/geoip6
+    EOF
+
+    mkdir -p $out/bin
+
+    makeWrapper "$TBB_IN_STORE/firefox" "$out/bin/tor-browser" \
+      --prefix LD_LIBRARY_PATH : "$libPath" \
+      --set FONTCONFIG_FILE "$FONTCONFIG_FILE" \
+      --set-default MOZ_ENABLE_WAYLAND 1
+
+    # Easier access to docs
+    mkdir -p $out/share/doc
+    ln -s $TBB_IN_STORE/TorBrowser/Docs $out/share/doc/tor-browser
+
+    # Install icons
+    for i in 16 32 48 64 128; do
+      mkdir -p $out/share/icons/hicolor/''${i}x''${i}/apps/
+      ln -s $out/share/tor-browser/browser/chrome/icons/default/default$i.png $out/share/icons/hicolor/''${i}x''${i}/apps/tor-browser.png
+    done
+
+    # Check installed apps
+    echo "Checking bundled Tor ..."
+    LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null
+
+    echo "Checking tor-browser wrapper ..."
+    $out/bin/tor-browser --version >/dev/null
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    # Install distribution customizations
+    install -Dvm644 ${distributionIni} $out/share/tor-browser/distribution/distribution.ini
+    install -Dvm644 ${policiesJson} $out/share/tor-browser/distribution/policies.json
+
+    runHook postInstall
+  '';
+
+  passthru = {
+    inherit sources;
+    updateScript = callPackage ./update.nix {
+      inherit pname version meta;
+    };
+  };
+
+  meta = {
+    description = "Privacy-focused browser routing traffic through the Tor network";
+    mainProgram = "tor-browser";
+    homepage = "https://www.torproject.org/";
+    changelog = "https://gitweb.torproject.org/builders/tor-browser-build.git/plain/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt?h=maint-${version}";
+    platforms = lib.attrNames sources;
+    maintainers = with lib.maintainers; [
+      c4patino
+      felschr
+      hax404
+      joachifm
+      panicgh
+    ];
+    # MPL2.0+, GPL+, &c.  While it's not entirely clear whether
+    # the compound is "libre" in a strict sense (some components place certain
+    # restrictions on redistribution), it's free enough for our purposes.
+    license = with lib.licenses; [
+      mpl20
+      lgpl21Plus
+      lgpl3Plus
+      free
+    ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+}

From ab764de8e9f211ea7433bfc1e57fd5633e250f20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 20:30:42 +0000
Subject: [PATCH 1105/6226] exoscale-cli: 1.85.4 -> 1.86.0

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

diff --git a/pkgs/by-name/ex/exoscale-cli/package.nix b/pkgs/by-name/ex/exoscale-cli/package.nix
index 791e962fd122..e35bb87c7d8a 100644
--- a/pkgs/by-name/ex/exoscale-cli/package.nix
+++ b/pkgs/by-name/ex/exoscale-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "exoscale-cli";
-  version = "1.85.4";
+  version = "1.86.0";
 
   src = fetchFromGitHub {
     owner = "exoscale";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-rulleAbiwnUABnHLpfHFjGXK3/DxFJLmse3NIClSpMQ=";
+    sha256 = "sha256-AlpCTeopNfaN4IeumaEFTZNrBfIJH2RbfVoZaFRCy2Y=";
   };
 
   vendorHash = null;

From ebd8917c6ac385c6a325806483c13ef143247349 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 20 Oct 2025 22:16:45 +0200
Subject: [PATCH 1106/6226] csxcad: patch for CMake v4 + clean

---
 pkgs/by-name/cs/csxcad/package.nix | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/cs/csxcad/package.nix b/pkgs/by-name/cs/csxcad/package.nix
index 5482166b4d76..7ee94a9253da 100644
--- a/pkgs/by-name/cs/csxcad/package.nix
+++ b/pkgs/by-name/cs/csxcad/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   fparser,
   tinyxml,
@@ -13,18 +14,26 @@
   mpfr,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "csxcad";
   version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "thliebig";
     repo = "CSXCAD";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-SSV5ulx3rCJg99I/oOQbqe+gOSs+BfcCo6UkWHVhnSs=";
   };
 
-  patches = [ ./searchPath.patch ];
+  patches = [
+    ./searchPath.patch
+    # ref. https://github.com/thliebig/CSXCAD/pull/62 merged upstream
+    (fetchpatch {
+      name = "update-cmake-minimum-required.patch";
+      url = "https://github.com/thliebig/CSXCAD/commit/b8ea64e11320910109a49b6da5352e1a1a18a736.patch";
+      hash = "sha256-mpQmpvrEDjOKgEAZ5laIIepG+PWqSr637tOY7FQst2s=";
+    })
+  ];
 
   buildInputs = [
     cgal
@@ -39,11 +48,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  meta = with lib; {
+  meta = {
     description = "C++ library to describe geometrical objects";
     homepage = "https://github.com/thliebig/CSXCAD";
-    license = licenses.lgpl3;
-    maintainers = with maintainers; [ matthuszagh ];
-    platforms = platforms.linux;
+    license = lib.licenses.lgpl3;
+    maintainers = with lib.maintainers; [ matthuszagh ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From d886932fdb0e641ad7d70eb26c594e550dbbe25d Mon Sep 17 00:00:00 2001
From: Coutinho de Souza <dev@onemoresuza.com>
Date: Mon, 20 Oct 2025 15:46:38 -0400
Subject: [PATCH 1107/6226] maintainers: remove onemoresuza from hare, harec
 and haredoc

---
 pkgs/by-name/ha/hare/package.nix    | 2 +-
 pkgs/by-name/ha/harec/package.nix   | 2 +-
 pkgs/by-name/ha/haredoc/package.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/hare/package.nix b/pkgs/by-name/ha/hare/package.nix
index 4db503b574b4..406e7b72065c 100644
--- a/pkgs/by-name/ha/hare/package.nix
+++ b/pkgs/by-name/ha/hare/package.nix
@@ -170,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://harelang.org/";
     description = "Systems programming language designed to be simple, stable, and robust";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ onemoresuza ];
+    maintainers = [ ];
     mainProgram = "hare";
     inherit (harec.meta) platforms badPlatforms;
   };
diff --git a/pkgs/by-name/ha/harec/package.nix b/pkgs/by-name/ha/harec/package.nix
index 73257d0296ad..046bef8274a5 100644
--- a/pkgs/by-name/ha/harec/package.nix
+++ b/pkgs/by-name/ha/harec/package.nix
@@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://harelang.org/";
     description = "Bootstrapping Hare compiler written in C for POSIX systems";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ onemoresuza ];
+    maintainers = [ ];
     mainProgram = "harec";
     # The upstream developers do not like proprietary operating systems; see
     # https://harelang.org/platforms/
diff --git a/pkgs/by-name/ha/haredoc/package.nix b/pkgs/by-name/ha/haredoc/package.nix
index 773b226316ae..591983f1e093 100644
--- a/pkgs/by-name/ha/haredoc/package.nix
+++ b/pkgs/by-name/ha/haredoc/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation {
     homepage = "https://harelang.org/";
     description = "Hare's documentation tool";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ onemoresuza ];
+    maintainers = [ ];
     mainProgram = "haredoc";
     inherit (hareHook.meta) platforms badPlatforms;
   };

From 485daf938e31cfcd77210772b7c66f774c904e43 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 20:48:07 +0000
Subject: [PATCH 1108/6226] buf: 1.58.0 -> 1.59.0

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

diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix
index efa965fd1ed4..4a4e4cc2c31b 100644
--- a/pkgs/by-name/bu/buf/package.nix
+++ b/pkgs/by-name/bu/buf/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "buf";
-  version = "1.58.0";
+  version = "1.59.0";
 
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = "buf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RR5SjcMwU3Dcems7ovPlgH6Cp0sQ+Uqsztn6JATBfQo=";
+    hash = "sha256-2EFtRwLbwcgCLxEdZNYATlqFD3BJ+tRKscFAUBAzQOY=";
   };
 
-  vendorHash = "sha256-5n4+wIvefYkrvkYQKw++GuWnsewLXEZYC0w40Lh9N6g=";
+  vendorHash = "sha256-o6aE+qdsWGURJraebfhbVEwx6MJYs9Fw8B5FcoKHNgo=";
 
   patches = [
     # Skip a test that requires networking to be available to work.

From 70ee66918100f7939bce289ab72ad4ebd763003c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 20:55:07 +0000
Subject: [PATCH 1109/6226] dbeaver-bin: 25.2.2 -> 25.2.3

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

diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix
index 112917d6a74f..6747d9a99b6a 100644
--- a/pkgs/by-name/db/dbeaver-bin/package.nix
+++ b/pkgs/by-name/db/dbeaver-bin/package.nix
@@ -18,7 +18,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbeaver-bin";
-  version = "25.2.2";
+  version = "25.2.3";
 
   src =
     let
@@ -31,10 +31,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         aarch64-darwin = "macos-aarch64.dmg";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-e0xIFoDmhX1+VetCEJoDZqu6+wrFwTwgIzU8hQ/mXnI=";
-        aarch64-linux = "sha256-80HW2GGBAuCYo+fxz+XZG3sZm0/QW5krHLS4jSGgGvU=";
-        x86_64-darwin = "sha256-w1b22Uce2PmX3f6UMrrkVxSxT/E5rFhiSgb3PjYaYvY=";
-        aarch64-darwin = "sha256-oQ10VB4puNBxFcFRdOtFFF+FcN9I7CUbWMc56V1Z90E=";
+        x86_64-linux = "sha256-tOUOZP+A3vB73xvAj+OEvCR+APbwlKLwZN9iJYi/W7c=";
+        aarch64-linux = "sha256-yQ6+kZP22CtdaKQiRgWoYvUDMLz1mdlV3AWC+nKQVBI=";
+        x86_64-darwin = "sha256-tIkAkBcnF37sZV2ZHSgqe3PnAqSoU7iYRu8tNZ8fhfE=";
+        aarch64-darwin = "sha256-imkW4Dz8qWjIKLT6CvdjhIjWpEmfKk1MWVh5+NGujb4=";
       };
     in
     fetchurl {

From 79da313b3fafea6e9e72af1e1f32cdaf2e0487c7 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 17:57:34 -0300
Subject: [PATCH 1110/6226] sharpsat-td: fix build with cmake4

---
 pkgs/by-name/sh/sharpsat-td/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/sh/sharpsat-td/package.nix b/pkgs/by-name/sh/sharpsat-td/package.nix
index dfbc0053ce5f..6004c73a541a 100644
--- a/pkgs/by-name/sh/sharpsat-td/package.nix
+++ b/pkgs/by-name/sh/sharpsat-td/package.nix
@@ -48,6 +48,9 @@ stdenv.mkDerivation {
     # replace bundled version of mpreal/mpfrc++
     rm -r src/mpfr
     cp -r ${mpreal} src/mpfr
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [ cmake ];

From bb9fea9b8421292de7792aa3546d3b77202a1253 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Mon, 20 Oct 2025 15:57:53 -0500
Subject: [PATCH 1111/6226] =?UTF-8?q?yaziPlugins.mount:=2025.5.31-unstable?=
 =?UTF-8?q?-2025-08-11=20=E2=86=92=2025.5.31-unstable-2025-10-13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/ya/yazi/plugins/mount/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/mount/default.nix b/pkgs/by-name/ya/yazi/plugins/mount/default.nix
index 4da00adcaff1..03ae14ae1972 100644
--- a/pkgs/by-name/ya/yazi/plugins/mount/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/mount/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "mount.yazi";
-  version = "25.5.31-unstable-2025-08-11";
+  version = "25.5.31-unstable-2025-10-13";
 
   src = fetchFromGitHub {
     owner = "yazi-rs";
     repo = "plugins";
-    rev = "e95c7b384e7b0a9793fe1471f0f8f7810ef2a7ed";
-    hash = "sha256-TUS+yXxBOt6tL/zz10k4ezot8IgVg0/2BbS8wPs9KcE=";
+    rev = "9a52857eac61ede58d11c06ca813c3fa63fe3609";
+    hash = "sha256-YM53SsE10wtMqI1JGa4CqZbAgr7h62MZ5skEdAavOVA=";
   };
 
   meta = {

From d0288461da521322cda8ef3f7ea781164f78b2de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 21:02:48 +0000
Subject: [PATCH 1112/6226] melange: 0.31.6 -> 0.31.8

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

diff --git a/pkgs/by-name/me/melange/package.nix b/pkgs/by-name/me/melange/package.nix
index d03ae3293cb9..bb47934075ed 100644
--- a/pkgs/by-name/me/melange/package.nix
+++ b/pkgs/by-name/me/melange/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "melange";
-  version = "0.31.6";
+  version = "0.31.8";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "melange";
     rev = "v${version}";
-    hash = "sha256-C7aYI30ExREoIDzCMqGQtfjAf74wyA+6zcanmUoOAuI=";
+    hash = "sha256-oj9yXUX5eByCif6JUvixAKZaxH8ExsyXjJ+hYEOXIKc=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-52wU1icjR70EASU5DIu7Dpu8jEQv0vu69Qoibp6uB1o=";
+  vendorHash = "sha256-6LG+By5grybkyvySQf2PUvRSKY/c/wUrJEiBUU4JCgY=";
 
   subPackages = [ "." ];
 

From 5e03556d6c953ded3fd1c3ebda340b6c5c94a703 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 21:05:44 +0000
Subject: [PATCH 1113/6226] phpExtensions.spx: 0.4.21 -> 0.4.22

---
 pkgs/development/php-packages/spx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/spx/default.nix b/pkgs/development/php-packages/spx/default.nix
index 2b941d458943..a6fb3c8f3563 100644
--- a/pkgs/development/php-packages/spx/default.nix
+++ b/pkgs/development/php-packages/spx/default.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "0.4.21";
+  version = "0.4.22";
 in
 buildPecl {
   inherit version;
@@ -16,7 +16,7 @@ buildPecl {
     owner = "NoiseByNorthwest";
     repo = "php-spx";
     rev = "v${version}";
-    hash = "sha256-3rVnKUZZXLxoKCW717pCiPOVWDudQpoN8lC1jQzpwuw=";
+    hash = "sha256-P53g/o4i+QETWdErZaGA3AREvnr8kL9h0B1BMQlKdFA=";
   };
 
   configureFlags = [

From 4ce01653382c437497104d38c6f525a8c9dfdfff Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 20 Oct 2025 22:35:32 +0200
Subject: [PATCH 1114/6226] qcsxcad: fix for CMake v4

---
 pkgs/by-name/qc/qcsxcad/package.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/by-name/qc/qcsxcad/package.nix b/pkgs/by-name/qc/qcsxcad/package.nix
index 8d8b0fc4dfcc..00035bb2c64a 100644
--- a/pkgs/by-name/qc/qcsxcad/package.nix
+++ b/pkgs/by-name/qc/qcsxcad/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   csxcad,
   tinyxml,
@@ -20,6 +21,20 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-bX6e3ugHJynU9tP70BV8TadnoGg1VO7SAYJueMkMAyo=";
   };
 
+  patches = [
+    # ref. https://github.com/thliebig/QCSXCAD/pull/18 merged upstream
+    (fetchpatch {
+      name = "fix-cmake-40-issues.patch";
+      url = "https://github.com/thliebig/QCSXCAD/commit/200c9c211ee1401d6dce2bcbf2543089cdc67208.patch";
+      hash = "sha256-OVihvjBRTQ87l0bBq2J8aWC7WdFCPqy5CtU4S5a11Xw=";
+    })
+    (fetchpatch {
+      name = "update-cmake-minimum-required.patch";
+      url = "https://github.com/thliebig/QCSXCAD/commit/64a4bdc13511690499756e6602076c1e70cf4ee7.patch";
+      hash = "sha256-rzVj9YdAJVxhTatTO5MxZJInb1RB0qqmPFAkI2nxpQ0=";
+    })
+  ];
+
   outputs = [
     "out"
     "dev"

From 5c9aacf53dd2864b9d603dbd3dd1fc78a4900d2b Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 18:33:03 -0300
Subject: [PATCH 1115/6226] microsoft-edge: 141.0.3537.85 -> 141.0.3537.92

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

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 148b3e32ab9d..94ab92df4a06 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -162,11 +162,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "141.0.3537.85";
+  version = "141.0.3537.92";
 
   src = fetchurl {
     url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
-    hash = "sha256-BNLA4FeKxWZ8t5YMPbWK4z2UerjcVpbcBgotSfczVsA=";
+    hash = "sha256-nN/TgbaxOrALzMB56TO9ZbxIjJPTCxxWyr2WOMvY6Kg=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From e6db9fb9321c24821f0bca958c283d77e5e9784c Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 20 Oct 2025 23:42:23 +0200
Subject: [PATCH 1116/6226] openems: fix for CMake v4 + clean

---
 pkgs/by-name/op/openems/package.nix | 30 ++++++++++++++++++++++-------
 1 file changed, 23 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/op/openems/package.nix b/pkgs/by-name/op/openems/package.nix
index 22e92e81fa35..d336bf62f538 100644
--- a/pkgs/by-name/op/openems/package.nix
+++ b/pkgs/by-name/op/openems/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  fetchpatch,
   csxcad,
   fparser,
   tinyxml,
@@ -19,17 +20,32 @@
   hyp2mat,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "openems";
   version = "0.0.36";
 
   src = fetchFromGitHub {
     owner = "thliebig";
     repo = "openEMS";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-wdH+Zw7G2ZigzBMX8p3GKdFVx/AhbTNL+P3w+YjI/dc=";
   };
 
+  patches = [
+    # ref. https://github.com/thliebig/openEMS/pull/183 merged upstream
+    (fetchpatch {
+      name = "update-cmake-minimum-required.patch";
+      url = "https://github.com/thliebig/openEMS/commit/0fa7ba3aebc8ee531077973cfa136ead8e887872.patch";
+      hash = "sha256-q/ax7MZHwqSKAjx22uyV13YO/TXZa4bwikoQyItMB7E=";
+    })
+    # ref. https://github.com/thliebig/openEMS/pull/184 merged upstream
+    (fetchpatch {
+      name = "update-nf2ff-cmake-minimum-required.patch";
+      url = "https://github.com/thliebig/openEMS/commit/e02e2a8414355482145240e4c2b2464d7a26dd9e.patch";
+      hash = "sha256-y3pvim/8XUKF5k7shj0D+8P6tdfSZ3E/gxTogbRtxdo=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
   ];
@@ -60,11 +76,11 @@ stdenv.mkDerivation rec {
       -o $out/share/openEMS/matlab/h5readatt_octave.oct
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Open Source Electromagnetic Field Solver";
     homepage = "https://wiki.openems.de/index.php/Main_Page.html";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ matthuszagh ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ matthuszagh ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From a75357dc04f3da099bb0ccba095ffd7a2ec7e9cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 21:45:57 +0000
Subject: [PATCH 1117/6226] firefly-iii-data-importer: 1.8.4 -> 1.9.0

---
 pkgs/by-name/fi/firefly-iii-data-importer/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
index 766e6d422f4d..f11f9d768b89 100644
--- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
+++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
@@ -13,13 +13,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii-data-importer";
-  version = "1.8.4";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "data-importer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xo1CgsPdqSw7VFlPx5aidB7h7fwot95XYlPxyW7S8yw=";
+    hash = "sha256-07i/78dF6yynSGAHc91899hLD1MKacBUJ5d455hn9mE=";
   };
 
   buildInputs = [ php84 ];
@@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   composerStrictValidation = true;
   strictDeps = true;
 
-  vendorHash = "sha256-6sTCXSMAgMQH7tQjl3UvPgqRShdEUV1Xi4R/M/j2Xxc=";
+  vendorHash = "sha256-i4DZ62J5v/tskoaQ1GaE7b1VJcFOFIJW8xC8R4h4tHk=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-gYCjxZP7pytYYgJEvW78SmzX9jZAjkAMlRv9doc+JqE=";
+    hash = "sha256-KRMdcY9pkyXOPCwcNXOK1FJYWIcvDE6DRVX/aG8KzCs=";
   };
 
   composerRepository = php84.mkComposerRepository {

From 2baf1fe5ffd3a5c76df4b8bed401ebf14c4a2209 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 20 Oct 2025 23:46:08 +0200
Subject: [PATCH 1118/6226] appcsxcad: fix for CMake v4

---
 pkgs/by-name/ap/appcsxcad/package.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/by-name/ap/appcsxcad/package.nix b/pkgs/by-name/ap/appcsxcad/package.nix
index ae9504c3d2fa..4d1a5b3d82b5 100644
--- a/pkgs/by-name/ap/appcsxcad/package.nix
+++ b/pkgs/by-name/ap/appcsxcad/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   csxcad,
   qcsxcad,
@@ -25,6 +26,20 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-KrsnCnRZRTbkgEH3hOETrYhseg5mCHPqhAbYyHlS3sk=";
   };
 
+  patches = [
+    # ref. https://github.com/thliebig/AppCSXCAD/pull/14 merged upstream
+    (fetchpatch {
+      name = "update-minimum-cmake-required.patch";
+      url = "https://github.com/thliebig/AppCSXCAD/commit/9585207eb08195c3f1c47dc9d6a80b563a3272e0.patch";
+      hash = "sha256-2+C3cqQMU3UL12h0f7EdBZVqeJVSPhDVbMOcqbOY0gg=";
+    })
+    (fetchpatch {
+      name = "remove-cmp0020-policy.patch";
+      url = "https://github.com/thliebig/AppCSXCAD/commit/688c07cd847f463a2a42f01d41751374b4f787c8.patch";
+      hash = "sha256-pa6imzrUoVA3Ebc4UGPACJ6qjYiHOjB5aQ9FN/CUpVM=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     qt6.wrapQtAppsHook

From 9bc18f0a98ce4e51ec54c8e920bbd0ae594f75e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 21:50:30 +0000
Subject: [PATCH 1119/6226] rzls: 10.0.0-preview.25464.2 ->
 10.0.0-preview.25517.9

---
 pkgs/by-name/rz/rzls/deps.json   | 90 ++++++++++++++++----------------
 pkgs/by-name/rz/rzls/package.nix |  6 +--
 2 files changed, 48 insertions(+), 48 deletions(-)

diff --git a/pkgs/by-name/rz/rzls/deps.json b/pkgs/by-name/rz/rzls/deps.json
index 44f7c584b212..16d7d77ebc93 100644
--- a/pkgs/by-name/rz/rzls/deps.json
+++ b/pkgs/by-name/rz/rzls/deps.json
@@ -43,9 +43,9 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.Analyzers",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-BsNPX6p08WG5unEZOq/m8c9iKQ2tcX8LiUj2Icf9Mm8=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.0.0-2.25452.2/microsoft.codeanalysis.analyzers.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-ARzhiaKHCyl9IY39hWfzHiv5eDmmTBgnrhRaoYGSfTU=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.analyzers/5.0.0-2.25461.22/microsoft.codeanalysis.analyzers.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
@@ -55,27 +55,27 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.Common",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-C5ymxF29vgwu9Jwl7CwNEf4+zpb7fFLUdBGPVnf+Ixs=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/5.0.0-2.25452.2/microsoft.codeanalysis.common.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-GltCV7wW9rNxN2k6pS26lILDVDZcoyAZD1td4lmzKn4=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.common/5.0.0-2.25461.22/microsoft.codeanalysis.common.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-foZzAkEdfdtvF3WJwUhdC51KeBHnTdBoH+JGV5XD5A0=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/5.0.0-2.25452.2/microsoft.codeanalysis.csharp.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-+mf1IuoaRl5RPU6RjXrHkrdes8jE3z/JAPw+0ab4Fzk=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp/5.0.0-2.25461.22/microsoft.codeanalysis.csharp.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp.Features",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-3J+9YhYUePNRX8sWJQNbK3G/FjS+sh5ML1ix1zn5B5Q=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/5.0.0-2.25452.2/microsoft.codeanalysis.csharp.features.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-tPGG+CWkok0B9ggro1wU0g9iLaJ//oUtE/Z4EEqLdjk=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.features/5.0.0-2.25461.22/microsoft.codeanalysis.csharp.features.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.CSharp.Workspaces",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-Wnqq7HFdRvwde+tx1fLufiVOeAZul5jDasswEKFLhdk=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/5.0.0-2.25452.2/microsoft.codeanalysis.csharp.workspaces.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-9FTv+MloLtCBFmLN1eZ+7dLrHrMlFPA7na8gB2LwO0U=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.csharp.workspaces/5.0.0-2.25461.22/microsoft.codeanalysis.csharp.workspaces.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Elfie",
@@ -85,21 +85,21 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.ExternalAccess.Razor.Features",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-cfOyGxroU5SZAUar6YROo2o6lsr2lVAkYMQopIsIRnc=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.razor.features/5.0.0-2.25452.2/microsoft.codeanalysis.externalaccess.razor.features.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-LdE0uEZqa0NYG9n2MdVVw4gkj/5WlRjbdu0tL9u3Ir4=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.externalaccess.razor.features/5.0.0-2.25461.22/microsoft.codeanalysis.externalaccess.razor.features.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Features",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-3flzK3w1P+YEm93XeKyWKKu0de7uaSJhRR6CjDi2uAo=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/5.0.0-2.25452.2/microsoft.codeanalysis.features.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-vx5X2WC2Oc8sMmfOK09JOXMDtIdKeAXQJzD28DAeX0Q=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.features/5.0.0-2.25461.22/microsoft.codeanalysis.features.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.LanguageServer.Protocol",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-VbfgcAULLmLjGHfqYD1ohJPLZn65b8JFaOnP0kucqJg=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.languageserver.protocol/5.0.0-2.25452.2/microsoft.codeanalysis.languageserver.protocol.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-c75mxIhdNy5MmCxFQBTkyiyOgIDcTcBn2q+za3sR+gE=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.languageserver.protocol/5.0.0-2.25461.22/microsoft.codeanalysis.languageserver.protocol.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.PublicApiAnalyzers",
@@ -109,27 +109,27 @@
   },
   {
     "pname": "Microsoft.CodeAnalysis.Remote.Workspaces",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-jYHylTS3OO84UFz1vfB8ST/k5G/XI6Ks4lOE5DYlPcw=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.remote.workspaces/5.0.0-2.25452.2/microsoft.codeanalysis.remote.workspaces.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-kdk4Xb2DIK/ClG7sRFrP8KhmWjoi/t12zuEvt29D12I=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.remote.workspaces/5.0.0-2.25461.22/microsoft.codeanalysis.remote.workspaces.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Scripting.Common",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-dG632yqX95EwXqDfhnBwhbS1/fuex7fUjM/wUnPQaR0=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/5.0.0-2.25452.2/microsoft.codeanalysis.scripting.common.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-Y9D+zE9oiEceJ7eaD9jb0YWA/p7GG76m8TqL+bFex8U=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.scripting.common/5.0.0-2.25461.22/microsoft.codeanalysis.scripting.common.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CodeAnalysis.Workspaces.Common",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-JNadLPLKA2wuThQABqj3/PKPhMTrn72VjNumkGbkNm4=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/5.0.0-2.25452.2/microsoft.codeanalysis.workspaces.common.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-EmmjTePJXCdGjqYSFXHrZ6twXaJ9WWvLTFKrQGjVmhw=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.codeanalysis.workspaces.common/5.0.0-2.25461.22/microsoft.codeanalysis.workspaces.common.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CommonLanguageServerProtocol.Framework",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-b/kxQt5KyluSGkkmFzy9+EGlTOW5gBv3bkM/t5PbB+8=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.commonlanguageserverprotocol.framework/5.0.0-2.25452.2/microsoft.commonlanguageserverprotocol.framework.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-1ek78xZapHDcYE6JEXhXjwuLDNZgr/jLckM7WEw8G0I=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.commonlanguageserverprotocol.framework/5.0.0-2.25461.22/microsoft.commonlanguageserverprotocol.framework.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.CSharp",
@@ -145,15 +145,15 @@
   },
   {
     "pname": "Microsoft.DotNet.Arcade.Sdk",
-    "version": "9.0.0-beta.25428.3",
-    "hash": "sha256-imlZjZcVWjNXO0yZmSoXPOlxX/qaJ96LeN8Xb/ox+Vk=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25428.3/microsoft.dotnet.arcade.sdk.9.0.0-beta.25428.3.nupkg"
+    "version": "9.0.0-beta.25462.4",
+    "hash": "sha256-UsK0l85wtrwYf7tmEELr3RfCf+Y3IKInI8IOziPfEE4=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/9.0.0-beta.25462.4/microsoft.dotnet.arcade.sdk.9.0.0-beta.25462.4.nupkg"
   },
   {
     "pname": "Microsoft.DotNet.XliffTasks",
-    "version": "9.0.0-beta.25428.3",
-    "hash": "sha256-4Jgieh85GiTg8rmQb3esR0UZTuj+L2cLzwyC0ziOBDc=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25428.3/microsoft.dotnet.xlifftasks.9.0.0-beta.25428.3.nupkg"
+    "version": "9.0.0-beta.25462.4",
+    "hash": "sha256-Pd3JOHzGDL+gwNy+2wlvsoUFU8S0q71af6vmdApbHPA=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/9.0.0-beta.25462.4/microsoft.dotnet.xlifftasks.9.0.0-beta.25462.4.nupkg"
   },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
@@ -181,9 +181,9 @@
   },
   {
     "pname": "Microsoft.Net.Compilers.Toolset",
-    "version": "5.0.0-2.25452.2",
-    "hash": "sha256-lrjvenHm6/z8Fy37UaUdKjM36zlwe43revlQjg+aqV4=",
-    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/5.0.0-2.25452.2/microsoft.net.compilers.toolset.5.0.0-2.25452.2.nupkg"
+    "version": "5.0.0-2.25461.22",
+    "hash": "sha256-MNgU0lJksVPs7o1yMRWcpativck4As+cG4mOFbFPYLw=",
+    "url": "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/d1622942-d16f-48e5-bc83-96f4539e7601/nuget/v3/flat2/microsoft.net.compilers.toolset/5.0.0-2.25461.22/microsoft.net.compilers.toolset.5.0.0-2.25461.22.nupkg"
   },
   {
     "pname": "Microsoft.NET.StringTools",
diff --git a/pkgs/by-name/rz/rzls/package.nix b/pkgs/by-name/rz/rzls/package.nix
index 3964d85dc55c..c17bf107bdf4 100644
--- a/pkgs/by-name/rz/rzls/package.nix
+++ b/pkgs/by-name/rz/rzls/package.nix
@@ -29,11 +29,11 @@ buildDotnetModule {
   src = fetchFromGitHub {
     owner = "dotnet";
     repo = "razor";
-    rev = "bde4f70c9560811a7f25023b9d8ac42fd7d0e99f";
-    hash = "sha256-wS7JKHLpX9/JluID94HXUkepaX9eoceRzuIofBICiBk=";
+    rev = "73622b728a3015c601aeada75eb8425bde7ba439";
+    hash = "sha256-uy6e9J/mx05wlRILoetnSyRYXvaveGIVzdQKDHEfrVQ=";
   };
 
-  version = "10.0.0-preview.25464.2";
+  version = "10.0.0-preview.25517.9";
   projectFile = "src/Razor/src/rzls/rzls.csproj";
   useDotnetFromEnv = true;
   nugetDeps = ./deps.json;

From 668354dfbe4830df8e10045a06983e88dbae75df Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 07:04:37 -0300
Subject: [PATCH 1120/6226] webos.cmake-modules, webos.novacom, webos.novacomd:
 fix build with cmake4

---
 pkgs/development/mobile/webos/cmake-modules.nix | 7 +++++++
 pkgs/development/mobile/webos/novacom.nix       | 5 +++++
 pkgs/development/mobile/webos/novacomd.nix      | 5 +++++
 3 files changed, 17 insertions(+)

diff --git a/pkgs/development/mobile/webos/cmake-modules.nix b/pkgs/development/mobile/webos/cmake-modules.nix
index be7818a9cab5..a982ae8b7b33 100644
--- a/pkgs/development/mobile/webos/cmake-modules.nix
+++ b/pkgs/development/mobile/webos/cmake-modules.nix
@@ -29,6 +29,13 @@ stdenv.mkDerivation rec {
 
   setupHook = ./cmake-setup-hook.sh;
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.7)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace webOS/webOS.cmake \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.7)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "CMake modules needed to build Open WebOS components";
     license = licenses.asl20;
diff --git a/pkgs/development/mobile/webos/novacom.nix b/pkgs/development/mobile/webos/novacom.nix
index 9cd3fb152e31..6ce1bfdefb88 100644
--- a/pkgs/development/mobile/webos/novacom.nix
+++ b/pkgs/development/mobile/webos/novacom.nix
@@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
     webos.cmake-modules
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.7)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = ''
     install -Dm755 -t $out/bin ../scripts/novaterm
     substituteInPlace $out/bin/novaterm --replace "exec novacom" "exec $out/bin/novacom"
diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix
index 617ec9c83651..65a54306d41d 100644
--- a/pkgs/development/mobile/webos/novacomd.nix
+++ b/pkgs/development/mobile/webos/novacomd.nix
@@ -49,6 +49,11 @@ stdenv.mkDerivation rec {
 
   passthru.tests = { inherit (nixosTests) novacomd; };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.7)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Daemon for communicating with WebOS devices";
     mainProgram = "novacomd";

From 2d401b8df7f1f00d9196e1de01fd2db311e525f0 Mon Sep 17 00:00:00 2001
From: Ilya Savitsky <ipsavitsky234@gmail.com>
Date: Mon, 20 Oct 2025 00:52:40 +0100
Subject: [PATCH 1121/6226] dpp: init at 0.6.0

---
 pkgs/by-name/dp/dplusplus/dub-lock.json | 16 ++++++++++
 pkgs/by-name/dp/dplusplus/package.nix   | 39 +++++++++++++++++++++++++
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/by-name/dp/dplusplus/dub-lock.json
 create mode 100644 pkgs/by-name/dp/dplusplus/package.nix

diff --git a/pkgs/by-name/dp/dplusplus/dub-lock.json b/pkgs/by-name/dp/dplusplus/dub-lock.json
new file mode 100644
index 000000000000..0af3b0d52760
--- /dev/null
+++ b/pkgs/by-name/dp/dplusplus/dub-lock.json
@@ -0,0 +1,16 @@
+{
+  "dependencies": {
+    "libclang": {
+      "version": "0.3.3",
+      "sha256": "0abmwx294zrnmpzdqbwnw74i07wmvsvycsbh5j0yy1kcz411n6r8"
+    },
+    "sumtype": {
+      "version": "1.2.8",
+      "sha256": "0zvl0nncmrqvj2x96qjry2ws67fi3mykz1zr11pnpvwp9xdkw9zx"
+    },
+    "unit-threaded": {
+      "version": "2.1.9",
+      "sha256": "0x3d8jv65v4sh4nk4fkah202vbqnkhbzdc7k40yjqbjlgx76h1hy"
+    }
+  }
+}
diff --git a/pkgs/by-name/dp/dplusplus/package.nix b/pkgs/by-name/dp/dplusplus/package.nix
new file mode 100644
index 000000000000..4be1545f57f3
--- /dev/null
+++ b/pkgs/by-name/dp/dplusplus/package.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  dtools,
+  libclang,
+  buildDubPackage,
+  fetchFromGitHub,
+}:
+
+buildDubPackage (finalAttrs: {
+  pname = "dpp";
+  version = "0.6.0";
+
+  src = fetchFromGitHub {
+    owner = "atilaneves";
+    repo = "dpp";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-8zcjZ8EV5jdZrRCHkzxu9NeehY2/5AfOSdzreFC9z3c=";
+  };
+
+  nativeBuildInputs = [ dtools ];
+  buildInputs = [ libclang ];
+
+  dubLock = ./dub-lock.json;
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 bin/d++ -t $out/d++
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Directly include C headers in D source code";
+    changelog = "https://github.com/atilaneves/dpp/releases/tag/v${finalAttrs.version}";
+    homepage = "https://github.com/atilaneves/dpp";
+    mainProgram = "d++";
+    maintainers = with lib.maintainers; [ ipsavitsky ];
+    license = lib.licenses.boost;
+  };
+})

From 0513a22b62ebdd808535765fc2aec16a9d712168 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 22:16:49 +0000
Subject: [PATCH 1122/6226] tbls: 1.89.1 -> 1.90.0

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

diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix
index 2515e5067f71..588da1a82ca5 100644
--- a/pkgs/by-name/tb/tbls/package.nix
+++ b/pkgs/by-name/tb/tbls/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "tbls";
-  version = "1.89.1";
+  version = "1.90.0";
 
   src = fetchFromGitHub {
     owner = "k1LoW";
     repo = "tbls";
     tag = "v${version}";
-    hash = "sha256-fGaH9766OjPNz0eVG4M1hKdqRaEkAzwz1lL2o4TxyAo=";
+    hash = "sha256-1CiiRmooy1KG6WsdRyLkttiEGX0ObPyJ/s97DcQXwUU=";
   };
 
   vendorHash = "sha256-hupOff2cJ+UrJFgMyDu3XYvEjyE/XvvyqiQq408wJsw=";

From db8e018e25ff5e3a207d68583d77c9a2d028ba95 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 22:25:41 +0000
Subject: [PATCH 1123/6226] python3Packages.niworkflows: 1.14.2 -> 1.14.3

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

diff --git a/pkgs/development/python-modules/niworkflows/default.nix b/pkgs/development/python-modules/niworkflows/default.nix
index 45904d90c38f..258faa3462ed 100644
--- a/pkgs/development/python-modules/niworkflows/default.nix
+++ b/pkgs/development/python-modules/niworkflows/default.nix
@@ -40,14 +40,14 @@
 
 buildPythonPackage rec {
   pname = "niworkflows";
-  version = "1.14.2";
+  version = "1.14.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nipreps";
     repo = "niworkflows";
     tag = version;
-    hash = "sha256-LzzbletoZdI9HuaBWhFB6IGs1nX6ZItNP6cWlw5m5EE=";
+    hash = "sha256-wdPHXVgMvd+Od3M2j7S43gBRSh4yiPeu+HM6EyiakwU=";
   };
 
   pythonRelaxDeps = [ "traits" ];

From 9097f841b440c509c35fb3d9a862b9a72a4230fd Mon Sep 17 00:00:00 2001
From: Rexiel Scarlet <37258415+Rexcrazy804@users.noreply.github.com>
Date: Tue, 21 Oct 2025 02:27:02 +0400
Subject: [PATCH 1124/6226] q4wine: 1.3.13 -> 1.4.2; fix build with cmake 4

---
 pkgs/applications/misc/q4wine/default.nix | 8 ++++----
 pkgs/top-level/all-packages.nix           | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/q4wine/default.nix b/pkgs/applications/misc/q4wine/default.nix
index b3cbb9572923..708e965c0978 100644
--- a/pkgs/applications/misc/q4wine/default.nix
+++ b/pkgs/applications/misc/q4wine/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   fetchFromGitHub,
-  mkDerivation,
+  stdenv,
   cmake,
   sqlite,
   qtbase,
@@ -15,15 +15,15 @@
   which, # runtime deps.
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "q4wine";
-  version = "1.3.13";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "brezerk";
     repo = "q4wine";
     rev = "v${version}";
-    sha256 = "04gw5y3dxdpivm2xqacqq85fdzx7xkl0c3h3hdazljb0c3cxxs6h";
+    sha256 = "sha256-5rj+EDsOZib78gWT003a4IN23cZQftnhVggIdLN6f7I=";
   };
 
   buildInputs = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 486b519307ce..320665a58872 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11354,7 +11354,7 @@ with pkgs;
   graphicsmagick_q16 = graphicsmagick.override { quantumdepth = 16; };
   graphicsmagick-imagemagick-compat = graphicsmagick.imagemagick-compat;
 
-  q4wine = libsForQt5.callPackage ../applications/misc/q4wine { };
+  q4wine = kdePackages.callPackage ../applications/misc/q4wine { };
 
   googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { };
 

From a7bb7c6b43e62db7ccc80151dca25ff3a29a242b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 22:43:32 +0000
Subject: [PATCH 1125/6226] python3Packages.rigour: 1.3.11 -> 1.3.13

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

diff --git a/pkgs/development/python-modules/rigour/default.nix b/pkgs/development/python-modules/rigour/default.nix
index e9ab5a9c3685..5f831293e994 100644
--- a/pkgs/development/python-modules/rigour/default.nix
+++ b/pkgs/development/python-modules/rigour/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "rigour";
-  version = "1.3.11";
+  version = "1.3.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "opensanctions";
     repo = "rigour";
     tag = "v${version}";
-    hash = "sha256-ahHrNky8dGcH8UmpnZ8avfzyrz5RIvsL9YOe4V8EeE4=";
+    hash = "sha256-mcQ1GqmNWv4/ul9oRw/+MnTEcIcn3OP0C5eXi4HWKMU=";
   };
 
   build-system = [

From b95b7269861db1a999ccb560c5a718cdee5990f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 23:04:25 +0000
Subject: [PATCH 1126/6226] python3Packages.xvfbwrapper: 0.2.14 -> 0.2.15

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

diff --git a/pkgs/development/python-modules/xvfbwrapper/default.nix b/pkgs/development/python-modules/xvfbwrapper/default.nix
index dbea89615cc7..4701ab0cd557 100644
--- a/pkgs/development/python-modules/xvfbwrapper/default.nix
+++ b/pkgs/development/python-modules/xvfbwrapper/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "xvfbwrapper";
-  version = "0.2.14";
+  version = "0.2.15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cgoldberg";
     repo = "xvfbwrapper";
     tag = version;
-    sha256 = "sha256-SLf9ytogbIXPM/Nf5h6akKhU3UnAAspJc5f9/bL5YNk=";
+    sha256 = "sha256-9PDLR8oz6VcRfqWOrLCw08wCqJeNCI5leiE6+QZi7xY=";
   };
 
   build-system = [ setuptools ];

From fbe7517d6ef6e6d94fff63aa221932d9ac810a0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 23:09:52 +0000
Subject: [PATCH 1127/6226] python3Packages.google-cloud-network-connectivity:
 2.10.0 -> 2.11.0

---
 .../google-cloud-network-connectivity/default.nix             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix
index ee8d07c264bb..f56cc87aea13 100644
--- a/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix
+++ b/pkgs/development/python-modules/google-cloud-network-connectivity/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-network-connectivity";
-  version = "2.10.0";
+  version = "2.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "google_cloud_network_connectivity";
-    hash = "sha256-wbznAUjwh57xuvuLWOrk1eXvxuDE+wWh6Cx3oQI8dqE=";
+    hash = "sha256-PBqFMVGTn7si4UgAc4zk/97M9mWSnVJMX9gZk0eXpSY=";
   };
 
   build-system = [ setuptools ];

From 0909cb8a745678b68d6f2793aa5f40f10e267526 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 23:41:47 +0000
Subject: [PATCH 1128/6226] mirrord: 3.165.0 -> 3.167.0

---
 pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json
index c2ff36881b70..711c78a223cd 100644
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -1,21 +1,21 @@
 {
-  "version": "3.165.0",
+  "version": "3.167.0",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.165.0/mirrord_linux_x86_64",
-      "hash": "sha256-XLmI42PHs15KFwsKzVRohdVcQiwRncuoI375OlnhrRM="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.167.0/mirrord_linux_x86_64",
+      "hash": "sha256-7LxoI0y82Hy2Vi7SveKgkKw1Bv5AzcMceBbV1FDhock="
     },
     "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.165.0/mirrord_linux_aarch64",
-      "hash": "sha256-IWEE2Vi/OIbL5hgOAkXhz/lJix7qjKD9yQrT2lNW4uY="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.167.0/mirrord_linux_aarch64",
+      "hash": "sha256-a4SuVF1e02IjAt//DgSdJ3dy4GfDaNhOHOwrZHio7OY="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.165.0/mirrord_mac_universal",
-      "hash": "sha256-xRFLI/97yFpM4mt+SSbCHo4CLY0ClWLrG3jUvIRO9CQ="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.167.0/mirrord_mac_universal",
+      "hash": "sha256-pqIjHduZMwsR6zXEURkKfixkY+FLy4oIE+aPPUX904M="
     },
     "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.165.0/mirrord_mac_universal",
-      "hash": "sha256-xRFLI/97yFpM4mt+SSbCHo4CLY0ClWLrG3jUvIRO9CQ="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.167.0/mirrord_mac_universal",
+      "hash": "sha256-pqIjHduZMwsR6zXEURkKfixkY+FLy4oIE+aPPUX904M="
     }
   }
 }

From 9d08008ea9af583b66a02a9690e1dac864689dea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 23:42:44 +0000
Subject: [PATCH 1129/6226] pocketbase: 0.30.2 -> 0.30.4

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

diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix
index b3e0d7f46fcb..5eab2ef9c561 100644
--- a/pkgs/by-name/po/pocketbase/package.nix
+++ b/pkgs/by-name/po/pocketbase/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "pocketbase";
-  version = "0.30.2";
+  version = "0.30.4";
 
   src = fetchFromGitHub {
     owner = "pocketbase";
     repo = "pocketbase";
     rev = "v${version}";
-    hash = "sha256-7XpusTwdocLsJBHWU71nHMmY0T05d4fKHe5XKvHSPR0=";
+    hash = "sha256-n2xBwonQOEk2LVQePxdO/PraM75FFDmOqZ9fIL2xd+I=";
   };
 
-  vendorHash = "sha256-ft+hs1VfCZrWceVDqO7ThRE1tiyozMFsYMclsKKdEBo=";
+  vendorHash = "sha256-Zo0b0MTIRpLGPIg288ROFPIdHfMzZdFLbFZPAffWPxU=";
 
   # This is the released subpackage from upstream repo
   subPackages = [ "examples/base" ];

From 40162e03eb5a059534f1beab840cfad1fdece4e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 20 Oct 2025 23:50:03 +0000
Subject: [PATCH 1130/6226] chezmoi: 2.66.0 -> 2.66.1

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

diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix
index f40170313a01..150a2545838b 100644
--- a/pkgs/by-name/ch/chezmoi/package.nix
+++ b/pkgs/by-name/ch/chezmoi/package.nix
@@ -7,16 +7,16 @@
 
 buildGo125Module (finalAttrs: {
   pname = "chezmoi";
-  version = "2.66.0";
+  version = "2.66.1";
 
   src = fetchFromGitHub {
     owner = "twpayne";
     repo = "chezmoi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-r49KRq6PIB6gRnudY9HMm0UBjd07J6tUpA3oTOyJzGI=";
+    hash = "sha256-DwMkfS+D9o10Dk3jEzgkDcSoblbpoimN6RPV2iZTLcg=";
   };
 
-  vendorHash = "sha256-ioRFzkp4aSUdPq3NSKDj05DbTp6PwAjVkf7VtdpaI2w=";
+  vendorHash = "sha256-g9bzsmLKJ7pCmTnO8N9Um1FDBvQA0mqw14fwGYMb/K0=";
 
   nativeBuildInputs = [
     installShellFiles

From 69376c9e2e6c328f721f3438010fb3bba4feb448 Mon Sep 17 00:00:00 2001
From: Krishnan Shankar <krishnans2006@gmail.com>
Date: Mon, 20 Oct 2025 18:50:36 -0500
Subject: [PATCH 1131/6226] maintainers: add krishnans2006

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8c699a0e7b3b..0014addf962a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13933,6 +13933,14 @@
     githubId = 4032;
     name = "Kristoffer Thømt Ravneberg";
   };
+  krishnans2006 = {
+    email = "krishnans2006@gmail.com";
+    matrix = "@krishnans2006:matrix.org";
+    github = "krishnans2006";
+    githubId = 62958782;
+    name = "Krishnan Shankar";
+    keys = [ { fingerprint = "A30C 1843 F470 4843 5D54  3D68 29CB 06A8 40D0 E14A"; } ];
+  };
   kristian-brucaj = {
     email = "kbrucaj@gmail.com";
     github = "Flameslice";

From 272b829900af477066d91b08a547f578161f36a1 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Mon, 20 Oct 2025 19:57:52 -0400
Subject: [PATCH 1132/6226] niimath: 1.9.20240905 -> 1.0.20250804

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

diff --git a/pkgs/by-name/ni/niimath/package.nix b/pkgs/by-name/ni/niimath/package.nix
index d30a2680f2ca..5a85e292c038 100644
--- a/pkgs/by-name/ni/niimath/package.nix
+++ b/pkgs/by-name/ni/niimath/package.nix
@@ -18,13 +18,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "niimath";
-  version = "1.0.20240905";
+  version = "1.0.20250804";
 
   src = fetchFromGitHub {
     owner = "rordenlab";
     repo = "niimath";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3XgB4q0HXLo9rEQBzC+2dxN81r9n8kkj2OC5d+WFmEs=";
+    hash = "sha256-lCs3yagFHQ9livH1ffwNhh7XCn4nEY48or6512yAl0k=";
   };
 
   postPatch = ''

From ef69a993d6eb393b3c9ff6540803d93fee0a8d36 Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Mon, 20 Oct 2025 17:25:12 +0900
Subject: [PATCH 1133/6226] zulip-term: 0.7.0 -> 0.7.0-unstable-2025-05-19

This fixes the build and brings in updates, since 0.7.0 released in
2022.
---
 pkgs/by-name/zu/zulip-term/package.nix | 27 +++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/zu/zulip-term/package.nix b/pkgs/by-name/zu/zulip-term/package.nix
index ee4103805ed4..91dd61297ad7 100644
--- a/pkgs/by-name/zu/zulip-term/package.nix
+++ b/pkgs/by-name/zu/zulip-term/package.nix
@@ -29,25 +29,35 @@ with py.pkgs;
 
 buildPythonApplication rec {
   pname = "zulip-term";
-  version = "0.7.0";
+  version = "0.7.0-unstable-2025-05-19";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zulip";
     repo = "zulip-terminal";
-    rev = "refs/tags/${version}";
-    hash = "sha256-ZouUU4p1FSGMxPuzDo5P971R+rDXpBdJn2MqvkJO+Fw=";
+    rev = "8e5c0357c8746df64ac427d5db3d2cb0f002f975";
+    hash = "sha256-DW3GZ1hY/wZ6P/djPUlAvNIFcBV994FLJ3aiPfDVUBM=";
   };
 
   patches = [
     ./pytest-executable-name.patch
   ];
 
-  nativeBuildInputs = with py.pkgs; [
+  build-system = with py.pkgs; [
     setuptools
   ];
 
-  propagatedBuildInputs = with py.pkgs; [
+  pythonRelaxDeps = [
+    # zulip-term sets these versions for compat with python 3.6/3.7
+    "lxml"
+    "pygments"
+    "typing_extensions"
+    "tzlocal"
+    "urwid_readline"
+    "zulip"
+  ];
+
+  dependencies = with py.pkgs; [
     beautifulsoup4
     lxml
     pygments
@@ -70,6 +80,13 @@ buildPythonApplication rec {
     pytest-mock
   ]);
 
+  disabledTests = [
+    # these break the build but don't seem to affect
+    # the application at all
+    "test_soup2markup"
+    "test_main_help"
+  ];
+
   makeWrapperArgs = [
     "--prefix"
     "PATH"

From c3378bdd05c3eaa617531b85666d9049c7004452 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cl=C3=A9ment?= <git@drawbu.dev>
Date: Sat, 18 Oct 2025 14:58:32 -0700
Subject: [PATCH 1134/6226] python3Package.duckduckgo-search: drop

This package is now a duplicate of ddgs. It had been kept for retro
compatiblity reasons, but has since been updated by mistake in a large
PR, #431074.
---
 doc/release-notes/rl-2511.section.md | 4 ++++
 pkgs/top-level/python-aliases.nix    | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 6645bbde5508..b24640c9e0a1 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -240,6 +240,10 @@
 
 - `mariadb` now defaults to `mariadb_114` instead of `mariadb_1011`, meaning the default version was upgraded from 10.11.x to 11.4.x. See the [upgrade notes](https://mariadb.com/kb/en/upgrading-from-mariadb-10-11-to-mariadb-11-4/) for potential issues.
 
+- `python3Packages.duckduckgo-search` has been updated to v9+ and therefore has been renamed to ddgs.
+  Use `python3Packages.ddgs` instead.
+  See [release note for v9.0.0](https://github.com/deedy5/ddgs/releases/tag/v9.0.0)
+
 ## Other Notable Changes {#sec-nixpkgs-release-25.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index dab8b23d37f1..fb2349387f69 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -238,7 +238,7 @@ mapAliases {
   doctest-ignore-unicode = throw "doctest-ignore-unicode has been removed since it has been unmaintained for 11 years"; # added 2024-05-20
   dogpile_cache = dogpile-cache; # added 2021-10-28
   dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20
-  duckduckgo-search = ddgs; # added 2025-10-20
+  duckduckgo-search = throw "duckduckgo-search was renamed to ddgs, use ddgs instead"; # added 2025-10-20
   dugong = throw "dugong is unmaintained since 2022 and has therefore been removed"; # added 2024-12-12
   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
   easyeda2ato = throw "easyeda2ato as been removed in favor of atopile-easyda2kicad"; # added 2025-06-08

From 57ad7791324e815ed96cdf8040be6a6bd469b9a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 00:26:19 +0000
Subject: [PATCH 1135/6226] lcrq: 0.2.4 -> 0.3.0

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

diff --git a/pkgs/by-name/lc/lcrq/package.nix b/pkgs/by-name/lc/lcrq/package.nix
index 5ea054541afd..521b713cee47 100644
--- a/pkgs/by-name/lc/lcrq/package.nix
+++ b/pkgs/by-name/lc/lcrq/package.nix
@@ -5,14 +5,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "lcrq";
-  version = "0.2.4";
+  version = "0.3.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "librecast";
     repo = "lcrq";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Vij0aV4BIVrpRSzVneyP7MjlsdJSz1mbMCShEOOYVbQ=";
+    hash = "sha256-l8/mgcckc90FjcbAjGGUnXAN/GyOTQjjGvsA++VSen4=";
   };
 
   installFlags = [ "PREFIX=$(out)" ];

From 23d610edfeb7eb69e36af8a799e159d2430f5a83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 00:30:30 +0000
Subject: [PATCH 1136/6226] mpd: 0.24.5 -> 0.24.6

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

diff --git a/pkgs/by-name/mp/mpd/package.nix b/pkgs/by-name/mp/mpd/package.nix
index 7a152517ff9b..3bcc8851ae0a 100644
--- a/pkgs/by-name/mp/mpd/package.nix
+++ b/pkgs/by-name/mp/mpd/package.nix
@@ -197,13 +197,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "mpd";
-  version = "0.24.5";
+  version = "0.24.6";
 
   src = fetchFromGitHub {
     owner = "MusicPlayerDaemon";
     repo = "MPD";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-MgepOQeOl+n65+7b8zXe2u0fCHFAviSqL1aNu2iSXiM=";
+    sha256 = "sha256-KAyTDfe3bEFWwImNaTOgq0jAs49kH8H+8ZJPQipN4QA=";
   };
 
   buildInputs = [

From 809190698702a9bb32d12ca07f863c446ee76354 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 00:30:41 +0000
Subject: [PATCH 1137/6226] python3Packages.mcstatus: 12.0.5 -> 12.0.6

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

diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix
index 28c03cb655f2..40f7d8e83db9 100644
--- a/pkgs/development/python-modules/mcstatus/default.nix
+++ b/pkgs/development/python-modules/mcstatus/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "mcstatus";
-  version = "12.0.5";
+  version = "12.0.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "py-mine";
     repo = "mcstatus";
     tag = "v${version}";
-    hash = "sha256-gtLWUIxG40MsmavA4KrHJ3btCR/zKdstwiUiZGsoNcw=";
+    hash = "sha256-lo96dZ7YaqZz/fmhuo8XWm5tSsB6ixtdxkZ3Hd6mq78=";
   };
 
   build-system = [

From 25b5f3a546d18dd3b2246a6abae997c074820b35 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Mon, 20 Oct 2025 22:07:46 +0100
Subject: [PATCH 1138/6226] qview: migrate to qt6 and add HEIF support

- `qview` has supported Qt6 since version 5.0; this commit migrates
  fully to it.

- Qt6 enables the use of `kdePackages.kimageformats`, which provides
  support for 'HEIF' among other image formats.
---
 pkgs/by-name/qv/qview/package.nix | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/qv/qview/package.nix b/pkgs/by-name/qv/qview/package.nix
index d3c1fcea9d0d..3a91d9093a43 100644
--- a/pkgs/by-name/qv/qview/package.nix
+++ b/pkgs/by-name/qv/qview/package.nix
@@ -2,7 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  libsForQt5,
+  qt6,
+  kdePackages,
   x11Support ? true,
 }:
 
@@ -17,20 +18,24 @@ stdenv.mkDerivation rec {
     hash = "sha256-EcXhwJcgBLdXa/FQ5LuENlzwnLw4Gt2BGlBO1p5U8tI=";
   };
 
-  qmakeFlags = lib.optionals (!x11Support) [ "CONFIG+=NO_X11" ];
-
   nativeBuildInputs = [
-    libsForQt5.qmake
-    libsForQt5.wrapQtAppsHook
+    qt6.qmake
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
-    libsForQt5.qtbase
-    libsForQt5.qttools
-    libsForQt5.qtimageformats
-    libsForQt5.qtsvg
+    qt6.qtbase
+    qt6.qttools
+    qt6.qtimageformats
+    qt6.qtsvg
+    kdePackages.kimageformats
+  ];
+
+  qmakeFlags = [
+    # See https://github.com/NixOS/nixpkgs/issues/214765
+    "QT_TOOL.lrelease.binary=${lib.getDev qt6.qttools}/bin/lrelease"
   ]
-  ++ lib.optionals x11Support [ libsForQt5.qtx11extras ];
+  ++ lib.optionals (!x11Support) [ "CONFIG+=NO_X11" ];
 
   meta = with lib; {
     description = "Practical and minimal image viewer";

From b514a9ce3e45ea4b8ebb313821a10e3a4614013f Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Mon, 20 Oct 2025 23:02:20 +0100
Subject: [PATCH 1139/6226] qview: modernize

---
 pkgs/by-name/qv/qview/package.nix | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/qv/qview/package.nix b/pkgs/by-name/qv/qview/package.nix
index 3a91d9093a43..58b7f1c92e74 100644
--- a/pkgs/by-name/qv/qview/package.nix
+++ b/pkgs/by-name/qv/qview/package.nix
@@ -3,18 +3,19 @@
   stdenv,
   fetchFromGitHub,
   qt6,
+  nix-update-script,
   kdePackages,
   x11Support ? true,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qview";
   version = "7.1";
 
   src = fetchFromGitHub {
     owner = "jurplel";
     repo = "qView";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-EcXhwJcgBLdXa/FQ5LuENlzwnLw4Gt2BGlBO1p5U8tI=";
   };
 
@@ -37,12 +38,15 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals (!x11Support) [ "CONFIG+=NO_X11" ];
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "Practical and minimal image viewer";
     mainProgram = "qview";
+    changelog = "https://github.com/jurplel/qView/releases/tag/${finalAttrs.version}";
     homepage = "https://interversehq.com/qview/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ acowley ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ acowley ];
+    platforms = lib.platforms.all;
   };
-}
+})

From 96f5aa42d42c57e1122e67fa08dcf0dfacfbc5c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 00:39:05 +0000
Subject: [PATCH 1140/6226] myks: 4.11.4 -> 5.0.0

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

diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix
index bbd822c31a56..3b2c2fedb72a 100644
--- a/pkgs/by-name/my/myks/package.nix
+++ b/pkgs/by-name/my/myks/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "myks";
-  version = "4.11.4";
+  version = "5.0.0";
 
   src = fetchFromGitHub {
     owner = "mykso";
     repo = "myks";
     tag = "v${version}";
-    hash = "sha256-1tJPYLo14LPwd7mtNTvr6YMGz0s+K6aN9Hung/N9lrM=";
+    hash = "sha256-W1k65a67/77f8NBGOzHV4eVzoICnynxNeIYAefq+Fzo=";
   };
 
-  vendorHash = "sha256-k/EeQdThF8pgeY9RI012kjlEZkVVcnanL6L8UBrQTUI=";
+  vendorHash = "sha256-+YMR9Y5iSkpcHEg1IlSN3kB3fZAx5WNcOU71LXHhVV0=";
 
   subPackages = ".";
 

From 7d384c6da4d04477f18e5d41db41af5316505b8a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 01:07:59 +0000
Subject: [PATCH 1141/6226] kew: 3.5.3 -> 3.6.4

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

diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix
index 8dc3fe52ff43..418e999bcbc6 100644
--- a/pkgs/by-name/ke/kew/package.nix
+++ b/pkgs/by-name/ke/kew/package.nix
@@ -33,13 +33,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kew";
-  version = "3.5.3";
+  version = "3.6.4";
 
   src = fetchFromGitHub {
     owner = "ravachol";
     repo = "kew";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7bO9IvSTJJKiNYQzcTSI2Ugjhw1ibbyE5/fe6EDYqvI=";
+    hash = "sha256-PhNBAy+XS1wpU91GNoRc4jume9razD03xmmUER0p8I0=";
   };
 
   postPatch = ''

From 01d5b19de5bc8e5250da5eb461fbdd6412939b57 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 01:08:04 +0000
Subject: [PATCH 1142/6226] python3Packages.google-cloud-vpc-access: 1.13.2 ->
 1.14.0

---
 .../python-modules/google-cloud-vpc-access/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix
index 30e901e3cbc7..2260651c7595 100644
--- a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix
+++ b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-vpc-access";
-  version = "1.13.2";
+  version = "1.14.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_vpc_access";
     inherit version;
-    hash = "sha256-bfTho0kyaAQRWjAZJWFd/NFJ+EY7ZEtdOGcbb3MnJ6s=";
+    hash = "sha256-N1CpDs/TgSCjJOnNwOJCaS7MWur95uoztvl+R5DjYC0=";
   };
 
   build-system = [ setuptools ];

From b044ad6e5e92e70d7a7723864b0ab7a6c25bafda Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sun, 19 Oct 2025 17:47:01 -0400
Subject: [PATCH 1143/6226] elixir: simplifiy generic builder and overriding

---
 pkgs/development/beam-modules/default.nix     | 10 ++--
 pkgs/development/beam-modules/lib.nix         | 44 ---------------
 pkgs/development/interpreters/elixir/1.15.nix |  6 +-
 pkgs/development/interpreters/elixir/1.16.nix |  6 +-
 pkgs/development/interpreters/elixir/1.17.nix |  6 +-
 pkgs/development/interpreters/elixir/1.18.nix |  6 +-
 pkgs/development/interpreters/elixir/1.19.nix |  6 +-
 .../interpreters/elixir/generic-builder.nix   | 55 +++++++++----------
 8 files changed, 40 insertions(+), 99 deletions(-)

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 34a18b07231e..f5185bc61786 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -51,27 +51,27 @@ let
       # BEAM-based languages.
       elixir = elixir_1_18;
 
-      elixir_1_19 = lib'.callElixir ../interpreters/elixir/1.19.nix {
+      elixir_1_19 = callPackage ../interpreters/elixir/1.19.nix {
         inherit erlang;
         debugInfo = true;
       };
 
-      elixir_1_18 = lib'.callElixir ../interpreters/elixir/1.18.nix {
+      elixir_1_18 = callPackage ../interpreters/elixir/1.18.nix {
         inherit erlang;
         debugInfo = true;
       };
 
-      elixir_1_17 = lib'.callElixir ../interpreters/elixir/1.17.nix {
+      elixir_1_17 = callPackage ../interpreters/elixir/1.17.nix {
         inherit erlang;
         debugInfo = true;
       };
 
-      elixir_1_16 = lib'.callElixir ../interpreters/elixir/1.16.nix {
+      elixir_1_16 = callPackage ../interpreters/elixir/1.16.nix {
         inherit erlang;
         debugInfo = true;
       };
 
-      elixir_1_15 = lib'.callElixir ../interpreters/elixir/1.15.nix {
+      elixir_1_15 = callPackage ../interpreters/elixir/1.15.nix {
         inherit erlang;
         debugInfo = true;
       };
diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix
index 368e6163daa9..be16654c2d1f 100644
--- a/pkgs/development/beam-modules/lib.nix
+++ b/pkgs/development/beam-modules/lib.nix
@@ -38,48 +38,4 @@ rec {
         versionArgs: import ../../development/interpreters/erlang/generic-builder.nix (versionArgs // args);
     in
     pkgs.callPackage (import drv genericBuilder) { };
-
-  /*
-    Uses generic-builder to evaluate provided drv containing Elixir version
-    specific data.
-
-    drv: file containing version-specific args;
-    genericBuilder: generic builder for all Erlang versions;
-    args: arguments merged into version-specific args, used mostly to customize
-          high level options;
-
-    Arguments passed to the generic-builder are overridable.
-  */
-  callElixir =
-    drv: args:
-    let
-      builder = callPackage ../interpreters/elixir/generic-builder.nix args;
-    in
-    callPackage drv {
-      mkDerivation = pkgs.makeOverridable builder;
-    };
-
-  /*
-    Uses generic-builder to evaluate provided drv containing Elixir version
-    specific data.
-
-    drv: package containing version-specific args;
-    builder: generic builder for all Erlang versions;
-    args: arguments merged into version-specific args, used mostly to customize
-          dependencies;
-
-    Arguments passed to the generic-builder are overridable.
-
-    Please note that "mkDerivation" defined here is the one called from 1.2.nix
-    and similar files.
-  */
-  callLFE =
-    drv: args:
-    let
-      builder = callPackage ../interpreters/lfe/generic-builder.nix args;
-    in
-    callPackage drv {
-      mkDerivation = pkgs.makeOverridable builder;
-    };
-
 }
diff --git a/pkgs/development/interpreters/elixir/1.15.nix b/pkgs/development/interpreters/elixir/1.15.nix
index 4ed8e67bb8e4..ca38b3b9a2a4 100644
--- a/pkgs/development/interpreters/elixir/1.15.nix
+++ b/pkgs/development/interpreters/elixir/1.15.nix
@@ -1,9 +1,7 @@
-{ mkDerivation }:
-mkDerivation {
+import ./generic-builder.nix {
   version = "1.15.7";
-  sha256 = "sha256-6GfZycylh+sHIuiQk/GQr1pRQRY1uBycSQdsVJ0J13k=";
+  hash = "sha256-6GfZycylh+sHIuiQk/GQr1pRQRY1uBycSQdsVJ0J13k=";
   # https://hexdocs.pm/elixir/1.15.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
   minimumOTPVersion = "24";
   maximumOTPVersion = "26";
-  escriptPath = "lib/elixir/scripts/generate_app.escript";
 }
diff --git a/pkgs/development/interpreters/elixir/1.16.nix b/pkgs/development/interpreters/elixir/1.16.nix
index 1fdb4094494e..5845ff8bbb52 100644
--- a/pkgs/development/interpreters/elixir/1.16.nix
+++ b/pkgs/development/interpreters/elixir/1.16.nix
@@ -1,9 +1,7 @@
-{ mkDerivation }:
-mkDerivation {
+import ./generic-builder.nix {
   version = "1.16.3";
-  sha256 = "sha256-WUBqoz3aQvBlSG3pTxGBpWySY7I0NUcDajQBgq5xYTU=";
+  hash = "sha256-WUBqoz3aQvBlSG3pTxGBpWySY7I0NUcDajQBgq5xYTU=";
   # https://hexdocs.pm/elixir/1.16.0/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
   minimumOTPVersion = "24";
   maximumOTPVersion = "26";
-  escriptPath = "lib/elixir/scripts/generate_app.escript";
 }
diff --git a/pkgs/development/interpreters/elixir/1.17.nix b/pkgs/development/interpreters/elixir/1.17.nix
index 32d6654e11d5..1f0e05b6f016 100644
--- a/pkgs/development/interpreters/elixir/1.17.nix
+++ b/pkgs/development/interpreters/elixir/1.17.nix
@@ -1,9 +1,7 @@
-{ mkDerivation }:
-mkDerivation {
+import ./generic-builder.nix {
   version = "1.17.3";
-  sha256 = "sha256-7Qo6y0KAQ9lwD4oH+7wQ4W5i6INHIBDN9IQAAsYzNJw=";
+  hash = "sha256-7Qo6y0KAQ9lwD4oH+7wQ4W5i6INHIBDN9IQAAsYzNJw=";
   # https://hexdocs.pm/elixir/1.17.3/compatibility-and-deprecations.html#compatibility-between-elixir-and-erlang-otp
   minimumOTPVersion = "25";
   maximumOTPVersion = "27";
-  escriptPath = "lib/elixir/scripts/generate_app.escript";
 }
diff --git a/pkgs/development/interpreters/elixir/1.18.nix b/pkgs/development/interpreters/elixir/1.18.nix
index 8e4269c4d7a1..20779a12fcdd 100644
--- a/pkgs/development/interpreters/elixir/1.18.nix
+++ b/pkgs/development/interpreters/elixir/1.18.nix
@@ -1,8 +1,6 @@
-{ mkDerivation }:
-mkDerivation {
+import ./generic-builder.nix {
   version = "1.18.4";
-  sha256 = "sha256-PwogI+HfRXy5M7Xn/KyDjm5vUquTBoGxliSV0A2AwSA=";
+  hash = "sha256-PwogI+HfRXy5M7Xn/KyDjm5vUquTBoGxliSV0A2AwSA=";
   # https://hexdocs.pm/elixir/1.18.0/compatibility-and-deprecations.html#between-elixir-and-erlang-otp
   minimumOTPVersion = "25";
-  escriptPath = "lib/elixir/scripts/generate_app.escript";
 }
diff --git a/pkgs/development/interpreters/elixir/1.19.nix b/pkgs/development/interpreters/elixir/1.19.nix
index 20676fe8be79..125028eef3a4 100644
--- a/pkgs/development/interpreters/elixir/1.19.nix
+++ b/pkgs/development/interpreters/elixir/1.19.nix
@@ -1,9 +1,7 @@
-{ mkDerivation }:
-mkDerivation {
+import ./generic-builder.nix {
   version = "1.19.1";
-  sha256 = "sha256-0rJx1BoJGDS0FsXyngBfQL3LhhNZvwh+TLQZjqOPFQw=";
+  hash = "sha256-0rJx1BoJGDS0FsXyngBfQL3LhhNZvwh+TLQZjqOPFQw=";
   # https://hexdocs.pm/elixir/1.19.0-rc.1/compatibility-and-deprecations.html#between-elixir-and-erlang-otp
   minimumOTPVersion = "26";
   maximumOTPVersion = "28";
-  escriptPath = "lib/elixir/scripts/generate_app.escript";
 }
diff --git a/pkgs/development/interpreters/elixir/generic-builder.nix b/pkgs/development/interpreters/elixir/generic-builder.nix
index 82a53c2509e8..5b7da9856fe1 100644
--- a/pkgs/development/interpreters/elixir/generic-builder.nix
+++ b/pkgs/development/interpreters/elixir/generic-builder.nix
@@ -1,32 +1,22 @@
 {
-  config,
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  erlang,
-  makeWrapper,
-  nix-update-script,
-  coreutils,
-  curl,
-  bash,
-  debugInfo ? false,
-}@inputs:
-
-{
-  baseName ? "elixir",
   version,
-  erlang ? inputs.erlang,
+  hash,
   minimumOTPVersion,
   maximumOTPVersion ? null,
-  sha256 ? null,
-  rev ? "v${version}",
-  src ? fetchFromGitHub {
-    inherit rev sha256;
-    owner = "elixir-lang";
-    repo = "elixir";
-  },
-  escriptPath ? "lib/elixir/generate_app.escript",
-}@args:
+}:
+{
+  bash,
+  config,
+  coreutils,
+  curl,
+  debugInfo ? false,
+  erlang,
+  fetchFromGitHub,
+  lib,
+  makeWrapper,
+  nix-update-script,
+  stdenv,
+}:
 
 let
   inherit (lib)
@@ -79,9 +69,16 @@ if !config.allowAliases && !bothAssert then
 else
   assert assertMsg bothAssert compatibilityMsg;
   stdenv.mkDerivation {
-    pname = "${baseName}";
+    pname = "elixir";
 
-    inherit src version debugInfo;
+    src = fetchFromGitHub {
+      owner = "elixir-lang";
+      repo = "elixir";
+      rev = "v${version}";
+      inherit hash;
+    };
+
+    inherit version debugInfo;
 
     nativeBuildInputs = [ makeWrapper ];
     buildInputs = [ erlang ];
@@ -95,7 +92,7 @@ else
     };
 
     preBuild = ''
-      patchShebangs ${escriptPath} || true
+      patchShebangs lib/elixir/scripts/generate_app.escript || true
     '';
 
     # copy stdlib source files for LSP access
@@ -136,8 +133,6 @@ else
       ];
     };
 
-    pos = builtins.unsafeGetAttrPos "sha256" args;
-
     meta = {
       homepage = "https://elixir-lang.org/";
       description = "Functional, meta-programming aware language built on top of the Erlang VM";

From a6139c3df927ae8c7c31892c1c0067f0aef7c804 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sun, 19 Oct 2025 18:29:26 -0400
Subject: [PATCH 1144/6226] erlang: drop extra lib

---
 pkgs/development/beam-modules/default.nix |  2 --
 pkgs/development/beam-modules/lib.nix     | 41 -----------------------
 pkgs/top-level/beam-packages.nix          | 17 +++++++---
 3 files changed, 12 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/development/beam-modules/lib.nix

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index f5185bc61786..15ddc31e9347 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -8,8 +8,6 @@ let
   pkgs = __splicedPackages;
   inherit (lib) makeExtensible;
 
-  lib' = pkgs.callPackage ./lib.nix { };
-
   # FIXME: add support for overrideScope
   callPackageWithScope =
     scope: drv: args:
diff --git a/pkgs/development/beam-modules/lib.nix b/pkgs/development/beam-modules/lib.nix
deleted file mode 100644
index be16654c2d1f..000000000000
--- a/pkgs/development/beam-modules/lib.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{ __splicedPackages, lib }:
-
-let
-  pkgs = __splicedPackages;
-in
-rec {
-
-  # Similar to callPackageWith/callPackage, but without makeOverridable
-  callPackageWith =
-    autoArgs: fn: args:
-    let
-      f = if pkgs.lib.isFunction fn then fn else import fn;
-      auto = builtins.intersectAttrs (lib.functionArgs f) autoArgs;
-    in
-    f (auto // args);
-
-  callPackage = callPackageWith pkgs;
-
-  /*
-    Uses generic-builder to evaluate provided drv containing OTP-version
-    specific data.
-
-    drv: package containing version-specific args;
-    builder: generic builder for all Erlang versions;
-    args: arguments merged into version-specific args, used mostly to customize
-          dependencies;
-
-    Arguments passed to the generic-builder are overridable, used to
-    enable/disable high-level OTP features, like ODBC or WX support;
-
-    Please note that "mkDerivation" defined here is the one called from R16.nix
-    and similar files.
-  */
-  callErlang =
-    drv: args:
-    let
-      genericBuilder =
-        versionArgs: import ../../development/interpreters/erlang/generic-builder.nix (versionArgs // args);
-    in
-    pkgs.callPackage (import drv genericBuilder) { };
-}
diff --git a/pkgs/top-level/beam-packages.nix b/pkgs/top-level/beam-packages.nix
index c46d12eca8eb..fecf5d78208b 100644
--- a/pkgs/top-level/beam-packages.nix
+++ b/pkgs/top-level/beam-packages.nix
@@ -6,16 +6,23 @@
   wxSupport ? true,
   systemd,
   systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd,
+  __splicedPackages,
 }:
 
 let
   self = beam;
 
+  pkgs = __splicedPackages;
+  callErlang =
+    drv: args:
+    let
+      genericBuilder =
+        versionArgs: import ../development/interpreters/erlang/generic-builder.nix (versionArgs // args);
+    in
+    pkgs.callPackage (import drv genericBuilder) { };
 in
 
 {
-  beamLib = callPackage ../development/beam-modules/lib.nix { };
-
   latestVersion = "erlang_28";
 
   # Each
@@ -27,15 +34,15 @@ in
     #
     # Three versions are supported according to https://github.com/erlang/otp/security
 
-    erlang_28 = self.beamLib.callErlang ../development/interpreters/erlang/28.nix {
+    erlang_28 = callErlang ../development/interpreters/erlang/28.nix {
       inherit wxSupport systemdSupport;
     };
 
-    erlang_27 = self.beamLib.callErlang ../development/interpreters/erlang/27.nix {
+    erlang_27 = callErlang ../development/interpreters/erlang/27.nix {
       inherit wxSupport systemdSupport;
     };
 
-    erlang_26 = self.beamLib.callErlang ../development/interpreters/erlang/26.nix {
+    erlang_26 = callErlang ../development/interpreters/erlang/26.nix {
       inherit wxSupport systemdSupport;
     };
 

From 475951d1f36f454db6770929039ec09eb483913b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 01:10:32 +0000
Subject: [PATCH 1145/6226] python3Packages.mailchecker: 6.0.18 -> 6.0.19

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

diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix
index 0b14e1b6686c..247de221f576 100644
--- a/pkgs/development/python-modules/mailchecker/default.nix
+++ b/pkgs/development/python-modules/mailchecker/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "mailchecker";
-  version = "6.0.18";
+  version = "6.0.19";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-xX6Vr7hEi4o1OQjKUUrVEKZIOppbA+4hlN1XrV1vEnk=";
+    hash = "sha256-MuLQdGiFZbhd/1Zc+VnTo3UW3EAyISzz/c1F3D0F2UE=";
   };
 
   build-system = [ setuptools ];

From f0553e3f118ebb8cec9cf906c9d234218b9c3181 Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Tue, 21 Oct 2025 10:11:24 +0900
Subject: [PATCH 1146/6226] lenmus: fix build issue due to cmake 4

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

diff --git a/pkgs/by-name/le/lenmus/package.nix b/pkgs/by-name/le/lenmus/package.nix
index 5f32b2f0bc2f..3854ac3ef3b8 100644
--- a/pkgs/by-name/le/lenmus/package.nix
+++ b/pkgs/by-name/le/lenmus/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchFromGitHub,
   cmake,
   pkg-config,
@@ -31,6 +32,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-qegOAc6vs2+6VViDHVjv0q+qjLZyTT7yPF3hFpTt5zE=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "bump-cmake-minimum-required-version.patch";
+      url = "https://github.com/lenmus/lenmus/commit/cc250ca4ce9a90d8dddb0fc359c5a80609cdafcb.patch";
+      hash = "sha256-aP+ooaSi6vHk+g1XftfjZ39zAgYts1vOCqZWWZhJ+G8=";
+    })
+  ];
+
   env = {
     NIX_CFLAGS_COMPILE = "-fpermissive";
   };

From 92597b5a5b9d4f310386bcb2af2fd6a68625df75 Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Mon, 20 Oct 2025 20:22:46 -0500
Subject: [PATCH 1147/6226] nzbget: 25.3 -> 25.4

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

diff --git a/pkgs/by-name/nz/nzbget/package.nix b/pkgs/by-name/nz/nzbget/package.nix
index fc14d4964e83..04bc4baddadc 100644
--- a/pkgs/by-name/nz/nzbget/package.nix
+++ b/pkgs/by-name/nz/nzbget/package.nix
@@ -28,13 +28,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "nzbget";
-  version = "25.3";
+  version = "25.4";
 
   src = fetchFromGitHub {
     owner = "nzbgetcom";
     repo = "nzbget";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ecTz+axqPOlRe0wi7IRiESn2JjLbalI+sQVKqrvrAoU=";
+    hash = "sha256-BP2kNgEDLVpW4TvUW2dToa3rnvGANZw2alBO75Jd2hs=";
   };
 
   patches = [

From f7976ba86c0d406fde48ac3e1f4a716cb21fb9cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 01:23:05 +0000
Subject: [PATCH 1148/6226] json-repair: 0.52.0 -> 0.52.2

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

diff --git a/pkgs/development/python-modules/json-repair/default.nix b/pkgs/development/python-modules/json-repair/default.nix
index 12b1034446a8..4ad9515baf2b 100644
--- a/pkgs/development/python-modules/json-repair/default.nix
+++ b/pkgs/development/python-modules/json-repair/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "json-repair";
-  version = "0.52.0";
+  version = "0.52.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mangiucugna";
     repo = "json_repair";
     tag = "v${version}";
-    hash = "sha256-RK5VycwcI6EhFkejbSwr96iF12O22nIGQzbOIlo/Mhk=";
+    hash = "sha256-NYW2PJ329c8EYfQrRl1mi+leUR7Afz2J0N9HVD1xyT0=";
   };
 
   build-system = [ setuptools ];

From 188349eb7c5c42ece4955f6e7fcda6c2bc296536 Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Tue, 21 Oct 2025 10:22:47 +0900
Subject: [PATCH 1149/6226] lib60870: fix build issue related to cmake 4

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

diff --git a/pkgs/by-name/li/lib60870/package.nix b/pkgs/by-name/li/lib60870/package.nix
index 8a39f3d5d5e0..3887f73d2329 100644
--- a/pkgs/by-name/li/lib60870/package.nix
+++ b/pkgs/by-name/li/lib60870/package.nix
@@ -20,8 +20,13 @@ stdenv.mkDerivation (finalAttrs: {
 
   sourceRoot = "${finalAttrs.src.name}/lib60870-C";
 
-  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace src/CMakeLists.txt --replace-warn "-lrt" ""
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace src/CMakeLists.txt \
+      --replace-warn "-lrt" "" \
   '';
 
   separateDebugInfo = true;

From 4753633d40a8d63c176d8282e54b91d02390872c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 01:25:24 +0000
Subject: [PATCH 1150/6226] juju: 3.6.10 -> 3.6.11

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

diff --git a/pkgs/by-name/ju/juju/package.nix b/pkgs/by-name/ju/juju/package.nix
index 255326722325..5992cf64e4b7 100644
--- a/pkgs/by-name/ju/juju/package.nix
+++ b/pkgs/by-name/ju/juju/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "juju";
-  version = "3.6.10";
+  version = "3.6.11";
 
   src = fetchFromGitHub {
     owner = "juju";
     repo = "juju";
     rev = "v${version}";
-    hash = "sha256-J3AFH6kg+M6/8posiUaVP4biQpKPQ07Qp5BU3prAG/A=";
+    hash = "sha256-jeRA2HwXJt1FLQrUsE/OrpeRib5VRbNk84FTHCBeHiM=";
   };
 
-  vendorHash = "sha256-zTavqjEH4maEMj+AuYMcjT289peVNIc0rysBnnMxFNU=";
+  vendorHash = "sha256-pa6NOoC4OakJdKB2cWtQVoEt2UX/xv8mDOHmlDSk8Z8=";
 
   subPackages = [
     "cmd/juju"

From d7b4f13e14017c19da56a8af17323209b7c890da Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Mon, 20 Oct 2025 22:58:44 +0900
Subject: [PATCH 1151/6226] tiscamera: fix build issue due to cmake 4

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

diff --git a/pkgs/by-name/ti/tiscamera/package.nix b/pkgs/by-name/ti/tiscamera/package.nix
index 07f3d5cc9e5d..c6703b03e00b 100644
--- a/pkgs/by-name/ti/tiscamera/package.nix
+++ b/pkgs/by-name/ti/tiscamera/package.nix
@@ -109,6 +109,7 @@ stdenv.mkDerivation rec {
     "-DTCAM_INTERNAL_ARAVIS=OFF"
     "-DTCAM_ARAVIS_USB_VISION=${if withAravis && withAravisUsbVision then "ON" else "OFF"}"
     "-DTCAM_INSTALL_FORCE_PREFIX=ON"
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.10"
   ];
 
   env.CXXFLAGS = "-include cstdint";

From 186b20527969e823b899d3e1e68d6c1cc4184e8d Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Tue, 21 Oct 2025 10:33:05 +0900
Subject: [PATCH 1152/6226] libacars: fix build issue related to cmake 4

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

diff --git a/pkgs/by-name/li/libacars/package.nix b/pkgs/by-name/li/libacars/package.nix
index 0d2cd6b4bd03..adb346920174 100644
--- a/pkgs/by-name/li/libacars/package.nix
+++ b/pkgs/by-name/li/libacars/package.nix
@@ -15,9 +15,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-2n1tuKti8Zn5UzQHmRdvW5Q+x4CXS9QuPHFQ+DFriiE=";
   };
 
-  nativeBuildInputs = [
-    cmake
-  ];
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.1)" "cmake_minimum_required (VERSION 3.10)"
+  '';
+
+  nativeBuildInputs = [ cmake ];
 
   cmakeFlags = [
     "-DCMAKE_INSTALL_LIBDIR=lib"

From 6a3aed724f9947e4e7795cf8298427c3618df80a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 01:34:47 +0000
Subject: [PATCH 1153/6226] beszel: 0.13.2 -> 0.14.1

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

diff --git a/pkgs/by-name/be/beszel/package.nix b/pkgs/by-name/be/beszel/package.nix
index 79f012fdaea4..4301be555c87 100644
--- a/pkgs/by-name/be/beszel/package.nix
+++ b/pkgs/by-name/be/beszel/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule rec {
   pname = "beszel";
-  version = "0.13.2";
+  version = "0.14.1";
 
   src = fetchFromGitHub {
     owner = "henrygd";
     repo = "beszel";
     tag = "v${version}";
-    hash = "sha256-5akfgX3533NkeszP/by9ZfwTmMPdG5/JKFjswP1FRp8=";
+    hash = "sha256-IQ39OtYG2VDyHIPFRR0VNK56czGlJly66Bwb/NYIBxY=";
   };
 
   webui = buildNpmPackage {
@@ -47,7 +47,7 @@ buildGoModule rec {
 
     sourceRoot = "${src.name}/internal/site";
 
-    npmDepsHash = "sha256-7+3K8MhA+FXWRXQR5edUYbL/XcxPmUqWQPxl5k8u1xs=";
+    npmDepsHash = "sha256-Wtq/pesnovOyAnFta/wI+j8rml8XWORvOLz/Q82sy8g=";
   };
 
   vendorHash = "sha256-IfwgL4Ms5Uho1l0yGCyumbr1N/SN+j5HaFl4hACkTsQ=";

From c51652f6031b3e944f91411dab2339cddadb37b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 01:35:38 +0000
Subject: [PATCH 1154/6226] pixelflasher: 8.6.0.0 -> 8.9.0.1

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

diff --git a/pkgs/by-name/pi/pixelflasher/package.nix b/pkgs/by-name/pi/pixelflasher/package.nix
index 7c4e05444809..8f04e6dc0e2e 100644
--- a/pkgs/by-name/pi/pixelflasher/package.nix
+++ b/pkgs/by-name/pi/pixelflasher/package.nix
@@ -10,14 +10,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "pixelflasher";
-  version = "8.6.0.0";
+  version = "8.9.0.1";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "badabing2005";
     repo = "PixelFlasher";
     tag = "v${version}";
-    hash = "sha256-lCh4LmmFdX/CvJSYWso1c8cBklb+/qXsbUY3nrzKCYk=";
+    hash = "sha256-VDneBXHmU1yebDCUSFsuaRiPU8pE1MlfWIwvfBoI9wk=";
   };
 
   desktopItems = [

From 033dc8c664c8c22f624857dadbdb827b8129f9a7 Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Tue, 21 Oct 2025 10:38:58 +0900
Subject: [PATCH 1155/6226] libamqpcpp: fix build issue related to cmake 4

---
 pkgs/by-name/li/libamqpcpp/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libamqpcpp/package.nix b/pkgs/by-name/li/libamqpcpp/package.nix
index dfabbdb40c3a..6c6ceb5f4d54 100644
--- a/pkgs/by-name/li/libamqpcpp/package.nix
+++ b/pkgs/by-name/li/libamqpcpp/package.nix
@@ -17,6 +17,11 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-iaOXdDIJOBXHyjE07CvU4ApTh71lmtMCyU46AV+MGXQ=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.4 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10 FATAL_ERROR)"
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   buildInputs = [ openssl ];
@@ -24,7 +29,6 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [ ./libamqpcpp-darwin.patch ];
 
   enableParallelBuilding = true;
-  doCheck = true;
 
   meta = {
     description = "Library for communicating with a RabbitMQ server";

From e0ac4b99759ce87e7af0d42bbc49c778a0a91753 Mon Sep 17 00:00:00 2001
From: crertel <chris@kedagital.com>
Date: Wed, 15 Oct 2025 18:51:21 -0500
Subject: [PATCH 1156/6226] lmstudio: 0.3.28.2 -> 0.3.30.1

---
 pkgs/by-name/lm/lmstudio/package.nix | 8 ++++----
 pkgs/by-name/lm/lmstudio/update.sh   | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix
index 3f6eddb71be0..3b5bd0383065 100644
--- a/pkgs/by-name/lm/lmstudio/package.nix
+++ b/pkgs/by-name/lm/lmstudio/package.nix
@@ -7,10 +7,10 @@
 let
   pname = "lmstudio";
 
-  version_aarch64-darwin = "0.3.28-2";
-  hash_aarch64-darwin = "sha256-7sxhKZwZKzA2VUPHsChgysxXMB7SKEd9zK4kIPbWYjo=";
-  version_x86_64-linux = "0.3.28-2";
-  hash_x86_64-linux = "sha256-ewVjJ0Sy5Zwf9tvlfngQKnAfAv3BvPIAO+p1tJ3mO8M=";
+  version_aarch64-darwin = "0.3.30-2";
+  hash_aarch64-darwin = "sha256-49wubBIteg+gs9RQEozRiiFgWnVlHm1aOf7EqK1uvt4=";
+  version_x86_64-linux = "0.3.30-2";
+  hash_x86_64-linux = "sha256-v2m5/BoyGXRi09To9rHp79+t2QnT5U0XuL5WNpfWWRU=";
 
   meta = {
     description = "LM Studio is an easy to use desktop app for experimenting with local and open-source Large Language Models (LLMs)";
diff --git a/pkgs/by-name/lm/lmstudio/update.sh b/pkgs/by-name/lm/lmstudio/update.sh
index 415c2006e172..c884550ecae0 100755
--- a/pkgs/by-name/lm/lmstudio/update.sh
+++ b/pkgs/by-name/lm/lmstudio/update.sh
@@ -3,13 +3,14 @@
 
 set -euo pipefail
 
-packages="$(curl -s -L "https://lmstudio.ai/" | grep -oE 'https://installers.lmstudio.ai[^"\]*' | sort -u | grep -v \\.exe)"
 for system in "aarch64-darwin darwin/arm64" "x86_64-linux linux/x64"; do
   # shellcheck disable=SC2086
   set -- ${system} # split string into variables $1 and $2
 
   arch="${1}"
-  url=$(echo "${packages}" | grep "${2}")
+  platform="${2}"
+
+  url=$(curl -ILs -o /dev/null -w %{url_effective} "https://lmstudio.ai/download/latest/${platform}")
   version="$(echo "${url}" | cut -d/ -f6)"
   hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 "$(nix-prefetch-url "${url}")")
 

From 98ccd689bd83277461372aa85dea35fa6f63f18f Mon Sep 17 00:00:00 2001
From: botnk <github-botnk@korz.dev>
Date: Tue, 21 Oct 2025 01:43:44 +0000
Subject: [PATCH 1157/6226] zed-editor: 0.208.5 -> 0.208.6

Changelog: https://github.com/zed-industries/zed/releases/tag/v0.208.6
---
 pkgs/by-name/ze/zed-editor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index ffa93b6fe1c7..89eb02b392a5 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -101,7 +101,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.208.5";
+  version = "0.208.6";
 
   outputs = [
     "out"
@@ -114,7 +114,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6B0A6cMCTFGYRrAekTjHo667WcS9aTZbrjaGxKP6QfA=";
+    hash = "sha256-EzfeLSalC4pTtaiDWXYib5jDDKGVZ+PzFjgMjIGrUDg=";
   };
 
   postPatch = ''
@@ -134,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm -r $out/git/*/candle-book/
   '';
 
-  cargoHash = "sha256-wOhzHMh1nhWTpzzw7phOmhHMV4h7S+e+2SUkK4RK2b8=";
+  cargoHash = "sha256-PxreCKshDvzLQzPvNpGyNz3jOPIDiz7JHy/9nEujnKg=";
 
   nativeBuildInputs = [
     cmake

From e9268628ed381eba538858a6ecc66778ee78aa38 Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Tue, 21 Oct 2025 10:44:07 +0900
Subject: [PATCH 1158/6226] libbtbb: fix build issue related to cmake 4

---
 pkgs/by-name/li/libbtbb/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/libbtbb/package.nix b/pkgs/by-name/li/libbtbb/package.nix
index 2e9fbc46a460..00643a1cfda7 100644
--- a/pkgs/by-name/li/libbtbb/package.nix
+++ b/pkgs/by-name/li/libbtbb/package.nix
@@ -18,8 +18,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
-  # https://github.com/greatscottgadgets/libbtbb/issues/63
   postPatch = ''
+    # https://github.com/NixOS/nixpkgs/issues/445447
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+
+    # https://github.com/greatscottgadgets/libbtbb/issues/63
     substituteInPlace lib/libbtbb.pc.in \
       --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \
       --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@

From 8687602046b2b49da113998295184ce85fd94909 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 01:47:28 +0000
Subject: [PATCH 1159/6226] loco: 0.16.2 -> 0.16.3

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

diff --git a/pkgs/by-name/lo/loco/package.nix b/pkgs/by-name/lo/loco/package.nix
index 88dc7865dfbb..672730e845c0 100644
--- a/pkgs/by-name/lo/loco/package.nix
+++ b/pkgs/by-name/lo/loco/package.nix
@@ -6,14 +6,14 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "loco";
-  version = "0.16.2";
+  version = "0.16.3";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-yctOGUfKd1zaIArtHESYEr1q79ZrJqL7H6bvpAFrE+8=";
+    hash = "sha256-DdrLABMiTutIhUHvUw29DYZIT+YHLNJjoTT5kWMeAkU=";
   };
 
-  cargoHash = "sha256-IdYicJ7ZIoVOQU91S8yIPYGeY+DaeAMztGOmriTGW38=";
+  cargoHash = "sha256-01IQxfeOzxOHqRovmNV3q/ZSdESWi7Gb6F7o51Rbkw4=";
 
   #Skip trycmd integration tests
   checkFlags = [ "--skip=cli_tests" ];

From abe7ea46e4a793a2e43a908f7630ace7330c554a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 01:48:17 +0000
Subject: [PATCH 1160/6226] debian-devscripts: 2.25.19 -> 2.25.20

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

diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix
index f0c27ba249f0..15d694cd4442 100644
--- a/pkgs/by-name/de/debian-devscripts/package.nix
+++ b/pkgs/by-name/de/debian-devscripts/package.nix
@@ -30,14 +30,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "debian-devscripts";
-  version = "2.25.19";
+  version = "2.25.20";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "debian";
     repo = "devscripts";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xRWWdM2l1F1Z7U+ThxWvH5wL2ZY+sR8+Jx6h/7mo9dQ=";
+    hash = "sha256-TpS4Gb6HZfCO42PSMyQ6qC1uUYAGkC9r4DHz4tofYKw=";
   };
 
   patches = [

From 26aa06fad6311da23d26032ff93f1d89bca7c955 Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Tue, 21 Oct 2025 10:51:37 +0900
Subject: [PATCH 1161/6226] libcaption: 0.7 -> 0.8, fix cmake 4 build issue

---
 pkgs/by-name/li/libcaption/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libcaption/package.nix b/pkgs/by-name/li/libcaption/package.nix
index adcf4f7f22c2..27d788b00937 100644
--- a/pkgs/by-name/li/libcaption/package.nix
+++ b/pkgs/by-name/li/libcaption/package.nix
@@ -8,16 +8,21 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libcaption";
-  version = "0.7";
+  version = "0.8";
 
   src = fetchFromGitHub {
     owner = "szatmary";
     repo = "libcaption";
-    tag = finalAttrs.version;
-    hash = "sha256-OBtxoFJF0cxC+kfSK8TIKIdLkmCh5WOJlI0fejnisJo=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-9tszEKR30GHoGQ3DE9ejU3yOdtDiZwSZHiIJUPLgOdU=";
     fetchSubmodules = true;
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [ re2c ];
 

From 97aaac0bb197d8dbb41aa0f7f9563ce68e24c456 Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Tue, 21 Oct 2025 10:56:10 +0900
Subject: [PATCH 1162/6226] libclipboard: fix build issue with cmake 4

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

diff --git a/pkgs/by-name/li/libclipboard/package.nix b/pkgs/by-name/li/libclipboard/package.nix
index 122cbb651ab9..d2cad0072f8b 100644
--- a/pkgs/by-name/li/libclipboard/package.nix
+++ b/pkgs/by-name/li/libclipboard/package.nix
@@ -20,6 +20,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-553hNG8QUlt/Aff9EKYr6w279ELr+2MX7nh1SKIklhA=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   buildInputs = [
     libxcb
     libXau

From 1440d8f55f4380baeaa0cf4dfbb56321f797c186 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 01:59:25 +0000
Subject: [PATCH 1163/6226] jetty: 12.1.2 -> 12.1.3

---
 pkgs/servers/http/jetty/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix
index 69b76f17421b..a4f12d7b676b 100644
--- a/pkgs/servers/http/jetty/default.nix
+++ b/pkgs/servers/http/jetty/default.nix
@@ -57,7 +57,7 @@ in
   };
 
   jetty_12 = common {
-    version = "12.1.2";
-    hash = "sha256-GtaEIXqOSutgrSJJ/+oFuGSe7y8omVX7sBgcG3GJzvs=";
+    version = "12.1.3";
+    hash = "sha256-+DCfP0tFBouTZqOEzCFaQ4dl78xPFudUzS9hAzUkc7Y=";
   };
 }

From 012fbf5a34aa7ac1014a3c00d624a3b49ac8408a Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Tue, 21 Oct 2025 10:59:33 +0900
Subject: [PATCH 1164/6226] libcork: fix build issue with cmake 4

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

diff --git a/pkgs/by-name/li/libcork/package.nix b/pkgs/by-name/li/libcork/package.nix
index ffcf1683533b..d8261ba99721 100644
--- a/pkgs/by-name/li/libcork/package.nix
+++ b/pkgs/by-name/li/libcork/package.nix
@@ -31,6 +31,9 @@ stdenv.mkDerivation rec {
       --replace '\$'{exec_prefix}/'$'{CMAKE_INSTALL_LIBDIR} '$'{CMAKE_INSTALL_FULL_LIBDIR} \
       --replace '\$'{prefix}/'$'{CMAKE_INSTALL_INCLUDEDIR} '$'{CMAKE_INSTALL_FULL_INCLUDEDIR} \
       --replace '\$'{datarootdir}/'$'{base_docdir} '$'{CMAKE_INSTALL_FULL_DOCDIR}
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [

From 12509c3e736ffcb672ef39cbf0145f6b1bd16efe Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Tue, 21 Oct 2025 11:04:51 +0900
Subject: [PATCH 1165/6226] libcxxrt: fix build issue with cmake 4

---
 pkgs/development/libraries/libcxxrt/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/libcxxrt/default.nix b/pkgs/development/libraries/libcxxrt/default.nix
index e79779980e1d..d048102849ba 100644
--- a/pkgs/development/libraries/libcxxrt/default.nix
+++ b/pkgs/development/libraries/libcxxrt/default.nix
@@ -17,6 +17,11 @@ stdenv.mkDerivation {
     sha256 = "+oTjU/DgOEIwJebSVkSEt22mJSdeONozB8FfzEiESHU=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   outputs = [

From c5ceaffc82534ca8519c0dafd46f485e0d93ec96 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 02:08:52 +0000
Subject: [PATCH 1166/6226] copybara: 20250929 -> 20251020

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

diff --git a/pkgs/by-name/co/copybara/package.nix b/pkgs/by-name/co/copybara/package.nix
index 9b00d7c421a0..0bc3f592a8c0 100644
--- a/pkgs/by-name/co/copybara/package.nix
+++ b/pkgs/by-name/co/copybara/package.nix
@@ -13,11 +13,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "copybara";
-  version = "20250929";
+  version = "20251020";
 
   src = fetchurl {
     url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar";
-    hash = "sha256-7fI7YeGFmOc/t4JPW8dszX0/MctIJdCfRuJVjEn+7vQ=";
+    hash = "sha256-Jpq35BtBpXKKQBFhP4qJFBpACiAJ+TZIv6R5pMKTIvQ=";
   };
 
   nativeBuildInputs = [

From 698fa870b01a3686151fa94d1f0b21f07501b65c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 02:13:07 +0000
Subject: [PATCH 1167/6226] s7: 11.7-unstable-2025-10-14 ->
 11.7-unstable-2025-10-20

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

diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix
index b09f5e031e9e..6d8aa7a2c2f9 100644
--- a/pkgs/by-name/s7/s7/package.nix
+++ b/pkgs/by-name/s7/s7/package.nix
@@ -26,14 +26,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "s7";
-  version = "11.7-unstable-2025-10-14";
+  version = "11.7-unstable-2025-10-20";
 
   src = fetchFromGitLab {
     domain = "cm-gitlab.stanford.edu";
     owner = "bil";
     repo = "s7";
-    rev = "e338a5d36920e006d45880d9a89a2fb85068b0aa";
-    hash = "sha256-UpjJf45xuyn7zIMK/vj8UMmRYUuDcYe7GpLaOuxctNM=";
+    rev = "479045bf9445789c6a0a0252dd6fc092f2b0b507";
+    hash = "sha256-F7IPAjIlfZcuj9Of0wDYQWPTAWWZO9z6/FbjHwZlJAo=";
   };
 
   buildInputs =

From 7cb33540161f47f2a252f413cc058a62263ee353 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 02:14:49 +0000
Subject: [PATCH 1168/6226] speedscope: 1.23.1 -> 1.24.0

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

diff --git a/pkgs/by-name/sp/speedscope/package.nix b/pkgs/by-name/sp/speedscope/package.nix
index 4c75e2e21633..cfa8807566e7 100644
--- a/pkgs/by-name/sp/speedscope/package.nix
+++ b/pkgs/by-name/sp/speedscope/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage rec {
   pname = "speedscope";
-  version = "1.23.1";
+  version = "1.24.0";
 
   src = fetchFromGitHub {
     owner = "jlfwong";
     repo = "speedscope";
     tag = "v${version}";
-    hash = "sha256-PIyx4ceihTSLRDP5MW3n6edtYNFOnx8Uo7qUWW7LTs8=";
+    hash = "sha256-QL+Hm3ujfZeKHMoNgQdxYStgWOIbxjDmXMHKnWddTfs=";
 
     # scripts/prepack.sh wants to extract the git commit from .git
     # We don't want to keep .git for reproducibility reasons, so save the commit
@@ -25,7 +25,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-xpFrkKAaFbVE1zJ/haibQte4HjUWmeBR8BVjZuSoyjI=";
+  npmDepsHash = "sha256-MgCIiVeq9w5XRPIsZ/9AbZpVwRQdzZgK7VC5Gl7cn78=";
 
   patches = [
     ./fix-shebang.patch

From d50ec10adb240bb32a11239143c9e827701aa986 Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Tue, 21 Oct 2025 11:15:02 +0900
Subject: [PATCH 1169/6226] libfann: 2.2.0 -> 2.2.0-unstable-2025-10-13

* this update fixes the build issue with cmake 4, noted
  here: https://github.com/NixOS/nixpkgs/issues/445447
---
 pkgs/by-name/li/libfann/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/libfann/package.nix b/pkgs/by-name/li/libfann/package.nix
index 2cccdac05c1d..7e5623c858ac 100644
--- a/pkgs/by-name/li/libfann/package.nix
+++ b/pkgs/by-name/li/libfann/package.nix
@@ -5,15 +5,15 @@
   cmake,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "libfann";
-  version = "2.2.0";
+  version = "2.2.0-unstable-2025-10-13";
 
   src = fetchFromGitHub {
     owner = "libfann";
     repo = "fann";
-    rev = version;
-    sha256 = "0awbs0vjsrdglqiaybb0ln13ciizmyrw9ahllahvgbq4nr0nvf6y";
+    rev = "3907e1b37f94ed606b627c55dd2238956046a19b";
+    sha256 = "sha256-UdEpUD7ASrqygwFgW4CdCDGIJtUTKeJbHZDnnQI5jSI=";
   };
 
   nativeBuildInputs = [ cmake ];

From d2e51b1b3216722d2ae548db931f4a22158f4fcf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 02:15:47 +0000
Subject: [PATCH 1170/6226] sccache: 0.11.0 -> 0.12.0

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

diff --git a/pkgs/by-name/sc/sccache/package.nix b/pkgs/by-name/sc/sccache/package.nix
index 9dc1834f5b29..f7648cf09e26 100644
--- a/pkgs/by-name/sc/sccache/package.nix
+++ b/pkgs/by-name/sc/sccache/package.nix
@@ -8,17 +8,17 @@
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
-  version = "0.11.0";
+  version = "0.12.0";
   pname = "sccache";
 
   src = fetchFromGitHub {
     owner = "mozilla";
     repo = "sccache";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-x+TeFJa15eLmdUAAL4GH+bz6LWJZ/8Z0C1NcJ04MWc8=";
+    sha256 = "sha256-QNLcA31SJf7XmxYvzDC5LCKVu5ZWiw7U249KjUAGIZw=";
   };
 
-  cargoHash = "sha256-FyzeSiewKZhw1iIT6831W/FAx9IrG+Kswi5QWkQ0zQk=";
+  cargoHash = "sha256-tJGGS6Zpsz9nye2VKdZRuFeeqJ71MsXn3C9ytqeEW5I=";
 
   buildFeatures = lib.optionals distributed [
     "dist-client"

From 0690dbf5a92a612c30407930c08a98d03fc34045 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 02:33:26 +0000
Subject: [PATCH 1171/6226] open62541: 1.4.13 -> 1.4.14

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

diff --git a/pkgs/by-name/op/open62541/package.nix b/pkgs/by-name/op/open62541/package.nix
index 18303e4e5a0d..5107a1bf0ab6 100644
--- a/pkgs/by-name/op/open62541/package.nix
+++ b/pkgs/by-name/op/open62541/package.nix
@@ -33,13 +33,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "open62541";
-  version = "1.4.13";
+  version = "1.4.14";
 
   src = fetchFromGitHub {
     owner = "open62541";
     repo = "open62541";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-y4yxdO55fMmkP+nCU6ToabvAPi6hgXHiDXpF3tNEHNw=";
+    hash = "sha256-+gE1wlxAyUVgHnDhkHEu9IwCCIKDuAHUzkThuDgdzdE=";
     fetchSubmodules = true;
   };
 

From 22f6dc409f7c54a5207151342d2ebc5de9039ffc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 02:44:08 +0000
Subject: [PATCH 1172/6226] wait4x: 3.5.1 -> 3.6.0

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

diff --git a/pkgs/by-name/wa/wait4x/package.nix b/pkgs/by-name/wa/wait4x/package.nix
index 3cf6e2fc91b0..da5e3e2c3c76 100644
--- a/pkgs/by-name/wa/wait4x/package.nix
+++ b/pkgs/by-name/wa/wait4x/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "wait4x";
-  version = "3.5.1";
+  version = "3.6.0";
 in
 buildGoModule {
   inherit pname version;
@@ -14,10 +14,10 @@ buildGoModule {
     owner = "wait4x";
     repo = "wait4x";
     rev = "v${version}";
-    hash = "sha256-VAt61k2eHQwyLSsvbWxe7jJ/Wyj4U4O2+LzCsoP/Yq4=";
+    hash = "sha256-RiF5tcnzMteXaYmw4mfQdamwV1PAyNC8pUownJzfACs=";
   };
 
-  vendorHash = "sha256-KJOKLTjwwgu2MFNIRDk8eeSVnZyjO9dfVyWrF5vqj9g=";
+  vendorHash = "sha256-fa3XEqLkzriMFYea3bv4FzaKgK2FsGwn5IQG48vh7+M=";
 
   # Tests make network access
   doCheck = false;

From ff49ecfad82b63b2264f0636fafaf0e0be3688db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 20 Oct 2025 19:44:06 -0700
Subject: [PATCH 1173/6226] libcmatrix: 0.0.3 -> 0.0.4

Diff: https://source.puri.sm/Librem5/libcmatrix/-/compare/v0.0.3...0.0.4

Changelog: https://source.puri.sm/Librem5/libcmatrix/-/blob/v0.0.4/NEWS
---
 pkgs/by-name/li/libcmatrix/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libcmatrix/package.nix b/pkgs/by-name/li/libcmatrix/package.nix
index 2356e3936073..b12a53b70f3b 100644
--- a/pkgs/by-name/li/libcmatrix/package.nix
+++ b/pkgs/by-name/li/libcmatrix/package.nix
@@ -17,14 +17,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libcmatrix";
-  version = "0.0.3";
+  version = "0.0.4";
 
   src = fetchFromGitLab {
     domain = "source.puri.sm";
     owner = "Librem5";
     repo = "libcmatrix";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Usaqkb6zClVtYCL1VUv4iNeKs2GZECO9sOdPk3N8iLM=";
+    hash = "sha256-MyjgxOJmaDylPA2AENZPR+dfh2UN1H93ZOLMlycEmTw=";
   };
 
   nativeBuildInputs = [

From d924a755b0cc31262c6d8c588392905f788401aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 02:50:10 +0000
Subject: [PATCH 1174/6226] all-the-package-names: 2.0.2235 -> 2.0.2241

---
 pkgs/by-name/al/all-the-package-names/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix
index edf22fb4eccd..b405cef7f1f4 100644
--- a/pkgs/by-name/al/all-the-package-names/package.nix
+++ b/pkgs/by-name/al/all-the-package-names/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "all-the-package-names";
-  version = "2.0.2235";
+  version = "2.0.2241";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-I2E1V296tljsvtpfU5xlUkKNEeEZb4qtM1WDLXQZHbg=";
+    hash = "sha256-jiHYGxESaEKQ6g4Bz7fZNz24PFmF/PWKc3ySqZzFDa8=";
   };
 
-  npmDepsHash = "sha256-p1IBNK6dRBnEUEZ4bIMoGcVSPoecnKWgRtuUJTYW7q8=";
+  npmDepsHash = "sha256-KtfzWr8I0fmZfIgkVAohgd0UlJY1DeP6Q0n8e7YENrs=";
 
   passthru.updateScript = nix-update-script { };
 

From 2d230472558f82593409fd0e09ff04ed6406f4c8 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Mon, 20 Oct 2025 22:59:03 -0400
Subject: [PATCH 1175/6226] forgejo-runner: 11.1.2 -> 11.2.0

changelog: https://code.forgejo.org/forgejo/runner/releases/tag/v11.2.0
---
 pkgs/by-name/fo/forgejo-runner/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix
index e25f348ef2ce..e1e7f11d8e47 100644
--- a/pkgs/by-name/fo/forgejo-runner/package.nix
+++ b/pkgs/by-name/fo/forgejo-runner/package.nix
@@ -33,6 +33,7 @@ let
     "TestCloneIfRequired"
     "TestActionCache"
     "TestRunContext_GetGitHubContext"
+    "TestSetJobResult_SkipsBannerInChildReusableWorkflow"
 
     # These tests rely on outbound IP address
     "TestHandler"
@@ -41,17 +42,17 @@ let
 in
 buildGoModule rec {
   pname = "forgejo-runner";
-  version = "11.1.2";
+  version = "11.2.0";
 
   src = fetchFromGitea {
     domain = "code.forgejo.org";
     owner = "forgejo";
     repo = "runner";
     rev = "v${version}";
-    hash = "sha256-/rkBrG8hRn52M1ybjbWtSDFYsJ4fHzw9qAoc5325g9A=";
+    hash = "sha256-hjrn36Fm2kIKqn16DOPcrMF38dhsGOZVHCTrhkS99QQ=";
   };
 
-  vendorHash = "sha256-eVOmUozNLHRiNwIhbf7ebVNdRiMAtLMdYI7pnALvl8U=";
+  vendorHash = "sha256-QokVTTfMGAJG4Jqfs7mfGXrC4QSZfOXesfF2OeN0L9M=";
 
   # See upstream Makefile
   # https://code.forgejo.org/forgejo/runner/src/branch/main/Makefile

From c4e8a975f66d64c6629052faa2327f7bddf58f89 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 11 Oct 2025 22:34:16 +0800
Subject: [PATCH 1176/6226] libui-ng: only build native arch on darwin

---
 pkgs/by-name/li/libui-ng/darwin-no-universal.patch | 13 +++++++++++++
 pkgs/by-name/li/libui-ng/package.nix               |  6 +++---
 2 files changed, 16 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/li/libui-ng/darwin-no-universal.patch

diff --git a/pkgs/by-name/li/libui-ng/darwin-no-universal.patch b/pkgs/by-name/li/libui-ng/darwin-no-universal.patch
new file mode 100644
index 000000000000..587490d0ab85
--- /dev/null
+++ b/pkgs/by-name/li/libui-ng/darwin-no-universal.patch
@@ -0,0 +1,13 @@
+--- a/meson.build
++++ b/meson.build
+@@ -72,10 +72,6 @@
+ 	libui_macosx_version_min = '-mmacosx-version-min=10.8'
+ 	add_global_arguments(libui_macosx_version_min, language: libui_darwin_langs)
+ 	add_global_link_arguments(libui_macosx_version_min, language: libui_darwin_langs)
+-
+-	libui_arch = ['-arch', 'x86_64', '-arch', 'arm64']
+-	add_global_arguments(libui_arch, language: libui_darwin_langs)
+-	add_global_link_arguments(libui_arch, language: libui_darwin_langs)
+ endif
+ 
+ if libui_MSVC
diff --git a/pkgs/by-name/li/libui-ng/package.nix b/pkgs/by-name/li/libui-ng/package.nix
index 54312f6918fd..d58d382a9a5a 100644
--- a/pkgs/by-name/li/libui-ng/package.nix
+++ b/pkgs/by-name/li/libui-ng/package.nix
@@ -21,9 +21,9 @@ stdenv.mkDerivation {
     hash = "sha256-pnfrSPDIvG0tFYQoeMBONATkNRNjY/tJGp9n2I4cN/U=";
   };
 
-  postPatch = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) ''
-    substituteInPlace meson.build --replace "'-arch', 'arm64'" ""
-  '';
+  patches = [
+    ./darwin-no-universal.patch
+  ];
 
   nativeBuildInputs = [
     cmocka

From 48ab9a157b0e6aa99d1dd0f5e75e6fb65b92494d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 03:21:33 +0000
Subject: [PATCH 1177/6226] retool: 2.4.2 -> 2.4.3

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

diff --git a/pkgs/by-name/re/retool/package.nix b/pkgs/by-name/re/retool/package.nix
index ff7747e7e112..7bab9561e755 100644
--- a/pkgs/by-name/re/retool/package.nix
+++ b/pkgs/by-name/re/retool/package.nix
@@ -8,7 +8,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "retool";
-  version = "2.4.2";
+  version = "2.4.3";
 
   pyproject = true;
   disabled = python3.pkgs.pythonOlder "3.10";
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "unexpectedpanda";
     repo = "retool";
     tag = "v${version}";
-    hash = "sha256-jb2HJjXBxfdOY9TI37D5xwtySlYoSJwckrLC+h7YqoM=";
+    hash = "sha256-uYzsHraA5LX+5wZWSAO7lOFhssd7LojftLP5pufgUcc=";
   };
 
   nativeBuildInputs = with python3.pkgs; [

From 8259baad29a9d20eae9f4a0b89de5be650913427 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 03:31:08 +0000
Subject: [PATCH 1178/6226] nelm: 1.13.2 -> 1.14.1

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

diff --git a/pkgs/by-name/ne/nelm/package.nix b/pkgs/by-name/ne/nelm/package.nix
index d31162a9ef91..17eb53bbe9f2 100644
--- a/pkgs/by-name/ne/nelm/package.nix
+++ b/pkgs/by-name/ne/nelm/package.nix
@@ -9,13 +9,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "nelm";
-  version = "1.13.2";
+  version = "1.14.1";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "nelm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-g/JnFD1TPVKllY1yrODJ9P0bJe2357B11XAn9tQPLE8=";
+    hash = "sha256-yAd+4Up5SDVlrwa/46lQmCS257T16Wf6PSo7an07H8I=";
   };
 
   vendorHash = "sha256-yd9qSQi7ktbI9b5eaTc98TjhxDsBVvh9qrf3+F2Twu4=";

From e733121809e64473c89bf65647f7bad5f4d2dc5c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 03:32:57 +0000
Subject: [PATCH 1179/6226] linuxPackages.rtw88: 0-unstable-2025-09-05 ->
 0-unstable-2025-10-20

---
 pkgs/os-specific/linux/rtw88/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix
index 12b10c58c598..f12a7636ffbd 100644
--- a/pkgs/os-specific/linux/rtw88/default.nix
+++ b/pkgs/os-specific/linux/rtw88/default.nix
@@ -12,13 +12,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "rtw88";
-  version = "0-unstable-2025-09-05";
+  version = "0-unstable-2025-10-20";
 
   src = fetchFromGitHub {
     owner = "lwfinger";
     repo = "rtw88";
-    rev = "bb0ed9d5709afd30e928d2d11f7b650e03c8c72b";
-    hash = "sha256-ySIj9ZSIwdsn3WDFZ48xUGTFLA1BMU+hjvpDwifq4k4=";
+    rev = "9bc8fecb61d4ad59e46b4dbd003d60ef2d8437a8";
+    hash = "sha256-/nA0U1Ry+xt4F4GC9ymMDFhkiHAqeodv7uUXAaALmdg=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;

From 96b619ae47b12b5f125797dc404de81de24a81b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 03:33:51 +0000
Subject: [PATCH 1180/6226] python3Packages.wslink: 2.4.0 -> 2.5.0

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

diff --git a/pkgs/development/python-modules/wslink/default.nix b/pkgs/development/python-modules/wslink/default.nix
index c58032bcc291..e09cacf22404 100644
--- a/pkgs/development/python-modules/wslink/default.nix
+++ b/pkgs/development/python-modules/wslink/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "wslink";
-  version = "2.4.0";
+  version = "2.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kitware";
     repo = "wslink";
     tag = "v${version}";
-    hash = "sha256-IFXxMN+OXJ/J2BSegxOBjE4iSA27pLyCpyyx4hmo9NU=";
+    hash = "sha256-g1I8qCuqfv+pA3IP7b57PZ7vCsykpfJNG97NgJ+N5lE=";
   };
 
   sourceRoot = "${src.name}/python";

From e96455db689c4a7b7ea418ecb6dd3a72db2f72a7 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Mon, 20 Oct 2025 20:47:05 -0700
Subject: [PATCH 1181/6226] rocmPackages.rocblas: move tests and benchmarks to
 passthru.tests

Test and bench data bloated rocblas' closure size by around 1.1G
---
 pkgs/development/rocm-modules/6/default.nix   |  5 +----
 .../rocm-modules/6/rocblas/default.nix        | 21 ++++++++++++-------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index e457eff0879f..6fed3b011105 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -134,10 +134,7 @@ let
           ;
       };
 
-      rocblas = self.callPackage ./rocblas {
-        buildTests = true;
-        buildBenchmarks = true;
-      };
+      rocblas = self.callPackage ./rocblas { };
 
       rocsolver = self.callPackage ./rocsolver { };
 
diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix
index 33d707747056..0c9c2ee5c424 100644
--- a/pkgs/development/rocm-modules/6/rocblas/default.nix
+++ b/pkgs/development/rocm-modules/6/rocblas/default.nix
@@ -25,8 +25,8 @@
   rocm-smi,
   pkg-config,
   buildTensile ? true,
-  buildTests ? true,
-  buildBenchmarks ? true,
+  buildTests ? false,
+  buildBenchmarks ? false,
   tensileSepArch ? true,
   tensileLazyLib ? true,
   withHipBlasLt ? true,
@@ -130,8 +130,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "Tensile_LAZY_LIBRARY_LOADING" tensileLazyLib)
   ];
 
-  passthru.amdgpu_targets = gpuTargets';
-
   patches = [
     (fetchpatch {
       name = "Extend-rocBLAS-HIP-ISA-compatibility.patch";
@@ -150,10 +148,17 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail '0.10' '1.0'
   '';
 
-  passthru.updateScript = rocmUpdateScript {
-    name = finalAttrs.pname;
-    inherit (finalAttrs.src) owner;
-    inherit (finalAttrs.src) repo;
+  passthru = {
+    amdgpu_targets = gpuTargets';
+    tests.rocblas-tests = finalAttrs.finalPackage.override {
+      buildBenchmarks = true;
+      buildTests = true;
+    };
+    updateScript = rocmUpdateScript {
+      name = finalAttrs.pname;
+      inherit (finalAttrs.src) owner;
+      inherit (finalAttrs.src) repo;
+    };
   };
 
   enableParallelBuilding = true;

From 479b9bac700ebda909eaa0dc29fb07de5d98c317 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 04:02:37 +0000
Subject: [PATCH 1182/6226] vacuum-go: 0.18.6 -> 0.18.9

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

diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix
index 76d774d12bd7..1f08a8b343fd 100644
--- a/pkgs/by-name/va/vacuum-go/package.nix
+++ b/pkgs/by-name/va/vacuum-go/package.nix
@@ -7,14 +7,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "vacuum-go";
-  version = "0.18.6";
+  version = "0.18.9";
 
   src = fetchFromGitHub {
     owner = "daveshanley";
     repo = "vacuum";
     # using refs/tags because simple version gives: 'the given path has multiple possibilities' error
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9qRdikwZcTEZEQON2/n3dy9FA34Bu8YTfNfssOcUwgg=";
+    hash = "sha256-uXNSwp+Qqw8drSt+SN20AjoJG9Pmaz0WCozFq8jEv2o=";
   };
 
   vendorHash = "sha256-+GkxN20mZD/ZBTCjmjiDcEAJix2Ssn9HsNrUtQkrI18=";

From 03ffc669d2d09fb99e8c3dfc11daff94caea7051 Mon Sep 17 00:00:00 2001
From: hogcycle <nate@gysli.ng>
Date: Mon, 22 Sep 2025 18:37:47 -0400
Subject: [PATCH 1183/6226] discord-rich-presence-plex: init at version 2.16.0

---
 .../di/discord-rich-presence-plex/package.nix | 62 +++++++++++++++++++
 1 file changed, 62 insertions(+)
 create mode 100644 pkgs/by-name/di/discord-rich-presence-plex/package.nix

diff --git a/pkgs/by-name/di/discord-rich-presence-plex/package.nix b/pkgs/by-name/di/discord-rich-presence-plex/package.nix
new file mode 100644
index 000000000000..2c9f3a73e6df
--- /dev/null
+++ b/pkgs/by-name/di/discord-rich-presence-plex/package.nix
@@ -0,0 +1,62 @@
+{
+  lib,
+  python3Packages,
+  python3,
+  fetchFromGitHub,
+  makeWrapper,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "discord-rich-presence-plex";
+  version = "2.16.0";
+  format = "other";
+  src = fetchFromGitHub {
+    owner = "phin05";
+    repo = "discord-rich-presence-plex";
+    tag = "v${version}";
+    hash = "sha256-e1r0w72IOEY5XsjANkAHbfPYEf1B8n6KYVLMWFSLs0g=";
+  };
+
+  nativeBuildInputs = [
+    makeWrapper
+  ];
+  dontBuild = true;
+  dontUseSetuptoolsBuild = true;
+  dontUseSetuptoolsCheck = true;
+
+  dependencies = with python3Packages; [
+    requests
+    pillow
+    plexapi
+    pyyaml
+    websocket-client
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/discord-rich-presence-plex
+    cp -r * $out/lib/discord-rich-presence-plex/
+
+    mkdir -p $out/bin
+    makeWrapper ${lib.getExe python3} \
+      $out/bin/discord-rich-presence-plex \
+      --add-flags "$out/lib/discord-rich-presence-plex/main.py" \
+      --prefix PYTHONPATH : "$out/lib/discord-rich-presence-plex:$PYTHONPATH" \
+      --set DRPP_NO_PIP_INSTALL "true"
+
+    runHook postInstall
+  '';
+
+  # No tests
+  doCheck = false;
+
+  meta = {
+    homepage = "https://github.com/phin05/discord-rich-presence-plex";
+    changelog = "https://github.com/phin05/discord-rich-presence-plex/releases/tag/v${version}";
+    license = lib.licenses.gpl3Only;
+    description = "Displays your Plex status on Discord using Rich Presence";
+    maintainers = with lib.maintainers; [ hogcycle ];
+    mainProgram = "discord-rich-presence-plex";
+  };
+}

From 82bd28b0687374ec9b050f01b704402d0ba2f67b Mon Sep 17 00:00:00 2001
From: Spencer Janssen <spencerjanssen@gmail.com>
Date: Wed, 20 Aug 2025 23:14:22 -0500
Subject: [PATCH 1184/6226] nixos/github-runner: fix nodeRuntimes option

Fixes #434830.

Drops backwards compatibility workaround introduced in #286063.
---
 .../services/continuous-integration/github-runner/options.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/continuous-integration/github-runner/options.nix b/nixos/modules/services/continuous-integration/github-runner/options.nix
index a2df04e597d8..cb1020b7eab9 100644
--- a/nixos/modules/services/continuous-integration/github-runner/options.nix
+++ b/nixos/modules/services/continuous-integration/github-runner/options.nix
@@ -187,9 +187,7 @@
             };
 
             package = lib.mkPackageOption pkgs "github-runner" { } // {
-              apply =
-                # Support old github-runner versions which don't have the `nodeRuntimes` arg yet.
-                pkg: pkg.override (old: lib.optionalAttrs (old ? nodeRuntimes) { inherit (config) nodeRuntimes; });
+              apply = pkg: pkg.override { inherit (config) nodeRuntimes; };
             };
 
             ephemeral = lib.mkOption {

From 822f3a88ff4666030c8d20f984468ee037fb1b0d Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Mon, 20 Oct 2025 21:47:21 -0700
Subject: [PATCH 1185/6226] eget: remove unrelated binaries

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

diff --git a/pkgs/by-name/eg/eget/package.nix b/pkgs/by-name/eg/eget/package.nix
index 751e81a62008..680e4a00d094 100644
--- a/pkgs/by-name/eg/eget/package.nix
+++ b/pkgs/by-name/eg/eget/package.nix
@@ -34,6 +34,7 @@ buildGoModule rec {
   ];
 
   postInstall = ''
+    rm $out/bin/{test,tools}
     pandoc man/eget.md -s -t man -o eget.1
     installManPage eget.1
   '';

From 78f91aa72e3bb7a4d43cb781d5797d79a5d81575 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Mon, 20 Oct 2025 21:54:59 -0700
Subject: [PATCH 1186/6226] eget: cleanup

---
 pkgs/by-name/eg/eget/package.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/eg/eget/package.nix b/pkgs/by-name/eg/eget/package.nix
index 680e4a00d094..c518330c8637 100644
--- a/pkgs/by-name/eg/eget/package.nix
+++ b/pkgs/by-name/eg/eget/package.nix
@@ -6,17 +6,16 @@
   installShellFiles,
   nix-update-script,
   testers,
-  eget,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "eget";
   version = "1.3.4";
 
   src = fetchFromGitHub {
     owner = "zyedidia";
     repo = "eget";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     sha256 = "sha256-jhVUYyp6t5LleVotQQme07IJVdVnIOVFFtKEmzt8e2k=";
   };
 
@@ -25,7 +24,7 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X main.Version=v${version}"
+    "-X main.Version=v${finalAttrs.version}"
   ];
 
   nativeBuildInputs = [
@@ -42,16 +41,16 @@ buildGoModule rec {
   passthru = {
     updateScript = nix-update-script { };
     tests.version = testers.testVersion {
-      package = eget;
+      package = finalAttrs.finalPackage;
       command = "eget -v";
-      version = "v${version}";
+      version = "v${finalAttrs.version}";
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Easily install prebuilt binaries from GitHub";
     homepage = "https://github.com/zyedidia/eget";
-    license = licenses.mit;
-    maintainers = with maintainers; [ zendo ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ zendo ];
   };
-}
+})

From 2169d0ae195ec90e197fcd2ac02c5ae22995dbbc Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 9 Oct 2025 21:35:57 +0100
Subject: [PATCH 1187/6226] qemu: 10.1.0 -> 10.1.2

---
 pkgs/applications/virtualization/qemu/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix
index 00521e0feb27..fb46fb38a925 100644
--- a/pkgs/applications/virtualization/qemu/default.nix
+++ b/pkgs/applications/virtualization/qemu/default.nix
@@ -146,11 +146,11 @@ stdenv.mkDerivation (finalAttrs: {
     + lib.optionalString nixosTestRunner "-for-vm-tests"
     + lib.optionalString toolsOnly "-utils"
     + lib.optionalString userOnly "-user";
-  version = "10.1.0";
+  version = "10.1.2";
 
   src = fetchurl {
     url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz";
-    hash = "sha256-4FFzSbUMpz6+wvqFsGBQ1cRjymXHOIM72PwfFfGAvlE=";
+    hash = "sha256-nXXzMcGly5tuuP2fZPVj7C6rNGyCLLl/izXNgtPxFHk=";
   };
 
   depsBuildBuild = [

From cfe4f564bd1dca12975c505e7499c84ec7d2587c Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 21 Oct 2025 07:05:51 +0200
Subject: [PATCH 1188/6226] ocamlPackages.ocaml_gettext: fix for OCaml 5.4

---
 .../ocaml-modules/ocaml-gettext/default.nix   | 27 ++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix
index 1b32c0eb997c..93a91be6b7ed 100644
--- a/pkgs/development/ocaml-modules/ocaml-gettext/default.nix
+++ b/pkgs/development/ocaml-modules/ocaml-gettext/default.nix
@@ -4,27 +4,36 @@
   fetchpatch,
   applyPatches,
   buildDunePackage,
+  ocaml,
   cppo,
   gettext,
   fileutils,
   ounit2,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "gettext";
   version = "0.5.0";
 
   src = applyPatches {
     src = fetchurl {
-      url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${version}/gettext-${version}.tbz";
+      url = "https://github.com/gildor478/ocaml-gettext/releases/download/v${finalAttrs.version}/gettext-${finalAttrs.version}.tbz";
       hash = "sha256-CN2d9Vsq8YOOIxK+S+lCtDddvBjCrtDKGSRIh1DjT10=";
     };
-    # Disable dune sites
-    # See https://github.com/gildor478/ocaml-gettext/pull/37
-    patches = fetchpatch {
-      url = "https://github.com/gildor478/ocaml-gettext/commit/5462396bee53cb13d8d6fde4c6d430412a17b64d.patch";
-      hash = "sha256-tOR+xgZTadvNeQpZnFTJEvZglK8P+ySvYnE3c1VWvKQ=";
-    };
+    patches = [
+      # Disable dune sites
+      # See https://github.com/gildor478/ocaml-gettext/pull/37
+      (fetchpatch {
+        url = "https://github.com/gildor478/ocaml-gettext/commit/5462396bee53cb13d8d6fde4c6d430412a17b64d.patch";
+        hash = "sha256-tOR+xgZTadvNeQpZnFTJEvZglK8P+ySvYnE3c1VWvKQ=";
+      })
+    ]
+    # Compatibility with OCaml ≥ 5.4
+    # See https://github.com/gildor478/ocaml-gettext/pull/41
+    ++ lib.optional (lib.versionAtLeast ocaml.version "5.4") (fetchpatch {
+      url = "https://github.com/gildor478/ocaml-gettext/commit/5d521981e39dcaeada6bbe7b15c5432d6de5d33c.patch";
+      hash = "sha256-82ajmpyXSd2RdVq/ND4lS8PIugRSkKe5oL8BL9CsLo4=";
+    });
   };
 
   nativeBuildInputs = [ cppo ];
@@ -46,4 +55,4 @@ buildDunePackage rec {
     maintainers = [ ];
     mainProgram = "ocaml-gettext";
   };
-}
+})

From 35fa0b804b94bc57de6a966daf2c365a1ae2027a Mon Sep 17 00:00:00 2001
From: beeb <703631+beeb@users.noreply.github.com>
Date: Wed, 15 Oct 2025 17:09:48 +0200
Subject: [PATCH 1189/6226] lintspec: 0.10.0 -> 0.11.4

---
 pkgs/by-name/li/lintspec/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/lintspec/package.nix b/pkgs/by-name/li/lintspec/package.nix
index f699c09dc708..54381f2a14e9 100644
--- a/pkgs/by-name/li/lintspec/package.nix
+++ b/pkgs/by-name/li/lintspec/package.nix
@@ -8,16 +8,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lintspec";
-  version = "0.10.0";
+  version = "0.11.4";
 
   src = fetchFromGitHub {
     owner = "beeb";
     repo = "lintspec";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FCcAyOPym6e9L1yMNqdpw4m8JEeXJZhN2yJi86j/WC0=";
+    hash = "sha256-dd9j4eGXhNyaTOMiKK0qi8BW1Zy1kZ6+ZVMB7rrq4gE=";
   };
 
-  cargoHash = "sha256-RVKoy400ZPBC18gq87DntQw73AkIqSwpMqR0dtKA0wY=";
+  cargoHash = "sha256-u83OgBEbZ4b2CLZv/M9Wv0tum3ZKZGOuba0leqfMDoo=";
+  cargoBuildFlags = [
+    "--package"
+    "lintspec"
+  ];
 
   nativeBuildInputs = [ installShellFiles ];
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''

From 7550a60bf156154fe7d6b9f044523940410f23a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 06:16:46 +0000
Subject: [PATCH 1190/6226] supabase-cli: 2.50.3 -> 2.53.5

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

diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix
index 5f1c463ccdf2..4554d70990a3 100644
--- a/pkgs/by-name/su/supabase-cli/package.nix
+++ b/pkgs/by-name/su/supabase-cli/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "supabase-cli";
-  version = "2.50.3";
+  version = "2.53.5";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-ydo3f7TRhHwyrWrKxCT0wFXT5v5NSmoCMRjWf43MizM=";
+    hash = "sha256-U91G/5eWj+ZHCq9GU9R+gSYhwez99xi6t4VWsnYpjtI=";
   };
 
-  vendorHash = "sha256-SJisDIpk/xiPffhtA2wKRfftODnchnaOL0wCrLx94k0=";
+  vendorHash = "sha256-ST1j+UXGs3mBf5NYe+sp+QXjHsey9ATOFdriIEBJpKM=";
 
   ldflags = [
     "-s"

From 1492c86a79841dcc1565695deda585fbab349b38 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 06:40:51 +0000
Subject: [PATCH 1191/6226] cursor-cli: 0-unstable-2025-10-02 ->
 0-unstable-2025-10-20

---
 pkgs/by-name/cu/cursor-cli/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix
index 9ce40695c797..58215b6618de 100644
--- a/pkgs/by-name/cu/cursor-cli/package.nix
+++ b/pkgs/by-name/cu/cursor-cli/package.nix
@@ -9,26 +9,26 @@ let
   inherit (stdenv) hostPlatform;
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2025.10.02-bd871ac/linux/x64/agent-cli-package.tar.gz";
-      hash = "sha256-tqppTOkeChlyw3IjSkhGpNvMX9U5s2hiu13/RWakENg=";
+      url = "https://downloads.cursor.com/lab/2025.10.20-f1b214f/linux/x64/agent-cli-package.tar.gz";
+      hash = "sha256-v6wGVuKrK4JFFaJN55le5+wZV7LI9Bc70Osc05F0PeQ=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2025.10.02-bd871ac/linux/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-Gf/2wLS2+xQ6Mu4u96n4hI1I4L2iIG16R668BQCNZaw=";
+      url = "https://downloads.cursor.com/lab/2025.10.20-f1b214f/linux/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-j3z3K2tt2wl54OjLMPudGnCP2+9U2dOspM0G0Ob68Ds=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2025.10.02-bd871ac/darwin/x64/agent-cli-package.tar.gz";
-      hash = "sha256-/qznJxLpyUBH4L6zJSDB5mVFVk2Y7UJCt2Uw5g7U6AQ=";
+      url = "https://downloads.cursor.com/lab/2025.10.20-f1b214f/darwin/x64/agent-cli-package.tar.gz";
+      hash = "sha256-KRECUSqYohrCiF3YySZeJ0MaRhb7h+O+KyqCfpCbV8w=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2025.10.02-bd871ac/darwin/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-drbaPM4ho5/1vmQWMgBelmqR7Np45w/XR0ZsfR53vZI=";
+      url = "https://downloads.cursor.com/lab/2025.10.20-f1b214f/darwin/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-4S1HMPielrUwP5pyA/tp1FuByge9dcRx2XndTFnBKbY=";
     };
   };
 in
 stdenv.mkDerivation {
   pname = "cursor-cli";
-  version = "0-unstable-2025-10-02";
+  version = "0-unstable-2025-10-20";
 
   src = sources.${hostPlatform.system};
 

From f2c8f34d594f97c80c9a31c76da7c2864cf02891 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 06:45:50 +0000
Subject: [PATCH 1192/6226] vpl-gpu-rt: 25.3.4 -> 25.4.1

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

diff --git a/pkgs/by-name/vp/vpl-gpu-rt/package.nix b/pkgs/by-name/vp/vpl-gpu-rt/package.nix
index b397f413008f..005c69e3ee76 100644
--- a/pkgs/by-name/vp/vpl-gpu-rt/package.nix
+++ b/pkgs/by-name/vp/vpl-gpu-rt/package.nix
@@ -10,7 +10,7 @@
 
 stdenv.mkDerivation rec {
   pname = "vpl-gpu-rt";
-  version = "25.3.4";
+  version = "25.4.1";
 
   outputs = [
     "out"
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
     owner = "intel";
     repo = "vpl-gpu-rt";
     rev = "intel-onevpl-${version}";
-    hash = "sha256-tnRYP8mdG0bocdQTcpeJAGX+sHA52JuqeKazlkL2Y+0=";
+    hash = "sha256-JuvMz4O3HGwfcOd8QuyFXsBoz5M4Lw3Se73ObJ9s73c=";
   };
 
   nativeBuildInputs = [

From 8ea0e0a9d3f9ec7ba325fd41cd65511bcfbeeaf1 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 21 Oct 2025 08:47:09 +0200
Subject: [PATCH 1193/6226] claude-code: 2.0.22 -> 2.0.24

---
 .../vscode/extensions/anthropic.claude-code/default.nix     | 4 ++--
 pkgs/by-name/cl/claude-code/package-lock.json               | 4 ++--
 pkgs/by-name/cl/claude-code/package.nix                     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 4cb9c1bc531e..69ea179c954b 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "2.0.22";
-    hash = "sha256-ystT5nHh0ivpFLwhHr6Uw5PyubkdY/kWm841wzIfyJ4=";
+    version = "2.0.24";
+    hash = "sha256-5lPa2xBDqdVFdwVBiGz0u8Cp/oHvUTNEzvyKy4t2qvw=";
   };
 
   meta = {
diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 82dac85d93c1..07ec9ee16c3c 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.0.22",
+  "version": "2.0.24",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.0.22",
+      "version": "2.0.24",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 3ca88da75005..2c81854f4e18 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,14 +7,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.0.22";
+  version = "2.0.24";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-SDXYXEb7Vi150Hx04y9kd+Owzu11VSqVRgej36P2khU=";
+    hash = "sha256-pi8EdN/XyzMGWBcTiV8pr9GODcBs0uPFarWjQMoCaEs=";
   };
 
-  npmDepsHash = "sha256-kphPXek1YoEs4yvikOYg/CmkKuq1rMUJC6Rkrhydkxo=";
+  npmDepsHash = "sha256-XylBq0/zu7iSTPiLAkewQFeh1OmtJv9nUfnCb66opVE=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From e25ac51eccac1334692fa1c2dd5c453b17529758 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 21 Oct 2025 09:00:34 +0200
Subject: [PATCH 1194/6226] opensshTest: drop softhsm (failing part of the
 tests)

https://github.com/NixOS/nixpkgs/issues/453782
---
 pkgs/tools/networking/openssh/common.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix
index 5b672b6d6b7a..7eb07d074842 100644
--- a/pkgs/tools/networking/openssh/common.nix
+++ b/pkgs/tools/networking/openssh/common.nix
@@ -144,7 +144,8 @@ stdenv.mkDerivation (finalAttrs: {
     openssl
   ]
   ++ lib.optional (!stdenv.hostPlatform.isDarwin) hostname
-  ++ lib.optional (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl) softhsm;
+  # TODO: softhsm is currently breaking the tests; see #453782
+  ++ lib.optional (false && !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl) softhsm;
 
   preCheck = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) (
     ''
@@ -193,7 +194,8 @@ stdenv.mkDerivation (finalAttrs: {
       # set up NIX_REDIRECTS for direct invocations
       set -a; source ~/.ssh/environment.base; set +a
     ''
-    + lib.optionalString (!stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl) ''
+    # See softhsm in nativeCheckInputs above.
+    + lib.optionalString (!finalAttrs.doCheck && !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl) ''
       # The extra tests check PKCS#11 interactions, which softhsm emulates with software only
       substituteInPlace regress/test-exec.sh \
         --replace /usr/local/lib/softhsm/libsofthsm2.so ${lib.getLib softhsm}/lib/softhsm/libsofthsm2.so

From 2176515ba5135b8fa9fa1313d27af1ad3e818cfd Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Tue, 21 Oct 2025 07:58:45 +0100
Subject: [PATCH 1195/6226] vacuum-tube: mark as broken on darwin

---
 pkgs/by-name/va/vacuum-tube/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/va/vacuum-tube/package.nix b/pkgs/by-name/va/vacuum-tube/package.nix
index 8762b242f770..b3dcc291ae01 100644
--- a/pkgs/by-name/va/vacuum-tube/package.nix
+++ b/pkgs/by-name/va/vacuum-tube/package.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   buildNpmPackage,
   fetchFromGitHub,
   lib,
@@ -68,5 +69,7 @@ buildNpmPackage rec {
     mainProgram = "VacuumTube";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ theCapypara ];
+    # https://github.com/NixOS/nixpkgs/pull/453698#issuecomment-3422020307
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From 5ee8efde226d7b800f3496da386a68673e1b1aa6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 21 Oct 2025 09:08:08 +0200
Subject: [PATCH 1196/6226] opensshTest: nixfmt after the previous commit

I'm sorry.
---
 pkgs/tools/networking/openssh/common.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/tools/networking/openssh/common.nix b/pkgs/tools/networking/openssh/common.nix
index 7eb07d074842..5f495f89f11a 100644
--- a/pkgs/tools/networking/openssh/common.nix
+++ b/pkgs/tools/networking/openssh/common.nix
@@ -195,11 +195,14 @@ stdenv.mkDerivation (finalAttrs: {
       set -a; source ~/.ssh/environment.base; set +a
     ''
     # See softhsm in nativeCheckInputs above.
-    + lib.optionalString (!finalAttrs.doCheck && !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl) ''
-      # The extra tests check PKCS#11 interactions, which softhsm emulates with software only
-      substituteInPlace regress/test-exec.sh \
-        --replace /usr/local/lib/softhsm/libsofthsm2.so ${lib.getLib softhsm}/lib/softhsm/libsofthsm2.so
-    ''
+    +
+      lib.optionalString
+        (!finalAttrs.doCheck && !stdenv.hostPlatform.isDarwin && !stdenv.hostPlatform.isMusl)
+        ''
+          # The extra tests check PKCS#11 interactions, which softhsm emulates with software only
+          substituteInPlace regress/test-exec.sh \
+            --replace /usr/local/lib/softhsm/libsofthsm2.so ${lib.getLib softhsm}/lib/softhsm/libsofthsm2.so
+        ''
   );
   # integration tests hard to get working on darwin with its shaky
   # sandbox

From e12f518006565b866a0e81747ef950809e9c243f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 07:12:21 +0000
Subject: [PATCH 1197/6226] filebrowser: 2.44.0 -> 2.44.1

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

diff --git a/pkgs/by-name/fi/filebrowser/package.nix b/pkgs/by-name/fi/filebrowser/package.nix
index 0836c8308748..d49639074912 100644
--- a/pkgs/by-name/fi/filebrowser/package.nix
+++ b/pkgs/by-name/fi/filebrowser/package.nix
@@ -8,7 +8,7 @@
   nixosTests,
 }:
 let
-  version = "2.44.0";
+  version = "2.44.1";
 
   pnpm = pnpm_9;
 
@@ -16,7 +16,7 @@ let
     owner = "filebrowser";
     repo = "filebrowser";
     rev = "v${version}";
-    hash = "sha256-j7V1POuF6cFpnq6UgBseHe6GxypOoj2rYrN6k2nIF8w=";
+    hash = "sha256-ln7Dst+sN99c3snPU7DrIGpwKBz/e4Lz+uOknmm6sxg=";
   };
 
   frontend = buildNpmPackage rec {

From 44aac95e050958eaa2fae07a1016bb3324aa9e06 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 07:27:04 +0000
Subject: [PATCH 1198/6226] infrastructure-agent: 1.69.0 -> 1.70.0

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

diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix
index 53ad47608461..fa772b3efc52 100644
--- a/pkgs/by-name/in/infrastructure-agent/package.nix
+++ b/pkgs/by-name/in/infrastructure-agent/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule rec {
   pname = "infrastructure-agent";
-  version = "1.69.0";
+  version = "1.70.0";
 
   src = fetchFromGitHub {
     owner = "newrelic";
     repo = "infrastructure-agent";
     rev = version;
-    hash = "sha256-6yoHx1fVDaJZsQKFSfOCau/BrB6zcT52yrLbPp8ZiKQ=";
+    hash = "sha256-VdBcVFDtPajmAAQe2aZONf0/pCMf98gtR9zoeqL1aKQ=";
   };
 
   vendorHash = "sha256-KBzckYxiQ4/nhm7ZfGQDGi5uN652oZgdc9i0UexMr24=";

From dc0378fd97cccbcfd941acea1e6f1be2c77f3964 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Tue, 21 Oct 2025 16:27:18 +0900
Subject: [PATCH 1199/6226] pixi: 0.56.0 -> 0.57.0

https://github.com/prefix-dev/pixi/releases/tag/v0.57.0
Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/pi/pixi/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix
index f6341f7f1bef..24531f410f2f 100644
--- a/pkgs/by-name/pi/pixi/package.nix
+++ b/pkgs/by-name/pi/pixi/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pixi";
-  version = "0.56.0";
+  version = "0.57.0";
 
   src = fetchFromGitHub {
     owner = "prefix-dev";
     repo = "pixi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3YVIJLzFNJ5PlgT7NnxOtyA363A+qMpQPTr1N1E2daI=";
+    hash = "sha256-nWN+SCxlDeSzbnJtSIVVYw5G2WULdzD5VQ+Jc1xnpwI=";
   };
 
-  cargoHash = "sha256-z9lsxQ08ZJ1xjhIXSP6adO+sMJk3adUKrXqKJy4MA0g=";
+  cargoHash = "sha256-YHLN6jPSsNxWQJI+uDYgfetQFnMk8v2ev/EPjSRrCJY=";
 
   nativeBuildInputs = [
     pkg-config

From 2e81cc11c6061105b92a1a8c468729e8a99b1c71 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 07:38:15 +0000
Subject: [PATCH 1200/6226] litmusctl: 1.18.0 -> 1.19.0

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

diff --git a/pkgs/by-name/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix
index 34ffa1757d9f..f7ff430fe433 100644
--- a/pkgs/by-name/li/litmusctl/package.nix
+++ b/pkgs/by-name/li/litmusctl/package.nix
@@ -9,7 +9,7 @@
 
 buildGoModule rec {
   pname = "litmusctl";
-  version = "1.18.0";
+  version = "1.19.0";
 
   nativeBuildInputs = [
     installShellFiles
@@ -23,7 +23,7 @@ buildGoModule rec {
     owner = "litmuschaos";
     repo = "litmusctl";
     rev = "${version}";
-    hash = "sha256-lfR4Nk9n6mpfQVrVoI2iaCYkJelgGi5QLdZN9n0qPVQ=";
+    hash = "sha256-0fHkUKU1MwvPuM+20dH7W/GFdhzY+avgCufpKEDnPZQ=";
   };
 
   vendorHash = "sha256-7FYOQ89aUFPX+5NCPYKg+YGCXstQ6j9DK4V2mCgklu0=";

From e687f1f5936fa6123c07e2dbf010c3f6b61a64dd Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Tue, 21 Oct 2025 09:40:37 +0200
Subject: [PATCH 1201/6226] dsview: fix build with cmake 4

---
 .../science/electronics/dsview/cmake4.patch         | 13 +++++++++++++
 .../science/electronics/dsview/default.nix          |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/applications/science/electronics/dsview/cmake4.patch

diff --git a/pkgs/applications/science/electronics/dsview/cmake4.patch b/pkgs/applications/science/electronics/dsview/cmake4.patch
new file mode 100644
index 000000000000..b9674dc7d01c
--- /dev/null
+++ b/pkgs/applications/science/electronics/dsview/cmake4.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index d12bd0db..f904000b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -19,7 +19,7 @@
+ ## along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ ##
+ 
+-cmake_minimum_required(VERSION 2.8.6)
++cmake_minimum_required(VERSION 3.10)
+ 
+ project(DSView)
+ 
diff --git a/pkgs/applications/science/electronics/dsview/default.nix b/pkgs/applications/science/electronics/dsview/default.nix
index 379cd27af0b9..17b1a69380ae 100644
--- a/pkgs/applications/science/electronics/dsview/default.nix
+++ b/pkgs/applications/science/electronics/dsview/default.nix
@@ -31,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     # Fix absolute install paths
     ./install.patch
+    ./cmake4.patch
   ];
 
   # /build/source/libsigrok4DSL/strutil.c:343:19: error: implicit declaration of function 'strcasecmp'; did you mean 'g_strcasecmp'? []

From d08e570bb45d396671aa0b6ff554bd2a3831bdd8 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 21 Oct 2025 10:43:44 +0300
Subject: [PATCH 1202/6226] qt6.qtdeclarative: backport fix for another common
 crash

---
 .../libraries/qt-6/modules/qtdeclarative/default.nix        | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
index 5578dc8a8236..91671df7294b 100644
--- a/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
@@ -42,6 +42,12 @@ qtModule {
       url = "https://invent.kde.org/qt/qt/qtdeclarative/-/commit/2b7f93da38d41ffaeb5322a7dca40ec26fc091a1.diff";
       hash = "sha256-AOXey18lJlswpZ8tpTTZeFb0VE9k1louXy8TPPGNiA4=";
     })
+    # Fix another common crash
+    # https://bugreports.qt.io/browse/QTBUG-139626
+    (fetchpatch {
+      url = "https://invent.kde.org/qt/qt/qtdeclarative/-/commit/0de0b0ffdb44d73c605e20f00934dfb44bdf7ad9.diff";
+      hash = "sha256-DCoaSxH1MgywGXmmK21LLzCBi2KAmJIv5YKpFS6nw7M=";
+    })
   ];
 
   cmakeFlags = [

From 3d5c8f5e6be42cca034d94fcdbb21d31d1a63022 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 07:56:13 +0000
Subject: [PATCH 1203/6226] kas: 4.8.2 -> 5.0

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

diff --git a/pkgs/by-name/ka/kas/package.nix b/pkgs/by-name/ka/kas/package.nix
index 870028924c99..13c8b6c8a5e2 100644
--- a/pkgs/by-name/ka/kas/package.nix
+++ b/pkgs/by-name/ka/kas/package.nix
@@ -8,14 +8,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "kas";
-  version = "4.8.2";
+  version = "5.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "siemens";
     repo = "kas";
     tag = version;
-    hash = "sha256-mDfGiWZKipbaXxlyx8JWeFvSyE44FcumYD9Pr/38UBQ=";
+    hash = "sha256-KSmLQBOYyuO9o3YZYPJPDPeGudtNYIC2yghAu98sf3Q=";
   };
 
   patches = [ ./pass-terminfo-env.patch ];

From b0bc8faca25e15f5d227035b34289a4b25d2f9c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 07:58:54 +0000
Subject: [PATCH 1204/6226] riffdiff: 3.4.1 -> 3.5.0

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

diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix
index 7d066f224410..98fc4ccfb2f6 100644
--- a/pkgs/by-name/ri/riffdiff/package.nix
+++ b/pkgs/by-name/ri/riffdiff/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "riffdiff";
-  version = "3.4.1";
+  version = "3.5.0";
 
   src = fetchFromGitHub {
     owner = "walles";
     repo = "riff";
     tag = version;
-    hash = "sha256-IpEgWbmWFW4X09EeAfWadncH4ptzSom2+7kvh8h3hcM=";
+    hash = "sha256-qA20sLiGqDtIPWBNww+WXM5AG162RPTdkUPoJ0PLiYY=";
   };
 
-  cargoHash = "sha256-I0hBh9FFoy+RhEUAHfgQa+UiSgOS0mYJy+2W/0/9kG4=";
+  cargoHash = "sha256-omwKOstRXIAUDgLUFqmtxu77JJzAOASzbjLEImad1cE=";
 
   passthru = {
     tests.version = testers.testVersion { package = riffdiff; };

From 96be3f19b480296350027787acdad131daef014e Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Tue, 21 Oct 2025 16:59:54 +0900
Subject: [PATCH 1205/6226] nixos/rtkit: harden systemd service

---
 nixos/modules/security/rtkit.nix | 43 +++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/security/rtkit.nix b/nixos/modules/security/rtkit.nix
index a5916f1173b7..d7c6df17f03b 100644
--- a/nixos/modules/security/rtkit.nix
+++ b/nixos/modules/security/rtkit.nix
@@ -57,10 +57,45 @@ in
     systemd.packages = [ package ];
 
     systemd.services.rtkit-daemon = {
-      serviceConfig.ExecStart = [
-        "" # Resets command from upstream unit.
-        "${package}/libexec/rtkit-daemon ${utils.escapeSystemdExecArgs cfg.args}"
-      ];
+      serviceConfig = {
+        ExecStart = [
+          "" # Resets command from upstream unit.
+          "${package}/libexec/rtkit-daemon ${utils.escapeSystemdExecArgs cfg.args}"
+        ];
+
+        # Needs to verify the user of the processes.
+        PrivateUsers = "full";
+        # Needs to access other processes to modify their scheduling modes.
+        ProcSubset = "all";
+        ProtectProc = "default";
+        # Canary needs to be realtime.
+        RestrictRealtime = false;
+
+        LockPersonality = true;
+        MemoryDenyWriteExecute = true;
+        NoNewPrivileges = true;
+        PrivateDevices = true;
+        PrivateTmp = "disconnected";
+        ProtectClock = true;
+        ProtectControlGroups = "strict";
+        ProtectHome = true;
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectSystem = "strict";
+        RemoveIPC = true;
+        RestrictAddressFamilies = [ "AF_UNIX" ];
+        IPAddressDeny = "any";
+        RestrictNamespaces = true;
+        RestrictSUIDSGID = true;
+        SystemCallArchitectures = "native";
+        SystemCallFilter = [
+          "@system-service"
+          "@mount" # Needs chroot(1)
+        ];
+        UMask = "0777";
+      };
     };
 
     users.users.rtkit = {

From 8598b9e738dbb56e6081f8df6e88ce6d8db8a74a Mon Sep 17 00:00:00 2001
From: griffi-gh <prasol258@gmail.com>
Date: Thu, 16 Oct 2025 12:23:18 +0200
Subject: [PATCH 1206/6226] framework-tool-tui: init at 0.5.1

---
 .../by-name/fr/framework-tool-tui/package.nix | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 pkgs/by-name/fr/framework-tool-tui/package.nix

diff --git a/pkgs/by-name/fr/framework-tool-tui/package.nix b/pkgs/by-name/fr/framework-tool-tui/package.nix
new file mode 100644
index 000000000000..df7402cb8877
--- /dev/null
+++ b/pkgs/by-name/fr/framework-tool-tui/package.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  udev,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "framework-tool-tui";
+  version = "0.5.1";
+
+  src = fetchFromGitHub {
+    owner = "grouzen";
+    repo = "framework-tool-tui";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-R4/VeymmthI96PJt7XsKRYz1Y8QW/lV90HvJgt+e+hI=";
+  };
+
+  cargoHash = "sha256-tDNYkV5MWb4+co/gwjpAt/M7yJbEWrryieJoBuXmY8M=";
+
+  nativeBuildInputs = [ pkg-config ];
+  buildInputs = [ udev ];
+
+  meta = {
+    description = "TUI for controlling and monitoring Framework Computers hardware";
+    longDescription = ''
+      A snappy TUI dashboard for controlling and monitoring your Framework Laptop hardware —
+      charging, privacy, lighting, USB PD ports, and more.
+    '';
+    homepage = "https://github.com/grouzen/framework-tool-tui";
+    changelog = "https://github.com/grouzen/framework-tool-tui/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    platforms = [ "x86_64-linux" ];
+    maintainers = with lib.maintainers; [
+      griffi-gh
+      autra
+    ];
+    mainProgram = "framework-tool-tui";
+  };
+})

From a3027c40b45a4e28ac9093944544505b273831d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 08:05:42 +0000
Subject: [PATCH 1207/6226] txtpbfmt: 0-unstable-2025-10-15 ->
 0-unstable-2025-10-16

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

diff --git a/pkgs/by-name/tx/txtpbfmt/package.nix b/pkgs/by-name/tx/txtpbfmt/package.nix
index 2d2eb20b2817..b9ff82ddf66e 100644
--- a/pkgs/by-name/tx/txtpbfmt/package.nix
+++ b/pkgs/by-name/tx/txtpbfmt/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule {
   pname = "txtpbfmt";
-  version = "0-unstable-2025-10-15";
+  version = "0-unstable-2025-10-16";
 
   src = fetchFromGitHub {
     owner = "protocolbuffers";
     repo = "txtpbfmt";
-    rev = "0b0c2708cf8453209ac9864099a502d5d1723ee4";
-    hash = "sha256-d6fT98Po7c+ZIwn3UG4JlsLRVjurnE0htrCUzM9sxGk=";
+    rev = "16587c79cd916daf09ade0a7d72e6a5de7c81f81";
+    hash = "sha256-3rzsw6CvN8mzjRM8OCDNvVquQNx+82NPeHizNOF+g54=";
   };
 
   vendorHash = "sha256-aeYa7a/oKH2dxXHRkkqyh7f04citRDGQxAaKQTJst4o=";

From 7a9cf477c4d4b08fe5bb4ce781a73af0bb2b9535 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 05:06:43 -0300
Subject: [PATCH 1208/6226] chrome-pak-customizer: fix build with cmake4

---
 pkgs/by-name/ch/chrome-pak-customizer/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ch/chrome-pak-customizer/package.nix b/pkgs/by-name/ch/chrome-pak-customizer/package.nix
index 26f5711143f6..4788ec02120a 100644
--- a/pkgs/by-name/ch/chrome-pak-customizer/package.nix
+++ b/pkgs/by-name/ch/chrome-pak-customizer/package.nix
@@ -34,6 +34,11 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "Simple batch tool to customize pak files in chrome or chromium-based browser";
     homepage = "https://github.com/myfreeer/chrome-pak-customizer";

From dc9f8c43809f6ca27b30bb80f03092077a675f61 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 21 Oct 2025 11:13:50 +0300
Subject: [PATCH 1209/6226] haskellPackages.hsqml: fix eval

qt5Full is removed, and the thing is broken anyway, but hopefully this is correct and it
at least unblocks the channels.
---
 pkgs/development/haskell-modules/configuration-nix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix
index 77aa797f0ff5..74c5f2a2b3c9 100644
--- a/pkgs/development/haskell-modules/configuration-nix.nix
+++ b/pkgs/development/haskell-modules/configuration-nix.nix
@@ -580,7 +580,7 @@ builtins.intersectAttrs super {
   gi-gtk-declarative = dontCheck super.gi-gtk-declarative;
   gi-gtk-declarative-app-simple = dontCheck super.gi-gtk-declarative-app-simple;
   hsqml = dontCheck (
-    addExtraLibraries [ pkgs.libGLU pkgs.libGL ] (super.hsqml.override { qt5 = pkgs.qt5Full; })
+    addExtraLibraries [ pkgs.libGLU pkgs.libGL ] (super.hsqml.override { qt5 = pkgs.qt5.qtbase; })
   );
   monomer = dontCheck super.monomer;
 

From b107672c184e48ffcd0cc6d0e194bc756aa5badd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 08:27:29 +0000
Subject: [PATCH 1210/6226] reindeer: 2025.10.13.00 -> 2025.10.20.00

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

diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix
index b9416eb4ddad..f625eb94e134 100644
--- a/pkgs/by-name/re/reindeer/package.nix
+++ b/pkgs/by-name/re/reindeer/package.nix
@@ -9,13 +9,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "reindeer";
-  version = "2025.10.13.00";
+  version = "2025.10.20.00";
 
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "reindeer";
     tag = "v${version}";
-    hash = "sha256-jbxTHu8IoUsQMkH2u82T6XsRKto7Z3ehEOAL9v0WGxE=";
+    hash = "sha256-SHJIDFhK5y+XxOS76pbSXW8Hr1Y5g0uhSw4km5usIsM=";
   };
 
   cargoHash = "sha256-XTp0GaqJhNf6auZzdv0+aGgIJ6hh3027EqPr90nWB3I=";

From 3eca6bf120f315b1971142d3130241c117707146 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Mon, 20 Oct 2025 23:12:46 +0200
Subject: [PATCH 1211/6226] matomo: 5.4.0 -> 5.5.1

https://matomo.org/changelog/matomo-5-5-0/
https://matomo.org/changelog/matomo-5-5-1/
---
 pkgs/by-name/ma/matomo/change-path-geoip2-5.x.patch | 2 +-
 pkgs/by-name/ma/matomo/package.nix                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/matomo/change-path-geoip2-5.x.patch b/pkgs/by-name/ma/matomo/change-path-geoip2-5.x.patch
index 601e0815cb6e..50847feaf2de 100644
--- a/pkgs/by-name/ma/matomo/change-path-geoip2-5.x.patch
+++ b/pkgs/by-name/ma/matomo/change-path-geoip2-5.x.patch
@@ -6,5 +6,5 @@
  return [
 -    'path.geoip2' => Piwik\DI::string('{path.root}/misc/'),
 +    'path.geoip2' => PIWIK_USER_PATH . '/misc/',
-     'geopip2.ispEnabled' => true
+     'geopip2.ispEnabled' => true,
  ];
diff --git a/pkgs/by-name/ma/matomo/package.nix b/pkgs/by-name/ma/matomo/package.nix
index 53c7fcc46ff4..8887491f8e78 100644
--- a/pkgs/by-name/ma/matomo/package.nix
+++ b/pkgs/by-name/ma/matomo/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "matomo";
-  version = "5.4.0";
+  version = "5.5.1";
 
   src = fetchurl {
     url = "https://builds.matomo.org/matomo-${finalAttrs.version}.tar.gz";
-    hash = "sha256-PRZYqJBebDsjeT9WBArRX3GKFbW5TtejV2FOo8jjaMU=";
+    hash = "sha256-aL2mz7qyDT43Ez2BFzrdPyQX9/m3FUfz7copwa7u/zs=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 782d2b48c3ab835728014bc45f63845dbc436fc8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 08:32:18 +0000
Subject: [PATCH 1212/6226] python3Packages.google-cloud-workflows: 1.18.2 ->
 1.19.0

---
 .../python-modules/google-cloud-workflows/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-workflows/default.nix b/pkgs/development/python-modules/google-cloud-workflows/default.nix
index 09c61243b19c..d54d22e75f9f 100644
--- a/pkgs/development/python-modules/google-cloud-workflows/default.nix
+++ b/pkgs/development/python-modules/google-cloud-workflows/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-workflows";
-  version = "1.18.2";
+  version = "1.19.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_workflows";
     inherit version;
-    hash = "sha256-S7k2QZv+EQyfZ6RjG+NA/+a9IBQpnMTE+TIbXlIC1N8=";
+    hash = "sha256-SODiguyX82EPPvm3wvRp7tAcArNINmc9c1+WkkKPNHE=";
   };
 
   build-system = [ setuptools ];

From f6a4e3502e0494e0c7b975707faee2ba618ca5bd Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Tue, 21 Oct 2025 10:51:12 +0200
Subject: [PATCH 1213/6226] slade: 3.2.7 -> 3.2.8

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

diff --git a/pkgs/by-name/sl/slade/package.nix b/pkgs/by-name/sl/slade/package.nix
index d01793cdd99c..db8fbf298497 100644
--- a/pkgs/by-name/sl/slade/package.nix
+++ b/pkgs/by-name/sl/slade/package.nix
@@ -11,23 +11,23 @@
   sfml_2,
   fluidsynth,
   curl,
-  freeimage,
   ftgl,
   glew,
   lua,
   mpg123,
   wrapGAppsHook3,
+  libwebp,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "slade";
-  version = "3.2.7";
+  version = "3.2.8";
 
   src = fetchFromGitHub {
     owner = "sirjuddington";
     repo = "SLADE";
     tag = finalAttrs.version;
-    hash = "sha256-+i506uzO2q/9k7en6CKs4ui9gjszrMOYwW+V9W5Lvns=";
+    hash = "sha256-skJpcxLSInAzBHGtxdTWAqocXQKKQY7vJfUx8ZAlMqc=";
   };
 
   nativeBuildInputs = [
@@ -44,11 +44,11 @@ stdenv.mkDerivation (finalAttrs: {
     sfml_2
     fluidsynth
     curl
-    freeimage
     ftgl
     glew
     lua
     mpg123
+    libwebp
   ];
 
   cmakeFlags = [

From 6aafe72232f8edffecd661d29b02b1e8d0c330a6 Mon Sep 17 00:00:00 2001
From: Abdelrahman Abdelhafez <hi@abdelrahman.sh>
Date: Tue, 21 Oct 2025 10:41:17 +0200
Subject: [PATCH 1214/6226] nixos/postfix: fix removed option's replacement
 instructions

The replacement instructions for the removed services.postfix.extraConfig option suggests using the services.postfix.extraConfig option instead, which doesn't exist.
---
 nixos/modules/services/mail/postfix.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix
index 9715c8645dc3..bdfc53c83767 100644
--- a/nixos/modules/services/mail/postfix.nix
+++ b/nixos/modules/services/mail/postfix.nix
@@ -1243,7 +1243,7 @@ in
       "services.postfix.relayPort was removed in favor of services.postfix.settings.main.relayhost, which now takes a list of host:port."
     )
     (lib.mkRemovedOptionModule [ "services" "postfix" "extraConfig" ]
-      "services.postfix.extraConfig was replaced by the structured freeform service.postfix.settings.main option."
+      "services.postfix.extraConfig was replaced by the structured freeform services.postfix.settings.main option."
     )
     (lib.mkRenamedOptionModule
       [ "services" "postfix" "networks" ]

From eeedb0d9d6b9c2a949ced07aea9843ccb31e7647 Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Mon, 20 Oct 2025 17:58:01 +0200
Subject: [PATCH 1215/6226] containerlabs: 0.70.2 -> 0.71.0

Release: https://github.com/srl-labs/containerlab/releases/tag/v0.71.0
Changes: https://github.com/srl-labs/containerlab/compare/v0.70.2...v0.71.0

- adopt package
---
 pkgs/by-name/co/containerlab/package.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix
index f0f2b220ecab..29a2eadcdbc0 100644
--- a/pkgs/by-name/co/containerlab/package.nix
+++ b/pkgs/by-name/co/containerlab/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "containerlab";
-  version = "0.70.2";
+  version = "0.71.0";
 
   src = fetchFromGitHub {
     owner = "srl-labs";
     repo = "containerlab";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QBv0SZ7XxVc0yWbOxPKdfzk9AKYlMJyeZwpAx1jbamk=";
+    hash = "sha256-wfkkRQ0F8G57pEuyLP1qjoZGkDNW/Ix4Nh3ZKoWK+w8=";
   };
 
-  vendorHash = "sha256-XttJ/GXhNKVHLR33A/o3N3OYHsyKWHBhD5QOz0AlfFk=";
+  vendorHash = "sha256-s5WBCYOdNooygEL0AbhIqZLeWd4gnpAvWjJu38QTKYU=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -37,9 +37,10 @@ buildGoModule (finalAttrs: {
     export USER="runner"
   '';
 
-  # TestVerifyLinks wants to use docker.sock which is not available in the Nix build env
-  # KernelModulesLoaded wants to use /proc/modules which is not available in Nix build env
   checkFlags = [
+    # Not available in sandbox:
+    # - docker.sock needed for TestVerifyLinks
+    # - /proc/modules needed for KernelModulesLoaded
     "-skip=^TestVerifyLinks$|^TestIsKernelModuleLoaded$"
   ];
 
@@ -60,7 +61,7 @@ buildGoModule (finalAttrs: {
     changelog = "https://github.com/srl-labs/containerlab/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.linux;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ _0x4A6F ];
     mainProgram = "containerlab";
   };
 })

From 1439a850c605ca7cd4c8243a42c84a13f5357e2b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 21 Oct 2025 07:25:50 +0000
Subject: [PATCH 1216/6226] python3Packages.mercantile: cleanup

---
 .../python-modules/mercantile/default.nix     | 61 +++++++++++++++++--
 1 file changed, 55 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix
index 9d8f59cbef96..3d8485817d09 100644
--- a/pkgs/development/python-modules/mercantile/default.nix
+++ b/pkgs/development/python-modules/mercantile/default.nix
@@ -2,7 +2,14 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   click,
+
+  # tests
   pytestCheckHook,
   hypothesis,
 }:
@@ -10,27 +17,69 @@
 buildPythonPackage rec {
   pname = "mercantile";
   version = "1.2.1";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mapbox";
     repo = "mercantile";
-    rev = version;
+    tag = version;
     hash = "sha256-DiDXO2XnD3We6NhP81z7aIHzHrHDi/nkqy98OT9986w=";
   };
 
-  propagatedBuildInputs = [ click ];
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    click
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook
     hypothesis
   ];
 
-  meta = with lib; {
+  disabledTests = [
+    "test_cli_bounding_tile"
+    "test_cli_bounding_tile2"
+    "test_cli_bounding_tile_bbox"
+    "test_cli_bounding_tile_geosjon"
+    "test_cli_children"
+    "test_cli_multi_bounding_tile"
+    "test_cli_multi_bounding_tile_seq"
+    "test_cli_neighbors"
+    "test_cli_parent"
+    "test_cli_parent_depth"
+    "test_cli_parent_failure"
+    "test_cli_parent_multidepth"
+    "test_cli_quadkey_from_mixed"
+    "test_cli_quadkey_from_quadkeys"
+    "test_cli_quadkey_from_tiles"
+    "test_cli_shapes"
+    "test_cli_shapes_collect"
+    "test_cli_shapes_compact"
+    "test_cli_shapes_failure"
+    "test_cli_shapes_indentation"
+    "test_cli_strict_overlap_contain"
+    "test_cli_tiles_bad_bounds"
+    "test_cli_tiles_bounding_tiles_seq"
+    "test_cli_tiles_bounding_tiles_z0"
+    "test_cli_tiles_geosjon"
+    "test_cli_tiles_implicit_stdin"
+    "test_cli_tiles_multi_bounds"
+    "test_cli_tiles_multi_bounds_seq"
+    "test_cli_tiles_no_bounds"
+    "test_cli_tiles_point_geojson"
+    "test_cli_tiles_points"
+    "test_cli_tiles_seq"
+  ];
+
+  meta = {
     description = "Spherical mercator tile and coordinate utilities";
     mainProgram = "mercantile";
     homepage = "https://github.com/mapbox/mercantile";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ sikmir ];
+    changelog = "https://github.com/mapbox/mercantile/blob/${version}/CHANGES.txt";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ sikmir ];
   };
 }

From 596e5dbd1106264c3fa7d96229a7c3d5640caaca Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 21 Oct 2025 09:23:38 +0000
Subject: [PATCH 1217/6226] python3Packages.mercantile: skip failing tests

Introduced by https://github.com/NixOS/nixpkgs/pull/448189
---
 pkgs/development/python-modules/mercantile/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix
index 3d8485817d09..61357b3a7ad6 100644
--- a/pkgs/development/python-modules/mercantile/default.nix
+++ b/pkgs/development/python-modules/mercantile/default.nix
@@ -40,6 +40,8 @@ buildPythonPackage rec {
   ];
 
   disabledTests = [
+    # AssertionError CLI exists with non-zero error code
+    # This is a regression introduced by https://github.com/NixOS/nixpkgs/pull/448189
     "test_cli_bounding_tile"
     "test_cli_bounding_tile2"
     "test_cli_bounding_tile_bbox"

From dfc593b315628463ad1005c844ad962d95ef9d51 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 21 Oct 2025 09:24:44 +0000
Subject: [PATCH 1218/6226] python3Packages.mercantile: add versionCheckHook

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

diff --git a/pkgs/development/python-modules/mercantile/default.nix b/pkgs/development/python-modules/mercantile/default.nix
index 61357b3a7ad6..0c825469ed6e 100644
--- a/pkgs/development/python-modules/mercantile/default.nix
+++ b/pkgs/development/python-modules/mercantile/default.nix
@@ -10,8 +10,9 @@
   click,
 
   # tests
-  pytestCheckHook,
   hypothesis,
+  pytestCheckHook,
+  versionCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -35,9 +36,11 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    pytestCheckHook
     hypothesis
+    pytestCheckHook
+    versionCheckHook
   ];
+  versionCheckProgramArg = "--version";
 
   disabledTests = [
     # AssertionError CLI exists with non-zero error code

From b121e29725a64585549b9cd87ff3c4a1218f8490 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 21 Oct 2025 09:28:54 +0000
Subject: [PATCH 1219/6226] air-formatter: 0.7.1 -> 0.8.0

Diff: https://github.com/posit-dev/air/compare/0.7.1...0.8.0

Changelog: https://github.com/posit-dev/air/blob/0.8.0/CHANGELOG.md
---
 pkgs/by-name/ai/air-formatter/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ai/air-formatter/package.nix b/pkgs/by-name/ai/air-formatter/package.nix
index 4d8bc5240a7e..e36ffb8c68c4 100644
--- a/pkgs/by-name/ai/air-formatter/package.nix
+++ b/pkgs/by-name/ai/air-formatter/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "air-formatter";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "posit-dev";
     repo = "air";
     tag = finalAttrs.version;
-    hash = "sha256-FGucu5emmBtxVloun7Kh+MWKZDYdKw+75L7g3GqQ7Tw=";
+    hash = "sha256-LNU//dQico54GhZdehynEuukfGuU8rQvfFO4zvRsZL0=";
   };
 
-  cargoHash = "sha256-+cksQnHNXGyqbu+CoGhCEmQux7zfLIt5K5rWABfppDo=";
+  cargoHash = "sha256-9HRDUTYzKLYuh9KCcnvPXB6gDKcht79TOZZ3ze9+gbg=";
 
   useNextest = true;
 

From c096940dd2fb69d51fa0ccd452b9b70ccfa34c4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 09:40:05 +0000
Subject: [PATCH 1220/6226] eduke32: 0-unstable-2025-09-13 ->
 0-unstable-2025-10-17

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

diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix
index 84fa68acfff0..5b449a5416a6 100644
--- a/pkgs/by-name/ed/eduke32/package.nix
+++ b/pkgs/by-name/ed/eduke32/package.nix
@@ -27,14 +27,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "eduke32";
-  version = "0-unstable-2025-09-13";
+  version = "0-unstable-2025-10-17";
 
   src = fetchFromGitLab {
     domain = "voidpoint.io";
     owner = "terminx";
     repo = "eduke32";
-    rev = "e5aad188685d005f8ad65478384693fc0dc0c83f";
-    hash = "sha256-0iICExzsw/l/QjGJDJ6X+08+dzwsA+6tjaOWKNrXsjs=";
+    rev = "227c11dee0abaa57bbc22b06f0002e064efa7191";
+    hash = "sha256-bWty/eOq5dWltNREo9ba68pWDpBxOIfjJK1EtZ27l1U=";
     deepClone = true;
     leaveDotGit = true;
     postFetch = ''

From 2511df88a1fc12a7f11ba6137ba94fdac0ee887b Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 05:19:38 -0300
Subject: [PATCH 1221/6226] ciftilib: fix build with cmake4

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

diff --git a/pkgs/by-name/ci/ciftilib/package.nix b/pkgs/by-name/ci/ciftilib/package.nix
index 83a58b6bc351..a9c37a0f4f0b 100644
--- a/pkgs/by-name/ci/ciftilib/package.nix
+++ b/pkgs/by-name/ci/ciftilib/package.nix
@@ -38,11 +38,19 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "CMAKE_POLICY(VERSION 2.8.7)" "CMAKE_POLICY(VERSION 3.10)" \
+      --replace-fail "CMAKE_POLICY(SET CMP0045 OLD)" ""
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/Washington-University/CiftiLib";
     description = "Library for reading and writing CIFTI files";
     maintainers = with maintainers; [ bcdarwin ];
     platforms = platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin;
     license = licenses.bsd2;
   };
 }

From de60b9827c49f2b3f96b02a0cd3a0dcd03a685c3 Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Mon, 20 Oct 2025 18:43:41 +0200
Subject: [PATCH 1222/6226] python3Packages.stringzilla: fix build on
 `aarch64-linux`

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

diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix
index 05edc2fdf6c5..35876032eea4 100644
--- a/pkgs/development/python-modules/stringzilla/default.nix
+++ b/pkgs/development/python-modules/stringzilla/default.nix
@@ -21,6 +21,10 @@ buildPythonPackage rec {
     hash = "sha256-0CIekVxChvH912vFnBF2FR1YyIpxi3SD7KhBlh7yFGA=";
   };
 
+  # Define _POSIX_C_SOURCE to enable POSIX signal handling for ARM capability detection
+  # See: https://github.com/ashvardanian/StringZilla/pull/263
+  env.NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE=200809L";
+
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     # error: unsupported option '-mfloat-abi=' for target 'aarch64-apple-darwin'
     substituteInPlace setup.py \

From 9a940ebc36e573c11236836bbdebb23b96b65437 Mon Sep 17 00:00:00 2001
From: Nina Fromm <nina.fromm@cyberus-technology.de>
Date: Tue, 21 Oct 2025 11:43:26 +0200
Subject: [PATCH 1223/6226] team-list: add e1mo to cyberus team

---
 maintainers/team-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 9708249e5fdb..7b064b84501b 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -309,6 +309,7 @@ with lib.maintainers;
       xanderio
       blitz
       snu
+      e1mo
     ];
     scope = "Team for Cyberus Technology employees who collectively maintain packages.";
     shortName = "Cyberus Technology employees";

From 35383f5d629d29f667e1b383f20ad806ccaf0581 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 05:00:18 -0300
Subject: [PATCH 1224/6226] chewing-editor: 0.1.1 -> 0.1.2

---
 .../misc/chewing-editor/default.nix           | 25 ++++++++++++-------
 1 file changed, 16 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/misc/chewing-editor/default.nix b/pkgs/applications/misc/chewing-editor/default.nix
index 77a3f7228a1a..1f38613ce6cf 100644
--- a/pkgs/applications/misc/chewing-editor/default.nix
+++ b/pkgs/applications/misc/chewing-editor/default.nix
@@ -1,46 +1,53 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
+  gtest,
   cmake,
   pkg-config,
   libchewing,
+  qt5,
   qtbase,
   qttools,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "chewing-editor";
-  version = "0.1.1";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "chewing";
     repo = "chewing-editor";
-    rev = version;
-    sha256 = "0kc2hjx1gplm3s3p1r5sn0cyxw3k1q4gyv08q9r6rs4sg7xh2w7w";
+    tag = version;
+    hash = "sha256-gF3OotO/xb3Dc0YjVwAKIYnuEPIrgjpGR2tdjOBT4aI=";
   };
 
   doCheck = true;
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     cmake
     pkg-config
+    qt5.wrapQtAppsHook
   ];
   buildInputs = [
+    gtest
     libchewing
     qtbase
     qttools
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Cross platform chewing user phrase editor";
     mainProgram = "chewing-editor";
     longDescription = ''
       chewing-editor is a cross platform chewing user phrase editor. It provides a easy way to manage user phrase. With it, user can customize their user phrase to increase input performance.
     '';
     homepage = "https://github.com/chewing/chewing-editor";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.ShamrockLee ];
-    platforms = platforms.all;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ ShamrockLee ];
+    platforms = lib.platforms.all;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From 025236c80b0539963a17680c9cee01112335ebe0 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 21 Oct 2025 12:34:55 +0300
Subject: [PATCH 1225/6226] rssguard: refer to Qt packages properly

---
 pkgs/by-name/rs/rssguard/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/rs/rssguard/package.nix b/pkgs/by-name/rs/rssguard/package.nix
index 8eed1049eac5..3c25b7e3c025 100644
--- a/pkgs/by-name/rs/rssguard/package.nix
+++ b/pkgs/by-name/rs/rssguard/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  qt6,
   kdePackages,
   wrapGAppsHook4,
 }:
@@ -19,15 +20,17 @@ stdenv.mkDerivation rec {
   };
 
   buildInputs = [
-    kdePackages.qtwebengine
-    kdePackages.qttools
+    qt6.qtbase
+    qt6.qtmultimedia
+    qt6.qtwebengine
+    qt6.qttools
+    qt6.qt5compat
     kdePackages.mpvqt
-    kdePackages.full
   ];
   nativeBuildInputs = [
     cmake
     wrapGAppsHook4
-    kdePackages.wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
   cmakeFlags = with lib; [
     (cmakeFeature "CMAKE_BUILD_TYPE" "\"Release\"")

From 81c0759bd1ff8dc6216673382f0a3026e2c2944c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 21 Oct 2025 12:35:07 +0300
Subject: [PATCH 1226/6226] rssguard: don't double wrap

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

diff --git a/pkgs/by-name/rs/rssguard/package.nix b/pkgs/by-name/rs/rssguard/package.nix
index 3c25b7e3c025..700967b0557b 100644
--- a/pkgs/by-name/rs/rssguard/package.nix
+++ b/pkgs/by-name/rs/rssguard/package.nix
@@ -36,6 +36,12 @@ stdenv.mkDerivation rec {
     (cmakeFeature "CMAKE_BUILD_TYPE" "\"Release\"")
   ];
 
+  dontWrapGApps = true;
+
+  preFixup = ''
+    qtWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
   meta = {
     description = "Simple RSS/Atom feed reader with online synchronization";
     mainProgram = "rssguard";

From 699f3b3fd85abc0594da688ce891f3502ca15e43 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 21 Oct 2025 12:35:14 +0300
Subject: [PATCH 1227/6226] cudaPackages.nsight_compute: don't use qt6.full

---
 pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix b/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
index 2865b0e2fecc..bc7c5f1784db 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
@@ -32,7 +32,7 @@ in
     ++ [
       qtwayland
       qtwebview
-      (qt6.qtwebengine or qt6.full)
+      qt6.qtwebengine
       rdma-core
     ]
     ++ lib.optionals (cudaOlder "12.7") [

From 99fe7bea35ed3ca8de66188d2337cb3e7c6e83e7 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 21 Oct 2025 12:35:57 +0300
Subject: [PATCH 1228/6226] cudaPackages.nsight_systems: don't use qt6.full

---
 .../cuda-modules/_cuda/fixups/nsight_systems.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix b/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
index 9983f880b58b..2967fa89470a 100644
--- a/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
+++ b/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
@@ -87,14 +87,14 @@ in
   buildInputs =
     prevAttrs.buildInputs or [ ]
     ++ [
-      (qt6.qtdeclarative or qt6.full)
-      (qt6.qtsvg or qt6.full)
-      (qt6.qtimageformats or qt6.full)
-      (qt6.qtpositioning or qt6.full)
-      (qt6.qtscxml or qt6.full)
-      (qt6.qttools or qt6.full)
-      (qt6.qtwebengine or qt6.full)
-      (qt6.qtwayland or qt6.full)
+      qt6.qtdeclarative
+      qt6.qtsvg
+      qt6.qtimageformats
+      qt6.qtpositioning
+      qt6.qtscxml
+      qt6.qttools
+      qt6.qtwebengine
+      qt6.qtwayland
       boost178
       cuda_cudart.stubs
       e2fsprogs

From 8625370c5e3eb3f54d919620d3bc2e95deb22ea8 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 18 Sep 2025 19:21:24 +0300
Subject: [PATCH 1229/6226] kdePackages: metadata update

---
 pkgs/kde/frameworks/kio/default.nix           |   2 +
 pkgs/kde/frameworks/kwallet/default.nix       |   2 +
 .../gear/kdenetwork-filesharing/default.nix   |   8 +-
 pkgs/kde/gear/kontrast/default.nix            |   2 -
 pkgs/kde/gear/okular/default.nix              |   3 +
 pkgs/kde/generated/dependencies.json          | 109 +++++++++++++-----
 pkgs/kde/generated/licenses.json              |  35 ++++--
 pkgs/kde/generated/projects.json              |  22 +++-
 .../applet-window-buttons6/default.nix        |   2 +
 .../inputmethods/fcitx5/fcitx5-configtool.nix |   2 +
 10 files changed, 146 insertions(+), 41 deletions(-)

diff --git a/pkgs/kde/frameworks/kio/default.nix b/pkgs/kde/frameworks/kio/default.nix
index 3e6e6ab0ec74..f2ee6fb684e3 100644
--- a/pkgs/kde/frameworks/kio/default.nix
+++ b/pkgs/kde/frameworks/kio/default.nix
@@ -2,6 +2,7 @@
   mkKdeDerivation,
   qt5compat,
   qttools,
+  kauth,
   acl,
   attr,
 }:
@@ -16,6 +17,7 @@ mkKdeDerivation {
   extraBuildInputs = [
     qt5compat
     qttools
+    kauth
     acl
     attr
   ];
diff --git a/pkgs/kde/frameworks/kwallet/default.nix b/pkgs/kde/frameworks/kwallet/default.nix
index 3ba43cd40e3e..6f78a1b9d4fe 100644
--- a/pkgs/kde/frameworks/kwallet/default.nix
+++ b/pkgs/kde/frameworks/kwallet/default.nix
@@ -1,6 +1,7 @@
 {
   mkKdeDerivation,
   pkg-config,
+  gpgme,
   libgcrypt,
   libsecret,
   kdoctools,
@@ -13,6 +14,7 @@ mkKdeDerivation {
   ];
 
   extraBuildInputs = [
+    gpgme
     libgcrypt
     libsecret
     kdoctools
diff --git a/pkgs/kde/gear/kdenetwork-filesharing/default.nix b/pkgs/kde/gear/kdenetwork-filesharing/default.nix
index 597cb8cc80de..b72f4af7b955 100644
--- a/pkgs/kde/gear/kdenetwork-filesharing/default.nix
+++ b/pkgs/kde/gear/kdenetwork-filesharing/default.nix
@@ -2,9 +2,10 @@
   lib,
   mkKdeDerivation,
   replaceVars,
+  qtdeclarative,
+  kauth,
   samba,
   shadow,
-  qtdeclarative,
 }:
 mkKdeDerivation {
   pname = "kdenetwork-filesharing";
@@ -19,7 +20,10 @@ mkKdeDerivation {
     ./samba-hint.patch
   ];
 
-  extraBuildInputs = [ qtdeclarative ];
+  extraBuildInputs = [
+    qtdeclarative
+    kauth
+  ];
 
   # We can't actually install samba via PackageKit, so let's not confuse users any more than we have to
   extraCmakeFlags = [ "-DSAMBA_INSTALL=OFF" ];
diff --git a/pkgs/kde/gear/kontrast/default.nix b/pkgs/kde/gear/kontrast/default.nix
index 6d3ef5d3adb9..4ef2889cc1a0 100644
--- a/pkgs/kde/gear/kontrast/default.nix
+++ b/pkgs/kde/gear/kontrast/default.nix
@@ -1,14 +1,12 @@
 {
   mkKdeDerivation,
   qtsvg,
-  qcoro,
 }:
 mkKdeDerivation {
   pname = "kontrast";
 
   extraBuildInputs = [
     qtsvg
-    qcoro
   ];
   meta.mainProgram = "kontrast";
 }
diff --git a/pkgs/kde/gear/okular/default.nix b/pkgs/kde/gear/okular/default.nix
index b6048d9611d4..d55b5cd4bb0b 100644
--- a/pkgs/kde/gear/okular/default.nix
+++ b/pkgs/kde/gear/okular/default.nix
@@ -3,6 +3,7 @@
   pkg-config,
   qtspeech,
   qtsvg,
+  plasma-activities,
   poppler,
   libtiff,
   libspectre,
@@ -19,6 +20,8 @@ mkKdeDerivation {
     qtspeech
     qtsvg
 
+    plasma-activities
+
     poppler
     libtiff
     libspectre
diff --git a/pkgs/kde/generated/dependencies.json b/pkgs/kde/generated/dependencies.json
index 58f03bb030f1..bf2aada9b34b 100644
--- a/pkgs/kde/generated/dependencies.json
+++ b/pkgs/kde/generated/dependencies.json
@@ -18,6 +18,8 @@
       "kcrash",
       "ki18n",
       "kiconthemes",
+      "kirigami",
+      "kirigami-addons",
       "kitemmodels",
       "kwidgetsaddons",
       "kwindowsystem",
@@ -366,6 +368,7 @@
       "extra-cmake-modules",
       "karchive",
       "kcmutils",
+      "kcolorscheme",
       "kcompletion",
       "kconfig",
       "kconfigwidgets",
@@ -379,14 +382,14 @@
       "ki18n",
       "kiconthemes",
       "kio",
+      "kjobwidgets",
       "knotifications",
       "kparts",
       "kservice",
       "ktextwidgets",
       "kwidgetsaddons",
       "kwindowsystem",
-      "kxmlgui",
-      "phonon"
+      "kxmlgui"
     ],
     "blinken": [
       "extra-cmake-modules",
@@ -570,6 +573,9 @@
     ],
     "cervisia": [
       "extra-cmake-modules",
+      "kcompletion",
+      "kcoreaddons",
+      "kdbusaddons",
       "kdesu",
       "kdoctools",
       "ki18n",
@@ -949,6 +955,13 @@
       "wayland",
       "wayland-protocols"
     ],
+    "hana": [
+      "extra-cmake-modules",
+      "kconfig",
+      "ki18n",
+      "kio",
+      "kirigami"
+    ],
     "haruna": [
       "extra-cmake-modules",
       "kconfig",
@@ -971,6 +984,7 @@
       "kdbusaddons",
       "ki18n",
       "kirigami",
+      "kirigami-addons",
       "kwindowsystem",
       "libkleo",
       "qqc2-desktop-style"
@@ -1077,6 +1091,7 @@
     "k3b": [
       "extra-cmake-modules",
       "karchive",
+      "kauth",
       "kcmutils",
       "kconfig",
       "kcoreaddons",
@@ -1128,7 +1143,6 @@
       "kio",
       "kservice",
       "kwidgetsaddons",
-      "kwindowsystem",
       "kxmlgui"
     ],
     "kaddressbook": [
@@ -1158,7 +1172,6 @@
     ],
     "kaichat": [
       "extra-cmake-modules",
-      "kcompletion",
       "kconfig",
       "kcoreaddons",
       "kcrash",
@@ -1167,12 +1180,14 @@
       "ki18n",
       "kiconthemes",
       "kio",
-      "kitemviews",
+      "knotifications",
+      "knotifyconfig",
       "kstatusnotifieritem",
       "ktextaddons",
       "kwidgetsaddons",
       "kxmlgui",
-      "purpose"
+      "purpose",
+      "sonnet"
     ],
     "kaidan": [
       "extra-cmake-modules",
@@ -1738,6 +1753,7 @@
       "kiconthemes",
       "kitemviews",
       "kwidgetsaddons",
+      "kwindowsystem",
       "kxmlgui"
     ],
     "kdeclarative": [
@@ -1953,9 +1969,7 @@
     ],
     "kdesdk-thumbnailers": [
       "extra-cmake-modules",
-      "kconfig",
       "kcoreaddons",
-      "ki18n",
       "kio"
     ],
     "kdesu": [
@@ -2180,6 +2194,20 @@
       "kwidgetsaddons",
       "kwindowsystem"
     ],
+    "keepsecret": [
+      "extra-cmake-modules",
+      "kcolorscheme",
+      "kconfig",
+      "kcoreaddons",
+      "kcrash",
+      "kdbusaddons",
+      "ki18n",
+      "kiconthemes",
+      "kirigami",
+      "kirigami-addons",
+      "kitemmodels",
+      "qqc2-desktop-style"
+    ],
     "keurocalc": [
       "extra-cmake-modules",
       "kconfig",
@@ -2591,7 +2619,6 @@
     "kio": [
       "extra-cmake-modules",
       "karchive",
-      "kauth",
       "kbookmarks",
       "kcolorscheme",
       "kcompletion",
@@ -2688,11 +2715,14 @@
     ],
     "kirigami-addons": [
       "extra-cmake-modules",
+      "kcolorscheme",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "kglobalaccel",
       "kguiaddons",
       "ki18n",
+      "kiconthemes",
       "kirigami"
     ],
     "kirigami-gallery": [
@@ -2731,7 +2761,8 @@
       "ki18n",
       "kpackage",
       "libkscreen",
-      "plasma-desktop"
+      "plasma-desktop",
+      "plasma-workspace"
     ],
     "kitemmodels": [
       "extra-cmake-modules"
@@ -3040,8 +3071,7 @@
       "kstatusnotifieritem",
       "kwidgetsaddons",
       "kwindowsystem",
-      "kxmlgui",
-      "phonon"
+      "kxmlgui"
     ],
     "kmouth": [
       "extra-cmake-modules",
@@ -3084,6 +3114,7 @@
       "kxmlgui"
     ],
     "kmymoney": [
+      "akonadi",
       "alkimia",
       "extra-cmake-modules",
       "kcmutils",
@@ -3097,6 +3128,7 @@
       "kholidays",
       "ki18n",
       "kiconthemes",
+      "kidentitymanagement",
       "kio",
       "kitemmodels",
       "kitemviews",
@@ -3277,6 +3309,7 @@
       "kconfig",
       "kcoreaddons",
       "kdbusaddons",
+      "kdoctools",
       "kguiaddons",
       "ki18n",
       "kiconthemes",
@@ -3398,7 +3431,8 @@
       "kdoctools",
       "ki18n",
       "kirigami",
-      "kirigami-addons"
+      "kirigami-addons",
+      "qcoro"
     ],
     "konversation": [
       "extra-cmake-modules",
@@ -3490,6 +3524,7 @@
     ],
     "kosmindoormap": [
       "extra-cmake-modules",
+      "kcontacts",
       "ki18n",
       "kirigami",
       "kirigami-addons",
@@ -3596,6 +3631,8 @@
       "kguiaddons",
       "ki18n",
       "kirigami",
+      "kirigami-addons",
+      "kitemmodels",
       "knotifications",
       "kunifiedpush",
       "kweathercore"
@@ -3614,7 +3651,8 @@
       "extra-cmake-modules"
     ],
     "kquickimageeditor": [
-      "extra-cmake-modules"
+      "extra-cmake-modules",
+      "kconfig"
     ],
     "krdc": [
       "extra-cmake-modules",
@@ -3801,6 +3839,8 @@
       "kcoreaddons",
       "kdbusaddons",
       "ki18n",
+      "kimageformats",
+      "kirigami",
       "kpackage",
       "kservice",
       "ksvg",
@@ -3939,7 +3979,6 @@
       "extra-cmake-modules",
       "kconfig",
       "kcrash",
-      "kdoctools",
       "kguiaddons",
       "ki18n",
       "knewstuff",
@@ -4027,6 +4066,7 @@
       "kcoreaddons",
       "ki18n",
       "kio",
+      "kitemviews",
       "ktextwidgets",
       "qtkeychain",
       "sonnet",
@@ -4231,7 +4271,6 @@
     ],
     "kwallet": [
       "extra-cmake-modules",
-      "gpgme",
       "kcolorscheme",
       "kconfig",
       "kcoreaddons",
@@ -4312,12 +4351,13 @@
       "extra-cmake-modules"
     ],
     "kwin": [
+      "aurorae",
       "breeze",
       "breeze-icons",
       "extra-cmake-modules",
       "kcmutils",
+      "kcolorscheme",
       "kconfig",
-      "kconfigwidgets",
       "kcoreaddons",
       "kcrash",
       "kdeclarative",
@@ -4329,6 +4369,7 @@
       "kidletime",
       "kirigami",
       "knewstuff",
+      "knighttime",
       "knotifications",
       "kpackage",
       "kpipewire",
@@ -4347,6 +4388,7 @@
       "wayland-protocols"
     ],
     "kwin-x11": [
+      "aurorae",
       "breeze",
       "breeze-icons",
       "extra-cmake-modules",
@@ -4364,9 +4406,9 @@
       "kidletime",
       "kirigami",
       "knewstuff",
+      "knighttime",
       "knotifications",
       "kpackage",
-      "kpipewire",
       "kscreenlocker",
       "kservice",
       "ksvg",
@@ -4616,7 +4658,6 @@
     "libplasma": [
       "extra-cmake-modules",
       "karchive",
-      "kcmutils",
       "kcolorscheme",
       "kconfig",
       "kcoreaddons",
@@ -4872,6 +4913,7 @@
     "mimetreeparser": [
       "extra-cmake-modules",
       "kcalendarcore",
+      "kirigami",
       "kmbox",
       "kmime",
       "kwidgetsaddons",
@@ -4970,7 +5012,6 @@
       "kxmlgui",
       "libkexiv2",
       "phonon",
-      "plasma-activities",
       "purpose",
       "threadweaver"
     ],
@@ -5244,7 +5285,6 @@
       "baloo",
       "breeze",
       "extra-cmake-modules",
-      "kaccounts-integration",
       "kactivitymanagerd",
       "kauth",
       "kcmutils",
@@ -5379,6 +5419,7 @@
       "bluedevil",
       "bluez-qt",
       "extra-cmake-modules",
+      "kauth",
       "kconfig",
       "kcoreaddons",
       "ki18n",
@@ -5424,11 +5465,13 @@
       "kconfigwidgets",
       "kcoreaddons",
       "kdbusaddons",
+      "kdeclarative",
       "ki18n",
       "kio",
       "kjobwidgets",
       "knotifications",
       "kpackage",
+      "kquickcharts",
       "kservice",
       "ksvg",
       "kwallet",
@@ -5437,6 +5480,7 @@
       "libplasma",
       "modemmanager-qt",
       "networkmanager-qt",
+      "prison",
       "qcoro",
       "solid"
     ],
@@ -5449,6 +5493,7 @@
       "kglobalaccel",
       "ki18n",
       "kirigami-addons",
+      "kitemmodels",
       "kpackage",
       "kstatusnotifieritem",
       "ksvg",
@@ -5503,6 +5548,7 @@
       "kcompletion",
       "kconfig",
       "kcoreaddons",
+      "kcrash",
       "kdbusaddons",
       "ki18n",
       "kiconthemes",
@@ -5591,6 +5637,7 @@
     ],
     "plasma-welcome": [
       "extra-cmake-modules",
+      "kcmutils",
       "kcoreaddons",
       "kdbusaddons",
       "ki18n",
@@ -5616,6 +5663,7 @@
       "kbookmarks",
       "kcmutils",
       "kcodecs",
+      "kcolorscheme",
       "kcompletion",
       "kconfig",
       "kconfigwidgets",
@@ -5624,7 +5672,6 @@
       "kdbusaddons",
       "kdeclarative",
       "kded",
-      "kdesu",
       "kfilemetadata",
       "kglobalaccel",
       "kglobalacceld",
@@ -5639,6 +5686,7 @@
       "kitemviews",
       "kjobwidgets",
       "knewstuff",
+      "knighttime",
       "knotifications",
       "knotifyconfig",
       "kpackage",
@@ -5686,10 +5734,12 @@
       "kconfig",
       "kcoreaddons",
       "kguiaddons",
+      "kholidays",
       "ki18n",
       "kidletime",
       "kio",
       "knotifications",
+      "kunitconversion",
       "libksysguard",
       "networkmanager-qt",
       "plasma-activities",
@@ -5730,6 +5780,7 @@
       "kcrash",
       "kdbusaddons",
       "ki18n",
+      "knotifications",
       "kwindowsystem",
       "polkit-qt-1"
     ],
@@ -5784,7 +5835,6 @@
       "kcoreaddons",
       "kdbusaddons",
       "ki18n",
-      "kiconthemes",
       "kio",
       "kirigami",
       "knotifications",
@@ -5806,6 +5856,7 @@
       "ki18n",
       "kio",
       "kirigami",
+      "kitemmodels",
       "kservice"
     ],
     "pvfviewer": [
@@ -5831,7 +5882,6 @@
       "kcodecs",
       "kcolorscheme",
       "kconfig",
-      "kcoreaddons",
       "kguiaddons",
       "kiconthemes",
       "kirigami"
@@ -5910,6 +5960,7 @@
       "ki18n",
       "kitemviews",
       "ktexteditor",
+      "ktexttemplate",
       "kxmlgui"
     ],
     "rolisteam": [
@@ -6219,6 +6270,7 @@
     "systemsettings": [
       "extra-cmake-modules",
       "kcmutils",
+      "kcolorscheme",
       "kconfig",
       "kcrash",
       "kdbusaddons",
@@ -6241,6 +6293,7 @@
     ],
     "tellico": [
       "extra-cmake-modules",
+      "kcolorscheme",
       "kconfig",
       "kconfigwidgets",
       "kcrash",
@@ -6249,6 +6302,7 @@
       "ki18n",
       "kiconthemes",
       "kio",
+      "kio-extras",
       "kitemmodels",
       "knewstuff",
       "kwidgetsaddons",
@@ -6317,9 +6371,6 @@
       "kconfig",
       "kcoreaddons",
       "kcrash",
-      "kdev-php",
-      "kdevelop",
-      "kdevelop-pg-qt",
       "kdoctools",
       "ki18n",
       "kiconthemes",
@@ -6405,6 +6456,7 @@
       "kconfigwidgets",
       "kcoreaddons",
       "kcrash",
+      "kdeclarative",
       "ki18n",
       "kiconthemes",
       "kio",
@@ -6418,6 +6470,7 @@
       "kwidgetsaddons",
       "kwindowsystem",
       "kxmlgui",
+      "plasma-workspace",
       "solid",
       "wayland",
       "wayland-protocols"
@@ -6462,5 +6515,5 @@
       "kwindowsystem"
     ]
   },
-  "version": "723afe12"
+  "version": "4fa0d47e"
 }
\ No newline at end of file
diff --git a/pkgs/kde/generated/licenses.json b/pkgs/kde/generated/licenses.json
index d474fff199eb..b218ff318e9d 100644
--- a/pkgs/kde/generated/licenses.json
+++ b/pkgs/kde/generated/licenses.json
@@ -350,7 +350,6 @@
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
-    "GPL-2.0-or-later",
     "GPL-3.0-only",
     "LGPL-2.0-or-later",
     "LGPL-2.1-only",
@@ -452,6 +451,7 @@
   "flatpak-kcm": [
     "BSD-2-Clause",
     "BSD-3-Clause",
+    "CC-BY-SA-4.0",
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-2.0-or-later",
@@ -638,7 +638,9 @@
     "LicenseRef-KDE-Accepted-GPL"
   ],
   "karchive": [
+    "Apache-2.0",
     "BSD-2-Clause",
+    "CC-BY-SA-4.0",
     "CC0-1.0",
     "LGPL-2.0-or-later"
   ],
@@ -761,6 +763,9 @@
     "LicenseRef-KDE-Accepted-LGPL"
   ],
   "kcodecs": [
+    "Apache-2.0",
+    "BSD-2-Clause",
+    "CC-BY-SA-4.0",
     "CC0-1.0",
     "GPL-2.0-or-later",
     "LGPL-2.0-only",
@@ -1004,6 +1009,7 @@
     "LicenseRef-KDE-Accepted-LGPL"
   ],
   "kdeplasma-addons": [
+    "BSD-2-Clause",
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
@@ -1170,10 +1176,7 @@
   ],
   "kglobalacceld": [
     "CC0-1.0",
-    "LGPL-2.0-or-later",
-    "LGPL-2.1-only",
-    "LGPL-3.0-only",
-    "LicenseRef-KDE-Accepted-LGPL"
+    "LGPL-2.0-or-later"
   ],
   "kgoldrunner": [
     "BSD-3-Clause",
@@ -1296,6 +1299,7 @@
     "GPL-2.0-or-later"
   ],
   "kimageformats": [
+    "Apache-2.0",
     "BSD-2-Clause",
     "BSD-3-Clause",
     "CC0-1.0",
@@ -1437,6 +1441,7 @@
     "LGPL-2.0-only",
     "LGPL-2.0-or-later",
     "LGPL-2.1-only",
+    "LGPL-2.1-or-later",
     "LGPL-3.0-only",
     "LicenseRef-KDE-Accepted-LGPL"
   ],
@@ -1597,6 +1602,17 @@
     "GPL-3.0-only",
     "LicenseRef-KDE-Accepted-GPL"
   ],
+  "knighttime": [
+    "BSD-3-Clause",
+    "CC0-1.0",
+    "GPL-2.0-only",
+    "GPL-3.0-only",
+    "LGPL-2.1-only",
+    "LGPL-3.0-only",
+    "LicenseRef-KDE-Accepted-GPL",
+    "LicenseRef-KDE-Accepted-LGPL",
+    "MIT"
+  ],
   "knotifications": [
     "BSD-2-Clause",
     "BSD-3-Clause",
@@ -1850,6 +1866,7 @@
   ],
   "krdp": [
     "BSD-2-Clause",
+    "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-or-later",
     "LGPL-2.0-or-later",
@@ -2342,6 +2359,7 @@
     "MIT"
   ],
   "libplasma": [
+    "BSD-2-Clause",
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
@@ -2457,7 +2475,6 @@
     "Qt-Commercial-exception-1.0"
   ],
   "milou": [
-    "BSD-2-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-3.0-only",
@@ -2701,6 +2718,8 @@
   ],
   "plasma-mobile": [
     "Apache-2.0",
+    "BSD-2-Clause",
+    "CC-BY-SA-4.0",
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-2.0-or-later",
@@ -2720,7 +2739,7 @@
     "LGPL-2.0-or-later"
   ],
   "plasma-nm": [
-    "BSD-2-Clauses",
+    "BSD-2-Clause",
     "CC0-1.0",
     "GPL-2.0-only",
     "GPL-2.0-or-later",
@@ -2868,9 +2887,11 @@
     "BSD-3-Clause",
     "CC0-1.0",
     "GPL-2.0-or-later",
+    "GPL-3.0-only",
     "LGPL-2.0-or-later",
     "LGPL-2.1-only",
     "LGPL-3.0-only",
+    "LicenseRef-KDE-Accepted-GPL",
     "LicenseRef-KDE-Accepted-LGPL"
   ],
   "prison": [
diff --git a/pkgs/kde/generated/projects.json b/pkgs/kde/generated/projects.json
index 2125ea7bc26c..ec7937b31351 100644
--- a/pkgs/kde/generated/projects.json
+++ b/pkgs/kde/generated/projects.json
@@ -1265,6 +1265,12 @@
     "project_path": "unmaintained/jovie",
     "repo_path": "unmaintained/jovie"
   },
+  "jp-archives": {
+    "description": "Patches for KDE and Qt created by the members of Japan KDE Users Group (JKUG)",
+    "name": "jp-archives",
+    "project_path": "unmaintained/jp-archives",
+    "repo_path": "unmaintained/jp-archives"
+  },
   "jsmoke": {
     "description": "Smoke bindings for QtScript.",
     "name": "jsmoke",
@@ -2477,6 +2483,12 @@
     "project_path": "applications/keditbookmarks",
     "repo_path": "utilities/keditbookmarks"
   },
+  "keepsecret": {
+    "description": "Password manager",
+    "name": "keepsecret",
+    "project_path": "utilities/keepsecret",
+    "repo_path": "utilities/keepsecret"
+  },
   "kemoticons": {
     "description": "KEmoticons",
     "name": "kemoticons",
@@ -2864,8 +2876,8 @@
   "kiss": {
     "description": "KDE Initial System Setup",
     "name": "kiss",
-    "project_path": "system/kiss",
-    "repo_path": "system/kiss"
+    "project_path": "plasma/kiss",
+    "repo_path": "plasma/kiss"
   },
   "kitemmodels": {
     "description": "KItemModels",
@@ -6875,6 +6887,12 @@
     "project_path": "sysadmin/sentry-bugzilla-bridge",
     "repo_path": "sysadmin/sentry-bugzilla-bridge"
   },
+  "sysadmin-token-service": {
+    "description": "Service for issuing short lived access tokens for those presenting valid credentials",
+    "name": "sysadmin-token-service",
+    "project_path": "sysadmin/token-service",
+    "repo_path": "sysadmin/token-service"
+  },
   "sysadmin-webstats": {
     "description": "Scripts and templates used to manage web statistics on KDE servers",
     "name": "sysadmin-webstats",
diff --git a/pkgs/kde/third-party/applet-window-buttons6/default.nix b/pkgs/kde/third-party/applet-window-buttons6/default.nix
index 33ab54b180cf..50ebbea0d664 100644
--- a/pkgs/kde/third-party/applet-window-buttons6/default.nix
+++ b/pkgs/kde/third-party/applet-window-buttons6/default.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   cmake,
   extra-cmake-modules,
+  kcmutils,
   kcoreaddons,
   kdeclarative,
   kdecoration,
@@ -29,6 +30,7 @@ stdenv.mkDerivation rec {
   ];
 
   buildInputs = [
+    kcmutils
     kcoreaddons
     kdeclarative
     kdecoration
diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
index f0e1482b8579..caf4dc8be63c 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
@@ -15,6 +15,7 @@
   kitemviews,
   kwidgetsaddons,
   qtquickcontrols2 ? null,
+  kcmutils,
   kcoreaddons,
   kdeclarative,
   kirigami ? null,
@@ -78,6 +79,7 @@ stdenv.mkDerivation rec {
       kirigami2
     ]
     ++ lib.optionals (lib.versions.major qtbase.version == "6") [
+      kcmutils
       libplasma
       kirigami
     ]

From 15729ec4e1b90abbcec33b75c68d35dd5b968453 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sat, 27 Sep 2025 13:17:48 +0300
Subject: [PATCH 1230/6226] kdePackages: Plasma 6.4.5 -> 6.5.0

---
 .../services/desktop-managers/plasma6.nix     |   2 +
 pkgs/kde/generated/sources/plasma.json        | 419 +++++++++---------
 pkgs/kde/plasma/default.nix                   |   1 +
 pkgs/kde/plasma/knighttime/default.nix        |   9 +
 pkgs/kde/plasma/krdp/default.nix              |   3 +
 .../plasma/krdp/hardcode-openssl-path.patch   |  14 +-
 .../plasma-vault/0003-fusermount-path.patch   |  18 +-
 pkgs/kde/plasma/plasma-vault/default.nix      |   2 +-
 pkgs/kde/plasma/plasma-workspace/default.nix  |   2 -
 .../plasma-workspace/dependency-paths.patch   |  29 +-
 .../kde/plasma/polkit-kde-agent-1/default.nix |   2 -
 pkgs/kde/plasma/systemsettings/default.nix    |   8 +-
 .../applet-window-buttons6/default.nix        |   3 +
 13 files changed, 257 insertions(+), 255 deletions(-)
 create mode 100644 pkgs/kde/plasma/knighttime/default.nix

diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix
index c9da11d2ec63..4dcfecd7746d 100644
--- a/nixos/modules/services/desktop-managers/plasma6.nix
+++ b/nixos/modules/services/desktop-managers/plasma6.nix
@@ -91,6 +91,7 @@ in
           kio-admin # managing files as admin
           kio-extras # stuff for MTP, AFC, etc
           kio-fuse # fuse interface for KIO
+          knighttime # night mode switching daemon
           kpackage # provides kpackagetool tool
           kservice # provides kbuildsycoca6 tool
           kunifiedpush # provides a background service and a KCM
@@ -266,6 +267,7 @@ in
     services.udisks2.enable = true;
     services.upower.enable = config.powerManagement.enable;
     services.libinput.enable = mkDefault true;
+    services.geoclue2.enable = mkDefault true;
 
     # Extra UDEV rules used by Solid
     services.udev.packages = [
diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json
index 876d9609b9bc..c070b4587fa8 100644
--- a/pkgs/kde/generated/sources/plasma.json
+++ b/pkgs/kde/generated/sources/plasma.json
@@ -1,347 +1,352 @@
 {
   "aurorae": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/aurorae-6.4.5.tar.xz",
-    "hash": "sha256-MYPuvEdtZ2N0FUnGvQB8ZQZJkT1kjMr6MDZpCC2L83g="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/aurorae-6.5.0.tar.xz",
+    "hash": "sha256-jlHm8t9NPAclO06UtVo+FY3B72OARKaNrKaB7oKw+1s="
   },
   "bluedevil": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/bluedevil-6.4.5.tar.xz",
-    "hash": "sha256-+zoHx56pgM1V+SrQO4zrJZX9ehjXD2/SxNnjU4qE1x4="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/bluedevil-6.5.0.tar.xz",
+    "hash": "sha256-N2W9EvEPVChFR750P8mcECLLvzjg7lbYYxY7iWm7jZg="
   },
   "breeze": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/breeze-6.4.5.tar.xz",
-    "hash": "sha256-3LhDPTmVEVRpWPTIwaj65e0i8qaY8FOWjUEO51vW2LQ="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/breeze-6.5.0.tar.xz",
+    "hash": "sha256-Sa9bwnEicCjfcLIhSf5vz7FbbUuObz6zKd7N465N82k="
   },
   "breeze-grub": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/breeze-grub-6.4.5.tar.xz",
-    "hash": "sha256-ToJe6Vg3k/11W0E6R8QTpfnNFBKBL3tGrO7t5TgwZGs="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/breeze-grub-6.5.0.tar.xz",
+    "hash": "sha256-UumPPwodqDVRAfGeTzxz7tzst0imxyKVkk5sp2+cAJg="
   },
   "breeze-gtk": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/breeze-gtk-6.4.5.tar.xz",
-    "hash": "sha256-dx6IyhlCGkcvX0I1+ye6JYi36iZ+jyZH5eIxw1HwOpg="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/breeze-gtk-6.5.0.tar.xz",
+    "hash": "sha256-ul8FewjjgtngeQq1HXqhzFAXyVLrxGdlQAgVUn3IFHA="
   },
   "breeze-plymouth": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/breeze-plymouth-6.4.5.tar.xz",
-    "hash": "sha256-DhuDkj8JOCHd72/VsRtW2wVxtBCfTyYCFIAfscbfcAQ="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/breeze-plymouth-6.5.0.tar.xz",
+    "hash": "sha256-nK75hcMHirIp3u7DBFmw+Ms2mY8c63OuKpeMPipGGd8="
   },
   "discover": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/discover-6.4.5.tar.xz",
-    "hash": "sha256-kgjU43rSrkzR2nzTsB7eYQcaE4mOxMFO3/6YO5cvhXY="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/discover-6.5.0.tar.xz",
+    "hash": "sha256-k+Q7823cRxPLTsxtDwCkT9rmQmp9pScPcmRX5joPKD0="
   },
   "drkonqi": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/drkonqi-6.4.5.tar.xz",
-    "hash": "sha256-63ydNHXvQpiiotmKivIysvtw7kqnHE9R3RYVMXC7E7I="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/drkonqi-6.5.0.tar.xz",
+    "hash": "sha256-MQaismj2cY82kH02+sol8RlFg5oW/2uLdKE81wjvjLE="
   },
   "flatpak-kcm": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/flatpak-kcm-6.4.5.tar.xz",
-    "hash": "sha256-PxhYcHEkMFvCMYbzNLuvY8WivC2Jder/EnTUAuYRuLE="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/flatpak-kcm-6.5.0.tar.xz",
+    "hash": "sha256-0zqrUc9bpv37EvY4vH6LhSW55nMNFO7hRISN4XalGEU="
   },
   "kactivitymanagerd": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kactivitymanagerd-6.4.5.tar.xz",
-    "hash": "sha256-3lJRi5Ab7rWKYycxb82jRbNVIwVVbIWhxLETP5q3pCQ="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/kactivitymanagerd-6.5.0.tar.xz",
+    "hash": "sha256-owsjDL3o7SGwtJQjVRXrv+7JFvf+TxW7uSdUaEZ4Ppg="
   },
   "kde-cli-tools": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kde-cli-tools-6.4.5.tar.xz",
-    "hash": "sha256-PMMnRw79Y85nmPMQACNGdNaUmHLIVxwHLcsjlWoneyY="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/kde-cli-tools-6.5.0.tar.xz",
+    "hash": "sha256-3qIPn6Ni5ZBog7X4yZnuplGQYPEka9LyFJLYX17+QS0="
   },
   "kde-gtk-config": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kde-gtk-config-6.4.5.tar.xz",
-    "hash": "sha256-96gcHv1Tm2CMxkCpmf2xhLu4PPyWANQH0aTzMsOIDsI="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/kde-gtk-config-6.5.0.tar.xz",
+    "hash": "sha256-7fdYusB3N9/l394LeXuGRqhmnINp8PnUoroaAv5GLg4="
   },
   "kdecoration": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kdecoration-6.4.5.tar.xz",
-    "hash": "sha256-+dPsQlbPcSWjsLwIx3N69xUjXVwitpuil5e7BsXvSkw="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/kdecoration-6.5.0.tar.xz",
+    "hash": "sha256-+a4ZT+UfpkbSyGU++tU2KgrZJT48KLcOjkKpwDKLnBs="
   },
   "kdeplasma-addons": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kdeplasma-addons-6.4.5.tar.xz",
-    "hash": "sha256-S9vcKJK79iEcO+bAIXf3/9zhCrFUbYEaS1kCQZK3e84="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/kdeplasma-addons-6.5.0.tar.xz",
+    "hash": "sha256-zApdSDB9URDAE8CLLsOCqrqfZsNwyOSrRuxxq2aTuQs="
   },
   "kgamma": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kgamma-6.4.5.tar.xz",
-    "hash": "sha256-mW69YL9QgkjtwpPZ7J2kybg4s/sbzNgqTbMFnvJ6uxY="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/kgamma-6.5.0.tar.xz",
+    "hash": "sha256-woA1Ln611Ot95e3uNtv6I1plpbtetNk9rxblD1TaC/M="
   },
   "kglobalacceld": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kglobalacceld-6.4.5.tar.xz",
-    "hash": "sha256-pxLR96hpYCkv62l5/iyS8ufVz7zRB/Tv45eeGkwyzXM="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/kglobalacceld-6.5.0.tar.xz",
+    "hash": "sha256-XcstQngVKSCOy/TS6yMfmuwp79EsLSTsn4ppBKxvddU="
   },
   "kinfocenter": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kinfocenter-6.4.5.tar.xz",
-    "hash": "sha256-bCeofeJPbF6dvYDNemGLVMHSiRRmWBz8CZoCP9BxZgs="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/kinfocenter-6.5.0.tar.xz",
+    "hash": "sha256-3Dy9o60aZax+vbAvaTer1UZ9M9STjWDDO1tIeP442Ds="
   },
   "kmenuedit": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kmenuedit-6.4.5.tar.xz",
-    "hash": "sha256-YQ8HzTomwWGOKnwxzpARsos68N9dpl6wEAp+jwjIlC8="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/kmenuedit-6.5.0.tar.xz",
+    "hash": "sha256-WmGVESlpgfw3f/ASnIZYtMS5BDc+/XpjUahqPUxgXjg="
+  },
+  "knighttime": {
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/knighttime-6.5.0.tar.xz",
+    "hash": "sha256-rHrxaKAcoZv8cchJ11hyPdgcHxz+THs8ijYCGtXRuq8="
   },
   "kpipewire": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kpipewire-6.4.5.tar.xz",
-    "hash": "sha256-0KcEpqAw7bW09da5nDK8TkbhpqtSff3pCJ4RCUtrGpI="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/kpipewire-6.5.0.tar.xz",
+    "hash": "sha256-BlG46jhi/+PqTwiiRDGrRnJXQCIfBSxDKAMzYr4iC6c="
   },
   "krdp": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/krdp-6.4.5.tar.xz",
-    "hash": "sha256-OBwsAl22ti0tcWVVgsTJJyrgTUIlrqX4oDB2Gb+ZCkU="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/krdp-6.5.0.tar.xz",
+    "hash": "sha256-cQZct0KurdNq4k4pxb8eiDzQhNMPsjlCFcWJJ0AStYs="
   },
   "kscreen": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kscreen-6.4.5.tar.xz",
-    "hash": "sha256-uSvegjix5/PWUhzEsbqLumAEemT/8SmyAR3/X/NDEDc="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/kscreen-6.5.0.tar.xz",
+    "hash": "sha256-kesy8PcBFlWqOXK2wjXQaOI6/GugivBKMerJkt5zHZ4="
   },
   "kscreenlocker": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kscreenlocker-6.4.5.tar.xz",
-    "hash": "sha256-+sT51T1jy5sG6Q/rgsKPRxlx0V3v1KBoux59KIa3CQ0="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/kscreenlocker-6.5.0.tar.xz",
+    "hash": "sha256-DsR9SjPkfIbgnpsIrnaRXfZa+oDSjIm1Tiv7l60uwys="
   },
   "ksshaskpass": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/ksshaskpass-6.4.5.tar.xz",
-    "hash": "sha256-Wy2hGTcHnGGRl1XD1V/5v8W/l+0dvwgLQ8DCr1DjVNo="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/ksshaskpass-6.5.0.tar.xz",
+    "hash": "sha256-MWm4rL+HHSvGYWVAWNjjzhLRJRP9Id3Y8IrD9gT+2kk="
   },
   "ksystemstats": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/ksystemstats-6.4.5.tar.xz",
-    "hash": "sha256-cVsojzmr/ZDKgltPo8OHRenuHLvH9JW6FH1+++BKSdI="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/ksystemstats-6.5.0.tar.xz",
+    "hash": "sha256-wNbYkC8aRQfclV0owhvQhHJQwb+kofAwre5gskljYOo="
   },
   "kwallet-pam": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kwallet-pam-6.4.5.tar.xz",
-    "hash": "sha256-j/vxzELemqMq/JncxdwEgvGWcUVBbwVEmx5ye1WxNz4="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/kwallet-pam-6.5.0.tar.xz",
+    "hash": "sha256-M2OXxp7XwhtK0plDQyTHGrBP+J5kagdeeTmal62/3sw="
   },
   "kwayland": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kwayland-6.4.5.tar.xz",
-    "hash": "sha256-C4ddnnzFusTZfTRD/0MRUz4Nja1AGvEkTUdYpfpUKPM="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/kwayland-6.5.0.tar.xz",
+    "hash": "sha256-YLfslWNtnsTRbYC8IWEcLD1SVRStCiPwM6IGpTxLJ8E="
   },
   "kwayland-integration": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kwayland-integration-6.4.5.tar.xz",
-    "hash": "sha256-/SvWMFN2O703DJ5XggWDMK1zoUJBt6bj4bjSQwPe1QM="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/kwayland-integration-6.5.0.tar.xz",
+    "hash": "sha256-wq2mdIbNFNW2Mr8g/j9vC5q/aRk+bQIOlZXdtvQwNbo="
   },
   "kwin": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kwin-6.4.5.tar.xz",
-    "hash": "sha256-3s8ct5EnwoXH7ado5/9Pl8cvMUc1yCaFdY8LlWrBUfc="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/kwin-6.5.0.tar.xz",
+    "hash": "sha256-4OqmeYAmb+J/4y0VyfGPggZ3aRn4HU4aiJ00xfZc+YI="
   },
   "kwin-x11": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kwin-x11-6.4.5.tar.xz",
-    "hash": "sha256-zqkYeUZ6/fosrw7G3XJW6ueN76lwzcmpR/79hdQXrLE="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/kwin-x11-6.5.0.tar.xz",
+    "hash": "sha256-p52Pe0YQtI8dj1EylCKyiC7U2q3zjlyQQtJbFZQXZRM="
   },
   "kwrited": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/kwrited-6.4.5.tar.xz",
-    "hash": "sha256-Q0uDsRWkgPVCyX1RnCfy613U0zPPvdoo7ZlIE4kqANE="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/kwrited-6.5.0.tar.xz",
+    "hash": "sha256-IPMgzjtDD2RSppFqQpKQs8xFHZoroGrgh8PP0ZPWMes="
   },
   "layer-shell-qt": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/layer-shell-qt-6.4.5.tar.xz",
-    "hash": "sha256-72uq4iEU8DiviQKfPwB17inDuR/UkQCCjEw6MuFJbpU="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/layer-shell-qt-6.5.0.tar.xz",
+    "hash": "sha256-cg8ZPxGaR+44mktSs23cr+yk6SV/O33LVq4GI52xovc="
   },
   "libkscreen": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/libkscreen-6.4.5.tar.xz",
-    "hash": "sha256-aNJuJ2VrRQ8Vp49EeExQoiA05XwU+WpAIBnVK8Wz4rQ="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/libkscreen-6.5.0.tar.xz",
+    "hash": "sha256-nEJXf6qbuqSBl4KEcJr93DEPUqzJe2YTujxs7pFhzCw="
   },
   "libksysguard": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/libksysguard-6.4.5.tar.xz",
-    "hash": "sha256-x8+M0vCh5RkgHcYoifETWWeoUPkywlL9Juo9iMZWSg8="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/libksysguard-6.5.0.tar.xz",
+    "hash": "sha256-LxyTJGzbBXhlG3CNAP4rbAxkEfSh8shGTlrqyBaXHIU="
   },
   "libplasma": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/libplasma-6.4.5.tar.xz",
-    "hash": "sha256-lFtsVM/sVggPa1WGToKncCCW1oK+zx/Ul513pACcQSQ="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/libplasma-6.5.0.tar.xz",
+    "hash": "sha256-vJ+BSURzEpfhfZPQjxOQUGxdmtVfWoR+CuUHloN7bOg="
   },
   "milou": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/milou-6.4.5.tar.xz",
-    "hash": "sha256-Dq7sigWvw6lvag7vyaBF9JrOi+IBvI9X4e2BM82qEA0="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/milou-6.5.0.tar.xz",
+    "hash": "sha256-zuWqoW96kV0YdrL5GvDNchGmGNJwjle2frTfrs6ngR8="
   },
   "ocean-sound-theme": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/ocean-sound-theme-6.4.5.tar.xz",
-    "hash": "sha256-X140kY7Gn0TBAh2lJg4aXWVkNkYMn+AaXUiEkTAW+iU="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/ocean-sound-theme-6.5.0.tar.xz",
+    "hash": "sha256-yRLlOTCCZELphComNnnxkguaPcO2PZsCIJ/Pt2nXWg4="
   },
   "oxygen": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/oxygen-6.4.5.tar.xz",
-    "hash": "sha256-nBijOiJWC9xQS9HN1t054JGDjGC1R6zsAMUb2KEz62M="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/oxygen-6.5.0.tar.xz",
+    "hash": "sha256-rQGEkahM32n7uiCXUiYRBql+G6oCqp21HXaysSC2GKM="
   },
   "oxygen-sounds": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/oxygen-sounds-6.4.5.tar.xz",
-    "hash": "sha256-HQ+p+HIgXsjSvv5bwCnIsaDQ5UyLOhkHZTItiXeFIis="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/oxygen-sounds-6.5.0.tar.xz",
+    "hash": "sha256-XBJk1xNXsu0OJthXDnly9ZZcEjkROTqn5LTnDvgowm8="
   },
   "plasma-activities": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-activities-6.4.5.tar.xz",
-    "hash": "sha256-MK0jhG6Xvzwu1tOvJd4K4dmB6ocWCEkvzBYVXv0MgWk="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plasma-activities-6.5.0.tar.xz",
+    "hash": "sha256-DbhyvFaqhNIv5lsZxbNkzBT0SkBAHqqvv42iegS4iD8="
   },
   "plasma-activities-stats": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-activities-stats-6.4.5.tar.xz",
-    "hash": "sha256-NcZPckwFUPmWd/YTSEnez3a+R5cSEMqUGFguo4tIDDA="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plasma-activities-stats-6.5.0.tar.xz",
+    "hash": "sha256-YdcjGKwdTN7WFS8Jfuj0SzsyYXkaaELcrYZo59Bj9RU="
   },
   "plasma-browser-integration": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-browser-integration-6.4.5.tar.xz",
-    "hash": "sha256-rZL07B4x2f3Fe1F73C5awQfGLAIJCtN1Ke7N7myvnYs="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plasma-browser-integration-6.5.0.tar.xz",
+    "hash": "sha256-HwFDyglLrMMPtphYVOnI+9ktFJU7O7MSGTIrozFwnf8="
   },
   "plasma-desktop": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-desktop-6.4.5.tar.xz",
-    "hash": "sha256-dVLkx8fMv1t3VnJruaqr00RjCXeq8T9fMFtEd8qhe7c="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plasma-desktop-6.5.0.tar.xz",
+    "hash": "sha256-wn3CwSeVSDp3ohvMcAKbmDRHTtQj3NuT3A6IV9Te3kI="
   },
   "plasma-dialer": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-dialer-6.4.5.tar.xz",
-    "hash": "sha256-o5sUqDi+BNZeVOuD31hAPhj8EVBjeTXTdGZX4nyY/qg="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plasma-dialer-6.5.0.tar.xz",
+    "hash": "sha256-dTUxwFguIe6cJURMOn1gahNZ7MKKn2Ds/jCPS26d6Mg="
   },
   "plasma-disks": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-disks-6.4.5.tar.xz",
-    "hash": "sha256-gBfHSfvIUKE9EdWzU0P4UZStQnagHMBTEd1pgo9R/vM="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plasma-disks-6.5.0.tar.xz",
+    "hash": "sha256-6KThaCHyXGzC74JYcVQHfdfZi3Upiqh/6KxpXmo8+Po="
   },
   "plasma-firewall": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-firewall-6.4.5.tar.xz",
-    "hash": "sha256-hcjyic4DkNVgyZ/Z9KXFC8n6tvfQQ/WqMQuFIpsdg0w="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plasma-firewall-6.5.0.tar.xz",
+    "hash": "sha256-7fZeXA4jfFkyiZMxYx3XK6LZtp6cl/906P/AUEuQ9cs="
   },
   "plasma-integration": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-integration-6.4.5.tar.xz",
-    "hash": "sha256-w+Jx3h+ibIgzRAtpzKxejAlKheR0K/Jvl7y3yqjBeyw="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plasma-integration-6.5.0.tar.xz",
+    "hash": "sha256-AqfgvOVrqpPG9xNrljC5ulEJ19Kcb2wRDMcWEL3SDg4="
   },
   "plasma-mobile": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-mobile-6.4.5.tar.xz",
-    "hash": "sha256-pzz42tiaKEPfQS85X6HcaU4AHM4tZxrsJufoIXT7i+U="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plasma-mobile-6.5.0.tar.xz",
+    "hash": "sha256-Ib9k7bv5RGJuBX3CLpIugWxbVVIuh57rnLYQ/UhYNQU="
   },
   "plasma-nano": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-nano-6.4.5.tar.xz",
-    "hash": "sha256-xPMVP0/ao++XwXX+qW6RRyjqNr8ron5ojZkMCA+2wmE="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plasma-nano-6.5.0.tar.xz",
+    "hash": "sha256-GhFhF6XAaAwycZU6UMmKsN4y9qfwM9i1Zov+WtMr0RY="
   },
   "plasma-nm": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-nm-6.4.5.tar.xz",
-    "hash": "sha256-Sn0ilmiOlZfu3kRN5v5lSBMe1pE2puHEqt76D0oBXRY="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plasma-nm-6.5.0.tar.xz",
+    "hash": "sha256-ZIpHqoghXPIbtsbHnwwgvcqsn5/8VAKiPDQbpAApQZU="
   },
   "plasma-pa": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-pa-6.4.5.tar.xz",
-    "hash": "sha256-FMK6z/DwHAtSjXtxtQYsaLKXK7QVtcJzh901zuREGxo="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plasma-pa-6.5.0.tar.xz",
+    "hash": "sha256-JNdY8tVUhoSluNT+igowS7z23gLkijfLGji6eaQoJYw="
   },
   "plasma-sdk": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-sdk-6.4.5.tar.xz",
-    "hash": "sha256-VjLavtw/dRBtFdPW+lBmpb6drPh6IkxH+v6CrBHP278="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plasma-sdk-6.5.0.tar.xz",
+    "hash": "sha256-vCRMPWMXNepo7uQlrcfWCwnxcSi6ZT986jAxNGBr24E="
   },
   "plasma-systemmonitor": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-systemmonitor-6.4.5.tar.xz",
-    "hash": "sha256-MXtlI0eq6PmNSWF4GSv93FEn3mariLUa1yyK8flqTD0="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plasma-systemmonitor-6.5.0.tar.xz",
+    "hash": "sha256-AFXX6Cs+4VcYf7DHl/KGfD2mLVZJDJ02/VdvAmuTRbQ="
   },
   "plasma-thunderbolt": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-thunderbolt-6.4.5.tar.xz",
-    "hash": "sha256-fB0EOVuEo2h8Q9lASlfaidZNahNmcQe7wkOmHZ8GXzU="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plasma-thunderbolt-6.5.0.tar.xz",
+    "hash": "sha256-1kXh2Tri9kHO1u5fds/6vgTHqj6i3xjbiFyoyTTHIyI="
   },
   "plasma-vault": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-vault-6.4.5.tar.xz",
-    "hash": "sha256-OlEFvplfCSMUUDiGfqb8/kWoLpU37vWoVkPbJP/vcPU="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plasma-vault-6.5.0.tar.xz",
+    "hash": "sha256-umka8KaosOmZYH2UJOu6TVDKQwSgcTA3ypwhf9OrSJQ="
   },
   "plasma-welcome": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-welcome-6.4.5.tar.xz",
-    "hash": "sha256-V867V7XVKCY6nZBtsljjaNzNhCUa6SRKwHviC1n+1gk="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plasma-welcome-6.5.0.tar.xz",
+    "hash": "sha256-TcElW4McRGt+izc1RR/M+j34DCsoJdhQa7NWkM/LhbY="
   },
   "plasma-workspace": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-workspace-6.4.5.tar.xz",
-    "hash": "sha256-GZmevzV09TkUW6cHQBm4jVHyypUtEhOU2vavLmMpEPs="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plasma-workspace-6.5.0.tar.xz",
+    "hash": "sha256-ZJHq+/q8UzXFx6e21ohKEfkQdVh7SRJAHP/oMJZvLyA="
   },
   "plasma-workspace-wallpapers": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma-workspace-wallpapers-6.4.5.tar.xz",
-    "hash": "sha256-tDs9MXcS0MTruegAFiRON4LlsHlXV21qAwSQegfAj78="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plasma-workspace-wallpapers-6.5.0.tar.xz",
+    "hash": "sha256-MsHBoBVYlfTbU0M/pJKBH0VFth0jfHez0FzYP7b0yX0="
   },
   "plasma5support": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plasma5support-6.4.5.tar.xz",
-    "hash": "sha256-rP37yC+OOve9NdUUsePLtdq6jae6eQzsto+SWg9N+UI="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plasma5support-6.5.0.tar.xz",
+    "hash": "sha256-lyp3VujiH0mkJHnU4PW+tkT4/64V2lI3dk0k28UJ49o="
   },
   "plymouth-kcm": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/plymouth-kcm-6.4.5.tar.xz",
-    "hash": "sha256-K1fR9OJddp7ycA4427pV/np4xuyhP+6SWHWxoo4R5Hs="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/plymouth-kcm-6.5.0.tar.xz",
+    "hash": "sha256-Q2bI4WelqoBhc1wNK+VoNgLxJTMQEBvtc0bLPdMTyUk="
   },
   "polkit-kde-agent-1": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/polkit-kde-agent-1-6.4.5.tar.xz",
-    "hash": "sha256-W113FmD1IJKVplr9yz4RfBzJzXwYk9DJtorQxTEwgwE="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/polkit-kde-agent-1-6.5.0.tar.xz",
+    "hash": "sha256-pLJ7seqVF1jRG3jAhTyB73EigBqkGkSIQk2qWiCM5rE="
   },
   "powerdevil": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/powerdevil-6.4.5.tar.xz",
-    "hash": "sha256-qo6cbzO4rtTtrpycQ4MJZu1O7C+0N88hAjFQvfvYLkg="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/powerdevil-6.5.0.tar.xz",
+    "hash": "sha256-9+fb6mSvwVxd4YEA4zkr3eXM3HNfb1FpcyCBWZMfwYc="
   },
   "print-manager": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/print-manager-6.4.5.tar.xz",
-    "hash": "sha256-4jj9ApLRCsi1xRS9LOC5GNXVsZZsZpUyhb62bhOiQso="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/print-manager-6.5.0.tar.xz",
+    "hash": "sha256-D3R2h6DRWewhVkXY96g0RlDxojwmbEuysN7zH9G8O88="
   },
   "qqc2-breeze-style": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/qqc2-breeze-style-6.4.5.tar.xz",
-    "hash": "sha256-3zV16UPdGEbAeOSnDkV7CHeCDlqpn/XyeEMw8MlwN/8="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/qqc2-breeze-style-6.5.0.tar.xz",
+    "hash": "sha256-Zx3ipLD8F8qCIvkRuK3mxM7X/nb9n2BcIUyx5X72Jtk="
   },
   "sddm-kcm": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/sddm-kcm-6.4.5.tar.xz",
-    "hash": "sha256-BFI/OCv86SWcRzxX2kRyvk+vkvmLbtQKskq2Y6M3ya0="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/sddm-kcm-6.5.0.tar.xz",
+    "hash": "sha256-cfMwxsiQp7LAcYiqnHd8arZvTLHbq4lP0hKkiR6fRSg="
   },
   "spacebar": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/spacebar-6.4.5.tar.xz",
-    "hash": "sha256-y9Kj7g9wXxP4tC3HcA+5K++4jQT37jZ57qJNwWxPieA="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/spacebar-6.5.0.tar.xz",
+    "hash": "sha256-nUU0uHx+lrDB/VSmg21fnKsexoGbmwriysrutBQpdNg="
   },
   "spectacle": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/spectacle-6.4.5.tar.xz",
-    "hash": "sha256-QqVvBZPAxce2YQiO9ubjKg6iSDVPu/20og86IbpVQOc="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/spectacle-6.5.0.tar.xz",
+    "hash": "sha256-4UZXxvHyU4o3lvkVv9K4IV9GfLNqQrwtrYhsqevw3PE="
   },
   "systemsettings": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/systemsettings-6.4.5.tar.xz",
-    "hash": "sha256-kNfwl/GnekAAdiJM26RblMcdD+xD79Ltc3BH8v8quo8="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/systemsettings-6.5.0.tar.xz",
+    "hash": "sha256-u2XQzDPoqguIupyTAKHnGwDi4LoCiMQcFAG0q+g9JZw="
   },
   "wacomtablet": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/wacomtablet-6.4.5.tar.xz",
-    "hash": "sha256-4MdcwKW9KTQfcFzFA/eP3Ul2yxWolBvrt3RIs2iCZyg="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/wacomtablet-6.5.0.tar.xz",
+    "hash": "sha256-jqzMQN1kSaWJCOkJsq7cuJ1vuiVC7F+kbttrJpGYJBc="
   },
   "xdg-desktop-portal-kde": {
-    "version": "6.4.5",
-    "url": "mirror://kde/stable/plasma/6.4.5/xdg-desktop-portal-kde-6.4.5.tar.xz",
-    "hash": "sha256-n+BPBIK78yYIg2nANde29APbDAaupZNEQqd4h5ntzuI="
+    "version": "6.5.0",
+    "url": "mirror://kde/stable/plasma/6.5.0/xdg-desktop-portal-kde-6.5.0.tar.xz",
+    "hash": "sha256-9aRIU7Lm0IWKhigDiu6L/22EsewlsE7nqWHXPpYmGbc="
   }
 }
\ No newline at end of file
diff --git a/pkgs/kde/plasma/default.nix b/pkgs/kde/plasma/default.nix
index 865d667f33af..b51adab7631f 100644
--- a/pkgs/kde/plasma/default.nix
+++ b/pkgs/kde/plasma/default.nix
@@ -18,6 +18,7 @@
   kglobalacceld = callPackage ./kglobalacceld { };
   kinfocenter = callPackage ./kinfocenter { };
   kmenuedit = callPackage ./kmenuedit { };
+  knighttime = callPackage ./knighttime { };
   kpipewire = callPackage ./kpipewire { };
   krdp = callPackage ./krdp { };
   kscreen = callPackage ./kscreen { };
diff --git a/pkgs/kde/plasma/knighttime/default.nix b/pkgs/kde/plasma/knighttime/default.nix
new file mode 100644
index 000000000000..e2604cae53c2
--- /dev/null
+++ b/pkgs/kde/plasma/knighttime/default.nix
@@ -0,0 +1,9 @@
+{
+  mkKdeDerivation,
+  qtpositioning,
+}:
+mkKdeDerivation {
+  pname = "knighttime";
+
+  extraBuildInputs = [ qtpositioning ];
+}
diff --git a/pkgs/kde/plasma/krdp/default.nix b/pkgs/kde/plasma/krdp/default.nix
index 7f1d1bd89a69..197f01162a8c 100644
--- a/pkgs/kde/plasma/krdp/default.nix
+++ b/pkgs/kde/plasma/krdp/default.nix
@@ -3,6 +3,7 @@
   mkKdeDerivation,
   replaceVars,
   openssl,
+  pam,
   pkg-config,
   qtwayland,
   freerdp,
@@ -19,6 +20,8 @@ mkKdeDerivation {
   extraNativeBuildInputs = [ pkg-config ];
   extraBuildInputs = [
     qtwayland
+
     freerdp
+    pam
   ];
 }
diff --git a/pkgs/kde/plasma/krdp/hardcode-openssl-path.patch b/pkgs/kde/plasma/krdp/hardcode-openssl-path.patch
index 8ef18364b72c..21d9db7c0c82 100644
--- a/pkgs/kde/plasma/krdp/hardcode-openssl-path.patch
+++ b/pkgs/kde/plasma/krdp/hardcode-openssl-path.patch
@@ -1,13 +1,13 @@
 diff --git a/src/kcm/kcmkrdpserver.cpp b/src/kcm/kcmkrdpserver.cpp
-index 3af527c..3433a84 100644
+index 2d2c5e8..289c6f1 100644
 --- a/src/kcm/kcmkrdpserver.cpp
 +++ b/src/kcm/kcmkrdpserver.cpp
-@@ -218,7 +218,7 @@ void KRDPServerConfig::generateCertificate()
-     QString certificateKeyPath(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + QStringLiteral("/krdpserver/krdp.key"));
+@@ -293,7 +293,7 @@ void KRDPServerConfig::generateCertificate()
+     QString certificateKeyPath(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + u"/krdpserver/krdp.key"_s);
      qDebug(KRDPKCM) << "Generating certificate files to: " << certificatePath << " and " << certificateKeyPath;
      QProcess sslProcess;
--    sslProcess.start(u"openssl"_qs,
-+    sslProcess.start(u"@openssl@"_qs,
+-    sslProcess.start(u"openssl"_s,
++    sslProcess.start(u"@openssl@"_s,
                       {
-                          u"req"_qs,
-                          u"-nodes"_qs,
+                          u"req"_s,
+                          u"-nodes"_s,
diff --git a/pkgs/kde/plasma/plasma-vault/0003-fusermount-path.patch b/pkgs/kde/plasma/plasma-vault/0003-fusermount-path.patch
index 0d4481c70541..365ac8e3e160 100644
--- a/pkgs/kde/plasma/plasma-vault/0003-fusermount-path.patch
+++ b/pkgs/kde/plasma/plasma-vault/0003-fusermount-path.patch
@@ -1,25 +1,13 @@
-From 63571e28c65935f32567c0b179a096d62726b778 Mon Sep 17 00:00:00 2001
-From: Thomas Tuegel <ttuegel@mailbox.org>
-Date: Tue, 2 Nov 2021 06:00:32 -0500
-Subject: [PATCH 3/3] fusermount path
-
----
- kded/engine/fusebackend_p.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
 diff --git a/kded/engine/fusebackend_p.cpp b/kded/engine/fusebackend_p.cpp
-index 91f3523..1c19d88 100644
+index 714b660..cb384fc 100644
 --- a/kded/engine/fusebackend_p.cpp
 +++ b/kded/engine/fusebackend_p.cpp
-@@ -86,7 +86,7 @@ QProcess *FuseBackend::process(const QString &executable, const QStringList &arg
+@@ -90,7 +90,7 @@ QProcess *FuseBackend::process(const QString &executable, const QStringList &arg
  
  QProcess *FuseBackend::fusermount(const QStringList &arguments) const
  {
--    return process("fusermount", arguments, {});
+-    return process(fusermountExecutable, arguments, {});
 +    return process(NIXPKGS_FUSERMOUNT, arguments, {});
  }
  
  FutureResult<> FuseBackend::initialize(const QString &name, const Device &device, const MountPoint &mountPoint, const Vault::Payload &payload)
--- 
-2.33.1
-
diff --git a/pkgs/kde/plasma/plasma-vault/default.nix b/pkgs/kde/plasma/plasma-vault/default.nix
index f933687143a8..c66377c87069 100644
--- a/pkgs/kde/plasma/plasma-vault/default.nix
+++ b/pkgs/kde/plasma/plasma-vault/default.nix
@@ -21,7 +21,7 @@ mkKdeDerivation {
     ''-DNIXPKGS_ENCFS=\"${lib.getBin encfs}/bin/encfs\"''
     ''-DNIXPKGS_ENCFSCTL=\"${lib.getBin encfs}/bin/encfsctl\"''
     ''-DNIXPKGS_CRYFS=\"${lib.getBin cryfs}/bin/cryfs\"''
-    ''-DNIXPKGS_FUSERMOUNT=\"${lib.getBin fuse}/bin/fusermount\"''
+    ''-DNIXPKGS_FUSERMOUNT=\"${lib.getBin fuse}/bin/fusermount3\"''
     ''-DNIXPKGS_GOCRYPTFS=\"${lib.getBin gocryptfs}/bin/gocryptfs\"''
   ];
 
diff --git a/pkgs/kde/plasma/plasma-workspace/default.nix b/pkgs/kde/plasma/plasma-workspace/default.nix
index 90b76badce64..ebfa90da040d 100644
--- a/pkgs/kde/plasma/plasma-workspace/default.nix
+++ b/pkgs/kde/plasma/plasma-workspace/default.nix
@@ -2,7 +2,6 @@
   lib,
   mkKdeDerivation,
   replaceVars,
-  dbus,
   fontconfig,
   xorg,
   lsof,
@@ -24,7 +23,6 @@ mkKdeDerivation {
 
   patches = [
     (replaceVars ./dependency-paths.patch {
-      dbusSend = lib.getExe' dbus "dbus-send";
       fcMatch = lib.getExe' fontconfig "fc-match";
       lsof = lib.getExe lsof;
       qdbus = lib.getExe' qttools "qdbus";
diff --git a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch
index b4d46cd869bb..df8c5981dcfb 100644
--- a/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch
+++ b/pkgs/kde/plasma/plasma-workspace/dependency-paths.patch
@@ -1,8 +1,8 @@
-diff --git a/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp b/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp
-index ba214a555d..421d940738 100644
---- a/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp
-+++ b/applets/devicenotifier/plugin/deviceerrormonitor_p.cpp
-@@ -155,7 +155,7 @@ void DeviceErrorMonitor::queryBlockingApps(const QString &devicePath)
+diff --git a/applets/devicenotifier/devicemessagemonitor_p.cpp b/applets/devicenotifier/devicemessagemonitor_p.cpp
+index 173fec78c1..0519424f71 100644
+--- a/applets/devicenotifier/devicemessagemonitor_p.cpp
++++ b/applets/devicenotifier/devicemessagemonitor_p.cpp
+@@ -118,7 +118,7 @@ void DeviceMessageMonitor::queryBlockingApps(const QString &devicePath)
          Q_EMIT blockingAppsReady(blockApps);
          p->deleteLater();
      });
@@ -25,7 +25,7 @@ index e27e21a7bd..abbf7f32e1 100644
      p.write(input);
      p.closeWriteChannel();
 diff --git a/kcms/fonts/fonts.cpp b/kcms/fonts/fonts.cpp
-index 96417c440a..8c9bc2e9ab 100644
+index da28f13837..4af78b7850 100644
 --- a/kcms/fonts/fonts.cpp
 +++ b/kcms/fonts/fonts.cpp
 @@ -137,7 +137,7 @@ void KFonts::save()
@@ -51,7 +51,7 @@ index e4d1ad4311..d45bdfad98 100644
  
  void CFcQuery::procExited()
 diff --git a/kcms/krdb/krdb.cpp b/kcms/krdb/krdb.cpp
-index f3c9956921..09c818739d 100644
+index 53f77d0a18..680e81b6e4 100644
 --- a/kcms/krdb/krdb.cpp
 +++ b/kcms/krdb/krdb.cpp
 @@ -425,7 +425,7 @@ void runRdb(unsigned int flags)
@@ -107,7 +107,7 @@ index 7218628ce9..9126475ea4 100644
 +ExecStart=@qdbus@ org.kde.kcminit /kcminit org.kde.KCMInit.runPhase1
  Slice=session.slice
 diff --git a/startkde/startplasma.cpp b/startkde/startplasma.cpp
-index 4d31c6f408..17418b1ff7 100644
+index b8474dd34f..7d0616e116 100644
 --- a/startkde/startplasma.cpp
 +++ b/startkde/startplasma.cpp
 @@ -57,7 +57,7 @@ void sigtermHandler(int signalNumber)
@@ -119,7 +119,7 @@ index 4d31c6f408..17418b1ff7 100644
  }
  
  QStringList allServices(const QLatin1String &prefix)
-@@ -512,7 +512,7 @@ QProcess *setupKSplash()
+@@ -508,7 +508,7 @@ QProcess *setupKSplash()
          if (ksplashCfg.readEntry("Engine", QStringLiteral("KSplashQML")) == QLatin1String("KSplashQML")) {
              p = new QProcess;
              p->setProcessChannelMode(QProcess::ForwardedChannels);
@@ -128,14 +128,3 @@ index 4d31c6f408..17418b1ff7 100644
          }
      }
      return p;
-diff --git a/startkde/systemd/plasma-ksplash-ready.service.in b/startkde/systemd/plasma-ksplash-ready.service.in
-index 1e903130a9..0861c3d136 100644
---- a/startkde/systemd/plasma-ksplash-ready.service.in
-+++ b/startkde/systemd/plasma-ksplash-ready.service.in
-@@ -6,5 +6,5 @@ PartOf=graphical-session.target
- 
- [Service]
- Type=oneshot
--ExecStart=dbus-send --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready
-+ExecStart=@dbusSend@ --session --reply-timeout=1 --type=method_call --dest=org.kde.KSplash /KSplash org.kde.KSplash.setStage string:ready
- Slice=session.slice
diff --git a/pkgs/kde/plasma/polkit-kde-agent-1/default.nix b/pkgs/kde/plasma/polkit-kde-agent-1/default.nix
index 26e9f16d477c..f87d21cd21b8 100644
--- a/pkgs/kde/plasma/polkit-kde-agent-1/default.nix
+++ b/pkgs/kde/plasma/polkit-kde-agent-1/default.nix
@@ -2,7 +2,6 @@
   mkKdeDerivation,
   qtdeclarative,
   kirigami,
-  knotifications,
 }:
 mkKdeDerivation {
   pname = "polkit-kde-agent-1";
@@ -10,6 +9,5 @@ mkKdeDerivation {
   extraBuildInputs = [
     qtdeclarative
     kirigami
-    knotifications
   ];
 }
diff --git a/pkgs/kde/plasma/systemsettings/default.nix b/pkgs/kde/plasma/systemsettings/default.nix
index 7902e83710ff..0773a7f7d428 100644
--- a/pkgs/kde/plasma/systemsettings/default.nix
+++ b/pkgs/kde/plasma/systemsettings/default.nix
@@ -1,5 +1,11 @@
-{ mkKdeDerivation }:
+{
+  mkKdeDerivation,
+  kauth,
+}:
 mkKdeDerivation {
   pname = "systemsettings";
+
+  extraBuildInputs = [ kauth ];
+
   meta.mainProgram = "systemsettings";
 }
diff --git a/pkgs/kde/third-party/applet-window-buttons6/default.nix b/pkgs/kde/third-party/applet-window-buttons6/default.nix
index 50ebbea0d664..da2401736690 100644
--- a/pkgs/kde/third-party/applet-window-buttons6/default.nix
+++ b/pkgs/kde/third-party/applet-window-buttons6/default.nix
@@ -24,6 +24,9 @@ stdenv.mkDerivation rec {
 
   dontWrapQtApps = true;
 
+  # kdecoration headers include C++20 spaceship operator
+  env.NIX_CFLAGS_COMPILE = "-std=c++20";
+
   nativeBuildInputs = [
     cmake
     extra-cmake-modules

From d634874d42267392a3251099be1be318280288a8 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 14 Oct 2025 15:50:05 +0200
Subject: [PATCH 1231/6226] libks: Enable tests

---
 ...ly-request-shutdown-of-test2-threads.patch | 31 +++++++++++++++++++
 pkgs/by-name/li/libks/package.nix             | 23 ++++++++++++++
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/by-name/li/libks/1001-tests-testhash.c-Properly-request-shutdown-of-test2-threads.patch

diff --git a/pkgs/by-name/li/libks/1001-tests-testhash.c-Properly-request-shutdown-of-test2-threads.patch b/pkgs/by-name/li/libks/1001-tests-testhash.c-Properly-request-shutdown-of-test2-threads.patch
new file mode 100644
index 000000000000..5e59b385b4f8
--- /dev/null
+++ b/pkgs/by-name/li/libks/1001-tests-testhash.c-Properly-request-shutdown-of-test2-threads.patch
@@ -0,0 +1,31 @@
+From 61f2d2f7e308c42cce652db4a172cfa4b0ff6bf1 Mon Sep 17 00:00:00 2001
+From: OPNA2608 <opna2608@protonmail.com>
+Date: Sat, 18 Oct 2025 22:45:37 +0200
+Subject: [PATCH] tests/testhash.c: Properly request shutdown of test2 threads
+
+So they can be destroyed properly. Fixes sometimes-occuring SIGSEGVs.
+---
+ tests/testhash.c | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/tests/testhash.c b/tests/testhash.c
+index 0769aa6..cb6ed24 100644
+--- a/tests/testhash.c
++++ b/tests/testhash.c
+@@ -134,7 +134,12 @@ int test2(void)
+ 	}
+ 
+ 	for (i = 0; i < ttl; i++) {
+-		ks_thread_destroy(&threads[i]);
++		ks_thread_request_stop(threads[i]);
++	}
++
++	for (i = 0; i < ttl; i++) {
++		ks_thread_join(threads[i]);
++		if (ks_thread_destroy(&threads[i]) != KS_STATUS_SUCCESS) return 0;
+ 	}
+ 
+ 
+-- 
+2.51.0
+
diff --git a/pkgs/by-name/li/libks/package.nix b/pkgs/by-name/li/libks/package.nix
index ec0937c50037..331c10e9f925 100644
--- a/pkgs/by-name/li/libks/package.nix
+++ b/pkgs/by-name/li/libks/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   fetchpatch,
   cmake,
+  ctestCheckHook,
   pkg-config,
   libuuid,
   openssl,
@@ -28,6 +29,9 @@ stdenv.mkDerivation rec {
       url = "https://raw.githubusercontent.com/openwrt/telephony/5ced7ea4fc9bd746273d564bf3c102f253d2182e/libs/libks/patches/01-find-libm.patch";
       sha256 = "1hyrsdxg69d08qzvf3mbrx2363lw52jcybw8i3ynzqcl228gcg8a";
     })
+
+    # Remove when https://github.com/signalwire/libks/pull/246 merged & in release
+    ./1001-tests-testhash.c-Properly-request-shutdown-of-test2-threads.patch
   ];
 
   dontUseCmakeBuildDir = true;
@@ -43,6 +47,25 @@ stdenv.mkDerivation rec {
   ++ lib.optional stdenv.hostPlatform.isLinux libuuid
   ++ lib.optional stdenv.hostPlatform.isDarwin libossp_uuid;
 
+  nativeCheckInputs = [
+    ctestCheckHook
+  ];
+
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
+
+  disabledTests = [
+    # Runs into certificate error on aarch64
+    # [ERROR] [...] testhttp.c:95    init_ssl [...] SSL ERR: CERT CHAIN FILE ERROR
+    "testhttp"
+
+    # Runs into what seems like an overflow / memory corruption in the testing framework on the community runner.
+    # Doesn't happen on local ARM hardware, maybe due to unexpectedly high core count?
+    "testthreadmutex"
+  ];
+
+  # Something seems to go wrong with testwebsock2 when using parallelism
+  enableParallelChecking = false;
+
   passthru = {
     tests.freeswitch = freeswitch;
     updateScript = nix-update-script { };

From bbe9c1e46c3d09edc6716efe17cf9971008ae2b9 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 14 Oct 2025 15:50:22 +0200
Subject: [PATCH 1232/6226] libks: Adopt by NGI team

BigBlueButton uses this.
---
 pkgs/by-name/li/libks/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/li/libks/package.nix b/pkgs/by-name/li/libks/package.nix
index 331c10e9f925..811b7097c7ef 100644
--- a/pkgs/by-name/li/libks/package.nix
+++ b/pkgs/by-name/li/libks/package.nix
@@ -76,6 +76,7 @@ stdenv.mkDerivation rec {
     description = "Foundational support for signalwire C products";
     homepage = "https://github.com/signalwire/libks";
     maintainers = with lib.maintainers; [ misuzu ];
+    teams = [ lib.teams.ngi ];
     platforms = platforms.unix;
     license = licenses.mit;
   };

From 7dc06bb5e2c83c780df6628731a1d7d015b0d1c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 09:54:29 +0000
Subject: [PATCH 1233/6226] grafanaPlugins.frser-sqlite-datasource: 3.8.0 ->
 3.8.2

---
 .../grafana/plugins/frser-sqlite-datasource/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix
index c8dc591c7e2a..fc797bcd6ee5 100644
--- a/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/frser-sqlite-datasource/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "frser-sqlite-datasource";
-  version = "3.8.0";
-  zipHash = "sha256-wk0zEGQjDdz8bIc7e5aiaqg7AaTS6u8zp+WJy5YlWlQ=";
+  version = "3.8.2";
+  zipHash = "sha256-TJMKHB1loDiBrTWKpIUNfcMTBXhorxqvLrdBEuUspto=";
   meta = with lib; {
     description = "Use a SQLite database as a data source in Grafana";
     license = licenses.asl20;

From df6d44b95b3da1da5fa85874dc11129f1074a098 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas.gerbet@enalean.com>
Date: Tue, 21 Oct 2025 11:55:18 +0200
Subject: [PATCH 1234/6226] dockerfmt: 0.3.7 -> 0.3.9

Changes:
https://github.com/reteps/dockerfmt/releases/tag/v0.3.9
https://github.com/reteps/dockerfmt/releases/tag/v0.3.8
---
 pkgs/by-name/do/dockerfmt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/do/dockerfmt/package.nix b/pkgs/by-name/do/dockerfmt/package.nix
index a07d22af7c8a..98bbbfa00381 100644
--- a/pkgs/by-name/do/dockerfmt/package.nix
+++ b/pkgs/by-name/do/dockerfmt/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "dockerfmt";
-  version = "0.3.7";
+  version = "0.3.9";
 
   src = fetchFromGitHub {
     owner = "reteps";
     repo = "dockerfmt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cNxPe0LOZyUxyw43fmTQeoxvXcT9K+not/3SvChBSx4=";
+    hash = "sha256-eTsYL2UAVW2M1aQGc5X1gT5cXpXKgshLmN+U5Qro/Qw=";
   };
 
   vendorHash = "sha256-fLGgvAxSAiVSrsnF7r7EpPKCOOD9jzUsXxVQNWjYq80=";

From 7aaff66a8c443998557fba3330361960c5cfe503 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 07:03:50 -0300
Subject: [PATCH 1235/6226] createrepo_c: fix build with cmake4

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

diff --git a/pkgs/by-name/cr/createrepo_c/package.nix b/pkgs/by-name/cr/createrepo_c/package.nix
index f81fb02fbb2b..77374ef25273 100644
--- a/pkgs/by-name/cr/createrepo_c/package.nix
+++ b/pkgs/by-name/cr/createrepo_c/package.nix
@@ -5,6 +5,7 @@
   cmake,
   pkg-config,
   bzip2,
+  doxygen,
   glib,
   curl,
   libxml2,
@@ -36,10 +37,14 @@ stdenv.mkDerivation rec {
       --replace-fail 'execute_process(COMMAND ''${PKG_CONFIG_EXECUTABLE} --variable=completionsdir bash-completion OUTPUT_VARIABLE BASHCOMP_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)' "SET(BASHCOMP_DIR \"$out/share/bash-completion/completions\")"
     substituteInPlace src/python/CMakeLists.txt \
       --replace-fail "EXECUTE_PROCESS(COMMAND \''${PYTHON_EXECUTABLE} -c \"from sys import stdout; from sysconfig import get_path; stdout.write(get_path('platlib'))\" OUTPUT_VARIABLE PYTHON_INSTALL_DIR)" "SET(PYTHON_INSTALL_DIR \"$out/${python3.sitePackages}\")"
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED (VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [
     cmake
+    doxygen
     pkg-config
     rpm
     bash-completion

From ea68ae32d0654abe00205bdfd23b4f21009208db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 10:11:49 +0000
Subject: [PATCH 1236/6226] dns-collector: 1.11.0 -> 1.12.0

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

diff --git a/pkgs/by-name/dn/dns-collector/package.nix b/pkgs/by-name/dn/dns-collector/package.nix
index a52e8cfe8f8d..23140923c324 100644
--- a/pkgs/by-name/dn/dns-collector/package.nix
+++ b/pkgs/by-name/dn/dns-collector/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "dns-collector";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "dmachard";
     repo = "dns-collector";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2NHJs2KdSDw36ePG8s/YSU4wlWG+14NQ6oWJYqMv2Wk=";
+    hash = "sha256-LQJxK2MZtFeFm5keNoNSDHXmxS8z9/fsCV02BGsph74=";
   };
   subPackages = [ "." ];
 
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
     "-X github.com/prometheus/common/version.Version=${finalAttrs.version}"
   ];
 
-  vendorHash = "sha256-N0gaDyOlRvFR1Buj/SKoOjwkVMRxd8Uj7iT/cDBfM9A=";
+  vendorHash = "sha256-nZheY/CbzDR/GB4Nu3xiWXsxrrvu/AKZE0gquBrfXXM=";
 
   passthru.updateScript = nix-update-script { };
 

From dd5715b5b79ad297ccdd76b46fe82a5369fe6dba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 10:20:09 +0000
Subject: [PATCH 1237/6226] python3Packages.gilknocker: 0.4.1.post6 -> 0.4.2

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

diff --git a/pkgs/development/python-modules/gilknocker/default.nix b/pkgs/development/python-modules/gilknocker/default.nix
index fb6b432f3131..337242804af3 100644
--- a/pkgs/development/python-modules/gilknocker/default.nix
+++ b/pkgs/development/python-modules/gilknocker/default.nix
@@ -17,19 +17,19 @@
 
 buildPythonPackage rec {
   pname = "gilknocker";
-  version = "0.4.1.post6";
+  version = "0.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "milesgranger";
     repo = "gilknocker";
     tag = "v${version}";
-    hash = "sha256-jJOI7hlm6kcqfBbM56y5mKD+lJe0g+qAQpDF7ePM+GM=";
+    hash = "sha256-RFLThZRxAXqF/Yzjpmafn2dVavOGJrM9U258FfLej/I=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-cUv0CT8d6Nxjzh/S/hY9jcpeFX/5KvBxSkqOkt4htyU=";
+    hash = "sha256-C3rxqmZMSc6SC8bU5VB61x8Xk/crD3o7Nr1xvzv7uqI=";
   };
 
   nativeBuildInputs =

From f3d874fb9d2240ecacdfd6e2ce75cd442243a04e Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 21 Oct 2025 12:49:41 +0300
Subject: [PATCH 1238/6226] qt6.full: drop

---
 doc/release-notes/rl-2511.section.md        |  2 +
 pkgs/development/libraries/qt-6/default.nix | 55 ++-------------------
 2 files changed, 5 insertions(+), 52 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 579a03c4ec14..81389bf97a8b 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -242,6 +242,8 @@
 
 - `mariadb` now defaults to `mariadb_114` instead of `mariadb_1011`, meaning the default version was upgraded from 10.11.x to 11.4.x. See the [upgrade notes](https://mariadb.com/kb/en/upgrading-from-mariadb-10-11-to-mariadb-11-4/) for potential issues.
 
+- `qt5.full` and `qt6.full` aliases have been removed. Their use has always been discouraged, and downstream projects should use `qtN.env` with the right set of packages.
+
 - `python3Packages.duckduckgo-search` has been updated to v9+ and therefore has been renamed to ddgs.
   Use `python3Packages.ddgs` instead.
   See [release note for v9.0.0](https://github.com/deedy5/ddgs/releases/tag/v9.0.0)
diff --git a/pkgs/development/libraries/qt-6/default.nix b/pkgs/development/libraries/qt-6/default.nix
index e24c2c825240..2236001ad901 100644
--- a/pkgs/development/libraries/qt-6/default.nix
+++ b/pkgs/development/libraries/qt-6/default.nix
@@ -67,58 +67,6 @@ let
         inherit (srcs.qtbase) src version;
       };
       env = callPackage ./qt-env.nix { };
-      full = callPackage (
-        { env, qtbase }:
-        env "qt-full-${qtbase.version}"
-          # `with self` is ok to use here because having these spliced is unnecessary
-          (
-            with self;
-            [
-              qt3d
-              qt5compat
-              qtcharts
-              qtconnectivity
-              qtdatavis3d
-              qtdeclarative
-              qtdoc
-              qtgraphs
-              qtgrpc
-              qthttpserver
-              qtimageformats
-              qtlanguageserver
-              qtlocation
-              qtlottie
-              qtmultimedia
-              qtmqtt
-              qtnetworkauth
-              qtpositioning
-              qtsensors
-              qtserialbus
-              qtserialport
-              qtshadertools
-              qtspeech
-              qtquick3d
-              qtquick3dphysics
-              qtquickeffectmaker
-              qtquicktimeline
-              qtremoteobjects
-              qtsvg
-              qtscxml
-              qttools
-              qttranslations
-              qtvirtualkeyboard
-              qtwebchannel
-              qtwebengine
-              qtwebsockets
-              qtwebview
-            ]
-            ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
-              qtwayland
-              libglvnd
-            ]
-          )
-      ) { };
-
       qt3d = callPackage ./modules/qt3d.nix { };
       qt5compat = callPackage ./modules/qt5compat.nix { };
       qtcharts = callPackage ./modules/qtcharts.nix { };
@@ -213,6 +161,9 @@ let
           };
         } ./hooks/qmake-hook.sh
       ) { };
+    }
+    // lib.optionalAttrs config.allowAliases {
+      full = throw "qt6.full has been removed. Please use individual packages instead."; # Added 2025-10-21
     };
 
   baseScope = makeScopeWithSplicing' {

From 873668450eaa9a24e9f30f92c79f7063c476e19a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 10:24:49 +0000
Subject: [PATCH 1239/6226] saber: 0.26.7 -> 0.26.10

---
 pkgs/by-name/sa/saber/gitHashes.json    |   3 +-
 pkgs/by-name/sa/saber/package.nix       |   4 +-
 pkgs/by-name/sa/saber/pubspec.lock.json | 135 ++++++++++++++----------
 3 files changed, 82 insertions(+), 60 deletions(-)

diff --git a/pkgs/by-name/sa/saber/gitHashes.json b/pkgs/by-name/sa/saber/gitHashes.json
index 3ee14f88f491..caa97b756568 100644
--- a/pkgs/by-name/sa/saber/gitHashes.json
+++ b/pkgs/by-name/sa/saber/gitHashes.json
@@ -1,4 +1,5 @@
 {
   "flutter_secure_storage_linux": "sha256-cFNHW7dAaX8BV7arwbn68GgkkBeiAgPfhMOAFSJWlyY=",
-  "receive_sharing_intent": "sha256-8D5ZENARPZ7FGrdIErxOoV3Ao35/XoQ2tleegI42ZUY="
+  "receive_sharing_intent": "sha256-8D5ZENARPZ7FGrdIErxOoV3Ao35/XoQ2tleegI42ZUY=",
+  "yaru": "sha256-1sx2jtU6TXtzdGQn14dGZUszxqRBAEJkuEM5mDG7cR4="
 }
diff --git a/pkgs/by-name/sa/saber/package.nix b/pkgs/by-name/sa/saber/package.nix
index 318c4f8d258c..ce23e0efe3b3 100644
--- a/pkgs/by-name/sa/saber/package.nix
+++ b/pkgs/by-name/sa/saber/package.nix
@@ -23,13 +23,13 @@ let
     ln -s ${zlib}/lib $out/lib
   '';
 
-  version = "0.26.7";
+  version = "0.26.10";
 
   src = fetchFromGitHub {
     owner = "saber-notes";
     repo = "saber";
     tag = "v${version}";
-    hash = "sha256-XIDz2WcPZfiW4DE4/CZqmk/Lyu164GIS3moAJG9sbk0=";
+    hash = "sha256-PmkhIyRbRWp+ZujP8R1/h7NpKwYsaKx4JtYIikZjVzc=";
   };
 in
 flutter335.buildFlutterApplication {
diff --git a/pkgs/by-name/sa/saber/pubspec.lock.json b/pkgs/by-name/sa/saber/pubspec.lock.json
index 6eea758d5fa6..68d4c3d117c2 100644
--- a/pkgs/by-name/sa/saber/pubspec.lock.json
+++ b/pkgs/by-name/sa/saber/pubspec.lock.json
@@ -364,11 +364,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_pubspec_licenses",
-        "sha256": "23ddb78ff9204d08e3109ced67cd3c6c6a066f581b0edf5ee092fc3e1127f4ea",
+        "sha256": "fafb90d50c182dd3d4f441c6aea75baff1e5311aab2f6430d3f40f6e3a1f5885",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.4"
+      "version": "3.0.12"
     },
     "dart_quill_delta": {
       "dependency": "transitive",
@@ -534,11 +534,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "e7e16c9d15c36330b94ca0e2ad8cb61f93cd5282d0158c09805aed13b5452f22",
+        "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.3.2"
+      "version": "10.3.3"
     },
     "file_selector_linux": {
       "dependency": "transitive",
@@ -881,21 +881,21 @@
       "dependency": "direct main",
       "description": {
         "name": "go_router",
-        "sha256": "eb059dfe59f08546e9787f895bd01652076f996bcbf485a8609ef990419ad227",
+        "sha256": "c752e2d08d088bf83742cb05bf83003f3e9d276ff1519b5c92f9d5e60e5ddd23",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "16.2.1"
+      "version": "16.2.4"
     },
     "golden_screenshot": {
       "dependency": "direct dev",
       "description": {
         "name": "golden_screenshot",
-        "sha256": "8178266a5827eb74caf7547a19d42051e7493a4bbcc206917f62f4830729b6c3",
+        "sha256": "3cc52015a1acd506d4618ab7e863248f238f1230eaee2897cbbe8d86c3bba54c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.3.0"
+      "version": "5.0.0"
     },
     "gsettings": {
       "dependency": "transitive",
@@ -951,11 +951,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "icons_launcher",
-        "sha256": "e6d806458fac6d3b1126ad757b4208a314ba775b3c8119cd88877091379edc7a",
+        "sha256": "6317d56a73ee528f1dd570d7cd7be120ce58014e0fe635d141ada3d88782f58d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.2"
+      "version": "3.0.3"
     },
     "image": {
       "dependency": "transitive",
@@ -1057,11 +1057,11 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0",
+        "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.0.1"
+      "version": "11.0.2"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
@@ -1147,11 +1147,11 @@
       "dependency": "direct main",
       "description": {
         "name": "material_symbols_icons",
-        "sha256": "2cfd19bf1c3016b0de7298eb3d3444fcb6ef093d934deb870ceb946af89cfa58",
+        "sha256": "9a7de58ffc299c8e362b4e860e36e1d198fa0981a894376fe1b6bfe52773e15b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2872.0"
+      "version": "4.2874.0"
     },
     "matrix4_transform": {
       "dependency": "transitive",
@@ -1213,15 +1213,25 @@
       "source": "hosted",
       "version": "8.1.0"
     },
+    "objective_c": {
+      "dependency": "transitive",
+      "description": {
+        "name": "objective_c",
+        "sha256": "64e35e1e2e79da4e83f2ace3bf4e5437cef523f46c7db2eba9a1419c49573790",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "8.0.0"
+    },
     "one_dollar_unistroke_recognizer": {
       "dependency": "direct main",
       "description": {
         "name": "one_dollar_unistroke_recognizer",
-        "sha256": "459ba12aaada0e85e8f211f62fea649f246ccb74f726527593a0716bf1bcf6c4",
+        "sha256": "599a074c6cec9c1517e382368e5ea470abbd04a82fe3700472a7b042de882384",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.3"
+      "version": "1.3.4"
     },
     "onyxsdk_pen": {
       "dependency": "direct main",
@@ -1326,11 +1336,11 @@
       "dependency": "transitive",
       "description": {
         "name": "package_info_plus",
-        "sha256": "16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968",
+        "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.3.1"
+      "version": "9.0.0"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -1476,21 +1486,21 @@
       "dependency": "direct main",
       "description": {
         "name": "pdfrx",
-        "sha256": "25d45f4b9ea1cc71e1368c569b744eae15caf61745926db2fade85a9d2a79628",
+        "sha256": "e9663e265928dea8ef6f35fde4f9bbfbdafcb894feede38d4bf2b67394051a09",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.12"
+      "version": "2.1.25"
     },
     "pdfrx_engine": {
       "dependency": "transitive",
       "description": {
         "name": "pdfrx_engine",
-        "sha256": "3843477877302b89d0a2cbecaf518f39f2aca35ea9f359c187547345790fe5f2",
+        "sha256": "7327361eb4e63660996a16773b6f57120a267796431cd29d7d3b1150d51934de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.15"
+      "version": "0.1.21"
     },
     "perfect_freehand": {
       "dependency": "direct main",
@@ -1682,6 +1692,16 @@
       "source": "hosted",
       "version": "6.1.5+1"
     },
+    "pub_semver": {
+      "dependency": "transitive",
+      "description": {
+        "name": "pub_semver",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.2.0"
+    },
     "qr": {
       "dependency": "transitive",
       "description": {
@@ -1696,11 +1716,11 @@
       "dependency": "transitive",
       "description": {
         "name": "quill_native_bridge",
-        "sha256": "00752aca7d67cbd3254709a47558be78427750cb81aa42cfbed354d4a079bcfa",
+        "sha256": "76a16512e398e84216f3f659f7cb18a89ec1e141ea908e954652b4ce6cf15b18",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.0.1"
+      "version": "11.1.0"
     },
     "quill_native_bridge_android": {
       "dependency": "transitive",
@@ -1723,7 +1743,7 @@
       "version": "0.0.1"
     },
     "quill_native_bridge_linux": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "quill_native_bridge_linux",
         "sha256": "388aaa62017dbd746742ce0bfae99f4ffe1dda2462e8a866df630c67b63c54fe",
@@ -1897,11 +1917,11 @@
       "dependency": "transitive",
       "description": {
         "name": "sentry",
-        "sha256": "d9f3dcf1ecdd600cf9ce134f622383adde5423ecfdaf0ca9b20fbc1c44849337",
+        "sha256": "0a3a1e6b3b3873070d4dbefc6968f0d31e698ed55b4eb8ee185b230f35733b59",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.6.0"
+      "version": "9.7.0"
     },
     "sentry_dart_plugin": {
       "dependency": "direct dev",
@@ -1917,31 +1937,31 @@
       "dependency": "direct main",
       "description": {
         "name": "sentry_flutter",
-        "sha256": "37deb4ef8837d10b5c1f527ec18591f8d2d2da9c34f19b3d97ccbbe7f84077c0",
+        "sha256": "493b4adb378dfc93fb1595acca91834bbf56194a9038c400c9306588ad6a2f88",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.6.0"
+      "version": "9.7.0"
     },
     "sentry_logging": {
       "dependency": "direct main",
       "description": {
         "name": "sentry_logging",
-        "sha256": "040046d5fe79b94b1c73069031547c066ab37bcbd18c029dc3ceeb9b5d0c67c5",
+        "sha256": "d6a51795c5643a40928f77424dd2bd28a9a58f7c527d3f8d5e001c54ee98c51a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.6.0"
+      "version": "9.7.0"
     },
     "share_plus": {
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "d7dc0630a923883c6328ca31b89aa682bacbf2f8304162d29f7c6aaff03a27a1",
+        "sha256": "3424e9d5c22fd7f7590254ba09465febd6f8827c8b19a44350de4ac31d92d3a6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.1.0"
+      "version": "12.0.0"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
@@ -1967,11 +1987,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "a2608114b1ffdcbc9c120eb71a0e207c71da56202852d4aab8a5e30a82269e74",
+        "sha256": "0b0f98d535319cb5cdd4f65783c2a54ee6d417a2f093dbb18be3e36e4c3d181f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.12"
+      "version": "2.4.14"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -2043,21 +2063,21 @@
       "dependency": "direct main",
       "description": {
         "name": "slang",
-        "sha256": "b02c531f453c328a1343818c64d730357ac140860147c9a29030fdfc82039266",
+        "sha256": "47182d10ce284e232f25a02eb74a421a11e7eb6a6fab9ab84fd8182bb0761130",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.8.1"
+      "version": "4.9.0"
     },
     "slang_flutter": {
       "dependency": "direct main",
       "description": {
         "name": "slang_flutter",
-        "sha256": "7a5e55f2b1ec99e06354a5213b992d34017efacccba8ffc6066cfc5517cc0282",
+        "sha256": "5ecf841d6252c05ea335920ec299bb7edbb860eb793eebb4b40f68b9d148a571",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.8.0"
+      "version": "4.9.0"
     },
     "source_span": {
       "dependency": "transitive",
@@ -2093,21 +2113,21 @@
       "dependency": "direct main",
       "description": {
         "name": "stow",
-        "sha256": "5a2664c0dce3ad09499031b6db7686ff788f71d86ddfebde98916aa1e8caa14b",
+        "sha256": "4b8dbb36bb4fdbd47e9c3d3ce434e32dd91c98dd1ed469c769d5ebeb90949948",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.1"
+      "version": "0.5.1+1"
     },
     "stow_codecs": {
       "dependency": "direct main",
       "description": {
         "name": "stow_codecs",
-        "sha256": "edfaee5b03d6b23df277889ec80e587e66d48fbbf7f7ef925a9d1046d08a3ec0",
+        "sha256": "f35c83e853ca250261c42788141ef64e4c36d83b2613cd5927bd9f070843ad28",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0+1"
+      "version": "1.4.0"
     },
     "stow_plain": {
       "dependency": "direct main",
@@ -2193,11 +2213,11 @@
       "dependency": "transitive",
       "description": {
         "name": "system_info2",
-        "sha256": "65206bbef475217008b5827374767550a5420ce70a04d2d7e94d1d2253f3efc9",
+        "sha256": "b937736ecfa63c45b10dde1ceb6bb30e5c0c340e14c441df024150679d65ac43",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.0"
+      "version": "4.1.0"
     },
     "term_glyph": {
       "dependency": "transitive",
@@ -2273,11 +2293,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "69ee86740f2847b9a4ba6cffa74ed12ce500bbe2b07f3dc1e643439da60637b7",
+        "sha256": "c0fb544b9ac7efa10254efaf00a951615c362d1ea1877472f8f6c0fa00fcf15b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.18"
+      "version": "6.3.23"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
@@ -2413,11 +2433,11 @@
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c",
+        "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.3"
+      "version": "1.1.4"
     },
     "web": {
       "dependency": "transitive",
@@ -2443,11 +2463,11 @@
       "dependency": "transitive",
       "description": {
         "name": "win32",
-        "sha256": "66814138c3562338d05613a6e368ed8cfb237ad6d64a9e9334be3f309acfca03",
+        "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.14.0"
+      "version": "5.15.0"
     },
     "win32_registry": {
       "dependency": "transitive",
@@ -2483,11 +2503,11 @@
       "dependency": "direct main",
       "description": {
         "name": "worker_manager",
-        "sha256": "af3db5e6c6c8a74ab8f72e25e9d305f8ff60984ca55551397e3c8828ebf30509",
+        "sha256": "1bce9f894a0c187856f5fc0e150e7fe1facce326f048ca6172947754dac3d4f3",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.2.6"
+      "version": "7.2.7"
     },
     "workmanager": {
       "dependency": "direct main",
@@ -2572,11 +2592,12 @@
     "yaru": {
       "dependency": "direct main",
       "description": {
-        "name": "yaru",
-        "sha256": "67ac8c3dc52a5d69c049056d5fa40b909973e10b36df3cffeb666de867532d79",
-        "url": "https://pub.dev"
+        "path": ".",
+        "ref": "fix/keep-text-style",
+        "resolved-ref": "87779a4a78b793ad86a5d7177f223664e1ae0152",
+        "url": "https://github.com/adil192/yaru.dart.git"
       },
-      "source": "hosted",
+      "source": "git",
       "version": "8.3.0"
     },
     "yaru_window": {

From 3379edc0b0e819751e666ed085f4fc1c1fe6a131 Mon Sep 17 00:00:00 2001
From: 0x4A6F <0x4A6F@users.noreply.github.com>
Date: Tue, 21 Oct 2025 08:11:52 +0200
Subject: [PATCH 1240/6226] rotonda: 0.4.2 -> 0.5.0

Release: https://github.com/NLnetLabs/rotonda/releases/tag/v0.5.0
Changes: https://github.com/NLnetLabs/rotonda/compare/v0.4.2...v0.5.0
---
 pkgs/by-name/ro/rotonda/package.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ro/rotonda/package.nix b/pkgs/by-name/ro/rotonda/package.nix
index 6d18cef194b9..12f5ee3ba95e 100644
--- a/pkgs/by-name/ro/rotonda/package.nix
+++ b/pkgs/by-name/ro/rotonda/package.nix
@@ -10,18 +10,23 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rotonda";
-  version = "0.4.2";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "NLnetLabs";
     repo = "rotonda";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-B2sdQr9PctWZBpDuatJkUApW5T98BQa4HiqL8+HHevY=";
+    hash = "sha256-7SVhxUpQq1CCDYNc0xza/2ixjKF8kHBSobt4S+azLQU=";
   };
 
-  cargoHash = "sha256-XbBlA7QYUtD4uBz4t5ZR70o9bMgVLeSzq6Lexe0jzME=";
+  cargoHash = "sha256-4wldyvg0VOFTlM0FN/BSsyDNp5HbRumw4Lv4VEJlPfI=";
 
-  checkFlags =
+  checkFlags = [
+    # Broken in sandbox:
+    "--skip=http_api_responses_multiple_gets"
+    "--skip=representation::genoutput_json"
+  ]
+  ++
     lib.optionals
       (stdenv.hostPlatform.system == "aarch64-darwin" || stdenv.hostPlatform.system == "x86_64-darwin")
       [
@@ -36,10 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   passthru = {
     updateScript = nix-update-script { };
     tests.version = testers.testVersion {
-      package = rotonda;
-      command = "rotonda --version";
-      # tag/release with this version string, please revert to `inherit (finalAttrs) version;` on next release
-      version = "0.4.3-dev";
+      package = finalAttrs.finalPackage;
     };
   };
 

From 168a68e7dbc139ab6b5f769cf5b33fba9031830e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 21 Oct 2025 10:27:29 +0000
Subject: [PATCH 1241/6226] python3Packages.scanpy: 1.11.4 -> 1.11.5

Diff: https://github.com/scverse/scanpy/compare/1.11.4...1.11.5

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

diff --git a/pkgs/development/python-modules/scanpy/default.nix b/pkgs/development/python-modules/scanpy/default.nix
index 095f5bbf08df..133513e646ad 100644
--- a/pkgs/development/python-modules/scanpy/default.nix
+++ b/pkgs/development/python-modules/scanpy/default.nix
@@ -44,14 +44,14 @@
 
 buildPythonPackage rec {
   pname = "scanpy";
-  version = "1.11.4";
+  version = "1.11.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scverse";
     repo = "scanpy";
     tag = version;
-    hash = "sha256-EvNelorfLOpYLGGZ1RSq4+jk6emuCWCKBdUop24iLf4=";
+    hash = "sha256-GnZ1qJ4SaTLDzfLAH6IHrYeuMBo8PglKUlj4f3ljeR0=";
   };
 
   build-system = [

From 13fcdd46415643bebc3b95ca79c89bd26c56c4e8 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 07:33:20 -0300
Subject: [PATCH 1242/6226] elkhound: fix build with cmake4

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

diff --git a/pkgs/by-name/el/elkhound/package.nix b/pkgs/by-name/el/elkhound/package.nix
index 8f8daf2823ad..dc170614dccf 100644
--- a/pkgs/by-name/el/elkhound/package.nix
+++ b/pkgs/by-name/el/elkhound/package.nix
@@ -21,6 +21,9 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     patchShebangs scripts
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   sourceRoot = "${src.name}/src";

From f11a23da215bc28bfc682460f972ba32e5d1b54e Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 21 Oct 2025 13:06:43 +0300
Subject: [PATCH 1243/6226] taskwarrior3: 3.4.1 -> 3.4.2

Diff: https://github.com/GothenburgBitFactory/taskwarrior/compare/v3.4.1...v3.4.2

Changelog: https://github.com/GothenburgBitFactory/taskwarrior/releases/tag/v3.4.2
---
 pkgs/by-name/ta/taskwarrior3/package.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ta/taskwarrior3/package.nix b/pkgs/by-name/ta/taskwarrior3/package.nix
index 3f100fbb6b7c..9a1c94241827 100644
--- a/pkgs/by-name/ta/taskwarrior3/package.nix
+++ b/pkgs/by-name/ta/taskwarrior3/package.nix
@@ -11,6 +11,7 @@
   installShellFiles,
 
   # buildInputs
+  corrosion,
   libuuid,
 
   # passthru.tests
@@ -24,18 +25,18 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "taskwarrior";
-  version = "3.4.1";
+  version = "3.4.2";
   src = fetchFromGitHub {
     owner = "GothenburgBitFactory";
     repo = "taskwarrior";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-00HiGju4pIswx8Z+M+ATdBSupiMS2xIm2ZnE52k/RwA=";
+    hash = "sha256-Y0jnAW4OtPI9GCOSFRPf8/wo4qBB6O1FASj40S601+E=";
     fetchSubmodules = true;
   };
   cargoDeps = rustPlatform.fetchCargoVendor {
     name = "${finalAttrs.pname}-${finalAttrs.version}-cargo-deps";
     inherit (finalAttrs) src;
-    hash = "sha256-trc5DIWf68XRBSMjeG/ZchuwFA56wJnLbqm17gE+jYQ=";
+    hash = "sha256-03HG8AGe6PJ516zL23iNjGUYmGOZa8NuFljb1ll2pjs=";
   };
 
   # The CMakeLists files used by upstream issue a `cargo install` command to
@@ -46,6 +47,9 @@ stdenv.mkDerivation (finalAttrs: {
   postUnpack = ''
     export CARGO_HOME=$PWD/.cargo
   '';
+  cmakeFlags = [
+    (lib.cmakeBool "SYSTEM_CORROSION" true)
+  ];
   failingTests = [
     # It would be very hard to make this test succeed, as the bash completion
     # needs to be installed and the builder's `bash` should be aware of it.
@@ -74,12 +78,13 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    corrosion
     libuuid
   ];
 
   doCheck = true;
   # See:
-  # https://github.com/GothenburgBitFactory/taskwarrior/blob/v3.2.0/doc/devel/contrib/development.md#run-the-test-suite
+  # https://github.com/GothenburgBitFactory/taskwarrior/blob/v3.4.1/doc/devel/contrib/development.md#run-the-test-suite
   preCheck = ''
     make test_runner
   '';

From ebe946566b353c27e7c551483eda5ca8fb5196eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 10:49:04 +0000
Subject: [PATCH 1244/6226] nom: 2.18.0 -> 2.20.0

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

diff --git a/pkgs/by-name/no/nom/package.nix b/pkgs/by-name/no/nom/package.nix
index 42d2bcb886b1..ae63b28381c8 100644
--- a/pkgs/by-name/no/nom/package.nix
+++ b/pkgs/by-name/no/nom/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule rec {
   pname = "nom";
-  version = "2.18.0";
+  version = "2.20.0";
 
   src = fetchFromGitHub {
     owner = "guyfedwards";
     repo = "nom";
     tag = "v${version}";
-    hash = "sha256-xIe7CgGzNNYzhkazjrejvZGfuLL4RqFCfXOUtFEgLCA=";
+    hash = "sha256-3jkHwHEuwq+KmPyDqdRsHtU4HJiBSogifufUiFpsYkI=";
   };
 
   vendorHash = "sha256-d5KTDZKfuzv84oMgmsjJoXGO5XYLVKxOB5XehqgRvYw=";

From ae67150a8d7e0903894fa4b0c5a8050e13cd7b21 Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Tue, 21 Oct 2025 12:49:26 +0200
Subject: [PATCH 1245/6226] ffts: fix build with cmake 4

---
 pkgs/by-name/ff/ffts/cmake4.patch | 10 ++++++++++
 pkgs/by-name/ff/ffts/package.nix  |  4 ++++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/by-name/ff/ffts/cmake4.patch

diff --git a/pkgs/by-name/ff/ffts/cmake4.patch b/pkgs/by-name/ff/ffts/cmake4.patch
new file mode 100644
index 000000000000..9c4f91685aef
--- /dev/null
+++ b/pkgs/by-name/ff/ffts/cmake4.patch
@@ -0,0 +1,10 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 748f412..d8821ee 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.10)
+ 
+ project(ffts C ASM)
+ 
diff --git a/pkgs/by-name/ff/ffts/package.nix b/pkgs/by-name/ff/ffts/package.nix
index 25b371610fe5..5e92443d3730 100644
--- a/pkgs/by-name/ff/ffts/package.nix
+++ b/pkgs/by-name/ff/ffts/package.nix
@@ -20,6 +20,10 @@ stdenv.mkDerivation {
 
   cmakeFlags = [ "-DENABLE_SHARED=ON" ];
 
+  patches = [
+    ./cmake4.patch
+  ];
+
   meta = {
     description = "Fastest Fourier Transform in the South";
     homepage = "https://github.com/linkotec/ffts";

From 95625320bff6b09ab0d6d268626444bb9571eb57 Mon Sep 17 00:00:00 2001
From: Tobias M <tobias@miglix.eu>
Date: Tue, 21 Oct 2025 12:51:16 +0200
Subject: [PATCH 1246/6226] nixos/lldap: use exec for start script

Use exec for running lldap itself so that the bash startup script does
not have to linger around.
---
 nixos/modules/services/databases/lldap.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/databases/lldap.nix b/nixos/modules/services/databases/lldap.nix
index e21deef91f33..1680965573c9 100644
--- a/nixos/modules/services/databases/lldap.nix
+++ b/nixos/modules/services/databases/lldap.nix
@@ -224,7 +224,7 @@ in
           fi
         ''
         + ''
-          ${lib.getExe cfg.package} run --config-file ${format.generate "lldap_config.toml" cfg.settings}
+          exec ${lib.getExe cfg.package} run --config-file ${format.generate "lldap_config.toml" cfg.settings}
         '';
       serviceConfig = {
         StateDirectory = "lldap";

From 7a223b26858aaebb44009c8966a1756918e936e3 Mon Sep 17 00:00:00 2001
From: zorrobert <118135271+zorrobert@users.noreply.github.com>
Date: Sun, 5 Oct 2025 12:34:21 +0200
Subject: [PATCH 1247/6226] nixos/syncthing: add option for ignore patterns

Syncthing can be configured to ignore certain files and
directories via ignore patterns. This PR adds a new nix option to
set these patterns declaratively.
---
 .../modules/services/networking/syncthing.nix | 31 ++++++++++-
 nixos/tests/syncthing/folders.nix             | 52 +++++++++++++++++++
 2 files changed, 82 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index c3baf59db455..645852b646d3 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -117,6 +117,7 @@ let
             override = cfg.overrideFolders;
             conf = folders;
             baseAddress = curlAddressArgs "/rest/config/folders";
+            ignoreAddress = curlAddressArgs "/rest/db/ignores";
           };
         }
         [
@@ -142,7 +143,8 @@ let
                 let
                   jsonPreSecretsFile = pkgs.writeTextFile {
                     name = "${conf_type}-${new_cfg.id}-conf-pre-secrets.json";
-                    text = builtins.toJSON new_cfg;
+                    # Remove the ignorePatterns attribute, it is handled separately
+                    text = builtins.toJSON (builtins.removeAttrs new_cfg [ "ignorePatterns" ]);
                   };
                   injectSecretsJqCmd =
                     {
@@ -209,6 +211,13 @@ let
                 ''
                   ${injectSecretsJqCmd} ${jsonPreSecretsFile} | curl --json @- -X POST ${s.baseAddress}
                 ''
+                /*
+                  Check if we are configuring a folder which has ignore patterns.
+                  If it does, write the ignore patterns to the rest API.
+                */
+                + lib.optionalString ((conf_type == "dirs") && (new_cfg.ignorePatterns != null)) ''
+                  curl -d '{"ignore": ${builtins.toJSON new_cfg.ignorePatterns}}' -X POST ${s.ignoreAddress}?folder=${new_cfg.id}
+                ''
               ))
               (lib.concatStringsSep "\n")
             ]
@@ -649,6 +658,26 @@ in
                           Requires running Syncthing as a privileged user, or granting it additional capabilities (e.g. CAP_CHOWN on Linux).
                         '';
                       };
+
+                      ignorePatterns = mkOption {
+                        type = types.nullOr (types.listOf types.str);
+                        default = null;
+                        description = ''
+                          Syncthing can be configured to ignore certain files in a folder using ignore patterns.
+                          Enter them as a list of strings, one string per line.
+                          See the Syncthing documentation for syntax: <https://docs.syncthing.net/users/ignoring.html>
+                          Patterns set using the WebUI will be overridden if you define this option.
+                          If you want to override the ignore patterns to be empty, use `ignorePatterns = []`.
+                          Deleting the `ignorePatterns` option will not remove the patterns from Syncthing automatically
+                          because patterns are only handled by the module if this option is defined. Either use
+                          `ignorePatterns = []` before deleting the option or remove the patterns afterwards using the WebUI.
+                        '';
+                        example = [
+                          "// This is a comment"
+                          "*.part // Firefox downloads and other things"
+                          "*.crdownload // Chrom(ium|e) downloads"
+                        ];
+                      };
                     };
                   }
                 )
diff --git a/nixos/tests/syncthing/folders.nix b/nixos/tests/syncthing/folders.nix
index dbce02b279f2..264b2307aa39 100644
--- a/nixos/tests/syncthing/folders.nix
+++ b/nixos/tests/syncthing/folders.nix
@@ -42,6 +42,14 @@ in
                 }
               ];
             };
+            folders.baz = {
+              path = "/var/lib/syncthing/baz";
+              devices = [
+                "b"
+                "c"
+              ];
+              ignorePatterns = [ ];
+            };
           };
         };
       };
@@ -70,6 +78,16 @@ in
                 }
               ];
             };
+            folders.baz = {
+              path = "/var/lib/syncthing/baz";
+              devices = [
+                "a"
+                "c"
+              ];
+              ignorePatterns = [
+                "notB"
+              ];
+            };
           };
         };
       };
@@ -90,6 +108,16 @@ in
             ];
             type = "receiveencrypted";
           };
+          folders.baz = {
+            path = "/var/lib/syncthing/baz";
+            devices = [
+              "a"
+              "b"
+            ];
+            ignorePatterns = [
+              "notC"
+            ];
+          };
         };
       };
     };
@@ -131,5 +159,29 @@ in
 
     # Bar on C is untrusted, check that content is not in cleartext
     c.fail("grep -R plaincontent /var/lib/syncthing/bar")
+
+    # Test baz
+
+    a.wait_for_file("/var/lib/syncthing/baz")
+    b.wait_for_file("/var/lib/syncthing/baz")
+    c.wait_for_file("/var/lib/syncthing/baz")
+
+    # A creates the file notB, C should get it, B should ignore it
+    a.succeed("echo notB > /var/lib/syncthing/baz/notB")
+    a.succeed("echo controlA > /var/lib/syncthing/baz/controlA")
+    c.wait_for_file("/var/lib/syncthing/baz/notB")
+    c.wait_for_file("/var/lib/syncthing/baz/controlA")
+    b.wait_for_file("/var/lib/syncthing/baz/controlA")
+
+    # B creates the file notC, A should get it, C should ignore it
+    b.succeed("echo notC > /var/lib/syncthing/baz/notC")
+    b.succeed("echo controlB > /var/lib/syncthing/baz/controlB")
+    a.wait_for_file("/var/lib/syncthing/baz/notC")
+    a.wait_for_file("/var/lib/syncthing/baz/controlB")
+    c.wait_for_file("/var/lib/syncthing/baz/controlB")
+
+    # Check that files have been correctly ignored
+    b.fail("cat /var/lib/syncthing/baz/notB")
+    c.fail("cat /var/lib/syncthing/baz/notC")
   '';
 }

From 286aa47c0681592bcf7d1d7e66ffee1b2261d03a Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Mon, 20 Oct 2025 10:04:16 +0530
Subject: [PATCH 1248/6226] scx: remove need for custom update script

nix-shell maintainers/scripts/update.nix --argstr package scx.rustscheds

Should be ran from now on
---
 pkgs/os-specific/linux/scx/default.nix        | 39 ++-----------------
 pkgs/os-specific/linux/scx/scx_cscheds.nix    | 10 +++--
 pkgs/os-specific/linux/scx/scx_full.nix       |  7 ----
 pkgs/os-specific/linux/scx/scx_rustscheds.nix | 34 +++++++++++++---
 pkgs/os-specific/linux/scx/update.sh          | 39 -------------------
 pkgs/os-specific/linux/scx/version.json       |  7 ----
 6 files changed, 39 insertions(+), 97 deletions(-)
 delete mode 100755 pkgs/os-specific/linux/scx/update.sh
 delete mode 100644 pkgs/os-specific/linux/scx/version.json

diff --git a/pkgs/os-specific/linux/scx/default.nix b/pkgs/os-specific/linux/scx/default.nix
index f8d0dbf72f53..2383882a226e 100644
--- a/pkgs/os-specific/linux/scx/default.nix
+++ b/pkgs/os-specific/linux/scx/default.nix
@@ -1,41 +1,10 @@
 {
   lib,
   callPackage,
-  fetchFromGitHub,
 }:
-let
-  scx-common = rec {
-    versionInfo = lib.importJSON ./version.json;
 
-    inherit (versionInfo.scx) version;
-
-    src = fetchFromGitHub {
-      owner = "sched-ext";
-      repo = "scx";
-      tag = "v${versionInfo.scx.version}";
-      inherit (versionInfo.scx) hash;
-    };
-
-    meta = {
-      homepage = "https://github.com/sched-ext/scx";
-      changelog = "https://github.com/sched-ext/scx/releases/tag/v${versionInfo.scx.version}";
-      license = lib.licenses.gpl2Only;
-      platforms = lib.platforms.linux;
-      badPlatforms = [ "aarch64-linux" ];
-      maintainers = with lib.maintainers; [
-        johnrtitor
-        Gliczy
-      ];
-    };
-  };
-
-  schedulers = lib.mergeAttrsList [
-    { cscheds = import ./scx_cscheds.nix; }
-    { rustscheds = import ./scx_rustscheds.nix; }
-    { full = import ./scx_full.nix; }
-  ];
-in
-(lib.mapAttrs (name: scheduler: callPackage scheduler { inherit scx-common; }) schedulers)
-// {
-  inherit scx-common;
+lib.mapAttrs (name: scheduler: callPackage scheduler { }) {
+  cscheds = import ./scx_cscheds.nix;
+  rustscheds = import ./scx_rustscheds.nix;
+  full = import ./scx_full.nix;
 }
diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix
index 8b59bcb9aab5..328710f4831e 100644
--- a/pkgs/os-specific/linux/scx/scx_cscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix
@@ -6,13 +6,13 @@
   elfutils,
   zlib,
   zstd,
-  scx-common,
+  scx,
   libseccomp,
 }:
 
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "scx_cscheds";
-  inherit (scx-common) version src;
+  inherit (scx.rustscheds) version src;
 
   postPatch = ''
     substituteInPlace ./scheds/c/Makefile \
@@ -42,7 +42,11 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
-  meta = scx-common.meta // {
+  passthru = {
+    inherit (scx.rustscheds.passthru) tests;
+  };
+
+  meta = scx.rustscheds.meta // {
     description = "Sched-ext C userspace schedulers";
     longDescription = ''
       This includes C based schedulers such as scx_central, scx_flatcg,
diff --git a/pkgs/os-specific/linux/scx/scx_full.nix b/pkgs/os-specific/linux/scx/scx_full.nix
index c7a2a86e5329..17797c6f3309 100644
--- a/pkgs/os-specific/linux/scx/scx_full.nix
+++ b/pkgs/os-specific/linux/scx/scx_full.nix
@@ -1,9 +1,6 @@
 {
   lib,
-  stdenv,
-  scx-common,
   scx,
-  nixosTests,
 }:
 scx.cscheds.overrideAttrs (oldAttrs: {
   pname = "scx_full";
@@ -11,10 +8,6 @@ scx.cscheds.overrideAttrs (oldAttrs: {
     cp ${lib.getBin scx.rustscheds}/bin/* ${placeholder "out"}/bin/
   '';
 
-  passthru.tests.basic = nixosTests.scx;
-
-  passthru.updateScript.command = ./update.sh;
-
   meta = oldAttrs.meta // {
     description = "Sched-ext C and Rust userspace schedulers";
     longDescription = ''
diff --git a/pkgs/os-specific/linux/scx/scx_rustscheds.nix b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
index 3aca28e3812f..f39b001c3e34 100644
--- a/pkgs/os-specific/linux/scx/scx_rustscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
@@ -6,15 +6,24 @@
   elfutils,
   zlib,
   zstd,
-  scx-common,
+  fetchFromGitHub,
   protobuf,
   libseccomp,
+  nix-update-script,
+  nixosTests,
 }:
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "scx_rustscheds";
-  inherit (scx-common) version src;
+  version = "1.0.17";
 
-  inherit (scx-common.versionInfo.scx) cargoHash;
+  src = fetchFromGitHub {
+    owner = "sched-ext";
+    repo = "scx";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UhFHT8cSrdjhSqjj4qFzn5UvfPOLPwrBh1ytL2gFhzU=";
+  };
+
+  cargoHash = "sha256-yQM2zx1IzGjegwLK4epsluWl8m5RSP3jB00Lpd8+TLE=";
 
   nativeBuildInputs = [
     pkg-config
@@ -52,7 +61,10 @@ rustPlatform.buildRustPackage {
     "--skip=proc_data::tests::test_thread_operations"
   ];
 
-  meta = scx-common.meta // {
+  passthru.tests.basic = nixosTests.scx;
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "Sched-ext Rust userspace schedulers";
     longDescription = ''
       This includes Rust based schedulers such as
@@ -63,5 +75,15 @@ rustPlatform.buildRustPackage {
       It is recommended to use the latest kernel for the best compatibility.
       :::
     '';
+
+    homepage = "https://github.com/sched-ext/scx";
+    changelog = "https://github.com/sched-ext/scx/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    badPlatforms = [ "aarch64-linux" ];
+    maintainers = with lib.maintainers; [
+      johnrtitor
+      Gliczy
+    ];
   };
-}
+})
diff --git a/pkgs/os-specific/linux/scx/update.sh b/pkgs/os-specific/linux/scx/update.sh
deleted file mode 100755
index f76c4c4fa78f..000000000000
--- a/pkgs/os-specific/linux/scx/update.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils moreutils curl jq nix-prefetch-git cargo gnugrep gawk nix
-# shellcheck shell=bash
-
-# You must run it from the root directory of a nixpkgs repo checkout
-
-set -euo pipefail
-
-versionJson="$(realpath "./pkgs/os-specific/linux/scx/version.json")"
-nixFolder="$(dirname "$versionJson")"
-
-localVer=$(jq -r .scx.version <$versionJson)
-latestVer=$(curl -s https://api.github.com/repos/sched-ext/scx/releases/latest | jq -r .tag_name | sed 's/v//g')
-
-if [ "$localVer" == "$latestVer" ]; then
-  exit 0
-fi
-
-latestHash=$(nix-prefetch-git https://github.com/sched-ext/scx.git --rev refs/tags/v$latestVer --quiet | jq -r .hash)
-
-jq \
-  --arg latestVer "$latestVer" --arg latestHash "$latestHash" \
-  ".scx.version = \$latestVer | .scx.hash = \$latestHash" \
-  "$versionJson" | sponge $versionJson
-
-echo "scx: $localVer -> $latestVer"
-
-echo "Updating cargoHash. This may take a while..."
-cargoHash=$((nix-build --attr scx.rustscheds 2>&1 || true) | awk '/got/{print $2}')
-
-if [ -z "$cargoHash" ]; then
-  echo "Failed to get cargoHash, please update it manually"
-  exit 0
-fi
-
-jq \
-  --arg cargoHash "$cargoHash" \
-  ".scx.cargoHash = \$cargoHash" \
-  "$versionJson" | sponge $versionJson
diff --git a/pkgs/os-specific/linux/scx/version.json b/pkgs/os-specific/linux/scx/version.json
deleted file mode 100644
index f9334629755c..000000000000
--- a/pkgs/os-specific/linux/scx/version.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "scx": {
-    "version": "1.0.17",
-    "hash": "sha256-UhFHT8cSrdjhSqjj4qFzn5UvfPOLPwrBh1ytL2gFhzU=",
-    "cargoHash": "sha256-yQM2zx1IzGjegwLK4epsluWl8m5RSP3jB00Lpd8+TLE="
-  }
-}

From 1d1668a995abb6ea578c8f3c70f8e5d3618fc94d Mon Sep 17 00:00:00 2001
From: Sander <hey@sandydoo.me>
Date: Tue, 21 Oct 2025 13:17:25 +0200
Subject: [PATCH 1249/6226] cachix: refactor overrides

---
 .../haskell-modules/configuration-common.nix  | 77 ++++++++++---------
 1 file changed, 40 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index d6bd8bc4302a..0587161a6a68 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -747,43 +747,6 @@ with haskellLib;
   # https://github.com/illia-shkroba/pfile/issues/2
   pfile = doJailbreak super.pfile;
 
-  # Manually maintained
-  cachix-api = overrideCabal (drv: {
-    # FIXME: should use overrideSrc
-    version = "1.7.9";
-    src = pkgs.fetchFromGitHub {
-      owner = "cachix";
-      repo = "cachix";
-      tag = "v1.7.9";
-      hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=";
-    };
-    postUnpack = "sourceRoot=$sourceRoot/cachix-api";
-  }) super.cachix-api;
-  cachix = (
-    overrideCabal
-      (drv: {
-        # FIXME: should use overrideSrc
-        version = "1.7.9";
-        src = pkgs.fetchFromGitHub {
-          owner = "cachix";
-          repo = "cachix";
-          tag = "v1.7.9";
-          hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=";
-        };
-        postUnpack = "sourceRoot=$sourceRoot/cachix";
-        # Fix ambiguous 'show' reference: https://github.com/cachix/cachix/pull/704
-        postPatch = ''
-          sed -i 's/<> show i/<> Protolude.show i/' src/Cachix/Client/NixVersion.hs
-        '';
-      })
-      (
-        super.cachix.override {
-          nix = self.hercules-ci-cnix-store.nixPackage;
-          hnix-store-core = self.hnix-store-core_0_8_0_0;
-        }
-      )
-  );
-
   # Overly strict bounds on postgresql-simple (< 0.7), tasty (< 1.5) and tasty-quickcheck (< 0.11)
   # https://github.com/tdammers/migrant/pull/5
   migrant-core = doJailbreak super.migrant-core;
@@ -4070,3 +4033,43 @@ with haskellLib;
     );
   }
 )
+
+# cachix: manually maintained
+// (
+  let
+    version = "1.7.9";
+
+    src = pkgs.fetchFromGitHub {
+      owner = "cachix";
+      repo = "cachix";
+      tag = "v${version}";
+      hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=";
+    };
+  in
+  {
+    cachix-api = overrideSrc {
+      inherit version;
+      src = src + "/cachix-api";
+    } super.cachix-api;
+
+    cachix = lib.pipe super.cachix [
+      (overrideSrc {
+        inherit version;
+        src = src + "/cachix";
+      })
+      # Fix ambiguous 'show' reference: https://github.com/cachix/cachix/pull/704
+      (overrideCabal (_: {
+        postPatch = ''
+          sed -i 's/<> show i/<> Protolude.show i/' src/Cachix/Client/NixVersion.hs
+        '';
+      }))
+      (
+        drv:
+        drv.override {
+          nix = self.hercules-ci-cnix-store.nixPackage;
+          hnix-store-core = self.hnix-store-core_0_8_0_0;
+        }
+      )
+    ];
+  }
+)

From cf4d56f72ee30929377f416b0a4f0aab7b9611ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 11:19:12 +0000
Subject: [PATCH 1250/6226] projectm-sdl-cpp: 0-unstable-2025-10-08 ->
 0-unstable-2025-10-17

---
 pkgs/by-name/pr/projectm-sdl-cpp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/projectm-sdl-cpp/package.nix b/pkgs/by-name/pr/projectm-sdl-cpp/package.nix
index d5b93b643ce7..f5b99b1af790 100644
--- a/pkgs/by-name/pr/projectm-sdl-cpp/package.nix
+++ b/pkgs/by-name/pr/projectm-sdl-cpp/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation {
   pname = "projectm-sdl-cpp";
-  version = "0-unstable-2025-10-08";
+  version = "0-unstable-2025-10-17";
 
   src = fetchFromGitHub {
     owner = "projectM-visualizer";
     repo = "frontend-sdl-cpp";
-    rev = "7131af0618e4d7f4b64c623ad92795fef5a2d87a";
-    hash = "sha256-pXQGMwjOh7LjDuUPbXp5l9O4aSWqnTxdZSMtDzZ8118=";
+    rev = "72e5632897c9d9bef452c679d3cbe8c7b4bb4157";
+    hash = "sha256-uO2+CX2DqVn6NdcZhBlKFIPuUQpz6N8LazG3ALJTSx0=";
     fetchSubmodules = true;
   };
 

From cac05349d4275cd1e4235ab8e21c2dc23323699b Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Tue, 21 Oct 2025 16:51:48 +0530
Subject: [PATCH 1251/6226] scx: update homepage link

---
 pkgs/os-specific/linux/scx/scx_cscheds.nix    | 5 +++--
 pkgs/os-specific/linux/scx/scx_full.nix       | 1 +
 pkgs/os-specific/linux/scx/scx_rustscheds.nix | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/scx/scx_cscheds.nix b/pkgs/os-specific/linux/scx/scx_cscheds.nix
index 328710f4831e..c9f419c59b3c 100644
--- a/pkgs/os-specific/linux/scx/scx_cscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_cscheds.nix
@@ -10,7 +10,7 @@
   libseccomp,
 }:
 
-llvmPackages.stdenv.mkDerivation (finalAttrs: {
+llvmPackages.stdenv.mkDerivation {
   pname = "scx_cscheds";
   inherit (scx.rustscheds) version src;
 
@@ -57,5 +57,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
       It is recommended to use the latest kernel for the best compatibility.
       :::
     '';
+    homepage = "https://github.com/sched-ext/scx/tree/main/scheds/c";
   };
-})
+}
diff --git a/pkgs/os-specific/linux/scx/scx_full.nix b/pkgs/os-specific/linux/scx/scx_full.nix
index 17797c6f3309..8edcfbee8c70 100644
--- a/pkgs/os-specific/linux/scx/scx_full.nix
+++ b/pkgs/os-specific/linux/scx/scx_full.nix
@@ -20,5 +20,6 @@ scx.cscheds.overrideAttrs (oldAttrs: {
       It is recommended to use the latest kernel for the best compatibility.
       :::
     '';
+    homepage = "https://github.com/sched-ext/scx";
   };
 })
diff --git a/pkgs/os-specific/linux/scx/scx_rustscheds.nix b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
index f39b001c3e34..87665e5a1c78 100644
--- a/pkgs/os-specific/linux/scx/scx_rustscheds.nix
+++ b/pkgs/os-specific/linux/scx/scx_rustscheds.nix
@@ -76,7 +76,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       :::
     '';
 
-    homepage = "https://github.com/sched-ext/scx";
+    homepage = "https://github.com/sched-ext/scx/tree/main/scheds/rust";
     changelog = "https://github.com/sched-ext/scx/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.gpl2Only;
     platforms = lib.platforms.linux;

From 97cbccda7ae78f4b202ef353abe2e4b51730af5c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 11:30:35 +0000
Subject: [PATCH 1252/6226] python3Packages.pcodec: 0.4.6 -> 0.4.7

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

diff --git a/pkgs/development/python-modules/pcodec/default.nix b/pkgs/development/python-modules/pcodec/default.nix
index c1bc8b0480b8..bb36f4c92053 100644
--- a/pkgs/development/python-modules/pcodec/default.nix
+++ b/pkgs/development/python-modules/pcodec/default.nix
@@ -10,19 +10,19 @@
 
 buildPythonPackage rec {
   pname = "pcodec";
-  version = "0.4.6";
+  version = "0.4.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pcodec";
     repo = "pcodec";
     tag = "v${version}";
-    hash = "sha256-5NB+PoCS6yGT8N+MD4mdMRRMKCmlQcqdFPTW924UVgU=";
+    hash = "sha256-B96kMozVXLoLv0xP2o5IkI+d+4j0wIy4G4VruFS9b6M=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-vHADxRV9DOYhUg3IOm1HNk3RHB0/WKluD2PH3Hg8k7s=";
+    hash = "sha256-N1KOCZKpz+7yzCefv8AUk1kEmpct//mVCp7a8EW02oA=";
   };
 
   buildAndTestSubdir = "pco_python";

From 6b2c3433e789d3f68acd5fd5908928105cbdf85f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 11:32:12 +0000
Subject: [PATCH 1253/6226] storj-uplink: 1.137.5 -> 1.140.3

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

diff --git a/pkgs/by-name/st/storj-uplink/package.nix b/pkgs/by-name/st/storj-uplink/package.nix
index 96098914efdd..319a6d8fafca 100644
--- a/pkgs/by-name/st/storj-uplink/package.nix
+++ b/pkgs/by-name/st/storj-uplink/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "storj-uplink";
-  version = "1.137.5";
+  version = "1.140.3";
 
   src = fetchFromGitHub {
     owner = "storj";
     repo = "storj";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QvmCtW8szGoo7sNHbChvtkTOUOxf1TQHQCoYeV1pN9o=";
+    hash = "sha256-B33czQ2ffOsTEFpexwhIuxWp8xZMLrjwX+pMbPh1R7U=";
   };
 
   subPackages = [ "cmd/uplink" ];
 
-  vendorHash = "sha256-YWqrdjB6lOOdt99XOrh27O1gza6qZ2Xn+9XfTnwOJsw=";
+  vendorHash = "sha256-qlzHbGOcr+TeWkGNsGYsUodHaKbAW/5qyObRhOFa10M=";
 
   ldflags = [ "-s" ];
 

From 655969d13285c1cfb2dc9a61b9ef1a73f8bab1f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 11:33:22 +0000
Subject: [PATCH 1254/6226] python3Packages.pglast: 7.7 -> 7.8

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

diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix
index 5bcd04876042..b455e4859292 100644
--- a/pkgs/development/python-modules/pglast/default.nix
+++ b/pkgs/development/python-modules/pglast/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pglast";
-  version = "7.7";
+  version = "7.8";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Xfv8H6OYGWQ6O5FaE2aOQ7vWwLAUqt9dC0MJ6GC6y7A=";
+    hash = "sha256-2tSZKS3dXK6236Q1sox4wpCAgkQ91eqr0RZWMmY/Fz8=";
   };
 
   build-system = [ setuptools ];

From dd7d99efa9cbc19260910a288708f683385c9f86 Mon Sep 17 00:00:00 2001
From: Sander <hey@sandydoo.me>
Date: Tue, 21 Oct 2025 13:25:33 +0200
Subject: [PATCH 1255/6226] cachix: 1.7.9 -> 1.9.1

---
 .../haskell-modules/configuration-common.nix     | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix
index 0587161a6a68..b42dbb5a4b33 100644
--- a/pkgs/development/haskell-modules/configuration-common.nix
+++ b/pkgs/development/haskell-modules/configuration-common.nix
@@ -4034,16 +4034,17 @@ with haskellLib;
   }
 )
 
-# cachix: manually maintained
+# Cachix packages
+# Manually maintained
 // (
   let
-    version = "1.7.9";
+    version = "1.9.1";
 
     src = pkgs.fetchFromGitHub {
       owner = "cachix";
       repo = "cachix";
       tag = "v${version}";
-      hash = "sha256-R0W7uAg+BLoHjMRMQ8+oiSbTq8nkGz5RDpQ+ZfxxP3A=";
+      hash = "sha256-IwnNtbNVrlZIHh7h4Wz6VP0Furxg9Hh0ycighvL5cZc=";
     };
   in
   {
@@ -4057,12 +4058,9 @@ with haskellLib;
         inherit version;
         src = src + "/cachix";
       })
-      # Fix ambiguous 'show' reference: https://github.com/cachix/cachix/pull/704
-      (overrideCabal (_: {
-        postPatch = ''
-          sed -i 's/<> show i/<> Protolude.show i/' src/Cachix/Client/NixVersion.hs
-        '';
-      }))
+      (addBuildDepends [
+        self.pqueue
+      ])
       (
         drv:
         drv.override {

From 88ac990488eb6074156ef5a9d6efc6d863722032 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 08:31:18 -0300
Subject: [PATCH 1256/6226] eq10q: fix build with cmake4

---
 pkgs/by-name/eq/eq10q/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/eq/eq10q/package.nix b/pkgs/by-name/eq/eq10q/package.nix
index 5a6de756f6f9..3e758c0c94ca 100644
--- a/pkgs/by-name/eq/eq10q/package.nix
+++ b/pkgs/by-name/eq/eq10q/package.nix
@@ -45,13 +45,17 @@ stdenv.mkDerivation rec {
     # Fix build with lv2 1.18: https://sourceforge.net/p/eq10q/bugs/23/
     find . -type f -exec fgrep -q LV2UI_Descriptor {} \; \
       -exec sed -i {} -e 's/const _\?LV2UI_Descriptor/const LV2UI_Descriptor/' \;
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   installFlags = [ "DESTDIR=$(out)" ];
 
   fixupPhase = ''
-    cp -r $out/var/empty/local/lib $out
-    rm -R $out/var
+    mkdir -p $out/lib
+    mv $out/usr/local/lib/* $out/lib/
+    rm -R $out/usr
   '';
 
   meta = {

From 3864a2a11a680190f9db01c5a11372b8dae3fd5f Mon Sep 17 00:00:00 2001
From: Rexiel Scarlet <37258415+Rexcrazy804@users.noreply.github.com>
Date: Tue, 21 Oct 2025 15:42:06 +0400
Subject: [PATCH 1257/6226] qjoypad: fix build with cmake 4

---
 pkgs/tools/misc/qjoypad/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/misc/qjoypad/default.nix b/pkgs/tools/misc/qjoypad/default.nix
index 7c16bd121bec..5059fb58bfea 100644
--- a/pkgs/tools/misc/qjoypad/default.nix
+++ b/pkgs/tools/misc/qjoypad/default.nix
@@ -21,6 +21,11 @@ mkDerivation rec {
     hash = "sha256:1w26ddxb1xirb7qjf7kv9llxzjhbhcb7warnxbx41qhbni46g26y";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.11)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [
     pkg-config
     cmake

From 506e185a33abecfff2d720966fcb915154e19298 Mon Sep 17 00:00:00 2001
From: Fred Frey <fred@fpf3.net>
Date: Mon, 20 Oct 2025 09:22:11 -0400
Subject: [PATCH 1258/6226] synergy: substitute cmake minimum version

---
 pkgs/applications/misc/synergy/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix
index ab350c2509ae..7fc41a067fcd 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/applications/misc/synergy/default.nix
@@ -48,11 +48,14 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace src/gui/src/SslCertificate.cpp \
-      --replace 'kUnixOpenSslCommand[] = "openssl";' 'kUnixOpenSslCommand[] = "${openssl}/bin/openssl";'
+      --replace-fail 'kUnixOpenSslCommand[] = "openssl";' 'kUnixOpenSslCommand[] = "${openssl}/bin/openssl";'
+
+    substituteInPlace CMakeLists.txt cmake/Version.cmake src/gui/CMakeLists.txt \
+    --replace-fail "cmake_minimum_required (VERSION 3.4)" "cmake_minimum_required(VERSION 3.10)"
   ''
   + lib.optionalString stdenv.hostPlatform.isLinux ''
     substituteInPlace src/lib/synergy/unix/AppUtilUnix.cpp \
-      --replace "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"
+      --replace-fail "/usr/share/X11/xkb/rules/evdev.xml" "${xkeyboardconfig}/share/X11/xkb/rules/evdev.xml"
   '';
 
   nativeBuildInputs = [

From 18bd2aac0efb143410f827772bd51c814cc969fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 11:50:54 +0000
Subject: [PATCH 1259/6226] python3Packages.google-cloud-webrisk: 1.18.1 ->
 1.19.0

---
 .../python-modules/google-cloud-webrisk/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-webrisk/default.nix b/pkgs/development/python-modules/google-cloud-webrisk/default.nix
index ad6b545c1306..43db35398b72 100644
--- a/pkgs/development/python-modules/google-cloud-webrisk/default.nix
+++ b/pkgs/development/python-modules/google-cloud-webrisk/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-webrisk";
-  version = "1.18.1";
+  version = "1.19.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_webrisk";
     inherit version;
-    hash = "sha256-3OUxiDZtRfmipeyCW8in6+GkVnlilWgE8Hzr6G+1KQU=";
+    hash = "sha256-TuWU+3pfwFt8E06zUDAY8+JJb+2j4l/eHP7Y0dgE0gs=";
   };
 
   build-system = [ setuptools ];

From f15201fa483eaad69bf6559aa8a9898a5b714921 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Tue, 21 Oct 2025 19:55:54 +0800
Subject: [PATCH 1260/6226] python3Packages.fenics-basix: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/development/python-modules/fenics-basix/default.nix b/pkgs/development/python-modules/fenics-basix/default.nix
index 4d4d10b5c583..35d8b3b3d3c7 100644
--- a/pkgs/development/python-modules/fenics-basix/default.nix
+++ b/pkgs/development/python-modules/fenics-basix/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "fenics-basix";
-  version = "0.9.0";
+  version = "0.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fenics";
     repo = "basix";
     tag = "v${version}";
-    hash = "sha256-jLQMDt6zdl+oixd5Qevn4bvxBsXpTNcbH2Os6TC9sRQ=";
+    hash = "sha256-atrfIMyLY9EAyw6eiVaC/boG2/a8PCrrv/7J0ntHgSo=";
   };
 
   dontUseCmakeConfigure = true;

From f8c8434b0e0b5a5254aba145a2aa5be2d98acd12 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 07:43:32 -0300
Subject: [PATCH 1261/6226] ensemble-chorus: fix build with cmake4

---
 pkgs/by-name/en/ensemble-chorus/package.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/by-name/en/ensemble-chorus/package.nix b/pkgs/by-name/en/ensemble-chorus/package.nix
index 0bc9963b7bfd..ba5f43d8b69a 100644
--- a/pkgs/by-name/en/ensemble-chorus/package.nix
+++ b/pkgs/by-name/en/ensemble-chorus/package.nix
@@ -47,6 +47,18 @@ stdenv.mkDerivation {
     libjack2
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION "3.3")' \
+      'cmake_minimum_required(VERSION 4.0)'
+    substituteInPlace thirdparty/gsl-lite/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required( VERSION 3.0 FATAL_ERROR )' \
+      'cmake_minimum_required(VERSION 4.0)'
+    substituteInPlace thirdparty/jsl/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 3.3)' \
+      'cmake_minimum_required(VERSION 4.0)'
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/jpcima/ensemble-chorus";
     description = "Digital model of electronic string ensemble chorus";

From ad3aba152b0405d314b628a487ccc814dafe02b6 Mon Sep 17 00:00:00 2001
From: Rexiel Scarlet <37258415+Rexcrazy804@users.noreply.github.com>
Date: Tue, 21 Oct 2025 16:05:43 +0400
Subject: [PATCH 1262/6226] rang: fix build with cmake 4

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

diff --git a/pkgs/by-name/ra/rang/package.nix b/pkgs/by-name/ra/rang/package.nix
index 37d67d44d103..91e4c573ed1a 100644
--- a/pkgs/by-name/ra/rang/package.nix
+++ b/pkgs/by-name/ra/rang/package.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation rec {
     hash = "sha256-NK7jB5ijcu9OObmfLgiWxlJi4cVAhr7p6m9HKf+5TnQ=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [ cmake ];
 
   meta = {

From cd0ddf1e7a7e566a0bc2bcfa07bf2ab1d02ae50c Mon Sep 17 00:00:00 2001
From: Rexiel Scarlet <37258415+Rexcrazy804@users.noreply.github.com>
Date: Tue, 21 Oct 2025 16:06:08 +0400
Subject: [PATCH 1263/6226] d-seams: fix build with cmake 4

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

diff --git a/pkgs/by-name/d-/d-seams/package.nix b/pkgs/by-name/d-/d-seams/package.nix
index d70e0a7b9de2..46d7cf14ef24 100644
--- a/pkgs/by-name/d-/d-seams/package.nix
+++ b/pkgs/by-name/d-/d-seams/package.nix
@@ -35,6 +35,10 @@ clangStdenv.mkDerivation rec {
       hash = "sha256-PLbT1lqdw+69lIHH96MPcGRjfIeZyb88vc875QLYyqw=";
     })
   ];
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
   nativeBuildInputs = [
     cmake
     lua

From 6e50150544474b9eb82a2207c649e4c84f8345ed Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 09:13:28 -0300
Subject: [PATCH 1264/6226] ericw-tools: fix build with cmake4

---
 pkgs/by-name/er/ericw-tools/package.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/by-name/er/ericw-tools/package.nix b/pkgs/by-name/er/ericw-tools/package.nix
index dba4b02f9de7..011c4cb47b2a 100644
--- a/pkgs/by-name/er/ericw-tools/package.nix
+++ b/pkgs/by-name/er/ericw-tools/package.nix
@@ -61,6 +61,23 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace bspinfo/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace bsputil/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace light/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace qbsp/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace vis/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace man/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://ericwa.github.io/ericw-tools/";
     description = "Map compile tools for Quake and Hexen 2";

From 9ac9b3e391e05158745775782931b934a8229f2d Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Tue, 21 Oct 2025 12:31:03 +0200
Subject: [PATCH 1265/6226] opencode: 0.15.8 -> 0.15.10

https://github.com/sst/opencode/releases/tag/v0.15.9
https://github.com/sst/opencode/releases/tag/v0.15.10
---
 pkgs/by-name/op/opencode/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 4f303a9d42d0..1d38172673f5 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -22,12 +22,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.15.8";
+  version = "0.15.10";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6brfh6yTFGnhUo9kZ5VAcC1whhMPJYYwVIT7j6g+wkw=";
+    hash = "sha256-aP0CLHfuF21GXIvBTgs8RWpcCXOwy1oPW2P8jEU/4u4=";
   };
 
   tui = buildGoModule {
@@ -111,10 +111,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     outputHash =
       {
-        x86_64-linux = "sha256-EfH8fBgP0zsKVu26BxFq1NCwWLG6vlOhDD/WQ7152hA=";
-        aarch64-linux = "sha256-Bwwe9PTYwEJvTLhB2+6yzC4pB2/1J/JGI8S1TSrdOuM=";
-        x86_64-darwin = "sha256-TBSBpuPE+V7oanEMW6F8PvCZSLqIokibsyO1NtbLQnM=";
-        aarch64-darwin = "sha256-+wUulok3OdJ0YewuyOkv5zbiC+3QzhokfT3aCdL5akk=";
+        x86_64-linux = "sha256-iJbflfKwDwKrJQgy5jxrEhkyCie2hsEMmiLf2btE60E=";
+        aarch64-linux = "sha256-wQ+ToXRi+l24WM24PHGCw6acD9cvLDldOv9WvOzHYGU=";
+        x86_64-darwin = "sha256-DyvteSN+mEFZojH8mY4LNQE2C6lCWwrIVbJUFn4lAh0=";
+        aarch64-darwin = "sha256-oICPefgikykFWNDlxCXH4tILdjv4NytgQdejdQBeQ+A=";
       }
       .${stdenv.hostPlatform.system};
     outputHashAlgo = "sha256";

From 1f6015f6ee0b8ab7c51988c83b7236fc79d47160 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 09:32:41 -0300
Subject: [PATCH 1266/6226] genmap: fix build with cmake4

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

diff --git a/pkgs/by-name/ge/genmap/package.nix b/pkgs/by-name/ge/genmap/package.nix
index 10b4a96589b7..1c26feb1209a 100644
--- a/pkgs/by-name/ge/genmap/package.nix
+++ b/pkgs/by-name/ge/genmap/package.nix
@@ -34,6 +34,11 @@ stdenv.mkDerivation rec {
     echo > benchmarks/CMakeLists.txt
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.0.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "Ultra-fast computation of genome mappability";
     mainProgram = "genmap";

From 235f38852d9dff2971eebf5b5dd521e36a7b8de5 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 09:38:30 -0300
Subject: [PATCH 1267/6226] grip-search: fix build with cmake4

---
 pkgs/by-name/gr/grip-search/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/gr/grip-search/package.nix b/pkgs/by-name/gr/grip-search/package.nix
index 9d2f313b4388..c90d80c73485 100644
--- a/pkgs/by-name/gr/grip-search/package.nix
+++ b/pkgs/by-name/gr/grip-search/package.nix
@@ -41,6 +41,9 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace src/general/config.h --replace-fail "CUSTOM-BUILD" "${version}"
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   meta = with lib; {

From f0e3a9160af77840f044e266fdb12886d993e0a0 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 20 Oct 2025 22:21:43 +0000
Subject: [PATCH 1268/6226] python3Packages.pytensor: 2.35.0 -> 2.35.1

Diff:
https://github.com/pymc-devs/pytensor/compare/rel-2.35.0...rel-2.35.1

Changelog: https://github.com/pymc-devs/pytensor/releases/tag/rel-2.35.1
---
 pkgs/development/python-modules/pytensor/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytensor/default.nix b/pkgs/development/python-modules/pytensor/default.nix
index 7b138ce16b7c..d49dcbc7f087 100644
--- a/pkgs/development/python-modules/pytensor/default.nix
+++ b/pkgs/development/python-modules/pytensor/default.nix
@@ -33,7 +33,7 @@
 
 buildPythonPackage rec {
   pname = "pytensor";
-  version = "2.35.0";
+  version = "2.35.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     postFetch = ''
       sed -i 's/git_refnames = "[^"]*"/git_refnames = " (tag: ${src.tag})"/' $out/pytensor/_version.py
     '';
-    hash = "sha256-xQ9qFQhVSxdCB+jsfcxy04HySl7Mq0lGd4cg9bTxU5E=";
+    hash = "sha256-5+yMZysK69g+3uYrP12WK3ngpAYn8XrHoVjLqjvbobg=";
   };
 
   build-system = [
@@ -173,7 +173,7 @@ buildPythonPackage rec {
     description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays";
     mainProgram = "pytensor-cache";
     homepage = "https://github.com/pymc-devs/pytensor";
-    changelog = "https://github.com/pymc-devs/pytensor/releases/tag/rel-${src.tag}";
+    changelog = "https://github.com/pymc-devs/pytensor/releases/tag/${src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       bcdarwin

From f28be96fda7db5759dafc47d03b7e5a70150b5f1 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Tue, 21 Oct 2025 15:42:47 +0300
Subject: [PATCH 1269/6226] treewide: mkAliasOptionModuleMD ->
 mkAliasOptionModule

---
 nixos/modules/config/users-groups.nix           | 6 +++---
 nixos/modules/rename.nix                        | 4 ++--
 nixos/modules/services/networking/ssh/sshd.nix  | 4 ++--
 nixos/modules/services/torrent/transmission.nix | 5 ++---
 nixos/modules/services/x11/picom.nix            | 2 +-
 5 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix
index fd3c1b10d81b..0399962418ad 100644
--- a/nixos/modules/config/users-groups.nix
+++ b/nixos/modules/config/users-groups.nix
@@ -30,7 +30,7 @@ let
     mapAttrs'
     mapAttrsToList
     match
-    mkAliasOptionModuleMD
+    mkAliasOptionModule
     mkDefault
     mkIf
     mkMerge
@@ -666,8 +666,8 @@ let
 in
 {
   imports = [
-    (mkAliasOptionModuleMD [ "users" "extraUsers" ] [ "users" "users" ])
-    (mkAliasOptionModuleMD [ "users" "extraGroups" ] [ "users" "groups" ])
+    (mkAliasOptionModule [ "users" "extraUsers" ] [ "users" "users" ])
+    (mkAliasOptionModule [ "users" "extraGroups" ] [ "users" "groups" ])
     (mkRenamedOptionModule
       [ "security" "initialRootPassword" ]
       [ "users" "users" "root" "initialHashedPassword" ]
diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix
index aede85d7eee8..968ce8c5cf84 100644
--- a/nixos/modules/rename.nix
+++ b/nixos/modules/rename.nix
@@ -2,7 +2,7 @@
 
 let
   inherit (lib)
-    mkAliasOptionModuleMD
+    mkAliasOptionModule
     mkRemovedOptionModule
     ;
 in
@@ -18,7 +18,7 @@ in
 
     # This alias module can't be where _module.check is defined because it would
     # be added to submodules as well there
-    (mkAliasOptionModuleMD [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
+    (mkAliasOptionModule [ "environment" "checkConfigurationOptions" ] [ "_module" "check" ])
 
     # Completely removed modules
     (mkRemovedOptionModule [ "boot" "loader" "raspberryPi" ]
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index c56193cb4f83..bfa1b70bdfd7 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -177,8 +177,8 @@ in
 
 {
   imports = [
-    (lib.mkAliasOptionModuleMD [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ])
-    (lib.mkAliasOptionModuleMD [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ])
+    (lib.mkAliasOptionModule [ "services" "sshd" "enable" ] [ "services" "openssh" "enable" ])
+    (lib.mkAliasOptionModule [ "services" "openssh" "knownHosts" ] [ "programs" "ssh" "knownHosts" ])
     (lib.mkRenamedOptionModule
       [ "services" "openssh" "challengeResponseAuthentication" ]
       [ "services" "openssh" "kbdInteractiveAuthentication" ]
diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index 8454910654bf..e261abe44450 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -9,7 +9,7 @@
 let
   inherit (lib)
     mkRenamedOptionModule
-    mkAliasOptionModuleMD
+    mkAliasOptionModule
     mkEnableOption
     mkOption
     types
@@ -26,7 +26,6 @@ let
 
   cfg = config.services.transmission;
   opt = options.services.transmission;
-  inherit (config.environment) etc;
   apparmor = config.security.apparmor;
   rootDir = "/run/transmission";
   settingsDir = ".config/transmission-daemon";
@@ -51,7 +50,7 @@ in
         "rpc-port"
       ]
     )
-    (mkAliasOptionModuleMD
+    (mkAliasOptionModule
       [
         "services"
         "transmission"
diff --git a/nixos/modules/services/x11/picom.nix b/nixos/modules/services/x11/picom.nix
index e75ec5c2019f..33d53930dff0 100644
--- a/nixos/modules/services/x11/picom.nix
+++ b/nixos/modules/services/x11/picom.nix
@@ -62,7 +62,7 @@ in
 {
 
   imports = [
-    (mkAliasOptionModuleMD [ "services" "compton" ] [ "services" "picom" ])
+    (mkAliasOptionModule [ "services" "compton" ] [ "services" "picom" ])
     (mkRemovedOptionModule [ "services" "picom" "refreshRate" ] ''
       This option corresponds to `refresh-rate`, which has been unused
       since picom v6 and was subsequently removed by upstream.

From c38d80ddc0b2196c62142e18f4880bfb52eb122b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 12:45:18 +0000
Subject: [PATCH 1270/6226] libxfs: 6.16.0 -> 6.17.0

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

diff --git a/pkgs/by-name/xf/xfsprogs/package.nix b/pkgs/by-name/xf/xfsprogs/package.nix
index 0529b8efbfbf..61698c6b9176 100644
--- a/pkgs/by-name/xf/xfsprogs/package.nix
+++ b/pkgs/by-name/xf/xfsprogs/package.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "xfsprogs";
-  version = "6.16.0";
+  version = "6.17.0";
 
   src = fetchurl {
     url = "mirror://kernel/linux/utils/fs/xfs/xfsprogs/${pname}-${version}.tar.xz";
-    hash = "sha256-+nuow1y5iOfWW352MP6dDhfo15eZ07mNt+GfK5sVBQY=";
+    hash = "sha256-Ww9WqB9kEyYmb3Yq6KVjsp2Vzbzag7x5OPaM4SLx7dk=";
   };
 
   outputs = [

From 47709159d15ba2c0e32b1b5ffc28898203a490f5 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 21 Oct 2025 12:49:57 +0000
Subject: [PATCH 1271/6226] python3Packages.gtts: relax click

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

diff --git a/pkgs/development/python-modules/gtts/default.nix b/pkgs/development/python-modules/gtts/default.nix
index 36b3f6835d75..24bc7eb2ed4f 100644
--- a/pkgs/development/python-modules/gtts/default.nix
+++ b/pkgs/development/python-modules/gtts/default.nix
@@ -29,6 +29,9 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
+  pythonRelaxDeps = [
+    "click"
+  ];
   dependencies = [
     beautifulsoup4
     click
@@ -53,12 +56,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "gtts" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python library and CLI tool to interface with Google Translate text-to-speech API";
     mainProgram = "gtts-cli";
     homepage = "https://gtts.readthedocs.io";
     changelog = "https://gtts.readthedocs.io/en/latest/changelog.html";
-    license = licenses.mit;
-    maintainers = with maintainers; [ unode ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ unode ];
   };
 }

From 861e3f5cc36c0f15047eafe7e570f17539fd2ab3 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 21 Oct 2025 12:54:51 +0000
Subject: [PATCH 1272/6226] python3Packages.fiona: disable tests failing witch
 click 8.2.1

---
 .../python-modules/fiona/default.nix          | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)

diff --git a/pkgs/development/python-modules/fiona/default.nix b/pkgs/development/python-modules/fiona/default.nix
index 6a7c8b51bee3..04d5d9b8f5f6 100644
--- a/pkgs/development/python-modules/fiona/default.nix
+++ b/pkgs/development/python-modules/fiona/default.nix
@@ -95,6 +95,64 @@ buildPythonPackage rec {
 
     # see: https://github.com/Toblerity/Fiona/issues/1273
     "test_append_memoryfile_drivers"
+
+    # AssertionError CLI exists with non-zero error code
+    # This is a regression introduced by https://github.com/NixOS/nixpkgs/pull/448189
+    "test_bbox_json_yes"
+    "test_bbox_no"
+    "test_bbox_where"
+    "test_bbox_yes"
+    "test_bbox_yes_two_files"
+    "test_bool_seq"
+    "test_bounds_explode_with_obj"
+    "test_calc_seq"
+    "test_collect_ld"
+    "test_collect_no_rs"
+    "test_collect_noparse"
+    "test_collect_noparse_records"
+    "test_collect_noparse_rs"
+    "test_collect_rec_buffered"
+    "test_collect_rs"
+    "test_creation_options"
+    "test_different_crs"
+    "test_distrib"
+    "test_distrib_no_rs"
+    "test_dst_crs_default_to_src_crs"
+    "test_dst_crs_epsg3857"
+    "test_dst_crs_no_src"
+    "test_existing_property"
+    "test_explode"
+    "test_explode_output_rs"
+    "test_explode_pp"
+    "test_explode_with_id"
+    "test_filter"
+    "test_fio_load_layer"
+    "test_fio_load_layer_append"
+    "test_load__auto_detect_format"
+    "test_load__auto_detect_format"
+    "test_load__auto_detect_format"
+    "test_load__auto_detect_format"
+    "test_load__auto_detect_format"
+    "test_map_count"
+    "test_multi_layer"
+    "test_one"
+    "test_precision"
+    "test_reduce_area"
+    "test_reduce_area"
+    "test_reduce_union"
+    "test_reduce_union_zip_properties"
+    "test_seq"
+    "test_seq"
+    "test_seq_no_rs"
+    "test_seq_rs"
+    "test_seq_rs"
+    "test_two"
+    "test_vfs"
+    "test_where_no"
+    "test_where_yes"
+    "test_where_yes_two_files"
+    "test_with_id"
+    "test_with_obj"
   ];
 
   pythonImportsCheck = [ "fiona" ];

From 16501b04e2a698d95748b23a2f1d5aca566387ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 12:55:57 +0000
Subject: [PATCH 1273/6226] cnspec: 12.5.1 -> 12.6.0

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

diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix
index 08bbd94b9e98..a1e68c3d6965 100644
--- a/pkgs/by-name/cn/cnspec/package.nix
+++ b/pkgs/by-name/cn/cnspec/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnspec";
-  version = "12.5.1";
+  version = "12.6.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${version}";
-    hash = "sha256-F85GYOOheQ1Gx4NAWErfRwUjmjjRIv6EbXrlUPt9TX4=";
+    hash = "sha256-wV3LzrATUlNdPuqh/uB+EPeAPqbfWXEEhtctOIxJrWs=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-ayv4qwiOHbZkLWIA8RIJ2GiS2QZlDeJnnbDXIHP7BCE=";
+  vendorHash = "sha256-NDwPDij1dFpBjgePyQ7y2f4BIMl92ugDAYNOZJk+6bs=";
 
   subPackages = [ "apps/cnspec" ];
 

From 3e9e6bd925b58235ba0d0acd00d0b93a3dd41b46 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 12:56:08 +0000
Subject: [PATCH 1274/6226] python3Packages.azure-storage-queue: 12.13.0 ->
 12.14.0

---
 .../python-modules/azure-storage-queue/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-storage-queue/default.nix b/pkgs/development/python-modules/azure-storage-queue/default.nix
index 8e0814f06fa5..11aa7ee0506d 100644
--- a/pkgs/development/python-modules/azure-storage-queue/default.nix
+++ b/pkgs/development/python-modules/azure-storage-queue/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "azure-storage-queue";
-  version = "12.13.0";
+  version = "12.14.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_storage_queue";
     inherit version;
-    hash = "sha256-JWkeeVjSSXA5JFETTfpUdjf9Lfz95bNHai4VLlaXP4w=";
+    hash = "sha256-WIhM62wQqF3NIuOJreMr46bzbsWHxC5O/AZO/D7yV0M=";
   };
 
   build-system = [ setuptools ];

From 4b0ac4b4f13b6d99476dd7d8cf3284c73bb94cc9 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 09:59:23 -0300
Subject: [PATCH 1275/6226] hdf5-blosc: fix build with cmake4

---
 pkgs/by-name/hd/hdf5-blosc/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/hd/hdf5-blosc/package.nix b/pkgs/by-name/hd/hdf5-blosc/package.nix
index d0eb807a72a3..323a57698210 100644
--- a/pkgs/by-name/hd/hdf5-blosc/package.nix
+++ b/pkgs/by-name/hd/hdf5-blosc/package.nix
@@ -43,6 +43,11 @@ stdenv.mkDerivation rec {
     "-DBUILD_TESTS=ON"
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.10)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = ''
     mkdir -p $out/lib/pkgconfig
     substituteAll ${./blosc_filter.pc.in} $out/lib/pkgconfig/blosc_filter.pc

From e48fa78780570db2551d46a194256d1e0ed45e09 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 21 Oct 2025 13:00:39 +0000
Subject: [PATCH 1276/6226] python3Packages.rasterio: cleanup

---
 .../python-modules/rasterio/default.nix       | 60 +++++++++----------
 1 file changed, 28 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix
index 9fc55c214146..167d493cc892 100644
--- a/pkgs/development/python-modules/rasterio/default.nix
+++ b/pkgs/development/python-modules/rasterio/default.nix
@@ -1,42 +1,43 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  pytestCheckHook,
-  pythonOlder,
-  stdenv,
-  testers,
 
+  # build-system
+  cython,
+  gdal,
+  numpy,
+  setuptools,
+
+  # dependencies
   affine,
   attrs,
-  boto3,
   certifi,
   click,
   click-plugins,
   cligj,
-  cython,
-  fsspec,
-  gdal,
-  hypothesis,
+  snuggs,
+
+  # optional-dependencies
   ipython,
   matplotlib,
-  numpy,
-  packaging,
-  pytest-randomly,
-  setuptools,
-  shapely,
-  snuggs,
-  wheel,
+  boto3,
 
-  rasterio, # required to run version test
+  # tests
+  fsspec,
+  hypothesis,
+  packaging,
+  pytestCheckHook,
+  pytest-randomly,
+  shapely,
+  versionCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "rasterio";
   version = "1.4.3";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.8";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rasterio";
@@ -50,15 +51,14 @@ buildPythonPackage rec {
       --replace-fail "cython~=3.0.2" cython
   '';
 
-  nativeBuildInputs = [
+  build-system = [
     cython
     gdal
     numpy
     setuptools
-    wheel
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     affine
     attrs
     certifi
@@ -83,7 +83,9 @@ buildPythonPackage rec {
     pytestCheckHook
     pytest-randomly
     shapely
+    versionCheckHook
   ];
+  versionCheckProgramArg = "--version";
 
   preCheck = ''
     rm -r rasterio # prevent importing local rasterio
@@ -107,18 +109,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "rasterio" ];
 
-  passthru.tests.version = testers.testVersion {
-    package = rasterio;
-    version = version;
-    command = "${rasterio}/bin/rio --version";
-  };
-
-  meta = with lib; {
+  meta = {
     description = "Python package to read and write geospatial raster data";
     mainProgram = "rio";
     homepage = "https://rasterio.readthedocs.io/";
     changelog = "https://github.com/rasterio/rasterio/blob/${version}/CHANGES.txt";
-    license = licenses.bsd3;
-    teams = [ teams.geospatial ];
+    license = lib.licenses.bsd3;
+    teams = [ lib.teams.geospatial ];
   };
 }

From def801fb09bbdae515185b22c84bed63bee81f23 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Tue, 21 Oct 2025 15:55:50 +0300
Subject: [PATCH 1277/6226] lib: deprecate mkAliasOptionModuleMD

---
 doc/release-notes/rl-2511.section.md | 2 ++
 lib/modules.nix                      | 7 +++----
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 81389bf97a8b..ec1bec180d02 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -345,6 +345,8 @@
 
 ### Deprecations {#sec-nixpkgs-release-25.11-lib-deprecations}
 
+- `lib.options.mkAliasOptionModuleMD` is now obsolete; use the identical [`lib.options.mkAliasOptionModule`] instead.
+
 - `types.either` silently accepted mismatching types when used in `freeformType`. Module maintainers should fix the used type
   In most cases wrapping `either` with `attrsOf` should be sufficient.
 
diff --git a/lib/modules.nix b/lib/modules.nix
index 5fc00e2acee8..42e88dbbf625 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -1787,11 +1787,10 @@ let
     };
 
   /**
-    Transitional version of mkAliasOptionModule that uses MD docs.
-
-    This function is no longer necessary and merely an alias of `mkAliasOptionModule`.
+    Deprecated alias of mkAliasOptionModule that uses MD docs.
+    This function is no longer necessary will be removed in 26.05`.
   */
-  mkAliasOptionModuleMD = mkAliasOptionModule;
+  mkAliasOptionModuleMD = lib.warn "mkAliasOptionModuleMD is deprecated and will be removed in 26.05; please use mkAliasOptionModule." mkAliasOptionModule;
 
   /**
     mkDerivedConfig : Option a -> (a -> Definition b) -> Definition b

From fe899cf2ae42fd856079645db7d24f71c06235b1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 21 Oct 2025 13:01:51 +0000
Subject: [PATCH 1278/6226] python3Packages.rasterio: disable tests failing
 with click 8.2.1

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

diff --git a/pkgs/development/python-modules/rasterio/default.nix b/pkgs/development/python-modules/rasterio/default.nix
index 167d493cc892..53c1513e2c9d 100644
--- a/pkgs/development/python-modules/rasterio/default.nix
+++ b/pkgs/development/python-modules/rasterio/default.nix
@@ -104,6 +104,15 @@ buildPythonPackage rec {
     "test_warp"
     "test_warpedvrt"
     "test_rio_warp"
+
+    # AssertionError CLI exists with non-zero error code
+    # This is a regression introduced by https://github.com/NixOS/nixpkgs/pull/448189
+    "test_sample_stdin"
+    "test_transform"
+    "test_transform_point"
+    "test_transform_point_dst_file"
+    "test_transform_point_multi"
+    "test_transform_point_src_file"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ "test_reproject_error_propagation" ];
 

From 80f12557f5865badbefab979ca8b15db118773d6 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Mon, 13 Oct 2025 21:53:42 +0300
Subject: [PATCH 1279/6226] treewide: replace "yes" else "no" usages to
 lib.boolToYesNo

---
 nixos/modules/config/getaddrinfo.nix          |  2 +-
 nixos/modules/misc/locate.nix                 |  4 +--
 nixos/modules/programs/ssh.nix                |  2 +-
 nixos/modules/security/auditd.nix             |  2 +-
 nixos/modules/security/duosec.nix             | 13 +++++-----
 nixos/modules/security/pam_mount.nix          |  4 +--
 nixos/modules/security/tpm2.nix               |  2 +-
 nixos/modules/services/backup/bacula.nix      |  6 ++---
 .../modules/services/databases/cassandra.nix  |  2 +-
 nixos/modules/services/mail/cyrus-imap.nix    |  3 ++-
 nixos/modules/services/mail/rspamd.nix        |  4 +--
 nixos/modules/services/misc/gammu-smsd.nix    |  2 +-
 nixos/modules/services/misc/mediatomb.nix     |  7 +++---
 .../network-filesystems/orangefs/server.nix   |  4 +--
 .../services/networking/avahi-daemon.nix      | 24 ++++++++----------
 .../modules/services/networking/ddclient.nix  |  7 +++---
 nixos/modules/services/networking/frr.nix     |  2 +-
 .../modules/services/networking/miniupnpd.nix |  4 +--
 nixos/modules/services/networking/nsd.nix     | 25 +++++++++----------
 .../services/networking/pdns-recursor.nix     |  3 +--
 .../modules/services/networking/smartdns.nix  |  2 +-
 .../modules/services/networking/ssh/sshd.nix  |  1 -
 .../strongswan-swanctl/param-constructors.nix |  2 +-
 nixos/modules/services/networking/stunnel.nix |  9 +------
 nixos/modules/services/networking/tayga.nix   |  2 +-
 nixos/modules/services/networking/unbound.nix |  4 +--
 nixos/modules/services/networking/xinetd.nix  |  2 +-
 .../tasks/network-interfaces-systemd.nix      |  2 +-
 pkgs/applications/misc/redshift/default.nix   | 12 ++++-----
 pkgs/build-support/release/debian-build.nix   |  2 +-
 pkgs/by-name/ap/apr/package.nix               |  2 +-
 pkgs/by-name/ba/bacula/package.nix            |  2 +-
 pkgs/by-name/co/colpack/package.nix           |  2 +-
 pkgs/by-name/do/dovecot/package.nix           |  6 ++---
 pkgs/by-name/i2/i2pd/package.nix              |  2 +-
 pkgs/by-name/li/libcap/package.nix            |  2 +-
 pkgs/by-name/li/libdaemon/package.nix         |  2 +-
 pkgs/by-name/li/libepoxy/package.nix          |  4 +--
 pkgs/by-name/li/libgpiod/package.nix          |  2 +-
 pkgs/by-name/li/libgpiod_1/package.nix        |  2 +-
 pkgs/by-name/mo/moc/package.nix               |  2 +-
 pkgs/by-name/mo/motif/package.nix             |  2 +-
 pkgs/by-name/mu/mupdf/package.nix             |  2 +-
 .../ne/networkmanager-fortisslvpn/package.nix |  4 +--
 .../ne/networkmanager-iodine/package.nix      |  2 +-
 .../ne/networkmanager-l2tp/package.nix        |  4 +--
 .../ne/networkmanager-openconnect/package.nix |  4 +--
 .../ne/networkmanager-openvpn/package.nix     |  4 +--
 .../ne/networkmanager-sstp/package.nix        |  4 +--
 .../ne/networkmanager-vpnc/package.nix        |  4 +--
 pkgs/by-name/op/openmpi/package.nix           |  2 +-
 pkgs/by-name/pc/pciutils/package.nix          |  2 +-
 pkgs/by-name/sh/shadow/package.nix            |  2 +-
 pkgs/by-name/tp/tpm2-pkcs11/package.nix       |  2 +-
 pkgs/by-name/w3/w3m/package.nix               |  2 +-
 .../development/ada-modules/gnatcoll/core.nix |  4 +--
 pkgs/development/ada-modules/gpr2/default.nix |  2 +-
 .../ada-modules/gprbuild/default.nix          |  2 +-
 .../interpreters/python/cpython/default.nix   |  4 +--
 pkgs/development/libraries/libgda/5.x.nix     |  6 ++---
 .../tools/protoc-gen-grpc-web/default.nix     |  2 +-
 pkgs/games/quake2/yquake2/default.nix         |  4 +--
 .../bsd/freebsd/pkgs/sys/package.nix          |  2 +-
 pkgs/shells/bash/5.nix                        |  2 +-
 pkgs/tools/nix/info/default.nix               |  2 +-
 65 files changed, 118 insertions(+), 140 deletions(-)

diff --git a/nixos/modules/config/getaddrinfo.nix b/nixos/modules/config/getaddrinfo.nix
index f18651a9e031..ddea509bfa78 100644
--- a/nixos/modules/config/getaddrinfo.nix
+++ b/nixos/modules/config/getaddrinfo.nix
@@ -18,7 +18,7 @@ let
     [
       "# Generated by NixOS module networking.getaddrinfo"
       "# Do not edit manually!"
-      "reload ${if cfg.reload then "yes" else "no"}"
+      "reload ${lib.boolToYesNo cfg.reload}"
     ]
     ++ formatTableEntries "label" cfg.label
     ++ formatTableEntries "precedence" cfg.precedence
diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix
index 092852330437..0980e6f385a2 100644
--- a/nixos/modules/misc/locate.nix
+++ b/nixos/modules/misc/locate.nix
@@ -241,7 +241,7 @@ in
         PRUNEFS="${lib.concatStringsSep " " cfg.pruneFS}"
         PRUNENAMES="${lib.concatStringsSep " " cfg.pruneNames}"
         PRUNEPATHS="${lib.concatStringsSep " " cfg.prunePaths}"
-        PRUNE_BIND_MOUNTS="${if cfg.pruneBindMounts then "yes" else "no"}"
+        PRUNE_BIND_MOUNTS="${lib.boolToYesNo cfg.pruneBindMounts}"
       '';
 
       systemPackages = [ cfg.package ];
@@ -267,7 +267,7 @@ in
         ''
           exec ${cfg.package}/bin/updatedb \
             --output ${toString cfg.output} ${lib.concatStringsSep " " args} \
-            --prune-bind-mounts ${if cfg.pruneBindMounts then "yes" else "no"} \
+            --prune-bind-mounts ${lib.boolToYesNo cfg.pruneBindMounts} \
             ${lib.concatStringsSep " " cfg.extraFlags}
         '';
       serviceConfig = {
diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix
index 443878715bc0..508d1961c770 100644
--- a/nixos/modules/programs/ssh.nix
+++ b/nixos/modules/programs/ssh.nix
@@ -357,7 +357,7 @@ in
       ]
       ++ lib.optional (!config.networking.enableIPv6) "AddressFamily inet"
       ++ lib.optional cfg.setXAuthLocation "XAuthLocation ${pkgs.xorg.xauth}/bin/xauth"
-      ++ lib.optional (cfg.forwardX11 != null) "ForwardX11 ${if cfg.forwardX11 then "yes" else "no"}"
+      ++ lib.optional (cfg.forwardX11 != null) "ForwardX11 ${lib.boolToYesNo cfg.forwardX11}"
       ++ lib.optional (
         cfg.pubkeyAcceptedKeyTypes != [ ]
       ) "PubkeyAcceptedKeyTypes ${builtins.concatStringsSep "," cfg.pubkeyAcceptedKeyTypes}"
diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix
index bbe22fa6a5bc..f9e7fd6084c1 100644
--- a/nixos/modules/security/auditd.nix
+++ b/nixos/modules/security/auditd.nix
@@ -86,7 +86,7 @@ let
   prepareConfigValue =
     v:
     if lib.isBool v then
-      (if v then "yes" else "no")
+      lib.boolToYesNo v
     else if lib.isList v then
       lib.concatStringsSep " " (map prepareConfigValue v)
     else
diff --git a/nixos/modules/security/duosec.nix b/nixos/modules/security/duosec.nix
index b8ff3ae18856..3734bc89e402 100644
--- a/nixos/modules/security/duosec.nix
+++ b/nixos/modules/security/duosec.nix
@@ -6,8 +6,7 @@
 }:
 let
   cfg = config.security.duosec;
-
-  boolToStr = b: if b then "yes" else "no";
+  inherit (lib) boolToYesNo;
 
   configFilePam = ''
     [duo]
@@ -15,15 +14,15 @@ let
     host=${cfg.host}
     ${lib.optionalString (cfg.groups != "") ("groups=" + cfg.groups)}
     failmode=${cfg.failmode}
-    pushinfo=${boolToStr cfg.pushinfo}
-    autopush=${boolToStr cfg.autopush}
+    pushinfo=${boolToYesNo cfg.pushinfo}
+    autopush=${boolToYesNo cfg.autopush}
     prompts=${toString cfg.prompts}
-    fallback_local_ip=${boolToStr cfg.fallbackLocalIP}
+    fallback_local_ip=${boolToYesNo cfg.fallbackLocalIP}
   '';
 
   configFileLogin = configFilePam + ''
-    motd=${boolToStr cfg.motd}
-    accept_env_factor=${boolToStr cfg.acceptEnvFactor}
+    motd=${boolToYesNo cfg.motd}
+    accept_env_factor=${boolToYesNo cfg.acceptEnvFactor}
   '';
 in
 {
diff --git a/nixos/modules/security/pam_mount.nix b/nixos/modules/security/pam_mount.nix
index 62deec4ca487..d6459c2598f9 100644
--- a/nixos/modules/security/pam_mount.nix
+++ b/nixos/modules/security/pam_mount.nix
@@ -170,9 +170,7 @@ in
           <pam_mount>
           <debug enable="${toString cfg.debugLevel}" />
           <!-- if activated, requires ofl from hxtools to be present -->
-          <logout wait="${toString cfg.logoutWait}" hup="${if cfg.logoutHup then "yes" else "no"}" term="${
-            if cfg.logoutTerm then "yes" else "no"
-          }" kill="${if cfg.logoutKill then "yes" else "no"}" />
+          <logout wait="${toString cfg.logoutWait}" hup="${lib.boolToYesNo cfg.logoutHup}" term="${lib.boolToYesNo cfg.logoutTerm}" kill="${lib.boolToYesNo cfg.logoutKill}" />
           <!-- set PATH variable for pam_mount module -->
           <path>${lib.makeBinPath ([ pkgs.util-linux ] ++ cfg.additionalSearchPaths)}</path>
           <!-- create mount point if not present -->
diff --git a/nixos/modules/security/tpm2.nix b/nixos/modules/security/tpm2.nix
index 29eece1ef794..bc05c75669a3 100644
--- a/nixos/modules/security/tpm2.nix
+++ b/nixos/modules/security/tpm2.nix
@@ -39,7 +39,7 @@ let
           ima_log_file = cfg.fapi.imaLogFile;
         }
         // lib.optionalAttrs (cfg.fapi.ekCertLess != null) {
-          ek_cert_less = if cfg.fapi.ekCertLess then "yes" else "no";
+          ek_cert_less = lib.boolToYesNo cfg.fapi.ekCertLess;
         }
         // lib.optionalAttrs (cfg.fapi.ekFingerprint != null) { ek_fingerprint = cfg.fapi.ekFingerprint; }
       )
diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix
index cc2e603bf3f9..45d8557e609d 100644
--- a/nixos/modules/services/backup/bacula.nix
+++ b/nixos/modules/services/backup/bacula.nix
@@ -10,6 +10,7 @@
 
 let
   inherit (lib)
+    boolToYesNo
     concatStringsSep
     literalExpression
     mapAttrsToList
@@ -21,16 +22,15 @@ let
     ;
   libDir = "/var/lib/bacula";
 
-  yes_no = bool: if bool then "yes" else "no";
   tls_conf =
     tls_cfg:
     optionalString tls_cfg.enable (
       concatStringsSep "\n" (
         [ "TLS Enable = yes;" ]
-        ++ optional (tls_cfg.require != null) "TLS Require = ${yes_no tls_cfg.require};"
+        ++ optional (tls_cfg.require != null) "TLS Require = ${boolToYesNo tls_cfg.require};"
         ++ optional (tls_cfg.certificate != null) ''TLS Certificate = "${tls_cfg.certificate}";''
         ++ [ ''TLS Key = "${tls_cfg.key}";'' ]
-        ++ optional (tls_cfg.verifyPeer != null) "TLS Verify Peer = ${yes_no tls_cfg.verifyPeer};"
+        ++ optional (tls_cfg.verifyPeer != null) "TLS Verify Peer = ${boolToYesNo tls_cfg.verifyPeer};"
         ++ optional (
           tls_cfg.allowedCN != [ ]
         ) "TLS Allowed CN = ${concatStringsSep " " (tls_cfg.allowedCN)};"
diff --git a/nixos/modules/services/databases/cassandra.nix b/nixos/modules/services/databases/cassandra.nix
index 27b7a5b94db2..2161fc13ea59 100644
--- a/nixos/modules/services/databases/cassandra.nix
+++ b/nixos/modules/services/databases/cassandra.nix
@@ -504,7 +504,7 @@ in
         MAX_HEAP_SIZE = toString cfg.maxHeapSize;
         HEAP_NEWSIZE = toString cfg.heapNewSize;
         MALLOC_ARENA_MAX = toString cfg.mallocArenaMax;
-        LOCAL_JMX = if cfg.remoteJmx then "no" else "yes";
+        LOCAL_JMX = lib.boolToYesNo (!cfg.remoteJmx);
         JMX_PORT = toString cfg.jmxPort;
       };
       wantedBy = [ "multi-user.target" ];
diff --git a/nixos/modules/services/mail/cyrus-imap.nix b/nixos/modules/services/mail/cyrus-imap.nix
index 3ffd74451b6c..9ee7cf8ee44b 100644
--- a/nixos/modules/services/mail/cyrus-imap.nix
+++ b/nixos/modules/services/mail/cyrus-imap.nix
@@ -15,6 +15,7 @@ let
     optionalString
     generators
     mapAttrsToList
+    boolToYesNo
     ;
   inherit (lib.strings) concatStringsSep;
   inherit (lib.types)
@@ -63,7 +64,7 @@ let
         mkValueString =
           v:
           if builtins.isBool v then
-            if v then "yes" else "no"
+            boolToYesNo v
           else if builtins.isList v then
             concatStringsSep " " v
           else
diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix
index 5b09cfb217fb..715376e24f88 100644
--- a/nixos/modules/services/mail/rspamd.nix
+++ b/nixos/modules/services/mail/rspamd.nix
@@ -211,9 +211,7 @@ let
         ''
           worker "${value.type}" {
             type = "${value.type}";
-            ${optionalString (value.enable != null)
-              "enabled = ${if value.enable != false then "yes" else "no"};"
-            }
+            ${optionalString (value.enable != null) "enabled = ${lib.boolToYesNo (value.enable != false)};"}
             ${mkBindSockets value.enable value.bindSockets}
             ${optionalString (value.count != null) "count = ${toString value.count};"}
             ${concatStringsSep "\n  " (map (each: ".include \"${each}\"") value.includes)}
diff --git a/nixos/modules/services/misc/gammu-smsd.nix b/nixos/modules/services/misc/gammu-smsd.nix
index 85f3d2fa94a9..518a9c4f0065 100644
--- a/nixos/modules/services/misc/gammu-smsd.nix
+++ b/nixos/modules/services/misc/gammu-smsd.nix
@@ -11,7 +11,7 @@ let
     [gammu]
     Device = ${cfg.device.path}
     Connection = ${cfg.device.connection}
-    SynchronizeTime = ${if cfg.device.synchronizeTime then "yes" else "no"}
+    SynchronizeTime = ${lib.boolToYesNo cfg.device.synchronizeTime}
     LogFormat = ${cfg.log.format}
     ${lib.optionalString (cfg.device.pin != null) "PIN = ${cfg.device.pin}"}
     ${cfg.extraConfig.gammu}
diff --git a/nixos/modules/services/misc/mediatomb.nix b/nixos/modules/services/misc/mediatomb.nix
index eac446817ae7..1b92947db696 100644
--- a/nixos/modules/services/misc/mediatomb.nix
+++ b/nixos/modules/services/misc/mediatomb.nix
@@ -12,7 +12,6 @@ let
   opt = options.services.mediatomb;
   name = cfg.package.pname;
   pkg = cfg.package;
-  optionYesNo = option: if option then "yes" else "no";
   # configuration on media directory
   mediaDirectory = {
     options = {
@@ -36,7 +35,7 @@ let
   };
   toMediaDirectory =
     d:
-    "<directory location=\"${d.path}\" mode=\"inotify\" recursive=\"${optionYesNo d.recursive}\" hidden-files=\"${optionYesNo d.hidden-files}\" />\n";
+    "<directory location=\"${d.path}\" mode=\"inotify\" recursive=\"${lib.boolToYesNo d.recursive}\" hidden-files=\"${lib.boolToYesNo d.hidden-files}\" />\n";
 
   transcodingConfig =
     if cfg.transcoding then
@@ -89,13 +88,13 @@ let
           <home>${cfg.dataDir}</home>
           <interface>${cfg.interface}</interface>
           <webroot>${pkg}/share/${name}/web</webroot>
-          <pc-directory upnp-hide="${optionYesNo cfg.pcDirectoryHide}"/>
+          <pc-directory upnp-hide="${lib.boolToYesNo cfg.pcDirectoryHide}"/>
           <storage>
             <sqlite3 enabled="yes">
               <database-file>${name}.db</database-file>
             </sqlite3>
           </storage>
-          <protocolInfo extend="${optionYesNo cfg.ps3Support}"/>
+          <protocolInfo extend="${lib.boolToYesNo cfg.ps3Support}"/>
           ${lib.optionalString cfg.dsmSupport ''
             <custom-http-headers>
               <add header="X-User-Agent: redsonic"/>
diff --git a/nixos/modules/services/network-filesystems/orangefs/server.nix b/nixos/modules/services/network-filesystems/orangefs/server.nix
index 99d7b27011c2..d3047af4aa91 100644
--- a/nixos/modules/services/network-filesystems/orangefs/server.nix
+++ b/nixos/modules/services/network-filesystems/orangefs/server.nix
@@ -50,8 +50,8 @@ let
       </DataHandleRanges>
 
       <StorageHints>
-      TroveSyncMeta ${if fs.troveSyncMeta then "yes" else "no"}
-      TroveSyncData ${if fs.troveSyncData then "yes" else "no"}
+      TroveSyncMeta ${lib.boolToYesNo fs.troveSyncMeta}
+      TroveSyncData ${lib.boolToYesNo fs.troveSyncData}
       ${fs.extraStorageHints}
       </StorageHints>
 
diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix
index b1ed28980cfe..28efc39f8bce 100644
--- a/nixos/modules/services/networking/avahi-daemon.nix
+++ b/nixos/modules/services/networking/avahi-daemon.nix
@@ -7,8 +7,6 @@
 let
   cfg = config.services.avahi;
 
-  yesNo = yes: if yes then "yes" else "no";
-
   avahiDaemonConf =
     with cfg;
     pkgs.writeText "avahi-daemon.conf" ''
@@ -21,8 +19,8 @@ let
         lib.optionalString (hostName != "") "host-name=${hostName}"
       }
       browse-domains=${lib.concatStringsSep ", " browseDomains}
-      use-ipv4=${yesNo ipv4}
-      use-ipv6=${yesNo ipv6}
+      use-ipv4=${lib.boolToYesNo ipv4}
+      use-ipv6=${lib.boolToYesNo ipv6}
       ${lib.optionalString (
         allowInterfaces != null
       ) "allow-interfaces=${lib.concatStringsSep "," allowInterfaces}"}
@@ -30,22 +28,22 @@ let
         denyInterfaces != null
       ) "deny-interfaces=${lib.concatStringsSep "," denyInterfaces}"}
       ${lib.optionalString (domainName != null) "domain-name=${domainName}"}
-      allow-point-to-point=${yesNo allowPointToPoint}
+      allow-point-to-point=${lib.boolToYesNo allowPointToPoint}
       ${lib.optionalString (cacheEntriesMax != null) "cache-entries-max=${toString cacheEntriesMax}"}
 
       [wide-area]
-      enable-wide-area=${yesNo wideArea}
+      enable-wide-area=${lib.boolToYesNo wideArea}
 
       [publish]
-      disable-publishing=${yesNo (!publish.enable)}
-      disable-user-service-publishing=${yesNo (!publish.userServices)}
-      publish-addresses=${yesNo (publish.userServices || publish.addresses)}
-      publish-hinfo=${yesNo publish.hinfo}
-      publish-workstation=${yesNo publish.workstation}
-      publish-domain=${yesNo publish.domain}
+      disable-publishing=${lib.boolToYesNo (!publish.enable)}
+      disable-user-service-publishing=${lib.boolToYesNo (!publish.userServices)}
+      publish-addresses=${lib.boolToYesNo (publish.userServices || publish.addresses)}
+      publish-hinfo=${lib.boolToYesNo publish.hinfo}
+      publish-workstation=${lib.boolToYesNo publish.workstation}
+      publish-domain=${lib.boolToYesNo publish.domain}
 
       [reflector]
-      enable-reflector=${yesNo reflector}
+      enable-reflector=${lib.boolToYesNo reflector}
       ${extraConfig}
     '';
 in
diff --git a/nixos/modules/services/networking/ddclient.nix b/nixos/modules/services/networking/ddclient.nix
index 54e488db9856..773387939a7c 100644
--- a/nixos/modules/services/networking/ddclient.nix
+++ b/nixos/modules/services/networking/ddclient.nix
@@ -6,7 +6,6 @@
 }:
 let
   cfg = config.services.ddclient;
-  boolToStr = bool: if bool then "yes" else "no";
   dataDir = "/var/lib/ddclient";
   StateDirectory = builtins.baseNameOf dataDir;
   RuntimeDirectory = StateDirectory;
@@ -33,10 +32,10 @@ let
     ${lib.optionalString (cfg.script != "") "script=${cfg.script}"}
     ${lib.optionalString (cfg.server != "") "server=${cfg.server}"}
     ${lib.optionalString (cfg.zone != "") "zone=${cfg.zone}"}
-    ssl=${boolToStr cfg.ssl}
+    ssl=${lib.boolToYesNo cfg.ssl}
     wildcard=YES
-    quiet=${boolToStr cfg.quiet}
-    verbose=${boolToStr cfg.verbose}
+    quiet=${lib.boolToYesNo cfg.quiet}
+    verbose=${lib.boolToYesNo cfg.verbose}
     ${cfg.extraConfig}
     ${lib.concatStringsSep "," cfg.domains}
   '';
diff --git a/nixos/modules/services/networking/frr.nix b/nixos/modules/services/networking/frr.nix
index fac18c6a246c..73c194ac060c 100644
--- a/nixos/modules/services/networking/frr.nix
+++ b/nixos/modules/services/networking/frr.nix
@@ -82,7 +82,7 @@ let
 
   isEnabled = service: cfg.${service}.enable;
 
-  daemonLine = d: "${d}=${if isEnabled d then "yes" else "no"}";
+  daemonLine = d: "${d}=${lib.boolToYesNo (isEnabled d)}";
 
   configFile =
     if cfg.configFile != null then
diff --git a/nixos/modules/services/networking/miniupnpd.nix b/nixos/modules/services/networking/miniupnpd.nix
index ccbddbf3d5a1..c723ff16d3cd 100644
--- a/nixos/modules/services/networking/miniupnpd.nix
+++ b/nixos/modules/services/networking/miniupnpd.nix
@@ -11,8 +11,8 @@ let
   cfg = config.services.miniupnpd;
   configFile = pkgs.writeText "miniupnpd.conf" ''
     ext_ifname=${cfg.externalInterface}
-    enable_natpmp=${if cfg.natpmp then "yes" else "no"}
-    enable_upnp=${if cfg.upnp then "yes" else "no"}
+    enable_natpmp=${boolToYesNo cfg.natpmp}
+    enable_upnp=${boolToYesNo cfg.upnp}
 
     ${concatMapStrings (range: ''
       listening_ip=${range}
diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix
index bc6aa5ae3fff..46d9d084d7d7 100644
--- a/nixos/modules/services/networking/nsd.nix
+++ b/nixos/modules/services/networking/nsd.nix
@@ -100,19 +100,19 @@ let
       # interfaces
     ${forEach "  ip-address: " cfg.interfaces}
 
-      ip-freebind:         ${yesOrNo cfg.ipFreebind}
-      hide-version:        ${yesOrNo cfg.hideVersion}
+      ip-freebind:         ${boolToYesNo cfg.ipFreebind}
+      hide-version:        ${boolToYesNo cfg.hideVersion}
       identity:            "${cfg.identity}"
-      ip-transparent:      ${yesOrNo cfg.ipTransparent}
-      do-ip4:              ${yesOrNo cfg.ipv4}
+      ip-transparent:      ${boolToYesNo cfg.ipTransparent}
+      do-ip4:              ${boolToYesNo cfg.ipv4}
       ipv4-edns-size:      ${toString cfg.ipv4EDNSSize}
-      do-ip6:              ${yesOrNo cfg.ipv6}
+      do-ip6:              ${boolToYesNo cfg.ipv6}
       ipv6-edns-size:      ${toString cfg.ipv6EDNSSize}
-      log-time-ascii:      ${yesOrNo cfg.logTimeAscii}
+      log-time-ascii:      ${boolToYesNo cfg.logTimeAscii}
       ${maybeString "nsid: " cfg.nsid}
       port:                ${toString cfg.port}
-      reuseport:           ${yesOrNo cfg.reuseport}
-      round-robin:         ${yesOrNo cfg.roundRobin}
+      reuseport:           ${boolToYesNo cfg.reuseport}
+      round-robin:         ${boolToYesNo cfg.roundRobin}
       server-count:        ${toString cfg.serverCount}
       ${maybeToString "statistics: " cfg.statistics}
       tcp-count:           ${toString cfg.tcpCount}
@@ -121,7 +121,7 @@ let
       verbosity:           ${toString cfg.verbosity}
       ${maybeString "version: " cfg.version}
       xfrd-reload-timeout: ${toString cfg.xfrdReloadTimeout}
-      zonefiles-check:     ${yesOrNo cfg.zonefilesCheck}
+      zonefiles-check:     ${boolToYesNo cfg.zonefilesCheck}
       zonefiles-write:     ${toString cfg.zonefilesWrite}
 
       ${maybeString "rrl-ipv4-prefix-length: " cfg.ratelimit.ipv4PrefixLength}
@@ -134,7 +134,7 @@ let
     ${keyConfigFile}
 
     remote-control:
-      control-enable:    ${yesOrNo cfg.remoteControl.enable}
+      control-enable:    ${boolToYesNo cfg.remoteControl.enable}
       control-key-file:  "${cfg.remoteControl.controlKeyFile}"
       control-cert-file: "${cfg.remoteControl.controlCertFile}"
     ${forEach "  control-interface: " cfg.remoteControl.interfaces}
@@ -147,7 +147,6 @@ let
     ${cfg.extraConfig}
   '';
 
-  yesOrNo = b: if b then "yes" else "no";
   maybeString = prefix: x: optionalString (x != null) ''${prefix} "${x}"'';
   maybeToString = prefix: x: optionalString (x != null) ''${prefix} ${toString x}'';
   forEach = pre: l: concatMapStrings (x: pre + x + "\n") l;
@@ -183,8 +182,8 @@ let
       ${maybeToString "max-retry-time:   " zone.maxRetrySecs}
       ${maybeToString "min-retry-time:   " zone.minRetrySecs}
 
-      allow-axfr-fallback: ${yesOrNo zone.allowAXFRFallback}
-      multi-master-check: ${yesOrNo zone.multiMasterCheck}
+      allow-axfr-fallback: ${boolToYesNo zone.allowAXFRFallback}
+      multi-master-check: ${boolToYesNo zone.multiMasterCheck}
     ${forEach "  allow-notify: " zone.allowNotify}
     ${forEach "  request-xfr: " zone.requestXFR}
 
diff --git a/nixos/modules/services/networking/pdns-recursor.nix b/nixos/modules/services/networking/pdns-recursor.nix
index 3185dd1b9696..172f45c61331 100644
--- a/nixos/modules/services/networking/pdns-recursor.nix
+++ b/nixos/modules/services/networking/pdns-recursor.nix
@@ -21,7 +21,6 @@ let
     ];
   configType = with types; attrsOf (nullOr (oneOrMore valueType));
 
-  toBool = val: if val then "yes" else "no";
   serialize =
     val:
     with types;
@@ -32,7 +31,7 @@ let
     else if path.check val then
       toString val
     else if bool.check val then
-      toBool val
+      boolToYesNo val
     else if builtins.isList val then
       (concatMapStringsSep "," serialize val)
     else
diff --git a/nixos/modules/services/networking/smartdns.nix b/nixos/modules/services/networking/smartdns.nix
index d60c5cf19b84..761f3c3e6a14 100644
--- a/nixos/modules/services/networking/smartdns.nix
+++ b/nixos/modules/services/networking/smartdns.nix
@@ -23,7 +23,7 @@ let
     with generators;
     toKeyValue {
       mkKeyValue = mkKeyValueDefault {
-        mkValueString = v: if isBool v then if v then "yes" else "no" else mkValueStringDefault { } v;
+        mkValueString = v: if isBool v then boolToYesNo v else mkValueStringDefault { } v;
       } " ";
       listsAsDuplicateKeys = true; # Allowing duplications because we need to deal with multiple entries with the same key.
     } cfg.settings
diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix
index c56193cb4f83..ac7d43f81e77 100644
--- a/nixos/modules/services/networking/ssh/sshd.nix
+++ b/nixos/modules/services/networking/ssh/sshd.nix
@@ -484,7 +484,6 @@ in
               };
               UseDns = lib.mkOption {
                 type = lib.types.nullOr lib.types.bool;
-                # apply if cfg.useDns then "yes" else "no"
                 default = false;
                 description = ''
                   Specifies whether {manpage}`sshd(8)` should look up the remote host name, and to check that the resolved host name for
diff --git a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix
index cb4ef1079016..82b38d18c639 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix
+++ b/nixos/modules/services/networking/strongswan-swanctl/param-constructors.nix
@@ -97,7 +97,7 @@ rec {
       default = null;
       description = documentDefault description strongswanDefault;
     };
-    render = single (b: if b then "yes" else "no");
+    render = single boolToYesNo;
   };
   yes = true;
   no = false;
diff --git a/nixos/modules/services/networking/stunnel.nix b/nixos/modules/services/networking/stunnel.nix
index 9ff040191361..9ce2451b4231 100644
--- a/nixos/modules/services/networking/stunnel.nix
+++ b/nixos/modules/services/networking/stunnel.nix
@@ -7,7 +7,6 @@
 let
 
   cfg = config.services.stunnel;
-  yesNo = val: if val then "yes" else "no";
 
   verifyRequiredField = type: field: n: c: {
     assertion = lib.hasAttr field c;
@@ -23,13 +22,7 @@ let
 
   removeNulls = lib.mapAttrs (_: lib.filterAttrs (_: v: v != null));
   mkValueString =
-    v:
-    if v == true then
-      "yes"
-    else if v == false then
-      "no"
-    else
-      lib.generators.mkValueStringDefault { } v;
+    v: if lib.isBool v then lib.boolToYesNo v else lib.generators.mkValueStringDefault { } v;
   generateConfig =
     c:
     lib.generators.toINI {
diff --git a/nixos/modules/services/networking/tayga.nix b/nixos/modules/services/networking/tayga.nix
index 7ed0cf51e561..f7221bdaf8c7 100644
--- a/nixos/modules/services/networking/tayga.nix
+++ b/nixos/modules/services/networking/tayga.nix
@@ -28,7 +28,7 @@ let
       log ${concatStringsSep " " cfg.log}
     ''}
 
-    wkpf-strict ${if cfg.wkpfStrict then "yes" else "no"}
+    wkpf-strict ${boolToYesNo cfg.wkpfStrict}
   '';
 
   addrOpts =
diff --git a/nixos/modules/services/networking/unbound.nix b/nixos/modules/services/networking/unbound.nix
index 7ad0c53c17e9..219ca9fc13a9 100644
--- a/nixos/modules/services/networking/unbound.nix
+++ b/nixos/modules/services/networking/unbound.nix
@@ -9,8 +9,6 @@ with lib;
 let
   cfg = config.services.unbound;
 
-  yesOrNo = v: if v then "yes" else "no";
-
   toOption =
     indent: n: v:
     "${indent}${toString n}: ${v}";
@@ -22,7 +20,7 @@ let
     else if isInt v then
       (toOption indent n (toString v))
     else if isBool v then
-      (toOption indent n (yesOrNo v))
+      (toOption indent n (lib.boolToYesNo v))
     else if isString v then
       (toOption indent n v)
     else if isList v then
diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix
index 71a258fbfee1..d33b4d97519b 100644
--- a/nixos/modules/services/networking/xinetd.nix
+++ b/nixos/modules/services/networking/xinetd.nix
@@ -31,7 +31,7 @@ let
       ${optionalString (srv.flags != "") "flags = ${srv.flags}"}
       socket_type = ${if srv.protocol == "udp" then "dgram" else "stream"}
       ${optionalString (srv.port != 0) "port        = ${toString srv.port}"}
-      wait        = ${if srv.protocol == "udp" then "yes" else "no"}
+      wait        = ${lib.boolToYesNo (srv.protocol == "udp")}
       user        = ${srv.user}
       server      = ${srv.server}
       ${optionalString (srv.serverArgs != "") "server_args = ${srv.serverArgs}"}
diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index 653fafb9b216..14f9108c160d 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -18,7 +18,7 @@ let
 
   interfaceRoutes = i: i.ipv4.routes ++ optionals cfg.enableIPv6 i.ipv6.routes;
 
-  dhcpStr = useDHCP: if useDHCP == true || useDHCP == null then "yes" else "no";
+  dhcpStr = useDHCP: boolToYesNo (useDHCP == true || useDHCP == null);
 
   slaves =
     concatLists (map (bond: bond.interfaces) (attrValues cfg.bonds))
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index 6ac94dc2906b..aec14488480b 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -70,12 +70,12 @@ let
       ++ lib.optionals (pname == "gammastep") [ wayland-scanner ];
 
       configureFlags = [
-        "--enable-randr=${if withRandr then "yes" else "no"}"
-        "--enable-geoclue2=${if withGeoclue then "yes" else "no"}"
-        "--enable-drm=${if withDrm then "yes" else "no"}"
-        "--enable-vidmode=${if withVidmode then "yes" else "no"}"
-        "--enable-quartz=${if withQuartz then "yes" else "no"}"
-        "--enable-corelocation=${if withCoreLocation then "yes" else "no"}"
+        "--enable-randr=${lib.boolToYesNo withRandr}"
+        "--enable-geoclue2=${lib.boolToYesNo withGeoclue}"
+        "--enable-drm=${lib.boolToYesNo withDrm}"
+        "--enable-vidmode=${lib.boolToYesNo withVidmode}"
+        "--enable-quartz=${lib.boolToYesNo withQuartz}"
+        "--enable-corelocation=${lib.boolToYesNo withCoreLocation}"
       ]
       ++ lib.optionals (pname == "gammastep") [
         "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user/"
diff --git a/pkgs/build-support/release/debian-build.nix b/pkgs/build-support/release/debian-build.nix
index 27afc3a117fa..2359587665b8 100644
--- a/pkgs/build-support/release/debian-build.nix
+++ b/pkgs/build-support/release/debian-build.nix
@@ -69,7 +69,7 @@ vmTools.runInLinuxImage (
           # the log file
           export PAGER=cat
           ${checkinstall}/sbin/checkinstall --nodoc -y -D \
-            --fstrans=${if fsTranslation then "yes" else "no"} \
+            --fstrans=${lib.boolToYesNo fsTranslation} \
             --requires="${lib.concatStringsSep "," debRequires}" \
             --provides="${lib.concatStringsSep "," debProvides}" \
             ${
diff --git a/pkgs/by-name/ap/apr/package.nix b/pkgs/by-name/ap/apr/package.nix
index 8ded7258aca7..f9feea54a782 100644
--- a/pkgs/by-name/ap/apr/package.nix
+++ b/pkgs/by-name/ap/apr/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation rec {
       # These answers are valid on x86_64-linux and aarch64-linux.
       # TODO: provide all valid answers for BSD.
       "ac_cv_file__dev_zero=yes"
-      "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
+      "ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)}"
       "apr_cv_tcp_nodelay_with_cork=yes"
       "ac_cv_define_PTHREAD_PROCESS_SHARED=yes"
       "apr_cv_process_shared_works=yes"
diff --git a/pkgs/by-name/ba/bacula/package.nix b/pkgs/by-name/ba/bacula/package.nix
index 74007248fd63..9397eab8c4dd 100644
--- a/pkgs/by-name/ba/bacula/package.nix
+++ b/pkgs/by-name/ba/bacula/package.nix
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
   ]
   ++
     lib.optional (stdenv.buildPlatform != stdenv.hostPlatform)
-      "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
+      "ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)}"
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # bacula’s `configure` script fails to detect CoreFoundation correctly,
     # but these symbols are available in the nixpkgs CoreFoundation framework.
diff --git a/pkgs/by-name/co/colpack/package.nix b/pkgs/by-name/co/colpack/package.nix
index 897b137cd2c9..56bb94293a0e 100644
--- a/pkgs/by-name/co/colpack/package.nix
+++ b/pkgs/by-name/co/colpack/package.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ autoreconfHook ];
 
   configureFlags = [
-    "--enable-openmp=${if stdenv.hostPlatform.isLinux then "yes" else "no"}"
+    "--enable-openmp=${lib.boolToYesNo stdenv.hostPlatform.isLinux}"
     "--enable-examples=no"
   ];
 
diff --git a/pkgs/by-name/do/dovecot/package.nix b/pkgs/by-name/do/dovecot/package.nix
index 1dce4874455d..5dd75ba1b615 100644
--- a/pkgs/by-name/do/dovecot/package.nix
+++ b/pkgs/by-name/do/dovecot/package.nix
@@ -155,9 +155,9 @@ stdenv.mkDerivation rec {
     "--with-textcat"
   ]
   ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
-    "i_cv_epoll_works=${if stdenv.hostPlatform.isLinux then "yes" else "no"}"
-    "i_cv_posix_fallocate_works=${if stdenv.hostPlatform.isDarwin then "no" else "yes"}"
-    "i_cv_inotify_works=${if stdenv.hostPlatform.isLinux then "yes" else "no"}"
+    "i_cv_epoll_works=${lib.boolToYesNo stdenv.hostPlatform.isLinux}"
+    "i_cv_posix_fallocate_works=${lib.boolToYesNo stdenv.hostPlatform.isDarwin}"
+    "i_cv_inotify_works=${lib.boolToYesNo stdenv.hostPlatform.isLinux}"
     "i_cv_signed_size_t=no"
     "i_cv_signed_time_t=yes"
     "i_cv_c99_vsnprintf=yes"
diff --git a/pkgs/by-name/i2/i2pd/package.nix b/pkgs/by-name/i2/i2pd/package.nix
index 598ffdc52936..83b9fa9aa0cb 100644
--- a/pkgs/by-name/i2/i2pd/package.nix
+++ b/pkgs/by-name/i2/i2pd/package.nix
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
   ];
 
   makeFlags = [
-    "USE_UPNP=${if upnpSupport then "yes" else "no"}"
+    "USE_UPNP=${lib.boolToYesNo upnpSupport}"
   ];
 
   enableParallelBuilding = true;
diff --git a/pkgs/by-name/li/libcap/package.nix b/pkgs/by-name/li/libcap/package.nix
index 7abcdb8d24b8..76e0ee1d0fe6 100644
--- a/pkgs/by-name/li/libcap/package.nix
+++ b/pkgs/by-name/li/libcap/package.nix
@@ -56,7 +56,7 @@ stdenv.mkDerivation rec {
 
   makeFlags = [
     "lib=lib"
-    "PAM_CAP=${if usePam then "yes" else "no"}"
+    "PAM_CAP=${lib.boolToYesNo usePam}"
     "BUILD_CC=$(CC_FOR_BUILD)"
     "CC:=$(CC)"
     "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
diff --git a/pkgs/by-name/li/libdaemon/package.nix b/pkgs/by-name/li/libdaemon/package.nix
index 7be36bcece73..5a2013bfe03c 100644
--- a/pkgs/by-name/li/libdaemon/package.nix
+++ b/pkgs/by-name/li/libdaemon/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
     # Can't run this test while cross-compiling
-    "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
+    "ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)}"
   ];
 
   meta = {
diff --git a/pkgs/by-name/li/libepoxy/package.nix b/pkgs/by-name/li/libepoxy/package.nix
index c408b12bac40..c73090a25a29 100644
--- a/pkgs/by-name/li/libepoxy/package.nix
+++ b/pkgs/by-name/li/libepoxy/package.nix
@@ -63,8 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
     ];
 
   mesonFlags = [
-    "-Degl=${if (x11Support && !stdenv.hostPlatform.isDarwin) then "yes" else "no"}"
-    "-Dglx=${if x11Support then "yes" else "no"}"
+    "-Degl=${lib.boolToYesNo (x11Support && !stdenv.hostPlatform.isDarwin)}"
+    "-Dglx=${lib.boolToYesNo x11Support}"
     "-Dtests=${lib.boolToString finalAttrs.finalPackage.doCheck}"
     "-Dx11=${lib.boolToString x11Support}"
   ];
diff --git a/pkgs/by-name/li/libgpiod/package.nix b/pkgs/by-name/li/libgpiod/package.nix
index b40cb39b86ff..ed6b3ca2fa1c 100644
--- a/pkgs/by-name/li/libgpiod/package.nix
+++ b/pkgs/by-name/li/libgpiod/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--enable-tools=${if enable-tools then "yes" else "no"}"
+    "--enable-tools=${lib.boolToYesNo enable-tools}"
     "--enable-bindings-cxx"
   ];
 
diff --git a/pkgs/by-name/li/libgpiod_1/package.nix b/pkgs/by-name/li/libgpiod_1/package.nix
index f1c4908a2683..39aa5b933d01 100644
--- a/pkgs/by-name/li/libgpiod_1/package.nix
+++ b/pkgs/by-name/li/libgpiod_1/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--enable-tools=${if enable-tools then "yes" else "no"}"
+    "--enable-tools=${lib.boolToYesNo enable-tools}"
     "--enable-bindings-cxx"
     "--prefix=${placeholder "out"}"
   ]
diff --git a/pkgs/by-name/mo/moc/package.nix b/pkgs/by-name/mo/moc/package.nix
index ee093e43eb4c..676b435661ba 100644
--- a/pkgs/by-name/mo/moc/package.nix
+++ b/pkgs/by-name/mo/moc/package.nix
@@ -147,7 +147,7 @@ stdenv.mkDerivation {
     # Misc
     (lib.withFeature curlSupport "curl")
     (lib.withFeature samplerateSupport "samplerate")
-    ("--enable-debug=" + (if withDebug then "yes" else "no"))
+    "--enable-debug=${lib.boolToYesNo withDebug}"
     "--disable-cache"
     "--without-rcc"
   ];
diff --git a/pkgs/by-name/mo/motif/package.nix b/pkgs/by-name/mo/motif/package.nix
index c06b6c1e062c..92bd4eafae1b 100644
--- a/pkgs/by-name/mo/motif/package.nix
+++ b/pkgs/by-name/mo/motif/package.nix
@@ -119,7 +119,7 @@ stdenv.mkDerivation rec {
 
   # provide correct configure answers for cross builds
   configureFlags = [
-    "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
+    "ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)}"
   ];
 
   env = lib.optionalAttrs stdenv.cc.isClang {
diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix
index 1d3b8cea5f99..82447b34a4c5 100644
--- a/pkgs/by-name/mu/mupdf/package.nix
+++ b/pkgs/by-name/mu/mupdf/package.nix
@@ -282,7 +282,7 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
-  env.USE_SONAME = if (stdenv.hostPlatform.isDarwin) then "no" else "yes";
+  env.USE_SONAME = lib.boolToYesNo (!stdenv.hostPlatform.isDarwin);
 
   passthru = {
     tests = {
diff --git a/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix b/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix
index c03e224044a2..578632ad42b3 100644
--- a/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix
+++ b/pkgs/by-name/ne/networkmanager-fortisslvpn/package.nix
@@ -63,8 +63,8 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--with-gnome=${if withGnome then "yes" else "no"}"
-    "--with-gtk4=${if withGnome then "yes" else "no"}"
+    "--with-gnome=${lib.boolToYesNo withGnome}"
+    "--with-gtk4=${lib.boolToYesNo withGnome}"
     "--localstatedir=/var"
     "--enable-absolute-paths"
   ];
diff --git a/pkgs/by-name/ne/networkmanager-iodine/package.nix b/pkgs/by-name/ne/networkmanager-iodine/package.nix
index 423a68a9392b..c32c8d3ac34d 100644
--- a/pkgs/by-name/ne/networkmanager-iodine/package.nix
+++ b/pkgs/by-name/ne/networkmanager-iodine/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation {
   ];
 
   configureFlags = [
-    "--with-gnome=${if withGnome then "yes" else "no"}"
+    "--with-gnome=${lib.boolToYesNo withGnome}"
     "--localstatedir=/" # needed for the management socket under /run/NetworkManager
     "--enable-absolute-paths"
   ];
diff --git a/pkgs/by-name/ne/networkmanager-l2tp/package.nix b/pkgs/by-name/ne/networkmanager-l2tp/package.nix
index ddb1a9ea489d..3b2a3830d5de 100644
--- a/pkgs/by-name/ne/networkmanager-l2tp/package.nix
+++ b/pkgs/by-name/ne/networkmanager-l2tp/package.nix
@@ -62,8 +62,8 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--with-gnome=${if withGnome then "yes" else "no"}"
-    "--with-gtk4=${if withGnome then "yes" else "no"}"
+    "--with-gnome=${lib.boolToYesNo withGnome}"
+    "--with-gtk4=${lib.boolToYesNo withGnome}"
     "--localstatedir=/var"
     "--enable-absolute-paths"
   ];
diff --git a/pkgs/by-name/ne/networkmanager-openconnect/package.nix b/pkgs/by-name/ne/networkmanager-openconnect/package.nix
index 2fa483df360e..d9bf1c519342 100644
--- a/pkgs/by-name/ne/networkmanager-openconnect/package.nix
+++ b/pkgs/by-name/ne/networkmanager-openconnect/package.nix
@@ -60,8 +60,8 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--with-gnome=${if withGnome then "yes" else "no"}"
-    "--with-gtk4=${if withGnome then "yes" else "no"}"
+    "--with-gnome=${lib.boolToYesNo withGnome}"
+    "--with-gtk4=${lib.boolToYesNo withGnome}"
     "--enable-absolute-paths"
   ];
 
diff --git a/pkgs/by-name/ne/networkmanager-openvpn/package.nix b/pkgs/by-name/ne/networkmanager-openvpn/package.nix
index fc777d2e7a77..8ea6dd63f8db 100644
--- a/pkgs/by-name/ne/networkmanager-openvpn/package.nix
+++ b/pkgs/by-name/ne/networkmanager-openvpn/package.nix
@@ -56,8 +56,8 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   configureFlags = [
-    "--with-gnome=${if withGnome then "yes" else "no"}"
-    "--with-gtk4=${if withGnome then "yes" else "no"}"
+    "--with-gnome=${lib.boolToYesNo withGnome}"
+    "--with-gtk4=${lib.boolToYesNo withGnome}"
     "--localstatedir=/" # needed for the management socket under /run/NetworkManager
     "--enable-absolute-paths"
   ];
diff --git a/pkgs/by-name/ne/networkmanager-sstp/package.nix b/pkgs/by-name/ne/networkmanager-sstp/package.nix
index fb44c80c5e31..b881ddf0c756 100644
--- a/pkgs/by-name/ne/networkmanager-sstp/package.nix
+++ b/pkgs/by-name/ne/networkmanager-sstp/package.nix
@@ -59,8 +59,8 @@ stdenv.mkDerivation rec {
   '';
 
   configureFlags = [
-    "--with-gnome=${if withGnome then "yes" else "no"}"
-    "--with-gtk4=${if withGnome then "yes" else "no"}"
+    "--with-gnome=${lib.boolToYesNo withGnome}"
+    "--with-gtk4=${lib.boolToYesNo withGnome}"
     "--with-pppd-plugin-dir=$(out)/lib/pppd/2.5.0"
     "--enable-absolute-paths"
   ];
diff --git a/pkgs/by-name/ne/networkmanager-vpnc/package.nix b/pkgs/by-name/ne/networkmanager-vpnc/package.nix
index e5eab9609e70..06c49313d36e 100644
--- a/pkgs/by-name/ne/networkmanager-vpnc/package.nix
+++ b/pkgs/by-name/ne/networkmanager-vpnc/package.nix
@@ -52,8 +52,8 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--with-gnome=${if withGnome then "yes" else "no"}"
-    "--with-gtk4=${if withGnome then "yes" else "no"}"
+    "--with-gnome=${lib.boolToYesNo withGnome}"
+    "--with-gtk4=${lib.boolToYesNo withGnome}"
     "--enable-absolute-paths"
   ];
 
diff --git a/pkgs/by-name/op/openmpi/package.nix b/pkgs/by-name/op/openmpi/package.nix
index 2984c4c035d9..4bd744c5f5d3 100644
--- a/pkgs/by-name/op/openmpi/package.nix
+++ b/pkgs/by-name/op/openmpi/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
           substituteInPlace configure \
             --replace-fail \
               ompi_cv_op_avx_check_${option}=yes \
-              ompi_cv_op_avx_check_${option}=${if val then "yes" else "no"}
+              ompi_cv_op_avx_check_${option}=${lib.boolToYesNo val}
         ''
       ))
       (lib.concatStringsSep "\n")
diff --git a/pkgs/by-name/pc/pciutils/package.nix b/pkgs/by-name/pc/pciutils/package.nix
index 3aa99cd6634a..b3a0d2b91357 100644
--- a/pkgs/by-name/pc/pciutils/package.nix
+++ b/pkgs/by-name/pc/pciutils/package.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   enableParallelBuilding = true;
 
   makeFlags = [
-    "SHARED=${if static then "no" else "yes"}"
+    "SHARED=${lib.boolToYesNo (!static)}"
     "PREFIX=\${out}"
     "STRIP="
     "HOST=${stdenv.hostPlatform.system}"
diff --git a/pkgs/by-name/sh/shadow/package.nix b/pkgs/by-name/sh/shadow/package.nix
index 719bfb4fb1ff..72681d81eae0 100644
--- a/pkgs/by-name/sh/shadow/package.nix
+++ b/pkgs/by-name/sh/shadow/package.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation rec {
 
   # `AC_FUNC_SETPGRP' is not cross-compilation capable.
   preConfigure = ''
-    export ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}
+    export ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)}
     export shadow_cv_logdir=/var/log
   '';
 
diff --git a/pkgs/by-name/tp/tpm2-pkcs11/package.nix b/pkgs/by-name/tp/tpm2-pkcs11/package.nix
index 233f578d6596..aa5c17d283aa 100644
--- a/pkgs/by-name/tp/tpm2-pkcs11/package.nix
+++ b/pkgs/by-name/tp/tpm2-pkcs11/package.nix
@@ -87,7 +87,7 @@ chosenStdenv.mkDerivation (finalAttrs: {
     (lib.enableFeature finalAttrs.doCheck "integration")
 
     # Strangely, it uses --with-fapi=yes|no instead of a normal configure flag.
-    "--with-fapi=${if fapiSupport then "yes" else "no"}"
+    "--with-fapi=${lib.boolToYesNo fapiSupport}"
   ]
   ++ lib.optionals enableFuzzing [
     "--enable-fuzzing"
diff --git a/pkgs/by-name/w3/w3m/package.nix b/pkgs/by-name/w3/w3m/package.nix
index 4cb3648a56c5..c9d00588502a 100644
--- a/pkgs/by-name/w3/w3m/package.nix
+++ b/pkgs/by-name/w3/w3m/package.nix
@@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
     "CFLAGS=-std=gnu17"
   ]
   ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
-    "ac_cv_func_setpgrp_void=${if stdenv.hostPlatform.isBSD then "no" else "yes"}"
+    "ac_cv_func_setpgrp_void=${lib.boolToYesNo (!stdenv.hostPlatform.isBSD)}"
   ]
   ++ lib.optional graphicsSupport "--enable-image=${lib.optionalString x11Support "x11,"}fb"
   ++ lib.optional (graphicsSupport && !x11Support) "--without-x";
diff --git a/pkgs/development/ada-modules/gnatcoll/core.nix b/pkgs/development/ada-modules/gnatcoll/core.nix
index 6cd55e28c0bb..015c2e54e276 100644
--- a/pkgs/development/ada-modules/gnatcoll/core.nix
+++ b/pkgs/development/ada-modules/gnatcoll/core.nix
@@ -63,8 +63,8 @@ stdenv.mkDerivation rec {
     "PROCESSORS=$(NIX_BUILD_CORES)"
     # confusingly, for gprbuild --target is autoconf --host
     "TARGET=${stdenv.hostPlatform.config}"
-    "GNATCOLL_MINIMAL_ONLY=${if !enableGnatcollCore then "yes" else "no"}"
-    "GNATCOLL_PROJECTS=${if enableGnatcollProjects then "yes" else "no"}"
+    "GNATCOLL_MINIMAL_ONLY=${lib.boolToYesNo (!enableGnatcollCore)}"
+    "GNATCOLL_PROJECTS=${lib.boolToYesNo enableGnatcollProjects}"
   ];
 
   passthru.tests = {
diff --git a/pkgs/development/ada-modules/gpr2/default.nix b/pkgs/development/ada-modules/gpr2/default.nix
index 11c6006884f5..7448d251a692 100644
--- a/pkgs/development/ada-modules/gpr2/default.nix
+++ b/pkgs/development/ada-modules/gpr2/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
   makeFlags = [
     "prefix=$(out)"
     "PROCESSORS=$(NIX_BUILD_CORES)"
-    "ENABLE_SHARED=${if enableShared then "yes" else "no"}"
+    "ENABLE_SHARED=${lib.boolToYesNo enableShared}"
     "GPR2_BUILD=release"
   ]
   ++ lib.optionals (gpr2kbdir != null) [
diff --git a/pkgs/development/ada-modules/gprbuild/default.nix b/pkgs/development/ada-modules/gprbuild/default.nix
index b6f4a32fb441..c8d530466ca7 100644
--- a/pkgs/development/ada-modules/gprbuild/default.nix
+++ b/pkgs/development/ada-modules/gprbuild/default.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation {
   ];
 
   makeFlags = [
-    "ENABLE_SHARED=${if stdenv.hostPlatform.isStatic then "no" else "yes"}"
+    "ENABLE_SHARED=${lib.boolToYesNo (!stdenv.hostPlatform.isStatic)}"
     "PROCESSORS=$(NIX_BUILD_CORES)"
     # confusingly, for gprbuild --target is autoconf --host
     "TARGET=${stdenv.hostPlatform.config}"
diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix
index 58a2a5c4e2e6..51f9a544146c 100644
--- a/pkgs/development/interpreters/python/cpython/default.nix
+++ b/pkgs/development/interpreters/python/cpython/default.nix
@@ -516,8 +516,8 @@ stdenv.mkDerivation (finalAttrs: {
     "ac_cv_have_size_t_format=yes"
     "ac_cv_computed_gotos=yes"
     # Both fail when building for windows, normally configure checks this by itself but on other platforms this is set to yes always.
-    "ac_cv_file__dev_ptmx=${if stdenv.hostPlatform.isWindows then "no" else "yes"}"
-    "ac_cv_file__dev_ptc=${if stdenv.hostPlatform.isWindows then "no" else "yes"}"
+    "ac_cv_file__dev_ptmx=${lib.boolToYesNo (!stdenv.hostPlatform.isWindows)}"
+    "ac_cv_file__dev_ptc=${lib.boolToYesNo (!stdenv.hostPlatform.isWindows)}"
   ]
   ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform && pythonAtLeast "3.11") [
     "--with-build-python=${pythonOnBuildForHostInterpreter}"
diff --git a/pkgs/development/libraries/libgda/5.x.nix b/pkgs/development/libraries/libgda/5.x.nix
index 0761542379d3..ff40c3ccf86e 100644
--- a/pkgs/development/libraries/libgda/5.x.nix
+++ b/pkgs/development/libraries/libgda/5.x.nix
@@ -78,15 +78,15 @@ stdenv.mkDerivation rec {
   ];
 
   configureFlags = [
-    "--with-mysql=${if mysqlSupport then "yes" else "no"}"
-    "--with-postgres=${if postgresSupport then "yes" else "no"}"
+    "--with-mysql=${lib.boolToYesNo mysqlSupport}"
+    "--with-postgres=${lib.boolToYesNo postgresSupport}"
 
     # macOS builds use the sqlite source code that comes with libgda,
     # as opposed to using the system or brewed sqlite3, which is not supported on macOS,
     # as mentioned in https://github.com/GNOME/libgda/blob/95eeca4b0470f347c645a27f714c62aa6e59f820/libgda/sqlite/README#L31,
     # which references the paper https://web.archive.org/web/20100610151539/http://lattice.umiacs.umd.edu/files/functions_tr.pdf
     # See also https://github.com/Homebrew/homebrew-core/blob/104f9ecd02854a82372b64d63d41356555378a52/Formula/libgda.rb
-    "--enable-system-sqlite=${if stdenv.hostPlatform.isDarwin then "no" else "yes"}"
+    "--enable-system-sqlite=${lib.boolToYesNo (!stdenv.hostPlatform.isDarwin)}"
   ];
 
   env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
diff --git a/pkgs/development/tools/protoc-gen-grpc-web/default.nix b/pkgs/development/tools/protoc-gen-grpc-web/default.nix
index 61e9c252c12c..357d1d9a7272 100644
--- a/pkgs/development/tools/protoc-gen-grpc-web/default.nix
+++ b/pkgs/development/tools/protoc-gen-grpc-web/default.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [
     "PREFIX=$(out)"
-    "STATIC=${if isStatic then "yes" else "no"}"
+    "STATIC=${lib.boolToYesNo isStatic}"
   ];
 
   doCheck = true;
diff --git a/pkgs/games/quake2/yquake2/default.nix b/pkgs/games/quake2/yquake2/default.nix
index 749147859273..1646cb3163c3 100644
--- a/pkgs/games/quake2/yquake2/default.nix
+++ b/pkgs/games/quake2/yquake2/default.nix
@@ -14,8 +14,6 @@
 }:
 
 let
-  mkFlag = b: if b then "yes" else "no";
-
   games = import ./games.nix { inherit stdenv lib fetchFromGitHub; };
 
   wrapper = import ./wrapper.nix {
@@ -58,7 +56,7 @@ let
     ++ lib.optional openalSupport openal;
 
     makeFlags = [
-      "WITH_OPENAL=${mkFlag openalSupport}"
+      "WITH_OPENAL=${lib.boolToYesNo openalSupport}"
       "WITH_SYSTEMWIDE=yes"
       "WITH_SYSTEMDIR=$\{out}/share/games/quake2"
     ];
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
index 9c93d416f6c0..3dbfe3d9c284 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/sys/package.nix
@@ -70,7 +70,7 @@ let
   // (lib.flip lib.mapAttrs' extraFlags (
     name: value: {
       name = "MK_${lib.toUpper name}";
-      value = if value then "yes" else "no";
+      value = lib.boolToYesNo value;
     }
   ));
 in
diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix
index 08b4e4bff2fc..0ca4ca768b5d 100644
--- a/pkgs/shells/bash/5.nix
+++ b/pkgs/shells/bash/5.nix
@@ -103,7 +103,7 @@ lib.warnIf (withDocs != null)
       # default is fine for static linking on Linux (weak symbols?) but
       # not with BSDs, when it does clash with the regular `getenv`.
       "bash_cv_getenv_redef=${
-        if !(with stdenv.hostPlatform; isStatic && (isOpenBSD || isFreeBSD)) then "yes" else "no"
+        lib.boolToYesNo (!(with stdenv.hostPlatform; isStatic && (isOpenBSD || isFreeBSD)))
       }"
     ]
     ++ lib.optionals stdenv.hostPlatform.isCygwin [
diff --git a/pkgs/tools/nix/info/default.nix b/pkgs/tools/nix/info/default.nix
index be5b75282101..00e6821ce7bd 100644
--- a/pkgs/tools/nix/info/default.nix
+++ b/pkgs/tools/nix/info/default.nix
@@ -23,7 +23,7 @@ stdenv.mkDerivation {
     ]
     ++ (lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ])
   );
-  is_darwin = if stdenv.hostPlatform.isDarwin then "yes" else "no";
+  is_darwin = lib.boolToYesNo stdenv.hostPlatform.isDarwin;
 
   sandboxtest = ./sandbox.nix;
   relaxedsandboxtest = ./relaxedsandbox.nix;

From 7a1d881bafbb98c7d8d4469efe4c135bd0115dfe Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 10:06:06 -0300
Subject: [PATCH 1280/6226] hh-suite: fix build with cmake4

---
 pkgs/applications/science/biology/hh-suite/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/science/biology/hh-suite/default.nix b/pkgs/applications/science/biology/hh-suite/default.nix
index 51f12d9ae6ea..5cb62d1318df 100644
--- a/pkgs/applications/science/biology/hh-suite/default.nix
+++ b/pkgs/applications/science/biology/hh-suite/default.nix
@@ -41,6 +41,13 @@ stdenv.mkDerivation rec {
 
   buildInputs = lib.optional stdenv.cc.isClang openmp ++ lib.optional enableMpi mpi;
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace lib/ffindex/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Remote protein homology detection suite";
     homepage = "https://github.com/soedinglab/hh-suite";

From 525a729d80ae34b62e91b94dc7913a45a4077c95 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 21 Oct 2025 13:18:27 +0000
Subject: [PATCH 1281/6226] python3Packages.morecantile: cleanup

---
 .../python-modules/morecantile/default.nix    | 21 ++++++++++++-------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/morecantile/default.nix b/pkgs/development/python-modules/morecantile/default.nix
index c5e29eecfd02..8d0fd9ef7373 100644
--- a/pkgs/development/python-modules/morecantile/default.nix
+++ b/pkgs/development/python-modules/morecantile/default.nix
@@ -3,23 +3,26 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  pytestCheckHook,
-  pythonOlder,
 
+  # build-system
+  flit,
+
+  # dependencies
   attrs,
   click,
-  flit,
-  mercantile,
   pydantic,
   pyproj,
+
+  # tests
+  mercantile,
   rasterio,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "morecantile";
   version = "6.2.0";
   pyproject = true;
-  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "developmentseed";
@@ -28,9 +31,9 @@ buildPythonPackage rec {
     hash = "sha256-ohTSgkjgaANS/Pli4fao+THA4ltts6svj5CdJEgorz0=";
   };
 
-  nativeBuildInputs = [ flit ];
+  build-system = [ flit ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     attrs
     click
     pydantic
@@ -52,7 +55,9 @@ buildPythonPackage rec {
 
   meta = {
     description = "Construct and use map tile grids in different projection";
-    homepage = "https://developmentseed.org/morecantile/";
+    homepage = "https://developmentseed.org/morecantile";
+    downloadPage = "https://github.com/developmentseed/morecantile";
+    changelog = "https://github.com/developmentseed/morecantile/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     teams = [ lib.teams.geospatial ];
     mainProgram = "morecantile";

From cd82aae7e87ff68fc1230fb9f3bf0e884a62d6d1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 21 Oct 2025 13:18:55 +0000
Subject: [PATCH 1282/6226] python3Packages.morecantile: disable tests failing
 with click 8.2.1

---
 .../python-modules/morecantile/default.nix      | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/morecantile/default.nix b/pkgs/development/python-modules/morecantile/default.nix
index 8d0fd9ef7373..2246f96736bd 100644
--- a/pkgs/development/python-modules/morecantile/default.nix
+++ b/pkgs/development/python-modules/morecantile/default.nix
@@ -46,7 +46,22 @@ buildPythonPackage rec {
     rasterio
   ];
 
-  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+  disabledTests = [
+    # AssertionError CLI exists with non-zero error code
+    # This is a regression introduced by https://github.com/NixOS/nixpkgs/pull/448189
+    "test_cli_shapes"
+    "test_cli_shapesWGS84"
+    "test_cli_strict_overlap_contain"
+    "test_cli_tiles_bad_bounds"
+    "test_cli_tiles_geosjon"
+    "test_cli_tiles_implicit_stdin"
+    "test_cli_tiles_multi_bounds"
+    "test_cli_tiles_multi_bounds_seq"
+    "test_cli_tiles_ok"
+    "test_cli_tiles_points"
+    "test_cli_tiles_seq"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # https://github.com/developmentseed/morecantile/issues/156
     "test_tiles_when_tms_bounds_and_provided_bounds_cross_antimeridian"
   ];

From 333591a6ee64c8cae8723ef6b1e8eb4222d3bfee Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 21 Oct 2025 13:19:41 +0000
Subject: [PATCH 1283/6226] python3Packages.morecantile: add versionCheckHook

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

diff --git a/pkgs/development/python-modules/morecantile/default.nix b/pkgs/development/python-modules/morecantile/default.nix
index 2246f96736bd..e9f4650acb18 100644
--- a/pkgs/development/python-modules/morecantile/default.nix
+++ b/pkgs/development/python-modules/morecantile/default.nix
@@ -17,6 +17,7 @@
   mercantile,
   rasterio,
   pytestCheckHook,
+  versionCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -44,7 +45,9 @@ buildPythonPackage rec {
     mercantile
     pytestCheckHook
     rasterio
+    versionCheckHook
   ];
+  versionCheckProgramArg = "--version";
 
   disabledTests = [
     # AssertionError CLI exists with non-zero error code

From 89934abf504355ffd642bec46f467291f386d851 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 10:35:26 -0300
Subject: [PATCH 1284/6226] hypr: fix build with cmake4

---
 pkgs/applications/window-managers/hyprwm/hypr/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/window-managers/hyprwm/hypr/default.nix b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
index 3a83551b6e51..c8b3fcbfa762 100644
--- a/pkgs/applications/window-managers/hyprwm/hypr/default.nix
+++ b/pkgs/applications/window-managers/hyprwm/hypr/default.nix
@@ -67,6 +67,11 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.4)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postFixup = ''
     wrapProgram $out/bin/Hypr --prefix PATH : ${lib.makeBinPath [ xmodmap ]}
   '';

From 78729c2c4a98cfe7ecc046114519c0e0968d4609 Mon Sep 17 00:00:00 2001
From: Rexiel Scarlet <37258415+Rexcrazy804@users.noreply.github.com>
Date: Tue, 21 Oct 2025 14:29:01 +0400
Subject: [PATCH 1285/6226] qdmr: 0.12.3 -> 0.13.1

Release: https://github.com/hmatuschek/qdmr/releases/tag/v0.13.1
Changes: https://github.com/hmatuschek/qdmr/compare/v0.12.3...v0.13.1

- switched to qt6
- fix build with cmake 4
- fix build of manpages
---
 pkgs/by-name/qd/qdmr/package.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/qd/qdmr/package.nix b/pkgs/by-name/qd/qdmr/package.nix
index 0875c3b3e14c..ec24d4032f95 100644
--- a/pkgs/by-name/qd/qdmr/package.nix
+++ b/pkgs/by-name/qd/qdmr/package.nix
@@ -6,8 +6,9 @@
   cmake,
   libxslt,
   docbook_xsl_ns,
-  libsForQt5,
+  kdePackages,
   libusb1,
+  librsvg,
   yaml-cpp,
 }:
 
@@ -17,28 +18,30 @@ in
 
 stdenv.mkDerivation rec {
   pname = "qdmr";
-  version = "0.12.3";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "hmatuschek";
     repo = "qdmr";
     rev = "v${version}";
-    hash = "sha256-rb59zbYpIziqXWTjTApWXnkcpRiAUIqPiInEJdsYd48=";
+    hash = "sha256-Vz7di9VwrvtSCea3pipSCEw9pHfRv9lJn9jKzboyh6E=";
   };
 
   nativeBuildInputs = [
     cmake
-    libxslt
-    libsForQt5.wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
     installShellFiles
   ];
 
   buildInputs = [
+    librsvg
     libusb1
-    libsForQt5.qtlocation
-    libsForQt5.qtserialport
-    libsForQt5.qttools
-    libsForQt5.qtbase
+    libxslt
+    kdePackages.qtlocation
+    kdePackages.qtserialport
+    kdePackages.qttools
+    kdePackages.qtbase
+    kdePackages.qtpositioning
     yaml-cpp
   ];
 
@@ -59,6 +62,7 @@ stdenv.mkDerivation rec {
   cmakeFlags = [
     "-DBUILD_MAN=ON"
     "-DCMAKE_INSTALL_FULL_MANDIR=share/man"
+    "-DDOCBOOK2MAN_XSLT=docbook_man.${if isLinux then "debian" else "macports"}.xsl"
     "-DINSTALL_UDEV_RULES=OFF"
   ];
 

From 901ddad0838f69134e863579d140b2d0d28db46e Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Tue, 21 Oct 2025 22:57:19 +1100
Subject: [PATCH 1286/6226] xen: patch with XSA-475

                  Xen Security Advisory #475

       x86: Incorrect input sanitisation in Viridian hypercalls

Some Viridian hypercalls can specify a mask of vCPU IDs as an input, in
one of three formats.  Xen has boundary checking bugs with all three
formats, which can cause out-of-bounds reads and writes while processing
the inputs.

 * CVE-2025-58147.  Hypercalls using the HV_VP_SET Sparse format can
   cause vpmask_set() to write out of bounds when converting the bitmap
   to Xen's format.

 * CVE-2025-58148.  Hypercalls using any input format can cause
   send_ipi() to read d->vcpu[] out-of-bounds, and operate on a wild
   vCPU pointer.

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

diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix
index 152ecf6fdd5b..e5910918c62f 100644
--- a/pkgs/by-name/xe/xen/package.nix
+++ b/pkgs/by-name/xe/xen/package.nix
@@ -215,6 +215,16 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://xenbits.xen.org/xsa/xsa473-2.patch";
       hash = "sha256-tGuIGxJFBXbckIruSUeTyrM6GabdIj6Pr3cVxeDvNNY=";
     })
+
+    # XSA 475
+    (fetchpatch {
+      url = "https://xenbits.xen.org/xsa/xsa475-1.patch";
+      hash = "sha256-Bzvtr12g+7+M9jY9Nt2jd41CwYTL+h2fuwzJFsxroio=";
+    })
+    (fetchpatch {
+      url = "https://xenbits.xen.org/xsa/xsa475-2.patch";
+      hash = "sha256-7MKtDAJpihpfcBK+hyBFGCP6gHWs2cdgTks8B439b2s=";
+    })
   ];
 
   outputs = [

From 92b0d2e4cf5c85b0437b3f1c10e9e7e90c2eadc3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 13:48:53 +0000
Subject: [PATCH 1287/6226] ols: 0-unstable-2025-09-19 -> 0-unstable-2025-10-20

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

diff --git a/pkgs/by-name/ol/ols/package.nix b/pkgs/by-name/ol/ols/package.nix
index b03ec644e4ba..a02f63160e35 100644
--- a/pkgs/by-name/ol/ols/package.nix
+++ b/pkgs/by-name/ol/ols/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "ols";
-  version = "0-unstable-2025-09-19";
+  version = "0-unstable-2025-10-20";
 
   src = fetchFromGitHub {
     owner = "DanielGavin";
     repo = "ols";
-    rev = "7ff84eb0b24912db1b3f3b0cff323e1728f47b0b";
-    hash = "sha256-aKyVZARXFMBa0kbI4yeqPZIFHmPCKUy1WPr33aIHbQI=";
+    rev = "7d293c322ef85e4b60c943c220f1a6dd45895672";
+    hash = "sha256-6EzXMGn4c4i8bGdc35ennU4uiB3G4EYzRobrJbyiA9Q=";
   };
 
   postPatch = ''

From 2a6c2031739d2ef0832971fd9d981bbb3864b2ae Mon Sep 17 00:00:00 2001
From: azahi <azat@bahawi.net>
Date: Tue, 21 Oct 2025 16:53:11 +0300
Subject: [PATCH 1288/6226] werf: 2.49.0 -> 2.51.0

---
 pkgs/by-name/we/werf/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix
index 60ff9bb9cdc4..aa6b909aa062 100644
--- a/pkgs/by-name/we/werf/package.nix
+++ b/pkgs/by-name/we/werf/package.nix
@@ -1,26 +1,26 @@
 {
-  lib,
-  stdenv,
+  btrfs-progs,
   buildGoModule,
   fetchFromGitHub,
-  btrfs-progs,
-  writableTmpDirAsHomeHook,
   installShellFiles,
+  lib,
+  stdenv,
   versionCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 buildGoModule (finalAttrs: {
   pname = "werf";
-  version = "2.49.0";
+  version = "2.51.0";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-K999EgTbyQeLO1xm94WeOAQ5Ld3stOuAI4LGs4fSU5g=";
+    hash = "sha256-ZvEX834FLSQ5va5hbWxDibx0D6r9RZ8y4S6kNhVUEpM=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-Vjce/pmFRusBOJEQjgrlhS4LPlOy4nOWwCm7o5BB+OQ=";
+  vendorHash = "sha256-qy0eDvDSvudNRSmYwl3YUOpZJ/I0GQ6ITUVQCZCG4eU=";
 
   subPackages = [ "cmd/werf" ];
 

From 00311cd6aa61f55db415f8a9453b5acbc5ac44be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 13:55:12 +0000
Subject: [PATCH 1289/6226] kafkactl: 5.13.0 -> 5.14.0

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

diff --git a/pkgs/by-name/ka/kafkactl/package.nix b/pkgs/by-name/ka/kafkactl/package.nix
index 5238cc8bf1fc..5a2d043e056c 100644
--- a/pkgs/by-name/ka/kafkactl/package.nix
+++ b/pkgs/by-name/ka/kafkactl/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "kafkactl";
-  version = "5.13.0";
+  version = "5.14.0";
 
   src = fetchFromGitHub {
     owner = "deviceinsight";
     repo = "kafkactl";
     tag = "v${version}";
-    hash = "sha256-YJpRXCTI0Mwi4Zxeex8oxgzElk7l8Qus75lR42/wSww=";
+    hash = "sha256-WBycrpte3LSwAAjeD+gHXLEz9Y7075Ryip58fIGdJ8Q=";
   };
 
   vendorHash = "sha256-sVvEHMXpjas+l93IZfAChDX5eDm0lkUNCr5r1JaVQ9I=";

From 3c8d4111e7b619802fde80876be41c0cc2be1c40 Mon Sep 17 00:00:00 2001
From: mksafavi <mksafavi@gmail.com>
Date: Tue, 21 Oct 2025 12:12:51 +0330
Subject: [PATCH 1290/6226] rar: 7.01 -> 7.12

---
 pkgs/by-name/ra/rar/package.nix | 12 ++++--------
 pkgs/by-name/ra/rar/update.sh   |  5 ++---
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ra/rar/package.nix b/pkgs/by-name/ra/rar/package.nix
index 45794631b5b9..55f220a9f398 100644
--- a/pkgs/by-name/ra/rar/package.nix
+++ b/pkgs/by-name/ra/rar/package.nix
@@ -7,25 +7,21 @@
 }:
 
 let
-  version = "7.01";
+  version = "7.12";
   downloadVersion = lib.replaceStrings [ "." ] [ "" ] version;
   # Use `./update.sh` to generate the entries below
   srcs = {
-    i686-linux = {
-      url = "https://www.rarlab.com/rar/rarlinux-x32-${downloadVersion}.tar.gz";
-      hash = "sha256-1CSbxM7arGpn4Yj5fHEFKcDURFPrC2+XptLoaDH8LDs=";
-    };
     x86_64-linux = {
       url = "https://www.rarlab.com/rar/rarlinux-x64-${downloadVersion}.tar.gz";
-      hash = "sha256-34iWajylsSmIOuAT6kV7c2537qWFHc+gT+JT/trWrw8=";
+      hash = "sha256-Yw2andExNnJzZnvuB5rRA/Rp8bfNvJtCpPKDzCmTurI=";
     };
     aarch64-darwin = {
       url = "https://www.rarlab.com/rar/rarmacos-arm-${downloadVersion}.tar.gz";
-      hash = "sha256-BjEJFzKyRpN4XL6KYW7ykQcSxqF4tYr2dCFf50JHH38=";
+      hash = "sha256-lQeOD1n/0F6+ZlpVfp1NHAcxVqJ3fZFn9sQg7kSKg8U=";
     };
     x86_64-darwin = {
       url = "https://www.rarlab.com/rar/rarmacos-x64-${downloadVersion}.tar.gz";
-      hash = "sha256-1ExnVDre49wWwB/BKP/L9xdYOMx8qkeZfmObJ7xm4dY=";
+      hash = "sha256-Wzp5Izpc4usNldBEb3OZCeNyByTTJegoxbDD8HNnCPo=";
     };
   };
   manSrc = fetchurl {
diff --git a/pkgs/by-name/ra/rar/update.sh b/pkgs/by-name/ra/rar/update.sh
index f81562727f29..2ac315343d48 100755
--- a/pkgs/by-name/ra/rar/update.sh
+++ b/pkgs/by-name/ra/rar/update.sh
@@ -42,12 +42,12 @@ updateHash() {
     hash=$(nix store prefetch-file --json "$url" | jq -r .hash)
     currentHash=$(cd "$DIRNAME" && nix "${NIX_FLAGS[@]}" eval --raw "$NIXPKGS_ROOT#legacyPackages.$nix_arch.rar.src.outputHash")
 
-    sed -i "s|$currentHash|$hash|g" "$DIRNAME/default.nix"
+    sed -i "s|$currentHash|$hash|g" "$DIRNAME/package.nix"
 }
 
 updateVersion() {
     local -r version="$1"
-    sed -i "s|version = \"[0-9.]*\";|version = \"$version\";|g" "$DIRNAME/default.nix"
+    sed -i "s|version = \"[0-9.]*\";|version = \"$version\";|g" "$DIRNAME/package.nix"
 }
 
 latestVersion="${1:-}"
@@ -70,7 +70,6 @@ if [[ "$currentVersion" == "$latestVersion" ]]; then
     exit 0
 fi
 
-updateHash "$latestVersion" x32 linux i686-linux
 updateHash "$latestVersion" x64 linux x86_64-linux
 updateHash "$latestVersion" arm macos aarch64-darwin
 updateHash "$latestVersion" x64 macos x86_64-darwin

From ba269f70bcbef87f55c9f868d08c5862aa885de9 Mon Sep 17 00:00:00 2001
From: mksafavi <mksafavi@gmail.com>
Date: Sat, 18 Oct 2025 00:54:12 +0330
Subject: [PATCH 1291/6226] rar: generate manpage from rar.txt

---
 pkgs/by-name/ra/rar/package.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ra/rar/package.nix b/pkgs/by-name/ra/rar/package.nix
index 55f220a9f398..c8ff6a36e996 100644
--- a/pkgs/by-name/ra/rar/package.nix
+++ b/pkgs/by-name/ra/rar/package.nix
@@ -4,6 +4,7 @@
   fetchurl,
   autoPatchelfHook,
   installShellFiles,
+  perl,
 }:
 
 let
@@ -24,11 +25,6 @@ let
       hash = "sha256-Wzp5Izpc4usNldBEb3OZCeNyByTTJegoxbDD8HNnCPo=";
     };
   };
-  manSrc = fetchurl {
-    url = "https://aur.archlinux.org/cgit/aur.git/plain/rar.1?h=rar&id=8e39a12e88d8a3b168c496c44c18d443c876dd10";
-    name = "rar.1";
-    hash = "sha256-93cSr9oAsi+xHUtMsUvICyHJe66vAImS2tLie7nt8Uw=";
-  };
 in
 stdenv.mkDerivation {
   pname = "rar";
@@ -44,9 +40,17 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     installShellFiles
+    perl
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 
+  postPatch = ''
+    perl -0777 -i -pe 's/ ([\w .-]+\n) ~+\n/=head1 \U$1/g' rar.txt
+    perl -0777 -i -pe 's/ (Copyrights)/=head1 \U$1/g;' rar.txt
+    mv rar.txt rar.1.pod
+    pod2man -c "RAR User's Manual" -n "RAR" -r "rar ${version}" -s 1 rar.1.pod > rar.1
+  '';
+
   installPhase = ''
     runHook preInstall
 
@@ -54,14 +58,11 @@ stdenv.mkDerivation {
     install -Dm755 default.sfx -t "$out/lib"
     install -Dm644 {acknow.txt,license.txt} -t "$out/share/doc/rar"
     install -Dm644 rarfiles.lst -t "$out/etc"
+    installManPage rar.1
 
     runHook postInstall
   '';
 
-  postInstall = ''
-    installManPage ${manSrc}
-  '';
-
   passthru.updateScript = ./update.sh;
 
   meta = with lib; {

From e36144c463077cd9a5f8a63a83112c6dc54f0dce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 14:02:12 +0000
Subject: [PATCH 1292/6226] harbor-cli: 0.0.12 -> 0.0.13

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

diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix
index a2b4efeaa48a..8b46de187513 100644
--- a/pkgs/by-name/ha/harbor-cli/package.nix
+++ b/pkgs/by-name/ha/harbor-cli/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "harbor-cli";
-  version = "0.0.12";
+  version = "0.0.13";
 
   src = fetchFromGitHub {
     owner = "goharbor";
     repo = "harbor-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wdUXLgmdxkWzvLCuIJSkos1z7nyETZv3mNzGtBBJVUM=";
+    hash = "sha256-TVuWSbBPRXq9icfMXEg0wONaqD5S2ge5DQiDHSlrADk=";
   };
 
-  vendorHash = "sha256-OJTyX+HXyC6avsgUCzEfU0ej493J8p77r59j+X/Vqwk=";
+  vendorHash = "sha256-Pj573V6S2LaytQMK0jGVyLMX/GBZ1GOmYV/LPO1ScS4=";
 
   excludedPackages = [
     "dagger"

From 77de63de73c84f8dc7a02ee2d525aa2c1b4e303e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 14:06:41 +0000
Subject: [PATCH 1293/6226] hcloud: 1.54.0 -> 1.55.0

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

diff --git a/pkgs/by-name/hc/hcloud/package.nix b/pkgs/by-name/hc/hcloud/package.nix
index 9cd1c77baebf..72076d9a6e21 100644
--- a/pkgs/by-name/hc/hcloud/package.nix
+++ b/pkgs/by-name/hc/hcloud/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "hcloud";
-  version = "1.54.0";
+  version = "1.55.0";
 
   src = fetchFromGitHub {
     owner = "hetznercloud";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-PpCEdhEjfd7d8DdU2ABAjL8O98cLR20xWwhcESJK4uI=";
+    hash = "sha256-4UPZ3SCKTjmSt6mm0zHwecVq3UtR+cSkQmNdbkq/dMY=";
   };
 
-  vendorHash = "sha256-tJwd/qLs0QvnjKi0B2NBTosGt7qCzJCHxZ5LYJB4vjA=";
+  vendorHash = "sha256-heCGRW8yT/aTrh4PKj62P8EPT7mXVDMo9Z8pIypOT6o=";
 
   ldflags = [
     "-s"

From 9ba22790626f5c37a7f4d56e7fb5e2a20b12de40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 14:07:13 +0000
Subject: [PATCH 1294/6226] python3Packages.accelerate: 1.10.1 -> 1.11.0

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

diff --git a/pkgs/development/python-modules/accelerate/default.nix b/pkgs/development/python-modules/accelerate/default.nix
index 3c1ed7d52f8d..b8c2be527e7f 100644
--- a/pkgs/development/python-modules/accelerate/default.nix
+++ b/pkgs/development/python-modules/accelerate/default.nix
@@ -33,14 +33,14 @@
 
 buildPythonPackage rec {
   pname = "accelerate";
-  version = "1.10.1";
+  version = "1.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "accelerate";
     tag = "v${version}";
-    hash = "sha256-guUlgNRSgBmi5HZNnwPA6GQ1vq5LzZEW2J9w4Wmqh6o=";
+    hash = "sha256-RdqApMgf5EoiFjNAUhVNS3xaqszl2myMF9B5HJBfHOA=";
   };
 
   buildInputs = [ llvmPackages.openmp ];

From bc8dba478317c5ab6ee45d7a3ec4af7b463611e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 14:11:25 +0000
Subject: [PATCH 1295/6226] go2rtc: 1.9.10 -> 1.9.11

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

diff --git a/pkgs/by-name/go/go2rtc/package.nix b/pkgs/by-name/go/go2rtc/package.nix
index 2ba89c7d06f4..39dbedf1bb94 100644
--- a/pkgs/by-name/go/go2rtc/package.nix
+++ b/pkgs/by-name/go/go2rtc/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "go2rtc";
-  version = "1.9.10";
+  version = "1.9.11";
 
   src = fetchFromGitHub {
     owner = "AlexxIT";
     repo = "go2rtc";
     tag = "v${version}";
-    hash = "sha256-SWFVcfOfSCKuNJlahsZRY21n17vL1VjtDRiSZ5o3VGc=";
+    hash = "sha256-MJb88RwASZnURnqb8nmCKvf8G3VW+Vd1JlNtbh7i/Ps=";
   };
 
-  vendorHash = "sha256-k01+xngNA4SMCJa9Vhg+MxDgf973sUcrVXppwAz4MBs=";
+  vendorHash = "sha256-iOMIbeNh2+tNSMc5BR2h29a7uAru9ER/tPBI59PeeDY=";
 
   env.CGO_ENABLED = 0;
 

From f1875655201f130ec410f98e57c3d57fad20705c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 14:20:51 +0000
Subject: [PATCH 1296/6226] vscode-extensions.betterthantomorrow.calva: 2.0.536
 -> 2.0.538

---
 .../vscode/extensions/betterthantomorrow.calva/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
index 49ab14ef4ccc..e094742ff39d 100644
--- a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
@@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "calva";
     publisher = "betterthantomorrow";
-    version = "2.0.536";
-    hash = "sha256-Q6T8Ab8kwOjdFM63SjTNEOgd+a6fL1PRGRredHzwg7U=";
+    version = "2.0.538";
+    hash = "sha256-lJ9AnTNN9TkPDh9u2KV1BLn/fgZOWSOXNOTAdV+r6s4=";
   };
 
   nativeBuildInputs = [

From 43b2c9ccd1368ebcda88faa3ba7ab4bfe5edfa02 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 15 Oct 2025 13:14:20 +0300
Subject: [PATCH 1297/6226] live-server: use src.tag

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

diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix
index 260272bf87ae..ec1418983ca0 100644
--- a/pkgs/by-name/li/live-server/package.nix
+++ b/pkgs/by-name/li/live-server/package.nix
@@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   src = fetchFromGitHub {
     owner = "lomirus";
     repo = "live-server";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-0IP7F8+Vdl/h4+zcghRqowvzz6zjQYDTjMSZPuGOOj4=";
   };
 
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "Local network server with live reload feature for static pages";
     downloadPage = "https://github.com/lomirus/live-server/releases";
     homepage = "https://github.com/lomirus/live-server";
-    changelog = "https://github.com/lomirus/live-server/releases/tag/v${finalAttrs.version}";
+    changelog = "https://github.com/lomirus/live-server/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     mainProgram = "live-server";
     maintainers = [ lib.maintainers.philiptaron ];

From 0743752b426fcb8e7fad64684b5341b738b1ad39 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 15 Oct 2025 13:14:52 +0300
Subject: [PATCH 1298/6226] live-server: add doronbehar as maintainer

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

diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix
index ec1418983ca0..9a7268709d4f 100644
--- a/pkgs/by-name/li/live-server/package.nix
+++ b/pkgs/by-name/li/live-server/package.nix
@@ -33,7 +33,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/lomirus/live-server/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     mainProgram = "live-server";
-    maintainers = [ lib.maintainers.philiptaron ];
+    maintainers = with lib.maintainers; [
+      philiptaron
+      doronbehar
+    ];
     platforms = lib.platforms.unix;
   };
 })

From 6bb34eb6e1e0464ddb7ae77bb2f9715a53ab2068 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 21 Oct 2025 17:21:34 +0300
Subject: [PATCH 1299/6226] live-server: 0.10.1 -> 0.11.0

Diff: https://github.com/lomirus/live-server/compare/v0.10.1...v0.11.0

Changelog: https://github.com/lomirus/live-server/releases/tag/v0.11.0
---
 pkgs/by-name/li/live-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix
index 9a7268709d4f..6a31cf80f004 100644
--- a/pkgs/by-name/li/live-server/package.nix
+++ b/pkgs/by-name/li/live-server/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "live-server";
-  version = "0.10.1";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "lomirus";
     repo = "live-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0IP7F8+Vdl/h4+zcghRqowvzz6zjQYDTjMSZPuGOOj4=";
+    hash = "sha256-FKX1rbRKWkWsxzJZDicVAUqrHBwEe2o7EXIouK74UMA=";
   };
 
-  cargoHash = "sha256-MMeeUoj3vYd1lv15N3+qjHbn991IVMhIUCMd0isCNhk=";
+  cargoHash = "sha256-gaBYnhljcMqSEPViaOPMtuHjoDP8iY64UizlfK+fcQA=";
 
   nativeBuildInputs = [ pkg-config ];
 

From cf506f2a1f3e7dfa5b54692edc981a0628f9982e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 21 Oct 2025 14:36:56 +0000
Subject: [PATCH 1300/6226] pnpm_10: 10.18.3 -> 10.19.0

---
 pkgs/development/tools/pnpm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index 0f443d89bca2..681aaaf9e971 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -15,8 +15,8 @@ let
       hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
     };
     "10" = {
-      version = "10.18.3";
-      hash = "sha256-eX0AWbxfwzVtecaBYVoTfHs15O/AOkRJqKGr/LzEvcc=";
+      version = "10.19.0";
+      hash = "sha256-HF9e5ZJn5OLhv9M19DKhjcSPmplECU1dJkl1fnJa03Y=";
     };
   };
 

From e39a45fb2e594077d039466f6fb2852354b4603e Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 11:32:23 -0300
Subject: [PATCH 1301/6226] ispike: fix build with cmake4

---
 pkgs/by-name/is/ispike/package.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/is/ispike/package.nix b/pkgs/by-name/is/ispike/package.nix
index fb1754934fe4..3688511138ac 100644
--- a/pkgs/by-name/is/ispike/package.nix
+++ b/pkgs/by-name/is/ispike/package.nix
@@ -3,9 +3,13 @@
   stdenv,
   fetchurl,
   cmake,
-  boost,
+  boost186,
 }:
 
+let
+  boost = boost186;
+in
+
 stdenv.mkDerivation rec {
   pname = "ispike";
   version = "2.1.1";
@@ -17,6 +21,11 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -i "1i #include <map>" include/iSpike/YarpConnection.hpp
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED (VERSION 2.6.2)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace src/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [ cmake ];

From 98628ba682e38d2b9f42adecb0903b9e1a4cb7b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 14:44:11 +0000
Subject: [PATCH 1302/6226] shopify-cli: 3.84.2 -> 3.86.1

---
 .../shopify-cli/manifests/package-lock.json   | 243 ++++++++++--------
 .../sh/shopify-cli/manifests/package.json     |   4 +-
 pkgs/by-name/sh/shopify-cli/package.nix       |   4 +-
 3 files changed, 134 insertions(+), 117 deletions(-)

diff --git a/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json b/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json
index 526a983be650..bc1343d314c1 100644
--- a/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json
+++ b/pkgs/by-name/sh/shopify-cli/manifests/package-lock.json
@@ -1,14 +1,14 @@
 {
   "name": "shopify",
-  "version": "3.84.2",
+  "version": "3.86.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "shopify",
-      "version": "3.84.2",
+      "version": "3.86.1",
       "dependencies": {
-        "@shopify/cli": "3.84.2"
+        "@shopify/cli": "3.86.1"
       },
       "bin": {
         "shopify": "node_modules/@shopify/cli/bin/run.js"
@@ -179,9 +179,9 @@
       }
     },
     "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.5.tgz",
-      "integrity": "sha512-9o3TMmpmftaCMepOdA5k/yDw8SfInyzWWTjYTFCX3kPSDJMROQTb8jg+h9Cnwnmm1vOzvxN7gIfB5V2ewpjtGA==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.10.tgz",
+      "integrity": "sha512-0NFWnA+7l41irNuaSVlLfgNT12caWJVLzp5eAVhZ0z1qpxbockccEt3s+149rE64VUI3Ml2zt8Nv5JVc4QXTsw==",
       "cpu": [
         "ppc64"
       ],
@@ -195,9 +195,9 @@
       }
     },
     "node_modules/@esbuild/android-arm": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.5.tgz",
-      "integrity": "sha512-AdJKSPeEHgi7/ZhuIPtcQKr5RQdo6OO2IL87JkianiMYMPbCtot9fxPbrMiBADOWWm3T2si9stAiVsGbTQFkbA==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.10.tgz",
+      "integrity": "sha512-dQAxF1dW1C3zpeCDc5KqIYuZ1tgAdRXNoZP7vkBIRtKZPYe2xVr/d3SkirklCHudW1B45tGiUlz2pUWDfbDD4w==",
       "cpu": [
         "arm"
       ],
@@ -211,9 +211,9 @@
       }
     },
     "node_modules/@esbuild/android-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.5.tgz",
-      "integrity": "sha512-VGzGhj4lJO+TVGV1v8ntCZWJktV7SGCs3Pn1GRWI1SBFtRALoomm8k5E9Pmwg3HOAal2VDc2F9+PM/rEY6oIDg==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.10.tgz",
+      "integrity": "sha512-LSQa7eDahypv/VO6WKohZGPSJDq5OVOo3UoFR1E4t4Gj1W7zEQMUhI+lo81H+DtB+kP+tDgBp+M4oNCwp6kffg==",
       "cpu": [
         "arm64"
       ],
@@ -227,9 +227,9 @@
       }
     },
     "node_modules/@esbuild/android-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.5.tgz",
-      "integrity": "sha512-D2GyJT1kjvO//drbRT3Hib9XPwQeWd9vZoBJn+bu/lVsOZ13cqNdDeqIF/xQ5/VmWvMduP6AmXvylO/PIc2isw==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.10.tgz",
+      "integrity": "sha512-MiC9CWdPrfhibcXwr39p9ha1x0lZJ9KaVfvzA0Wxwz9ETX4v5CHfF09bx935nHlhi+MxhA63dKRRQLiVgSUtEg==",
       "cpu": [
         "x64"
       ],
@@ -243,9 +243,9 @@
       }
     },
     "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.5.tgz",
-      "integrity": "sha512-GtaBgammVvdF7aPIgH2jxMDdivezgFu6iKpmT+48+F8Hhg5J/sfnDieg0aeG/jfSvkYQU2/pceFPDKlqZzwnfQ==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.10.tgz",
+      "integrity": "sha512-JC74bdXcQEpW9KkV326WpZZjLguSZ3DfS8wrrvPMHgQOIEIG/sPXEN/V8IssoJhbefLRcRqw6RQH2NnpdprtMA==",
       "cpu": [
         "arm64"
       ],
@@ -259,9 +259,9 @@
       }
     },
     "node_modules/@esbuild/darwin-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.5.tgz",
-      "integrity": "sha512-1iT4FVL0dJ76/q1wd7XDsXrSW+oLoquptvh4CLR4kITDtqi2e/xwXwdCVH8hVHU43wgJdsq7Gxuzcs6Iq/7bxQ==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.10.tgz",
+      "integrity": "sha512-tguWg1olF6DGqzws97pKZ8G2L7Ig1vjDmGTwcTuYHbuU6TTjJe5FXbgs5C1BBzHbJ2bo1m3WkQDbWO2PvamRcg==",
       "cpu": [
         "x64"
       ],
@@ -275,9 +275,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.5.tgz",
-      "integrity": "sha512-nk4tGP3JThz4La38Uy/gzyXtpkPW8zSAmoUhK9xKKXdBCzKODMc2adkB2+8om9BDYugz+uGV7sLmpTYzvmz6Sw==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.10.tgz",
+      "integrity": "sha512-3ZioSQSg1HT2N05YxeJWYR+Libe3bREVSdWhEEgExWaDtyFbbXWb49QgPvFH8u03vUPX10JhJPcz7s9t9+boWg==",
       "cpu": [
         "arm64"
       ],
@@ -291,9 +291,9 @@
       }
     },
     "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.5.tgz",
-      "integrity": "sha512-PrikaNjiXdR2laW6OIjlbeuCPrPaAl0IwPIaRv+SMV8CiM8i2LqVUHFC1+8eORgWyY7yhQY+2U2fA55mBzReaw==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.10.tgz",
+      "integrity": "sha512-LLgJfHJk014Aa4anGDbh8bmI5Lk+QidDmGzuC2D+vP7mv/GeSN+H39zOf7pN5N8p059FcOfs2bVlrRr4SK9WxA==",
       "cpu": [
         "x64"
       ],
@@ -307,9 +307,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.5.tgz",
-      "integrity": "sha512-cPzojwW2okgh7ZlRpcBEtsX7WBuqbLrNXqLU89GxWbNt6uIg78ET82qifUy3W6OVww6ZWobWub5oqZOVtwolfw==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.10.tgz",
+      "integrity": "sha512-oR31GtBTFYCqEBALI9r6WxoU/ZofZl962pouZRTEYECvNF/dtXKku8YXcJkhgK/beU+zedXfIzHijSRapJY3vg==",
       "cpu": [
         "arm"
       ],
@@ -323,9 +323,9 @@
       }
     },
     "node_modules/@esbuild/linux-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.5.tgz",
-      "integrity": "sha512-Z9kfb1v6ZlGbWj8EJk9T6czVEjjq2ntSYLY2cw6pAZl4oKtfgQuS4HOq41M/BcoLPzrUbNd+R4BXFyH//nHxVg==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.10.tgz",
+      "integrity": "sha512-5luJWN6YKBsawd5f9i4+c+geYiVEw20FVW5x0v1kEMWNq8UctFjDiMATBxLvmmHA4bf7F6hTRaJgtghFr9iziQ==",
       "cpu": [
         "arm64"
       ],
@@ -339,9 +339,9 @@
       }
     },
     "node_modules/@esbuild/linux-ia32": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.5.tgz",
-      "integrity": "sha512-sQ7l00M8bSv36GLV95BVAdhJ2QsIbCuCjh/uYrWiMQSUuV+LpXwIqhgJDcvMTj+VsQmqAHL2yYaasENvJ7CDKA==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.10.tgz",
+      "integrity": "sha512-NrSCx2Kim3EnnWgS4Txn0QGt0Xipoumb6z6sUtl5bOEZIVKhzfyp/Lyw4C1DIYvzeW/5mWYPBFJU3a/8Yr75DQ==",
       "cpu": [
         "ia32"
       ],
@@ -355,9 +355,9 @@
       }
     },
     "node_modules/@esbuild/linux-loong64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.5.tgz",
-      "integrity": "sha512-0ur7ae16hDUC4OL5iEnDb0tZHDxYmuQyhKhsPBV8f99f6Z9KQM02g33f93rNH5A30agMS46u2HP6qTdEt6Q1kg==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.10.tgz",
+      "integrity": "sha512-xoSphrd4AZda8+rUDDfD9J6FUMjrkTz8itpTITM4/xgerAZZcFW7Dv+sun7333IfKxGG8gAq+3NbfEMJfiY+Eg==",
       "cpu": [
         "loong64"
       ],
@@ -371,9 +371,9 @@
       }
     },
     "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.5.tgz",
-      "integrity": "sha512-kB/66P1OsHO5zLz0i6X0RxlQ+3cu0mkxS3TKFvkb5lin6uwZ/ttOkP3Z8lfR9mJOBk14ZwZ9182SIIWFGNmqmg==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.10.tgz",
+      "integrity": "sha512-ab6eiuCwoMmYDyTnyptoKkVS3k8fy/1Uvq7Dj5czXI6DF2GqD2ToInBI0SHOp5/X1BdZ26RKc5+qjQNGRBelRA==",
       "cpu": [
         "mips64el"
       ],
@@ -387,9 +387,9 @@
       }
     },
     "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.5.tgz",
-      "integrity": "sha512-UZCmJ7r9X2fe2D6jBmkLBMQetXPXIsZjQJCjgwpVDz+YMcS6oFR27alkgGv3Oqkv07bxdvw7fyB71/olceJhkQ==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.10.tgz",
+      "integrity": "sha512-NLinzzOgZQsGpsTkEbdJTCanwA5/wozN9dSgEl12haXJBzMTpssebuXR42bthOF3z7zXFWH1AmvWunUCkBE4EA==",
       "cpu": [
         "ppc64"
       ],
@@ -403,9 +403,9 @@
       }
     },
     "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.5.tgz",
-      "integrity": "sha512-kTxwu4mLyeOlsVIFPfQo+fQJAV9mh24xL+y+Bm6ej067sYANjyEw1dNHmvoqxJUCMnkBdKpvOn0Ahql6+4VyeA==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.10.tgz",
+      "integrity": "sha512-FE557XdZDrtX8NMIeA8LBJX3dC2M8VGXwfrQWU7LB5SLOajfJIxmSdyL/gU1m64Zs9CBKvm4UAuBp5aJ8OgnrA==",
       "cpu": [
         "riscv64"
       ],
@@ -419,9 +419,9 @@
       }
     },
     "node_modules/@esbuild/linux-s390x": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.5.tgz",
-      "integrity": "sha512-K2dSKTKfmdh78uJ3NcWFiqyRrimfdinS5ErLSn3vluHNeHVnBAFWC8a4X5N+7FgVE1EjXS1QDZbpqZBjfrqMTQ==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.10.tgz",
+      "integrity": "sha512-3BBSbgzuB9ajLoVZk0mGu+EHlBwkusRmeNYdqmznmMc9zGASFjSsxgkNsqmXugpPk00gJ0JNKh/97nxmjctdew==",
       "cpu": [
         "s390x"
       ],
@@ -435,9 +435,9 @@
       }
     },
     "node_modules/@esbuild/linux-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.5.tgz",
-      "integrity": "sha512-uhj8N2obKTE6pSZ+aMUbqq+1nXxNjZIIjCjGLfsWvVpy7gKCOL6rsY1MhRh9zLtUtAI7vpgLMK6DxjO8Qm9lJw==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.10.tgz",
+      "integrity": "sha512-QSX81KhFoZGwenVyPoberggdW1nrQZSvfVDAIUXr3WqLRZGZqWk/P4T8p2SP+de2Sr5HPcvjhcJzEiulKgnxtA==",
       "cpu": [
         "x64"
       ],
@@ -451,9 +451,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.5.tgz",
-      "integrity": "sha512-pwHtMP9viAy1oHPvgxtOv+OkduK5ugofNTVDilIzBLpoWAM16r7b/mxBvfpuQDpRQFMfuVr5aLcn4yveGvBZvw==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.10.tgz",
+      "integrity": "sha512-AKQM3gfYfSW8XRk8DdMCzaLUFB15dTrZfnX8WXQoOUpUBQ+NaAFCP1kPS/ykbbGYz7rxn0WS48/81l9hFl3u4A==",
       "cpu": [
         "arm64"
       ],
@@ -467,9 +467,9 @@
       }
     },
     "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.5.tgz",
-      "integrity": "sha512-WOb5fKrvVTRMfWFNCroYWWklbnXH0Q5rZppjq0vQIdlsQKuw6mdSihwSo4RV/YdQ5UCKKvBy7/0ZZYLBZKIbwQ==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.10.tgz",
+      "integrity": "sha512-7RTytDPGU6fek/hWuN9qQpeGPBZFfB4zZgcz2VK2Z5VpdUxEI8JKYsg3JfO0n/Z1E/6l05n0unDCNc4HnhQGig==",
       "cpu": [
         "x64"
       ],
@@ -483,9 +483,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.5.tgz",
-      "integrity": "sha512-7A208+uQKgTxHd0G0uqZO8UjK2R0DDb4fDmERtARjSHWxqMTye4Erz4zZafx7Di9Cv+lNHYuncAkiGFySoD+Mw==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.10.tgz",
+      "integrity": "sha512-5Se0VM9Wtq797YFn+dLimf2Zx6McttsH2olUBsDml+lm0GOCRVebRWUvDtkY4BWYv/3NgzS8b/UM3jQNh5hYyw==",
       "cpu": [
         "arm64"
       ],
@@ -499,9 +499,9 @@
       }
     },
     "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.5.tgz",
-      "integrity": "sha512-G4hE405ErTWraiZ8UiSoesH8DaCsMm0Cay4fsFWOOUcz8b8rC6uCvnagr+gnioEjWn0wC+o1/TAHt+It+MpIMg==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.10.tgz",
+      "integrity": "sha512-XkA4frq1TLj4bEMB+2HnI0+4RnjbuGZfet2gs/LNs5Hc7D89ZQBHQ0gL2ND6Lzu1+QVkjp3x1gIcPKzRNP8bXw==",
       "cpu": [
         "x64"
       ],
@@ -514,10 +514,26 @@
         "node": ">=18"
       }
     },
+    "node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.10.tgz",
+      "integrity": "sha512-AVTSBhTX8Y/Fz6OmIVBip9tJzZEUcY8WLh7I59+upa5/GPhh2/aM6bvOMQySspnCCHvFi79kMtdJS1w0DXAeag==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/sunos-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.5.tgz",
-      "integrity": "sha512-l+azKShMy7FxzY0Rj4RCt5VD/q8mG/e+mDivgspo+yL8zW7qEwctQ6YqKX34DTEleFAvCIUviCFX1SDZRSyMQA==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.10.tgz",
+      "integrity": "sha512-fswk3XT0Uf2pGJmOpDB7yknqhVkJQkAQOcW/ccVOtfx05LkbWOaRAtn5SaqXypeKQra1QaEa841PgrSL9ubSPQ==",
       "cpu": [
         "x64"
       ],
@@ -531,9 +547,9 @@
       }
     },
     "node_modules/@esbuild/win32-arm64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.5.tgz",
-      "integrity": "sha512-O2S7SNZzdcFG7eFKgvwUEZ2VG9D/sn/eIiz8XRZ1Q/DO5a3s76Xv0mdBzVM5j5R639lXQmPmSo0iRpHqUUrsxw==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.10.tgz",
+      "integrity": "sha512-ah+9b59KDTSfpaCg6VdJoOQvKjI33nTaQr4UluQwW7aEwZQsbMCfTmfEO4VyewOxx4RaDT/xCy9ra2GPWmO7Kw==",
       "cpu": [
         "arm64"
       ],
@@ -547,9 +563,9 @@
       }
     },
     "node_modules/@esbuild/win32-ia32": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.5.tgz",
-      "integrity": "sha512-onOJ02pqs9h1iMJ1PQphR+VZv8qBMQ77Klcsqv9CNW2w6yLqoURLcgERAIurY6QE63bbLuqgP9ATqajFLK5AMQ==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.10.tgz",
+      "integrity": "sha512-QHPDbKkrGO8/cz9LKVnJU22HOi4pxZnZhhA2HYHez5Pz4JeffhDjf85E57Oyco163GnzNCVkZK0b/n4Y0UHcSw==",
       "cpu": [
         "ia32"
       ],
@@ -563,9 +579,9 @@
       }
     },
     "node_modules/@esbuild/win32-x64": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.5.tgz",
-      "integrity": "sha512-TXv6YnJ8ZMVdX+SXWVBo/0p8LTcrUYngpWjvm91TMjjBQii7Oz11Lw5lbDV5Y0TzuhSJHwiH4hEtC1I42mMS0g==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.10.tgz",
+      "integrity": "sha512-9KpxSVFCu0iK1owoez6aC/s/EdUQLDN3adTxGCqxMVhrPDj6bt5dbrHDXUuq+Bs2vATFBBrQS5vdQ/Ed2P+nbw==",
       "cpu": [
         "x64"
       ],
@@ -579,9 +595,9 @@
       }
     },
     "node_modules/@shopify/cli": {
-      "version": "3.84.2",
-      "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.84.2.tgz",
-      "integrity": "sha512-L6vqC7Y7u1QwMFIVm4QVbvGfemIyFPssMdXXbqLo7mvZVdohC7SYmUhgerI5TsE3EIScsSBBwrI6VXWUb8JyrQ==",
+      "version": "3.86.1",
+      "resolved": "https://registry.npmjs.org/@shopify/cli/-/cli-3.86.1.tgz",
+      "integrity": "sha512-d49b7Tx7xkgih2bwbLC1BXhgiEs4HGVoOBn8bKihtKILqbZ/V/6VFQB82BV8s00JPWaWy8pEOvX+0sMg2UIFSw==",
       "license": "MIT",
       "os": [
         "darwin",
@@ -590,7 +606,7 @@
       ],
       "dependencies": {
         "@ast-grep/napi": "0.33.0",
-        "esbuild": "0.25.5",
+        "esbuild": "0.25.10",
         "global-agent": "3.0.0"
       },
       "bin": {
@@ -672,9 +688,9 @@
       "license": "MIT"
     },
     "node_modules/esbuild": {
-      "version": "0.25.5",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.5.tgz",
-      "integrity": "sha512-P8OtKZRv/5J5hhz0cUAdu/cLuPIKXpQl1R9pZtvmHWQvrAUVd0UNIPT4IB4W3rNOqVO0rlqHmCIbSwxh/c9yUQ==",
+      "version": "0.25.10",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.10.tgz",
+      "integrity": "sha512-9RiGKvCwaqxO2owP61uQ4BgNborAQskMR6QusfWzQqv7AZOg5oGehdY2pRJMTKuwxd1IDBP4rSbI5lHzU7SMsQ==",
       "hasInstallScript": true,
       "license": "MIT",
       "bin": {
@@ -684,31 +700,32 @@
         "node": ">=18"
       },
       "optionalDependencies": {
-        "@esbuild/aix-ppc64": "0.25.5",
-        "@esbuild/android-arm": "0.25.5",
-        "@esbuild/android-arm64": "0.25.5",
-        "@esbuild/android-x64": "0.25.5",
-        "@esbuild/darwin-arm64": "0.25.5",
-        "@esbuild/darwin-x64": "0.25.5",
-        "@esbuild/freebsd-arm64": "0.25.5",
-        "@esbuild/freebsd-x64": "0.25.5",
-        "@esbuild/linux-arm": "0.25.5",
-        "@esbuild/linux-arm64": "0.25.5",
-        "@esbuild/linux-ia32": "0.25.5",
-        "@esbuild/linux-loong64": "0.25.5",
-        "@esbuild/linux-mips64el": "0.25.5",
-        "@esbuild/linux-ppc64": "0.25.5",
-        "@esbuild/linux-riscv64": "0.25.5",
-        "@esbuild/linux-s390x": "0.25.5",
-        "@esbuild/linux-x64": "0.25.5",
-        "@esbuild/netbsd-arm64": "0.25.5",
-        "@esbuild/netbsd-x64": "0.25.5",
-        "@esbuild/openbsd-arm64": "0.25.5",
-        "@esbuild/openbsd-x64": "0.25.5",
-        "@esbuild/sunos-x64": "0.25.5",
-        "@esbuild/win32-arm64": "0.25.5",
-        "@esbuild/win32-ia32": "0.25.5",
-        "@esbuild/win32-x64": "0.25.5"
+        "@esbuild/aix-ppc64": "0.25.10",
+        "@esbuild/android-arm": "0.25.10",
+        "@esbuild/android-arm64": "0.25.10",
+        "@esbuild/android-x64": "0.25.10",
+        "@esbuild/darwin-arm64": "0.25.10",
+        "@esbuild/darwin-x64": "0.25.10",
+        "@esbuild/freebsd-arm64": "0.25.10",
+        "@esbuild/freebsd-x64": "0.25.10",
+        "@esbuild/linux-arm": "0.25.10",
+        "@esbuild/linux-arm64": "0.25.10",
+        "@esbuild/linux-ia32": "0.25.10",
+        "@esbuild/linux-loong64": "0.25.10",
+        "@esbuild/linux-mips64el": "0.25.10",
+        "@esbuild/linux-ppc64": "0.25.10",
+        "@esbuild/linux-riscv64": "0.25.10",
+        "@esbuild/linux-s390x": "0.25.10",
+        "@esbuild/linux-x64": "0.25.10",
+        "@esbuild/netbsd-arm64": "0.25.10",
+        "@esbuild/netbsd-x64": "0.25.10",
+        "@esbuild/openbsd-arm64": "0.25.10",
+        "@esbuild/openbsd-x64": "0.25.10",
+        "@esbuild/openharmony-arm64": "0.25.10",
+        "@esbuild/sunos-x64": "0.25.10",
+        "@esbuild/win32-arm64": "0.25.10",
+        "@esbuild/win32-ia32": "0.25.10",
+        "@esbuild/win32-x64": "0.25.10"
       }
     },
     "node_modules/escape-string-regexp": {
@@ -825,9 +842,9 @@
       }
     },
     "node_modules/semver": {
-      "version": "7.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-      "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
       "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
diff --git a/pkgs/by-name/sh/shopify-cli/manifests/package.json b/pkgs/by-name/sh/shopify-cli/manifests/package.json
index d72e00f0f496..8093f53a20c1 100644
--- a/pkgs/by-name/sh/shopify-cli/manifests/package.json
+++ b/pkgs/by-name/sh/shopify-cli/manifests/package.json
@@ -1,11 +1,11 @@
 {
   "name": "shopify",
-  "version": "3.84.2",
+  "version": "3.86.1",
   "private": true,
   "bin": {
     "shopify": "node_modules/@shopify/cli/bin/run.js"
   },
   "dependencies": {
-    "@shopify/cli": "3.84.2"
+    "@shopify/cli": "3.86.1"
   }
 }
diff --git a/pkgs/by-name/sh/shopify-cli/package.nix b/pkgs/by-name/sh/shopify-cli/package.nix
index 58c2dd43edcc..0e2385cf5264 100644
--- a/pkgs/by-name/sh/shopify-cli/package.nix
+++ b/pkgs/by-name/sh/shopify-cli/package.nix
@@ -5,7 +5,7 @@
   shopify-cli,
 }:
 let
-  version = "3.84.2";
+  version = "3.86.1";
 in
 buildNpmPackage {
   pname = "shopify";
@@ -13,7 +13,7 @@ buildNpmPackage {
 
   src = ./manifests;
 
-  npmDepsHash = "sha256-UW8kNTCDHJOhFuVwawXcZvmaFSDgdGWPJlK3Y/x4IMo=";
+  npmDepsHash = "sha256-GAE4zfSqk7oM2ecojPC4REFGRdRwvqCnA9L2L7LMIfQ=";
   dontNpmBuild = true;
 
   passthru = {

From 4ab2d8965c925c0f0c4d7b44bfa2dd90fb2ab2c6 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 11:44:42 -0300
Subject: [PATCH 1303/6226] jfbview: fix build with cmake4

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

diff --git a/pkgs/by-name/jf/jfbview/package.nix b/pkgs/by-name/jf/jfbview/package.nix
index 989736d29b38..8d099de18acc 100644
--- a/pkgs/by-name/jf/jfbview/package.nix
+++ b/pkgs/by-name/jf/jfbview/package.nix
@@ -53,6 +53,11 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 273cbb728aa1d39308496c2f6ffc28e063fbdbd7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 15:00:49 +0000
Subject: [PATCH 1304/6226] aks-mcp-server: 0.0.9 -> 0.0.10

---
 pkgs/by-name/ak/aks-mcp-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ak/aks-mcp-server/package.nix b/pkgs/by-name/ak/aks-mcp-server/package.nix
index 27515f5e717b..42bca9f7bb98 100644
--- a/pkgs/by-name/ak/aks-mcp-server/package.nix
+++ b/pkgs/by-name/ak/aks-mcp-server/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "aks-mcp-server";
-  version = "0.0.9";
+  version = "0.0.10";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "aks-mcp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-LhFFmzL9jTrUqYlHNMWVZBuiZFB0oFLA409byFWFIl0=";
+    hash = "sha256-RWBZevNiWbG4luw70gXIvyk+IQkH6xIDBd7uD8eq3r8=";
   };
 
-  vendorHash = "sha256-tglqpX/SbqcqMXkByrzuadczXLPvPFXvslNkh1rSgWU=";
+  vendorHash = "sha256-8EV8cqta0DVrRFtig+Rx8SWxgAl6qu9wVVLWRhtl6N4=";
 
   subPackages = [ "cmd/aks-mcp" ];
 

From 30629a8ec7bbf9246567727fce3a0f9e9d51c3f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 15:02:52 +0000
Subject: [PATCH 1305/6226] baresip: 4.1.0 -> 4.2.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 77a50d2a1670..6f1b79be95e8 100644
--- a/pkgs/by-name/ba/baresip/package.nix
+++ b/pkgs/by-name/ba/baresip/package.nix
@@ -31,14 +31,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "4.1.0";
+  version = "4.2.0";
   pname = "baresip";
 
   src = fetchFromGitHub {
     owner = "baresip";
     repo = "baresip";
     rev = "v${version}";
-    hash = "sha256-KbjdwvXUiNvHb6AXt38M9gkhliiie+8frvuqYJEsnJE=";
+    hash = "sha256-kC1pqquIddjqIvGSIE9Rzlvr6qzTXF+mFsZlIzFBExI=";
   };
 
   patches = [

From 0a5bba0f15bea325bf5d316da979b126e645da67 Mon Sep 17 00:00:00 2001
From: Bouke van der Bijl <i@bou.ke>
Date: Mon, 24 Mar 2025 11:27:15 +0100
Subject: [PATCH 1306/6226] nixos/opentelemetry-collector: validate config

---
 .../manual/release-notes/rl-2511.section.md   |  2 +
 .../monitoring/opentelemetry-collector.nix    | 56 +++++++++++--------
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 848fa1eb9b52..8dc6829d7182 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -435,3 +435,5 @@
 - The `open-webui` package's postgres support have been moved to optional dependencies to comply with upstream changes in 0.6.26.
 
 - `prl-tools` has been moved out of `linuxPackages` because Parallels Guest Tools become driverless since 26.1.0.
+
+- `services.opentelemetry-collector` has a new option `validateConfigFile` option that checks the configuration file during build. It is enabled by default if the configuration file is in the Nix store.
diff --git a/nixos/modules/services/monitoring/opentelemetry-collector.nix b/nixos/modules/services/monitoring/opentelemetry-collector.nix
index 125dec00b6cf..a722c7a88b5f 100644
--- a/nixos/modules/services/monitoring/opentelemetry-collector.nix
+++ b/nixos/modules/services/monitoring/opentelemetry-collector.nix
@@ -13,12 +13,27 @@ let
     mkOption
     types
     getExe
+    isStorePath
+    literalMD
     ;
 
   cfg = config.services.opentelemetry-collector;
   opentelemetry-collector = cfg.package;
 
   settingsFormat = pkgs.formats.yaml { };
+  generatedConf =
+    if cfg.configFile == null then
+      settingsFormat.generate "config.yaml" cfg.settings
+    else
+      cfg.configFile;
+  conf =
+    if cfg.validateConfigFile then
+      pkgs.runCommandLocal "config.yaml" { inherit generatedConf; } ''
+        cp $generatedConf $out
+        ${getExe opentelemetry-collector} validate --config=file:$out
+      ''
+    else
+      generatedConf;
 in
 {
   options.services.opentelemetry-collector = {
@@ -43,6 +58,11 @@ in
         Specify a path to a configuration file that Opentelemetry Collector should use.
       '';
     };
+
+    validateConfigFile = lib.mkEnableOption "Validate configuration file" // {
+      defaultText = literalMD "`true` if `configFile` is a store path";
+      default = isStorePath cfg.configFile;
+    };
   };
 
   config = mkIf cfg.enable {
@@ -61,28 +81,20 @@ in
       description = "Opentelemetry Collector Service Daemon";
       wantedBy = [ "multi-user.target" ];
 
-      serviceConfig =
-        let
-          conf =
-            if cfg.configFile == null then
-              settingsFormat.generate "config.yaml" cfg.settings
-            else
-              cfg.configFile;
-        in
-        {
-          ExecStart = "${getExe opentelemetry-collector} --config=file:${conf}";
-          DynamicUser = true;
-          Restart = "always";
-          ProtectSystem = "full";
-          DevicePolicy = "closed";
-          NoNewPrivileges = true;
-          WorkingDirectory = "%S/opentelemetry-collector";
-          StateDirectory = "opentelemetry-collector";
-          SupplementaryGroups = [
-            # allow to read the systemd journal for opentelemetry-collector
-            "systemd-journal"
-          ];
-        };
+      serviceConfig = {
+        ExecStart = "${getExe opentelemetry-collector} --config=file:${conf}";
+        DynamicUser = true;
+        Restart = "always";
+        ProtectSystem = "full";
+        DevicePolicy = "closed";
+        NoNewPrivileges = true;
+        WorkingDirectory = "%S/opentelemetry-collector";
+        StateDirectory = "opentelemetry-collector";
+        SupplementaryGroups = [
+          # allow to read the systemd journal for opentelemetry-collector
+          "systemd-journal"
+        ];
+      };
     };
   };
 }

From 9b5f114a4a214960ce68a8d962624ff5bb701aa4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 15:10:58 +0000
Subject: [PATCH 1307/6226] plakar: 1.0.4 -> 1.0.5

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

diff --git a/pkgs/by-name/pl/plakar/package.nix b/pkgs/by-name/pl/plakar/package.nix
index 336064592473..dab7c6e06394 100644
--- a/pkgs/by-name/pl/plakar/package.nix
+++ b/pkgs/by-name/pl/plakar/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "plakar";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchFromGitHub {
     owner = "PlakarKorp";
     repo = "plakar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gClQiXZEPui7g3Ps6yhB2tN36PnkqADo9iD4Gm6DpD4=";
+    hash = "sha256-cuPz0xg/cGKczHLpFqSBfFD7KlygCX6fnfrigv0K2Zs=";
   };
 
-  vendorHash = "sha256-JVk8wiuuicwWgEbqIjp7ryC4k3uc4DiXnJ5FxYbXV5M=";
+  vendorHash = "sha256-ySzDtj8EdGcWl6H1q44+QR5ebSC76leVygl+c8fa7sk=";
 
   buildInputs = [
     fuse

From e06fba148586cd99f3235afc2920be32ec9b5565 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 15:14:18 +0000
Subject: [PATCH 1308/6226] syft: 1.34.0 -> 1.34.2

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

diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix
index a91dd0b252fa..5e584c0d4331 100644
--- a/pkgs/by-name/sy/syft/package.nix
+++ b/pkgs/by-name/sy/syft/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "syft";
-  version = "1.34.0";
+  version = "1.34.2";
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "syft";
     tag = "v${version}";
-    hash = "sha256-J9ia5VjEItwDS2YjKAGAuQTTig5IIQA70yBYM/2r4B4=";
+    hash = "sha256-1RdJpjUVenmfx6dIme97f1N4zAWFt5Z25IfIjZLIAPI=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;

From 3e60491d5e5651195f1014ddedc157a6bae447f4 Mon Sep 17 00:00:00 2001
From: Savinien Petitjean <savinien.petitjean@gmail.com>
Date: Tue, 21 Oct 2025 17:21:10 +0200
Subject: [PATCH 1309/6226] winbox4: 4.0beta33 -> 4.0beta35

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

diff --git a/pkgs/by-name/wi/winbox4/package.nix b/pkgs/by-name/wi/winbox4/package.nix
index 555591192ecb..e8d5d71753e4 100644
--- a/pkgs/by-name/wi/winbox4/package.nix
+++ b/pkgs/by-name/wi/winbox4/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "winbox";
-  version = "4.0beta33";
+  version = "4.0beta35";
 
   metaCommon = {
     description = "Graphical configuration utility for RouterOS-based devices";
@@ -23,13 +23,13 @@ let
   x86_64-zip = callPackage ./build-from-zip.nix {
     inherit pname version metaCommon;
 
-    hash = "sha256-jGYqzmqH/0cbYoI5rGqSALzU8/dtDIKXCoFn9adDBZY=";
+    hash = "sha256-gmFAxa9ogFwbSZ9yOCkDzHDoRwc3FRx/HS9/yqdUpZc=";
   };
 
   x86_64-dmg = callPackage ./build-from-dmg.nix {
     inherit pname version metaCommon;
 
-    hash = "sha256-INMSKYGpXMBIF11Xaz+MLmCk78+rn7jf5BaFsErIG1E=";
+    hash = "sha256-FeUEr9Kpu92NDOyp8inpSvx42xRboHb/Ey3Bo4S91S0=";
   };
 in
 (if stdenvNoCC.hostPlatform.isDarwin then x86_64-dmg else x86_64-zip).overrideAttrs (oldAttrs: {

From 30dcef68d0c61fa91a33ed01285d9d03cce75bfe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 15:23:12 +0000
Subject: [PATCH 1310/6226] coroot-node-agent: 1.26.3 -> 1.26.4

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

diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix
index 63e1cef48274..fb6e024caf26 100644
--- a/pkgs/by-name/co/coroot-node-agent/package.nix
+++ b/pkgs/by-name/co/coroot-node-agent/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "coroot-node-agent";
-  version = "1.26.3";
+  version = "1.26.4";
 
   src = fetchFromGitHub {
     owner = "coroot";
     repo = "coroot-node-agent";
     rev = "v${version}";
-    hash = "sha256-IdDH+jFVRbquM+9VkPw/Sb2dc6eajLpNsLlYkUEUNAo=";
+    hash = "sha256-bm3zMk44FNZ3vb9fP1Szbmi+0I1kOas0es8Cqu3yWeA=";
   };
 
   vendorHash = "sha256-LJq45IGXgYNx0Hky2w+O5Enwc5EvD79/cJRQ/iCythk=";

From c1fccc2e4cd8da9656d4f030cf2fe429a9280a83 Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 19 Oct 2025 23:30:01 +0200
Subject: [PATCH 1311/6226] libportal-qt: fix build against Qt 6.9+

Has been failing for a while. See https://hydra.nixos.org/build/308845839

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/li/libportal/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/li/libportal/package.nix b/pkgs/by-name/li/libportal/package.nix
index 86f9068dc88d..2ac26a43b3b8 100644
--- a/pkgs/by-name/li/libportal/package.nix
+++ b/pkgs/by-name/li/libportal/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  fetchpatch2,
   meson,
   ninja,
   pkg-config,
@@ -68,6 +69,15 @@ stdenv.mkDerivation rec {
     qt6Packages.qtbase
   ];
 
+  patches = [
+    # See https://github.com/flatpak/libportal/pull/200
+    (fetchpatch2 {
+      name = "libportal-fix-qt6.9-private-api-usage.patch";
+      url = "https://github.com/flatpak/libportal/commit/796053d2eebe4532aad6bd3fd80cdf3b197806ec.patch?full_index=1";
+      hash = "sha256-TPIKKnZCcp/bmmsaNlDxAsKLTBe6BKPCTOutLjXPCHQ=";
+    })
+  ];
+
   mesonFlags = [
     (lib.mesonEnable "backend-gtk3" (variant == "gtk3"))
     (lib.mesonEnable "backend-gtk4" (variant == "gtk4"))

From 385547cc9afffacf196fb14fba9a82c9a240cada Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Tue, 21 Oct 2025 15:32:19 +0900
Subject: [PATCH 1312/6226] 
 anki,anki-bin,anki-utils,anki-sync-server,ankiAddons: mv to pkgs/by-name

* mv `anki`, `anki-bin`, `anki-sync-server` into pkgs/by-name
  * `ankiAddons` and `anki-utils` are under `anki`
---
 .../anki/bin.nix => by-name/an/anki-bin/package.nix}     | 0
 .../an/anki-sync-server/package.nix}                     | 0
 .../an}/anki/addons/adjust-sound-volume/default.nix      | 0
 .../an}/anki/addons/anki-connect/default.nix             | 0
 .../addons/anki-quizlet-importer-extended/default.nix    | 0
 pkgs/{games => by-name/an}/anki/addons/anki-utils.nix    | 0
 pkgs/{games => by-name/an}/anki/addons/default.nix       | 0
 .../an}/anki/addons/local-audio-yomichan/default.nix     | 0
 .../an}/anki/addons/passfail2/default.nix                | 0
 .../an}/anki/addons/puppy-reinforcement/default.nix      | 0
 .../an}/anki/addons/recolor/default.nix                  | 0
 ...0001-Apply-vite-style-to-anki-review-heatmap.js.patch | 0
 .../an}/anki/addons/review-heatmap/default.nix           | 0
 .../an}/anki/addons/reviewer-refocus-card/default.nix    | 0
 .../an}/anki/addons/yomichan-forvo-server/default.nix    | 0
 pkgs/{games => by-name/an}/anki/missing-hashes.json      | 0
 .../anki/default.nix => by-name/an/anki/package.nix}     | 4 ++--
 .../an}/anki/patches/allow-setting-addons-folder.patch   | 0
 .../an}/anki/patches/disable-auto-update.patch           | 0
 .../anki/patches/remove-the-gl-library-workaround.patch  | 0
 .../an}/anki/patches/skip-formatting-python-code.patch   | 0
 pkgs/{games => by-name/an}/anki/update.sh                | 0
 pkgs/{games => by-name/an}/anki/uv-deps.json             | 0
 pkgs/{games => by-name/an}/anki/with-addons.nix          | 0
 pkgs/top-level/all-packages.nix                          | 9 ++-------
 25 files changed, 4 insertions(+), 9 deletions(-)
 rename pkgs/{games/anki/bin.nix => by-name/an/anki-bin/package.nix} (100%)
 rename pkgs/{games/anki/sync-server.nix => by-name/an/anki-sync-server/package.nix} (100%)
 rename pkgs/{games => by-name/an}/anki/addons/adjust-sound-volume/default.nix (100%)
 rename pkgs/{games => by-name/an}/anki/addons/anki-connect/default.nix (100%)
 rename pkgs/{games => by-name/an}/anki/addons/anki-quizlet-importer-extended/default.nix (100%)
 rename pkgs/{games => by-name/an}/anki/addons/anki-utils.nix (100%)
 rename pkgs/{games => by-name/an}/anki/addons/default.nix (100%)
 rename pkgs/{games => by-name/an}/anki/addons/local-audio-yomichan/default.nix (100%)
 rename pkgs/{games => by-name/an}/anki/addons/passfail2/default.nix (100%)
 rename pkgs/{games => by-name/an}/anki/addons/puppy-reinforcement/default.nix (100%)
 rename pkgs/{games => by-name/an}/anki/addons/recolor/default.nix (100%)
 rename pkgs/{games => by-name/an}/anki/addons/review-heatmap/0001-Apply-vite-style-to-anki-review-heatmap.js.patch (100%)
 rename pkgs/{games => by-name/an}/anki/addons/review-heatmap/default.nix (100%)
 rename pkgs/{games => by-name/an}/anki/addons/reviewer-refocus-card/default.nix (100%)
 rename pkgs/{games => by-name/an}/anki/addons/yomichan-forvo-server/default.nix (100%)
 rename pkgs/{games => by-name/an}/anki/missing-hashes.json (100%)
 rename pkgs/{games/anki/default.nix => by-name/an/anki/package.nix} (99%)
 rename pkgs/{games => by-name/an}/anki/patches/allow-setting-addons-folder.patch (100%)
 rename pkgs/{games => by-name/an}/anki/patches/disable-auto-update.patch (100%)
 rename pkgs/{games => by-name/an}/anki/patches/remove-the-gl-library-workaround.patch (100%)
 rename pkgs/{games => by-name/an}/anki/patches/skip-formatting-python-code.patch (100%)
 rename pkgs/{games => by-name/an}/anki/update.sh (100%)
 rename pkgs/{games => by-name/an}/anki/uv-deps.json (100%)
 rename pkgs/{games => by-name/an}/anki/with-addons.nix (100%)

diff --git a/pkgs/games/anki/bin.nix b/pkgs/by-name/an/anki-bin/package.nix
similarity index 100%
rename from pkgs/games/anki/bin.nix
rename to pkgs/by-name/an/anki-bin/package.nix
diff --git a/pkgs/games/anki/sync-server.nix b/pkgs/by-name/an/anki-sync-server/package.nix
similarity index 100%
rename from pkgs/games/anki/sync-server.nix
rename to pkgs/by-name/an/anki-sync-server/package.nix
diff --git a/pkgs/games/anki/addons/adjust-sound-volume/default.nix b/pkgs/by-name/an/anki/addons/adjust-sound-volume/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/adjust-sound-volume/default.nix
rename to pkgs/by-name/an/anki/addons/adjust-sound-volume/default.nix
diff --git a/pkgs/games/anki/addons/anki-connect/default.nix b/pkgs/by-name/an/anki/addons/anki-connect/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/anki-connect/default.nix
rename to pkgs/by-name/an/anki/addons/anki-connect/default.nix
diff --git a/pkgs/games/anki/addons/anki-quizlet-importer-extended/default.nix b/pkgs/by-name/an/anki/addons/anki-quizlet-importer-extended/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/anki-quizlet-importer-extended/default.nix
rename to pkgs/by-name/an/anki/addons/anki-quizlet-importer-extended/default.nix
diff --git a/pkgs/games/anki/addons/anki-utils.nix b/pkgs/by-name/an/anki/addons/anki-utils.nix
similarity index 100%
rename from pkgs/games/anki/addons/anki-utils.nix
rename to pkgs/by-name/an/anki/addons/anki-utils.nix
diff --git a/pkgs/games/anki/addons/default.nix b/pkgs/by-name/an/anki/addons/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/default.nix
rename to pkgs/by-name/an/anki/addons/default.nix
diff --git a/pkgs/games/anki/addons/local-audio-yomichan/default.nix b/pkgs/by-name/an/anki/addons/local-audio-yomichan/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/local-audio-yomichan/default.nix
rename to pkgs/by-name/an/anki/addons/local-audio-yomichan/default.nix
diff --git a/pkgs/games/anki/addons/passfail2/default.nix b/pkgs/by-name/an/anki/addons/passfail2/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/passfail2/default.nix
rename to pkgs/by-name/an/anki/addons/passfail2/default.nix
diff --git a/pkgs/games/anki/addons/puppy-reinforcement/default.nix b/pkgs/by-name/an/anki/addons/puppy-reinforcement/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/puppy-reinforcement/default.nix
rename to pkgs/by-name/an/anki/addons/puppy-reinforcement/default.nix
diff --git a/pkgs/games/anki/addons/recolor/default.nix b/pkgs/by-name/an/anki/addons/recolor/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/recolor/default.nix
rename to pkgs/by-name/an/anki/addons/recolor/default.nix
diff --git a/pkgs/games/anki/addons/review-heatmap/0001-Apply-vite-style-to-anki-review-heatmap.js.patch b/pkgs/by-name/an/anki/addons/review-heatmap/0001-Apply-vite-style-to-anki-review-heatmap.js.patch
similarity index 100%
rename from pkgs/games/anki/addons/review-heatmap/0001-Apply-vite-style-to-anki-review-heatmap.js.patch
rename to pkgs/by-name/an/anki/addons/review-heatmap/0001-Apply-vite-style-to-anki-review-heatmap.js.patch
diff --git a/pkgs/games/anki/addons/review-heatmap/default.nix b/pkgs/by-name/an/anki/addons/review-heatmap/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/review-heatmap/default.nix
rename to pkgs/by-name/an/anki/addons/review-heatmap/default.nix
diff --git a/pkgs/games/anki/addons/reviewer-refocus-card/default.nix b/pkgs/by-name/an/anki/addons/reviewer-refocus-card/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/reviewer-refocus-card/default.nix
rename to pkgs/by-name/an/anki/addons/reviewer-refocus-card/default.nix
diff --git a/pkgs/games/anki/addons/yomichan-forvo-server/default.nix b/pkgs/by-name/an/anki/addons/yomichan-forvo-server/default.nix
similarity index 100%
rename from pkgs/games/anki/addons/yomichan-forvo-server/default.nix
rename to pkgs/by-name/an/anki/addons/yomichan-forvo-server/default.nix
diff --git a/pkgs/games/anki/missing-hashes.json b/pkgs/by-name/an/anki/missing-hashes.json
similarity index 100%
rename from pkgs/games/anki/missing-hashes.json
rename to pkgs/by-name/an/anki/missing-hashes.json
diff --git a/pkgs/games/anki/default.nix b/pkgs/by-name/an/anki/package.nix
similarity index 99%
rename from pkgs/games/anki/default.nix
rename to pkgs/by-name/an/anki/package.nix
index 57d68b125fbc..ec4f2405a974 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/by-name/an/anki/package.nix
@@ -14,7 +14,7 @@
   nixosTests,
   nodejs,
   jq,
-  protobuf,
+  protobuf_31,
   python3,
   python3Packages,
   qt6,
@@ -176,7 +176,7 @@ python3Packages.buildPythonApplication rec {
     # https://github.com/ankitects/anki/blob/24.11/docs/linux.md#packaging-considerations
     OFFLINE_BUILD = "1";
     NODE_BINARY = lib.getExe nodejs;
-    PROTOC_BINARY = lib.getExe protobuf;
+    PROTOC_BINARY = lib.getExe protobuf_31;
     PYTHON_BINARY = lib.getExe python3;
     UV_BINARY = lib.getExe uv;
     UV_NO_MANAGED_PYTHON = "1";
diff --git a/pkgs/games/anki/patches/allow-setting-addons-folder.patch b/pkgs/by-name/an/anki/patches/allow-setting-addons-folder.patch
similarity index 100%
rename from pkgs/games/anki/patches/allow-setting-addons-folder.patch
rename to pkgs/by-name/an/anki/patches/allow-setting-addons-folder.patch
diff --git a/pkgs/games/anki/patches/disable-auto-update.patch b/pkgs/by-name/an/anki/patches/disable-auto-update.patch
similarity index 100%
rename from pkgs/games/anki/patches/disable-auto-update.patch
rename to pkgs/by-name/an/anki/patches/disable-auto-update.patch
diff --git a/pkgs/games/anki/patches/remove-the-gl-library-workaround.patch b/pkgs/by-name/an/anki/patches/remove-the-gl-library-workaround.patch
similarity index 100%
rename from pkgs/games/anki/patches/remove-the-gl-library-workaround.patch
rename to pkgs/by-name/an/anki/patches/remove-the-gl-library-workaround.patch
diff --git a/pkgs/games/anki/patches/skip-formatting-python-code.patch b/pkgs/by-name/an/anki/patches/skip-formatting-python-code.patch
similarity index 100%
rename from pkgs/games/anki/patches/skip-formatting-python-code.patch
rename to pkgs/by-name/an/anki/patches/skip-formatting-python-code.patch
diff --git a/pkgs/games/anki/update.sh b/pkgs/by-name/an/anki/update.sh
similarity index 100%
rename from pkgs/games/anki/update.sh
rename to pkgs/by-name/an/anki/update.sh
diff --git a/pkgs/games/anki/uv-deps.json b/pkgs/by-name/an/anki/uv-deps.json
similarity index 100%
rename from pkgs/games/anki/uv-deps.json
rename to pkgs/by-name/an/anki/uv-deps.json
diff --git a/pkgs/games/anki/with-addons.nix b/pkgs/by-name/an/anki/with-addons.nix
similarity index 100%
rename from pkgs/games/anki/with-addons.nix
rename to pkgs/by-name/an/anki/with-addons.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c967d8f89074..c62100ef4843 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13196,13 +13196,8 @@ with pkgs;
 
   qgo = libsForQt5.callPackage ../games/qgo { };
 
-  anki = callPackage ../games/anki {
-    protobuf = protobuf_31;
-  };
-  anki-utils = callPackage ../games/anki/addons/anki-utils.nix { };
-  ankiAddons = recurseIntoAttrs (callPackage ../games/anki/addons { });
-  anki-bin = callPackage ../games/anki/bin.nix { };
-  anki-sync-server = callPackage ../games/anki/sync-server.nix { };
+  anki-utils = callPackage ../by-name/an/anki/addons/anki-utils.nix { };
+  ankiAddons = recurseIntoAttrs (callPackage ../by-name/an/anki/addons { });
 
   art = callPackage ../by-name/ar/art/package.nix {
     fftw = fftwSinglePrec;

From 884f11bb5d43bb7b06e9f217a018f9f17d0a1d9d Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Tue, 21 Oct 2025 17:31:10 +0200
Subject: [PATCH 1313/6226] Revert "libcava: 0.10.4 -> 0.10.6"

This reverts commit d37ee6e262a53eee2b813d1a6d2ede457d82995a.
---
 pkgs/by-name/li/libcava/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libcava/package.nix b/pkgs/by-name/li/libcava/package.nix
index 0067bd5e99df..cd0516a98fe4 100644
--- a/pkgs/by-name/li/libcava/package.nix
+++ b/pkgs/by-name/li/libcava/package.nix
@@ -8,13 +8,13 @@
 cava.overrideAttrs (old: rec {
   pname = "libcava";
   # fork may not be updated when we update upstream
-  version = "0.10.6";
+  version = "0.10.4";
 
   src = fetchFromGitHub {
     owner = "LukashonakV";
     repo = "cava";
     tag = version;
-    hash = "sha256-63be1wypMiqhPA6sjMebmFE6yKpTj/bUE53sMWun554=";
+    hash = "sha256-9eTDqM+O1tA/3bEfd1apm8LbEcR9CVgELTIspSVPMKM=";
   };
 
   nativeBuildInputs = old.nativeBuildInputs ++ [

From 78f1706789d5441b3ed8454918c915bd26b3bad1 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Tue, 21 Oct 2025 17:43:59 +0200
Subject: [PATCH 1314/6226] python3Packages.maestral: 1.9.4 -> 1.9.5

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

diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix
index 78ddcc7d8d51..de2b186f348c 100644
--- a/pkgs/development/python-modules/maestral/default.nix
+++ b/pkgs/development/python-modules/maestral/default.nix
@@ -31,16 +31,16 @@
 
 buildPythonPackage rec {
   pname = "maestral";
-  version = "1.9.4";
+  version = "1.9.5";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "SamSchott";
     repo = "maestral";
     tag = "v${version}";
-    hash = "sha256-akh0COltpUU4Z4kfubg6A7k6W8ICoqVYkmFpMkTC8H8=";
+    hash = "sha256-xFSnJPKTAPXYa4FuqkFF5gLzGZ9TltNVDhyBnswiut4=";
   };
 
   build-system = [ setuptools ];
@@ -51,7 +51,6 @@ buildPythonPackage rec {
     dbus-python
     dropbox
     fasteners
-    importlib-metadata
     keyring
     keyrings-alt
     packaging

From 93d6ac4860f46b9b19764b8bd6460646fa922f1d Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Tue, 21 Oct 2025 17:44:14 +0200
Subject: [PATCH 1315/6226] maestral-qt: 1.9.4 -> 1.9.5

---
 pkgs/applications/networking/maestral-qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix
index 2be6ae59feb1..293b28e074c7 100644
--- a/pkgs/applications/networking/maestral-qt/default.nix
+++ b/pkgs/applications/networking/maestral-qt/default.nix
@@ -11,7 +11,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "maestral-qt";
-  version = "1.9.4";
+  version = "1.9.5";
   pyproject = true;
 
   disabled = python3.pythonOlder "3.7";
@@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "SamSchott";
     repo = "maestral-qt";
     tag = "v${version}";
-    hash = "sha256-VkJOKKYnoXux3WjD1JwINGWwv1SMIXfidyV2ITE7dJc=";
+    hash = "sha256-FCn9ELbodk+zCJNmlOVoxE/KSSqbxy5HTB1vpiu7AJA=";
   };
 
   build-system = with python3.pkgs; [ setuptools ];

From d7e922a9b10a38a6eaddb4b14689c02ce5085246 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 13:05:04 -0300
Subject: [PATCH 1316/6226] kcp: fix build with cmake4

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

diff --git a/pkgs/by-name/kc/kcp/package.nix b/pkgs/by-name/kc/kcp/package.nix
index b939e335718e..e2733a5c925b 100644
--- a/pkgs/by-name/kc/kcp/package.nix
+++ b/pkgs/by-name/kc/kcp/package.nix
@@ -18,6 +18,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Fast and Reliable ARQ Protocol";
     homepage = "https://github.com/skywind3000/kcp";

From 8ba4ce2f86d81a3892facdefdf8a4f334c789bd6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 21 Oct 2025 16:17:20 +0000
Subject: [PATCH 1317/6226] rerun: 0.26.0 -> 0.26.1

Diff: https://github.com/rerun-io/rerun/compare/0.26.0...0.26.1

Changelog: https://github.com/rerun-io/rerun/blob/0.26.1/CHANGELOG.md
---
 pkgs/by-name/re/rerun/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix
index 6ee6084d8082..2ca6715de353 100644
--- a/pkgs/by-name/re/rerun/package.nix
+++ b/pkgs/by-name/re/rerun/package.nix
@@ -34,13 +34,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rerun";
-  version = "0.26.0";
+  version = "0.26.1";
 
   src = fetchFromGitHub {
     owner = "rerun-io";
     repo = "rerun";
     tag = finalAttrs.version;
-    hash = "sha256-aJKrC8cDYHpOEUdzLKJP7t/hn/fOFz2aulz+8BsuXZk=";
+    hash = "sha256-T4Ko0CDaKSEadaKB3JtTK9b2dRT9eJ7ThXEVipCRdBU=";
   };
 
   # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"'
   '';
 
-  cargoHash = "sha256-oRmOydykTPL8YwyFdD/OqDhHXlUnY5NJewfIQkdMaC4=";
+  cargoHash = "sha256-c234pbC5wNKsWwt049Zmk3gaAEb+obkkwAqefRmsu2A=";
 
   cargoBuildFlags = [ "--package rerun-cli" ];
   cargoTestFlags = [ "--package rerun-cli" ];

From 3bea5bba8a9b331d12e26c321b139c8756cd8976 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 16:19:04 +0000
Subject: [PATCH 1318/6226] python3Packages.fast-array-utils: 1.2.4 -> 1.2.5

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

diff --git a/pkgs/development/python-modules/fast-array-utils/default.nix b/pkgs/development/python-modules/fast-array-utils/default.nix
index 2c6675ac026a..4e1e6ffc2c16 100644
--- a/pkgs/development/python-modules/fast-array-utils/default.nix
+++ b/pkgs/development/python-modules/fast-array-utils/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "fast-array-utils";
-  version = "1.2.4";
+  version = "1.2.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scverse";
     repo = "fast-array-utils";
     tag = "v${version}";
-    hash = "sha256-R8pOID9Lws29OCMWb7RZNDsWakEYDf7bya6iSXp8Ips=";
+    hash = "sha256-iJcnmCh0AssbUEJg62cKURu1afHQiS/cZhYmGsZQM9I=";
   };
 
   # hatch-min-requirements tries to talk to PyPI by default. See https://github.com/tlambert03/hatch-min-requirements?tab=readme-ov-file#environment-variables.

From 70b786f0bcfe97688a840fc10d1d8d6df6e6e82f Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Tue, 21 Oct 2025 18:22:56 +0200
Subject: [PATCH 1319/6226] Revert "astal.source: 0-unstable-2025-10-09 ->
 0-unstable-2025-10-18"

This reverts commit dced4c3dafc28cb3717e44e3ceb7d69078f3e3b8.
---
 pkgs/development/libraries/astal/source.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/astal/source.nix b/pkgs/development/libraries/astal/source.nix
index 68184fc380ae..7c121da0a806 100644
--- a/pkgs/development/libraries/astal/source.nix
+++ b/pkgs/development/libraries/astal/source.nix
@@ -7,15 +7,15 @@ let
   originalDrv = fetchFromGitHub {
     owner = "Aylur";
     repo = "astal";
-    rev = "0b57af330086ee9492f63d2cb77b993b1ce38b6f";
-    hash = "sha256-fXJFoYjjiqkAXfiadshGrABuZ2VxmINKjXFbYtWBHiY=";
+    rev = "71b008e5fb59e0a992724db78d54a5ddcf234515";
+    hash = "sha256-vMhDAwwSrwMd5xWcTiA56fsk7LRz4tHOsKhrt2hXi48=";
   };
 in
 originalDrv.overrideAttrs (
   final: prev: {
     name = "${final.pname}-${final.version}"; # fetchFromGitHub already defines name
     pname = "astal-source";
-    version = "0-unstable-2025-10-18";
+    version = "0-unstable-2025-10-09";
 
     meta = prev.meta // {
       description = "Building blocks for creating custom desktop shells (source)";

From 08112f77485414006f99a9a29c25ca1ca5c35205 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 16:24:15 +0000
Subject: [PATCH 1320/6226] blint: 3.0.1 -> 3.0.2

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

diff --git a/pkgs/by-name/bl/blint/package.nix b/pkgs/by-name/bl/blint/package.nix
index 66bf4acccfc3..a3b163760a5d 100644
--- a/pkgs/by-name/bl/blint/package.nix
+++ b/pkgs/by-name/bl/blint/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "blint";
-  version = "3.0.1";
+  version = "3.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "owasp-dep-scan";
     repo = "blint";
     tag = "v${version}";
-    hash = "sha256-E4hOTDYJzavWM0/YGclhddS0eZE9eJLQmeS4Fpbysic=";
+    hash = "sha256-ell0/opQso7/qD6d6i18vU55TfTgdcZwVFXD+yZg9/g=";
   };
 
   build-system = [

From 372ed83b45005aabf4841a9888402690c937ab11 Mon Sep 17 00:00:00 2001
From: Assistant <assistant.moetron@gmail.com>
Date: Tue, 21 Oct 2025 12:24:22 -0400
Subject: [PATCH 1321/6226] maintainers: update assistant info

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 675f7d710209..52b6e7231b96 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2331,7 +2331,7 @@
     email = "assistant.moetron@gmail.com";
     github = "Assistant";
     githubId = 2748721;
-    matrix = "@assistant:pygmalion.chat";
+    matrix = "@self:assistant.moe";
     name = "Assistant Moetron";
   };
   astavie = {

From 3984e9e2e3f5192965b1d021165aa2baa20960f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 2 Sep 2025 18:17:18 +0000
Subject: [PATCH 1322/6226] cmdstan: 2.36.0 -> 2.37.0

---
 pkgs/by-name/cm/cmdstan/package.nix | 4 ++--
 pkgs/by-name/st/stanc/package.nix   | 7 ++++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/cm/cmdstan/package.nix b/pkgs/by-name/cm/cmdstan/package.nix
index 8cb501df30fd..fb1e8e4e54ca 100644
--- a/pkgs/by-name/cm/cmdstan/package.nix
+++ b/pkgs/by-name/cm/cmdstan/package.nix
@@ -12,14 +12,14 @@
 
 stdenv.mkDerivation rec {
   pname = "cmdstan";
-  version = "2.36.0";
+  version = "2.37.0";
 
   src = fetchFromGitHub {
     owner = "stan-dev";
     repo = "cmdstan";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-9Dan86C0nxxxkIXaOSKExY0hngAgWTpL4RlI3rTnBZo=";
+    hash = "sha256-bKkzzFkMF8+Ufz/EdKLJdB290Fvc2t8b47xB8oPz/sk=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/st/stanc/package.nix b/pkgs/by-name/st/stanc/package.nix
index 8ac7add6d2ae..a456773dfbc0 100644
--- a/pkgs/by-name/st/stanc/package.nix
+++ b/pkgs/by-name/st/stanc/package.nix
@@ -6,7 +6,7 @@
 
 ocamlPackages.buildDunePackage rec {
   pname = "stanc";
-  version = "2.36.0";
+  version = "2.37.0";
 
   minimalOCamlVersion = "4.12";
   duneVersion = "3";
@@ -14,8 +14,8 @@ ocamlPackages.buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "stan-dev";
     repo = "stanc3";
-    rev = "v${version}";
-    hash = "sha256-IrpHV00Fn3Nxail4Xgv/8ezclKpyVuQa1F34kF07wwA=";
+    tag = "v${version}";
+    hash = "sha256-d+sInQfnlT1gLbtIRPD+LUZgIdl519OrfvgSNYdYeII=";
   };
 
   nativeBuildInputs = with ocamlPackages; [ menhir ];
@@ -26,6 +26,7 @@ ocamlPackages.buildDunePackage rec {
     ppx_deriving
     fmt
     yojson
+    cmdliner
   ];
 
   meta = with lib; {

From 4fa4a80f6af96f0146f46736fa916f7fbeea2776 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 16:32:37 +0000
Subject: [PATCH 1323/6226] unciv: 4.18.6 -> 4.18.7

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

diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix
index e6c4d681f96d..d9f8949cb4db 100644
--- a/pkgs/by-name/un/unciv/package.nix
+++ b/pkgs/by-name/un/unciv/package.nix
@@ -12,7 +12,7 @@
   nix-update-script,
 }:
 let
-  version = "4.18.6";
+  version = "4.18.7";
 
   desktopItem = makeDesktopItem {
     name = "unciv";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
-    hash = "sha256-UKm5lJ378AZ016To5eC6EpFFNfbINCeHZdUyv+MN0X4=";
+    hash = "sha256-bZzF8WUDw2rrF8Qi6PKBA9F5EUDZGwgXegcHDFgQxJY=";
   };
 
   dontUnpack = true;

From 5bb28f854d688a9f213c6703ae1c244f731bbb46 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 20 Oct 2025 18:35:13 +0200
Subject: [PATCH 1324/6226] python3Packages.cmdstanpy: 1.2.5 -> 1.3.0

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

diff --git a/pkgs/development/python-modules/cmdstanpy/default.nix b/pkgs/development/python-modules/cmdstanpy/default.nix
index 6a9a2df2a11b..2ac12e0e0196 100644
--- a/pkgs/development/python-modules/cmdstanpy/default.nix
+++ b/pkgs/development/python-modules/cmdstanpy/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "cmdstanpy";
-  version = "1.2.5";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "stan-dev";
     repo = "cmdstanpy";
     tag = "v${version}";
-    hash = "sha256-/MiWawB1Y4/eMBHXQLjd+P+Pe8EtsLbGFrzQa1RNf6g=";
+    hash = "sha256-XVviGdJ41mcjCscL3jvcpHi6zMREHsuShGHpnMQX6V8=";
   };
 
   patches = [

From 4e1d0feefbaa11694ce4f05e5832eedf3a64d407 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 20 Oct 2025 19:55:24 +0200
Subject: [PATCH 1325/6226] python3Packages.prophet: 1.1.7 -> 1.2.0

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

diff --git a/pkgs/development/python-modules/prophet/default.nix b/pkgs/development/python-modules/prophet/default.nix
index cd49cb2a0442..63b037e2c07a 100644
--- a/pkgs/development/python-modules/prophet/default.nix
+++ b/pkgs/development/python-modules/prophet/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "prophet";
-  version = "1.1.7";
+  version = "1.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "facebook";
     repo = "prophet";
     tag = "v${version}";
-    hash = "sha256-94hxpfpZN3yvDUu+kM7Oc2Yu8+z0Gv6zqYRAwKXgHk4=";
+    hash = "sha256-SCd/PhchLbkb63HEEmRlfX2VruLo2jpweRkidgqNzE8=";
   };
 
   sourceRoot = "${src.name}/python";

From a1d3ffe29c39ec6ab876e51b6a89aeae4d2c0bb7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Tue, 21 Oct 2025 18:40:45 +0200
Subject: [PATCH 1326/6226] Pin ameba and blahaj to `crystal_1_17`

---
 pkgs/by-name/am/ameba/package.nix  | 6 ++++--
 pkgs/by-name/bl/blahaj/package.nix | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/am/ameba/package.nix b/pkgs/by-name/am/ameba/package.nix
index c1ce7a669fad..429e0ef8a062 100644
--- a/pkgs/by-name/am/ameba/package.nix
+++ b/pkgs/by-name/am/ameba/package.nix
@@ -1,10 +1,12 @@
 {
   lib,
   fetchFromGitHub,
-  crystal,
+  crystal_1_17,
   coreutils,
 }:
-
+let
+  crystal = crystal_1_17;
+in
 crystal.buildCrystalPackage rec {
   pname = "ameba";
   version = "1.6.4";
diff --git a/pkgs/by-name/bl/blahaj/package.nix b/pkgs/by-name/bl/blahaj/package.nix
index 258da854cfb8..b834d213e8fe 100644
--- a/pkgs/by-name/bl/blahaj/package.nix
+++ b/pkgs/by-name/bl/blahaj/package.nix
@@ -1,13 +1,16 @@
 {
   lib,
   stdenv,
-  crystal,
+  crystal_1_17,
   fetchFromGitHub,
   # https://crystal-lang.org/2019/09/06/parallelism-in-crystal/
   multithreading ? true,
   static ? stdenv.hostPlatform.isStatic,
 }:
 
+let
+  crystal = crystal_1_17;
+in
 crystal.buildCrystalPackage rec {
   pname = "blahaj";
   version = "2.2.0";

From 7f7d45e2646ec6498c52f8e86b3afaf5c5f05897 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 13:42:15 -0300
Subject: [PATCH 1327/6226] knightos-{genkfs, kcc, kimg, kpack, mktiupgrade,
 patchrom, scas}: fix build with cmake4

---
 pkgs/by-name/kn/knightos-genkfs/package.nix      | 5 +++++
 pkgs/by-name/kn/knightos-kcc/package.nix         | 5 +++++
 pkgs/by-name/kn/knightos-kimg/package.nix        | 5 +++++
 pkgs/by-name/kn/knightos-kpack/package.nix       | 5 +++++
 pkgs/by-name/kn/knightos-mktiupgrade/package.nix | 5 +++++
 pkgs/by-name/kn/knightos-patchrom/package.nix    | 5 +++++
 pkgs/by-name/kn/knightos-scas/package.nix        | 3 ++-
 7 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/kn/knightos-genkfs/package.nix b/pkgs/by-name/kn/knightos-genkfs/package.nix
index b91d29537a6f..663770b483c2 100644
--- a/pkgs/by-name/kn/knightos-genkfs/package.nix
+++ b/pkgs/by-name/kn/knightos-genkfs/package.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://knightos.org/";
     description = "Utility to write a KFS filesystem into a ROM file";
diff --git a/pkgs/by-name/kn/knightos-kcc/package.nix b/pkgs/by-name/kn/knightos-kcc/package.nix
index e43d2cd29a33..6b22a5a1ea4e 100644
--- a/pkgs/by-name/kn/knightos-kcc/package.nix
+++ b/pkgs/by-name/kn/knightos-kcc/package.nix
@@ -30,6 +30,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ boost ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/KnightOS/kcc";
     description = "KnightOS C compiler";
diff --git a/pkgs/by-name/kn/knightos-kimg/package.nix b/pkgs/by-name/kn/knightos-kimg/package.nix
index 732fc6f8e2b4..acfcf4cd1d8e 100644
--- a/pkgs/by-name/kn/knightos-kimg/package.nix
+++ b/pkgs/by-name/kn/knightos-kimg/package.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://knightos.org/";
     description = "Converts image formats supported by stb_image to the KnightOS image format";
diff --git a/pkgs/by-name/kn/knightos-kpack/package.nix b/pkgs/by-name/kn/knightos-kpack/package.nix
index 3d4cc0595fea..141bdb8b1a4e 100644
--- a/pkgs/by-name/kn/knightos-kpack/package.nix
+++ b/pkgs/by-name/kn/knightos-kpack/package.nix
@@ -29,6 +29,11 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "fortify" ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://knightos.org/";
     description = "Tool to create or extract KnightOS packages";
diff --git a/pkgs/by-name/kn/knightos-mktiupgrade/package.nix b/pkgs/by-name/kn/knightos-mktiupgrade/package.nix
index 850a35df20d2..0a688a809e88 100644
--- a/pkgs/by-name/kn/knightos-mktiupgrade/package.nix
+++ b/pkgs/by-name/kn/knightos-mktiupgrade/package.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://knightos.org/";
     description = "Makes TI calculator upgrade files from ROM dumps";
diff --git a/pkgs/by-name/kn/knightos-patchrom/package.nix b/pkgs/by-name/kn/knightos-patchrom/package.nix
index 097fffc85698..9f7163e2f0a5 100644
--- a/pkgs/by-name/kn/knightos-patchrom/package.nix
+++ b/pkgs/by-name/kn/knightos-patchrom/package.nix
@@ -29,6 +29,11 @@ stdenv.mkDerivation rec {
 
   hardeningDisable = [ "format" ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://knightos.org/";
     description = "Patches jumptables into TI calculator ROM files and generates an include file";
diff --git a/pkgs/by-name/kn/knightos-scas/package.nix b/pkgs/by-name/kn/knightos-scas/package.nix
index a04b03e6d10f..f3dc7525d961 100644
--- a/pkgs/by-name/kn/knightos-scas/package.nix
+++ b/pkgs/by-name/kn/knightos-scas/package.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation rec {
   cmakeFlags = [ "-DSCAS_LIBRARY=1" ];
   postPatch = ''
     substituteInPlace CMakeLists.txt \
-      --replace "TARGETS scas scdump scwrap" "TARGETS scas scdump scwrap generate_tables"
+      --replace-fail "TARGETS scas scdump scwrap" "TARGETS scas scdump scwrap generate_tables" \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
   '';
   strictDeps = true;
 

From 8496210f3d38c148e950c7e45134267da5b19add Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sat, 20 Sep 2025 19:53:43 -0400
Subject: [PATCH 1328/6226] idris2: Move to by-name

---
 .../idris2/idris2.nix => by-name/id/idris2/package.nix}     | 0
 pkgs/{development/compilers => by-name/id}/idris2/tests.nix | 0
 pkgs/development/compilers/idris2/default.nix               | 6 ++----
 pkgs/top-level/all-packages.nix                             | 2 --
 4 files changed, 2 insertions(+), 6 deletions(-)
 rename pkgs/{development/compilers/idris2/idris2.nix => by-name/id/idris2/package.nix} (100%)
 rename pkgs/{development/compilers => by-name/id}/idris2/tests.nix (100%)

diff --git a/pkgs/development/compilers/idris2/idris2.nix b/pkgs/by-name/id/idris2/package.nix
similarity index 100%
rename from pkgs/development/compilers/idris2/idris2.nix
rename to pkgs/by-name/id/idris2/package.nix
diff --git a/pkgs/development/compilers/idris2/tests.nix b/pkgs/by-name/id/idris2/tests.nix
similarity index 100%
rename from pkgs/development/compilers/idris2/tests.nix
rename to pkgs/by-name/id/idris2/tests.nix
diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix
index 57031f673d3e..1083a9b653f8 100644
--- a/pkgs/development/compilers/idris2/default.nix
+++ b/pkgs/development/compilers/idris2/default.nix
@@ -1,10 +1,8 @@
-{ callPackage }:
+{ callPackage, idris2 }:
 {
-  idris2 = callPackage ./idris2.nix { };
+  inherit idris2;
   idris2Api = callPackage ./idris2-api.nix { };
   idris2Lsp = callPackage ./idris2-lsp.nix { };
-
   pack = callPackage ./pack.nix { };
-
   buildIdris = callPackage ./build-idris.nix { };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c967d8f89074..4c4bf0ac88c9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5048,8 +5048,6 @@ with pkgs;
 
   idris2Packages = recurseIntoAttrs (callPackage ../development/compilers/idris2 { });
 
-  inherit (idris2Packages) idris2;
-
   inherit (callPackage ../development/tools/database/indradb { })
     indradb-server
     indradb-client

From 103a6160681685b93a5a530369b29bbe190f49ab Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Fri, 19 Sep 2025 14:08:11 -0400
Subject: [PATCH 1329/6226] idris2: Modernize derivation

---
 pkgs/by-name/id/idris2/package.nix            | 38 +++++++++++--------
 pkgs/by-name/id/idris2/tests.nix              |  3 +-
 pkgs/development/compilers/idris2/default.nix |  2 +
 3 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/id/idris2/package.nix b/pkgs/by-name/id/idris2/package.nix
index b34cda66e497..d2d276683f01 100644
--- a/pkgs/by-name/id/idris2/package.nix
+++ b/pkgs/by-name/id/idris2/package.nix
@@ -1,18 +1,18 @@
-# Almost 1:1 copy of idris2's nix/package.nix. Some work done in their flake.nix
-# we do here instead.
 {
-  stdenv,
   lib,
+  stdenv,
+  fetchFromGitHub,
   chez,
   chez-racket,
   clang,
   gmp,
-  fetchFromGitHub,
+  installShellFiles,
   makeWrapper,
   gambit,
   nodejs,
   zsh,
   callPackage,
+  idris2Packages,
 }:
 
 # NOTICE: An `idris2WithPackages` is available at: https://github.com/claymager/idris2-pkgs
@@ -24,22 +24,22 @@ let
     else
       chez-racket;
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "idris2";
   version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "idris-lang";
     repo = "Idris2";
-    rev = "v${version}";
-    sha256 = "sha256-VwveX3fZfrxEsytpbOc5Tm6rySpLFhTt5132J6rmrmM=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-VwveX3fZfrxEsytpbOc5Tm6rySpLFhTt5132J6rmrmM=";
   };
 
   strictDeps = true;
   nativeBuildInputs = [
-    makeWrapper
     clang
     platformChez
+    installShellFiles
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ];
   buildInputs = [
@@ -47,11 +47,9 @@ stdenv.mkDerivation rec {
     gmp
   ];
 
-  prePatch = ''
-    patchShebangs --build tests
-  '';
+  enableParallelBuilding = true;
 
-  makeFlags = [ "PREFIX=$(out)" ] ++ lib.optional stdenv.hostPlatform.isDarwin "OS=";
+  makeFlags = [ "PREFIX=${placeholder "out"}" ] ++ lib.optional stdenv.hostPlatform.isDarwin "OS=";
 
   # The name of the main executable of pkgs.chez is `scheme`
   buildFlags = [
@@ -59,6 +57,7 @@ stdenv.mkDerivation rec {
     "SCHEME=scheme"
   ];
 
+  doCheck = false;
   checkTarget = "test";
   nativeCheckInputs = [
     gambit
@@ -99,21 +98,30 @@ stdenv.mkDerivation rec {
         --suffix IDRIS2_PACKAGE_PATH ':' "${globalLibrariesPath}" \
         --suffix DYLD_LIBRARY_PATH ':' "$out/${name}/lib" \
         --suffix LD_LIBRARY_PATH ':' "$out/${name}/lib"
+    ''
+    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+      installShellCompletion --cmd idris2 \
+        --bash <($out/bin/idris2 --bash-completion-script idris2)
     '';
 
   # Run package tests
-  passthru.tests = callPackage ./tests.nix { inherit pname; };
+  passthru.tests = callPackage ./tests.nix {
+    idris2 = finalAttrs.finalPackage;
+    idris2Packages = idris2Packages.override { idris2 = finalAttrs.finalPackage; };
+  };
 
   meta = {
     description = "Purely functional programming language with first class types";
     mainProgram = "idris2";
     homepage = "https://github.com/idris-lang/Idris2";
+    changelog = "https://github.com/idris-lang/Idris2/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       fabianhjr
       wchresta
       mattpolzin
+      RossSmyth
     ];
-    inherit (chez.meta) platforms;
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/by-name/id/idris2/tests.nix b/pkgs/by-name/id/idris2/tests.nix
index b26227d7c4ed..6abf9435fcc1 100644
--- a/pkgs/by-name/id/idris2/tests.nix
+++ b/pkgs/by-name/id/idris2/tests.nix
@@ -2,7 +2,6 @@
   stdenv,
   runCommand,
   lib,
-  pname,
   idris2,
   idris2Packages,
   zsh,
@@ -18,6 +17,7 @@ let
       packages ? [ ],
     }:
     let
+      inherit (idris2) pname;
       packageString = builtins.concatStringsSep " " (map (p: "--package " + p) packages);
     in
     runCommand "${pname}-${testName}"
@@ -61,6 +61,7 @@ let
       expectedTree,
     }:
     let
+      inherit (idris2) pname;
       idrisPkg = transformBuildIdrisOutput (idris2Packages.buildIdris buildIdrisArgs);
     in
     runCommand "${pname}-${testName}"
diff --git a/pkgs/development/compilers/idris2/default.nix b/pkgs/development/compilers/idris2/default.nix
index 1083a9b653f8..8cb6edca8fcd 100644
--- a/pkgs/development/compilers/idris2/default.nix
+++ b/pkgs/development/compilers/idris2/default.nix
@@ -3,6 +3,8 @@
   inherit idris2;
   idris2Api = callPackage ./idris2-api.nix { };
   idris2Lsp = callPackage ./idris2-lsp.nix { };
+
   pack = callPackage ./pack.nix { };
+
   buildIdris = callPackage ./build-idris.nix { };
 }

From 4167386d69c1d0c1352de1057a66cb5f00c0b55c Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sat, 20 Sep 2025 21:46:58 -0400
Subject: [PATCH 1330/6226] idris2: Fix tests

---
 pkgs/by-name/id/idris2/tests.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/id/idris2/tests.nix b/pkgs/by-name/id/idris2/tests.nix
index 6abf9435fcc1..152b055ceefd 100644
--- a/pkgs/by-name/id/idris2/tests.nix
+++ b/pkgs/by-name/id/idris2/tests.nix
@@ -4,6 +4,7 @@
   lib,
   idris2,
   idris2Packages,
+  chez,
   zsh,
   tree,
 }:
@@ -28,7 +29,8 @@ let
         # is not the case with pure nix environments. Thus, we need to include zsh
         # when we build for darwin in tests. While this is impure, this is also what
         # we find in real darwin hosts.
-        nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ zsh ];
+        strictDeps = true;
+        nativeBuildInputs = [ chez ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ];
       }
       ''
         set -eo pipefail
@@ -39,6 +41,7 @@ let
 
         ${idris2}/bin/idris2 ${packageString} -o packageTest packageTest.idr
 
+        patchShebangs --build ./build/exec/packageTest
         GOT=$(./build/exec/packageTest)
 
         if [ "$GOT" = "${want}" ]; then
@@ -68,6 +71,7 @@ let
       {
         meta.timeout = 60;
 
+        strictDeps = true;
         nativeBuildInputs = [ tree ];
       }
       ''

From f5a33c56af78fd9b403e5f40f9ce31b03b55cb04 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Fri, 19 Sep 2025 16:11:00 -0400
Subject: [PATCH 1331/6226] idris2: Split runtime support library to seperate
 derivation

---
 pkgs/by-name/id/idris2/libidris2_support.nix | 32 ++++++++++++
 pkgs/by-name/id/idris2/package.nix           | 51 ++++++++++++++------
 2 files changed, 69 insertions(+), 14 deletions(-)
 create mode 100644 pkgs/by-name/id/idris2/libidris2_support.nix

diff --git a/pkgs/by-name/id/idris2/libidris2_support.nix b/pkgs/by-name/id/idris2/libidris2_support.nix
new file mode 100644
index 000000000000..81d6c10c9cd5
--- /dev/null
+++ b/pkgs/by-name/id/idris2/libidris2_support.nix
@@ -0,0 +1,32 @@
+{
+  stdenv,
+  lib,
+  gmp,
+  src,
+  version,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  inherit version src;
+  pname = "libidris2_support";
+
+  strictDeps = true;
+  buildInputs = [ gmp ];
+
+  enableParallelBuilding = true;
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+  ]
+  ++ lib.optional stdenv.isDarwin "OS=";
+
+  buildFlags = [ "support" ];
+
+  installTargets = "install-support";
+
+  postInstall = ''
+    mv "$out/idris2-${finalAttrs.version}/lib" "$out/lib"
+    mv "$out/idris2-${finalAttrs.version}/support" "$out/share"
+    rm -rf $out/idris2-${finalAttrs.version}
+  '';
+
+  meta.description = "Runtime library for Idris2";
+})
diff --git a/pkgs/by-name/id/idris2/package.nix b/pkgs/by-name/id/idris2/package.nix
index d2d276683f01..799b3599fd44 100644
--- a/pkgs/by-name/id/idris2/package.nix
+++ b/pkgs/by-name/id/idris2/package.nix
@@ -18,6 +18,19 @@
 # NOTICE: An `idris2WithPackages` is available at: https://github.com/claymager/idris2-pkgs
 
 let
+  version = "0.7.0";
+  src = fetchFromGitHub {
+    owner = "idris-lang";
+    repo = "Idris2";
+    rev = "v${version}";
+    hash = "sha256-VwveX3fZfrxEsytpbOc5Tm6rySpLFhTt5132J6rmrmM=";
+  };
+
+  # Runtime library
+  libidris2_support = callPackage ./libidris2_support.nix { inherit src version; };
+  libsupportLib = lib.makeLibraryPath [ libidris2_support ];
+  libsupportShare = lib.makeSearchPath "share" [ libidris2_support ];
+
   platformChez =
     if (stdenv.system == "x86_64-linux") || (lib.versionAtLeast chez.version "10.0.0") then
       chez
@@ -25,15 +38,8 @@ let
       chez-racket;
 in
 stdenv.mkDerivation (finalAttrs: {
+  inherit version src;
   pname = "idris2";
-  version = "0.7.0";
-
-  src = fetchFromGitHub {
-    owner = "idris-lang";
-    repo = "Idris2";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-VwveX3fZfrxEsytpbOc5Tm6rySpLFhTt5132J6rmrmM=";
-  };
 
   strictDeps = true;
   nativeBuildInputs = [
@@ -45,16 +51,23 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     platformChez
     gmp
+    libidris2_support
   ];
 
   enableParallelBuilding = true;
 
-  makeFlags = [ "PREFIX=${placeholder "out"}" ] ++ lib.optional stdenv.hostPlatform.isDarwin "OS=";
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "IDRIS2_SUPPORT_DIR=${libsupportLib}"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "OS=";
 
   # The name of the main executable of pkgs.chez is `scheme`
   buildFlags = [
     "bootstrap"
     "SCHEME=scheme"
+    "IDRIS2_LIBS=${libsupportLib}"
+    "IDRIS2_DATA=${libsupportShare}"
   ];
 
   doCheck = false;
@@ -62,8 +75,15 @@ stdenv.mkDerivation (finalAttrs: {
   nativeCheckInputs = [
     gambit
     nodejs
-  ]; # racket ];
-  checkFlags = [ "INTERACTIVE=" ];
+  ];
+  checkFlags = [
+    "INTERACTIVE="
+    "IDRIS2_DATA=${libsupportShare}"
+    "IDRIS2_LIBS=${libsupportLib}"
+    "TEST_IDRIS2_DATA=${libsupportShare}"
+    "TEST_IDRIS2_LIBS=${libsupportLib}"
+    "TEST_IDRIS2_SUPPORT_DIR=${libsupportLib}"
+  ];
 
   # TODO: Move this into its own derivation, such that this can be changed
   #       without having to recompile idris2 every time.
@@ -105,9 +125,12 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
   # Run package tests
-  passthru.tests = callPackage ./tests.nix {
-    idris2 = finalAttrs.finalPackage;
-    idris2Packages = idris2Packages.override { idris2 = finalAttrs.finalPackage; };
+  passthru = {
+    inherit libidris2_support;
+    tests = callPackage ./tests.nix {
+      idris2 = finalAttrs.finalPackage;
+      idris2Packages = idris2Packages.override { idris2 = finalAttrs.finalPackage; };
+    };
   };
 
   meta = {

From d5365578dd5c81fb3480db94661552f849ccae42 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Fri, 19 Sep 2025 16:09:08 -0400
Subject: [PATCH 1332/6226] idris2: Make it an "unwrapped" compiler, add
 wrapper

Patch source so the unwrapped compiler can run at all
---
 pkgs/by-name/id/idris2/package.nix | 206 +++++++++++++++--------------
 pkgs/by-name/id/idris2/wrapped.nix |  48 +++++++
 2 files changed, 154 insertions(+), 100 deletions(-)
 create mode 100644 pkgs/by-name/id/idris2/wrapped.nix

diff --git a/pkgs/by-name/id/idris2/package.nix b/pkgs/by-name/id/idris2/package.nix
index 799b3599fd44..3698414cb005 100644
--- a/pkgs/by-name/id/idris2/package.nix
+++ b/pkgs/by-name/id/idris2/package.nix
@@ -7,17 +7,16 @@
   clang,
   gmp,
   installShellFiles,
-  makeWrapper,
   gambit,
   nodejs,
   zsh,
   callPackage,
   idris2Packages,
+  testers,
 }:
-
-# NOTICE: An `idris2WithPackages` is available at: https://github.com/claymager/idris2-pkgs
-
 let
+  inherit (stdenv.hostPlatform) extensions;
+
   version = "0.7.0";
   src = fetchFromGitHub {
     owner = "idris-lang";
@@ -36,115 +35,122 @@ let
       chez
     else
       chez-racket;
-in
-stdenv.mkDerivation (finalAttrs: {
-  inherit version src;
-  pname = "idris2";
 
-  strictDeps = true;
-  nativeBuildInputs = [
-    clang
-    platformChez
-    installShellFiles
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ];
-  buildInputs = [
-    platformChez
-    gmp
-    libidris2_support
-  ];
+  unwrapped = stdenv.mkDerivation (finalAttrs: {
+    inherit version src;
+    pname = "idris2";
 
-  enableParallelBuilding = true;
+    postPatch = ''
+      shopt -s globstar
 
-  makeFlags = [
-    "PREFIX=${placeholder "out"}"
-    "IDRIS2_SUPPORT_DIR=${libsupportLib}"
-  ]
-  ++ lib.optional stdenv.hostPlatform.isDarwin "OS=";
+      # Patch all occurences of the support lib with an absolute path so it
+      # works without wrapping.
+      substituteInPlace **/*.idr \
+        --replace-quiet "libidris2_support" "${libidris2_support}/lib/libidris2_support${extensions.sharedLibrary}"
 
-  # The name of the main executable of pkgs.chez is `scheme`
-  buildFlags = [
-    "bootstrap"
-    "SCHEME=scheme"
-    "IDRIS2_LIBS=${libsupportLib}"
-    "IDRIS2_DATA=${libsupportShare}"
-  ];
+      substituteInPlace src/Compiler/RefC/CC.idr \
+        --replace-fail "libidris2_support${extensions.sharedLibrary}.a" "libidris2_support.a"
 
-  doCheck = false;
-  checkTarget = "test";
-  nativeCheckInputs = [
-    gambit
-    nodejs
-  ];
-  checkFlags = [
-    "INTERACTIVE="
-    "IDRIS2_DATA=${libsupportShare}"
-    "IDRIS2_LIBS=${libsupportLib}"
-    "TEST_IDRIS2_DATA=${libsupportShare}"
-    "TEST_IDRIS2_LIBS=${libsupportLib}"
-    "TEST_IDRIS2_SUPPORT_DIR=${libsupportLib}"
-  ];
+      patchShebangs --build tests
+    '';
 
-  # TODO: Move this into its own derivation, such that this can be changed
-  #       without having to recompile idris2 every time.
-  postInstall =
-    let
-      name = "${pname}-${version}";
-      globalLibraries = [
-        "\\$HOME/.nix-profile/lib/${name}"
-        "/run/current-system/sw/lib/${name}"
-        "$out/${name}"
-      ];
-      globalLibrariesPath = builtins.concatStringsSep ":" globalLibraries;
-    in
-    ''
+    strictDeps = true;
+    nativeBuildInputs = [
+      clang
+      platformChez
+      installShellFiles
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ];
+    buildInputs = [
+      platformChez
+      gmp
+      libidris2_support
+    ];
+
+    enableParallelBuilding = true;
+
+    makeFlags = [
+      "PREFIX=${placeholder "out"}"
+      "IDRIS2_SUPPORT_DIR=${libsupportLib}"
+    ]
+    ++ lib.optional stdenv.hostPlatform.isDarwin "OS=";
+
+    # The name of the main executable of pkgs.chez is `scheme`
+    buildFlags = [
+      "bootstrap"
+      "SCHEME=scheme"
+      "IDRIS2_LIBS=${libsupportLib}"
+      "IDRIS2_DATA=${libsupportShare}"
+    ];
+
+    doCheck = false;
+    checkTarget = "test";
+    nativeCheckInputs = [
+      gambit
+      nodejs
+    ];
+    checkFlags = [
+      "INTERACTIVE="
+      "IDRIS2_DATA=${libsupportShare}"
+      "IDRIS2_LIBS=${libsupportLib}"
+      "TEST_IDRIS2_DATA=${libsupportShare}"
+      "TEST_IDRIS2_LIBS=${libsupportLib}"
+      "TEST_IDRIS2_SUPPORT_DIR=${libsupportLib}"
+    ];
+
+    postInstall = ''
       # Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH
       rm $out/bin/idris2
-      # The only thing we need from idris2_app is the actual binary
+
+      # The only thing we need from idris2_app is the actual binary, which is
+      # a Chez Scheme object.
+      # The extensions is .so on Darwin and Linux for some reason
       mv $out/bin/idris2_app/idris2.so $out/bin/idris2
-      rm $out/bin/idris2_app/*
-      rmdir $out/bin/idris2_app
-      # idris2 needs to find scheme at runtime to compile
-      # idris2 installs packages with --install into the path given by
-      #   IDRIS2_PREFIX. We set that to a default of ~/.idris2, to mirror the
-      #   behaviour of the standard Makefile install.
-      # TODO: Make support libraries their own derivation such that
-      #       overriding LD_LIBRARY_PATH is unnecessary
-      wrapProgram "$out/bin/idris2" \
-        --set-default CHEZ "${platformChez}/bin/scheme" \
-        --run 'export IDRIS2_PREFIX=''${IDRIS2_PREFIX-"$HOME/.idris2"}' \
-        --suffix IDRIS2_LIBS ':' "$out/${name}/lib" \
-        --suffix IDRIS2_DATA ':' "$out/${name}/support" \
-        --suffix IDRIS2_PACKAGE_PATH ':' "${globalLibrariesPath}" \
-        --suffix DYLD_LIBRARY_PATH ':' "$out/${name}/lib" \
-        --suffix LD_LIBRARY_PATH ':' "$out/${name}/lib"
+
+      rm -rf $out/bin/idris2_app
     ''
     + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
       installShellCompletion --cmd idris2 \
         --bash <($out/bin/idris2 --bash-completion-script idris2)
     '';
 
-  # Run package tests
-  passthru = {
-    inherit libidris2_support;
-    tests = callPackage ./tests.nix {
-      idris2 = finalAttrs.finalPackage;
-      idris2Packages = idris2Packages.override { idris2 = finalAttrs.finalPackage; };
-    };
-  };
+    # Run package tests
+    passthru = {
+      inherit libidris2_support;
+      tests = {
+        wrapped = testers.testVersion {
+          package = finalAttrs.finalPackage.withPackages (p: [ p.idris2Api ]);
+        };
+      }
+      // (callPackage ./tests.nix {
+        idris2 = finalAttrs.finalPackage;
+        idris2Packages = idris2Packages.override { idris2 = finalAttrs.finalPackage; };
+      });
 
-  meta = {
-    description = "Purely functional programming language with first class types";
-    mainProgram = "idris2";
-    homepage = "https://github.com/idris-lang/Idris2";
-    changelog = "https://github.com/idris-lang/Idris2/releases/tag/v${finalAttrs.version}";
-    license = lib.licenses.bsd3;
-    maintainers = with lib.maintainers; [
-      fabianhjr
-      wchresta
-      mattpolzin
-      RossSmyth
-    ];
-    platforms = lib.platforms.all;
-  };
-})
+      chez = platformChez;
+
+      withPackages =
+        f:
+        callPackage ./wrapped.nix {
+          idris2-unwrapped = finalAttrs.finalPackage;
+          extraPackages = f idris2Packages;
+        };
+    };
+
+    meta = {
+      description = "Purely functional programming language with first class types";
+      mainProgram = "idris2";
+      homepage = "https://github.com/idris-lang/Idris2";
+      changelog = "https://github.com/idris-lang/Idris2/releases/tag/v${finalAttrs.version}";
+      license = lib.licenses.bsd3;
+      maintainers = with lib.maintainers; [
+        fabianhjr
+        wchresta
+        mattpolzin
+        RossSmyth
+      ];
+      platforms = lib.platforms.all;
+    };
+  });
+in
+unwrapped.withPackages (_: [ ])
diff --git a/pkgs/by-name/id/idris2/wrapped.nix b/pkgs/by-name/id/idris2/wrapped.nix
new file mode 100644
index 000000000000..237f6761fc2a
--- /dev/null
+++ b/pkgs/by-name/id/idris2/wrapped.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  makeBinaryWrapper,
+  symlinkJoin,
+  idris2-unwrapped,
+  extraPackages ? [ ],
+}:
+let
+  supportLibrariesPath = lib.makeLibraryPath [ idris2-unwrapped.libidris2_support ];
+  supportSharePath = lib.makeSearchPath "share" [ idris2-unwrapped.libidris2_support ];
+in
+symlinkJoin {
+  inherit (idris2-unwrapped) version;
+  pname = "idris2-wrapped";
+
+  paths = [ idris2-unwrapped ] ++ extraPackages;
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  postBuild = ''
+    wrapProgram "$out/bin/idris2" \
+      --set CHEZ "${lib.getExe idris2-unwrapped.chez}" \
+      --suffix IDRIS2_LIBS ':' "${supportLibrariesPath}" \
+      --suffix IDRIS2_DATA ':' "${supportSharePath}" \
+      --suffix IDRIS2_PACKAGE_PATH ':' "$out/idris2-${idris2-unwrapped.version}" \
+      --suffix LD_LIBRARY_PATH ':' "${supportLibrariesPath}" \
+      --suffix DYLD_LIBRARY_PATH ':' "${supportLibrariesPath}"
+  '';
+
+  passthru = {
+    unwrapped = idris2-unwrapped;
+    src = idris2-unwrapped.src;
+  }
+  // idris2-unwrapped.passthru;
+
+  meta = {
+    # Manually inherit so that pos works
+    inherit (idris2-unwrapped.meta)
+      description
+      mainProgram
+      homepage
+      changelog
+      license
+      maintainers
+      platforms
+      ;
+  };
+}

From fa2c3ecdc4c962079236bf68563f61a1b389270d Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sat, 20 Sep 2025 20:12:08 -0400
Subject: [PATCH 1333/6226] idris2: Make a compiler pkgset

---
 pkgs/by-name/id/idris2/libidris2_support.nix  |   7 +-
 pkgs/by-name/id/idris2/package.nix            | 169 +++---------------
 pkgs/by-name/id/idris2/unwrapped.nix          | 154 ++++++++++++++++
 .../compilers/idris2/idris2-api.nix           |   2 +-
 4 files changed, 179 insertions(+), 153 deletions(-)
 create mode 100644 pkgs/by-name/id/idris2/unwrapped.nix

diff --git a/pkgs/by-name/id/idris2/libidris2_support.nix b/pkgs/by-name/id/idris2/libidris2_support.nix
index 81d6c10c9cd5..538da01e26d7 100644
--- a/pkgs/by-name/id/idris2/libidris2_support.nix
+++ b/pkgs/by-name/id/idris2/libidris2_support.nix
@@ -2,12 +2,13 @@
   stdenv,
   lib,
   gmp,
-  src,
-  version,
+  idris2-src,
+  idris2-version,
 }:
 stdenv.mkDerivation (finalAttrs: {
-  inherit version src;
   pname = "libidris2_support";
+  version = idris2-version;
+  src = idris2-src;
 
   strictDeps = true;
   buildInputs = [ gmp ];
diff --git a/pkgs/by-name/id/idris2/package.nix b/pkgs/by-name/id/idris2/package.nix
index 3698414cb005..694160d9d5c1 100644
--- a/pkgs/by-name/id/idris2/package.nix
+++ b/pkgs/by-name/id/idris2/package.nix
@@ -1,156 +1,27 @@
 {
   lib,
-  stdenv,
+  newScope,
   fetchFromGitHub,
-  chez,
-  chez-racket,
-  clang,
-  gmp,
-  installShellFiles,
-  gambit,
-  nodejs,
-  zsh,
-  callPackage,
-  idris2Packages,
-  testers,
 }:
 let
-  inherit (stdenv.hostPlatform) extensions;
+  idris2CompilerPackages = lib.makeScope newScope (
+    self:
+    let
+      inherit (self) callPackage;
+    in
+    {
+      # Compiler version & repo
+      idris2-version = "0.7.0";
+      idris2-src = fetchFromGitHub {
+        owner = "idris-lang";
+        repo = "Idris2";
+        rev = "v${self.idris2-version}";
+        hash = "sha256-VwveX3fZfrxEsytpbOc5Tm6rySpLFhTt5132J6rmrmM=";
+      };
 
-  version = "0.7.0";
-  src = fetchFromGitHub {
-    owner = "idris-lang";
-    repo = "Idris2";
-    rev = "v${version}";
-    hash = "sha256-VwveX3fZfrxEsytpbOc5Tm6rySpLFhTt5132J6rmrmM=";
-  };
-
-  # Runtime library
-  libidris2_support = callPackage ./libidris2_support.nix { inherit src version; };
-  libsupportLib = lib.makeLibraryPath [ libidris2_support ];
-  libsupportShare = lib.makeSearchPath "share" [ libidris2_support ];
-
-  platformChez =
-    if (stdenv.system == "x86_64-linux") || (lib.versionAtLeast chez.version "10.0.0") then
-      chez
-    else
-      chez-racket;
-
-  unwrapped = stdenv.mkDerivation (finalAttrs: {
-    inherit version src;
-    pname = "idris2";
-
-    postPatch = ''
-      shopt -s globstar
-
-      # Patch all occurences of the support lib with an absolute path so it
-      # works without wrapping.
-      substituteInPlace **/*.idr \
-        --replace-quiet "libidris2_support" "${libidris2_support}/lib/libidris2_support${extensions.sharedLibrary}"
-
-      substituteInPlace src/Compiler/RefC/CC.idr \
-        --replace-fail "libidris2_support${extensions.sharedLibrary}.a" "libidris2_support.a"
-
-      patchShebangs --build tests
-    '';
-
-    strictDeps = true;
-    nativeBuildInputs = [
-      clang
-      platformChez
-      installShellFiles
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ];
-    buildInputs = [
-      platformChez
-      gmp
-      libidris2_support
-    ];
-
-    enableParallelBuilding = true;
-
-    makeFlags = [
-      "PREFIX=${placeholder "out"}"
-      "IDRIS2_SUPPORT_DIR=${libsupportLib}"
-    ]
-    ++ lib.optional stdenv.hostPlatform.isDarwin "OS=";
-
-    # The name of the main executable of pkgs.chez is `scheme`
-    buildFlags = [
-      "bootstrap"
-      "SCHEME=scheme"
-      "IDRIS2_LIBS=${libsupportLib}"
-      "IDRIS2_DATA=${libsupportShare}"
-    ];
-
-    doCheck = false;
-    checkTarget = "test";
-    nativeCheckInputs = [
-      gambit
-      nodejs
-    ];
-    checkFlags = [
-      "INTERACTIVE="
-      "IDRIS2_DATA=${libsupportShare}"
-      "IDRIS2_LIBS=${libsupportLib}"
-      "TEST_IDRIS2_DATA=${libsupportShare}"
-      "TEST_IDRIS2_LIBS=${libsupportLib}"
-      "TEST_IDRIS2_SUPPORT_DIR=${libsupportLib}"
-    ];
-
-    postInstall = ''
-      # Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH
-      rm $out/bin/idris2
-
-      # The only thing we need from idris2_app is the actual binary, which is
-      # a Chez Scheme object.
-      # The extensions is .so on Darwin and Linux for some reason
-      mv $out/bin/idris2_app/idris2.so $out/bin/idris2
-
-      rm -rf $out/bin/idris2_app
-    ''
-    + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-      installShellCompletion --cmd idris2 \
-        --bash <($out/bin/idris2 --bash-completion-script idris2)
-    '';
-
-    # Run package tests
-    passthru = {
-      inherit libidris2_support;
-      tests = {
-        wrapped = testers.testVersion {
-          package = finalAttrs.finalPackage.withPackages (p: [ p.idris2Api ]);
-        };
-      }
-      // (callPackage ./tests.nix {
-        idris2 = finalAttrs.finalPackage;
-        idris2Packages = idris2Packages.override { idris2 = finalAttrs.finalPackage; };
-      });
-
-      chez = platformChez;
-
-      withPackages =
-        f:
-        callPackage ./wrapped.nix {
-          idris2-unwrapped = finalAttrs.finalPackage;
-          extraPackages = f idris2Packages;
-        };
-    };
-
-    meta = {
-      description = "Purely functional programming language with first class types";
-      mainProgram = "idris2";
-      homepage = "https://github.com/idris-lang/Idris2";
-      changelog = "https://github.com/idris-lang/Idris2/releases/tag/v${finalAttrs.version}";
-      license = lib.licenses.bsd3;
-      maintainers = with lib.maintainers; [
-        fabianhjr
-        wchresta
-        mattpolzin
-        RossSmyth
-      ];
-      platforms = lib.platforms.all;
-    };
-  });
+      libidris2_support = callPackage ./libidris2_support.nix { };
+      idris2-unwrapped = callPackage ./unwrapped.nix { };
+    }
+  );
 in
-unwrapped.withPackages (_: [ ])
+idris2CompilerPackages.idris2-unwrapped.withPackages (_: [ ])
diff --git a/pkgs/by-name/id/idris2/unwrapped.nix b/pkgs/by-name/id/idris2/unwrapped.nix
new file mode 100644
index 000000000000..42ac86fb5def
--- /dev/null
+++ b/pkgs/by-name/id/idris2/unwrapped.nix
@@ -0,0 +1,154 @@
+{
+  lib,
+  stdenv,
+  chez,
+  chez-racket,
+  clang,
+  gmp,
+  installShellFiles,
+  gambit,
+  nodejs,
+  zsh,
+  callPackage,
+  idris2Packages,
+  testers,
+  libidris2_support,
+  idris2-version,
+  idris2-src,
+}:
+let
+  inherit (stdenv.hostPlatform) extensions;
+
+  # Runtime library
+  libsupportLib = lib.makeLibraryPath [ libidris2_support ];
+  libsupportShare = lib.makeSearchPath "share" [ libidris2_support ];
+
+  platformChez =
+    if (stdenv.system == "x86_64-linux") || (lib.versionAtLeast chez.version "10.0.0") then
+      chez
+    else
+      chez-racket;
+in
+stdenv.mkDerivation (finalAttrs: {
+  pname = "idris2";
+  version = idris2-version;
+  src = idris2-src;
+
+  postPatch = ''
+    shopt -s globstar
+
+    # Patch all occurences of the support lib with an absolute path so it
+    # works without wrapping.
+    substituteInPlace **/*.idr \
+      --replace-quiet "libidris2_support" "${libidris2_support}/lib/libidris2_support${extensions.sharedLibrary}"
+
+    # The remove changes libidris2_support.a to /nix/store/..../libidris2_support.so.a
+    # Fix that up so the reference-counted C backend works
+    substituteInPlace src/Compiler/RefC/CC.idr \
+      --replace-fail "libidris2_support${extensions.sharedLibrary}.a" "libidris2_support.a"
+
+    substituteInPlace bootstrap-stage2.sh \
+      --replace-fail "MAKE all" "MAKE idris2-exec"
+
+    patchShebangs --build tests
+  '';
+
+  strictDeps = true;
+  nativeBuildInputs = [
+    clang
+    platformChez
+    installShellFiles
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [ zsh ];
+  buildInputs = [
+    platformChez
+    gmp
+    libidris2_support
+  ];
+
+  enableParallelBuilding = true;
+
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "IDRIS2_SUPPORT_DIR=${libsupportLib}"
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin "OS=";
+
+  # The name of the main executable of pkgs.chez is `scheme`
+  buildFlags = [
+    "bootstrap"
+    "SCHEME=scheme"
+    "IDRIS2_LIBS=${libsupportLib}"
+    "IDRIS2_DATA=${libsupportShare}"
+  ];
+
+  doCheck = false;
+  checkTarget = "test";
+  nativeCheckInputs = [
+    gambit
+    nodejs
+  ];
+  checkFlags = [
+    "INTERACTIVE="
+    "IDRIS2_DATA=${libsupportShare}"
+    "IDRIS2_LIBS=${libsupportLib}"
+    "TEST_IDRIS2_DATA=${libsupportShare}"
+    "TEST_IDRIS2_LIBS=${libsupportLib}"
+    "TEST_IDRIS2_SUPPORT_DIR=${libsupportLib}"
+  ];
+
+  installTargets = "install-idris2";
+
+  postInstall = ''
+    # Remove existing idris2 wrapper that sets incorrect LD_LIBRARY_PATH
+    rm $out/bin/idris2
+
+    # The only thing we need from idris2_app is the actual binary, which is a Chez
+    # scheme object and for some reason *.so on darwin too
+    mv $out/bin/idris2_app/idris2.so $out/bin/idris2
+
+    rm -rf $out/bin/idris2_app
+  ''
+  + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd idris2 \
+      --bash <($out/bin/idris2 --bash-completion-script idris2)
+  '';
+
+  # Run package tests
+  passthru = {
+    inherit libidris2_support;
+    tests = {
+      wrapped = testers.testVersion {
+        package = finalAttrs.finalPackage.withPackages (p: [ p.idris2Api ]);
+      };
+    }
+    // (callPackage ./tests.nix {
+      idris2 = finalAttrs.finalPackage;
+      idris2Packages = idris2Packages.override { idris2 = finalAttrs.finalPackage; };
+    });
+
+    chez = platformChez;
+
+    withPackages =
+      f:
+      callPackage ./wrapped.nix {
+        idris2-unwrapped = finalAttrs.finalPackage;
+        extraPackages = f idris2Packages;
+      };
+  };
+
+  meta = {
+    description = "Purely functional programming language with first class types";
+    mainProgram = "idris2";
+    homepage = "https://github.com/idris-lang/Idris2";
+    changelog = "https://github.com/idris-lang/Idris2/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [
+      fabianhjr
+      wchresta
+      mattpolzin
+      RossSmyth
+    ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/development/compilers/idris2/idris2-api.nix b/pkgs/development/compilers/idris2/idris2-api.nix
index bd408a64dee1..49f24e927176 100644
--- a/pkgs/development/compilers/idris2/idris2-api.nix
+++ b/pkgs/development/compilers/idris2/idris2-api.nix
@@ -2,7 +2,7 @@
 let
   inherit (idris2Packages) idris2 buildIdris;
   apiPkg = buildIdris {
-    inherit (idris2) src version;
+    inherit (idris2.unwrapped) src version;
     ipkgName = "idris2api";
     idrisLibraries = [ ];
     preBuild = ''

From 622489c23a691e1bc2f23736af1a97b1007d4e70 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Fri, 17 Oct 2025 16:35:07 -0400
Subject: [PATCH 1334/6226] idris2: Make prelude library build helper

---
 pkgs/by-name/id/idris2/mkPrelude.nix | 39 ++++++++++++++++++++++++++++
 pkgs/by-name/id/idris2/package.nix   |  2 ++
 2 files changed, 41 insertions(+)
 create mode 100644 pkgs/by-name/id/idris2/mkPrelude.nix

diff --git a/pkgs/by-name/id/idris2/mkPrelude.nix b/pkgs/by-name/id/idris2/mkPrelude.nix
new file mode 100644
index 000000000000..90659c8c4fe6
--- /dev/null
+++ b/pkgs/by-name/id/idris2/mkPrelude.nix
@@ -0,0 +1,39 @@
+{
+  lib,
+  stdenvNoCC,
+  idris2-src,
+  idris2-version,
+  idris2-unwrapped,
+}:
+lib.extendMkDerivation {
+  constructDrv = stdenvNoCC.mkDerivation;
+
+  excludeDrvArgNames = [
+    "dependencies"
+  ];
+
+  extendDrvArgs =
+    finalAttrs:
+    {
+      name,
+      dependencies ? [ ],
+    }:
+    {
+      pname = name;
+      version = idris2-version;
+      src = idris2-src;
+      strictDeps = true;
+
+      makeFlags = "IDRIS2=${lib.getExe idris2-unwrapped}";
+
+      enableParallelBuilding = true;
+      preBuild = ''
+        cd libs/${name}
+      '';
+
+      env = {
+        IDRIS2_PREFIX = placeholder "out";
+        IDRIS2_PACKAGE_PATH = lib.makeSearchPath "idris2-${idris2-version}" dependencies;
+      };
+    };
+}
diff --git a/pkgs/by-name/id/idris2/package.nix b/pkgs/by-name/id/idris2/package.nix
index 694160d9d5c1..77adf53b0c34 100644
--- a/pkgs/by-name/id/idris2/package.nix
+++ b/pkgs/by-name/id/idris2/package.nix
@@ -18,6 +18,8 @@ let
         rev = "v${self.idris2-version}";
         hash = "sha256-VwveX3fZfrxEsytpbOc5Tm6rySpLFhTt5132J6rmrmM=";
       };
+      # Prelude libraries
+      mkPrelude = callPackage ./mkPrelude.nix { }; # Build helper
 
       libidris2_support = callPackage ./libidris2_support.nix { };
       idris2-unwrapped = callPackage ./unwrapped.nix { };

From 429035971208da8e9bd04234312e1aa087694833 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Fri, 17 Oct 2025 16:10:08 -0400
Subject: [PATCH 1335/6226] idris2: Put prelude in seperate derivation

---
 pkgs/by-name/id/idris2/base.nix               |  5 +++++
 pkgs/by-name/id/idris2/contrib.nix            | 12 ++++++++++
 pkgs/by-name/id/idris2/linear.nix             | 12 ++++++++++
 pkgs/by-name/id/idris2/network.nix            | 14 ++++++++++++
 pkgs/by-name/id/idris2/package.nix            |  6 +++++
 pkgs/by-name/id/idris2/prelude.nix            |  6 +++++
 pkgs/by-name/id/idris2/test.nix               | 14 ++++++++++++
 pkgs/by-name/id/idris2/unwrapped.nix          | 19 +++++++++++++++-
 pkgs/by-name/id/idris2/wrapped.nix            | 22 +++++++++++++++++--
 .../compilers/idris2/build-idris.nix          |  4 ++--
 .../compilers/idris2/idris2-lsp.nix           | 17 +++++++-------
 11 files changed, 118 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/by-name/id/idris2/base.nix
 create mode 100644 pkgs/by-name/id/idris2/contrib.nix
 create mode 100644 pkgs/by-name/id/idris2/linear.nix
 create mode 100644 pkgs/by-name/id/idris2/network.nix
 create mode 100644 pkgs/by-name/id/idris2/prelude.nix
 create mode 100644 pkgs/by-name/id/idris2/test.nix

diff --git a/pkgs/by-name/id/idris2/base.nix b/pkgs/by-name/id/idris2/base.nix
new file mode 100644
index 000000000000..2d0b1aa5ebe9
--- /dev/null
+++ b/pkgs/by-name/id/idris2/base.nix
@@ -0,0 +1,5 @@
+{ mkPrelude, prelude }:
+mkPrelude {
+  name = "base";
+  dependencies = [ prelude ];
+}
diff --git a/pkgs/by-name/id/idris2/contrib.nix b/pkgs/by-name/id/idris2/contrib.nix
new file mode 100644
index 000000000000..4d15fe54961e
--- /dev/null
+++ b/pkgs/by-name/id/idris2/contrib.nix
@@ -0,0 +1,12 @@
+{
+  mkPrelude,
+  prelude,
+  base,
+}:
+mkPrelude {
+  name = "contrib";
+  dependencies = [
+    prelude
+    base
+  ];
+}
diff --git a/pkgs/by-name/id/idris2/linear.nix b/pkgs/by-name/id/idris2/linear.nix
new file mode 100644
index 000000000000..162618d272ac
--- /dev/null
+++ b/pkgs/by-name/id/idris2/linear.nix
@@ -0,0 +1,12 @@
+{
+  mkPrelude,
+  prelude,
+  base,
+}:
+mkPrelude {
+  name = "linear";
+  dependencies = [
+    prelude
+    base
+  ];
+}
diff --git a/pkgs/by-name/id/idris2/network.nix b/pkgs/by-name/id/idris2/network.nix
new file mode 100644
index 000000000000..c5c6deee1813
--- /dev/null
+++ b/pkgs/by-name/id/idris2/network.nix
@@ -0,0 +1,14 @@
+{
+  mkPrelude,
+  prelude,
+  base,
+  linear,
+}:
+mkPrelude {
+  name = "network";
+  dependencies = [
+    prelude
+    base
+    linear
+  ];
+}
diff --git a/pkgs/by-name/id/idris2/package.nix b/pkgs/by-name/id/idris2/package.nix
index 77adf53b0c34..1b296d002c1f 100644
--- a/pkgs/by-name/id/idris2/package.nix
+++ b/pkgs/by-name/id/idris2/package.nix
@@ -20,6 +20,12 @@ let
       };
       # Prelude libraries
       mkPrelude = callPackage ./mkPrelude.nix { }; # Build helper
+      prelude = callPackage ./prelude.nix { };
+      base = callPackage ./base.nix { };
+      linear = callPackage ./linear.nix { };
+      network = callPackage ./network.nix { };
+      contrib = callPackage ./contrib.nix { };
+      test = callPackage ./test.nix { };
 
       libidris2_support = callPackage ./libidris2_support.nix { };
       idris2-unwrapped = callPackage ./unwrapped.nix { };
diff --git a/pkgs/by-name/id/idris2/prelude.nix b/pkgs/by-name/id/idris2/prelude.nix
new file mode 100644
index 000000000000..7dd74db76f0d
--- /dev/null
+++ b/pkgs/by-name/id/idris2/prelude.nix
@@ -0,0 +1,6 @@
+{
+  mkPrelude,
+}:
+mkPrelude {
+  name = "prelude";
+}
diff --git a/pkgs/by-name/id/idris2/test.nix b/pkgs/by-name/id/idris2/test.nix
new file mode 100644
index 000000000000..6cbe06e0e487
--- /dev/null
+++ b/pkgs/by-name/id/idris2/test.nix
@@ -0,0 +1,14 @@
+{
+  mkPrelude,
+  prelude,
+  base,
+  contrib,
+}:
+mkPrelude {
+  name = "test";
+  dependencies = [
+    prelude
+    base
+    contrib
+  ];
+}
diff --git a/pkgs/by-name/id/idris2/unwrapped.nix b/pkgs/by-name/id/idris2/unwrapped.nix
index 42ac86fb5def..1aa7c86e9077 100644
--- a/pkgs/by-name/id/idris2/unwrapped.nix
+++ b/pkgs/by-name/id/idris2/unwrapped.nix
@@ -121,9 +121,26 @@ stdenv.mkDerivation (finalAttrs: {
       wrapped = testers.testVersion {
         package = finalAttrs.finalPackage.withPackages (p: [ p.idris2Api ]);
       };
+
+      prelude = testers.runCommand {
+        name = "idris2-prelude-wrapped";
+        script = ''
+          local packages=$(idris2 --list-packages)
+
+          if ! [[ $packages =~ "contrib" ]]; then
+            exit 1
+          fi
+
+          touch "$out"
+        '';
+
+        nativeBuildInputs = [
+          (finalAttrs.finalPackage.withPackages (_: [ ]))
+        ];
+      };
     }
     // (callPackage ./tests.nix {
-      idris2 = finalAttrs.finalPackage;
+      idris2 = finalAttrs.finalPackage.withPackages (_: [ ]);
       idris2Packages = idris2Packages.override { idris2 = finalAttrs.finalPackage; };
     });
 
diff --git a/pkgs/by-name/id/idris2/wrapped.nix b/pkgs/by-name/id/idris2/wrapped.nix
index 237f6761fc2a..c1170dc2d854 100644
--- a/pkgs/by-name/id/idris2/wrapped.nix
+++ b/pkgs/by-name/id/idris2/wrapped.nix
@@ -3,17 +3,34 @@
   makeBinaryWrapper,
   symlinkJoin,
   idris2-unwrapped,
+  prelude,
+  linear,
+  base,
+  network,
+  contrib,
+  test,
   extraPackages ? [ ],
 }:
 let
+  preludeLibs = [
+    prelude
+    linear
+    base
+    network
+    contrib
+    test
+  ];
   supportLibrariesPath = lib.makeLibraryPath [ idris2-unwrapped.libidris2_support ];
   supportSharePath = lib.makeSearchPath "share" [ idris2-unwrapped.libidris2_support ];
+  packagePath = lib.makeSearchPath "idris2-${idris2-unwrapped.version}" (
+    preludeLibs ++ extraPackages
+  );
 in
 symlinkJoin {
   inherit (idris2-unwrapped) version;
   pname = "idris2-wrapped";
 
-  paths = [ idris2-unwrapped ] ++ extraPackages;
+  paths = [ idris2-unwrapped ];
 
   nativeBuildInputs = [ makeBinaryWrapper ];
 
@@ -22,12 +39,13 @@ symlinkJoin {
       --set CHEZ "${lib.getExe idris2-unwrapped.chez}" \
       --suffix IDRIS2_LIBS ':' "${supportLibrariesPath}" \
       --suffix IDRIS2_DATA ':' "${supportSharePath}" \
-      --suffix IDRIS2_PACKAGE_PATH ':' "$out/idris2-${idris2-unwrapped.version}" \
+      --suffix IDRIS2_PACKAGE_PATH ':' ${packagePath} \
       --suffix LD_LIBRARY_PATH ':' "${supportLibrariesPath}" \
       --suffix DYLD_LIBRARY_PATH ':' "${supportLibrariesPath}"
   '';
 
   passthru = {
+    prelude = preludeLibs;
     unwrapped = idris2-unwrapped;
     src = idris2-unwrapped.src;
   }
diff --git a/pkgs/development/compilers/idris2/build-idris.nix b/pkgs/development/compilers/idris2/build-idris.nix
index 9a5a1f2818d7..93fb40f2af86 100644
--- a/pkgs/development/compilers/idris2/build-idris.nix
+++ b/pkgs/development/compilers/idris2/build-idris.nix
@@ -49,8 +49,8 @@ let
   idrName = "idris2-${idris2.version}";
   libSuffix = "lib/${idrName}";
   libDirs = libs: (lib.makeSearchPath libSuffix libs) + ":${idris2}/${idrName}";
-  supportDir = "${idris2}/${idrName}/lib";
-  drvAttrs = removeAttrs attrs [
+  supportDir = "${idris2.libidris2_support}/lib";
+  drvAttrs = builtins.removeAttrs attrs [
     "ipkgName"
     "idrisLibraries"
   ];
diff --git a/pkgs/development/compilers/idris2/idris2-lsp.nix b/pkgs/development/compilers/idris2/idris2-lsp.nix
index f5a3d93eab4a..68f7084df45e 100644
--- a/pkgs/development/compilers/idris2/idris2-lsp.nix
+++ b/pkgs/development/compilers/idris2/idris2-lsp.nix
@@ -6,17 +6,18 @@
 }:
 
 let
-  globalLibraries =
+  globalLibrariesPath =
     let
       idrName = "idris2-${idris2Packages.idris2.version}";
-      libSuffix = "lib/${idrName}";
     in
-    [
-      "\\$HOME/.nix-profile/lib/${idrName}"
-      "/run/current-system/sw/lib/${idrName}"
-      "${idris2Packages.idris2}/${idrName}"
-    ];
-  globalLibrariesPath = builtins.concatStringsSep ":" globalLibraries;
+    lib.makeSearchPath idrName (
+      [
+        "\\$HOME/.nix-profile/lib/"
+        "/run/current-system/sw/lib/"
+        "${idris2Packages.idris2}"
+      ]
+      ++ idris2Packages.idris2.prelude
+    );
 
   inherit (idris2Packages) idris2Api;
   lspLib = idris2Packages.buildIdris {

From efa5600771ecb2198c862af60835b4a9ab3e5f8b Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sun, 21 Sep 2025 21:52:11 -0400
Subject: [PATCH 1336/6226] docs: Add to docs and release notes

---
 doc/languages-frameworks/idris2.section.md | 69 ++++++++++++++++++++++
 doc/release-notes/rl-2511.section.md       |  2 +
 2 files changed, 71 insertions(+)

diff --git a/doc/languages-frameworks/idris2.section.md b/doc/languages-frameworks/idris2.section.md
index 953222b9b315..a9b524250a37 100644
--- a/doc/languages-frameworks/idris2.section.md
+++ b/doc/languages-frameworks/idris2.section.md
@@ -1,5 +1,57 @@
 # Idris2 {#sec-idris2}
 
+When developing using Idris2, by default the Idris compiler only has the minimal support libraries in its environment. This means that it will not attempt to read any libraries installed
+globally, for example in the `$HOME` directory. The recommended way to use Idris2 is to wrap the compiler in an environment that provides these packages per-project, for example in a
+devShell.
+
+```nix
+{
+  pkgs ? import <nixpkgs> { },
+}:
+pkgs.mkShell {
+  packages = [ (idris2.withPackages (p: [ p.idris2Api ])) ];
+}
+```
+or, alternatively if Nix is used to build the Idris2 project:
+
+```nix
+{
+  pkgs ? import <nixpkgs> { },
+}:
+pkgs.mkShell {
+  inputsFrom = [ (pkgs.callPackage ./package.nix { }) ];
+}
+```
+
+By default, the Idris2 compiler provided by Nixpkgs does not read globally installed packages, nor can install them. Running `idris2 --install` will fail because the Nix store is
+a read-only file-system. If globally-installed packages are desired rather than the above strategy, one can set `IDRIS2_PREFIX`, or additional `IDRIS2_PACKAGE_PATH` entries
+for the compiler to read from. The following snippet will append `$HOME/.idris2` to `$IDRIS2_PACKAGE_PATH`, and if such a variable does not exist, create it. The Nixpkg's Idris2
+compiler append a few required libraries to this path variable, but any paths in the user's environment will be prefixed to those libraries.
+
+```nix
+{
+  pkgs ? import <nixpkgs> { },
+}:
+pkgs.mkShell {
+  packages = [ (idris2.withPackages (p: [ p.idris2Api ])) ];
+  shellHook = ''
+    IDRIS2_PACKAGE_PATH="''${IDRIS2_PACKAGE_PATH:+$IDRIS2_PACKAGE_PATH}$HOME/.idris2"
+  '';
+}
+```
+The following snippet will allow the Idris2 to run `idris2 --install` successfully:
+```nix
+{
+  pkgs ? import <nixpkgs> { },
+}:
+pkgs.mkShell {
+  packages = [ (idris2.withPackages (p: [ p.idris2Api ])) ];
+  shellHook = ''
+    IDRIS2_PREFIX="$HOME/.idris2"
+  '';
+}
+```
+
 In addition to exposing the Idris2 compiler itself, Nixpkgs exposes an `idris2Packages.buildIdris` helper to make it a bit more ergonomic to build Idris2 executables or libraries.
 
 The `buildIdris` function takes an attribute set that defines at a minimum the `src` and `ipkgName` of the package to be built and any `idrisLibraries` required to build it. The `src` is the same source you're familiar with and the `ipkgName` must be the name of the `ipkg` file for the project (omitting the `.ipkg` extension). The `idrisLibraries` is a list of other library derivations created with `buildIdris`. You can optionally specify other derivation properties as needed but sensible defaults for `configurePhase`, `buildPhase`, and `installPhase` are provided.
@@ -56,3 +108,20 @@ lspPkg.executable
 ```
 
 The above uses the default value of `withSource = false` for the `idris2Api` but could be modified to include that library's source by passing `(idris2Api { withSource = true; })` to `idrisLibraries` instead. `idris2Api` in the above derivation comes built in with `idris2Packages`. This library exposes many of the otherwise internal APIs of the Idris2 compiler.
+
+The compiler package can be instantiated with packages on its `IDRIS2_PACKAGES` path from the `idris2Packages` set.
+
+```nix
+{
+  idris2,
+  devShell,
+}:
+let
+  myIdris = idris2.withPackages (p: [ p.idris2Api ]);
+in
+devShell {
+  packages = [ myIdris ];
+}
+```
+
+This search path is extended from the path already in the user's environment.
diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 81389bf97a8b..4e42fcca7ec7 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -267,6 +267,8 @@
 
 - `installShellCompletion`: now supports Nushell completion files
 
+- `idris2` supports being instantiated with a package environment with `idris.withPackages (p: [ ])`
+
 - New hardening flags, `strictflexarrays1` and `strictflexarrays3` were made available, corresponding to the gcc/clang options `-fstrict-flex-arrays=1` and `-fstrict-flex-arrays=3` respectively.
 
 - `gramps` has been updated to 6.0.0

From 159c2cb8941ff709a9a674f4fb321f3d16426c81 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Sun, 21 Sep 2025 22:52:57 -0400
Subject: [PATCH 1337/6226] idris2: Add updateScript

---
 pkgs/by-name/id/idris2/unwrapped.nix |  2 ++
 pkgs/by-name/id/idris2/update.nu     | 28 ++++++++++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100755 pkgs/by-name/id/idris2/update.nu

diff --git a/pkgs/by-name/id/idris2/unwrapped.nix b/pkgs/by-name/id/idris2/unwrapped.nix
index 1aa7c86e9077..d932f720ba31 100644
--- a/pkgs/by-name/id/idris2/unwrapped.nix
+++ b/pkgs/by-name/id/idris2/unwrapped.nix
@@ -152,6 +152,8 @@ stdenv.mkDerivation (finalAttrs: {
         idris2-unwrapped = finalAttrs.finalPackage;
         extraPackages = f idris2Packages;
       };
+
+    updateScript = ./update.nu;
   };
 
   meta = {
diff --git a/pkgs/by-name/id/idris2/update.nu b/pkgs/by-name/id/idris2/update.nu
new file mode 100755
index 000000000000..c687b4646d6e
--- /dev/null
+++ b/pkgs/by-name/id/idris2/update.nu
@@ -0,0 +1,28 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -I ./.
+#! nix-shell -i nu
+#! nix-shell -p nushell nix
+
+const PACKAGE = './pkgs/by-name/id/idris2/package.nix'
+
+def main [] {
+  let tag = http get "https://api.github.com/repos/idris-lang/Idris2/releases"
+    | sort-by -r created_at
+    | first
+    | get tag_name
+
+  print $"Newest version: ($tag)"
+
+  let hash = run-external "nix" "flake" "prefetch" "--json" $"github:idris-lang/Idris2/($tag)"
+    | from json
+    | get hash
+
+  let current_hash = nix eval -f ./. idris2.unwrapped.src.outputHash --json | from json
+  let current_version = nix eval -f ./. idris2.version --json | from json
+
+  $PACKAGE
+    | open
+    | str replace $current_version ($tag | str trim -c 'v')
+    | str replace $current_hash $hash
+    | save -f $PACKAGE
+}

From 1d527df27ba3d6937f1843e014d2d4b8f08fe62a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 21 Oct 2025 18:46:35 +0200
Subject: [PATCH 1338/6226] python3Packages.rdflib: skip a test broken by
 python3: 3.13.7 -> 3.13.8

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

diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix
index 2aecf3ac308d..2b3b1caa6737 100644
--- a/pkgs/development/python-modules/rdflib/default.nix
+++ b/pkgs/development/python-modules/rdflib/default.nix
@@ -66,6 +66,8 @@ buildPythonPackage rec {
     # requires network access
     "rdflib/__init__.py::rdflib"
     "test/jsonld/test_onedotone.py::test_suite"
+    # https://github.com/RDFLib/rdflib/issues/3274
+    "test/test_sparql/test_translate_algebra.py::test_roundtrip"
   ];
 
   disabledTests = [

From 263ec6ca014b22b197337b0192e13827df5f5c83 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 21 Oct 2025 18:44:39 +0200
Subject: [PATCH 1339/6226] python3Packages.rdflib: 7.1.4 -> 7.2.1

https://github.com/RDFLib/rdflib/releases/tag/7.2.1
---
 pkgs/development/python-modules/rdflib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rdflib/default.nix b/pkgs/development/python-modules/rdflib/default.nix
index 2b3b1caa6737..07c57be63ef0 100644
--- a/pkgs/development/python-modules/rdflib/default.nix
+++ b/pkgs/development/python-modules/rdflib/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "rdflib";
-  version = "7.1.4";
+  version = "7.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "RDFLib";
     repo = "rdflib";
     tag = version;
-    hash = "sha256-u9hdwxAJIuTQ3zKstbwn88u1opzWXc8otJKbtIl4Li4=";
+    hash = "sha256-FisMiBTiL6emJS0d7UmlwGUzayA+CME5GGWgw/owfhc=";
   };
 
   build-system = [ poetry-core ];

From 8edd06b9671979da6104d4f57fd1f5449639c223 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Oct 2025 18:52:01 +0200
Subject: [PATCH 1340/6226] python313Packages.google-cloud-vpc-access: remove
 disabled

Removed the restriction for Python version 3.8.
---
 .../python-modules/google-cloud-vpc-access/default.nix         | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix
index 2260651c7595..72365208b378 100644
--- a/pkgs/development/python-modules/google-cloud-vpc-access/default.nix
+++ b/pkgs/development/python-modules/google-cloud-vpc-access/default.nix
@@ -9,7 +9,6 @@
   protobuf,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
@@ -18,8 +17,6 @@ buildPythonPackage rec {
   version = "1.14.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     pname = "google_cloud_vpc_access";
     inherit version;

From d2263ebdef5fa53997059cf6abc570f02fe7eee8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Oct 2025 18:52:47 +0200
Subject: [PATCH 1341/6226] python313Packages.mailchecker: remove disabled

---
 pkgs/development/python-modules/mailchecker/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/mailchecker/default.nix b/pkgs/development/python-modules/mailchecker/default.nix
index 247de221f576..92f962a1bc7f 100644
--- a/pkgs/development/python-modules/mailchecker/default.nix
+++ b/pkgs/development/python-modules/mailchecker/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
   setuptools,
 }:
 
@@ -11,8 +10,6 @@ buildPythonPackage rec {
   version = "6.0.19";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-MuLQdGiFZbhd/1Zc+VnTo3UW3EAyISzz/c1F3D0F2UE=";

From a7454c145bcde5d963cfdd0f8a300432ce51dca4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 21 Oct 2025 18:54:51 +0200
Subject: [PATCH 1342/6226] evcc: 0.209.2 -> 0.209.3

https://github.com/evcc-io/evcc/releases/tag/0.209.3
---
 pkgs/by-name/ev/evcc/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix
index 5f4bbe34f18e..06032b701f10 100644
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@@ -17,16 +17,16 @@
 }:
 
 let
-  version = "0.209.2";
+  version = "0.209.3";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     tag = version;
-    hash = "sha256-iaBP1/SszGSVMvS+kEzjbl2saaDbD7wbLdmhkQuKdwg=";
+    hash = "sha256-L3Rxp6p0iuEh06YHPKxK4//w2FPtLj6iy3qHk3hl9L8=";
   };
 
-  vendorHash = "sha256-Is6hv2nkTQhugSj+CqcTiwAPvIBtNNAvWZLLWm0jU/8=";
+  vendorHash = "sha256-T+5kbeKV0KWrKcTZzf7bcnoQUH5pRevj1JGZq3Z6/NM=";
 
   commonMeta = with lib; {
     license = licenses.mit;
@@ -52,7 +52,7 @@ buildGo125Module rec {
 
   npmDeps = fetchNpmDeps {
     inherit src;
-    hash = "sha256-TGT3lUhUpHJ4Aw43a4C6MBH8jbXKPdM5WZwBVTfJxws=";
+    hash = "sha256-WATWlCqTBY6vVMWpdyZ7Y/s0uI304TEC4gaKM2s5P/U=";
   };
 
   nativeBuildInputs = [

From 3b1276e958f7f2d6fe15f95dac2ff48a094a10e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 16:57:39 +0000
Subject: [PATCH 1343/6226] libretro.nestopia: 0-unstable-2025-10-15 ->
 0-unstable-2025-10-16

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

diff --git a/pkgs/applications/emulators/libretro/cores/nestopia.nix b/pkgs/applications/emulators/libretro/cores/nestopia.nix
index 25b01a635a13..c4166818f3e8 100644
--- a/pkgs/applications/emulators/libretro/cores/nestopia.nix
+++ b/pkgs/applications/emulators/libretro/cores/nestopia.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "nestopia";
-  version = "0-unstable-2025-10-15";
+  version = "0-unstable-2025-10-16";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "nestopia";
-    rev = "3ac52e67c4a7fa696ee37e48bbcec93611277288";
-    hash = "sha256-TDv+HTOtNEmel1lZlnlAGMVM8nEYdHLH7Rw6WBviGGw=";
+    rev = "e9429844f2e16a284a8cdf663589634fd4c6345f";
+    hash = "sha256-Ss4AuIuwEbaQOUcnGfXbJbEw/1HkyGZSRD2ody+wSSU=";
   };
 
   makefile = "Makefile";

From d0055576c6258ad5506dcc3087071fd4317f5b53 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Oct 2025 19:00:19 +0200
Subject: [PATCH 1344/6226] python313Packages.cyclopts: 3.24.0 -> 4.0.0

Changelog: https://github.com/BrianPugh/cyclopts/releases/tag/v4.0.0
---
 .../python-modules/cyclopts/default.nix       | 25 ++++++++++---------
 1 file changed, 13 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix
index f01ac6e888cc..d2b79bff7003 100644
--- a/pkgs/development/python-modules/cyclopts/default.nix
+++ b/pkgs/development/python-modules/cyclopts/default.nix
@@ -4,12 +4,11 @@
   buildPythonPackage,
   docstring-parser,
   fetchFromGitHub,
-  poetry-core,
-  poetry-dynamic-versioning,
+  hatchling,
+  hatch-vcs,
   pydantic,
   pytest-mock,
   pytestCheckHook,
-  pythonOlder,
   pyyaml,
   rich-rst,
   rich,
@@ -18,21 +17,19 @@
 
 buildPythonPackage rec {
   pname = "cyclopts";
-  version = "3.24.0";
+  version = "4.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.12";
-
   src = fetchFromGitHub {
     owner = "BrianPugh";
     repo = "cyclopts";
     tag = "v${version}";
-    hash = "sha256-gJflZBH3xCGKffKGt7y1xGXQR8C1wK19LnbunZ0kbAc=";
+    hash = "sha256-efc3P5xOy6YTWoCNOjatjELOEUh6Obfkf8U94GO4+40=";
   };
 
   build-system = [
-    poetry-core
-    poetry-dynamic-versioning
+    hatchling
+    hatch-vcs
   ];
 
   dependencies = [
@@ -51,15 +48,19 @@ buildPythonPackage rec {
     pydantic
     pytest-mock
     pytestCheckHook
-    pyyaml
   ]
   ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "cyclopts" ];
 
   disabledTests = [
-    # Assertion error
-    "test_pydantic_error_msg"
+    # Test requires bash
+    "test_positional_not_treated_as_command"
+  ];
+
+  disabledTestPaths = [
+    # Tests requires sphinx
+    "tests/test_sphinx_ext.py"
   ];
 
   meta = with lib; {

From 8827d8e5c7a813c3c3cf6bc0502b5ca6b0b3dc98 Mon Sep 17 00:00:00 2001
From: Matt Moriarity <matt@mattmoriarity.com>
Date: Tue, 21 Oct 2025 11:02:19 -0600
Subject: [PATCH 1345/6226] spire: add mjm as maintainer

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

diff --git a/pkgs/by-name/sp/spire/package.nix b/pkgs/by-name/sp/spire/package.nix
index 2275712444c6..027cf1c1ec0a 100644
--- a/pkgs/by-name/sp/spire/package.nix
+++ b/pkgs/by-name/sp/spire/package.nix
@@ -99,6 +99,7 @@ buildGoModule (finalAttrs: {
     maintainers = with lib.maintainers; [
       fkautz
       jk
+      mjm
     ];
   };
 })

From 9c458a12b4b262aab3d87809ee500ffcd37193f4 Mon Sep 17 00:00:00 2001
From: Matt Moriarity <matt@mattmoriarity.com>
Date: Tue, 21 Oct 2025 11:02:47 -0600
Subject: [PATCH 1346/6226] spire: 1.13.1 -> 1.13.2

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

diff --git a/pkgs/by-name/sp/spire/package.nix b/pkgs/by-name/sp/spire/package.nix
index 027cf1c1ec0a..ac6d592ff42b 100644
--- a/pkgs/by-name/sp/spire/package.nix
+++ b/pkgs/by-name/sp/spire/package.nix
@@ -6,7 +6,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "spire";
-  version = "1.13.1";
+  version = "1.13.2";
 
   outputs = [
     "out"
@@ -18,7 +18,7 @@ buildGoModule (finalAttrs: {
     owner = "spiffe";
     repo = "spire";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-1i2zT2oTJXMmISzUc4ixlZQjtjCcqUEi6RzgF9Zwm9s=";
+    sha256 = "sha256-iZMeD5ZwWKjY9mfuXgEgh+QLotmv28T8xBgpKoQTgxw=";
   };
 
   vendorHash = "sha256-tho3Qm9uHiiSNFmBZGZFgxhAKD4HKWsIUmiqkWlToQk=";

From 9daf354624124db4e670cf29c8e46c7334d5dbab Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Oct 2025 19:03:50 +0200
Subject: [PATCH 1347/6226] python313Packages.bthome-ble: 3.14.2 -> 3.15.0

Diff: https://github.com/Bluetooth-Devices/bthome-ble/compare/v3.14.2...v3.15.0

Changelog: https://github.com/bluetooth-devices/bthome-ble/blob/v3.15.0/CHANGELOG.md
---
 pkgs/development/python-modules/bthome-ble/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bthome-ble/default.nix b/pkgs/development/python-modules/bthome-ble/default.nix
index 1ea295a14750..a39d79049575 100644
--- a/pkgs/development/python-modules/bthome-ble/default.nix
+++ b/pkgs/development/python-modules/bthome-ble/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "bthome-ble";
-  version = "3.14.2";
+  version = "3.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "bthome-ble";
     tag = "v${version}";
-    hash = "sha256-kxKQnHrRZE7ugrRn7VSwQ99TtEX/DmH5x4Yy22UsXjA=";
+    hash = "sha256-AFALd5owqwaXPiMs0zHkGKpNqcpKG2O/JXXvuEF4d3s=";
   };
 
   build-system = [ poetry-core ];

From d1d85212b2bcf71cbde5c964d6cfef103bb4b87c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Oct 2025 19:08:21 +0200
Subject: [PATCH 1348/6226] cfripper: 1.18.0 -> 1.19.0

Diff: https://github.com/Skyscanner/cfripper/compare/v1.18.0...v1.19.0

Changelog: https://github.com/Skyscanner/cfripper/releases/tag/v1.19.0
---
 pkgs/by-name/cf/cfripper/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cf/cfripper/package.nix b/pkgs/by-name/cf/cfripper/package.nix
index 86eb84d06828..cbbd6cbdc633 100644
--- a/pkgs/by-name/cf/cfripper/package.nix
+++ b/pkgs/by-name/cf/cfripper/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "cfripper";
-  version = "1.18.0";
+  version = "1.19.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Skyscanner";
     repo = "cfripper";
     tag = "v${version}";
-    hash = "sha256-9cnOy7XBN3BRjUh6ST9RsKpAPJ8wrzJHtKMKhp7sg1g=";
+    hash = "sha256-4qDZANerC46CV0/+6dItNDCKSPsd5HjiK1+BFZktouw=";
   };
 
   pythonRelaxDeps = [

From f00deff49f2df70bea9a637becf0bcbc5f0ee33c Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Tue, 21 Oct 2025 19:09:04 +0200
Subject: [PATCH 1349/6226] blas-reference: remove

blas-reference has been moved into lapack-reference.
It is no longer maintained as free-standing package
and the current version is outdated. Use lapack-reference instead.
---
 pkgs/by-name/bl/blas-reference/package.nix | 62 ----------------------
 pkgs/top-level/aliases.nix                 |  1 +
 2 files changed, 1 insertion(+), 62 deletions(-)
 delete mode 100644 pkgs/by-name/bl/blas-reference/package.nix

diff --git a/pkgs/by-name/bl/blas-reference/package.nix b/pkgs/by-name/bl/blas-reference/package.nix
deleted file mode 100644
index 326b7e7fe4e2..000000000000
--- a/pkgs/by-name/bl/blas-reference/package.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  cmake,
-  gfortran,
-  # Whether to build with ILP64 interface
-  blas64 ? false,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "blas";
-  version = "3.12.0";
-
-  src = fetchurl {
-    url = "http://www.netlib.org/blas/${pname}-${version}.tgz";
-    sha256 = "sha256-zMQbXQiOUNsAMDF66bDJrzdXEME5KsrR/iCWAtpaWq0=";
-  };
-
-  passthru = { inherit blas64; };
-
-  nativeBuildInputs = [
-    cmake
-    gfortran
-  ];
-
-  cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ] ++ lib.optional blas64 "-DBUILD_INDEX64=ON";
-
-  # CMake 4 is no longer retro compatible with versions < 3.5
-  postPatch = ''
-    substituteInPlace CMakeLists.txt --replace-fail \
-      "cmake_minimum_required(VERSION 3.2)" \
-      "cmake_minimum_required(VERSION 3.5)"
-  '';
-
-  postInstall =
-    let
-      canonicalExtension =
-        if stdenv.hostPlatform.isLinux then
-          "${stdenv.hostPlatform.extensions.sharedLibrary}.${lib.versions.major version}"
-        else
-          stdenv.hostPlatform.extensions.sharedLibrary;
-    in
-    lib.optionalString blas64 ''
-      ln -s $out/lib/libblas64${canonicalExtension} $out/lib/libblas${canonicalExtension}
-    '';
-
-  preFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    for fn in $(find $out/lib -name "*.so*"); do
-      if [ -L "$fn" ]; then continue; fi
-      install_name_tool -id "$fn" "$fn"
-    done
-  '';
-
-  meta = with lib; {
-    description = "Basic Linear Algebra Subprograms";
-    license = licenses.publicDomain;
-    maintainers = [ maintainers.markuskowa ];
-    homepage = "http://www.netlib.org/blas/";
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4b7c42542c5f..4946d4c2d6cb 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -544,6 +544,7 @@ mapAliases {
   bisq-desktop = throw "bisq-desktop has been removed because OpenJFX 11 was removed"; # Added 2024-11-17
   bitmeter = throw "bitmeter has been removed, use `x42-meter 18` from the x42-plugins pkg instead."; # Added 2025-10-03
   bitwarden = bitwarden-desktop; # Added 2024-02-25
+  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-with-packages =
     args:
     lib.warnOnInstantiate

From 13080f7735f45db26781c56b21c960e39c84b0bb Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 17 Oct 2025 19:33:05 +0200
Subject: [PATCH 1350/6226] frozen: unstable-2021-02-23 -> 1.7

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/fr/frozen/meson.build |  2 +-
 pkgs/by-name/fr/frozen/package.nix | 11 +++++------
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/fr/frozen/meson.build b/pkgs/by-name/fr/frozen/meson.build
index 1db9546491ce..a551018bad0f 100644
--- a/pkgs/by-name/fr/frozen/meson.build
+++ b/pkgs/by-name/fr/frozen/meson.build
@@ -7,7 +7,7 @@ project(
         'werror=true'
     ],
     license: 'Apache-2.0',
-    version: '20210223'
+    version: '1.7'
 )
 
 library(
diff --git a/pkgs/by-name/fr/frozen/package.nix b/pkgs/by-name/fr/frozen/package.nix
index dfd96c7ce58a..6f3c8fbe729f 100644
--- a/pkgs/by-name/fr/frozen/package.nix
+++ b/pkgs/by-name/fr/frozen/package.nix
@@ -6,16 +6,15 @@
   ninja,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "frozen";
-  # pin to a newer release if frozen releases again, see cesanta/frozen#72
-  version = "unstable-2021-02-23";
+  version = "1.7";
 
   src = fetchFromGitHub {
     owner = "cesanta";
     repo = "frozen";
-    rev = "21f051e3abc2240d9a25b2add6629b38e963e102";
-    hash = "sha256-BpuYK9fbWSpeF8iPT8ImrV3CKKaA5RQ2W0ZQ03TciR0=";
+    tag = finalAttrs.version;
+    hash = "sha256-dOQb6wVufkqOSVZa2o8A1DLad0zvo2xQzmu09J2ZT7E=";
   };
 
   nativeBuildInputs = [
@@ -41,4 +40,4 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [ thillux ];
     platforms = lib.platforms.unix;
   };
-}
+})

From ca0411c207781d3287e6841cbeaa7dca18305f6f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Oct 2025 19:16:20 +0200
Subject: [PATCH 1351/6226] python313Packages.pylitterbot: 2024.2.4 -> 2024.2.6

Diff: https://github.com/natekspencer/pylitterbot/compare/v2024.2.4...v2024.2.6

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

diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix
index ceef62732855..e8059f9c5e83 100644
--- a/pkgs/development/python-modules/pylitterbot/default.nix
+++ b/pkgs/development/python-modules/pylitterbot/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pylitterbot";
-  version = "2024.2.4";
+  version = "2024.2.6";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "natekspencer";
     repo = "pylitterbot";
     tag = "v${version}";
-    hash = "sha256-/GN2b4rlE6j60O5ZxH8I58qwcZewAYJu0EHwQ7mrdBY=";
+    hash = "sha256-oQuEo0np+e+HfsQoWbv84BNpxNJQO3ZjocaCfllqkts=";
   };
 
   pythonRelaxDeps = [ "deepdiff" ];

From f73d0a2095c9c1eba2d310ff9f460609bf6f26db Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Oct 2025 19:18:25 +0200
Subject: [PATCH 1352/6226] python313Packages.pylitterbot: modernize

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

diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix
index e8059f9c5e83..33590b96fecc 100644
--- a/pkgs/development/python-modules/pylitterbot/default.nix
+++ b/pkgs/development/python-modules/pylitterbot/default.nix
@@ -12,7 +12,6 @@
   pytest-aiohttp,
   pytest-freezegun,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -20,8 +19,6 @@ buildPythonPackage rec {
   version = "2024.2.6";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "natekspencer";
     repo = "pylitterbot";
@@ -52,11 +49,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pylitterbot" ];
 
-  meta = with lib; {
+  meta = {
     description = "Modulefor controlling a Litter-Robot";
     homepage = "https://github.com/natekspencer/pylitterbot";
     changelog = "https://github.com/natekspencer/pylitterbot/releases/tag/${src.tag}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

From e4510bcb30d6f6e135a85f381f1d7971edaa328c Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Tue, 21 Oct 2025 19:34:40 +0200
Subject: [PATCH 1353/6226] powershell: 7.5.3 -> 7.5.4

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

diff --git a/pkgs/by-name/po/powershell/package.nix b/pkgs/by-name/po/powershell/package.nix
index 4dc7fab221bf..67937b0fb035 100644
--- a/pkgs/by-name/po/powershell/package.nix
+++ b/pkgs/by-name/po/powershell/package.nix
@@ -31,7 +31,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "powershell";
-  version = "7.5.3";
+  version = "7.5.4";
 
   src =
     passthru.sources.${stdenv.hostPlatform.system}
@@ -96,19 +96,19 @@ stdenv.mkDerivation rec {
     sources = {
       aarch64-darwin = fetchurl {
         url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-arm64.tar.gz";
-        hash = "sha256-9PrFxy6MCbo7b7hmfyGx1zVWBHgZhX/OeIMmjQI2nN4=";
+        hash = "sha256-OqrdfKYvHk2+WRRbavJOkm1h+NqKR4K8U15QDBhBNfA=";
       };
       aarch64-linux = fetchurl {
         url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-arm64.tar.gz";
-        hash = "sha256-SmtlbdDnUegsXfm5pCRb0ex9Id5TNK+72ALf0AlZVZk=";
+        hash = "sha256-SzLUy4akPfuD1WAtApQpW/Ivr7+eB4XRqu+Bk4zakvg=";
       };
       x86_64-darwin = fetchurl {
         url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-osx-x64.tar.gz";
-        hash = "sha256-wxAB9bwKTSNkGarwVNjAMWAnozHTPi+0HPjSdko1fgU=";
+        hash = "sha256-zRagTBuZzay9wDN7D9DaUNvxqLToQ3vLTKkRjvcpIRo=";
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/PowerShell/PowerShell/releases/download/v${version}/powershell-${version}-linux-x64.tar.gz";
-        hash = "sha256-XHTgu6/YvlnnImfwVwD9ZhU0TZz00wRg2bbRLNSoiow=";
+        hash = "sha256-H9eYP+VsqeYjPxJpJe2yS/a2sz41a2mZbZJcTblOL+8=";
       };
     };
     tests.version = testers.testVersion {

From 43dfca5d131bb160e18eb358ba04c7ea80023bca Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Oct 2025 19:04:47 +0200
Subject: [PATCH 1354/6226] python313Packages.aioshutil: 1.6.a1 -> 1.6

Diff: https://github.com/kumaraditya303/aioshutil/compare/v1.6.a1...v1.6

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

diff --git a/pkgs/development/python-modules/aioshutil/default.nix b/pkgs/development/python-modules/aioshutil/default.nix
index a48d53f8a5b3..579fe33bd1de 100644
--- a/pkgs/development/python-modules/aioshutil/default.nix
+++ b/pkgs/development/python-modules/aioshutil/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "aioshutil";
-  version = "1.6.a1";
+  version = "1.6";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "kumaraditya303";
     repo = "aioshutil";
     tag = "v${version}";
-    hash = "sha256-KoKIlliWSbU8KY92SgFm4Wams87O22KVlE41q18Sk3I=";
+    hash = "sha256-+8BpL9CVH0X/9H7vL4xuV5CdA3A10a2A1q4wt1x1sSM=";
   };
 
   build-system = [ setuptools-scm ];

From feaea0700169eeba502c4c2a3c6f71f077e98966 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 17:42:20 +0000
Subject: [PATCH 1355/6226] yandex-cloud: 0.168.0 -> 0.171.0

---
 pkgs/by-name/ya/yandex-cloud/sources.json | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ya/yandex-cloud/sources.json b/pkgs/by-name/ya/yandex-cloud/sources.json
index 2c248e36c928..2d2ad12b4017 100644
--- a/pkgs/by-name/ya/yandex-cloud/sources.json
+++ b/pkgs/by-name/ya/yandex-cloud/sources.json
@@ -1,25 +1,25 @@
 {
-  "version": "0.168.0",
+  "version": "0.171.0",
   "binaries": {
     "aarch64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.168.0/darwin/arm64/yc",
-      "hash": "sha256-BeaUE3hSFNw9xoIsqfPVI3d4c2mE/mXQPGKx43DEE38="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.171.0/darwin/arm64/yc",
+      "hash": "sha256-yasNFnjZJgtEcF9leIrk45lmpsvoggqJ71PFMcKqpZQ="
     },
     "aarch64-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.168.0/linux/arm64/yc",
-      "hash": "sha256-H0H+V94jQJCLJODcUj1ekK7v3PpipFLpuPaCtAKtEh0="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.171.0/linux/arm64/yc",
+      "hash": "sha256-FLPY5kk1C6UZnFgieaZ8h4Uupj+/GYzbGwo/9DBWMNs="
     },
     "i686-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.168.0/linux/386/yc",
-      "hash": "sha256-TgqkCo3kitCLd8LhmJH5uaf6dA2Zq1HkPczGk7NBpJ4="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.171.0/linux/386/yc",
+      "hash": "sha256-fcnnQG9RcFzfW7pd/bhJErSW4xFJwyjh0RUj+uQkCVM="
     },
     "x86_64-darwin": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.168.0/darwin/amd64/yc",
-      "hash": "sha256-xom3Ml8+3IHew2CskcnDj+VWQdD+A7DjEjq3pGrwlIU="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.171.0/darwin/amd64/yc",
+      "hash": "sha256-hbrp90y0p1ylgEGEWtGeLBFwaRn8yr58C9W1miz8mkQ="
     },
     "x86_64-linux": {
-      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.168.0/linux/amd64/yc",
-      "hash": "sha256-hj1zCcq4FYvWhfX0t9P/8wl94M0Rl6ieROPt4szYRZo="
+      "url": "https://storage.yandexcloud.net/yandexcloud-yc/release/0.171.0/linux/amd64/yc",
+      "hash": "sha256-uxPHCY9RdosL8wQePYUccKjIpMZlcfCGSS/SjAtyPIQ="
     }
   }
 }

From 17da68deb35e247a7a37664a13f33ccc08edd5f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 17:50:55 +0000
Subject: [PATCH 1356/6226] python3Packages.chromadb: 1.1.1 -> 1.2.1

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

diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix
index 6f7605e74ae5..b2dea382959b 100644
--- a/pkgs/development/python-modules/chromadb/default.nix
+++ b/pkgs/development/python-modules/chromadb/default.nix
@@ -67,20 +67,20 @@
 
 buildPythonPackage rec {
   pname = "chromadb";
-  version = "1.1.1";
+  version = "1.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chroma-core";
     repo = "chroma";
     tag = version;
-    hash = "sha256-WFN4z+LQwqy6bd59yWlglpXFqNZPEd3jcgeWhdphxYM=";
+    hash = "sha256-xEXW88iV9lqDOGrnoH0ZsoGMajATShA9HC+G79EdS9s=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
     name = "${pname}-${version}-vendor";
-    hash = "sha256-LZXtAt4rP0rKaleMht1eFPdqgE8nu5NdLzhWBW69WW8=";
+    hash = "sha256-GlF8Fp42ra5d55PIGOS4zOHXPSaIZGI/l8sHz/wyDgo=";
   };
 
   # Can't use fetchFromGitHub as the build expects a zipfile

From a8c190adbd7cff5bcc2794875305848536c7f6d4 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 14:47:16 -0300
Subject: [PATCH 1357/6226] knightos-z80e: fix build with cmake4

---
 pkgs/by-name/kn/knightos-z80e/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/kn/knightos-z80e/package.nix b/pkgs/by-name/kn/knightos-z80e/package.nix
index 0b39ebfa0999..6b15c23bed03 100644
--- a/pkgs/by-name/kn/knightos-z80e/package.nix
+++ b/pkgs/by-name/kn/knightos-z80e/package.nix
@@ -29,6 +29,15 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-Denable-sdl=YES" ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace libz80e/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace frontends/libz80e/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://knightos.org/";
     description = "Z80 calculator emulator and debugger";

From 6c910ccd4f954d59334727835445619e1d7d4333 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Oct 2025 10:53:21 -0700
Subject: [PATCH 1358/6226] python3Packages.pysmhi: fix tests on Darwin

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

diff --git a/pkgs/development/python-modules/pysmhi/default.nix b/pkgs/development/python-modules/pysmhi/default.nix
index da449ca28eaa..9427b8ca00a8 100644
--- a/pkgs/development/python-modules/pysmhi/default.nix
+++ b/pkgs/development/python-modules/pysmhi/default.nix
@@ -39,6 +39,8 @@ buildPythonPackage rec {
     syrupy
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     changelog = "https://github.com/gjohansson-ST/pysmhi/releases/tag/${src.tag}";
     description = "Retrieve open data from SMHI api";

From dda9be0de6f0847f9a27b96d2be8072d30b932df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Oct 2025 10:56:25 -0700
Subject: [PATCH 1359/6226] python3Packages.python-bsblan: fix tests on Darwin

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

diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix
index 572447f69c36..fc09767f6dae 100644
--- a/pkgs/development/python-modules/python-bsblan/default.nix
+++ b/pkgs/development/python-modules/python-bsblan/default.nix
@@ -55,6 +55,8 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   pythonImportsCheck = [ "bsblan" ];
 
   meta = with lib; {

From b37a09681db5369500fafd593414cd68063b80fb Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Tue, 21 Oct 2025 20:18:54 +0200
Subject: [PATCH 1360/6226] libreoffice: skip broken aarch64-linux test

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 .../office/libreoffice/skip-broken-tests-still.patch   | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch b/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch
index 13606bac50fc..1fa0009d97c2 100644
--- a/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch
+++ b/pkgs/applications/office/libreoffice/skip-broken-tests-still.patch
@@ -176,6 +176,16 @@
      createSwDoc("tdf166152.fodt");
  
      auto* pWrtShell = getSwDocShell()->GetWrtShell();
+--- a/unoxml/qa/unit/rdftest.cxx
++++ b/unoxml/qa/unit/rdftest.cxx
+@@ -962,6 +962,7 @@ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testTdf123293)
+
+ CPPUNIT_TEST_FIXTURE(RDFStreamTest, testDocumentMetadataAccess)
+ {
++    return; // fails on aarch64
+     loadFromURL(u"private:factory/swriter"_ustr);
+
+     uno::Reference<rdf::XDocumentMetadataAccess> xDocumentMetadataAccess(mxComponent,
 --- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
 +++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx
 @@ -6077,6 +6077,7 @@ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf162750SmallCapsLigature)

From b73f82fed126e62e4de6c479b1ddcf8e450a72e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Tue, 21 Oct 2025 19:17:40 +0100
Subject: [PATCH 1361/6226] hyprland-qtutils: fix build with Qt 6.10

---
 pkgs/by-name/hy/hyprland-qtutils/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/hy/hyprland-qtutils/package.nix b/pkgs/by-name/hy/hyprland-qtutils/package.nix
index b045af63c591..12cac7364ae0 100644
--- a/pkgs/by-name/hy/hyprland-qtutils/package.nix
+++ b/pkgs/by-name/hy/hyprland-qtutils/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   pkg-config,
   hyprutils,
@@ -23,6 +24,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-bTYedtQFqqVBAh42scgX7+S3O6XKLnT6FTC6rpmyCCc=";
   };
 
+  patches = [
+    # this should be removed in the next release
+    (fetchpatch {
+      name = "Fix build with Qt 6.10";
+      url = "https://github.com/hyprwm/hyprland-qtutils/commit/5ffdfc13ed03df1dae5084468d935f0a3f2c9a4c.patch";
+      hash = "sha256-5nVj4AFJpmazX9o9tQD6mzBW9KtRYov4yRbGpUwFcgc=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config

From b0a797069dca1cadbbc248d69ad56412b4aef38c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 18:23:57 +0000
Subject: [PATCH 1362/6226] xdg-desktop-portal-wlr: 0.7.1 -> 0.8.0

---
 pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
index 6dfac779d3c7..daec6e238113 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-wlr/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "xdg-desktop-portal-wlr";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "emersion";
     repo = "xdg-desktop-portal-wlr";
     rev = "v${version}";
-    sha256 = "sha256-GIIDeZMIGUiZV0IUhcclRVThE5LKaqVc5VwnNT8beNU=";
+    sha256 = "sha256-TAWrDH6kud4eXFJvfihImuEFm2uTOaqAOatG+7JmaEM=";
   };
 
   strictDeps = true;

From e8aa7dd8211825b0449c2cb3a2cd925be2e0ef5b Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Tue, 21 Oct 2025 20:27:29 +0200
Subject: [PATCH 1363/6226] ngrok: 3.25.0 -> 3.31.0

---
 pkgs/by-name/ng/ngrok/versions.json | 36 ++++++++++++++---------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/ng/ngrok/versions.json b/pkgs/by-name/ng/ngrok/versions.json
index cfdea158e908..a481d4be6d99 100644
--- a/pkgs/by-name/ng/ngrok/versions.json
+++ b/pkgs/by-name/ng/ngrok/versions.json
@@ -1,38 +1,38 @@
 {
   "linux-386": {
     "sys": "linux-386",
-    "url": "https://bin.equinox.io/a/9q4HZ8StRme/ngrok-v3-3.25.0-linux-386",
-    "sha256": "69a76dacb52e568977d105d0d8945c70d1702f9516d42959a4236daaab53559e",
-    "version": "3.25.0"
+    "url": "https://bin.equinox.io/a/nNTqdX4Ydi/ngrok-v3-3.31.0-linux-386",
+    "sha256": "df57220616e209b18fad5db27ebab459b79d79431845a9f35e39f5f7b482646d",
+    "version": "3.31.0"
   },
   "linux-amd64": {
     "sys": "linux-amd64",
-    "url": "https://bin.equinox.io/a/9smpcEP9X6q/ngrok-v3-3.25.0-linux-amd64",
-    "sha256": "13ec4a15ab815f29cd6d9eafc4bde3b6bb3a7c6ed5d96c3dd093884fb41c7b27",
-    "version": "3.25.0"
+    "url": "https://bin.equinox.io/a/mWtsD5CQpnc/ngrok-v3-3.31.0-linux-amd64",
+    "sha256": "1dab42535428db2a55f44abb0d14f6d9fec7f930f9346c9bd69f0cf5b6529dca",
+    "version": "3.31.0"
   },
   "linux-arm": {
     "sys": "linux-arm",
-    "url": "https://bin.equinox.io/a/jyXJJfSXXDP/ngrok-v3-3.25.0-linux-arm",
-    "sha256": "60901e0ce54f2730b27f76797c2b96f40b9af859403da6c4be81d9d6330bca9f",
-    "version": "3.25.0"
+    "url": "https://bin.equinox.io/a/dDdHR6qWaFy/ngrok-v3-3.31.0-linux-arm",
+    "sha256": "e713bfc77f2fe0a1225215ce5651a3beefb27773b01f1cce442a271512ee60bd",
+    "version": "3.31.0"
   },
   "linux-arm64": {
     "sys": "linux-arm64",
-    "url": "https://bin.equinox.io/a/7TpsSBE1k4y/ngrok-v3-3.25.0-linux-arm64",
-    "sha256": "dd49f434b64c1b4646a2e287f939d77f4dfc8d0a314e39c69a89e8cf5275f55b",
-    "version": "3.25.0"
+    "url": "https://bin.equinox.io/a/2SEt27vYGV3/ngrok-v3-3.31.0-linux-arm64",
+    "sha256": "4bd600d663bcdec42a7d1a6f0c5a042042fecd529b9867b532bd794e62fdb9b4",
+    "version": "3.31.0"
   },
   "darwin-amd64": {
     "sys": "darwin-amd64",
-    "url": "https://bin.equinox.io/a/9pCLo8uquic/ngrok-v3-3.25.0-darwin-amd64",
-    "sha256": "1199c6c6f6f4d5fc7c91ed5dbbbda2cf212568d7397e0785d92b1d1c4bd87a25",
-    "version": "3.25.0"
+    "url": "https://bin.equinox.io/a/8YrgUfMJ8FH/ngrok-v3-3.31.0-darwin-amd64",
+    "sha256": "b4855f6d9b170ffe9a77393e43d1e40a4a5ce66a6906fa2cfcddaf5e05938b98",
+    "version": "3.31.0"
   },
   "darwin-arm64": {
     "sys": "darwin-arm64",
-    "url": "https://bin.equinox.io/a/2PceGNze17x/ngrok-v3-3.25.0-darwin-arm64",
-    "sha256": "a3799883672ed868036ec71353e9feec8389568b75e5d704a32a52a409f37133",
-    "version": "3.25.0"
+    "url": "https://bin.equinox.io/a/9XVR1UCtCce/ngrok-v3-3.31.0-darwin-arm64",
+    "sha256": "407f7e88a57f93536d0981544d4132cdf100aa2799a5b56640ec13726febc970",
+    "version": "3.31.0"
   }
 }

From 742ae8a26dd762ab8ad583e2848dce6fb7764a73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Tue, 21 Oct 2025 19:28:06 +0100
Subject: [PATCH 1364/6226] lsp-plugins: use php84

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

diff --git a/pkgs/by-name/ls/lsp-plugins/package.nix b/pkgs/by-name/ls/lsp-plugins/package.nix
index e3ef3b6d7fed..1874f7502232 100644
--- a/pkgs/by-name/ls/lsp-plugins/package.nix
+++ b/pkgs/by-name/ls/lsp-plugins/package.nix
@@ -11,12 +11,12 @@
   libXrandr,
   libsndfile,
   lv2,
-  php82,
+  php84,
   pkg-config,
 }:
 
 let
-  php = php82;
+  php = php84;
 in
 
 stdenv.mkDerivation (finalAttrs: {

From 7afd4188d5458d6ddf370d67746890f4ae12b5fc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Oct 2025 20:32:17 +0200
Subject: [PATCH 1365/6226] python313Packages.groq: 0.32.0 -> 0.33.0

Diff: https://github.com/groq/groq-python/compare/v0.32.0...v0.33.0

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

diff --git a/pkgs/development/python-modules/groq/default.nix b/pkgs/development/python-modules/groq/default.nix
index 70db8134153d..f0e60c517667 100644
--- a/pkgs/development/python-modules/groq/default.nix
+++ b/pkgs/development/python-modules/groq/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "groq";
-  version = "0.32.0";
+  version = "0.33.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "groq";
     repo = "groq-python";
     tag = "v${version}";
-    hash = "sha256-31doHBwdZWlEb1tk0OjfLciPhde0kfiMY6heiXDvnWI=";
+    hash = "sha256-DR5/g/SQZ1445k2nF9cXzyaoGz3QNKvwNPBY5kWngRM=";
   };
 
   postPatch = ''

From 13b4ef935774807551d5c8fe546f77f5b8386d0d Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 21 Oct 2025 20:33:41 +0200
Subject: [PATCH 1366/6226] =?UTF-8?q?ocamlPackages.graphql=5Fppx:=201.2.2?=
 =?UTF-8?q?=20=E2=86=92=201.2.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ocaml-modules/graphql_ppx/default.nix        | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/ocaml-modules/graphql_ppx/default.nix b/pkgs/development/ocaml-modules/graphql_ppx/default.nix
index 08ae3343d062..5623248589fa 100644
--- a/pkgs/development/ocaml-modules/graphql_ppx/default.nix
+++ b/pkgs/development/ocaml-modules/graphql_ppx/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  ocaml,
   buildDunePackage,
   fetchFromGitHub,
   alcotest,
@@ -9,19 +10,15 @@
   yojson,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "graphql_ppx";
-  version = "1.2.2";
-
-  duneVersion = "3";
-
-  minimalOCamlVersion = "4.08";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "reasonml-community";
     repo = "graphql-ppx";
-    rev = "v${version}";
-    sha256 = "sha256-+WJhA2ixZHiSZBoX14dnQKk7JfVAIME4JooNSnhRp44=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-u49JHC8K5iMCOQRPYaMl00npJsIE6ePaeJ2jP/vnuvw=";
   };
 
   nativeBuildInputs = [ reason ];
@@ -42,6 +39,7 @@ buildDunePackage rec {
   doCheck = true;
 
   meta = {
+    broken = lib.versionAtLeast ocaml.version "5.4";
     homepage = "https://github.com/reasonml-community/graphql_ppx";
     description = "GraphQL PPX rewriter for Bucklescript/ReasonML";
     license = lib.licenses.mit;
@@ -50,4 +48,4 @@ buildDunePackage rec {
       jtcoolen
     ];
   };
-}
+})

From 11079dfb1401b0fcef429b7244f618bbaa784a75 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 21 Oct 2025 18:50:59 +0000
Subject: [PATCH 1367/6226] python3Packages.vector: 1.6.3 -> 1.7.0

Diff: https://github.com/scikit-hep/vector/compare/v1.6.3...v1.7.0

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

diff --git a/pkgs/development/python-modules/vector/default.nix b/pkgs/development/python-modules/vector/default.nix
index 0a92d42fa9c4..62d734364025 100644
--- a/pkgs/development/python-modules/vector/default.nix
+++ b/pkgs/development/python-modules/vector/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "vector";
-  version = "1.6.3";
+  version = "1.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "vector";
     tag = "v${version}";
-    hash = "sha256-KwxQ2sA8cdHmTRbh23H5iTexMlWK2MxdA8XWpXscpfU=";
+    hash = "sha256-U1ttxt7Ba+NrcbslmkZT/d+ZdXrmk0teT5vGAcfLqF4=";
   };
 
   build-system = [

From 15a236022357b55aaf35ab87b45e27449408414b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 18:52:42 +0000
Subject: [PATCH 1368/6226] signalbackup-tools: 20251015 -> 20251021

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

diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index fbee5740f382..2b8d0dcce12b 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "signalbackup-tools";
-  version = "20251015";
+  version = "20251021";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     tag = version;
-    hash = "sha256-/rqYM0KLBcvYt2lpkOZKipb/lpVtkUevGFNWVenPbOk=";
+    hash = "sha256-m9Mg55e9M/v+0ucW6RMNBnY4JLJGY43jwFWufpv2xSY=";
   };
 
   nativeBuildInputs = [

From 8a7a4d12a79f9bd3a6fd91e4b59e3cd329af8895 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 18:54:26 +0000
Subject: [PATCH 1369/6226] telegraf: 1.36.2 -> 1.36.3

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

diff --git a/pkgs/by-name/te/telegraf/package.nix b/pkgs/by-name/te/telegraf/package.nix
index 6dbb853a213f..4a165b103098 100644
--- a/pkgs/by-name/te/telegraf/package.nix
+++ b/pkgs/by-name/te/telegraf/package.nix
@@ -10,7 +10,7 @@
 
 buildGoModule rec {
   pname = "telegraf";
-  version = "1.36.2";
+  version = "1.36.3";
 
   subPackages = [ "cmd/telegraf" ];
 
@@ -18,10 +18,10 @@ buildGoModule rec {
     owner = "influxdata";
     repo = "telegraf";
     rev = "v${version}";
-    hash = "sha256-nIYAGsGYZUK5o1KqcH4bI3wPRRXCynN6N5T6f2oy2bo=";
+    hash = "sha256-aEMvBKDE+fbjXyvi3MkbV1/Bu0q4F7W7DPwTRUcWY8M=";
   };
 
-  vendorHash = "sha256-k4hI/qIQgV1qChOWDCqWcMboaVoDe3k/DP/wNa0Aqg4=";
+  vendorHash = "sha256-BofW6hvcpQb1OWTbfoS+o2RJg4N0zMqid1ergeVh/wM=";
   proxyVendor = true;
 
   ldflags = [

From 2c9e0d03147e1269129d694f43487f5e45782d32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 18:55:58 +0000
Subject: [PATCH 1370/6226] semantic-release: 25.0.0 -> 25.0.1

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

diff --git a/pkgs/by-name/se/semantic-release/package.nix b/pkgs/by-name/se/semantic-release/package.nix
index a8d5c57bd61c..7287e7a67d55 100644
--- a/pkgs/by-name/se/semantic-release/package.nix
+++ b/pkgs/by-name/se/semantic-release/package.nix
@@ -9,16 +9,16 @@
 
 buildNpmPackage rec {
   pname = "semantic-release";
-  version = "25.0.0";
+  version = "25.0.1";
 
   src = fetchFromGitHub {
     owner = "semantic-release";
     repo = "semantic-release";
     rev = "v${version}";
-    hash = "sha256-B+j84GeRw9YFMx8kTXPqqs57ClgZtziAh/BXh47WfVc=";
+    hash = "sha256-6OgqZh9OXITPwOtCD209H7KjPGf2MK/sCcrzZgpasyE=";
   };
 
-  npmDepsHash = "sha256-0eHK2FiRRzfvCrGag0/KDq/3nWZbwnM1FEhtKu4mrHE=";
+  npmDepsHash = "sha256-/Ba4udEUZAEfUmMcUHykkLGPvH9lr8Wxb+6FkJKYiWQ=";
 
   dontNpmBuild = true;
 

From 73e8a483e6baf2ff666d393b8396a02490ee6de6 Mon Sep 17 00:00:00 2001
From: Lukas Wurzinger <lukas@wrz.one>
Date: Tue, 21 Oct 2025 15:02:15 +0200
Subject: [PATCH 1371/6226] lib/cli: add toCommandLine

---
 doc/release-notes/rl-2511.section.md |   2 +
 lib/cli.nix                          | 191 ++++++++++++++++++++++++++-
 lib/tests/misc.nix                   |  80 +++++++++++
 3 files changed, 270 insertions(+), 3 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 81389bf97a8b..df2eb32e9ef1 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -360,3 +360,5 @@
   See the neovim help page [`:help startup`](https://neovim.io/doc/user/starting.html#startup) for more information, as well as [the nixpkgs neovim wrapper documentation](#neovim-custom-configuration).
 
 - `cloudflare-ddns`: Added package cloudflare-ddns.
+
+- `lib.cli.toCommandLine`, `lib.cli.toCommandLineShell`, `lib.cli.toCommandLineGNU` and `lib.cli.toCommandLineShellGNU` have been added to address multiple issues in `lib.cli.toGNUCommandLine` and `lib.cli.toGNUCommandLineShell`.
diff --git a/lib/cli.nix b/lib/cli.nix
index 590ba691d386..487f7f44e969 100644
--- a/lib/cli.nix
+++ b/lib/cli.nix
@@ -1,6 +1,6 @@
 { lib }:
 
-rec {
+{
   /**
     Automatically convert an attribute set to command-line options.
 
@@ -20,6 +20,7 @@ rec {
     : The attributes to transform into arguments.
 
     # Examples
+
     :::{.example}
     ## `lib.cli.toGNUCommandLineShell` usage example
 
@@ -38,7 +39,8 @@ rec {
 
     :::
   */
-  toGNUCommandLineShell = options: attrs: lib.escapeShellArgs (toGNUCommandLine options attrs);
+  toGNUCommandLineShell =
+    options: attrs: lib.escapeShellArgs (lib.cli.toGNUCommandLine options attrs);
 
   /**
     Automatically convert an attribute set to a list of command-line options.
@@ -55,7 +57,7 @@ rec {
 
     : The attributes to transform into arguments.
 
-    # Options
+    ## Options
 
     `mkOptionName`
 
@@ -85,6 +87,7 @@ rec {
     This is useful if the command requires equals, for example, `-c=5`.
 
     # Examples
+
     :::{.example}
     ## `lib.cli.toGNUCommandLine` usage example
 
@@ -145,4 +148,186 @@ rec {
 
     in
     builtins.concatLists (lib.mapAttrsToList render options);
+
+  /**
+    Converts the given attributes into a single shell-escaped command-line string.
+    Similar to `toCommandLineGNU`, but returns a single escaped string instead of an array of arguments.
+    For further reference see: [`lib.cli.toCommandLineGNU`](#function-library-lib.cli.toCommandLineGNU)
+  */
+  toCommandLineShellGNU =
+    options: attrs: lib.escapeShellArgs (lib.cli.toCommandLineGNU options attrs);
+
+  /**
+    Converts an attribute set into a list of GNU-style command line options.
+
+    `toCommandLineGNU` returns a list of string arguments.
+
+    # Inputs
+
+    `options`
+
+    : Options, see below.
+
+    `attrs`
+
+    : The attributes to transform into arguments.
+
+    ## Options
+
+    `isLong`
+
+    : A function that determines whether an option is long or short.
+
+    `explicitBool`
+
+    : Whether or not boolean option arguments should be formatted explicitly.
+
+    `formatArg`
+
+    : A function that turns the option argument into a string.
+
+    # Examples
+
+    :::{.example}
+    ## `lib.cli.toCommandLineGNU` usage example
+
+    ```nix
+    lib.cli.toCommandLineGNU {} {
+      v = true;
+      verbose = [true true false null];
+      i = ".bak";
+      testsuite = ["unit" "integration"];
+      e = ["s/a/b/" "s/b/c/"];
+      n = false;
+      data = builtins.toJSON {id = 0;};
+    }
+    => [
+      "--data={\"id\":0}"
+      "-es/a/b/"
+      "-es/b/c/"
+      "-i.bak"
+      "--testsuite=unit"
+      "--testsuite=integration"
+      "-v"
+      "--verbose"
+      "--verbose"
+    ]
+    ```
+
+    :::
+  */
+  toCommandLineGNU =
+    {
+      isLong ? optionName: builtins.stringLength optionName > 1,
+      explicitBool ? false,
+      formatArg ? lib.generators.mkValueStringDefault { },
+    }:
+    let
+      optionFormat = optionName: {
+        option = if isLong optionName then "--${optionName}" else "-${optionName}";
+        sep = if isLong optionName then "=" else "";
+        inherit explicitBool formatArg;
+      };
+    in
+    lib.cli.toCommandLine optionFormat;
+
+  /**
+    Converts the given attributes into a single shell-escaped command-line string.
+    Similar to `toCommandLine`, but returns a single escaped string instead of an array of arguments.
+    For further reference see: [`lib.cli.toCommandLine`](#function-library-lib.cli.toCommandLine)
+  */
+  toCommandLineShell =
+    optionFormat: attrs: lib.escapeShellArgs (lib.cli.toCommandLine optionFormat attrs);
+
+  /**
+    Converts an attribute set into a list of command line options.
+
+    `toCommandLine` returns a list of string arguments.
+
+    # Inputs
+
+    `optionFormat`
+
+    : The option format that describes how options and their arguments should be formatted.
+
+    `attrs`
+
+    : The attributes to transform into arguments.
+
+    # Examples
+    :::{.example}
+    ## `lib.cli.toCommandLine` usage example
+
+    ```nix
+    let
+      optionFormat = optionName: {
+        option = "-${optionName}";
+        sep = "=";
+        explicitBool = true;
+      };
+    in lib.cli.toCommandLine optionFormat {
+      v = true;
+      verbose = [true true false null];
+      i = ".bak";
+      testsuite = ["unit" "integration"];
+      e = ["s/a/b/" "s/b/c/"];
+      n = false;
+      data = builtins.toJSON {id = 0;};
+    }
+    => [
+      "-data={\"id\":0}"
+      "-e=s/a/b/"
+      "-e=s/b/c/"
+      "-i=.bak"
+      "-n=false"
+      "-testsuite=unit"
+      "-testsuite=integration"
+      "-v=true"
+      "-verbose=true"
+      "-verbose=true"
+      "-verbose=false"
+    ]
+    ```
+
+    :::
+  */
+  toCommandLine =
+    optionFormat: attrs:
+    let
+      handlePair =
+        k: v:
+        if k == "" then
+          lib.throw "lib.cli.toCommandLine only accepts non-empty option names."
+        else if builtins.isList v then
+          builtins.concatMap (handleOption k) v
+        else
+          handleOption k v;
+
+      handleOption = k: renderOption (optionFormat k) k;
+
+      renderOption =
+        {
+          option,
+          sep,
+          explicitBool,
+          formatArg ? lib.generators.mkValueStringDefault { },
+        }:
+        k: v:
+        if v == null || (!explicitBool && v == false) then
+          [ ]
+        else if !explicitBool && v == true then
+          [ option ]
+        else
+          let
+            arg = formatArg v;
+          in
+          if sep != null then
+            [ "${option}${sep}${arg}" ]
+          else
+            [
+              option
+              arg
+            ];
+    in
+    builtins.concatLists (lib.mapAttrsToList handlePair attrs);
 }
diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix
index 59fbb1ccd63b..d12c27c34bbc 100644
--- a/lib/tests/misc.nix
+++ b/lib/tests/misc.nix
@@ -3106,6 +3106,86 @@ runTests {
     expected = "-X PUT --data '{\"id\":0}' --retry 3 --url https://example.com/foo --url https://example.com/bar --verbose";
   };
 
+  testToCommandLine = {
+    expr =
+      let
+        optionFormat = optionName: {
+          option = "-${optionName}";
+          sep = "=";
+          explicitBool = true;
+        };
+      in
+      cli.toCommandLine optionFormat {
+        v = true;
+        verbose = [
+          true
+          true
+          false
+          null
+        ];
+        i = ".bak";
+        testsuite = [
+          "unit"
+          "integration"
+        ];
+        e = [
+          "s/a/b/"
+          "s/b/c/"
+        ];
+        n = false;
+        data = builtins.toJSON { id = 0; };
+      };
+
+    expected = [
+      "-data={\"id\":0}"
+      "-e=s/a/b/"
+      "-e=s/b/c/"
+      "-i=.bak"
+      "-n=false"
+      "-testsuite=unit"
+      "-testsuite=integration"
+      "-v=true"
+      "-verbose=true"
+      "-verbose=true"
+      "-verbose=false"
+    ];
+  };
+
+  testToCommandLineGNU = {
+    expr = cli.toCommandLineGNU { } {
+      v = true;
+      verbose = [
+        true
+        true
+        false
+        null
+      ];
+      i = ".bak";
+      testsuite = [
+        "unit"
+        "integration"
+      ];
+      e = [
+        "s/a/b/"
+        "s/b/c/"
+      ];
+      n = false;
+      data = builtins.toJSON { id = 0; };
+    };
+
+    expected = [
+      "--data={\"id\":0}"
+      "-es/a/b/"
+      "-es/b/c/"
+      "-i.bak"
+      "--testsuite=unit"
+      "--testsuite=integration"
+      "-v"
+      "--verbose"
+      "--verbose"
+    ];
+  };
+
   testSanitizeDerivationNameLeadingDots = testSanitizeDerivationName {
     name = "..foo";
     expected = "foo";

From 1f4c50ab8116b151fb9a007b2dbf46decd7a1483 Mon Sep 17 00:00:00 2001
From: Lukas Wurzinger <lukas@wrz.one>
Date: Tue, 21 Oct 2025 15:02:59 +0200
Subject: [PATCH 1372/6226] lib/cli: deprecate toGNUCommandLine

---
 doc/release-notes/rl-2511.section.md          |  2 +
 lib/cli.nix                                   | 66 ++++++++++---------
 nixos/modules/hardware/printers.nix           |  2 +-
 .../services/finance/libeufin/common.nix      |  6 +-
 nixos/modules/services/hardware/undervolt.nix |  2 +-
 .../services/home-automation/ebusd.nix        |  2 +-
 nixos/modules/services/mail/mailpit.nix       |  2 +-
 nixos/modules/services/misc/paperless.nix     |  2 +-
 .../services/networking/gns3-server.nix       |  2 +-
 .../services/networking/hylafax/systemd.nix   | 12 ++--
 nixos/modules/services/networking/newt.nix    |  2 +-
 .../modules/services/networking/syncthing.nix |  2 +-
 .../modules/services/networking/wstunnel.nix  |  2 +-
 nixos/modules/services/security/tsidp.nix     |  2 +-
 nixos/modules/services/system/earlyoom.nix    |  2 +-
 nixos/modules/services/system/self-deploy.nix |  2 +-
 .../services/web-apps/c2fmzq-server.nix       |  6 +-
 .../services/web-apps/libretranslate.nix      |  2 +-
 nixos/modules/services/web-apps/zitadel.nix   |  2 +-
 .../modules/services/web-servers/fcgiwrap.nix |  2 +-
 .../system/boot/systemd/journald-gateway.nix  |  2 +-
 .../system/boot/systemd/journald-remote.nix   |  2 +-
 nixos/modules/virtualisation/containerd.nix   |  2 +-
 .../virtualisation/virtualbox-image.nix       |  4 +-
 pkgs/build-support/writers/scripts.nix        |  8 ++-
 pkgs/by-name/an/antora/test/default.nix       |  2 +-
 pkgs/by-name/li/lightway/package.nix          |  2 +-
 .../dhall/build-dhall-package.nix             |  2 +-
 28 files changed, 81 insertions(+), 65 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index df2eb32e9ef1..6793072fcf79 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -353,6 +353,8 @@
   - `number`
   - `numbers.*`
 
+- `lib.cli.toGNUCommandLine` and `lib.cli.toGNUCommandLineShell` have been deprecated in favor of `lib.cli.toCommandLine`, `lib.cli.toCommandLineShell`, `lib.cli.toCommandLineGNU` and `lib.cli.toCommandLineShellGNU`.
+
 ### Additions and Improvements {#sec-nixpkgs-release-25.11-lib-additions-improvements}
 
 - `neovim`: Added support for the `vim.o.exrc` option, the `VIMINIT` environment variable, and sourcing of `sysinit.vim`.
diff --git a/lib/cli.nix b/lib/cli.nix
index 487f7f44e969..f0ebeb76c4c2 100644
--- a/lib/cli.nix
+++ b/lib/cli.nix
@@ -40,7 +40,9 @@
     :::
   */
   toGNUCommandLineShell =
-    options: attrs: lib.escapeShellArgs (lib.cli.toGNUCommandLine options attrs);
+    lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2511)
+      "lib.cli.toGNUCommandLineShell is deprecated, please use lib.cli.toCommandLineShell or lib.cli.toCommandLineShellGNU instead."
+      (options: attrs: lib.escapeShellArgs (lib.cli.toGNUCommandLine options attrs));
 
   /**
     Automatically convert an attribute set to a list of command-line options.
@@ -114,40 +116,44 @@
     :::
   */
   toGNUCommandLine =
-    {
-      mkOptionName ? k: if builtins.stringLength k == 1 then "-${k}" else "--${k}",
+    lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2511)
+      "lib.cli.toGNUCommandLine is deprecated, please use lib.cli.toCommandLine or lib.cli.toCommandLineShellGNU instead."
+      (
+        {
+          mkOptionName ? k: if builtins.stringLength k == 1 then "-${k}" else "--${k}",
 
-      mkBool ? k: v: lib.optional v (mkOptionName k),
+          mkBool ? k: v: lib.optional v (mkOptionName k),
 
-      mkList ? k: v: lib.concatMap (mkOption k) v,
+          mkList ? k: v: lib.concatMap (mkOption k) v,
 
-      mkOption ?
-        k: v:
-        if v == null then
-          [ ]
-        else if optionValueSeparator == null then
-          [
-            (mkOptionName k)
-            (lib.generators.mkValueStringDefault { } v)
-          ]
-        else
-          [ "${mkOptionName k}${optionValueSeparator}${lib.generators.mkValueStringDefault { } v}" ],
+          mkOption ?
+            k: v:
+            if v == null then
+              [ ]
+            else if optionValueSeparator == null then
+              [
+                (mkOptionName k)
+                (lib.generators.mkValueStringDefault { } v)
+              ]
+            else
+              [ "${mkOptionName k}${optionValueSeparator}${lib.generators.mkValueStringDefault { } v}" ],
 
-      optionValueSeparator ? null,
-    }:
-    options:
-    let
-      render =
-        k: v:
-        if builtins.isBool v then
-          mkBool k v
-        else if builtins.isList v then
-          mkList k v
-        else
-          mkOption k v;
+          optionValueSeparator ? null,
+        }:
+        options:
+        let
+          render =
+            k: v:
+            if builtins.isBool v then
+              mkBool k v
+            else if builtins.isList v then
+              mkList k v
+            else
+              mkOption k v;
 
-    in
-    builtins.concatLists (lib.mapAttrsToList render options);
+        in
+        builtins.concatLists (lib.mapAttrsToList render options)
+      );
 
   /**
     Converts the given attributes into a single shell-escaped command-line string.
diff --git a/nixos/modules/hardware/printers.nix b/nixos/modules/hardware/printers.nix
index 8dbfea78a516..23f656579fe6 100644
--- a/nixos/modules/hardware/printers.nix
+++ b/nixos/modules/hardware/printers.nix
@@ -10,7 +10,7 @@ let
   ensurePrinter =
     p:
     let
-      args = lib.cli.toGNUCommandLineShell { } (
+      args = lib.cli.toCommandLineShellGNU { } (
         {
           p = p.name;
           v = p.deviceUri;
diff --git a/nixos/modules/services/finance/libeufin/common.nix b/nixos/modules/services/finance/libeufin/common.nix
index 71133248d607..461a96940123 100644
--- a/nixos/modules/services/finance/libeufin/common.nix
+++ b/nixos/modules/services/finance/libeufin/common.nix
@@ -48,7 +48,7 @@ libeufinComponent:
             DynamicUser = true;
             ExecStart =
               let
-                args = lib.cli.toGNUCommandLineShell { } {
+                args = lib.cli.toCommandLineShellGNU { } {
                   c = configFile;
                   L = if cfg.debug then "debug" else null;
                 };
@@ -80,7 +80,7 @@ libeufinComponent:
             initialAccountRegistration = lib.concatMapStringsSep "\n" (
               account:
               let
-                args = lib.cli.toGNUCommandLineShell { } {
+                args = lib.cli.toCommandLineShellGNU { } {
                   c = configFile;
                   inherit (account) username password name;
                   payto_uri = "payto://x-taler-bank/${bankHost}/${account.username}?receiver-name=${account.name}";
@@ -90,7 +90,7 @@ libeufinComponent:
               "${lib.getExe' cfg.package "libeufin-bank"} create-account ${args}"
             ) cfg.initialAccounts;
 
-            args = lib.cli.toGNUCommandLineShell { } {
+            args = lib.cli.toCommandLineShellGNU { } {
               c = configFile;
               L = if cfg.debug then "debug" else null;
             };
diff --git a/nixos/modules/services/hardware/undervolt.nix b/nixos/modules/services/hardware/undervolt.nix
index 5a8ad9806ef1..dd020181a6fe 100644
--- a/nixos/modules/services/hardware/undervolt.nix
+++ b/nixos/modules/services/hardware/undervolt.nix
@@ -16,7 +16,7 @@ let
         limit != null && window != null
       ) "Both power limit and window must be set";
       "${toString limit} ${toString window}";
-  cliArgs = lib.cli.toGNUCommandLine { } {
+  cliArgs = lib.cli.toCommandLineGNU { } {
     inherit (cfg)
       verbose
       temp
diff --git a/nixos/modules/services/home-automation/ebusd.nix b/nixos/modules/services/home-automation/ebusd.nix
index 3b98408ec9cc..7ee7d0751303 100644
--- a/nixos/modules/services/home-automation/ebusd.nix
+++ b/nixos/modules/services/home-automation/ebusd.nix
@@ -170,7 +170,7 @@ in
         serviceConfig = {
           ExecStart =
             let
-              args = lib.cli.toGNUCommandLineShell { optionValueSeparator = "="; } (
+              args = lib.cli.toCommandLineShellGNU { } (
                 lib.foldr (a: b: a // b) { } [
                   {
                     inherit (cfg)
diff --git a/nixos/modules/services/mail/mailpit.nix b/nixos/modules/services/mail/mailpit.nix
index 6bc368e91f5f..c3b888f15c9b 100644
--- a/nixos/modules/services/mail/mailpit.nix
+++ b/nixos/modules/services/mail/mailpit.nix
@@ -22,7 +22,7 @@ let
 
   isNonNull = v: v != null;
   genCliFlags =
-    settings: concatStringsSep " " (cli.toGNUCommandLine { } (filterAttrs (const isNonNull) settings));
+    settings: concatStringsSep " " (cli.toCommandLineGNU { } (filterAttrs (const isNonNull) settings));
 in
 {
   options.services.mailpit.instances = mkOption {
diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix
index 8ab3372c75d7..14bb792790a7 100644
--- a/nixos/modules/services/misc/paperless.nix
+++ b/nixos/modules/services/misc/paperless.nix
@@ -686,7 +686,7 @@ in
           path = [ manage ];
           script = ''
             paperless-manage document_exporter ${cfg.exporter.directory} ${
-              lib.cli.toGNUCommandLineShell { } cfg.exporter.settings
+              lib.cli.toCommandLineShellGNU { } cfg.exporter.settings
             }
           '';
         };
diff --git a/nixos/modules/services/networking/gns3-server.nix b/nixos/modules/services/networking/gns3-server.nix
index 21679a3d8364..6d69090744be 100644
--- a/nixos/modules/services/networking/gns3-server.nix
+++ b/nixos/modules/services/networking/gns3-server.nix
@@ -187,7 +187,7 @@ in
 
       systemd.services.gns3-server =
         let
-          commandArgs = lib.cli.toGNUCommandLineShell { } {
+          commandArgs = lib.cli.toCommandLineShellGNU { } {
             config = "/etc/gns3/gns3_server.conf";
             pid = "/run/gns3/server.pid";
             log = cfg.log.file;
diff --git a/nixos/modules/services/networking/hylafax/systemd.nix b/nixos/modules/services/networking/hylafax/systemd.nix
index d0cc0f230278..d08c08e6ec42 100644
--- a/nixos/modules/services/networking/hylafax/systemd.nix
+++ b/nixos/modules/services/networking/hylafax/systemd.nix
@@ -14,7 +14,13 @@ let
     mkMerge
     optional
     ;
-  inherit (lib.cli) toGNUCommandLine;
+  inherit (lib.cli) toCommandLine;
+
+  optionFormat = optionName: {
+    option = "-${optionName}";
+    sep = null;
+    explicitBool = false;
+  };
 
   cfg = config.services.hylafax;
   mapModems = lib.forEach (lib.attrValues cfg.modems);
@@ -23,9 +29,7 @@ let
     prefix: program: posArg: options:
     let
       start = "${prefix}${cfg.package}/spool/bin/${program}";
-      optionsList = toGNUCommandLine { mkOptionName = k: "-${k}"; } (
-        { q = cfg.spoolAreaPath; } // options
-      );
+      optionsList = toCommandLine optionFormat ({ q = cfg.spoolAreaPath; } // options);
       posArgList = optional (posArg != null) posArg;
     in
     "${start} ${escapeShellArgs (optionsList ++ posArgList)}";
diff --git a/nixos/modules/services/networking/newt.nix b/nixos/modules/services/networking/newt.nix
index bc2d1cc001a9..9caa45351958 100644
--- a/nixos/modules/services/networking/newt.nix
+++ b/nixos/modules/services/networking/newt.nix
@@ -83,7 +83,7 @@ in
       };
       # the flag values will all be overwritten if also defined in the env file
       serviceConfig = {
-        ExecStart = "${lib.getExe cfg.package} ${lib.cli.toGNUCommandLineShell { } cfg.settings}";
+        ExecStart = "${lib.getExe cfg.package} ${lib.cli.toCommandLineShellGNU { } cfg.settings}";
         DynamicUser = true;
         StateDirectory = "newt";
         StateDirectoryMode = "0700";
diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix
index 645852b646d3..f1fcaf855e96 100644
--- a/nixos/modules/services/networking/syncthing.nix
+++ b/nixos/modules/services/networking/syncthing.nix
@@ -947,7 +947,7 @@ in
           ExecStart =
             let
               args = lib.escapeShellArgs (
-                (lib.cli.toGNUCommandLine { } {
+                (lib.cli.toCommandLineGNU { } {
                   "no-browser" = true;
                   "gui-address" = (if isUnixGui then "unix://" else "") + cfg.guiAddress;
                   "config" = cfg.configDir;
diff --git a/nixos/modules/services/networking/wstunnel.nix b/nixos/modules/services/networking/wstunnel.nix
index ce6195ec1011..8d20b37eeea8 100644
--- a/nixos/modules/services/networking/wstunnel.nix
+++ b/nixos/modules/services/networking/wstunnel.nix
@@ -26,7 +26,7 @@ let
         str
         (listOf str)
       ]);
-    generate = lib.cli.toGNUCommandLineShell { };
+    generate = lib.cli.toCommandLineShellGNU { };
   };
 
   hostPortToString = { host, port, ... }: "${host}:${toString port}";
diff --git a/nixos/modules/services/security/tsidp.nix b/nixos/modules/services/security/tsidp.nix
index 4b854cf183ca..5d1a32522875 100644
--- a/nixos/modules/services/security/tsidp.nix
+++ b/nixos/modules/services/security/tsidp.nix
@@ -164,7 +164,7 @@ in
           Type = "simple";
           ExecStart =
             let
-              args = lib.cli.toGNUCommandLineShell { mkOptionName = k: "-${k}"; } {
+              args = lib.cli.toCommandLineShellGNU { } {
                 dir = stateDir;
                 hostname = cfg.settings.hostName;
                 port = cfg.settings.port;
diff --git a/nixos/modules/services/system/earlyoom.nix b/nixos/modules/services/system/earlyoom.nix
index 674e075b9ad4..f52c4b4fb4e2 100644
--- a/nixos/modules/services/system/earlyoom.nix
+++ b/nixos/modules/services/system/earlyoom.nix
@@ -179,7 +179,7 @@ in
       serviceConfig.EnvironmentFile = "";
 
       environment.EARLYOOM_ARGS =
-        lib.cli.toGNUCommandLineShell { } {
+        lib.cli.toCommandLineShellGNU { } {
           m =
             "${toString cfg.freeMemThreshold}"
             + optionalString (cfg.freeMemKillThreshold != null) ",${toString cfg.freeMemKillThreshold}";
diff --git a/nixos/modules/services/system/self-deploy.nix b/nixos/modules/services/system/self-deploy.nix
index 4f11e8df18ad..bde3ac811569 100644
--- a/nixos/modules/services/system/self-deploy.nix
+++ b/nixos/modules/services/system/self-deploy.nix
@@ -179,7 +179,7 @@ in
         ${gitWithRepo} checkout FETCH_HEAD
 
         nix-build${renderNixArgs cfg.nixArgs} ${
-          lib.cli.toGNUCommandLineShell { } {
+          lib.cli.toCommandLineShellGNU { } {
             attr = cfg.nixAttribute;
             out-link = outPath;
           }
diff --git a/nixos/modules/services/web-apps/c2fmzq-server.nix b/nixos/modules/services/web-apps/c2fmzq-server.nix
index f1935e05407f..a7622d384cf3 100644
--- a/nixos/modules/services/web-apps/c2fmzq-server.nix
+++ b/nixos/modules/services/web-apps/c2fmzq-server.nix
@@ -25,10 +25,8 @@ let
           str
         ])
       );
-    generate = lib.cli.toGNUCommandLineShell {
-      mkBool = k: v: [
-        "--${k}=${if v then "true" else "false"}"
-      ];
+    generate = lib.cli.toCommandLineShellGNU {
+      explicitBool = true;
     };
   };
 in
diff --git a/nixos/modules/services/web-apps/libretranslate.nix b/nixos/modules/services/web-apps/libretranslate.nix
index 1664b9ef4581..5ac68ad3c919 100644
--- a/nixos/modules/services/web-apps/libretranslate.nix
+++ b/nixos/modules/services/web-apps/libretranslate.nix
@@ -146,7 +146,7 @@ in
           Type = "simple";
           ExecStart = ''
             ${cfg.package}/bin/libretranslate ${
-              lib.cli.toGNUCommandLineShell { } (
+              lib.cli.toCommandLineShellGNU { } (
                 cfg.extraArgs
                 // {
                   inherit (cfg) host port threads;
diff --git a/nixos/modules/services/web-apps/zitadel.nix b/nixos/modules/services/web-apps/zitadel.nix
index c097d36d9039..6cfd1bbd4680 100644
--- a/nixos/modules/services/web-apps/zitadel.nix
+++ b/nixos/modules/services/web-apps/zitadel.nix
@@ -207,7 +207,7 @@ in
         configFile = settingsFormat.generate "config.yaml" cfg.settings;
         stepsFile = settingsFormat.generate "steps.yaml" cfg.steps;
 
-        args = lib.cli.toGNUCommandLineShell { } {
+        args = lib.cli.toCommandLineShellGNU { } {
           config = cfg.extraSettingsPaths ++ [ configFile ];
           steps = cfg.extraStepsPaths ++ [ stepsFile ];
           masterkeyFile = cfg.masterKeyFile;
diff --git a/nixos/modules/services/web-servers/fcgiwrap.nix b/nixos/modules/services/web-servers/fcgiwrap.nix
index 992f4a46ff4b..493cd710c1bb 100644
--- a/nixos/modules/services/web-servers/fcgiwrap.nix
+++ b/nixos/modules/services/web-servers/fcgiwrap.nix
@@ -151,7 +151,7 @@ in
       serviceConfig = {
         ExecStart = ''
           ${pkgs.fcgiwrap}/sbin/fcgiwrap ${
-            cli.toGNUCommandLineShell { } (
+            cli.toCommandLineShellGNU { } (
               {
                 c = cfg.process.prefork;
               }
diff --git a/nixos/modules/system/boot/systemd/journald-gateway.nix b/nixos/modules/system/boot/systemd/journald-gateway.nix
index b6cf300d3bfb..f0d80077e6d6 100644
--- a/nixos/modules/system/boot/systemd/journald-gateway.nix
+++ b/nixos/modules/system/boot/systemd/journald-gateway.nix
@@ -8,7 +8,7 @@
 let
   cfg = config.services.journald.gateway;
 
-  cliArgs = lib.cli.toGNUCommandLineShell { } {
+  cliArgs = lib.cli.toCommandLineShellGNU { } {
     # If either of these are null / false, they are not passed in the command-line
     inherit (cfg)
       cert
diff --git a/nixos/modules/system/boot/systemd/journald-remote.nix b/nixos/modules/system/boot/systemd/journald-remote.nix
index 89baf421f591..7216c179b3a0 100644
--- a/nixos/modules/system/boot/systemd/journald-remote.nix
+++ b/nixos/modules/system/boot/systemd/journald-remote.nix
@@ -9,7 +9,7 @@ let
   cfg = config.services.journald.remote;
   format = pkgs.formats.systemd { };
 
-  cliArgs = lib.cli.toGNUCommandLineShell { } {
+  cliArgs = lib.cli.toCommandLineShellGNU { } {
     inherit (cfg) output;
     # "-3" specifies the file descriptor from the .socket unit.
     "listen-${cfg.listen}" = "-3";
diff --git a/nixos/modules/virtualisation/containerd.nix b/nixos/modules/virtualisation/containerd.nix
index 9e061f851126..c43db34dbf99 100644
--- a/nixos/modules/virtualisation/containerd.nix
+++ b/nixos/modules/virtualisation/containerd.nix
@@ -90,7 +90,7 @@ in
         ++ lib.optional config.boot.zfs.enabled config.boot.zfs.package;
       serviceConfig = {
         ExecStart = ''${pkgs.containerd}/bin/containerd ${
-          lib.concatStringsSep " " (lib.cli.toGNUCommandLine { } cfg.args)
+          lib.concatStringsSep " " (lib.cli.toCommandLineGNU { } cfg.args)
         }'';
         Delegate = "yes";
         KillMode = "process";
diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix
index 04d36c9ce82f..25de9ac0ce86 100644
--- a/nixos/modules/virtualisation/virtualbox-image.nix
+++ b/nixos/modules/virtualisation/virtualbox-image.nix
@@ -252,8 +252,8 @@ in
           --ostype ${if pkgs.stdenv.hostPlatform.system == "x86_64-linux" then "Linux26_64" else "Linux26"}
         VBoxManage modifyvm "$vmName" \
           --memory ${toString cfg.memorySize} \
-          ${lib.cli.toGNUCommandLineShell { } cfg.params}
-        VBoxManage storagectl "$vmName" ${lib.cli.toGNUCommandLineShell { } cfg.storageController}
+          ${lib.cli.toCommandLineShellGNU { } cfg.params}
+        VBoxManage storagectl "$vmName" ${lib.cli.toCommandLineShellGNU { } cfg.storageController}
         VBoxManage storageattach "$vmName" --storagectl ${cfg.storageController.name} --port 0 --device 0 --type hdd \
           --medium disk.vdi
         ${lib.optionalString (cfg.extraDisk != null) ''
diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix
index bd4e9209ce67..8f2110bdfa58 100644
--- a/pkgs/build-support/writers/scripts.nix
+++ b/pkgs/build-support/writers/scripts.nix
@@ -812,7 +812,13 @@ rec {
       strip ? true,
     }:
     let
-      nimCompileCmdArgs = lib.cli.toGNUCommandLineShell { optionValueSeparator = ":"; } (
+      optionFormat = optionName: {
+        option = "--${optionName}";
+        sep = ":";
+        explicitBool = false;
+      };
+
+      nimCompileCmdArgs = lib.cli.toCommandLineShell optionFormat (
         {
           d = "release";
           nimcache = ".";
diff --git a/pkgs/by-name/an/antora/test/default.nix b/pkgs/by-name/an/antora/test/default.nix
index ce5e0d5f50bb..b473a87b1434 100644
--- a/pkgs/by-name/an/antora/test/default.nix
+++ b/pkgs/by-name/an/antora/test/default.nix
@@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation {
       # The --to-dir and --ui-bundle-url options are not included in the
       # playbook due to Antora and Nix limitations.
       antora ${
-        lib.cli.toGNUCommandLineShell { } {
+        lib.cli.toCommandLineShellGNU { } {
           cache-dir = "$(mktemp --directory)";
           extension = if antora-lunr-extension-test then antora-lunr-extension else false;
           to-dir = placeholder "out";
diff --git a/pkgs/by-name/li/lightway/package.nix b/pkgs/by-name/li/lightway/package.nix
index 0bf4c6a92840..82c22ee4df25 100644
--- a/pkgs/by-name/li/lightway/package.nix
+++ b/pkgs/by-name/li/lightway/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
 
   cargoHash = "sha256-RFlac10XFJXT3Giayy31kZ3Nn1Q+YsPt/zCdkSV0Atk=";
 
-  cargoBuildFlags = lib.cli.toGNUCommandLine { } {
+  cargoBuildFlags = lib.cli.toCommandLineGNU { } {
     package = [
       "lightway-client"
       "lightway-server"
diff --git a/pkgs/development/interpreters/dhall/build-dhall-package.nix b/pkgs/development/interpreters/dhall/build-dhall-package.nix
index 214fe7f92d28..3ce1c8fceb75 100644
--- a/pkgs/development/interpreters/dhall/build-dhall-package.nix
+++ b/pkgs/development/interpreters/dhall/build-dhall-package.nix
@@ -101,7 +101,7 @@ runCommand name { inherit dependencies; } ''
     mkdir -p $out/${dataDhall}
 
     XDG_DATA_HOME=$out/${data} ${dhall-docs}/bin/dhall-docs --output-link $out/docs ${
-      lib.cli.toGNUCommandLineShell { } {
+      lib.cli.toCommandLineShellGNU { } {
         base-import-url = baseImportUrl;
 
         input = documentationRoot;

From e13e7916f16ee18fa1aa5a7e0ce28323ff320a00 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 19:01:49 +0000
Subject: [PATCH 1373/6226] rqlite: 9.1.2 -> 9.1.3

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

diff --git a/pkgs/by-name/rq/rqlite/package.nix b/pkgs/by-name/rq/rqlite/package.nix
index 957d68a1ed3e..7cdba738aec7 100644
--- a/pkgs/by-name/rq/rqlite/package.nix
+++ b/pkgs/by-name/rq/rqlite/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "rqlite";
-  version = "9.1.2";
+  version = "9.1.3";
 
   src = fetchFromGitHub {
     owner = "rqlite";
     repo = "rqlite";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7QAJofhssL2N5szD4j9rcv830sEnMyrS2Mg4s4G33HI=";
+    hash = "sha256-BybfZio4SSlpTbNHWfiA/2lVcNXhKWaBNTEoCSDxMSE=";
   };
 
-  vendorHash = "sha256-zGAC7yDccfhZ+2WeiN9DAsOFTa3j4ymPxeFNwam7+Ts=";
+  vendorHash = "sha256-bkAlZT0bntSdVwioEaqBK7XObGwJuIG7tfF7XOr3lKQ=";
 
   subPackages = [
     "cmd/rqlite"

From dbd6a2c73f5fc2a4d471a497a1290652c3a373e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 19:04:33 +0000
Subject: [PATCH 1374/6226] reaper-go: 0.2.3 -> 0.2.5

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

diff --git a/pkgs/by-name/re/reaper-go/package.nix b/pkgs/by-name/re/reaper-go/package.nix
index acc4e9969f8f..77113341467b 100644
--- a/pkgs/by-name/re/reaper-go/package.nix
+++ b/pkgs/by-name/re/reaper-go/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "reaper-go";
-  version = "0.2.3";
+  version = "0.2.5";
 
   src = fetchFromGitHub {
     owner = "ghostsecurity";
     repo = "reaper";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NXRqKO76RoxEvR7slMmUDdesRFMxDJpX/IGxoTDwJVU=";
+    hash = "sha256-3kTGlGvuTSB3KOeQvhF/pNaWVU153qGqqskJd+G6FF4=";
   };
 
-  vendorHash = "sha256-PxZ+fx5wkYuggMfpTfkc8quSssCzXdIcwjdR4qhDbqE=";
+  vendorHash = "sha256-T9qTfGRLhlYrezraRRztZC2Kw4L6Fap1YQgQdnlxKhE=";
 
   ldflags = [
     "-s"

From c9142c94f5850b331ad4dbcf2f8dbec479ba5c54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 19:05:19 +0000
Subject: [PATCH 1375/6226] rucio: 38.3.0 -> 38.4.0

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

diff --git a/pkgs/development/python-modules/rucio/default.nix b/pkgs/development/python-modules/rucio/default.nix
index 70eb5045bc8e..78681732514d 100644
--- a/pkgs/development/python-modules/rucio/default.nix
+++ b/pkgs/development/python-modules/rucio/default.nix
@@ -40,13 +40,13 @@
 }:
 
 let
-  version = "38.3.0";
+  version = "38.4.0";
 
   src = fetchFromGitHub {
     owner = "rucio";
     repo = "rucio";
     tag = version;
-    hash = "sha256-hMFWydOWfpRooOVd1wJ5jDWsdvF2oT1n/SlLj3CM9Qs=";
+    hash = "sha256-PGBVStSLyNHbW8vmx7enxsqaw7KRMzR2HPXun9GMPQY=";
   };
 in
 buildPythonPackage {

From 87a7f0217fd3bdcf3f376cae5556b291eda7c465 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 16:09:03 -0300
Subject: [PATCH 1376/6226] libitl: fix build with cmake4

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

diff --git a/pkgs/by-name/li/libitl/package.nix b/pkgs/by-name/li/libitl/package.nix
index ce6c87b115ee..0a478041dfef 100644
--- a/pkgs/by-name/li/libitl/package.nix
+++ b/pkgs/by-name/li/libitl/package.nix
@@ -18,6 +18,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-bhejnA7FfuopR27heliaE/vNd1Rqvnjj3n/vkjmimAw=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Islamic Tools and Libraries (ITL)";
     longDescription = ''

From 436f35019305d061112137b53d2f6f6662f15f21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Tue, 21 Oct 2025 21:10:36 +0200
Subject: [PATCH 1377/6226] Crystal 1.18.2

---
 pkgs/development/compilers/crystal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix
index 53d51fb3e810..30c53688cbeb 100644
--- a/pkgs/development/compilers/crystal/default.nix
+++ b/pkgs/development/compilers/crystal/default.nix
@@ -326,8 +326,8 @@ rec {
   };
 
   crystal_1_18 = generic {
-    version = "1.18.1";
-    sha256 = "sha256-6bJnonQyPtWIl1ex1tw3QercDl4ZQcvuVNYiWzMpGZ0=";
+    version = "1.18.2";
+    sha256 = "sha256-bwKs9bwD1WfS95DSxVY5AjT5Q61jOsfAH897tmiurng=";
     binary = binaryCrystal_1_10;
     llvmPackages = llvmPackages_21;
     doCheck = false;

From 401adf55dfc9ce41ad8366b93f348d1690f71e7f Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 21 Oct 2025 20:04:55 +0200
Subject: [PATCH 1378/6226] sigsum: init at 0.11.2

---
 pkgs/by-name/si/sigsum/package.nix | 51 ++++++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 pkgs/by-name/si/sigsum/package.nix

diff --git a/pkgs/by-name/si/sigsum/package.nix b/pkgs/by-name/si/sigsum/package.nix
new file mode 100644
index 000000000000..03bf0d55345b
--- /dev/null
+++ b/pkgs/by-name/si/sigsum/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitLab,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "sigsum";
+  version = "0.11.2";
+
+  src = fetchFromGitLab {
+    domain = "git.glasklar.is";
+    group = "sigsum";
+    owner = "core";
+    repo = "sigsum-go";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-oaYquy0N8yHfKLoNEv8Vte3dpp/UQFZ74mZHin8dDzw=";
+  };
+
+  postPatch = ''
+    substituteInPlace internal/version/version.go \
+      --replace-fail "info.Main.Version" '"${finalAttrs.version}"'
+  '';
+
+  vendorHash = "sha256-8Tyhd13PRTO2dGOdhkgYmwsVzWfqwOpZ9XSsAtiCcyM=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  excludedPackages = [ "./test" ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/sigsum-key";
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "System for public and transparent logging of signed checksums";
+    homepage = "https://www.sigsum.org/";
+    downloadPage = "https://git.glasklar.is/sigsum/core/sigsum-go";
+    changelog = "https://git.glasklar.is/sigsum/core/sigsum-go/-/blob/v${finalAttrs.version}/NEWS";
+    license = lib.licenses.bsd2;
+    maintainers = with lib.maintainers; [ defelo ];
+  };
+})

From fe86104664bad6014dccc79e5759e19cc09d4676 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 21 Oct 2025 12:03:49 -0700
Subject: [PATCH 1379/6226] jupyter-server: mark tests that fail on all darwin,
 not just x86

---
 pkgs/development/python-modules/jupyter-server/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/jupyter-server/default.nix b/pkgs/development/python-modules/jupyter-server/default.nix
index 195813ddf7fd..ae7d77d47eda 100644
--- a/pkgs/development/python-modules/jupyter-server/default.nix
+++ b/pkgs/development/python-modules/jupyter-server/default.nix
@@ -111,6 +111,8 @@ buildPythonPackage rec {
     "test_delete"
     # Insufficient access privileges for operation
     "test_regression_is_hidden"
+    # Fails under load (which causes failure on Hydra)
+    "test_execution_state"
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     # Failed: DID NOT RAISE <class 'tornado.web.HTTPError'>
@@ -120,7 +122,6 @@ buildPythonPackage rec {
     # TypeError: the JSON object must be str, bytes or bytearray, not NoneType
     "test_terminal_create_with_cwd"
     # Fails under load (which causes failure on Hydra)
-    "test_execution_state"
     "test_cull_connected"
   ];
 

From 6e46b015a4307017cc5eb21edcac9666cdd004b3 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 16:25:40 -0300
Subject: [PATCH 1380/6226] libjson-rpc-cpp: fix build with cmake4

---
 pkgs/by-name/li/libjson-rpc-cpp/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/li/libjson-rpc-cpp/package.nix b/pkgs/by-name/li/libjson-rpc-cpp/package.nix
index b2e3417c0920..39b88c637d67 100644
--- a/pkgs/by-name/li/libjson-rpc-cpp/package.nix
+++ b/pkgs/by-name/li/libjson-rpc-cpp/package.nix
@@ -50,6 +50,10 @@ stdenv.mkDerivation rec {
     done
 
     sed -i -re 's#MATCHES "jsoncpp"#MATCHES ".*/jsoncpp/json$"#g' cmake/FindJsoncpp.cmake
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_policy(SET CMP0042 OLD)" ""
   '';
 
   preConfigure = ''

From 8703905b226eedc7d5c8bb360cd4e24283b5ea8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 19:33:56 +0000
Subject: [PATCH 1381/6226] google-chrome: 141.0.7390.107 -> 141.0.7390.122

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

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index fbf2b103a7ec..e9d941a6a651 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -170,11 +170,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "141.0.7390.107";
+    version = "141.0.7390.122";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-dNc4pUaqghgMxibOpHn3p2H/85ByqpPDRYpUWXX7ZzU=";
+      hash = "sha256-svzUxJiw5ldHwl413QV+9Egixes8D7tEmqFU+k94mlA=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -272,11 +272,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "141.0.7390.108";
+    version = "141.0.7390.123";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/mevrk534jr6le7rbu7gatnuxym_141.0.7390.108/GoogleChrome-141.0.7390.108.dmg";
-      hash = "sha256-gMWPUPyHV0HvNkMuk10Kii7IrNMaA0etTPhcddDSDGE=";
+      url = "http://dl.google.com/release2/chrome/adavkzngpjaayzmntr45fwn25nyq_141.0.7390.123/GoogleChrome-141.0.7390.123.dmg";
+      hash = "sha256-06sXHnSG2x8+OSbgXcPsErgdmjypIlbylrb61Du6j7U=";
     };
 
     dontPatch = true;

From 345a318c5a533eac2d6cddddb40623429c2f286d Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 16:39:49 -0300
Subject: [PATCH 1382/6226] libnghttp2_asio: fix build with cmake4

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

diff --git a/pkgs/by-name/li/libnghttp2_asio/package.nix b/pkgs/by-name/li/libnghttp2_asio/package.nix
index 4fe8889e16b2..490566fde01f 100644
--- a/pkgs/by-name/li/libnghttp2_asio/package.nix
+++ b/pkgs/by-name/li/libnghttp2_asio/package.nix
@@ -35,6 +35,11 @@ stdenv.mkDerivation {
     openssl
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "High level HTTP/2 C++ library";
     longDescription = ''

From 37a26664be18ec09507095c889cd54adc2fa29ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Oct 2025 12:43:09 -0700
Subject: [PATCH 1383/6226] python3Packages.pymobiledevice3: 4.27.5 -> 4.27.6

Diff: https://github.com/doronz88/pymobiledevice3/compare/v4.27.5...v4.27.6

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

diff --git a/pkgs/development/python-modules/pymobiledevice3/default.nix b/pkgs/development/python-modules/pymobiledevice3/default.nix
index 4204cb8df42c..f621a696435f 100644
--- a/pkgs/development/python-modules/pymobiledevice3/default.nix
+++ b/pkgs/development/python-modules/pymobiledevice3/default.nix
@@ -48,14 +48,14 @@
 
 buildPythonPackage rec {
   pname = "pymobiledevice3";
-  version = "4.27.5";
+  version = "4.27.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "doronz88";
     repo = "pymobiledevice3";
     tag = "v${version}";
-    hash = "sha256-dfbh1NvM/XccsGnJ7iTBzkdc31eOSaDs8671cibLI14=";
+    hash = "sha256-UOB8cNswgTKIRXU7KOr6rgc+oqj2DUu4BKqFljsQSw8=";
   };
 
   build-system = [

From 3e89b0f880c6e81e2a9a4a49034669bdb3cdb90a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Oct 2025 12:44:06 -0700
Subject: [PATCH 1384/6226] flare-signal: 0.17.1 -> 0.17.2

Diff: https://gitlab.com/schmiddi-on-mobile/flare/-/compare/0.17.1...0.17.2

Changelog: https://gitlab.com/schmiddi-on-mobile/flare/-/blob/0.17.2/CHANGELOG.md
---
 pkgs/by-name/fl/flare-signal/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/fl/flare-signal/package.nix b/pkgs/by-name/fl/flare-signal/package.nix
index a36029891702..92932650eb27 100644
--- a/pkgs/by-name/fl/flare-signal/package.nix
+++ b/pkgs/by-name/fl/flare-signal/package.nix
@@ -28,29 +28,29 @@ let
     owner = "whisperfish";
     repo = "presage";
     # match with commit from Cargo.toml
-    rev = "31a418d0a35ad746590165520b652d6adb7a0384";
-    hash = "sha256-Mf8RvwfrVpbsUj+mA9L7IjnbMKoZDjZKYor2iqFWSx4=";
+    rev = "ed011688fc8d9c0ee07c3d44743c138c1fa4dfda";
+    hash = "sha256-NTSxSOAmA9HOH52GPwl6pL0MQly+NTfJDk7k7TUP9II=";
   };
 in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flare";
   # NOTE: also update presage commit
-  version = "0.17.1";
+  version = "0.17.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.com";
     owner = "schmiddi-on-mobile";
     repo = "flare";
     tag = finalAttrs.version;
-    hash = "sha256-3SYsVF3aUJYSr3pM/BGXYExQwbwckExYwEcF3cZ/94g=";
+    hash = "sha256-Nezg+fNC29blGhyetJqs9l6/IL08b7tHn+D3pzKj26I=";
   };
 
   cargoDeps =
     let
       cargoDeps = rustPlatform.fetchCargoVendor {
         inherit (finalAttrs) pname version src;
-        hash = "sha256-cxhnfdYcsyXxvTpGGXm2rK3cKVsNk66FYif7/c16NhU=";
+        hash = "sha256-Y6jY588axEcqv0WN6Fcm8Kd5yd2JXvKwMd8h1L6J9TE=";
       };
     in
     # Replace with simpler solution:

From e2c4571eefa1d97e71e7f789b435ec79338a6f7d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Oct 2025 12:49:46 -0700
Subject: [PATCH 1385/6226] python3Packages.python-rapidjson: 1.21 -> 1.22

Diff: https://github.com/python-rapidjson/python-rapidjson/compare/v1.21...v1.22

Changelog: https://github.com/python-rapidjson/python-rapidjson/blob/v1.22/CHANGES.rst
---
 pkgs/development/python-modules/python-rapidjson/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-rapidjson/default.nix b/pkgs/development/python-modules/python-rapidjson/default.nix
index 7d5e92b9407b..e60e070c8614 100644
--- a/pkgs/development/python-modules/python-rapidjson/default.nix
+++ b/pkgs/development/python-modules/python-rapidjson/default.nix
@@ -10,7 +10,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "1.21";
+  version = "1.22";
   pname = "python-rapidjson";
   pyproject = true;
 
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "python-rapidjson";
     repo = "python-rapidjson";
     tag = "v${version}";
-    hash = "sha256-qpq7gNdWDSNTVTqV1rnRffap0VrlHOr4soAY/SXqd1k=";
+    hash = "sha256-q+qIuFD3TboevD88iaBQxwOoOdb6I+yyCsNXIqMcR3g=";
   };
 
   patches = [

From 1ac12f97c150ee59a5734f06e9fffe7ec3325792 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Oct 2025 12:55:00 -0700
Subject: [PATCH 1386/6226] python3Packages.elevenlabs: 2.18.0 -> 2.20.0

Diff: https://github.com/elevenlabs/elevenlabs-python/compare/v2.18.0...v2.20.0

Changelog: https://github.com/elevenlabs/elevenlabs-python/releases/tag/v2.20.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 affab66c0803..9c4ef79a85dd 100644
--- a/pkgs/development/python-modules/elevenlabs/default.nix
+++ b/pkgs/development/python-modules/elevenlabs/default.nix
@@ -13,7 +13,7 @@
 }:
 
 let
-  version = "2.18.0";
+  version = "2.20.0";
   tag = "v${version}";
 in
 buildPythonPackage {
@@ -25,7 +25,7 @@ buildPythonPackage {
     owner = "elevenlabs";
     repo = "elevenlabs-python";
     inherit tag;
-    hash = "sha256-FSUKKYG9cMuh4AcU6nYBtzjt+znfel3SHLRDDWPNCv8=";
+    hash = "sha256-oxhXvPUOplftB3b7oXmfLSRdPVVjzuOeVPp19OEHVCk=";
   };
 
   build-system = [ poetry-core ];

From 1404e235eaec2d69e6047c0e2ce274e7001ec890 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Oct 2025 12:59:34 -0700
Subject: [PATCH 1387/6226] python3Packages.aioamazondevices: 6.4.4 -> 6.4.6

Diff: https://github.com/chemelli74/aioamazondevices/compare/v6.4.4...v6.4.6

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

diff --git a/pkgs/development/python-modules/aioamazondevices/default.nix b/pkgs/development/python-modules/aioamazondevices/default.nix
index da0b52e3eb23..b1153a351968 100644
--- a/pkgs/development/python-modules/aioamazondevices/default.nix
+++ b/pkgs/development/python-modules/aioamazondevices/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "aioamazondevices";
-  version = "6.4.4";
+  version = "6.4.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chemelli74";
     repo = "aioamazondevices";
     tag = "v${version}";
-    hash = "sha256-zp6lWRnyDTHi1Pm2Ra8xCrRBGfge1wli1EEebv5T8gM=";
+    hash = "sha256-EjgZ/zmUSCaLDUmijYMCXvwpl4dWfjmTdlO5VLuzIHg=";
   };
 
   build-system = [ poetry-core ];

From 4bee6ab4715ee083a1acec6abee640b342cf0310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Oct 2025 13:02:36 -0700
Subject: [PATCH 1388/6226] python3Packages.bluecurrent-api: 1.3.1 -> 1.3.2

Diff: https://github.com/bluecurrent/HomeAssistantAPI/compare/v1.3.1...v1.3.2
---
 pkgs/development/python-modules/bluecurrent-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bluecurrent-api/default.nix b/pkgs/development/python-modules/bluecurrent-api/default.nix
index 33e250cbe4cd..a92ed1b08aca 100644
--- a/pkgs/development/python-modules/bluecurrent-api/default.nix
+++ b/pkgs/development/python-modules/bluecurrent-api/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "bluecurrent-api";
-  version = "1.3.1";
+  version = "1.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "bluecurrent";
     repo = "HomeAssistantAPI";
     tag = "v${version}";
-    hash = "sha256-PX0pD7X0o7OVtlz4Q5KuDBH83jtTaIdMnuLvAMTP8+U=";
+    hash = "sha256-a0IqtRj761h1P8Q3xrFY1XPFl6J6HaArv6IfO88OJco=";
   };
 
   build-system = [ setuptools ];

From 0679c4665150b864408c4c0ea6e13cc0b2bbe14b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 20:07:15 +0000
Subject: [PATCH 1389/6226] gcsfuse: 3.4.0 -> 3.4.1

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

diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix
index 253b21b623b6..15c8c9fd21de 100644
--- a/pkgs/by-name/gc/gcsfuse/package.nix
+++ b/pkgs/by-name/gc/gcsfuse/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "gcsfuse";
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "googlecloudplatform";
     repo = "gcsfuse";
     rev = "v${version}";
-    hash = "sha256-PdYHsHIlq77QnsjD1z3KliW3JHLZ0M26I4Z7v0SuvlU=";
+    hash = "sha256-KB7iq92U5NIchC3Lj2q2eesYLlKa1zee0rUPU81xb5k=";
   };
 
-  vendorHash = "sha256-w5EOHPOJLfINILrP3ipZwYUAcAJIlGw1HlVAUAzW3x4=";
+  vendorHash = "sha256-BirzhmYwFSs2poA5tNOlK2bDO71mCkgSck7fE9la2wA=";
 
   subPackages = [
     "."

From c63a1d81f5f4ca6f1736b4e3d52dee3f57208777 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 20:07:49 +0000
Subject: [PATCH 1390/6226] sydbox: 3.40.1 -> 3.41.0

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

diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix
index 146a41c816a1..d848b16bb536 100644
--- a/pkgs/by-name/sy/sydbox/package.nix
+++ b/pkgs/by-name/sy/sydbox/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sydbox";
-  version = "3.40.1";
+  version = "3.41.0";
 
   outputs = [
     "out"
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Sydbox";
     repo = "sydbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hO17Rm4gOSCVlmVZTZdJ2qh9pzdrl8Ay9uU6w7V4RPo=";
+    hash = "sha256-Qb7BYBMHKb+hCLNADOgBL8r/YeTiw9Rmy0pTV/jk93o=";
   };
 
-  cargoHash = "sha256-y6FvIH3+daDsYP18BpsoYKsshvpVcSU7s/tjPdnudtY=";
+  cargoHash = "sha256-dx/AP5CiKz6asfYPEmjo+7ZELMyyxaEHZ5virL68IB4=";
 
   nativeBuildInputs = [
     mandoc

From 1fbb08ed57173324dfcf037681895204b5f774ee Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 21 Oct 2025 13:08:45 -0700
Subject: [PATCH 1391/6226] python3Packages.llm: disable tests that fail due to
 updated dependencies

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

diff --git a/pkgs/development/python-modules/llm/default.nix b/pkgs/development/python-modules/llm/default.nix
index 7b8098c86227..a943c405d447 100644
--- a/pkgs/development/python-modules/llm/default.nix
+++ b/pkgs/development/python-modules/llm/default.nix
@@ -228,6 +228,17 @@ let
       "tests/"
     ];
 
+    disabledTests = [
+      # AssertionError: The following responses are mocked but not requested:
+      # - Match POST request on https://api.openai.com/v1/chat/completions
+      # https://github.com/simonw/llm/issues/1292
+      "test_gpt4o_mini_sync_and_async"
+
+      # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr
+      # https://github.com/simonw/llm/issues/1293
+      "test_embed_multi_files_encoding"
+    ];
+
     pythonImportsCheck = [ "llm" ];
 
     passthru = {

From 3a506a348c44167f77caaccf02bf48174e805c7b Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 21 Oct 2025 22:09:54 +0200
Subject: [PATCH 1392/6226] jruby: 10.0.0.0 -> 10.0.2.0

Fixes CVE-2025-46551.

Changes:
https://github.com/jruby/jruby/releases/tag/10.0.2.0
https://github.com/jruby/jruby/releases/tag/10.0.1.0
---
 pkgs/development/interpreters/jruby/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix
index af054c353d85..0b8a388d3ea4 100644
--- a/pkgs/development/interpreters/jruby/default.nix
+++ b/pkgs/development/interpreters/jruby/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   callPackage,
   fetchurl,
+  fetchMavenArtifact,
   gitUpdater,
   mkRubyVersion,
   makeBinaryWrapper,
@@ -11,15 +12,15 @@
 
 let
   # The version number here is whatever is reported by the RUBY_VERSION string
-  rubyVersion = mkRubyVersion "3" "1" "4" "";
+  rubyVersion = mkRubyVersion "3" "4" "2" "";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "jruby";
-  version = "10.0.0.0";
+  version = "10.0.2.0";
 
   src = fetchurl {
-    url = "https://s3.amazonaws.com/jruby.org/downloads/${finalAttrs.version}/jruby-bin-${finalAttrs.version}.tar.gz";
-    hash = "sha256-Qn2YJ+0j/mtNEf5hZlx13XR2ujagQ4N26zEM4qjSRzM=";
+    url = "https://repo1.maven.org/maven2/org/jruby/jruby-dist/${finalAttrs.version}/jruby-dist-${finalAttrs.version}-bin.tar.gz";
+    hash = "sha256-uKAm84qphGGgTtCqCyCJHOJX7L5T4SRxnOnuW4BFJfE=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];
@@ -27,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     mkdir -pv $out/share/jruby/docs
     mv * $out
-    rm $out/bin/*.{bat,dll,exe,sh}
+    rm $out/bin/*.{bat,dll,exe}
     mv $out/samples $out/share/jruby/
     mv $out/BSDL $out/COPYING $out/LEGAL $out/LICENSE* $out/share/jruby/docs/
 
@@ -36,8 +37,6 @@ stdenv.mkDerivation (finalAttrs: {
         --set JAVA_HOME ${jre.home}
     done
 
-    ln -s $out/bin/jruby $out/bin/ruby
-
     # Bundler tries to create this directory
     mkdir -pv $out/${finalAttrs.passthru.gemPath}
     mkdir -p $out/nix-support

From 1a10671ace748b594b9415c0db2ab5a13d1f28ab Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 21 Oct 2025 22:12:06 +0200
Subject: [PATCH 1393/6226] chromium,chromedriver: 141.0.7390.107 ->
 141.0.7390.122

https://chromereleases.googleblog.com/2025/10/stable-channel-update-for-desktop_21.html

This update includes 1 security fix.

CVEs:
CVE-2025-12036
---
 .../networking/browsers/chromium/info.json           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 058ff8f0bff8..60470a5e6638 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "141.0.7390.107",
+    "version": "141.0.7390.122",
     "chromedriver": {
-      "version": "141.0.7390.108",
-      "hash_darwin": "sha256-TvfBtM4vEYmBiUiZmdALHouufc95l9lcptGUafhT/a4=",
-      "hash_darwin_aarch64": "sha256-xe9/tivLgzkUHRo/39ytgGl32Q/Gml8Vg7Jptf1jtGw="
+      "version": "141.0.7390.123",
+      "hash_darwin": "sha256-grFBdZXToIZiHOrKs3EkVcl3+Bpj4tbui63oUstkpT4=",
+      "hash_darwin_aarch64": "sha256-Da3LogG0JRRI9iuTw4vWUh9CGCnicMzIDea641teQII="
     },
     "deps": {
       "depot_tools": {
@@ -21,8 +21,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "1c008349f76ff3a317bf28316fc5008c0120deb4",
-        "hash": "sha256-NRqWOkGrg/Y4wZi4WQDJ6CvsDpeseVgTc/iAnuPRy/U=",
+        "rev": "b477534e7e10d193e916cd4e2967c589383625b2",
+        "hash": "sha256-3sVHRzERwlLzXl2qSn2Lil4U4d6N63MUOomSUrjy2YY=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {

From 8de092589729784a50c4075179710d0fe198b7fe Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 15:57:15 -0300
Subject: [PATCH 1394/6226] l8w8jwt: fix build with cmake4

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

diff --git a/pkgs/by-name/l8/l8w8jwt/package.nix b/pkgs/by-name/l8/l8w8jwt/package.nix
index 8449da40c884..1f6765e9cc0e 100644
--- a/pkgs/by-name/l8/l8w8jwt/package.nix
+++ b/pkgs/by-name/l8/l8w8jwt/package.nix
@@ -47,6 +47,11 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  postPatch = ''
+    substituteInPlace lib/chillbuff/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "Minimal, OpenSSL-less and super lightweight JWT library written in C";
     homepage = "https://codeberg.org/GlitchedPolygons/l8w8jwt";
@@ -54,5 +59,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ jherland ];
     platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
   };
 })

From e5d67461cbd667d366b949b6ca90e10efffa5071 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 07:31:55 -0300
Subject: [PATCH 1395/6226] ursadb: fix build with cmake4

---
 pkgs/by-name/ur/ursadb/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ur/ursadb/package.nix b/pkgs/by-name/ur/ursadb/package.nix
index 108c9ef067cc..ec3f808df0ee 100644
--- a/pkgs/by-name/ur/ursadb/package.nix
+++ b/pkgs/by-name/ur/ursadb/package.nix
@@ -25,6 +25,12 @@ stdenv.mkDerivation (finalAttrs: {
       --replace "target_clangformat_setup(ursadb_test)" "" \
       --replace 'target_include_directories(ursadb_test PUBLIC ${"$"}{CMAKE_SOURCE_DIR})' "" \
       --replace "ursadb_test" ""
+
+    substituteInPlace extern/spdlog/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace extern/libzmq/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0.2)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [
@@ -37,6 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.bsd3;
     maintainers = with maintainers; [ msm ];
     platforms = platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin;
+    broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
   };
 })

From 2d6a109cefefb923522606670b437b81bec0fb79 Mon Sep 17 00:00:00 2001
From: Jonas Rembser <jonas.rembser@cern.ch>
Date: Thu, 28 Aug 2025 16:16:54 +0200
Subject: [PATCH 1396/6226] root: make rootcint and genreflex available again

The mechanism to install these binaries as hard links to `rootcling`
was quite fragile. This commit suggests to just build them as separate
CMake targets instead.

This fixes the compilation of `applgrid, `apfelgrid`, and `xfitter`
reported in https://github.com/NixOS/nixpkgs/pull/424032#discussion_r2305727437
---
 ...nt-and-genreflex-as-separate-targets.patch | 108 ++++++++++++++++++
 pkgs/by-name/ro/root/package.nix              |   2 +
 2 files changed, 110 insertions(+)
 create mode 100644 pkgs/by-name/ro/root/Build-rootcint-and-genreflex-as-separate-targets.patch

diff --git a/pkgs/by-name/ro/root/Build-rootcint-and-genreflex-as-separate-targets.patch b/pkgs/by-name/ro/root/Build-rootcint-and-genreflex-as-separate-targets.patch
new file mode 100644
index 000000000000..668c8f69f842
--- /dev/null
+++ b/pkgs/by-name/ro/root/Build-rootcint-and-genreflex-as-separate-targets.patch
@@ -0,0 +1,108 @@
+From febb61a45a40a76bdbcd320f307dcd8f14cc532b Mon Sep 17 00:00:00 2001
+From: Jonas Rembser <jonas.rembser@cern.ch>
+Date: Thu, 28 Aug 2025 14:07:01 +0200
+Subject: [PATCH] [CMake] Build `rootcint` and `genreflex` as separate targets
+
+This makes the CMake code more robust.
+
+Right now, we use some `install(CODE "execute_process(COMMAND ln -f ...`
+solution on unix to install `rootcint` and `genreflex`. This does not
+work in all cases, either because of the usage of `\$ENV{DESTDIR}` when
+`DESTDIR` is not set, or because hard links are not allowed.
+
+Always copying `rootcling` - already in the build tree - would avoid
+that problem, but by copying we risk sidestepping the CMake mechanisms
+to set the RPath correctly when installing the copies, which are not
+actual targets.
+
+To make makes things simpler and more robust, this commit suggests to
+build the `rootcing` and `genreflex` executables as separate targets
+from the same source. The cost is very little cost in memory
+(`rootcling` is only 31K, so copying two times only increases the size
+of ROOTs `bin` directory by 1.5 %) and little in compile time (the extra
+compile time is less than a second, not noticable in parallel builds).
+---
+ main/CMakeLists.txt | 69 +++++++++++++++------------------------------
+ 1 file changed, 23 insertions(+), 46 deletions(-)
+
+diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
+index 7dfcd98e345..857f0df48d8 100644
+--- a/main/CMakeLists.txt
++++ b/main/CMakeLists.txt
+@@ -98,50 +98,27 @@ set_source_files_properties(src/rootcling.cxx PROPERTIES
+   VISIBILITY_INLINES_HIDDEN "ON"
+ )
+ 
+-ROOT_EXECUTABLE(rootcling src/rootcling.cxx LIBRARIES RIO Cling Core Rint)
+-
+-# rootcling includes the ROOT complex header which would build the complex
+-# dictionary with modules. To make sure that rootcling_stage1 builds this
+-# dict before we use it, we add a dependency here.
+-add_dependencies(rootcling complexDict)
+-
+-target_include_directories(rootcling PRIVATE
+-        ${CMAKE_SOURCE_DIR}/core/metacling/res
+-        ${CMAKE_SOURCE_DIR}/core/dictgen/res
+-        ${CMAKE_SOURCE_DIR}/io/rootpcm/res)
+-set_property(TARGET rootcling PROPERTY ENABLE_EXPORTS 1)
+-if(WIN32)
+-  set_target_properties(rootcling PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS 1)
+-  set_property(TARGET rootcling APPEND_STRING PROPERTY LINK_FLAGS " -STACK:4000000")
+-endif()
+-
+-# Create aliases: rootcint, genreflex.
+-if(WIN32)
+-  add_custom_command(TARGET rootcling POST_BUILD
+-                     COMMAND copy /y rootcling.exe rootcint.exe
+-                     COMMAND copy /y rootcling.exe genreflex.exe
+-                     WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+-else()
+-  add_custom_command(TARGET rootcling POST_BUILD
+-                     COMMAND ln -f rootcling rootcint
+-                     COMMAND ln -f rootcling genreflex
+-                     WORKING_DIRECTORY ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
+-endif()
+-set_directory_properties(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES
+-                         "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/rootcint;${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/genreflex")
+-
+-if(CMAKE_HOST_UNIX)
+-  install(CODE "execute_process(COMMAND ln -f rootcling rootcint WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})" COMPONENT applications)
+-  install(CODE "execute_process(COMMAND ln -f rootcling genreflex WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_BINDIR})" COMPONENT applications)
+-else()
+-  if(MSVC)
+-    install(PROGRAMS  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/rootcling.exe DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
+-    install(PROGRAMS  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/rootcint.exe DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
+-    install(PROGRAMS  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/genreflex.exe DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
+-  else()
+-    install(PROGRAMS  ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/rootcint
+-                      ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/genreflex
+-                      ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/rlibmap
+-                      DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT applications)
++set(rootcling_exe_names rootcling genreflex rootcint)
++
++foreach(exe_name IN LISTS rootcling_exe_names)
++  ROOT_EXECUTABLE(${exe_name} src/rootcling.cxx LIBRARIES RIO Cling Core Rint)
++
++  # rootcling includes the ROOT complex header which would build the complex
++  # dictionary with modules. To make sure that rootcling_stage1 builds this
++  # dict before we use it, we add a dependency here.
++  add_dependencies(${exe_name} complexDict)
++
++  target_include_directories(${exe_name} PRIVATE
++          ${CMAKE_SOURCE_DIR}/core/metacling/res
++          ${CMAKE_SOURCE_DIR}/core/dictgen/res
++          ${CMAKE_SOURCE_DIR}/io/rootpcm/res)
++  set_property(TARGET ${exe_name} PROPERTY ENABLE_EXPORTS 1)
++  if(WIN32)
++    set_target_properties(${exe_name} PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS 1)
++    set_property(TARGET ${exe_name} APPEND_STRING PROPERTY LINK_FLAGS " -STACK:4000000")
+   endif()
+-endif()
++endforeach()
++
++# To inherit the dependencies from rootcling
++add_dependencies(genreflex rootcling)
++add_dependencies(rootcint rootcint)
+-- 
+2.50.1
+
diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix
index c432784847e3..4264f2a6a1eb 100644
--- a/pkgs/by-name/ro/root/package.nix
+++ b/pkgs/by-name/ro/root/package.nix
@@ -135,6 +135,8 @@ stdenv.mkDerivation rec {
       hash = "sha256-D7LZWJnGF9DtKcM8EF3KILU81cqTcZolW+HMe3fmXTw=";
       revert = true;
     })
+    # Will also be integrated to ROOT 6.38.00
+    ./Build-rootcint-and-genreflex-as-separate-targets.patch
   ];
 
   preConfigure = ''

From 7016a28fa7cafca9e2e60fe16eb674bd2f56a850 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 21 Oct 2025 22:32:50 +0200
Subject: [PATCH 1397/6226] mysql80: 8.0.43 -> 8.0.44

Fixes:
* CVE-2025-53054
* CVE-2025-53053
* CVE-2025-53044
* CVE-2025-53045
* CVE-2025-53062
* CVE-2025-53069
* CVE-2025-53040
* CVE-2025-53042

https://www.oracle.com/security-alerts/cpuoct2025.html#AppendixMSQL

Changes:
https://dev.mysql.com/doc/relnotes/mysql/8.0/en/news-8-0-44.html
---
 pkgs/servers/sql/mysql/8.0.x.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix
index 3345c368a6da..9b158fad46d6 100644
--- a/pkgs/servers/sql/mysql/8.0.x.nix
+++ b/pkgs/servers/sql/mysql/8.0.x.nix
@@ -30,11 +30,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mysql";
-  version = "8.0.43";
+  version = "8.0.44";
 
   src = fetchurl {
     url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
-    hash = "sha256-diUKgQFch49iUhz68w3/DqmyUJeNKx3/AHQIo5jV25M=";
+    hash = "sha256-YJUi7R/vzlqziN7CXg0bzhMjgtom4rd7aPB0HApkE1Y=";
   };
 
   nativeBuildInputs = [

From 9a28cade70d5a9fea018d794d9ce70eb3b276159 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 21 Oct 2025 22:34:45 +0200
Subject: [PATCH 1398/6226] mysql84: 8.4.6 -> 8.4.7

Fixes:
* CVE-2025-53054
* CVE-2025-53053
* CVE-2025-53044
* CVE-2025-53045
* CVE-2025-53062
* CVE-2025-53069
* CVE-2025-53040
* CVE-2025-53042

https://www.oracle.com/security-alerts/cpuoct2025.html#AppendixMSQL

Changes:
https://dev.mysql.com/doc/relnotes/mysql/8.4/en/news-8-4-7.html
---
 pkgs/by-name/my/mysql84/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/my/mysql84/package.nix b/pkgs/by-name/my/mysql84/package.nix
index c7ed5567b802..22a1752e0df7 100644
--- a/pkgs/by-name/my/mysql84/package.nix
+++ b/pkgs/by-name/my/mysql84/package.nix
@@ -27,11 +27,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mysql";
-  version = "8.4.6";
+  version = "8.4.7";
 
   src = fetchurl {
     url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz";
-    hash = "sha256-oeUj3IvpbRilreEGmYZhKFygG29bRsCLJlQRDkDfL7c=";
+    hash = "sha256-wL8zqUzbkI8UmuoHl6/7GxOSYszw4Ll4ehckYgdULmk=";
   };
 
   nativeBuildInputs = [

From b6ded2688f5fedfe535cc50854292d9751dbc4ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 20:35:05 +0000
Subject: [PATCH 1399/6226] slade-unstable: 3.2.7-unstable-2025-09-30 ->
 3.2.8-unstable-2025-10-21

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

diff --git a/pkgs/by-name/sl/slade-unstable/package.nix b/pkgs/by-name/sl/slade-unstable/package.nix
index 3b40757dbddd..3d4027fd860b 100644
--- a/pkgs/by-name/sl/slade-unstable/package.nix
+++ b/pkgs/by-name/sl/slade-unstable/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation {
   pname = "slade";
-  version = "3.2.7-unstable-2025-09-30";
+  version = "3.2.8-unstable-2025-10-21";
 
   src = fetchFromGitHub {
     owner = "sirjuddington";
     repo = "SLADE";
-    rev = "8ad6609784de6fef6b35f1508b6d5d8a3084aa17";
-    hash = "sha256-XYg0k5ZOZ/M/4X0+6pjJEMK0sIVqu/1LtmJaeq6iOvM=";
+    rev = "fb7cc161a6886c12c5120e30190a7813c6c16b62";
+    hash = "sha256-skJpcxLSInAzBHGtxdTWAqocXQKKQY7vJfUx8ZAlMqc=";
   };
 
   nativeBuildInputs = [

From 4c86df0733883f84e9cd22aea9dfe29a67a9cf73 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 16:34:44 -0300
Subject: [PATCH 1400/6226] liblaxjson: fix build with cmake4

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

diff --git a/pkgs/by-name/li/liblaxjson/package.nix b/pkgs/by-name/li/liblaxjson/package.nix
index 905cc1cb9a16..86fb56ebb3ce 100644
--- a/pkgs/by-name/li/liblaxjson/package.nix
+++ b/pkgs/by-name/li/liblaxjson/package.nix
@@ -18,11 +18,17 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Library for parsing JSON config files";
     homepage = "https://github.com/andrewrk/liblaxjson";
     license = licenses.mit;
     platforms = platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin;
     maintainers = [ maintainers.andrewrk ];
   };
 }

From 5277c2ddd93ed68f490fc647f8536c3a396bb606 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 20:39:36 +0000
Subject: [PATCH 1401/6226] dita-ot: 4.3.4 -> 4.3.5

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

diff --git a/pkgs/by-name/di/dita-ot/package.nix b/pkgs/by-name/di/dita-ot/package.nix
index 5ad3cbb2f4ba..d9d9d076e4ed 100644
--- a/pkgs/by-name/di/dita-ot/package.nix
+++ b/pkgs/by-name/di/dita-ot/package.nix
@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dita-ot";
-  version = "4.3.4";
+  version = "4.3.5";
 
   nativeBuildInputs = [ makeWrapper ];
   buildInputs = [ openjdk17 ];
 
   src = fetchzip {
     url = "https://github.com/dita-ot/dita-ot/releases/download/${finalAttrs.version}/dita-ot-${finalAttrs.version}.zip";
-    hash = "sha256-L3chSLr/S7d2sx0FjGbn1A1GRknBqVIUrklOW7LjakA=";
+    hash = "sha256-odL9i48SICfXLxSDqwqIXBXG57dENRjdkZkRjt3xhMg=";
   };
 
   installPhase = ''

From e229c4be84575b1b9019ca5fe19fedad478aeeea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 20:41:38 +0000
Subject: [PATCH 1402/6226] do-agent: 3.18.4 -> 3.18.5

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

diff --git a/pkgs/by-name/do/do-agent/package.nix b/pkgs/by-name/do/do-agent/package.nix
index 1d55fd10c4f5..2a3a879ceda8 100644
--- a/pkgs/by-name/do/do-agent/package.nix
+++ b/pkgs/by-name/do/do-agent/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "do-agent";
-  version = "3.18.4";
+  version = "3.18.5";
 
   src = fetchFromGitHub {
     owner = "digitalocean";
     repo = "do-agent";
     rev = version;
-    sha256 = "sha256-Pn53zNp3D0NcEQqfiv4ZceLT2Pgvz7oZYZAhk2D1SCc=";
+    sha256 = "sha256-Wc0VqBiIAQGtORdm0paAm9vnbThc+5seHXmpnYcyNh8=";
   };
 
   ldflags = [

From 5dbf685defeec6ab18cbbb57c537956c968cdaec Mon Sep 17 00:00:00 2001
From: Bonus <root@bonusplay.pl>
Date: Tue, 7 Oct 2025 19:52:15 +0200
Subject: [PATCH 1403/6226] nixos/beszel.hub: init

Co-authored-by: Mirza Arnaut <mirza.arnaut45@gmail.com>
---
 .../manual/release-notes/rl-2511.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../services/monitoring/beszel-hub.nix        | 114 ++++++++++++++++++
 3 files changed, 117 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/beszel-hub.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 8dc6829d7182..7056f7fd144f 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -146,6 +146,8 @@
 
 - [KMinion](https://github.com/redpanda-data/kminion), feature-rich Prometheus exporter for Apache Kafka. Available as [services.prometheus.exporters.kafka](options.html#opt-services.prometheus.exporters.kafka).
 
+- [Beszel](https://beszel.dev), a lightweight server monitoring hub with historical data, docker stats, and alerts. Available as `services.beszel.hub`.
+
 - [Spoolman](https://github.com/Donkie/Spoolman), a inventory management system for Filament spools. Available as [services.spoolman](#opt-services.spoolman.enable).
 
 - [Temporal](https://temporal.io/), a durable execution platform that enables
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 457d7923fd63..27ce3ddc3b86 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -973,6 +973,7 @@
   ./services/monitoring/apcupsd.nix
   ./services/monitoring/arbtt.nix
   ./services/monitoring/below.nix
+  ./services/monitoring/beszel-hub.nix
   ./services/monitoring/bosun.nix
   ./services/monitoring/cadvisor.nix
   ./services/monitoring/certspotter.nix
diff --git a/nixos/modules/services/monitoring/beszel-hub.nix b/nixos/modules/services/monitoring/beszel-hub.nix
new file mode 100644
index 000000000000..8028d13c39d3
--- /dev/null
+++ b/nixos/modules/services/monitoring/beszel-hub.nix
@@ -0,0 +1,114 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.beszel.hub;
+in
+{
+  meta.maintainers = with lib.maintainers; [
+    BonusPlay
+    arunoruto
+  ];
+
+  options.services.beszel.hub = {
+    enable = lib.mkEnableOption "beszel hub";
+
+    package = lib.mkPackageOption pkgs "beszel" { };
+
+    host = lib.mkOption {
+      default = "127.0.0.1";
+      type = lib.types.str;
+      example = "0.0.0.0";
+      description = "Host or address this beszel hub listens on.";
+    };
+    port = lib.mkOption {
+      default = 8090;
+      type = lib.types.port;
+      example = 3002;
+      description = "Port for this beszel hub to listen on.";
+    };
+
+    dataDir = lib.mkOption {
+      type = lib.types.path;
+      default = "/var/lib/beszel-hub";
+      description = "Data directory of beszel-hub.";
+    };
+
+    environment = lib.mkOption {
+      type = with lib.types; attrsOf str;
+      default = { };
+      example = {
+        DISABLE_PASSWORD_AUTH = "true";
+      };
+      description = ''
+        Environment variables passed to the systemd service.
+        See <https://www.beszel.dev/guide/environment-variables#hub> for available options.
+      '';
+    };
+    environmentFile = lib.mkOption {
+      type = lib.types.nullOr lib.types.path;
+      default = null;
+      description = ''
+        Environment file to be passed to the systemd service.
+        Useful for passing secrets to the service to prevent them from being
+        world-readable in the Nix store. See {manpage}`systemd.exec(5)`.
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.services.beszel-hub = {
+      description = "Beszel Server Monitoring Web App";
+
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" ];
+      environment = cfg.environment;
+
+      serviceConfig = {
+        ExecStartPre = [
+          "${cfg.package}/bin/beszel-hub migrate up"
+          "${cfg.package}/bin/beszel-hub history-sync"
+        ];
+        ExecStart = ''
+          ${cfg.package}/bin/beszel-hub serve --http='${cfg.host}:${toString cfg.port}'
+        '';
+
+        EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile;
+        WorkingDirectory = cfg.dataDir;
+        StateDirectory = baseNameOf cfg.dataDir;
+        RuntimeDirectory = baseNameOf cfg.dataDir;
+        ReadWritePaths = cfg.dataDir;
+
+        DynamicUser = true;
+        User = "beszel-hub";
+        LockPersonality = true;
+        NoNewPrivileges = true;
+        PrivateDevices = true;
+        PrivateTmp = true;
+        PrivateUsers = true;
+        ProtectClock = true;
+        ProtectControlGroups = "strict";
+        ProtectHome = "read-only";
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectSystem = "strict";
+        DevicePolicy = "closed";
+        Restart = "on-failure";
+        RestartSec = "30s";
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        RestrictNamespaces = true;
+        SystemCallArchitectures = "native";
+        SystemCallErrorNumber = "EPERM";
+        SystemCallFilter = [ "@system-service" ];
+        UMask = 27;
+      };
+    };
+  };
+}

From f5d45f3499777a1a0c075993dea8b0d5bee81302 Mon Sep 17 00:00:00 2001
From: Bonus <root@bonusplay.pl>
Date: Tue, 7 Oct 2025 19:54:37 +0200
Subject: [PATCH 1404/6226] nixos/beszel.agent: init

Co-authored-by: Mirza Arnaut <mirza.arnaut45@gmail.com>
---
 .../manual/release-notes/rl-2511.section.md   |   2 +-
 nixos/modules/module-list.nix                 |   1 +
 .../services/monitoring/beszel-agent.nix      | 119 ++++++++++++++++++
 3 files changed, 121 insertions(+), 1 deletion(-)
 create mode 100644 nixos/modules/services/monitoring/beszel-agent.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 7056f7fd144f..4fc6e12d04d6 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -146,7 +146,7 @@
 
 - [KMinion](https://github.com/redpanda-data/kminion), feature-rich Prometheus exporter for Apache Kafka. Available as [services.prometheus.exporters.kafka](options.html#opt-services.prometheus.exporters.kafka).
 
-- [Beszel](https://beszel.dev), a lightweight server monitoring hub with historical data, docker stats, and alerts. Available as `services.beszel.hub`.
+- [Beszel](https://beszel.dev), a lightweight server monitoring hub with historical data, docker stats, and alerts. Available as [`services.beszel.agent`](options.html#opt-services.beszel.agent.enable) and [`services.beszel.hub`](options.html#opt-services.beszel.hub.enable).
 
 - [Spoolman](https://github.com/Donkie/Spoolman), a inventory management system for Filament spools. Available as [services.spoolman](#opt-services.spoolman.enable).
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 27ce3ddc3b86..ac62b33bd6b6 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -973,6 +973,7 @@
   ./services/monitoring/apcupsd.nix
   ./services/monitoring/arbtt.nix
   ./services/monitoring/below.nix
+  ./services/monitoring/beszel-agent.nix
   ./services/monitoring/beszel-hub.nix
   ./services/monitoring/bosun.nix
   ./services/monitoring/cadvisor.nix
diff --git a/nixos/modules/services/monitoring/beszel-agent.nix b/nixos/modules/services/monitoring/beszel-agent.nix
new file mode 100644
index 000000000000..9cb4e1e57c7c
--- /dev/null
+++ b/nixos/modules/services/monitoring/beszel-agent.nix
@@ -0,0 +1,119 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.beszel.agent;
+in
+{
+  meta.maintainers = with lib.maintainers; [
+    BonusPlay
+    arunoruto
+  ];
+
+  options.services.beszel.agent = {
+    enable = lib.mkEnableOption "beszel agent";
+    package = lib.mkPackageOption pkgs "beszel" { };
+    openFirewall = (lib.mkEnableOption "") // {
+      description = "Whether to open the firewall port (default 45876).";
+    };
+
+    environment = lib.mkOption {
+      type = lib.types.attrsOf lib.types.str;
+      default = { };
+      description = ''
+        Environment variables for configuring the beszel-agent service.
+        This field will end up public in /nix/store, for secret values (such as `KEY`) use `environmentFile`.
+
+        See <https://www.beszel.dev/guide/environment-variables#agent> for available options.
+      '';
+    };
+    environmentFile = lib.mkOption {
+      type = lib.types.nullOr lib.types.path;
+      default = null;
+      description = ''
+        File path containing environment variables for configuring the beszel-agent service in the format of an EnvironmentFile. See {manpage}`systemd.exec(5)`.
+      '';
+    };
+    extraPath = lib.mkOption {
+      type = lib.types.listOf lib.types.package;
+      default = [ ];
+      description = ''
+        Extra packages to add to beszel path (such as nvidia-smi or rocm-smi).
+      '';
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    systemd.services.beszel-agent = {
+      description = "Beszel Server Monitoring Agent";
+
+      wantedBy = [ "multi-user.target" ];
+      wants = [ "network-online.target" ];
+      after = [ "network-online.target" ];
+
+      environment = cfg.environment;
+      path =
+        cfg.extraPath
+        ++ lib.optionals (builtins.elem "nvidia" config.services.xserver.videoDrivers) [
+          (lib.getBin config.hardware.nvidia.package)
+        ]
+        ++ lib.optionals (builtins.elem "amdgpu" config.services.xserver.videoDrivers) [
+          (lib.getBin pkgs.rocmPackages.rocm-smi)
+        ]
+        ++ lib.optionals (builtins.elem "intel" config.services.xserver.videoDrivers) [
+          (lib.getBin pkgs.intel-gpu-tools)
+        ];
+
+      serviceConfig = {
+        ExecStart = ''
+          ${cfg.package}/bin/beszel-agent
+        '';
+
+        EnvironmentFile = cfg.environmentFile;
+
+        # adds ability to monitor docker/podman containers
+        SupplementaryGroups =
+          lib.optionals config.virtualisation.docker.enable [ "docker" ]
+          ++ lib.optionals (
+            config.virtualisation.podman.enable && config.virtualisation.podman.dockerSocket.enable
+          ) [ "podman" ];
+
+        DynamicUser = true;
+        User = "beszel-agent";
+        LockPersonality = true;
+        NoNewPrivileges = true;
+        PrivateTmp = true;
+        PrivateUsers = true;
+        ProtectClock = true;
+        ProtectControlGroups = "strict";
+        ProtectHome = "read-only";
+        ProtectHostname = true;
+        ProtectKernelLogs = true;
+        ProtectKernelModules = true;
+        ProtectKernelTunables = true;
+        ProtectSystem = "strict";
+        Restart = "on-failure";
+        RestartSec = "30s";
+        RestrictRealtime = true;
+        RestrictSUIDSGID = true;
+        SystemCallArchitectures = "native";
+        SystemCallErrorNumber = "EPERM";
+        SystemCallFilter = [ "@system-service" ];
+        Type = "simple";
+        UMask = 27;
+      };
+    };
+
+    networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [
+      (
+        if (builtins.hasAttr "PORT" cfg.environment) then
+          (lib.strings.toInt cfg.environment.PORT)
+        else
+          45876
+      )
+    ];
+  };
+}

From c7e3e4546723650366ee18e4aa876856329d3b49 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 13 Oct 2025 12:52:20 +0200
Subject: [PATCH 1405/6226] nixos/tests/beszel: init

---
 nixos/tests/all-tests.nix          |   1 +
 nixos/tests/beszel.nix             | 119 +++++++++++++++++++++++++++++
 pkgs/by-name/be/beszel/package.nix |  14 ++--
 3 files changed, 129 insertions(+), 5 deletions(-)
 create mode 100644 nixos/tests/beszel.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 7ef0a3a4a368..3af4002a6aa2 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -266,6 +266,7 @@ in
   beanstalkd = runTest ./beanstalkd.nix;
   bees = runTest ./bees.nix;
   benchexec = runTest ./benchexec.nix;
+  beszel = runTest ./beszel.nix;
   binary-cache = runTest {
     imports = [ ./binary-cache.nix ];
     _module.args.compression = "zstd";
diff --git a/nixos/tests/beszel.nix b/nixos/tests/beszel.nix
new file mode 100644
index 000000000000..77a4a32a3747
--- /dev/null
+++ b/nixos/tests/beszel.nix
@@ -0,0 +1,119 @@
+{ pkgs, lib, ... }:
+{
+  name = "beszel";
+  meta.maintainers = with lib.maintainers; [ h7x4 ];
+
+  nodes = {
+    hubHost =
+      { config, pkgs, ... }:
+      {
+        virtualisation.vlans = [ 1 ];
+
+        systemd.network.networks."01-eth1" = {
+          name = "eth1";
+          networkConfig.Address = "10.0.0.1/24";
+        };
+
+        networking = {
+          useNetworkd = true;
+          useDHCP = false;
+        };
+
+        services.beszel.hub = {
+          enable = true;
+          host = "10.0.0.1";
+        };
+
+        networking.firewall.allowedTCPPorts = [
+          config.services.beszel.hub.port
+        ];
+
+        environment.systemPackages = [
+          config.services.beszel.hub.package
+        ];
+      };
+
+    agentHost =
+      { config, pkgs, ... }:
+      {
+        virtualisation.vlans = [ 1 ];
+
+        systemd.network.networks."01-eth1" = {
+          name = "eth1";
+          networkConfig.Address = "10.0.0.2/24";
+        };
+
+        networking = {
+          useNetworkd = true;
+          useDHCP = false;
+        };
+
+        environment.systemPackages = with pkgs; [ jq ];
+
+        specialisation."agent".configuration = {
+          services.beszel.agent = {
+            enable = true;
+            environment.HUB_URL = "http://10.0.0.1:8090";
+            environment.KEY_FILE = "/var/lib/beszel-agent/id_ed25519.pub";
+            environment.TOKEN_FILE = "/var/lib/beszel-agent/token";
+            openFirewall = true;
+          };
+        };
+      };
+  };
+
+  testScript =
+    { nodes, ... }:
+    let
+      hubCfg = nodes.hubHost.services.beszel.hub;
+      agentCfg = nodes.agentHost.specialisation."agent".configuration.services.beszel.agent;
+    in
+    ''
+      import json
+
+      start_all()
+
+      with subtest("Start hub"):
+        hubHost.wait_for_unit("beszel-hub.service")
+        hubHost.wait_for_open_port(${toString hubCfg.port}, "${toString hubCfg.host}")
+
+      with subtest("Register user"):
+        agentHost.succeed('curl -f --json \'${
+          builtins.toJSON {
+            email = "admin@example.com";
+            password = "password";
+          }
+        }\' "${agentCfg.environment.HUB_URL}/api/beszel/create-user"')
+        user = json.loads(agentHost.succeed('curl -f --json \'${
+          builtins.toJSON {
+            identity = "admin@example.com";
+            password = "password";
+          }
+        }\' ${agentCfg.environment.HUB_URL}/api/collections/users/auth-with-password').strip())
+
+      with subtest("Install agent credentials"):
+        agentHost.succeed("mkdir -p \"$(dirname '${agentCfg.environment.KEY_FILE}')\" \"$(dirname '${agentCfg.environment.TOKEN_FILE}')\"")
+        sshkey = agentHost.succeed(f"curl -H 'Authorization: {user["token"]}' -f ${agentCfg.environment.HUB_URL}/api/beszel/getkey | jq -r .key").strip()
+        utoken = agentHost.succeed(f"curl -H 'Authorization: {user["token"]}' -f ${agentCfg.environment.HUB_URL}/api/beszel/universal-token | jq -r .token").strip()
+        agentHost.succeed(f"echo '{sshkey}' > '${agentCfg.environment.KEY_FILE}'")
+        agentHost.succeed(f"echo '{utoken}' > '${agentCfg.environment.TOKEN_FILE}'")
+
+      with subtest("Register agent in hub"):
+        agentHost.succeed(f'curl -H \'Authorization: {user["token"]}\' -f --json \'{${
+          builtins.toJSON {
+            "host" = "10.0.0.2";
+            "name" = "agent";
+            "pkey" = "{sshkey}";
+            "port" = "45876";
+            "tkn" = "{utoken}";
+            "users" = ''{user['record']['id']}'';
+          }
+        }}\' "${agentCfg.environment.HUB_URL}/api/collections/systems/records"')
+
+      with subtest("Start agent"):
+        agentHost.succeed("/run/current-system/specialisation/agent/bin/switch-to-configuration switch")
+        agentHost.wait_for_unit("beszel-agent.service")
+        agentHost.wait_until_succeeds("journalctl -eu beszel-agent --grep 'SSH connection established'")
+        agentHost.wait_until_succeeds(f'curl -H \'Authorization: {user["token"]}\' -f ${agentCfg.environment.HUB_URL}/api/collections/systems/records | grep agentHost')
+    '';
+}
diff --git a/pkgs/by-name/be/beszel/package.nix b/pkgs/by-name/be/beszel/package.nix
index 79f012fdaea4..930f7b281482 100644
--- a/pkgs/by-name/be/beszel/package.nix
+++ b/pkgs/by-name/be/beszel/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   nix-update-script,
   buildNpmPackage,
+  nixosTests,
 }:
 buildGoModule rec {
   pname = "beszel";
@@ -62,11 +63,14 @@ buildGoModule rec {
     mv $out/bin/hub $out/bin/beszel-hub
   '';
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--subpackage"
-      "webui"
-    ];
+  passthru = {
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--subpackage"
+        "webui"
+      ];
+    };
+    tests.nixos = nixosTests.beszel;
   };
 
   meta = {

From 088c65a81fbf1412f36ecaec8b1c4aebb226b719 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 20:46:20 +0000
Subject: [PATCH 1406/6226] vscode-extensions.continue.continue: 1.2.9 ->
 1.2.10

---
 .../vscode/extensions/continue.continue/default.nix    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix b/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix
index 88121258de9b..dd00d0294258 100644
--- a/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-zcP+oV7+xpXN5ZSvxw03XborEp2i9+3r1Hbv6sFq2rM=";
+          hash = "sha256-NuJK5BjEsGeNQ2lBOHc5zPVzblwaS51hMUiYNtpQVlw=";
         };
         "x86_64-darwin" = {
           arch = "darwin-x64";
-          hash = "sha256-/nP0e3IHZtmsgTzNlJk9WOtg3jm6kpVGBaC5RMIvaII=";
+          hash = "sha256-6+X7h6AHmCwTmH0gOoB9Mb8yEsmmyJEQ58sSVrqSTeA=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-WhIMbgMJE4FK83qmjCPobwNIzcGVU56jOw5v2Q4oIhU=";
+          hash = "sha256-mvYWAEKoQODGgZ4CaJ5xlGnwEBatMU2oecSM2hVmRog=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-gThzjcah7MWBKVkViDWJ5Z0epxy+9aWFpcFt4KI9zzQ=";
+          hash = "sha256-5EsFUBJie2zNtlwJYIcFndkNPDDsZlUAggLwF1QESug=";
         };
       };
     in
     {
       name = "continue";
       publisher = "Continue";
-      version = "1.2.9";
+      version = "1.2.10";
     }
     // sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}");
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];

From 844e0ecf4f9a9af807e55f91e23d5da861d76926 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 20:47:42 +0000
Subject: [PATCH 1407/6226] clever-tools: 4.1.0 -> 4.2.0

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

diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix
index 10f9dcc93525..c5b6683f55e3 100644
--- a/pkgs/by-name/cl/clever-tools/package.nix
+++ b/pkgs/by-name/cl/clever-tools/package.nix
@@ -11,7 +11,7 @@
 buildNpmPackage rec {
   pname = "clever-tools";
 
-  version = "4.1.0";
+  version = "4.2.0";
 
   nodejs = nodejs_22;
 
@@ -19,10 +19,10 @@ buildNpmPackage rec {
     owner = "CleverCloud";
     repo = "clever-tools";
     rev = version;
-    hash = "sha256-ntKxMlRBE0WoaO2Fmpymhm7y7kCwe197sotNzpK92C4=";
+    hash = "sha256-1llFIq5F4FTxJuIdFov8+XExAZmfIMy81fP7OT2JbbE=";
   };
 
-  npmDepsHash = "sha256-GsJlrz41q9GvFpYZcauuGXgMCG6mqSuI5gy+hxlJfUQ=";
+  npmDepsHash = "sha256-UzjGYHIG2fza4HJqiha0dyIqKY9v0O9YvbmcMUcMhAY=";
 
   nativeBuildInputs = [
     installShellFiles

From 3c25c6c08bec800eab39577d931c89817ddf4b73 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 21 Oct 2025 13:50:22 -0700
Subject: [PATCH 1408/6226] python3Packages.symbex: disable tests broken due to
 click 8.2.0

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

diff --git a/pkgs/development/python-modules/symbex/default.nix b/pkgs/development/python-modules/symbex/default.nix
index 47405f4b8223..94cb8baf6d0b 100644
--- a/pkgs/development/python-modules/symbex/default.nix
+++ b/pkgs/development/python-modules/symbex/default.nix
@@ -35,6 +35,15 @@ buildPythonPackage rec {
     writableTmpDirAsHomeHook
   ];
 
+  disabledTests = [
+    # Broken due to click 8.2.0 update
+    # https://github.com/simonw/symbex/issues/48
+    "test_output"
+    "test_replace"
+    "test_replace_errors"
+    "test_errors"
+  ];
+
   meta = {
     description = "Find the Python code for specified symbols";
     homepage = "https://github.com/simonw/symbex";

From 92e3f287b9f0edec40874c55540e4d3d4bf2d8ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 20:52:57 +0000
Subject: [PATCH 1409/6226] cargo-bundle-licenses: 4.0.0 -> 4.2.0

---
 pkgs/by-name/ca/cargo-bundle-licenses/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
index f286cc526ec4..4fdd5adb7bea 100644
--- a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
+++ b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-bundle-licenses";
-  version = "4.0.0";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "sstadick";
     repo = "cargo-bundle-licenses";
     rev = "v${version}";
-    hash = "sha256-pTxZ9s8ZccylMfEiifYmJuBB+riZ37QJSAMpVuSgLzs=";
+    hash = "sha256-L3hmgDwzL6lLa0LCg/V5QeNK2U1u2dJMO4+t6W1UvxI=";
   };
 
-  cargoHash = "sha256-4zolwQzK6dnFIcS2NwuxYZRS2AGcUGHh+KQzDkI0J6c=";
+  cargoHash = "sha256-HHBFT4u0NPjhKJa3KNg8/AgkgNoFUkMWmioVaXYlD2M=";
 
   meta = with lib; {
     description = "Generate a THIRDPARTY file with all licenses in a cargo project";

From 51327b083653a8d2a49e89526848036cd556f078 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 20:55:19 +0000
Subject: [PATCH 1410/6226] capypdf: 0.17.0 -> 0.18.0

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

diff --git a/pkgs/by-name/ca/capypdf/package.nix b/pkgs/by-name/ca/capypdf/package.nix
index c63246a73824..51f3a492ae3a 100644
--- a/pkgs/by-name/ca/capypdf/package.nix
+++ b/pkgs/by-name/ca/capypdf/package.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "capypdf";
-  version = "0.17.0";
+  version = "0.18.0";
 
   outputs = [
     "out"
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "jpakkane";
     repo = "capypdf";
     rev = finalAttrs.version;
-    hash = "sha256-hdutgZhJwUi+wwtYt3+hSiyBImchUtbpVd0RCPWEr0Q=";
+    hash = "sha256-FivwBSpaIpkdKPYk7FuwpcBCYq59XH7SouA47rmGSaQ=";
   };
 
   nativeBuildInputs = [

From af22d2daae2bb31e068302dbf250bb72aad6f881 Mon Sep 17 00:00:00 2001
From: Pui Yong Qing <puiyongqing@gmail.com>
Date: Wed, 22 Oct 2025 04:50:23 +0800
Subject: [PATCH 1411/6226] gradle-completion: 1.5.2 -> 1.6.0

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

diff --git a/pkgs/by-name/gr/gradle-completion/package.nix b/pkgs/by-name/gr/gradle-completion/package.nix
index 228b89f3b4db..67c9555f9bb7 100644
--- a/pkgs/by-name/gr/gradle-completion/package.nix
+++ b/pkgs/by-name/gr/gradle-completion/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "gradle-completion";
-  version = "1.5.2";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "gradle";
     repo = "gradle-completion";
-    rev = "v${finalAttrs.version}";
-    sha256 = "u3bnvNkjKzNp604hnPoAT3YY3Xf9eJlAe174YnM2RMQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-HY/woUOzkRVb6ekIaQrY1+5pKxd5+cpG74+xqzpkazs=";
   };
 
   nativeBuildInputs = [

From eb0d99b67dfe3f9934275fc8a558031574140925 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Tue, 21 Oct 2025 21:42:57 +0300
Subject: [PATCH 1412/6226] spek: update meta.homepage to a relevant URL

Use HTTPS + `www` subdomain for a proper cert.
---
 pkgs/by-name/sp/spek/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sp/spek/package.nix b/pkgs/by-name/sp/spek/package.nix
index 0ebaefd3550f..5ff36e44fdbd 100644
--- a/pkgs/by-name/sp/spek/package.nix
+++ b/pkgs/by-name/sp/spek/package.nix
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   meta = {
     description = "Analyse your audio files by showing their spectrogram";
-    homepage = "http://spek.cc/";
+    homepage = "https://www.spek.cc/";
     license = lib.licenses.gpl3;
     maintainers = with lib.maintainers; [ bjornfor ];
     platforms = lib.platforms.all;

From e2a14b9697ba960be0ae8a08693bfa460ddcb999 Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Tue, 21 Oct 2025 15:20:04 -0600
Subject: [PATCH 1413/6226] amazon-q-cli: 1.17.1 -> 1.18.1

---
 pkgs/by-name/am/amazon-q-cli/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/am/amazon-q-cli/package.nix b/pkgs/by-name/am/amazon-q-cli/package.nix
index 8690a64d5509..235b5a2c1d07 100644
--- a/pkgs/by-name/am/amazon-q-cli/package.nix
+++ b/pkgs/by-name/am/amazon-q-cli/package.nix
@@ -3,24 +3,27 @@
   fetchFromGitHub,
   rustPlatform,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "amazon-q-cli";
-  version = "1.17.1";
+  version = "1.18.1";
+
+  passthru.updateScript = nix-update-script { };
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "amazon-q-developer-cli";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-bRin4JKnBsWLvk+dIwHWAf4KKD1n6FOf2wICYNZpHd4=";
+    tag = finalAttrs.version;
+    hash = "sha256-wAcxXDEadPgyb3OpQXWxOEX3AMtf0ubx0J/H9Iff+rk=";
   };
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
   ];
 
-  cargoHash = "sha256-Isa7kxnov4D+Sd7b4LJW52TIR864CDFkAjAHJoVQRcA=";
+  cargoHash = "sha256-jjx9HBJQ5eTS8+0Wus8hfNPZ+eETKHjjX3BsEq2LRn0=";
 
   cargoBuildFlags = [
     "-p"

From bb56489b2f29eb99fc9bcd3112e081b05bd7b98b Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Wed, 22 Oct 2025 00:20:17 +0300
Subject: [PATCH 1414/6226] lib/types: small typo fix

---
 lib/types.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/types.nix b/lib/types.nix
index d1220e18828d..ae77c9fcf8cb 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -1464,7 +1464,7 @@ let
                         One or more definitions did not pass the type-check of the 'either' type.
                         ${headError.message}
                         If `either`, `oneOf` or similar is used in freeformType, ensure that it is preceded by an 'attrsOf' such as: `freeformType = types.attrsOf (types.either t1 t2)`.
-                        Otherwise consider using the correct type for the option `${showOption loc}`.  This will be an error in Nixpkgs 26.06.
+                        Otherwise consider using the correct type for the option `${showOption loc}`.  This will be an error in Nixpkgs 26.05.
                       '' (mergeOneOption loc defs);
                     };
               in

From 2359adf5838ec0cc20ab37ccf3a669963151d593 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 21:34:51 +0000
Subject: [PATCH 1415/6226] python3Packages.lacuscore: 1.19.1 -> 1.19.2

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

diff --git a/pkgs/development/python-modules/lacuscore/default.nix b/pkgs/development/python-modules/lacuscore/default.nix
index 70b208bd794d..0313e19e055e 100644
--- a/pkgs/development/python-modules/lacuscore/default.nix
+++ b/pkgs/development/python-modules/lacuscore/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "lacuscore";
-  version = "1.19.1";
+  version = "1.19.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ail-project";
     repo = "LacusCore";
     tag = "v${version}";
-    hash = "sha256-5cMgeZlbgK+YixHiwnolqxLUVNbfVdabtVZWZIGzjdk=";
+    hash = "sha256-8cAN560wg2MwZ9EooHVz3dsoNC5WQWhCAGqu48ZeRtY=";
   };
 
   pythonRelaxDeps = [

From ed877db3b51389eae3ed2a9abf6fa01d322d2bf5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 21:39:05 +0000
Subject: [PATCH 1416/6226] ni: 26.1.0 -> 27.0.0

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

diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix
index 476baccd55c9..5d350458f138 100644
--- a/pkgs/by-name/ni/ni/package.nix
+++ b/pkgs/by-name/ni/ni/package.nix
@@ -13,19 +13,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ni";
-  version = "26.1.0";
+  version = "27.0.0";
 
   src = fetchFromGitHub {
     owner = "antfu-collective";
     repo = "ni";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vde0NUOWVfdrJUgYBLP4C3I+lFv3YJVtcqUgB7Nx2b0=";
+    hash = "sha256-Yh159OpM4LPWJMO2Jv8xkzqRFurgK8EAQDyUIhWfHZ4=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-aNRWBnlZ72OmU619L99aVqL317w4gSaJNtoO25u+s40=";
+    hash = "sha256-pg2zFm84sqTRM/KaNxnvtZMZHhgdrThPoMV58KKbvHA=";
   };
 
   nativeBuildInputs = [

From 9be06f56c66a69ce817938a38dc235b156fcf9ca Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 21 Oct 2025 23:40:04 +0200
Subject: [PATCH 1417/6226] percona-server_8_0: 8.0.42-33 -> 8.0.43-34

Fixes CVE-2025-50078, CVE-2025-50082, CVE-2025-50083, CVE-2025-50085,
CVE-2025-50077, CVE-2025-50092, CVE-2025-50099, CVE-2025-50086,
CVE-2025-50093, CVE-2025-50094, CVE-2025-50079, CVE-2025-50084,
CVE-2025-50087, CVE-2025-50091, CVE-2025-50101, CVE-2025-50102,
CVE-2025-53023, CVE-2025-50097, CVE-2025-50080, CVE-2025-50096,
CVE-2025-50081, CVE-2025-50104, CVE-2025-50098 and CVE-2025-50100.

https://www.oracle.com/security-alerts/cpujul2025.html#AppendixMSQL

https://docs.percona.com/percona-distribution-for-mysql/8.0/release-notes-ps-v8.0.43.html
---
 pkgs/servers/sql/percona-server/8_0.nix       |   8 +-
 .../sql/percona-server/libcpp-fixes.patch     | 207 ------------------
 2 files changed, 3 insertions(+), 212 deletions(-)
 delete mode 100644 pkgs/servers/sql/percona-server/libcpp-fixes.patch

diff --git a/pkgs/servers/sql/percona-server/8_0.nix b/pkgs/servers/sql/percona-server/8_0.nix
index 8cdca01efb1e..ff1f517af0e8 100644
--- a/pkgs/servers/sql/percona-server/8_0.nix
+++ b/pkgs/servers/sql/percona-server/8_0.nix
@@ -43,11 +43,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "percona-server";
-  version = "8.0.42-33";
+  version = "8.0.43-34";
 
   src = fetchurl {
-    url = "https://www.percona.com/downloads/Percona-Server-8.0/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";
-    hash = "sha256-UDdmBz1RVjX/kRivvk69GPdtjLjWTglKxteiLxXKQGc=";
+    url = "https://downloads.percona.com/downloads/Percona-Server-8.0/Percona-Server-${finalAttrs.version}/source/tarball/percona-server-${finalAttrs.version}.tar.gz";
+    hash = "sha256-RGm144c1WfNm62MsfCMeAapwDBucE8zoaQhdvh7JID4=";
   };
 
   nativeBuildInputs = [
@@ -63,8 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ];
 
   patches = [
-    # adapted from mysql80's llvm 19 fixes
-    ./libcpp-fixes.patch
     # fixes using -DWITH_SSL=system with CMAKE_PREFIX_PATH on darwin
     # https://github.com/Homebrew/homebrew-core/pull/204799
     (fetchpatch {
diff --git a/pkgs/servers/sql/percona-server/libcpp-fixes.patch b/pkgs/servers/sql/percona-server/libcpp-fixes.patch
deleted file mode 100644
index 7e8de096415e..000000000000
--- a/pkgs/servers/sql/percona-server/libcpp-fixes.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-diff --git a/include/my_char_traits.h b/include/my_char_traits.h
-new file mode 100644
-index 00000000000..6336bc039c8
---- /dev/null
-+++ b/include/my_char_traits.h
-@@ -0,0 +1,65 @@
-+/* Copyright (c) 2024, Oracle and/or its affiliates.
-+
-+   This program is free software; you can redistribute it and/or modify
-+   it under the terms of the GNU General Public License, version 2.0,
-+   as published by the Free Software Foundation.
-+
-+   This program is designed to work with certain software (including
-+   but not limited to OpenSSL) that is licensed under separate terms,
-+   as designated in a particular file or component or in included license
-+   documentation.  The authors of MySQL hereby grant you an additional
-+   permission to link the program and your derivative works with the
-+   separately licensed software that they have either included with
-+   the program or referenced in the documentation.
-+
-+   This program is distributed in the hope that it will be useful,
-+   but WITHOUT ANY WARRANTY; without even the implied warranty of
-+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+   GNU General Public License, version 2.0, for more details.
-+
-+   You should have received a copy of the GNU General Public License
-+   along with this program; if not, write to the Free Software
-+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
-+
-+#ifndef MY_CHAR_TRAITS_INCLUDED
-+#define MY_CHAR_TRAITS_INCLUDED
-+
-+#include <cstring>
-+
-+template <class CharT>
-+struct my_char_traits;
-+
-+/*
-+  This is a standards-compliant, drop-in replacement for
-+    std::char_traits<unsigned char>
-+  We need this because clang libc++ is removing support for it in clang 19.
-+  It is not a complete implementation. Rather we implement just enough to
-+  compile any usage of char_traits<uchar> we have in our codebase.
-+ */
-+template <>
-+struct my_char_traits<unsigned char> {
-+  using char_type = unsigned char;
-+  using int_type = unsigned int;
-+
-+  static void assign(char_type &c1, const char_type &c2) { c1 = c2; }
-+
-+  static char_type *assign(char_type *s, std::size_t n, char_type a) {
-+    return static_cast<char_type *>(memset(s, a, n));
-+  }
-+
-+  static int compare(const char_type *s1, const char_type *s2, std::size_t n) {
-+    return memcmp(s1, s2, n);
-+  }
-+
-+  static char_type *move(char_type *s1, const char_type *s2, std::size_t n) {
-+    if (n == 0) return s1;
-+    return static_cast<char_type *>(memmove(s1, s2, n));
-+  }
-+
-+  static char_type *copy(char_type *s1, const char_type *s2, std::size_t n) {
-+    if (n == 0) return s1;
-+    return static_cast<char_type *>(memcpy(s1, s2, n));
-+  }
-+};
-+
-+#endif  // MY_CHAR_TRAITS_INCLUDED
-diff --git a/sql/mdl_context_backup.h b/sql/mdl_context_backup.h
-index 89e7e23df34..cf9c307ec2d 100644
---- a/sql/mdl_context_backup.h
-+++ b/sql/mdl_context_backup.h
-@@ -28,6 +28,7 @@
- #include <map>
- #include <memory>
- 
-+#include "my_char_traits.h"
- #include "sql/malloc_allocator.h"
- #include "sql/mdl.h"
- 
-@@ -47,7 +48,8 @@ class MDL_context_backup_manager {
-   /**
-     Key for uniquely identifying MDL_context in the MDL_context_backup map.
-   */
--  typedef std::basic_string<uchar> MDL_context_backup_key;
-+  using MDL_context_backup_key =
-+      std::basic_string<uchar, my_char_traits<uchar>>;
- 
-   class MDL_context_backup;
- 
-diff --git a/sql/range_optimizer/index_range_scan_plan.cc b/sql/range_optimizer/index_range_scan_plan.cc
-index 74fbb100397..8ed1f50da33 100644
---- a/sql/range_optimizer/index_range_scan_plan.cc
-+++ b/sql/range_optimizer/index_range_scan_plan.cc
-@@ -54,6 +54,8 @@
- #include "sql/thr_malloc.h"
- #include "sql_string.h"
- 
-+#include "my_char_traits.h"
-+
- using opt_range::null_element;
- using std::max;
- using std::min;
-@@ -1025,8 +1027,8 @@ static bool null_part_in_key(KEY_PART *key_part, const uchar *key,
- 
- // TODO(sgunders): This becomes a bit simpler with C++20's string_view
- // constructors.
--static inline std::basic_string_view<uchar> make_string_view(const uchar *start,
--                                                             const uchar *end) {
-+static inline std::basic_string_view<uchar, my_char_traits<uchar>>
-+make_string_view(const uchar *start, const uchar *end) {
-   return {start, static_cast<size_t>(end - start)};
- }
- 
-diff --git a/sql/stream_cipher.h b/sql/stream_cipher.h
-index 606d40645c6..358fbb41959 100644
---- a/sql/stream_cipher.h
-+++ b/sql/stream_cipher.h
-@@ -28,6 +28,8 @@
- #include <memory>
- #include <string>
- 
-+#include "my_char_traits.h"
-+
- /**
-   @file stream_cipher.h
- 
-@@ -35,7 +37,8 @@
-          binary log files.
- */
- 
--typedef std::basic_string<unsigned char> Key_string;
-+using Key_string =
-+    std::basic_string<unsigned char, my_char_traits<unsigned char>>;
- 
- /**
-   @class Stream_cipher
-diff --git a/unittest/gunit/binlogevents/transaction_compression-t.cc b/unittest/gunit/binlogevents/transaction_compression-t.cc
-index ba13f979aa3..01af0e3a360 100644
---- a/unittest/gunit/binlogevents/transaction_compression-t.cc
-+++ b/unittest/gunit/binlogevents/transaction_compression-t.cc
-@@ -23,6 +23,7 @@
- */
- 
- #include <array>
-+#include <string>
- 
- #include <gtest/gtest.h>
- #include "libbinlogevents/include/binary_log.h"
-@@ -51,14 +52,13 @@ class TransactionPayloadCompressionTest : public ::testing::Test {
-   using Managed_buffer_t = Decompressor_t::Managed_buffer_t;
-   using Size_t = Decompressor_t::Size_t;
-   using Char_t = Decompressor_t::Char_t;
--  using String_t = std::basic_string<Char_t>;
-   using Decompress_status_t =
-       binary_log::transaction::compression::Decompress_status;
-   using Compress_status_t =
-       binary_log::transaction::compression::Compress_status;
- 
--  static String_t constant_data(Size_t size) {
--    return String_t(size, (Char_t)'a');
-+  static std::string constant_data(Size_t size) {
-+    return std::string(size, (Char_t)'a');
-   }
- 
-  protected:
-@@ -69,7 +69,7 @@ class TransactionPayloadCompressionTest : public ::testing::Test {
-   void TearDown() override {}
- 
-   static void compression_idempotency_test(Compressor_t &c, Decompressor_t &d,
--                                           String_t data) {
-+                                           const std::string &data) {
-     auto debug_string = concat(
-         binary_log::transaction::compression::type_to_string(c.get_type_code()),
-         " ", data.size());
-@@ -104,8 +104,8 @@ class TransactionPayloadCompressionTest : public ::testing::Test {
- 
-     // Check decompressed data
-     ASSERT_EQ(managed_buffer.read_part().size(), data.size()) << debug_string;
--    ASSERT_EQ(data, String_t(managed_buffer.read_part().begin(),
--                             managed_buffer.read_part().end()))
-+    ASSERT_EQ(data, std::string(managed_buffer.read_part().begin(),
-+                                managed_buffer.read_part().end()))
-         << debug_string;
- 
-     // Check that we reached EOF
-@@ -118,7 +118,7 @@ TEST_F(TransactionPayloadCompressionTest, CompressDecompressZstdTest) {
-   for (auto size : buffer_sizes) {
-     binary_log::transaction::compression::Zstd_dec d;
-     binary_log::transaction::compression::Zstd_comp c;
--    String_t data{TransactionPayloadCompressionTest::constant_data(size)};
-+    std::string data{TransactionPayloadCompressionTest::constant_data(size)};
-     TransactionPayloadCompressionTest::compression_idempotency_test(c, d, data);
-     c.set_compression_level(22);
-     TransactionPayloadCompressionTest::compression_idempotency_test(c, d, data);
-@@ -129,7 +129,7 @@ TEST_F(TransactionPayloadCompressionTest, CompressDecompressNoneTest) {
-   for (auto size : buffer_sizes) {
-     binary_log::transaction::compression::None_dec d;
-     binary_log::transaction::compression::None_comp c;
--    String_t data{TransactionPayloadCompressionTest::constant_data(size)};
-+    std::string data{TransactionPayloadCompressionTest::constant_data(size)};
-     TransactionPayloadCompressionTest::compression_idempotency_test(c, d, data);
-   }
- }

From 30d5d5f2feb5d4acf8158de04d63d0e6457ff490 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 21 Oct 2025 14:42:31 -0700
Subject: [PATCH 1418/6226] python3Packages.chromadb: fix cargo vendor file
 name

---
 pkgs/development/python-modules/chromadb/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix
index b2dea382959b..dd2fff079397 100644
--- a/pkgs/development/python-modules/chromadb/default.nix
+++ b/pkgs/development/python-modules/chromadb/default.nix
@@ -78,8 +78,7 @@ buildPythonPackage rec {
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src;
-    name = "${pname}-${version}-vendor";
+    inherit pname version src;
     hash = "sha256-GlF8Fp42ra5d55PIGOS4zOHXPSaIZGI/l8sHz/wyDgo=";
   };
 

From b0322c6ceaf44cddd96619051a6104b9d2aeefc5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 21:43:05 +0000
Subject: [PATCH 1419/6226] mtail: 3.2.20 -> 3.2.21

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

diff --git a/pkgs/by-name/mt/mtail/package.nix b/pkgs/by-name/mt/mtail/package.nix
index 7e8eee04a0be..985979582720 100644
--- a/pkgs/by-name/mt/mtail/package.nix
+++ b/pkgs/by-name/mt/mtail/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "mtail";
-  version = "3.2.20";
+  version = "3.2.21";
 
   src = fetchFromGitHub {
     owner = "jaqx0r";
     repo = "mtail";
     rev = "v${version}";
-    hash = "sha256-w895q6J0o4a4y3YwGWyu5tpv7ow9RNWEFQVIMDJo43Y=";
+    hash = "sha256-i5c9e7b7PmvFdNddngsCIx4GKYqPPwTZSUoNAIL8RZ4=";
   };
 
   vendorHash = "sha256-hVguLf/EkTz7Z8lTT9tCQ8iGO5asSkrsW+u8D1ND+dw=";

From 5902b308bc71883a3c1464177cd070060af3fc62 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 21:49:27 +0000
Subject: [PATCH 1420/6226] python3Packages.pynitrokey: 0.10.0 -> 0.11.1

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

diff --git a/pkgs/development/python-modules/pynitrokey/default.nix b/pkgs/development/python-modules/pynitrokey/default.nix
index 1ce0824e3d39..637fdab9c909 100644
--- a/pkgs/development/python-modules/pynitrokey/default.nix
+++ b/pkgs/development/python-modules/pynitrokey/default.nix
@@ -25,7 +25,7 @@
 
 let
   pname = "pynitrokey";
-  version = "0.10.0";
+  version = "0.11.1";
   mainProgram = "nitropy";
 in
 
@@ -35,7 +35,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Kr6VtBADLvXUva7csbsHujGzBfRG1atJLF7qbIWmToM=";
+    hash = "sha256-TUc8ZDQ0MHyEtrsudqGxTXmwNIio4UcNcjwsOtaK0Ww=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From bc23f1e7637ce90657d746653b44b6ff8a96f4b6 Mon Sep 17 00:00:00 2001
From: fleaz <mail@felixbreidenstein.de>
Date: Tue, 21 Oct 2025 23:50:02 +0200
Subject: [PATCH 1421/6226] prometheus-storagebox-exporter:
 0-unstable-2025-07-28 -> 1.0.0

---
 .../pr/prometheus-storagebox-exporter/package.nix      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix b/pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix
index 9a4dbd6d1a46..f9b5b50b1696 100644
--- a/pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix
@@ -4,18 +4,18 @@
   fetchFromGitHub,
 }:
 
-buildGoModule {
+buildGoModule rec {
   pname = "prometheus-storagebox-exporter";
-  version = "0-unstable-2025-07-28";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "fleaz";
     repo = "prometheus-storagebox-exporter";
-    hash = "sha256-HGUAvoLIVXwZT/CJ1yj9H6ClNRwiJ8rjjluAQ6GdBME=";
-    rev = "e03cfd5f60f7847b74de2f6f47690bc03b7c157a";
+    hash = "sha256-sufxNnHAdOaYEzKj9vriDrJF6Tq4Eim3Z45FEuuG97Q=";
+    tag = "v${version}";
   };
 
-  vendorHash = "sha256-w2S8LWQyDLnUba7+YnTk7GhRXR/agbF5GFIeOPk8w64=";
+  vendorHash = "sha256-hWM7JnL0x+vsUrQsJZGM3z2jB3F1wtjKWmX8j+WnjKY=";
 
   meta = {
     description = "Prometheus exporter for Hetzner storage boxes";

From 9795e17f9919b0df2423cdb56c073025aa04d35a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 21:57:27 +0000
Subject: [PATCH 1422/6226] python3Packages.pyportainer: 1.0.3 -> 1.0.4

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

diff --git a/pkgs/development/python-modules/pyportainer/default.nix b/pkgs/development/python-modules/pyportainer/default.nix
index 145ad7676d87..13c7411a45d1 100644
--- a/pkgs/development/python-modules/pyportainer/default.nix
+++ b/pkgs/development/python-modules/pyportainer/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pyportainer";
-  version = "1.0.3";
+  version = "1.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "erwindouna";
     repo = "pyportainer";
     tag = "v${version}";
-    hash = "sha256-Y/O2lhsjkSEKQL7HhdmlzMjY1597uuUOFfI05aLiBXg=";
+    hash = "sha256-jEUVAbNwBil5k6eNtuzspMvXDhFXktopwl/YCvnK2ko=";
   };
 
   build-system = [ poetry-core ];

From 24f5f977bbdf4d82fc43c31854d4f2ae7a180bc2 Mon Sep 17 00:00:00 2001
From: Alexander Iliev <ailiev@mamul.org>
Date: Fri, 20 Dec 2024 21:00:10 +0200
Subject: [PATCH 1423/6226] ubootNanoPiR5S: init

Adds uboot build for FriendlyElec NanoPi R5S.

The board fits well in network scenarios, as it provides three
Ethernet ports (1x1Gbe and 2x2.5Gbe).

Board Wiki: https://wiki.friendlyelec.com/wiki/index.php/NanoPi_R5S
---
 pkgs/misc/uboot/default.nix     | 11 +++++++++++
 pkgs/top-level/all-packages.nix |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 559da3d2c48d..15977020a903 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -395,6 +395,17 @@ in
     ];
   };
 
+  ubootNanoPiR5S = buildUBoot {
+    defconfig = "nanopi-r5s-rk3568_defconfig";
+    extraMeta.platforms = [ "aarch64-linux" ];
+    BL31 = rkbin.BL31_RK3568;
+    ROCKCHIP_TPL = rkbin.TPL_RK3568;
+    filesToInstall = [
+      "idbloader.img"
+      "u-boot.itb"
+    ];
+  };
+
   ubootNovena = buildUBoot {
     defconfig = "novena_defconfig";
     extraMeta.platforms = [ "armv7l-linux" ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1084db40b90f..2835fa2de0d4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10371,6 +10371,7 @@ with pkgs;
     ubootLibreTechCC
     ubootNanoPCT4
     ubootNanoPCT6
+    ubootNanoPiR5S
     ubootNovena
     ubootOdroidC2
     ubootOdroidXU3

From 9665c292222585483ee6549413c590fafccbe004 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 22:00:50 +0000
Subject: [PATCH 1424/6226] python3Packages.cometx: 3.0.1 -> 3.1.0

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

diff --git a/pkgs/development/python-modules/cometx/default.nix b/pkgs/development/python-modules/cometx/default.nix
index eb83df977162..c232b0b2c56a 100644
--- a/pkgs/development/python-modules/cometx/default.nix
+++ b/pkgs/development/python-modules/cometx/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "cometx";
-  version = "3.0.1";
+  version = "3.1.0";
 
   pyproject = true;
   build-system = [ setuptools ];
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "comet-ml";
     repo = "cometx";
     tag = version;
-    hash = "sha256-Dudg1GLeo9WhtZnW+PEi10pxA+EDUBs2u3oIBMN8w30=";
+    hash = "sha256-7rxEJNmJsFExfvYCuO/JOgj7yRFBjceE1bhRL1hFoPU=";
   };
 
   dependencies = [

From 69589546bf4442f0b5687557b34ad493e3efa68b Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sun, 12 Oct 2025 04:25:49 +0200
Subject: [PATCH 1425/6226] linuxPackages.virtualboxGuestAdditions: Add depmod
 config

The 3rdparty VirtualBox guest kernel modules conflict with the ones in
the mainline Linux kernel, which is why the mainline modules are not
enabled in the NixOS kernel configuration. In order to resolve the
conflict, add a configuration for depmod allowing to override the
search paths for these modules. So, if this package is added to
`boot.extraModulePackages` then depmod will read the configuration and
it will use these modules instead of the mainline ones.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 .../virtualization/virtualbox/guest-additions/default.nix  | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 642a4f59c770..741aa1295a64 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -4,6 +4,7 @@
   callPackage,
   lib,
   dbus,
+  kmod,
   xorg,
   zlib,
   patchelf,
@@ -81,6 +82,7 @@ stdenv.mkDerivation {
     patchelf
     makeWrapper
     virtualBoxNixGuestAdditionsBuilder
+    kmod
   ]
   ++ kernel.moduleBuildDependencies;
 
@@ -140,6 +142,11 @@ stdenv.mkDerivation {
     # libGL.so (which we can't), and Oracle doesn't plan on supporting libglvnd
     # either. (#18457)
 
+    mkdir -p $out/etc/depmod.d
+    for mod in $out/lib/modules/*/misc/*; do
+      echo "override $(modinfo -F name "$mod") * misc" >> $out/etc/depmod.d/vbox.conf
+    done
+
     runHook postInstall
   '';
 

From 047bd6a5b7cf197817d87f2b99f3fb2015f9b15f Mon Sep 17 00:00:00 2001
From: prescientmoon <git@moonythm.dev>
Date: Wed, 22 Oct 2025 00:12:38 +0200
Subject: [PATCH 1426/6226] pounce: migrate to finalAttrs

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

diff --git a/pkgs/by-name/po/pounce/package.nix b/pkgs/by-name/po/pounce/package.nix
index 84fac59714c6..e7ca38499fd2 100644
--- a/pkgs/by-name/po/pounce/package.nix
+++ b/pkgs/by-name/po/pounce/package.nix
@@ -7,12 +7,12 @@
   libxcrypt,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pounce";
   version = "3.1";
 
   src = fetchzip {
-    url = "https://git.causal.agency/pounce/snapshot/pounce-${version}.tar.gz";
+    url = "https://git.causal.agency/pounce/snapshot/pounce-${finalAttrs.version}.tar.gz";
     sha256 = "sha256-6PGiaU5sOwqO4V2PKJgIi3kI2jXsBOldEH51D7Sx9tg=";
   };
 
@@ -36,4 +36,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = with maintainers; [ edef ];
   };
-}
+})

From c06ad375ebc8b7bc5e7c87cdef14166e61195978 Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Tue, 21 Oct 2025 23:54:58 +0200
Subject: [PATCH 1427/6226] android-udev-rules: drop

As of systemd 258 adb and fastboot connections are handled by a built-in
uaccess rule, so a dedicated package with hardcoded ID-based udev rules
is no longer needed.

Drop the android-udev-rules package and related mentions of the adbusers
group, which is also no longer used.
---
 doc/release-notes/rl-2511.section.md          |  2 +
 nixos/modules/programs/adb.nix                |  4 --
 nixos/modules/programs/envision.nix           |  1 -
 nixos/modules/services/video/wivrn.nix        |  1 -
 .../by-name/an/android-udev-rules/package.nix | 44 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 6 files changed, 3 insertions(+), 50 deletions(-)
 delete mode 100644 pkgs/by-name/an/android-udev-rules/package.nix

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index ec1bec180d02..d9a0e065b598 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -180,6 +180,8 @@
 
 - `proton-caller` has been removed due to lack of upstream maintenance.
 
+- `android-udev-rules` has been removed, as it is effectively superseded by built-in uaccess rules in systemd.
+
 - `lima` package now only includes the guest agent for the host's architecture by default. If your guest VM's architecture differs from your Lima host's, you'll need to enable the `lima-additional-guestagents` package by setting `withAdditionalGuestAgents = true` when overriding lima with this input.
 
 - `mongodb-6_0` was removed as it is end of life as of 2025-07-31.
diff --git a/nixos/modules/programs/adb.nix b/nixos/modules/programs/adb.nix
index 28182df9cc23..4ae2569049ed 100644
--- a/nixos/modules/programs/adb.nix
+++ b/nixos/modules/programs/adb.nix
@@ -16,8 +16,6 @@
         type = lib.types.bool;
         description = ''
           Whether to configure system to use Android Debug Bridge (adb).
-          To grant access to a user, it must be part of adbusers group:
-          `users.users.alice.extraGroups = ["adbusers"];`
         '';
       };
     };
@@ -25,8 +23,6 @@
 
   ###### implementation
   config = lib.mkIf config.programs.adb.enable {
-    services.udev.packages = [ pkgs.android-udev-rules ];
     environment.systemPackages = [ pkgs.android-tools ];
-    users.groups.adbusers = { };
   };
 }
diff --git a/nixos/modules/programs/envision.nix b/nixos/modules/programs/envision.nix
index 02f7ba5fdbeb..b31980f03eb8 100644
--- a/nixos/modules/programs/envision.nix
+++ b/nixos/modules/programs/envision.nix
@@ -34,7 +34,6 @@ in
     services.udev = {
       enable = true;
       packages = with pkgs; [
-        android-udev-rules
         xr-hardware
       ];
     };
diff --git a/nixos/modules/services/video/wivrn.nix b/nixos/modules/services/video/wivrn.nix
index 6f4538964283..9c7250fb7d08 100644
--- a/nixos/modules/services/video/wivrn.nix
+++ b/nixos/modules/services/video/wivrn.nix
@@ -217,7 +217,6 @@ in
     };
 
     services = {
-      udev.packages = with pkgs; [ android-udev-rules ];
       avahi = {
         enable = true;
         publish = {
diff --git a/pkgs/by-name/an/android-udev-rules/package.nix b/pkgs/by-name/an/android-udev-rules/package.nix
deleted file mode 100644
index 4c118124e02b..000000000000
--- a/pkgs/by-name/an/android-udev-rules/package.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  udevCheckHook,
-}:
-stdenv.mkDerivation (finalAttrs: {
-  pname = "android-udev-rules";
-  version = "20250525";
-
-  src = fetchFromGitHub {
-    owner = "M0Rf30";
-    repo = "android-udev-rules";
-    rev = finalAttrs.version;
-    hash = "sha256-4ODU9EoVYV+iSu6+M9ePed45QkOZgWkDUlFTlWJ8ttQ=";
-  };
-
-  installPhase = ''
-    runHook preInstall
-    install -D 51-android.rules $out/lib/udev/rules.d/51-android.rules
-    runHook postInstall
-  '';
-
-  nativeBuildInputs = [
-    udevCheckHook
-  ];
-  doInstallCheck = true;
-
-  meta = {
-    homepage = "https://github.com/M0Rf30/android-udev-rules";
-    description = "Android udev rules list aimed to be the most comprehensive on the net";
-    longDescription = ''
-      Android udev rules list aimed to be the most comprehensive on the net.
-      To use on NixOS, simply add this package to services.udev.packages:
-      ```nix
-      services.udev.packages = [ pkgs.android-udev-rules ];
-      ```
-    '';
-    platforms = lib.platforms.linux;
-    license = lib.licenses.gpl3Plus;
-    maintainers = [ ];
-    teams = [ lib.teams.android ];
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 4b7c42542c5f..f3c45aee3f03 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -434,6 +434,7 @@ mapAliases {
   alsaUtils = throw "'alsaUtils' has been renamed to/replaced by 'alsa-utils'"; # Converted to throw 2024-10-17
   amazon-qldb-shell = throw "'amazon-qldb-shell' has been removed due to being unmaintained upstream"; # Added 2025-07-30
   amdvlk = throw "'amdvlk' has been removed since it was deprecated by AMD. Its replacement, RADV, is enabled by default."; # Added 2025-09-20
+  android-udev-rules = throw "'android-udev-rules' has been removed due to being superseded by built-in systemd uaccess rules."; # Added 2025-10-21
   angelfish = throw "'angelfish' has been renamed to/replaced by 'libsForQt5.kdeGear.angelfish'"; # Converted to throw 2024-10-17
   animeko = throw "'animeko' has been removed since it is unmaintained"; # Added 2025-08-20
   ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11

From ffbd32696827d7a1ef3ff371424c4b181a1e4cec Mon Sep 17 00:00:00 2001
From: prescientmoon <git@moonythm.dev>
Date: Wed, 22 Oct 2025 00:14:36 +0200
Subject: [PATCH 1428/6226] pounce: avoid with lib

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

diff --git a/pkgs/by-name/po/pounce/package.nix b/pkgs/by-name/po/pounce/package.nix
index e7ca38499fd2..426c77dfb57f 100644
--- a/pkgs/by-name/po/pounce/package.nix
+++ b/pkgs/by-name/po/pounce/package.nix
@@ -29,11 +29,11 @@ stdenv.mkDerivation (finalAttrs: {
     "PREFIX=$(out)"
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://code.causal.agency/june/pounce";
     description = "Simple multi-client TLS-only IRC bouncer";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ edef ];
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ edef ];
   };
 })

From 9270c9cffcc545ee881942ca9e3c824457965b9a Mon Sep 17 00:00:00 2001
From: prescientmoon <git@moonythm.dev>
Date: Wed, 22 Oct 2025 00:15:40 +0200
Subject: [PATCH 1429/6226] pounce: replace libressl with libretls

pounce cannot find the system ca store using latest libressl:

pounce: tls_connect: failed to open CA file 'etc/ssl/cert.pem': No such file or directory

The solution here is the same one taken by the catgirl package, see bcff49197e12abcc40b562a99d8627a5749a6bbe.
---
 pkgs/by-name/po/pounce/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/pounce/package.nix b/pkgs/by-name/po/pounce/package.nix
index 426c77dfb57f..c8fd34f67d25 100644
--- a/pkgs/by-name/po/pounce/package.nix
+++ b/pkgs/by-name/po/pounce/package.nix
@@ -1,7 +1,8 @@
 {
   lib,
   stdenv,
-  libressl,
+  libretls,
+  openssl,
   fetchzip,
   pkg-config,
   libxcrypt,
@@ -17,7 +18,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    libressl
+    libretls
+    openssl
     libxcrypt
   ];
 

From e00c08fb5066aeede03127f781e03ec3e20e9cc1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 22:20:47 +0000
Subject: [PATCH 1430/6226] turso-cli: 1.0.14 -> 1.0.15

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

diff --git a/pkgs/by-name/tu/turso-cli/package.nix b/pkgs/by-name/tu/turso-cli/package.nix
index ba3e9dc26b15..b51755c4b0fb 100644
--- a/pkgs/by-name/tu/turso-cli/package.nix
+++ b/pkgs/by-name/tu/turso-cli/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule rec {
   pname = "turso-cli";
-  version = "1.0.14";
+  version = "1.0.15";
 
   src = fetchFromGitHub {
     owner = "tursodatabase";
     repo = "turso-cli";
     rev = "v${version}";
-    hash = "sha256-1wvr2E1sYcDSelTxfl+LYoSDnYBdQqmMt6+UzjpkKa0=";
+    hash = "sha256-c4RtEqMCpRgr4p6STWrRv7+UIA11WySTNhyvkLgzRso=";
   };
 
   vendorHash = "sha256-tBO21IgUczwMgrEyV7scV3YTY898lYHASaLeXqvBopU=";

From 5ce94d31c1d917174c9c7bdaadd895c594469682 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 22:27:21 +0000
Subject: [PATCH 1431/6226] python3Packages.oelint-parser: 8.6.0 -> 8.6.1

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

diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix
index 449ec4e2d1c7..237660e41a60 100644
--- a/pkgs/development/python-modules/oelint-parser/default.nix
+++ b/pkgs/development/python-modules/oelint-parser/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "oelint-parser";
-  version = "8.6.0";
+  version = "8.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-parser";
     tag = version;
-    hash = "sha256-OHyOlqZpevWEhFAa12VDimMT261A9DK+Cx67TDjh7rg=";
+    hash = "sha256-lKHtKrR5bjBuqBvfsMAIR3K+ERhITBXzrxAvvYopDiM=";
   };
 
   pythonRelaxDeps = [ "regex" ];

From 6885524b6a57a80bed0a706805e2a4895af79388 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 19:34:23 -0300
Subject: [PATCH 1432/6226] libuinputplus: fix build with cmake4

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

diff --git a/pkgs/by-name/li/libuinputplus/package.nix b/pkgs/by-name/li/libuinputplus/package.nix
index 0371a66131d0..1541a52b32a7 100644
--- a/pkgs/by-name/li/libuinputplus/package.nix
+++ b/pkgs/by-name/li/libuinputplus/package.nix
@@ -25,6 +25,11 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     inherit (src.meta) homepage;
     description = "Easy-to-use uinput library in C++";

From 7a63e407dcd0ea774949b653a13e02a9b045ded5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 22:37:41 +0000
Subject: [PATCH 1433/6226] xemu: 0.8.107 -> 0.8.108

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

diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix
index 706607e4fc93..f2b10ad27c91 100644
--- a/pkgs/by-name/xe/xemu/package.nix
+++ b/pkgs/by-name/xe/xemu/package.nix
@@ -35,13 +35,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xemu";
-  version = "0.8.107";
+  version = "0.8.108";
 
   src = fetchFromGitHub {
     owner = "xemu-project";
     repo = "xemu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rrf3PVetkrHbogOd+1ZrtfHdRJPrq0c9q4Zg0LSOy94=";
+    hash = "sha256-+bQNy3UvRT9GKwsRNFezbyeXKzCnHw9S8GdT+UQc+Kw=";
 
     nativeBuildInputs = [
       git

From 003b5ac29b2a6a54344db1108221ae8a6898f54d Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 21 Oct 2025 15:38:03 -0700
Subject: [PATCH 1434/6226] python3Packages.aiolifx: modernize derivation

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

diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix
index 3818ad68ef14..bd5d5e776fbb 100644
--- a/pkgs/development/python-modules/aiolifx/default.nix
+++ b/pkgs/development/python-modules/aiolifx/default.nix
@@ -7,7 +7,6 @@
   fetchPypi,
   ifaddr,
   inquirerpy,
-  pythonOlder,
   setuptools,
 }:
 
@@ -16,8 +15,6 @@ buildPythonPackage rec {
   version = "1.2.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-h82KPrHcWUUrQFyMy3fY6BmQFA5a4DFJdhJ6zRnKMsc=";
@@ -38,12 +35,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aiolifx" ];
 
-  meta = with lib; {
+  meta = {
     description = "Module for local communication with LIFX devices over a LAN";
     homepage = "https://github.com/aiolifx/aiolifx";
     changelog = "https://github.com/aiolifx/aiolifx/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ netixx ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ netixx ];
     mainProgram = "aiolifx";
   };
 }

From 20ef37577ce56303b370b0e134b270d00fb78db9 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 21 Oct 2025 15:40:45 -0700
Subject: [PATCH 1435/6226] python3Packages.aiolifx: build from GitHub source

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

diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix
index bd5d5e776fbb..d1cc221a239e 100644
--- a/pkgs/development/python-modules/aiolifx/default.nix
+++ b/pkgs/development/python-modules/aiolifx/default.nix
@@ -4,7 +4,7 @@
   bitstring,
   buildPythonPackage,
   click,
-  fetchPypi,
+  fetchFromGitHub,
   ifaddr,
   inquirerpy,
   setuptools,
@@ -15,9 +15,11 @@ buildPythonPackage rec {
   version = "1.2.1";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-h82KPrHcWUUrQFyMy3fY6BmQFA5a4DFJdhJ6zRnKMsc=";
+  src = fetchFromGitHub {
+    owner = "aiolifx";
+    repo = "aiolifx";
+    tag = version;
+    hash = "sha256-9FTsY/VFfzLlDEjF8ueBQxr30YasdQwei1/KfHiXwMo=";
   };
 
   build-system = [ setuptools ];

From 001f5c9c5953bba44bc5d222d9da760eaff5f43d Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 19:43:16 -0300
Subject: [PATCH 1436/6226] libwebcam: fix build with cmake4

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

diff --git a/pkgs/by-name/li/libwebcam/package.nix b/pkgs/by-name/li/libwebcam/package.nix
index aebf4eb6411b..70d08400a1b9 100644
--- a/pkgs/by-name/li/libwebcam/package.nix
+++ b/pkgs/by-name/li/libwebcam/package.nix
@@ -30,14 +30,20 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     substituteInPlace ./uvcdynctrl/CMakeLists.txt \
-      --replace "/lib/udev" "$out/lib/udev"
+      --replace-fail "/lib/udev" "$out/lib/udev" \
+      --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
 
     substituteInPlace ./uvcdynctrl/udev/scripts/uvcdynctrl \
-      --replace 'debug=0' 'debug=''${NIX_UVCDYNCTRL_UDEV_DEBUG:-0}' \
-      --replace 'uvcdynctrlpath=uvcdynctrl' "uvcdynctrlpath=$out/bin/uvcdynctrl"
+      --replace-fail 'debug=0' 'debug=''${NIX_UVCDYNCTRL_UDEV_DEBUG:-0}' \
+      --replace-fail 'uvcdynctrlpath=uvcdynctrl' "uvcdynctrlpath=$out/bin/uvcdynctrl"
 
     substituteInPlace ./uvcdynctrl/udev/rules/80-uvcdynctrl.rules \
-      --replace "/lib/udev" "$out/lib/udev"
+      --replace-fail "/lib/udev" "$out/lib/udev"
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace libwebcam/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   preConfigure = ''

From b14dc913cda785a4c3921dd7efbc4a0832852684 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 19:48:34 -0300
Subject: [PATCH 1437/6226] libzra: fix build with cmake4

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

diff --git a/pkgs/by-name/li/libzra/package.nix b/pkgs/by-name/li/libzra/package.nix
index 17669909a5ca..6f4dd78693e2 100644
--- a/pkgs/by-name/li/libzra/package.nix
+++ b/pkgs/by-name/li/libzra/package.nix
@@ -22,6 +22,9 @@ stdenv.mkDerivation {
   # in submodule dev as of 1.4.7
   postPatch = ''
     (cd submodule/zstd && patch -Np1 < ${./fix-pkg-config.patch})
+
+    substituteInPlace submodule/zstd/build/cmake/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.9 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   meta = with lib; {

From f1749a1465df58062399c1606bd9b1eccc12c966 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 19:52:33 -0300
Subject: [PATCH 1438/6226] linvstmanager: fix build with cmake4

---
 pkgs/applications/audio/linvstmanager/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/audio/linvstmanager/default.nix b/pkgs/applications/audio/linvstmanager/default.nix
index 1da68ebb45d1..6da4c7fcc626 100644
--- a/pkgs/applications/audio/linvstmanager/default.nix
+++ b/pkgs/applications/audio/linvstmanager/default.nix
@@ -27,6 +27,11 @@ stdenv.mkDerivation rec {
     qtbase
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Graphical companion application for various bridges like LinVst, etc";
     mainProgram = "linvstmanager";

From 23f76c73d3d32941f5bb38c2a8e7b5fe9ab58641 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 22:57:18 +0000
Subject: [PATCH 1439/6226] phpPackages.grumphp: 2.16.0 -> 2.17.0

---
 pkgs/development/php-packages/grumphp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/php-packages/grumphp/default.nix b/pkgs/development/php-packages/grumphp/default.nix
index 068ccb189d93..d9c42c328551 100644
--- a/pkgs/development/php-packages/grumphp/default.nix
+++ b/pkgs/development/php-packages/grumphp/default.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "grumphp";
-  version = "2.16.0";
+  version = "2.17.0";
 
   src = fetchFromGitHub {
     owner = "phpro";
     repo = "grumphp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-YEapyEtvI0N9ey9UNbgRd15NyrCqRYJkmD+RuyysIRw=";
+    hash = "sha256-g2V2clNI0+KzKAPStq1vJZ3gHpBV1EbduWBmzRnuzv8=";
   };
 
-  vendorHash = "sha256-0MH4Q5FY9nu5Jpz/iMIu99P8ptQY07t3qbXMp6J7bt4=";
+  vendorHash = "sha256-wDxrLsBA8TMc6Fk+voeHlxQNfJaaef1ydg0ppuJgO2E=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From a60f412cc6d82e2abbf0558ff9bb6326e6865e35 Mon Sep 17 00:00:00 2001
From: Jeffrey Harmon <contact@jeffreyharmon.dev>
Date: Wed, 24 Sep 2025 22:41:41 -0400
Subject: [PATCH 1440/6226] gdscript-formatter: init at 0.14.0

---
 .../by-name/gd/gdscript-formatter/package.nix | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/gd/gdscript-formatter/package.nix

diff --git a/pkgs/by-name/gd/gdscript-formatter/package.nix b/pkgs/by-name/gd/gdscript-formatter/package.nix
new file mode 100644
index 000000000000..b92bbdb93954
--- /dev/null
+++ b/pkgs/by-name/gd/gdscript-formatter/package.nix
@@ -0,0 +1,42 @@
+{
+  lib,
+  fetchFromGitHub,
+  nix-update-script,
+  rustPlatform,
+  versionCheckHook,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "gdscript-formatter";
+  version = "0.14.0";
+
+  src = fetchFromGitHub {
+    owner = "GDQuest";
+    repo = "GDScript-formatter";
+    tag = finalAttrs.version;
+    hash = "sha256-cY6Ow1f8o40M9/knneAod8ABj7ObQAkzs3yODMpkCxQ=";
+    # Needed due to .gitattributes being used for the Godot addon and export-ignoring all files
+    deepClone = true;
+  };
+
+  cargoHash = "sha256-U3M1xuSybP9WVHNMYaY6QrBZ//cAGCIOIo2dY0jpJzc=";
+
+  cargoBuildFlags = [
+    "--bin=gdscript-formatter"
+  ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Fast code formatter for GDScript and Godot 4";
+    homepage = "https://github.com/GDQuest/GDScript-formatter";
+    changelog = "https://github.com/GDQuest/GDScript-formatter/blob/${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    mainProgram = "gdscript-formatter";
+    maintainers = with lib.maintainers; [ squarepear ];
+  };
+})

From 190b04b78097c614322e34897e8f62c4d29e4ad7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 23:14:50 +0000
Subject: [PATCH 1441/6226] zoekt: 3.7.2-2-unstable-2025-09-02 ->
 3.7.2-2-unstable-2025-10-16

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

diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix
index d186ea9f002f..e5412d1ce914 100644
--- a/pkgs/by-name/zo/zoekt/package.nix
+++ b/pkgs/by-name/zo/zoekt/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule {
   pname = "zoekt";
-  version = "3.7.2-2-unstable-2025-09-02";
+  version = "3.7.2-2-unstable-2025-10-16";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "zoekt";
-    rev = "4e4a529c3b63c7d4c7897ba736f1cd52cc163134";
-    hash = "sha256-aRQQAG0qZOrkdbQoQRXeddhMmQaB+/ESD6Ba+q4UIlI=";
+    rev = "90faf6de70e39db5fb48839eabfba6c8add008f0";
+    hash = "sha256-nULqnTms5Jw8gE8VcUzRGJaJqyavXyABU8SyTg8fCtE=";
   };
 
   vendorHash = "sha256-urXYBv8+C2jwnr5PjXz7nUyX/Gz4wmtS76UTXFqfQFk=";

From 99674de0a4368f69edfa7bf223774fff1f435808 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 23:18:25 +0000
Subject: [PATCH 1442/6226] codecrafters-cli: 42 -> 43

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

diff --git a/pkgs/by-name/co/codecrafters-cli/package.nix b/pkgs/by-name/co/codecrafters-cli/package.nix
index f81412ca9e53..b81deb83009f 100644
--- a/pkgs/by-name/co/codecrafters-cli/package.nix
+++ b/pkgs/by-name/co/codecrafters-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "codecrafters-cli";
-  version = "42";
+  version = "43";
 
   src = fetchFromGitHub {
     owner = "codecrafters-io";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-vkugNHeajGv/2t3/4eZbcsXXuaD7/fUM/3Cg0AO+6H0=";
+    hash = "sha256-B7vxBl4y2gS4iEmER4Cq1D7yDGFW3Q4DRL+aJESMOMs=";
     # A shortened git commit hash is part of the version output, and is
     # needed at build time. Use the `.git` directory to retrieve the
     # commit SHA, and remove the directory afterwards since it is not needed

From 8fa376aaaae58c600710ae868b90e8d066fa7a37 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 21 Oct 2025 23:25:16 +0000
Subject: [PATCH 1443/6226] cargo-mobile2: 0.21.1 -> 0.22.1

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

diff --git a/pkgs/by-name/ca/cargo-mobile2/package.nix b/pkgs/by-name/ca/cargo-mobile2/package.nix
index 99d9709259f9..e34ee1e278a8 100644
--- a/pkgs/by-name/ca/cargo-mobile2/package.nix
+++ b/pkgs/by-name/ca/cargo-mobile2/package.nix
@@ -10,7 +10,7 @@
 
 let
   pname = "cargo-mobile2";
-  version = "0.21.1";
+  version = "0.22.1";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -18,14 +18,14 @@ rustPlatform.buildRustPackage {
     owner = "tauri-apps";
     repo = "cargo-mobile2";
     rev = "cargo-mobile2-v${version}";
-    hash = "sha256-w95UAtAP11jaW4EqprGv+duBf81rLv8y7+Ej5SFeRAs=";
+    hash = "sha256-+U/uTbTGa3NPK5WpyvR5C5L1ozl+fa15pNNWYZJXgnk=";
   };
 
   # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at
   # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202
   # sourceRoot = "${src.name}/tooling/cli";
 
-  cargoHash = "sha256-Aa4Iubl8l+tss0ClF93RqVUsB4Jg4/MQCeKSr/iY5tA=";
+  cargoHash = "sha256-fMtFvPrWMLHE4N9WJv6J4pqHbHPnNKhQWz5qEvB8jKQ=";
 
   preBuild = ''
     mkdir -p $out/share/

From 3fcaabe0bb9c05624b1b9cdf07604a9fe1024711 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 00:21:50 +0000
Subject: [PATCH 1444/6226] api-linter: 1.71.0 -> 1.72.0

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

diff --git a/pkgs/by-name/ap/api-linter/package.nix b/pkgs/by-name/ap/api-linter/package.nix
index faa37966618c..43d272e8c323 100644
--- a/pkgs/by-name/ap/api-linter/package.nix
+++ b/pkgs/by-name/ap/api-linter/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "api-linter";
-  version = "1.71.0";
+  version = "1.72.0";
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "api-linter";
     tag = "v${version}";
-    hash = "sha256-WZvaPYiz1pHW6OLl6ahV3/b9RXW6S/c/kbQxJFfAn28=";
+    hash = "sha256-RI2JBeDeB37AhCMYpZzUKl10hcLNL5uOkMwRSBCtJG0=";
   };
 
-  vendorHash = "sha256-KW5+THuV7U09ZV0eShLCDJYDPOM09/bUi7t0WiVx6pk=";
+  vendorHash = "sha256-lILGYebnm3OkqsrXdElV1vDzyhVAk4iJGZrffKX9RTA=";
 
   subPackages = [ "cmd/api-linter" ];
 

From 95f51ebfe81f5e245d8cf10ed42e78fd1cc82415 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 00:24:42 +0000
Subject: [PATCH 1445/6226] libretro.snes9x: 0-unstable-2025-10-11 ->
 0-unstable-2025-10-16

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

diff --git a/pkgs/applications/emulators/libretro/cores/snes9x.nix b/pkgs/applications/emulators/libretro/cores/snes9x.nix
index af98268827e1..3a8150cbb2f2 100644
--- a/pkgs/applications/emulators/libretro/cores/snes9x.nix
+++ b/pkgs/applications/emulators/libretro/cores/snes9x.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "snes9x";
-  version = "0-unstable-2025-10-11";
+  version = "0-unstable-2025-10-16";
 
   src = fetchFromGitHub {
     owner = "snes9xgit";
     repo = "snes9x";
-    rev = "cdffce2e32bfc0305fd5489831d09b5e730bed9b";
-    hash = "sha256-uTUhE6yvzgGxik1TMxcOI4K55xKTZNl7PmwYVxBsQZY=";
+    rev = "abfc018c90799eb55b773fc46d486167d8b3c762";
+    hash = "sha256-7PXUGUfhieYz8rLDhfLq09AcJbEcTLC/peYYN/B07c4=";
   };
 
   makefile = "Makefile";

From b7213d4e2d3f5361979207a521362c520648730d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 00:29:39 +0000
Subject: [PATCH 1446/6226] crd2pulumi: 1.5.4 -> 1.6.0

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

diff --git a/pkgs/by-name/cr/crd2pulumi/package.nix b/pkgs/by-name/cr/crd2pulumi/package.nix
index f14c9851b715..9d39e7bdf99a 100644
--- a/pkgs/by-name/cr/crd2pulumi/package.nix
+++ b/pkgs/by-name/cr/crd2pulumi/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "crd2pulumi";
-  version = "1.5.4";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "pulumi";
     repo = "crd2pulumi";
     rev = "v${version}";
-    sha256 = "sha256-PqEQrmSfcPH+GSGnuv6xpAm/2gAyTmLf81C+e25Un4s=";
+    sha256 = "sha256-f18E0mUE3bT5od0JBzyAEXOHymoPtpRHeZhZnQR4Ezw=";
   };
 
-  vendorHash = "sha256-4L1KfpZ+KICPko74x3STRQFtkcNVU/5KFGhKEJ64+Jk=";
+  vendorHash = "sha256-cLp0EWF6h/xCWbqadpbgLRFmH8RKWoY6xPb/tzZoKzM=";
 
   ldflags = [
     "-s"

From 8ca28141fae0506df41503e0e02291aead93639f Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 21 Oct 2025 16:00:18 -0700
Subject: [PATCH 1447/6226] python3Packages.atproto: allow cryptography 46

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

diff --git a/pkgs/development/python-modules/atproto/default.nix b/pkgs/development/python-modules/atproto/default.nix
index f5f812458bc3..0ceac6eae01e 100644
--- a/pkgs/development/python-modules/atproto/default.nix
+++ b/pkgs/development/python-modules/atproto/default.nix
@@ -29,7 +29,6 @@ buildPythonPackage rec {
   pname = "atproto";
   version = "0.0.62";
   format = "pyproject";
-  disabled = pythonOlder "3.8";
 
   # use GitHub, pypi does not include tests
   src = fetchFromGitHub {
@@ -58,6 +57,7 @@ buildPythonPackage rec {
   ];
 
   pythonRelaxDeps = [
+    "cryptography"
     "websockets"
   ];
 

From a1a848838e4593c42de27022a3f8c95343ffb914 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 00:39:23 +0000
Subject: [PATCH 1448/6226] python3Packages.mcdreforged: 2.15.4 -> 2.15.5

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

diff --git a/pkgs/development/python-modules/mcdreforged/default.nix b/pkgs/development/python-modules/mcdreforged/default.nix
index 796301df1627..c561b1b914b3 100644
--- a/pkgs/development/python-modules/mcdreforged/default.nix
+++ b/pkgs/development/python-modules/mcdreforged/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "mcdreforged";
-  version = "2.15.4";
+  version = "2.15.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "MCDReforged";
     repo = "MCDReforged";
     tag = "v${version}";
-    hash = "sha256-q88jAsgoIFzsOVKeA4fk69wGbnq3HcYJ2YzeZQHmYo4=";
+    hash = "sha256-4zThW18/6aO5gCsxx7TNM+q0Z7/c6G5zUxbCMpwEsEU=";
   };
 
   build-system = [ setuptools ];

From 3f9b779ba699bc044d351f3e56860fa027acc52a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 22 Oct 2025 02:36:30 +0200
Subject: [PATCH 1449/6226] webrtc-audio-processing_0_3: do not break patches

---
 pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix b/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix
index b64d19521905..8f2d5bcb4c1a 100644
--- a/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix
+++ b/pkgs/by-name/we/webrtc-audio-processing_0_3/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
-  patchPhase = lib.optionalString stdenv.hostPlatform.isMusl ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isMusl ''
     substituteInPlace webrtc/base/checks.cc --replace 'defined(__UCLIBC__)' 1
   '';
 

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

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

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

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

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

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

From 37e8abc01a9e886db363dbb841dd7cfc8a07e695 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 00:44:25 +0000
Subject: [PATCH 1452/6226] railway: 4.10.0 -> 4.11.0

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

diff --git a/pkgs/by-name/ra/railway/package.nix b/pkgs/by-name/ra/railway/package.nix
index 371267663137..be7157a37b93 100644
--- a/pkgs/by-name/ra/railway/package.nix
+++ b/pkgs/by-name/ra/railway/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "railway";
-  version = "4.10.0";
+  version = "4.11.0";
 
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-fvasxm9BjoHvSS5qqlYdCFN7j4E/MAsGhaKxt2y8Bhw=";
+    hash = "sha256-3MqMkef/oc6Fk2PHvdTMlH/lRU19Tru5uqs8yVThSdw=";
   };
 
-  cargoHash = "sha256-yQtsL4FHEuA2Ji5HW4LYoYoY1CDQf8LO0E1en04JpOA=";
+  cargoHash = "sha256-JYsnrZsUrESOZQzVOkHLFDDtjDCzGva6mrFLSOiEUzw=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 582b384329fa17386c6bb6453c472f2755da868a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 00:49:57 +0000
Subject: [PATCH 1453/6226] mediamtx: 1.15.2 -> 1.15.3

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

diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix
index c103101da65e..1da648e268f8 100644
--- a/pkgs/by-name/me/mediamtx/package.nix
+++ b/pkgs/by-name/me/mediamtx/package.nix
@@ -15,16 +15,16 @@ in
 buildGoModule (finalAttrs: {
   pname = "mediamtx";
   # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION
-  version = "1.15.2";
+  version = "1.15.3";
 
   src = fetchFromGitHub {
     owner = "bluenviron";
     repo = "mediamtx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sqrcfH0A2wvMAhnW/f8Ev3b+neIFv+6//0BFxASyvcM=";
+    hash = "sha256-alZn6o8S6HWlYdsziptsqqSZKdfYHGB1VhPGhTJNbqQ=";
   };
 
-  vendorHash = "sha256-HGh6mbaDANSk8n40Y4RY7L9XFaLe+fSB2afAIVg7M8A=";
+  vendorHash = "sha256-/k0fIxL6x1X1kDNuMVWb40nkXbl+IakSYUgugd8vlLk=";
 
   postPatch = ''
     cp ${hlsJs} internal/servers/hls/hls.min.js

From 0e19a0dc5eca09370d59f49584064fdbc6225da5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 01:08:08 +0000
Subject: [PATCH 1454/6226] libretro-shaders-slang: 0-unstable-2025-10-15 ->
 0-unstable-2025-10-20

---
 pkgs/by-name/li/libretro-shaders-slang/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix
index ca83205dde68..7eab65738a01 100644
--- a/pkgs/by-name/li/libretro-shaders-slang/package.nix
+++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "libretro-shaders-slang";
-  version = "0-unstable-2025-10-15";
+  version = "0-unstable-2025-10-20";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "slang-shaders";
-    rev = "c94b1bdfd8c973893ac3fe883ae05c420aba2908";
-    hash = "sha256-aZ6Xf7suIlUj3NcGtRfoYTKMnenCupS7dLoENGePr/E=";
+    rev = "422e59878b7e0b4d5d677e6163cc560767398d20";
+    hash = "sha256-PdurVN86deGS1pNvFY1IZblBklc/CEFrB7jKbB8JrG4=";
   };
 
   dontConfigure = true;

From 560aa18403428cdd923e0eb9691b859e7faa748f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 01:09:50 +0000
Subject: [PATCH 1455/6226] asusctl: 6.1.15 -> 6.1.16

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

diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix
index d27dcb359fea..db51d5237c31 100644
--- a/pkgs/by-name/as/asusctl/package.nix
+++ b/pkgs/by-name/as/asusctl/package.nix
@@ -18,16 +18,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "asusctl";
-  version = "6.1.15";
+  version = "6.1.16";
 
   src = fetchFromGitLab {
     owner = "asus-linux";
     repo = "asusctl";
     tag = version;
-    hash = "sha256-ckazulETorMaYc860ELV/kABPv9+YF+EvpapNqNnXuI=";
+    hash = "sha256-Ndwzy/2Rg5W1cF6YFjoUtgN1156VZW4Gs1DgJTrmu/w=";
   };
 
-  cargoHash = "sha256-qryRfwffP+AiaFjZ6mw5GHI/xlV1EhOsdhJhJw6Zn74=";
+  cargoHash = "sha256-+j682yZx54DXh+45b9GzSD29/aYALI/y1YbmlfQd09Q=";
 
   postPatch = ''
     files="

From 1b7d72b8485a1360aed12c90347c326cf5bf0551 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 10:50:18 -0300
Subject: [PATCH 1456/6226] imagelol: fix build with cmake4, mark as broken on
 darwin

Co-authored-by: Michael Daniels <mdaniels5757@gmail.com>
---
 pkgs/by-name/im/imagelol/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/im/imagelol/package.nix b/pkgs/by-name/im/imagelol/package.nix
index efdc4991ad94..c177b42a7f8e 100644
--- a/pkgs/by-name/im/imagelol/package.nix
+++ b/pkgs/by-name/im/imagelol/package.nix
@@ -37,6 +37,12 @@ stdenv.mkDerivation rec {
     mv imagelol src
     substituteInPlace CMakeLists.txt \
       --replace 'add_subdirectory("imagelol")' 'add_subdirectory("src")'
+
+    substituteInPlace External/zlib-no-examples/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.4.4)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace External/libpng/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_policy(VERSION 3.1)" "cmake_policy(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [ cmake ];
@@ -59,6 +65,7 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = [ ];
     platforms = platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin;
     mainProgram = "ImageLOL";
   };
 }

From 0a97e091ba05aba074120ef5400974da96eecc79 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 01:20:38 +0000
Subject: [PATCH 1457/6226] goreleaser: 2.12.5 -> 2.12.6

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

diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix
index d30a09c70ea8..2b67e9bfff7e 100644
--- a/pkgs/by-name/go/goreleaser/package.nix
+++ b/pkgs/by-name/go/goreleaser/package.nix
@@ -10,16 +10,16 @@
 }:
 buildGo125Module rec {
   pname = "goreleaser";
-  version = "2.12.5";
+  version = "2.12.6";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = "goreleaser";
     rev = "v${version}";
-    hash = "sha256-EHJ1ARzk6BD5D121u+1UTe90oLOovKKD+LQWLIj81Jk=";
+    hash = "sha256-ZYlT/CkYMPZgVNR0uaDPbLT7WH5EDcUeTwUPFM6fZOg=";
   };
 
-  vendorHash = "sha256-J/OwvPxC8wz/91sWWUBNkW5E71m8EPjTq3h/MOxT/3k=";
+  vendorHash = "sha256-Zv13xWe/wwmq+2lqvsX6oWIyEYlCojgIgH/cvr5rSOI=";
 
   ldflags = [
     "-s"

From 43edfa75b7b6b60b69d7b497e937dffe9343adfb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 01:23:09 +0000
Subject: [PATCH 1458/6226] immudb: 1.9.7 -> 1.10.0

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

diff --git a/pkgs/by-name/im/immudb/package.nix b/pkgs/by-name/im/immudb/package.nix
index 6ff3b34bef70..cd63013a75cd 100644
--- a/pkgs/by-name/im/immudb/package.nix
+++ b/pkgs/by-name/im/immudb/package.nix
@@ -15,13 +15,13 @@ let
 in
 buildGoModule rec {
   pname = "immudb";
-  version = "1.9.7";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "codenotary";
     repo = "immudb";
     rev = "v${version}";
-    sha256 = "sha256-tYQYQyYhHMn0+PQWDEb4zY9EbDt1pVzZIcP0Gnsplrk=";
+    sha256 = "sha256-RsDM+5/a3huBJ6HfaALpw+KpcIfg198gZfC4c4DsDlU=";
   };
 
   postPatch = ''

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

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

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

From 74098b69f3c866c6c958fc1d9039ea0a48692679 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Mon, 13 Oct 2025 18:46:57 -0700
Subject: [PATCH 1460/6226] flying-carpet: init at 9.0.0

---
 pkgs/by-name/fl/flying-carpet/package.nix | 84 +++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 pkgs/by-name/fl/flying-carpet/package.nix

diff --git a/pkgs/by-name/fl/flying-carpet/package.nix b/pkgs/by-name/fl/flying-carpet/package.nix
new file mode 100644
index 000000000000..d2c15aabcac2
--- /dev/null
+++ b/pkgs/by-name/fl/flying-carpet/package.nix
@@ -0,0 +1,84 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  rustPlatform,
+  fetchNpmDeps,
+  cargo-tauri,
+  glib-networking,
+  nodejs,
+  npmHooks,
+  openssl,
+  pkg-config,
+  webkitgtk_4_1,
+  wrapGAppsHook4,
+  copyDesktopItems,
+  makeDesktopItem,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "flying-carpet";
+  version = "9.0.0";
+
+  src = fetchFromGitHub {
+    owner = "spieglt";
+    repo = "FlyingCarpet";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-xjTypnI6NXG4D3iaSEHcea2as3MSmKVo9x/4JTx9znc=";
+  };
+
+  cargoHash = "sha256-zoZS7rV5Pou9OmodLF8CqcEsAWFjSdtk/S5OXsnKKyg=";
+
+  nativeBuildInputs = [
+    cargo-tauri.hook
+    nodejs
+    pkg-config
+    wrapGAppsHook4
+    copyDesktopItems
+  ];
+
+  buildInputs = [
+    glib-networking
+    openssl
+    webkitgtk_4_1
+  ];
+
+  checkFlags = [
+    "--skip"
+    "network"
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "FlyingCarpet";
+      desktopName = "FlyingCarpet";
+      exec = "FlyingCarpet";
+      icon = "FlyingCarpet";
+      categories = [ "Development" ];
+    })
+  ];
+
+  postInstall = ''
+    install -Dm644 "Flying Carpet/src-tauri/icons/32x32.png" "$out/share/icons/hicolor/32x32/apps/FlyingCarpet.png"
+    install -Dm644 "Flying Carpet/src-tauri/icons/128x128.png" "$out/share/icons/hicolor/128x128/apps/FlyingCarpet.png"
+    install -Dm644 "Flying Carpet/src-tauri/icons/128x128@2x.png" "$out/share/icons/hicolor/256x256@2/apps/FlyingCarpet.png"
+  '';
+
+  preFixup = ''
+    # https://github.com/tauri-apps/tauri/issues/9304
+    gappsWrapperArgs+=(--set WEBKIT_DISABLE_DMABUF_RENDERER 1)
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Send and receive files between Android, iOS, Linux, macOS, and Windows over ad hoc WiFi";
+    homepage = "https://github.com/spieglt/FlyingCarpet";
+    changelog = "https://github.com/spieglt/FlyingCarpet/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ ulysseszhan ];
+    platforms = lib.platforms.linux; # No darwin: https://github.com/spieglt/FlyingCarpet/issues/117
+    mainProgram = "FlyingCarpet";
+  };
+})

From f314ac70ef1c9315730aa9ad202b4a73b14a9a4d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 01:47:48 +0000
Subject: [PATCH 1461/6226] nvidia-mig-parted: 0.12.3 -> 0.13.0

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

diff --git a/pkgs/by-name/nv/nvidia-mig-parted/package.nix b/pkgs/by-name/nv/nvidia-mig-parted/package.nix
index 0701e1fa2206..d135c3fb44b8 100644
--- a/pkgs/by-name/nv/nvidia-mig-parted/package.nix
+++ b/pkgs/by-name/nv/nvidia-mig-parted/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "nvidia-mig-parted";
-  version = "0.12.3";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "mig-parted";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-B4vSNG3+qbUqCvEmBz+VUgrnvhNvCR74uvo4uo+bD/Q=";
+    hash = "sha256-oSoPgap/LFjJ1tW3KLlcQ/zdym9A9h5zownktVxdQfY=";
   };
 
   vendorHash = null;

From a0d7b28e3046186f34faf2c257603ddfb3be223a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 02:00:28 +0000
Subject: [PATCH 1462/6226] pdfcpu: 0.11.0 -> 0.11.1

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

diff --git a/pkgs/by-name/pd/pdfcpu/package.nix b/pkgs/by-name/pd/pdfcpu/package.nix
index f1d0b0b084df..e62672964b97 100644
--- a/pkgs/by-name/pd/pdfcpu/package.nix
+++ b/pkgs/by-name/pd/pdfcpu/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "pdfcpu";
-  version = "0.11.0";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     owner = "pdfcpu";
     repo = "pdfcpu";
     tag = "v${version}";
-    hash = "sha256-HTqaFl/ug/4sdchZBD4VQiXbD1L0/DVf2efZ3BV/vx4=";
+    hash = "sha256-0xsa7/WlqjRMP961FTonfty40+C1knI3szCmCDfZJ/0=";
     # Apparently upstream requires that the compiled executable will know the
     # commit hash and the date of the commit. This information is also presented
     # in the output of `pdfcpu version` which we use as a sanity check in the
@@ -37,7 +37,7 @@ buildGoModule rec {
     '';
   };
 
-  vendorHash = "sha256-5qB3zXiee4yMFpV8Ia8jICZaw+8Zpxd2Fs7DZ/DW/Jg=";
+  vendorHash = "sha256-wZYYIcPhyDlmIhuJs91EqPB8AjLIDHz39lXh35LHUwQ=";
 
   ldflags = [
     "-s"

From 66e6aadbac30cc3c52549db41d5f971422661c17 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 02:03:30 +0000
Subject: [PATCH 1463/6226] coder: 2.23.4 -> 2.26.2

---
 pkgs/by-name/co/coder/package.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/co/coder/package.nix b/pkgs/by-name/co/coder/package.nix
index dc3290228648..3621ccf59f16 100644
--- a/pkgs/by-name/co/coder/package.nix
+++ b/pkgs/by-name/co/coder/package.nix
@@ -15,21 +15,21 @@ let
 
   channels = {
     stable = {
-      version = "2.23.4";
+      version = "2.26.2";
       hash = {
-        x86_64-linux = "sha256-tpU26+3NrfOUWgd4Wav1fhTMtErh2CXt3Nr8BTIUdbc=";
-        x86_64-darwin = "sha256-07pSXm++a9VWcnc4AgrR7OaaDw2ki2XMtr8PZkWW2Vw=";
-        aarch64-linux = "sha256-Rm1CIVK7qPLizK+0H3Eb2qwPEj1TjHtIqdBr+Z+21eA=";
-        aarch64-darwin = "sha256-H5MLnRokC5Wb3FrotprunG+kx0qwT8/Ou6ScO7N2h+E=";
+        x86_64-linux = "sha256-bIt20dfLgKtR/pnm2ZKAdMOw5tBGSiL7VdY7n1+KtGo=";
+        x86_64-darwin = "sha256-VSoNXyHXKLJTxEOCNQ04j4bk3s9zRL9ITxfO8Ow7Sw4=";
+        aarch64-linux = "sha256-7J6KneDZZyXwaM0ebTmVezUFcwR9w7dxIDsp9aSuPbs=";
+        aarch64-darwin = "sha256-tfECXi7deg73fyQU10a5G+XU7Ql1A/jyOlJwAAVqeA8=";
       };
     };
     mainline = {
-      version = "2.24.2";
+      version = "2.27.1";
       hash = {
-        x86_64-linux = "sha256-Al3bvIsSnU0vdNAkZknpP/rxJIP6UGUIeIZ6kw84SuM=";
-        x86_64-darwin = "sha256-0+n69BWKIgKFUCQzW4AMRW4QdRQcZkK5Ioiu4d4RvnE=";
-        aarch64-linux = "sha256-2JkEO7hhLY9e22OTYLhzv+Zb0aP6PRVG8ZX5r686o0Q=";
-        aarch64-darwin = "sha256-7CJQEj7VA3SwaZeimng6BPDtw14LXt7+1E7HxVs8kYM=";
+        x86_64-linux = "sha256-BkUC6D9Qdewj+nQo8Oi8BiJkrdSnud4bFHDbXCthKqQ=";
+        x86_64-darwin = "sha256-OPL7Fb0mUhGBEjdjPOTh3W6SWqOB7JvVosft/6K0Sos=";
+        aarch64-linux = "sha256-oMCR5hroO9HqygakQwxRTlrJiha2MTj+gQsY8WEVe7w=";
+        aarch64-darwin = "sha256-UDOaG+cT0X6t2UX4N7Wlgok9MxLLDTDZ9eY9TMN6iT8=";
       };
     };
   };

From 525d06dd31369c9a3833ba59c81be30469383cea Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 21 Oct 2025 21:11:10 -0500
Subject: [PATCH 1464/6226] vimPlugins.snacks-nvim: 2025-10-20 -> 2025-10-21

Bunch of important bug fixes

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/applications/editors/vim/plugins/generated.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index a1d983b96293..e577027973d4 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -13968,12 +13968,12 @@ final: prev: {
 
   snacks-nvim = buildVimPlugin {
     pname = "snacks.nvim";
-    version = "2025-10-20";
+    version = "2025-10-21";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "snacks.nvim";
-      rev = "a54477b0acfb7c7cf7e55edc2619ffcd23b2f357";
-      sha256 = "1zpgybhdf74rbwqpycyb88qydcs36yy551ij8si3f0108ag04s88";
+      rev = "d293b21fe1a603dfb4757feb82ab3e67b78589f2";
+      sha256 = "1qfjcx1d55b7lqikkhr326gs74h9lq9pdpadpd33wdjrbjgv0a09";
     };
     meta.homepage = "https://github.com/folke/snacks.nvim/";
     meta.hydraPlatforms = [ ];

From 4aee1ae0318ca78d54e646a64b0e25b30b67cf2e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 02:15:52 +0000
Subject: [PATCH 1465/6226] python3Packages.django-import-export: 4.3.10 ->
 4.3.12

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

diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix
index 15890451fe7a..b0788bb9de88 100644
--- a/pkgs/development/python-modules/django-import-export/default.nix
+++ b/pkgs/development/python-modules/django-import-export/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "django-import-export";
-  version = "4.3.10";
+  version = "4.3.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django-import-export";
     repo = "django-import-export";
     tag = version;
-    hash = "sha256-amc5Qp3tdtqUGGN+DMT/r/CKMkMNnx5ryA+HlzQEejk=";
+    hash = "sha256-52nlqgKWh37Qr5UvCRBEPz2WHb2BU987+Ibt9yQyFVM=";
   };
 
   pythonRelaxDeps = [ "tablib" ];

From 5382a7f7be7dd376657760202d4401e18fcc95f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 02:16:07 +0000
Subject: [PATCH 1466/6226] rustical: 0.9.11 -> 0.9.12

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

diff --git a/pkgs/by-name/ru/rustical/package.nix b/pkgs/by-name/ru/rustical/package.nix
index 1d8e90342c25..48261b300c02 100644
--- a/pkgs/by-name/ru/rustical/package.nix
+++ b/pkgs/by-name/ru/rustical/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rustical";
-  version = "0.9.11";
+  version = "0.9.12";
 
   src = fetchFromGitHub {
     owner = "lennart-k";
     repo = "rustical";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XDnhHgswje335c3OHR/cUO9qtOj1MQBYvAsoH5coiDY=";
+    hash = "sha256-pmIWLhrf7AsFr+xvYeibAutIigLeQNQepssLpHxjZyQ=";
   };
 
-  cargoHash = "sha256-MevmHEdkczL4CcQpjdvv21rvnCmbnSr37Ny6G0kodag=";
+  cargoHash = "sha256-vU/iXRas6PYUASPTVDkzmZCyOHnH07S4YpvIyg1zybk=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];

From a4491bd7eec94380136fac5a002db10f8469ece2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 02:44:14 +0000
Subject: [PATCH 1467/6226] tmuxai: 1.1.3 -> 2.0.0

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

diff --git a/pkgs/by-name/tm/tmuxai/package.nix b/pkgs/by-name/tm/tmuxai/package.nix
index f31a9ae356be..490e3df32d8a 100644
--- a/pkgs/by-name/tm/tmuxai/package.nix
+++ b/pkgs/by-name/tm/tmuxai/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tmuxai";
-  version = "1.1.3";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "alvinunreal";
     repo = "tmuxai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SOqfEaCtJ8xlv0RA83tevbXjxwyGILSWlxNCVrKeLak=";
+    hash = "sha256-5XcqovO1HKNAlZ7H26jWHSLt3bbxzhLJIL9sLDMdHR4=";
   };
 
-  vendorHash = "sha256-6X79tFZCiuVq3ZgHC/EhwF9Nlge/8UoubRG1O9DGwxc=";
+  vendorHash = "sha256-cw/tW7i+CDN7AYLcU7bC1VNeD1aFRvngvtwmgBqKvoc=";
 
   ldflags = [
     "-s"

From 2b87c344d64a51f6745c33a55e62bd7ad32e79e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 02:44:42 +0000
Subject: [PATCH 1468/6226] python3Packages.edk2-pytool-library: 0.23.8 ->
 0.23.10

---
 .../python-modules/edk2-pytool-library/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/edk2-pytool-library/default.nix b/pkgs/development/python-modules/edk2-pytool-library/default.nix
index d90b312b155b..a7f996d33900 100644
--- a/pkgs/development/python-modules/edk2-pytool-library/default.nix
+++ b/pkgs/development/python-modules/edk2-pytool-library/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "edk2-pytool-library";
-  version = "0.23.8";
+  version = "0.23.10";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "tianocore";
     repo = "edk2-pytool-library";
     tag = "v${version}";
-    hash = "sha256-JSOijiH/de/bItNt7yNu8+P21rI7YqiTf54zV2Ij5Gs=";
+    hash = "sha256-Q10CjpNd6e5xULziJsBTAcEWMaG68ixBnfHUeOxTyj0=";
   };
 
   build-system = [

From acb5e4763e151dd12b35657911bf50f6a3de7693 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 17:08:06 -0700
Subject: [PATCH 1469/6226] iannix: modernize, move to by-name/

---
 .../ia/iannix/package.nix}                    | 23 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 11 insertions(+), 14 deletions(-)
 rename pkgs/{applications/audio/iannix/default.nix => by-name/ia/iannix/package.nix} (67%)

diff --git a/pkgs/applications/audio/iannix/default.nix b/pkgs/by-name/ia/iannix/package.nix
similarity index 67%
rename from pkgs/applications/audio/iannix/default.nix
rename to pkgs/by-name/ia/iannix/package.nix
index a6b3cd769205..1ba5fd2405cd 100644
--- a/pkgs/applications/audio/iannix/default.nix
+++ b/pkgs/by-name/ia/iannix/package.nix
@@ -1,15 +1,13 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
   alsa-lib,
   pkg-config,
-  qtbase,
-  qtscript,
-  qmake,
+  libsForQt5,
 }:
 
-mkDerivation {
+stdenv.mkDerivation {
   pname = "iannix";
   version = "unstable-2020-12-09";
 
@@ -22,24 +20,25 @@ mkDerivation {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     alsa-lib
-    qtbase
-    qtscript
+    libsForQt5.qtbase
+    libsForQt5.qtscript
   ];
 
   qmakeFlags = [ "PREFIX=/" ];
 
   installFlags = [ "INSTALL_ROOT=$(out)" ];
 
-  meta = with lib; {
+  meta = {
     description = "Graphical open-source sequencer";
     mainProgram = "iannix";
     homepage = "https://www.iannix.org/";
-    license = licenses.lgpl3;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ freezeboy ];
+    license = lib.licenses.lgpl3;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ freezeboy ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5b1888b04b63..248202caea78 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3078,8 +3078,6 @@ with pkgs;
 
   hyphenDicts = recurseIntoAttrs (callPackages ../development/libraries/hyphen/dictionaries.nix { });
 
-  iannix = libsForQt5.callPackage ../applications/audio/iannix { };
-
   iaito = libsForQt5.callPackage ../tools/security/iaito { };
 
   icemon = libsForQt5.callPackage ../applications/networking/icemon { };

From 236eab40dc3d00512351c54f56f2b8f1fc4c7963 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 17:17:26 -0700
Subject: [PATCH 1470/6226] muse: move to by-name/

---
 .../muse/default.nix => by-name/mu/muse/package.nix} | 12 +++++-------
 pkgs/top-level/all-packages.nix                      |  2 --
 2 files changed, 5 insertions(+), 9 deletions(-)
 rename pkgs/{applications/audio/muse/default.nix => by-name/mu/muse/package.nix} (93%)

diff --git a/pkgs/applications/audio/muse/default.nix b/pkgs/by-name/mu/muse/package.nix
similarity index 93%
rename from pkgs/applications/audio/muse/default.nix
rename to pkgs/by-name/mu/muse/package.nix
index 5bf3612596b2..411bc19c4c0f 100644
--- a/pkgs/applications/audio/muse/default.nix
+++ b/pkgs/by-name/mu/muse/package.nix
@@ -5,8 +5,6 @@
   cmake,
   extra-cmake-modules,
   pkg-config,
-  qttools,
-  wrapQtAppsHook,
   alsa-lib,
   dssi,
   fluidsynth,
@@ -20,11 +18,11 @@
   lilv,
   lrdf,
   lv2,
-  qtsvg,
   rtaudio,
   rubberband,
   sord,
   serd,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -34,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "muse-sequencer";
     repo = "muse";
-    rev = finalAttrs.version;
+    tag = finalAttrs.version;
     hash = "sha256-LxibuqopMHuKEfTWXSEXc1g3wTm2F3NQRiV71FHvaY0=";
   };
 
@@ -44,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
     extra-cmake-modules
     pkg-config
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -62,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     lilv
     lrdf
     lv2
-    qtsvg
+    libsForQt5.qtsvg
     rtaudio
     rubberband
     sord
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 248202caea78..08eda57a5239 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14290,8 +14290,6 @@ with pkgs;
 
   openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { };
 
-  muse = libsForQt5.callPackage ../applications/audio/muse { };
-
   nixDependencies = recurseIntoAttrs (
     callPackage ../tools/package-management/nix/dependencies-scope.nix { }
   );

From 60b91288d9145100befa651b2c37dfd6831e92af Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 17:25:56 -0700
Subject: [PATCH 1471/6226] jack-autoconnect: move to by-name/

---
 .../ja/jack-autoconnect/package.nix}          | 23 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  1 -
 2 files changed, 12 insertions(+), 12 deletions(-)
 rename pkgs/{applications/audio/jack-autoconnect/default.nix => by-name/ja/jack-autoconnect/package.nix} (67%)

diff --git a/pkgs/applications/audio/jack-autoconnect/default.nix b/pkgs/by-name/ja/jack-autoconnect/package.nix
similarity index 67%
rename from pkgs/applications/audio/jack-autoconnect/default.nix
rename to pkgs/by-name/ja/jack-autoconnect/package.nix
index 9d84c9ff669e..f46a4882b66b 100644
--- a/pkgs/applications/audio/jack-autoconnect/default.nix
+++ b/pkgs/by-name/ja/jack-autoconnect/package.nix
@@ -1,13 +1,12 @@
 {
+  stdenv,
   lib,
-  mkDerivation,
   fetchFromGitHub,
   pkg-config,
-  qmake,
-  qtbase,
   libjack2,
+  libsForQt5,
 }:
-mkDerivation {
+stdenv.mkDerivation {
   pname = "jack_autoconnect";
 
   # It does not have any versions (yet?)
@@ -17,16 +16,18 @@ mkDerivation {
     owner = "kripton";
     repo = "jack_autoconnect";
     rev = "fe0c8f69149e30979e067646f80b9d326341c02b";
-    sha256 = "sha256-imvNc498Q2W9RKmiOoNepSoJzIv2tGvFG6hx+seiifw=";
+    hash = "sha256-imvNc498Q2W9RKmiOoNepSoJzIv2tGvFG6hx+seiifw=";
   };
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     libjack2
   ];
+
   nativeBuildInputs = [
     pkg-config
-    qmake
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   installPhase = ''
@@ -34,12 +35,12 @@ mkDerivation {
     cp -- jack_autoconnect "$out/bin"
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/kripton/jack_autoconnect";
     description = "Tiny application that reacts on port registrations by clients and connects them";
     mainProgram = "jack_autoconnect";
-    maintainers = with maintainers; [ unclechu ];
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ unclechu ];
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 08eda57a5239..a5bb892fea6d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14254,7 +14254,6 @@ with pkgs;
 
   libjack2 = jack2.override { prefix = "lib"; };
 
-  jack-autoconnect = libsForQt5.callPackage ../applications/audio/jack-autoconnect { };
   jack_autoconnect = jack-autoconnect;
 
   j2cli = with python311Packages; toPythonApplication j2cli;

From 72641301aef9fbd5376f231f78b8f9a2821613bc Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 17:35:55 -0700
Subject: [PATCH 1472/6226] mt32emu-qt: modernize, move to by-name/

---
 .../mt/mt32emu-qt/package.nix}                | 32 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 14 insertions(+), 20 deletions(-)
 rename pkgs/{applications/audio/munt/mt32emu-qt.nix => by-name/mt/mt32emu-qt/package.nix} (68%)

diff --git a/pkgs/applications/audio/munt/mt32emu-qt.nix b/pkgs/by-name/mt/mt32emu-qt/package.nix
similarity index 68%
rename from pkgs/applications/audio/munt/mt32emu-qt.nix
rename to pkgs/by-name/mt/mt32emu-qt/package.nix
index ca2d22cc8071..a7eb6f529ca3 100644
--- a/pkgs/applications/audio/munt/mt32emu-qt.nix
+++ b/pkgs/by-name/mt/mt32emu-qt/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  mkDerivation,
   fetchFromGitHub,
   alsa-lib,
   cmake,
@@ -9,24 +8,20 @@
   libmt32emu,
   pkg-config,
   portaudio,
-  qtbase,
-  qtmultimedia,
   withJack ? stdenv.hostPlatform.isUnix,
   libjack2,
+  libsForQt5,
 }:
 
-let
-  char2underscore = char: str: lib.replaceStrings [ char ] [ "_" ] str;
-in
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mt32emu-qt";
   version = "1.11.1";
 
   src = fetchFromGitHub {
     owner = "munt";
     repo = "munt";
-    rev = "${char2underscore "-" pname}_${char2underscore "." version}";
-    sha256 = "sha256-PqYPYnKPlnU3PByxksBscl4GqDRllQdmD6RWpy/Ura0=";
+    tag = "mt32emu_qt_${lib.replaceString "." "_" finalAttrs.version}";
+    hash = "sha256-PqYPYnKPlnU3PByxksBscl4GqDRllQdmD6RWpy/Ura0=";
   };
 
   postPatch = ''
@@ -36,13 +31,14 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     libmt32emu
     portaudio
-    qtbase
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     alsa-lib
@@ -58,11 +54,11 @@ mkDerivation rec {
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir $out/Applications
-    mv $out/bin/${pname}.app $out/Applications/
-    ln -s $out/{Applications/${pname}.app/Contents/MacOS,bin}/${pname}
+    mv $out/bin/mt32emu-qt.app $out/Applications/
+    ln -s $out/{Applications/mt32emu-qt.app/Contents/MacOS,bin}/mt32emu-qt
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://munt.sourceforge.net/";
     description = "Synthesizer application built on Qt and libmt32emu";
     mainProgram = "mt32emu-qt";
@@ -71,8 +67,8 @@ mkDerivation rec {
       synthesis and conversion of pre-recorded SMF files to WAVE making use of
       the mt32emu library and the Qt framework.
     '';
-    license = with licenses; [ gpl3Plus ];
-    maintainers = with maintainers; [ OPNA2608 ];
-    platforms = platforms.all;
+    license = with lib.licenses; [ gpl3Plus ];
+    maintainers = with lib.maintainers; [ OPNA2608 ];
+    platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a5bb892fea6d..1098b9c343ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11377,8 +11377,6 @@ with pkgs;
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
 
-  mt32emu-qt = libsForQt5.callPackage ../applications/audio/munt/mt32emu-qt.nix { };
-
   pass2csv = python3Packages.callPackage ../tools/security/pass2csv { };
 
   pinboard = with python3Packages; toPythonApplication pinboard;

From e1a909b7a1f46d2b65ef2b1221c00f3cc0685d72 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 17:46:46 -0700
Subject: [PATCH 1473/6226] synthv1: modernize, move to by-name/

---
 .../sy/synthv1/package.nix}                   | 28 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 15 insertions(+), 15 deletions(-)
 rename pkgs/{applications/audio/synthv1/default.nix => by-name/sy/synthv1/package.nix} (50%)

diff --git a/pkgs/applications/audio/synthv1/default.nix b/pkgs/by-name/sy/synthv1/package.nix
similarity index 50%
rename from pkgs/applications/audio/synthv1/default.nix
rename to pkgs/by-name/sy/synthv1/package.nix
index 4f6582a875cc..cda48be4f6ae 100644
--- a/pkgs/applications/audio/synthv1/default.nix
+++ b/pkgs/by-name/sy/synthv1/package.nix
@@ -1,42 +1,44 @@
 {
-  mkDerivation,
   lib,
+  stdenv,
   fetchurl,
   pkg-config,
-  qtbase,
-  qttools,
   libjack2,
   alsa-lib,
   liblo,
   lv2,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "synthv1";
   version = "0.9.23";
 
   src = fetchurl {
-    url = "mirror://sourceforge/synthv1/${pname}-${version}.tar.gz";
-    sha256 = "sha256-0V72T51icT/t9fJf4mwcMYZLjzTPnmiCbU+BdwnCmw4=";
+    url = "mirror://sourceforge/synthv1/synthv1-${finalAttrs.version}.tar.gz";
+    hash = "sha256-0V72T51icT/t9fJf4mwcMYZLjzTPnmiCbU+BdwnCmw4=";
   };
 
   buildInputs = [
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
     libjack2
     alsa-lib
     liblo
     lv2
   ];
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+    libsForQt5.wrapQtAppsHook
+  ];
 
-  meta = with lib; {
+  meta = {
     description = "Old-school 4-oscillator subtractive polyphonic synthesizer with stereo fx";
     mainProgram = "synthv1_jack";
     homepage = "https://synthv1.sourceforge.io/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1098b9c343ff..5c68da360a1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13526,8 +13526,6 @@ with pkgs;
 
   stuntrally = callPackage ../games/stuntrally { boost = boost183; };
 
-  synthv1 = libsForQt5.callPackage ../applications/audio/synthv1 { };
-
   the-powder-toy = callPackage ../by-name/th/the-powder-toy/package.nix {
     lua = lua5_2;
   };

From 490bc12f6de312c9d27a90e1d4dce1f005337123 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 17:50:33 -0700
Subject: [PATCH 1474/6226] traverso: move to by-name/

---
 .../tr/traverso/package.nix}                  | 22 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 12 insertions(+), 12 deletions(-)
 rename pkgs/{applications/audio/traverso/default.nix => by-name/tr/traverso/package.nix} (74%)

diff --git a/pkgs/applications/audio/traverso/default.nix b/pkgs/by-name/tr/traverso/package.nix
similarity index 74%
rename from pkgs/applications/audio/traverso/default.nix
rename to pkgs/by-name/tr/traverso/package.nix
index d58ccbf940f0..c554ac5683c9 100644
--- a/pkgs/applications/audio/traverso/default.nix
+++ b/pkgs/by-name/tr/traverso/package.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchurl,
   cmake,
@@ -15,22 +15,24 @@
   libsndfile,
   libvorbis,
   portaudio,
-  qtbase,
   wavpack,
+  libsForQt5,
 }:
-mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "traverso";
   version = "0.49.6";
 
   src = fetchurl {
-    url = "https://traverso-daw.org/traverso-0.49.6.tar.gz";
+    url = "https://traverso-daw.org/traverso-${finalAttrs.version}.tar.gz";
     sha256 = "12f7x8kw4fw1j0xkwjrp54cy4cv1ql0zwz2ba5arclk4pf6bhl7q";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
+
   buildInputs = [
     alsa-lib
     fftw
@@ -43,7 +45,7 @@ mkDerivation {
     libsndfile.dev
     libvorbis
     portaudio
-    qtbase
+    libsForQt5.qtbase
     wavpack
   ];
 
@@ -56,15 +58,15 @@ mkDerivation {
 
   hardeningDisable = [ "format" ];
 
-  meta = with lib; {
+  meta = {
     description = "Cross-platform multitrack audio recording and audio editing suite";
     mainProgram = "traverso";
     homepage = "https://traverso-daw.org/";
-    license = with licenses; [
+    license = with lib.licenses; [
       gpl2Plus
       lgpl21Plus
     ];
-    platforms = platforms.all;
-    maintainers = with maintainers; [ coconnor ];
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ coconnor ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c68da360a1c..28073e101548 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12634,8 +12634,6 @@ with pkgs;
   transmission_4-qt6 = transmission_4.override { enableQt6 = true; };
   transmission_4-qt = transmission_4-qt5;
 
-  traverso = libsForQt5.callPackage ../applications/audio/traverso { };
-
   tinywl = callPackage ../applications/window-managers/tinywl {
     wlroots = wlroots_0_19;
   };

From 94e81c1f953643fbdd1eebe79f9f1edc36d97cf7 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 18:35:19 -0700
Subject: [PATCH 1475/6226] sayonara: modernize, move to by-name/

---
 .../sa/sayonara/package.nix}                  | 24 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 12 insertions(+), 14 deletions(-)
 rename pkgs/{applications/audio/sayonara/default.nix => by-name/sa/sayonara/package.nix} (83%)

diff --git a/pkgs/applications/audio/sayonara/default.nix b/pkgs/by-name/sa/sayonara/package.nix
similarity index 83%
rename from pkgs/applications/audio/sayonara/default.nix
rename to pkgs/by-name/sa/sayonara/package.nix
index bd9331d6bc7e..ac4043f3b686 100644
--- a/pkgs/applications/audio/sayonara/default.nix
+++ b/pkgs/by-name/sa/sayonara/package.nix
@@ -1,5 +1,5 @@
 {
-  mkDerivation,
+  stdenv,
   cmake,
   fetchFromGitLab,
   nix-update-script,
@@ -9,11 +9,10 @@
   ninja,
   pcre,
   pkg-config,
-  qtbase,
-  qttools,
   taglib,
   zlib,
   python3,
+  libsForQt5,
 }:
 
 let
@@ -23,14 +22,14 @@ let
     ]
   );
 in
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "sayonara";
   version = "1.10.0-stable1";
 
   src = fetchFromGitLab {
     owner = "luciocarreras";
     repo = "sayonara-player";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-ZcuWe1dsLJS4/nLXSSKB7wzPU9COFyE4vPSwZIo0bgI=";
   };
 
@@ -44,13 +43,14 @@ mkDerivation rec {
     cmake
     ninja
     pkg-config
-    qttools
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     libpulseaudio
     pcre
-    qtbase
+    libsForQt5.qtbase
     taglib
     zlib
     py
@@ -80,11 +80,11 @@ mkDerivation rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Sayonara music player";
     homepage = "https://sayonara-player.com/";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ deepfire ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ deepfire ];
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 28073e101548..5a0e4d8350ee 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12357,8 +12357,6 @@ with pkgs;
 
   rusty-psn-gui = rusty-psn.override { withGui = true; };
 
-  sayonara = libsForQt5.callPackage ../applications/audio/sayonara { };
-
   scantailor-advanced = callPackage ../applications/graphics/scantailor/advanced.nix { };
 
   scantailor-universal = callPackage ../applications/graphics/scantailor/universal.nix { };

From db37f785a819c352879d95ad4d1d52471cea55fd Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 18:50:03 -0700
Subject: [PATCH 1476/6226] dfasma: modernize, move to by-name/

---
 .../df/dfasma/package.nix}                    | 27 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 14 insertions(+), 15 deletions(-)
 rename pkgs/{applications/audio/dfasma/default.nix => by-name/df/dfasma/package.nix} (85%)

diff --git a/pkgs/applications/audio/dfasma/default.nix b/pkgs/by-name/df/dfasma/package.nix
similarity index 85%
rename from pkgs/applications/audio/dfasma/default.nix
rename to pkgs/by-name/df/dfasma/package.nix
index dd3827ab8a19..96ad53f3bb7b 100644
--- a/pkgs/applications/audio/dfasma/default.nix
+++ b/pkgs/by-name/df/dfasma/package.nix
@@ -1,12 +1,10 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
   fftw,
   libsndfile,
-  qtbase,
-  qtmultimedia,
-  qmake,
+  libsForQt5,
 }:
 
 let
@@ -36,13 +34,13 @@ let
   };
 
 in
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "dfasma";
   version = "1.4.5";
 
   src = fetchFromGitHub {
     sha256 = "09fcyjm0hg3y51fnjax88m93im39nbynxj79ffdknsazmqw9ac0h";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     repo = "dfasma";
     owner = "gillesdegottex";
   };
@@ -50,11 +48,14 @@ mkDerivation rec {
   buildInputs = [
     fftw
     libsndfile
-    qtbase
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
   ];
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
+  ];
 
   postPatch = ''
     cp -Rv "${reaperFork.src}"/* external/REAPER
@@ -62,7 +63,7 @@ mkDerivation rec {
     substituteInPlace dfasma.pro --replace "CONFIG += file_sdif" "";
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Analyse and compare audio files in time and frequency";
     mainProgram = "dfasma";
     longDescription = ''
@@ -75,9 +76,9 @@ mkDerivation rec {
     '';
     homepage = "https://gillesdegottex.gitlab.io/dfasma-website/";
     license = [
-      licenses.gpl3Plus
+      lib.licenses.gpl3Plus
       reaperFork.meta.license
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5a0e4d8350ee..a820d305ac35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10934,8 +10934,6 @@ with pkgs;
 
   inherit (callPackage ../development/tools/devpod { }) devpod devpod-desktop;
 
-  dfasma = libsForQt5.callPackage ../applications/audio/dfasma { };
-
   djv = callPackage ../by-name/dj/djv/package.nix { openexr = openexr_2; };
 
   djview4 = djview;

From f4ec3db3f4ffbe83f3fe99f814a2f4141d96d099 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 19:08:04 -0700
Subject: [PATCH 1477/6226] qmidinet: modernize, move to by-name/

---
 .../qm/qmidinet/package.nix}                  | 28 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 15 insertions(+), 15 deletions(-)
 rename pkgs/{applications/audio/qmidinet/default.nix => by-name/qm/qmidinet/package.nix} (55%)

diff --git a/pkgs/applications/audio/qmidinet/default.nix b/pkgs/by-name/qm/qmidinet/package.nix
similarity index 55%
rename from pkgs/applications/audio/qmidinet/default.nix
rename to pkgs/by-name/qm/qmidinet/package.nix
index 782ddc613260..ba981125e1ac 100644
--- a/pkgs/applications/audio/qmidinet/default.nix
+++ b/pkgs/by-name/qm/qmidinet/package.nix
@@ -1,40 +1,42 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchurl,
   pkg-config,
-  qtbase,
-  qttools,
   alsa-lib,
   libjack2,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "0.9.4";
   pname = "qmidinet";
 
   src = fetchurl {
-    url = "mirror://sourceforge/qmidinet/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/qmidinet/qmidinet-${finalAttrs.version}.tar.gz";
     sha256 = "sha256-7Ui4kUgYgpPVAaaINrd6WGZoYon5UuHszGVaHafb/p0=";
   };
 
   hardeningDisable = [ "format" ];
 
   buildInputs = [
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
     alsa-lib
     libjack2
   ];
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+    libsForQt5.wrapQtAppsHook
+  ];
 
-  meta = with lib; {
+  meta = {
     description = "MIDI network gateway application that sends and receives MIDI data (ALSA Sequencer and/or JACK MIDI) over the network";
     mainProgram = "qmidinet";
     homepage = "http://qmidinet.sourceforge.net/";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.magnetophon ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ magnetophon ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a820d305ac35..575e54cfa88f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12218,8 +12218,6 @@ with pkgs;
   qmplay2-qt5 = qmplay2.override { qtVersion = "5"; };
   qmplay2-qt6 = qmplay2.override { qtVersion = "6"; };
 
-  qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { };
-
   qnotero = libsForQt5.callPackage ../applications/office/qnotero { };
 
   qsampler = libsForQt5.callPackage ../applications/audio/qsampler { };

From 3691402438faaa7ac686cfc9e9d919b5fcc37efe Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 19:18:45 -0700
Subject: [PATCH 1478/6226] qjackctl: modernize, move to by-name/

---
 .../qj/qjackctl/package.nix}                  | 27 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 13 insertions(+), 16 deletions(-)
 rename pkgs/{applications/audio/qjackctl/default.nix => by-name/qj/qjackctl/package.nix} (65%)

diff --git a/pkgs/applications/audio/qjackctl/default.nix b/pkgs/by-name/qj/qjackctl/package.nix
similarity index 65%
rename from pkgs/applications/audio/qjackctl/default.nix
rename to pkgs/by-name/qj/qjackctl/package.nix
index 49adf9fab6f9..fc2a1cdd8bf4 100644
--- a/pkgs/applications/audio/qjackctl/default.nix
+++ b/pkgs/by-name/qj/qjackctl/package.nix
@@ -1,20 +1,18 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   pkg-config,
   cmake,
   alsa-lib,
   libjack2,
   dbus,
-  qtbase,
-  qttools,
-  qtx11extras,
+  libsForQt5,
   # Enable jack session support
   jackSession ? false,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "0.9.91";
   pname = "qjackctl";
 
@@ -23,14 +21,14 @@ mkDerivation rec {
   src = fetchFromGitHub {
     owner = "rncbc";
     repo = "qjackctl";
-    rev = "${pname}_${lib.replaceStrings [ "." ] [ "_" ] version}";
-    sha256 = "sha256-YfdRyylU/ktFvsh18FjpnG9MkV1HxHJBhRnHWQ7I+hY=";
+    tag = "qjackctl_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}";
+    hash = "sha256-YfdRyylU/ktFvsh18FjpnG9MkV1HxHJBhRnHWQ7I+hY=";
   };
 
   buildInputs = [
-    qtbase
-    qtx11extras
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qtx11extras
+    libsForQt5.qttools
     alsa-lib
     libjack2
     dbus
@@ -39,6 +37,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
 
   cmakeFlags = [
@@ -46,12 +45,12 @@ mkDerivation rec {
     "-DCONFIG_JACK_SESSION=${toString jackSession}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Qt application to control the JACK sound server daemon";
     mainProgram = "qjackctl";
     homepage = "https://github.com/rncbc/qjackctl";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 575e54cfa88f..4ce134137a6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12211,8 +12211,6 @@ with pkgs;
 
   wrapQemuBinfmtP = callPackage ../applications/virtualization/qemu/binfmt-p-wrapper.nix { };
 
-  qjackctl = libsForQt5.callPackage ../applications/audio/qjackctl { };
-
   qmediathekview = libsForQt5.callPackage ../applications/video/qmediathekview { };
 
   qmplay2-qt5 = qmplay2.override { qtVersion = "5"; };

From ffa273ca0cdd894176abd4e1040b94dda88d94a3 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 19:21:42 -0700
Subject: [PATCH 1479/6226] qsampler: modernize, move to by-name/

---
 .../qs/qsampler/package.nix}                  | 22 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 11 insertions(+), 13 deletions(-)
 rename pkgs/{applications/audio/qsampler/default.nix => by-name/qs/qsampler/package.nix} (66%)

diff --git a/pkgs/applications/audio/qsampler/default.nix b/pkgs/by-name/qs/qsampler/package.nix
similarity index 66%
rename from pkgs/applications/audio/qsampler/default.nix
rename to pkgs/by-name/qs/qsampler/package.nix
index 46e7a5c7fea3..1abc916de994 100644
--- a/pkgs/applications/audio/qsampler/default.nix
+++ b/pkgs/by-name/qs/qsampler/package.nix
@@ -1,23 +1,22 @@
 {
   lib,
+  stdenv,
   fetchurl,
   autoconf,
   automake,
   libtool,
   pkg-config,
-  qttools,
   liblscp,
   libgig,
-  qtbase,
-  mkDerivation,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qsampler";
   version = "0.6.1";
 
   src = fetchurl {
-    url = "mirror://sourceforge/qsampler/${pname}-${version}.tar.gz";
+    url = "mirror://sourceforge/qsampler/qsampler-${finalAttrs.version}.tar.gz";
     sha256 = "1wr7k739zx2nz00b810f60g9k3y92w05nfci987hw7y2sks9rd8j";
   };
 
@@ -26,24 +25,25 @@ mkDerivation rec {
     automake
     libtool
     pkg-config
-    qttools
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
     liblscp
     libgig
-    qtbase
+    libsForQt5.qtbase
   ];
 
   preConfigure = "make -f Makefile.svn";
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "http://www.linuxsampler.org";
     description = "Graphical frontend to LinuxSampler";
     mainProgram = "qsampler";
-    license = licenses.gpl2;
+    license = lib.licenses.gpl2;
     maintainers = [ ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4ce134137a6e..77825ef64ec5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12218,8 +12218,6 @@ with pkgs;
 
   qnotero = libsForQt5.callPackage ../applications/office/qnotero { };
 
-  qsampler = libsForQt5.callPackage ../applications/audio/qsampler { };
-
   qsstv = qt5.callPackage ../applications/radio/qsstv { };
 
   qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };

From b2ed4d386a8178619db0fa00e9df664573c18595 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 19:51:00 -0700
Subject: [PATCH 1480/6226] projectm_3: move to by-name/

---
 .../pr/projectm_3/package.nix}                     | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    |  2 --
 2 files changed, 7 insertions(+), 9 deletions(-)
 rename pkgs/{applications/audio/projectm_3/default.nix => by-name/pr/projectm_3/package.nix} (88%)

diff --git a/pkgs/applications/audio/projectm_3/default.nix b/pkgs/by-name/pr/projectm_3/package.nix
similarity index 88%
rename from pkgs/applications/audio/projectm_3/default.nix
rename to pkgs/by-name/pr/projectm_3/package.nix
index 09db5ad83393..fb283966c723 100644
--- a/pkgs/applications/audio/projectm_3/default.nix
+++ b/pkgs/by-name/pr/projectm_3/package.nix
@@ -1,37 +1,37 @@
 {
   stdenv,
-  mkDerivation,
   lib,
   fetchFromGitHub,
   autoreconfHook,
   pkg-config,
   SDL2,
-  qtdeclarative,
   libpulseaudio,
   glm,
   which,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "projectm";
   version = "3.1.12";
 
   src = fetchFromGitHub {
     owner = "projectM-visualizer";
     repo = "projectM";
-    rev = "v${version}";
-    sha256 = "sha256-oEfOx93JyR94II5NkUCvMwqxuV7ktpOHZ8PNMLCiqDw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-oEfOx93JyR94II5NkUCvMwqxuV7ktpOHZ8PNMLCiqDw=";
   };
 
   nativeBuildInputs = [
     pkg-config
     autoreconfHook
     which
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     SDL2
-    qtdeclarative
+    libsForQt5.qtdeclarative
     libpulseaudio
     glm
   ];
@@ -65,4 +65,4 @@ mkDerivation rec {
       Read an audio input and produces mesmerizing visuals, detecting tempo, and rendering advanced equations into a limitless array of user-contributed visualizations.
     '';
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 77825ef64ec5..96ce666dc72a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3833,8 +3833,6 @@ with pkgs;
 
   polaris-web = callPackage ../servers/polaris/web.nix { };
 
-  projectm_3 = libsForQt5.callPackage ../applications/audio/projectm_3 { };
-
   proxmark3 = libsForQt5.callPackage ../tools/security/proxmark3/default.nix { };
 
   pycflow2dot = with python3.pkgs; toPythonApplication pycflow2dot;

From 0d1e5fd68008ccc0c3a830e5213f77afd42192e7 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 19:54:01 -0700
Subject: [PATCH 1481/6226] jackmix: modernize, move to by-name/

---
 .../audio => by-name/ja}/jackmix/no_error.patch     |  0
 .../default.nix => by-name/ja/jackmix/package.nix}  | 13 +++++++------
 pkgs/top-level/all-packages.nix                     |  1 -
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename pkgs/{applications/audio => by-name/ja}/jackmix/no_error.patch (100%)
 rename pkgs/{applications/audio/jackmix/default.nix => by-name/ja/jackmix/package.nix} (88%)

diff --git a/pkgs/applications/audio/jackmix/no_error.patch b/pkgs/by-name/ja/jackmix/no_error.patch
similarity index 100%
rename from pkgs/applications/audio/jackmix/no_error.patch
rename to pkgs/by-name/ja/jackmix/no_error.patch
diff --git a/pkgs/applications/audio/jackmix/default.nix b/pkgs/by-name/ja/jackmix/package.nix
similarity index 88%
rename from pkgs/applications/audio/jackmix/default.nix
rename to pkgs/by-name/ja/jackmix/package.nix
index d4a0bf6064a4..7b57e6571bcb 100644
--- a/pkgs/applications/audio/jackmix/default.nix
+++ b/pkgs/by-name/ja/jackmix/package.nix
@@ -1,25 +1,25 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
   pkg-config,
   scons,
-  qtbase,
   lash,
   libjack2,
   jack ? libjack2,
   alsa-lib,
+  libsForQt5,
   fetchpatch,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "jackmix";
   version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "kampfschlaefer";
     repo = "jackmix";
-    rev = version;
+    tag = finalAttrs.version;
     sha256 = "0p59411vk38lccn24r7nih10jpgg9i46yc26zpc3x13amxwwpd4h";
   };
 
@@ -35,9 +35,10 @@ mkDerivation rec {
   nativeBuildInputs = [
     scons
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     lash
     jack
     alsa-lib
@@ -55,4 +56,4 @@ mkDerivation rec {
     maintainers = with maintainers; [ kampfschlaefer ];
     platforms = platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96ce666dc72a..8b0c025fd583 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11578,7 +11578,6 @@ with pkgs;
     subproject = "reader";
   };
 
-  jackmix = libsForQt5.callPackage ../applications/audio/jackmix { };
   jackmix_jack1 = jackmix.override { jack = jack1; };
 
   js8call = qt5.callPackage ../applications/radio/js8call { };

From 38a526329486c6091a6d7e5a6ed0e8616c053171 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 20:20:42 -0700
Subject: [PATCH 1482/6226] carla: move to by-name/

---
 .../ca/carla/package.nix}                     | 21 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 10 insertions(+), 13 deletions(-)
 rename pkgs/{applications/audio/carla/default.nix => by-name/ca/carla/package.nix} (87%)

diff --git a/pkgs/applications/audio/carla/default.nix b/pkgs/by-name/ca/carla/package.nix
similarity index 87%
rename from pkgs/applications/audio/carla/default.nix
rename to pkgs/by-name/ca/carla/package.nix
index ece20404eac8..5e89d64292bf 100644
--- a/pkgs/applications/audio/carla/default.nix
+++ b/pkgs/by-name/ca/carla/package.nix
@@ -11,17 +11,16 @@
   libsndfile,
   pkg-config,
   python3Packages,
+  libsForQt5,
   which,
   gtk3 ? null,
-  qtbase ? null,
   withFrontend ? true,
   withGtk3 ? true,
   withQt ? true,
-  wrapQtAppsHook ? null,
 }:
 
-assert withQt -> qtbase != null;
-assert withQt -> wrapQtAppsHook != null;
+assert withQt -> libsForQt5.qtbase != null;
+assert withQt -> libsForQt5.wrapQtAppsHook != null;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "carla";
@@ -30,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "falkTX";
     repo = "carla";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-21QaFCIjGjRTcJtf2nwC5RcVJF8JgcFPIbS8apvf9tw=";
   };
 
@@ -38,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
     python3Packages.wrapPython
     pkg-config
     which
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   pythonPath =
@@ -58,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     libpulseaudio
     libsndfile
   ]
-  ++ lib.optional withQt qtbase
+  ++ lib.optional withQt libsForQt5.qtbase
   ++ lib.optional withGtk3 gtk3;
 
   propagatedBuildInputs = finalAttrs.pythonPath;
@@ -99,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://kx.studio/Applications:Carla";
     description = "Audio plugin host";
     longDescription = ''
@@ -108,8 +107,8 @@ stdenv.mkDerivation (finalAttrs: {
       It uses JACK as the default and preferred audio driver but also
       supports native drivers like ALSA, DirectSound or CoreAudio.
     '';
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.minijackson ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ minijackson ];
+    platforms = lib.platforms.linux;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8b0c025fd583..9822dbf4263c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10842,8 +10842,6 @@ with pkgs;
     confd-calico
     ;
 
-  carla = libsForQt5.callPackage ../applications/audio/carla { };
-
   cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { };
 
   cbconvert-gui = cbconvert.gui;

From 873872959d90f6539061bdf229c76e027b1527c6 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 20:51:34 -0700
Subject: [PATCH 1483/6226] seq66: move to by-name/

---
 .../se/seq66/package.nix}                     | 26 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 12 insertions(+), 16 deletions(-)
 rename pkgs/{applications/audio/seq66/default.nix => by-name/se/seq66/package.nix} (73%)

diff --git a/pkgs/applications/audio/seq66/default.nix b/pkgs/by-name/se/seq66/package.nix
similarity index 73%
rename from pkgs/applications/audio/seq66/default.nix
rename to pkgs/by-name/se/seq66/package.nix
index 90ed92fa2039..0d0415ba25cb 100644
--- a/pkgs/applications/audio/seq66/default.nix
+++ b/pkgs/by-name/se/seq66/package.nix
@@ -4,55 +4,53 @@
   fetchFromGitHub,
   autoreconfHook,
   pkg-config,
-  qttools,
   which,
   alsa-lib,
   libjack2,
   liblo,
-  qtbase,
-  wrapQtAppsHook,
+  qt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "seq66";
   version = "0.99.21";
 
   src = fetchFromGitHub {
     owner = "ahlstromcj";
     repo = "seq66";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-0joa69nSX3lcpoRq9YToNA75Sg9dlYMGRZEfcJm9Vjg=";
   };
 
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
-    qttools
+    qt5.qttools
     which
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     alsa-lib
     libjack2
     liblo
-    qtbase
+    qt5.qtbase
   ];
 
   postPatch = ''
     for d in libseq66/src libsessions/include libsessions/src seq_qt5/src seq_rtmidi/src; do
-      substituteInPlace "$d/Makefile.am" --replace-fail '$(git_info)' '${version}'
+      substituteInPlace "$d/Makefile.am" --replace-fail '$(git_info)' '${finalAttrs.version}'
     done
   '';
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/ahlstromcj/seq66";
     description = "Loop based midi sequencer with Qt GUI derived from seq24 and sequencer64";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ orivej ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ orivej ];
     mainProgram = "qseq66";
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9822dbf4263c..1e7eadd6cb59 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12348,8 +12348,6 @@ with pkgs;
 
   scantailor-universal = callPackage ../applications/graphics/scantailor/universal.nix { };
 
-  seq66 = qt5.callPackage ../applications/audio/seq66 { };
-
   sfxr-qt = libsForQt5.callPackage ../applications/audio/sfxr-qt { };
 
   stag = callPackage ../applications/misc/stag {

From 62c2b9c6f1560b1cb4005c1006bb47448f7a9027 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 21:27:49 -0700
Subject: [PATCH 1484/6226] samplv1: move to by-name/

---
 .../sa/samplv1/package.nix}                   | 19 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 8 insertions(+), 13 deletions(-)
 rename pkgs/{applications/audio/samplv1/default.nix => by-name/sa/samplv1/package.nix} (75%)

diff --git a/pkgs/applications/audio/samplv1/default.nix b/pkgs/by-name/sa/samplv1/package.nix
similarity index 75%
rename from pkgs/applications/audio/samplv1/default.nix
rename to pkgs/by-name/sa/samplv1/package.nix
index c15e62c3612a..9991c26e50db 100644
--- a/pkgs/applications/audio/samplv1/default.nix
+++ b/pkgs/by-name/sa/samplv1/package.nix
@@ -8,27 +8,24 @@
   liblo,
   libsndfile,
   lv2,
-  qtbase,
-  qttools,
   rubberband,
-  wrapQtAppsHook,
   cmake,
-  qtsvg,
+  kdePackages,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "samplv1";
   version = "1.3.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/samplv1/samplv1-${version}.tar.gz";
+    url = "mirror://sourceforge/samplv1/samplv1-${finalAttrs.version}.tar.gz";
     hash = "sha256-YCxt9RAP02uAigddA6HjBt2ryM6MyOtI3L2eLg0AhFg=";
   };
 
   nativeBuildInputs = [
-    qttools
+    kdePackages.qttools
     pkg-config
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
     cmake
   ];
 
@@ -38,9 +35,9 @@ stdenv.mkDerivation rec {
     liblo
     libsndfile
     lv2
-    qtbase
+    kdePackages.qtbase
     rubberband
-    qtsvg
+    kdePackages.qtsvg
   ];
 
   meta = {
@@ -51,4 +48,4 @@ stdenv.mkDerivation rec {
     platforms = lib.platforms.linux;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1e7eadd6cb59..214bea99b2ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13104,8 +13104,6 @@ with pkgs;
     stdenv = llvmPackages.stdenv;
   };
 
-  samplv1 = qt6.callPackage ../applications/audio/samplv1 { };
-
   beancount = with python3.pkgs; toPythonApplication beancount;
 
   beancount_2 = with python3.pkgs; toPythonApplication beancount_2;

From 89d1c448c15200fa772aeef5aa6bb182474201f3 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 21:32:44 -0700
Subject: [PATCH 1485/6226] mbrola{-voices}: move to by-name/

---
 .../voices.nix => by-name/mb/mbrola-voices/package.nix}       | 0
 .../mbrola/default.nix => by-name/mb/mbrola/package.nix}      | 0
 pkgs/top-level/all-packages.nix                               | 4 ----
 3 files changed, 4 deletions(-)
 rename pkgs/{applications/audio/mbrola/voices.nix => by-name/mb/mbrola-voices/package.nix} (100%)
 rename pkgs/{applications/audio/mbrola/default.nix => by-name/mb/mbrola/package.nix} (100%)

diff --git a/pkgs/applications/audio/mbrola/voices.nix b/pkgs/by-name/mb/mbrola-voices/package.nix
similarity index 100%
rename from pkgs/applications/audio/mbrola/voices.nix
rename to pkgs/by-name/mb/mbrola-voices/package.nix
diff --git a/pkgs/applications/audio/mbrola/default.nix b/pkgs/by-name/mb/mbrola/package.nix
similarity index 100%
rename from pkgs/applications/audio/mbrola/default.nix
rename to pkgs/by-name/mb/mbrola/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 214bea99b2ff..2f5ec60f0304 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11774,10 +11774,6 @@ with pkgs;
     python3Packages.callPackage ../applications/networking/instant-messengers/matrix-commander
       { };
 
-  mbrola = callPackage ../applications/audio/mbrola { };
-
-  mbrola-voices = callPackage ../applications/audio/mbrola/voices.nix { };
-
   mediaelch-qt5 = callPackage ../by-name/me/mediaelch/package.nix { qtVersion = 5; };
   mediaelch-qt6 = mediaelch;
 

From 73e26854d1ed03f2df5bf12bb32aa6f072136570 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 21:57:21 -0700
Subject: [PATCH 1486/6226] patchance: move to by-name/

---
 .../pa/patchance/package.nix}                 | 19 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 9 insertions(+), 12 deletions(-)
 rename pkgs/{applications/audio/patchance/default.nix => by-name/pa/patchance/package.nix} (72%)

diff --git a/pkgs/applications/audio/patchance/default.nix b/pkgs/by-name/pa/patchance/package.nix
similarity index 72%
rename from pkgs/applications/audio/patchance/default.nix
rename to pkgs/by-name/pa/patchance/package.nix
index c527bc7037c2..dbe985fd808f 100644
--- a/pkgs/applications/audio/patchance/default.nix
+++ b/pkgs/by-name/pa/patchance/package.nix
@@ -1,27 +1,26 @@
 {
   lib,
   fetchurl,
-  buildPythonApplication,
+  python3Packages,
   libjack2,
-  pyqt5,
   qt5,
   which,
   bash,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "patchance";
   version = "1.1.0";
 
   src = fetchurl {
     url = "https://github.com/Houston4444/Patchance/releases/download/v${version}/Patchance-${version}-source.tar.gz";
-    sha256 = "sha256-wlkEKkPH2C/y7TQicIVycWbtLUdX2hICcUWi7nFN51w=";
+    hash = "sha256-wlkEKkPH2C/y7TQicIVycWbtLUdX2hICcUWi7nFN51w=";
   };
 
   format = "other";
 
   nativeBuildInputs = [
-    pyqt5 # pyuic5 and pyrcc5 to build resources.
+    python3Packages.pyqt5 # pyuic5 and pyrcc5 to build resources.
     qt5.qttools # lrelease to build translations.
     which # which to find lrelease.
     qt5.wrapQtAppsHook
@@ -30,7 +29,7 @@ buildPythonApplication rec {
     libjack2
     bash
   ];
-  propagatedBuildInputs = [ pyqt5 ];
+  propagatedBuildInputs = [ python3Packages.pyqt5 ];
 
   dontWrapQtApps = true; # The program is a python script.
 
@@ -54,12 +53,12 @@ buildPythonApplication rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/Houston4444/Patchance";
     description = "JACK Patchbay GUI";
     mainProgram = "patchance";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ orivej ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ orivej ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f5ec60f0304..b82f42e5eb62 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3747,8 +3747,6 @@ with pkgs;
 
   patch = gnupatch;
 
-  patchance = python3Packages.callPackage ../applications/audio/patchance { };
-
   pcscliteWithPolkit = pcsclite.override {
     pname = "pcsclite-with-polkit";
     polkitSupport = true;

From 83581bafc24ce2b89926f1630220a9ed960ba3da Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Mon, 20 Oct 2025 21:59:27 -0700
Subject: [PATCH 1487/6226] raysession: move to by-name/

---
 .../ra/raysession/package.nix}                | 22 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 10 insertions(+), 14 deletions(-)
 rename pkgs/{applications/audio/raysession/default.nix => by-name/ra/raysession/package.nix} (76%)

diff --git a/pkgs/applications/audio/raysession/default.nix b/pkgs/by-name/ra/raysession/package.nix
similarity index 76%
rename from pkgs/applications/audio/raysession/default.nix
rename to pkgs/by-name/ra/raysession/package.nix
index ad6ae6e03dd9..27cfceef16e6 100644
--- a/pkgs/applications/audio/raysession/default.nix
+++ b/pkgs/by-name/ra/raysession/package.nix
@@ -1,22 +1,20 @@
 {
   lib,
   fetchurl,
-  buildPythonApplication,
+  python3Packages,
   libjack2,
-  pyliblo3,
-  pyqt5,
   which,
   bash,
   qt5,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "raysession";
   version = "0.14.4";
 
   src = fetchurl {
     url = "https://github.com/Houston4444/RaySession/releases/download/v${version}/RaySession-${version}-source.tar.gz";
-    sha256 = "sha256-cr9kqZdqY6Wq+RkzwYxNrb/PLFREKUgWeVNILVUkc7A=";
+    hash = "sha256-cr9kqZdqY6Wq+RkzwYxNrb/PLFREKUgWeVNILVUkc7A=";
   };
 
   postPatch = ''
@@ -30,7 +28,7 @@ buildPythonApplication rec {
   format = "other";
 
   nativeBuildInputs = [
-    pyqt5 # pyuic5 and pyrcc5 to build resources.
+    python3Packages.pyqt5 # pyuic5 and pyrcc5 to build resources.
     qt5.qttools # lrelease to build translations.
     which # which to find lrelease.
     qt5.wrapQtAppsHook
@@ -40,8 +38,8 @@ buildPythonApplication rec {
     bash
   ];
   dependencies = [
-    pyliblo3
-    pyqt5
+    python3Packages.pyliblo3
+    python3Packages.pyqt5
   ];
 
   dontWrapQtApps = true; # The program is a python script.
@@ -62,11 +60,11 @@ buildPythonApplication rec {
     done
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/Houston4444/RaySession";
     description = "Session manager for Linux musical programs";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ orivej ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ orivej ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b82f42e5eb62..85c68d5e51e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3847,8 +3847,6 @@ with pkgs;
 
   pywal = with python3Packages; toPythonApplication pywal;
 
-  raysession = python3Packages.callPackage ../applications/audio/raysession { };
-
   remarshal = with python3Packages; toPythonApplication remarshal;
 
   riseup-vpn = qt6Packages.callPackage ../tools/networking/bitmask-vpn {

From c8a90d6bb4906539aea1a1935148081d452ab162 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 13:17:17 -0700
Subject: [PATCH 1488/6226] mixxx: move to by-name/

---
 .../mi/mixxx/package.nix}                     | 19 +++++++------------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 7 insertions(+), 14 deletions(-)
 rename pkgs/{applications/audio/mixxx/default.nix => by-name/mi/mixxx/package.nix} (93%)

diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/by-name/mi/mixxx/package.nix
similarity index 93%
rename from pkgs/applications/audio/mixxx/default.nix
rename to pkgs/by-name/mi/mixxx/package.nix
index 82bd51e8ad17..ee9cbed563a7 100644
--- a/pkgs/applications/audio/mixxx/default.nix
+++ b/pkgs/by-name/mi/mixxx/package.nix
@@ -36,11 +36,6 @@
   portaudio,
   portmidi,
   protobuf,
-  qt5compat,
-  qtbase,
-  qtdeclarative,
-  qtkeychain,
-  qtsvg,
   rubberband,
   serd,
   sord,
@@ -51,7 +46,7 @@
   upower,
   vamp-plugin-sdk,
   wavpack,
-  wrapQtAppsHook,
+  kdePackages,
 }:
 
 stdenv.mkDerivation rec {
@@ -74,7 +69,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -110,11 +105,11 @@ stdenv.mkDerivation rec {
     portaudio
     portmidi
     protobuf
-    qt5compat
-    qtbase
-    qtdeclarative
-    qtkeychain
-    qtsvg
+    kdePackages.qt5compat
+    kdePackages.qtbase
+    kdePackages.qtdeclarative
+    kdePackages.qtkeychain
+    kdePackages.qtsvg
     rubberband
     serd
     sord
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 85c68d5e51e4..139fcdbf8766 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11795,8 +11795,6 @@ with pkgs;
 
   minitube = libsForQt5.callPackage ../applications/video/minitube { };
 
-  mixxx = qt6Packages.callPackage ../applications/audio/mixxx { };
-
   mldonkey = callPackage ../applications/networking/p2p/mldonkey {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };

From ed5d911fafe738234b1046b7d611cfc665d80e74 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 13:34:57 -0700
Subject: [PATCH 1489/6226] pragha: modernize, move to by-name/

---
 .../pr/pragha/package.nix}                    | 27 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 14 insertions(+), 15 deletions(-)
 rename pkgs/{applications/audio/pragha/default.nix => by-name/pr/pragha/package.nix} (83%)

diff --git a/pkgs/applications/audio/pragha/default.nix b/pkgs/by-name/pr/pragha/package.nix
similarity index 83%
rename from pkgs/applications/audio/pragha/default.nix
rename to pkgs/by-name/pr/pragha/package.nix
index a96b037d8c5b..067359851eb7 100644
--- a/pkgs/applications/audio/pragha/default.nix
+++ b/pkgs/by-name/pr/pragha/package.nix
@@ -1,14 +1,13 @@
 {
   lib,
+  stdenv,
   intltool,
-  mkDerivation,
   installShellFiles,
   pkg-config,
   fetchFromGitHub,
   dbus-glib,
   desktop-file-utils,
   hicolor-icon-theme,
-  qtbase,
   sqlite,
   taglib,
   zlib,
@@ -17,6 +16,7 @@
   libcddb,
   libcdio,
   gst_all_1,
+  libsForQt5,
   withGstPlugins ? true,
   glyr,
   withGlyr ? true,
@@ -45,15 +45,15 @@
 assert withGlyr -> withLastfm;
 assert withLastfm -> withCD;
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pragha";
   version = "1.3.99.1";
 
   src = fetchFromGitHub {
     owner = "pragha-music-player";
     repo = "pragha";
-    rev = "v${version}";
-    sha256 = "sha256-C4zh2NHqP4bwKMi5s+3AfEtKqxRlzL66H8OyNonGzxE=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-C4zh2NHqP4bwKMi5s+3AfEtKqxRlzL66H8OyNonGzxE=";
   };
 
   nativeBuildInputs = [
@@ -62,6 +62,7 @@ mkDerivation rec {
     xfce.xfce4-dev-tools
     desktop-file-utils
     installShellFiles
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs =
@@ -73,7 +74,7 @@ mkDerivation rec {
       gtk3
       hicolor-icon-theme
       libpeas
-      qtbase
+      libsForQt5.qtbase
       sqlite
       taglib
       zlib
@@ -108,17 +109,17 @@ mkDerivation rec {
   postInstall = ''
     qtWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0")
 
-    install -m 444 data/${pname}.desktop $out/share/applications
+    install -m 444 data/pragha.desktop $out/share/applications
     install -d $out/share/pixmaps
-    installManPage data/${pname}.1
+    installManPage data/pragha.1
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Lightweight GTK+ music manager - fork of Consonance Music Manager";
     mainProgram = "pragha";
     homepage = "https://pragha-music-player.github.io/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ mbaeten ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ mbaeten ];
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 139fcdbf8766..104ff7b6ca1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11858,8 +11858,6 @@ with pkgs;
     withConplay = false;
   };
 
-  pragha = libsForQt5.callPackage ../applications/audio/pragha { };
-
   rofi-emoji = (callPackage ../applications/misc/rofi-emoji { }).v3;
 
   rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw {

From 3f9b9a9212d9c5f749acc9901fb60e2a5af85b7e Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 15:06:20 -0700
Subject: [PATCH 1490/6226] hqplayer-desktop: move to by-name/

---
 .../hq/hqplayer-desktop/package.nix}          | 27 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 11 insertions(+), 18 deletions(-)
 rename pkgs/{applications/audio/hqplayer-desktop/default.nix => by-name/hq/hqplayer-desktop/package.nix} (87%)

diff --git a/pkgs/applications/audio/hqplayer-desktop/default.nix b/pkgs/by-name/hq/hqplayer-desktop/package.nix
similarity index 87%
rename from pkgs/applications/audio/hqplayer-desktop/default.nix
rename to pkgs/by-name/hq/hqplayer-desktop/package.nix
index 36fc6235dad5..2b8acc8aa1ab 100644
--- a/pkgs/applications/audio/hqplayer-desktop/default.nix
+++ b/pkgs/by-name/hq/hqplayer-desktop/package.nix
@@ -12,13 +12,8 @@
   libusb-compat-0_1,
   llvmPackages,
   mpfr,
-  qtcharts,
-  qtdeclarative,
-  qtwayland,
-  qtwebengine,
-  qtwebview,
   wavpack,
-  wrapQtAppsHook,
+  kdePackages,
 }:
 
 let
@@ -44,7 +39,7 @@ stdenv.mkDerivation {
   nativeBuildInputs = [
     autoPatchelfHook
     dpkg
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -56,11 +51,11 @@ stdenv.mkDerivation {
     libusb-compat-0_1
     llvmPackages.openmp
     mpfr
-    qtcharts
-    qtdeclarative
-    qtwayland
-    qtwebengine
-    qtwebview
+    kdePackages.qtcharts
+    kdePackages.qtdeclarative
+    kdePackages.qtwayland
+    kdePackages.qtwebengine
+    kdePackages.qtwebview
     wavpack
   ];
 
@@ -111,12 +106,12 @@ stdenv.mkDerivation {
     patchelf --replace-needed libomp.so.5 libomp.so $out/bin/.hqplayer5*-wrapped
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.signalyst.com";
     description = "High-end upsampling multichannel software HD-audio player";
-    license = licenses.unfree;
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     platforms = builtins.attrNames srcs;
-    maintainers = with maintainers; [ lovesegfault ];
+    maintainers = with lib.maintainers; [ lovesegfault ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 104ff7b6ca1a..818bebe35901 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3062,8 +3062,6 @@ with pkgs;
 
   hpccm = with python3Packages; toPythonApplication hpccm;
 
-  hqplayer-desktop = qt6Packages.callPackage ../applications/audio/hqplayer-desktop { };
-
   html-proofer = callPackage ../tools/misc/html-proofer { };
 
   httpie = with python3Packages; toPythonApplication httpie;

From 101675411d30a3f8b0eaae967f203949c0b66fd6 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 15:17:55 -0700
Subject: [PATCH 1491/6226] mellowplayer: modernize, move to by-name/

---
 .../me/mellowplayer/package.nix}              | 39 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 17 insertions(+), 24 deletions(-)
 rename pkgs/{applications/audio/mellowplayer/default.nix => by-name/me/mellowplayer/package.nix} (77%)

diff --git a/pkgs/applications/audio/mellowplayer/default.nix b/pkgs/by-name/me/mellowplayer/package.nix
similarity index 77%
rename from pkgs/applications/audio/mellowplayer/default.nix
rename to pkgs/by-name/me/mellowplayer/package.nix
index 418e80e15c20..89429be73733 100644
--- a/pkgs/applications/audio/mellowplayer/default.nix
+++ b/pkgs/by-name/me/mellowplayer/package.nix
@@ -1,43 +1,38 @@
 {
+  stdenv,
   cmake,
   fetchFromGitLab,
   lib,
   libnotify,
-  mkDerivation,
   pkg-config,
-  qtbase,
-  qtdeclarative,
-  qtgraphicaleffects,
-  qtquickcontrols2,
-  qttools,
-  qtwebengine,
-  stdenv,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "MellowPlayer";
   version = "3.6.8";
 
   src = fetchFromGitLab {
     owner = "ColinDuquesnoy";
     repo = "MellowPlayer";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-rsF2xQet7U8d4oGU/HgghvE3vvmkxjlGXPBlLD9mWTk=";
   };
 
   nativeBuildInputs = [
     cmake
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     libnotify
-    qtbase
-    qtdeclarative
-    qtgraphicaleffects
-    qtquickcontrols2
-    qttools
-    qtwebengine
+    libsForQt5.qtbase
+    libsForQt5.qtdeclarative
+    libsForQt5.qtgraphicaleffects
+    libsForQt5.qtquickcontrols2
+    libsForQt5.qttools
+    libsForQt5.qtwebengine
   ];
 
   doCheck = true;
@@ -63,18 +58,18 @@ mkDerivation rec {
         (lib.optionalString (pkg ? qtQmlPrefix) ''
           export QML2_IMPORT_PATH="${pkg}/${pkg.qtQmlPrefix}"''${QML2_IMPORT_PATH:+':'}$QML2_IMPORT_PATH
         '')
-      ]) buildInputs
+      ]) finalAttrs.buildInputs
     )
   ));
 
-  meta = with lib; {
-    inherit (qtbase.meta) platforms;
+  meta = {
+    inherit (libsForQt5.qtbase.meta) platforms;
     broken = stdenv.hostPlatform.isDarwin; # test build fails, but the project is not maintained anymore
 
     description = "Cloud music integration for your desktop";
     mainProgram = "MellowPlayer";
     homepage = "https://gitlab.com/ColinDuquesnoy/MellowPlayer";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ kalbasit ];
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ kalbasit ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 818bebe35901..523e9b6e1320 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2383,8 +2383,6 @@ with pkgs;
     protobuf = protobuf_21;
   };
 
-  mellowplayer = libsForQt5.callPackage ../applications/audio/mellowplayer { };
-
   circus = with python310Packages; toPythonApplication circus;
 
   inherit (callPackage ../applications/networking/remote/citrix-workspace { })

From a62102d5d241004d71e7ba4a4b682745c75d6186 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 16:12:59 -0700
Subject: [PATCH 1492/6226] greg: move to by-name/

---
 .../gr/greg/package.nix}                      | 19 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 ----
 2 files changed, 9 insertions(+), 14 deletions(-)
 rename pkgs/{applications/audio/greg/default.nix => by-name/gr/greg/package.nix} (53%)

diff --git a/pkgs/applications/audio/greg/default.nix b/pkgs/by-name/gr/greg/package.nix
similarity index 53%
rename from pkgs/applications/audio/greg/default.nix
rename to pkgs/by-name/gr/greg/package.nix
index 44bd16adf092..da9eca5d24ff 100644
--- a/pkgs/applications/audio/greg/default.nix
+++ b/pkgs/by-name/gr/greg/package.nix
@@ -1,34 +1,33 @@
 {
   lib,
   fetchFromGitHub,
-  pythonPackages,
+  python3Packages,
 }:
 
-with pythonPackages;
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "greg";
   version = "0.4.8";
   format = "setuptools";
 
-  disabled = !isPy3k;
+  disabled = !python3Packages.isPy3k;
 
   src = fetchFromGitHub {
     owner = "manolomartinez";
     repo = "greg";
     tag = "v${version}";
-    sha256 = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4=";
+    hash = "sha256-o4+tXVJTgT52JyJOC+Glr2cvZjbTaZL8TIsmz+A4vE4=";
   };
 
   propagatedBuildInputs = [
-    setuptools
-    feedparser
+    python3Packages.setuptools
+    python3Packages.feedparser
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/manolomartinez/greg";
     description = "Command-line podcast aggregator";
     mainProgram = "greg";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ edwtjo ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ edwtjo ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 523e9b6e1320..4fe3da820ac4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2032,10 +2032,6 @@ with pkgs;
     inherit (darwin) libresolv;
   };
 
-  greg = callPackage ../applications/audio/greg {
-    pythonPackages = python3Packages;
-  };
-
   hocr-tools = with python3Packages; toPythonApplication hocr-tools;
 
   hopper = qt5.callPackage ../development/tools/analysis/hopper { };

From c159537648488d972f6acfed73c107f5d0fa0dec Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 16:19:27 -0700
Subject: [PATCH 1493/6226] deadbeef: modernize, move to by-name/

---
 .../de/deadbeef/package.nix}                       | 14 ++++++--------
 pkgs/top-level/all-packages.nix                    |  2 --
 2 files changed, 6 insertions(+), 10 deletions(-)
 rename pkgs/{applications/audio/deadbeef/default.nix => by-name/de/deadbeef/package.nix} (95%)

diff --git a/pkgs/applications/audio/deadbeef/default.nix b/pkgs/by-name/de/deadbeef/package.nix
similarity index 95%
rename from pkgs/applications/audio/deadbeef/default.nix
rename to pkgs/by-name/de/deadbeef/package.nix
index afcd574395f4..6179b42afcad 100644
--- a/pkgs/applications/audio/deadbeef/default.nix
+++ b/pkgs/by-name/de/deadbeef/package.nix
@@ -62,18 +62,16 @@
 
 let
   inherit (lib) optionals;
-
-  version = "1.10.0";
 in
-clangStdenv.mkDerivation {
+clangStdenv.mkDerivation (finalAttrs: {
   pname = "deadbeef";
-  inherit version;
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "DeaDBeeF-Player";
     repo = "deadbeef";
     fetchSubmodules = true;
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-qa0ULmE15lV2vkyXPNW9kSISQZEANrjwJwykTiifk5Q=";
   };
 
@@ -155,16 +153,16 @@ clangStdenv.mkDerivation {
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Ultimate Music Player for GNU/Linux";
     mainProgram = "deadbeef";
     homepage = "http://deadbeef.sourceforge.net/";
     downloadPage = "https://github.com/DeaDBeeF-Player/deadbeef";
-    license = licenses.gpl2;
+    license = lib.licenses.gpl2;
     platforms = [
       "x86_64-linux"
       "i686-linux"
     ];
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4fe3da820ac4..68af85ebbdb7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10900,8 +10900,6 @@ with pkgs;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  deadbeef = callPackage ../applications/audio/deadbeef { };
-
   deadbeefPlugins = {
     headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { };
     lyricbar = callPackage ../applications/audio/deadbeef/plugins/lyricbar.nix { };

From 36967779e93f9c657dc288aabedf7f78f2764c68 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 16:38:09 -0700
Subject: [PATCH 1494/6226] petrifoo: modernize, move to by-name/

---
 .../pe/petrifoo/package.nix}                     | 16 ++++++++--------
 pkgs/top-level/all-packages.nix                  |  4 ----
 2 files changed, 8 insertions(+), 12 deletions(-)
 rename pkgs/{applications/audio/petrifoo/default.nix => by-name/pe/petrifoo/package.nix} (84%)

diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/by-name/pe/petrifoo/package.nix
similarity index 84%
rename from pkgs/applications/audio/petrifoo/default.nix
rename to pkgs/by-name/pe/petrifoo/package.nix
index 71eb8a766482..864c1668c47a 100644
--- a/pkgs/applications/audio/petrifoo/default.nix
+++ b/pkgs/by-name/pe/petrifoo/package.nix
@@ -7,7 +7,7 @@
   cmake,
   gtk2,
   libjack2,
-  libgnomecanvas,
+  gnome2,
   libpthreadstubs,
   libsamplerate,
   libsndfile,
@@ -17,12 +17,12 @@
   openssl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "petri-foo";
   version = "0.1.87";
 
   src = fetchurl {
-    url = "mirror://sourceforge/petri-foo/${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/petri-foo/petri-foo-${finalAttrs.version}.tar.bz2";
     sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh";
   };
 
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
     alsa-lib
     gtk2
     libjack2
-    libgnomecanvas
+    gnome2.libgnomecanvas
     libpthreadstubs
     libsamplerate
     libsndfile
@@ -61,13 +61,13 @@ stdenv.mkDerivation rec {
     openssl
   ];
 
-  meta = with lib; {
+  meta = {
     description = "MIDI controllable audio sampler";
     longDescription = "a fork of Specimen";
     homepage = "https://petri-foo.sourceforge.net";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
     mainProgram = "petri-foo";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 68af85ebbdb7..f219668bf496 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12084,10 +12084,6 @@ with pkgs;
     sed = gnused;
   };
 
-  petrifoo = callPackage ../applications/audio/petrifoo {
-    inherit (gnome2) libgnomecanvas;
-  };
-
   pdfpc = callPackage ../applications/misc/pdfpc {
     inherit (gst_all_1)
       gstreamer

From 161046a6d03393f7b00e6b215376cedb8bbf99e4 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 16:55:37 -0700
Subject: [PATCH 1495/6226] puredata: move to by-name/

---
 .../audio => by-name/pu}/puredata/expose-error.patch           | 0
 .../puredata/default.nix => by-name/pu/puredata/package.nix}   | 0
 pkgs/{applications/audio => by-name/pu}/puredata/wrapper.nix   | 0
 pkgs/top-level/all-packages.nix                                | 3 +--
 4 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/{applications/audio => by-name/pu}/puredata/expose-error.patch (100%)
 rename pkgs/{applications/audio/puredata/default.nix => by-name/pu/puredata/package.nix} (100%)
 rename pkgs/{applications/audio => by-name/pu}/puredata/wrapper.nix (100%)

diff --git a/pkgs/applications/audio/puredata/expose-error.patch b/pkgs/by-name/pu/puredata/expose-error.patch
similarity index 100%
rename from pkgs/applications/audio/puredata/expose-error.patch
rename to pkgs/by-name/pu/puredata/expose-error.patch
diff --git a/pkgs/applications/audio/puredata/default.nix b/pkgs/by-name/pu/puredata/package.nix
similarity index 100%
rename from pkgs/applications/audio/puredata/default.nix
rename to pkgs/by-name/pu/puredata/package.nix
diff --git a/pkgs/applications/audio/puredata/wrapper.nix b/pkgs/by-name/pu/puredata/wrapper.nix
similarity index 100%
rename from pkgs/applications/audio/puredata/wrapper.nix
rename to pkgs/by-name/pu/puredata/wrapper.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f219668bf496..2431e91887a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12138,9 +12138,8 @@ with pkgs;
 
   pulseview = libsForQt5.callPackage ../applications/science/electronics/pulseview { };
 
-  puredata = callPackage ../applications/audio/puredata { };
   puredata-with-plugins =
-    plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; };
+    plugins: callPackage ../by-name/pu/puredata/wrapper.nix { inherit plugins; };
 
   pure-maps = libsForQt5.callPackage ../applications/misc/pure-maps { };
 

From 343db01d3188f6e0de3c822033fa25c8e7e34696 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 17:37:56 -0700
Subject: [PATCH 1496/6226] ladspa{H,-sdk}: modernize, move to by-name/

---
 .../default.nix => by-name/la/ladspa-sdk/package.nix}  | 10 +++++-----
 .../ladspah.nix => by-name/la/ladspaH/package.nix}     |  6 +++---
 pkgs/top-level/all-packages.nix                        |  4 ----
 3 files changed, 8 insertions(+), 12 deletions(-)
 rename pkgs/{applications/audio/ladspa-sdk/default.nix => by-name/la/ladspa-sdk/package.nix} (82%)
 rename pkgs/{applications/audio/ladspa-sdk/ladspah.nix => by-name/la/ladspaH/package.nix} (84%)

diff --git a/pkgs/applications/audio/ladspa-sdk/default.nix b/pkgs/by-name/la/ladspa-sdk/package.nix
similarity index 82%
rename from pkgs/applications/audio/ladspa-sdk/default.nix
rename to pkgs/by-name/la/ladspa-sdk/package.nix
index 0103db6a7422..6f154ea224d8 100644
--- a/pkgs/applications/audio/ladspa-sdk/default.nix
+++ b/pkgs/by-name/la/ladspa-sdk/package.nix
@@ -4,22 +4,22 @@
   fetchurl,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ladspa-sdk";
   version = "1.15";
   src = fetchurl {
-    url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
+    url = "https://www.ladspa.org/download/ladspa_sdk_${finalAttrs.version}.tgz";
     sha256 = "1vgx54cgsnc3ncl9qbgjbmq12c444xjafjkgr348h36j16draaa2";
   };
 
-  sourceRoot = "ladspa_sdk_${version}/src";
+  sourceRoot = "ladspa_sdk_${finalAttrs.version}/src";
 
   strictDeps = true;
 
   patchPhase = ''
     sed -i 's@/usr/@$(out)/@g'  Makefile
     substituteInPlace Makefile \
-      --replace /tmp/test.wav $NIX_BUILD_TOP/${sourceRoot}/test.wav
+      --replace /tmp/test.wav $NIX_BUILD_TOP/${finalAttrs.sourceRoot}/test.wav
   '';
 
   makeFlags = [
@@ -47,4 +47,4 @@ stdenv.mkDerivation rec {
     maintainers = [ lib.maintainers.magnetophon ];
     platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/applications/audio/ladspa-sdk/ladspah.nix b/pkgs/by-name/la/ladspaH/package.nix
similarity index 84%
rename from pkgs/applications/audio/ladspa-sdk/ladspah.nix
rename to pkgs/by-name/la/ladspaH/package.nix
index fae714eb19ae..7c2515002b1c 100644
--- a/pkgs/applications/audio/ladspa-sdk/ladspah.nix
+++ b/pkgs/by-name/la/ladspaH/package.nix
@@ -3,11 +3,11 @@
   stdenv,
   fetchurl,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ladspa.h";
   version = "1.15";
   src = fetchurl {
-    url = "https://www.ladspa.org/download/ladspa_sdk_${version}.tgz";
+    url = "https://www.ladspa.org/download/ladspa_sdk_${finalAttrs.version}.tgz";
     sha256 = "1vgx54cgsnc3ncl9qbgjbmq12c444xjafjkgr348h36j16draaa2";
   };
 
@@ -27,4 +27,4 @@ stdenv.mkDerivation rec {
     maintainers = [ lib.maintainers.magnetophon ];
     platforms = lib.platforms.all;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2431e91887a0..45b2ee319010 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11647,14 +11647,10 @@ with pkgs;
 
   kvirc = libsForQt5.callPackage ../applications/networking/irc/kvirc { };
 
-  ladspaH = callPackage ../applications/audio/ladspa-sdk/ladspah.nix { };
-
   ladspaPlugins = callPackage ../applications/audio/ladspa-plugins {
     fftw = fftwSinglePrec;
   };
 
-  ladspa-sdk = callPackage ../applications/audio/ladspa-sdk { };
-
   lemonbar = callPackage ../applications/window-managers/lemonbar { };
 
   lemonbar-xft = callPackage ../applications/window-managers/lemonbar/xft.nix { };

From 5376c4415b7bc074deee332dc921160f73b8be72 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 17:57:44 -0700
Subject: [PATCH 1497/6226] espeak-ng: move to by-name/

---
 pkgs/{applications/audio => by-name/es}/espeak-ng/mbrola.patch | 0
 .../espeak-ng/default.nix => by-name/es/espeak-ng/package.nix} | 0
 pkgs/top-level/all-packages.nix                                | 3 +--
 3 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/{applications/audio => by-name/es}/espeak-ng/mbrola.patch (100%)
 rename pkgs/{applications/audio/espeak-ng/default.nix => by-name/es/espeak-ng/package.nix} (100%)

diff --git a/pkgs/applications/audio/espeak-ng/mbrola.patch b/pkgs/by-name/es/espeak-ng/mbrola.patch
similarity index 100%
rename from pkgs/applications/audio/espeak-ng/mbrola.patch
rename to pkgs/by-name/es/espeak-ng/mbrola.patch
diff --git a/pkgs/applications/audio/espeak-ng/default.nix b/pkgs/by-name/es/espeak-ng/package.nix
similarity index 100%
rename from pkgs/applications/audio/espeak-ng/default.nix
rename to pkgs/by-name/es/espeak-ng/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45b2ee319010..681e5213b1fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10997,8 +10997,7 @@ with pkgs;
 
   espeak-classic = callPackage ../applications/audio/espeak { };
 
-  espeak-ng = callPackage ../applications/audio/espeak-ng { };
-  espeak = res.espeak-ng;
+  espeak = espeak-ng;
 
   espeakedit = callPackage ../applications/audio/espeak/edit.nix { };
 

From f4be23dfcc236585a1ee1b8824a81042c7aa9047 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 18:21:15 -0700
Subject: [PATCH 1498/6226] pithos: move to by-name/

---
 .../default.nix => by-name/pi/pithos/package.nix}    | 12 ++++++------
 pkgs/top-level/all-packages.nix                      |  4 ----
 2 files changed, 6 insertions(+), 10 deletions(-)
 rename pkgs/{applications/audio/pithos/default.nix => by-name/pi/pithos/package.nix} (85%)

diff --git a/pkgs/applications/audio/pithos/default.nix b/pkgs/by-name/pi/pithos/package.nix
similarity index 85%
rename from pkgs/applications/audio/pithos/default.nix
rename to pkgs/by-name/pi/pithos/package.nix
index 1cf887ab07cd..e293b5b28ed0 100644
--- a/pkgs/applications/audio/pithos/default.nix
+++ b/pkgs/by-name/pi/pithos/package.nix
@@ -8,7 +8,7 @@
   appstream-glib,
   glib,
   wrapGAppsHook3,
-  pythonPackages,
+  python3Packages,
   gtk3,
   adwaita-icon-theme,
   gobject-introspection,
@@ -17,7 +17,7 @@
   gst_all_1,
 }:
 
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "pithos";
   version = "1.6.2";
 
@@ -61,17 +61,17 @@ pythonPackages.buildPythonApplication rec {
   propagatedBuildInputs = [
     adwaita-icon-theme
   ]
-  ++ (with pythonPackages; [
+  ++ (with python3Packages; [
     pygobject3
     pylast
   ]);
 
-  meta = with lib; {
+  meta = {
     broken = stdenv.hostPlatform.isDarwin;
     description = "Pandora Internet Radio player for GNOME";
     mainProgram = "pithos";
     homepage = "https://pithos.github.io/";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ obadz ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ obadz ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 681e5213b1fc..c253431db594 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12100,10 +12100,6 @@ with pkgs;
 
   inherit (pidginPackages) pidgin;
 
-  pithos = callPackage ../applications/audio/pithos {
-    pythonPackages = python3Packages;
-  };
-
   pineapple-pictures = qt6Packages.callPackage ../applications/graphics/pineapple-pictures { };
 
   plex-mpv-shim = python3Packages.callPackage ../applications/video/plex-mpv-shim { };

From 138eb86862f4adbc1fbae1b07b15a8f140338e6b Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Wed, 22 Oct 2025 01:33:53 +0100
Subject: [PATCH 1499/6226] =?UTF-8?q?nexusmods-app:=200.18.2=20=E2=86=92?=
 =?UTF-8?q?=200.19.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.19.4

Backports a critical SMAPI fix:
https://github.com/Nexus-Mods/NexusMods.App/pull/4026
---
 pkgs/by-name/ne/nexusmods-app/deps.json       | 81 +++++--------------
 pkgs/by-name/ne/nexusmods-app/package.nix     | 18 ++++-
 .../ne/nexusmods-app/vendored/games.json      | 38 ++++-----
 3 files changed, 53 insertions(+), 84 deletions(-)

diff --git a/pkgs/by-name/ne/nexusmods-app/deps.json b/pkgs/by-name/ne/nexusmods-app/deps.json
index 8a7000283848..07856e2cbb8f 100644
--- a/pkgs/by-name/ne/nexusmods-app/deps.json
+++ b/pkgs/by-name/ne/nexusmods-app/deps.json
@@ -1926,23 +1926,23 @@
   },
   {
     "pname": "NexusMods.HyperDuck",
-    "version": "0.28.0",
-    "hash": "sha256-vJW/9DbnSIzxH6CR1CzMru0w/BA7HwxuJ0TiKt6NgcQ="
+    "version": "0.28.2",
+    "hash": "sha256-VErxX62rvY5MA9LGyBcKi1BCgtgzOo4rgWTRczFNrVY="
   },
   {
     "pname": "NexusMods.MnemonicDB",
-    "version": "0.28.0",
-    "hash": "sha256-AzSzn2mdp4sx1ntOfm03kWlfo/mxxURcEMmChxSyEAI="
+    "version": "0.28.2",
+    "hash": "sha256-l6b1r0swnRfqAIk7WvdQv0VaekFRXENhZqEL9ut4AT0="
   },
   {
     "pname": "NexusMods.MnemonicDB.Abstractions",
-    "version": "0.28.0",
-    "hash": "sha256-c6hEojlKk8B//lpEyxrYBy/QlpixzDE4LJq+sk4XZDY="
+    "version": "0.28.2",
+    "hash": "sha256-HJsnz1nQeUG4iln+WDkR3SMEalYM47Z8vdYZf8V+RIU="
   },
   {
     "pname": "NexusMods.MnemonicDB.SourceGenerator",
-    "version": "0.28.0",
-    "hash": "sha256-o888EyOAzDypNzhZTtW8BZp0Ew/fOUsho6IeBbGlmNM="
+    "version": "0.28.2",
+    "hash": "sha256-vmOO/qImh5RrWC3U11D5A4Gd2SvOJvuoDID+b5fI+cA="
   },
   {
     "pname": "NexusMods.Paths",
@@ -1969,51 +1969,6 @@
     "version": "0.20.0",
     "hash": "sha256-k+1dgCZEuEO8xVfdwGKec+FgE//FX1xqIyiyPGYypF0="
   },
-  {
-    "pname": "Nito.AsyncEx",
-    "version": "5.1.2",
-    "hash": "sha256-9o4YLWAHSeApF4E/qNFyaZPh/V9N5JSeF32uquukb5I="
-  },
-  {
-    "pname": "Nito.AsyncEx.Context",
-    "version": "5.1.2",
-    "hash": "sha256-7BCVYJgZyU2/Z4r8CKajorlzajr6GBUBAbY3AcswPC0="
-  },
-  {
-    "pname": "Nito.AsyncEx.Coordination",
-    "version": "5.1.2",
-    "hash": "sha256-NHMnIBkGzzuoZL0qHKAwFC35doB08IDvmCQptC2uu2s="
-  },
-  {
-    "pname": "Nito.AsyncEx.Interop.WaitHandles",
-    "version": "5.1.2",
-    "hash": "sha256-1DgBWnkYggWQk0w2g7Y24Ogl7TJ7bQkc/0NIUFJzN00="
-  },
-  {
-    "pname": "Nito.AsyncEx.Oop",
-    "version": "5.1.2",
-    "hash": "sha256-1hnCagbt6SLbn+RpasWdBH3pLvqm8kC2Ut2iG75OUMM="
-  },
-  {
-    "pname": "Nito.AsyncEx.Tasks",
-    "version": "5.1.2",
-    "hash": "sha256-W5jxZZ0pbPHte6TkWTq4FDtHOejvlrdyb1Inw+Yhl4c="
-  },
-  {
-    "pname": "Nito.Cancellation",
-    "version": "1.1.2",
-    "hash": "sha256-oZKZUymYJiM2AfMpX4pX0FIlut0lEWdy250iVX0w+is="
-  },
-  {
-    "pname": "Nito.Collections.Deque",
-    "version": "1.1.1",
-    "hash": "sha256-6Pmz6XQ+rY32O21Z3cUDVQsLH+i53LId18UCPTAxRZQ="
-  },
-  {
-    "pname": "Nito.Disposables",
-    "version": "2.2.1",
-    "hash": "sha256-FKDLUWysqroSHLU2kLjK1m0g417AAPh6n2TIkwiapcM="
-  },
   {
     "pname": "NLog",
     "version": "6.0.3",
@@ -2689,11 +2644,6 @@
     "version": "4.3.0",
     "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
   },
-  {
-    "pname": "System.Collections.Immutable",
-    "version": "1.7.1",
-    "hash": "sha256-WMMAUqoxT3J1gW9DI8v31VAuhwqTc4Posose5jq1BNo="
-  },
   {
     "pname": "System.Collections.Immutable",
     "version": "5.0.0",
@@ -3069,6 +3019,11 @@
     "version": "5.0.0",
     "hash": "sha256-M5Z8pw8rVb8ilbnTdaOptzk5VFd5DlKa7zzCpuytTtE="
   },
+  {
+    "pname": "System.Reactive",
+    "version": "6.0.0",
+    "hash": "sha256-hXB18OsiUHSCmRF3unAfdUEcbXVbG6/nZxcyz13oe9Y="
+  },
   {
     "pname": "System.Reactive",
     "version": "6.0.1",
@@ -3194,11 +3149,6 @@
     "version": "4.3.0",
     "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
   },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "4.4.0",
-    "hash": "sha256-SeTI4+yVRO2SmAKgOrMni4070OD+Oo8L1YiEVeKDyig="
-  },
   {
     "pname": "System.Runtime.CompilerServices.Unsafe",
     "version": "4.5.3",
@@ -3564,6 +3514,11 @@
     "version": "2.5.0",
     "hash": "sha256-i9TpQJ2+JhSQ7RXkdmC6pkND32V4cLyEaPLGrD/EpYk="
   },
+  {
+    "pname": "Verify.TUnit",
+    "version": "30.11.0",
+    "hash": "sha256-xuP2oetSNIBhCzt7go3S2Icy8wy3pBseq4XcEMMrDV8="
+  },
   {
     "pname": "Verify.Xunit",
     "version": "30.11.0",
diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 5bcea550ddf8..29bd3c391a52 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -5,6 +5,7 @@
   desktop-file-utils,
   dotnetCorePackages,
   fetchFromGitHub,
+  fetchpatch2,
   imagemagick,
   lib,
   xdg-utils,
@@ -22,13 +23,13 @@ let
 in
 buildDotnetModule (finalAttrs: {
   inherit pname;
-  version = "0.18.2";
+  version = "0.19.4";
 
   src = fetchFromGitHub {
     owner = "Nexus-Mods";
     repo = "NexusMods.App";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+ayYRNclxbBedH6gIWTh5wI/AIvMzSq4x5fQXzxOT5c=";
+    hash = "sha256-WKfv5y6UmO3dmzkXrqZ+VtIbXf0FszRdsa5Rmp95rYg=";
     fetchSubmodules = true;
   };
 
@@ -56,10 +57,23 @@ buildDotnetModule (finalAttrs: {
   dotnet-sdk = dotnetCorePackages.sdk_9_0;
   dotnet-runtime = dotnetCorePackages.runtime_9_0;
 
+  patches = [
+    (fetchpatch2 {
+      name = "Fix-SMAPI-installation.patch";
+      url = "https://github.com/Nexus-Mods/NexusMods.App/pull/4026.patch?full_index=1";
+      hash = "sha256-1LgFTi63fVhGUZXZtS6iD2yqd0RxhdpiXKtWMFNEoD4=";
+    })
+  ];
+
   postPatch = ''
     # for some reason these tests fail (intermittently?) with a zero timestamp
     touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png
 
+    # Fix expected version number in text fixture
+    # https://github.com/Nexus-Mods/NexusMods.App/issues/4030
+    substituteInPlace tests/NexusMods.Backend.Tests/EventTrackerTests.Test_PrepareRequest.verified.txt \
+      --replace-fail 0.0.1 ${finalAttrs.version}
+
     # Specify a fixed date to improve build reproducibility
     echo "1970-01-01T00:00:00Z" >buildDate.txt
     substituteInPlace src/NexusMods.Sdk/NexusMods.Sdk.csproj \
diff --git a/pkgs/by-name/ne/nexusmods-app/vendored/games.json b/pkgs/by-name/ne/nexusmods-app/vendored/games.json
index 1ee7cae625b9..478145604579 100644
--- a/pkgs/by-name/ne/nexusmods-app/vendored/games.json
+++ b/pkgs/by-name/ne/nexusmods-app/vendored/games.json
@@ -6,12 +6,12 @@
     "forum_url": "https://forums.nexusmods.com/games/19-stardew-valley/",
     "nexusmods_url": "https://www.nexusmods.com/stardewvalley",
     "genre": "Simulation",
-    "file_count": 141993,
-    "downloads": 619854329,
+    "file_count": 143212,
+    "downloads": 627187655,
     "domain_name": "stardewvalley",
     "approved_date": 1457432329,
-    "mods": 25658,
-    "collections": 2049
+    "mods": 25945,
+    "collections": 2020
   },
   {
     "id": 1704,
@@ -20,12 +20,12 @@
     "forum_url": "https://forums.nexusmods.com/games/6-skyrim/",
     "nexusmods_url": "https://www.nexusmods.com/skyrimspecialedition",
     "genre": "RPG",
-    "file_count": 656636,
-    "downloads": 9072303822,
+    "file_count": 661698,
+    "downloads": 9193533035,
     "domain_name": "skyrimspecialedition",
     "approved_date": 1477480498,
-    "mods": 117768,
-    "collections": 4872
+    "mods": 118807,
+    "collections": 4852
   },
   {
     "id": 3174,
@@ -34,11 +34,11 @@
     "forum_url": "https://forums.nexusmods.com/games/9-mount-blade-ii-bannerlord/",
     "nexusmods_url": "https://www.nexusmods.com/mountandblade2bannerlord",
     "genre": "Strategy",
-    "file_count": 50300,
-    "downloads": 115343239,
+    "file_count": 50603,
+    "downloads": 116400189,
     "domain_name": "mountandblade2bannerlord",
     "approved_date": 1582898627,
-    "mods": 6294,
+    "mods": 6341,
     "collections": 293
   },
   {
@@ -48,12 +48,12 @@
     "forum_url": "https://forums.nexusmods.com/games/1-cyberpunk-2077/",
     "nexusmods_url": "https://www.nexusmods.com/cyberpunk2077",
     "genre": "Action",
-    "file_count": 123906,
-    "downloads": 908587568,
+    "file_count": 125224,
+    "downloads": 930909718,
     "domain_name": "cyberpunk2077",
     "approved_date": 1607433331,
-    "mods": 17809,
-    "collections": 1602
+    "mods": 18032,
+    "collections": 1588
   },
   {
     "id": 3474,
@@ -62,11 +62,11 @@
     "forum_url": "https://forums.nexusmods.com/games/2-baldurs-gate-3/",
     "nexusmods_url": "https://www.nexusmods.com/baldursgate3",
     "genre": "RPG",
-    "file_count": 104549,
-    "downloads": 345662936,
+    "file_count": 105632,
+    "downloads": 351591575,
     "domain_name": "baldursgate3",
     "approved_date": 1602863114,
-    "mods": 14843,
-    "collections": 1805
+    "mods": 15020,
+    "collections": 1752
   }
 ]

From 40c8149187de143a4718f1a9215b71b2a8d0805b Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Wed, 22 Oct 2025 00:49:40 +0100
Subject: [PATCH 1500/6226] nexusmods-app: predicate test patches on `doCheck`

Only bother with the test patches when `finalAttrs.doCheck` is true.
---
 pkgs/by-name/ne/nexusmods-app/package.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 29bd3c391a52..5b993929fc93 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -66,14 +66,6 @@ buildDotnetModule (finalAttrs: {
   ];
 
   postPatch = ''
-    # for some reason these tests fail (intermittently?) with a zero timestamp
-    touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png
-
-    # Fix expected version number in text fixture
-    # https://github.com/Nexus-Mods/NexusMods.App/issues/4030
-    substituteInPlace tests/NexusMods.Backend.Tests/EventTrackerTests.Test_PrepareRequest.verified.txt \
-      --replace-fail 0.0.1 ${finalAttrs.version}
-
     # Specify a fixed date to improve build reproducibility
     echo "1970-01-01T00:00:00Z" >buildDate.txt
     substituteInPlace src/NexusMods.Sdk/NexusMods.Sdk.csproj \
@@ -86,6 +78,16 @@ buildDotnetModule (finalAttrs: {
     # Use a vendored version of the nexus API's games.json data
     substituteInPlace src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj \
       --replace-fail '$(BaseIntermediateOutputPath)games.json' ${./vendored/games.json}
+
+    ${lib.optionalString finalAttrs.doCheck ''
+      # For some reason these tests fail (intermittently?) with a zero timestamp
+      touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png
+
+      # Fix expected version number in text fixture
+      # https://github.com/Nexus-Mods/NexusMods.App/issues/4030
+      substituteInPlace tests/NexusMods.Backend.Tests/EventTrackerTests.Test_PrepareRequest.verified.txt \
+        --replace-fail 0.0.1 ${finalAttrs.version}
+    ''}
   '';
 
   makeWrapperArgs = [

From 153be6ef09d94cfbea09d3ed3d5a3cb313e6bf24 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 20:15:51 -0700
Subject: [PATCH 1501/6226] linvstmanager: move to by-name/

---
 .../li/linvstmanager/package.nix}             | 21 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 10 insertions(+), 13 deletions(-)
 rename pkgs/{applications/audio/linvstmanager/default.nix => by-name/li/linvstmanager/package.nix} (71%)

diff --git a/pkgs/applications/audio/linvstmanager/default.nix b/pkgs/by-name/li/linvstmanager/package.nix
similarity index 71%
rename from pkgs/applications/audio/linvstmanager/default.nix
rename to pkgs/by-name/li/linvstmanager/package.nix
index 6da4c7fcc626..5358d1d975d7 100644
--- a/pkgs/applications/audio/linvstmanager/default.nix
+++ b/pkgs/by-name/li/linvstmanager/package.nix
@@ -3,28 +3,27 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  qtbase,
-  wrapQtAppsHook,
+  qt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "linvstmanager";
   version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "Goli4thus";
     repo = "linvstmanager";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-K6eugimMy/MZgHYkg+zfF8DDqUuqqoeymxHtcFGu2Uk=";
   };
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt5.qtbase
   ];
 
   postPatch = ''
@@ -32,12 +31,12 @@ stdenv.mkDerivation rec {
       --replace-fail "cmake_minimum_required(VERSION 3.0.0)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Graphical companion application for various bridges like LinVst, etc";
     mainProgram = "linvstmanager";
     homepage = "https://github.com/Goli4thus/linvstmanager";
-    license = with licenses; [ gpl3 ];
-    platforms = platforms.linux;
-    maintainers = [ maintainers.GabrielDougherty ];
+    license = with lib.licenses; [ gpl3 ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ GabrielDougherty ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c253431db594..38daf75b0be8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11271,8 +11271,6 @@ with pkgs;
 
   linssid = libsForQt5.callPackage ../applications/networking/linssid { };
 
-  linvstmanager = qt5.callPackage ../applications/audio/linvstmanager { };
-
   deadd-notification-center = haskell.lib.compose.justStaticExecutables (
     haskellPackages.callPackage ../applications/misc/deadd-notification-center { }
   );

From b420ad063c7dd7781c1baa593b69160626c20c3a Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Tue, 21 Oct 2025 20:16:33 -0700
Subject: [PATCH 1502/6226] nootka: move to by-name/

---
 .../no/nootka/package.nix}                    | 35 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 15 insertions(+), 22 deletions(-)
 rename pkgs/{applications/audio/nootka/default.nix => by-name/no/nootka/package.nix} (59%)

diff --git a/pkgs/applications/audio/nootka/default.nix b/pkgs/by-name/no/nootka/package.nix
similarity index 59%
rename from pkgs/applications/audio/nootka/default.nix
rename to pkgs/by-name/no/nootka/package.nix
index 88a5ed0c4301..7640384181eb 100644
--- a/pkgs/applications/audio/nootka/default.nix
+++ b/pkgs/by-name/no/nootka/package.nix
@@ -9,26 +9,21 @@
   libpulseaudio,
   libvorbis,
   soundtouch,
-  qtbase,
-  qtdeclarative,
-  qtgraphicaleffects,
-  qtquickcontrols2,
-  qttools,
-  wrapQtAppsHook,
+  qt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "nootka";
   version = "2.0.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/nootka/${pname}-${version}-source.tar.bz2";
-    sha256 = "sha256-ZHdyLZ3+TCpQ77tcNuDlN2124qLDZu9DdH5x7RI1HIs=";
+    url = "mirror://sourceforge/nootka/nootka-${finalAttrs.version}-source.tar.bz2";
+    hash = "sha256-ZHdyLZ3+TCpQ77tcNuDlN2124qLDZu9DdH5x7RI1HIs=";
   };
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
   ];
   buildInputs = [
     alsa-lib
@@ -37,11 +32,11 @@ stdenv.mkDerivation rec {
     libpulseaudio
     libvorbis
     soundtouch
-    qtbase
-    qtdeclarative
-    qtgraphicaleffects
-    qtquickcontrols2
-    qttools
+    qt5.qtbase
+    qt5.qtdeclarative
+    qt5.qtgraphicaleffects
+    qt5.qtquickcontrols2
+    qt5.qttools
   ];
 
   cmakeFlags = [
@@ -50,15 +45,15 @@ stdenv.mkDerivation rec {
     "-DENABLE_PULSEAUDIO=ON"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Application for practicing playing musical scores and ear training";
     mainProgram = "nootka";
     homepage = "https://nootka.sourceforge.io/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
       mmlb
       orivej
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 38daf75b0be8..845b384b32a4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11904,8 +11904,6 @@ with pkgs;
 
   ninja_1_11 = callPackage ../by-name/ni/ninja/package.nix { ninjaRelease = "1.11"; };
 
-  nootka = qt5.callPackage ../applications/audio/nootka { };
-
   opcua-client-gui = libsForQt5.callPackage ../misc/opcua-client-gui { };
 
   ostinato = libsForQt5.callPackage ../applications/networking/ostinato {

From b87416ff95465c54ee87f977e2b48deb5d26b67a Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 21 Oct 2025 15:45:01 -0700
Subject: [PATCH 1503/6226] python3Packages.aiolifx: allow click 8.2.x

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

diff --git a/pkgs/development/python-modules/aiolifx/default.nix b/pkgs/development/python-modules/aiolifx/default.nix
index d1cc221a239e..d1525f12f6a1 100644
--- a/pkgs/development/python-modules/aiolifx/default.nix
+++ b/pkgs/development/python-modules/aiolifx/default.nix
@@ -24,6 +24,8 @@ buildPythonPackage rec {
 
   build-system = [ setuptools ];
 
+  pythonRelaxDeps = [ "click" ];
+
   dependencies = [
     async-timeout
     bitstring

From b3bf773364373b88fba01f5c12cf31fff018ac5a Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 21 Oct 2025 11:48:58 -0700
Subject: [PATCH 1504/6226] seagoat: disable broken tests under click 8.2.x

---
 pkgs/by-name/se/seagoat/failing_tests.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/se/seagoat/failing_tests.nix b/pkgs/by-name/se/seagoat/failing_tests.nix
index 75ed4e5bbab4..b347b63fcad5 100644
--- a/pkgs/by-name/se/seagoat/failing_tests.nix
+++ b/pkgs/by-name/se/seagoat/failing_tests.nix
@@ -51,4 +51,14 @@
   "test_file_change_many_times_is_first_result"
   "test_newer_change_can_beat_frequent_change_in_past"
   "test_commit_messages_with_three_or_more_colons"
+
+  # Compatibility issue with click 8.2
+  # https://github.com/kantord/SeaGOAT/issues/1021
+  "test_seagoat_warns_on_incomplete_accuracy[99]"
+  "test_seagoat_warns_on_incomplete_accuracy[100]"
+  "test_server_error_handling[File Not Found on Server-500]"
+  "test_server_error_handling[Database Connection Failed-503]"
+  "test_server_does_not_exist_error"
+  "test_no_network_to_update"
+  "test_server_shows_error_when_folder_is_not_a_git_repo"
 ]

From 01bc8ac5b9e4000a7aeea26e731330c896280bc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Oct 2025 20:33:37 -0700
Subject: [PATCH 1505/6226] python3Packages.python-jose: fix
 test_incorrect_public_key_hmac_signing

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

diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix
index 470337705c89..13e7257d63b3 100644
--- a/pkgs/development/python-modules/python-jose/default.nix
+++ b/pkgs/development/python-modules/python-jose/default.nix
@@ -4,6 +4,7 @@
   cryptography,
   ecdsa,
   fetchFromGitHub,
+  fetchpatch,
   pyasn1,
   pycrypto,
   pycryptodome,
@@ -24,6 +25,15 @@ buildPythonPackage rec {
     hash = "sha256-8DQ0RBQ4ZgEIwcosgX3dzr928cYIQoH0obIOgk0+Ozs=";
   };
 
+  patches = [
+    # https://github.com/mpdavis/python-jose/pull/393
+    (fetchpatch {
+      name = "fix-test_incorrect_public_key_hmac_signing.patch";
+      url = "https://github.com/mpdavis/python-jose/commit/7c0e4c6640bdc9cd60ac66d96d5d90f4377873db.patch";
+      hash = "sha256-bCzxZEWKYD20TLqzVv6neZlpU41otbVqaXc7C0Ky9BQ=";
+    })
+  ];
+
   pythonRelaxDeps = [
     # https://github.com/mpdavis/python-jose/pull/376
     "pyasn1"

From f88a462a447841201f7b7639112263fdce3d3ee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Oct 2025 13:53:44 -0700
Subject: [PATCH 1506/6226] python3Packages.ecdsa: mark insecure

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

diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix
index 11fb0ac08cc4..62524edf4f01 100644
--- a/pkgs/development/python-modules/ecdsa/default.nix
+++ b/pkgs/development/python-modules/ecdsa/default.nix
@@ -24,5 +24,12 @@ buildPythonPackage rec {
     description = "ECDSA cryptographic signature library";
     homepage = "https://github.com/warner/python-ecdsa";
     license = licenses.mit;
+    knownVulnerabilities = [
+      # "I don't want people to use this library in production environments.
+      # It's a teaching tool, it's a testing tool, it's absolutely not an
+      # production grade implementation."
+      # https://github.com/tlsfuzzer/python-ecdsa/issues/330
+      "CVE-2024-23342"
+    ];
   };
 }

From a33f37292c71051f683283af27a35c891d7aafa1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Oct 2025 14:05:39 -0700
Subject: [PATCH 1507/6226] python3Packages.scapy: use optional-dependencies

Packages like graphviz, imagemagick, and texliveBasic don't belong in
propagatedBuildInputs. If needed, the path to their executables should
be hardcoded using a patch instead.
---
 .../python-modules/scapy/default.nix          | 35 +++++--------------
 1 file changed, 9 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/python-modules/scapy/default.nix b/pkgs/development/python-modules/scapy/default.nix
index 5c457b80a29c..e554dd9df25a 100644
--- a/pkgs/development/python-modules/scapy/default.nix
+++ b/pkgs/development/python-modules/scapy/default.nix
@@ -4,25 +4,15 @@
   stdenv,
   lib,
   isPyPy,
-  pycrypto,
-  ecdsa, # TODO
   mock,
   python-can,
   brotli,
-  withOptionalDeps ? true,
-  tcpdump,
   ipython,
-  withCryptography ? true,
   cryptography,
   withVoipSupport ? true,
   sox,
-  withPlottingSupport ? true,
   matplotlib,
-  withGraphicsSupport ? false,
   pyx,
-  texliveBasic,
-  graphviz,
-  imagemagick,
   withManufDb ? false,
   wireshark,
   libpcap,
@@ -63,22 +53,15 @@ buildPythonPackage rec {
 
   buildInputs = lib.optional withVoipSupport sox;
 
-  propagatedBuildInputs = [
-    pycrypto
-    ecdsa
-  ]
-  ++ lib.optionals withOptionalDeps [
-    tcpdump
-    ipython
-  ]
-  ++ lib.optional withCryptography cryptography
-  ++ lib.optional withPlottingSupport matplotlib
-  ++ lib.optionals withGraphicsSupport [
-    pyx
-    texliveBasic
-    graphviz
-    imagemagick
-  ];
+  optional-dependencies = {
+    all = [
+      cryptography
+      ipython
+      matplotlib
+      pyx
+    ];
+    cli = [ ipython ];
+  };
 
   # Running the tests seems too complicated:
   doCheck = false;

From b16459bfd1df53ddf26d22fe4fd07ea52ac7a5c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Oct 2025 14:52:08 -0700
Subject: [PATCH 1508/6226] duplicity: clean up dependencies

---
 pkgs/by-name/du/duplicity/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/du/duplicity/package.nix b/pkgs/by-name/du/duplicity/package.nix
index 161efe0f35ee..42907aa7d1a4 100644
--- a/pkgs/by-name/du/duplicity/package.nix
+++ b/pkgs/by-name/du/duplicity/package.nix
@@ -80,16 +80,10 @@ let
       [
         b2sdk
         boto3
-        cffi
-        cryptography
-        ecdsa
         idna
         pygobject3
         fasteners
-        lockfile
         paramiko
-        pyasn1
-        pycrypto
         # Currently marked as broken.
         # pydrive2
       ]

From 0fc3a2dc01a4508ae311d706d1db5b0226ac74d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Oct 2025 15:10:48 -0700
Subject: [PATCH 1509/6226] python3Packages.plugp100: update dependencies

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

diff --git a/pkgs/development/python-modules/plugp100/default.nix b/pkgs/development/python-modules/plugp100/default.nix
index de9c7beb41cc..9e139df6a276 100644
--- a/pkgs/development/python-modules/plugp100/default.nix
+++ b/pkgs/development/python-modules/plugp100/default.nix
@@ -9,11 +9,10 @@
   aiohttp,
   jsons,
   requests,
+  cryptography,
   # Test inputs
   pytestCheckHook,
-  pyyaml,
   pytest-asyncio,
-  async-timeout,
 }:
 
 buildPythonPackage rec {
@@ -34,15 +33,14 @@ buildPythonPackage rec {
     requests
     aiohttp
     semantic-version
+    cryptography
     scapy
     urllib3
-    pyyaml
   ];
 
   nativeCheckInputs = [
     pytestCheckHook
     pytest-asyncio
-    async-timeout
   ];
 
   disabledTestPaths = [

From a11c6cd1e903beffd655532a5d8364dff6bfe6f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Oct 2025 15:12:41 -0700
Subject: [PATCH 1510/6226] killerbee: depends on pycrypto

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

diff --git a/pkgs/by-name/ki/killerbee/package.nix b/pkgs/by-name/ki/killerbee/package.nix
index 51a03e71f0b3..3efd7d527be2 100644
--- a/pkgs/by-name/ki/killerbee/package.nix
+++ b/pkgs/by-name/ki/killerbee/package.nix
@@ -22,6 +22,7 @@ python3.pkgs.buildPythonApplication rec {
   buildInputs = [ libgcrypt ];
 
   dependencies = with python3.pkgs; [
+    pycrypto
     pyserial
     pyusb
     rangeparser

From b4587b019bf3d0ecbf5e30adafb11577bd8dd795 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Oct 2025 16:51:20 -0700
Subject: [PATCH 1511/6226] python3Packages.okta: clean up dependencies

---
 pkgs/development/python-modules/okta/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/python-modules/okta/default.nix b/pkgs/development/python-modules/okta/default.nix
index 4bbf77f2c4a0..c5a59b064598 100644
--- a/pkgs/development/python-modules/okta/default.nix
+++ b/pkgs/development/python-modules/okta/default.nix
@@ -6,7 +6,6 @@
   fetchPypi,
   flatdict,
   jwcrypto,
-  pycryptodome,
   pycryptodomex,
   pydash,
   pyfakefs,
@@ -15,7 +14,6 @@
   pytest-mock,
   pytest-recording,
   pytestCheckHook,
-  python-jose,
   pythonOlder,
   pyyaml,
   setuptools,
@@ -42,11 +40,9 @@ buildPythonPackage rec {
     aiohttp
     flatdict
     jwcrypto
-    pycryptodome
     pycryptodomex
     pydash
     pyjwt
-    python-jose
     pyyaml
     xmltodict
     yarl

From da764037f9fb282020a3d5a67427244ce30f5632 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Oct 2025 16:59:38 -0700
Subject: [PATCH 1512/6226] python3Packages.sshpubkeys: modernize

---
 .../python-modules/sshpubkeys/default.nix     | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/sshpubkeys/default.nix b/pkgs/development/python-modules/sshpubkeys/default.nix
index 0f2fc24474a1..28480e772d2f 100644
--- a/pkgs/development/python-modules/sshpubkeys/default.nix
+++ b/pkgs/development/python-modules/sshpubkeys/default.nix
@@ -2,31 +2,36 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  setuptools,
   cryptography,
-  ecdsa,
 }:
 
 buildPythonPackage rec {
   version = "3.3.1";
-  format = "setuptools";
   pname = "sshpubkeys";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ojarva";
-    repo = "python-${pname}";
-    rev = version;
-    sha256 = "1qsixmqg97kyvg1naw76blq4314vaw4hl5f9wi0v111mcmdia1r4";
+    repo = "python-sshpubkeys";
+    # https://github.com/ojarva/python-sshpubkeys/issues/94
+    tag = "v3.2.0";
+    hash = "sha256-2OJatnQuCt9XQ797F5nEmgEZl5/tu9lrAry5yBGW61g=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     cryptography
-    ecdsa
   ];
 
-  meta = with lib; {
+  pythonImportsCheck = [ "sshpubkeys" ];
+
+  meta = {
+    changelog = "https://github.com/ojarva/python-sshpubkeys/releases/tag/${src.tag}";
     description = "OpenSSH Public Key Parser for Python";
     homepage = "https://github.com/ojarva/python-sshpubkeys";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     maintainers = [ ];
   };
 }

From b7f314ae80b8061d12c9c906971427f910b7a922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Oct 2025 17:45:44 -0700
Subject: [PATCH 1513/6226] python3Packages.ecdsa: modernize

---
 .../python-modules/ecdsa/default.nix          | 41 ++++++++++++++-----
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix
index 62524edf4f01..8950bd0d9b71 100644
--- a/pkgs/development/python-modules/ecdsa/default.nix
+++ b/pkgs/development/python-modules/ecdsa/default.nix
@@ -1,29 +1,48 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
-  pkgs,
+  fetchFromGitHub,
+  gitUpdater,
+  hypothesis,
+  openssl,
+  pytestCheckHook,
+  setuptools,
   six,
 }:
 
 buildPythonPackage rec {
   pname = "ecdsa";
   version = "0.19.1";
-  format = "setuptools";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-R4y6e2JVWGb8s7s/6YXgbey9to71VxPE5auYxX1QjmE=";
+  src = fetchFromGitHub {
+    owner = "tlsfuzzer";
+    repo = "python-ecdsa";
+    tag = "python-ecdsa-${version}";
+    hash = "sha256-PjOjHQziQ9ohXH82Ocaowj/AtsXHMHDhatFPQNccyC8=";
   };
 
-  propagatedBuildInputs = [ six ];
-  # Only needed for tests
-  nativeCheckInputs = [ pkgs.openssl ];
+  build-system = [ setuptools ];
 
-  meta = with lib; {
+  dependencies = [ six ];
+
+  pythonImportsCheck = [ "ecdsa" ];
+
+  nativeCheckInputs = [
+    hypothesis
+    openssl # Only needed for tests
+    pytestCheckHook
+  ];
+
+  passthru.updateScript = gitUpdater {
+    rev-prefix = "python-ecdsa-";
+  };
+
+  meta = {
+    changelog = "https://github.com/tlsfuzzer/python-ecdsa/blob/${src.tag}/NEWS";
     description = "ECDSA cryptographic signature library";
     homepage = "https://github.com/warner/python-ecdsa";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     knownVulnerabilities = [
       # "I don't want people to use this library in production environments.
       # It's a teaching tool, it's a testing tool, it's absolutely not an

From 28c04716384349d9bf71fe4eeaeb5c6606fde551 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Oct 2025 17:27:09 -0700
Subject: [PATCH 1514/6226] python3Packages.home-assistant-chip-core: don't
 import ecdsa

Its only import outside of tests is in
`connectedhomeip/src/controller/python/chip/crypto/p256keypair.py` where
it is used in the `TestP256Keypair` class which is only used in tests.
---
 .../home-assistant-chip-core/default.nix      |  7 +--
 .../home-assistant-chip-wheels/default.nix    |  3 ++
 .../dont-import-ecdsa.patch                   | 44 +++++++++++++++++++
 3 files changed, 48 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/python-modules/home-assistant-chip-wheels/dont-import-ecdsa.patch

diff --git a/pkgs/development/python-modules/home-assistant-chip-core/default.nix b/pkgs/development/python-modules/home-assistant-chip-core/default.nix
index ce3dd7cba288..fbbc011d0b6a 100644
--- a/pkgs/development/python-modules/home-assistant-chip-core/default.nix
+++ b/pkgs/development/python-modules/home-assistant-chip-core/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   aenum,
   home-assistant-chip-wheels,
   coloredlogs,
@@ -9,7 +8,6 @@
   cryptography,
   dacite,
   deprecation,
-  ecdsa,
   ipdb,
   mobly,
   pygobject3,
@@ -22,8 +20,6 @@ buildPythonPackage rec {
   inherit (home-assistant-chip-wheels) version;
   format = "wheel";
 
-  disabled = pythonOlder "3.7";
-
   src = home-assistant-chip-wheels;
 
   # format=wheel needs src to be a wheel not a folder of wheels
@@ -31,13 +27,12 @@ buildPythonPackage rec {
     src=($src/home_assistant_chip_core*.whl)
   '';
 
-  propagatedBuildInputs = [
+  dependencies = [
     aenum
     coloredlogs
     construct
     cryptography
     dacite
-    ecdsa
     rich
     pyyaml
     ipdb
diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
index ae78ed9cb1d3..a856179eee7a 100644
--- a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
+++ b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
@@ -166,6 +166,9 @@ stdenv.mkDerivation rec {
       patch -p1 < $patch
     done
 
+    # ecdsa is insecure and only used in tests
+    patch -p1 < ${./dont-import-ecdsa.patch}
+
     # unpin dependencies
     # there are many files to modify, in different formats
     sed -i 's/==.*$//' third_party/pigweed/repo/pw_env_setup/py/pw_env_setup/virtualenv_setup/python_base_requirements.txt
diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/dont-import-ecdsa.patch b/pkgs/development/python-modules/home-assistant-chip-wheels/dont-import-ecdsa.patch
new file mode 100644
index 000000000000..ec1bb87bd8ac
--- /dev/null
+++ b/pkgs/development/python-modules/home-assistant-chip-wheels/dont-import-ecdsa.patch
@@ -0,0 +1,44 @@
+diff --git a/src/controller/python/chip/crypto/p256keypair.py b/src/controller/python/chip/crypto/p256keypair.py
+index 30198eabee..926f55318e 100644
+--- a/src/controller/python/chip/crypto/p256keypair.py
++++ b/src/controller/python/chip/crypto/p256keypair.py
+@@ -22,7 +22,6 @@ from ctypes import (CFUNCTYPE, POINTER, _Pointer, c_bool, c_char, c_size_t, c_ui
+ from typing import TYPE_CHECKING
+ 
+ from chip import native
+-from ecdsa import ECDH, NIST256p, SigningKey  # type: ignore
+ 
+ # WORKAROUND: Create a subscriptable pointer type (with square brackets) to ensure compliance of type hinting with ctypes
+ if not TYPE_CHECKING:
+@@ -133,31 +132,3 @@ class P256Keypair:
+         format of section 2.3.3 of the SECG SEC 1 standard.
+         '''
+         raise NotImplementedError()
+-
+-
+-class TestP256Keypair(P256Keypair):
+-    ''' The P256Keypair for testing purpose. It is not safe for any productions use
+-    '''
+-
+-    def __init__(self, private_key: SigningKey = None):
+-        super().__init__()
+-
+-        if private_key is None:
+-            self._key = SigningKey.generate(NIST256p)
+-        else:
+-            self._key = private_key
+-
+-        self._pubkey = self._key.verifying_key.to_string(encoding='uncompressed')
+-
+-    @property
+-    def public_key(self) -> bytes:
+-        return self._pubkey
+-
+-    def ECDSA_sign_msg(self, message: bytes) -> bytes:
+-        return self._key.sign_deterministic(message, hashfunc=hashlib.sha256)
+-
+-    def ECDH_derive_secret(self, remote_pubkey: bytes) -> bytes:
+-        ecdh = ECDH(curve=NIST256p)
+-        ecdh.load_private_key(self._key)
+-        ecdh.load_received_public_key_bytes(remote_pubkey[1:])
+-        return ecdh.ecdh1.generate_sharedsecret_bytes()

From 231961afaacc8736ab2b87b7869349f117f48835 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 21 Oct 2025 20:29:25 -0700
Subject: [PATCH 1515/6226] python3Packages.python-jose: always use
 cryptography backend

---
 .../python-modules/python-jose/default.nix         | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/python-jose/default.nix b/pkgs/development/python-modules/python-jose/default.nix
index 13e7257d63b3..539d1e5644bb 100644
--- a/pkgs/development/python-modules/python-jose/default.nix
+++ b/pkgs/development/python-modules/python-jose/default.nix
@@ -2,14 +2,11 @@
   lib,
   buildPythonPackage,
   cryptography,
-  ecdsa,
   fetchFromGitHub,
   fetchpatch,
-  pyasn1,
   pycrypto,
   pycryptodome,
   pytestCheckHook,
-  rsa,
   setuptools,
 }:
 
@@ -34,17 +31,18 @@ buildPythonPackage rec {
     })
   ];
 
-  pythonRelaxDeps = [
-    # https://github.com/mpdavis/python-jose/pull/376
+  pythonRemoveDeps = [
+    # These aren't needed if the cryptography backend is used:
+    # https://github.com/mpdavis/python-jose/blob/3.5.0/README.rst#cryptographic-backends
+    "ecdsa"
     "pyasn1"
+    "rsa"
   ];
 
   build-system = [ setuptools ];
 
   dependencies = [
-    ecdsa
-    pyasn1
-    rsa
+    cryptography
   ];
 
   optional-dependencies = {

From 669a4768042a398e1514d1bf89daa9b6c0a26785 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 03:50:00 +0000
Subject: [PATCH 1516/6226] mpv-handler: 0.4.1 -> 0.4.2

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

diff --git a/pkgs/by-name/mp/mpv-handler/package.nix b/pkgs/by-name/mp/mpv-handler/package.nix
index e0dd5c913cca..14637dcab48d 100644
--- a/pkgs/by-name/mp/mpv-handler/package.nix
+++ b/pkgs/by-name/mp/mpv-handler/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "mpv-handler";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "akiirui";
     repo = "mpv-handler";
     tag = "v${version}";
-    hash = "sha256-uWV9pjZp5s8H1UDS/T0JK//eJNnsaaby88l/tDqlQHY=";
+    hash = "sha256-QoctjneJA7CdXqGm0ylAh9w6611vv2PD1fzS0exag5A=";
   };
 
-  cargoHash = "sha256-Cps+cPOv8uV8x0MiBdSqsdJ/8n259K6Y5aVl2aWJ/tE=";
+  cargoHash = "sha256-gKDkDLTLzC53obDd7pORsqP6DhORTbx6tvQ4jq61znQ=";
 
   passthru.updateScript = nix-update-script { };
 

From 0abc48b78a9fc6d4c6e2c3e90c03e3f1c0ffb097 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 04:25:43 +0000
Subject: [PATCH 1517/6226] chirpstack-mqtt-forwarder: 4.4.0 -> 4.4.1

---
 pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix
index e2e700e9197a..87c66935d2fb 100644
--- a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix
+++ b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "chirpstack-mqtt-forwarder";
-  version = "4.4.0";
+  version = "4.4.1";
 
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-mqtt-forwarder";
     rev = "v${version}";
-    hash = "sha256-HopcEwj/WOialvttVJ6bTyRRTqrgfIJ/dYKti5T87Os=";
+    hash = "sha256-qkktkydg5Xe6q5IFalkxtGjO2zK9mZVMnKOBassiEtk=";
   };
 
-  cargoHash = "sha256-uR+Y8+/XbIQdbGOoS/tHBo/r7DLiwiRiaXQ7CjaPpoI=";
+  cargoHash = "sha256-rQPmFmra9Gd8XDP9HuTZZru780RmmqWEKX2iuuRkZQw=";
 
   nativeBuildInputs = [ protobuf ];
 

From b208b07fd09818a1b3308ef197dc4cf869827e8a Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Tue, 21 Oct 2025 20:06:07 +0800
Subject: [PATCH 1518/6226] kdePackages.fcitx5-qt: fix build for Qt 6.10

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
index 0a7564adfbfc..efc7719e6c8b 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
@@ -10,6 +10,7 @@
   qtwayland,
   wrapQtAppsHook,
   wayland,
+  fetchpatch2,
 }:
 let
   majorVersion = lib.versions.major qtbase.version;
@@ -25,6 +26,22 @@ stdenv.mkDerivation rec {
     hash = "sha256-JhmaAAJ1fevCPItVnneUCAalnDDaCjjkAl9QRhSkBk4=";
   };
 
+  patches = [
+    # TODO: remove on next release
+    (fetchpatch2 {
+      url = "https://github.com/fcitx/fcitx5-qt/commit/46a07a85d191fd77a1efc39c8ed43d0cd87788d2.patch?full_index=1";
+      hash = "sha256-qv8Rj6YoFdMQLOB2R9LGgwCHKdhEji0Sg67W37jSIac=";
+    })
+    (fetchpatch2 {
+      url = "https://github.com/fcitx/fcitx5-qt/commit/6ac4fdd8e90ff9c25a5219e15e83740fa38c9c71.patch?full_index=1";
+      hash = "sha256-x0OdlIVmwVuq2TfBlgmfwaQszXLxwRFVf+gEU224uVA=";
+    })
+    (fetchpatch2 {
+      url = "https://github.com/fcitx/fcitx5-qt/commit/1d07f7e8d6a7ae8651eda658f87ab0c9df08bef4.patch?full_index=1";
+      hash = "sha256-22tKD7sbsTJcNqur9/Uf+XAvMvA7tzNQ9hUCMm+E+E0=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace qt${majorVersion}/platforminputcontext/CMakeLists.txt \
       --replace \$"{CMAKE_INSTALL_QT${majorVersion}PLUGINDIR}" $out/${qtbase.qtPluginPrefix}

From 3c0c4ebe027bdfef9e3f9fc588d7a5695fb7b079 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 05:13:36 +0000
Subject: [PATCH 1519/6226] bento: 1.11.0 -> 1.12.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 3e8754604c92..789bcc922e6e 100644
--- a/pkgs/by-name/be/bento/package.nix
+++ b/pkgs/by-name/be/bento/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule rec {
   pname = "bento";
-  version = "1.11.0";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "warpstreamlabs";
     repo = "bento";
     tag = "v${version}";
-    hash = "sha256-F5RUOcD6nKH5NS0nK78d94FtXduI/6AVJJ0qArP8Ziw=";
+    hash = "sha256-BrGYMOXSRYoCE29KQU07LaK8HQ1+QrMusYejL5SrpXk=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-hBjj3voqWvwURGsgIgySLyxfm0JKu4qHe/HLcUO0Fa0=";
+  vendorHash = "sha256-YPCC8xK4lRtRzNjx6U8O7/+PqhhOaM/QofnOvH1rg9Y=";
 
   subPackages = [
     "cmd/bento"

From 23bc67bf0c9244228f64b45e19f0b69aee743834 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Wed, 22 Oct 2025 07:18:51 +0200
Subject: [PATCH 1520/6226] mumble: 1.5.735 -> 1.5.857

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/applications/networking/mumble/default.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index 957313668a15..6820ec4208a2 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -155,12 +155,6 @@ let
       patches = [
         ./disable-overlay-build.patch
         ./fix-plugin-copy.patch
-        # Can be removed before the next update of Mumble, as that fix was upstreamed
-        # fix version display in MacOS Finder
-        (fetchpatch {
-          url = "https://github.com/mumble-voip/mumble/commit/fbd21bd422367bed19f801bf278562f567cbb8b7.patch";
-          sha256 = "sha256-qFhC2j/cOWzAhs+KTccDIdcgFqfr4y4VLjHiK458Ucs=";
-        })
       ];
 
       postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
@@ -224,14 +218,14 @@ let
     } source;
 
   source = rec {
-    version = "1.5.735";
+    version = "1.5.857";
 
     # Needs submodules
     src = fetchFromGitHub {
       owner = "mumble-voip";
       repo = "mumble";
-      rev = "v${version}";
-      hash = "sha256-JRnGgxkf5ct6P71bYgLbCEUmotDLS2Evy6t8R7ac7D4=";
+      tag = "v${version}";
+      hash = "sha256-4ySak2nzT8p48waMgBc9kLrvFB8716e7p0G4trzuh1k=";
       fetchSubmodules = true;
     };
   };

From 86f3462f211269ff586f0e109049acbbb70e12b2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 05:25:32 +0000
Subject: [PATCH 1521/6226] laravel: 5.21.0 -> 5.22.0

---
 pkgs/by-name/la/laravel/composer.lock | 32 +++++++++++++--------------
 pkgs/by-name/la/laravel/package.nix   |  6 ++---
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/la/laravel/composer.lock b/pkgs/by-name/la/laravel/composer.lock
index 8989fcdb1e51..d9fae099ba7a 100644
--- a/pkgs/by-name/la/laravel/composer.lock
+++ b/pkgs/by-name/la/laravel/composer.lock
@@ -167,7 +167,7 @@
         },
         {
             "name": "illuminate/collections",
-            "version": "v12.34.0",
+            "version": "v12.35.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/collections.git",
@@ -226,7 +226,7 @@
         },
         {
             "name": "illuminate/conditionable",
-            "version": "v12.34.0",
+            "version": "v12.35.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/conditionable.git",
@@ -272,7 +272,7 @@
         },
         {
             "name": "illuminate/contracts",
-            "version": "v12.34.0",
+            "version": "v12.35.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/contracts.git",
@@ -320,7 +320,7 @@
         },
         {
             "name": "illuminate/filesystem",
-            "version": "v12.34.0",
+            "version": "v12.35.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/filesystem.git",
@@ -387,7 +387,7 @@
         },
         {
             "name": "illuminate/macroable",
-            "version": "v12.34.0",
+            "version": "v12.35.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/macroable.git",
@@ -433,16 +433,16 @@
         },
         {
             "name": "illuminate/support",
-            "version": "v12.34.0",
+            "version": "v12.35.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/support.git",
-                "reference": "89291f59ef6c170c00f10a41c566c49ee32ca09a"
+                "reference": "eefcefcf6edff2c986f746f10fad3da3e79a1223"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/89291f59ef6c170c00f10a41c566c49ee32ca09a",
-                "reference": "89291f59ef6c170c00f10a41c566c49ee32ca09a",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/eefcefcf6edff2c986f746f10fad3da3e79a1223",
+                "reference": "eefcefcf6edff2c986f746f10fad3da3e79a1223",
                 "shasum": ""
             },
             "require": {
@@ -508,7 +508,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-10-13T21:11:33+00:00"
+            "time": "2025-10-18T13:23:12+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -2262,16 +2262,16 @@
         },
         {
             "name": "nikic/php-parser",
-            "version": "v5.6.1",
+            "version": "v5.6.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2"
+                "reference": "3a454ca033b9e06b63282ce19562e892747449bb"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
-                "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/3a454ca033b9e06b63282ce19562e892747449bb",
+                "reference": "3a454ca033b9e06b63282ce19562e892747449bb",
                 "shasum": ""
             },
             "require": {
@@ -2314,9 +2314,9 @@
             ],
             "support": {
                 "issues": "https://github.com/nikic/PHP-Parser/issues",
-                "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.1"
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.2"
             },
-            "time": "2025-08-13T20:13:15+00:00"
+            "time": "2025-10-21T19:32:17+00:00"
         },
         {
             "name": "phar-io/manifest",
diff --git a/pkgs/by-name/la/laravel/package.nix b/pkgs/by-name/la/laravel/package.nix
index 8ed1ade24a71..c7c3626719ec 100644
--- a/pkgs/by-name/la/laravel/package.nix
+++ b/pkgs/by-name/la/laravel/package.nix
@@ -7,19 +7,19 @@
 }:
 php.buildComposerProject2 (finalAttrs: {
   pname = "laravel";
-  version = "5.21.0";
+  version = "5.22.0";
 
   src = fetchFromGitHub {
     owner = "laravel";
     repo = "installer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2UfLzB3m/WjzJC7h/wYX9MHCUQFCVWRlXWVUpmDtUoE=";
+    hash = "sha256-kC6RD+rtjHXrOGhF/E9l8/eArTnDrXIw3D6lnDpsl7I=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
   composerLock = ./composer.lock;
-  vendorHash = "sha256-My17A7xl2HacrVP5SMzYpSar6cJ0MONznkJIPLFTII8=";
+  vendorHash = "sha256-s+wBvGnDyKbzniZoKJ4wUcv0FCo7XnrD6KYvYhllBFM=";
 
   # Adding npm (nodejs) and php composer to path
   postInstall = ''

From bcf1dd999f32c7608f19e0b45ce0d46476dbfef3 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 22 Oct 2025 07:31:04 +0200
Subject: [PATCH 1522/6226] =?UTF-8?q?fstar:=202025.08.07=20=E2=86=92=20202?=
 =?UTF-8?q?5.10.06?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/fs/fstar/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/fs/fstar/package.nix b/pkgs/by-name/fs/fstar/package.nix
index fc810157836f..55f3433789b4 100644
--- a/pkgs/by-name/fs/fstar/package.nix
+++ b/pkgs/by-name/fs/fstar/package.nix
@@ -17,15 +17,15 @@ let
 
   fstarZ3 = callPackage ./z3 { };
 in
-ocamlPackages.buildDunePackage rec {
+ocamlPackages.buildDunePackage (finalAttrs: {
   pname = "fstar";
-  version = "2025.08.07";
+  version = "2025.10.06";
 
   src = fetchFromGitHub {
     owner = "FStarLang";
     repo = "FStar";
-    rev = "v${version}";
-    hash = "sha256-IfwMLMbyC1+iPIG48zm6bzhKCHKPOpVaHdlLhU5g3co=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-PH3ylEiUS+mfFtYV+KI7xrCewkEutM1c14A+ARsyOQY=";
   };
 
   nativeBuildInputs = [
@@ -114,7 +114,7 @@ ocamlPackages.buildDunePackage rec {
   meta = {
     description = "ML-like functional programming language aimed at program verification";
     homepage = "https://www.fstar-lang.org";
-    changelog = "https://github.com/FStarLang/FStar/raw/v${version}/CHANGES.md";
+    changelog = "https://github.com/FStarLang/FStar/raw/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       numinit
@@ -122,4 +122,4 @@ ocamlPackages.buildDunePackage rec {
     mainProgram = "fstar.exe";
     platforms = with lib.platforms; darwin ++ linux;
   };
-}
+})

From b77e15ce2040afe630009db6c53bfd55cb61741a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 05:43:17 +0000
Subject: [PATCH 1523/6226] rclone: 1.71.1 -> 1.71.2

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

diff --git a/pkgs/by-name/rc/rclone/package.nix b/pkgs/by-name/rc/rclone/package.nix
index fa6fa70030d6..1f54edecca42 100644
--- a/pkgs/by-name/rc/rclone/package.nix
+++ b/pkgs/by-name/rc/rclone/package.nix
@@ -17,7 +17,7 @@
 
 buildGoModule rec {
   pname = "rclone";
-  version = "1.71.1";
+  version = "1.71.2";
 
   outputs = [
     "out"
@@ -28,10 +28,10 @@ buildGoModule rec {
     owner = "rclone";
     repo = "rclone";
     tag = "v${version}";
-    hash = "sha256-CvU07yzqBtQVjNtwnOLnSwULNkDMSmNTNyLFpDYy/w4=";
+    hash = "sha256-fmqIjwWhWj8ucw/OP6B9dCGKaF8eiVQdJEtK0a6G9E4=";
   };
 
-  vendorHash = "sha256-Hapwa+WYz6a22HauRjRUl7q0ZlwR/j/zwex0VebgC+g=";
+  vendorHash = "sha256-0RK2gc3InPZZnAEgv01fgG19cWeKCsBP6JN2OCVY8O4=";
 
   subPackages = [ "." ];
 

From 42a9ec36d74d40c6c6917cd8a6bdfd48b3086483 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 05:55:37 +0000
Subject: [PATCH 1524/6226] python3Packages.web3: 7.13.0 -> 7.14.0

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

diff --git a/pkgs/development/python-modules/web3/default.nix b/pkgs/development/python-modules/web3/default.nix
index 79c6e2c7bfb5..fa594f39b8d0 100644
--- a/pkgs/development/python-modules/web3/default.nix
+++ b/pkgs/development/python-modules/web3/default.nix
@@ -39,14 +39,14 @@
 
 buildPythonPackage rec {
   pname = "web3";
-  version = "7.13.0";
+  version = "7.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ethereum";
     repo = "web3.py";
     tag = "v${version}";
-    hash = "sha256-cG4P/mrvQ3GlGT17o5yVGZtIM5Vgi2+iojUsYSBbhFA=";
+    hash = "sha256-jcRbyYbbqcY7WYIO8wiqLWYnS73NRDfMIpxDFT8ulSY=";
   };
 
   build-system = [ setuptools ];

From 4209f9cd2201d8a4955c58d403b9505b39b75d47 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Wed, 22 Oct 2025 08:06:44 +0200
Subject: [PATCH 1525/6226] claude-code: 2.0.24 -> 2.0.25

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
---
 .../vscode/extensions/anthropic.claude-code/default.nix     | 4 ++--
 pkgs/by-name/cl/claude-code/package-lock.json               | 4 ++--
 pkgs/by-name/cl/claude-code/package.nix                     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 69ea179c954b..378d852bb39a 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "2.0.24";
-    hash = "sha256-5lPa2xBDqdVFdwVBiGz0u8Cp/oHvUTNEzvyKy4t2qvw=";
+    version = "2.0.25";
+    hash = "sha256-I4z39qCDraRbpFlgUPW6KQcuALZYRqlLT6poJzs/8d8=";
   };
 
   meta = {
diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 07ec9ee16c3c..e90b62d35f7a 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.0.24",
+  "version": "2.0.25",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.0.24",
+      "version": "2.0.25",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 2c81854f4e18..f6a6d9d7b6b8 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,14 +7,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.0.24";
+  version = "2.0.25";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-pi8EdN/XyzMGWBcTiV8pr9GODcBs0uPFarWjQMoCaEs=";
+    hash = "sha256-ix/JSPBLnvCPtyqJ6beAaOpuimphpkrkIw5HCdeeGkM=";
   };
 
-  npmDepsHash = "sha256-XylBq0/zu7iSTPiLAkewQFeh1OmtJv9nUfnCb66opVE=";
+  npmDepsHash = "sha256-NjmCmOwepKaSZ+vji0sUlZ1nSkcG02kNokGe37YYtX0=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From d0b1cf078b6aa1d3feec21bd61e424e06fae28e9 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Mon, 6 Oct 2025 01:26:56 +0800
Subject: [PATCH 1526/6226] python3Packages.firedrake-fiat: 2025.4.2 ->
 2025.10.0

Diff: https://github.com/firedrakeproject/fiat/compare/2025.4.2...2025.10.0
ChangeLog: https://github.com/firedrakeproject/fiat/releases/tag/2025.10.0
---
 pkgs/development/python-modules/firedrake-fiat/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/firedrake-fiat/default.nix b/pkgs/development/python-modules/firedrake-fiat/default.nix
index 5255fa695da8..015a3fd91b15 100644
--- a/pkgs/development/python-modules/firedrake-fiat/default.nix
+++ b/pkgs/development/python-modules/firedrake-fiat/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "firedrake-fiat";
-  version = "2025.4.2";
+  version = "2025.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "firedrakeproject";
     repo = "fiat";
     tag = version;
-    hash = "sha256-SIi/4JW9L4kyFxEmbG9pqe0QtY80UMOh7LSFLmrHhZY=";
+    hash = "sha256-kyQe4VFzcK1idMt/NNND2cytGUryyhh5+ZP292zxT7c=";
   };
 
   postPatch =

From 45e29d998e5e61ef0d776c8a166525df06d44e04 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Mon, 6 Oct 2025 01:34:28 +0800
Subject: [PATCH 1527/6226] python3Packages.pyadjoint-ad: 2025.4.1 -> 2025.10.0

Diff: https://github.com/dolfin-adjoint/pyadjoint/compare/2025.04.1...2025.10.0
ChangeLog: https://github.com/dolfin-adjoint/pyadjoint/releases/tag/2025.10.0
---
 pkgs/development/python-modules/pyadjoint-ad/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pyadjoint-ad/default.nix b/pkgs/development/python-modules/pyadjoint-ad/default.nix
index 5b91b9dcb6aa..6a6ad8d50eab 100644
--- a/pkgs/development/python-modules/pyadjoint-ad/default.nix
+++ b/pkgs/development/python-modules/pyadjoint-ad/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pyadjoint-ad";
-  version = "2025.04.1";
+  version = "2025.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dolfin-adjoint";
     repo = "pyadjoint";
     tag = version;
-    hash = "sha256-S9A0qCatnnLuOkqWsEC4tjVY1HZqqi2T5iXu+WUoN24=";
+    hash = "sha256-caW2X4q0mHnD8CEh5jjelD4xBth/R/8/P3m0tTeO/LQ=";
   };
 
   build-system = [
@@ -30,8 +30,6 @@ buildPythonPackage rec {
   ];
 
   pythonImportsCheck = [
-    # The firedrake_adjoint module is deprecated and requires a cyclic dependency of firedrake
-    # "firedrake_adjoint"
     "numpy_adjoint"
     "pyadjoint"
     "pyadjoint.optimization"

From b22b5a3c20c81569504934ed7c897a3ce1a0f611 Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Wed, 22 Oct 2025 01:43:39 -0400
Subject: [PATCH 1528/6226] nixos/tests: More temporary uaccess fixes

See: https://github.com/NixOS/nixpkgs/pull/453603
---
 nixos/tests/budgie.nix           | 3 ++-
 nixos/tests/cinnamon-wayland.nix | 3 ++-
 nixos/tests/cinnamon.nix         | 3 ++-
 nixos/tests/enlightenment.nix    | 3 ++-
 nixos/tests/gnome-extensions.nix | 3 ++-
 nixos/tests/gnome-flashback.nix  | 3 ++-
 nixos/tests/gnome-xorg.nix       | 3 ++-
 nixos/tests/gnome.nix            | 3 ++-
 nixos/tests/lxqt.nix             | 3 ++-
 nixos/tests/mate.nix             | 3 ++-
 nixos/tests/pantheon.nix         | 3 ++-
 nixos/tests/xfce-wayland.nix     | 3 ++-
 nixos/tests/xfce.nix             | 3 ++-
 13 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/nixos/tests/budgie.nix b/nixos/tests/budgie.nix
index a6c40f6a9ab4..b003e1c65240 100644
--- a/nixos/tests/budgie.nix
+++ b/nixos/tests/budgie.nix
@@ -54,7 +54,8 @@
           machine.succeed("xauth merge ${user.home}/.Xauthority")
 
       with subtest("Check that logging in has given the user ownership of devices"):
-          machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+          # Change back to /dev/snd/timer after systemd-258.1
+          machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")
 
       with subtest("Check if Budgie session components actually start"):
           for i in ["budgie-daemon", "budgie-panel", "budgie-wm", "budgie-desktop-view", "gsd-media-keys"]:
diff --git a/nixos/tests/cinnamon-wayland.nix b/nixos/tests/cinnamon-wayland.nix
index d19ac920b388..e4118d82f4dd 100644
--- a/nixos/tests/cinnamon-wayland.nix
+++ b/nixos/tests/cinnamon-wayland.nix
@@ -42,7 +42,8 @@
           machine.wait_for_file("/run/user/${toString user.uid}/wayland-0")
 
       with subtest("Check that logging in has given the user ownership of devices"):
-          machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+          # Change back to /dev/snd/timer after systemd-258.1
+          machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")
 
       with subtest("Wait for the Cinnamon shell"):
           # Correct output should be (true, '2')
diff --git a/nixos/tests/cinnamon.nix b/nixos/tests/cinnamon.nix
index 9ff43a8dbbb7..1f8fb683efc7 100644
--- a/nixos/tests/cinnamon.nix
+++ b/nixos/tests/cinnamon.nix
@@ -53,7 +53,8 @@
           machine.succeed("xauth merge ${user.home}/.Xauthority")
 
       with subtest("Check that logging in has given the user ownership of devices"):
-          machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+          # Change back to /dev/snd/timer after systemd-258.1
+          machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")
 
       with subtest("Wait for the Cinnamon shell"):
           # Correct output should be (true, '2')
diff --git a/nixos/tests/enlightenment.nix b/nixos/tests/enlightenment.nix
index 77e731feddbf..41dfc754e7fe 100644
--- a/nixos/tests/enlightenment.nix
+++ b/nixos/tests/enlightenment.nix
@@ -42,7 +42,8 @@
           machine.succeed("xauth merge ${user.home}/.Xauthority")
 
       with subtest("Check that logging in has given the user ownership of devices"):
-          machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+          # Change back to /dev/snd/timer after systemd-258.1
+          machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")
 
       with subtest("First time wizard"):
           machine.wait_for_text("Default")  # Language
diff --git a/nixos/tests/gnome-extensions.nix b/nixos/tests/gnome-extensions.nix
index bde20a8c95aa..66003daa09d9 100644
--- a/nixos/tests/gnome-extensions.nix
+++ b/nixos/tests/gnome-extensions.nix
@@ -105,7 +105,8 @@
           # wait for alice to be logged in
           machine.wait_for_unit("default.target", "${user.name}")
           # check that logging in has given the user ownership of devices
-          assert "alice" in machine.succeed("getfacl -p /dev/snd/timer")
+          # Change back to /dev/snd/timer after systemd-258.1
+          assert "alice" in machine.succeed("getfacl -p /dev/dri/card0")
 
       with subtest("Wait for GNOME Shell"):
           # correct output should be (true, 'false')
diff --git a/nixos/tests/gnome-flashback.nix b/nixos/tests/gnome-flashback.nix
index 6df6e621995e..46cb6402bbb1 100644
--- a/nixos/tests/gnome-flashback.nix
+++ b/nixos/tests/gnome-flashback.nix
@@ -46,7 +46,8 @@
           machine.wait_for_file("${xauthority}")
           machine.succeed("xauth merge ${xauthority}")
           # Check that logging in has given the user ownership of devices
-          assert "alice" in machine.succeed("getfacl -p /dev/snd/timer")
+          # Change back to /dev/snd/timer after systemd-258.1
+          assert "alice" in machine.succeed("getfacl -p /dev/dri/card0")
 
       with subtest("Wait for Metacity"):
           machine.wait_until_succeeds("pgrep metacity")
diff --git a/nixos/tests/gnome-xorg.nix b/nixos/tests/gnome-xorg.nix
index 82d3bf3e08ce..9e9fdc9bdb9f 100644
--- a/nixos/tests/gnome-xorg.nix
+++ b/nixos/tests/gnome-xorg.nix
@@ -83,7 +83,8 @@
           machine.wait_for_file("${xauthority}")
           machine.succeed("xauth merge ${xauthority}")
           # Check that logging in has given the user ownership of devices
-          assert "alice" in machine.succeed("getfacl -p /dev/snd/timer")
+          # Change back to /dev/snd/timer after systemd-258.1
+          assert "alice" in machine.succeed("getfacl -p /dev/dri/card0")
 
       with subtest("Wait for GNOME Shell"):
           # correct output should be (true, 'false')
diff --git a/nixos/tests/gnome.nix b/nixos/tests/gnome.nix
index 4d1b4c71ecd2..0bb2e7061133 100644
--- a/nixos/tests/gnome.nix
+++ b/nixos/tests/gnome.nix
@@ -76,7 +76,8 @@
           # wait for alice to be logged in
           machine.wait_for_unit("default.target", "${user.name}")
           # check that logging in has given the user ownership of devices
-          assert "alice" in machine.succeed("getfacl -p /dev/snd/timer")
+          # Change back to /dev/snd/timer after systemd-258.1
+          assert "alice" in machine.succeed("getfacl -p /dev/dri/card0")
 
       with subtest("Wait for GNOME Shell"):
           # correct output should be (true, 'false')
diff --git a/nixos/tests/lxqt.nix b/nixos/tests/lxqt.nix
index 595b6dc3f9ba..a7b8120016aa 100644
--- a/nixos/tests/lxqt.nix
+++ b/nixos/tests/lxqt.nix
@@ -42,7 +42,8 @@
           machine.succeed("su - ${user.name} -c 'xauth merge /tmp/xauth_*'")
 
       with subtest("Check that logging in has given the user ownership of devices"):
-          machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+          # Change back to /dev/snd/timer after systemd-258.1
+          machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")
 
       with subtest("Check if LXQt components actually start"):
           for i in ["openbox", "lxqt-session", "pcmanfm-qt", "lxqt-panel", "lxqt-runner"]:
diff --git a/nixos/tests/mate.nix b/nixos/tests/mate.nix
index 45fd877c1ca4..81948d5a1ae1 100644
--- a/nixos/tests/mate.nix
+++ b/nixos/tests/mate.nix
@@ -41,7 +41,8 @@
           machine.succeed("xauth merge ${user.home}/.Xauthority")
 
       with subtest("Check that logging in has given the user ownership of devices"):
-          machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+          # Change back to /dev/snd/timer after systemd-258.1
+          machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")
 
       with subtest("Check if MATE session components actually start"):
           machine.wait_until_succeeds("pgrep marco")
diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix
index 336f84a061b4..3e24bff88527 100644
--- a/nixos/tests/pantheon.nix
+++ b/nixos/tests/pantheon.nix
@@ -72,7 +72,8 @@
           machine.wait_for_file("/run/user/${toString user.uid}/wayland-0")
 
       with subtest("Check that logging in has given the user ownership of devices"):
-          machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+          # Change back to /dev/snd/timer after systemd-258.1
+          machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")
 
       with subtest("Check if Pantheon components actually start"):
           pgrep_list = [
diff --git a/nixos/tests/xfce-wayland.nix b/nixos/tests/xfce-wayland.nix
index 17defe1b4d26..061efa002327 100644
--- a/nixos/tests/xfce-wayland.nix
+++ b/nixos/tests/xfce-wayland.nix
@@ -39,7 +39,8 @@
         machine.wait_for_file("/run/user/${toString user.uid}/wayland-0")
 
       with subtest("Check that logging in has given the user ownership of devices"):
-        machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+        # Change back to /dev/snd/timer after systemd-258.1
+        machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")
 
       with subtest("Check if Xfce components actually start"):
         for p in ["labwc", "xfdesktop", "xfce4-notifyd", "xfconfd", "xfce4-panel"]:
diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix
index 0b88fb18870f..cdd1f3ffc676 100644
--- a/nixos/tests/xfce.nix
+++ b/nixos/tests/xfce.nix
@@ -38,7 +38,8 @@
         machine.succeed("xauth merge ${user.home}/.Xauthority")
 
       with subtest("Check that logging in has given the user ownership of devices"):
-        machine.succeed("getfacl -p /dev/snd/timer | grep -q ${user.name}")
+        # Change back to /dev/snd/timer after systemd-258.1
+        machine.succeed("getfacl -p /dev/dri/card0 | grep -q ${user.name}")
 
       with subtest("Check if Xfce components actually start"):
         machine.wait_for_window("xfce4-panel")

From dfa6f760067255e0a0e182724dc481b76f31cb1e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 06:25:20 +0000
Subject: [PATCH 1529/6226] auth0-cli: 1.21.0 -> 1.22.0

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

diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix
index f2d34eb7490d..86840cb136c5 100644
--- a/pkgs/by-name/au/auth0-cli/package.nix
+++ b/pkgs/by-name/au/auth0-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "auth0-cli";
-  version = "1.21.0";
+  version = "1.22.0";
 
   src = fetchFromGitHub {
     owner = "auth0";
     repo = "auth0-cli";
     tag = "v${version}";
-    hash = "sha256-HII1qRJ4or5gncSVUA41DmkC8EQ9w6fdmMM15JTUFsw=";
+    hash = "sha256-y+vNIXwSNVWwR6uSyLqsk366Y558sZxK4RYG/Cres/4=";
   };
 
-  vendorHash = "sha256-g/vpUbtWFKyoPObpd9yOdsbzD/8d0SjAUZzL7A92bio=";
+  vendorHash = "sha256-eqeicg4ZWd/oOjaULXKjI5t8+4lSl5HFG3fOaeF5zB4=";
 
   ldflags = [
     "-s"

From 6d034fff8c9c9677e357f0a66a9a76dc61d8ecdb Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Mon, 6 Oct 2025 03:42:41 +0800
Subject: [PATCH 1530/6226] python3Packages.firedrake 2025.4.2 -> 2025.10.1

Diff: https://github.com/firedrakeproject/firedrake/compare/2025.4.2...2025.10.1
ChangeLog: https://github.com/firedrakeproject/firedrake/releases/tag/2025.10.1
---
 .../python-modules/firedrake/default.nix      | 48 ++++++++-----------
 1 file changed, 19 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/python-modules/firedrake/default.nix b/pkgs/development/python-modules/firedrake/default.nix
index 4788e344cf05..4723401106cc 100644
--- a/pkgs/development/python-modules/firedrake/default.nix
+++ b/pkgs/development/python-modules/firedrake/default.nix
@@ -23,6 +23,7 @@
   libsupermesh,
   loopy,
   petsc4py,
+  petsctools,
   numpy,
   packaging,
   pkgconfig,
@@ -35,6 +36,7 @@
   scipy,
   sympy,
   islpy,
+  vtk,
   matplotlib,
   immutabledict,
 
@@ -59,36 +61,31 @@ let
 in
 buildPythonPackage rec {
   pname = "firedrake";
-  version = "2025.4.2";
+  version = "2025.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "firedrakeproject";
     repo = "firedrake";
     tag = version;
-    hash = "sha256-bAGmXoHPAdMYJMMQYVq98LYro1Vd+o9pfvXC3BsQUf0=";
+    hash = "sha256-paZNs6T9v7TNSdc8YJTjNcQvGrPg/Sy9K27/aUxNu5w=";
   };
 
-  postPatch =
-    # relax build-dependency petsc4py
-    ''
-      substituteInPlace pyproject.toml --replace-fail \
-        "petsc4py==3.23.4" "petsc4py"
-    ''
-    + lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace firedrake/petsc.py --replace-fail \
-        'program = ["ldd"]' \
-        'program = ["${lib.getExe' pax-utils "lddtree"}"]'
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace firedrake/petsc.py --replace-fail \
-        'program = ["otool"' \
-        'program = ["${lib.getExe' stdenv.cc.bintools.bintools "otool"}"'
-    '';
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/firedrakeproject/firedrake/pull/4632/commits/717ae8a62e19e0cc91419c12ca14170d252b2bb9.patch?full_index=1";
+      hash = "sha256-XHIcXmfh/brlQkrM4FTRvTrOovLvBN5mBrqZpZewTnc=";
+    })
+  ];
+
+  # relax build-dependency petsc4py
+  postPatch = ''
+    substituteInPlace pyproject.toml --replace-fail \
+      "petsc4py==3.24.0" "petsc4py"
+  '';
 
   pythonRelaxDeps = [
     "decorator"
-    "slepc4py"
   ];
 
   build-system = [
@@ -117,6 +114,7 @@ buildPythonPackage rec {
     libsupermesh
     loopy
     petsc4py
+    petsctools
     numpy
     packaging
     pkgconfig
@@ -128,6 +126,7 @@ buildPythonPackage rec {
     rtree
     scipy
     sympy
+    vtk
     # required by script spydump
     matplotlib
     # required by pyop2
@@ -155,20 +154,11 @@ buildPythonPackage rec {
     writableTmpDirAsHomeHook
   ];
 
-  # These scripts are used by official sdist/editable_wheel only
-  postInstall = ''
-    rm $out/bin/firedrake-{check,status,run-split-tests}
-  '';
-
-  preCheck = ''
-    rm -rf firedrake pyop2 tinyasm tsfc
-  '';
-
   # run official smoke tests
   checkPhase = ''
     runHook preCheck
 
-    make check
+    $out/bin/firedrake-check
 
     runHook postCheck
   '';

From a16cec57f8608d7a95395db0fb8c189111bfecb0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 06:44:53 +0000
Subject: [PATCH 1531/6226] argocd: 3.1.8 -> 3.1.9

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

diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix
index 0dd904c7cd23..a5569cc2e9d2 100644
--- a/pkgs/by-name/ar/argocd/package.nix
+++ b/pkgs/by-name/ar/argocd/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule rec {
   pname = "argocd";
-  version = "3.1.8";
+  version = "3.1.9";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-cd";
     rev = "v${version}";
-    hash = "sha256-xySxnRw8MvMi4BJ/h8+4Lhf2ontC05hAliMG2e3xnQg=";
+    hash = "sha256-l8MlEVfw8BoHS/ZCtxzi7M0xMMOvotXYnconB+3x/1k=";
   };
 
   ui = stdenv.mkDerivation {

From 0f6f20ae969c609affeab267eb889d6be69dc226 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 06:48:19 +0000
Subject: [PATCH 1532/6226] crosvm: 0-unstable-2025-10-15 ->
 0-unstable-2025-10-21

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

diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix
index 9bcb2f6a1069..0b3d9291048f 100644
--- a/pkgs/by-name/cr/crosvm/package.nix
+++ b/pkgs/by-name/cr/crosvm/package.nix
@@ -21,12 +21,12 @@
 
 rustPlatform.buildRustPackage {
   pname = "crosvm";
-  version = "0-unstable-2025-10-15";
+  version = "0-unstable-2025-10-21";
 
   src = fetchgit {
     url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
-    rev = "b516534fef1658536e76cfcb958db424c1a764b5";
-    hash = "sha256-FZu/eWEZ9j/gBL9mYFB29aT3MF95hjRS075pAmv8SjA=";
+    rev = "f6de423867b914a59d86c54d102831bccc7ed2c8";
+    hash = "sha256-xTuu1tMoFuMcj2RqtGjyDbcFPh3bTCtWpr0fuND4aos=";
     fetchSubmodules = true;
   };
 

From 3fe523fb408e1625abeb53d00705158bd0905ae8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 06:49:35 +0000
Subject: [PATCH 1533/6226] go-sendxmpp: 0.15.0 -> 0.15.1

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

diff --git a/pkgs/by-name/go/go-sendxmpp/package.nix b/pkgs/by-name/go/go-sendxmpp/package.nix
index e2cc18dad348..90aeea6276e4 100644
--- a/pkgs/by-name/go/go-sendxmpp/package.nix
+++ b/pkgs/by-name/go/go-sendxmpp/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-sendxmpp";
-  version = "0.15.0";
+  version = "0.15.1";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "mdosch";
     repo = "go-sendxmpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-S4KoCMlW+uUJcQTYkEtlRT4IAALfRFSj2UDZk4A5e5g=";
+    hash = "sha256-dXSja3k7Gb9fzP3TrQqB9KRVO90i967eVaLldwhBnvQ=";
   };
 
-  vendorHash = "sha256-Qe95u+M9X45cVO9MNLPxoyMyoWOAYYQ2n/GorD/PMIA=";
+  vendorHash = "sha256-fnaOgc8RPDQnxTWOLQx1kw0+qj1iaff+UkjnoJYdEG4=";
 
   passthru = {
     tests.version = testers.testVersion {

From 6e67c6ab86e135ed0fa0d5bbbb112f84f94dcc62 Mon Sep 17 00:00:00 2001
From: Svenum <s.ziegler@holypenguin.net>
Date: Tue, 14 Oct 2025 11:28:19 +0200
Subject: [PATCH 1534/6226] audialitiy2: fix build

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

diff --git a/pkgs/by-name/au/audiality2/package.nix b/pkgs/by-name/au/audiality2/package.nix
index 61e83d4fac5d..d6c6e328fa7d 100644
--- a/pkgs/by-name/au/audiality2/package.nix
+++ b/pkgs/by-name/au/audiality2/package.nix
@@ -20,6 +20,12 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "0ipqna7a9mxqm0fl9ggwhbc7i9yxz3jfyi0w3dymjp40v7jw1n20";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 2.8)' \
+      'cmake_minimum_required(VERSION 3.5)'
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config

From d1342a6cfce204faa8278e1143aba6ae77fee7e5 Mon Sep 17 00:00:00 2001
From: Svenum <s.ziegler@holypenguin.net>
Date: Tue, 14 Oct 2025 12:48:17 +0200
Subject: [PATCH 1535/6226] bowtie2: fix build

---
 pkgs/by-name/bo/bowtie2/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/bo/bowtie2/package.nix b/pkgs/by-name/bo/bowtie2/package.nix
index 5286edb36f81..7349d505e7ce 100644
--- a/pkgs/by-name/bo/bowtie2/package.nix
+++ b/pkgs/by-name/bo/bowtie2/package.nix
@@ -28,7 +28,9 @@ stdenv.mkDerivation (finalAttrs: {
   # TODO: check with other distros and report upstream
   postPatch = ''
     substituteInPlace CMakeLists.txt \
-      --replace "-m64" ""
+      --replace-fail "-m64" "" \
+      --replace-fail 'cmake_minimum_required(VERSION 3.1 FATAL_ERROR)' \
+        'cmake_minimum_required(VERSION 3.5 FATAL_ERROR)'
   '';
 
   nativeBuildInputs = [ cmake ];

From 38ae2a8fe89f0c9e36cb998b9cebd541d1128208 Mon Sep 17 00:00:00 2001
From: Svenum <s.ziegler@holypenguin.net>
Date: Tue, 14 Oct 2025 12:51:52 +0200
Subject: [PATCH 1536/6226] bustools: fix build

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

diff --git a/pkgs/by-name/bu/bustools/package.nix b/pkgs/by-name/bu/bustools/package.nix
index d42e48bf131f..4951b32c5115 100644
--- a/pkgs/by-name/bu/bustools/package.nix
+++ b/pkgs/by-name/bu/bustools/package.nix
@@ -23,6 +23,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ zlib ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 2.8.12)' \
+      'cmake_minimum_required(VERSION 3.5)'
+  '';
+
   passthru.tests.version = testers.testVersion {
     package = bustools;
     command = "bustools version";

From 64db0c708c029a22bda6d5d6da560d2294e38b5c Mon Sep 17 00:00:00 2001
From: Svenum <s.ziegler@holypenguin.net>
Date: Tue, 14 Oct 2025 23:32:45 +0200
Subject: [PATCH 1537/6226] qstopmotion: fix build

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

diff --git a/pkgs/by-name/qs/qstopmotion/package.nix b/pkgs/by-name/qs/qstopmotion/package.nix
index 83913cf2905a..52e0d17f564b 100644
--- a/pkgs/by-name/qs/qstopmotion/package.nix
+++ b/pkgs/by-name/qs/qstopmotion/package.nix
@@ -67,7 +67,10 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace CMakeLists.txt \
       --replace-fail \
         "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml" \
-        "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml Multimedia"
+        "find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml Multimedia" \
+      --replace-fail \
+        "cmake_minimum_required(VERSION 3.0.2)" \
+        "cmake_minimum_required(VERSION 3.5)"
     grep -rl 'qwt' . | xargs sed -i 's@<qwt/qwt_slider.h>@<qwt_slider.h>@g'
   '';
 

From b76af7d00e5711168729387ea45b852da82d1374 Mon Sep 17 00:00:00 2001
From: Svenum <s.ziegler@holypenguin.net>
Date: Thu, 16 Oct 2025 08:55:40 +0200
Subject: [PATCH 1538/6226] chiaki: fix build

---
 pkgs/games/chiaki/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/games/chiaki/default.nix b/pkgs/games/chiaki/default.nix
index 608664d61ad5..03e5c528ac2f 100644
--- a/pkgs/games/chiaki/default.nix
+++ b/pkgs/games/chiaki/default.nix
@@ -33,6 +33,12 @@ mkDerivation rec {
     pkg-config
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+    'cmake_minimum_required(VERSION 3.2)' \
+    'cmake_minimum_required(VERSION 3.5)'
+  '';
+
   buildInputs = [
     ffmpeg
     libopus

From c56fff34f9e28184c066447adcd272427013e041 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 22 Oct 2025 07:40:03 +0200
Subject: [PATCH 1539/6226] gitlab: 18.5.0 -> 18.5.1

https://about.gitlab.com/releases/2025/10/22/patch-release-gitlab-18-5-1-released/
---
 pkgs/by-name/gi/gitaly/package.nix                  |  4 ++--
 pkgs/by-name/gi/gitlab-pages/package.nix            |  4 ++--
 pkgs/by-name/gi/gitlab/data.json                    | 12 ++++++------
 pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix |  2 +-
 pkgs/by-name/gi/gitlab/rubyEnv/Gemfile              |  3 ++-
 pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock         | 10 +++++-----
 pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix           |  8 ++++----
 7 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix
index c17b59e72158..f4860607a84e 100644
--- a/pkgs/by-name/gi/gitaly/package.nix
+++ b/pkgs/by-name/gi/gitaly/package.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "18.5.0";
+  version = "18.5.1";
   package_version = "v${lib.versions.major version}";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
 
@@ -21,7 +21,7 @@ let
       owner = "gitlab-org";
       repo = "gitaly";
       rev = "v${version}";
-      hash = "sha256-kVFO8brtXWWGU2nWTtHR1q5RrTIXy2ssra9YjtWsglU=";
+      hash = "sha256-719FC9+OBX9Li9gkIpusFoZrpMyeDwCsoWxt9pfhI1A=";
     };
 
     vendorHash = "sha256-I2YMn84wEAY+Z02bmkyP/b0eix7FW3hP/noyEKYsEaQ=";
diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix
index e9ebdcf15885..9f57f4318c51 100644
--- a/pkgs/by-name/gi/gitlab-pages/package.nix
+++ b/pkgs/by-name/gi/gitlab-pages/package.nix
@@ -6,14 +6,14 @@
 
 buildGoModule rec {
   pname = "gitlab-pages";
-  version = "18.5.0";
+  version = "18.5.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-pages";
     rev = "v${version}";
-    hash = "sha256-7jMiKN2L4rF4YyqoJW8pzj5rP5g6ScwZ3qkY+OCZOZ8=";
+    hash = "sha256-UrVH5Ky5aiqquQ2o6bSkqLD4ULl9/vUViOoACantT1Q=";
   };
 
   vendorHash = "sha256-VWD/AXqEVWo7G9p1q1BM2LUNwAFmkPm+Gm2s9EPu6nM=";
diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json
index 59c57336b8f2..a9150fdb3e22 100644
--- a/pkgs/by-name/gi/gitlab/data.json
+++ b/pkgs/by-name/gi/gitlab/data.json
@@ -1,16 +1,16 @@
 {
-  "version": "18.5.0",
-  "repo_hash": "0r1q6byqv3zziwsw63z7km5jjap7q6222j91lnr048w6cf425n1w",
+  "version": "18.5.1",
+  "repo_hash": "0h80pzsfn6lb8mz8igbpkmazzj3kkdwhrqxazjq6g9zrsqsvydx5",
   "yarn_hash": "16f7r4v4mjjdsfbzy5vy1g18p0l3gnjvfvzrl2xrxdibx7a3b4xs",
   "frontend_islands_yarn_hash": "0kks9hzm5fq3fss9ys8zxls3d3860l1fvsfcrbhf9rccmwvmjn3l",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v18.5.0-ee",
+  "rev": "v18.5.1-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "18.5.0",
-    "GITLAB_PAGES_VERSION": "18.5.0",
+    "GITALY_SERVER_VERSION": "18.5.1",
+    "GITLAB_PAGES_VERSION": "18.5.1",
     "GITLAB_SHELL_VERSION": "14.45.3",
     "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.9.4",
-    "GITLAB_WORKHORSE_VERSION": "18.5.0"
+    "GITLAB_WORKHORSE_VERSION": "18.5.1"
   }
 }
diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
index 1e3add758495..a91f24c0e36c 100644
--- a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix
@@ -10,7 +10,7 @@ in
 buildGoModule rec {
   pname = "gitlab-workhorse";
 
-  version = "18.5.0";
+  version = "18.5.1";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitLab {
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
index 49c314934630..868611f74092 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile
@@ -331,7 +331,8 @@ gem 'js_regex', '~> 3.8', feature_category: :shared
 gem 'device_detector', feature_category: :shared
 
 # Redis
-gem 'redis', '~> 5.4.0', feature_category: :redis
+# Do NOT upgrade until Rails is upgraded with a version that contains https://github.com/rails/rails/pull/55359.
+gem 'redis', '= 5.4.0', feature_category: :redis
 gem 'redis-client', '~> 0.25', feature_category: :redis
 gem 'redis-cluster-client', '~> 0.13', feature_category: :redis
 gem 'redis-clustering', '~> 5.4.0', feature_category: :redis
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
index cf4481484644..5bbab0aec3a3 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock
@@ -1624,7 +1624,7 @@ GEM
       json
     recursive-open-struct (1.1.3)
     redcarpet (3.6.0)
-    redis (5.4.1)
+    redis (5.4.0)
       redis-client (>= 0.22.0)
     redis-actionpack (5.5.0)
       actionpack (>= 5)
@@ -1634,8 +1634,8 @@ GEM
       connection_pool
     redis-cluster-client (0.13.5)
       redis-client (~> 0.24)
-    redis-clustering (5.4.1)
-      redis (= 5.4.1)
+    redis-clustering (5.4.0)
+      redis (= 5.4.0)
       redis-cluster-client (>= 0.10.0)
     redis-namespace (1.11.0)
       redis (>= 4)
@@ -2364,7 +2364,7 @@ DEPENDENCIES
   rbtrace (~> 0.4)
   re2 (~> 2.15)
   recaptcha (~> 5.12)
-  redis (~> 5.4.0)
+  redis (= 5.4.0)
   redis-actionpack (~> 5.5.0)
   redis-client (~> 0.25)
   redis-cluster-client (~> 0.13)
@@ -2452,4 +2452,4 @@ DEPENDENCIES
   yard (~> 0.9)
 
 BUNDLED WITH
-   2.7.1
+   2.7.2
diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
index 1f5b15a95a5a..a109fcdc6d3f 100644
--- a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
+++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix
@@ -7528,10 +7528,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bpsh5dbvybsa8qnv4dg11a6f2zn4sndarf7pk4iaayjgaspbrmm";
+      sha256 = "0syhyw1bp9nbb0fvcmm58y1c6iav6xw6b4bzjz1rz2j1d7c012br";
       type = "gem";
     };
-    version = "5.4.1";
+    version = "5.4.0";
   };
   redis-actionpack = {
     dependencies = [
@@ -7579,10 +7579,10 @@ src: {
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1sj4b3j7i3rb5a276g7yyd95kji4j9sl6wmqfgpz39gx06qlni47";
+      sha256 = "0fsnfi15xiy8sal6av11fqfjmdmjpy93amf790i0zwqcf1iq1qbw";
       type = "gem";
     };
-    version = "5.4.1";
+    version = "5.4.0";
   };
   redis-namespace = {
     dependencies = [ "redis" ];

From 8d4def53f8b47ff199311650590e5aa34e99a3f5 Mon Sep 17 00:00:00 2001
From: Friedrich Altheide <friedrich.altheide@w34you.de>
Date: Wed, 22 Oct 2025 09:04:10 +0200
Subject: [PATCH 1540/6226] virtualbox: 7.2.2 -> 7.2.4

---
 pkgs/applications/virtualization/virtualbox/default.nix       | 4 ++--
 pkgs/applications/virtualization/virtualbox/extpack.nix       | 4 ++--
 .../virtualization/virtualbox/guest-additions-iso/default.nix | 2 +-
 .../virtualization/virtualbox/guest-additions/default.nix     | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index c14fb2a67ed0..9132fe88ce71 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -72,9 +72,9 @@ let
   buildType = "release";
   # Use maintainers/scripts/update.nix to update the version and all related hashes or
   # change the hashes in extpack.nix and guest-additions/default.nix as well manually.
-  virtualboxVersion = "7.2.2";
+  virtualboxVersion = "7.2.4";
   virtualboxSubVersion = "";
-  virtualboxSha256 = "sha256-sOY7+4VTJ67PESLNozOQwzc05f/tcvEj9e33hqjOE5M=";
+  virtualboxSha256 = "d281ec981b5f580211a0cedd1b75a1adcb0fbfcbb768d8c2bf4429f4763e8bbd";
 
   kvmPatchVboxVersion = "7.2.0";
   kvmPatchVersion = "20250903";
diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix
index 42701f6efead..cb3a6cea45db 100644
--- a/pkgs/applications/virtualization/virtualbox/extpack.nix
+++ b/pkgs/applications/virtualization/virtualbox/extpack.nix
@@ -4,7 +4,7 @@
   virtualbox,
 }:
 let
-  virtualboxExtPackVersion = "7.2.2";
+  virtualboxExtPackVersion = "7.2.4";
 in
 fetchurl rec {
   name = "Oracle_VirtualBox_Extension_Pack-${virtualboxExtPackVersion}.vbox-extpack";
@@ -14,7 +14,7 @@ fetchurl rec {
     # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`.
     # Checksums can also be found at https://download.virtualbox.org/virtualbox/${version}/SHA256SUMS
     let
-      value = "a7f5904e35b3c34c000f74e0364f1d1c0efdb126a4d3c4a264244959711c7f42";
+      value = "b80ee54252442ec025d6a7b2b9c3f32526ab5c2d91a0ffa2385be3ed83bcff0b";
     in
     assert (builtins.stringLength value) == 64;
     value;
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
index 654e9a78a867..61862a140ae3 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix
@@ -5,7 +5,7 @@
 }:
 fetchurl {
   url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso";
-  sha256 = "sha256-QkV0h/tfEXJl/kG/iypSFEnCz/dclQKdj2Z/fataRAk=";
+  sha256 = "66fa60b041fcda5d8b2ed22ba91bfafafaa3a5ff05c7d8ba01fbbe639669e153";
   meta = {
     description = "Guest additions ISO for VirtualBox";
     longDescription = ''
diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
index 642a4f59c770..510462ed53a4 100644
--- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix
@@ -12,9 +12,9 @@
   libX11,
 }:
 let
-  virtualboxVersion = "7.2.2";
+  virtualboxVersion = "7.2.4";
   virtualboxSubVersion = "";
-  virtualboxSha256 = "sha256-sOY7+4VTJ67PESLNozOQwzc05f/tcvEj9e33hqjOE5M=";
+  virtualboxSha256 = "d281ec981b5f580211a0cedd1b75a1adcb0fbfcbb768d8c2bf4429f4763e8bbd";
 
   platform =
     if stdenv.hostPlatform.isAarch64 then

From cdd8dd08081a752e1c3c8afc4168f2595da54638 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 07:06:39 +0000
Subject: [PATCH 1541/6226] dnsproxy: 0.76.1 -> 0.77.0

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

diff --git a/pkgs/by-name/dn/dnsproxy/package.nix b/pkgs/by-name/dn/dnsproxy/package.nix
index 422da13b90ba..cb2c9d252d91 100644
--- a/pkgs/by-name/dn/dnsproxy/package.nix
+++ b/pkgs/by-name/dn/dnsproxy/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "dnsproxy";
-  version = "0.76.1";
+  version = "0.77.0";
 
   src = fetchFromGitHub {
     owner = "AdguardTeam";
     repo = "dnsproxy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XbFa0KN5RYcdjXHKSnSs0ba+9YDFGZN/DafV4gOSow0=";
+    hash = "sha256-xq/lhwGyVvhKFQqwgtdomi/pZyrTShI60Sz/fEplEIw=";
   };
 
-  vendorHash = "sha256-87WXRBzV7ROsWAhtS8vcpvj4x1yIcFDaEje8inAqwoo=";
+  vendorHash = "sha256-Ti+dfz9f8xXpTmmVIUAuheBQzNnYUJ2QIb0IWotNzsA=";
 
   ldflags = [
     "-s"

From 2c92bedc5763e2b82387e74cddcad784d971f135 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 07:13:30 +0000
Subject: [PATCH 1542/6226] plantuml: 1.2025.8 -> 1.2025.9

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

diff --git a/pkgs/by-name/pl/plantuml/package.nix b/pkgs/by-name/pl/plantuml/package.nix
index f7ac77e03407..129f45843867 100644
--- a/pkgs/by-name/pl/plantuml/package.nix
+++ b/pkgs/by-name/pl/plantuml/package.nix
@@ -11,11 +11,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "plantuml";
-  version = "1.2025.8";
+  version = "1.2025.9";
 
   src = fetchurl {
     url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar";
-    hash = "sha256-KYOy8hJ62IBrLx78S2JLAMR2wuL18Ww+afVgPeKgWgQ=";
+    hash = "sha256-sQeOboLmTsHeT5Gk/hSBs9IsMMqiYrjThv7OSAIvyNg=";
   };
 
   nativeBuildInputs = [

From 7482508248066f7b9570b008af2563ce272523ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 07:13:43 +0000
Subject: [PATCH 1543/6226] gh: 2.82.0 -> 2.82.1

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

diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix
index 66585581547b..9f3881dfdcca 100644
--- a/pkgs/by-name/gh/gh/package.nix
+++ b/pkgs/by-name/gh/gh/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "2.82.0";
+  version = "2.82.1";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-0PheldNAlexi/tXHhhrPLd3YBGmcM1G+guicI2z9RYU=";
+    hash = "sha256-WoxPqrh8SLptoG3qRvJbNRSYJE3GMJE7KufwSLGSvtA=";
   };
 
-  vendorHash = "sha256-rVNKTr3b4zShPfkiEBx7LqVQY2eMrXo/s8iC5tyQZNo=";
+  vendorHash = "sha256-vO/r74h4GJB1q3u429Gto9B621EHZ9rhzHJWtWK6Xh0=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From ee13958ad2234eae15cf11b16a8ea978936211a9 Mon Sep 17 00:00:00 2001
From: Svenum <s.ziegler@holypenguin.net>
Date: Wed, 22 Oct 2025 09:17:26 +0200
Subject: [PATCH 1544/6226] clfft: fix build

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

diff --git a/pkgs/by-name/cl/clfft/package.nix b/pkgs/by-name/cl/clfft/package.nix
index e81f6aac8ceb..5c1ed6fba19c 100644
--- a/pkgs/by-name/cl/clfft/package.nix
+++ b/pkgs/by-name/cl/clfft/package.nix
@@ -28,6 +28,9 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -i '/-m64/d;/-m32/d' CMakeLists.txt
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'cmake_minimum_required( VERSION 2.6 )' \
+      'cmake_minimum_required( VERSION 3.5 ) '
   '';
 
   nativeBuildInputs = [ cmake ];

From c0731d8ae067f4a4108ca0d1e415a93455217e7b Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 22 Oct 2025 15:17:18 +0800
Subject: [PATCH 1545/6226] claude-code-router: 1.0.59 -> 1.0.64

---
 .../by-name/cl/claude-code-router/package.nix | 15 ++--
 .../cl/claude-code-router/pnpm-lock.patch     | 90 -------------------
 2 files changed, 5 insertions(+), 100 deletions(-)
 delete mode 100644 pkgs/by-name/cl/claude-code-router/pnpm-lock.patch

diff --git a/pkgs/by-name/cl/claude-code-router/package.nix b/pkgs/by-name/cl/claude-code-router/package.nix
index 435a85ea4cb5..5d4aad31b6f4 100644
--- a/pkgs/by-name/cl/claude-code-router/package.nix
+++ b/pkgs/by-name/cl/claude-code-router/package.nix
@@ -13,20 +13,15 @@ let
 in
 buildNpmPackage' (finalAttrs: {
   pname = "claude-code-router";
-  version = "1.0.59";
+  version = "1.0.64";
 
   src = fetchFromGitHub {
     owner = "musistudio";
     repo = "claude-code-router";
-    rev = "4617d66492cf37539d9567044f6ffec7844af2ee";
-    hash = "sha256-LC1JIOLaNLYNIIDofgFj+is4mwLjRjD3aAOt/nHRUmo=";
+    rev = "1a4462a92362e8c41d4539dc1a79fb85fccf9559";
+    hash = "sha256-q818e8PcKjdBqYk6WfGLKQ8pybXWVxmNV8KX7GjEQq0=";
   };
 
-  patches = [
-    # pnpm install --fix-lockfile --lockfile-only
-    ./pnpm-lock.patch
-  ];
-
   postPatch = ''
     substituteInPlace src/cli.ts \
       --replace-fail '"node"' '"${lib.getExe nodejs_24}"'
@@ -34,9 +29,9 @@ buildNpmPackage' (finalAttrs: {
 
   npmDeps = null;
   pnpmDeps = pnpm_9.fetchDeps {
-    inherit (finalAttrs) pname src patches;
+    inherit (finalAttrs) pname src;
     fetcherVersion = 2;
-    hash = "sha256-aPAY7JhzzYQero8f0/w3jtf5IwpDnoZCXGQKzRbj9aU=";
+    hash = "sha256-BLPGTbDvvI40kuXfE/p3+s9hkE0reXr7OJA6UGXN4ys=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/cl/claude-code-router/pnpm-lock.patch b/pkgs/by-name/cl/claude-code-router/pnpm-lock.patch
deleted file mode 100644
index b060b630d425..000000000000
--- a/pkgs/by-name/cl/claude-code-router/pnpm-lock.patch
+++ /dev/null
@@ -1,90 +0,0 @@
---- a/pnpm-lock.yaml
-+++ b/pnpm-lock.yaml
-@@ -356,6 +356,12 @@
-     resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==}
-     engines: {node: '>= 8'}
- 
-+  '@types/mute-stream@0.0.4':
-+    resolution: {integrity: sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==}
-+
-+  '@types/node@22.18.9':
-+    resolution: {integrity: sha512-5yBtK0k/q8PjkMXbTfeIEP/XVYnz1R9qZJ3yUicdEW7ppdDJfe+MqXEhpqDL3mtn4Wvs1u0KLEG0RXzCgNpsSg==}
-+
-   '@types/node@24.7.0':
-     resolution: {integrity: sha512-IbKooQVqUBrlzWTi79E8Fw78l8k1RNtlDDNWsFZs7XonuQSJ8oNYfEeclhprUldXISRMLzBpILuKgPlIxm+/Yw==}
- 
-@@ -904,6 +910,9 @@
-     resolution: {integrity: sha512-b3rppTKm9T+PsVCBEOUR46GWI7fdOs00VKZ1+9c1EWDaDMvjQc6tUwuFyIprgGgTcWoVHSKrU8H31ZHA2e0RHA==}
-     engines: {node: '>=10'}
- 
-+  safer-buffer@2.1.2:
-+    resolution: {integrity: sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==}
-+
-   secure-json-parse@4.1.0:
-     resolution: {integrity: sha512-l4KnYfEyqYJxDwlNVyRfO2E4NTHfMKAWdUuA8J0yve2Dz/E/PdBepY03RvyJpssIpRFwJoCD55wA+mEDs6ByWA==}
- 
-@@ -1026,11 +1035,18 @@
-   tr46@0.0.3:
-     resolution: {integrity: sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==}
- 
-+  type-fest@0.21.3:
-+    resolution: {integrity: sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==}
-+    engines: {node: '>=10'}
-+
-   typescript@5.9.3:
-     resolution: {integrity: sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==}
-     engines: {node: '>=14.17'}
-     hasBin: true
- 
-+  undici-types@6.21.0:
-+    resolution: {integrity: sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==}
-+
-   undici-types@7.14.0:
-     resolution: {integrity: sha512-QQiYxHuyZ9gQUIrmPo3IA+hUl4KYk8uSA7cHrcKd/l3p1OTpZcM0Tbp9x7FAtXdAYhlasd60ncPpgu6ihG6TOA==}
- 
-@@ -1253,7 +1269,7 @@
-       '@inquirer/figures': 1.0.13
-       '@inquirer/type': 2.0.0
-       '@types/mute-stream': 0.0.4
--      '@types/node': 22.18.8
-+      '@types/node': 22.18.9
-       '@types/wrap-ansi': 3.0.0
-       ansi-escapes: 4.3.2
-       cli-width: 4.1.0
-@@ -1386,6 +1402,14 @@
-       '@nodelib/fs.scandir': 2.1.5
-       fastq: 1.19.1
- 
-+  '@types/mute-stream@0.0.4':
-+    dependencies:
-+      '@types/node': 24.7.0
-+
-+  '@types/node@22.18.9':
-+    dependencies:
-+      undici-types: 6.21.0
-+
-   '@types/node@24.7.0':
-     dependencies:
-       undici-types: 7.14.0
-@@ -1956,6 +1980,8 @@
- 
-   safe-stable-stringify@2.5.0: {}
- 
-+  safer-buffer@2.1.2: {}
-+
-   secure-json-parse@4.1.0: {}
- 
-   semver@5.7.2: {}
-@@ -2054,8 +2080,12 @@
- 
-   tr46@0.0.3: {}
- 
-+  type-fest@0.21.3: {}
-+
-   typescript@5.9.3: {}
- 
-+  undici-types@6.21.0: {}
-+
-   undici-types@7.14.0: {}
- 
-   undici@7.16.0: {}

From 4b1026aef004d15648e255799de94f30adeb9e4d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 07:33:16 +0000
Subject: [PATCH 1546/6226] kubevpn: 2.9.9 -> 2.9.10

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

diff --git a/pkgs/by-name/ku/kubevpn/package.nix b/pkgs/by-name/ku/kubevpn/package.nix
index f7bd3d678bfb..b5354c6261ea 100644
--- a/pkgs/by-name/ku/kubevpn/package.nix
+++ b/pkgs/by-name/ku/kubevpn/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubevpn";
-  version = "2.9.9";
+  version = "2.9.10";
 
   src = fetchFromGitHub {
     owner = "KubeNetworks";
     repo = "kubevpn";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-iGharffqrN5Vh9GhoajRjh+2R6hevhvrjtH4WIUq8nw=";
+    hash = "sha256-5yuJfGWNEQ/1ufV1rVze2JrL/67/UlYdG2YH9i+gI3w=";
   };
 
   vendorHash = null;

From 93d6f018a2c692d18651182cf531cc63b029bbce Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 22 Oct 2025 10:46:27 +0300
Subject: [PATCH 1547/6226] crd2pulumi: drop myself from maintainers

I'm not using this package anymore.
---
 pkgs/by-name/cr/crd2pulumi/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/cr/crd2pulumi/package.nix b/pkgs/by-name/cr/crd2pulumi/package.nix
index f14c9851b715..56b61ba95416 100644
--- a/pkgs/by-name/cr/crd2pulumi/package.nix
+++ b/pkgs/by-name/cr/crd2pulumi/package.nix
@@ -30,6 +30,6 @@ buildGoModule rec {
     mainProgram = "crd2pulumi";
     homepage = "https://github.com/pulumi/crd2pulumi";
     license = licenses.asl20;
-    maintainers = with maintainers; [ flokli ];
+    maintainers = [ ];
   };
 }

From 5841e36b5d9190c4218b874463e386c98ca45401 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 07:50:31 +0000
Subject: [PATCH 1548/6226] openstack-rs: 0.13.1 -> 0.13.2

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

diff --git a/pkgs/by-name/op/openstack-rs/package.nix b/pkgs/by-name/op/openstack-rs/package.nix
index e680073a1203..be2db56c5724 100644
--- a/pkgs/by-name/op/openstack-rs/package.nix
+++ b/pkgs/by-name/op/openstack-rs/package.nix
@@ -9,15 +9,15 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "openstack-rs";
-  version = "0.13.1";
+  version = "0.13.2";
   src = fetchFromGitHub {
     owner = "gtema";
     repo = "openstack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wK4CDG0W8cI+64wbK4PMvDy50b0WAktmJo+7Wf1ucjQ=";
+    hash = "sha256-90yuCPUS9yv2UbPOPj+aE8s3qMJXsda41uoMRAVYQ1g=";
   };
 
-  cargoHash = "sha256-q1Q4GBWmdjIpjyN2wH9baxtgwvF6gG0aaqqVDn1ji44=";
+  cargoHash = "sha256-qUCgRCfCuu6bSSlUsY18QQHIOtOwwPyYnA2sCpuf10I=";
 
   nativeBuildInputs = [
     installShellFiles

From 2ce85badb9d1fa01df96b133447eea1b7113552a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 08:04:52 +0000
Subject: [PATCH 1549/6226] thunderbird-latest-bin-unwrapped: 144.0 -> 144.0.1

---
 .../thunderbird-bin/release_sources.nix       | 794 +++++++++---------
 1 file changed, 397 insertions(+), 397 deletions(-)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
index 450d76559632..5df2cc543e16 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix
@@ -1,1193 +1,1193 @@
 {
-  version = "144.0";
+  version = "144.0.1";
   sources = [
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/af/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/af/thunderbird-144.0.1.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "64b6dc451ad7755b6687b748c7f000eb3a1900993e5ee565d2c8fcc81ae55ad2";
+      sha256 = "2eaef7a844b0b96fd1e9db361245baef31a4e7b2afb60b7c76d2cf3a8ac58d80";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/ar/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/ar/thunderbird-144.0.1.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "a8b9d9c52705349d783c6f4e755ad13238958a9acc188420d2bf6bdca73b7346";
+      sha256 = "2d4b293fc767a446e2e4ed25e732628a0117b0bfdb9ee09375a283a061faef39";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/ast/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/ast/thunderbird-144.0.1.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "ccf4cabcb100fd192ccb38353249ebd85e5cb2826631be27284c55b66447b22a";
+      sha256 = "5bece4acfa5fbb551d253ceade81c464b97ccb235cf3c7bd2277de752f8da2c4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/be/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/be/thunderbird-144.0.1.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "f631939aad56cb3b2152ba7f3b061923ffad2dbe4648cc9d19ab863694414cab";
+      sha256 = "a9654f6e0dfc6c5dfbaa63725390edc2a3d5b7fad37f3b8800124d4c0b29fdfb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/bg/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/bg/thunderbird-144.0.1.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "7c968c11820d71389a30de41228d61d81801a7b8f33d14a2c48cda3d02eeade6";
+      sha256 = "c75bf9947d561ce28282dac114dba20907adbb64b9df04b30d41f5964b9ef888";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/br/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/br/thunderbird-144.0.1.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "a068c9d0bd597ba67dd8af9c6d16ffeda3c63e8f3f03f2c07dee0cafa280e472";
+      sha256 = "00f643b8057c385d8b806b9d51645eb50722eed77efe0a21caeeaf1ee14583b4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/ca/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/ca/thunderbird-144.0.1.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "1804824fbe7befc738f0a113a92890e492f87392099b58c67faeffa672100eb3";
+      sha256 = "9229a0cea3fd7ee22531d9e38913e742cd98692c4ba7a85cc8dd585b7fb5cbb1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/cak/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/cak/thunderbird-144.0.1.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "174f63ecf4d5d305b9da0cf1308c8cb996871db645153ce90cd8ea0d5537bffb";
+      sha256 = "8c22440c075a9d64524dd713d8c9a8817505325e7172368a3b737b2b74ccbb6c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/cs/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/cs/thunderbird-144.0.1.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "9cab8cdaf3e202ea9ebf8c65d2ab84d171e1ee616c0465e9a08ed7dfe0aa9e70";
+      sha256 = "8ac1be7213a0630c1bbfdaa04991d159171466ec81da5fb13c1391ca39cdf50d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/cy/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/cy/thunderbird-144.0.1.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "f5841c61608104c8d984977adb4a4836604236c5699a0e9b619058f13e124043";
+      sha256 = "c4e59f830f548d1ee0c9a08cb7ee8c9b36dcc96fbddc5b6448dbfbf53cf50907";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/da/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/da/thunderbird-144.0.1.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "dad290f498e8e9f6613995b51ca049263458506b46cfb6ef1c62cc21a54750fa";
+      sha256 = "5c985a7adeb9b01f0a2b2f90dde73b7c09f6c333d280072931de8b8e19c556e8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/de/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/de/thunderbird-144.0.1.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "c99ceedac5f41b4405ad8a916d9d39979185d59925848131070899d4fd9b2ae4";
+      sha256 = "cac38327aafce3819998a5b71c210cbc757fec9e61802255a39c3534df41a94b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/dsb/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/dsb/thunderbird-144.0.1.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "07a66bbd9ecca1932527fbcb6de5a890615c6c86efb436cbe0a17e11b25d488a";
+      sha256 = "69ad7365bdfea6652d2cc2c7f2950269d9cd7bcc6c51ed8726d542e29cb08ef8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/el/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/el/thunderbird-144.0.1.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "cd5dda184b5d798a17d559f4c161ddefe17f6211d59369a71222dd7b5faa0e87";
+      sha256 = "e172680c3559e08b2ace167a38db61099e952431f8906a25c09cd79e528c517a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/en-CA/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/en-CA/thunderbird-144.0.1.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "e2f29495d9cc253a0aa0219d95b632b5eae9c838c4fc9e32a6329ce2f32f9a13";
+      sha256 = "f11f685a168af61710f311cfaeb7df205c88dab1772b71c35819fb2c9c1dddff";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/en-GB/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/en-GB/thunderbird-144.0.1.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "012a7e12ce533d2f92127deb6c667497bf99355ea7dff0151b68fe7e59b09671";
+      sha256 = "2822e047a90dd3ef26d792c7fcee69822f799d74205ac37cc59b9a53f6915af5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/en-US/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/en-US/thunderbird-144.0.1.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "77fec4c6299459d9acf15e45146fcdee2fad70bfb4d9c4cc7b296cdaeb932445";
+      sha256 = "bc2f1b9b09d3c4a9e66667862f9ee629b0e000c65217f7d4592f7654bcc7f957";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/es-AR/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/es-AR/thunderbird-144.0.1.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "2cbfd53e1735b9c91660d260728de13dfd1694a8a2d928f8cc8c61633b3da67e";
+      sha256 = "d601c69a1c486231cf30d4676f7e75b96ad3043c365e0a1f96f93c54af7b8b85";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/es-ES/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/es-ES/thunderbird-144.0.1.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "645382cd83c34e17b4800df4e98b557a230f65ef100f5e016f700ce64ec3793c";
+      sha256 = "7e439bc19094917e96a1f30a196f6a7cacde0356d33edc0dbc76d2c0ae04324f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/es-MX/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/es-MX/thunderbird-144.0.1.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "898765f72080a2c3c3bd5ccd8b6d628e5a5129aff4f813d7f516188b8ca52b91";
+      sha256 = "07992bb01703d8d0d4faffeca8b4040a7a778aea6b685237ad6374287d644fe9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/et/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/et/thunderbird-144.0.1.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "32df4bb595bd162cfbd5e099f755c339914bfd462e191eb225910a6abd15f75e";
+      sha256 = "ca9637f6efd47004c51dbb6ffc25873eeebd401b1a6adeee7c6718274c282278";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/eu/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/eu/thunderbird-144.0.1.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "736db365e8f10bdd6839a21e005e9d3b700735e85faae66b26b079f88573df6b";
+      sha256 = "8b79818c1183471034b8e15b10dee3b709e1b6b6de25e56900514fb1867bc1ef";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/fi/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/fi/thunderbird-144.0.1.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "73d3b87e59ffcfa9bc8d32f015886194d3955790d19c0660c703d1cbdb4349aa";
+      sha256 = "30319f1d8a64d1d5cb45a8e4b48e08f3acccdfd2cfd9098f985570a7ad15fbf6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/fr/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/fr/thunderbird-144.0.1.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "44d362de98f6d3d673fda3692cb80eff0af40848ccbc38c25eb8c02087c15795";
+      sha256 = "4ea5b46400eb21716bba08c8ff5a476c21b7e2caebceae23ef0f8a0ae3f89a9d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/fy-NL/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/fy-NL/thunderbird-144.0.1.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "d24ba14620021f7c5848e97f53951c039d07a9e7851afa1187a00ef78ddb09f9";
+      sha256 = "4c358143bde9419c986d91571f473211fca571dc5e86b08884fbc644e6e09dfe";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/ga-IE/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/ga-IE/thunderbird-144.0.1.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "fe12da58fe9b6b5e8f5aa50376c7bc9bcb8ad5a666213122511029f23e9a467b";
+      sha256 = "1a2d20d1ac7f5aa1fa943fc2293d032fd803b96434d2b71274c8b9409e244169";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/gd/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/gd/thunderbird-144.0.1.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "abd0f4346209b093cbaa008d195f7d20404bb2b2e4274ef1140908a81a27620c";
+      sha256 = "0f017e22289d4e58085eb281a488466231b387d8ef0dfdb6c23700619335b28c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/gl/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/gl/thunderbird-144.0.1.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "94eeeea9c14a74ca1bfc4d093776b5b2d0fbafc354b374b2e3a8d7891a4506d7";
+      sha256 = "d3968b0c9bd2c3ca67225f4da13c740b8060d14d3167cf02dca7280c1da8c800";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/he/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/he/thunderbird-144.0.1.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "9da1e67050e09c91fb1566f7dd09e412e5bfb76c2bef67fc27eb5ededba008e7";
+      sha256 = "e91bf4535535053defa087edb072b4532a963206785e9928ce2be6bd4f2f8c03";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/hr/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/hr/thunderbird-144.0.1.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "b45cdf60ad18487011dd1671f192f5909bedc0e88ba773438993c515f96c4b59";
+      sha256 = "0abd3881f98b25c4460f74cb314b105f296a79b98be95a3e393c3b1c7827c5ee";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/hsb/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/hsb/thunderbird-144.0.1.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "11e78a663837bcb64951d6e3e12e4afd2b0b5e5a3f383b41908999312f6fd35d";
+      sha256 = "e1e691da2d35c1028c03578b7eb1e4c27f525a327e069d6e905221092935bd37";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/hu/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/hu/thunderbird-144.0.1.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "205e72a59fad2fbfaff1d1662b04cd9375cbf126d82127305fd843adc316de6f";
+      sha256 = "8f081961c4d726b42829832b67762c9890cffa245e05ec6dd83e18883da7e3ff";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/hy-AM/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/hy-AM/thunderbird-144.0.1.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "4b60e04cf513d51a3c8bf4ce446081bc24e56ddaa61286ec85353a0103452e36";
+      sha256 = "22c8c53ad7e35293334663269066867e263f1c0cda1b130e72a9091040181a5c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/id/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/id/thunderbird-144.0.1.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "4cec6a5ce2472a0410aef50c4eb97b534208360de85c820ca255ef96196b81ee";
+      sha256 = "9e475931040eda58e861e5b445fdca66d23808328514d5139f59b20184912424";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/is/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/is/thunderbird-144.0.1.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "e1fe729f4d3a58b24c264c8908a363e745f958bdaea7a5c02c560008b09e03f7";
+      sha256 = "b998793160c7052d8a85a21009c442a2faad834ef174c1271c5bfcaf8d849b50";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/it/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/it/thunderbird-144.0.1.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "248eb088bf5786e9a5c408590c840389f66c3ca4d867880461b42ea284ace29a";
+      sha256 = "730958edd5452e8a2b6fcad37d09602b3f6c8fa8c345cd9c24154f864a83b7a4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/ja/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/ja/thunderbird-144.0.1.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "76ade0fde1a259b948b9322368047e5f419b86a8e81665692095353f285728cf";
+      sha256 = "4ca93d071f8cb63941e91615bb34df822644db0ba654b46b249dbbb3611068e2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/ka/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/ka/thunderbird-144.0.1.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "919611522061033378113333edbc8c829895b38d4173a317d34b3ebb0142bf97";
+      sha256 = "9ce2c43ac9db1eac62afcb7f704f51395c97937504412a9c6f20fbbaaf179c2d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/kab/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/kab/thunderbird-144.0.1.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "975cd73e2fb0f8f87689ae0f381539623cccdcff6bc684a4101757483bd8b2ad";
+      sha256 = "fc75310b68369d00aaf8369d640dbe3ea51cc6272985ba8a6cfd8e1cb711a140";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/kk/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/kk/thunderbird-144.0.1.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "04fdbb418c445d47b04ad2c0f3687a98d11541ef758a56db8b589ca8398b8d3f";
+      sha256 = "4aaff43f29ded8eecfa21537062ee64162cbd2b603814d08a8379c9751f3afe0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/ko/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/ko/thunderbird-144.0.1.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "6c87465f073a5c11ff13a2676bc7fdf1ad2755ba20c5a1049a3f084376cfa86a";
+      sha256 = "f95a153a913bc74ff410ceb25d4955c55d386a920c28fe137aee94bc2dedc7f8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/lt/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/lt/thunderbird-144.0.1.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "2548bc0e99cb8471a2a03968644c66fd9fdb97812b39a6c25f7392d358ab2b34";
+      sha256 = "a28d27f6357a0c918fe21f666338c845c66bf1fd337b45bcbbf325fe9212e1bd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/lv/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/lv/thunderbird-144.0.1.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "3946f71022a5084adc62f8f717a5ec9b99d20f6a0cd275491b8a24c483c4206c";
+      sha256 = "4353343e330518fe144b9064fa1af0cebb0c43fff3776ef4ee55193d4cefac2a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/ms/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/ms/thunderbird-144.0.1.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "f74a790ff549e08deaeb70d1a016eca3d3ff8e56b96a0ad1d9353060b6c33201";
+      sha256 = "c970d0bb2e477f1aac161d50c3028fb5e05d3632cebc9c86ab6be1b10fc3b3e6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/nb-NO/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/nb-NO/thunderbird-144.0.1.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "b7460007a5cbbe32262c77acd61eac53a0fc83a81cdd8e5e81841e930c6ac6f6";
+      sha256 = "c31c05863ebca12a8c1e0edabb628a4f75643f536f13863291ca5512848edfcc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/nl/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/nl/thunderbird-144.0.1.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "84f8d779314a962688b89286a36fec55fb8579503915e90ec446dd354c879164";
+      sha256 = "aeb5af8126b8e4bc9d1cfd9d7708d4359e4c2119296c480a82bbbaa07a938056";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/nn-NO/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/nn-NO/thunderbird-144.0.1.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "c97854ed2b13ce24e2cec92db0343f6d12db1f8844341185f759df6183d74cf3";
+      sha256 = "1467647d4315070308a160b12463c327feefdbd1c5995c00b2484662ab61b279";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/pa-IN/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/pa-IN/thunderbird-144.0.1.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "00cca464af192d974727652c038a98453ca97aeb978d6efd27d413b62c69f40c";
+      sha256 = "241b275a831862af53758690e86549e7846ced0aff23abf0ec7064a71983b6d9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/pl/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/pl/thunderbird-144.0.1.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "c1e2946f724f597191d64e6e954fdf74e57fcffadec495f983daf7b44a54d057";
+      sha256 = "087470f8d19ae0cf148323f0144fb389be373490ec4d5506194959cf341b84ae";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/pt-BR/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/pt-BR/thunderbird-144.0.1.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "2d02f8bb0f4af9a27725811ab7fa660cb5035ec8b163708c8183842d7bb28e27";
+      sha256 = "6f441114b414be6f65747492022fb3aa51120c85a7e2e46a21409776ac97862c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/pt-PT/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/pt-PT/thunderbird-144.0.1.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "7d7af36bb2054b66a06c181c16d0419d2e25daa7fe7eee149cdc70458d32268b";
+      sha256 = "e1715feedb2c0d68863bcf231fdc0b73bc3e9450c1e10ab4c6ad3a19c1f56e09";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/rm/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/rm/thunderbird-144.0.1.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "ddeb17c40fbbacd42881391ffb729b1470785ff574fffc44133b94e81d9e1da7";
+      sha256 = "106e92fbd6812fd42dc8bb6e48d205ff130a8b95cc7d121e88b63df5df2aac00";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/ro/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/ro/thunderbird-144.0.1.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "05c835ed0f876d5f284a7d3b8be1e7c5bbfd4eddcb504d88cff31b1f2032db7a";
+      sha256 = "dee95f50515f305cd17d5d4ab29b57ebbcaf790717a0c9d070a2b3cfea091c0b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/ru/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/ru/thunderbird-144.0.1.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "c577dc115ed9e497f8374a20b73d7b646262fb74c0febbcfdb312e3ed74ac318";
+      sha256 = "fa3e951752051baf68869fc3b9e8361be26a8ace3f683b46c9035b4b9b296a46";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/sk/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/sk/thunderbird-144.0.1.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "c4fb9e20a5f676c3130fcef7ffda30214a81a0aa7543f93aca9ea42aba606af7";
+      sha256 = "db57519f1254039333f48145b22531f7eae00ffbafc857fb70b7cb979d008b3e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/sl/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/sl/thunderbird-144.0.1.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "c50e7decfb5cae2cb000805856d8d7d568825a1a67790f7b38be4b58f59018d7";
+      sha256 = "4a465b766f799f37cb484f1b7aeafec72e22faab9c74262b33ccbc4c5906be8c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/sq/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/sq/thunderbird-144.0.1.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "baf0e9c92535e46fd087d3b59bf4d048d71b7b4e93447240091a4641c4de0afe";
+      sha256 = "f9ab51bc21b0eee776498f2f3a16a7b73e31cc4e48a26fb52367d7a711ad210f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/sr/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/sr/thunderbird-144.0.1.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "9baf41acbfe92c13c6e9f57c4af19920f3915a78e7fc70609c854504f238127e";
+      sha256 = "c0a625270bf3647c187bb8872b0400232bc3fb30fe5f1a936ef7fa61b555b3f1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/sv-SE/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/sv-SE/thunderbird-144.0.1.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "5268b829e1a9e0306488656a9b3a6fb9eb95db9904c80621aeb308318821a114";
+      sha256 = "82f806ffec3073d8526a2486f85034084f2cb95552bfdcb9e7e22cb1098617b3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/th/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/th/thunderbird-144.0.1.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "2931612764305e940ad686e5f7c554aec660f7c1a5794834bfcd51283be23e88";
+      sha256 = "5f7621438f0bb8924f7b6109764201d0f0662af8936762b7bccd2d7a8d1267e5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/tr/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/tr/thunderbird-144.0.1.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "9d0ab4f018bc19e15800364dce841219ccb579925cfb727bffd4d59bcacc4573";
+      sha256 = "e9d0b46c28a46d250595939c7d460871dfc42d3f970f0aaa9cb9a367c632ca63";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/uk/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/uk/thunderbird-144.0.1.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "3771a41fd3fa8e27bd0b35bdc0a239104f6fce440475b14b5f537f1de7cad185";
+      sha256 = "4fd49301a6c85c7563e6d6a69802af6fb6e3f93e64e7068d15eb14e4a5b05742";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/uz/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/uz/thunderbird-144.0.1.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "296d8309901bbf558325a99e666010f16f32a11af704dc784cbc7fb6d08569b8";
+      sha256 = "3f76efe4502d19f91b07263dab1f7f214affdea2aaa183758b751a1059f1bbbc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/vi/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/vi/thunderbird-144.0.1.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "d0af2ab6711853cf08ff07e88cb3511ace6e3f75197acfefd5b5754729cf0abb";
+      sha256 = "e6865a6dcc0fc7910639347fb67e089a40fe3798f98b6799c969f7e7675c518c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/zh-CN/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/zh-CN/thunderbird-144.0.1.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "a745853b3e1c9bd6ee068b11cfa6ae715d8a043506e7d7a1d4fa988ad9aeefc4";
+      sha256 = "3a46a1b47717f127c9839419c05f72a52b4668d821603130e75a17fbc28beb4f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-x86_64/zh-TW/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-x86_64/zh-TW/thunderbird-144.0.1.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "5965e7b0c0f466885fcbd1b33a76e67cc7444be7b7f01d2e46b61ff53f208c61";
+      sha256 = "e93bccca9f943112c59994da68836bb1e79cb466994b895cffd77aaa1d86a355";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/af/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/af/thunderbird-144.0.1.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "9d6249ddcc4153d7908556406500fbed9f0317bf1b787a40b3924b7676a3695a";
+      sha256 = "8d87c551127f928af2f7d312a22e63dc32fa42f429102e44ff4d438326ec0f17";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/ar/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/ar/thunderbird-144.0.1.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "b8e306139a4306abf5156db940cf1bcf52ea65abfd2d276f1d217acb43ac5e78";
+      sha256 = "dbeeae3590792c4368aaa128b617c7fd4abd2dd5181a81e03ee271cef3837bbd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/ast/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/ast/thunderbird-144.0.1.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "23b7039b46aafaf2a07cced9346b42333efc0fd35fa3e205eaf5b96b09896169";
+      sha256 = "f12289f26fc49199ea4dd3873f0126c2cb24eeb19a19345691596b90064d3249";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/be/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/be/thunderbird-144.0.1.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "14ebe9f846d75e6386b255a90f88ca568f61f47f6899fe09abed492d978b5f25";
+      sha256 = "70e81a825b6a0fdc2fbd58d1a1308d3aa8b7c2e3b2a3f39f87f7de410a9a6948";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/bg/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/bg/thunderbird-144.0.1.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "a1136764f004266778fd43843924fee0ee25f993646f3740cae2d355d3086b86";
+      sha256 = "945ad45745ce69561471f0ee7648683dec23d7b3c58483bf99ec40dd9452349a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/br/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/br/thunderbird-144.0.1.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "a729e2893e3f0db1da769b82cd38c35a547f67a15a28ff56a1c8a0d7485362a1";
+      sha256 = "cb83bf2b71c696945c746c6b0d4bb7dc4d49b50331e6468a701c486dd9fd1779";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/ca/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/ca/thunderbird-144.0.1.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "8659e4aa1ef5d0e9bb7eeabf67d2d2b44b837bd96b90d1e8f9bc9e1766fb3cf6";
+      sha256 = "2b56d9309155df32d9e5493da7c8668308fe79f889613f90f567b856e99eea96";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/cak/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/cak/thunderbird-144.0.1.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "b26b0ab4bc0ba1f0bef52dfff2a6f9182ba8612a8c6e6c10d4773a9fd402d83e";
+      sha256 = "1a6452216f161b7926b7d5856bef87220733821b76708d7fbf16870c380b0142";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/cs/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/cs/thunderbird-144.0.1.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "c90ffbfe5d2b9f0b1712acd5a069db34abcde929972acf500da10d3fb3430d72";
+      sha256 = "23e791a9f4108b3c84aa8bf17b323ef276682527ee6123b4eb4038e328c97cd3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/cy/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/cy/thunderbird-144.0.1.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "36c5112eb8b69c6083fa4dbf808344b79e299d516ad5974ce531ea17c9394b5c";
+      sha256 = "18d6608e99db288aebc42f45b207ac53405f00c7131eec2fbdaca3e43addc058";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/da/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/da/thunderbird-144.0.1.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "bc4a5a8e8ec64bf550ff3bc1e08c0cd86b1bafd8b5ba3b75e814b4e853f2370f";
+      sha256 = "d08828cfc4ad0f9e21cfe308eb0f3ee5d2af1a79691ac2d11f2fea97d887de88";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/de/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/de/thunderbird-144.0.1.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "8789362a9b6e2e10103c2da76e2d4b6deac10ce79b7464f1ee4d08c3fb2ea43f";
+      sha256 = "5881bf2aff7e355e4e60f3e1a73ccdd72f31f19981d31cd870dded2de4203bab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/dsb/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/dsb/thunderbird-144.0.1.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "ae534c06013437099dcd10dcd742bf999a53b024849c1dc164ba2f829f811299";
+      sha256 = "e7bd39bd050ecbbf8f38c6bdf4bbb92de16af9ea53206dd2df38eb4c69dbdcbc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/el/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/el/thunderbird-144.0.1.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "928bf686dbc212e5015cbd616944749343f101d587a0494add805a1bb778e933";
+      sha256 = "eb8e4f41eb19988d3d1b6f750b82ec54930a8f95c75d9c5792707711323cac05";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/en-CA/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/en-CA/thunderbird-144.0.1.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "4cd4294ab2a9e54cb1a6b7146c87ced6b3d8c50141550652baea9bd57e6cdc59";
+      sha256 = "d738c83c17a3f62aaab1dca4d83528c0e657a67fc44f939f69c0a4b9400df9cb";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/en-GB/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/en-GB/thunderbird-144.0.1.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "8c5e59fa9ff632887406527be4ab81b65696dc33a128a122196ecfd3dc8a442b";
+      sha256 = "869ccc308fc3da57a3027a4c1d60687406f5cc827d701b0e0970a08e66ed4a9b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/en-US/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/en-US/thunderbird-144.0.1.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "3571ef6cc41f9a0387294ef837aa492d7c820a6181678ec3127afbe01b18f43f";
+      sha256 = "8ce035d6bb82841e051c05664dc365e3ac056115d4f48a724fcbb008a8d56a31";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/es-AR/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/es-AR/thunderbird-144.0.1.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "d750b5ff5a20455573692830f43e76642e3d68d447e6ccefba21b8d797acdb11";
+      sha256 = "f67a33d6bcd8bc85ea271b1f0ed6b5293ed3635a915180478aaa186989336007";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/es-ES/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/es-ES/thunderbird-144.0.1.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "d9172c8dcb8954371c775701de43c37bc4b6bfa104a590398340574d547b9b7e";
+      sha256 = "502f9ed9f9d17405af499220dcf299af7be9f8ae90776d6c140aaecdc3535dda";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/es-MX/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/es-MX/thunderbird-144.0.1.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "bd5af1904e26a5342e178acf3684d3cb27e69cdca11203a2b954299000b882c1";
+      sha256 = "d6772acdef3faf5c4de5de5fc97ae36f3ea8ef1083d1097224c34edbde76e465";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/et/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/et/thunderbird-144.0.1.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "c5dc6a226758112d81969ef1ca44d52528df33b32324350718ccefd1c512d76b";
+      sha256 = "39fd78ba4ea9895e37133bb26c62234437513f43871e46e58b5cf6dc58efa32e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/eu/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/eu/thunderbird-144.0.1.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "049277bf518da3cfa5454f94de38b0ca772f15522696a6d4b6b43a8cd96bc8ed";
+      sha256 = "fd4cff6039fc8d452955013c0d2268ca2d5b62e0a914fd3e74067129a2638989";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/fi/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/fi/thunderbird-144.0.1.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "d5b62f5df0d896f37ce6dc89a361f1ca9586342874c768e00a39eaadd16eba1c";
+      sha256 = "057eefee02f1a4dbb1f931537a83514d7b4bde5555f240c033e90d768f96f455";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/fr/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/fr/thunderbird-144.0.1.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "7ccff5fe2c3718c9e08a34b71c2f24cb650f63c99dfa89e104863b99d54a1af0";
+      sha256 = "c8c615a8d2d01a06aa4e8621b7fc093130af76dea0c8285bd55d37e4a6a64648";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/fy-NL/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/fy-NL/thunderbird-144.0.1.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "40c51bea5ab2b7193387fdeaa217cc05192237ebcf88de6c7563155a1abb5176";
+      sha256 = "1718a343ac13458231a4888247b5f29c53d77d5cec08ebdcaf4bba69b5851ac5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/ga-IE/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/ga-IE/thunderbird-144.0.1.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "181b1763591a5df60afcb96c639e06bff27a0a21358f5469c4ff6d1496d98b6c";
+      sha256 = "1bc195ef047cacb03e594196c0fc8d2759b1dea9f14e068476298f86f4fa9e16";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/gd/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/gd/thunderbird-144.0.1.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "7cf8b4fcae7ed95b12f82508f201397768078f3388125da4213a115912497fe0";
+      sha256 = "ba937f7fc0297150aaced07bc3e2979ae22c20bb071f89bcdfb3e875ccef9b7a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/gl/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/gl/thunderbird-144.0.1.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "1711d7433f6dc436ba09b1d94282cf2e51cc4e6ebe0f79684822f57b83a7a985";
+      sha256 = "8f89d7f2d94b84642f7e567a7a9e5984334d6c521e50cea707d2c35703c9cb57";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/he/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/he/thunderbird-144.0.1.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "143bf963dffcf2620481180d07a4fbbf5555f074108903a5421c35ebd97f058c";
+      sha256 = "3e62d0dba485bb147f0a28b6ce39aee49243d8fe47fa220fe6ed7f36aa292133";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/hr/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/hr/thunderbird-144.0.1.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "fb49d4b0ae6f1cbe7f4d8f336505028563e25668475c40289426cfd8193a7ca9";
+      sha256 = "64c96845d9e8f28cf5cb213cb601be5cb6dbace58720863a936c071658e52c9c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/hsb/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/hsb/thunderbird-144.0.1.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "ac77a0c5ad0a764ce6167f55dc33bcccf66028379cec14138fd5b2bfb6ec6f37";
+      sha256 = "657bf6ad82a32de00fec9f4b17b6355b76cc8ba7f8d727ec517e1867a947042a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/hu/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/hu/thunderbird-144.0.1.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "44b1ddbbf62c55f27ddd78ee98ef702fa53113139ff4f2fff6190fc2a2c7434f";
+      sha256 = "4cfc559d502b6e0d5de49faa207243ca20aa3282e14924297b6e447e7a78858e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/hy-AM/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/hy-AM/thunderbird-144.0.1.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "41ca474b3e6683071f0d21d0bf5a266d8271e811077ea5a8451e25f3ce41b8da";
+      sha256 = "86adcfefb98752cbb4614623f63b672e4b57d00903a411a3491a028866122b63";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/id/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/id/thunderbird-144.0.1.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "84b083df08b7363d403b17425296ec20067b9600e5e73d42ec3c8d511fc32be7";
+      sha256 = "260022085fee9bca54ac3dbea3f754d155f2c06834d6594487d55d59576d8662";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/is/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/is/thunderbird-144.0.1.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "36ad178e06b746fa9c4d2bbeac208450137dda892bfff5e22440629424e120a0";
+      sha256 = "610e5837ca0922f094d5c60e86c3696c6c57f290f1d89b97ea2aa9de3d703954";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/it/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/it/thunderbird-144.0.1.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "a133fd33e4b8cd59144997e2021c0940d68fce72c51ffbb47d1832048ac3a323";
+      sha256 = "c9f1d50e01225745adee7119aa1e56d8a9855a56183e2ab611586a24e3da9b0a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/ja/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/ja/thunderbird-144.0.1.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "9ea73487f8e95f7ade00fa69096df68b4760480ce58b83511dd1aa1e55c55946";
+      sha256 = "e87a2ddb57d1375196492482eebb30fd8af9714af5104545e21e3097b2d59fa9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/ka/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/ka/thunderbird-144.0.1.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "d3eff33c07c4daea97312c52226ecc5ec42a97bf985cda71cc744622960c2425";
+      sha256 = "2c4e2e6a4f547c338710179676a7111c1a373c3e26e899662b518b5c728c7547";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/kab/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/kab/thunderbird-144.0.1.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "bbe510efba183d0c9aadd85afd582509a173a5eba5a7abf6f9d008e4d2a95312";
+      sha256 = "3985cbcb10d181d199121ae409e4cca9abc8931af7ad836e9e6519fd792a99ae";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/kk/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/kk/thunderbird-144.0.1.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "237af8177e0ccf5f5bfc18669e5fb57ce992f71a257f8f08086873ac87415b0d";
+      sha256 = "6b9d554a13d9e8c32fdf6aca42646b4f86180270d93568e3cda30af1f21014df";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/ko/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/ko/thunderbird-144.0.1.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "428a3d2529ff57a673464de5518493eb56c286615e7d01eab01aeaf5f2604db8";
+      sha256 = "5f7e7decb4cc20e6e8911b8caef0d3db5b7a5a7ac3fd357aefb6abf445acd28a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/lt/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/lt/thunderbird-144.0.1.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "f703e6ab802df82221b978d3de3e2e3f187d5a71ee232ba8729e37d80d9e1064";
+      sha256 = "11c01efbaebe0b698ea2acb02c6d0cd4d6ace36efc92bfb5331630be528aeb96";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/lv/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/lv/thunderbird-144.0.1.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "bed53df3edc278c93e08b54aefda760046f5ee8e82f4c874d35d8eb394ac50ae";
+      sha256 = "500a3e9a1ae0214cd7c6fdd7adeefdb324330fe3cce33fd5138c6338ac8d5e97";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/ms/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/ms/thunderbird-144.0.1.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "bfa64af3ba3181ca6c20bd82af942c86765cff0355831c1c311da94f1ac524b1";
+      sha256 = "4a7b22c3e59a895693c48d50e17afd29a7d30cab1064a7b4f4873bdfac74e1e1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/nb-NO/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/nb-NO/thunderbird-144.0.1.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "0c3bfad564524d3b236acfd7bf6018b8d0c4f77657fd666adf9b3899e8777a72";
+      sha256 = "bfe89c74b7ae95eb9e4ea75f6887bb9ba702ef963504f761f8ac17fda3146c75";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/nl/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/nl/thunderbird-144.0.1.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "c0e25bcb8b0ebc1f9b7eebbd4b9e1bb8795092a40e1c9449e7dc4fff9f1891bc";
+      sha256 = "aa82158433a38a5e3f7789829b72ecb90d2a077c1c8fbe0114ccda2b50196f5a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/nn-NO/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/nn-NO/thunderbird-144.0.1.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "8e7f9dd16280c1d0607290d4f14f1e39c200d6f20a0c1bc5cf18cda979be481a";
+      sha256 = "6b9190f4de5721e72c218b91a091fc70a1ea572b4dfd9f5e7a37060f9c80b94c";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/pa-IN/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/pa-IN/thunderbird-144.0.1.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "656fd0bdd94ed929f3f02841b7c8ada0786ba16932f37aa3f42c50d6acc29835";
+      sha256 = "987577b397607ba06925ed5c4778e60f5d4ec90df0a24fd78350afc3a4f40272";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/pl/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/pl/thunderbird-144.0.1.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "0aae5ed6b45d3660b5469694f53467442d6385bac93b1c1f504886311ff898a9";
+      sha256 = "47faac054b19425840029ea4ad7c5189542a0998311d08eb115e4b3859e0e50d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/pt-BR/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/pt-BR/thunderbird-144.0.1.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "3cca3fe5c91dfcde348f23c1d2161557279368ded091212f76a2282c9eea2c53";
+      sha256 = "60253469a4d479e45fa036230808f079356dbc31608ae94198b7ec2b5fe87bf7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/pt-PT/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/pt-PT/thunderbird-144.0.1.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "f19a1bd9c55b49934c2e232a00f389d1dbe4c209e89e57e011b30c537d6d8f93";
+      sha256 = "458ecf5e00aaeaa417ba77fe3803a43f906fdab788a51f3e19a86502fc2c8d63";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/rm/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/rm/thunderbird-144.0.1.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "8251c7303b588649260ef4785c9ddab038fb4d355fafd11a796cbb472df30e64";
+      sha256 = "f70f7b4da88a69f4ba1318bf4cadc4759abde316af6d6791eab9404189997a9d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/ro/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/ro/thunderbird-144.0.1.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "8b9a654ea69c8b1f82cd73d89a44651ea45bb9cf8e63facb28934e53e361a6d6";
+      sha256 = "001d2f0acb268549bf35ea9f68139c462d41be5e58fce20fab61248a50585e69";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/ru/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/ru/thunderbird-144.0.1.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "eafd782bb64e5aa6b41f12a83493b6844a1768f6600f216784d34c1cd67e0041";
+      sha256 = "47db9c0e8be8629516781fbae5efdcc5f0845200831d0c7904b5eb6bdd2415cf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/sk/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/sk/thunderbird-144.0.1.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "151f29136030c6b17c23e80a7a57d21faa3cf14485e7476754ed6c6627a9843c";
+      sha256 = "c92e424ca762cad2be6a16e9a478b66bf2c6aa1f4fdc6e6b8a945d8c4ed07b55";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/sl/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/sl/thunderbird-144.0.1.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "88668746c8c65e38be23db075745e08a1670bfd2187fdcda653cd0330d384c6c";
+      sha256 = "9bda88037c11717a805a414a56c587b3f661a1493da934d00d80703ebd5ef275";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/sq/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/sq/thunderbird-144.0.1.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "339aa49f8cb94493cd6bae2b84e599ac7acf3e671ed49be2dc859bdb275b4255";
+      sha256 = "349052077ce905897589e237a94c97730ed7e3f50adae9f00d80d3ccfe7ac1ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/sr/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/sr/thunderbird-144.0.1.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "5b445d49a89729c9524d0203786036693ea3538a3ba6b39f01a78e6816de747e";
+      sha256 = "1c88f68d61c95acabc6d4893af53a524f081b51bc9e77032b2e7fd4969fefba8";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/sv-SE/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/sv-SE/thunderbird-144.0.1.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "5ae480e28197a02e142270a6eba47b2ffb5e7a776249882cedb8dd8af55ef969";
+      sha256 = "e5f7748667f16460ebefbda113a6d7eacd8f27e6e119475cac7d341c77835a18";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/th/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/th/thunderbird-144.0.1.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "9ba2dd890d9f723424c833c44e84cdb6613fc70bef901144d1a1fb4e2bf15d5b";
+      sha256 = "25ca184c7e3d9ea560bfece7696f0b57685a60ae2174108bb3ac7bc09eeef8ab";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/tr/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/tr/thunderbird-144.0.1.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "58cfd32d386f92ecd48c58012d15e1c8de9877f09f1d1bb1f265b4ebe124260f";
+      sha256 = "4edbd170c9121fddd7656576b2314642350495dc1091cbb46a22cb9b91175332";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/uk/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/uk/thunderbird-144.0.1.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "b0824946e3a3f3d10a557a65d795c8ea64368d07610f4d6c11f1e4959762785a";
+      sha256 = "a187c1fa157f7d03b61fff62bafc11504dc0740de7071a8c365c3a44c3def2cd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/uz/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/uz/thunderbird-144.0.1.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "97bb50b38cc8229ecff8c38dd84246156577a2d19c848f533360a0aa0724edc6";
+      sha256 = "d5e660266413f432bcfd4516fca0ff8c819ed8c37faed1a70450758e3ed39aaa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/vi/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/vi/thunderbird-144.0.1.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "ee0b32cacf8c82d341c65af5028a00bf2ad5db8c794a0bdc0e79270863e0afa6";
+      sha256 = "d895b83095f1868c61518d235129309bac5cbb4fb01211772984221bb5ce488d";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/zh-CN/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/zh-CN/thunderbird-144.0.1.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "7ad9144a1f58ada2776b98c3a4f6c48ed70a1e3d6ddb60e36d57e52b2a8da0ec";
+      sha256 = "4769aeb54e07535f8aa579258b6277735aece5dd28981f02082dda2d31f4ef54";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/linux-i686/zh-TW/thunderbird-144.0.tar.xz";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/linux-i686/zh-TW/thunderbird-144.0.1.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "1bb480f7160d414f7a93d843327e6c26690f556e3fbdda167a13aca613425900";
+      sha256 = "5a5bcf60c84a3f33af891e90a24a9455d88fbe0b4f5dd4b514b8baab9dda6a05";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/af/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/af/Thunderbird%20144.0.1.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "d5faf90a03cdb56f41f83ffef2e58d4688a7aa30d72f502058414f4e8045b497";
+      sha256 = "50707c752c5ce123afc26478fac24fad8622d3a55e5ba533d66af091d28de65a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/ar/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/ar/Thunderbird%20144.0.1.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "f6e2fd543511e33db960b77c4bda8085d5dfda2f3809aaa76f37f99d0768cd54";
+      sha256 = "df673e63ac5722b2da586c63c7a0f840ad9fb0fe184bca23127d774956c6ba84";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/ast/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/ast/Thunderbird%20144.0.1.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "0acb463cc769c3198b58e907629f8f7e411647e8c8a25df16beb22b7cea5e6e6";
+      sha256 = "657fa539d3616f1c369279869e72853cf55c483091cf3eb0315f2dfc9f322fd1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/be/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/be/Thunderbird%20144.0.1.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "8c50d7f9a71683fe3eb1dbddcc26e751178297923989dd95ef725fb2f1086120";
+      sha256 = "12e7cdbf669eae2f0a6f0e662fc06f74276fba74b7dce7823c34f82ce2c616a5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/bg/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/bg/Thunderbird%20144.0.1.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "7aadd4182f78407db485a1e30aa000d2a312733bf825bae2e313f6968e55e927";
+      sha256 = "6975acc34c2e8c08e1b44d05793efabc34843ff56cc8c76291e0f1809d9888e2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/br/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/br/Thunderbird%20144.0.1.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "28f2f03af1c4550344c5b7278d4b05975330c8e7d12322d47e4e2b1d97645bb2";
+      sha256 = "97985e5d3ef7bd31cd457530ff2719b8caa162517dbd4b4fb6c6e5d11db78bf4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/ca/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/ca/Thunderbird%20144.0.1.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "ec896e83af2a1dc63fd8184fb9f2f44fdabe5442aa8bef017e0e7832ab222a26";
+      sha256 = "fc1eeb6ac4f1151b0f7d4c7ab8f7bcc197bef4e6b9b3761bfafa7c23e27b1838";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/cak/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/cak/Thunderbird%20144.0.1.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "06bc5bc973b109b6104bf5c24a1ddb0a3c7edd74cba48df871ebb512b7106240";
+      sha256 = "27063f6a6d0c5f50bbac34076e2dfd5340d84567223265eb92da067ea2076f1f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/cs/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/cs/Thunderbird%20144.0.1.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "21c97a17ca04cb4ab254333f55eec1ef5ba7d1429cfd219ca88ee7f37939b0e3";
+      sha256 = "9b230019117857a585aff0cdd0ecbe72fe47bcb4b9067a66292dbfd5aabaf767";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/cy/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/cy/Thunderbird%20144.0.1.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "5dc2d6214244f021211b51260c8e93d6794b2cc228f520d23e913977e2c8333a";
+      sha256 = "11fadeee8c4d2df4ec0d3f7e207b6e86c8e93c1ce43885a4b6965c871ed1c282";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/da/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/da/Thunderbird%20144.0.1.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "c56bcae49797f54953fe20cdf47c40f5e80e5c679fa3e242e8be1a3cb2223cdb";
+      sha256 = "259f8901a03776317b72da8ff6638a175f701eb0eae3f556600d49f23807c4e1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/de/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/de/Thunderbird%20144.0.1.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "f06e39b024533cd6fe6c85bbab3b3a1023a606b5ef2e8218d44edecb3563cc22";
+      sha256 = "aa5272e750450b125fbd963a6aed81428007579361d6918489368c0ae421886e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/dsb/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/dsb/Thunderbird%20144.0.1.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "9eae4a657d0e7ae9ecc424b011b8cc2be679b7d3906f6d20501620e1ea280574";
+      sha256 = "614331a903e45f09050b46b77c795eb738e4cee8e1af4607e69677e832560ee7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/el/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/el/Thunderbird%20144.0.1.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "0e6ec59993fd235d82b1daacd48caec372690a41be9ded90cce0424a9068a4fe";
+      sha256 = "75319feaac6353b5d5181d8419222b8dc6788e9b58c7560f0b233bbd6cafcf89";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/en-CA/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/en-CA/Thunderbird%20144.0.1.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "871e3d928956c272966f40d7b185db9d7da823203eecafd3b5284bef90f7c3b4";
+      sha256 = "8f6e71257b09084dcb863539cf3d804774ec4129431dd52306d3964cfa60c8b2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/en-GB/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/en-GB/Thunderbird%20144.0.1.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "45da6b70eb58365997cd290b494f5b6a0753bf778cac332c4c1e655de95e3e4e";
+      sha256 = "a70bc82bf7d8a5be669c3184d53a31864fe2b133c69b0d394db10b753213d2c9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/en-US/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/en-US/Thunderbird%20144.0.1.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "69cbd7b9caefcc64737ea9af07f7bd3cf80419a8aeaa8d1a1b2d9ebf9df2c400";
+      sha256 = "4123ab05561df67d256953dcb914f94ca669489852c71c9bbdfc63fe7f62bd82";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/es-AR/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/es-AR/Thunderbird%20144.0.1.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "51271d663f2be274b6cf737be5f2fa68e769ef1e020fe982d0e4be73ae1f24cb";
+      sha256 = "fe7ba2b4232a9d777acc983dcf3f9d7478c6ba900354c48e10279321c4a4aac4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/es-ES/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/es-ES/Thunderbird%20144.0.1.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "0dc774267e6b17bc699f1002335ec84bfc03b7ad70c3b4f9ca54dfb7ee7462bc";
+      sha256 = "76f2d93fdb799a0aed7661d249e9d91c87d5a403b08e4e0374a9f1e0552e5958";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/es-MX/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/es-MX/Thunderbird%20144.0.1.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "47f74d79f979545758cd21305c9f9333cd8aaf34d3361855df42ec0ad7699ef2";
+      sha256 = "955833013658aee3e9348f6a7759b14eed107b79a8700bc868c04769eba20f4e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/et/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/et/Thunderbird%20144.0.1.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "fe56dd4ce0c64ed23eb8c89a6c663ce7795de4f61e2204052a402983998b01dc";
+      sha256 = "4498db08bace5d6ba58bc7c77b13bbe60c2d1b31262b1fe1f76d205f76be64ad";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/eu/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/eu/Thunderbird%20144.0.1.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "5bebcd0180929ea4c7a24a0431cc48cf8880dfab24f73d17832b5288937091b4";
+      sha256 = "13fb18ac26e231da7873473156ebb95a5d43b186c1322783fee40dd121391abc";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/fi/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/fi/Thunderbird%20144.0.1.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "8dd265080a4f8d4bb6731cc439b5da7ca254e96ab8aa38ef3cca8b3ed3400ec6";
+      sha256 = "553a67509868d4fe6ac579dc21272eb7a07e27942a6f65fe4411ddf70a84119b";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/fr/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/fr/Thunderbird%20144.0.1.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "c2366efb4f666f995c9cf741f1d5cb2058690d2de89d32fa777fd8892ceefdd9";
+      sha256 = "f89b49f4529d4037541b654b0462854ea79c178ecab4110cd23f658c8236bc43";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/fy-NL/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/fy-NL/Thunderbird%20144.0.1.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "9478be90105467afe2924a2c92c0d1412d7a114967a4843d2558ad4d9621e680";
+      sha256 = "648dfc6c384734bbd9965d4c514994fa9837be5a2aefd1404eac0c737be6a89a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/ga-IE/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/ga-IE/Thunderbird%20144.0.1.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "f8b7ae0adefda81075fbb3d7ac35cfa2ab4aa71d8ffd970e77e4299915e795ea";
+      sha256 = "763c0d2ca92035b2e887fa5f09d1c10532bd8e1dad7fd45af5d49f1d9e1aeb32";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/gd/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/gd/Thunderbird%20144.0.1.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "1d4bad6e6c0720e8dd6d196a52e3a2e07e393fae6a2e07217d9744dc5c4c0158";
+      sha256 = "9d6ad8dcd65767271fad6f4ec759360ae5e84b15d3852851765d010e6b546c6f";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/gl/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/gl/Thunderbird%20144.0.1.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "21e930ee36571ed91d3cb969155f7e479090dc4d68ee5acd851c1f4123e5a182";
+      sha256 = "0209f3c446b2e29792318c71e983869fd683ad0b1daddc36d568b780f80cbd29";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/he/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/he/Thunderbird%20144.0.1.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "6ec022464b20281c8cf3a8dc3d0ebc8d4e508d30898c730c85f42228470bd3c1";
+      sha256 = "235dbaf8fbfb9d4e02c6fa732ede8668265f5c3f2c5400b014cb47821e68dc09";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/hr/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/hr/Thunderbird%20144.0.1.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "02889cf5566e883f59bb28edd3c34ef6c4991d81f7da17085ee2339229d8bb9b";
+      sha256 = "55a47d9f0159933313c0d25e8e97509e35b972c1ad672a6f4dd76f7e861b32f1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/hsb/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/hsb/Thunderbird%20144.0.1.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "feeb385552441cf3b026e46f3c72552fa7937a372708b54ff149f094f4f2b0a4";
+      sha256 = "39a90b407058e349792217026cf391a62ed8c88978e6e175973aaa83451f12d3";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/hu/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/hu/Thunderbird%20144.0.1.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "1d78241c8802f8128e5b6eaa53a65d7ab7bcd4a4dd452ec16ed91127b136949e";
+      sha256 = "9fb24545d83a80f23d0c94535f77257cb5df6f8db3d312e2902ab370845bb2f1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/hy-AM/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/hy-AM/Thunderbird%20144.0.1.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "81037f29d4f4212bfecca2c54f6e4e074bb631688732b8bc2e3b4d0d560db820";
+      sha256 = "44b5e96ea52157f6f537d5e9ce013aac337cdb89167d80e362e26fa8883622e9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/id/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/id/Thunderbird%20144.0.1.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "832a38aab976ffd8a556ff48b880885609eae7e68fc4e635c410c3c0ca6de91d";
+      sha256 = "abd62036a090d55136f320eba57333df867c3d5543d7f1522ec352939c905713";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/is/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/is/Thunderbird%20144.0.1.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "a700e605d04a485e8bf9f2b61d8cddced4d03bc8d74df116c8ab7ca8ad356760";
+      sha256 = "c719b4ed5eb4983051155b91289618cd96c61a1bb64d74a74dd4e566776a3f55";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/it/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/it/Thunderbird%20144.0.1.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "0d6e4450829f2d7f8afb20c7f63b717904b3fdf0050206b25eba40e387af5ad6";
+      sha256 = "8617593f1b979a9ecaa78cb4965ff84df516c460c3d8d2566ef06583f4d5009e";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/ja-JP-mac/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/ja-JP-mac/Thunderbird%20144.0.1.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "7ae27553fd0cc3afc9547ebc8695e4598fedfcfdbad6c5c18237d15f342b69e7";
+      sha256 = "f5d0be7a510700e178c67309c60553056f739208de0eb81560ed243a0934aab6";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/ka/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/ka/Thunderbird%20144.0.1.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "3380b4637f982f09bb0c878eb5f4fe4019bd72199db6812ca907daf6d196c767";
+      sha256 = "2ea0aed9890263214c10109703f38b0ce93259a70c90e5ae90a7de2b53d5e946";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/kab/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/kab/Thunderbird%20144.0.1.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "649678ef4711c0f7991797fefa856d228f45ffe6331eaaf27cdc012901eb4814";
+      sha256 = "1dbbe5ef5f622e1fd4c412a94351ea9eac5ac3fa9d5d7b3ac7c630113f166442";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/kk/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/kk/Thunderbird%20144.0.1.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "f8b9feeb1a679573ad5c331e3656360e93353d36cebb8b9ea094322377a32a67";
+      sha256 = "836b3bde5a9b926798213db199a4db85c7c720029a1c4ccd6fd0896e59d7e188";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/ko/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/ko/Thunderbird%20144.0.1.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "66d96796f19b066ab77c8f93355d05c7094e45fd82a7f8eb784f8624a77538a0";
+      sha256 = "2c76b53abd508079176d9901ba5a4afdd44dc5ce54844b98342600f1cc02f6bf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/lt/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/lt/Thunderbird%20144.0.1.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "93d53aa4f10194ab5d30e01425171483950c834a04cc21bde74ffd5379f6fcb0";
+      sha256 = "3bac44098ab4c7b28496a8939fa9a5649b305cc9425c406d78cf60d2135d36f4";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/lv/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/lv/Thunderbird%20144.0.1.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "8ac6318cc2040fe51d64c5f771aa20f79d77102ad63538334905c805a5de356a";
+      sha256 = "d3482f7a5e1261e73d54ff7ffdb928e66813a90b0f1f94166930fd74a3fdbff9";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/ms/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/ms/Thunderbird%20144.0.1.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "018c5e2306acc47c66ed1400056b7f3b5defc49310790e0529a015fa905e2503";
+      sha256 = "78ef6a32739fd239d8c81ebcc1bd932ce4c6380e895a66106f6bb6a5ca13dd35";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/nb-NO/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/nb-NO/Thunderbird%20144.0.1.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "80594aa81db677728426fe8fe816ba29d9dd5840604a4939a562671ed0585a93";
+      sha256 = "25224fa9365ec7735f4937a6ef12c97d0586a621b18394e82514aa398b8a2ddf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/nl/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/nl/Thunderbird%20144.0.1.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "8ce3f122454297962f2084bc3d342f5c578b4f82190428d20ed8db968118a5e4";
+      sha256 = "5b217a285a068ad49b95a64db3b6f618bd6dad054baaab3dc87cf2e021a97edd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/nn-NO/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/nn-NO/Thunderbird%20144.0.1.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "c2fbe4dec2ad367973c76e6592d3572c85cc7142362bb81d089a045df4c1221f";
+      sha256 = "4257d101741b23fd4930c4617627e4990a5695a4e5847efa86660b9c0b3ddcaf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/pa-IN/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/pa-IN/Thunderbird%20144.0.1.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "942666771510e52e15610374fea74ead504799816b31a76ad4bd308b1e2ac64e";
+      sha256 = "b98f8a371c9917c0e8068e314ca0bc478935eacdb88e393523b733e6c0b19920";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/pl/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/pl/Thunderbird%20144.0.1.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "9ac1a606b3a40395501420cd2f6e0148e6d3c0322d66fb242837f58cde18abb9";
+      sha256 = "4dae823128c5aedfaf4cc5f5d43e657bd15e5702838bc1de61b5e5df2d75ecaf";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/pt-BR/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/pt-BR/Thunderbird%20144.0.1.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "0f7c1b7df7cf7de476827434994e1c346a1c648a1c6e9dda8ea408ff2138c1ac";
+      sha256 = "a6424d3b36bae7b9bac4e03453823ee2ecc9853fad02c5ac5fd2b5a39c84bc25";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/pt-PT/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/pt-PT/Thunderbird%20144.0.1.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "9f9e9348c27381a20305d46d4dae69b39c308736eb37c0f09be81ec39fd06677";
+      sha256 = "e259cb6c33d3fdc4d589e2e7eda963325f17430f52157b82e2ccdb38ed6260a7";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/rm/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/rm/Thunderbird%20144.0.1.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "34d6bb0f5c9a5951b94b816df23df50180ae2a498287dc0264f35ddc4763b8f2";
+      sha256 = "dac16df1214df18a401421c3628984a403d21b23e979b4e7a5b33ae6dee181a5";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/ro/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/ro/Thunderbird%20144.0.1.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "d2d9c0afb817054c44416cd19fe36cfb8e20edc885016a08061c6dfeef0f6595";
+      sha256 = "ab51b61453707c00a7278b9008f349ed1e23261993837655d563ff01ced93cf2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/ru/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/ru/Thunderbird%20144.0.1.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "e1930d4e76a8f4751699ce133c4c997c3e871c780163a3777e61d0b8485c53fa";
+      sha256 = "17bcce9b523f57aa8acb70458061fe79705e72747cefdff6155da4e34a5f6189";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/sk/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/sk/Thunderbird%20144.0.1.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "fc149c6d7a7c2545b66fdc2852417436e77dc1ed4dc5b0d9f673310c12ca4c9e";
+      sha256 = "7681b5c664d1a2b81d5bd6adf1b11891b00aa55cccb63ce7c3e5a1bacb652d72";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/sl/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/sl/Thunderbird%20144.0.1.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "6db6d1af6b16dcaf1afdfaa2158562fb931bf94c7515f08729f18c357308455f";
+      sha256 = "a5c3def0dc36de407874b70640043c8836949efdf90093109d6053c840882ab1";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/sq/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/sq/Thunderbird%20144.0.1.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "ceb7146dcd7b87e6d495001a8149eb161368a2c23e5f027dd77cf984466a64f1";
+      sha256 = "5d3a2118f5002ddb88fcc2e8e420b43229aa6e7be2ee7bef865a8bb8e9a7bae2";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/sr/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/sr/Thunderbird%20144.0.1.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "3c24891ada8de8a76938c97c4d382569bc1889338734d290e726c846b5884704";
+      sha256 = "f51aa78643ccc4c5fcc3c2f0be107f20df63e4a06274dff01ad30468729a95bd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/sv-SE/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/sv-SE/Thunderbird%20144.0.1.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "5e89e781c43db35dd680e03fb3dda56059a3f154e5b22e346b5a6521c19c7e89";
+      sha256 = "895cbf0d4a9ce7778a17bce6939832b38e7e388f72363f8e902b6797ad71cf8a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/th/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/th/Thunderbird%20144.0.1.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "bc6d978045506b60862646054bb344f3613f8fcaaaab6737e5d8274bb8b97b9e";
+      sha256 = "5146cb8f18b9bc96cb1e398d232441fcb25b3cd41a425d2825387d865e2197e0";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/tr/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/tr/Thunderbird%20144.0.1.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "48625313d9c39f84f6fd1a7a5e32dd50420d7070f91101788929869aec01ce00";
+      sha256 = "584194757dfb731b845c995ee710714b55e3fa442e010724976326a26c6ad5fa";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/uk/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/uk/Thunderbird%20144.0.1.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "2bfd468fda91ede44c8c2b32b1e04bf231715e8c578b9b8e0ea59e0bffe74069";
+      sha256 = "fe9d57bb5ba05366b294e4f5181f79d3c0a8a5e62514d741844dc24e9734a918";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/uz/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/uz/Thunderbird%20144.0.1.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "4669144f645aee7a595b206bca8fdc0c3f5a096b28da272af0af730d7559572b";
+      sha256 = "3f4f64d3c15b940be52a269043a5c245addf52370f0ea7938b7654364d8ddc7a";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/vi/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/vi/Thunderbird%20144.0.1.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "a384eb8aee07146dafe4b7ec1ee650b5573dc5f3644865148cc2ffa948c69bec";
+      sha256 = "0d96bf5ce3b0a1f5ed31219a55c165c33cd60e4e51b9c50fe7b747d43d7b7491";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/zh-CN/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/zh-CN/Thunderbird%20144.0.1.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "605255c9a0fba4e69bddefc0760ac4cde102c7ceabe0b1637230aa15f3b0efe9";
+      sha256 = "5c80d9ad363d43f29a706ebedbafb47e39de04da402d222e316deafbc649edcd";
     }
     {
-      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0/mac/zh-TW/Thunderbird%20144.0.dmg";
+      url = "http://archive.mozilla.org/pub/thunderbird/releases/144.0.1/mac/zh-TW/Thunderbird%20144.0.1.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "b4867fea1ceb5b6063271db15f1f635b06bbe06cf185d3bb0fcfdfab03e3113c";
+      sha256 = "a26c5d121f630f75f546d996096ee4edcadd26a0b7d7d796089d318761a3093b";
     }
   ];
 }

From 31abe2775bc139c8f263efa0cee0a04e1a656de3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 08:08:19 +0000
Subject: [PATCH 1550/6226] python3Packages.pyecharts: 2.0.8 -> 2.0.9

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

diff --git a/pkgs/development/python-modules/pyecharts/default.nix b/pkgs/development/python-modules/pyecharts/default.nix
index 22a55c389e53..06f7db4eb268 100644
--- a/pkgs/development/python-modules/pyecharts/default.nix
+++ b/pkgs/development/python-modules/pyecharts/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pyecharts";
-  version = "2.0.8";
+  version = "2.0.9";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "pyecharts";
     repo = "pyecharts";
     tag = "v${version}";
-    hash = "sha256-Aax/HpYJRrfituiAIT7Y6F9v9tX9EmVXtr+4R98tces=";
+    hash = "sha256-AMdPsTQsndc0fr4NF2AnJy98k4I2832/GNWeY4IWSRA=";
   };
 
   build-system = [ setuptools ];

From cad26e44ca96766faf1966beec0c9acf796858d5 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Wed, 22 Oct 2025 11:06:52 +0300
Subject: [PATCH 1551/6226] maintainers/team-list: drop myself from ACME team

I haven't been really active there for a while, and am not in the ACME
github team (anymore) either.
---
 maintainers/team-list.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 9708249e5fdb..036a2eba1cff 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -37,7 +37,6 @@ with lib.maintainers;
       aanderse
       arianvp
       emily
-      flokli
       m1cr0man
     ];
     scope = "Maintain ACME-related packages and modules.";

From e1ff0357f8c3d6b2cbc2b5cfd99e4226c25d1b20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 08:14:03 +0000
Subject: [PATCH 1552/6226] tombi: 0.6.33 -> 0.6.37

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

diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix
index 3ae9850b5285..fb2da8295749 100644
--- a/pkgs/by-name/to/tombi/package.nix
+++ b/pkgs/by-name/to/tombi/package.nix
@@ -9,19 +9,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tombi";
-  version = "0.6.33";
+  version = "0.6.37";
 
   src = fetchFromGitHub {
     owner = "tombi-toml";
     repo = "tombi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-K8r+AmIOD0WjC7U4x0Xr6KUiGMykk9lHQs38MIKa4MQ=";
+    hash = "sha256-oQx38k/ANf/+SA7FZqw8tQejt4WQd5yPPgcMEuFcUGU=";
   };
 
   # Tests relies on the presence of network
   doCheck = false;
   cargoBuildFlags = [ "--package tombi-cli" ];
-  cargoHash = "sha256-dz9AtZTCKSQuk9LpNVSxx/yLIujzG5U4vE/OdapCqvM=";
+  cargoHash = "sha256-bj+d03asqABk4RphtCPQoM8E36Hb26yzAhSMIgrg7DI=";
 
   postPatch = ''
     substituteInPlace Cargo.toml \

From b52ae9a7e69215184e4f5ad956d2e0a2a62343d5 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Wed, 22 Oct 2025 10:14:14 +0200
Subject: [PATCH 1553/6226] bun: 1.3.0 -> 1.3.1

https://bun.com/blog/bun-v1.3.1
---
 pkgs/by-name/bu/bun/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix
index 971ef0f69307..9311c7f83886 100644
--- a/pkgs/by-name/bu/bun/package.nix
+++ b/pkgs/by-name/bu/bun/package.nix
@@ -17,7 +17,7 @@
 }:
 
 stdenvNoCC.mkDerivation rec {
-  version = "1.3.0";
+  version = "1.3.1";
   pname = "bun";
 
   src =
@@ -87,19 +87,19 @@ stdenvNoCC.mkDerivation rec {
     sources = {
       "aarch64-darwin" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-aarch64.zip";
-        hash = "sha256-hYSOP5ZIHvyr51pQD9O5S5u5VoaretCjiSl2x74VA2o=";
+        hash = "sha256-ronylWETMwdRWqPdpdXv3R6dJod+yFtPGAABNDGqmO0=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-aarch64.zip";
-        hash = "sha256-aLfc2Go159XhVrN+TO9LSrbWs3/SF5VwwOgV8TiQ/r0=";
+        hash = "sha256-ZWZqGEOeiR5XUbZmED/lkahRnxG2bsS9hlTFUV1P/4o=";
       };
       "x86_64-darwin" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-darwin-x64-baseline.zip";
-        hash = "sha256-RWGVArQmNX03XFnxhgbqTKLC1ZQoyG9EKZUKHP7oahU=";
+        hash = "sha256-pILjoY8BpW13NvpuQXjbNdoeVr3cgjJa10jhXKAdigs=";
       };
       "x86_64-linux" = fetchurl {
         url = "https://github.com/oven-sh/bun/releases/download/bun-v${version}/bun-linux-x64.zip";
-        hash = "sha256-YMOdkri9CQYnUkyYswEvDAjciQJM/ap8nJjLX9Q1k3Y=";
+        hash = "sha256-QAgkyCv8wIVDZbytoRz1PXOE7LHiw9oOLAosalJ9Vik=";
       };
     };
     updateScript = writeShellScript "update-bun" ''

From 11c89b1a83fb83a297b80f9b0764b0cdcc98f507 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 08:31:56 +0000
Subject: [PATCH 1554/6226] calibre: 8.12.0 -> 8.13.0

https://github.com/kovidgoyal/calibre/blob/refs/tags/v8.13.0/Changelog.txt
https://github.com/kovidgoyal/calibre/compare/refs/tags/v8.12.0...refs/tags/v8.13.0
https://github.com/kovidgoyal/calibre/releases/tag/v8.13.0

close #453932
---
 pkgs/by-name/ca/calibre/package.nix | 36 ++++++++++++++++-------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix
index 28652699dad5..56642f9be070 100644
--- a/pkgs/by-name/ca/calibre/package.nix
+++ b/pkgs/by-name/ca/calibre/package.nix
@@ -38,27 +38,31 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "calibre";
-  version = "8.12.0";
+  version = "8.13.0";
 
   src = fetchurl {
     url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz";
-    hash = "sha256-ZY7FXpJCWJ3495SPW3Px/oNt5CkffMzmCb8Qt12dluw=";
+    hash = "sha256-31CFoVkXXks1NdePNOvFklfJFT36kmLL4vsgDnTaXyQ=";
   };
 
-  patches = [
-    #  allow for plugin update check, but no calibre version check
-    (fetchpatch {
-      name = "0001-only-plugin-update.patch";
-      url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/0001-only-plugin-update.patch";
-      hash = "sha256-mHZkUoVcoVi9XBOSvM5jyvpOTCcM91g9+Pa/lY6L5p8=";
-    })
-    (fetchpatch {
-      name = "0007-Hardening-Qt-code.patch";
-      url = "https://raw.githubusercontent.com/debian-calibre/calibre/debian/${finalAttrs.version}+ds-1/debian/patches/hardening/0007-Hardening-Qt-code.patch";
-      hash = "sha256-V/ZUTH0l4QSfM0dHrgLGdJjF/CCQ0S/fnCP/ZKD563U=";
-    })
-  ]
-  ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
+  patches =
+    let
+      debian-source = "ds+_0.10.5-1";
+    in
+    [
+      #  allow for plugin update check, but no calibre version check
+      (fetchpatch {
+        name = "0001-only-plugin-update.patch";
+        url = "https://github.com/debian-calibre/calibre/raw/refs/tags/debian/${finalAttrs.version}+${debian-source}/debian/patches/0001-only-plugin-update.patch";
+        hash = "sha256-mHZkUoVcoVi9XBOSvM5jyvpOTCcM91g9+Pa/lY6L5p8=";
+      })
+      (fetchpatch {
+        name = "0007-Hardening-Qt-code.patch";
+        url = "https://github.com/debian-calibre/calibre/raw/refs/tags/debian/${finalAttrs.version}+${debian-source}/debian/patches/hardening/0007-Hardening-Qt-code.patch";
+        hash = "sha256-lKp/omNicSBiQUIK+6OOc8ysM6LImn5GxWhpXr4iX+U=";
+      })
+    ]
+    ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch;
 
   prePatch = ''
     sed -i "s@\[tool.sip.project\]@[tool.sip.project]\nsip-include-dirs = [\"${python3Packages.pyqt6}/${python3Packages.python.sitePackages}/PyQt6/bindings\"]@g" \

From 4a0348758ad8cd5a953a8850c89f6dc964aa96d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 08:38:00 +0000
Subject: [PATCH 1555/6226] namespace-cli: 0.0.442 -> 0.0.443

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

diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix
index 45ff827a80c8..a1366cd36737 100644
--- a/pkgs/by-name/na/namespace-cli/package.nix
+++ b/pkgs/by-name/na/namespace-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "namespace-cli";
-  version = "0.0.442";
+  version = "0.0.443";
 
   src = fetchFromGitHub {
     owner = "namespacelabs";
     repo = "foundation";
     rev = "v${version}";
-    hash = "sha256-SGibs1Jbq6WWeiDS1SbjX5s+Wy2vpCD74TofB9CbuVE=";
+    hash = "sha256-LprQhUIh5wcxiR3sf2+cT3fg458KDDv9f7Sytcs1NC8=";
   };
 
   vendorHash = "sha256-913vffq86pju2UKW0UkTm8qE7bylR9n0SgacELIRhVY=";

From e078dbbddb7d9434a44072bb1286ddf32885388f Mon Sep 17 00:00:00 2001
From: yuannan <brandon@emergence.ltd>
Date: Wed, 22 Oct 2025 09:48:17 +0100
Subject: [PATCH 1556/6226] nixos/nftables: added wiki link for no VM network
 access

---
 nixos/modules/services/networking/nftables.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/networking/nftables.nix b/nixos/modules/services/networking/nftables.nix
index 7ee1b7caafed..7275d25ad5e1 100644
--- a/nixos/modules/services/networking/nftables.nix
+++ b/nixos/modules/services/networking/nftables.nix
@@ -67,6 +67,9 @@ in
         There are other programs that use iptables internally too, such as
         libvirt. For information on how the two firewalls interact, see
         <https://wiki.nftables.org/wiki-nftables/index.php/Troubleshooting#Question_4._How_do_nftables_and_iptables_interact_when_used_on_the_same_system.3F>.
+
+        Some network configurations may prevent VMs from having network access, see
+        <https://wiki.nixos.org/wiki/Networking#Virtualization>.
       '';
     };
 

From cc6bd8c33c5dee01190f86e8470dbf73d4870e71 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 08:56:46 +0000
Subject: [PATCH 1557/6226] vscode-extensions.saoudrizwan.claude-dev: 3.32.8 ->
 3.33.1

---
 .../vscode/extensions/saoudrizwan.claude-dev/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
index 42e5683b4e64..9cfd6d964706 100644
--- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-dev";
     publisher = "saoudrizwan";
-    version = "3.32.8";
-    hash = "sha256-IwWAk8Awi6JNDQbJ7XX2wiFVsEYKzIBHqynig5W5Dtg=";
+    version = "3.33.1";
+    hash = "sha256-DSLRfzAL4jqj32XZOmGGSb/BBGEfzJ9fbkiSLLpaYM4=";
   };
 
   meta = {

From b64f2fba1a3a69592e7bf658e50791b84437aba1 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 22 Oct 2025 12:01:51 +0300
Subject: [PATCH 1558/6226] linux-firmware: 20251011 -> 20251021

Diff: https://gitlab.com/kernel-firmware/linux-firmware/-/compare/20251011...20251021
---
 pkgs/by-name/li/linux-firmware/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix
index f31439d6f313..b20668e4a8f7 100644
--- a/pkgs/by-name/li/linux-firmware/package.nix
+++ b/pkgs/by-name/li/linux-firmware/package.nix
@@ -22,13 +22,13 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "linux-firmware";
-  version = "20251011";
+  version = "20251021";
 
   src = fetchFromGitLab {
     owner = "kernel-firmware";
     repo = "linux-firmware";
     tag = version;
-    hash = "sha256-LFVrrVCqJORiHVnhIY0l7B4pRHI2MS0o/GbgOUDqO8s=";
+    hash = "sha256-hG5PGLmeVqe/kyr9Q113mlLZvP32GTi20vxHRhxKalw=";
   };
 
   postUnpack = ''

From 234baf0fe9765c263a90933d506640c234569daf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 09:11:04 +0000
Subject: [PATCH 1559/6226] aliyun-cli: 3.0.307 -> 3.0.308

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

diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix
index 66e76b71e122..00212eda320d 100644
--- a/pkgs/by-name/al/aliyun-cli/package.nix
+++ b/pkgs/by-name/al/aliyun-cli/package.nix
@@ -8,17 +8,17 @@
 
 buildGoModule rec {
   pname = "aliyun-cli";
-  version = "3.0.307";
+  version = "3.0.308";
 
   src = fetchFromGitHub {
     owner = "aliyun";
     repo = "aliyun-cli";
     tag = "v${version}";
-    hash = "sha256-36IGN0salTpMWJDA/UKFQiyob/r5WLZFC9krTXVTxuA=";
+    hash = "sha256-W6ooP9Ua7GtaD9ROBc0AbJdFHMUU6OYwT2JZulvn5+Q=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-WbMyxOSCWtlngqQHtKfkWq9bYlXUmvijGwt3zM9JoNY=";
+  vendorHash = "sha256-lmlCPBEqopmoNjkihVOh8zKSKsS4HmaDQ+QAEJ/pEvA=";
 
   subPackages = [ "main" ];
 

From 44d2d65e3cb6aa19ce49fdb8d4eb3a3463a2e8bd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 09:26:54 +0000
Subject: [PATCH 1560/6226] mcphost: 0.31.1 -> 0.31.3

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

diff --git a/pkgs/by-name/mc/mcphost/package.nix b/pkgs/by-name/mc/mcphost/package.nix
index 6b3c4cfd614a..1c0d61ed2436 100644
--- a/pkgs/by-name/mc/mcphost/package.nix
+++ b/pkgs/by-name/mc/mcphost/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "mcphost";
-  version = "0.31.1";
+  version = "0.31.3";
 
   src = fetchFromGitHub {
     owner = "mark3labs";
     repo = "mcphost";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WvoBQLrs9lcbaTueyIPI89Y2t37mKxlE0tOczLhw8Bg=";
+    hash = "sha256-1pPwW4Q84OWTcMVz4rEWEt1ZwWmxHmQTsCiqXKpOkvs=";
   };
 
   vendorHash = "sha256-xZ7JbX1sAt2ZtgSMm86MQEJWwjL17O9LMsjOmkhzWt0=";

From 614a43bb4ff766172d58072ef165a81ee9f04dcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Wed, 22 Oct 2025 11:39:27 +0200
Subject: [PATCH 1561/6226] Pin invidious to `crystal_1_17`

---
 pkgs/by-name/in/invidious/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix
index db6d48735876..9b4a099fe824 100644
--- a/pkgs/by-name/in/invidious/package.nix
+++ b/pkgs/by-name/in/invidious/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   callPackage,
-  crystal,
+  crystal_1_17,
   fetchFromGitHub,
   librsvg,
   pkg-config,
@@ -27,6 +27,7 @@
 let
   # normally video.js is downloaded at build time
   videojs = callPackage ./videojs.nix { inherit versions; };
+  crystal = crystal_1_17;
 in
 crystal.buildCrystalPackage rec {
   pname = "invidious";

From 946d26158aee5cdedfdcab33f08221de241b712c Mon Sep 17 00:00:00 2001
From: Nikita Uvarov <uv.nikita@gmail.com>
Date: Fri, 3 Oct 2025 10:19:12 +0200
Subject: [PATCH 1562/6226] home-assistant-custom-components.systemair: 0.2.0
 -> 1.0.11

Switch to active fork by AN3Orik since original repository is stale.
---
 .../custom-components/systemair/package.nix   | 26 ++++++++++++++-----
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/systemair/package.nix b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
index e55bb645fa56..f2b13e6ff225 100644
--- a/pkgs/servers/home-assistant/custom-components/systemair/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
@@ -1,25 +1,39 @@
 {
   lib,
+  pymodbus,
   buildHomeAssistantComponent,
   fetchFromGitHub,
+  async-timeout,
+  aiohttp,
 }:
 
 buildHomeAssistantComponent rec {
-  owner = "tesharp";
+  owner = "AN3Orik";
   domain = "systemair";
-  version = "0.2.0";
+  version = "1.0.11";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "systemair";
     tag = "v${version}";
-    hash = "sha256-lzFnKPkBOt2fkVGWCj1M/skSr8V39GgDHS+0HD4ACAw=";
+    hash = "sha256-/M9ErhtggyaY8ZZyhdPSoVCGqrhAQ9/RMRyl34Ks3mc=";
   };
 
+  postPatch = ''
+    substituteInPlace custom_components/systemair/manifest.json \
+      --replace-fail "pymodbus==" "pymodbus>=" \
+  '';
+
+  dependencies = [
+    pymodbus
+    async-timeout
+    aiohttp
+  ];
+
   meta = with lib; {
-    changelog = "https://github.com/tesharp/systemair/releases/tag/v${version}";
-    description = "Home Assistant component for Systemair SAVE Connect 2";
-    homepage = "https://github.com/tesharp/systemair";
+    changelog = "https://github.com/AN3Orik/systemair/releases/tag/v${version}";
+    description = "Home Assistant component for Systemair SAVE ventilation units";
+    homepage = "https://github.com/AN3Orik/systemair";
     maintainers = with maintainers; [ uvnikita ];
     license = licenses.mit;
   };

From 368da01dbf6295da271764ffe939e423d682f630 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 09:52:54 +0000
Subject: [PATCH 1563/6226] python3Packages.llguidance: 1.2.0 -> 1.3.0

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

diff --git a/pkgs/development/python-modules/llguidance/default.nix b/pkgs/development/python-modules/llguidance/default.nix
index ff1f22856ce2..2256fc21346c 100644
--- a/pkgs/development/python-modules/llguidance/default.nix
+++ b/pkgs/development/python-modules/llguidance/default.nix
@@ -22,19 +22,19 @@
 
 buildPythonPackage rec {
   pname = "llguidance";
-  version = "1.2.0";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "guidance-ai";
     repo = "llguidance";
     tag = "v${version}";
-    hash = "sha256-Fe7cKZotjRexcSHcoT0Y9I3m+dRarhlBOjYR7rdJBRY=";
+    hash = "sha256-lnQn8587ioMXm1HiY/yBLFdofJldsw0Y6csBJiVnBrs=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src pname version;
-    hash = "sha256-//Vjj4QIDcZEPujMfUhZd5nx5pAyF3l3CdNvI/Wi74A=";
+    hash = "sha256-CMRkOeO8JMVatjjDNsaN2CcWGQS/l0onjqrCbp3/49Q=";
   };
 
   nativeBuildInputs = [

From 115adc466a67265e2352e4dc3431e25f4c59bc29 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Wed, 22 Oct 2025 00:20:51 +0300
Subject: [PATCH 1564/6226] nixos/plymouth: replace `with lib;` with `inherit`

---
 nixos/modules/system/boot/plymouth.nix | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index 395632466f27..1023fa8ce42d 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -6,9 +6,20 @@
   ...
 }:
 
-with lib;
-
 let
+  inherit (lib)
+    mkOption
+    mkEnableOption
+    optional
+    mkIf
+    mkBefore
+    mkAfter
+    literalExpression
+    types
+    literalMD
+    getBin
+    escapeShellArg
+    ;
 
   plymouth = pkgs.plymouth.override {
     systemd = config.boot.initrd.systemd.package;
@@ -109,7 +120,7 @@ in
       };
 
       themePackages = mkOption {
-        default = lib.optional (cfg.theme == "breeze") nixosBreezePlymouth;
+        default = optional (cfg.theme == "breeze") nixosBreezePlymouth;
         defaultText = literalMD ''
           A NixOS branded variant of the breeze theme when
           `config.${opt.theme} == "breeze"`, otherwise
@@ -202,7 +213,7 @@ in
     boot.initrd.systemd = {
       extraBin.plymouth = "${plymouth}/bin/plymouth"; # for the recovery shell
       storePaths = [
-        "${lib.getBin config.boot.initrd.systemd.package}/bin/systemd-tty-ask-password-agent"
+        "${getBin config.boot.initrd.systemd.package}/bin/systemd-tty-ask-password-agent"
         "${plymouth}/bin/plymouthd"
         "${plymouth}/sbin/plymouthd"
       ];
@@ -306,7 +317,7 @@ in
       '')
     ];
 
-    boot.initrd.extraUtilsCommands = lib.mkIf (!config.boot.initrd.systemd.enable) (
+    boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) (
       ''
         copy_bin_and_libs ${plymouth}/bin/plymouth
         copy_bin_and_libs ${plymouth}/bin/plymouthd

From c6e38d30329ca883e627e8aa7a489f4d1f149c2c Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:39 +0000
Subject: [PATCH 1565/6226] lxqt.libqtxdg: fix build against Qt >= 6.10

---
 pkgs/desktops/lxqt/libqtxdg/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
index 3ea0a857efe8..dabc9a6eb7fa 100644
--- a/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   qtbase,
   qtsvg,
@@ -27,6 +28,16 @@ stdenv.mkDerivation rec {
       ."${version}";
   };
 
+  patches = lib.optionals (version == "4.2.0") [
+    # fix build against Qt >= 6.10 (https://github.com/lxqt/libqtxdg/pull/313)
+    # TODO: drop when upgrading beyond version 4.2.0
+    (fetchpatch {
+      name = "cmake-fix-build-with-Qt-6.10.patch";
+      url = "https://github.com/lxqt/libqtxdg/commit/b01a024921acdfd5b0e97d5fda2933c726826e99.patch";
+      hash = "sha256-njpn6pU9BHlfYfkw/jEwh8w3Wo1F8MlRU8iQB+Tz2zU=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     lxqt-build-tools

From e3152f4bc7e5f15e2314d7b64f216c2a4f4aef41 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:39 +0000
Subject: [PATCH 1566/6226] lxqt.libqtxdg: modernize

---
 pkgs/desktops/lxqt/libqtxdg/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
index dabc9a6eb7fa..b5b23b1569a8 100644
--- a/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -12,23 +12,23 @@
   version ? "4.2.0",
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libqtxdg";
   inherit version;
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "libqtxdg";
-    rev = version;
+    tag = finalAttrs.version;
     hash =
       {
         "3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU=";
         "4.2.0" = "sha256-TSyVYlWsmB/6gxJo+CjROBQaWsmYZAwkM8BwiWP+XBI=";
       }
-      ."${version}";
+      ."${finalAttrs.version}";
   };
 
-  patches = lib.optionals (version == "4.2.0") [
+  patches = lib.optionals (finalAttrs.version == "4.2.0") [
     # fix build against Qt >= 6.10 (https://github.com/lxqt/libqtxdg/pull/313)
     # TODO: drop when upgrading beyond version 4.2.0
     (fetchpatch {
@@ -59,11 +59,11 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lxqt/libqtxdg";
     description = "Qt implementation of freedesktop.org xdg specs";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    teams = [ teams.lxqt ];
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.lxqt ];
   };
-}
+})

From 020a5073f18b1e21750b8513adacbce75362ea9f Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:39 +0000
Subject: [PATCH 1567/6226] lxqt.libfm-qt: fix build against Qt >= 6.10

---
 pkgs/desktops/lxqt/libfm-qt/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index 74a5afc95c60..aef56f98f801 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   libXdmcp,
   libexif,
@@ -35,6 +36,16 @@ stdenv.mkDerivation rec {
       ."${version}";
   };
 
+  patches = lib.optionals (version == "2.2.0") [
+    # fix build against Qt >= 6.10 (https://github.com/lxqt/libfm-qt/pull/1060)
+    # TODO: drop when upgrading beyond version 2.2.0
+    (fetchpatch {
+      name = "cmake-fix-build-with-Qt-6.10.patch";
+      url = "https://github.com/lxqt/libfm-qt/commit/3bcbae5831f5ce3d2f06dc370f0c2ad0026ae82a.patch";
+      hash = "sha256-nTuPXlkP7AzC8R4OHfQx6/kxPsDjaw7tGzQGyiYqQSQ=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config

From 97bf55a00bdd3444daa7d1fef30e2318178c09d7 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:39 +0000
Subject: [PATCH 1568/6226] lxqt.libfm-qt: modernize

---
 pkgs/desktops/lxqt/libfm-qt/default.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index aef56f98f801..222b4e839514 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -20,23 +20,23 @@
   qtx11extras ? null,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libfm-qt";
   inherit version;
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "libfm-qt";
-    rev = version;
+    tag = finalAttrs.version;
     hash =
       {
         "1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4=";
         "2.2.0" = "sha256-xLXHwrcMJ8PObZ2qWVZTf9FREcjUi5qtcCJgNHj391Q=";
       }
-      ."${version}";
+      ."${finalAttrs.version}";
   };
 
-  patches = lib.optionals (version == "2.2.0") [
+  patches = lib.optionals (finalAttrs.version == "2.2.0") [
     # fix build against Qt >= 6.10 (https://github.com/lxqt/libfm-qt/pull/1060)
     # TODO: drop when upgrading beyond version 2.2.0
     (fetchpatch {
@@ -63,15 +63,15 @@ stdenv.mkDerivation rec {
     lxqt-menu-data
     menu-cache
   ]
-  ++ (lib.optionals (lib.versionAtLeast "2.0.0" version) [ qtx11extras ]);
+  ++ (lib.optionals (lib.versionAtLeast "2.0.0" finalAttrs.version) [ qtx11extras ]);
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lxqt/libfm-qt";
     description = "Core library of PCManFM-Qt (Qt binding for libfm)";
-    license = licenses.lgpl21Plus;
-    platforms = with platforms; unix;
-    teams = [ teams.lxqt ];
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.unix;
+    teams = [ lib.teams.lxqt ];
   };
-}
+})

From e89d3caa32e904f1d653aa8209fdfaaef5f6077f Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:39 +0000
Subject: [PATCH 1569/6226] lxqt.lxqt-panel: fix build against Qt >= 6.10

---
 pkgs/desktops/lxqt/lxqt-panel/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index 957287946690..4e4d5d73f931 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   pkg-config,
   alsa-lib,
@@ -44,6 +45,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-ui+HD2igPiyIOgIKPbgfO4dnfm2rFP/R6oG2pH5g5VY=";
   };
 
+  patches = [
+    # fix build against Qt >= 6.10 (https://github.com/lxqt/lxqt-panel/pull/2306)
+    # TODO: drop when upgrading beyond version 2.2.2
+    (fetchpatch {
+      name = "cmake-fix-build-with-Qt-6.10.patch";
+      url = "https://github.com/lxqt/lxqt-panel/commit/fce8cd99a1de0e637e8539c4d8ac68832a40fa6d.patch";
+      hash = "sha256-KXxV6SZqdpvZSn+zbBZ32Qs6XKfFXEej1F4qBt+MzxA=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config

From 4e3055e86224af8235f46931a9912f93d3fd43bf Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:39 +0000
Subject: [PATCH 1570/6226] lxqt.lxqt-panel: modernize

---
 pkgs/desktops/lxqt/lxqt-panel/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index 4e4d5d73f931..b5893196071a 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -34,14 +34,14 @@
   gitUpdater,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lxqt-panel";
   version = "2.2.2";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-panel";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-ui+HD2igPiyIOgIKPbgfO4dnfm2rFP/R6oG2pH5g5VY=";
   };
 
@@ -91,12 +91,12 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lxqt/lxqt-panel";
     description = "LXQt desktop panel";
     mainProgram = "lxqt-panel";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    teams = [ teams.lxqt ];
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.lxqt ];
   };
-}
+})

From 45673136b0818a0bcd501dd41028e49888feb5f5 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:39 +0000
Subject: [PATCH 1571/6226] lxqt.lxqt-qtplugin: fix build against Qt >= 6.10

---
 pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
index 8f11a11dbb96..c3078f95085d 100644
--- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   libdbusmenu-lxqt,
   libfm-qt,
@@ -25,6 +26,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-qXadz9JBk4TURAWj6ByP/lGV1u0Z6rNJ/VraBh5zY+Q=";
   };
 
+  patches = [
+    # fix build against Qt >= 6.10 (https://github.com/lxqt/lxqt-qtplugin/pull/100)
+    # TODO: drop when upgrading beyond version 2.2.0
+    (fetchpatch {
+      name = "cmake-fix-build-with-Qt-6.10.patch";
+      url = "https://github.com/lxqt/lxqt-qtplugin/commit/90473945206dbf21816a00dfba27426a5b5a9e25.patch";
+      hash = "sha256-cCghOJHsveR5IYisEFv3h8WreRDi0kuyj/2YBD+ATsc=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     lxqt-build-tools

From 96084835c500693bf12c94db871d7220d3492834 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:39 +0000
Subject: [PATCH 1572/6226] lxqt.lxqt-qtplugin: modernize

---
 pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
index c3078f95085d..db6a8b2ae8bb 100644
--- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
@@ -15,14 +15,14 @@
   wrapQtAppsHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "lxqt-qtplugin";
   version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-qtplugin";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-qXadz9JBk4TURAWj6ByP/lGV1u0Z6rNJ/VraBh5zY+Q=";
   };
 
@@ -58,11 +58,11 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lxqt/lxqt-qtplugin";
     description = "LXQt Qt platform integration plugin";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    teams = [ teams.lxqt ];
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.lxqt ];
   };
-}
+})

From b1f1eb2bda918793b175415dca3b7054fb0ff6c5 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:40 +0000
Subject: [PATCH 1573/6226] lxqt.screengrab: fix build against Qt >= 6.10

---
 pkgs/desktops/lxqt/screengrab/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
index f2ef16012680..09bad89905e3 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/screengrab/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   autoPatchelfHook,
   gitUpdater,
@@ -31,6 +32,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-6cGj3Ijv4DsAdJjcHKUg5et+yYc5miIHHZOTD2D9ASk=";
   };
 
+  patches = [
+    # fix build against Qt >= 6.10 (https://github.com/lxqt/screengrab/pull/434)
+    # TODO: drop when upgrading beyond version 3.0.0
+    (fetchpatch {
+      name = "cmake-fix-build-with-Qt-6.10.patch";
+      url = "https://github.com/lxqt/screengrab/commit/1621ef5df9461cdd1dcef3faee36e9419f1ca08c.patch";
+      hash = "sha256-+rpCDLnHmgy/1PME3QaN+978W+jR6PDmiZ/5hAx8Djg=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     lxqt-build-tools

From 4490f10953a7b5350b8fc740bf40038c6d1e5724 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:40 +0000
Subject: [PATCH 1574/6226] lxqt.screengrab: modernize

---
 pkgs/desktops/lxqt/screengrab/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
index 09bad89905e3..e93d0afce933 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/screengrab/default.nix
@@ -21,14 +21,14 @@
   wrapQtAppsHook,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "screengrab";
   version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "screengrab";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-6cGj3Ijv4DsAdJjcHKUg5et+yYc5miIHHZOTD2D9ASk=";
   };
 
@@ -65,12 +65,12 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lxqt/screengrab";
     description = "Crossplatform tool for fast making screenshots";
     mainProgram = "screengrab";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    teams = [ teams.lxqt ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    teams = [ lib.teams.lxqt ];
   };
-}
+})

From 7cddd344d09185de9a833023f61bfef104604a8a Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:40 +0000
Subject: [PATCH 1575/6226] lxqt.xdg-desktop-portal-lxqt: fix build against Qt
 >= 6.10

---
 .../desktops/lxqt/xdg-desktop-portal-lxqt/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
index 52956cd0bc64..29cf01143dfb 100644
--- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   kwindowsystem,
   libexif,
@@ -25,6 +26,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-y3VqDuFagKcG8O5m5qjRGtlUZXfIXV0tclvZLChhWkg=";
   };
 
+  patches = [
+    # fix build against Qt >= 6.10 (https://github.com/lxqt/xdg-desktop-portal-lxqt/pull/50)
+    # TODO: drop when upgrading beyond version 1.2.0
+    (fetchpatch {
+      name = "cmake-fix-build-with-Qt-6.10.patch";
+      url = "https://github.com/lxqt/xdg-desktop-portal-lxqt/commit/15fae3c57a8e8149ef19a8c919f5728016390e3f.patch";
+      hash = "sha256-oReYMEr+tBDHtnFDZahBwTtzgtL/BABZO64yob9tem4=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     wrapQtAppsHook

From ea9f4739b60e933dee0d02972cdbdda94b12b856 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 22 Oct 2025 10:00:40 +0000
Subject: [PATCH 1576/6226] lxqt.xdg-desktop-portal-lxqt: modernize

---
 .../lxqt/xdg-desktop-portal-lxqt/default.nix       | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
index 29cf01143dfb..2836344f6ddc 100644
--- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
@@ -15,14 +15,14 @@
   extraQtStyles ? [ ],
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal-lxqt";
   version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "xdg-desktop-portal-lxqt";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-y3VqDuFagKcG8O5m5qjRGtlUZXfIXV0tclvZLChhWkg=";
   };
 
@@ -53,11 +53,11 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/lxqt/xdg-desktop-portal-lxqt";
     description = "Backend implementation for xdg-desktop-portal that is using Qt/KF5/libfm-qt";
-    license = licenses.lgpl21Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ romildo ];
+    license = lib.licenses.lgpl21Plus;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.romildo ];
   };
-}
+})

From d4300f595780e8a4dfbeca4a3445e661f3f5aad5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 10:07:26 +0000
Subject: [PATCH 1577/6226] microplane: 0.0.35 -> 0.0.37

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

diff --git a/pkgs/by-name/mi/microplane/package.nix b/pkgs/by-name/mi/microplane/package.nix
index fcae4cf42b71..59b6b67f2621 100644
--- a/pkgs/by-name/mi/microplane/package.nix
+++ b/pkgs/by-name/mi/microplane/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "microplane";
-  version = "0.0.35";
+  version = "0.0.37";
 
   src = fetchFromGitHub {
     owner = "Clever";
     repo = "microplane";
     rev = "v${version}";
-    sha256 = "sha256-3QPxH4ZR02bkL2uKoJpLW9e7q1LjSlWw5jo0jxegeiM=";
+    sha256 = "sha256-TwNwXMQGsD9Kx5uH+kAOGlwCF1t1oAefVCbKmRtZ4Vc=";
   };
 
-  vendorHash = "sha256-DizwNph3hmSRoozvJgs3Qw/c9iMTRR1gMGC60pBCFSk=";
+  vendorHash = "sha256-fF1tHhOtw1ms6447lna40NrZT3ItpiQu31Y0psXt1/Y=";
 
   ldflags = [
     "-s"

From 7ce352496351311d9a4a8d53009dc9e8af8365ca Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 07:14:07 -0300
Subject: [PATCH 1578/6226] loudgain: fix build with cmake4

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

diff --git a/pkgs/by-name/lo/loudgain/package.nix b/pkgs/by-name/lo/loudgain/package.nix
index 653440a5f11b..730dcd266526 100644
--- a/pkgs/by-name/lo/loudgain/package.nix
+++ b/pkgs/by-name/lo/loudgain/package.nix
@@ -48,6 +48,11 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = ''
     sed -e "1aPATH=$out/bin:\$PATH" -i "$out/bin/rgbpm"
   '';

From ca1811bd0cb2bca8e235a15411734d69faf8febf Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 07:17:54 -0300
Subject: [PATCH 1579/6226] louvain-community: fix build with cmake4

---
 pkgs/by-name/lo/louvain-community/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/lo/louvain-community/package.nix b/pkgs/by-name/lo/louvain-community/package.nix
index 97d0c3e7acd4..139da16aa76f 100644
--- a/pkgs/by-name/lo/louvain-community/package.nix
+++ b/pkgs/by-name/lo/louvain-community/package.nix
@@ -21,6 +21,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = unstableGitUpdater { };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.3 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Louvain Community Detection Library";
     homepage = "https://github.com/meelgroup/louvain-community";

From 47e4f9f8699af35023facac79c491af971ed67c0 Mon Sep 17 00:00:00 2001
From: Simon Hauser <simon.hauser@helsinki-systems.de>
Date: Wed, 22 Oct 2025 12:22:06 +0200
Subject: [PATCH 1580/6226] mariadb: fix build on x86_64-darwin

---
 pkgs/servers/sql/mariadb/default.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix
index 752e9d0440ca..2ffe92954ffb 100644
--- a/pkgs/servers/sql/mariadb/default.nix
+++ b/pkgs/servers/sql/mariadb/default.nix
@@ -116,10 +116,15 @@ let
         prePatch = ''
           sed -i 's,[^"]*/var/log,/var/log,g' storage/mroonga/vendor/groonga/CMakeLists.txt
         '';
-        env = lib.optionalAttrs (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isGnu) {
-          # MariaDB uses non-POSIX fopen64, which musl only conditionally defines.
-          NIX_CFLAGS_COMPILE = "-D_LARGEFILE64_SOURCE";
-        };
+        env =
+          lib.optionalAttrs (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isGnu) {
+            # MariaDB uses non-POSIX fopen64, which musl only conditionally defines.
+            NIX_CFLAGS_COMPILE = "-D_LARGEFILE64_SOURCE";
+          }
+          // lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) {
+            # Detection of netdb.h doesnt work for some reason on x86_64-darwin
+            NIX_CFLAGS_COMPILE = "-DHAVE_NETDB_H";
+          };
 
         patches = [
           ./patch/cmake-includedir.patch

From 3cd7f07ea9b4b3ca995d5285aff438c42a3411dd Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Wed, 22 Oct 2025 12:30:45 +0200
Subject: [PATCH 1581/6226] mastodon: 4.4.7 -> 4.4.8

Changelog: https://github.com/mastodon/mastodon/releases/tag/v4.4.8
---
 pkgs/servers/mastodon/source.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix
index 8f28667c1604..348bd973f3b8 100644
--- a/pkgs/servers/mastodon/source.nix
+++ b/pkgs/servers/mastodon/source.nix
@@ -5,14 +5,14 @@
   patches ? [ ],
 }:
 let
-  version = "4.4.7";
+  version = "4.4.8";
 in
 applyPatches {
   src = fetchFromGitHub {
     owner = "mastodon";
     repo = "mastodon";
     rev = "v${version}";
-    hash = "sha256-jm8qqgYEQMDB/5p/iQecFAGIIazPuv4ruoVgy9YSlVU=";
+    hash = "sha256-EE0A9EH+8ND9Whig2dhM27EONjJfdVtd9g+Mo0/2iHo=";
     passthru = {
       inherit version;
       yarnHash = "sha256-K1EqeLi4dWnaLIaUU5apxE5ZOM98XBn6KTHWTkPLWE0=";

From 19b4b2047526b82011e3b37d56cf40ac087241fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 10:32:23 +0000
Subject: [PATCH 1582/6226] ktls-utils: 1.2.1 -> 1.3.0

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

diff --git a/pkgs/by-name/kt/ktls-utils/package.nix b/pkgs/by-name/kt/ktls-utils/package.nix
index 3fb20ea47a93..671c53a75f8d 100644
--- a/pkgs/by-name/kt/ktls-utils/package.nix
+++ b/pkgs/by-name/kt/ktls-utils/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ktls-utils";
-  version = "1.2.1";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "oracle";
     repo = "ktls-utils";
     rev = "ktls-utils-${version}";
-    hash = "sha256-aCn9qBD1bh7VFSSrC1uR/XPfFI+YC/gylCr7tSs56VQ=";
+    hash = "sha256-xBh9iSmTf8YCfahWnJvDx/nvz91NFZ3AiJ2JYs+pMfY=";
   };
 
   nativeBuildInputs = [

From c131045bab877183abc7f851742e739292380272 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 10:34:26 +0000
Subject: [PATCH 1583/6226] jwtinfo: 0.4.4 -> 0.6.0

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

diff --git a/pkgs/by-name/jw/jwtinfo/package.nix b/pkgs/by-name/jw/jwtinfo/package.nix
index d307f2c846e3..abcf18969c39 100644
--- a/pkgs/by-name/jw/jwtinfo/package.nix
+++ b/pkgs/by-name/jw/jwtinfo/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "jwtinfo";
-  version = "0.4.4";
+  version = "0.6.0";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -14,10 +14,10 @@ rustPlatform.buildRustPackage {
     owner = "lmammino";
     repo = "jwtinfo";
     rev = "v${version}";
-    hash = "sha256-FDN9K7KnMro2BluHB7I0HTDdT9YXxi8UcOoBhKx/5dA=";
+    hash = "sha256-d88RL3Ii2/akIyxmKMEBqILRuaSP2v/RZ5zuWrwyYkc=";
   };
 
-  cargoHash = "sha256-pRlnZAFsEBGz0yYfcZ0SCiH2om8URQ4J3+c01pBT7ag=";
+  cargoHash = "sha256-5lSGVr5iMk4Zai2HNTSXOeJXyXPRAWNEyJeZxMrAMUg=";
 
   meta = {
     description = "Command-line tool to get information about JWTs";

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

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

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

From ab49e37a022de924b83b600371dd89d5135ca23c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 21 Oct 2025 16:56:14 +0200
Subject: [PATCH 1585/6226] nixos/facter: add core library and system detection

This adds foundational functionality for nixos-facter hardware detection:

- lib.nix: Internal helper functions for querying facter reports
  - hasCpu/hasAmdCpu/hasIntelCpu: CPU vendor detection
  - collectDrivers: Extract driver_modules from hardware entries
  - toZeroPaddedHex: Format USB device IDs (for fingerprint matching)

- system.nix: Auto-detect nixpkgs.hostPlatform from facter report
  Automatically sets the correct platform (x86_64-linux, aarch64-linux, etc.)
  based on the hardware report, reducing manual configuration.

This builds on the base infrastructure added in PR #450303 and provides
the foundation for upcoming hardware detection modules (boot, networking,
graphics, etc.).

Part of the incremental upstreaming effort from:
https://github.com/nix-community/nixos-facter-modules
---
 nixos/modules/hardware/facter/default.nix |  4 ++
 nixos/modules/hardware/facter/lib.nix     | 59 +++++++++++++++++++++++
 nixos/modules/hardware/facter/system.nix  | 15 ++++++
 3 files changed, 78 insertions(+)
 create mode 100644 nixos/modules/hardware/facter/lib.nix
 create mode 100644 nixos/modules/hardware/facter/system.nix

diff --git a/nixos/modules/hardware/facter/default.nix b/nixos/modules/hardware/facter/default.nix
index 0d3163185b98..471bee49b95b 100644
--- a/nixos/modules/hardware/facter/default.nix
+++ b/nixos/modules/hardware/facter/default.nix
@@ -4,6 +4,10 @@
   ...
 }:
 {
+  imports = [
+    ./system.nix
+  ];
+
   meta.maintainers = with lib.maintainers; [ mic92 ];
 
   options.hardware.facter = with lib; {
diff --git a/nixos/modules/hardware/facter/lib.nix b/nixos/modules/hardware/facter/lib.nix
new file mode 100644
index 000000000000..099254cbce8d
--- /dev/null
+++ b/nixos/modules/hardware/facter/lib.nix
@@ -0,0 +1,59 @@
+# Internal library functions for hardware.facter modules
+# Eventually we can think about moving this under lib/
+# These are facter-specific helpers for querying nixos-facter reports
+lib:
+let
+
+  inherit (lib) assertMsg;
+
+  # Query if a facter report contains a CPU with the given vendor name
+  hasCpu =
+    name:
+    {
+      hardware ? { },
+      ...
+    }:
+    let
+      cpus = hardware.cpu or [ ];
+    in
+    assert assertMsg (hardware != { }) "no hardware entries found in the report";
+    assert assertMsg (cpus != [ ]) "no cpu entries found in the report";
+    builtins.any (
+      {
+        vendor_name ? null,
+        ...
+      }:
+      assert assertMsg (vendor_name != null) "detail.vendor_name not found in cpu entry";
+      vendor_name == name
+    ) cpus;
+
+  # Extract all driver_modules from a list of hardware entries
+  collectDrivers = list: lib.catAttrs "driver_modules" list;
+
+  # Convert number to zero-padded 4-digit hex string (for USB device IDs)
+  toZeroPaddedHex =
+    n:
+    let
+      hex = lib.toHexString n;
+      len = builtins.stringLength hex;
+    in
+    if len == 1 then
+      "000${hex}"
+    else if len == 2 then
+      "00${hex}"
+    else if len == 3 then
+      "0${hex}"
+    else
+      hex;
+in
+{
+  inherit
+    hasCpu
+    collectDrivers
+    toZeroPaddedHex
+    ;
+
+  hasAmdCpu = hasCpu "AuthenticAMD";
+  hasIntelCpu = hasCpu "GenuineIntel";
+
+}
diff --git a/nixos/modules/hardware/facter/system.nix b/nixos/modules/hardware/facter/system.nix
new file mode 100644
index 000000000000..02e329f8e162
--- /dev/null
+++ b/nixos/modules/hardware/facter/system.nix
@@ -0,0 +1,15 @@
+{
+  config,
+  options,
+  lib,
+  ...
+}:
+{
+  # Skip setting hostPlatform in test VMs where it's read-only
+  # Tests have virtualisation.test options and import read-only.nix
+  config.nixpkgs = lib.optionalAttrs (!(options ? virtualisation.test)) {
+    hostPlatform = lib.mkIf (
+      config.hardware.facter.report.system or null != null && !options.nixpkgs.pkgs.isDefined
+    ) (lib.mkDefault config.hardware.facter.report.system);
+  };
+}

From d5fd4f001b4aaae09c98fd260ae0256e6aa09b1a Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 22 Oct 2025 11:14:52 +0200
Subject: [PATCH 1586/6226] grafana: fix `find(1)` brackets in `go.mod` fixup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

DAMN you `find`!

The parentheses are only necessary when having `-exec` 🫠
It does what I expected, i.e. finding EVERY go.mod and go.work instead
of only go.work when not using `-exec`.
---
 pkgs/servers/monitoring/grafana/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 524ba2fa4c0e..6d5d8a69bd5a 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -64,7 +64,7 @@ buildGoModule (finalAttrs: {
   # This is still better than maintaining some list of go.mod files (or exclusions of that)
   # where to patch the go version (and where to not do that).
   postPatch = ''
-    find . -name go.mod -or -name "go.work" -type f -exec sed -i -e 's/^go .*/go ${finalAttrs.passthru.go.version}/g' {} \;
+    find . \( -name go.mod -or -name "go.work" \) -type f -exec sed -i -e 's/^go .*/go ${finalAttrs.passthru.go.version}/g' {} \;
   '';
 
   proxyVendor = true;

From 3d7406bd588638a9c4d9db4ee3dc87ea0ee5180d Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 22 Oct 2025 11:15:55 +0200
Subject: [PATCH 1587/6226] grafana: 12.2.0 -> 12.2.1

ChangeLog: https://github.com/grafana/grafana/releases/tag/v12.2.1
---
 pkgs/servers/monitoring/grafana/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 6d5d8a69bd5a..eac1cb5e7ec6 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -19,7 +19,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "grafana";
-  version = "12.2.0";
+  version = "12.2.1";
 
   subPackages = [
     "pkg/cmd/grafana"
@@ -31,7 +31,7 @@ buildGoModule (finalAttrs: {
     owner = "grafana";
     repo = "grafana";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-EFqR+du+ZeWih7+s4iVVAiwOvTwbF1pNg1TntkoGCEQ=";
+    hash = "sha256-fOlf+NTV1DIotC0JyG+PCMe8uPr+mfe/CLQP7dmRtkg=";
   };
 
   # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22
@@ -46,12 +46,12 @@ buildGoModule (finalAttrs: {
   missingHashes = ./missing-hashes.json;
   offlineCache = yarn-berry_4.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-BqlkFgWiU5gruDHjkazNy6GKL2KgpcrwaHXDYNBF9EY=";
+    hash = "sha256-aXWi2hriPHm1Gsmd6Zg8eTR//KuI6SrvJAYhTeRZTug=";
   };
 
   disallowedRequisites = [ finalAttrs.offlineCache ];
 
-  vendorHash = "sha256-yoOs9MngUCfvvK9rPUsXCoSc5LiRs0g66KdINLQzO8Q=";
+  vendorHash = "sha256-TvKG/fUBure2wiZDVFD7dHGVDBl8gqWRkv2YBYNcIDQ=";
 
   # Grafana seems to just set it to the latest version available
   # nowadays.

From 94afdc15bac37a8b8c32106d6ac556aaa031bfca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 10:42:58 +0000
Subject: [PATCH 1588/6226] lxgw-neoxihei: 1.224 -> 1.225

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

diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix
index c428bb8f8757..106ddb457599 100644
--- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix
+++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix
@@ -6,11 +6,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "lxgw-neoxihei";
-  version = "1.224";
+  version = "1.225";
 
   src = fetchurl {
     url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
-    hash = "sha256-Wib8zZsdw9K5dmVYPymzv4hkAhrOWyEjflzEX8tv0zc=";
+    hash = "sha256-Mvlt9P0/tIuizXLBdzmBJpxd8UsfOwP6saYG17KVeXQ=";
   };
 
   dontUnpack = true;

From bf2e1d26a433884fab991892fc0cd6e0af6f9a6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 10:47:15 +0000
Subject: [PATCH 1589/6226] crowdsec: 1.7.0 -> 1.7.2

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

diff --git a/pkgs/by-name/cr/crowdsec/package.nix b/pkgs/by-name/cr/crowdsec/package.nix
index 94a6c7cfd0fc..b0aed58f0c93 100644
--- a/pkgs/by-name/cr/crowdsec/package.nix
+++ b/pkgs/by-name/cr/crowdsec/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "crowdsec";
-  version = "1.7.0";
+  version = "1.7.2";
 
   src = fetchFromGitHub {
     owner = "crowdsecurity";
     repo = "crowdsec";
     tag = "v${version}";
-    hash = "sha256-ILGvHSDONyq6O1V/xm4lanSTmkdkMAwvvhoUtM2b7Gc=";
+    hash = "sha256-f0SxOXxXqKft3Nnf9y7itpPXJOjBrEpImbPANFNx4BM=";
   };
 
-  vendorHash = "sha256-B9VZlNks7/ozay5+di++sbLwIKN98P7U+o6knVaKlqo=";
+  vendorHash = "sha256-v1UECFfgx1zFCzSyazxFRWMP/0fayVnrC+pJHio5z+Q=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From e0573ec670b020796d62fe08f5b346c2c6582f6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 10:48:25 +0000
Subject: [PATCH 1590/6226] micronaut: 4.9.4 -> 4.10.0

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

diff --git a/pkgs/by-name/mi/micronaut/package.nix b/pkgs/by-name/mi/micronaut/package.nix
index 812b6b323be5..d6922b079c8d 100644
--- a/pkgs/by-name/mi/micronaut/package.nix
+++ b/pkgs/by-name/mi/micronaut/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "micronaut";
-  version = "4.9.4";
+  version = "4.10.0";
 
   src = fetchzip {
     url = "https://github.com/micronaut-projects/micronaut-starter/releases/download/v${version}/micronaut-cli-${version}.zip";
-    sha256 = "sha256-zsC8hMXHRi8xJro/IhihGzw8Nx8loaMh4Y8xlmtTyMQ=";
+    sha256 = "sha256-FYky14Lnl5B+zLgulFJdRdaDIQi+FhoUjce+LKYaMKE=";
   };
 
   nativeBuildInputs = [

From a81c05b311e3a9e48b8d98cf72fba4f28d65fe98 Mon Sep 17 00:00:00 2001
From: Robert Helgesson <robert@rycee.net>
Date: Wed, 22 Oct 2025 09:29:32 +0200
Subject: [PATCH 1591/6226] grav: 1.7.49.5 -> 1.7.50.2

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

diff --git a/pkgs/by-name/gr/grav/package.nix b/pkgs/by-name/gr/grav/package.nix
index 0f2fa5f4c49b..89ea0e66bcca 100644
--- a/pkgs/by-name/gr/grav/package.nix
+++ b/pkgs/by-name/gr/grav/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "1.7.49.5";
+  version = "1.7.50.2";
 in
 stdenvNoCC.mkDerivation {
   pname = "grav";
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation {
 
   src = fetchzip {
     url = "https://github.com/getgrav/grav/releases/download/${version}/grav-admin-v${version}.zip";
-    hash = "sha256-zhjsYWma0qze8zdzX01EauzMONeEC6TRkhdQJUoJEUQ=";
+    hash = "sha256-UaaROMdUNFX6gcbJnfRn9CopZ3nuIMD91CkHnujtnE4=";
   };
 
   patches = [

From ce8c42d995342ee602c658d688be86b25428743d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 20 Oct 2025 21:52:04 +0200
Subject: [PATCH 1592/6226] ci/README: add github-script policy

Over the last couple of months we have been migrating a lot of the old
bash code to JavaScript, which is supported in GitHub Actions via
`actions/github-script`. This change documents a "manual ratchet check"
for this migration - new code should only be introduced as JavaScript
and not as Bash. This will help us to eventually succeed with the
migration and ensure quality and maintainability.

We are migrating to JavaScript, because:

1. Using JavaScript is GitHub's [recommendation] against injection attacks.
   Using `actions/github-script` has first-class support for the event
   context and does not require to resort back to environment variables in
   most cases. When environment variables need to be used, these are
   accessed via `process.env`, without a risk for accidental injections.
   Using `actions/github-script` is also recommended in a recent
   [survey] of open source supply chain compromises:

   > Finally, since two out of three compromises were due to shell injection,
   > it might be safer to use a proper programming language, like JavaScript
   > with actions/github-script, or any other language accessing the context
   > via environment variables instead of YAML interpolation.

2. Handling even environment variables in Bash safely is almost
   impossible. For example arithmetic expressions cause arbitrary code
   execution vulnerabilities. While a lot of contributors are somehwat
   familiar writing Bash code for builders, writing *safe* Bash code for
   CI is a very different matter. Few people, if any, know how to do
   this.

3. GitHub Action's security model is quite unintuitive and even if some
   code runs with trusted inputs today, it may later be used in a more
   exposed context. Instead of making judgement calls about language
   choice case by case, a clear policy helps writing things defensively
   from the beginning.

4. We have developed a framework around our github-script based tools in
   `ci/github-script`. This provides a local `nix-shell` environment
   with the right dependencies and a local runner for these scripts for
   quick testing, debugging and development. No matter, whether you're
   developing a new feature, fixing bugs or reviewing a PR - this allows
   much quicker verification of the scripts, *without* running
   everything in a fork or test organization.

5. This framework also provides helpers for challenges that come up with
   GHA. One example is rate-limiting, where we have a helper script that
   will handle all rate-limiting needs for us, preventing us from
   running out of API calls and thus breaking CI entirely. We can only
   use these tools consistently, if we consistently use JavaScript code.

6. Using JavaScript allows us to handle JSON natively. Using
   `octokit/rest.js` provides first-class integration with GitHub's API.
   Together, this makes these scripts much more maintainable than
   resorting to `gh` and `jq`.

[recommendation]: https://docs.github.com/en/actions/reference/security/secure-use#use-an-action-instead-of-an-inline-script
[survey]: https://words.filippo.io/compromise-survey/
---
 ci/README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/ci/README.md b/ci/README.md
index 797f231aea62..389ef59f57b9 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -10,6 +10,14 @@ In order to ensure that the needed packages are generally available without buil
 
 Run [`update-pinned.sh`](./update-pinned.sh) to update it.
 
+## GitHub specific code
+
+Some of the code is specific to GitHub.
+This code is currently spread out over multiple places and written in both Bash and JavaScript.
+The goal is to eventually have all GitHub specific code in `ci/github-script` and written in JavaScript via `actions/github-script`.
+A lot of code has already been migrated, but some Bash code still remains.
+New CI features need to be introduced in JavaScript, not Bash.
+
 ## `ci/nixpkgs-vet.sh BASE_BRANCH [REPOSITORY]`
 
 Runs the [`nixpkgs-vet` tool](https://github.com/NixOS/nixpkgs-vet) on the HEAD commit, closely matching what CI does.

From 9f62ff9ffdd9265c53838e719058a8c299dfd59f Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 08:03:08 -0300
Subject: [PATCH 1593/6226] arjun-cnf: fix build with cmake4

---
 pkgs/by-name/ar/arjun-cnf/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ar/arjun-cnf/package.nix b/pkgs/by-name/ar/arjun-cnf/package.nix
index b257a607c94c..0542eef55abc 100644
--- a/pkgs/by-name/ar/arjun-cnf/package.nix
+++ b/pkgs/by-name/ar/arjun-cnf/package.nix
@@ -38,6 +38,11 @@ stdenv.mkDerivation (finalAttrs: {
     louvain-community
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.3 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "CNF minimizer and minimal independent set calculator";
     homepage = "https://github.com/meelgroup/arjun";

From fee16d1268051934aa0970d698f928eb9df0ffb8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 11:03:40 +0000
Subject: [PATCH 1594/6226] python3Packages.pyscf: 2.10.0 -> 2.11.0

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

diff --git a/pkgs/development/python-modules/pyscf/default.nix b/pkgs/development/python-modules/pyscf/default.nix
index eb107f072c5c..509a758d8340 100644
--- a/pkgs/development/python-modules/pyscf/default.nix
+++ b/pkgs/development/python-modules/pyscf/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "pyscf";
-  version = "2.10.0";
+  version = "2.11.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "pyscf";
     repo = "pyscf";
     tag = "v${version}";
-    hash = "sha256-lFYSWCe5THlivpBB6nFBR2zfCIKJ0YJeuY2rCKoXUq8=";
+    hash = "sha256-JqjZn4EL6P7qS9PJ/wV6+FniEUeCB/f271nczVH5VuQ=";
   };
 
   # setup.py calls Cmake and passes the arguments in CMAKE_CONFIGURE_ARGS to cmake.

From 0fa3eee10dfe160f4e80c250d813d2da23bc32df Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Wed, 22 Oct 2025 10:36:43 +0200
Subject: [PATCH 1595/6226] fritz-exporter: 2.5.2 -> 2.6.0

Diff: https://github.com/pdreker/fritz_exporter/compare/fritzexporter-v2.5.2...fritzexporter-v2.6.0
Release-Notes: https://github.com/pdreker/fritz_exporter/releases/tag/fritzexporter-v2.6.0
---
 pkgs/by-name/fr/fritz-exporter/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fr/fritz-exporter/package.nix b/pkgs/by-name/fr/fritz-exporter/package.nix
index 7c18ee1f1932..f45cf5b6e39a 100644
--- a/pkgs/by-name/fr/fritz-exporter/package.nix
+++ b/pkgs/by-name/fr/fritz-exporter/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "fritz-exporter";
-  version = "2.5.2";
+  version = "2.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pdreker";
     repo = "fritz_exporter";
     tag = "fritzexporter-v${version}";
-    hash = "sha256-xQLTI6b8X22aU6dj7Tmkzxn7vE4y8r/djUetG3Qg9Qw=";
+    hash = "sha256-m2jDQN6c3S4xDIrmRFdD+stwutBxcespLKZvxp1VC0I=";
   };
 
   postPatch = ''
@@ -43,6 +43,9 @@ python3.pkgs.buildPythonApplication rec {
     pytestCheckHook
   ];
 
+  # Required for tests
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     changelog = "https://github.com/pdreker/fritz_exporter/blob/${src.tag}/CHANGELOG.md";
     description = "Prometheus exporter for Fritz!Box home routers";

From 99382fd8c523d1860e36172fc36687ad183375e3 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 08:11:11 -0300
Subject: [PATCH 1596/6226] lwan: 0.5 -> 0.7

---
 pkgs/by-name/lw/lwan/package.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/lw/lwan/package.nix b/pkgs/by-name/lw/lwan/package.nix
index 2034caffd516..fc93de1a31b2 100644
--- a/pkgs/by-name/lw/lwan/package.nix
+++ b/pkgs/by-name/lw/lwan/package.nix
@@ -12,22 +12,15 @@
 
 stdenv.mkDerivation rec {
   pname = "lwan";
-  version = "0.5";
+  version = "0.7";
 
   src = fetchFromGitHub {
     owner = "lpereira";
     repo = "lwan";
     rev = "v${version}";
-    sha256 = "sha256-otiPH+e+auMCyeOTq4LJYaBNv+I91kOCww7DCepQTAQ=";
+    sha256 = "sha256-kH4pZXLcVqGtiGF9IXsybWc+iG8bGASmxcaCKTAB40g=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/lpereira/lwan/commit/9b94ff5eecec1e925103b25a43dacc226a634878.patch";
-      hash = "sha256-g1ZwmEodtF1fkbIBaLT4YvH8EG8DGafHydPSYJra+c0=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config

From 8fafc667f76cf2522bbcb089fcb9138db58e7ca7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 11:13:13 +0000
Subject: [PATCH 1597/6226] libretro.beetle-pce-fast: 0-unstable-2025-10-10 ->
 0-unstable-2025-10-17

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

diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
index faec57bc9b36..138ce2e99ed4 100644
--- a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
+++ b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mednafen-pce-fast";
-  version = "0-unstable-2025-10-10";
+  version = "0-unstable-2025-10-17";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "beetle-pce-fast-libretro";
-    rev = "22ca252ac248de126f5c7df8f8ff07a31a7e7731";
-    hash = "sha256-7mG7TCTPuu3T6x50Lw85lwcZh80zSTG4XbDhoxCSw/0=";
+    rev = "d5c2b28ee6931ae43a4a79455937693ae8ccc8a1";
+    hash = "sha256-67SLilFN88TVdbtpb97dw87QVLJWIib44kifVvZMXYE=";
   };
 
   makefile = "Makefile";

From d0291f419cdd70b2a9462270018b84bbce593257 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 11:14:57 +0000
Subject: [PATCH 1598/6226] prisma-language-server: 6.17.1 -> 6.18.0

---
 pkgs/by-name/pr/prisma-language-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/prisma-language-server/package.nix b/pkgs/by-name/pr/prisma-language-server/package.nix
index a7b5f6fc35d4..9e5412b94327 100644
--- a/pkgs/by-name/pr/prisma-language-server/package.nix
+++ b/pkgs/by-name/pr/prisma-language-server/package.nix
@@ -6,17 +6,17 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "prisma-language-server";
-  version = "6.17.1";
+  version = "6.18.0";
 
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "language-tools";
     tag = "${finalAttrs.version}";
-    hash = "sha256-L2THhIjCeoNRUWTQ0aMkXeatjunRPhd0m4No5UE11lI=";
+    hash = "sha256-o6v7IcpSXDBd/R5XmSMklc3GsWWLKAvvzmi7bTTDlpU=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/packages/language-server";
-  npmDepsHash = "sha256-Fa6Eajzm3/NHHr4ngsgJ/CFfEcQ2J3DTEQEUcK7ZdeU=";
+  npmDepsHash = "sha256-XcJ5ky9MLa2Ta7Xuwf57Zs6SzpUR5h5J640TH39Ukbg=";
 
   meta = {
     description = "Language server for Prisma";

From 3c916f4b9eccafa8de09c827a27ce4dadc3cdc57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Wed, 22 Oct 2025 13:21:05 +0200
Subject: [PATCH 1599/6226] Update pkgs/by-name/in/invidious/package.nix

Co-authored-by: Kenichi Kamiya <kachick1@gmail.com>
---
 pkgs/by-name/in/invidious/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix
index 9b4a099fe824..71c4b3d2aea9 100644
--- a/pkgs/by-name/in/invidious/package.nix
+++ b/pkgs/by-name/in/invidious/package.nix
@@ -27,7 +27,7 @@
 let
   # normally video.js is downloaded at build time
   videojs = callPackage ./videojs.nix { inherit versions; };
-  crystal = crystal_1_17;
+  crystal = crystal_1_16;
 in
 crystal.buildCrystalPackage rec {
   pname = "invidious";

From 4a8ef0e0cf75aaf5e65d726a1e87de833d2fd951 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 22 Oct 2025 12:45:11 +0200
Subject: [PATCH 1600/6226] linux_6_16: remove

EOL upstream.
---
 pkgs/os-specific/linux/kernel/kernels-org.json |  5 -----
 pkgs/top-level/linux-kernels.nix               | 11 ++---------
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 144d74916ee7..b2addeb3c360 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -34,11 +34,6 @@
         "hash": "sha256:0qny8c4r9rf55bvchs5vjplfldngmydn0j47a97c9vpgj0rws38v",
         "lts": true
     },
-    "6.16": {
-        "version": "6.16.12",
-        "hash": "sha256:0vm257d76hmimnac8hzg66gd1mdg330sai39lywfn4m9bjydx93w",
-        "lts": false
-    },
     "6.17": {
         "version": "6.17.4",
         "hash": "sha256:1nwi0hzikziwkxm9xzf819wb3lsz93i1ns1nzybpbfkgdqli42h1",
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 0a43f3394372..478387a5a167 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -204,14 +204,6 @@ in
           ];
         };
 
-        linux_6_16 = callPackage ../os-specific/linux/kernel/mainline.nix {
-          branch = "6.16";
-          kernelPatches = [
-            kernelPatches.bridge_stp_helper
-            kernelPatches.request_key_helper
-          ];
-        };
-
         linux_6_17 = callPackage ../os-specific/linux/kernel/mainline.nix {
           branch = "6.17";
           kernelPatches = [
@@ -299,6 +291,7 @@ in
         linux_6_13 = throw "linux 6.13 was removed because it has reached its end of life upstream";
         linux_6_14 = throw "linux 6.14 was removed because it has reached its end of life upstream";
         linux_6_15 = throw "linux 6.15 was removed because it has reached its end of life upstream";
+        linux_6_16 = throw "linux 6.16 was removed because it has reached its end of life upstream";
 
         linux_5_10_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
         linux_5_15_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS";
@@ -735,7 +728,6 @@ in
     linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);
     linux_6_6 = recurseIntoAttrs (packagesFor kernels.linux_6_6);
     linux_6_12 = recurseIntoAttrs (packagesFor kernels.linux_6_12);
-    linux_6_16 = recurseIntoAttrs (packagesFor kernels.linux_6_16);
     linux_6_17 = recurseIntoAttrs (packagesFor kernels.linux_6_17);
   }
   // lib.optionalAttrs config.allowAliases {
@@ -746,6 +738,7 @@ in
     linux_6_13 = throw "linux 6.13 was removed because it reached its end of life upstream"; # Added 2025-06-22
     linux_6_14 = throw "linux 6.14 was removed because it reached its end of life upstream"; # Added 2025-06-22
     linux_6_15 = throw "linux 6.15 was removed because it reached its end of life upstream"; # Added 2025-08-23
+    linux_6_16 = throw "linux 6.16 was removed because it reached its end of life upstream"; # Added 2025-10-22
   };
 
   rtPackages = {

From 91eb7cd17eb54b567c14e75a490ba8bc4b3ae5a5 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 22 Oct 2025 12:46:29 +0200
Subject: [PATCH 1601/6226] linux-rt_5_10: 5.10.240-rt134 -> 5.10.245-rt139

---
 pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
index a4019bd33645..c3c11fd7cd94 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
@@ -10,7 +10,7 @@
 }@args:
 
 let
-  version = "5.10.240-rt134"; # updated by ./update-rt.sh
+  version = "5.10.245-rt139"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in
@@ -25,7 +25,7 @@ buildLinux (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-      sha256 = "04sdcf4aqsqchii38anzmk9f9x65wv8q1x3m9dandmi6fabw724d";
+      sha256 = "17wxs8i8vd5ivv99ra0sri3wmkw5c22wsaw8nf1xcvys2kmpa7hk";
     };
 
     kernelPatches =
@@ -34,7 +34,7 @@ buildLinux (
           name = "rt";
           patch = fetchurl {
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "0f2wq6w0707qn798a9lk7r31mfmdll6xwnxq8fy86574gl08ah79";
+            sha256 = "1nqdshpcf775cmb1kqcq939b7qx6wsy91pf0l0vsd3rdpixidzyk";
           };
         };
       in

From 204eebe13471d96080918f515c9f708a97043f11 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 22 Oct 2025 12:46:56 +0200
Subject: [PATCH 1602/6226] linux-rt_5_15: 5.15.189-rt87 -> 5.15.195-rt90

---
 pkgs/os-specific/linux/kernel/linux-rt-5.15.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
index c930d86de797..822d06217b1e 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
@@ -10,7 +10,7 @@
 }@args:
 
 let
-  version = "5.15.189-rt87"; # updated by ./update-rt.sh
+  version = "5.15.195-rt90"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in
@@ -29,7 +29,7 @@ buildLinux (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-      sha256 = "1hshd26ahn6dbw6jnqi0v5afpk672w7p09mk7iri93i7hxdh5l73";
+      sha256 = "0hd4p76qv29zlr0iik4j9y9qynyqisk6bgfiqcwkk7gr6bf81l13";
     };
 
     kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
           name = "rt";
           patch = fetchurl {
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "151vznvdcdmjsjsz3b4hfxw1v2jyigrh34k2qyxk3fkqg999fx9w";
+            sha256 = "15n1l3b0yq7hl2zady3s3a3zym82clyycvf5icavvd68758sdp25";
           };
         };
       in

From 4e9fde93420a279e56486d950b725c36dc662732 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 22 Oct 2025 12:47:25 +0200
Subject: [PATCH 1603/6226] linux-rt_6_1: 6.1.146-rt53 -> 6.1.156-rt56

---
 pkgs/os-specific/linux/kernel/linux-rt-6.1.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
index 355a3a106199..508da7ec98cd 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
@@ -10,7 +10,7 @@
 }@args:
 
 let
-  version = "6.1.146-rt53"; # updated by ./update-rt.sh
+  version = "6.1.156-rt56"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in
@@ -29,7 +29,7 @@ buildLinux (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-      sha256 = "117gyi8zym09z2qarnv02i7v23v8596nqvllid07aydlcpihl9pv";
+      sha256 = "13i2l04pmba7dksz2p5kwxgr5bydc5lp7284d4wfsnjf425i9fyl";
     };
 
     kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
           name = "rt";
           patch = fetchurl {
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "1kz416nc8hd2pi87l9k496r2lig07dbapyh701lq81rilbzx9nmc";
+            sha256 = "1smah5wa4lrgb13li025lpj80yxay4g13m7c4i09whxcgxhc294k";
           };
         };
       in

From df3ea7bfcd12f89912c22d42cf6e32b5fba1ae22 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 22 Oct 2025 12:47:56 +0200
Subject: [PATCH 1604/6226] linux-rt_6_6: 6.6.101-rt59 -> 6.6.112-rt63

---
 pkgs/os-specific/linux/kernel/linux-rt-6.6.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
index 5df3a1097066..5ce2e345bc97 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
@@ -10,7 +10,7 @@
 }@args:
 
 let
-  version = "6.6.101-rt59"; # updated by ./update-rt.sh
+  version = "6.6.112-rt63"; # updated by ./update-rt.sh
   branch = lib.versions.majorMinor version;
   kversion = builtins.elemAt (lib.splitString "-" version) 0;
 in
@@ -29,7 +29,7 @@ buildLinux (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-      sha256 = "1h71zbqlsxcafrk218s0rip9rdrj0fzqvsl81ndqnlrnjy3g4kwc";
+      sha256 = "08la2f8w5w2x0l9nmvzsmbwa951xyshhvdhwwhfyjmka66zr4zbc";
     };
 
     kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
           name = "rt";
           patch = fetchurl {
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "0w71nl8s0npcz6x3qavl5j3vcqwd5wcqx4dj5ck2qs7bzv9kbrwb";
+            sha256 = "01z2dwl54hfqfyc8xmlz6kaw522s55jsdrdw31pjnzkn6rxf7zbf";
           };
         };
       in

From 270d0275c2bb3aeb0f26df1c8b1be3c9e837cbe8 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sun, 25 May 2025 14:19:17 +0300
Subject: [PATCH 1605/6226] rofi-rbw: move to pkgs/by-name

---
 pkgs/by-name/ro/rofi-rbw-wayland/package.nix        |  4 ++++
 pkgs/by-name/ro/rofi-rbw-x11/package.nix            |  4 ++++
 .../default.nix => by-name/ro/rofi-rbw/package.nix} | 12 ++++++------
 pkgs/top-level/all-packages.nix                     | 13 -------------
 4 files changed, 14 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/by-name/ro/rofi-rbw-wayland/package.nix
 create mode 100644 pkgs/by-name/ro/rofi-rbw-x11/package.nix
 rename pkgs/{applications/misc/rofi-rbw/default.nix => by-name/ro/rofi-rbw/package.nix} (89%)

diff --git a/pkgs/by-name/ro/rofi-rbw-wayland/package.nix b/pkgs/by-name/ro/rofi-rbw-wayland/package.nix
new file mode 100644
index 000000000000..df14e2c5f67c
--- /dev/null
+++ b/pkgs/by-name/ro/rofi-rbw-wayland/package.nix
@@ -0,0 +1,4 @@
+{ rofi-rbw }:
+rofi-rbw.override {
+  waylandSupport = true;
+}
diff --git a/pkgs/by-name/ro/rofi-rbw-x11/package.nix b/pkgs/by-name/ro/rofi-rbw-x11/package.nix
new file mode 100644
index 000000000000..80ef776daa51
--- /dev/null
+++ b/pkgs/by-name/ro/rofi-rbw-x11/package.nix
@@ -0,0 +1,4 @@
+{ rofi-rbw }:
+rofi-rbw.override {
+  x11Support = true;
+}
diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/by-name/ro/rofi-rbw/package.nix
similarity index 89%
rename from pkgs/applications/misc/rofi-rbw/default.nix
rename to pkgs/by-name/ro/rofi-rbw/package.nix
index 13f9e91244e5..54b65be783fe 100644
--- a/pkgs/applications/misc/rofi-rbw/default.nix
+++ b/pkgs/by-name/ro/rofi-rbw/package.nix
@@ -1,9 +1,7 @@
 {
   lib,
-  buildPythonApplication,
+  python3Packages,
   fetchFromGitHub,
-  configargparse,
-  hatchling,
   rbw,
 
   waylandSupport ? false,
@@ -15,7 +13,7 @@
   xdotool,
 }:
 
-buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "rofi-rbw";
   version = "1.5.1";
   format = "pyproject";
@@ -28,7 +26,7 @@ buildPythonApplication rec {
   };
 
   nativeBuildInputs = [
-    hatchling
+    python3Packages.hatchling
   ];
 
   buildInputs = [
@@ -43,7 +41,9 @@ buildPythonApplication rec {
     xdotool
   ];
 
-  propagatedBuildInputs = [ configargparse ];
+  propagatedBuildInputs = [
+    python3Packages.configargparse
+  ];
 
   pythonImportsCheck = [ "rofi_rbw" ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3b48eb8809a3..4e0df15c2457 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11839,19 +11839,6 @@ with pkgs;
 
   rofi-emoji = (callPackage ../applications/misc/rofi-emoji { }).v3;
 
-  rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw {
-    waylandSupport = false;
-    x11Support = false;
-  };
-
-  rofi-rbw-wayland = python3Packages.callPackage ../applications/misc/rofi-rbw {
-    waylandSupport = true;
-  };
-
-  rofi-rbw-x11 = python3Packages.callPackage ../applications/misc/rofi-rbw {
-    x11Support = true;
-  };
-
   # a somewhat more maintained fork of ympd
   memento = qt6Packages.callPackage ../applications/video/memento { };
 

From 2e28c9f6db72bd3e5476affa85974831d7484294 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sun, 13 Jul 2025 18:34:19 +0300
Subject: [PATCH 1606/6226] rofi-rbw: modernize and cleanup

- pyprojectize the recipe
- buildInputs were useless
- wrapper paths and flags belonged in a `let..in`
---
 pkgs/by-name/ro/rofi-rbw/package.nix | 64 ++++++++++++----------------
 1 file changed, 27 insertions(+), 37 deletions(-)

diff --git a/pkgs/by-name/ro/rofi-rbw/package.nix b/pkgs/by-name/ro/rofi-rbw/package.nix
index 54b65be783fe..c6d82037d52b 100644
--- a/pkgs/by-name/ro/rofi-rbw/package.nix
+++ b/pkgs/by-name/ro/rofi-rbw/package.nix
@@ -16,7 +16,7 @@
 python3Packages.buildPythonApplication rec {
   pname = "rofi-rbw";
   version = "1.5.1";
-  format = "pyproject";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fdw";
@@ -25,57 +25,47 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-Qdbz3UjWMCuJUzR6UMt/apt+OjMAr2U7uMtv9wxEZKE=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     python3Packages.hatchling
   ];
 
-  buildInputs = [
-    rbw
-  ]
-  ++ lib.optionals waylandSupport [
-    wl-clipboard
-    wtype
-  ]
-  ++ lib.optionals x11Support [
-    xclip
-    xdotool
-  ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     python3Packages.configargparse
   ];
 
   pythonImportsCheck = [ "rofi_rbw" ];
 
-  wrapper_paths = [
-    rbw
-  ]
-  ++ lib.optionals waylandSupport [
-    wl-clipboard
-    wtype
-  ]
-  ++ lib.optionals x11Support [
-    xclip
-    xdotool
-  ];
+  preFixup =
+    let
+      wrapperPaths = [
+        rbw
+      ]
+      ++ lib.optionals waylandSupport [
+        wl-clipboard
+        wtype
+      ]
+      ++ lib.optionals x11Support [
+        xclip
+        xdotool
+      ];
 
-  wrapper_flags =
-    lib.optionalString waylandSupport "--typer wtype --clipboarder wl-copy"
-    + lib.optionalString x11Support "--typer xdotool --clipboarder xclip";
+      wrapperFlags =
+        lib.optionalString waylandSupport " --typer wtype --clipboarder wl-copy"
+        + lib.optionalString x11Support " --typer xdotool --clipboarder xclip";
+    in
+    ''
+      makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath wrapperPaths} --add-flags "${wrapperFlags}")
+    '';
 
-  preFixup = ''
-    makeWrapperArgs+=(--prefix PATH : ${lib.makeBinPath wrapper_paths} --add-flags "${wrapper_flags}")
-  '';
-
-  meta = with lib; {
+  meta = {
     description = "Rofi frontend for Bitwarden";
     homepage = "https://github.com/fdw/rofi-rbw";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       equirosa
       dit7ya
     ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     mainProgram = "rofi-rbw";
   };
 }

From b0912adb84c68732c6f52a6b65d73d21070f7687 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 07:13:40 -0300
Subject: [PATCH 1607/6226] creduce: fix build with cmake4

Co-authored-by: Michael Daniels <mdaniels5757@gmail.com>
---
 pkgs/development/tools/misc/creduce/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix
index 3061968e2b71..abd83ca195a5 100644
--- a/pkgs/development/tools/misc/creduce/default.nix
+++ b/pkgs/development/tools/misc/creduce/default.nix
@@ -23,12 +23,16 @@ stdenv.mkDerivation {
     hash = "sha256-RbxFqZegsCxnUaIIA5OfTzx1wflCPeF+enQt90VwMgA=";
   };
 
-  postPatch =
+  postPatch = ''
+    substituteInPlace {clex,clang_delta,delta,unifdef,creduce,.}/CMakeLists.txt --replace-fail \
+    "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
+  ''
+  +
     # On Linux, c-reduce's preferred way to reason about
     # the cpu architecture/topology is to use 'lscpu',
     # so let's make sure it knows where to find it:
     lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteInPlace creduce/creduce_utils.pm --replace \
+      substituteInPlace creduce/creduce_utils.pm --replace-fail \
         lscpu ${util-linux}/bin/lscpu
     '';
 

From d17e964c45da45d795ea1d91425025f35efcf29b Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sun, 1 Jun 2025 22:07:32 +0300
Subject: [PATCH 1608/6226] rofi-emoji: move to pkgs/by-name, use v4

---
 pkgs/applications/misc/rofi-emoji/default.nix | 93 -------------------
 .../applications/misc/rofi-emoji/versions.nix | 18 ----
 .../0001-Patch-plugindir-to-output.patch      |  0
 pkgs/by-name/ro/rofi-emoji/package.nix        | 86 +++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 -
 5 files changed, 86 insertions(+), 113 deletions(-)
 delete mode 100644 pkgs/applications/misc/rofi-emoji/default.nix
 delete mode 100644 pkgs/applications/misc/rofi-emoji/versions.nix
 rename pkgs/{applications/misc => by-name/ro}/rofi-emoji/0001-Patch-plugindir-to-output.patch (100%)
 create mode 100644 pkgs/by-name/ro/rofi-emoji/package.nix

diff --git a/pkgs/applications/misc/rofi-emoji/default.nix b/pkgs/applications/misc/rofi-emoji/default.nix
deleted file mode 100644
index 520781f67cfc..000000000000
--- a/pkgs/applications/misc/rofi-emoji/default.nix
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  makeWrapper,
-
-  autoreconfHook,
-  pkg-config,
-
-  waylandSupport ? true,
-  x11Support ? true,
-
-  cairo,
-  glib,
-  libnotify,
-  rofi-unwrapped,
-  wl-clipboard,
-  xclip,
-  xdotool,
-  wtype,
-}:
-
-import ./versions.nix (
-  {
-    version,
-    hash,
-    patches,
-  }:
-  stdenv.mkDerivation rec {
-    pname = "rofi-emoji";
-    inherit version;
-
-    src = fetchFromGitHub {
-      owner = "Mange";
-      repo = "rofi-emoji";
-      rev = "v${version}";
-      inherit hash;
-    };
-
-    inherit patches;
-
-    postPatch = ''
-      patchShebangs clipboard-adapter.sh
-    '';
-
-    postFixup = ''
-      chmod +x $out/share/rofi-emoji/clipboard-adapter.sh
-      wrapProgram $out/share/rofi-emoji/clipboard-adapter.sh \
-       --prefix PATH ":" ${
-         lib.makeBinPath (
-           [ libnotify ]
-           ++ lib.optionals waylandSupport [
-             wl-clipboard
-             wtype
-           ]
-           ++ lib.optionals x11Support [
-             xclip
-             xdotool
-           ]
-         )
-       }
-    '';
-
-    nativeBuildInputs = [
-      autoreconfHook
-      pkg-config
-      makeWrapper
-    ];
-
-    buildInputs = [
-      cairo
-      glib
-      libnotify
-      rofi-unwrapped
-    ]
-    ++ lib.optionals waylandSupport [
-      wl-clipboard
-      wtype
-    ]
-    ++ lib.optionals x11Support [ xclip ];
-
-    meta = with lib; {
-      description = "Emoji selector plugin for Rofi";
-      homepage = "https://github.com/Mange/rofi-emoji";
-      license = licenses.mit;
-      maintainers = with maintainers; [
-        cole-h
-        Mange
-      ];
-      platforms = platforms.linux;
-    };
-  }
-)
diff --git a/pkgs/applications/misc/rofi-emoji/versions.nix b/pkgs/applications/misc/rofi-emoji/versions.nix
deleted file mode 100644
index 20b79d584634..000000000000
--- a/pkgs/applications/misc/rofi-emoji/versions.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-generic: {
-  v4 = generic {
-    version = "4.0.0";
-    hash = "sha256-864Mohxfc3EchBKtSNifxy8g8T8YBUQ/H7+8Ti6TiFo=";
-    patches = [
-      # Look for plugin-related files in $out/lib/rofi
-      ./0001-Patch-plugindir-to-output.patch
-    ];
-  };
-  v3 = generic {
-    version = "3.4.1";
-    hash = "sha256-ZHhgYytPB14zj2MS8kChRD+LTqXzHRrz7YIikuQD6i0=";
-    patches = [
-      # Look for plugin-related files in $out/lib/rofi
-      ./0001-Patch-plugindir-to-output.patch
-    ];
-  };
-}
diff --git a/pkgs/applications/misc/rofi-emoji/0001-Patch-plugindir-to-output.patch b/pkgs/by-name/ro/rofi-emoji/0001-Patch-plugindir-to-output.patch
similarity index 100%
rename from pkgs/applications/misc/rofi-emoji/0001-Patch-plugindir-to-output.patch
rename to pkgs/by-name/ro/rofi-emoji/0001-Patch-plugindir-to-output.patch
diff --git a/pkgs/by-name/ro/rofi-emoji/package.nix b/pkgs/by-name/ro/rofi-emoji/package.nix
new file mode 100644
index 000000000000..07432f337d77
--- /dev/null
+++ b/pkgs/by-name/ro/rofi-emoji/package.nix
@@ -0,0 +1,86 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  makeWrapper,
+
+  autoreconfHook,
+  pkg-config,
+
+  cairo,
+  glib,
+  libnotify,
+  rofi-unwrapped,
+
+  x11Support ? true,
+  xclip,
+  xdotool,
+
+  waylandSupport ? true,
+  wl-clipboard,
+  wtype,
+}:
+
+stdenv.mkDerivation (final: {
+  pname = "rofi-emoji";
+  version = "4.0.0";
+
+  src = fetchFromGitHub {
+    owner = "Mange";
+    repo = "rofi-emoji";
+    rev = "v${final.version}";
+    hash = "sha256-864Mohxfc3EchBKtSNifxy8g8T8YBUQ/H7+8Ti6TiFo=";
+  };
+
+  patches = [
+    # Look for plugin-related files in $out/lib/rofi
+    ./0001-Patch-plugindir-to-output.patch
+  ];
+
+  postPatch = ''
+    patchShebangs --host clipboard-adapter.sh
+  '';
+
+  postFixup = ''
+    chmod +x $out/share/rofi-emoji/clipboard-adapter.sh
+    wrapProgram $out/share/rofi-emoji/clipboard-adapter.sh \
+     --prefix PATH ":" ${
+       lib.makeBinPath (
+         [
+           libnotify
+         ]
+         ++ lib.optionals waylandSupport [
+           wl-clipboard
+           wtype
+         ]
+         ++ lib.optionals x11Support [
+           xclip
+           xdotool
+         ]
+       )
+     }
+  '';
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+    makeWrapper
+  ];
+
+  buildInputs = [
+    cairo
+    glib
+    rofi-unwrapped
+  ];
+
+  meta = {
+    description = "Emoji selector plugin for Rofi";
+    homepage = "https://github.com/Mange/rofi-emoji";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      cole-h
+      Mange
+    ];
+    platforms = lib.platforms.linux;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4e0df15c2457..a4aac3ea1ac4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11837,8 +11837,6 @@ with pkgs;
     withConplay = false;
   };
 
-  rofi-emoji = (callPackage ../applications/misc/rofi-emoji { }).v3;
-
   # a somewhat more maintained fork of ympd
   memento = qt6Packages.callPackage ../applications/video/memento { };
 

From e8b41122d1681017e2f6b1a4b10b1682d11957b5 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sat, 27 Sep 2025 19:53:08 +0300
Subject: [PATCH 1609/6226] rofi-emoji: remove explicit patchShebang-ing of
 clipboard-adapter.sh

it's executable, so it gets patchShebang-ed in fixupPhase anyway
---
 pkgs/by-name/ro/rofi-emoji/package.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/by-name/ro/rofi-emoji/package.nix b/pkgs/by-name/ro/rofi-emoji/package.nix
index 07432f337d77..12e7b1554cb6 100644
--- a/pkgs/by-name/ro/rofi-emoji/package.nix
+++ b/pkgs/by-name/ro/rofi-emoji/package.nix
@@ -37,12 +37,7 @@ stdenv.mkDerivation (final: {
     ./0001-Patch-plugindir-to-output.patch
   ];
 
-  postPatch = ''
-    patchShebangs --host clipboard-adapter.sh
-  '';
-
   postFixup = ''
-    chmod +x $out/share/rofi-emoji/clipboard-adapter.sh
     wrapProgram $out/share/rofi-emoji/clipboard-adapter.sh \
      --prefix PATH ":" ${
        lib.makeBinPath (

From 559b28ce6ed0673f2f0a69d148a71e73af0ad420 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sun, 1 Jun 2025 23:52:08 +0300
Subject: [PATCH 1610/6226] rofi-emoji: add update script

---
 pkgs/by-name/ro/rofi-emoji/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/ro/rofi-emoji/package.nix b/pkgs/by-name/ro/rofi-emoji/package.nix
index 12e7b1554cb6..ba348e52e598 100644
--- a/pkgs/by-name/ro/rofi-emoji/package.nix
+++ b/pkgs/by-name/ro/rofi-emoji/package.nix
@@ -19,6 +19,8 @@
   waylandSupport ? true,
   wl-clipboard,
   wtype,
+
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (final: {
@@ -68,6 +70,8 @@ stdenv.mkDerivation (final: {
     rofi-unwrapped
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Emoji selector plugin for Rofi";
     homepage = "https://github.com/Mange/rofi-emoji";

From 4e40d43c42991e5efd4af35f0a72303546a49308 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Sat, 27 Sep 2025 17:00:36 +0000
Subject: [PATCH 1611/6226] rofi-emoji: 4.0.0 -> 4.1.0

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

diff --git a/pkgs/by-name/ro/rofi-emoji/package.nix b/pkgs/by-name/ro/rofi-emoji/package.nix
index ba348e52e598..03ef3156716e 100644
--- a/pkgs/by-name/ro/rofi-emoji/package.nix
+++ b/pkgs/by-name/ro/rofi-emoji/package.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation (final: {
   pname = "rofi-emoji";
-  version = "4.0.0";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "Mange";
     repo = "rofi-emoji";
     rev = "v${final.version}";
-    hash = "sha256-864Mohxfc3EchBKtSNifxy8g8T8YBUQ/H7+8Ti6TiFo=";
+    hash = "sha256-Amaz+83mSPue+pjZq/pJiCxu5QczYvmJk6f96eraaK8=";
   };
 
   patches = [

From 78021c7da86d183b3ed85bda08c57e04151bc4c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Wed, 22 Oct 2025 13:30:13 +0200
Subject: [PATCH 1612/6226] Update pkgs/by-name/in/invidious/package.nix

Co-authored-by: Kenichi Kamiya <kachick1@gmail.com>
---
 pkgs/by-name/in/invidious/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix
index 71c4b3d2aea9..d01f5bf3406a 100644
--- a/pkgs/by-name/in/invidious/package.nix
+++ b/pkgs/by-name/in/invidious/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   callPackage,
-  crystal_1_17,
+  crystal_1_16,
   fetchFromGitHub,
   librsvg,
   pkg-config,

From 6a26c663358dec6488c8a9f71ee124a462c6e11f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 22 Oct 2025 13:33:41 +0200
Subject: [PATCH 1613/6226] ci/eval/compare/maintainers: disable aliases

We should never try to ping maintainers through package aliases, this
can only lead to errors. One example case is, where an attribute is a
throw alias, but then re-introduced in a PR. This would trigger the
throw. By disabling aliases, we can fallback gracefully.
---
 ci/eval/compare/maintainers.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
index fef5ecb8d9b9..b3ebf6aee569 100644
--- a/ci/eval/compare/maintainers.nix
+++ b/ci/eval/compare/maintainers.nix
@@ -7,7 +7,13 @@
   removedattrs,
 }:
 let
-  pkgs = import ../../.. { system = "x86_64-linux"; };
+  pkgs = import ../../.. {
+    system = "x86_64-linux";
+    # We should never try to ping maintainers through package aliases, this can only lead to errors.
+    # One example case is, where an attribute is a throw alias, but then re-introduced in a PR.
+    # This would trigger the throw. By disabling aliases, we can fallback gracefully below.
+    config.allowAliases = false;
+  };
 
   changedpaths = lib.importJSON changedpathsjson;
 

From 8edb1fc3c2b2dfdf212e0e32d1efe2e2bf47e723 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 22 Oct 2025 13:39:38 +0200
Subject: [PATCH 1614/6226] workflows/prepare: retry automatically

We have seen API errors in the prepare scripts frequently the last
couple of days. A quick fix should be to retry these requests.
---
 .github/workflows/pr.yml   | 1 +
 .github/workflows/test.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 9f4a2ba4d0b4..d443d68cdad9 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -40,6 +40,7 @@ jobs:
       - id: prepare
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
+          retries: 3
           script: |
             require('./ci/github-script/prepare.js')({
               github,
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 0d5f20e3b57b..4431e89954f3 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -27,6 +27,7 @@ jobs:
       - id: prepare
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
+          retries: 3
           script: |
             require('./ci/github-script/prepare.js')({
               github,

From a14c83cdebefe94b2e1457c0733ba743b35681b6 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 08:45:40 -0300
Subject: [PATCH 1615/6226] maia-icon-theme: fix build with cmake4

---
 pkgs/data/icons/maia-icon-theme/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/data/icons/maia-icon-theme/default.nix b/pkgs/data/icons/maia-icon-theme/default.nix
index e0558ce70c38..295f595a57b1 100644
--- a/pkgs/data/icons/maia-icon-theme/default.nix
+++ b/pkgs/data/icons/maia-icon-theme/default.nix
@@ -39,6 +39,13 @@ stdenv.mkDerivation {
 
   dontWrapQtApps = true;
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace {icons,icons-dark}/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = ''
     for theme in $out/share/icons/*; do
       gtk-update-icon-cache $theme

From db8d5de6f55767477ba0fd02a0ea4be9b82914c5 Mon Sep 17 00:00:00 2001
From: Thibault Gagnaux <thibault.gagnaux@bit.admin.ch>
Date: Tue, 21 Oct 2025 11:44:03 +0200
Subject: [PATCH 1616/6226] {gpclient,gpauth}: update 2.4.1 -> 2.4.6

---
 pkgs/by-name/gp/gpauth/package.nix   |  6 +++---
 pkgs/by-name/gp/gpclient/package.nix | 10 ++++++++++
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix
index a78cddb2f7fe..2b31edcb2836 100644
--- a/pkgs/by-name/gp/gpauth/package.nix
+++ b/pkgs/by-name/gp/gpauth/package.nix
@@ -11,18 +11,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "gpauth";
-  version = "2.4.1";
+  version = "2.4.6";
 
   src = fetchFromGitHub {
     owner = "yuezk";
     repo = "GlobalProtect-openconnect";
     rev = "v${version}";
-    hash = "sha256-MY4JvftrC6sR8M0dFvnGZOkvHIhPRcyct9AG/8527gw=";
+    hash = "sha256-AxerhMQBgEgeecKAhedokMdpra1C9iqhutPrdAQng6Q=";
   };
 
   buildAndTestSubdir = "apps/gpauth";
 
-  cargoHash = "sha256-8LSGuRnWRWeaY6t25GdZ2y4hGIJ+mP3UBXRjcvPuD6U=";
+  cargoHash = "sha256-oPnBpwE8bdYgve1Dh64WNjWXClSRoHL5PVwrB1ovU6Y=";
 
   nativeBuildInputs = [
     perl
diff --git a/pkgs/by-name/gp/gpclient/package.nix b/pkgs/by-name/gp/gpclient/package.nix
index 78e6c0a975bf..0412494e614b 100644
--- a/pkgs/by-name/gp/gpclient/package.nix
+++ b/pkgs/by-name/gp/gpclient/package.nix
@@ -8,6 +8,11 @@
   perl,
   pkg-config,
   vpnc-scripts,
+  glib,
+  pango,
+  cairo,
+  atk,
+  gtk3,
 }:
 
 rustPlatform.buildRustPackage {
@@ -32,6 +37,11 @@ rustPlatform.buildRustPackage {
     openconnect
     openssl
     glib-networking
+    glib
+    pango
+    cairo
+    atk
+    gtk3
   ];
 
   preConfigure = ''

From 4d268775b4b9afcbe2461c31ccc3ccbf81f5eade Mon Sep 17 00:00:00 2001
From: Mirza Arnaut <mirza.arnaut45@gmail.com>
Date: Tue, 21 Oct 2025 17:02:49 +0200
Subject: [PATCH 1617/6226] beszel: add arunoruto to maintainers list

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

diff --git a/pkgs/by-name/be/beszel/package.nix b/pkgs/by-name/be/beszel/package.nix
index 79f012fdaea4..b30719113978 100644
--- a/pkgs/by-name/be/beszel/package.nix
+++ b/pkgs/by-name/be/beszel/package.nix
@@ -73,7 +73,10 @@ buildGoModule rec {
     homepage = "https://github.com/henrygd/beszel";
     changelog = "https://github.com/henrygd/beszel/releases/tag/v${version}";
     description = "Lightweight server monitoring hub with historical data, docker stats, and alerts";
-    maintainers = with lib.maintainers; [ bot-wxt1221 ];
+    maintainers = with lib.maintainers; [
+      bot-wxt1221
+      arunoruto
+    ];
     license = lib.licenses.mit;
   };
 }

From fbc0a134eaa3565fe6af532b36367509a2d238cd Mon Sep 17 00:00:00 2001
From: Simon Hauser <simon.hauser@helsinki-systems.de>
Date: Wed, 22 Oct 2025 14:15:50 +0200
Subject: [PATCH 1618/6226] proxysql: 3.0.1 -> 3.0.2

Changelog: https://github.com/sysown/proxysql/releases/tag/v3.0.2
---
 pkgs/by-name/pr/proxysql/makefiles.patch | 35 +++++++++++++++++++-----
 pkgs/by-name/pr/proxysql/package.nix     |  4 +--
 2 files changed, 30 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/pr/proxysql/makefiles.patch b/pkgs/by-name/pr/proxysql/makefiles.patch
index cf6328920254..17facc6744c1 100644
--- a/pkgs/by-name/pr/proxysql/makefiles.patch
+++ b/pkgs/by-name/pr/proxysql/makefiles.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile b/Makefile
-index b9ad6f71..60e71a86 100644
+index 01aa5730..6c71b3a5 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -81,10 +81,7 @@ endif
@@ -35,7 +35,7 @@ index b9ad6f71..60e71a86 100644
  	install -m 0755 etc/init.d/proxysql /etc/init.d
  ifeq ($(DISTRO),"CentOS Linux")
 diff --git a/deps/Makefile b/deps/Makefile
-index 7c8fcc85..4ae0aba1 100644
+index 87d2a20e..505e069a 100644
 --- a/deps/Makefile
 +++ b/deps/Makefile
 @@ -61,27 +61,22 @@ default: $(targets)
@@ -66,7 +66,7 @@ index 7c8fcc85..4ae0aba1 100644
  	cd libhttpserver/libhttpserver && patch -p1 < ../noexcept.patch
  	cd libhttpserver/libhttpserver && patch -p1 < ../re2_regex.patch
  	cd libhttpserver/libhttpserver && patch -p1 < ../final_val_post_process.patch
-@@ -99,58 +94,49 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a
+@@ -99,77 +94,66 @@ libhttpserver: libhttpserver/libhttpserver/build/src/.libs/libhttpserver.a
  
  
  libev/libev/.libs/libev.a:
@@ -83,7 +83,8 @@ index 7c8fcc85..4ae0aba1 100644
  	cd coredumper && rm -rf coredumper-*/ || true
  	cd coredumper && tar -zxf coredumper-*.tar.gz
  	cd coredumper/coredumper && patch -p1 < ../includes.patch
- 	cd coredumper/coredumper && cmake . -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Debug
+-	cd coredumper/coredumper && cmake . -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Debug
++	cd coredumper/coredumper && cmake . -DBUILD_TESTING=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_BUILD_TYPE=Debug -DCMAKE_POLICY_VERSION_MINIMUM=3.5
  	cd coredumper/coredumper && CC=${CC} CXX=${CXX} ${MAKE}
  coredumper: coredumper/coredumper/src/libcoredumper.a
  
@@ -125,7 +126,18 @@ index 7c8fcc85..4ae0aba1 100644
  	cd lz4/lz4 && CC=${CC} CXX=${CXX} ${MAKE}
  
  lz4: lz4/lz4/lib/liblz4.a
-@@ -168,8 +154,6 @@ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-s
+ 
+ 
+ clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a:
+ 	cd clickhouse-cpp && rm -rf clickhouse-cpp-*/ || true
+ 	cd clickhouse-cpp && tar -zxf v2.3.0.tar.gz
+ 	cd clickhouse-cpp && ln -fs clickhouse-cpp-*/ clickhouse-cpp
+ 	cd clickhouse-cpp/clickhouse-cpp && patch clickhouse/base/wire_format.h < ../wire_format.patch
+-	cd clickhouse-cpp/clickhouse-cpp && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo .
++	cd clickhouse-cpp/clickhouse-cpp && cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_POLICY_VERSION_MINIMUM=3.5 .
+ 	cd clickhouse-cpp/clickhouse-cpp && CC=${CC} CXX=${CXX} ${MAKE}
+ 
+ clickhouse-cpp: clickhouse-cpp/clickhouse-cpp/clickhouse/libclickhouse-cpp-lib-static.a
  
  
  libdaemon/libdaemon/libdaemon/.libs/libdaemon.a:
@@ -134,6 +146,15 @@ index 7c8fcc85..4ae0aba1 100644
  	cd libdaemon/libdaemon && patch -p0 < ../daemon_fork_umask.patch
  	cd libdaemon/libdaemon && cp ../config.guess . && chmod +x config.guess && cp ../config.sub . && chmod +x config.sub && ./configure --disable-examples
  	cd libdaemon/libdaemon && CC=${CC} CXX=${CXX} ${MAKE}
+@@ -194,7 +178,7 @@ mariadb-client-library/mariadb_client/libmariadb/libmariadbclient.a:
+ 	cd mariadb-client-library && rm -rf mariadb-connector-c-*/ || true
+ 	cd mariadb-client-library && tar -zxf mariadb-connector-c-3.3.8-src.tar.gz
+ 	cd mariadb-client-library/mariadb_client && patch -p0 < ../plugin_auth_CMakeLists.txt.patch
+-	cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include .
++	cd mariadb-client-library/mariadb_client && cmake . -Wno-dev -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DCMAKE_BUILD_TYPE=RelWithDebInfo -DOPENSSL_ROOT_DIR=$(SSL_IDIR) -DOPENSSL_LIBRARIES=$(SSL_LDIR) -DICONV_LIBRARIES=$(brew --prefix libiconv)/lib -DICONV_INCLUDE=$(brew --prefix libiconv)/include .
+ ifeq ($(PROXYDEBUG),1)
+ 	cd mariadb-client-library/mariadb_client && patch -p0 < ../ma_context.h.patch
+ else ifeq ($(USEVALGRIND),1)
 @@ -253,18 +237,13 @@ sqlite3/sqlite3/sqlite3.o:
  sqlite3: sqlite3/sqlite3/sqlite3.o
  
@@ -170,8 +191,8 @@ index 7c8fcc85..4ae0aba1 100644
 -	cd postgresql && tar -zxf postgresql-*.tar.gz
  	cd postgresql/postgresql && patch -p0 < ../get_result_from_pgconn.patch
  	cd postgresql/postgresql && patch -p0 < ../handle_row_data.patch
- 	#cd postgresql/postgresql && LD_LIBRARY_PATH="$(shell pwd)/libssl/openssl" ./configure --with-ssl=openssl --with-includes="$(shell pwd)/libssl/openssl/include/" --with-libraries="$(shell pwd)/libssl/openssl/" --without-readline --enable-debug  CFLAGS="-ggdb -O0 -fno-omit-frame-pointer" CPPFLAGS="-g -O0"
-@@ -360,4 +335,3 @@ cleanall:
+ 	cd postgresql/postgresql && patch -p0 < ../fmt_err_msg.patch
+@@ -361,4 +336,3 @@ cleanall:
  	cd libusual && rm -rf libusual-*/ || true
  	cd libscram && rm -rf lib/* obj/* || true
  .PHONY: cleanall
diff --git a/pkgs/by-name/pr/proxysql/package.nix b/pkgs/by-name/pr/proxysql/package.nix
index 0d9012a2054a..6efeb676bec4 100644
--- a/pkgs/by-name/pr/proxysql/package.nix
+++ b/pkgs/by-name/pr/proxysql/package.nix
@@ -37,13 +37,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "proxysql";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchFromGitHub {
     owner = "sysown";
     repo = "proxysql";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yGxn46Vm8YdtIvvoTlOHQ1aAP2J/h/kFqr4ehruDsTw=";
+    hash = "sha256-kbfuUulEDPx/5tpp7uOkIXQuyaFYzos3crCvkWHSmHg=";
   };
 
   patches = [

From 0a858cf0db5d631f523e3a311142db3349b48fb1 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 22 Oct 2025 12:19:21 +0000
Subject: [PATCH 1619/6226] maintainers: add BronzeDeer

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index df1dff6b5564..0a0ff9f25a9b 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -3836,6 +3836,11 @@
     githubId = 40476330;
     name = "brokenpip3";
   };
+  BronzeDeer = {
+    github = "BronzeDeer";
+    githubId = 74385045;
+    name = "Joël Pepper";
+  };
   brpaz = {
     email = "oss@brunopaz.dev";
     github = "brpaz";

From 60da627bb15b895f633c666de55cfe4ce8d906d0 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Mon, 13 Oct 2025 14:50:23 +0000
Subject: [PATCH 1620/6226] zsh-completion-sync: init at 0.3.3

---
 .../zs/zsh-completion-sync/package.nix        | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pkgs/by-name/zs/zsh-completion-sync/package.nix

diff --git a/pkgs/by-name/zs/zsh-completion-sync/package.nix b/pkgs/by-name/zs/zsh-completion-sync/package.nix
new file mode 100644
index 000000000000..d094b8964c78
--- /dev/null
+++ b/pkgs/by-name/zs/zsh-completion-sync/package.nix
@@ -0,0 +1,36 @@
+{
+  stdenvNoCC,
+  lib,
+  fetchFromGitHub,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "zsh-completion-sync";
+  version = "0.3.3";
+
+  src = fetchFromGitHub {
+    owner = "BronzeDeer";
+    repo = "zsh-completion-sync";
+    rev = "v${finalAttrs.version}";
+    sha256 = "sha256-GTW4nLVW1/09aXNnZJuKs12CoalzWGKB79VsQ2a2Av4=";
+  };
+
+  strictDeps = true;
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    install -D zsh-completion-sync.plugin.zsh  $out/share/zsh-completion-sync/zsh-completion-sync.plugin.zsh
+  '';
+
+  meta = {
+    description = "Automatically loads completions added dynamically to FPATH or XDG_DATA_DIRS";
+    homepage = "https://github.com/BronzeDeer/zsh-completion-sync";
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [
+      ambroisie
+      BronzeDeer
+    ];
+  };
+})

From b9a335b180e8f61b3e027add1d0ade0ef61ce986 Mon Sep 17 00:00:00 2001
From: Julia Brunenberg <julia@jjim.de>
Date: Wed, 22 Oct 2025 12:04:37 +0200
Subject: [PATCH 1621/6226] qdmr: add maintainer juliabru

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

diff --git a/pkgs/by-name/qd/qdmr/package.nix b/pkgs/by-name/qd/qdmr/package.nix
index ec24d4032f95..a307759560e1 100644
--- a/pkgs/by-name/qd/qdmr/package.nix
+++ b/pkgs/by-name/qd/qdmr/package.nix
@@ -77,7 +77,10 @@ stdenv.mkDerivation rec {
     description = "GUI application and command line tool for programming DMR radios";
     homepage = "https://dm3mat.darc.de/qdmr/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ _0x4A6F ];
+    maintainers = with lib.maintainers; [
+      _0x4A6F
+      juliabru
+    ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };
 }

From dacb222c4bd18164436aca370a1f53ea496dc321 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 09:51:45 -0300
Subject: [PATCH 1622/6226] marl: fix build with cmake4

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

diff --git a/pkgs/by-name/ma/marl/package.nix b/pkgs/by-name/ma/marl/package.nix
index ae5e576bc9c7..b2e338d11bca 100644
--- a/pkgs/by-name/ma/marl/package.nix
+++ b/pkgs/by-name/ma/marl/package.nix
@@ -21,6 +21,11 @@ stdenv.mkDerivation {
   # Turn on the flag to install after building the library.
   cmakeFlags = [ "-DMARL_INSTALL=ON" ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/google/marl";
     description = "Hybrid thread / fiber task scheduler written in C++ 11";

From 75944f5f77306a11d27deea6f4ca4fd01fe27497 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 12:52:20 +0000
Subject: [PATCH 1623/6226] versatiles: 1.0.1 -> 1.1.0

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

diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix
index 1fd54eed863b..ae1a9420df2c 100644
--- a/pkgs/by-name/ve/versatiles/package.nix
+++ b/pkgs/by-name/ve/versatiles/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "versatiles";
-  version = "1.0.1"; # When updating: Replace with current version
+  version = "1.1.0"; # When updating: Replace with current version
 
   src = fetchFromGitHub {
     owner = "versatiles-org";
     repo = "versatiles-rs";
     tag = "v${version}"; # When updating: Replace with long commit hash of new version
-    hash = "sha256-Byc8w1NCJbLPInXgva41CO2SnqWRubXeELJLlMFf54k="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
+    hash = "sha256-yGvU/2DUL9PboDhcjxxxXHeBlrUe7vvcxKKWv03bqeA="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
   };
 
-  cargoHash = "sha256-kWRzxaGDVV3FuVrg+hqpCHPvbCQ0KMO1luCgNiNHYeg="; # When updating: Same as above
+  cargoHash = "sha256-QD76WR3xnZBcfnQA0G9AOQa9aIdzWazDr3Ya+kL8iCE="; # When updating: Same as above
 
   __darwinAllowLocalNetworking = true;
 

From e42d9749b054a5948e522f5da08e3873b5ba1725 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 12:54:56 +0000
Subject: [PATCH 1624/6226] subxt: 0.43.0 -> 0.44.0

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

diff --git a/pkgs/by-name/su/subxt/package.nix b/pkgs/by-name/su/subxt/package.nix
index 6d176cd6c643..b36424f3e907 100644
--- a/pkgs/by-name/su/subxt/package.nix
+++ b/pkgs/by-name/su/subxt/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "subxt";
-  version = "0.43.0";
+  version = "0.44.0";
 
   src = fetchFromGitHub {
     owner = "paritytech";
     repo = "subxt";
     rev = "v${version}";
-    hash = "sha256-BV/zP0L0gDmLSuzkp4OkOPfgldXBUiaHL4rciM7lrno=";
+    hash = "sha256-gn8PdVvXGDEAfeDMXtMILsGBTy6y1jFdYXVeFrbHNyo=";
   };
 
-  cargoHash = "sha256-7kmxnlhgNj0hY9FwVrzmdHw73Jf/pSeTHi6sqDg9X24=";
+  cargoHash = "sha256-JLQr2GDdAFXlsr2F9a5VQ8HwAFpEhYWfsLEdLfABGDM=";
 
   # Only build the command line client
   cargoBuildFlags = [

From 1dd72fcd9a6baa34346245047597920150dd69c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 13:00:05 +0000
Subject: [PATCH 1625/6226] sentry-cli: 2.56.1 -> 2.57.0

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

diff --git a/pkgs/by-name/se/sentry-cli/package.nix b/pkgs/by-name/se/sentry-cli/package.nix
index 4011acc62608..8ba3950aaa1d 100644
--- a/pkgs/by-name/se/sentry-cli/package.nix
+++ b/pkgs/by-name/se/sentry-cli/package.nix
@@ -9,13 +9,13 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "sentry-cli";
-  version = "2.56.1";
+  version = "2.57.0";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-cli";
     rev = version;
-    hash = "sha256-2T4HEWEcT8ehy5wQqKlBPx2MyusLYg8eM/fWlZ83HAw=";
+    hash = "sha256-VcWIeWLWQpEDJhF0f95S9sQ0yC1NJqisOmEONINtKeA=";
   };
   doCheck = false;
 
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  cargoHash = "sha256-6AM1oGX4q6kHePiS0fsoXPt0b89O9WItIBukPIwapJQ=";
+  cargoHash = "sha256-S+A6v4rva8c7QuWP/5dRzUtJDdWryb8Jmu2J4JurNMM=";
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd sentry-cli \

From 1d5d744033d75dbf141a4fe9acd214ba43f03d56 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 22 Oct 2025 13:13:33 +0200
Subject: [PATCH 1626/6226] python3Packages.django-treenode: init at 0.23.2

required for paperless-ngx 2.19.0
---
 .../django-treenode/default.nix               | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-treenode/default.nix

diff --git a/pkgs/development/python-modules/django-treenode/default.nix b/pkgs/development/python-modules/django-treenode/default.nix
new file mode 100644
index 000000000000..a445a478121d
--- /dev/null
+++ b/pkgs/development/python-modules/django-treenode/default.nix
@@ -0,0 +1,40 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  django,
+}:
+
+buildPythonPackage rec {
+  pname = "django-treenode";
+  version = "0.23.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "fabiocaccamo";
+    repo = "django-treenode";
+    tag = version;
+    hash = "sha256-9AG8ntuXHB3jUHRKFDh7OOT5c0Nt8uAZnf5dR7xC/Bc=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    django
+  ];
+
+  pythonImportsCheck = [
+    "treenode"
+  ];
+
+  meta = {
+    description = "Deciduous_tree: probably the best abstract model/admin for your tree based stuff";
+    homepage = "https://github.com/fabiocaccamo/django-treenode";
+    changelog = "https://github.com/fabiocaccamo/django-treenode/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ leona ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ea017e16abb6..0ede87779691 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4156,6 +4156,8 @@ self: super: with self; {
 
   django-treebeard = callPackage ../development/python-modules/django-treebeard { };
 
+  django-treenode = callPackage ../development/python-modules/django-treenode { };
+
   django-two-factor-auth = callPackage ../development/python-modules/django-two-factor-auth { };
 
   django-types = callPackage ../development/python-modules/django-types { };

From 997e93908aed94b8d97d3e14265fd6934040629d Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 22 Oct 2025 13:13:33 +0200
Subject: [PATCH 1627/6226] python3Packages.gotenberg-client: 0.11.0 -> 0.12.0

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

diff --git a/pkgs/development/python-modules/gotenberg-client/default.nix b/pkgs/development/python-modules/gotenberg-client/default.nix
index 3f2cb9c04844..85a752ea301d 100644
--- a/pkgs/development/python-modules/gotenberg-client/default.nix
+++ b/pkgs/development/python-modules/gotenberg-client/default.nix
@@ -9,14 +9,14 @@
 }:
 buildPythonPackage rec {
   pname = "gotenberg-client";
-  version = "0.11.0";
+  version = "0.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "stumpylog";
     repo = "gotenberg-client";
     tag = version;
-    hash = "sha256-a/GXVhZtxGgmx5mb8hozbXAI9ecrl0c6BIz3BNekA8Q=";
+    hash = "sha256-+beO1Pp+ikfk4gqpfvIEHCOPZGLanGX6Kw4mqJglJTI=";
   };
 
   build-system = [ hatchling ];

From d28f7498c973875ccd097cb030d2c12f0fcbf515 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 22 Oct 2025 13:13:33 +0200
Subject: [PATCH 1628/6226] paperless-ngx: 2.18.4 -> 2.19.0

https://github.com/paperless-ngx/paperless-ngx/releases/tag/v2.19.0
---
 pkgs/by-name/pa/paperless-ngx/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 0fad77fe6a12..a518dc7625f9 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -28,13 +28,13 @@
   xorg,
 }:
 let
-  version = "2.18.4";
+  version = "2.19.0";
 
   src = fetchFromGitHub {
     owner = "paperless-ngx";
     repo = "paperless-ngx";
     tag = "v${version}";
-    hash = "sha256-sQ5laFO6DSg+4tF9jk2yuV0q2Vp7VC/+hu2XrVj8/bY=";
+    hash = "sha256-t2T42K+F3PaMfNDFa3NF/rAcG6izKTXMIzgD68WdVFE=";
   };
 
   python = python3.override {
@@ -80,7 +80,7 @@ let
     pnpmDeps = pnpm.fetchDeps {
       inherit (finalAttrs) pname version src;
       fetcherVersion = 2;
-      hash = "sha256-fs9a2uI/TnWalQ/qRb6m4d1CsU7O6VYCJMz2xWLdC0I=";
+      hash = "sha256-AJp796oO8qOltPKndOXlLx1luCOfzsRSFscCUCe6MZo=";
     };
 
     nativeBuildInputs = [
@@ -168,10 +168,9 @@ python.pkgs.buildPythonApplication rec {
 
   pythonRelaxDeps = [
     "django-allauth"
-    "django-guardian"
+    "django-cors-headers"
+    "drf-spectacular-sidecar"
     "filelock"
-    "ocrmypdf"
-    "rapidfuzz"
     "redis"
   ];
 
@@ -207,6 +206,7 @@ python.pkgs.buildPythonApplication rec {
       django-guardian
       django-multiselectfield
       django-soft-delete
+      django-treenode
       djangorestframework
       djangorestframework-guardian
       drf-spectacular

From f616d62caed9212f2d90fc92bf075079988059dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 13:15:47 +0000
Subject: [PATCH 1629/6226] python3Packages.python-toolbox: 1.0.11 -> 1.2.8

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

diff --git a/pkgs/development/python-modules/python-toolbox/default.nix b/pkgs/development/python-modules/python-toolbox/default.nix
index f4a6e1ba8edf..358037d3c8eb 100644
--- a/pkgs/development/python-modules/python-toolbox/default.nix
+++ b/pkgs/development/python-modules/python-toolbox/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "python-toolbox";
-  version = "1.0.11";
+  version = "1.2.8";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "cool-RR";
     repo = "python_toolbox";
     tag = version;
-    hash = "sha256-Y9RmVndgsBESrUCEORUwAdaFYBiunY3kWArhB9d7bw4=";
+    hash = "sha256-jP7umFVyt7myF9SwV8b+shh6ZDwVDCZKlF+6zMkR3+M=";
   };
 
   build-system = [ setuptools ];

From 3de0aa85e2f9d5cc4e9bbdd985952dfd32fc3d50 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 13:16:44 +0000
Subject: [PATCH 1630/6226] ipxe: 1.21.1-unstable-2025-10-16 ->
 1.21.1-unstable-2025-10-20

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

diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix
index 89299e2ef688..3919d76f122c 100644
--- a/pkgs/by-name/ip/ipxe/package.nix
+++ b/pkgs/by-name/ip/ipxe/package.nix
@@ -48,7 +48,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ipxe";
-  version = "1.21.1-unstable-2025-10-16";
+  version = "1.21.1-unstable-2025-10-20";
 
   nativeBuildInputs = [
     mtools
@@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ipxe";
     repo = "ipxe";
-    rev = "c1badf71ca22f94277873ebc6171bfa41a50e378";
-    hash = "sha256-emPO4DRVr/rQZgr+Tnvg3+oijhh9IzG1TH0BWu96oBY=";
+    rev = "c8f088d4e11a1dedda4829c4be1bb1b14e9da016";
+    hash = "sha256-rNs9KIxK8Q6imv1h7qVE516JccYHNzLUWJrv6sKGRWo=";
   };
 
   # Calling syslinux on a FAT image isn't going to work on Aarch64.

From 7ac0bf8ee4cdf5e3d9687123e0692458a46d590d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 22 Oct 2025 15:25:53 +0200
Subject: [PATCH 1631/6226] ktailctl: 0.21.2 -> 0.21.3

Diff: https://github.com/f-koehler/KTailctl/compare/v0.21.2...v0.21.3
---
 pkgs/by-name/kt/ktailctl/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/kt/ktailctl/package.nix b/pkgs/by-name/kt/ktailctl/package.nix
index 26207bd9d4de..3f684aed23cf 100644
--- a/pkgs/by-name/kt/ktailctl/package.nix
+++ b/pkgs/by-name/kt/ktailctl/package.nix
@@ -1,9 +1,9 @@
 {
-  buildGo124Module,
+  buildGoModule,
   cmake,
   fetchFromGitHub,
   git,
-  go_1_24,
+  go,
   lib,
   nlohmann_json,
   stdenv,
@@ -11,21 +11,21 @@
 }:
 
 let
-  version = "0.21.2";
+  version = "0.21.3";
 
   src = fetchFromGitHub {
     owner = "f-koehler";
     repo = "KTailctl";
     rev = "v${version}";
-    hash = "sha256-CP5ivqhYVCotsL6e9eV9L1OGr2W+vNHJOq8hMYj7g/o=";
+    hash = "sha256-BKVq6d8CDmAOGULKoxXtlGbtgNu7wfsQnsyYV7PiFfc=";
   };
 
   goDeps =
-    (buildGo124Module {
+    (buildGoModule {
       pname = "ktailctl-go-wrapper";
       inherit src version;
       modRoot = "src/wrapper";
-      vendorHash = "sha256-uZydTufEpGKbX3T3Zm4WTU2ZZNhC6oHSb/sHPM4ekmQ=";
+      vendorHash = "sha256-RhVZ1yXm+gJHM993Iw1XM/w/O1YiG6Mt4YMK+0JqRpg=";
     }).goModules;
 in
 stdenv.mkDerivation {
@@ -50,7 +50,7 @@ stdenv.mkDerivation {
     cmake
     extra-cmake-modules
     git
-    go_1_24
+    go
     wrapQtAppsHook
   ];
 

From 13a6d7fc6d56ce5e4514dfe06e0c2a184f48a471 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 13:29:17 +0000
Subject: [PATCH 1632/6226] opentabletdriver: 0.6.6.1 -> 0.6.6.2

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

diff --git a/pkgs/by-name/op/opentabletdriver/package.nix b/pkgs/by-name/op/opentabletdriver/package.nix
index 2e5a79bdb483..04a3730acb58 100644
--- a/pkgs/by-name/op/opentabletdriver/package.nix
+++ b/pkgs/by-name/op/opentabletdriver/package.nix
@@ -23,13 +23,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "OpenTabletDriver";
-  version = "0.6.6.1";
+  version = "0.6.6.2";
 
   src = fetchFromGitHub {
     owner = "OpenTabletDriver";
     repo = "OpenTabletDriver";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ixckDFE/LCSncNGjXqPT5GurPhm5aSVALOw4ZrBa5Ww=";
+    hash = "sha256-OeioFdevYPiLl9w7FXVmpbcp1cIMoMYnSLgoBisOOOU=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;

From 2bebb656992db02d4e217a57427f69e751a18cd4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 13:35:04 +0000
Subject: [PATCH 1633/6226] nemu: 3.3.1 -> 3.4.0

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

diff --git a/pkgs/by-name/ne/nemu/package.nix b/pkgs/by-name/ne/nemu/package.nix
index 0ec873b2faac..329754fe2c1b 100644
--- a/pkgs/by-name/ne/nemu/package.nix
+++ b/pkgs/by-name/ne/nemu/package.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nemu";
-  version = "3.3.1";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "nemuTUI";
     repo = "nemu";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-6WzqBkspKKs1e8kg1i71ntZHa78s5pJ1u02mXvzpiEc=";
+    hash = "sha256-QvyCBHZmahZPIghPX53HcL5HsOVvhsVwdMZosVQ9A5U=";
   };
 
   cmakeFlags = [

From dbaaa4b058687335828393302dfd8f25f4aa73fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 13:42:48 +0000
Subject: [PATCH 1634/6226] python3Packages.plugwise: 1.8.0 -> 1.8.2

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

diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index 31be8adb7114..8b63f53d48a6 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "plugwise";
-  version = "1.8.0";
+  version = "1.8.2";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "plugwise";
     repo = "python-plugwise";
     tag = "v${version}";
-    hash = "sha256-a0svh7FyQbuo74gIRxPA8WiFSG7zKkA0oZgztAmfd4o=";
+    hash = "sha256-9mJznR6iUyKBojMaSxlsaP4XjaHtYMPkq/wGr5F90ik=";
   };
 
   postPatch = ''

From a943d89fb0228aced3f9007fe8cbf605001c38ba Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 22 Oct 2025 13:03:55 +0200
Subject: [PATCH 1635/6226] linux_5_4: remove

See https://endoflife.date/linux

Will be end of life on 2025-12-31 which is well within the timespan of
25.11.
---
 .../manual/release-notes/rl-2511.section.md   |  2 +
 nixos/tests/kernel-generic/default.nix        |  1 -
 .../os-specific/linux/kernel/kernels-org.json |  5 --
 .../os-specific/linux/kernel/linux-rt-5.4.nix | 60 -------------------
 pkgs/top-level/linux-kernels.nix              | 25 +++-----
 5 files changed, 9 insertions(+), 84 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/kernel/linux-rt-5.4.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index d1285109a0ce..62d661579955 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -178,6 +178,8 @@
 
 - `hardware.amdgpu.amdvlk` and the `amdvlk` package have been removed, as they have been deprecated by AMD. These have been replaced with the RADV driver from Mesa, which is enabled by default.
 
+- Linux 5.4 and all its variants have been removed since mainline will reach its end of life within the support-span of 25.11.
+
 - The `services.polipo` module has been removed as `polipo` is unmaintained and archived upstream.
 
 - `virtualisation.lxd` has been removed due to lack of Nixpkgs maintenance. Users can migrate to `virtualisation.incus`, a fork of LXD, as a replacement. See [Incus migration documentation](https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/) for migration information.
diff --git a/nixos/tests/kernel-generic/default.nix b/nixos/tests/kernel-generic/default.nix
index 0fd9672d4006..60337d82bb70 100644
--- a/nixos/tests/kernel-generic/default.nix
+++ b/nixos/tests/kernel-generic/default.nix
@@ -81,7 +81,6 @@ let
   kernels = patchedPkgs.linuxKernel.vanillaPackages // {
     inherit (patchedPkgs.linuxKernel.packages)
       linux_6_12_hardened
-      linux_rt_5_4
       linux_rt_5_10
       linux_rt_5_15
       linux_rt_6_1
diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index b2addeb3c360..ca53bfbc19ea 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -19,11 +19,6 @@
         "hash": "sha256:17wxs8i8vd5ivv99ra0sri3wmkw5c22wsaw8nf1xcvys2kmpa7hk",
         "lts": true
     },
-    "5.4": {
-        "version": "5.4.300",
-        "hash": "sha256:0nl1l689d4jq2l39v816yy7z5lzc5dvv8aqn85xlv4najc022jcr",
-        "lts": true
-    },
     "6.6": {
         "version": "6.6.113",
         "hash": "sha256:07n494cblmlfmn8l3kjalwlnb1f9xxxf8c31kkfr5lb1wk9cz58z",
diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
deleted file mode 100644
index e855b51903ee..000000000000
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{
-  lib,
-  buildLinux,
-  fetchurl,
-  kernelPatches ? [ ],
-  structuredExtraConfig ? { },
-  extraMeta ? { },
-  argsOverride ? { },
-  ...
-}@args:
-
-let
-  version = "5.4.296-rt100"; # updated by ./update-rt.sh
-  branch = lib.versions.majorMinor version;
-  kversion = builtins.elemAt (lib.splitString "-" version) 0;
-in
-buildLinux (
-  args
-  // {
-    inherit version;
-    pname = "linux-rt";
-
-    src = fetchurl {
-      url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-      sha256 = "0fm73yqzbzclh2achcj8arpg428d412k2wgmlfmyy6xzb1762qrx";
-    };
-
-    kernelPatches =
-      let
-        rt-patch = {
-          name = "rt";
-          patch = fetchurl {
-            url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "0ggmgkhmnvx4xxb3smfdcafqr9m3qdyc40xp3h7586p4n3wwpw9d";
-          };
-        };
-      in
-      [ rt-patch ] ++ kernelPatches;
-
-    structuredExtraConfig =
-      with lib.kernel;
-      {
-        PREEMPT_RT = yes;
-        # Fix error: unused option: PREEMPT_RT.
-        EXPERT = yes; # PREEMPT_RT depends on it (in kernel/Kconfig.preempt)
-        # Fix error: option not set correctly: PREEMPT_VOLUNTARY (wanted 'y', got 'n').
-        PREEMPT_VOLUNTARY = lib.mkForce no; # PREEMPT_RT deselects it.
-        # Fix error: unused option: RT_GROUP_SCHED.
-        RT_GROUP_SCHED = lib.mkForce (option no); # Removed by sched-disable-rt-group-sched-on-rt.patch.
-      }
-      // structuredExtraConfig;
-
-    isLTS = true;
-
-    extraMeta = extraMeta // {
-      inherit branch;
-    };
-  }
-  // argsOverride
-)
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 478387a5a167..eea835790fac 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -116,22 +116,6 @@ in
           rpiVersion = 4;
         };
 
-        linux_5_4 = callPackage ../os-specific/linux/kernel/mainline.nix {
-          branch = "5.4";
-          kernelPatches = [
-            kernelPatches.bridge_stp_helper
-            kernelPatches.request_key_helper
-            kernelPatches.rtl8761b_support
-          ];
-        };
-
-        linux_rt_5_4 = callPackage ../os-specific/linux/kernel/linux-rt-5.4.nix {
-          kernelPatches = [
-            kernelPatches.bridge_stp_helper
-            kernelPatches.request_key_helper
-          ];
-        };
-
         linux_5_10 = callPackage ../os-specific/linux/kernel/mainline.nix {
           branch = "5.10";
           kernelPatches = [
@@ -285,6 +269,7 @@ in
         linux_latest_libre = throw "linux_latest_libre has been removed due to lack of maintenance";
 
         linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11";
+        linux_5_4 = throw "linux 5.4 was removed because it will reach its end of life within 25.11";
         linux_6_9 = throw "linux 6.9 was removed because it has reached its end of life upstream";
         linux_6_10 = throw "linux 6.10 was removed because it has reached its end of life upstream";
         linux_6_11 = throw "linux 6.11 was removed because it has reached its end of life upstream";
@@ -307,6 +292,8 @@ in
         linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream";
         linux_6_15_hardened = throw "linux 6.15 was removed because it has reached its end of life upstream";
 
+        linux_rt_5_4 = throw "linux_rt 5.4 has been removed because it will reach its end of life within 25.11";
+
         linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages";
       }
     )
@@ -722,7 +709,6 @@ in
 
   vanillaPackages = {
     # recurse to build modules for the kernels
-    linux_5_4 = recurseIntoAttrs (packagesFor kernels.linux_5_4);
     linux_5_10 = recurseIntoAttrs (packagesFor kernels.linux_5_10);
     linux_5_15 = recurseIntoAttrs (packagesFor kernels.linux_5_15);
     linux_6_1 = recurseIntoAttrs (packagesFor kernels.linux_6_1);
@@ -732,6 +718,7 @@ in
   }
   // lib.optionalAttrs config.allowAliases {
     linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-21
+    linux_5_4 = throw "linux 5.4 was removed because it will reach its end of life within 25.11"; # Added 2025-10-22
     linux_6_9 = throw "linux 6.9 was removed because it reached its end of life upstream"; # Added 2024-08-02
     linux_6_10 = throw "linux 6.10 was removed because it reached its end of life upstream"; # Added 2024-10-23
     linux_6_11 = throw "linux 6.11 was removed because it reached its end of life upstream"; # Added 2025-03-23
@@ -743,11 +730,13 @@ in
 
   rtPackages = {
     # realtime kernel packages
-    linux_rt_5_4 = packagesFor kernels.linux_rt_5_4;
     linux_rt_5_10 = packagesFor kernels.linux_rt_5_10;
     linux_rt_5_15 = packagesFor kernels.linux_rt_5_15;
     linux_rt_6_1 = packagesFor kernels.linux_rt_6_1;
     linux_rt_6_6 = packagesFor kernels.linux_rt_6_6;
+  }
+  // lib.optionalAttrs config.allowAliases {
+    linux_rt_5_4 = throw "linux_rt 5.4 was removed because it will reach its end of life within 25.11"; # Added 2025-10-22
   };
 
   rpiPackages = {

From bc693cf4b9083d97d49f4b398fe454e177ab6776 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Wed, 22 Oct 2025 13:21:03 +0200
Subject: [PATCH 1636/6226] linux/common-config: only enable VFIO opts for 6.6
 and later

For older kernels (<=6.1) I get

    error: unused option: VFIO_DEVICE_CDEV

while building `linux-config`.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 03a8b930bc92..4fa16a094bdc 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -1003,8 +1003,8 @@ let
 
       # Enable CDEV and NOIOMMU support for VFIO, which is useful for
       # passthrough.
-      VFIO_DEVICE_CDEV = yes;
-      VFIO_NOIOMMU = yes;
+      VFIO_DEVICE_CDEV = whenAtLeast "6.6" yes;
+      VFIO_NOIOMMU = whenAtLeast "6.6" yes;
     };
 
     media = {

From 9e6f02e8b9f60bafe3b16e5f388667ac9f20116e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 13:52:37 +0000
Subject: [PATCH 1637/6226] cnquery: 12.5.1 -> 12.6.0

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

diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix
index 23ea89b4c39f..ad34ce6ecf15 100644
--- a/pkgs/by-name/cn/cnquery/package.nix
+++ b/pkgs/by-name/cn/cnquery/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnquery";
-  version = "12.5.1";
+  version = "12.6.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnquery";
     tag = "v${version}";
-    hash = "sha256-f7P7m+RBrWxvdBMtPXZLNB4/Alr0ByiEhh9mIcVPfLk=";
+    hash = "sha256-f+2E3pG5c/3yrsvBPJp9QUHcDRY4vmmxeosw/jfQ+mY=";
   };
 
   subPackages = [ "apps/cnquery" ];
 
-  vendorHash = "sha256-i0atpv6vtbbpTKuh9aJU6oPILCqdshB0MVbgOn6fppw=";
+  vendorHash = "sha256-NI6x1MIdIHK4OfoqRvnyGxJZaCxLclaU4/rNvDx/Fhc=";
 
   ldflags = [
     "-w"

From cad32a24812b17a574b1ce57a7885dd4459f9f4a Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Mon, 20 Oct 2025 23:22:57 +0530
Subject: [PATCH 1638/6226] dprint-plugins: update all plugins

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>

dprint-plugins: fix update script

Co-authored-by: Kenichi Kamiya <kachick1@gmail.com>
Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix | 6 +++---
 pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix       | 6 +++---
 pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix            | 6 +++---
 pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix       | 6 +++---
 pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix   | 6 +++---
 pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix      | 6 +++---
 pkgs/by-name/dp/dprint/plugins/update-plugins.py            | 4 ++--
 7 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix
index 5a14b10c58a9..1b6b85835d3e 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-dockerfile.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "Dockerfile code formatter";
-  hash = "sha256-gsfMLa4zw8AblOS459ZS9OZrkGCQi5gBN+a3hvOsspk=";
+  hash = "sha256-GaK1sYdZPwQWJmz2ULcsGpWDiKjgPhqNRoGgQfGOkqc=";
   initConfig = {
     configExcludes = [ ];
     configKey = "dockerfile";
@@ -9,6 +9,6 @@ mkDprintPlugin {
   };
   pname = "dprint-plugin-dockerfile";
   updateUrl = "https://plugins.dprint.dev/dprint/dockerfile/latest.json";
-  url = "https://plugins.dprint.dev/dockerfile-0.3.2.wasm";
-  version = "0.3.2";
+  url = "https://plugins.dprint.dev/dockerfile-0.3.3.wasm";
+  version = "0.3.3";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix
index aeb931ecd58e..d83c0588a4ff 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-ruff.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "Ruff (Python) wrapper plugin";
-  hash = "sha256-15InHQgF9c0Js4yUJxmZ1oNj1O16FBU12u/GOoaSAJ8=";
+  hash = "sha256-qT+6zPbX3KrONXshwzLoGTWRXM93VKO0lN9ycJujEDM=";
   initConfig = {
     configExcludes = [ ];
     configKey = "ruff";
@@ -12,6 +12,6 @@ mkDprintPlugin {
   };
   pname = "dprint-plugin-ruff";
   updateUrl = "https://plugins.dprint.dev/dprint/ruff/latest.json";
-  url = "https://plugins.dprint.dev/ruff-0.3.9.wasm";
-  version = "0.3.9";
+  url = "https://plugins.dprint.dev/ruff-0.6.1.wasm";
+  version = "0.6.1";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix
index 1abaa2a54ea1..89a3b44c0e48 100644
--- a/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix
+++ b/pkgs/by-name/dp/dprint/plugins/g-plane-malva.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "CSS, SCSS, Sass and Less formatter";
-  hash = "sha256-mFlhfqtglKtKNls96PO/2AWLL1fNC5msQCd9EgdKauE=";
+  hash = "sha256-IAIix6c9/GNDZsRk95T/rpvMh7HqFgBoq5KDVYHHOjU=";
   initConfig = {
     configExcludes = [ "**/node_modules" ];
     configKey = "malva";
@@ -14,6 +14,6 @@ mkDprintPlugin {
   };
   pname = "g-plane-malva";
   updateUrl = "https://plugins.dprint.dev/g-plane/malva/latest.json";
-  url = "https://plugins.dprint.dev/g-plane/malva-v0.11.2.wasm";
-  version = "0.11.2";
+  url = "https://plugins.dprint.dev/g-plane/malva-v0.14.3.wasm";
+  version = "0.14.3";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix
index 6c9ea245898e..633820b9ce32 100644
--- a/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix
+++ b/pkgs/by-name/dp/dprint/plugins/g-plane-markup_fmt.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "HTML, Vue, Svelte, Astro, Angular, Jinja, Twig, Nunjucks, and Vento formatter";
-  hash = "sha256-fCvurr8f79io/jIjwCfwr/WGjvcKZtptRrx9GFfytSI=";
+  hash = "sha256-TQxHIw5IXZwFA/WzIJ33ZckJNkHwW67lnh0cCGkgmrs=";
   initConfig = {
     configExcludes = [ ];
     configKey = "markup";
@@ -19,6 +19,6 @@ mkDprintPlugin {
   };
   pname = "g-plane-markup_fmt";
   updateUrl = "https://plugins.dprint.dev/g-plane/markup_fmt/latest.json";
-  url = "https://plugins.dprint.dev/g-plane/markup_fmt-v0.19.0.wasm";
-  version = "0.19.0";
+  url = "https://plugins.dprint.dev/g-plane/markup_fmt-v0.24.0.wasm";
+  version = "0.24.0";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix
index 6cdea7f70ae7..084bdadbb763 100644
--- a/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix
+++ b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_graphql.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "GraphQL formatter";
-  hash = "sha256-PlQwpR0tMsghMrOX7is+anN57t9xa9weNtoWpc0E9ec=";
+  hash = "sha256-xEEBnmxxiIPNOePBDS2HG6lfAhR4l53w+QDF2mXdyzg=";
   initConfig = {
     configExcludes = [ ];
     configKey = "graphql";
@@ -12,6 +12,6 @@ mkDprintPlugin {
   };
   pname = "g-plane-pretty_graphql";
   updateUrl = "https://plugins.dprint.dev/g-plane/pretty_graphql/latest.json";
-  url = "https://plugins.dprint.dev/g-plane/pretty_graphql-v0.2.1.wasm";
-  version = "0.2.1";
+  url = "https://plugins.dprint.dev/g-plane/pretty_graphql-v0.2.3.wasm";
+  version = "0.2.3";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix
index ca0b4883918b..7667e46621f3 100644
--- a/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix
+++ b/pkgs/by-name/dp/dprint/plugins/g-plane-pretty_yaml.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "YAML formatter";
-  hash = "sha256-6ua021G7ZW7Ciwy/OHXTA1Joj9PGEx3SZGtvaA//gzo=";
+  hash = "sha256-iSh5SRrjQB1hJoKkkup7R+Durcu+cxePa7GDVjwnexU=";
   initConfig = {
     configExcludes = [ ];
     configKey = "yaml";
@@ -12,6 +12,6 @@ mkDprintPlugin {
   };
   pname = "g-plane-pretty_yaml";
   updateUrl = "https://plugins.dprint.dev/g-plane/pretty_yaml/latest.json";
-  url = "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.0.wasm";
-  version = "0.5.0";
+  url = "https://plugins.dprint.dev/g-plane/pretty_yaml-v0.5.1.wasm";
+  version = "0.5.1";
 }
diff --git a/pkgs/by-name/dp/dprint/plugins/update-plugins.py b/pkgs/by-name/dp/dprint/plugins/update-plugins.py
index 54eab2a67355..9c1e5c91883c 100755
--- a/pkgs/by-name/dp/dprint/plugins/update-plugins.py
+++ b/pkgs/by-name/dp/dprint/plugins/update-plugins.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i python -p nix 'python3.withPackages (pp: [ pp.requests ])'
+#!nix-shell -i python3 -p nix 'python3.withPackages (ps: [ ps.requests ])'
 
 import json
 import os
@@ -138,7 +138,7 @@ def update_plugins():
             "updateUrl": update_url,
             "pname": pname,
             "version": e["version"],
-            "description": e["description"],
+            "description": e["description"].rstrip("."),
             "initConfig": {
                 "configKey": e["configKey"],
                 "configExcludes": e["configExcludes"],

From 89f2026b8e7d9cc41b4481cea968cba302c8352e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 14:04:36 +0000
Subject: [PATCH 1639/6226] postgresqlPackages.pg_ivm: 1.12 -> 1.13

---
 pkgs/servers/sql/postgresql/ext/pg_ivm.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
index fa58af91cb6c..1d9bd45d3680 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_ivm.nix
@@ -7,13 +7,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_ivm";
-  version = "1.12";
+  version = "1.13";
 
   src = fetchFromGitHub {
     owner = "sraoss";
     repo = "pg_ivm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UeRcxoUkpPw4EcQXKUxHamjczOaE59d00kSrYsijnH8=";
+    hash = "sha256-DKU5jwnRo/kMycnq4nAdQTiZwv/wXybyjXLtz4xdaBo=";
   };
 
   meta = {

From c5ba86ae5f6f2ddbc7a1c3720ca456262102939b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 14:07:14 +0000
Subject: [PATCH 1640/6226] glaze: 6.0.0 -> 6.0.1

---
 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 6248ad5aad49..caf902307d35 100644
--- a/pkgs/by-name/gl/glaze/package.nix
+++ b/pkgs/by-name/gl/glaze/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (final: {
   pname = "glaze";
-  version = "6.0.0";
+  version = "6.0.1";
 
   src = fetchFromGitHub {
     owner = "stephenberry";
     repo = "glaze";
     tag = "v${final.version}";
-    hash = "sha256-4bEBnPLp7v6Jrd8h6q5LJc93om2VP3ZqB4JNSpKzPao=";
+    hash = "sha256-eBgcIhmezfYYaqBrKh6elbTMIQCUXd3W9TAuS/RDXcA=";
   };
 
   nativeBuildInputs = [ cmake ];

From 9521fd2fbbb3eb68a71e10f78e5360d17635e4e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 24 Sep 2025 05:22:53 +0000
Subject: [PATCH 1641/6226] kdePackages.qt6gtk2: 0.5 -> 0.6

---
 pkgs/tools/misc/qt6gtk2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/qt6gtk2/default.nix b/pkgs/tools/misc/qt6gtk2/default.nix
index b2ffaac64abe..0bcd31da1850 100644
--- a/pkgs/tools/misc/qt6gtk2/default.nix
+++ b/pkgs/tools/misc/qt6gtk2/default.nix
@@ -11,14 +11,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qt6gtk2";
-  version = "0.5";
+  version = "0.6";
 
   src = fetchFromGitLab {
     domain = "opencode.net";
     owner = "trialuser";
     repo = "qt6gtk2";
     tag = finalAttrs.version;
-    hash = "sha256-G2TQ4LU8Cmvd+u6/s1ugbUkZcRXHTBm3+ISY0g/5/60=";
+    hash = "sha256-RJybIm0HllnYaPfsnci+9ZCGvvL9F2MC7dDbiK+L7bU=";
   };
 
   buildInputs = [
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "GTK+2.0 integration plugins for Qt6";
     license = lib.licenses.gpl2Plus;
-    homepage = "https://github.com/trialuser02/qt6gtk2";
+    homepage = "https://www.opencode.net/trialuser/qt6gtk2";
     maintainers = [ lib.maintainers.misterio77 ];
     platforms = lib.platforms.linux;
   };

From e53e10938c73da21f3fc763485aee70ea56f8e3b Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Wed, 22 Oct 2025 19:50:35 +0530
Subject: [PATCH 1642/6226] nixosTests.limine.secureBoot: fix secure boot check

An easier way to check if secureBoot is enabled is by running mokutil --sb-state

We have to do this way now because on systemd v258 `bootctl status` returns non 0 value if systemd-boot is not properly installed, which is to be expected when using Limine.
---
 nixos/tests/limine/secure-boot.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/limine/secure-boot.nix b/nixos/tests/limine/secure-boot.nix
index 52508f7eb385..9811734db5cb 100644
--- a/nixos/tests/limine/secure-boot.nix
+++ b/nixos/tests/limine/secure-boot.nix
@@ -26,10 +26,12 @@
       boot.loader.limine.secureBoot.enable = true;
       boot.loader.limine.secureBoot.createAndEnrollKeys = true;
       boot.loader.timeout = 0;
+
+      environment.systemPackages = [ pkgs.mokutil ];
     };
 
   testScript = ''
     machine.start()
-    assert "Secure Boot: enabled (user)" in machine.succeed("bootctl status")
+    assert "SecureBoot enabled" in machine.succeed("mokutil --sb-state")
   '';
 }

From ea037e7187b6db5870b5b635433c940a5c639349 Mon Sep 17 00:00:00 2001
From: Ivy Pierlot <ivyp@outlook.com.au>
Date: Thu, 23 Oct 2025 01:34:42 +1100
Subject: [PATCH 1643/6226] maintainers: add matrix account to auscyber

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index dd06cef1f75a..0948524fc6a4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2489,6 +2489,7 @@
     github = "auscyber";
     name = "Ivy Pierlot";
     githubId = 12080502;
+    matrix = "@ivy:faggot.sh";
   };
   austin-artificial = {
     email = "austin.platt@artificial.io";

From 312201f83f1b8e378340e75318951090aab1f848 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 14:37:13 +0000
Subject: [PATCH 1644/6226] pixi-pack: 0.7.3 -> 0.7.4

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

diff --git a/pkgs/by-name/pi/pixi-pack/package.nix b/pkgs/by-name/pi/pixi-pack/package.nix
index 18090d797625..591fafd8ba92 100644
--- a/pkgs/by-name/pi/pixi-pack/package.nix
+++ b/pkgs/by-name/pi/pixi-pack/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pixi-pack";
-  version = "0.7.3";
+  version = "0.7.4";
 
   src = fetchFromGitHub {
     owner = "Quantco";
     repo = "pixi-pack";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IYY5moAxZ+pDF6G6KxfuB6DI+Y5V8AseFUyWGs77+bQ=";
+    hash = "sha256-R+JydhsYha4bQu7KBMEyV5IijnPtJZphbSib9JpchrI=";
   };
 
-  cargoHash = "sha256-EM1xCQGIXI2Q5OkfXcReGvPSLiVq98sleo0+rYa0bkw=";
+  cargoHash = "sha256-U2Ty8ZzNkhDc2O3I3ceFcZRk3fu0aSzwsdIuo6Edcx0=";
 
   buildInputs = [ openssl ];
 

From 183078a900d31c3d42548eb2735b9f9caa0c57c2 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Mon, 13 Oct 2025 23:21:11 +0200
Subject: [PATCH 1645/6226] lora: 3.006 -> 3.021, install otf and variable
 files

---
 pkgs/by-name/lo/lora/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/lo/lora/package.nix b/pkgs/by-name/lo/lora/package.nix
index 83222c9ae75d..d8666f5b6a28 100644
--- a/pkgs/by-name/lo/lora/package.nix
+++ b/pkgs/by-name/lo/lora/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "lora";
-  version = "3.006";
+  version = "3.021";
 
   src = fetchFromGitHub {
     owner = "cyrealtype";
     repo = "lora";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nNl2IC/KqYO6uS6ah0qWgesqm2cG8cIix/MhxbkOeAM=";
+    hash = "sha256-v9wE9caI9HTCfO01Yf+s6KajF7WpnL12nu+IuOV7T+w=";
   };
 
   dontConfigure = true;
@@ -24,8 +24,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    mkdir -p $out/share/fonts/truetype
-    cp -R $src/fonts/ttf/*.ttf $out/share/fonts/truetype
+    install -Dm444 -t $out/share/fonts/truetype $src/fonts/ttf/*.ttf
+    install -Dm444 -t $out/share/fonts/opentype $src/fonts/otf/*.otf
+    install -Dm444 -t $out/share/fonts/variable $src/fonts/variable/*.ttf
 
     runHook postInstall
   '';

From 204ae8bbb9f2804b40cef51ca2ff579c5201c490 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Wed, 22 Oct 2025 22:47:43 +0800
Subject: [PATCH 1646/6226] sing-box: 1.12.10 -> 1.12.11

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

diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix
index b7db2b8d0f35..d6762c1fae33 100644
--- a/pkgs/by-name/si/sing-box/package.nix
+++ b/pkgs/by-name/si/sing-box/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "sing-box";
-  version = "1.12.10";
+  version = "1.12.11";
 
   src = fetchFromGitHub {
     owner = "SagerNet";
     repo = "sing-box";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZnpvE/x2+kKlKYuez1VaVx7qkybYhRTqfg7yorZpxfc=";
+    hash = "sha256-K28Lf5WOd0RNpk7nRettrJLc5WrGgqki5Dj4zxfmZ+4=";
   };
 
-  vendorHash = "sha256-D4nfi5PzcL9CcgLvm09DmF2Ws1o4wIH0zjgv1qDP7Nw=";
+  vendorHash = "sha256-+p2esP5sKNSPJ2ig9R58PflsMPlrGv+MJCwX0ESMmbc=";
 
   tags = [
     "with_quic"

From 155bcc68661df145de1540ea6ee59de72f7edc7a Mon Sep 17 00:00:00 2001
From: adam <me@adamperkowski.dev>
Date: Tue, 21 Oct 2025 15:31:33 +0200
Subject: [PATCH 1647/6226] julec.hook: init

Co-authored-by: philiptaron <philip.taron@gmail.com>
---
 .editorconfig                                 |  4 +
 doc/hooks/index.md                            |  1 +
 doc/hooks/julec.section.md                    | 77 ++++++++++++++++++
 doc/redirects.json                            | 36 +++++++++
 pkgs/by-name/ju/julec/hook.nix                | 15 ++++
 pkgs/by-name/ju/julec/hook.sh                 | 80 +++++++++++++++++++
 pkgs/by-name/ju/julec/package.nix             |  7 ++
 pkgs/by-name/ju/julec/test/default.nix        | 19 +++++
 .../by-name/ju/julec/test/hello-jule/jule.mod |  0
 .../ju/julec/test/hello-jule/src/_test.jule   |  8 ++
 .../ju/julec/test/hello-jule/src/main.jule    |  7 ++
 11 files changed, 254 insertions(+)
 create mode 100644 doc/hooks/julec.section.md
 create mode 100644 pkgs/by-name/ju/julec/hook.nix
 create mode 100644 pkgs/by-name/ju/julec/hook.sh
 create mode 100644 pkgs/by-name/ju/julec/test/default.nix
 create mode 100644 pkgs/by-name/ju/julec/test/hello-jule/jule.mod
 create mode 100644 pkgs/by-name/ju/julec/test/hello-jule/src/_test.jule
 create mode 100644 pkgs/by-name/ju/julec/test/hello-jule/src/main.jule

diff --git a/.editorconfig b/.editorconfig
index 2d877d20b825..6972df7013d6 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -89,6 +89,10 @@ trim_trailing_whitespace = unset
 end_of_line = unset
 insert_final_newline = unset
 
+# see https://manual.jule.dev/project/code-style.html#indentions
+[*.jule]
+indent_style = tab
+
 # Keep this hint at the bottom:
 # Please don't add entries for subfolders here.
 # Create <subfolder>/.editorconfig instead.
diff --git a/doc/hooks/index.md b/doc/hooks/index.md
index cd04fd84495a..cd769cec0373 100644
--- a/doc/hooks/index.md
+++ b/doc/hooks/index.md
@@ -20,6 +20,7 @@ ghc.section.md
 gnome.section.md
 haredo.section.md
 installShellFiles.section.md
+julec.section.md
 just.section.md
 libiconv.section.md
 libxml2.section.md
diff --git a/doc/hooks/julec.section.md b/doc/hooks/julec.section.md
new file mode 100644
index 000000000000..f85619ac39e7
--- /dev/null
+++ b/doc/hooks/julec.section.md
@@ -0,0 +1,77 @@
+# julec.hook {#julec-hook}
+
+[Jule](https://jule.dev) is an effective programming language designed to build efficient, fast, reliable and safe software while maintaining simplicity.
+
+In Nixpkgs, `jule.hook` overrides the default build, check and install phases.
+
+## Example code snippet {#julec-hook-example-code-snippet}
+
+```nix
+{
+  julec,
+  clangStdenv,
+}:
+
+clangStdenv.mkDerivation (finalAttrs: {
+  # ...
+
+  nativeBuildInputs = [ julec.hook ];
+
+  # Customize filenames if needed
+  JULE_SRC_DIR = "./src";
+  JULE_OUT_DIR = "./bin";
+  JULE_OUT_NAME = "hello-jule";
+  JULE_TEST_DIR = "./tests";
+  JULE_TEST_OUT_DIR = "./test-bin";
+  JULE_TEST_OUT_NAME = "hello-jule-test";
+
+  # ...
+})
+```
+
+## Variables controlling julec.hook {#julec-hook-variables}
+
+### `JULE_SRC_DIR` {#julec-hook-variable-jule-src-dir}
+
+Specifies the source directory containing `main.jule`.
+Default is `./src`.
+
+### `JULE_OUT_DIR` {#julec-hook-variable-jule-out-dir}
+
+Specifies the output directory for the compiled binary.
+Default is `./bin`.
+
+### `JULE_OUT_NAME` {#julec-hook-variable-jule-out-name}
+
+Specifies the name of the compiled binary.
+Default is `output`.
+
+### `JULE_TEST_DIR` {#julec-hook-variable-jule-test-dir}
+
+Specifies the directory containing test files.
+Default is the value of [`JULE_SRC_DIR`](#julec-hook-variable-jule-src-dir).
+
+### `JULE_TEST_OUT_DIR` {#julec-hook-variable-jule-test-out-dir}
+
+Specifies the output directory for compiled test binaries.
+Default is the value of [`JULE_OUT_DIR`](#julec-hook-variable-jule-out-dir).
+
+### `JULE_TEST_OUT_NAME` {#julec-hook-variable-jule-test-out-name}
+
+Specifies the name of the compiled test binary.
+Default is the value of [`JULE_OUT_NAME`](#julec-hook-variable-jule-out-name) with `-test` suffix.
+
+### `dontUseJulecBuild` {#julec-hook-variable-dontusejulecbuild}
+
+When set to true, doesn't use the predefined `julecBuildHook`.
+Default is false.
+
+### `dontUseJulecCheck` {#julec-hook-variable-dontusejuleccheck}
+
+When set to true, doesn't use the predefined `julecCheckHook`.
+Default is false.
+
+### `dontUseJulecInstall` {#julec-hook-variable-dontusejulecinstall}
+
+When set to true, doesn't use the predefined `julecInstallHook`.
+Default is false.
diff --git a/doc/redirects.json b/doc/redirects.json
index b4cec3d403eb..4198cee6ca48 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -124,6 +124,42 @@
   "inkscape-plugins": [
     "index.html#inkscape-plugins"
   ],
+  "julec-hook": [
+    "index.html#julec-hook"
+  ],
+  "julec-hook-example-code-snippet": [
+    "index.html#julec-hook-example-code-snippet"
+  ],
+  "julec-hook-variable-dontusejulecbuild": [
+    "index.html#julec-hook-variable-dontusejulecbuild"
+  ],
+  "julec-hook-variable-dontusejuleccheck": [
+    "index.html#julec-hook-variable-dontusejuleccheck"
+  ],
+  "julec-hook-variable-dontusejulecinstall": [
+    "index.html#julec-hook-variable-dontusejulecinstall"
+  ],
+  "julec-hook-variable-jule-out-dir": [
+    "index.html#julec-hook-variable-jule-out-dir"
+  ],
+  "julec-hook-variable-jule-out-name": [
+    "index.html#julec-hook-variable-jule-out-name"
+  ],
+  "julec-hook-variable-jule-src-dir": [
+    "index.html#julec-hook-variable-jule-src-dir"
+  ],
+  "julec-hook-variable-jule-test-dir": [
+    "index.html#julec-hook-variable-jule-test-dir"
+  ],
+  "julec-hook-variable-jule-test-out-dir": [
+    "index.html#julec-hook-variable-jule-test-out-dir"
+  ],
+  "julec-hook-variable-jule-test-out-name": [
+    "index.html#julec-hook-variable-jule-test-out-name"
+  ],
+  "julec-hook-variables": [
+    "index.html#julec-hook-variables"
+  ],
   "major-ghc-deprecation": [
     "index.html#major-ghc-deprecation"
   ],
diff --git a/pkgs/by-name/ju/julec/hook.nix b/pkgs/by-name/ju/julec/hook.nix
new file mode 100644
index 000000000000..d6cccb165979
--- /dev/null
+++ b/pkgs/by-name/ju/julec/hook.nix
@@ -0,0 +1,15 @@
+{
+  julec,
+  clang,
+  makeSetupHook,
+}:
+
+makeSetupHook {
+  name = "julec-hook";
+
+  propagatedBuildInputs = [ julec ];
+
+  meta = {
+    inherit (julec.meta) maintainers;
+  };
+} ./hook.sh
diff --git a/pkgs/by-name/ju/julec/hook.sh b/pkgs/by-name/ju/julec/hook.sh
new file mode 100644
index 000000000000..112dc48d0c81
--- /dev/null
+++ b/pkgs/by-name/ju/julec/hook.sh
@@ -0,0 +1,80 @@
+# shellcheck shell=bash disable=SC2154,SC2034
+
+julecSetEnv() {
+  if [ -z "$JULE_SRC_DIR" ]; then
+    export JULE_SRC_DIR='./src'
+  fi
+  if [ -z "$JULE_OUT_DIR" ]; then
+    export JULE_OUT_DIR='./bin'
+  fi
+  if [ -z "$JULE_OUT_NAME" ]; then
+    export JULE_OUT_NAME='output'
+  fi
+  if [ -z "$JULE_TEST_DIR" ]; then
+    export JULE_TEST_DIR="$JULE_SRC_DIR"
+  fi
+  if [ -z "$JULE_TEST_OUT_DIR" ]; then
+    export JULE_TEST_OUT_DIR="$JULE_OUT_DIR"
+  fi
+  if [ -z "$JULE_TEST_OUT_NAME" ]; then
+    export JULE_TEST_OUT_NAME="$JULE_OUT_NAME-test"
+  fi
+}
+
+julecBuildHook() {
+  echo "Executing julecBuildHook"
+
+  runHook preBuild
+
+  julecSetEnv
+  mkdir -p "$JULE_OUT_DIR"
+  julec --opt L2 -p -o "$JULE_OUT_DIR/$JULE_OUT_NAME" "$JULE_SRC_DIR"
+
+  runHook postBuild
+
+  echo "Finished julecBuildHook"
+}
+
+julecCheckHook() {
+  echo "Executing julecCheckHook"
+
+  runHook preCheck
+
+  echo "Building tests..."
+
+  julecSetEnv
+  mkdir -p "$JULE_TEST_OUT_DIR"
+  julec test -o "$JULE_TEST_OUT_DIR/$JULE_TEST_OUT_NAME" "$JULE_TEST_DIR"
+
+  echo "Running tests..."
+
+  "$JULE_TEST_OUT_DIR/$JULE_TEST_OUT_NAME"
+
+  runHook postCheck
+
+  echo "Finished julecCheckHook"
+}
+
+julecInstallHook() {
+  echo "Executing julecInstallHook"
+
+  runHook preInstall
+
+  julecSetEnv
+  mkdir -p "$out/bin"
+  cp -r "$JULE_OUT_DIR/$JULE_OUT_NAME" "$out/bin/"
+
+  runHook postInstall
+
+  echo "Finished julecInstallHook"
+}
+
+if [ -z "${dontUseJulecBuild-}" ] && [ -z "${buildPhase-}" ]; then
+  buildPhase=julecBuildHook
+fi
+if [ -z "${dontUseJulecCheck-}" ] && [ -z "${checkPhase-}" ]; then
+  checkPhase=julecCheckHook
+fi
+if [ -z "${dontUseJulecInstall-}" ] && [ -z "${installPhase-}" ]; then
+  installPhase=julecInstallHook
+fi
diff --git a/pkgs/by-name/ju/julec/package.nix b/pkgs/by-name/ju/julec/package.nix
index 27a007a791ee..e22298483855 100644
--- a/pkgs/by-name/ju/julec/package.nix
+++ b/pkgs/by-name/ju/julec/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   clangStdenv,
+  callPackage,
   fetchFromGitHub,
 }:
 
@@ -93,6 +94,12 @@ clangStdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru = {
+    # see doc/hooks/julec.section.md
+    hook = callPackage ./hook.nix { julec = finalAttrs.finalPackage; };
+    tests.hello-jule = callPackage ./test { julec = finalAttrs.finalPackage; };
+  };
+
   meta = {
     description = "Jule Programming Language Compiler";
     longDescription = ''
diff --git a/pkgs/by-name/ju/julec/test/default.nix b/pkgs/by-name/ju/julec/test/default.nix
new file mode 100644
index 000000000000..6717600389c9
--- /dev/null
+++ b/pkgs/by-name/ju/julec/test/default.nix
@@ -0,0 +1,19 @@
+{
+  julec,
+  clangStdenv,
+}:
+
+clangStdenv.mkDerivation (finalAttrs: {
+  pname = "hello-jule";
+  inherit (julec) version;
+
+  src = ./hello-jule;
+
+  nativeBuildInputs = [ julec.hook ];
+
+  doCheck = true;
+
+  meta = {
+    inherit (julec.meta) platforms;
+  };
+})
diff --git a/pkgs/by-name/ju/julec/test/hello-jule/jule.mod b/pkgs/by-name/ju/julec/test/hello-jule/jule.mod
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/pkgs/by-name/ju/julec/test/hello-jule/src/_test.jule b/pkgs/by-name/ju/julec/test/hello-jule/src/_test.jule
new file mode 100644
index 000000000000..53b23c3cf884
--- /dev/null
+++ b/pkgs/by-name/ju/julec/test/hello-jule/src/_test.jule
@@ -0,0 +1,8 @@
+use "std/testing"
+
+#test
+fn testPi(t: &testing::T) {
+		if getPi() != 3.14 {
+				t.Errorf("PI not precise enough")
+		}
+}
diff --git a/pkgs/by-name/ju/julec/test/hello-jule/src/main.jule b/pkgs/by-name/ju/julec/test/hello-jule/src/main.jule
new file mode 100644
index 000000000000..322bd3111649
--- /dev/null
+++ b/pkgs/by-name/ju/julec/test/hello-jule/src/main.jule
@@ -0,0 +1,7 @@
+fn main() {
+		println("Hello, Jule!");
+}
+
+fn getPi(): f64 {
+		ret 3.14;
+}

From 3d00669140f623de5e0a19e84cd70b8f3cdc454d Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 22 Oct 2025 11:05:06 -0400
Subject: [PATCH 1648/6226] rl-2511: Move entries from incorrect sections

---
 doc/release-notes/rl-2511.section.md          | 26 +++++++++----------
 .../manual/release-notes/rl-2511.section.md   |  3 +++
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 5e22edd9f6dc..08887b914fd0 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -30,6 +30,11 @@
 
 - Everything related to `bower` was removed, as it is deprecated and not used by anything in nixpkgs.
 
+- `reaction` has been updated to version 2, which includes some breaking changes.
+  For more information, [check the release article](https://blog.ppom.me/en-reaction-v2).
+
+- `mealie` has been updated to 3.0.2: This update introduces breaking changes in some API endpoints (see the [release changelog](https://github.com/mealie-recipes/mealie/releases/tag/v3.0.0)).
+
 - The `offrss` package was removed due to lack of upstream maintenance since 2012. It's recommended for users to migrate to another RSS reader
 
 - `installShellFiles`: Allow installManPage to take a piped input, add the `--name` flag for renaming the file when installed. Can also append `--` to opt-out of all subsequent parsing.
@@ -263,6 +268,13 @@
 
 - The systemd initrd will now respect `x-systemd.wants` and `x-systemd.requires` for reliably unlocking multi-disk bcachefs volumes.
 
+- `neovim`: Added support for the `vim.o.exrc` option, the `VIMINIT` environment variable, and sourcing of `sysinit.vim`.
+
+  See the neovim help page [`:help startup`](https://neovim.io/doc/user/starting.html#startup) for more information, as well as [the nixpkgs neovim wrapper documentation](#neovim-custom-configuration).
+
+- `cloudflare-ddns`: Added package cloudflare-ddns.
+
+
 - [`homebox` 0.20.0](https://github.com/sysadminsmedia/homebox/releases/tag/v0.20.0) changed how assets are stored and hashed. It is recommended to back up your database before this update. In particular, `--storage-data` was replaced with `--storage-conn-string` and `--storage-prefix-path`. If your configuration set `HBOX_STORAGE_DATA` manually, you must migrate it to `HBOX_STORAGE_CONN_STRING` and `HBOX_STORAGE_PREFIX_PATH`.
 
 - GIMP now defaults to version 3. Use `gimp2` for the old version.
@@ -322,13 +334,8 @@
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
 
-- `mealie` has been updated to 3.0.2: This update introduces breaking changes in some API endpoints (see the [release changelog](https://github.com/mealie-recipes/mealie/releases/tag/v3.0.0)).
-
 ### Breaking changes {#sec-nixpkgs-release-25.11-lib-breaking}
 
-- `reaction` has been updated to version 2, which includes some breaking changes.
-  For more information, [check the release article](https://blog.ppom.me/en-reaction-v2).
-
 - `lib.mapAttrsFlatten` has been removed, following its deprecation in NixOS 24.11. Use `lib.attrsets.mapAttrsToList` instead.
 
 - `lib.attrsets.cartesianProductOfSets` has been removed, following its deprecation in NixOS 24.11. Use `lib.attrsets.cartesianProduct` instead.
@@ -344,9 +351,6 @@
   and called `setup.py` from the source tree, which is deprecated.
   The modern alternative is to configure `pyproject = true` with `build-system = [ setuptools ]`.
 
-- `boot.enableContainers` is only turned on when a declarative NixOS container is defined in `containers`.
-  If you use the `nixos-container` tool for imperative container management, set `boot.enableContainers = true;` explicitly.
-
 ### Deprecations {#sec-nixpkgs-release-25.11-lib-deprecations}
 
 - `lib.options.mkAliasOptionModuleMD` is now obsolete; use the identical [`lib.options.mkAliasOptionModule`] instead.
@@ -363,10 +367,4 @@
 
 ### Additions and Improvements {#sec-nixpkgs-release-25.11-lib-additions-improvements}
 
-- `neovim`: Added support for the `vim.o.exrc` option, the `VIMINIT` environment variable, and sourcing of `sysinit.vim`.
-
-  See the neovim help page [`:help startup`](https://neovim.io/doc/user/starting.html#startup) for more information, as well as [the nixpkgs neovim wrapper documentation](#neovim-custom-configuration).
-
-- `cloudflare-ddns`: Added package cloudflare-ddns.
-
 - `lib.cli.toCommandLine`, `lib.cli.toCommandLineShell`, `lib.cli.toCommandLineGNU` and `lib.cli.toCommandLineShellGNU` have been added to address multiple issues in `lib.cli.toGNUCommandLine` and `lib.cli.toGNUCommandLineShell`.
diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 8b3a14483687..a4dd44596b39 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -180,6 +180,9 @@
 
 - The `services.polipo` module has been removed as `polipo` is unmaintained and archived upstream.
 
+- `boot.enableContainers` is only turned on when a declarative NixOS container is defined in `containers`.
+  If you use the `nixos-container` tool for imperative container management, set `boot.enableContainers = true;` explicitly.
+
 - `virtualisation.lxd` has been removed due to lack of Nixpkgs maintenance. Users can migrate to `virtualisation.incus`, a fork of LXD, as a replacement. See [Incus migration documentation](https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/) for migration information.
 
 - `virtualisation.libvirtd` now uses OVMF images shipped with QEMU for UEFI machines. `virtualisation.libvirtd.qemu.ovmf` has been removed.

From 8a45925d3567391944a2f50c009cc3a9730fb252 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 15:06:56 +0000
Subject: [PATCH 1649/6226] dependabot-cli: 1.76.0 -> 1.76.1

---
 pkgs/by-name/de/dependabot-cli/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix
index 9e4f43601691..e2fe18a1e96f 100644
--- a/pkgs/by-name/de/dependabot-cli/package.nix
+++ b/pkgs/by-name/de/dependabot-cli/package.nix
@@ -12,20 +12,20 @@
 }:
 let
   pname = "dependabot-cli";
-  version = "1.76.0";
+  version = "1.76.1";
 
   # `tag` is what `dependabot` uses to find the relevant docker images.
   tag = "nixpkgs-dependabot-cli-${version}";
 
   # Get these hashes from
   # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
-  updateJobProxy.imageDigest = "sha256:42b2a171891f4667d9a443cbfdc5f10a58e5b5d7f1b9eae6c12ec9815bec72fd";
-  updateJobProxy.hash = "sha256-+GcGyip8cgVBZeji6Zn3oN8Mc3xZvASohbPVNUbHOgA=";
+  updateJobProxy.imageDigest = "sha256:d40c689e947e78ecdaccb3da1d070a458b7f1d1cfb3052cf5751e43583d89560";
+  updateJobProxy.hash = "sha256-6VhY+7pg6+LXQ1F58ghKdabqpgPcbxWI91KNz6FntJA=";
 
   # Get these hashes from
   # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
-  updaterGitHubActions.imageDigest = "sha256:d26d4ce071684b63d935c550552ae0d129f845254cb1e2f8635f15c62f43319e";
-  updaterGitHubActions.hash = "sha256-21E8q1+cwYlD8FL5njGhpsGRd/YkGQNS/y0howQFp6g=";
+  updaterGitHubActions.imageDigest = "sha256:e2cfbdde4014cd17cd85b9b411cb87a41d985bc27569e5fe1457ec68d16400b1";
+  updaterGitHubActions.hash = "sha256-VC+F0139+7n6rBLAw6MCgMf6yHCci7blaeLkHJ22fVc=";
 in
 buildGoModule {
   inherit pname version;
@@ -34,10 +34,10 @@ buildGoModule {
     owner = "dependabot";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-fSb2zzddwGJ1r9NhPEhE1WCndyoBK4VLOP3CmQUcjy0=";
+    hash = "sha256-i/Kr+69ws3HDWS+cQSn3cZzvW6GzKT+Avd3fZfvSA/c=";
   };
 
-  vendorHash = "sha256-xdouoPEPPhHcXNWxMdcdxVQsgRlFXBXjyZQ7CcROA4U=";
+  vendorHash = "sha256-dD48OKpuGAJAro7qV4tqpf/uENV2X1VQ2kUvAuJLXc0=";
 
   ldflags = [
     "-s"

From e3b49d09cd4655756429e8fd90517ae8bd45829e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 15:14:13 +0000
Subject: [PATCH 1650/6226] sqldef: 3.1.16 -> 3.2.2

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

diff --git a/pkgs/by-name/sq/sqldef/package.nix b/pkgs/by-name/sq/sqldef/package.nix
index 36da36b45fe1..7e8ecf60b523 100644
--- a/pkgs/by-name/sq/sqldef/package.nix
+++ b/pkgs/by-name/sq/sqldef/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "sqldef";
-  version = "3.1.16";
+  version = "3.2.2";
 
   src = fetchFromGitHub {
     owner = "sqldef";
     repo = "sqldef";
     rev = "v${version}";
-    hash = "sha256-Ll0yZ441WeBfCGOmsplN4907q3XQ7hVecwbu6YTC46I=";
+    hash = "sha256-8xwkXjF/+/pxumhQwBidv2xkmTy7NLCYG0nzlEq9lyI=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-nLKldyh2p3MA7Ka3YzrafLbxKxdxKQVnMQVhTpNVdXI=";
+  vendorHash = "sha256-u471eJFxVcXiwuAFRD65yJnDoR3D40PLHXeoMcENdLY=";
 
   ldflags = [
     "-s"

From e0da918f8f010d0a0f369b0e1bd5da6b18403040 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 12:15:07 -0300
Subject: [PATCH 1651/6226] mbusd: fix build with cmake4

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

diff --git a/pkgs/by-name/mb/mbusd/package.nix b/pkgs/by-name/mb/mbusd/package.nix
index baba9df86a83..a80cf02fd297 100644
--- a/pkgs/by-name/mb/mbusd/package.nix
+++ b/pkgs/by-name/mb/mbusd/package.nix
@@ -22,6 +22,11 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "Modbus TCP to Modbus RTU (RS-232/485) gateway";
     homepage = "https://github.com/3cky/mbusd";

From bb7dd24c07ffb410ef8d30ae7ad32d094b06ed6f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 15:22:16 +0000
Subject: [PATCH 1652/6226] postfix-tlspol: 1.8.19 -> 1.8.20

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

diff --git a/pkgs/by-name/po/postfix-tlspol/package.nix b/pkgs/by-name/po/postfix-tlspol/package.nix
index 700e77578310..627a0309d56f 100644
--- a/pkgs/by-name/po/postfix-tlspol/package.nix
+++ b/pkgs/by-name/po/postfix-tlspol/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "postfix-tlspol";
-  version = "1.8.19";
+  version = "1.8.20";
 
   src = fetchFromGitHub {
     owner = "Zuplu";
     repo = "postfix-tlspol";
     tag = "v${version}";
-    hash = "sha256-DSkWE76GSQKkrXAlnMvjTPAa4I4J07mZL9eea06Dzb8=";
+    hash = "sha256-/+FWTrb39PB1L6UDXAr3w0c0bMrpptX23g8WHI794GA=";
   };
 
   vendorHash = null;

From 9f68527a7355427f0265b9b160c7526213ba0343 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 28 Sep 2025 12:39:51 +0000
Subject: [PATCH 1653/6226] openapi-generator-cli: 7.15.0 -> 7.16.0

---
 pkgs/by-name/op/openapi-generator-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openapi-generator-cli/package.nix b/pkgs/by-name/op/openapi-generator-cli/package.nix
index d0d5200d0b37..10f37d24530e 100644
--- a/pkgs/by-name/op/openapi-generator-cli/package.nix
+++ b/pkgs/by-name/op/openapi-generator-cli/package.nix
@@ -9,7 +9,7 @@
 
 let
   jre = jre_headless;
-  version = "7.15.0";
+  version = "7.16.0";
   mainProgram = "openapi-generator-cli";
   this = maven.buildMavenPackage {
     inherit version;
@@ -20,10 +20,10 @@ let
       owner = "OpenAPITools";
       repo = "openapi-generator";
       tag = "v${version}";
-      hash = "sha256-IgjlMOHMASijIt5nMqOZcUpxecbWljHh9rA1YUwUmwM=";
+      hash = "sha256-CoztWf2H2rXcx4d8Av8cBXzMqIZsrSCgx21i3+o2ufo=";
     };
 
-    mvnHash = "sha256-woHPf7vPja70cNj6Glqr0OGAR8CV8qWiRu0hkmCcCrA=";
+    mvnHash = "sha256-5Kzv9h3X5s/1D0Gd1XQRvNGVAyf44QcriJFvS07wdZo=";
     mvnParameters = "-Duser.home=$TMPDIR";
     doCheck = false;
 

From 18fbd0d1d30d7094b59ce4edbf79e79cf9a14c5d Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 12:27:10 -0300
Subject: [PATCH 1654/6226] megaglest: fix build with cmake4

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

diff --git a/pkgs/by-name/me/megaglest/package.nix b/pkgs/by-name/me/megaglest/package.nix
index 18b3923132cd..59ff8c9a7306 100644
--- a/pkgs/by-name/me/megaglest/package.nix
+++ b/pkgs/by-name/me/megaglest/package.nix
@@ -144,6 +144,11 @@ stdenv.mkDerivation {
     "-DBUILD_MEGAGLEST_MODEL_VIEWER=On"
   ];
 
+  postPatch = ''
+    substituteInPlace {data/glest_game,.}/CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED( VERSION 2.8.2 )" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = ''
     for i in $out/bin/*; do
       wrapProgram $i \

From 88bbbe33b1598dbbec4d4f1c04c187f44290cca8 Mon Sep 17 00:00:00 2001
From: Philipp Mildenberger <philipp@mildenberger.me>
Date: Wed, 22 Oct 2025 17:25:41 +0200
Subject: [PATCH 1655/6226] cloudcompare: fix build with cmake 4

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

diff --git a/pkgs/by-name/cl/cloudcompare/package.nix b/pkgs/by-name/cl/cloudcompare/package.nix
index 496b0e7a761e..61ef38adeba1 100644
--- a/pkgs/by-name/cl/cloudcompare/package.nix
+++ b/pkgs/by-name/cl/cloudcompare/package.nix
@@ -91,6 +91,7 @@ stdenv.mkDerivation rec {
     "-DPLUGIN_STANDARD_QRANSAC_SD=OFF" # not compatible with GPL, broken on non-x86
     "-DPLUGIN_STANDARD_QSRA=ON"
     "-DPLUGIN_STANDARD_QCLOUDLAYERS=ON"
+    (lib.strings.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
   ];
 
   dontWrapGApps = true;

From efecb81e39dcca3a9fe6f253a2a9b461e770d593 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 12:36:44 -0300
Subject: [PATCH 1656/6226] megahit: fix build with cmake4

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

diff --git a/pkgs/by-name/me/megahit/package.nix b/pkgs/by-name/me/megahit/package.nix
index 84b8953a0556..ea0266471781 100644
--- a/pkgs/by-name/me/megahit/package.nix
+++ b/pkgs/by-name/me/megahit/package.nix
@@ -34,6 +34,12 @@ stdenv.mkDerivation rec {
   cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [
     "-DSTATIC_BUILD=ON"
   ];
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Ultra-fast single-node solution for large and complex metagenomics assembly via succinct de Bruijn graph";
     license = licenses.gpl3;

From ccb612fa02c5a5a4185b859ab82fa3dc61756a7c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 15:40:07 +0000
Subject: [PATCH 1657/6226] python3Packages.async-modbus: 0.2.2 -> 0.2.3

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

diff --git a/pkgs/development/python-modules/async-modbus/default.nix b/pkgs/development/python-modules/async-modbus/default.nix
index dcc5a4247a6f..e302b4f7568e 100644
--- a/pkgs/development/python-modules/async-modbus/default.nix
+++ b/pkgs/development/python-modules/async-modbus/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "async-modbus";
-  version = "0.2.2";
+  version = "0.2.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "tiagocoutinho";
     repo = "async_modbus";
     tag = "v${version}";
-    hash = "sha256-xms2OfX5bHPXswwhLhyh6HFsm1YqDwKclUirxrgL4i0=";
+    hash = "sha256-d4TTs3TtD/9eFdzXBaY+QeAMeRWTvsWeaxONeG0AXJU=";
   };
 
   patches = [

From b80bd9544df78c785106718552504076d142216d Mon Sep 17 00:00:00 2001
From: "Alexander V. Nikolaev" <avnick@gmail.com>
Date: Wed, 15 Oct 2025 15:03:48 +0300
Subject: [PATCH 1658/6226] brltty: add pkg-config for build (fix
 crosscompilation)

Also removed now unneeded pkg-config from nativeBuildInputs

Signed-off-by: Alexander V. Nikolaev <avn@avnik.info>
---
 pkgs/by-name/br/brltty/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/br/brltty/package.nix b/pkgs/by-name/br/brltty/package.nix
index 5885c511d333..a2bba6ec5aa2 100644
--- a/pkgs/by-name/br/brltty/package.nix
+++ b/pkgs/by-name/br/brltty/package.nix
@@ -29,8 +29,8 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-MoDYjHU6aJY9e5cgjm9InOEDGCs+jvlEurMWg9wo4RY=";
   };
 
+  depsBuildBuild = [ pkg-config ];
   nativeBuildInputs = [
-    pkg-config
     python3.pkgs.cython
     python3.pkgs.setuptools
     tcl # One of build scripts require tclsh

From 0735808727a89c45b4a0103d7d8ff2ca5aa8e555 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 15:46:42 +0000
Subject: [PATCH 1659/6226] python3Packages.mkdocs-mermaid2-plugin: 1.2.2 ->
 1.2.3

---
 .../python-modules/mkdocs-mermaid2-plugin/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
index b35b48626644..c97cd755c8e6 100644
--- a/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
+++ b/pkgs/development/python-modules/mkdocs-mermaid2-plugin/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-mermaid2-plugin";
-  version = "1.2.2";
+  version = "1.2.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "fralau";
     repo = "mkdocs-mermaid2-plugin";
     tag = "v${version}";
-    hash = "sha256-4WuE9fO4o0uN48W2Rwd4gKa6pK9bqyrcGjFLEkfJ0E4=";
+    hash = "sha256-EsfcOnfjZpAndYccN8WTpfLoUAlc5JQkgoy1ro1hMRo=";
   };
 
   propagatedBuildInputs = [

From 9f4aae33c9e0a66598a368050170f395e5c53c3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 15:54:37 +0000
Subject: [PATCH 1660/6226] switchfin: 0.7.5 -> 0.7.6

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

diff --git a/pkgs/by-name/sw/switchfin/package.nix b/pkgs/by-name/sw/switchfin/package.nix
index 5331a060a489..c3e64cfe49e8 100644
--- a/pkgs/by-name/sw/switchfin/package.nix
+++ b/pkgs/by-name/sw/switchfin/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchfin";
-  version = "0.7.5";
+  version = "0.7.6";
 
   src = fetchFromGitHub {
     owner = "dragonflylee";
     repo = "switchfin";
     rev = version;
-    hash = "sha256-vmf7urq3lnfvmdZUJ+G5zn4ZpNA2N4jlLo8D5ZG3tUQ=";
+    hash = "sha256-WEqscGd7K5tTQcK8XXc02EQU2yCbTIdrzw40eXw8lYY=";
     fetchSubmodules = true;
   };
 

From 6e0e04856f0e1c7083f813f984e9f43f2bf042ac Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Oct 2025 18:48:05 +0200
Subject: [PATCH 1661/6226] python313Packages.iamdata: 0.1.202510201 ->
 0.1.202510211

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202510201...v0.1.202510211

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

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 986d4bd3711b..ac0c2a694a71 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202510201";
+  version = "0.1.202510211";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-E9yFns1sRSyiFqQA3jXTSvMK7a7nj/UfUFUzh1PlUhM=";
+    hash = "sha256-ligG5GQkSFQtP059ekiTwPmFiOSdIzFXeSrVu2O6vLI=";
   };
 
   build-system = [ hatchling ];

From 7240cd4d3bd07b43b60b5fce603190016aaa839c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Oct 2025 17:56:05 +0200
Subject: [PATCH 1662/6226] python313Packages.iamdata: 0.1.202510211 ->
 0.1.202510221

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202510211...v0.1.202510221

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

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index ac0c2a694a71..c6ee6dafdf6b 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202510211";
+  version = "0.1.202510221";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-ligG5GQkSFQtP059ekiTwPmFiOSdIzFXeSrVu2O6vLI=";
+    hash = "sha256-jFx4B9RQ0tcYySCRdaClVN4tovLA4pPIhJvj7Ld5J1A=";
   };
 
   build-system = [ hatchling ];

From 15b473ecb1f9a3fcbe43e269bafb4549a16cf006 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Wed, 22 Oct 2025 17:59:15 +0200
Subject: [PATCH 1663/6226] ungoogled-chromium: 141.0.7390.107-1 ->
 141.0.7390.122-1

https://chromereleases.googleblog.com/2025/10/stable-channel-update-for-desktop_21.html

This update includes 1 security fix.

CVEs:
CVE-2025-12036
---
 .../networking/browsers/chromium/info.json             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 60470a5e6638..3ce8d2d65f6e 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -808,7 +808,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "141.0.7390.107",
+    "version": "141.0.7390.122",
     "deps": {
       "depot_tools": {
         "rev": "3f41e54ae17d53d4a39feecad64c3d3e6871b219",
@@ -820,16 +820,16 @@
         "hash": "sha256-WERLGrReUATmn3RhxtmyZcJBxdIY/WZqBDranCLDYEg="
       },
       "ungoogled-patches": {
-        "rev": "141.0.7390.107-1",
-        "hash": "sha256-IQoIcOlFhbSBpmZ6bpoX43XMPrKWRVExETjBBT4TCs0="
+        "rev": "141.0.7390.122-1",
+        "hash": "sha256-xFJdvGHLMXNcotHTamh9Q4M2/ctoJ3b5ORHBWtZOY90="
       },
       "npmHash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "1c008349f76ff3a317bf28316fc5008c0120deb4",
-        "hash": "sha256-NRqWOkGrg/Y4wZi4WQDJ6CvsDpeseVgTc/iAnuPRy/U=",
+        "rev": "b477534e7e10d193e916cd4e2967c589383625b2",
+        "hash": "sha256-3sVHRzERwlLzXl2qSn2Lil4U4d6N63MUOomSUrjy2YY=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {

From b750702053f21dc06f8ce49b3278e1a5119b57b0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Oct 2025 17:59:19 +0200
Subject: [PATCH 1664/6226] python313Packages.async-modbus: modernize

---
 .../python-modules/async-modbus/default.nix          | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/async-modbus/default.nix b/pkgs/development/python-modules/async-modbus/default.nix
index e302b4f7568e..ce18fc2268f2 100644
--- a/pkgs/development/python-modules/async-modbus/default.nix
+++ b/pkgs/development/python-modules/async-modbus/default.nix
@@ -7,7 +7,6 @@
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   umodbus,
 }:
@@ -15,9 +14,7 @@
 buildPythonPackage rec {
   pname = "async-modbus";
   version = "0.2.3";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tiagocoutinho";
@@ -39,9 +36,9 @@ buildPythonPackage rec {
       --replace '"--durations=2", "--verbose"' ""
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     connio
     umodbus
   ];
@@ -57,7 +54,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library for Modbus communication";
     homepage = "https://github.com/tiagocoutinho/async_modbus";
-    license = with licenses; [ gpl3Plus ];
+    changelog = "https://github.com/tiagocoutinho/async_modbus/releases/tag/${src.tag}";
+    license = licenses.gpl3Plus;
     maintainers = with maintainers; [ fab ];
   };
 }

From 702ac68c3cccc4371bb27ad474a67b0ac7346e9c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Oct 2025 18:00:29 +0200
Subject: [PATCH 1665/6226] python312Packages.mypy-boto3-dynamodb: 1.40.44 ->
 1.40.56

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ae9b79cabbee..96f3f68939bb 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -434,8 +434,8 @@ in
       "sha256-obbn0FjZQDwFucsnH3N1+zfe1aWFE5PWHUWiLAeupqA=";
 
   mypy-boto3-dynamodb =
-    buildMypyBoto3Package "dynamodb" "1.40.44"
-      "sha256-WPo6Y4scrvVkS2D1iU4RgqKVH+swo9xt7bNOGwyd7Zk=";
+    buildMypyBoto3Package "dynamodb" "1.40.56"
+      "sha256-V23RL+ESV1QGbn+kgPksEjIglwqdafdmOlbXAfKXisU=";
 
   mypy-boto3-dynamodbstreams =
     buildMypyBoto3Package "dynamodbstreams" "1.40.40"

From facfcf8a43a7ad7ce161dcf0940327820716a2c5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Oct 2025 18:00:34 +0200
Subject: [PATCH 1666/6226] python312Packages.mypy-boto3-emr: 1.40.0 -> 1.40.56

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 96f3f68939bb..092e5b901475 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -498,8 +498,8 @@ in
       "sha256-TGc78KsQ4y8QSFutN+/cj/gr2iJWi7fYh52OYFCFwho=";
 
   mypy-boto3-emr =
-    buildMypyBoto3Package "emr" "1.40.0"
-      "sha256-crNaa6bqSP7fCsFV5CnAHazDpXrFkkb46ria2LWTDvY=";
+    buildMypyBoto3Package "emr" "1.40.56"
+      "sha256-Khke6Z4btoZe5VlLDLJEmwxDD3o/uOYImj/bUy92Wdc=";
 
   mypy-boto3-emr-containers =
     buildMypyBoto3Package "emr-containers" "1.40.29"

From adf1f27f1b990864611918edbb9efc44a5df554b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Oct 2025 18:00:53 +0200
Subject: [PATCH 1667/6226] python312Packages.mypy-boto3-mediaconvert: 1.40.17
 -> 1.40.56

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 092e5b901475..7f3800a813e6 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -861,8 +861,8 @@ in
       "sha256-18sD6lfs5Y9BBp3j8c/TVjI/3KZbO6pKuYPYKir1NQY=";
 
   mypy-boto3-mediaconvert =
-    buildMypyBoto3Package "mediaconvert" "1.40.17"
-      "sha256-L2/TEQbnd60RuCaqpNI/xyQ76AqbIUe5KWwZtSf+2I8=";
+    buildMypyBoto3Package "mediaconvert" "1.40.56"
+      "sha256-oxrbkvlpIII2Ib8hMF0UnZ6PNFYnDHceA6V9M1thF18=";
 
   mypy-boto3-medialive =
     buildMypyBoto3Package "medialive" "1.40.45"

From 25f48567b316b24dfd375ed0b0288ab1aad79b83 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Oct 2025 18:00:56 +0200
Subject: [PATCH 1668/6226] python312Packages.mypy-boto3-meteringmarketplace:
 1.40.0 -> 1.40.56

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

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 7f3800a813e6..cda7504ab743 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -901,8 +901,8 @@ in
       "sha256-f/tGLKRnpzMDLAzQH1W7sUjGljb04Ws5Tidh8lL0pWE=";
 
   mypy-boto3-meteringmarketplace =
-    buildMypyBoto3Package "meteringmarketplace" "1.40.0"
-      "sha256-wbPakhKKDtNY6y84jzqJQlP7IiG5QAKQTRsYP/tndV8=";
+    buildMypyBoto3Package "meteringmarketplace" "1.40.56"
+      "sha256-idAuSb9+u1KVh13BBNSgXYkqKHZHcSfQ3rVxiDBLdVU=";
 
   mypy-boto3-mgh =
     buildMypyBoto3Package "mgh" "1.40.18"

From 936d108aad26ae0a42334d99d7b393b7de32e6f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 16:01:21 +0000
Subject: [PATCH 1669/6226] python3Packages.fastcore: 1.8.12 -> 1.8.13

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

diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix
index 8b42a9d32ba4..c408ab3d9282 100644
--- a/pkgs/development/python-modules/fastcore/default.nix
+++ b/pkgs/development/python-modules/fastcore/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "fastcore";
-  version = "1.8.12";
+  version = "1.8.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fastai";
     repo = "fastcore";
     tag = version;
-    hash = "sha256-YJONK7WMAQLCkROosGbT5C1G/JtTC7iZs2t+mx03yOo=";
+    hash = "sha256-5bgFV7ZGk+s8jjQaE13lWY+fIStin701ZrzyoJ7ziyY=";
   };
 
   build-system = [ setuptools ];

From 23f8bd6ee172570a1c188ffe944b5d89871e5f63 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Oct 2025 18:01:27 +0200
Subject: [PATCH 1670/6226] python313Packages.botocore-stubs: 1.40.55 ->
 1.40.56

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

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index 6d399c408e44..7857f852ee6d 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.40.55";
+  version = "1.40.56";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-V8iXiwu+QKn6Kf3lZN6KBGeaIj9DCpfQOtpi7BEiMa8=";
+    hash = "sha256-qpU1uKD3E1sGJQTjnny8g/s/ALLU3CurphcENrSUtpY=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 85941dcc960bdca4ecf88e230f4535d2659aa120 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Oct 2025 18:01:30 +0200
Subject: [PATCH 1671/6226] python313Packages.boto3-stubs: 1.40.55 -> 1.40.56

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

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 0ec58fa99c7a..e9f72aa92c71 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -358,13 +358,13 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.40.55";
+  version = "1.40.56";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-oRra+OrHfE7Uwbe/ckGwzZrQI9wcF8SbRfNa30wht/8=";
+    hash = "sha256-5WRFI+/39Qut5en0okVEtA+EnpBRlJ41ASA6IGJ/QmM=";
   };
 
   build-system = [ setuptools ];

From 2eec0ae2454a0793dee81ea44b865de8a2680267 Mon Sep 17 00:00:00 2001
From: cr0n <cr0n@cypherpunks.cc>
Date: Wed, 22 Oct 2025 18:04:37 +0200
Subject: [PATCH 1672/6226] necesse-server: 1.0.1-20456269 -> 1.0.1-20495154

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

diff --git a/pkgs/by-name/ne/necesse-server/package.nix b/pkgs/by-name/ne/necesse-server/package.nix
index 684d4c5d9b1e..c1e39ebe2d40 100644
--- a/pkgs/by-name/ne/necesse-server/package.nix
+++ b/pkgs/by-name/ne/necesse-server/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "1.0.1-20456269";
+  version = "1.0.1-20495154";
   urlVersion = lib.replaceStrings [ "." ] [ "-" ] version;
 
 in
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {
 
   src = fetchzip {
     url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip";
-    hash = "sha256-1Du0r/R7wLqnWRkihW3Kwzo58HEmUt8NgNYWSyJwwdc=";
+    hash = "sha256-1k+4ywYjVddAb4yyGx1Fi/RXMyJzPIiQIyUzA0VhpAI=";
   };
 
   # removing packaged jre since we use our own

From b2d076483ff51544cf7f158c06ea0a1dfe7a96d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 16:04:53 +0000
Subject: [PATCH 1673/6226] ripgrep: 15.0.0 -> 15.1.0

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

diff --git a/pkgs/by-name/ri/ripgrep/package.nix b/pkgs/by-name/ri/ripgrep/package.nix
index c5258bba05e7..26cca99406d2 100644
--- a/pkgs/by-name/ri/ripgrep/package.nix
+++ b/pkgs/by-name/ri/ripgrep/package.nix
@@ -17,16 +17,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "ripgrep";
-  version = "15.0.0";
+  version = "15.1.0";
 
   src = fetchFromGitHub {
     owner = "BurntSushi";
     repo = "ripgrep";
     rev = version;
-    hash = "sha256-pYQw4LuKBZdLTc/aBpruwrd9U9s++yXbSXfq2JZ/jyI=";
+    hash = "sha256-0gjwYMUlXYnmIWQS1SVzF1yQw1lpveRLw5qp049lc3I=";
   };
 
-  cargoHash = "sha256-vh5adpwdZHjEXLyiMKvL3LHNPZaiB4TWuypTXsieyek=";
+  cargoHash = "sha256-ry3pLuYNwX776Dpj9IE2+uc7eEa5+sQvdNNeG1eJecs=";
 
   nativeBuildInputs = [
     installShellFiles

From 927416baa9fe083b6f9ddf842fff875685c4b920 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 13:09:39 -0300
Subject: [PATCH 1674/6226] wesnoth-devel: 1.19.16.1 -> 1.19.17

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

diff --git a/pkgs/by-name/we/wesnoth/package.nix b/pkgs/by-name/we/wesnoth/package.nix
index 0c03fa0d7b7f..be34a6058bc8 100644
--- a/pkgs/by-name/we/wesnoth/package.nix
+++ b/pkgs/by-name/we/wesnoth/package.nix
@@ -39,7 +39,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "wesnoth${suffix}";
-  version = if enableDevel then "1.19.16.1" else "1.18.5";
+  version = if enableDevel then "1.19.17" else "1.18.5";
 
   src = fetchFromGitHub {
     owner = "wesnoth";
@@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     tag = finalAttrs.version;
     hash =
       if enableDevel then
-        "sha256-ekpyQnP5r3jl98qyNkO6SwUGc9qvz2OTidUu0k3m28c="
+        "sha256-8JFJR4ghL2uSI5zG63MPX5NwlvIc3/xR0SQ2FjG5JCw="
       else
         "sha256-0VZJAmaCg12x4S07H1kl5s2NGMEo/NSVnzMniREmPJk=";
   };

From 2ee9a375d9375b706e17b77cb683dc8be0223e6d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Oct 2025 18:14:25 +0200
Subject: [PATCH 1675/6226] python313Packages.tencentcloud-sdk-python: 3.0.1476
 -> 3.0.1479

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.0.1476...3.0.1479

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

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 258852bb9976..ef0672e82392 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1476";
+  version = "3.0.1479";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-FzCZT5ZIPdjl568lilb2syJA47FW1jjW7mYLj2cIO4k=";
+    hash = "sha256-RvMQk/8btxQ2c9idSnLmZedM/oDID9OFKcEikHXRIxs=";
   };
 
   build-system = [ setuptools ];

From 73ebacc1ef5726dbee512e84209fbc38834e08cf Mon Sep 17 00:00:00 2001
From: Jonas Rembser <jonas.rembser@cern.ch>
Date: Wed, 22 Oct 2025 18:22:37 +0200
Subject: [PATCH 1676/6226] xfitter: fix cmake error by changing minimum
 required version in code

This commit is analogous to 4ae54c3624, which did the same change to
`gfal2`.
---
 pkgs/by-name/xf/xfitter/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/xf/xfitter/package.nix b/pkgs/by-name/xf/xfitter/package.nix
index 7d54c0a76891..6bcff096cbcc 100644
--- a/pkgs/by-name/xf/xfitter/package.nix
+++ b/pkgs/by-name/xf/xfitter/package.nix
@@ -60,6 +60,12 @@ stdenv.mkDerivation {
   ]
   ++ lib.optional (stdenv.hostPlatform.libc == "glibc") libtirpc;
 
+  preConfigure = ''
+    substituteInPlace "CMakeLists.txt" \
+      --replace-fail 'cmake_minimum_required(VERSION 2.8.12.2)' \
+                     'cmake_minimum_required(VERSION 3.10)'
+  '';
+
   env.NIX_CFLAGS_COMPILE = lib.optionalString (
     stdenv.hostPlatform.libc == "glibc"
   ) "-I${libtirpc.dev}/include/tirpc";

From cad599f3526b0f1515e323a817fb5821a4a175b0 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 21 Oct 2025 11:37:59 +0200
Subject: [PATCH 1677/6226] top-level/by-name-overlay: remove optimization TODO

We tried to apply this, but this won't consistently help performance.
While it can potentially make full eval a tad faster, we'd pay the price
when evaluating single packages.
---
 pkgs/top-level/by-name-overlay.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/top-level/by-name-overlay.nix b/pkgs/top-level/by-name-overlay.nix
index 9a011439596a..e6fe5b721556 100644
--- a/pkgs/top-level/by-name-overlay.nix
+++ b/pkgs/top-level/by-name-overlay.nix
@@ -41,10 +41,6 @@ let
   # if the overlay has to be applied multiple times
   packageFiles = mergeAttrsList (mapAttrsToList namesForShard (readDir baseDirectory));
 in
-# TODO: Consider optimising this using `builtins.deepSeq packageFiles`,
-# which could free up the above thunks and reduce GC times.
-# Currently this would be hard to measure until we have more packages
-# and ideally https://github.com/NixOS/nix/pull/8895
 self: super:
 {
   # This attribute is necessary to allow CI to ensure that all packages defined in `pkgs/by-name`

From 41c4edc26bc025a9764f33359f74a3526a1f3e58 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Wed, 22 Oct 2025 18:47:50 +0200
Subject: [PATCH 1678/6226] victoriametrics: 1.127.0 -> 1.128.0

Release notes: https://github.com/VictoriaMetrics/VictoriaMetrics/releases/tag/v1.128.0
Full changelog: https://github.com/VictoriaMetrics/VictoriaMetrics/compare/v1.127.0...v1.128.0
---
 pkgs/by-name/vi/victoriametrics/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix
index 2ceb5c9ace3c..704465fd1b83 100644
--- a/pkgs/by-name/vi/victoriametrics/package.nix
+++ b/pkgs/by-name/vi/victoriametrics/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "VictoriaMetrics";
-  version = "1.127.0";
+  version = "1.128.0";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaMetrics";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-j0PikCV0VWSfp2rvwssXwvkRGQzFNd6hidZv3bufUuI=";
+    hash = "sha256-X1TkE0lJNu68iETf8M8U5IZvRadtIPR6LqP61uzhD3Y=";
   };
 
   vendorHash = null;
@@ -53,7 +53,7 @@ buildGoModule (finalAttrs: {
 
     # Allow older go versions
     substituteInPlace go.mod \
-      --replace-fail "go 1.25.1" "go ${finalAttrs.passthru.go.version}"
+      --replace-fail "go 1.25.3" "go ${finalAttrs.passthru.go.version}"
 
     # Increase timeouts in tests to prevent failure on heavily loaded builders
     substituteInPlace lib/storage/storage_test.go \

From ee05195f7b6a487a93a86958e4f1ff89d238349f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 22 Oct 2025 18:22:34 +0200
Subject: [PATCH 1679/6226] bind: 9.20.13 -> 9.20.15

https://downloads.isc.org/isc/bind9/cur/9.20/doc/arm/html/notes.html#notes-for-bind-9-20-15

https://kb.isc.org/docs/cve-2025-8677
https://kb.isc.org/docs/cve-2025-40778
https://kb.isc.org/docs/cve-2025-40780
---
 pkgs/by-name/bi/bind/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix
index 4d506f669dd6..f77606459334 100644
--- a/pkgs/by-name/bi/bind/package.nix
+++ b/pkgs/by-name/bi/bind/package.nix
@@ -29,11 +29,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bind";
-  version = "9.20.13";
+  version = "9.20.15";
 
   src = fetchurl {
     url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/bind-${finalAttrs.version}.tar.xz";
-    hash = "sha256-FR+TdurTF+ZGpdDJ8BwGA4bYkRGNdDen+Cm7lyfHs0w=";
+    hash = "sha256-1is4+uSLqD/KYYERLQxxAY2LDyzihdx53GoDZ3Isyrs=";
   };
 
   outputs = [

From cec129a7d1be8be3df3f1c3e2f9df67774284a8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 17:06:27 +0000
Subject: [PATCH 1680/6226] glooctl: 1.20.2 -> 1.20.3

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

diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix
index 914193157343..acd687d5574b 100644
--- a/pkgs/by-name/gl/glooctl/package.nix
+++ b/pkgs/by-name/gl/glooctl/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "glooctl";
-  version = "1.20.2";
+  version = "1.20.3";
 
   src = fetchFromGitHub {
     owner = "solo-io";
     repo = "gloo";
     rev = "v${version}";
-    hash = "sha256-Fc7AxuE2t7tw4Q5/iTcCg417Z0QqzWIB9IBBPysVMGc=";
+    hash = "sha256-i2+CEPHK2C34ulY4nRTVw0sNBsHzD1WlKiZRjwHJOVc=";
   };
 
   vendorHash = "sha256-zJmp3UWzZSI7G54DTOEOEo2ZIKjM6GZ0Cf5/BukaB4o=";

From 10c0ba45be36d7a7b8247e22fa30fc4148bbd907 Mon Sep 17 00:00:00 2001
From: osbm <osbm@osbm.dev>
Date: Wed, 22 Oct 2025 20:09:59 +0300
Subject: [PATCH 1681/6226] networkmanager: fix changelog url

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

diff --git a/pkgs/by-name/ne/networkmanager/package.nix b/pkgs/by-name/ne/networkmanager/package.nix
index dd1d931001a2..51e267cb8a28 100644
--- a/pkgs/by-name/ne/networkmanager/package.nix
+++ b/pkgs/by-name/ne/networkmanager/package.nix
@@ -233,7 +233,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://networkmanager.dev";
     description = "Network configuration and management tool";
     license = licenses.gpl2Plus;
-    changelog = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/${version}/NEWS";
+    changelog = "https://gitlab.freedesktop.org/NetworkManager/NetworkManager/-/raw/${finalAttrs.version}/NEWS";
     maintainers = with maintainers; [
       obadz
     ];

From 8996a61a0b4a3e289a201c0732ac9a4049b701b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 17:11:51 +0000
Subject: [PATCH 1682/6226] ginkgo: 2.26.0 -> 2.27.1

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

diff --git a/pkgs/by-name/gi/ginkgo/package.nix b/pkgs/by-name/gi/ginkgo/package.nix
index 063dc6ddab51..aeb981992263 100644
--- a/pkgs/by-name/gi/ginkgo/package.nix
+++ b/pkgs/by-name/gi/ginkgo/package.nix
@@ -8,15 +8,15 @@
 
 buildGoModule rec {
   pname = "ginkgo";
-  version = "2.26.0";
+  version = "2.27.1";
 
   src = fetchFromGitHub {
     owner = "onsi";
     repo = "ginkgo";
     rev = "v${version}";
-    sha256 = "sha256-sf8rGRLSX3AsUSGqBXzb0KRwKqpmRiD+U9V/ldLqwps=";
+    sha256 = "sha256-XdJYg0ahUkYdaEc4G5lqxc7gr5fF3BjhVPcaynd7u2Q=";
   };
-  vendorHash = "sha256-CUoVFKA/LQNVf4gnjqguYjPTF4ZdxA+QSJmw/UeUsrM=";
+  vendorHash = "sha256-VKflMZ+qZGLlXdWpdnRV2dSqta4C3SfLKgJcqHHtDNk=";
 
   # integration tests expect more file changes
   # types tests are missing CodeLocation

From faf2de06835a7c61fc302f408cbf190d4419709f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebasti=C3=A1n=20Zavala=20Villag=C3=B3mez?=
 <sebaszv@proton.me>
Date: Mon, 15 Sep 2025 03:22:58 -0400
Subject: [PATCH 1683/6226] ugrep: add optional filter utils wrapping & gnugrep
 replacement symlinks

The `ugrep+` and `ug+` commands are the same as the
`ugrep` and `ug` commands, but also use filters to
search PDFs, documents, e-books, image metadata,
when these filter tools are present:
- pdftotext
- antiword
- pandoc
- exiftool

`ugrep+` and `ug+` can now be wrapped to make those
utils accessible without the need for users to clutter
their environments through installing them. This is
opt-in with the `wrapWithFilterUtils` flag since these
packages grow the closure size massively.

A `createGrepReplacementLinks` flag was also added to
optionally create symlinks to serve as `gnugrep` drop-in
replacements. This works just like with `coreutils`. We
ensure that these variants beat `gnugrep`'s priority value
so `ugrep` wins when building `system-path` with `buildEnv`.
---
 doc/release-notes/rl-2511.section.md |  5 ++
 pkgs/by-name/ug/ugrep/package.nix    | 86 +++++++++++++++++++++++-----
 2 files changed, 78 insertions(+), 13 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 5e22edd9f6dc..50bbc8883bb7 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -370,3 +370,8 @@
 - `cloudflare-ddns`: Added package cloudflare-ddns.
 
 - `lib.cli.toCommandLine`, `lib.cli.toCommandLineShell`, `lib.cli.toCommandLineGNU` and `lib.cli.toCommandLineShellGNU` have been added to address multiple issues in `lib.cli.toGNUCommandLine` and `lib.cli.toGNUCommandLineShell`.
+
+- `ugrep`: Added `wrapWithFilterUtils` package flag for optionally wrapping `ugrep+` and `ug+` with filter utilities for grepping other file types.
+
+- `ugrep`: Added `createGrepReplacementLinks` package flag for optionally creating drop-in replacement symlinks for `gnugrep`.
+
diff --git a/pkgs/by-name/ug/ugrep/package.nix b/pkgs/by-name/ug/ugrep/package.nix
index 5765e0898b09..14880464bb59 100644
--- a/pkgs/by-name/ug/ugrep/package.nix
+++ b/pkgs/by-name/ug/ugrep/package.nix
@@ -13,6 +13,28 @@
   xz,
   zlib,
   zstd,
+  # The `ugrep+` and `ug+` commands are the same as the
+  # `ugrep` and `ug` commands, but also use filters to
+  # search PDFs, documents, e-books, image metadata,
+  # when these filter tools are present:
+  poppler-utils, # Provides `pdftotext`.
+  antiword,
+  pandoc,
+  exiftool,
+  # Alleviates the need for users to pollute their
+  # environment with these packages, but grows the
+  # closure size massively; hence this is opt-in.
+  wrapWithFilterUtils ? false,
+  # `ugrep` has a compatibility mode for the `gnugrep`
+  # variants. When `$0` is one of the variants, `ugrep`
+  # behaves like it to be drop-in compatible. This can
+  # be done simply through symlinks, just like is done
+  # with `coreutils`. These will of course shadow the
+  # `pkgs.gnugrep` binaries in `system-path`.
+  createGrepReplacementLinks ? false,
+  # All we need is its `meta.priority` to ensure `ugrep`
+  # beats it.
+  gnugrep,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -41,8 +63,39 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   postFixup = ''
+    # Needed because `ug+` and `ugrep+` are
+    # just scripts that call `ug` or `ugrep`
+    # with certain arguments. They must be
+    # reachable.
     for i in ug+ ugrep+; do
-      wrapProgram "$out/bin/$i" --prefix PATH : "$out/bin"
+      wrapProgram "$out/bin/$i" --prefix PATH : "${
+        lib.makeBinPath (
+          [ "$out" ]
+          ++ (lib.optionals wrapWithFilterUtils [
+            poppler-utils
+            antiword
+            pandoc
+            exiftool
+          ])
+        )
+      }"
+    done
+  ''
+  + lib.optionalString createGrepReplacementLinks ''
+    # These will be made relative by the
+    # `_makeSymlinksRelativeInAllOutputs`
+    # `postFixupHook`.
+    for i in ${
+      lib.concatStringsSep " " [
+        "grep"
+        "egrep"
+        "fgrep"
+        "zgrep"
+        "zegrep"
+        "zfgrep"
+      ]
+    }; do
+      ln -s "$out/bin/ugrep" "$out/bin/$i"
     done
   '';
 
@@ -52,16 +105,23 @@ stdenv.mkDerivation (finalAttrs: {
     };
   };
 
-  meta = with lib; {
-    description = "Ultra fast grep with interactive query UI";
-    homepage = "https://github.com/Genivia/ugrep";
-    changelog = "https://github.com/Genivia/ugrep/releases/tag/v${finalAttrs.version}";
-    maintainers = with maintainers; [
-      numkem
-      mikaelfangel
-    ];
-    license = licenses.bsd3;
-    platforms = platforms.all;
-    mainProgram = "ug";
-  };
+  meta =
+    with lib;
+    {
+      description = "Ultra fast grep with interactive query UI";
+      homepage = "https://github.com/Genivia/ugrep";
+      changelog = "https://github.com/Genivia/ugrep/releases/tag/v${finalAttrs.version}";
+      maintainers = with maintainers; [
+        numkem
+        mikaelfangel
+      ];
+      license = licenses.bsd3;
+      platforms = platforms.all;
+      mainProgram = "ug";
+    }
+    # Needed to ensure that the grep replacements take precedence over
+    # `gnugrep` when installed. Lower priority values win.
+    // lib.optionalAttrs createGrepReplacementLinks {
+      priority = (gnugrep.meta.priority or meta.defaultPriority) - 1;
+    };
 })

From 42f3540c9e0aac0a66d824aff3c01fd2a2c2a72e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 22 Oct 2025 17:25:55 +0000
Subject: [PATCH 1684/6226] python3Packages.orbax-checkpoint: 0.11.25 ->
 0.11.26

Diff: https://github.com/google/orbax/compare/v0.11.25...v0.11.26

Changelog: https://github.com/google/orbax/blob/v0.11.26/checkpoint/CHANGELOG.md
---
 .../development/python-modules/orbax-checkpoint/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix
index 1e4b06e2d871..897e31c8e350 100644
--- a/pkgs/development/python-modules/orbax-checkpoint/default.nix
+++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix
@@ -18,6 +18,7 @@
   nest-asyncio,
   numpy,
   protobuf,
+  psutil,
   pyyaml,
   simplejson,
   tensorstore,
@@ -36,14 +37,14 @@
 
 buildPythonPackage rec {
   pname = "orbax-checkpoint";
-  version = "0.11.25";
+  version = "0.11.26";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "orbax";
     tag = "v${version}";
-    hash = "sha256-myhPWKP2uI9NQKZki1Rr+B6Kusn0qNWREKHkiDrSheA=";
+    hash = "sha256-CY5Bs/o8fU57QJETYnyJVkP7Y+cahpqZftyIJNU+GvU=";
   };
 
   sourceRoot = "${src.name}/checkpoint";
@@ -65,6 +66,7 @@ buildPythonPackage rec {
     nest-asyncio
     numpy
     protobuf
+    psutil
     pyyaml
     simplejson
     tensorstore

From e6aa2e34a15ec7eb4309267d9942814b2015c820 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Wed, 22 Oct 2025 13:09:00 +0300
Subject: [PATCH 1685/6226] nixos/plymouth: add package option

---
 .../manual/release-notes/rl-2511.section.md   |  2 +
 nixos/modules/system/boot/plymouth.nix        | 49 +++++++++++--------
 2 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index d1285109a0ce..b845345a2872 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -331,6 +331,8 @@
 
 - `services.dnscrypt-proxy` gains a `package` option to specify dnscrypt-proxy package to use.
 
+- `boot.plymouth` now has a [`package`](#opt-boot.plymouth.package) option to specify the package used in the module.
+
 - `services.limesurvey` now supports nginx as reverse-proxy. Available through [services.limesurvey.webserver](#opt-services.limesurvey.webserver).
 
 - `services.nextcloud.configureRedis` now defaults to `true` in accordance with upstream recommendations to have caching for file locking. See the [upstream doc](https://docs.nextcloud.com/server/31/admin_manual/configuration_files/files_locking_transactional.html) for further details.
diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index 1023fa8ce42d..51026e8c7a6a 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -21,10 +21,6 @@ let
     escapeShellArg
     ;
 
-  plymouth = pkgs.plymouth.override {
-    systemd = config.boot.initrd.systemd.package;
-  };
-
   cfg = config.boot.plymouth;
   opt = options.boot.plymouth;
 
@@ -64,7 +60,7 @@ let
   themesEnv = pkgs.buildEnv {
     name = "plymouth-themes";
     paths = [
-      plymouth
+      cfg.package
       plymouthLogos
     ]
     ++ cfg.themePackages;
@@ -96,7 +92,7 @@ let
   preStartQuitFixup = {
     serviceConfig.ExecStartPre = [
       ""
-      "${plymouth}/bin/plymouth quit --wait"
+      "${cfg.package}/bin/plymouth quit --wait"
     ];
   };
 
@@ -110,6 +106,19 @@ in
 
       enable = mkEnableOption "Plymouth boot splash screen";
 
+      package = mkOption {
+        description = "The plymouth package to use.";
+        type = types.package;
+        default = pkgs.plymouth.override {
+          systemd = config.boot.initrd.systemd.package;
+        };
+        defaultText = literalExpression ''
+          pkgs.plymouth.override {
+            systemd = config.boot.initrd.systemd.package;
+          }
+        '';
+      };
+
       font = mkOption {
         default = "${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf";
         defaultText = literalExpression ''"''${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf"'';
@@ -175,15 +184,15 @@ in
     boot.kernelParams = [ "splash" ];
 
     # To be discoverable by systemd.
-    environment.systemPackages = [ plymouth ];
+    environment.systemPackages = [ cfg.package ];
 
     environment.etc."plymouth/plymouthd.conf".source = configFile;
     environment.etc."plymouth/plymouthd.defaults".source =
-      "${plymouth}/share/plymouth/plymouthd.defaults";
+      "${cfg.package}/share/plymouth/plymouthd.defaults";
     environment.etc."plymouth/logo.png".source = cfg.logo;
     environment.etc."plymouth/themes".source = "${themesEnv}/share/plymouth/themes";
     # XXX: Needed because we supply a different set of plugins in initrd.
-    environment.etc."plymouth/plugins".source = "${plymouth}/lib/plymouth";
+    environment.etc."plymouth/plugins".source = "${cfg.package}/lib/plymouth";
 
     systemd.tmpfiles.rules = [
       "d /run/plymouth 0755 root root 0 -"
@@ -192,7 +201,7 @@ in
       "L+ /run/plymouth/plugins - - - - /etc/plymouth/plugins"
     ];
 
-    systemd.packages = [ plymouth ];
+    systemd.packages = [ cfg.package ];
 
     systemd.services.plymouth-kexec.wantedBy = [ "kexec.target" ];
     systemd.services.plymouth-halt.wantedBy = [ "halt.target" ];
@@ -211,13 +220,13 @@ in
     systemd.services.emergency = preStartQuitFixup;
 
     boot.initrd.systemd = {
-      extraBin.plymouth = "${plymouth}/bin/plymouth"; # for the recovery shell
+      extraBin.plymouth = "${cfg.package}/bin/plymouth"; # for the recovery shell
       storePaths = [
         "${getBin config.boot.initrd.systemd.package}/bin/systemd-tty-ask-password-agent"
-        "${plymouth}/bin/plymouthd"
-        "${plymouth}/sbin/plymouthd"
+        "${cfg.package}/bin/plymouthd"
+        "${cfg.package}/sbin/plymouthd"
       ];
-      packages = [ plymouth ]; # systemd units
+      packages = [ cfg.package ]; # systemd units
 
       services.rescue = preStartQuitFixup;
       services.emergency = preStartQuitFixup;
@@ -226,7 +235,7 @@ in
         # Files
         "/etc/plymouth/plymouthd.conf".source = configFile;
         "/etc/plymouth/logo.png".source = cfg.logo;
-        "/etc/plymouth/plymouthd.defaults".source = "${plymouth}/share/plymouth/plymouthd.defaults";
+        "/etc/plymouth/plymouthd.defaults".source = "${cfg.package}/share/plymouth/plymouthd.defaults";
         # Directories
         "/etc/plymouth/plugins".source = pkgs.runCommand "plymouth-initrd-plugins" { } (
           checkIfThemeExists
@@ -236,7 +245,7 @@ in
             mkdir -p $out/renderers
             # module might come from a theme
             cp ${themesEnv}/lib/plymouth/*.so $out
-            cp ${plymouth}/lib/plymouth/renderers/*.so $out/renderers
+            cp ${cfg.package}/lib/plymouth/renderers/*.so $out/renderers
             # useless in the initrd, and adds several megabytes to the closure
             rm $out/renderers/x11.so
           ''
@@ -319,8 +328,8 @@ in
 
     boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) (
       ''
-        copy_bin_and_libs ${plymouth}/bin/plymouth
-        copy_bin_and_libs ${plymouth}/bin/plymouthd
+        copy_bin_and_libs ${cfg.package}/bin/plymouth
+        copy_bin_and_libs ${cfg.package}/bin/plymouthd
 
       ''
       + checkIfThemeExists
@@ -331,12 +340,12 @@ in
         mkdir -p $out/lib/plymouth/renderers
         # module might come from a theme
         cp ${themesEnv}/lib/plymouth/*.so $out/lib/plymouth
-        cp ${plymouth}/lib/plymouth/renderers/*.so $out/lib/plymouth/renderers
+        cp ${cfg.package}/lib/plymouth/renderers/*.so $out/lib/plymouth/renderers
         # useless in the initrd, and adds several megabytes to the closure
         rm $out/lib/plymouth/renderers/x11.so
 
         mkdir -p $out/share/plymouth/themes
-        cp ${plymouth}/share/plymouth/plymouthd.defaults $out/share/plymouth
+        cp ${cfg.package}/share/plymouth/plymouthd.defaults $out/share/plymouth
 
         # Copy themes into working directory for patching
         mkdir themes

From a548bd706f4a213842488dd9742085dee57de322 Mon Sep 17 00:00:00 2001
From: SkohTV <contact@skoh.dev>
Date: Wed, 22 Oct 2025 13:31:44 -0400
Subject: [PATCH 1686/6226] libnl-tiny: 2025-03-19 -> 2025-10-20

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

diff --git a/pkgs/by-name/li/libnl-tiny/package.nix b/pkgs/by-name/li/libnl-tiny/package.nix
index f0fefcc64767..d814fbab6ce7 100644
--- a/pkgs/by-name/li/libnl-tiny/package.nix
+++ b/pkgs/by-name/li/libnl-tiny/package.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation {
   pname = "libnl-tiny";
-  version = "0-unstable-2025-03-19";
+  version = "0-unstable-2025-10-20";
 
   src = fetchgit {
     url = "https://git.openwrt.org/project/libnl-tiny.git";
-    rev = "c0df580adbd4d555ecc1962dbe88e91d75b67a4e";
-    hash = "sha256-j5oIEbWqVWd7rNpCMm9+WZwud43uTGeHG81lmzQOoeY=";
+    rev = "c69fb5ef80b9780fe9add345052aef9ccb5d51f4";
+    hash = "sha256-QH4w++kekejvvgTye6djs0jYzcNsxfrE3XCBed+Oizo=";
   };
 
   nativeBuildInputs = [

From 73a21101d677580bb7de49f1a996f7ba19f40400 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 17:35:31 +0000
Subject: [PATCH 1687/6226] fflogs: 8.17.71 -> 8.17.83

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

diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix
index 85e0168b4713..0bd801ac94b0 100644
--- a/pkgs/by-name/ff/fflogs/package.nix
+++ b/pkgs/by-name/ff/fflogs/package.nix
@@ -6,10 +6,10 @@
 
 let
   pname = "fflogs";
-  version = "8.17.71";
+  version = "8.17.83";
   src = fetchurl {
     url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
-    hash = "sha256-ey2hfndsLxViy7dYtIwfUgsk9kQycgBpsHGoBwO9LUs=";
+    hash = "sha256-orVUCf7+OzJQ561maIYEBKgSgLuKfuSXFGMLZV/HMjM=";
   };
   extracted = appimageTools.extractType2 { inherit pname version src; };
 in

From 9da8ee8d57230fea9d2cefa93392e89080a76725 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Tue, 21 Oct 2025 18:16:59 -0700
Subject: [PATCH 1688/6226] imagelol: use system libraries, unbreak darwin

Replace bundled zlib, libpng, and stb with system libraries via a
patch file. Some of bundled libraries fail to build on clang.

This also removes the broken flag on darwin.
---
 pkgs/by-name/im/imagelol/package.nix          | 38 ++++++++++---------
 .../by-name/im/imagelol/use-system-libs.patch | 32 ++++++++++++++++
 2 files changed, 52 insertions(+), 18 deletions(-)
 create mode 100644 pkgs/by-name/im/imagelol/use-system-libs.patch

diff --git a/pkgs/by-name/im/imagelol/package.nix b/pkgs/by-name/im/imagelol/package.nix
index c177b42a7f8e..1e0c8bed3483 100644
--- a/pkgs/by-name/im/imagelol/package.nix
+++ b/pkgs/by-name/im/imagelol/package.nix
@@ -4,6 +4,8 @@
   fetchFromGitHub,
   fetchpatch,
   cmake,
+  libpng,
+  stb,
 }:
 
 stdenv.mkDerivation rec {
@@ -25,10 +27,11 @@ stdenv.mkDerivation rec {
       url = "https://github.com/MCredstoner2004/ImageLOL/commit/013fb1f901d88f5fd21a896bfab47c7fff0737d7.patch";
       hash = "sha256-RVaG2xbUqE4CxqI2lhvug2qihT6A8vN+pIfK58CXLDw=";
       includes = [ "imagelol/ImageLOL.inl" ];
-      # change lib/ for imagelol
       stripLen = 2;
       extraPrefix = "imagelol/";
     })
+    # use system libraries instead of bundled versions
+    ./use-system-libs.patch
   ];
 
   # fix for case-sensitive filesystems
@@ -36,28 +39,28 @@ stdenv.mkDerivation rec {
   postPatch = ''
     mv imagelol src
     substituteInPlace CMakeLists.txt \
-      --replace 'add_subdirectory("imagelol")' 'add_subdirectory("src")'
+      --replace-fail 'add_subdirectory("imagelol")' 'add_subdirectory("src")'
 
-    substituteInPlace External/zlib-no-examples/CMakeLists.txt \
-      --replace-fail "cmake_minimum_required(VERSION 2.4.4)" "cmake_minimum_required(VERSION 3.10)"
-    substituteInPlace External/libpng/CMakeLists.txt \
-      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" \
-      --replace-fail "cmake_policy(VERSION 3.1)" "cmake_policy(VERSION 3.10)"
+    # use system stb headers
+    substituteInPlace External/stb_image-cmake/CMakeLists.txt \
+      --replace-fail '"''${CMAKE_CURRENT_SOURCE_DIR}/../stb"' '"${stb}/include/stb"'
+
+    # remove bundled libraries
+    rm -r External/zlib External/zlib-no-examples External/libpng External/stb
   '';
 
   nativeBuildInputs = [ cmake ];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp ./ImageLOL $out/bin
-  '';
+  buildInputs = [
+    libpng
+    stb
+  ];
 
-  cmakeFlags = [
-    (lib.cmakeFeature "CMAKE_C_FLAGS" "-std=gnu90")
-  ]
-  ++ lib.optional (
-    stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64
-  ) "-DPNG_ARM_NEON=off";
+  installPhase = ''
+    runHook preInstall
+    install -Dm755 ImageLOL -t $out/bin
+    runHook postInstall
+  '';
 
   meta = with lib; {
     homepage = "https://github.com/MCredstoner2004/ImageLOL";
@@ -65,7 +68,6 @@ stdenv.mkDerivation rec {
     license = licenses.mit;
     maintainers = [ ];
     platforms = platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin;
     mainProgram = "ImageLOL";
   };
 }
diff --git a/pkgs/by-name/im/imagelol/use-system-libs.patch b/pkgs/by-name/im/imagelol/use-system-libs.patch
new file mode 100644
index 000000000000..05e89a41d16b
--- /dev/null
+++ b/pkgs/by-name/im/imagelol/use-system-libs.patch
@@ -0,0 +1,32 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -3,26 +3,12 @@
+ project(ImageLOL VERSION 0.0)
+ set(CMAKE_CXX_STANDARD 20)
+ set(CMAKE_CXX_STANDARD_REQUIRED True)
+-include_directories("External/zlib" "External/libpng")
+ add_subdirectory("External/stb_image-cmake")
+
+-set(SKIP_INSTALL_ALL ON CACHE BOOL "")
+-add_subdirectory("External/zlib-no-examples")
+-
+-set(PNG_BUILD_ZLIB ON CACHE BOOL "")
+-link_libraries(zlibstatic)
+-get_target_property(ZLIB_INCLUDE_DIRECTORIES zlibstatic INCLUDE_DIRECTORIES)
+-include_directories(${ZLIB_INCLUDE_DIRECTORIES})
+-set(ZLIB_INCLUDE_DIR ${ZLIB_INCLUDE_DIRECTORIES} CACHE PATH "")
+-set(PNG_SHARED OFF CACHE BOOL "")
+-set(PNG_EXECUTABLES OFF CACHE BOOL "")
+-add_subdirectory("External/libpng")
+-add_dependencies(png_static zlibstatic zlib)
+-add_dependencies(genfiles zlibstatic)
+-unset(SKIP_INSTALL_ALL CACHE)
+-get_target_property(LIBPNG_INCLUDE_DIRECTORIES png_static INCLUDE_DIRECTORIES)
++find_package(PNG REQUIRED)
++set(LIBPNG_INCLUDE_DIRECTORIES ${PNG_INCLUDE_DIRS})
+
+ add_subdirectory("imagelol")
+ add_executable(ImageLOL main.cpp)
+ target_include_directories(ImageLOL PRIVATE ${LIBPNG_INCLUDE_DIRECTORIES})
+-target_link_libraries(ImageLOL PRIVATE stb_image png_static zlibstatic libimagelol)
++target_link_libraries(ImageLOL PRIVATE stb_image PNG::PNG libimagelol)

From bfaa803e7dc276e35e608c29196905411ba09c1c Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 13:57:09 -0300
Subject: [PATCH 1689/6226] translatelocally: fix build with cmake4

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

diff --git a/pkgs/by-name/tr/translatelocally/package.nix b/pkgs/by-name/tr/translatelocally/package.nix
index 3ade4781eca9..5e4344db5744 100644
--- a/pkgs/by-name/tr/translatelocally/package.nix
+++ b/pkgs/by-name/tr/translatelocally/package.nix
@@ -38,6 +38,12 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     echo '#define GIT_REVISION "${rev} ${finalAttrs.version}"' > \
       3rd_party/bergamot-translator/3rd_party/marian-dev/src/common/git_revision.h
+
+    substituteInPlace 3rd_party/bergamot-translator/3rd_party/marian-dev/src/3rd_party/sentencepiece/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+
+    substituteInPlace 3rd_party/bergamot-translator/3rd_party/marian-dev/src/3rd_party/ruy/third_party/cpuinfo/deps/clog/CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   # https://github.com/XapaJIaMnu/translateLocally/blob/81ed8b9/.github/workflows/build.yml#L330

From 6e1fb5d6b26c20fe752417dbd03ddffc141e2760 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Wed, 22 Oct 2025 20:47:33 +0300
Subject: [PATCH 1690/6226] nixos/plymouth: make use of lib.getExe' wherever
 possible

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

diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix
index 51026e8c7a6a..3636503992c5 100644
--- a/nixos/modules/system/boot/plymouth.nix
+++ b/nixos/modules/system/boot/plymouth.nix
@@ -17,7 +17,7 @@ let
     literalExpression
     types
     literalMD
-    getBin
+    getExe'
     escapeShellArg
     ;
 
@@ -92,7 +92,7 @@ let
   preStartQuitFixup = {
     serviceConfig.ExecStartPre = [
       ""
-      "${cfg.package}/bin/plymouth quit --wait"
+      "${getExe' cfg.package "plymouth"} quit --wait"
     ];
   };
 
@@ -220,10 +220,10 @@ in
     systemd.services.emergency = preStartQuitFixup;
 
     boot.initrd.systemd = {
-      extraBin.plymouth = "${cfg.package}/bin/plymouth"; # for the recovery shell
+      extraBin.plymouth = getExe' cfg.package "plymouth"; # for the recovery shell
       storePaths = [
-        "${getBin config.boot.initrd.systemd.package}/bin/systemd-tty-ask-password-agent"
-        "${cfg.package}/bin/plymouthd"
+        (getExe' config.boot.initrd.systemd.package "systemd-tty-ask-password-agent")
+        (getExe' cfg.package "plymouthd")
         "${cfg.package}/sbin/plymouthd"
       ];
       packages = [ cfg.package ]; # systemd units
@@ -328,8 +328,8 @@ in
 
     boot.initrd.extraUtilsCommands = mkIf (!config.boot.initrd.systemd.enable) (
       ''
-        copy_bin_and_libs ${cfg.package}/bin/plymouth
-        copy_bin_and_libs ${cfg.package}/bin/plymouthd
+        copy_bin_and_libs ${getExe' cfg.package "plymouth"}
+        copy_bin_and_libs ${getExe' cfg.package "plymouthd"}
 
       ''
       + checkIfThemeExists

From f501cb862541485a6f7b3c2a63df5df66e32ce4b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 17:54:38 +0000
Subject: [PATCH 1691/6226] tpnote: 1.25.15 -> 1.25.16

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

diff --git a/pkgs/by-name/tp/tpnote/package.nix b/pkgs/by-name/tp/tpnote/package.nix
index 5dc592333593..06f44f3036fc 100644
--- a/pkgs/by-name/tp/tpnote/package.nix
+++ b/pkgs/by-name/tp/tpnote/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tpnote";
-  version = "1.25.15";
+  version = "1.25.16";
 
   src = fetchFromGitHub {
     owner = "getreu";
     repo = "tp-note";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vmHRpY2KvG6vxVQ6OVi/u6wpD8oqQFXn2IJOT0Nh/V0=";
+    hash = "sha256-gltzK1C+4qddJ49vv+OZ8AVuMeBWArwOZkL+v7cxFzw=";
   };
 
-  cargoHash = "sha256-dltBOA6pxy2gLemVoX8l0Z+xkiJvhGWSmediWWnN1bc=";
+  cargoHash = "sha256-OH3aSQdcAGNRJWGmgQ4LNnD89hqCIEh+ieHosjFhAbk=";
 
   nativeBuildInputs = [
     cmake

From aabdb0af1e10da264d6a5dbe344e5f5c767cb2f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 17:56:32 +0000
Subject: [PATCH 1692/6226] bluemap: 5.12 -> 5.13

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

diff --git a/pkgs/by-name/bl/bluemap/package.nix b/pkgs/by-name/bl/bluemap/package.nix
index 13d5c1226156..da8193a8e798 100644
--- a/pkgs/by-name/bl/bluemap/package.nix
+++ b/pkgs/by-name/bl/bluemap/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "bluemap";
-  version = "5.12";
+  version = "5.13";
 
   src = fetchurl {
     url = "https://github.com/BlueMap-Minecraft/BlueMap/releases/download/v${version}/BlueMap-${version}-cli.jar";
-    hash = "sha256-k+tSIlgOj7o7aHPdJzXSW1zxx2pZ67TB3aJ4Fv7U0pM=";
+    hash = "sha256-NDnslNJ3B6Cjxr6qem9xRX71ddHP014cGynJZdiFDpE=";
   };
 
   dontUnpack = true;

From c3ec442f3291ad30ea8a5644febbf3ccef5430bf Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Wed, 22 Oct 2025 20:59:18 +0300
Subject: [PATCH 1693/6226] maintainers: drop rileyinman

---
 maintainers/maintainer-list.nix                       | 6 ------
 pkgs/applications/video/streamlink-twitch-gui/bin.nix | 2 +-
 pkgs/by-name/io/iosevka/package.nix                   | 1 -
 pkgs/by-name/no/noto-fonts-emoji-blob-bin/package.nix | 1 -
 pkgs/development/python-modules/pyctr/default.nix     | 2 +-
 5 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index dd06cef1f75a..d70a76a5b913 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -22013,12 +22013,6 @@
     githubId = 1810487;
     name = "Rika";
   };
-  rileyinman = {
-    email = "rileyminman@gmail.com";
-    github = "rileyinman";
-    githubId = 37246692;
-    name = "Riley Inman";
-  };
   rinx = {
     email = "rintaro.okamura@gmail.com";
     github = "rinx";
diff --git a/pkgs/applications/video/streamlink-twitch-gui/bin.nix b/pkgs/applications/video/streamlink-twitch-gui/bin.nix
index 57c7bdcc24fe..086f3be3a4a6 100644
--- a/pkgs/applications/video/streamlink-twitch-gui/bin.nix
+++ b/pkgs/applications/video/streamlink-twitch-gui/bin.nix
@@ -139,7 +139,7 @@ stdenv.mkDerivation rec {
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.mit;
     mainProgram = "streamlink-twitch-gui";
-    maintainers = with maintainers; [ rileyinman ];
+    maintainers = [ ];
     platforms = [
       "x86_64-linux"
       "i686-linux"
diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix
index f41c80aa8e9a..c6fc14bfd5ee 100644
--- a/pkgs/by-name/io/iosevka/package.nix
+++ b/pkgs/by-name/io/iosevka/package.nix
@@ -148,7 +148,6 @@ buildNpmPackage rec {
     platforms = platforms.all;
     maintainers = with maintainers; [
       ttuegel
-      rileyinman
       lunik1
     ];
   };
diff --git a/pkgs/by-name/no/noto-fonts-emoji-blob-bin/package.nix b/pkgs/by-name/no/noto-fonts-emoji-blob-bin/package.nix
index ffd2bd18c00e..336d76859782 100644
--- a/pkgs/by-name/no/noto-fonts-emoji-blob-bin/package.nix
+++ b/pkgs/by-name/no/noto-fonts-emoji-blob-bin/package.nix
@@ -30,7 +30,6 @@ stdenvNoCC.mkDerivation rec {
     ];
     platforms = lib.platforms.all;
     maintainers = with lib.maintainers; [
-      rileyinman
       jk
     ];
   };
diff --git a/pkgs/development/python-modules/pyctr/default.nix b/pkgs/development/python-modules/pyctr/default.nix
index a3280adc4726..e7450bb287b6 100644
--- a/pkgs/development/python-modules/pyctr/default.nix
+++ b/pkgs/development/python-modules/pyctr/default.nix
@@ -27,6 +27,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/ihaveamac/pyctr";
     changelog = "https://github.com/ihaveamac/pyctr/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ rileyinman ];
+    maintainers = [ ];
   };
 }

From 13f7bf35e786a6840e78b6725808ce030304be4d Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Tue, 21 Oct 2025 19:24:06 -0700
Subject: [PATCH 1694/6226] everest{,-bin}: 5806 -> 5935

---
 pkgs/by-name/ev/everest-bin/package.nix |   6 +-
 pkgs/by-name/ev/everest/deps.json       | 199 ++++--------------------
 pkgs/by-name/ev/everest/package.nix     |  24 ++-
 pkgs/by-name/ev/everest/update.sh       |   1 -
 4 files changed, 50 insertions(+), 180 deletions(-)

diff --git a/pkgs/by-name/ev/everest-bin/package.nix b/pkgs/by-name/ev/everest-bin/package.nix
index 80387bdfd538..2f0076b4dfd2 100644
--- a/pkgs/by-name/ev/everest-bin/package.nix
+++ b/pkgs/by-name/ev/everest-bin/package.nix
@@ -8,15 +8,15 @@
 
 let
   pname = "everest";
-  version = "5806";
+  version = "5935";
   phome = "$out/lib/Celeste";
 in
 stdenvNoCC.mkDerivation {
   inherit pname version;
   src = fetchzip {
-    url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.5806.0/main.zip";
+    url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.5935.0/main.zip";
     extension = "zip";
-    hash = "sha256-Hw/BNvWfhdO7bvYrY/Px12BRG1SYcCBeAXBH4QnKyeY=";
+    hash = "sha256-XYvXrfHSjSShAg3r2qikt1CPXldYvsU1EvRJNzJoGTU=";
   };
   buildInputs = [
     icu
diff --git a/pkgs/by-name/ev/everest/deps.json b/pkgs/by-name/ev/everest/deps.json
index 9fc14832db35..6a228fef7f00 100644
--- a/pkgs/by-name/ev/everest/deps.json
+++ b/pkgs/by-name/ev/everest/deps.json
@@ -1,4 +1,14 @@
 [
+  {
+    "pname": "DotNet.ReproducibleBuilds",
+    "version": "1.2.25",
+    "hash": "sha256-Vl9RPq9vCO4bjulPZiOr3gDVKlr9vnuKIIX3KWlRxvw="
+  },
+  {
+    "pname": "DotNet.ReproducibleBuilds.Isolated",
+    "version": "1.2.25",
+    "hash": "sha256-NpGbG9rnKKN6ejz1xqUa2AYx8mGSv+ZHbducFGhhrwA="
+  },
   {
     "pname": "DotNetZip",
     "version": "1.16.0",
@@ -24,16 +34,6 @@
     "version": "3.0.2",
     "hash": "sha256-iAX3oCX2092oKXEASUhMkh2A1kh1cBRSkkMJ6BmszRA="
   },
-  {
-    "pname": "Microsoft.AspNetCore.App.Ref",
-    "version": "3.0.1",
-    "hash": "sha256-y4VQ8teCZOnCJyg0rh3s1SbbqfoEclB5T6lCfMrxWUw="
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Ref",
-    "version": "3.1.10",
-    "hash": "sha256-51D1XkqFMPHJzOmt1HQ0Bf1n9K0auwEyxTJuqA/8xHY="
-  },
   {
     "pname": "Microsoft.AspNetCore.App.Ref",
     "version": "5.0.0",
@@ -49,21 +49,6 @@
     "version": "7.0.20",
     "hash": "sha256-OEDXXjQ1HDRPiA4Y1zPr1xUeH6wlzTCJpts+DZL61wI="
   },
-  {
-    "pname": "Microsoft.AspNetCore.App.Ref",
-    "version": "8.0.20",
-    "hash": "sha256-A6300qL9iP7iuY4wF9QkmOcuvoJFB0H64BAM5oGZF/4="
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
-    "version": "3.0.3",
-    "hash": "sha256-CbtnZSF+lvyeIfEUC8a0Jf4EMvYAxa9mvWF9lyLymMk="
-  },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
-    "version": "3.1.32",
-    "hash": "sha256-OV3Ie8JGTEwNI4Y6DJFh+ZUrBTwrSdFjEbfljfAwn3s="
-  },
   {
     "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
     "version": "5.0.17",
@@ -79,11 +64,6 @@
     "version": "7.0.20",
     "hash": "sha256-vq59xMfrET8InzUhkAsbs2xp3ML+SO9POsbwAiYKzkA="
   },
-  {
-    "pname": "Microsoft.AspNetCore.App.Runtime.linux-x64",
-    "version": "8.0.20",
-    "hash": "sha256-rToqTSs66gvIi2I69+0/qjhKAXk5/rRQUh0KetP3ZxE="
-  },
   {
     "pname": "Microsoft.Build.Tasks.Git",
     "version": "1.1.0",
@@ -129,26 +109,6 @@
     "version": "3.1.16",
     "hash": "sha256-42cFtaZFzM93I0gZjuDbcEYWM5Pld+kx2MkWu0J66ww="
   },
-  {
-    "pname": "Microsoft.NET.Sdk.IL",
-    "version": "8.0.0",
-    "hash": "sha256-guQcVwSaVwJ0uJvUYZqk1bZ9ATLBk3zWHZmTW7EV1KM="
-  },
-  {
-    "pname": "Microsoft.NETCore.App",
-    "version": "2.1.0",
-    "hash": "sha256-RJksv5W7LhWJYGmkwYHfiU0s9XLCvT05KxSMz6U1/OE="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.linux-x64",
-    "version": "3.0.3",
-    "hash": "sha256-hIdA8ncOXoDM6/ryKCTVz/vZrqFLffxAgpN/qfl2L6Y="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Host.linux-x64",
-    "version": "3.1.32",
-    "hash": "sha256-ajR6pZv0zuzWDyxEnWtAuhasV5biV5lvweEbefTISiM="
-  },
   {
     "pname": "Microsoft.NETCore.App.Host.linux-x64",
     "version": "5.0.17",
@@ -164,21 +124,6 @@
     "version": "7.0.20",
     "hash": "sha256-Y1Dg8Sqhya86xD+9aJOuznT4mJUyFmoF/YZc0+5LBdc="
   },
-  {
-    "pname": "Microsoft.NETCore.App.Host.linux-x64",
-    "version": "8.0.20",
-    "hash": "sha256-NlwDtSJmxP+9oIqWEMKU12o96g9TzQAEt//votxI2PU="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Ref",
-    "version": "3.0.0",
-    "hash": "sha256-PHovvd+mPN9HoCF0rFEnS015p7Yj76+e9cfSU4JAI+I="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Ref",
-    "version": "3.1.0",
-    "hash": "sha256-nuAvHwmJ2s3Ob1qNDH1+uV3awOZaWlaV3FenTmPUWyM="
-  },
   {
     "pname": "Microsoft.NETCore.App.Ref",
     "version": "5.0.0",
@@ -194,21 +139,6 @@
     "version": "7.0.20",
     "hash": "sha256-W9RU3bja4BQLAbsaIhANQPJJh6DycDiBR+WZ3mK6Zrs="
   },
-  {
-    "pname": "Microsoft.NETCore.App.Ref",
-    "version": "8.0.20",
-    "hash": "sha256-1YXXJaiMZOIbLduuWyFGSWt6hOxKa3URNsPDfiMrnDM="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
-    "version": "3.0.3",
-    "hash": "sha256-mxA9JF2WyEDV8yahdwhe4qfCTbIFroUfmMzPBa91b/o="
-  },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
-    "version": "3.1.32",
-    "hash": "sha256-h4HjfRnvH81dW84S3TCPcCfxeQLiLN7b1ZleRNsprFY="
-  },
   {
     "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
     "version": "5.0.17",
@@ -224,36 +154,11 @@
     "version": "7.0.20",
     "hash": "sha256-L+WaGvoXVMT3tZ7R5xFE06zaLcC3SI7LEf4ATBkUAGQ="
   },
-  {
-    "pname": "Microsoft.NETCore.App.Runtime.linux-x64",
-    "version": "8.0.20",
-    "hash": "sha256-BkV2ZjBpQvLhijWFSwWDpr5m2ffNlCtYJA5TUTro6no="
-  },
-  {
-    "pname": "Microsoft.NETCore.DotNetAppHost",
-    "version": "2.1.0",
-    "hash": "sha256-LV8pnNFsKGFONyCTGsd8qB5A+EUIiyvbYWAr0eOEFoI="
-  },
-  {
-    "pname": "Microsoft.NETCore.DotNetHostPolicy",
-    "version": "2.1.0",
-    "hash": "sha256-FqQm4BLznzRmF1nhk3nEwrdeAdCY35eBmHk6/4+MCPY="
-  },
-  {
-    "pname": "Microsoft.NETCore.DotNetHostResolver",
-    "version": "2.1.0",
-    "hash": "sha256-5nQTmMhaEvbuT+1f7u0t0tEK3SCVUeXhsExq8tiYBI0="
-  },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "1.1.0",
     "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
   },
-  {
-    "pname": "Microsoft.NETCore.Platforms",
-    "version": "2.1.0",
-    "hash": "sha256-v09ltBAKTX8iAKuU2nCl+Op/ilVJQ0POZUh2z+u0rVo="
-  },
   {
     "pname": "Microsoft.NETCore.Platforms",
     "version": "3.1.0",
@@ -269,11 +174,6 @@
     "version": "1.1.0",
     "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
   },
-  {
-    "pname": "Microsoft.NETCore.Targets",
-    "version": "2.1.0",
-    "hash": "sha256-+KdWdA9I392SRqMb9KaiiRZatfvJ9RcdbtyGUkpHW7U="
-  },
   {
     "pname": "Microsoft.NETFramework.ReferenceAssemblies",
     "version": "1.0.3",
@@ -331,33 +231,28 @@
   },
   {
     "pname": "Mono.Cecil",
-    "version": "0.11.5",
-    "hash": "sha256-nPFwbzW08gnCjadBdgi+16MHYhsPAXnFIliveLxGaNA="
+    "version": "0.11.6",
+    "hash": "sha256-0qI4MqqpSLqaAazEK1cm40xfmVlY8bMNRcDnxws6ctU="
   },
   {
     "pname": "MonoMod.Backports",
-    "version": "1.1.0",
-    "hash": "sha256-ruRX10/u+lRfMKr0UMbCVYS/nUK5fzV4+8ujJXBnles="
+    "version": "1.1.2",
+    "hash": "sha256-oXhcnMo0rDZDcpmhGVhQhax0lFeb9DT3GfSooesOo38="
   },
   {
     "pname": "MonoMod.Core",
-    "version": "1.0.0",
-    "hash": "sha256-Y55fgMd0d35qztqqC0drzn3NdSMYLiWie8IL9LbmFnc="
+    "version": "1.3.0",
+    "hash": "sha256-B/pb8hor4npd3YSkvEF8FEO7xbbcHIfLapTUcrd5qRY="
   },
   {
     "pname": "MonoMod.ILHelpers",
-    "version": "1.0.0",
-    "hash": "sha256-N6ybnOMkEtxXy/PdJAEkqHggHYSLETbCMF+mgNGXAvo="
-  },
-  {
-    "pname": "MonoMod.Patcher",
-    "version": "25.0.0-prerelease.1",
-    "hash": "sha256-+5kddzc3FheDIRNoTPWQREc1ufVFjfPFiiKrXTPCTWQ="
+    "version": "1.1.0",
+    "hash": "sha256-seoET5fqsyOY8g7DfNpLQHNTdUVY3U/xCoYFC4UrOKw="
   },
   {
     "pname": "MonoMod.RuntimeDetour",
-    "version": "25.0.0",
-    "hash": "sha256-yyP3kTN+OcOoO8xmHZfebKB/EtWNi7V6aJnXUTjVU/8="
+    "version": "25.3.0",
+    "hash": "sha256-ZDS2MYHwL+cGuGycqivqfS/i+Uglx203SGtFx3vCSOA="
   },
   {
     "pname": "MonoMod.RuntimeDetour.HookGen",
@@ -366,8 +261,8 @@
   },
   {
     "pname": "MonoMod.Utils",
-    "version": "25.0.0",
-    "hash": "sha256-PL7/F0zXnLRb5icD5zl/QCeMyTEsJZKOvSBvM1t8BEY="
+    "version": "25.0.8",
+    "hash": "sha256-k2Nh8btGmOhKCEmCnO7t5pQszrzH0Lok5mgwWBRXviE="
   },
   {
     "pname": "NETStandard.Library",
@@ -499,36 +394,6 @@
     "version": "4.3.0",
     "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
   },
-  {
-    "pname": "runtime.linux-x64.Microsoft.NETCore.App",
-    "version": "2.1.0",
-    "hash": "sha256-qFtPLe3t/V9DZTaYhAO6MbVsyzH4hcQQUvyIJ6ywbEw="
-  },
-  {
-    "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetAppHost",
-    "version": "2.1.0",
-    "hash": "sha256-NMuEFKc68Vn4bVoX6kdGSQeyDpktUYliUg6Lbj4E8FU="
-  },
-  {
-    "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy",
-    "version": "2.1.0",
-    "hash": "sha256-U/WlbUpImqPjZf075WgBOb1o1i1H3VOL4QbzHfQ9Itk="
-  },
-  {
-    "pname": "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver",
-    "version": "2.1.0",
-    "hash": "sha256-vcB6FY1GDP+kTsmp9OXpPg50sXKqOSJzWUSuNlN1+rs="
-  },
-  {
-    "pname": "runtime.linux-x64.Microsoft.NETCore.ILAsm",
-    "version": "6.0.0",
-    "hash": "sha256-i/UcSf9HhYBtscSZKsaPReL/ntN8EQhmEpFIkEfoGhQ="
-  },
-  {
-    "pname": "runtime.linux-x64.Microsoft.NETCore.ILDAsm",
-    "version": "6.0.0",
-    "hash": "sha256-flN7eEFoqIUmbuGHgVu/R1F7trwjOXwxmBVw/+Jv2Hg="
-  },
   {
     "pname": "runtime.native.System",
     "version": "4.3.0",
@@ -659,11 +524,6 @@
     "version": "4.3.0",
     "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
   },
-  {
-    "pname": "System.Collections.Immutable",
-    "version": "6.0.0",
-    "hash": "sha256-DKEbpFqXCIEfqp9p3ezqadn5b/S1YTk32/EQK+tEScs="
-  },
   {
     "pname": "System.Collections.Immutable",
     "version": "8.0.0",
@@ -774,11 +634,6 @@
     "version": "4.3.0",
     "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
   },
-  {
-    "pname": "System.Numerics.Vectors",
-    "version": "4.4.0",
-    "hash": "sha256-auXQK2flL/JpnB/rEcAcUm4vYMCYMEMiWOCAlIaqu2U="
-  },
   {
     "pname": "System.Numerics.Vectors",
     "version": "4.5.0",
@@ -864,11 +719,6 @@
     "version": "4.3.0",
     "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
   },
-  {
-    "pname": "System.Runtime.CompilerServices.Unsafe",
-    "version": "4.5.3",
-    "hash": "sha256-lnZMUqRO4RYRUeSO8HSJ9yBHqFHLVbmenwHWkIU20ak="
-  },
   {
     "pname": "System.Runtime.CompilerServices.Unsafe",
     "version": "6.0.0",
@@ -1029,6 +879,11 @@
     "version": "4.3.0",
     "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="
   },
+  {
+    "pname": "Vezel.Zig.Toolsets.linux-x64",
+    "version": "0.14.1.1",
+    "hash": "sha256-H32XG4157eWqa6qcVtd4t6Ef35MzYnXqr62FcwMAxSo="
+  },
   {
     "pname": "YamlDotNet",
     "version": "16.1.3",
diff --git a/pkgs/by-name/ev/everest/package.nix b/pkgs/by-name/ev/everest/package.nix
index f32b1ad20f42..a6f7bcf3f285 100644
--- a/pkgs/by-name/ev/everest/package.nix
+++ b/pkgs/by-name/ev/everest/package.nix
@@ -11,7 +11,7 @@
 
 let
   pname = "everest";
-  version = "5806";
+  version = "5935";
   phome = "$out/lib/Celeste";
 in
 buildDotnetModule {
@@ -20,11 +20,11 @@ buildDotnetModule {
   src = fetchFromGitHub {
     owner = "EverestAPI";
     repo = "Everest";
-    rev = "e47f67fc8c4b0b60b0a75112c5c90704ed371040";
+    rev = "6a6da718227b357f5b997499e454d5dc5c3e2788";
     fetchSubmodules = true;
     # TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink
     # Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty.
-    hash = "sha256-scizz5U9DQaeJsh0dg7Lllycd/D3Ezu8QNYPPZFGJhY=";
+    hash = "sha256-qSDcwqjJeb2pNbyriZ/9Gk72DyR5KdIoncXol7JZvFg=";
   };
 
   nativeBuildInputs = [ autoPatchelfHook ];
@@ -44,9 +44,25 @@ buildDotnetModule {
     autoPatchelf lib-ext/piton/piton-linux_x64
   '';
 
-  dotnet-sdk = dotnetCorePackages.sdk_9_0;
+  dotnet-sdk =
+    with dotnetCorePackages;
+    sdk_9_0
+    // {
+      inherit
+        (combinePackages [
+          sdk_9_0
+          sdk_8_0
+        ])
+        packages
+        targetPackages
+        ;
+    };
   nugetDeps = ./deps.json;
 
+  # Workaround from https://github.com/NixOS/nixpkgs/issues/454432
+  # Necessitated by https://github.com/MonoMod/MonoMod/pull/246
+  dotnetRestoreFlags = [ "--force-evaluate" ];
+
   # Needed for ILAsm projects: https://github.com/NixOS/nixpkgs/issues/370754#issuecomment-2571475814
   linkNugetPackages = true;
 
diff --git a/pkgs/by-name/ev/everest/update.sh b/pkgs/by-name/ev/everest/update.sh
index 569f64ffc08b..29f9c13e3ae0 100755
--- a/pkgs/by-name/ev/everest/update.sh
+++ b/pkgs/by-name/ev/everest/update.sh
@@ -19,6 +19,5 @@ version=$(echo "$latest" | jq -r .version)
 url=$(echo "$latest" | jq -r .mainDownload)
 
 update-source-version everest $version --rev=$commit
-echo > "$(dirname "$(nix-instantiate --eval --strict -A everest.meta.position | sed -re 's/^"(.*):[0-9]+"$/\1/')")/deps.json"
 "$(nix-build --attr everest.fetch-deps --no-out-link)"
 update-source-version everest-bin $version "" $url

From b2e235cfdf211f842241f01c1fd33cc9d73a0ef1 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Wed, 22 Oct 2025 19:08:13 +0100
Subject: [PATCH 1695/6226] =?UTF-8?q?prometheus:=203.7.1=20=E2=86=92=203.7?=
 =?UTF-8?q?.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/pr/prometheus/package.nix b/pkgs/by-name/pr/prometheus/package.nix
index d4967897caaf..05781511931e 100644
--- a/pkgs/by-name/pr/prometheus/package.nix
+++ b/pkgs/by-name/pr/prometheus/package.nix
@@ -33,7 +33,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "prometheus";
-  version = "3.7.1";
+  version = "3.7.2";
 
   outputs = [
     "out"
@@ -45,14 +45,14 @@ buildGoModule (finalAttrs: {
     owner = "prometheus";
     repo = "prometheus";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-m5dQoEn/989gmG5Q4A/oCY6JKvOLzpAU8kaPQOsajlA=";
+    hash = "sha256-bitRDX1oymFfzvQVYL31BON6UBfQYnqjZefQKc+yXx0=";
   };
 
   vendorHash = "sha256-V+qLxjqGOaT1veEwtklqcS7iO31ufvDHBA9DbZLzDiE=";
 
   webUiStatic = fetchurl {
     url = "https://github.com/prometheus/prometheus/releases/download/v${finalAttrs.version}/prometheus-web-ui-${finalAttrs.version}.tar.gz";
-    hash = "sha256-88PNQfVM9le+2mqMBq9tyyZ+1J+yloWWIE4VJHSCS1g=";
+    hash = "sha256-NFv6zNpMacd0RgVYBlWKbXKNCEh7WijpREg0bNojisM=";
   };
 
   excludedPackages = [

From 703b33ab933457f23b3435815ae8eeaed4b58125 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 18:12:46 +0000
Subject: [PATCH 1696/6226] guile-hoot: 0.6.1 -> 0.7.0

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

diff --git a/pkgs/by-name/gu/guile-hoot/package.nix b/pkgs/by-name/gu/guile-hoot/package.nix
index 395582e38218..9851d8a192b2 100644
--- a/pkgs/by-name/gu/guile-hoot/package.nix
+++ b/pkgs/by-name/gu/guile-hoot/package.nix
@@ -11,14 +11,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "guile-hoot";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "spritely";
     repo = "hoot";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Y3UWKSjJQnYh+06p+Oi0Fa0ul2T8QWemgNm9A0su5WQ=";
+    hash = "sha256-mthEqyVsBrFhwz29VwatbFp4QgGmZ9sDoyTpRIEsOmI=";
   };
 
   nativeBuildInputs = [

From e97f7fdcc5911b6826f7fa723dfab9d577a38790 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 18:27:28 +0000
Subject: [PATCH 1697/6226] libucontext: 1.3.2 -> 1.3.3

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

diff --git a/pkgs/by-name/li/libucontext/package.nix b/pkgs/by-name/li/libucontext/package.nix
index b7b56b4ff3f4..e4bfd406a04c 100644
--- a/pkgs/by-name/li/libucontext/package.nix
+++ b/pkgs/by-name/li/libucontext/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libucontext";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "kaniini";
     repo = "libucontext";
     rev = "libucontext-${version}";
-    hash = "sha256-aBmGt8O/HTWM9UJMKWz37uDLDkq1JEYTUb1SeGu9j9M=";
+    hash = "sha256-MQCRRyA64MEtPoUtf1tFVbhiMDc4DlepSjMEFcb/Kh4=";
   };
 
   nativeBuildInputs = [

From 79dae2290e98edc9480032ce059423f3da2083bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 18:32:00 +0000
Subject: [PATCH 1698/6226] gemini-cli: 0.9.0 -> 0.10.0

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

diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix
index 20d75f63e3e7..789b24efd95a 100644
--- a/pkgs/by-name/ge/gemini-cli/package.nix
+++ b/pkgs/by-name/ge/gemini-cli/package.nix
@@ -13,16 +13,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "gemini-cli";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitHub {
     owner = "google-gemini";
     repo = "gemini-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QvcC/QzotP1OhcOyZoNK5FkZwVKm4ZNfU5s3B9UKhc0=";
+    hash = "sha256-h6JyiIh0+PI/5JHlztMKlXlK5XQC8x6V7Yq1VyboaXs=";
   };
 
-  npmDepsHash = "sha256-0Tbwco+9Int7krl2bsphCMPtObJtJhYw8X3zyof30qA=";
+  npmDepsHash = "sha256-4RsZAs9+Q7vnRiyA1OMXC185d9Y9k6mwG+QkOE+5Pas=";
 
   nativeBuildInputs = [
     jq

From 41339ec247020274a66a945654ff86fec72db19a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 18:46:21 +0000
Subject: [PATCH 1699/6226] python3Packages.aioesphomeapi: 42.0.0 -> 42.2.0

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

diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index c23132d65d2e..edeaabdb4575 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "42.0.0";
+  version = "42.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "aioesphomeapi";
     tag = "v${version}";
-    hash = "sha256-THhWp5X5oFjFrUMN8Hr0Vs9ElwFro16DoNzvU2Kux/4=";
+    hash = "sha256-3ao0RM+NFzbsj0Ws+A19S+OGwinZI+syU8PFgqcIYMU=";
   };
 
   build-system = [

From e33798277b4cc15339a1488c81d0612d62f43fdf Mon Sep 17 00:00:00 2001
From: Lukas Wurzinger <lukas@wrz.one>
Date: Mon, 26 May 2025 21:09:01 +0200
Subject: [PATCH 1700/6226] nixos/rsync: init module

---
 .../manual/release-notes/rl-2511.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/misc/rsync.nix         | 203 ++++++++++++++++++
 nixos/tests/all-tests.nix                     |   1 +
 nixos/tests/rsync.nix                         |  64 ++++++
 5 files changed, 271 insertions(+)
 create mode 100644 nixos/modules/services/misc/rsync.nix
 create mode 100644 nixos/tests/rsync.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 8b3a14483687..e00b4317fa0b 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -30,6 +30,8 @@
 
 - [Overseerr](https://overseerr.dev), a request management and media discovery tool for the Plex ecosystem. Available as [services.overseerr](#opt-services.overseerr.enable).
 
+- [services.rsync](options.html#opt-services.rsync) has been added to simplify periodic directory syncing.
+
 - [gtklock](https://github.com/jovanlanik/gtklock), a GTK-based lockscreen for Wayland. Available as [programs.gtklock](#opt-programs.gtklock.enable).
 - [Chrysalis](https://github.com/keyboardio/Chrysalis), a graphical configurator for Kaleidoscope-powered keyboards. Available as [programs.chrysalis](#opt-programs.chrysalis.enable).
 
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2b98c1cc23e1..2b178220e065 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -924,6 +924,7 @@
   ./services/misc/rkvm.nix
   ./services/misc/rmfakecloud.nix
   ./services/misc/rshim.nix
+  ./services/misc/rsync.nix
   ./services/misc/safeeyes.nix
   ./services/misc/sdrplay.nix
   ./services/misc/servarr/lidarr.nix
diff --git a/nixos/modules/services/misc/rsync.nix b/nixos/modules/services/misc/rsync.nix
new file mode 100644
index 000000000000..0a262a076621
--- /dev/null
+++ b/nixos/modules/services/misc/rsync.nix
@@ -0,0 +1,203 @@
+{
+  config,
+  lib,
+  pkgs,
+  utils,
+  ...
+}:
+let
+  cfg = config.services.rsync;
+  inherit (lib) types;
+  inherit (utils.systemdUtils.unitOptions) unitOption;
+in
+{
+  options.services.rsync = {
+    enable = lib.mkEnableOption "periodic directory syncing via rsync";
+
+    package = lib.mkPackageOption pkgs "rsync" { };
+
+    jobs = lib.mkOption {
+      description = ''
+        Synchronization jobs to run.
+      '';
+      default = { };
+      type = types.attrsOf (
+        types.submodule {
+          options = {
+            sources = lib.mkOption {
+              type = types.nonEmptyListOf types.str;
+              example = [
+                "/srv/src1/"
+                "/srv/src2/"
+              ];
+              description = ''
+                Source directories.
+              '';
+            };
+
+            destination = lib.mkOption {
+              type = types.str;
+              example = "/srv/dst";
+              description = ''
+                Destination directory.
+              '';
+            };
+
+            settings = lib.mkOption {
+              type =
+                let
+                  simples = [
+                    types.bool
+                    types.str
+                    types.int
+                    types.float
+                  ];
+                in
+                types.attrsOf (
+                  types.oneOf (
+                    simples
+                    ++ [
+                      (types.listOf (types.oneOf simples))
+                    ]
+                  )
+                );
+              default = { };
+              example = {
+                verbose = true;
+                archive = true;
+                delete = true;
+                mkpath = true;
+              };
+              description = ''
+                Settings that should be passed to rsync via long options.
+                See {manpage}`rsync(1)` for available options.
+              '';
+            };
+
+            user = lib.mkOption {
+              type = types.str;
+              default = "root";
+              description = ''
+                The name of an existing user account under which the rsync process should run.
+              '';
+            };
+
+            group = lib.mkOption {
+              type = types.str;
+              default = "root";
+              description = ''
+                The name of an existing user group under which the rsync process should run.
+              '';
+            };
+
+            timerConfig = lib.mkOption {
+              type = types.nullOr (types.attrsOf unitOption);
+              default = {
+                OnCalendar = "daily";
+                Persistent = true;
+              };
+              description = ''
+                When to run the job.
+              '';
+            };
+
+            inhibit = lib.mkOption {
+              default = [ ];
+              type = types.listOf (types.strMatching "^[^:]+$");
+              example = [
+                "sleep"
+              ];
+              description = ''
+                Run the rsync process with an inhibition lock taken;
+                see {manpage}`systemd-inhibit(1)` for a list of possible operations.
+              '';
+            };
+          };
+        }
+      );
+    };
+  };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion = lib.all (job: job.sources != [ ]) (lib.attrValues cfg.jobs);
+        message = ''
+          At least one source directory must be provided to rsync.
+        '';
+      }
+    ];
+
+    systemd = lib.mkMerge (
+      lib.mapAttrsToList (
+        jobName: job:
+        let
+          systemdName = "rsync-job-${jobName}";
+          description = "Directory syncing via rsync job ${jobName}";
+        in
+        {
+          timers.${systemdName} = {
+            wantedBy = [
+              "timers.target"
+            ];
+            inherit description;
+            inherit (job) timerConfig;
+          };
+
+          services.${systemdName} = {
+            inherit description;
+
+            serviceConfig = {
+              Type = "oneshot";
+
+              ExecStart =
+                let
+                  settingsToCommandLine = lib.cli.toCommandLineGNU {
+                    isLong = _: true;
+                  };
+
+                  inhibitArgs = [
+                    (lib.getExe' config.systemd.package "systemd-inhibit")
+                    "--mode"
+                    "block"
+                    "--who"
+                    description
+                    "--what"
+                    (lib.concatStringsSep ":" job.inhibit)
+                    "--why"
+                    "Scheduled rsync job ${jobName}"
+                    "--"
+                  ];
+
+                  args =
+                    (lib.optionals (job.inhibit != [ ]) inhibitArgs)
+                    ++ [ (lib.getExe cfg.package) ]
+                    ++ (settingsToCommandLine job.settings)
+                    ++ [ "--" ]
+                    ++ job.sources
+                    ++ [ job.destination ];
+                in
+                utils.escapeSystemdExecArgs args;
+
+              User = job.user;
+              Group = job.group;
+
+              NoNewPrivileges = true;
+              PrivateDevices = true;
+              ProtectSystem = "full";
+              ProtectKernelTunables = true;
+              ProtectKernelModules = true;
+              ProtectControlGroups = true;
+              MemoryDenyWriteExecute = true;
+              LockPersonality = true;
+            };
+          };
+        }
+      ) cfg.jobs
+    );
+  };
+
+  meta.maintainers = [
+    lib.maintainers.lukaswrz
+  ];
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 3af4002a6aa2..b8def04f8295 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1322,6 +1322,7 @@ in
   rss-bridge = handleTest ./web-apps/rss-bridge { };
   rss2email = handleTest ./rss2email.nix { };
   rstudio-server = runTest ./rstudio-server.nix;
+  rsync = runTest ./rsync.nix;
   rsyncd = runTest ./rsyncd.nix;
   rsyslogd = handleTest ./rsyslogd.nix { };
   rtkit = runTest ./rtkit.nix;
diff --git a/nixos/tests/rsync.nix b/nixos/tests/rsync.nix
new file mode 100644
index 000000000000..2a570adf20de
--- /dev/null
+++ b/nixos/tests/rsync.nix
@@ -0,0 +1,64 @@
+{
+  name = "rsync";
+
+  nodes.machine = {
+    users.users.test.isNormalUser = true;
+
+    services.rsync = {
+      enable = true;
+      jobs = {
+        root = {
+          sources = [ "/root/src/" ];
+          destination = "/root/dst";
+          settings = {
+            archive = true;
+            delete = true;
+            mkpath = true;
+          };
+          timerConfig = {
+            OnCalendar = "daily";
+            Persistent = false;
+          };
+          inhibit = [ "sleep" ];
+        };
+        user = {
+          sources = [ "/home/test/src/" ];
+          destination = "/home/test/dst";
+          settings = {
+            archive = true;
+            delete = true;
+            mkpath = true;
+          };
+          timerConfig = {
+            OnCalendar = "daily";
+            Persistent = false;
+          };
+          user = "test";
+          group = "users";
+        };
+      };
+    };
+  };
+
+  testScript = ''
+    machine.start()
+
+    machine.wait_for_unit("multi-user.target")
+
+    machine.succeed("mkdir --parents /root/src")
+    machine.succeed("echo test data > /root/src/file.txt")
+    machine.start_job("rsync-job-root.service")
+    machine.succeed("""[[ 'test data' == "$(< /root/dst/file.txt)" ]]""")
+
+    machine.succeed("mkdir --parents /home/test/src")
+    machine.succeed("echo test data > /home/test/src/file.txt")
+    machine.start_job("rsync-job-user.service")
+    machine.succeed("""[[ 'test data' == "$(< /home/test/dst/file.txt)" ]]""")
+
+    machine.wait_for_unit("timers.target")
+    machine.require_unit_state("rsync-job-root.timer", "active")
+    machine.require_unit_state("rsync-job-user.timer", "active")
+
+    machine.shutdown()
+  '';
+}

From 867675ce78273450572e4104d845ebde76e0bde2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 18:58:10 +0000
Subject: [PATCH 1701/6226] flood: 4.10.0 -> 4.11.0

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

diff --git a/pkgs/by-name/fl/flood/package.nix b/pkgs/by-name/fl/flood/package.nix
index aac33e941f31..39f7f2c3a108 100644
--- a/pkgs/by-name/fl/flood/package.nix
+++ b/pkgs/by-name/fl/flood/package.nix
@@ -9,13 +9,13 @@
 
 buildNpmPackage rec {
   pname = "flood";
-  version = "4.10.0";
+  version = "4.11.0";
 
   src = fetchFromGitHub {
     owner = "jesec";
     repo = "flood";
     rev = "v${version}";
-    hash = "sha256-+mVfaCxSHGy4r3ULO2bnV5X2xG7LJT27Bce0y55i6DA=";
+    hash = "sha256-RBWDEFhLEZdC7luGFGx3qY0Hk7nM44RZgRyCWXFPh1k=";
   };
 
   npmConfigHook = pnpm_9.configHook;

From b942c9ad1a9f730d87250e60bbb36c5debef728c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 18:59:10 +0000
Subject: [PATCH 1702/6226] sesh: 2.18.1 -> 2.18.2

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

diff --git a/pkgs/by-name/se/sesh/package.nix b/pkgs/by-name/se/sesh/package.nix
index a4de0fa084eb..678189c7922f 100644
--- a/pkgs/by-name/se/sesh/package.nix
+++ b/pkgs/by-name/se/sesh/package.nix
@@ -7,7 +7,7 @@
 }:
 buildGoModule rec {
   pname = "sesh";
-  version = "2.18.1";
+  version = "2.18.2";
 
   nativeBuildInputs = [
     go-mockery
@@ -16,13 +16,13 @@ buildGoModule rec {
     owner = "joshmedeski";
     repo = "sesh";
     rev = "v${version}";
-    hash = "sha256-f63C2QFU5G/xoy6mLUSzgQv7VOJ4lv06OnGoyZy54rg=";
+    hash = "sha256-ZxO6hUE1/KzcZu0G9NaCgpqy1JfPdUxlAOkqm4bpfxE=";
   };
 
   preBuild = ''
     mockery
   '';
-  vendorHash = "sha256-TLl8HZnsVvtx6jqusTETP0l3zTmzYmuV4NJIM958VcQ=";
+  vendorHash = "sha256-GEWtbhZhgussFzfg1wNEU0Gr5zhXmwlsgH6d1cXOwvc=";
 
   ldflags = [
     "-s"

From aed57c1b0e0be6483f443eeab262869283c7688e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 19:04:59 +0000
Subject: [PATCH 1703/6226] rke: 1.8.7 -> 1.8.8

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

diff --git a/pkgs/by-name/rk/rke/package.nix b/pkgs/by-name/rk/rke/package.nix
index dee2796991c2..dfd6ee1ade98 100644
--- a/pkgs/by-name/rk/rke/package.nix
+++ b/pkgs/by-name/rk/rke/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "rke";
-  version = "1.8.7";
+  version = "1.8.8";
 
   src = fetchFromGitHub {
     owner = "rancher";
     repo = "rke";
     rev = "v${version}";
-    hash = "sha256-qborClm+QF1cVKSPEY+JYEylQ2I+XHkmCd3ez8fdfmk=";
+    hash = "sha256-xa9f82jbSjJEd0XR1iaqu3qA3O5G5vfj4RRhpT9c32Y=";
   };
 
   vendorHash = "sha256-OWC8OZhORHwntAR2YHd4KfQgB2Wtma6ayBWfY94uOA4=";

From 6d564102b72c8fd3cb7e4d2971be1fb1067e43bc Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 22 Oct 2025 21:06:53 +0200
Subject: [PATCH 1704/6226] ci/eval/compare/maintainers: fix maintainer pings
 without meta.position

In a recent change, the path matching was simplified in maintainers.nix.
This revealed a pre-existing logic bug: Packages without `meta.position`
would get an empty string as their file name. The change would then
cause this empty string to always be matched, which lead to maintainer
pings for these packages in seemingly random PRs, when some of their
dependencies were changed.
---
 ci/eval/compare/maintainers.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
index b3ebf6aee569..854c1f730bda 100644
--- a/ci/eval/compare/maintainers.nix
+++ b/ci/eval/compare/maintainers.nix
@@ -72,7 +72,8 @@ let
           (lib.unsafeGetAttrPos "src" drv)
           (lib.unsafeGetAttrPos "pname" drv)
           (lib.unsafeGetAttrPos "version" drv)
-
+        ]
+        ++ lib.optionals (drv.meta.position or null != null) [
           # Use ".meta.position" for cases when most of the package is
           # defined in a "common" section and the only place where
           # reference to the file with a derivation the "pos"
@@ -82,7 +83,7 @@ let
           #   "pkgs/tools/package-management/nix/default.nix:155"
           # We transform it to the following:
           #   { file = "pkgs/tools/package-management/nix/default.nix"; }
-          { file = lib.head (lib.splitString ":" (drv.meta.position or "")); }
+          { file = lib.head (lib.splitString ":" drv.meta.position); }
         ]
       )
     ));

From cce0f3f3006853f9182c893df2e3b04a262aece2 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Fri, 20 Dec 2024 00:30:50 +0800
Subject: [PATCH 1705/6226] buildPython*: bring back buildPython*.override

Fix `makeOverridablePythonPackage` in python-package-base.nix
and unshadow `buildPython*.override`.

This makes it possible to override the dependencies of buildPython*.
E.g., `buildPythonPackage.override { unzip = unzip-custom; }`
returns a derived version of `buildPythonPackage` with
the `unzip` package overridden with `unzip-custom`.
---
 .../interpreters/python/python-packages-base.nix           | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix
index 66a7c823fecc..ca4e4fd89741 100644
--- a/pkgs/development/interpreters/python/python-packages-base.nix
+++ b/pkgs/development/interpreters/python/python-packages-base.nix
@@ -38,7 +38,12 @@ let
         }
       else
         result
-    );
+    )
+    // lib.optionalAttrs (f ? override) {
+      # Support overriding `f` itself, e.g. `buildPythonPackage.override { }`.
+      # Ensure `makeOverridablePythonPackage` is applied to the result.
+      override = lib.mirrorFunctionArgs f.override (fdrv: makeOverridablePythonPackage (f.override fdrv));
+    };
 
   mkPythonDerivation =
     if python.isPy3k then ./mk-python-derivation.nix else ./python2/mk-python-derivation.nix;

From 872e7b2b26a0ffc33943ebafeb36047d048a481c Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Wed, 22 Oct 2025 21:14:05 +0200
Subject: [PATCH 1706/6226] harper: 0.68.0 -> 0.69.0

Changelog: https://github.com/Automattic/harper/releases/tag/v0.69.0
Diff: https://github.com/Automattic/harper/compare/v0.68.0...v0.69.0
---
 .../vscode/extensions/elijah-potter.harper/default.nix      | 2 +-
 pkgs/by-name/ha/harper/package.nix                          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix
index b080f2fa1ad2..29260baf3a36 100644
--- a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix
@@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     name = "harper";
     publisher = "elijah-potter";
     version = harper.version;
-    hash = "sha256-kWO3Gd2g5IsMCg+rvlQ3LpU/g5hUrpCsg3+vmOO0mnA=";
+    hash = "sha256-VvXErcIqM37huOvPhfGtY+1N4j4N1en1C5bRPjClqZk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index 4fd9bff2db9a..92ca11739862 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "harper";
-  version = "0.68.0";
+  version = "0.69.0";
 
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
     rev = "v${version}";
-    hash = "sha256-NYbTz/+APVGU8P0edXz84YBbBWBc8k7rhDXpRxH7Pjc=";
+    hash = "sha256-OLGIQ2ISZwuResmuxRhbFpBtSPs/73q6haEW5qeh6Qg=";
   };
 
   buildAndTestSubdir = "harper-ls";
 
-  cargoHash = "sha256-3Vk8nQPUxD1D6AG6PjJwju5xolvfVucfYL9i6l9atOk=";
+  cargoHash = "sha256-zSuitQ0URnWDPNuBc1bkVWddnYTjyU41uXe9oSYYsoU=";
 
   passthru.updateScript = nix-update-script { };
 

From 08b5cabfe4efc0c46485cc7dc000acfd9b607180 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 22 Oct 2025 21:22:35 +0200
Subject: [PATCH 1707/6226] hadoop: fix meta.position

This was broken because the `recursiveUpdate` in the `meta` block causes
Nix to lose track of `meta.description`'s position.
---
 pkgs/applications/networking/cluster/hadoop/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix
index dc3759d31ea4..b771864c5b65 100644
--- a/pkgs/applications/networking/cluster/hadoop/default.nix
+++ b/pkgs/applications/networking/cluster/hadoop/default.nix
@@ -144,6 +144,8 @@ let
 
       passthru = { inherit tests; };
 
+      # The recursiveUpdate below breaks default meta.position, so manually override it.
+      pos = __curPos;
       meta =
         with lib;
         recursiveUpdate {

From b8db29cc0ed671bb6ad36a340ffbf205d5e25c7b Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:28:53 -0300
Subject: [PATCH 1708/6226] cosmic-applets: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-applets/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-applets/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix
index eb3e8993e527..0a781a1d627e 100644
--- a/pkgs/by-name/co/cosmic-applets/package.nix
+++ b/pkgs/by-name/co/cosmic-applets/package.nix
@@ -20,17 +20,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-applets";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-applets";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-Vs6sNf6nbOqxlHq3NTFyRltiWVdPmumvuAq8nlWZEkc=";
+    hash = "sha256-KNlWOQjISvuZdaf6pXUVh6pyUm1sjmI77iAizEXdE8s=";
   };
 
-  cargoHash = "sha256-uTKHCrgy3URLvqO96CJ0jORZF9/KPDf59iEsdrK1tY4=";
+  cargoHash = "sha256-Apae3sJ27yVRl7Lf+SGsxM0zMlSFkdp6Q3BQoY5u3r4=";
 
   nativeBuildInputs = [
     just

From 4a6ca5ccda2d80ad1a0e86d5bdc489f35426a706 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:30:58 -0300
Subject: [PATCH 1709/6226] cosmic-applibrary: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-applibrary/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-applibrary/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix
index 72a3013a0e6e..bedc140cee5f 100644
--- a/pkgs/by-name/co/cosmic-applibrary/package.nix
+++ b/pkgs/by-name/co/cosmic-applibrary/package.nix
@@ -11,14 +11,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-applibrary";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-applibrary";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-Y0fohkNV9C78rGK+uoofQBDdK6Fb7XzmAdY1SorKFxA=";
+    hash = "sha256-YfcLcM67RICTSFhMCyAcx1RPwnpN107Kov6BM0jxGPM=";
   };
 
   cargoHash = "sha256-s2YiB4U/pVAul2YC5/6bCVwKd18odoTAua4YhUJDN3U=";

From 3138775c0132789a61a6f23e08260f0f9f168bcc Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:32:22 -0300
Subject: [PATCH 1710/6226] cosmic-bg: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-bg/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-bg/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix
index 05cf6292d191..4e2eb37ab414 100644
--- a/pkgs/by-name/co/cosmic-bg/package.nix
+++ b/pkgs/by-name/co/cosmic-bg/package.nix
@@ -13,7 +13,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-bg";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 5a26b6ea4f3e4d51b653828fe2b17bce6e78c740 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 22 Oct 2025 19:04:26 +0000
Subject: [PATCH 1711/6226] python3Packages.sentence-transformers: 5.1.1 ->
 5.1.2

Diff:
https://github.com/huggingface/sentence-transformers/compare/v5.1.1...v5.1.2

Changelog:
https://github.com/huggingface/sentence-transformers/releases/tag/v5.1.2
---
 .../sentence-transformers/default.nix         | 22 ++++++++++++++-----
 1 file changed, 17 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/sentence-transformers/default.nix b/pkgs/development/python-modules/sentence-transformers/default.nix
index 456a2f3f2c81..0e63b52faee1 100644
--- a/pkgs/development/python-modules/sentence-transformers/default.nix
+++ b/pkgs/development/python-modules/sentence-transformers/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "sentence-transformers";
-  version = "5.1.1";
+  version = "5.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "UKPLab";
+    owner = "huggingface";
     repo = "sentence-transformers";
     tag = "v${version}";
-    hash = "sha256-n0ZP01BU/s9iJ+RP7rNlBjD11jNDj8A8Q/seekh56nA=";
+    hash = "sha256-FNJ4mWBcgy3J8ZJtHt+uBgNmvMnqphj+sLMmBvgdB1k=";
   };
 
   build-system = [ setuptools ];
@@ -74,6 +74,11 @@ buildPythonPackage rec {
     "test_ParaphraseMiningEvaluator"
     "test_TripletEvaluator"
     "test_cmnrl_same_grad"
+    "test_default_weights_when_none"
+    "test_dense_load_and_save_in_other_precisions"
+    "test_dimension_exceeds_model_dimension_raises_error"
+    "test_dimensions_sorted_descending"
+    "test_empty_matryoshka_dims_raises_error"
     "test_forward"
     "test_initialization_with_embedding_dim"
     "test_initialization_with_embedding_weights"
@@ -81,7 +86,10 @@ buildPythonPackage rec {
     "test_mine_hard_negatives_with_prompt"
     "test_model_card_base"
     "test_model_card_reuse"
+    "test_model_dimension_not_in_dims_warns"
+    "test_mse_loss_matryoshka"
     "test_nanobeir_evaluator"
+    "test_negative_dimension_raises_error"
     "test_paraphrase_mining"
     "test_pretrained_model"
     "test_router_as_middle_module"
@@ -101,6 +109,10 @@ buildPythonPackage rec {
     "test_trainer"
     "test_trainer_invalid_column_names"
     "test_trainer_multi_dataset_errors"
+    "test_valid_initialization_no_warnings"
+    "test_valid_initialization_with_weights"
+    "test_weights_length_mismatch_raises_error"
+    "test_zero_dimension_raises_error"
 
     # Assertion error: Sparse operations take too long
     # (namely, load-sensitive test)
@@ -141,8 +153,8 @@ buildPythonPackage rec {
 
   meta = {
     description = "Multilingual Sentence & Image Embeddings with BERT";
-    homepage = "https://github.com/UKPLab/sentence-transformers";
-    changelog = "https://github.com/UKPLab/sentence-transformers/releases/tag/${src.tag}";
+    homepage = "https://github.com/huggingface/sentence-transformers";
+    changelog = "https://github.com/huggingface/sentence-transformers/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ dit7ya ];
   };

From 1bbc53f60fa04efc4689f90fabd5f9abb8ccaac7 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:34:08 -0300
Subject: [PATCH 1712/6226] cosmic-comp: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-comp/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-comp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix
index 705bd550c322..19d007598cfa 100644
--- a/pkgs/by-name/co/cosmic-comp/package.nix
+++ b/pkgs/by-name/co/cosmic-comp/package.nix
@@ -20,14 +20,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-comp";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-comp";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-VMM26rSO1ldM5WgoSJ5z89UgEK2GFNyDbqwdN53p8J8=";
+    hash = "sha256-wmXkbyczPFBw6264Om7/k8jnhPpa43Y18TL0qMn18mI=";
   };
 
   cargoHash = "sha256-hqw5nGKP0nw00qQoHyrcryVg2Kkdnx6yyJIERbh3DFE=";

From 170e96137a4b205dc9be2ce522ef673b848dc0e7 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:36:32 -0300
Subject: [PATCH 1713/6226] cosmic-edit: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-edit/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-edit/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix
index a81a49b959b1..f35827174cc0 100644
--- a/pkgs/by-name/co/cosmic-edit/package.nix
+++ b/pkgs/by-name/co/cosmic-edit/package.nix
@@ -16,17 +16,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-edit";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-edit";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-AIx7lZSWApdNMETVxTXmAeMcDlPFitG5lLlhAi+NUF0=";
+    hash = "sha256-hmPYdKU+QgksqD2CCutDfm6lVKoplTOhle2s9RVM5Gs=";
   };
 
-  cargoHash = "sha256-RwBrZ6cgr/7qmZZ+680otWQSWZyW04QE/102l+bKtpc=";
+  cargoHash = "sha256-s7vJqRzx2hg6SZ+uVOSoy+xHg6nEls6GbVfi8zT2QAw=";
 
   postPatch = ''
     substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"

From a86f58fb818e9db3400cf6d5b51b79ba5ca4c643 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:38:47 -0300
Subject: [PATCH 1714/6226] cosmic-files: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-files/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-files/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix
index 5ecdbe58e6ef..da6830fa032f 100644
--- a/pkgs/by-name/co/cosmic-files/package.nix
+++ b/pkgs/by-name/co/cosmic-files/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-files";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-files";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-D4oyuNSGMGRLRkPmKYIXUCTZh94QJuUYBbpiLA4szKk=";
+    hash = "sha256-F0h/OYRuKJw9/kQ1WWnD6AoiGLF+09IxARe45AAKV7c=";
   };
 
-  cargoHash = "sha256-GLO5d+NRaKIlc7K1CZ0YH9kp6Q0rVfh0sJRjMLqPTBY=";
+  cargoHash = "sha256-GnYEZgatMlTu0tK7zsiCNSAwSwnTmZhyqotYBIVCHuc=";
 
   nativeBuildInputs = [
     just

From c0e9f9f67bed36f0ecad1184f27d83c383bc0a60 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:40:55 -0300
Subject: [PATCH 1715/6226] cosmic-greeter: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-greeter/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-greeter/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix
index 271b99b99640..23d6a5d140f5 100644
--- a/pkgs/by-name/co/cosmic-greeter/package.nix
+++ b/pkgs/by-name/co/cosmic-greeter/package.nix
@@ -19,17 +19,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-greeter";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-greeter";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-Q4JrqyZbqdRk9nYk+u61CCHIucUOP4VjNALJRGaCfn4=";
+    hash = "sha256-MI0iqDnBtN3gkRo8u9eA3z89aU8XF1szxTG07zOtaFI=";
   };
 
-  cargoHash = "sha256-qioWGfg+cMaRNX6H6IWdcAU2py7oq9eNaxzKWw0H4R4=";
+  cargoHash = "sha256-4yRBgFrH4RBpuvChTED+ynx+PyFumoT2Z+R1gXxF4Xc=";
 
   env = {
     VERGEN_GIT_COMMIT_DATE = "2025-10-14";

From 16afffd79b5b829ba5f88a219eba94d7d5a9d55d Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:41:27 -0300
Subject: [PATCH 1716/6226] cosmic-icons: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-icons/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-icons/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix
index 579b417c2a56..68ca78cc3099 100644
--- a/pkgs/by-name/co/cosmic-icons/package.nix
+++ b/pkgs/by-name/co/cosmic-icons/package.nix
@@ -9,7 +9,7 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cosmic-icons";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 28d59c1459b36b58b5e83f4b06cd0662753ff7ed Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:42:29 -0300
Subject: [PATCH 1717/6226] cosmic-idle: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-idle/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-idle/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix
index ba6778cc2154..90d718213f79 100644
--- a/pkgs/by-name/co/cosmic-idle/package.nix
+++ b/pkgs/by-name/co/cosmic-idle/package.nix
@@ -16,7 +16,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-idle";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 303dc1366dfaa96284ac7edc4a932ccdbb8b34c0 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:44:26 -0300
Subject: [PATCH 1718/6226] cosmic-initial-setup: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-initial-setup/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-initial-setup/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-initial-setup/package.nix b/pkgs/by-name/co/cosmic-initial-setup/package.nix
index eb300279a439..252c3898567a 100644
--- a/pkgs/by-name/co/cosmic-initial-setup/package.nix
+++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix
@@ -14,7 +14,7 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-initial-setup";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   src = fetchFromGitHub {
     owner = "pop-os";

From 328a707386f152347f91af3237b64b45b93a40f2 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 22 Oct 2025 21:45:27 +0200
Subject: [PATCH 1719/6226] {audit,file,heart,metric,packet}beat7: fix
 meta.position

---
 pkgs/misc/logging/beats/7.x.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/logging/beats/7.x.nix b/pkgs/misc/logging/beats/7.x.nix
index 660349b1ac00..13c7ce8e3979 100644
--- a/pkgs/misc/logging/beats/7.x.nix
+++ b/pkgs/misc/logging/beats/7.x.nix
@@ -42,8 +42,12 @@ let
     );
 in
 rec {
-  auditbeat7 = beat "auditbeat" { meta.description = "Lightweight shipper for audit data"; };
+  auditbeat7 = beat "auditbeat" {
+    pos = __curPos;
+    meta.description = "Lightweight shipper for audit data";
+  };
   filebeat7 = beat "filebeat" {
+    pos = __curPos;
     meta.description = "Lightweight shipper for logfiles";
     buildInputs = [ systemd ];
     tags = [ "withjournald" ];
@@ -51,8 +55,12 @@ rec {
       patchelf --set-rpath ${lib.makeLibraryPath [ (lib.getLib systemd) ]} "$out/bin/filebeat"
     '';
   };
-  heartbeat7 = beat "heartbeat" { meta.description = "Lightweight shipper for uptime monitoring"; };
+  heartbeat7 = beat "heartbeat" {
+    pos = __curPos;
+    meta.description = "Lightweight shipper for uptime monitoring";
+  };
   metricbeat7 = beat "metricbeat" {
+    pos = __curPos;
     meta.description = "Lightweight shipper for metrics";
     passthru.tests = lib.optionalAttrs config.allowUnfree (
       assert metricbeat7.drvPath == nixosTests.elk.unfree.ELK-7.elkPackages.metricbeat.drvPath;
@@ -63,6 +71,7 @@ rec {
   };
   packetbeat7 = beat "packetbeat" {
     buildInputs = [ libpcap ];
+    pos = __curPos;
     meta.description = "Network packet analyzer that ships data to Elasticsearch";
     meta.longDescription = ''
       Packetbeat is an open source network packet analyzer that ships the

From 51387c35973ad7b1e893c472c0e845ba41092926 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 22 Oct 2025 21:45:41 +0200
Subject: [PATCH 1720/6226] openra_2019: fix meta.position

---
 pkgs/games/openra_2019/default.nix |  2 ++
 pkgs/games/openra_2019/engine.nix  |  1 +
 pkgs/games/openra_2019/engines.nix |  1 +
 pkgs/games/openra_2019/mod.nix     |  1 +
 pkgs/games/openra_2019/mods.nix    | 13 +++++++++++++
 5 files changed, 18 insertions(+)

diff --git a/pkgs/games/openra_2019/default.nix b/pkgs/games/openra_2019/default.nix
index e2e8c2eac202..375f7b7eef29 100644
--- a/pkgs/games/openra_2019/default.nix
+++ b/pkgs/games/openra_2019/default.nix
@@ -76,6 +76,7 @@ pkgs.recurseIntoAttrs rec {
       homepage,
       mods,
       src,
+      pos,
     }@engine:
     # Allow specifying the name at a later point if no name has been given.
     let
@@ -101,6 +102,7 @@ pkgs.recurseIntoAttrs rec {
       description,
       homepage,
       src,
+      pos,
       engine,
       assetsError ? "",
     }@mod:
diff --git a/pkgs/games/openra_2019/engine.nix b/pkgs/games/openra_2019/engine.nix
index ae207f24729c..ed6342ca0f92 100644
--- a/pkgs/games/openra_2019/engine.nix
+++ b/pkgs/games/openra_2019/engine.nix
@@ -61,6 +61,7 @@ stdenv.mkDerivation (
       )}
     '';
 
+    inherit (engine) pos;
     meta = {
       inherit (engine) description homepage;
     };
diff --git a/pkgs/games/openra_2019/engines.nix b/pkgs/games/openra_2019/engines.nix
index 3bbce300cfa5..b3eae5a67322 100644
--- a/pkgs/games/openra_2019/engines.nix
+++ b/pkgs/games/openra_2019/engines.nix
@@ -27,6 +27,7 @@ let
         repo = "OpenRA";
         inherit rev sha256 postFetch;
       };
+      pos = __curPos;
     } name).overrideAttrs
       (origAttrs: {
         postInstall = ''
diff --git a/pkgs/games/openra_2019/mod.nix b/pkgs/games/openra_2019/mod.nix
index 13152e7caa81..d174778608dd 100644
--- a/pkgs/games/openra_2019/mod.nix
+++ b/pkgs/games/openra_2019/mod.nix
@@ -110,6 +110,7 @@ stdenv.mkDerivation (
       runHook postInstall
     '';
 
+    inherit (mod) pos;
     meta = {
       inherit (mod) description homepage;
     };
diff --git a/pkgs/games/openra_2019/mods.nix b/pkgs/games/openra_2019/mods.nix
index a9f95d0f25c8..cd983b85b201 100644
--- a/pkgs/games/openra_2019/mods.nix
+++ b/pkgs/games/openra_2019/mods.nix
@@ -24,6 +24,7 @@ in
       rev = "fc3cf0baf2b827650eaae9e1d2335a3eed24bac9";
       sha256 = "15w91xs253gyrlzsgid6ixxjazx0fbzick6vlkiay0znb58n883m";
     };
+    pos = __curPos;
     engine = {
       version = "b8a7dd5";
       src = fetchFromGitHub {
@@ -48,6 +49,7 @@ in
       rev = "69a4aa708e2c26376469c0048fac13592aa452ca";
       sha256 = "1mfch4s6c05slyqvxllklbxpqq8dqcbx3515n3gyylyq43gq481r";
     };
+    pos = __curPos;
     engine = rec {
       version = "release-20181215";
       mods = [
@@ -81,6 +83,7 @@ in
       rev = "ffcd6ba72979e5f77508136ed7b0efc13e4b100e";
       sha256 = "07g4qw909649s3i1yhw75613mpwfka05jana5mpp5smhnf0pkack";
     };
+    pos = __curPos;
     engine = {
       version = "DarkReign";
       src = fetchFromGitHub {
@@ -105,6 +108,7 @@ in
       rev = "4f5e11d916e4a03d8cf1c97eef484ce2d77d7df2";
       sha256 = "1wnl4qrlhynnlahgdlxwhgsdba5wgdg9yrv9f8hkgi69j60szypd";
     };
+    pos = __curPos;
     engine = rec {
       version = "gen-20190128_3";
       src = fetchFromGitHub {
@@ -134,6 +138,7 @@ in
         rev = "5530babcb05170e0959e4cf2b079161e9fedde4f";
         sha256 = "07jczrarmgm6zdk0myzwgq200x19yvpjyxrnhdac08mjgyz75zk1";
       };
+      pos = __curPos;
       engine = {
         version = "4e8eab4ca00d1910203c8a103dfd2c002714daa8";
         src = fetchFromGitHub {
@@ -165,6 +170,7 @@ in
       rev = "c9be8f2a6f1dd710b1aedd9d5b00b4cf5020e2fe";
       sha256 = "09fp7k95jd6hjqdasbspbd43z5670wkyzbbgqkll9dfsrv0sky0v";
     };
+    pos = __curPos;
     engine = {
       version = "MedievalWarfareEngine";
       src = fetchFromGitHub {
@@ -189,6 +195,7 @@ in
       rev = "2f7c700d6d63c0625e7158ef3098221fa6741569";
       sha256 = "11vnzwczn47wjfrq6y7z9q234p27ihdrcl5p87i6h2xnrpwi8b6m";
     };
+    pos = __curPos;
     engine = rec {
       version = "release-20180923";
       src = fetchFromGitHub {
@@ -217,6 +224,7 @@ in
       rev = "c76c13e9f0912a66ddebae8d05573632b19736b2";
       sha256 = "1cnr3ccvrkjlv8kkdcglcfh133yy0fkva9agwgvc7wlj9n5ydl4g";
     };
+    pos = __curPos;
     engine = rec {
       version = "release-20190314";
       src = fetchFromGitHub {
@@ -241,6 +249,7 @@ in
       rev = "9230e6f1dd9758467832aee4eda115e18f0e635f";
       sha256 = "0bwbmmlhp1kh8rgk2nx1ca9vqssj849amndacf318d61gksc1w9n";
     };
+    pos = __curPos;
     engine = {
       version = "f3873ae";
       mods = [ "as" ];
@@ -270,6 +279,7 @@ in
       rev = "ac000cc15377cdf6d3c2b72c737d692aa0ed8bcd";
       sha256 = "16mzs5wcxj9nlpcyx2c87idsqpbm40lx0rznsccclnlb3hiwqas9";
     };
+    pos = __curPos;
     engine = {
       version = "SP-22-04-19";
       mods = [
@@ -298,6 +308,7 @@ in
       rev = "23e1f3e5d8b98c936797b6680d95d56a69a9e2ab";
       sha256 = "104clmxphchs7r8y7hpmw103bychayz80bqj98bp89i64nv9d89x";
     };
+    pos = __curPos;
     engine = {
       version = "6de92de";
       src = fetchFromGitHub {
@@ -322,6 +333,7 @@ in
       rev = "128dc53741fae923f4af556f2293ceaa0cf571f0";
       sha256 = "1mhr8kyh313z52gdrqv31d6z7jvdldiajalca5mcr8gzg6mph66p";
     };
+    pos = __curPos;
     engine = rec {
       version = "unplugged-cd82382";
       src = fetchFromGitHub {
@@ -346,6 +358,7 @@ in
       rev = "5b8b952dbe21f194a6d00485f20e215ce8362712";
       sha256 = "0hxzrqnz5d7qj1jjr20imiyih62x1cnmndf75nnil4c4sj82f9a6";
     };
+    pos = __curPos;
     engine = rec {
       version = "release-20190314";
       src = fetchFromGitHub {

From 9c8471e4438beb69cac580eeb57a10dcda677303 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:45:52 -0300
Subject: [PATCH 1721/6226] cosmic-launcher: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-launcher/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-launcher/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix
index d44e097bdf89..9742a153e18a 100644
--- a/pkgs/by-name/co/cosmic-launcher/package.nix
+++ b/pkgs/by-name/co/cosmic-launcher/package.nix
@@ -11,14 +11,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-launcher";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-launcher";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-V4FShr8kTf3lsYpPoU3hfeLgR4iQXmo+BxNOBko8pN0=";
+    hash = "sha256-QqJ59e0UxnNjbsIjsoeZaUhc1WfVpQtorzDVewJNpIo=";
   };
 
   cargoHash = "sha256-bW6XtdK+AZiuwfzBUWmUi00RJXeuzgzGKoL35lyDBfM=";

From 3cb0fadb13728d54e64470bcb38da25d76151d4e Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:47:32 -0300
Subject: [PATCH 1722/6226] cosmic-notifications: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-notifications/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-notifications/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix
index e25b2fb5a2e1..140ce59e4f5c 100644
--- a/pkgs/by-name/co/cosmic-notifications/package.nix
+++ b/pkgs/by-name/co/cosmic-notifications/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-notifications";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-notifications";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-HMs08kAS+dC8GsznmQveZczwYtlSKxS4MU3BEKLgxjY=";
+    hash = "sha256-cr8nG9Mj2CZNj+SgOYFScPVAvj71z3jTxCfbQoTJjqs=";
   };
 
-  cargoHash = "sha256-CL8xvj57yq0qzK3tyYh3YXh+fM4ZDsmL8nP1mcqTqeQ=";
+  cargoHash = "sha256-kLvfZBHJbVSceqKuB9XFshTH4Sl54hKfm8H90RUszKk=";
 
   nativeBuildInputs = [
     just

From f9652e33a7b75df1ec401fe16603ef1887ee4778 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:49:18 -0300
Subject: [PATCH 1723/6226] cosmic-osd: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-osd/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-osd/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix
index 32ae263c5019..12e1bc5eef1f 100644
--- a/pkgs/by-name/co/cosmic-osd/package.nix
+++ b/pkgs/by-name/co/cosmic-osd/package.nix
@@ -13,7 +13,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-osd";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From b9bab6c5acdc5c574b28aa801d88e0b3c5ad90f4 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:51:03 -0300
Subject: [PATCH 1724/6226] cosmic-panel: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-panel/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-panel/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix
index 3c8e1265058f..b7945a2053bf 100644
--- a/pkgs/by-name/co/cosmic-panel/package.nix
+++ b/pkgs/by-name/co/cosmic-panel/package.nix
@@ -11,7 +11,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-panel";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 85b850f908336e0a02e1aac75380ae65d81587e1 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:52:47 -0300
Subject: [PATCH 1725/6226] cosmic-player: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-player/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-player/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix
index fc42c3570653..7992e56ecb98 100644
--- a/pkgs/by-name/co/cosmic-player/package.nix
+++ b/pkgs/by-name/co/cosmic-player/package.nix
@@ -18,14 +18,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-player";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-player";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-jf9KSgA94SL6JX7Nh1BQiumOYBJjjt5O5DRCjeBHovo=";
+    hash = "sha256-e2BBXfPUl9L/cyPAEwkoS0Z3JrW5/K7cpreP5jcW/c4=";
   };
 
   cargoHash = "sha256-fnX5BkzRAetKxHZ9XyWdmG6TSxFqGJsmg16zlpYG9Ag=";

From 36d8ad15a4df2db8b9b6a10607c86aa11c25ef9e Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:55:04 -0300
Subject: [PATCH 1726/6226] cosmic-randr: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-randr/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-randr/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix
index 90791bfb918f..1ba28e028605 100644
--- a/pkgs/by-name/co/cosmic-randr/package.nix
+++ b/pkgs/by-name/co/cosmic-randr/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-randr";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 1b6aca73874e6c215166ba79d40ce4ec1b53f5dc Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:55:53 -0300
Subject: [PATCH 1727/6226] cosmic-screenshot: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-screenshot/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-screenshot/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix
index b04fe70ea437..236afa6d1016 100644
--- a/pkgs/by-name/co/cosmic-screenshot/package.nix
+++ b/pkgs/by-name/co/cosmic-screenshot/package.nix
@@ -10,7 +10,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-screenshot";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From dee19925a190dbcf230220b2c4eaf2f7c4c838fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 20:01:21 +0000
Subject: [PATCH 1728/6226] glsl_analyzer: 1.7.0 -> 1.7.1

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

diff --git a/pkgs/by-name/gl/glsl_analyzer/package.nix b/pkgs/by-name/gl/glsl_analyzer/package.nix
index c6b041aac7d2..0b53a622d192 100644
--- a/pkgs/by-name/gl/glsl_analyzer/package.nix
+++ b/pkgs/by-name/gl/glsl_analyzer/package.nix
@@ -9,13 +9,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "glsl_analyzer";
-  version = "1.7.0";
+  version = "1.7.1";
 
   src = fetchFromGitHub {
     owner = "nolanderc";
     repo = "glsl_analyzer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sNvhqnuWEG9Www6dBlxNVHd9b5uXgmDEwApgfkh1gzE=";
+    hash = "sha256-429S4iTkXQ64Fd153Xr7Z7eKbqKe0gI9yAvMPNV2/dE=";
   };
 
   nativeBuildInputs = [

From d9c2793e85b5bf578320e7cc54d25833407b1348 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 16:56:38 -0300
Subject: [PATCH 1729/6226] cosmic-session: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-session/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-session/package.nix | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix
index 71a7f7bae081..19d2aaaf1b65 100644
--- a/pkgs/by-name/co/cosmic-session/package.nix
+++ b/pkgs/by-name/co/cosmic-session/package.nix
@@ -6,20 +6,19 @@
   just,
   dbus,
   stdenv,
-  xdg-desktop-portal-cosmic,
   nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-session";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-session";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-P3xXYd80P+DR1vVE0zZC+v4ARsGhRrG9N9LdP2BEfDA=";
+    hash = "sha256-vt6Tjo2N8eh4Js0mdXSdHjke/W+chl6YH5W7Xl1BUdo=";
   };
 
   cargoHash = "sha256-bo46A7hS1U0cOsa/T4oMTKUTjxVCaGuFdN2qCjVHxhg=";
@@ -49,10 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "target/${stdenv.hostPlatform.rust.cargoShortTarget}"
   ];
 
-  env = {
-    XDP_COSMIC = "${xdg-desktop-portal-cosmic}/libexec/xdg-desktop-portal-cosmic";
-    ORCA = "orca"; # get orca from $PATH
-  };
+  env.ORCA = "orca"; # get orca from $PATH
 
   passthru = {
     providedSessions = [ "cosmic" ];

From 0dba84cf5bb66a1933b306fe1e505acf483e8eb6 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 17:07:05 -0300
Subject: [PATCH 1730/6226] cosmic-settings-daemon: 1.0.0-beta.2 ->
 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-settings-daemon/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-settings-daemon/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
index 13dfde98f513..b5f86d8f21e9 100644
--- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix
+++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
@@ -15,7 +15,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings-daemon";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 47004b160d6fe3016ba51b2f8de7901357029922 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 17:08:56 -0300
Subject: [PATCH 1731/6226] cosmic-settings: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-settings/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-settings/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix
index 9efa293f3f58..f256e7066a89 100644
--- a/pkgs/by-name/co/cosmic-settings/package.nix
+++ b/pkgs/by-name/co/cosmic-settings/package.nix
@@ -27,14 +27,14 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-ziA9dy3wZHhpgBNgjC/Uq8M7R5B62k3PGzFiC+rrPpI=";
+    hash = "sha256-vCNiMNHRzdntys8XHwOS8g72EXncGJVH6U7b6AW4BUQ=";
   };
 
   cargoHash = "sha256-mMfKY+ouszbN2rEf6zvv1Sc1FEZ/ZVuQ6RXGMBFDwIE=";

From e0ba8aa4123f5bf062a7308c07be5c8cdc9f9795 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Wed, 22 Oct 2025 22:10:29 +0200
Subject: [PATCH 1732/6226] yt-dlp: 2025.10.14 -> 2025.10.22

Changelog: https://github.com/yt-dlp/yt-dlp/releases/tag/2025.10.22
Diff: https://github.com/yt-dlp/yt-dlp/compare/2025.10.14...2025.10.22
---
 pkgs/by-name/yt/yt-dlp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/yt/yt-dlp/package.nix b/pkgs/by-name/yt/yt-dlp/package.nix
index ae0b2733f6b9..a54f623a3b51 100644
--- a/pkgs/by-name/yt/yt-dlp/package.nix
+++ b/pkgs/by-name/yt/yt-dlp/package.nix
@@ -19,14 +19,14 @@ python3Packages.buildPythonApplication rec {
   # The websites yt-dlp deals with are a very moving target. That means that
   # downloads break constantly. Because of that, updates should always be backported
   # to the latest stable release.
-  version = "2025.10.14";
+  version = "2025.10.22";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "yt-dlp";
     repo = "yt-dlp";
     tag = version;
-    hash = "sha256-x7vpuXUihlC4jONwjmWnPECFZ7xiVAOFSDUgBNvl+aA=";
+    hash = "sha256-jQaENEflaF9HzY/EiMXIHgUehAJ3nnDT9IbaN6bDcac=";
   };
 
   postPatch = ''

From 51e63842f384a29644907559e6b006f865f59a44 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 17:11:07 -0300
Subject: [PATCH 1733/6226] cosmic-store: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-store/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-store/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix
index ddfcfa9d06da..d13d0abd7ef3 100644
--- a/pkgs/by-name/co/cosmic-store/package.nix
+++ b/pkgs/by-name/co/cosmic-store/package.nix
@@ -15,17 +15,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-store";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-store";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-t27WA/q+RFyjGpmpgJCGmen67h4NMAkyHbObpaJiSz4=";
+    hash = "sha256-G335fS65CApkuUsqRcDgT2ZEBWfiPQ1R84tLZ62Cyig=";
   };
 
-  cargoHash = "sha256-7FvelbsXa3ya6EY2irfCxwjAr9o3VWJ9/vJutFTjYpQ=";
+  cargoHash = "sha256-nJLowAuWvj5JfmPyExQyfCJ9pqNJ0OdzPPku9z7RDWc=";
 
   nativeBuildInputs = [
     just

From 9ea88ca354f8c162b22cf7baf6f714d708eca585 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Wed, 22 Oct 2025 21:11:19 +0100
Subject: [PATCH 1734/6226] ci/eval/compare/maintainers: simplify
 `meta.position` predicate

---
 ci/eval/compare/maintainers.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
index 854c1f730bda..9f19a4c382eb 100644
--- a/ci/eval/compare/maintainers.nix
+++ b/ci/eval/compare/maintainers.nix
@@ -73,7 +73,7 @@ let
           (lib.unsafeGetAttrPos "pname" drv)
           (lib.unsafeGetAttrPos "version" drv)
         ]
-        ++ lib.optionals (drv.meta.position or null != null) [
+        ++ lib.optionals (drv ? meta.position) [
           # Use ".meta.position" for cases when most of the package is
           # defined in a "common" section and the only place where
           # reference to the file with a derivation the "pos"

From d996bed4f30abd42e8abaa37e738caa1c29f07bc Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 17:13:27 -0300
Subject: [PATCH 1735/6226] cosmic-term: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-term/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-term/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix
index c3571b9cdd93..024f933d9671 100644
--- a/pkgs/by-name/co/cosmic-term/package.nix
+++ b/pkgs/by-name/co/cosmic-term/package.nix
@@ -15,14 +15,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-term";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-term";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-Gf5C135I3MBxyYBvgbOcY4USa75BeD7sPhFjq5BIM1s=";
+    hash = "sha256-BdWyKRoBZybRrtyBfJlRJxVPIIJWY3F8Ei8UgMfVPJo=";
   };
 
   cargoHash = "sha256-qXAgmVsjhr3aqEQRGjsK2JM8YwpkRK5Y+XYJRSZ8Swc=";

From e64f45158b161744c138f2c497c0ac83acf9be3d Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 3 Oct 2025 09:43:14 -0700
Subject: [PATCH 1736/6226] xgboost: properly condition ncclSupport

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/by-name/xg/xgboost/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/xg/xgboost/package.nix b/pkgs/by-name/xg/xgboost/package.nix
index fe0e48d2f95c..dade3dfebf3d 100644
--- a/pkgs/by-name/xg/xgboost/package.nix
+++ b/pkgs/by-name/xg/xgboost/package.nix
@@ -16,7 +16,7 @@
   rPackages,
 }@inputs:
 
-assert ncclSupport -> (cudaSupport && !cudaPackages.nccl.meta.unsupported);
+assert ncclSupport -> (cudaSupport && cudaPackages.nccl.meta.available);
 # Disable regular tests when building the R package
 # because 1) the R package runs its own tests and
 # 2) the R package creates a different binary shared

From d70f62973b03bd7eaa168d7dc0b4988a5ca4eac0 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 28 Aug 2025 23:17:39 +0000
Subject: [PATCH 1737/6226] onnxruntime: properly condition ncclSupport

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/by-name/on/onnxruntime/package.nix               | 11 +++--------
 .../python-modules/onnxruntime/default.nix            |  2 ++
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix
index dcbea042fe7d..05ecb2453419 100644
--- a/pkgs/by-name/on/onnxruntime/package.nix
+++ b/pkgs/by-name/on/onnxruntime/package.nix
@@ -23,7 +23,7 @@
   darwinMinVersionHook,
   pythonSupport ? true,
   cudaSupport ? config.cudaSupport,
-  ncclSupport ? config.cudaSupport,
+  ncclSupport ? cudaSupport && cudaPackages.nccl.meta.available,
   withFullProtobuf ? false,
   cudaPackages ? { },
 }@inputs:
@@ -154,12 +154,7 @@ effectiveStdenv.mkDerivation rec {
       cudnn # cudnn.h
       cuda_cudart
     ]
-    ++ lib.optionals (cudaSupport && ncclSupport) (
-      with cudaPackages;
-      [
-        nccl
-      ]
-    )
+    ++ lib.optionals ncclSupport [ nccl ]
   )
   ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [
     (darwinMinVersionHook "13.3")
@@ -270,7 +265,7 @@ effectiveStdenv.mkDerivation rec {
   '';
 
   passthru = {
-    inherit cudaSupport cudaPackages; # for the python module
+    inherit cudaSupport cudaPackages ncclSupport; # for the python module
     inherit protobuf;
     tests = lib.optionalAttrs pythonSupport {
       python = python3Packages.onnxruntime;
diff --git a/pkgs/development/python-modules/onnxruntime/default.nix b/pkgs/development/python-modules/onnxruntime/default.nix
index dbd2db24232b..4d2ed826d456 100644
--- a/pkgs/development/python-modules/onnxruntime/default.nix
+++ b/pkgs/development/python-modules/onnxruntime/default.nix
@@ -68,6 +68,8 @@ buildPythonPackage {
       libcufft # libcufft.so.XX
       cudnn # libcudnn.soXX
       cuda_cudart # libcudart.so.XX
+    ]
+    ++ lib.optionals onnxruntime.passthru.ncclSupport [
       nccl # libnccl.so.XX
     ]
   );

From 494a8d96a84eab7f3e1a249b2455c6d5a123d158 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 29 Aug 2025 10:43:56 +0000
Subject: [PATCH 1738/6226] python3Packages.torch: fix condition and usage of
 static NCCL

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/python-modules/torch/source/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index 61caaf420b57..436ff8ac3b1a 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -24,7 +24,7 @@
   magma-hip,
   magma-cuda-static,
   # Use the system NCCL as long as we're targeting CUDA on a supported platform.
-  useSystemNccl ? (cudaSupport && !cudaPackages.nccl.meta.unsupported || rocmSupport),
+  useSystemNccl ? (cudaSupport && cudaPackages.nccl.meta.available || rocmSupport),
   MPISupport ? false,
   mpi,
   buildDocs ? false,
@@ -580,7 +580,8 @@ buildPythonPackage rec {
     ++ lists.optionals (cudaPackages ? cudnn) [ cudnn ]
     ++ lists.optionals useSystemNccl [
       # Some platforms do not support NCCL (i.e., Jetson)
-      nccl # Provides nccl.h AND a static copy of NCCL!
+      (lib.getDev nccl) # Provides nccl.h
+      (lib.getOutput "static" nccl) # Provides static library
     ]
     ++ [
       cuda_profiler_api # <cuda_profiler_api.h>

From f5deefd4631e6062a2b84c62f1eb6d0c1a8e4ccf Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@Gmail.com>
Date: Sun, 31 Aug 2025 16:39:33 +0100
Subject: [PATCH 1739/6226] config: add and document
 {allow,block}listedLicenses

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/stdenv/generic/check-meta.nix |  4 ++--
 pkgs/top-level/config.nix          | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 1a3e65ea650d..c59e92e114ea 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -64,8 +64,8 @@ let
     in
     if envVar != "" then envVar != "0" else config.allowNonSource or true;
 
-  allowlist = config.allowlistedLicenses or config.whitelistedLicenses or [ ];
-  blocklist = config.blocklistedLicenses or config.blacklistedLicenses or [ ];
+  allowlist = config.allowlistedLicenses;
+  blocklist = config.blocklistedLicenses;
 
   areLicenseListsValid =
     if mutuallyExclusive allowlist blocklist then
diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix
index 09d31a2d117c..bf9419571158 100644
--- a/pkgs/top-level/config.nix
+++ b/pkgs/top-level/config.nix
@@ -229,6 +229,36 @@ let
       '';
     };
 
+    allowlistedLicenses = mkOption {
+      description = ''
+        Allow licenses that are specifically acceptable. `allowlistedLicenses` only applies to unfree licenses unless
+        `allowUnfree` is enabled. It is not a generic allowlist for all types of licenses.
+      '';
+      default = [ ];
+      type = types.listOf (types.attrsOf types.anything);
+      example = literalExpression ''
+        with lib.licenses; [
+          amd
+          wtfpl
+        ]
+      '';
+    };
+
+    blocklistedLicenses = mkOption {
+      description = ''
+        Block licenses that are specifically unacceptable. Unlike `allowlistedLicenses`, `blocklistedLicenses`
+        applies to all licenses.
+      '';
+      default = [ ];
+      type = types.listOf (types.attrsOf types.anything);
+      example = literalExpression ''
+        with lib.licenses; [
+          agpl3Only
+          gpl3Only
+        ]
+      '';
+    };
+
     cudaSupport = mkMassRebuild {
       feature = "build packages with CUDA support by default";
     };

From db1b553ef953c347cb71cfc26742aebfd116f627 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@Gmail.com>
Date: Sun, 31 Aug 2025 16:44:25 +0100
Subject: [PATCH 1740/6226] blender: OptiX is under
 lib.licenses.nvidiaCudaRedist

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/by-name/bl/blender/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index dc4f903ade7f..25d6eb947682 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -434,9 +434,7 @@ stdenv'.mkDerivation (finalAttrs: {
     # They comment two licenses: GPLv2 and Blender License, but they
     # say: "We've decided to cancel the BL offering for an indefinite period."
     # OptiX, enabled with cudaSupport, is non-free.
-    license =
-      with lib.licenses;
-      [ gpl2Plus ] ++ lib.optional cudaSupport (unfree // { shortName = "NVidia OptiX EULA"; });
+    license = with lib.licenses; [ gpl2Plus ] ++ lib.optional cudaSupport nvidiaCudaRedist;
 
     platforms = [
       "aarch64-linux"

From 2e0c9f61315c03889e8222f96bcb05a686d988cd Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 14:07:00 +0000
Subject: [PATCH 1741/6226] slurm: fixup usage of NVML

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/by-name/sl/slurm/package.nix | 6 +++---
 pkgs/top-level/all-packages.nix   | 4 ----
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/sl/slurm/package.nix b/pkgs/by-name/sl/slurm/package.nix
index 1ed22d4730d0..596916865a11 100644
--- a/pkgs/by-name/sl/slurm/package.nix
+++ b/pkgs/by-name/sl/slurm/package.nix
@@ -34,7 +34,7 @@
   # enable internal X11 support via libssh2
   enableX11 ? true,
   enableNVML ? config.cudaSupport,
-  nvml,
+  cudaPackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -110,8 +110,8 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals enableNVML [
     (runCommand "collect-nvml" { } ''
       mkdir $out
-      ln -s ${lib.getDev nvml}/include $out/include
-      ln -s ${lib.getLib nvml}/lib/stubs $out/lib
+      ln -s ${lib.getOutput "include" cudaPackages.cuda_nvml_dev}/include $out/include
+      ln -s ${lib.getOutput "stubs" cudaPackages.cuda_nvml_dev}/lib/stubs $out/lib
     '')
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9b11818e8562..cfe063b4fb6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6852,10 +6852,6 @@ with pkgs;
 
   sloc = nodePackages.sloc;
 
-  slurm = callPackage ../by-name/sl/slurm/package.nix {
-    nvml = cudaPackages.cuda_nvml_dev;
-  };
-
   speedtest-cli = with python3Packages; toPythonApplication speedtest-cli;
 
   splint = callPackage ../development/tools/analysis/splint {

From c331103437d18a403886cc7b563c312b170b9ee6 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Sun, 7 Sep 2025 09:25:19 +0000
Subject: [PATCH 1742/6226] openmpi: fix CUDA paths in configureFlags

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/by-name/op/openmpi/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openmpi/package.nix b/pkgs/by-name/op/openmpi/package.nix
index 2984c4c035d9..a437632e8d7a 100644
--- a/pkgs/by-name/op/openmpi/package.nix
+++ b/pkgs/by-name/op/openmpi/package.nix
@@ -123,8 +123,9 @@ stdenv.mkDerivation (finalAttrs: {
     # TODO: add UCX support, which is recommended to use with cuda for the most robust OpenMPI build
     # https://github.com/openucx/ucx
     # https://www.open-mpi.org/faq/?category=buildcuda
-    (lib.withFeatureAs cudaSupport "cuda" (lib.getDev cudaPackages.cuda_cudart))
-    (lib.withFeatureAs cudaSupport "cuda-libdir" "${cudaPackages.cuda_cudart.stubs}/lib")
+    # NOTE: Open MPI requires the header files specifically, which are in the `include` output.
+    (lib.withFeatureAs cudaSupport "cuda" (lib.getOutput "include" cudaPackages.cuda_cudart))
+    (lib.withFeatureAs cudaSupport "cuda-libdir" "${lib.getLib cudaPackages.cuda_cudart}/lib")
     (lib.enableFeature cudaSupport "dlopen")
     (lib.withFeatureAs fabricSupport "psm2" (lib.getDev libpsm2))
     (lib.withFeatureAs fabricSupport "ofi" (lib.getDev libfabric))

From 4f81b9b642e5ebdef6514c26b65c1f5f3f414e5a Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 15:46:02 +0000
Subject: [PATCH 1743/6226] _cuda.lib.licenses: init

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/_cuda/lib/default.nix        |  3 +
 .../cuda-modules/_cuda/lib/licenses.nix       | 55 +++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/_cuda/lib/licenses.nix

diff --git a/pkgs/development/cuda-modules/_cuda/lib/default.nix b/pkgs/development/cuda-modules/_cuda/lib/default.nix
index b2fe9838de61..f227e66864f2 100644
--- a/pkgs/development/cuda-modules/_cuda/lib/default.nix
+++ b/pkgs/development/cuda-modules/_cuda/lib/default.nix
@@ -18,6 +18,9 @@
     allowUnfreeCudaPredicate
     ;
 
+  # See ./licenses.nix for documentation.
+  licenses = import ./licenses.nix;
+
   # See ./meta.nix for documentation.
   inherit (import ./meta.nix { inherit _cuda lib; })
     _mkMetaBadPlatforms
diff --git a/pkgs/development/cuda-modules/_cuda/lib/licenses.nix b/pkgs/development/cuda-modules/_cuda/lib/licenses.nix
new file mode 100644
index 000000000000..68b5ec7cc32a
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/lib/licenses.nix
@@ -0,0 +1,55 @@
+{
+  cudnn = {
+    shortName = "cuDNN EULA";
+    fullName = "cuDNN SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS";
+    url = "https://docs.nvidia.com/deeplearning/cudnn/backend/latest/reference/eula.html";
+    free = false;
+    redistributable = false;
+  };
+
+  cusparse_lt = {
+    shortName = "cuSPARSELt EULA";
+    fullName = "cuSPARSELt SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS";
+    url = "https://docs.nvidia.com/cuda/cusparselt/license.html";
+    free = false;
+    redistributable = false;
+  };
+
+  cutensor = {
+    shortName = "cuTENSOR EULA";
+    fullName = "cuTENSOR SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS";
+    url = "https://docs.nvidia.com/cuda/cutensor/latest/license.html";
+    free = false;
+    redistributable = false;
+  };
+
+  tensorrt = {
+    shortName = "TensorRT EULA";
+    fullName = "TensorRT SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS";
+    url = "https://docs.nvidia.com/deeplearning/tensorrt/latest/reference/sla.html";
+    free = false;
+    redistributable = false;
+  };
+
+  math_sdk_sla = {
+    shortName = "NVIDIA Math SDK SLA";
+    fullName = "LICENSE AGREEMENT FOR NVIDIA MATH LIBRARIES SOFTWARE DEVELOPMENT KITS";
+    url = "https://developer.download.nvidia.com/compute/mathdx/License.txt";
+    free = false;
+    redistributable = false;
+  };
+
+  # "license": "CUDA Toolkit",
+  # "license": "NVIDIA Driver",
+  # "license": "NVIDIA Proprietary",
+  # "license": "NVIDIA",
+  # "license": "NVIDIA SLA",
+  # "license": "cuDSS library",
+  # "license": "cuQuantum",
+  # "license": "libcusolvermp library",
+  # "license": "NPP PLUS library",
+  # "license": "nvCOMP library",
+  # "license": "nvJPEG 2K",
+  # "license": "NVPL",
+  # "license": "nvTIFF",
+}

From 763abd9405bbc1460492433511c83fe21ad5c971 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 8 Sep 2025 08:06:12 +0000
Subject: [PATCH 1744/6226] suitesparse: correct CUDA_PATH

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/libraries/science/math/suitesparse/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/science/math/suitesparse/default.nix b/pkgs/development/libraries/science/math/suitesparse/default.nix
index df867ee42121..bf3eeab4682e 100644
--- a/pkgs/development/libraries/science/math/suitesparse/default.nix
+++ b/pkgs/development/libraries/science/math/suitesparse/default.nix
@@ -80,7 +80,7 @@ effectiveStdenv.mkDerivation rec {
     "CFLAGS=-DBLAS64"
   ]
   ++ lib.optionals enableCuda [
-    "CUDA_PATH=${cudaPackages.cuda_nvcc}"
+    "CUDA_PATH=${lib.getBin cudaPackages.cuda_nvcc}"
     "CUDART_LIB=${lib.getLib cudaPackages.cuda_cudart}/lib/libcudart.so"
     "CUBLAS_LIB=${lib.getLib cudaPackages.libcublas}/lib/libcublas.so"
   ]

From ba2fa45461119d315485329b1aba165a2a39efdf Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Wed, 24 Sep 2025 00:22:44 +0000
Subject: [PATCH 1745/6226] _cuda.lib.allowUnfreeCudaPredicate: derive from
 _cuda.lib.licenses

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 doc/languages-frameworks/cuda.section.md      | 18 ++-------------
 .../cuda-modules/_cuda/lib/cuda.nix           | 22 +++++++++----------
 .../cuda-modules/_cuda/lib/default.nix        |  2 +-
 3 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md
index a469cdd42188..9ab8edc04726 100644
--- a/doc/languages-frameworks/cuda.section.md
+++ b/doc/languages-frameworks/cuda.section.md
@@ -26,23 +26,9 @@ All CUDA package sets include common CUDA packages like `libcublas`, `cudnn`, `t
 CUDA support is not enabled by default in Nixpkgs. To enable CUDA support, make sure Nixpkgs is imported with a configuration similar to the following:
 
 ```nix
+{ pkgs }:
 {
-  allowUnfreePredicate =
-    let
-      ensureList = x: if builtins.isList x then x else [ x ];
-    in
-    package:
-    builtins.all (
-      license:
-      license.free
-      || builtins.elem license.shortName [
-        "CUDA EULA"
-        "cuDNN EULA"
-        "cuSPARSELt EULA"
-        "cuTENSOR EULA"
-        "NVidia OptiX EULA"
-      ]
-    ) (ensureList package.meta.license);
+  allowUnfreePredicate = pkgs._cuda.lib.allowUnfreeCudaPredicate;
   cudaCapabilities = [ <target-architectures> ];
   cudaForwardCompat = true;
   cudaSupport = true;
diff --git a/pkgs/development/cuda-modules/_cuda/lib/cuda.nix b/pkgs/development/cuda-modules/_cuda/lib/cuda.nix
index 16f99e57709a..abae22f9d4f8 100644
--- a/pkgs/development/cuda-modules/_cuda/lib/cuda.nix
+++ b/pkgs/development/cuda-modules/_cuda/lib/cuda.nix
@@ -1,4 +1,4 @@
-{ lib }:
+{ _cuda, lib }:
 {
   /**
     Returns whether a capability should be built by default for a particular CUDA version.
@@ -114,16 +114,14 @@
     ```
   */
   allowUnfreeCudaPredicate =
-    package:
-    lib.all (
-      license:
-      license.free
-      || lib.elem license.shortName [
-        "CUDA EULA"
-        "cuDNN EULA"
-        "cuSPARSELt EULA"
-        "cuTENSOR EULA"
-        "NVidia OptiX EULA"
+    let
+      cudaLicenseNames = [
+        lib.licenses.nvidiaCuda.shortName
       ]
-    ) (lib.toList package.meta.license);
+      ++ lib.map (license: license.shortName) (lib.attrValues _cuda.lib.licenses);
+    in
+    package:
+    lib.all (license: license.free || lib.elem license.shortName cudaLicenseNames) (
+      lib.toList package.meta.license
+    );
 }
diff --git a/pkgs/development/cuda-modules/_cuda/lib/default.nix b/pkgs/development/cuda-modules/_cuda/lib/default.nix
index f227e66864f2..3aa3aab7dafb 100644
--- a/pkgs/development/cuda-modules/_cuda/lib/default.nix
+++ b/pkgs/development/cuda-modules/_cuda/lib/default.nix
@@ -11,7 +11,7 @@
     ;
 
   # See ./cuda.nix for documentation.
-  inherit (import ./cuda.nix { inherit lib; })
+  inherit (import ./cuda.nix { inherit _cuda lib; })
     _cudaCapabilityIsDefault
     _cudaCapabilityIsSupported
     _mkCudaVariant

From 6f0ca9e8afd4924db9faa073f497c31e5ea9d06d Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 9 Sep 2025 22:25:30 +0000
Subject: [PATCH 1746/6226] actiona: consume opencv CXX components when
 available

We do not default to `.dev` or any other output because `make-derivation.nix` needs to be able to select the `.dev` output,
and specifying an output prevents it from doing so.

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/by-name/ac/actiona/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ac/actiona/package.nix b/pkgs/by-name/ac/actiona/package.nix
index 0e022282ced7..b1c68d2a4c00 100644
--- a/pkgs/by-name/ac/actiona/package.nix
+++ b/pkgs/by-name/ac/actiona/package.nix
@@ -44,7 +44,10 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     bluez
     libnotify
-    opencv
+    # NOTE: Specifically not using lib.getOutput here because it would select the out output of opencv, which changes
+    # semantics since make-derivation uses lib.getDev on the dependency arrays, which won't touch derivations with
+    # specified outputs.
+    (opencv.cxxdev or opencv)
     qt6.qtbase
     qt6.qtmultimedia
     qt6.qttools

From d2367f07180c54834b749a48e6dc797c8e0735c3 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Sun, 5 Oct 2025 00:18:03 +0000
Subject: [PATCH 1747/6226] _cuda.lib.allowUnfreeCudaPredicate: handle license
 not having shortName

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/_cuda/lib/cuda.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/cuda-modules/_cuda/lib/cuda.nix b/pkgs/development/cuda-modules/_cuda/lib/cuda.nix
index abae22f9d4f8..09cf9c588f4a 100644
--- a/pkgs/development/cuda-modules/_cuda/lib/cuda.nix
+++ b/pkgs/development/cuda-modules/_cuda/lib/cuda.nix
@@ -121,7 +121,7 @@
       ++ lib.map (license: license.shortName) (lib.attrValues _cuda.lib.licenses);
     in
     package:
-    lib.all (license: license.free || lib.elem license.shortName cudaLicenseNames) (
+    lib.all (license: license.free || lib.elem (license.shortName or null) cudaLicenseNames) (
       lib.toList package.meta.license
     );
 }

From e0f1a5321e15d010368b4237e74e020840942dd7 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 15:50:29 +0000
Subject: [PATCH 1748/6226] cudaPackages: remove module system evaluation

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/modules/README.md            | 56 -----------------
 .../cuda-modules/modules/cuda/default.nix     |  4 --
 .../cuda-modules/modules/cudnn/default.nix    | 12 ----
 .../modules/cusparselt/default.nix            |  4 --
 .../cuda-modules/modules/cutensor/default.nix |  4 --
 .../cuda-modules/modules/default.nix          | 11 ----
 .../cuda-modules/modules/generic/default.nix  |  7 ---
 .../modules/generic/manifests/default.nix     |  7 ---
 .../generic/manifests/feature/manifest.nix    | 10 ----
 .../generic/manifests/feature/outputs.nix     | 60 -------------------
 .../generic/manifests/feature/package.nix     | 10 ----
 .../generic/manifests/feature/release.nix     | 10 ----
 .../generic/manifests/redistrib/manifest.nix  | 33 ----------
 .../generic/manifests/redistrib/package.nix   | 32 ----------
 .../generic/manifests/redistrib/release.nix   | 36 -----------
 .../modules/generic/releases/default.nix      | 45 --------------
 .../modules/generic/types/default.nix         | 39 ------------
 .../cuda-modules/modules/tensorrt/default.nix | 16 -----
 18 files changed, 396 deletions(-)
 delete mode 100644 pkgs/development/cuda-modules/modules/README.md
 delete mode 100644 pkgs/development/cuda-modules/modules/cuda/default.nix
 delete mode 100644 pkgs/development/cuda-modules/modules/cudnn/default.nix
 delete mode 100644 pkgs/development/cuda-modules/modules/cusparselt/default.nix
 delete mode 100644 pkgs/development/cuda-modules/modules/cutensor/default.nix
 delete mode 100644 pkgs/development/cuda-modules/modules/default.nix
 delete mode 100644 pkgs/development/cuda-modules/modules/generic/default.nix
 delete mode 100644 pkgs/development/cuda-modules/modules/generic/manifests/default.nix
 delete mode 100644 pkgs/development/cuda-modules/modules/generic/manifests/feature/manifest.nix
 delete mode 100644 pkgs/development/cuda-modules/modules/generic/manifests/feature/outputs.nix
 delete mode 100644 pkgs/development/cuda-modules/modules/generic/manifests/feature/package.nix
 delete mode 100644 pkgs/development/cuda-modules/modules/generic/manifests/feature/release.nix
 delete mode 100644 pkgs/development/cuda-modules/modules/generic/manifests/redistrib/manifest.nix
 delete mode 100644 pkgs/development/cuda-modules/modules/generic/manifests/redistrib/package.nix
 delete mode 100644 pkgs/development/cuda-modules/modules/generic/manifests/redistrib/release.nix
 delete mode 100644 pkgs/development/cuda-modules/modules/generic/releases/default.nix
 delete mode 100644 pkgs/development/cuda-modules/modules/generic/types/default.nix
 delete mode 100644 pkgs/development/cuda-modules/modules/tensorrt/default.nix

diff --git a/pkgs/development/cuda-modules/modules/README.md b/pkgs/development/cuda-modules/modules/README.md
deleted file mode 100644
index ab56463eea59..000000000000
--- a/pkgs/development/cuda-modules/modules/README.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Modules
-
-Modules as they are used in `modules` exist primarily to check the shape and
-content of CUDA redistributable and feature manifests. They are ultimately meant
-to reduce the repetitive nature of repackaging CUDA redistributables.
-
-Building most redistributables follows a pattern of a manifest indicating which
-packages are available at a location, their versions, and their hashes. To avoid
-creating builders for each and every derivation, modules serve as a way for us
-to use a single `genericManifestBuilder` to build all redistributables.
-
-## `generic`
-
-The modules in `generic` are reusable components meant to check the shape and
-content of NVIDIA's CUDA redistributable manifests, our feature manifests (which
-are derived from NVIDIA's manifests), or hand-crafted Nix expressions describing
-available packages. They are used by the `genericManifestBuilder` to build CUDA
-redistributables.
-
-Generally, each package which relies on manifests or Nix release expressions
-will create an alias to the relevant generic module. For example, the [module
-for CUDNN](./cudnn/default.nix) aliases the generic module for release
-expressions, while the [module for CUDA redistributables](./cuda/default.nix)
-aliases the generic module for manifests.
-
-Alternatively, additional fields or values may need to be configured to account
-for the particulars of a package. For example, while the release expressions for
-[CUDNN](../cudnn/releases.nix) and [TensorRT](../tensorrt/releases.nix) are very
-close, they differ slightly in the fields they have. The [module for
-CUDNN](./cudnn/default.nix) is able to use the generic module for
-release expressions, while the [module for
-TensorRT](./tensorrt/default.nix) must add additional fields to the
-generic module.
-
-### `manifests`
-
-The modules in `generic/manifests` define the structure of NVIDIA's CUDA
-redistributable manifests and our feature manifests.
-
-NVIDIA's redistributable manifests are retrieved from their web server, while
-the feature manifests are produced by
-[`cuda-redist-find-features`](https://github.com/connorbaker/cuda-redist-find-features).
-
-### `releases`
-
-The modules in `generic/releases` define the structure of our hand-crafted Nix
-expressions containing information necessary to download and repackage CUDA
-redistributables. These expressions are created when NVIDIA-provided manifests
-are unavailable or otherwise unusable. For example, though CUDNN has manifests,
-a bug in NVIDIA's CI/CD causes manifests for different versions of CUDA to use
-the same name, which leads to the manifests overwriting each other.
-
-### `types`
-
-The modules in `generic/types` define reusable types used in both
-`generic/manifests` and `generic/releases`.
diff --git a/pkgs/development/cuda-modules/modules/cuda/default.nix b/pkgs/development/cuda-modules/modules/cuda/default.nix
deleted file mode 100644
index 2ff6c885623d..000000000000
--- a/pkgs/development/cuda-modules/modules/cuda/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ options, ... }:
-{
-  options.cuda.manifests = options.generic.manifests;
-}
diff --git a/pkgs/development/cuda-modules/modules/cudnn/default.nix b/pkgs/development/cuda-modules/modules/cudnn/default.nix
deleted file mode 100644
index 36a9a26bda52..000000000000
--- a/pkgs/development/cuda-modules/modules/cudnn/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ options, ... }:
-{
-  options.cudnn.releases = options.generic.releases;
-  # TODO(@connorbaker): Figure out how to add additional options to the
-  # to the generic release.
-  # {
-  #   url = options.mkOption {
-  #     description = "URL to download the tarball from";
-  #     type = types.str;
-  #   };
-  # }
-}
diff --git a/pkgs/development/cuda-modules/modules/cusparselt/default.nix b/pkgs/development/cuda-modules/modules/cusparselt/default.nix
deleted file mode 100644
index 745bad811c05..000000000000
--- a/pkgs/development/cuda-modules/modules/cusparselt/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ options, ... }:
-{
-  options.cusparselt.manifests = options.generic.manifests;
-}
diff --git a/pkgs/development/cuda-modules/modules/cutensor/default.nix b/pkgs/development/cuda-modules/modules/cutensor/default.nix
deleted file mode 100644
index e3eb5383669b..000000000000
--- a/pkgs/development/cuda-modules/modules/cutensor/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ options, ... }:
-{
-  options.cutensor.manifests = options.generic.manifests;
-}
diff --git a/pkgs/development/cuda-modules/modules/default.nix b/pkgs/development/cuda-modules/modules/default.nix
deleted file mode 100644
index a173d1cae360..000000000000
--- a/pkgs/development/cuda-modules/modules/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  imports = [
-    ./generic
-    # Always after generic
-    ./cuda
-    ./cudnn
-    ./cusparselt
-    ./cutensor
-    ./tensorrt
-  ];
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/default.nix b/pkgs/development/cuda-modules/modules/generic/default.nix
deleted file mode 100644
index b68aa614f240..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  imports = [
-    ./types
-    ./manifests
-    ./releases
-  ];
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/default.nix b/pkgs/development/cuda-modules/modules/generic/manifests/default.nix
deleted file mode 100644
index c30589af6219..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/manifests/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ lib, config, ... }:
-{
-  options.generic.manifests = {
-    feature = import ./feature/manifest.nix { inherit lib config; };
-    redistrib = import ./redistrib/manifest.nix { inherit lib; };
-  };
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/feature/manifest.nix b/pkgs/development/cuda-modules/modules/generic/manifests/feature/manifest.nix
deleted file mode 100644
index 2c874b5e4c25..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/manifests/feature/manifest.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ lib, config, ... }:
-let
-  inherit (lib) options trivial types;
-  Release = import ./release.nix { inherit lib config; };
-in
-options.mkOption {
-  description = "Feature manifest is an attribute set which includes a mapping from package name to release";
-  example = trivial.importJSON ../../../../cuda/manifests/feature_11.8.0.json;
-  type = types.attrsOf Release.type;
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/feature/outputs.nix b/pkgs/development/cuda-modules/modules/generic/manifests/feature/outputs.nix
deleted file mode 100644
index 961f0b968685..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/manifests/feature/outputs.nix
+++ /dev/null
@@ -1,60 +0,0 @@
-{ lib, ... }:
-let
-  inherit (lib) options types;
-in
-# https://github.com/ConnorBaker/cuda-redist-find-features/blob/603407bea2fab47f2dfcd88431122a505af95b42/cuda_redist_find_features/manifest/feature/package/package.py
-options.mkOption {
-  description = "Set of outputs that a package can provide";
-  example = {
-    bin = true;
-    dev = true;
-    doc = false;
-    lib = false;
-    sample = false;
-    static = false;
-  };
-  type = types.submodule {
-    options = {
-      bin = options.mkOption {
-        description = "`bin` output requires that we have a non-empty `bin` directory containing at least one file with the executable bit set";
-        type = types.bool;
-      };
-      dev = options.mkOption {
-        description = ''
-          A `dev` output requires that we have at least one of the following non-empty directories:
-
-          - `include`
-          - `lib/pkgconfig`
-          - `share/pkgconfig`
-          - `lib/cmake`
-          - `share/aclocal`
-        '';
-        type = types.bool;
-      };
-      doc = options.mkOption {
-        description = ''
-          A `doc` output requires that we have at least one of the following non-empty directories:
-
-          - `share/info`
-          - `share/doc`
-          - `share/gtk-doc`
-          - `share/devhelp`
-          - `share/man`
-        '';
-        type = types.bool;
-      };
-      lib = options.mkOption {
-        description = "`lib` output requires that we have a non-empty lib directory containing at least one shared library";
-        type = types.bool;
-      };
-      sample = options.mkOption {
-        description = "`sample` output requires that we have a non-empty `samples` directory";
-        type = types.bool;
-      };
-      static = options.mkOption {
-        description = "`static` output requires that we have a non-empty lib directory containing at least one static library";
-        type = types.bool;
-      };
-    };
-  };
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/feature/package.nix b/pkgs/development/cuda-modules/modules/generic/manifests/feature/package.nix
deleted file mode 100644
index 2563598a7829..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/manifests/feature/package.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ lib, ... }:
-let
-  inherit (lib) options types;
-  Outputs = import ./outputs.nix { inherit lib; };
-in
-options.mkOption {
-  description = "Package in the manifest";
-  example = (import ./release.nix { inherit lib; }).linux-x86_64;
-  type = types.submodule { options.outputs = Outputs; };
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/feature/release.nix b/pkgs/development/cuda-modules/modules/generic/manifests/feature/release.nix
deleted file mode 100644
index 6754ae56e0b0..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/manifests/feature/release.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{ lib, config, ... }:
-let
-  inherit (lib) options types;
-  Package = import ./package.nix { inherit lib config; };
-in
-options.mkOption {
-  description = "Release is an attribute set which includes a mapping from platform to package";
-  example = (import ./manifest.nix { inherit lib; }).cuda_cccl;
-  type = types.attrsOf Package.type;
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/manifest.nix b/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/manifest.nix
deleted file mode 100644
index ec8cba3c7858..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/manifest.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{ lib, ... }:
-let
-  inherit (lib) options trivial types;
-  Release = import ./release.nix { inherit lib; };
-in
-options.mkOption {
-  description = "Redistributable manifest is an attribute set which includes a mapping from package name to release";
-  example = trivial.importJSON ../../../../cuda/manifests/redistrib_11.8.0.json;
-  type = types.submodule {
-    # Allow any attribute name as these will be the package names
-    freeformType = types.attrsOf Release.type;
-    options = {
-      release_date = options.mkOption {
-        description = "Release date of the manifest";
-        type = types.nullOr types.str;
-        default = null;
-        example = "2023-08-29";
-      };
-      release_label = options.mkOption {
-        description = "Release label of the manifest";
-        type = types.nullOr types.str;
-        default = null;
-        example = "12.2.2";
-      };
-      release_product = options.mkOption {
-        example = "cuda";
-        description = "Release product of the manifest";
-        type = types.nullOr types.str;
-        default = null;
-      };
-    };
-  };
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/package.nix b/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/package.nix
deleted file mode 100644
index bf3bd478a123..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/package.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ lib, ... }:
-let
-  inherit (lib) options types;
-in
-options.mkOption {
-  description = "Package in the manifest";
-  example = (import ./release.nix { inherit lib; }).linux-x86_64;
-  type = types.submodule {
-    options = {
-      relative_path = options.mkOption {
-        description = "Relative path to the package";
-        example = "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-11.5.62-archive.tar.xz";
-        type = types.str;
-      };
-      sha256 = options.mkOption {
-        description = "Sha256 hash of the package";
-        example = "bbe633d6603d5a96a214dcb9f3f6f6fd2fa04d62e53694af97ae0c7afe0121b0";
-        type = types.str;
-      };
-      md5 = options.mkOption {
-        description = "Md5 hash of the package";
-        example = "e5deef4f6cb71f14aac5be5d5745dafe";
-        type = types.str;
-      };
-      size = options.mkOption {
-        description = "Size of the package as a string";
-        type = types.str;
-        example = "960968";
-      };
-    };
-  };
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/release.nix b/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/release.nix
deleted file mode 100644
index 0165ecbb08bc..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/manifests/redistrib/release.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{ lib, ... }:
-let
-  inherit (lib) options types;
-  Package = import ./package.nix { inherit lib; };
-in
-options.mkOption {
-  description = "Release is an attribute set which includes a mapping from platform to package";
-  example = (import ./manifest.nix { inherit lib; }).cuda_cccl;
-  type = types.submodule {
-    # Allow any attribute name as these will be the platform names
-    freeformType = types.attrsOf Package.type;
-    options = {
-      name = options.mkOption {
-        description = "Full name of the package";
-        example = "CXX Core Compute Libraries";
-        type = types.str;
-      };
-      license = options.mkOption {
-        description = "License of the package";
-        example = "CUDA Toolkit";
-        type = types.str;
-      };
-      license_path = options.mkOption {
-        description = "Path to the license of the package";
-        example = "cuda_cccl/LICENSE.txt";
-        default = null;
-        type = types.nullOr types.str;
-      };
-      version = options.mkOption {
-        description = "Version of the package";
-        example = "11.5.62";
-        type = types.str;
-      };
-    };
-  };
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/releases/default.nix b/pkgs/development/cuda-modules/modules/generic/releases/default.nix
deleted file mode 100644
index 87985ef08134..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/releases/default.nix
+++ /dev/null
@@ -1,45 +0,0 @@
-{ lib, config, ... }:
-let
-  inherit (config.generic.types) majorMinorVersion majorMinorPatchBuildVersion;
-  inherit (lib) options types;
-in
-{
-  options.generic.releases = options.mkOption {
-    description = "Collection of packages targeting different platforms";
-    type =
-      let
-        Package = options.mkOption {
-          description = "Package for a specific platform";
-          example = {
-            version = "8.0.3.4";
-            minCudaVersion = "10.2";
-            maxCudaVersion = "10.2";
-            hash = "sha256-LxcXgwe1OCRfwDsEsNLIkeNsOcx3KuF5Sj+g2dY6WD0=";
-          };
-          type = types.submodule {
-            # TODO(@connorbaker): Figure out how to extend option sets.
-            freeformType = types.attrsOf types.anything;
-            options = {
-              version = options.mkOption {
-                description = "Version of the package";
-                type = majorMinorPatchBuildVersion;
-              };
-              minCudaVersion = options.mkOption {
-                description = "Minimum CUDA version supported";
-                type = majorMinorVersion;
-              };
-              maxCudaVersion = options.mkOption {
-                description = "Maximum CUDA version supported";
-                type = majorMinorVersion;
-              };
-              hash = options.mkOption {
-                description = "Hash of the tarball";
-                type = types.str;
-              };
-            };
-          };
-        };
-      in
-      types.attrsOf (types.listOf Package.type);
-  };
-}
diff --git a/pkgs/development/cuda-modules/modules/generic/types/default.nix b/pkgs/development/cuda-modules/modules/generic/types/default.nix
deleted file mode 100644
index 31e0a4403e81..000000000000
--- a/pkgs/development/cuda-modules/modules/generic/types/default.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{ lib, ... }:
-let
-  inherit (lib) options types;
-in
-{
-  options.generic.types = options.mkOption {
-    type = types.attrsOf types.optionType;
-    default = { };
-    description = "Set of generic types";
-  };
-  config.generic.types = {
-    cudaArch = types.strMatching "^sm_[[:digit:]]+[a-z]?$" // {
-      name = "cudaArch";
-      description = "CUDA architecture name";
-    };
-    # https://github.com/ConnorBaker/cuda-redist-find-features/blob/c841980e146f8664bbcd0ba1399e486b7910617b/cuda_redist_find_features/types/_lib_so_name.py
-    libSoName = types.strMatching ".*\\.so(\\.[[:digit:]]+)*$" // {
-      name = "libSoName";
-      description = "Name of a shared object file";
-    };
-
-    majorMinorVersion = types.strMatching "^([[:digit:]]+)\\.([[:digit:]]+)$" // {
-      name = "majorMinorVersion";
-      description = "Version number with a major and minor component";
-    };
-
-    majorMinorPatchVersion = types.strMatching "^([[:digit:]]+)\\.([[:digit:]]+)\\.([[:digit:]]+)$" // {
-      name = "majorMinorPatchVersion";
-      description = "Version number with a major, minor, and patch component";
-    };
-
-    majorMinorPatchBuildVersion =
-      types.strMatching "^([[:digit:]]+)\\.([[:digit:]]+)\\.([[:digit:]]+)\\.([[:digit:]]+)$"
-      // {
-        name = "majorMinorPatchBuildVersion";
-        description = "Version number with a major, minor, patch, and build component";
-      };
-  };
-}
diff --git a/pkgs/development/cuda-modules/modules/tensorrt/default.nix b/pkgs/development/cuda-modules/modules/tensorrt/default.nix
deleted file mode 100644
index a214a26e434b..000000000000
--- a/pkgs/development/cuda-modules/modules/tensorrt/default.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ options, ... }:
-{
-  options.tensorrt.releases = options.generic.releases;
-  # TODO(@connorbaker): Figure out how to add additional options to the
-  # to the generic release.
-  # {
-  #   cudnnVersion = lib.options.mkOption {
-  #     description = "CUDNN version supported";
-  #     type = types.nullOr majorMinorVersion;
-  #   };
-  #   filename = lib.options.mkOption {
-  #     description = "Tarball name";
-  #     type = types.str;
-  #   };
-  # }
-}

From 5d39671a430bb92e62c612433c09ecdfdea44051 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 15:54:45 +0000
Subject: [PATCH 1749/6226] cudaPackages: remove generic-builder

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../generic-builders/manifest.nix             | 356 ------------------
 .../generic-builders/multiplex.nix            | 130 -------
 2 files changed, 486 deletions(-)
 delete mode 100644 pkgs/development/cuda-modules/generic-builders/manifest.nix
 delete mode 100644 pkgs/development/cuda-modules/generic-builders/multiplex.nix

diff --git a/pkgs/development/cuda-modules/generic-builders/manifest.nix b/pkgs/development/cuda-modules/generic-builders/manifest.nix
deleted file mode 100644
index 7f346df79809..000000000000
--- a/pkgs/development/cuda-modules/generic-builders/manifest.nix
+++ /dev/null
@@ -1,356 +0,0 @@
-{
-  # General callPackage-supplied arguments
-  autoAddDriverRunpath,
-  autoAddCudaCompatRunpath,
-  autoPatchelfHook,
-  backendStdenv,
-  callPackage,
-  _cuda,
-  fetchurl,
-  lib,
-  markForCudatoolkitRootHook,
-  flags,
-  stdenv,
-  # Builder-specific arguments
-  # Short package name (e.g., "cuda_cccl")
-  # pname : String
-  pname,
-  # Common name (e.g., "cutensor" or "cudnn") -- used in the URL.
-  # Also known as the Redistributable Name.
-  # redistName : String,
-  redistName,
-  # If libPath is non-null, it must be a subdirectory of `lib`.
-  # The contents of `libPath` will be moved to the root of `lib`.
-  libPath ? null,
-  # See ./modules/generic/manifests/redistrib/release.nix
-  redistribRelease,
-  # See ./modules/generic/manifests/feature/release.nix
-  featureRelease,
-  cudaMajorMinorVersion,
-}:
-let
-  inherit (lib)
-    attrsets
-    lists
-    strings
-    trivial
-    licenses
-    teams
-    sourceTypes
-    ;
-
-  inherit (stdenv) hostPlatform;
-
-  # Last step before returning control to `callPackage` (adds the `.override` method)
-  # we'll apply (`overrideAttrs`) necessary package-specific "fixup" functions.
-  # Order is significant.
-  maybeFixup = _cuda.fixups.${pname} or null;
-  fixup = if maybeFixup != null then callPackage maybeFixup { } else { };
-
-  # Get the redist systems for which package provides distributables.
-  # These are used by meta.platforms.
-  supportedRedistSystems = builtins.attrNames featureRelease;
-  # redistSystem :: String
-  # The redistSystem is the name of the system for which the redistributable is built.
-  # It is `"unsupported"` if the redistributable is not supported on the target system.
-  redistSystem = _cuda.lib.getRedistSystem backendStdenv.hasJetsonCudaCapability hostPlatform.system;
-
-  sourceMatchesHost = lib.elem hostPlatform.system (_cuda.lib.getNixSystems redistSystem);
-in
-(backendStdenv.mkDerivation (finalAttrs: {
-  # NOTE: Even though there's no actual buildPhase going on here, the derivations of the
-  # redistributables are sensitive to the compiler flags provided to stdenv. The patchelf package
-  # is sensitive to the compiler flags provided to stdenv, and we depend on it. As such, we are
-  # also sensitive to the compiler flags provided to stdenv.
-  inherit pname;
-  inherit (redistribRelease) version;
-
-  # Don't force serialization to string for structured attributes, like outputToPatterns
-  # and brokenConditions.
-  # Avoids "set cannot be coerced to string" errors.
-  __structuredAttrs = true;
-
-  # Keep better track of dependencies.
-  strictDeps = true;
-
-  # NOTE: Outputs are evaluated jointly with meta, so in the case that this is an unsupported platform,
-  # we still need to provide a list of outputs.
-  outputs =
-    let
-      # Checks whether the redistributable provides an output.
-      hasOutput =
-        output:
-        attrsets.attrByPath [
-          redistSystem
-          "outputs"
-          output
-        ] false featureRelease;
-      # Order is important here so we use a list.
-      possibleOutputs = [
-        "bin"
-        "lib"
-        "static"
-        "dev"
-        "doc"
-        "sample"
-        "python"
-      ];
-      # Filter out outputs that don't exist in the redistributable.
-      # NOTE: In the case the redistributable isn't supported on the target platform,
-      # we will have `outputs = [ "out" ] ++ possibleOutputs`. This is of note because platforms which
-      # aren't supported would otherwise have evaluation errors when trying to access outputs other than `out`.
-      # The alternative would be to have `outputs = [ "out" ]` when`redistSystem = "unsupported"`, but that would
-      # require adding guards throughout the entirety of the CUDA package set to ensure `cudaSupport` is true --
-      # recall that OfBorg will evaluate packages marked as broken and that `cudaPackages` will be evaluated with
-      # `cudaSupport = false`!
-      additionalOutputs =
-        if redistSystem == "unsupported" then
-          possibleOutputs
-        else
-          builtins.filter hasOutput possibleOutputs;
-      # The out output is special -- it's the default output and we always include it.
-      outputs = [ "out" ] ++ additionalOutputs;
-    in
-    outputs;
-
-  # Traversed in the order of the outputs specified in outputs;
-  # entries are skipped if they don't exist in outputs.
-  outputToPatterns = {
-    bin = [ "bin" ];
-    dev = [
-      "share/pkgconfig"
-      "**/*.pc"
-      "**/*.cmake"
-    ];
-    lib = [
-      "lib"
-      "lib64"
-    ];
-    static = [ "**/*.a" ];
-    sample = [ "samples" ];
-    python = [ "**/*.whl" ];
-  };
-
-  # Useful for introspecting why something went wrong. Maps descriptions of why the derivation would be marked as
-  # broken on have badPlatforms include the current platform.
-
-  # brokenConditions :: AttrSet Bool
-  # Sets `meta.broken = true` if any of the conditions are true.
-  # Example: Broken on a specific version of CUDA or when a dependency has a specific version.
-  brokenConditions = {
-    # Unclear how this is handled by Nix internals.
-    "Duplicate entries in outputs" = finalAttrs.outputs != lists.unique finalAttrs.outputs;
-    # Typically this results in the static output being empty, as all libraries are moved
-    # back to the lib output.
-    "lib output follows static output" =
-      let
-        libIndex = lists.findFirstIndex (x: x == "lib") null finalAttrs.outputs;
-        staticIndex = lists.findFirstIndex (x: x == "static") null finalAttrs.outputs;
-      in
-      libIndex != null && staticIndex != null && libIndex > staticIndex;
-  };
-
-  # badPlatformsConditions :: AttrSet Bool
-  # Sets `meta.badPlatforms = meta.platforms` if any of the conditions are true.
-  # Example: Broken on a specific architecture when some condition is met (like targeting Jetson).
-  badPlatformsConditions = {
-    "No source" = !sourceMatchesHost;
-  };
-
-  # src :: Optional Derivation
-  # If redistSystem doesn't exist in redistribRelease, return null.
-  src = trivial.mapNullable (
-    { relative_path, sha256, ... }:
-    fetchurl {
-      url = "https://developer.download.nvidia.com/compute/${redistName}/redist/${relative_path}";
-      inherit sha256;
-    }
-  ) (redistribRelease.${redistSystem} or null);
-
-  postPatch =
-    # Pkg-config's setup hook expects configuration files in $out/share/pkgconfig
-    ''
-      for path in pkg-config pkgconfig; do
-        [[ -d "$path" ]] || continue
-        mkdir -p share/pkgconfig
-        mv "$path"/* share/pkgconfig/
-        rmdir "$path"
-      done
-    ''
-    # Rewrite FHS paths with store paths
-    # NOTE: output* fall back to out if the corresponding output isn't defined.
-    + ''
-      for pc in share/pkgconfig/*.pc; do
-        sed -i \
-          -e "s|^cudaroot\s*=.*\$|cudaroot=''${!outputDev}|" \
-          -e "s|^libdir\s*=.*/lib\$|libdir=''${!outputLib}/lib|" \
-          -e "s|^includedir\s*=.*/include\$|includedir=''${!outputDev}/include|" \
-          "$pc"
-      done
-    ''
-    # Generate unversioned names.
-    # E.g. cuda-11.8.pc -> cuda.pc
-    + ''
-      for pc in share/pkgconfig/*-"$majorMinorVersion.pc"; do
-        ln -s "$(basename "$pc")" "''${pc%-$majorMinorVersion.pc}".pc
-      done
-    '';
-
-  env.majorMinorVersion = cudaMajorMinorVersion;
-
-  # We do need some other phases, like configurePhase, so the multiple-output setup hook works.
-  dontBuild = true;
-
-  nativeBuildInputs = [
-    autoPatchelfHook
-    # This hook will make sure libcuda can be found
-    # in typically /lib/opengl-driver by adding that
-    # directory to the rpath of all ELF binaries.
-    # Check e.g. with `patchelf --print-rpath path/to/my/binary
-    autoAddDriverRunpath
-    markForCudatoolkitRootHook
-  ]
-  # autoAddCudaCompatRunpath depends on cuda_compat and would cause
-  # infinite recursion if applied to `cuda_compat` itself (beside the fact
-  # that it doesn't make sense in the first place)
-  ++ lib.optionals (pname != "cuda_compat" && flags.isJetsonBuild) [
-    # autoAddCudaCompatRunpath must appear AFTER autoAddDriverRunpath.
-    # See its documentation in ./setup-hooks/extension.nix.
-    autoAddCudaCompatRunpath
-  ];
-
-  buildInputs = [
-    # autoPatchelfHook will search for a libstdc++ and we're giving it
-    # one that is compatible with the rest of nixpkgs, even when
-    # nvcc forces us to use an older gcc
-    # NB: We don't actually know if this is the right thing to do
-    (lib.getLib stdenv.cc.cc)
-  ];
-
-  # Picked up by autoPatchelf
-  # Needed e.g. for libnvrtc to locate (dlopen) libnvrtc-builtins
-  appendRunpaths = [ "$ORIGIN" ];
-
-  # NOTE: We don't need to check for dev or doc, because those outputs are handled by
-  # the multiple-outputs setup hook.
-  # NOTE: moveToOutput operates on all outputs:
-  # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L105-L107
-  installPhase =
-    let
-      mkMoveToOutputCommand =
-        output:
-        let
-          template = pattern: ''moveToOutput "${pattern}" "${"$" + output}"'';
-          patterns = finalAttrs.outputToPatterns.${output} or [ ];
-        in
-        strings.concatMapStringsSep "\n" template patterns;
-    in
-    # Pre-install hook
-    ''
-      runHook preInstall
-    ''
-    # Handle the existence of libPath, which requires us to re-arrange the lib directory
-    + strings.optionalString (libPath != null) ''
-      full_lib_path="lib/${libPath}"
-      if [[ ! -d "$full_lib_path" ]]; then
-        echo "${finalAttrs.pname}: '$full_lib_path' does not exist, only found:" >&2
-        find lib/ -mindepth 1 -maxdepth 1 >&2
-        echo "This release might not support your CUDA version" >&2
-        exit 1
-      fi
-      echo "Making libPath '$full_lib_path' the root of lib" >&2
-      mv "$full_lib_path" lib_new
-      rm -r lib
-      mv lib_new lib
-    ''
-    # Create the primary output, out, and move the other outputs into it.
-    + ''
-      mkdir -p "$out"
-      mv * "$out"
-    ''
-    # Move the outputs into their respective outputs.
-    + strings.concatMapStringsSep "\n" mkMoveToOutputCommand (builtins.tail finalAttrs.outputs)
-    # Add a newline to the end of the installPhase, so that the post-install hook doesn't
-    # get concatenated with the last moveToOutput command.
-    + "\n"
-    # Post-install hook
-    + ''
-      runHook postInstall
-    '';
-
-  doInstallCheck = true;
-  allowFHSReferences = true; # TODO: Default to `false`
-  postInstallCheck = ''
-    echo "Executing postInstallCheck"
-
-    if [[ -z "''${allowFHSReferences-}" ]]; then
-      mapfile -t outputPaths < <(for o in $(getAllOutputNames); do echo "''${!o}"; done)
-      if grep --max-count=5 --recursive --exclude=LICENSE /usr/ "''${outputPaths[@]}"; then
-        echo "Detected references to /usr" >&2
-        exit 1
-      fi
-    fi
-  '';
-
-  # libcuda needs to be resolved during runtime
-  autoPatchelfIgnoreMissingDeps = [
-    "libcuda.so"
-    "libcuda.so.*"
-  ];
-
-  # _multioutPropagateDev() currently expects a space-separated string rather than an array
-  preFixup = ''
-    export propagatedBuildOutputs="''${propagatedBuildOutputs[@]}"
-  '';
-
-  # Propagate all outputs, including `static`
-  propagatedBuildOutputs = builtins.filter (x: x != "dev") finalAttrs.outputs;
-
-  # Kept in case overrides assume postPhases have already been defined
-  postPhases = [ "postPatchelf" ];
-  postPatchelf = ''
-    true
-  '';
-
-  passthru = {
-    # Provide access to the release information for fixup functions.
-    inherit redistribRelease featureRelease;
-    # Make the CUDA-patched stdenv available
-    stdenv = backendStdenv;
-  };
-
-  meta = {
-    description = "${redistribRelease.name}. By downloading and using the packages you accept the terms and conditions of the ${finalAttrs.meta.license.shortName}";
-    sourceProvenance = [ sourceTypes.binaryNativeCode ];
-    broken = lists.any trivial.id (attrsets.attrValues finalAttrs.brokenConditions);
-    platforms = trivial.pipe supportedRedistSystems [
-      # Map each redist system to the equivalent nix systems.
-      (lib.concatMap _cuda.lib.getNixSystems)
-      # Take all the unique values.
-      lib.unique
-      # Sort the list.
-      lib.naturalSort
-    ];
-    badPlatforms =
-      let
-        isBadPlatform = lists.any trivial.id (attrsets.attrValues finalAttrs.badPlatformsConditions);
-      in
-      lists.optionals isBadPlatform finalAttrs.meta.platforms;
-    license =
-      if redistName == "cuda" then
-        # Add the package-specific license.
-        let
-          licensePath =
-            if redistribRelease.license_path != null then
-              redistribRelease.license_path
-            else
-              "${pname}/LICENSE.txt";
-          url = "https://developer.download.nvidia.com/compute/cuda/redist/${licensePath}";
-        in
-        lib.licenses.nvidiaCudaRedist // { inherit url; }
-      else
-        licenses.unfree;
-    teams = [ teams.cuda ];
-  };
-})).overrideAttrs
-  fixup
diff --git a/pkgs/development/cuda-modules/generic-builders/multiplex.nix b/pkgs/development/cuda-modules/generic-builders/multiplex.nix
deleted file mode 100644
index 3085ae3e4610..000000000000
--- a/pkgs/development/cuda-modules/generic-builders/multiplex.nix
+++ /dev/null
@@ -1,130 +0,0 @@
-{
-  lib,
-  cudaLib,
-  cudaMajorMinorVersion,
-  redistSystem,
-  stdenv,
-  # Builder-specific arguments
-  # Short package name (e.g., "cuda_cccl")
-  # pname : String
-  pname,
-  # Common name (e.g., "cutensor" or "cudnn") -- used in the URL.
-  # Also known as the Redistributable Name.
-  # redistName : String,
-  redistName,
-  # releasesModule :: Path
-  # A path to a module which provides a `releases` attribute
-  releasesModule,
-  # shims :: Path
-  # A path to a module which provides a `shims` attribute
-  # The redistribRelease is only used in ./manifest.nix for the package version
-  # and the package description (which NVIDIA's manifest calls the "name").
-  # It's also used for fetching the source, but we override that since we can't
-  # re-use that portion of the functionality (different URLs, etc.).
-  # The featureRelease is used to populate meta.platforms (by way of looking at the attribute names), determine the
-  # outputs of the package, and provide additional package-specific constraints (e.g., min/max supported CUDA versions,
-  # required versions of other packages, etc.).
-  # shimFn :: {package, redistSystem} -> AttrSet
-  shimsFn ? (throw "shimsFn must be provided"),
-}:
-let
-  evaluatedModules = lib.modules.evalModules {
-    modules = [
-      ../modules
-      releasesModule
-    ];
-  };
-
-  # NOTE: Important types:
-  # - Releases: ../modules/${pname}/releases/releases.nix
-  # - Package: ../modules/${pname}/releases/package.nix
-
-  # Check whether a package supports our CUDA version.
-  # satisfiesCudaVersion :: Package -> Bool
-  satisfiesCudaVersion =
-    package:
-    lib.versionAtLeast cudaMajorMinorVersion package.minCudaVersion
-    && lib.versionAtLeast package.maxCudaVersion cudaMajorMinorVersion;
-
-  # FIXME: do this at the module system level
-  propagatePlatforms = lib.mapAttrs (redistSystem: lib.map (p: { inherit redistSystem; } // p));
-
-  # Releases for all platforms and all CUDA versions.
-  allReleases = propagatePlatforms evaluatedModules.config.${pname}.releases;
-
-  # Releases for all platforms and our CUDA version.
-  allReleases' = lib.mapAttrs (_: lib.filter satisfiesCudaVersion) allReleases;
-
-  # Packages for all platforms and our CUDA versions.
-  allPackages = lib.concatLists (lib.attrValues allReleases');
-
-  packageOlder = p1: p2: lib.versionOlder p1.version p2.version;
-  packageSupportedPlatform = p: p.redistSystem == redistSystem;
-
-  # Compute versioned attribute name to be used in this package set
-  # Patch version changes should not break the build, so we only use major and minor
-  # computeName :: Package -> String
-  computeName = { version, ... }: cudaLib.mkVersionedName pname (lib.versions.majorMinor version);
-
-  # The newest package for each major-minor version, with newest first.
-  # newestPackages :: List Package
-  newestPackages =
-    let
-      newestForEachMajorMinorVersion = lib.foldl' (
-        newestPackages: package:
-        let
-          majorMinorVersion = lib.versions.majorMinor package.version;
-          existingPackage = newestPackages.${majorMinorVersion} or null;
-        in
-        newestPackages
-        // {
-          ${majorMinorVersion} =
-            # Only keep the existing package if it is newer than the one we are considering or it is supported on the
-            # current platform and the one we are considering is not.
-            if
-              existingPackage != null
-              && (
-                packageOlder package existingPackage
-                || (!packageSupportedPlatform package && packageSupportedPlatform existingPackage)
-              )
-            then
-              existingPackage
-            else
-              package;
-        }
-      ) { } allPackages;
-    in
-    # Sort the packages by version so the newest is first.
-    # NOTE: builtins.sort requires a strict weak ordering, so we must use versionOlder rather than versionAtLeast.
-    # See https://github.com/NixOS/nixpkgs/commit/9fd753ea84e5035b357a275324e7fd7ccfb1fc77.
-    lib.sort (lib.flip packageOlder) (lib.attrValues newestForEachMajorMinorVersion);
-
-  extension =
-    final: _:
-    let
-      # Builds our package into derivation and wraps it in a nameValuePair, where the name is the versioned name
-      # of the package.
-      buildPackage =
-        package:
-        let
-          shims = final.callPackage shimsFn { inherit package redistSystem; };
-          name = computeName package;
-          drv = final.callPackage ./manifest.nix {
-            inherit pname redistName;
-            inherit (shims) redistribRelease featureRelease;
-          };
-        in
-        lib.nameValuePair name drv;
-
-      # versionedDerivations :: AttrSet Derivation
-      versionedDerivations = builtins.listToAttrs (lib.map buildPackage newestPackages);
-
-      defaultDerivation = {
-        ${pname} = (buildPackage (lib.head newestPackages)).value;
-      };
-    in
-    # NOTE: Must condition on the length of newestPackages to avoid non-total function lib.head aborting if
-    # newestPackages is empty.
-    lib.optionalAttrs (lib.length newestPackages > 0) (versionedDerivations // defaultDerivation);
-in
-extension

From 3ad342b28e77b93e768c1be116723ace1ce9d70b Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 15:54:58 +0000
Subject: [PATCH 1750/6226] cudaPackages.buildRedist: init

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../buildRedist/buildRedistHook.bash          | 174 +++++++
 .../cuda-modules/buildRedist/default.nix      | 480 ++++++++++++++++++
 2 files changed, 654 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/buildRedist/buildRedistHook.bash
 create mode 100644 pkgs/development/cuda-modules/buildRedist/default.nix

diff --git a/pkgs/development/cuda-modules/buildRedist/buildRedistHook.bash b/pkgs/development/cuda-modules/buildRedist/buildRedistHook.bash
new file mode 100644
index 000000000000..6ca8f3d19dcc
--- /dev/null
+++ b/pkgs/development/cuda-modules/buildRedist/buildRedistHook.bash
@@ -0,0 +1,174 @@
+# shellcheck shell=bash
+
+if [[ -n ${strictDeps:-} && ${hostOffset:-0} -ne -1 ]]; then
+  nixLog "skipping sourcing buildRedistHook.bash (hostOffset=${hostOffset:-0}) (targetOffset=${targetOffset:-0})"
+  return 0
+fi
+nixLog "sourcing buildRedistHook.bash (hostOffset=${hostOffset:-0}) (targetOffset=${targetOffset:-0})"
+
+buildRedistHookRegistration() {
+  postUnpackHooks+=(unpackCudaLibSubdir)
+  nixLog "added unpackCudaLibSubdir to postUnpackHooks"
+
+  postUnpackHooks+=(unpackCudaPkgConfigDirs)
+  nixLog "added unpackCudaPkgConfigDirs to postUnpackHooks"
+
+  prePatchHooks+=(patchCudaPkgConfig)
+  nixLog "added patchCudaPkgConfig to prePatchHooks"
+
+  if [[ -z ${allowFHSReferences-} ]]; then
+    postInstallCheckHooks+=(checkCudaFhsRefs)
+    nixLog "added checkCudaFhsRefs to postInstallCheckHooks"
+  fi
+
+  postInstallCheckHooks+=(checkCudaNonEmptyOutputs)
+  nixLog "added checkCudaNonEmptyOutputs to postInstallCheckHooks"
+
+  preFixupHooks+=(fixupPropagatedBuildOutputsForMultipleOutputs)
+  nixLog "added fixupPropagatedBuildOutputsForMultipleOutputs to preFixupHooks"
+
+  postFixupHooks+=(fixupCudaPropagatedBuildOutputsToOut)
+  nixLog "added fixupCudaPropagatedBuildOutputsToOut to postFixupHooks"
+}
+
+buildRedistHookRegistration
+
+unpackCudaLibSubdir() {
+  local -r cudaLibDir="${NIX_BUILD_TOP:?}/${sourceRoot:?}/lib"
+  local -r versionedCudaLibDir="$cudaLibDir/${cudaMajorVersion:?}"
+
+  if [[ ! -d $versionedCudaLibDir ]]; then
+    return 0
+  fi
+
+  nixLog "found versioned CUDA lib dir: $versionedCudaLibDir"
+
+  mv \
+    --verbose \
+    --no-clobber \
+    "$versionedCudaLibDir" \
+    "${cudaLibDir}-new"
+  rm --verbose --recursive "$cudaLibDir" || {
+    nixErrorLog "could not delete $cudaLibDir: $(ls -laR "$cudaLibDir")"
+    exit 1
+  }
+  mv \
+    --verbose \
+    --no-clobber \
+    "${cudaLibDir}-new" \
+    "$cudaLibDir"
+
+  return 0
+}
+
+# Pkg-config's setup hook expects configuration files in $out/share/pkgconfig
+unpackCudaPkgConfigDirs() {
+  local path
+  local -r pkgConfigDir="${NIX_BUILD_TOP:?}/${sourceRoot:?}/share/pkgconfig"
+
+  for path in "${NIX_BUILD_TOP:?}/${sourceRoot:?}"/{pkg-config,pkgconfig}; do
+    [[ -d $path ]] || continue
+    mkdir -p "$pkgConfigDir"
+    mv \
+      --verbose \
+      --no-clobber \
+      --target-directory "$pkgConfigDir" \
+      "$path"/*
+    rm --recursive --dir "$path" || {
+      nixErrorLog "$path contains non-empty directories: $(ls -laR "$path")"
+      exit 1
+    }
+  done
+
+  return 0
+}
+
+patchCudaPkgConfig() {
+  local pc
+
+  for pc in "${NIX_BUILD_TOP:?}/${sourceRoot:?}"/share/pkgconfig/*.pc; do
+    nixLog "patching $pc"
+    sed -i \
+      -e "s|^cudaroot\s*=.*\$|cudaroot=${!outputDev:?}|" \
+      -e "s|^libdir\s*=.*/lib\$|libdir=${!outputLib:?}/lib|" \
+      -e "s|^includedir\s*=.*/include\$|includedir=${!outputInclude:?}/include|" \
+      "$pc"
+  done
+
+  for pc in "${NIX_BUILD_TOP:?}/${sourceRoot:?}"/share/pkgconfig/*-"${cudaMajorMinorVersion:?}.pc"; do
+    nixLog "creating unversioned symlink for $pc"
+    ln -s "$(basename "$pc")" "${pc%-"${cudaMajorMinorVersion:?}".pc}".pc
+  done
+
+  return 0
+}
+
+checkCudaFhsRefs() {
+  nixLog "checking for FHS references..."
+  local -a outputPaths=()
+  local firstMatches
+
+  mapfile -t outputPaths < <(for o in $(getAllOutputNames); do echo "${!o}"; done)
+  firstMatches="$(grep --max-count=5 --recursive --exclude=LICENSE /usr/ "${outputPaths[@]}")" || true
+  if [[ -n $firstMatches ]]; then
+    nixErrorLog "detected references to /usr: $firstMatches"
+    exit 1
+  fi
+
+  return 0
+}
+
+checkCudaNonEmptyOutputs() {
+  local output
+  local dirs
+  local -a failingOutputs=()
+
+  for output in $(getAllOutputNames); do
+    [[ ${!output:?} == "out" || ${!output:?} == "${!outputDev:?}" ]] && continue
+    dirs="$(find "${!output:?}" -mindepth 1 -maxdepth 1)" || true
+    if [[ -z $dirs || $dirs == "${!output:?}/nix-support" ]]; then
+      failingOutputs+=("$output")
+    fi
+  done
+
+  if ((${#failingOutputs[@]})); then
+    nixErrorLog "detected empty (excluding nix-support) outputs: ${failingOutputs[*]}"
+    nixErrorLog "this typically indicates a failure in packaging or moveToOutput ordering"
+    exit 1
+  fi
+
+  return 0
+}
+
+# TODO(@connorbaker): https://github.com/NixOS/nixpkgs/issues/323126.
+# _multioutPropagateDev() currently expects a space-separated string rather than an array.
+# NOTE: Because _multioutPropagateDev is a postFixup hook, we correct it in preFixup.
+fixupPropagatedBuildOutputsForMultipleOutputs() {
+  nixLog "converting propagatedBuildOutputs to a space-separated string"
+  # shellcheck disable=SC2124
+  export propagatedBuildOutputs="${propagatedBuildOutputs[@]}"
+  return 0
+}
+
+# The multiple outputs setup hook only propagates build outputs to dev.
+# We want to propagate them to out as well, in case the user interpolates
+# the package into a string -- in such a case, the dev output is not selected
+# and no propagation occurs.
+# NOTE: This must run in postFixup because fixupPhase nukes the propagated dependency files.
+fixupCudaPropagatedBuildOutputsToOut() {
+  local output
+
+  # The `out` output should largely be empty save for nix-support/propagated-build-inputs.
+  # In effect, this allows us to make `out` depend on all the other components.
+  # NOTE: It may have been deleted if it was empty, which is why we must recreate it.
+  mkdir -p "${out:?}/nix-support"
+
+  # NOTE: We must use printWords to ensure the output is a single line.
+  for output in $propagatedBuildOutputs; do
+    # Propagate the other components to the out output
+    nixLog "adding ${!output:?} to propagatedBuildInputs of ${out:?}"
+    printWords "${!output:?}" >>"${out:?}/nix-support/propagated-build-inputs"
+  done
+
+  return 0
+}
diff --git a/pkgs/development/cuda-modules/buildRedist/default.nix b/pkgs/development/cuda-modules/buildRedist/default.nix
new file mode 100644
index 000000000000..847830e17641
--- /dev/null
+++ b/pkgs/development/cuda-modules/buildRedist/default.nix
@@ -0,0 +1,480 @@
+# NOTE: buildRedist should never take manifests or fixups as callPackage-provided arguments,
+# since we want to provide the flexibility to call it directly with a different fixup or manifest.
+{
+  _cuda,
+  autoAddCudaCompatRunpath,
+  autoAddDriverRunpath,
+  autoPatchelfHook,
+  backendStdenv,
+  config,
+  cudaMajorMinorVersion,
+  cudaMajorVersion,
+  cudaNamePrefix,
+  fetchurl,
+  flags,
+  lib,
+  manifests,
+  markForCudatoolkitRootHook,
+  setupCudaHook,
+  srcOnly,
+  stdenv,
+}:
+let
+  inherit (backendStdenv) hostRedistSystem;
+  inherit (_cuda.lib) getNixSystems _mkCudaVariant mkRedistUrl;
+  inherit (lib.attrsets)
+    foldlAttrs
+    hasAttr
+    isAttrs
+    attrNames
+    optionalAttrs
+    ;
+  inherit (lib.customisation) extendMkDerivation;
+  inherit (lib.lists)
+    naturalSort
+    concatMap
+    unique
+    ;
+  inherit (lib.trivial) mapNullable pipe;
+  inherit (_cuda.lib) _mkMetaBadPlatforms _mkMetaBroken _redistSystemIsSupported;
+  inherit (lib)
+    licenses
+    sourceTypes
+    teams
+    ;
+  inherit (lib.asserts) assertMsg;
+  inherit (lib.lists)
+    elem
+    findFirst
+    findFirstIndex
+    foldl'
+    intersectLists
+    map
+    subtractLists
+    tail
+    ;
+  inherit (lib.strings)
+    concatMapStringsSep
+    toUpper
+    stringLength
+    substring
+    ;
+  inherit (lib.trivial) flip;
+
+  mkOutputNameVar =
+    output:
+    assert assertMsg (output != "") "mkOutputNameVar: output name variable must not be empty";
+    "output" + toUpper (substring 0 1 output) + substring 1 (stringLength output - 1) output;
+
+  getSupportedReleases =
+    let
+      desiredCudaVariant = _mkCudaVariant cudaMajorVersion;
+    in
+    release:
+    # Always show preference to the "source", then "linux-all" redistSystem if they are available, as they are
+    # the most general.
+    if release ? source then
+      {
+        inherit (release) source;
+      }
+    else if release ? linux-all then
+      {
+        inherit (release) linux-all;
+      }
+    else
+      let
+        hasCudaVariants = release ? cuda_variant;
+      in
+      foldlAttrs (
+        acc: name: value:
+        acc
+        # If the value is an attribute, and when hasCudaVariants is true it has the relevant CUDA variant,
+        # then add it to the set.
+        // optionalAttrs (isAttrs value && (hasCudaVariants -> hasAttr desiredCudaVariant value)) {
+          ${name} = value.${desiredCudaVariant} or value;
+        }
+      ) { } release;
+
+  getPreferredRelease =
+    supportedReleases:
+    supportedReleases.source or supportedReleases.linux-all or supportedReleases.${hostRedistSystem}
+      or null;
+in
+extendMkDerivation {
+  constructDrv = backendStdenv.mkDerivation;
+  # These attributes are moved to passthru to avoid changing derivation hashes.
+  excludeDrvArgNames = [
+    # Core
+    "redistName"
+    "release"
+
+    # Misc
+    "brokenAssertions"
+    "platformAssertions"
+    "expectedOutputs"
+    "outputToPatterns"
+    "outputNameVarFallbacks"
+  ];
+  extendDrvArgs =
+    finalAttrs:
+    {
+      # Core
+      redistName,
+      pname,
+      release ? manifests.${finalAttrs.passthru.redistName}.${finalAttrs.pname} or null,
+
+      # Outputs
+      outputs ? [ "out" ],
+      propagatedBuildOutputs ? [ ],
+
+      # Inputs
+      nativeBuildInputs ? [ ],
+      propagatedBuildInputs ? [ ],
+      buildInputs ? [ ],
+
+      # Checking
+      doInstallCheck ? true,
+      allowFHSReferences ? false,
+
+      # Fixups
+      appendRunpaths ? [ ],
+
+      # Extra
+      passthru ? { },
+      meta ? { },
+
+      # Misc
+      brokenAssertions ? [ ],
+      platformAssertions ? [ ],
+
+      # Order is important here so we use a list.
+      expectedOutputs ? [
+        "out"
+        "doc"
+        "samples"
+        "python"
+        "bin"
+        "dev"
+        "include"
+        "lib"
+        "static"
+        "stubs"
+      ],
+
+      # Traversed in the order of the outputs speficied in outputs;
+      # entries are skipped if they don't exist in outputs.
+      # NOTE: The nil LSP gets angry if we do not parenthesize the default attrset.
+      outputToPatterns ? {
+        bin = [ "bin" ];
+        dev = [
+          "**/*.pc"
+          "**/*.cmake"
+        ];
+        include = [ "include" ];
+        lib = [
+          "lib"
+          "lib64"
+        ];
+        static = [ "**/*.a" ];
+        samples = [ "samples" ];
+        python = [ "**/*.whl" ];
+        stubs = [
+          "stubs"
+          "lib/stubs"
+        ];
+      },
+
+      # Defines a list of fallbacks for each potential output.
+      # The last fallback is the out output.
+      # Taken and modified from:
+      # https://github.com/NixOS/nixpkgs/blob/fe5e11faed6241aacf7220436088789287507494/pkgs/build-support/setup-hooks/multiple-outputs.sh#L45-L62
+      outputNameVarFallbacks ? {
+        outputBin = [ "bin" ];
+        outputDev = [ "dev" ];
+        outputDoc = [ "doc" ];
+        outputInclude = [
+          "include"
+          "dev"
+        ];
+        outputLib = [ "lib" ];
+        outputOut = [ "out" ];
+        outputPython = [ "python" ];
+        outputSamples = [ "samples" ];
+        outputStatic = [ "static" ];
+        outputStubs = [ "stubs" ];
+      },
+      ...
+    }:
+    {
+      __structuredAttrs = true;
+      strictDeps = true;
+
+      # NOTE: `release` may be null if a redistributable isn't available.
+      version = finalAttrs.passthru.release.version or "0-unsupported";
+
+      # Name should be prefixed by cudaNamePrefix to create more descriptive path names.
+      name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
+
+      # We should only have the output `out` when `src` is null.
+      # lists.intersectLists iterates over the second list, checking if the elements are in the first list.
+      # As such, the order of the output is dictated by the order of the second list.
+      outputs =
+        if finalAttrs.src == null then
+          [ "out" ]
+        else
+          intersectLists outputs finalAttrs.passthru.expectedOutputs;
+
+      # NOTE: Because the `dev` output is special in Nixpkgs -- make-derivation.nix uses it as the default if
+      # it is present -- we must ensure that it brings in the expected dependencies. For us, this means that `dev`
+      # should include `bin`, `include`, and `lib` -- `static` is notably absent because it is quite large.
+      # We do not include `stubs`, as a number of packages contain stubs for libraries they already ship with!
+      # Only a few, like cuda_cudart, actually provide stubs for libraries we're missing.
+      # As such, these packages should override propagatedBuildOutputs to add `stubs`.
+      propagatedBuildOutputs =
+        intersectLists [
+          "bin"
+          "include"
+          "lib"
+        ] finalAttrs.outputs
+        ++ propagatedBuildOutputs;
+
+      # src :: null | Derivation
+      src = mapNullable (
+        { relative_path, sha256, ... }:
+        srcOnly {
+          __structuredAttrs = true;
+          strictDeps = true;
+          stdenv = backendStdenv;
+          inherit (finalAttrs) pname version;
+          src = fetchurl {
+            url = mkRedistUrl finalAttrs.passthru.redistName relative_path;
+            inherit sha256;
+          };
+        }
+      ) (getPreferredRelease finalAttrs.passthru.supportedReleases);
+
+      # Required for the hook.
+      inherit cudaMajorMinorVersion cudaMajorVersion;
+
+      # We do need some other phases, like configurePhase, so the multiple-output setup hook works.
+      dontBuild = true;
+
+      nativeBuildInputs = [
+        ./buildRedistHook.bash
+        autoPatchelfHook
+        # This hook will make sure libcuda can be found
+        # in typically /lib/opengl-driver by adding that
+        # directory to the rpath of all ELF binaries.
+        # Check e.g. with `patchelf --print-rpath path/to/my/binary
+        autoAddDriverRunpath
+        markForCudatoolkitRootHook
+      ]
+      # autoAddCudaCompatRunpath depends on cuda_compat and would cause
+      # infinite recursion if applied to `cuda_compat` itself (beside the fact
+      # that it doesn't make sense in the first place)
+      ++ lib.optionals (finalAttrs.pname != "cuda_compat" && flags.isJetsonBuild) [
+        # autoAddCudaCompatRunpath must appear AFTER autoAddDriverRunpath.
+        # See its documentation in ./setup-hooks/extension.nix.
+        autoAddCudaCompatRunpath
+      ]
+      ++ nativeBuildInputs;
+
+      propagatedBuildInputs = [ setupCudaHook ] ++ propagatedBuildInputs;
+
+      buildInputs = [
+        # autoPatchelfHook will search for a libstdc++ and we're giving it
+        # one that is compatible with the rest of nixpkgs, even when
+        # nvcc forces us to use an older gcc
+        # NB: We don't actually know if this is the right thing to do
+        # NOTE: Not all packages actually need this, but it's easier to just add it than create overrides for nearly all
+        # of them.
+        (lib.getLib stdenv.cc.cc)
+      ]
+      ++ buildInputs;
+
+      # Picked up by autoPatchelf
+      # Needed e.g. for libnvrtc to locate (dlopen) libnvrtc-builtins
+      appendRunpaths = [ "$ORIGIN" ] ++ appendRunpaths;
+
+      # NOTE: We don't need to check for dev or doc, because those outputs are handled by
+      # the multiple-outputs setup hook.
+      # NOTE: moveToOutput operates on all outputs:
+      # https://github.com/NixOS/nixpkgs/blob/2920b6fc16a9ed5d51429e94238b28306ceda79e/pkgs/build-support/setup-hooks/multiple-outputs.sh#L105-L107
+      # NOTE: installPhase is not moved into the builder hook because we do a lot of Nix templating.
+      installPhase =
+        let
+          mkMoveToOutputCommand =
+            output:
+            let
+              template = pattern: ''
+                moveToOutput "${pattern}" "${"$" + output}"
+              '';
+              patterns = finalAttrs.passthru.outputToPatterns.${output} or [ ];
+            in
+            concatMapStringsSep "\n" template patterns;
+        in
+        # Pre-install hook
+        ''
+          runHook preInstall
+        ''
+        # Create the primary output, out, and move the other outputs into it.
+        + ''
+          mkdir -p "$out"
+          nixLog "moving tree to output out"
+          mv * "$out"
+        ''
+        # Move the outputs into their respective outputs.
+        + ''
+          ${concatMapStringsSep "\n" mkMoveToOutputCommand (tail finalAttrs.outputs)}
+        ''
+        # Post-install hook
+        + ''
+          runHook postInstall
+        '';
+
+      inherit doInstallCheck;
+      inherit allowFHSReferences;
+
+      passthru = passthru // {
+        inherit redistName release;
+
+        supportedReleases =
+          passthru.supportedReleases
+            # NOTE: `release` may be null, so we must use `lib.defaultTo`
+            or (getSupportedReleases (lib.defaultTo { } finalAttrs.passthru.release));
+
+        supportedNixSystems =
+          passthru.supportedNixSystems or (pipe finalAttrs.passthru.supportedReleases [
+            attrNames
+            (concatMap getNixSystems)
+            naturalSort
+            unique
+          ]);
+
+        supportedRedistSystems =
+          passthru.supportedRedistSystems or (naturalSort (attrNames finalAttrs.passthru.supportedReleases));
+
+        # NOTE: Downstream may expand this to include other outputs, but they must remember to set the appropriate
+        # outputNameVarFallbacks!
+        inherit expectedOutputs;
+
+        # Traversed in the order of the outputs speficied in outputs;
+        # entries are skipped if they don't exist in outputs.
+        inherit outputToPatterns;
+
+        # Defines a list of fallbacks for each potential output.
+        # The last fallback is the out output.
+        # Taken and modified from:
+        # https://github.com/NixOS/nixpkgs/blob/fe5e11faed6241aacf7220436088789287507494/pkgs/build-support/setup-hooks/multiple-outputs.sh#L45-L62
+        inherit outputNameVarFallbacks;
+
+        # brokenAssertions :: [Attrs]
+        # Used by mkMetaBroken to set `meta.broken`.
+        # Example: Broken on a specific version of CUDA or when a dependency has a specific version.
+        # NOTE: Do not use this when a broken assertion means evaluation will fail! For example, if
+        # a package is missing and is required for the build -- that should go in platformAssertions,
+        # because attempts to access attributes on the package will cause evaluation errors.
+        brokenAssertions = [
+          {
+            message = "CUDA support is enabled by config.cudaSupport";
+            assertion = config.cudaSupport;
+          }
+          {
+            message = "lib output precedes static output";
+            assertion =
+              let
+                libIndex = findFirstIndex (x: x == "lib") null finalAttrs.outputs;
+                staticIndex = findFirstIndex (x: x == "static") null finalAttrs.outputs;
+              in
+              libIndex == null || staticIndex == null || libIndex < staticIndex;
+          }
+          {
+            # NOTE: We cannot (easily) check that all expected outputs have a corresponding outputNameVar attribute in
+            # finalAttrs because of the presence of attributes which use the "output" prefix but are not outputNameVars
+            # (e.g., outputChecks and outputName).
+            message = "outputNameVarFallbacks is a super set of expectedOutputs";
+            assertion =
+              subtractLists (map mkOutputNameVar finalAttrs.passthru.expectedOutputs) (
+                attrNames finalAttrs.passthru.outputNameVarFallbacks
+              ) == [ ];
+          }
+          {
+            message = "outputToPatterns is a super set of expectedOutputs";
+            assertion =
+              subtractLists finalAttrs.passthru.expectedOutputs (attrNames finalAttrs.passthru.outputToPatterns)
+              == [ ];
+          }
+          {
+            message = "propagatedBuildOutputs is a subset of outputs";
+            assertion = subtractLists finalAttrs.outputs finalAttrs.propagatedBuildOutputs == [ ];
+          }
+        ]
+        ++ brokenAssertions;
+
+        # platformAssertions :: [Attrs]
+        # Used by mkMetaBadPlatforms to set `meta.badPlatforms`.
+        # Example: Broken on a specific system when some condition is met, like targeting Jetson or
+        # a required package missing.
+        # NOTE: Use this when a failed assertion means evaluation can fail!
+        platformAssertions =
+          let
+            isSupportedRedistSystem = _redistSystemIsSupported hostRedistSystem finalAttrs.passthru.supportedRedistSystems;
+          in
+          [
+            {
+              message = "src is null if and only if hostRedistSystem is unsupported";
+              assertion = (finalAttrs.src == null) == !isSupportedRedistSystem;
+            }
+            {
+              message = "hostRedistSystem (${hostRedistSystem}) is supported (${builtins.toJSON finalAttrs.passthru.supportedRedistSystems})";
+              assertion = isSupportedRedistSystem;
+            }
+          ]
+          ++ platformAssertions;
+      };
+
+      meta = meta // {
+        longDescription = meta.longDescription or "" + ''
+          By downloading and using this package you accept the terms and conditions of the associated license(s).
+        '';
+        sourceProvenance = meta.sourceProvenance or [ sourceTypes.binaryNativeCode ];
+        platforms = finalAttrs.passthru.supportedNixSystems;
+        broken = _mkMetaBroken (!(config.inHydra or false)) finalAttrs;
+        badPlatforms = _mkMetaBadPlatforms (!(config.inHydra or false)) finalAttrs;
+        downloadPage =
+          meta.downloadPage
+            or "https://developer.download.nvidia.com/compute/${finalAttrs.passthru.redistName}/redist/${finalAttrs.pname}";
+        # NOTE:
+        #   Every redistributable should set its own license; since that's a lot of manual work, we default to
+        #   nvidiaCudaRedist if the redistributable is from the CUDA redistributables and nvidiaCuda otherwise.
+        #   Despite calling them "redistributable" and the download URL containing "redist", a number of these
+        #   packages are not licensed such that redistribution is allowed.
+        license =
+          if meta ? license then
+            lib.toList meta.license
+          else if finalAttrs.passthru.redistName == "cuda" then
+            [ licenses.nvidiaCudaRedist ]
+          else
+            [ licenses.nvidiaCuda ];
+        teams = meta.teams or [ ] ++ [ teams.cuda ];
+      };
+    }
+    # Setup the outputNameVar variables to gracefully handle missing outputs.
+    # NOTE: We cannot use expectedOutputs from finalAttrs.passthru because we will infinitely recurse: presence of
+    # attributes in finalAttrs cannot depend on finalAttrs.
+    // foldl' (
+      acc: output:
+      let
+        outputNameVar = mkOutputNameVar output;
+      in
+      acc
+      // {
+        ${outputNameVar} =
+          findFirst (flip elem finalAttrs.outputs) "out"
+            finalAttrs.passthru.outputNameVarFallbacks.${outputNameVar};
+      }
+    ) { } expectedOutputs;
+
+  # Don't inherit any of stdenv.mkDerivation's arguments.
+  inheritFunctionArgs = false;
+}

From 29ce0536172258b788030698d1b9f06736fbf23e Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 17:09:41 +0000
Subject: [PATCH 1751/6226] cudaPackages: build redists from manifests

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/README.md       |   57 +-
 .../cuda-modules/_cuda/db/bootstrap/nvcc.nix  |    2 +-
 .../cuda-modules/_cuda/default.nix            |    8 +-
 .../cuda-modules/_cuda/fixups/cuda_compat.nix |   12 -
 .../cuda-modules/_cuda/fixups/cuda_cudart.nix |   37 -
 .../_cuda/fixups/cuda_demo_suite.nix          |   18 -
 .../cuda-modules/_cuda/fixups/cuda_gdb.nix    |   35 -
 .../cuda-modules/_cuda/fixups/cuda_nvcc.nix   |   62 -
 .../cuda-modules/_cuda/fixups/cuda_nvprof.nix |    1 -
 .../_cuda/fixups/cuda_sanitizer_api.nix       |    1 -
 .../cuda-modules/_cuda/fixups/cudnn.nix       |   75 -
 .../cuda-modules/_cuda/fixups/default.nix     |   11 -
 .../_cuda/fixups/driver_assistant.nix         |    5 -
 .../_cuda/fixups/fabricmanager.nix            |    1 -
 .../cuda-modules/_cuda/fixups/imex.nix        |    1 -
 .../cuda-modules/_cuda/fixups/libcufile.nix   |   12 -
 .../cuda-modules/_cuda/fixups/libcusolver.nix |   19 -
 .../cuda-modules/_cuda/fixups/libcusparse.nix |   12 -
 .../_cuda/fixups/libcusparse_lt.nix           |   23 -
 .../cuda-modules/_cuda/fixups/libcutensor.nix |   23 -
 .../_cuda/fixups/nsight_compute.nix           |   86 -
 .../_cuda/fixups/nsight_systems.nix           |  136 --
 .../_cuda/fixups/nvidia_driver.nix            |    5 -
 .../cuda-modules/_cuda/fixups/tensorrt.nix    |  127 --
 .../_cuda/manifests/cuda/README.md            |    5 +
 .../manifests/cuda}/redistrib_12.6.3.json     |    0
 .../manifests/cuda}/redistrib_12.8.1.json     |    0
 .../manifests/cuda/redistrib_12.9.1.json      | 1151 +++++++++++++
 .../_cuda/manifests/cudnn/README.md           |    8 +
 .../manifests/cudnn/redistrib_8.9.5.json      |  139 ++
 .../manifests/cudnn/redistrib_8.9.7.json      |  123 ++
 .../manifests/cudnn/redistrib_9.8.0.json      |   77 +
 .../_cuda/manifests/cusparselt/README.md      |    7 +
 .../manifests/cusparselt/redistrib_0.6.3.json |   35 +
 .../cusparselt}/redistrib_0.7.1.json          |    0
 .../_cuda/manifests/cutensor/README.md        |    5 +
 .../manifests/cutensor/redistrib_2.2.0.json   |   29 +
 .../cuda-modules/_cuda/manifests/default.nix  |   19 +
 .../_cuda/manifests/tensorrt/README.md        |   30 +
 .../_cuda/manifests/tensorrt/helper.sh        |  130 ++
 .../manifests/tensorrt/redistrib_10.7.0.json  |   37 +
 .../manifests/tensorrt/redistrib_10.9.0.json  |   29 +
 pkgs/development/cuda-modules/aliases.nix     |    4 +
 .../cuda-library-samples/extension.nix        |   16 -
 .../cuda-modules/cuda/extension.nix           |   70 -
 .../cuda/manifests/feature_12.6.3.json        | 1386 ---------------
 .../cuda/manifests/feature_12.8.1.json        | 1410 ---------------
 .../cuda/manifests/feature_12.9.1.json        | 1520 -----------------
 .../cuda/manifests/redistrib_12.9.1.json      | 1151 -------------
 .../cuda-modules/cudnn/releases.nix           |  112 --
 pkgs/development/cuda-modules/cudnn/shims.nix |   21 -
 .../cuda-modules/cusparselt/extension.nix     |   96 --
 .../cusparselt/manifests/feature_0.7.1.json   |   44 -
 .../cuda-modules/cutensor/extension.nix       |  124 --
 .../cutensor/manifests/feature_2.0.2.json     |   44 -
 .../cutensor/manifests/feature_2.1.0.json     |   34 -
 .../cutensor/manifests/redistrib_2.0.2.json   |   35 -
 .../cutensor/manifests/redistrib_2.1.0.json   |   29 -
 pkgs/development/cuda-modules/default.nix     |  152 ++
 .../cuda-modules/packages/README.md           |   19 +
 .../cuda-modules/packages/backendStdenv.nix   |  102 +-
 .../cuda-modules/packages/cuda-samples.nix    |  220 +++
 .../cuda-modules/packages/cuda_cccl.nix       |   34 +
 .../cuda-modules/packages/cuda_compat.nix     |   20 +
 .../cuda-modules/packages/cuda_crt.nix        |   27 +
 .../cuda-modules/packages/cuda_cudart.nix     |   98 ++
 .../cuda-modules/packages/cuda_cuobjdump.nix  |   17 +
 .../cuda-modules/packages/cuda_cupti.nix      |   30 +
 .../cuda-modules/packages/cuda_cuxxfilt.nix   |   21 +
 .../cuda-modules/packages/cuda_demo_suite.nix |   33 +
 .../packages/cuda_documentation.nix           |   14 +
 .../cuda-modules/packages/cuda_gdb.nix        |   71 +
 .../cuda-modules/packages/cuda_nsight.nix     |   19 +
 .../cuda-modules/packages/cuda_nvcc.nix       |  175 ++
 .../cuda-modules/packages/cuda_nvdisasm.nix   |   18 +
 .../cuda-modules/packages/cuda_nvml_dev.nix   |   47 +
 .../cuda-modules/packages/cuda_nvprof.nix     |   36 +
 .../cuda-modules/packages/cuda_nvprune.nix    |   15 +
 .../cuda-modules/packages/cuda_nvrtc.nix      |   25 +
 .../cuda-modules/packages/cuda_nvtx.nix       |   23 +
 .../cuda-modules/packages/cuda_nvvp.nix       |   18 +
 .../cuda-modules/packages/cuda_opencl.nix     |   22 +
 .../packages/cuda_profiler_api.nix            |   13 +
 .../packages/cuda_sandbox_dev.nix             |    6 +
 .../packages/cuda_sanitizer_api.nix           |   18 +
 .../cudatoolkit.nix}                          |    5 +-
 .../packages/cudnn-frontend/package.nix       |   20 +-
 .../cuda-modules/packages/cudnn.nix           |   77 +
 .../cuda-modules/packages/cudnn_8_9.nix       |   14 +
 .../packages/driver_assistant.nix             |   14 +
 .../cuda-modules/packages/fabricmanager.nix   |   19 +
 .../cuda-modules/packages/imex.nix            |   16 +
 .../cuda-modules/packages/libcublas.nix       |   22 +
 .../cuda-modules/packages/libcudla.nix        |   21 +
 .../cuda-modules/packages/libcufft.nix        |   19 +
 .../cuda-modules/packages/libcufile.nix       |   32 +
 .../cuda-modules/packages/libcurand.nix       |   24 +
 .../cuda-modules/packages/libcusolver.nix     |   36 +
 .../cuda-modules/packages/libcusparse.nix     |   26 +
 .../cuda-modules/packages/libcusparse_lt.nix  |   38 +
 .../cuda-modules/packages/libcutensor.nix     |   42 +
 .../cuda-modules/packages/libnpp.nix          |   23 +
 .../cuda-modules/packages/libnvfatbin.nix     |   12 +
 .../cuda-modules/packages/libnvidia_nscq.nix  |   12 +
 .../cuda-modules/packages/libnvjitlink.nix    |   19 +
 .../cuda-modules/packages/libnvjpeg.nix       |   23 +
 .../cuda-modules/packages/libnvsdm.nix        |   16 +
 .../cuda-modules/packages/libnvvm.nix         |   25 +
 .../cuda-modules/packages/nccl-tests.nix      |   89 +-
 .../cuda-modules/packages/nccl.nix            |   92 +-
 .../cuda-modules/packages/nsight_compute.nix  |  103 ++
 .../cuda-modules/packages/nsight_systems.nix  |  147 ++
 .../cuda-modules/packages/nvidia_driver.nix   |   14 +
 .../cuda-modules/packages/nvidia_fs.nix       |   19 +
 .../cuda-modules/packages/saxpy/package.nix   |   43 +-
 .../cuda-modules/packages/tensorrt.nix        |  161 ++
 .../tests/cuda-library-samples.nix}           |   41 +-
 .../{ => packages}/tests/flags.nix            |    0
 .../tests/opencv-and-torch/package.nix        |  122 ++
 .../cuda-modules/tensorrt/releases.nix        |   50 -
 .../cuda-modules/tensorrt/shims.nix           |   24 -
 .../tests/opencv-and-torch/default.nix        |   81 -
 pkgs/top-level/all-packages.nix               |   11 +-
 pkgs/top-level/cuda-packages.nix              |  261 +--
 124 files changed, 4449 insertions(+), 7346 deletions(-)
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/cuda_compat.nix
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/cuda_cudart.nix
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/cuda_demo_suite.nix
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/cuda_gdb.nix
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/cuda_nvcc.nix
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/cuda_nvprof.nix
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/cuda_sanitizer_api.nix
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/cudnn.nix
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/default.nix
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/driver_assistant.nix
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/fabricmanager.nix
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/imex.nix
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/libcufile.nix
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/libcusolver.nix
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/libcusparse.nix
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/libcusparse_lt.nix
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/libcutensor.nix
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/nvidia_driver.nix
 delete mode 100644 pkgs/development/cuda-modules/_cuda/fixups/tensorrt.nix
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cuda/README.md
 rename pkgs/development/cuda-modules/{cuda/manifests => _cuda/manifests/cuda}/redistrib_12.6.3.json (100%)
 rename pkgs/development/cuda-modules/{cuda/manifests => _cuda/manifests/cuda}/redistrib_12.8.1.json (100%)
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_12.9.1.json
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cudnn/README.md
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_8.9.5.json
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_8.9.7.json
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_9.8.0.json
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cusparselt/README.md
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cusparselt/redistrib_0.6.3.json
 rename pkgs/development/cuda-modules/{cusparselt/manifests => _cuda/manifests/cusparselt}/redistrib_0.7.1.json (100%)
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cutensor/README.md
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cutensor/redistrib_2.2.0.json
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/default.nix
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/tensorrt/README.md
 create mode 100755 pkgs/development/cuda-modules/_cuda/manifests/tensorrt/helper.sh
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.7.0.json
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.9.0.json
 delete mode 100644 pkgs/development/cuda-modules/cuda-library-samples/extension.nix
 delete mode 100644 pkgs/development/cuda-modules/cuda/extension.nix
 delete mode 100644 pkgs/development/cuda-modules/cuda/manifests/feature_12.6.3.json
 delete mode 100644 pkgs/development/cuda-modules/cuda/manifests/feature_12.8.1.json
 delete mode 100644 pkgs/development/cuda-modules/cuda/manifests/feature_12.9.1.json
 delete mode 100644 pkgs/development/cuda-modules/cuda/manifests/redistrib_12.9.1.json
 delete mode 100644 pkgs/development/cuda-modules/cudnn/releases.nix
 delete mode 100644 pkgs/development/cuda-modules/cudnn/shims.nix
 delete mode 100644 pkgs/development/cuda-modules/cusparselt/extension.nix
 delete mode 100644 pkgs/development/cuda-modules/cusparselt/manifests/feature_0.7.1.json
 delete mode 100644 pkgs/development/cuda-modules/cutensor/extension.nix
 delete mode 100644 pkgs/development/cuda-modules/cutensor/manifests/feature_2.0.2.json
 delete mode 100644 pkgs/development/cuda-modules/cutensor/manifests/feature_2.1.0.json
 delete mode 100644 pkgs/development/cuda-modules/cutensor/manifests/redistrib_2.0.2.json
 delete mode 100644 pkgs/development/cuda-modules/cutensor/manifests/redistrib_2.1.0.json
 create mode 100644 pkgs/development/cuda-modules/default.nix
 create mode 100644 pkgs/development/cuda-modules/packages/README.md
 create mode 100644 pkgs/development/cuda-modules/packages/cuda-samples.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_cccl.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_compat.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_crt.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_cudart.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_cuobjdump.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_cupti.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_cuxxfilt.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_demo_suite.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_documentation.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_gdb.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_nsight.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_nvcc.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_nvdisasm.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_nvml_dev.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_nvprof.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_nvprune.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_nvrtc.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_nvtx.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_nvvp.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_opencl.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_profiler_api.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_sandbox_dev.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_sanitizer_api.nix
 rename pkgs/development/cuda-modules/{cudatoolkit/redist-wrapper.nix => packages/cudatoolkit.nix} (94%)
 create mode 100644 pkgs/development/cuda-modules/packages/cudnn.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cudnn_8_9.nix
 create mode 100644 pkgs/development/cuda-modules/packages/driver_assistant.nix
 create mode 100644 pkgs/development/cuda-modules/packages/fabricmanager.nix
 create mode 100644 pkgs/development/cuda-modules/packages/imex.nix
 create mode 100644 pkgs/development/cuda-modules/packages/libcublas.nix
 create mode 100644 pkgs/development/cuda-modules/packages/libcudla.nix
 create mode 100644 pkgs/development/cuda-modules/packages/libcufft.nix
 create mode 100644 pkgs/development/cuda-modules/packages/libcufile.nix
 create mode 100644 pkgs/development/cuda-modules/packages/libcurand.nix
 create mode 100644 pkgs/development/cuda-modules/packages/libcusolver.nix
 create mode 100644 pkgs/development/cuda-modules/packages/libcusparse.nix
 create mode 100644 pkgs/development/cuda-modules/packages/libcusparse_lt.nix
 create mode 100644 pkgs/development/cuda-modules/packages/libcutensor.nix
 create mode 100644 pkgs/development/cuda-modules/packages/libnpp.nix
 create mode 100644 pkgs/development/cuda-modules/packages/libnvfatbin.nix
 create mode 100644 pkgs/development/cuda-modules/packages/libnvidia_nscq.nix
 create mode 100644 pkgs/development/cuda-modules/packages/libnvjitlink.nix
 create mode 100644 pkgs/development/cuda-modules/packages/libnvjpeg.nix
 create mode 100644 pkgs/development/cuda-modules/packages/libnvsdm.nix
 create mode 100644 pkgs/development/cuda-modules/packages/libnvvm.nix
 create mode 100644 pkgs/development/cuda-modules/packages/nsight_compute.nix
 create mode 100644 pkgs/development/cuda-modules/packages/nsight_systems.nix
 create mode 100644 pkgs/development/cuda-modules/packages/nvidia_driver.nix
 create mode 100644 pkgs/development/cuda-modules/packages/nvidia_fs.nix
 create mode 100644 pkgs/development/cuda-modules/packages/tensorrt.nix
 rename pkgs/development/cuda-modules/{cuda-library-samples/generic.nix => packages/tests/cuda-library-samples.nix} (79%)
 rename pkgs/development/cuda-modules/{ => packages}/tests/flags.nix (100%)
 create mode 100644 pkgs/development/cuda-modules/packages/tests/opencv-and-torch/package.nix
 delete mode 100644 pkgs/development/cuda-modules/tensorrt/releases.nix
 delete mode 100644 pkgs/development/cuda-modules/tensorrt/shims.nix
 delete mode 100644 pkgs/development/cuda-modules/tests/opencv-and-torch/default.nix

diff --git a/pkgs/development/cuda-modules/README.md b/pkgs/development/cuda-modules/README.md
index 8d450302a45d..393b6ccfaa5e 100644
--- a/pkgs/development/cuda-modules/README.md
+++ b/pkgs/development/cuda-modules/README.md
@@ -10,39 +10,40 @@ package set by [cuda-packages.nix](../../top-level/cuda-packages.nix).
 
 ## Top-level directories
 
-- `cuda`: CUDA redistributables! Provides extension to `cudaPackages` scope.
-- `cudatoolkit`: monolithic CUDA Toolkit run-file installer. Provides extension
-    to `cudaPackages` scope.
-- `cudnn`: NVIDIA cuDNN library.
-- `cutensor`: NVIDIA cuTENSOR library.
-- `fixups`: Each file or directory (excluding `default.nix`) should contain a
-    `callPackage`-able expression to be provided to the `overrideAttrs` attribute
-    of a package produced by the generic manifest builder.
-    These fixups are applied by `pname`, so packages with multiple versions
-    (e.g., `cudnn`, `cudnn_8_9`, etc.) all share a single fixup function
-    (i.e., `fixups/cudnn.nix`).
-- `generic-builders`:
-  - Contains a builder `manifest.nix` which operates on the `Manifest` type
-      defined in `modules/generic/manifests`. Most packages are built using this
-      builder.
-  - Contains a builder `multiplex.nix` which leverages the Manifest builder. In
-      short, the Multiplex builder adds multiple versions of a single package to
-      single instance of the CUDA Packages package set. It is used primarily for
-      packages like `cudnn` and `cutensor`.
-- `modules`: Nixpkgs modules to check the shape and content of CUDA
-    redistributable and feature manifests. These modules additionally use shims
-    provided by some CUDA packages to allow them to re-use the
-    `genericManifestBuilder`, even if they don't have manifest files of their
-    own. `cudnn` and `tensorrt` are examples of packages which provide such
-    shims. These modules are further described in the
-    [Modules](./modules/README.md) documentation.
+- `_cuda`: Fixed-point used to configure, construct, and extend the CUDA package
+    set. This includes NVIDIA manifests.
+- `buildRedist`: Contains the logic to build packages using NVIDIA's manifests.
 - `packages`: Contains packages which exist in every instance of the CUDA
     package set. These packages are built in a `by-name` fashion.
-- `setup-hooks`: Nixpkgs setup hooks for CUDA.
-- `tensorrt`: NVIDIA TensorRT library.
+- `tests`: Contains tests which can be run against the CUDA package set.
+
+Many redistributable packages are in the `packages` directory. Their presence
+ensures that, even if a CUDA package set which no longer includes a given package
+is being constructed, the attribute for that package will still exist (but refer
+to a broken package). This prevents missing attribute errors as the package set
+evolves.
 
 ## Distinguished packages
 
+Some packages are purposefully not in the `packages` directory. These are packages
+which do not make sense for Nixpkgs, require further investigation, or are otherwise
+not straightforward to include. These packages are:
+
+- `cuda`:
+  - `collectx_bringup`: missing `libssl.so.1.1` and `libcrypto.so.1.1`; not sure how
+    to provide them or what the package does.
+  - `cuda_sandbox_dev`: unclear on purpose.
+  - `driver_assistant`: we don't use the drivers from the CUDA releases; irrelevant.
+  - `mft_autocomplete`: unsure of purpose; contains FHS paths.
+  - `mft_oem`: unsure of purpose; contains FHS paths.
+  - `mft`: unsure of purpose; contains FHS paths.
+  - `nvidia_driver`: we don't use the drivers from the CUDA releases; irrelevant.
+  - `nvlsm`: contains FHS paths.
+- `cublasmp`:
+  - `libcublasmp`: `nvshmem` isnt' packaged.
+- `cudnn`:
+  - `cudnn_samples`: requires FreeImage, which is abandoned and not packaged.
+
 ### CUDA Compatibility
 
 [CUDA Compatibility](https://docs.nvidia.com/deploy/cuda-compatibility/),
diff --git a/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix b/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
index 76704f9c5c65..bd4477cc2914 100644
--- a/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
+++ b/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
@@ -55,7 +55,7 @@
     };
 
     # No changes from 12.8 to 12.9
-    # https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#host-compiler-support-policy
+    # https://docs.nvidia.com/cuda/archive/12.9.1/cuda-installation-guide-linux/index.html#host-compiler-support-policy
     "12.9" = {
       clang = {
         maxMajorVersion = "19";
diff --git a/pkgs/development/cuda-modules/_cuda/default.nix b/pkgs/development/cuda-modules/_cuda/default.nix
index fdbac3c8fbd7..9f7fe75ecfa5 100644
--- a/pkgs/development/cuda-modules/_cuda/default.nix
+++ b/pkgs/development/cuda-modules/_cuda/default.nix
@@ -1,9 +1,7 @@
 # The _cuda attribute set is a fixed-point which contains the static functionality required to construct CUDA package
 # sets. For example, `_cuda.bootstrapData` includes information about NVIDIA's redistributables (such as the names
-# NVIDIA uses for different systems), `_cuda.lib` contains utility functions like `formatCapabilities` (which generate
-# common arguments passed to NVCC and `cmakeFlags`), and `_cuda.fixups` contains `callPackage`-able functions which
-# are provided to the corresponding package's `overrideAttrs` attribute to provide package-specific fixups
-# out of scope of the generic redistributable builder.
+# NVIDIA uses for different systems), and `_cuda.lib` contains utility functions like `formatCapabilities` (which generate
+# common arguments passed to NVCC and `cmakeFlags`).
 #
 # Since this attribute set is used to construct the CUDA package sets, it must exist outside the fixed point of the
 # package sets. Make these attributes available directly in the package set construction could cause confusion if
@@ -23,7 +21,7 @@ lib.fixedPoints.makeExtensible (final: {
     inherit lib;
   };
   extensions = [ ]; # Extensions applied to every CUDA package set.
-  fixups = import ./fixups { inherit lib; };
+  manifests = import ./manifests { inherit lib; };
   lib = import ./lib {
     _cuda = final;
     inherit lib;
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cuda_compat.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_compat.nix
deleted file mode 100644
index 1f5736ba059a..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/cuda_compat.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ flags, lib }:
-prevAttrs: {
-  autoPatchelfIgnoreMissingDeps = prevAttrs.autoPatchelfIgnoreMissingDeps or [ ] ++ [
-    "libnvrm_gpu.so"
-    "libnvrm_mem.so"
-    "libnvdla_runtime.so"
-  ];
-  # `cuda_compat` only works on aarch64-linux, and only when building for Jetson devices.
-  badPlatformsConditions = prevAttrs.badPlatformsConditions or { } // {
-    "Trying to use cuda_compat on aarch64-linux targeting non-Jetson devices" = !flags.isJetsonBuild;
-  };
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cuda_cudart.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_cudart.nix
deleted file mode 100644
index d95b014cdca6..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/cuda_cudart.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-# TODO(@connorbaker): cuda_cudart.dev depends on crt/host_config.h, which is from
-# (getDev cuda_nvcc). It would be nice to be able to encode that.
-{ addDriverRunpath, lib }:
-prevAttrs: {
-  # Remove once cuda-find-redist-features has a special case for libcuda
-  outputs =
-    prevAttrs.outputs or [ ]
-    ++ lib.lists.optionals (!(builtins.elem "stubs" prevAttrs.outputs)) [ "stubs" ];
-
-  allowFHSReferences = false;
-
-  # The libcuda stub's pkg-config doesn't follow the general pattern:
-  postPatch =
-    prevAttrs.postPatch or ""
-    + ''
-      while IFS= read -r -d $'\0' path; do
-        sed -i \
-          -e "s|^libdir\s*=.*/lib\$|libdir=''${!outputLib}/lib/stubs|" \
-          -e "s|^Libs\s*:\(.*\)\$|Libs: \1 -Wl,-rpath,${addDriverRunpath.driverLink}/lib|" \
-          "$path"
-      done < <(find -iname 'cuda-*.pc' -print0)
-    ''
-    # Namelink may not be enough, add a soname.
-    # Cf. https://gitlab.kitware.com/cmake/cmake/-/issues/25536
-    + ''
-      if [[ -f lib/stubs/libcuda.so && ! -f lib/stubs/libcuda.so.1 ]]; then
-        ln -s libcuda.so lib/stubs/libcuda.so.1
-      fi
-    '';
-
-  postFixup = prevAttrs.postFixup or "" + ''
-    mv "''${!outputDev}/share" "''${!outputDev}/lib"
-    moveToOutput lib/stubs "$stubs"
-    ln -s "$stubs"/lib/stubs/* "$stubs"/lib/
-    ln -s "$stubs"/lib/stubs "''${!outputLib}/lib/stubs"
-  '';
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cuda_demo_suite.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_demo_suite.nix
deleted file mode 100644
index 817f9d1a0302..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/cuda_demo_suite.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  libglut,
-  libcufft,
-  libcurand,
-  libGLU,
-  libglvnd,
-  libgbm,
-}:
-prevAttrs: {
-  buildInputs = prevAttrs.buildInputs or [ ] ++ [
-    libglut
-    libcufft
-    libcurand
-    libGLU
-    libglvnd
-    libgbm
-  ];
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cuda_gdb.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_gdb.nix
deleted file mode 100644
index e3593b0a90f0..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/cuda_gdb.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  cudaAtLeast,
-  gmp,
-  expat,
-  libxcrypt-legacy,
-  ncurses6,
-  python310,
-  python311,
-  python312,
-  stdenv,
-  lib,
-}:
-prevAttrs: {
-  buildInputs =
-    prevAttrs.buildInputs or [ ]
-    ++ [
-      gmp
-      libxcrypt-legacy
-      ncurses6
-      python310
-      python311
-      python312
-    ]
-    # aarch64,sbsa needs expat
-    ++ lib.lists.optionals (stdenv.hostPlatform.isAarch64) [ expat ];
-
-  installPhase =
-    prevAttrs.installPhase or ""
-    # Python 3.8 is not in nixpkgs anymore, delete Python 3.8 cuda-gdb support
-    # to avoid autopatchelf failing to find libpython3.8.so.
-    + ''
-      find $bin -name '*python3.8*' -delete
-      find $bin -name '*python3.9*' -delete
-    '';
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvcc.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvcc.nix
deleted file mode 100644
index f042222ab9fd..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvcc.nix
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-  lib,
-  backendStdenv,
-  setupCudaHook,
-}:
-prevAttrs: {
-  # Merge "bin" and "dev" into "out" to avoid circular references
-  outputs = builtins.filter (
-    x:
-    !(builtins.elem x [
-      "dev"
-      "bin"
-    ])
-  ) prevAttrs.outputs or [ ];
-
-  # Patch the nvcc.profile.
-  # Syntax:
-  # - `=` for assignment,
-  # - `?=` for conditional assignment,
-  # - `+=` to "prepend",
-  # - `=+` to "append".
-
-  # Cf. https://web.archive.org/web/20230308044351/https://arcb.csc.ncsu.edu/~mueller/cluster/nvidia/2.0/nvcc_2.0.pdf
-
-  # We set all variables with the lowest priority (=+), but we do force
-  # nvcc to use the fixed backend toolchain. Cf. comments in
-  # backend-stdenv.nix
-
-  postPatch =
-    prevAttrs.postPatch or ""
-    + ''
-      substituteInPlace bin/nvcc.profile \
-        --replace-fail \
-          '$(TOP)/$(_TARGET_DIR_)/include' \
-          "''${!outputDev}/include"
-    ''
-    + ''
-      cat << EOF >> bin/nvcc.profile
-
-      # Fix a compatible backend compiler
-      PATH += "${backendStdenv.cc}/bin":
-
-      # Expose the split-out nvvm
-      LIBRARIES =+ "-L''${!outputBin}/nvvm/lib"
-      INCLUDES =+ "-I''${!outputBin}/nvvm/include"
-      EOF
-    '';
-
-  # Entries here will be in nativeBuildInputs when cuda_nvcc is in nativeBuildInputs.
-  propagatedBuildInputs = prevAttrs.propagatedBuildInputs or [ ] ++ [ setupCudaHook ];
-
-  postInstall = prevAttrs.postInstall or "" + ''
-    moveToOutput "nvvm" "''${!outputBin}"
-  '';
-
-  # The nvcc and cicc binaries contain hard-coded references to /usr
-  allowFHSReferences = true;
-
-  meta = prevAttrs.meta or { } // {
-    mainProgram = "nvcc";
-  };
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvprof.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvprof.nix
deleted file mode 100644
index 7452e41bad7b..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/cuda_nvprof.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ cuda_cupti }: prevAttrs: { buildInputs = prevAttrs.buildInputs or [ ] ++ [ cuda_cupti ]; }
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cuda_sanitizer_api.nix b/pkgs/development/cuda-modules/_cuda/fixups/cuda_sanitizer_api.nix
deleted file mode 100644
index df0019f4d827..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/cuda_sanitizer_api.nix
+++ /dev/null
@@ -1 +0,0 @@
-_: _: { outputs = [ "out" ]; }
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/cudnn.nix b/pkgs/development/cuda-modules/_cuda/fixups/cudnn.nix
deleted file mode 100644
index dbf36688f011..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/cudnn.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  cudaOlder,
-  cudaMajorMinorVersion,
-  fetchurl,
-  lib,
-  libcublas,
-  patchelf,
-  zlib,
-}:
-let
-  inherit (lib)
-    attrsets
-    maintainers
-    meta
-    strings
-    ;
-in
-finalAttrs: prevAttrs: {
-  src = fetchurl { inherit (finalAttrs.passthru.redistribRelease) hash url; };
-
-  # Useful for inspecting why something went wrong.
-  badPlatformsConditions =
-    let
-      cudaTooOld = cudaOlder finalAttrs.passthru.featureRelease.minCudaVersion;
-      cudaTooNew =
-        (finalAttrs.passthru.featureRelease.maxCudaVersion != null)
-        && strings.versionOlder finalAttrs.passthru.featureRelease.maxCudaVersion cudaMajorMinorVersion;
-    in
-    prevAttrs.badPlatformsConditions or { }
-    // {
-      "CUDA version is too old" = cudaTooOld;
-      "CUDA version is too new" = cudaTooNew;
-    };
-
-  buildInputs = prevAttrs.buildInputs or [ ] ++ [
-    zlib
-    (attrsets.getLib libcublas)
-  ];
-
-  # Tell autoPatchelf about runtime dependencies. *_infer* libraries only
-  # exist in CuDNN 8.
-  # NOTE: Versions from CUDNN releases have four components.
-  postFixup =
-    prevAttrs.postFixup or ""
-    +
-      strings.optionalString
-        (
-          strings.versionAtLeast finalAttrs.version "8.0.5.0"
-          && strings.versionOlder finalAttrs.version "9.0.0.0"
-        )
-        ''
-          ${meta.getExe patchelf} $lib/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so
-          ${meta.getExe patchelf} $lib/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so
-        '';
-
-  meta = prevAttrs.meta or { } // {
-    homepage = "https://developer.nvidia.com/cudnn";
-    maintainers =
-      prevAttrs.meta.maintainers or [ ]
-      ++ (with maintainers; [
-        mdaiter
-        samuela
-        connorbaker
-      ]);
-    # TODO(@connorbaker): Temporary workaround to avoid changing the derivation hash since introducing more
-    # brokenConditions would change the derivation as they're top-level and __structuredAttrs is set.
-    teams = prevAttrs.meta.teams or [ ];
-    license = {
-      shortName = "cuDNN EULA";
-      fullName = "NVIDIA cuDNN Software License Agreement (EULA)";
-      url = "https://docs.nvidia.com/deeplearning/sdk/cudnn-sla/index.html#supplement";
-      free = false;
-    };
-  };
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/default.nix b/pkgs/development/cuda-modules/_cuda/fixups/default.nix
deleted file mode 100644
index 0c9874672ce4..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/default.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ lib }:
-lib.concatMapAttrs (
-  fileName: _type:
-  let
-    # Fixup is in `./${attrName}.nix` or in `./${fileName}/default.nix`:
-    attrName = lib.removeSuffix ".nix" fileName;
-    fixup = import (./. + "/${fileName}");
-    isFixup = fileName != "default.nix";
-  in
-  lib.optionalAttrs isFixup { ${attrName} = fixup; }
-) (builtins.readDir ./.)
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/driver_assistant.nix b/pkgs/development/cuda-modules/_cuda/fixups/driver_assistant.nix
deleted file mode 100644
index e9c50b2f4eaf..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/driver_assistant.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-_: prevAttrs: {
-  badPlatformsConditions = prevAttrs.badPlatformsConditions or { } // {
-    "Package is not supported; use drivers from linuxPackages" = true;
-  };
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/fabricmanager.nix b/pkgs/development/cuda-modules/_cuda/fixups/fabricmanager.nix
deleted file mode 100644
index fa2073ce002a..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/fabricmanager.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ zlib }: prevAttrs: { buildInputs = prevAttrs.buildInputs or [ ] ++ [ zlib ]; }
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/imex.nix b/pkgs/development/cuda-modules/_cuda/fixups/imex.nix
deleted file mode 100644
index fa2073ce002a..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/imex.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ zlib }: prevAttrs: { buildInputs = prevAttrs.buildInputs or [ ] ++ [ zlib ]; }
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/libcufile.nix b/pkgs/development/cuda-modules/_cuda/fixups/libcufile.nix
deleted file mode 100644
index b4fc02e89655..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/libcufile.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  libcublas,
-  numactl,
-  rdma-core,
-}:
-prevAttrs: {
-  buildInputs = prevAttrs.buildInputs or [ ] ++ [
-    libcublas
-    numactl
-    rdma-core
-  ];
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/libcusolver.nix b/pkgs/development/cuda-modules/_cuda/fixups/libcusolver.nix
deleted file mode 100644
index 699f0f708260..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/libcusolver.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  cudaAtLeast,
-  lib,
-  libcublas,
-  libcusparse ? null,
-  libnvjitlink ? null,
-}:
-prevAttrs: {
-  buildInputs = prevAttrs.buildInputs or [ ] ++ [
-    libcublas
-    libnvjitlink
-    libcusparse
-  ];
-
-  brokenConditions = prevAttrs.brokenConditions or { } // {
-    "libnvjitlink missing (CUDA >= 12.0)" = libnvjitlink == null;
-    "libcusparse missing (CUDA >= 12.1)" = libcusparse == null;
-  };
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/libcusparse.nix b/pkgs/development/cuda-modules/_cuda/fixups/libcusparse.nix
deleted file mode 100644
index e895e568d784..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/libcusparse.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  cudaAtLeast,
-  lib,
-  libnvjitlink ? null,
-}:
-prevAttrs: {
-  buildInputs = prevAttrs.buildInputs or [ ] ++ [ libnvjitlink ];
-
-  brokenConditions = prevAttrs.brokenConditions or { } // {
-    "libnvjitlink missing (CUDA >= 12.0)" = libnvjitlink == null;
-  };
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/libcusparse_lt.nix b/pkgs/development/cuda-modules/_cuda/fixups/libcusparse_lt.nix
deleted file mode 100644
index 009e64555133..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/libcusparse_lt.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  cuda_cudart,
-  lib,
-  libcublas,
-}:
-finalAttrs: prevAttrs: {
-  buildInputs =
-    prevAttrs.buildInputs or [ ]
-    ++ [ (lib.getLib libcublas) ]
-    # For some reason, the 1.4.x release of cusparselt requires the cudart library.
-    ++ lib.optionals (lib.hasPrefix "1.4" finalAttrs.version) [ (lib.getLib cuda_cudart) ];
-  meta = prevAttrs.meta or { } // {
-    description = "cuSPARSELt: A High-Performance CUDA Library for Sparse Matrix-Matrix Multiplication";
-    homepage = "https://developer.nvidia.com/cusparselt-downloads";
-    maintainers = prevAttrs.meta.maintainers or [ ] ++ [ lib.maintainers.sepiabrown ];
-    teams = prevAttrs.meta.teams or [ ];
-    license = lib.licenses.unfreeRedistributable // {
-      shortName = "cuSPARSELt EULA";
-      fullName = "cuSPARSELt SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS";
-      url = "https://docs.nvidia.com/cuda/cusparselt/license.html";
-    };
-  };
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/libcutensor.nix b/pkgs/development/cuda-modules/_cuda/fixups/libcutensor.nix
deleted file mode 100644
index 530e35af5635..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/libcutensor.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  cuda_cudart,
-  lib,
-  libcublas,
-}:
-finalAttrs: prevAttrs: {
-  buildInputs =
-    prevAttrs.buildInputs or [ ]
-    ++ [ (lib.getLib libcublas) ]
-    # For some reason, the 1.4.x release of cuTENSOR requires the cudart library.
-    ++ lib.optionals (lib.hasPrefix "1.4" finalAttrs.version) [ (lib.getLib cuda_cudart) ];
-  meta = prevAttrs.meta or { } // {
-    description = "cuTENSOR: A High-Performance CUDA Library For Tensor Primitives";
-    homepage = "https://developer.nvidia.com/cutensor";
-    maintainers = prevAttrs.meta.maintainers or [ ] ++ [ lib.maintainers.obsidian-systems-maintenance ];
-    teams = prevAttrs.meta.teams;
-    license = lib.licenses.unfreeRedistributable // {
-      shortName = "cuTENSOR EULA";
-      fullName = "cuTENSOR SUPPLEMENT TO SOFTWARE LICENSE AGREEMENT FOR NVIDIA SOFTWARE DEVELOPMENT KITS";
-      url = "https://docs.nvidia.com/cuda/cutensor/license.html";
-    };
-  };
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix b/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
deleted file mode 100644
index bc7c5f1784db..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/nsight_compute.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  cudaAtLeast,
-  cudaMajorMinorVersion,
-  cudaOlder,
-  e2fsprogs,
-  elfutils,
-  flags,
-  gst_all_1,
-  lib,
-  libjpeg8,
-  qt6,
-  rdma-core,
-  stdenv,
-  ucx,
-}:
-prevAttrs:
-let
-  qtwayland = lib.getLib qt6.qtwayland;
-  inherit (qt6) wrapQtAppsHook qtwebview;
-  archDir =
-    {
-      aarch64-linux = "linux-" + (if flags.isJetsonBuild then "v4l_l4t" else "desktop") + "-t210-a64";
-      x86_64-linux = "linux-desktop-glibc_2_11_3-x64";
-    }
-    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-in
-{
-  outputs = [ "out" ]; # NOTE(@connorbaker): Force a single output so relative lookups work.
-  nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [ wrapQtAppsHook ];
-  buildInputs =
-    prevAttrs.buildInputs or [ ]
-    ++ [
-      qtwayland
-      qtwebview
-      qt6.qtwebengine
-      rdma-core
-    ]
-    ++ lib.optionals (cudaOlder "12.7") [
-      e2fsprogs
-      ucx
-    ]
-    ++ lib.optionals (cudaMajorMinorVersion == "12.9") [
-      elfutils
-    ];
-  dontWrapQtApps = true;
-  preInstall = prevAttrs.preInstall or "" + ''
-    if [[ -d nsight-compute ]]; then
-      nixLog "Lifting components of Nsight Compute to the top level"
-      mv -v nsight-compute/*/* .
-      nixLog "Removing empty directories"
-      rmdir -pv nsight-compute/*
-    fi
-
-    rm -rf host/${archDir}/Mesa/
-  '';
-  postInstall =
-    prevAttrs.postInstall or ""
-    + ''
-      moveToOutput 'ncu' "''${!outputBin}/bin"
-      moveToOutput 'ncu-ui' "''${!outputBin}/bin"
-      moveToOutput 'host/${archDir}' "''${!outputBin}/bin"
-      moveToOutput 'target/${archDir}' "''${!outputBin}/bin"
-      wrapQtApp "''${!outputBin}/bin/host/${archDir}/ncu-ui.bin"
-    ''
-    # NOTE(@connorbaker): No idea what this platform is or how to patchelf for it.
-    + lib.optionalString (flags.isJetsonBuild && cudaOlder "12.9") ''
-      nixLog "Removing QNX 700 target directory for Jetson builds"
-      rm -rfv "''${!outputBin}/target/qnx-700-t210-a64"
-    ''
-    + lib.optionalString (flags.isJetsonBuild && cudaAtLeast "12.8") ''
-      nixLog "Removing QNX 800 target directory for Jetson builds"
-      rm -rfv "''${!outputBin}/target/qnx-800-tegra-a64"
-    '';
-  # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
-  preFixup = prevAttrs.preFixup or "" + ''
-    patchelf --replace-needed libtiff.so.5 libtiff.so "''${!outputBin}/bin/host/${archDir}/Plugins/imageformats/libqtiff.so"
-  '';
-  autoPatchelfIgnoreMissingDeps = prevAttrs.autoPatchelfIgnoreMissingDeps or [ ] ++ [
-    "libnvidia-ml.so.1"
-  ];
-  # NOTE(@connorbaker): It might be a problem that when nsight_compute contains hosts and targets of different
-  # architectures, that we patchelf just the binaries matching the builder's platform; autoPatchelfHook prints
-  # messages like
-  #   skipping [$out]/host/linux-desktop-glibc_2_11_3-x64/libQt6Core.so.6 because its architecture (x64) differs from
-  #   target (AArch64)
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix b/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
deleted file mode 100644
index 2967fa89470a..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/nsight_systems.nix
+++ /dev/null
@@ -1,136 +0,0 @@
-{
-  boost178,
-  cuda_cudart,
-  cudaAtLeast,
-  e2fsprogs,
-  gst_all_1,
-  lib,
-  nss,
-  numactl,
-  pulseaudio,
-  qt6,
-  rdma-core,
-  stdenv,
-  ucx,
-  wayland,
-  xorg,
-}:
-prevAttrs:
-let
-  qtwayland = lib.getLib qt6.qtwayland;
-  qtWaylandPlugins = "${qtwayland}/${qt6.qtbase.qtPluginPrefix}";
-  # NOTE(@connorbaker): nsight_systems doesn't support Jetson, so no need for case splitting on aarch64-linux.
-  hostDir =
-    {
-      aarch64-linux = "host-linux-armv8";
-      x86_64-linux = "host-linux-x64";
-    }
-    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-  targetDir =
-    {
-      aarch64-linux = "target-linux-sbsa-armv8";
-      x86_64-linux = "target-linux-x64";
-    }
-    .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-in
-{
-  outputs = [ "out" ]; # NOTE(@connorbaker): Force a single output so relative lookups work.
-
-  # An ad hoc replacement for
-  # https://github.com/ConnorBaker/cuda-redist-find-features/issues/11
-  env = prevAttrs.env or { } // {
-    rmPatterns =
-      prevAttrs.env.rmPatterns or ""
-      + toString [
-        "${hostDir}/lib{arrow,jpeg}*"
-        "${hostDir}/lib{ssl,ssh,crypto}*"
-        "${hostDir}/libboost*"
-        "${hostDir}/libexec"
-        "${hostDir}/libstdc*"
-        "${hostDir}/python/bin/python"
-        "${hostDir}/Mesa"
-      ];
-  };
-
-  # NOTE(@connorbaker): nsight-exporter and nsight-sys are deprecated scripts wrapping nsys, it's fine to remove them.
-  prePatch = prevAttrs.prePatch or "" + ''
-    if [[ -d bin ]]; then
-      nixLog "Removing bin wrapper scripts"
-      for knownWrapper in bin/{nsys{,-ui},nsight-{exporter,sys}}; do
-        [[ -e $knownWrapper ]] && rm -v "$knownWrapper"
-      done
-      unset -v knownWrapper
-
-      nixLog "Removing empty bin directory"
-      rmdir -v bin
-    fi
-
-    if [[ -d nsight-systems ]]; then
-      nixLog "Lifting components of Nsight System to the top level"
-      mv -v nsight-systems/*/* .
-      nixLog "Removing empty nsight-systems directory"
-      rmdir -pv nsight-systems/*
-    fi
-  '';
-
-  postPatch = prevAttrs.postPatch or "" + ''
-    for path in $rmPatterns; do
-      rm -r "$path"
-    done
-    patchShebangs nsight-systems
-  '';
-
-  nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [ qt6.wrapQtAppsHook ];
-
-  dontWrapQtApps = true;
-
-  buildInputs =
-    prevAttrs.buildInputs or [ ]
-    ++ [
-      qt6.qtdeclarative
-      qt6.qtsvg
-      qt6.qtimageformats
-      qt6.qtpositioning
-      qt6.qtscxml
-      qt6.qttools
-      qt6.qtwebengine
-      qt6.qtwayland
-      boost178
-      cuda_cudart.stubs
-      e2fsprogs
-      gst_all_1.gst-plugins-base
-      gst_all_1.gstreamer
-      nss
-      numactl
-      pulseaudio
-      qt6.qtbase
-      qtWaylandPlugins
-      rdma-core
-      ucx
-      wayland
-      xorg.libXcursor
-      xorg.libXdamage
-      xorg.libXrandr
-      xorg.libXtst
-    ]
-    # NOTE(@connorbaker): Seems to be required only for aarch64-linux.
-    ++ lib.optionals stdenv.hostPlatform.isAarch64 [
-      gst_all_1.gst-plugins-bad
-    ];
-
-  postInstall = prevAttrs.postInstall or "" + ''
-    moveToOutput '${hostDir}' "''${!outputBin}"
-    moveToOutput '${targetDir}' "''${!outputBin}"
-    moveToOutput 'bin' "''${!outputBin}"
-    wrapQtApp "''${!outputBin}/${hostDir}/nsys-ui.bin"
-  '';
-
-  # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
-  preFixup = prevAttrs.preFixup or "" + ''
-    patchelf --replace-needed libtiff.so.5 libtiff.so "''${!outputBin}/${hostDir}/Plugins/imageformats/libqtiff.so"
-  '';
-
-  autoPatchelfIgnoreMissingDeps = prevAttrs.autoPatchelfIgnoreMissingDeps or [ ] ++ [
-    "libnvidia-ml.so.1"
-  ];
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/nvidia_driver.nix b/pkgs/development/cuda-modules/_cuda/fixups/nvidia_driver.nix
deleted file mode 100644
index e9c50b2f4eaf..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/nvidia_driver.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-_: prevAttrs: {
-  badPlatformsConditions = prevAttrs.badPlatformsConditions or { } // {
-    "Package is not supported; use drivers from linuxPackages" = true;
-  };
-}
diff --git a/pkgs/development/cuda-modules/_cuda/fixups/tensorrt.nix b/pkgs/development/cuda-modules/_cuda/fixups/tensorrt.nix
deleted file mode 100644
index 49d1018ab305..000000000000
--- a/pkgs/development/cuda-modules/_cuda/fixups/tensorrt.nix
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  _cuda,
-  cudaOlder,
-  cudaPackages,
-  cudaMajorMinorVersion,
-  lib,
-  patchelf,
-  requireFile,
-  stdenv,
-}:
-let
-  inherit (lib)
-    attrsets
-    maintainers
-    meta
-    strings
-    versions
-    ;
-  inherit (stdenv) hostPlatform;
-  # targetArch :: String
-  targetArch = attrsets.attrByPath [ hostPlatform.system ] "unsupported" {
-    x86_64-linux = "x86_64-linux-gnu";
-    aarch64-linux = "aarch64-linux-gnu";
-  };
-in
-finalAttrs: prevAttrs: {
-  # Useful for inspecting why something went wrong.
-  brokenConditions =
-    let
-      cudaTooOld = cudaOlder finalAttrs.passthru.featureRelease.minCudaVersion;
-      cudaTooNew =
-        (finalAttrs.passthru.featureRelease.maxCudaVersion != null)
-        && strings.versionOlder finalAttrs.passthru.featureRelease.maxCudaVersion cudaMajorMinorVersion;
-      cudnnVersionIsSpecified = finalAttrs.passthru.featureRelease.cudnnVersion != null;
-      cudnnVersionSpecified = versions.majorMinor finalAttrs.passthru.featureRelease.cudnnVersion;
-      cudnnVersionProvided = versions.majorMinor finalAttrs.passthru.cudnn.version;
-      cudnnTooOld =
-        cudnnVersionIsSpecified && (strings.versionOlder cudnnVersionProvided cudnnVersionSpecified);
-      cudnnTooNew =
-        cudnnVersionIsSpecified && (strings.versionOlder cudnnVersionSpecified cudnnVersionProvided);
-    in
-    prevAttrs.brokenConditions or { }
-    // {
-      "CUDA version is too old" = cudaTooOld;
-      "CUDA version is too new" = cudaTooNew;
-      "CUDNN version is too old" = cudnnTooOld;
-      "CUDNN version is too new" = cudnnTooNew;
-    };
-
-  src = requireFile {
-    name = finalAttrs.passthru.redistribRelease.filename;
-    inherit (finalAttrs.passthru.redistribRelease) hash;
-    message = ''
-      To use the TensorRT derivation, you must join the NVIDIA Developer Program and
-      download the ${finalAttrs.version} TAR package for CUDA ${cudaMajorMinorVersion} from
-      ${finalAttrs.meta.homepage}.
-
-      Once you have downloaded the file, add it to the store with the following
-      command, and try building this derivation again.
-
-      $ nix-store --add-fixed sha256 ${finalAttrs.passthru.redistribRelease.filename}
-    '';
-  };
-
-  # We need to look inside the extracted output to get the files we need.
-  sourceRoot = "TensorRT-${finalAttrs.version}";
-
-  buildInputs = prevAttrs.buildInputs or [ ] ++ [ (finalAttrs.passthru.cudnn.lib or null) ];
-
-  preInstall =
-    prevAttrs.preInstall or ""
-    + strings.optionalString (targetArch != "unsupported") ''
-      # Replace symlinks to bin and lib with the actual directories from targets.
-      for dir in bin lib; do
-        rm "$dir"
-        mv "targets/${targetArch}/$dir" "$dir"
-      done
-
-      # Remove broken symlinks
-      for dir in include samples; do
-        rm "targets/${targetArch}/$dir" || :
-      done
-    '';
-
-  # Tell autoPatchelf about runtime dependencies.
-  postFixup =
-    let
-      versionTriple = "${versions.majorMinor finalAttrs.version}.${versions.patch finalAttrs.version}";
-    in
-    prevAttrs.postFixup or ""
-    + ''
-      ${meta.getExe' patchelf "patchelf"} --add-needed libnvinfer.so \
-        "$lib/lib/libnvinfer.so.${versionTriple}" \
-        "$lib/lib/libnvinfer_plugin.so.${versionTriple}" \
-        "$lib/lib/libnvinfer_builder_resource.so.${versionTriple}"
-    '';
-
-  passthru = prevAttrs.passthru or { } // {
-    # The CUDNN used with TensorRT.
-    # If null, the default cudnn derivation will be used.
-    # If a version is specified, the cudnn derivation with that version will be used,
-    # unless it is not available, in which case the default cudnn derivation will be used.
-    cudnn =
-      let
-        desiredName = _cuda.lib.mkVersionedName "cudnn" (
-          lib.versions.majorMinor finalAttrs.passthru.featureRelease.cudnnVersion
-        );
-      in
-      if finalAttrs.passthru.featureRelease.cudnnVersion == null || (cudaPackages ? desiredName) then
-        cudaPackages.cudnn
-      else
-        cudaPackages.${desiredName};
-  };
-
-  meta = prevAttrs.meta or { } // {
-    badPlatforms =
-      prevAttrs.meta.badPlatforms or [ ]
-      ++ lib.optionals (targetArch == "unsupported") [ hostPlatform.system ];
-    homepage = "https://developer.nvidia.com/tensorrt";
-    teams = prevAttrs.meta.teams or [ ];
-
-    # Building TensorRT on Hydra is impossible because of the non-redistributable
-    # license and because the source needs to be manually downloaded from the
-    # NVIDIA Developer Program (see requireFile above).
-    hydraPlatforms = lib.platforms.none;
-  };
-}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cuda/README.md b/pkgs/development/cuda-modules/_cuda/manifests/cuda/README.md
new file mode 100644
index 000000000000..3a5eb56b6f9f
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cuda/README.md
@@ -0,0 +1,5 @@
+# cuda
+
+Link: <https://developer.download.nvidia.com/compute/cuda/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/cuda-toolkit-release-notes/index.html#cuda-toolkit-major-component-versions>
diff --git a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.6.3.json b/pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_12.6.3.json
similarity index 100%
rename from pkgs/development/cuda-modules/cuda/manifests/redistrib_12.6.3.json
rename to pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_12.6.3.json
diff --git a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.8.1.json b/pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_12.8.1.json
similarity index 100%
rename from pkgs/development/cuda-modules/cuda/manifests/redistrib_12.8.1.json
rename to pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_12.8.1.json
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_12.9.1.json b/pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_12.9.1.json
new file mode 100644
index 000000000000..835340899e33
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_12.9.1.json
@@ -0,0 +1,1151 @@
+{
+    "release_date": "2025-06-05",
+    "release_label": "12.9.1",
+    "release_product": "cuda",
+    "collectx_bringup": {
+        "name": "UFM telemetry CollectX Bringup",
+        "license": "NVIDIA Proprietary",
+        "license_path": "collectx_bringup/LICENSE.txt",
+        "version": "1.19.13",
+        "linux-x86_64": {
+            "relative_path": "collectx_bringup/linux-x86_64/collectx_bringup-linux-x86_64-1.19.13-archive.tar.xz",
+            "sha256": "4965fe096fca645a6d4565fd4d12366ae0ec31ec54ca20274910f34eea74b41a",
+            "md5": "d48b8c177f312c8774c54988594f725c",
+            "size": "125307508"
+        },
+        "linux-sbsa": {
+            "relative_path": "collectx_bringup/linux-sbsa/collectx_bringup-linux-sbsa-1.19.13-archive.tar.xz",
+            "sha256": "5d716fbb80ef7b9ac89f9e3fa8b900a29d4e6c0be487420dc4ee7a05340b57a9",
+            "md5": "dc2c0bfedf790ba7dc21f684510e592e",
+            "size": "120696772"
+        }
+    },
+    "cuda_cccl": {
+        "name": "CXX Core Compute Libraries",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_cccl/LICENSE.txt",
+        "version": "12.9.27",
+        "linux-x86_64": {
+            "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-12.9.27-archive.tar.xz",
+            "sha256": "8b1a5095669e94f2f9afd7715533314d418179e9452be61e2fde4c82a3e542aa",
+            "md5": "59e3cb66aeb96423dcca73218c85bc02",
+            "size": "997888"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-12.9.27-archive.tar.xz",
+            "sha256": "8c3da24801b500f1d9217d191bb4b63e5d2096c8e7d0b7695e876853180ba82f",
+            "md5": "b39d03cfac57a3b2ded8e9b0a6b0e782",
+            "size": "997840"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-12.9.27-archive.zip",
+            "sha256": "17aaa7c6b8f94a417d8f3261780b7e34b9cbdfab7513bce86768623b06aa28b5",
+            "md5": "afdfa89a35951f67b5bd70c513f5ef09",
+            "size": "3127658"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_cccl/linux-aarch64/cuda_cccl-linux-aarch64-12.9.27-archive.tar.xz",
+            "sha256": "8c87c2db67130108861609eacd40d30ee109656a7765e5172eab71dd6da4c453",
+            "md5": "25b1a257ed35393052577bd9ee432d3f",
+            "size": "998228"
+        }
+    },
+    "cuda_compat": {
+        "name": "CUDA compat L4T",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_compat/LICENSE.txt",
+        "version": "12.9.40580548",
+        "linux-aarch64": {
+            "relative_path": "cuda_compat/linux-aarch64/cuda_compat-linux-aarch64-12.9.40580548-archive.tar.xz",
+            "sha256": "c03fe18b9d23881f068ac97b45001a47778f83d2361728427a3f92b551b1c898",
+            "md5": "3ca26403b8b36c5cc18104ee174ec874",
+            "size": "37422044"
+        }
+    },
+    "cuda_cudart": {
+        "name": "CUDA Runtime (cudart)",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_cudart/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "1f6ad42d4f530b24bfa35894ccf6b7209d2354f59101fd62ec4a6192a184ce99",
+            "md5": "6153e2b6a43389e5be3d68b04c6488f5",
+            "size": "1514676"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-12.9.79-archive.tar.xz",
+            "sha256": "8b422a3b2cb8452cb678181b0bf9d7aa7342df168b5319c5488ae3b8514101fc",
+            "md5": "c4b3e0d206f5dc3aceaddb78a32424d3",
+            "size": "1521596"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-12.9.79-archive.zip",
+            "sha256": "179e9c43b0735ffe67207b3da556eb5a0c50f3047961882b7657d3b822d34ef8",
+            "md5": "22e500ce68dc9e099ec18f57e1309808",
+            "size": "3521238"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_cudart/linux-aarch64/cuda_cudart-linux-aarch64-12.9.79-archive.tar.xz",
+            "sha256": "f893e2c72be81b0d0e3bc33827c785a96db15fd5aafdc51cc187f3df6fdbb657",
+            "md5": "8970e9d40a7edada8cd9270906b1daa3",
+            "size": "1223440"
+        }
+    },
+    "cuda_cuobjdump": {
+        "name": "cuobjdump",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_cuobjdump/LICENSE.txt",
+        "version": "12.9.82",
+        "linux-x86_64": {
+            "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-12.9.82-archive.tar.xz",
+            "sha256": "ee0de40e8c18068bfcc53e73510e7e7a1a80555205347940df67fa525d24452f",
+            "md5": "fb4ceb446f3ca58c4ca5381a2c0eee06",
+            "size": "214896"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-12.9.82-archive.tar.xz",
+            "sha256": "2d39ae9309f81a7980df296a93c0e49215c6fb22d316fd9daae211d29a731d27",
+            "md5": "9ec739cea851b184b55017d0a6185304",
+            "size": "208936"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-12.9.82-archive.zip",
+            "sha256": "1eda43a76a2eac25fce5bdb4b68673b5bda737d54cca5513148c36362ab7c811",
+            "md5": "0a1c8b1f69537bc605c0d5fc28110258",
+            "size": "6219088"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_cuobjdump/linux-aarch64/cuda_cuobjdump-linux-aarch64-12.9.82-archive.tar.xz",
+            "sha256": "91a9ae2935b411d136c2c61ccbbc0df3a83f17cce122d12d262be202217163ee",
+            "md5": "ec5905b13be30f8f39e18d1f41dbcf18",
+            "size": "197604"
+        }
+    },
+    "cuda_cupti": {
+        "name": "CUPTI",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_cupti/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "f779a24e8f0177b4ce45cbf118cb470139fb5107858df96689d0a0aa01f0fba1",
+            "md5": "5fe49729261d1f899bd0948026b755ae",
+            "size": "16799436"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-12.9.79-archive.tar.xz",
+            "sha256": "84f8657375c23a425b2d107c3cde1ce75777bff9798b744b78e146fdc02d2de0",
+            "md5": "ff4c04b183cc173aa2937a21a3569b5b",
+            "size": "12805704"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-12.9.79-archive.zip",
+            "sha256": "c96018456dc4db6af6d69d6db0170a2ccc656ddde8c8ce6ee05682c2c5569daa",
+            "md5": "1cecfef05160d4e6b0f2549534fe7973",
+            "size": "13359912"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_cupti/linux-aarch64/cuda_cupti-linux-aarch64-12.9.79-archive.tar.xz",
+            "sha256": "74a884691b2c7e5c8db8bd2a38143fc82f7502f0dd484051809df7953f7ae719",
+            "md5": "7f92adb9aed6fdb047ebe3c7617c7179",
+            "size": "4781260"
+        }
+    },
+    "cuda_cuxxfilt": {
+        "name": "CUDA cuxxfilt (demangler)",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_cuxxfilt/LICENSE.txt",
+        "version": "12.9.82",
+        "linux-x86_64": {
+            "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-12.9.82-archive.tar.xz",
+            "sha256": "833d7e56351d032717f217212577d369d230e284b2ded4bf151403cc11213add",
+            "md5": "a7f4a446e4fb00657f5bd7eb1dd814a7",
+            "size": "188692"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-12.9.82-archive.tar.xz",
+            "sha256": "2175ef96b523eb8fea5d6ccfd21b70d6afaee623d00dbab70f11e8aa892c2828",
+            "md5": "fde8b2db7d7e4afb08e7c703fa735440",
+            "size": "177440"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-12.9.82-archive.zip",
+            "sha256": "ec5911d680394d90968c480c7359e7f5a4025b9c4806dad673d489e57585afd3",
+            "md5": "537cd82a0945fe20275d4791e353c3f5",
+            "size": "178570"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_cuxxfilt/linux-aarch64/cuda_cuxxfilt-linux-aarch64-12.9.82-archive.tar.xz",
+            "sha256": "37acae6576874c3781e844ea268a9fe076d13aaab3acda6f65bbe885a3726a3c",
+            "md5": "c8e23bff8cc13fb58a57c90d69e7b374",
+            "size": "170436"
+        }
+    },
+    "cuda_demo_suite": {
+        "name": "CUDA Demo Suite",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_demo_suite/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "92e0b324bf02d9705b8dd5bf1d36149c06512c720ceda7cc7d791fc3ecf64f0e",
+            "md5": "5030cddcab7101704bb8a9b53c6137ad",
+            "size": "4036604"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-12.9.79-archive.zip",
+            "sha256": "adffd0b0f7cca262025f171dcaa73f62af020de5d9a0d6e0fbe7dbd827dd77a8",
+            "md5": "9a8c3bbd696392e768ae3278e269cbd9",
+            "size": "5164004"
+        }
+    },
+    "cuda_documentation": {
+        "name": "CUDA Documentation",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_documentation/LICENSE.txt",
+        "version": "12.9.88",
+        "linux-x86_64": {
+            "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-12.9.88-archive.tar.xz",
+            "sha256": "d6e44c454654016a3650f3101688231ba111cd00647b726b34d18ff0bd721933",
+            "md5": "17436d82e589824bbf3f4ff669201d81",
+            "size": "67920"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-12.9.88-archive.tar.xz",
+            "sha256": "e1c47f32279a827baf8b4339c1737d7bd8e54c73388835e5fae3e2db83db2479",
+            "md5": "995f5692be016e44821fb85ebc3a62d9",
+            "size": "67924"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-12.9.88-archive.zip",
+            "sha256": "660f2f71b94c13a021850a8bb6227dfb4eb9a8dd8e0f6bc9feb0b993dea180fd",
+            "md5": "3d21d1b9056629557bb2745f962af636",
+            "size": "107626"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_documentation/linux-aarch64/cuda_documentation-linux-aarch64-12.9.88-archive.tar.xz",
+            "sha256": "830476a755f9a8c9780a6876d0ed562c073f29968c3e0e91962d0fd14b3f3618",
+            "md5": "098d318ebb7700a6513e57e41edf20c8",
+            "size": "67948"
+        }
+    },
+    "cuda_gdb": {
+        "name": "CUDA GDB",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_gdb/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "3dbb657683cd4f2989c30bdad31b3f4493795a9acc8a2214f48df3cfca7c37c0",
+            "md5": "1405f9cf4a5d2c03785a69aefa05de16",
+            "size": "67691620"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-12.9.79-archive.tar.xz",
+            "sha256": "251b9bd86ffcce0cdc4a5480ef3d8d609ca3a276cbbb5c793ca9978721d31faf",
+            "md5": "b76ab824a5b651ecec31978e6e2f41bf",
+            "size": "45695592"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_gdb/linux-aarch64/cuda_gdb-linux-aarch64-12.9.79-archive.tar.xz",
+            "sha256": "5473c27f1ec03fe064a09399e52b251e6ca5d3b9a67f21c1a26a02a26102f165",
+            "md5": "95325479bec751d72d4f063d8d244049",
+            "size": "45662012"
+        }
+    },
+    "cuda_nsight": {
+        "name": "Nsight Eclipse Edition Plugin",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nsight/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "5c3994440ce7aa6ac5ab120e45f25f5f5eaa631af0f793fab860a5edbc499518",
+            "md5": "3bce6195222da1c1d549fbd2d83422e8",
+            "size": "118693300"
+        }
+    },
+    "cuda_nvcc": {
+        "name": "CUDA NVCC",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvcc/LICENSE.txt",
+        "version": "12.9.86",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-12.9.86-archive.tar.xz",
+            "sha256": "7a1a5b652e5ef85c82b721d10672fc9a2dbaab44e9bd3c65a69517bf53998c35",
+            "md5": "ac1871c955070267e117bd985f6dbb36",
+            "size": "81100244"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-12.9.86-archive.tar.xz",
+            "sha256": "0aa1fce92dbae76c059c27eefb9d0ffb58e1291151e44ff7c7f1fc2dd9376c0d",
+            "md5": "1322a14e4d6482f69d4b8a14a7d5f4c5",
+            "size": "73407012"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-12.9.86-archive.zip",
+            "sha256": "227b109663b5e57d2718bcabb24a4ba0d9d4e52d958e327dc476f7c28691be85",
+            "md5": "ff9b2942aaa3a1dfb487da6767bc689f",
+            "size": "126917884"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_nvcc/linux-aarch64/cuda_nvcc-linux-aarch64-12.9.86-archive.tar.xz",
+            "sha256": "2432ef8a7c12d0a9ce3332a8af42b123c07f256390b3390802b1b2c6254c6c74",
+            "md5": "f846e79e53be949484a4968880eb9dd9",
+            "size": "77162776"
+        }
+    },
+    "cuda_nvdisasm": {
+        "name": "CUDA nvdisasm",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvdisasm/LICENSE.txt",
+        "version": "12.9.88",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-12.9.88-archive.tar.xz",
+            "sha256": "49296dd550e05434185a8588ec639f1325b2de413e2321ddd7e56c5182a476ff",
+            "md5": "87ec016e430618bf724a3e8332bfcca6",
+            "size": "5483340"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-12.9.88-archive.tar.xz",
+            "sha256": "28b2597f0901cfafcd050cba0877c1eb5edcd7ebd8164aea356cec832e636ee3",
+            "md5": "0d6f0b8883e55ca07d64cbb746b80e8c",
+            "size": "5408212"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-12.9.88-archive.zip",
+            "sha256": "955ba1f52f7115031f10408ce3cec4c745df41dba8fdf6024c3983d899e9fbbc",
+            "md5": "43cd76e59014be18d96ce03e2ed09d6b",
+            "size": "5791897"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_nvdisasm/linux-aarch64/cuda_nvdisasm-linux-aarch64-12.9.88-archive.tar.xz",
+            "sha256": "99bf70149423c42c8dc2649f76f8983101dcf9879d355cfb2582b2adbed84614",
+            "md5": "cb9f7798d824ef1696fdde67f9506aa4",
+            "size": "5416148"
+        }
+    },
+    "cuda_nvml_dev": {
+        "name": "CUDA NVML Headers",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvml_dev/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "1ad0866dbfff6a9e2661f5348e4ca4c2a4e40882b90014ab127f2734856ecccb",
+            "md5": "7e615aa7b4525d3cc1b28379abcf6ce5",
+            "size": "129244"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-12.9.79-archive.tar.xz",
+            "sha256": "e97e668ead7ebc1fb7e93ffe303019660d0119c4e4d0e8ef26ce012bbbea9b34",
+            "md5": "d48bcaa83a7299b836d381b32e94a99d",
+            "size": "130480"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-12.9.79-archive.zip",
+            "sha256": "1894b70c5487a739c740929263fa3fbca80e53790647abc02b74eac024b97be8",
+            "md5": "213d773bb297b15e9f697ec8f1363bd9",
+            "size": "144955"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_nvml_dev/linux-aarch64/cuda_nvml_dev-linux-aarch64-12.9.79-archive.tar.xz",
+            "sha256": "531ac94b8b83209657cd14b28d23660df252393fb34c24f5d8919c56c977477e",
+            "md5": "3fe82d3f6042a22ac3d119192577db79",
+            "size": "130544"
+        }
+    },
+    "cuda_nvprof": {
+        "name": "CUDA nvprof",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvprof/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "8d8d1a9004710bad8d7a653769f088064b0285a06a80b46c4da7598115a0c6a2",
+            "md5": "df8f768c6c21b06cb048b9a4b0ac39e7",
+            "size": "2402440"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-12.9.79-archive.zip",
+            "sha256": "81aefd12ab0a24f88feee10303b814fcf21887b3947d5e73523ed14338ef4e2b",
+            "md5": "69ada7050609c5860a2396a6354665e0",
+            "size": "1705346"
+        }
+    },
+    "cuda_nvprune": {
+        "name": "CUDA nvprune",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvprune/LICENSE.txt",
+        "version": "12.9.82",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-12.9.82-archive.tar.xz",
+            "sha256": "a06f0e2959a4dd3dbb62a984dbe77b813397022596f5c62d74ddd83b238571f2",
+            "md5": "db647ad5946c1e4cb0289c16e5ec92d8",
+            "size": "59372"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-12.9.82-archive.tar.xz",
+            "sha256": "15e1d6527bf04c162950251940b10b8b8254f68028e2ffc0bfb7ed84bb2e1382",
+            "md5": "3d51536a3582379389d821afa05becfd",
+            "size": "51052"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-12.9.82-archive.zip",
+            "sha256": "be23018507f015ca948c503a43a3c48449c0dc1ceaab1e721caf01f024727312",
+            "md5": "f5c1eaa20c7c8c67a564f04cec87fca2",
+            "size": "142316"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_nvprune/linux-aarch64/cuda_nvprune-linux-aarch64-12.9.82-archive.tar.xz",
+            "sha256": "69fa4cf2cede678825e0c8032ccd629e17de1b9d8667b05b6702d873fd2fb926",
+            "md5": "00c370560287a3dcdeedb32fe13e7e0e",
+            "size": "52876"
+        }
+    },
+    "cuda_nvrtc": {
+        "name": "CUDA NVRTC",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvrtc/LICENSE.txt",
+        "version": "12.9.86",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-12.9.86-archive.tar.xz",
+            "sha256": "82913658363892dbc0f2638b070476234476e06e084fed60db861cb7e161a6af",
+            "md5": "8ed74b72c44ee50759f820dee875589c",
+            "size": "114231976"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-12.9.86-archive.tar.xz",
+            "sha256": "fb2d50c791465f333fc2236d2419170cf7a7886f48dd9b967a10f8233c686029",
+            "md5": "483dc56df046c9c03eb17cd637bb8fc9",
+            "size": "53265740"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-12.9.86-archive.zip",
+            "sha256": "1aa0644fa53c8ca34cdc73db17bcc73530557bdd3f582c7bfdbd7916c8b48f65",
+            "md5": "76317f5006ce9de6720cea0b3bdc7db6",
+            "size": "314608748"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_nvrtc/linux-aarch64/cuda_nvrtc-linux-aarch64-12.9.86-archive.tar.xz",
+            "sha256": "785b0952c0f77dd0feb9a674f3fcca3fcf05541bbe27f70a5926da9f85339152",
+            "md5": "b49aeba8583248a4cd628154361d313d",
+            "size": "57633224"
+        }
+    },
+    "cuda_nvtx": {
+        "name": "CUDA NVTX",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvtx/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "819bc39192955e6ba2067de39b85f30e157de462945e54b12bfdeda429d793fb",
+            "md5": "3a56b3c5c1e20d99cff4c354e57ea30f",
+            "size": "64496"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-12.9.79-archive.tar.xz",
+            "sha256": "dae359c2c51f83a5cd402468f481a82aeb6d32d79dc707d3625607e83cf97ceb",
+            "md5": "d783ac2926973ad682c69270d047c3f3",
+            "size": "64856"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-12.9.79-archive.zip",
+            "sha256": "b9d506ce9ba056bf171b60e9dada06fb3d8bed5453a6399d0541960bf9b81659",
+            "md5": "907cfcf3f3b637912ded30349ecfd515",
+            "size": "87029"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_nvtx/linux-aarch64/cuda_nvtx-linux-aarch64-12.9.79-archive.tar.xz",
+            "sha256": "f1a4366e45dbfd0a4e6210a5a4b9b51501aaebb6b58845d3f1b271ec3d7f3e15",
+            "md5": "6b40a46f73f46a7d8bac37b212989007",
+            "size": "65396"
+        }
+    },
+    "cuda_nvvp": {
+        "name": "CUDA NVVP",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvvp/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "6cdf9196373a848856c1afc6f1df1023649fb5fe77b896967ecc0b014b200003",
+            "md5": "0ded9b80cf8fc2c2233b28d582f2334e",
+            "size": "117732648"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-12.9.79-archive.zip",
+            "sha256": "a7e1ac0de34c69afc288283ea75314b67f109b08d046c3622405dff8f66b0720",
+            "md5": "dd673788d3fae14c38af5c1506fae11d",
+            "size": "120342251"
+        }
+    },
+    "cuda_opencl": {
+        "name": "CUDA OpenCL",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_opencl/LICENSE.txt",
+        "version": "12.9.19",
+        "linux-x86_64": {
+            "relative_path": "cuda_opencl/linux-x86_64/cuda_opencl-linux-x86_64-12.9.19-archive.tar.xz",
+            "sha256": "1bddacc2f0de77901faad5fecfad8fef8136ea8dd708e02177d10eef97d85b78",
+            "md5": "d0a85b602afc8957374d3f536dfd0306",
+            "size": "94140"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_opencl/windows-x86_64/cuda_opencl-windows-x86_64-12.9.19-archive.zip",
+            "sha256": "7c78e05697a3f74510c4154b175ce4597ed0719c7793236ca7f3989eccae0ff6",
+            "md5": "e2dec7d45f8d87045c4a37bb882e9cf4",
+            "size": "139663"
+        }
+    },
+    "cuda_profiler_api": {
+        "name": "CUDA Profiler API",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_profiler_api/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_profiler_api/linux-x86_64/cuda_profiler_api-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "8c50636bfb97e9420905aa795b9fa6e3ad0b30ec6a6c8b0b8db519beb9241ce6",
+            "md5": "483998e0e5b012d976bf62ada20bd4fa",
+            "size": "16316"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_profiler_api/linux-sbsa/cuda_profiler_api-linux-sbsa-12.9.79-archive.tar.xz",
+            "sha256": "e07f47ef3aeb3a3ca995e9070d77d98ad79460216bf2075c9f9018962ae1d03b",
+            "md5": "55345cd640f299f8da43ef946dd8aa89",
+            "size": "16316"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_profiler_api/windows-x86_64/cuda_profiler_api-windows-x86_64-12.9.79-archive.zip",
+            "sha256": "b05519f8ce4f02167bfc859358f62eb771d89ac2af3a6952a82317f2af4bc5bd",
+            "md5": "f5da20e1160f547602ec1c558dd0bc64",
+            "size": "20352"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_profiler_api/linux-aarch64/cuda_profiler_api-linux-aarch64-12.9.79-archive.tar.xz",
+            "sha256": "e26d82b4ce994dc445dc0191b1a5fe68dacc7290bfb9c2133b4979fe90e05433",
+            "md5": "738fe1e26407ab88e0fd3209b4da1cfa",
+            "size": "16308"
+        }
+    },
+    "cuda_sandbox_dev": {
+        "name": "CUDA nvsandboxutils Headers",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_sandbox_dev/LICENSE.txt",
+        "version": "12.9.19",
+        "linux-x86_64": {
+            "relative_path": "cuda_sandbox_dev/linux-x86_64/cuda_sandbox_dev-linux-x86_64-12.9.19-archive.tar.xz",
+            "sha256": "058c9616f9bb4e57c58996a053cf9a87f655c139dc2fa11af7bed74432bd8153",
+            "md5": "ce4326bc03b26b88a552db8b163d7f5f",
+            "size": "29172"
+        }
+    },
+    "cuda_sanitizer_api": {
+        "name": "CUDA Compute Sanitizer API",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_sanitizer_api/LICENSE.txt",
+        "version": "12.9.79",
+        "linux-x86_64": {
+            "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-12.9.79-archive.tar.xz",
+            "sha256": "e23aad21132ff58b92a22aad372a7048793400b79c625665d325d4ecec6979bf",
+            "md5": "9d138eb96c11e1b9293408e5b7a97114",
+            "size": "9758036"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-12.9.79-archive.tar.xz",
+            "sha256": "281538927b6818d4687fad102c0603ab7b389513c9c129f3e0de8c61ac7f474d",
+            "md5": "3192ef7e50255f80430471ae6add0ebf",
+            "size": "7753752"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-12.9.79-archive.zip",
+            "sha256": "b1f366312cb52164dfe7b78463ab085b742f052e74b89e9da08561a8ca8b06e9",
+            "md5": "1821743a8a46f3e4bab0fe96dac813f8",
+            "size": "10103190"
+        },
+        "linux-aarch64": {
+            "relative_path": "cuda_sanitizer_api/linux-aarch64/cuda_sanitizer_api-linux-aarch64-12.9.79-archive.tar.xz",
+            "sha256": "2baaba3ff47eceb529ddcc866fc7e647fd02427ef3dbb8bec06689f919c14c69",
+            "md5": "e48b00b6ed2124ac4a3a0b20201ba4dd",
+            "size": "4808620"
+        }
+    },
+    "driver_assistant": {
+        "name": "NVIDIA Driver Assistant",
+        "license": "MIT",
+        "license_path": "driver_assistant/LICENSE.txt",
+        "version": "0.21.57.08",
+        "linux-all": {
+            "relative_path": "driver_assistant/source/driver_assistant-0.21.57.08-archive.tar.xz",
+            "sha256": "4904c08e1de1aa790d200f36528aaa672ab6b3c6620bbfe5e221312b9ef1120a",
+            "md5": "ebb37f4ad248ddba8071c570f5267da3",
+            "size": "38644"
+        }
+    },
+    "fabricmanager": {
+        "name": "NVIDIA Fabric Manager",
+        "license": "NVIDIA Driver",
+        "license_path": "fabricmanager/LICENSE.txt",
+        "version": "575.57.08",
+        "linux-x86_64": {
+            "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-575.57.08-archive.tar.xz",
+            "sha256": "2e7dc4db6788e618af345fb50dee63115b5116ccb57d6d27d93c1ff5e2c3a8cf",
+            "md5": "39f4aa35a3f7cda55297bb73c91a5481",
+            "size": "8077772"
+        },
+        "linux-sbsa": {
+            "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-575.57.08-archive.tar.xz",
+            "sha256": "239a7f8406987fb6d44cd4f7f6ba6e843b3f3acb7b1732e6ab5c0d370690ee85",
+            "md5": "4d288febfed83ff3d532ebbc692f65ec",
+            "size": "7336832"
+        }
+    },
+    "imex": {
+        "name": "Nvidia-Imex",
+        "license": "NVIDIA Proprietary",
+        "license_path": "imex/LICENSE.txt",
+        "version": "575.57.08",
+        "linux-x86_64": {
+            "relative_path": "imex/linux-x86_64/nvidia-imex-linux-x86_64-575.57.08-archive.tar.xz",
+            "sha256": "5dfe195429b0967788b7e9b4bab85d4936220d6d2f6cf394a61bd3439b437506",
+            "md5": "909fd5da3b23f54e39484efd187f4c3e",
+            "size": "7718644"
+        },
+        "linux-sbsa": {
+            "relative_path": "imex/linux-sbsa/nvidia-imex-linux-sbsa-575.57.08-archive.tar.xz",
+            "sha256": "36d1a49fb52294ef5352eeea457d131f3d14320fca0a56633d7798ab32eead18",
+            "md5": "bd3d1ce8d91e1fd7d26191c05292698e",
+            "size": "7149236"
+        }
+    },
+    "libcublas": {
+        "name": "CUDA cuBLAS",
+        "license": "CUDA Toolkit",
+        "license_path": "libcublas/LICENSE.txt",
+        "version": "12.9.1.4",
+        "linux-x86_64": {
+            "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-12.9.1.4-archive.tar.xz",
+            "sha256": "546addc4a9d82b8f23aa9ba9274b6bc0429a63008a31c759884ac24880796057",
+            "md5": "9b07f0c3d94534e56e003c6016b9771c",
+            "size": "933611504"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-12.9.1.4-archive.tar.xz",
+            "sha256": "e99b074e6f66034e563508118804599d7579f73afc8424c55ad5fd8d12e085a5",
+            "md5": "4c7cdc43283c0ba62e665b02e9ec7540",
+            "size": "932528492"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-12.9.1.4-archive.zip",
+            "sha256": "d534d98b0b453a98914dbf3adf47d7e84b55037abf02f87466439e1dcef581ed",
+            "md5": "3f092963b0767968fe6f02febc1b0cbf",
+            "size": "549755186"
+        },
+        "linux-aarch64": {
+            "relative_path": "libcublas/linux-aarch64/libcublas-linux-aarch64-12.9.1.4-archive.tar.xz",
+            "sha256": "f75938d72153902cf08d1666311f35851e7eb6a16af743b2346bc68d7ba6b341",
+            "md5": "15f6396431885647e961af811a90cc06",
+            "size": "493899648"
+        }
+    },
+    "libcudla": {
+        "name": "cuDLA",
+        "license": "CUDA Toolkit",
+        "license_path": "libcudla/LICENSE.txt",
+        "version": "12.9.19",
+        "linux-aarch64": {
+            "relative_path": "libcudla/linux-aarch64/libcudla-linux-aarch64-12.9.19-archive.tar.xz",
+            "sha256": "ef7c1a05d9927c53aa089ec2217a1e999ffac0e776145d798bf784279fc79d40",
+            "md5": "dd1fc18bd0fe3ed38b87a453d31575a0",
+            "size": "38548"
+        }
+    },
+    "libcufft": {
+        "name": "CUDA cuFFT",
+        "license": "CUDA Toolkit",
+        "license_path": "libcufft/LICENSE.txt",
+        "version": "11.4.1.4",
+        "linux-x86_64": {
+            "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-11.4.1.4-archive.tar.xz",
+            "sha256": "b0e65af59b0c2f6c8ed9f5552a9b375890855b7926ae2c0404d15dcf2565bda4",
+            "md5": "3ffadd77d5b084470aa8d9215d760e76",
+            "size": "470942192"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-11.4.1.4-archive.tar.xz",
+            "sha256": "b87637db96e485f4793d7ca8bd2cf07250eca5c86f6c56744a36683418359c03",
+            "md5": "4a0906639fd293f529b8f949bc3ad9eb",
+            "size": "471560648"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-11.4.1.4-archive.zip",
+            "sha256": "f26f80bb9abff3269c548e1559e8c2b4ba58ccb8acc6095bbc6404fc962d4b80",
+            "md5": "504ad2e94fd0d923b8a7082659813431",
+            "size": "198361265"
+        },
+        "linux-aarch64": {
+            "relative_path": "libcufft/linux-aarch64/libcufft-linux-aarch64-11.4.1.4-archive.tar.xz",
+            "sha256": "5d992b98f0d3d294e339ed2f65a477a587803c1567598a120349fae52596bf20",
+            "md5": "1f10a57d45e9078e940340cdeff26478",
+            "size": "471529132"
+        }
+    },
+    "libcufile": {
+        "name": "CUDA cuFile",
+        "license": "CUDA Toolkit",
+        "license_path": "libcufile/LICENSE.txt",
+        "version": "1.14.1.1",
+        "linux-x86_64": {
+            "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.14.1.1-archive.tar.xz",
+            "sha256": "7ba9834b8dc2f8cdb1710a49f3de3f627bbcd4cc1f8a754019c66c8c80fdaee7",
+            "md5": "e59833cbd8e423948fa5814a276315e3",
+            "size": "42129088"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcufile/linux-sbsa/libcufile-linux-sbsa-1.14.1.1-archive.tar.xz",
+            "sha256": "6b1d2a771bd822fdd06a6286eb59acba179b13fe063ae5b0de8fc0f4991a39d8",
+            "md5": "5a8499cdc22754fe5c9335065d708ea4",
+            "size": "41676328"
+        },
+        "linux-aarch64": {
+            "relative_path": "libcufile/linux-aarch64/libcufile-linux-aarch64-1.14.1.1-archive.tar.xz",
+            "sha256": "196b61a1bf02b85e76c21bdfe414a3f4db4380df41d9212c9eb6d0aa92eee1ce",
+            "md5": "c7e269a01ecd2dc427941c5bc775c2ef",
+            "size": "41655988"
+        }
+    },
+    "libcurand": {
+        "name": "CUDA cuRAND",
+        "license": "CUDA Toolkit",
+        "license_path": "libcurand/LICENSE.txt",
+        "version": "10.3.10.19",
+        "linux-x86_64": {
+            "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.3.10.19-archive.tar.xz",
+            "sha256": "48281b4caadb1cf790d44ac76b23c77d06f474c0b1799814f314aafec9258ad6",
+            "md5": "e2fd0b8dd197f3bccc0ee19e5640fc93",
+            "size": "89582256"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.3.10.19-archive.tar.xz",
+            "sha256": "078afec842c99b3a953d62cc76bd74afa2d883dc436e6d642e6440bb1e85eb8e",
+            "md5": "fae5b6ce60678f452a2c760e8bf27563",
+            "size": "89544732"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.3.10.19-archive.zip",
+            "sha256": "d0411f0b8c07e90d0fb6e01bfa7a54c9cb80f2ddf67e4ded2d96a50e19aadad6",
+            "md5": "6ccce2f4f1f6d9592c908fa1cb91536d",
+            "size": "67904600"
+        },
+        "linux-aarch64": {
+            "relative_path": "libcurand/linux-aarch64/libcurand-linux-aarch64-10.3.10.19-archive.tar.xz",
+            "sha256": "e5087640b5c9cd8bc173efb6a21f8388b24da59511cc3d57e60afc5e05d14b50",
+            "md5": "71ed8ff7a7e539c0be8ca4b699f2f3e1",
+            "size": "79761424"
+        }
+    },
+    "libcusolver": {
+        "name": "CUDA cuSOLVER",
+        "license": "CUDA Toolkit",
+        "license_path": "libcusolver/LICENSE.txt",
+        "version": "11.7.5.82",
+        "linux-x86_64": {
+            "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.7.5.82-archive.tar.xz",
+            "sha256": "3d3b96f3087dbc43893a28691b172f31725b316d524f5a3c1e6837257c898d06",
+            "md5": "efcc5d100623563d1a56dff59b45b65d",
+            "size": "324393196"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.7.5.82-archive.tar.xz",
+            "sha256": "db463593ffcbc78f542a7f1ef808da43bf742acae654d970d99a47289c2a83e5",
+            "md5": "63113f462dc11289f996eec8bab1db74",
+            "size": "323573816"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.7.5.82-archive.zip",
+            "sha256": "e991d64a0bbe3e0bb69ce2adce000244288002b0341894729666d66adb9b4f25",
+            "md5": "e2d79987f6e38f63cc64816f393a8e51",
+            "size": "322216184"
+        },
+        "linux-aarch64": {
+            "relative_path": "libcusolver/linux-aarch64/libcusolver-linux-aarch64-11.7.5.82-archive.tar.xz",
+            "sha256": "45e2fefeee5797c0492d8a9ee26c3dbb7af0cdcefe6f1cd25bd586daa633d9a0",
+            "md5": "e311d62bfc65c6afc29152f6e923f78c",
+            "size": "113258352"
+        }
+    },
+    "libcusparse": {
+        "name": "CUDA cuSPARSE",
+        "license": "CUDA Toolkit",
+        "license_path": "libcusparse/LICENSE.txt",
+        "version": "12.5.10.65",
+        "linux-x86_64": {
+            "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-12.5.10.65-archive.tar.xz",
+            "sha256": "a83415dcd3e1183afe363d4740f9f0309cfe560c6c08016c2a61468304f4b848",
+            "md5": "c7ed952d12dec0f50a4386e5d09203f6",
+            "size": "398914580"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-12.5.10.65-archive.tar.xz",
+            "sha256": "8d1c8a57ba3eaecc3f7c11e29fed275a2f3dca5cea51dd2a24d07ab5d9998583",
+            "md5": "2d48c3aecca07be0a458a977350ce175",
+            "size": "398606816"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-12.5.10.65-archive.zip",
+            "sha256": "abb4bfc01198f82fbc956773ccb98c578c03027b6ad425e829355be0c0a11a4a",
+            "md5": "33ce31c3d880596c31304c965dbfcdce",
+            "size": "358114928"
+        },
+        "linux-aarch64": {
+            "relative_path": "libcusparse/linux-aarch64/libcusparse-linux-aarch64-12.5.10.65-archive.tar.xz",
+            "sha256": "b294b6cd0acf5e68078d2fe4d41d95a4073fed780805adca7774bce7cbbe5b65",
+            "md5": "ce4d363d3affd40fe751f065ec2bd4cf",
+            "size": "131075108"
+        }
+    },
+    "libnpp": {
+        "name": "CUDA NPP",
+        "license": "CUDA Toolkit",
+        "license_path": "libnpp/LICENSE.txt",
+        "version": "12.4.1.87",
+        "linux-x86_64": {
+            "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-12.4.1.87-archive.tar.xz",
+            "sha256": "49351448d896854284ec708c14506eaaceb92aa01fbe35c91d5c52ad482e17ae",
+            "md5": "03de546e34ad54d0119594bc237c5e87",
+            "size": "331733872"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-12.4.1.87-archive.tar.xz",
+            "sha256": "992d461905366cec4243b26ce7bfe997c0c0eabf53a001333025930a1a0c7237",
+            "md5": "8de3be3d9043a07011b0de46c49ea668",
+            "size": "330804724"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-12.4.1.87-archive.zip",
+            "sha256": "cfcfbf59e4e5ce71113c058bd4eba3dd56e4db080932146d4047c0d44b4a558e",
+            "md5": "7549e1191510ae5ca9291e5f13c70296",
+            "size": "274109870"
+        },
+        "linux-aarch64": {
+            "relative_path": "libnpp/linux-aarch64/libnpp-linux-aarch64-12.4.1.87-archive.tar.xz",
+            "sha256": "50c9f80592eaf4f246c82475143768b848333d9f540782257d42023f5fe68fdf",
+            "md5": "869efb32d5ab9468fda4cb94848cf90f",
+            "size": "104647240"
+        }
+    },
+    "libnvfatbin": {
+        "name": "NVIDIA compiler library for fatbin interaction",
+        "license": "CUDA Toolkit",
+        "license_path": "libnvfatbin/LICENSE.txt",
+        "version": "12.9.82",
+        "linux-x86_64": {
+            "relative_path": "libnvfatbin/linux-x86_64/libnvfatbin-linux-x86_64-12.9.82-archive.tar.xz",
+            "sha256": "315be969a303437329bf72d7141babed024fc54f90a10aa748b03be8f826d57b",
+            "md5": "d5e2dc19c01ab62dbf437a1ef80847b1",
+            "size": "930820"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvfatbin/linux-sbsa/libnvfatbin-linux-sbsa-12.9.82-archive.tar.xz",
+            "sha256": "87bf71288ea7390d039b246fa794cad2ddd3b164ce9566f8542bb15039432cdb",
+            "md5": "91902ce86f6f55a4ecc948f95bf1c032",
+            "size": "836312"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvfatbin/windows-x86_64/libnvfatbin-windows-x86_64-12.9.82-archive.zip",
+            "sha256": "86563b25096bbc21d74b1c043701ec8596499f76b40e32f9ec9179fc10404d00",
+            "md5": "c0963a07d7f2cbffd34b0b1ec6cae5c0",
+            "size": "2217262"
+        },
+        "linux-aarch64": {
+            "relative_path": "libnvfatbin/linux-aarch64/libnvfatbin-linux-aarch64-12.9.82-archive.tar.xz",
+            "sha256": "248e77ede9afbd6060cda7de0475d222731ac021e22e696ce75ed72b426dfca9",
+            "md5": "814b2ff13e944a07669580eb85c0e653",
+            "size": "808780"
+        }
+    },
+    "libnvidia_nscq": {
+        "name": "NVIDIA NSCQ API",
+        "license": "NVIDIA Driver",
+        "license_path": "libnvidia_nscq/LICENSE.txt",
+        "version": "575.57.08",
+        "linux-x86_64": {
+            "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-575.57.08-archive.tar.xz",
+            "sha256": "7c54e959ee50212be8595e01ee76581c1f3a13c19b2279424b55a8d26385c41a",
+            "md5": "b86a87c4f9fd58a79ced07cf82cec271",
+            "size": "455504"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-575.57.08-archive.tar.xz",
+            "sha256": "931004b8b2062249016a9bded2499f70331d27b265226ed879428b8bd7e4bb20",
+            "md5": "790ca3dd29b03a71f32ad1dd05611a9e",
+            "size": "446980"
+        }
+    },
+    "libnvjitlink": {
+        "name": "NVIDIA compiler library for JIT LTO functionality",
+        "license": "CUDA Toolkit",
+        "license_path": "libnvjitlink/LICENSE.txt",
+        "version": "12.9.86",
+        "linux-x86_64": {
+            "relative_path": "libnvjitlink/linux-x86_64/libnvjitlink-linux-x86_64-12.9.86-archive.tar.xz",
+            "sha256": "392cac3144b52ba14900bc7259ea6405ae6da88a8c704eab9bbbcc9ba4824b07",
+            "md5": "9156156146001536d1c8346783991d1b",
+            "size": "54021940"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvjitlink/linux-sbsa/libnvjitlink-linux-sbsa-12.9.86-archive.tar.xz",
+            "sha256": "9c9227c1e9122fd8448cafced3b32bc69f40d3c041d25034ea23611a1262852f",
+            "md5": "7fdf2864352ac613415327ebde38598b",
+            "size": "50981988"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvjitlink/windows-x86_64/libnvjitlink-windows-x86_64-12.9.86-archive.zip",
+            "sha256": "ee7175da9628d47ccc92dce6d28d57ca77633e79079a2aee90e2a645edcd1384",
+            "md5": "4cdb56f88316a5ade3edf69a1e7192e8",
+            "size": "265666466"
+        },
+        "linux-aarch64": {
+            "relative_path": "libnvjitlink/linux-aarch64/libnvjitlink-linux-aarch64-12.9.86-archive.tar.xz",
+            "sha256": "a24842165d98660d4ba9fd753395f7c9834445552110fabce4baa4c211fd2c52",
+            "md5": "548a35d56f08d07b1dc294a3c8172f71",
+            "size": "54783780"
+        }
+    },
+    "libnvjpeg": {
+        "name": "CUDA nvJPEG",
+        "license": "CUDA Toolkit",
+        "license_path": "libnvjpeg/LICENSE.txt",
+        "version": "12.4.0.76",
+        "linux-x86_64": {
+            "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-12.4.0.76-archive.tar.xz",
+            "sha256": "ddd8245b2803f5b55211261d7e5d7abf803c05f3b032238d0feaa6e09ea9401d",
+            "md5": "b9f7806fb279c9cdd0b4a40e4171b87b",
+            "size": "6378624"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-12.4.0.76-archive.tar.xz",
+            "sha256": "405b5627ffd772d2837ae4ece123fdee841c34894dba2180a1c8e1b84c0f2665",
+            "md5": "bad1da3ec8865dbd3955a757bb6b7ba0",
+            "size": "6179324"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-12.4.0.76-archive.zip",
+            "sha256": "b253241fc88bf30947b8ee068101aca8930960f113d8ee4a9583de021a79ffa1",
+            "md5": "d19d13f9bd3dbc9c9361a3c1fee99dd5",
+            "size": "4667529"
+        },
+        "linux-aarch64": {
+            "relative_path": "libnvjpeg/linux-aarch64/libnvjpeg-linux-aarch64-12.4.0.76-archive.tar.xz",
+            "sha256": "a9841bff40e577bec81352054e05c5d98720ae8e2ccfc4863eaac9dd35444c27",
+            "md5": "0a7197330938f8b5363d38bdde63562c",
+            "size": "1821640"
+        }
+    },
+    "libnvsdm": {
+        "name": "LIBNVSDM",
+        "license": "NVIDIA",
+        "license_path": "libnvsdm/LICENSE.txt",
+        "version": "575.57.08",
+        "linux-x86_64": {
+            "relative_path": "libnvsdm/linux-x86_64/libnvsdm-linux-x86_64-575.57.08-archive.tar.xz",
+            "sha256": "7a6ee934d5c328f9c05e967b63053c211f80485e0443ac119d887612a510ad53",
+            "md5": "788f7c59de54096d84dc7f645964ad2a",
+            "size": "500100"
+        }
+    },
+    "mft": {
+        "name": "NVLink 5 MFT",
+        "license": "NVIDIA Proprietary",
+        "license_path": "mft/LICENSE.txt",
+        "version": "4.30.1.510",
+        "linux-x86_64": {
+            "relative_path": "mft/linux-x86_64/mft-linux-x86_64-4.30.1.510-archive.tar.xz",
+            "sha256": "512714ab076d90d88550e60f5da65181363336cee94c67bff8821face8ef10b4",
+            "md5": "30698cf8741826df5ca3d4d3bb3a982c",
+            "size": "45536612"
+        },
+        "linux-sbsa": {
+            "relative_path": "mft/linux-sbsa/mft-linux-sbsa-4.30.1.510-archive.tar.xz",
+            "sha256": "95c05e1bc03ff81dffa58bfff26a1dd59c6300d6d5922662ae59c7af5788a310",
+            "md5": "78ef93686e91302f7b751fed8f83d9be",
+            "size": "44222004"
+        }
+    },
+    "mft_autocomplete": {
+        "name": "NVLink 5 MFT AUTOCOMPLETE",
+        "license": "NVIDIA Proprietary",
+        "license_path": "mft_autocomplete/LICENSE.txt",
+        "version": "4.30.1.510",
+        "linux-x86_64": {
+            "relative_path": "mft_autocomplete/linux-x86_64/mft_autocomplete-linux-x86_64-4.30.1.510-archive.tar.xz",
+            "sha256": "dc9069baa888c7ca0c3e55a3043d27b0100c29c81e6ed3346907dd49dabb1325",
+            "md5": "b65cb40bacfe276b3444920e8eef1f2f",
+            "size": "11884"
+        },
+        "linux-sbsa": {
+            "relative_path": "mft_autocomplete/linux-sbsa/mft_autocomplete-linux-sbsa-4.30.1.510-archive.tar.xz",
+            "sha256": "64647ce2a4de62e535ea7060d20d58c2613937071008c2a93894e1995facce2b",
+            "md5": "bf034fbf9f887d62434f83dc9727db80",
+            "size": "11880"
+        }
+    },
+    "mft_oem": {
+        "name": "NVLink 5 MFT OEM",
+        "license": "NVIDIA Proprietary",
+        "license_path": "mft_oem/LICENSE.txt",
+        "version": "4.30.1.510",
+        "linux-x86_64": {
+            "relative_path": "mft_oem/linux-x86_64/mft_oem-linux-x86_64-4.30.1.510-archive.tar.xz",
+            "sha256": "7a4729f8b91ba5c179820583189a4c95ffa9669312a28fe7ac03feebb726bbc3",
+            "md5": "7329d76d0e5b976f88ef1f2484d962de",
+            "size": "4708108"
+        },
+        "linux-sbsa": {
+            "relative_path": "mft_oem/linux-sbsa/mft_oem-linux-sbsa-4.30.1.510-archive.tar.xz",
+            "sha256": "b71bb03130b6dd3388a3e909cdf91cc9bca8b8098a8b80b5f376f5726e5b5e1c",
+            "md5": "e55a4d898553c2cf92be57724a8204e1",
+            "size": "4429188"
+        }
+    },
+    "nsight_compute": {
+        "name": "Nsight Compute",
+        "license": "NVIDIA SLA",
+        "license_path": "nsight_compute/LICENSE.txt",
+        "version": "2025.2.1.3",
+        "linux-x86_64": {
+            "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2025.2.1.3-archive.tar.xz",
+            "sha256": "02ab8867197aaf6a6ae3171293d70b6a9ddb20296be94ff4287741338cc2e1df",
+            "md5": "e81faf319af6b21f241bae535d3d1907",
+            "size": "300347320"
+        },
+        "linux-sbsa": {
+            "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2025.2.1.3-archive.tar.xz",
+            "sha256": "0e336a5139f76778b8ad70fdb49fb43817ec1bb3ee6e7425d59d99d8c455d976",
+            "md5": "18334b109fe6f10fdba2c2681726ba96",
+            "size": "107009604"
+        },
+        "windows-x86_64": {
+            "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2025.2.1.3-archive.zip",
+            "sha256": "e9d558654c98d83049969d133b98922b53ab8f4e3ba9e0a37bdb5e2ff300b7de",
+            "md5": "7cb9cff3e0718212866c7fbb4365dee5",
+            "size": "341265370"
+        },
+        "linux-aarch64": {
+            "relative_path": "nsight_compute/linux-aarch64/nsight_compute-linux-aarch64-2025.2.1.3-archive.tar.xz",
+            "sha256": "51c7762110c34728acd37878d4340f13612401fa622be0031b1a9e2ce112cfb2",
+            "md5": "355babae2f49f3f2c7ec1cf1c0b07966",
+            "size": "221171904"
+        }
+    },
+    "nsight_systems": {
+        "name": "Nsight Systems",
+        "license": "NVIDIA SLA",
+        "license_path": "nsight_systems/LICENSE.txt",
+        "version": "2025.1.3.140",
+        "linux-x86_64": {
+            "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2025.1.3.140-archive.tar.xz",
+            "sha256": "dded4227619340307be0ba5bc4e23bcbc966e2df3763170ebb20410c2b54754e",
+            "md5": "0b16c35f6e63a4fc33d14795e65bcd61",
+            "size": "1075732108"
+        },
+        "linux-sbsa": {
+            "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2025.1.3.140-archive.tar.xz",
+            "sha256": "479c46de1c459f7c760ef1ea5e5bbe61bfe7f4ba525ce4778d5ba25d874b8e1f",
+            "md5": "6d70406b53a94eba94d7c3552b938fe6",
+            "size": "980282844"
+        },
+        "windows-x86_64": {
+            "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2025.1.3.140-archive.zip",
+            "sha256": "8d61f266a8a1bc1ababd44de3ee38f7b85c8cdfcdaebace14c8f065d7624d0b3",
+            "md5": "b741046881531cbf6e3ccedb0b403432",
+            "size": "403084779"
+        }
+    },
+    "nsight_vse": {
+        "name": "Nsight Visual Studio Edition (VSE)",
+        "license": "NVIDIA SLA",
+        "license_path": "nsight_vse/LICENSE.txt",
+        "version": "2025.2.1.25125",
+        "windows-x86_64": {
+            "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2025.2.1.25125-archive.zip",
+            "sha256": "3f2b6ca8705929c97e0f931f0559921b110b9337cf11af5e017d0c95b5b31feb",
+            "md5": "7e74f479c09aece6e5b46c97d0d4cc86",
+            "size": "136237151"
+        }
+    },
+    "nvidia_driver": {
+        "name": "NVIDIA Linux Driver",
+        "license": "NVIDIA Driver",
+        "license_path": "nvidia_driver/LICENSE.txt",
+        "version": "575.57.08",
+        "linux-x86_64": {
+            "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-575.57.08-archive.tar.xz",
+            "sha256": "27ddfabde120a107527cbf88a6c96d1f81ee5c977462ce1a793051a3e678f552",
+            "md5": "9007dddd1e2d48f897958b676fbe30ff",
+            "size": "471616744"
+        },
+        "linux-sbsa": {
+            "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-575.57.08-archive.tar.xz",
+            "sha256": "4a7d1accb257f2539ff7dabb02319339fc3a8db622073e5dde33a5446910346a",
+            "md5": "3c2b686f392789d8f3a1db1ae2ad62be",
+            "size": "349127420"
+        }
+    },
+    "nvidia_fs": {
+        "name": "NVIDIA filesystem",
+        "license": "CUDA Toolkit",
+        "license_path": "nvidia_fs/LICENSE.txt",
+        "version": "2.25.7",
+        "linux-x86_64": {
+            "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.25.7-archive.tar.xz",
+            "sha256": "6e11ec0b885177ab21f4b864ff7417ea3cc1b0994f1c318767984557cd5b29d1",
+            "md5": "60d2fa54d55b739302e3db38a8a389c9",
+            "size": "60280"
+        },
+        "linux-sbsa": {
+            "relative_path": "nvidia_fs/linux-sbsa/nvidia_fs-linux-sbsa-2.25.7-archive.tar.xz",
+            "sha256": "62baf0beac2d446c0ff033fb3780cf348ab9c090d7903c210106dc98bb29d7eb",
+            "md5": "3859bed4b5e330cde0e2316f9cdcdaeb",
+            "size": "60296"
+        },
+        "linux-aarch64": {
+            "relative_path": "nvidia_fs/linux-aarch64/nvidia_fs-linux-aarch64-2.25.7-archive.tar.xz",
+            "sha256": "b8c67e28e9e23453183fb7d12ed9fed449427b2c11a21b1de4e7046a57d8d366",
+            "md5": "5128c63c80c1089340b65807445d921a",
+            "size": "60272"
+        }
+    },
+    "nvlsm": {
+        "name": "NVLSM SM component",
+        "license": "NVIDIA Proprietary",
+        "license_path": "nvlsm/LICENSE.txt",
+        "version": "2025.03.1",
+        "linux-x86_64": {
+            "relative_path": "nvlsm/linux-x86_64/nvlsm-linux-x86_64-2025.03.1-archive.tar.xz",
+            "sha256": "b034dad10a3154359e244b85206cd73f0fbce8e1cdf76058417b7b562c337388",
+            "md5": "6e09669fe8e4fb26e5334a1c4aa9dabb",
+            "size": "6890300"
+        },
+        "linux-sbsa": {
+            "relative_path": "nvlsm/linux-sbsa/nvlsm-linux-sbsa-2025.03.1-archive.tar.xz",
+            "sha256": "e260285ec01c6beb562a14625e9564b96374bb824ec62cc9866066a48710fa54",
+            "md5": "bc90989f567c27d8b39e607f719acba8",
+            "size": "6175832"
+        }
+    },
+    "visual_studio_integration": {
+        "name": "CUDA Visual Studio Integration",
+        "license": "CUDA Toolkit",
+        "license_path": "visual_studio_integration/LICENSE.txt",
+        "version": "12.9.79",
+        "windows-x86_64": {
+            "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-12.9.79-archive.zip",
+            "sha256": "d5b6514866395f52f04107da1aa523954f8dc76daf18a9f8699c3d564f294449",
+            "md5": "680fbdf0f345619c1fa3de5f1fc79090",
+            "size": "864204"
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cudnn/README.md b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/README.md
new file mode 100644
index 000000000000..ca6a04ea7074
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/README.md
@@ -0,0 +1,8 @@
+# cudnn
+
+Link: <https://developer.download.nvidia.com/compute/cudnn/redist/>
+
+Requirements: <https://docs.nvidia.com/deeplearning/cudnn/backend/v9.8.0/reference/support-matrix.html#gpu-cuda-toolkit-and-cuda-driver-requirements>
+
+8.9.7 is the latest release from the 8.x series and supports everything but Jetson.
+8.9.5 is the latest release from the 8.x series that supports Jetson.
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_8.9.5.json b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_8.9.5.json
new file mode 100644
index 000000000000..6d1962435bfa
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_8.9.5.json
@@ -0,0 +1,139 @@
+{
+    "release_date": "2024-03-15",
+    "release_label": "8.9.5",
+    "release_product": "cudnn",
+    "cudnn": {
+        "name": "NVIDIA CUDA Deep Neural Network library",
+        "license": "cudnn",
+        "license_path": "cudnn/LICENSE.txt",
+        "version": "8.9.5.30",
+        "cuda_variant": [
+            "11",
+            "12"
+        ],
+        "linux-x86_64": {
+            "cuda11": {
+                "relative_path": "cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.5.30_cuda11-archive.tar.xz",
+                "sha256": "bbe10e3c08cd7e4aea1012213781e4fe270e1c908263444f567cafefb2cc6525",
+                "md5": "300aaaa05ca6d12b3ac058fd0bd70c6b",
+                "size": "857471712"
+            },
+            "cuda12": {
+                "relative_path": "cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.5.30_cuda12-archive.tar.xz",
+                "sha256": "2a2eb89a2ab51071151c6082f1e816c702167a711a9372f9f73a7b5c4b06e01a",
+                "md5": "afb13f2d7377f4a16b54a6acc373bbd9",
+                "size": "861488496"
+            }
+        },
+        "linux-ppc64le": {
+            "cuda11": {
+                "relative_path": "cudnn/linux-ppc64le/cudnn-linux-ppc64le-8.9.5.30_cuda11-archive.tar.xz",
+                "sha256": "d678f8b2903b95de7eeaef38890c5674705864ea049b2b63e90565f2c0ea682f",
+                "md5": "daed75ed0c9f4dcc5b9521d2a833be3d",
+                "size": "860245008"
+            },
+            "cuda12": {
+                "relative_path": "cudnn/linux-ppc64le/cudnn-linux-ppc64le-8.9.5.30_cuda12-archive.tar.xz",
+                "sha256": "38388ec3c99c6646aaf5c707985cd35e25c67f653d780c4081c2df5557ab665f",
+                "md5": "8893605a415202937ad9f2587e7a16ce",
+                "size": "862346664"
+            }
+        },
+        "linux-sbsa": {
+            "cuda11": {
+                "relative_path": "cudnn/linux-sbsa/cudnn-linux-sbsa-8.9.5.30_cuda11-archive.tar.xz",
+                "sha256": "50e3d38cb70a53bb059da0aefc60e1460729c6988e2697200c43b80d218e556c",
+                "md5": "3479f3fdbda83cd6df104851dc1f940a",
+                "size": "857816268"
+            },
+            "cuda12": {
+                "relative_path": "cudnn/linux-sbsa/cudnn-linux-sbsa-8.9.5.30_cuda12-archive.tar.xz",
+                "sha256": "107d3dbec6345e1a3879a151cf3cbf6a2d96162c7b8eeb2ff85b84a67e79e2d1",
+                "md5": "90715ef0e48f6f153587ee59df7c1a87",
+                "size": "859978180"
+            }
+        },
+        "windows-x86_64": {
+            "cuda11": {
+                "relative_path": "cudnn/windows-x86_64/cudnn-windows-x86_64-8.9.5.30_cuda11-archive.zip",
+                "sha256": "e42aaa92203cc101a1619656ae50852a0d818a06ca99684c5f51ba95bd7a7cf9",
+                "md5": "d2f4fbc710da61253570306ed2e63ac4",
+                "size": "701179425"
+            },
+            "cuda12": {
+                "relative_path": "cudnn/windows-x86_64/cudnn-windows-x86_64-8.9.5.30_cuda12-archive.zip",
+                "sha256": "be76d407ce0e609f94688aa45bfd5648fd21a4d9f84a588fad10aa4802ca1301",
+                "md5": "54146d8da6df9da3ef125171da959dcf",
+                "size": "705347747"
+            }
+        },
+        "linux-aarch64": {
+            "cuda12": {
+                "relative_path": "cudnn/linux-aarch64/cudnn-linux-aarch64-8.9.5.30_cuda12-archive.tar.xz",
+                "sha256": "0491f7b02f55c22077eb678bf314c1f917524bd507cf5b658239bf98a47233a1",
+                "md5": "fffd4a177c3e2ebaaceb83131d69e4e3",
+                "size": "891432124"
+            }
+        }
+    },
+    "cudnn_samples": {
+        "name": "NVIDIA cuDNN samples",
+        "license": "cudnn",
+        "license_path": "cudnn_samples/LICENSE.txt",
+        "version": "8.9.5.30",
+        "cuda_variant": [
+            "11",
+            "12"
+        ],
+        "linux-x86_64": {
+            "cuda11": {
+                "relative_path": "cudnn_samples/linux-x86_64/cudnn_samples-linux-x86_64-8.9.5.30_cuda11-archive.tar.xz",
+                "sha256": "9c0d951788461f6e9e000209cf4b100839effd1fd300371dfa6929552c8b1d4e",
+                "md5": "dcbdaaa0171aa6b8331fcd6218558953",
+                "size": "1665468"
+            },
+            "cuda12": {
+                "relative_path": "cudnn_samples/linux-x86_64/cudnn_samples-linux-x86_64-8.9.5.30_cuda12-archive.tar.xz",
+                "sha256": "441d262d82888c6ca5a02c8ad0f07c3a876be7b473bc2ec2638d86ea2e80a884",
+                "md5": "a2ca6bf77b610024aff5c1a7ee53ea01",
+                "size": "1664272"
+            }
+        },
+        "linux-ppc64le": {
+            "cuda11": {
+                "relative_path": "cudnn_samples/linux-ppc64le/cudnn_samples-linux-ppc64le-8.9.5.30_cuda11-archive.tar.xz",
+                "sha256": "ded84be373031ff843c0b7118e9fdb48b06ec763eae3c76cb9c57e121b47c228",
+                "md5": "d4d76362cf7ba0a0711088c38a3e17a7",
+                "size": "1666372"
+            },
+            "cuda12": {
+                "relative_path": "cudnn_samples/linux-ppc64le/cudnn_samples-linux-ppc64le-8.9.5.30_cuda12-archive.tar.xz",
+                "sha256": "275d6a6671c210d4c4a92240de24cba0c5ca17e9007f91656b18bbff81621f81",
+                "md5": "b13c3befd24473ad536ef6ea3f4dc939",
+                "size": "1666788"
+            }
+        },
+        "linux-sbsa": {
+            "cuda11": {
+                "relative_path": "cudnn_samples/linux-sbsa/cudnn_samples-linux-sbsa-8.9.5.30_cuda11-archive.tar.xz",
+                "sha256": "fa2150dff6f574fb2927bfd2d10b5c2e2e90603f59d3d3371eaa41f2e9528c74",
+                "md5": "80783b38089b6573943959e873693f0a",
+                "size": "1665660"
+            },
+            "cuda12": {
+                "relative_path": "cudnn_samples/linux-sbsa/cudnn_samples-linux-sbsa-8.9.5.30_cuda12-archive.tar.xz",
+                "sha256": "af98dec9cf613cb7f67e27f5a5da24fc183996fc25a875aa0a7dc2914c986fe3",
+                "md5": "5f5b67f5d2862190ae9440ca7041b7a5",
+                "size": "1668336"
+            }
+        },
+        "linux-aarch64": {
+            "cuda12": {
+                "relative_path": "cudnn_samples/linux-aarch64/cudnn_samples-linux-aarch64-8.9.5.30_cuda12-archive.tar.xz",
+                "sha256": "044c0d4436e1ecff6785a8bacf45cf2b5d504eb1c04bb9617aed86bfea77e45f",
+                "md5": "ad2c201cf63561b5f0ddf505706eed97",
+                "size": "1663868"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_8.9.7.json b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_8.9.7.json
new file mode 100644
index 000000000000..b5940fd5275c
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_8.9.7.json
@@ -0,0 +1,123 @@
+{
+    "release_date": "2024-03-15",
+    "release_label": "8.9.7",
+    "release_product": "cudnn",
+    "cudnn": {
+        "name": "NVIDIA CUDA Deep Neural Network library",
+        "license": "cudnn",
+        "license_path": "cudnn/LICENSE.txt",
+        "version": "8.9.7.29",
+        "cuda_variant": [
+            "11",
+            "12"
+        ],
+        "linux-x86_64": {
+            "cuda11": {
+                "relative_path": "cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.7.29_cuda11-archive.tar.xz",
+                "sha256": "a3e2509028cecda0117ce5a0f42106346e82e86d390f4bb9475afc976c77402e",
+                "md5": "9ee28df53dc5f83d97f5406f880d3953",
+                "size": "860967256"
+            },
+            "cuda12": {
+                "relative_path": "cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.7.29_cuda12-archive.tar.xz",
+                "sha256": "475333625c7e42a7af3ca0b2f7506a106e30c93b1aa0081cd9c13efb6e21e3bb",
+                "md5": "046e32d5ab0fdc56878e9b33f3a6883d",
+                "size": "864984964"
+            }
+        },
+        "linux-ppc64le": {
+            "cuda11": {
+                "relative_path": "cudnn/linux-ppc64le/cudnn-linux-ppc64le-8.9.7.29_cuda11-archive.tar.xz",
+                "sha256": "f23fd7d59f9d4f743fa926f317dab0d37f6ea21edb2726ceb607bea45b0f9f36",
+                "md5": "44d8f80a90b6ba44379727a49a75b1fc",
+                "size": "863759764"
+            },
+            "cuda12": {
+                "relative_path": "cudnn/linux-ppc64le/cudnn-linux-ppc64le-8.9.7.29_cuda12-archive.tar.xz",
+                "sha256": "8574d291b299f9cc0134304473c9933bd098cc717e8d0876f4aba9f9eebe1b76",
+                "md5": "7acbeb71d48373ea343c13028172c783",
+                "size": "865846096"
+            }
+        },
+        "linux-sbsa": {
+            "cuda11": {
+                "relative_path": "cudnn/linux-sbsa/cudnn-linux-sbsa-8.9.7.29_cuda11-archive.tar.xz",
+                "sha256": "91c37cfb458f541419e98510f13aaf5975c0232c613e18b776385490074eea17",
+                "md5": "b4ae46fb80f2f8ef283d038585bbb122",
+                "size": "861355724"
+            },
+            "cuda12": {
+                "relative_path": "cudnn/linux-sbsa/cudnn-linux-sbsa-8.9.7.29_cuda12-archive.tar.xz",
+                "sha256": "e98b7c80010785e5d5ca01ee4ce9b5b0c8c73587ea6f8648be34d3f8d1d47bd1",
+                "md5": "52a436f378d20b8e1e1a8a173a8bdeda",
+                "size": "863497272"
+            }
+        },
+        "windows-x86_64": {
+            "cuda11": {
+                "relative_path": "cudnn/windows-x86_64/cudnn-windows-x86_64-8.9.7.29_cuda11-archive.zip",
+                "sha256": "5e45478efe71a96329e6c0d2a3a2f79c747c15b2a51fead4b84c89b02cbf1671",
+                "md5": "7dddb764c0a608ac23e72761be4c92c0",
+                "size": "704240064"
+            },
+            "cuda12": {
+                "relative_path": "cudnn/windows-x86_64/cudnn-windows-x86_64-8.9.7.29_cuda12-archive.zip",
+                "sha256": "94fc17af8e83a26cc5d231ed23981b28c29c3fc2e87b1844ea3f46486f481df5",
+                "md5": "30f8a180be36451511306f7837270214",
+                "size": "708408517"
+            }
+        }
+    },
+    "cudnn_samples": {
+        "name": "NVIDIA cuDNN samples",
+        "license": "cudnn",
+        "license_path": "cudnn_samples/LICENSE.txt",
+        "version": "8.9.7.29",
+        "cuda_variant": [
+            "11",
+            "12"
+        ],
+        "linux-x86_64": {
+            "cuda11": {
+                "relative_path": "cudnn_samples/linux-x86_64/cudnn_samples-linux-x86_64-8.9.7.29_cuda11-archive.tar.xz",
+                "sha256": "8b17f56e9d654d9af3d7711645811fb6f240f53bc2d62c00c063a6d452d80091",
+                "md5": "b5410e97c73ea206b3d8939ce6ff8832",
+                "size": "1664448"
+            },
+            "cuda12": {
+                "relative_path": "cudnn_samples/linux-x86_64/cudnn_samples-linux-x86_64-8.9.7.29_cuda12-archive.tar.xz",
+                "sha256": "d3a9a4f3f74b04c393bb9152fe3a53ac1514da679ca57858d69f64243debb905",
+                "md5": "348306c65eb4c865fba72332fa7a5f33",
+                "size": "1665932"
+            }
+        },
+        "linux-ppc64le": {
+            "cuda11": {
+                "relative_path": "cudnn_samples/linux-ppc64le/cudnn_samples-linux-ppc64le-8.9.7.29_cuda11-archive.tar.xz",
+                "sha256": "29a18538f13a63ee54cd795c78f64a1ca45df2de0b140cf095281a16d1d4d4e3",
+                "md5": "9f398a26a5c7913faf58e8ee3bd9c6ff",
+                "size": "1665244"
+            },
+            "cuda12": {
+                "relative_path": "cudnn_samples/linux-ppc64le/cudnn_samples-linux-ppc64le-8.9.7.29_cuda12-archive.tar.xz",
+                "sha256": "80664b7a6abed08633e0dc238f47f26aaaa0add5571bf6f4f4e475686a702c8d",
+                "md5": "6aa5e8e801b5f730a103aaf52c66485e",
+                "size": "1668400"
+            }
+        },
+        "linux-sbsa": {
+            "cuda11": {
+                "relative_path": "cudnn_samples/linux-sbsa/cudnn_samples-linux-sbsa-8.9.7.29_cuda11-archive.tar.xz",
+                "sha256": "dd7b618f4af89fff9cdad9cd87dbc4380c7f6120460c174bd10fef6342099915",
+                "md5": "841a6dde4037a39f7ddd0fb92f245c9d",
+                "size": "1666176"
+            },
+            "cuda12": {
+                "relative_path": "cudnn_samples/linux-sbsa/cudnn_samples-linux-sbsa-8.9.7.29_cuda12-archive.tar.xz",
+                "sha256": "4d84211d62e636ad3728674e55e9ce91e29c78d071fcb78453f8a71902758836",
+                "md5": "0e80992ee19918efd714199f41cbe24b",
+                "size": "1664288"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_9.8.0.json b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_9.8.0.json
new file mode 100644
index 000000000000..3265e008f6a6
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_9.8.0.json
@@ -0,0 +1,77 @@
+{
+    "release_date": "2025-03-04",
+    "release_label": "9.8.0",
+    "release_product": "cudnn",
+    "cudnn": {
+        "name": "NVIDIA CUDA Deep Neural Network library",
+        "license": "cudnn",
+        "license_path": "cudnn/LICENSE.txt",
+        "version": "9.8.0.87",
+        "linux-x86_64": {
+            "cuda11": {
+                "relative_path": "cudnn/linux-x86_64/cudnn-linux-x86_64-9.8.0.87_cuda11-archive.tar.xz",
+                "sha256": "cf4dfaef8311d987d640a322f668cd5240ac3e5302abe9617dd991b5b2532758",
+                "md5": "f8cc1eb607dd83dbaa12f9ba80934cbb",
+                "size": "561520128"
+            },
+            "cuda12": {
+                "relative_path": "cudnn/linux-x86_64/cudnn-linux-x86_64-9.8.0.87_cuda12-archive.tar.xz",
+                "sha256": "321b9b33bb1287404d93d5672d352f16feabc4b220ac6ae0b86e4b27f257dcf4",
+                "md5": "3674444654eb59b6f4c919103a8531af",
+                "size": "923946888"
+            }
+        },
+        "cuda_variant": [
+            "11",
+            "12"
+        ],
+        "linux-sbsa": {
+            "cuda11": {
+                "relative_path": "cudnn/linux-sbsa/cudnn-linux-sbsa-9.8.0.87_cuda11-archive.tar.xz",
+                "sha256": "8ff117715fb3323032d1b489880117556ad8b5e57a9060143f0cb72384db7710",
+                "md5": "b38a6fba3c53ded236b5596d405c7ef6",
+                "size": "560558204"
+            },
+            "cuda12": {
+                "relative_path": "cudnn/linux-sbsa/cudnn-linux-sbsa-9.8.0.87_cuda12-archive.tar.xz",
+                "sha256": "22f62f474f0cbb35bef540adb1d841da63c9cd3df76b3c4e43010f436b2cd85c",
+                "md5": "3ec9ec13b42e5f43f49cfa63f83b46fa",
+                "size": "922963076"
+            }
+        },
+        "windows-x86_64": {
+            "cuda11": {
+                "relative_path": "cudnn/windows-x86_64/cudnn-windows-x86_64-9.8.0.87_cuda11-archive.zip",
+                "sha256": "b2995837e6b9a5b3816a0cd90480769cd4280f965c2ef0848debf029f391ca8f",
+                "md5": "39b78253550678399367b160d7503e04",
+                "size": "422255533"
+            },
+            "cuda12": {
+                "relative_path": "cudnn/windows-x86_64/cudnn-windows-x86_64-9.8.0.87_cuda12-archive.zip",
+                "sha256": "d8a23705e3884b137b7e05449fb2b61bfa524e7cfc3fda80743d633f423c6ce4",
+                "md5": "c9926e3b1638d775ae384837ccd97c72",
+                "size": "675349654"
+            }
+        },
+        "linux-aarch64": {
+            "cuda12": {
+                "relative_path": "cudnn/linux-aarch64/cudnn-linux-aarch64-9.8.0.87_cuda12-archive.tar.xz",
+                "sha256": "f03ece3ff07d1719f06218973a8797cec1be387cc317baab5bb118dc988199e7",
+                "md5": "989ba35d01495ea4c66097b021eb7cda",
+                "size": "964790260"
+            }
+        }
+    },
+    "cudnn_samples": {
+        "name": "NVIDIA cuDNN samples",
+        "license": "cudnn",
+        "license_path": "cudnn_samples/LICENSE.txt",
+        "version": "9.8.0.87",
+        "source": {
+            "relative_path": "cudnn_samples/source/cudnn_samples-source-9.8.0.87-archive.tar.xz",
+            "sha256": "2a63562a3a9b2cdcd9d8bce1dcc106a3cc9f47a6448b7a77b0e3b8f8776d0a41",
+            "md5": "e0a198f07791ece1d635d56c9626132a",
+            "size": "1666724"
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/README.md b/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/README.md
new file mode 100644
index 000000000000..80252fca2261
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/README.md
@@ -0,0 +1,7 @@
+# cusparselt
+
+Link: <https://developer.download.nvidia.com/compute/cusparselt/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/cusparselt/getting_started.html#prerequisites>
+
+NOTE: 0.7.1 only supports CUDA 12.8 and later.
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/redistrib_0.6.3.json b/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/redistrib_0.6.3.json
new file mode 100644
index 000000000000..d2d8279c9d75
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/redistrib_0.6.3.json
@@ -0,0 +1,35 @@
+{
+    "release_date": "2024-10-15",
+    "release_label": "0.6.3",
+    "release_product": "cusparselt",
+    "libcusparse_lt": {
+        "name": "NVIDIA cuSPARSELt",
+        "license": "cuSPARSELt",
+        "license_path": "libcusparse_lt/LICENSE.txt",
+        "version": "0.6.3.2",
+        "linux-x86_64": {
+            "relative_path": "libcusparse_lt/linux-x86_64/libcusparse_lt-linux-x86_64-0.6.3.2-archive.tar.xz",
+            "sha256": "a2f856e78943f5c538bdef1c9edc64a5ed30bf8bb7d5fcb615c684ffe776cc31",
+            "md5": "d074824e3dc6c382160873a8ef49c098",
+            "size": "110698912"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcusparse_lt/linux-sbsa/libcusparse_lt-linux-sbsa-0.6.3.2-archive.tar.xz",
+            "sha256": "3e420ddbff4eb9ac603f57c7aa8b3d5271112816e244eb55ef9f30c4eb6a04b7",
+            "md5": "dd6b0dd464bb8596950ab761890e1ae1",
+            "size": "109919332"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcusparse_lt/windows-x86_64/libcusparse_lt-windows-x86_64-0.6.3.2-archive.zip",
+            "sha256": "6d276e33a399008c22ffefd707eefe2f57ff2ff8f1dc1929d9e3e75d3c83562d",
+            "md5": "95de6b57ceceb199f9b86bfbe5d2d394",
+            "size": "328143559"
+        },
+        "linux-aarch64": {
+            "relative_path": "libcusparse_lt/linux-aarch64/libcusparse_lt-linux-aarch64-0.6.3.2-archive.tar.xz",
+            "sha256": "91501d0c05d1ff0dd67399ecd7c1bf76a620e842dce54ae4c8a1f07cec0673e5",
+            "md5": "7f00c8663678a97948bbd2e98b65a9fa",
+            "size": "19000276"
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/cusparselt/manifests/redistrib_0.7.1.json b/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/redistrib_0.7.1.json
similarity index 100%
rename from pkgs/development/cuda-modules/cusparselt/manifests/redistrib_0.7.1.json
rename to pkgs/development/cuda-modules/_cuda/manifests/cusparselt/redistrib_0.7.1.json
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cutensor/README.md b/pkgs/development/cuda-modules/_cuda/manifests/cutensor/README.md
new file mode 100644
index 000000000000..5df404c3f6f9
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cutensor/README.md
@@ -0,0 +1,5 @@
+# cutensor
+
+Link: <https://developer.download.nvidia.com/compute/cutensor/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/cutensor/latest/index.html#support>
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cutensor/redistrib_2.2.0.json b/pkgs/development/cuda-modules/_cuda/manifests/cutensor/redistrib_2.2.0.json
new file mode 100644
index 000000000000..fa14d26a4d48
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cutensor/redistrib_2.2.0.json
@@ -0,0 +1,29 @@
+{
+    "release_date": "2025-03-13",
+    "release_label": "2.2.0",
+    "release_product": "cutensor",
+    "libcutensor": {
+        "name": "NVIDIA cuTENSOR",
+        "license": "cuTensor",
+        "license_path": "libcutensor/LICENSE.txt",
+        "version": "2.2.0.0",
+        "linux-x86_64": {
+            "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-2.2.0.0-archive.tar.xz",
+            "sha256": "db76dcbe997615ef8bc1e04c385e9a1e2016430afee7d6a242663baf17108dbf",
+            "md5": "48d7be41aa46cc1eb75b6603495a245e",
+            "size": "703852896"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-2.2.0.0-archive.tar.xz",
+            "sha256": "484791c8967a4137c544304e7d475b1cd753d9aad5d835ae6794f68087b1175a",
+            "md5": "dc0032e78d875068424010abf1aef6f0",
+            "size": "694257044"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-2.2.0.0-archive.zip",
+            "sha256": "b1f5c7b399f8124ccf70e4df751e43757b7727e1028ec04a27a4a63efff06885",
+            "md5": "db4563d3ee67f3bf6af4db31d326917d",
+            "size": "1288139786"
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/default.nix b/pkgs/development/cuda-modules/_cuda/manifests/default.nix
new file mode 100644
index 000000000000..8f33ebbfb413
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/default.nix
@@ -0,0 +1,19 @@
+{ lib }:
+lib.mapAttrs (
+  redistName: _type:
+  let
+    redistManifestDir = ./. + "/${redistName}";
+  in
+  lib.concatMapAttrs (
+    fileName: _type:
+    let
+      # Manifests all end in .json and are named "redistrib_<version>.json".
+      version = lib.removePrefix "redistrib_" (lib.removeSuffix ".json" fileName);
+    in
+    # NOTE: We do not require that all files have this pattern, as manifest directories may contain documentation
+    # and utility functions we should ignore.
+    lib.optionalAttrs (version != fileName) {
+      "${version}" = lib.importJSON (redistManifestDir + "/${fileName}");
+    }
+  ) (builtins.readDir redistManifestDir)
+) (builtins.removeAttrs (builtins.readDir ./.) [ "default.nix" ])
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/README.md b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/README.md
new file mode 100644
index 000000000000..a87a58ef70a6
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/README.md
@@ -0,0 +1,30 @@
+# tensorrt
+
+Requirements: <https://docs.nvidia.com/deeplearning/tensorrt/latest/getting-started/support-matrix.html#support-matrix>
+
+These redistributable manifests are made by hand to allow TensorRT to be packaged with the same functionality the other NVIDIA redistributable libraries are packaged with.
+
+Only available from 10.0.0 and onwards, which is when NVIDIA stopped putting them behind a login wall.
+
+You can find them at: <https://github.com/NVIDIA/TensorRT?tab=readme-ov-file#optional---if-not-using-tensorrt-container-specify-the-tensorrt-ga-release-build-path>.
+
+Construct entries using the provider `helper.sh` script.
+
+As an example:
+
+```console
+$ ./tensorrt/helper.sh 12.5 10.2.0.19 windows-x86_64
+main: storePath: /nix/store/l2hq83ihj3bcm4z836cz2dw3ilkhwrpy-TensorRT-10.2.0.19.Windows.win10.cuda-12.5.zip
+{
+  "windows-x86_64": {
+    "cuda12": {
+      "md5": "70282ec501c9e395a3ffdd0d2baf9d95",
+      "relative_path": "tensorrt/10.2.0/zip/TensorRT-10.2.0.19.Windows.win10.cuda-12.5.zip",
+      "sha256": "4a9c6e279fd36559551a6d88e37d835db5ebdc950246160257b0b538960e57fa",
+      "size": "1281366141"
+    }
+  }
+}
+```
+
+I set the `release_date` to the date of the corresponding release on their GitHub: <https://github.com/NVIDIA/TensorRT/releases>.
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/helper.sh b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/helper.sh
new file mode 100755
index 000000000000..ab7431e7bfba
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/helper.sh
@@ -0,0 +1,130 @@
+#!/usr/bin/env bash
+
+# Requires nix and jq
+
+set -euo pipefail
+
+mkRedistUrlRelativePath() {
+  local -r cudaMajorMinorVersion=${1:?}
+  local -r tensorrtMajorMinorPatchBuildVersion=${2:?}
+  local -r redistSystem=${3:?}
+
+  local -r tensorrtMajorMinorPatchVersion="$(echo "$tensorrtMajorMinorPatchBuildVersion" | cut -d. -f1-3)"
+  local -r tensorrtMinorVersion="$(echo "$tensorrtMajorMinorPatchVersion" | cut -d. -f2)"
+
+  local archiveDir=""
+  local archiveExtension=""
+  local osName=""
+  local platformName=""
+  case "$redistSystem" in
+  linux-aarch64) archiveDir="tars" && archiveExtension="tar.gz" && osName="l4t" && platformName="aarch64-gnu" ;;
+  linux-sbsa)
+    archiveDir="tars" && archiveExtension="tar.gz" && platformName="aarch64-gnu"
+    # 10.0-10.3 use Ubuntu 22.40
+    # 10.4-10.6 use Ubuntu 24.04
+    # 10.7+ use Linux
+    case "$tensorrtMinorVersion" in
+    0 | 1 | 2 | 3) osName="Ubuntu-22.04" ;;
+    4 | 5 | 6) osName="Ubuntu-24.04" ;;
+    *) osName="Linux" ;;
+    esac
+    ;;
+  linux-x86_64) archiveDir="tars" && archiveExtension="tar.gz" && osName="Linux" && platformName="x86_64-gnu" ;;
+  windows-x86_64)
+    archiveExtension="zip" && platformName="win10"
+    # Windows info is different for 10.0.*
+    case "$tensorrtMinorVersion" in
+    0) archiveDir="zips" && osName="Windows10" ;;
+    *) archiveDir="zip" && osName="Windows" ;;
+    esac
+    ;;
+  *)
+    echo "mkRedistUrlRelativePath: Unsupported redistSystem: $redistSystem" >&2
+    exit 1
+    ;;
+  esac
+
+  local -r relativePath="tensorrt/$tensorrtMajorMinorPatchVersion/$archiveDir/TensorRT-${tensorrtMajorMinorPatchBuildVersion}.${osName}.${platformName}.cuda-${cudaMajorMinorVersion}.${archiveExtension}"
+  echo "$relativePath"
+}
+
+getNixStorePath() {
+  local -r relativePath=${1:?}
+  local -r jsonBlob="$(nix store prefetch-file --json "https://developer.nvidia.com/downloads/compute/machine-learning/$relativePath")"
+  if [[ -z $jsonBlob ]]; then
+    echo "getNixStorePath: Failed to fetch jsonBlob for relativePath: $relativePath" >&2
+    exit 1
+  fi
+  local -r storePath="$(echo "$jsonBlob" | jq -cr '.storePath')"
+  echo "$storePath"
+}
+
+printOutput() {
+  local -r cudaMajorMinorVersion=${1:?}
+  local -r redistSystem=${2:?}
+  local -r md5Hash=${3:?}
+  local -r relativePath=${4:?}
+  local -r sha256Hash=${5:?}
+  local -r size=${6:?}
+
+  local -r cudaVariant="cuda$(echo "$cudaMajorMinorVersion" | cut -d. -f1)"
+
+  # Echo everything to stdout using JQ to format the output as JSON
+  jq \
+    --raw-output \
+    --sort-keys \
+    --null-input \
+    --arg redistSystem "$redistSystem" \
+    --arg cudaVariant "$cudaVariant" \
+    --arg md5Hash "$md5Hash" \
+    --arg relativePath "$relativePath" \
+    --arg sha256Hash "$sha256Hash" \
+    --arg size "$size" \
+    '{
+      $redistSystem: {
+        $cudaVariant: {
+          md5: $md5Hash,
+          relative_path: $relativePath,
+          sha256: $sha256Hash,
+          size: $size
+        }
+      }
+    }'
+}
+
+main() {
+  local -r cudaMajorMinorVersion=${1:?}
+  if [[ ! $cudaMajorMinorVersion =~ ^[0-9]+\.[0-9]+$ ]]; then
+    echo "main: Invalid cudaMajorMinorVersion: $cudaMajorMinorVersion" >&2
+    exit 1
+  fi
+
+  local -r tensorrtMajorMinorPatchBuildVersion=${2:?}
+  if [[ ! $tensorrtMajorMinorPatchBuildVersion =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
+    echo "main: Invalid tensorrtMajorMinorPatchBuildVersion: $tensorrtMajorMinorPatchBuildVersion" >&2
+    exit 1
+  fi
+
+  local -r redistSystem=${3:?}
+  case "$redistSystem" in
+  linux-aarch64) ;;
+  linux-sbsa) ;;
+  linux-x86_64) ;;
+  windows-x86_64) ;;
+  *)
+    echo "main: Unsupported redistSystem: $redistSystem" >&2
+    exit 1
+    ;;
+  esac
+
+  local -r relativePath="$(mkRedistUrlRelativePath "$cudaMajorMinorVersion" "$tensorrtMajorMinorPatchBuildVersion" "$redistSystem")"
+  local -r storePath="$(getNixStorePath "$relativePath")"
+  echo "main: storePath: $storePath" >&2
+  local -r md5Hash="$(nix hash file --type md5 --base16 "$storePath")"
+  local -r sha256Hash="$(nix hash file --type sha256 --base16 "$storePath")"
+  local -r size="$(du -b "$storePath" | cut -f1)"
+
+  printOutput "$cudaMajorMinorVersion" "$redistSystem" "$md5Hash" "$relativePath" "$sha256Hash" "$size"
+}
+
+main "$@"
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.7.0.json b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.7.0.json
new file mode 100644
index 000000000000..58c70ca39332
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.7.0.json
@@ -0,0 +1,37 @@
+{
+    "release_date": "2024-12-02",
+    "release_label": "10.7.0",
+    "release_product": "tensorrt",
+    "tensorrt": {
+        "name": "NVIDIA TensorRT",
+        "license": "TensorRT",
+        "version": "10.7.0.23",
+        "cuda_variant": [
+            "12"
+        ],
+        "linux-aarch64": {
+            "cuda12": {
+                "md5": "ec486c783455bf31a2561f2b7874585e",
+                "relative_path": "tensorrt/10.7.0/tars/TensorRT-10.7.0.23.l4t.aarch64-gnu.cuda-12.6.tar.gz",
+                "sha256": "b3028a82818a9daf6296f43d0cdecfa51eaea4552ffb6fe6fad5e6e1aea44da6",
+                "size": "655777784"
+            }
+        },
+        "linux-sbsa": {
+            "cuda12": {
+                "md5": "5b49557b4dc47641242a2bfb29e1cff1",
+                "relative_path": "tensorrt/10.7.0/tars/TensorRT-10.7.0.23.Linux.aarch64-gnu.cuda-12.6.tar.gz",
+                "sha256": "6b304cf014f2977e845bd44fdb343f0e7af2d9cded997bc9cfea3949d9e84dcb",
+                "size": "2469927296"
+            }
+        },
+        "linux-x86_64": {
+            "cuda12": {
+                "md5": "925c98fbe9abe82058814159727732a2",
+                "relative_path": "tensorrt/10.7.0/tars/TensorRT-10.7.0.23.Linux.x86_64-gnu.cuda-12.6.tar.gz",
+                "sha256": "d7f16520457caaf97ad8a7e94d802f89d77aedf9f361a255f2c216e2a3a40a11",
+                "size": "4446480887"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.9.0.json b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.9.0.json
new file mode 100644
index 000000000000..083119406e07
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/redistrib_10.9.0.json
@@ -0,0 +1,29 @@
+{
+    "release_date": "2025-03-11",
+    "release_label": "10.9.0",
+    "release_product": "tensorrt",
+    "tensorrt": {
+        "name": "NVIDIA TensorRT",
+        "license": "TensorRT",
+        "version": "10.9.0.34",
+        "cuda_variant": [
+            "12"
+        ],
+        "linux-sbsa": {
+            "cuda12": {
+                "md5": "e56a9f9d7327c65d9b95996d3008ed44",
+                "relative_path": "tensorrt/10.9.0/tars/TensorRT-10.9.0.34.Linux.aarch64-gnu.cuda-12.8.tar.gz",
+                "sha256": "b81ec2a067f67f082c13caec2dcef54385b42a9de6a4ecae6f318aa2d41964f2",
+                "size": "4123115318"
+            }
+        },
+        "linux-x86_64": {
+            "cuda12": {
+                "md5": "ee49e3e6e00b21274907956216b6769f",
+                "relative_path": "tensorrt/10.9.0/tars/TensorRT-10.9.0.34.Linux.x86_64-gnu.cuda-12.8.tar.gz",
+                "sha256": "33be0e61e3bf177bbbcabb4892bf013f0c8ac71d2be73f2803848a382cb14272",
+                "size": "6917032417"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/aliases.nix b/pkgs/development/cuda-modules/aliases.nix
index 9f73d75d8d2d..3eef4e7b6ae8 100644
--- a/pkgs/development/cuda-modules/aliases.nix
+++ b/pkgs/development/cuda-modules/aliases.nix
@@ -25,4 +25,8 @@ builtins.mapAttrs mkRenamed {
     package = final.cudatoolkit;
   };
 
+  cusparselt = {
+    path = "cudaPackages.libcusparse_lt";
+    package = final.libcusparse_lt;
+  };
 }
diff --git a/pkgs/development/cuda-modules/cuda-library-samples/extension.nix b/pkgs/development/cuda-modules/cuda-library-samples/extension.nix
deleted file mode 100644
index 1184547c7f93..000000000000
--- a/pkgs/development/cuda-modules/cuda-library-samples/extension.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ lib, stdenv }:
-let
-  inherit (stdenv) hostPlatform;
-
-  # Samples are built around the CUDA Toolkit, which is not available for
-  # aarch64. Check for both CUDA version and platform.
-  platformIsSupported = hostPlatform.isx86_64 && hostPlatform.isLinux;
-
-  # Build our extension
-  extension =
-    final: _:
-    lib.attrsets.optionalAttrs platformIsSupported {
-      cuda-library-samples = final.callPackage ./generic.nix { };
-    };
-in
-extension
diff --git a/pkgs/development/cuda-modules/cuda/extension.nix b/pkgs/development/cuda-modules/cuda/extension.nix
deleted file mode 100644
index 706631c06285..000000000000
--- a/pkgs/development/cuda-modules/cuda/extension.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ cudaMajorMinorVersion, lib }:
-let
-  inherit (lib) attrsets modules trivial;
-  redistName = "cuda";
-
-  # Manifest files for CUDA redistributables (aka redist). These can be found at
-  # https://developer.download.nvidia.com/compute/cuda/redist/
-  # Maps a cuda version to the specific version of the manifest.
-  cudaVersionMap = {
-    "12.6" = "12.6.3";
-    "12.8" = "12.8.1";
-    "12.9" = "12.9.1";
-  };
-
-  # Check if the current CUDA version is supported.
-  cudaVersionMappingExists = builtins.hasAttr cudaMajorMinorVersion cudaVersionMap;
-
-  # fullCudaVersion : String
-  fullCudaVersion = cudaVersionMap.${cudaMajorMinorVersion};
-
-  evaluatedModules = modules.evalModules {
-    modules = [
-      ../modules
-      # We need to nest the manifests in a config.cuda.manifests attribute so the
-      # module system can evaluate them.
-      {
-        cuda.manifests = {
-          redistrib = trivial.importJSON (./manifests + "/redistrib_${fullCudaVersion}.json");
-          feature = trivial.importJSON (./manifests + "/feature_${fullCudaVersion}.json");
-        };
-      }
-    ];
-  };
-
-  # Generally we prefer to do things involving getting attribute names with feature_manifest instead
-  # of redistrib_manifest because the feature manifest will have *only* the redist system
-  # names as the keys, whereas the redistrib manifest will also have things like version, name, license,
-  # and license_path.
-  featureManifest = evaluatedModules.config.cuda.manifests.feature;
-  redistribManifest = evaluatedModules.config.cuda.manifests.redistrib;
-
-  # Builder function which builds a single redist package for a given platform.
-  # buildRedistPackage : callPackage -> PackageName -> Derivation
-  buildRedistPackage =
-    callPackage: pname:
-    callPackage ../generic-builders/manifest.nix {
-      inherit pname redistName;
-      # We pass the whole release to the builder because it has logic to handle
-      # the case we're trying to build on an unsupported platform.
-      redistribRelease = redistribManifest.${pname};
-      featureRelease = featureManifest.${pname};
-    };
-
-  # Build all the redist packages given final and prev.
-  redistPackages =
-    final: _prev:
-    # Wrap the whole thing in an optionalAttrs so we can return an empty set if the CUDA version
-    # is not supported.
-    # NOTE: We cannot include the call to optionalAttrs *in* the pipe as we would strictly evaluate the
-    # attrNames before we check if the CUDA version is supported.
-    attrsets.optionalAttrs cudaVersionMappingExists (
-      trivial.pipe featureManifest [
-        # Get all the package names
-        builtins.attrNames
-        # Build the redist packages
-        (trivial.flip attrsets.genAttrs (buildRedistPackage final.callPackage))
-      ]
-    );
-in
-redistPackages
diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_12.6.3.json b/pkgs/development/cuda-modules/cuda/manifests/feature_12.6.3.json
deleted file mode 100644
index 7ee3951de1d6..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/feature_12.6.3.json
+++ /dev/null
@@ -1,1386 +0,0 @@
-{
-  "cuda_cccl": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_compat": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cudart": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuobjdump": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cupti": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": true,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuxxfilt": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_demo_suite": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_documentation": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_gdb": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nsight": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvcc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvdisasm": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvml_dev": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprof": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprune": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvrtc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvtx": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvvp": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_opencl": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_profiler_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_sanitizer_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "fabricmanager": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "imex": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcublas": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcudla": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufft": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufile": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    }
-  },
-  "libcurand": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusolver": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusparse": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnpp": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvfatbin": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvidia_nscq": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjitlink": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjpeg": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvsdm": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_compute": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_systems": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_vse": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_driver": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_fs": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "visual_studio_integration": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_12.8.1.json b/pkgs/development/cuda-modules/cuda/manifests/feature_12.8.1.json
deleted file mode 100644
index 20aa77b1ba1e..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/feature_12.8.1.json
+++ /dev/null
@@ -1,1410 +0,0 @@
-{
-  "cuda_cccl": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_compat": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cudart": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuobjdump": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cupti": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": true,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuxxfilt": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_demo_suite": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_documentation": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_gdb": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nsight": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvcc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvdisasm": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvml_dev": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprof": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprune": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvrtc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvtx": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvvp": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_opencl": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_profiler_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_sandbox_dev": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_sanitizer_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "driver_assistant": {
-    "linux-all": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "fabricmanager": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "imex": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcublas": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcudla": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufft": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufile": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    }
-  },
-  "libcurand": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusolver": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusparse": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnpp": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvfatbin": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvidia_nscq": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjitlink": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjpeg": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvsdm": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_compute": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_systems": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_vse": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_driver": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_fs": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "visual_studio_integration": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cuda/manifests/feature_12.9.1.json b/pkgs/development/cuda-modules/cuda/manifests/feature_12.9.1.json
deleted file mode 100644
index 00e11ae31f94..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/feature_12.9.1.json
+++ /dev/null
@@ -1,1520 +0,0 @@
-{
-  "collectx_bringup": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cccl": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_compat": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cudart": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuobjdump": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_cupti": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": true,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": true,
-        "static": false
-      }
-    }
-  },
-  "cuda_cuxxfilt": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_demo_suite": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_documentation": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_gdb": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nsight": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvcc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvdisasm": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvml_dev": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprof": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvprune": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvrtc": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvtx": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_nvvp": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_opencl": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_profiler_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "cuda_sandbox_dev": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": true
-      }
-    }
-  },
-  "cuda_sanitizer_api": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "driver_assistant": {
-    "linux-all": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "fabricmanager": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "imex": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcublas": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcudla": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufft": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcufile": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    }
-  },
-  "libcurand": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusolver": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libcusparse": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnpp": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvfatbin": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvidia_nscq": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjitlink": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvjpeg": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "libnvsdm": {
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "mft": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "mft_autocomplete": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "mft_oem": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_compute": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_systems": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nsight_vse": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_driver": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": true,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvidia_fs": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "nvlsm": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": false
-      }
-    }
-  },
-  "visual_studio_integration": {
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": false,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.9.1.json b/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.9.1.json
deleted file mode 100644
index 2ead9b4f283f..000000000000
--- a/pkgs/development/cuda-modules/cuda/manifests/redistrib_12.9.1.json
+++ /dev/null
@@ -1,1151 +0,0 @@
-{
-  "release_date": "2025-06-05",
-  "release_label": "12.9.1",
-  "release_product": "cuda",
-  "collectx_bringup": {
-    "name": "UFM telemetry CollectX Bringup",
-    "license": "NVIDIA Proprietary",
-    "license_path": "collectx_bringup/LICENSE.txt",
-    "version": "1.19.13",
-    "linux-x86_64": {
-      "relative_path": "collectx_bringup/linux-x86_64/collectx_bringup-linux-x86_64-1.19.13-archive.tar.xz",
-      "sha256": "4965fe096fca645a6d4565fd4d12366ae0ec31ec54ca20274910f34eea74b41a",
-      "md5": "d48b8c177f312c8774c54988594f725c",
-      "size": "125307508"
-    },
-    "linux-sbsa": {
-      "relative_path": "collectx_bringup/linux-sbsa/collectx_bringup-linux-sbsa-1.19.13-archive.tar.xz",
-      "sha256": "5d716fbb80ef7b9ac89f9e3fa8b900a29d4e6c0be487420dc4ee7a05340b57a9",
-      "md5": "dc2c0bfedf790ba7dc21f684510e592e",
-      "size": "120696772"
-    }
-  },
-  "cuda_cccl": {
-    "name": "CXX Core Compute Libraries",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_cccl/LICENSE.txt",
-    "version": "12.9.27",
-    "linux-x86_64": {
-      "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-12.9.27-archive.tar.xz",
-      "sha256": "8b1a5095669e94f2f9afd7715533314d418179e9452be61e2fde4c82a3e542aa",
-      "md5": "59e3cb66aeb96423dcca73218c85bc02",
-      "size": "997888"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-12.9.27-archive.tar.xz",
-      "sha256": "8c3da24801b500f1d9217d191bb4b63e5d2096c8e7d0b7695e876853180ba82f",
-      "md5": "b39d03cfac57a3b2ded8e9b0a6b0e782",
-      "size": "997840"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-12.9.27-archive.zip",
-      "sha256": "17aaa7c6b8f94a417d8f3261780b7e34b9cbdfab7513bce86768623b06aa28b5",
-      "md5": "afdfa89a35951f67b5bd70c513f5ef09",
-      "size": "3127658"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_cccl/linux-aarch64/cuda_cccl-linux-aarch64-12.9.27-archive.tar.xz",
-      "sha256": "8c87c2db67130108861609eacd40d30ee109656a7765e5172eab71dd6da4c453",
-      "md5": "25b1a257ed35393052577bd9ee432d3f",
-      "size": "998228"
-    }
-  },
-  "cuda_compat": {
-    "name": "CUDA compat L4T",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_compat/LICENSE.txt",
-    "version": "12.9.40580548",
-    "linux-aarch64": {
-      "relative_path": "cuda_compat/linux-aarch64/cuda_compat-linux-aarch64-12.9.40580548-archive.tar.xz",
-      "sha256": "c03fe18b9d23881f068ac97b45001a47778f83d2361728427a3f92b551b1c898",
-      "md5": "3ca26403b8b36c5cc18104ee174ec874",
-      "size": "37422044"
-    }
-  },
-  "cuda_cudart": {
-    "name": "CUDA Runtime (cudart)",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_cudart/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "1f6ad42d4f530b24bfa35894ccf6b7209d2354f59101fd62ec4a6192a184ce99",
-      "md5": "6153e2b6a43389e5be3d68b04c6488f5",
-      "size": "1514676"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-12.9.79-archive.tar.xz",
-      "sha256": "8b422a3b2cb8452cb678181b0bf9d7aa7342df168b5319c5488ae3b8514101fc",
-      "md5": "c4b3e0d206f5dc3aceaddb78a32424d3",
-      "size": "1521596"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-12.9.79-archive.zip",
-      "sha256": "179e9c43b0735ffe67207b3da556eb5a0c50f3047961882b7657d3b822d34ef8",
-      "md5": "22e500ce68dc9e099ec18f57e1309808",
-      "size": "3521238"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_cudart/linux-aarch64/cuda_cudart-linux-aarch64-12.9.79-archive.tar.xz",
-      "sha256": "f893e2c72be81b0d0e3bc33827c785a96db15fd5aafdc51cc187f3df6fdbb657",
-      "md5": "8970e9d40a7edada8cd9270906b1daa3",
-      "size": "1223440"
-    }
-  },
-  "cuda_cuobjdump": {
-    "name": "cuobjdump",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_cuobjdump/LICENSE.txt",
-    "version": "12.9.82",
-    "linux-x86_64": {
-      "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-12.9.82-archive.tar.xz",
-      "sha256": "ee0de40e8c18068bfcc53e73510e7e7a1a80555205347940df67fa525d24452f",
-      "md5": "fb4ceb446f3ca58c4ca5381a2c0eee06",
-      "size": "214896"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-12.9.82-archive.tar.xz",
-      "sha256": "2d39ae9309f81a7980df296a93c0e49215c6fb22d316fd9daae211d29a731d27",
-      "md5": "9ec739cea851b184b55017d0a6185304",
-      "size": "208936"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-12.9.82-archive.zip",
-      "sha256": "1eda43a76a2eac25fce5bdb4b68673b5bda737d54cca5513148c36362ab7c811",
-      "md5": "0a1c8b1f69537bc605c0d5fc28110258",
-      "size": "6219088"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_cuobjdump/linux-aarch64/cuda_cuobjdump-linux-aarch64-12.9.82-archive.tar.xz",
-      "sha256": "91a9ae2935b411d136c2c61ccbbc0df3a83f17cce122d12d262be202217163ee",
-      "md5": "ec5905b13be30f8f39e18d1f41dbcf18",
-      "size": "197604"
-    }
-  },
-  "cuda_cupti": {
-    "name": "CUPTI",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_cupti/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "f779a24e8f0177b4ce45cbf118cb470139fb5107858df96689d0a0aa01f0fba1",
-      "md5": "5fe49729261d1f899bd0948026b755ae",
-      "size": "16799436"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-12.9.79-archive.tar.xz",
-      "sha256": "84f8657375c23a425b2d107c3cde1ce75777bff9798b744b78e146fdc02d2de0",
-      "md5": "ff4c04b183cc173aa2937a21a3569b5b",
-      "size": "12805704"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-12.9.79-archive.zip",
-      "sha256": "c96018456dc4db6af6d69d6db0170a2ccc656ddde8c8ce6ee05682c2c5569daa",
-      "md5": "1cecfef05160d4e6b0f2549534fe7973",
-      "size": "13359912"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_cupti/linux-aarch64/cuda_cupti-linux-aarch64-12.9.79-archive.tar.xz",
-      "sha256": "74a884691b2c7e5c8db8bd2a38143fc82f7502f0dd484051809df7953f7ae719",
-      "md5": "7f92adb9aed6fdb047ebe3c7617c7179",
-      "size": "4781260"
-    }
-  },
-  "cuda_cuxxfilt": {
-    "name": "CUDA cuxxfilt (demangler)",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_cuxxfilt/LICENSE.txt",
-    "version": "12.9.82",
-    "linux-x86_64": {
-      "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-12.9.82-archive.tar.xz",
-      "sha256": "833d7e56351d032717f217212577d369d230e284b2ded4bf151403cc11213add",
-      "md5": "a7f4a446e4fb00657f5bd7eb1dd814a7",
-      "size": "188692"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-12.9.82-archive.tar.xz",
-      "sha256": "2175ef96b523eb8fea5d6ccfd21b70d6afaee623d00dbab70f11e8aa892c2828",
-      "md5": "fde8b2db7d7e4afb08e7c703fa735440",
-      "size": "177440"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-12.9.82-archive.zip",
-      "sha256": "ec5911d680394d90968c480c7359e7f5a4025b9c4806dad673d489e57585afd3",
-      "md5": "537cd82a0945fe20275d4791e353c3f5",
-      "size": "178570"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_cuxxfilt/linux-aarch64/cuda_cuxxfilt-linux-aarch64-12.9.82-archive.tar.xz",
-      "sha256": "37acae6576874c3781e844ea268a9fe076d13aaab3acda6f65bbe885a3726a3c",
-      "md5": "c8e23bff8cc13fb58a57c90d69e7b374",
-      "size": "170436"
-    }
-  },
-  "cuda_demo_suite": {
-    "name": "CUDA Demo Suite",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_demo_suite/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_demo_suite/linux-x86_64/cuda_demo_suite-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "92e0b324bf02d9705b8dd5bf1d36149c06512c720ceda7cc7d791fc3ecf64f0e",
-      "md5": "5030cddcab7101704bb8a9b53c6137ad",
-      "size": "4036604"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_demo_suite/windows-x86_64/cuda_demo_suite-windows-x86_64-12.9.79-archive.zip",
-      "sha256": "adffd0b0f7cca262025f171dcaa73f62af020de5d9a0d6e0fbe7dbd827dd77a8",
-      "md5": "9a8c3bbd696392e768ae3278e269cbd9",
-      "size": "5164004"
-    }
-  },
-  "cuda_documentation": {
-    "name": "CUDA Documentation",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_documentation/LICENSE.txt",
-    "version": "12.9.88",
-    "linux-x86_64": {
-      "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-12.9.88-archive.tar.xz",
-      "sha256": "d6e44c454654016a3650f3101688231ba111cd00647b726b34d18ff0bd721933",
-      "md5": "17436d82e589824bbf3f4ff669201d81",
-      "size": "67920"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-12.9.88-archive.tar.xz",
-      "sha256": "e1c47f32279a827baf8b4339c1737d7bd8e54c73388835e5fae3e2db83db2479",
-      "md5": "995f5692be016e44821fb85ebc3a62d9",
-      "size": "67924"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-12.9.88-archive.zip",
-      "sha256": "660f2f71b94c13a021850a8bb6227dfb4eb9a8dd8e0f6bc9feb0b993dea180fd",
-      "md5": "3d21d1b9056629557bb2745f962af636",
-      "size": "107626"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_documentation/linux-aarch64/cuda_documentation-linux-aarch64-12.9.88-archive.tar.xz",
-      "sha256": "830476a755f9a8c9780a6876d0ed562c073f29968c3e0e91962d0fd14b3f3618",
-      "md5": "098d318ebb7700a6513e57e41edf20c8",
-      "size": "67948"
-    }
-  },
-  "cuda_gdb": {
-    "name": "CUDA GDB",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_gdb/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "3dbb657683cd4f2989c30bdad31b3f4493795a9acc8a2214f48df3cfca7c37c0",
-      "md5": "1405f9cf4a5d2c03785a69aefa05de16",
-      "size": "67691620"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-12.9.79-archive.tar.xz",
-      "sha256": "251b9bd86ffcce0cdc4a5480ef3d8d609ca3a276cbbb5c793ca9978721d31faf",
-      "md5": "b76ab824a5b651ecec31978e6e2f41bf",
-      "size": "45695592"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_gdb/linux-aarch64/cuda_gdb-linux-aarch64-12.9.79-archive.tar.xz",
-      "sha256": "5473c27f1ec03fe064a09399e52b251e6ca5d3b9a67f21c1a26a02a26102f165",
-      "md5": "95325479bec751d72d4f063d8d244049",
-      "size": "45662012"
-    }
-  },
-  "cuda_nsight": {
-    "name": "Nsight Eclipse Edition Plugin",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_nsight/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "5c3994440ce7aa6ac5ab120e45f25f5f5eaa631af0f793fab860a5edbc499518",
-      "md5": "3bce6195222da1c1d549fbd2d83422e8",
-      "size": "118693300"
-    }
-  },
-  "cuda_nvcc": {
-    "name": "CUDA NVCC",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_nvcc/LICENSE.txt",
-    "version": "12.9.86",
-    "linux-x86_64": {
-      "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-12.9.86-archive.tar.xz",
-      "sha256": "7a1a5b652e5ef85c82b721d10672fc9a2dbaab44e9bd3c65a69517bf53998c35",
-      "md5": "ac1871c955070267e117bd985f6dbb36",
-      "size": "81100244"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-12.9.86-archive.tar.xz",
-      "sha256": "0aa1fce92dbae76c059c27eefb9d0ffb58e1291151e44ff7c7f1fc2dd9376c0d",
-      "md5": "1322a14e4d6482f69d4b8a14a7d5f4c5",
-      "size": "73407012"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-12.9.86-archive.zip",
-      "sha256": "227b109663b5e57d2718bcabb24a4ba0d9d4e52d958e327dc476f7c28691be85",
-      "md5": "ff9b2942aaa3a1dfb487da6767bc689f",
-      "size": "126917884"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_nvcc/linux-aarch64/cuda_nvcc-linux-aarch64-12.9.86-archive.tar.xz",
-      "sha256": "2432ef8a7c12d0a9ce3332a8af42b123c07f256390b3390802b1b2c6254c6c74",
-      "md5": "f846e79e53be949484a4968880eb9dd9",
-      "size": "77162776"
-    }
-  },
-  "cuda_nvdisasm": {
-    "name": "CUDA nvdisasm",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_nvdisasm/LICENSE.txt",
-    "version": "12.9.88",
-    "linux-x86_64": {
-      "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-12.9.88-archive.tar.xz",
-      "sha256": "49296dd550e05434185a8588ec639f1325b2de413e2321ddd7e56c5182a476ff",
-      "md5": "87ec016e430618bf724a3e8332bfcca6",
-      "size": "5483340"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-12.9.88-archive.tar.xz",
-      "sha256": "28b2597f0901cfafcd050cba0877c1eb5edcd7ebd8164aea356cec832e636ee3",
-      "md5": "0d6f0b8883e55ca07d64cbb746b80e8c",
-      "size": "5408212"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-12.9.88-archive.zip",
-      "sha256": "955ba1f52f7115031f10408ce3cec4c745df41dba8fdf6024c3983d899e9fbbc",
-      "md5": "43cd76e59014be18d96ce03e2ed09d6b",
-      "size": "5791897"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_nvdisasm/linux-aarch64/cuda_nvdisasm-linux-aarch64-12.9.88-archive.tar.xz",
-      "sha256": "99bf70149423c42c8dc2649f76f8983101dcf9879d355cfb2582b2adbed84614",
-      "md5": "cb9f7798d824ef1696fdde67f9506aa4",
-      "size": "5416148"
-    }
-  },
-  "cuda_nvml_dev": {
-    "name": "CUDA NVML Headers",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_nvml_dev/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "1ad0866dbfff6a9e2661f5348e4ca4c2a4e40882b90014ab127f2734856ecccb",
-      "md5": "7e615aa7b4525d3cc1b28379abcf6ce5",
-      "size": "129244"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-12.9.79-archive.tar.xz",
-      "sha256": "e97e668ead7ebc1fb7e93ffe303019660d0119c4e4d0e8ef26ce012bbbea9b34",
-      "md5": "d48bcaa83a7299b836d381b32e94a99d",
-      "size": "130480"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-12.9.79-archive.zip",
-      "sha256": "1894b70c5487a739c740929263fa3fbca80e53790647abc02b74eac024b97be8",
-      "md5": "213d773bb297b15e9f697ec8f1363bd9",
-      "size": "144955"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_nvml_dev/linux-aarch64/cuda_nvml_dev-linux-aarch64-12.9.79-archive.tar.xz",
-      "sha256": "531ac94b8b83209657cd14b28d23660df252393fb34c24f5d8919c56c977477e",
-      "md5": "3fe82d3f6042a22ac3d119192577db79",
-      "size": "130544"
-    }
-  },
-  "cuda_nvprof": {
-    "name": "CUDA nvprof",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_nvprof/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_nvprof/linux-x86_64/cuda_nvprof-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "8d8d1a9004710bad8d7a653769f088064b0285a06a80b46c4da7598115a0c6a2",
-      "md5": "df8f768c6c21b06cb048b9a4b0ac39e7",
-      "size": "2402440"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_nvprof/windows-x86_64/cuda_nvprof-windows-x86_64-12.9.79-archive.zip",
-      "sha256": "81aefd12ab0a24f88feee10303b814fcf21887b3947d5e73523ed14338ef4e2b",
-      "md5": "69ada7050609c5860a2396a6354665e0",
-      "size": "1705346"
-    }
-  },
-  "cuda_nvprune": {
-    "name": "CUDA nvprune",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_nvprune/LICENSE.txt",
-    "version": "12.9.82",
-    "linux-x86_64": {
-      "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-12.9.82-archive.tar.xz",
-      "sha256": "a06f0e2959a4dd3dbb62a984dbe77b813397022596f5c62d74ddd83b238571f2",
-      "md5": "db647ad5946c1e4cb0289c16e5ec92d8",
-      "size": "59372"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-12.9.82-archive.tar.xz",
-      "sha256": "15e1d6527bf04c162950251940b10b8b8254f68028e2ffc0bfb7ed84bb2e1382",
-      "md5": "3d51536a3582379389d821afa05becfd",
-      "size": "51052"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-12.9.82-archive.zip",
-      "sha256": "be23018507f015ca948c503a43a3c48449c0dc1ceaab1e721caf01f024727312",
-      "md5": "f5c1eaa20c7c8c67a564f04cec87fca2",
-      "size": "142316"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_nvprune/linux-aarch64/cuda_nvprune-linux-aarch64-12.9.82-archive.tar.xz",
-      "sha256": "69fa4cf2cede678825e0c8032ccd629e17de1b9d8667b05b6702d873fd2fb926",
-      "md5": "00c370560287a3dcdeedb32fe13e7e0e",
-      "size": "52876"
-    }
-  },
-  "cuda_nvrtc": {
-    "name": "CUDA NVRTC",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_nvrtc/LICENSE.txt",
-    "version": "12.9.86",
-    "linux-x86_64": {
-      "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-12.9.86-archive.tar.xz",
-      "sha256": "82913658363892dbc0f2638b070476234476e06e084fed60db861cb7e161a6af",
-      "md5": "8ed74b72c44ee50759f820dee875589c",
-      "size": "114231976"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-12.9.86-archive.tar.xz",
-      "sha256": "fb2d50c791465f333fc2236d2419170cf7a7886f48dd9b967a10f8233c686029",
-      "md5": "483dc56df046c9c03eb17cd637bb8fc9",
-      "size": "53265740"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-12.9.86-archive.zip",
-      "sha256": "1aa0644fa53c8ca34cdc73db17bcc73530557bdd3f582c7bfdbd7916c8b48f65",
-      "md5": "76317f5006ce9de6720cea0b3bdc7db6",
-      "size": "314608748"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_nvrtc/linux-aarch64/cuda_nvrtc-linux-aarch64-12.9.86-archive.tar.xz",
-      "sha256": "785b0952c0f77dd0feb9a674f3fcca3fcf05541bbe27f70a5926da9f85339152",
-      "md5": "b49aeba8583248a4cd628154361d313d",
-      "size": "57633224"
-    }
-  },
-  "cuda_nvtx": {
-    "name": "CUDA NVTX",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_nvtx/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "819bc39192955e6ba2067de39b85f30e157de462945e54b12bfdeda429d793fb",
-      "md5": "3a56b3c5c1e20d99cff4c354e57ea30f",
-      "size": "64496"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-12.9.79-archive.tar.xz",
-      "sha256": "dae359c2c51f83a5cd402468f481a82aeb6d32d79dc707d3625607e83cf97ceb",
-      "md5": "d783ac2926973ad682c69270d047c3f3",
-      "size": "64856"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-12.9.79-archive.zip",
-      "sha256": "b9d506ce9ba056bf171b60e9dada06fb3d8bed5453a6399d0541960bf9b81659",
-      "md5": "907cfcf3f3b637912ded30349ecfd515",
-      "size": "87029"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_nvtx/linux-aarch64/cuda_nvtx-linux-aarch64-12.9.79-archive.tar.xz",
-      "sha256": "f1a4366e45dbfd0a4e6210a5a4b9b51501aaebb6b58845d3f1b271ec3d7f3e15",
-      "md5": "6b40a46f73f46a7d8bac37b212989007",
-      "size": "65396"
-    }
-  },
-  "cuda_nvvp": {
-    "name": "CUDA NVVP",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_nvvp/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_nvvp/linux-x86_64/cuda_nvvp-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "6cdf9196373a848856c1afc6f1df1023649fb5fe77b896967ecc0b014b200003",
-      "md5": "0ded9b80cf8fc2c2233b28d582f2334e",
-      "size": "117732648"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_nvvp/windows-x86_64/cuda_nvvp-windows-x86_64-12.9.79-archive.zip",
-      "sha256": "a7e1ac0de34c69afc288283ea75314b67f109b08d046c3622405dff8f66b0720",
-      "md5": "dd673788d3fae14c38af5c1506fae11d",
-      "size": "120342251"
-    }
-  },
-  "cuda_opencl": {
-    "name": "CUDA OpenCL",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_opencl/LICENSE.txt",
-    "version": "12.9.19",
-    "linux-x86_64": {
-      "relative_path": "cuda_opencl/linux-x86_64/cuda_opencl-linux-x86_64-12.9.19-archive.tar.xz",
-      "sha256": "1bddacc2f0de77901faad5fecfad8fef8136ea8dd708e02177d10eef97d85b78",
-      "md5": "d0a85b602afc8957374d3f536dfd0306",
-      "size": "94140"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_opencl/windows-x86_64/cuda_opencl-windows-x86_64-12.9.19-archive.zip",
-      "sha256": "7c78e05697a3f74510c4154b175ce4597ed0719c7793236ca7f3989eccae0ff6",
-      "md5": "e2dec7d45f8d87045c4a37bb882e9cf4",
-      "size": "139663"
-    }
-  },
-  "cuda_profiler_api": {
-    "name": "CUDA Profiler API",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_profiler_api/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_profiler_api/linux-x86_64/cuda_profiler_api-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "8c50636bfb97e9420905aa795b9fa6e3ad0b30ec6a6c8b0b8db519beb9241ce6",
-      "md5": "483998e0e5b012d976bf62ada20bd4fa",
-      "size": "16316"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_profiler_api/linux-sbsa/cuda_profiler_api-linux-sbsa-12.9.79-archive.tar.xz",
-      "sha256": "e07f47ef3aeb3a3ca995e9070d77d98ad79460216bf2075c9f9018962ae1d03b",
-      "md5": "55345cd640f299f8da43ef946dd8aa89",
-      "size": "16316"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_profiler_api/windows-x86_64/cuda_profiler_api-windows-x86_64-12.9.79-archive.zip",
-      "sha256": "b05519f8ce4f02167bfc859358f62eb771d89ac2af3a6952a82317f2af4bc5bd",
-      "md5": "f5da20e1160f547602ec1c558dd0bc64",
-      "size": "20352"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_profiler_api/linux-aarch64/cuda_profiler_api-linux-aarch64-12.9.79-archive.tar.xz",
-      "sha256": "e26d82b4ce994dc445dc0191b1a5fe68dacc7290bfb9c2133b4979fe90e05433",
-      "md5": "738fe1e26407ab88e0fd3209b4da1cfa",
-      "size": "16308"
-    }
-  },
-  "cuda_sandbox_dev": {
-    "name": "CUDA nvsandboxutils Headers",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_sandbox_dev/LICENSE.txt",
-    "version": "12.9.19",
-    "linux-x86_64": {
-      "relative_path": "cuda_sandbox_dev/linux-x86_64/cuda_sandbox_dev-linux-x86_64-12.9.19-archive.tar.xz",
-      "sha256": "058c9616f9bb4e57c58996a053cf9a87f655c139dc2fa11af7bed74432bd8153",
-      "md5": "ce4326bc03b26b88a552db8b163d7f5f",
-      "size": "29172"
-    }
-  },
-  "cuda_sanitizer_api": {
-    "name": "CUDA Compute Sanitizer API",
-    "license": "CUDA Toolkit",
-    "license_path": "cuda_sanitizer_api/LICENSE.txt",
-    "version": "12.9.79",
-    "linux-x86_64": {
-      "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-12.9.79-archive.tar.xz",
-      "sha256": "e23aad21132ff58b92a22aad372a7048793400b79c625665d325d4ecec6979bf",
-      "md5": "9d138eb96c11e1b9293408e5b7a97114",
-      "size": "9758036"
-    },
-    "linux-sbsa": {
-      "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-12.9.79-archive.tar.xz",
-      "sha256": "281538927b6818d4687fad102c0603ab7b389513c9c129f3e0de8c61ac7f474d",
-      "md5": "3192ef7e50255f80430471ae6add0ebf",
-      "size": "7753752"
-    },
-    "windows-x86_64": {
-      "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-12.9.79-archive.zip",
-      "sha256": "b1f366312cb52164dfe7b78463ab085b742f052e74b89e9da08561a8ca8b06e9",
-      "md5": "1821743a8a46f3e4bab0fe96dac813f8",
-      "size": "10103190"
-    },
-    "linux-aarch64": {
-      "relative_path": "cuda_sanitizer_api/linux-aarch64/cuda_sanitizer_api-linux-aarch64-12.9.79-archive.tar.xz",
-      "sha256": "2baaba3ff47eceb529ddcc866fc7e647fd02427ef3dbb8bec06689f919c14c69",
-      "md5": "e48b00b6ed2124ac4a3a0b20201ba4dd",
-      "size": "4808620"
-    }
-  },
-  "driver_assistant": {
-    "name": "NVIDIA Driver Assistant",
-    "license": "MIT",
-    "license_path": "driver_assistant/LICENSE.txt",
-    "version": "0.21.57.08",
-    "linux-all": {
-      "relative_path": "driver_assistant/source/driver_assistant-0.21.57.08-archive.tar.xz",
-      "sha256": "4904c08e1de1aa790d200f36528aaa672ab6b3c6620bbfe5e221312b9ef1120a",
-      "md5": "ebb37f4ad248ddba8071c570f5267da3",
-      "size": "38644"
-    }
-  },
-  "fabricmanager": {
-    "name": "NVIDIA Fabric Manager",
-    "license": "NVIDIA Driver",
-    "license_path": "fabricmanager/LICENSE.txt",
-    "version": "575.57.08",
-    "linux-x86_64": {
-      "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-575.57.08-archive.tar.xz",
-      "sha256": "2e7dc4db6788e618af345fb50dee63115b5116ccb57d6d27d93c1ff5e2c3a8cf",
-      "md5": "39f4aa35a3f7cda55297bb73c91a5481",
-      "size": "8077772"
-    },
-    "linux-sbsa": {
-      "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-575.57.08-archive.tar.xz",
-      "sha256": "239a7f8406987fb6d44cd4f7f6ba6e843b3f3acb7b1732e6ab5c0d370690ee85",
-      "md5": "4d288febfed83ff3d532ebbc692f65ec",
-      "size": "7336832"
-    }
-  },
-  "imex": {
-    "name": "Nvidia-Imex",
-    "license": "NVIDIA Proprietary",
-    "license_path": "imex/LICENSE.txt",
-    "version": "575.57.08",
-    "linux-x86_64": {
-      "relative_path": "imex/linux-x86_64/nvidia-imex-linux-x86_64-575.57.08-archive.tar.xz",
-      "sha256": "5dfe195429b0967788b7e9b4bab85d4936220d6d2f6cf394a61bd3439b437506",
-      "md5": "909fd5da3b23f54e39484efd187f4c3e",
-      "size": "7718644"
-    },
-    "linux-sbsa": {
-      "relative_path": "imex/linux-sbsa/nvidia-imex-linux-sbsa-575.57.08-archive.tar.xz",
-      "sha256": "36d1a49fb52294ef5352eeea457d131f3d14320fca0a56633d7798ab32eead18",
-      "md5": "bd3d1ce8d91e1fd7d26191c05292698e",
-      "size": "7149236"
-    }
-  },
-  "libcublas": {
-    "name": "CUDA cuBLAS",
-    "license": "CUDA Toolkit",
-    "license_path": "libcublas/LICENSE.txt",
-    "version": "12.9.1.4",
-    "linux-x86_64": {
-      "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-12.9.1.4-archive.tar.xz",
-      "sha256": "546addc4a9d82b8f23aa9ba9274b6bc0429a63008a31c759884ac24880796057",
-      "md5": "9b07f0c3d94534e56e003c6016b9771c",
-      "size": "933611504"
-    },
-    "linux-sbsa": {
-      "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-12.9.1.4-archive.tar.xz",
-      "sha256": "e99b074e6f66034e563508118804599d7579f73afc8424c55ad5fd8d12e085a5",
-      "md5": "4c7cdc43283c0ba62e665b02e9ec7540",
-      "size": "932528492"
-    },
-    "windows-x86_64": {
-      "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-12.9.1.4-archive.zip",
-      "sha256": "d534d98b0b453a98914dbf3adf47d7e84b55037abf02f87466439e1dcef581ed",
-      "md5": "3f092963b0767968fe6f02febc1b0cbf",
-      "size": "549755186"
-    },
-    "linux-aarch64": {
-      "relative_path": "libcublas/linux-aarch64/libcublas-linux-aarch64-12.9.1.4-archive.tar.xz",
-      "sha256": "f75938d72153902cf08d1666311f35851e7eb6a16af743b2346bc68d7ba6b341",
-      "md5": "15f6396431885647e961af811a90cc06",
-      "size": "493899648"
-    }
-  },
-  "libcudla": {
-    "name": "cuDLA",
-    "license": "CUDA Toolkit",
-    "license_path": "libcudla/LICENSE.txt",
-    "version": "12.9.19",
-    "linux-aarch64": {
-      "relative_path": "libcudla/linux-aarch64/libcudla-linux-aarch64-12.9.19-archive.tar.xz",
-      "sha256": "ef7c1a05d9927c53aa089ec2217a1e999ffac0e776145d798bf784279fc79d40",
-      "md5": "dd1fc18bd0fe3ed38b87a453d31575a0",
-      "size": "38548"
-    }
-  },
-  "libcufft": {
-    "name": "CUDA cuFFT",
-    "license": "CUDA Toolkit",
-    "license_path": "libcufft/LICENSE.txt",
-    "version": "11.4.1.4",
-    "linux-x86_64": {
-      "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-11.4.1.4-archive.tar.xz",
-      "sha256": "b0e65af59b0c2f6c8ed9f5552a9b375890855b7926ae2c0404d15dcf2565bda4",
-      "md5": "3ffadd77d5b084470aa8d9215d760e76",
-      "size": "470942192"
-    },
-    "linux-sbsa": {
-      "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-11.4.1.4-archive.tar.xz",
-      "sha256": "b87637db96e485f4793d7ca8bd2cf07250eca5c86f6c56744a36683418359c03",
-      "md5": "4a0906639fd293f529b8f949bc3ad9eb",
-      "size": "471560648"
-    },
-    "windows-x86_64": {
-      "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-11.4.1.4-archive.zip",
-      "sha256": "f26f80bb9abff3269c548e1559e8c2b4ba58ccb8acc6095bbc6404fc962d4b80",
-      "md5": "504ad2e94fd0d923b8a7082659813431",
-      "size": "198361265"
-    },
-    "linux-aarch64": {
-      "relative_path": "libcufft/linux-aarch64/libcufft-linux-aarch64-11.4.1.4-archive.tar.xz",
-      "sha256": "5d992b98f0d3d294e339ed2f65a477a587803c1567598a120349fae52596bf20",
-      "md5": "1f10a57d45e9078e940340cdeff26478",
-      "size": "471529132"
-    }
-  },
-  "libcufile": {
-    "name": "CUDA cuFile",
-    "license": "CUDA Toolkit",
-    "license_path": "libcufile/LICENSE.txt",
-    "version": "1.14.1.1",
-    "linux-x86_64": {
-      "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.14.1.1-archive.tar.xz",
-      "sha256": "7ba9834b8dc2f8cdb1710a49f3de3f627bbcd4cc1f8a754019c66c8c80fdaee7",
-      "md5": "e59833cbd8e423948fa5814a276315e3",
-      "size": "42129088"
-    },
-    "linux-sbsa": {
-      "relative_path": "libcufile/linux-sbsa/libcufile-linux-sbsa-1.14.1.1-archive.tar.xz",
-      "sha256": "6b1d2a771bd822fdd06a6286eb59acba179b13fe063ae5b0de8fc0f4991a39d8",
-      "md5": "5a8499cdc22754fe5c9335065d708ea4",
-      "size": "41676328"
-    },
-    "linux-aarch64": {
-      "relative_path": "libcufile/linux-aarch64/libcufile-linux-aarch64-1.14.1.1-archive.tar.xz",
-      "sha256": "196b61a1bf02b85e76c21bdfe414a3f4db4380df41d9212c9eb6d0aa92eee1ce",
-      "md5": "c7e269a01ecd2dc427941c5bc775c2ef",
-      "size": "41655988"
-    }
-  },
-  "libcurand": {
-    "name": "CUDA cuRAND",
-    "license": "CUDA Toolkit",
-    "license_path": "libcurand/LICENSE.txt",
-    "version": "10.3.10.19",
-    "linux-x86_64": {
-      "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.3.10.19-archive.tar.xz",
-      "sha256": "48281b4caadb1cf790d44ac76b23c77d06f474c0b1799814f314aafec9258ad6",
-      "md5": "e2fd0b8dd197f3bccc0ee19e5640fc93",
-      "size": "89582256"
-    },
-    "linux-sbsa": {
-      "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.3.10.19-archive.tar.xz",
-      "sha256": "078afec842c99b3a953d62cc76bd74afa2d883dc436e6d642e6440bb1e85eb8e",
-      "md5": "fae5b6ce60678f452a2c760e8bf27563",
-      "size": "89544732"
-    },
-    "windows-x86_64": {
-      "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.3.10.19-archive.zip",
-      "sha256": "d0411f0b8c07e90d0fb6e01bfa7a54c9cb80f2ddf67e4ded2d96a50e19aadad6",
-      "md5": "6ccce2f4f1f6d9592c908fa1cb91536d",
-      "size": "67904600"
-    },
-    "linux-aarch64": {
-      "relative_path": "libcurand/linux-aarch64/libcurand-linux-aarch64-10.3.10.19-archive.tar.xz",
-      "sha256": "e5087640b5c9cd8bc173efb6a21f8388b24da59511cc3d57e60afc5e05d14b50",
-      "md5": "71ed8ff7a7e539c0be8ca4b699f2f3e1",
-      "size": "79761424"
-    }
-  },
-  "libcusolver": {
-    "name": "CUDA cuSOLVER",
-    "license": "CUDA Toolkit",
-    "license_path": "libcusolver/LICENSE.txt",
-    "version": "11.7.5.82",
-    "linux-x86_64": {
-      "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-11.7.5.82-archive.tar.xz",
-      "sha256": "3d3b96f3087dbc43893a28691b172f31725b316d524f5a3c1e6837257c898d06",
-      "md5": "efcc5d100623563d1a56dff59b45b65d",
-      "size": "324393196"
-    },
-    "linux-sbsa": {
-      "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-11.7.5.82-archive.tar.xz",
-      "sha256": "db463593ffcbc78f542a7f1ef808da43bf742acae654d970d99a47289c2a83e5",
-      "md5": "63113f462dc11289f996eec8bab1db74",
-      "size": "323573816"
-    },
-    "windows-x86_64": {
-      "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-11.7.5.82-archive.zip",
-      "sha256": "e991d64a0bbe3e0bb69ce2adce000244288002b0341894729666d66adb9b4f25",
-      "md5": "e2d79987f6e38f63cc64816f393a8e51",
-      "size": "322216184"
-    },
-    "linux-aarch64": {
-      "relative_path": "libcusolver/linux-aarch64/libcusolver-linux-aarch64-11.7.5.82-archive.tar.xz",
-      "sha256": "45e2fefeee5797c0492d8a9ee26c3dbb7af0cdcefe6f1cd25bd586daa633d9a0",
-      "md5": "e311d62bfc65c6afc29152f6e923f78c",
-      "size": "113258352"
-    }
-  },
-  "libcusparse": {
-    "name": "CUDA cuSPARSE",
-    "license": "CUDA Toolkit",
-    "license_path": "libcusparse/LICENSE.txt",
-    "version": "12.5.10.65",
-    "linux-x86_64": {
-      "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-12.5.10.65-archive.tar.xz",
-      "sha256": "a83415dcd3e1183afe363d4740f9f0309cfe560c6c08016c2a61468304f4b848",
-      "md5": "c7ed952d12dec0f50a4386e5d09203f6",
-      "size": "398914580"
-    },
-    "linux-sbsa": {
-      "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-12.5.10.65-archive.tar.xz",
-      "sha256": "8d1c8a57ba3eaecc3f7c11e29fed275a2f3dca5cea51dd2a24d07ab5d9998583",
-      "md5": "2d48c3aecca07be0a458a977350ce175",
-      "size": "398606816"
-    },
-    "windows-x86_64": {
-      "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-12.5.10.65-archive.zip",
-      "sha256": "abb4bfc01198f82fbc956773ccb98c578c03027b6ad425e829355be0c0a11a4a",
-      "md5": "33ce31c3d880596c31304c965dbfcdce",
-      "size": "358114928"
-    },
-    "linux-aarch64": {
-      "relative_path": "libcusparse/linux-aarch64/libcusparse-linux-aarch64-12.5.10.65-archive.tar.xz",
-      "sha256": "b294b6cd0acf5e68078d2fe4d41d95a4073fed780805adca7774bce7cbbe5b65",
-      "md5": "ce4d363d3affd40fe751f065ec2bd4cf",
-      "size": "131075108"
-    }
-  },
-  "libnpp": {
-    "name": "CUDA NPP",
-    "license": "CUDA Toolkit",
-    "license_path": "libnpp/LICENSE.txt",
-    "version": "12.4.1.87",
-    "linux-x86_64": {
-      "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-12.4.1.87-archive.tar.xz",
-      "sha256": "49351448d896854284ec708c14506eaaceb92aa01fbe35c91d5c52ad482e17ae",
-      "md5": "03de546e34ad54d0119594bc237c5e87",
-      "size": "331733872"
-    },
-    "linux-sbsa": {
-      "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-12.4.1.87-archive.tar.xz",
-      "sha256": "992d461905366cec4243b26ce7bfe997c0c0eabf53a001333025930a1a0c7237",
-      "md5": "8de3be3d9043a07011b0de46c49ea668",
-      "size": "330804724"
-    },
-    "windows-x86_64": {
-      "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-12.4.1.87-archive.zip",
-      "sha256": "cfcfbf59e4e5ce71113c058bd4eba3dd56e4db080932146d4047c0d44b4a558e",
-      "md5": "7549e1191510ae5ca9291e5f13c70296",
-      "size": "274109870"
-    },
-    "linux-aarch64": {
-      "relative_path": "libnpp/linux-aarch64/libnpp-linux-aarch64-12.4.1.87-archive.tar.xz",
-      "sha256": "50c9f80592eaf4f246c82475143768b848333d9f540782257d42023f5fe68fdf",
-      "md5": "869efb32d5ab9468fda4cb94848cf90f",
-      "size": "104647240"
-    }
-  },
-  "libnvfatbin": {
-    "name": "NVIDIA compiler library for fatbin interaction",
-    "license": "CUDA Toolkit",
-    "license_path": "libnvfatbin/LICENSE.txt",
-    "version": "12.9.82",
-    "linux-x86_64": {
-      "relative_path": "libnvfatbin/linux-x86_64/libnvfatbin-linux-x86_64-12.9.82-archive.tar.xz",
-      "sha256": "315be969a303437329bf72d7141babed024fc54f90a10aa748b03be8f826d57b",
-      "md5": "d5e2dc19c01ab62dbf437a1ef80847b1",
-      "size": "930820"
-    },
-    "linux-sbsa": {
-      "relative_path": "libnvfatbin/linux-sbsa/libnvfatbin-linux-sbsa-12.9.82-archive.tar.xz",
-      "sha256": "87bf71288ea7390d039b246fa794cad2ddd3b164ce9566f8542bb15039432cdb",
-      "md5": "91902ce86f6f55a4ecc948f95bf1c032",
-      "size": "836312"
-    },
-    "windows-x86_64": {
-      "relative_path": "libnvfatbin/windows-x86_64/libnvfatbin-windows-x86_64-12.9.82-archive.zip",
-      "sha256": "86563b25096bbc21d74b1c043701ec8596499f76b40e32f9ec9179fc10404d00",
-      "md5": "c0963a07d7f2cbffd34b0b1ec6cae5c0",
-      "size": "2217262"
-    },
-    "linux-aarch64": {
-      "relative_path": "libnvfatbin/linux-aarch64/libnvfatbin-linux-aarch64-12.9.82-archive.tar.xz",
-      "sha256": "248e77ede9afbd6060cda7de0475d222731ac021e22e696ce75ed72b426dfca9",
-      "md5": "814b2ff13e944a07669580eb85c0e653",
-      "size": "808780"
-    }
-  },
-  "libnvidia_nscq": {
-    "name": "NVIDIA NSCQ API",
-    "license": "NVIDIA Driver",
-    "license_path": "libnvidia_nscq/LICENSE.txt",
-    "version": "575.57.08",
-    "linux-x86_64": {
-      "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-575.57.08-archive.tar.xz",
-      "sha256": "7c54e959ee50212be8595e01ee76581c1f3a13c19b2279424b55a8d26385c41a",
-      "md5": "b86a87c4f9fd58a79ced07cf82cec271",
-      "size": "455504"
-    },
-    "linux-sbsa": {
-      "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-575.57.08-archive.tar.xz",
-      "sha256": "931004b8b2062249016a9bded2499f70331d27b265226ed879428b8bd7e4bb20",
-      "md5": "790ca3dd29b03a71f32ad1dd05611a9e",
-      "size": "446980"
-    }
-  },
-  "libnvjitlink": {
-    "name": "NVIDIA compiler library for JIT LTO functionality",
-    "license": "CUDA Toolkit",
-    "license_path": "libnvjitlink/LICENSE.txt",
-    "version": "12.9.86",
-    "linux-x86_64": {
-      "relative_path": "libnvjitlink/linux-x86_64/libnvjitlink-linux-x86_64-12.9.86-archive.tar.xz",
-      "sha256": "392cac3144b52ba14900bc7259ea6405ae6da88a8c704eab9bbbcc9ba4824b07",
-      "md5": "9156156146001536d1c8346783991d1b",
-      "size": "54021940"
-    },
-    "linux-sbsa": {
-      "relative_path": "libnvjitlink/linux-sbsa/libnvjitlink-linux-sbsa-12.9.86-archive.tar.xz",
-      "sha256": "9c9227c1e9122fd8448cafced3b32bc69f40d3c041d25034ea23611a1262852f",
-      "md5": "7fdf2864352ac613415327ebde38598b",
-      "size": "50981988"
-    },
-    "windows-x86_64": {
-      "relative_path": "libnvjitlink/windows-x86_64/libnvjitlink-windows-x86_64-12.9.86-archive.zip",
-      "sha256": "ee7175da9628d47ccc92dce6d28d57ca77633e79079a2aee90e2a645edcd1384",
-      "md5": "4cdb56f88316a5ade3edf69a1e7192e8",
-      "size": "265666466"
-    },
-    "linux-aarch64": {
-      "relative_path": "libnvjitlink/linux-aarch64/libnvjitlink-linux-aarch64-12.9.86-archive.tar.xz",
-      "sha256": "a24842165d98660d4ba9fd753395f7c9834445552110fabce4baa4c211fd2c52",
-      "md5": "548a35d56f08d07b1dc294a3c8172f71",
-      "size": "54783780"
-    }
-  },
-  "libnvjpeg": {
-    "name": "CUDA nvJPEG",
-    "license": "CUDA Toolkit",
-    "license_path": "libnvjpeg/LICENSE.txt",
-    "version": "12.4.0.76",
-    "linux-x86_64": {
-      "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-12.4.0.76-archive.tar.xz",
-      "sha256": "ddd8245b2803f5b55211261d7e5d7abf803c05f3b032238d0feaa6e09ea9401d",
-      "md5": "b9f7806fb279c9cdd0b4a40e4171b87b",
-      "size": "6378624"
-    },
-    "linux-sbsa": {
-      "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-12.4.0.76-archive.tar.xz",
-      "sha256": "405b5627ffd772d2837ae4ece123fdee841c34894dba2180a1c8e1b84c0f2665",
-      "md5": "bad1da3ec8865dbd3955a757bb6b7ba0",
-      "size": "6179324"
-    },
-    "windows-x86_64": {
-      "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-12.4.0.76-archive.zip",
-      "sha256": "b253241fc88bf30947b8ee068101aca8930960f113d8ee4a9583de021a79ffa1",
-      "md5": "d19d13f9bd3dbc9c9361a3c1fee99dd5",
-      "size": "4667529"
-    },
-    "linux-aarch64": {
-      "relative_path": "libnvjpeg/linux-aarch64/libnvjpeg-linux-aarch64-12.4.0.76-archive.tar.xz",
-      "sha256": "a9841bff40e577bec81352054e05c5d98720ae8e2ccfc4863eaac9dd35444c27",
-      "md5": "0a7197330938f8b5363d38bdde63562c",
-      "size": "1821640"
-    }
-  },
-  "libnvsdm": {
-    "name": "LIBNVSDM",
-    "license": "NVIDIA",
-    "license_path": "libnvsdm/LICENSE.txt",
-    "version": "575.57.08",
-    "linux-x86_64": {
-      "relative_path": "libnvsdm/linux-x86_64/libnvsdm-linux-x86_64-575.57.08-archive.tar.xz",
-      "sha256": "7a6ee934d5c328f9c05e967b63053c211f80485e0443ac119d887612a510ad53",
-      "md5": "788f7c59de54096d84dc7f645964ad2a",
-      "size": "500100"
-    }
-  },
-  "mft": {
-    "name": "NVLink 5 MFT",
-    "license": "NVIDIA Proprietary",
-    "license_path": "mft/LICENSE.txt",
-    "version": "4.30.1.510",
-    "linux-x86_64": {
-      "relative_path": "mft/linux-x86_64/mft-linux-x86_64-4.30.1.510-archive.tar.xz",
-      "sha256": "512714ab076d90d88550e60f5da65181363336cee94c67bff8821face8ef10b4",
-      "md5": "30698cf8741826df5ca3d4d3bb3a982c",
-      "size": "45536612"
-    },
-    "linux-sbsa": {
-      "relative_path": "mft/linux-sbsa/mft-linux-sbsa-4.30.1.510-archive.tar.xz",
-      "sha256": "95c05e1bc03ff81dffa58bfff26a1dd59c6300d6d5922662ae59c7af5788a310",
-      "md5": "78ef93686e91302f7b751fed8f83d9be",
-      "size": "44222004"
-    }
-  },
-  "mft_autocomplete": {
-    "name": "NVLink 5 MFT AUTOCOMPLETE",
-    "license": "NVIDIA Proprietary",
-    "license_path": "mft_autocomplete/LICENSE.txt",
-    "version": "4.30.1.510",
-    "linux-x86_64": {
-      "relative_path": "mft_autocomplete/linux-x86_64/mft_autocomplete-linux-x86_64-4.30.1.510-archive.tar.xz",
-      "sha256": "dc9069baa888c7ca0c3e55a3043d27b0100c29c81e6ed3346907dd49dabb1325",
-      "md5": "b65cb40bacfe276b3444920e8eef1f2f",
-      "size": "11884"
-    },
-    "linux-sbsa": {
-      "relative_path": "mft_autocomplete/linux-sbsa/mft_autocomplete-linux-sbsa-4.30.1.510-archive.tar.xz",
-      "sha256": "64647ce2a4de62e535ea7060d20d58c2613937071008c2a93894e1995facce2b",
-      "md5": "bf034fbf9f887d62434f83dc9727db80",
-      "size": "11880"
-    }
-  },
-  "mft_oem": {
-    "name": "NVLink 5 MFT OEM",
-    "license": "NVIDIA Proprietary",
-    "license_path": "mft_oem/LICENSE.txt",
-    "version": "4.30.1.510",
-    "linux-x86_64": {
-      "relative_path": "mft_oem/linux-x86_64/mft_oem-linux-x86_64-4.30.1.510-archive.tar.xz",
-      "sha256": "7a4729f8b91ba5c179820583189a4c95ffa9669312a28fe7ac03feebb726bbc3",
-      "md5": "7329d76d0e5b976f88ef1f2484d962de",
-      "size": "4708108"
-    },
-    "linux-sbsa": {
-      "relative_path": "mft_oem/linux-sbsa/mft_oem-linux-sbsa-4.30.1.510-archive.tar.xz",
-      "sha256": "b71bb03130b6dd3388a3e909cdf91cc9bca8b8098a8b80b5f376f5726e5b5e1c",
-      "md5": "e55a4d898553c2cf92be57724a8204e1",
-      "size": "4429188"
-    }
-  },
-  "nsight_compute": {
-    "name": "Nsight Compute",
-    "license": "NVIDIA SLA",
-    "license_path": "nsight_compute/LICENSE.txt",
-    "version": "2025.2.1.3",
-    "linux-x86_64": {
-      "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2025.2.1.3-archive.tar.xz",
-      "sha256": "02ab8867197aaf6a6ae3171293d70b6a9ddb20296be94ff4287741338cc2e1df",
-      "md5": "e81faf319af6b21f241bae535d3d1907",
-      "size": "300347320"
-    },
-    "linux-sbsa": {
-      "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2025.2.1.3-archive.tar.xz",
-      "sha256": "0e336a5139f76778b8ad70fdb49fb43817ec1bb3ee6e7425d59d99d8c455d976",
-      "md5": "18334b109fe6f10fdba2c2681726ba96",
-      "size": "107009604"
-    },
-    "windows-x86_64": {
-      "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2025.2.1.3-archive.zip",
-      "sha256": "e9d558654c98d83049969d133b98922b53ab8f4e3ba9e0a37bdb5e2ff300b7de",
-      "md5": "7cb9cff3e0718212866c7fbb4365dee5",
-      "size": "341265370"
-    },
-    "linux-aarch64": {
-      "relative_path": "nsight_compute/linux-aarch64/nsight_compute-linux-aarch64-2025.2.1.3-archive.tar.xz",
-      "sha256": "51c7762110c34728acd37878d4340f13612401fa622be0031b1a9e2ce112cfb2",
-      "md5": "355babae2f49f3f2c7ec1cf1c0b07966",
-      "size": "221171904"
-    }
-  },
-  "nsight_systems": {
-    "name": "Nsight Systems",
-    "license": "NVIDIA SLA",
-    "license_path": "nsight_systems/LICENSE.txt",
-    "version": "2025.1.3.140",
-    "linux-x86_64": {
-      "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2025.1.3.140-archive.tar.xz",
-      "sha256": "dded4227619340307be0ba5bc4e23bcbc966e2df3763170ebb20410c2b54754e",
-      "md5": "0b16c35f6e63a4fc33d14795e65bcd61",
-      "size": "1075732108"
-    },
-    "linux-sbsa": {
-      "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2025.1.3.140-archive.tar.xz",
-      "sha256": "479c46de1c459f7c760ef1ea5e5bbe61bfe7f4ba525ce4778d5ba25d874b8e1f",
-      "md5": "6d70406b53a94eba94d7c3552b938fe6",
-      "size": "980282844"
-    },
-    "windows-x86_64": {
-      "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2025.1.3.140-archive.zip",
-      "sha256": "8d61f266a8a1bc1ababd44de3ee38f7b85c8cdfcdaebace14c8f065d7624d0b3",
-      "md5": "b741046881531cbf6e3ccedb0b403432",
-      "size": "403084779"
-    }
-  },
-  "nsight_vse": {
-    "name": "Nsight Visual Studio Edition (VSE)",
-    "license": "NVIDIA SLA",
-    "license_path": "nsight_vse/LICENSE.txt",
-    "version": "2025.2.1.25125",
-    "windows-x86_64": {
-      "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2025.2.1.25125-archive.zip",
-      "sha256": "3f2b6ca8705929c97e0f931f0559921b110b9337cf11af5e017d0c95b5b31feb",
-      "md5": "7e74f479c09aece6e5b46c97d0d4cc86",
-      "size": "136237151"
-    }
-  },
-  "nvidia_driver": {
-    "name": "NVIDIA Linux Driver",
-    "license": "NVIDIA Driver",
-    "license_path": "nvidia_driver/LICENSE.txt",
-    "version": "575.57.08",
-    "linux-x86_64": {
-      "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-575.57.08-archive.tar.xz",
-      "sha256": "27ddfabde120a107527cbf88a6c96d1f81ee5c977462ce1a793051a3e678f552",
-      "md5": "9007dddd1e2d48f897958b676fbe30ff",
-      "size": "471616744"
-    },
-    "linux-sbsa": {
-      "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-575.57.08-archive.tar.xz",
-      "sha256": "4a7d1accb257f2539ff7dabb02319339fc3a8db622073e5dde33a5446910346a",
-      "md5": "3c2b686f392789d8f3a1db1ae2ad62be",
-      "size": "349127420"
-    }
-  },
-  "nvidia_fs": {
-    "name": "NVIDIA filesystem",
-    "license": "CUDA Toolkit",
-    "license_path": "nvidia_fs/LICENSE.txt",
-    "version": "2.25.7",
-    "linux-x86_64": {
-      "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.25.7-archive.tar.xz",
-      "sha256": "6e11ec0b885177ab21f4b864ff7417ea3cc1b0994f1c318767984557cd5b29d1",
-      "md5": "60d2fa54d55b739302e3db38a8a389c9",
-      "size": "60280"
-    },
-    "linux-sbsa": {
-      "relative_path": "nvidia_fs/linux-sbsa/nvidia_fs-linux-sbsa-2.25.7-archive.tar.xz",
-      "sha256": "62baf0beac2d446c0ff033fb3780cf348ab9c090d7903c210106dc98bb29d7eb",
-      "md5": "3859bed4b5e330cde0e2316f9cdcdaeb",
-      "size": "60296"
-    },
-    "linux-aarch64": {
-      "relative_path": "nvidia_fs/linux-aarch64/nvidia_fs-linux-aarch64-2.25.7-archive.tar.xz",
-      "sha256": "b8c67e28e9e23453183fb7d12ed9fed449427b2c11a21b1de4e7046a57d8d366",
-      "md5": "5128c63c80c1089340b65807445d921a",
-      "size": "60272"
-    }
-  },
-  "nvlsm": {
-    "name": "NVLSM SM component",
-    "license": "NVIDIA Proprietary",
-    "license_path": "nvlsm/LICENSE.txt",
-    "version": "2025.03.1",
-    "linux-x86_64": {
-      "relative_path": "nvlsm/linux-x86_64/nvlsm-linux-x86_64-2025.03.1-archive.tar.xz",
-      "sha256": "b034dad10a3154359e244b85206cd73f0fbce8e1cdf76058417b7b562c337388",
-      "md5": "6e09669fe8e4fb26e5334a1c4aa9dabb",
-      "size": "6890300"
-    },
-    "linux-sbsa": {
-      "relative_path": "nvlsm/linux-sbsa/nvlsm-linux-sbsa-2025.03.1-archive.tar.xz",
-      "sha256": "e260285ec01c6beb562a14625e9564b96374bb824ec62cc9866066a48710fa54",
-      "md5": "bc90989f567c27d8b39e607f719acba8",
-      "size": "6175832"
-    }
-  },
-  "visual_studio_integration": {
-    "name": "CUDA Visual Studio Integration",
-    "license": "CUDA Toolkit",
-    "license_path": "visual_studio_integration/LICENSE.txt",
-    "version": "12.9.79",
-    "windows-x86_64": {
-      "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-12.9.79-archive.zip",
-      "sha256": "d5b6514866395f52f04107da1aa523954f8dc76daf18a9f8699c3d564f294449",
-      "md5": "680fbdf0f345619c1fa3de5f1fc79090",
-      "size": "864204"
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cudnn/releases.nix b/pkgs/development/cuda-modules/cudnn/releases.nix
deleted file mode 100644
index d8c4d70ddd09..000000000000
--- a/pkgs/development/cuda-modules/cudnn/releases.nix
+++ /dev/null
@@ -1,112 +0,0 @@
-# NOTE: Check the following URLs for support matrices:
-#       v8 -> https://docs.nvidia.com/deeplearning/cudnn/archives/index.html
-#       v9 -> https://docs.nvidia.com/deeplearning/cudnn/frontend/latest/reference/support-matrix.html
-# Version policy is to keep the latest minor release for each major release.
-#             https://developer.download.nvidia.com/compute/cudnn/redist/
-{
-  cudnn.releases = {
-    # jetson
-    linux-aarch64 = [
-      {
-        version = "8.9.5.30";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-aarch64/cudnn-linux-aarch64-8.9.5.30_cuda12-archive.tar.xz";
-        hash = "sha256-BJH3sC9VwiB362eL8xTB+RdSS9UHz1tlgjm/mKRyM6E=";
-      }
-      {
-        version = "9.7.1.26";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-aarch64/cudnn-linux-aarch64-9.7.1.26_cuda12-archive.tar.xz";
-        hash = "sha256-jDPWAXKOiJYpblPwg5FUSh7F0Dgg59LLnd+pX9y7r1w=";
-      }
-      {
-        version = "9.8.0.87";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-aarch64/cudnn-linux-aarch64-9.8.0.87_cuda12-archive.tar.xz";
-        hash = "sha256-8D7OP/B9FxnwYhiXOoeXzsG+OHzDF7qrW7EY3JiBmec=";
-      }
-    ];
-    # powerpc
-    linux-ppc64le = [ ];
-    # server-grade arm
-    linux-sbsa = [
-      {
-        version = "8.9.7.29";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-8.9.7.29_cuda12-archive.tar.xz";
-        hash = "sha256-6Yt8gAEHheXVygHuTOm1sMjHNYfqb4ZIvjTT+NHUe9E=";
-      }
-      {
-        version = "9.3.0.75";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.6";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-9.3.0.75_cuda12-archive.tar.xz";
-        hash = "sha256-Eibdm5iciYY4VSlj0ACjz7uKCgy5uvjLCear137X1jk=";
-      }
-      {
-        version = "9.7.1.26";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-9.7.1.26_cuda12-archive.tar.xz";
-        hash = "sha256-koJFUKlesnWwbJCZhBDhLOBRQOBQjwkFZExlTJ7Xp2Q=";
-      }
-      {
-        version = "9.8.0.87";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-9.8.0.87_cuda12-archive.tar.xz";
-        hash = "sha256-IvYvR08MuzW+9UCtsdhB2mPJzT33azxOQwEPQ2ss2Fw=";
-      }
-      {
-        version = "9.11.0.98";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.9";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-sbsa/cudnn-linux-sbsa-9.11.0.98_cuda12-archive.tar.xz";
-        hash = "sha256-X81kUdiKnTt/rLwASB+l4rsV8sptxvhuCysgG8QuzVY=";
-      }
-
-    ];
-    # x86_64
-    linux-x86_64 = [
-      {
-        version = "8.9.7.29";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-8.9.7.29_cuda12-archive.tar.xz";
-        hash = "sha256-R1MzYlx+QqevPKCy91BqEG4wyTsaoAgc2cE++24h47s=";
-      }
-      {
-        version = "9.3.0.75";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.6";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-9.3.0.75_cuda12-archive.tar.xz";
-        hash = "sha256-PW7xCqBtyTOaR34rBX4IX/hQC73ueeQsfhNlXJ7/LCY=";
-      }
-      {
-        version = "9.7.1.26";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-9.7.1.26_cuda12-archive.tar.xz";
-        hash = "sha256-EJpeXGvN9Dlub2Pz+GLtLc8W7pPuA03HBKGxG98AwLE=";
-      }
-      {
-        version = "9.8.0.87";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-9.8.0.87_cuda12-archive.tar.xz";
-        hash = "sha256-MhubM7sSh0BNk9VnLTUvFv6rxLIgrGrguG5LJ/JX3PQ=";
-      }
-      {
-        version = "9.11.0.98";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.9";
-        url = "https://developer.download.nvidia.com/compute/cudnn/redist/cudnn/linux-x86_64/cudnn-linux-x86_64-9.11.0.98_cuda12-archive.tar.xz";
-        hash = "sha256-tgyPrQH6FSHS5x7TiIe5BHjX8Hs9pJ/WirEYqf7k2kg=";
-      }
-    ];
-  };
-}
diff --git a/pkgs/development/cuda-modules/cudnn/shims.nix b/pkgs/development/cuda-modules/cudnn/shims.nix
deleted file mode 100644
index 01918e88f07b..000000000000
--- a/pkgs/development/cuda-modules/cudnn/shims.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-# Shims to mimic the shape of ../modules/generic/manifests/{feature,redistrib}/release.nix
-{
-  package,
-  # redistSystem :: String
-  # String is "unsupported" if the given architecture is unsupported.
-  redistSystem,
-}:
-{
-  featureRelease = {
-    inherit (package) minCudaVersion maxCudaVersion;
-    ${redistSystem}.outputs = {
-      lib = true;
-      static = true;
-      dev = true;
-    };
-  };
-  redistribRelease = {
-    name = "NVIDIA CUDA Deep Neural Network library (cuDNN)";
-    inherit (package) hash url version;
-  };
-}
diff --git a/pkgs/development/cuda-modules/cusparselt/extension.nix b/pkgs/development/cuda-modules/cusparselt/extension.nix
deleted file mode 100644
index f53405e3d099..000000000000
--- a/pkgs/development/cuda-modules/cusparselt/extension.nix
+++ /dev/null
@@ -1,96 +0,0 @@
-# Support matrix can be found at
-# https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-880/support-matrix/index.html
-{
-  cudaLib,
-  lib,
-  redistSystem,
-}:
-let
-  inherit (lib)
-    attrsets
-    lists
-    modules
-    trivial
-    ;
-
-  redistName = "cusparselt";
-  pname = "libcusparse_lt";
-
-  cusparseltVersions = [
-    "0.7.1"
-  ];
-
-  # Manifests :: { redistrib, feature }
-
-  # Each release of cusparselt gets mapped to an evaluated module for that release.
-  # From there, we can get the min/max CUDA versions supported by that release.
-  # listOfManifests :: List Manifests
-  listOfManifests =
-    let
-      configEvaluator =
-        fullCusparseltVersion:
-        modules.evalModules {
-          modules = [
-            ../modules
-            # We need to nest the manifests in a config.cusparselt.manifests attribute so the
-            # module system can evaluate them.
-            {
-              cusparselt.manifests = {
-                redistrib = trivial.importJSON (./manifests + "/redistrib_${fullCusparseltVersion}.json");
-                feature = trivial.importJSON (./manifests + "/feature_${fullCusparseltVersion}.json");
-              };
-            }
-          ];
-        };
-      # Un-nest the manifests attribute set.
-      releaseGrabber = evaluatedModules: evaluatedModules.config.cusparselt.manifests;
-    in
-    lists.map (trivial.flip trivial.pipe [
-      configEvaluator
-      releaseGrabber
-    ]) cusparseltVersions;
-
-  # platformIsSupported :: Manifests -> Boolean
-  platformIsSupported =
-    { feature, redistrib, ... }:
-    (attrsets.attrByPath [
-      pname
-      redistSystem
-    ] null feature) != null;
-
-  # TODO(@connorbaker): With an auxiliary file keeping track of the CUDA versions each release supports,
-  # we could filter out releases that don't support our CUDA version.
-  # However, we don't have that currently, so we make a best-effort to try to build TensorRT with whatever
-  # libPath corresponds to our CUDA version.
-  # supportedManifests :: List Manifests
-  supportedManifests = builtins.filter platformIsSupported listOfManifests;
-
-  # Compute versioned attribute name to be used in this package set
-  # Patch version changes should not break the build, so we only use major and minor
-  # computeName :: RedistribRelease -> String
-  computeName =
-    { version, ... }: cudaLib.mkVersionedName redistName (lib.versions.majorMinor version);
-in
-final: _:
-let
-  # buildCusparseltPackage :: Manifests -> AttrSet Derivation
-  buildCusparseltPackage =
-    { redistrib, feature }:
-    let
-      drv = final.callPackage ../generic-builders/manifest.nix {
-        inherit pname redistName;
-        redistribRelease = redistrib.${pname};
-        featureRelease = feature.${pname};
-      };
-    in
-    attrsets.nameValuePair (computeName redistrib.${pname}) drv;
-
-  extension =
-    let
-      nameOfNewest = computeName (lists.last supportedManifests).redistrib.${pname};
-      drvs = builtins.listToAttrs (lists.map buildCusparseltPackage supportedManifests);
-      containsDefault = attrsets.optionalAttrs (drvs != { }) { cusparselt = drvs.${nameOfNewest}; };
-    in
-    drvs // containsDefault;
-in
-extension
diff --git a/pkgs/development/cuda-modules/cusparselt/manifests/feature_0.7.1.json b/pkgs/development/cuda-modules/cusparselt/manifests/feature_0.7.1.json
deleted file mode 100644
index 0b368e22bb24..000000000000
--- a/pkgs/development/cuda-modules/cusparselt/manifests/feature_0.7.1.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "libcusparse_lt": {
-    "linux-aarch64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cutensor/extension.nix b/pkgs/development/cuda-modules/cutensor/extension.nix
deleted file mode 100644
index 5f6724549e3e..000000000000
--- a/pkgs/development/cuda-modules/cutensor/extension.nix
+++ /dev/null
@@ -1,124 +0,0 @@
-# Support matrix can be found at
-# https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-880/support-matrix/index.html
-#
-# TODO(@connorbaker):
-# This is a very similar strategy to CUDA/CUDNN:
-#
-# - Get all versions supported by the current release of CUDA
-# - Build all of them
-# - Make the newest the default
-#
-# Unique twists:
-#
-# - Instead of providing different releases for each version of CUDA, CuTensor has multiple subdirectories in `lib`
-#   -- one for each version of CUDA.
-{
-  cudaLib,
-  cudaMajorMinorVersion,
-  lib,
-  redistSystem,
-}:
-let
-  inherit (lib)
-    attrsets
-    lists
-    modules
-    versions
-    trivial
-    ;
-
-  redistName = "cutensor";
-  pname = "libcutensor";
-
-  cutensorVersions = [
-    "2.0.2"
-    "2.1.0"
-  ];
-
-  # Manifests :: { redistrib, feature }
-
-  # Each release of cutensor gets mapped to an evaluated module for that release.
-  # From there, we can get the min/max CUDA versions supported by that release.
-  # listOfManifests :: List Manifests
-  listOfManifests =
-    let
-      configEvaluator =
-        fullCutensorVersion:
-        modules.evalModules {
-          modules = [
-            ../modules
-            # We need to nest the manifests in a config.cutensor.manifests attribute so the
-            # module system can evaluate them.
-            {
-              cutensor.manifests = {
-                redistrib = trivial.importJSON (./manifests + "/redistrib_${fullCutensorVersion}.json");
-                feature = trivial.importJSON (./manifests + "/feature_${fullCutensorVersion}.json");
-              };
-            }
-          ];
-        };
-      # Un-nest the manifests attribute set.
-      releaseGrabber = evaluatedModules: evaluatedModules.config.cutensor.manifests;
-    in
-    lists.map (trivial.flip trivial.pipe [
-      configEvaluator
-      releaseGrabber
-    ]) cutensorVersions;
-
-  # Our cudaMajorMinorVersion tells us which version of CUDA we're building against.
-  # The subdirectories in lib/ tell us which versions of CUDA are supported.
-  # Typically the names will look like this:
-  #
-  # - 11
-  # - 12
-
-  # libPath :: String
-  libPath = versions.major cudaMajorMinorVersion;
-
-  # A release is supported if it has a libPath that matches our CUDA version for our platform.
-  # LibPath are not constant across the same release -- one platform may support fewer
-  # CUDA versions than another.
-  # platformIsSupported :: Manifests -> Boolean
-  platformIsSupported =
-    { feature, redistrib, ... }:
-    (attrsets.attrByPath [
-      pname
-      redistSystem
-    ] null feature) != null;
-
-  # TODO(@connorbaker): With an auxiliary file keeping track of the CUDA versions each release supports,
-  # we could filter out releases that don't support our CUDA version.
-  # However, we don't have that currently, so we make a best-effort to try to build TensorRT with whatever
-  # libPath corresponds to our CUDA version.
-  # supportedManifests :: List Manifests
-  supportedManifests = builtins.filter platformIsSupported listOfManifests;
-
-  # Compute versioned attribute name to be used in this package set
-  # Patch version changes should not break the build, so we only use major and minor
-  # computeName :: RedistribRelease -> String
-  computeName =
-    { version, ... }: cudaLib.mkVersionedName redistName (lib.versions.majorMinor version);
-in
-final: _:
-let
-  # buildCutensorPackage :: Manifests -> AttrSet Derivation
-  buildCutensorPackage =
-    { redistrib, feature }:
-    let
-      drv = final.callPackage ../generic-builders/manifest.nix {
-        inherit pname redistName libPath;
-        redistribRelease = redistrib.${pname};
-        featureRelease = feature.${pname};
-      };
-    in
-    attrsets.nameValuePair (computeName redistrib.${pname}) drv;
-
-  extension =
-    let
-      nameOfNewest = computeName (lists.last supportedManifests).redistrib.${pname};
-      drvs = builtins.listToAttrs (lists.map buildCutensorPackage supportedManifests);
-      containsDefault = attrsets.optionalAttrs (drvs != { }) { cutensor = drvs.${nameOfNewest}; };
-    in
-    drvs // containsDefault;
-in
-extension
diff --git a/pkgs/development/cuda-modules/cutensor/manifests/feature_2.0.2.json b/pkgs/development/cuda-modules/cutensor/manifests/feature_2.0.2.json
deleted file mode 100644
index 99679aecbc44..000000000000
--- a/pkgs/development/cuda-modules/cutensor/manifests/feature_2.0.2.json
+++ /dev/null
@@ -1,44 +0,0 @@
-{
-  "libcutensor": {
-    "linux-ppc64le": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cutensor/manifests/feature_2.1.0.json b/pkgs/development/cuda-modules/cutensor/manifests/feature_2.1.0.json
deleted file mode 100644
index 4d6a398605a1..000000000000
--- a/pkgs/development/cuda-modules/cutensor/manifests/feature_2.1.0.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "libcutensor": {
-    "linux-sbsa": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "linux-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": true,
-        "sample": false,
-        "static": true
-      }
-    },
-    "windows-x86_64": {
-      "outputs": {
-        "bin": false,
-        "dev": true,
-        "doc": false,
-        "lib": false,
-        "sample": false,
-        "static": false
-      }
-    }
-  }
-}
diff --git a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_2.0.2.json b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_2.0.2.json
deleted file mode 100644
index cf790b7746c2..000000000000
--- a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_2.0.2.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "release_date": "2024-06-24",
-    "release_label": "2.0.2",
-    "release_product": "cutensor",
-    "libcutensor": {
-        "name": "NVIDIA cuTENSOR",
-        "license": "cuTensor",
-        "license_path": "libcutensor/LICENSE.txt",
-        "version": "2.0.2.4",
-        "linux-x86_64": {
-            "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-2.0.2.4-archive.tar.xz",
-            "sha256": "957b04ef6343aca404fe5f4a3f1f1d3ac0bd04ceb3acecc93e53f4d63bd91157",
-            "md5": "2b994ecba434e69ee55043cf353e05b4",
-            "size": "545271628"
-        },
-        "linux-ppc64le": {
-            "relative_path": "libcutensor/linux-ppc64le/libcutensor-linux-ppc64le-2.0.2.4-archive.tar.xz",
-            "sha256": "db2c05e231a26fb5efee470e1d8e11cb1187bfe0726b665b87cbbb62a9901ba0",
-            "md5": "6b00e29407452333946744c4084157e8",
-            "size": "543070992"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-2.0.2.4-archive.tar.xz",
-            "sha256": "9712b54aa0988074146867f9b6f757bf11a61996f3b58b21e994e920b272301b",
-            "md5": "c9bb31a92626a092d0c7152b8b3eaa18",
-            "size": "540299376"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-2.0.2.4-archive.zip",
-            "sha256": "ab2fca16d410863d14f2716cec0d07fb21d20ecd24ee47d309e9970c9c01ed4a",
-            "md5": "f6cfdb29a9a421a1ee4df674dd54028c",
-            "size": "921154033"
-        }
-    }
-}
diff --git a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_2.1.0.json b/pkgs/development/cuda-modules/cutensor/manifests/redistrib_2.1.0.json
deleted file mode 100644
index cf0ce0aa4b9a..000000000000
--- a/pkgs/development/cuda-modules/cutensor/manifests/redistrib_2.1.0.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "release_date": "2025-01-27",
-    "release_label": "2.1.0",
-    "release_product": "cutensor",
-    "libcutensor": {
-        "name": "NVIDIA cuTENSOR",
-        "license": "cuTensor",
-        "license_path": "libcutensor/LICENSE.txt",
-        "version": "2.1.0.9",
-        "linux-x86_64": {
-            "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-2.1.0.9-archive.tar.xz",
-            "sha256": "ee59fcb4e8d59fc0d8cebf5f7f23bf2a196a76e6bcdcaa621aedbdcabd20a759",
-            "md5": "ed15120c512dfb3e32b49103850bb9dd",
-            "size": "814871140"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-2.1.0.9-archive.tar.xz",
-            "sha256": "cef7819c4ecf3120d4f99b08463b8db1a8591be25147d1688371024885b1d2f0",
-            "md5": "fec00a1a825a05c0166eda6625dc587d",
-            "size": "782008004"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-2.1.0.9-archive.zip",
-            "sha256": "ed835ba7fd617000f77e1dff87403d123edf540bd99339e3da2eaab9d32a4040",
-            "md5": "9efcbc0c9c372b0e71e11d4487aa5ffa",
-            "size": "1514752712"
-        }
-    }
-}
diff --git a/pkgs/development/cuda-modules/default.nix b/pkgs/development/cuda-modules/default.nix
new file mode 100644
index 000000000000..48ddae3692de
--- /dev/null
+++ b/pkgs/development/cuda-modules/default.nix
@@ -0,0 +1,152 @@
+{
+  _cuda,
+  config,
+  lib,
+  pkgs,
+  # Manually provided arguments
+  manifests,
+}:
+let
+  inherit (lib.customisation) callPackagesWith;
+  inherit (lib.filesystem) packagesFromDirectoryRecursive;
+  inherit (lib.fixedPoints) composeManyExtensions extends;
+  inherit (lib.lists) optionals;
+  inherit (lib.strings) versionAtLeast versionOlder;
+  inherit (lib.versions) major majorMinor;
+  inherit (_cuda.lib)
+    dropDots
+    formatCapabilities
+    mkVersionedName
+    ;
+
+  # NOTE: This value is considered an implementation detail and should not be exposed in the attribute set.
+  cudaMajorMinorPatchVersion = manifests.cuda.release_label;
+  cudaMajorMinorVersion = majorMinor cudaMajorMinorPatchVersion;
+  cudaMajorVersion = major cudaMajorMinorPatchVersion;
+
+  cudaPackagesMajorMinorVersionedName = mkVersionedName "cudaPackages" cudaMajorMinorVersion;
+
+  # We must use an instance of Nixpkgs where the CUDA package set we're building is the default; if we do not, members
+  # of the versioned, non-default package sets may rely on (transitively) members of the default, unversioned CUDA
+  # package set.
+  # See `Using cudaPackages.pkgs` in doc/languages-frameworks/cuda.section.md for more information.
+  pkgs' =
+    let
+      cudaPackagesUnversionedName = "cudaPackages";
+      cudaPackagesMajorVersionedName = mkVersionedName cudaPackagesUnversionedName cudaMajorVersion;
+    in
+    pkgs.extend (
+      final: _: {
+        recurseForDerivations = false;
+        # The CUDA package set will be available as cudaPackages_x_y, so we need only update the aliases for the
+        # minor-versioned and unversioned package sets.
+        # cudaPackages_x = cudaPackages_x_y
+        ${cudaPackagesMajorVersionedName} = final.${cudaPackagesMajorMinorVersionedName};
+        # cudaPackages = cudaPackages_x
+        ${cudaPackagesUnversionedName} = final.${cudaPackagesMajorVersionedName};
+      }
+    );
+
+  cudaPackagesFixedPoint =
+    finalCudaPackages:
+    {
+      # NOTE:
+      # It is important that _cuda is not part of the package set fixed-point. As described by
+      # @SomeoneSerge:
+      # > The layering should be: configuration -> (identifies/is part of) cudaPackages -> (is built using) cudaLib.
+      # > No arrows should point in the reverse directions.
+      # That is to say that cudaLib should only know about package sets and configurations, because it implements
+      # functionality for interpreting configurations, resolving them against data, and constructing package sets.
+      # This decision is driven both by a separation of concerns and by "NAMESET STRICTNESS" (see above).
+      # Also see the comment in `pkgs/top-level/all-packages.nix` about the `_cuda` attribute.
+
+      inherit
+        cudaMajorMinorPatchVersion
+        cudaMajorMinorVersion
+        cudaMajorVersion
+        ;
+
+      pkgs = pkgs';
+
+      # Core
+      callPackages = callPackagesWith (pkgs' // finalCudaPackages);
+
+      cudaNamePrefix = "cuda${cudaMajorMinorVersion}";
+
+      cudaOlder = versionOlder cudaMajorMinorVersion;
+      cudaAtLeast = versionAtLeast cudaMajorMinorVersion;
+
+      # These must be modified through callPackage, not by overriding the scope, since we cannot
+      # depend on them recursively as they are used to add top-level attributes.
+      inherit manifests;
+
+      # Create backendStdenv variants for different host compilers, since users may want to build a CUDA project with
+      # Clang or GCC specifically.
+      # TODO(@connorbaker): Because of the way our setup hooks and patching of NVCC works, the user's choice of
+      # backendStdenv is largely disregarded or will cause build failures; fixing this would require the setup hooks
+      # and patching to be made aware of the current environment (perhaps by reading certain environment variables set
+      # by our backendStdenv).
+      # backendClangStdenv = finalCudaPackages.callPackage ./packages/backendStdenv.nix {
+      #   stdenv = pkgs'.clangStdenv;
+      # };
+      # backendGccStdenv = finalCudaPackages.callPackage ./packages/backendStdenv.nix {
+      #   stdenv = pkgs'.gccStdenv;
+      # };
+
+      # Must be constructed without `callPackage` to avoid replacing the `override` attribute with that of
+      # `callPackage`'s.
+      buildRedist = import ./buildRedist {
+        inherit (pkgs)
+          _cuda
+          autoAddDriverRunpath
+          autoPatchelfHook
+          config
+          fetchurl
+          lib
+          srcOnly
+          stdenv
+          ;
+        inherit (finalCudaPackages)
+          autoAddCudaCompatRunpath
+          backendStdenv
+          cudaMajorMinorVersion
+          cudaMajorVersion
+          cudaNamePrefix
+          flags
+          manifests
+          markForCudatoolkitRootHook
+          setupCudaHook
+          ;
+      };
+
+      flags =
+        formatCapabilities {
+          inherit (finalCudaPackages.backendStdenv) cudaCapabilities cudaForwardCompat;
+          inherit (_cuda.db) cudaCapabilityToInfo;
+        }
+        # TODO(@connorbaker): Enable the corresponding warnings in `./aliases.nix` after some
+        # time to allow users to migrate to cudaLib and backendStdenv.
+        // {
+          inherit dropDots;
+          cudaComputeCapabilityToName =
+            cudaCapability: _cuda.db.cudaCapabilityToInfo.${cudaCapability}.archName;
+          dropDot = dropDots;
+          isJetsonBuild = finalCudaPackages.backendStdenv.hasJetsonCudaCapability;
+        };
+    }
+    // packagesFromDirectoryRecursive {
+      inherit (finalCudaPackages) callPackage;
+      directory = ./packages;
+    };
+
+  composedExtensions = composeManyExtensions (
+    optionals config.allowAliases [
+      (import ./aliases.nix { inherit lib; })
+    ]
+    ++ _cuda.extensions
+  );
+in
+pkgs'.makeScopeWithSplicing' {
+  otherSplices = pkgs'.generateSplicesForMkScope [ cudaPackagesMajorMinorVersionedName ];
+  f = extends composedExtensions cudaPackagesFixedPoint;
+}
diff --git a/pkgs/development/cuda-modules/packages/README.md b/pkgs/development/cuda-modules/packages/README.md
new file mode 100644
index 000000000000..322522b048de
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/README.md
@@ -0,0 +1,19 @@
+# packages
+
+Packages which are not created by the redistributable builder.
+
+## Conventions
+
+- All new packages should include the following lines as part of their arguments to `stdenv.mkDerivation`:
+
+  ```nix
+  finalAttrs: {
+    __structuredAttrs = true;
+    strictDeps = true;
+
+    # NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
+    name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
+  }
+  ```
+
+  If the package does not require elements of the package set, then the `cudaNamePrefix` must be omitted: changing the name of a derivation yields a different hash and store path, so we would end up with multiple different store paths with the same content.
diff --git a/pkgs/development/cuda-modules/packages/backendStdenv.nix b/pkgs/development/cuda-modules/packages/backendStdenv.nix
index c0fbb7068a9a..3ad59dabeb86 100644
--- a/pkgs/development/cuda-modules/packages/backendStdenv.nix
+++ b/pkgs/development/cuda-modules/packages/backendStdenv.nix
@@ -6,8 +6,8 @@
 # E.g. for cudaPackages_12_9 we use gcc14 with gcc's libstdc++
 # Cf. https://github.com/NixOS/nixpkgs/pull/218265 for context
 {
-  config,
   _cuda,
+  config,
   cudaMajorMinorVersion,
   lib,
   pkgs,
@@ -15,7 +15,11 @@
   stdenvAdapters,
 }:
 let
-  inherit (builtins) toJSON;
+  inherit (builtins)
+    throw
+    toJSON
+    toString
+    ;
   inherit (_cuda.db) allSortedCudaCapabilities cudaCapabilityToInfo nvccCompatibilities;
   inherit (_cuda.lib)
     _cudaCapabilityIsDefault
@@ -24,9 +28,21 @@ let
     getRedistSystem
     mkVersionedName
     ;
-  inherit (lib) addErrorContext;
-  inherit (lib.customisation) extendDerivation;
-  inherit (lib.lists) filter intersectLists subtractLists;
+  inherit (lib)
+    addErrorContext
+    assertMsg
+    extendDerivation
+    filter
+    findFirst
+    intersectLists
+    pipe
+    range
+    reverseList
+    subtractLists
+    toIntBase10
+    versionAtLeast
+    ;
+  inherit (lib.versions) major;
 
   # NOTE: By virtue of processing a sorted list (allSortedCudaCapabilities), our groups will be sorted.
 
@@ -45,6 +61,9 @@ let
   passthruExtra = {
     nvccHostCCMatchesStdenvCC = backendStdenv.cc == stdenv.cc;
 
+    # TODO(@connorbaker): Does it make sense to expose the `stdenv` we were called with and the `stdenv` selected
+    # prior to using `stdenvAdapters.useLibsFrom`?
+
     # The Nix system of the host platform.
     hostNixSystem = stdenv.hostPlatform.system;
 
@@ -146,9 +165,78 @@ let
     _evaluateAssertions assertions
   );
 
+  # TODO(@connorbaker): Seems like `stdenvAdapters.useLibsFrom` breaks clangStdenv's ability to find header files.
+  # To reproduce: use `nix shell .#cudaPackages_12_6.backendClangStdenv.cc` since CUDA 12.6 supports at most Clang
+  # 18, but the current stdenv uses Clang 19, requiring this code path.
+  # With:
+  #
+  # ```cpp
+  # #include <cmath>
+  #
+  # int main() {
+  #     double value = 0.5;
+  #     double result = std::sin(value);
+  #     return 0;
+  # }
+  # ```
+  #
+  # we get:
+  #
+  # ```console
+  # $ clang++ ./main.cpp
+  # ./main.cpp:1:10: fatal error: 'cmath' file not found
+  #     1 | #include <cmath>
+  #       |          ^~~~~~~
+  # 1 error generated.
+  # ```
+  # TODO(@connorbaker): Seems like even using unmodified `clangStdenv` causes issues -- saxpy fails to build CMake
+  # errors during CUDA compiler identification about invalid redefinitions of things like `realpath`.
   backendStdenv =
-    stdenvAdapters.useLibsFrom stdenv
-      pkgs."gcc${nvccCompatibilities.${cudaMajorMinorVersion}.gcc.maxMajorVersion}Stdenv";
+    let
+      hostCCName =
+        if stdenv.cc.isGNU then
+          "gcc"
+        else if stdenv.cc.isClang then
+          "clang"
+        else
+          throw "cudaPackages.backendStdenv: unsupported host compiler: ${stdenv.cc.name}";
+
+      versions = nvccCompatibilities.${cudaMajorMinorVersion}.${hostCCName};
+
+      stdenvIsSupportedVersion =
+        versionAtLeast (major stdenv.cc.version) versions.minMajorVersion
+        && versionAtLeast versions.maxMajorVersion (major stdenv.cc.version);
+
+      maybeGetVersionedCC =
+        if hostCCName == "gcc" then
+          version: pkgs."gcc${version}Stdenv" or null
+        else
+          version: pkgs."llvmPackages_${version}".stdenv or null;
+
+      maybeHostStdenv =
+        pipe (range (toIntBase10 versions.minMajorVersion) (toIntBase10 versions.maxMajorVersion))
+          [
+            # Convert integers to strings.
+            (map toString)
+            # Prefer the highest available version.
+            reverseList
+            # Map to the actual stdenvs or null if unavailable.
+            (map maybeGetVersionedCC)
+            # Get the first available version.
+            (findFirst (x: x != null) null)
+          ];
+    in
+    # If the current stdenv's compiler version is compatible, or we're on an unsupported host system, use stdenv
+    # directly.
+    # If we're on an unsupported host system (like darwin), there's not much else we can do, but we should not break
+    # evaluation on unsupported systems.
+    if stdenvIsSupportedVersion || passthruExtra.hostRedistSystem == "unsupported" then
+      stdenv
+    # Otherwise, try to find a compatible stdenv.
+    else
+      assert assertMsg (maybeHostStdenv != null)
+        "backendStdenv: no supported host compiler found (tried ${hostCCName} ${versions.minMajorVersion} to ${versions.maxMajorVersion})";
+      stdenvAdapters.useLibsFrom stdenv maybeHostStdenv;
 in
 # TODO: Consider testing whether we in fact use the newer libstdc++
 extendDerivation assertCondition passthruExtra backendStdenv
diff --git a/pkgs/development/cuda-modules/packages/cuda-samples.nix b/pkgs/development/cuda-modules/packages/cuda-samples.nix
new file mode 100644
index 000000000000..e77ca8eda743
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda-samples.nix
@@ -0,0 +1,220 @@
+{
+  backendStdenv,
+  _cuda,
+  cmake,
+  cuda_cccl,
+  cuda_cudart,
+  cuda_nvcc,
+  cuda_nvrtc,
+  cuda_nvtx,
+  cuda_profiler_api,
+  cudaAtLeast,
+  cudaNamePrefix,
+  cudaOlder,
+  fetchFromGitHub,
+  flags,
+  lib,
+  libcublas,
+  libcufft,
+  libcurand,
+  libcusolver,
+  libcusparse,
+  libnpp,
+  libnvjitlink,
+  libnvjpeg,
+}:
+backendStdenv.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
+  pname = "cuda-samples";
+  version = "12.8";
+
+  # We should be able to use samples from the latest version of CUDA
+  # on most of the CUDA package sets we have.
+  # Plus, 12.8 and later are rewritten to use CMake which makes it much, much easier to build.
+  src = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "cuda-samples";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Ba0Fi0v/sQ+1iJ4mslgyIAE+oK5KO0lMoTQCC91vpiA=";
+  };
+
+  prePatch =
+    # https://github.com/NVIDIA/cuda-samples/issues/333
+    ''
+      nixLog "removing sample 0_Introduction/UnifiedMemoryStreams which requires OpenMP support for CUDA"
+      substituteInPlace \
+        "$NIX_BUILD_TOP/$sourceRoot/Samples/0_Introduction/CMakeLists.txt" \
+        --replace-fail \
+          'add_subdirectory(UnifiedMemoryStreams)' \
+          '# add_subdirectory(UnifiedMemoryStreams)'
+    ''
+    # This sample tries to use a relative path, which doesn't work for our splayed installation.
+    + ''
+      nixLog "patching sample 0_Introduction/matrixMul_nvrtc"
+      substituteInPlace \
+        "$NIX_BUILD_TOP/$sourceRoot/Samples/0_Introduction/matrixMul_nvrtc/CMakeLists.txt" \
+        --replace-fail \
+          "\''${CUDAToolkit_BIN_DIR}/../include/cooperative_groups" \
+          "${lib.getOutput "include" cuda_cudart}/include/cooperative_groups" \
+        --replace-fail \
+          "\''${CUDAToolkit_BIN_DIR}/../include/nv" \
+          "${lib.getOutput "include" cuda_cccl}/include/nv" \
+        --replace-fail \
+          "\''${CUDAToolkit_BIN_DIR}/../include/cuda" \
+          "${lib.getOutput "include" cuda_cccl}/include/cuda"
+    ''
+    # These three samples give undefined references, like
+    # nvlink error   : Undefined reference to '__cudaCDP2Free' in 'CMakeFiles/cdpBezierTessellation.dir/BezierLineCDP.cu.o'
+    # nvlink error   : Undefined reference to '__cudaCDP2Malloc' in 'CMakeFiles/cdpBezierTessellation.dir/BezierLineCDP.cu.o'
+    # nvlink error   : Undefined reference to '__cudaCDP2GetParameterBufferV2' in 'CMakeFiles/cdpBezierTessellation.dir/BezierLineCDP.cu.o'
+    # nvlink error   : Undefined reference to '__cudaCDP2LaunchDeviceV2' in 'CMakeFiles/cdpBezierTessellation.dir/BezierLineCDP.cu.o'
+    + ''
+      for sample in cdp{AdvancedQuicksort,BezierTessellation,Quadtree,SimplePrint,SimpleQuicksort}; do
+        nixLog "removing sample 3_CUDA_Features/$sample which fails to link"
+        substituteInPlace \
+          "$NIX_BUILD_TOP/$sourceRoot/Samples/3_CUDA_Features/CMakeLists.txt" \
+          --replace-fail \
+            "add_subdirectory($sample)" \
+            "# add_subdirectory($sample)"
+      done
+      unset -v sample
+    ''
+    + lib.optionalString (cudaOlder "12.4") ''
+      nixLog "removing sample 3_CUDA_Features/graphConditionalNodes which requires at least CUDA 12.4"
+      substituteInPlace \
+        "$NIX_BUILD_TOP/$sourceRoot/Samples/3_CUDA_Features/CMakeLists.txt" \
+        --replace-fail \
+          "add_subdirectory(graphConditionalNodes)" \
+          "# add_subdirectory(graphConditionalNodes)"
+    ''
+    # For some reason this sample requires a static library, which we don't propagate by default due to size.
+    + ''
+      nixLog "patching sample 4_CUDA_Libraries/simpleCUFFT_callback to use dynamic library"
+      substituteInPlace \
+        "$NIX_BUILD_TOP/$sourceRoot/Samples/4_CUDA_Libraries/simpleCUFFT_callback/CMakeLists.txt" \
+        --replace-fail \
+          'CUDA::cufft_static' \
+          'CUDA::cufft'
+    ''
+    # Patch to use the correct path to libnvJitLink.so, or disable the sample if older than 12.4.
+    + lib.optionalString (cudaOlder "12.4") ''
+      nixLog "removing sample 4_CUDA_Libraries/jitLto which requires at least CUDA 12.4"
+      substituteInPlace \
+        "$NIX_BUILD_TOP/$sourceRoot/Samples/4_CUDA_Libraries/CMakeLists.txt" \
+        --replace-fail \
+          "add_subdirectory(jitLto)" \
+          "# add_subdirectory(jitLto)"
+    ''
+    + lib.optionalString (cudaAtLeast "12.4") ''
+      nixLog "patching sample 4_CUDA_Libraries/jitLto to use correct path to libnvJitLink.so"
+      substituteInPlace \
+        "$NIX_BUILD_TOP/$sourceRoot/Samples/4_CUDA_Libraries/jitLto/CMakeLists.txt" \
+        --replace-fail \
+          "\''${CUDAToolkit_LIBRARY_DIR}/libnvJitLink.so" \
+          "${lib.getLib libnvjitlink}/lib/libnvJitLink.so"
+    ''
+    # /build/NVIDIA-cuda-samples-v12.8/Samples/4_CUDA_Libraries/watershedSegmentationNPP/watershedSegmentationNPP.cpp:272:80: error: cannot convert 'size_t*' {aka 'long unsigned int*'} to 'int*'
+    #   272 |         nppStatus = nppiSegmentWatershedGetBufferSize_8u_C1R(oSizeROI[nImage], &aSegmentationScratchBufferSize[nImage]);
+    #       |                                                                                ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+    #       |                                                                                |
+    #       |                                                                                size_t* {aka long unsigned int*}
+    + lib.optionalString (cudaOlder "12.8") ''
+      nixLog "removing sample 4_CUDA_Libraries/watershedSegmentationNPP which requires at least CUDA 12.8"
+      substituteInPlace \
+        "$NIX_BUILD_TOP/$sourceRoot/Samples/4_CUDA_Libraries/CMakeLists.txt" \
+        --replace-fail \
+          "add_subdirectory(watershedSegmentationNPP)" \
+          "# add_subdirectory(watershedSegmentationNPP)"
+    ''
+    # NVVM samples require a specific build of LLVM, which is a hassle.
+    + ''
+      nixLog "removing samples 7_libNVVM which require a specific build of LLVM"
+      substituteInPlace \
+        "$NIX_BUILD_TOP/$sourceRoot/Samples/CMakeLists.txt" \
+        --replace-fail \
+          'add_subdirectory(7_libNVVM)' \
+          '# add_subdirectory(7_libNVVM)'
+    ''
+    # Don't use hard-coded CUDA architectures
+    + ''
+      nixLog "patching CMakeLists.txt to use provided CUDA architectures"
+      local path=""
+      while IFS= read -r -d $'\0' path; do
+        nixLog "removing CMAKE_CUDA_ARCHITECTURES declaration from $path"
+        substituteInPlace \
+          "$path" \
+          --replace-fail \
+            'set(CMAKE_CUDA_ARCHITECTURES' \
+            '# set(CMAKE_CUDA_ARCHITECTURES'
+      done < <(grep --files-with-matches --null "set(CMAKE_CUDA_ARCHITECTURES" --recursive "$NIX_BUILD_TOP/$sourceRoot")
+      unset -v path
+    '';
+
+  nativeBuildInputs = [
+    cmake
+    cuda_nvcc
+  ];
+
+  buildInputs = [
+    cuda_cccl
+    cuda_cudart
+    cuda_nvrtc
+    cuda_nvtx
+    cuda_profiler_api
+    libcublas
+    libcufft
+    libcurand
+    libcusolver
+    libcusparse
+    libnpp
+    libnvjitlink
+    libnvjpeg
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString)
+    (lib.cmakeBool "BUILD_TEGRA" backendStdenv.hasJetsonCudaCapability)
+  ];
+
+  # TODO(@connorbaker):
+  # For some reason, using the combined find command doesn't delete directories:
+  # find "$PWD/Samples" \
+  #     \( -type d -name CMakeFiles \) \
+  #     -o \( -type f -name cmake_install.cmake \) \
+  #     -o \( -type f -name Makefile \) \
+  #     -exec rm -rf {} +
+  installPhase = ''
+    runHook preInstall
+
+    pushd "$NIX_BUILD_TOP/$sourceRoot/''${cmakeBuildDir:?}" >/dev/null
+
+    nixLog "deleting CMake related files"
+
+    find "$PWD/Samples" -type d -name CMakeFiles -exec rm -rf {} +
+    find "$PWD/Samples" -type f -name cmake_install.cmake -exec rm -rf {} +
+    find "$PWD/Samples" -type f -name Makefile -exec rm -rf {} +
+
+    nixLog "copying $PWD/Samples to $out/"
+    mkdir -p "$out"
+    cp -rv "$PWD/Samples"/* "$out/"
+
+    popd >/dev/null
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Samples for CUDA Developers which demonstrates features in CUDA Toolkit";
+    homepage = "https://github.com/NVIDIA/cuda-samples";
+    license = lib.licenses.nvidiaCuda;
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
+    maintainers = [ lib.maintainers.connorbaker ];
+    teams = [ lib.teams.cuda ];
+  };
+})
diff --git a/pkgs/development/cuda-modules/packages/cuda_cccl.nix b/pkgs/development/cuda-modules/packages/cuda_cccl.nix
new file mode 100644
index 000000000000..481970c39884
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_cccl.nix
@@ -0,0 +1,34 @@
+{
+  buildRedist,
+  cudaAtLeast,
+  lib,
+}:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_cccl";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+  ];
+
+  prePatch = lib.optionalString (cudaAtLeast "13.0") ''
+    nixLog "removing top-level $PWD/include/nv directory"
+    rm -rfv "$PWD/include/nv"
+    nixLog "un-nesting top-level $PWD/include/cccl directory"
+    mv -v "$PWD/include/cccl"/* "$PWD/include/"
+    nixLog "removing empty $PWD/include/cccl directory"
+    rmdir -v "$PWD/include/cccl"
+  '';
+
+  meta = {
+    description = "Building blocks that make it easier to write safe and efficient CUDA C++ code";
+    longDescription = ''
+      The goal of CCCL is to provide CUDA C++ developers with building blocks that make it easier to write safe and
+      efficient code.
+    '';
+    homepage = "https://github.com/NVIDIA/cccl";
+    changelog = "https://github.com/NVIDIA/cccl/releases";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_compat.nix b/pkgs/development/cuda-modules/packages/cuda_compat.nix
new file mode 100644
index 000000000000..0a2f5e0e7cd7
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_compat.nix
@@ -0,0 +1,20 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_compat";
+
+  # NOTE: Using multiple outputs with symlinks causes build cycles.
+  # To avoid that (and troubleshooting why), we just use a single output.
+  outputs = [ "out" ];
+
+  autoPatchelfIgnoreMissingDeps = [
+    "libnvrm_gpu.so"
+    "libnvrm_mem.so"
+    "libnvdla_runtime.so"
+  ];
+
+  meta = {
+    description = "Provides minor version forward compatibility for the CUDA runtime";
+    homepage = "https://docs.nvidia.com/deploy/cuda-compatibility";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_crt.nix b/pkgs/development/cuda-modules/packages/cuda_crt.nix
new file mode 100644
index 000000000000..3cf2246235bd
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_crt.nix
@@ -0,0 +1,27 @@
+{ backendStdenv, buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_crt";
+
+  outputs = [ "out" ];
+
+  brokenAssertions = [
+    # TODO(@connorbaker): Build fails on x86 when using pkgsLLVM.
+    #  .../include/crt/host_defines.h:67:2:
+    #  error: "libc++ is not supported on x86 system"
+    #
+    #     67 | #error "libc++ is not supported on x86 system"
+    #        |  ^
+    #
+    #  1 error generated.
+    #
+    #  # --error 0x1 --
+    {
+      message = "cannot use libc++ on x86_64-linux";
+      assertion = backendStdenv.hostNixSystem == "x86_64-linux" -> backendStdenv.cc.libcxx == null;
+    }
+  ];
+
+  # There's a comment with a reference to /usr
+  allowFHSReferences = true;
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_cudart.nix b/pkgs/development/cuda-modules/packages/cuda_cudart.nix
new file mode 100644
index 000000000000..4b1619fa40ba
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_cudart.nix
@@ -0,0 +1,98 @@
+# TODO(@connorbaker): cuda_cudart.dev depends on crt/host_config.h, which is from
+# (getDev cuda_nvcc). It would be nice to be able to encode that.
+{
+  _cuda,
+  addDriverRunpath,
+  backendStdenv,
+  buildRedist,
+  cuda_cccl,
+  cuda_compat,
+  cuda_crt,
+  cuda_nvcc,
+  cudaAtLeast,
+  lib,
+}:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_cudart";
+
+  # NOTE: A number of packages expect cuda_cudart to be in a single directory.
+  # NOTE: CMake expects the static libraries to exist alongside the dynamic libraries,
+  # so we may need to revisit whether we have a static output at all.
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+    "stubs"
+  ];
+
+  propagatedBuildOutputs = [
+    "static" # required by CMake
+    "stubs" # always propagate, even when cuda_compat is used, to avoid symbol linking errors
+  ];
+
+  # When cuda_compat is available, propagate it.
+  # NOTE: `cuda_compat` can be disabled by setting the package to `null`. This is useful in cases where
+  # the host OS has a recent enough CUDA driver that the compatibility library isn't needed.
+  propagatedBuildInputs =
+    # Add the dependency on NVCC's include directory.
+    # - crt/host_config.h
+    # TODO(@connorbaker): Check that the dependency offset for this is correct.
+    [ (lib.getOutput "include" cuda_nvcc) ]
+    # TODO(@connorbaker): From CUDA 13.0, crt/host_config.h is in cuda_crt
+    ++ lib.optionals (cudaAtLeast "13.0") [ (lib.getOutput "include" cuda_crt) ]
+    # Add the dependency on CCCL's include directory.
+    # - nv/target
+    # TODO(@connorbaker): Check that the dependency offset for this is correct.
+    ++ [ (lib.getOutput "include" cuda_cccl) ]
+    ++ lib.optionals (backendStdenv.hasJetsonCudaCapability && cuda_compat != null) [
+      cuda_compat
+    ];
+
+  allowFHSReferences = false;
+
+  # Patch the `cudart` package config files so they reference lib
+  postPatch = ''
+    local path=""
+    while IFS= read -r -d $'\0' path; do
+      nixLog "patching $path"
+      sed -i \
+        -e "s|^cudaroot\s*=.*\$||" \
+        -e "s|^Libs\s*:\(.*\)\$|Libs: \1 -Wl,-rpath,${addDriverRunpath.driverLink}/lib|" \
+        "$path"
+    done < <(find -iname 'cudart-*.pc' -print0)
+    unset -v path
+  ''
+  # Patch the `cuda` package config files so they reference stubs
+  # TODO: Will this always pull in the stubs output and cause its setup hook to be executed?
+  + ''
+    local path=""
+    while IFS= read -r -d $'\0' path; do
+      nixLog "patching $path"
+      sed -i \
+        -e "s|^cudaroot\s*=.*\$||" \
+        -e "s|^libdir\s*=.*/lib\$|libdir=''${!outputStubs:?}/lib/stubs|" \
+        -e "s|^Libs\s*:\(.*\)\$|Libs: \1 -Wl,-rpath,${addDriverRunpath.driverLink}/lib|" \
+        "$path"
+    done < <(find -iname 'cuda-*.pc' -print0)
+    unset -v path
+  '';
+
+  # Namelink may not be enough, add a soname.
+  # Cf. https://gitlab.kitware.com/cmake/cmake/-/issues/25536
+  # NOTE: Relative symlinks is fine since this is all within the same output.
+  postInstall = ''
+    pushd "''${!outputStubs:?}/lib/stubs" >/dev/null
+    if [[ -f libcuda.so && ! -f libcuda.so.1 ]]; then
+      nixLog "creating versioned symlink for libcuda.so stub"
+      ln -srv libcuda.so libcuda.so.1
+    fi
+    nixLog "creating symlinks for stubs in lib directory"
+    ln -srvt "''${!outputStubs:?}/lib/" *.so *.so.*
+    popd >/dev/null
+  '';
+
+  meta.description = "CUDA Runtime";
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_cuobjdump.nix b/pkgs/development/cuda-modules/packages/cuda_cuobjdump.nix
new file mode 100644
index 000000000000..754c70915497
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_cuobjdump.nix
@@ -0,0 +1,17 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_cuobjdump";
+  outputs = [ "out" ];
+
+  meta = {
+    description = "Extracts information from CUDA binary files (both standalone and those embedded in host binaries) and presents them in human readable format";
+    longDescription = ''
+      `cuobjdump` extracts information from CUDA binary files (both standalone and those embedded in host binaries)
+      and presents them in human readable format. The output of cuobjdump includes CUDA assembly code for each kernel,
+      CUDA ELF section headers, string tables, relocators and other CUDA specific sections. It also extracts embedded
+      ptx text from host binaries.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/cuda-binary-utilities#cuobjdump";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_cupti.nix b/pkgs/development/cuda-modules/packages/cuda_cupti.nix
new file mode 100644
index 000000000000..4a1eb1d19dac
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_cupti.nix
@@ -0,0 +1,30 @@
+{
+  backendStdenv,
+  buildRedist,
+  lib,
+}:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_cupti";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "samples"
+  ]
+  ++ lib.optionals (backendStdenv.hostNixSystem == "x86_64-linux") [ "static" ];
+
+  allowFHSReferences = true;
+
+  meta = {
+    description = "C-based interface for creating profiling and tracing tools designed for CUDA applications";
+    longDescription = ''
+      The CUDA Profiling Tools Interface (CUPTI) provides a C-based interface for creating profiling and tracing tools
+      designed for CUDA applications.
+    '';
+    homepage = "https://docs.nvidia.com/cupti";
+    changelog = "https://docs.nvidia.com/cupti/release-notes/release-notes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_cuxxfilt.nix b/pkgs/development/cuda-modules/packages/cuda_cuxxfilt.nix
new file mode 100644
index 000000000000..046ddebebfaf
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_cuxxfilt.nix
@@ -0,0 +1,21 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_cuxxfilt";
+
+  outputs = [
+    "out"
+    "bin"
+    "dev"
+    "include"
+    "static"
+  ];
+
+  meta = {
+    description = "Decode low-level identifiers that have been mangled by CUDA C++ into user readable names";
+    longDescription = ''
+      cu++filt decodes (demangles) low-level identifiers that have been mangled by CUDA C++ into user readable names.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/cuda-binary-utilities#cu-filt";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_demo_suite.nix b/pkgs/development/cuda-modules/packages/cuda_demo_suite.nix
new file mode 100644
index 000000000000..1a85c258eb0e
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_demo_suite.nix
@@ -0,0 +1,33 @@
+{
+  buildRedist,
+  libcufft,
+  libcurand,
+  libGLU,
+  libglut,
+  libglvnd,
+  mesa,
+}:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_demo_suite";
+
+  buildInputs = [
+    libcufft
+    libcurand
+    libGLU
+    libglut
+    libglvnd
+    mesa
+  ];
+
+  outputs = [ "out" ];
+
+  meta = {
+    description = "Pre-built applications which use CUDA";
+    longDescription = ''
+      The CUDA Demo Suite contains pre-built applications which use CUDA. These applications demonstrate the
+      capabilities and details of NVIDIA GPUs.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/demo-suite";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_documentation.nix b/pkgs/development/cuda-modules/packages/cuda_documentation.nix
new file mode 100644
index 000000000000..dc872008b58a
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_documentation.nix
@@ -0,0 +1,14 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_documentation";
+
+  outputs = [ "out" ];
+
+  allowFHSReferences = true;
+
+  meta = {
+    homepage = "https://docs.nvidia.com/cuda";
+    changelog = "https://docs.nvidia.com/cuda/cuda-toolkit-release-notes";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_gdb.nix b/pkgs/development/cuda-modules/packages/cuda_gdb.nix
new file mode 100644
index 000000000000..0eb1e56f65c2
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_gdb.nix
@@ -0,0 +1,71 @@
+{
+  backendStdenv,
+  buildRedist,
+  cudaAtLeast,
+  expat,
+  gmp,
+  lib,
+  libxcrypt-legacy,
+  ncurses,
+  python3,
+}:
+let
+  python3MajorMinorVersion = lib.versions.majorMinor python3.version;
+in
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_gdb";
+
+  outputs = [
+    "out"
+    "bin"
+  ];
+
+  allowFHSReferences = true;
+
+  buildInputs = [
+    gmp
+  ]
+  # aarch64, sbsa needs expat
+  ++ lib.optionals backendStdenv.hostPlatform.isAarch64 [ expat ]
+  # From 12.5, cuda-gdb comes with Python TUI wrappers
+  ++ lib.optionals (cudaAtLeast "12.5") [
+    libxcrypt-legacy
+    ncurses
+    python3
+  ];
+
+  # Remove binaries requiring Python3 versions we do not have
+  postInstall = lib.optionalString (cudaAtLeast "12.5") ''
+    pushd "''${!outputBin}/bin" >/dev/null
+    nixLog "removing cuda-gdb-python*-tui binaries for Python 3 versions other than ${python3MajorMinorVersion}"
+    for pygdb in cuda-gdb-python*-tui; do
+      if [[ "$pygdb" == "cuda-gdb-python${python3MajorMinorVersion}-tui" ]]; then
+        continue
+      fi
+      nixLog "removing $pygdb"
+      rm -rf "$pygdb"
+    done
+    unset -v pygdb
+    popd >/dev/null
+  '';
+
+  brokenAssertions = [
+    {
+      # TODO(@connorbaker): Figure out which are supported.
+      message = "python 3 version is supported";
+      assertion = true;
+    }
+  ];
+
+  meta = {
+    description = "NVIDIA tool for debugging CUDA applications on Linux and QNX systems";
+    longDescription = ''
+      CUDA-GDB is the NVIDIA tool for debugging CUDA applications running on Linux and QNX. CUDA-GDB is an extension
+      to GDB, the GNU Project debugger. The tool provides developers with a mechanism for debugging CUDA
+      applications running on actual hardware.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/cuda-gdb";
+    changelog = "https://docs.nvidia.com/cuda/cuda-gdb#release-notes";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_nsight.nix b/pkgs/development/cuda-modules/packages/cuda_nsight.nix
new file mode 100644
index 000000000000..d47e55f6920d
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_nsight.nix
@@ -0,0 +1,19 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_nsight";
+
+  outputs = [ "out" ];
+
+  allowFHSReferences = true;
+
+  meta = {
+    description = "Nsight Eclipse Plugins Edition";
+    longDescription = ''
+      NVIDIA Nsight Eclipse Edition is a unified CPU plus GPU integrated development environment (IDE) for developing
+      CUDA applications on Linux and Mac OS X for the x86, POWER and ARM platforms. It is designed to help developers
+      on all stages of the software development process.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/nsight-eclipse-plugins-guide";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix
new file mode 100644
index 000000000000..41da5b0f8c6c
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix
@@ -0,0 +1,175 @@
+{
+  _cuda,
+  backendStdenv,
+  buildRedist,
+  cudaAtLeast,
+  cudaOlder,
+  lib,
+  libnvvm,
+}:
+buildRedist (finalAttrs: {
+  redistName = "cuda";
+  pname = "cuda_nvcc";
+
+  # NOTE: May need to restrict cuda_nvcc to a single output to avoid breaking consumers which expect NVCC
+  # to be within a single directory structure. This happens partly because NVCC is also home to NVVM.
+  outputs = [
+    "out"
+  ]
+  # CUDA 13.0 has essentially nothing other than binaries.
+  ++ lib.optionals (cudaOlder "13.0") [
+    "bin"
+    "dev"
+    "include"
+    "static"
+  ];
+
+  # The nvcc and cicc binaries contain hard-coded references to /usr
+  allowFHSReferences = true;
+
+  # Entries here will be in nativeBuildInputs when cuda_nvcc is in nativeBuildInputs
+  propagatedBuildInputs = [ backendStdenv.cc ];
+
+  # Patch the nvcc.profile.
+  # Syntax:
+  # - `=` for assignment,
+  # - `?=` for conditional assignment,
+  # - `+=` to "prepend",
+  # - `=+` to "append".
+
+  # Cf. https://web.archive.org/web/20220912081901/https://developer.download.nvidia.com/compute/DevZone/docs/html/C/doc/nvcc.pdf
+
+  # We set all variables with the lowest priority (=+), but we do force
+  # nvcc to use the fixed backend toolchain. Cf. comments in
+  # backend-stdenv.nix
+
+  # As an example, here's the nvcc.profile for CUDA 11.8-12.4 (yes, that is a leading newline):
+
+  #
+  # TOP              = $(_HERE_)/..
+  #
+  # NVVMIR_LIBRARY_DIR = $(TOP)/$(_NVVM_BRANCH_)/libdevice
+  #
+  # LD_LIBRARY_PATH += $(TOP)/lib:
+  # PATH            += $(TOP)/$(_NVVM_BRANCH_)/bin:$(_HERE_):
+  #
+  # INCLUDES        +=  "-I$(TOP)/$(_TARGET_DIR_)/include" $(_SPACE_)
+  #
+  # LIBRARIES        =+ $(_SPACE_) "-L$(TOP)/$(_TARGET_DIR_)/lib$(_TARGET_SIZE_)/stubs" "-L$(TOP)/$(_TARGET_DIR_)/lib$(_TARGET_SIZE_)"
+  #
+  # CUDAFE_FLAGS    +=
+  # PTXAS_FLAGS     +=
+
+  # And here's the nvcc.profile for CUDA 12.5:
+
+  #
+  # TOP              = $(_HERE_)/..
+  #
+  # CICC_PATH        = $(TOP)/nvvm/bin
+  # CICC_NEXT_PATH   = $(TOP)/nvvm-next/bin
+  # NVVMIR_LIBRARY_DIR = $(TOP)/nvvm/libdevice
+  #
+  # LD_LIBRARY_PATH += $(TOP)/lib:
+  # PATH            += $(CICC_PATH):$(_HERE_):
+  #
+  # INCLUDES        +=  "-I$(TOP)/$(_TARGET_DIR_)/include" $(_SPACE_)
+  #
+  # LIBRARIES        =+ $(_SPACE_) "-L$(TOP)/$(_TARGET_DIR_)/lib$(_TARGET_SIZE_)/stubs" "-L$(TOP)/$(_TARGET_DIR_)/lib$(_TARGET_SIZE_)"
+  #
+  # CUDAFE_FLAGS    +=
+  # PTXAS_FLAGS     +=
+
+  postInstall =
+    let
+      # TODO: Should we also patch the LIBRARIES line's use of $(TOP)/$(_TARGET_DIR_)?
+      oldNvvmDir = lib.concatStringsSep "/" (
+        [ "$(TOP)" ]
+        ++ lib.optionals (cudaOlder "12.5") [ "$(_NVVM_BRANCH_)" ]
+        ++ lib.optionals (cudaAtLeast "12.5") [ "nvvm" ]
+      );
+      newNvvmDir = ''''${!outputBin:?}/nvvm'';
+    in
+    lib.optionalString finalAttrs.finalPackage.meta.available (
+      # From CUDA 13.0, NVVM is available as a separate library and not bundled in the NVCC redist.
+      lib.optionalString (cudaOlder "13.0") ''
+        nixLog "moving $PWD/nvvm to ''${!outputBin:?} and renaming lib64 to lib"
+        moveToOutput "nvvm" "''${!outputBin:?}"
+        mv --verbose --no-clobber "${newNvvmDir}/lib64" "${newNvvmDir}/lib"
+      ''
+      # NVVM is unpacked and made top-level; we cannot make a symlink to it because build systems (like CMake)
+      # may take the target and do relative path operations to it.
+      + lib.optionalString (cudaAtLeast "13.0") ''
+        nixLog "copying ${libnvvm} to ${newNvvmDir} and fixing permissions"
+        cp -rv "${libnvvm}" "${newNvvmDir}"
+        chmod -Rv u+w "${newNvvmDir}"
+      ''
+      # Unconditional patching to remove the use of $(_TARGET_SIZE_) since we don't use lib64 in Nixpkgs
+      + ''
+        nixLog 'removing $(_TARGET_SIZE_) from nvcc.profile'
+        substituteInPlace "''${!outputBin:?}/bin/nvcc.profile" \
+          --replace-fail \
+            '$(_TARGET_SIZE_)' \
+            ""
+      ''
+      # Unconditional patching to switch to the correct include paths.
+      # NOTE: _TARGET_DIR_ appears to be used for the target architecture, which is relevant for cross-compilation.
+      + ''
+        nixLog "patching nvcc.profile to use the correct include paths"
+        substituteInPlace "''${!outputBin:?}/bin/nvcc.profile" \
+          --replace-fail \
+            '$(TOP)/$(_TARGET_DIR_)/include' \
+            "''${!outputInclude:?}/include"
+      ''
+      # Fixup the nvcc.profile to use the correct paths for NVVM.
+      # NOTE: In our replacement substitution, we use double quotes to allow for variable expansion.
+      # NOTE: We use a trailing slash only on the NVVM directory replacement to prevent partial matches.
+      # + lib.optionalString (cudaOlder "13.0") ''
+      + ''
+        nixLog "patching nvcc.profile to use the correct NVVM paths"
+        substituteInPlace "''${!outputBin:?}/bin/nvcc.profile" \
+          --replace-fail \
+            '${oldNvvmDir}/' \
+            "${newNvvmDir}/"
+
+        nixLog "adding ${newNvvmDir} to nvcc.profile"
+        cat << EOF >> "''${!outputBin:?}/bin/nvcc.profile"
+
+        # Expose the split-out nvvm
+        LIBRARIES =+ \$(_SPACE_) "-L${newNvvmDir}/lib"
+        INCLUDES =+ \$(_SPACE_) "-I${newNvvmDir}/include"
+        EOF
+      ''
+      # Add the dependency on backendStdenv.cc to the nvcc.profile.
+      + ''
+        nixLog "adding backendStdenv.cc to nvcc.profile"
+        cat << EOF >> "''${!outputBin:?}/bin/nvcc.profile"
+
+        # Fix a compatible backend compiler
+        PATH += "${backendStdenv.cc}/bin":
+        EOF
+      ''
+    );
+
+  brokenAssertions = [
+    # TODO(@connorbaker): Build fails on x86 when using pkgsLLVM.
+    #  .../include/crt/host_defines.h:67:2:
+    #  error: "libc++ is not supported on x86 system"
+    #
+    #     67 | #error "libc++ is not supported on x86 system"
+    #        |  ^
+    #
+    #  1 error generated.
+    #
+    #  # --error 0x1 --
+    {
+      message = "cannot use libc++ on x86_64-linux";
+      assertion = backendStdenv.hostNixSystem == "x86_64-linux" -> backendStdenv.cc.libcxx == null;
+    }
+  ];
+
+  meta = {
+    description = "CUDA compiler driver";
+    homepage = "https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc";
+    mainProgram = "nvcc";
+  };
+})
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvdisasm.nix b/pkgs/development/cuda-modules/packages/cuda_nvdisasm.nix
new file mode 100644
index 000000000000..981a0ce420a7
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_nvdisasm.nix
@@ -0,0 +1,18 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_nvdisasm";
+
+  outputs = [ "out" ];
+
+  meta = {
+    description = "Extracts information from standalone cubin files and presents them in human readable format";
+    longDescription = ''
+      `nvdisasm` extracts information from standalone cubin files and presents them in human readable format. The
+      output of `nvdisasm` includes CUDA assembly code for each kernel, listing of ELF data sections and other CUDA
+      specific sections. Output style and options are controlled through `nvdisasm` command-line options. `nvdisasm`
+      also does control flow analysis to annotate jump/branch targets and makes the output easier to read.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/cuda-binary-utilities#nvdisasm";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvml_dev.nix b/pkgs/development/cuda-modules/packages/cuda_nvml_dev.nix
new file mode 100644
index 000000000000..516ddf67fbcf
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_nvml_dev.nix
@@ -0,0 +1,47 @@
+{ buildRedist, lib }:
+buildRedist (finalAttrs: {
+  redistName = "cuda";
+  pname = "cuda_nvml_dev";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "stubs"
+  ];
+
+  # TODO(@connorbaker): Add a setup hook to the outputStubs output to automatically replace rpath entries
+  # containing the stubs output with the driver link.
+
+  allowFHSReferences = true;
+
+  # Include the stubs output since it provides libnvidia-ml.so.
+  propagatedBuildOutputs = lib.optionals (lib.elem "stubs" finalAttrs.outputs) [ "stubs" ];
+
+  # TODO: Some programs try to link against libnvidia-ml.so.1, so make an alias.
+  # Not sure about the version number though!
+  postInstall = lib.optionalString (lib.elem "stubs" finalAttrs.outputs) ''
+    pushd "''${!outputStubs:?}/lib/stubs" >/dev/null
+    if [[ -f libnvidia-ml.so && ! -f libnvidia-ml.so.1 ]]; then
+      nixLog "creating versioned symlink for libnvidia-ml.so stub"
+      ln -sr libnvidia-ml.so libnvidia-ml.so.1
+    fi
+    if [[ -f libnvidia-ml.a && ! -f libnvidia-ml.a.1 ]]; then
+      nixLog "creating versioned symlink for libnvidia-ml.a stub"
+      ln -sr libnvidia-ml.a libnvidia-ml.a.1
+    fi
+    nixLog "creating symlinks for stubs in lib directory"
+    ln -srt "''${!outputStubs:?}/lib/" *.so *.so.*
+    popd >/dev/null
+  '';
+
+  meta = {
+    description = "C-based programmatic interface for monitoring and managing various states within Data Center GPUs";
+    longDescription = ''
+      The NVIDIA Management Library (NVML) is a C-based programmatic interface for monitoring and managing various
+      states within Data Center GPUs. It is intended to be a platform for building 3rd party applications, and is also
+      the underlying library for the NVIDIA-supported nvidia-smi tool.
+    '';
+    homepage = "https://developer.nvidia.com/management-library-nvml";
+  };
+})
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvprof.nix b/pkgs/development/cuda-modules/packages/cuda_nvprof.nix
new file mode 100644
index 000000000000..ccbab56e12c4
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_nvprof.nix
@@ -0,0 +1,36 @@
+{
+  buildRedist,
+  cuda_cudart,
+  cuda_cupti,
+  lib,
+}:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_nvprof";
+
+  allowFHSReferences = true;
+
+  outputs = [
+    "out"
+    "bin"
+    "lib"
+  ];
+
+  buildInputs = [
+    (lib.getOutput "stubs" cuda_cudart)
+    cuda_cupti
+  ];
+
+  meta = {
+    description = "Collect and view profiling data from the command-line";
+    longDescription = ''
+      The `nvprof` profiling tool enables you to collect and view profiling data from the command-line. `nvprof`
+      enables the collection of a timeline of CUDA-related activities on both CPU and GPU, including kernel execution,
+      memory transfers, memory set and CUDA API calls and events or metrics for CUDA kernels. Profiling options are
+      provided to `nvprof` through command-line options. Profiling results are displayed in the console after the
+      profiling data is collected, and may also be saved for later viewing by either `nvprof` or the Visual Profiler.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/profiler-users-guide#nvprof";
+    changelog = "https://docs.nvidia.com/cuda/profiler-users-guide#changelog";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvprune.nix b/pkgs/development/cuda-modules/packages/cuda_nvprune.nix
new file mode 100644
index 000000000000..db3c7b60e6f5
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_nvprune.nix
@@ -0,0 +1,15 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_nvprune";
+
+  outputs = [ "out" ];
+
+  meta = {
+    description = "Prune host object files and libraries to only contain device code for the specified targets";
+    longDescription = ''
+      `nvprune` prunes host object files and libraries to only contain device code for the specified targets.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/cuda-binary-utilities#nvprune";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvrtc.nix b/pkgs/development/cuda-modules/packages/cuda_nvrtc.nix
new file mode 100644
index 000000000000..88828bd15050
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_nvrtc.nix
@@ -0,0 +1,25 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_nvrtc";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+    "stubs"
+  ];
+
+  allowFHSReferences = true;
+
+  meta = {
+    description = "Runtime compilation library for CUDA C++";
+    longDescription = ''
+      NVRTC is a runtime compilation library for CUDA C++. It accepts CUDA C++ source code in character string form
+      and creates handles that can be used to obtain the PTX.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/nvrtc";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvtx.nix b/pkgs/development/cuda-modules/packages/cuda_nvtx.nix
new file mode 100644
index 000000000000..ef079fe0110d
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_nvtx.nix
@@ -0,0 +1,23 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_nvtx";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  meta = {
+    description = "C-based Application Programming Interface (API) for annotating events, code ranges, and resources in your applications";
+    longDescription = ''
+      NVTX is a cross-platform API for annotating source code to provide contextual information to developer tools.
+
+      The NVTX API is written in C, with wrappers provided for C++ and Python.
+    '';
+    homepage = "https://github.com/NVIDIA/NVTX";
+    changelog = "https://github.com/NVIDIA/NVTX/releases";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvvp.nix b/pkgs/development/cuda-modules/packages/cuda_nvvp.nix
new file mode 100644
index 000000000000..8aeb178a2ace
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_nvvp.nix
@@ -0,0 +1,18 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_nvvp";
+
+  outputs = [ "out" ];
+
+  allowFHSReferences = true;
+
+  meta = {
+    description = "Cross-platform performance profiling tool for optimizing CUDA C/C++ applications";
+    longDescription = ''
+      The NVIDIA Visual Profiler is a cross-platform performance profiling tool that delivers developers vital
+      feedback for optimizing CUDA C/C++ applications.
+    '';
+    homepage = "https://developer.nvidia.com/nvidia-visual-profiler";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_opencl.nix b/pkgs/development/cuda-modules/packages/cuda_opencl.nix
new file mode 100644
index 000000000000..50d94e44dbea
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_opencl.nix
@@ -0,0 +1,22 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_opencl";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  meta = {
+    description = "Low-level API for heterogeneous computing that runs on CUDA-powered GPUs";
+    longDescription = ''
+      OpenCL™ (Open Computing Language) is a low-level API for heterogeneous computing that runs on CUDA-powered GPUs.
+      Using the OpenCL API, developers can launch compute kernels written using a limited subset of the C programming
+      language on a GPU.
+    '';
+    homepage = "https://developer.nvidia.com/opencl";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_profiler_api.nix b/pkgs/development/cuda-modules/packages/cuda_profiler_api.nix
new file mode 100644
index 000000000000..39a90d72df2c
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_profiler_api.nix
@@ -0,0 +1,13 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_profiler_api";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+  ];
+
+  meta.description = "API for profiling CUDA runtime";
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_sandbox_dev.nix b/pkgs/development/cuda-modules/packages/cuda_sandbox_dev.nix
new file mode 100644
index 000000000000..53ff67a909b1
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_sandbox_dev.nix
@@ -0,0 +1,6 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_sandbox_dev";
+  outputs = [ "out" ];
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_sanitizer_api.nix b/pkgs/development/cuda-modules/packages/cuda_sanitizer_api.nix
new file mode 100644
index 000000000000..eab5b6c35cb2
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_sanitizer_api.nix
@@ -0,0 +1,18 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_sanitizer_api";
+
+  outputs = [ "out" ];
+
+  allowFHSReferences = true;
+
+  meta = {
+    description = "Enables the creation of sanitizing and tracing tools that target CUDA applications";
+    longDescription = ''
+      The Compute Sanitizer API enables the creation of sanitizing and tracing tools that target CUDA applications.
+      Examples of such tools are memory and race condition checkers.
+    '';
+    homepage = "https://docs.nvidia.com/compute-sanitizer/SanitizerApiGuide";
+  };
+}
diff --git a/pkgs/development/cuda-modules/cudatoolkit/redist-wrapper.nix b/pkgs/development/cuda-modules/packages/cudatoolkit.nix
similarity index 94%
rename from pkgs/development/cuda-modules/cudatoolkit/redist-wrapper.nix
rename to pkgs/development/cuda-modules/packages/cudatoolkit.nix
index 56ef05a09d6c..d122e6312d14 100644
--- a/pkgs/development/cuda-modules/cudatoolkit/redist-wrapper.nix
+++ b/pkgs/development/cuda-modules/packages/cudatoolkit.nix
@@ -73,8 +73,9 @@ symlinkJoin rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Wrapper substituting the deprecated runfile-based CUDA installation";
-    license = licenses.nvidiaCuda;
+    license = lib.licenses.nvidiaCudaRedist;
+    teams = [ lib.teams.cuda ];
   };
 }
diff --git a/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix b/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix
index b9e622b9f31e..1be759846e44 100644
--- a/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix
+++ b/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix
@@ -1,19 +1,19 @@
 {
   autoAddDriverRunpath,
+  backendStdenv,
   catch2_3,
   cmake,
+  cuda_cccl,
+  cuda_cudart,
+  cuda_nvcc,
+  cuda_nvrtc,
+  cudnn,
   fetchFromGitHub,
   gitUpdater,
   lib,
+  libcublas,
   ninja,
   nlohmann_json,
-  stdenv,
-  cuda_cccl ? null,
-  cuda_cudart ? null,
-  cuda_nvcc ? null,
-  cuda_nvrtc ? null,
-  cudnn ? null,
-  libcublas ? null,
 }:
 let
   inherit (lib.lists) optionals;
@@ -23,9 +23,8 @@ let
     optionalString
     ;
 in
-
 # TODO(@connorbaker): This should be a hybrid C++/Python package.
-stdenv.mkDerivation (finalAttrs: {
+backendStdenv.mkDerivation (finalAttrs: {
   pname = "cudnn-frontend";
   version = "1.9.0";
 
@@ -121,7 +120,8 @@ stdenv.mkDerivation (finalAttrs: {
     description = "A c++ wrapper for the cudnn backend API";
     homepage = "https://github.com/NVIDIA/cudnn-frontend";
     license = lib.licenses.mit;
-    badPlatforms = optionals (cudnn == null) finalAttrs.meta.platforms;
+    # TODO(@connorbaker): How tightly coupled is this library to specific cuDNN versions?
+    # Should it be marked as broken if it doesn't match our expected version?
     platforms = [
       "aarch64-linux"
       "x86_64-linux"
diff --git a/pkgs/development/cuda-modules/packages/cudnn.nix b/pkgs/development/cuda-modules/packages/cudnn.nix
new file mode 100644
index 000000000000..9dec6fbf5fbb
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cudnn.nix
@@ -0,0 +1,77 @@
+{
+  _cuda,
+  buildRedist,
+  lib,
+  libcublas,
+  patchelf,
+  zlib,
+}:
+buildRedist (finalAttrs: {
+  redistName = "cudnn";
+  pname = "cudnn";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+  ];
+
+  buildInputs = [
+    # NOTE: Verions of CUDNN after 9.0 no longer depend on libcublas:
+    # https://docs.nvidia.com/deeplearning/cudnn/latest/release-notes.html?highlight=cublas#cudnn-9-0-0
+    # However, NVIDIA only provides libcublasLT via the libcublas package.
+    (lib.getLib libcublas)
+    zlib
+  ];
+
+  # Tell autoPatchelf about runtime dependencies. *_infer* libraries only
+  # exist in CuDNN 8.
+  # NOTE: Versions from CUDNN releases have four components.
+  postFixup =
+    lib.optionalString
+      (lib.versionAtLeast finalAttrs.version "8.0.5.0" && lib.versionOlder finalAttrs.version "9.0.0.0")
+      ''
+        ${lib.getExe patchelf} $lib/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so
+        ${lib.getExe patchelf} $lib/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so
+      '';
+
+  # TODO(@connorbaker): Broken conditions for cuDNN used out of scope.
+  # platformAssertions =
+  #   let
+  #     cudaTooOld = cudaOlder finalAttrs.passthru.featureRelease.minCudaVersion;
+  #     cudaTooNew =
+  #       (finalAttrs.passthru.featureRelease.maxCudaVersion != null)
+  #       && lib.versionOlder finalAttrs.passthru.featureRelease.maxCudaVersion cudaMajorMinorVersion;
+  #   in
+  #   prevAttrs.passthru.platformAssertions or [ ]
+  #   ++ [
+  #     {
+  #       message = "CUDA version is too old";
+  #       assertion = cudaTooOld;
+  #     }
+  #     {
+  #       message = "CUDA version is too new";
+  #       assertion = cudaTooNew;
+  #     }
+  #   ];
+
+  meta = {
+    description = "GPU-accelerated library of primitives for deep neural networks";
+    longDescription = ''
+      The NVIDIA CUDA Deep Neural Network library (cuDNN) is a GPU-accelerated library of primitives for deep neural
+      networks.
+    '';
+    homepage = "https://developer.nvidia.com/cudnn";
+    changelog = "https://docs.nvidia.com/deeplearning/cudnn/backend/latest/release-notes.html";
+
+    license = _cuda.lib.licenses.cudnn;
+
+    maintainers = with lib.maintainers; [
+      mdaiter
+      samuela
+      connorbaker
+    ];
+  };
+})
diff --git a/pkgs/development/cuda-modules/packages/cudnn_8_9.nix b/pkgs/development/cuda-modules/packages/cudnn_8_9.nix
new file mode 100644
index 000000000000..069af8a426d3
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cudnn_8_9.nix
@@ -0,0 +1,14 @@
+{
+  _cuda,
+  backendStdenv,
+  cudnn,
+}:
+let
+  version = if backendStdenv.hasJetsonCudaCapability then "8.9.5" else "8.9.7";
+in
+# TODO(@connorbaker): Support for old versions of CUDNN should be removed.
+cudnn.overrideAttrs (prevAttrs: {
+  passthru = prevAttrs.passthru // {
+    release = _cuda.manifests.cudnn.${version}.cudnn;
+  };
+})
diff --git a/pkgs/development/cuda-modules/packages/driver_assistant.nix b/pkgs/development/cuda-modules/packages/driver_assistant.nix
new file mode 100644
index 000000000000..3224416e7a6f
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/driver_assistant.nix
@@ -0,0 +1,14 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "driver_assistant";
+
+  outputs = [ "out" ];
+
+  platformAssertions = [
+    {
+      message = "Package is not supported; use drivers from linuxPackages";
+      assertion = false;
+    }
+  ];
+}
diff --git a/pkgs/development/cuda-modules/packages/fabricmanager.nix b/pkgs/development/cuda-modules/packages/fabricmanager.nix
new file mode 100644
index 000000000000..a380c3de5d9b
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/fabricmanager.nix
@@ -0,0 +1,19 @@
+{ buildRedist, zlib }:
+buildRedist {
+  redistName = "cuda";
+  pname = "fabricmanager";
+
+  outputs = [
+    "out"
+    "bin"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  allowFHSReferences = true;
+
+  buildInputs = [ zlib ];
+
+  meta.homepage = "https://docs.nvidia.com/datacenter/tesla/fabric-manager-user-guide";
+}
diff --git a/pkgs/development/cuda-modules/packages/imex.nix b/pkgs/development/cuda-modules/packages/imex.nix
new file mode 100644
index 000000000000..1325f7044d3d
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/imex.nix
@@ -0,0 +1,16 @@
+{ buildRedist, zlib }:
+buildRedist {
+  redistName = "cuda";
+  pname = "imex";
+
+  outputs = [ "out" ];
+
+  allowFHSReferences = true;
+
+  buildInputs = [ zlib ];
+
+  meta = {
+    description = "Service which supports GPU memory export and import (NVLink P2P) and shared memory operations across OS domains in an NVLink multi-node deployment";
+    homepage = "https://docs.nvidia.com/multi-node-nvlink-systems/imex-guide";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libcublas.nix b/pkgs/development/cuda-modules/packages/libcublas.nix
new file mode 100644
index 000000000000..0606bba7eb5d
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcublas.nix
@@ -0,0 +1,22 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "libcublas";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+    "stubs"
+  ];
+
+  meta = {
+    description = "CUDA Basic Linear Algebra Subroutine library";
+    longDescription = ''
+      The cuBLAS library is an implementation of BLAS (Basic Linear Algebra Subprograms) on top of the NVIDIA CUDA runtime.
+    '';
+    homepage = "https://developer.nvidia.com/cublas";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libcudla.nix b/pkgs/development/cuda-modules/packages/libcudla.nix
new file mode 100644
index 000000000000..c8a1b4549dcb
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcudla.nix
@@ -0,0 +1,21 @@
+{
+  backendStdenv,
+  buildRedist,
+  lib,
+}:
+buildRedist {
+  redistName = "cuda";
+  pname = "libcudla";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "stubs"
+  ];
+
+  autoPatchelfIgnoreMissingDeps = lib.optionals backendStdenv.hasJetsonCudaCapability [
+    "libnvcudla.so"
+  ];
+}
diff --git a/pkgs/development/cuda-modules/packages/libcufft.nix b/pkgs/development/cuda-modules/packages/libcufft.nix
new file mode 100644
index 000000000000..7b7aa3611936
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcufft.nix
@@ -0,0 +1,19 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "libcufft";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+    "stubs"
+  ];
+
+  meta = {
+    description = "High-performance FFT product CUDA library";
+    homepage = "https://developer.nvidia.com/cufft";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libcufile.nix b/pkgs/development/cuda-modules/packages/libcufile.nix
new file mode 100644
index 000000000000..1d5ed47ba60d
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcufile.nix
@@ -0,0 +1,32 @@
+{
+  buildRedist,
+  cuda_cudart,
+  lib,
+  numactl,
+  rdma-core,
+}:
+buildRedist {
+  redistName = "cuda";
+  pname = "libcufile";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+  ];
+
+  allowFHSReferences = true;
+
+  buildInputs = [
+    (lib.getOutput "stubs" cuda_cudart)
+    numactl
+    rdma-core
+  ];
+
+  meta = {
+    description = "Library to leverage GDS technology";
+    homepage = "https://docs.nvidia.com/gpudirect-storage/api-reference-guide";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libcurand.nix b/pkgs/development/cuda-modules/packages/libcurand.nix
new file mode 100644
index 000000000000..e05287b1c2d0
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcurand.nix
@@ -0,0 +1,24 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "libcurand";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+    "stubs"
+  ];
+
+  meta = {
+    description = "Helper module for the cuBLASMp library that allows it to efficiently perform communications between different GPUs";
+    longDescription = ''
+      Communication Abstraction Library (CAL) is a helper module for the cuBLASMp library that allows it to
+      efficiently perform communications between different GPUs.
+    '';
+    homepage = "https://developer.nvidia.com/curand";
+    changelog = "https://docs.nvidia.com/cuda/cublasmp/release_notes";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libcusolver.nix b/pkgs/development/cuda-modules/packages/libcusolver.nix
new file mode 100644
index 000000000000..90a9f6de8f37
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcusolver.nix
@@ -0,0 +1,36 @@
+{
+  buildRedist,
+  lib,
+  libcublas,
+  libcusparse,
+  libnvjitlink,
+}:
+buildRedist {
+  redistName = "cuda";
+  pname = "libcusolver";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+    "stubs"
+  ];
+
+  buildInputs = [
+    (lib.getLib libcublas)
+    (lib.getLib libcusparse)
+    libnvjitlink
+  ];
+
+  meta = {
+    description = "Collection of dense and sparse direct linear solvers and Eigen solvers";
+    longDescription = ''
+      The NVIDIA cuSOLVER library provides a collection of dense and sparse direct linear solvers and Eigen solvers
+      which deliver significant acceleration for Computer Vision, CFD, Computational Chemistry, and Linear
+      Optimization applications.
+    '';
+    homepage = "https://developer.nvidia.com/cusolver";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libcusparse.nix b/pkgs/development/cuda-modules/packages/libcusparse.nix
new file mode 100644
index 000000000000..9553d2da4903
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcusparse.nix
@@ -0,0 +1,26 @@
+{ buildRedist, libnvjitlink }:
+buildRedist {
+  redistName = "cuda";
+  pname = "libcusparse";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+    "stubs"
+  ];
+
+  buildInputs = [ libnvjitlink ];
+
+  meta = {
+    description = "GPU-accelerated basic linear algebra subroutines for sparse matrix computations for unstructured sparsity";
+    longDescription = ''
+      The cuSPARSE APIs provides GPU-accelerated basic linear algebra subroutines for sparse matrix computations for
+      unstructured sparsity.
+    '';
+    homepage = "https://developer.nvidia.com/cusparse";
+    changelog = "https://docs.nvidia.com/cuda/cusparse";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libcusparse_lt.nix b/pkgs/development/cuda-modules/packages/libcusparse_lt.nix
new file mode 100644
index 000000000000..9b326baaa96a
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcusparse_lt.nix
@@ -0,0 +1,38 @@
+{
+  _cuda,
+  buildRedist,
+  cuda_cudart,
+  lib,
+  libcublas,
+}:
+buildRedist (finalAttrs: {
+  redistName = "cusparselt";
+  pname = "libcusparse_lt";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+  ];
+
+  buildInputs = [
+    (lib.getLib libcublas)
+  ]
+  # For some reason, the 1.4.x release of cusparselt requires the cudart library.
+  ++ lib.optionals (lib.hasPrefix "1.4" finalAttrs.version) [ (lib.getLib cuda_cudart) ];
+
+  meta = {
+    description = "High-performance CUDA library dedicated to general matrix-matrix operations in which at least one operand is a structured sparse matrix with 50% sparsity ratio";
+    longDescription = ''
+      NVIDIA cuSPARSELt is a high-performance CUDA library dedicated to general matrix-matrix operations in which at
+      least one operand is a structured sparse matrix with 50% sparsity ratio.
+    '';
+    homepage = "https://developer.nvidia.com/cusparselt-downloads";
+    changelog = "https://docs.nvidia.com/cuda/cublasmp/release_notes";
+
+    maintainers = [ lib.maintainers.sepiabrown ];
+    license = _cuda.lib.licenses.cusparse_lt;
+  };
+})
diff --git a/pkgs/development/cuda-modules/packages/libcutensor.nix b/pkgs/development/cuda-modules/packages/libcutensor.nix
new file mode 100644
index 000000000000..0b193619021d
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcutensor.nix
@@ -0,0 +1,42 @@
+{
+  _cuda,
+  buildRedist,
+  cuda_cudart,
+  lib,
+  libcublas,
+}:
+buildRedist (finalAttrs: {
+  redistName = "cutensor";
+  pname = "libcutensor";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+  ];
+
+  allowFHSReferences = true;
+
+  buildInputs = [
+    (lib.getLib libcublas)
+  ]
+  # For some reason, the 1.4.x release of cuTENSOR requires the cudart library.
+  ++ lib.optionals (lib.hasPrefix "1.4" finalAttrs.version) [ (lib.getLib cuda_cudart) ];
+
+  meta = {
+    description = "GPU-accelerated tensor linear algebra library for tensor contraction, reduction, and elementwise operations";
+    longDescription = ''
+      NVIDIA cuTENSOR is a GPU-accelerated tensor linear algebra library for tensor contraction, reduction, and
+      elementwise operations. Using cuTENSOR, applications can harness the specialized tensor cores on NVIDIA GPUs for
+      high-performance tensor computations and accelerate deep learning training and inference, computer vision,
+      quantum chemistry, and computational physics workloads.
+    '';
+    homepage = "https://developer.nvidia.com/cutensor";
+    changelog = "https://docs.nvidia.com/cuda/cutensor/latest/release_notes.html";
+
+    maintainers = [ lib.maintainers.obsidian-systems-maintenance ];
+    license = _cuda.lib.licenses.cutensor;
+  };
+})
diff --git a/pkgs/development/cuda-modules/packages/libnpp.nix b/pkgs/development/cuda-modules/packages/libnpp.nix
new file mode 100644
index 000000000000..5527345a6aab
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnpp.nix
@@ -0,0 +1,23 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "libnpp";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+    "stubs"
+  ];
+
+  meta = {
+    description = "Library of primitives for image and signal processing";
+    longDescription = ''
+      NPP is a library of over 5,000 primitives for image and signal processing that lets you easily perform tasks
+      such as color conversion, image compression, filtering, thresholding, and image manipulation.
+    '';
+    homepage = "https://developer.nvidia.com/npp";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libnvfatbin.nix b/pkgs/development/cuda-modules/packages/libnvfatbin.nix
new file mode 100644
index 000000000000..965bd22d18cb
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnvfatbin.nix
@@ -0,0 +1,12 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "libnvfatbin";
+
+  outputs = [ "out" ];
+
+  meta = {
+    description = "APIs which can be used at runtime to combine multiple CUDA objects into one CUDA fat binary (fatbin)";
+    homepage = "https://docs.nvidia.com/cuda/nvfatbin";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libnvidia_nscq.nix b/pkgs/development/cuda-modules/packages/libnvidia_nscq.nix
new file mode 100644
index 000000000000..3aa47e0818ab
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnvidia_nscq.nix
@@ -0,0 +1,12 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "libnvidia_nscq";
+
+  outputs = [
+    "out"
+    "lib"
+  ];
+
+  allowFHSReferences = true;
+}
diff --git a/pkgs/development/cuda-modules/packages/libnvjitlink.nix b/pkgs/development/cuda-modules/packages/libnvjitlink.nix
new file mode 100644
index 000000000000..4124d3fa86a6
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnvjitlink.nix
@@ -0,0 +1,19 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "libnvjitlink";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+    "stubs"
+  ];
+
+  meta = {
+    description = "APIs which can be used at runtime to link together GPU device code";
+    homepage = "https://docs.nvidia.com/cuda/nvjitlink";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libnvjpeg.nix b/pkgs/development/cuda-modules/packages/libnvjpeg.nix
new file mode 100644
index 000000000000..4cdb9bddfd12
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnvjpeg.nix
@@ -0,0 +1,23 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "libnvjpeg";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+    "stubs"
+  ];
+
+  meta = {
+    description = "Provides high-performance, GPU accelerated JPEG decoding functionality for image formats commonly used in deep learning and hyperscale multimedia applications";
+    longDescription = ''
+      The nvJPEG library provides high-performance, GPU accelerated JPEG decoding functionality for image formats
+      commonly used in deep learning and hyperscale multimedia applications.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/nvjpeg";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libnvsdm.nix b/pkgs/development/cuda-modules/packages/libnvsdm.nix
new file mode 100644
index 000000000000..f48ecdbc26af
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnvsdm.nix
@@ -0,0 +1,16 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "libnvsdm";
+
+  # TODO(@connorbaker): Not sure this is the correct set of outputs.
+  outputs = [ "out" ];
+
+  allowFHSReferences = true;
+
+  meta = {
+    description = "NVSwitch Device Monitoring API";
+    homepage = "https://github.com/NVIDIA/nvsdm";
+    changelog = "https://github.com/NVIDIA/nvsdm/releases";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/libnvvm.nix b/pkgs/development/cuda-modules/packages/libnvvm.nix
new file mode 100644
index 000000000000..868cacae3eba
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnvvm.nix
@@ -0,0 +1,25 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "libnvvm";
+
+  # NOTE(@connorbaker): CMake and other build systems may not react well to this library being split into multiple
+  # outputs; they may use relative path accesses.
+  outputs = [ "out" ];
+
+  # Everything is nested under the nvvm directory.
+  prePatch = ''
+    nixLog "un-nesting top-level $PWD/nvvm directory"
+    mv -v "$PWD/nvvm"/* "$PWD/"
+    nixLog "removing empty $PWD/nvvm directory"
+    rmdir -v "$PWD/nvvm"
+  '';
+
+  meta = {
+    description = "Interface for generating PTX code from both binary and text NVVM IR inputs";
+    longDescription = ''
+      libNVVM API provides an interface for generating PTX code from both binary and text NVVM IR inputs.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/libnvvm-api";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/nccl-tests.nix b/pkgs/development/cuda-modules/packages/nccl-tests.nix
index 4ce489a34d00..18118b94bcb8 100644
--- a/pkgs/development/cuda-modules/packages/nccl-tests.nix
+++ b/pkgs/development/cuda-modules/packages/nccl-tests.nix
@@ -2,29 +2,35 @@
 # the names of dependencies from that package set directly to avoid evaluation errors
 # in the case redistributable packages are not available.
 {
-  config,
-  cudaPackages,
+  backendStdenv,
+  _cuda,
+  cuda_cccl,
+  cuda_cudart,
+  cuda_nvcc,
+  cudaNamePrefix,
   fetchFromGitHub,
+  flags,
   gitUpdater,
   lib,
   mpi,
   mpiSupport ? false,
+  nccl,
   which,
 }:
 let
-  inherit (cudaPackages)
-    backendStdenv
-    cuda_cccl
-    cuda_cudart
-    cuda_nvcc
-    cudaAtLeast
-    nccl
-    ;
+  inherit (_cuda.lib) _mkMetaBroken;
+  inherit (lib) licenses maintainers teams;
+  inherit (lib.attrsets) getBin;
+  inherit (lib.lists) optionals;
 in
 backendStdenv.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+  strictDeps = true;
 
+  # NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
+  name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
   pname = "nccl-tests";
-  version = "2.15.0";
+  version = "2.14.1";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
@@ -34,11 +40,18 @@ backendStdenv.mkDerivation (finalAttrs: {
   };
 
   postPatch = ''
-    # fix build failure with GCC14
-    substituteInPlace src/Makefile --replace-fail "-std=c++11" "-std=c++14"
-  '';
+    nixLog "patching $PWD/src/Makefile to remove NVIDIA's ccbin declaration"
+    substituteInPlace ./src/Makefile \
+      --replace-fail \
+        '-ccbin $(CXX)' \
+        ""
 
-  strictDeps = true;
+    nixLog "patching $PWD/src/Makefile to replace -std=c++11 with -std=c++14"
+    substituteInPlace ./src/Makefile \
+      --replace-fail \
+        '-std=c++11' \
+        '-std=c++14'
+  '';
 
   nativeBuildInputs = [
     which
@@ -46,37 +59,55 @@ backendStdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    nccl
-    cuda_nvcc # crt/host_config.h
-    cuda_cudart
     cuda_cccl # <nv/target>
+    cuda_cudart
+    nccl
   ]
-  ++ lib.optionals mpiSupport [ mpi ];
+  ++ optionals mpiSupport [ mpi ];
 
   makeFlags = [
+    # NOTE: CUDA_HOME is expected to have the bin directory
+    # TODO: This won't work with cross-compilation since cuda_nvcc will come from hostPackages by default (aka pkgs).
+    "CUDA_HOME=${getBin cuda_nvcc}"
     "NCCL_HOME=${nccl}"
-    "CUDA_HOME=${cuda_nvcc}"
+    "NVCC_GENCODE=${flags.gencodeString}"
   ]
-  ++ lib.optionals mpiSupport [ "MPI=1" ];
+  ++ optionals mpiSupport [ "MPI=1" ];
 
   enableParallelBuilding = true;
 
   installPhase = ''
-    mkdir -p $out/bin
-    cp -r build/* $out/bin/
+    runHook preInstall
+    mkdir -p "$out/bin"
+    install -Dm755 \
+      $(find build -type f -executable) \
+      "$out/bin"
+    runHook postInstall
   '';
 
-  passthru.updateScript = gitUpdater {
-    inherit (finalAttrs) pname version;
-    rev-prefix = "v";
+  passthru = {
+    brokenAssertions = [
+      {
+        message = "mpi is non-null when mpiSupport is true";
+        assertion = mpiSupport -> mpi != null;
+      }
+    ];
+
+    updateScript = gitUpdater {
+      inherit (finalAttrs) pname version;
+      rev-prefix = "v";
+    };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Tests to check both the performance and the correctness of NVIDIA NCCL operations";
     homepage = "https://github.com/NVIDIA/nccl-tests";
-    platforms = platforms.linux;
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
     license = licenses.bsd3;
-    broken = !config.cudaSupport || (mpiSupport && mpi == null);
+    broken = _mkMetaBroken (!(config.inHydra or false)) finalAttrs;
     maintainers = with maintainers; [ jmillerpdt ];
     teams = [ teams.cuda ];
   };
diff --git a/pkgs/development/cuda-modules/packages/nccl.nix b/pkgs/development/cuda-modules/packages/nccl.nix
index 2d89653ebe0d..a160d501cb44 100644
--- a/pkgs/development/cuda-modules/packages/nccl.nix
+++ b/pkgs/development/cuda-modules/packages/nccl.nix
@@ -2,57 +2,62 @@
 # the names of dependencies from that package set directly to avoid evaluation errors
 # in the case redistributable packages are not available.
 {
-  lib,
+  _cuda,
+  backendStdenv,
+  cuda_cccl,
+  cuda_cudart,
+  cuda_nvcc,
+  cudaNamePrefix,
   fetchFromGitHub,
+  flags,
+  lib,
   python3,
   which,
-  autoAddDriverRunpath,
-  cudaPackages,
   # passthru.updateScript
   gitUpdater,
 }:
 let
-  inherit (cudaPackages)
-    backendStdenv
-    cuda_cccl
-    cuda_cudart
-    cuda_nvcc
-    cudaAtLeast
-    flags
+  inherit (_cuda.lib) _mkMetaBadPlatforms;
+  inherit (backendStdenv) hasJetsonCudaCapability;
+  inherit (lib) licenses maintainers teams;
+  inherit (lib.attrsets)
+    getBin
+    getLib
+    getOutput
     ;
-  version = "2.27.6-1";
-  hash = "sha256-/BiLSZaBbVIqOfd8nQlgUJub0YR3SR4B93x2vZpkeiU=";
 in
 backendStdenv.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  # NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
+  name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
   pname = "nccl";
-  version = version;
+  version = "2.27.6-1";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "nccl";
-    rev = "v${finalAttrs.version}";
-    hash = hash;
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-/BiLSZaBbVIqOfd8nQlgUJub0YR3SR4B93x2vZpkeiU=";
   };
 
-  __structuredAttrs = true;
-  strictDeps = true;
-
   outputs = [
     "out"
     "dev"
+    "static"
   ];
 
   nativeBuildInputs = [
-    which
-    autoAddDriverRunpath
-    python3
     cuda_nvcc
+    python3
+    which
   ];
 
   buildInputs = [
-    cuda_nvcc # crt/host_config.h
-    cuda_cudart
+    (getOutput "include" cuda_nvcc)
     cuda_cccl
+    cuda_cudart
   ];
 
   env.NIX_CFLAGS_COMPILE = toString [ "-Wno-unused-function" ];
@@ -60,35 +65,54 @@ backendStdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     patchShebangs ./src/device/generate.py
     patchShebangs ./src/device/symmetric/generate.py
+
+    nixLog "patching $PWD/makefiles/common.mk to remove NVIDIA's ccbin declaration"
+    substituteInPlace ./makefiles/common.mk \
+      --replace-fail \
+        '-ccbin $(CXX)' \
+        ""
   '';
 
+  # TODO: This would likely break under cross; need to delineate between build and host packages.
   makeFlags = [
-    "PREFIX=$(out)"
+    "CUDA_HOME=${getBin cuda_nvcc}"
+    "CUDA_INC=${getOutput "include" cuda_cudart}/include"
+    "CUDA_LIB=${getLib cuda_cudart}/lib"
     "NVCC_GENCODE=${flags.gencodeString}"
-    "CUDA_HOME=${cuda_nvcc}"
-    "CUDA_LIB=${lib.getLib cuda_cudart}/lib"
-    "CUDA_INC=${lib.getDev cuda_cudart}/include"
+    "PREFIX=$(out)"
   ];
 
   enableParallelBuilding = true;
 
   postFixup = ''
-    moveToOutput lib/libnccl_static.a $dev
+    moveToOutput lib/libnccl_static.a "$static"
   '';
 
-  passthru.updateScript = gitUpdater {
-    inherit (finalAttrs) pname version;
-    rev-prefix = "v";
+  passthru = {
+    platformAssertions = [
+      {
+        message = "target is not a Jetson device";
+        assertion = !hasJetsonCudaCapability;
+      }
+    ];
+
+    updateScript = gitUpdater {
+      inherit (finalAttrs) pname version;
+      rev-prefix = "v";
+    };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs";
     homepage = "https://developer.nvidia.com/nccl";
     license = licenses.bsd3;
-    platforms = platforms.linux;
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
     # NCCL is not supported on Jetson, because it does not use NVLink or PCI-e for inter-GPU communication.
     # https://forums.developer.nvidia.com/t/can-jetson-orin-support-nccl/232845/9
-    badPlatforms = lib.optionals flags.isJetsonBuild [ "aarch64-linux" ];
+    badPlatforms = _mkMetaBadPlatforms (!(config.inHydra or false)) finalAttrs;
     maintainers = with maintainers; [
       mdaiter
       orivej
diff --git a/pkgs/development/cuda-modules/packages/nsight_compute.nix b/pkgs/development/cuda-modules/packages/nsight_compute.nix
new file mode 100644
index 000000000000..0387e1c30e06
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nsight_compute.nix
@@ -0,0 +1,103 @@
+{
+  backendStdenv,
+  buildRedist,
+  cudaAtLeast,
+  cudaOlder,
+  e2fsprogs,
+  elfutils,
+  flags,
+  lib,
+  qt6,
+  rdma-core,
+  ucx,
+}:
+let
+  archDir =
+    {
+      aarch64-linux = "linux-" + (if flags.isJetsonBuild then "v4l_l4t" else "desktop") + "-t210-a64";
+      x86_64-linux = "linux-desktop-glibc_2_11_3-x64";
+    }
+    .${backendStdenv.hostPlatform.system}
+      or (throw "Unsupported system: ${backendStdenv.hostPlatform.system}");
+in
+buildRedist {
+  redistName = "cuda";
+  pname = "nsight_compute";
+
+  # NOTE(@connorbaker): It might be a problem that when nsight_compute contains hosts and targets of different
+  # architectures, that we patchelf just the binaries matching the builder's platform; autoPatchelfHook prints
+  # messages like
+  #   skipping [$out]/host/linux-desktop-glibc_2_11_3-x64/libQt6Core.so.6 because its architecture (x64) differs from
+  #   target (AArch64)
+  outputs = [ "out" ];
+
+  allowFHSReferences = true;
+
+  nativeBuildInputs = [ qt6.wrapQtAppsHook ];
+
+  buildInputs = [
+    (lib.getLib qt6.qtwayland)
+    qt6.qtwebview
+    qt6.qtwebengine
+    rdma-core
+  ]
+  ++ lib.optionals (cudaOlder "12.7") [
+    e2fsprogs
+    ucx
+  ]
+  ++ lib.optionals (cudaAtLeast "12.9") [ elfutils ];
+
+  dontWrapQtApps = true;
+
+  preInstall = ''
+    if [[ -d nsight-compute ]]; then
+      nixLog "Lifting components of Nsight Compute to the top level"
+      mv -v nsight-compute/*/* .
+      nixLog "Removing empty directories"
+      rmdir -pv nsight-compute/*
+    fi
+
+    rm -rf host/${archDir}/Mesa/
+  '';
+
+  postInstall = ''
+    moveToOutput 'ncu' "''${!outputBin}/bin"
+    moveToOutput 'ncu-ui' "''${!outputBin}/bin"
+    moveToOutput 'host/${archDir}' "''${!outputBin}/bin"
+    moveToOutput 'target/${archDir}' "''${!outputBin}/bin"
+    wrapQtApp "''${!outputBin}/bin/host/${archDir}/ncu-ui.bin"
+  ''
+  # NOTE(@connorbaker): No idea what this platform is or how to patchelf for it.
+  + lib.optionalString (flags.isJetsonBuild && cudaOlder "12.9") ''
+    nixLog "Removing QNX 700 target directory for Jetson builds"
+    rm -rfv "''${!outputBin}/target/qnx-700-t210-a64"
+  ''
+  + lib.optionalString (flags.isJetsonBuild && cudaAtLeast "12.8") ''
+    nixLog "Removing QNX 800 target directory for Jetson builds"
+    rm -rfv "''${!outputBin}/target/qnx-800-tegra-a64"
+  '';
+
+  # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
+  preFixup = ''
+    patchelf --replace-needed libtiff.so.5 libtiff.so "''${!outputBin}/bin/host/${archDir}/Plugins/imageformats/libqtiff.so"
+  '';
+
+  autoPatchelfIgnoreMissingDeps = [
+    "libnvidia-ml.so.1"
+    "libcuda.so.1"
+  ];
+
+  meta = {
+    description = "Interactive profiler for CUDA and NVIDIA OptiX";
+    longDescription = ''
+      NVIDIA Nsight Compute is an interactive profiler for CUDA and NVIDIA OptiX that provides detailed performance
+      metrics and API debugging via a user interface and command-line tool. Users can run guided analysis and compare
+      results with a customizable and data-driven user interface, as well as post-process and analyze results in their
+      own workflows.
+    '';
+    homepage = "https://developer.nvidia.com/nsight-compute";
+    changelog = "https://docs.nvidia.com/nsight-compute/ReleaseNotes";
+
+    mainProgram = "ncu";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/nsight_systems.nix b/pkgs/development/cuda-modules/packages/nsight_systems.nix
new file mode 100644
index 000000000000..de65f5265c52
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nsight_systems.nix
@@ -0,0 +1,147 @@
+{
+  backendStdenv,
+  boost178,
+  buildRedist,
+  cuda_cudart,
+  e2fsprogs,
+  gst_all_1,
+  lib,
+  nss,
+  numactl,
+  pulseaudio,
+  qt6,
+  rdma-core,
+  ucx,
+  wayland,
+  xorg,
+}:
+let
+  qtwayland = lib.getLib qt6.qtwayland;
+  qtWaylandPlugins = "${qtwayland}/${qt6.qtbase.qtPluginPrefix}";
+  # NOTE(@connorbaker): nsight_systems doesn't support Jetson, so no need for case splitting on aarch64-linux.
+  hostDir =
+    {
+      aarch64-linux = "host-linux-armv8";
+      x86_64-linux = "host-linux-x64";
+    }
+    .${backendStdenv.hostPlatform.system}
+      or (throw "Unsupported system: ${backendStdenv.hostPlatform.system}");
+  targetDir =
+    {
+      aarch64-linux = "target-linux-sbsa-armv8";
+      x86_64-linux = "target-linux-x64";
+    }
+    .${backendStdenv.hostPlatform.system}
+      or (throw "Unsupported system: ${backendStdenv.hostPlatform.system}");
+in
+buildRedist {
+  redistName = "cuda";
+  pname = "nsight_systems";
+
+  allowFHSReferences = true;
+
+  outputs = [ "out" ];
+
+  # An ad hoc replacement for
+  # https://github.com/ConnorBaker/cuda-redist-find-features/issues/11
+  env.rmPatterns = toString [
+    "${hostDir}/lib{arrow,jpeg}*"
+    "${hostDir}/lib{ssl,ssh,crypto}*"
+    "${hostDir}/libboost*"
+    "${hostDir}/libexec"
+    "${hostDir}/libstdc*"
+    "${hostDir}/python/bin/python"
+    "${hostDir}/Mesa"
+  ];
+
+  # NOTE(@connorbaker): nsight-exporter and nsight-sys are deprecated scripts wrapping nsys, it's fine to remove them.
+  prePatch = ''
+    if [[ -d bin ]]; then
+      nixLog "Removing bin wrapper scripts"
+      for knownWrapper in bin/{nsys{,-ui},nsight-{exporter,sys}}; do
+        [[ -e $knownWrapper ]] && rm -v "$knownWrapper"
+      done
+      unset -v knownWrapper
+
+      nixLog "Removing empty bin directory"
+      rmdir -v bin
+    fi
+
+    if [[ -d nsight-systems ]]; then
+      nixLog "Lifting components of Nsight System to the top level"
+      mv -v nsight-systems/*/* .
+      nixLog "Removing empty nsight-systems directory"
+      rmdir -pv nsight-systems/*
+    fi
+  '';
+
+  postPatch = ''
+    for path in $rmPatterns; do
+      rm -r "$path"
+    done
+    patchShebangs nsight-systems
+  '';
+
+  nativeBuildInputs = [ qt6.wrapQtAppsHook ];
+
+  dontWrapQtApps = true;
+
+  buildInputs = [
+    qt6.qtdeclarative
+    qt6.qtsvg
+    qt6.qtimageformats
+    qt6.qtpositioning
+    qt6.qtscxml
+    qt6.qttools
+    qt6.qtwebengine
+    qt6.qtwayland
+    boost178
+    cuda_cudart.stubs
+    e2fsprogs
+    gst_all_1.gst-plugins-base
+    gst_all_1.gstreamer
+    nss
+    numactl
+    pulseaudio
+    qt6.qtbase
+    qtWaylandPlugins
+    rdma-core
+    ucx
+    wayland
+    xorg.libXcursor
+    xorg.libXdamage
+    xorg.libXrandr
+    xorg.libXtst
+  ]
+  # NOTE(@connorbaker): Seems to be required only for aarch64-linux.
+  ++ lib.optionals backendStdenv.hostPlatform.isAarch64 [
+    gst_all_1.gst-plugins-bad
+  ];
+
+  postInstall = ''
+    moveToOutput '${hostDir}' "''${!outputBin}"
+    moveToOutput '${targetDir}' "''${!outputBin}"
+    moveToOutput 'bin' "''${!outputBin}"
+    wrapQtApp "''${!outputBin}/${hostDir}/nsys-ui.bin"
+  '';
+
+  # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
+  preFixup = ''
+    patchelf --replace-needed libtiff.so.5 libtiff.so "''${!outputBin}/${hostDir}/Plugins/imageformats/libqtiff.so"
+  '';
+
+  autoPatchelfIgnoreMissingDeps = [
+    "libnvidia-ml.so.1"
+  ];
+
+  meta = {
+    description = "System-wide performance analysis and visualization tool";
+    longDescription = ''
+      NVIDIA Nsight Systems is a system-wide performance analysis tool designed to visualize an application's
+      algorithms, identify the largest opportunities to optimize, and tune to scale efficiently across any quantity or
+      size of CPUs and GPUs, from large servers to our smallest systems-on-a-chip (SoCs).
+    '';
+    homepage = "https://developer.nvidia.com/nsight-systems";
+    changelog = "https://docs.nvidia.com/nsight-systems/ReleaseNotes";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/nvidia_driver.nix b/pkgs/development/cuda-modules/packages/nvidia_driver.nix
new file mode 100644
index 000000000000..c21a59e7402b
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvidia_driver.nix
@@ -0,0 +1,14 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "nvidia_driver";
+
+  outputs = [ "out" ];
+
+  brokenAssertions = [
+    {
+      message = "use drivers from linuxPackages";
+      assertion = false;
+    }
+  ];
+}
diff --git a/pkgs/development/cuda-modules/packages/nvidia_fs.nix b/pkgs/development/cuda-modules/packages/nvidia_fs.nix
new file mode 100644
index 000000000000..1dbe5d9c9baf
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvidia_fs.nix
@@ -0,0 +1,19 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "nvidia_fs";
+
+  outputs = [ "out" ];
+
+  allowFHSReferences = true;
+
+  meta = {
+    description = "GPUDirect Storage kernel driver to read/write data from supported storage using cufile APIs";
+    longDescription = ''
+      GPUDirect Storage kernel driver nvidia-fs.ko is a kernel module to orchestrate IO directly from DMA/RDMA
+      capable storage to user allocated GPU memory on NVIDIA Graphics cards.
+    '';
+    homepage = "https://github.com/NVIDIA/gds-nvidia-fs";
+    changelog = "https://github.com/NVIDIA/gds-nvidia-fs/releases";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/saxpy/package.nix b/pkgs/development/cuda-modules/packages/saxpy/package.nix
index 5e3c2bb168ad..076afb708895 100644
--- a/pkgs/development/cuda-modules/packages/saxpy/package.nix
+++ b/pkgs/development/cuda-modules/packages/saxpy/package.nix
@@ -1,43 +1,34 @@
 {
-  autoAddDriverRunpath,
+  backendStdenv,
   cmake,
-  cudaPackages,
+  cuda_cccl,
+  cuda_cudart,
+  cuda_nvcc,
+  cudaNamePrefix,
+  flags,
   lib,
+  libcublas,
   saxpy,
 }:
-let
-  inherit (cudaPackages)
-    backendStdenv
-    cuda_cccl
-    cuda_cudart
-    cuda_nvcc
-    cudaAtLeast
-    flags
-    libcublas
-    ;
-  inherit (lib) getDev getLib getOutput;
-in
-backendStdenv.mkDerivation {
-  pname = "saxpy";
-  version = "unstable-2023-07-11";
-
-  src = ./src;
-
+backendStdenv.mkDerivation (finalAttrs: {
   __structuredAttrs = true;
   strictDeps = true;
 
+  name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
+  pname = "saxpy";
+  version = "0-unstable-2023-07-11";
+
+  src = ./src;
+
   nativeBuildInputs = [
     cmake
-    autoAddDriverRunpath
     cuda_nvcc
   ];
 
   buildInputs = [
-    (getDev libcublas)
-    (getLib libcublas)
-    (getOutput "static" libcublas)
-    cuda_cudart
     cuda_cccl
+    cuda_cudart
+    libcublas
   ];
 
   cmakeFlags = [
@@ -60,4 +51,4 @@ backendStdenv.mkDerivation {
     mainProgram = "saxpy";
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/development/cuda-modules/packages/tensorrt.nix b/pkgs/development/cuda-modules/packages/tensorrt.nix
new file mode 100644
index 000000000000..395fb494f1ba
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/tensorrt.nix
@@ -0,0 +1,161 @@
+{
+  _cuda,
+  backendStdenv,
+  buildRedist,
+  cuda_cudart,
+  cudnn,
+  cuda_nvrtc,
+  lib,
+  libcudla, # only for Jetson
+  patchelf,
+}:
+let
+  inherit (_cuda.lib) majorMinorPatch;
+  inherit (backendStdenv) hasJetsonCudaCapability;
+  inherit (lib.attrsets) getLib;
+  inherit (lib.lists) optionals;
+  inherit (lib.strings) concatStringsSep;
+in
+buildRedist (
+  finalAttrs:
+  let
+    majorMinorPatchVersion = majorMinorPatch finalAttrs.version;
+    majorVersion = lib.versions.major finalAttrs.version;
+  in
+  {
+    redistName = "tensorrt";
+    pname = "tensorrt";
+
+    outputs = [
+      "out"
+      "bin"
+      "dev"
+      "include"
+      "lib"
+      "samples"
+      "static"
+      # "stubs" removed in postInstall
+    ];
+
+    allowFHSReferences = true;
+
+    nativeBuildInputs = [ patchelf ];
+
+    buildInputs = [
+      (getLib cudnn)
+      (getLib cuda_nvrtc)
+      cuda_cudart
+    ]
+    ++ optionals hasJetsonCudaCapability [ libcudla ];
+
+    preInstall =
+      let
+        inherit (backendStdenv.hostPlatform) parsed;
+        # x86_64-linux-gnu
+        targetString = concatStringsSep "-" [
+          parsed.cpu.name
+          parsed.kernel.name
+          parsed.abi.name
+        ];
+      in
+      # Replace symlinks to bin and lib with the actual directories from targets.
+      ''
+        for dir in bin lib; do
+          [[ -L "$dir" ]] || continue
+          nixLog "replacing symlink $NIX_BUILD_TOP/$sourceRoot/$dir with $NIX_BUILD_TOP/$sourceRoot/targets/${targetString}/$dir"
+          rm --verbose "$NIX_BUILD_TOP/$sourceRoot/$dir"
+          mv --verbose --no-clobber "$NIX_BUILD_TOP/$sourceRoot/targets/${targetString}/$dir" "$NIX_BUILD_TOP/$sourceRoot/$dir"
+        done
+        unset -v dir
+      ''
+      # Remove symlinks if they exist
+      + ''
+        for dir in include samples; do
+          if [[ -L "$NIX_BUILD_TOP/$sourceRoot/targets/${targetString}/$dir" ]]; then
+            nixLog "removing symlink $NIX_BUILD_TOP/$sourceRoot/targets/${targetString}/$dir"
+            rm --verbose "$NIX_BUILD_TOP/$sourceRoot/targets/${targetString}/$dir"
+          fi
+        done
+        unset -v dir
+
+        if [[ -d "$NIX_BUILD_TOP/$sourceRoot/targets" ]]; then
+          nixLog "removing targets directory"
+          rm --recursive --verbose "$NIX_BUILD_TOP/$sourceRoot/targets" || {
+            nixErrorLog "could not delete $NIX_BUILD_TOP/$sourceRoot/targets: $(ls -laR "$NIX_BUILD_TOP/$sourceRoot/targets")"
+            exit 1
+          }
+        fi
+      '';
+
+    autoPatchelfIgnoreMissingDeps = optionals hasJetsonCudaCapability [
+      "libnvdla_compiler.so"
+    ];
+
+    # Create a symlink for the Onnx header files in include/onnx
+    # NOTE(@connorbaker): This is shared with the tensorrt-oss package, with the `out` output swapped with `include`.
+    # When updating one, check if the other should be updated.
+    postInstall = ''
+      mkdir "''${!outputInclude:?}/include/onnx"
+      pushd "''${!outputInclude:?}/include" >/dev/null
+      nixLog "creating symlinks for Onnx header files"
+      ln -srvt "''${!outputInclude:?}/include/onnx/" NvOnnx*.h
+      popd >/dev/null
+    ''
+    # Move the python directory, which contains header files, to the include output.
+    + ''
+      nixLog "moving python directory to include output"
+      moveToOutput python "''${!outputInclude:?}"
+
+      nixLog "remove python wheels"
+      rm --verbose "''${!outputInclude:?}"/python/*.whl
+    ''
+    + ''
+      nixLog "moving data directory to samples output"
+      moveToOutput data "''${!outputSamples:?}"
+    ''
+    # Remove the Windows library used for cross-compilation if it exists.
+    + ''
+      if [[ -e "''${!outputLib:?}/lib/libnvinfer_builder_resource_win.so.${majorMinorPatchVersion}" ]]; then
+        nixLog "removing Windows library"
+        rm --verbose "''${!outputLib:?}/lib/libnvinfer_builder_resource_win.so.${majorMinorPatchVersion}"
+      fi
+    ''
+    # Remove the stub libraries.
+    + ''
+      nixLog "removing stub libraries"
+      rm --recursive --verbose "''${!outputLib:?}/lib/stubs" || {
+        nixErrorLog "could not delete ''${!outputLib:?}/lib/stubs"
+        exit 1
+      }
+    '';
+
+    # Tell autoPatchelf about runtime dependencies.
+    postFixup = ''
+      nixLog "patchelf-ing ''${!outputBin:?}/bin/trtexec with runtime dependencies"
+      patchelf \
+        "''${!outputBin:?}/bin/trtexec" \
+        --add-needed libnvinfer_plugin.so.${majorVersion}
+    '';
+
+    passthru = {
+      # The CUDNN used with TensorRT.
+      inherit cudnn;
+    };
+
+    meta = {
+      description = "SDK that facilitates high-performance machine learning inference";
+      longDescription = ''
+        NVIDIA TensorRT is an SDK that facilitates high-performance machine learning inference. It complements training
+        frameworks such as TensorFlow, PyTorch, and MXNet. It focuses on running an already-trained network quickly and
+        efficiently on NVIDIA hardware.
+      '';
+      homepage = "https://developer.nvidia.com/tensorrt";
+      # NOTE: As of 2025-08-31, TensorRT doesn't follow the standard naming convention for URL paths that the rest of
+      # the redistributables do. As such, we need to specify downloadPage manually.
+      downloadPage = "https://developer.nvidia.com/downloads/compute/machine-learning/tensorrt";
+      changelog = "https://docs.nvidia.com/deeplearning/tensorrt/latest/getting-started/release-notes.html#release-notes";
+
+      license = _cuda.lib.licenses.tensorrt;
+    };
+  }
+)
diff --git a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix b/pkgs/development/cuda-modules/packages/tests/cuda-library-samples.nix
similarity index 79%
rename from pkgs/development/cuda-modules/cuda-library-samples/generic.nix
rename to pkgs/development/cuda-modules/packages/tests/cuda-library-samples.nix
index 529716220351..67bab4b3483c 100644
--- a/pkgs/development/cuda-modules/cuda-library-samples/generic.nix
+++ b/pkgs/development/cuda-modules/packages/tests/cuda-library-samples.nix
@@ -4,18 +4,17 @@
   autoPatchelfHook,
   backendStdenv,
   cmake,
-  cuda_cccl ? null,
-  cuda_cudart ? null,
-  cuda_nvcc ? null,
+  cuda_cccl,
+  cuda_cudart,
+  cuda_nvcc,
   cudatoolkit,
-  cusparselt ? null,
-  cutensor ? null,
+  libcusparse_lt,
+  libcutensor,
   fetchFromGitHub,
   lib,
-  libcusparse ? null,
+  libcusparse,
   setupCudaHook,
 }:
-
 let
   base = backendStdenv.mkDerivation (finalAttrs: {
     src = fetchFromGitHub {
@@ -72,7 +71,7 @@ in
 
       sourceRoot = "${finalAttrs.src.name}/cuTENSOR";
 
-      buildInputs = prevAttrs.buildInputs or [ ] ++ [ cutensor ];
+      buildInputs = prevAttrs.buildInputs or [ ] ++ [ libcutensor ];
 
       cmakeFlags = prevAttrs.cmakeFlags or [ ] ++ [
         "-DCUTENSOR_EXAMPLE_BINARY_INSTALL_DIR=${placeholder "out"}/bin"
@@ -81,14 +80,10 @@ in
       # CUTENSOR_ROOT is double escaped
       postPatch = prevAttrs.postPatch or "" + ''
         substituteInPlace CMakeLists.txt \
-          --replace-fail "\''${CUTENSOR_ROOT}/include" "${lib.getDev cutensor}/include"
+          --replace-fail "\''${CUTENSOR_ROOT}/include" "${lib.getOutput "include" libcutensor}/include"
       '';
 
-      CUTENSOR_ROOT = cutensor;
-
-      meta = prevAttrs.meta or { } // {
-        broken = cutensor == null;
-      };
+      CUTENSOR_ROOT = libcutensor;
     }
   );
 
@@ -101,7 +96,7 @@ in
       nativeBuildInputs = prevAttrs.nativeBuildInputs or [ ] ++ [
         cmake
         addDriverRunpath
-        (lib.getDev cusparselt)
+        (lib.getDev libcusparse_lt)
         (lib.getDev libcusparse)
         cuda_nvcc
         (lib.getDev cuda_cudart) # <cuda_runtime_api.h>
@@ -110,8 +105,8 @@ in
 
       postPatch = prevAttrs.postPatch or "" + ''
         substituteInPlace CMakeLists.txt \
-          --replace-fail "''${CUSPARSELT_ROOT}/lib64/libcusparseLt.so" "${lib.getLib cusparselt}/lib/libcusparseLt.so" \
-          --replace-fail "''${CUSPARSELT_ROOT}/lib64/libcusparseLt_static.a" "${lib.getStatic cusparselt}/lib/libcusparseLt_static.a"
+          --replace-fail "''${CUSPARSELT_ROOT}/lib64/libcusparseLt.so" "${lib.getLib libcusparse_lt}/lib/libcusparseLt.so" \
+          --replace-fail "''${CUSPARSELT_ROOT}/lib64/libcusparseLt_static.a" "${lib.getStatic libcusparse_lt}/lib/libcusparseLt_static.a"
       '';
 
       postInstall = prevAttrs.postInstall or "" + ''
@@ -121,17 +116,7 @@ in
       '';
 
       CUDA_TOOLKIT_PATH = lib.getLib cudatoolkit;
-      CUSPARSELT_PATH = lib.getLib cusparselt;
-
-      meta = prevAttrs.meta or { } // {
-        broken =
-          # Base dependencies
-          cusparselt == null
-          || libcusparse == null
-          || cuda_nvcc == null
-          || cuda_cudart == null
-          || cuda_cccl == null;
-      };
+      CUSPARSELT_PATH = lib.getLib libcusparse_lt;
     }
   );
 }
diff --git a/pkgs/development/cuda-modules/tests/flags.nix b/pkgs/development/cuda-modules/packages/tests/flags.nix
similarity index 100%
rename from pkgs/development/cuda-modules/tests/flags.nix
rename to pkgs/development/cuda-modules/packages/tests/flags.nix
diff --git a/pkgs/development/cuda-modules/packages/tests/opencv-and-torch/package.nix b/pkgs/development/cuda-modules/packages/tests/opencv-and-torch/package.nix
new file mode 100644
index 000000000000..86b2780944ea
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/tests/opencv-and-torch/package.nix
@@ -0,0 +1,122 @@
+{
+  cudaPackages,
+  lib,
+  writeGpuTestPython,
+}:
+let
+  inherit (lib)
+    listToAttrs
+    mapCartesianProduct
+    optionals
+    concatStringsSep
+    optionalString
+    ;
+
+  bools = [
+    true
+    false
+  ];
+
+  configs = {
+    openCVFirst = bools;
+    useOpenCVDefaultCuda = bools;
+    useTorchDefaultCuda = bools;
+  };
+
+  openCVBlock = ''
+
+    import cv2
+    print("OpenCV version:", cv2.__version__)
+
+    # Ensure OpenCV can access the GPU.
+    assert cv2.cuda.getCudaEnabledDeviceCount() > 0, "No CUDA devices found for OpenCV"
+    print("OpenCV CUDA device:", cv2.cuda.printCudaDeviceInfo(cv2.cuda.getDevice()))
+
+    # Ensure OpenCV can access the GPU.
+    print(cv2.getBuildInformation())
+
+    a = cv2.cuda.GpuMat(size=(256, 256), type=cv2.CV_32S, s=1)
+    b = cv2.cuda.GpuMat(size=(256, 256), type=cv2.CV_32S, s=1)
+    c = int(cv2.cuda.sum(cv2.cuda.add(a, b))[0]) # OpenCV returns a Scalar float object.
+
+    assert c == 2 * 256 * 256, f"Expected {2 * 256 * 256} OpenCV, got {c}"
+
+  '';
+
+  torchBlock = ''
+
+    import torch
+    print("Torch version:", torch.__version__)
+
+    # Set up the GPU.
+    torch.cuda.init()
+    # Ensure the GPU is available.
+    assert torch.cuda.is_available(), "CUDA is not available to Torch"
+    print("Torch CUDA device:", torch.cuda.get_device_properties(torch.cuda.current_device()))
+
+    a = torch.ones(256, 256, dtype=torch.int32).cuda()
+    b = torch.ones(256, 256, dtype=torch.int32).cuda()
+    c = (a + b).sum().item()
+    assert c == 2 * 256 * 256, f"Expected {2 * 256 * 256} for Torch, got {c}"
+
+  '';
+
+  mkNamedTest =
+    {
+      openCVFirst,
+      useOpenCVDefaultCuda,
+      useTorchDefaultCuda,
+    }:
+    {
+      name = concatStringsSep "-" (
+        [
+          "test"
+          (if openCVFirst then "opencv" else "torch")
+        ]
+        ++ optionals (if openCVFirst then useOpenCVDefaultCuda else useTorchDefaultCuda) [
+          "with-default-cuda"
+        ]
+        ++ [
+          "then"
+          (if openCVFirst then "torch" else "opencv")
+        ]
+        ++ optionals (if openCVFirst then useTorchDefaultCuda else useOpenCVDefaultCuda) [
+          "with-default-cuda"
+        ]
+      );
+      value =
+        let
+          content = if openCVFirst then openCVBlock + torchBlock else torchBlock + openCVBlock;
+
+          torchName = "torch" + optionalString useTorchDefaultCuda "-with-default-cuda";
+          openCVName = "opencv4" + optionalString useOpenCVDefaultCuda "-with-default-cuda";
+        in
+        # TODO: Ensure the expected CUDA libraries are loaded.
+        # TODO: Ensure GPU access works as expected.
+        writeGpuTestPython {
+          name = if openCVFirst then "${openCVName}-then-${torchName}" else "${torchName}-then-${openCVName}";
+          libraries =
+            # NOTE: These are purposefully in this order.
+            pythonPackages:
+            let
+              effectiveOpenCV = pythonPackages.opencv4.override (prevAttrs: {
+                cudaPackages = if useOpenCVDefaultCuda then prevAttrs.cudaPackages else cudaPackages;
+              });
+              effectiveTorch = pythonPackages.torchWithCuda.override (prevAttrs: {
+                cudaPackages = if useTorchDefaultCuda then prevAttrs.cudaPackages else cudaPackages;
+              });
+            in
+            if openCVFirst then
+              [
+                effectiveOpenCV
+                effectiveTorch
+              ]
+            else
+              [
+                effectiveTorch
+                effectiveOpenCV
+              ];
+        } content;
+    };
+in
+listToAttrs (mapCartesianProduct mkNamedTest configs)
diff --git a/pkgs/development/cuda-modules/tensorrt/releases.nix b/pkgs/development/cuda-modules/tensorrt/releases.nix
deleted file mode 100644
index 9ead3767a286..000000000000
--- a/pkgs/development/cuda-modules/tensorrt/releases.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-# NOTE: Check https://developer.nvidia.com/nvidia-tensorrt-8x-download
-#             https://developer.nvidia.com/nvidia-tensorrt-10x-download
-
-# Version policy is to keep the latest minor release for each major release.
-{
-  tensorrt.releases = {
-    # jetson
-    linux-aarch64 = [ ];
-    # powerpc
-    linux-ppc64le = [ ];
-    # server-grade arm
-    linux-sbsa = [
-      {
-        version = "10.8.0.43";
-        minCudaVersion = "12.8";
-        maxCudaVersion = "12.8";
-        cudnnVersion = "9.7";
-        filename = "TensorRT-10.8.0.43.Linux.aarch64-gnu.cuda-12.8.tar.gz";
-        hash = "sha256-sB5d0sfGQyUhGdA9ku6pcCNBjpL0Wjvg0Ilulikj5Do=";
-      }
-      {
-        version = "10.9.0.34";
-        minCudaVersion = "12.8";
-        maxCudaVersion = "12.8";
-        cudnnVersion = "9.7";
-        filename = "TensorRT-10.9.0.34.Linux.aarch64-gnu.cuda-12.8.tar.gz";
-        hash = "sha256-uB7CoGf2fwgsE8rsLc71Q4W0Kp3mpOyubzGKotQZZPI=";
-      }
-    ];
-    # x86_64
-    linux-x86_64 = [
-      {
-        version = "10.8.0.43";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        cudnnVersion = "9.7";
-        filename = "TensorRT-10.8.0.43.Linux.x86_64-gnu.cuda-12.8.tar.gz";
-        hash = "sha256-V31tivU4FTQUuYZ8ZmtPZYUvwusefA6jogbl+vvH1J4=";
-      }
-      {
-        version = "10.9.0.34";
-        minCudaVersion = "12.0";
-        maxCudaVersion = "12.8";
-        cudnnVersion = "9.7";
-        filename = "TensorRT-10.9.0.34.Linux.x86_64-gnu.cuda-12.8.tar.gz";
-        hash = "sha256-M74OYeO/F3u7yrtIkr8BPwyKxx0r5z8oA4SKOCyxQnI=";
-      }
-    ];
-  };
-}
diff --git a/pkgs/development/cuda-modules/tensorrt/shims.nix b/pkgs/development/cuda-modules/tensorrt/shims.nix
deleted file mode 100644
index b452a515404c..000000000000
--- a/pkgs/development/cuda-modules/tensorrt/shims.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-# Shims to mimic the shape of ../modules/generic/manifests/{feature,redistrib}/release.nix
-{
-  package,
-  # redistSystem :: String
-  # String is `"unsupported"` if the given architecture is unsupported.
-  redistSystem,
-}:
-{
-  featureRelease = {
-    inherit (package) cudnnVersion minCudaVersion maxCudaVersion;
-    ${redistSystem}.outputs = {
-      bin = true;
-      lib = true;
-      static = true;
-      dev = true;
-      sample = true;
-      python = true;
-    };
-  };
-  redistribRelease = {
-    name = "TensorRT: a high-performance deep learning interface";
-    inherit (package) hash filename version;
-  };
-}
diff --git a/pkgs/development/cuda-modules/tests/opencv-and-torch/default.nix b/pkgs/development/cuda-modules/tests/opencv-and-torch/default.nix
deleted file mode 100644
index 442bfb8a2dd0..000000000000
--- a/pkgs/development/cuda-modules/tests/opencv-and-torch/default.nix
+++ /dev/null
@@ -1,81 +0,0 @@
-{
-  cudaPackages,
-  lib,
-  writeGpuTestPython,
-  # Configuration flags
-  openCVFirst,
-  useOpenCVDefaultCuda,
-  useTorchDefaultCuda,
-}:
-let
-  inherit (lib.strings) optionalString;
-
-  openCVBlock = ''
-
-    import cv2
-    print("OpenCV version:", cv2.__version__)
-
-    # Ensure OpenCV can access the GPU.
-    assert cv2.cuda.getCudaEnabledDeviceCount() > 0, "No CUDA devices found for OpenCV"
-    print("OpenCV CUDA device:", cv2.cuda.printCudaDeviceInfo(cv2.cuda.getDevice()))
-
-    # Ensure OpenCV can access the GPU.
-    print(cv2.getBuildInformation())
-
-    a = cv2.cuda.GpuMat(size=(256, 256), type=cv2.CV_32S, s=1)
-    b = cv2.cuda.GpuMat(size=(256, 256), type=cv2.CV_32S, s=1)
-    c = int(cv2.cuda.sum(cv2.cuda.add(a, b))[0]) # OpenCV returns a Scalar float object.
-
-    assert c == 2 * 256 * 256, f"Expected {2 * 256 * 256} OpenCV, got {c}"
-
-  '';
-
-  torchBlock = ''
-
-    import torch
-    print("Torch version:", torch.__version__)
-
-    # Set up the GPU.
-    torch.cuda.init()
-    # Ensure the GPU is available.
-    assert torch.cuda.is_available(), "CUDA is not available to Torch"
-    print("Torch CUDA device:", torch.cuda.get_device_properties(torch.cuda.current_device()))
-
-    a = torch.ones(256, 256, dtype=torch.int32).cuda()
-    b = torch.ones(256, 256, dtype=torch.int32).cuda()
-    c = (a + b).sum().item()
-    assert c == 2 * 256 * 256, f"Expected {2 * 256 * 256} for Torch, got {c}"
-
-  '';
-
-  content = if openCVFirst then openCVBlock + torchBlock else torchBlock + openCVBlock;
-
-  torchName = "torch" + optionalString useTorchDefaultCuda "-with-default-cuda";
-  openCVName = "opencv4" + optionalString useOpenCVDefaultCuda "-with-default-cuda";
-in
-# TODO: Ensure the expected CUDA libraries are loaded.
-# TODO: Ensure GPU access works as expected.
-writeGpuTestPython {
-  name = if openCVFirst then "${openCVName}-then-${torchName}" else "${torchName}-then-${openCVName}";
-  libraries =
-    # NOTE: These are purposefully in this order.
-    pythonPackages:
-    let
-      effectiveOpenCV = pythonPackages.opencv4.override (prevAttrs: {
-        cudaPackages = if useOpenCVDefaultCuda then prevAttrs.cudaPackages else cudaPackages;
-      });
-      effectiveTorch = pythonPackages.torchWithCuda.override (prevAttrs: {
-        cudaPackages = if useTorchDefaultCuda then prevAttrs.cudaPackages else cudaPackages;
-      });
-    in
-    if openCVFirst then
-      [
-        effectiveOpenCV
-        effectiveTorch
-      ]
-    else
-      [
-        effectiveTorch
-        effectiveOpenCV
-      ];
-} content
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cfe063b4fb6e..5ef79ac7581f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2557,10 +2557,13 @@ with pkgs;
   # Top-level fix-point used in `cudaPackages`' internals
   _cuda = import ../development/cuda-modules/_cuda;
 
-  cudaPackages_12_6 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.6"; };
-  cudaPackages_12_8 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.8"; };
-  cudaPackages_12_9 = callPackage ./cuda-packages.nix { cudaMajorMinorVersion = "12.9"; };
-  cudaPackages_12 = cudaPackages_12_8; # Latest supported by cudnn
+  inherit (callPackages ./cuda-packages.nix { })
+    cudaPackages_12_6
+    cudaPackages_12_8
+    cudaPackages_12_9
+    ;
+
+  cudaPackages_12 = cudaPackages_12_8;
 
   cudaPackages = recurseIntoAttrs cudaPackages_12;
 
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index cc92f7ae3491..3ab93e801d36 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -1,240 +1,55 @@
-# Notes:
-#
-# Silvan (Tweag) covered some things on recursive attribute sets in the Nix Hour:
-# https://www.youtube.com/watch?v=BgnUFtd1Ivs
-#
-# I (@connorbaker) highly recommend watching it.
-#
-# Most helpful comment regarding recursive attribute sets:
-#
-# https://github.com/NixOS/nixpkgs/pull/256324#issuecomment-1749935979
-#
-# To summarize:
-#
-# - `prev` should only be used to access attributes which are going to be overridden.
-# - `final` should only be used to access `callPackage` to build new packages.
-# - Attribute names are evaluated eagerly ("NAMESET STRICTNESS").
-#   - Extensions must not depend on `final` when computing names and count of new attributes.
-#
-# Silvan's recommendation then is to explicitly use `callPackage` to provide everything our
-# extensions need to compute the attribute names, without relying on `final`.
-#
-# I've (@connorbaker) attempted to do that, though I'm unsure of how this will interact with overrides.
 {
-  config,
   _cuda,
-  cudaMajorMinorVersion,
+  callPackage,
+  config,
   lib,
   pkgs,
   stdenv,
-  runCommand,
 }:
 let
-  inherit (lib)
-    attrsets
-    customisation
-    fixedPoints
-    lists
-    strings
-    versions
-    ;
-
-  cudaLib = _cuda.lib;
+  # NOTE: Because manifests are used to add redistributables to the package set,
+  # we cannot have values depend on the package set itself, or we run into infinite recursion.
 
   # Since Jetson capabilities are never built by default, we can check if any of them were requested
   # through final.config.cudaCapabilities and use that to determine if we should change some manifest versions.
   # Copied from backendStdenv.
-  jetsonCudaCapabilities = lib.filter (
-    cudaCapability: _cuda.db.cudaCapabilityToInfo.${cudaCapability}.isJetson
-  ) _cuda.db.allSortedCudaCapabilities;
   hasJetsonCudaCapability =
-    lib.intersectLists jetsonCudaCapabilities (config.cudaCapabilities or [ ]) != [ ];
-  redistSystem = _cuda.lib.getRedistSystem hasJetsonCudaCapability stdenv.hostPlatform.system;
-
-  # We must use an instance of Nixpkgs where the CUDA package set we're building is the default; if we do not, members
-  # of the versioned, non-default package sets may rely on (transitively) members of the default, unversioned CUDA
-  # package set.
-  # See `Using cudaPackages.pkgs` in doc/languages-frameworks/cuda.section.md for more information.
-  pkgs' =
     let
-      cudaPackagesUnversionedName = "cudaPackages";
-      cudaPackagesMajorVersionName = cudaLib.mkVersionedName cudaPackagesUnversionedName (
-        versions.major cudaMajorMinorVersion
-      );
-      cudaPackagesMajorMinorVersionName = cudaLib.mkVersionedName cudaPackagesUnversionedName cudaMajorMinorVersion;
+      jetsonCudaCapabilities = lib.filter (
+        cudaCapability: _cuda.db.cudaCapabilityToInfo.${cudaCapability}.isJetson
+      ) _cuda.db.allSortedCudaCapabilities;
     in
-    # If the CUDA version of pkgs matches our CUDA version, we are constructing the default package set and can use
-    # pkgs without modification.
-    if pkgs.cudaPackages.cudaMajorMinorVersion == cudaMajorMinorVersion then
-      pkgs
-    else
-      pkgs.extend (
-        final: _: {
-          recurseForDerivations = false;
-          # The CUDA package set will be available as cudaPackages_x_y, so we need only update the aliases for the
-          # minor-versioned and unversioned package sets.
-          # cudaPackages_x = cudaPackages_x_y
-          ${cudaPackagesMajorVersionName} = final.${cudaPackagesMajorMinorVersionName};
-          # cudaPackages = cudaPackages_x
-          ${cudaPackagesUnversionedName} = final.${cudaPackagesMajorVersionName};
-        }
-      );
-
-  passthruFunction = final: {
-    # NOTE:
-    # It is important that _cuda is not part of the package set fixed-point. As described by
-    # @SomeoneSerge:
-    # > The layering should be: configuration -> (identifies/is part of) cudaPackages -> (is built using) cudaLib.
-    # > No arrows should point in the reverse directions.
-    # That is to say that cudaLib should only know about package sets and configurations, because it implements
-    # functionality for interpreting configurations, resolving them against data, and constructing package sets.
-    # This decision is driven both by a separation of concerns and by "NAMESET STRICTNESS" (see above).
-    # Also see the comment in `pkgs/top-level/all-packages.nix` about the `_cuda` attribute.
-
-    inherit cudaMajorMinorVersion;
-
-    pkgs = pkgs';
-
-    cudaNamePrefix = "cuda${cudaMajorMinorVersion}";
-
-    cudaMajorVersion = versions.major cudaMajorMinorVersion;
-    cudaOlder = strings.versionOlder cudaMajorMinorVersion;
-    cudaAtLeast = strings.versionAtLeast cudaMajorMinorVersion;
-
-    flags =
-      cudaLib.formatCapabilities {
-        inherit (final.backendStdenv) cudaCapabilities cudaForwardCompat;
-        inherit (_cuda.db) cudaCapabilityToInfo;
-      }
-      # TODO(@connorbaker): Enable the corresponding warnings in `../development/cuda-modules/aliases.nix` after some
-      # time to allow users to migrate to cudaLib and backendStdenv.
-      // {
-        inherit (cudaLib) dropDots;
-        cudaComputeCapabilityToName =
-          cudaCapability: _cuda.db.cudaCapabilityToInfo.${cudaCapability}.archName;
-        dropDot = cudaLib.dropDots;
-        isJetsonBuild = final.backendStdenv.hasJetsonCudaCapability;
-      };
-
-    # Loose packages
-    # Barring packages which share a home (e.g., cudatoolkit), new packages
-    # should be added to ../development/cuda-modules/packages in "by-name" style, where they will be automatically
-    # discovered and added to the package set.
-
-    # TODO: Move to aliases.nix once all Nixpkgs has migrated to the splayed CUDA packages
-    cudatoolkit = final.callPackage ../development/cuda-modules/cudatoolkit/redist-wrapper.nix { };
-
-    tests =
-      let
-        bools = [
-          true
-          false
-        ];
-        configs = {
-          openCVFirst = bools;
-          useOpenCVDefaultCuda = bools;
-          useTorchDefaultCuda = bools;
-        };
-        builder =
-          {
-            openCVFirst,
-            useOpenCVDefaultCuda,
-            useTorchDefaultCuda,
-          }@config:
-          {
-            name = strings.concatStringsSep "-" (
-              [
-                "test"
-                (if openCVFirst then "opencv" else "torch")
-              ]
-              ++ lists.optionals (if openCVFirst then useOpenCVDefaultCuda else useTorchDefaultCuda) [
-                "with-default-cuda"
-              ]
-              ++ [
-                "then"
-                (if openCVFirst then "torch" else "opencv")
-              ]
-              ++ lists.optionals (if openCVFirst then useTorchDefaultCuda else useOpenCVDefaultCuda) [
-                "with-default-cuda"
-              ]
-            );
-            value = final.callPackage ../development/cuda-modules/tests/opencv-and-torch config;
-          };
-      in
-      attrsets.listToAttrs (attrsets.mapCartesianProduct builder configs)
-      // {
-        flags = final.callPackage ../development/cuda-modules/tests/flags.nix { };
-      };
+    lib.intersectLists jetsonCudaCapabilities (config.cudaCapabilities or [ ]) != [ ];
+  selectManifests = lib.mapAttrs (name: version: _cuda.manifests.${name}.${version});
+in
+{
+  cudaPackages_12_6 = callPackage ../development/cuda-modules {
+    manifests = selectManifests {
+      cuda = "12.6.3";
+      cudnn = "9.8.0";
+      cusparselt = "0.6.3";
+      cutensor = "2.2.0";
+      tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
+    };
   };
 
-  composedExtension = fixedPoints.composeManyExtensions (
-    [
-      (
-        final: _:
-        {
-          # Prevent missing attribute errors
-          # NOTE(@connorbaker): CUDA 12.3 does not have a cuda_compat package; indeed, none of the release supports
-          # Jetson devices. To avoid errors in the case that cuda_compat is not defined, we have a dummy package which
-          # is always defined, but does nothing, will not build successfully, and has no platforms.
-          cuda_compat = runCommand "cuda_compat" { meta.platforms = [ ]; } "false";
-        }
-        // lib.packagesFromDirectoryRecursive {
-          inherit (final) callPackage;
-          directory = ../development/cuda-modules/packages;
-        }
-      )
-      (import ../development/cuda-modules/cuda/extension.nix { inherit cudaMajorMinorVersion lib; })
-      (import ../development/cuda-modules/generic-builders/multiplex.nix {
-        inherit
-          cudaLib
-          cudaMajorMinorVersion
-          lib
-          redistSystem
-          stdenv
-          ;
-        pname = "cudnn";
-        redistName = "cudnn";
-        releasesModule = ../development/cuda-modules/cudnn/releases.nix;
-        shimsFn = ../development/cuda-modules/cudnn/shims.nix;
-      })
-      (import ../development/cuda-modules/cutensor/extension.nix {
-        inherit
-          cudaLib
-          cudaMajorMinorVersion
-          lib
-          redistSystem
-          ;
-      })
-      (import ../development/cuda-modules/cusparselt/extension.nix {
-        inherit
-          cudaLib
-          lib
-          redistSystem
-          ;
-      })
-      (import ../development/cuda-modules/generic-builders/multiplex.nix {
-        inherit
-          cudaLib
-          cudaMajorMinorVersion
-          lib
-          redistSystem
-          stdenv
-          ;
-        pname = "tensorrt";
-        redistName = "tensorrt";
-        releasesModule = ../development/cuda-modules/tensorrt/releases.nix;
-        shimsFn = ../development/cuda-modules/tensorrt/shims.nix;
-      })
-      (import ../development/cuda-modules/cuda-library-samples/extension.nix { inherit lib stdenv; })
-    ]
-    ++ lib.optionals config.allowAliases [
-      (import ../development/cuda-modules/aliases.nix { inherit lib; })
-    ]
-    ++ _cuda.extensions
-  );
+  cudaPackages_12_8 = callPackage ../development/cuda-modules {
+    manifests = selectManifests {
+      cuda = "12.8.1";
+      cudnn = "9.8.0";
+      cusparselt = "0.7.1";
+      cutensor = "2.2.0";
+      tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
+    };
+  };
 
-  cudaPackages = customisation.makeScope pkgs'.newScope (
-    fixedPoints.extends composedExtension passthruFunction
-  );
-in
-cudaPackages
+  cudaPackages_12_9 = callPackage ../development/cuda-modules {
+    manifests = selectManifests {
+      cuda = "12.9.1";
+      cudnn = "9.8.0";
+      cusparselt = "0.7.1";
+      cutensor = "2.2.0";
+      tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
+    };
+  };
+}

From ebd2e2aa9cabfd09e1ad2e9429815d0639d2472b Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 17:30:59 +0000
Subject: [PATCH 1752/6226] cudaPackages_13: init at 13.0.2

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/_cuda/db/bootstrap/cuda.nix  |   53 +-
 .../cuda-modules/_cuda/db/bootstrap/nvcc.nix  |   13 +
 .../manifests/cuda/redistrib_13.0.2.json      | 1031 +++++++++++++++++
 .../packages/collectx_bringup.nix             |   48 +
 .../cuda-modules/packages/cuda_ctadvisor.nix  |   18 +
 .../cuda-modules/packages/cuda_culibos.nix    |    6 +
 .../packages/libnvptxcompiler.nix             |   12 +
 .../development/cuda-modules/packages/mft.nix |   39 +
 .../packages/mft_autocomplete.nix             |   39 +
 .../cuda-modules/packages/mft_oem.nix         |   25 +
 .../cuda-modules/packages/nvlsm.nix           |   30 +
 pkgs/top-level/all-packages.nix               |    3 +
 pkgs/top-level/cuda-packages.nix              |   10 +
 13 files changed, 1321 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_13.0.2.json
 create mode 100644 pkgs/development/cuda-modules/packages/collectx_bringup.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_ctadvisor.nix
 create mode 100644 pkgs/development/cuda-modules/packages/cuda_culibos.nix
 create mode 100644 pkgs/development/cuda-modules/packages/libnvptxcompiler.nix
 create mode 100644 pkgs/development/cuda-modules/packages/mft.nix
 create mode 100644 pkgs/development/cuda-modules/packages/mft_autocomplete.nix
 create mode 100644 pkgs/development/cuda-modules/packages/mft_oem.nix
 create mode 100644 pkgs/development/cuda-modules/packages/nvlsm.nix

diff --git a/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix b/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix
index eaee60b2434e..b90884d7eed8 100644
--- a/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix
+++ b/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix
@@ -104,6 +104,7 @@
         "5.0" = {
           archName = "Maxwell";
           minCudaMajorMinorVersion = "10.0";
+          maxCudaMajorMinorVersion = "12.9";
           dontDefaultAfterCudaMajorMinorVersion = "11.0";
         };
 
@@ -111,6 +112,7 @@
         "5.2" = {
           archName = "Maxwell";
           minCudaMajorMinorVersion = "10.0";
+          maxCudaMajorMinorVersion = "12.9";
           dontDefaultAfterCudaMajorMinorVersion = "11.0";
         };
 
@@ -118,6 +120,7 @@
         "6.0" = {
           archName = "Pascal";
           minCudaMajorMinorVersion = "10.0";
+          maxCudaMajorMinorVersion = "12.9";
           # Removed from TensorRT 10.0, which corresponds to CUDA 12.4 release.
           # https://docs.nvidia.com/deeplearning/tensorrt/archives/tensorrt-1001/support-matrix/index.html
           dontDefaultAfterCudaMajorMinorVersion = "12.3";
@@ -128,6 +131,7 @@
         "6.1" = {
           archName = "Pascal";
           minCudaMajorMinorVersion = "10.0";
+          maxCudaMajorMinorVersion = "12.9";
           # Removed from TensorRT 10.0, which corresponds to CUDA 12.4 release.
           # https://docs.nvidia.com/deeplearning/tensorrt/archives/tensorrt-1001/support-matrix/index.html
           dontDefaultAfterCudaMajorMinorVersion = "12.3";
@@ -137,6 +141,7 @@
         "7.0" = {
           archName = "Volta";
           minCudaMajorMinorVersion = "10.0";
+          maxCudaMajorMinorVersion = "12.9";
           # Removed from TensorRT 10.5, which corresponds to CUDA 12.6 release.
           # https://docs.nvidia.com/deeplearning/tensorrt/archives/tensorrt-1050/support-matrix/index.html
           dontDefaultAfterCudaMajorMinorVersion = "12.5";
@@ -163,20 +168,30 @@
           minCudaMajorMinorVersion = "11.2";
         };
 
-        # Jetson AGX Orin and Drive AGX Orin only
+        # Tegra T234 (Jetson Orin)
         "8.7" = {
           archName = "Ampere";
           minCudaMajorMinorVersion = "11.5";
           isJetson = true;
         };
 
+        # Tegra T239 (Switch 2?)
+        # "8.8" = {
+        #   archName = "Ampere";
+        #   minCudaMajorMinorVersion = "13.0";
+        #   # It's not a Jetson device, but it does use the same architecture.
+        #   isJetson = true;
+        #   # Should never be default.
+        #   dontDefaultAfterCudaMajorMinorVersion = "13.0";
+        # };
+
         # NVIDIA GeForce RTX 4090, RTX 4080, RTX 6000, Tesla L40
         "8.9" = {
           archName = "Ada";
           minCudaMajorMinorVersion = "11.8";
         };
 
-        # NVIDIA H100 (GH100)
+        # NVIDIA H100, H200, GH200
         "9.0" = {
           archName = "Hopper";
           minCudaMajorMinorVersion = "11.8";
@@ -187,7 +202,7 @@
           minCudaMajorMinorVersion = "12.0";
         };
 
-        # NVIDIA B100
+        # NVIDIA B200, GB200
         "10.0" = {
           archName = "Blackwell";
           minCudaMajorMinorVersion = "12.7";
@@ -203,26 +218,33 @@
           minCudaMajorMinorVersion = "12.9";
         };
 
-        # NVIDIA Jetson Thor Blackwell
+        # NVIDIA Jetson Thor Blackwell, T4000, T5000 (CUDA 12.7-12.9)
+        # Okay, so:
+        # - Support for Thor was added in CUDA 12.7, which was never released but is referenced in docs
+        # - NVIDIA changed the compute capability from 10.0 to 11.0 in CUDA 13.0
+        # - From CUDA 13.0 and on, 10.1 is no longer a valid compute capability
         "10.1" = {
           archName = "Blackwell";
           minCudaMajorMinorVersion = "12.7";
+          maxCudaMajorMinorVersion = "12.9";
           isJetson = true;
         };
 
         "10.1a" = {
           archName = "Blackwell";
           minCudaMajorMinorVersion = "12.7";
+          maxCudaMajorMinorVersion = "12.9";
           isJetson = true;
         };
 
         "10.1f" = {
           archName = "Blackwell";
           minCudaMajorMinorVersion = "12.9";
+          maxCudaMajorMinorVersion = "12.9";
           isJetson = true;
         };
 
-        # NVIDIA ???
+        # NVIDIA B300
         "10.3" = {
           archName = "Blackwell";
           minCudaMajorMinorVersion = "12.9";
@@ -238,6 +260,25 @@
           minCudaMajorMinorVersion = "12.9";
         };
 
+        # NVIDIA Jetson Thor Blackwell, T4000, T5000 (CUDA 13.0+)
+        "11.0" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "13.0";
+          isJetson = true;
+        };
+
+        "11.0a" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "13.0";
+          isJetson = true;
+        };
+
+        "11.0f" = {
+          archName = "Blackwell";
+          minCudaMajorMinorVersion = "13.0";
+          isJetson = true;
+        };
+
         # NVIDIA GeForce RTX 5090 (GB202) etc.
         "12.0" = {
           archName = "Blackwell";
@@ -254,7 +295,7 @@
           minCudaMajorMinorVersion = "12.9";
         };
 
-        # NVIDIA ???
+        # NVIDIA DGX Spark
         "12.1" = {
           archName = "Blackwell";
           minCudaMajorMinorVersion = "12.9";
diff --git a/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix b/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
index bd4477cc2914..0b3c2de94876 100644
--- a/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
+++ b/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
@@ -66,5 +66,18 @@
         minMajorVersion = "6";
       };
     };
+
+    # 12.9 to 13.0 adds support for GCC 15 and Clang 20
+    # https://docs.nvidia.com/cuda/cuda-installation-guide-linux/index.html#host-compiler-support-policy
+    "13.0" = {
+      clang = {
+        maxMajorVersion = "20";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "15";
+        minMajorVersion = "6";
+      };
+    };
   };
 }
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_13.0.2.json b/pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_13.0.2.json
new file mode 100644
index 000000000000..d4caeeddd7e4
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cuda/redistrib_13.0.2.json
@@ -0,0 +1,1031 @@
+{
+    "release_date": "2025-10-09",
+    "release_label": "13.0.2",
+    "release_product": "cuda",
+    "collectx_bringup": {
+        "name": "UFM telemetry CollectX Bringup",
+        "license": "NVIDIA Proprietary",
+        "license_path": "collectx_bringup/LICENSE.txt",
+        "version": "1.22.1",
+        "linux-x86_64": {
+            "relative_path": "collectx_bringup/linux-x86_64/collectx_bringup-linux-x86_64-1.22.1-archive.tar.xz",
+            "sha256": "ba1676715cc32ddf9695e1e59fe283c0489a9a18f6a0bfdd1b0104631766a1ca",
+            "md5": "e480e74d2ca1ec226c1f15f47d0fac30",
+            "size": "142950700"
+        },
+        "linux-sbsa": {
+            "relative_path": "collectx_bringup/linux-sbsa/collectx_bringup-linux-sbsa-1.22.1-archive.tar.xz",
+            "sha256": "8f7dd62d0adf8dfd0543aa82c1859f161fea23e8d5bb5b4b2bcc698508329a22",
+            "md5": "5e44cf49922aec1937414c0f54b2e491",
+            "size": "125513356"
+        }
+    },
+    "cuda_cccl": {
+        "name": "CXX Core Compute Libraries",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_cccl/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_cccl/linux-x86_64/cuda_cccl-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "ed845eae8c1767706b6ee91e40c608a03f6f633551a849b63f7346d32d73ee60",
+            "md5": "c0dd26e0c41dc35bd73435a4799c7508",
+            "size": "991284"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cccl/linux-sbsa/cuda_cccl-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "eca22ded176804a78afcba3fe1909e7d473366ee1cb9f3784080df23bc8e74d5",
+            "md5": "e50b07ae0a9920ce07a107a5c7030157",
+            "size": "990368"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cccl/windows-x86_64/cuda_cccl-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "f4f5187f7976d8057d76e1e04e72c8b7d0a2a22793107a671ad709b1d8d3408d",
+            "md5": "8dba9713ce4b4e6f0c58a92a8a1379db",
+            "size": "3119228"
+        }
+    },
+    "cuda_crt": {
+        "name": "CUDA CRT",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_crt/LICENSE.txt",
+        "version": "13.0.88",
+        "linux-x86_64": {
+            "relative_path": "cuda_crt/linux-x86_64/cuda_crt-linux-x86_64-13.0.88-archive.tar.xz",
+            "sha256": "5a3279a049ffc1cdb951c44cb95206acfdde9e9ae5e87825fc18d7e4a6878bb0",
+            "md5": "f90b38d702a29668d97e8f94a399ea31",
+            "size": "79800"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_crt/linux-sbsa/cuda_crt-linux-sbsa-13.0.88-archive.tar.xz",
+            "sha256": "c03b92941ba7bf58a4992231ceb572477784ef450ce678f6545bed02392cae50",
+            "md5": "3db54b1fb543f00c1cca085569bffd9e",
+            "size": "79916"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_crt/windows-x86_64/cuda_crt-windows-x86_64-13.0.88-archive.zip",
+            "sha256": "ff413c89dbd96ed3b3dcfac923437de78acea32fb90309277197c8a127588112",
+            "md5": "29b09d1ab8f3b5550a8e8da587b105f1",
+            "size": "140187"
+        }
+    },
+    "cuda_ctadvisor": {
+        "name": "ctadvisor",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_ctadvisor/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_ctadvisor/linux-x86_64/cuda_ctadvisor-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "9c82af2dbd2d0db7c8108bc9f150ddb02f36d2b66a5edc552ffb94ab41fda065",
+            "md5": "86766786f7e67b75320f7b79c1cdb8f9",
+            "size": "617204"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_ctadvisor/linux-sbsa/cuda_ctadvisor-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "7a2b60e949fcce748318bda190ff4c54d6d4b9753a1be44bbeed254b6880b91a",
+            "md5": "03361a3736df8719d2294649419d637f",
+            "size": "529764"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_ctadvisor/windows-x86_64/cuda_ctadvisor-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "beeab2bf9575ff04f9a9d1c94b743f29ed817a12b294b8928db84fb26f5ef056",
+            "md5": "72a0e640cabd8baa6455117d375dbb4d",
+            "size": "861030"
+        }
+    },
+    "cuda_cudart": {
+        "name": "CUDA Runtime (cudart)",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_cudart/LICENSE.txt",
+        "version": "13.0.96",
+        "linux-x86_64": {
+            "relative_path": "cuda_cudart/linux-x86_64/cuda_cudart-linux-x86_64-13.0.96-archive.tar.xz",
+            "sha256": "25b8071951baba827be1580b841d363464f6ee6c39f48d33a81646f90cc95ed1",
+            "md5": "26ebf8fd2c0fe1f303d5d27c49624d5e",
+            "size": "1487960"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cudart/linux-sbsa/cuda_cudart-linux-sbsa-13.0.96-archive.tar.xz",
+            "sha256": "e2c78564330a09d890f98a066a2082a32c78256ffcc6bccca1696bd2abbaf445",
+            "md5": "ff3140b2fb00f583295484fe36f77995",
+            "size": "1489276"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cudart/windows-x86_64/cuda_cudart-windows-x86_64-13.0.96-archive.zip",
+            "sha256": "a2ed875f9997aa24904fb70cc9db3acd9308433cde99bc8e63ec1271c9da31b4",
+            "md5": "dc22a52b5b75c198a12ce8c4d885e2e5",
+            "size": "2873447"
+        }
+    },
+    "cuda_culibos": {
+        "name": "CUDA MATH Library (cuda culibos)",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_culibos/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_culibos/linux-x86_64/cuda_culibos-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "98fca11f9ab89be61385a67eee686c1ebf76fad9c7269d0cf9090edfcdb8a8ac",
+            "md5": "4b61b30864c47e1292f6d132653140d1",
+            "size": "21412"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_culibos/linux-sbsa/cuda_culibos-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "ab5ecee37c8adc7efbc2a88ab091de9d978924c4d7f66c3e0c42f23983a1beb3",
+            "md5": "86aa2f9aca3cddc7c61d6029ce22a5d3",
+            "size": "21444"
+        }
+    },
+    "cuda_cuobjdump": {
+        "name": "cuobjdump",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_cuobjdump/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_cuobjdump/linux-x86_64/cuda_cuobjdump-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "bd624dcb2089842add8f293efab1d21aa076c98b36d8dcb64347fe08fb03315d",
+            "md5": "1f6f98ec1dcf7f0b1b50ca88f2c4cd7b",
+            "size": "242604"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cuobjdump/linux-sbsa/cuda_cuobjdump-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "cd0304f70ff905421da2ca0fe53cfc384baa48d6ff6b34f92a80cf723064e827",
+            "md5": "eb64d979ba5c6e75e14bac6ec4c58e08",
+            "size": "232276"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cuobjdump/windows-x86_64/cuda_cuobjdump-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "cddbc524dc229c708cc989e4ff2d636ba342c695e0f60c1026a1b5f76de4b77b",
+            "md5": "f4738a4ff851ffed9d83e03ad98e4c13",
+            "size": "6272066"
+        }
+    },
+    "cuda_cupti": {
+        "name": "CUPTI",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_cupti/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_cupti/linux-x86_64/cuda_cupti-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "92fb7e0430521517174c4c171173b888aaa8d78d8762e59752dea2ed14a0ad7d",
+            "md5": "da5bac6241e10114d6dd941c25b0e1b0",
+            "size": "16253056"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cupti/linux-sbsa/cuda_cupti-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "f6f34d534cce56f91b1496abf51be3b1559ba879985d34eb89c808004b77513a",
+            "md5": "bafe0e433c575ab69369919a04ab923d",
+            "size": "12542416"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cupti/windows-x86_64/cuda_cupti-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "e739e96415e1fb9a650eaac826f7cd24701e18ae2f7c26b78f3fabaf64c8e39b",
+            "md5": "d4affebe5c588520fb13a4ba04a9da22",
+            "size": "13282089"
+        }
+    },
+    "cuda_cuxxfilt": {
+        "name": "CUDA cuxxfilt (demangler)",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_cuxxfilt/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_cuxxfilt/linux-x86_64/cuda_cuxxfilt-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "ae1acfe8dca8453e0b243ecde8a45e88a9584bf050b307b96ec9dc286fd8e714",
+            "md5": "8f6fa1787171abc922814d6b4c6824c1",
+            "size": "189496"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_cuxxfilt/linux-sbsa/cuda_cuxxfilt-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "8f0dd0433d2fa4591f7dbdf8169ec4b355fe567657dd28bc8ac2e8ec41fda4f9",
+            "md5": "bdadf71bdfc2a4418e1cc25828a69c0b",
+            "size": "177300"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_cuxxfilt/windows-x86_64/cuda_cuxxfilt-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "f885168de4d35ee4c8ea3d37068bc476726310334dcbcc74e2c1b76b3d088ece",
+            "md5": "293ca297f3263c0cbd3487ad5d5a4749",
+            "size": "186499"
+        }
+    },
+    "cuda_documentation": {
+        "name": "CUDA Documentation",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_documentation/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_documentation/linux-x86_64/cuda_documentation-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "05df885f5b825e51a69da1318ca6713112ec09baf4d3c6262663111255504eae",
+            "md5": "6467a953e2492ddb3d812b5e8768bb9a",
+            "size": "67948"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_documentation/linux-sbsa/cuda_documentation-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "f6bdca23da438ce1ce11f557e7a9571e1a81aa49a56d3b9eaaee2419111dae13",
+            "md5": "8f6f5d7fe9a964bce7560ee6a55d08ec",
+            "size": "68052"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_documentation/windows-x86_64/cuda_documentation-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "4879ab75b0fefc591ec0752d80c846b9a191fe6e9528380cc2f105210403e9c2",
+            "md5": "8c1f9a2a0bb9cfb51cc1660da920cc96",
+            "size": "107985"
+        }
+    },
+    "cuda_gdb": {
+        "name": "CUDA GDB",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_gdb/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_gdb/linux-x86_64/cuda_gdb-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "a6bf87dac5edb64eee36425f6f8a91676966c456c49a213da5b3158581a4432f",
+            "md5": "24267797e580285a899686e6909cb425",
+            "size": "68531784"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_gdb/linux-sbsa/cuda_gdb-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "48bfce61e6f86661ec12bb65dd97e1607799406de5ceafccba2212962568d40e",
+            "md5": "b50bc5c7d85c3bb669b0f4b907eaaa6d",
+            "size": "66117920"
+        }
+    },
+    "cuda_nsight": {
+        "name": "Nsight Eclipse Edition Plugin",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nsight/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_nsight/linux-x86_64/cuda_nsight-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "26bace58e46a4aa038ac531d6ef3a3abd12f43da65ba24c29b894e08ca64f5e9",
+            "md5": "937fcefb4d045d1c986bc459b1df078e",
+            "size": "118691392"
+        }
+    },
+    "cuda_nvcc": {
+        "name": "CUDA NVCC",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvcc/LICENSE.txt",
+        "version": "13.0.88",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvcc/linux-x86_64/cuda_nvcc-linux-x86_64-13.0.88-archive.tar.xz",
+            "sha256": "48e35be3cfbf4b4fbc16828eaec8a7048ee789403049dc409f7b643d6259cf7a",
+            "md5": "e3e925c644055b9306aec9c9b84d1975",
+            "size": "26657716"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvcc/linux-sbsa/cuda_nvcc-linux-sbsa-13.0.88-archive.tar.xz",
+            "sha256": "01b01e10aa2662ad1b3aeab3317151d7d6d4a650eeade55ded504f6b7fced18e",
+            "md5": "4defe04ac10e7231bfa63cbd72dd8e21",
+            "size": "22383012"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvcc/windows-x86_64/cuda_nvcc-windows-x86_64-13.0.88-archive.zip",
+            "sha256": "61760e24a44937c6c29a20ddea69067b4d3860ccd6a9a0564573f840d96e6c5f",
+            "md5": "00f382c4efc8602a6fce54fd61da0c23",
+            "size": "29142142"
+        }
+    },
+    "cuda_nvdisasm": {
+        "name": "CUDA nvdisasm",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvdisasm/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvdisasm/linux-x86_64/cuda_nvdisasm-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "0541e0230f724a43d67288ef882c63351d0c302bf567591b7620d40f93c2c93c",
+            "md5": "c087569ce5afb128f99fadf280c98815",
+            "size": "4129456"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvdisasm/linux-sbsa/cuda_nvdisasm-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "77e2ef1494270839829d5608352ba67a278e80fdaf4e3cc3c8ac9cb73e1c463c",
+            "md5": "004432bcd5466fdc6a4bcb8ce67c14cc",
+            "size": "4057500"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvdisasm/windows-x86_64/cuda_nvdisasm-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "c15885ed180cc6439b92a59fede41082434fdd9baac7280d5f0570f1d0786b04",
+            "md5": "00cd56f73b5de05c94c7858cb1219c79",
+            "size": "4450492"
+        }
+    },
+    "cuda_nvml_dev": {
+        "name": "CUDA NVML Headers",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvml_dev/LICENSE.txt",
+        "version": "13.0.87",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvml_dev/linux-x86_64/cuda_nvml_dev-linux-x86_64-13.0.87-archive.tar.xz",
+            "sha256": "92d441fa7ae41bba92e06c928cacdb32f4703763512f68d10c9c230f09ffe6d8",
+            "md5": "f293cd0388e3d57f4e216a7843f0af3a",
+            "size": "140148"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvml_dev/linux-sbsa/cuda_nvml_dev-linux-sbsa-13.0.87-archive.tar.xz",
+            "sha256": "71740823e837c2a1a6e314f0fe801f8fa6aef1055220e9a504f6f4c67e21d72b",
+            "md5": "d8455698e595b0a78bec35ee84065c90",
+            "size": "142288"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvml_dev/windows-x86_64/cuda_nvml_dev-windows-x86_64-13.0.87-archive.zip",
+            "sha256": "b19b2b5fd534f37c3f0aab49d25ebb28496963aef3e819466bcf0fa20607b0cd",
+            "md5": "6f820eb0f0de554e48e6dd627acd0845",
+            "size": "162340"
+        }
+    },
+    "cuda_nvprune": {
+        "name": "CUDA nvprune",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvprune/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvprune/linux-x86_64/cuda_nvprune-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "b182d8b0398ba9ff8ee75fc2ffef3ff1e2069e6bec6938bcf02a6c9e69d40456",
+            "md5": "ae2e691465a09e92768b3aada7092f38",
+            "size": "59948"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvprune/linux-sbsa/cuda_nvprune-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "956e1f1b282522ff40b331e5cea83b5d7a87bd97cd9c2bea3454bb0c6adf5414",
+            "md5": "b9529445dd0d916e71e9e4af96ba63ec",
+            "size": "51700"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvprune/windows-x86_64/cuda_nvprune-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "b52ca2d51d0e41c317f68f38ce88f4ae7184443eac04203e7a80fd054f2028ec",
+            "md5": "fef61c48fdef576c2f44d26da5168bd3",
+            "size": "150099"
+        }
+    },
+    "cuda_nvrtc": {
+        "name": "CUDA NVRTC",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvrtc/LICENSE.txt",
+        "version": "13.0.88",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvrtc/linux-x86_64/cuda_nvrtc-linux-x86_64-13.0.88-archive.tar.xz",
+            "sha256": "00038aac08e1dba6f1933237dbfb217ac6452ae24fab970edcac808f103ca64b",
+            "md5": "62a842b5c00b0d44a5a03a18fad07945",
+            "size": "116779532"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvrtc/linux-sbsa/cuda_nvrtc-linux-sbsa-13.0.88-archive.tar.xz",
+            "sha256": "decf9977ab114ff195c8cdfce6fbc94aea4a62efdae628092cbb9fd1c31cda1a",
+            "md5": "1fdf86efd1ad72fe618404d4cd1947c6",
+            "size": "52411212"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvrtc/windows-x86_64/cuda_nvrtc-windows-x86_64-13.0.88-archive.zip",
+            "sha256": "8c50a52467826167e0dbe99936140c52d62272bfc5849fe2d6587d050c8c5d29",
+            "md5": "584ae7baced761d594e2e53eb30f1411",
+            "size": "318076161"
+        }
+    },
+    "cuda_nvtx": {
+        "name": "CUDA NVTX",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_nvtx/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_nvtx/linux-x86_64/cuda_nvtx-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "ed150e6fb1b50663ff068cccee3c5e2ca581c3b939b321656afbc9193671137d",
+            "md5": "56273621b95441995c72c199cfd5226b",
+            "size": "94140"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_nvtx/linux-sbsa/cuda_nvtx-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "6f50a3729091aa5a0ae61cda979ea020e09aeb7c07cec0c8962949599d2b72c6",
+            "md5": "1a2ed71befd31ee92a91b12ee257c406",
+            "size": "94612"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_nvtx/windows-x86_64/cuda_nvtx-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "184f578d7bcce2012edf266c51dfa7834ded41464f62459f4ebcb2398cddc665",
+            "md5": "9b01b0d114755775d98626f6dd176137",
+            "size": "147156"
+        }
+    },
+    "cuda_opencl": {
+        "name": "CUDA OpenCL",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_opencl/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_opencl/linux-x86_64/cuda_opencl-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "f48040e3054d561484e4ba136650cec68eeebaf4ff4d70d1d704dcdc5f38cf90",
+            "md5": "36009e7503e87c28dc66f8840287eb0d",
+            "size": "95092"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_opencl/windows-x86_64/cuda_opencl-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "ef7b189fba61e0fd13e5f50b940fc0e22f9d211481d1c7061b9d586641929f3b",
+            "md5": "ac85141514a2f42eb30f0f6550b5b9bf",
+            "size": "140926"
+        }
+    },
+    "cuda_profiler_api": {
+        "name": "CUDA Profiler API",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_profiler_api/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_profiler_api/linux-x86_64/cuda_profiler_api-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "dc233d88a5cafa095b197e6246b4c468a4581c128da8f951d67e063cdd6bca4c",
+            "md5": "643aa0f86952f61a183c7342ef877632",
+            "size": "17044"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_profiler_api/linux-sbsa/cuda_profiler_api-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "58c304116de3d184cebcc7d04934bff9d99d2276ff28c46372664bc3fcc32976",
+            "md5": "75920888da1f2ab140a90f490195a636",
+            "size": "17048"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_profiler_api/windows-x86_64/cuda_profiler_api-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "38c6c854f325b64e7ca0a8b14e1996dedb5abbb38f3580e5c7744b688abdc56e",
+            "md5": "61c405a619241f213110f0a5ea7fe559",
+            "size": "21185"
+        }
+    },
+    "cuda_sandbox_dev": {
+        "name": "CUDA nvsandboxutils Headers",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_sandbox_dev/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_sandbox_dev/linux-x86_64/cuda_sandbox_dev-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "642d3dccf9c59d3238659687cdb968f85f643b089c946e35ce278ae59288d73e",
+            "md5": "6ea5dd26e7ea3c047ebb6c8de171ab2c",
+            "size": "30208"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_sandbox_dev/linux-sbsa/cuda_sandbox_dev-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "d3aaa63a9fbbee1eb656b10390dd2f0d86c9e9329b578e27c11bbe4fea3cdab6",
+            "md5": "483d362d27d9b828f10b16ee32f2e90d",
+            "size": "30792"
+        }
+    },
+    "cuda_sanitizer_api": {
+        "name": "CUDA Compute Sanitizer API",
+        "license": "CUDA Toolkit",
+        "license_path": "cuda_sanitizer_api/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "cuda_sanitizer_api/linux-x86_64/cuda_sanitizer_api-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "8eeba425f66fdd17e78d0dff49baa8b3e4599fc0579984eab7ad9c486a95ebf2",
+            "md5": "47623b2482a3c6e09710d63b44d97b90",
+            "size": "11399964"
+        },
+        "linux-sbsa": {
+            "relative_path": "cuda_sanitizer_api/linux-sbsa/cuda_sanitizer_api-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "68cc7d0144cdf746d4e76565dca86002979ecab5c5674be01bb3fbd3628531e5",
+            "md5": "02b4d469d5099b8853a2669f338e155d",
+            "size": "8547700"
+        },
+        "windows-x86_64": {
+            "relative_path": "cuda_sanitizer_api/windows-x86_64/cuda_sanitizer_api-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "dcca7ce173165d75eb7f5df76672ec598b11f12e583356eaf80b16f6d43ace9f",
+            "md5": "07ac1cb30f5ea1810092ea08bd4d0fbb",
+            "size": "10867115"
+        }
+    },
+    "driver_assistant": {
+        "name": "NVIDIA Driver Assistant",
+        "license": "MIT",
+        "license_path": "driver_assistant/LICENSE.txt",
+        "version": "0.22.95.05",
+        "linux-all": {
+            "relative_path": "driver_assistant/source/driver_assistant-0.22.95.05-archive.tar.xz",
+            "sha256": "1f4d19c468988dc0f23ca7c1844d6434dfc9a6f0c4eaca43a7a63ab9a51c8552",
+            "md5": "bce1617e3337e8bbab4a51937e0ff544",
+            "size": "38944"
+        }
+    },
+    "fabricmanager": {
+        "name": "NVIDIA Fabric Manager",
+        "license": "NVIDIA Driver",
+        "license_path": "fabricmanager/LICENSE.txt",
+        "version": "580.95.05",
+        "linux-x86_64": {
+            "relative_path": "fabricmanager/linux-x86_64/fabricmanager-linux-x86_64-580.95.05-archive.tar.xz",
+            "sha256": "f0220bfb67d04b4107acf00cc95abe5a9268fd8f8b5bae26971f4df232e4369c",
+            "md5": "a6568aa288cb4784b85ba6826463f918",
+            "size": "8249864"
+        },
+        "linux-sbsa": {
+            "relative_path": "fabricmanager/linux-sbsa/fabricmanager-linux-sbsa-580.95.05-archive.tar.xz",
+            "sha256": "ea91191e91b306da1ee2932da399fab8fe46395ec6820f638432b0176fc7a28e",
+            "md5": "3acd0c87be46dfcc6a45704aa34f0f03",
+            "size": "7501248"
+        }
+    },
+    "imex": {
+        "name": "Nvidia-Imex",
+        "license": "NVIDIA Proprietary",
+        "license_path": "imex/LICENSE.txt",
+        "version": "580.95.05",
+        "linux-x86_64": {
+            "relative_path": "imex/linux-x86_64/nvidia-imex-linux-x86_64-580.95.05-archive.tar.xz",
+            "sha256": "8f8c2fe1571ffbc9d7810289b8fb323340083a896d51daffeebee94d5a60b37e",
+            "md5": "0557449a6dadc51171bc54323a1b64c9",
+            "size": "7772976"
+        },
+        "linux-sbsa": {
+            "relative_path": "imex/linux-sbsa/nvidia-imex-linux-sbsa-580.95.05-archive.tar.xz",
+            "sha256": "3d0179eeed5899b32bb893ec3466c9e3ae347bf7947e35313224480eb966ed92",
+            "md5": "c7e9affa44fbb1d94d7888808b706eed",
+            "size": "7212868"
+        }
+    },
+    "libcublas": {
+        "name": "CUDA cuBLAS",
+        "license": "CUDA Toolkit",
+        "license_path": "libcublas/LICENSE.txt",
+        "version": "13.1.0.3",
+        "linux-x86_64": {
+            "relative_path": "libcublas/linux-x86_64/libcublas-linux-x86_64-13.1.0.3-archive.tar.xz",
+            "sha256": "88bc951efd906032a371153ca61975e0d9c4761e4012169169a6b3a47931606e",
+            "md5": "980968a3f2a7fc483be4a07dd56e09ad",
+            "size": "838952932"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcublas/linux-sbsa/libcublas-linux-sbsa-13.1.0.3-archive.tar.xz",
+            "sha256": "18832d4798b0a4fc75fa90d58c1780203713ca2e35751a2492262e58f2620c50",
+            "md5": "5773abd5980d9a7af9c0732700287156",
+            "size": "1084803912"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcublas/windows-x86_64/libcublas-windows-x86_64-13.1.0.3-archive.zip",
+            "sha256": "4ac4847bbe4f7709b244956fcfc32197a2954ee70b155cb67eebd9ee26f7e339",
+            "md5": "1d3169b46c18bbb58df11c1227931a54",
+            "size": "403672823"
+        }
+    },
+    "libcufft": {
+        "name": "CUDA cuFFT",
+        "license": "CUDA Toolkit",
+        "license_path": "libcufft/LICENSE.txt",
+        "version": "12.0.0.61",
+        "linux-x86_64": {
+            "relative_path": "libcufft/linux-x86_64/libcufft-linux-x86_64-12.0.0.61-archive.tar.xz",
+            "sha256": "5cdef1238c270f8f148da18587fdba8b9478c596e40f5490bba2b15c94915dd9",
+            "md5": "aec4ffbf2d55707649295e0372ee3d36",
+            "size": "354634628"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcufft/linux-sbsa/libcufft-linux-sbsa-12.0.0.61-archive.tar.xz",
+            "sha256": "5361f3b22a50923204e07f7ff601150dc67aab6b0fff26c47bd3ac0a50c921a0",
+            "md5": "d4a1bd6640e13b13bc919ba6d5128290",
+            "size": "354230580"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcufft/windows-x86_64/libcufft-windows-x86_64-12.0.0.61-archive.zip",
+            "sha256": "4f2695ea50f895618316ee32636f5d0e5e0bc330e74b3e0876bff002af9e1eb3",
+            "md5": "3d031b8a3629ea62add09f974d608f3f",
+            "size": "212026245"
+        }
+    },
+    "libcufile": {
+        "name": "CUDA cuFile",
+        "license": "CUDA Toolkit",
+        "license_path": "libcufile/LICENSE.txt",
+        "version": "1.15.1.6",
+        "linux-x86_64": {
+            "relative_path": "libcufile/linux-x86_64/libcufile-linux-x86_64-1.15.1.6-archive.tar.xz",
+            "sha256": "2c1f544ab1b0e215590d943cbd1b0a192a066e9b7592e605c2e28b22e886688f",
+            "md5": "c745668d5bebe08c01473d48bf398833",
+            "size": "42256540"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcufile/linux-sbsa/libcufile-linux-sbsa-1.15.1.6-archive.tar.xz",
+            "sha256": "e41292a40bb89bb6f64e19972d3d9a209eddcbb96299a777b2edfa6b7d5b8777",
+            "md5": "91e1dc883031e2b90351634ad4768e4d",
+            "size": "42514828"
+        }
+    },
+    "libcurand": {
+        "name": "CUDA cuRAND",
+        "license": "CUDA Toolkit",
+        "license_path": "libcurand/LICENSE.txt",
+        "version": "10.4.0.35",
+        "linux-x86_64": {
+            "relative_path": "libcurand/linux-x86_64/libcurand-linux-x86_64-10.4.0.35-archive.tar.xz",
+            "sha256": "ee0dbf473998050bda876cb945634bec87d44b90b05a5550e9c2499ab7c1a5c3",
+            "md5": "e236c0f2483e83d614b563a9dc136ba3",
+            "size": "86175028"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcurand/linux-sbsa/libcurand-linux-sbsa-10.4.0.35-archive.tar.xz",
+            "sha256": "12a0afe1ee73e806924fc6c9bdd33a47a970d31967a634ec9ab2f0662a502ed2",
+            "md5": "1aa3ad816d7bd327c2561712426c471a",
+            "size": "87176908"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcurand/windows-x86_64/libcurand-windows-x86_64-10.4.0.35-archive.zip",
+            "sha256": "c4db1ed0595fcdba3c4da0f5605ca4c3f4340b6be833d94765994e239c775a32",
+            "md5": "b204f174a5bf30a728a4f6f68356ad8c",
+            "size": "54762976"
+        }
+    },
+    "libcusolver": {
+        "name": "CUDA cuSOLVER",
+        "license": "CUDA Toolkit",
+        "license_path": "libcusolver/LICENSE.txt",
+        "version": "12.0.4.66",
+        "linux-x86_64": {
+            "relative_path": "libcusolver/linux-x86_64/libcusolver-linux-x86_64-12.0.4.66-archive.tar.xz",
+            "sha256": "1cd13dcb58c5e4bb0ce47ea8876aba21091c1e67165c616144b2dd6331d252ec",
+            "md5": "0dd4b521ddaa0a475a528ef61bd91f7c",
+            "size": "265714920"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcusolver/linux-sbsa/libcusolver-linux-sbsa-12.0.4.66-archive.tar.xz",
+            "sha256": "882c480bedd5ec6e416fe0a9edb7bfdd78f6ffa885310870e4a04d8fce8e655d",
+            "md5": "c43e9ec46e165d5af53df9353eee9512",
+            "size": "291337460"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcusolver/windows-x86_64/libcusolver-windows-x86_64-12.0.4.66-archive.zip",
+            "sha256": "8fe0aa8b2f8709402a8a7494037cdb648f0be7da1ed14e511cefea88a532ef8b",
+            "md5": "ab03f6e62dadab74f4a475068615b935",
+            "size": "193265103"
+        }
+    },
+    "libcusparse": {
+        "name": "CUDA cuSPARSE",
+        "license": "CUDA Toolkit",
+        "license_path": "libcusparse/LICENSE.txt",
+        "version": "12.6.3.3",
+        "linux-x86_64": {
+            "relative_path": "libcusparse/linux-x86_64/libcusparse-linux-x86_64-12.6.3.3-archive.tar.xz",
+            "sha256": "b9de356c3478329e2589d91284f2a685a36f041060f3cb897441ab46a480a30a",
+            "md5": "4c101a89f3b6185ac36e1e98e2d45f15",
+            "size": "278384532"
+        },
+        "linux-sbsa": {
+            "relative_path": "libcusparse/linux-sbsa/libcusparse-linux-sbsa-12.6.3.3-archive.tar.xz",
+            "sha256": "50c9fb74e8468af559150f3f072cc2793a5ff70792fa79962146096385cf7346",
+            "md5": "fed1a66a5af73ab124faf01e886c4470",
+            "size": "308854880"
+        },
+        "windows-x86_64": {
+            "relative_path": "libcusparse/windows-x86_64/libcusparse-windows-x86_64-12.6.3.3-archive.zip",
+            "sha256": "21f70385aae76de5c24c6baab4df4337d0bc9e1ce69e9ebad228d87d686a28e6",
+            "md5": "4980a04d3a1a810fe86e76693dc9624e",
+            "size": "143747284"
+        }
+    },
+    "libnpp": {
+        "name": "CUDA NPP",
+        "license": "CUDA Toolkit",
+        "license_path": "libnpp/LICENSE.txt",
+        "version": "13.0.1.2",
+        "linux-x86_64": {
+            "relative_path": "libnpp/linux-x86_64/libnpp-linux-x86_64-13.0.1.2-archive.tar.xz",
+            "sha256": "b99e7e145283667728e5fd1bf99c79ed9825c164d3c4a40f6dc549cb0b0e1333",
+            "md5": "27a886d47c737964fa4a628997efad31",
+            "size": "240938928"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnpp/linux-sbsa/libnpp-linux-sbsa-13.0.1.2-archive.tar.xz",
+            "sha256": "6d06bd527b3cb17e354a3d25f9334ff9f972f6af7dc1fe0a7e0f5b87ba6e618a",
+            "md5": "d5e81e33a02980c1320f45c482b34f39",
+            "size": "267380224"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnpp/windows-x86_64/libnpp-windows-x86_64-13.0.1.2-archive.zip",
+            "sha256": "cec65b472cdbd97c557cc45cabc5998288b48c166b9e05d95b8ee3e44083906b",
+            "md5": "b4eeff86fa222309f114eced88ee3bd5",
+            "size": "129562453"
+        }
+    },
+    "libnvfatbin": {
+        "name": "NVIDIA compiler library for fatbin interaction",
+        "license": "CUDA Toolkit",
+        "license_path": "libnvfatbin/LICENSE.txt",
+        "version": "13.0.85",
+        "linux-x86_64": {
+            "relative_path": "libnvfatbin/linux-x86_64/libnvfatbin-linux-x86_64-13.0.85-archive.tar.xz",
+            "sha256": "2f23e25c90517aefd0417304a6b428760373bac78a57d0137645b1bd326f754d",
+            "md5": "298af14438a14e755d2c9deb90ea2604",
+            "size": "940220"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvfatbin/linux-sbsa/libnvfatbin-linux-sbsa-13.0.85-archive.tar.xz",
+            "sha256": "2599efa23bd85d29526bc579ee86c810705bfbfbefd033e4df85b13a2e8e661f",
+            "md5": "9208373e18a48e5ae61d161a07b3ffcc",
+            "size": "848440"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvfatbin/windows-x86_64/libnvfatbin-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "ba40fc248c8cf1e709004adeb8c92ac1343048b23a56961e93d282eaed9b3566",
+            "md5": "7200ba0c4a4c786fd671acfe85fd425d",
+            "size": "2242775"
+        }
+    },
+    "libnvidia_nscq": {
+        "name": "NVIDIA NSCQ API",
+        "license": "NVIDIA Driver",
+        "license_path": "libnvidia_nscq/LICENSE.txt",
+        "version": "580.95.05",
+        "linux-x86_64": {
+            "relative_path": "libnvidia_nscq/linux-x86_64/libnvidia_nscq-linux-x86_64-580.95.05-archive.tar.xz",
+            "sha256": "c2285c12f10ec2afc0ad2949f7fcc282b6fd37f32165c1df241451ccabb1067a",
+            "md5": "6bc20061ebdae98fadd7a76110b44430",
+            "size": "380464"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvidia_nscq/linux-sbsa/libnvidia_nscq-linux-sbsa-580.95.05-archive.tar.xz",
+            "sha256": "67cba21aad38e48247e88f480ed67a3096f7173abc190a3f3fbcb312f9649ac6",
+            "md5": "e368f46e7ea592090d3efe425ffc5bbe",
+            "size": "351076"
+        }
+    },
+    "libnvjitlink": {
+        "name": "NVIDIA compiler library for JIT LTO functionality",
+        "license": "CUDA Toolkit",
+        "license_path": "libnvjitlink/LICENSE.txt",
+        "version": "13.0.88",
+        "linux-x86_64": {
+            "relative_path": "libnvjitlink/linux-x86_64/libnvjitlink-linux-x86_64-13.0.88-archive.tar.xz",
+            "sha256": "25f9763fd60122a4f728eec22ac4e64e46ea8679e140234f15eaec008e6c41a8",
+            "md5": "ad488d8956b7e93e6386ede30a3f2e6d",
+            "size": "55521316"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvjitlink/linux-sbsa/libnvjitlink-linux-sbsa-13.0.88-archive.tar.xz",
+            "sha256": "b7c25896af24ea88309301c8325449cd3d4907b3f1db4060f43a8ca8f4738cdc",
+            "md5": "3febdc80a7af025dc93a2091bb97648e",
+            "size": "49924684"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvjitlink/windows-x86_64/libnvjitlink-windows-x86_64-13.0.88-archive.zip",
+            "sha256": "4b2cff3cfcec50cab2193f11cee023589b1b3b15388ab38780ea08b7ebbf15e3",
+            "md5": "e4b5c1e668ce33e44b643e14342504e8",
+            "size": "269633168"
+        }
+    },
+    "libnvjpeg": {
+        "name": "CUDA nvJPEG",
+        "license": "CUDA Toolkit",
+        "license_path": "libnvjpeg/LICENSE.txt",
+        "version": "13.0.1.86",
+        "linux-x86_64": {
+            "relative_path": "libnvjpeg/linux-x86_64/libnvjpeg-linux-x86_64-13.0.1.86-archive.tar.xz",
+            "sha256": "ebef16a52d31d2de0e888f0fd9c788bfe99be988ebad4927754e5ccdfdae6360",
+            "md5": "23291f980056e22961a2ab83e6a1c52c",
+            "size": "3618252"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvjpeg/linux-sbsa/libnvjpeg-linux-sbsa-13.0.1.86-archive.tar.xz",
+            "sha256": "6132e76ec6064881592b38ef5b2a135237005d8533660ee8f525b120a178d1f4",
+            "md5": "b2c038c246ca28a1446eaf235769ea62",
+            "size": "3460824"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvjpeg/windows-x86_64/libnvjpeg-windows-x86_64-13.0.1.86-archive.zip",
+            "sha256": "b8d64f9fb90632e33685529e2b8baee245ca3dcaecab4b8998815ae0f44c5171",
+            "md5": "8c0faada587f472d75ae4e22ced3f6c1",
+            "size": "3144778"
+        }
+    },
+    "libnvptxcompiler": {
+        "name": "CUDA libnvptxcompiler",
+        "license": "CUDA Toolkit",
+        "license_path": "libnvptxcompiler/LICENSE.txt",
+        "version": "13.0.88",
+        "linux-x86_64": {
+            "relative_path": "libnvptxcompiler/linux-x86_64/libnvptxcompiler-linux-x86_64-13.0.88-archive.tar.xz",
+            "sha256": "3d2a51c6816278b90167550a7e0e9adfff9c8c919d87ef980565c0eb7fc23830",
+            "md5": "c2877d647902ab01f88b922306189a8c",
+            "size": "13779680"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvptxcompiler/linux-sbsa/libnvptxcompiler-linux-sbsa-13.0.88-archive.tar.xz",
+            "sha256": "fa47b2045245c5e86d41f9f13d571514f12a9f84eaaf0680087813fd71c3c0bd",
+            "md5": "5a4d6a737853f25547a2a47287572c08",
+            "size": "12913976"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvptxcompiler/windows-x86_64/libnvptxcompiler-windows-x86_64-13.0.88-archive.zip",
+            "sha256": "863efcf751575f17111b99d0e553de954d3e8c9a91315505605601b0cc33fe4d",
+            "md5": "b920f1abf2214e335d6ff22d8188cbeb",
+            "size": "46889642"
+        }
+    },
+    "libnvsdm": {
+        "name": "LIBNVSDM",
+        "license": "NVIDIA",
+        "license_path": "libnvsdm/LICENSE.txt",
+        "version": "580.95.05",
+        "linux-x86_64": {
+            "relative_path": "libnvsdm/linux-x86_64/libnvsdm-linux-x86_64-580.95.05-archive.tar.xz",
+            "sha256": "61731fb08bcc5cc143e8514d5ec4f24d42ef9f2563d0ba1ea78bac9eabee8075",
+            "md5": "a46f9176919e90badd89240de658ec7c",
+            "size": "499756"
+        }
+    },
+    "libnvvm": {
+        "name": "CUDA NVVM",
+        "license": "CUDA Toolkit",
+        "license_path": "libnvvm/LICENSE.txt",
+        "version": "13.0.88",
+        "linux-x86_64": {
+            "relative_path": "libnvvm/linux-x86_64/libnvvm-linux-x86_64-13.0.88-archive.tar.xz",
+            "sha256": "17ef1665b63670887eeba7d908da5669fa8c66bb73b5b4c1367f49929c086353",
+            "md5": "816927093ffbdc10fddd751f045396b1",
+            "size": "43645408"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvvm/linux-sbsa/libnvvm-linux-sbsa-13.0.88-archive.tar.xz",
+            "sha256": "f94feb1a0da0c55ceb5c7f039c1f0ffad5d162e0fedfb565efb87771187ddcfd",
+            "md5": "b9730ee7e25db76caa843c858af31d98",
+            "size": "38570872"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvvm/windows-x86_64/libnvvm-windows-x86_64-13.0.88-archive.zip",
+            "sha256": "6dda4a82d22a2c173a65c66b4b4c933e3424a56ce845e2864bdca9cc66e6c524",
+            "md5": "779d2fb0a5235cc7763c06686def0226",
+            "size": "52909116"
+        }
+    },
+    "mft": {
+        "name": "NVLink 5 MFT",
+        "license": "NVIDIA Proprietary",
+        "license_path": "mft/LICENSE.txt",
+        "version": "4.33.0.3004",
+        "linux-x86_64": {
+            "relative_path": "mft/linux-x86_64/mft-linux-x86_64-4.33.0.3004-archive.tar.xz",
+            "sha256": "d8b885df13e32730275436d56cd48a3c4a755b2591ff4e3e6836c7a9f9433af1",
+            "md5": "0ee5b7ee7e9e3d982d39c65117891db9",
+            "size": "50206528"
+        },
+        "linux-sbsa": {
+            "relative_path": "mft/linux-sbsa/mft-linux-sbsa-4.33.0.3004-archive.tar.xz",
+            "sha256": "26aa6ecb6827d88003b50c7d649962b78eb58cba190fdb1f4836b9a3bc75b22e",
+            "md5": "93f81aed65d166b5cb4b2c1193778f3d",
+            "size": "46314988"
+        }
+    },
+    "mft_autocomplete": {
+        "name": "NVLink 5 MFT AUTOCOMPLETE",
+        "license": "NVIDIA Proprietary",
+        "license_path": "mft_autocomplete/LICENSE.txt",
+        "version": "4.33.0.3004",
+        "linux-x86_64": {
+            "relative_path": "mft_autocomplete/linux-x86_64/mft_autocomplete-linux-x86_64-4.33.0.3004-archive.tar.xz",
+            "sha256": "8d16437d55f15ab5c6da9fa26aec6806eb7f6e9606006a7f09593344c848acdb",
+            "md5": "00c429dd417652d24a93f7e66fbab865",
+            "size": "12240"
+        },
+        "linux-sbsa": {
+            "relative_path": "mft_autocomplete/linux-sbsa/mft_autocomplete-linux-sbsa-4.33.0.3004-archive.tar.xz",
+            "sha256": "b4d492b889d76ea156b97739da4661dfd36c2053a0090065317701c323b51859",
+            "md5": "1a7327e04ae79247054cc551d8f0b263",
+            "size": "12176"
+        }
+    },
+    "mft_oem": {
+        "name": "NVLink 5 MFT OEM",
+        "license": "NVIDIA Proprietary",
+        "license_path": "mft_oem/LICENSE.txt",
+        "version": "4.33.0.3004",
+        "linux-x86_64": {
+            "relative_path": "mft_oem/linux-x86_64/mft_oem-linux-x86_64-4.33.0.3004-archive.tar.xz",
+            "sha256": "0f703047ad69e46c6e3f021fc1ae5e086530a52311da08b3a49451db7f1332e7",
+            "md5": "42498e50e4bdedbb3a99ba434a3ee6a5",
+            "size": "3674360"
+        },
+        "linux-sbsa": {
+            "relative_path": "mft_oem/linux-sbsa/mft_oem-linux-sbsa-4.33.0.3004-archive.tar.xz",
+            "sha256": "fb755738e56a883d68bb408f28e293df00d1e66e1554e48f339f0f0cf0b7be04",
+            "md5": "fe00dfbbac0c16f74e0d8f21a759d522",
+            "size": "3276404"
+        }
+    },
+    "nsight_compute": {
+        "name": "Nsight Compute",
+        "license": "NVIDIA SLA",
+        "license_path": "nsight_compute/LICENSE.txt",
+        "version": "2025.3.1.4",
+        "linux-x86_64": {
+            "relative_path": "nsight_compute/linux-x86_64/nsight_compute-linux-x86_64-2025.3.1.4-archive.tar.xz",
+            "sha256": "d3c0a0402511034c58227b817cbfed599765f32dc662cdcda58922247b52dd7a",
+            "md5": "05222d0ca8b526f7f94d95e60dbb0459",
+            "size": "322049776"
+        },
+        "linux-sbsa": {
+            "relative_path": "nsight_compute/linux-sbsa/nsight_compute-linux-sbsa-2025.3.1.4-archive.tar.xz",
+            "sha256": "562acdb72942ba3250fbda1d0a5b45d9d8bebf7295049846d16ffbdb457f9d28",
+            "md5": "e061682e32865f54d6499c402cb1f340",
+            "size": "141672040"
+        },
+        "windows-x86_64": {
+            "relative_path": "nsight_compute/windows-x86_64/nsight_compute-windows-x86_64-2025.3.1.4-archive.zip",
+            "sha256": "0ad1c310f38cdfc17e85f6efa2da60e7628bd2db81eba8ec487ab6d49c1bcdef",
+            "md5": "a78ed24bbe8554a6ff7ebfff6c516185",
+            "size": "371135506"
+        }
+    },
+    "nsight_systems": {
+        "name": "Nsight Systems",
+        "license": "NVIDIA SLA",
+        "license_path": "nsight_systems/LICENSE.txt",
+        "version": "2025.3.2.474",
+        "linux-x86_64": {
+            "relative_path": "nsight_systems/linux-x86_64/nsight_systems-linux-x86_64-2025.3.2.474-archive.tar.xz",
+            "sha256": "fa4e9908e9a593383ac7f669472dd52e712cbc426f69b349ada363e80cdebbd5",
+            "md5": "e0dbd1d1d1d7ab7387eb2cf2c7b6cabc",
+            "size": "1131797276"
+        },
+        "linux-sbsa": {
+            "relative_path": "nsight_systems/linux-sbsa/nsight_systems-linux-sbsa-2025.3.2.474-archive.tar.xz",
+            "sha256": "547bc5c72df6adc325a761201f4d7e20a2c80c94adf1169f6d365c6995594b4f",
+            "md5": "5a6bdffed12380675d576ca20d81a1b4",
+            "size": "1025797284"
+        },
+        "windows-x86_64": {
+            "relative_path": "nsight_systems/windows-x86_64/nsight_systems-windows-x86_64-2025.3.2.474-archive.zip",
+            "sha256": "7b55f8fedbcf797817e5062fbdec55f8b90c26c62c0451adc68cf2f30000752a",
+            "md5": "f1f3f495e27127f32a8e6d8486df0385",
+            "size": "446766583"
+        }
+    },
+    "nsight_vse": {
+        "name": "Nsight Visual Studio Edition (VSE)",
+        "license": "NVIDIA SLA",
+        "license_path": "nsight_vse/LICENSE.txt",
+        "version": "2025.3.1.25227",
+        "windows-x86_64": {
+            "relative_path": "nsight_vse/windows-x86_64/nsight_vse-windows-x86_64-2025.3.1.25227-archive.zip",
+            "sha256": "bc92e5c1bb1a45f60d4e8382169990094b1f8531f37cafb180690d5bb14e2fce",
+            "md5": "00022c2eafadf7bc024625629f896b74",
+            "size": "200540705"
+        }
+    },
+    "nvidia_driver": {
+        "name": "NVIDIA Linux Driver",
+        "license": "NVIDIA Driver",
+        "license_path": "nvidia_driver/LICENSE.txt",
+        "version": "580.95.05",
+        "linux-x86_64": {
+            "relative_path": "nvidia_driver/linux-x86_64/nvidia_driver-linux-x86_64-580.95.05-archive.tar.xz",
+            "sha256": "3528df4fb0c7a1665ae2af5d26effeb67f76fc86742ffc1defd7714408405d4d",
+            "md5": "414882bb4f82d3f30f56e22bcb162a67",
+            "size": "492741996"
+        },
+        "linux-sbsa": {
+            "relative_path": "nvidia_driver/linux-sbsa/nvidia_driver-linux-sbsa-580.95.05-archive.tar.xz",
+            "sha256": "95b52919632928d7a245e5696b71cd68285e6bffd1f22cdcd4f9686d5d5b0b09",
+            "md5": "119f7e0375f09e0a9c1ec4befca800f0",
+            "size": "367188496"
+        }
+    },
+    "nvidia_fs": {
+        "name": "NVIDIA filesystem",
+        "license": "CUDA Toolkit",
+        "license_path": "nvidia_fs/LICENSE.txt",
+        "version": "2.26.6",
+        "linux-x86_64": {
+            "relative_path": "nvidia_fs/linux-x86_64/nvidia_fs-linux-x86_64-2.26.6-archive.tar.xz",
+            "sha256": "39ff513827f39c26140303c2b1eb28cb46e2afb6f6676881dfcd6e7b0248bcee",
+            "md5": "9cdd880eb9678967d8e0712f708eeca5",
+            "size": "60292"
+        },
+        "linux-sbsa": {
+            "relative_path": "nvidia_fs/linux-sbsa/nvidia_fs-linux-sbsa-2.26.6-archive.tar.xz",
+            "sha256": "de648016c4123afe65684448ee0e8719cf9d4f934bb63a82239411f6c7fd1fc1",
+            "md5": "51c58f7b414b3461f0bdc71316dc2f50",
+            "size": "60308"
+        }
+    },
+    "nvlsm": {
+        "name": "NVLSM SM component",
+        "license": "NVIDIA Proprietary",
+        "license_path": "nvlsm/LICENSE.txt",
+        "version": "2025.06.6",
+        "linux-x86_64": {
+            "relative_path": "nvlsm/linux-x86_64/nvlsm-linux-x86_64-2025.06.6-archive.tar.xz",
+            "sha256": "bd77ad2504966450aab15041223eea34538a57e870b7d447c097ec721efba792",
+            "md5": "798accd845365da78e2ce99b0aac22ce",
+            "size": "7005320"
+        },
+        "linux-sbsa": {
+            "relative_path": "nvlsm/linux-sbsa/nvlsm-linux-sbsa-2025.06.6-archive.tar.xz",
+            "sha256": "1f24d590129e4951d57b1ba75f321bc7ec66b487249ac53b771f0d3a5c5ff371",
+            "md5": "953f75c92485fd63057ec365511f27da",
+            "size": "9365804"
+        }
+    },
+    "visual_studio_integration": {
+        "name": "CUDA Visual Studio Integration",
+        "license": "CUDA Toolkit",
+        "license_path": "visual_studio_integration/LICENSE.txt",
+        "version": "13.0.85",
+        "windows-x86_64": {
+            "relative_path": "visual_studio_integration/windows-x86_64/visual_studio_integration-windows-x86_64-13.0.85-archive.zip",
+            "sha256": "babb8113ae3845fff6cac0fd8a14838d384d61960bcc60289b72129e8db08bd9",
+            "md5": "9577f804ebffb01e9876a7d7b33cba1f",
+            "size": "887859"
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/packages/collectx_bringup.nix b/pkgs/development/cuda-modules/packages/collectx_bringup.nix
new file mode 100644
index 000000000000..a6df12920f2e
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/collectx_bringup.nix
@@ -0,0 +1,48 @@
+{
+  buildRedist,
+  curl,
+  lib,
+  libibmad,
+  libibumad,
+  rdma-core,
+  ucx,
+  zlib,
+}:
+buildRedist (finalAttrs: {
+  redistName = "cuda";
+  pname = "collectx_bringup";
+
+  # TODO: Has python packages, bin, etc, lib, share, and collectx directory,
+  # which has its own bin and lib directories.
+  outputs = [ "out" ];
+
+  postUnpack = lib.optionalString (finalAttrs.src ? name) ''
+    nixLog "moving collectx_bringup to the top level of source root"
+    mv --verbose --no-clobber \
+      "$PWD/${finalAttrs.src.name}/opt/nvidia/collectx_bringup"/* \
+      "$PWD/${finalAttrs.src.name}/"
+    rm --dir --verbose --recursive "$PWD/${finalAttrs.src.name}/opt"
+  '';
+
+  buildInputs = [
+    curl
+    libibmad
+    libibumad
+    rdma-core
+    ucx
+    zlib
+  ];
+
+  brokenAssertions = [
+    # NOTE: Neither of these are available in Nixpkgs, from what I can tell by way of
+    # nix-community/nix-index-database.
+    {
+      message = "libssl.so.1.1 is available";
+      assertion = false;
+    }
+    {
+      message = "libcrypto.so.1.1 is available";
+      assertion = false;
+    }
+  ];
+})
diff --git a/pkgs/development/cuda-modules/packages/cuda_ctadvisor.nix b/pkgs/development/cuda-modules/packages/cuda_ctadvisor.nix
new file mode 100644
index 000000000000..aa7139a53c94
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_ctadvisor.nix
@@ -0,0 +1,18 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_ctadvisor";
+
+  outputs = [ "out" ];
+
+  meta = {
+    description = "Analyzes trace files containing compilation time information generated by NVCC or NVRTC";
+    longDescription = ''
+      CUDA Compile Time Advisor (ctadvisor) analyzes trace files containing compilation time information generated by
+      NVCC or NVRTC. ctadvisor identifies compilation bottlenecks that take significant amount of time, for examples,
+      template instantiation and headers processing. The tool provides users with suggestions to reduce compilation
+      time.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/cuda-compile-time-advisor";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/cuda_culibos.nix b/pkgs/development/cuda-modules/packages/cuda_culibos.nix
new file mode 100644
index 000000000000..c95939a96d86
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuda_culibos.nix
@@ -0,0 +1,6 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "cuda_culibos";
+  outputs = [ "out" ];
+}
diff --git a/pkgs/development/cuda-modules/packages/libnvptxcompiler.nix b/pkgs/development/cuda-modules/packages/libnvptxcompiler.nix
new file mode 100644
index 000000000000..84f0ff1a1932
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnvptxcompiler.nix
@@ -0,0 +1,12 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "libnvptxcompiler";
+
+  outputs = [ "out" ];
+
+  meta = {
+    description = "APIs which can be used to compile a PTX program into GPU assembly code";
+    homepage = "https://docs.nvidia.com/cuda/ptx-compiler-api";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/mft.nix b/pkgs/development/cuda-modules/packages/mft.nix
new file mode 100644
index 000000000000..7c7c7c9dd361
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/mft.nix
@@ -0,0 +1,39 @@
+{
+  buildRedist,
+  lib,
+  rdma-core,
+  zlib,
+}:
+buildRedist (finalAttrs: {
+  redistName = "cuda";
+  pname = "mft";
+
+  # TODO: includes bin, etc, include, lib, and share directories.
+  outputs = [ "out" ];
+
+  postUnpack = lib.optionalString (finalAttrs.src != null) ''
+    nixLog "moving items in usr to the top level of source root"
+    mv --verbose --no-clobber \
+      "$PWD/${finalAttrs.src.name}/usr"/* \
+      "$PWD/${finalAttrs.src.name}/"
+    rm --dir --verbose --recursive "$PWD/${finalAttrs.src.name}/usr"
+  '';
+
+  buildInputs = [
+    rdma-core
+    zlib
+  ];
+
+  brokenAssertions = [
+    {
+      # There are a *bunch* of these references and I don't know how to patch them all.
+      message = "contains no references to FHS paths";
+      assertion = false;
+    }
+  ];
+
+  meta = {
+    description = "NVIDIA firmware management tools";
+    homepage = "https://network.nvidia.com/products/adapter-software/firmware-tools/";
+  };
+})
diff --git a/pkgs/development/cuda-modules/packages/mft_autocomplete.nix b/pkgs/development/cuda-modules/packages/mft_autocomplete.nix
new file mode 100644
index 000000000000..35cbabc87759
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/mft_autocomplete.nix
@@ -0,0 +1,39 @@
+{
+  buildRedist,
+  lib,
+  python3,
+}:
+buildRedist {
+  redistName = "cuda";
+  pname = "mft_autocomplete";
+
+  # TODO: includes bin, etc, include, lib, and share directories.
+  outputs = [ "out" ];
+
+  postPatch = ''
+    nixLog "patching python path in $PWD/etc/bash_completion.d/mft/mft_base_autocomplete"
+    substituteInPlace "$PWD/etc/bash_completion.d/mft/mft_base_autocomplete" \
+      --replace-fail \
+        "PYTHON_EXEC='/usr/bin/env python3'" \
+        "PYTHON_EXEC='${lib.getExe python3}'" \
+      --replace-fail \
+        "PYTHON_EXEC='/usr/bin/env python2'" \
+        "PYTHON_EXEC='${lib.getExe python3}'"
+
+    nixLog "patching python shebang path in $PWD/etc/bash_completion.d/mft/mft_help_to_completion.py"
+    substituteInPlace "$PWD/etc/bash_completion.d/mft/mft_help_to_completion.py" \
+      --replace-fail \
+        '#!/usr/bin/python' \
+        '#!${lib.getExe python3}'
+  '';
+
+  brokenAssertions = [
+    {
+      # The mft_base_autocomplete file needs heavier patching to remove FHS references and ensure it uses Nixpkgs' python.
+      # In particular, it does something like
+      # PYTHON_EXEC=`find /usr/bin /bin/ /usr/local/bin -iname 'python*' 2>&1 | grep -e='*python[0-9,.]*' | sort -d | head -n 1`
+      message = "contains no references to FHS paths";
+      assertion = false;
+    }
+  ];
+}
diff --git a/pkgs/development/cuda-modules/packages/mft_oem.nix b/pkgs/development/cuda-modules/packages/mft_oem.nix
new file mode 100644
index 000000000000..3eb7c56b42b5
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/mft_oem.nix
@@ -0,0 +1,25 @@
+{ buildRedist, libxcrypt-legacy }:
+buildRedist (finalAttrs: {
+  redistName = "cuda";
+  pname = "mft_oem";
+
+  outputs = [ "out" ];
+
+  postUnpack = ''
+    nixLog "moving items in usr to the top level of source root"
+    mv --verbose --no-clobber \
+      "$PWD/${finalAttrs.src.name}/usr"/* \
+      "$PWD/${finalAttrs.src.name}/"
+    rm --dir --verbose --recursive "$PWD/${finalAttrs.src.name}/usr"
+  '';
+
+  buildInputs = [ libxcrypt-legacy ];
+
+  brokenAssertions = [
+    {
+      # Contains problems similar to mft_autocomplete.
+      message = "contains no references to FHS paths";
+      assertion = false;
+    }
+  ];
+})
diff --git a/pkgs/development/cuda-modules/packages/nvlsm.nix b/pkgs/development/cuda-modules/packages/nvlsm.nix
new file mode 100644
index 000000000000..7ab82cf1c1fa
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvlsm.nix
@@ -0,0 +1,30 @@
+{ buildRedist, lib }:
+buildRedist (finalAttrs: {
+  redistName = "cuda";
+  pname = "nvlsm";
+
+  # TODO: includes bin, lib, and share directories.
+  outputs = [ "out" ];
+
+  postUnpack = lib.optionalString (finalAttrs.src != null) ''
+    nixLog "moving sbin to bin"
+    mv --verbose --no-clobber \
+      "$PWD/${finalAttrs.src.name}/sbin" \
+      "$PWD/${finalAttrs.src.name}/bin"
+  '';
+
+  brokenAssertions = [
+    {
+      # The binary files match FHS paths and the configuration files need to be patched.
+      message = "contains no references to FHS paths";
+      assertion = false;
+    }
+  ];
+
+  meta = {
+    description = "NVLink Subnet Manager";
+    longDescription = ''
+      A service that originates from NVIDIA InfiniBand switches and has the necessary modifications to effectively manage NVSwitches.
+    '';
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ef79ac7581f..ac293591cbb3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2561,10 +2561,13 @@ with pkgs;
     cudaPackages_12_6
     cudaPackages_12_8
     cudaPackages_12_9
+    cudaPackages_13_0
     ;
 
   cudaPackages_12 = cudaPackages_12_8;
 
+  cudaPackages_13 = cudaPackages_13_0;
+
   cudaPackages = recurseIntoAttrs cudaPackages_12;
 
   # TODO: move to alias
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index 3ab93e801d36..f3cd68a96195 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -52,4 +52,14 @@ in
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
   };
+
+  cudaPackages_13_0 = callPackage ../development/cuda-modules {
+    manifests = selectManifests {
+      cuda = "13.0.2";
+      cudnn = "9.8.0";
+      cusparselt = "0.7.1";
+      cutensor = "2.2.0";
+      tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
+    };
+  };
 }

From cd53001dd5e68cbaff2a561ad202299c21a3044b Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Wed, 10 Sep 2025 00:37:06 +0000
Subject: [PATCH 1753/6226] cudaPackages.cudnn: 9.8.0 -> 9.13.0

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../manifests/cudnn/redistrib_9.13.0.json     | 121 ++++++++++++++++++
 .../manifests/cudnn/redistrib_9.8.0.json      |  77 -----------
 pkgs/top-level/cuda-packages.nix              |   8 +-
 3 files changed, 125 insertions(+), 81 deletions(-)
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_9.13.0.json
 delete mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_9.8.0.json

diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_9.13.0.json b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_9.13.0.json
new file mode 100644
index 000000000000..15367f5a3fa6
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_9.13.0.json
@@ -0,0 +1,121 @@
+{
+    "release_date": "2025-09-04",
+    "release_label": "9.13.0",
+    "release_product": "cudnn",
+    "cudnn": {
+        "name": "NVIDIA CUDA Deep Neural Network library",
+        "license": "cudnn",
+        "license_path": "cudnn/LICENSE.txt",
+        "version": "9.13.0.50",
+        "linux-x86_64": {
+            "cuda12": {
+                "relative_path": "cudnn/linux-x86_64/cudnn-linux-x86_64-9.13.0.50_cuda12-archive.tar.xz",
+                "sha256": "28c5c59316464434eb7bafe75fc36285160c28d559a50056ded13394955d1f7d",
+                "md5": "55633b6a710506c4e4d704aef42a5fdd",
+                "size": "873944756"
+            },
+            "cuda13": {
+                "relative_path": "cudnn/linux-x86_64/cudnn-linux-x86_64-9.13.0.50_cuda13-archive.tar.xz",
+                "sha256": "02f47d9456773c80d97ed245efd9eb22bb985dcfdb74559213536035291e7a01",
+                "md5": "ff33c2783f44d10874f93d32d13764ab",
+                "size": "641302680"
+            }
+        },
+        "cuda_variant": [
+            "12",
+            "13"
+        ],
+        "linux-sbsa": {
+            "cuda12": {
+                "relative_path": "cudnn/linux-sbsa/cudnn-linux-sbsa-9.13.0.50_cuda12-archive.tar.xz",
+                "sha256": "28f3f86aa102870c5d6804bca1bb1a0dcc1df69d0235c0a4120ae0aa6d14ffc7",
+                "md5": "9bd5d15c46ccc94e7191e47446f22e62",
+                "size": "873177712"
+            },
+            "cuda13": {
+                "relative_path": "cudnn/linux-sbsa/cudnn-linux-sbsa-9.13.0.50_cuda13-archive.tar.xz",
+                "sha256": "78931057322ab87b72b0a988462568412edfed5bdef1eaf717961351b53cb3d0",
+                "md5": "aadbfef24b136ce2385170c19213c4fa",
+                "size": "766735516"
+            }
+        },
+        "windows-x86_64": {
+            "cuda12": {
+                "relative_path": "cudnn/windows-x86_64/cudnn-windows-x86_64-9.13.0.50_cuda12-archive.zip",
+                "sha256": "827e294e13e352586a5bcf5b2188025fe5cba590df69b8010e97dd30b9a0266f",
+                "md5": "e08c945fd8f570e6779ce9cb216bcf20",
+                "size": "621840857"
+            },
+            "cuda13": {
+                "relative_path": "cudnn/windows-x86_64/cudnn-windows-x86_64-9.13.0.50_cuda13-archive.zip",
+                "sha256": "6314aa4ca21e727bc012fecf2bf7192276ac7b648e1f709f52947496d70808dd",
+                "md5": "d5fa2f7d1596bc6bbabb6888f9139fd4",
+                "size": "337906764"
+            }
+        },
+        "linux-aarch64": {
+            "cuda12": {
+                "relative_path": "cudnn/linux-aarch64/cudnn-linux-aarch64-9.13.0.50_cuda12-archive.tar.xz",
+                "sha256": "c4b47fe8b1f936aa5cbc312f2d0707990fe5f55693fb5640c7141d301aa7db4c",
+                "md5": "4a00c0ae53ad6fdb761d7ab56993863c",
+                "size": "940699120"
+            },
+            "cuda13": {
+                "relative_path": "cudnn/linux-aarch64/cudnn-linux-aarch64-9.13.0.50_cuda13-archive.tar.xz",
+                "sha256": "f18ee7d3fd7b1d136602eb2f5d5d59abe5445db384ad308d22fbeeee11ef151e",
+                "md5": "365f06153492370374e5e7b20d4646eb",
+                "size": "690215112"
+            }
+        }
+    },
+    "cudnn_jit": {
+        "name": "NVIDIA CUDA Deep Neural Network Graph JIT library",
+        "license": "cudnn",
+        "license_path": "cudnn_jit/LICENSE.txt",
+        "version": "9.13.0.50",
+        "linux-x86_64": {
+            "cuda12": {
+                "relative_path": "cudnn_jit/linux-x86_64/cudnn_jit-linux-x86_64-9.13.0.50_cuda12-archive.tar.xz",
+                "sha256": "eb22533f125e4315de501112e2d0f0c001ba50b8f872f2bf7a12d545f609cb59",
+                "md5": "07023563efe85b7aab07b2982e541872",
+                "size": "13417344"
+            },
+            "cuda13": {
+                "relative_path": "cudnn_jit/linux-x86_64/cudnn_jit-linux-x86_64-9.13.0.50_cuda13-archive.tar.xz",
+                "sha256": "cd76ea09574f3a1c07728c15fc794dbeed181b57b25e02768c5918b0353e658d",
+                "md5": "e9cc3e0e19d4c88158ef48193905b94b",
+                "size": "12722420"
+            }
+        },
+        "cuda_variant": [
+            "12",
+            "13"
+        ],
+        "linux-sbsa": {
+            "cuda12": {
+                "relative_path": "cudnn_jit/linux-sbsa/cudnn_jit-linux-sbsa-9.13.0.50_cuda12-archive.tar.xz",
+                "sha256": "f8c91dca056c0128f0ed15296de4b9fcf1cd503241cec02f6e4b3e2965e1be9e",
+                "md5": "adf011a7b7bcbd0c9be0abd546a49e22",
+                "size": "13047884"
+            },
+            "cuda13": {
+                "relative_path": "cudnn_jit/linux-sbsa/cudnn_jit-linux-sbsa-9.13.0.50_cuda13-archive.tar.xz",
+                "sha256": "d5ce2fb281457eddf6319e517a797d009a4f5db55a565a753f0ba53e541163b2",
+                "md5": "d61024f0d19e5bcdad3e969c79f21d62",
+                "size": "12812136"
+            }
+        }
+    },
+    "cudnn_samples": {
+        "name": "NVIDIA cuDNN samples",
+        "license": "cudnn",
+        "license_path": "cudnn_samples/LICENSE.txt",
+        "version": "9.13.0.50",
+        "source": {
+            "relative_path": "cudnn_samples/source/cudnn_samples-source-9.13.0.50-archive.tar.xz",
+            "sha256": "34dd694b6a1de34fca31a89b0b41f1f5edbf2dddb5822dda193332be6a2f508d",
+            "md5": "2750b23e2e468d8f5ff0b429d1e60d32",
+            "size": "1666920"
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_9.8.0.json b/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_9.8.0.json
deleted file mode 100644
index 3265e008f6a6..000000000000
--- a/pkgs/development/cuda-modules/_cuda/manifests/cudnn/redistrib_9.8.0.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-    "release_date": "2025-03-04",
-    "release_label": "9.8.0",
-    "release_product": "cudnn",
-    "cudnn": {
-        "name": "NVIDIA CUDA Deep Neural Network library",
-        "license": "cudnn",
-        "license_path": "cudnn/LICENSE.txt",
-        "version": "9.8.0.87",
-        "linux-x86_64": {
-            "cuda11": {
-                "relative_path": "cudnn/linux-x86_64/cudnn-linux-x86_64-9.8.0.87_cuda11-archive.tar.xz",
-                "sha256": "cf4dfaef8311d987d640a322f668cd5240ac3e5302abe9617dd991b5b2532758",
-                "md5": "f8cc1eb607dd83dbaa12f9ba80934cbb",
-                "size": "561520128"
-            },
-            "cuda12": {
-                "relative_path": "cudnn/linux-x86_64/cudnn-linux-x86_64-9.8.0.87_cuda12-archive.tar.xz",
-                "sha256": "321b9b33bb1287404d93d5672d352f16feabc4b220ac6ae0b86e4b27f257dcf4",
-                "md5": "3674444654eb59b6f4c919103a8531af",
-                "size": "923946888"
-            }
-        },
-        "cuda_variant": [
-            "11",
-            "12"
-        ],
-        "linux-sbsa": {
-            "cuda11": {
-                "relative_path": "cudnn/linux-sbsa/cudnn-linux-sbsa-9.8.0.87_cuda11-archive.tar.xz",
-                "sha256": "8ff117715fb3323032d1b489880117556ad8b5e57a9060143f0cb72384db7710",
-                "md5": "b38a6fba3c53ded236b5596d405c7ef6",
-                "size": "560558204"
-            },
-            "cuda12": {
-                "relative_path": "cudnn/linux-sbsa/cudnn-linux-sbsa-9.8.0.87_cuda12-archive.tar.xz",
-                "sha256": "22f62f474f0cbb35bef540adb1d841da63c9cd3df76b3c4e43010f436b2cd85c",
-                "md5": "3ec9ec13b42e5f43f49cfa63f83b46fa",
-                "size": "922963076"
-            }
-        },
-        "windows-x86_64": {
-            "cuda11": {
-                "relative_path": "cudnn/windows-x86_64/cudnn-windows-x86_64-9.8.0.87_cuda11-archive.zip",
-                "sha256": "b2995837e6b9a5b3816a0cd90480769cd4280f965c2ef0848debf029f391ca8f",
-                "md5": "39b78253550678399367b160d7503e04",
-                "size": "422255533"
-            },
-            "cuda12": {
-                "relative_path": "cudnn/windows-x86_64/cudnn-windows-x86_64-9.8.0.87_cuda12-archive.zip",
-                "sha256": "d8a23705e3884b137b7e05449fb2b61bfa524e7cfc3fda80743d633f423c6ce4",
-                "md5": "c9926e3b1638d775ae384837ccd97c72",
-                "size": "675349654"
-            }
-        },
-        "linux-aarch64": {
-            "cuda12": {
-                "relative_path": "cudnn/linux-aarch64/cudnn-linux-aarch64-9.8.0.87_cuda12-archive.tar.xz",
-                "sha256": "f03ece3ff07d1719f06218973a8797cec1be387cc317baab5bb118dc988199e7",
-                "md5": "989ba35d01495ea4c66097b021eb7cda",
-                "size": "964790260"
-            }
-        }
-    },
-    "cudnn_samples": {
-        "name": "NVIDIA cuDNN samples",
-        "license": "cudnn",
-        "license_path": "cudnn_samples/LICENSE.txt",
-        "version": "9.8.0.87",
-        "source": {
-            "relative_path": "cudnn_samples/source/cudnn_samples-source-9.8.0.87-archive.tar.xz",
-            "sha256": "2a63562a3a9b2cdcd9d8bce1dcc106a3cc9f47a6448b7a77b0e3b8f8776d0a41",
-            "md5": "e0a198f07791ece1d635d56c9626132a",
-            "size": "1666724"
-        }
-    }
-}
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index f3cd68a96195..ffae58dc2322 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -26,7 +26,7 @@ in
   cudaPackages_12_6 = callPackage ../development/cuda-modules {
     manifests = selectManifests {
       cuda = "12.6.3";
-      cudnn = "9.8.0";
+      cudnn = "9.13.0";
       cusparselt = "0.6.3";
       cutensor = "2.2.0";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
@@ -36,7 +36,7 @@ in
   cudaPackages_12_8 = callPackage ../development/cuda-modules {
     manifests = selectManifests {
       cuda = "12.8.1";
-      cudnn = "9.8.0";
+      cudnn = "9.13.0";
       cusparselt = "0.7.1";
       cutensor = "2.2.0";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
@@ -46,7 +46,7 @@ in
   cudaPackages_12_9 = callPackage ../development/cuda-modules {
     manifests = selectManifests {
       cuda = "12.9.1";
-      cudnn = "9.8.0";
+      cudnn = "9.13.0";
       cusparselt = "0.7.1";
       cutensor = "2.2.0";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
@@ -56,7 +56,7 @@ in
   cudaPackages_13_0 = callPackage ../development/cuda-modules {
     manifests = selectManifests {
       cuda = "13.0.2";
-      cudnn = "9.8.0";
+      cudnn = "9.13.0";
       cusparselt = "0.7.1";
       cutensor = "2.2.0";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";

From 31dc7efe56b49655d4d25b7fff3ab314ed82886b Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Wed, 10 Sep 2025 00:42:17 +0000
Subject: [PATCH 1754/6226] cudaPackages.libcusparse_lt: 0.7.1 -> 0.8.1

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../manifests/cusparselt/redistrib_0.7.1.json | 35 ---------
 .../manifests/cusparselt/redistrib_0.8.1.json | 71 +++++++++++++++++++
 pkgs/top-level/cuda-packages.nix              |  6 +-
 3 files changed, 74 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cusparselt/redistrib_0.7.1.json
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cusparselt/redistrib_0.8.1.json

diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/redistrib_0.7.1.json b/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/redistrib_0.7.1.json
deleted file mode 100644
index b9609bd4532a..000000000000
--- a/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/redistrib_0.7.1.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "release_date": "2025-02-25",
-    "release_label": "0.7.1",
-    "release_product": "cusparselt",
-    "libcusparse_lt": {
-        "name": "NVIDIA cuSPARSELt",
-        "license": "cuSPARSELt",
-        "license_path": "libcusparse_lt/LICENSE.txt",
-        "version": "0.7.1.0",
-        "linux-x86_64": {
-            "relative_path": "libcusparse_lt/linux-x86_64/libcusparse_lt-linux-x86_64-0.7.1.0-archive.tar.xz",
-            "sha256": "a0d885837887c73e466a31b4e86aaae2b7d0cc9c5de0d40921dbe2a15dbd6a88",
-            "md5": "b2e5f3c9b9d69e1e0b55b16de33fdc6e",
-            "size": "353151840"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcusparse_lt/linux-sbsa/libcusparse_lt-linux-sbsa-0.7.1.0-archive.tar.xz",
-            "sha256": "4a131d0a54728e53ba536b50bb65380603456f1656e7df8ee52e285618a0b57c",
-            "md5": "612a712c7da6e801ee773687e99af87e",
-            "size": "352406784"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcusparse_lt/windows-x86_64/libcusparse_lt-windows-x86_64-0.7.1.0-archive.zip",
-            "sha256": "004bcb1b700c24ca8d60a8ddd2124640f61138a6c29914d2afaa0bfa0d0e3cf2",
-            "md5": "a1d8df8dc8ff4b3bd0e859f992f8f392",
-            "size": "268594665"
-        },
-        "linux-aarch64": {
-            "relative_path": "libcusparse_lt/linux-aarch64/libcusparse_lt-linux-aarch64-0.7.1.0-archive.tar.xz",
-            "sha256": "d3b0a660fd552e0bd9a4491b15299d968674833483d5f164cfea35e70646136c",
-            "md5": "54e3f3b28c94118991ce54ec38f531fb",
-            "size": "5494380"
-        }
-    }
-}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/redistrib_0.8.1.json b/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/redistrib_0.8.1.json
new file mode 100644
index 000000000000..c0e38e6acec8
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cusparselt/redistrib_0.8.1.json
@@ -0,0 +1,71 @@
+{
+    "release_date": "2025-09-04",
+    "release_label": "0.8.1",
+    "release_product": "cusparselt",
+    "libcusparse_lt": {
+        "name": "NVIDIA cuSPARSELt",
+        "license": "cuSPARSELt",
+        "license_path": "libcusparse_lt/LICENSE.txt",
+        "version": "0.8.1.1",
+        "linux-x86_64": {
+            "cuda12": {
+                "relative_path": "libcusparse_lt/linux-x86_64/libcusparse_lt-linux-x86_64-0.8.1.1_cuda12-archive.tar.xz",
+                "sha256": "b34272e683e9f798435af05dc124657d1444cd0e13802c3d2f3152e31cd898a3",
+                "md5": "8e6d6454a2ac514c592f18fe7e77f84c",
+                "size": "311599728"
+            },
+            "cuda13": {
+                "relative_path": "libcusparse_lt/linux-x86_64/libcusparse_lt-linux-x86_64-0.8.1.1_cuda13-archive.tar.xz",
+                "sha256": "82dd3e5ebc199a27011f58857a80cd825e77bba634ab2286ba3d4e13115db89a",
+                "md5": "90e40a8bffe304d14578eb8f2173dee1",
+                "size": "317355908"
+            }
+        },
+        "cuda_variant": [
+            "12",
+            "13"
+        ],
+        "linux-sbsa": {
+            "cuda12": {
+                "relative_path": "libcusparse_lt/linux-sbsa/libcusparse_lt-linux-sbsa-0.8.1.1_cuda12-archive.tar.xz",
+                "sha256": "e87c2e1a8615aa588864915a05c42309869c96d4046b07a50a7a729af2c1ff22",
+                "md5": "504742ec72d48e75954d1a31e30aebcb",
+                "size": "310432728"
+            },
+            "cuda13": {
+                "relative_path": "libcusparse_lt/linux-sbsa/libcusparse_lt-linux-sbsa-0.8.1.1_cuda13-archive.tar.xz",
+                "sha256": "d3ce9fb25961540291c6dc6c7292a1ea7cb886590bf896fdc2564cb2a261a3de",
+                "md5": "032ce0fc1decdca18652ce3fcf05b14e",
+                "size": "425143780"
+            }
+        },
+        "windows-x86_64": {
+            "cuda12": {
+                "relative_path": "libcusparse_lt/windows-x86_64/libcusparse_lt-windows-x86_64-0.8.1.1_cuda12-archive.zip",
+                "sha256": "1a1a4be5c2da47e242d3fbab35b66077916aeb2b8175bc6a0a6691e11972951c",
+                "md5": "78f5c274b42ff56b1b74427d89372a14",
+                "size": "223735080"
+            },
+            "cuda13": {
+                "relative_path": "libcusparse_lt/windows-x86_64/libcusparse_lt-windows-x86_64-0.8.1.1_cuda13-archive.zip",
+                "sha256": "d83c3a9c34df98aa999e6a64278a36eb837b411af593d41fe74746a2915e379d",
+                "md5": "ece8942a85c1706547da6c11ed4e48b2",
+                "size": "156765306"
+            }
+        },
+        "linux-aarch64": {
+            "cuda12": {
+                "relative_path": "libcusparse_lt/linux-aarch64/libcusparse_lt-linux-aarch64-0.8.1.1_cuda12-archive.tar.xz",
+                "sha256": "5426a897c73a9b98a83c4e132d15abc63dc4a00f7e38266e7b82c42cd58a01e1",
+                "md5": "fffc61b32112a6c09046bfb3300c840f",
+                "size": "127531168"
+            },
+            "cuda13": {
+                "relative_path": "libcusparse_lt/linux-aarch64/libcusparse_lt-linux-aarch64-0.8.1.1_cuda13-archive.tar.xz",
+                "sha256": "0fcf5808f66c71f755b4a73af2e955292e4334fec6a851eea1ac2e20878602b7",
+                "md5": "eb6eb4a96f82ff42e0be38f8486fb5d7",
+                "size": "124707896"
+            }
+        }
+    }
+}
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index ffae58dc2322..7c46438bd2ba 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -37,7 +37,7 @@ in
     manifests = selectManifests {
       cuda = "12.8.1";
       cudnn = "9.13.0";
-      cusparselt = "0.7.1";
+      cusparselt = "0.8.1";
       cutensor = "2.2.0";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
@@ -47,7 +47,7 @@ in
     manifests = selectManifests {
       cuda = "12.9.1";
       cudnn = "9.13.0";
-      cusparselt = "0.7.1";
+      cusparselt = "0.8.1";
       cutensor = "2.2.0";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
@@ -57,7 +57,7 @@ in
     manifests = selectManifests {
       cuda = "13.0.2";
       cudnn = "9.13.0";
-      cusparselt = "0.7.1";
+      cusparselt = "0.8.1";
       cutensor = "2.2.0";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };

From d1f4bcd03f899dd57ed7636720d358c17addcf1f Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Wed, 10 Sep 2025 00:46:04 +0000
Subject: [PATCH 1755/6226] cudaPackages.libcutensor: 2.2.0 -> 2.3.1

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../manifests/cutensor/redistrib_2.2.0.json   | 29 ----------
 .../manifests/cutensor/redistrib_2.3.1.json   | 57 +++++++++++++++++++
 pkgs/top-level/cuda-packages.nix              |  8 +--
 3 files changed, 61 insertions(+), 33 deletions(-)
 delete mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cutensor/redistrib_2.2.0.json
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cutensor/redistrib_2.3.1.json

diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cutensor/redistrib_2.2.0.json b/pkgs/development/cuda-modules/_cuda/manifests/cutensor/redistrib_2.2.0.json
deleted file mode 100644
index fa14d26a4d48..000000000000
--- a/pkgs/development/cuda-modules/_cuda/manifests/cutensor/redistrib_2.2.0.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "release_date": "2025-03-13",
-    "release_label": "2.2.0",
-    "release_product": "cutensor",
-    "libcutensor": {
-        "name": "NVIDIA cuTENSOR",
-        "license": "cuTensor",
-        "license_path": "libcutensor/LICENSE.txt",
-        "version": "2.2.0.0",
-        "linux-x86_64": {
-            "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-2.2.0.0-archive.tar.xz",
-            "sha256": "db76dcbe997615ef8bc1e04c385e9a1e2016430afee7d6a242663baf17108dbf",
-            "md5": "48d7be41aa46cc1eb75b6603495a245e",
-            "size": "703852896"
-        },
-        "linux-sbsa": {
-            "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-2.2.0.0-archive.tar.xz",
-            "sha256": "484791c8967a4137c544304e7d475b1cd753d9aad5d835ae6794f68087b1175a",
-            "md5": "dc0032e78d875068424010abf1aef6f0",
-            "size": "694257044"
-        },
-        "windows-x86_64": {
-            "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-2.2.0.0-archive.zip",
-            "sha256": "b1f5c7b399f8124ccf70e4df751e43757b7727e1028ec04a27a4a63efff06885",
-            "md5": "db4563d3ee67f3bf6af4db31d326917d",
-            "size": "1288139786"
-        }
-    }
-}
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cutensor/redistrib_2.3.1.json b/pkgs/development/cuda-modules/_cuda/manifests/cutensor/redistrib_2.3.1.json
new file mode 100644
index 000000000000..2a00c57e23b0
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cutensor/redistrib_2.3.1.json
@@ -0,0 +1,57 @@
+{
+    "release_date": "2025-09-04",
+    "release_label": "2.3.1",
+    "release_product": "cutensor",
+    "libcutensor": {
+        "name": "NVIDIA cuTENSOR",
+        "license": "cuTensor",
+        "license_path": "libcutensor/LICENSE.txt",
+        "version": "2.3.1.0",
+        "linux-x86_64": {
+            "cuda12": {
+                "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-2.3.1.0_cuda12-archive.tar.xz",
+                "sha256": "b1d7ad37b24cd66a446ae76ac33bd5125aa58007a604cb64fc9c014a8d685940",
+                "md5": "061f0d50d4642431d284bdd8ad9c45a4",
+                "size": "428900080"
+            },
+            "cuda13": {
+                "relative_path": "libcutensor/linux-x86_64/libcutensor-linux-x86_64-2.3.1.0_cuda13-archive.tar.xz",
+                "sha256": "9cb1125f7de01ca319b5c72edeb7169b679b72beacc90354fb18a14056e24372",
+                "md5": "e94ea98ca6e88961a39d52da1c9470c7",
+                "size": "386539432"
+            }
+        },
+        "cuda_variant": [
+            "12",
+            "13"
+        ],
+        "linux-sbsa": {
+            "cuda12": {
+                "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-2.3.1.0_cuda12-archive.tar.xz",
+                "sha256": "f3763cdc7b03ca08e348efb6faa35d461537390ce7d059e279e415b33dad8291",
+                "md5": "048b99ec5a968df2dd2a3f6bd26d6f63",
+                "size": "427395404"
+            },
+            "cuda13": {
+                "relative_path": "libcutensor/linux-sbsa/libcutensor-linux-sbsa-2.3.1.0_cuda13-archive.tar.xz",
+                "sha256": "2e4c24bd1621dac7497ca9edf90bfc5dbdcc38490dafd35821066f96f2934aef",
+                "md5": "05e13cda907130e2f77cf86bba05fa11",
+                "size": "385157096"
+            }
+        },
+        "windows-x86_64": {
+            "cuda12": {
+                "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-2.3.1.0_cuda12-archive.zip",
+                "sha256": "8df4c1b856c40e72f41d5b92efee5729bf11f00a0e1e3afd546b0d35a360a6cb",
+                "md5": "3aae5e991b780b9c484a4f77883c84f8",
+                "size": "218109706"
+            },
+            "cuda13": {
+                "relative_path": "libcutensor/windows-x86_64/libcutensor-windows-x86_64-2.3.1.0_cuda13-archive.zip",
+                "sha256": "8f933694164e310183fffa9cf27d4db43b6edb0fff53b5aa0ab23e705807ac12",
+                "md5": "d4a958abf9ba2f10234364a37302e1ee",
+                "size": "150006958"
+            }
+        }
+    }
+}
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index 7c46438bd2ba..8ca8bbca41c3 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -28,7 +28,7 @@ in
       cuda = "12.6.3";
       cudnn = "9.13.0";
       cusparselt = "0.6.3";
-      cutensor = "2.2.0";
+      cutensor = "2.3.1";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
   };
@@ -38,7 +38,7 @@ in
       cuda = "12.8.1";
       cudnn = "9.13.0";
       cusparselt = "0.8.1";
-      cutensor = "2.2.0";
+      cutensor = "2.3.1";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
   };
@@ -48,7 +48,7 @@ in
       cuda = "12.9.1";
       cudnn = "9.13.0";
       cusparselt = "0.8.1";
-      cutensor = "2.2.0";
+      cutensor = "2.3.1";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
   };
@@ -58,7 +58,7 @@ in
       cuda = "13.0.2";
       cudnn = "9.13.0";
       cusparselt = "0.8.1";
-      cutensor = "2.2.0";
+      cutensor = "2.3.1";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
   };

From a094eed596891f4feba0e2b15628ca6abd3a3c77 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 17:11:20 +0000
Subject: [PATCH 1756/6226] cudaPackages.cublasmp: init at 0.6.0

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../_cuda/manifests/cublasmp/README.md        |  5 +++
 .../manifests/cublasmp/redistrib_0.6.0.json   | 43 +++++++++++++++++++
 .../cuda-modules/packages/libcublasmp.nix     | 38 ++++++++++++++++
 pkgs/top-level/cuda-packages.nix              |  4 ++
 4 files changed, 90 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cublasmp/README.md
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cublasmp/redistrib_0.6.0.json
 create mode 100644 pkgs/development/cuda-modules/packages/libcublasmp.nix

diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cublasmp/README.md b/pkgs/development/cuda-modules/_cuda/manifests/cublasmp/README.md
new file mode 100644
index 000000000000..de9d7fcd41c2
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cublasmp/README.md
@@ -0,0 +1,5 @@
+# cublasmp
+
+Link: <https://developer.download.nvidia.com/compute/cublasmp/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/cublasmp/getting_started/index.html#hardware-and-software-requirements>
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cublasmp/redistrib_0.6.0.json b/pkgs/development/cuda-modules/_cuda/manifests/cublasmp/redistrib_0.6.0.json
new file mode 100644
index 000000000000..f3c90fe91791
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cublasmp/redistrib_0.6.0.json
@@ -0,0 +1,43 @@
+{
+    "release_date": "2025-09-09",
+    "release_label": "0.6.0",
+    "release_product": "cublasmp",
+    "libcublasmp": {
+        "name": "NVIDIA cuBLASMp library",
+        "license": "cuBLASMp library",
+        "license_path": "libcublasmp/LICENSE.txt",
+        "version": "0.6.0.84",
+        "linux-x86_64": {
+            "cuda12": {
+                "relative_path": "libcublasmp/linux-x86_64/libcublasmp-linux-x86_64-0.6.0.84_cuda12-archive.tar.xz",
+                "sha256": "214a439031cc53be7d02961651e5e6ee520d80ab09b772d5a470e678477a6c57",
+                "md5": "2a6a91fd58b90a16a1c2b3c3e4d2bdce",
+                "size": "4324732"
+            },
+            "cuda13": {
+                "relative_path": "libcublasmp/linux-x86_64/libcublasmp-linux-x86_64-0.6.0.84_cuda13-archive.tar.xz",
+                "sha256": "f3892486ac72649ab5e140fd1466421e5638ce23a56a5360a42f32450fcfbf83",
+                "md5": "b3f96dce5e52f432a36e0a6a006f6b27",
+                "size": "4815848"
+            }
+        },
+        "cuda_variant": [
+            "12",
+            "13"
+        ],
+        "linux-sbsa": {
+            "cuda12": {
+                "relative_path": "libcublasmp/linux-sbsa/libcublasmp-linux-sbsa-0.6.0.84_cuda12-archive.tar.xz",
+                "sha256": "6af07f02ed01eee761509ad5c733a7196520f09ce036d5d047f38a1768287080",
+                "md5": "f6efeba7b2e1ae8b164a69f208c5a53b",
+                "size": "4273376"
+            },
+            "cuda13": {
+                "relative_path": "libcublasmp/linux-sbsa/libcublasmp-linux-sbsa-0.6.0.84_cuda13-archive.tar.xz",
+                "sha256": "9c3ea75c2a2705cb415d37316a6f540dbeb021ac3dc7bf0404dac314eb098aa0",
+                "md5": "35bac35e00eb29a86e54bb4fb703d258",
+                "size": "4751836"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/packages/libcublasmp.nix b/pkgs/development/cuda-modules/packages/libcublasmp.nix
new file mode 100644
index 000000000000..92130c135a06
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcublasmp.nix
@@ -0,0 +1,38 @@
+{
+  _cuda,
+  buildRedist,
+  libcublas,
+  nvshmem ? null, # TODO(@connorbaker): package this
+}:
+buildRedist {
+  redistName = "cublasmp";
+  pname = "libcublasmp";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  # TODO: Looks like the minimum supported capability is 7.0 as of the latest:
+  # https://docs.nvidia.com/cuda/cublasmp/getting_started/index.html
+  buildInputs = [
+    libcublas
+  ];
+
+  platformAssertions = _cuda.lib._mkMissingPackagesAssertions { inherit nvshmem; };
+
+  meta = {
+    description = "High-performance, multi-process, GPU-accelerated library for distributed basic dense linear algebra";
+    longDescription = ''
+      NVIDIA cuBLASMp is a high-performance, multi-process, GPU-accelerated library for distributed basic dense linear
+      algebra.
+
+      cuBLASMp is compatible with 2D block-cyclic data layout and provides PBLAS-like C APIs.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/cublasmp";
+    changelog = "https://docs.nvidia.com/cuda/cublasmp/release_notes";
+    license = _cuda.lib.licenses.math_sdk_sla;
+  };
+}
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index 8ca8bbca41c3..7c18919d703e 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -25,6 +25,7 @@ in
 {
   cudaPackages_12_6 = callPackage ../development/cuda-modules {
     manifests = selectManifests {
+      cublasmp = "0.6.0";
       cuda = "12.6.3";
       cudnn = "9.13.0";
       cusparselt = "0.6.3";
@@ -35,6 +36,7 @@ in
 
   cudaPackages_12_8 = callPackage ../development/cuda-modules {
     manifests = selectManifests {
+      cublasmp = "0.6.0";
       cuda = "12.8.1";
       cudnn = "9.13.0";
       cusparselt = "0.8.1";
@@ -45,6 +47,7 @@ in
 
   cudaPackages_12_9 = callPackage ../development/cuda-modules {
     manifests = selectManifests {
+      cublasmp = "0.6.0";
       cuda = "12.9.1";
       cudnn = "9.13.0";
       cusparselt = "0.8.1";
@@ -55,6 +58,7 @@ in
 
   cudaPackages_13_0 = callPackage ../development/cuda-modules {
     manifests = selectManifests {
+      cublasmp = "0.6.0";
       cuda = "13.0.2";
       cudnn = "9.13.0";
       cusparselt = "0.8.1";

From f3ceb798536023105280e51bf710c4666798bc0d Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 17:12:24 +0000
Subject: [PATCH 1757/6226] cudaPackages.nvpl: init at 25.5

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../_cuda/manifests/nvpl/README.md            |   5 +
 .../_cuda/manifests/nvpl/redistrib_25.5.json  | 101 ++++++++++++++++++
 .../cuda-modules/packages/nvpl_blas.nix       |  18 ++++
 .../cuda-modules/packages/nvpl_common.nix     |  16 +++
 .../cuda-modules/packages/nvpl_fft.nix        |  18 ++++
 .../cuda-modules/packages/nvpl_lapack.nix     |  20 ++++
 .../cuda-modules/packages/nvpl_rand.nix       |  18 ++++
 .../cuda-modules/packages/nvpl_scalapack.nix  |  18 ++++
 .../cuda-modules/packages/nvpl_sparse.nix     |  19 ++++
 .../cuda-modules/packages/nvpl_tensor.nix     |  20 ++++
 pkgs/top-level/cuda-packages.nix              |   4 +
 11 files changed, 257 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/nvpl/README.md
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/nvpl/redistrib_25.5.json
 create mode 100644 pkgs/development/cuda-modules/packages/nvpl_blas.nix
 create mode 100644 pkgs/development/cuda-modules/packages/nvpl_common.nix
 create mode 100644 pkgs/development/cuda-modules/packages/nvpl_fft.nix
 create mode 100644 pkgs/development/cuda-modules/packages/nvpl_lapack.nix
 create mode 100644 pkgs/development/cuda-modules/packages/nvpl_rand.nix
 create mode 100644 pkgs/development/cuda-modules/packages/nvpl_scalapack.nix
 create mode 100644 pkgs/development/cuda-modules/packages/nvpl_sparse.nix
 create mode 100644 pkgs/development/cuda-modules/packages/nvpl_tensor.nix

diff --git a/pkgs/development/cuda-modules/_cuda/manifests/nvpl/README.md b/pkgs/development/cuda-modules/_cuda/manifests/nvpl/README.md
new file mode 100644
index 000000000000..1a338d1c2461
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/nvpl/README.md
@@ -0,0 +1,5 @@
+# nvpl
+
+Link: <https://developer.download.nvidia.com/compute/nvpl/redist/>
+
+Requirements: <https://docs.nvidia.com/nvpl/latest/introduction.html>
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/nvpl/redistrib_25.5.json b/pkgs/development/cuda-modules/_cuda/manifests/nvpl/redistrib_25.5.json
new file mode 100644
index 000000000000..d7739f946a1c
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/nvpl/redistrib_25.5.json
@@ -0,0 +1,101 @@
+{
+    "release_date": "2025-05-28",
+    "release_label": "25.5",
+    "release_product": "nvpl",
+    "nvpl_blas": {
+        "name": "NVPL BLAS",
+        "license": "NVPL",
+        "license_path": "nvpl_blas/LICENSE.txt",
+        "version": "0.4.1.1",
+        "linux-sbsa": {
+            "relative_path": "nvpl_blas/linux-sbsa/nvpl_blas-linux-sbsa-0.4.1.1-archive.tar.xz",
+            "sha256": "57704e2e211999c899bca26346b946b881b609554914245131b390410f7b93e8",
+            "md5": "9e2a95925dcb4bbe0ac337550f317272",
+            "size": "773716"
+        }
+    },
+    "nvpl_common": {
+        "name": "NVPL Common",
+        "license": "NVPL",
+        "license_path": "nvpl_common/LICENSE.txt",
+        "version": "0.3.3",
+        "linux-sbsa": {
+            "relative_path": "nvpl_common/linux-sbsa/nvpl_common-linux-sbsa-0.3.3-archive.tar.xz",
+            "sha256": "fe87ccd63817427c6c9b9e292447a4e8f256b9c9157065fba1a338719fa433c8",
+            "md5": "9ae9f3253461a0565bc3c01a07c50fe3",
+            "size": "9444"
+        }
+    },
+    "nvpl_fft": {
+        "name": "NVPL FFT",
+        "license": "NVPL",
+        "license_path": "nvpl_fft/LICENSE.txt",
+        "version": "0.4.2.1",
+        "linux-sbsa": {
+            "relative_path": "nvpl_fft/linux-sbsa/nvpl_fft-linux-sbsa-0.4.2.1-archive.tar.xz",
+            "sha256": "ebb9d98abc23ddee5c492e0bbf2c534570a38d7df1863a0630da2c6d7f5cca3d",
+            "md5": "211ec34eef6b023f7af8e1fc40ae4ad1",
+            "size": "24974464"
+        }
+    },
+    "nvpl_lapack": {
+        "name": "NVPL LAPACK",
+        "license": "NVPL",
+        "license_path": "nvpl_lapack/LICENSE.txt",
+        "version": "0.3.1.1",
+        "linux-sbsa": {
+            "relative_path": "nvpl_lapack/linux-sbsa/nvpl_lapack-linux-sbsa-0.3.1.1-archive.tar.xz",
+            "sha256": "f5b916aa36a8549946fc2262acebb082fe8c463bd1523a3c0cc2c93527231653",
+            "md5": "ec0616b0be4616ac7050807a872343a2",
+            "size": "4781368"
+        }
+    },
+    "nvpl_rand": {
+        "name": "NVPL RAND",
+        "license": "NVPL",
+        "license_path": "nvpl_rand/LICENSE.txt",
+        "version": "0.5.2",
+        "linux-sbsa": {
+            "relative_path": "nvpl_rand/linux-sbsa/nvpl_rand-linux-sbsa-0.5.2-archive.tar.xz",
+            "sha256": "1eb5c2a5e98390b2bc76c3218837916df64d33cce220169811e14ecead36933f",
+            "md5": "fe72dcf4600cbd85f7249e95ebbcd363",
+            "size": "34025772"
+        }
+    },
+    "nvpl_scalapack": {
+        "name": "NVPL SCALAPACK",
+        "license": "NVPL",
+        "license_path": "nvpl_scalapack/LICENSE.txt",
+        "version": "0.2.2",
+        "linux-sbsa": {
+            "relative_path": "nvpl_scalapack/linux-sbsa/nvpl_scalapack-linux-sbsa-0.2.2-archive.tar.xz",
+            "sha256": "20cf6c54a0352f2fb0060e6f5ef6b892c5d07a242f8aab31cd9bbceb58a7bd11",
+            "md5": "8e3e728e8587cc4698beb2ab7ce162d6",
+            "size": "4647440"
+        }
+    },
+    "nvpl_sparse": {
+        "name": "NVPL SPARSE",
+        "license": "NVPL",
+        "license_path": "nvpl_sparse/LICENSE.txt",
+        "version": "0.4.1",
+        "linux-sbsa": {
+            "relative_path": "nvpl_sparse/linux-sbsa/nvpl_sparse-linux-sbsa-0.4.1-archive.tar.xz",
+            "sha256": "fda868fe6619e94463a93efed1958e67588c607c170a4c658103a24295855e19",
+            "md5": "851080b3e56db9bf6fa37cea198bcb33",
+            "size": "556932"
+        }
+    },
+    "nvpl_tensor": {
+        "name": "NVPL TENSOR",
+        "license": "NVPL",
+        "license_path": "nvpl_tensor/LICENSE.txt",
+        "version": "0.3.1",
+        "linux-sbsa": {
+            "relative_path": "nvpl_tensor/linux-sbsa/nvpl_tensor-linux-sbsa-0.3.1-archive.tar.xz",
+            "sha256": "12e9293609b3726cf9e92c648f117412a98a5e54700c877518ec2991e51ab50f",
+            "md5": "613b9a05d867667deae31bfea26688e8",
+            "size": "2338804"
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/packages/nvpl_blas.nix b/pkgs/development/cuda-modules/packages/nvpl_blas.nix
new file mode 100644
index 000000000000..94661a67067d
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvpl_blas.nix
@@ -0,0 +1,18 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "nvpl_blas";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  meta = {
+    description = "Part of NVIDIA Performance Libraries that provides standard Fortran 77 BLAS APIs as well as C (CBLAS)";
+    homepage = "https://developer.nvidia.com/nvpl";
+    changelog = "https://docs.nvidia.com/nvpl/latest/blas/release_notes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/nvpl_common.nix b/pkgs/development/cuda-modules/packages/nvpl_common.nix
new file mode 100644
index 000000000000..86330f5187ed
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvpl_common.nix
@@ -0,0 +1,16 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "nvpl_common";
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  meta = {
+    description = "Common part of NVIDIA Performance Libraries";
+    homepage = "https://developer.nvidia.com/nvpl";
+    changelog = "https://docs.nvidia.com/nvpl/latest/release_notes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/nvpl_fft.nix b/pkgs/development/cuda-modules/packages/nvpl_fft.nix
new file mode 100644
index 000000000000..30eb09ff9a11
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvpl_fft.nix
@@ -0,0 +1,18 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "nvpl_fft";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  meta = {
+    description = "Perform Fast Fourier Transform (FFT) calculations on ARM CPUs";
+    homepage = "https://developer.nvidia.com/nvpl";
+    changelog = "https://docs.nvidia.com/nvpl/latest/fft/release_notes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/nvpl_lapack.nix b/pkgs/development/cuda-modules/packages/nvpl_lapack.nix
new file mode 100644
index 000000000000..64637f45d9b5
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvpl_lapack.nix
@@ -0,0 +1,20 @@
+{ buildRedist, nvpl_blas }:
+buildRedist {
+  redistName = "cuda";
+  pname = "nvpl_lapack";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  buildInputs = [ nvpl_blas ];
+
+  meta = {
+    description = "Part of NVIDIA Performance Libraries that provides standard Fortran 90 LAPACK and LAPACKE APIs";
+    homepage = "https://developer.nvidia.com/nvpl";
+    changelog = "https://docs.nvidia.com/nvpl/latest/lapack/release_notes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/nvpl_rand.nix b/pkgs/development/cuda-modules/packages/nvpl_rand.nix
new file mode 100644
index 000000000000..f65e6f15f0ee
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvpl_rand.nix
@@ -0,0 +1,18 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "nvpl_rand";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  meta = {
+    description = "Collection of efficient pseudorandom and quasirandom number generators for ARM CPUs";
+    homepage = "https://developer.nvidia.com/nvpl";
+    changelog = "https://docs.nvidia.com/nvpl/latest/rand/release_notes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/nvpl_scalapack.nix b/pkgs/development/cuda-modules/packages/nvpl_scalapack.nix
new file mode 100644
index 000000000000..d9bf55082b6c
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvpl_scalapack.nix
@@ -0,0 +1,18 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "nvpl_scalapack";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  meta = {
+    description = "Provides an optimized implementation of ScaLAPACK for distributed-memory architectures";
+    homepage = "https://developer.nvidia.com/nvpl";
+    changelog = "https://docs.nvidia.com/nvpl/latest/scalapack/release_notes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/nvpl_sparse.nix b/pkgs/development/cuda-modules/packages/nvpl_sparse.nix
new file mode 100644
index 000000000000..3bd6985e66e0
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvpl_sparse.nix
@@ -0,0 +1,19 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "cuda";
+  pname = "nvpl_sparse";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+  ];
+
+  meta = {
+    description = "Provides a set of CPU-accelerated basic linear algebra subroutines used for handling sparse matrices";
+    homepage = "https://developer.nvidia.com/nvpl";
+    changelog = "https://docs.nvidia.com/nvpl/latest/sparse/release_notes.html";
+  };
+}
diff --git a/pkgs/development/cuda-modules/packages/nvpl_tensor.nix b/pkgs/development/cuda-modules/packages/nvpl_tensor.nix
new file mode 100644
index 000000000000..177c267465bd
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvpl_tensor.nix
@@ -0,0 +1,20 @@
+{ buildRedist, nvpl_blas }:
+buildRedist {
+  redistName = "cuda";
+  pname = "nvpl_tensor";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  buildInputs = [ nvpl_blas ];
+
+  meta = {
+    description = "Part of NVIDIA Performance Libraries that provides tensor primitives";
+    homepage = "https://developer.nvidia.com/nvpl";
+    changelog = "https://docs.nvidia.com/nvpl/latest/tensor/release_notes.html";
+  };
+}
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index 7c18919d703e..e6a4a3355e45 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -30,6 +30,7 @@ in
       cudnn = "9.13.0";
       cusparselt = "0.6.3";
       cutensor = "2.3.1";
+      nvpl = "25.5";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
   };
@@ -41,6 +42,7 @@ in
       cudnn = "9.13.0";
       cusparselt = "0.8.1";
       cutensor = "2.3.1";
+      nvpl = "25.5";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
   };
@@ -52,6 +54,7 @@ in
       cudnn = "9.13.0";
       cusparselt = "0.8.1";
       cutensor = "2.3.1";
+      nvpl = "25.5";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
   };
@@ -63,6 +66,7 @@ in
       cudnn = "9.13.0";
       cusparselt = "0.8.1";
       cutensor = "2.3.1";
+      nvpl = "25.5";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
   };

From 0d87dea8f24410e72c74226b5ad6544d87b5eb3b Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 17:13:26 +0000
Subject: [PATCH 1758/6226] cudaPackages.npp_plus: init at 0.10.0

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../_cuda/manifests/nppplus/README.md         |  5 ++
 .../manifests/nppplus/redistrib_0.10.0.json   | 71 +++++++++++++++++++
 .../cuda-modules/packages/libnpp_plus.nix     | 24 +++++++
 pkgs/top-level/cuda-packages.nix              |  4 ++
 4 files changed, 104 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/nppplus/README.md
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/nppplus/redistrib_0.10.0.json
 create mode 100644 pkgs/development/cuda-modules/packages/libnpp_plus.nix

diff --git a/pkgs/development/cuda-modules/_cuda/manifests/nppplus/README.md b/pkgs/development/cuda-modules/_cuda/manifests/nppplus/README.md
new file mode 100644
index 000000000000..15ca836ce534
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/nppplus/README.md
@@ -0,0 +1,5 @@
+# nppplus
+
+Link: <https://developer.download.nvidia.com/compute/nppplus/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/nppplus/>
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/nppplus/redistrib_0.10.0.json b/pkgs/development/cuda-modules/_cuda/manifests/nppplus/redistrib_0.10.0.json
new file mode 100644
index 000000000000..84c8b1a0d70d
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/nppplus/redistrib_0.10.0.json
@@ -0,0 +1,71 @@
+{
+    "release_date": "2025-04-18",
+    "release_label": "0.10.0",
+    "release_product": "nppplus",
+    "libnpp_plus": {
+        "name": "NVIDIA NPP PLUS library",
+        "license": "NPP PLUS library",
+        "license_path": "libnpp_plus/LICENSE.txt",
+        "version": "0.10.0.0",
+        "linux-x86_64": {
+            "cuda11": {
+                "relative_path": "libnpp_plus/linux-x86_64/libnpp_plus-linux-x86_64-0.10.0.0_cuda11-archive.tar.xz",
+                "sha256": "dfd0995068504ab9cd14767036680222f73d01a0e38ab9a53f9968d53f9745f7",
+                "md5": "210b430b3b047956a43564f6102664a1",
+                "size": "365025464"
+            },
+            "cuda12": {
+                "relative_path": "libnpp_plus/linux-x86_64/libnpp_plus-linux-x86_64-0.10.0.0_cuda12-archive.tar.xz",
+                "sha256": "0a2f1138b941160863eb1ec75a9f5072b330b234c287504bc5ca06130c5342b9",
+                "md5": "71c7a351c31df634bb9c504ff8d3f9c1",
+                "size": "365024708"
+            }
+        },
+        "cuda_variant": [
+            "11",
+            "12"
+        ],
+        "linux-sbsa": {
+            "cuda11": {
+                "relative_path": "libnpp_plus/linux-sbsa/libnpp_plus-linux-sbsa-0.10.0.0_cuda11-archive.tar.xz",
+                "sha256": "108a3126d07c7e4ce5ad0c85a9076bed6c2abeeec66b4c23a35d30d45ecf9110",
+                "md5": "461dbe9d9dbdf1ed68b688634a3aaafa",
+                "size": "363897792"
+            },
+            "cuda12": {
+                "relative_path": "libnpp_plus/linux-sbsa/libnpp_plus-linux-sbsa-0.10.0.0_cuda12-archive.tar.xz",
+                "sha256": "7aab2e7cab1fade883463bdb85a240f66d956395e3a90ca78b5bf413fa9a2fd9",
+                "md5": "f0b042171c6c0290a9afaf1a5766994b",
+                "size": "363891396"
+            }
+        },
+        "windows-x86_64": {
+            "cuda11": {
+                "relative_path": "libnpp_plus/windows-x86_64/libnpp_plus-windows-x86_64-0.10.0.0_cuda11-archive.zip",
+                "sha256": "333b9181526d8421b3445bc1c2b50ea8a0a8dd06412bf1c5dce3ed760659ec73",
+                "md5": "13d9f5a50932e3c457fec8f38e0b914b",
+                "size": "310918881"
+            },
+            "cuda12": {
+                "relative_path": "libnpp_plus/windows-x86_64/libnpp_plus-windows-x86_64-0.10.0.0_cuda12-archive.zip",
+                "sha256": "55f352478ce111187e2a1a2944f95eff009e156fc16793786f36ed6ed6e334d6",
+                "md5": "5142a28d82bc8470d7a7eea698b10f56",
+                "size": "310918881"
+            }
+        },
+        "linux-aarch64": {
+            "cuda11": {
+                "relative_path": "libnpp_plus/linux-aarch64/libnpp_plus-linux-aarch64-0.10.0.0_cuda11-archive.tar.xz",
+                "sha256": "fa09d1306eadd304913fa7e9904790e00c8acb05bdddd9832b2681d591449ecf",
+                "md5": "0263b51a2cf5ca3b23464dfe5a688044",
+                "size": "114297704"
+            },
+            "cuda12": {
+                "relative_path": "libnpp_plus/linux-aarch64/libnpp_plus-linux-aarch64-0.10.0.0_cuda12-archive.tar.xz",
+                "sha256": "570c4e0c871f9dd0a3e5959c1d144a53b232e8308b7d7f4d496df705f9aa2269",
+                "md5": "44b1e1f7d5671aa08276bcabbe1cc458",
+                "size": "114297660"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/packages/libnpp_plus.nix b/pkgs/development/cuda-modules/packages/libnpp_plus.nix
new file mode 100644
index 000000000000..44e905570472
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnpp_plus.nix
@@ -0,0 +1,24 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "nppplus";
+  pname = "libnpp_plus";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+    "stubs"
+  ];
+
+  meta = {
+    description = "C++ support for interfacing with the NVIDIA Performance Primitives (NPP) library";
+    longDescription = ''
+      NPP is a library of over 5,000 primitives for image and signal processing that lets you easily perform tasks
+      such as color conversion, image compression, filtering, thresholding, and image manipulation.
+    '';
+    homepage = "https://developer.nvidia.com/npp";
+    changelog = "https://docs.nvidia.com/cuda/nppplus/releasenotes";
+  };
+}
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index e6a4a3355e45..0e360dfad2c9 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -30,6 +30,7 @@ in
       cudnn = "9.13.0";
       cusparselt = "0.6.3";
       cutensor = "2.3.1";
+      nppplus = "0.10.0";
       nvpl = "25.5";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
@@ -42,6 +43,7 @@ in
       cudnn = "9.13.0";
       cusparselt = "0.8.1";
       cutensor = "2.3.1";
+      nppplus = "0.10.0";
       nvpl = "25.5";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
@@ -54,6 +56,7 @@ in
       cudnn = "9.13.0";
       cusparselt = "0.8.1";
       cutensor = "2.3.1";
+      nppplus = "0.10.0";
       nvpl = "25.5";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
@@ -66,6 +69,7 @@ in
       cudnn = "9.13.0";
       cusparselt = "0.8.1";
       cutensor = "2.3.1";
+      nppplus = "0.10.0";
       nvpl = "25.5";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };

From 7d7182b1fb3378ab8e57187c7a88687d9163f44f Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 17:14:06 +0000
Subject: [PATCH 1759/6226] cudaPackages.cudss: init at 0.6.0

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../_cuda/manifests/cudss/README.md           |  5 ++
 .../manifests/cudss/redistrib_0.6.0.json      | 46 +++++++++++++
 .../cuda-modules/packages/libcudss.nix        | 68 +++++++++++++++++++
 pkgs/top-level/cuda-packages.nix              |  4 ++
 4 files changed, 123 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cudss/README.md
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cudss/redistrib_0.6.0.json
 create mode 100644 pkgs/development/cuda-modules/packages/libcudss.nix

diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cudss/README.md b/pkgs/development/cuda-modules/_cuda/manifests/cudss/README.md
new file mode 100644
index 000000000000..95d44eaba298
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cudss/README.md
@@ -0,0 +1,5 @@
+# cudss
+
+Link: <https://developer.download.nvidia.com/compute/cudss/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/cudss/release_notes.html>
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cudss/redistrib_0.6.0.json b/pkgs/development/cuda-modules/_cuda/manifests/cudss/redistrib_0.6.0.json
new file mode 100644
index 000000000000..778d938e3db7
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cudss/redistrib_0.6.0.json
@@ -0,0 +1,46 @@
+{
+    "release_date": "2025-06-16",
+    "release_label": "0.6.0",
+    "release_product": "cudss",
+    "libcudss": {
+        "name": "NVIDIA cuDSS library",
+        "license": "cuDSS library",
+        "license_path": "libcudss/LICENSE.txt",
+        "version": "0.6.0.5",
+        "linux-x86_64": {
+            "cuda12": {
+                "relative_path": "libcudss/linux-x86_64/libcudss-linux-x86_64-0.6.0.5_cuda12-archive.tar.xz",
+                "sha256": "159ce1d4e3e4bba13b0bd15cf943e44b869c53b7a94f9bac980768c927f02e75",
+                "md5": "4ac17f5b35a4ecc550c4d7c479a5c5b5",
+                "size": "68957176"
+            }
+        },
+        "cuda_variant": [
+            "12"
+        ],
+        "linux-sbsa": {
+            "cuda12": {
+                "relative_path": "libcudss/linux-sbsa/libcudss-linux-sbsa-0.6.0.5_cuda12-archive.tar.xz",
+                "sha256": "b56cd0841c543bb81b2665063967f56cf3a3a22a445ddf1642c7f765f2059b42",
+                "md5": "490582492aceea286eb6d961d1a55beb",
+                "size": "68786208"
+            }
+        },
+        "windows-x86_64": {
+            "cuda12": {
+                "relative_path": "libcudss/windows-x86_64/libcudss-windows-x86_64-0.6.0.5_cuda12-archive.zip",
+                "sha256": "45319317d9f67fecc9af7e5cf162cb46111f5d35b06871c147fa8f030d7cecc5",
+                "md5": "c1036a4cbadc7b201e08acaac13fcac6",
+                "size": "50807624"
+            }
+        },
+        "linux-aarch64": {
+            "cuda12": {
+                "relative_path": "libcudss/linux-aarch64/libcudss-linux-aarch64-0.6.0.5_cuda12-archive.tar.xz",
+                "sha256": "e6f5d5122d735f9dbfd42c9eaba067a557a5613ee4a6001806935de11aff4b09",
+                "md5": "34fd4b0843da02ebaa76f5711e1b63de",
+                "size": "32347256"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/packages/libcudss.nix b/pkgs/development/cuda-modules/packages/libcudss.nix
new file mode 100644
index 000000000000..6dc547d592bd
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcudss.nix
@@ -0,0 +1,68 @@
+{
+  buildRedist,
+  lib,
+  libcublas,
+  mpi,
+  nccl,
+}:
+buildRedist {
+  redistName = "cudss";
+  pname = "libcudss";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+  ];
+
+  buildInputs = [
+    libcublas
+  ]
+  # MPI brings in NCCL dependency by way of UCC/UCX.
+  ++ lib.optionals nccl.meta.available [
+    mpi
+    nccl
+  ];
+
+  # Update the CMake configurations
+  postFixup = ''
+    pushd "''${!outputDev:?}/lib/cmake/cudss" >/dev/null
+
+    nixLog "patching $PWD/cudss-config.cmake to fix relative paths"
+    substituteInPlace "$PWD/cudss-config.cmake" \
+      --replace-fail \
+        'get_filename_component(PACKAGE_PREFIX_DIR "''${CMAKE_CURRENT_LIST_DIR}/../../../../" ABSOLUTE)' \
+        "" \
+      --replace-fail \
+        'file(REAL_PATH "../../" _cudss_search_prefix BASE_DIRECTORY "''${_cudss_cmake_config_realpath}")' \
+        "set(_cudss_search_prefix \"''${!outputDev:?}/lib;''${!outputLib:?}/lib;''${!outputInclude:?}/include\")"
+
+    nixLog "patching $PWD/cudss-static-targets.cmake to fix INTERFACE_LINK_DIRECTORIES for cublas"
+    sed -Ei \
+      's|INTERFACE_LINK_DIRECTORIES "/usr/local/cuda.*/lib64"|INTERFACE_LINK_DIRECTORIES "${lib.getLib libcublas}/lib"|g' \
+      "$PWD/cudss-static-targets.cmake"
+    if grep -Eq 'INTERFACE_LINK_DIRECTORIES "/usr/local/cuda.*/lib64"' "$PWD/cudss-static-targets.cmake"; then
+      nixErrorLog "failed to patch $PWD/cudss-static-targets.cmake"
+      exit 1
+    fi
+
+    nixLog "patching $PWD/cudss-static-targets-release.cmake to fix the path to the static library"
+    substituteInPlace "$PWD/cudss-static-targets-release.cmake" \
+      --replace-fail \
+        '"''${cudss_LIBRARY_DIR}/libcudss_static.a"' \
+        "\"''${!outputStatic:?}/lib/libcudss_static.a\""
+
+    popd >/dev/null
+  '';
+
+  meta = {
+    description = "Library of GPU-accelerated linear solvers with sparse matrices";
+    longDescription = ''
+      NVIDIA cuDSS (Preview) is a library of GPU-accelerated linear solvers with sparse matrices.
+    '';
+    homepage = "https://developer.nvidia.com/cudss";
+    changelog = "https://docs.nvidia.com/cuda/cudss/release_notes.html";
+  };
+}
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index 0e360dfad2c9..e0343c662839 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -28,6 +28,7 @@ in
       cublasmp = "0.6.0";
       cuda = "12.6.3";
       cudnn = "9.13.0";
+      cudss = "0.6.0";
       cusparselt = "0.6.3";
       cutensor = "2.3.1";
       nppplus = "0.10.0";
@@ -41,6 +42,7 @@ in
       cublasmp = "0.6.0";
       cuda = "12.8.1";
       cudnn = "9.13.0";
+      cudss = "0.6.0";
       cusparselt = "0.8.1";
       cutensor = "2.3.1";
       nppplus = "0.10.0";
@@ -54,6 +56,7 @@ in
       cublasmp = "0.6.0";
       cuda = "12.9.1";
       cudnn = "9.13.0";
+      cudss = "0.6.0";
       cusparselt = "0.8.1";
       cutensor = "2.3.1";
       nppplus = "0.10.0";
@@ -67,6 +70,7 @@ in
       cublasmp = "0.6.0";
       cuda = "13.0.2";
       cudnn = "9.13.0";
+      cudss = "0.6.0";
       cusparselt = "0.8.1";
       cutensor = "2.3.1";
       nppplus = "0.10.0";

From 51df369461246392638e74eaec3925a089e06def Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 17:15:03 +0000
Subject: [PATCH 1760/6226] cudaPackages.cuquantum: init at 25.09.0

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../_cuda/manifests/cuquantum/README.md       |  5 +++
 .../cuquantum/redistrib_25.09.0.json          | 43 +++++++++++++++++++
 .../cuda-modules/packages/cuquantum.nix       | 41 ++++++++++++++++++
 pkgs/top-level/cuda-packages.nix              |  4 ++
 4 files changed, 93 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cuquantum/README.md
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cuquantum/redistrib_25.09.0.json
 create mode 100644 pkgs/development/cuda-modules/packages/cuquantum.nix

diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cuquantum/README.md b/pkgs/development/cuda-modules/_cuda/manifests/cuquantum/README.md
new file mode 100644
index 000000000000..e9601dcb9d9c
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cuquantum/README.md
@@ -0,0 +1,5 @@
+# cuquantum
+
+Link: <https://developer.download.nvidia.com/compute/cuquantum/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/cuquantum/latest/getting-started/index.html#dependencies>
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cuquantum/redistrib_25.09.0.json b/pkgs/development/cuda-modules/_cuda/manifests/cuquantum/redistrib_25.09.0.json
new file mode 100644
index 000000000000..a66a8c10a557
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cuquantum/redistrib_25.09.0.json
@@ -0,0 +1,43 @@
+{
+    "release_date": "2025-09-08",
+    "release_label": "25.09.0",
+    "release_product": "cuquantum",
+    "cuquantum": {
+        "name": "NVIDIA cuQuantum",
+        "license": "cuQuantum",
+        "license_path": "cuquantum/LICENSE.txt",
+        "version": "25.09.0.7",
+        "linux-x86_64": {
+            "cuda12": {
+                "relative_path": "cuquantum/linux-x86_64/cuquantum-linux-x86_64-25.09.0.7_cuda12-archive.tar.xz",
+                "sha256": "fec8fcceeb9b62f2dff37834a9cd44c6ab05486dec0ebc5ae3452dd8d6390ea0",
+                "md5": "b57e63b14a2a83115fc11ebb0fa93f61",
+                "size": "115548260"
+            },
+            "cuda13": {
+                "relative_path": "cuquantum/linux-x86_64/cuquantum-linux-x86_64-25.09.0.7_cuda13-archive.tar.xz",
+                "sha256": "3f1e706c0ee582341ec4f103d37c92d90ef16d1cfac42f502c44b2feb6861dd9",
+                "md5": "9e11c71d25231c962b8df11adb4e570b",
+                "size": "119378588"
+            }
+        },
+        "cuda_variant": [
+            "12",
+            "13"
+        ],
+        "linux-sbsa": {
+            "cuda12": {
+                "relative_path": "cuquantum/linux-sbsa/cuquantum-linux-sbsa-25.09.0.7_cuda12-archive.tar.xz",
+                "sha256": "b63237e122a32f2576118297c291597815c9c3573daf5c9b4592ada7af13fc17",
+                "md5": "5b7d6dcf44d2e80eb155a22574b71b3a",
+                "size": "115171716"
+            },
+            "cuda13": {
+                "relative_path": "cuquantum/linux-sbsa/cuquantum-linux-sbsa-25.09.0.7_cuda13-archive.tar.xz",
+                "sha256": "629d3e6749ac49e96de4469477d3b0172581896c7273890bc355420b344fac87",
+                "md5": "624ddcbf89311a43f2d7fb6671e37c6b",
+                "size": "119179132"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/packages/cuquantum.nix b/pkgs/development/cuda-modules/packages/cuquantum.nix
new file mode 100644
index 000000000000..eec280fedb07
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cuquantum.nix
@@ -0,0 +1,41 @@
+{
+  buildRedist,
+  cuda_cudart,
+  cuda_nvml_dev,
+  lib,
+  libcublas,
+  libcurand,
+  libcusolver,
+  libcutensor,
+}:
+buildRedist {
+  redistName = "cuquantum";
+  pname = "cuquantum";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+  ];
+
+  buildInputs = [
+    cuda_cudart
+    (lib.getOutput "stubs" cuda_nvml_dev) # for libnvidia-ml.so
+    libcublas
+    libcurand
+    libcusolver
+    libcutensor
+  ];
+
+  meta = {
+    description = "Set of high-performance libraries and tools for accelerating quantum computing simulations at both the circuit and device level by orders of magnitude";
+    longDescription = ''
+      NVIDIA cuQuantum SDK is a set of high-performance libraries and tools for accelerating quantum computing
+      simulations at both the circuit and device level by orders of magnitude.
+    '';
+    homepage = "https://developer.nvidia.com/cuquantum-sdk";
+    changelog = "https://docs.nvidia.com/cuda/cuquantum/latest/cuquantum-sdk-release-notes.html";
+  };
+}
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index e0343c662839..58c06dc2155e 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -29,6 +29,7 @@ in
       cuda = "12.6.3";
       cudnn = "9.13.0";
       cudss = "0.6.0";
+      cuquantum = "25.09.0";
       cusparselt = "0.6.3";
       cutensor = "2.3.1";
       nppplus = "0.10.0";
@@ -43,6 +44,7 @@ in
       cuda = "12.8.1";
       cudnn = "9.13.0";
       cudss = "0.6.0";
+      cuquantum = "25.09.0";
       cusparselt = "0.8.1";
       cutensor = "2.3.1";
       nppplus = "0.10.0";
@@ -57,6 +59,7 @@ in
       cuda = "12.9.1";
       cudnn = "9.13.0";
       cudss = "0.6.0";
+      cuquantum = "25.09.0";
       cusparselt = "0.8.1";
       cutensor = "2.3.1";
       nppplus = "0.10.0";
@@ -71,6 +74,7 @@ in
       cuda = "13.0.2";
       cudnn = "9.13.0";
       cudss = "0.6.0";
+      cuquantum = "25.09.0";
       cusparselt = "0.8.1";
       cutensor = "2.3.1";
       nppplus = "0.10.0";

From d6b2dbb9b057120dd1fe406c4654ad4efc97b71d Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 17:15:43 +0000
Subject: [PATCH 1761/6226] cudaPackages.cusolvermp: init at 0.7.0

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../_cuda/manifests/cusolvermp/README.md      |  5 +++
 .../manifests/cusolvermp/redistrib_0.7.0.json | 43 +++++++++++++++++++
 .../cuda-modules/packages/libcusolvermp.nix   | 35 +++++++++++++++
 pkgs/top-level/cuda-packages.nix              |  4 ++
 4 files changed, 87 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cusolvermp/README.md
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/cusolvermp/redistrib_0.7.0.json
 create mode 100644 pkgs/development/cuda-modules/packages/libcusolvermp.nix

diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cusolvermp/README.md b/pkgs/development/cuda-modules/_cuda/manifests/cusolvermp/README.md
new file mode 100644
index 000000000000..a142f245fe06
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cusolvermp/README.md
@@ -0,0 +1,5 @@
+# cusolvermp
+
+Link: <https://developer.download.nvidia.com/compute/cusolvermp/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/cusolvermp/getting_started/index.html#hardware-and-software-requirements>
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/cusolvermp/redistrib_0.7.0.json b/pkgs/development/cuda-modules/_cuda/manifests/cusolvermp/redistrib_0.7.0.json
new file mode 100644
index 000000000000..8181beabbec6
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/cusolvermp/redistrib_0.7.0.json
@@ -0,0 +1,43 @@
+{
+    "release_date": "2025-08-12",
+    "release_label": "0.7.0",
+    "release_product": "cusolvermp",
+    "libcusolvermp": {
+        "name": "NVIDIA libcusolvermp library",
+        "license": "libcusolvermp library",
+        "license_path": "libcusolvermp/LICENSE.txt",
+        "version": "0.7.0.833",
+        "linux-x86_64": {
+            "cuda12": {
+                "relative_path": "libcusolvermp/linux-x86_64/libcusolvermp-linux-x86_64-0.7.0.833_cuda12-archive.tar.xz",
+                "sha256": "5383f35eefd45cc0a5cbd173a4a353941f02b912eb2f8d3a85c30345054df5e9",
+                "md5": "f9cf72595e8ff6d72a68b4a23ccc9973",
+                "size": "9293812"
+            },
+            "cuda13": {
+                "relative_path": "libcusolvermp/linux-x86_64/libcusolvermp-linux-x86_64-0.7.0.833_cuda13-archive.tar.xz",
+                "sha256": "4a4bf2d08dad3a276b33f9356f8cd8b5b2a70201257a277c83bb3cfdb7a7107a",
+                "md5": "a95c2c6a6f8d9c07ee99ca1545a71967",
+                "size": "8014464"
+            }
+        },
+        "cuda_variant": [
+            "12",
+            "13"
+        ],
+        "linux-sbsa": {
+            "cuda12": {
+                "relative_path": "libcusolvermp/linux-sbsa/libcusolvermp-linux-sbsa-0.7.0.833_cuda12-archive.tar.xz",
+                "sha256": "a0012c5be7ac742a26cf8894bed3c703edea84eddf0d5dca42d35582622ffb9b",
+                "md5": "626c1e35145fa495a7708c5fff007866",
+                "size": "9214676"
+            },
+            "cuda13": {
+                "relative_path": "libcusolvermp/linux-sbsa/libcusolvermp-linux-sbsa-0.7.0.833_cuda13-archive.tar.xz",
+                "sha256": "51b80fc5cdeb197b3e9b1de393a8413943ccb2d0e7509c6a183816be83123260",
+                "md5": "6338b4e581a076214581ec650f9eb92e",
+                "size": "7605548"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/packages/libcusolvermp.nix b/pkgs/development/cuda-modules/packages/libcusolvermp.nix
new file mode 100644
index 000000000000..eb18e2cb7b25
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libcusolvermp.nix
@@ -0,0 +1,35 @@
+{
+  _cuda,
+  buildRedist,
+  cuda_cudart,
+  libcublas,
+  libcusolver,
+  nccl,
+}:
+buildRedist {
+  redistName = "cusolvermp";
+  pname = "libcusolvermp";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+  ];
+
+  buildInputs = [
+    cuda_cudart
+    libcublas
+    libcusolver
+    nccl
+  ];
+
+  meta = {
+    description = "High-performance, distributed-memory, GPU-accelerated library that provides tools for solving dense linear systems and eigenvalue problems";
+    longDescription = ''
+      The NVIDIA cuSOLVERMp library is a high-performance, distributed-memory, GPU-accelerated library that provides
+      tools for solving dense linear systems and eigenvalue problems.
+    '';
+    homepage = "https://developer.nvidia.com/cusolver";
+  };
+}
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index 58c06dc2155e..3854f251a6c8 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -30,6 +30,7 @@ in
       cudnn = "9.13.0";
       cudss = "0.6.0";
       cuquantum = "25.09.0";
+      cusolvermp = "0.7.0";
       cusparselt = "0.6.3";
       cutensor = "2.3.1";
       nppplus = "0.10.0";
@@ -45,6 +46,7 @@ in
       cudnn = "9.13.0";
       cudss = "0.6.0";
       cuquantum = "25.09.0";
+      cusolvermp = "0.7.0";
       cusparselt = "0.8.1";
       cutensor = "2.3.1";
       nppplus = "0.10.0";
@@ -60,6 +62,7 @@ in
       cudnn = "9.13.0";
       cudss = "0.6.0";
       cuquantum = "25.09.0";
+      cusolvermp = "0.7.0";
       cusparselt = "0.8.1";
       cutensor = "2.3.1";
       nppplus = "0.10.0";
@@ -75,6 +78,7 @@ in
       cudnn = "9.13.0";
       cudss = "0.6.0";
       cuquantum = "25.09.0";
+      cusolvermp = "0.7.0";
       cusparselt = "0.8.1";
       cutensor = "2.3.1";
       nppplus = "0.10.0";

From f18468faf3d8e4f720155c849a74af39c9ad4a8a Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 17:16:25 +0000
Subject: [PATCH 1762/6226] cudaPackages.nvcomp: init at 5.0.0.6

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../_cuda/manifests/nvcomp/README.md          |  5 ++
 .../manifests/nvcomp/redistrib_5.0.0.6.json   | 76 +++++++++++++++++++
 .../cuda-modules/packages/nvcomp.nix          | 22 ++++++
 pkgs/top-level/cuda-packages.nix              |  4 +
 4 files changed, 107 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/nvcomp/README.md
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/nvcomp/redistrib_5.0.0.6.json
 create mode 100644 pkgs/development/cuda-modules/packages/nvcomp.nix

diff --git a/pkgs/development/cuda-modules/_cuda/manifests/nvcomp/README.md b/pkgs/development/cuda-modules/_cuda/manifests/nvcomp/README.md
new file mode 100644
index 000000000000..51bf4844fe93
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/nvcomp/README.md
@@ -0,0 +1,5 @@
+# nvcomp
+
+Link: <https://developer.download.nvidia.com/compute/nvcomp/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/nvcomp/installation.html>
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/nvcomp/redistrib_5.0.0.6.json b/pkgs/development/cuda-modules/_cuda/manifests/nvcomp/redistrib_5.0.0.6.json
new file mode 100644
index 000000000000..d5976c02450a
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/nvcomp/redistrib_5.0.0.6.json
@@ -0,0 +1,76 @@
+{
+    "release_date": "2025-08-04",
+    "release_label": "5.0.0.6",
+    "release_product": "nvcomp",
+    "nvcomp": {
+        "name": "NVIDIA nvCOMP library",
+        "license": "nvCOMP library",
+        "license_path": "nvcomp/LICENSE.txt",
+        "version": "5.0.0.6",
+        "linux-x86_64": {
+            "cuda11": {
+                "relative_path": "nvcomp/linux-x86_64/nvcomp-linux-x86_64-5.0.0.6_cuda11-archive.tar.xz",
+                "sha256": "64f5f7cc622f36006c503ee5a3f9d730b5c6cc49e4fab0fc0507c1272d5efa7b",
+                "md5": "e7fcc75a1ed5c056211948c896dccf62",
+                "size": "21128508"
+            },
+            "cuda12": {
+                "relative_path": "nvcomp/linux-x86_64/nvcomp-linux-x86_64-5.0.0.6_cuda12-archive.tar.xz",
+                "sha256": "40ac1d5f8c0a2719f11b21a4d31b6050343607dffd1401d1fe9a154800b56e46",
+                "md5": "58436c6eb41b7a317ddf9131bfe7f92b",
+                "size": "40211608"
+            },
+            "cuda13": {
+                "relative_path": "nvcomp/linux-x86_64/nvcomp-linux-x86_64-5.0.0.6_cuda13-archive.tar.xz",
+                "sha256": "4166e7c3825fa90139d50042154438ba06ea493985aeb7968fc1ad0d5fa5a22a",
+                "md5": "abb06ec210645ce491d66fdf26f89a35",
+                "size": "37072544"
+            }
+        },
+        "cuda_variant": [
+            "11",
+            "12",
+            "13"
+        ],
+        "linux-sbsa": {
+            "cuda11": {
+                "relative_path": "nvcomp/linux-sbsa/nvcomp-linux-sbsa-5.0.0.6_cuda11-archive.tar.xz",
+                "sha256": "e98a20570e56ad94709c5014960c9f1fa9b4b5a7eb132dede85dd8ffd6c5f3f8",
+                "md5": "d80c48f270668e50e61e718b13643080",
+                "size": "21312128"
+            },
+            "cuda12": {
+                "relative_path": "nvcomp/linux-sbsa/nvcomp-linux-sbsa-5.0.0.6_cuda12-archive.tar.xz",
+                "sha256": "e57e658e35f6b266399ca2286e9439e5e9c9f3db907a718c55a07e6338b1c5bf",
+                "md5": "a32f79f2cef263a7b304d681a3076af5",
+                "size": "40157632"
+            },
+            "cuda13": {
+                "relative_path": "nvcomp/linux-sbsa/nvcomp-linux-sbsa-5.0.0.6_cuda13-archive.tar.xz",
+                "sha256": "26f6189f302affba7a3df726164a809aa7a5118560283627bbaa9aaa860cbc96",
+                "md5": "57c04016e2506a63947e5ccedb3a0be3",
+                "size": "37327100"
+            }
+        },
+        "windows-x86_64": {
+            "cuda11": {
+                "relative_path": "nvcomp/windows-x86_64/nvcomp-windows-x86_64-5.0.0.6_cuda11-archive.zip",
+                "sha256": "5c2e1ee55398f47d28806eb7c53aca33b9e22d6d5b3acec86bbc4253c7e6d1d3",
+                "md5": "40e5c7250ad930aeb1e34d5e01f3ada1",
+                "size": "38916070"
+            },
+            "cuda12": {
+                "relative_path": "nvcomp/windows-x86_64/nvcomp-windows-x86_64-5.0.0.6_cuda12-archive.zip",
+                "sha256": "d851077cf6ebaea21a548c4e55db45f0dd45271e35e7cffda7dd9917603ab8d4",
+                "md5": "da94be1539cf0f709bf9cd2b6881ebd1",
+                "size": "61092352"
+            },
+            "cuda13": {
+                "relative_path": "nvcomp/windows-x86_64/nvcomp-windows-x86_64-5.0.0.6_cuda13-archive.zip",
+                "sha256": "d7d1397a438f6d16dbe9989a72ffcf9e7935f17c836316dd98403929c09c585a",
+                "md5": "b3195c7bbe9775a9ddcaea1c1f43664e",
+                "size": "43017930"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/packages/nvcomp.nix b/pkgs/development/cuda-modules/packages/nvcomp.nix
new file mode 100644
index 000000000000..eb5889c69d60
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/nvcomp.nix
@@ -0,0 +1,22 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "nvcomp";
+  pname = "nvcomp";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+  ];
+
+  meta = {
+    description = "High-speed data compression and decompression library optimized for NVIDIA GPUs";
+    longDescription = ''
+      NVIDIA nvCOMP is a high-speed data compression and decompression library optimized for NVIDIA GPUs.
+    '';
+    homepage = "https://developer.nvidia.com/nvcomp";
+    changelog = "https://docs.nvidia.com/cuda/nvcomp/release_notes.html";
+  };
+}
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index 3854f251a6c8..296ccba3c0b9 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -34,6 +34,7 @@ in
       cusparselt = "0.6.3";
       cutensor = "2.3.1";
       nppplus = "0.10.0";
+      nvcomp = "5.0.0.6";
       nvpl = "25.5";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
@@ -50,6 +51,7 @@ in
       cusparselt = "0.8.1";
       cutensor = "2.3.1";
       nppplus = "0.10.0";
+      nvcomp = "5.0.0.6";
       nvpl = "25.5";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
@@ -66,6 +68,7 @@ in
       cusparselt = "0.8.1";
       cutensor = "2.3.1";
       nppplus = "0.10.0";
+      nvcomp = "5.0.0.6";
       nvpl = "25.5";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
@@ -82,6 +85,7 @@ in
       cusparselt = "0.8.1";
       cutensor = "2.3.1";
       nppplus = "0.10.0";
+      nvcomp = "5.0.0.6";
       nvpl = "25.5";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };

From 36a8a15416e918d8bee6a963c622a5b7dfc38a9a Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 17:17:05 +0000
Subject: [PATCH 1763/6226] cudaPackages.libnvjpeg_2k: init at 0.9.0

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../_cuda/manifests/nvjpeg2000/README.md      |  5 +++
 .../manifests/nvjpeg2000/redistrib_0.9.0.json | 35 +++++++++++++++++++
 .../cuda-modules/packages/libnvjpeg_2k.nix    | 22 ++++++++++++
 pkgs/top-level/cuda-packages.nix              |  4 +++
 4 files changed, 66 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/nvjpeg2000/README.md
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/nvjpeg2000/redistrib_0.9.0.json
 create mode 100644 pkgs/development/cuda-modules/packages/libnvjpeg_2k.nix

diff --git a/pkgs/development/cuda-modules/_cuda/manifests/nvjpeg2000/README.md b/pkgs/development/cuda-modules/_cuda/manifests/nvjpeg2000/README.md
new file mode 100644
index 000000000000..5e5a9300ff9a
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/nvjpeg2000/README.md
@@ -0,0 +1,5 @@
+# nvjpeg2000
+
+Link: <https://developer.download.nvidia.com/compute/nvjpeg2000/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/nvjpeg2000/userguide.html#platforms-supported>
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/nvjpeg2000/redistrib_0.9.0.json b/pkgs/development/cuda-modules/_cuda/manifests/nvjpeg2000/redistrib_0.9.0.json
new file mode 100644
index 000000000000..a611460cba67
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/nvjpeg2000/redistrib_0.9.0.json
@@ -0,0 +1,35 @@
+{
+    "release_date": "2025-08-05",
+    "release_label": "0.9.0",
+    "release_product": "nvjpeg2000",
+    "libnvjpeg_2k": {
+        "name": "NVIDIA nvJPEG 2000",
+        "license": "nvJPEG 2K",
+        "license_path": "libnvjpeg_2k/LICENSE.txt",
+        "version": "0.9.0.43",
+        "linux-x86_64": {
+            "relative_path": "libnvjpeg_2k/linux-x86_64/libnvjpeg_2k-linux-x86_64-0.9.0.43-archive.tar.xz",
+            "sha256": "1d26f62a7141e81c604342a610deb8ad8d10e1c08cb59598881dc201e59f21a3",
+            "md5": "88e231d23f60bfc0effc871ccf465b3a",
+            "size": "15407304"
+        },
+        "linux-sbsa": {
+            "relative_path": "libnvjpeg_2k/linux-sbsa/libnvjpeg_2k-linux-sbsa-0.9.0.43-archive.tar.xz",
+            "sha256": "03e37b8e0f2d67a1ee376e6ac54fa9d62284bbdbf9edf90ea7d0a05b4c45bce1",
+            "md5": "1b6b06ec71a67e1a70b15e379cd8c9ca",
+            "size": "15432332"
+        },
+        "windows-x86_64": {
+            "relative_path": "libnvjpeg_2k/windows-x86_64/libnvjpeg_2k-windows-x86_64-0.9.0.43-archive.zip",
+            "sha256": "272d409945cd1c00beaa7f5d4c8197139aa32394358ea76d83f2cd2b51faf0c7",
+            "md5": "6828d19ce79b943705e22d5cd4dbe6c4",
+            "size": "14206962"
+        },
+        "linux-aarch64": {
+            "relative_path": "libnvjpeg_2k/linux-aarch64/libnvjpeg_2k-linux-aarch64-0.9.0.43-archive.tar.xz",
+            "sha256": "b2285c1da026bd189e837800da2a26cb75ce45ccb23ea7e6ee65114b3dcee66c",
+            "md5": "608ef4eb15da8fda26b5b649c340855d",
+            "size": "5384888"
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/packages/libnvjpeg_2k.nix b/pkgs/development/cuda-modules/packages/libnvjpeg_2k.nix
new file mode 100644
index 000000000000..b9250be6248b
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnvjpeg_2k.nix
@@ -0,0 +1,22 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "nvjpeg2000";
+  pname = "libnvjpeg_2k";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+  ];
+
+  meta = {
+    description = "Accelerates the decoding and encoding of JPEG2000 images on NVIDIA GPUs";
+    longDescription = ''
+      The nvJPEG2000 library accelerates the decoding and encoding of JPEG2000 images on NVIDIA GPUs.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/nvjpeg2000";
+    changelog = "https://docs.nvidia.com/cuda/nvjpeg2000/releasenotes.html";
+  };
+}
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index 296ccba3c0b9..f4aed78c5a9d 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -35,6 +35,7 @@ in
       cutensor = "2.3.1";
       nppplus = "0.10.0";
       nvcomp = "5.0.0.6";
+      nvjpeg2000 = "0.9.0";
       nvpl = "25.5";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
@@ -52,6 +53,7 @@ in
       cutensor = "2.3.1";
       nppplus = "0.10.0";
       nvcomp = "5.0.0.6";
+      nvjpeg2000 = "0.9.0";
       nvpl = "25.5";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
@@ -69,6 +71,7 @@ in
       cutensor = "2.3.1";
       nppplus = "0.10.0";
       nvcomp = "5.0.0.6";
+      nvjpeg2000 = "0.9.0";
       nvpl = "25.5";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
@@ -86,6 +89,7 @@ in
       cutensor = "2.3.1";
       nppplus = "0.10.0";
       nvcomp = "5.0.0.6";
+      nvjpeg2000 = "0.9.0";
       nvpl = "25.5";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };

From 3b17f672d26d9b28e08c992ba259af322ab25b24 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 17:22:15 +0000
Subject: [PATCH 1764/6226] cudaPackages.libnvtiff: init at 0.5.1

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../_cuda/manifests/nvtiff/README.md          |  5 +
 .../manifests/nvtiff/redistrib_0.5.1.json     | 96 +++++++++++++++++++
 .../cuda-modules/packages/libnvtiff.nix       | 22 +++++
 pkgs/top-level/cuda-packages.nix              |  4 +
 4 files changed, 127 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/nvtiff/README.md
 create mode 100644 pkgs/development/cuda-modules/_cuda/manifests/nvtiff/redistrib_0.5.1.json
 create mode 100644 pkgs/development/cuda-modules/packages/libnvtiff.nix

diff --git a/pkgs/development/cuda-modules/_cuda/manifests/nvtiff/README.md b/pkgs/development/cuda-modules/_cuda/manifests/nvtiff/README.md
new file mode 100644
index 000000000000..cda290cb2c4d
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/nvtiff/README.md
@@ -0,0 +1,5 @@
+# nvtiff
+
+Link: <https://developer.download.nvidia.com/compute/nvtiff/redist/>
+
+Requirements: <https://docs.nvidia.com/cuda/nvtiff/releasenotes.html>
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/nvtiff/redistrib_0.5.1.json b/pkgs/development/cuda-modules/_cuda/manifests/nvtiff/redistrib_0.5.1.json
new file mode 100644
index 000000000000..03e84ce292d4
--- /dev/null
+++ b/pkgs/development/cuda-modules/_cuda/manifests/nvtiff/redistrib_0.5.1.json
@@ -0,0 +1,96 @@
+{
+    "release_date": "2025-08-05",
+    "release_label": "0.5.1",
+    "release_product": "nvtiff",
+    "libnvtiff": {
+        "name": "NVIDIA nvTIFF",
+        "license": "nvTIFF",
+        "license_path": "libnvtiff/LICENSE.txt",
+        "version": "0.5.1.75",
+        "linux-x86_64": {
+            "cuda11": {
+                "relative_path": "libnvtiff/linux-x86_64/libnvtiff-linux-x86_64-0.5.1.75_cuda11-archive.tar.xz",
+                "sha256": "5adabfe9c4eac59916bfc464b7325866da99752ade30bbc3ddd3cd9c852f69e7",
+                "md5": "93e04a669a8dd4ff696950bac5e77e7d",
+                "size": "1332668"
+            },
+            "cuda12": {
+                "relative_path": "libnvtiff/linux-x86_64/libnvtiff-linux-x86_64-0.5.1.75_cuda12-archive.tar.xz",
+                "sha256": "1f97778f92c938f5174fda74a913370d4ff200d77809570cecdafcd8aaff84b6",
+                "md5": "1c8508be2791abbd5d78f059bbc3a2be",
+                "size": "1922764"
+            },
+            "cuda13": {
+                "relative_path": "libnvtiff/linux-x86_64/libnvtiff-linux-x86_64-0.5.1.75_cuda13-archive.tar.xz",
+                "sha256": "5d63be4128daf28676ae01a81d2e69f828d2e7eda332c039079ff57b42915d20",
+                "md5": "0aa016e6e9d70866dae1367ee5d8731a",
+                "size": "1498124"
+            }
+        },
+        "cuda_variant": [
+            "11",
+            "12",
+            "13"
+        ],
+        "linux-sbsa": {
+            "cuda11": {
+                "relative_path": "libnvtiff/linux-sbsa/libnvtiff-linux-sbsa-0.5.1.75_cuda11-archive.tar.xz",
+                "sha256": "9274e74f58c2d85d13089ba3be3e3464c2cb34d2332c9f7a96ec42765bf2b034",
+                "md5": "e174a596cf84862ca903f79a2db356c2",
+                "size": "1236416"
+            },
+            "cuda12": {
+                "relative_path": "libnvtiff/linux-sbsa/libnvtiff-linux-sbsa-0.5.1.75_cuda12-archive.tar.xz",
+                "sha256": "d20309617df0bca6b373dfa33bac99703993a0e3759af70d2691d3b829df4d33",
+                "md5": "1a25761b4bfeb2ff7016114701d132b6",
+                "size": "1829060"
+            },
+            "cuda13": {
+                "relative_path": "libnvtiff/linux-sbsa/libnvtiff-linux-sbsa-0.5.1.75_cuda13-archive.tar.xz",
+                "sha256": "415c507443c026db501bd58d49428d6378f7d5e02e371f8f05d9cbe421565a90",
+                "md5": "6fb9797d1cef94e17c0ed8c82e9b8bc8",
+                "size": "1559296"
+            }
+        },
+        "windows-x86_64": {
+            "cuda11": {
+                "relative_path": "libnvtiff/windows-x86_64/libnvtiff-windows-x86_64-0.5.1.75_cuda11-archive.zip",
+                "sha256": "c140fb7c0cb40c8796cdc7f3cf604a7fbb85e5b6e0e3315d9c269cfa19caa46a",
+                "md5": "1747419ee8df0434010a89014757065d",
+                "size": "1157130"
+            },
+            "cuda12": {
+                "relative_path": "libnvtiff/windows-x86_64/libnvtiff-windows-x86_64-0.5.1.75_cuda12-archive.zip",
+                "sha256": "a3db5d37c61845d97aa5f1c1a93f9885239741c169a4c577f1f93293dd139a0d",
+                "md5": "861f76739d7632b9ccf60f9bde2c2b36",
+                "size": "1805927"
+            },
+            "cuda13": {
+                "relative_path": "libnvtiff/windows-x86_64/libnvtiff-windows-x86_64-0.5.1.75_cuda13-archive.zip",
+                "sha256": "0e75603c23eed4df4d04d8ddd08bc106df9a4423596f32d238fbf7bb623280b1",
+                "md5": "83c07811a9ebcc9aaa3e8d296f018f4a",
+                "size": "1178242"
+            }
+        },
+        "linux-aarch64": {
+            "cuda11": {
+                "relative_path": "libnvtiff/linux-aarch64/libnvtiff-linux-aarch64-0.5.1.75_cuda11-archive.tar.xz",
+                "sha256": "ef8f2f8472959be63e895997c0b13892db4e3c6bf3d06a4752c8e9292531c55a",
+                "md5": "ee0034f50b9c348ce64c7358ebc16ea5",
+                "size": "979744"
+            },
+            "cuda12": {
+                "relative_path": "libnvtiff/linux-aarch64/libnvtiff-linux-aarch64-0.5.1.75_cuda12-archive.tar.xz",
+                "sha256": "7d37821154aca7846695ccf12369eeb8c0f263d58b6dfb43e23bd12f4c114ef0",
+                "md5": "0491eaec9a956a42a4450b546cc113d4",
+                "size": "1279516"
+            },
+            "cuda13": {
+                "relative_path": "libnvtiff/linux-aarch64/libnvtiff-linux-aarch64-0.5.1.75_cuda13-archive.tar.xz",
+                "sha256": "8d1b07af6d8b68776d6a6533b4c33134af01d5cb6a0d9c5bcc7a866559de600a",
+                "md5": "94e8fbcbeca5b26e177b3c9c71f18214",
+                "size": "1104224"
+            }
+        }
+    }
+}
diff --git a/pkgs/development/cuda-modules/packages/libnvtiff.nix b/pkgs/development/cuda-modules/packages/libnvtiff.nix
new file mode 100644
index 000000000000..e3623eb3b47d
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnvtiff.nix
@@ -0,0 +1,22 @@
+{ buildRedist }:
+buildRedist {
+  redistName = "nvtiff";
+  pname = "libnvtiff";
+
+  outputs = [
+    "out"
+    "dev"
+    "include"
+    "lib"
+    "static"
+  ];
+
+  meta = {
+    description = "Accelerates TIFF encode/decode on NVIDIA GPUs";
+    longDescription = ''
+      nvTIFF is a GPU accelerated TIFF(Tagged Image File Format) encode/decode library built on the CUDA platform.
+    '';
+    homepage = "https://docs.nvidia.com/cuda/nvtiff";
+    changelog = "https://docs.nvidia.com/cuda/nvtiff/releasenotes.html";
+  };
+}
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index f4aed78c5a9d..b89cfe1670c0 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -37,6 +37,7 @@ in
       nvcomp = "5.0.0.6";
       nvjpeg2000 = "0.9.0";
       nvpl = "25.5";
+      nvtiff = "0.5.1";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
   };
@@ -55,6 +56,7 @@ in
       nvcomp = "5.0.0.6";
       nvjpeg2000 = "0.9.0";
       nvpl = "25.5";
+      nvtiff = "0.5.1";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
   };
@@ -73,6 +75,7 @@ in
       nvcomp = "5.0.0.6";
       nvjpeg2000 = "0.9.0";
       nvpl = "25.5";
+      nvtiff = "0.5.1";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
   };
@@ -91,6 +94,7 @@ in
       nvcomp = "5.0.0.6";
       nvjpeg2000 = "0.9.0";
       nvpl = "25.5";
+      nvtiff = "0.5.1";
       tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
   };

From 53f599e35cf0d9cd0aba461b243021ddce78418c Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 17:25:33 +0000
Subject: [PATCH 1765/6226] cudaPackages.cutlass: init at 3.9.2

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/packages/cutlass.nix         | 232 ++++++++++++++++++
 1 file changed, 232 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/packages/cutlass.nix

diff --git a/pkgs/development/cuda-modules/packages/cutlass.nix b/pkgs/development/cuda-modules/packages/cutlass.nix
new file mode 100644
index 000000000000..e9dfaa84f786
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cutlass.nix
@@ -0,0 +1,232 @@
+{
+  _cuda,
+  addDriverRunpath,
+  backendStdenv,
+  cmake,
+  cuda_cudart,
+  cuda_nvcc,
+  cuda_nvrtc,
+  cudaNamePrefix,
+  cudnn,
+  fetchFromGitHub,
+  flags,
+  gtest,
+  lib,
+  libcublas,
+  libcurand,
+  ninja,
+  python3Packages,
+  # Options
+  pythonSupport ? true,
+  enableF16C ? false,
+  enableTools ? false,
+  # passthru.updateScript
+  gitUpdater,
+}:
+let
+  inherit (_cuda.lib) _mkMetaBadPlatforms;
+  inherit (lib) licenses maintainers teams;
+  inherit (lib.asserts) assertMsg;
+  inherit (lib.attrsets) getBin;
+  inherit (lib.lists) all optionals;
+  inherit (lib.strings)
+    cmakeBool
+    cmakeFeature
+    optionalString
+    versionAtLeast
+    ;
+  inherit (lib.trivial) flip;
+in
+# TODO: Tests.
+assert assertMsg (!enableTools) "enableTools is not yet implemented";
+backendStdenv.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  # NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
+  name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
+  pname = "cutlass";
+  version = "3.9.2";
+
+  src = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "cutlass";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-teziPNA9csYvhkG5t2ht8W8x5+1YGGbHm8VKx4JoxgI=";
+  };
+
+  # TODO: As a header-only library, we should make sure we have an `include` directory or similar which is not a
+  # superset of the `out` (`bin`) or `dev` outputs (whih is what the multiple-outputs setup hook does by default).
+  outputs = [ "out" ] ++ optionals pythonSupport [ "dist" ];
+
+  nativeBuildInputs = [
+    cuda_nvcc
+    cmake
+    ninja
+    python3Packages.python # Python is always required
+  ]
+  ++ optionals pythonSupport (
+    with python3Packages;
+    [
+      build
+      pythonOutputDistHook
+      setuptools
+    ]
+  );
+
+  postPatch =
+    # Prepend some commands to the CUDA.cmake file so it can find the CUDA libraries using CMake's FindCUDAToolkit
+    # module. These target names are used throughout the project; I (@connorbaker) did not choose them.
+    ''
+      nixLog "patching CUDA.cmake to use FindCUDAToolkit"
+      mv ./CUDA.cmake ./_CUDA_Append.cmake
+      cat > ./_CUDA_Prepend.cmake <<'EOF'
+      find_package(CUDAToolkit REQUIRED)
+      foreach(_target cudart cuda_driver nvrtc)
+        if (NOT TARGET CUDA::''${_target})
+          message(FATAL_ERROR "''${_target} Not Found")
+        endif()
+        message(STATUS "''${_target} library: ''${CUDA_''${_target}_LIBRARY}")
+        add_library(''${_target} ALIAS CUDA::''${_target})
+      endforeach()
+      EOF
+      cat ./_CUDA_Prepend.cmake ./_CUDA_Append.cmake > ./CUDA.cmake
+    ''
+    # Patch cutlass to use the provided NVCC.
+    # '_CUDA_INSTALL_PATH = os.getenv("CUDA_INSTALL_PATH", _cuda_install_path_from_nvcc())' \
+    # '_CUDA_INSTALL_PATH = "${getBin cuda_nvcc}"'
+    + ''
+      nixLog "patching python bindings to make cuda_install_path fail"
+      substituteInPlace ./python/cutlass/__init__.py \
+        --replace-fail \
+          'def cuda_install_path():' \
+      '
+      def cuda_install_path():
+          raise RuntimeException("not supported with Nixpkgs CUDA packaging")
+      '
+    ''
+    # Patch the python bindings to use environment variables set by Nixpkgs.
+    # https://github.com/NVIDIA/cutlass/blob/e94e888df3551224738bfa505787b515eae8352f/python/cutlass/backend/compiler.py#L80
+    # https://github.com/NVIDIA/cutlass/blob/e94e888df3551224738bfa505787b515eae8352f/python/cutlass/backend/compiler.py#L81
+    # https://github.com/NVIDIA/cutlass/blob/e94e888df3551224738bfa505787b515eae8352f/python/cutlass/backend/compiler.py#L317
+    # https://github.com/NVIDIA/cutlass/blob/e94e888df3551224738bfa505787b515eae8352f/python/cutlass/backend/compiler.py#L319
+    # https://github.com/NVIDIA/cutlass/blob/e94e888df3551224738bfa505787b515eae8352f/python/cutlass/backend/compiler.py#L344
+    # https://github.com/NVIDIA/cutlass/blob/e94e888df3551224738bfa505787b515eae8352f/python/cutlass/backend/compiler.py#L360
+    + ''
+      nixLog "patching python bindings to use environment variables"
+      substituteInPlace ./python/cutlass/backend/compiler.py \
+        --replace-fail \
+          'self.include_paths = include_paths' \
+          'self.include_paths = include_paths + [root + "/include" for root in os.getenv("CUDAToolkit_ROOT").split(";")]' \
+        --replace-fail \
+          'self.flags = flags' \
+          'self.flags = flags + ["-L" + root + "/lib" for root in os.getenv("CUDAToolkit_ROOT").split(";")]' \
+        --replace-fail \
+          "\''${cuda_install_path}/bin/nvcc" \
+          '${getBin cuda_nvcc}/bin/nvcc' \
+        --replace-fail \
+          '"cuda_install_path": cuda_install_path(),' \
+          "" \
+        --replace-fail \
+          'f"{cuda_install_path()}/bin/nvcc"' \
+          '"${getBin cuda_nvcc}/bin/nvcc"' \
+        --replace-fail \
+          'cuda_install_path() + "/include",' \
+          ""
+    '';
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    cuda_cudart
+    cuda_nvrtc
+    libcurand
+  ]
+  ++ optionals enableTools [
+    cudnn
+    libcublas
+  ];
+
+  cmakeFlags = [
+    (cmakeFeature "CUTLASS_NVCC_ARCHS" flags.cmakeCudaArchitecturesString)
+    (cmakeBool "CUTLASS_ENABLE_EXAMPLES" false)
+
+    # Tests.
+    (cmakeBool "CUTLASS_ENABLE_TESTS" finalAttrs.doCheck)
+    (cmakeBool "CUTLASS_ENABLE_GTEST_UNIT_TESTS" finalAttrs.doCheck)
+    (cmakeBool "CUTLASS_USE_SYSTEM_GOOGLETEST" true)
+
+    # NOTE: Both CUDNN and CUBLAS can be used by the examples and the profiler. Since they are large dependencies, they
+    #       are disabled by default.
+    (cmakeBool "CUTLASS_ENABLE_TOOLS" enableTools)
+    (cmakeBool "CUTLASS_ENABLE_CUBLAS" enableTools)
+    (cmakeBool "CUTLASS_ENABLE_CUDNN" enableTools)
+
+    # NOTE: Requires x86_64 and hardware support.
+    (cmakeBool "CUTLASS_ENABLE_F16C" enableF16C)
+
+    # TODO: Unity builds are supposed to reduce build time, but this seems to just reduce the number of tasks
+    # generated?
+    # NOTE: Good explanation of unity builds:
+    #       https://www.methodpark.de/blog/how-to-speed-up-clang-tidy-with-unity-builds.
+    (cmakeBool "CUTLASS_UNITY_BUILD_ENABLED" false)
+  ];
+
+  postBuild = lib.optionalString pythonSupport ''
+    pushd "$NIX_BUILD_TOP/$sourceRoot"
+    nixLog "building Python wheel"
+    pyproject-build \
+      --no-isolation \
+      --outdir "$NIX_BUILD_TOP/$sourceRoot/''${cmakeBuildDir:?}/dist/" \
+      --wheel
+    popd >/dev/null
+  '';
+
+  doCheck = false;
+
+  checkInputs = [ gtest ];
+
+  # NOTE: Because the test cases immediately create and try to run the binaries, we don't have an opportunity
+  # to patch them with autoAddDriverRunpath. To get around this, we add the driver runpath to the environment.
+  # TODO: This would break Jetson when using cuda_compat, as it must come first.
+  preCheck = optionalString finalAttrs.doCheck ''
+    export LD_LIBRARY_PATH="$(readlink -mnv "${addDriverRunpath.driverLink}/lib")"
+  '';
+
+  # This is *not* a derivation you want to build on a small machine.
+  requiredSystemFeatures = optionals finalAttrs.doCheck [
+    "big-parallel"
+    "cuda"
+  ];
+
+  passthru = {
+    updateScript = gitUpdater {
+      inherit (finalAttrs) pname version;
+      rev-prefix = "v";
+    };
+    # TODO:
+    # tests.test = cutlass.overrideAttrs { doCheck = true; };
+
+    # Include required architectures in compatibility check.
+    # https://github.com/NVIDIA/cutlass/tree/main?tab=readme-ov-file#compatibility
+    platformAssertions = [
+      {
+        message = "all capabilities are >= 7.0 (${builtins.toJSON flags.cudaCapabilities})";
+        assertion = all (flip versionAtLeast "7.0") flags.cudaCapabilities;
+      }
+    ];
+  };
+
+  meta = {
+    description = "CUDA Templates for Linear Algebra Subroutines";
+    homepage = "https://github.com/NVIDIA/cutlass";
+    license = licenses.asl20;
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
+    badPlatforms = _mkMetaBadPlatforms (!(config.inHydra or false)) finalAttrs;
+    maintainers = [ maintainers.connorbaker ];
+    teams = [ teams.cuda ];
+  };
+})

From 016004a37bb784a418a57ac8cc9cd358340630d2 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 17:24:24 +0000
Subject: [PATCH 1766/6226] cudaPackages.cudnn_samples: init

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/packages/cudnn_samples.nix   | 36 +++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/packages/cudnn_samples.nix

diff --git a/pkgs/development/cuda-modules/packages/cudnn_samples.nix b/pkgs/development/cuda-modules/packages/cudnn_samples.nix
new file mode 100644
index 000000000000..ff4e743c0eb6
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/cudnn_samples.nix
@@ -0,0 +1,36 @@
+{
+  buildRedist,
+  cmake,
+  cuda_cudart,
+  cuda_nvcc,
+  cudnn,
+  lib,
+}:
+buildRedist (finalAttrs: {
+  redistName = "cudnn";
+  pname = "cudnn_samples";
+
+  outputs = [ "out" ];
+
+  allowFHSReferences = true;
+
+  # Sources are nested in a directory with the same name as the package
+  setSourceRoot = "sourceRoot=$(echo */src/cudnn_samples_v${lib.versions.major finalAttrs.version}/)";
+
+  nativeBuildInputs = [
+    cmake
+    cuda_nvcc
+  ];
+
+  buildInputs = [
+    cuda_cudart
+    cudnn
+  ];
+
+  brokenAssertions = [
+    {
+      message = "FreeImage is required as a subdirectory and @connorbaker has not yet patched the build to find it";
+      assertion = false;
+    }
+  ];
+})

From 48eda7fc1f74ec94ac3cd6a773f233909e48fcc5 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 9 Oct 2025 21:22:57 +0000
Subject: [PATCH 1767/6226] cudaPackages.cudnn-frontend: clean up expression

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../packages/cudnn-frontend/package.nix       | 20 +++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix b/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix
index 1be759846e44..79a19e321b39 100644
--- a/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix
+++ b/pkgs/development/cuda-modules/packages/cudnn-frontend/package.nix
@@ -7,6 +7,7 @@
   cuda_cudart,
   cuda_nvcc,
   cuda_nvrtc,
+  cudaNamePrefix,
   cudnn,
   fetchFromGitHub,
   gitUpdater,
@@ -16,6 +17,7 @@
   nlohmann_json,
 }:
 let
+  inherit (lib) licenses maintainers teams;
   inherit (lib.lists) optionals;
   inherit (lib.strings)
     cmakeBool
@@ -25,6 +27,12 @@ let
 in
 # TODO(@connorbaker): This should be a hybrid C++/Python package.
 backendStdenv.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  # NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
+  name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
+
   pname = "cudnn-frontend";
   version = "1.9.0";
 
@@ -45,9 +53,9 @@ backendStdenv.mkDerivation (finalAttrs: {
 
   # nlohmann_json should be the only vendored dependency.
   postPatch = ''
-    echo "patching source to use nlohmann_json from nixpkgs"
-    rm -rf include/cudnn_frontend/thirdparty/nlohmann
-    rmdir include/cudnn_frontend/thirdparty
+    nixLog "patching source to use nlohmann_json from nixpkgs"
+    rm -rfv include/cudnn_frontend/thirdparty/nlohmann
+    rmdir -v include/cudnn_frontend/thirdparty
     substituteInPlace include/cudnn_frontend_utils.h \
       --replace-fail \
         '#include "cudnn_frontend/thirdparty/nlohmann/json.hpp"' \
@@ -119,14 +127,14 @@ backendStdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "A c++ wrapper for the cudnn backend API";
     homepage = "https://github.com/NVIDIA/cudnn-frontend";
-    license = lib.licenses.mit;
+    license = licenses.mit;
     # TODO(@connorbaker): How tightly coupled is this library to specific cuDNN versions?
     # Should it be marked as broken if it doesn't match our expected version?
     platforms = [
       "aarch64-linux"
       "x86_64-linux"
     ];
-    maintainers = with lib.maintainers; [ connorbaker ];
-    teams = [ lib.teams.cuda ];
+    maintainers = [ maintainers.connorbaker ];
+    teams = [ teams.cuda ];
   };
 })

From 072d508a71dcc4ca4b79edb54f2f8b8650d4e9c8 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 17:22:55 +0000
Subject: [PATCH 1768/6226] cudaPackages.tests.cmake: init

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../packages/tests/cmake/package.nix          | 203 ++++++++++++++++++
 1 file changed, 203 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/packages/tests/cmake/package.nix

diff --git a/pkgs/development/cuda-modules/packages/tests/cmake/package.nix b/pkgs/development/cuda-modules/packages/tests/cmake/package.nix
new file mode 100644
index 000000000000..3a1ce899624d
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/tests/cmake/package.nix
@@ -0,0 +1,203 @@
+{
+  backendStdenv,
+  cmake,
+  cuda_cudart,
+  cuda_nvcc,
+  cudaNamePrefix,
+  fetchpatch2,
+  flags,
+  lib,
+  srcOnly,
+  stdenv,
+  stdenvNoCC,
+}:
+let
+  inherit (backendStdenv) cc;
+  inherit (lib.attrsets) mapAttrs optionalAttrs recurseIntoAttrs;
+  inherit (lib.fixedPoints) composeExtensions toExtension;
+  inherit (lib.lists) optionals;
+  inherit (lib.strings)
+    cmakeBool
+    cmakeFeature
+    optionalString
+    versionAtLeast
+    ;
+
+  cmake' = cmake.overrideAttrs (prevAttrs: {
+    patches = prevAttrs.patches or [ ] ++ [
+      # Fix errors during configuration when C/CXX is not loaded
+      # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10354
+      (fetchpatch2 {
+        name = "find-cuda-toolkit-check-for-language-enablement.patch";
+        url = "https://gitlab.kitware.com/cmake/cmake/-/commit/c5d81a246852e1ad81a3d55fcaff7e6feb779db7.patch";
+        hash = "sha256-oGxzbp+x88+79V+Cyx0l7+nMxX+n3ixzAFKPK26NMI8=";
+      })
+      # https://gitlab.kitware.com/cmake/cmake/-/merge_requests/10289
+      (fetchpatch2 {
+        name = "update-arch-supported-by-cuda-12_8.patch";
+        url = "https://gitlab.kitware.com/cmake/cmake/-/commit/a745b6869ee3681e39544d96d936c95c196c7398.patch";
+        hash = "sha256-B6ny6AZFIcyFhsEnzNk7+vJTb36HeguM53sk/LCnjS4=";
+      })
+    ];
+  });
+
+  isBroken = _: prevAttrs: {
+    meta = prevAttrs.meta or { } // {
+      broken = true;
+    };
+  };
+
+  cmakeSrc = srcOnly {
+    name = "cmake-unpacked";
+    inherit (cmake) src version;
+    stdenv = stdenvNoCC;
+  };
+
+  mkTest =
+    let
+      generic = stdenv.mkDerivation (finalAttrs: {
+        __structuredAttrs = true;
+        strictDeps = true;
+
+        testSuiteName = builtins.throw "testSuiteName must be set";
+        testName = builtins.throw "testName must be set";
+
+        name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
+        pname = "tests-cmake-${finalAttrs.testSuiteName}-${finalAttrs.testName}";
+        inherit (cmakeSrc) version;
+
+        src = cmakeSrc;
+
+        setSourceRoot = ''
+          sourceRoot="$(echo */Tests/${finalAttrs.testSuiteName}/${finalAttrs.testName})"
+        '';
+
+        nativeBuildInputs = [
+          cmake'
+          cuda_nvcc
+        ];
+
+        # If our compiler uses C++14, we must modify the CMake files so they don't hardcode C++11.
+        # This behavior has only been seen with GCC 14, but it's possible Clang would also require this.
+        requireCxxStandard14 = cc.isGNU && versionAtLeast cc.version "14";
+
+        cmakeListsReplacements = optionalAttrs finalAttrs.requireCxxStandard14 {
+          "cuda_std_11" = "cuda_std_14";
+          "cxx_std_11" = "cxx_std_14";
+          "set(CMAKE_CUDA_STANDARD 11)" = "set(CMAKE_CUDA_STANDARD 14)";
+          "set(CMAKE_CXX_STANDARD 11)" = "set(CMAKE_CXX_STANDARD 14)";
+        };
+
+        prePatch = optionalString finalAttrs.requireCxxStandard14 ''
+          for key in "''${!cmakeListsReplacements[@]}"; do
+            if grep -q "$key" CMakeLists.txt; then
+              nixLog "replacing occurrences of \"$key\" with \"''${cmakeListsReplacements[$key]}\" in $PWD/CMakeLists.txt"
+              substituteInPlace CMakeLists.txt --replace-fail "$key" "''${cmakeListsReplacements[$key]}"
+            fi
+          done
+        '';
+
+        buildInputs = [
+          cuda_cudart
+        ];
+
+        cmakeFlags = [
+          (cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
+          (cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString)
+        ]
+        ++ optionals finalAttrs.requireCxxStandard14 [
+          (cmakeFeature "CMAKE_CXX_STANDARD" "14")
+          (cmakeFeature "CMAKE_CUDA_STANDARD" "14")
+        ];
+
+        # The build *is* the check.
+        doCheck = false;
+
+        installPhase = ''
+          runHook preInstall
+          touch "$out"
+          runHook postInstall
+        '';
+
+        # Don't try to run stuff in the patch phase as the setup hooks will error on empty output.
+        dontFixup = true;
+
+        meta = {
+          description = "Generic builder for running CMake tests";
+          license = lib.licenses.mit;
+          maintainers = lib.teams.cuda.members;
+          platforms = [
+            "aarch64-linux"
+            "x86_64-linux"
+          ];
+        };
+      });
+    in
+    testSuiteName: testName: overrideAttrsArg:
+    generic.overrideAttrs (
+      composeExtensions (toExtension { inherit testSuiteName testName; }) (toExtension overrideAttrsArg)
+    );
+in
+recurseIntoAttrs (
+  mapAttrs (testSuiteName: testSuite: recurseIntoAttrs (mapAttrs (mkTest testSuiteName) testSuite)) {
+    # TODO: Handle set(Cuda.Toolkit_BUILD_OPTIONS -DHAS_CUPTI:BOOL=${CMake_TEST_CUDA_CUPTI})
+    # from Tests/Cuda/CMakeLists.txt
+    Cuda = {
+      Complex = { };
+      CXXStandardSetTwice = { };
+      IncludePathNoToolkit = { };
+      MixedStandardLevels1 = { };
+      MixedStandardLevels2 = { };
+      MixedStandardLevels3 = { };
+      MixedStandardLevels4 = if cc.isClang then isBroken else { };
+      MixedStandardLevels5 = if cc.isClang then isBroken else { };
+      NotEnabled = { };
+      ObjectLibrary = { };
+      ProperDeviceLibraries =
+        if cc.isClang then
+          isBroken # Clang lacks __CUDACC_VER*__ defines.
+        else
+          isBroken; # TODO: Fix
+      ProperLinkFlags = { };
+      SeparableCompCXXOnly = { };
+      SharedRuntimePlusToolkit = isBroken; # TODO: Fix
+      StaticRuntimePlusToolkit = isBroken; # TODO: Fix
+      StubRPATH = { };
+      Toolkit = isBroken; # TODO: Fix
+      ToolkitBeforeLang = if cc.isClang then isBroken else { }; # Clang lacks __CUDACC_VER*__ defines.
+      WithC = { };
+    };
+    # TODO: Handle set(CudaOnly.Toolkit_BUILD_OPTIONS -DHAS_CUPTI:BOOL=${CMake_TEST_CUDA_CUPTI})
+    # from Tests/CudaOnly/CMakeLists.txt
+    CudaOnly = {
+      Architecture = { };
+      ArchSpecial = isBroken; # Tries to detect the native architecture, which is impure.
+      CircularLinkLine = { };
+      CompileFlags = { };
+      CUBIN = if cc.isClang then isBroken else { }; # Only NVCC defines __CUDACC_DEBUG__ when compiling in debug mode.
+      DeviceLTO = isBroken; # TODO: Fix
+      DontResolveDeviceSymbols = { };
+      EnableStandard = { };
+      ExportPTX = { };
+      Fatbin = if cc.isClang then isBroken else { }; # Only NVCC defines __CUDACC_DEBUG__ when compiling in debug mode.
+      GPUDebugFlag = if cc.isClang then isBroken else { }; # Only NVCC defines __CUDACC_DEBUG__ when compiling in debug mode.
+      OptixIR = if cc.isClang then isBroken else { }; # Only NVCC defines __CUDACC_DEBUG__ when compiling in debug mode.
+      PDB = isBroken; # Tests for features that only work with MSVC
+      ResolveDeviceSymbols = { };
+      RuntimeControls = { };
+      SeparateCompilation = { };
+      SeparateCompilationPTX = isBroken; # TODO: Fix
+      SeparateCompilationTargetObjects = { };
+      SharedRuntimePlusToolkit = isBroken; # TODO: Fix
+      SharedRuntimeViaCUDAFlags = if cc.isClang then isBroken else { }; # Clang doesn't have flags for selecting the runtime.
+      Standard98 = if cc.isClang then isBroken else { };
+      StaticRuntimePlusToolkit = isBroken; # TODO: Fix
+      Toolkit = isBroken; # TODO: Fix
+      ToolkitBeforeLang = { };
+      ToolkitMultipleDirs = { };
+      TryCompileTargetStatic = { };
+      Unity = { };
+      WithDefs = { };
+    };
+  }
+)

From d027f0a54379aa50e1af990711d9a8637cca678c Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 17:23:12 +0000
Subject: [PATCH 1769/6226] cudaPackages.tests.cudnn-frontend: init

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../tests/cudnn-frontend/legacy_samples.nix   | 39 +++++++++++++++++++
 .../packages/tests/cudnn-frontend/samples.nix | 38 ++++++++++++++++++
 .../packages/tests/cudnn-frontend/tests.nix   | 38 ++++++++++++++++++
 3 files changed, 115 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/packages/tests/cudnn-frontend/legacy_samples.nix
 create mode 100644 pkgs/development/cuda-modules/packages/tests/cudnn-frontend/samples.nix
 create mode 100644 pkgs/development/cuda-modules/packages/tests/cudnn-frontend/tests.nix

diff --git a/pkgs/development/cuda-modules/packages/tests/cudnn-frontend/legacy_samples.nix b/pkgs/development/cuda-modules/packages/tests/cudnn-frontend/legacy_samples.nix
new file mode 100644
index 000000000000..ae3226b5a753
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/tests/cudnn-frontend/legacy_samples.nix
@@ -0,0 +1,39 @@
+{
+  cudaNamePrefix,
+  cudnn-frontend,
+  jq,
+  lib,
+  writeShellApplication,
+}:
+let
+  inherit (lib.meta) getExe';
+in
+writeShellApplication {
+  derivationArgs = {
+    __structuredAttrs = true;
+    strictDeps = true;
+  };
+  name = "${cudaNamePrefix}-tests-cudnn-frontend-legacy-samples";
+  runtimeInputs = [
+    cudnn-frontend.legacy_samples
+    jq
+  ];
+  text = ''
+    args=( "${getExe' cudnn-frontend.legacy_samples "legacy_samples"}" )
+
+    if (( $# != 0 ))
+    then
+      args+=( "$@" )
+      "''${args[@]}"
+    else
+      args+=(
+        --success
+        --rng-seed=0
+        --reporter=json
+        exclude:"Scale Bias Conv BNGenstats with CPU Reference"
+      )
+      echo "Running with default arguments: ''${args[*]}" >&2
+      "''${args[@]}" | jq
+    fi
+  '';
+}
diff --git a/pkgs/development/cuda-modules/packages/tests/cudnn-frontend/samples.nix b/pkgs/development/cuda-modules/packages/tests/cudnn-frontend/samples.nix
new file mode 100644
index 000000000000..0aa16703acda
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/tests/cudnn-frontend/samples.nix
@@ -0,0 +1,38 @@
+{
+  cudaNamePrefix,
+  cudnn-frontend,
+  jq,
+  lib,
+  writeShellApplication,
+}:
+let
+  inherit (lib.meta) getExe';
+in
+writeShellApplication {
+  derivationArgs = {
+    __structuredAttrs = true;
+    strictDeps = true;
+  };
+  name = "${cudaNamePrefix}-tests-cudnn-frontend-samples";
+  runtimeInputs = [
+    cudnn-frontend.samples
+    jq
+  ];
+  text = ''
+    args=( "${getExe' cudnn-frontend.samples "samples"}" )
+
+    if (( $# != 0 ))
+    then
+      args+=( "$@" )
+      "''${args[@]}"
+    else
+      args+=(
+        --success
+        --rng-seed=0
+        --reporter=json
+      )
+      echo "Running with default arguments: ''${args[*]}" >&2
+      "''${args[@]}" | jq
+    fi
+  '';
+}
diff --git a/pkgs/development/cuda-modules/packages/tests/cudnn-frontend/tests.nix b/pkgs/development/cuda-modules/packages/tests/cudnn-frontend/tests.nix
new file mode 100644
index 000000000000..d0949a0f53e6
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/tests/cudnn-frontend/tests.nix
@@ -0,0 +1,38 @@
+{
+  cudaNamePrefix,
+  cudnn-frontend,
+  jq,
+  lib,
+  writeShellApplication,
+}:
+let
+  inherit (lib.meta) getExe';
+in
+writeShellApplication {
+  derivationArgs = {
+    __structuredAttrs = true;
+    strictDeps = true;
+  };
+  name = "${cudaNamePrefix}-tests-cudnn-frontend-tests";
+  runtimeInputs = [
+    cudnn-frontend.tests
+    jq
+  ];
+  text = ''
+    args=( "${getExe' cudnn-frontend.tests "tests"}" )
+
+    if (( $# != 0 ))
+    then
+      args+=( "$@" )
+      "''${args[@]}"
+    else
+      args+=(
+        --success
+        --rng-seed=0
+        --reporter=json
+      )
+      echo "Running with default arguments: ''${args[*]}" >&2
+      "''${args[@]}" | jq
+    fi
+  '';
+}

From 71228337e5da42af00d5fda8f991a79ff9e46261 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 17:23:25 +0000
Subject: [PATCH 1770/6226] cudaPackages.tests.onnx-tensorrt: init

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../packages/tests/onnx-tensorrt/long.nix     | 40 +++++++++++++++++
 .../packages/tests/onnx-tensorrt/short.nix    | 43 +++++++++++++++++++
 2 files changed, 83 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/packages/tests/onnx-tensorrt/long.nix
 create mode 100644 pkgs/development/cuda-modules/packages/tests/onnx-tensorrt/short.nix

diff --git a/pkgs/development/cuda-modules/packages/tests/onnx-tensorrt/long.nix b/pkgs/development/cuda-modules/packages/tests/onnx-tensorrt/long.nix
new file mode 100644
index 000000000000..eb0fa74db933
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/tests/onnx-tensorrt/long.nix
@@ -0,0 +1,40 @@
+{
+  cuda_cudart,
+  cudaNamePrefix,
+  onnx-tensorrt,
+  python3,
+  writeShellApplication,
+}:
+writeShellApplication {
+  derivationArgs = {
+    __structuredAttrs = true;
+    strictDeps = true;
+  };
+  name = "${cudaNamePrefix}-tests-onnx-tensorrt-long";
+  runtimeInputs = [
+    cuda_cudart
+    (python3.withPackages (ps: [
+      ps.onnx-tensorrt
+      ps.pytest
+      ps.six
+    ]))
+  ];
+  text = ''
+    args=(
+      python3
+      "${onnx-tensorrt.test_script}/onnx_backend_test.py"
+    )
+
+    if (( $# != 0 ))
+    then
+      args+=( "$@" )
+    else
+      args+=( --verbose )
+      echo "Running with default arguments: ''${args[*]}" >&2
+    fi
+
+    mkdir -p "$HOME/.onnx"
+    chmod -R +w "$HOME/.onnx"
+    "''${args[@]}"
+  '';
+}
diff --git a/pkgs/development/cuda-modules/packages/tests/onnx-tensorrt/short.nix b/pkgs/development/cuda-modules/packages/tests/onnx-tensorrt/short.nix
new file mode 100644
index 000000000000..9415246f7c67
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/tests/onnx-tensorrt/short.nix
@@ -0,0 +1,43 @@
+{
+  cuda_cudart,
+  cudaNamePrefix,
+  onnx-tensorrt,
+  python3,
+  writeShellApplication,
+}:
+writeShellApplication {
+  derivationArgs = {
+    __structuredAttrs = true;
+    strictDeps = true;
+  };
+  name = "${cudaNamePrefix}-tests-onnx-tensorrt-short";
+  runtimeInputs = [
+    cuda_cudart
+    (python3.withPackages (ps: [
+      ps.onnx-tensorrt
+      ps.pytest
+      ps.six
+    ]))
+  ];
+  text = ''
+    args=(
+      python3
+      "${onnx-tensorrt.test_script}/onnx_backend_test.py"
+    )
+
+    if (( $# != 0 ))
+    then
+      args+=( "$@" )
+    else
+      args+=(
+        --verbose
+        OnnxBackendRealModelTest
+      )
+      echo "Running with default arguments: ''${args[*]}" >&2
+    fi
+
+    mkdir -p "$HOME/.onnx"
+    chmod -R +w "$HOME/.onnx"
+    "''${args[@]}"
+  '';
+}

From fb03f6ad14f97ea094f9a978397c23bb31ad6fe6 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 17:23:38 +0000
Subject: [PATCH 1771/6226] cudaPackages.tests.redists-unpacked: init

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../packages/tests/redists-unpacked.nix            | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/packages/tests/redists-unpacked.nix

diff --git a/pkgs/development/cuda-modules/packages/tests/redists-unpacked.nix b/pkgs/development/cuda-modules/packages/tests/redists-unpacked.nix
new file mode 100644
index 000000000000..f822210b5889
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/tests/redists-unpacked.nix
@@ -0,0 +1,14 @@
+{
+  cudaNamePrefix,
+  cudaPackages,
+  lib,
+  linkFarm,
+}:
+linkFarm "${cudaNamePrefix}-redists-unpacked" (
+  lib.concatMapAttrs (
+    name: attr:
+    lib.optionalAttrs (attr ? passthru.redistName && attr.src or null != null) {
+      ${name} = attr.src;
+    }
+  ) cudaPackages
+)

From e8587dbe95cffbc0bab696caaac4a7519a3a7f41 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 17:23:47 +0000
Subject: [PATCH 1772/6226] cudaPackages.tests.redists-installed: init

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../packages/tests/redists-installed.nix        | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/packages/tests/redists-installed.nix

diff --git a/pkgs/development/cuda-modules/packages/tests/redists-installed.nix b/pkgs/development/cuda-modules/packages/tests/redists-installed.nix
new file mode 100644
index 000000000000..606a0d166136
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/tests/redists-installed.nix
@@ -0,0 +1,17 @@
+{
+  cudaNamePrefix,
+  cudaPackages,
+  lib,
+  linkFarm,
+}:
+linkFarm "${cudaNamePrefix}-redists-installed" (
+  lib.concatMapAttrs (
+    name: attr:
+    lib.optionalAttrs (attr ? passthru.redistName && attr.meta.available or false) (
+      lib.genAttrs' attr.outputs (output: {
+        name = "${name}-${output}";
+        value = attr.${output};
+      })
+    )
+  ) cudaPackages
+)

From 66bde7d578380128d1b0f9a18aca5d1096a417b4 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 17:31:38 +0000
Subject: [PATCH 1773/6226] python3Packages.torch: correct package name
 cusparselt -> libcusparse_lt

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/python-modules/torch/bin/default.nix    | 2 +-
 pkgs/development/python-modules/torch/source/default.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/torch/bin/default.nix b/pkgs/development/python-modules/torch/bin/default.nix
index eb03276cf909..a24774985149 100644
--- a/pkgs/development/python-modules/torch/bin/default.nix
+++ b/pkgs/development/python-modules/torch/bin/default.nix
@@ -65,13 +65,13 @@ buildPythonPackage {
       cuda_cupti
       cuda_nvrtc
       cudnn
-      cusparselt
       libcublas
       libcufft
       libcufile
       libcurand
       libcusolver
       libcusparse
+      libcusparse_lt
       nccl
     ]
   );
diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index 436ff8ac3b1a..64f90f30cdcb 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -569,13 +569,13 @@ buildPythonPackage rec {
       cuda_nvml_dev # <nvml.h>
       cuda_nvrtc
       cuda_nvtx # -llibNVToolsExt
-      cusparselt
       libcublas
       libcufft
       libcufile
       libcurand
       libcusolver
       libcusparse
+      libcusparse_lt
     ]
     ++ lists.optionals (cudaPackages ? cudnn) [ cudnn ]
     ++ lists.optionals useSystemNccl [

From 7c69a31d57f9397bc0faf6e9465fecba396f94be Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 23 Sep 2025 17:32:13 +0000
Subject: [PATCH 1774/6226] python3Packages.cupy: add libcusparse_lt now that
 it is available

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/python-modules/cupy/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index f1527a2dd8cf..1ac1baf78fa3 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -38,9 +38,7 @@ let
     libcurand
     libcusolver
     libcusparse
-
-    # Missing:
-    # cusparselt
+    libcusparse_lt
   ];
   cudatoolkit-joined = symlinkJoin {
     name = "cudatoolkit-joined-${cudaPackages.cudaMajorMinorVersion}";

From 3c604b19ef5dc8d61d96484f45f28f607508fc77 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 3 Oct 2025 09:50:52 -0700
Subject: [PATCH 1775/6226] python3Packages.cupy: fixup shouldUsePkg to check
 for broken-ness

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/python-modules/cupy/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index 1ac1baf78fa3..a9451ade1d63 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -17,8 +17,7 @@
 let
   inherit (cudaPackages) cudnn;
 
-  shouldUsePkg =
-    pkg: if pkg != null && lib.meta.availableOn stdenv.hostPlatform pkg then pkg else null;
+  shouldUsePkg = lib.mapNullable (pkg: if pkg.meta.available or true then pkg else null);
 
   # some packages are not available on all platforms
   cuda_nvprof = shouldUsePkg (cudaPackages.nvprof or null);

From c71700689bd11e2b08af1b1563d180e1070c318e Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Sun, 7 Sep 2025 21:43:37 +0000
Subject: [PATCH 1776/6226] cudaPackages.cudatoolkit: use all outputs but
 static from constituents

Fixes a bug where include and other outputs were not made available.

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/packages/cudatoolkit.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/cudatoolkit.nix b/pkgs/development/cuda-modules/packages/cudatoolkit.nix
index d122e6312d14..4df552d048cc 100644
--- a/pkgs/development/cuda-modules/packages/cudatoolkit.nix
+++ b/pkgs/development/cuda-modules/packages/cudatoolkit.nix
@@ -26,11 +26,10 @@
 }:
 
 let
-  getAllOutputs = p: [
-    (lib.getBin p)
-    (lib.getLib p)
-    (lib.getDev p)
-  ];
+  # Retrieve all the outputs of a package except for the "static" output.
+  getAllOutputs =
+    p: lib.concatMap (output: lib.optionals (output != "static") [ p.${output} ]) p.outputs;
+
   hostPackages = [
     cuda_cuobjdump
     cuda_gdb

From b854a35c62fd8e54a4a9619970a42a196ddcbf64 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Sun, 7 Sep 2025 10:35:41 +0000
Subject: [PATCH 1777/6226] _cuda.lib.{_mkMetaBadPlatforms,_mkMetaBroken}: use
 builtins.traceVerbose

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/_cuda/lib/meta.nix           | 55 +++++++++++--------
 .../cuda-modules/buildRedist/default.nix      |  4 +-
 .../cuda-modules/packages/cutlass.nix         |  2 +-
 .../cuda-modules/packages/nccl-tests.nix      |  2 +-
 .../cuda-modules/packages/nccl.nix            |  2 +-
 5 files changed, 36 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/cuda-modules/_cuda/lib/meta.nix b/pkgs/development/cuda-modules/_cuda/lib/meta.nix
index 72f71973b0cd..7adc36474935 100644
--- a/pkgs/development/cuda-modules/_cuda/lib/meta.nix
+++ b/pkgs/development/cuda-modules/_cuda/lib/meta.nix
@@ -2,7 +2,7 @@
 {
   /**
     Returns a list of bad platforms for a given package if assertsions in `finalAttrs.passthru.platformAssertions`
-    fail, optionally logging evaluation warnings for each reason.
+    fail, optionally logging evaluation warnings with `builtins.traceVerbose` for each reason.
 
     NOTE: No guarantees are made about this function's stability. You may use it at your own risk.
 
@@ -12,31 +12,39 @@
     # Type
 
     ```
-    _mkMetaBadPlatforms :: (warn :: Bool) -> (finalAttrs :: AttrSet) -> List String
+    _mkMetaBadPlatforms :: (finalAttrs :: AttrSet) -> List String
     ```
+
+    # Inputs
+
+    `finalAttrs`
+
+    : The final attributes of the package
   */
   _mkMetaBadPlatforms =
-    warn: finalAttrs:
+    finalAttrs:
     let
       failedAssertionsString = _cuda.lib._mkFailedAssertionsString finalAttrs.passthru.platformAssertions;
       hasFailedAssertions = failedAssertionsString != "";
       finalStdenv = finalAttrs.finalPackage.stdenv;
-    in
-    lib.warnIf (warn && hasFailedAssertions)
-      "Package ${finalAttrs.finalPackage.name} is unsupported on this platform due to the following failed assertions:${failedAssertionsString}"
-      (
-        lib.optionals hasFailedAssertions (
-          lib.unique [
-            finalStdenv.buildPlatform.system
-            finalStdenv.hostPlatform.system
-            finalStdenv.targetPlatform.system
-          ]
-        )
+      badPlatforms = lib.optionals hasFailedAssertions (
+        lib.unique [
+          finalStdenv.buildPlatform.system
+          finalStdenv.hostPlatform.system
+          finalStdenv.targetPlatform.system
+        ]
       );
+      handle =
+        if hasFailedAssertions then
+          builtins.traceVerbose "Package ${finalAttrs.finalPackage.name} is unsupported on this platform due to the following failed assertions:${failedAssertionsString}"
+        else
+          lib.id;
+    in
+    handle badPlatforms;
 
   /**
     Returns a boolean indicating whether the package is broken as a result of `finalAttrs.passthru.brokenAssertions`,
-    optionally logging evaluation warnings for each reason.
+    optionally logging evaluation warnings with `builtins.traceVerbose` for each reason.
 
     NOTE: No guarantees are made about this function's stability. You may use it at your own risk.
 
@@ -46,26 +54,25 @@
     # Type
 
     ```
-    _mkMetaBroken :: (warn :: Bool) -> (finalAttrs :: AttrSet) -> Bool
+    _mkMetaBroken :: (finalAttrs :: AttrSet) -> Bool
     ```
 
     # Inputs
 
-    `warn`
-
-    : A boolean indicating whether to log warnings
-
     `finalAttrs`
 
     : The final attributes of the package
   */
   _mkMetaBroken =
-    warn: finalAttrs:
+    finalAttrs:
     let
       failedAssertionsString = _cuda.lib._mkFailedAssertionsString finalAttrs.passthru.brokenAssertions;
       hasFailedAssertions = failedAssertionsString != "";
+      handle =
+        if hasFailedAssertions then
+          builtins.traceVerbose "Package ${finalAttrs.finalPackage.name} is marked as broken due to the following failed assertions:${failedAssertionsString}"
+        else
+          lib.id;
     in
-    lib.warnIf (warn && hasFailedAssertions)
-      "Package ${finalAttrs.finalPackage.name} is marked as broken due to the following failed assertions:${failedAssertionsString}"
-      hasFailedAssertions;
+    handle hasFailedAssertions;
 }
diff --git a/pkgs/development/cuda-modules/buildRedist/default.nix b/pkgs/development/cuda-modules/buildRedist/default.nix
index 847830e17641..b29eacd37c2b 100644
--- a/pkgs/development/cuda-modules/buildRedist/default.nix
+++ b/pkgs/development/cuda-modules/buildRedist/default.nix
@@ -439,8 +439,8 @@ extendMkDerivation {
         '';
         sourceProvenance = meta.sourceProvenance or [ sourceTypes.binaryNativeCode ];
         platforms = finalAttrs.passthru.supportedNixSystems;
-        broken = _mkMetaBroken (!(config.inHydra or false)) finalAttrs;
-        badPlatforms = _mkMetaBadPlatforms (!(config.inHydra or false)) finalAttrs;
+        broken = _mkMetaBroken finalAttrs;
+        badPlatforms = _mkMetaBadPlatforms finalAttrs;
         downloadPage =
           meta.downloadPage
             or "https://developer.download.nvidia.com/compute/${finalAttrs.passthru.redistName}/redist/${finalAttrs.pname}";
diff --git a/pkgs/development/cuda-modules/packages/cutlass.nix b/pkgs/development/cuda-modules/packages/cutlass.nix
index e9dfaa84f786..c6e0126504f0 100644
--- a/pkgs/development/cuda-modules/packages/cutlass.nix
+++ b/pkgs/development/cuda-modules/packages/cutlass.nix
@@ -225,7 +225,7 @@ backendStdenv.mkDerivation (finalAttrs: {
       "aarch64-linux"
       "x86_64-linux"
     ];
-    badPlatforms = _mkMetaBadPlatforms (!(config.inHydra or false)) finalAttrs;
+    badPlatforms = _mkMetaBadPlatforms finalAttrs;
     maintainers = [ maintainers.connorbaker ];
     teams = [ teams.cuda ];
   };
diff --git a/pkgs/development/cuda-modules/packages/nccl-tests.nix b/pkgs/development/cuda-modules/packages/nccl-tests.nix
index 18118b94bcb8..4a7528a10356 100644
--- a/pkgs/development/cuda-modules/packages/nccl-tests.nix
+++ b/pkgs/development/cuda-modules/packages/nccl-tests.nix
@@ -107,7 +107,7 @@ backendStdenv.mkDerivation (finalAttrs: {
       "x86_64-linux"
     ];
     license = licenses.bsd3;
-    broken = _mkMetaBroken (!(config.inHydra or false)) finalAttrs;
+    broken = _mkMetaBroken finalAttrs;
     maintainers = with maintainers; [ jmillerpdt ];
     teams = [ teams.cuda ];
   };
diff --git a/pkgs/development/cuda-modules/packages/nccl.nix b/pkgs/development/cuda-modules/packages/nccl.nix
index a160d501cb44..48ce87101eba 100644
--- a/pkgs/development/cuda-modules/packages/nccl.nix
+++ b/pkgs/development/cuda-modules/packages/nccl.nix
@@ -112,7 +112,7 @@ backendStdenv.mkDerivation (finalAttrs: {
     ];
     # NCCL is not supported on Jetson, because it does not use NVLink or PCI-e for inter-GPU communication.
     # https://forums.developer.nvidia.com/t/can-jetson-orin-support-nccl/232845/9
-    badPlatforms = _mkMetaBadPlatforms (!(config.inHydra or false)) finalAttrs;
+    badPlatforms = _mkMetaBadPlatforms finalAttrs;
     maintainers = with maintainers; [
       mdaiter
       orivej

From c6015a146b3bd48069de6a528868498ca0295098 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Sun, 7 Sep 2025 22:27:17 +0000
Subject: [PATCH 1778/6226] python3Packages.cupy: fixup

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/packages/cudnn_8_9.nix       | 14 ------
 .../python-modules/cupy/default.nix           | 49 +++++++++----------
 pkgs/top-level/all-packages.nix               | 10 +++-
 pkgs/top-level/cuda-packages.nix              |  2 -
 pkgs/top-level/python-packages.nix            | 20 +++++---
 5 files changed, 45 insertions(+), 50 deletions(-)
 delete mode 100644 pkgs/development/cuda-modules/packages/cudnn_8_9.nix

diff --git a/pkgs/development/cuda-modules/packages/cudnn_8_9.nix b/pkgs/development/cuda-modules/packages/cudnn_8_9.nix
deleted file mode 100644
index 069af8a426d3..000000000000
--- a/pkgs/development/cuda-modules/packages/cudnn_8_9.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  _cuda,
-  backendStdenv,
-  cudnn,
-}:
-let
-  version = if backendStdenv.hasJetsonCudaCapability then "8.9.5" else "8.9.7";
-in
-# TODO(@connorbaker): Support for old versions of CUDNN should be removed.
-cudnn.overrideAttrs (prevAttrs: {
-  passthru = prevAttrs.passthru // {
-    release = _cuda.manifests.cudnn.${version}.cudnn;
-  };
-})
diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index a9451ade1d63..507e54f74e1a 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -21,34 +21,31 @@ let
 
   # some packages are not available on all platforms
   cuda_nvprof = shouldUsePkg (cudaPackages.nvprof or null);
-  cutensor = shouldUsePkg (cudaPackages.cutensor or null);
+  libcutensor = shouldUsePkg (cudaPackages.libcutensor or null);
   nccl = shouldUsePkg (cudaPackages.nccl or null);
 
-  outpaths = with cudaPackages; [
-    cuda_cccl # <nv/target>
-    cuda_cudart
-    cuda_nvcc # <crt/host_defines.h>
-    cuda_nvprof
-    cuda_nvrtc
-    cuda_nvtx
-    cuda_profiler_api
-    libcublas
-    libcufft
-    libcurand
-    libcusolver
-    libcusparse
-    libcusparse_lt
-  ];
+  outpaths = lib.filter (outpath: outpath != null) (
+    with cudaPackages;
+    [
+      cuda_cccl # <nv/target>
+      cuda_cudart
+      cuda_nvcc # <crt/host_defines.h>
+      cuda_nvprof
+      cuda_nvrtc
+      cuda_nvtx
+      cuda_profiler_api
+      libcublas
+      libcufft
+      libcurand
+      libcusolver
+      libcusparse
+      libcusparse_lt
+    ]
+  );
   cudatoolkit-joined = symlinkJoin {
     name = "cudatoolkit-joined-${cudaPackages.cudaMajorMinorVersion}";
     paths =
-      outpaths
-      ++ lib.concatMap (f: lib.map f outpaths) [
-        lib.getLib
-        lib.getDev
-        (lib.getOutput "static")
-        (lib.getOutput "stubs")
-      ];
+      outpaths ++ lib.concatMap (outpath: lib.map (output: outpath.${output}) outpath.outputs) outpaths;
   };
 in
 buildPythonPackage rec {
@@ -84,17 +81,17 @@ buildPythonPackage rec {
 
   nativeBuildInputs = [
     addDriverRunpath
-    cudaPackages.cuda_nvcc
+    cudatoolkit-joined
   ];
 
   buildInputs = [
     cudatoolkit-joined
     cudnn
-    cutensor
+    libcutensor
     nccl
   ];
 
-  NVCC = "${lib.getExe cudaPackages.cuda_nvcc}"; # FIXME: splicing/buildPackages
+  # NVCC = "${lib.getExe cudaPackages.cuda_nvcc}"; # FIXME: splicing/buildPackages
   CUDA_PATH = "${cudatoolkit-joined}";
 
   dependencies = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac293591cbb3..93304d8cd0ea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2557,7 +2557,15 @@ with pkgs;
   # Top-level fix-point used in `cudaPackages`' internals
   _cuda = import ../development/cuda-modules/_cuda;
 
-  inherit (callPackages ./cuda-packages.nix { })
+  inherit
+    (import ./cuda-packages.nix {
+      inherit
+        _cuda
+        callPackage
+        config
+        lib
+        ;
+    })
     cudaPackages_12_6
     cudaPackages_12_8
     cudaPackages_12_9
diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index b89cfe1670c0..933dcc49ae30 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -3,8 +3,6 @@
   callPackage,
   config,
   lib,
-  pkgs,
-  stdenv,
 }:
 let
   # NOTE: Because manifests are used to add redistributables to the package set,
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index bc2a77471386..81ccecc90f3f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3192,13 +3192,19 @@ self: super: with self; {
   cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { };
 
   cupy = callPackage ../development/python-modules/cupy {
-    cudaPackages = pkgs.cudaPackages.overrideScope (
-      cu-fi: _: {
-        # CuDNN 9 is not supported:
-        # https://github.com/cupy/cupy/issues/8215
-        cudnn = cu-fi.cudnn_8_9;
-      }
-    );
+    cudaPackages =
+      # CuDNN 9 is not supported:
+      # https://github.com/cupy/cupy/issues/8215
+      # NOTE: cupy 14 will drop support for cuDNN entirely.
+      # https://github.com/cupy/cupy/pull/9326
+      let
+        version = if pkgs.cudaPackages.backendStdenv.hasJetsonCudaCapability then "8.9.5" else "8.9.7";
+      in
+      pkgs.cudaPackages.override (prevArgs: {
+        manifests = prevArgs.manifests // {
+          cudnn = pkgs._cuda.manifests.cudnn.${version};
+        };
+      });
   };
 
   curated-tokenizers = callPackage ../development/python-modules/curated-tokenizers { };

From 4d392118ea7e00abe19993f7a2e95843f125db74 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 1 Sep 2025 02:27:22 +0100
Subject: [PATCH 1779/6226] python3Packages.warp-lang: correct mathdx license

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/python-modules/warp-lang/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/warp-lang/default.nix b/pkgs/development/python-modules/warp-lang/default.nix
index cd521021b7f8..9de805812305 100644
--- a/pkgs/development/python-modules/warp-lang/default.nix
+++ b/pkgs/development/python-modules/warp-lang/default.nix
@@ -1,4 +1,5 @@
 {
+  _cuda,
   autoAddDriverRunpath,
   buildPythonPackage,
   config,
@@ -107,12 +108,7 @@ let
         # By downloading and using the software, you agree to fully
         # comply with the terms and conditions of the NVIDIA Software
         # License Agreement.
-        (
-          nvidiaCudaRedist
-          // {
-            url = "https://developer.download.nvidia.cn/compute/mathdx/License.txt";
-          }
-        )
+        _cuda.lib.licenses.math_sdk_sla
 
         # Some of the libmathdx routines were written by or derived
         # from code written by Meta Platforms, Inc. and affiliates and

From 3c216c9ed20938a6c04d2c511f3454b429e11eed Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Wed, 24 Sep 2025 03:18:55 +0000
Subject: [PATCH 1780/6226] tests.cuda: fixup

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/test/cuda/default.nix | 49 ++++++++++++++++++--------------------
 1 file changed, 23 insertions(+), 26 deletions(-)

diff --git a/pkgs/test/cuda/default.nix b/pkgs/test/cuda/default.nix
index 242d3c71b273..88c58169d2a6 100644
--- a/pkgs/test/cuda/default.nix
+++ b/pkgs/test/cuda/default.nix
@@ -1,31 +1,28 @@
 {
   lib,
+  pkgs,
   recurseIntoAttrs,
-
-  cudaPackages,
-
-  cudaPackages_12_6,
-  cudaPackages_12_8,
-  cudaPackages_12_9,
-  cudaPackages_12,
-}@args:
-
+}:
 let
-  isTest =
-    name: package:
-    builtins.elem (package.pname or null) [
-      "cuda-library-samples"
-      "saxpy"
-    ];
+  getTests =
+    cps:
+    recurseIntoAttrs {
+      inherit (cps) saxpy;
+      inherit (cps.tests) cuda-library-samples;
+    };
 in
-(lib.trivial.pipe args [
-  (lib.filterAttrs (name: _: lib.hasPrefix "cudaPackages" name))
-  (lib.mapAttrs (
-    _: ps:
-    lib.pipe ps [
-      (lib.filterAttrs isTest)
-      recurseIntoAttrs
-    ]
-  ))
-  recurseIntoAttrs
-])
+recurseIntoAttrs (
+  lib.mapAttrs (_: getTests) {
+    inherit (pkgs)
+      cudaPackages
+
+      cudaPackages_12
+      cudaPackages_12_6
+      cudaPackages_12_8
+      cudaPackages_12_9
+
+      cudaPackages_13
+      cudaPackages_13_0
+      ;
+  }
+)

From 5b43c7a49778f0552e78c4fca0cf440f96ea9ec5 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 29 Sep 2025 20:27:23 +0000
Subject: [PATCH 1781/6226] cuda-packages.nix: re-use
 backendStdenv.hasJetsonCudaCapability

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/top-level/cuda-packages.nix | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index 933dcc49ae30..6623c5b43b4f 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -5,22 +5,8 @@
   lib,
 }:
 let
-  # NOTE: Because manifests are used to add redistributables to the package set,
-  # we cannot have values depend on the package set itself, or we run into infinite recursion.
-
-  # Since Jetson capabilities are never built by default, we can check if any of them were requested
-  # through final.config.cudaCapabilities and use that to determine if we should change some manifest versions.
-  # Copied from backendStdenv.
-  hasJetsonCudaCapability =
-    let
-      jetsonCudaCapabilities = lib.filter (
-        cudaCapability: _cuda.db.cudaCapabilityToInfo.${cudaCapability}.isJetson
-      ) _cuda.db.allSortedCudaCapabilities;
-    in
-    lib.intersectLists jetsonCudaCapabilities (config.cudaCapabilities or [ ]) != [ ];
   selectManifests = lib.mapAttrs (name: version: _cuda.manifests.${name}.${version});
-in
-{
+
   cudaPackages_12_6 = callPackage ../development/cuda-modules {
     manifests = selectManifests {
       cublasmp = "0.6.0";
@@ -36,7 +22,7 @@ in
       nvjpeg2000 = "0.9.0";
       nvpl = "25.5";
       nvtiff = "0.5.1";
-      tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
+      tensorrt = if cudaPackages_12_6.backendStdenv.hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
   };
 
@@ -55,7 +41,7 @@ in
       nvjpeg2000 = "0.9.0";
       nvpl = "25.5";
       nvtiff = "0.5.1";
-      tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
+      tensorrt = if cudaPackages_12_8.backendStdenv.hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
   };
 
@@ -74,7 +60,7 @@ in
       nvjpeg2000 = "0.9.0";
       nvpl = "25.5";
       nvtiff = "0.5.1";
-      tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
+      tensorrt = if cudaPackages_12_9.backendStdenv.hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
   };
 
@@ -93,7 +79,15 @@ in
       nvjpeg2000 = "0.9.0";
       nvpl = "25.5";
       nvtiff = "0.5.1";
-      tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
+      tensorrt = if cudaPackages_13_0.backendStdenv.hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
   };
+in
+{
+  inherit
+    cudaPackages_12_6
+    cudaPackages_12_8
+    cudaPackages_12_9
+    cudaPackages_13_0
+    ;
 }

From d637c4036495e2fc0e158614658f690ad183ff46 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 29 Sep 2025 22:34:31 +0000
Subject: [PATCH 1782/6226] _cuda.lib.getRedistSystem: refactor for CUDA 13
 support

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/_cuda/lib/redist.nix         | 70 +++++++++++++++----
 1 file changed, 57 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/cuda-modules/_cuda/lib/redist.nix b/pkgs/development/cuda-modules/_cuda/lib/redist.nix
index a7053dc582c4..613c10d88c32 100644
--- a/pkgs/development/cuda-modules/_cuda/lib/redist.nix
+++ b/pkgs/development/cuda-modules/_cuda/lib/redist.nix
@@ -111,26 +111,39 @@
   /**
     Maps a Nix system to a NVIDIA redistributable system.
 
-    NOTE: We swap out the default `linux-sbsa` redist (for server-grade ARM chips) with the `linux-aarch64` redist
-    (which is for Jetson devices) if we're building any Jetson devices. Since both are based on aarch64, we can only
-    have one or the other, otherwise there's an ambiguity as to which should be used.
+    NOTE: Certain Nix systems can map to multiple NVIDIA redistributable systems. In particular, ARM systems can map to
+    either `linux-sbsa` (for server-grade ARM chips) or `linux-aarch64` (for Jetson devices). Complicating matters
+    further, as of CUDA 13.0, Jetson Thor devices use `linux-sbsa` instead of `linux-aarch64`. (It is unknown whether
+    NVIDIA plans to make the Orin series use `linux-sbsa` as well for the CUDA 13.0 release.)
 
     NOTE: This function *will* be called by unsupported systems because `cudaPackages` is evaluated on all systems. As
     such, we need to handle unsupported systems gracefully.
 
+    NOTE: This function does not check whether the provided CUDA capabilities are valid for the given CUDA version.
+    The heavy validation work to ensure consistency of CUDA capabilities is performed by backendStdenv.
+
     # Type
 
     ```
-    getRedistSystem :: (hasJetsonCudaCapability :: Bool) -> (nixSystem :: String) -> String
+    getRedistSystem ::
+      { cudaCapabilities :: List String
+      , cudaMajorMinorVersion :: String
+      , system :: String
+      }
+      -> String
     ```
 
     # Inputs
 
-    `hasJetsonCudaCapability`
+    `cudaCapabilities`
 
-    : If configured for a Jetson device
+    : The list of CUDA capabilities to build GPU code for
 
-    `nixSystem`
+    `cudaMajorMinorVersion`
+
+    : The major and minor version of CUDA (e.g. "12.6")
+
+    `system`
 
     : The Nix system
 
@@ -140,22 +153,53 @@
     ## `cudaLib.getRedistSystem` usage examples
 
     ```nix
-    getRedistSystem true "aarch64-linux"
+    getRedistSystem {
+      cudaCapabilities = [ "8.7" ];
+      cudaMajorMinorVersion = "12.6";
+      system = "aarch64-linux";
+    }
     => "linux-aarch64"
     ```
 
     ```nix
-    getRedistSystem false "aarch64-linux"
+    getRedistSystem {
+      cudaCapabilities = [ "11.0" ];
+      cudaMajorMinorVersion = "13.0";
+      system = "aarch64-linux";
+    }
+    => "linux-sbsa"
+    ```
+
+    ```nix
+    getRedistSystem {
+      cudaCapabilities = [ "8.0" "8.9" ];
+      cudaMajorMinorVersion = "12.6";
+      system = "aarch64-linux";
+    }
     => "linux-sbsa"
     ```
     :::
   */
   getRedistSystem =
-    hasJetsonCudaCapability: nixSystem:
-    if nixSystem == "x86_64-linux" then
+    {
+      cudaCapabilities,
+      cudaMajorMinorVersion,
+      system,
+    }:
+    if system == "x86_64-linux" then
       "linux-x86_64"
-    else if nixSystem == "aarch64-linux" then
-      if hasJetsonCudaCapability then "linux-aarch64" else "linux-sbsa"
+    else if system == "aarch64-linux" then
+      # If all the Jetson devices are at least 10.1 (Thor, CUDA 12.9; CUDA 13.0 and later use 11.0 for Thor), then
+      # we've got SBSA.
+      if
+        lib.all (
+          cap: _cuda.db.cudaCapabilityToInfo.${cap}.isJetson -> lib.versionAtLeast cap "10.1"
+        ) cudaCapabilities
+      then
+        "linux-sbsa"
+      # Otherwise we've got some Jetson devices older than Thor and need to use linux-aarch64.
+      else
+        "linux-aarch64"
     else
       "unsupported";
 

From 75d424e1c845044b261784fdb98604e78489234e Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 29 Sep 2025 22:35:32 +0000
Subject: [PATCH 1783/6226] cudaPackages.backendStdenv: clean up assertions for
 CUDA 13

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/packages/backendStdenv.nix   | 85 +++++++++++++------
 1 file changed, 57 insertions(+), 28 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/backendStdenv.nix b/pkgs/development/cuda-modules/packages/backendStdenv.nix
index 3ad59dabeb86..c7b0dbd549a5 100644
--- a/pkgs/development/cuda-modules/packages/backendStdenv.nix
+++ b/pkgs/development/cuda-modules/packages/backendStdenv.nix
@@ -24,16 +24,16 @@ let
   inherit (_cuda.lib)
     _cudaCapabilityIsDefault
     _cudaCapabilityIsSupported
-    _evaluateAssertions
+    _mkFailedAssertionsString
     getRedistSystem
     mkVersionedName
     ;
   inherit (lib)
-    addErrorContext
     assertMsg
     extendDerivation
     filter
     findFirst
+    flip
     intersectLists
     pipe
     range
@@ -41,6 +41,7 @@ let
     subtractLists
     toIntBase10
     versionAtLeast
+    versionOlder
     ;
   inherit (lib.versions) major;
 
@@ -68,7 +69,11 @@ let
     hostNixSystem = stdenv.hostPlatform.system;
 
     # The Nix system of the host platform for the CUDA redistributable.
-    hostRedistSystem = getRedistSystem passthruExtra.hasJetsonCudaCapability stdenv.hostPlatform.system;
+    hostRedistSystem = getRedistSystem {
+      inherit (passthruExtra) cudaCapabilities;
+      inherit cudaMajorMinorVersion;
+      inherit (stdenv.hostPlatform) system;
+    };
 
     # Sets whether packages should be built with forward compatibility.
     # TODO(@connorbaker): If the requested CUDA capabilities are not supported by the current CUDA version,
@@ -117,53 +122,74 @@ let
 
   assertions =
     let
-      # Jetson devices cannot be targeted by the same binaries which target non-Jetson devices. While
+      # Jetson devices (pre-Thor) cannot be targeted by the same binaries which target non-Jetson devices. While
       # NVIDIA provides both `linux-aarch64` and `linux-sbsa` packages, which both target `aarch64`,
       # they are built with different settings and cannot be mixed.
-      jetsonMesssagePrefix = "Jetson CUDA capabilities (${toJSON passthruExtra.requestedJetsonCudaCapabilities})";
+      preThorJetsonCudaCapabilities = filter (flip versionOlder "10.1") passthruExtra.requestedJetsonCudaCapabilities;
+      postThorJetsonCudaCapabilities = filter (flip versionAtLeast "10.1") passthruExtra.requestedJetsonCudaCapabilities;
 
       # Remove all known capabilities from the user's list to find unrecognized capabilities.
       unrecognizedCudaCapabilities = subtractLists allSortedCudaCapabilities passthruExtra.cudaCapabilities;
 
-      # Remove all supported capabilities from the user's list to find unsupported capabilities.
-      unsupportedCudaCapabilities = subtractLists passthruExtra.supportedCudaCapabilities passthruExtra.cudaCapabilities;
+      # Capabilities which are too old for this CUDA version.
+      tooOldCudaCapabilities = filter (
+        cap:
+        let
+          # This can be null!
+          maybeMax = cudaCapabilityToInfo.${cap}.maxCudaMajorMinorVersion;
+        in
+        maybeMax != null && lib.versionOlder maybeMax cudaMajorMinorVersion
+      ) passthruExtra.cudaCapabilities;
+
+      # Capabilities which are too new for this CUDA version.
+      tooNewCudaCapabilities = filter (
+        cap: lib.versionOlder cudaMajorMinorVersion cudaCapabilityToInfo.${cap}.minCudaMajorMinorVersion
+      ) passthruExtra.cudaCapabilities;
     in
     [
       {
-        message = "Unrecognized CUDA capabilities: ${toJSON unrecognizedCudaCapabilities}";
+        message = "Requested unrecognized CUDA capabilities: ${toJSON unrecognizedCudaCapabilities}";
         assertion = unrecognizedCudaCapabilities == [ ];
       }
       {
-        message = "Unsupported CUDA capabilities: ${toJSON unsupportedCudaCapabilities}";
-        assertion = unsupportedCudaCapabilities == [ ];
+        message = "Requested CUDA capabilities which are too old for CUDA ${cudaMajorMinorVersion}: ${toJSON tooOldCudaCapabilities}";
+        assertion = tooOldCudaCapabilities == [ ];
+      }
+      {
+        message = "Requested CUDA capabilities which are too new for CUDA ${cudaMajorMinorVersion}: ${toJSON tooNewCudaCapabilities}";
+        assertion = tooNewCudaCapabilities == [ ];
       }
       {
         message =
-          "${jetsonMesssagePrefix} require hostPlatform (currently ${passthruExtra.hostNixSystem}) "
-          + "to be aarch64-linux";
+          "Requested Jetson CUDA capabilities (${toJSON passthruExtra.requestedJetsonCudaCapabilities}) require "
+          + "hostPlatform (${passthruExtra.hostNixSystem}) to be aarch64-linux";
         assertion = passthruExtra.hasJetsonCudaCapability -> passthruExtra.hostNixSystem == "aarch64-linux";
       }
       {
         message =
-          let
-            # Find the capabilities which are not Jetson capabilities.
-            requestedNonJetsonCudaCapabilities = subtractLists (
-              passthruExtra.requestedJetsonCudaCapabilities
-              ++ passthruExtra.requestedArchitectureSpecificCudaCapabilities
-              ++ passthruExtra.requestedFamilySpecificCudaCapabilities
-            ) passthruExtra.cudaCapabilities;
-          in
-          "${jetsonMesssagePrefix} cannot be specified with non-Jetson capabilities "
-          + "(${toJSON requestedNonJetsonCudaCapabilities})";
+          "Requested pre-Thor (10.1) Jetson CUDA capabilities (${toJSON preThorJetsonCudaCapabilities}) cannot be "
+          + "specified with other capabilities (${toJSON (subtractLists preThorJetsonCudaCapabilities passthruExtra.cudaCapabilities)})";
         assertion =
-          passthruExtra.hasJetsonCudaCapability
-          -> passthruExtra.requestedJetsonCudaCapabilities == passthruExtra.cudaCapabilities;
+          # If there are preThorJetsonCudaCapabilities, they must be the only requested capabilities.
+          preThorJetsonCudaCapabilities != [ ]
+          -> preThorJetsonCudaCapabilities == passthruExtra.cudaCapabilities;
+      }
+      {
+        message =
+          "Requested pre-Thor (10.1) Jetson CUDA capabilities (${toJSON preThorJetsonCudaCapabilities}) require "
+          + "computed NVIDIA hostRedistSystem (${passthruExtra.hostRedistSystem}) to be linux-aarch64";
+        assertion =
+          preThorJetsonCudaCapabilities != [ ] -> passthruExtra.hostRedistSystem == "linux-aarch64";
+      }
+      {
+        message =
+          "Requested post-Thor (10.1) Jetson CUDA capabilities (${toJSON postThorJetsonCudaCapabilities}) require "
+          + "computed NVIDIA hostRedistSystem (${passthruExtra.hostRedistSystem}) to be linux-sbsa";
+        assertion = postThorJetsonCudaCapabilities != [ ] -> passthruExtra.hostRedistSystem == "linux-sbsa";
       }
     ];
 
-  assertCondition = addErrorContext "while evaluating ${mkVersionedName "cudaPackages" cudaMajorMinorVersion}.backendStdenv" (
-    _evaluateAssertions assertions
-  );
+  failedAssertionsString = _mkFailedAssertionsString assertions;
 
   # TODO(@connorbaker): Seems like `stdenvAdapters.useLibsFrom` breaks clangStdenv's ability to find header files.
   # To reproduce: use `nix shell .#cudaPackages_12_6.backendClangStdenv.cc` since CUDA 12.6 supports at most Clang
@@ -239,4 +265,7 @@ let
       stdenvAdapters.useLibsFrom stdenv maybeHostStdenv;
 in
 # TODO: Consider testing whether we in fact use the newer libstdc++
-extendDerivation assertCondition passthruExtra backendStdenv
+# NOTE: The assertion message we get from `extendDerivation` is not at all helpful. Instead, we use assertMsg.
+assert assertMsg (failedAssertionsString == "")
+  "${mkVersionedName "cudaPackages" cudaMajorMinorVersion}.backendStdenv has failed assertions:${failedAssertionsString}";
+extendDerivation true passthruExtra backendStdenv

From 20f3fc3cfd72bb9350a208b458a161ed47706ae3 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 29 Sep 2025 22:36:12 +0000
Subject: [PATCH 1784/6226] cudaPackages.cuda_cudart: cuda_compat can be null
 or unavailable

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/packages/cuda_cudart.nix     | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/cuda_cudart.nix b/pkgs/development/cuda-modules/packages/cuda_cudart.nix
index 4b1619fa40ba..f85a8dc23295 100644
--- a/pkgs/development/cuda-modules/packages/cuda_cudart.nix
+++ b/pkgs/development/cuda-modules/packages/cuda_cudart.nix
@@ -3,7 +3,6 @@
 {
   _cuda,
   addDriverRunpath,
-  backendStdenv,
   buildRedist,
   cuda_cccl,
   cuda_compat,
@@ -12,7 +11,7 @@
   cudaAtLeast,
   lib,
 }:
-buildRedist {
+buildRedist (finalAttrs: {
   redistName = "cuda";
   pname = "cuda_cudart";
 
@@ -28,10 +27,11 @@ buildRedist {
     "stubs"
   ];
 
-  propagatedBuildOutputs = [
-    "static" # required by CMake
-    "stubs" # always propagate, even when cuda_compat is used, to avoid symbol linking errors
-  ];
+  propagatedBuildOutputs =
+    # required by CMake
+    lib.optionals (lib.elem "static" finalAttrs.outputs) [ "static" ]
+    # always propagate, even when cuda_compat is used, to avoid symbol linking errors
+    ++ lib.optionals (lib.elem "stubs" finalAttrs.outputs) [ "stubs" ];
 
   # When cuda_compat is available, propagate it.
   # NOTE: `cuda_compat` can be disabled by setting the package to `null`. This is useful in cases where
@@ -47,9 +47,8 @@ buildRedist {
     # - nv/target
     # TODO(@connorbaker): Check that the dependency offset for this is correct.
     ++ [ (lib.getOutput "include" cuda_cccl) ]
-    ++ lib.optionals (backendStdenv.hasJetsonCudaCapability && cuda_compat != null) [
-      cuda_compat
-    ];
+    # NOTE: cuda_compat may be null or unavailable
+    ++ lib.optionals (cuda_compat.meta.available or false) [ cuda_compat ];
 
   allowFHSReferences = false;
 
@@ -95,4 +94,4 @@ buildRedist {
   '';
 
   meta.description = "CUDA Runtime";
-}
+})

From 09ea5703ac5ec12ea0a49d2280350d3edb3fd948 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 29 Sep 2025 22:36:46 +0000
Subject: [PATCH 1785/6226] cudaPackages.autoAddCudaCompatRunpath: make hook a
 no-op when cuda_compat is unavailable

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../auto-add-cuda-compat-runpath.sh           | 11 ++++++---
 .../autoAddCudaCompatRunpath/package.nix      | 24 +++++++++----------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/auto-add-cuda-compat-runpath.sh b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/auto-add-cuda-compat-runpath.sh
index fc41024f1551..d4b37cce05a7 100644
--- a/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/auto-add-cuda-compat-runpath.sh
+++ b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/auto-add-cuda-compat-runpath.sh
@@ -3,18 +3,23 @@
 # coming from the cuda_compat package by adding it to the RUNPATH.
 echo "Sourcing auto-add-cuda-compat-runpath-hook"
 
+if [[ -z "@libcudaPath@" ]]; then
+  echo "auto-add-cuda-compat-runpath-hook: cuda_compat not available, skipping hook"
+  return
+fi
+
 addCudaCompatRunpath() {
   local libPath
   local origRpath
 
   if [[ $# -eq 0 ]]; then
-    echo "addCudaCompatRunpath: no library path provided" >&2
+    nixLog "no library path provided" >&2
     exit 1
   elif [[ $# -gt 1 ]]; then
-    echo "addCudaCompatRunpath: too many arguments" >&2
+    nixLog "too many arguments" >&2
     exit 1
   elif [[ "$1" == "" ]]; then
-    echo "addCudaCompatRunpath: empty library path" >&2
+    nixLog "empty library path" >&2
     exit 1
   else
     libPath="$1"
diff --git a/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix
index 5df6535bc81d..242323052563 100644
--- a/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix
+++ b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix
@@ -6,24 +6,24 @@
 {
   autoFixElfFiles,
   cuda_compat,
+  lib,
   makeSetupHook,
 }:
+let
+  # cuda_compat can be null or broken, depending on the platform, CUDA release, and compute capability.
+  # To avoid requiring all consumers of this hook to do these checks, we do them here; the hook is a no-op if
+  # cuda_compat is not available.
+  enableHook = cuda_compat != null && cuda_compat.meta.available;
+in
 makeSetupHook {
   name = "auto-add-cuda-compat-runpath-hook";
-  propagatedBuildInputs = [ autoFixElfFiles ];
+  propagatedBuildInputs = lib.optionals enableHook [ autoFixElfFiles ];
 
   substitutions = {
-    libcudaPath = "${cuda_compat}/compat";
+    libcudaPath = lib.optionalString enableHook "${cuda_compat}/compat";
   };
 
-  meta =
-    let
-      # Handle `null`s in pre-`cuda_compat` releases,
-      # and `badPlatform`s for `!isJetsonBuild`.
-      platforms = cuda_compat.meta.platforms or [ ];
-      badPlatforms = cuda_compat.meta.badPlatforms or platforms;
-    in
-    {
-      inherit badPlatforms platforms;
-    };
+  passthru = {
+    inherit enableHook;
+  };
 } ./auto-add-cuda-compat-runpath.sh

From 9602bfe0a049f7bbce407cbab98dcbaf9dbb69c7 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 9 Oct 2025 20:34:07 +0000
Subject: [PATCH 1786/6226] cudaPackages.buildRedist: condition inclusion of
 autoAddCudaCompatRupath on its enablement

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/buildRedist/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/cuda-modules/buildRedist/default.nix b/pkgs/development/cuda-modules/buildRedist/default.nix
index b29eacd37c2b..a1aa5645bce4 100644
--- a/pkgs/development/cuda-modules/buildRedist/default.nix
+++ b/pkgs/development/cuda-modules/buildRedist/default.nix
@@ -272,7 +272,7 @@ extendMkDerivation {
       # autoAddCudaCompatRunpath depends on cuda_compat and would cause
       # infinite recursion if applied to `cuda_compat` itself (beside the fact
       # that it doesn't make sense in the first place)
-      ++ lib.optionals (finalAttrs.pname != "cuda_compat" && flags.isJetsonBuild) [
+      ++ lib.optionals (finalAttrs.pname != "cuda_compat" && autoAddCudaCompatRunpath.enableHook) [
         # autoAddCudaCompatRunpath must appear AFTER autoAddDriverRunpath.
         # See its documentation in ./setup-hooks/extension.nix.
         autoAddCudaCompatRunpath

From 909949ced661063141c694797c04d0074fdf4c8d Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 29 Sep 2025 22:37:12 +0000
Subject: [PATCH 1787/6226] cudaPackages.nccl: allow building on Thor and later

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/packages/nccl.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/nccl.nix b/pkgs/development/cuda-modules/packages/nccl.nix
index 48ce87101eba..07f0ba06a067 100644
--- a/pkgs/development/cuda-modules/packages/nccl.nix
+++ b/pkgs/development/cuda-modules/packages/nccl.nix
@@ -18,7 +18,7 @@
 }:
 let
   inherit (_cuda.lib) _mkMetaBadPlatforms;
-  inherit (backendStdenv) hasJetsonCudaCapability;
+  inherit (backendStdenv) hasJetsonCudaCapability requestedJetsonCudaCapabilities;
   inherit (lib) licenses maintainers teams;
   inherit (lib.attrsets)
     getBin
@@ -91,8 +91,10 @@ backendStdenv.mkDerivation (finalAttrs: {
   passthru = {
     platformAssertions = [
       {
-        message = "target is not a Jetson device";
-        assertion = !hasJetsonCudaCapability;
+        message = "Pre-Thor Jetson devices (CUDA capabilities < 10.1) are not supported by NCCL";
+        assertion =
+          !hasJetsonCudaCapability
+          || lib.all (lib.flip lib.versionAtLeast "10.1") requestedJetsonCudaCapabilities;
       }
     ];
 
@@ -110,7 +112,7 @@ backendStdenv.mkDerivation (finalAttrs: {
       "aarch64-linux"
       "x86_64-linux"
     ];
-    # NCCL is not supported on Jetson, because it does not use NVLink or PCI-e for inter-GPU communication.
+    # NCCL is not supported on Pre-Thor Jetsons, because it does not use NVLink or PCI-e for inter-GPU communication.
     # https://forums.developer.nvidia.com/t/can-jetson-orin-support-nccl/232845/9
     badPlatforms = _mkMetaBadPlatforms finalAttrs;
     maintainers = with maintainers; [

From d21cad3bb1841daec382a99d984d052aac2cb922 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 30 Sep 2025 15:28:29 -0700
Subject: [PATCH 1788/6226] cudaPackages.tests.redists-{unpacked,installed}:
 include license metadata

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../packages/tests/redists-installed.nix      | 54 +++++++++++++++----
 .../packages/tests/redists-unpacked.nix       | 29 +++++++---
 2 files changed, 64 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/tests/redists-installed.nix b/pkgs/development/cuda-modules/packages/tests/redists-installed.nix
index 606a0d166136..5ef1cde8ae31 100644
--- a/pkgs/development/cuda-modules/packages/tests/redists-installed.nix
+++ b/pkgs/development/cuda-modules/packages/tests/redists-installed.nix
@@ -1,17 +1,49 @@
 {
+  _cuda,
+  backendStdenv,
   cudaNamePrefix,
-  cudaPackages,
   lib,
   linkFarm,
+  tests,
 }:
-linkFarm "${cudaNamePrefix}-redists-installed" (
-  lib.concatMapAttrs (
-    name: attr:
-    lib.optionalAttrs (attr ? passthru.redistName && attr.meta.available or false) (
-      lib.genAttrs' attr.outputs (output: {
-        name = "${name}-${output}";
-        value = attr.${output};
-      })
-    )
-  ) cudaPackages
+# NOTE: Because Nixpkgs, by default, allows aliases, this derivation may contain multiple entries for a single redistributable.
+let
+  # redists-unpacked has already found all the names of the redistributables
+  availableRedistsForPlatform = lib.filterAttrs (
+    _: value: value.meta.available or false
+  ) tests.redists-unpacked.passthru.redistsForPlatform;
+
+  mkOutputs =
+    name: drv:
+    lib.genAttrs' drv.outputs (output: {
+      name = "${name}-${output}";
+      value = drv.${output};
+    });
+
+  linkedWithoutLicenses = linkFarm "${cudaNamePrefix}-redists-installed" (
+    lib.concatMapAttrs mkOutputs availableRedistsForPlatform
+  );
+in
+linkedWithoutLicenses.overrideAttrs (
+  finalAttrs: prevAttrs: {
+    passthru = prevAttrs.passthru or { } // {
+      inherit availableRedistsForPlatform;
+
+      brokenAssertions = prevAttrs.passthru.brokenAssertions or [ ] ++ [
+        {
+          message = "No redists are available for the current platform (${backendStdenv.hostNixSystem}); ensure proper licenses are allowed";
+          assertion = availableRedistsForPlatform != { };
+        }
+      ];
+    };
+
+    meta = prevAttrs.meta or { } // {
+      broken = _cuda.lib._mkMetaBroken finalAttrs;
+      license = lib.unique (
+        lib.concatMap (drv: lib.toList (drv.meta.license or [ ])) (
+          lib.attrValues availableRedistsForPlatform
+        )
+      );
+    };
+  }
 )
diff --git a/pkgs/development/cuda-modules/packages/tests/redists-unpacked.nix b/pkgs/development/cuda-modules/packages/tests/redists-unpacked.nix
index f822210b5889..cbc0e49de360 100644
--- a/pkgs/development/cuda-modules/packages/tests/redists-unpacked.nix
+++ b/pkgs/development/cuda-modules/packages/tests/redists-unpacked.nix
@@ -4,11 +4,24 @@
   lib,
   linkFarm,
 }:
-linkFarm "${cudaNamePrefix}-redists-unpacked" (
-  lib.concatMapAttrs (
-    name: attr:
-    lib.optionalAttrs (attr ? passthru.redistName && attr.src or null != null) {
-      ${name} = attr.src;
-    }
-  ) cudaPackages
-)
+# NOTE: Because Nixpkgs, by default, allows aliases, this derivation may contain multiple entries for a single redistributable.
+let
+  redistsForPlatform = lib.filterAttrs (
+    _: value: value ? passthru.redistName && value.src or null != null
+  ) cudaPackages;
+
+  linkedWithoutLicenses = linkFarm "${cudaNamePrefix}-redists-unpacked" (
+    lib.mapAttrs (_: drv: drv.src) redistsForPlatform
+  );
+in
+linkedWithoutLicenses.overrideAttrs (prevAttrs: {
+  passthru = prevAttrs.passthru or { } // {
+    inherit redistsForPlatform;
+  };
+
+  meta = prevAttrs.meta or { } // {
+    license = lib.unique (
+      lib.concatMap (drv: lib.toList (drv.meta.license or [ ])) (lib.attrValues redistsForPlatform)
+    );
+  };
+})

From adcfdf7eafd5267403c1fbe9f17f3df2c43f0f9b Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 3 Oct 2025 10:12:42 -0700
Subject: [PATCH 1789/6226] cudaPackages.libcudla: only available on Xavier and
 Orin

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/packages/libcudla.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/development/cuda-modules/packages/libcudla.nix b/pkgs/development/cuda-modules/packages/libcudla.nix
index c8a1b4549dcb..809c0008884d 100644
--- a/pkgs/development/cuda-modules/packages/libcudla.nix
+++ b/pkgs/development/cuda-modules/packages/libcudla.nix
@@ -18,4 +18,16 @@ buildRedist {
   autoPatchelfIgnoreMissingDeps = lib.optionals backendStdenv.hasJetsonCudaCapability [
     "libnvcudla.so"
   ];
+
+  passthru.platformAssertions = [
+    {
+      message = "Only Xavier (7.2) and Orin (8.7) Jetson devices are supported";
+      assertion =
+        let
+          inherit (backendStdenv) hasJetsonCudaCapability requestedJetsonCudaCapabilities;
+        in
+        hasJetsonCudaCapability
+        -> (lib.subtractLists [ "7.2" "8.7" ] requestedJetsonCudaCapabilities == [ ]);
+    }
+  ];
 }

From 02b3f483fd60f8e0af1db1122236df4c9ccef8e3 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 3 Oct 2025 10:13:32 -0700
Subject: [PATCH 1790/6226] cudaPackages.tensorrt: properly condition inclusion
 of libcudla

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/packages/tensorrt.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/cuda-modules/packages/tensorrt.nix b/pkgs/development/cuda-modules/packages/tensorrt.nix
index 395fb494f1ba..0a1192090e90 100644
--- a/pkgs/development/cuda-modules/packages/tensorrt.nix
+++ b/pkgs/development/cuda-modules/packages/tensorrt.nix
@@ -46,7 +46,7 @@ buildRedist (
       (getLib cuda_nvrtc)
       cuda_cudart
     ]
-    ++ optionals hasJetsonCudaCapability [ libcudla ];
+    ++ optionals libcudla.meta.available [ libcudla ];
 
     preInstall =
       let

From 26ad532defd88e41559e1ee22545ff07eeee0236 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 9 Oct 2025 02:59:03 +0000
Subject: [PATCH 1791/6226] colmap: only Linux is supported with CUDA

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/by-name/co/colmap/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/colmap/package.nix b/pkgs/by-name/co/colmap/package.nix
index babe6beab93b..318fe7cc9932 100644
--- a/pkgs/by-name/co/colmap/package.nix
+++ b/pkgs/by-name/co/colmap/package.nix
@@ -129,7 +129,7 @@ stdenv'.mkDerivation {
     mainProgram = "colmap";
     homepage = "https://colmap.github.io/index.html";
     license = licenses.bsd3;
-    platforms = platforms.unix;
+    platforms = if cudaSupport then platforms.linux else platforms.unix;
     maintainers = with maintainers; [
       lebastr
       usertam

From 4252ef54c239301e49c8d4cf8c002a1074d6a61d Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 9 Oct 2025 18:28:26 +0000
Subject: [PATCH 1792/6226] doc: update CUDA section

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 doc/languages-frameworks/cuda.section.md | 126 +++++++----------------
 doc/redirects.json                       |   9 +-
 2 files changed, 38 insertions(+), 97 deletions(-)

diff --git a/doc/languages-frameworks/cuda.section.md b/doc/languages-frameworks/cuda.section.md
index 9ab8edc04726..01b70402cf48 100644
--- a/doc/languages-frameworks/cuda.section.md
+++ b/doc/languages-frameworks/cuda.section.md
@@ -49,45 +49,23 @@ The `cudaForwardCompat` boolean configuration option determines whether PTX supp
 
 ### Modifying CUDA package sets {#cuda-modifying-cuda-package-sets}
 
-CUDA package sets are created by using `callPackage` on `pkgs/top-level/cuda-packages.nix` with an explicit argument for `cudaMajorMinorVersion`, a string of the form `"<major>.<minor>"` (e.g., `"12.2"`), which informs the CUDA package set tooling which version of CUDA to use. The majority of the CUDA package set tooling is available through the top-level attribute set `_cuda`, a fixed-point defined outside the CUDA package sets.
+CUDA package sets are defined in `pkgs/top-level/cuda-packages.nix`. A CUDA package set is created by `callPackage`-ing `pkgs/development/cuda-modules/default.nix` with an attribute set `manifests`, containing NVIDIA manifests for each redistributable. The manifests for supported redistributables are available through `_cuda.manifests` and live in `pkgs/development/cuda-modules/_cuda/manifests`.
 
-::: {.caution}
-The `cudaMajorMinorVersion` and `_cuda` attributes are not part of the CUDA package set fixed-point, but are instead provided by `callPackage` from the top-level in the construction of the package set. As such, they must be modified via the package set's `override` attribute.
-:::
+The majority of the CUDA package set tooling is available through the top-level attribute set `_cuda`, a fixed-point defined outside the CUDA package sets. As a fixed-point, `_cuda` should be modified through its `extend` attribute.
 
 ::: {.caution}
 As indicated by the underscore prefix, `_cuda` is an implementation detail and no guarantees are provided with respect to its stability or API. The `_cuda` attribute set is exposed only to ease creation or modification of CUDA package sets by expert, out-of-tree users.
 :::
 
+Out-of-tree modifications of packages should use `overrideAttrs` to make any necessary modifications to the package expression.
+
 ::: {.note}
-The `_cuda` attribute set fixed-point should be modified through its `extend` attribute.
+The `_cuda` attribute set previously exposed `fixups`, an attribute set mapping from package name (`pname`) to a `callPackage`-compatible expression which provided to `overrideAttrs` on the result of a generic redistributable builder. This functionality has been removed in favor of including full package expressions for each redistributable package to ensure consistent attribute set membership across supported CUDA releases, platforms, and configurations.
 :::
 
-The `_cuda.fixups` attribute set is a mapping from package name (`pname`) to a `callPackage`-compatible expression which will be provided to `overrideAttrs` on the result of our generic builder.
-
-::: {.caution}
-Fixups are chosen from `_cuda.fixups` by `pname`. As a result, packages with multiple versions (e.g., `cudnn`, `cudnn_8_9`, etc.) all share a single fixup function (i.e., `_cuda.fixups.cudnn`, which is `pkgs/development/cuda-modules/fixups/cudnn.nix`).
-:::
-
-As an example, you can change the fixup function used for cuDNN for only the default CUDA package set with this overlay:
-
-```nix
-final: prev: {
-  cudaPackages = prev.cudaPackages.override (prevArgs: {
-    _cuda = prevArgs._cuda.extend (
-      _: prevAttrs: {
-        fixups = prevAttrs.fixups // {
-          cudnn = <your-fixup-function>;
-        };
-      }
-    );
-  });
-}
-```
-
 ### Extending CUDA package sets {#cuda-extending-cuda-package-sets}
 
-CUDA package sets are scopes and provide the usual `overrideScope` attribute for overriding package attributes (see the note about `cudaMajorMinorVersion` and `_cuda` in [Configuring CUDA package sets](#cuda-modifying-cuda-package-sets)).
+CUDA package sets are scopes and provide the usual `overrideScope` attribute for overriding package attributes (see the note about `_cuda` in [Configuring CUDA package sets](#cuda-modifying-cuda-package-sets)).
 
 Inspired by `pythonPackagesExtensions`, the `_cuda.extensions` attribute is a list of extensions applied to every version of the CUDA package set, allowing modification of all versions of the CUDA package set without needing to know their names or explicitly enumerate and modify them. As an example, disabling `cuda_compat` across all CUDA package sets can be accomplished with this overlay:
 
@@ -101,6 +79,8 @@ final: prev: {
 }
 ```
 
+Redistributable packages are constructed by the `buildRedist` helper; see `pkgs/development/cuda-modules/buildRedist/default.nix` for the implementation.
+
 ### Using `cudaPackages` {#cuda-using-cudapackages}
 
 ::: {.caution}
@@ -180,7 +160,7 @@ In `pkgsForCudaArch`, the `cudaForwardCompat` option is set to `false` because e
 ::: {.caution}
 Not every version of CUDA supports every architecture!
 
-To illustrate: support for Blackwell (e.g., `sm_100`) was added in CUDA 12.8. Assume our Nixpkgs' default CUDA package set is to CUDA 12.6. Then the Nixpkgs variant available through `pkgsForCudaArch.sm_100` is useless, since packages like `pkgsForCudaArch.sm_100.opencv` and `pkgsForCudaArch.sm_100.python3Packages.torch` will try to generate code for `sm_100`, an architecture unknown to CUDA 12.6. In that case, you should use `pkgsForCudaArch.sm_100.cudaPackages_12_8.pkgs` instead (see [Using cudaPackages.pkgs](#cuda-using-cudapackages-pkgs) for more details).
+To illustrate: support for Blackwell (e.g., `sm_100`) was added in CUDA 12.8. Assume our Nixpkgs' default CUDA package set is to CUDA 12.6. Then the Nixpkgs variant available through `pkgsForCudaArch.sm_100` is useless, since packages like `pkgsForCudaArch.sm_100.opencv` and `pkgsForCudaArch.sm_100.python3Packages.torch` will try to generate code for `sm_100`, an architecture unknown to CUDA 12.6. In that case, you should use `pkgsForCudaArch.sm_100.cudaPackages_12_8.pkgs` instead (see [Using `cudaPackages.pkgs`](#cuda-using-cudapackages-pkgs) for more details).
 :::
 
 The `pkgsForCudaArch` attribute set makes it possible to access packages built for a specific architecture without needing to manually call `pkgs.extend` and supply a new `config`. As an example, `pkgsForCudaArch.sm_89.python3Packages.torch` provides PyTorch built for Ada Lovelace GPUs.
@@ -292,82 +272,41 @@ This section of the docs is still very much in progress. Feedback is welcome in
 
 ### Package set maintenance {#cuda-package-set-maintenance}
 
-The CUDA Toolkit is a suite of CUDA libraries and software meant to provide a development environment for CUDA-accelerated applications. Until the release of CUDA 11.4, NVIDIA had only made the CUDA Toolkit available as a multi-gigabyte runfile installer, which we provide through the [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) attribute. From CUDA 11.4 and onwards, NVIDIA has also provided CUDA redistributables (“CUDA-redist”): individually packaged CUDA Toolkit components meant to facilitate redistribution and inclusion in downstream projects. These packages are available in the [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set.
+The CUDA Toolkit is a suite of CUDA libraries and software meant to provide a development environment for CUDA-accelerated applications. Until the release of CUDA 11.4, NVIDIA had only made the CUDA Toolkit available as a multi-gigabyte runfile installer. From CUDA 11.4 and onwards, NVIDIA has also provided CUDA redistributables (“CUDA-redist”): individually packaged CUDA Toolkit components meant to facilitate redistribution and inclusion in downstream projects. These packages are available in the [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set.
 
-All new projects should use the CUDA redistributables available in [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) in place of [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit), as they are much easier to maintain and update.
+While the monolithic CUDA Toolkit runfile installer is no longer provided, [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) provides a `symlinkJoin`-ed approximation which common libraries. The use of [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) is discouraged: all new projects should use the CUDA redistributables available in [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) instead, as they are much easier to maintain and update.
 
 #### Updating redistributables {#cuda-updating-redistributables}
 
-1. Go to NVIDIA's index of CUDA redistributables: <https://developer.download.nvidia.com/compute/cuda/redist/>
-2. Make a note of the new version of CUDA available.
-3. Run
+Whenever a new version of a redistributable manifest is made available:
 
-   ```bash
-   nix run github:connorbaker/cuda-redist-find-features -- \
-      download-manifests \
-      --log-level DEBUG \
-      --version <newest CUDA version> \
-      https://developer.download.nvidia.com/compute/cuda/redist \
-      ./pkgs/development/cuda-modules/cuda/manifests
-   ```
+1. Check the corresponding README.md in `pkgs/development/cuda-modules/_cuda/manifests` for the URL to use when vendoring manifests.
+2. Update the manifest version used in construction of each CUDA package set in `pkgs/top-level/cuda-packages.nix`.
+3. Update package expressions in `pkgs/development/cuda-modules/packages`.
 
-   This will download a copy of the manifest for the new version of CUDA.
-4. Run
+Updating package expressions amounts to:
 
-   ```bash
-   nix run github:connorbaker/cuda-redist-find-features -- \
-      process-manifests \
-      --log-level DEBUG \
-      --version <newest CUDA version> \
-      https://developer.download.nvidia.com/compute/cuda/redist \
-      ./pkgs/development/cuda-modules/cuda/manifests
-   ```
-
-   This will generate a `redistrib_features_<newest CUDA version>.json` file in the same directory as the manifest.
-5. Update the `cudaVersionMap` attribute set in `pkgs/development/cuda-modules/cuda/extension.nix`.
-
-#### Updating cuTensor {#cuda-updating-cutensor}
-
-1. Repeat the steps present in [Updating CUDA redistributables](#cuda-updating-redistributables) with the following changes:
-   - Use the index of cuTensor redistributables: <https://developer.download.nvidia.com/compute/cutensor/redist>
-   - Use the newest version of cuTensor available instead of the newest version of CUDA.
-   - Use `pkgs/development/cuda-modules/cutensor/manifests` instead of `pkgs/development/cuda-modules/cuda/manifests`.
-   - Skip the step of updating `cudaVersionMap` in `pkgs/development/cuda-modules/cuda/extension.nix`.
+- adding fixes conditioned on newer releases, like added or removed dependencies
+- adding package expressions for new packages
+- updating `passthru.brokenConditions` and `passthru.badPlatformsConditions` with various constraints, (e.g., new releases removing support for various architectures)
 
 #### Updating supported compilers and GPUs {#cuda-updating-supported-compilers-and-gpus}
 
-1. Update `nvccCompatibilities` in `pkgs/development/cuda-modules/_cuda/data/nvcc.nix` to include the newest release of NVCC, as well as any newly supported host compilers.
-2. Update `cudaCapabilityToInfo` in `pkgs/development/cuda-modules/_cuda/data/cuda.nix` to include any new GPUs supported by the new release of CUDA.
-
-#### Updating the CUDA Toolkit runfile installer {#cuda-updating-the-cuda-toolkit}
-
-::: {.warning}
-While the CUDA Toolkit runfile installer is still available in Nixpkgs as the [`cudaPackages.cudatoolkit`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages.cudatoolkit) attribute, its use is not recommended, and it should be considered deprecated. Please migrate to the CUDA redistributables provided by the [`cudaPackages`](https://search.nixos.org/packages?channel=unstable&type=packages&query=cudaPackages) package set.
-
-To ensure packages relying on the CUDA Toolkit runfile installer continue to build, it will continue to be updated until a migration path is available.
-:::
-
-1. Go to NVIDIA's CUDA Toolkit runfile installer download page: <https://developer.nvidia.com/cuda-downloads>
-2. Select the appropriate OS, architecture, distribution, and version, and installer type.
-
-   - For example: Linux, x86_64, Ubuntu, 22.04, runfile (local)
-   - NOTE: Typically, we use the Ubuntu runfile. It is unclear if the runfile for other distributions will work.
-
-3. Take the link provided by the installer instructions on the webpage after selecting the installer type and get its hash by running:
-
-   ```bash
-   nix store prefetch-file --hash-type sha256 <link>
-   ```
-
-4. Update `pkgs/development/cuda-modules/cudatoolkit/releases.nix` to include the release.
+1. Update `nvccCompatibilities` in `pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix` to include the newest release of NVCC, as well as any newly supported host compilers.
+2. Update `cudaCapabilityToInfo` in `pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix` to include any new GPUs supported by the new release of CUDA.
 
 #### Updating the CUDA package set {#cuda-updating-the-cuda-package-set}
 
-1. Include a new `cudaPackages_<major>_<minor>` package set in `pkgs/top-level/all-packages.nix`.
+::: {.note}
+Changing the default CUDA package set should occur in a separate PR, allowing time for additional testing.
+:::
 
-   - NOTE: Changing the default CUDA package set should occur in a separate PR, allowing time for additional testing.
+::: {.warning}
+As described in [Using `cudaPackages.pkgs`](#cuda-using-cudapackages-pkgs), the current implementation fix for package set leakage involves creating a new instance for each non-default CUDA package sets. As such, We should limit the number of CUDA package sets which have `recurseForDerivations` set to true: `lib.recurseIntoAttrs` should only be applied to the default CUDA package set.
+:::
 
-2. Successfully build the closure of the new package set, updating `pkgs/development/cuda-modules/cuda/overrides.nix` as needed. Below are some common failures:
+1. Include a new `cudaPackages_<major>_<minor>` package set in `pkgs/top-level/cuda-packages.nix` and inherit it in `pkgs/top-level/all-packages.nix`.
+2. Successfully build the closure of the new package set, updating expressions in `pkgs/development/cuda-modules/packages` as needed. Below are some common failures:
 
 | Unable to ...  | During ...                       | Reason                                           | Solution                   | Note                                                         |
 | -------------- | -------------------------------- | ------------------------------------------------ | -------------------------- | ------------------------------------------------------------ |
@@ -375,6 +314,13 @@ To ensure packages relying on the CUDA Toolkit runfile installer continue to bui
 | Find libraries | `configurePhase`                 | Missing dependency on a `dev` output             | Add the missing dependency | The `dev` output typically contains CMake configuration files |
 | Find libraries | `buildPhase` or `patchelf`       | Missing dependency on a `lib` or `static` output | Add the missing dependency | The `lib` or `static` output typically contains the libraries |
 
+::: {.note}
+Two utility derivations ease testing updates to the package set:
+
+- `cudaPackages.tests.redists-unpacked`: the `src` of each redistributable package unpacked and `symlinkJoin`-ed
+- `cudaPackages.tests.redists-installed`: each output of each redistributable package `symlinkJoin`-ed
+:::
+
 Failure to run the resulting binary is typically the most challenging to diagnose, as it may involve a combination of the aforementioned issues. This type of failure typically occurs when a library attempts to load or open a library it depends on that it does not declare in its `DT_NEEDED` section. Try the following debugging steps:
 
 1. First ensure that dependencies are patched with [`autoAddDriverRunpath`](https://search.nixos.org/packages?channel=unstable&type=packages&query=autoAddDriverRunpath).
diff --git a/doc/redirects.json b/doc/redirects.json
index 4198cee6ca48..3ac53e80a42b 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -58,9 +58,8 @@
   ],
   "cuda-updating-redistributables": [
     "index.html#cuda-updating-redistributables",
-    "index.html#updating-cuda-redistributables"
-  ],
-  "cuda-updating-cutensor": [
+    "index.html#updating-cuda-redistributables",
+    "index.html#updating-the-cuda-toolkit",
     "index.html#cuda-updating-cutensor",
     "index.html#updating-cutensor"
   ],
@@ -72,10 +71,6 @@
     "index.html#cuda-updating-the-cuda-package-set",
     "index.html#updating-the-cuda-package-set"
   ],
-  "cuda-updating-the-cuda-toolkit": [
-    "index.html#cuda-updating-the-cuda-toolkit",
-    "index.html#updating-the-cuda-toolkit"
-  ],
   "cuda-user-guide": [
     "index.html#cuda-user-guide"
   ],

From 9c5a55ebe15f497e96bfa18a21e0fdd27e9c8f43 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 9 Oct 2025 18:34:35 +0000
Subject: [PATCH 1793/6226] cudaPackages: remove some packages expressions
 which aren't ready

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/README.md       |  4 +-
 .../packages/collectx_bringup.nix             | 48 -------------------
 .../packages/cuda_sandbox_dev.nix             |  6 ---
 .../cuda-modules/packages/cudnn_samples.nix   | 36 --------------
 .../packages/driver_assistant.nix             | 14 ------
 .../cuda-modules/packages/libnvidia_nscq.nix  | 12 -----
 .../cuda-modules/packages/libnvsdm.nix        | 16 -------
 .../development/cuda-modules/packages/mft.nix | 39 ---------------
 .../packages/mft_autocomplete.nix             | 39 ---------------
 .../cuda-modules/packages/mft_oem.nix         | 25 ----------
 .../cuda-modules/packages/nvidia_driver.nix   | 14 ------
 .../cuda-modules/packages/nvlsm.nix           | 30 ------------
 12 files changed, 3 insertions(+), 280 deletions(-)
 delete mode 100644 pkgs/development/cuda-modules/packages/collectx_bringup.nix
 delete mode 100644 pkgs/development/cuda-modules/packages/cuda_sandbox_dev.nix
 delete mode 100644 pkgs/development/cuda-modules/packages/cudnn_samples.nix
 delete mode 100644 pkgs/development/cuda-modules/packages/driver_assistant.nix
 delete mode 100644 pkgs/development/cuda-modules/packages/libnvidia_nscq.nix
 delete mode 100644 pkgs/development/cuda-modules/packages/libnvsdm.nix
 delete mode 100644 pkgs/development/cuda-modules/packages/mft.nix
 delete mode 100644 pkgs/development/cuda-modules/packages/mft_autocomplete.nix
 delete mode 100644 pkgs/development/cuda-modules/packages/mft_oem.nix
 delete mode 100644 pkgs/development/cuda-modules/packages/nvidia_driver.nix
 delete mode 100644 pkgs/development/cuda-modules/packages/nvlsm.nix

diff --git a/pkgs/development/cuda-modules/README.md b/pkgs/development/cuda-modules/README.md
index 393b6ccfaa5e..a826d48ca2f2 100644
--- a/pkgs/development/cuda-modules/README.md
+++ b/pkgs/development/cuda-modules/README.md
@@ -38,7 +38,9 @@ not straightforward to include. These packages are:
   - `mft_oem`: unsure of purpose; contains FHS paths.
   - `mft`: unsure of purpose; contains FHS paths.
   - `nvidia_driver`: we don't use the drivers from the CUDA releases; irrelevant.
-  - `nvlsm`: contains FHS paths.
+  - `nvlsm`: contains FHS paths/NVSwitch and NVLINK software
+  - `libnvidia_nscq`: NVSwitch software
+  - `libnvsdm`: NVSwitch software
 - `cublasmp`:
   - `libcublasmp`: `nvshmem` isnt' packaged.
 - `cudnn`:
diff --git a/pkgs/development/cuda-modules/packages/collectx_bringup.nix b/pkgs/development/cuda-modules/packages/collectx_bringup.nix
deleted file mode 100644
index a6df12920f2e..000000000000
--- a/pkgs/development/cuda-modules/packages/collectx_bringup.nix
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-  buildRedist,
-  curl,
-  lib,
-  libibmad,
-  libibumad,
-  rdma-core,
-  ucx,
-  zlib,
-}:
-buildRedist (finalAttrs: {
-  redistName = "cuda";
-  pname = "collectx_bringup";
-
-  # TODO: Has python packages, bin, etc, lib, share, and collectx directory,
-  # which has its own bin and lib directories.
-  outputs = [ "out" ];
-
-  postUnpack = lib.optionalString (finalAttrs.src ? name) ''
-    nixLog "moving collectx_bringup to the top level of source root"
-    mv --verbose --no-clobber \
-      "$PWD/${finalAttrs.src.name}/opt/nvidia/collectx_bringup"/* \
-      "$PWD/${finalAttrs.src.name}/"
-    rm --dir --verbose --recursive "$PWD/${finalAttrs.src.name}/opt"
-  '';
-
-  buildInputs = [
-    curl
-    libibmad
-    libibumad
-    rdma-core
-    ucx
-    zlib
-  ];
-
-  brokenAssertions = [
-    # NOTE: Neither of these are available in Nixpkgs, from what I can tell by way of
-    # nix-community/nix-index-database.
-    {
-      message = "libssl.so.1.1 is available";
-      assertion = false;
-    }
-    {
-      message = "libcrypto.so.1.1 is available";
-      assertion = false;
-    }
-  ];
-})
diff --git a/pkgs/development/cuda-modules/packages/cuda_sandbox_dev.nix b/pkgs/development/cuda-modules/packages/cuda_sandbox_dev.nix
deleted file mode 100644
index 53ff67a909b1..000000000000
--- a/pkgs/development/cuda-modules/packages/cuda_sandbox_dev.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{ buildRedist }:
-buildRedist {
-  redistName = "cuda";
-  pname = "cuda_sandbox_dev";
-  outputs = [ "out" ];
-}
diff --git a/pkgs/development/cuda-modules/packages/cudnn_samples.nix b/pkgs/development/cuda-modules/packages/cudnn_samples.nix
deleted file mode 100644
index ff4e743c0eb6..000000000000
--- a/pkgs/development/cuda-modules/packages/cudnn_samples.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  buildRedist,
-  cmake,
-  cuda_cudart,
-  cuda_nvcc,
-  cudnn,
-  lib,
-}:
-buildRedist (finalAttrs: {
-  redistName = "cudnn";
-  pname = "cudnn_samples";
-
-  outputs = [ "out" ];
-
-  allowFHSReferences = true;
-
-  # Sources are nested in a directory with the same name as the package
-  setSourceRoot = "sourceRoot=$(echo */src/cudnn_samples_v${lib.versions.major finalAttrs.version}/)";
-
-  nativeBuildInputs = [
-    cmake
-    cuda_nvcc
-  ];
-
-  buildInputs = [
-    cuda_cudart
-    cudnn
-  ];
-
-  brokenAssertions = [
-    {
-      message = "FreeImage is required as a subdirectory and @connorbaker has not yet patched the build to find it";
-      assertion = false;
-    }
-  ];
-})
diff --git a/pkgs/development/cuda-modules/packages/driver_assistant.nix b/pkgs/development/cuda-modules/packages/driver_assistant.nix
deleted file mode 100644
index 3224416e7a6f..000000000000
--- a/pkgs/development/cuda-modules/packages/driver_assistant.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ buildRedist }:
-buildRedist {
-  redistName = "cuda";
-  pname = "driver_assistant";
-
-  outputs = [ "out" ];
-
-  platformAssertions = [
-    {
-      message = "Package is not supported; use drivers from linuxPackages";
-      assertion = false;
-    }
-  ];
-}
diff --git a/pkgs/development/cuda-modules/packages/libnvidia_nscq.nix b/pkgs/development/cuda-modules/packages/libnvidia_nscq.nix
deleted file mode 100644
index 3aa47e0818ab..000000000000
--- a/pkgs/development/cuda-modules/packages/libnvidia_nscq.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ buildRedist }:
-buildRedist {
-  redistName = "cuda";
-  pname = "libnvidia_nscq";
-
-  outputs = [
-    "out"
-    "lib"
-  ];
-
-  allowFHSReferences = true;
-}
diff --git a/pkgs/development/cuda-modules/packages/libnvsdm.nix b/pkgs/development/cuda-modules/packages/libnvsdm.nix
deleted file mode 100644
index f48ecdbc26af..000000000000
--- a/pkgs/development/cuda-modules/packages/libnvsdm.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ buildRedist }:
-buildRedist {
-  redistName = "cuda";
-  pname = "libnvsdm";
-
-  # TODO(@connorbaker): Not sure this is the correct set of outputs.
-  outputs = [ "out" ];
-
-  allowFHSReferences = true;
-
-  meta = {
-    description = "NVSwitch Device Monitoring API";
-    homepage = "https://github.com/NVIDIA/nvsdm";
-    changelog = "https://github.com/NVIDIA/nvsdm/releases";
-  };
-}
diff --git a/pkgs/development/cuda-modules/packages/mft.nix b/pkgs/development/cuda-modules/packages/mft.nix
deleted file mode 100644
index 7c7c7c9dd361..000000000000
--- a/pkgs/development/cuda-modules/packages/mft.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  buildRedist,
-  lib,
-  rdma-core,
-  zlib,
-}:
-buildRedist (finalAttrs: {
-  redistName = "cuda";
-  pname = "mft";
-
-  # TODO: includes bin, etc, include, lib, and share directories.
-  outputs = [ "out" ];
-
-  postUnpack = lib.optionalString (finalAttrs.src != null) ''
-    nixLog "moving items in usr to the top level of source root"
-    mv --verbose --no-clobber \
-      "$PWD/${finalAttrs.src.name}/usr"/* \
-      "$PWD/${finalAttrs.src.name}/"
-    rm --dir --verbose --recursive "$PWD/${finalAttrs.src.name}/usr"
-  '';
-
-  buildInputs = [
-    rdma-core
-    zlib
-  ];
-
-  brokenAssertions = [
-    {
-      # There are a *bunch* of these references and I don't know how to patch them all.
-      message = "contains no references to FHS paths";
-      assertion = false;
-    }
-  ];
-
-  meta = {
-    description = "NVIDIA firmware management tools";
-    homepage = "https://network.nvidia.com/products/adapter-software/firmware-tools/";
-  };
-})
diff --git a/pkgs/development/cuda-modules/packages/mft_autocomplete.nix b/pkgs/development/cuda-modules/packages/mft_autocomplete.nix
deleted file mode 100644
index 35cbabc87759..000000000000
--- a/pkgs/development/cuda-modules/packages/mft_autocomplete.nix
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  buildRedist,
-  lib,
-  python3,
-}:
-buildRedist {
-  redistName = "cuda";
-  pname = "mft_autocomplete";
-
-  # TODO: includes bin, etc, include, lib, and share directories.
-  outputs = [ "out" ];
-
-  postPatch = ''
-    nixLog "patching python path in $PWD/etc/bash_completion.d/mft/mft_base_autocomplete"
-    substituteInPlace "$PWD/etc/bash_completion.d/mft/mft_base_autocomplete" \
-      --replace-fail \
-        "PYTHON_EXEC='/usr/bin/env python3'" \
-        "PYTHON_EXEC='${lib.getExe python3}'" \
-      --replace-fail \
-        "PYTHON_EXEC='/usr/bin/env python2'" \
-        "PYTHON_EXEC='${lib.getExe python3}'"
-
-    nixLog "patching python shebang path in $PWD/etc/bash_completion.d/mft/mft_help_to_completion.py"
-    substituteInPlace "$PWD/etc/bash_completion.d/mft/mft_help_to_completion.py" \
-      --replace-fail \
-        '#!/usr/bin/python' \
-        '#!${lib.getExe python3}'
-  '';
-
-  brokenAssertions = [
-    {
-      # The mft_base_autocomplete file needs heavier patching to remove FHS references and ensure it uses Nixpkgs' python.
-      # In particular, it does something like
-      # PYTHON_EXEC=`find /usr/bin /bin/ /usr/local/bin -iname 'python*' 2>&1 | grep -e='*python[0-9,.]*' | sort -d | head -n 1`
-      message = "contains no references to FHS paths";
-      assertion = false;
-    }
-  ];
-}
diff --git a/pkgs/development/cuda-modules/packages/mft_oem.nix b/pkgs/development/cuda-modules/packages/mft_oem.nix
deleted file mode 100644
index 3eb7c56b42b5..000000000000
--- a/pkgs/development/cuda-modules/packages/mft_oem.nix
+++ /dev/null
@@ -1,25 +0,0 @@
-{ buildRedist, libxcrypt-legacy }:
-buildRedist (finalAttrs: {
-  redistName = "cuda";
-  pname = "mft_oem";
-
-  outputs = [ "out" ];
-
-  postUnpack = ''
-    nixLog "moving items in usr to the top level of source root"
-    mv --verbose --no-clobber \
-      "$PWD/${finalAttrs.src.name}/usr"/* \
-      "$PWD/${finalAttrs.src.name}/"
-    rm --dir --verbose --recursive "$PWD/${finalAttrs.src.name}/usr"
-  '';
-
-  buildInputs = [ libxcrypt-legacy ];
-
-  brokenAssertions = [
-    {
-      # Contains problems similar to mft_autocomplete.
-      message = "contains no references to FHS paths";
-      assertion = false;
-    }
-  ];
-})
diff --git a/pkgs/development/cuda-modules/packages/nvidia_driver.nix b/pkgs/development/cuda-modules/packages/nvidia_driver.nix
deleted file mode 100644
index c21a59e7402b..000000000000
--- a/pkgs/development/cuda-modules/packages/nvidia_driver.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ buildRedist }:
-buildRedist {
-  redistName = "cuda";
-  pname = "nvidia_driver";
-
-  outputs = [ "out" ];
-
-  brokenAssertions = [
-    {
-      message = "use drivers from linuxPackages";
-      assertion = false;
-    }
-  ];
-}
diff --git a/pkgs/development/cuda-modules/packages/nvlsm.nix b/pkgs/development/cuda-modules/packages/nvlsm.nix
deleted file mode 100644
index 7ab82cf1c1fa..000000000000
--- a/pkgs/development/cuda-modules/packages/nvlsm.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ buildRedist, lib }:
-buildRedist (finalAttrs: {
-  redistName = "cuda";
-  pname = "nvlsm";
-
-  # TODO: includes bin, lib, and share directories.
-  outputs = [ "out" ];
-
-  postUnpack = lib.optionalString (finalAttrs.src != null) ''
-    nixLog "moving sbin to bin"
-    mv --verbose --no-clobber \
-      "$PWD/${finalAttrs.src.name}/sbin" \
-      "$PWD/${finalAttrs.src.name}/bin"
-  '';
-
-  brokenAssertions = [
-    {
-      # The binary files match FHS paths and the configuration files need to be patched.
-      message = "contains no references to FHS paths";
-      assertion = false;
-    }
-  ];
-
-  meta = {
-    description = "NVLink Subnet Manager";
-    longDescription = ''
-      A service that originates from NVIDIA InfiniBand switches and has the necessary modifications to effectively manage NVSwitches.
-    '';
-  };
-})

From af82ffccb217536e62d4bc64c91b76a262f1d359 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 9 Oct 2025 23:41:52 +0000
Subject: [PATCH 1794/6226] cudaPackages.cuda_nvcc: correct nvcc.profile
 patching for 13.0+

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/packages/cuda_nvcc.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix
index 41da5b0f8c6c..993c92c778de 100644
--- a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix
+++ b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix
@@ -4,6 +4,7 @@
   buildRedist,
   cudaAtLeast,
   cudaOlder,
+  cuda_cccl,
   lib,
   libnvvm,
 }:
@@ -111,6 +112,16 @@ buildRedist (finalAttrs: {
             '$(_TARGET_SIZE_)' \
             ""
       ''
+      # CUDA 13.0+ introduced
+      # SYSTEM_INCLUDES +=  "-isystem" "$(TOP)/$(_TARGET_DIR_)/include/cccl" $(_SPACE_)
+      # so we need to make sure to patch the reference to cccl.
+      + lib.optionalString (cudaAtLeast "13.0") ''
+        nixLog "patching nvcc.profile to include correct path to cccl"
+        substituteInPlace "''${!outputBin:?}/bin/nvcc.profile" \
+          --replace-fail \
+            '$(TOP)/$(_TARGET_DIR_)/include/cccl' \
+            "${lib.getOutput "include" cuda_cccl}/include"
+      ''
       # Unconditional patching to switch to the correct include paths.
       # NOTE: _TARGET_DIR_ appears to be used for the target architecture, which is relevant for cross-compilation.
       + ''

From ef442c3958be37c09403f095886ff145788fa521 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 14 Oct 2025 02:38:06 +0000
Subject: [PATCH 1795/6226] cudaPackages.cuda_nvcc: provide a single output

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/packages/cuda_nvcc.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix
index 993c92c778de..47906b5977c1 100644
--- a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix
+++ b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix
@@ -12,17 +12,10 @@ buildRedist (finalAttrs: {
   redistName = "cuda";
   pname = "cuda_nvcc";
 
-  # NOTE: May need to restrict cuda_nvcc to a single output to avoid breaking consumers which expect NVCC
-  # to be within a single directory structure. This happens partly because NVCC is also home to NVVM.
+  # NOTE: We restrict cuda_nvcc to a single output to avoid breaking consumers which expect NVCC to be within a single
+  # directory structure. This happens partly because NVCC is also home to NVVM.
   outputs = [
     "out"
-  ]
-  # CUDA 13.0 has essentially nothing other than binaries.
-  ++ lib.optionals (cudaOlder "13.0") [
-    "bin"
-    "dev"
-    "include"
-    "static"
   ];
 
   # The nvcc and cicc binaries contain hard-coded references to /usr
@@ -134,7 +127,6 @@ buildRedist (finalAttrs: {
       # Fixup the nvcc.profile to use the correct paths for NVVM.
       # NOTE: In our replacement substitution, we use double quotes to allow for variable expansion.
       # NOTE: We use a trailing slash only on the NVVM directory replacement to prevent partial matches.
-      # + lib.optionalString (cudaOlder "13.0") ''
       + ''
         nixLog "patching nvcc.profile to use the correct NVVM paths"
         substituteInPlace "''${!outputBin:?}/bin/nvcc.profile" \

From 43c7b5e291f0f938a840953928236cface9fc664 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 14 Oct 2025 02:59:50 +0000
Subject: [PATCH 1796/6226] cudaPackages.cuda_cudart: provide a single output

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/by-name/co/colmap/package.nix                    |  2 +-
 pkgs/by-name/dc/dcgm/package.nix                      |  2 +-
 .../development/cuda-modules/packages/cuda_cudart.nix | 11 +++--------
 .../cuda-modules/packages/nsight_systems.nix          |  2 +-
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/co/colmap/package.nix b/pkgs/by-name/co/colmap/package.nix
index 318fe7cc9932..24608e78d058 100644
--- a/pkgs/by-name/co/colmap/package.nix
+++ b/pkgs/by-name/co/colmap/package.nix
@@ -55,7 +55,7 @@ let
   ]
   ++ lib.optionals cudaSupport [
     cudatoolkit
-    cudaPackages.cuda_cudart.static
+    (lib.getOutput "static" cudaPackages.cuda_cudart)
   ]
   ++ lib.optional stdenv'.cc.isClang llvmPackages.openmp;
 
diff --git a/pkgs/by-name/dc/dcgm/package.nix b/pkgs/by-name/dc/dcgm/package.nix
index a9094cd870a5..0c43d7b3bbe1 100644
--- a/pkgs/by-name/dc/dcgm/package.nix
+++ b/pkgs/by-name/dc/dcgm/package.nix
@@ -60,7 +60,7 @@ let
     in
     [
       (lib.cmakeFeature "CUDA${version}_INCLUDE_DIR" "${headers}")
-      (lib.cmakeFeature "CUDA${version}_LIBS" "${cudaPackages.cuda_cudart.stubs}/lib/stubs/libcuda.so")
+      (lib.cmakeFeature "CUDA${version}_LIBS" "${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs/libcuda.so")
       (lib.cmakeFeature "CUDA${version}_STATIC_LIBS" "${lib.getLib cudaPackages.cuda_cudart}/lib/libcudart.so")
       (lib.cmakeFeature "CUDA${version}_STATIC_CUBLAS_LIBS" (
         lib.concatStringsSep ";" [
diff --git a/pkgs/development/cuda-modules/packages/cuda_cudart.nix b/pkgs/development/cuda-modules/packages/cuda_cudart.nix
index f85a8dc23295..0143ad4c7123 100644
--- a/pkgs/development/cuda-modules/packages/cuda_cudart.nix
+++ b/pkgs/development/cuda-modules/packages/cuda_cudart.nix
@@ -15,16 +15,11 @@ buildRedist (finalAttrs: {
   redistName = "cuda";
   pname = "cuda_cudart";
 
-  # NOTE: A number of packages expect cuda_cudart to be in a single directory.
-  # NOTE: CMake expects the static libraries to exist alongside the dynamic libraries,
-  # so we may need to revisit whether we have a static output at all.
+  # NOTE: A number of packages expect cuda_cudart to be in a single directory. We restrict the package to a single
+  # output to avoid breaking these assumptions. As an example, CMake expects the static libraries to exist alongside
+  # the dynamic libraries.
   outputs = [
     "out"
-    "dev"
-    "include"
-    "lib"
-    "static"
-    "stubs"
   ];
 
   propagatedBuildOutputs =
diff --git a/pkgs/development/cuda-modules/packages/nsight_systems.nix b/pkgs/development/cuda-modules/packages/nsight_systems.nix
index de65f5265c52..8da5a0e980fe 100644
--- a/pkgs/development/cuda-modules/packages/nsight_systems.nix
+++ b/pkgs/development/cuda-modules/packages/nsight_systems.nix
@@ -96,7 +96,7 @@ buildRedist {
     qt6.qtwebengine
     qt6.qtwayland
     boost178
-    cuda_cudart.stubs
+    (lib.getOutput "stubs" cuda_cudart)
     e2fsprogs
     gst_all_1.gst-plugins-base
     gst_all_1.gstreamer

From 2ee10f484a1f201a05fdc548f5b960da4e7b2ae0 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 14 Oct 2025 03:23:54 +0000
Subject: [PATCH 1797/6226] cudaPackages.autoAddCudaCompatRunpath: clean up
 enableHook

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/packages/autoAddCudaCompatRunpath/package.nix  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix
index 242323052563..75a279addf78 100644
--- a/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix
+++ b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/package.nix
@@ -13,7 +13,7 @@ let
   # cuda_compat can be null or broken, depending on the platform, CUDA release, and compute capability.
   # To avoid requiring all consumers of this hook to do these checks, we do them here; the hook is a no-op if
   # cuda_compat is not available.
-  enableHook = cuda_compat != null && cuda_compat.meta.available;
+  enableHook = cuda_compat.meta.available or false;
 in
 makeSetupHook {
   name = "auto-add-cuda-compat-runpath-hook";

From 1b88b73416fc85809db623fa59e18136143e1949 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 16 Oct 2025 14:41:08 -0700
Subject: [PATCH 1798/6226] cudaPackages.cuda_cudart: don't symlink lib/stubs
 into lib

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/packages/cuda_cudart.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/cuda_cudart.nix b/pkgs/development/cuda-modules/packages/cuda_cudart.nix
index 0143ad4c7123..8ec7c4f8b3c6 100644
--- a/pkgs/development/cuda-modules/packages/cuda_cudart.nix
+++ b/pkgs/development/cuda-modules/packages/cuda_cudart.nix
@@ -83,8 +83,6 @@ buildRedist (finalAttrs: {
       nixLog "creating versioned symlink for libcuda.so stub"
       ln -srv libcuda.so libcuda.so.1
     fi
-    nixLog "creating symlinks for stubs in lib directory"
-    ln -srvt "''${!outputStubs:?}/lib/" *.so *.so.*
     popd >/dev/null
   '';
 

From e3adc1f6feb35f5cb85f4152dd3f8e3c0e8be16b Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 16 Oct 2025 14:41:27 -0700
Subject: [PATCH 1799/6226] cudaPackages.cuda_nvml_dev: don't symlink lib/stubs
 into lib

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/packages/cuda_nvml_dev.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/cuda_nvml_dev.nix b/pkgs/development/cuda-modules/packages/cuda_nvml_dev.nix
index 516ddf67fbcf..cb97f2c76210 100644
--- a/pkgs/development/cuda-modules/packages/cuda_nvml_dev.nix
+++ b/pkgs/development/cuda-modules/packages/cuda_nvml_dev.nix
@@ -30,8 +30,6 @@ buildRedist (finalAttrs: {
       nixLog "creating versioned symlink for libnvidia-ml.a stub"
       ln -sr libnvidia-ml.a libnvidia-ml.a.1
     fi
-    nixLog "creating symlinks for stubs in lib directory"
-    ln -srt "''${!outputStubs:?}/lib/" *.so *.so.*
     popd >/dev/null
   '';
 

From 3a57a460b3dbe011f18109e7f6a70a206219d309 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 16 Oct 2025 14:46:12 -0700
Subject: [PATCH 1800/6226] cudaPackages.gdrcopy: init at 2.5.1

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/packages/gdrcopy.nix         | 113 ++++++++++++++++++
 1 file changed, 113 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/packages/gdrcopy.nix

diff --git a/pkgs/development/cuda-modules/packages/gdrcopy.nix b/pkgs/development/cuda-modules/packages/gdrcopy.nix
new file mode 100644
index 000000000000..433b8b3f3130
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/gdrcopy.nix
@@ -0,0 +1,113 @@
+{
+  _cuda,
+  backendStdenv,
+  cuda_cudart,
+  cuda_nvcc,
+  cudaMajorMinorVersion,
+  cudaNamePrefix,
+  fetchFromGitHub,
+  flags,
+  lib,
+  # passthru.updateScript
+  gitUpdater,
+}:
+let
+  inherit (_cuda.lib) _mkMetaBadPlatforms;
+  inherit (lib) licenses maintainers teams;
+in
+backendStdenv.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  # NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
+  name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
+  pname = "gdrcopy";
+  version = "2.5.1";
+
+  src = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "gdrcopy";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-2cDsDc1lGW9rNF1q3EhjmiJhNaIwuFYlNdooPe7/R2I=";
+  };
+
+  outputs = [ "out" ];
+
+  nativeBuildInputs = [
+    cuda_nvcc
+  ];
+
+  postPatch = ''
+    nixLog "patching shebang in $PWD/config_arch"
+    patchShebangs "$PWD/config_arch"
+
+    nixLog "patching awk expression in $PWD/Makefile"
+    substituteInPlace "$PWD/Makefile" \
+      --replace-fail \
+        "/\#" \
+        "/#" \
+      --replace-fail \
+        'lib64' \
+        'lib'
+
+    nixLog "patching $PWD/src/Makefile"
+    substituteInPlace "$PWD/src/Makefile" \
+      --replace-fail \
+        "/\#" \
+        "/#"
+
+    nixLog "patching $PWD/tests/Makefile"
+    substituteInPlace "$PWD/tests/Makefile" \
+      --replace-fail \
+        'CUDA_VERSION := $(shell $(GET_CUDA_VERSION) $(NVCC))' \
+        'CUDA_VERSION := ${cudaMajorMinorVersion}' \
+      --replace-fail \
+        'NVCCFLAGS ?= $(shell $(GET_CUDA_GENCODE) $(NVCC)) $(NVCC_STD)' \
+        'NVCCFLAGS ?= ${flags.gencodeString} $(NVCC_STD)' \
+      --replace-fail \
+        'lib64' \
+        'lib'
+  '';
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    cuda_cudart
+  ];
+
+  buildFlags = [
+    # Makefile variables which must be set explicitly
+    "CUDA=${lib.getLib cuda_cudart}"
+    "NVCC=${lib.getExe cuda_nvcc}" # TODO: shoud be using cuda_nvcc from pkgsBuildHost
+
+    # Make targets
+    # NOTE: We cannot use `all` because it includes the driver, which needs the driver source code.
+    "lib"
+    "exes"
+  ];
+
+  # Tests require gdrdrv be installed (don't know how to communicate dependency on the driver).
+  doCheck = false;
+
+  installFlags = [
+    "DESTDIR=${placeholder "out"}"
+    "prefix=/"
+  ];
+
+  passthru.updateScript = gitUpdater {
+    inherit (finalAttrs) pname version;
+    rev-prefix = "v";
+  };
+
+  meta = {
+    description = "Fast GPU memory copy library based on NVIDIA GPUDirect RDMA technology";
+    homepage = "https://github.com/NVIDIA/gdrcopy";
+    license = licenses.mit;
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
+    maintainers = [ maintainers.connorbaker ];
+    teams = [ teams.cuda ];
+  };
+})

From 858797b6ac6f1c9a8f69c517ae2939834a2acf03 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 16 Oct 2025 15:56:38 -0700
Subject: [PATCH 1801/6226] ucc: fix linking against CUDA stubs

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/by-name/uc/ucc/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/uc/ucc/package.nix b/pkgs/by-name/uc/ucc/package.nix
index 284fcdc68cf4..fc43ddc832d4 100644
--- a/pkgs/by-name/uc/ucc/package.nix
+++ b/pkgs/by-name/uc/ucc/package.nix
@@ -15,7 +15,7 @@ inputs@{
   enableSse42 ? stdenv.hostPlatform.sse4_2Support,
 }:
 let
-  inherit (lib.attrsets) getLib;
+  inherit (lib.attrsets) getOutput;
   inherit (lib.lists) optionals;
   inherit (lib.strings) concatStringsSep;
 
@@ -88,8 +88,10 @@ effectiveStdenv.mkDerivation (finalAttrs: {
   # referring to an array!
   env.LDFLAGS = toString (
     optionals enableCuda [
+      # Fake libcuda.so (the real one is deployed impurely)
+      "-L${getOutput "stubs" cuda_cudart}/lib/stubs"
       # Fake libnvidia-ml.so (the real one is deployed impurely)
-      "-L${getLib cuda_nvml_dev}/lib/stubs"
+      "-L${getOutput "stubs" cuda_nvml_dev}/lib/stubs"
     ]
   );
 

From 1fceb96ffabc6477d86989160c9bd80e60386402 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 16 Oct 2025 15:56:46 -0700
Subject: [PATCH 1802/6226] ucx: fix linking against CUDA stubs

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/by-name/uc/ucx/package.nix | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/uc/ucx/package.nix b/pkgs/by-name/uc/ucx/package.nix
index b3a10fc8454e..aecefb06fd48 100644
--- a/pkgs/by-name/uc/ucx/package.nix
+++ b/pkgs/by-name/uc/ucx/package.nix
@@ -34,6 +34,13 @@ let
   };
 in
 stdenv.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+  # TODO(@connorbaker):
+  # When strictDeps is enabled, `cuda_nvcc` is required as the argument to `--with-cuda` in `configureFlags` or else
+  # configurePhase fails with `checking for cuda_runtime.h... no`.
+  # This is odd, especially given `cuda_runtime.h` is provided by `cuda_cudart.dev`, which is already in `buildInputs`.
+  strictDeps = true;
+
   pname = "ucx";
   version = "1.19.0";
 
@@ -75,10 +82,17 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals enableRocm rocmList;
 
-  LDFLAGS = lib.optionals enableCuda [
-    # Fake libnvidia-ml.so (the real one is deployed impurely)
-    "-L${lib.getLib cudaPackages.cuda_nvml_dev}/lib/stubs"
-  ];
+  # NOTE: With `__structuredAttrs` enabled, `LDFLAGS` must be set under `env` so it is assured to be a string;
+  # otherwise, we might have forgotten to convert it to a string and Nix would make LDFLAGS a shell variable
+  # referring to an array!
+  env.LDFLAGS = toString (
+    lib.optionals enableCuda [
+      # Fake libcuda.so (the real one is deployed impurely)
+      "-L${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs"
+      # Fake libnvidia-ml.so (the real one is deployed impurely)
+      "-L${lib.getOutput "stubs" cudaPackages.cuda_nvml_dev}/lib/stubs"
+    ]
+  );
 
   configureFlags = [
     "--with-rdmacm=${lib.getDev rdma-core}"

From c8a22940c7289223e7292e537274077afded3896 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 16 Oct 2025 15:57:47 -0700
Subject: [PATCH 1803/6226] python3Packages.gpuctypes: fix linking against CUDA
 stubs

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/python-modules/gpuctypes/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/gpuctypes/default.nix b/pkgs/development/python-modules/gpuctypes/default.nix
index d4669e89e001..1a27da65f4e2 100644
--- a/pkgs/development/python-modules/gpuctypes/default.nix
+++ b/pkgs/development/python-modules/gpuctypes/default.nix
@@ -103,7 +103,7 @@ buildPythonPackage rec {
   };
 
   preCheck = lib.optionalString (cudaSupport && !testCudaRuntime) ''
-    addToSearchPath LD_LIBRARY_PATH ${lib.getLib cudaPackages.cuda_cudart}/lib/stubs
+    addToSearchPath LD_LIBRARY_PATH ${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs
   '';
 
   # If neither rocmSupport or cudaSupport is enabled, no tests are selected

From 9c1181a75e798f46197fa47ce2b436fde4417485 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 16 Oct 2025 18:07:48 -0700
Subject: [PATCH 1804/6226] cudaPackages.libnvshmem: init at 3.4.5

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/packages/libnvshmem.nix      | 182 ++++++++++++++++++
 1 file changed, 182 insertions(+)
 create mode 100644 pkgs/development/cuda-modules/packages/libnvshmem.nix

diff --git a/pkgs/development/cuda-modules/packages/libnvshmem.nix b/pkgs/development/cuda-modules/packages/libnvshmem.nix
new file mode 100644
index 000000000000..37a4a79d14a4
--- /dev/null
+++ b/pkgs/development/cuda-modules/packages/libnvshmem.nix
@@ -0,0 +1,182 @@
+{
+  backendStdenv,
+  buildPackages,
+  cmake,
+  cuda_cccl,
+  cuda_cudart,
+  cuda_nvcc,
+  cuda_nvml_dev,
+  cuda_nvtx,
+  cudaAtLeast,
+  cudaNamePrefix,
+  fetchFromGitHub,
+  flags,
+  gdrcopy,
+  lib,
+  libfabric,
+  mpi,
+  nccl,
+  ninja,
+  pmix,
+  python3Packages,
+  rdma-core,
+  ucx,
+  # passthru.updateScript
+  gitUpdater,
+}:
+let
+  inherit (lib)
+    cmakeBool
+    cmakeFeature
+    getBin
+    getDev
+    getExe
+    getLib
+    licenses
+    maintainers
+    teams
+    ;
+in
+backendStdenv.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  # NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
+  name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
+  pname = "libnvshmem";
+  version = "3.4.5-0";
+
+  src = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "nvshmem";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-RHZzjDMYlL7vAVP1/UXM/Pt4bhajeWdCi3ihICeD2mc=";
+  };
+
+  outputs = [ "out" ];
+
+  nativeBuildInputs = [
+    cuda_nvcc
+    cmake
+    ninja
+
+    # NOTE: mpi is in nativeBuildInputs because it contains compilers and is only discoverable by CMake
+    # when a nativeBuildInput.
+    mpi
+
+    # NOTE: Python is required even if not building nvshmem4py:
+    # https://github.com/NVIDIA/nvshmem/blob/131da55f643ac87c810ba0bc51d359258bf433a1/CMakeLists.txt#L173
+    python3Packages.python
+  ];
+
+  # NOTE: Hardcoded standard versions mean CMake doesn't respect values we provide, so we need to patch the files.
+  postPatch = lib.optionalString (cudaAtLeast "12.8") ''
+    for standardName in {CXX,CUDA}_STANDARD
+    do
+      while IFS= read -r cmakeFileToPatch
+      do
+        nixLog "patching $PWD/$cmakeFileToPatch to fix $standardName"
+        substituteInPlace "$PWD/$cmakeFileToPatch" \
+          --replace-fail \
+            "$standardName 11" \
+            "$standardName 17"
+      done < <(grep --recursive --files-with-matches "$standardName 11")
+    done
+    unset -v cmakeFileToPatch
+    unset -v standardName
+  '';
+
+  enableParallelBuilding = true;
+
+  buildInputs = [
+    cuda_cccl
+    cuda_cudart
+    cuda_nvml_dev
+    cuda_nvtx
+    gdrcopy
+    libfabric
+    nccl
+    pmix
+    rdma-core
+    ucx
+  ];
+
+  # NOTE: This *must* be an environment variable NVIDIA saw fit to *configure and build CMake projects* while *inside*
+  # a CMake build and didn't correctly thread arguments through, so the environment is the only way to get
+  # configurations to the nested build.
+  env.CUDA_HOME = (getBin cuda_nvcc).outPath;
+
+  # https://docs.nvidia.com/nvshmem/release-notes-install-guide/install-guide/nvshmem-install-proc.html#other-distributions
+  cmakeFlags = [
+    (cmakeFeature "NVSHMEM_PREFIX" (placeholder "out"))
+
+    (cmakeFeature "CUDA_HOME" (getBin cuda_nvcc).outPath)
+    (cmakeFeature "CMAKE_CUDA_COMPILER" (getExe cuda_nvcc))
+
+    (cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString)
+
+    (cmakeBool "NVSHMEM_USE_NCCL" true)
+    (cmakeFeature "NCCL_HOME" (getDev nccl).outPath)
+
+    (cmakeBool "NVSHMEM_USE_GDRCOPY" true)
+    (cmakeFeature "GDRCOPY_HOME" (getDev gdrcopy).outPath)
+
+    # NOTE: Make sure to use mpi from buildPackages to match the spliced version created through nativeBuildInputs.
+    (cmakeBool "NVSHMEM_MPI_SUPPORT" true)
+    (cmakeFeature "MPI_HOME" (getLib buildPackages.mpi).outPath)
+
+    # TODO: Doesn't UCX need to be built with some argument when we want to use it with libnvshmem?
+    (cmakeBool "NVSHMEM_UCX_SUPPORT" true)
+    (cmakeFeature "UCX_HOME" (getDev ucx).outPath)
+
+    (cmakeBool "NVSHMEM_LIBFABRIC_SUPPORT" true)
+    (cmakeFeature "LIBFABRIC_HOME" (getDev libfabric).outPath)
+
+    (cmakeBool "NVSHMEM_IBGDA_SUPPORT" true)
+    # NOTE: no corresponding _HOME variable for IBGDA.
+
+    (cmakeBool "NVSHMEM_PMIX_SUPPORT" true)
+    (cmakeFeature "PMIX_HOME" (getDev pmix).outPath)
+
+    (cmakeBool "NVSHMEM_BUILD_TESTS" true)
+    (cmakeBool "NVSHMEM_BUILD_EXAMPLES" true)
+
+    (cmakeBool "NVSHMEM_BUILD_DEB_PACKAGE" false)
+    (cmakeBool "NVSHMEM_BUILD_RPM_PACKAGE" false)
+
+    # TODO: Looks like a nightmare to package and depends on things we haven't packaged yet
+    # https://github.com/NVIDIA/nvshmem/tree/131da55f643ac87c810ba0bc51d359258bf433a1/nvshmem4py
+    (cmakeBool "NVSHMEM_BUILD_PYTHON_LIB" false)
+
+    # NOTE: unsupported because it requires Clang
+    (cmakeBool "NVSHMEM_BUILD_BITCODE_LIBRARY" false)
+  ];
+
+  postInstall = ''
+    nixLog "moving top-level files in $out to $out/share"
+    mv -v "$out"/{changelog,git_commit.txt,License.txt,version.txt} "$out/share/"
+  '';
+
+  doCheck = false;
+
+  passthru = {
+    updateScript = gitUpdater {
+      inherit (finalAttrs) pname version;
+      rev-prefix = "v";
+    };
+  };
+
+  meta = {
+    description = "Parallel programming interface for NVIDIA GPUs based on OpenSHMEM";
+    homepage = "https://github.com/NVIDIA/nvshmem";
+    # NOTE: There are many licenses:
+    # https://github.com/NVIDIA/nvshmem/blob/7dd48c9fd7aa2134264400802881269b7822bd2f/License.txt
+    license = licenses.nvidiaCudaRedist;
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
+    maintainers = [ maintainers.connorbaker ];
+    teams = [ teams.cuda ];
+  };
+})

From 6abb73f11564ab7f33d264d243dd54b5239445ea Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 17 Oct 2025 05:26:29 +0000
Subject: [PATCH 1805/6226] gpu-burn: tidy up after CUDA changes

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/by-name/gp/gpu-burn/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gp/gpu-burn/package.nix b/pkgs/by-name/gp/gpu-burn/package.nix
index 02ef35d1ab9f..ac4b748d7b49 100644
--- a/pkgs/by-name/gp/gpu-burn/package.nix
+++ b/pkgs/by-name/gp/gpu-burn/package.nix
@@ -6,7 +6,6 @@
   lib,
 }:
 let
-  inherit (lib.attrsets) getBin;
   inherit (lib.lists) last map optionals;
   inherit (lib.trivial) boolToString;
   inherit (config) cudaSupport;
@@ -36,7 +35,11 @@ backendStdenv.mkDerivation {
     substituteInPlace gpu_burn-drv.cpp \
       --replace-fail \
         '#define COMPARE_KERNEL "compare.ptx"' \
-        "#define COMPARE_KERNEL \"$out/share/compare.ptx\""
+        '#define COMPARE_KERNEL "${placeholder "out"}/share/compare.ptx"'
+    substituteInPlace Makefile \
+      --replace-fail \
+        '${''''${CUDAPATH}/bin/nvcc''}' \
+        '${lib.getExe cuda_nvcc}'
   '';
 
   nativeBuildInputs = [
@@ -52,7 +55,8 @@ backendStdenv.mkDerivation {
   ];
 
   makeFlags = [
-    "CUDAPATH=${getBin cuda_nvcc}"
+    # NOTE: CUDAPATH assumes cuda_cudart is a single output containing all of lib, dev, and stubs.
+    "CUDAPATH=${cuda_cudart}"
     "COMPUTE=${last (map dropDots cudaCapabilities)}"
     "IS_JETSON=${boolToString isJetsonBuild}"
   ];

From df2b636a0f9bd60768c3c55276d97f020f53a75a Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 17 Oct 2025 05:36:27 +0000
Subject: [PATCH 1806/6226] cudaPackages.libcufile: fixup autoPatchelfHook for
 cuda_cudart stubs location

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/packages/libcufile.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/cuda-modules/packages/libcufile.nix b/pkgs/development/cuda-modules/packages/libcufile.nix
index 1d5ed47ba60d..1d5fba212bec 100644
--- a/pkgs/development/cuda-modules/packages/libcufile.nix
+++ b/pkgs/development/cuda-modules/packages/libcufile.nix
@@ -25,6 +25,10 @@ buildRedist {
     rdma-core
   ];
 
+  extraAutoPatchelfLibs = [
+    "${lib.getOutput "stubs" cuda_cudart}/lib/stubs"
+  ];
+
   meta = {
     description = "Library to leverage GDS technology";
     homepage = "https://docs.nvidia.com/gpudirect-storage/api-reference-guide";

From 0fc63e4b7cf7d359c136e8d4cbee18e87de2b373 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 17 Oct 2025 06:42:25 +0000
Subject: [PATCH 1807/6226] python3Packages.cupy: fix cuda_cudart stub linking

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/python-modules/cupy/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index 507e54f74e1a..e41a1b6cba11 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -63,6 +63,11 @@ buildPythonPackage rec {
     fetchSubmodules = true;
   };
 
+  env.LDFLAGS = toString [
+    # Fake libcuda.so (the real one is deployed impurely)
+    "-L${lib.getOutput "stubs" cudaPackages.cuda_cudart}/lib/stubs"
+  ];
+
   # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Setting both
   # CUPY_NUM_BUILD_JOBS and CUPY_NUM_NVCC_THREADS to NIX_BUILD_CORES results in
   # a small amount of thrashing but it turns out there are a large number of

From c1c2dd27b922035e6cc0198453dd44c3fe976a99 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 17 Oct 2025 06:43:25 +0000
Subject: [PATCH 1808/6226] python3Packages.cupy: build without libcusparse_lt
 for now

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/python-modules/cupy/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix
index e41a1b6cba11..fbf48fe98d2b 100644
--- a/pkgs/development/python-modules/cupy/default.nix
+++ b/pkgs/development/python-modules/cupy/default.nix
@@ -39,7 +39,8 @@ let
       libcurand
       libcusolver
       libcusparse
-      libcusparse_lt
+      # NOTE: libcusparse_lt is too new for CuPy, so we must do without.
+      # libcusparse_lt
     ]
   );
   cudatoolkit-joined = symlinkJoin {

From 12ad2459b1d2adb456adecacb72844961187280e Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 17 Oct 2025 06:58:36 +0000
Subject: [PATCH 1809/6226] koboldcpp: remove hardcoded link against CUDA
 driver

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/by-name/ko/koboldcpp/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index b21669dee58b..1f4cefb71bd1 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -57,6 +57,14 @@ effectiveStdenv.mkDerivation (finalAttrs: {
     python3Packages.wrapPython
   ];
 
+  postPatch = ''
+    nixLog "patching $PWD/Makefile to remove explicit linking against CUDA driver"
+    substituteInPlace "$PWD/Makefile" \
+      --replace-fail \
+        'CUBLASLD_FLAGS = -lcuda ' \
+        'CUBLASLD_FLAGS = '
+  '';
+
   pythonInputs = builtins.attrValues { inherit (python3Packages) tkinter customtkinter packaging; };
 
   buildInputs = [

From 04cfbd0435af59dc2321b5f727407358ae54240d Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 17 Oct 2025 07:19:18 +0000
Subject: [PATCH 1810/6226] cudaPackages.libcublasmp: use newly packaged
 libnvshmem

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/packages/libcublasmp.nix            | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/libcublasmp.nix b/pkgs/development/cuda-modules/packages/libcublasmp.nix
index 92130c135a06..8c0b7a5482f9 100644
--- a/pkgs/development/cuda-modules/packages/libcublasmp.nix
+++ b/pkgs/development/cuda-modules/packages/libcublasmp.nix
@@ -1,8 +1,11 @@
 {
   _cuda,
   buildRedist,
+  cuda_cudart,
+  lib,
   libcublas,
-  nvshmem ? null, # TODO(@connorbaker): package this
+  libnvshmem,
+  nccl,
 }:
 buildRedist {
   redistName = "cublasmp";
@@ -18,10 +21,15 @@ buildRedist {
   # TODO: Looks like the minimum supported capability is 7.0 as of the latest:
   # https://docs.nvidia.com/cuda/cublasmp/getting_started/index.html
   buildInputs = [
+    (lib.getOutput "stubs" cuda_cudart)
     libcublas
+    libnvshmem
+    nccl
   ];
 
-  platformAssertions = _cuda.lib._mkMissingPackagesAssertions { inherit nvshmem; };
+  extraAutoPatchelfLibs = [
+    "${lib.getOutput "stubs" cuda_cudart}/lib/stubs"
+  ];
 
   meta = {
     description = "High-performance, multi-process, GPU-accelerated library for distributed basic dense linear algebra";

From 4cbdd81a5fc0e9cf9510d75a079d813d7b670f6d Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 17 Oct 2025 07:21:06 +0000
Subject: [PATCH 1811/6226] cudaPackages.libcudla: buildRedist expects
 top-level platformAssertions

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/packages/libcudla.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/cuda-modules/packages/libcudla.nix b/pkgs/development/cuda-modules/packages/libcudla.nix
index 809c0008884d..0c9f2da5492e 100644
--- a/pkgs/development/cuda-modules/packages/libcudla.nix
+++ b/pkgs/development/cuda-modules/packages/libcudla.nix
@@ -19,7 +19,7 @@ buildRedist {
     "libnvcudla.so"
   ];
 
-  passthru.platformAssertions = [
+  platformAssertions = [
     {
       message = "Only Xavier (7.2) and Orin (8.7) Jetson devices are supported";
       assertion =

From a43503a1aca8bac06ee841f746561953e34a0a47 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 17 Oct 2025 07:29:15 +0000
Subject: [PATCH 1812/6226] cudaPackages.cuda_nvprof: fix cuda_cudart stub
 linking

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/packages/cuda_nvprof.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/cuda-modules/packages/cuda_nvprof.nix b/pkgs/development/cuda-modules/packages/cuda_nvprof.nix
index ccbab56e12c4..202dfc389d34 100644
--- a/pkgs/development/cuda-modules/packages/cuda_nvprof.nix
+++ b/pkgs/development/cuda-modules/packages/cuda_nvprof.nix
@@ -21,6 +21,10 @@ buildRedist {
     cuda_cupti
   ];
 
+  extraAutoPatchelfLibs = [
+    "${lib.getOutput "stubs" cuda_cudart}/lib/stubs"
+  ];
+
   meta = {
     description = "Collect and view profiling data from the command-line";
     longDescription = ''

From 3728d487af5c521a99225cefef9ffa63e333dda5 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 17 Oct 2025 07:30:13 +0000
Subject: [PATCH 1813/6226] cudaPackages.cuquantum: fix libnvidia-ml.so stub
 linking

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/packages/cuquantum.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/cuda-modules/packages/cuquantum.nix b/pkgs/development/cuda-modules/packages/cuquantum.nix
index eec280fedb07..8f3c0a30d893 100644
--- a/pkgs/development/cuda-modules/packages/cuquantum.nix
+++ b/pkgs/development/cuda-modules/packages/cuquantum.nix
@@ -29,6 +29,10 @@ buildRedist {
     libcutensor
   ];
 
+  extraAutoPatchelfLibs = [
+    "${lib.getOutput "stubs" cuda_nvml_dev}/lib/stubs"
+  ];
+
   meta = {
     description = "Set of high-performance libraries and tools for accelerating quantum computing simulations at both the circuit and device level by orders of magnitude";
     longDescription = ''

From 169851269bafa5be4f1d248485bb3097e7f943f2 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 17 Oct 2025 07:34:27 +0000
Subject: [PATCH 1814/6226] cudaPackages.nsight_systems: fix stub linking

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/packages/nsight_systems.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/nsight_systems.nix b/pkgs/development/cuda-modules/packages/nsight_systems.nix
index 8da5a0e980fe..d12cc2c7b3b2 100644
--- a/pkgs/development/cuda-modules/packages/nsight_systems.nix
+++ b/pkgs/development/cuda-modules/packages/nsight_systems.nix
@@ -3,6 +3,7 @@
   boost178,
   buildRedist,
   cuda_cudart,
+  cuda_nvml_dev,
   e2fsprogs,
   gst_all_1,
   lib,
@@ -97,6 +98,7 @@ buildRedist {
     qt6.qtwayland
     boost178
     (lib.getOutput "stubs" cuda_cudart)
+    (lib.getOutput "stubs" cuda_nvml_dev)
     e2fsprogs
     gst_all_1.gst-plugins-base
     gst_all_1.gstreamer
@@ -130,8 +132,9 @@ buildRedist {
     patchelf --replace-needed libtiff.so.5 libtiff.so "''${!outputBin}/${hostDir}/Plugins/imageformats/libqtiff.so"
   '';
 
-  autoPatchelfIgnoreMissingDeps = [
-    "libnvidia-ml.so.1"
+  extraAutoPatchelfLibs = [
+    "${lib.getOutput "stubs" cuda_cudart}/lib/stubs"
+    "${lib.getOutput "stubs" cuda_nvml_dev}/lib/stubs"
   ];
 
   meta = {

From a42e4a5254bf2de2b2101a881fa5f3d40f4b2b3f Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 21 Oct 2025 04:12:41 +0000
Subject: [PATCH 1815/6226] python3Packages.tensorrt: fixup

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../python-modules/tensorrt/default.nix       | 40 ++++++++-----------
 1 file changed, 17 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/python-modules/tensorrt/default.nix b/pkgs/development/python-modules/tensorrt/default.nix
index 94a3504b95fa..86580550c7af 100644
--- a/pkgs/development/python-modules/tensorrt/default.nix
+++ b/pkgs/development/python-modules/tensorrt/default.nix
@@ -1,41 +1,35 @@
 {
+  autoPatchelfHook,
+  buildPythonPackage,
+  cudaPackages,
   lib,
   python,
-  autoAddDriverRunpath,
-  buildPythonPackage,
-  autoPatchelfHook,
-  unzip,
-  cudaPackages,
+  stdenv,
 }:
-
 let
-  pyVersion = "${lib.versions.major python.version}${lib.versions.minor python.version}";
-  buildVersion = lib.optionalString (cudaPackages ? tensorrt) cudaPackages.tensorrt.version;
+  inherit (cudaPackages.tensorrt) src pname version;
+  inherit (lib.versions) major minor;
+  inherit (stdenv.hostPlatform) parsed;
 in
 buildPythonPackage {
-  pname = "tensorrt";
-  version = buildVersion;
+  inherit pname version;
 
-  src = cudaPackages.tensorrt.src;
+  src =
+    let
+      # https://peps.python.org/pep-0427/#file-name-convention
+      distribution = pname;
+      pythonTag = "cp${major python.version}${minor python.version}";
+      abiTag = "none";
+      platformTag = "${parsed.kernel.name}_${parsed.cpu.name}";
+    in
+    src + "/python/${distribution}-${version}-${pythonTag}-${abiTag}-${platformTag}.whl";
 
   format = "wheel";
-  # We unpack the wheel ourselves because of the odd packaging.
-  dontUseWheelUnpack = true;
 
   nativeBuildInputs = [
-    unzip
     autoPatchelfHook
-    autoAddDriverRunpath
   ];
 
-  preUnpack = ''
-    mkdir -p dist
-    tar --strip-components=2 -xf "$src" --directory=dist \
-      "TensorRT-${buildVersion}/python/tensorrt-${buildVersion}-cp${pyVersion}-none-linux_x86_64.whl"
-  '';
-
-  sourceRoot = ".";
-
   buildInputs = [
     cudaPackages.cudnn
     cudaPackages.tensorrt

From 46b5290da7a7e4a66c418bd1a9994df785445f7e Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 17:14:55 -0300
Subject: [PATCH 1816/6226] cosmic-wallpapers: 1.0.0-beta.2 -> 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-wallpapers/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-wallpapers/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix
index 158f18977f0f..93523afc93ef 100644
--- a/pkgs/by-name/co/cosmic-wallpapers/package.nix
+++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix
@@ -7,7 +7,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cosmic-wallpapers";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 92a977059b2b0d6101e3a6e43dc81294850d6a29 Mon Sep 17 00:00:00 2001
From: Philipp Mildenberger <philipp@mildenberger.me>
Date: Wed, 22 Oct 2025 22:15:53 +0200
Subject: [PATCH 1817/6226] Add explanation comment

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

diff --git a/pkgs/by-name/cl/cloudcompare/package.nix b/pkgs/by-name/cl/cloudcompare/package.nix
index 61ef38adeba1..bcefbc878f88 100644
--- a/pkgs/by-name/cl/cloudcompare/package.nix
+++ b/pkgs/by-name/cl/cloudcompare/package.nix
@@ -91,6 +91,8 @@ stdenv.mkDerivation rec {
     "-DPLUGIN_STANDARD_QRANSAC_SD=OFF" # not compatible with GPL, broken on non-x86
     "-DPLUGIN_STANDARD_QSRA=ON"
     "-DPLUGIN_STANDARD_QCLOUDLAYERS=ON"
+    # Fix the build with CMake 4, by overriding the minimum version globally, as support for < 3.5 was removed
+    # Ideally this can be removed at some time, but there are a lot of dependencies (e.g. plugins) which have a lower minimum version configured.
     (lib.strings.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5")
   ];
 

From 696533bb7fab5ccb722d002b3a44caefaa8de2c3 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 17:16:47 -0300
Subject: [PATCH 1818/6226] cosmic-workspaces-epoch: 1.0.0-beta.2 ->
 1.0.0-beta.3

Diff: https://github.com/pop-os/cosmic-workspaces-epoch/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/co/cosmic-workspaces-epoch/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
index 879a62516599..056beebea342 100644
--- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
+++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
@@ -14,7 +14,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-workspaces-epoch";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 934a9ff265fc585ab043a40e0c899d455f91f1cf Mon Sep 17 00:00:00 2001
From: Zhaith Izaliel <zhaith.izaliel@ethereal-edelweiss.cloud>
Date: Wed, 22 Oct 2025 22:18:16 +0200
Subject: [PATCH 1819/6226] maintainers: add Zhaith-Izaliel

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 52b6e7231b96..c50b17a3308f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28952,6 +28952,11 @@
     githubId = 1329212;
     name = "Andy Zhang";
   };
+  zhaithizaliel = {
+    name = "Zhaith Izaliel";
+    github = "Zhaith-Izaliel";
+    githubId = 39216756;
+  };
   zhaofengli = {
     email = "hello@zhaofeng.li";
     matrix = "@zhaofeng:zhaofeng.li";

From e46d02ec9220d4e93722fb8f44468f4e93f880f7 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 22 Oct 2025 17:18:42 -0300
Subject: [PATCH 1820/6226] xdg-desktop-portal-cosmic: 1.0.0-beta.2 ->
 1.0.0-beta.3

Diff: https://github.com/pop-os/xdg-desktop-portal-cosmic/compare/epoch-1.0.0-beta.2...epoch-1.0.0-beta.3
---
 pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
index 3264cf67b9e8..52642f0392d4 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
@@ -10,21 +10,20 @@
   pipewire,
   gst_all_1,
   cosmic-wallpapers,
-  coreutils,
   nix-update-script,
   nixosTests,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xdg-desktop-portal-cosmic";
-  version = "1.0.0-beta.2";
+  version = "1.0.0-beta.3";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "xdg-desktop-portal-cosmic";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-3FmNaT9tfDttINSbkwEaNW5i5hk9jH+fmMAg0UagttA=";
+    hash = "sha256-JNLcrOj04HHFg8p76IdziMKbc2cjWIT+zhihzXis19M=";
   };
 
   cargoHash = "sha256-gaDVt/0QPFZHnt9veUo5bvZECxKZcIrja/QdLBn/Xi4=";
@@ -59,10 +58,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     # [2]: https://github.com/pop-os/cosmic-bg/blob/epoch-1.0.0-alpha.6/data/v1/all#L3
     substituteInPlace src/screenshot.rs src/widget/screenshot.rs \
       --replace-fail '/usr/share/backgrounds/pop/kate-hazen-COSMIC-desktop-wallpaper.png' '${cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg'
-
-    # Also modifies the functionality by replacing 'false' with 'true' to enable the portal to start properly.
-    substituteInPlace data/org.freedesktop.impl.portal.desktop.cosmic.service \
-      --replace-fail 'Exec=/bin/false' 'Exec=${lib.getExe' coreutils "true"}'
   '';
 
   dontCargoInstall = true;

From 1efa75a507669ccb6e3471a8256e143b3d399acb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 20:22:40 +0000
Subject: [PATCH 1821/6226] python3Packages.polyfactory: 2.22.2 -> 2.22.3

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

diff --git a/pkgs/development/python-modules/polyfactory/default.nix b/pkgs/development/python-modules/polyfactory/default.nix
index 2b7d81d99777..3e0d3b275268 100644
--- a/pkgs/development/python-modules/polyfactory/default.nix
+++ b/pkgs/development/python-modules/polyfactory/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "polyfactory";
-  version = "2.22.2";
+  version = "2.22.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "litestar-org";
     repo = "polyfactory";
     tag = "v${version}";
-    hash = "sha256-Mm9Yj8yBaH1KQJxQJY/sbrkfL/eDpMyWd/9ThQfmzx8=";
+    hash = "sha256-/LHGUQsYwEPBHWSyzaX0gUrqNm2cvWGraxMhWWvMkBc=";
   };
 
   build-system = [ hatchling ];

From 60271a21aa9fe5f9b4128e6c3dca674390facadd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 20:24:46 +0000
Subject: [PATCH 1822/6226] fanficfare: 4.49.0 -> 4.50.0

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

diff --git a/pkgs/by-name/fa/fanficfare/package.nix b/pkgs/by-name/fa/fanficfare/package.nix
index 92759ffad673..6f9c182dd0cd 100644
--- a/pkgs/by-name/fa/fanficfare/package.nix
+++ b/pkgs/by-name/fa/fanficfare/package.nix
@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "fanficfare";
-  version = "4.49.0";
+  version = "4.50.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-b+PGsm5szBAd8R7P+TT4EyXd2ULgr3+AV5F15S3pn3o=";
+    hash = "sha256-+4hasWmQx//HzKwOmtlGqutw95rKFvWL97Ec1xLE1Js=";
   };
 
   nativeBuildInputs = with python3Packages; [

From 4a0a1c6ad27f9e7fbf64c5698c9d5a1851249ec0 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 17:34:08 -0300
Subject: [PATCH 1823/6226] minia: fix build with cmake4

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

diff --git a/pkgs/by-name/mi/minia/package.nix b/pkgs/by-name/mi/minia/package.nix
index 1397cc2cb286..33dfd798cad7 100644
--- a/pkgs/by-name/mi/minia/package.nix
+++ b/pkgs/by-name/mi/minia/package.nix
@@ -33,6 +33,13 @@ stdenv.mkDerivation rec {
     rm -rf thirdparty/gatb-core/gatb-core/thirdparty/{hdf5,boost}
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace thirdparty/gatb-core/gatb-core/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.1.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Short read genome assembler";
     mainProgram = "minia";

From 3fbc67c715303e209fff85e52c0ecce9c94f781e Mon Sep 17 00:00:00 2001
From: Zhaith Izaliel <zhaith.izaliel@ethereal-edelweiss.cloud>
Date: Wed, 22 Oct 2025 22:32:00 +0200
Subject: [PATCH 1824/6226] iio-niri: init at 1.2.1

---
 pkgs/by-name/ii/iio-niri/package.nix | 37 ++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/ii/iio-niri/package.nix

diff --git a/pkgs/by-name/ii/iio-niri/package.nix b/pkgs/by-name/ii/iio-niri/package.nix
new file mode 100644
index 000000000000..e203e26149a8
--- /dev/null
+++ b/pkgs/by-name/ii/iio-niri/package.nix
@@ -0,0 +1,37 @@
+{
+  rustPlatform,
+  lib,
+  fetchFromGitHub,
+  dbus,
+  pkg-config,
+}:
+rustPlatform.buildRustPackage rec {
+  pname = "iio-niri";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "Zhaith-Izaliel";
+    repo = "iio-niri";
+    tag = "v${version}";
+    hash = "sha256-IOMJ1xtjUkUoUgFZ9pxBf5XKdaUHu3WbUH5TlEiNRc4=";
+  };
+
+  cargoHash = "sha256-b05Jy+EKFAUcHR9+SdjHZUcIZG0Ta+ar/qc0GdRlJik=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    dbus
+  ];
+
+  meta = {
+    description = "Listen to iio-sensor-proxy and updates Niri output orientation depending on the accelerometer orientation";
+    homepage = "https://github.com/Zhaith-Izaliel/iio-niri";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ zhaithizaliel ];
+    mainProgram = "iio-niri";
+    platforms = lib.platforms.linux;
+  };
+}

From 395df2e74aa4f41f94cd692e438c345328495d64 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 20:47:42 +0000
Subject: [PATCH 1825/6226] cilium-cli: 0.18.7 -> 0.18.8

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

diff --git a/pkgs/by-name/ci/cilium-cli/package.nix b/pkgs/by-name/ci/cilium-cli/package.nix
index 59f2c448423b..950f2384ae0d 100644
--- a/pkgs/by-name/ci/cilium-cli/package.nix
+++ b/pkgs/by-name/ci/cilium-cli/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "cilium-cli";
-  version = "0.18.7";
+  version = "0.18.8";
 
   src = fetchFromGitHub {
     owner = "cilium";
     repo = "cilium-cli";
     tag = "v${version}";
-    hash = "sha256-zmVSryOp+4QDm83yJFwUld/NlZEHZtV0BJABqBcMirE=";
+    hash = "sha256-6/ECHhPV9rJHcHFVAvkwtlZi96rjhEe2PjEvXtv8OMY=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 8c8d23b188e87ba370897a53101fb3c41a4063db Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 22 Oct 2025 18:52:27 +0000
Subject: [PATCH 1826/6226] python3Packages.textual: 6.3.0 -> 6.4.0

Diff: https://github.com/Textualize/textual/compare/v6.3.0...v6.4.0

Changelog: https://github.com/Textualize/textual/blob/v6.4.0/CHANGELOG.md
---
 pkgs/development/python-modules/textual/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix
index 4dfe95cadb03..68eee933c737 100644
--- a/pkgs/development/python-modules/textual/default.nix
+++ b/pkgs/development/python-modules/textual/default.nix
@@ -11,6 +11,7 @@
   platformdirs,
   rich,
   typing-extensions,
+  mdit-py-plugins,
 
   # optional-dependencies
   tree-sitter,
@@ -29,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "textual";
-  version = "6.3.0";
+  version = "6.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "textual";
     tag = "v${version}";
-    hash = "sha256-3KxSuyfczyulbpysAO8mF7wvzd+807Lj6l6g0TygBnI=";
+    hash = "sha256-lwtgPJK62SntL0ThoIpmEq0Ngjf8wl73Q8PXjvut3ps=";
   };
 
   build-system = [ poetry-core ];
@@ -46,6 +47,7 @@ buildPythonPackage rec {
   ];
   dependencies = [
     markdown-it-py
+    mdit-py-plugins
     platformdirs
     rich
     typing-extensions

From 8bbae6fa785f6e229ee46bfc36c0fe0197494665 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 20:54:30 +0000
Subject: [PATCH 1827/6226] azurehound: 2.7.1 -> 2.8.0

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

diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix
index 024b29001b65..aee89fec8197 100644
--- a/pkgs/by-name/az/azurehound/package.nix
+++ b/pkgs/by-name/az/azurehound/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "azurehound";
-  version = "2.7.1";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "SpecterOps";
     repo = "AzureHound";
     tag = "v${version}";
-    hash = "sha256-fCs9C86IO1aTzBFZiA7SaVlk0Zdm/ItWtLhE8Ii2W0A=";
+    hash = "sha256-nek4WXjXk36IcdnIFv0q1vTKmLnxgCu2xX/AzwQb8kc=";
   };
 
-  vendorHash = "sha256-ScFHEIarDvxd9R6eUONdECmtK+5aZRdo71khljLz8c4=";
+  vendorHash = "sha256-+iNFWKFNON4HX2mf4O29zAdElEkIGIx55Wi9MRtg1dg=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 

From 71133711b3f6fdfd7076620189765bdb1ce0d1ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 20:55:32 +0000
Subject: [PATCH 1828/6226] llama-cpp: 6782 -> 6821

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

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index b832dddde80b..e45a22e0aefb 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -75,13 +75,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "6782";
+  version = "6821";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-9cFuYkEcgUHsC4jg8qzKvHA8xI8Bp0w4AQKEt/TACUI=";
+    hash = "sha256-HqrX7xOYsF0UUF12c8KgIM2HMeTm1XxiFPuz/PaToI0=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT

From 294984f6e7a245a870092bf3d2e13ddfdd25a77f Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 17:22:24 -0300
Subject: [PATCH 1829/6226] midivisualizer: 7.0 -> 7.2, mark as broken on
 darwin

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

diff --git a/pkgs/by-name/mi/midivisualizer/package.nix b/pkgs/by-name/mi/midivisualizer/package.nix
index d9ff9bf1ec6c..601f52e080de 100644
--- a/pkgs/by-name/mi/midivisualizer/package.nix
+++ b/pkgs/by-name/mi/midivisualizer/package.nix
@@ -5,6 +5,7 @@
   cmake,
   pkg-config,
   libX11,
+  libnotify,
   glfw,
   makeWrapper,
   libXrandr,
@@ -16,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "midivisualizer";
-  version = "7.0";
+  version = "7.2";
 
   src = fetchFromGitHub {
     owner = "kosua20";
     repo = "MIDIVisualizer";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-wfPSPH+E9cErVvfJZqHttFtjiUYJopM/u6w6NpRHifE=";
+    sha256 = "sha256-Ilsqc14PBTqreLhrEpvMOZAp37xOY/OwuhHTjeOjqm8=";
   };
 
   nativeBuildInputs = [
@@ -34,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     glfw
     ffmpeg-full
+    libnotify
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libX11
@@ -65,6 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/kosua20/MIDIVisualizer";
     license = licenses.mit;
     platforms = platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin;
     maintainers = [ maintainers.ericdallo ];
   };
 })

From 348ebc46e087661abff1312c03225b8f1dc88113 Mon Sep 17 00:00:00 2001
From: CherryKitten <sammy@cherrykitten.dev>
Date: Wed, 22 Oct 2025 23:04:52 +0200
Subject: [PATCH 1830/6226] gotosocial: 0.20.0 -> 0.20.1

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

diff --git a/pkgs/by-name/go/gotosocial/package.nix b/pkgs/by-name/go/gotosocial/package.nix
index 54306db43a7f..fe50a35985f7 100644
--- a/pkgs/by-name/go/gotosocial/package.nix
+++ b/pkgs/by-name/go/gotosocial/package.nix
@@ -10,11 +10,11 @@ let
   owner = "superseriousbusiness";
   repo = "gotosocial";
 
-  version = "0.20.0";
+  version = "0.20.1";
 
   web-assets = fetchurl {
     url = "https://${domain}/${owner}/${repo}/releases/download/v${version}/${repo}_${version}_web-assets.tar.gz";
-    hash = "sha256-poG+j5WfbTN7853cOdngv+uIblcL19ySgtguXW5TX+w=";
+    hash = "sha256-0WvaPUVTMYd1tz7Rtmlp37vx/co4efhDdSWBc4gUzAU=";
   };
 in
 buildGo124Module rec {
@@ -24,7 +24,7 @@ buildGo124Module rec {
   src = fetchFromGitea {
     inherit domain owner repo;
     tag = "v${version}";
-    hash = "sha256-RN2U/hYJcmuTGMnTCQCLX74qdxANF8nkIx98uWT/Aww=";
+    hash = "sha256-8z2tBiEVcof0/G41gpc0S8Dye5nynwHSJpTzo/ZseFs=";
   };
 
   vendorHash = null;

From abf2fec8268080e29913c88ff83235c674c25cd6 Mon Sep 17 00:00:00 2001
From: Izel Nakri <contact@izelnakri.com>
Date: Sun, 10 Aug 2025 08:03:08 +0200
Subject: [PATCH 1831/6226] level-zero: add setup-hook for Intel OpenGL driver
 lookups

The Level Zero package requires /run/opengl-driver/lib and
/run/opengl-driver-32/lib
to be in LD_LIBRARY_PATH for the Intel GPU driver to function correctly.

This change adds a setup-hook that prepends these paths if they exist,
ensuring runtime linker can find the necessary driver libraries in
NixOS and other Linux systems without manual environment modifications.
---
 pkgs/by-name/le/level-zero/package.nix   | 2 ++
 pkgs/by-name/le/level-zero/setup-hook.sh | 7 +++++++
 2 files changed, 9 insertions(+)
 create mode 100644 pkgs/by-name/le/level-zero/setup-hook.sh

diff --git a/pkgs/by-name/le/level-zero/package.nix b/pkgs/by-name/le/level-zero/package.nix
index 1637b1bd1d68..cba1ef9cc53b 100644
--- a/pkgs/by-name/le/level-zero/package.nix
+++ b/pkgs/by-name/le/level-zero/package.nix
@@ -29,6 +29,8 @@ stdenv.mkDerivation rec {
     addDriverRunpath $out/lib/libze_loader.so
   '';
 
+  setupHook = ./setup-hook.sh;
+
   passthru = {
     tests = {
       inherit intel-compute-runtime openvino;
diff --git a/pkgs/by-name/le/level-zero/setup-hook.sh b/pkgs/by-name/le/level-zero/setup-hook.sh
new file mode 100644
index 000000000000..be0a59a05376
--- /dev/null
+++ b/pkgs/by-name/le/level-zero/setup-hook.sh
@@ -0,0 +1,7 @@
+if [ -d /run/opengl-driver/lib ]; then
+  export LD_LIBRARY_PATH="/run/opengl-driver/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH:-}"
+fi
+
+if [ -d /run/opengl-driver-32/lib ]; then
+  export LD_LIBRARY_PATH="/run/opengl-driver-32/lib${LD_LIBRARY_PATH:+:}${LD_LIBRARY_PATH:-}"
+fi

From 0dabfc547c5616a09426ef48b6b610e9585777ad Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 18:26:35 -0300
Subject: [PATCH 1832/6226] mkclean: fix build with cmake4

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

diff --git a/pkgs/by-name/mk/mkclean/package.nix b/pkgs/by-name/mk/mkclean/package.nix
index 13e6da9a0945..cfda95fc3c90 100644
--- a/pkgs/by-name/mk/mkclean/package.nix
+++ b/pkgs/by-name/mk/mkclean/package.nix
@@ -18,6 +18,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   hardeningDisable = [ "format" ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = ''
     install -Dm0755 mkclean/mkclean $out/bin/mkclean
   '';

From ebaf8b83ad1aaf389e96a97121433c3d06710cbd Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Wed, 22 Oct 2025 14:19:12 -0700
Subject: [PATCH 1833/6226] nixos-rebuild-ng: make the version correlated to
 the release we are in

---
 pkgs/by-name/ni/nixos-rebuild-ng/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
index 1e2c8363ad6c..33f52e0e1c68 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/package.nix
@@ -26,7 +26,7 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "nixos-rebuild-ng";
-  version = "0.0.0";
+  version = lib.trivial.release;
   src = ./src;
   pyproject = true;
 

From ddb5a1988b59a15888ec609ace17a4916c161860 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 22 Oct 2025 21:27:38 +0000
Subject: [PATCH 1834/6226] python3Packages.sqlfmt: 0.27.0 -> 0.28.1

Diff: https://github.com/tconbeer/sqlfmt/compare/v0.27.0...v0.28.1

Changelog: https://github.com/tconbeer/sqlfmt/blob/v0.28.1/CHANGELOG.md
---
 .../python-modules/sqlfmt/default.nix         | 46 +++++++++++++------
 1 file changed, 32 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/sqlfmt/default.nix b/pkgs/development/python-modules/sqlfmt/default.nix
index 2f1dff47901a..1acdfcfa0664 100644
--- a/pkgs/development/python-modules/sqlfmt/default.nix
+++ b/pkgs/development/python-modules/sqlfmt/default.nix
@@ -1,23 +1,33 @@
 {
   lib,
-  black,
   buildPythonPackage,
-  click,
   fetchFromGitHub,
-  gitpython,
+  pythonOlder,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  click,
   jinja2,
   platformdirs,
-  poetry-core,
+  tqdm,
+
+  # optional-dependencies
+  black,
+  gitpython,
+
+  # tests
+  addBinToPathHook,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
-  tqdm,
+  versionCheckHook,
   writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
   pname = "sqlfmt";
-  version = "0.27.0";
+  version = "0.28.1";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -26,11 +36,14 @@ buildPythonPackage rec {
     owner = "tconbeer";
     repo = "sqlfmt";
     tag = "v${version}";
-    hash = "sha256-Yel9SB7KrDqtuZxNx4omz6u4AID8Fk5kFYKBEZD1fuU=";
+    hash = "sha256-H896Ey4iJFuvcLLvLilN/6nN4gxpvv3VJKIjivEDwMU=";
   };
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
+  pythonRelaxDeps = [
+    "click"
+  ];
   dependencies = [
     click
     jinja2
@@ -43,18 +56,23 @@ buildPythonPackage rec {
     sqlfmt_primer = [ gitpython ];
   };
 
+  pythonImportsCheck = [ "sqlfmt" ];
+
   nativeCheckInputs = [
+    addBinToPathHook
     pytest-asyncio
     pytestCheckHook
+    versionCheckHook
     writableTmpDirAsHomeHook
   ]
   ++ lib.flatten (builtins.attrValues optional-dependencies);
+  versionCheckProgramArg = "--version";
 
-  preCheck = ''
-    export PATH="$PATH:$out/bin";
-  '';
-
-  pythonImportsCheck = [ "sqlfmt" ];
+  disabledTestPaths = [
+    # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr'
+    "tests/functional_tests/test_end_to_end.py"
+    "tests/unit_tests/test_cli.py"
+  ];
 
   meta = {
     description = "Sqlfmt formats your dbt SQL files so you don't have to";

From 3e14dbd9c9e9c43bd73042ea3ff83179b435624f Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 18:36:05 -0300
Subject: [PATCH 1835/6226] mni_autoreg: fix build with cmake4

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

diff --git a/pkgs/by-name/mn/mni_autoreg/package.nix b/pkgs/by-name/mn/mni_autoreg/package.nix
index e7698513891e..fe1b40ba90b1 100644
--- a/pkgs/by-name/mn/mni_autoreg/package.nix
+++ b/pkgs/by-name/mn/mni_autoreg/package.nix
@@ -48,6 +48,12 @@ stdenv.mkDerivation {
     done
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "CMAKE_POLICY(SET CMP0026 OLD)" "CMAKE_POLICY(SET CMP0026 NEW)"
+  '';
+
   meta = {
     homepage = "https://github.com/BIC-MNI/mni_autoreg";
     description = "Tools for automated registration using the MINC image format";

From 045f67c33e0953781911457366144cb6712e6f5f Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 12 Oct 2025 10:16:51 +0800
Subject: [PATCH 1836/6226] sirius: 7.8.0-unstable-2025-07-23 -> 7.9.0

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

diff --git a/pkgs/by-name/si/sirius/package.nix b/pkgs/by-name/si/sirius/package.nix
index f0b404de0de6..ff4c82bd92a5 100644
--- a/pkgs/by-name/si/sirius/package.nix
+++ b/pkgs/by-name/si/sirius/package.nix
@@ -51,15 +51,15 @@ assert builtins.elem gpuBackend [
 ];
 assert enablePython -> pythonPackages != null;
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "SIRIUS";
-  version = "7.8.0-unstable-2025-07-23";
+  version = "7.9.0";
 
   src = fetchFromGitHub {
     owner = "electronic-structure";
     repo = "SIRIUS";
-    rev = "258c8c6543af0350ac002a52fbe18221ea275590";
-    hash = "sha256-HHt3iw3muIGz86NmI9p6yuv7jrXoiz/83qTTueU7Lpk=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-/bhY+LCxOikS1at0ONFAhmvfnWhAVHsRQ4GfXJOZbBA=";
   };
 
   outputs = [
@@ -182,4 +182,4 @@ stdenv.mkDerivation {
     platforms = platforms.linux;
     maintainers = [ maintainers.sheepforce ];
   };
-}
+})

From 052978d1ee02e841db03e7a3587c7566d6e6717a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 21:38:31 +0000
Subject: [PATCH 1837/6226] tradingview: 2.12.0 -> 2.14.0

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

diff --git a/pkgs/by-name/tr/tradingview/package.nix b/pkgs/by-name/tr/tradingview/package.nix
index af6e1619e7a3..a19ed8864e20 100644
--- a/pkgs/by-name/tr/tradingview/package.nix
+++ b/pkgs/by-name/tr/tradingview/package.nix
@@ -24,12 +24,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tradingview";
-  version = "2.12.0";
-  revision = "66";
+  version = "2.14.0";
+  revision = "68";
 
   src = fetchurl {
     url = "https://api.snapcraft.io/api/v1/snaps/download/nJdITJ6ZJxdvfu8Ch7n5kH5P99ClzBYV_${finalAttrs.revision}.snap";
-    hash = "sha512-ydk0/mJh4M02oIEfU3PKTwEO+nMpeJGuxQAly8WqJLx5GOQAb/J7VRB8IQpHHqWGeRfbwhantdZryQF8ngFJ/g==";
+    hash = "sha512-wuMQBfJfMbQdq4eUNl9bitf4IGcpczX0FDdnQAgyALBpHI7CbcIF9Aq4hIy0dblYgeISM1HFqPiSIcFCS+VuSQ==";
   };
 
   nativeBuildInputs = [

From dd76681b3a0f072ff626cdd2b267c0fae46ad17d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 22 Oct 2025 21:42:21 +0000
Subject: [PATCH 1838/6226] harlequin: address click 8.2.x incompatibility

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

diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix
index 6a06668e656c..b12abb6b7a03 100644
--- a/pkgs/by-name/ha/harlequin/package.nix
+++ b/pkgs/by-name/ha/harlequin/package.nix
@@ -47,6 +47,7 @@ pythonPackages.buildPythonApplication rec {
   };
 
   pythonRelaxDeps = [
+    "click"
     "numpy"
     "pyarrow"
     "questionary"
@@ -104,6 +105,10 @@ pythonPackages.buildPythonApplication rec {
     # Tests require network access
     "test_connect_extensions"
     "test_connect_prql"
+
+    # Broken since click was updated to 8.2.1 in https://github.com/NixOS/nixpkgs/pull/448189
+    # AssertionError
+    "test_bad_adapter_opt"
   ]
   ++ lib.optionals (!stdenv.hostPlatform.isx86_64) [
     # Test incorrectly tries to load a dylib/so compiled for x86_64

From d7ce9cddbd1560d76cce350cc45deab031207f34 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 18:47:25 -0300
Subject: [PATCH 1839/6226] molequeue: fix build with cmake4

---
 .../libraries/science/chemistry/molequeue/default.nix        | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/science/chemistry/molequeue/default.nix b/pkgs/development/libraries/science/chemistry/molequeue/default.nix
index dba6e33b22e6..122214040a08 100644
--- a/pkgs/development/libraries/science/chemistry/molequeue/default.nix
+++ b/pkgs/development/libraries/science/chemistry/molequeue/default.nix
@@ -25,6 +25,11 @@ stdenv.mkDerivation rec {
 
   buildInputs = [ qttools ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.3 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   # Fix the broken CMake files to use the correct paths
   postInstall = ''
     substituteInPlace $out/lib/cmake/molequeue/MoleQueueConfig.cmake \

From 524585d1b0fc6634ad5a5df9367f2243b3a3c87e Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Wed, 22 Oct 2025 17:52:51 -0400
Subject: [PATCH 1840/6226] buildMavenPackage: fix keytool path on darwin

zulu jdk build for darwin has different lib/ structure. We should be
able to just call /bin/keytool since it's symlinked in both derivations.

I think this is a regression since:
https://github.com/NixOS/nixpkgs/pull/437528
---
 pkgs/by-name/ma/maven/build-maven-package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix
index 2e167b02a9df..b829cb71199b 100644
--- a/pkgs/by-name/ma/maven/build-maven-package.nix
+++ b/pkgs/by-name/ma/maven/build-maven-package.nix
@@ -63,7 +63,7 @@ let
         # handle cacert by populating a trust store on the fly
         if [[ -n "''${NIX_SSL_CERT_FILE-}" ]] && [[ "''${NIX_SSL_CERT_FILE-}" != "/no-cert-file.crt" ]];then
           echo "using ''${NIX_SSL_CERT_FILE-} as trust store"
-          ${jre-generate-cacerts} ${jdk}/lib/openjdk/bin/keytool $NIX_SSL_CERT_FILE
+          ${jre-generate-cacerts} ${lib.getBin jdk}/bin/keytool $NIX_SSL_CERT_FILE
 
           MAVEN_EXTRA_ARGS="$MAVEN_EXTRA_ARGS -Djavax.net.ssl.trustStore=cacerts -Djavax.net.ssl.trustStorePassword=changeit"
         fi

From 54d5d50e6045686a205eaefbdd461464a504e9db Mon Sep 17 00:00:00 2001
From: Linus Karl <linus@lotz.li>
Date: Wed, 22 Oct 2025 17:57:29 +0200
Subject: [PATCH 1841/6226] indilib: fix hash of tag, remove patch

---
 .../libraries/science/astronomy/indilib/default.nix  | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/science/astronomy/indilib/default.nix b/pkgs/development/libraries/science/astronomy/indilib/default.nix
index 527f716a686d..a9200c388be5 100644
--- a/pkgs/development/libraries/science/astronomy/indilib/default.nix
+++ b/pkgs/development/libraries/science/astronomy/indilib/default.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch2,
   bash,
   cmake,
   cfitsio,
@@ -30,18 +29,9 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "indilib";
     repo = "indi";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-0+ZC9NoanBDojYz/ufZUpUQB++vnMcUYtG1UmmVGbTg=";
+    hash = "sha256-WfVC5CLzwyO40Kpv/SZaYiPGDvWLUydQaA8FvTVhHqg=";
   };
 
-  # fixes version number. This commit is directly after the tagged commit in master
-  # should be removed with the next release
-  patches = [
-    (fetchpatch2 {
-      url = "https://github.com/indilib/indi/commit/91e3e35250126887a856e90b6a0a30697fb01545.patch?full_index=1";
-      hash = "sha256-ho1S+A6gTQ9ELy/QE14S6daXyMN+vASFbXa2vMWdqR8=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
   ];

From 391b77f792f0d237841c6cd2cba2f2da3d6c34fb Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Wed, 22 Oct 2025 18:00:17 -0400
Subject: [PATCH 1842/6226] brave: 1.83.118 -> 1.83.120

https://community.brave.app/t/release-channel-1-83-120/644570
---
 pkgs/by-name/br/brave/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index ab0839301615..cb38c191c8a7 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,24 +3,24 @@
 
 let
   pname = "brave";
-  version = "1.83.118";
+  version = "1.83.120";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-daHMBEGYJBLYu2HP2oY1wYLhVC61DNT6EFlK/PBzqcw=";
+      hash = "sha256-DQX+HKNLakI6G7K53SmcmtmA+h7ZmvkcjUgd/k3C/cc=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-KjcRXDxXAkhgAXgALzCN828+ovp2HURKL+VWT2DIMVI=";
+      hash = "sha256-E1IKc6ftBO88WVXa0RgjAFhtckBNm/hTQgxzMzK17PY=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-EnCEuLqYdV3gSwvcT19FUtRbPm79TdjUzL39sKpPTd8=";
+      hash = "sha256-aMyTGhxnExd1kaoHHTZu7UU42/WSOkB9PAyc8M0B/xU=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-brj0EvOwX0i82ndPHBS9mqfliq/YnXyxGeiz4nA1qNw=";
+      hash = "sha256-lTxFrmQzWWegmlyBc71fL81iTPqVLB3r8q2gqvrlM3o=";
     };
   };
 

From 0449e34b11f15ee2958e75d2b7301341f807e6ac Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 19:09:06 -0300
Subject: [PATCH 1843/6226] mozart2: fix build with cmake4

---
 pkgs/development/compilers/mozart/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/development/compilers/mozart/default.nix b/pkgs/development/compilers/mozart/default.nix
index 88736dffdeec..d9f82898c8e7 100644
--- a/pkgs/development/compilers/mozart/default.nix
+++ b/pkgs/development/compilers/mozart/default.nix
@@ -76,6 +76,17 @@ stdenv.mkDerivation rec {
     tk
   ];
 
+  postPatch = ''
+    substituteInPlace {vm,.}/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace vm/vm/test/gtest/{googletest,.}/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6.4)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace bootcompiler/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace {boosthost,opi,wish,stdlib}/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Open source implementation of Oz 3";
     maintainers = with maintainers; [

From 4704a316771e45164f4747471f4cb146d4101370 Mon Sep 17 00:00:00 2001
From: Grisha Shipunov <blame@oxapentane.com>
Date: Mon, 20 Oct 2025 18:08:43 +0200
Subject: [PATCH 1844/6226] CubicSDR: fix build with cmake4

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

diff --git a/pkgs/by-name/cu/cubicsdr/package.nix b/pkgs/by-name/cu/cubicsdr/package.nix
index 7f7a9f0d67e5..53f769ac092d 100644
--- a/pkgs/by-name/cu/cubicsdr/package.nix
+++ b/pkgs/by-name/cu/cubicsdr/package.nix
@@ -55,6 +55,11 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [ "-DUSE_HAMLIB=ON" ] ++ lib.optional enableDigitalLab "-DENABLE_DIGITAL_LAB=ON";
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required (VERSION 3.10)"
+  '';
+
   postFixup = lib.optionalString stdenv.hostPlatform.isDarwin ''
     install_name_tool -change libliquid.dylib ${lib.getLib liquid-dsp}/lib/libliquid.dylib ''${out}/bin/CubicSDR
   '';

From 3a490f17c0eaa43f89dc04d41dfdecf62155ab39 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 19:14:20 -0300
Subject: [PATCH 1845/6226] mpifileutils: fix build with cmake4

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

diff --git a/pkgs/by-name/mp/mpifileutils/package.nix b/pkgs/by-name/mp/mpifileutils/package.nix
index 6011e6d26d3b..ddb67dd5d5d0 100644
--- a/pkgs/by-name/mp/mpifileutils/package.nix
+++ b/pkgs/by-name/mp/mpifileutils/package.nix
@@ -45,6 +45,11 @@ stdenv.mkDerivation rec {
 
   propagatedBuildInputs = [ mpi ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Suite of MPI-based tools to manage large datasets";
     homepage = "https://hpc.github.io/mpifileutils";

From 18084c88a903b25ccab6bfc3d550189765c1e133 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 22 Oct 2025 22:15:43 +0000
Subject: [PATCH 1846/6226] chhoto-url: 6.3.2 -> 6.4.0

Changelog: https://github.com/SinTan1729/chhoto-url/releases/tag/6.4.0
Diff: https://github.com/SinTan1729/chhoto-url/compare/6.3.2...6.4.0
---
 pkgs/by-name/ch/chhoto-url/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix
index 778471e975ad..f6add0a52d8f 100644
--- a/pkgs/by-name/ch/chhoto-url/package.nix
+++ b/pkgs/by-name/ch/chhoto-url/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "chhoto-url";
-  version = "6.3.2";
+  version = "6.4.0";
 
   src = fetchFromGitHub {
     owner = "SinTan1729";
     repo = "chhoto-url";
     tag = finalAttrs.version;
-    hash = "sha256-k5fxU3HWhlYlBjmHNsj4lin7LHdwswbwm5bCVmCMjg8=";
+    hash = "sha256-IghMhr1ksoTWPvuQ66XfXWrNgPAmS39OqjdhwpElD3U=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/actix";
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
   '';
 
-  cargoHash = "sha256-oR1SCEbMMDfQyvhoUJzBiK4VHCZwx+o/PaZBfxPB2K8=";
+  cargoHash = "sha256-cxw0Gg80UHvkjBXGt7tKMEinfhS2aT4fZ7oDzNNHnX8=";
 
   postInstall = ''
     mkdir -p $out/share/chhoto-url

From 40211ad1af58b87610e078216468b4e0f16b656d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 22:23:54 +0000
Subject: [PATCH 1847/6226] qownnotes: 25.10.3 -> 25.10.4

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

diff --git a/pkgs/by-name/qo/qownnotes/package.nix b/pkgs/by-name/qo/qownnotes/package.nix
index 6c9e932f5297..73db3a0cda24 100644
--- a/pkgs/by-name/qo/qownnotes/package.nix
+++ b/pkgs/by-name/qo/qownnotes/package.nix
@@ -19,11 +19,11 @@
 stdenv.mkDerivation (finalAttrs: {
   pname = "qownnotes";
   appname = "QOwnNotes";
-  version = "25.10.3";
+  version = "25.10.4";
 
   src = fetchurl {
     url = "https://github.com/pbek/QOwnNotes/releases/download/v${finalAttrs.version}/qownnotes-${finalAttrs.version}.tar.xz";
-    hash = "sha256-hXqfo+67m1yEr8q7UQ+Er+BuJrIB3Z8M+x39PpmUdxA=";
+    hash = "sha256-taYrPrirSIu1CGs8GeX2lhSS8R1l3mr8YPqpkH4Y/bk=";
   };
 
   nativeBuildInputs = [

From a6d5d6ba57fb8ff1b91147a8e4d26c09a2393bb8 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 22 Oct 2025 22:17:31 +0000
Subject: [PATCH 1848/6226] hyfetch: 2.0.2 -> 2.0.4

Changelog: https://github.com/hykilpikonna/hyfetch/releases/tag/2.0.4
Diff: https://github.com/hykilpikonna/hyfetch/compare/2.0.2...2.0.4
---
 pkgs/by-name/hy/hyfetch/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hy/hyfetch/package.nix b/pkgs/by-name/hy/hyfetch/package.nix
index 098d367be445..a258372f80fe 100644
--- a/pkgs/by-name/hy/hyfetch/package.nix
+++ b/pkgs/by-name/hy/hyfetch/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hyfetch";
-  version = "2.0.2";
+  version = "2.0.4";
 
   src = fetchFromGitHub {
     owner = "hykilpikonna";
     repo = "hyfetch";
     tag = finalAttrs.version;
-    hash = "sha256-Y9v2vrpTPlsgFRoo33NDVoyQSgUD/stKQLJXzUxFesA=";
+    hash = "sha256-nqbdkVEKuzuDDK4NivzJ6hfm3KqkFqorETiEaTqgKNY=";
   };
 
-  cargoHash = "sha256-auOeH/1KtxS7a1APOtCMwNTdEQ976BL/jEKj2ADaakQ=";
+  cargoHash = "sha256-Lem/6q0+P+1Hy+ZCJvP+O7kws49ytKEhzytT2+B4aRE=";
 
   nativeBuildInputs = [
     installShellFiles

From 0267f98888a66cac451cbaebd20c09fc3aeacb9e Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 19:26:51 -0300
Subject: [PATCH 1849/6226] msgpuck: fix build with cmake4

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

diff --git a/pkgs/by-name/ms/msgpuck/package.nix b/pkgs/by-name/ms/msgpuck/package.nix
index 41fdca7052de..85cdb0859429 100644
--- a/pkgs/by-name/ms/msgpuck/package.nix
+++ b/pkgs/by-name/ms/msgpuck/package.nix
@@ -27,6 +27,13 @@ stdenv.mkDerivation rec {
     pkg-config
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.5)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace test/CMakeLists.txt \
+      --replace-fail "cmake_policy(SET CMP0037 OLD)" "cmake_policy(SET CMP0037 NEW)"
+  '';
+
   meta = with lib; {
     description = "Simple and efficient MsgPack binary serialization library in a self-contained header file";
     homepage = "https://github.com/rtsisyk/msgpuck";

From a2f52f4cca4851511b74cc88540964fe2dac7256 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 22 Oct 2025 22:17:58 +0000
Subject: [PATCH 1850/6226] python312Packages.asyncer: 0.0.9 -> 0.0.10

Changelog: https://github.com/fastapi/asyncer/releases/tag/0.0.10
Diff: https://github.com/fastapi/asyncer/compare/0.0.9...0.0.10
---
 pkgs/development/python-modules/asyncer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/asyncer/default.nix b/pkgs/development/python-modules/asyncer/default.nix
index daa9524cf7ea..6047204329b7 100644
--- a/pkgs/development/python-modules/asyncer/default.nix
+++ b/pkgs/development/python-modules/asyncer/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "asyncer";
-  version = "0.0.9";
+  version = "0.0.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fastapi";
     repo = "asyncer";
     tag = version;
-    hash = "sha256-1M5MGaxfEfJMCfAoGorNGbRBZdvLue5lHu8DuR96mLo=";
+    hash = "sha256-LjQOhcnCwM4Vcw+lBq6bexPYewRuhkU/R/pkDTEVHWQ=";
   };
 
   build-system = [ pdm-backend ];

From 50408122ea4b7c8d0fdf7a797524ac29fe4f3bcf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 22:35:06 +0000
Subject: [PATCH 1851/6226] xk6: 1.2.2 -> 1.2.3

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

diff --git a/pkgs/by-name/xk/xk6/package.nix b/pkgs/by-name/xk/xk6/package.nix
index 7a24b72fb7e3..8d5f57ef048f 100644
--- a/pkgs/by-name/xk/xk6/package.nix
+++ b/pkgs/by-name/xk/xk6/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "xk6";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "xk6";
     tag = "v${version}";
-    hash = "sha256-qZCOsduj/oSizkEgy/MydYc5CQiBHgEnxjWeoS2EMX4=";
+    hash = "sha256-he6m5mkQ5Pp8hWPEU+/PD/ADCk0AQOyTAO8CVeNUa8o=";
   };
 
   vendorHash = null;

From 111cca68c74e6047e2c6daed2cdf82270e8eb872 Mon Sep 17 00:00:00 2001
From: Linus Karl <linus@lotz.li>
Date: Sun, 5 Oct 2025 12:06:46 +0200
Subject: [PATCH 1852/6226] kstars: 3.7.8 -> 3.7.9, fix Qt 6.10 build

---
 pkgs/by-name/ks/kstars/package.nix | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ks/kstars/package.nix b/pkgs/by-name/ks/kstars/package.nix
index 92560f8ec3a3..c0cf5700f06c 100644
--- a/pkgs/by-name/ks/kstars/package.nix
+++ b/pkgs/by-name/ks/kstars/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch2,
   cfitsio,
   cmake,
   curl,
@@ -22,19 +23,29 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kstars";
-  version = "3.7.8";
+  version = "3.7.9";
 
   src = fetchurl {
     url = "mirror://kde/stable/kstars/${finalAttrs.version}/kstars-${finalAttrs.version}.tar.xz";
-    hash = "sha256-VbOu8p7Bq6UJBr05PVZein4LWzpdLo4838G1jXGNLAw=";
+    hash = "sha256-aE2gtAGzLBcUk+Heg+ZOMLd1wX6VEbrSpxkWETmlEZc=";
   };
 
+  # Qt 6.10 build patch from master
+  # can be removed with next release
+  patches = [
+    (fetchpatch2 {
+      url = "https://invent.kde.org/education/kstars/-/commit/ce53888e6dbaeb1b9239fca55288b5ead969b5a7.diff";
+      hash = "sha256-awZeOLlG1vlCWC+QfypqHIIYexpywRmNT1ACdkqqLt4=";
+    })
+  ];
+
   nativeBuildInputs = with kdePackages; [
     extra-cmake-modules
     kdoctools
     wrapQtAppsHook
     cmake
   ];
+
   buildInputs = with kdePackages; [
     breeze-icons
     cfitsio
@@ -70,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = with lib.strings; [
-    (cmakeBool "BUILD_QT5" false)
+    (cmakeBool "BUILD_WITH_QT6" true)
     (cmakeFeature "INDI_PREFIX" "${indi-full}")
     (cmakeFeature "XPLANET_PREFIX" "${xplanet}")
     (cmakeFeature "DATA_INSTALL_DIR" (placeholder "out") + "/share/kstars/")

From f2503b6e631b5a53fe34a9ae7388e7431b70c0b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 22:55:32 +0000
Subject: [PATCH 1853/6226] vscodium: 1.105.16954 -> 1.105.17075

---
 pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix
index a2ab054df798..496a86337f80 100644
--- a/pkgs/applications/editors/vscode/vscodium.nix
+++ b/pkgs/applications/editors/vscode/vscodium.nix
@@ -26,11 +26,11 @@ let
 
   hash =
     {
-      x86_64-linux = "sha256-uW5fD7/mjFN9Ap21h2Kht7rztEVGWIYcQMfXW/jzHHI=";
-      x86_64-darwin = "sha256-xY84sbFPU4wDWH546h+ItxM1ohuv9ZuTNYN37lVFEJ4=";
-      aarch64-linux = "sha256-nO13ItYXeChbO/C12S679FKt+pk9d42DMrrb9LhoCPc=";
-      aarch64-darwin = "sha256-wqAbzL0uK12UkmvaZRb13GZGIgg/Wo1u1qB4cCgxVWk=";
-      armv7l-linux = "sha256-kw9OBihzHweHtpltjQKZ+yTpGuGGzJkB9fk5aBbuj0g=";
+      x86_64-linux = "sha256-+aMcRAM1mOu2rLCVGtkygGgM/8VNeteM66BOlmQCIpA=";
+      x86_64-darwin = "sha256-A/5l3LZn7SYNLkixNAfcb0HJlXY9dN9tjDT/KJ4Ycqk=";
+      aarch64-linux = "sha256-LxVKn5ld2mhsV9ya2V9zXEjtEZRAUWupMgkWXSgrL+8=";
+      aarch64-darwin = "sha256-jF18swYLWCtT0GerSLkT01M1sGZmkAb6bRZlRL5Bna4=";
+      armv7l-linux = "sha256-MlN22vWh0FiqgYQqZ1YjhAEtPRGaGv4Rz3J3LF6udts=";
     }
     .${system} or throwSystem;
 
@@ -41,7 +41,7 @@ callPackage ./generic.nix rec {
 
   # Please backport all compatible updates to the stable release.
   # This is important for the extension ecosystem.
-  version = "1.105.16954";
+  version = "1.105.17075";
   pname = "vscodium";
 
   executableName = "codium";

From 9e682fcd5472e27677aaa9722c28f9d26d489946 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 23 Oct 2025 09:05:14 +1000
Subject: [PATCH 1854/6226] zfs_unstable: 2.4.0-rc2 -> 2.4.0-rc3

Diff: https://github.com/openzfs/zfs/compare/zfs-2.4.0-rc2...zfs-2.4.0-rc3

Changelog: https://github.com/openzfs/zfs/releases/tag/zfs-2.4.0-rc3
---
 pkgs/os-specific/linux/zfs/unstable.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/unstable.nix b/pkgs/os-specific/linux/zfs/unstable.nix
index 8c9b35be6056..d54f41119b36 100644
--- a/pkgs/os-specific/linux/zfs/unstable.nix
+++ b/pkgs/os-specific/linux/zfs/unstable.nix
@@ -16,14 +16,14 @@ callPackage ./generic.nix args {
   # IMPORTANT: Always use a tagged release candidate or commits from the
   # zfs-<version>-staging branch, because this is tested by the OpenZFS
   # maintainers.
-  version = "2.4.0-rc2";
+  version = "2.4.0-rc3";
   # rev = "";
 
   tests = {
     inherit (nixosTests.zfs) unstable;
   };
 
-  hash = "sha256-NoY8lXQ/qxO0cQLmU0tIjqqWUThfWzVioigpS2crbeE=";
+  hash = "sha256-VfCeQqgahNNQA4jsiFHTdUjgXIH26k5r3q/Rpo2JrCc=";
 
   extraLongDescription = ''
     This is "unstable" ZFS, and will usually be a pre-release version of ZFS.

From 9fc34132c4393ca387816d8a38e747219063be0e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 20 Oct 2025 21:16:22 +0200
Subject: [PATCH 1855/6226] servo: 0-unstable-2025-07-30 ->
 0.0.1-unstable-2025-10-22

https://github.com/servo/servo/compare/e6b604a276959c218591b463f5b3b2ec8c3bcaec...efc8c0f6647e542e35bac732585bc3aef6578028

Co-authored-by: Niklas Korz <niklas@niklaskorz.de>
---
 pkgs/by-name/se/servo/package.nix | 38 +++++++++++++++++++++++--------
 pkgs/by-name/se/servo/update.sh   | 28 -----------------------
 2 files changed, 29 insertions(+), 37 deletions(-)
 delete mode 100755 pkgs/by-name/se/servo/update.sh

diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index c6b69dc98503..851ee7fe32d1 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
+  nix-update-script,
 
   # build deps
   cargo-deny,
@@ -21,7 +22,6 @@
   uv,
   which,
   yasm,
-  zlib,
 
   # runtime deps
   apple-sdk_14,
@@ -36,6 +36,7 @@
   vulkan-loader,
   wayland,
   xorg,
+  zlib,
 
   # tests
   nixosTests,
@@ -65,13 +66,13 @@ in
 
 rustPlatform.buildRustPackage {
   pname = "servo";
-  version = "0-unstable-2025-07-30";
+  version = "0.0.1-unstable-2025-10-22";
 
   src = fetchFromGitHub {
     owner = "servo";
     repo = "servo";
-    rev = "0e180578632facc10f0e8fb29df9084369adc600";
-    hash = "sha256-4EQ15jOZNYjGmhIOJivHT8R6BeT6moGj+AI9DBq58v4=";
+    rev = "efc8c0f6647e542e35bac732585bc3aef6578028";
+    hash = "sha256-mLXs0OaOLD12hFQ8w/3xnDV+4fhjRKToRjZZMPDJ9X8=";
     # Breaks reproducibility depending on whether the picked commit
     # has other ref-names or not, which may change over time, i.e. with
     # "ref-names: HEAD -> main" as long this commit is the branch HEAD
@@ -81,7 +82,7 @@ rustPlatform.buildRustPackage {
     '';
   };
 
-  cargoHash = "sha256-fqIlN+6SEY0LVrUk47U12TuVoRte0oCGJhO7DHovzBM=";
+  cargoHash = "sha256-POMWoM5NVeas/t1XivqBDrhZy7qRvIL3e01Wu3893L4=";
 
   # set `HOME` to a temp dir for write access
   # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)
@@ -108,11 +109,21 @@ rustPlatform.buildRustPackage {
     uv
     which
     yasm
-    zlib
   ];
 
   env.UV_PYTHON = customPython.interpreter;
 
+  postPatch = ''
+    # mozjs-sys attempts to find the header path of the icu_capi crate through cargo-metadata at build time.
+    # Unfortunately, cargo-metadata also attempts to fetch optional, disabled crates in the process.
+    # As these are not part of servo's Cargo.lock, they are not included in our cache and cargo-metadata fails.
+    # We work around this by finding the header path ourselves and substituting the invocation in mozjs-sys' build.rs.
+    icu_capi_dir=$(find $cargoDepsCopy -maxdepth 2 -type d -name icu_capi-\*)
+    icu_c_include_path="$icu_capi_dir/bindings/c"
+    substituteInPlace $cargoDepsCopy/mozjs_sys-*/build.rs \
+      --replace-fail "let icu_c_include_path = get_icu_capi_include_path();" "let icu_c_include_path = \"$icu_c_include_path\".to_string();"
+  '';
+
   buildInputs = [
     fontconfig
     freetype
@@ -124,6 +135,7 @@ rustPlatform.buildRustPackage {
     harfbuzz
     libunwind
     libGL
+    zlib
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     wayland
@@ -141,7 +153,16 @@ rustPlatform.buildRustPackage {
     "servo_allocator/use-system-allocator"
   ];
 
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1";
+  env.NIX_CFLAGS_COMPILE = toString (
+    [
+      # mozjs-sys fails with:
+      #  cc1plus: error: '-Wformat-security' ignored without '-Wformat'
+      "-Wno-error=format-security"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      "-I${lib.getInclude stdenv.cc.libcxx}/include/c++/v1"
+    ]
+  );
 
   # copy resources into `$out` to be used during runtime
   # link runtime libraries
@@ -154,12 +175,11 @@ rustPlatform.buildRustPackage {
   '';
 
   passthru = {
-    updateScript = ./update.sh;
+    updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
     tests = { inherit (nixosTests) servo; };
   };
 
   meta = {
-    broken = true; # cargo fetcher leaves invalid Cargo.toml around, which breaks mozjs-sys build
     description = "Embeddable, independent, memory-safe, modular, parallel web rendering engine";
     homepage = "https://servo.org";
     license = lib.licenses.mpl20;
diff --git a/pkgs/by-name/se/servo/update.sh b/pkgs/by-name/se/servo/update.sh
deleted file mode 100755
index ffb4265b6c70..000000000000
--- a/pkgs/by-name/se/servo/update.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p coreutils common-updater-scripts curl jq nix-update
-
-# This update script exists, because nix-update is unable to ignore various
-# bogus tags that exist on the upstream repo e.g.
-#  - selectors-v0.18.0/v0.20.0/v0.21.0/v0.22.0
-#  - homu-tmp
-#
-# Once https://github.com/Mic92/nix-update/issues/322 is resolved it can be
-# removed.
-
-set -exuo pipefail
-
-# Determine latest commit id and date
-TMP=$(mktemp)
-curl -o "$TMP" https://api.github.com/repos/servo/servo/commits/main
-COMMIT_ID=$(jq -r '.sha' "$TMP")
-COMMIT_TIMESTAMP=$(jq -r '.commit.author.date' "$TMP")
-COMMIT_DATE=$(date -d "$COMMIT_TIMESTAMP" +"%Y-%m-%d")
-rm $TMP
-
-cd "$(git rev-parse --show-toplevel)"
-
-# Update version, src
-update-source-version servo "0-unstable-${COMMIT_DATE}" --file=pkgs/by-name/se/servo/package.nix --rev="$COMMIT_ID"
-
-# Update cargoHash
-nix-update --version=skip servo

From bd66b2590a62c05c3429ce6705d65fd5beed6c9c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 23 Oct 2025 00:08:14 +0200
Subject: [PATCH 1856/6226] servo: add ngi team as maintainers

Added with the expectation that they'll earn that role through regular
updates, reviews and responding to issues.
---
 pkgs/by-name/se/servo/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index 851ee7fe32d1..96cf22b68d7e 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -187,6 +187,7 @@ rustPlatform.buildRustPackage {
       hexa
       supinie
     ];
+    teams = with lib.teams; [ ngi ];
     mainProgram = "servo";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };

From 433b75b5781b1f7596683919b522679e35a64ff7 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Thu, 23 Oct 2025 07:14:06 +0800
Subject: [PATCH 1857/6226] umpire: mark linux supported platforms

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

diff --git a/pkgs/by-name/um/umpire/package.nix b/pkgs/by-name/um/umpire/package.nix
index 4a520a31950a..172c9bd9cb44 100644
--- a/pkgs/by-name/um/umpire/package.nix
+++ b/pkgs/by-name/um/umpire/package.nix
@@ -43,11 +43,11 @@ stdenv.mkDerivation rec {
     (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Application-focused API for memory management on NUMA & GPU architectures";
     homepage = "https://github.com/LLNL/Umpire";
-    maintainers = with maintainers; [ sheepforce ];
-    license = with licenses; [ mit ];
-    platforms = [ "x86_64-linux" ];
+    maintainers = with lib.maintainers; [ sheepforce ];
+    license = with lib.licenses; [ mit ];
+    platforms = lib.platforms.linux;
   };
 }

From e278e26846ca46f3d812e14136a237881165407f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 23 Oct 2025 01:24:56 +0200
Subject: [PATCH 1858/6226] mypaint: Fix crashes due to numpy breaking changes

---
 pkgs/by-name/my/mypaint/package.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/by-name/my/mypaint/package.nix b/pkgs/by-name/my/mypaint/package.nix
index 1bd95b060598..a5473c7adf8d 100644
--- a/pkgs/by-name/my/mypaint/package.nix
+++ b/pkgs/by-name/my/mypaint/package.nix
@@ -76,6 +76,25 @@ buildPythonApplication rec {
       url = "https://github.com/mypaint/mypaint/commit/5496b1cd1113fcd46230d87760b7e6b51cc747bc.patch";
       hash = "sha256-h+sE1LW04xDU2rofH5KqXsY1M0jacfBNBC+Zb0i6y1w=";
     })
+    # Format source so the later patches apply
+    (fetchpatch {
+      url = "https://github.com/mypaint/mypaint/commit/69d1d553034a31c0a466050a4acb323787dd04e6.patch";
+      hash = "sha256-nziaPgfZRzPUvQEyQUM4FQbasHLFFT88H8qucbYI0pA=";
+      includes = [
+        "lib/strokemap.py"
+        "lib/stroke.py"
+      ];
+    })
+    # Fix numpy deprecation
+    (fetchpatch {
+      url = "https://github.com/mypaint/mypaint/commit/2a92b6baf452aba2cff3cc0a7782b301da3933d7.patch";
+      hash = "sha256-IkzdrA3pmeiihDOMzqIfc3uDd/wO3cI6dT+cVVhaQcI=";
+    })
+    # Fix numpy deprecation
+    (fetchpatch {
+      url = "https://github.com/mypaint/mypaint/commit/ab017e073e83a4930a0fb09608682bf4b7ab1874.patch";
+      hash = "sha256-7OFqH75/gJYRJ1vROUDIkUqoBowAolBYQ5anWtp228o=";
+    })
   ];
 
   nativeBuildInputs = [

From ab7ec939f0b4a8fb21418211fee8e7b89d8c1721 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 23 Oct 2025 01:24:56 +0200
Subject: [PATCH 1859/6226] pytrainer: unbreak

---
 pkgs/by-name/py/pytrainer/package.nix | 21 +++++++++++++++------
 1 file changed, 15 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/py/pytrainer/package.nix b/pkgs/by-name/py/pytrainer/package.nix
index 9cc8686cf22f..8af97702b335 100644
--- a/pkgs/by-name/py/pytrainer/package.nix
+++ b/pkgs/by-name/py/pytrainer/package.nix
@@ -2,6 +2,7 @@
   lib,
   python3,
   fetchFromGitHub,
+  fetchpatch,
   gdk-pixbuf,
   adwaita-icon-theme,
   gpsbabel,
@@ -41,6 +42,20 @@ python.pkgs.buildPythonApplication rec {
     hash = "sha256-t61vHVTKN5KsjrgbhzljB7UZdRask7qfYISd+++QbV0=";
   };
 
+  patches = [
+    # Fix startup crash with SQLAlchemy 2.0
+    (fetchpatch {
+      url = "https://github.com/pytrainer/pytrainer/commit/9847c76e61945466775bde038057bf5fd31ae089.patch";
+      hash = "sha256-cGNu4lK0eQWzcSFTKc8g/qHSSHfy0ow4T3eT+zl5lPM=";
+    })
+
+    # Port to webkigtk 4.1
+    (fetchpatch {
+      url = "https://github.com/pytrainer/pytrainer/commit/eda968a8b48074f03efbdfbd692b46edef3658cd.patch";
+      hash = "sha256-MdxsKO6DgncHhGlJWcEeyYiPKf3qdhMqXrYYC+jqros=";
+    })
+  ];
+
   build-system = with python3.pkgs; [ setuptools ];
 
   dependencies = with python.pkgs; [
@@ -89,10 +104,6 @@ python.pkgs.buildPythonApplication rec {
   postPatch = ''
     substituteInPlace pytrainer/platform.py \
         --replace-fail 'sys.prefix' "\"$out\""
-
-    # https://github.com/pytrainer/pytrainer/pull/281
-    substituteInPlace pytrainer/extensions/mapviewer.py \
-        --replace-fail "gi.require_version('WebKit2', '4.0')" "gi.require_version('WebKit2', '4.1')"
   '';
 
   checkPhase = ''
@@ -106,8 +117,6 @@ python.pkgs.buildPythonApplication rec {
   '';
 
   meta = with lib; {
-    # https://github.com/pytrainer/pytrainer/issues/280
-    broken = true;
     homepage = "https://github.com/pytrainer/pytrainer";
     description = "Application for logging and graphing sporting excursions";
     mainProgram = "pytrainer";

From 8433198def9414c7bc09f2bb4476e4e616b04a1d Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Thu, 23 Oct 2025 00:32:15 +0100
Subject: [PATCH 1860/6226] nixos/zeronet: fix meta.maintainers

Fixes 982ede4108972fad3e7f7e77f08039ebeaa78402
---
 nixos/modules/services/networking/zeronet.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/zeronet.nix b/nixos/modules/services/networking/zeronet.nix
index fd85f29e300e..9dc737bd7d0d 100644
--- a/nixos/modules/services/networking/zeronet.nix
+++ b/nixos/modules/services/networking/zeronet.nix
@@ -134,6 +134,6 @@ with lib;
   ];
 
   meta = {
-    inherit (pkgs.zeronet) maintainers;
+    inherit (pkgs.zeronet.meta) maintainers;
   };
 }

From 1b1e26e1b86bc1de2306d3bf4421e34a557bfea3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 23 Oct 2025 01:47:50 +0200
Subject: [PATCH 1861/6226] nextcloud-client: 3.17.2 -> 4.0.0

Diff: https://github.com/nextcloud-releases/desktop/compare/v3.17.2...v4.0.0

Changelog: https://github.com/nextcloud/desktop/releases/tag/v4.0.0
---
 pkgs/by-name/ne/nextcloud-client/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix
index 44dcf47ce335..f55675dff4ed 100644
--- a/pkgs/by-name/ne/nextcloud-client/package.nix
+++ b/pkgs/by-name/ne/nextcloud-client/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation rec {
   pname = "nextcloud-client";
-  version = "3.17.2";
+  version = "4.0.0";
 
   outputs = [
     "out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     owner = "nextcloud-releases";
     repo = "desktop";
     tag = "v${version}";
-    hash = "sha256-jBlQh5tHP+2LyFCnP0m/ud3nU40i5cWtUwSeM5auQX8=";
+    hash = "sha256-IXX1PdMR3ptgH7AufnGKBeKftZgai7KGvYW+OCkM8jo=";
   };
 
   patches = [

From 3ac75fb3b986a6529d50eefc7aa1be943f4b6b22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 23:58:29 +0000
Subject: [PATCH 1862/6226] cosmic-ext-applet-caffeine: 0-unstable-2025-10-16
 -> 0-unstable-2025-10-22

---
 pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix b/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix
index a508e77d7565..c5901df0f842 100644
--- a/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix
+++ b/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage {
   pname = "cosmic-ext-applet-caffeine";
-  version = "0-unstable-2025-10-16";
+  version = "0-unstable-2025-10-22";
 
   src = fetchFromGitHub {
     owner = "tropicbliss";
     repo = "cosmic-ext-applet-caffeine";
-    rev = "0b50a109495d02ab8c99a501d2dd7575c6fabc1b";
-    hash = "sha256-Z84LqsPVGd7PfOUmC1iJWgTGrl6FicaxZHwTZmgmAyk=";
+    rev = "2d27a3dec13ca455975f39927bad040f36576d03";
+    hash = "sha256-4MP1H3U1sr7+h5Psf6wTiQuJJgEtlRrgQKdF7COkosI=";
   };
 
-  cargoHash = "sha256-TC7WNJUxGZpfDbDgnifBSZM7SvN2/Iw0HRXWPDXnDBM=";
+  cargoHash = "sha256-89/0XEdQ7MCycAkHhTkA5FCj/eKVLgWDhljKB/Lo4+4=";
 
   nativeBuildInputs = [
     libcosmicAppHook

From 8a93389fa7a226659f3673c4008f04002cf75430 Mon Sep 17 00:00:00 2001
From: utopiatopia <98685984+utopiatopia@users.noreply.github.com>
Date: Wed, 22 Oct 2025 13:07:21 -0700
Subject: [PATCH 1863/6226] maintainers: add utopiatopia

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0948524fc6a4..714a865f8b09 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -27023,6 +27023,11 @@
     githubId = 5155100;
     name = "Utkarsh Gupta";
   };
+  utopiatopia = {
+    github = "utopiatopia";
+    githubId = 98685984;
+    name = "utopiatopia";
+  };
   uvnikita = {
     email = "uv.nikita@gmail.com";
     github = "uvNikita";

From cd4081b41564fcda66779c80af9ab867c42f1454 Mon Sep 17 00:00:00 2001
From: utopiatopia <98685984+utopiatopia@users.noreply.github.com>
Date: Wed, 22 Oct 2025 13:48:34 -0700
Subject: [PATCH 1864/6226] auto-editor: 28.0.2 -> 29.2.0

---
 pkgs/by-name/au/auto-editor/lock.json   |  28 +++++++
 pkgs/by-name/au/auto-editor/package.nix | 101 +++++++++++++++++++-----
 2 files changed, 109 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/by-name/au/auto-editor/lock.json

diff --git a/pkgs/by-name/au/auto-editor/lock.json b/pkgs/by-name/au/auto-editor/lock.json
new file mode 100644
index 000000000000..e772f3c9743b
--- /dev/null
+++ b/pkgs/by-name/au/auto-editor/lock.json
@@ -0,0 +1,28 @@
+{
+  "depends": [
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/w556rbsnv2fxb229av2iq180ri9x0d9j-source",
+      "rev": "77469f58916369bc3863194cabb05238577fb257",
+      "sha256": "18wjz5yqzr1dz6286p2w02fk2xjr54l477g90bz4pskjcqrqnjbv",
+      "url": "https://github.com/khchen/tinyre/archive/77469f58916369bc3863194cabb05238577fb257.tar.gz",
+      "ref": "1.6.0",
+      "packages": [
+        "tinyre"
+      ],
+      "srcDir": ""
+    },
+    {
+      "method": "fetchzip",
+      "path": "/nix/store/6aph9sfwcws7pd2725fwjnibdfrv7qmw-source",
+      "rev": "f8f6bd34bfa3fe12c64b919059ad856a96efcba0",
+      "sha256": "11m1rb6rzk70kvskppf97ddzgf5fnh9crjziqc6hib0jgsm5d615",
+      "url": "https://github.com/nim-lang/checksums/archive/f8f6bd34bfa3fe12c64b919059ad856a96efcba0.tar.gz",
+      "ref": "v0.2.1",
+      "packages": [
+        "checksums"
+      ],
+      "srcDir": "src"
+    }
+  ]
+}
diff --git a/pkgs/by-name/au/auto-editor/package.nix b/pkgs/by-name/au/auto-editor/package.nix
index a1fe3fa99ecb..546eb42a631d 100644
--- a/pkgs/by-name/au/auto-editor/package.nix
+++ b/pkgs/by-name/au/auto-editor/package.nix
@@ -1,43 +1,100 @@
 {
   lib,
-  python3Packages,
+  buildNimPackage,
   fetchFromGitHub,
+
+  withHEVC ? true,
+  withWhisper ? false,
+
+  ffmpeg,
   yt-dlp,
+  lame,
+  libopus,
+  libvpx,
+  x264,
+  x265,
+  dav1d,
+  svt-av1,
+  whisper-cpp,
+
+  python3,
+  python3Packages,
+  nimble,
+  nim,
 }:
 
-python3Packages.buildPythonApplication rec {
+buildNimPackage rec {
   pname = "auto-editor";
-  version = "28.0.2";
-  pyproject = true;
+  version = "29.2.0";
 
   src = fetchFromGitHub {
     owner = "WyattBlue";
     repo = "auto-editor";
     tag = version;
-    hash = "sha256-ozw5ZPvKP7aTBBItQKNx85hZ1T4IxX9NYCcNHC5UuuM=";
+    hash = "sha256-2EpdrFGkeISiCnwtBMFikfWOzEdHO/ut2NbVbIAutdk=";
   };
 
-  postPatch = ''
-    substituteInPlace auto_editor/__main__.py \
-      --replace-fail '"yt-dlp"' '"${lib.getExe yt-dlp}"'
-  '';
+  lockFile = ./lock.json;
 
-  build-system = with python3Packages; [ setuptools ];
-
-  dependencies = with python3Packages; [
-    basswood-av
-    numpy
+  buildInputs = [
+    ffmpeg
+    lame
+    libopus
+    libvpx
+    x264
+    dav1d
+    svt-av1
+  ]
+  ++ lib.optionals withHEVC [
+    x265
+  ]
+  ++ lib.optionals withWhisper [
+    whisper-cpp
   ];
 
-  checkPhase = ''
-    runHook preCheck
+  nimFlags = [
+    "--passc:-Wno-incompatible-pointer-types"
+  ]
+  ++ lib.optionals withHEVC [
+    "-d:enable_hevc"
+  ]
+  ++ lib.optionals withWhisper [
+    "-d:enable_whisper"
+  ];
 
-    $out/bin/auto-editor test all
+  postPatch = ''
+    substituteInPlace src/log.nim \
+      --replace-fail '"yt-dlp"' '"${lib.getExe yt-dlp}"'
 
-    runHook postCheck
+    # buildNimPackage hack
+    substituteInPlace ae.nimble \
+      --replace-fail '"main=auto-editor"' '"main"'
   '';
 
-  pythonImportsCheck = [ "auto_editor" ];
+  # TODO: Fix checks
+  /*
+    nativeCheckInputs = [
+      python3Packages.av
+      python3
+    ];
+
+    checkPhase = ''
+      runHook preCheck
+
+      nim c \
+      ${if withHEVC then "-d:enable_hevc" else ""} \
+      ${if withWhisper then "-d:enable_whisper" else ""} \
+      -r $src/src/rationals
+
+      python3 $src/tests/test.py
+
+      runHook postCheck
+    '';
+  */
+
+  postInstall = ''
+    mv $out/bin/main $out/bin/auto-editor
+  '';
 
   meta = {
     changelog = "https://github.com/WyattBlue/auto-editor/releases/tag/${src.tag}";
@@ -45,6 +102,10 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://auto-editor.com/";
     license = lib.licenses.unlicense;
     mainProgram = "auto-editor";
-    maintainers = with lib.maintainers; [ tomasajt ];
+    maintainers = with lib.maintainers; [
+      tomasajt
+      utopiatopia
+    ];
+    platforms = lib.platforms.unix;
   };
 }

From b6f55fe9416f63e34fdced5216316a8bdd394f56 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Mon, 20 Oct 2025 04:29:22 +0800
Subject: [PATCH 1865/6226] precice: 3.2.0-unstable-2025-05-23 -> 3.3.0

Changelog: https://github.com/precice/precice/releases/tag/v3.3.0
---
 pkgs/by-name/pr/precice/package.nix | 37 +++++++++++++++++++++--------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/pr/precice/package.nix b/pkgs/by-name/pr/precice/package.nix
index ac12dbdd38e6..4d4cea292f5d 100644
--- a/pkgs/by-name/pr/precice/package.nix
+++ b/pkgs/by-name/pr/precice/package.nix
@@ -3,29 +3,32 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  pkg-config,
   boost,
   eigen,
   libxml2,
   mpi,
   python3Packages,
   petsc,
-  pkg-config,
+  ctestCheckHook,
+  mpiCheckPhaseHook,
 }:
 
-stdenv.mkDerivation {
+assert petsc.mpiSupport;
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "precice";
-  version = "3.2.0-unstable-2025-05-23";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "precice";
     repo = "precice";
-    rev = "6ee3e347843d4d3c416a32917f6505d35b822445";
-    hash = "sha256-BxNAbpeLqJPzQ9dvvgC9jJQQFBdVMunSqIekz7SIHv4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-1FbTNo2F+jH1EVV6gXc9o0T31UHY/wBK3vQeCV7wW5E=";
   };
 
   cmakeFlags = [
-    (lib.cmakeBool "PRECICE_PETScMapping" false)
-    (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
   ];
 
   nativeBuildInputs = [
@@ -43,12 +46,26 @@ stdenv.mkDerivation {
     python3Packages.numpy
   ];
 
+  __darwinAllowLocalNetworking = true;
+
+  doCheck = true;
+
+  nativeCheckInputs = [
+    ctestCheckHook
+    mpiCheckPhaseHook
+  ];
+
+  disabledTests = [
+    # Because preciceDt becomes very small. Test is likely to fail on other platform.
+    "precice.Integration/Serial/Time/Explicit/ParallelCoupling/ReadWriteScalarDataWithSubcycling6400Steps"
+  ];
+
   meta = {
     description = "PreCICE stands for Precise Code Interaction Coupling Environment";
     homepage = "https://precice.org/";
-    license = with lib.licenses; [ gpl3 ];
+    license = with lib.licenses; [ lgpl3Only ];
     maintainers = with lib.maintainers; [ Scriptkiddi ];
-    mainProgram = "binprecice";
+    mainProgram = "precice-tools";
     platforms = lib.platforms.unix;
   };
-}
+})

From 04512dc6909d96297b01da5c923b2101cad49710 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Wed, 22 Oct 2025 17:13:49 -0700
Subject: [PATCH 1866/6226] cudaPackages.buildRedist: unpacking sources
 shouldn't depend on backendStdenv

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/buildRedist/default.nix | 4 ++--
 pkgs/development/cuda-modules/default.nix             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/cuda-modules/buildRedist/default.nix b/pkgs/development/cuda-modules/buildRedist/default.nix
index a1aa5645bce4..0317d85c9b22 100644
--- a/pkgs/development/cuda-modules/buildRedist/default.nix
+++ b/pkgs/development/cuda-modules/buildRedist/default.nix
@@ -11,13 +11,13 @@
   cudaMajorVersion,
   cudaNamePrefix,
   fetchurl,
-  flags,
   lib,
   manifests,
   markForCudatoolkitRootHook,
   setupCudaHook,
   srcOnly,
   stdenv,
+  stdenvNoCC,
 }:
 let
   inherit (backendStdenv) hostRedistSystem;
@@ -244,7 +244,7 @@ extendMkDerivation {
         srcOnly {
           __structuredAttrs = true;
           strictDeps = true;
-          stdenv = backendStdenv;
+          stdenv = stdenvNoCC;
           inherit (finalAttrs) pname version;
           src = fetchurl {
             url = mkRedistUrl finalAttrs.passthru.redistName relative_path;
diff --git a/pkgs/development/cuda-modules/default.nix b/pkgs/development/cuda-modules/default.nix
index 48ddae3692de..5190dcecdb4c 100644
--- a/pkgs/development/cuda-modules/default.nix
+++ b/pkgs/development/cuda-modules/default.nix
@@ -105,6 +105,7 @@ let
           lib
           srcOnly
           stdenv
+          stdenvNoCC
           ;
         inherit (finalCudaPackages)
           autoAddCudaCompatRunpath
@@ -112,7 +113,6 @@ let
           cudaMajorMinorVersion
           cudaMajorVersion
           cudaNamePrefix
-          flags
           manifests
           markForCudatoolkitRootHook
           setupCudaHook

From 68aefe6693d4b4f00323ccc8b1dd9a1cddeca6eb Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Wed, 22 Oct 2025 17:15:01 -0700
Subject: [PATCH 1867/6226] cudaPackages.tests.redists-installed: some packages
 may have dependents which are unavailable

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/packages/tests/redists-installed.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/cuda-modules/packages/tests/redists-installed.nix b/pkgs/development/cuda-modules/packages/tests/redists-installed.nix
index 5ef1cde8ae31..84c25c6b9f0e 100644
--- a/pkgs/development/cuda-modules/packages/tests/redists-installed.nix
+++ b/pkgs/development/cuda-modules/packages/tests/redists-installed.nix
@@ -10,7 +10,16 @@
 let
   # redists-unpacked has already found all the names of the redistributables
   availableRedistsForPlatform = lib.filterAttrs (
-    _: value: value.meta.available or false
+    _: value:
+    let
+      canInstantiate =
+        (builtins.tryEval (
+          builtins.deepSeq ((value.drvPath or null) != null) ((value.drvPath or null) != null)
+        )).value;
+    in
+    lib.warnIfNot canInstantiate
+      "Package ${value.name} is unavailable and will not be included in redists-installed"
+      canInstantiate
   ) tests.redists-unpacked.passthru.redistsForPlatform;
 
   mkOutputs =

From 4d389fba1f05fed5c7f8d6fe52563617d53bbcd0 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Wed, 22 Oct 2025 17:17:38 -0700
Subject: [PATCH 1868/6226] cudaPackages.autoAddCudaCompatRunpath: format with
 shfmt and lint with ShellCheck

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../autoAddCudaCompatRunpath/auto-add-cuda-compat-runpath.sh   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/auto-add-cuda-compat-runpath.sh b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/auto-add-cuda-compat-runpath.sh
index d4b37cce05a7..000c911887a5 100644
--- a/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/auto-add-cuda-compat-runpath.sh
+++ b/pkgs/development/cuda-modules/packages/autoAddCudaCompatRunpath/auto-add-cuda-compat-runpath.sh
@@ -3,6 +3,7 @@
 # coming from the cuda_compat package by adding it to the RUNPATH.
 echo "Sourcing auto-add-cuda-compat-runpath-hook"
 
+# shellcheck disable=SC2157
 if [[ -z "@libcudaPath@" ]]; then
   echo "auto-add-cuda-compat-runpath-hook: cuda_compat not available, skipping hook"
   return
@@ -18,7 +19,7 @@ addCudaCompatRunpath() {
   elif [[ $# -gt 1 ]]; then
     nixLog "too many arguments" >&2
     exit 1
-  elif [[ "$1" == "" ]]; then
+  elif [[ $1 == "" ]]; then
     nixLog "empty library path" >&2
     exit 1
   else

From 88ea56107fd3f5e1e43c140b2a0f00f50e0c1485 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Wed, 22 Oct 2025 17:18:06 -0700
Subject: [PATCH 1869/6226] cudaPackages.markForCudatoolkitRootHook: format
 with shfmt and lint with ShellCheck

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../mark-for-cudatoolkit-root-hook.sh         | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/markForCudatoolkitRootHook/mark-for-cudatoolkit-root-hook.sh b/pkgs/development/cuda-modules/packages/markForCudatoolkitRootHook/mark-for-cudatoolkit-root-hook.sh
index 0abd651005c6..2540116c017b 100644
--- a/pkgs/development/cuda-modules/packages/markForCudatoolkitRootHook/mark-for-cudatoolkit-root-hook.sh
+++ b/pkgs/development/cuda-modules/packages/markForCudatoolkitRootHook/mark-for-cudatoolkit-root-hook.sh
@@ -1,25 +1,25 @@
 # shellcheck shell=bash
 
-(( ${hostOffset:?} == -1 && ${targetOffset:?} == 0)) || return 0
+((${hostOffset:?} == -1 && ${targetOffset:?} == 0)) || return 0
 
 echo "Sourcing mark-for-cudatoolkit-root-hook" >&2
 
 markForCUDAToolkit_ROOT() {
-    mkdir -p "${prefix:?}/nix-support"
-    local markerPath="$prefix/nix-support/include-in-cudatoolkit-root"
+  mkdir -p "${prefix:?}/nix-support"
+  local markerPath="$prefix/nix-support/include-in-cudatoolkit-root"
 
-    # Return early if the file already exists.
-    [[ -f "$markerPath" ]] && return 0
+  # Return early if the file already exists.
+  [[ -f $markerPath ]] && return 0
 
-    # Always create the file, even if it's empty, since setup-cuda-hook relies on its existence.
-    # However, only populate it if strictDeps is not set.
-    touch "$markerPath"
+  # Always create the file, even if it's empty, since setup-cuda-hook relies on its existence.
+  # However, only populate it if strictDeps is not set.
+  touch "$markerPath"
 
-    # Return early if strictDeps is set.
-    [[ -n "${strictDeps-}" ]] && return 0
+  # Return early if strictDeps is set.
+  [[ -n ${strictDeps-} ]] && return 0
 
-    # Populate the file with the package name and output.
-    echo "${pname:?}-${output:?}" > "$markerPath"
+  # Populate the file with the package name and output.
+  echo "${pname:?}-${output:?}" >"$markerPath"
 }
 
 fixupOutputHooks+=(markForCUDAToolkit_ROOT)

From 8d50fc5800a929addc033e9b117cc794d42267c2 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Wed, 22 Oct 2025 17:18:51 -0700
Subject: [PATCH 1870/6226] cudaPackages.setupCudaHook: format with shfmt and
 lint with ShellCheck

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../packages/setupCudaHook/setup-cuda-hook.sh | 157 +++++++++---------
 1 file changed, 79 insertions(+), 78 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/setupCudaHook/setup-cuda-hook.sh b/pkgs/development/cuda-modules/packages/setupCudaHook/setup-cuda-hook.sh
index 95d1cee2c14a..1b0e6bf9c868 100644
--- a/pkgs/development/cuda-modules/packages/setupCudaHook/setup-cuda-hook.sh
+++ b/pkgs/development/cuda-modules/packages/setupCudaHook/setup-cuda-hook.sh
@@ -1,128 +1,129 @@
 # shellcheck shell=bash
 
 # Only run the hook from nativeBuildInputs
-(( "$hostOffset" == -1 && "$targetOffset" == 0)) || return 0
+# shellcheck disable=SC2154
+(("$hostOffset" == -1 && "$targetOffset" == 0)) || return 0
 
 guard=Sourcing
 reason=
 
 [[ -n ${cudaSetupHookOnce-} ]] && guard=Skipping && reason=" because the hook has been propagated more than once"
 
-if (( "${NIX_DEBUG:-0}" >= 1 )) ; then
-    echo "$guard hostOffset=$hostOffset targetOffset=$targetOffset setup-cuda-hook$reason" >&2
+if (("${NIX_DEBUG:-0}" >= 1)); then
+  echo "$guard hostOffset=$hostOffset targetOffset=$targetOffset setup-cuda-hook$reason" >&2
 else
-    echo "$guard setup-cuda-hook$reason" >&2
+  echo "$guard setup-cuda-hook$reason" >&2
 fi
 
-[[ "$guard" = Sourcing ]] || return 0
+[[ $guard == Sourcing ]] || return 0
 
 declare -g cudaSetupHookOnce=1
 declare -Ag cudaHostPathsSeen=()
 declare -Ag cudaOutputToPath=()
 
 extendcudaHostPathsSeen() {
-    (( "${NIX_DEBUG:-0}" >= 1 )) && echo "extendcudaHostPathsSeen $1" >&2
+  (("${NIX_DEBUG:-0}" >= 1)) && echo "extendcudaHostPathsSeen $1" >&2
 
-    local markerPath="$1/nix-support/include-in-cudatoolkit-root"
-    [[ ! -f "${markerPath}" ]] && return 0
-    [[ -v cudaHostPathsSeen[$1] ]] && return 0
+  local markerPath="$1/nix-support/include-in-cudatoolkit-root"
+  [[ ! -f ${markerPath} ]] && return 0
+  [[ -v cudaHostPathsSeen[$1] ]] && return 0
 
-    cudaHostPathsSeen["$1"]=1
+  cudaHostPathsSeen["$1"]=1
 
-    # E.g. cuda_cudart-lib
-    local cudaOutputName
-    # Fail gracefully if the file is empty.
-    # One reason the file may be empty: the package was built with strictDeps set, but the current build does not have
-    # strictDeps set.
-    read -r cudaOutputName < "$markerPath" || return 0
+  # E.g. cuda_cudart-lib
+  local cudaOutputName
+  # Fail gracefully if the file is empty.
+  # One reason the file may be empty: the package was built with strictDeps set, but the current build does not have
+  # strictDeps set.
+  read -r cudaOutputName <"$markerPath" || return 0
 
-    [[ -z "$cudaOutputName" ]] && return 0
+  [[ -z $cudaOutputName ]] && return 0
 
-    local oldPath="${cudaOutputToPath[$cudaOutputName]-}"
-    [[ -n "$oldPath" ]] && echo "extendcudaHostPathsSeen: warning: overwriting $cudaOutputName from $oldPath to $1" >&2
-    cudaOutputToPath["$cudaOutputName"]="$1"
+  local oldPath="${cudaOutputToPath[$cudaOutputName]-}"
+  [[ -n $oldPath ]] && echo "extendcudaHostPathsSeen: warning: overwriting $cudaOutputName from $oldPath to $1" >&2
+  cudaOutputToPath["$cudaOutputName"]="$1"
 }
 addEnvHooks "$targetOffset" extendcudaHostPathsSeen
 
 setupCUDAToolkit_ROOT() {
-    (( "${NIX_DEBUG:-0}" >= 1 )) && echo "setupCUDAToolkit_ROOT: cudaHostPathsSeen=${!cudaHostPathsSeen[*]}" >&2
+  (("${NIX_DEBUG:-0}" >= 1)) && echo "setupCUDAToolkit_ROOT: cudaHostPathsSeen=${!cudaHostPathsSeen[*]}" >&2
 
-    for path in "${!cudaHostPathsSeen[@]}" ; do
-        addToSearchPathWithCustomDelimiter ";" CUDAToolkit_ROOT "$path"
-        if [[ -d "$path/include" ]] ; then
-            addToSearchPathWithCustomDelimiter ";" CUDAToolkit_INCLUDE_DIR "$path/include"
-        fi
-    done
+  for path in "${!cudaHostPathsSeen[@]}"; do
+    addToSearchPathWithCustomDelimiter ";" CUDAToolkit_ROOT "$path"
+    if [[ -d "$path/include" ]]; then
+      addToSearchPathWithCustomDelimiter ";" CUDAToolkit_INCLUDE_DIR "$path/include"
+    fi
+  done
 
-    # Use array form so semicolon-separated lists are passed safely.
-    if [[ -n "${CUDAToolkit_INCLUDE_DIR-}" ]]; then
-        cmakeFlagsArray+=("-DCUDAToolkit_INCLUDE_DIR=${CUDAToolkit_INCLUDE_DIR}")
-    fi
-    if [[ -n "${CUDAToolkit_ROOT-}" ]]; then
-        cmakeFlagsArray+=("-DCUDAToolkit_ROOT=${CUDAToolkit_ROOT}")
-    fi
+  # Use array form so semicolon-separated lists are passed safely.
+  if [[ -n ${CUDAToolkit_INCLUDE_DIR-} ]]; then
+    cmakeFlagsArray+=("-DCUDAToolkit_INCLUDE_DIR=${CUDAToolkit_INCLUDE_DIR}")
+  fi
+  if [[ -n ${CUDAToolkit_ROOT-} ]]; then
+    cmakeFlagsArray+=("-DCUDAToolkit_ROOT=${CUDAToolkit_ROOT}")
+  fi
 }
 preConfigureHooks+=(setupCUDAToolkit_ROOT)
 
 setupCUDAToolkitCompilers() {
-    echo Executing setupCUDAToolkitCompilers >&2
+  echo Executing setupCUDAToolkitCompilers >&2
 
-    if [[ -n "${dontSetupCUDAToolkitCompilers-}" ]] ; then
-        return 0
-    fi
+  if [[ -n ${dontSetupCUDAToolkitCompilers-} ]]; then
+    return 0
+  fi
 
-    # Point NVCC at a compatible compiler
+  # Point NVCC at a compatible compiler
 
-    # For CMake-based projects:
-    # https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables
-    # https://cmake.org/cmake/help/latest/envvar/CUDAHOSTCXX.html
-    # https://cmake.org/cmake/help/latest/variable/CMAKE_CUDA_HOST_COMPILER.html
+  # For CMake-based projects:
+  # https://cmake.org/cmake/help/latest/module/FindCUDA.html#input-variables
+  # https://cmake.org/cmake/help/latest/envvar/CUDAHOSTCXX.html
+  # https://cmake.org/cmake/help/latest/variable/CMAKE_CUDA_HOST_COMPILER.html
 
-    appendToVar cmakeFlags "-DCUDA_HOST_COMPILER=@ccFullPath@"
-    appendToVar cmakeFlags "-DCMAKE_CUDA_HOST_COMPILER=@ccFullPath@"
+  appendToVar cmakeFlags "-DCUDA_HOST_COMPILER=@ccFullPath@"
+  appendToVar cmakeFlags "-DCMAKE_CUDA_HOST_COMPILER=@ccFullPath@"
 
-    # For non-CMake projects:
-    # We prepend --compiler-bindir to nvcc flags.
-    # Downstream packages can override these, because NVCC
-    # uses the last --compiler-bindir it gets on the command line.
-    # FIXME: this results in "incompatible redefinition" warnings.
-    # https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compiler-bindir-directory-ccbin
-    if [ -z "${CUDAHOSTCXX-}" ]; then
-      export CUDAHOSTCXX="@ccFullPath@";
-    fi
+  # For non-CMake projects:
+  # We prepend --compiler-bindir to nvcc flags.
+  # Downstream packages can override these, because NVCC
+  # uses the last --compiler-bindir it gets on the command line.
+  # FIXME: this results in "incompatible redefinition" warnings.
+  # https://docs.nvidia.com/cuda/cuda-compiler-driver-nvcc/index.html#compiler-bindir-directory-ccbin
+  if [ -z "${CUDAHOSTCXX-}" ]; then
+    export CUDAHOSTCXX="@ccFullPath@"
+  fi
 
-    appendToVar NVCC_PREPEND_FLAGS "--compiler-bindir=@ccRoot@/bin"
+  appendToVar NVCC_PREPEND_FLAGS "--compiler-bindir=@ccRoot@/bin"
 
-    # NOTE: We set -Xfatbin=-compress-all, which reduces the size of the compiled
-    #   binaries. If binaries grow over 2GB, they will fail to link. This is a problem for us, as
-    #   the default set of CUDA capabilities we build can regularly cause this to occur (for
-    #   example, with Magma).
-    #
-    # @SomeoneSerge: original comment was made by @ConnorBaker in .../cudatoolkit/common.nix
-    if [[ -z "${dontCompressFatbin-}" ]]; then
-        appendToVar NVCC_PREPEND_FLAGS "-Xfatbin=-compress-all"
-    fi
+  # NOTE: We set -Xfatbin=-compress-all, which reduces the size of the compiled
+  #   binaries. If binaries grow over 2GB, they will fail to link. This is a problem for us, as
+  #   the default set of CUDA capabilities we build can regularly cause this to occur (for
+  #   example, with Magma).
+  #
+  # @SomeoneSerge: original comment was made by @ConnorBaker in .../cudatoolkit/common.nix
+  if [[ -z ${dontCompressFatbin-} ]]; then
+    appendToVar NVCC_PREPEND_FLAGS "-Xfatbin=-compress-all"
+  fi
 }
 preConfigureHooks+=(setupCUDAToolkitCompilers)
 
 propagateCudaLibraries() {
-    (( "${NIX_DEBUG:-0}" >= 1 )) && echo "propagateCudaLibraries: cudaPropagateToOutput=$cudaPropagateToOutput cudaHostPathsSeen=${!cudaHostPathsSeen[*]}" >&2
+  (("${NIX_DEBUG:-0}" >= 1)) && echo "propagateCudaLibraries: cudaPropagateToOutput=$cudaPropagateToOutput cudaHostPathsSeen=${!cudaHostPathsSeen[*]}" >&2
 
-    [[ -z "${cudaPropagateToOutput-}" ]] && return 0
+  [[ -z ${cudaPropagateToOutput-} ]] && return 0
 
-    mkdir -p "${!cudaPropagateToOutput}/nix-support"
-    # One'd expect this should be propagated-bulid-build-deps, but that doesn't seem to work
-    echo "@setupCudaHook@" >> "${!cudaPropagateToOutput}/nix-support/propagated-native-build-inputs"
+  mkdir -p "${!cudaPropagateToOutput}/nix-support"
+  # One'd expect this should be propagated-bulid-build-deps, but that doesn't seem to work
+  echo "@setupCudaHook@" >>"${!cudaPropagateToOutput}/nix-support/propagated-native-build-inputs"
 
-    local propagatedBuildInputs=( "${!cudaHostPathsSeen[@]}" )
-    for output in $(getAllOutputNames) ; do
-        if [[ ! "$output" = "$cudaPropagateToOutput" ]] ; then
-            appendToVar propagatedBuildInputs "${!output}"
-        fi
-        break
-    done
+  local propagatedBuildInputs=("${!cudaHostPathsSeen[@]}")
+  for output in $(getAllOutputNames); do
+    if [[ $output != "$cudaPropagateToOutput" ]]; then
+      appendToVar propagatedBuildInputs "${!output}"
+    fi
+    break
+  done
 
-    # One'd expect this should be propagated-host-host-deps, but that doesn't seem to work
-    printWords "${propagatedBuildInputs[@]}" >> "${!cudaPropagateToOutput}/nix-support/propagated-build-inputs"
+  # One'd expect this should be propagated-host-host-deps, but that doesn't seem to work
+  printWords "${propagatedBuildInputs[@]}" >>"${!cudaPropagateToOutput}/nix-support/propagated-build-inputs"
 }
 postFixupHooks+=(propagateCudaLibraries)

From f8ba5f3ff77af7a06dc9a8e01bb9c12156f9d8e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 00:21:25 +0000
Subject: [PATCH 1871/6226] libretro.ppsspp: 0-unstable-2025-10-17 ->
 0-unstable-2025-10-22

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

diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
index 2ac064a36510..7acd6a288f8a 100644
--- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix
+++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
@@ -13,13 +13,13 @@
 }:
 mkLibretroCore {
   core = "ppsspp";
-  version = "0-unstable-2025-10-17";
+  version = "0-unstable-2025-10-22";
 
   src = fetchFromGitHub {
     owner = "hrydgard";
     repo = "ppsspp";
-    rev = "4ccf013d3b52314b935d8fc49b70f08d546aa48b";
-    hash = "sha256-e1iqnhJQKYXddp3VwpAPg6eHBnDHOFvo1b4evp8f8X4=";
+    rev = "28790c19af7ddfa822c4152a3cae4a7fb6c06bc7";
+    hash = "sha256-m1qmgr92Ni8wAYer6kIdcu+BUiBSROFcSC/M3v/JOmA=";
     fetchSubmodules = true;
   };
 

From 1119d225de6747ee87b3674ae4e67b1a8e8fabb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 23 Oct 2025 02:25:40 +0200
Subject: [PATCH 1872/6226] nixos/librenms: update config cache

otherwise any change to .env is never reflected.
---
 nixos/modules/services/monitoring/librenms.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/nixos/modules/services/monitoring/librenms.nix b/nixos/modules/services/monitoring/librenms.nix
index ef3593cf038c..3d8d3dbd8296 100644
--- a/nixos/modules/services/monitoring/librenms.nix
+++ b/nixos/modules/services/monitoring/librenms.nix
@@ -668,6 +668,9 @@ in
           ${artisanWrapper}/bin/librenms-artisan optimize
           echo "${package}" > ${cfg.dataDir}/package
         fi
+
+        # to make sure to not read an outdated .env file
+        ${artisanWrapper}/bin/librenms-artisan config:cache
       '';
     };
 

From 49535d5708570d82536613239bcaeec03a948f1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 00:27:28 +0000
Subject: [PATCH 1873/6226] libosmo-sigtran: 2.1.0 -> 2.1.2

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

diff --git a/pkgs/by-name/li/libosmo-sigtran/package.nix b/pkgs/by-name/li/libosmo-sigtran/package.nix
index dee2431912a7..0e661a183f4e 100644
--- a/pkgs/by-name/li/libosmo-sigtran/package.nix
+++ b/pkgs/by-name/li/libosmo-sigtran/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libosmo-sigtran";
-  version = "2.1.0";
+  version = "2.1.2";
 
   # fetchFromGitea hangs
   src = fetchgit {
     url = "https://gitea.osmocom.org/osmocom/libosmo-sigtran.git";
     rev = version;
-    hash = "sha256-/MUFTo5Uo60CZV0ZTDVLVgEXrNw9kX5gafq7rJb82Do=";
+    hash = "sha256-/TxD7lc/htm1c24rKfnlYxGsVpxawi3nh7m34mRRhUA=";
   };
 
   configureFlags = [ "--with-systemdsystemunitdir=$out" ];

From d4fdb2c3c8cea2fb4e80c5239bfe81c0e08756e9 Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Wed, 22 Oct 2025 18:45:51 -0400
Subject: [PATCH 1874/6226] shipwright: 9.0.5 -> 9.1.0

---
 pkgs/by-name/sh/shipwright/package.nix | 48 ++++++++++++++++++--------
 1 file changed, 33 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix
index c3fd3e73c0c8..8f97165fbc91 100644
--- a/pkgs/by-name/sh/shipwright/package.nix
+++ b/pkgs/by-name/sh/shipwright/package.nix
@@ -30,25 +30,32 @@
   fixDarwinDylibNames,
   applyPatches,
   shipwright,
+  libopus,
+  opusfile,
+  libogg,
+  libvorbis,
+  bzip2,
+  libX11,
+  sdl_gamecontrollerdb,
 }:
 
 let
 
   # The following would normally get fetched at build time, or a specific version is required
 
-  gamecontrollerdb = fetchFromGitHub {
-    owner = "mdqinc";
-    repo = "SDL_GameControllerDB";
-    rev = "a74711e1e87733ccdf02d7020d8fa9e4fa67176e";
-    hash = "sha256-rXC4akz9BaKzr/C2CryZC6RGk6+fGVG7RsQryUFUUk0=";
+  dr_libs = fetchFromGitHub {
+    owner = "mackron";
+    repo = "dr_libs";
+    rev = "da35f9d6c7374a95353fd1df1d394d44ab66cf01";
+    hash = "sha256-ydFhQ8LTYDBnRTuETtfWwIHZpRciWfqGsZC6SuViEn0=";
   };
 
   imgui' = applyPatches {
     src = fetchFromGitHub {
       owner = "ocornut";
       repo = "imgui";
-      tag = "v1.91.6-docking";
-      hash = "sha256-28wyzzwXE02W5vbEdRCw2iOF8ONkb3M3Al8XlYBvz1A=";
+      tag = "v1.91.9b-docking";
+      hash = "sha256-mQOJ6jCN+7VopgZ61yzaCnt4R1QLrW7+47xxMhFRHLQ=";
     };
     patches = [
       "${shipwright.src}/libultraship/cmake/dependencies/patches/imgui-fixes-and-config.patch"
@@ -65,8 +72,8 @@ let
   prism = fetchFromGitHub {
     owner = "KiritoDv";
     repo = "prism-processor";
-    rev = "fb3f8b4a2d14dfcbae654d0f0e59a73b6f6ca850";
-    hash = "sha256-gGdQSpX/TgCNZ0uyIDdnazgVHpAQhl30e+V0aVvTFMM=";
+    rev = "bbcbc7e3f890a5806b579361e7aa0336acd547e7";
+    hash = "sha256-jRPwO1Vub0cH12YMlME6kd8zGzKmcfIrIJZYpQJeOks=";
   };
 
   stb_impl = writeTextFile {
@@ -111,12 +118,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "shipwright";
-  version = "9.0.5";
+  version = "9.1.0";
   src = fetchFromGitHub {
     owner = "harbourmasters";
     repo = "shipwright";
     tag = finalAttrs.version;
-    hash = "sha256-F5d4u3Nq/+yYiOgkH/bwWPhZDxgBpJ5ktee0Hc5UmEo=";
+    hash = "sha256-sRUg6wa0KOG+hoR+6QEVyPe/9O9yEefNB69BMO+H+iU=";
     fetchSubmodules = true;
     deepClone = true;
     postFetch = ''
@@ -161,6 +168,12 @@ stdenv.mkDerivation (finalAttrs: {
     nlohmann_json
     tinyxml-2
     spdlog
+    (lib.getDev libopus)
+    (lib.getDev opusfile)
+    libogg
+    libvorbis
+    bzip2
+    libX11
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     libpulseaudio
@@ -175,11 +188,14 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "BUILD_REMOTE_CONTROL" true)
     (lib.cmakeBool "NON_PORTABLE" true)
     (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_DR_LIBS" "${dr_libs}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_IMGUI" "${imgui'}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_LIBGFXD" "${libgfxd}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_PRISM" "${prism}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_STORMLIB" "${stormlib'}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_THREADPOOL" "${thread_pool}")
+    (lib.cmakeFeature "OPUS_INCLUDE_DIR" "${lib.getDev libopus}/include/opus")
+    (lib.cmakeFeature "OPUSFILE_INCLUDE_DIR" "${lib.getDev opusfile}/include/opus")
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_METALCPP" "${metalcpp}")
@@ -188,6 +204,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-Wno-int-conversion -Wno-implicit-int -Wno-elaborated-enum-base";
 
+  strictDeps = true;
+
   dontAddPrefix = true;
 
   # Linking fails without this
@@ -210,16 +228,16 @@ stdenv.mkDerivation (finalAttrs: {
 
   postBuild = ''
     port_ver=$(grep CMAKE_PROJECT_VERSION: "$PWD/CMakeCache.txt" | cut -d= -f2)
-    cp ${gamecontrollerdb}/gamecontrollerdb.txt gamecontrollerdb.txt
-    mv ../libultraship/src/graphic/Fast3D/shaders ../soh/assets/custom
+    cp ${sdl_gamecontrollerdb}/share/gamecontrollerdb.txt gamecontrollerdb.txt
+    mv ../libultraship/src/fast/shaders ../soh/assets/custom
     pushd ../OTRExporter
-    python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out --norom --xml-root ../soh/assets/xml --custom-assets-path ../soh/assets/custom --custom-otr-file soh.otr --port-ver $port_ver
+    python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out --norom --xml-root ../soh/assets/xml --custom-assets-path ../soh/assets/custom --custom-otr-file soh.o2r --port-ver $port_ver
     popd
   '';
 
   preInstall = ''
     # Cmake likes it here for its install paths
-    cp ../OTRExporter/soh.otr soh/soh.otr
+    cp ../OTRExporter/soh.o2r soh/soh.o2r
   '';
 
   postInstall =

From dad73c2ec4b12deb3eed369fe71a992ce1f09e41 Mon Sep 17 00:00:00 2001
From: Andy Zhang <1329212+zh4ngx@users.noreply.github.com>
Date: Wed, 22 Oct 2025 17:31:12 -0700
Subject: [PATCH 1875/6226] fix beeper appimage url

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

diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix
index ec3891a548dd..129f0c3ba496 100644
--- a/pkgs/by-name/be/beeper/package.nix
+++ b/pkgs/by-name/be/beeper/package.nix
@@ -11,7 +11,7 @@ let
   pname = "beeper";
   version = "4.1.253";
   src = fetchurl {
-    url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}.AppImage";
+    url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage";
     hash = "sha256-/vjJmDP183M8B/g0IIcWytB5NUoteWMZlef0j8nZdOQ=";
   };
   appimageContents = appimageTools.extract {

From d894ce6bbd7e26460084b31c204e513d250dc5ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 00:31:30 +0000
Subject: [PATCH 1876/6226] activemq: 6.1.7 -> 6.1.8

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

diff --git a/pkgs/by-name/ac/activemq/package.nix b/pkgs/by-name/ac/activemq/package.nix
index 56ba6f4e4915..66d78633c3ed 100644
--- a/pkgs/by-name/ac/activemq/package.nix
+++ b/pkgs/by-name/ac/activemq/package.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "6.1.7";
+  version = "6.1.8";
 in
 stdenvNoCC.mkDerivation {
   pname = "activemq";
@@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation {
 
   src = fetchurl {
     url = "mirror://apache/activemq/${version}/apache-activemq-${version}-bin.tar.gz";
-    hash = "sha256-dcxBEJqJd0XUSsonNYVo88vgzVj8a7/wNag8Td9I0xY=";
+    hash = "sha256-BCrdMR698xAsl+8nY8DpwdZZH6LH2C5FBNZ2sRUmtBk=";
   };
 
   installPhase = ''

From bbe895cb83f1d0978381e234e7c0ff75eda0d61a Mon Sep 17 00:00:00 2001
From: Andy Zhang <1329212+zh4ngx@users.noreply.github.com>
Date: Wed, 22 Oct 2025 17:32:53 -0700
Subject: [PATCH 1877/6226] beeper: 4.1.253 -> 4.1.289

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

diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix
index 129f0c3ba496..733cb48a0fc4 100644
--- a/pkgs/by-name/be/beeper/package.nix
+++ b/pkgs/by-name/be/beeper/package.nix
@@ -9,10 +9,10 @@
 }:
 let
   pname = "beeper";
-  version = "4.1.253";
+  version = "4.1.289";
   src = fetchurl {
     url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage";
-    hash = "sha256-/vjJmDP183M8B/g0IIcWytB5NUoteWMZlef0j8nZdOQ=";
+    hash = "sha256-35fPd3bwbUwhdEtMrq/P+vPeh9Kdv9vwCP6LC7p4N9I=";
   };
   appimageContents = appimageTools.extract {
     inherit pname version src;

From 02326abe903b8e778d4b5fb5779f5644eae8e93f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 00:36:59 +0000
Subject: [PATCH 1878/6226] python3Packages.f3d: 3.2.0 -> 3.3.0

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

diff --git a/pkgs/by-name/f3/f3d/package.nix b/pkgs/by-name/f3/f3d/package.nix
index f79b09b643c7..2c5f0895bd9b 100644
--- a/pkgs/by-name/f3/f3d/package.nix
+++ b/pkgs/by-name/f3/f3d/package.nix
@@ -22,7 +22,7 @@
 
 stdenv.mkDerivation rec {
   pname = "f3d";
-  version = "3.2.0";
+  version = "3.3.0";
 
   outputs = [ "out" ] ++ lib.optionals withManual [ "man" ];
 
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     owner = "f3d-app";
     repo = "f3d";
     tag = "v${version}";
-    hash = "sha256-p1Cqam3sYDXJCU1A2sC/fV1ohxS3FGiVrxeGooNXVBQ=";
+    hash = "sha256-nZXz5FiGAcDqTi5hlSH7rq2QazhqYg1IoNDog35dygA=";
   };
 
   nativeBuildInputs = [

From 756c738fa2affc0077fe401a0c8265e9cb42a381 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 00:46:15 +0000
Subject: [PATCH 1879/6226] thin-provisioning-tools: 1.2.2 -> 1.3.0

---
 pkgs/by-name/th/thin-provisioning-tools/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/th/thin-provisioning-tools/package.nix b/pkgs/by-name/th/thin-provisioning-tools/package.nix
index ba60faa15860..8a6e1def88de 100644
--- a/pkgs/by-name/th/thin-provisioning-tools/package.nix
+++ b/pkgs/by-name/th/thin-provisioning-tools/package.nix
@@ -9,13 +9,13 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "thin-provisioning-tools";
-  version = "1.2.2";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "jthornber";
     repo = "thin-provisioning-tools";
     rev = "v${version}";
-    hash = "sha256-JnibI3txqPXwEemLtgtfe6NAZrOX09p0w4sp9/HEXBQ=";
+    hash = "sha256-KjX+qAiHkbv3DicAfJxEFv/4CKdE0ZeB9Ktia93oiaU=";
   };
 
   strictDeps = true;
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     udev
   ];
 
-  cargoHash = "sha256-1spipVIT49G0l6yLyv3/7jsR2xyJQPjtB5vouyAjpgA=";
+  cargoHash = "sha256-IgP5JehP/mlsjYSTn5hepWVgZmPGoyZix83rgO08WfA=";
 
   passthru.tests = {
     inherit (nixosTests.lvm2) lvm-thinpool-linux-latest;

From 0b6ef9155412e6b3d34cb43d54a6ee84cb2db921 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 01:13:54 +0000
Subject: [PATCH 1880/6226] gh-markdown-preview: 1.10.1 -> 1.11.0

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

diff --git a/pkgs/by-name/gh/gh-markdown-preview/package.nix b/pkgs/by-name/gh/gh-markdown-preview/package.nix
index a6d83efa539a..7507a1343ee1 100644
--- a/pkgs/by-name/gh/gh-markdown-preview/package.nix
+++ b/pkgs/by-name/gh/gh-markdown-preview/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "gh-markdown-preview";
-  version = "1.10.1";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "yusukebe";
     repo = "gh-markdown-preview";
     rev = "v${version}";
-    hash = "sha256-jvdNAxPAr3ieOhUWeALmopeN06mZZJ+zBDFVl7gsYoc=";
+    hash = "sha256-Q6rTkiklSU1lh4mEKYJYXOmGlRkNUYTC/jtMkVVFRu0=";
   };
 
   vendorHash = "sha256-O6Q9h5zcYAoKLjuzGu7f7UZY0Y5rL2INqFyJT2QZJ/E=";

From 428a26ee7c9dfe6df677063083b819f86c86ffdb Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 16 Oct 2025 13:00:03 +0800
Subject: [PATCH 1881/6226] wechat: 4.1.0.19-29668 -> 4.1.0.34-29721 for darwin

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

diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix
index 945a202f9c78..2fce20ac0308 100644
--- a/pkgs/by-name/we/wechat/package.nix
+++ b/pkgs/by-name/we/wechat/package.nix
@@ -30,14 +30,14 @@ let
       # https://dldir1.qq.com/weixin/mac/mac-release.xml
       any-darwin =
         let
-          version = "4.1.0.19-29668";
+          version = "4.1.0.34-29721";
           version' = lib.replaceString "-" "_" version;
         in
         {
           inherit version;
           src = fetchurl {
             url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg";
-            hash = "sha256-EAKfskB3zY4C05MVCoyxzW6wuRw8b2nXIynyEjx8Rvw=";
+            hash = "sha256-UwQrU4uVCKnAYXFSnlIfXQbBxyR3KNn6f1Mp4bCSAZI=";
           };
         };
     in

From d66b4cf838f7f21f72766c9148abcd1ec40dcab0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 01:40:09 +0000
Subject: [PATCH 1882/6226] impala: 0.4.0 -> 0.4.1

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

diff --git a/pkgs/by-name/im/impala/package.nix b/pkgs/by-name/im/impala/package.nix
index 3f9df755a88a..d64655d707d2 100644
--- a/pkgs/by-name/im/impala/package.nix
+++ b/pkgs/by-name/im/impala/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "impala";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "pythops";
     repo = "impala";
     rev = "v${version}";
-    hash = "sha256-MrqyDwZztuYrqgbznBNDwusu3zNES+v2+BOti6lm5HU=";
+    hash = "sha256-CRnGycN2juXXNI1LhAH5HQbmXYatBZ0GxYKYgb5SBSE=";
   };
 
-  cargoHash = "sha256-DBYQ7xeLLnIR5dcnvK2P4l5Fpfi/TvVajs4OQ66UUP0=";
+  cargoHash = "sha256-fBeSbJdFwT/ZwK2FTJQtZakKqMiAICMY2rkbNnYOGzU=";
 
   meta = {
     description = "TUI for managing wifi";

From e8d62167071dd0280b6f1e7452289f296ba28374 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 01:42:10 +0000
Subject: [PATCH 1883/6226] biome: 2.2.6 -> 2.2.7

---
 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 967588c95784..133780819c08 100644
--- a/pkgs/by-name/bi/biome/package.nix
+++ b/pkgs/by-name/bi/biome/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "biome";
-  version = "2.2.6";
+  version = "2.2.7";
 
   src = fetchFromGitHub {
     owner = "biomejs";
     repo = "biome";
     rev = "@biomejs/biome@${finalAttrs.version}";
-    hash = "sha256-5QxcKVo6niV+K63JRBhs6/RUR6jru20f+DeitfqEuRI=";
+    hash = "sha256-VBNFQkgruomZjDaQouR4KZooGNN/0VCRYFRomdhPFF8=";
   };
 
-  cargoHash = "sha256-/POhRQ2HIaBwk9VeMdkK7dAZ90EmB49oCvQEUScgjpY=";
+  cargoHash = "sha256-CkKwzTi9yqao8mGqIu4F2lqMKZVpFsLUtccXOSXr+uw=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 4a6e852d13dcf257d2f18aadfdf6c15eba7dba37 Mon Sep 17 00:00:00 2001
From: botnk <github-botnk@korz.dev>
Date: Thu, 23 Oct 2025 01:43:07 +0000
Subject: [PATCH 1884/6226] zed-editor: 0.208.6 -> 0.209.5

Changelog: https://github.com/zed-industries/zed/releases/tag/v0.209.5
---
 pkgs/by-name/ze/zed-editor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 89eb02b392a5..5aade7dcf8d3 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -101,7 +101,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.208.6";
+  version = "0.209.5";
 
   outputs = [
     "out"
@@ -114,7 +114,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EzfeLSalC4pTtaiDWXYib5jDDKGVZ+PzFjgMjIGrUDg=";
+    hash = "sha256-p5qKbNPf7j4HiYv+Ej7df131z8xL09egbyOUwIkYC5Q=";
   };
 
   postPatch = ''
@@ -134,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm -r $out/git/*/candle-book/
   '';
 
-  cargoHash = "sha256-PxreCKshDvzLQzPvNpGyNz3jOPIDiz7JHy/9nEujnKg=";
+  cargoHash = "sha256-6LBBa6CDLrEkyazZuqDj2wj41KQnhp3NRw5AlaUtxj0=";
 
   nativeBuildInputs = [
     cmake

From 02a6a4cf343148cbbd1cd1d94a2811d3319fc167 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Wed, 22 Oct 2025 21:51:47 -0400
Subject: [PATCH 1885/6226] paperless-ngx: 2.19.0 -> 2.19.1

changelog: https://github.com/paperless-ngx/paperless-ngx/releases/tag/v2.19.1
---
 pkgs/by-name/pa/paperless-ngx/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index a518dc7625f9..80567181881a 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -28,13 +28,13 @@
   xorg,
 }:
 let
-  version = "2.19.0";
+  version = "2.19.1";
 
   src = fetchFromGitHub {
     owner = "paperless-ngx";
     repo = "paperless-ngx";
     tag = "v${version}";
-    hash = "sha256-t2T42K+F3PaMfNDFa3NF/rAcG6izKTXMIzgD68WdVFE=";
+    hash = "sha256-J9e39c8AnEj+1lB+KrxsG3h4VjTo65an24IJ5mvACUE=";
   };
 
   python = python3.override {

From efea9cb2cff2dbc2008608775467b25131d52551 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 02:06:02 +0000
Subject: [PATCH 1886/6226] lasuite-meet: 0.1.40 -> 0.1.41

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

diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix
index 8ea69995ee86..98812a18cb67 100644
--- a/pkgs/by-name/la/lasuite-meet/package.nix
+++ b/pkgs/by-name/la/lasuite-meet/package.nix
@@ -13,14 +13,14 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "lasuite-meet";
-  version = "0.1.40";
+  version = "0.1.41";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "meet";
     tag = "v${version}";
-    hash = "sha256-jzMjLiNLLBBHo9/c/ufB59V6qMwjpx38sImFR+Q+wBE=";
+    hash = "sha256-QAzkRbAxtHa7Py4DDSc2/QHHyFHp+e+/uGmGzUPtFPI=";
   };
 
   sourceRoot = "source/src/backend";

From 3ce22cb92a4eee8f91166f34284fba5387a9e638 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 02:12:17 +0000
Subject: [PATCH 1887/6226] shopify-themekit: 1.3.2 -> 1.3.3

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

diff --git a/pkgs/by-name/sh/shopify-themekit/package.nix b/pkgs/by-name/sh/shopify-themekit/package.nix
index cbe076825c21..23dbdd89a1a3 100644
--- a/pkgs/by-name/sh/shopify-themekit/package.nix
+++ b/pkgs/by-name/sh/shopify-themekit/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "shopify-themekit";
-  version = "1.3.2";
+  version = "1.3.3";
 
   src = fetchFromGitHub {
     owner = "Shopify";
     repo = "themekit";
     rev = "v${version}";
-    sha256 = "sha256-A/t6yQW2xRFZYuYRyNN/0v4zdivch3tiv65a7TdHm2c=";
+    sha256 = "sha256-m0TAgnYklj/WqZJIm9mHLE7SZgXP8YDQZndDgpiNqL0=";
   };
 
   vendorHash = "sha256-o928qjp7+/U1W03esYTwVEfQ4A3TmPnmgmh4oWpqJoo=";

From a70b28a38816fb5529971cf2a6c97a6aa26b0bd3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 02:25:59 +0000
Subject: [PATCH 1888/6226] shh: 2025.9.22 -> 2025.10.22

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

diff --git a/pkgs/by-name/sh/shh/package.nix b/pkgs/by-name/sh/shh/package.nix
index b8940661b542..bb3337716b20 100644
--- a/pkgs/by-name/sh/shh/package.nix
+++ b/pkgs/by-name/sh/shh/package.nix
@@ -18,16 +18,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "shh";
-  version = "2025.9.22";
+  version = "2025.10.22";
 
   src = fetchFromGitHub {
     owner = "desbma";
     repo = "shh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Esb6IR49YtGWvLmGLtviAyMLjoWZLQka2igC6yKJ3A0=";
+    hash = "sha256-OxiQOwoWytZvPVVurSckPSWcb88pyDHRdUV/87Dbb9Q=";
   };
 
-  cargoHash = "sha256-CB0jhVDR40lZaYqNq43V/af1v3Ph+6Z9swSrrsNgA8k=";
+  cargoHash = "sha256-KRRBqRm6/TedzjGRTcbj0q4R9xOgj0PmKEm9rY2f4PM=";
 
   patches = [
     ./fix_run_checks.patch

From 99d62884386e62f420a13577e0f0658adfcb7406 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 02:54:52 +0000
Subject: [PATCH 1889/6226] server-box: 1.0.1262 -> 1.0.1270

---
 pkgs/by-name/se/server-box/gitHashes.json    |  6 +++---
 pkgs/by-name/se/server-box/package.nix       |  4 ++--
 pkgs/by-name/se/server-box/pubspec.lock.json | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/se/server-box/gitHashes.json b/pkgs/by-name/se/server-box/gitHashes.json
index d91645f03a29..a10caf0c8b05 100644
--- a/pkgs/by-name/se/server-box/gitHashes.json
+++ b/pkgs/by-name/se/server-box/gitHashes.json
@@ -1,11 +1,11 @@
 {
   "circle_chart": "sha256-BcnL/hRf+Yv2U8Nkl7pc8BtncBW+M2by86jO5IbFIRk=",
   "computer": "sha256-qaD6jn78zDyZBktwJ4WTQa8oCvCWQJOBDaozBVsXNb8=",
-  "dartssh2": "sha256-XlbruyraMmZGNRppQdBLS89Qyd7mm5Noiap2BhZjEPw=",
+  "dartssh2": "sha256-Bl5eLrYU2YnpRcleff3wVXiTS9wuo2A1neiLUClvbGU=",
   "fl_build": "sha256-e2BUk4WmwFzFrA2iHg4dG8fRqWhNt8KFuTEZgWL7H4g=",
-  "fl_lib": "sha256-gK9eJ3GiM9fRVUew1xrd/WYf9ITHi++yR0Bt6qlFm98=",
+  "fl_lib": "sha256-0Dg21LBVIyTH5MLt/v+kGzfOK8PFVYfNiK6P/jcy2jI=",
   "gtk": "sha256-nt7d2MvIfizxezWhQNm2/yHEzYuPKDvfHGM9Bnq3f04=",
   "plain_notification_token": "sha256-Cy1/S8bAtKCBnjfDEeW4Q2nP4jtwyCstAC1GH1efu8I=",
   "watch_connectivity": "sha256-9TyuElr0PNoiUvbSTOakdw1/QwWp6J2GAwzVHsgYWtM=",
-  "xterm": "sha256-VxAWV40R+rSvYyS9LZoD7GL1K1gwjMnpoKd7hfb48Wo="
+  "xterm": "sha256-ujR2aRB9TbaSoGB0vmx75X6683f/tu+Ptj+BFJ2WWVs="
 }
diff --git a/pkgs/by-name/se/server-box/package.nix b/pkgs/by-name/se/server-box/package.nix
index 578c4625c31b..d1dda3c87e75 100644
--- a/pkgs/by-name/se/server-box/package.nix
+++ b/pkgs/by-name/se/server-box/package.nix
@@ -12,13 +12,13 @@
 }:
 
 let
-  version = "1.0.1262";
+  version = "1.0.1270";
 
   src = fetchFromGitHub {
     owner = "lollipopkit";
     repo = "flutter_server_box";
     tag = "v${version}";
-    hash = "sha256-2UJgqNLwVttmc/D4DEhC7oe2yhFNdkvFnOCRVV3WVFk=";
+    hash = "sha256-3erwb2e9iINe4MVuOQKzBuBdUJyBgW2zIImZwVyll6Q=";
   };
 in
 flutter335.buildFlutterApplication {
diff --git a/pkgs/by-name/se/server-box/pubspec.lock.json b/pkgs/by-name/se/server-box/pubspec.lock.json
index a82576bebbd5..1cc8a74af475 100644
--- a/pkgs/by-name/se/server-box/pubspec.lock.json
+++ b/pkgs/by-name/se/server-box/pubspec.lock.json
@@ -466,8 +466,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "v1.0.285",
-        "resolved-ref": "18fb1ad15ee6d2c8c5ec67722bf8b90fe0f4746d",
+        "ref": "v1.0.293",
+        "resolved-ref": "3eedfd55916eede70aeb28605469a43623a9791b",
         "url": "https://github.com/lollipopkit/dartssh2"
       },
       "source": "git",
@@ -628,8 +628,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "v1.0.355",
-        "resolved-ref": "73d5f2603859a9f70459d798ed2d267b1d9a86e5",
+        "ref": "v1.0.358",
+        "resolved-ref": "c8e55d054875bb3ccdab9894a01fe82d173dc54e",
         "url": "https://github.com/lppcg/fl_lib"
       },
       "source": "git",
@@ -2322,8 +2322,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "v4.0.4",
-        "resolved-ref": "5747837cdb7b113ef733ce0104e4f2bfa1eb4a36",
+        "ref": "v4.0.13",
+        "resolved-ref": "6343b0e5f744d2c11090d34690ad5049ebbc599b",
         "url": "https://github.com/lollipopkit/xterm.dart"
       },
       "source": "git",

From d4bc75e4d497e1b4afc13fccb6797752ac02a065 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 23 Oct 2025 11:06:05 +0800
Subject: [PATCH 1890/6226] qq: disable auto updates

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

diff --git a/pkgs/by-name/qq/qq/package.nix b/pkgs/by-name/qq/qq/package.nix
index f5933b5ae267..b96313a53e87 100644
--- a/pkgs/by-name/qq/qq/package.nix
+++ b/pkgs/by-name/qq/qq/package.nix
@@ -37,6 +37,7 @@ let
   pname = "qq";
   inherit (source) version src;
   passthru = {
+    # nixpkgs-update: no auto update
     updateScript = ./update.sh;
   };
   meta = {

From dd5a323c085204a81760aa9aadf8dc2ad3fb7155 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 03:14:13 +0000
Subject: [PATCH 1891/6226] vscode-extensions.denoland.vscode-deno: 3.45.2 ->
 3.46.1

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 63cb59813f4f..5bb60a023e82 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1264,8 +1264,8 @@ let
         mktplcRef = {
           publisher = "denoland";
           name = "vscode-deno";
-          version = "3.45.2";
-          hash = "sha256-U83RWIIorJdFuhr0/l2bIo5JthTFIvedWq52dsSGOx8=";
+          version = "3.46.1";
+          hash = "sha256-9lALQ0ZSIyCJB/nMm7p3Gnl5PtFRSMIqx4DR/B8LdXY=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/denoland.vscode-deno/changelog";

From a73482b1dfa89982a3fb69e6b31673d563ded373 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 08:52:38 -0300
Subject: [PATCH 1892/6226] vmime: unstable-2022-03-26 -> 0-unstable-2025-07-21

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

diff --git a/pkgs/by-name/vm/vmime/package.nix b/pkgs/by-name/vm/vmime/package.nix
index 7b82f03b1cfe..238e8bc41ee9 100644
--- a/pkgs/by-name/vm/vmime/package.nix
+++ b/pkgs/by-name/vm/vmime/package.nix
@@ -18,12 +18,12 @@ stdenv.mkDerivation {
   pname = "vmime";
   # XXX: using unstable rev for now to comply with the removal of
   # deprecated symbols in the latest release of gsasl
-  version = "unstable-2022-03-26";
+  version = "0-unstable-2025-07-21";
   src = fetchFromGitHub {
     owner = "kisli";
     repo = "vmime";
-    rev = "fc69321d5304c73be685c890f3b30528aadcfeaf";
-    sha256 = "sha256-DUcGQcT7hp5Rs2Z5C8wo+3BYwWqED0KrF3h3vgLiiow=";
+    rev = "7046a4360bbeea21d1d8b5cfa4589bb4df7f980d";
+    sha256 = "sha256-cwilSnybH5E0wq384lPnqAjPkQTLtlWS8NhmoFE/13k=";
   };
 
   buildInputs = [

From 2b4b134548e8ef9231261fc4f9e715d9149cd67a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 03:34:25 +0000
Subject: [PATCH 1893/6226] apko: 0.30.16 -> 0.30.17

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

diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix
index 01ee440fae8c..31c6a6ae6a5f 100644
--- a/pkgs/by-name/ap/apko/package.nix
+++ b/pkgs/by-name/ap/apko/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "apko";
-  version = "0.30.16";
+  version = "0.30.17";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "apko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6/vB/ooTkEPazHOjtVEePdCd5048NJTLFDdr2Rxmqa8=";
+    hash = "sha256-pFkNYtY2LAzLxMMo3GQxaa1WBZSWxqXdxE9K/FIjZ0s=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-mZg8OXPMeBAJYQWB0vrZC5fo0+xuU8ho/IE2j624RV8=";
+  vendorHash = "sha256-0wVuZy+SEiyFIk0RLIAbvv52DiFpTZk7Z6PzqY+jo5I=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 9a2c712f1c90d42e42a57ff0590591aa11e46a58 Mon Sep 17 00:00:00 2001
From: Michael Tibben <mtibben@groq.com>
Date: Thu, 23 Oct 2025 13:17:19 +1100
Subject: [PATCH 1894/6226] google-cloud-sdk: stop python bytecode from being
 written

---
 pkgs/by-name/go/google-cloud-sdk/package.nix             | 5 +++--
 pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix | 5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/go/google-cloud-sdk/package.nix b/pkgs/by-name/go/google-cloud-sdk/package.nix
index e5c4399649a0..e7014c1a0037 100644
--- a/pkgs/by-name/go/google-cloud-sdk/package.nix
+++ b/pkgs/by-name/go/google-cloud-sdk/package.nix
@@ -87,6 +87,9 @@ stdenv.mkDerivation rec {
     ./gsutil-disable-updates.patch
   ];
 
+  # Prevent Python from writing bytecode to ensure build determinism
+  PYTHONDONTWRITEBYTECODE = "1";
+
   installPhase = ''
     runHook preInstall
 
@@ -161,8 +164,6 @@ stdenv.mkDerivation rec {
   installCheckPhase = ''
     # Avoid trying to write logs to homeless-shelter
     export HOME=$(mktemp -d)
-    # Prevent Python from writing bytecode to ensure build determinism
-    export PYTHONDONTWRITEBYTECODE=1
     $out/bin/gcloud version --format json | jq '."Google Cloud SDK"' | grep "${version}"
     $out/bin/gsutil version | grep -w "$(cat platform/gsutil/VERSION)"
   '';
diff --git a/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix b/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix
index e13ea25caac9..9d5a341105dc 100644
--- a/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix
+++ b/pkgs/by-name/go/google-cloud-sdk/withExtraComponents.nix
@@ -78,11 +78,12 @@ symlinkJoin {
   ]
   ++ comps;
 
+  # Prevent Python from writing bytecode to ensure build determinism
+  PYTHONDONTWRITEBYTECODE = "1";
+
   postBuild = ''
     sed -i ';' $out/google-cloud-sdk/bin/.gcloud-wrapped
     sed -i -e "s#${google-cloud-sdk}#$out#" "$out/google-cloud-sdk/bin/gcloud"
-    # Prevent Python from writing bytecode to ensure build determinism
-    export PYTHONDONTWRITEBYTECODE=1
     ${installCheck}
   '';
 }

From 71eb4a12323323d858cb36df69aa9101f0efc5f2 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 23 Oct 2025 11:41:35 +0800
Subject: [PATCH 1895/6226] python3Packages.beangulp: fix build

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

diff --git a/pkgs/development/python-modules/beangulp/default.nix b/pkgs/development/python-modules/beangulp/default.nix
index 6299ca35159a..d051c0bc622b 100644
--- a/pkgs/development/python-modules/beangulp/default.nix
+++ b/pkgs/development/python-modules/beangulp/default.nix
@@ -6,6 +6,7 @@
   chardet,
   click,
   fetchFromGitHub,
+  fetchpatch2,
   lxml,
   petl,
   python-magic,
@@ -25,6 +26,13 @@ buildPythonPackage rec {
     hash = "sha256-h7xLHwEyS+tOI7v6Erp12VfVnxOf4930++zghhC3in4=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/beancount/beangulp/commit/254bfb38ffed049ef8f3041bfaf01b3f5a8aa771.patch?full_index=1";
+      hash = "sha256-ojysT23K0xmFafzTnRZiHkLS2ioDR/tVK02mfF7N9so=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   dependencies = [

From 6275c708fb42c75458a898b57ad2ac81d532f932 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 14 Oct 2025 19:40:29 +0800
Subject: [PATCH 1896/6226] fava: 1.30.6 -> 1.30.7

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

diff --git a/pkgs/by-name/fa/fava/package.nix b/pkgs/by-name/fa/fava/package.nix
index e20ea15fb424..9dc0fcad61b4 100644
--- a/pkgs/by-name/fa/fava/package.nix
+++ b/pkgs/by-name/fa/fava/package.nix
@@ -8,17 +8,17 @@
 let
   src = buildNpmPackage (finalAttrs: {
     pname = "fava-frontend";
-    version = "1.30.6";
+    version = "1.30.7";
 
     src = fetchFromGitHub {
       owner = "beancount";
       repo = "fava";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-AMbKGIfR/URu7RpyBKSR3lzfIliRWjnUNNjLvu9KmfM=";
+      hash = "sha256-gO6eJIFp/yWAXFWhUcqkkfk2pA8/vyTxgPRPBmv4a6Q=";
     };
     sourceRoot = "${finalAttrs.src.name}/frontend";
 
-    npmDepsHash = "sha256-geou0+Ges0jjrlXG9m3u1GMdf0Qt2pTd8vRGh9gAWJ4=";
+    npmDepsHash = "sha256-cXIhEzYFpLOxUEY7lhTWW7R3/ptkx7hB9K92Fd2m1Ng=";
     makeCacheWritable = true;
 
     preBuild = ''
@@ -34,7 +34,7 @@ let
 in
 python3Packages.buildPythonApplication {
   pname = "fava";
-  version = "1.30.6";
+  inherit (src) version;
   pyproject = true;
 
   inherit src;
@@ -78,10 +78,6 @@ python3Packages.buildPythonApplication {
     SNAPSHOT_IGNORE = lib.versions.major python3Packages.beancount.version == "2";
   };
 
-  preCheck = ''
-    export HOME=$TEMPDIR
-  '';
-
   meta = {
     description = "Web interface for beancount";
     mainProgram = "fava";

From df0b96d06b829be5310e4826d98931aee5d5176d Mon Sep 17 00:00:00 2001
From: thattemperature <2719023332@qq.com>
Date: Thu, 23 Oct 2025 11:47:22 +0800
Subject: [PATCH 1897/6226] emacsPackages.eaf-browser: add Python dependency.

---
 .../emacs/elisp-packages/manual-packages/eaf-browser/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix
index f804b2a65d32..005323cf11f0 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/eaf-browser/default.nix
@@ -60,6 +60,7 @@ melpaBuild (finalAttrs: {
     eafPythonDeps =
       ps: with ps; [
         pysocks
+        pycookiecheat
       ];
   };
 

From 991a9130504c96cbef862f7349f3ae2822e10c8e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 04:14:43 +0000
Subject: [PATCH 1898/6226] polylith: 0.2.22 -> 0.3.30

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

diff --git a/pkgs/by-name/po/polylith/package.nix b/pkgs/by-name/po/polylith/package.nix
index a91b3e4cecaa..7a33086ce54f 100644
--- a/pkgs/by-name/po/polylith/package.nix
+++ b/pkgs/by-name/po/polylith/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "polylith";
-  version = "0.2.22";
+  version = "0.3.30";
 
   src = fetchurl {
     url = "https://github.com/polyfy/polylith/releases/download/v${version}/poly-${version}.jar";
-    sha256 = "sha256-DKJ669TeDFK/USi7UxraAqgqnSCkG/nSIGphvpsmUv8=";
+    sha256 = "sha256-G64sbV671fY+k/tYy8Kq/cAGXLzbZY1g+HyzOw29D24=";
   };
 
   dontUnpack = true;

From 752df2baf874fae065183ceba45766b775d1c30c Mon Sep 17 00:00:00 2001
From: kruziikrel13 <dev@michaelpetersen.io>
Date: Sun, 19 Oct 2025 17:10:11 +1000
Subject: [PATCH 1899/6226] maintainers: add kruziikrel13

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0948524fc6a4..7065ddde4ea1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -13989,6 +13989,12 @@
     name = "Tomas Krupka";
     matrix = "@krupkat:matrix.org";
   };
+  kruziikrel13 = {
+    github = "kruziikrel13";
+    name = "Michael Petersen";
+    email = "dev@michaelpetersen.io";
+    githubId = 72793125;
+  };
   krzaczek = {
     name = "Pawel Krzaczkowski";
     email = "pawel@printu.pl";

From cfa2f785b1d141ef7a81f13d6f94777a1fc6a5a6 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Wed, 22 Oct 2025 23:50:06 -0600
Subject: [PATCH 1900/6226] nheko: fix build for Qt 6.10

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

diff --git a/pkgs/by-name/nh/nheko/package.nix b/pkgs/by-name/nh/nheko/package.nix
index c48c23697788..cd012dbd780b 100644
--- a/pkgs/by-name/nh/nheko/package.nix
+++ b/pkgs/by-name/nh/nheko/package.nix
@@ -43,6 +43,11 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-y8aiS6h5CSJYBdsAH4jYhAyrFug7aH2H8L6rBfULnQQ=";
     })
     ./fix-darwin-build.patch
+    # Fix for Qt 6.10
+    (fetchpatch {
+      url = "https://github.com/Nheko-Reborn/nheko/commit/af2ca72030deb14a920a888e807dc732d93e3714.patch";
+      hash = "sha256-tlYrfEoUkdJoVzvfF34IhXdn1AxLO0MOlp9rzuFivws=";
+    })
   ];
 
   nativeBuildInputs = [

From c15126c336b7ccd9e75743746cea8684a2cb26b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 22 Oct 2025 22:59:31 -0700
Subject: [PATCH 1901/6226] python3Packages.clarifai: unpin psutil

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

diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix
index 56e2a74ca67f..c3efbb15880f 100644
--- a/pkgs/development/python-modules/clarifai/default.nix
+++ b/pkgs/development/python-modules/clarifai/default.nix
@@ -48,6 +48,7 @@ buildPythonPackage rec {
     "clarifai-protocol"
     "click"
     "fsspec"
+    "psutil"
     "ruff"
     "schema"
     "uv"

From 60080e9f64f5c44857a2d8bd07c31a9e399e7ec8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 06:15:52 +0000
Subject: [PATCH 1902/6226] libretro.mame2003: 0-unstable-2025-08-26 ->
 0-unstable-2025-10-21

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

diff --git a/pkgs/applications/emulators/libretro/cores/mame2003.nix b/pkgs/applications/emulators/libretro/cores/mame2003.nix
index 57cce733e2ec..e20163bf9ff0 100644
--- a/pkgs/applications/emulators/libretro/cores/mame2003.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame2003.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "mame2003";
-  version = "0-unstable-2025-08-26";
+  version = "0-unstable-2025-10-21";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame2003-libretro";
-    rev = "dfddf4db86a3acd5997ce9419c7afd00ff6587a0";
-    hash = "sha256-GJRawFdlHCfBRiErJJ3ZvZDF1gvYVkuQvKXV1qUCCRQ=";
+    rev = "3570605767a447c13b087a5946189bcbafe11e1d";
+    hash = "sha256-BcPiNYEi6uE8aSpPDNgZ8vmzSnZJUparEM3CEdexbPo=";
   };
 
   # Fix build with GCC 14

From 47281f1b0c68c86aa6822e67f9232c49376205fc Mon Sep 17 00:00:00 2001
From: wrvsrx <wrvsrx@outlook.com>
Date: Thu, 23 Oct 2025 12:59:21 +0800
Subject: [PATCH 1903/6226] conky: fix build failure

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

diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix
index 8f32a4310e89..7c6524367e1a 100644
--- a/pkgs/os-specific/linux/conky/default.nix
+++ b/pkgs/os-specific/linux/conky/default.nix
@@ -9,6 +9,7 @@
 
   # dependencies
   glib,
+  libxfixes,
   libXinerama,
   catch2,
   gperf,
@@ -129,6 +130,7 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional ncursesSupport ncurses
   ++ lib.optionals x11Support [
     freetype
+    libxfixes
     xorg.libICE
     xorg.libX11
     xorg.libXext

From 81e87b9bd8a822a3ab9164831d8f176b4cd4ca3b Mon Sep 17 00:00:00 2001
From: Lan Tian <xuyh0120@outlook.com>
Date: Sat, 18 Oct 2025 21:18:45 -0700
Subject: [PATCH 1904/6226] glauth: 2.3.2 -> 2.4.0

Changelog: https://github.com/glauth/glauth/releases/tag/v2.4.0

Also added versionCheckHook and switch to more commonly used finalAttrs structure.

Using the go work vendor workaround from mattermost package, since building without go workspace fail with some mysterious errors.
---
 pkgs/by-name/gl/glauth/package.nix | 43 ++++++++++++++++--------------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/pkgs/by-name/gl/glauth/package.nix b/pkgs/by-name/gl/glauth/package.nix
index 845080180656..5f07e0f79d90 100644
--- a/pkgs/by-name/gl/glauth/package.nix
+++ b/pkgs/by-name/gl/glauth/package.nix
@@ -2,53 +2,56 @@
   lib,
   fetchFromGitHub,
   buildGoModule,
-  oath-toolkit,
-  openldap,
+  versionCheckHook,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "glauth";
-  version = "2.3.2";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "glauth";
     repo = "glauth";
-    rev = "v${version}";
-    hash = "sha256-FOhtL8nIm5kuKRxFtkrDyUU2z1K22ZdHaes3GY0KmfQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-UUTL+ZnHRSYuD/TUYpsuo+Nu90kpA8ZL4XaGz6in3ME=";
   };
 
-  vendorHash = "sha256-MfauZRufl3kxr1fqatxTmiIvLJ+5JhbpSnbTHiujME8=";
+  vendorHash = "sha256-Lijy0LFy0PgWogdzYRNPFOkLym6Gf9qG4R+Bm91eYJg=";
 
-  nativeCheckInputs = [
-    oath-toolkit
-    openldap
-  ];
+  postPatch = ''
+    substituteInPlace v2/internal/version/const.go \
+      --replace-fail '"v2.3.1"' '"v${finalAttrs.version}"'
+  '';
 
-  modRoot = "v2";
+  # Builds without go workspace fail with mysterious errors
+  overrideModAttrs = _: {
+    buildPhase = ''
+      go work vendor -e -v
+    '';
+  };
 
-  # Disable go workspaces to fix build.
-  env.GOWORK = "off";
-
-  # Based on ldflags in <glauth>/Makefile.
   ldflags = [
     "-s"
     "-w"
-    "-X main.GitClean=1"
-    "-X main.LastGitTag=v${version}"
-    "-X main.GitTagIsCommit=1"
   ];
 
   # Tests fail in the sandbox.
   doCheck = false;
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+
   meta = with lib; {
     description = "Lightweight LDAP server for development, home use, or CI";
     homepage = "https://github.com/glauth/glauth";
+    changelog = "https://github.com/glauth/glauth/releases/tag/v${finalAttrs.version}";
     license = licenses.mit;
     maintainers = with maintainers; [
       bjornfor
       christoph-heiss
+      xddxdd
     ];
     mainProgram = "glauth";
   };
-}
+})

From 84faa36c5030923311b1ecc98cabd850a8f83d76 Mon Sep 17 00:00:00 2001
From: mrtnvgr <martynovegorOF@yandex.ru>
Date: Thu, 23 Oct 2025 13:36:01 +0700
Subject: [PATCH 1905/6226] ufetch: add nix-update-script

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

diff --git a/pkgs/by-name/uf/ufetch/package.nix b/pkgs/by-name/uf/ufetch/package.nix
index 3f2543d53263..00f6fca8e348 100644
--- a/pkgs/by-name/uf/ufetch/package.nix
+++ b/pkgs/by-name/uf/ufetch/package.nix
@@ -1,6 +1,7 @@
 {
   stdenvNoCC,
   fetchFromGitLab,
+  nix-update-script,
   lib,
   full ? true,
   # see https://gitlab.com/jschx/ufetch for a list
@@ -34,6 +35,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Tiny system info for Unix-like operating systems";
     homepage = "https://gitlab.com/jschx/ufetch";

From c65ffed08036e076404b5e7680f7197291677b0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 06:47:11 +0000
Subject: [PATCH 1906/6226] async-profiler: 4.1 -> 4.2

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

diff --git a/pkgs/by-name/as/async-profiler/package.nix b/pkgs/by-name/as/async-profiler/package.nix
index ce1ac1d6e498..0240dba85cc9 100644
--- a/pkgs/by-name/as/async-profiler/package.nix
+++ b/pkgs/by-name/as/async-profiler/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "async-profiler";
-  version = "4.1";
+  version = "4.2";
 
   src = fetchFromGitHub {
     owner = "jvm-profiling-tools";
     repo = "async-profiler";
     rev = "v${version}";
-    hash = "sha256-82aZK9y1Y5PaYtIG7FqnrbYU+bQ3nNzOCn+3lFzyeCA=";
+    hash = "sha256-y/MQgXoaJSwc6QjTPGQRFNyVoR1ENQ7rDmtCwR5F/oM=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 6e34ca27418bdbc560275f66cacc8771e3e22fe9 Mon Sep 17 00:00:00 2001
From: kruziikrel13 <dev@michaelpetersen.io>
Date: Thu, 23 Oct 2025 16:48:23 +1000
Subject: [PATCH 1907/6226] keychron-udev-rules: init at 23-10-2025

---
 .../ke/keychron-udev-rules/package.nix        | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 pkgs/by-name/ke/keychron-udev-rules/package.nix

diff --git a/pkgs/by-name/ke/keychron-udev-rules/package.nix b/pkgs/by-name/ke/keychron-udev-rules/package.nix
new file mode 100644
index 000000000000..374ef9ff2a57
--- /dev/null
+++ b/pkgs/by-name/ke/keychron-udev-rules/package.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  stdenvNoCC,
+  udevCheckHook,
+  writeTextFile,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "keychron-udev-rules";
+  version = "23-10-2025";
+
+  nativeBuildInputs = [ udevCheckHook ];
+
+  src = writeTextFile {
+    name = "69-keychron.rules";
+    text = ''
+      KERNEL=="event*", SUBSYSTEM=="input", ENV{ID_VENDOR_ID}=="3434", ENV{ID_INPUT_JOYSTICK}=="*?", ENV{ID_INPUT_JOYSTICK}=""
+    '';
+  };
+
+  dontConfigure = true;
+  dontUnpack = true;
+  dontBuild = true;
+  dontFixup = true;
+
+  installPhase = ''
+    runHook preInstall
+    install -Dm644 $src $out/lib/udev/rules.d/69-keychron.rules
+    runHook postInstall
+  '';
+
+  meta = with lib; {
+    description = "Keychron Keyboard Udev Rules, fixes issues with keyboard detection on Linux";
+    license = licenses.mit;
+    platforms = platforms.linux;
+    maintainers = with maintainers; [ kruziikrel13 ];
+  };
+})

From 5cd26d1051279ba434024457cf3dabb67a54a1b6 Mon Sep 17 00:00:00 2001
From: kruziikrel13 <dev@michaelpetersen.io>
Date: Thu, 23 Oct 2025 16:48:31 +1000
Subject: [PATCH 1908/6226] nixos/qmk: add keychron support

---
 nixos/modules/hardware/keyboard/qmk.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/hardware/keyboard/qmk.nix b/nixos/modules/hardware/keyboard/qmk.nix
index 6690deca3506..b3fb02858b1d 100644
--- a/nixos/modules/hardware/keyboard/qmk.nix
+++ b/nixos/modules/hardware/keyboard/qmk.nix
@@ -8,15 +8,18 @@
 let
   cfg = config.hardware.keyboard.qmk;
   inherit (lib) mkEnableOption mkIf;
-
 in
 {
   options.hardware.keyboard.qmk = {
     enable = mkEnableOption "non-root access to the firmware of QMK keyboards";
+    keychronSupport = mkEnableOption "udev rules for keychron QMK based keyboards";
   };
 
   config = mkIf cfg.enable {
-    services.udev.packages = [ pkgs.qmk-udev-rules ];
+    services.udev.packages = [
+      pkgs.qmk-udev-rules
+    ]
+    ++ lib.optionals cfg.keychronSupport [ pkgs.keychron-udev-rules ];
     users.groups.plugdev = { };
   };
 }

From c4e3b67afb2508d5e174ed2ea3c5e339cfd37e9b Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 23 Jan 2025 02:07:35 +0800
Subject: [PATCH 1909/6226] buildPython*: allow stdenv customization through
 <function>.override

---
 .../python/mk-python-derivation.nix           |  5 +--
 .../python/python-packages-base.nix           | 37 +++++++++++++++----
 .../python/python2/mk-python-derivation.nix   |  4 +-
 3 files changed, 33 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index b3ef73804311..04deb32b6a3a 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -4,6 +4,8 @@
   lib,
   config,
   python,
+  # Allow passing in a custom stdenv to buildPython*.override
+  stdenv,
   wrapPython,
   unzip,
   ensureNewerSourcesForZipFilesHook,
@@ -192,9 +194,6 @@ in
 
   doCheck ? true,
 
-  # Allow passing in a custom stdenv to buildPython*
-  stdenv ? python.stdenv,
-
   ...
 }@attrs:
 
diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix
index 121e4ead8987..1c3b4d309523 100644
--- a/pkgs/development/interpreters/python/python-packages-base.nix
+++ b/pkgs/development/interpreters/python/python-packages-base.nix
@@ -45,21 +45,42 @@ let
       override = lib.mirrorFunctionArgs f.override (fdrv: makeOverridablePythonPackage (f.override fdrv));
     };
 
+  overrideStdenvCompat =
+    f:
+    lib.setFunctionArgs (
+      args:
+      if !(lib.isFunction args) && (args ? stdenv) then
+        # TODO: warn that `args ? stdenv` is deprecated (once in-tree usage is migrated)
+        f.override { stdenv = args.stdenv; } args
+      else
+        f args
+    ) (removeAttrs (lib.functionArgs f) [ "stdenv" ])
+    // {
+      # Intentionally drop the effect of overrideStdenvCompat when calling `buildPython*.override`.
+      inherit (f) override;
+    };
+
   mkPythonDerivation =
     if python.isPy3k then ./mk-python-derivation.nix else ./python2/mk-python-derivation.nix;
 
   buildPythonPackage = makeOverridablePythonPackage (
-    callPackage mkPythonDerivation {
-      inherit namePrefix; # We want Python libraries to be named like e.g. "python3.6-${name}"
-      inherit toPythonModule; # Libraries provide modules
-    }
+    overrideStdenvCompat (
+      callPackage mkPythonDerivation {
+        inherit namePrefix; # We want Python libraries to be named like e.g. "python3.6-${name}"
+        inherit toPythonModule; # Libraries provide modules
+        inherit (python) stdenv;
+      }
+    )
   );
 
   buildPythonApplication = makeOverridablePythonPackage (
-    callPackage mkPythonDerivation {
-      namePrefix = ""; # Python applications should not have any prefix
-      toPythonModule = x: x; # Application does not provide modules.
-    }
+    overrideStdenvCompat (
+      callPackage mkPythonDerivation {
+        namePrefix = ""; # Python applications should not have any prefix
+        toPythonModule = x: x; # Application does not provide modules.
+        inherit (python) stdenv;
+      }
+    )
   );
 
   # Check whether a derivation provides a Python module.
diff --git a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
index b27d3e92eb24..4bdda1506290 100644
--- a/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/python2/mk-python-derivation.nix
@@ -4,6 +4,8 @@
   lib,
   config,
   python,
+  # Allow passing in a custom stdenv to buildPython*.override
+  stdenv,
   wrapPython,
   unzip,
   ensureNewerSourcesForZipFilesHook,
@@ -101,8 +103,6 @@
 }@attrs:
 
 let
-  inherit (python) stdenv;
-
   withDistOutput = lib.elem format [
     "pyproject"
     "setuptools"

From eacb4ac5f0c7f95f63b645ea1ed67fd543cc5a09 Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Thu, 23 Oct 2025 14:51:49 +0800
Subject: [PATCH 1910/6226] pwvucontrol: 0.4.9 -> 0.5.1

Diff: https://github.com/saivert/pwvucontrol/compare/0.4.9...0.5.1
---
 pkgs/by-name/pw/pwvucontrol/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pw/pwvucontrol/package.nix b/pkgs/by-name/pw/pwvucontrol/package.nix
index 35dab5a2f0e9..699f37ee388f 100644
--- a/pkgs/by-name/pw/pwvucontrol/package.nix
+++ b/pkgs/by-name/pw/pwvucontrol/package.nix
@@ -43,18 +43,18 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "pwvucontrol";
-  version = "0.4.9";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "saivert";
     repo = "pwvucontrol";
     tag = finalAttrs.version;
-    hash = "sha256-fmEXVUz3SerVgWijT/CAoelSUzq861AkBVjP5qwS0ao=";
+    hash = "sha256-21TBVDzjrBzNIPkAURGs2ngI8Vj6o/RL3Ael4wwE2Lk=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-oQSH4P9WxvkXZ53KM5ZoRAZyQFt60Zz7guBbgT1iiBk=";
+    hash = "sha256-FrPpLbfqM/DtjYu20pwr1AMUHaAuTEt60I3JlFZO4RI=";
   };
 
   postPatch = ''

From 17fd98922434bf66cdad4f01379d4e76178951e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 06:52:39 +0000
Subject: [PATCH 1911/6226] comrak: 0.44.0 -> 0.45.0

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

diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix
index 8773e0922cdc..d704ccfb4132 100644
--- a/pkgs/by-name/co/comrak/package.nix
+++ b/pkgs/by-name/co/comrak/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "comrak";
-  version = "0.44.0";
+  version = "0.45.0";
 
   src = fetchFromGitHub {
     owner = "kivikakk";
     repo = "comrak";
     rev = "v${version}";
-    sha256 = "sha256-qwwROwIFG9/pX8t92EHriaN3O4Z2IpQGylVKhbp/0IU=";
+    sha256 = "sha256-+87K5ITDrF/nH1H4z8zyqQlJnviOlRdNnV8v6xsS0uM=";
   };
 
-  cargoHash = "sha256-Ybyrk+I0nzHFkEaWDovTOGPC26i7BXcNtFgFjmCHIwM=";
+  cargoHash = "sha256-efUiKSEsD+GguhriTpLmsyUxpQYzwr4rHJAC9FHMzdU=";
 
   meta = {
     description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter";

From 7cf8ffb32a4eab16ab546b7de6d6a8f7c0c92696 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 23 Oct 2025 05:51:45 +0800
Subject: [PATCH 1912/6226] python3Packages.torch: specify custom stdenv by
 overriding buildPythonPackage

---
 pkgs/development/python-modules/torch/source/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index 61caaf420b57..f806c2ded5f8 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -275,14 +275,16 @@ let
 
   stdenv' = if cudaSupport then cudaPackages.backendStdenv else stdenv;
 in
-buildPythonPackage rec {
+let
+  # From here on, `stdenv` shall be `stdenv'`.
+  stdenv = stdenv';
+in
+buildPythonPackage.override { inherit stdenv; } rec {
   pname = "torch";
   # Don't forget to update torch-bin to the same version.
   version = "2.8.0";
   pyproject = true;
 
-  stdenv = stdenv';
-
   outputs = [
     "out" # output standard python package
     "dev" # output libtorch headers

From 3a4c37457b697cd625dd9714196cb240715f5a0c Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 23 Jan 2025 05:06:44 +0800
Subject: [PATCH 1913/6226] doc: document buildPython* stdenv overriding via
 <function>.override

---
 doc/languages-frameworks/python.section.md | 13 +++++++++++++
 doc/redirects.json                         |  3 +++
 doc/release-notes/rl-2511.section.md       |  4 ++++
 3 files changed, 20 insertions(+)

diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md
index 61c211c0dfcb..fad930c8206d 100644
--- a/doc/languages-frameworks/python.section.md
+++ b/doc/languages-frameworks/python.section.md
@@ -557,6 +557,19 @@ are used in [`buildPythonPackage`](#buildpythonpackage-function).
   with the `pipInstallHook`.
 - `unittestCheckHook` will run tests with `python -m unittest discover`. See [example usage](#using-unittestcheckhook).
 
+#### Overriding build helpers {#overriding-python-build-helpers}
+
+Like many of the build helpers provided by Nixpkgs, Python build helpers typically provide a `<function>.override` attribute.
+It works like [`<pkg>.override`](#sec-pkg-override), and can be used to override the dependencies of each build helper.
+
+This allows specifying the stdenv to be used by `buildPythonPackage` or `buildPythonApplication`. The default (`python.stdenv`) can be overridden as follows:
+
+```nix
+buildPythonPackage.override { stdenv = customStdenv; } {
+  # package attrs...
+}
+```
+
 ## User Guide {#user-guide}
 
 ### Using Python {#using-python}
diff --git a/doc/redirects.json b/doc/redirects.json
index 4198cee6ca48..6334e3e669e5 100644
--- a/doc/redirects.json
+++ b/doc/redirects.json
@@ -3807,6 +3807,9 @@
   "buildpythonpackage-parameters": [
     "index.html#buildpythonpackage-parameters"
   ],
+  "overriding-python-build-helpers": [
+    "index.html#overriding-python-build-helpers"
+  ],
   "overriding-python-packages": [
     "index.html#overriding-python-packages"
   ],
diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 5e22edd9f6dc..9e98d6b55456 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -314,6 +314,10 @@
 
 - `emacs` now disables the GC mark trace buffer by default. This improves GC performance by 5%, but can make GC issues harder to debug. This is configurable with `withGcMarkTrace`.
 
+- Passing `stdenv` to `buildPythonPackage` or `buildPythonApplication` has been deprecated and will trigger an error in a future release.
+  Instead, you should _override_ the python build helper, e.g., `(buildPythonPackage.override { stdenv = customStdenv; })`.
+  See [](#overriding-python-build-helpers).
+
 - `buildPythonPackage` and `buildPythonApplication` now default to `nix-update-script` as their default `updateScript`. This should improve automated updates, since nix-update is better maintained than the in-tree update script and has more robust fetcher support.
 
 - `plasma6`: Fixed the `ksycoca` cache not being re-built when `$XDG_CACHE_HOME` is set to something that isn't `$HOME/.cache`.

From e05528c65f1c1128e8269df0281560bbc88f0d20 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 23 Oct 2025 05:45:44 +0800
Subject: [PATCH 1914/6226] buildPython*: warn about deprecated argument stdenv

On Nixpkgs >= 26.05 (or precisely, oldest supported release >= 25.11),
warn about the use of buildPython*'s deprecated argument `stdenv`.

Co-authored-by: Matt Sturgeon <matt@sturgeon.me.uk>
---
 .../interpreters/python/python-packages-base.nix            | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix
index 1c3b4d309523..19a46dc7ee74 100644
--- a/pkgs/development/interpreters/python/python-packages-base.nix
+++ b/pkgs/development/interpreters/python/python-packages-base.nix
@@ -50,8 +50,10 @@ let
     lib.setFunctionArgs (
       args:
       if !(lib.isFunction args) && (args ? stdenv) then
-        # TODO: warn that `args ? stdenv` is deprecated (once in-tree usage is migrated)
-        f.override { stdenv = args.stdenv; } args
+        lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2511) ''
+          Passing `stdenv` directly to `buildPythonPackage` or `buildPythonApplication` is deprecated. You should use their `.override` function instead, e.g:
+            buildPythonPackage.override { stdenv = customStdenv; } { }
+        '' (f.override { stdenv = args.stdenv; } args)
       else
         f args
     ) (removeAttrs (lib.functionArgs f) [ "stdenv" ])

From feabce77e4bd68e3cd0359563bec5a5a42da55d9 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Thu, 23 Oct 2025 00:10:21 -0700
Subject: [PATCH 1915/6226] armagetronad: add curl dependency (fixing NixOS
 tests)

---
 pkgs/by-name/ar/armagetronad/package.nix | 28 ++++++++++++++----------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ar/armagetronad/package.nix b/pkgs/by-name/ar/armagetronad/package.nix
index f814aad03c33..146fe963c05e 100644
--- a/pkgs/by-name/ar/armagetronad/package.nix
+++ b/pkgs/by-name/ar/armagetronad/package.nix
@@ -10,6 +10,7 @@
   python3,
   which,
   boost,
+  curl,
   ftgl,
   freetype,
   glew,
@@ -70,11 +71,11 @@ let
       # https://gitlab.com/armagetronad/armagetronad/-/commits/trunk/?ref_type=heads
       ${unstableVersionMajor} =
         let
-          rev = "813b684ab0de8ee9737c9fc1f9b90ba0543dd418";
-          hash = "sha256-01jWE9rSBJn+JS8p8LTFqIGquOY1avXsAZnfYfo5pPk=";
+          rev = "3675f21cd5be4932a7a168b321576e0b09e64aaf";
+          hash = "sha256-d2vPFAyx6LhEIxtEUdhrlqqYeCY0NnETlq7TVvX5vVo=";
         in
         dedicatedServer: {
-          version = "${unstableVersionMajor}-${builtins.substring 0 8 rev}";
+          version = "${unstableVersionMajor}-${lib.substring 0 8 rev}";
           src = fetchArmagetron rev hash;
           extraBuildInputs = [
             protobuf
@@ -97,11 +98,11 @@ let
       # https://gitlab.com/armagetronad/armagetronad/-/commits/hack-0.2.8-sty+ct+ap/?ref_type=heads
       "${latestVersionMajor}-sty+ct+ap" =
         let
-          rev = "5a17cc9fb6e1e27a358711afbd745ae54d4a8c60";
-          hash = "sha256-111C1j/hSaASGcvYy3//TyHs4Z+3fuiOvCmtcWLdFd4=";
+          rev = "c907ee3efd76f3b1e6eb41257cf7127f3eab280c";
+          hash = "sha256-d5uWBSz07OinbGHoxUQ64go3eOugLu/tWNjeihobQdo=";
         in
         dedicatedServer: {
-          version = "${latestVersionMajor}-sty+ct+ap-${builtins.substring 0 8 rev}";
+          version = "${latestVersionMajor}-sty+ct+ap-${lib.substring 0 8 rev}";
           src = fetchArmagetron rev hash;
           extraBuildInputs = lib.optionals (!dedicatedServer) [
             libGL
@@ -127,13 +128,13 @@ let
 
       # Split the version into the major and minor parts
       versionParts = lib.splitString "-" resolvedParams.version;
-      splitVersion = lib.splitVersion (builtins.elemAt versionParts 0);
-      majorVersion = builtins.concatStringsSep "." (lib.lists.take 2 splitVersion);
+      splitVersion = lib.splitVersion (lib.elemAt versionParts 0);
+      majorVersion = lib.concatStringsSep "." (lib.lists.take 2 splitVersion);
 
       minorVersionPart =
         parts: sep: expectedSize:
-        if builtins.length parts > expectedSize then
-          sep + (builtins.concatStringsSep sep (lib.lists.drop expectedSize parts))
+        if lib.length parts > expectedSize then
+          sep + (lib.concatStringsSep sep (lib.lists.drop expectedSize parts))
         else
           "";
 
@@ -172,8 +173,11 @@ let
       ++ lib.optional dedicatedServer "--enable-dedicated"
       ++ lib.optional (!dedicatedServer) "--enable-music";
 
-      buildInputs =
-        lib.singleton (libxml2.override { enableHttp = true; }) ++ (resolvedParams.extraBuildInputs or [ ]);
+      buildInputs = [
+        (libxml2.override { enableHttp = true; })
+        curl
+      ]
+      ++ (resolvedParams.extraBuildInputs or [ ]);
 
       nativeBuildInputs = [
         autoconf

From a2d88e8b7b1a0237a484935adb1c863776d43c44 Mon Sep 17 00:00:00 2001
From: Sav Tripodi <sav@sanico.com.au>
Date: Thu, 23 Oct 2025 09:10:31 +0200
Subject: [PATCH 1916/6226] maintainers: add savtrip

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0948524fc6a4..d3a59e2ad27e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -23072,6 +23072,11 @@
     githubId = 99875823;
     name = "Michael Savedra";
   };
+  savtrip = {
+    github = "savtrip";
+    githubId = 42227195;
+    name = "Sav Tripodi";
+  };
   savyajha = {
     email = "savya.jha@hawkradius.com";
     github = "savyajha";

From 86c3b4dc4195c60a7cece3017a1d44cb03e7962b Mon Sep 17 00:00:00 2001
From: Sav Tripodi <sav@sanico.com.au>
Date: Thu, 23 Oct 2025 09:12:43 +0200
Subject: [PATCH 1917/6226] python3Packages.copier: add savtrip as maintainer

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

diff --git a/pkgs/development/python-modules/copier/default.nix b/pkgs/development/python-modules/copier/default.nix
index ccfd20310fb3..bc0e79c3867a 100644
--- a/pkgs/development/python-modules/copier/default.nix
+++ b/pkgs/development/python-modules/copier/default.nix
@@ -79,7 +79,10 @@ buildPythonPackage rec {
     homepage = "https://copier.readthedocs.io";
     changelog = "https://github.com/copier-org/copier/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ greg ];
+    maintainers = with lib.maintainers; [
+      greg
+      savtrip
+    ];
     mainProgram = "copier";
   };
 }

From cc4a6e2f84d4562484036fdb70822c4a796eebee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 07:13:31 +0000
Subject: [PATCH 1918/6226] numix-icon-theme: 25.10.14 -> 25.10.17.2

---
 pkgs/data/icons/numix-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index efe9fa722c65..0e597a783999 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -12,13 +12,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "numix-icon-theme";
-  version = "25.10.14";
+  version = "25.10.17.2";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = "numix-icon-theme";
     rev = version;
-    sha256 = "sha256-g+6tinHNGodnsQBxlFCNJ05vSqu7YlaT9khUjqVqIjk=";
+    sha256 = "sha256-0s35a7GkjNL/DNEJI/A2TfI+FawvpKn/HY46tqXKbcY=";
   };
 
   nativeBuildInputs = [

From d18f7100272567f2d0a8956a54fa7b8611a7248b Mon Sep 17 00:00:00 2001
From: Sav Tripodi <sav@sanico.com.au>
Date: Thu, 23 Oct 2025 09:13:45 +0200
Subject: [PATCH 1919/6226] hugo: add savtrip as maintainer

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

diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix
index 075233ed7010..c29355592438 100644
--- a/pkgs/by-name/hu/hugo/package.nix
+++ b/pkgs/by-name/hu/hugo/package.nix
@@ -83,6 +83,7 @@ buildGoModule (finalAttrs: {
     maintainers = with lib.maintainers; [
       Br1ght0ne
       Frostman
+      savtrip
     ];
   };
 })

From f9ff37cdc3ade4bc45f501af0e7f7520a9543f1c Mon Sep 17 00:00:00 2001
From: Sav Tripodi <sav@sanico.com.au>
Date: Thu, 23 Oct 2025 09:15:11 +0200
Subject: [PATCH 1920/6226] maintainers: add savtrip to beam team

---
 maintainers/team-list.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index f23ccf22f840..89fcb5dc007e 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -115,6 +115,7 @@ with lib.maintainers;
       happysalada
       minijackson
       yurrriq
+      savtrip
     ];
     github = "beam";
     scope = "Maintain BEAM-related packages and modules.";

From f19caec025a2b849442aae384f73705ebe1c72b1 Mon Sep 17 00:00:00 2001
From: Sav Tripodi <sav@sanico.com.au>
Date: Thu, 23 Oct 2025 09:16:15 +0200
Subject: [PATCH 1921/6226] gum: add savtrip as maintainer

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

diff --git a/pkgs/by-name/gu/gum/package.nix b/pkgs/by-name/gu/gum/package.nix
index afbcd246a4af..20858d53c588 100644
--- a/pkgs/by-name/gu/gum/package.nix
+++ b/pkgs/by-name/gu/gum/package.nix
@@ -48,7 +48,10 @@ buildGoModule rec {
     homepage = "https://github.com/charmbracelet/gum";
     changelog = "https://github.com/charmbracelet/gum/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ maaslalani ];
+    maintainers = with lib.maintainers; [
+      maaslalani
+      savtrip
+    ];
     mainProgram = "gum";
   };
 }

From ee5be45861af29137e5b527b2f2e43895523fef3 Mon Sep 17 00:00:00 2001
From: Sav Tripodi <sav@sanico.com.au>
Date: Thu, 23 Oct 2025 09:17:18 +0200
Subject: [PATCH 1922/6226] pre-commit: add savtrip as maintainer

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

diff --git a/pkgs/by-name/pr/pre-commit/package.nix b/pkgs/by-name/pr/pre-commit/package.nix
index 7e5f493deb05..31ffa0a866c6 100644
--- a/pkgs/by-name/pr/pre-commit/package.nix
+++ b/pkgs/by-name/pr/pre-commit/package.nix
@@ -222,7 +222,10 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://pre-commit.com/";
     changelog = "https://github.com/pre-commit/pre-commit/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ borisbabic ];
+    maintainers = with lib.maintainers; [
+      borisbabic
+      savtrip
+    ];
     mainProgram = "pre-commit";
   };
 }

From 3ce779cd41f2a81282122d634b87831a978028f4 Mon Sep 17 00:00:00 2001
From: David Morgan <djm_uk@protonmail.com>
Date: Wed, 22 Oct 2025 17:19:18 +0100
Subject: [PATCH 1923/6226] msgpack-tools: Fix build

Co-authored-by: Petr Zahradnik <junior@zahradnik.cz>
---
 pkgs/by-name/ms/msgpack-tools/cmake-v4.patch  |  8 +++
 pkgs/by-name/ms/msgpack-tools/package.nix     | 61 ++++++++++-------
 .../ms/msgpack-tools/use-nix-deps.patch       | 67 +++++++++++++++++++
 3 files changed, 111 insertions(+), 25 deletions(-)
 create mode 100644 pkgs/by-name/ms/msgpack-tools/cmake-v4.patch
 create mode 100644 pkgs/by-name/ms/msgpack-tools/use-nix-deps.patch

diff --git a/pkgs/by-name/ms/msgpack-tools/cmake-v4.patch b/pkgs/by-name/ms/msgpack-tools/cmake-v4.patch
new file mode 100644
index 000000000000..7b2efd41bcb5
--- /dev/null
+++ b/pkgs/by-name/ms/msgpack-tools/cmake-v4.patch
@@ -0,0 +1,8 @@
+--- a/CMakeLists.txt	2025-10-23 07:12:12.766221736 +0100
++++ b/CMakeLists.txt	2025-10-23 07:14:58.069499300 +0100
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 2.6...3.10)
+ 
+ include(GNUInstallDirs)
+ include(CheckCCompilerFlag)
diff --git a/pkgs/by-name/ms/msgpack-tools/package.nix b/pkgs/by-name/ms/msgpack-tools/package.nix
index e62af58ae1c1..610b356ebd88 100644
--- a/pkgs/by-name/ms/msgpack-tools/package.nix
+++ b/pkgs/by-name/ms/msgpack-tools/package.nix
@@ -1,51 +1,62 @@
 {
   lib,
   stdenv,
-  fetchurl,
   fetchFromGitHub,
+  fetchurl,
   cmake,
+  rapidjson,
+  replaceVars,
+  libb64,
+  versionCheckHook,
 }:
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "msgpack-tools";
   version = "0.6";
 
   src = fetchFromGitHub {
     owner = "ludocode";
     repo = "msgpack-tools";
-    rev = "v${version}";
-    sha256 = "1ygjk25zlpqjckxgqmahnz999704zy2bd9id6hp5jych1szkjgs5";
-  };
-
-  libb64 = fetchurl {
-    url = "mirror://sourceforge/libb64/libb64-1.2.1.zip";
-    sha256 = "1chlcc8qggzxnbpy5wrda533xyz38dk20w9wl4srrzawm45ny410";
-  };
-
-  rapidjson = fetchurl {
-    url = "https://github.com/miloyip/rapidjson/archive/99ba17bd66a85ec64a2f322b68c2b9c3b77a4391.tar.gz";
-    sha256 = "0jxgyy5n0lf9w36dycwwgz2wici4z9dnxlsn0z6m23zaa47g3wyw";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-RT85vw6QeVkuNC2mtoT/BJyU0rdQVfz6ZBJf+ouY8vk=";
   };
 
   mpack = fetchurl {
     url = "https://github.com/ludocode/mpack/archive/df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz";
-    sha256 = "1br8g3rf86h8z8wbqkd50aq40953862lgn0xk7cy68m07fhqc3pg";
+    hash = "sha256-hyiXygbAHnNgF4TIg+DemBvtdBnSgJ7fAhknVuL+T/c=";
   };
 
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  buildInputs = [
+    rapidjson
+    libb64
+  ];
+
+  patches = [
+    ./cmake-v4.patch
+    (replaceVars ./use-nix-deps.patch {
+      rapidjson = "${rapidjson}";
+      libb64 = "${libb64}";
+    })
+  ];
+
   postUnpack = ''
     mkdir $sourceRoot/contrib
-    cp ${rapidjson} $sourceRoot/contrib/rapidjson-99ba17bd66a85ec64a2f322b68c2b9c3b77a4391.tar.gz
-    cp ${libb64} $sourceRoot/contrib/libb64-1.2.1.zip
-    cp ${mpack} $sourceRoot/contrib/mpack-df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz
+    cp ${finalAttrs.mpack} $sourceRoot/contrib/mpack-df17e83f0fa8571b9cd0d8ccf38144fa90e244d1.tar.gz
   '';
 
-  nativeBuildInputs = [ cmake ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/json2msgpack";
+  versionCheckProgramArg = "-v";
+  doInstallCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Command-line tools for converting between MessagePack and JSON";
     homepage = "https://github.com/ludocode/msgpack-tools";
-    license = licenses.mit;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = [ ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ deejayem ];
   };
-}
+})
diff --git a/pkgs/by-name/ms/msgpack-tools/use-nix-deps.patch b/pkgs/by-name/ms/msgpack-tools/use-nix-deps.patch
new file mode 100644
index 000000000000..e9ea671cddd6
--- /dev/null
+++ b/pkgs/by-name/ms/msgpack-tools/use-nix-deps.patch
@@ -0,0 +1,67 @@
+--- a/CMakeLists.txt	2017-01-22 19:51:41.000000000 +0000
++++ b/CMakeLists.txt	2025-10-04 14:08:24.934041902 +0100
+@@ -83,57 +83,21 @@
+ 
+ # rapidjson
+ 
+-set(RAPIDJSON_FILE "rapidjson-${RAPIDJSON_COMMIT}.tar.gz")
+-set(RAPIDJSON_DIR "${CONTRIB_DIR}/rapidjson-${RAPIDJSON_COMMIT}")
+-set(RAPIDJSON_URL "https://github.com/miloyip/rapidjson/archive/${RAPIDJSON_COMMIT}.tar.gz")
+-
+-if(EXISTS "${CMAKE_SOURCE_DIR}/contrib/${RAPIDJSON_FILE}")
+-    message(STATUS "Found package: ${RAPIDJSON_FILE}")
+-else()
+-    message(STATUS "Downloading: ${RAPIDJSON_FILE}")
+-    file(DOWNLOAD ${RAPIDJSON_URL} "${CMAKE_SOURCE_DIR}/contrib/${RAPIDJSON_FILE}")
+-    if(NOT EXISTS "${CMAKE_SOURCE_DIR}/contrib/${RAPIDJSON_FILE}")
+-        message(FATAL_ERROR "\nFailed to download source file: ${RAPIDJSON_FILE}\nFrom: ${RAPIDJSON_URL}")
+-    endif()
+-endif()
+-
+-execute_process(COMMAND ${CMAKE_COMMAND} -E tar xzf ${CMAKE_SOURCE_DIR}/contrib/${RAPIDJSON_FILE} WORKING_DIRECTORY ${CONTRIB_DIR})
+-
+-include_directories(SYSTEM ${RAPIDJSON_DIR}/include)
++include_directories(SYSTEM @rapidjson@/include)
+ 
+ 
+ # libb64
+ 
+-set(LIBB64_FILE "libb64-${LIBB64_VERSION}.zip")
+-set(LIBB64_DIR "${CONTRIB_DIR}/libb64-${LIBB64_VERSION}")
+-set(LIBB64_URL "http://downloads.sourceforge.net/project/libb64/libb64/libb64/${LIBB64_FILE}?use_mirror=autoselect")
+-
+-if(EXISTS "${CMAKE_SOURCE_DIR}/contrib/${LIBB64_FILE}")
+-    message(STATUS "Found package: ${LIBB64_FILE}")
+-else()
+-    message(STATUS "Downloading: ${LIBB64_FILE}")
+-    file(DOWNLOAD ${LIBB64_URL} "${CMAKE_SOURCE_DIR}/contrib/${LIBB64_FILE}")
+-    if(NOT EXISTS "${CMAKE_SOURCE_DIR}/contrib/${LIBB64_FILE}")
+-        message(FATAL_ERROR "\nFailed to download source file: ${LIBB64_FILE}\nFrom: ${LIBB64_URL}")
+-    endif()
+-endif()
+-
+-execute_process(COMMAND ${CMAKE_COMMAND} -E tar xf "${CMAKE_SOURCE_DIR}/contrib/${LIBB64_FILE}" WORKING_DIRECTORY "${CONTRIB_DIR}")
+-
+-# Remove libb64's newlines
+-set(LIBB64_CENCODE_FILE ${LIBB64_DIR}/src/cencode.c)
+-file(READ ${LIBB64_CENCODE_FILE} LIBB64_CENCODE)
+-string(REPLACE "*codechar++ = '\\n';" "/* *codechar++ = '\\n'; */" LIBB64_CENCODE "${LIBB64_CENCODE}")
+-file(WRITE ${LIBB64_CENCODE_FILE} "${LIBB64_CENCODE}")
+-
+-file(GLOB_RECURSE LIBB64_SRCS ${LIBB64_DIR}/src/*.c)
+-include_directories(SYSTEM ${LIBB64_DIR}/include)
++include_directories(SYSTEM @libb64@/include)
+ 
+ 
+ # executable targets
+ 
+-add_executable(msgpack2json src/msgpack2json.cpp ${MPACK_SRCS} ${LIBB64_SRCS})
+-add_executable(json2msgpack src/json2msgpack.cpp ${MPACK_SRCS} ${LIBB64_SRCS})
++add_executable(msgpack2json src/msgpack2json.cpp ${MPACK_SRCS})
++add_executable(json2msgpack src/json2msgpack.cpp ${MPACK_SRCS})
++
++target_link_libraries(msgpack2json b64)
++target_link_libraries(json2msgpack b64)
+ 
+ install(TARGETS msgpack2json json2msgpack DESTINATION bin)
+ 

From 8b87a0cff195c3903df37eacfb3a737126210247 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 07:27:05 +0000
Subject: [PATCH 1924/6226] python3Packages.disposable-email-domains: 0.0.140
 -> 0.0.143

---
 .../python-modules/disposable-email-domains/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix
index a991f326bd7f..267bad65f450 100644
--- a/pkgs/development/python-modules/disposable-email-domains/default.nix
+++ b/pkgs/development/python-modules/disposable-email-domains/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "disposable-email-domains";
-  version = "0.0.140";
+  version = "0.0.143";
   pyproject = true;
 
   # No tags on GitHub
   src = fetchPypi {
     pname = "disposable_email_domains";
     inherit version;
-    hash = "sha256-7BLx7zXb3JsdX8ty9wEfO4CW5zOxIrTyYW2C8k4ZkLg=";
+    hash = "sha256-AOQbmUHx6nQYnKzOlPSh+r/Fzn2r2CtsTGYswnJI05E=";
   };
 
   build-system = [

From febb9368d3435025b39b9667de9817dc80cce9ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 04:09:57 +0000
Subject: [PATCH 1925/6226] cargo-tauri: 2.8.4 -> 2.9.1

---
 pkgs/by-name/ca/cargo-tauri/package.nix  | 6 +++---
 pkgs/by-name/ca/cargo-tauri/test-app.nix | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix
index dedff8b05ab8..119d6352fdfa 100644
--- a/pkgs/by-name/ca/cargo-tauri/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tauri";
-  version = "2.8.4";
+  version = "2.9.1";
 
   src = fetchFromGitHub {
     owner = "tauri-apps";
     repo = "tauri";
     tag = "tauri-cli-v${finalAttrs.version}";
-    hash = "sha256-fp/ODsbZTQdMkkRu9QqTQfavq0RPfSzZm1l4sE1hacc=";
+    hash = "sha256-MOhcTG8r7kDVTg5PY1rmrkd8U94CqT7RdPSfaakqf2M=";
   };
 
-  cargoHash = "sha256-l1IF9R+KeXAjs8Dy59mZNOCX0eoskotBPbltKU3nHQ8=";
+  cargoHash = "sha256-lWBCMS7xFEqXPpMpBzfZmdwQOq8Yaux83FGFaRyaBNg=";
 
   nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [
     pkg-config
diff --git a/pkgs/by-name/ca/cargo-tauri/test-app.nix b/pkgs/by-name/ca/cargo-tauri/test-app.nix
index fd5f5f359972..ae91d53e172f 100644
--- a/pkgs/by-name/ca/cargo-tauri/test-app.nix
+++ b/pkgs/by-name/ca/cargo-tauri/test-app.nix
@@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
       ;
 
     fetcherVersion = 1;
-    hash = "sha256-7F2vk6WUeXunTuXX9J0rVhl2I0ENYagRdqTy+WAXBB8=";
+    hash = "sha256-gHniZv847JFrmKnTUZcgyWhFl/ovJ5IfKbbM5I21tZc=";
   };
 
   nativeBuildInputs = [

From 35bb67f856f0b9c7428263eef0eb5ee4c52298cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 07:50:49 +0000
Subject: [PATCH 1926/6226] python3Packages.django-tinymce: 4.1.0 -> 5.0.0

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

diff --git a/pkgs/development/python-modules/django-tinymce/default.nix b/pkgs/development/python-modules/django-tinymce/default.nix
index a0eb660c1da9..39e7aff4b43d 100644
--- a/pkgs/development/python-modules/django-tinymce/default.nix
+++ b/pkgs/development/python-modules/django-tinymce/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "django-tinymce";
-  version = "4.1.0";
+  version = "5.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "django_tinymce";
-    hash = "sha256-AuO3DpQP0pnw++9DFa7lwYVmTh64zTlrF2ljlU5DV8k=";
+    hash = "sha256-YldmntWWrM9fqWf/MGEnayxTUrqsG7xlj82CUrEso4o=";
   };
 
   build-system = [ setuptools ];

From e4629f0dda7444225d85cd95df47732429c19414 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Thu, 23 Oct 2025 09:52:20 +0200
Subject: [PATCH 1927/6226] nixos/nextcloud: Fix fetchNextcloudApp example

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

diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix
index 9ebc3c240416..dca73f6bc6bd 100644
--- a/nixos/modules/services/web-apps/nextcloud.nix
+++ b/nixos/modules/services/web-apps/nextcloud.nix
@@ -402,11 +402,11 @@ in
         {
           inherit (pkgs.nextcloud31Packages.apps) mail calendar contacts;
           phonetrack = pkgs.fetchNextcloudApp {
-            name = "phonetrack";
+            appName = "phonetrack";
+            appVersion = "0.8.2";
             license = "agpl3Plus";
             sha512 = "f67902d1b48def9a244383a39d7bec95bb4215054963a9751f99dae9bd2f2740c02d2ef97b3b76d69a36fa95f8a9374dd049440b195f4dad2f0c4bca645de228";
             url = "https://github.com/julien-nc/phonetrack/releases/download/v0.8.2/phonetrack-0.8.2.tar.gz";
-            version = "0.8.2";
           };
         }
       '';

From 93bacc97666e1601e9758d96080b4893b15b9fe4 Mon Sep 17 00:00:00 2001
From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com>
Date: Thu, 23 Oct 2025 10:05:20 +0200
Subject: [PATCH 1928/6226] pcloud: 1.14.16 -> 1.14.17

Changelog: https://www.pcloud.com/release-notes/linux.html

- 1.14.17 (22/10/2025)
  - Fixed high CPU usage when using VPN.
---
 pkgs/by-name/pc/pcloud/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix
index 8569087b9db8..12dcb5eb4d2f 100644
--- a/pkgs/by-name/pc/pcloud/package.nix
+++ b/pkgs/by-name/pc/pcloud/package.nix
@@ -39,13 +39,13 @@
 
 let
   pname = "pcloud";
-  version = "1.14.16";
-  code = "XZbJvD5ZfXtwygX5xg7F9ywtRup5H5sBvfhy";
+  version = "1.14.17";
+  code = "XZNtR95ZctUIq8zYVD7eSKotwGMx7kDWVtzV";
 
   # Archive link's codes: https://www.pcloud.com/release-notes/linux.html
   src = fetchzip {
     url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip";
-    hash = "sha256-6K7QPr3MtZvRZt84N8+i8QZBaKHHeTY1bXMdO+wUCr0=";
+    hash = "sha256-Chh8obZHntkiG7IJAW96T9y3KcOwzI18/VALheLcxBA=";
   };
 
   appimageContents = appimageTools.extractType2 {

From 207f23bf08f0c30c0f30ae9054c2a6014b08d2aa Mon Sep 17 00:00:00 2001
From: Zhaith Izaliel <zhaith.izaliel@ethereal-edelweiss.cloud>
Date: Wed, 22 Oct 2025 22:33:42 +0200
Subject: [PATCH 1929/6226] nixos/iio-niri: init module

---
 .../manual/release-notes/rl-2111.section.md   |  2 +
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/programs/iio-niri.nix           | 59 +++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 nixos/modules/programs/iio-niri.nix

diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index bf39afd98627..40a1a37483d7 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -166,6 +166,8 @@ In addition to numerous new and upgraded packages, this release has the followin
 
 - [twingate](https://docs.twingate.com/docs/linux), a high performance, easy to use zero trust solution that enables access to private resources from any device with better security than a VPN.
 
+- [iio-niri](https://github.com/Zhaith-Izaliel/iio-niri), a utils that listens to `iio-sensor-proxy` and updates Niri output orientation depending on the accelerometer orientation.
+
 ## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
 
 - The NixOS VM test framework, `pkgs.nixosTest`/`make-test-python.nix` (`pkgs.testers.nixosTest` since 22.05), now requires detaching commands such as `succeed("foo &")` and `succeed("foo | xclip -i")` to close stdout.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2b98c1cc23e1..0fb8a9220d75 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -240,6 +240,7 @@
   ./programs/iay.nix
   ./programs/iftop.nix
   ./programs/iio-hyprland.nix
+  ./programs/iio-niri.nix
   ./programs/immersed.nix
   ./programs/iotop.nix
   ./programs/java.nix
diff --git a/nixos/modules/programs/iio-niri.nix b/nixos/modules/programs/iio-niri.nix
new file mode 100644
index 000000000000..2c2810b0ee0f
--- /dev/null
+++ b/nixos/modules/programs/iio-niri.nix
@@ -0,0 +1,59 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib)
+    mkEnableOption
+    mkPackageOption
+    mkOption
+    types
+    mkIf
+    getExe
+    escapeShellArgs
+    mkDefault
+    ;
+  cfg = config.services.iio-niri;
+in
+{
+  options.services.iio-niri = {
+    enable = mkEnableOption "IIO-Niri";
+
+    package = mkPackageOption pkgs "iio-niri" { };
+
+    niriUnit = mkOption {
+      type = types.nonEmptyStr;
+      default = "niri.service";
+      description = "The Niri **user** service unit to bind IIO-Niri's **user** service unit to.";
+    };
+
+    extraArgs = mkOption {
+      type = types.listOf types.str;
+      default = [ ];
+      description = "Extra arguments to pass to IIO-Niri.";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    hardware.sensor.iio.enable = mkDefault true;
+
+    environment.systemPackages = [ cfg.package ];
+
+    systemd.user.services.iio-niri = {
+      description = "IIO-Niri";
+      wantedBy = [ cfg.niriUnit ];
+      bindsTo = [ cfg.niriUnit ];
+      partOf = [ cfg.niriUnit ];
+      after = [ cfg.niriUnit ];
+      serviceConfig = {
+        Type = "simple";
+        ExecStart = "${getExe cfg.package} ${escapeShellArgs cfg.extraArgs}";
+        Restart = "on-failure";
+      };
+    };
+  };
+
+  meta.maintainers = with lib.maintainers; [ zhaithizaliel ];
+}

From 40258dce629e59ca4c1fb8cb20aa6690546ab5ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 08:12:08 +0000
Subject: [PATCH 1930/6226] rancher: 2.12.2 -> 2.12.3

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

diff --git a/pkgs/by-name/ra/rancher/package.nix b/pkgs/by-name/ra/rancher/package.nix
index eacae104cd63..df7c7b9e62d5 100644
--- a/pkgs/by-name/ra/rancher/package.nix
+++ b/pkgs/by-name/ra/rancher/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "rancher";
-  version = "2.12.2";
+  version = "2.12.3";
 
   src = fetchFromGitHub {
     owner = "rancher";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-KVJfeCv+rMPGvKknov1LQX/ndI182p8p+ze2522xb7U=";
+    hash = "sha256-i+l+vs+uD6h0GruvxhkQtb7DYCJ3uysa/rZ8hGmmu7Y=";
   };
 
   env.CGO_ENABLED = 0;
@@ -25,7 +25,7 @@ buildGoModule rec {
     "-static"
   ];
 
-  vendorHash = "sha256-guxr/co4IJoX+mSBPFqdjo8C/QnRIXcd/RztNdnfVQM=";
+  vendorHash = "sha256-mObfou6JXQ+ZWvxWMpdcC1ymngFJZ8k9I+rCYCFvDg4=";
 
   postInstall = ''
     mv $out/bin/cli $out/bin/rancher

From 18ca25e57785081d17b12b7ace48353478b3a6de Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 5 Oct 2025 09:49:22 +0200
Subject: [PATCH 1931/6226] chow-kick: remove unneeded dependencies
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

see: Tracking issue: Remove long end-of-life GTK 2 #410814
---
 pkgs/by-name/ch/chow-kick/package.nix | 42 +++------------------------
 1 file changed, 4 insertions(+), 38 deletions(-)

diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix
index cbb4ecce74be..b65941f8d089 100644
--- a/pkgs/by-name/ch/chow-kick/package.nix
+++ b/pkgs/by-name/ch/chow-kick/package.nix
@@ -1,38 +1,21 @@
 {
   alsa-lib,
-  at-spi2-core,
-  brotli,
   cmake,
   curl,
-  dbus,
   libepoxy,
   fetchFromGitHub,
-  libglut,
   freetype,
-  gtk2-x11,
   lib,
   libGL,
   libXcursor,
-  libXdmcp,
   libXext,
   libXinerama,
   libXrandr,
-  libXtst,
-  libdatrie,
   libjack2,
-  libpsl,
-  libselinux,
-  libsepol,
-  libsysprof-capture,
-  libthai,
   libxkbcommon,
   lv2,
-  pcre,
   pkg-config,
-  python3,
-  sqlite,
   stdenv,
-  util-linuxMinimal,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -53,34 +36,17 @@ stdenv.mkDerivation (finalAttrs: {
   ];
   buildInputs = [
     alsa-lib
-    at-spi2-core
-    brotli
     curl
-    dbus
     libepoxy
-    libglut
     freetype
-    gtk2-x11
     libGL
     libXcursor
-    libXdmcp
     libXext
     libXinerama
     libXrandr
-    libXtst
-    libdatrie
     libjack2
-    libpsl
-    libselinux
-    libsepol
-    libsysprof-capture
-    libthai
     libxkbcommon
     lv2
-    pcre
-    python3
-    sqlite
-    util-linuxMinimal
   ];
 
   cmakeFlags = [
@@ -101,12 +67,12 @@ stdenv.mkDerivation (finalAttrs: {
     cp ChowKick_artefacts/Release/Standalone/ChowKick  $out/bin
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/Chowdhury-DSP/ChowKick";
     description = "Kick synthesizer based on old-school drum machine circuits";
-    license = with licenses; [ bsd3 ];
-    maintainers = with maintainers; [ magnetophon ];
-    platforms = platforms.linux;
+    license = [ lib.licenses.bsd3 ];
+    maintainers = [ lib.maintainers.magnetophon ];
+    platforms = lib.platforms.linux;
     mainProgram = "ChowKick";
   };
 })

From 592249e4960661d15f392615c7122a3fff228317 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 08:20:01 +0000
Subject: [PATCH 1932/6226] urn-timer: 0-unstable-2025-08-07 ->
 0-unstable-2025-10-18

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

diff --git a/pkgs/by-name/ur/urn-timer/package.nix b/pkgs/by-name/ur/urn-timer/package.nix
index c56e8686fa98..f8e23e4da99a 100644
--- a/pkgs/by-name/ur/urn-timer/package.nix
+++ b/pkgs/by-name/ur/urn-timer/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation {
   pname = "urn-timer";
-  version = "0-unstable-2025-08-07";
+  version = "0-unstable-2025-10-18";
 
   src = fetchFromGitHub {
     owner = "paoloose";
     repo = "urn";
-    rev = "7acdab69eaec05f173d95eff190e5d7a03db8847";
-    hash = "sha256-jFatHlkQr6O9E2pKroFWk6F2BccnfSr1pq43Q5qQbC4=";
+    rev = "cae0763f7d5c0d895faf6d2ab7448d1b05b60dff";
+    hash = "sha256-jG+Xibdsu53/aycUf/TzsQtegGY/buwswJ9ediZIJ4w=";
   };
 
   nativeBuildInputs = [

From ce9d71d3e051ee7a53a9f6ae9101d3516801b0aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 08:21:19 +0000
Subject: [PATCH 1933/6226] searxng: 0-unstable-2025-10-17 ->
 0-unstable-2025-10-23

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

diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix
index 0a3d216255e5..745c3b3b087e 100644
--- a/pkgs/by-name/se/searxng/package.nix
+++ b/pkgs/by-name/se/searxng/package.nix
@@ -13,14 +13,14 @@ in
 python.pkgs.toPythonModule (
   python.pkgs.buildPythonApplication rec {
     pname = "searxng";
-    version = "0-unstable-2025-10-17";
+    version = "0-unstable-2025-10-23";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "searxng";
       repo = "searxng";
-      rev = "57622793bf80b90a651a566178ae139f64ea5d93";
-      hash = "sha256-LKv/WS8aAgD8s1T7aHeHrkDMVy/E5FiuJEoM+80KLb4=";
+      rev = "e363db970c77e9cab8f3611bb6b6f8a59646a035";
+      hash = "sha256-phJRQ+euSTEmsn1wS5dgO8UPwAJ8cr8ov3K3fSzWQVA=";
     };
 
     nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ];

From 7f1ae93e959616517de7aca3429375608c143566 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Thu, 23 Oct 2025 05:29:34 -0300
Subject: [PATCH 1934/6226] cosmic-ext-applet-caffeine: update license to
 GPL-2.0-only

---
 pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix b/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix
index c5901df0f842..f9f5f1eb28fa 100644
--- a/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix
+++ b/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage {
   meta = {
     description = "Caffeine Applet for the COSMIC desktop";
     homepage = "https://github.com/tropicbliss/cosmic-ext-applet-caffeine";
-    license = lib.licenses.mit;
+    license = lib.licenses.gpl2Only;
     mainProgram = "cosmic-ext-applet-caffeine";
     maintainers = [ lib.maintainers.HeitorAugustoLN ];
     platforms = lib.platforms.linux;

From 24695fc4d3dce86db5d0688d35c06d23a1449296 Mon Sep 17 00:00:00 2001
From: ccicnce113424 <ccicnce113424@gmail.com>
Date: Thu, 23 Oct 2025 16:56:50 +0800
Subject: [PATCH 1935/6226] cantata: fix build with qt 6.10

---
 pkgs/by-name/ca/cantata/package.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/by-name/ca/cantata/package.nix b/pkgs/by-name/ca/cantata/package.nix
index 52305fa26472..35482d168b9d 100644
--- a/pkgs/by-name/ca/cantata/package.nix
+++ b/pkgs/by-name/ca/cantata/package.nix
@@ -6,6 +6,7 @@
   pkg-config,
   qt6,
   perl,
+  fetchpatch2,
 
   # Cantata doesn't build with cdparanoia enabled so we disable that
   # default for now until I (or someone else) figure it out.
@@ -176,6 +177,18 @@ stdenv.mkDerivation (finalAttrs: {
     # patchShebangs the playlists scripts, making that unnecessary (perl will
     # always be available because it's a dependency)
     ./dont-check-for-perl-in-PATH.diff
+
+    # remove following patches in next release
+    (fetchpatch2 {
+      name = "fix-build-with-qt-610-qfile-open.patch";
+      url = "https://github.com/nullobsi/cantata/pull/89.patch";
+      hash = "sha256-c7hdecX2oo9jTlLc6zd7LVjgZj4w89zN+eEw7ol/hmI=";
+    })
+    (fetchpatch2 {
+      name = "fix-build-with-qt-610-invalidateFilter-deprecated.patch";
+      url = "https://github.com/nullobsi/cantata/pull/90.patch";
+      hash = "sha256-dMxbC/p5mD/TQZEXORbvNON7Zzbvq0khaIR89lU5cO4=";
+    })
   ];
 
   postPatch = ''

From 428deb18ab93507bf685ab4a07788afc83103c94 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Wed, 22 Oct 2025 13:38:17 +0200
Subject: [PATCH 1936/6226] bat-extras: minor improvements

---
 pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix     | 12 +++++++-----
 .../bat-extras/patches/disable-theme-tests.patch     |  8 ++++----
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix b/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
index 7c7d36d397d0..34a526ff9e26 100644
--- a/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
+++ b/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
@@ -12,6 +12,7 @@
 }:
 let
   cleanArgs = lib.flip removeAttrs [
+    "name"
     "dependencies"
     "meta"
   ];
@@ -26,6 +27,7 @@ stdenv.mkDerivation (
   finalAttrs:
   cleanArgs args
   // {
+    pname = name;
     inherit (core) version;
 
     src = core;
@@ -35,14 +37,14 @@ stdenv.mkDerivation (
     buildInputs = dependencies;
 
     # Patch shebangs now because our tests rely on them
-    postPatch = ''
+    postPatch = (args.postPatch or "") + ''
       patchShebangs --host bin/${name}
     '';
 
     dontConfigure = true;
-    dontBuild = true; # we've already built
+    dontBuild = true; # we've already built it
 
-    doCheck = true;
+    doCheck = args.doCheck or true;
     nativeCheckInputs = [
       bat
       bash
@@ -52,7 +54,7 @@ stdenv.mkDerivation (
     ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]);
     checkPhase = ''
       runHook preCheck
-      bash ./test.sh --compiled --suite ${name}
+      bash ./test.sh --compiled --suite ${name} --verbose --snapshot:show
       runHook postCheck
     '';
 
@@ -69,7 +71,7 @@ stdenv.mkDerivation (
       runHook postInstall
     '';
 
-    # We already patched
+    # We have already patched
     dontPatchShebangs = true;
 
     meta = core.meta // { mainProgram = name; } // meta;
diff --git a/pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch b/pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch
index 695d350a2a30..31aad00c3028 100644
--- a/pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch
+++ b/pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch
@@ -7,7 +7,7 @@ diff --git a/test/suite/batpipe.sh b/test/suite/batpipe.sh
  test:batpipe_term_width() {
  	description "Test support for BATPIPE_TERM_WIDTH"
  	snapshot STDOUT
-+	skip "bat-extras does not support `--theme` flag"
++	skip "bat-extras does not support '--theme' flag"
 
  	export BATPIPE=color
  	export BATPIPE_DEBUG_PARENT_EXECUTABLE=less
@@ -20,7 +20,7 @@ diff --git a/test/suite/batgrep.sh b/test/suite/batgrep.sh
  	description "Snapshot test for colored output."
  	snapshot stdout
  	snapshot stderr
-+	skip "bat-extras does not support `--theme` flag"
++	skip "bat-extras does not support '--theme' flag"
 
  	require_rg
 
@@ -28,7 +28,7 @@ diff --git a/test/suite/batgrep.sh b/test/suite/batgrep.sh
  	description "Should respect the BAT_STYLE variable."
  	snapshot stdout
  	snapshot stderr
-+	skip "bat-extras does not support `--theme` flag"
++	skip "bat-extras does not support '--theme' flag"
 
  	require_rg
 
@@ -36,7 +36,7 @@ diff --git a/test/suite/batgrep.sh b/test/suite/batgrep.sh
  	description "Snapshot test for output without separator"
  	snapshot stdout
  	snapshot stderr
-+	skip "bat-extras does not support `--theme` flag"
++	skip "bat-extras does not support '--theme' flag"
 
  	require_rg
 

From a996e5339e424e82b3d8be745d26a442a8b46934 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Wed, 22 Oct 2025 13:39:52 +0200
Subject: [PATCH 1937/6226] bat-extras: 2024.08.24 ->
 2024.08.24-unstable-2025-02-22

---
 .../tools/misc/bat-extras/modules/batpipe.nix |  9 +++-
 pkgs/tools/misc/bat-extras/modules/core.nix   | 12 +++---
 .../patches/batpipe-skip-outdated-test.patch  | 12 ++++++
 .../patches/disable-theme-tests.patch         | 42 -------------------
 4 files changed, 25 insertions(+), 50 deletions(-)
 create mode 100644 pkgs/tools/misc/bat-extras/patches/batpipe-skip-outdated-test.patch
 delete mode 100644 pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch

diff --git a/pkgs/tools/misc/bat-extras/modules/batpipe.nix b/pkgs/tools/misc/bat-extras/modules/batpipe.nix
index 2740444bb26d..1f1a0352094f 100644
--- a/pkgs/tools/misc/bat-extras/modules/batpipe.nix
+++ b/pkgs/tools/misc/bat-extras/modules/batpipe.nix
@@ -1,9 +1,16 @@
 {
   buildBatExtrasPkg,
   less,
+  procps,
 }:
 buildBatExtrasPkg {
   name = "batpipe";
-  dependencies = [ less ];
+  dependencies = [
+    less
+    procps
+  ];
+  patches = [
+    ../patches/batpipe-skip-outdated-test.patch
+  ];
   meta.description = "Less (and soon bat) preprocessor for viewing more types of files in the terminal";
 }
diff --git a/pkgs/tools/misc/bat-extras/modules/core.nix b/pkgs/tools/misc/bat-extras/modules/core.nix
index b27f8be6e3e1..b7469055f903 100644
--- a/pkgs/tools/misc/bat-extras/modules/core.nix
+++ b/pkgs/tools/misc/bat-extras/modules/core.nix
@@ -9,15 +9,15 @@
   nix-update-script,
   zsh,
 }:
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "bat-extras";
-  version = "2024.08.24";
+  version = "2024.08.24-unstable-2025-02-22";
 
   src = fetchFromGitHub {
     owner = "eth-p";
     repo = "bat-extras";
-    tag = "v${version}";
-    hash = "sha256-xkND/w6UNC58dC8WrsifwjqU9ZI4yUUq+ZljkhhUNT8=";
+    rev = "3860f0f1481f1d0e117392030f55ef19cc018ee4";
+    hash = "sha256-9TEq/LzE1Pty1Z3WFWR/TaNNKPp2LGBr0jzGBkOEGQo=";
     fetchSubmodules = true;
   };
 
@@ -26,8 +26,6 @@ stdenv.mkDerivation rec {
 
   dontConfigure = true;
 
-  patches = [ ../patches/disable-theme-tests.patch ];
-
   postPatch = ''
     patchShebangs --build test.sh test/shimexec .test-framework/bin/best.sh
   '';
@@ -72,7 +70,7 @@ stdenv.mkDerivation rec {
   # The per-script derivations will go ahead and patch the files they actually install.
   dontPatchShebangs = true;
 
-  passthru.updateScript = nix-update-script { };
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
   meta = {
     description = "Bash scripts that integrate bat with various command line tools";
diff --git a/pkgs/tools/misc/bat-extras/patches/batpipe-skip-outdated-test.patch b/pkgs/tools/misc/bat-extras/patches/batpipe-skip-outdated-test.patch
new file mode 100644
index 000000000000..6ca368863d6c
--- /dev/null
+++ b/pkgs/tools/misc/bat-extras/patches/batpipe-skip-outdated-test.patch
@@ -0,0 +1,12 @@
+diff --git a/test/suite/batpipe.sh b/test/suite/batpipe.sh
+index e834f6e..2d9354d 100644
+--- a/test/suite/batpipe.sh
++++ b/test/suite/batpipe.sh
+@@ -51,6 +51,7 @@ test:viewer_gzip() {
+ 
+ test:batpipe_term_width() {
+ 	description "Test support for BATPIPE_TERM_WIDTH"
++	skip "Fails on a newer version of bat"
+ 	snapshot STDOUT
+ 
+ 	export BATPIPE=color
diff --git a/pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch b/pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch
deleted file mode 100644
index 31aad00c3028..000000000000
--- a/pkgs/tools/misc/bat-extras/patches/disable-theme-tests.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Subject: [PATCH] skip tests depending on color theme
-===================================================================
-diff --git a/test/suite/batpipe.sh b/test/suite/batpipe.sh
---- a/test/suite/batpipe.sh	(revision 36c77c171cc71b2ff3ec4cb781aa16ca3ad258b1)
-+++ b/test/suite/batpipe.sh	(date 1736621098865)
-@@ -29,6 +29,7 @@
- test:batpipe_term_width() {
- 	description "Test support for BATPIPE_TERM_WIDTH"
- 	snapshot STDOUT
-+	skip "bat-extras does not support '--theme' flag"
-
- 	export BATPIPE=color
- 	export BATPIPE_DEBUG_PARENT_EXECUTABLE=less
-Index: test/suite/batgrep.sh
-===================================================================
-diff --git a/test/suite/batgrep.sh b/test/suite/batgrep.sh
---- a/test/suite/batgrep.sh	(revision 36c77c171cc71b2ff3ec4cb781aa16ca3ad258b1)
-+++ b/test/suite/batgrep.sh	(date 1736621086239)
-@@ -58,6 +58,7 @@
- 	description "Snapshot test for colored output."
- 	snapshot stdout
- 	snapshot stderr
-+	skip "bat-extras does not support '--theme' flag"
-
- 	require_rg
-
-@@ -118,6 +119,7 @@
- 	description "Should respect the BAT_STYLE variable."
- 	snapshot stdout
- 	snapshot stderr
-+	skip "bat-extras does not support '--theme' flag"
-
- 	require_rg
-
-@@ -128,6 +130,7 @@
- 	description "Snapshot test for output without separator"
- 	snapshot stdout
- 	snapshot stderr
-+	skip "bat-extras does not support '--theme' flag"
-
- 	require_rg
-

From 80edfe6d33b064087549928e0910f2e640106026 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Thu, 23 Oct 2025 12:10:14 +0300
Subject: [PATCH 1938/6226] twemoji-color-font: use fetchzip and replace
 `sha256` attr with `hash`

---
 pkgs/by-name/tw/twemoji-color-font/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tw/twemoji-color-font/package.nix b/pkgs/by-name/tw/twemoji-color-font/package.nix
index d55af5b4b6e9..de84e1d07c88 100644
--- a/pkgs/by-name/tw/twemoji-color-font/package.nix
+++ b/pkgs/by-name/tw/twemoji-color-font/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchzip,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -10,9 +10,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   # We fetch the prebuilt font because building it takes 1.5 hours on hydra.
   # Relevant issue: https://github.com/NixOS/nixpkgs/issues/97871
-  src = fetchurl {
+  src = fetchzip {
     url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${finalAttrs.version}/TwitterColorEmoji-SVGinOT-Linux-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-yKUwLuTkwhiM54Xt2ExQxhagf26Z/huRrsuk4ds0EpU=";
+    hash = "sha256-Xy6Lkm340ldm9ssQWn/eRFIJ5kyhYaXPNy/Y/9vUt40=";
   };
 
   dontBuild = true;

From 1b60052baee28c92a5079e4bd060dca33d6cf017 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Thu, 23 Oct 2025 12:12:44 +0300
Subject: [PATCH 1939/6226] twemoji-color-font: improve phases

- `dontBuild` is redundant, there's no Makefile in the source
- run pre- and postInstall hooks
---
 pkgs/by-name/tw/twemoji-color-font/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tw/twemoji-color-font/package.nix b/pkgs/by-name/tw/twemoji-color-font/package.nix
index de84e1d07c88..c4d9048f3ec5 100644
--- a/pkgs/by-name/tw/twemoji-color-font/package.nix
+++ b/pkgs/by-name/tw/twemoji-color-font/package.nix
@@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Xy6Lkm340ldm9ssQWn/eRFIJ5kyhYaXPNy/Y/9vUt40=";
   };
 
-  dontBuild = true;
-
   installPhase = ''
+    runHook preInstall
     install -Dm755 TwitterColorEmoji-SVGinOT.ttf $out/share/fonts/truetype/TwitterColorEmoji-SVGinOT.ttf
     install -Dm644 fontconfig/46-twemoji-color.conf $out/etc/fonts/conf.d/46-twemoji-color.conf
+    runHook postInstall
   '';
 
   meta = with lib; {

From 4234ac2686733c0a93a31b9469e18354ee3b4cf0 Mon Sep 17 00:00:00 2001
From: Angelo Delefortrie <angelo.delefortrie@gmail.com>
Date: Thu, 23 Oct 2025 11:02:58 +0200
Subject: [PATCH 1940/6226] swagger-typescript-api: 13.2.8 -> 13.2.16

---
 .../missing-hashes.json                       | 136 +++++++++---------
 .../sw/swagger-typescript-api/package.nix     |   6 +-
 2 files changed, 73 insertions(+), 69 deletions(-)

diff --git a/pkgs/by-name/sw/swagger-typescript-api/missing-hashes.json b/pkgs/by-name/sw/swagger-typescript-api/missing-hashes.json
index 4600a0aeaff9..e69a0ea7abd4 100644
--- a/pkgs/by-name/sw/swagger-typescript-api/missing-hashes.json
+++ b/pkgs/by-name/sw/swagger-typescript-api/missing-hashes.json
@@ -1,68 +1,72 @@
 {
-  "@biomejs/cli-darwin-arm64@npm:2.1.4": "11ec854dec62d9ba34df3ce240a6baca6ff78d41d2bbcfed47741f3c13566007a93f60290eb043d6e4bc4b5f7997ebcbd843781d6cdadb74368bad788e7f8d86",
-  "@biomejs/cli-darwin-x64@npm:2.1.4": "e35434896cb45410cd2565d1c476526c6ac0421368d27624a84b12993ccb8afdd5b8b45eaec9b4fe92497a0718ecb6d0ff26de4d8d2647ac821906e8d77bdbea",
-  "@biomejs/cli-linux-arm64-musl@npm:2.1.4": "42f9e3ca494471875fd404c79d5fa19c01626aee48fde619861ebe695d40fd5ecca3a6d211eb165058ba2091e3e0df317e16e4c887794198291144de0d3742b3",
-  "@biomejs/cli-linux-arm64@npm:2.1.4": "49896343090353fdd1b5f1bdd109bcd2f93ce43a73d3d58bafbd58b5dfda2b1cde288adcd9d58603a9b34c2c83ba0471ee2bde06724b4388af940df9fb4ae4a0",
-  "@biomejs/cli-linux-x64-musl@npm:2.1.4": "11f30c976bd395e7cdaac88858055c06327bd20a4f7d499a799286c05c653d025ce2783b1ed741e07afb2757803dd324a8f217fc804d04859ab6f9650c050811",
-  "@biomejs/cli-linux-x64@npm:2.1.4": "3e9831d10f9113be37ecdd293a3fb54645e63edc3acae9d810a37e028ebe2061d71ba6e8589f6a2e41c31533fa011403366cadff7d1606765dd7363e1bf7cd14",
-  "@biomejs/cli-win32-arm64@npm:2.1.4": "44a1400a476e76c48d4522a723af594afb1c2d837b3bebcb084ce84fedd3cf58c7c848cff72c788ee7e428ff40954baefb54b754632cd41a3649e1dc5f027284",
-  "@biomejs/cli-win32-x64@npm:2.1.4": "2414e6b01d637739c851b08393a3298cfc6a6912037042f58ec63d789cdd6ccd2ad634d44613b09daa21ade9d880a0575d67486c0ed37668dab4746fb9ae519b",
-  "@esbuild/aix-ppc64@npm:0.25.8": "37fc14b17214c1f6bf41175029b62a43664a6a5a5b802614fe1d837bbf7abf5eaf2f6b735b6a446ebcfabb632e038c8ad9cccd87a259c45a1846689f8527874a",
-  "@esbuild/android-arm64@npm:0.25.8": "e367e989238292ccee72013511dde1aef2d2160d8d5d669a12272f693cf9a0970fac9d7835178b3c46ed6936a0c4b29d21d58ed11851a3697bf98b4320be4b74",
-  "@esbuild/android-arm@npm:0.25.8": "cbfa2c802d8931e5f4d06582f20573cb34774ab713b4712c37eb15bfab6f90b693878b661de2a3bb9c81eecf45b37e0ddf2e9c79ef4ff932bbc37da588c40183",
-  "@esbuild/android-x64@npm:0.25.8": "1d4b900dd2f43790415745d20ae6cadb53e9412911578aaf43462277169c22800eca1f49a9f8ce9c37236e1691279494f91967d28310720707911910ec765013",
-  "@esbuild/darwin-arm64@npm:0.25.8": "a8a50e303056e668e99370a88d1744de4a83e62e2f3f7fcf2ff611142346505229568b0ec5edda93ec96e33e842a585880a312790553202750f123d9636fa97d",
-  "@esbuild/darwin-x64@npm:0.25.8": "9806fe9d54f3228a01f535e7c51aea26bd1bab3c5d64d5f77f4606de44f361f049222776d32bfd262d45991b7aecca645ed576ea338edbf4f8044b22b3e331ad",
-  "@esbuild/freebsd-arm64@npm:0.25.8": "8e6cbdd45819390ecdb62a70a4f119a9269a90895f3e1237788b36a512248a756233ef59f55f9033658af372a196f0edc3567f078f1387e150238d2bd51f733b",
-  "@esbuild/freebsd-x64@npm:0.25.8": "3f920c686037f825859a2fe82104085f4b254b77821cc71a71db512ef0679dd01481c136c3f7057ba7250daff2458aa3ffd101cc28cb5fff2d55270ba5930ec8",
-  "@esbuild/linux-arm64@npm:0.25.8": "234edc9f815cdc74d21c6a90a3542c941deeaf3a24b408c74a4651616bd270383ba5a15eaef837ab347a374032c7028fc29e4f1da0becb33f0b8dd8f744934d7",
-  "@esbuild/linux-arm@npm:0.25.8": "dc6dc225ae278cb3383e11d9829d22f301e1b79f2ed4efde1a01896ae67e45efde98caa61f10cb425a809e9b61e9a4651b60d2b6a3e9ad6174519e8ce74bc02a",
-  "@esbuild/linux-ia32@npm:0.25.8": "1c780012035552e27adea34d11f959a3ddd4a4d576cddd03d320b1db18110e777c1adca2c6d10affd587a4454900d3ffcad9371956855e56739babdc2e4edcd3",
-  "@esbuild/linux-loong64@npm:0.25.8": "d3d39691d301d144c7d61f52163a2fe64caaf928f4117d906707dc1456f3d88d1a7a3b16fb988ccfc0b0bc203f4bcd56665a9c7405dc380b3165a26ab195b9ec",
-  "@esbuild/linux-mips64el@npm:0.25.8": "437e51b2be977cf7774114e04c141e3c0f1ceb7f12b961b7b3ac7f99c4e203afdd74c41e072ecdc4bab3cde4f14feedd78653727d1b2013ed3611bd89117ee8c",
-  "@esbuild/linux-ppc64@npm:0.25.8": "29d2e344b1c8b767518d25b23eb9e98d85deae1f2def2e01c1939536ac7d1fc9e92749a8d29b29277b3340d3613e4b0f96213c6aa2de7e06885a19d3d269870a",
-  "@esbuild/linux-riscv64@npm:0.25.8": "82b2ef7fd5a00b465da97bd797246269d7460ed710c0533517a1f8ad8e32527f405509b2ce27e29f8f3df1affa04e45cf5d1a71205f69dab5c1a27118cf10fb8",
-  "@esbuild/linux-s390x@npm:0.25.8": "74168a6e8927d12c883dba56006f5277f8888c7b1b5e4d132a3c235b8629c3015b4715968ba128a79ff55c9f08a23df84fe44047e8cda4366b9699c5c45f27a4",
-  "@esbuild/linux-x64@npm:0.25.8": "d531002ac2ead0bdb293ec1a4eceea687d37815e298196af2471107cdd4c1f76ef7d12417052b51852b80f66111abfb5ad8375c58b97da92306b975e9a8f0649",
-  "@esbuild/netbsd-arm64@npm:0.25.8": "55626924ae946a6225707062648aabb79c70d61e7e094b067338ea1adf72493b502e99e59440fe0d3abfe20eb36c33f78115815d63e72fa99f5e90146c2ee5d9",
-  "@esbuild/netbsd-x64@npm:0.25.8": "d03122aaa3e9a8bda686bc4120820805b5d9701099458a2c928ee1a292fabcc47df0cb178c8c428edb78a058e75cf7c0d80fa25b71fb91db43d73fe6e4062c41",
-  "@esbuild/openbsd-arm64@npm:0.25.8": "113ed8722788986b5b703c791bb9c954e80a861b92f453c66c79318d71cc6eac509c1dc79d20671b4af92165eee05a28eb7b3122537d8701447d30f58c428942",
-  "@esbuild/openbsd-x64@npm:0.25.8": "dfa68d80d68ae825de85aeccc118724ced6b232dcf25da6d862ba03abda2f55e75483dccbf8cb3a7338e7882a05e5425fcf5a902b7dced72c9f1a9c2650912bd",
-  "@esbuild/openharmony-arm64@npm:0.25.8": "8dab5710d93ad4a78a34a0016f6ea0bf2e16489845f9895ecaf354c1c3db209bed8f05a31309b95c358bfeaea53829605f4e315e9a53dae4d9fdb58e31ca4688",
-  "@esbuild/sunos-x64@npm:0.25.8": "ccc940bd687d1f6d320d2538ac594b7fe5e291e194380a8b392dd2348d738cf8d322f9f62bcea82b3809f98796a0a004cd02ba9c4d563e5e336665e1ec8e1e1d",
-  "@esbuild/win32-arm64@npm:0.25.8": "b0a9a86548d4a62e68b12a89e21aaadda3d6d3e96541a2714b74df370cc344e1a2d91604998a26951da28c2f932bd2ee033adc9346bb232622c3ac419107136a",
-  "@esbuild/win32-ia32@npm:0.25.8": "5880e933c8fb8dc1de1225128c171ea64f4b27fe52fc11ed9cfe6b0ca8ae091c2703d4cb629f08c06731810c46f48cf881516d0d54b3ac408dec34586ea84d27",
-  "@esbuild/win32-x64@npm:0.25.8": "9e98fe0e7eef7a0e774ab761c59d520ea1c997a7a6e4c7f9cbc967471a4a7ffb14bc27c60d2aa10796c4e945c3da2613fcc297054566fe3f5191e1250691d622",
-  "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.9-commit.d91dfb5": "a4636b96d36bfaccc655f9de258cef17daedd025463309657ed213b63b4226aeb6901eaa05d00d577e486bfb4d4ef99ee1457d8d7a8b5170afe07c86d2a5c18d",
-  "@rolldown/binding-darwin-x64@npm:1.0.0-beta.9-commit.d91dfb5": "a7b89d92f33ad9a718de70c56452dc481962e5396b32d66cbc08e588f45fa090ed6e3b7d8fc2ec641acf3de2a550b6d05416b14179ed4fcc8d336fdbd697d40b",
-  "@rolldown/binding-freebsd-x64@npm:1.0.0-beta.9-commit.d91dfb5": "7da382e43eeada73dec31bb63680432f129fa17efed7ed211da0c9915a89c9dfa2e8ec35aa7f07a4be99a36eb14df67059a375ac4bc5e6a5cdc16e02f7a9bd3c",
-  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.9-commit.d91dfb5": "cb5a7635fc2c39049c1fba8376d3b23f58240dbe2cbdc127d0dc8f2b8900537298bb8b52abde5b6e941cf22d8f69466433048db573c683947bf797f92f28baee",
-  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.9-commit.d91dfb5": "8ff267e66b1f59e9317d5b9d89e00a3e11172ae5b5cca17985e92cd52672ef59cd2d6292263700ff8edb02b53420865f655e6ed7f4b4ad8680e4ee0d99dcf5a7",
-  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.9-commit.d91dfb5": "7b320fbdc870cb7f2f75e89058ac50a675c05236df12739b98ce287ad07cce53474699bf19b729577c3de62d80c2fbd988cbbb8bc29e06c88fc42a8ece176b19",
-  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.9-commit.d91dfb5": "99679e1c7e290c7d747d6deb420357522fb0fab1fd022cf79f84534243af2eac15988c8ef5d1b50c679fdc915788360bf744c4e0c9e47952aa0985f23ee58e80",
-  "@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.9-commit.d91dfb5": "2ce172ea44980ca6b86636a13cce7d70104e25f75caaa0c4d6d9199721825a896a74b11bc32fecbc2756aa829d7e10f4701b2f3544b77cfa4da3c2cea0d72e1c",
-  "@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.9-commit.d91dfb5": "3516b21ab1982990435d550a23c153393ce1a2c9308b6df6614438c14ef1206d50c5e7dd214c403a42c9f4e695b574122abc8009df5171ebb79e685da14e7562",
-  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "17086030865bbfb6668d04f882926035fc1f72db81c3415a8f81e6196b9f849eabd6f2a62066e83f87255fcec106fe274353c8f5ff9c782417b6eddc664a129c",
-  "@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "ecd226ec05f9f863d97de98ca4d7cb9026bcb0cd2fff12e325209664eaca1fa131744ad72d1352b522567adfe4967ca73e50987f96ab475b50e9b96456dd50cf",
-  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "9e50f65fb7ad451a6eb4f9305650605e7a4efdd6873ad9412520edb8fd4c7f0bb67aa9922dbf1bad055c01a0de677eace73abf4285409cb9defae93956a83b24",
-  "@rollup/rollup-android-arm-eabi@npm:4.45.1": "c8f4939edd5bdac2d846307e7accddd8d777accbc900757386feeb26b609813b1e6cb1860464700b8f724f0175701a52cfe35aaab40193e471d72967d2580cea",
-  "@rollup/rollup-android-arm64@npm:4.45.1": "f4a842bbd8ec08eea0a3d76381bf7441e0bd9cca34b83519044c9d30514639d6c9125234253705b14dcade1faef603829892627f3e5b3fb79ca2fffdb7f0a1dc",
-  "@rollup/rollup-darwin-arm64@npm:4.45.1": "9cd3c451dd4727ea97d67f7a1d19c16cd91b53509c2b7f0e123ca2ecfa5a542ac9e0d7ed5d4a2fc6e0e2636b2d783a5ea94d3d9b079e58094807f46af2d3b1f5",
-  "@rollup/rollup-darwin-x64@npm:4.45.1": "beff80194e9aa470f233783230e607c16c3180c479c630b1affb792ea94517305c7736f5bcc50bf7485532179713258b8688904ffd1a39b4cedbbd37a60fc676",
-  "@rollup/rollup-freebsd-arm64@npm:4.45.1": "92a873121ff3828a904ae5c073ac11206749cffaa2f0f717a0261318cda8992d951993ae57aae519ffd840fe74b8e4cb41a419996e4b7114007e163dafd24d28",
-  "@rollup/rollup-freebsd-x64@npm:4.45.1": "919ff2d364ddeb2c4ed717c772b9f9e4b616dbcb8db25123a9f48468b1777e0db0ab2a80a48674e0dad7036cbf5407de83532123b09986226ad3759806fe369e",
-  "@rollup/rollup-linux-arm-gnueabihf@npm:4.45.1": "f519dc61d585495502a81f10898eed4a1d7d3d3d7675c0e9082924622a68212d586dcc31ad6fff4562eacdf0420c3017e66c9960fc972b4c3605d2f7bc3d6581",
-  "@rollup/rollup-linux-arm-musleabihf@npm:4.45.1": "aad10aefd9142278a87f9d6489d1f14666ca4c9345b099942dee8e30fb5e1cc6bee630c8de48d4b11302315e8341bdc0664560388792db248823532eb81eee4a",
-  "@rollup/rollup-linux-arm64-gnu@npm:4.45.1": "2822750ecd8f9566095c3a51e2666c9e35d307fb322f730303259d035b3d2f3960441d9647cc3fd15b3bc5e37bc8190461c318a05c189dc95ff636024b0b4169",
-  "@rollup/rollup-linux-arm64-musl@npm:4.45.1": "372430e2ae57007b64358eb4c26720b1dcdd80fd2ee24688ceb4d6031158790039f9d1a48f60df7a57e17e82395609428eca90e5e467766d867a60104c73eed5",
-  "@rollup/rollup-linux-loongarch64-gnu@npm:4.45.1": "fb0063b86d3308eea4940798ea711867a8de1a7494070b55bbf86a03b401b41b75cb88868e13f45148653699a18b1d2363351801a5b0c0b653867e4e662daa98",
-  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.45.1": "bc9f4c68939f98562864b5100a78a6f6e3d9597db2f459b99fa114e498c14f06171647be3d7a560781483ee1971122a7e3b3ab58e2584b960447994ba444eb4e",
-  "@rollup/rollup-linux-riscv64-gnu@npm:4.45.1": "bc0a285841a777e14836be0102d58ecaf064d0373fde1aae730844d27c7f2982ccdfc0cab41d3c689b1472258fdc93568ca71660423ed670d938e3583570f69b",
-  "@rollup/rollup-linux-riscv64-musl@npm:4.45.1": "2150cb74acb44af2a2ead9068006efc76201b651f0ee09061aebd4e6e22b75254b3e64a8e1684c422ef72ea4001049379110199126dac288602464c4432dbdb6",
-  "@rollup/rollup-linux-s390x-gnu@npm:4.45.1": "a11dad7ddd921104d33d1d5aed05beef4ac8d6e79b69e5afc3612d424a2e12e67c6cd67d916b4f0f981bdb5738fe7c59a5e342fe265bc989a2acc9c981d3e212",
-  "@rollup/rollup-linux-x64-gnu@npm:4.45.1": "baf9081b367a5f557cfcd17ae60b196c00a933e87c5b16045efa312cb142518c91706ae3e6a4be1d09f7fbf2b133d386fc4ff3f6dd2d5b7149ac139af4a63391",
-  "@rollup/rollup-linux-x64-musl@npm:4.45.1": "dd53812371c9e7c68d4a4d6d96993c3d2def5c91c7bd9f264d832263f5fb0b7601789cb394b4ee835ff5c828a02da7421bef43e31131c44eccb548cca576d886",
-  "@rollup/rollup-win32-arm64-msvc@npm:4.45.1": "5d336c675befca41c76b0529e194e30eca93465512db3a95afcb626cf3fe56664d9e1e9b124a29c02383f43fe8638c5a1652171bdd341d8ea65ebc8462050e3f",
-  "@rollup/rollup-win32-ia32-msvc@npm:4.45.1": "53e1aea2fb90f3704b272d3f89009a04891ce318d7cdf5dea85092b1f039499a8f916065e9775ddebaa1af411bf8213d656bd540eabfcd7f764eaf0d21c33b98",
-  "@rollup/rollup-win32-x64-msvc@npm:4.45.1": "801641e0ecef2e8fd0e616ba443b029adb9a2ed5303b8f7ad8caf23a6615ba5e221dbefb138d17ef77039e6a240c0ba1ea022cf1e116a5545ea518a6063c1e63"
+  "@biomejs/cli-darwin-arm64@npm:2.2.6": "38ade81bfc2cf3c981fc6c06f15d41faefec1eed3be7a9c856304db9d0010700769479e2df16f7f421bf335a910b72fa1bf5185f30dd8372d416972a623c7841",
+  "@biomejs/cli-darwin-x64@npm:2.2.6": "42d5a3ca874969d3e1d72a7151f1ef3a40cb887f8c6c315a1898cf53f8a825eeb1419fbc691adf1551ec06355cf4c11f5400ecb42720e63a44c5c5b0db6f1cbc",
+  "@biomejs/cli-linux-arm64-musl@npm:2.2.6": "866839019a2a5ad2e731a4f04c1effdeb41a2559e04639ecc33bbc119c0d217175dd8e972ec54d34f84edea8db00ee75fda7bca44bbdcba5495ebffbaf3dc709",
+  "@biomejs/cli-linux-arm64@npm:2.2.6": "18db4d7c04347b2095584b9ed851234aeb31599a112176418d8b29d3dcc73f6e2b4a759e3c20b3a0440d57b6656056c418f8b9f52aad5e1bbb02385f97792bee",
+  "@biomejs/cli-linux-x64-musl@npm:2.2.6": "b43573c8cda9b9026d911931b8fd517a0e1f661ff6529ad718852cc8716a68632361d06f1c14bcc73fd600c69aeb7542680ac66a46a2461f6a4a645e7cef1d9b",
+  "@biomejs/cli-linux-x64@npm:2.2.6": "06f32d1d001eb09d9783587318f94fa52c3055826c0b835f48c18fc480aecfd311bcc0ddac678c709949f3b99b1283450cb073bbcc8b1631c39877d7264ac62e",
+  "@biomejs/cli-win32-arm64@npm:2.2.6": "fbdbb024198c027edc2043e1f6416592263624a4534768a98a46b359bfa813e9b919e2bb89f10114b7bfd7e78d29b298773262a255c924555096b39df9d35323",
+  "@biomejs/cli-win32-x64@npm:2.2.6": "7ceac86065c5e7c765993d4b300fd29c710678d2c65ea4394ed68ccf6ae1fa5133730829a7db8915dfb2877792093b8d5fe6eaea3ed727826ee5e2ac11530274",
+  "@esbuild/aix-ppc64@npm:0.25.11": "46c2697b0e5bf6a1d1d57e80358ee04fcb0d59a1c6648759ec94e12a83af50d35ecf2469cf7c5643f85a9b2c5b2f91173bc6485ebec9bb9add4a6b30b5dab95c",
+  "@esbuild/android-arm64@npm:0.25.11": "cc45d931e813767a15ad6e7fd6071c97865a2e9aaa0d3a78374da452d303dbea71a4f13c63426b01f71ce3c10dd208f9382e6387505111adaf631e39749aa404",
+  "@esbuild/android-arm@npm:0.25.11": "b8ee90079d3d6c02b732529b04d2e6c017d12b2c401f2f8d6e60ec5fb1060d819edde5429acfbc7471b2224b4457de8cb99b97bea4164e94a3da2cbf121e60a4",
+  "@esbuild/android-x64@npm:0.25.11": "c03182ed17c50ab29973b19814cbdee85ff67ba00e13f001fafabcf7538d061fd737a783fc4131f96e22b2e7bed26936e5e730b717bb88ffb0b8c429fadd6536",
+  "@esbuild/darwin-arm64@npm:0.25.11": "67114421780e01c947d3a646d9737d5965e2bf39ea75a2440d614971b7b2565a8cc91c39780f5b86adc25cdc466bbf1ade79a05cef71827e3f3a2be00435d868",
+  "@esbuild/darwin-x64@npm:0.25.11": "da5612584d5fc2e714efc0876826fa45a48fa3b881be4a728516f2394c6aeb72f6ca8ce08272106c24ea6a9b040513afd847b4ea9bfcc5a6637e427a1634acd7",
+  "@esbuild/freebsd-arm64@npm:0.25.11": "8ad357e0b7605a320d428b10ab704a2f34383786bb43e663ebb62ded22297343c72149ab126257629308195cd18b4828f9b90579b224c26d2ca56f416dcb3e48",
+  "@esbuild/freebsd-x64@npm:0.25.11": "a42ea4c6801eb2ff09b0f1e67a04b2d4a00da9dc08233a8dc227b25468efa954ea13478bd2f2dad46bf78e8d1ec3cf11b1edbc1b50af7e61da05e715f0ea0fc7",
+  "@esbuild/linux-arm64@npm:0.25.11": "c8f87df1d15ff5c835d782e26213bb28653eed9388351e42c073431ffa8e3606fa8e0670ccb0df325f56a9695782b34c98af2fe30756953a883f9da63d1eb42a",
+  "@esbuild/linux-arm@npm:0.25.11": "122d069ed8332d3eb6e3f0d99c7f25d8920d6aff3655013d6bc2f3666fcba85ae074402b54f3a2ca9a3a3a9cd54350fac1f56252d84d466daefca7a8dc82975b",
+  "@esbuild/linux-ia32@npm:0.25.11": "dbd90c3efbbb33b920abb3f3def4a61fcff258b8a60289c61c0ba6d5210fae8fd569af991ff9aaebe03b3c24a0c67a5fd74d8e32e8fd7c5a0dbf1898aeeb2bf3",
+  "@esbuild/linux-loong64@npm:0.25.11": "c58d14d84cf4f024f5cc585efd759b161ec4122767d94500578cf32f9649542ab7e7b5e2b88389d774d4544d50a39ba1e0d791793170643645ec6a2eb8836ffe",
+  "@esbuild/linux-mips64el@npm:0.25.11": "5a3f4ccefe0d8ed30806a6984b7b6cee17e2f2a14d3f6d64c37f05f78f6dddd04821fd5ff4d61044ce23c0206a8fd4f1535a90d534e26cb5e90c8c04d1203a0a",
+  "@esbuild/linux-ppc64@npm:0.25.11": "e35d0a4e54f7d48aa931abe6211b7fc374291b26cd59849fff938499114b5b34e3da15b71e67b76f83c1d712d6f78a50255d8b96bacaad8df233771126544ebe",
+  "@esbuild/linux-riscv64@npm:0.25.11": "4e932cf5950d97aec76aa5c52d7d15e7135f2b865414c97cd4410adc3f8b26e1588cda7a09222b92f54fff8c888180219e822b9a633c833098bb876b1e66ac02",
+  "@esbuild/linux-s390x@npm:0.25.11": "af2b8a5c0a6147985b1d194a7c1323b4693b72ad5884de1292f045882b41436cf4e64828c18cdbf7b85763060404279cc070fbf74c00f9f82d8f35469b8c0073",
+  "@esbuild/linux-x64@npm:0.25.11": "1e1fe2d9c8ae8ed76f3090ff2e4d3d084d581cc9298e349daf8addd398ae9b466a1817d9640202956d72479a82e602979ca364035d10e8cb6e2c2baf6e850081",
+  "@esbuild/netbsd-arm64@npm:0.25.11": "03e86862f25a9d3ed05383031ab3430ba73b80e5a1617cf0b9f91ce2a4d5700125398722a4a6145299d6f3626caca556d30604bd24f88af1a289794822322814",
+  "@esbuild/netbsd-x64@npm:0.25.11": "af848a8e720c5ba4fb63a748c657e366770e4f00a249dd4a0eb996bdafa0fcad7f04c88df3ed29cb1b488f76c4f7c3355e192ff71392c81d641dd52bc453355c",
+  "@esbuild/openbsd-arm64@npm:0.25.11": "40d46a15da7643aa57ba7a61aa8174cc7ead37f67b3438eaeb407f6527712b848327a025484a57ce936debced507a2d405614e790491aa181f8178c09b8f2ad2",
+  "@esbuild/openbsd-x64@npm:0.25.11": "8ee73b8cfe0b5d24433400bddcb20c3ceb2cab3d11112ba01c5ee799e3629d24267f6dcfcb2f3aef89726ddc5d10592e35ec46b9725cc9e297af3d8d35a3122b",
+  "@esbuild/openharmony-arm64@npm:0.25.11": "bf2fa9985a1aaba0a4376657e72e73c7d5368d0a1972e12788ec276384e6a20637904c5d07b52a9f10306735898730dbebd55a6234cc0cd30962ee130c7b9a8b",
+  "@esbuild/sunos-x64@npm:0.25.11": "7ac357650fadc4ad44a0615a184920734ab5f4432ddd913bef2cf4e4ef7855f7ffd1995cfabb323c10cb9b876f252cf3f7938b4450cfa9ce3b1488e47d91b6cf",
+  "@esbuild/win32-arm64@npm:0.25.11": "01a7db317fecb784cd273ddfb0f3eb35871709904cc879adfbeca139cb33fbe8db6d33ee53ae4eb3b4185ef9fb6d6f140d9ac0fcbbe61518cf546487d7430dcb",
+  "@esbuild/win32-ia32@npm:0.25.11": "cdb90fcd780022685374b762b2f6fdd19501ff43c4b4b63b9b875cdb56d4c79b4747f36f4893ce57d3f0c520aaf30b0f31309e606bae14738300b22bbb30b1df",
+  "@esbuild/win32-x64@npm:0.25.11": "a7b6080abc4d575c0572e880cefcb24faf89f7e48057652d6ab11e2e5b3fbd4555d27246ee281d5a1ac1f744a29ff90573e7075310e171ade9e2838665caefce",
+  "@rolldown/binding-android-arm64@npm:1.0.0-beta.44": "3584478753a119db5c345c314b7a80a122fe1f4aa868773d5103942f62e81493f922f440c040af86902296b8343a418f8ff325f0336ca477c58a3f00a5fe92cd",
+  "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.44": "b3ffe5e3e54d7db2aa77ea24399016c934b68e3c4e7d5124ea90e85a7814e74ef933e07fd640ca0608fbf4a46f6db21087fa301ebf209883db8d0f43b97b5081",
+  "@rolldown/binding-darwin-x64@npm:1.0.0-beta.44": "ecad93425fde8cbc0ab451592887f068fbd3b2e6e7c6a54c12e4f02dceb499ec584a5ebd854b94691e78ad1a097846e0328485adc7c8f69a66531001dfd3afa0",
+  "@rolldown/binding-freebsd-x64@npm:1.0.0-beta.44": "4b397b3e5bf3ba2b3f4af648921bd027fbaf9859041b92aa36c9a60d4e25eb7f67da8812d61b80078957ffd2836d3a9618dfa6c4d1141e2c4eb1dd6d4b7a051c",
+  "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-beta.44": "0d2be4daa7358490a081769efc6bf5a7ef8007706bf8a54d354950214b4eff91b367f21f4cb4d05d0e0a3dc759528bf8d7eab7e482754c74321d66d612997f43",
+  "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-beta.44": "4a0d9d0e06fae39dcd984e5dcb858aa38d34d412e8472290593f3b907aac6e8c1e60b7659020b71063d469faa904dee78fb6678979292ddc7060e765cf0258a7",
+  "@rolldown/binding-linux-arm64-musl@npm:1.0.0-beta.44": "3dfb95b4663bc950d1ed5f93162ed1b7a2cb02281f1ee82901844a9e22e34369dece54d5a9bbf9d3d2381407ca363b8536d236421a793dbd72350dc65d7bfc46",
+  "@rolldown/binding-linux-x64-gnu@npm:1.0.0-beta.44": "d6329c568d9ccd363b215ebffff7b86df0a102d0dcf2b56e32a81e2d1961d052691d8a90e9df5dff3c819a0965635b3b5beb71e125fb7f385aebdf458b3f53a8",
+  "@rolldown/binding-linux-x64-musl@npm:1.0.0-beta.44": "b0fd15a216b02ff03cb927e84802bc9d8454d5cafcc3561cb9f642997fd5869c6611bdbb5e3391d9d6866ea8b764876db8dcbab6a52017025f4f349c83c6a51f",
+  "@rolldown/binding-openharmony-arm64@npm:1.0.0-beta.44": "e367f21610a6daf111f337824334474213172f4050d67bf4c7a29f69ba43e35733911cf4c44906b3170cdcaf9fb96ba6386eff29e02650109e11130da46dc53a",
+  "@rolldown/binding-wasm32-wasi@npm:1.0.0-beta.44": "a53092c1338dfc25fc0447a223748ef5048058ee420fefda15e846131b31c3c8fc6d3f2e975467190905f91abccf8de570653aed77a147513d3dae7ff0004931",
+  "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-beta.44": "d985908536816c176699b21626ad57106af36a99d665437cf58f827f54491200763f2b47870c218ac3022d4a43c6ff5bb38438f81a18a1fc88fc837d9e53a459",
+  "@rolldown/binding-win32-ia32-msvc@npm:1.0.0-beta.44": "f247d3a00caa1238fed18d6d7f884d02291e3fd570d987f50bf77b0886e767529dae2586093bfd820320eb0548cbdba6784f5b49afd49032a883bfc3f1ea19b4",
+  "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.44": "9f13f6cd9f6ba17c79a7c398c1931cd2e8321703d30aea0de56e5c6175e4979d96988ca941576d0d424e928e873625c5802d081498e8111e52382ada737656f2",
+  "@rollup/rollup-android-arm-eabi@npm:4.52.5": "62451748fde2f4a8e8423b2e7f83fd0342e57433fa0f71d378ea38ed3f85dc6a0706ef9feae21d79428f4e274da45c07bc49eb1b3a82c08f6b98d8cf20de83f7",
+  "@rollup/rollup-android-arm64@npm:4.52.5": "d050880ec4e14c0d1ab7e32e6a843c3f39b4161ddd574532482807e6e559e34dee8bfe3862bf06a62e79e46a410afaa3dafedc5e0db41db5cf39c10bbcf32330",
+  "@rollup/rollup-darwin-arm64@npm:4.52.5": "4c7a2994ec5bb915b5b455a507b296c892c914ed0c0c3e8e1958d7e021dc47627a27c756f1628aca2e2ace8487dc93dd801483f0ec40f92603b6a788322e66ed",
+  "@rollup/rollup-darwin-x64@npm:4.52.5": "fcdc3b7954afea6dc191a6244e793a32e8373e1798020d1cfcaf5da48bd23c533b661763d2dbfb87412bf5b1a59377ec06560f64da869126ab8c995391de9047",
+  "@rollup/rollup-freebsd-arm64@npm:4.52.5": "f52788b616f5bc4c5edbc41ca2ac4fde7fbed678a0d2c3249111f4322a76550e682037563d07a0f07eb21f82289e9c5616c41797f3d9caa6d5b4261b8e1ce642",
+  "@rollup/rollup-freebsd-x64@npm:4.52.5": "8fcb45fd9b7ec02848230cefac866bca73f38071e2e85e1217627007df211e814743e3e2525b236dc410acea7f7c4484050e2338391bda509bac34e7e0bc9ca4",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.52.5": "ff055f9efd2f8d1e1ced74a0defa0d089b54789f2b3d3d8f9261180059d6cd45fb895399c938c87467419ce1b37f7c50eaec333d5f140e7d8b53874cfba7bad9",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.52.5": "2932799d8e79831d1f79032d2bced666503466a5d3b87e98a12f577400bad80dfb5ce2883318059c038d061319ed51ed58213bc9b253b3c60a1ac5ca3807ba46",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.52.5": "f2bf47b114856efd75e23baa3c3954fc2a8b864d678610fec5c2ecdab5736d1068fe3c813d29592a9de3f54c0de4055190670ef842333f5bc9e34e1221fb403e",
+  "@rollup/rollup-linux-arm64-musl@npm:4.52.5": "26c8ded405da1a31c414677de84c261d1139cd7bf568e979036d39c613a2783bff559ba9cd4ebeda06c517d709050fea97ed65ca482316322984a1bad51ccc05",
+  "@rollup/rollup-linux-loong64-gnu@npm:4.52.5": "3fec9dbb69d304495c40c26d49e736ae98ac173368ed0f0115fdf90b464e8bdd716b5a10f0458438a8ee31d5b13cb219ceff2ea0773537a87b597a3aaf6c0fbd",
+  "@rollup/rollup-linux-ppc64-gnu@npm:4.52.5": "542b1171f910f3298a1f326ca6dfb41463ac8a9291f21502830a75217d91c38a0701517c4424c1d114b7fcba06b5fdc1ac95b9814ff542fc1c5741c965a12fc0",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.52.5": "3f8a728b372d5cd2964281bdfe6184cd6dcff579681ea3a9bcb240d2fdaa0181a763f6f34930eae206d00c687cbecfa3d3b18b49bfdef0b772809fac80e007d8",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.52.5": "26b5a6d0983aeea544421d697787a540de653a84f948389280cfde0add366fa0fb7af4a5e67ca490a63a8fabca801f04b23a70bb948cbe06d48aa0ab0b3fff73",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.52.5": "6f4b1605d9cb191ec404ad2418f5fbc43d5585a83eeb33f8a8de6d2393e4ec85fb42a4e55da7d100bdd708e830e89b815d4e444f34b3002096370b1e1e80bee7",
+  "@rollup/rollup-linux-x64-gnu@npm:4.52.5": "70fdee240db9c56c9a2a202450f4fb2b8cad059bb001c10cfc37b8ba1a333f1ad61b4a9bc01df005d9d0eb9c7ae57103c70c4ba58ef89942e11b0eb449cb3fd8",
+  "@rollup/rollup-linux-x64-musl@npm:4.52.5": "871865574e0a5f79af49151685b1e243d43f0eb11100cffb9d835c4aa3423a471dfbb56ba7d16928eb11df7956e307c74d0b5cd872db711cd382bc36e487be9a",
+  "@rollup/rollup-openharmony-arm64@npm:4.52.5": "15150989aa46138a5675962f1bfb01640a212e26976e799be4b0029c2e6f0e7a21b32754457b13dac05d02aa04814b6d0a6ee43dbf3473dc9fce00c7d8c0155f",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.52.5": "6433d349de33e71bb1cd11192ac58827630ef1b4eef79af40708cd7a8375922bfdcde69ed9e31309ae9b9224e3d9237ac00191a1c8406c7e3bbfa99d57baae00",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.52.5": "0da2d66ad1bc046a601b9de5a1266ba61a08e211df670d056451a58ee92a1a1de3739cfae853bf133c4204802ec7c72d2fae607f7ef31789e6124c23441f3f07",
+  "@rollup/rollup-win32-x64-gnu@npm:4.52.5": "a7d3489e79f1cd8e4d34e784f3e32e9681170e4fc7d568cf43b31511c6b9c0e03db722c76baa595799c85ebd96a7e6ce66670ec00ed253e674d7e732a244c554",
+  "@rollup/rollup-win32-x64-msvc@npm:4.52.5": "eb1c823b1e13f27b49321ae56f4c35710194d674034820f6c0b66a2309cbefaff7bc4a58e6c3fbb2453f8913f4aa1cc173cf9f6e9085df47f1922626630260da"
 }
diff --git a/pkgs/by-name/sw/swagger-typescript-api/package.nix b/pkgs/by-name/sw/swagger-typescript-api/package.nix
index 55277421c6e6..b54a6c588812 100644
--- a/pkgs/by-name/sw/swagger-typescript-api/package.nix
+++ b/pkgs/by-name/sw/swagger-typescript-api/package.nix
@@ -8,7 +8,7 @@
 }:
 let
   pname = "swagger-typescript-api";
-  version = "13.2.8";
+  version = "13.2.16";
   yarn-berry = yarn-berry_4;
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "acacode";
     repo = "swagger-typescript-api";
     rev = version;
-    hash = "sha256-3IPap3Ln8UheYD3/PE4y1ga1KXMNihm36bkMCKy6WuQ=";
+    hash = "sha256-SPvOCoxtf7x8MLPV8kylyaNXHaNtsHvs6liagd7iyF8=";
   };
 
   nativeBuildInputs = [
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
   missingHashes = ./missing-hashes.json;
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-3vVaW9beLNuudq7RB8pnw6aMJ8nJ1YBFaYr1d9K/k5U=";
+    hash = "sha256-ZIF+sA/Wp2Rbu9CeERZo1X1oC00SjE64Mk5verb8IxU=";
   };
 
   buildPhase = ''

From db2a595e867948bbffa8446398be601921530986 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 23 Oct 2025 08:46:17 +0000
Subject: [PATCH 1941/6226] python3Packages.fedora-messaging: skip failing test

---
 .../fedora-messaging/default.nix              | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/development/python-modules/fedora-messaging/default.nix b/pkgs/development/python-modules/fedora-messaging/default.nix
index 6e2af5d98c43..b6a10c0c5059 100644
--- a/pkgs/development/python-modules/fedora-messaging/default.nix
+++ b/pkgs/development/python-modules/fedora-messaging/default.nix
@@ -1,8 +1,13 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   poetry-core,
+
+  # dependencies
   blinker,
   click,
   crochet,
@@ -13,6 +18,8 @@
   service-identity,
   tomli,
   twisted,
+
+  # tests
   pytest-mock,
   pytest-twisted,
   pytestCheckHook,
@@ -55,6 +62,18 @@ buildPythonPackage rec {
 
   enabledTestPaths = [ "tests/unit" ];
 
+  disabledTests = [
+    # Broken since click was updated to 8.2.1 in https://github.com/NixOS/nixpkgs/pull/448189
+    # AssertionError
+    "test_no_conf"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # AttributeError: module 'errno' has no attribute 'EREMOTEIO'. Did you mean: 'EREMOTE'?
+    "test_publish_rejected_message"
+  ];
+
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "Library for sending AMQP messages with JSON schema in Fedora infrastructure";
     homepage = "https://github.com/fedora-infra/fedora-messaging";

From d69f2a5605c0bf0850e2b43911ec8edbc09d948a Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Thu, 23 Oct 2025 12:16:29 +0300
Subject: [PATCH 1942/6226] twemoji-color-font: remove `with lib`

---
 pkgs/by-name/tw/twemoji-color-font/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tw/twemoji-color-font/package.nix b/pkgs/by-name/tw/twemoji-color-font/package.nix
index c4d9048f3ec5..8b52c440708b 100644
--- a/pkgs/by-name/tw/twemoji-color-font/package.nix
+++ b/pkgs/by-name/tw/twemoji-color-font/package.nix
@@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags";
     longDescription = ''
       A color and B&W emoji SVGinOT font built from the Twitter Emoji for
@@ -37,10 +37,10 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     homepage = "https://github.com/eosrei/twemoji-color-font";
     downloadPage = "https://github.com/eosrei/twemoji-color-font/releases";
-    license = with licenses; [
+    license = with lib.licenses; [
       cc-by-40
       mit
     ];
-    maintainers = [ maintainers.fgaz ];
+    maintainers = [ lib.maintainers.fgaz ];
   };
 })

From e10a344e5d4565528e9b378187d6c0b6cbfc8fc7 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Thu, 23 Oct 2025 12:18:08 +0300
Subject: [PATCH 1943/6226] twemoji-color-font: update source URL

The repo was transferred from `eosrei` to `13rac1`
---
 pkgs/by-name/tw/twemoji-color-font/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tw/twemoji-color-font/package.nix b/pkgs/by-name/tw/twemoji-color-font/package.nix
index 8b52c440708b..da0e38087b39 100644
--- a/pkgs/by-name/tw/twemoji-color-font/package.nix
+++ b/pkgs/by-name/tw/twemoji-color-font/package.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: {
   # We fetch the prebuilt font because building it takes 1.5 hours on hydra.
   # Relevant issue: https://github.com/NixOS/nixpkgs/issues/97871
   src = fetchzip {
-    url = "https://github.com/eosrei/twemoji-color-font/releases/download/v${finalAttrs.version}/TwitterColorEmoji-SVGinOT-Linux-${finalAttrs.version}.tar.gz";
+    url = "https://github.com/13rac1/twemoji-color-font/releases/download/v${finalAttrs.version}/TwitterColorEmoji-SVGinOT-Linux-${finalAttrs.version}.tar.gz";
     hash = "sha256-Xy6Lkm340ldm9ssQWn/eRFIJ5kyhYaXPNy/Y/9vUt40=";
   };
 
@@ -35,8 +35,8 @@ stdenv.mkDerivation (finalAttrs: {
       systems and applications. Regular B&W outline emoji are included for
       backwards/fallback compatibility.
     '';
-    homepage = "https://github.com/eosrei/twemoji-color-font";
-    downloadPage = "https://github.com/eosrei/twemoji-color-font/releases";
+    homepage = "https://github.com/13rac1/twemoji-color-font";
+    downloadPage = "https://github.com/13rac1/twemoji-color-font/releases";
     license = with lib.licenses; [
       cc-by-40
       mit

From 2a00280a2477bf1e5ad74d71854e373e8023a191 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 09:20:03 +0000
Subject: [PATCH 1944/6226] ghmap: 1.0.4 -> 1.0.6

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

diff --git a/pkgs/by-name/gh/ghmap/package.nix b/pkgs/by-name/gh/ghmap/package.nix
index 42ee79085f7f..79113ee6a440 100644
--- a/pkgs/by-name/gh/ghmap/package.nix
+++ b/pkgs/by-name/gh/ghmap/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ghmap";
-  version = "1.0.4";
+  version = "1.0.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "uhourri";
     repo = "ghmap";
     tag = "v${version}";
-    hash = "sha256-liwkJfNp2Ozph3ummrh2GEshIlmVsG8Y8Pmm4lw2Ya8=";
+    hash = "sha256-mNWBClKs5QnjwMMWS/OaxgD0g0D0bWRx8ecyG3+zy+s=";
   };
 
   build-system = with python3Packages; [

From 07d18ecce71e16f9bda7b88a84e50a6057d8719a Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Thu, 23 Oct 2025 12:21:30 +0300
Subject: [PATCH 1945/6226] twemoji-color-font: add updateScript

---
 pkgs/by-name/tw/twemoji-color-font/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/tw/twemoji-color-font/package.nix b/pkgs/by-name/tw/twemoji-color-font/package.nix
index da0e38087b39..570630b5a683 100644
--- a/pkgs/by-name/tw/twemoji-color-font/package.nix
+++ b/pkgs/by-name/tw/twemoji-color-font/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchzip,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -22,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Color emoji SVGinOT font using Twitter Unicode 10 emoji with diversity and country flags";
     longDescription = ''

From d161cb06fe4b7173a782e212ece4837f03da1e0a Mon Sep 17 00:00:00 2001
From: HHR2020 <76608828+HHR2020@users.noreply.github.com>
Date: Thu, 23 Oct 2025 14:29:44 +0800
Subject: [PATCH 1946/6226] linyaps: fix build for Qt 6.10

https://doc-snapshots.qt.io/qt6-6.10/whatsnew610.html#build-system-changes
---
 pkgs/by-name/li/linyaps/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/li/linyaps/package.nix b/pkgs/by-name/li/linyaps/package.nix
index 0feed2bdd45e..b1fdeae4014d 100644
--- a/pkgs/by-name/li/linyaps/package.nix
+++ b/pkgs/by-name/li/linyaps/package.nix
@@ -50,6 +50,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = [
     ./fix-host-path.patch
+    # Fix for Qt 6.10
+    (fetchpatch {
+      url = "https://github.com/OpenAtom-Linyaps/linyaps/commit/c49e6cfab304ffa2b5b1657da247a6eda6f46c3a.patch";
+      hash = "sha256-lFyPb8YiaXJl2yzPElUR1jYwdOxA0h+db4sv/N70N4E=";
+    })
   ];
 
   postPatch = ''

From ef6fe8d55c1b43a69cd8e4435f3e85a1ac708420 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 09:33:12 +0000
Subject: [PATCH 1947/6226] vscode-extensions.ionide.ionide-fsharp: 7.28.0 ->
 7.28.1

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 63cb59813f4f..94ffde0588de 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2348,8 +2348,8 @@ let
         mktplcRef = {
           name = "Ionide-fsharp";
           publisher = "Ionide";
-          version = "7.28.0";
-          hash = "sha256-d6AucdoKeVAobTj1cbELce2vcXsZW5TX74mkcnHPtkA=";
+          version = "7.28.1";
+          hash = "sha256-JDrJAZB1QvLG/dXHOhg6VM8dgwEc1eV6BycoRfEQmuY=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog";

From cecb26c2a79e8e3e4cc4fdb7f1688ba6f674db05 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 23 Oct 2025 11:35:15 +0200
Subject: [PATCH 1948/6226] python313Packages.google-cloud-webrisk: 1.18.1 ->
 1.19.0

Removed pythonOlder dependency and its usage.
---
 .../python-modules/google-cloud-webrisk/default.nix            | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-webrisk/default.nix b/pkgs/development/python-modules/google-cloud-webrisk/default.nix
index 43db35398b72..81a1af721fb0 100644
--- a/pkgs/development/python-modules/google-cloud-webrisk/default.nix
+++ b/pkgs/development/python-modules/google-cloud-webrisk/default.nix
@@ -9,7 +9,6 @@
   protobuf,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
@@ -18,8 +17,6 @@ buildPythonPackage rec {
   version = "1.19.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     pname = "google_cloud_webrisk";
     inherit version;

From 17fe21e593235a33916e13042cf80bd601302f1a Mon Sep 17 00:00:00 2001
From: Nikita Uvarov <uv.nikita@gmail.com>
Date: Thu, 23 Oct 2025 11:24:45 +0200
Subject: [PATCH 1949/6226] python3Packages.pymitsubishi: 0.3.0 -> 0.4.0

Diff: https://github.com/pymitsubishi/pymitsubishi/compare/v0.3.0...v0.4.0
Changelog: https://github.com/pymitsubishi/pymitsubishi/releases/tag/v0.4.0
---
 pkgs/development/python-modules/pymitsubishi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymitsubishi/default.nix b/pkgs/development/python-modules/pymitsubishi/default.nix
index 241556be6829..dfc4b6ff41e4 100644
--- a/pkgs/development/python-modules/pymitsubishi/default.nix
+++ b/pkgs/development/python-modules/pymitsubishi/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pymitsubishi";
-  version = "0.3.0";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pymitsubishi";
     repo = "pymitsubishi";
     tag = "v${version}";
-    hash = "sha256-cfLKFvhzLN9dM0cMogCL93LVfRd8jDFo9x+nnEWInSc=";
+    hash = "sha256-oMv+GKdl1H1S5mYUYfTUHuLM5yvkvD44dy9DEsQVAyg=";
   };
 
   build-system = [ setuptools ];

From 727e8a98d0702a93c0d9bbc62172042955855584 Mon Sep 17 00:00:00 2001
From: Nikita Uvarov <uv.nikita@gmail.com>
Date: Thu, 23 Oct 2025 11:25:23 +0200
Subject: [PATCH 1950/6226] home-assistant-custom-components.mitsubishi: 0.2.0
 -> 0.4.0

Diff: https://github.com/pymitsubishi/homeassistant-mitsubishi/compare/v0.2.0...v0.4.0
Changelog: https://github.com/pymitsubishi/homeassistant-mitsubishi/releases/tag/v0.4.0
---
 .../home-assistant/custom-components/mitsubishi/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix
index 67d80f81a247..8fd8dcde5d3c 100644
--- a/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/mitsubishi/package.nix
@@ -11,19 +11,21 @@
 buildHomeAssistantComponent rec {
   owner = "pymitsubishi";
   domain = "mitsubishi";
-  version = "0.2.0";
+  version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "pymitsubishi";
     repo = "homeassistant-mitsubishi";
     tag = "v${version}";
-    hash = "sha256-V8fT/w7a/uUN4yKJ+jB6UUQDP6dif80MvlqV9n4KENc=";
+    hash = "sha256-VEV+HOzXrxX2rsStjwXD4ZWclP2oF6zZHv0MuzL8DE4=";
   };
 
   dependencies = [
     pymitsubishi
   ];
 
+  doCheck = false; # TODO: remove in the next release after 0.4.0
+
   nativeCheckInputs = [
     pytest-cov-stub
     pytestCheckHook

From 636104f2d93f1b777bb97f898d2603db51d90f76 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@ballards.net>
Date: Thu, 23 Oct 2025 01:52:22 -0700
Subject: [PATCH 1951/6226] macvim: work around Xcode 26.0 bug

Xcode 26.0 sets `*_DEPLOYMENT_TARGET` env vars for all platforms in
shell script build phases, which breaks invocations of clang from those
phases, as they target the wrong platform.
---
 pkgs/applications/editors/vim/macvim.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index fcb8a7de920e..a4c87e2283bd 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -92,6 +92,13 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     echo "Patching file src/MacVim/MacVim.xcodeproj/project.pbxproj"
     sed -e '/Sparkle\.framework/d' -i src/MacVim/MacVim.xcodeproj/project.pbxproj
+  ''
+  # Xcode 26.0 sets *_DEPLOYMENT_TARGET env vars for all platforms in shell script build phases.
+  # This breaks invocations of clang in those phases, as they target the wrong platform.
+  # Note: The shell script build phase in question uses /bin/zsh.
+  + ''
+    substituteInPlace src/MacVim/MacVim.xcodeproj/project.pbxproj \
+      --replace-fail 'make \' $'for x in ''${(k)parameters}; do if [[ $x = *_DEPLOYMENT_TARGET ]]; then [[ $x = MACOSX_DEPLOYMENT_TARGET ]] || unset $x; fi; done\nmake \\'
   '';
 
   # This is unfortunate, but we need to use the same compiler as Xcode, but Xcode doesn't provide a
@@ -149,9 +156,9 @@ stdenv.mkDerivation (finalAttrs: {
   # Xcode project or pass it as a flag to xcodebuild as well.
   postConfigure = ''
     substituteInPlace src/auto/config.mk \
-      --replace " -L${stdenv.cc.libc}/lib" "" \
-      --replace " -L${darwin.libunwind}/lib" "" \
-      --replace " -L${libiconv}/lib" ""
+      --replace-warn " -L${stdenv.cc.libc}/lib" "" \
+      --replace-warn " -L${darwin.libunwind}/lib" "" \
+      --replace-warn " -L${libiconv}/lib" ""
 
     # All the libraries we stripped have -osx- in their name as of this time.
     # Assert now that this pattern no longer appears in config.mk.

From 427a98e1292d7cb6a1693af54b8176fb184e6cc6 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@ballards.net>
Date: Thu, 23 Oct 2025 01:52:22 -0700
Subject: [PATCH 1952/6226] macvim: delete incorrect manpages

We don't provide `eview` so we need to get rid of that manpage, and
there's also a bad `man/man1/mvim.1` symlink that goes nowhere.
---
 pkgs/applications/editors/vim/macvim.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index a4c87e2283bd..cb6c36d51451 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -203,7 +203,8 @@ stdenv.mkDerivation (finalAttrs: {
     install_name_tool -add_rpath ${ruby}/lib $exe
 
     # Remove manpages from tools we aren't providing
-    find $out/Applications/MacVim.app/Contents/man -name evim.1 -delete
+    find $out/Applications/MacVim.app/Contents/man \( -name evim.1 -or -name eview.1 \) -delete
+    rm $out/Applications/MacVim.app/Contents/man/man1/mvim.1
   '';
 
   # We rely on the user's Xcode install to build. It may be located in an arbitrary place, and

From 3693c2dc20c98f22c05bd43130079d14bd68ad39 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@ballards.net>
Date: Thu, 23 Oct 2025 01:52:22 -0700
Subject: [PATCH 1953/6226] macvim: ensure we can change install names

Pass `-headerpad_max_install_names` again. This is something we used to
do, and then the flag got removed at some point. For some reason we need
to provide it both to configure and to Xcode.
---
 pkgs/applications/editors/vim/macvim.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index cb6c36d51451..85aab70ef948 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: {
     let
       # ideally we'd recurse, but we don't need that right now
       inputs = [ ncurses ] ++ perl.propagatedBuildInputs;
-      ldflags = map (drv: "-L${lib.getLib drv}/lib") inputs;
+      ldflags = map (drv: "-L${lib.getLib drv}/lib") inputs ++ [ "-headerpad_max_install_names" ];
       cppflags = map (drv: "-isystem ${lib.getDev drv}/include") inputs;
     in
     ''
@@ -138,7 +138,7 @@ stdenv.mkDerivation (finalAttrs: {
     # as the scheme seems to have the wrong default.
     + ''
       configureFlagsArray+=(
-        XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData"
+        XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData LDFLAGS='\$(inherited) -headerpad_max_install_names' ENABLE_CODE_COVERAGE=NO"
         --with-xcodecfg="Release"
       )
     '';

From f7c3c92c7a4b2180c0a50abad7f6e0e65c79da03 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@ballards.net>
Date: Thu, 23 Oct 2025 01:52:22 -0700
Subject: [PATCH 1954/6226] macvim: resign the binary on aarch64-darwin

We need to resign the binary after running `install_name_tool` or it
will have an invalid code signature.
---
 pkgs/applications/editors/vim/macvim.nix | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index 85aab70ef948..9b0dcb4df47c 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -14,8 +14,13 @@
   darwin,
   libiconv,
   python3,
+  rcodesign,
 }:
 
+let
+  inherit (lib) optional optionalString;
+in
+
 # Try to match MacVim's documented script interface compatibility
 let
   #perl = perl540;
@@ -49,7 +54,8 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     pkg-config
     buildSymlinks
-  ];
+  ]
+  ++ optional stdenv.isAarch64 rcodesign;
   buildInputs = [
     gettext
     ncurses
@@ -205,6 +211,10 @@ stdenv.mkDerivation (finalAttrs: {
     # Remove manpages from tools we aren't providing
     find $out/Applications/MacVim.app/Contents/man \( -name evim.1 -or -name eview.1 \) -delete
     rm $out/Applications/MacVim.app/Contents/man/man1/mvim.1
+  ''
+  + optionalString stdenv.isAarch64 ''
+    # Resign the binary and set the linker-signed flag.
+    rcodesign sign --code-signature-flags linker-signed $exe
   '';
 
   # We rely on the user's Xcode install to build. It may be located in an arbitrary place, and

From c06af958dcdd1dd05f2b3ef0ac9505bcbce5470d Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@ballards.net>
Date: Thu, 23 Oct 2025 01:43:22 -0700
Subject: [PATCH 1955/6226] macvim: disable python support by default

MacVim currently fails to link against nixpkgs python because Xcode's
clang doesn't understand the LLVM bitcode in the
`libpython${pythonVersion}.a` static library. I'm not sure what this
static library is for when `lib/libpython${pythonVersion}.dylib` exists,
but I don't know of a way to tell MacVim to ignore it. Linking against
python works if we rebuild python to skip the static library but that
doesn't seem like a proper solution, so until a permanent solution is
found, just disable python by default.

Also mark macvim as no longer broken.
---
 pkgs/applications/editors/vim/macvim.nix | 21 ++++++++++++++++-----
 1 file changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index 9b0dcb4df47c..a3c7dabf9b37 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -14,11 +14,12 @@
   darwin,
   libiconv,
   python3,
+  enablePython ? false,
   rcodesign,
 }:
 
 let
-  inherit (lib) optional optionalString;
+  inherit (lib) optional optionals optionalString;
 in
 
 # Try to match MacVim's documented script interface compatibility
@@ -64,8 +65,8 @@ stdenv.mkDerivation (finalAttrs: {
     ruby
     tcl
     perl
-    python3
-  ];
+  ]
+  ++ optional enablePython python3;
 
   patches = [ ./macvim.patch ];
 
@@ -77,14 +78,22 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-multibyte"
     "--enable-nls"
     "--enable-luainterp=dynamic"
+  ]
+  ++ optionals enablePython [
     "--enable-python3interp=dynamic"
+  ]
+  ++ [
     "--enable-perlinterp=dynamic"
     "--enable-rubyinterp=dynamic"
     "--enable-tclinterp=yes"
     "--without-local-dir"
     "--with-luajit"
     "--with-lua-prefix=${luajit}"
+  ]
+  ++ optionals enablePython [
     "--with-python3-command=${python3}/bin/python3"
+  ]
+  ++ [
     "--with-ruby-command=${ruby}/bin/ruby"
     "--with-tclsh=${tcl}/bin/tclsh"
     "--with-tlib=ncurses"
@@ -204,7 +213,11 @@ stdenv.mkDerivation (finalAttrs: {
     libperl=$(dirname $(find ${perl} -name "libperl.dylib"))
     install_name_tool -add_rpath ${luajit}/lib $exe
     install_name_tool -add_rpath ${tcl}/lib $exe
+  ''
+  + optionalString enablePython ''
     install_name_tool -add_rpath ${python3}/lib $exe
+  ''
+  + ''
     install_name_tool -add_rpath $libperl $exe
     install_name_tool -add_rpath ${ruby}/lib $exe
 
@@ -233,8 +246,6 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = [ ];
     platforms = platforms.darwin;
     hydraPlatforms = [ ]; # hydra can't build this as long as we rely on Xcode and sandboxProfile
-    # Needs updating to a newer MacVim for Python and Ruby version support
-    broken = true;
     knownVulnerabilities = [
       "CVE-2023-46246"
       "CVE-2023-48231"

From 5ece9f37b1b90898002ee777972b2d1684f84dae Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@ballards.net>
Date: Thu, 23 Oct 2025 02:31:45 -0700
Subject: [PATCH 1956/6226] macvim: 179 -> 181

Updates macvim to r181, including bumping the Ruby version to 3.4 since
that's what MacVim r181 is built against.

There's still 3 CVEs in the `knownVulnerabilities` list that are newer
than this release, but this is the latest MacVim release available right
now.
---
 pkgs/applications/editors/vim/macvim.nix   | 32 ++++------------------
 pkgs/applications/editors/vim/macvim.patch | 13 ---------
 2 files changed, 5 insertions(+), 40 deletions(-)

diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index a3c7dabf9b37..668604968f72 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -7,7 +7,7 @@
   gettext,
   pkg-config,
   cscope,
-  ruby,
+  ruby_3_4,
   tcl,
   perl,
   luajit,
@@ -24,9 +24,8 @@ in
 
 # Try to match MacVim's documented script interface compatibility
 let
-  #perl = perl540;
-  # Ruby 3.3
-  #ruby = ruby_3_3;
+  # Ruby 3.4
+  ruby = ruby_3_4;
 
   # Building requires a few system tools to be in PATH.
   # Some of these we could patch into the relevant source files (such as xcodebuild and
@@ -41,13 +40,13 @@ in
 stdenv.mkDerivation (finalAttrs: {
   pname = "macvim";
 
-  version = "179";
+  version = "181";
 
   src = fetchFromGitHub {
     owner = "macvim-dev";
     repo = "macvim";
     rev = "release-${finalAttrs.version}";
-    hash = "sha256-L9LVXyeA09aMtNf+b/Oo+eLpeVEKTD1/oNWCiFn5FbU=";
+    hash = "sha256-Wdq+eXSaGs+y+75ZbxoNAcyopRkWRHHRm05T0SHBrow=";
   };
 
   enableParallelBuilding = true;
@@ -247,27 +246,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = platforms.darwin;
     hydraPlatforms = [ ]; # hydra can't build this as long as we rely on Xcode and sandboxProfile
     knownVulnerabilities = [
-      "CVE-2023-46246"
-      "CVE-2023-48231"
-      "CVE-2023-48232"
-      "CVE-2023-48233"
-      "CVE-2023-48234"
-      "CVE-2023-48235"
-      "CVE-2023-48236"
-      "CVE-2023-48237"
-      "CVE-2023-48706"
-      "CVE-2023-5344"
-      "CVE-2023-5441"
-      "CVE-2023-5535"
-      "CVE-2024-22667"
-      "CVE-2024-41957"
-      "CVE-2024-41965"
-      "CVE-2024-43374"
-      "CVE-2024-47814"
-      "CVE-2025-1215"
-      "CVE-2025-22134"
-      "CVE-2025-24014"
-      "CVE-2025-26603"
       "CVE-2025-29768"
       "CVE-2025-53905"
       "CVE-2025-53906"
diff --git a/pkgs/applications/editors/vim/macvim.patch b/pkgs/applications/editors/vim/macvim.patch
index 223778acf60c..767c59bd154c 100644
--- a/pkgs/applications/editors/vim/macvim.patch
+++ b/pkgs/applications/editors/vim/macvim.patch
@@ -199,16 +199,3 @@ index 6e33142..6185f45 100644
  #ifdef AMIGA
  # include "os_amiga.h"
  #endif
-diff --git a/src/vimtutor b/src/vimtutor
-index 3b154f2..e89f260 100755
---- a/src/vimtutor
-+++ b/src/vimtutor
-@@ -16,7 +16,7 @@ seq="vim vim81 vim80 vim8 vim74 vim73 vim72 vim71 vim70 vim7 vim6 vi"
- if test "$1" = "-g"; then
-     # Try to use the GUI version of Vim if possible, it will fall back
-     # on Vim if Gvim is not installed.
--    seq="gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq"
-+    seq="mvim gvim gvim81 gvim80 gvim8 gvim74 gvim73 gvim72 gvim71 gvim70 gvim7 gvim6 $seq"
-     shift
- fi
- 

From 8b45a0a4f0cea1b9c9e932aca579e75afbac0eb5 Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@ballards.net>
Date: Thu, 23 Oct 2025 02:58:18 -0700
Subject: [PATCH 1957/6226] maintainers: add lilyball

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0948524fc6a4..dd68132569b4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14728,6 +14728,13 @@
     githubId = 54189319;
     name = "Lilly Cham";
   };
+  lilyball = {
+    email = "lily@ballards.net";
+    github = "lilyball";
+    githubId = 714;
+    matrix = "@esperlily:matrix.org";
+    name = "Lily Ballard";
+  };
   limeytexan = {
     email = "limeytexan@gmail.com";
     github = "limeytexan";

From f20cb87b0a864f5cfb7af71fbab7e31ae470ec2f Mon Sep 17 00:00:00 2001
From: Lily Ballard <lily@ballards.net>
Date: Thu, 23 Oct 2025 02:59:56 -0700
Subject: [PATCH 1958/6226] macvim: add lilyball as maintainer

---
 pkgs/applications/editors/vim/macvim.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/macvim.nix b/pkgs/applications/editors/vim/macvim.nix
index 668604968f72..943fd5b3b29e 100644
--- a/pkgs/applications/editors/vim/macvim.nix
+++ b/pkgs/applications/editors/vim/macvim.nix
@@ -242,7 +242,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Vim - the text editor - for macOS";
     homepage = "https://macvim.org/";
     license = licenses.vim;
-    maintainers = [ ];
+    maintainers = with maintainers; [ lilyball ];
     platforms = platforms.darwin;
     hydraPlatforms = [ ]; # hydra can't build this as long as we rely on Xcode and sandboxProfile
     knownVulnerabilities = [

From bbf1c769252adcd3d0411b670f7da86d5d508a3c Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Thu, 23 Oct 2025 11:01:03 +0100
Subject: [PATCH 1959/6226] firefox: do not define gtk_modules in darwin

This is causing an unnecessary dependency in libcanberra-gtk3 being
added to the wrapper.

Right now gtk3 derivation is broken so firefox is broken in
aarch64-darwin, but even if gtk3 was working having an unnecessary
dependency being added is a waste of storage.

This commit fixes it.
---
 pkgs/applications/networking/browsers/firefox/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix
index be43ccc85ad6..c144a5076e75 100644
--- a/pkgs/applications/networking/browsers/firefox/wrapper.nix
+++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix
@@ -116,7 +116,7 @@ let
         ++ lib.optional smartcardSupport opensc
         ++ pkcs11Modules
         ++ lib.optionals (!isDarwin) gtk_modules;
-      gtk_modules = [ libcanberra-gtk3 ];
+      gtk_modules = lib.optionals (!isDarwin) [ libcanberra-gtk3 ];
 
       # Darwin does not rename bundled binaries
       launcherName = "${applicationName}${lib.optionalString (!isDarwin) nameSuffix}";

From bd8890b4f81363865a380c0c48d3f3dfdcb6728f Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Thu, 23 Oct 2025 13:07:43 +0300
Subject: [PATCH 1960/6226] birdtray: move to `pkgs/by-name`

---
 .../default.nix => by-name/bi/birdtray/package.nix}   | 11 +++++------
 pkgs/top-level/all-packages.nix                       |  2 --
 2 files changed, 5 insertions(+), 8 deletions(-)
 rename pkgs/{applications/misc/birdtray/default.nix => by-name/bi/birdtray/package.nix} (89%)

diff --git a/pkgs/applications/misc/birdtray/default.nix b/pkgs/by-name/bi/birdtray/package.nix
similarity index 89%
rename from pkgs/applications/misc/birdtray/default.nix
rename to pkgs/by-name/bi/birdtray/package.nix
index ce8673ed6c09..09321955a62f 100644
--- a/pkgs/applications/misc/birdtray/default.nix
+++ b/pkgs/by-name/bi/birdtray/package.nix
@@ -1,16 +1,14 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
 
   cmake,
   pkg-config,
-  qtbase,
-  qttools,
-  qtx11extras,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "birdtray";
   version = "1.11.4";
 
@@ -24,8 +22,9 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
-  buildInputs = [
+  buildInputs = with libsForQt5; [
     qtbase
     qttools
     qtx11extras
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c3525f46c6f9..575246f33a3d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1765,8 +1765,6 @@ with pkgs;
 
   biliass = with python3.pkgs; toPythonApplication biliass;
 
-  birdtray = libsForQt5.callPackage ../applications/misc/birdtray { };
-
   charles = charles5;
   inherit (callPackages ../applications/networking/charles { })
     charles3

From 0daa3ea1757c9b8f7be45a7da8c4ba28d4c82618 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Thu, 23 Oct 2025 13:09:08 +0300
Subject: [PATCH 1961/6226] birdtray: refresh the recipe to the current
 guidelines

- remove `with lib`
- use `tag` and `hash` in source
- replace `rec` with `finalAttrs`
---
 pkgs/by-name/bi/birdtray/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/bi/birdtray/package.nix b/pkgs/by-name/bi/birdtray/package.nix
index 09321955a62f..17fd18702428 100644
--- a/pkgs/by-name/bi/birdtray/package.nix
+++ b/pkgs/by-name/bi/birdtray/package.nix
@@ -8,15 +8,15 @@
   libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "birdtray";
   version = "1.11.4";
 
   src = fetchFromGitHub {
     owner = "gyunaev";
     repo = "birdtray";
-    rev = "v${version}";
-    sha256 = "sha256-rj8tPzZzgW0hXmq8c1LiunIX1tO/tGAaqDGJgCQda5M=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-rj8tPzZzgW0hXmq8c1LiunIX1tO/tGAaqDGJgCQda5M=";
   };
 
   nativeBuildInputs = [
@@ -40,12 +40,12 @@ stdenv.mkDerivation rec {
   # https://github.com/gyunaev/birdtray/issues/113#issuecomment-621742315
   qtWrapperArgs = [ "--set QT_QPA_PLATFORM xcb" ];
 
-  meta = with lib; {
+  meta = {
     description = "Mail system tray notification icon for Thunderbird";
     mainProgram = "birdtray";
     homepage = "https://github.com/gyunaev/birdtray";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ Flakebi ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ Flakebi ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From 26d63c2b6c2da048c6558bc01e953c84a2a04a0b Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Thu, 23 Oct 2025 13:11:42 +0300
Subject: [PATCH 1962/6226] birdtray: add update script

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

diff --git a/pkgs/by-name/bi/birdtray/package.nix b/pkgs/by-name/bi/birdtray/package.nix
index 17fd18702428..73cd238cd10c 100644
--- a/pkgs/by-name/bi/birdtray/package.nix
+++ b/pkgs/by-name/bi/birdtray/package.nix
@@ -6,6 +6,8 @@
   cmake,
   pkg-config,
   libsForQt5,
+
+  nix-update-script,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -40,6 +42,8 @@ stdenv.mkDerivation (finalAttrs: {
   # https://github.com/gyunaev/birdtray/issues/113#issuecomment-621742315
   qtWrapperArgs = [ "--set QT_QPA_PLATFORM xcb" ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Mail system tray notification icon for Thunderbird";
     mainProgram = "birdtray";

From d957aa3f8b73bdf65253b0a67fa858ac73155d4b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 10:24:28 +0000
Subject: [PATCH 1963/6226] python3Packages.google-cloud-os-config: 1.21.0 ->
 1.22.0

---
 .../python-modules/google-cloud-os-config/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-os-config/default.nix b/pkgs/development/python-modules/google-cloud-os-config/default.nix
index 16fa3d531908..3bf88361e6cd 100644
--- a/pkgs/development/python-modules/google-cloud-os-config/default.nix
+++ b/pkgs/development/python-modules/google-cloud-os-config/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-os-config";
-  version = "1.21.0";
+  version = "1.22.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_os_config";
     inherit version;
-    hash = "sha256-NKdb/E9CO1Zp98kHcvqYNIr0L27C+ijQ1ulT3p58qSk=";
+    hash = "sha256-15oxD2+hznRwqqCExw443AXZhTH0aPghs6Um5NM6cOQ=";
   };
 
   build-system = [ setuptools ];

From 7a185ce09e810aa9a0811fc762476e29a721dc10 Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Wed, 15 Oct 2025 12:00:00 +0000
Subject: [PATCH 1964/6226] nixseparatedebuginfod2: v1.0.0 -> v1.0.1

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

diff --git a/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix b/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix
index 548618f311a5..42f9613df285 100644
--- a/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix
+++ b/pkgs/by-name/ni/nixseparatedebuginfod2/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nixseparatedebuginfod2";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "symphorien";
     repo = "nixseparatedebuginfod2";
     tag = "v${version}";
-    hash = "sha256-r/lmnYdnqyc0Mx1ZVzebiz8V04bmKb8lJBv/ndIzQYM=";
+    hash = "sha256-INY9mLJ+7i3BoShqFZMELm9aXiDbZkuLyokgm42kEbo=";
   };
 
-  cargoHash = "sha256-bj5OOj/PpoBU745hbhN1YqiVBikNIzT6/WrNGklRqy4=";
+  cargoHash = "sha256-6JyC0CLGnkbQWp8l27DXZ04Gt0nsNNSBFfcvAQtllE4=";
 
   buildInputs = [
     libarchive
@@ -41,6 +41,9 @@ rustPlatform.buildRustPackage rec {
 
   passthru.tests = { inherit (nixosTests) nixseparatedebuginfod2; };
 
+  # flaky tests
+  checkFlags = [ "--skip substituter::http" ];
+
   meta = {
     description = "Downloads and provides debug symbols and source code for nix derivations to gdb and other debuginfod-capable debuggers as needed";
     homepage = "https://github.com/symphorien/nixseparatedebuginfod2";

From ec4ed42ca79a653057adcc621ef4eb3987ce695b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 23 Oct 2025 12:33:47 +0200
Subject: [PATCH 1965/6226] tamarin-prover: mark as broken

This keeps showing up in haskell-updates' build reports, but is not
automatically marked broken by our scripts, because it is a top-level
package.

Let's mark it as broken until somebody can get around to fixing it.
---
 pkgs/applications/science/logic/tamarin-prover/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix
index c03d1825e152..6d382ed87d3d 100644
--- a/pkgs/applications/science/logic/tamarin-prover/default.nix
+++ b/pkgs/applications/science/logic/tamarin-prover/default.nix
@@ -32,6 +32,9 @@ let
     description = "Security protocol verification in the symbolic model";
     maintainers = [ lib.maintainers.thoughtpolice ];
     hydraPlatforms = lib.platforms.linux; # maude is broken on darwin
+    # Has been broken for a while now:
+    # https://hydra.nixos.org/job/nixpkgs/trunk/tamarin-prover.x86_64-linux
+    broken = true;
   };
 
   # tamarin use symlinks to the LICENSE and Setup.hs files, so for these sublibraries

From 4a1965675a1cccdf4cf89e3c5996100a9315903f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 10:34:42 +0000
Subject: [PATCH 1966/6226] swiftformat: 0.58.4 -> 0.58.5

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

diff --git a/pkgs/by-name/sw/swiftformat/package.nix b/pkgs/by-name/sw/swiftformat/package.nix
index a5d177c872a1..a34e16966a33 100644
--- a/pkgs/by-name/sw/swiftformat/package.nix
+++ b/pkgs/by-name/sw/swiftformat/package.nix
@@ -12,13 +12,13 @@
 
 swift.stdenv.mkDerivation rec {
   pname = "swiftformat";
-  version = "0.58.4";
+  version = "0.58.5";
 
   src = fetchFromGitHub {
     owner = "nicklockwood";
     repo = "SwiftFormat";
     rev = version;
-    sha256 = "sha256-GFnFTRPf4sZhLXe+VnDOndS/GhhTkZZmTTj/gR05IcI=";
+    sha256 = "sha256-QTfdMJpdm4m2YSZefPclGcAZFjyFgJeeWIYLf3apuFo=";
   };
 
   nativeBuildInputs = [

From 41a460700200c2a7b4d42f33595a8f1fdccac4fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 10:38:19 +0000
Subject: [PATCH 1967/6226] stash: 0.28.1 -> 0.29.1

---
 pkgs/by-name/st/stash/version.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/st/stash/version.json b/pkgs/by-name/st/stash/version.json
index ddc3258c29e5..db05c8eee830 100644
--- a/pkgs/by-name/st/stash/version.json
+++ b/pkgs/by-name/st/stash/version.json
@@ -1,7 +1,7 @@
 {
-  "version": "0.28.1",
-  "gitHash": "cc6917f2",
-  "srcHash": "sha256-hUx4y7VzsZYbykt9eOdwho0f/Xueh2eh7QykCsgt62A=",
-  "yarnHash": "sha256-MEyhPPzqJH7lNB5CLMbehjJXU/HQUNsFtPrl670kTvA=",
-  "vendorHash": "sha256-bD2YpsrksvDWvrokvRBGdnAUNJ5XHD/jDrF5dSCESr0="
+  "version": "0.29.1",
+  "gitHash": "869cbd49",
+  "srcHash": "sha256-OM2tpa8m4QuUs/HABRt8t/WHNeHWtrbJPZvlKBHcj9Y=",
+  "yarnHash": "sha256-E5JJZa+P83CnNDyhfrMwjC0xoXIV2DfyslQTLard4uE=",
+  "vendorHash": "sha256-1YVtA+kE7QHW/ACr9GPh7P0yQHdmF2NdrQR06ke2idY="
 }

From 689bb003be33e8558ca159f104925df8d5b7795b Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Thu, 28 Aug 2025 02:05:17 +0200
Subject: [PATCH 1968/6226] ibus-engines.kkc: drop

---
 .../ibus-engines/ibus-kkc/default.nix         | 46 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 48 deletions(-)
 delete mode 100644 pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix

diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
deleted file mode 100644
index 93cc1b9daa4a..000000000000
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-kkc/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  vala,
-  intltool,
-  pkg-config,
-  libkkc,
-  ibus,
-  skkDictionaries,
-  gtk3,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "ibus-kkc";
-  version = "1.5.22";
-
-  src = fetchurl {
-    url = "${meta.homepage}/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "1kj74c9zy9yxkjx7pz96mzqc13cf10yfmlgprr8sfd4ay192bzi2";
-  };
-
-  nativeBuildInputs = [
-    vala
-    intltool
-    pkg-config
-  ];
-
-  buildInputs = [
-    libkkc
-    ibus
-    gtk3
-  ];
-
-  postInstall = ''
-    ln -s ${skkDictionaries.l}/share/skk $out/share/skk
-  '';
-
-  meta = with lib; {
-    isIbusEngine = true;
-    description = "Libkkc (Japanese Kana Kanji input method) engine for ibus";
-    homepage = "https://github.com/ueno/ibus-kkc";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c9a1f523aa80..6c0d7da1edb9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2474,8 +2474,6 @@ with pkgs;
 
     hangul = callPackage ../tools/inputmethods/ibus-engines/ibus-hangul { };
 
-    kkc = callPackage ../tools/inputmethods/ibus-engines/ibus-kkc { };
-
     libpinyin = callPackage ../tools/inputmethods/ibus-engines/ibus-libpinyin { };
 
     libthai = callPackage ../tools/inputmethods/ibus-engines/ibus-libthai { };

From d0ec96e6f29710a67129ad83c44dcc2d76987ac5 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Thu, 28 Aug 2025 02:08:54 +0200
Subject: [PATCH 1969/6226] libkkc-data: drop

---
 pkgs/by-name/li/libkkc-data/package.nix | 38 -------------------------
 pkgs/top-level/aliases.nix              |  1 +
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 pkgs/by-name/li/libkkc-data/package.nix

diff --git a/pkgs/by-name/li/libkkc-data/package.nix b/pkgs/by-name/li/libkkc-data/package.nix
deleted file mode 100644
index 85e9f3e7d256..000000000000
--- a/pkgs/by-name/li/libkkc-data/package.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  fetchpatch,
-  python3,
-  libkkc,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libkkc-data";
-  version = "0.2.7";
-
-  src = fetchurl {
-    url = "${meta.homepage}/releases/download/v${libkkc.version}/${pname}-${version}.tar.xz";
-    sha256 = "16avb50jasq2f1n9xyziky39dhlnlad0991pisk3s11hl1aqfrwy";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "build-python3.patch";
-      url = "https://github.com/ueno/libkkc/commit/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch";
-      relative = "data/templates/libkkc-data";
-      hash = "sha256-q4zUclJtDQ1E5v2PW00zRZz6GXllLUcp2h3tugufrRU=";
-    })
-  ];
-
-  nativeBuildInputs = [ python3.pkgs.marisa ];
-
-  strictDeps = true;
-
-  meta = with lib; {
-    description = "Language model data package for libkkc";
-    homepage = "https://github.com/ueno/libkkc";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 1a09ca02c33f..d76cbfa469b4 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1379,6 +1379,7 @@ mapAliases {
   libiconv-darwin = darwin.libiconv; # Added 2024-09-22
   libixp_hg = libixp; # Added 2022-04-25
   libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17
+  libkkc-data = throw "'libkkc-data' has been removed as it depended on libkkc which was removed"; # Added 2025-08-28
   liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17
   liblinphone = throw "'liblinphone' has been moved to 'linphonePackages.liblinphone'"; # Added 2025-09-20
   libmp3splt = throw "'libmp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17

From 84aad828626d38c01f8ca89d6a99ffefe89a4b3c Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Thu, 28 Aug 2025 01:57:04 +0200
Subject: [PATCH 1970/6226] libkkc: drop

---
 pkgs/by-name/li/libkkc/package.nix | 67 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 2 files changed, 1 insertion(+), 67 deletions(-)
 delete mode 100644 pkgs/by-name/li/libkkc/package.nix

diff --git a/pkgs/by-name/li/libkkc/package.nix b/pkgs/by-name/li/libkkc/package.nix
deleted file mode 100644
index 0788ab0cc610..000000000000
--- a/pkgs/by-name/li/libkkc/package.nix
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  fetchpatch,
-  vala,
-  gobject-introspection,
-  intltool,
-  python3,
-  glib,
-  pkg-config,
-  libgee,
-  json-glib,
-  marisa,
-  libkkc-data,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libkkc";
-  version = "0.3.5";
-
-  src = fetchurl {
-    url = "${meta.homepage}/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "89b07b042dae5726d306aaa1296d1695cb75c4516f4b4879bc3781fe52f62aef";
-  };
-
-  patches = [
-    (fetchpatch {
-      name = "build-python3.patch";
-      url = "https://github.com/ueno/libkkc/commit/ba1c1bd3eb86d887fc3689c3142732658071b5f7.patch";
-      hash = "sha256-4IVpcJJFrxmxJGNiRHteleAa6trOwbvMHRTE/qyjOPY=";
-    })
-  ];
-
-  nativeBuildInputs = [
-    vala
-    gobject-introspection
-    python3
-    python3.pkgs.marisa
-    intltool
-    glib
-    pkg-config
-  ];
-
-  buildInputs = [
-    marisa
-    libkkc-data
-  ];
-  enableParallelBuilding = true;
-
-  propagatedBuildInputs = [
-    libgee
-    json-glib
-  ];
-
-  postInstall = ''
-    ln -s ${libkkc-data}/lib/libkkc/models $out/share/libkkc/models
-  '';
-
-  meta = with lib; {
-    broken = true;
-    description = "Japanese Kana Kanji conversion input method library";
-    homepage = "https://github.com/ueno/libkkc";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d76cbfa469b4..bd97176bbf12 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1379,6 +1379,7 @@ mapAliases {
   libiconv-darwin = darwin.libiconv; # Added 2024-09-22
   libixp_hg = libixp; # Added 2022-04-25
   libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17
+  libkkc = throw "'libkkc' has been removed due to lack of maintenance. Consider using anthy instead"; # added 2025-08-28
   libkkc-data = throw "'libkkc-data' has been removed as it depended on libkkc which was removed"; # Added 2025-08-28
   liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17
   liblinphone = throw "'liblinphone' has been moved to 'linphonePackages.liblinphone'"; # Added 2025-09-20

From 6332c09ecef12b203a8c09ef8acd9767132937dc Mon Sep 17 00:00:00 2001
From: l1npengtul <l1npengtul@protonmail.com>
Date: Thu, 23 Oct 2025 19:43:25 +0900
Subject: [PATCH 1971/6226] sonobus: general cleanup, add desktop item, add
 nix-update-script

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

diff --git a/pkgs/by-name/so/sonobus/package.nix b/pkgs/by-name/so/sonobus/package.nix
index c3de44a3f59f..c300bf7ce724 100644
--- a/pkgs/by-name/so/sonobus/package.nix
+++ b/pkgs/by-name/so/sonobus/package.nix
@@ -17,8 +17,10 @@
   libopus,
   curl,
   gtk3,
+  nix-update-script,
+  copyDesktopItems,
+  makeDesktopItem,
 }:
-
 stdenv.mkDerivation (finalAttrs: {
   pname = "sonobus";
   version = "1.7.2";
@@ -31,10 +33,26 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
+  desktopItems = [
+    (makeDesktopItem {
+      type = "Application";
+      name = "sonobus";
+      desktopName = "Sonobus";
+      comment = "High-quality network audio streaming";
+      icon = "sonobus";
+      exec = "sonobus";
+      categories = [
+        "Audio"
+        "AudioVideo"
+      ];
+    })
+  ];
+
   nativeBuildInputs = [
     autoPatchelfHook
     cmake
     pkg-config
+    copyDesktopItems
   ];
 
   buildInputs = [
@@ -44,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: {
     libopus
     curl
     gtk3
-    # webkitgtk_4_0
   ];
 
   runtimeDependencies = [
@@ -71,17 +88,22 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preInstall
     cd ../linux
     ./install.sh "$out"
+
+    install -Dm444 $src/images/sonobus_logo_96.png $out/share/pixmaps/sonobus.png
+
     runHook postInstall
   '';
 
-  meta = with lib; {
-    # webkitgtk_4_0 was removed
-    broken = true;
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "High-quality network audio streaming";
     homepage = "https://sonobus.net/";
-    license = with licenses; [ gpl3Plus ];
-    maintainers = with maintainers; [ PowerUser64 ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      PowerUser64
+    ];
+    platforms = lib.platforms.unix;
     mainProgram = "sonobus";
   };
 })

From 01354e86ae44d76666446f2e0dab5a1ffa3c4609 Mon Sep 17 00:00:00 2001
From: l1npengtul <l1npengtul@protonmail.com>
Date: Thu, 23 Oct 2025 19:43:45 +0900
Subject: [PATCH 1972/6226] sonobus: add l1npengtul as maintainer

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

diff --git a/pkgs/by-name/so/sonobus/package.nix b/pkgs/by-name/so/sonobus/package.nix
index c300bf7ce724..ccff9bc0cb01 100644
--- a/pkgs/by-name/so/sonobus/package.nix
+++ b/pkgs/by-name/so/sonobus/package.nix
@@ -102,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       PowerUser64
+      l1npengtul
     ];
     platforms = lib.platforms.unix;
     mainProgram = "sonobus";

From cb883c36e3ee6551fa2b67c481a58d1186e83c38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 21 Oct 2025 16:59:53 +0200
Subject: [PATCH 1973/6226] nixos/facter: add boot and storage detection

This adds automatic kernel module detection for boot-critical hardware:

- disk.nix: Detects and loads kernel modules for storage controllers
  Auto-detects modules for: disk controllers, storage controllers,
  and FireWire controllers (for FireWire-attached disks).
  Modules are automatically added to boot.initrd.availableKernelModules.

- keyboard.nix: Detects USB controller drivers for keyboard support
  Ensures USB HID drivers are loaded in initrd for keyboard access
  during boot (critical for LUKS password entry, etc.).

Follow up to #454237.
Part of incremental upstreaming from nixos-facter-modules.
---
 nixos/modules/hardware/facter/default.nix  |  2 ++
 nixos/modules/hardware/facter/disk.nix     | 28 ++++++++++++++++++++++
 nixos/modules/hardware/facter/keyboard.nix | 21 ++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 nixos/modules/hardware/facter/disk.nix
 create mode 100644 nixos/modules/hardware/facter/keyboard.nix

diff --git a/nixos/modules/hardware/facter/default.nix b/nixos/modules/hardware/facter/default.nix
index 471bee49b95b..324471b16e70 100644
--- a/nixos/modules/hardware/facter/default.nix
+++ b/nixos/modules/hardware/facter/default.nix
@@ -5,6 +5,8 @@
 }:
 {
   imports = [
+    ./disk.nix
+    ./keyboard.nix
     ./system.nix
   ];
 
diff --git a/nixos/modules/hardware/facter/disk.nix b/nixos/modules/hardware/facter/disk.nix
new file mode 100644
index 000000000000..4bb76f16366d
--- /dev/null
+++ b/nixos/modules/hardware/facter/disk.nix
@@ -0,0 +1,28 @@
+{ lib, config, ... }:
+let
+  facterLib = import ./lib.nix lib;
+
+  inherit (config.hardware.facter) report;
+in
+{
+  options.hardware.facter.detected.boot.disk.kernelModules = lib.mkOption {
+    type = lib.types.listOf lib.types.str;
+    default = lib.uniqueStrings (
+      facterLib.collectDrivers (
+        # A disk might be attached.
+        (report.hardware.firewire_controller or [ ])
+        # definitely important
+        ++ (report.hardware.disk or [ ])
+        ++ (report.hardware.storage_controller or [ ])
+      )
+    );
+    defaultText = "hardware dependent";
+    description = ''
+      List of kernel modules that are needed to access the disk.
+    '';
+  };
+
+  config = {
+    boot.initrd.availableKernelModules = config.hardware.facter.detected.boot.disk.kernelModules;
+  };
+}
diff --git a/nixos/modules/hardware/facter/keyboard.nix b/nixos/modules/hardware/facter/keyboard.nix
new file mode 100644
index 000000000000..d19e17cd6901
--- /dev/null
+++ b/nixos/modules/hardware/facter/keyboard.nix
@@ -0,0 +1,21 @@
+{ lib, config, ... }:
+let
+  facterLib = import ./lib.nix lib;
+
+  inherit (config.hardware.facter) report;
+in
+{
+  options.hardware.facter.detected.boot.keyboard.kernelModules = lib.mkOption {
+    type = lib.types.listOf lib.types.str;
+    default = lib.uniqueStrings (facterLib.collectDrivers (report.hardware.usb_controller or [ ]));
+    defaultText = "hardware dependent";
+    example = [ "usbhid" ];
+    description = ''
+      List of kernel modules to include in the initrd to support the keyboard.
+    '';
+  };
+
+  config = {
+    boot.initrd.availableKernelModules = config.hardware.facter.detected.boot.keyboard.kernelModules;
+  };
+}

From 6898384e71123caed119cc8536381ab910f5d6d6 Mon Sep 17 00:00:00 2001
From: Yuriy Taraday <yuriy.taraday@tweag.io>
Date: Thu, 23 Oct 2025 12:52:52 +0200
Subject: [PATCH 1974/6226] netlify-cli: 19.0.2 -> 23.9.2

Upgrades for netlify-cli were broken for a while because postinstall
script was changed to not build the packages into dist directory ahead
of time, but rather expect the user to do this. Add an workaround to not
run postinstall logic entirely.
Also disable edge functions in tests using an internal flag, because
they try to download Deno, some types definitions, and maybe other stuff
at runtime.
---
 pkgs/by-name/ne/netlify-cli/package.nix | 12 +++++++++---
 pkgs/by-name/ne/netlify-cli/test.nix    |  9 +++++++--
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ne/netlify-cli/package.nix b/pkgs/by-name/ne/netlify-cli/package.nix
index e913e4bb00a7..ceda6d70bf65 100644
--- a/pkgs/by-name/ne/netlify-cli/package.nix
+++ b/pkgs/by-name/ne/netlify-cli/package.nix
@@ -11,16 +11,22 @@
 
 buildNpmPackage rec {
   pname = "netlify-cli";
-  version = "19.0.2";
+  version = "23.9.2";
 
   src = fetchFromGitHub {
     owner = "netlify";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-+P+hS/g/xRFNvzESZ5LyxyQSSRZ7BzCg9ZX/ndNLeDg=";
+    hash = "sha256-rjxm/TrKsvYCKwoHkZRZXFpFTfLd0s0D/H6p5Bull0E=";
   };
 
-  npmDepsHash = "sha256-3C+tTqLJCm48pAbQMiIq2SsHmb4bcCaf3IU/cTeR5BA=";
+  # Prevent postinstall script from running before package is built
+  # See https://github.com/netlify/cli/blob/v23.9.2/scripts/postinstall.js#L70
+  postPatch = ''
+    touch .git
+  '';
+
+  npmDepsHash = "sha256-itzEmCOBXxspGiwxt8t6di7/EuCo2Qkl5JVSkMfUemI=";
 
   inherit nodejs;
 
diff --git a/pkgs/by-name/ne/netlify-cli/test.nix b/pkgs/by-name/ne/netlify-cli/test.nix
index 2d311105a094..cb36c91fb253 100644
--- a/pkgs/by-name/ne/netlify-cli/test.nix
+++ b/pkgs/by-name/ne/netlify-cli/test.nix
@@ -27,10 +27,15 @@ runCommand "netlify-cli-test"
     echo '/with-redirect /' >_redirects
 
     # Start a local server and wait for it to respond
-    netlify dev --offline --port 8888 2>&1 | tee log &
+    # Edge functions require specific version of Deno and internet access for other Netlify stuff
+    netlify dev --offline --internal-disable-edge-functions --port 8888 --debug 2>&1 | tee log &
     sleep 0.1 || true
     for (( i=0; i<300; i++ )); do
-      if grep --ignore-case 'Server now ready' <log; then
+      if ! jobs %% > /dev/null; then
+        echo "Server died before starting" >&2
+        exit 1
+      fi
+      if grep --ignore-case 'Local dev server ready' <log; then
         break
       else
         sleep 1

From dc34f40b5de2704be21eb5632f1919e7f6ffaf54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 11:03:06 +0000
Subject: [PATCH 1975/6226] python3Packages.mdformat-wikilink: 0.2.0 -> 0.3.0

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

diff --git a/pkgs/development/python-modules/mdformat-wikilink/default.nix b/pkgs/development/python-modules/mdformat-wikilink/default.nix
index 0c3c119a632b..5378eade888e 100644
--- a/pkgs/development/python-modules/mdformat-wikilink/default.nix
+++ b/pkgs/development/python-modules/mdformat-wikilink/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "mdformat-wikilink";
-  version = "0.2.0";
+  version = "0.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tmr232";
     repo = "mdformat-wikilink";
     tag = "v${version}";
-    hash = "sha256-KOPh9iZfb3GCvslQeYBgqNaOyqtWi2llkaiWE7nmcJo=";
+    hash = "sha256-tYUF5gNmXjzlf0jQg0tL2ayFGCSFFeYJHkWA6cYLpvI=";
   };
 
   build-system = [ poetry-core ];

From 529c94a5ad1dc775e76907aed29b4b2988365a7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 11:03:17 +0000
Subject: [PATCH 1976/6226] cameractrls: 0.6.7 -> 0.6.8

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

diff --git a/pkgs/by-name/ca/cameractrls/package.nix b/pkgs/by-name/ca/cameractrls/package.nix
index 9d7f988d7009..1e6be24d57a3 100644
--- a/pkgs/by-name/ca/cameractrls/package.nix
+++ b/pkgs/by-name/ca/cameractrls/package.nix
@@ -40,14 +40,14 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "cameractrls";
-  version = "0.6.7";
+  version = "0.6.8";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "soyersoyer";
     repo = "cameractrls";
     rev = "v${version}";
-    hash = "sha256-MM+Py8tHtqJWIGmGg3RaIhJa0E1zM3hXOnTOqXPuejw=";
+    hash = "sha256-kc5/HbtDZHJHR2loo8Zs555GRW6ynSdBLr3Uowo+OEA=";
   };
 
   postPatch = ''

From 663318b71e9d9254972bb920f63432f90bba1c72 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Thu, 23 Oct 2025 17:51:01 +0800
Subject: [PATCH 1977/6226] qtcreator: Compile fixes for Qt 6.10

fix: https://github.com/NixOS/nixpkgs/issues/454783
---
 pkgs/development/tools/qtcreator/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix
index cabba61c97cc..98ab72525ac1 100644
--- a/pkgs/development/tools/qtcreator/default.nix
+++ b/pkgs/development/tools/qtcreator/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchurl,
+  fetchpatch,
   cmake,
   pkg-config,
   ninja,
@@ -39,6 +40,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-sOEY+fuJvnF2KLP5JRwpX6bfQfqLfYEhbi6tg1XlWhM=";
   };
 
+  patches = [
+    # QmlDesigner: Compile fixes for Qt 6.10 private API changes
+    (fetchpatch {
+      url = "https://github.com/qt-creator/qt-creator/commit/5a4c700ccefc76c7c531c834734e6fefa14b5364.patch";
+      hash = "sha256-BnS0HOqP5b7ZsVtuRpCK+TtoJj0yhodDuVtp+C3btIA=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config

From e1e356e70387b7c2dfcecd96b2afc2078f325493 Mon Sep 17 00:00:00 2001
From: Casey Link <unnamedrambler@gmail.com>
Date: Thu, 23 Oct 2025 13:07:44 +0200
Subject: [PATCH 1978/6226] tailwindcss_4: 4.1.14 -> 4.1.16

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

diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix
index da963b1858d1..107239a1850f 100644
--- a/pkgs/by-name/ta/tailwindcss_4/package.nix
+++ b/pkgs/by-name/ta/tailwindcss_4/package.nix
@@ -7,7 +7,7 @@
   makeWrapper,
 }:
 let
-  version = "4.1.14";
+  version = "4.1.16";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "tailwindcss has not been packaged for ${system} yet.";
 
@@ -22,10 +22,10 @@ let
 
   hash =
     {
-      aarch64-darwin = "sha256-5yK3UvUd74bULohrTBFx8tCaS+GnSHoKUeSv+OdgPOM=";
-      aarch64-linux = "sha256-MUlB9fbhQ+dOdAxYetH7qu3lRiVy3TMLvgk35hHpZts=";
-      x86_64-darwin = "sha256-Z7JbYQP6dndjflpd4zJ/7DM12jFtkNP9saTNcr2kHAo=";
-      x86_64-linux = "sha256-vDTDAbCAtua5jtJBGEGYM/lm9vNH5VaUXWVX02pEpW4=";
+      aarch64-darwin = "sha256-5s1EuBZ/V0bKMuVPahQR3RpsDdFdJqnCc7Oy7Z2H330=";
+      aarch64-linux = "sha256-ln60NPTWocDf2hBt7MZGy3QuBNdFqkhHJgI83Ua6jto=";
+      x86_64-darwin = "sha256-/eKu0JvyScq5+Yb9byCJ486anOHHhi/dv6gHxBfg9dM=";
+      x86_64-linux = "sha256-CeaHamPOsJzNflhn49uystxlw6Ly4v4hDWjqO8BDIFA=";
     }
     .${system} or throwSystem;
 in

From 5bfe61215f393ddeafeaf6315e3b733125ccb007 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 11:16:08 +0000
Subject: [PATCH 1979/6226] okms-cli: 0.4.0 -> 0.4.1

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

diff --git a/pkgs/by-name/ok/okms-cli/package.nix b/pkgs/by-name/ok/okms-cli/package.nix
index 9d66557ab71c..1fe0694acd66 100644
--- a/pkgs/by-name/ok/okms-cli/package.nix
+++ b/pkgs/by-name/ok/okms-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "okms-cli";
-  version = "0.4.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "ovh";
     repo = "okms-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XW+otYeEQAuPVOXI6unTi28vn6dvpO7aVkr2bZ039Mk=";
+    hash = "sha256-Wbb4M4tSLjpsm7K/Y0QDPxofeymw0zSRMcwvN+E3bLU=";
   };
 
-  vendorHash = "sha256-GxHOWJcRBBHVm/RLeXChSDg59sX6dnO+yKyNEvUNup4=";
+  vendorHash = "sha256-6S+8pNYZUp0REQ91gzktYQMziDb3w+/474pPbuxuASc=";
 
   ldflags = [
     "-s"

From f51a53d6fdd0c3c140ba1f4b0b1aeb3b1bfe9cbf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 11:24:55 +0000
Subject: [PATCH 1980/6226] readsb: 3.16.3 -> 3.16.5

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

diff --git a/pkgs/by-name/re/readsb/package.nix b/pkgs/by-name/re/readsb/package.nix
index 7813baddc5c4..280eec71ba1d 100644
--- a/pkgs/by-name/re/readsb/package.nix
+++ b/pkgs/by-name/re/readsb/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "readsb";
-  version = "3.16.3";
+  version = "3.16.5";
 
   src = fetchFromGitHub {
     owner = "wiedehopf";
     repo = "readsb";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IjARj2qC1/kwoVvc5SXkJmoDN2m1fjPWj7jVgHG8cWI=";
+    hash = "sha256-MYtrCjWuTEM8sYiDWbCL+BJVtdWuItduqEb4LQGiovs=";
   };
 
   strictDeps = true;

From 9a916280d8be761f8974ef251ebe594d62f4e530 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 11:28:10 +0000
Subject: [PATCH 1981/6226] 
 python3Packages.snakemake-interface-scheduler-plugins: 2.0.1 -> 2.0.2

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

diff --git a/pkgs/development/python-modules/snakemake-interface-scheduler-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-scheduler-plugins/default.nix
index ccad1ca6f6a2..bbceb3a22c30 100644
--- a/pkgs/development/python-modules/snakemake-interface-scheduler-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-scheduler-plugins/default.nix
@@ -7,13 +7,13 @@
 }:
 
 let
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-interface-scheduler-plugins";
     tag = "v${version}";
-    hash = "sha256-Z/rJGkby9AcYB+Gil00xhbrySChqEIEOtzLyzQPhObk=";
+    hash = "sha256-BowMwZllFR9IKYUMhISAbf606awTxfmS/nQxkGgb4y8=";
   };
 in
 buildPythonPackage {

From 6961589f103d9d2f2e4d37e1c1a7471bc36e8f5a Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Thu, 23 Oct 2025 13:28:25 +0200
Subject: [PATCH 1982/6226] signal-desktop: 7.75.1 -> 7.76.0

Changelog: https://github.com/signalapp/Signal-Desktop/releases/tag/v7.76.0
---
 pkgs/by-name/si/signal-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index e4f94e63f7c7..028c523da7e5 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -52,13 +52,13 @@ let
     '';
   });
 
-  version = "7.75.1";
+  version = "7.76.0";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-l5fMVXwuXHaGcBuemkwzUcEuktTseGL2k13oxoo81+0=";
+    hash = "sha256-zwywpQ/1LYSofXPMLtYt7c0PLlzgNedRGqslPJur61g=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -142,7 +142,7 @@ stdenv.mkDerivation (finalAttrs: {
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1760633959;
+    SOURCE_DATE_EPOCH = 1761172657;
   };
 
   preBuild = ''

From adb904feaad57481bb7feecc11d77d3f0dea4df5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 11:34:36 +0000
Subject: [PATCH 1983/6226] python3Packages.pbxproj: 4.3.0 -> 4.3.2

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

diff --git a/pkgs/development/python-modules/pbxproj/default.nix b/pkgs/development/python-modules/pbxproj/default.nix
index 74906b1414c7..38e8011b3690 100644
--- a/pkgs/development/python-modules/pbxproj/default.nix
+++ b/pkgs/development/python-modules/pbxproj/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pbxproj";
-  version = "4.3.0";
+  version = "4.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kronenthaler";
     repo = "mod-pbxproj";
     tag = version;
-    hash = "sha256-A7kYjlMr0PDZHdZLhs7Mn2Ihx0XKQUbVaRgWcMoWM7E=";
+    hash = "sha256-Kwt/ellGOZBenYBCCW13pSMsPVdJyiEklIPMtw/UDvI=";
   };
 
   build-system = [ setuptools ];

From 17427f0ed7b2ad26b35cd761886ce355a8a7b7cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 11:41:39 +0000
Subject: [PATCH 1984/6226] moonraker: 0.9.3-unstable-2025-09-22 ->
 0.9.3-unstable-2025-10-20

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

diff --git a/pkgs/by-name/mo/moonraker/package.nix b/pkgs/by-name/mo/moonraker/package.nix
index c04ddd2e4af1..f34241bebd57 100644
--- a/pkgs/by-name/mo/moonraker/package.nix
+++ b/pkgs/by-name/mo/moonraker/package.nix
@@ -35,13 +35,13 @@ let
 in
 stdenvNoCC.mkDerivation rec {
   pname = "moonraker";
-  version = "0.9.3-unstable-2025-09-22";
+  version = "0.9.3-unstable-2025-10-20";
 
   src = fetchFromGitHub {
     owner = "Arksine";
     repo = "moonraker";
-    rev = "72ca7dbe057c00c3a34013d0c56fda0ab9bbfffe";
-    sha256 = "sha256-yQmJ78Gj2ilxKQ21tx0fimo9cYFlSyTmcVgC6OwxmkQ=";
+    rev = "8426f4107c7afb9adf876fce53b2cd725370523a";
+    sha256 = "sha256-gNmgUwp+OHW18Ylzzve1Ey63L5kobOoldAkr0VdfG3w=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From a8204745e51ab28628d555c9665edde63e48d755 Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Tue, 22 Jul 2025 16:10:38 -0400
Subject: [PATCH 1985/6226] treewide: remove packages which depend on freeimage

freeimage support was dropped in 608422bd4ba43, so these
no longer build. Removing the most obvious dependents of
the library.
---
 pkgs/by-name/ar/arrayfire/no-assets.patch     |  35 ---
 pkgs/by-name/ar/arrayfire/no-download.patch   |  31 ---
 pkgs/by-name/ar/arrayfire/package.nix         | 248 ------------------
 .../001-add-nixpkgs-retroarch-cores.patch     |  12 -
 .../em/emulationstation-de/package.nix        |  74 ------
 pkgs/by-name/em/emulationstation/package.nix  |  87 ------
 pkgs/by-name/em/emulationstation/sources.nix  |  35 ---
 pkgs/by-name/fo/forge/no-download-glad.patch  |  31 ---
 pkgs/by-name/fo/forge/package.nix             |  86 ------
 pkgs/by-name/ga/gamecube-tools/package.nix    |  33 ---
 pkgs/by-name/pe/perceptualdiff/package.nix    |  31 ---
 pkgs/by-name/pg/pgf_graphics/package.nix      |  43 ---
 pkgs/by-name/po/posterazor/package.nix        |  58 ----
 pkgs/by-name/ru/rucksack/package.nix          |  37 ---
 pkgs/by-name/tr/trenchbroom/package.nix       | 175 ------------
 pkgs/top-level/aliases.nix                    |  10 +
 16 files changed, 10 insertions(+), 1016 deletions(-)
 delete mode 100644 pkgs/by-name/ar/arrayfire/no-assets.patch
 delete mode 100644 pkgs/by-name/ar/arrayfire/no-download.patch
 delete mode 100644 pkgs/by-name/ar/arrayfire/package.nix
 delete mode 100644 pkgs/by-name/em/emulationstation-de/001-add-nixpkgs-retroarch-cores.patch
 delete mode 100644 pkgs/by-name/em/emulationstation-de/package.nix
 delete mode 100644 pkgs/by-name/em/emulationstation/package.nix
 delete mode 100644 pkgs/by-name/em/emulationstation/sources.nix
 delete mode 100644 pkgs/by-name/fo/forge/no-download-glad.patch
 delete mode 100644 pkgs/by-name/fo/forge/package.nix
 delete mode 100644 pkgs/by-name/ga/gamecube-tools/package.nix
 delete mode 100644 pkgs/by-name/pe/perceptualdiff/package.nix
 delete mode 100644 pkgs/by-name/pg/pgf_graphics/package.nix
 delete mode 100644 pkgs/by-name/po/posterazor/package.nix
 delete mode 100644 pkgs/by-name/ru/rucksack/package.nix
 delete mode 100644 pkgs/by-name/tr/trenchbroom/package.nix

diff --git a/pkgs/by-name/ar/arrayfire/no-assets.patch b/pkgs/by-name/ar/arrayfire/no-assets.patch
deleted file mode 100644
index b8820f8aa55b..000000000000
--- a/pkgs/by-name/ar/arrayfire/no-assets.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 12d6e557c..cc004555d 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -321,11 +321,6 @@ if(NOT TARGET nonstd::span-lite)
- 
- endif()
- 
--af_dep_check_and_populate(${assets_prefix}
--  URI https://github.com/arrayfire/assets.git
--  REF master
--)
--set(ASSETS_DIR ${${assets_prefix}_SOURCE_DIR})
- 
- # when crosscompiling use the bin2cpp file from the native bin directory
- if(CMAKE_CROSSCOMPILING)
-@@ -473,18 +468,6 @@ install(FILES ${ArrayFire_BINARY_DIR}/include/af/version.h
-         DESTINATION "${AF_INSTALL_INC_DIR}/af/"
-         COMPONENT headers)
- 
--# install the examples irrespective of the AF_BUILD_EXAMPLES value
--# only the examples source files are installed, so the installation of these
--# source files does not depend on AF_BUILD_EXAMPLES
--# when AF_BUILD_EXAMPLES is OFF, the examples source is installed without
--# building the example executables
--install(DIRECTORY examples/ #NOTE The slash at the end is important
--    DESTINATION ${AF_INSTALL_EXAMPLE_DIR}
--    COMPONENT examples)
--
--install(DIRECTORY ${ASSETS_DIR}/examples/ #NOTE The slash at the end is important
--    DESTINATION ${AF_INSTALL_EXAMPLE_DIR}
--    COMPONENT examples)
- 
- install(DIRECTORY "${ArrayFire_SOURCE_DIR}/LICENSES/"
-     DESTINATION LICENSES
diff --git a/pkgs/by-name/ar/arrayfire/no-download.patch b/pkgs/by-name/ar/arrayfire/no-download.patch
deleted file mode 100644
index f7903e74112d..000000000000
--- a/pkgs/by-name/ar/arrayfire/no-download.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/CMakeModules/AFconfigure_deps_vars.cmake b/CMakeModules/AFconfigure_deps_vars.cmake
-index aac332f5a..e9e711159 100644
---- a/CMakeModules/AFconfigure_deps_vars.cmake
-+++ b/CMakeModules/AFconfigure_deps_vars.cmake
-@@ -94,7 +94,7 @@ macro(af_dep_check_and_populate dep_prefix)
-         URL            ${adcp_args_URI}
-         URL_HASH       ${adcp_args_REF}
-         DOWNLOAD_COMMAND \"\"
--        UPDATE_DISCONNECTED ON
-+        UPDATE_COMMAND \"\"
-         SOURCE_DIR     "${ArrayFire_SOURCE_DIR}/extern/${dep_prefix}-src"
-         BINARY_DIR     "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-build"
-         SUBBUILD_DIR   "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-subbuild"
-@@ -104,7 +104,7 @@ macro(af_dep_check_and_populate dep_prefix)
-         QUIET
-         URL            ${adcp_args_URI}
-         DOWNLOAD_COMMAND \"\"
--        UPDATE_DISCONNECTED ON
-+        UPDATE_COMMAND \"\"
-         SOURCE_DIR     "${ArrayFire_SOURCE_DIR}/extern/${dep_prefix}-src"
-         BINARY_DIR     "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-build"
-         SUBBUILD_DIR   "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-subbuild"
-@@ -116,7 +116,7 @@ macro(af_dep_check_and_populate dep_prefix)
-         GIT_REPOSITORY ${adcp_args_URI}
-         GIT_TAG        ${adcp_args_REF}
-         DOWNLOAD_COMMAND \"\"
--        UPDATE_DISCONNECTED ON
-+        UPDATE_COMMAND \"\"
-         SOURCE_DIR     "${ArrayFire_SOURCE_DIR}/extern/${dep_prefix}-src"
-         BINARY_DIR     "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-build"
-         SUBBUILD_DIR   "${ArrayFire_BINARY_DIR}/extern/${dep_prefix}-subbuild"
diff --git a/pkgs/by-name/ar/arrayfire/package.nix b/pkgs/by-name/ar/arrayfire/package.nix
deleted file mode 100644
index 0cc0623a995d..000000000000
--- a/pkgs/by-name/ar/arrayfire/package.nix
+++ /dev/null
@@ -1,248 +0,0 @@
-{
-  blas,
-  boost,
-  clblast,
-  cmake,
-  config,
-  cudaPackages,
-  fetchFromGitHub,
-  fftw,
-  fftwFloat,
-  fmt_9,
-  forge,
-  freeimage,
-  gtest,
-  lapack,
-  lib,
-  libGL,
-  mesa,
-  ocl-icd,
-  opencl-clhpp,
-  pkg-config,
-  python3,
-  span-lite,
-  stdenv,
-  # NOTE: We disable tests by default, because they cannot be run easily on
-  # non-NixOS systems when either CUDA or OpenCL support is enabled (CUDA and
-  # OpenCL need access to drivers that are installed outside of Nix on
-  # non-NixOS systems).
-  doCheck ? false,
-  cpuSupport ? true,
-  cudaSupport ? config.cudaSupport,
-  # OpenCL needs mesa which is broken on Darwin
-  openclSupport ? !stdenv.hostPlatform.isDarwin,
-  # This argument lets one run CUDA & OpenCL tests on non-NixOS systems by
-  # telling Nix where to find the drivers. If you know the version of the
-  # Nvidia driver that is installed on your system, you can do:
-  #
-  # arrayfire.override {
-  #   nvidiaComputeDrivers =
-  #     callPackage
-  #       (prev.linuxPackages.nvidiaPackages.mkDriver {
-  #         version = cudaVersion; # our driver version
-  #         sha256_64bit = cudaHash; # sha256 of the .run binary
-  #         useGLVND = false;
-  #         useProfiles = false;
-  #         useSettings = false;
-  #         usePersistenced = false;
-  #         ...
-  #       })
-  #       { libsOnly = true; };
-  # }
-  nvidiaComputeDrivers ? null,
-  fetchpatch,
-}:
-
-# ArrayFire compiles with 64-bit BLAS, but some tests segfault or throw
-# exceptions, which means that it isn't really supported yet...
-assert blas.isILP64 == false;
-
-stdenv.mkDerivation rec {
-  pname = "arrayfire";
-  version = "3.9.0";
-
-  src = fetchFromGitHub {
-    owner = "arrayfire";
-    repo = "arrayfire";
-    rev = "v3.9.0";
-    hash = "sha256-80fxdkaeAQ5u0X/UGPaI/900cdkZ/vXNcOn5tkZ+C3Y=";
-  };
-
-  # We cannot use the clfft from Nixpkgs because ArrayFire maintain a fork
-  # of clfft where they've modified the CMake build system, and the
-  # CMakeLists.txt of ArrayFire assumes that we're using that fork.
-  #
-  # This can be removed once ArrayFire upstream their changes.
-  clfft = fetchFromGitHub {
-    owner = "arrayfire";
-    repo = "clfft";
-    rev = "760096b37dcc4f18ccd1aac53f3501a83b83449c";
-    sha256 = "sha256-vJo1YfC2AJIbbRj/zTfcOUmi0Oj9v64NfA9MfK8ecoY=";
-  };
-  glad = fetchFromGitHub {
-    owner = "arrayfire";
-    repo = "glad";
-    rev = "ef8c5508e72456b714820c98e034d9a55b970650";
-    sha256 = "sha256-u9Vec7XLhE3xW9vzM7uuf+b18wZsh/VMtGbB6nMVlno=";
-  };
-  threads = fetchFromGitHub {
-    owner = "arrayfire";
-    repo = "threads";
-    rev = "4d4a4f0384d1ac2f25b2c4fc1d57b9e25f4d6818";
-    sha256 = "sha256-qqsT9woJDtQvzuV323OYXm68pExygYs/+zZNmg2sN34=";
-  };
-  test-data = fetchFromGitHub {
-    owner = "arrayfire";
-    repo = "arrayfire-data";
-    rev = "a5f533d7b864a4d8f0dd7c9aaad5ff06018c4867";
-    sha256 = "sha256-AWzhsrDXyZrQN2bd0Ng/XlE8v02x7QWTiFTyaAuRXSw=";
-  };
-  # ArrayFire fails to compile with newer versions of spdlog, so we can't use
-  # the one in Nixpkgs. Once they upgrade, we can switch to using spdlog from
-  # Nixpkgs.
-  spdlog = fetchFromGitHub {
-    owner = "gabime";
-    repo = "spdlog";
-    rev = "v1.9.2";
-    hash = "sha256-GSUdHtvV/97RyDKy8i+ticnSlQCubGGWHg4Oo+YAr8Y=";
-  };
-
-  cmakeFlags = [
-    "-DBUILD_TESTING=ON"
-    # We do not build examples, because building tests already takes long enough...
-    "-DAF_BUILD_EXAMPLES=OFF"
-    # No need to build forge, because it's a separate package
-    "-DAF_BUILD_FORGE=OFF"
-    "-DAF_COMPUTE_LIBRARY='FFTW/LAPACK/BLAS'"
-    # Prevent ArrayFire from trying to download some matrices from the Internet
-    "-DAF_TEST_WITH_MTX_FILES=OFF"
-    # Have to use the header-only version, because we're not using the version
-    # from Nixpkgs. Otherwise, libaf.so won't be able to find the shared
-    # library, because ArrayFire's CMake files do not run the install step of
-    # spdlog.
-    "-DAF_WITH_SPDLOG_HEADER_ONLY=ON"
-    (if cpuSupport then "-DAF_BUILD_CPU=ON" else "-DAF_BUILD_CPU=OFF")
-    (if openclSupport then "-DAF_BUILD_OPENCL=ON" else "-DAF_BUILD_OPENCL=OFF")
-    (if cudaSupport then "-DAF_BUILD_CUDA=ON" else "-DAF_BUILD_CUDA=OFF")
-  ]
-  ++ lib.optionals cudaSupport [
-    # ArrayFire use deprecated FindCUDA in their CMake files, so we help CMake
-    # locate cudatoolkit.
-    "-DCUDA_LIBRARIES_PATH=${cudaPackages.cudatoolkit}/lib"
-  ];
-
-  # ArrayFire have a repo with assets for the examples. Since we don't build
-  # the examples anyway, remove the dependency on assets.
-  patches = [
-    ./no-assets.patch
-    ./no-download.patch
-    # Fix for newer opencl-clhpp. Remove with the next release.
-    (fetchpatch {
-      url = "https://github.com/arrayfire/arrayfire/pull/3562.patch";
-      hash = "sha256-AdWlpcRTn9waNAaVpZfK6sJ/xBQLiBC4nBeEYiGNN50";
-    })
-  ];
-
-  postPatch = ''
-    mkdir -p ./extern/af_glad-src
-    mkdir -p ./extern/af_threads-src
-    mkdir -p ./extern/af_test_data-src
-    mkdir -p ./extern/ocl_clfft-src
-    mkdir -p ./extern/spdlog-src
-    cp -R --no-preserve=mode,ownership ${glad}/* ./extern/af_glad-src/
-    cp -R --no-preserve=mode,ownership ${threads}/* ./extern/af_threads-src/
-    cp -R --no-preserve=mode,ownership ${test-data}/* ./extern/af_test_data-src/
-    cp -R --no-preserve=mode,ownership ${clfft}/* ./extern/ocl_clfft-src/
-    cp -R --no-preserve=mode,ownership ${spdlog}/* ./extern/spdlog-src/
-
-    # libaf.so (the unified backend) tries to load the right shared library at
-    # runtime, and the search paths are hard-coded... We tweak them to point to
-    # the installation directory in the Nix store.
-    substituteInPlace src/api/unified/symbol_manager.cpp \
-      --replace '"/opt/arrayfire-3/lib/",' \
-                "\"$out/lib/\", \"/opt/arrayfire-3/lib/\","
-  '';
-
-  inherit doCheck;
-  checkPhase =
-    let
-      LD_LIBRARY_PATH = builtins.concatStringsSep ":" (
-        [
-          "${forge}/lib"
-          "${freeimage}/lib"
-        ]
-        ++ lib.optional cudaSupport "${cudaPackages.cudatoolkit}/lib64"
-        # On non-NixOS systems, help the tests find Nvidia drivers
-        ++ lib.optional (nvidiaComputeDrivers != null) "${nvidiaComputeDrivers}/lib"
-      );
-      ctestFlags = builtins.concatStringsSep " " (
-        # We have to run with "-j1" otherwise various segfaults occur on non-NixOS systems.
-        [
-          "--output-on-errors"
-          "-j1"
-        ]
-        # See https://github.com/arrayfire/arrayfire/issues/3484
-        ++ lib.optional openclSupport "-E '(inverse_dense|cholesky_dense)'"
-      );
-    in
-    ''
-      export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}
-    ''
-    +
-      # On non-NixOS systems, help the tests find Nvidia drivers
-      lib.optionalString (openclSupport && nvidiaComputeDrivers != null) ''
-        export OCL_ICD_VENDORS=${nvidiaComputeDrivers}/etc/OpenCL/vendors
-      ''
-    + ''
-      # Note: for debugging, enable AF_TRACE=all
-      AF_PRINT_ERRORS=1 ctest ${ctestFlags}
-    '';
-
-  buildInputs = [
-    blas
-    boost.dev
-    boost.out
-    clblast
-    fftw
-    fftwFloat
-    # We need fmt_9 because ArrayFire fails to compile with newer versions.
-    fmt_9
-    forge
-    freeimage
-    gtest
-    lapack
-    libGL
-    ocl-icd
-    opencl-clhpp
-    span-lite
-  ]
-  ++ lib.optionals cudaSupport [
-    cudaPackages.cudatoolkit
-    cudaPackages.cudnn
-    cudaPackages.cuda_cccl
-  ]
-  ++ lib.optionals openclSupport [
-    mesa
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    python3
-  ];
-
-  meta = with lib; {
-    description = "General-purpose library for parallel and massively-parallel computations";
-    longDescription = ''
-      A general-purpose library that simplifies the process of developing software that targets parallel and massively-parallel architectures including CPUs, GPUs, and other hardware acceleration devices.";
-    '';
-    license = licenses.bsd3;
-    homepage = "https://arrayfire.com/";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
-      chessai
-      twesterhout
-    ];
-    broken = true;
-  };
-}
diff --git a/pkgs/by-name/em/emulationstation-de/001-add-nixpkgs-retroarch-cores.patch b/pkgs/by-name/em/emulationstation-de/001-add-nixpkgs-retroarch-cores.patch
deleted file mode 100644
index 5c9b3d194392..000000000000
--- a/pkgs/by-name/em/emulationstation-de/001-add-nixpkgs-retroarch-cores.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/resources/systems/linux/es_find_rules.xml	2024-09-13 16:19:36.000000000 +0300
-+++ b/resources/systems/linux/es_find_rules.xml	2024-11-26 23:08:49.204498848 +0200
-@@ -41,6 +41,9 @@
-             <entry>/usr/lib64/libretro</entry>
-             <!-- Manjaro repository -->
-             <entry>/usr/lib/libretro</entry>
-+            <!-- NixOS and Nixpkgs repository -->
-+            <entry>/run/current-system/sw/lib/retroarch/cores</entry>
-+            <entry>~/.nix-profile/lib/retroarch/cores</entry>
-         </rule>
-     </core>
-     <emulator name="3DSEN-WINDOWS">
diff --git a/pkgs/by-name/em/emulationstation-de/package.nix b/pkgs/by-name/em/emulationstation-de/package.nix
deleted file mode 100644
index 7646b0754512..000000000000
--- a/pkgs/by-name/em/emulationstation-de/package.nix
+++ /dev/null
@@ -1,74 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchzip,
-  cmake,
-  pkg-config,
-  alsa-lib,
-  bluez,
-  curl,
-  ffmpeg,
-  freeimage,
-  freetype,
-  gettext,
-  harfbuzz,
-  icu,
-  libgit2,
-  poppler,
-  pugixml,
-  SDL2,
-  libGL,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "emulationstation-de";
-  version = "3.2.0";
-
-  src = fetchzip {
-    url = "https://gitlab.com/es-de/emulationstation-de/-/archive/v${finalAttrs.version}/emulationstation-de-v${finalAttrs.version}.tar.gz";
-    hash = "sha256-tW8+7ImcJ3mBhoIHVE8h4cba+4SQLP55kiFYE7N8jyI=";
-  };
-
-  patches = [
-    ./001-add-nixpkgs-retroarch-cores.patch
-  ];
-
-  postPatch = ''
-    # ldd-based detection fails for cross builds
-    substituteInPlace CMake/Packages/FindPoppler.cmake \
-      --replace-fail 'GET_PREREQUISITES("''${POPPLER_LIBRARY}" POPPLER_PREREQS 1 0 "" "")' ""
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    gettext # msgfmt
-    pkg-config
-  ];
-
-  buildInputs = [
-    alsa-lib
-    bluez
-    curl
-    ffmpeg
-    freeimage
-    freetype
-    harfbuzz
-    icu
-    libgit2
-    poppler
-    pugixml
-    SDL2
-    libGL
-  ];
-
-  cmakeFlags = [ (lib.cmakeBool "APPLICATION_UPDATER" false) ];
-
-  meta = {
-    description = "ES-DE (EmulationStation Desktop Edition) is a frontend for browsing and launching games from your multi-platform collection";
-    homepage = "https://es-de.org";
-    maintainers = with lib.maintainers; [ ivarmedi ];
-    license = lib.licenses.mit;
-    platforms = lib.platforms.linux;
-    mainProgram = "es-de";
-  };
-})
diff --git a/pkgs/by-name/em/emulationstation/package.nix b/pkgs/by-name/em/emulationstation/package.nix
deleted file mode 100644
index eb8c048d4ea1..000000000000
--- a/pkgs/by-name/em/emulationstation/package.nix
+++ /dev/null
@@ -1,87 +0,0 @@
-{
-  lib,
-  SDL2,
-  alsa-lib,
-  boost,
-  callPackage,
-  cmake,
-  curl,
-  freeimage,
-  freetype,
-  libGL,
-  libGLU,
-  libvlc,
-  pkg-config,
-  rapidjson,
-  stdenv,
-}:
-
-let
-  sources = callPackage ./sources.nix { };
-in
-stdenv.mkDerivation {
-  inherit (sources.emulationstation) pname version src;
-
-  postUnpack = ''
-    pushd $sourceRoot/external/pugixml
-    cp --verbose --archive ${sources.pugixml.src}/* .
-    chmod --recursive 744 .
-    popd
-  '';
-
-  nativeBuildInputs = [
-    SDL2
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    SDL2
-    alsa-lib
-    boost
-    curl
-    freeimage
-    freetype
-    libGL
-    libGLU
-    libvlc
-    rapidjson
-  ];
-
-  cmakeFlags = [ (lib.cmakeBool "GL" true) ];
-
-  strictDeps = true;
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 ../emulationstation $out/bin/emulationstation
-    mkdir -p $out/share/emulationstation/
-    cp -r ../resources $out/share/emulationstation/
-
-    runHook postInstall
-  '';
-
-  # es-core/src/resources/ResourceManager.cpp: resources are searched at the
-  # same place of binaries.
-  postFixup = ''
-    pushd $out
-    ln -s $out/share/emulationstation/resources $out/bin/
-    popd
-  '';
-
-  passthru = {
-    inherit sources;
-  };
-
-  meta = {
-    homepage = "https://github.com/RetroPie/EmulationStation";
-    description = "Flexible emulator front-end supporting keyboardless navigation and custom system themes (forked by RetroPie)";
-    license = with lib.licenses; [ mit ];
-    mainProgram = "emulationstation";
-    maintainers = with lib.maintainers; [
-      edwtjo
-    ];
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/by-name/em/emulationstation/sources.nix b/pkgs/by-name/em/emulationstation/sources.nix
deleted file mode 100644
index 88273e845fee..000000000000
--- a/pkgs/by-name/em/emulationstation/sources.nix
+++ /dev/null
@@ -1,35 +0,0 @@
-{ fetchFromGitHub }:
-
-{
-  emulationstation =
-    let
-      self = {
-        pname = "emulationstation";
-        version = "2.11.2";
-
-        src = fetchFromGitHub {
-          owner = "RetroPie";
-          repo = "EmulationStation";
-          rev = "v${self.version}";
-          hash = "sha256-f2gRkp+3Pp2qnvg2RBzaHPpzhAnwx0+5x1Pe3kD90xE=";
-        };
-      };
-    in
-    self;
-
-  pugixml =
-    let
-      self = {
-        pname = "pugixml";
-        version = "1.8.1";
-
-        src = fetchFromGitHub {
-          owner = "zeux";
-          repo = "pugixml";
-          rev = "v${self.version}";
-          hash = "sha256-LbjTN1hnIbqI79C+gCdwuDG0+B/5yXf7hg0Q+cDFIf4=";
-        };
-      };
-    in
-    self;
-}
diff --git a/pkgs/by-name/fo/forge/no-download-glad.patch b/pkgs/by-name/fo/forge/no-download-glad.patch
deleted file mode 100644
index 0957be82a3b7..000000000000
--- a/pkgs/by-name/fo/forge/no-download-glad.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/CMakeModules/ForgeConfigureDepsVars.cmake b/CMakeModules/ForgeConfigureDepsVars.cmake
-index ee5c2fc..2f75181 100644
---- a/CMakeModules/ForgeConfigureDepsVars.cmake
-+++ b/CMakeModules/ForgeConfigureDepsVars.cmake
-@@ -84,7 +84,7 @@ macro(fg_dep_check_and_populate dep_prefix)
-         URL            ${fdcp_args_URI}
-         URL_HASH       ${fdcp_args_REF}
-         DOWNLOAD_COMMAND \"\"
--        UPDATE_DISCONNECTED ON
-+        UPDATE_COMMAND \"\"
-         SOURCE_DIR     "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src"
-         BINARY_DIR     "${Forge_BINARY_DIR}/extern/${dep_prefix}-build"
-         SUBBUILD_DIR   "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild"
-@@ -94,7 +94,7 @@ macro(fg_dep_check_and_populate dep_prefix)
-         QUIET
-         URL            ${fdcp_args_URI}
-         DOWNLOAD_COMMAND \"\"
--        UPDATE_DISCONNECTED ON
-+        UPDATE_COMMAND \"\"
-         SOURCE_DIR     "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src"
-         BINARY_DIR     "${Forge_BINARY_DIR}/extern/${dep_prefix}-build"
-         SUBBUILD_DIR   "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild"
-@@ -106,7 +106,7 @@ macro(fg_dep_check_and_populate dep_prefix)
-         GIT_REPOSITORY ${fdcp_args_URI}
-         GIT_TAG        ${fdcp_args_REF}
-         DOWNLOAD_COMMAND \"\"
--        UPDATE_DISCONNECTED ON
-+        UPDATE_COMMAND \"\"
-         SOURCE_DIR     "${Forge_SOURCE_DIR}/extern/${dep_prefix}-src"
-         BINARY_DIR     "${Forge_BINARY_DIR}/extern/${dep_prefix}-build"
-         SUBBUILD_DIR   "${Forge_BINARY_DIR}/extern/${dep_prefix}-subbuild"
diff --git a/pkgs/by-name/fo/forge/package.nix b/pkgs/by-name/fo/forge/package.nix
deleted file mode 100644
index 653f33eab53c..000000000000
--- a/pkgs/by-name/fo/forge/package.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  boost,
-  cmake,
-  expat,
-  fetchFromGitHub,
-  fontconfig,
-  freeimage,
-  freetype,
-  glfw3,
-  glm,
-  lib,
-  libGLU,
-  libGL,
-  libgbm,
-  opencl-clhpp,
-  pkg-config,
-  stdenv,
-  SDL2,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "forge";
-  version = "1.0.8";
-
-  src = fetchFromGitHub {
-    owner = "arrayfire";
-    repo = "forge";
-    rev = "v1.0.8";
-    sha256 = "sha256-lSZAwcqAHiuZkpYcVfwvZCfNmEF3xGN9S/HuZQrGeKU=";
-  };
-  glad = fetchFromGitHub {
-    owner = "arrayfire";
-    repo = "glad";
-    rev = "b94680aee5b8ce01ae1644c5f2661769366c765a";
-    hash = "sha256-CrZy76gOGMpy9f1NuMK4tokZ57U//zYeNH5ZYY0SC2U=";
-  };
-
-  # This patch ensures that Forge does not try to fetch glad from GitHub and
-  # uses our sources that we've checked out via Nix.
-  patches = [ ./no-download-glad.patch ];
-
-  postPatch = ''
-    mkdir -p ./extern
-    cp -R --no-preserve=mode,ownership ${glad} ./extern/fg_glad-src
-    ln -s ${opencl-clhpp} ./extern/cl2hpp
-  '';
-
-  cmakeFlags = [ "-DFETCHCONTENT_FULLY_DISCONNECTED=ON" ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  buildInputs = [
-    boost.out
-    boost.dev
-    expat
-    fontconfig
-    freeimage
-    freetype
-    glfw3
-    glm
-    libGL
-    libGLU
-    opencl-clhpp
-    SDL2
-    libgbm
-  ];
-
-  meta = with lib; {
-    description = "OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend";
-    longDescription = ''
-      An OpenGL interop library that can be used with ArrayFire or any other application using CUDA or OpenCL compute backend.
-      The goal of Forge is to provide high performance OpenGL visualizations for C/C++ applications that use CUDA/OpenCL.
-      Forge uses OpenGL >=3.3 forward compatible contexts, so please make sure you have capable hardware before trying it out.
-    '';
-    license = licenses.bsd3;
-    homepage = "https://arrayfire.com/";
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
-      chessai
-      twesterhout
-    ];
-  };
-}
diff --git a/pkgs/by-name/ga/gamecube-tools/package.nix b/pkgs/by-name/ga/gamecube-tools/package.nix
deleted file mode 100644
index edf3e5b21684..000000000000
--- a/pkgs/by-name/ga/gamecube-tools/package.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoreconfHook,
-  freeimage,
-  libGL,
-}:
-
-stdenv.mkDerivation rec {
-  version = "1.0.6";
-  pname = "gamecube-tools";
-
-  nativeBuildInputs = [ autoreconfHook ];
-  buildInputs = [
-    freeimage
-    libGL
-  ];
-
-  src = fetchFromGitHub {
-    owner = "devkitPro";
-    repo = "gamecube-tools";
-    rev = "v${version}";
-    sha256 = "sha256-GsTmwyxBc36Qg+UGy+cRAjGW1eh1XxV0s94B14ZJAjU=";
-  };
-
-  meta = with lib; {
-    description = "Tools for gamecube/wii projects";
-    homepage = "https://github.com/devkitPro/gamecube-tools/";
-    license = licenses.gpl2;
-    maintainers = with maintainers; [ tomsmeets ];
-  };
-}
diff --git a/pkgs/by-name/pe/perceptualdiff/package.nix b/pkgs/by-name/pe/perceptualdiff/package.nix
deleted file mode 100644
index 0f2154629c3d..000000000000
--- a/pkgs/by-name/pe/perceptualdiff/package.nix
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  freeimage,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "perceptualdiff";
-  version = "2.1";
-
-  src = fetchFromGitHub {
-    owner = "myint";
-    repo = "perceptualdiff";
-    rev = "v${version}";
-    sha256 = "176n518xv0pczf1yyz9r5a8zw5r6sh5ym596kmvw30qznp8n4a8j";
-  };
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [ freeimage ];
-
-  meta = with lib; {
-    description = "Program that compares two images using a perceptually based image metric";
-    homepage = "https://github.com/myint/perceptualdiff";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ uri-canva ];
-    platforms = platforms.unix;
-    mainProgram = "perceptualdiff";
-  };
-}
diff --git a/pkgs/by-name/pg/pgf_graphics/package.nix b/pkgs/by-name/pg/pgf_graphics/package.nix
deleted file mode 100644
index f92be10a6307..000000000000
--- a/pkgs/by-name/pg/pgf_graphics/package.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchzip,
-  autoreconfHook,
-  dos2unix,
-  doxygen,
-  freeimage,
-  libpgf,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "pgf";
-  version = "7.21.7";
-
-  src = fetchzip {
-    url = "mirror://sourceforge/libpgf/libpgf/${version}/pgf-console.zip";
-    hash = "sha256-W9eXYhbynLtvZQsn724Uw0SZ5TuyK2MwREwYKGFhJj0=";
-  };
-
-  postPatch = ''
-    find . -type f | xargs dos2unix
-    mv README.txt README
-  '';
-
-  nativeBuildInputs = [
-    autoreconfHook
-    dos2unix
-    doxygen
-  ];
-
-  buildInputs = [
-    freeimage
-    libpgf
-  ];
-
-  meta = {
-    homepage = "https://www.libpgf.org/";
-    description = "Progressive Graphics Format command line program";
-    license = lib.licenses.lgpl21Plus;
-    platforms = lib.platforms.linux;
-  };
-}
diff --git a/pkgs/by-name/po/posterazor/package.nix b/pkgs/by-name/po/posterazor/package.nix
deleted file mode 100644
index 300f959bb0f2..000000000000
--- a/pkgs/by-name/po/posterazor/package.nix
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  cmake,
-  unzip,
-  pkg-config,
-  libXpm,
-  fltk13,
-  freeimage,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "posterazor";
-  version = "1.5.1";
-
-  src = fetchurl {
-    url = "mirror://sourceforge/posterazor/${version}/PosteRazor-${version}-Source.zip";
-    hash = "sha256-BbujA2ASyqQelb3iFAwgeJC0OhzXqufIa1UD+tFsF7c=";
-  };
-
-  hardeningDisable = [ "format" ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    unzip
-  ];
-  buildInputs = [
-    libXpm
-    fltk13
-    freeimage
-  ];
-
-  unpackPhase = ''
-    unzip $src -d posterazor
-    cd posterazor/src
-  '';
-
-  # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667328
-  patchPhase = ''
-    sed "s/\(#define CASESENSITIVESTRCMP strcasecmp\)/#include <unistd.h>\n\1/" -i FlPosteRazorDialog.cpp
-  '';
-
-  installPhase = ''
-    mkdir -p $out/bin
-    cp PosteRazor $out/bin
-  '';
-
-  meta = with lib; {
-    homepage = "http://posterazor.sourceforge.net/";
-    description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.madjar ];
-    mainProgram = "PosteRazor";
-  };
-}
diff --git a/pkgs/by-name/ru/rucksack/package.nix b/pkgs/by-name/ru/rucksack/package.nix
deleted file mode 100644
index c6d84a6f2961..000000000000
--- a/pkgs/by-name/ru/rucksack/package.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  liblaxjson,
-  cmake,
-  freeimage,
-}:
-
-stdenv.mkDerivation rec {
-  version = "3.1.0";
-  pname = "rucksack";
-
-  src = fetchFromGitHub {
-    owner = "andrewrk";
-    repo = "rucksack";
-    rev = version;
-    sha256 = "0bcm20hqxqnq1j0zghb9i7z9frri6bbf7rmrv5g8dd626sq07vyv";
-  };
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [
-    liblaxjson
-    freeimage
-  ];
-
-  meta = with lib; {
-    description = "Texture packer and resource bundler";
-    platforms = [
-      "i686-linux"
-      "x86_64-linux"
-    ]; # fails on Darwin and AArch64
-    homepage = "https://github.com/andrewrk/rucksack";
-    license = licenses.mit;
-    maintainers = [ maintainers.andrewrk ];
-  };
-}
diff --git a/pkgs/by-name/tr/trenchbroom/package.nix b/pkgs/by-name/tr/trenchbroom/package.nix
deleted file mode 100644
index bc7a43919e18..000000000000
--- a/pkgs/by-name/tr/trenchbroom/package.nix
+++ /dev/null
@@ -1,175 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  writeText,
-  cmake,
-  ninja,
-  curl,
-  git,
-  pandoc,
-  pkg-config,
-  unzip,
-  zip,
-  libGL,
-  libGLU,
-  freeimage,
-  freetype,
-  assimp,
-  catch2,
-  fmt,
-  glew,
-  miniz,
-  tinyxml-2,
-  xorg,
-  qt6,
-  copyDesktopItems,
-  makeDesktopItem,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "TrenchBroom";
-  version = "2025.2";
-
-  src = fetchFromGitHub {
-    owner = "TrenchBroom";
-    repo = "TrenchBroom";
-    tag = "v${version}";
-    hash = "sha256-aOHhL0yBDgFTMcDY7RKZXRrReRiThcQdf7QMHEpRuks=";
-    fetchSubmodules = true;
-  };
-
-  # Manually simulate a vcpkg installation so that it can link the libraries
-  # properly.
-  postUnpack =
-    let
-      vcpkg_target = "x64-linux";
-
-      vcpkg_pkgs = [
-        "assimp"
-        "catch2"
-        "fmt"
-        "freeimage"
-        "freetype"
-        "glew"
-        "miniz"
-        "tinyxml2"
-      ];
-
-      updates_vcpkg_file = writeText "update_vcpkg_trenchbroom" (
-        lib.concatMapStringsSep "\n" (name: ''
-          Package : ${name}
-          Architecture : ${vcpkg_target}
-          Version : 1.0
-          Status : is installed
-        '') vcpkg_pkgs
-      );
-    in
-    ''
-      export VCPKG_ROOT="$TMP/vcpkg"
-
-      mkdir -p $VCPKG_ROOT/.vcpkg-root
-      mkdir -p $VCPKG_ROOT/installed/${vcpkg_target}/lib
-      mkdir -p $VCPKG_ROOT/installed/vcpkg/updates
-      ln -s ${updates_vcpkg_file} $VCPKG_ROOT/installed/vcpkg/status
-      mkdir -p $VCPKG_ROOT/installed/vcpkg/info
-      ${lib.concatMapStrings (name: ''
-        touch $VCPKG_ROOT/installed/vcpkg/info/${name}_1.0_${vcpkg_target}.list
-      '') vcpkg_pkgs}
-
-      ln -s ${assimp.lib}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
-      ln -s ${catch2}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
-      ln -s ${fmt}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
-      ln -s ${freeimage}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
-      ln -s ${freetype}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
-      ln -s ${glew.out}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
-      ln -s ${miniz}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
-      ln -s ${tinyxml-2}/lib/lib* $VCPKG_ROOT/installed/${vcpkg_target}/lib/
-    '';
-
-  postPatch = ''
-    substituteInPlace common/src/Version.h.in \
-      --subst-var-by APP_VERSION_YEAR ${lib.versions.major version} \
-      --subst-var-by APP_VERSION_NUMBER ${lib.versions.minor version} \
-      --subst-var-by GIT_DESCRIBE v${version}
-    substituteInPlace app/CMakeLists.txt \
-      --replace-fail 'set(CPACK_PACKAGING_INSTALL_PREFIX "/usr")' 'set(CPACK_PACKAGING_INSTALL_PREFIX "'$out'")'
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    ninja
-    curl
-    git
-    pandoc
-    qt6.wrapQtAppsHook
-    copyDesktopItems
-    pkg-config
-    unzip
-    zip
-  ];
-
-  buildInputs = [
-    libGL
-    libGLU
-    xorg.libXxf86vm
-    xorg.libSM
-    freeimage
-    freetype
-    qt6.qtbase
-    qt6.qtwayland
-    qt6.qtsvg
-    catch2
-    fmt
-    glew
-    miniz
-    tinyxml-2
-    assimp
-  ];
-
-  QT_PLUGIN_PATH = "${qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}";
-
-  QT_QPA_PLATFORM = "offscreen";
-
-  cmakeFlags = [
-    "-DCMAKE_MAKE_PROGRAM=ninja"
-    "-DCMAKE_TOOLCHAIN_FILE=vcpkg/scripts/buildsystems/vcpkg.cmake"
-    "-DVCPKG_MANIFEST_INSTALL=OFF"
-    # https://github.com/TrenchBroom/TrenchBroom/issues/4002#issuecomment-1125390780
-    "-DCMAKE_PREFIX_PATH=cmake/packages"
-  ];
-
-  ninjaFlags = [ "TrenchBroom" ];
-
-  postInstall = ''
-    pushd ../app/resources/linux/icons
-
-    for F in icon_*.png; do
-      SIZE=$(echo $F|sed -e s/icon_// -e s/.png//)
-      DIR=$out/share/icons/hicolor/$SIZE"x"$SIZE/apps
-      install -Dm644 $F $DIR/trenchbroom.png
-    done
-
-    popd
-  '';
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "TrenchBroom";
-      desktopName = "TrenchBroom level editor";
-      icon = "trenchbroom";
-      comment = meta.description;
-      categories = [ "Development" ];
-      exec = "trenchbroom";
-    })
-  ];
-
-  meta = {
-    homepage = "https://trenchbroom.github.io/";
-    changelog = "https://github.com/TrenchBroom/TrenchBroom/releases/tag/v${version}";
-    description = "Level editor for Quake-engine based games";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ astro ];
-    platforms = [ "x86_64-linux" ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9f8b8dd7d5ae..30eb6aa12ea8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -478,6 +478,7 @@ mapAliases {
   aria = aria2; # Added 2024-03-26
   artim-dark = aritim-dark; # Added 2025-07-27
   armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11
+  arrayfire = throw "arrayfire was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   aseprite-unfree = aseprite; # Added 2023-08-26
   asitop = macpm; # 'macpm' is a better-maintained downstream; keep 'asitop' for backwards-compatibility
   async = throw "'async' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
@@ -863,6 +864,8 @@ mapAliases {
 
   embree2 = throw "embree2 has been removed, as it is unmaintained upstream and depended on tbb_2020"; # Added 2025-09-14
   EmptyEpsilon = empty-epsilon; # Added 2024-07-14
+  emulationstation = throw "emulationstation was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
+  emulationstation-de = throw "emulationstation-de was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   enyo-doom = enyo-launcher; # Added 2022-09-09
   eolie = throw "'eolie' has been removed due to being unmaintained"; # Added 2025-04-15
   epapirus-icon-theme = throw "'epapirus-icon-theme' has been removed because 'papirus-icon-theme' no longer supports building with elementaryOS icon support"; # Added 2025-06-15
@@ -955,6 +958,7 @@ mapAliases {
   fntsample = throw "fntsample has been removed as it is unmaintained upstream"; # Added 2025-04-21
   foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2024-10-17
   follow = lib.warnOnInstantiate "follow has been renamed to folo" folo; # Added 2025-05-18
+  forge = throw "forge was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   forgejo-actions-runner = forgejo-runner; # Added 2024-04-04
   fornalder = throw "'fornalder' has been removed as it is unmaintained upstream"; # Added 2025-01-25
   foundationdb71 = throw "foundationdb71 has been removed; please upgrade to foundationdb73"; # Added 2024-12-28
@@ -984,6 +988,7 @@ mapAliases {
 
   g4music = gapless; # Added 2024-07-26
   g4py = throw "'g4py' has been renamed to/replaced by 'python3Packages.geant4'"; # Converted to throw 2024-10-17
+  gamecube-tools = throw "gamecube-tools was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   gamin = throw "'gamin' has been removed as it is unmaintained upstream"; # Added 2024-04-19
   garage_0_8 = throw "'garage_0_8' has been removed as it is unmaintained upstream"; # Added 2025-06-23
   garage_0_8_7 = throw "'garage_0_8_7' has been removed as it is unmaintained upstream"; # Added 2025-06-23
@@ -2073,6 +2078,7 @@ mapAliases {
   pds = lib.warnOnInstantiate "'pds' has been renamed to 'bluesky-pds'" bluesky-pds; # Added 2025-08-20
   pdsadmin = lib.warnOnInstantiate "'pdsadmin' has been renamed to 'bluesky-pdsadmin'" bluesky-pdsadmin; # Added 2025-08-20
   peach = asouldocs; # Added 2022-08-28
+  perceptual-diff = throw "perceptual-diff was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   percona-server_innovation = lib.warnOnInstantiate "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-server; # Added 2024-10-13
   percona-server_lts = percona-server; # Added 2024-10-13
   percona-xtrabackup_innovation = lib.warnOnInstantiate "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-xtrabackup; # Added 2024-10-13
@@ -2085,6 +2091,7 @@ mapAliases {
   petrinizer = throw "'petrinizer' has been removed, as it was broken and unmaintained"; # added 2024-05-09
   pg-gvm = throw "pg-gvm has been moved to postgresql.pkgs.pg-gvm to make it work with all versions of PostgreSQL"; # added 2024-11-30
   pgadmin = pgadmin4; # Added 2022-01-14
+  pgf_graphics = throw "pgf_graphics was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   pharo-spur64 = pharo; # Added 2022-08-03
   phlare = throw "'phlare' has been removed as the upstream project was archived."; # Added 2025-03-27
   php81 = throw "php81 is EOL";
@@ -2124,6 +2131,7 @@ mapAliases {
   polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25
   poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03
   posix_man_pages = throw "'posix_man_pages' has been renamed to/replaced by 'man-pages-posix'"; # Converted to throw 2024-10-17
+  posterazor = throw "posterazor was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   powerdns = pdns; # Added 2022-03-28
   postfixadmin = throw "'postfixadmin' has been removed due to lack of maintenance and missing support for PHP >8.1"; # Added 2025-10-03
   presage = throw "presage has been removed, as it has been unmaintained since 2018"; # Added 2024-03-24
@@ -2341,6 +2349,7 @@ mapAliases {
   rubyPackages_3_1 = throw "rubyPackages_3_1 has been removed, as it is has reached end‐of‐life upstream"; # Added 2025-10-12
   rubyPackages_3_2 = throw "rubyPackages_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-zoom = throw "'ruby-zoom' has been removed due to lack of maintaince and had not been updated since 2020"; # Added 2025-08-24
+  rucksack = throw "rucksack was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   runCommandNoCC = runCommand; # Added 2021-08-15
   runCommandNoCCLocal = runCommandLocal; # Added 2021-08-15
   run-scaled = throw "run-scaled has been removed due to being deprecated. Consider using run_scaled from 'xpra' instead"; # Added 2025-03-17
@@ -2633,6 +2642,7 @@ mapAliases {
   transcode = throw "transcode has been removed as it is unmaintained"; # Added 2024-12-11
   transfig = fig2dev; # Added 2022-02-15
   transifex-client = transifex-cli; # Added 2023-12-29
+  trenchbroom = throw "trenchbroom was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   trfl = throw "trfl has been removed, because it has not received an update for 3 years and was broken"; # Added 2024-07-25
   trezor_agent = trezor-agent; # Added 2024-01-07
   trilium-next-desktop = trilium-desktop; # Added 2025-08-30

From 71599f8f6cb28689a164c6caa116d1150ff7f7b3 Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Thu, 23 Oct 2025 19:47:01 +0800
Subject: [PATCH 1986/6226] wlroots: 0.19.1 -> 0.19.2

---
 pkgs/development/libraries/wlroots/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index 7518d68b2fb1..0a9ae47f1704 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -169,19 +169,10 @@ in
   };
 
   wlroots_0_19 = generic {
-    version = "0.19.1";
-    hash = "sha256-Q4x6obwzYYncgoUzqFVzn/scjxsiUeAIlEWY43emdvA=";
+    version = "0.19.2";
+    hash = "sha256-8VOhSaH9D0GkqyIP42W3uGcDT5ixPVDMT/OLlMXBNXA=";
     extraBuildInputs = [
       lcms2
     ];
-    patches = [
-      (fetchpatch {
-        # https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/5134
-        # > backend, output: send commit events after applying all in wlr_backend_commit()
-        # fixes potential crash in sway. Remove once a new release is made of wlroots
-        url = "https://gitlab.freedesktop.org/wlroots/wlroots/-/commit/7392b3313a7b483c61f4fea648ba8f2aa4ce8798.patch";
-        sha256 = "sha256-SK463pnIX2qjwRblCJRbvJeZTL6wAXho6wBIJ10OuNk=";
-      })
-    ];
   };
 }

From 6ebd17550c1323650ef2f80d80dd1e0d633d57b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 11:48:38 +0000
Subject: [PATCH 1987/6226] vcpkg: 2025.09.17 -> 2025.10.17

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

diff --git a/pkgs/by-name/vc/vcpkg/package.nix b/pkgs/by-name/vc/vcpkg/package.nix
index 9be733374954..8fbbcd9b3b4a 100644
--- a/pkgs/by-name/vc/vcpkg/package.nix
+++ b/pkgs/by-name/vc/vcpkg/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "vcpkg";
-  version = "2025.09.17";
+  version = "2025.10.17";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "vcpkg";
     tag = finalAttrs.version;
-    hash = "sha256-DySLGZrsUwXEW3NbcG6hEvcJZyPHub+oI9HWiKvYIpM=";
+    hash = "sha256-prWpMtvXWZ53y2gzr7IIqL/5kQZRfErnynEHMqi15/A=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"

From a25c8a70458c252f3a11929d9637ed9fb12df7c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 11:51:38 +0000
Subject: [PATCH 1988/6226] python3Packages.weblate-language-data: 2025.8 ->
 2025.9

---
 .../python-modules/weblate-language-data/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/weblate-language-data/default.nix b/pkgs/development/python-modules/weblate-language-data/default.nix
index de9f99097797..e9f957ebfe89 100644
--- a/pkgs/development/python-modules/weblate-language-data/default.nix
+++ b/pkgs/development/python-modules/weblate-language-data/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "weblate-language-data";
-  version = "2025.8";
+  version = "2025.9";
   pyproject = true;
 
   src = fetchPypi {
     pname = "weblate_language_data";
     inherit version;
-    hash = "sha256-buZNp7iWF7Ppx5RcTRs2kawwmzCPmwXSqarRbmgP0i8=";
+    hash = "sha256-sk53eGLPSfYoe4+BExIxINkFt/vcvkIIO5611hwx9uU=";
   };
 
   build-system = [ setuptools ];

From 3e505de718c840728e2c84890a5ed99eee8f26cd Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 23 Oct 2025 13:40:15 +0200
Subject: [PATCH 1989/6226] freeimage: drop

Very insecure.
---
 lib/licenses.nix                              |   5 -
 .../by-name/fr/freeimage/CVE-2020-24292.patch |  13 -
 .../by-name/fr/freeimage/CVE-2020-24293.patch |  14 -
 .../by-name/fr/freeimage/CVE-2020-24295.patch |  21 -
 .../by-name/fr/freeimage/CVE-2021-33367.patch |  19 -
 .../by-name/fr/freeimage/CVE-2021-40263.patch |  15 -
 .../by-name/fr/freeimage/CVE-2021-40266.patch |  14 -
 .../by-name/fr/freeimage/CVE-2023-47995.patch |  14 -
 .../by-name/fr/freeimage/CVE-2023-47997.patch |  16 -
 pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff  |  15 -
 pkgs/by-name/fr/freeimage/package.nix         | 170 -----
 pkgs/by-name/fr/freeimage/unbundle.diff       | 584 ------------------
 pkgs/by-name/im/imv/package.nix               |   3 +-
 pkgs/by-name/li/libtiff/package.nix           |   2 -
 pkgs/by-name/me/megacmd/package.nix           |   9 +-
 pkgs/development/lisp-modules/ql.nix          |   3 -
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   4 -
 18 files changed, 5 insertions(+), 917 deletions(-)
 delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2020-24292.patch
 delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2020-24293.patch
 delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2020-24295.patch
 delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2021-33367.patch
 delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2021-40263.patch
 delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2021-40266.patch
 delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2023-47995.patch
 delete mode 100644 pkgs/by-name/fr/freeimage/CVE-2023-47997.patch
 delete mode 100644 pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff
 delete mode 100644 pkgs/by-name/fr/freeimage/package.nix
 delete mode 100644 pkgs/by-name/fr/freeimage/unbundle.diff

diff --git a/lib/licenses.nix b/lib/licenses.nix
index 9e2edd69836a..b3d4a82b87c8 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -620,11 +620,6 @@ lib.mapAttrs mkLicense (
       fullName = "Unspecified free software license";
     };
 
-    freeimage = {
-      spdxId = "FreeImage";
-      fullName = "FreeImage Public License v1.0";
-    };
-
     fsl11Mit = {
       fullName = "Functional Source License, Version 1.1, MIT Future License";
       spdxId = "FSL-1.1-MIT";
diff --git a/pkgs/by-name/fr/freeimage/CVE-2020-24292.patch b/pkgs/by-name/fr/freeimage/CVE-2020-24292.patch
deleted file mode 100644
index 059bb5a520c2..000000000000
--- a/pkgs/by-name/fr/freeimage/CVE-2020-24292.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginICO.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginICO.cpp
---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginICO.cpp	2023-09-28 19:34:45.524031668 +0200
-+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginICO.cpp	2023-09-28 19:34:47.717009813 +0200
-@@ -301,6 +301,9 @@ LoadStandardIcon(FreeImageIO *io, fi_han
- 	int width  = bmih.biWidth;
- 	int height = bmih.biHeight / 2; // height == xor + and mask
- 	unsigned bit_count = bmih.biBitCount;
-+	if (bit_count != 1 && bit_count != 2 && bit_count != 4 && bit_count != 8 && bit_count != 16 && bit_count != 24 && bit_count != 32) {
-+	  return NULL;
-+	}
- 	unsigned line   = CalculateLine(width, bit_count);
- 	unsigned pitch  = CalculatePitch(line);
- 
diff --git a/pkgs/by-name/fr/freeimage/CVE-2020-24293.patch b/pkgs/by-name/fr/freeimage/CVE-2020-24293.patch
deleted file mode 100644
index d457ae51fe07..000000000000
--- a/pkgs/by-name/fr/freeimage/CVE-2020-24293.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp
---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp	2023-09-28 19:34:47.287014100 +0200
-+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp	2023-09-28 19:34:47.832008666 +0200
-@@ -780,6 +780,10 @@ int psdThumbnail::Read(FreeImageIO *io,
- 		FreeImage_Unload(_dib);
- 	}
- 
-+	if (_WidthBytes != _Width * _BitPerPixel / 8) {
-+	  throw "Invalid PSD image";
-+	}
-+
- 	if(_Format == 1) {
- 		// kJpegRGB thumbnail image
- 		_dib = FreeImage_LoadFromHandle(FIF_JPEG, io, handle);
diff --git a/pkgs/by-name/fr/freeimage/CVE-2020-24295.patch b/pkgs/by-name/fr/freeimage/CVE-2020-24295.patch
deleted file mode 100644
index 2f3bac236737..000000000000
--- a/pkgs/by-name/fr/freeimage/CVE-2020-24295.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp
---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PSDParser.cpp	2023-09-28 19:34:47.936007630 +0200
-+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PSDParser.cpp	2023-09-28 19:34:47.940007590 +0200
-@@ -1466,6 +1466,7 @@ FIBITMAP* psdParser::ReadImageData(FreeI
- 	const unsigned dstBpp =  (depth == 1) ? 1 : FreeImage_GetBPP(bitmap)/8;
- 	const unsigned dstLineSize = FreeImage_GetPitch(bitmap);
- 	BYTE* const dst_first_line = FreeImage_GetScanLine(bitmap, nHeight - 1);//<*** flipped
-+	const unsigned dst_buffer_size = dstLineSize * nHeight;
- 
- 	BYTE* line_start = new BYTE[lineSize]; //< fileline cache
- 
-@@ -1481,6 +1482,9 @@ FIBITMAP* psdParser::ReadImageData(FreeI
- 				const unsigned channelOffset = GetChannelOffset(bitmap, c) * bytes;
- 
- 				BYTE* dst_line_start = dst_first_line + channelOffset;
-+				if (channelOffset + lineSize > dst_buffer_size) {
-+					throw "Invalid PSD image";
-+				}
- 				for(unsigned h = 0; h < nHeight; ++h, dst_line_start -= dstLineSize) {//<*** flipped
- 					io->read_proc(line_start, lineSize, 1, handle);
- 					ReadImageLine(dst_line_start, line_start, lineSize, dstBpp, bytes);
diff --git a/pkgs/by-name/fr/freeimage/CVE-2021-33367.patch b/pkgs/by-name/fr/freeimage/CVE-2021-33367.patch
deleted file mode 100644
index 655a8e7f70cc..000000000000
--- a/pkgs/by-name/fr/freeimage/CVE-2021-33367.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/Metadata/Exif.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/Metadata/Exif.cpp
---- freeimage-svn-r1909-FreeImage-trunk/Source/Metadata/Exif.cpp	2023-09-28 19:34:45.003036859 +0200
-+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/Metadata/Exif.cpp	2023-09-28 19:34:47.505011926 +0200
-@@ -770,8 +770,13 @@ jpeg_read_exif_dir(FIBITMAP *dib, const
- 	//
- 
- 	const WORD entriesCount0th = ReadUint16(msb_order, ifd0th);
--	
--	DWORD next_offset = ReadUint32(msb_order, DIR_ENTRY_ADDR(ifd0th, entriesCount0th));
-+
-+	const BYTE* de_addr = DIR_ENTRY_ADDR(ifd0th, entriesCount0th);
-+	if(de_addr+4 >= (BYTE*)(dwLength + ifd0th - tiffp)) {
-+		return TRUE; //< no thumbnail
-+	}
-+
-+	DWORD next_offset = ReadUint32(msb_order, de_addr);
- 	if((next_offset == 0) || (next_offset >= dwLength)) {
- 		return TRUE; //< no thumbnail
- 	}
diff --git a/pkgs/by-name/fr/freeimage/CVE-2021-40263.patch b/pkgs/by-name/fr/freeimage/CVE-2021-40263.patch
deleted file mode 100644
index 11681c372be3..000000000000
--- a/pkgs/by-name/fr/freeimage/CVE-2021-40263.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp
---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp	2023-09-28 19:34:47.713009853 +0200
-+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp	2023-09-28 19:34:48.043006563 +0200
-@@ -2142,6 +2142,11 @@ Load(FreeImageIO *io, fi_handle handle,
- 				uint32_t tileRowSize = (uint32_t)TIFFTileRowSize(tif);
- 				uint32_t imageRowSize = (uint32_t)TIFFScanlineSize(tif);
- 
-+				if (width / tileWidth * tileRowSize * 8 > bitspersample * samplesperpixel * width) {
-+				  free(tileBuffer);
-+				  throw "Corrupted tiled TIFF file";
-+				}
-+
- 
- 				// In the tiff file the lines are saved from up to down 
- 				// In a DIB the lines must be saved from down to up
diff --git a/pkgs/by-name/fr/freeimage/CVE-2021-40266.patch b/pkgs/by-name/fr/freeimage/CVE-2021-40266.patch
deleted file mode 100644
index 8526f9814851..000000000000
--- a/pkgs/by-name/fr/freeimage/CVE-2021-40266.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp
---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp	2023-09-28 19:34:47.501011966 +0200
-+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp	2023-09-28 19:34:47.610010879 +0200
-@@ -372,6 +372,10 @@ static void
- ReadPalette(TIFF *tiff, uint16_t photometric, uint16_t bitspersample, FIBITMAP *dib) {
- 	RGBQUAD *pal = FreeImage_GetPalette(dib);
- 
-+	if (!pal) {
-+	  return;
-+	}
-+
- 	switch(photometric) {
- 		case PHOTOMETRIC_MINISBLACK:	// bitmap and greyscale image types
- 		case PHOTOMETRIC_MINISWHITE:
diff --git a/pkgs/by-name/fr/freeimage/CVE-2023-47995.patch b/pkgs/by-name/fr/freeimage/CVE-2023-47995.patch
deleted file mode 100644
index ccd623b81fa1..000000000000
--- a/pkgs/by-name/fr/freeimage/CVE-2023-47995.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginJPEG.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginJPEG.cpp
---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginJPEG.cpp	2024-03-10 14:22:17.818579271 +0100
-+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginJPEG.cpp	2024-03-10 14:22:18.776573816 +0100
-@@ -1086,6 +1086,10 @@ Load(FreeImageIO *io, fi_handle handle,
- 
- 			jpeg_read_header(&cinfo, TRUE);
- 
-+			if (cinfo.image_width > JPEG_MAX_DIMENSION || cinfo.image_height > JPEG_MAX_DIMENSION) {
-+				throw FI_MSG_ERROR_DIB_MEMORY;
-+			}
-+
- 			// step 4: set parameters for decompression
- 
- 			unsigned int scale_denom = 1;		// fraction by which to scale image
diff --git a/pkgs/by-name/fr/freeimage/CVE-2023-47997.patch b/pkgs/by-name/fr/freeimage/CVE-2023-47997.patch
deleted file mode 100644
index 2969c738c509..000000000000
--- a/pkgs/by-name/fr/freeimage/CVE-2023-47997.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -rupN --no-dereference freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp
---- freeimage-svn-r1909-FreeImage-trunk/Source/FreeImage/PluginTIFF.cpp	2024-03-10 14:22:18.669574426 +0100
-+++ freeimage-svn-r1909-FreeImage-trunk-new/Source/FreeImage/PluginTIFF.cpp	2024-03-10 14:22:18.673574403 +0100
-@@ -1484,6 +1484,12 @@ Load(FreeImageIO *io, fi_handle handle,
- 				(int)bitspersample, (int)samplesperpixel, (int)photometric);
- 			throw (char*)NULL;
- 		}
-+		if (planar_config == PLANARCONFIG_SEPARATE && bitspersample < 8) {
-+			FreeImage_OutputMessageProc(s_format_id,
-+				"Unable to handle this format: bitspersample = 8, TIFFTAG_PLANARCONFIG = PLANARCONFIG_SEPARATE"
-+			);
-+			throw (char*)NULL;
-+		}
- 
- 		// ---------------------------------------------------------------------------------
- 
diff --git a/pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff b/pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff
deleted file mode 100644
index 13abd5dd7089..000000000000
--- a/pkgs/by-name/fr/freeimage/libtiff-4.4.0.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix build with libtiff 4.4.0 by not using a private libtiff API.
-Patch by Kurt Schwehr: https://sourceforge.net/p/freeimage/discussion/36109/thread/2018fdc6e7/
-
-diff -ru a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp
---- a/Source/Metadata/XTIFF.cpp
-+++ b/Source/Metadata/XTIFF.cpp
-@@ -749,7 +749,7 @@
- 				continue;
- 			}
- 			// type of storage may differ (e.g. rationnal array vs float array type)
--			if((unsigned)_TIFFDataSize(tif_tag_type) != FreeImage_TagDataWidth(tag_type)) {
-+			if((unsigned)TIFFFieldSetGetSize(fld) != FreeImage_TagDataWidth(tag_type)) {
- 				// skip tag or _TIFFmemcpy will fail
- 				continue;
- 			}
diff --git a/pkgs/by-name/fr/freeimage/package.nix b/pkgs/by-name/fr/freeimage/package.nix
deleted file mode 100644
index e541840df2b5..000000000000
--- a/pkgs/by-name/fr/freeimage/package.nix
+++ /dev/null
@@ -1,170 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchsvn,
-  cctools,
-  libtiff,
-  libpng,
-  zlib,
-  libwebp,
-  libraw,
-  openexr,
-  openjpeg,
-  libjpeg,
-  jxrlib,
-  pkg-config,
-  fixDarwinDylibNames,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "freeimage";
-  version = "3.18.0-unstable-2024-04-18";
-
-  src = fetchsvn {
-    url = "svn://svn.code.sf.net/p/freeimage/svn/";
-    rev = "1911";
-    hash = "sha256-JznVZUYAbsN4FplnuXxCd/ITBhH7bfGKWXep2A6mius=";
-  };
-
-  sourceRoot = "${finalAttrs.src.name}/FreeImage/trunk";
-
-  # Ensure that the bundled libraries are not used at all
-  prePatch = ''
-    rm -rf Source/Lib* Source/OpenEXR Source/ZLib
-  '';
-
-  # Tell patch to work with trailing carriage returns
-  patchFlags = [
-    "-p1"
-    "--binary"
-  ];
-
-  patches = [
-    ./unbundle.diff
-    ./CVE-2020-24292.patch
-    ./CVE-2020-24293.patch
-    ./CVE-2020-24295.patch
-    ./CVE-2021-33367.patch
-    ./CVE-2021-40263.patch
-    ./CVE-2021-40266.patch
-    ./CVE-2023-47995.patch
-    ./CVE-2023-47997.patch
-  ];
-
-  postPatch = ''
-    # To support cross compilation, use the correct `pkg-config`.
-    substituteInPlace Makefile.fip \
-      --replace "pkg-config" "$PKG_CONFIG"
-    substituteInPlace Makefile.gnu \
-      --replace "pkg-config" "$PKG_CONFIG"
-  ''
-  + lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) ''
-    # Upstream Makefile hardcodes i386 and x86_64 architectures only
-    substituteInPlace Makefile.osx --replace "x86_64" "arm64"
-  '';
-
-  nativeBuildInputs = [
-    pkg-config
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    cctools
-    fixDarwinDylibNames
-  ];
-
-  buildInputs = [
-    libtiff
-    libtiff.dev_private
-    libpng
-    zlib
-    libwebp
-    libraw
-    openexr
-    openjpeg
-    libjpeg
-    libjpeg.dev_private
-    jxrlib
-  ];
-
-  postBuild = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-    make -f Makefile.fip
-  '';
-
-  INCDIR = "${placeholder "out"}/include";
-  INSTALLDIR = "${placeholder "out"}/lib";
-
-  preInstall = ''
-    mkdir -p $INCDIR $INSTALLDIR
-  ''
-  # Workaround for Makefiles.osx not using ?=
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    makeFlagsArray+=( "INCDIR=$INCDIR" "INSTALLDIR=$INSTALLDIR" )
-  '';
-
-  postInstall =
-    lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-      make -f Makefile.fip install
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      ln -s $out/lib/libfreeimage.3.dylib $out/lib/libfreeimage.dylib
-    '';
-
-  enableParallelBuilding = true;
-
-  meta = {
-    description = "Open Source library for accessing popular graphics image file formats";
-    homepage = "http://freeimage.sourceforge.net/";
-    license = with lib.licenses; [
-      freeimage
-      gpl2Only
-      gpl3Only
-    ];
-    knownVulnerabilities = [
-      "CVE-2024-31570"
-      "CVE-2024-28584"
-      "CVE-2024-28583"
-      "CVE-2024-28582"
-      "CVE-2024-28581"
-      "CVE-2024-28580"
-      "CVE-2024-28579"
-      "CVE-2024-28578"
-      "CVE-2024-28577"
-      "CVE-2024-28576"
-      "CVE-2024-28575"
-      "CVE-2024-28574"
-      "CVE-2024-28573"
-      "CVE-2024-28572"
-      "CVE-2024-28571"
-      "CVE-2024-28570"
-      "CVE-2024-28569"
-      "CVE-2024-28568"
-      "CVE-2024-28567"
-      "CVE-2024-28566"
-      "CVE-2024-28565"
-      "CVE-2024-28564"
-      "CVE-2024-28563"
-      "CVE-2024-28562"
-      "CVE-2024-9029"
-      # "CVE-2023-47997"
-      "CVE-2023-47996"
-      # "CVE-2023-47995"
-      "CVE-2023-47994"
-      "CVE-2023-47993"
-      "CVE-2023-47992"
-      # "CVE-2021-40266"
-      "CVE-2021-40265"
-      "CVE-2021-40264"
-      # "CVE-2021-40263"
-      "CVE-2021-40262"
-      # "CVE-2021-33367"
-      # "CVE-2020-24295"
-      "CVE-2020-24294"
-      # "CVE-2020-24293"
-      # "CVE-2020-24292"
-      "CVE-2020-21426"
-      "CVE-2019-12214"
-      "CVE-2019-12212"
-    ];
-    maintainers = [ ];
-    platforms = with lib.platforms; unix;
-  };
-})
diff --git a/pkgs/by-name/fr/freeimage/unbundle.diff b/pkgs/by-name/fr/freeimage/unbundle.diff
deleted file mode 100644
index 66df1176bca9..000000000000
--- a/pkgs/by-name/fr/freeimage/unbundle.diff
+++ /dev/null
@@ -1,584 +0,0 @@
-diff --git a/Makefile.fip b/Makefile.fip
-index 660a0265..86b30401 100644
---- a/Makefile.fip
-+++ b/Makefile.fip
-@@ -11,32 +11,21 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
- 
--LIBRARIES = -lstdc++
-+LIBRARIES = -lstdc++ $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg)
- 
- MODULES = $(SRCS:.c=.o)
- MODULES := $(MODULES:.cpp=.o)
- 
-+INCLUDE += $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg)
-+
- # C flags
- CFLAGS ?= -std=c99 -O3 -fPIC -fexceptions -fvisibility=hidden
--# OpenJPEG
--CFLAGS += -DOPJ_STATIC
--# LibRaw
--CFLAGS += -DNO_LCMS
--# LibJXR
--CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__
- CFLAGS += $(INCLUDE)
- 
- # C++ flags
- CXXFLAGS ?= -std=c++0x -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
--# LibJXR
--CXXFLAGS += -D__ANSI__
- CXXFLAGS += $(INCLUDE)
- 
--ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
--	CFLAGS += -fPIC
--	CXXFLAGS += -fPIC
--endif
--
- TARGET  = freeimageplus
- STATICLIB = lib$(TARGET).a
- SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so
-@@ -76,10 +65,10 @@ $(SHAREDLIB): $(MODULES)
- 
- install:
- 	install -d $(INCDIR) $(INSTALLDIR)
--	install -m 644 -o root -g root $(HEADER) $(INCDIR)
--	install -m 644 -o root -g root $(HEADERFIP) $(INCDIR)
--	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
--	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
-+	install -m 644 $(HEADER) $(INCDIR)
-+	install -m 644 $(HEADERFIP) $(INCDIR)
-+	install -m 644 $(STATICLIB) $(INSTALLDIR)
-+	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
- 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
- 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
- 
-diff --git a/Makefile.gnu b/Makefile.gnu
-index a4f26013..be954761 100644
---- a/Makefile.gnu
-+++ b/Makefile.gnu
-@@ -11,32 +11,21 @@ INSTALLDIR ?= $(DESTDIR)/usr/lib
- # Converts cr/lf to just lf
- DOS2UNIX = dos2unix
- 
--LIBRARIES = -lstdc++
-+LIBRARIES = -lstdc++ $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg)
- 
- MODULES = $(SRCS:.c=.o)
- MODULES := $(MODULES:.cpp=.o)
- 
-+INCLUDE += $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg)
-+
- # C flags
- CFLAGS ?= -std=c99 -O3 -fPIC -fexceptions -fvisibility=hidden
--# OpenJPEG
--CFLAGS += -DOPJ_STATIC
--# LibRaw
--CFLAGS += -DNO_LCMS
--# LibJXR
--CFLAGS += -DDISABLE_PERF_MEASUREMENT -D__ANSI__
- CFLAGS += $(INCLUDE)
- 
- # C++ flags
- CXXFLAGS ?= -std=c++0x -O3 -fPIC -fexceptions -fvisibility=hidden -Wno-ctor-dtor-privacy
--# LibJXR
--CXXFLAGS += -D__ANSI__
- CXXFLAGS += $(INCLUDE)
- 
--ifeq ($(shell sh -c 'uname -m 2>/dev/null || echo not'),x86_64)
--	CFLAGS += -fPIC
--	CXXFLAGS += -fPIC
--endif
--
- TARGET  = freeimage
- STATICLIB = lib$(TARGET).a
- SHAREDLIB = lib$(TARGET)-$(VER_MAJOR).$(VER_MINOR).so
-@@ -75,12 +64,11 @@ $(SHAREDLIB): $(MODULES)
- 
- install:
- 	install -d $(INCDIR) $(INSTALLDIR)
--	install -m 644 -o root -g root $(HEADER) $(INCDIR)
--	install -m 644 -o root -g root $(STATICLIB) $(INSTALLDIR)
--	install -m 755 -o root -g root $(SHAREDLIB) $(INSTALLDIR)
-+	install -m 644 $(HEADER) $(INCDIR)
-+	install -m 644 $(STATICLIB) $(INSTALLDIR)
-+	install -m 755 $(SHAREDLIB) $(INSTALLDIR)
- 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(VERLIBNAME)
- 	ln -sf $(VERLIBNAME) $(INSTALLDIR)/$(LIBNAME)	
--#	ldconfig
- 
- clean:
- 	rm -f core Dist/*.* u2dtmp* $(MODULES) $(STATICLIB) $(SHAREDLIB) $(LIBNAME)
-diff --git a/Makefile.osx b/Makefile.osx
-index c39121db..3800e39d 100644
---- a/Makefile.osx
-+++ b/Makefile.osx
-@@ -10,24 +10,25 @@ MACOSX_SYSROOT = $(shell xcrun --show-sdk-path)
- MACOSX_DEPLOYMENT_TARGET = 10.11
- 
- # General configuration variables:
--CC_I386 = $(shell xcrun -find clang)
--CC_X86_64 = $(shell xcrun -find clang)
--CPP_I386 = $(shell xcrun -find clang++)
--CPP_X86_64 = $(shell xcrun -find clang++)
-+CC_I386 = clang
-+CC_X86_64 = clang
-+CPP_I386 = clang++
-+CPP_X86_64 = clang++
- MACOSX_DEPLOY = -mmacosx-version-min=$(MACOSX_DEPLOYMENT_TARGET)
- COMPILERFLAGS = -Os -fexceptions -fvisibility=hidden -DNO_LCMS -D__ANSI__
- COMPILERFLAGS_I386 = -arch i386
- COMPILERFLAGS_X86_64 = -arch x86_64
- COMPILERPPFLAGS = -Wno-ctor-dtor-privacy -D__ANSI__ -std=c++11 -stdlib=libc++ -Wc++11-narrowing
--INCLUDE +=
--INCLUDE_I386 = -isysroot $(MACOSX_SYSROOT)
--INCLUDE_X86_64 = -isysroot $(MACOSX_SYSROOT)
-+INCLUDE += $(shell pkg-config --cflags OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg)
-+INCLUDE_I386 =
-+INCLUDE_X86_64 =
- CFLAGS_I386 = $(COMPILERFLAGS) $(COMPILERFLAGS_I386) $(INCLUDE) $(INCLUDE_I386) $(MACOSX_DEPLOY)
- CFLAGS_X86_64 = $(COMPILERFLAGS) $(COMPILERFLAGS_X86_64) $(INCLUDE) $(INCLUDE_X86_64) $(MACOSX_DEPLOY)
- CPPFLAGS_I386 = $(COMPILERPPFLAGS) $(CFLAGS_I386)
- CPPFLAGS_X86_64 = $(COMPILERPPFLAGS) $(CFLAGS_X86_64)
--LIBRARIES_I386 = $(MACOSX_DEPLOY) -Wl,-syslibroot $(MACOSX_SYSROOT)
--LIBRARIES_X86_64 = $(MACOSX_DEPLOY) -Wl,-syslibroot $(MACOSX_SYSROOT)
-+LIBS = $(shell pkg-config --libs OpenEXR libopenjp2 libraw libpng libtiff-4 libwebp libwebpmux zlib libjxr libjpeg)
-+LIBRARIES_I386 = $(LIBS) $(MACOSX_DEPLOY)
-+LIBRARIES_X86_64 = $(LIBS) $(MACOSX_DEPLOY)
- LIBTOOL = libtool
- LIPO = lipo
- 
-@@ -57,7 +58,7 @@ dist: FreeImage
- 	cp *.a Dist
- 	cp Source/FreeImage.h Dist
- 
--FreeImage: $(STATICLIB)
-+FreeImage: $(STATICLIB) $(SHAREDLIB)
- 
- $(STATICLIB): $(STATICLIB)-x86_64
- 	cp -p $(STATICLIB)-x86_64 $(STATICLIB)
-@@ -84,13 +85,10 @@ $(STATICLIB)-i386: $(MODULES_I386)
- $(STATICLIB)-x86_64: $(MODULES_X86_64)
- 	$(LIBTOOL) -arch_only x86_64 -o $@ $(MODULES_X86_64)
- 
--$(SHAREDLIB): $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64
--	$(LIPO) -create $(SHAREDLIB)-i386 $(SHAREDLIB)-x86_64 -output $(SHAREDLIB)
--
- $(SHAREDLIB)-i386: $(MODULES_I386)
- 	$(CPP_I386) -arch i386 -dynamiclib $(LIBRARIES_I386) -o $@ $(MODULES_I386)
- 
--$(SHAREDLIB)-x86_64: $(MODULES_X86_64)
-+$(SHAREDLIB): $(MODULES_X86_64)
- 	$(CPP_X86_64) -arch x86_64 -dynamiclib $(LIBRARIES_X86_64) -o $@ $(MODULES_X86_64)
- 
- .c.o-i386:
-@@ -106,9 +104,8 @@ $(SHAREDLIB)-x86_64: $(MODULES_X86_64)
- 	$(CPP_X86_64) $(CPPFLAGS_X86_64) -c $< -o $@
- 
- install:
--	install -d -m 755 -o root -g wheel $(INCDIR) $(INSTALLDIR)
--	install -m 644 -o root -g wheel $(HEADER) $(INCDIR)
--	install -m 644 -o root -g wheel $(SHAREDLIB) $(STATICLIB) $(INSTALLDIR)
-+	install $(HEADER) $(INCDIR)
-+	install $(SHAREDLIB) $(STATICLIB) $(INSTALLDIR)
- 	ranlib -sf $(INSTALLDIR)/$(STATICLIB)
- 	ln -sf $(SHAREDLIB) $(INSTALLDIR)/$(LIBNAME)
- 
-diff --git a/Makefile.srcs b/Makefile.srcs
-index 692c6e56..212195b2 100644
---- a/Makefile.srcs
-+++ b/Makefile.srcs
-@@ -1,6 +1,6 @@
- VER_MAJOR = 3
- VER_MINOR = 19.0
--SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibPNG/png.c Source/LibPNG/pngerror.c Source/LibPNG/pngget.c Source/LibPNG/pngmem.c Source/LibPNG/pngpread.c Source/LibPNG/pngread.c Source/LibPNG/pngrio.c Source/LibPNG/pngrtran.c Source/LibPNG/pngrutil.c Source/LibPNG/pngset.c Source/LibPNG/pngtrans.c Source/LibPNG/pngwio.c Source/LibPNG/pngwrite.c Source/LibPNG/pngwtran.c Source/LibPNG/pngwutil.c Source/LibTIFF4/tif_aux.c Source/LibTIFF4/tif_close.c Source/LibTIFF4/tif_codec.c Source/LibTIFF4/tif_color.c Source/LibTIFF4/tif_compress.c Source/LibTIFF4/tif_dir.c Source/LibTIFF4/tif_dirinfo.c Source/LibTIFF4/tif_dirread.c Source/LibTIFF4/tif_dirwrite.c Source/LibTIFF4/tif_dumpmode.c Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_extension.c Source/LibTIFF4/tif_fax3.c Source/LibTIFF4/tif_fax3sm.c Source/LibTIFF4/tif_flush.c Source/LibTIFF4/tif_getimage.c Source/LibTIFF4/tif_jpeg.c Source/LibTIFF4/tif_lerc.c Source/LibTIFF4/tif_luv.c Source/LibTIFF4/tif_lzw.c Source/LibTIFF4/tif_next.c Source/LibTIFF4/tif_ojpeg.c Source/LibTIFF4/tif_open.c Source/LibTIFF4/tif_packbits.c Source/LibTIFF4/tif_pixarlog.c Source/LibTIFF4/tif_predict.c Source/LibTIFF4/tif_print.c Source/LibTIFF4/tif_read.c Source/LibTIFF4/tif_strip.c Source/LibTIFF4/tif_swab.c Source/LibTIFF4/tif_thunder.c Source/LibTIFF4/tif_tile.c Source/LibTIFF4/tif_version.c Source/LibTIFF4/tif_warning.c Source/LibTIFF4/tif_webp.c Source/LibTIFF4/tif_write.c Source/LibTIFF4/tif_zip.c Source/ZLib/adler32.c Source/ZLib/compress.c Source/ZLib/crc32.c Source/ZLib/deflate.c Source/ZLib/gzclose.c Source/ZLib/gzlib.c Source/ZLib/gzread.c Source/ZLib/gzwrite.c Source/ZLib/infback.c Source/ZLib/inffast.c Source/ZLib/inflate.c Source/ZLib/inftrees.c Source/ZLib/trees.c Source/ZLib/uncompr.c Source/ZLib/zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/function_list.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/invert.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/opj_clock.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/IexMath/IexMathFpu.cpp Source/OpenEXR/IlmImf/b44ExpLogTable.cpp Source/OpenEXR/IlmImf/ImfAcesFile.cpp Source/OpenEXR/IlmImf/ImfAttribute.cpp Source/OpenEXR/IlmImf/ImfB44Compressor.cpp Source/OpenEXR/IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/IlmImf/ImfChannelList.cpp Source/OpenEXR/IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/IlmImf/ImfChromaticities.cpp Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.cpp Source/OpenEXR/IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/IlmImf/ImfCompressor.cpp Source/OpenEXR/IlmImf/ImfConvert.cpp Source/OpenEXR/IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/IlmImf/ImfDeepCompositing.cpp Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/IlmImf/ImfDwaCompressor.cpp Source/OpenEXR/IlmImf/ImfEnvmap.cpp Source/OpenEXR/IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/IlmImf/ImfFastHuf.cpp Source/OpenEXR/IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/IlmImf/ImfGenericInputFile.cpp Source/OpenEXR/IlmImf/ImfGenericOutputFile.cpp Source/OpenEXR/IlmImf/ImfHeader.cpp Source/OpenEXR/IlmImf/ImfHuf.cpp Source/OpenEXR/IlmImf/ImfInputFile.cpp Source/OpenEXR/IlmImf/ImfInputPart.cpp Source/OpenEXR/IlmImf/ImfInputPartData.cpp Source/OpenEXR/IlmImf/ImfIntAttribute.cpp Source/OpenEXR/IlmImf/ImfIO.cpp Source/OpenEXR/IlmImf/ImfKeyCode.cpp Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/IlmImf/ImfLut.cpp Source/OpenEXR/IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/IlmImf/ImfMisc.cpp Source/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp Source/OpenEXR/IlmImf/ImfMultiView.cpp Source/OpenEXR/IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/IlmImf/ImfOutputFile.cpp Source/OpenEXR/IlmImf/ImfOutputPart.cpp Source/OpenEXR/IlmImf/ImfOutputPartData.cpp Source/OpenEXR/IlmImf/ImfPartType.cpp Source/OpenEXR/IlmImf/ImfPizCompressor.cpp Source/OpenEXR/IlmImf/ImfPreviewImage.cpp Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/IlmImf/ImfRational.cpp Source/OpenEXR/IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/IlmImf/ImfRgbaFile.cpp Source/OpenEXR/IlmImf/ImfRgbaYca.cpp Source/OpenEXR/IlmImf/ImfRle.cpp Source/OpenEXR/IlmImf/ImfRleCompressor.cpp Source/OpenEXR/IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/IlmImf/ImfStdIO.cpp Source/OpenEXR/IlmImf/ImfStringAttribute.cpp Source/OpenEXR/IlmImf/ImfStringVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp Source/OpenEXR/IlmImf/ImfTestFile.cpp Source/OpenEXR/IlmImf/ImfThreading.cpp Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfTiledMisc.cpp Source/OpenEXR/IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/IlmImf/ImfTileOffsets.cpp Source/OpenEXR/IlmImf/ImfTimeCode.cpp Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfVecAttribute.cpp Source/OpenEXR/IlmImf/ImfVersion.cpp Source/OpenEXR/IlmImf/ImfWav.cpp Source/OpenEXR/IlmImf/ImfZip.cpp Source/OpenEXR/IlmImf/ImfZipCompressor.cpp Source/OpenEXR/Imath/ImathBox.cpp Source/OpenEXR/Imath/ImathColorAlgo.cpp Source/OpenEXR/Imath/ImathFun.cpp Source/OpenEXR/Imath/ImathMatrixAlgo.cpp Source/OpenEXR/Imath/ImathRandom.cpp Source/OpenEXR/Imath/ImathShear.cpp Source/OpenEXR/Imath/ImathVec.cpp Source/OpenEXR/Iex/IexBaseExc.cpp Source/OpenEXR/Iex/IexThrowErrnoExc.cpp Source/OpenEXR/Half/half.cpp Source/OpenEXR/IlmThread/IlmThread.cpp Source/OpenEXR/IlmThread/IlmThreadMutex.cpp Source/OpenEXR/IlmThread/IlmThreadPool.cpp Source/OpenEXR/IlmThread/IlmThreadSemaphore.cpp Source/OpenEXR/IexMath/IexMathFloatExc.cpp Source/LibRawLite/src/decoders/canon_600.cpp Source/LibRawLite/src/decoders/crx.cpp Source/LibRawLite/src/decoders/decoders_dcraw.cpp Source/LibRawLite/src/decoders/decoders_libraw.cpp Source/LibRawLite/src/decoders/decoders_libraw_dcrdefs.cpp Source/LibRawLite/src/decoders/dng.cpp Source/LibRawLite/src/decoders/fp_dng.cpp Source/LibRawLite/src/decoders/fuji_compressed.cpp Source/LibRawLite/src/decoders/generic.cpp Source/LibRawLite/src/decoders/kodak_decoders.cpp Source/LibRawLite/src/decoders/load_mfbacks.cpp Source/LibRawLite/src/decoders/smal.cpp Source/LibRawLite/src/decoders/unpack.cpp Source/LibRawLite/src/decoders/unpack_thumb.cpp Source/LibRawLite/src/demosaic/aahd_demosaic.cpp Source/LibRawLite/src/demosaic/ahd_demosaic.cpp Source/LibRawLite/src/demosaic/dcb_demosaic.cpp Source/LibRawLite/src/demosaic/dht_demosaic.cpp Source/LibRawLite/src/demosaic/misc_demosaic.cpp Source/LibRawLite/src/demosaic/xtrans_demosaic.cpp Source/LibRawLite/src/integration/dngsdk_glue.cpp Source/LibRawLite/src/integration/rawspeed_glue.cpp Source/LibRawLite/src/libraw_datastream.cpp Source/LibRawLite/src/metadata/adobepano.cpp Source/LibRawLite/src/metadata/canon.cpp Source/LibRawLite/src/metadata/ciff.cpp Source/LibRawLite/src/metadata/cr3_parser.cpp Source/LibRawLite/src/metadata/epson.cpp Source/LibRawLite/src/metadata/exif_gps.cpp Source/LibRawLite/src/metadata/fuji.cpp Source/LibRawLite/src/metadata/hasselblad_model.cpp Source/LibRawLite/src/metadata/identify.cpp Source/LibRawLite/src/metadata/identify_tools.cpp Source/LibRawLite/src/metadata/kodak.cpp Source/LibRawLite/src/metadata/leica.cpp Source/LibRawLite/src/metadata/makernotes.cpp Source/LibRawLite/src/metadata/mediumformat.cpp Source/LibRawLite/src/metadata/minolta.cpp Source/LibRawLite/src/metadata/misc_parsers.cpp Source/LibRawLite/src/metadata/nikon.cpp Source/LibRawLite/src/metadata/normalize_model.cpp Source/LibRawLite/src/metadata/olympus.cpp Source/LibRawLite/src/metadata/p1.cpp Source/LibRawLite/src/metadata/pentax.cpp Source/LibRawLite/src/metadata/samsung.cpp Source/LibRawLite/src/metadata/sony.cpp Source/LibRawLite/src/metadata/tiff.cpp Source/LibRawLite/src/postprocessing/aspect_ratio.cpp Source/LibRawLite/src/postprocessing/dcraw_process.cpp Source/LibRawLite/src/postprocessing/mem_image.cpp Source/LibRawLite/src/postprocessing/postprocessing_aux.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils_dcrdefs.cpp Source/LibRawLite/src/preprocessing/ext_preprocess.cpp Source/LibRawLite/src/preprocessing/raw2image.cpp Source/LibRawLite/src/preprocessing/subtract_black.cpp Source/LibRawLite/src/tables/cameralist.cpp Source/LibRawLite/src/tables/colorconst.cpp Source/LibRawLite/src/tables/colordata.cpp Source/LibRawLite/src/tables/wblists.cpp Source/LibRawLite/src/utils/curves.cpp Source/LibRawLite/src/utils/decoder_info.cpp Source/LibRawLite/src/utils/init_close_utils.cpp Source/LibRawLite/src/utils/open.cpp Source/LibRawLite/src/utils/phaseone_processing.cpp Source/LibRawLite/src/utils/read_utils.cpp Source/LibRawLite/src/utils/thumb_utils.cpp Source/LibRawLite/src/utils/utils_dcraw.cpp Source/LibRawLite/src/utils/utils_libraw.cpp Source/LibRawLite/src/write/file_write.cpp Source/LibRawLite/src/x3f/x3f_parse_process.cpp Source/LibRawLite/src/x3f/x3f_utils_patched.cpp Source/LibWebP/src/dec/alpha_dec.c Source/LibWebP/src/dec/buffer_dec.c Source/LibWebP/src/dec/frame_dec.c Source/LibWebP/src/dec/idec_dec.c Source/LibWebP/src/dec/io_dec.c Source/LibWebP/src/dec/quant_dec.c Source/LibWebP/src/dec/tree_dec.c Source/LibWebP/src/dec/vp8l_dec.c Source/LibWebP/src/dec/vp8_dec.c Source/LibWebP/src/dec/webp_dec.c Source/LibWebP/src/demux/anim_decode.c Source/LibWebP/src/demux/demux.c Source/LibWebP/src/dsp/alpha_processing.c Source/LibWebP/src/dsp/alpha_processing_mips_dsp_r2.c Source/LibWebP/src/dsp/alpha_processing_neon.c Source/LibWebP/src/dsp/alpha_processing_sse2.c Source/LibWebP/src/dsp/alpha_processing_sse41.c Source/LibWebP/src/dsp/cost.c Source/LibWebP/src/dsp/cost_mips32.c Source/LibWebP/src/dsp/cost_mips_dsp_r2.c Source/LibWebP/src/dsp/cost_neon.c Source/LibWebP/src/dsp/cost_sse2.c Source/LibWebP/src/dsp/cpu.c Source/LibWebP/src/dsp/dec.c Source/LibWebP/src/dsp/dec_clip_tables.c Source/LibWebP/src/dsp/dec_mips32.c Source/LibWebP/src/dsp/dec_mips_dsp_r2.c Source/LibWebP/src/dsp/dec_msa.c Source/LibWebP/src/dsp/dec_neon.c Source/LibWebP/src/dsp/dec_sse2.c Source/LibWebP/src/dsp/dec_sse41.c Source/LibWebP/src/dsp/enc.c Source/LibWebP/src/dsp/enc_avx2.c Source/LibWebP/src/dsp/enc_mips32.c Source/LibWebP/src/dsp/enc_mips_dsp_r2.c Source/LibWebP/src/dsp/enc_msa.c Source/LibWebP/src/dsp/enc_neon.c Source/LibWebP/src/dsp/enc_sse2.c Source/LibWebP/src/dsp/enc_sse41.c Source/LibWebP/src/dsp/filters.c Source/LibWebP/src/dsp/filters_mips_dsp_r2.c Source/LibWebP/src/dsp/filters_msa.c Source/LibWebP/src/dsp/filters_neon.c Source/LibWebP/src/dsp/filters_sse2.c Source/LibWebP/src/dsp/lossless.c Source/LibWebP/src/dsp/lossless_enc.c Source/LibWebP/src/dsp/lossless_enc_mips32.c Source/LibWebP/src/dsp/lossless_enc_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_enc_msa.c Source/LibWebP/src/dsp/lossless_enc_neon.c Source/LibWebP/src/dsp/lossless_enc_sse2.c Source/LibWebP/src/dsp/lossless_enc_sse41.c Source/LibWebP/src/dsp/lossless_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_msa.c Source/LibWebP/src/dsp/lossless_neon.c Source/LibWebP/src/dsp/lossless_sse2.c Source/LibWebP/src/dsp/lossless_sse41.c Source/LibWebP/src/dsp/rescaler.c Source/LibWebP/src/dsp/rescaler_mips32.c Source/LibWebP/src/dsp/rescaler_mips_dsp_r2.c Source/LibWebP/src/dsp/rescaler_msa.c Source/LibWebP/src/dsp/rescaler_neon.c Source/LibWebP/src/dsp/rescaler_sse2.c Source/LibWebP/src/dsp/ssim.c Source/LibWebP/src/dsp/ssim_sse2.c Source/LibWebP/src/dsp/upsampling.c Source/LibWebP/src/dsp/upsampling_mips_dsp_r2.c Source/LibWebP/src/dsp/upsampling_msa.c Source/LibWebP/src/dsp/upsampling_neon.c Source/LibWebP/src/dsp/upsampling_sse2.c Source/LibWebP/src/dsp/upsampling_sse41.c Source/LibWebP/src/dsp/yuv.c Source/LibWebP/src/dsp/yuv_mips32.c Source/LibWebP/src/dsp/yuv_mips_dsp_r2.c Source/LibWebP/src/dsp/yuv_neon.c Source/LibWebP/src/dsp/yuv_sse2.c Source/LibWebP/src/dsp/yuv_sse41.c Source/LibWebP/src/enc/alpha_enc.c Source/LibWebP/src/enc/analysis_enc.c Source/LibWebP/src/enc/backward_references_cost_enc.c Source/LibWebP/src/enc/backward_references_enc.c Source/LibWebP/src/enc/config_enc.c Source/LibWebP/src/enc/cost_enc.c Source/LibWebP/src/enc/filter_enc.c Source/LibWebP/src/enc/frame_enc.c Source/LibWebP/src/enc/histogram_enc.c Source/LibWebP/src/enc/iterator_enc.c Source/LibWebP/src/enc/near_lossless_enc.c Source/LibWebP/src/enc/picture_csp_enc.c Source/LibWebP/src/enc/picture_enc.c Source/LibWebP/src/enc/picture_psnr_enc.c Source/LibWebP/src/enc/picture_rescale_enc.c Source/LibWebP/src/enc/picture_tools_enc.c Source/LibWebP/src/enc/predictor_enc.c Source/LibWebP/src/enc/quant_enc.c Source/LibWebP/src/enc/syntax_enc.c Source/LibWebP/src/enc/token_enc.c Source/LibWebP/src/enc/tree_enc.c Source/LibWebP/src/enc/vp8l_enc.c Source/LibWebP/src/enc/webp_enc.c Source/LibWebP/src/mux/anim_encode.c Source/LibWebP/src/mux/muxedit.c Source/LibWebP/src/mux/muxinternal.c Source/LibWebP/src/mux/muxread.c Source/LibWebP/src/utils/bit_reader_utils.c Source/LibWebP/src/utils/bit_writer_utils.c Source/LibWebP/src/utils/color_cache_utils.c Source/LibWebP/src/utils/filters_utils.c Source/LibWebP/src/utils/huffman_encode_utils.c Source/LibWebP/src/utils/huffman_utils.c Source/LibWebP/src/utils/quant_levels_dec_utils.c Source/LibWebP/src/utils/quant_levels_utils.c Source/LibWebP/src/utils/random_utils.c Source/LibWebP/src/utils/rescaler_utils.c Source/LibWebP/src/utils/thread_utils.c Source/LibWebP/src/utils/utils.c Source/LibJXR/image/decode/decode.c Source/LibJXR/image/decode/JXRTranscode.c Source/LibJXR/image/decode/postprocess.c Source/LibJXR/image/decode/segdec.c Source/LibJXR/image/decode/strdec.c Source/LibJXR/image/decode/strdec_x86.c Source/LibJXR/image/decode/strInvTransform.c Source/LibJXR/image/decode/strPredQuantDec.c Source/LibJXR/image/encode/encode.c Source/LibJXR/image/encode/segenc.c Source/LibJXR/image/encode/strenc.c Source/LibJXR/image/encode/strenc_x86.c Source/LibJXR/image/encode/strFwdTransform.c Source/LibJXR/image/encode/strPredQuantEnc.c Source/LibJXR/image/sys/adapthuff.c Source/LibJXR/image/sys/image.c Source/LibJXR/image/sys/strcodec.c Source/LibJXR/image/sys/strPredQuant.c Source/LibJXR/image/sys/strTransform.c Source/LibJXR/jxrgluelib/JXRGlue.c Source/LibJXR/jxrgluelib/JXRGlueJxr.c Source/LibJXR/jxrgluelib/JXRGluePFC.c Source/LibJXR/jxrgluelib/JXRMeta.c 
--INCLS = ./Dist/x64/FreeImage.h ./Examples/Generic/FIIO_Mem.h ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Plugin/PluginCradle.h ./Source/CacheFile.h ./Source/FreeImage/J2KHelper.h ./Source/FreeImage/PSDParser.h ./Source/FreeImage.h ./Source/FreeImageIO.h ./Source/FreeImageToolkit/Filters.h ./Source/FreeImageToolkit/Resize.h ./Source/LibJPEG/cderror.h ./Source/LibJPEG/cdjpeg.h ./Source/LibJPEG/jconfig.h ./Source/LibJPEG/jdct.h ./Source/LibJPEG/jerror.h ./Source/LibJPEG/jinclude.h ./Source/LibJPEG/jmemsys.h ./Source/LibJPEG/jmorecfg.h ./Source/LibJPEG/jpegint.h ./Source/LibJPEG/jpeglib.h ./Source/LibJPEG/jversion.h ./Source/LibJPEG/transupp.h ./Source/LibJXR/common/include/guiddef.h ./Source/LibJXR/common/include/wmsal.h ./Source/LibJXR/common/include/wmspecstring.h ./Source/LibJXR/common/include/wmspecstrings_adt.h ./Source/LibJXR/common/include/wmspecstrings_strict.h ./Source/LibJXR/common/include/wmspecstrings_undef.h ./Source/LibJXR/image/decode/decode.h ./Source/LibJXR/image/encode/encode.h ./Source/LibJXR/image/sys/ansi.h ./Source/LibJXR/image/sys/common.h ./Source/LibJXR/image/sys/perfTimer.h ./Source/LibJXR/image/sys/strcodec.h ./Source/LibJXR/image/sys/strTransform.h ./Source/LibJXR/image/sys/windowsmediaphoto.h ./Source/LibJXR/image/sys/xplatform_image.h ./Source/LibJXR/image/x86/x86.h ./Source/LibJXR/jxrgluelib/JXRGlue.h ./Source/LibJXR/jxrgluelib/JXRMeta.h ./Source/LibOpenJPEG/bio.h ./Source/LibOpenJPEG/cidx_manager.h ./Source/LibOpenJPEG/cio.h ./Source/LibOpenJPEG/dwt.h ./Source/LibOpenJPEG/event.h ./Source/LibOpenJPEG/function_list.h ./Source/LibOpenJPEG/image.h ./Source/LibOpenJPEG/indexbox_manager.h ./Source/LibOpenJPEG/invert.h ./Source/LibOpenJPEG/j2k.h ./Source/LibOpenJPEG/jp2.h ./Source/LibOpenJPEG/mct.h ./Source/LibOpenJPEG/mqc.h ./Source/LibOpenJPEG/openjpeg.h ./Source/LibOpenJPEG/opj_clock.h ./Source/LibOpenJPEG/opj_codec.h ./Source/LibOpenJPEG/opj_config.h ./Source/LibOpenJPEG/opj_config_private.h ./Source/LibOpenJPEG/opj_includes.h ./Source/LibOpenJPEG/opj_intmath.h ./Source/LibOpenJPEG/opj_inttypes.h ./Source/LibOpenJPEG/opj_malloc.h ./Source/LibOpenJPEG/opj_stdint.h ./Source/LibOpenJPEG/pi.h ./Source/LibOpenJPEG/raw.h ./Source/LibOpenJPEG/t1.h ./Source/LibOpenJPEG/t1_luts.h ./Source/LibOpenJPEG/t2.h ./Source/LibOpenJPEG/tcd.h ./Source/LibOpenJPEG/tgt.h ./Source/LibPNG/png.h ./Source/LibPNG/pngconf.h ./Source/LibPNG/pngdebug.h ./Source/LibPNG/pnginfo.h ./Source/LibPNG/pnglibconf.h ./Source/LibPNG/pngpriv.h ./Source/LibPNG/pngstruct.h ./Source/LibRawLite/internal/dcraw_defs.h ./Source/LibRawLite/internal/dcraw_fileio_defs.h ./Source/LibRawLite/internal/defines.h ./Source/LibRawLite/internal/dmp_include.h ./Source/LibRawLite/internal/libraw_cameraids.h ./Source/LibRawLite/internal/libraw_cxx_defs.h ./Source/LibRawLite/internal/libraw_internal_funcs.h ./Source/LibRawLite/internal/var_defines.h ./Source/LibRawLite/internal/x3f_tools.h ./Source/LibRawLite/libraw/libraw.h ./Source/LibRawLite/libraw/libraw_alloc.h ./Source/LibRawLite/libraw/libraw_const.h ./Source/LibRawLite/libraw/libraw_datastream.h ./Source/LibRawLite/libraw/libraw_internal.h ./Source/LibRawLite/libraw/libraw_types.h ./Source/LibRawLite/libraw/libraw_version.h ./Source/LibTIFF4/t4.h ./Source/LibTIFF4/tiff.h ./Source/LibTIFF4/tiffconf.h ./Source/LibTIFF4/tiffconf.vc.h ./Source/LibTIFF4/tiffconf.wince.h ./Source/LibTIFF4/tiffio.h ./Source/LibTIFF4/tiffiop.h ./Source/LibTIFF4/tiffvers.h ./Source/LibTIFF4/tif_config.h ./Source/LibTIFF4/tif_config.vc.h ./Source/LibTIFF4/tif_config.wince.h ./Source/LibTIFF4/tif_dir.h ./Source/LibTIFF4/tif_fax3.h ./Source/LibTIFF4/tif_predict.h ./Source/LibTIFF4/uvcode.h ./Source/LibWebP/src/dec/alphai_dec.h ./Source/LibWebP/src/dec/common_dec.h ./Source/LibWebP/src/dec/vp8i_dec.h ./Source/LibWebP/src/dec/vp8li_dec.h ./Source/LibWebP/src/dec/vp8_dec.h ./Source/LibWebP/src/dec/webpi_dec.h ./Source/LibWebP/src/dsp/common_sse2.h ./Source/LibWebP/src/dsp/common_sse41.h ./Source/LibWebP/src/dsp/dsp.h ./Source/LibWebP/src/dsp/lossless.h ./Source/LibWebP/src/dsp/lossless_common.h ./Source/LibWebP/src/dsp/mips_macro.h ./Source/LibWebP/src/dsp/msa_macro.h ./Source/LibWebP/src/dsp/neon.h ./Source/LibWebP/src/dsp/quant.h ./Source/LibWebP/src/dsp/yuv.h ./Source/LibWebP/src/enc/backward_references_enc.h ./Source/LibWebP/src/enc/cost_enc.h ./Source/LibWebP/src/enc/histogram_enc.h ./Source/LibWebP/src/enc/vp8i_enc.h ./Source/LibWebP/src/enc/vp8li_enc.h ./Source/LibWebP/src/mux/animi.h ./Source/LibWebP/src/mux/muxi.h ./Source/LibWebP/src/utils/bit_reader_inl_utils.h ./Source/LibWebP/src/utils/bit_reader_utils.h ./Source/LibWebP/src/utils/bit_writer_utils.h ./Source/LibWebP/src/utils/color_cache_utils.h ./Source/LibWebP/src/utils/endian_inl_utils.h ./Source/LibWebP/src/utils/filters_utils.h ./Source/LibWebP/src/utils/huffman_encode_utils.h ./Source/LibWebP/src/utils/huffman_utils.h ./Source/LibWebP/src/utils/quant_levels_dec_utils.h ./Source/LibWebP/src/utils/quant_levels_utils.h ./Source/LibWebP/src/utils/random_utils.h ./Source/LibWebP/src/utils/rescaler_utils.h ./Source/LibWebP/src/utils/thread_utils.h ./Source/LibWebP/src/utils/utils.h ./Source/LibWebP/src/webp/decode.h ./Source/LibWebP/src/webp/demux.h ./Source/LibWebP/src/webp/encode.h ./Source/LibWebP/src/webp/format_constants.h ./Source/LibWebP/src/webp/mux.h ./Source/LibWebP/src/webp/mux_types.h ./Source/LibWebP/src/webp/types.h ./Source/MapIntrospector.h ./Source/Metadata/FIRational.h ./Source/Metadata/FreeImageTag.h ./Source/OpenEXR/Half/eLut.h ./Source/OpenEXR/Half/half.h ./Source/OpenEXR/Half/halfExport.h ./Source/OpenEXR/Half/halfFunction.h ./Source/OpenEXR/Half/halfLimits.h ./Source/OpenEXR/Half/toFloat.h ./Source/OpenEXR/Iex/Iex.h ./Source/OpenEXR/Iex/IexBaseExc.h ./Source/OpenEXR/Iex/IexErrnoExc.h ./Source/OpenEXR/Iex/IexExport.h ./Source/OpenEXR/Iex/IexForward.h ./Source/OpenEXR/Iex/IexMacros.h ./Source/OpenEXR/Iex/IexMathExc.h ./Source/OpenEXR/Iex/IexNamespace.h ./Source/OpenEXR/Iex/IexThrowErrnoExc.h ./Source/OpenEXR/IexMath/IexMathFloatExc.h ./Source/OpenEXR/IexMath/IexMathFpu.h ./Source/OpenEXR/IexMath/IexMathIeeeExc.h ./Source/OpenEXR/IlmBaseConfig.h ./Source/OpenEXR/IlmImf/b44ExpLogTable.h ./Source/OpenEXR/IlmImf/dwaLookups.h ./Source/OpenEXR/IlmImf/ImfAcesFile.h ./Source/OpenEXR/IlmImf/ImfArray.h ./Source/OpenEXR/IlmImf/ImfAttribute.h ./Source/OpenEXR/IlmImf/ImfAutoArray.h ./Source/OpenEXR/IlmImf/ImfB44Compressor.h ./Source/OpenEXR/IlmImf/ImfBoxAttribute.h ./Source/OpenEXR/IlmImf/ImfChannelList.h ./Source/OpenEXR/IlmImf/ImfChannelListAttribute.h ./Source/OpenEXR/IlmImf/ImfCheckedArithmetic.h ./Source/OpenEXR/IlmImf/ImfChromaticities.h ./Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.h ./Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.h ./Source/OpenEXR/IlmImf/ImfCompression.h ./Source/OpenEXR/IlmImf/ImfCompressionAttribute.h ./Source/OpenEXR/IlmImf/ImfCompressor.h ./Source/OpenEXR/IlmImf/ImfConvert.h ./Source/OpenEXR/IlmImf/ImfCRgbaFile.h ./Source/OpenEXR/IlmImf/ImfDeepCompositing.h ./Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfDeepImageState.h ./Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.h ./Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.h ./Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.h ./Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.h ./Source/OpenEXR/IlmImf/ImfDoubleAttribute.h ./Source/OpenEXR/IlmImf/ImfDwaCompressor.h ./Source/OpenEXR/IlmImf/ImfDwaCompressorSimd.h ./Source/OpenEXR/IlmImf/ImfEnvmap.h ./Source/OpenEXR/IlmImf/ImfEnvmapAttribute.h ./Source/OpenEXR/IlmImf/ImfExport.h ./Source/OpenEXR/IlmImf/ImfFastHuf.h ./Source/OpenEXR/IlmImf/ImfFloatAttribute.h ./Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.h ./Source/OpenEXR/IlmImf/ImfForward.h ./Source/OpenEXR/IlmImf/ImfFrameBuffer.h ./Source/OpenEXR/IlmImf/ImfFramesPerSecond.h ./Source/OpenEXR/IlmImf/ImfGenericInputFile.h ./Source/OpenEXR/IlmImf/ImfGenericOutputFile.h ./Source/OpenEXR/IlmImf/ImfHeader.h ./Source/OpenEXR/IlmImf/ImfHuf.h ./Source/OpenEXR/IlmImf/ImfInputFile.h ./Source/OpenEXR/IlmImf/ImfInputPart.h ./Source/OpenEXR/IlmImf/ImfInputPartData.h ./Source/OpenEXR/IlmImf/ImfInputStreamMutex.h ./Source/OpenEXR/IlmImf/ImfInt64.h ./Source/OpenEXR/IlmImf/ImfIntAttribute.h ./Source/OpenEXR/IlmImf/ImfIO.h ./Source/OpenEXR/IlmImf/ImfKeyCode.h ./Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfLineOrder.h ./Source/OpenEXR/IlmImf/ImfLineOrderAttribute.h ./Source/OpenEXR/IlmImf/ImfLut.h ./Source/OpenEXR/IlmImf/ImfMatrixAttribute.h ./Source/OpenEXR/IlmImf/ImfMisc.h ./Source/OpenEXR/IlmImf/ImfMultiPartInputFile.h ./Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.h ./Source/OpenEXR/IlmImf/ImfMultiView.h ./Source/OpenEXR/IlmImf/ImfName.h ./Source/OpenEXR/IlmImf/ImfNamespace.h ./Source/OpenEXR/IlmImf/ImfOpaqueAttribute.h ./Source/OpenEXR/IlmImf/ImfOptimizedPixelReading.h ./Source/OpenEXR/IlmImf/ImfOutputFile.h ./Source/OpenEXR/IlmImf/ImfOutputPart.h ./Source/OpenEXR/IlmImf/ImfOutputPartData.h ./Source/OpenEXR/IlmImf/ImfOutputStreamMutex.h ./Source/OpenEXR/IlmImf/ImfPartHelper.h ./Source/OpenEXR/IlmImf/ImfPartType.h ./Source/OpenEXR/IlmImf/ImfPixelType.h ./Source/OpenEXR/IlmImf/ImfPizCompressor.h ./Source/OpenEXR/IlmImf/ImfPreviewImage.h ./Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.h ./Source/OpenEXR/IlmImf/ImfPxr24Compressor.h ./Source/OpenEXR/IlmImf/ImfRational.h ./Source/OpenEXR/IlmImf/ImfRationalAttribute.h ./Source/OpenEXR/IlmImf/ImfRgba.h ./Source/OpenEXR/IlmImf/ImfRgbaFile.h ./Source/OpenEXR/IlmImf/ImfRgbaYca.h ./Source/OpenEXR/IlmImf/ImfRle.h ./Source/OpenEXR/IlmImf/ImfRleCompressor.h ./Source/OpenEXR/IlmImf/ImfScanLineInputFile.h ./Source/OpenEXR/IlmImf/ImfSimd.h ./Source/OpenEXR/IlmImf/ImfStandardAttributes.h ./Source/OpenEXR/IlmImf/ImfStdIO.h ./Source/OpenEXR/IlmImf/ImfStringAttribute.h ./Source/OpenEXR/IlmImf/ImfStringVectorAttribute.h ./Source/OpenEXR/IlmImf/ImfSystemSpecific.h ./Source/OpenEXR/IlmImf/ImfTestFile.h ./Source/OpenEXR/IlmImf/ImfThreading.h ./Source/OpenEXR/IlmImf/ImfTileDescription.h ./Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.h ./Source/OpenEXR/IlmImf/ImfTiledInputFile.h ./Source/OpenEXR/IlmImf/ImfTiledInputPart.h ./Source/OpenEXR/IlmImf/ImfTiledMisc.h ./Source/OpenEXR/IlmImf/ImfTiledOutputFile.h ./Source/OpenEXR/IlmImf/ImfTiledOutputPart.h ./Source/OpenEXR/IlmImf/ImfTiledRgbaFile.h ./Source/OpenEXR/IlmImf/ImfTileOffsets.h ./Source/OpenEXR/IlmImf/ImfTimeCode.h ./Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.h ./Source/OpenEXR/IlmImf/ImfVecAttribute.h ./Source/OpenEXR/IlmImf/ImfVersion.h ./Source/OpenEXR/IlmImf/ImfWav.h ./Source/OpenEXR/IlmImf/ImfXdr.h ./Source/OpenEXR/IlmImf/ImfZip.h ./Source/OpenEXR/IlmImf/ImfZipCompressor.h ./Source/OpenEXR/IlmThread/IlmThread.h ./Source/OpenEXR/IlmThread/IlmThreadExport.h ./Source/OpenEXR/IlmThread/IlmThreadForward.h ./Source/OpenEXR/IlmThread/IlmThreadMutex.h ./Source/OpenEXR/IlmThread/IlmThreadNamespace.h ./Source/OpenEXR/IlmThread/IlmThreadPool.h ./Source/OpenEXR/IlmThread/IlmThreadSemaphore.h ./Source/OpenEXR/Imath/ImathBox.h ./Source/OpenEXR/Imath/ImathBoxAlgo.h ./Source/OpenEXR/Imath/ImathColor.h ./Source/OpenEXR/Imath/ImathColorAlgo.h ./Source/OpenEXR/Imath/ImathEuler.h ./Source/OpenEXR/Imath/ImathExc.h ./Source/OpenEXR/Imath/ImathExport.h ./Source/OpenEXR/Imath/ImathForward.h ./Source/OpenEXR/Imath/ImathFrame.h ./Source/OpenEXR/Imath/ImathFrustum.h ./Source/OpenEXR/Imath/ImathFrustumTest.h ./Source/OpenEXR/Imath/ImathFun.h ./Source/OpenEXR/Imath/ImathGL.h ./Source/OpenEXR/Imath/ImathGLU.h ./Source/OpenEXR/Imath/ImathHalfLimits.h ./Source/OpenEXR/Imath/ImathInt64.h ./Source/OpenEXR/Imath/ImathInterval.h ./Source/OpenEXR/Imath/ImathLimits.h ./Source/OpenEXR/Imath/ImathLine.h ./Source/OpenEXR/Imath/ImathLineAlgo.h ./Source/OpenEXR/Imath/ImathMath.h ./Source/OpenEXR/Imath/ImathMatrix.h ./Source/OpenEXR/Imath/ImathMatrixAlgo.h ./Source/OpenEXR/Imath/ImathNamespace.h ./Source/OpenEXR/Imath/ImathPlane.h ./Source/OpenEXR/Imath/ImathPlatform.h ./Source/OpenEXR/Imath/ImathQuat.h ./Source/OpenEXR/Imath/ImathRandom.h ./Source/OpenEXR/Imath/ImathRoots.h ./Source/OpenEXR/Imath/ImathShear.h ./Source/OpenEXR/Imath/ImathSphere.h ./Source/OpenEXR/Imath/ImathVec.h ./Source/OpenEXR/Imath/ImathVecAlgo.h ./Source/OpenEXR/OpenEXRConfig.h ./Source/Plugin.h ./Source/Quantizers.h ./Source/ToneMapping.h ./Source/Utilities.h ./Source/ZLib/crc32.h ./Source/ZLib/deflate.h ./Source/ZLib/gzguts.h ./Source/ZLib/inffast.h ./Source/ZLib/inffixed.h ./Source/ZLib/inflate.h ./Source/ZLib/inftrees.h ./Source/ZLib/trees.h ./Source/ZLib/zconf.h ./Source/ZLib/zlib.h ./Source/ZLib/zutil.h ./TestAPI/TestSuite.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImagePlus/dist/x64/FreeImagePlus.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Wrapper/FreeImagePlus/test/fipTest.h
-+SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp 
-+INCLS = ./Dist/FreeImage.h ./Examples/Generic/FIIO_Mem.h ./Examples/OpenGL/TextureManager/TextureManager.h ./Examples/Plugin/PluginCradle.h ./Source/CacheFile.h ./Source/FreeImage/J2KHelper.h ./Source/FreeImage/PSDParser.h ./Source/FreeImage.h ./Source/FreeImageIO.h ./Source/FreeImageToolkit/Filters.h ./Source/FreeImageToolkit/Resize.h ./Source/MapIntrospector.h ./Source/Metadata/FIRational.h ./Source/Metadata/FreeImageTag.h ./Source/Plugin.h ./Source/Quantizers.h ./Source/ToneMapping.h ./Source/Utilities.h ./TestAPI/TestSuite.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/FreeImageIO.Net.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/resource.h ./Wrapper/FreeImage.NET/cpp/FreeImageIO/Stdafx.h ./Wrapper/FreeImagePlus/FreeImagePlus.h ./Wrapper/FreeImagePlus/test/fipTest.h
- 
--INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibJPEG -ISource/LibPNG -ISource/LibTIFF4 -ISource/ZLib -ISource/LibOpenJPEG -ISource/OpenEXR -ISource/OpenEXR/Half -ISource/OpenEXR/Iex -ISource/OpenEXR/IlmImf -ISource/OpenEXR/IlmThread -ISource/OpenEXR/Imath -ISource/OpenEXR/IexMath -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src -ISource/LibWebP -ISource/LibJXR -ISource/LibJXR/common/include -ISource/LibJXR/image/sys -ISource/LibJXR/jxrgluelib
-+INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit
-diff --git a/Source/FreeImage.h b/Source/FreeImage.h
-index 2dfb9ee2..d2d32322 100644
---- a/Source/FreeImage.h
-+++ b/Source/FreeImage.h
-@@ -155,8 +155,8 @@ typedef uint8_t BYTE;
- typedef uint16_t WORD;
- typedef uint32_t DWORD;
- typedef int32_t LONG;
--typedef int64_t INT64;
--typedef uint64_t UINT64;
-+#define INT64 int64_t
-+#define UINT64 uint64_t
- #else
- // MS is not C99 ISO compliant
- typedef long BOOL;
-diff --git a/Source/FreeImage/J2KHelper.cpp b/Source/FreeImage/J2KHelper.cpp
-index 062b49ee..0e79fbc5 100644
---- a/Source/FreeImage/J2KHelper.cpp
-+++ b/Source/FreeImage/J2KHelper.cpp
-@@ -21,7 +21,7 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
- #include "J2KHelper.h"
- 
- // --------------------------------------------------------------------------
-diff --git a/Source/FreeImage/PluginEXR.cpp b/Source/FreeImage/PluginEXR.cpp
-index b2864303..9bf3ada9 100644
---- a/Source/FreeImage/PluginEXR.cpp
-+++ b/Source/FreeImage/PluginEXR.cpp
-@@ -28,16 +28,16 @@
- #pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning)
- #endif 
- 
--#include "../OpenEXR/IlmImf/ImfIO.h"
--#include "../OpenEXR/Iex/Iex.h"
--#include "../OpenEXR/IlmImf/ImfOutputFile.h"
--#include "../OpenEXR/IlmImf/ImfInputFile.h"
--#include "../OpenEXR/IlmImf/ImfRgbaFile.h"
--#include "../OpenEXR/IlmImf/ImfChannelList.h"
--#include "../OpenEXR/IlmImf/ImfRgba.h"
--#include "../OpenEXR/IlmImf/ImfArray.h"
--#include "../OpenEXR/IlmImf/ImfPreviewImage.h"
--#include "../OpenEXR/Half/half.h"
-+#include <OpenEXR/ImfIO.h>
-+#include <OpenEXR/Iex.h>
-+#include <OpenEXR/ImfOutputFile.h>
-+#include <OpenEXR/ImfInputFile.h>
-+#include <OpenEXR/ImfRgbaFile.h>
-+#include <OpenEXR/ImfChannelList.h>
-+#include <OpenEXR/ImfRgba.h>
-+#include <OpenEXR/ImfArray.h>
-+#include <OpenEXR/ImfPreviewImage.h>
-+#include <OpenEXR/half.h>
- 
- 
- // ==========================================================
-diff --git a/Source/FreeImage/PluginG3.cpp b/Source/FreeImage/PluginG3.cpp
-index 4680aa32..7d4b5ce6 100644
---- a/Source/FreeImage/PluginG3.cpp
-+++ b/Source/FreeImage/PluginG3.cpp
-@@ -20,7 +20,7 @@
- // Use at your own risk!
- // ==========================================================
- 
--#include "../LibTIFF4/tiffiop.h"
-+#include <tiffiop.h>
- 
- #include "FreeImage.h"
- #include "Utilities.h"
-diff --git a/Source/FreeImage/PluginJ2K.cpp b/Source/FreeImage/PluginJ2K.cpp
-index b8bcfc8b..621a9037 100644
---- a/Source/FreeImage/PluginJ2K.cpp
-+++ b/Source/FreeImage/PluginJ2K.cpp
-@@ -21,7 +21,7 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
- #include "J2KHelper.h"
- 
- // ==========================================================
-diff --git a/Source/FreeImage/PluginJP2.cpp b/Source/FreeImage/PluginJP2.cpp
-index 742fe2c0..c57f6267 100644
---- a/Source/FreeImage/PluginJP2.cpp
-+++ b/Source/FreeImage/PluginJP2.cpp
-@@ -21,7 +21,7 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibOpenJPEG/openjpeg.h"
-+#include <openjpeg.h>
- #include "J2KHelper.h"
- 
- // ==========================================================
-diff --git a/Source/FreeImage/PluginJPEG.cpp b/Source/FreeImage/PluginJPEG.cpp
-index 8db177d2..a7de6378 100644
---- a/Source/FreeImage/PluginJPEG.cpp
-+++ b/Source/FreeImage/PluginJPEG.cpp
-@@ -35,9 +35,9 @@ extern "C" {
- #undef FAR
- #include <setjmp.h>
- 
--#include "../LibJPEG/jinclude.h"
--#include "../LibJPEG/jpeglib.h"
--#include "../LibJPEG/jerror.h"
-+#include <stdio.h>
-+#include <jpeglib.h>
-+#include <jerror.h>
- }
- 
- #include "FreeImage.h"
-@@ -484,116 +484,6 @@ marker_is_icc(jpeg_saved_marker_ptr marker) {
- 	return FALSE;
- }
- 
--/**
--  See if there was an ICC profile in the JPEG file being read;
--  if so, reassemble and return the profile data.
--
--  TRUE is returned if an ICC profile was found, FALSE if not.
--  If TRUE is returned, *icc_data_ptr is set to point to the
--  returned data, and *icc_data_len is set to its length.
--  
--  IMPORTANT: the data at **icc_data_ptr has been allocated with malloc()
--  and must be freed by the caller with free() when the caller no longer
--  needs it.  (Alternatively, we could write this routine to use the
--  IJG library's memory allocator, so that the data would be freed implicitly
--  at jpeg_finish_decompress() time.  But it seems likely that many apps
--  will prefer to have the data stick around after decompression finishes.)
--  
--  NOTE: if the file contains invalid ICC APP2 markers, we just silently
--  return FALSE.  You might want to issue an error message instead.
--*/
--static BOOL 
--jpeg_read_icc_profile(j_decompress_ptr cinfo, JOCTET **icc_data_ptr, unsigned *icc_data_len) {
--	jpeg_saved_marker_ptr marker;
--	int num_markers = 0;
--	int seq_no;
--	JOCTET *icc_data;
--	unsigned total_length;
--
--	const int MAX_SEQ_NO = 255;			// sufficient since marker numbers are bytes
--	BYTE marker_present[MAX_SEQ_NO+1];	// 1 if marker found
--	unsigned data_length[MAX_SEQ_NO+1];	// size of profile data in marker
--	unsigned data_offset[MAX_SEQ_NO+1];	// offset for data in marker
--	
--	*icc_data_ptr = NULL;		// avoid confusion if FALSE return
--	*icc_data_len = 0;
--	
--	/**
--	this first pass over the saved markers discovers whether there are
--	any ICC markers and verifies the consistency of the marker numbering.
--	*/
--	
--	memset(marker_present, 0, (MAX_SEQ_NO + 1));
--	
--	for(marker = cinfo->marker_list; marker != NULL; marker = marker->next) {
--		if (marker_is_icc(marker)) {
--			if (num_markers == 0) {
--				// number of markers
--				num_markers = GETJOCTET(marker->data[13]);
--			}
--			else if (num_markers != GETJOCTET(marker->data[13])) {
--				return FALSE;		// inconsistent num_markers fields 
--			}
--			// sequence number
--			seq_no = GETJOCTET(marker->data[12]);
--			if (seq_no <= 0 || seq_no > num_markers) {
--				return FALSE;		// bogus sequence number 
--			}
--			if (marker_present[seq_no]) {
--				return FALSE;		// duplicate sequence numbers 
--			}
--			marker_present[seq_no] = 1;
--			data_length[seq_no] = marker->data_length - ICC_HEADER_SIZE;
--		}
--	}
--	
--	if (num_markers == 0)
--		return FALSE;
--		
--	/**
--	check for missing markers, count total space needed,
--	compute offset of each marker's part of the data.
--	*/
--	
--	total_length = 0;
--	for(seq_no = 1; seq_no <= num_markers; seq_no++) {
--		if (marker_present[seq_no] == 0) {
--			return FALSE;		// missing sequence number
--		}
--		data_offset[seq_no] = total_length;
--		total_length += data_length[seq_no];
--	}
--	
--	if (total_length <= 0)
--		return FALSE;		// found only empty markers ?
--	
--	// allocate space for assembled data 
--	icc_data = (JOCTET *) malloc(total_length * sizeof(JOCTET));
--	if (icc_data == NULL)
--		return FALSE;		// out of memory
--	
--	// and fill it in
--	for (marker = cinfo->marker_list; marker != NULL; marker = marker->next) {
--		if (marker_is_icc(marker)) {
--			JOCTET FAR *src_ptr;
--			JOCTET *dst_ptr;
--			unsigned length;
--			seq_no = GETJOCTET(marker->data[12]);
--			dst_ptr = icc_data + data_offset[seq_no];
--			src_ptr = marker->data + ICC_HEADER_SIZE;
--			length = data_length[seq_no];
--			while (length--) {
--				*dst_ptr++ = *src_ptr++;
--			}
--		}
--	}
--	
--	*icc_data_ptr = icc_data;
--	*icc_data_len = total_length;
--	
--	return TRUE;
--}
--
- /**
- 	Read JPEG_APPD marker (IPTC or Adobe Photoshop profile)
- */
-diff --git a/Source/FreeImage/PluginJXR.cpp b/Source/FreeImage/PluginJXR.cpp
-index 85c6ff3e..163a93bd 100644
---- a/Source/FreeImage/PluginJXR.cpp
-+++ b/Source/FreeImage/PluginJXR.cpp
-@@ -23,7 +23,7 @@
- #include "Utilities.h"
- #include "../Metadata/FreeImageTag.h"
- 
--#include "../LibJXR/jxrgluelib/JXRGlue.h"
-+#include <JXRGlue.h>
- 
- // ==========================================================
- // Plugin Interface
-diff --git a/Source/FreeImage/PluginPNG.cpp b/Source/FreeImage/PluginPNG.cpp
-index 661f1602..504fafe1 100644
---- a/Source/FreeImage/PluginPNG.cpp
-+++ b/Source/FreeImage/PluginPNG.cpp
-@@ -40,8 +40,8 @@
- 
- // ----------------------------------------------------------
- 
--#include "../ZLib/zlib.h"
--#include "../LibPNG/png.h"
-+#include <zlib.h>
-+#include <png.h>
- 
- // ----------------------------------------------------------
- 
-diff --git a/Source/FreeImage/PluginRAW.cpp b/Source/FreeImage/PluginRAW.cpp
-index 26134bcc..d7fa81e4 100644
---- a/Source/FreeImage/PluginRAW.cpp
-+++ b/Source/FreeImage/PluginRAW.cpp
-@@ -19,12 +19,16 @@
- // Use at your own risk!
- // ==========================================================
- 
--#include "../LibRawLite/libraw/libraw.h"
-+#include <libraw.h>
- 
- #include "FreeImage.h"
- #include "Utilities.h"
- #include "../Metadata/FreeImageTag.h"
- 
-+// What an ugly hack
-+#undef INT64
-+#undef UINT64
-+
- // ==========================================================
- // Plugin Interface
- // ==========================================================
-diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp
-index 84554958..13a224dd 100644
---- a/Source/FreeImage/PluginTIFF.cpp
-+++ b/Source/FreeImage/PluginTIFF.cpp
-@@ -37,9 +37,9 @@
- 
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../LibTIFF4/tiffiop.h"
-+#include <tiffiop.h>
- #include "../Metadata/FreeImageTag.h"
--#include "../OpenEXR/Half/half.h"
-+#include <OpenEXR/half.h>
- 
- #include "FreeImageIO.h"
- #include "PSDParser.h"
-diff --git a/Source/FreeImage/PluginWebP.cpp b/Source/FreeImage/PluginWebP.cpp
-index 7c9f62fd..c4014473 100644
---- a/Source/FreeImage/PluginWebP.cpp
-+++ b/Source/FreeImage/PluginWebP.cpp
-@@ -24,9 +24,9 @@
- 
- #include "../Metadata/FreeImageTag.h"
- 
--#include "../LibWebP/src/webp/decode.h"
--#include "../LibWebP/src/webp/encode.h"
--#include "../LibWebP/src/webp/mux.h"
-+#include <webp/decode.h>
-+#include <webp/encode.h>
-+#include <webp/mux.h>
- 
- // ==========================================================
- // Plugin Interface
-diff --git a/Source/FreeImage/ZLibInterface.cpp b/Source/FreeImage/ZLibInterface.cpp
-index 3ab6d321..09734755 100644
---- a/Source/FreeImage/ZLibInterface.cpp
-+++ b/Source/FreeImage/ZLibInterface.cpp
-@@ -19,10 +19,9 @@
- // Use at your own risk!
- // ==========================================================
- 
--#include "../ZLib/zlib.h"
-+#include <zlib.h>
- #include "FreeImage.h"
- #include "Utilities.h"
--#include "../ZLib/zutil.h"	/* must be the last header because of error C3163 in VS2008 (_vsnprintf defined in stdio.h) */
- 
- /**
- Compresses a source buffer into a target buffer, using the ZLib library. 
-@@ -115,7 +114,8 @@ FreeImage_ZLibGZip(BYTE *target, DWORD target_size, BYTE *source, DWORD source_s
- 			return 0;
-         case Z_OK: {
-             // patch header, setup crc and length (stolen from mod_trace_output)
--            BYTE *p = target + 8; *p++ = 2; *p = OS_CODE; // xflags, os_code
-+            // OS_CODE is 0x03 on unix it seems, not sure how important this is
-+            BYTE *p = target + 8; *p++ = 2; *p = 0x03; // xflags, os_code
-  	        crc = crc32(crc, source, source_size);
- 	        memcpy(target + 4 + dest_len, &crc, 4);
- 	        memcpy(target + 8 + dest_len, &source_size, 4);
-diff --git a/Source/FreeImageToolkit/JPEGTransform.cpp b/Source/FreeImageToolkit/JPEGTransform.cpp
-index 6f9ba8e1..836bc901 100644
---- a/Source/FreeImageToolkit/JPEGTransform.cpp
-+++ b/Source/FreeImageToolkit/JPEGTransform.cpp
-@@ -26,10 +26,10 @@ extern "C" {
- #undef FAR
- #include <setjmp.h>
- 
--#include "../LibJPEG/jinclude.h"
--#include "../LibJPEG/jpeglib.h"
--#include "../LibJPEG/jerror.h"
--#include "../LibJPEG/transupp.h"
-+#include <stdio.h>
-+#include <jpeglib.h>
-+#include <jerror.h>
-+#include <transupp.h>
- }
- 
- #include "FreeImage.h"
-diff --git a/Source/Metadata/XTIFF.cpp b/Source/Metadata/XTIFF.cpp
-index 6919a8e8..ce3d7c6b 100644
---- a/Source/Metadata/XTIFF.cpp
-+++ b/Source/Metadata/XTIFF.cpp
-@@ -29,7 +29,7 @@
- #pragma warning (disable : 4786) // identifier was truncated to 'number' characters
- #endif
- 
--#include "../LibTIFF4/tiffiop.h"
-+#include <tiffiop.h>
- 
- #include "FreeImage.h"
- #include "Utilities.h"
-diff --git a/fipMakefile.srcs b/fipMakefile.srcs
-index cc75e5e0..bedc9e3e 100644
---- a/fipMakefile.srcs
-+++ b/fipMakefile.srcs
-@@ -1,4 +1,4 @@
- VER_MAJOR = 3
- VER_MINOR = 19.0
--SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Source/LibJPEG/jaricom.c Source/LibJPEG/jcapimin.c Source/LibJPEG/jcapistd.c Source/LibJPEG/jcarith.c Source/LibJPEG/jccoefct.c Source/LibJPEG/jccolor.c Source/LibJPEG/jcdctmgr.c Source/LibJPEG/jchuff.c Source/LibJPEG/jcinit.c Source/LibJPEG/jcmainct.c Source/LibJPEG/jcmarker.c Source/LibJPEG/jcmaster.c Source/LibJPEG/jcomapi.c Source/LibJPEG/jcparam.c Source/LibJPEG/jcprepct.c Source/LibJPEG/jcsample.c Source/LibJPEG/jctrans.c Source/LibJPEG/jdapimin.c Source/LibJPEG/jdapistd.c Source/LibJPEG/jdarith.c Source/LibJPEG/jdatadst.c Source/LibJPEG/jdatasrc.c Source/LibJPEG/jdcoefct.c Source/LibJPEG/jdcolor.c Source/LibJPEG/jddctmgr.c Source/LibJPEG/jdhuff.c Source/LibJPEG/jdinput.c Source/LibJPEG/jdmainct.c Source/LibJPEG/jdmarker.c Source/LibJPEG/jdmaster.c Source/LibJPEG/jdmerge.c Source/LibJPEG/jdpostct.c Source/LibJPEG/jdsample.c Source/LibJPEG/jdtrans.c Source/LibJPEG/jerror.c Source/LibJPEG/jfdctflt.c Source/LibJPEG/jfdctfst.c Source/LibJPEG/jfdctint.c Source/LibJPEG/jidctflt.c Source/LibJPEG/jidctfst.c Source/LibJPEG/jidctint.c Source/LibJPEG/jmemmgr.c Source/LibJPEG/jmemnobs.c Source/LibJPEG/jquant1.c Source/LibJPEG/jquant2.c Source/LibJPEG/jutils.c Source/LibJPEG/transupp.c Source/LibPNG/png.c Source/LibPNG/pngerror.c Source/LibPNG/pngget.c Source/LibPNG/pngmem.c Source/LibPNG/pngpread.c Source/LibPNG/pngread.c Source/LibPNG/pngrio.c Source/LibPNG/pngrtran.c Source/LibPNG/pngrutil.c Source/LibPNG/pngset.c Source/LibPNG/pngtrans.c Source/LibPNG/pngwio.c Source/LibPNG/pngwrite.c Source/LibPNG/pngwtran.c Source/LibPNG/pngwutil.c Source/LibTIFF4/tif_aux.c Source/LibTIFF4/tif_close.c Source/LibTIFF4/tif_codec.c Source/LibTIFF4/tif_color.c Source/LibTIFF4/tif_compress.c Source/LibTIFF4/tif_dir.c Source/LibTIFF4/tif_dirinfo.c Source/LibTIFF4/tif_dirread.c Source/LibTIFF4/tif_dirwrite.c Source/LibTIFF4/tif_dumpmode.c Source/LibTIFF4/tif_error.c Source/LibTIFF4/tif_extension.c Source/LibTIFF4/tif_fax3.c Source/LibTIFF4/tif_fax3sm.c Source/LibTIFF4/tif_flush.c Source/LibTIFF4/tif_getimage.c Source/LibTIFF4/tif_jpeg.c Source/LibTIFF4/tif_lerc.c Source/LibTIFF4/tif_luv.c Source/LibTIFF4/tif_lzw.c Source/LibTIFF4/tif_next.c Source/LibTIFF4/tif_ojpeg.c Source/LibTIFF4/tif_open.c Source/LibTIFF4/tif_packbits.c Source/LibTIFF4/tif_pixarlog.c Source/LibTIFF4/tif_predict.c Source/LibTIFF4/tif_print.c Source/LibTIFF4/tif_read.c Source/LibTIFF4/tif_strip.c Source/LibTIFF4/tif_swab.c Source/LibTIFF4/tif_thunder.c Source/LibTIFF4/tif_tile.c Source/LibTIFF4/tif_version.c Source/LibTIFF4/tif_warning.c Source/LibTIFF4/tif_webp.c Source/LibTIFF4/tif_write.c Source/LibTIFF4/tif_zip.c Source/ZLib/adler32.c Source/ZLib/compress.c Source/ZLib/crc32.c Source/ZLib/deflate.c Source/ZLib/gzclose.c Source/ZLib/gzlib.c Source/ZLib/gzread.c Source/ZLib/gzwrite.c Source/ZLib/infback.c Source/ZLib/inffast.c Source/ZLib/inflate.c Source/ZLib/inftrees.c Source/ZLib/trees.c Source/ZLib/uncompr.c Source/ZLib/zutil.c Source/LibOpenJPEG/bio.c Source/LibOpenJPEG/cio.c Source/LibOpenJPEG/dwt.c Source/LibOpenJPEG/event.c Source/LibOpenJPEG/function_list.c Source/LibOpenJPEG/image.c Source/LibOpenJPEG/invert.c Source/LibOpenJPEG/j2k.c Source/LibOpenJPEG/jp2.c Source/LibOpenJPEG/mct.c Source/LibOpenJPEG/mqc.c Source/LibOpenJPEG/openjpeg.c Source/LibOpenJPEG/opj_clock.c Source/LibOpenJPEG/pi.c Source/LibOpenJPEG/raw.c Source/LibOpenJPEG/t1.c Source/LibOpenJPEG/t2.c Source/LibOpenJPEG/tcd.c Source/LibOpenJPEG/tgt.c Source/OpenEXR/IexMath/IexMathFpu.cpp Source/OpenEXR/IlmImf/b44ExpLogTable.cpp Source/OpenEXR/IlmImf/ImfAcesFile.cpp Source/OpenEXR/IlmImf/ImfAttribute.cpp Source/OpenEXR/IlmImf/ImfB44Compressor.cpp Source/OpenEXR/IlmImf/ImfBoxAttribute.cpp Source/OpenEXR/IlmImf/ImfChannelList.cpp Source/OpenEXR/IlmImf/ImfChannelListAttribute.cpp Source/OpenEXR/IlmImf/ImfChromaticities.cpp Source/OpenEXR/IlmImf/ImfChromaticitiesAttribute.cpp Source/OpenEXR/IlmImf/ImfCompositeDeepScanLine.cpp Source/OpenEXR/IlmImf/ImfCompressionAttribute.cpp Source/OpenEXR/IlmImf/ImfCompressor.cpp Source/OpenEXR/IlmImf/ImfConvert.cpp Source/OpenEXR/IlmImf/ImfCRgbaFile.cpp Source/OpenEXR/IlmImf/ImfDeepCompositing.cpp Source/OpenEXR/IlmImf/ImfDeepFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfDeepImageStateAttribute.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepScanLineOutputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfDeepTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfDoubleAttribute.cpp Source/OpenEXR/IlmImf/ImfDwaCompressor.cpp Source/OpenEXR/IlmImf/ImfEnvmap.cpp Source/OpenEXR/IlmImf/ImfEnvmapAttribute.cpp Source/OpenEXR/IlmImf/ImfFastHuf.cpp Source/OpenEXR/IlmImf/ImfFloatAttribute.cpp Source/OpenEXR/IlmImf/ImfFloatVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfFrameBuffer.cpp Source/OpenEXR/IlmImf/ImfFramesPerSecond.cpp Source/OpenEXR/IlmImf/ImfGenericInputFile.cpp Source/OpenEXR/IlmImf/ImfGenericOutputFile.cpp Source/OpenEXR/IlmImf/ImfHeader.cpp Source/OpenEXR/IlmImf/ImfHuf.cpp Source/OpenEXR/IlmImf/ImfInputFile.cpp Source/OpenEXR/IlmImf/ImfInputPart.cpp Source/OpenEXR/IlmImf/ImfInputPartData.cpp Source/OpenEXR/IlmImf/ImfIntAttribute.cpp Source/OpenEXR/IlmImf/ImfIO.cpp Source/OpenEXR/IlmImf/ImfKeyCode.cpp Source/OpenEXR/IlmImf/ImfKeyCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfLineOrderAttribute.cpp Source/OpenEXR/IlmImf/ImfLut.cpp Source/OpenEXR/IlmImf/ImfMatrixAttribute.cpp Source/OpenEXR/IlmImf/ImfMisc.cpp Source/OpenEXR/IlmImf/ImfMultiPartInputFile.cpp Source/OpenEXR/IlmImf/ImfMultiPartOutputFile.cpp Source/OpenEXR/IlmImf/ImfMultiView.cpp Source/OpenEXR/IlmImf/ImfOpaqueAttribute.cpp Source/OpenEXR/IlmImf/ImfOutputFile.cpp Source/OpenEXR/IlmImf/ImfOutputPart.cpp Source/OpenEXR/IlmImf/ImfOutputPartData.cpp Source/OpenEXR/IlmImf/ImfPartType.cpp Source/OpenEXR/IlmImf/ImfPizCompressor.cpp Source/OpenEXR/IlmImf/ImfPreviewImage.cpp Source/OpenEXR/IlmImf/ImfPreviewImageAttribute.cpp Source/OpenEXR/IlmImf/ImfPxr24Compressor.cpp Source/OpenEXR/IlmImf/ImfRational.cpp Source/OpenEXR/IlmImf/ImfRationalAttribute.cpp Source/OpenEXR/IlmImf/ImfRgbaFile.cpp Source/OpenEXR/IlmImf/ImfRgbaYca.cpp Source/OpenEXR/IlmImf/ImfRle.cpp Source/OpenEXR/IlmImf/ImfRleCompressor.cpp Source/OpenEXR/IlmImf/ImfScanLineInputFile.cpp Source/OpenEXR/IlmImf/ImfStandardAttributes.cpp Source/OpenEXR/IlmImf/ImfStdIO.cpp Source/OpenEXR/IlmImf/ImfStringAttribute.cpp Source/OpenEXR/IlmImf/ImfStringVectorAttribute.cpp Source/OpenEXR/IlmImf/ImfSystemSpecific.cpp Source/OpenEXR/IlmImf/ImfTestFile.cpp Source/OpenEXR/IlmImf/ImfThreading.cpp Source/OpenEXR/IlmImf/ImfTileDescriptionAttribute.cpp Source/OpenEXR/IlmImf/ImfTiledInputFile.cpp Source/OpenEXR/IlmImf/ImfTiledInputPart.cpp Source/OpenEXR/IlmImf/ImfTiledMisc.cpp Source/OpenEXR/IlmImf/ImfTiledOutputFile.cpp Source/OpenEXR/IlmImf/ImfTiledOutputPart.cpp Source/OpenEXR/IlmImf/ImfTiledRgbaFile.cpp Source/OpenEXR/IlmImf/ImfTileOffsets.cpp Source/OpenEXR/IlmImf/ImfTimeCode.cpp Source/OpenEXR/IlmImf/ImfTimeCodeAttribute.cpp Source/OpenEXR/IlmImf/ImfVecAttribute.cpp Source/OpenEXR/IlmImf/ImfVersion.cpp Source/OpenEXR/IlmImf/ImfWav.cpp Source/OpenEXR/IlmImf/ImfZip.cpp Source/OpenEXR/IlmImf/ImfZipCompressor.cpp Source/OpenEXR/Imath/ImathBox.cpp Source/OpenEXR/Imath/ImathColorAlgo.cpp Source/OpenEXR/Imath/ImathFun.cpp Source/OpenEXR/Imath/ImathMatrixAlgo.cpp Source/OpenEXR/Imath/ImathRandom.cpp Source/OpenEXR/Imath/ImathShear.cpp Source/OpenEXR/Imath/ImathVec.cpp Source/OpenEXR/Iex/IexBaseExc.cpp Source/OpenEXR/Iex/IexThrowErrnoExc.cpp Source/OpenEXR/Half/half.cpp Source/OpenEXR/IlmThread/IlmThread.cpp Source/OpenEXR/IlmThread/IlmThreadMutex.cpp Source/OpenEXR/IlmThread/IlmThreadPool.cpp Source/OpenEXR/IlmThread/IlmThreadSemaphore.cpp Source/OpenEXR/IexMath/IexMathFloatExc.cpp Source/LibRawLite/src/decoders/canon_600.cpp Source/LibRawLite/src/decoders/crx.cpp Source/LibRawLite/src/decoders/decoders_dcraw.cpp Source/LibRawLite/src/decoders/decoders_libraw.cpp Source/LibRawLite/src/decoders/decoders_libraw_dcrdefs.cpp Source/LibRawLite/src/decoders/dng.cpp Source/LibRawLite/src/decoders/fp_dng.cpp Source/LibRawLite/src/decoders/fuji_compressed.cpp Source/LibRawLite/src/decoders/generic.cpp Source/LibRawLite/src/decoders/kodak_decoders.cpp Source/LibRawLite/src/decoders/load_mfbacks.cpp Source/LibRawLite/src/decoders/smal.cpp Source/LibRawLite/src/decoders/unpack.cpp Source/LibRawLite/src/decoders/unpack_thumb.cpp Source/LibRawLite/src/demosaic/aahd_demosaic.cpp Source/LibRawLite/src/demosaic/ahd_demosaic.cpp Source/LibRawLite/src/demosaic/dcb_demosaic.cpp Source/LibRawLite/src/demosaic/dht_demosaic.cpp Source/LibRawLite/src/demosaic/misc_demosaic.cpp Source/LibRawLite/src/demosaic/xtrans_demosaic.cpp Source/LibRawLite/src/integration/dngsdk_glue.cpp Source/LibRawLite/src/integration/rawspeed_glue.cpp Source/LibRawLite/src/libraw_datastream.cpp Source/LibRawLite/src/metadata/adobepano.cpp Source/LibRawLite/src/metadata/canon.cpp Source/LibRawLite/src/metadata/ciff.cpp Source/LibRawLite/src/metadata/cr3_parser.cpp Source/LibRawLite/src/metadata/epson.cpp Source/LibRawLite/src/metadata/exif_gps.cpp Source/LibRawLite/src/metadata/fuji.cpp Source/LibRawLite/src/metadata/hasselblad_model.cpp Source/LibRawLite/src/metadata/identify.cpp Source/LibRawLite/src/metadata/identify_tools.cpp Source/LibRawLite/src/metadata/kodak.cpp Source/LibRawLite/src/metadata/leica.cpp Source/LibRawLite/src/metadata/makernotes.cpp Source/LibRawLite/src/metadata/mediumformat.cpp Source/LibRawLite/src/metadata/minolta.cpp Source/LibRawLite/src/metadata/misc_parsers.cpp Source/LibRawLite/src/metadata/nikon.cpp Source/LibRawLite/src/metadata/normalize_model.cpp Source/LibRawLite/src/metadata/olympus.cpp Source/LibRawLite/src/metadata/p1.cpp Source/LibRawLite/src/metadata/pentax.cpp Source/LibRawLite/src/metadata/samsung.cpp Source/LibRawLite/src/metadata/sony.cpp Source/LibRawLite/src/metadata/tiff.cpp Source/LibRawLite/src/postprocessing/aspect_ratio.cpp Source/LibRawLite/src/postprocessing/dcraw_process.cpp Source/LibRawLite/src/postprocessing/mem_image.cpp Source/LibRawLite/src/postprocessing/postprocessing_aux.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils.cpp Source/LibRawLite/src/postprocessing/postprocessing_utils_dcrdefs.cpp Source/LibRawLite/src/preprocessing/ext_preprocess.cpp Source/LibRawLite/src/preprocessing/raw2image.cpp Source/LibRawLite/src/preprocessing/subtract_black.cpp Source/LibRawLite/src/tables/cameralist.cpp Source/LibRawLite/src/tables/colorconst.cpp Source/LibRawLite/src/tables/colordata.cpp Source/LibRawLite/src/tables/wblists.cpp Source/LibRawLite/src/utils/curves.cpp Source/LibRawLite/src/utils/decoder_info.cpp Source/LibRawLite/src/utils/init_close_utils.cpp Source/LibRawLite/src/utils/open.cpp Source/LibRawLite/src/utils/phaseone_processing.cpp Source/LibRawLite/src/utils/read_utils.cpp Source/LibRawLite/src/utils/thumb_utils.cpp Source/LibRawLite/src/utils/utils_dcraw.cpp Source/LibRawLite/src/utils/utils_libraw.cpp Source/LibRawLite/src/write/file_write.cpp Source/LibRawLite/src/x3f/x3f_parse_process.cpp Source/LibRawLite/src/x3f/x3f_utils_patched.cpp Source/LibWebP/src/dec/alpha_dec.c Source/LibWebP/src/dec/buffer_dec.c Source/LibWebP/src/dec/frame_dec.c Source/LibWebP/src/dec/idec_dec.c Source/LibWebP/src/dec/io_dec.c Source/LibWebP/src/dec/quant_dec.c Source/LibWebP/src/dec/tree_dec.c Source/LibWebP/src/dec/vp8l_dec.c Source/LibWebP/src/dec/vp8_dec.c Source/LibWebP/src/dec/webp_dec.c Source/LibWebP/src/demux/anim_decode.c Source/LibWebP/src/demux/demux.c Source/LibWebP/src/dsp/alpha_processing.c Source/LibWebP/src/dsp/alpha_processing_mips_dsp_r2.c Source/LibWebP/src/dsp/alpha_processing_neon.c Source/LibWebP/src/dsp/alpha_processing_sse2.c Source/LibWebP/src/dsp/alpha_processing_sse41.c Source/LibWebP/src/dsp/cost.c Source/LibWebP/src/dsp/cost_mips32.c Source/LibWebP/src/dsp/cost_mips_dsp_r2.c Source/LibWebP/src/dsp/cost_neon.c Source/LibWebP/src/dsp/cost_sse2.c Source/LibWebP/src/dsp/cpu.c Source/LibWebP/src/dsp/dec.c Source/LibWebP/src/dsp/dec_clip_tables.c Source/LibWebP/src/dsp/dec_mips32.c Source/LibWebP/src/dsp/dec_mips_dsp_r2.c Source/LibWebP/src/dsp/dec_msa.c Source/LibWebP/src/dsp/dec_neon.c Source/LibWebP/src/dsp/dec_sse2.c Source/LibWebP/src/dsp/dec_sse41.c Source/LibWebP/src/dsp/enc.c Source/LibWebP/src/dsp/enc_avx2.c Source/LibWebP/src/dsp/enc_mips32.c Source/LibWebP/src/dsp/enc_mips_dsp_r2.c Source/LibWebP/src/dsp/enc_msa.c Source/LibWebP/src/dsp/enc_neon.c Source/LibWebP/src/dsp/enc_sse2.c Source/LibWebP/src/dsp/enc_sse41.c Source/LibWebP/src/dsp/filters.c Source/LibWebP/src/dsp/filters_mips_dsp_r2.c Source/LibWebP/src/dsp/filters_msa.c Source/LibWebP/src/dsp/filters_neon.c Source/LibWebP/src/dsp/filters_sse2.c Source/LibWebP/src/dsp/lossless.c Source/LibWebP/src/dsp/lossless_enc.c Source/LibWebP/src/dsp/lossless_enc_mips32.c Source/LibWebP/src/dsp/lossless_enc_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_enc_msa.c Source/LibWebP/src/dsp/lossless_enc_neon.c Source/LibWebP/src/dsp/lossless_enc_sse2.c Source/LibWebP/src/dsp/lossless_enc_sse41.c Source/LibWebP/src/dsp/lossless_mips_dsp_r2.c Source/LibWebP/src/dsp/lossless_msa.c Source/LibWebP/src/dsp/lossless_neon.c Source/LibWebP/src/dsp/lossless_sse2.c Source/LibWebP/src/dsp/lossless_sse41.c Source/LibWebP/src/dsp/rescaler.c Source/LibWebP/src/dsp/rescaler_mips32.c Source/LibWebP/src/dsp/rescaler_mips_dsp_r2.c Source/LibWebP/src/dsp/rescaler_msa.c Source/LibWebP/src/dsp/rescaler_neon.c Source/LibWebP/src/dsp/rescaler_sse2.c Source/LibWebP/src/dsp/ssim.c Source/LibWebP/src/dsp/ssim_sse2.c Source/LibWebP/src/dsp/upsampling.c Source/LibWebP/src/dsp/upsampling_mips_dsp_r2.c Source/LibWebP/src/dsp/upsampling_msa.c Source/LibWebP/src/dsp/upsampling_neon.c Source/LibWebP/src/dsp/upsampling_sse2.c Source/LibWebP/src/dsp/upsampling_sse41.c Source/LibWebP/src/dsp/yuv.c Source/LibWebP/src/dsp/yuv_mips32.c Source/LibWebP/src/dsp/yuv_mips_dsp_r2.c Source/LibWebP/src/dsp/yuv_neon.c Source/LibWebP/src/dsp/yuv_sse2.c Source/LibWebP/src/dsp/yuv_sse41.c Source/LibWebP/src/enc/alpha_enc.c Source/LibWebP/src/enc/analysis_enc.c Source/LibWebP/src/enc/backward_references_cost_enc.c Source/LibWebP/src/enc/backward_references_enc.c Source/LibWebP/src/enc/config_enc.c Source/LibWebP/src/enc/cost_enc.c Source/LibWebP/src/enc/filter_enc.c Source/LibWebP/src/enc/frame_enc.c Source/LibWebP/src/enc/histogram_enc.c Source/LibWebP/src/enc/iterator_enc.c Source/LibWebP/src/enc/near_lossless_enc.c Source/LibWebP/src/enc/picture_csp_enc.c Source/LibWebP/src/enc/picture_enc.c Source/LibWebP/src/enc/picture_psnr_enc.c Source/LibWebP/src/enc/picture_rescale_enc.c Source/LibWebP/src/enc/picture_tools_enc.c Source/LibWebP/src/enc/predictor_enc.c Source/LibWebP/src/enc/quant_enc.c Source/LibWebP/src/enc/syntax_enc.c Source/LibWebP/src/enc/token_enc.c Source/LibWebP/src/enc/tree_enc.c Source/LibWebP/src/enc/vp8l_enc.c Source/LibWebP/src/enc/webp_enc.c Source/LibWebP/src/mux/anim_encode.c Source/LibWebP/src/mux/muxedit.c Source/LibWebP/src/mux/muxinternal.c Source/LibWebP/src/mux/muxread.c Source/LibWebP/src/utils/bit_reader_utils.c Source/LibWebP/src/utils/bit_writer_utils.c Source/LibWebP/src/utils/color_cache_utils.c Source/LibWebP/src/utils/filters_utils.c Source/LibWebP/src/utils/huffman_encode_utils.c Source/LibWebP/src/utils/huffman_utils.c Source/LibWebP/src/utils/quant_levels_dec_utils.c Source/LibWebP/src/utils/quant_levels_utils.c Source/LibWebP/src/utils/random_utils.c Source/LibWebP/src/utils/rescaler_utils.c Source/LibWebP/src/utils/thread_utils.c Source/LibWebP/src/utils/utils.c Source/LibJXR/image/decode/decode.c Source/LibJXR/image/decode/JXRTranscode.c Source/LibJXR/image/decode/postprocess.c Source/LibJXR/image/decode/segdec.c Source/LibJXR/image/decode/strdec.c Source/LibJXR/image/decode/strdec_x86.c Source/LibJXR/image/decode/strInvTransform.c Source/LibJXR/image/decode/strPredQuantDec.c Source/LibJXR/image/encode/encode.c Source/LibJXR/image/encode/segenc.c Source/LibJXR/image/encode/strenc.c Source/LibJXR/image/encode/strenc_x86.c Source/LibJXR/image/encode/strFwdTransform.c Source/LibJXR/image/encode/strPredQuantEnc.c Source/LibJXR/image/sys/adapthuff.c Source/LibJXR/image/sys/image.c Source/LibJXR/image/sys/strcodec.c Source/LibJXR/image/sys/strPredQuant.c Source/LibJXR/image/sys/strTransform.c Source/LibJXR/jxrgluelib/JXRGlue.c Source/LibJXR/jxrgluelib/JXRGlueJxr.c Source/LibJXR/jxrgluelib/JXRGluePFC.c Source/LibJXR/jxrgluelib/JXRMeta.c Wrapper/FreeImagePlus/src/fipImage.cpp Wrapper/FreeImagePlus/src/fipMemoryIO.cpp Wrapper/FreeImagePlus/src/fipMetadataFind.cpp Wrapper/FreeImagePlus/src/fipMultiPage.cpp Wrapper/FreeImagePlus/src/fipTag.cpp Wrapper/FreeImagePlus/src/fipWinImage.cpp Wrapper/FreeImagePlus/src/FreeImagePlus.cpp 
--INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -ISource/LibJPEG -ISource/LibPNG -ISource/LibTIFF4 -ISource/ZLib -ISource/LibOpenJPEG -ISource/OpenEXR -ISource/OpenEXR/Half -ISource/OpenEXR/Iex -ISource/OpenEXR/IlmImf -ISource/OpenEXR/IlmThread -ISource/OpenEXR/Imath -ISource/OpenEXR/IexMath -ISource/LibRawLite -ISource/LibRawLite/dcraw -ISource/LibRawLite/internal -ISource/LibRawLite/libraw -ISource/LibRawLite/src -ISource/LibWebP -ISource/LibJXR -ISource/LibJXR/common/include -ISource/LibJXR/image/sys -ISource/LibJXR/jxrgluelib -IWrapper/FreeImagePlus
-+SRCS = ./Source/FreeImage/BitmapAccess.cpp ./Source/FreeImage/ColorLookup.cpp ./Source/FreeImage/ConversionRGBA16.cpp ./Source/FreeImage/ConversionRGBAF.cpp ./Source/FreeImage/FreeImage.cpp ./Source/FreeImage/FreeImageC.c ./Source/FreeImage/FreeImageIO.cpp ./Source/FreeImage/GetType.cpp ./Source/FreeImage/LFPQuantizer.cpp ./Source/FreeImage/MemoryIO.cpp ./Source/FreeImage/PixelAccess.cpp ./Source/FreeImage/J2KHelper.cpp ./Source/FreeImage/MNGHelper.cpp ./Source/FreeImage/Plugin.cpp ./Source/FreeImage/PluginBMP.cpp ./Source/FreeImage/PluginCUT.cpp ./Source/FreeImage/PluginDDS.cpp ./Source/FreeImage/PluginEXR.cpp ./Source/FreeImage/PluginG3.cpp ./Source/FreeImage/PluginGIF.cpp ./Source/FreeImage/PluginHDR.cpp ./Source/FreeImage/PluginICO.cpp ./Source/FreeImage/PluginIFF.cpp ./Source/FreeImage/PluginJ2K.cpp ./Source/FreeImage/PluginJNG.cpp ./Source/FreeImage/PluginJP2.cpp ./Source/FreeImage/PluginJPEG.cpp ./Source/FreeImage/PluginJXR.cpp ./Source/FreeImage/PluginKOALA.cpp ./Source/FreeImage/PluginMNG.cpp ./Source/FreeImage/PluginPCD.cpp ./Source/FreeImage/PluginPCX.cpp ./Source/FreeImage/PluginPFM.cpp ./Source/FreeImage/PluginPICT.cpp ./Source/FreeImage/PluginPNG.cpp ./Source/FreeImage/PluginPNM.cpp ./Source/FreeImage/PluginPSD.cpp ./Source/FreeImage/PluginRAS.cpp ./Source/FreeImage/PluginRAW.cpp ./Source/FreeImage/PluginSGI.cpp ./Source/FreeImage/PluginTARGA.cpp ./Source/FreeImage/PluginTIFF.cpp ./Source/FreeImage/PluginWBMP.cpp ./Source/FreeImage/PluginWebP.cpp ./Source/FreeImage/PluginXBM.cpp ./Source/FreeImage/PluginXPM.cpp ./Source/FreeImage/PSDParser.cpp ./Source/FreeImage/TIFFLogLuv.cpp ./Source/FreeImage/Conversion.cpp ./Source/FreeImage/Conversion16_555.cpp ./Source/FreeImage/Conversion16_565.cpp ./Source/FreeImage/Conversion24.cpp ./Source/FreeImage/Conversion32.cpp ./Source/FreeImage/Conversion4.cpp ./Source/FreeImage/Conversion8.cpp ./Source/FreeImage/ConversionFloat.cpp ./Source/FreeImage/ConversionRGB16.cpp ./Source/FreeImage/ConversionRGBF.cpp ./Source/FreeImage/ConversionType.cpp ./Source/FreeImage/ConversionUINT16.cpp ./Source/FreeImage/Halftoning.cpp ./Source/FreeImage/tmoColorConvert.cpp ./Source/FreeImage/tmoDrago03.cpp ./Source/FreeImage/tmoFattal02.cpp ./Source/FreeImage/tmoReinhard05.cpp ./Source/FreeImage/ToneMapping.cpp ./Source/FreeImage/NNQuantizer.cpp ./Source/FreeImage/WuQuantizer.cpp ./Source/FreeImage/CacheFile.cpp ./Source/FreeImage/MultiPage.cpp ./Source/FreeImage/ZLibInterface.cpp ./Source/Metadata/Exif.cpp ./Source/Metadata/FIRational.cpp ./Source/Metadata/FreeImageTag.cpp ./Source/Metadata/IPTC.cpp ./Source/Metadata/TagConversion.cpp ./Source/Metadata/TagLib.cpp ./Source/Metadata/XTIFF.cpp ./Source/FreeImageToolkit/Background.cpp ./Source/FreeImageToolkit/BSplineRotate.cpp ./Source/FreeImageToolkit/Channels.cpp ./Source/FreeImageToolkit/ClassicRotate.cpp ./Source/FreeImageToolkit/Colors.cpp ./Source/FreeImageToolkit/CopyPaste.cpp ./Source/FreeImageToolkit/Display.cpp ./Source/FreeImageToolkit/Flip.cpp ./Source/FreeImageToolkit/JPEGTransform.cpp ./Source/FreeImageToolkit/MultigridPoissonSolver.cpp ./Source/FreeImageToolkit/Rescale.cpp ./Source/FreeImageToolkit/Resize.cpp Wrapper/FreeImagePlus/src/fipImage.cpp Wrapper/FreeImagePlus/src/fipMemoryIO.cpp Wrapper/FreeImagePlus/src/fipMetadataFind.cpp Wrapper/FreeImagePlus/src/fipMultiPage.cpp Wrapper/FreeImagePlus/src/fipTag.cpp Wrapper/FreeImagePlus/src/fipWinImage.cpp Wrapper/FreeImagePlus/src/FreeImagePlus.cpp 
-+INCLUDE = -I. -ISource -ISource/Metadata -ISource/FreeImageToolkit -IWrapper/FreeImagePlus
diff --git a/pkgs/by-name/im/imv/package.nix b/pkgs/by-name/im/imv/package.nix
index 47e257e65e2e..656590150e2b 100644
--- a/pkgs/by-name/im/imv/package.nix
+++ b/pkgs/by-name/im/imv/package.nix
@@ -27,7 +27,6 @@
     "libheif"
     "libnsgif"
   ],
-  freeimage,
   libtiff,
   libjpeg_turbo,
   libjxl,
@@ -50,7 +49,6 @@ let
 
   backends = {
     inherit
-      freeimage
       libtiff
       libpng
       librsvg
@@ -59,6 +57,7 @@ let
       libnsgif
       ;
     libjpeg = libjpeg_turbo;
+    freeimage = throw "freeimage backend not supported";
   };
 
   backendFlags = map (
diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix
index 7bbb16328344..a7930a49d2af 100644
--- a/pkgs/by-name/li/libtiff/package.nix
+++ b/pkgs/by-name/li/libtiff/package.nix
@@ -32,7 +32,6 @@
   graphicsmagick,
   gdal,
   openimageio,
-  freeimage,
   testers,
 }:
 
@@ -113,7 +112,6 @@ stdenv.mkDerivation (finalAttrs: {
         graphicsmagick
         gdal
         openimageio
-        freeimage
         ;
 
       inherit (python3Packages) pillow imread;
diff --git a/pkgs/by-name/me/megacmd/package.nix b/pkgs/by-name/me/megacmd/package.nix
index b8e02743871f..cbbdb84569f5 100644
--- a/pkgs/by-name/me/megacmd/package.nix
+++ b/pkgs/by-name/me/megacmd/package.nix
@@ -7,7 +7,6 @@
   curl,
   fetchFromGitHub,
   ffmpeg,
-  freeimage,
   gcc-unwrapped,
   icu,
   libmediainfo,
@@ -19,7 +18,6 @@
   pkg-config,
   readline,
   sqlite,
-  withFreeImage ? false, # default to false because freeimage is insecure
 }:
 
 let
@@ -71,8 +69,7 @@ stdenv.mkDerivation {
       pcre-cpp
       readline
       sqlite
-    ]
-    ++ lib.optionals withFreeImage [ freeimage ];
+    ];
 
   configureFlags = [
     "--disable-examples"
@@ -88,8 +85,8 @@ stdenv.mkDerivation {
     "--with-readline"
     "--with-sodium"
     "--with-termcap"
-  ]
-  ++ (if withFreeImage then [ "--with-freeimage" ] else [ "--without-freeimage" ]);
+    "--without-freeimage"
+  ];
 
   # On darwin, some macros defined in AssertMacros.h (from apple-sdk) are conflicting.
   postConfigure = ''
diff --git a/pkgs/development/lisp-modules/ql.nix b/pkgs/development/lisp-modules/ql.nix
index 45ad78c4f236..725a6353f983 100644
--- a/pkgs/development/lisp-modules/ql.nix
+++ b/pkgs/development/lisp-modules/ql.nix
@@ -27,9 +27,6 @@ let
       cl-cairo2-xlib = super.cl-cairo2-xlib.overrideLispAttrs (o: {
         nativeLibs = [ pkgs.gtk2-x11 ];
       });
-      cl-freeimage = super.cl-freeimage.overrideLispAttrs (o: {
-        nativeLibs = [ pkgs.freeimage ];
-      });
       cl-freetype2 = super.cl-freetype2.overrideLispAttrs (o: {
         nativeLibs = [ pkgs.freetype ];
         nativeBuildInputs = [ pkgs.freetype ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 30eb6aa12ea8..fce4d1cd6ac8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -968,6 +968,7 @@ mapAliases {
   francis = kdePackages.francis; # added 2024-07-13
   freecad-qt6 = freecad; # added 2025-06-14
   freecad-wayland = freecad; # added 2025-06-14
+  freeimage = throw "freeimage was removed due to numerous vulnerabilities"; # Added 2025-10-23
   freerdp3 = freerdp; # added 2025-03-25
   freerdpUnstable = freerdp; # added 2025-03-25
   frostwire = throw "frostwire was removed, as it was broken due to reproducibility issues, use `frostwire-bin` package instead."; # added 2024-05-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d3847ee7ae46..64c1a5833818 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7225,10 +7225,6 @@ with pkgs;
   fplll = callPackage ../development/libraries/fplll { };
   fplll_20160331 = callPackage ../development/libraries/fplll/20160331.nix { };
 
-  freeimage = callPackage ../by-name/fr/freeimage/package.nix {
-    openexr = openexr_2;
-  };
-
   freeipa = callPackage ../os-specific/linux/freeipa {
     # NOTE: freeipa and sssd need to be built with the same version of python
     kerberos = krb5.override {

From f364b5a80766ce5287ae909fb5c1d6b8ed1d7ead Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 22 Oct 2025 22:09:53 +0000
Subject: [PATCH 1990/6226] python3Packages.kfactory: 1.14.4 -> 2.0.0

Diff: https://github.com/gdsfactory/kfactory/compare/v1.14.4...v2.0.0

Changelog: https://github.com/gdsfactory/kfactory/blob/v2.0.0/CHANGELOG.md
---
 .../python-modules/kfactory/default.nix       | 74 +++++++++++++++++--
 1 file changed, 67 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/kfactory/default.nix b/pkgs/development/python-modules/kfactory/default.nix
index 0e10841be1d9..5e0c219ee589 100644
--- a/pkgs/development/python-modules/kfactory/default.nix
+++ b/pkgs/development/python-modules/kfactory/default.nix
@@ -12,7 +12,6 @@
   cachetools,
   klayout,
   loguru,
-  numpy,
   pydantic-extra-types,
   pydantic-settings,
   pydantic,
@@ -21,26 +20,32 @@
   rectangle-packer,
   requests,
   ruamel-yaml-string,
-  ruamel-yaml,
   scipy,
   semver,
   toolz,
   typer,
 
   # tests
+  pytest-regressions,
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "kfactory";
-  version = "1.14.4";
+  version = "2.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gdsfactory";
     repo = "kfactory";
     tag = "v${version}";
-    hash = "sha256-el3bGv57mAfxYG9tdLX5N6R76F+9GY9jdZaIUjMqcVU=";
+    # kfactory uses `.git` to infer the project directory.
+    # https://github.com/gdsfactory/kfactory/blob/v2.0.0/src/kfactory/conf.py#L318-L327
+    # Otherwise, tests fail with:
+    # assert kf.config.project_dir is not None
+    # E   AssertionError: assert None is not None
+    leaveDotGit = true;
+    hash = "sha256-eZRNUb2Qw2HcR2W1pf15ulEt7ZCJwi60SuGdte/cG8E=";
   };
 
   build-system = [
@@ -48,12 +53,14 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
+  pythonRelaxDeps = [
+    "pydantic"
+  ];
   dependencies = [
     aenum
     cachetools
     klayout
     loguru
-    numpy
     pydantic
     pydantic-extra-types
     pydantic-settings
@@ -61,7 +68,6 @@ buildPythonPackage rec {
     rapidfuzz
     rectangle-packer
     requests
-    ruamel-yaml
     ruamel-yaml-string
     scipy
     semver
@@ -71,13 +77,67 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "kfactory" ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytest-regressions
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # AssertionError: Binary files ... and ... differ
+    "test_array"
+    "test_array_indexerror"
+    "test_autorename"
+    "test_cell_default_fallback"
+    "test_cell_in_threads"
+    "test_cell_yaml"
+    "test_circular_snapping"
+    "test_create"
+    "test_enclosure_name"
+    "test_euler_snapping"
+    "test_filter_layer_pt_reg"
+    "test_filter_regex"
+    "test_flatten"
+    "test_info"
+    "test_invalid_array"
+    "test_kcell_attributes"
+    "test_namecollision"
+    "test_nested_dic"
+    "test_nested_dict_list"
+    "test_netlist"
+    "test_netlist_equivalent"
+    "test_no_snap"
+    "test_overwrite"
+    "test_ports_cell"
+    "test_ports_in_cells"
+    "test_ports_instance"
+    "test_rename_clockwise"
+    "test_rename_clockwise_multi"
+    "test_schematic_anchor"
+    "test_schematic_create"
+    "test_schematic_create_cell"
+    "test_schematic_kcl_mix_netlist"
+    "test_schematic_mirror_connection"
+    "test_schematic_route"
+    "test_size_info"
+    "test_to_dtype"
+  ];
 
   disabledTestPaths = [
     # https://github.com/gdsfactory/kfactory/issues/511
     "tests/test_pdk.py"
     # NameError
     "tests/test_session.py"
+
+    # AssertionError: Binary files ... and ... differ
+    "tests/test_all_angle.py"
+    "tests/test_cells.py"
+    "tests/test_grid.py"
+    "tests/test_l2n.py"
+    "tests/test_packing.py"
+    "tests/test_pins.py"
+    "tests/test_rename.py"
+    "tests/test_routing.py"
+    "tests/test_spiral.py"
   ];
 
   meta = {

From 937b73dd4a1eae038c1deecfd3d631fdff1c019b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 23 Oct 2025 09:43:46 +0000
Subject: [PATCH 1991/6226] python3Packages.gdsfactory: 9.18.1 -> 9.20.1

Diff: https://github.com/gdsfactory/gdsfactory/compare/v9.18.1...v9.20.1

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

diff --git a/pkgs/development/python-modules/gdsfactory/default.nix b/pkgs/development/python-modules/gdsfactory/default.nix
index 56914ec6fb4f..7e35b8d2decd 100644
--- a/pkgs/development/python-modules/gdsfactory/default.nix
+++ b/pkgs/development/python-modules/gdsfactory/default.nix
@@ -46,14 +46,14 @@
 }:
 buildPythonPackage rec {
   pname = "gdsfactory";
-  version = "9.18.1";
+  version = "9.20.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gdsfactory";
     repo = "gdsfactory";
     tag = "v${version}";
-    hash = "sha256-PPps3BaQbU7PCq+tlvjlPOurgBYHx/eGDEmlUmaB+O4=";
+    hash = "sha256-TpMi0Rv6sQA8uAPGl6iR1qgTU7havBlWmdz98DROoSk=";
   };
 
   build-system = [ flit-core ];

From a247e882f84b6cfde66a93e81758d39b88c7999f Mon Sep 17 00:00:00 2001
From: rewine <luhongxu@deepin.org>
Date: Thu, 23 Oct 2025 19:59:05 +0800
Subject: [PATCH 1992/6226] wlroots_0_18: 0.18.2 -> 0.18.3

---
 pkgs/development/libraries/wlroots/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix
index 7518d68b2fb1..4860f23d9fad 100644
--- a/pkgs/development/libraries/wlroots/default.nix
+++ b/pkgs/development/libraries/wlroots/default.nix
@@ -161,8 +161,8 @@ in
   };
 
   wlroots_0_18 = generic {
-    version = "0.18.2";
-    hash = "sha256-vKvMWRPPJ4PRKWVjmKKCdNSiqsQm+uQBoBnBUFElLNA=";
+    version = "0.18.3";
+    hash = "sha256-D8RapSeH+5JpTtq+OU8PyVZubLhjcebbCBPuSO5Q7kU=";
     extraBuildInputs = [
       lcms2
     ];

From 60d03335e83c355e1eec3aceb03a0798aaf5334e Mon Sep 17 00:00:00 2001
From: ccicnce113424 <ccicnce113424@gmail.com>
Date: Thu, 23 Oct 2025 19:42:51 +0800
Subject: [PATCH 1993/6226] ayugram-desktop: fix build with qt 6.10

---
 pkgs/by-name/ay/ayugram-desktop/package.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ay/ayugram-desktop/package.nix b/pkgs/by-name/ay/ayugram-desktop/package.nix
index 4a7029bab9d6..57fa92699d2e 100644
--- a/pkgs/by-name/ay/ayugram-desktop/package.nix
+++ b/pkgs/by-name/ay/ayugram-desktop/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  stdenv,
+  fetchpatch2,
   fetchFromGitHub,
   nix-update-script,
   telegram-desktop,
@@ -23,6 +23,15 @@ telegram-desktop.override {
         fetchSubmodules = true;
       };
 
+      # fix build failure with Qt 6.10
+      patches = fetchpatch2 {
+        name = "fix-build-with-qt-610.patch";
+        url = "https://github.com/desktop-app/cmake_helpers/commit/682f1b57.patch";
+        hash = "sha256-DHwgxAEFc1byQkVvrPwyctQKvUsK/KQ/cnzRv6PQuTM=";
+        stripLen = 1;
+        extraPrefix = "cmake/";
+      };
+
       passthru.updateScript = nix-update-script { };
 
       meta = previousAttrs.meta // {

From 242c50714dcac682450783e12720712291cdcfd0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 12:21:17 +0000
Subject: [PATCH 1994/6226] pixi: 0.57.0 -> 0.58.0

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

diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix
index 24531f410f2f..9c076d7cb760 100644
--- a/pkgs/by-name/pi/pixi/package.nix
+++ b/pkgs/by-name/pi/pixi/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pixi";
-  version = "0.57.0";
+  version = "0.58.0";
 
   src = fetchFromGitHub {
     owner = "prefix-dev";
     repo = "pixi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nWN+SCxlDeSzbnJtSIVVYw5G2WULdzD5VQ+Jc1xnpwI=";
+    hash = "sha256-+Bhyt01gTNWVOL0WG6pdjzbRqIfm2MUEHnbTGg3nG2k=";
   };
 
-  cargoHash = "sha256-YHLN6jPSsNxWQJI+uDYgfetQFnMk8v2ev/EPjSRrCJY=";
+  cargoHash = "sha256-b7/UiIkeLddo9hUipqd7zLGvFumAjFolf/jODZ0qOQw=";
 
   nativeBuildInputs = [
     pkg-config

From 12482942c1de70f4c9daaf505a0ba7eed765b5bd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 12:32:56 +0000
Subject: [PATCH 1995/6226] phrase-cli: 2.48.0 -> 2.49.0

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

diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix
index 5e7465bfb19a..3f98171435bf 100644
--- a/pkgs/by-name/ph/phrase-cli/package.nix
+++ b/pkgs/by-name/ph/phrase-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "phrase-cli";
-  version = "2.48.0";
+  version = "2.49.0";
 
   src = fetchFromGitHub {
     owner = "phrase";
     repo = "phrase-cli";
     rev = version;
-    sha256 = "sha256-X6Y7B9LLxoxsMbLlhJTlHWdnJV6ZG4EuV+Dww6mtgAc=";
+    sha256 = "sha256-P3tCYmqLnskuBJBgeEvdjkNAqVCFtDUes1CTHoj/k5M=";
   };
 
-  vendorHash = "sha256-si1io4DMjhUhpAwb4ctUFLdIblZOBskn9dGwCTy4pAo=";
+  vendorHash = "sha256-VFJfpMVMHUkfH04hBpeoH5lUeW+5eG8V03W0DgcVpDM=";
 
   ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ];
 

From c6d501e3c5560825dd3b0a0d48e28014ac9aebe9 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Thu, 23 Oct 2025 11:41:11 +0200
Subject: [PATCH 1996/6226] opencode: 0.15.10 -> 0.15.14

https://github.com/sst/opencode/releases/tag/v0.15.11
https://github.com/sst/opencode/releases/tag/v0.15.12
https://github.com/sst/opencode/releases/tag/v0.15.13
https://github.com/sst/opencode/releases/tag/v0.15.14
---
 pkgs/by-name/op/opencode/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 1d38172673f5..a3def7a3309d 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -22,12 +22,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.15.10";
+  version = "0.15.14";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aP0CLHfuF21GXIvBTgs8RWpcCXOwy1oPW2P8jEU/4u4=";
+    hash = "sha256-K7TmsJm11uDNjN3fUaapM1A01FmHUSfXMiqOzhLzRI8=";
   };
 
   tui = buildGoModule {
@@ -111,10 +111,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     outputHash =
       {
-        x86_64-linux = "sha256-iJbflfKwDwKrJQgy5jxrEhkyCie2hsEMmiLf2btE60E=";
-        aarch64-linux = "sha256-wQ+ToXRi+l24WM24PHGCw6acD9cvLDldOv9WvOzHYGU=";
-        x86_64-darwin = "sha256-DyvteSN+mEFZojH8mY4LNQE2C6lCWwrIVbJUFn4lAh0=";
-        aarch64-darwin = "sha256-oICPefgikykFWNDlxCXH4tILdjv4NytgQdejdQBeQ+A=";
+        x86_64-linux = "sha256-8pJBLNPuF7+wcUCNoI9z68q5Pl6Mvm1ZvIDianLPdHo=";
+        aarch64-linux = "sha256-zODR/4mcE4Hh3I6Yh8ExUi3WdBttrRBf00ItQ4TmVMU=";
+        x86_64-darwin = "sha256-ZJFT0qY82UK9jXVMQweXXjZ4ohZLKVJEf+CjfRkJB9E=";
+        aarch64-darwin = "sha256-0bjdbPXm2TkOEsSyqvPJnFLIzmBJt5SH40hwYutWYBY=";
       }
       .${stdenv.hostPlatform.system};
     outputHashAlgo = "sha256";

From 932c796fa26362357f696831b8c5c0c3b6ba2126 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 19 Oct 2025 19:47:37 -0300
Subject: [PATCH 1997/6226] zandronum-alpha, zandronum-alpha-server: drop

---
 .../zandronum/alpha/add_gitinfo.patch         |  15 ---
 .../doom-ports/zandronum/alpha/default.nix    | 127 ------------------
 .../zandronum/alpha/dont_update_gitinfo.patch |  19 ---
 .../alpha/zan_configure_impurity.patch        |  69 ----------
 pkgs/top-level/aliases.nix                    |   2 +
 pkgs/top-level/all-packages.nix               |   6 -
 6 files changed, 2 insertions(+), 236 deletions(-)
 delete mode 100644 pkgs/games/doom-ports/zandronum/alpha/add_gitinfo.patch
 delete mode 100644 pkgs/games/doom-ports/zandronum/alpha/default.nix
 delete mode 100644 pkgs/games/doom-ports/zandronum/alpha/dont_update_gitinfo.patch
 delete mode 100644 pkgs/games/doom-ports/zandronum/alpha/zan_configure_impurity.patch

diff --git a/pkgs/games/doom-ports/zandronum/alpha/add_gitinfo.patch b/pkgs/games/doom-ports/zandronum/alpha/add_gitinfo.patch
deleted file mode 100644
index fdf8e2e1a957..000000000000
--- a/pkgs/games/doom-ports/zandronum/alpha/add_gitinfo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -r 89bccf7127ba src/gitinfo.h
---- /dev/null	Thu Jan 01 00:00:00 1970 +0000
-+++ b/src/gitinfo.h	Fri Dec 01 10:18:23 2023 -0300
-@@ -0,0 +1,11 @@
-+// 89bccf7127ba1ebe92558f674be69549bf2c4bd4
-+//
-+// This file was automatically generated by the
-+// updaterevision tool. Do not edit by hand.
-+
-+#define GIT_DESCRIPTION "ZA_3.1-404-89bccf7127ba"
-+#define GIT_HASH "89bccf7127ba1ebe92558f674be69549bf2c4bd4"
-+#define GIT_TIME "2023-07-09 15:14:38 -0400"
-+#define HG_REVISION_NUMBER 1688930078
-+#define HG_REVISION_HASH_STRING "89bccf7127ba"
-+#define HG_TIME "230709-1914"
diff --git a/pkgs/games/doom-ports/zandronum/alpha/default.nix b/pkgs/games/doom-ports/zandronum/alpha/default.nix
deleted file mode 100644
index 5298485df6b6..000000000000
--- a/pkgs/games/doom-ports/zandronum/alpha/default.nix
+++ /dev/null
@@ -1,127 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchhg,
-  cmake,
-  pkg-config,
-  makeWrapper,
-  callPackage,
-  soundfont-fluid,
-  SDL_compat,
-  libGL,
-  glew,
-  bzip2,
-  zlib,
-  libjpeg,
-  fluidsynth,
-  fmodex,
-  openssl,
-  gtk2,
-  python3,
-  game-music-emu,
-  serverOnly ? false,
-}:
-
-let
-  suffix = lib.optionalString serverOnly "-server";
-  fmod = fmodex; # fmodex is on nixpkgs now
-  sqlite = callPackage ../sqlite.nix { };
-  clientLibPath = lib.makeLibraryPath [ fluidsynth ];
-
-in
-stdenv.mkDerivation {
-  pname = "zandronum-alpha${suffix}";
-  version = "3.2-230709-1914";
-
-  src = fetchhg {
-    # expired ssl certificate
-    url = "http://hg.osdn.net/view/zandronum/zandronum-stable";
-    rev = "89bccf7127ba";
-    hash = "sha256-waD9hKk0A0zMPyqEvAKxaz2e2TBG2G0MJRrzjx1LyB0=";
-  };
-
-  # zandronum tries to download sqlite now when running cmake, don't let it
-  # it also needs the current mercurial revision info embedded in gitinfo.h
-  # otherwise, the client will fail to connect to servers because the
-  # protocol version doesn't match.
-  patches = [
-    ./zan_configure_impurity.patch
-    ./dont_update_gitinfo.patch
-    ./add_gitinfo.patch
-  ];
-
-  # I have no idea why would SDL and libjpeg be needed for the server part!
-  # But they are.
-  buildInputs = [
-    openssl
-    bzip2
-    zlib
-    SDL_compat
-    libjpeg
-    sqlite
-    game-music-emu
-  ]
-  ++ lib.optionals (!serverOnly) [
-    libGL
-    glew
-    fmod
-    fluidsynth
-    gtk2
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-    makeWrapper
-    python3
-  ];
-
-  preConfigure = ''
-    ln -s ${sqlite}/* sqlite/
-    sed -i -e 's| restrict| _restrict|g' dumb/include/dumb.h \
-                                       dumb/src/it/*.c
-  ''
-  + lib.optionalString (!serverOnly) ''
-    sed -i \
-      -e "s@/usr/share/sounds/sf2/@${soundfont-fluid}/share/soundfonts/@g" \
-      -e "s@FluidR3_GM.sf2@FluidR3_GM2-2.sf2@g" \
-      src/sound/music_fluidsynth_mididevice.cpp
-  '';
-
-  cmakeFlags = [
-    "-DFORCE_INTERNAL_GME=OFF"
-  ]
-  ++ (if serverOnly then [ "-DSERVERONLY=ON" ] else [ "-DFMOD_LIBRARY=${fmod}/lib/libfmodex.so" ]);
-
-  hardeningDisable = [ "format" ];
-
-  # Won't work well without C or en_US. Setting LANG might not be enough if the user is making use of LC_* so wrap with LC_ALL instead
-  installPhase = ''
-    mkdir -p $out/bin
-    mkdir -p $out/lib/zandronum
-    cp zandronum${suffix} \
-       *.pk3 \
-       ${lib.optionalString (!serverOnly) "liboutput_sdl.so"} \
-       $out/lib/zandronum
-    makeWrapper $out/lib/zandronum/zandronum${suffix} $out/bin/zandronum-alpha${suffix}
-    wrapProgram $out/bin/zandronum-alpha${suffix} \
-      --set LC_ALL="C"
-  '';
-
-  postFixup = lib.optionalString (!serverOnly) ''
-    patchelf --set-rpath $(patchelf --print-rpath $out/lib/zandronum/zandronum):$out/lib/zandronum:${clientLibPath} \
-      $out/lib/zandronum/zandronum
-  '';
-
-  passthru = {
-    inherit fmod sqlite;
-  };
-
-  meta = with lib; {
-    homepage = "https://zandronum.com/";
-    description = "Multiplayer oriented port, based off Skulltag, for Doom and Doom II by id Software";
-    maintainers = with maintainers; [ lassulus ];
-    license = licenses.sleepycat;
-    platforms = platforms.linux;
-  };
-}
diff --git a/pkgs/games/doom-ports/zandronum/alpha/dont_update_gitinfo.patch b/pkgs/games/doom-ports/zandronum/alpha/dont_update_gitinfo.patch
deleted file mode 100644
index 8d639c646738..000000000000
--- a/pkgs/games/doom-ports/zandronum/alpha/dont_update_gitinfo.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -r 89bccf7127ba src/CMakeLists.txt
---- a/src/CMakeLists.txt	Sun Jul 09 15:14:38 2023 -0400
-+++ b/src/CMakeLists.txt	Fri Dec 01 10:16:26 2023 -0300
-@@ -642,15 +642,6 @@
- 	add_definitions( -DBACKPATCH )
- endif( BACKPATCH )
- 
--# Update gitinfo.h
--
--get_target_property( UPDATEREVISION_EXE updaterevision LOCATION )
--
--add_custom_target( revision_check ALL
--	COMMAND ${UPDATEREVISION_EXE} src/gitinfo.h
--	WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
--	DEPENDS updaterevision )
--
- # Libraries ZDoom needs
- 
- message( STATUS "Fluid synth libs: ${FLUIDSYNTH_LIBRARIES}" )
diff --git a/pkgs/games/doom-ports/zandronum/alpha/zan_configure_impurity.patch b/pkgs/games/doom-ports/zandronum/alpha/zan_configure_impurity.patch
deleted file mode 100644
index 4a85de520ac1..000000000000
--- a/pkgs/games/doom-ports/zandronum/alpha/zan_configure_impurity.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-diff -r 89bccf7127ba sqlite/CMakeLists.txt
---- a/sqlite/CMakeLists.txt	Sun Jul 09 15:14:38 2023 -0400
-+++ b/sqlite/CMakeLists.txt	Fri Dec 01 10:10:35 2023 -0300
-@@ -1,65 +1,5 @@
- cmake_minimum_required( VERSION 2.4 )
- 
--# [BB/EP] Download SQLite archive and extract the sources if necessary.
--set( ZAN_SQLITE_VERSION 3360000 ) # SQL version 3.36.0
--set( ZAN_SQLITE_YEAR 2021 )
--set( ZAN_SQLITE_SHA1 "a4bcf9e951bfb9745214241ba08476299fc2dc1e" )
--set( ZAN_SQLITE_DOWNLOAD_NAME "sqlite-autoconf-${ZAN_SQLITE_VERSION}" )
--set( ZAN_SQLITE_TEMP_ARCHIVE "${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME}.tar.gz" )
--set( ZAN_SQLITE_HASHED_ARCHIVE "${CMAKE_CURRENT_SOURCE_DIR}/sqlite-${ZAN_SQLITE_SHA1}.tar.gz" )
--
--if( IS_DIRECTORY ${ZAN_SQLITE_HASHED_ARCHIVE} OR IS_SYMLINK ${ZAN_SQLITE_HASHED_ARCHIVE} )
--	message( FATAL_ERROR "SQLite: ${ZAN_SQLITE_HASHED_ARCHIVE} must be a valid file.\n"
--				"SQLite: Please remove it and try again." )
--elseif( ( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3.c ) OR ( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3.h ) OR ( NOT EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/sqlite3ext.h ) )
--
--	if( NOT EXISTS ${ZAN_SQLITE_HASHED_ARCHIVE} )
--		if( IS_DIRECTORY ${ZAN_SQLITE_TEMP_ARCHIVE} OR IS_SYMLINK ${ZAN_SQLITE_TEMP_ARCHIVE} )
--			message( FATAL_ERROR "SQLite: ${ZAN_SQLITE_TEMP_ARCHIVE} must be a valid file.\n"
--					"SQLite: Please remove it and try again." )
--		endif()
--
--		message( STATUS "SQLite: downloading the archive..." )
--
--		file( DOWNLOAD https://www.sqlite.org/${ZAN_SQLITE_YEAR}/${ZAN_SQLITE_DOWNLOAD_NAME}.tar.gz ${ZAN_SQLITE_TEMP_ARCHIVE}
--				SHOW_PROGRESS
--				STATUS ZAN_SQLITE_DOWNLOAD_STATUS )
--
--		# Report any problem if present and abort immediately.
--		list( GET ZAN_SQLITE_DOWNLOAD_STATUS 0 ZAN_SQLITE_DOWNLOAD_ERROR_CODE )
--		if( ZAN_SQLITE_DOWNLOAD_ERROR_CODE )
--			list( GET ZAN_SQLITE_DOWNLOAD_STATUS 1 ZAN_SQLITE_DOWNLOAD_ERROR_MESSAGE )
--			message( FATAL_ERROR "SQLite: download failed. Reason: ${ZAN_SQLITE_DOWNLOAD_ERROR_MESSAGE}" )
--		endif()
--
--		# Check the hash. Abort immediately if it's not valid (something is wrong with the download)
--		file( SHA1 ${ZAN_SQLITE_TEMP_ARCHIVE} ZAN_SQLITE_CURRENT_SHA1 )
--		if( NOT ZAN_SQLITE_CURRENT_SHA1 STREQUAL ZAN_SQLITE_SHA1 )
--			message( FATAL_ERROR "SQLite: download failed. The downloaded file has a different hash:\n"
--						"SQLite:    valid:      ${ZAN_SQLITE_SHA1}\n"
--						"SQLite:    downloaded: ${ZAN_SQLITE_CURRENT_SHA1}" )
--		endif()
--
--		# Rename the archive.
--		execute_process( COMMAND ${CMAKE_COMMAND} -E rename ${ZAN_SQLITE_TEMP_ARCHIVE} ${ZAN_SQLITE_HASHED_ARCHIVE} )
--	endif()
--
--	message( STATUS "SQLite: saving the source files into the 'sqlite' directory." )
--
--	# Extract the archive.
--	execute_process( COMMAND ${CMAKE_COMMAND} -E tar xzf ${ZAN_SQLITE_HASHED_ARCHIVE} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} )
--
--	# Copy the required files.
--	execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME}/sqlite3.c ${CMAKE_CURRENT_SOURCE_DIR} )
--	execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME}/sqlite3.h ${CMAKE_CURRENT_SOURCE_DIR} )
--	execute_process( COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME}/sqlite3ext.h ${CMAKE_CURRENT_SOURCE_DIR} )
--
--	# Remove the extracted folder.
--	execute_process( COMMAND ${CMAKE_COMMAND} -E remove_directory ${CMAKE_CURRENT_SOURCE_DIR}/${ZAN_SQLITE_DOWNLOAD_NAME} )
--
--	message( STATUS "SQLite: done." )
--endif()
--
- # [BB] Silence all GCC warnings
- IF ( CMAKE_COMPILER_IS_GNUCXX )
- 	ADD_DEFINITIONS ( -w )
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 909f5afde9a1..12de3ec40218 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2862,6 +2862,8 @@ mapAliases {
   z3_4_8 = throw "'z3_4_8' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
   zabbix50 = throw "'zabbix50' has been removed, it would have reached its End of Life a few days after the release of NixOS 25.05. Consider upgrading to 'zabbix60' or 'zabbix70'."; # Added 2025-04-22
   zabbix64 = throw "'zabbix64' has been removed because it reached its End of Life. Consider upgrading to 'zabbix70'."; # Added 2025-04-22
+  zandronum-alpha = throw "'zandronum-alpha' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19
+  zandronum-alpha-server = throw "'zandronum-alpha-server' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19
   zbackup = throw "'zbackup' has been removed due to being unmaintained upstream"; # Added 2025-08-22
   zeal-qt5 = lib.warnOnInstantiate "'zeal-qt5' has been removed from nixpkgs. Please use 'zeal' instead" zeal; # Added 2025-08-31
   zeal-qt6 = lib.warnOnInstantiate "'zeal-qt6' has been renamed to 'zeal'" zeal; # Added 2025-08-31
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 486b519307ce..8473007e29d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13245,12 +13245,6 @@ with pkgs;
     serverOnly = true;
   };
 
-  zandronum-alpha = callPackage ../games/doom-ports/zandronum/alpha { };
-
-  zandronum-alpha-server = zandronum-alpha.override {
-    serverOnly = true;
-  };
-
   fmodex = callPackage ../games/doom-ports/zandronum/fmod.nix { };
 
   pro-office-calculator = libsForQt5.callPackage ../games/pro-office-calculator { };

From 1f6186dd9ad4b8836553db163e25ae6ffe39a10f Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Thu, 23 Oct 2025 14:33:47 +0200
Subject: [PATCH 1998/6226] php82Extensions.dom: fix build with libxml 2.15.0

---
 pkgs/top-level/php-packages.nix | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index 2e3fe3d68310..fd753977bf87 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -447,14 +447,25 @@ lib.makeScope pkgs.newScope (
               configureFlags = [
                 "--enable-dom"
               ];
-              patches = lib.optionals (lib.versionAtLeast php.version "8.4") [
-                # Fix build of ext-dom.
-                # https://github.com/php/php-src/pull/20023 (will be part of 8.4.14)
-                (fetchpatch {
-                  url = "https://github.com/php/php-src/commit/4fe040290da2822c70d3b60d30a2c1256264735d.patch";
-                  hash = "sha256-hCs59X5gCApXMjU9dKEtgdTJBHYq3BcKr9tlQjRCTIA=";
-                })
-              ];
+              patches =
+                lib.optionals (lib.versionAtLeast php.version "8.4") [
+                  # Fix build of ext-dom.
+                  # https://github.com/php/php-src/pull/20023 (will be part of 8.4.14)
+                  (fetchpatch {
+                    url = "https://github.com/php/php-src/commit/4fe040290da2822c70d3b60d30a2c1256264735d.patch";
+                    hash = "sha256-hCs59X5gCApXMjU9dKEtgdTJBHYq3BcKr9tlQjRCTIA=";
+                  })
+                ]
+                ++ lib.optionals (lib.versionOlder php.version "8.3") [
+                  # Fix gh10234 test with libxml 2.15.0
+                  (fetchpatch {
+                    url = "https://github.com/php/php-src/commit/d6e70e705323a50b616ffee9402245ab97de3e4e.patch";
+                    hash = "sha256-Axu09l3uQ83qe30aDsR+Bt29cJiF4mLknwDyQf94vic=";
+                    includes = [
+                      "ext/dom/tests/gh10234.phpt"
+                    ];
+                  })
+                ];
             }
             {
               name = "enchant";

From 3a83ba5a76c3aab0e7dc9903cd82a0e84c12f226 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 12:42:11 +0000
Subject: [PATCH 1999/6226] twmn: 2025_03_06 -> 2025_10_23

---
 pkgs/applications/misc/twmn/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/twmn/default.nix b/pkgs/applications/misc/twmn/default.nix
index bdf7ec15c384..4f84bf31bc34 100644
--- a/pkgs/applications/misc/twmn/default.nix
+++ b/pkgs/applications/misc/twmn/default.nix
@@ -10,13 +10,13 @@
 
 mkDerivation rec {
   pname = "twmn";
-  version = "2025_03_06";
+  version = "2025_10_23";
 
   src = fetchFromGitHub {
     owner = "sboli";
     repo = "twmn";
     tag = version;
-    hash = "sha256-JQhONBcTJUzsKJY6YstC6HB4d/t8vf155/lN4UUv4l4=";
+    hash = "sha256-/yQtwoolGhtn19I+vus27OjaZgXXfhnWKQi+rUMozCY=";
   };
 
   nativeBuildInputs = [

From 427229d2cfa28b1b8b3d092b39edc0e63f2a838f Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 09:44:56 -0300
Subject: [PATCH 2000/6226] netcdfcxx4: fix build with cmake4

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

diff --git a/pkgs/by-name/ne/netcdfcxx4/package.nix b/pkgs/by-name/ne/netcdfcxx4/package.nix
index b96c8f89f6ed..8f0a1c3b502f 100644
--- a/pkgs/by-name/ne/netcdfcxx4/package.nix
+++ b/pkgs/by-name/ne/netcdfcxx4/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   netcdf,
   hdf5,
   curl,
@@ -23,6 +24,11 @@ stdenv.mkDerivation rec {
     # This fix is included upstream, remove with next upgrade
     ./cmake-h5free.patch
     ./netcdf.patch
+    (fetchpatch {
+      name = "cmake-4.patch";
+      url = "https://github.com/Unidata/netcdf-cxx4/commit/8455a69867a420cffa226978174bc0f99029bc8b.patch?full_index=1";
+      hash = "sha256-AS2nQIXEW1iSR2LAzvTB04M+kyureJAn63+mPNoCq+0=";
+    })
   ];
 
   preConfigure = ''

From 3803a1f3279a55a42e50f3dfaec5ff947bafcdae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 12:47:00 +0000
Subject: [PATCH 2001/6226] trdl-client: 0.12.1 -> 0.12.2

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

diff --git a/pkgs/by-name/tr/trdl-client/package.nix b/pkgs/by-name/tr/trdl-client/package.nix
index 03d81f653c1c..ea0a7e425e12 100644
--- a/pkgs/by-name/tr/trdl-client/package.nix
+++ b/pkgs/by-name/tr/trdl-client/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "trdl-client";
-  version = "0.12.1";
+  version = "0.12.2";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "trdl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Wu4PRFJDT6SvWPHOaOmBBVX1wvkDrjigxah5ZCq8NsY=";
+    hash = "sha256-0hyo32LjPG/Zu0n1WHg7O3f9blxiGUkfUD1i/80UIRE=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/client";

From d7b902e0d4477238782f408292edccb93817b45f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 22 Oct 2025 07:46:49 +0300
Subject: [PATCH 2002/6226] python3Packages.pyglossary: init at 5.1.1

---
 .../python-modules/pyglossary/default.nix     | 72 ++++++++++++++
 .../pyglossary/fix-install-issues.patch       | 93 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 167 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyglossary/default.nix
 create mode 100644 pkgs/development/python-modules/pyglossary/fix-install-issues.patch

diff --git a/pkgs/development/python-modules/pyglossary/default.nix b/pkgs/development/python-modules/pyglossary/default.nix
new file mode 100644
index 000000000000..eb52c2d127c8
--- /dev/null
+++ b/pkgs/development/python-modules/pyglossary/default.nix
@@ -0,0 +1,72 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  fetchpatch,
+
+  # build-system
+  setuptools,
+
+  # tests
+  versionCheckHook,
+
+  # dependencies (required for most functionality)
+  pyicu,
+  lxml,
+}:
+
+buildPythonPackage rec {
+  pname = "pyglossary";
+  version = "5.1.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ilius";
+    repo = "pyglossary";
+    tag = version;
+    hash = "sha256-OrySbbStVSz+WF8D+ODK++lKfYJOm9KCfOxDP3snuKY=";
+  };
+
+  patches = [
+    # Fixes a few install issues, can be removed in the next release. See:
+    # https://github.com/ilius/pyglossary/pull/684
+    (fetchpatch {
+      url = "https://github.com/ilius/pyglossary/commit/f86c91ed987579cd8a1c7f7f278452901ce725ac.patch";
+      hash = "sha256-ewYeNwD3/aSsNbMazgW/3tBpYAPBZdnVu9LCh7tQZjg=";
+    })
+  ];
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    pyicu
+    lxml
+  ];
+
+  # Many issues with the tests: They require `cd tests` in `preCheck`; Some of
+  # them depend upon files in `tests/deprecated`; Even with workarounds to
+  # these 2 issues, many tests require network access. We don't enable the
+  # tests by not adding pytestCheckHook to this list.
+  nativeCheckInputs = [
+    versionCheckHook
+  ];
+  env = {
+    # The default --help creates permission errors that may be confusing when
+    # observed in the build log.
+    versionCheckProgramArg = "--version";
+  };
+
+  pythonImportsCheck = [
+    "pyglossary"
+  ];
+
+  meta = {
+    description = "Tool for converting dictionary files aka glossaries. Mainly to help use our offline glossaries in any Open Source dictionary we like on any operating system / device";
+    homepage = "https://github.com/ilius/pyglossary";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ doronbehar ];
+    mainProgram = "pyglossary";
+  };
+}
diff --git a/pkgs/development/python-modules/pyglossary/fix-install-issues.patch b/pkgs/development/python-modules/pyglossary/fix-install-issues.patch
new file mode 100644
index 000000000000..d9e5db1a8111
--- /dev/null
+++ b/pkgs/development/python-modules/pyglossary/fix-install-issues.patch
@@ -0,0 +1,93 @@
+diff --git c/pyproject.toml w/pyproject.toml
+index abfb59ac..8f9c2121 100644
+--- c/pyproject.toml
++++ w/pyproject.toml
+@@ -416,11 +416,10 @@ version = "5.1.1"
+ description = "A tool for converting dictionary files aka glossaries."
+ readme = "README.md"
+ authors = [{ name = "Saeed Rasooli", email = "saeed.gnu@gmail.com" }]
+-license = { text = "GPLv3+" }
++license = "GPL-3.0-or-later"
+ keywords = ["dictionary", "glossary"]
+ classifiers = [
+ 	"Development Status :: 5 - Production/Stable",
+-	"License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
+ 	"Operating System :: OS Independent",
+ 	"Typing :: Typed",
+ 	"Programming Language :: Python :: 3.11",
+@@ -430,6 +429,9 @@ classifiers = [
+ requires-python = ">= 3.11"
+ dependencies = []
+ 
++[project.scripts]
++pyglossary = "pyglossary.ui.main:main"
++
+ [project.optional-dependencies]
+ all = ["PyICU", "lxml", "beautifulsoup4"]
+ 
+diff --git c/setup.py w/setup.py
+index fd38a060..19df9ee3 100755
+--- c/setup.py
++++ w/setup.py
+@@ -8,8 +8,7 @@ import sys
+ from glob import glob
+ from os.path import dirname, exists, isdir, join
+ 
+-from setuptools import setup
+-from setuptools.command.install import install
++from setuptools import setup, find_packages
+ 
+ VERSION = "5.1.1"
+ log = logging.getLogger("root")
+@@ -46,29 +45,6 @@ def getPipSafeVersion() -> str:
+ 	return VERSION
+ 
+ 
+-class my_install(install):
+-	def run(self) -> None:
+-		install.run(self)
+-		if os.sep == "/":
+-			binPath = join(self.install_scripts, "pyglossary")
+-			log.info(f"creating script file {binPath!r}")
+-			if not exists(self.install_scripts):
+-				os.makedirs(self.install_scripts)
+-				# let it fail on wrong permissions.
+-			elif not isdir(self.install_scripts):
+-				raise OSError(
+-					"installation path already exists "
+-					f"but is not a directory: {self.install_scripts}",
+-				)
+-			open(binPath, "w", encoding="ascii").write("""#!/usr/bin/env -S python3 -O
+-import sys
+-from os.path import dirname
+-sys.path.insert(0, dirname(__file__))
+-from pyglossary.ui.main import main
+-main()""")
+-			os.chmod(binPath, 0o755)
+-
+-
+ root_data_file_names = [
+ 	"about",
+ 	"LICENSE",
+@@ -146,19 +122,14 @@ setup(
+ 	name="pyglossary",
+ 	version=getPipSafeVersion(),
+ 	python_requires=">=3.10.0",
+-	cmdclass={
+-		"install": my_install,
+-	},
+ 	description="A tool for converting dictionary files aka glossaries.",
+ 	long_description_content_type="text/markdown",
+ 	long_description=long_description,
+ 	author="Saeed Rasooli",
+ 	author_email="saeed.gnu@gmail.com",
+-	license="GPLv3+",
++	license="GPL-3.0-or-later",
+ 	url="https://github.com/ilius/pyglossary",
+-	packages=[
+-		"pyglossary",
+-	],
++	packages=find_packages(),
+ 	entry_points={
+ 		"console_scripts": [
+ 			"pyglossary = pyglossary.ui.main:main",
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9523371a1569..73f3196fbf82 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13124,6 +13124,8 @@ self: super: with self; {
 
   pyglm = callPackage ../development/python-modules/pyglm { };
 
+  pyglossary = callPackage ../development/python-modules/pyglossary { };
+
   pygls = callPackage ../development/python-modules/pygls { };
 
   pygltflib = callPackage ../development/python-modules/pygltflib { };

From 1d1ce10813f73dc514fb53bad4dedcb02fe172e6 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 22 Oct 2025 10:51:15 +0300
Subject: [PATCH 2003/6226] pyglossary: init at 5.1.1

---
 pkgs/by-name/py/pyglossary/package.nix | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 pkgs/by-name/py/pyglossary/package.nix

diff --git a/pkgs/by-name/py/pyglossary/package.nix b/pkgs/by-name/py/pyglossary/package.nix
new file mode 100644
index 000000000000..8c96c385d8a2
--- /dev/null
+++ b/pkgs/by-name/py/pyglossary/package.nix
@@ -0,0 +1,5 @@
+{
+  python3,
+}:
+
+python3.pkgs.toPythonApplication python3.pkgs.pyglossary

From 97354a1b5a9cb3d6f2459470e6b9d22fb7a996fe Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 22 Oct 2025 10:51:32 +0300
Subject: [PATCH 2004/6226] pyglossary-gui: init at 5.1.1

---
 pkgs/by-name/py/pyglossary-gui/package.nix    |  9 +++++++++
 .../python-modules/pyglossary/default.nix     | 19 +++++++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/by-name/py/pyglossary-gui/package.nix

diff --git a/pkgs/by-name/py/pyglossary-gui/package.nix b/pkgs/by-name/py/pyglossary-gui/package.nix
new file mode 100644
index 000000000000..b9f68d286190
--- /dev/null
+++ b/pkgs/by-name/py/pyglossary-gui/package.nix
@@ -0,0 +1,9 @@
+{
+  python3,
+}:
+
+python3.pkgs.toPythonApplication (
+  python3.pkgs.pyglossary.override {
+    enableGui = true;
+  }
+)
diff --git a/pkgs/development/python-modules/pyglossary/default.nix b/pkgs/development/python-modules/pyglossary/default.nix
index eb52c2d127c8..9f9012c06d4a 100644
--- a/pkgs/development/python-modules/pyglossary/default.nix
+++ b/pkgs/development/python-modules/pyglossary/default.nix
@@ -10,9 +10,17 @@
   # tests
   versionCheckHook,
 
+  # nativeBuildInputs for GUI
+  gobject-introspection,
+  wrapGAppsHook3,
+
   # dependencies (required for most functionality)
   pyicu,
   lxml,
+  enableGui ? false,
+  # for GUI only
+  pygobject3,
+  gtk3,
 }:
 
 buildPythonPackage rec {
@@ -38,11 +46,22 @@ buildPythonPackage rec {
 
   build-system = [
     setuptools
+  ]
+  ++ lib.optionals enableGui [
+    gobject-introspection
+    wrapGAppsHook3
   ];
 
   dependencies = [
     pyicu
     lxml
+  ]
+  ++ lib.optionals enableGui [
+    pygobject3
+  ];
+
+  buildInputs = lib.optionals enableGui [
+    gtk3
   ];
 
   # Many issues with the tests: They require `cd tests` in `preCheck`; Some of

From f940a6d6fb8db8e4e9cd97c271fce55325ee249c Mon Sep 17 00:00:00 2001
From: Onni Hakala <onni@flaky.build>
Date: Fri, 19 Sep 2025 08:21:07 +0300
Subject: [PATCH 2005/6226] duckdb: 1.3.2 -> 1.4.1

Co-authored-by: sikmir <688044+sikmir@users.noreply.github.com>
---
 pkgs/by-name/du/duckdb/package.nix   | 13 +++++--------
 pkgs/by-name/du/duckdb/versions.json |  6 +++---
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/du/duckdb/package.nix b/pkgs/by-name/du/duckdb/package.nix
index 3cfd451a4681..8a5b6700476d 100644
--- a/pkgs/by-name/du/duckdb/package.nix
+++ b/pkgs/by-name/du/duckdb/package.nix
@@ -13,7 +13,6 @@
 }:
 
 let
-  enableFeature = yes: if yes then "ON" else "OFF";
   versions = lib.importJSON ./versions.json;
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -47,14 +46,12 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optionals withOdbc [ unixODBC ];
 
   cmakeFlags = [
-    "-DDUCKDB_EXTENSION_CONFIGS=${finalAttrs.src}/.github/config/in_tree_extensions.cmake"
-    "-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}"
-    "-DJDBC_DRIVER=${enableFeature withJdbc}"
-    "-DOVERRIDE_GIT_DESCRIBE=v${finalAttrs.version}-0-g${finalAttrs.rev}"
-  ]
-  ++ lib.optionals finalAttrs.doInstallCheck [
+    (lib.cmakeFeature "DUCKDB_EXTENSION_CONFIGS" "${finalAttrs.src}/.github/config/in_tree_extensions.cmake")
+    (lib.cmakeBool "BUILD_ODBC_DRIVER" withOdbc)
+    (lib.cmakeBool "JDBC_DRIVER" withJdbc)
+    (lib.cmakeFeature "OVERRIDE_GIT_DESCRIBE" "v${finalAttrs.version}-0-g${finalAttrs.rev}")
     # development settings
-    "-DBUILD_UNITTESTS=ON"
+    (lib.cmakeBool "BUILD_UNITTESTS" finalAttrs.doInstallCheck)
   ];
 
   doInstallCheck = true;
diff --git a/pkgs/by-name/du/duckdb/versions.json b/pkgs/by-name/du/duckdb/versions.json
index a6127ebe6d3e..0bbd61cd8bbc 100644
--- a/pkgs/by-name/du/duckdb/versions.json
+++ b/pkgs/by-name/du/duckdb/versions.json
@@ -1,5 +1,5 @@
 {
-  "version": "1.3.2",
-  "rev": "0b83e5d2f68bc02dfefde74b846bd039f078affa",
-  "hash": "sha256-6NMQ893g+nOiH8dnb63oa+fZMNXs8N6tJv+Er4x547U="
+  "version": "1.4.1",
+  "rev": "b390a7c3760bd95926fe8aefde20d04b349b472e",
+  "hash": "sha256-w/mELyRs4B9hJngi1MLed0fHRq/ldkkFV+SDkSxs3O8="
 }

From 61aacedd9286d768b2999e8a7ac7cfb32c8bf3ed Mon Sep 17 00:00:00 2001
From: Cameron Smith <cameron.ray.smith@gmail.com>
Date: Tue, 21 Oct 2025 22:52:44 -0400
Subject: [PATCH 2006/6226] python3Packages.duckdb: 1.3.2 -> 1.4.1

Co-authored-by: sikmir <688044+sikmir@users.noreply.github.com>
Co-authored-by: harvidsen <62279738+harvidsen@users.noreply.github.com>
---
 .../python-modules/duckdb/default.nix         | 94 ++++++++++++++-----
 1 file changed, 71 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix
index 38e87cef209a..cc87702bb703 100644
--- a/pkgs/development/python-modules/duckdb/default.nix
+++ b/pkgs/development/python-modules/duckdb/default.nix
@@ -2,14 +2,21 @@
   lib,
   stdenv,
   buildPythonPackage,
+  fetchFromGitHub,
+  pythonOlder,
+  cmake,
+  ninja,
   duckdb,
   fsspec,
   google-cloud-storage,
+  ipython,
   numpy,
   openssl,
   pandas,
   psutil,
+  pyarrow,
   pybind11,
+  scikit-build-core,
   setuptools-scm,
   pytest-reraise,
   pytestCheckHook,
@@ -17,43 +24,79 @@
 
 buildPythonPackage rec {
   inherit (duckdb)
-    patches
     pname
-    rev
-    src
     version
     ;
   pyproject = true;
 
-  postPatch = (duckdb.postPatch or "") + ''
-    # we can't use sourceRoot otherwise patches don't apply, because the patches apply to the C++ library
-    cd tools/pythonpkg
+  src = fetchFromGitHub {
+    owner = "duckdb";
+    repo = "duckdb-python";
+    tag = "v${version}";
+    hash = "sha256-cZyiTqu5iW/cqEo42b/XnOG7hJqtQs1h2RXXL392ujA=";
+  };
 
-    # 1. let nix control build cores
-    # 2. default to extension autoload & autoinstall disabled
-    substituteInPlace setup.py \
-      --replace-fail "ParallelCompile()" 'ParallelCompile("NIX_BUILD_CORES")' \
-      --replace-fail "define_macros.extend([('DUCKDB_EXTENSION_AUTOLOAD_DEFAULT', '1'), ('DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT', '1')])" "pass"
+  postPatch = ''
+    # patch cmake to ignore absence of git submodule copy of duckdb
+    substituteInPlace cmake/duckdb_loader.cmake \
+      --replace-fail '"''${CMAKE_CURRENT_SOURCE_DIR}/external/duckdb"' \
+                     '"${duckdb.src}"'
 
+    # replace pybind11[global] with pybind11
     substituteInPlace pyproject.toml \
-      --replace-fail 'setuptools_scm>=6.4,<8.0' 'setuptools_scm'
+      --replace-fail "pybind11[global]" "pybind11"
+
+    # replace custom build backend with standard scikit-build-core
+    substituteInPlace pyproject.toml \
+      --replace-fail 'build-backend = "duckdb_packaging.build_backend"' \
+                     'build-backend = "scikit_build_core.build"' \
+      --replace-fail 'backend-path = ["./"]' \
+                     '# backend-path removed'
   '';
 
-  env = {
-    DUCKDB_BUILD_UNITY = 1;
-    OVERRIDE_GIT_DESCRIBE = "v${version}-0-g${rev}";
-  };
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+
+  dontUseCmakeConfigure = true;
 
   build-system = [
     pybind11
+    scikit-build-core
     setuptools-scm
   ];
 
-  buildInputs = [ openssl ];
+  buildInputs = [
+    duckdb
+    openssl
+  ];
 
-  dependencies = [
-    numpy
-    pandas
+  optional-dependencies = {
+    # Note: ipython and adbc_driver_manager currently excluded despite inclusion in upstream
+    # https://github.com/duckdb/duckdb-python/blob/v1.4.0/pyproject.toml#L44-L52
+    all = [
+      ipython
+      fsspec
+      numpy
+    ]
+    ++ lib.optionals (pythonOlder "3.14") [
+      # https://github.com/duckdb/duckdb-python/blob/0ee500cfa35fc07bf81ed02e8ab6984ea1f665fd/pyproject.toml#L49-L51
+      # adbc_driver_manager noted for migration to duckdb C source
+      pandas
+      pyarrow
+    ];
+  };
+
+  env = {
+    DUCKDB_BUILD_UNITY = 1;
+    # default to disabled extension autoload/autoinstall
+    CMAKE_DEFINE_DUCKDB_EXTENSION_AUTOLOAD_DEFAULT = "0";
+    CMAKE_DEFINE_DUCKDB_EXTENSION_AUTOINSTALL_DEFAULT = "0";
+  };
+
+  cmakeFlags = [
+    (lib.cmakeFeature "OVERRIDE_GIT_DESCRIBE" "v${version}-0-g${duckdb.rev}")
   ];
 
   nativeCheckInputs = [
@@ -62,7 +105,8 @@ buildPythonPackage rec {
     psutil
     pytest-reraise
     pytestCheckHook
-  ];
+  ]
+  ++ optional-dependencies.all;
 
   pytestFlags = [ "--verbose" ];
 
@@ -71,8 +115,12 @@ buildPythonPackage rec {
   enabledTestPaths = if stdenv.hostPlatform.isDarwin then [ "tests/fast" ] else [ "tests" ];
 
   disabledTestPaths = [
-    # avoid dependency on mypy
-    "tests/stubs/test_stubs.py"
+    # avoid dependency on adbc_driver_manager
+    "tests/fast/adbc"
+    # avoid dependency on pyotp
+    "tests/fast/test_pypi_cleanup.py"
+    # avoid test data download requiring network access
+    "tests/slow/test_h2oai_arrow.py"
   ];
 
   disabledTests = [

From 4006d2988c95c79f0246bbb6a72b04897a727765 Mon Sep 17 00:00:00 2001
From: Cameron Smith <cameron.ray.smith@gmail.com>
Date: Sun, 12 Oct 2025 09:05:07 -0400
Subject: [PATCH 2007/6226] python3Packages.sqlglot: add missing test
 dependencies

sqlglot tests require numpy and pandas, which were previously provided
transitively through duckdb. After duckdb update to 1.4.1, these became
optional dependencies and are no longer available to sqlglot tests.
---
 pkgs/development/python-modules/sqlglot/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/sqlglot/default.nix b/pkgs/development/python-modules/sqlglot/default.nix
index 5b6bb1ceec67..0499fd11382d 100644
--- a/pkgs/development/python-modules/sqlglot/default.nix
+++ b/pkgs/development/python-modules/sqlglot/default.nix
@@ -13,6 +13,8 @@
   # tests
   pytestCheckHook,
   duckdb,
+  numpy,
+  pandas,
 }:
 
 buildPythonPackage rec {
@@ -40,6 +42,8 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     duckdb
+    numpy
+    pandas
   ];
 
   pythonImportsCheck = [ "sqlglot" ];

From c578ecfdc3f6d0e8d8aab6912c242eb929847d58 Mon Sep 17 00:00:00 2001
From: Cameron Smith <cameron.ray.smith@gmail.com>
Date: Wed, 22 Oct 2025 15:17:21 -0400
Subject: [PATCH 2008/6226] python3Packages.narwhals: disable tests failing
 with duckdb 1.4.x

DuckDB 1.4.x introduces breaking changes in how empty results are
converted to PyArrow tables, causing test failures in narwhals.

Disabled tests:
- test_skew_expr: PyArrow conversion fails with empty DuckDB results
  Error: ValueError: Must pass schema, or at least one RecordBatch

- test_empty_scalar_reduction_with_columns: XPASS(strict) failure
  Test expected to fail with ibis now passes due to ibis improvements

- test_collect_empty: XPASS(strict) failure
  Test expected to fail with ibis now passes due to ibis improvements

These are known compatibility issues that should be addressed upstream
in narwhals for DuckDB 1.4.x support. The failures don't affect actual
functionality, only test compatibility.

This unblocks 42 dependent packages that were failing due to narwhals
build failure.
---
 pkgs/development/python-modules/narwhals/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/narwhals/default.nix b/pkgs/development/python-modules/narwhals/default.nix
index 9c7c61b74527..abb7a87dac64 100644
--- a/pkgs/development/python-modules/narwhals/default.nix
+++ b/pkgs/development/python-modules/narwhals/default.nix
@@ -75,6 +75,11 @@ buildPythonPackage rec {
     "test_lazy"
     # Incompatible with ibis 11
     "test_unique_3069"
+    # DuckDB 1.4.x compatibility - empty result schema handling with PyArrow
+    "test_skew_expr"
+    # ibis improvements cause strict XPASS failures (tests expected to fail now pass)
+    "test_empty_scalar_reduction_with_columns"
+    "test_collect_empty"
   ];
 
   pytestFlags = [

From 13f1da4b65b0cc35b6d7e24b1eba80e765c93ea2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 22 Oct 2025 04:16:19 +0000
Subject: [PATCH 2009/6226] python3Packages.torchao: 0.13.0 -> 0.14.1

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

diff --git a/pkgs/development/python-modules/torchao/default.nix b/pkgs/development/python-modules/torchao/default.nix
index 5c301da0ffba..e92454771c3d 100644
--- a/pkgs/development/python-modules/torchao/default.nix
+++ b/pkgs/development/python-modules/torchao/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "ao";
-  version = "0.13.0";
+  version = "0.14.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "ao";
     tag = "v${version}";
-    hash = "sha256-R9H4+KkKuOzsunM3A5LT8upH1TfkHrD+BZerToCHwjo=";
+    hash = "sha256-L9Eoul7Nar/+gS44+hA8JbfxCgkMH5xAMCleggAZn7c=";
   };
 
   build-system = [

From 140e2b8f3ca64774ba5b0ec68827e30bf830a624 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 12:59:17 +0000
Subject: [PATCH 2010/6226] vscode-extensions.detachhead.basedpyright: 1.31.7
 -> 1.32.0

---
 .../vscode/extensions/detachhead.basedpyright/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
index f4b6a6966a55..073dfde6be65 100644
--- a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "basedpyright";
     publisher = "detachhead";
-    version = "1.31.7";
-    hash = "sha256-EGHtYGPfP9n675MLoFBqct0EEPwI2Ts8SnBzmSptVGc=";
+    version = "1.32.0";
+    hash = "sha256-Lf7sg67i0FFvHSZ9Cw6RT+ECzFF+lNYH2hxzrss1+fg=";
   };
   meta = {
     changelog = "https://github.com/detachhead/basedpyright/releases";

From ff4ea44ce41b9028ae6d75b9c5ce8f08ef3c629f Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 10:02:39 -0300
Subject: [PATCH 2011/6226] ngt: 1.12.3-alpha -> 2.5.0

---
 pkgs/by-name/ng/ngt/package.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ng/ngt/package.nix b/pkgs/by-name/ng/ngt/package.nix
index 44f3bb1d69e9..76427d914f1c 100644
--- a/pkgs/by-name/ng/ngt/package.nix
+++ b/pkgs/by-name/ng/ngt/package.nix
@@ -4,22 +4,26 @@
   fetchFromGitHub,
   cmake,
   llvmPackages,
+  openblas,
   enableAVX ? stdenv.hostPlatform.avxSupport,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "NGT";
-  version = "1.12.3-alpha";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "yahoojapan";
     repo = "NGT";
-    rev = "29c88ff6cd5824d3196986d1f50b834565b6c9dd";
-    sha256 = "sha256-nu0MJNpaenOB4+evoSVLKmPIuZXVj1Rm9x53+TfhezY=";
+    rev = "v${finalAttrs.version}";
+    sha256 = "sha256-2cCuVeg7y3butTIAQaYIgx+DPqIFEA2qqVe3exAoAY8=";
   };
 
   nativeBuildInputs = [ cmake ];
-  buildInputs = [ llvmPackages.openmp ];
+  buildInputs = [
+    llvmPackages.openmp
+    openblas
+  ];
 
   NIX_ENFORCE_NO_NATIVE = !enableAVX;
   __AVX2__ = if enableAVX then 1 else 0;
@@ -31,4 +35,4 @@ stdenv.mkDerivation {
     license = licenses.asl20;
     maintainers = with maintainers; [ tomberek ];
   };
-}
+})

From af240623517bb27bb340153dbf8c18002db0ffc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 23 Oct 2025 15:05:29 +0200
Subject: [PATCH 2012/6226] ngtcp2-gnutls.tests: add curlWithGnuTls

It's another consumer of this library and now used in a dozen packages.
---
 pkgs/development/libraries/ngtcp2/gnutls.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ngtcp2/gnutls.nix b/pkgs/development/libraries/ngtcp2/gnutls.nix
index fce288b44b58..7461fdfaeb3c 100644
--- a/pkgs/development/libraries/ngtcp2/gnutls.nix
+++ b/pkgs/development/libraries/ngtcp2/gnutls.nix
@@ -8,6 +8,7 @@
   cunit,
   ncurses,
   knot-dns,
+  curlWithGnuTls,
 }:
 
 stdenv.mkDerivation rec {
@@ -38,7 +39,9 @@ stdenv.mkDerivation rec {
   doCheck = true;
   nativeCheckInputs = [ cunit ] ++ lib.optional stdenv.hostPlatform.isDarwin ncurses;
 
-  passthru.tests = knot-dns.passthru.tests; # the only consumer so far
+  passthru.tests = knot-dns.passthru.tests // {
+    inherit curlWithGnuTls;
+  };
 
   meta = with lib; {
     homepage = "https://github.com/ngtcp2/ngtcp2";

From b3cc7c9f5f4fc59da113ebf257012784a4d5ddbc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 13:05:57 +0000
Subject: [PATCH 2013/6226] mcp-nixos: 1.0.2 -> 1.0.3

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

diff --git a/pkgs/by-name/mc/mcp-nixos/package.nix b/pkgs/by-name/mc/mcp-nixos/package.nix
index fd990bd36647..4e93f0109204 100644
--- a/pkgs/by-name/mc/mcp-nixos/package.nix
+++ b/pkgs/by-name/mc/mcp-nixos/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "mcp-nixos";
-  version = "1.0.2";
+  version = "1.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "utensils";
     repo = "mcp-nixos";
     tag = "v${version}";
-    hash = "sha256-SbmfP5Qo7liu39tTpIm6IC2qfwChooTYaPZiJqgwTzY=";
+    hash = "sha256-UCsJ8eDuHL14u2GFIYEY/drtZ6jht5zN/G/6QNlEy2g=";
   };
 
   patches = [

From d1a5c248176a9292e60b2dcd0f4201c6192a0c0c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 13:06:20 +0000
Subject: [PATCH 2014/6226] typescript-go: 0-unstable-2025-10-17 ->
 0-unstable-2025-10-22

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

diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix
index 5e5012860ba0..92b1ad63fdf7 100644
--- a/pkgs/by-name/ty/typescript-go/package.nix
+++ b/pkgs/by-name/ty/typescript-go/package.nix
@@ -10,13 +10,13 @@ let
 in
 buildGoModule {
   pname = "typescript-go";
-  version = "0-unstable-2025-10-17";
+  version = "0-unstable-2025-10-22";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "typescript-go";
-    rev = "20b1482ea8b55d51fc21c60718dc934d763c918b";
-    hash = "sha256-+sfewMFnvq4zJO6KCvii9qF8LdAd+5Rqk2GJcJrJAeI=";
+    rev = "42241ec50d438ce9ef1f2b90a7b2cdd1bfa5f51d";
+    hash = "sha256-5vm9ht3nZ3ELODN+J5PfAOWrxIUCyvsIxbf29geSYrA=";
     fetchSubmodules = false;
   };
 

From 84704f3ecb46931a3e4caf12faf823bfa1db22a4 Mon Sep 17 00:00:00 2001
From: Louis Chan <louischan0325@gmail.com>
Date: Thu, 23 Oct 2025 21:14:17 +0800
Subject: [PATCH 2015/6226] vimPlugins.vim-hy: init at 2024-10-06

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index e577027973d4..73bf6c5e54ee 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -18552,6 +18552,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  vim-hy = buildVimPlugin {
+    pname = "vim-hy";
+    version = "2024-10-06";
+    src = fetchFromGitHub {
+      owner = "hylang";
+      repo = "vim-hy";
+      rev = "ab1699bfa636e7355ac0030189331251c49c7d61";
+      sha256 = "09v83a6ybj73043acpm2nps5s56sqg2pz456b4qgz2r7zjlgx5r9";
+    };
+    meta.homepage = "https://github.com/hylang/vim-hy/";
+    meta.hydraPlatforms = [ ];
+  };
+
   vim-hybrid = buildVimPlugin {
     pname = "vim-hybrid";
     version = "2016-01-05";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 0605761caae9..fade945e948b 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1424,6 +1424,7 @@ https://github.com/ntk148v/vim-horizon/,,
 https://github.com/jonsmithers/vim-html-template-literals/,,
 https://github.com/humanoid-colors/vim-humanoid-colorscheme/,,
 https://github.com/vim-utils/vim-husk/,,
+https://github.com/hylang/vim-hy/,HEAD,
 https://github.com/w0ng/vim-hybrid/,,
 https://github.com/kristijanhusak/vim-hybrid-material/,,
 https://github.com/noc7c9/vim-iced-coffee-script/,,

From 372a6a1e4d365b55b853dbcdb46488c3fa9475f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 13:17:52 +0000
Subject: [PATCH 2016/6226] bash-pinyin-completion-rs: 0.3.2 -> 1.0.0

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

diff --git a/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix b/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix
index 400d318dbfdb..5a6efefcef0a 100644
--- a/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix
+++ b/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix
@@ -7,13 +7,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bash-pinyin-completion-rs";
-  version = "0.3.2";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "AOSC-Dev";
     repo = "bash-pinyin-completion-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-r+B11TgMOhwslqygv72S9uhF7v79MAzUu5XHlD/P3HY=";
+    hash = "sha256-VXIIG+ZGb4fS3LSIkGW744ui4AKTdQCjrNlObH/YZVY=";
   };
 
   strictDeps = true;

From e02c7adc5410137e1467922e46c03a2acee7ff40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 13:18:29 +0000
Subject: [PATCH 2017/6226] python3Packages.giturlparse: 0.12.0 -> 0.14.0

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

diff --git a/pkgs/development/python-modules/giturlparse/default.nix b/pkgs/development/python-modules/giturlparse/default.nix
index 6dfd53352672..011ae2959bc6 100644
--- a/pkgs/development/python-modules/giturlparse/default.nix
+++ b/pkgs/development/python-modules/giturlparse/default.nix
@@ -7,14 +7,14 @@
 }:
 buildPythonPackage rec {
   pname = "giturlparse";
-  version = "0.12.0";
+  version = "0.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "nephila";
     repo = "giturlparse";
     tag = version;
-    hash = "sha256-VqlsqMLwOtaciBWXphmFAMwtfkWBBNaL1Sdcc8Ltq7k=";
+    hash = "sha256-KBJVsg3xpy4WkXlkP+eNTJpGIpZhPI4TwD5/0eCbTL0=";
   };
 
   build-system = [

From e770359fd70c77f8f789f274899bf89a17dd1141 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 13:23:52 +0000
Subject: [PATCH 2018/6226] okteto: 3.12.0 -> 3.12.1

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

diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix
index 431db2635b18..e4d05a1fc448 100644
--- a/pkgs/by-name/ok/okteto/package.nix
+++ b/pkgs/by-name/ok/okteto/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "okteto";
-  version = "3.12.0";
+  version = "3.12.1";
 
   src = fetchFromGitHub {
     owner = "okteto";
     repo = "okteto";
     tag = finalAttrs.version;
-    hash = "sha256-EL1xWrxI7W2iXb0syb/53BgW22kqOSJCHyzBHGdQOm4=";
+    hash = "sha256-TtRLTZ/CnhJZYFrMUYAvRksSbQywP5P0dlYhT74yju8=";
   };
 
   vendorHash = "sha256-wkuCUMzmYAWf8RjM6DkTTHaY7qEIjGNYiT4grtCbYs8=";

From 7aa6e24987f1634212b1075a3b0c44f81707dbaf Mon Sep 17 00:00:00 2001
From: Sergey Volkov <taranarmo@gmail.com>
Date: Thu, 9 Oct 2025 12:36:19 +0200
Subject: [PATCH 2019/6226] julia_112-bin: init at 1.12.1

---
 pkgs/development/compilers/julia/default.nix     | 11 +++++++++++
 pkgs/development/compilers/julia/generic-bin.nix | 13 ++++++++++---
 pkgs/top-level/all-packages.nix                  |  3 ++-
 3 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 6f8b92d7a34b..4013c2196cf6 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -51,6 +51,17 @@ in
       };
     }) { }
   );
+  julia_112-bin = wrapJulia (
+    callPackage (import ./generic-bin.nix {
+      version = "1.12.1";
+      sha256 = {
+        x86_64-linux = "7d2add9ee74ee2f12b5c268bc194794cc52ea440f8687fbab29db6afefbf69b7";
+        aarch64-linux = "2e3d6ca07e251721fa3e0cd3460fc240e60f2a9bd97bae0ea2144f586da19297";
+        x86_64-darwin = "7dd841cd853ad64f5e90a4b459631b49ee388891ceaba81857f5b8959392c4b2";
+        aarch64-darwin = "cc65620b71a725380e59d0e31dc0b4140f30229b70a4b8eec8e32c222bc54fc1";
+      };
+    }) { }
+  );
   julia_19 = wrapJulia (
     callPackage (import ./generic.nix {
       version = "1.9.4";
diff --git a/pkgs/development/compilers/julia/generic-bin.nix b/pkgs/development/compilers/julia/generic-bin.nix
index b6622dfc4b3d..5190ba3226bf 100644
--- a/pkgs/development/compilers/julia/generic-bin.nix
+++ b/pkgs/development/compilers/julia/generic-bin.nix
@@ -15,9 +15,6 @@ let
   skip_tests = [
     # Test flaky on ofborg
     "channels"
-    # Test flaky because of our RPATH patching
-    # https://github.com/NixOS/nixpkgs/pull/230965#issuecomment-1545336489
-    "compiler/codegen"
     # Test flaky
     "read"
   ]
@@ -34,6 +31,16 @@ let
     "loading"
     "cmdlineargs"
   ]
+  ++ lib.optionals (lib.versionAtLeast version "1.12") [
+    # Test flaky because of our RPATH patching
+    # https://github.com/NixOS/nixpkgs/pull/230965#issuecomment-1545336489
+    "Compiler/codegen"
+    "precompile"
+    "compileall"
+  ]
+  ++ lib.optionals (lib.versionOlder version "1.12") [
+    "compiler/codegen" # older versions' test was in lowercase
+  ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # Test flaky on ofborg
     "FileWatching"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9a1c7a5c4ce0..c8dc5dce144a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5180,6 +5180,7 @@ with pkgs;
     julia_19-bin
     julia_110-bin
     julia_111-bin
+    julia_112-bin
     julia_19
     julia_110
     julia_111
@@ -5190,7 +5191,7 @@ with pkgs;
   julia = julia-stable;
 
   julia-lts-bin = julia_110-bin;
-  julia-stable-bin = julia_111-bin;
+  julia-stable-bin = julia_112-bin;
   julia-bin = julia-stable-bin;
 
   kotlin = callPackage ../development/compilers/kotlin { };

From f99dc0652eb0110395c7629cfd4f2ee1531172ad Mon Sep 17 00:00:00 2001
From: Sergey Volkov <taranarmo@gmail.com>
Date: Fri, 10 Oct 2025 10:07:56 +0200
Subject: [PATCH 2020/6226] julia_112: init at 1.12.1

---
 pkgs/development/compilers/julia/default.nix  |  9 +++++++
 pkgs/development/compilers/julia/generic.nix  |  5 ++++
 .../0001-skip-failing-and-flaky-tests.patch   | 25 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  3 ++-
 4 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/compilers/julia/patches/1.12/0001-skip-failing-and-flaky-tests.patch

diff --git a/pkgs/development/compilers/julia/default.nix b/pkgs/development/compilers/julia/default.nix
index 4013c2196cf6..80fcfd5a0add 100644
--- a/pkgs/development/compilers/julia/default.nix
+++ b/pkgs/development/compilers/julia/default.nix
@@ -97,4 +97,13 @@ in
       ];
     }) { }
   );
+  julia_112 = wrapJulia (
+    callPackage (import ./generic.nix {
+      version = "1.12.1";
+      hash = "sha256-iR0Wu5HIqU1aY1WoLBf6PCRY64kWDUKEQ6CyobhB6lI=";
+      patches = [
+        ./patches/1.12/0001-skip-failing-and-flaky-tests.patch
+      ];
+    }) { }
+  );
 }
diff --git a/pkgs/development/compilers/julia/generic.nix b/pkgs/development/compilers/julia/generic.nix
index 469e0206514d..f1ef721d346c 100644
--- a/pkgs/development/compilers/julia/generic.nix
+++ b/pkgs/development/compilers/julia/generic.nix
@@ -60,6 +60,11 @@ stdenv.mkDerivation rec {
     substituteInPlace deps/curl.mk \
       --replace-fail 'cd $(dir $<) && $(TAR) jxf $(notdir $<)' \
                      'cd $(dir $<) && $(TAR) jxf $(notdir $<) && sed -i "s|/usr/bin/env perl|${lib.getExe buildPackages.perl}|" curl-$(CURL_VER)/scripts/cd2nroff'
+  ''
+  + lib.optionalString (lib.versionAtLeast version "1.12") ''
+    substituteInPlace deps/openssl.mk \
+      --replace-fail 'cd $(dir $<) && $(TAR) -zxf $<' \
+                     'cd $(dir $<) && $(TAR) -zxf $< && sed -i "s|/usr/bin/env perl|${lib.getExe buildPackages.perl}|" openssl-$(OPENSSL_VER)/Configure'
   '';
 
   makeFlags = [
diff --git a/pkgs/development/compilers/julia/patches/1.12/0001-skip-failing-and-flaky-tests.patch b/pkgs/development/compilers/julia/patches/1.12/0001-skip-failing-and-flaky-tests.patch
new file mode 100644
index 000000000000..4ab76c9fa642
--- /dev/null
+++ b/pkgs/development/compilers/julia/patches/1.12/0001-skip-failing-and-flaky-tests.patch
@@ -0,0 +1,25 @@
+From e26b82d0c162b6c22b65b2a5d2cd03d98fd9f5d4 Mon Sep 17 00:00:00 2001
+From: Sergey Volkov <taranarmo@gmail.com>
+Date: Thu, 9 Oct 2025 13:00:31 +0200
+Subject: [PATCH] disable failing and flaky tests
+
+---
+ test/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/Makefile b/test/Makefile
+index 69b7ad1451..583e64a287 100644
+--- a/test/Makefile
++++ b/test/Makefile
+@@ -30,7 +30,7 @@ default:
+ 
+ $(TESTS):
+ 	@cd $(SRCDIR) && \
+-	$(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl $@)
++	$(call PRINT_JULIA, $(call spawn,$(JULIA_EXECUTABLE)) --check-bounds=yes --startup-file=no --depwarn=error ./runtests.jl --skip NetworkOptions REPL channels FileWatching ccall loading cmdlineargs Distributed precompile compileall $@)
+ 
+ $(addprefix revise-, $(TESTS)): revise-% :
+ 	@cd $(SRCDIR) && \
+-- 
+2.51.0
+
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8dc5dce144a..ba165a8c4f3b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5184,10 +5184,11 @@ with pkgs;
     julia_19
     julia_110
     julia_111
+    julia_112
     ;
 
   julia-lts = julia_110-bin;
-  julia-stable = julia_111;
+  julia-stable = julia_112;
   julia = julia-stable;
 
   julia-lts-bin = julia_110-bin;

From 1c1747cd179721740b171ab66be87af20a3431ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 13:35:44 +0000
Subject: [PATCH 2021/6226] lynis: 3.1.5 -> 3.1.6

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

diff --git a/pkgs/by-name/ly/lynis/package.nix b/pkgs/by-name/ly/lynis/package.nix
index 47eefd68371e..f19d7cdde6ab 100644
--- a/pkgs/by-name/ly/lynis/package.nix
+++ b/pkgs/by-name/ly/lynis/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lynis";
-  version = "3.1.5";
+  version = "3.1.6";
 
   src = fetchFromGitHub {
     owner = "CISOfy";
     repo = "lynis";
     rev = version;
-    sha256 = "sha256-XMgC6KjkLgjSOBHBx7WM7C2Vm3Z/lto7CFs10kIxwZc=";
+    sha256 = "sha256-f1iV9OBkycrwP3ydjaGMX45JIBtzZKHEJqnEoVuZPu4=";
   };
 
   nativeBuildInputs = [

From 542ca7f353feb6dfcd7bb293ba469a6ebe146d87 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 13:37:25 +0000
Subject: [PATCH 2022/6226] matrix-alertmanager-receiver: 2025.10.15 ->
 2025.10.22

---
 pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
index df081fed2cec..86ca596569df 100644
--- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
+++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "matrix-alertmanager-receiver";
-  version = "2025.10.15";
+  version = "2025.10.22";
 
   src = fetchFromGitHub {
     owner = "metio";
     repo = "matrix-alertmanager-receiver";
     tag = finalAttrs.version;
-    hash = "sha256-NOVMn6RlD/H0upYhM1kZe61XbTvY+xd32K/+Caa/0rM=";
+    hash = "sha256-TJDh1taboIRSBDyF1RV/NXKVvuT884+aU6wg6tC+YqI=";
   };
 
-  vendorHash = "sha256-ggZTmXcjVk6P5/TrPHVyVbRAoQlGg1hYCLeI51mX8tM=";
+  vendorHash = "sha256-8Ag/Xd4+TQBBNVJpYQfuelhaCy+3hatTZFIo2VMjXOs=";
 
   env.CGO_ENABLED = "0";
 

From e9fc04cf0f23058802175f595165905c6e6b6b9a Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Wed, 22 Oct 2025 20:57:00 +0200
Subject: [PATCH 2023/6226] =?UTF-8?q?ocamlPackages.camlp5:=208.03.2=20?=
 =?UTF-8?q?=E2=86=92=208.04.00?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tools/ocaml/camlp5/default.nix            | 153 +++++++++---------
 pkgs/top-level/ocaml-packages.nix             |  11 +-
 2 files changed, 82 insertions(+), 82 deletions(-)

diff --git a/pkgs/development/tools/ocaml/camlp5/default.nix b/pkgs/development/tools/ocaml/camlp5/default.nix
index 49f70b69960a..38fd24135427 100644
--- a/pkgs/development/tools/ocaml/camlp5/default.nix
+++ b/pkgs/development/tools/ocaml/camlp5/default.nix
@@ -14,92 +14,83 @@
   legacy ? false,
 }:
 
-if lib.versionOlder ocaml.version "4.02" then
-  throw "camlp5 is not available for OCaml ${ocaml.version}"
-else
-
+stdenv.mkDerivation (
+  finalAttrs:
   let
-    params =
-      if lib.versionAtLeast ocaml.version "4.12" && !legacy then
-        rec {
-          version = "8.03.02";
-
-          src = fetchFromGitHub {
-            owner = "camlp5";
-            repo = "camlp5";
-            rev = version;
-            hash = "sha256-nz+VfGR/6FdBvMzPPpVpviAXXBWNqM3Ora96Yzx964o=";
-          };
-
-          nativeBuildInputs = [
-            makeWrapper
-            ocaml
-            findlib
-            perl
-          ];
-          buildInputs = [
-            bos
-            pcre2
-            re
-            rresult
-          ];
-          propagatedBuildInputs = [ camlp-streams ];
-          postInstall = ''
-            for prog in camlp5 camlp5o camlp5r camlp5sch mkcamlp5 ocpp5
-            do
-              wrapProgram $out/bin/$prog \
-                --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH"
-            done
-          '';
-
-        }
-      else
-        rec {
-          version = "7.14";
-          src = fetchFromGitHub {
-            owner = "camlp5";
-            repo = "camlp5";
-            rev = "rel${builtins.replaceStrings [ "." ] [ "" ] version}";
-            sha256 = "1dd68bisbpqn5lq2pslm582hxglcxnbkgfkwhdz67z4w9d5nvr7w";
-          };
-          nativeBuildInputs = [
-            ocaml
-            perl
-          ];
-        };
+    recent = lib.versionAtLeast (lib.versions.major finalAttrs.version) "8";
   in
+  {
 
-  stdenv.mkDerivation (
-    params
-    // {
+    version = if lib.versionAtLeast ocaml.version "4.12" && !legacy then "8.04.00" else "7.14";
 
-      pname = "ocaml${ocaml.version}-camlp5";
+    pname = "ocaml${ocaml.version}-camlp5";
 
-      strictDeps = true;
+    src = fetchFromGitHub {
+      owner = "camlp5";
+      repo = "camlp5";
+      tag =
+        if recent then
+          finalAttrs.version
+        else
+          "rel${builtins.replaceStrings [ "." ] [ "" ] finalAttrs.version}";
+      hash =
+        {
+          "8.04.00" = "sha256-5IQVGm/tqEzXmZmSYGbGqX+KN9nQLQgw+sBP+F2keXo=";
+          "8.03.2" = "sha256-nz+VfGR/6FdBvMzPPpVpviAXXBWNqM3Ora96Yzx964o=";
+          "7.14" = "sha256-/ORtS0uc/GN+g3y6N5ftjL4OBSqV6iswLRbfpeNCprU=";
+        }
+        ."${finalAttrs.version}";
+    };
+    nativeBuildInputs = [
+      ocaml
+      perl
+    ]
+    ++ lib.optionals recent [
+      makeWrapper
+      findlib
+    ];
 
-      prefixKey = "-prefix ";
+    buildInputs = lib.optionals recent [
+      bos
+      pcre2
+      re
+      rresult
+    ];
 
-      preConfigure = ''
-        configureFlagsArray=(--strict --libdir $out/lib/ocaml/${ocaml.version}/site-lib)
-        patchShebangs ./config/find_stuffversion.pl etc/META.pl
+    propagatedBuildInputs = lib.optional recent camlp-streams;
+
+    strictDeps = true;
+
+    prefixKey = "-prefix ";
+
+    preConfigure = ''
+      configureFlagsArray=(--strict --libdir $out/lib/ocaml/${ocaml.version}/site-lib)
+      patchShebangs ./config/find_stuffversion.pl etc/META.pl tools/ ocaml_src/tools/
+    '';
+
+    buildFlags = [ "world.opt" ];
+
+    postInstall = lib.optionalString recent ''
+      for prog in camlp5 camlp5o camlp5r camlp5sch mkcamlp5 ocpp5
+      do
+        wrapProgram $out/bin/$prog \
+          --prefix CAML_LD_LIBRARY_PATH : "$CAML_LD_LIBRARY_PATH"
+      done
+    '';
+    dontStrip = true;
+
+    meta = {
+      broken =
+        lib.versionAtLeast ocaml.version "5.04" && !lib.versionAtLeast finalAttrs.version "8.04.00";
+      description = "Preprocessor-pretty-printer for OCaml";
+      longDescription = ''
+        Camlp5 is a preprocessor and pretty-printer for OCaml programs.
+        It also provides parsing and printing tools.
       '';
-
-      buildFlags = [ "world.opt" ];
-
-      dontStrip = true;
-
-      meta = with lib; {
-        description = "Preprocessor-pretty-printer for OCaml";
-        longDescription = ''
-          Camlp5 is a preprocessor and pretty-printer for OCaml programs.
-          It also provides parsing and printing tools.
-        '';
-        homepage = "https://camlp5.github.io/";
-        license = licenses.bsd3;
-        platforms = ocaml.meta.platforms or [ ];
-        maintainers = with maintainers; [
-          vbgl
-        ];
-      };
-    }
-  )
+      homepage = "https://camlp5.github.io/";
+      license = lib.licenses.bsd3;
+      platforms = ocaml.meta.platforms or [ ];
+      maintainers = [ lib.maintainers.vbgl ];
+    };
+  }
+)
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 290ed9741029..7ad37e506046 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -2245,7 +2245,16 @@ let
 
         google-drive-ocamlfuse = callPackage ../applications/networking/google-drive-ocamlfuse { };
 
-        hol_light = callPackage ../applications/science/logic/hol_light { };
+        hol_light = callPackage ../applications/science/logic/hol_light {
+          camlp5 =
+            if lib.versionAtLeast camlp5.version "8.04.00" then
+              camlp5.overrideAttrs {
+                version = "8.03.2";
+                __intentionallyOverridingVersion = true;
+              }
+            else
+              camlp5;
+        };
 
         ### End ###
 

From 668eaba9927a26ccb21eaa547f417da9881418ab Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Thu, 23 Oct 2025 15:41:12 +0200
Subject: [PATCH 2024/6226] integrity-scrub: 0.6.5 -> 0.6.6

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

diff --git a/pkgs/by-name/in/integrity-scrub/package.nix b/pkgs/by-name/in/integrity-scrub/package.nix
index 83257185c2ed..51ebd8da0602 100644
--- a/pkgs/by-name/in/integrity-scrub/package.nix
+++ b/pkgs/by-name/in/integrity-scrub/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "integrity-scrub";
-  version = "0.6.5";
+  version = "0.6.6";
 
   src = fetchFromGitHub {
     owner = "illdefined";
     repo = "integrity-scrub";
     tag = version;
-    hash = "sha256-oWS6HxdZ8tGeIRGpfHHkNhNdepBjhhdgTjKmxElNPbk=";
+    hash = "sha256-OLO64R9AYpHSkIwk2arka5EEzCWusZPWsBhy5HEDIQI=";
   };
 
-  cargoHash = "sha256-3LC3eZNmHG6OFIvQzmvs4BCSX0CVpwaYhZM2H2YoY4M=";
+  cargoHash = "sha256-sS4z5NImUdk0EnQ+BGPofFZtXZsomfUXXbHNDmVqAos=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 

From 337378e8fc5f69e439fc353460ae4ece07978387 Mon Sep 17 00:00:00 2001
From: Mikael Voss <mvs@nyantec.com>
Date: Thu, 23 Oct 2025 15:41:42 +0200
Subject: [PATCH 2025/6226] integrity-scrub: provide meta.mainProgram

---
 pkgs/by-name/in/integrity-scrub/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/in/integrity-scrub/package.nix b/pkgs/by-name/in/integrity-scrub/package.nix
index 51ebd8da0602..b0c3d68fe774 100644
--- a/pkgs/by-name/in/integrity-scrub/package.nix
+++ b/pkgs/by-name/in/integrity-scrub/package.nix
@@ -34,5 +34,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.cc0;
     maintainers = with lib.maintainers; [ mvs ];
     platforms = lib.platforms.linux;
+    mainProgram = "integrity-scrub";
   };
 }

From edadddc82691242cbcca72259d75afc551db4de0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 13:46:34 +0000
Subject: [PATCH 2026/6226] kotlin: 2.2.20 -> 2.2.21

---
 pkgs/development/compilers/kotlin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix
index 03b588f085e5..1e2ec624894d 100644
--- a/pkgs/development/compilers/kotlin/default.nix
+++ b/pkgs/development/compilers/kotlin/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kotlin";
-  version = "2.2.20";
+  version = "2.2.21";
 
   src = fetchurl {
     url = "https://github.com/JetBrains/kotlin/releases/download/v${finalAttrs.version}/kotlin-compiler-${finalAttrs.version}.zip";
-    sha256 = "sha256-gfAmTJBztcu9s/+EGM8sXawHaHn8FW+hpkYvWlrMRCA=";
+    sha256 = "sha256-piOHHxzZyTiUaUi3DvkXCHnwdYBDiFu9MMMvAk5RFxQ=";
   };
 
   propagatedBuildInputs = [ jre ];

From 9e718dc939e5bbe8827cef4f66f6de147d6f301c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 13:47:03 +0000
Subject: [PATCH 2027/6226] kubectl-cnpg: 1.27.0 -> 1.27.1

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

diff --git a/pkgs/by-name/ku/kubectl-cnpg/package.nix b/pkgs/by-name/ku/kubectl-cnpg/package.nix
index 84a32bce1016..df1cd3d29cfd 100644
--- a/pkgs/by-name/ku/kubectl-cnpg/package.nix
+++ b/pkgs/by-name/ku/kubectl-cnpg/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kubectl-cnpg";
-  version = "1.27.0";
+  version = "1.27.1";
 
   src = fetchFromGitHub {
     owner = "cloudnative-pg";
     repo = "cloudnative-pg";
     rev = "v${version}";
-    hash = "sha256-GDPVrGWawzuOjTCtXIDFH2XUQ6Ot3i+w4x61QK3TyIE=";
+    hash = "sha256-iEia3g3nxnVm4q5lpV9SFOSKgHJsZ7jdqE73vA2bPpI=";
   };
 
-  vendorHash = "sha256-CekPp3Tmte08DdFulVTNxlh4OuWz+ObqQ9jDd5b+Qn8=";
+  vendorHash = "sha256-nbUaSTmhAViwkguMsgIp3lh2JVe7ZTwBTM7oE1aIulk=";
 
   subPackages = [ "cmd/kubectl-cnpg" ];
 

From 78b67e628929f227d0f3e81b703f24a7ae08e9bf Mon Sep 17 00:00:00 2001
From: Cameron Smith <cameron.ray.smith@gmail.com>
Date: Wed, 22 Oct 2025 21:02:01 -0400
Subject: [PATCH 2028/6226] python3Packages.frictionless: disable console CLI
 tests failing with Click 8.2.1

Disable console CLI test paths due to CliRunner output capture issues:
- frictionless/console/__spec__/test_console.py (2 tests)
- frictionless/console/commands/__spec__/test_summary.py (3 tests)

These tests expect error messages in result.stdout but it's empty,
likely due to Click CliRunner API changes in how output is captured or
redirected.

All 1676 functional tests pass, including:
- DuckDB adapter tests (frictionless/formats/sql/__spec__/duckdb/)
- All other format adapters
- Data validation and transformation tests

The failure is in tests only.
---
 pkgs/development/python-modules/frictionless/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/frictionless/default.nix b/pkgs/development/python-modules/frictionless/default.nix
index 95847eab78a1..95962afd69f0 100644
--- a/pkgs/development/python-modules/frictionless/default.nix
+++ b/pkgs/development/python-modules/frictionless/default.nix
@@ -200,6 +200,11 @@ buildPythonPackage rec {
     # The tests of other unavailable formats are auto-skipped
     "frictionless/formats/excel"
     "frictionless/formats/spss"
+    # Console CLI tests fail due to typer/Click CliRunner output capture issues
+    # result.stdout is empty when error messages are expected
+    # All 1690 functional tests pass (including duckdb adapter tests)
+    "frictionless/console/__spec__/test_console.py"
+    "frictionless/console/commands/__spec__/test_summary.py"
   ];
 
   pythonImportsCheck = [

From 65a28e21cdb58eedb5e16a94219e29b3eb46f21c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 13:49:02 +0000
Subject: [PATCH 2029/6226] kotlin-native: 2.2.20 -> 2.2.21

---
 pkgs/development/compilers/kotlin/native.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix
index 1c3334a6d392..aeb98f646f58 100644
--- a/pkgs/development/compilers/kotlin/native.nix
+++ b/pkgs/development/compilers/kotlin/native.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   pname = "kotlin-native";
-  version = "2.2.20";
+  version = "2.2.21";
 
   src =
     let
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
         {
           "macos-aarch64" = "sha256-UnDl9wj/7RXrEaApuAaLczIfz0lscQPf+pCeSdJxJeY=";
           "macos-x86_64" = "sha256-mmsBQrx0yKqvvhnD8CU+oxqhWsOT1RzvzSniN3CeG7g=";
-          "linux-x86_64" = "sha256-2Ff+4rTj/W0tQBo6lADcQMIN4dAj32UnIXF9PRme0Nw=";
+          "linux-x86_64" = "sha256-oTW6qe+SklxcKu8gwc8DZzTKj+L65duYYXO+uWp6gfg=";
         }
         .${arch};
     in

From f7400f8e4c386e3a4763e42ed737a071bc8f150d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 23 Oct 2025 16:01:36 +0200
Subject: [PATCH 2030/6226] python313Packages.iamdata: 0.1.202510221 ->
 0.1.202510231

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202510221...v0.1.202510231

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

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index c6ee6dafdf6b..87c473b3b94f 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202510221";
+  version = "0.1.202510231";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-jFx4B9RQ0tcYySCRdaClVN4tovLA4pPIhJvj7Ld5J1A=";
+    hash = "sha256-pTe0WN4PXkVd8P3y0yq/mV1tRY1g9WO+uSdV9DaV/xo=";
   };
 
   build-system = [ hatchling ];

From 4780060c1f80ec4039e2750846dbf43219d4d0dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 14:14:01 +0000
Subject: [PATCH 2031/6226] python3Packages.x-transformers: 2.9.2 -> 2.10.2

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

diff --git a/pkgs/development/python-modules/x-transformers/default.nix b/pkgs/development/python-modules/x-transformers/default.nix
index 74ed3730a9ec..ded96ac0ba22 100644
--- a/pkgs/development/python-modules/x-transformers/default.nix
+++ b/pkgs/development/python-modules/x-transformers/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "x-transformers";
-  version = "2.9.2";
+  version = "2.10.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lucidrains";
     repo = "x-transformers";
     tag = version;
-    hash = "sha256-JxIcEGR28VxsosKsEFLpttT9JMeGwcJxjZiDXRhTv/o=";
+    hash = "sha256-7tlaq1/2S1uVlhZud/6Nnuf/oopHe88HHq69TUuKITo=";
   };
 
   build-system = [ hatchling ];

From be5d4d6107b4e658c745b008923b58f413c0de24 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 22 Oct 2025 08:42:52 +0000
Subject: [PATCH 2032/6226] python3Packages.torchao: fix build on darwin

---
 .../python-modules/torchao/default.nix        | 61 +++++++++++++++++++
 .../torchao/use-llvm-openmp.patch             | 13 ++++
 .../torchao/use-system-cpuinfo.patch          | 22 +++++++
 3 files changed, 96 insertions(+)
 create mode 100644 pkgs/development/python-modules/torchao/use-llvm-openmp.patch
 create mode 100644 pkgs/development/python-modules/torchao/use-system-cpuinfo.patch

diff --git a/pkgs/development/python-modules/torchao/default.nix b/pkgs/development/python-modules/torchao/default.nix
index e92454771c3d..2af60a2115b0 100644
--- a/pkgs/development/python-modules/torchao/default.nix
+++ b/pkgs/development/python-modules/torchao/default.nix
@@ -3,10 +3,18 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  replaceVars,
 
   # build-system
   setuptools,
 
+  # nativeBuildInputs
+  cmake,
+
+  # buildInputs
+  cpuinfo,
+  llvmPackages,
+
   # dependencies
   torch,
 
@@ -34,10 +42,33 @@ buildPythonPackage rec {
     hash = "sha256-L9Eoul7Nar/+gS44+hA8JbfxCgkMH5xAMCleggAZn7c=";
   };
 
+  patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    ./use-system-cpuinfo.patch
+    (replaceVars ./use-llvm-openmp.patch {
+      inherit (llvmPackages) openmp;
+    })
+  ];
+
   build-system = [
     setuptools
   ];
 
+  nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    cmake
+  ];
+  dontUseCmakeConfigure = true;
+
+  buildInputs = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    cpuinfo
+  ];
+
+  propagatedBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [
+    # Otherwise, torch will fail to include `omp.h`:
+    # torch._inductor.exc.InductorError: CppCompileError: C++ compile error
+    # OpenMP support not found.
+    llvmPackages.openmp
+  ];
+
   dependencies = [
     torch
   ];
@@ -90,6 +121,36 @@ buildPythonPackage rec {
     "test_save_load_int4woqtensors_2_cpu"
     "test_save_load_int8woqtensors_0_cpu"
     "test_save_load_int8woqtensors_1_cpu"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+    # AssertionError: Scalars are not equal!
+    "test_comm"
+    "test_fsdp2"
+    "test_fsdp2_correctness"
+    "test_precompute_bitnet_scale"
+    "test_qlora_fsdp2"
+    "test_uneven_shard"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    # RuntimeError: No packed_weights_format was selected
+    "TestIntxOpaqueTensor"
+    "test_accuracy_kleidiai"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+    # Flaky: [gw0] node down: keyboard-interrupt
+    "test_int8_weight_only_quant_with_freeze_0_cpu"
+    "test_int8_weight_only_quant_with_freeze_1_cpu"
+    "test_int8_weight_only_quant_with_freeze_2_cpu"
+  ];
+
+  disabledTestPaths = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
+    # Require unpackaged 'coremltools'
+    "test/prototype/test_groupwise_lowbit_weight_lut_quantizer.py"
+
+    # AttributeError: '_OpNamespace' 'mkldnn' object has no attribute '_is_mkldnn_acl_supported'
+    "test/quantization/pt2e/test_arm_inductor_quantizer.py"
+    "test/quantization/pt2e/test_x86inductor_fusion.py"
+    "test/quantization/pt2e/test_x86inductor_quantizer.py"
   ];
 
   meta = {
diff --git a/pkgs/development/python-modules/torchao/use-llvm-openmp.patch b/pkgs/development/python-modules/torchao/use-llvm-openmp.patch
new file mode 100644
index 000000000000..b399b347da39
--- /dev/null
+++ b/pkgs/development/python-modules/torchao/use-llvm-openmp.patch
@@ -0,0 +1,13 @@
+diff --git a/torchao/csrc/cpu/shared_kernels/Utils.cmake b/torchao/csrc/cpu/shared_kernels/Utils.cmake
+index be7004784..0e1a2ed0e 100644
+--- a/torchao/csrc/cpu/shared_kernels/Utils.cmake
++++ b/torchao/csrc/cpu/shared_kernels/Utils.cmake
+@@ -21,7 +21,7 @@ function(target_link_torchao_parallel_backend target_name torchao_parallel_backe
+         target_link_libraries(${target_name} PRIVATE "${TORCH_LIBRARIES}")
+ 
+         target_compile_definitions(${target_name} PRIVATE TORCHAO_PARALLEL_ATEN=1 AT_PARALLEL_OPENMP=1 INTRA_OP_PARALLEL=1)
+-        target_link_libraries(${target_name} PRIVATE ${TORCH_INSTALL_PREFIX}/lib/libomp${CMAKE_SHARED_LIBRARY_SUFFIX})
++        target_link_libraries(${target_name} PRIVATE @openmp@/lib/libomp${CMAKE_SHARED_LIBRARY_SUFFIX})
+ 
+     elseif(TORCHAO_PARALLEL_BACKEND_TOUPPER STREQUAL "EXECUTORCH")
+         message(STATUS "Building with TORCHAO_PARALLEL_BACKEND=TORCHAO_PARALLEL_EXECUTORCH")
diff --git a/pkgs/development/python-modules/torchao/use-system-cpuinfo.patch b/pkgs/development/python-modules/torchao/use-system-cpuinfo.patch
new file mode 100644
index 000000000000..25b08a6dcde9
--- /dev/null
+++ b/pkgs/development/python-modules/torchao/use-system-cpuinfo.patch
@@ -0,0 +1,22 @@
+diff --git a/torchao/csrc/cpu/CMakeLists.txt b/torchao/csrc/cpu/CMakeLists.txt
+index aaea27ec7..53dee80fd 100644
+--- a/torchao/csrc/cpu/CMakeLists.txt
++++ b/torchao/csrc/cpu/CMakeLists.txt
+@@ -49,16 +49,7 @@ if (NOT TARGET cpuinfo)
+     add_compile_options(-Wno-unused-function -Wno-unused-variable)
+ 
+     # set(CMAKE_POLICY_VERSION_MINIMUM 3.5)
+-    include(FetchContent)
+-    set(CPUINFO_BUILD_UNIT_TESTS OFF CACHE BOOL "" FORCE)
+-    set(CPUINFO_BUILD_MOCK_TESTS OFF CACHE BOOL "" FORCE)
+-    set(CPUINFO_BUILD_BENCHMARKS OFF CACHE BOOL "" FORCE)
+-    FetchContent_Declare(cpuinfo
+-        GIT_REPOSITORY https://github.com/pytorch/cpuinfo.git
+-        GIT_TAG c61fe919607bbc534d7a5a5707bdd7041e72c5ff
+-    )
+-    FetchContent_MakeAvailable(
+-        cpuinfo)
++    find_package(cpuinfo REQUIRED)
+ 
+     cmake_policy(POP)
+ endif()

From 9cf484a1e5c10c84662ded3b9fc04df7e221ee8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 14:16:39 +0000
Subject: [PATCH 2033/6226] luau-lsp: 1.54.0 -> 1.55.0

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

diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix
index 1b7cb2d98a08..aed342c18c23 100644
--- a/pkgs/by-name/lu/luau-lsp/package.nix
+++ b/pkgs/by-name/lu/luau-lsp/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "luau-lsp";
-  version = "1.54.0";
+  version = "1.55.0";
 
   src = fetchFromGitHub {
     owner = "JohnnyMorganz";
     repo = "luau-lsp";
     tag = finalAttrs.version;
-    hash = "sha256-18r/NScWfSwAvFT46zdJsNYXoEW8FF34XyZajAaGb28=";
+    hash = "sha256-ZrvPZi3ss83onsinyAl1AlQmV6jFctW8agYO9ieJtno=";
     fetchSubmodules = true;
   };
 

From c4744541bb81971f1165d96d45645203535d0c5b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 23 Oct 2025 16:18:06 +0200
Subject: [PATCH 2034/6226] python313Packages.types-awscrt: 0.28.1 -> 0.28.2

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

diff --git a/pkgs/development/python-modules/types-awscrt/default.nix b/pkgs/development/python-modules/types-awscrt/default.nix
index 5ea39543c847..22f329b3afac 100644
--- a/pkgs/development/python-modules/types-awscrt/default.nix
+++ b/pkgs/development/python-modules/types-awscrt/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "types-awscrt";
-  version = "0.28.1";
+  version = "0.28.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "types_awscrt";
     inherit version;
-    hash = "sha256-Ztd+woPh3JB1JqRFEaEmJBGHI6OWw20/PdmFXLYUzhQ=";
+    hash = "sha256-Q0m2/Hsc2cnreCcB+yE4dduJqxeBIZwOlH3XxNnc1l4=";
   };
 
   build-system = [ setuptools ];

From d76312a35d0e92b180c87fbd2c4f0ec7567225bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 14:18:51 +0000
Subject: [PATCH 2035/6226] bosh-cli: 7.9.11 -> 7.9.13

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

diff --git a/pkgs/by-name/bo/bosh-cli/package.nix b/pkgs/by-name/bo/bosh-cli/package.nix
index 305b8ee840b0..09630854b0f6 100644
--- a/pkgs/by-name/bo/bosh-cli/package.nix
+++ b/pkgs/by-name/bo/bosh-cli/package.nix
@@ -9,13 +9,13 @@
 buildGoModule rec {
   pname = "bosh-cli";
 
-  version = "7.9.11";
+  version = "7.9.13";
 
   src = fetchFromGitHub {
     owner = "cloudfoundry";
     repo = "bosh-cli";
     rev = "v${version}";
-    sha256 = "sha256-yODZexoUPs6CLyv/Wpy4lcNMYQVnS651ZJC0HEvEh1s=";
+    sha256 = "sha256-/9rtm1JdyfnCG60YeM9jJ0koeo0d1qfVJ8zHAHoBCGQ=";
   };
   vendorHash = null;
 

From 30a713c7b3adf20736528a2c7075929d14d5d6d9 Mon Sep 17 00:00:00 2001
From: Lemon Lam <alemonmk@users.noreply.github.com>
Date: Thu, 24 Jul 2025 23:50:27 +0800
Subject: [PATCH 2036/6226] maintainers: add alemonmk

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 0948524fc6a4..5ebba6ced33f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1106,6 +1106,12 @@
     githubId = 83360;
     name = "Aleksey Sidorov";
   };
+  alemonmk = {
+    email = "almk@rmntn.net";
+    github = "alemonmk";
+    githubId = 3955369;
+    name = "Lemon Lam";
+  };
   alerque = {
     email = "caleb@alerque.com";
     github = "alerque";

From 16c01fbc4de6a7876ebe30e0dc8e673cccb8ff2e Mon Sep 17 00:00:00 2001
From: Lemon Lam <alemonmk@users.noreply.github.com>
Date: Tue, 5 Aug 2025 12:52:51 +0800
Subject: [PATCH 2037/6226] warpgate: init at 0.17.0

---
 .../disable-rust-reproducible-build.patch     | 14 ++++
 .../wa/warpgate/hardcode-version.patch        | 14 ++++
 pkgs/by-name/wa/warpgate/package.nix          | 78 +++++++++++++++++++
 .../wa/warpgate/web-ui-package-json.patch     | 15 ++++
 4 files changed, 121 insertions(+)
 create mode 100644 pkgs/by-name/wa/warpgate/disable-rust-reproducible-build.patch
 create mode 100644 pkgs/by-name/wa/warpgate/hardcode-version.patch
 create mode 100644 pkgs/by-name/wa/warpgate/package.nix
 create mode 100644 pkgs/by-name/wa/warpgate/web-ui-package-json.patch

diff --git a/pkgs/by-name/wa/warpgate/disable-rust-reproducible-build.patch b/pkgs/by-name/wa/warpgate/disable-rust-reproducible-build.patch
new file mode 100644
index 000000000000..8db9aba1c95a
--- /dev/null
+++ b/pkgs/by-name/wa/warpgate/disable-rust-reproducible-build.patch
@@ -0,0 +1,14 @@
+diff --git a/.cargo/config.toml b/.cargo/config.toml
+index 8ab4225..8e0c812 100644
+--- a/.cargo/config.toml
++++ b/.cargo/config.toml
+@@ -1,8 +1,5 @@
+ # https://github.com/rust-lang/cargo/issues/5376#issuecomment-2163350032
+ [target.'cfg(all())']
+ rustflags = [
+-    "--cfg", "tokio_unstable",
+-    "-Zremap-cwd-prefix=/reproducible-cwd",
+-    "--remap-path-prefix=$HOME=/reproducible-home",
+-    "--remap-path-prefix=$PWD=/reproducible-pwd",
++    "--cfg", "tokio_unstable"
+ ]
diff --git a/pkgs/by-name/wa/warpgate/hardcode-version.patch b/pkgs/by-name/wa/warpgate/hardcode-version.patch
new file mode 100644
index 000000000000..a23cd10b01a8
--- /dev/null
+++ b/pkgs/by-name/wa/warpgate/hardcode-version.patch
@@ -0,0 +1,14 @@
+diff --git a/warpgate-common/src/version.rs b/warpgate-common/src/version.rs
+index 07db547..2a7967f 100644
+--- a/warpgate-common/src/version.rs
++++ b/warpgate-common/src/version.rs
+@@ -1,8 +1,3 @@
+-use git_version::git_version;
+-
+ pub fn warpgate_version() -> &'static str {
+-    git_version!(
+-        args = ["--tags", "--always", "--dirty=-modified"],
+-        fallback = "unknown"
+-    )
++    "v@version@"
+ }
diff --git a/pkgs/by-name/wa/warpgate/package.nix b/pkgs/by-name/wa/warpgate/package.nix
new file mode 100644
index 000000000000..440b3f762724
--- /dev/null
+++ b/pkgs/by-name/wa/warpgate/package.nix
@@ -0,0 +1,78 @@
+{
+  lib,
+  replaceVars,
+  fetchurl,
+  fetchFromGitHub,
+  rustPlatform,
+  buildNpmPackage,
+  openapi-generator-cli,
+  nixosTests,
+}:
+rustPlatform.buildRustPackage (
+  finalAttrs:
+  let
+    warpgate-web = buildNpmPackage {
+      pname = "${finalAttrs.pname}-web";
+      version = finalAttrs.version;
+
+      src = finalAttrs.src;
+      sourceRoot = "${finalAttrs.src.name}/warpgate-web";
+
+      patches = [ ./web-ui-package-json.patch ];
+
+      npmDepsHash = "sha256-1zCxKAH2IAKSFdL8Pyd8dJi0i8Y5mgYcWNKVpiQszc0=";
+
+      nativeBuildInputs = [ openapi-generator-cli ];
+
+      preBuild = "rm node_modules/.bin/openapi-generator-cli";
+
+      installPhase = ''
+        runHook preInstall
+        cp -R dist $out
+        runHook postInstall
+      '';
+    };
+  in
+  {
+    pname = "warpgate";
+    version = "0.17.0";
+
+    src = fetchFromGitHub {
+      owner = "warp-tech";
+      repo = "warpgate";
+      tag = "v${finalAttrs.version}";
+      hash = "sha256-nr0z8c0o5u4Rqs9pFUaxnasRHUhwT3qQe5+JNV+LObg=";
+    };
+
+    cargoHash = "sha256-pIr5Z7rp+dYOuKYnlsBdya6MqAdL0U2gUhwXvLfmM34=";
+
+    patches = [
+      (replaceVars ./hardcode-version.patch { inherit (finalAttrs) version; })
+      ./disable-rust-reproducible-build.patch
+    ];
+
+    buildFeatures = [
+      "postgres"
+      "mysql"
+      "sqlite"
+    ];
+
+    preBuild = ''ln -rs "${warpgate-web}" warpgate-web/dist'';
+
+    # skip check, project included tests require python stuff and docker
+    doCheck = false;
+
+    passthru.tests = {
+      inherit (nixosTests) warpgate;
+    };
+
+    meta = {
+      description = "Smart SSH, HTTPS, MySQL and Postgres bastion that requires no additional client-side software";
+      homepage = "https://warpgate.null.page";
+      license = lib.licenses.asl20;
+      platforms = lib.platforms.linux;
+      mainProgram = "warpgate";
+      maintainers = with lib.maintainers; [ alemonmk ];
+    };
+  }
+)
diff --git a/pkgs/by-name/wa/warpgate/web-ui-package-json.patch b/pkgs/by-name/wa/warpgate/web-ui-package-json.patch
new file mode 100644
index 000000000000..4799dea3dd1b
--- /dev/null
+++ b/pkgs/by-name/wa/warpgate/web-ui-package-json.patch
@@ -0,0 +1,15 @@
+diff --git a/package.json b/package.json
+index 54125c3..6942dfb 100644
+--- a/package.json
++++ b/package.json
+@@ -12,8 +12,8 @@
+     "postinstall": "npm run openapi:client:gateway && npm run openapi:client:admin",
+     "openapi:schema:gateway": "cargo run -p warpgate-protocol-http > src/gateway/lib/openapi-schema.json",
+     "openapi:schema:admin": "cargo run -p warpgate-admin > src/admin/lib/openapi-schema.json",
+-    "openapi:client:gateway": "openapi-generator-cli generate -g typescript-fetch -i src/gateway/lib/openapi-schema.json -o src/gateway/lib/api-client -p npmName=warpgate-gateway-api-client -p useSingleRequestParameter=true && cd src/gateway/lib/api-client && npm i typescript@5 && npm i && npx tsc --target esnext --module esnext && rm -rf src tsconfig.json",
+-    "openapi:client:admin": "openapi-generator-cli generate -g typescript-fetch -i src/admin/lib/openapi-schema.json -o src/admin/lib/api-client -p npmName=warpgate-admin-api-client -p useSingleRequestParameter=true && cd src/admin/lib/api-client && npm i typescript@5 && npm i && npx tsc --target esnext --module esnext && rm -rf src tsconfig.json",
++    "openapi:client:gateway": "openapi-generator-cli generate -g typescript-fetch -i src/gateway/lib/openapi-schema.json -o src/gateway/lib/api-client -p npmName=warpgate-gateway-api-client -p useSingleRequestParameter=true && ln -sr node_modules src/gateway/lib/api-client/node_modules && cd src/gateway/lib/api-client && npx tsc --target esnext --module esnext && rm -rf src tsconfig.json",
++    "openapi:client:admin": "openapi-generator-cli generate -g typescript-fetch -i src/admin/lib/openapi-schema.json -o src/admin/lib/api-client -p npmName=warpgate-admin-api-client -p useSingleRequestParameter=true && ln -sr node_modules src/admin/lib/api-client/node_modules && cd src/admin/lib/api-client && npx tsc --target esnext --module esnext && rm -rf src tsconfig.json",
+     "openapi:tests-sdk": "openapi-generator-cli generate -g python -i src/admin/lib/openapi-schema.json -o ../tests/api_sdk",
+     "openapi": "npm run openapi:schema:admin && npm run openapi:schema:gateway && npm run openapi:client:admin && npm run openapi:client:gateway"
+   },

From da2060bdc1c9bc35acc4eafa265ba6b6c64f9926 Mon Sep 17 00:00:00 2001
From: Peter Bynum <pkpbynum@gmail.com>
Date: Tue, 14 Oct 2025 10:02:27 -0400
Subject: [PATCH 2038/6226] Allocate virtualisation.diskSize with useBootLoader

---
 nixos/modules/virtualisation/qemu-vm.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix
index 6893d39382ea..ca28ecc81968 100644
--- a/nixos/modules/virtualisation/qemu-vm.nix
+++ b/nixos/modules/virtualisation/qemu-vm.nix
@@ -136,14 +136,20 @@ let
             ''
               # Create a writable qcow2 image using the systemImage as a backing
               # image.
+              BACKING_SIZE_MB=$(( $(${lib.getExe' qemu "qemu-img"} info ${systemImage}/nixos.qcow2 --output=json | ${lib.getExe hostPkgs.jq} -r '."virtual-size"') / 1024 / 1024 ))
+              DISK_SIZE_MB=${toString cfg.diskSize}
+              if (( DISK_SIZE_MB < BACKING_SIZE_MB )); then
+                OVERLAY_SIZE_MB=$BACKING_SIZE_MB
+              else
+                OVERLAY_SIZE_MB=$DISK_SIZE_MB
+              fi
 
-              # CoW prevent size to be attributed to an image.
-              # FIXME: raise this issue to upstream.
               ${qemu}/bin/qemu-img create \
                 -f qcow2 \
                 -b ${systemImage}/nixos.qcow2 \
                 -F qcow2 \
-                "$NIX_DISK_IMAGE"
+                "$NIX_DISK_IMAGE" \
+                 ''${OVERLAY_SIZE_MB}M
             ''
           else if cfg.useDefaultFilesystems then
             ''

From 7c695d271260addb332ff38e4769280b9ef1f967 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 23 Oct 2025 16:41:13 +0300
Subject: [PATCH 2039/6226] musescore: fix 2 separate compilation issues

- Fixes https://github.com/NixOS/nixpkgs/issues/454746
- Closes https://github.com/NixOS/nixpkgs/pull/454758
---
 pkgs/by-name/mu/musescore/package.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/by-name/mu/musescore/package.nix b/pkgs/by-name/mu/musescore/package.nix
index 05adb2aa0ad5..dcf7328050fe 100644
--- a/pkgs/by-name/mu/musescore/package.nix
+++ b/pkgs/by-name/mu/musescore/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   wrapGAppsHook3,
   pkg-config,
@@ -36,6 +37,19 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-3VpptHR9dt8lJeFhFygnPiP0XRf4R29SASC8AicLU5E=";
   };
 
+  patches = [
+    # https://github.com/musescore/MuseScore/pull/30422
+    (fetchpatch {
+      url = "https://github.com/musescore/MuseScore/commit/bda5eac091bca1db15fbe9546b2d71b7e8a126c8.patch";
+      hash = "sha256-MTSFxmwBWaOXipeUqIFKP4Oek087oqW2MQvltV9vAgA=";
+    })
+    # https://github.com/musescore/MuseScore/pull/30691
+    (fetchpatch {
+      url = "https://github.com/musescore/MuseScore/commit/840f8b7ded19cdc5d2dc78d32e396494aaf8c4c0.patch";
+      hash = "sha256-MfHLFQbgvgNTd5G3mxCMlS7bF8LrNWMLZUQ+A21l/RM=";
+    })
+  ];
+
   cmakeFlags = [
     "-DMUSE_APP_BUILD_MODE=release"
     # Disable the build and usage of the `/bin/crashpad_handler` utility - it's

From 61fddbe06bbc9a016b9eb3759d858c1674b10018 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 23 Oct 2025 16:42:01 +0300
Subject: [PATCH 2040/6226] musescore: 4.6.2 -> 4.6.3

Diff: https://github.com/musescore/MuseScore/compare/v4.6.2...v4.6.3
---
 pkgs/by-name/mu/musescore/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mu/musescore/package.nix b/pkgs/by-name/mu/musescore/package.nix
index dcf7328050fe..49d15577716c 100644
--- a/pkgs/by-name/mu/musescore/package.nix
+++ b/pkgs/by-name/mu/musescore/package.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "musescore";
-  version = "4.6.2";
+  version = "4.6.3";
 
   src = fetchFromGitHub {
     owner = "musescore";
     repo = "MuseScore";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3VpptHR9dt8lJeFhFygnPiP0XRf4R29SASC8AicLU5E=";
+    hash = "sha256-WLzt/Ox6GrfWD0/l8/Ksc2ptg5LZSOXXnlsSnenfZtI=";
   };
 
   patches = [

From cdfabd6440d380c75b8501d38be357475db4b87d Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Thu, 23 Oct 2025 13:37:12 +0200
Subject: [PATCH 2041/6226] tome4: remove references to pname

---
 pkgs/by-name/to/tome4/package.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix
index c9c23e185156..2cad28ec24a9 100644
--- a/pkgs/by-name/to/tome4/package.nix
+++ b/pkgs/by-name/to/tome4/package.nix
@@ -25,17 +25,17 @@ stdenv.mkDerivation rec {
   };
 
   desktop = makeDesktopItem {
-    desktopName = pname;
-    name = pname;
-    exec = "@out@/bin/${pname}";
-    icon = pname;
+    desktopName = "tome4";
+    name = "Tales of Maj'Eyal";
+    exec = "@out@/bin/tome4";
+    icon = "tome4";
     comment = "An open-source, single-player, role-playing roguelike game set in the world of Eyal.";
     type = "Application";
     categories = [
       "Game"
       "RolePlaying"
     ];
-    genericName = pname;
+    genericName = "2D roguelike RPG";
   };
 
   prePatch = ''
@@ -74,21 +74,21 @@ stdenv.mkDerivation rec {
   installPhase = ''
     runHook preInstall
 
-    dir=$out/share/${pname}
+    dir=$out/share/tome4
 
     install -Dm755 t-engine $dir/t-engine
     cp -r bootstrap game $dir
-    makeWrapper $dir/t-engine $out/bin/${pname} \
+    makeWrapper $dir/t-engine $out/bin/tome4 \
       --chdir "$dir"
 
-    install -Dm755 ${desktop}/share/applications/${pname}.desktop $out/share/applications/${pname}.desktop
-    substituteInPlace $out/share/applications/${pname}.desktop \
+    install -Dm755 ${desktop}/share/applications/tome4.desktop $out/share/applications/tome4.desktop
+    substituteInPlace $out/share/applications/tome4.desktop \
       --subst-var out
 
     unzip -oj -qq game/engines/te4-${version}.teae data/gfx/te4-icon.png
-    install -Dm644 te4-icon.png $out/share/icons/hicolor/64x64/${pname}.png
+    install -Dm644 te4-icon.png $out/share/icons/hicolor/64x64/tome4.png
 
-    install -Dm644 -t $out/share/doc/${pname} CONTRIBUTING COPYING COPYING-MEDIA CREDITS
+    install -Dm644 -t $out/share/doc/tome4 CONTRIBUTING COPYING COPYING-MEDIA CREDITS
 
     runHook postInstall
   '';

From 1d41c1d76c40bf0549a7ece53dd81e9fce227af6 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Thu, 23 Oct 2025 13:37:52 +0200
Subject: [PATCH 2042/6226] tome4: rec -> finalAttrs

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

diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix
index 2cad28ec24a9..a9693533dac6 100644
--- a/pkgs/by-name/to/tome4/package.nix
+++ b/pkgs/by-name/to/tome4/package.nix
@@ -15,12 +15,12 @@
   SDL2_ttf,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "tome4";
   version = "1.7.6";
 
   src = fetchurl {
-    url = "https://te4.org/dl/t-engine/t-engine4-src-${version}.tar.bz2";
+    url = "https://te4.org/dl/t-engine/t-engine4-src-${finalAttrs.version}.tar.bz2";
     sha256 = "sha256-mJ3qAIA/jNyt4CT0ZH1IC7GsDUN8JUKSwHVJwnKkaAw=";
   };
 
@@ -81,11 +81,11 @@ stdenv.mkDerivation rec {
     makeWrapper $dir/t-engine $out/bin/tome4 \
       --chdir "$dir"
 
-    install -Dm755 ${desktop}/share/applications/tome4.desktop $out/share/applications/tome4.desktop
+    install -Dm755 ${finalAttrs.desktop}/share/applications/tome4.desktop $out/share/applications/tome4.desktop
     substituteInPlace $out/share/applications/tome4.desktop \
       --subst-var out
 
-    unzip -oj -qq game/engines/te4-${version}.teae data/gfx/te4-icon.png
+    unzip -oj -qq game/engines/te4-${finalAttrs.version}.teae data/gfx/te4-icon.png
     install -Dm644 te4-icon.png $out/share/icons/hicolor/64x64/tome4.png
 
     install -Dm644 -t $out/share/doc/tome4 CONTRIBUTING COPYING COPYING-MEDIA CREDITS
@@ -104,4 +104,4 @@ stdenv.mkDerivation rec {
       "x86_64-linux"
     ];
   };
-}
+})

From e1d465f7d52140de1ad1228cfce374b3d5a0a679 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Thu, 23 Oct 2025 13:38:29 +0200
Subject: [PATCH 2043/6226] tome4: remove `with lib;`

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

diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix
index a9693533dac6..956949657f01 100644
--- a/pkgs/by-name/to/tome4/package.nix
+++ b/pkgs/by-name/to/tome4/package.nix
@@ -93,12 +93,12 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Tales of Maj'eyal (rogue-like game)";
     mainProgram = "tome4";
     homepage = "https://te4.org/";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ peterhoeg ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ peterhoeg ];
     platforms = [
       "i686-linux"
       "x86_64-linux"

From 95cd63bebc6566b031813bcf4518a588948b5c02 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Thu, 23 Oct 2025 13:39:09 +0200
Subject: [PATCH 2044/6226] tome4: use copyDesktopItems

---
 pkgs/by-name/to/tome4/package.nix | 41 ++++++++++++++-----------------
 1 file changed, 19 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix
index 956949657f01..770e5974768b 100644
--- a/pkgs/by-name/to/tome4/package.nix
+++ b/pkgs/by-name/to/tome4/package.nix
@@ -2,10 +2,10 @@
   lib,
   stdenv,
   fetchurl,
+  copyDesktopItems,
   makeDesktopItem,
   makeWrapper,
   premake4,
-  unzip,
   openal,
   libpng,
   libvorbis,
@@ -24,28 +24,14 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-mJ3qAIA/jNyt4CT0ZH1IC7GsDUN8JUKSwHVJwnKkaAw=";
   };
 
-  desktop = makeDesktopItem {
-    desktopName = "tome4";
-    name = "Tales of Maj'Eyal";
-    exec = "@out@/bin/tome4";
-    icon = "tome4";
-    comment = "An open-source, single-player, role-playing roguelike game set in the world of Eyal.";
-    type = "Application";
-    categories = [
-      "Game"
-      "RolePlaying"
-    ];
-    genericName = "2D roguelike RPG";
-  };
-
   prePatch = ''
     # http://forums.te4.org/viewtopic.php?f=42&t=49478&view=next#p234354
     sed -i 's|#include <GL/glext.h>||' src/tgl.h
   '';
 
   nativeBuildInputs = [
+    copyDesktopItems
     makeWrapper
-    unzip
     premake4
   ];
 
@@ -68,6 +54,22 @@ stdenv.mkDerivation (finalAttrs: {
 
   makeFlags = [ "config=release" ];
 
+  desktopItems = [
+    (makeDesktopItem {
+      desktopName = "Tales of Maj'Eyal";
+      name = "tome4";
+      exec = "tome4";
+      icon = "te4-icon";
+      comment = "An open-source, single-player, role-playing roguelike game set in the world of Eyal.";
+      type = "Application";
+      categories = [
+        "Game"
+        "RolePlaying"
+      ];
+      genericName = "2D roguelike RPG";
+    })
+  ];
+
   # The wrapper needs to cd into the correct directory as tome4's detection of
   # the game asset root directory is faulty.
 
@@ -81,12 +83,7 @@ stdenv.mkDerivation (finalAttrs: {
     makeWrapper $dir/t-engine $out/bin/tome4 \
       --chdir "$dir"
 
-    install -Dm755 ${finalAttrs.desktop}/share/applications/tome4.desktop $out/share/applications/tome4.desktop
-    substituteInPlace $out/share/applications/tome4.desktop \
-      --subst-var out
-
-    unzip -oj -qq game/engines/te4-${finalAttrs.version}.teae data/gfx/te4-icon.png
-    install -Dm644 te4-icon.png $out/share/icons/hicolor/64x64/tome4.png
+    install -Dm644 game/engines/default/data/gfx/te4-icon.png -t $out/share/icons/hicolor/64x64
 
     install -Dm644 -t $out/share/doc/tome4 CONTRIBUTING COPYING COPYING-MEDIA CREDITS
 

From 25454ff52fa4c9984e3b69dbdaca8b17cd7760da Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Thu, 23 Oct 2025 13:41:55 +0200
Subject: [PATCH 2045/6226] tome4: use substituteInPlace instead of sed

---
 pkgs/by-name/to/tome4/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix
index 770e5974768b..777ee07186e4 100644
--- a/pkgs/by-name/to/tome4/package.nix
+++ b/pkgs/by-name/to/tome4/package.nix
@@ -26,7 +26,8 @@ stdenv.mkDerivation (finalAttrs: {
 
   prePatch = ''
     # http://forums.te4.org/viewtopic.php?f=42&t=49478&view=next#p234354
-    sed -i 's|#include <GL/glext.h>||' src/tgl.h
+    substituteInPlace src/tgl.h \
+      --replace-fail "#include <GL/glext.h>" ""
   '';
 
   nativeBuildInputs = [

From 6ef6514633857d4195db067d9da29fbc4ff7f7f9 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Thu, 23 Oct 2025 13:50:28 +0200
Subject: [PATCH 2046/6226] tome4: sha256 -> hash

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

diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix
index 777ee07186e4..82691a86a2ad 100644
--- a/pkgs/by-name/to/tome4/package.nix
+++ b/pkgs/by-name/to/tome4/package.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://te4.org/dl/t-engine/t-engine4-src-${finalAttrs.version}.tar.bz2";
-    sha256 = "sha256-mJ3qAIA/jNyt4CT0ZH1IC7GsDUN8JUKSwHVJwnKkaAw=";
+    hash = "sha256-mJ3qAIA/jNyt4CT0ZH1IC7GsDUN8JUKSwHVJwnKkaAw=";
   };
 
   prePatch = ''

From 7389da9a751bb6794b3ef1a46298b75e9bc07a95 Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Thu, 23 Oct 2025 14:13:15 +0200
Subject: [PATCH 2047/6226] tome4: build from official sources

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

diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix
index 82691a86a2ad..54111b960562 100644
--- a/pkgs/by-name/to/tome4/package.nix
+++ b/pkgs/by-name/to/tome4/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitLab,
   copyDesktopItems,
   makeDesktopItem,
   makeWrapper,
@@ -19,9 +19,13 @@ stdenv.mkDerivation (finalAttrs: {
   pname = "tome4";
   version = "1.7.6";
 
-  src = fetchurl {
-    url = "https://te4.org/dl/t-engine/t-engine4-src-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-mJ3qAIA/jNyt4CT0ZH1IC7GsDUN8JUKSwHVJwnKkaAw=";
+  # Official source according to https://te4.org/wiki/How_to_compile
+  src = fetchFromGitLab {
+    domain = "git.net-core.org";
+    owner = "tome";
+    repo = "t-engine4";
+    tag = "tome-${finalAttrs.version}";
+    hash = "sha256-v0YPbmaOqKYgFkOe/X0FCirucrMo2UGAyhZ7MFj+nsU=";
   };
 
   prePatch = ''

From 38f2134339e766a2411a79c05153ea089240c46e Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Thu, 23 Oct 2025 14:45:36 +0200
Subject: [PATCH 2048/6226] tome4: fix build

---
 .../to/tome4/0001-web-missing-include.patch   | 24 +++++++
 .../to/tome4/0002-zlib-missing-include.patch  | 24 +++++++
 .../0003-incompatible-pointer-types.patch     | 71 +++++++++++++++++++
 pkgs/by-name/to/tome4/package.nix             | 40 +++++++++--
 4 files changed, 154 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/by-name/to/tome4/0001-web-missing-include.patch
 create mode 100644 pkgs/by-name/to/tome4/0002-zlib-missing-include.patch
 create mode 100644 pkgs/by-name/to/tome4/0003-incompatible-pointer-types.patch

diff --git a/pkgs/by-name/to/tome4/0001-web-missing-include.patch b/pkgs/by-name/to/tome4/0001-web-missing-include.patch
new file mode 100644
index 000000000000..e23aa77c1ca2
--- /dev/null
+++ b/pkgs/by-name/to/tome4/0001-web-missing-include.patch
@@ -0,0 +1,24 @@
+From e0c17a8665250b3e3e7f4938f7b256ff50b78fc8 Mon Sep 17 00:00:00 2001
+From: Tom van Dijk <18gatenmaker6@gmail.com>
+Date: Thu, 23 Oct 2025 15:01:01 +0200
+Subject: [PATCH 1/3] web missing include
+
+---
+ src/web.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/web.c b/src/web.c
+index f12eebb..940aaf9 100644
+--- a/src/web.c
++++ b/src/web.c
+@@ -32,6 +32,7 @@
+ #include "te4web.h"
+ #include "web-external.h"
+ #include "lua_externs.h"
++#include <unistd.h>
+ 
+ /*
+  * Grab web browser methods -- availabe only here
+-- 
+2.51.0
+
diff --git a/pkgs/by-name/to/tome4/0002-zlib-missing-include.patch b/pkgs/by-name/to/tome4/0002-zlib-missing-include.patch
new file mode 100644
index 000000000000..d6fb92441f2b
--- /dev/null
+++ b/pkgs/by-name/to/tome4/0002-zlib-missing-include.patch
@@ -0,0 +1,24 @@
+From a14890a8a7080c73cac10ff31365833b179c0464 Mon Sep 17 00:00:00 2001
+From: Tom van Dijk <18gatenmaker6@gmail.com>
+Date: Thu, 23 Oct 2025 15:45:03 +0200
+Subject: [PATCH 2/3] zlib missing include
+
+---
+ src/zlib/gzguts.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/zlib/gzguts.h b/src/zlib/gzguts.h
+index 990a4d2..7c89751 100644
+--- a/src/zlib/gzguts.h
++++ b/src/zlib/gzguts.h
+@@ -21,6 +21,7 @@
+ #include <stdio.h>
+ #include "zlib.h"
+ #ifdef STDC
++#  include <unistd.h>
+ #  include <string.h>
+ #  include <stdlib.h>
+ #  include <limits.h>
+-- 
+2.51.0
+
diff --git a/pkgs/by-name/to/tome4/0003-incompatible-pointer-types.patch b/pkgs/by-name/to/tome4/0003-incompatible-pointer-types.patch
new file mode 100644
index 000000000000..f2e1b36b34de
--- /dev/null
+++ b/pkgs/by-name/to/tome4/0003-incompatible-pointer-types.patch
@@ -0,0 +1,71 @@
+From ed9f9819c3a0d6b8e92f66aafa6324eb4b310282 Mon Sep 17 00:00:00 2001
+From: Tom van Dijk <18gatenmaker6@gmail.com>
+Date: Thu, 23 Oct 2025 15:53:06 +0200
+Subject: [PATCH 3/3] incompatible pointer types
+
+---
+ src/display_sdl.c                  | 2 +-
+ src/physfs/archivers/bind_physfs.c | 2 +-
+ src/physfs/physfs.c                | 3 ++-
+ src/tgl.h                          | 2 +-
+ 4 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/src/display_sdl.c b/src/display_sdl.c
+index 61b2f0e..c533c8b 100644
+--- a/src/display_sdl.c
++++ b/src/display_sdl.c
+@@ -78,5 +78,5 @@ GLuint gl_c_shader = 0;
+ int nb_draws = 0;
+ int gl_c_vertices_nb = 0, gl_c_texcoords_nb = 0, gl_c_colors_nb = 0;
+ GLfloat *gl_c_vertices_ptr = NULL;
+-GLfloat *gl_c_texcoords_ptr = NULL;
++void *gl_c_texcoords_ptr = NULL;
+ GLfloat *gl_c_colors_ptr = NULL;
+diff --git a/src/physfs/archivers/bind_physfs.c b/src/physfs/archivers/bind_physfs.c
+index d02d323..c0d77c1 100644
+--- a/src/physfs/archivers/bind_physfs.c
++++ b/src/physfs/archivers/bind_physfs.c
+@@ -222,7 +222,7 @@ static fvoid *doOpen(dvoid *opaque, const char *name,
+ 
+ static fvoid *BIND_PHYSFS_openRead(dvoid *opaque, const char *fnm, int *exist)
+ {
+-	return(doOpen(opaque, fnm, PHYSFS_openRead, exist));
++	return(doOpen(opaque, fnm, (void * (*)(const char *)) PHYSFS_openRead, exist));
+ } /* BIND_PHYSFS_openRead */
+ 
+ 
+diff --git a/src/physfs/physfs.c b/src/physfs/physfs.c
+index 03eb86d..32e2c91 100644
+--- a/src/physfs/physfs.c
++++ b/src/physfs/physfs.c
+@@ -68,12 +68,13 @@ extern const PHYSFS_Archiver       __PHYSFS_Archiver_MVL;
+ extern const PHYSFS_ArchiveInfo    __PHYSFS_ArchiveInfo_WAD;
+ extern const PHYSFS_Archiver       __PHYSFS_Archiver_WAD;
+ extern const PHYSFS_Archiver       __PHYSFS_Archiver_DIR;
++extern const PHYSFS_ArchiveInfo    __PHYSFS_ArchiveInfo_BIND_PHYSFS;
+ extern const PHYSFS_Archiver       __PHYSFS_Archiver_BIND_PHYSFS;
+ 
+ 
+ static const PHYSFS_ArchiveInfo *supported_types[] =
+ {
+-    &__PHYSFS_Archiver_BIND_PHYSFS,
++    &__PHYSFS_ArchiveInfo_BIND_PHYSFS,
+ #if (defined PHYSFS_SUPPORTS_ZIP)
+     &__PHYSFS_ArchiveInfo_SUBZIP,
+     &__PHYSFS_ArchiveInfo_ZIP,
+diff --git a/src/tgl.h b/src/tgl.h
+index e2ec026..f905033 100644
+--- a/src/tgl.h
++++ b/src/tgl.h
+@@ -71,7 +71,7 @@ extern int nb_draws;
+ 
+ extern int gl_c_vertices_nb, gl_c_texcoords_nb, gl_c_colors_nb;
+ extern GLfloat *gl_c_vertices_ptr;
+-extern GLfloat *gl_c_texcoords_ptr;
++extern void *gl_c_texcoords_ptr;
+ extern GLfloat *gl_c_colors_ptr;
+ #define glVertexPointer(nb, t, v, p) \
+ { \
+-- 
+2.51.0
+
diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix
index 54111b960562..0d7b218b44ce 100644
--- a/pkgs/by-name/to/tome4/package.nix
+++ b/pkgs/by-name/to/tome4/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitLab,
+  fetchpatch2,
   copyDesktopItems,
   makeDesktopItem,
   makeWrapper,
@@ -13,8 +14,17 @@
   SDL2,
   SDL2_image,
   SDL2_ttf,
+  xorg,
 }:
 
+let
+  sdlInputs = [
+    SDL2
+    SDL2_ttf
+    SDL2_image
+  ];
+in
+
 stdenv.mkDerivation (finalAttrs: {
   pname = "tome4";
   version = "1.7.6";
@@ -34,6 +44,19 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "#include <GL/glext.h>" ""
   '';
 
+  patches = [
+    # https://forums.te4.org/viewtopic.php?f=69&t=39859&p=168681&hilit=luaopen_shaders#p168681
+    (fetchpatch2 {
+      url = "https://gist.githubusercontent.com/hasufell/cb3b10f834e891d90f83/raw/cb4adda13868f6b94585575db4f8df70877ae45a/tome4-1.1.3-fix-implicit-declaration.patch";
+      hash = "sha256-g47N/bi2/DDKqaEkfTaGp9ItS57QVnObzMDWXqrCjWE=";
+    })
+    # unistd required for execv
+    ./0001-web-missing-include.patch
+    # unistd required for read and close
+    ./0002-zlib-missing-include.patch
+    ./0003-incompatible-pointer-types.patch
+  ];
+
   nativeBuildInputs = [
     copyDesktopItems
     makeWrapper
@@ -47,15 +70,22 @@ stdenv.mkDerivation (finalAttrs: {
     openal
     libpng
     libvorbis
-    SDL2
-    SDL2_ttf
-    SDL2_image
-  ];
+    xorg.libX11
+    xorg.xorgproto
+  ]
+  ++ sdlInputs;
 
   # disable parallel building as it caused sporadic build failures
   enableParallelBuilding = false;
 
-  env.NIX_CFLAGS_COMPILE = "-I${lib.getInclude SDL2}/include/SDL2 -I${SDL2_image}/include/SDL2 -I${SDL2_ttf}/include/SDL2";
+  env = {
+    NIX_CFLAGS_COMPILE =
+      lib.concatMapStringsSep " " (i: "-I${lib.getInclude i}/include/SDL2") sdlInputs
+      + " "
+      + lib.concatMapStringsSep " " (i: "-I${lib.getInclude i}") finalAttrs.buildInputs;
+
+    NIX_CFLAGS_LINK = lib.concatMapStringsSep " " (i: "-L${lib.getLib i}/lib") finalAttrs.buildInputs;
+  };
 
   makeFlags = [ "config=release" ];
 

From 0ba4d0e96e2358ea1db4737ff8591cba314a574e Mon Sep 17 00:00:00 2001
From: Tom van Dijk <18gatenmaker6@gmail.com>
Date: Thu, 23 Oct 2025 16:35:15 +0200
Subject: [PATCH 2049/6226] tome4: add update script

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

diff --git a/pkgs/by-name/to/tome4/package.nix b/pkgs/by-name/to/tome4/package.nix
index 0d7b218b44ce..d74852014c8e 100644
--- a/pkgs/by-name/to/tome4/package.nix
+++ b/pkgs/by-name/to/tome4/package.nix
@@ -15,6 +15,7 @@
   SDL2_image,
   SDL2_ttf,
   xorg,
+  nix-update-script,
 }:
 
 let
@@ -125,6 +126,13 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "tome-(.*)"
+    ];
+  };
+
   meta = {
     description = "Tales of Maj'eyal (rogue-like game)";
     mainProgram = "tome4";

From 7eebd4369e1947832394a78044bc170eee5e96e0 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Thu, 23 Oct 2025 14:38:48 +0000
Subject: [PATCH 2050/6226] ty: 0.0.1-alpha.23 -> 0.0.1-alpha.24

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

diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix
index eff2d73ceac5..31297822df3b 100644
--- a/pkgs/by-name/ty/ty/package.nix
+++ b/pkgs/by-name/ty/ty/package.nix
@@ -14,14 +14,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ty";
-  version = "0.0.1-alpha.23";
+  version = "0.0.1-alpha.24";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ty";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-gkHKccY2EfcdPI44A3u3c0JwAxSKtno6/kI/+a0e+FY=";
+    hash = "sha256-QcWYrXWKxoqaaVNXgsrL05DyCbewltlVHgd7xQWd0g4=";
   };
 
   # For Darwin platforms, remove the integration test for file notifications,
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoBuildFlags = [ "--package=ty" ];
 
-  cargoHash = "sha256-ZHapUIdpplKWNGi20QeBEQKgHCiR5laNUBzEDyxSEfI=";
+  cargoHash = "sha256-fo1he5WyQK4qu1gz50snah49GMopfQtbtJRwSimT1Fg=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 50fccc29d7d8da11de205a3815b916642cbc9c57 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nam=20Kh=C3=A1nh?=
 <102988626+IdaCryze@users.noreply.github.com>
Date: Thu, 23 Oct 2025 16:47:01 +0200
Subject: [PATCH 2051/6226] logisim-evolution: 3.9.0 -> 4.0.0

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

diff --git a/pkgs/by-name/lo/logisim-evolution/package.nix b/pkgs/by-name/lo/logisim-evolution/package.nix
index 07a6dde8c7fa..864539c8750e 100644
--- a/pkgs/by-name/lo/logisim-evolution/package.nix
+++ b/pkgs/by-name/lo/logisim-evolution/package.nix
@@ -18,11 +18,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "logisim-evolution";
-  version = "3.9.0";
+  version = "4.0.0";
 
   src = fetchurl {
     url = "https://github.com/logisim-evolution/logisim-evolution/releases/download/v${finalAttrs.version}/logisim-evolution-${finalAttrs.version}-all.jar";
-    hash = "sha256-QxU1h6LKzWy25wtXgEufPT0KsIsLhrKnq9CRcS4Mlzc=";
+    hash = "sha256-aZ+VekHVLAtPy8KJmhWpGC6RwZBui31lNCCABDhxYfQ=";
   };
   dontUnpack = true;
 

From 5154bca56e9a68d60c64cc7918b07133733f4f6a Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 11:47:19 -0300
Subject: [PATCH 2052/6226] niftyreg: fix build with cmake4

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

diff --git a/pkgs/by-name/ni/niftyreg/package.nix b/pkgs/by-name/ni/niftyreg/package.nix
index f71fa0132586..3f981df10c2d 100644
--- a/pkgs/by-name/ni/niftyreg/package.nix
+++ b/pkgs/by-name/ni/niftyreg/package.nix
@@ -20,6 +20,11 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [ cmake ];
   buildInputs = [ zlib ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "http://cmictig.cs.ucl.ac.uk/wiki/index.php/NiftyReg";
     description = "Medical image registration software";

From 18528cfe2ce74ddf4a1d7a6e91dd3784f62c2e9d Mon Sep 17 00:00:00 2001
From: cinereal <cinereal@riseup.net>
Date: Thu, 23 Oct 2025 16:47:49 +0200
Subject: [PATCH 2053/6226] terraform_providers.e-breuninger_netbox: init at
 5.0.0

adds Terraform provider
[`netbox`](https://registry.terraform.io/providers/e-breuninger/netbox),
which allows one to interact with our existing `services.netbox`.

Signed-off-by: cinereal <cinereal@riseup.net>
---
 .../cluster/terraform-providers/providers.json           | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 42ce809bcd18..a9c2baab64d6 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -353,6 +353,15 @@
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-u/ycUCnEYlCBrDcI0VCkob4CGXrXYdGWwiw5EeJyuiw="
   },
+  "e-breuninger_netbox": {
+    "hash": "sha256-iCaCt8ZbkxCk43QEyj3PeHYuKPCPVU2oQ78aumH/l6k=",
+    "homepage": "https://registry.terraform.io/providers/e-breuninger/netbox",
+    "owner": "e-breuninger",
+    "repo": "terraform-provider-netbox",
+    "rev": "v5.0.0",
+    "spdx": "MPL-2.0",
+    "vendorHash": "sha256-Q3H/6mpkWn1Gw0NRMtKtkBRGHjPJZGBFdGwfalyQ4Z0="
+  },
   "equinix_equinix": {
     "hash": "sha256-QE8ukiQHZqhSsZyFnInIpnGvsSlFuFMun7paK/Z3HTM=",
     "homepage": "https://registry.terraform.io/providers/equinix/equinix",

From 706c7e840c3db457b652bd238f7cb6ed1c5a151f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 14:52:57 +0000
Subject: [PATCH 2054/6226] webex: 45.6.2.32823 -> 45.10.0.33234

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

diff --git a/pkgs/by-name/we/webex/package.nix b/pkgs/by-name/we/webex/package.nix
index 1633cb8018d3..6b84aa55a8ad 100644
--- a/pkgs/by-name/we/webex/package.nix
+++ b/pkgs/by-name/we/webex/package.nix
@@ -57,11 +57,11 @@
 
 stdenv.mkDerivation rec {
   pname = "webex";
-  version = "45.6.2.32823";
+  version = "45.10.0.33234";
 
   src = fetchurl {
-    url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20250725151734/Webex_ubuntu.7z";
-    sha256 = "72e9693d7c1c09ebf2c93c5e29e2b52a012eaf3ac108d7759d66be500c528b3b";
+    url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Gold/20251014140645/Webex_ubuntu.7z";
+    sha256 = "126ac38dbf659d26c213a9ccd5930f6a88d1aa90fd9de90cba74b2f2bfbe7793";
   };
 
   nativeBuildInputs = [

From cded73442f0f98588e04189cb1c06e1c37ef6936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mladen=20Brankovi=C4=87?= <root@brankovic.dev>
Date: Mon, 8 Sep 2025 16:31:49 +0200
Subject: [PATCH 2055/6226] maintainers: add imatpot

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 94f4899b4d51..b89ca4c30921 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -10956,6 +10956,12 @@
     githubId = 993484;
     name = "Greg Hale";
   };
+  imatpot = {
+    email = "nixpkgs@brnk.vc";
+    github = "imatpot";
+    githubId = 39416660;
+    name = "Mladen Branković";
+  };
   imgabe = {
     email = "gabrielpmonte@hotmail.com";
     github = "ImGabe";

From 370e97de6cd51a308de8827cd74e269e0c3af600 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mladen=20Brankovi=C4=87?= <root@brankovic.dev>
Date: Sun, 21 Sep 2025 01:14:32 +0200
Subject: [PATCH 2056/6226] hyperglot: init at 0.7.3

---
 .../python-modules/hyperglot/default.nix      | 45 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/python-modules/hyperglot/default.nix

diff --git a/pkgs/development/python-modules/hyperglot/default.nix b/pkgs/development/python-modules/hyperglot/default.nix
new file mode 100644
index 000000000000..1722f06a28ce
--- /dev/null
+++ b/pkgs/development/python-modules/hyperglot/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  nix-update-script,
+  fetchPypi,
+  buildPythonApplication,
+  setuptools,
+  click,
+  fonttools,
+  uharfbuzz,
+  pyyaml,
+  colorlog,
+}:
+buildPythonApplication rec {
+  pname = "hyperglot";
+  version = "0.7.3";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-Pd9Yxmv9a1T2xV03q2U1m1laHE3WifHwmnGBfTTCSxM=";
+  };
+
+  dependencies = [
+    click
+    fonttools
+    uharfbuzz
+    pyyaml
+    colorlog
+  ];
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "hyperglot" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Database and tools for detecting language support in fonts";
+    homepage = "https://hyperglot.rosettatype.com";
+    changelog = "https://github.com/rosettatype/hyperglot/blob/${version}/CHANGELOG.md";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ imatpot ];
+    mainProgram = "hyperglot";
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f7d72bf5914..b50a7f879110 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11341,6 +11341,8 @@ with pkgs;
 
   hyperion-ng = libsForQt5.callPackage ../applications/video/hyperion-ng { };
 
+  hyperglot = with python3Packages; toPythonApplication hyperglot;
+
   jackline = callPackage ../applications/networking/instant-messengers/jackline {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 44fef07a0ef2..c96ff21556da 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6884,6 +6884,8 @@ self: super: with self; {
 
   hyperframe = callPackage ../development/python-modules/hyperframe { };
 
+  hyperglot = callPackage ../development/python-modules/hyperglot { };
+
   hyperion-py = callPackage ../development/python-modules/hyperion-py { };
 
   hyperlink = callPackage ../development/python-modules/hyperlink { };

From 370b4a8ae458391b6ed4642f5a3b36f1bfe6fcdf Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Thu, 23 Oct 2025 17:11:12 +0200
Subject: [PATCH 2057/6226] nextcloud31: 31.0.9 -> 31.0.10

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

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 51c0d542a9f6..2459ea7c64dd 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -59,8 +59,8 @@ let
 in
 {
   nextcloud31 = generic {
-    version = "31.0.9";
-    hash = "sha256-qrhBTMY1gco6jfRy9F60ErK4Q6lms4cCdUIbrQ1nD2g=";
+    version = "31.0.10";
+    hash = "sha256-6FZxPwIo8+Ju6F72+ZFetNBYwNIYML1Y7l10K+3wpmk=";
     packages = nextcloud31Packages;
   };
 

From 72bd32e562edfb7eac058f2453da61101a6dd2e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 9 Oct 2025 17:09:19 +0000
Subject: [PATCH 2058/6226] python3Packages.ahocorasick-rs: 0.22.2 -> 1.0.3

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

diff --git a/pkgs/development/python-modules/ahocorasick-rs/default.nix b/pkgs/development/python-modules/ahocorasick-rs/default.nix
index e8c3b47854db..f60ebfe67ef0 100644
--- a/pkgs/development/python-modules/ahocorasick-rs/default.nix
+++ b/pkgs/development/python-modules/ahocorasick-rs/default.nix
@@ -13,19 +13,19 @@
 
 buildPythonPackage rec {
   pname = "ahocorasick-rs";
-  version = "0.22.2";
+  version = "1.0.3";
 
   pyproject = true;
 
   src = fetchPypi {
     inherit version;
     pname = "ahocorasick_rs";
-    hash = "sha256-h/J6ZCLb+U7A+f6ErAGI1KZrXHsvX23rFl8MXj25dpw=";
+    hash = "sha256-V503Bwp8Idqc2ZiLn7RxKXJztgy0EmWG1tzZn6r8XKU=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-uB3r6+Ewpi4dVke/TsCZltfc+ZABYLOLKuNxw+Jfu/M=";
+    hash = "sha256-RfgjO0qffiAZynQ/xChd81L8S0sqTGdWvpHPrz3bKlQ=";
   };
 
   nativeBuildInputs = with rustPlatform; [

From 50c7612fa4b4889ce083b172cf71ab9b94897765 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Thu, 23 Oct 2025 16:16:00 +0100
Subject: [PATCH 2059/6226] =?UTF-8?q?clickhouse:=2025.9.2.1=20=E2=86=92=20?=
 =?UTF-8?q?25.9.4.58?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/pkgs/by-name/cl/clickhouse/package.nix b/pkgs/by-name/cl/clickhouse/package.nix
index 1fc35212e7d4..50f05896dd39 100644
--- a/pkgs/by-name/cl/clickhouse/package.nix
+++ b/pkgs/by-name/cl/clickhouse/package.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "25.9.2.1-stable";
-  hash = "sha256-BygRxiDhhs91/UPWY7f3jAGyTtyAj98RdDXLwjs8Abo=";
+  version = "25.9.4.58-stable";
+  hash = "sha256-HRbqVSyDuvhkv0+PSgps9AXKdLlukrLA65OLx5gZ3c0=";
   lts = false;
   nixUpdateExtraArgs = [
     "--version-regex"

From fc049b4e2d859aa2d97bb935d346162b66d80977 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 15:20:29 +0000
Subject: [PATCH 2060/6226] converseen: 0.15.0.3 -> 0.15.1.0

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

diff --git a/pkgs/by-name/co/converseen/package.nix b/pkgs/by-name/co/converseen/package.nix
index 0f7e90a87f78..036047bc1e61 100644
--- a/pkgs/by-name/co/converseen/package.nix
+++ b/pkgs/by-name/co/converseen/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "converseen";
-  version = "0.15.0.3";
+  version = "0.15.1.0";
 
   src = fetchFromGitHub {
     owner = "Faster3ck";
     repo = "Converseen";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZC7D+0tonAIkbDaoqw+RarIVuNcDQe410JrfC2kG+B8=";
+    hash = "sha256-loWwwleiBgwV/6t33HgIqEHU9y/pqyocmwBn0Qg01RY=";
   };
 
   strictDeps = true;

From d179757d5e3f52cf8efca29808bc37927de4108d Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Thu, 23 Oct 2025 16:22:14 +0100
Subject: [PATCH 2061/6226] =?UTF-8?q?apacheKafka:=204=5F0:=204.0.0=20?=
 =?UTF-8?q?=E2=86=92=204.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/servers/apache-kafka/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/apache-kafka/default.nix b/pkgs/servers/apache-kafka/default.nix
index 024646625193..fdda9d510d90 100644
--- a/pkgs/servers/apache-kafka/default.nix
+++ b/pkgs/servers/apache-kafka/default.nix
@@ -22,9 +22,9 @@ let
       nixosTest = nixosTests.kafka.base.kafka_4_1;
     };
     "4_0" = {
-      kafkaVersion = "4.0.0";
+      kafkaVersion = "4.0.1";
       scalaVersion = "2.13";
-      sha256 = "sha256-e4Uuk4vAneEM2W7KN1UljH0l+4nb3XYwVxdgfhg14qo=";
+      sha256 = "sha256-M8xc04WE6w9yYWxMLwX7SINKVvoKnNn+AKxzIMNM9SQ=";
       jre = jdk17_headless;
       nixosTest = nixosTests.kafka.base.kafka_4_0;
     };

From 3fdfbf7a477014c2bfd1846c63e9d5ad3ab7353e Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 23 Oct 2025 20:27:27 +0800
Subject: [PATCH 2062/6226] python3Packages.jax: fix build

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

diff --git a/pkgs/development/python-modules/jax/default.nix b/pkgs/development/python-modules/jax/default.nix
index dfc221a76e56..4cd12283ab1b 100644
--- a/pkgs/development/python-modules/jax/default.nix
+++ b/pkgs/development/python-modules/jax/default.nix
@@ -6,6 +6,7 @@
   lapack,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   cudaSupport ? config.cudaSupport,
 
   # build-system
@@ -51,6 +52,14 @@ buildPythonPackage rec {
     hash = "sha256-Ilcp4WW65SyqrqDGBRdnB25m7OCbrsfdtxWvl0uTjNw=";
   };
 
+  patches = [
+    # https://github.com/jax-ml/jax/pull/32840
+    (fetchpatch2 {
+      url = "https://github.com/Prince213/jax/commit/af5c211d49f3b99447db2252d2cc2b8e0fb54d1c.patch?full_index=1";
+      hash = "sha256-ijEd+MDe91qyYfE+aMzR5rNmTeGadin6Io8PIfJWc3o=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   # The version is automatically set to ".dev" if this variable is not set.

From cc176831b79b389dfc8980d2de8e7a601317174c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 15:30:12 +0000
Subject: [PATCH 2063/6226] papilo: 2.4.3 -> 2.4.4

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

diff --git a/pkgs/by-name/pa/papilo/package.nix b/pkgs/by-name/pa/papilo/package.nix
index 0aac8f0dade3..b1792c608182 100644
--- a/pkgs/by-name/pa/papilo/package.nix
+++ b/pkgs/by-name/pa/papilo/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "papilo";
-  version = "2.4.3";
+  version = "2.4.4";
 
   src = fetchFromGitHub {
     owner = "scipopt";
     repo = "papilo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SsRAwidqvisoDODBLRatVWFw7wGeLUavmPXSlPmD7d8=";
+    hash = "sha256-VHOwr3uIhurab1zI9FeecBXZIp1ee2pk8fhVak6H0+A=";
   };
 
   # skip SEGFAULT tests

From 2811ae30af1d3ed1566f804a6fe0c18be7eae269 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 23 Oct 2025 15:30:04 +0000
Subject: [PATCH 2064/6226] cudaPackages.cuda_cccl: restrict to a single output
 to fix libnvshmem build

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/packages/cuda_cccl.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/cuda_cccl.nix b/pkgs/development/cuda-modules/packages/cuda_cccl.nix
index 481970c39884..c4f39f875dd9 100644
--- a/pkgs/development/cuda-modules/packages/cuda_cccl.nix
+++ b/pkgs/development/cuda-modules/packages/cuda_cccl.nix
@@ -7,11 +7,12 @@ buildRedist {
   redistName = "cuda";
   pname = "cuda_cccl";
 
-  outputs = [
-    "out"
-    "dev"
-    "include"
-  ];
+  # Restrict header-only packages to a single output.
+  # Also, when using multiple outputs (i.e., `out`, `dev`, and `include`), something isn't being patched correctly,
+  # so libnvshmem fails to build, complaining about being unable to find the thrust include directory. This is likely
+  # because the `dev` output contains the CMake configuration and is written to assume it will share a parent
+  # directory with the include directory rather than be in a separate output.
+  outputs = [ "out" ];
 
   prePatch = lib.optionalString (cudaAtLeast "13.0") ''
     nixLog "removing top-level $PWD/include/nv directory"

From 6784ffd6051cf535d5e9905112f1ff238146b4bd Mon Sep 17 00:00:00 2001
From: David Sierra DiazGranados <davidsierradz@gmail.com>
Date: Wed, 22 Oct 2025 16:02:30 +0000
Subject: [PATCH 2065/6226] copyq: 11.0.0 -> 13.0.0

---
 pkgs/applications/misc/copyq/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/copyq/default.nix b/pkgs/applications/misc/copyq/default.nix
index 5d97c06610a3..d0f69520f4cc 100644
--- a/pkgs/applications/misc/copyq/default.nix
+++ b/pkgs/applications/misc/copyq/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   cmake,
   ninja,
   qtbase,
@@ -19,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "CopyQ";
-  version = "11.0.0";
+  version = "13.0.0";
 
   src = fetchFromGitHub {
     owner = "hluk";
     repo = "CopyQ";
     rev = "v${version}";
-    hash = "sha256-/t+8YsqeX0tlxwQDDNTalttCDIgGhpLbzYe3UqY04xM=";
+    hash = "sha256-wxjUL5mGXAMNVGP+dAh1NrE9tw71cJW9zmLsaCVphTo=";
   };
 
   nativeBuildInputs = [
@@ -48,12 +49,21 @@ stdenv.mkDerivation rec {
     kdePackages.kconfig
     kdePackages.kstatusnotifieritem
     kdePackages.knotifications
+    kdePackages.kguiaddons
   ];
 
   cmakeFlags = [
     (lib.cmakeBool "WITH_QT6" true)
   ];
 
+  patches = [
+    # https://github.com/hluk/CopyQ/pull/3268
+    (fetchpatch2 {
+      url = "https://github.com/hluk/CopyQ/commit/103903593c37c9db5406d276e0097fbf18d2a8c4.patch?full_index=1";
+      hash = "sha256-zywE6ntMw+WvTyilXwvd4lfQRAAB9R/AGpwtwwPFZZE=";
+    })
+  ];
+
   meta = {
     homepage = "https://hluk.github.io/CopyQ";
     description = "Clipboard Manager with Advanced Features";

From 3efe5715cfc845a7d7a2490f1df02fb86b7ff18c Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Thu, 23 Oct 2025 10:48:16 -0500
Subject: [PATCH 2066/6226] kiwix: fix build error with latest qt

---
 pkgs/applications/misc/kiwix/default.nix         |  4 ++++
 pkgs/applications/misc/kiwix/remove-Werror.patch | 12 ++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 pkgs/applications/misc/kiwix/remove-Werror.patch

diff --git a/pkgs/applications/misc/kiwix/default.nix b/pkgs/applications/misc/kiwix/default.nix
index 4f05aa627d64..fd7690db657a 100644
--- a/pkgs/applications/misc/kiwix/default.nix
+++ b/pkgs/applications/misc/kiwix/default.nix
@@ -25,6 +25,10 @@ stdenv.mkDerivation rec {
     hash = "sha256-B3RcYr/b8pZTJV35BWuqmWbq+C2WkkcwBR0oNaUXPRw=";
   };
 
+  patches = [
+    ./remove-Werror.patch
+  ];
+
   nativeBuildInputs = [
     qmake
     pkg-config
diff --git a/pkgs/applications/misc/kiwix/remove-Werror.patch b/pkgs/applications/misc/kiwix/remove-Werror.patch
new file mode 100644
index 000000000000..da035478b99f
--- /dev/null
+++ b/pkgs/applications/misc/kiwix/remove-Werror.patch
@@ -0,0 +1,12 @@
+diff --git a/kiwix-desktop.pro b/kiwix-desktop.pro
+index c1f4f93..bf10828 100644
+--- a/kiwix-desktop.pro
++++ b/kiwix-desktop.pro
+@@ -27,7 +27,6 @@ QMAKE_CXXFLAGS += -std=c++17
+ QMAKE_LFLAGS +=  -std=c++17
+ 
+ !win32 {
+-    QMAKE_CXXFLAGS += -Werror
+     equals(QT_MAJOR_VERSION, 6):equals(QT_MINOR_VERSION, 6) {
+         # Fail the build on errors, except for 'template-id-cdtor' due to a problem with Qt headers.
+         # This can be removed when the Ubuntu package is fixed.

From 3b9257dd0f9b43b0a7a31eb760f9403a97ec8805 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Thu, 23 Oct 2025 16:46:01 +0200
Subject: [PATCH 2067/6226] tart: 2.28.6 -> 2.30.0

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

diff --git a/pkgs/by-name/ta/tart/package.nix b/pkgs/by-name/ta/tart/package.nix
index 357a77a53d82..a207bf40819a 100644
--- a/pkgs/by-name/ta/tart/package.nix
+++ b/pkgs/by-name/ta/tart/package.nix
@@ -14,11 +14,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tart";
-  version = "2.28.6";
+  version = "2.30.0";
 
   src = fetchurl {
     url = "https://github.com/cirruslabs/tart/releases/download/${finalAttrs.version}/tart.tar.gz";
-    hash = "sha256-F6bYWVHtzXo6TH4CAvdF6qx7OCVvKACsh2KdRYFsxOw=";
+    hash = "sha256-NUjF5hX+M12WcT+T/QXqHBFz2UOVm0NFtYzKGQmS6kg=";
   };
   sourceRoot = ".";
 

From 1c07044214f4965268e93f32d462f7348d3283b0 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Thu, 23 Oct 2025 17:31:17 +0200
Subject: [PATCH 2068/6226] python3Packages.weblate-schemas: 2025.5 -> 2025.6

Changelog: https://github.com/WeblateOrg/weblate_schemas/blob/2025.6/CHANGES.rst
---
 pkgs/development/python-modules/weblate-schemas/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/weblate-schemas/default.nix b/pkgs/development/python-modules/weblate-schemas/default.nix
index 4563d1ee40ac..f3310a3b5094 100644
--- a/pkgs/development/python-modules/weblate-schemas/default.nix
+++ b/pkgs/development/python-modules/weblate-schemas/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "weblate-schemas";
-  version = "2025.5";
+  version = "2025.6";
 
   pyproject = true;
 
   src = fetchPypi {
     pname = "weblate_schemas";
     inherit version;
-    hash = "sha256-ZhFF3UD7lX/KXVDZFOn+Gc1w/cpzzVYVrbpVeJ9/wiE=";
+    hash = "sha256-Kxu+8CiJ343PmCdY5rSbTqsWmVMLnz9inAH726g5TQQ=";
   };
 
   build-system = [ setuptools ];

From f45d7d6cde32dd06321018540a2080a4413936ce Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Thu, 23 Oct 2025 17:22:15 +0200
Subject: [PATCH 2069/6226] dolphin-emu: fix build with Qt 6.10

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/do/dolphin-emu/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix
index 92da789dbf6b..205fcf578325 100644
--- a/pkgs/by-name/do/dolphin-emu/package.nix
+++ b/pkgs/by-name/do/dolphin-emu/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
 
   # nativeBuildInputs
   cmake,
@@ -71,6 +72,13 @@ stdenv.mkDerivation (finalAttrs: {
     '';
   };
 
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/dolphin-emu/dolphin/commit/8edef722ce1aae65d5a39faf58753044de48b6e0.patch?full_index=1";
+      hash = "sha256-QEG0p+AzrExWrOxL0qRPa+60GlL0DlLyVBrbG6pGuog=";
+    })
+  ];
+
   strictDeps = true;
 
   nativeBuildInputs = [

From b48f55f989d9ef010e27ec9a201ddf5c06c414bd Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Thu, 23 Oct 2025 17:57:08 +0200
Subject: [PATCH 2070/6226] melonDS: 1.0-unstable-2025-08-10 ->
 1.0-unstable-2025-10-13

---
 pkgs/by-name/me/melonDS/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix
index dd612f49c779..831f12648b4e 100644
--- a/pkgs/by-name/me/melonDS/package.nix
+++ b/pkgs/by-name/me/melonDS/package.nix
@@ -5,6 +5,7 @@
   enet,
   extra-cmake-modules,
   fetchFromGitHub,
+  faad2,
   libGL,
   libarchive,
   libpcap,
@@ -28,13 +29,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "melonDS";
-  version = "1.0-unstable-2025-08-10";
+  version = "1.0-unstable-2025-10-13";
 
   src = fetchFromGitHub {
     owner = "melonDS-emu";
     repo = "melonDS";
-    rev = "f9e46fdc29f8e55aca6bc121c424890faee2e51d";
-    hash = "sha256-g5TVvnCoWQej9v2aii5klx7gRzUrokiwy0By0G3LkiI=";
+    rev = "91ab68090c0aa588aabaeaa5e2c62564fd661ccc";
+    hash = "sha256-04Wr7xUwz6Q9JDiEfTQh6Vx5q71dFVI9rScIpt6ywGY=";
   };
 
   nativeBuildInputs = [
@@ -47,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     SDL2
     enet
+    faad2
     libarchive
     libslirp
     libGL

From 85f1dd73bc93b51b4f4076d872bdf4dfeca15d95 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Thu, 23 Oct 2025 17:28:45 +0200
Subject: [PATCH 2071/6226] python3Packages.crispy-bootstrap3: disable tests
 for Django >= 5.1

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

diff --git a/pkgs/development/python-modules/crispy-bootstrap3/default.nix b/pkgs/development/python-modules/crispy-bootstrap3/default.nix
index f7f09e8e6962..e7662f47548c 100644
--- a/pkgs/development/python-modules/crispy-bootstrap3/default.nix
+++ b/pkgs/development/python-modules/crispy-bootstrap3/default.nix
@@ -35,6 +35,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "crispy_bootstrap3" ];
 
+  # Tests are broken on Django >= 5.1
+  # https://github.com/django-crispy-forms/crispy-bootstrap3/issues/12
+  doCheck = lib.versionOlder django.version "5.1";
+
   meta = with lib; {
     description = "Bootstrap 3 template pack for django-crispy-forms";
     homepage = "https://github.com/django-crispy-forms/crispy-bootstrap3";

From 718707b2b6c17b32222598b4cbd9dcd8691e3af1 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Wed, 22 Oct 2025 12:49:30 +0200
Subject: [PATCH 2072/6226] weblate: 5.13.3 -> 5.14

Changelog: https://github.com/WeblateOrg/weblate/releases/tag/weblate-5.14
---
 pkgs/by-name/we/weblate/package.nix | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/we/weblate/package.nix b/pkgs/by-name/we/weblate/package.nix
index a84ece94bd64..8a34ea867162 100644
--- a/pkgs/by-name/we/weblate/package.nix
+++ b/pkgs/by-name/we/weblate/package.nix
@@ -16,18 +16,13 @@
 let
   python = python3.override {
     packageOverrides = final: prev: {
-      # https://github.com/django-crispy-forms/crispy-bootstrap3/issues/12
-      django = prev.django_5_1;
-      djangorestframework = prev.djangorestframework.overridePythonAttrs (old: {
-        # https://github.com/encode/django-rest-framework/discussions/9342
-        disabledTests = (old.disabledTests or [ ]) ++ [ "test_invalid_inputs" ];
-      });
+      django = prev.django_5_2;
     };
   };
 in
 python.pkgs.buildPythonApplication rec {
   pname = "weblate";
-  version = "5.13.3";
+  version = "5.14";
 
   pyproject = true;
 
@@ -40,7 +35,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "WeblateOrg";
     repo = "weblate";
     tag = "weblate-${version}";
-    hash = "sha256-PM5h9RqCMdt0FODE7MoCWv9I+RMFTgjDmSrid59cHOA=";
+    hash = "sha256-XIaVM9bsgv6qJ1Q/6wzfO7D04WsUEkxNnJlyLd5+bY4=";
   };
 
   build-system = with python.pkgs; [ setuptools ];
@@ -68,7 +63,7 @@ python.pkgs.buildPythonApplication rec {
     '';
 
   pythonRelaxDeps = [
-    "rapidfuzz"
+    "certifi"
   ];
 
   dependencies =

From ee59f881961ce367c047fa450dbec4398d151f1c Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Thu, 23 Oct 2025 18:04:28 +0200
Subject: [PATCH 2073/6226] melonDS: fix build with Qt 6.10

---
 pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch | 15 +++++++++++++++
 pkgs/by-name/me/melonDS/package.nix             |  2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch

diff --git a/pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch b/pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch
new file mode 100644
index 000000000000..a7138372240e
--- /dev/null
+++ b/pkgs/by-name/me/melonDS/fix-build-qt-6.10.patch
@@ -0,0 +1,15 @@
+diff --git a/src/frontend/qt_sdl/CMakeLists.txt b/src/frontend/qt_sdl/CMakeLists.txt
+index 1afa856f..dcd36f84 100644
+--- a/src/frontend/qt_sdl/CMakeLists.txt
++++ b/src/frontend/qt_sdl/CMakeLists.txt
+@@ -65,6 +65,10 @@ option(USE_QT6 "Use Qt 6 instead of Qt 5" ON)
+ if (USE_QT6)
+     find_package(Qt6 COMPONENTS Core Gui Widgets Network Multimedia OpenGL OpenGLWidgets Svg REQUIRED)
+     set(QT_LINK_LIBS Qt6::Core Qt6::Gui Qt6::Widgets Qt6::Network Qt6::Multimedia Qt6::OpenGL Qt6::OpenGLWidgets)
++    if(Qt6Gui_VERSION VERSION_GREATER_EQUAL "6.10")
++        find_package(Qt6 COMPONENTS GuiPrivate REQUIRED)
++        list(APPEND QT_LINK_LIBS Qt6::GuiPrivate)
++    endif()
+ else()
+     find_package(Qt5 COMPONENTS Core Gui Widgets Network Multimedia Svg REQUIRED)
+     set(QT_LINK_LIBS Qt5::Core Qt5::Gui Qt5::Widgets Qt5::Network Qt5::Multimedia)
diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix
index 831f12648b4e..bde7555c6e54 100644
--- a/pkgs/by-name/me/melonDS/package.nix
+++ b/pkgs/by-name/me/melonDS/package.nix
@@ -38,6 +38,8 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-04Wr7xUwz6Q9JDiEfTQh6Vx5q71dFVI9rScIpt6ywGY=";
   };
 
+  patches = [ ./fix-build-qt-6.10.patch ];
+
   nativeBuildInputs = [
     cmake
     extra-cmake-modules

From 7e25e67f6b2444d59a772b9e094d975db8de3ee5 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Thu, 23 Oct 2025 18:01:41 +0200
Subject: [PATCH 2074/6226] openbao: 2.4.1 -> 2.4.3

2.4.2 was skipped because of issues upstream had with their CI.

https://github.com/openbao/openbao/releases/tag/v2.4.3

diff: https://github.com/openbao/openbao/compare/v2.4.1...v2.4.3
---
 pkgs/by-name/op/openbao/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openbao/package.nix b/pkgs/by-name/op/openbao/package.nix
index 1c57ce5a4e69..7fafe1f938b9 100644
--- a/pkgs/by-name/op/openbao/package.nix
+++ b/pkgs/by-name/op/openbao/package.nix
@@ -14,16 +14,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "openbao";
-  version = "2.4.1";
+  version = "2.4.3";
 
   src = fetchFromGitHub {
     owner = "openbao";
     repo = "openbao";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-HfPkjeScegylpA/i8KlS3t468pmD5sRwp2Ct164fkTo=";
+    hash = "sha256-gutZATBAaMXOZM/fDwU+T1fajFI/OIuKX/Na217r5y4=";
   };
 
-  vendorHash = "sha256-4SWpWGWoesUCgSpgOpblkxOpPbBC/grC2S1m7R9qasY=";
+  vendorHash = "sha256-YxpWdwaPCk5mX8ZYJVNIG9end6/HkhXeGvgEq14cErY=";
 
   proxyVendor = true;
 

From df215cd8113ec4b1c7bd3de36c9ba193d7b6300a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 16:10:33 +0000
Subject: [PATCH 2075/6226] crush: 0.11.2 -> 0.12.1

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

diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix
index 24285d6948df..0d4ec7a3bd24 100644
--- a/pkgs/by-name/cr/crush/package.nix
+++ b/pkgs/by-name/cr/crush/package.nix
@@ -9,16 +9,16 @@
 
 buildGo125Module (finalAttrs: {
   pname = "crush";
-  version = "0.11.2";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "crush";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vBjyykNSQ6Mq7OMRS0cCSHa8LUrIcfk9cr66ViU9z54=";
+    hash = "sha256-uESS76cPJ/sYGbsTpaUKlF8g0y2+LYbF4zd7dAoKWWU=";
   };
 
-  vendorHash = "sha256-KaEPF4h5XqCjh91/KmB+AoiQK+fUmGEP0Lnyfe2qEZc=";
+  vendorHash = "sha256-lqoAPp8EW2tW+QjwCuBgxZDbKT3XMvP3qwx/yES1mx4=";
 
   # rename TestMain to prevent it from running, as it panics in the sandbox.
   postPatch = ''

From 97d52c7ba32b14fcab54ca2acdacb68277964636 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 16:10:58 +0000
Subject: [PATCH 2076/6226] vscode-extensions.tabnine.tabnine-vscode: 3.320.0
 -> 3.320.4

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

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 63cb59813f4f..383f11d3f057 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4512,8 +4512,8 @@ let
         mktplcRef = {
           name = "tabnine-vscode";
           publisher = "tabnine";
-          version = "3.320.0";
-          hash = "sha256-CFkLAMSMWGSHQwD0diSTn3z+U95Y4uCSnHNMTOj+iAo=";
+          version = "3.320.4";
+          hash = "sha256-ZuJX2ybmBDya0eCvIYx90JcGweHLiWanr72xItQpSXY=";
         };
         meta = {
           license = lib.licenses.mit;

From e1fcdad9243603fda81718b825175f6d4d53f78f Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 23 Oct 2025 11:08:56 -0400
Subject: [PATCH 2077/6226] forgejo-lts: fix check failure

Uses upstream fix from v11 branch due to go 1.25.2 changes
---
 pkgs/by-name/fo/forgejo/generic.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix
index 1db5124e8fd5..b0820560c1e1 100644
--- a/pkgs/by-name/fo/forgejo/generic.nix
+++ b/pkgs/by-name/fo/forgejo/generic.nix
@@ -12,6 +12,7 @@
   bash,
   brotli,
   buildGoModule,
+  fetchpatch,
   forgejo,
   git,
   gzip,
@@ -83,6 +84,14 @@ buildGoModule rec {
 
   patches = [
     ./static-root-path.patch
+  ]
+  ++ lib.optionals lts [
+    (fetchpatch {
+      # fix for go 1.25.2 stricter ipv6 parsing, remove for LTS > 11.0.6
+      name = "fix-test-ipv6-go125.patch";
+      url = "https://codeberg.org/forgejo/forgejo/commit/0d9a8e3fa2cf9228290ed1a9a5767e6ba204edd7.patch";
+      hash = "sha256-AM4/kgCXSU5Bj8aOObm6qyeL1SEpeFhmlT42lMJ2o08=";
+    })
   ];
 
   postPatch = ''

From 75c9e6694415682eea0f73a87a269502bc7a7048 Mon Sep 17 00:00:00 2001
From: Eric Helgeson <erichelgeson@gmail.com>
Date: Thu, 23 Oct 2025 11:23:15 -0500
Subject: [PATCH 2078/6226] rpcs3: Add upstream patch for Qt 6.10+

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

diff --git a/pkgs/by-name/rp/rpcs3/package.nix b/pkgs/by-name/rp/rpcs3/package.nix
index ed68bcb2ec19..109f71454fe2 100644
--- a/pkgs/by-name/rp/rpcs3/package.nix
+++ b/pkgs/by-name/rp/rpcs3/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchFromGitHub,
   nix-update-script,
   cmake,
@@ -148,6 +149,14 @@ stdenv.mkDerivation (finalAttrs: {
     qtwayland
   ];
 
+  patches = [
+    (fetchpatch {
+      name = "fix-build-qt-6.10.patch";
+      url = "https://github.com/RPCS3/rpcs3/commit/038ee090b731bf63917371a3586c2f7d7cf4e585.patch";
+      hash = "sha256-jTIxsheG9b9zp0JEeWQ73BunAXmEIg5tj4SrWBfdHy8=";
+    })
+  ];
+
   doInstallCheck = true;
 
   preFixup = ''

From dd207a94bea4679948e37183fb6ad89c40dd79f1 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Wed, 15 Oct 2025 15:18:48 +0000
Subject: [PATCH 2079/6226] pcsx2: fix build with Qt 6.10

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/pc/pcsx2/fix-qt-6.10.patch | 25 +++++++++++++++++++++++++
 pkgs/by-name/pc/pcsx2/package.nix       |  3 +++
 2 files changed, 28 insertions(+)
 create mode 100644 pkgs/by-name/pc/pcsx2/fix-qt-6.10.patch

diff --git a/pkgs/by-name/pc/pcsx2/fix-qt-6.10.patch b/pkgs/by-name/pc/pcsx2/fix-qt-6.10.patch
new file mode 100644
index 000000000000..06341689c453
--- /dev/null
+++ b/pkgs/by-name/pc/pcsx2/fix-qt-6.10.patch
@@ -0,0 +1,25 @@
+diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
+index 504b7a3..100a024 100644
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -107,7 +107,7 @@ disable_compiler_warnings_for_target(cubeb)
+ disable_compiler_warnings_for_target(speex)
+ 
+ # Find the Qt components that we need.
+-find_package(Qt6 6.7.3 COMPONENTS CoreTools Core GuiTools Gui WidgetsTools Widgets LinguistTools REQUIRED)
++find_package(Qt6 6.7.3 COMPONENTS CoreTools Core CorePrivate GuiTools Gui GuiPrivate WidgetsTools Widgets WidgetsPrivate LinguistTools REQUIRED)
+ 
+ if(WIN32)
+   add_subdirectory(3rdparty/rainterface EXCLUDE_FROM_ALL)
+diff --git a/pcsx2-qt/CMakeLists.txt b/pcsx2-qt/CMakeLists.txt
+index a62df95..4883c64 100644
+--- a/pcsx2-qt/CMakeLists.txt
++++ b/pcsx2-qt/CMakeLists.txt
+@@ -266,6 +266,7 @@ target_link_libraries(pcsx2-qt PRIVATE
+ 	Qt6::Core
+ 	Qt6::Gui
+ 	Qt6::Widgets
++	Qt6::GuiPrivate
+ 	KDAB::kddockwidgets
+ )
+ 
diff --git a/pkgs/by-name/pc/pcsx2/package.nix b/pkgs/by-name/pc/pcsx2/package.nix
index 16e9aeabf1f6..daddd2f377eb 100644
--- a/pkgs/by-name/pc/pcsx2/package.nix
+++ b/pkgs/by-name/pc/pcsx2/package.nix
@@ -63,6 +63,9 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     ./0000-define-rev.patch
 
     ./remove-cubeb-vendor.patch
+
+    # Based on https://github.com/PCSX2/pcsx2/commit/8dffc857079e942ca77b091486c20c3c6530e4ed which doesn't apply cleanly
+    ./fix-qt-6.10.patch
   ];
 
   cmakeFlags = [

From 5bbfe68fedaa6734940781a54c8576c05209c9a3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 16:49:29 +0000
Subject: [PATCH 2080/6226] codebook: 0.3.14 -> 0.3.15

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

diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix
index be7ee8b049cb..bc35fe20a220 100644
--- a/pkgs/by-name/co/codebook/package.nix
+++ b/pkgs/by-name/co/codebook/package.nix
@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codebook";
-  version = "0.3.14";
+  version = "0.3.15";
 
   src = fetchFromGitHub {
     owner = "blopker";
     repo = "codebook";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XS4neGqi0tLzs53jV37mDsfC8bAXwpqinoe3gT8GYZw=";
+    hash = "sha256-Sv1rB6Jvg+FX5NuWr4jwCwLdVPuub8OK1+Nin2D4XVY=";
   };
 
   buildAndTestSubdir = "crates/codebook-lsp";
-  cargoHash = "sha256-39ROafYvaTL3wZCUyycGV0PCnR/mr+rJK3/lrvfqKIM=";
+  cargoHash = "sha256-DRXTCquhGhNIby+HMQZGF8NWAbto5Egaij6jDVwnSHQ=";
 
   # Integration tests require internet access for dictionaries
   doCheck = false;

From 742b1d432c3659a0cb76d1ba316cb724b0f32977 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 16:59:41 +0000
Subject: [PATCH 2081/6226] shogihome: 1.25.0 -> 1.25.1

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

diff --git a/pkgs/by-name/sh/shogihome/package.nix b/pkgs/by-name/sh/shogihome/package.nix
index e90d2b63b645..71e9ce12297d 100644
--- a/pkgs/by-name/sh/shogihome/package.nix
+++ b/pkgs/by-name/sh/shogihome/package.nix
@@ -22,16 +22,16 @@ let
 in
 buildNpmPackage (finalAttrs: {
   pname = "shogihome";
-  version = "1.25.0";
+  version = "1.25.1";
 
   src = fetchFromGitHub {
     owner = "sunfish-shogi";
     repo = "shogihome";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Qa8ykN514Moc/PpBhD/X+mzfclQPp3yiriwTJCtmMA8=";
+    hash = "sha256-CRPZmycYaKtqjjiISKVGLf2jUvM6Xk6cUryKZcFX3tc=";
   };
 
-  npmDepsHash = "sha256-rcrj3dG96oNbmp3cXw1qRJPi1SZdBcG9paAShSfb/0E=";
+  npmDepsHash = "sha256-8v6r3DAUzNeMQqLl99mp5rUytbUe7wFj3jkHb6lbwFI=";
 
   postPatch = ''
     substituteInPlace package.json \

From 13c33dc3659cb6a73bca87232207d2d44ec01e74 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Thu, 23 Oct 2025 19:59:49 +0300
Subject: [PATCH 2082/6226] ncdu: fix infinite loop on Zig 0.15.2

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

diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix
index 850f03521303..ddc2ab69c617 100644
--- a/pkgs/by-name/nc/ncdu/package.nix
+++ b/pkgs/by-name/nc/ncdu/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchurl,
+  fetchpatch2,
   ncurses,
   pkg-config,
   zig_0_15,
@@ -20,6 +21,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-v9EJThQA7onP1ZIA6rlA8CXM3AwjgGcQXJhKPEhXv34=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      # Fix infinite loop when reading config file on Zig 0.15.2
+      url = "https://code.blicky.net/yorhel/ncdu/commit/f45224457687a55aa885aca8e7300f1fbf0af59b.patch";
+      hash = "sha256-80Igx1MOINdeufCsNoisNo3dJ2iUTpZIxyXy/KzQ1Ng=";
+    })
+  ];
+
   nativeBuildInputs = [
     zig_0_15.hook
     installShellFiles

From 93ea59f66d5e33c0734f2c8f27d7b3c0b4207ab3 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Thu, 23 Oct 2025 18:31:35 +0200
Subject: [PATCH 2083/6226] lib/modules: Report error for unsupported // {
 check }

`check` can have a new place since the introduction of
merge.v2. This makes the // { check = ... } idiom unreliable.

In this PR we add checks to detect and report this.

merge.v2 introduced in:
https://github.com/NixOS/nixpkgs/pull/391544

Real world case:
https://hercules-ci.com/github/hercules-ci/hercules-ci-effects/jobs/875
---
 lib/modules.nix                          |  34 ++++++-
 lib/tests/modules.sh                     |  19 ++++
 lib/tests/modules/v2-check-coherence.nix | 117 +++++++++++++++++++++++
 lib/types.nix                            |  83 ++++++++++++----
 4 files changed, 232 insertions(+), 21 deletions(-)
 create mode 100644 lib/tests/modules/v2-check-coherence.nix

diff --git a/lib/modules.nix b/lib/modules.nix
index 42e88dbbf625..09f0908a69da 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -1126,6 +1126,29 @@ let
       __toString = _: showOption loc;
     };
 
+  # Check that a type with v2 merge has a coherent check attribute.
+  # Throws an error if the type uses an ad-hoc `type // { check }` override.
+  # Returns the last argument like `seq`, allowing usage: checkV2MergeCoherence loc type expr
+  checkV2MergeCoherence =
+    loc: type: result:
+    if type.check.isV2MergeCoherent or false then
+      result
+    else
+      throw ''
+        The option `${showOption loc}' has a type `${type.description}' that uses
+        an ad-hoc `type // { check = ...; }' override, which is incompatible with
+        the v2 merge mechanism.
+
+        Please use `lib.types.addCheck` instead of `type // { check }' to add
+        custom validation. For example:
+
+          lib.types.addCheck baseType (value: /* your check */)
+
+        instead of:
+
+          baseType // { check = value: /* your check */; }
+      '';
+
   # Merge definitions of a value of a given type.
   mergeDefinitions = loc: type: defs: rec {
     defsFinal' =
@@ -1201,10 +1224,13 @@ let
         (
           if type.merge ? v2 then
             let
-              r = type.merge.v2 {
-                inherit loc;
-                defs = defsFinal;
-              };
+              # Check for v2 merge coherence
+              r = checkV2MergeCoherence loc type (
+                type.merge.v2 {
+                  inherit loc;
+                  defs = defsFinal;
+                }
+              );
             in
             r
             // {
diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 5cd781752317..02f73310dd9b 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -806,6 +806,25 @@ checkConfigError 'A definition for option .* is not of type .signed integer.*' c
 checkConfigOutput '^true$' config.v2checkedPass ./add-check.nix
 checkConfigError 'A definition for option .* is not of type .attribute set of signed integer.*' config.v2checkedFail ./add-check.nix
 
+# v2 merge check coherence
+# Tests checkV2MergeCoherence call in modules.nix (mergeDefinitions for lazyAttrsOf)
+checkConfigError 'ad-hoc.*override.*incompatible' config.adhocFail.foo ./v2-check-coherence.nix
+# Tests checkV2MergeCoherence call in modules.nix (mergeDefinitions for lazyAttrsOf)
+checkConfigError 'ad-hoc.*override.*incompatible' config.adhocOuterFail.bar ./v2-check-coherence.nix
+# Tests checkV2MergeCoherence call in types.nix (either t1)
+checkConfigError 'ad-hoc.*override.*incompatible' config.eitherLeftFail ./v2-check-coherence.nix
+# Tests checkV2MergeCoherence call in types.nix (either t2)
+checkConfigError 'ad-hoc.*override.*incompatible' config.eitherRightFail ./v2-check-coherence.nix
+# Tests checkV2MergeCoherence call in types.nix (coercedTo coercedType)
+checkConfigError 'ad-hoc.*override.*incompatible' config.coercedFromFail.bar ./v2-check-coherence.nix
+# Tests checkV2MergeCoherence call in types.nix (coercedTo finalType)
+checkConfigError 'ad-hoc.*override.*incompatible' config.coercedToFail.foo ./v2-check-coherence.nix
+# Tests checkV2MergeCoherence call in types.nix (addCheck elemType)
+checkConfigError 'ad-hoc.*override.*incompatible' config.addCheckNested.foo ./v2-check-coherence.nix
+checkConfigError 'Please use.*lib.types.addCheck.*instead' config.adhocFail.foo ./v2-check-coherence.nix
+checkConfigError 'A definition for option .* is not of type .*' config.addCheckFail.bar.baz ./v2-check-coherence.nix
+checkConfigOutput '^true$' config.result ./v2-check-coherence.nix
+
 
 cat <<EOF
 ====== module tests ======
diff --git a/lib/tests/modules/v2-check-coherence.nix b/lib/tests/modules/v2-check-coherence.nix
new file mode 100644
index 000000000000..60e134ff483e
--- /dev/null
+++ b/lib/tests/modules/v2-check-coherence.nix
@@ -0,0 +1,117 @@
+# Tests for v2 merge check coherence
+{ lib, ... }:
+let
+  inherit (lib) types mkOption;
+
+  # The problematic pattern: overriding check with //
+  # This inner type should reject everything (check always returns false)
+  adhocOverrideType = (types.lazyAttrsOf types.raw) // {
+    check = _: false;
+  };
+
+  # Using addCheck is the correct way to add custom checks
+  properlyCheckedType = types.addCheck (types.lazyAttrsOf types.raw) (v: v ? foo);
+
+  # Using addCheck with a check that will fail
+  failingCheckedType = types.addCheck (types.lazyAttrsOf types.raw) (v: v ? foo);
+
+  # Ad-hoc override on outer type
+  adhocOuterType = types.lazyAttrsOf types.int // {
+    check = _: false;
+  };
+
+  # Ad-hoc override on left side of either
+  adhocEitherLeft = types.lazyAttrsOf types.raw // {
+    check = _: false;
+  };
+
+  # Ad-hoc override on coercedType in coercedTo
+  adhocCoercedFrom = types.lazyAttrsOf types.raw // {
+    check = _: false;
+  };
+
+  # Ad-hoc override on finalType in coercedTo
+  adhocCoercedTo = types.lazyAttrsOf types.raw // {
+    check = _: false;
+  };
+
+  # Ad-hoc override wrapped in addCheck
+  adhocAddCheck = types.addCheck (types.lazyAttrsOf types.raw // { check = _: false; }) (v: true);
+in
+{
+  # Test 1: Ad-hoc check override in nested type should be detected
+  options.adhocFail = mkOption {
+    type = types.lazyAttrsOf adhocOverrideType;
+    default = { };
+  };
+  config.adhocFail = {
+    foo = { };
+  };
+
+  # Test 1b: Ad-hoc check override in outer type should be detected
+  options.adhocOuterFail = mkOption {
+    type = adhocOuterType;
+    default = { };
+  };
+  config.adhocOuterFail.bar = 42;
+
+  # Test 1c: Ad-hoc check override on left side of either type
+  options.eitherLeftFail = mkOption {
+    type = types.either adhocEitherLeft types.int;
+  };
+  config.eitherLeftFail.foo = { };
+
+  # Test 1d: Ad-hoc check override on right side of either type
+  options.eitherRightFail = mkOption {
+    type = types.either types.int (types.lazyAttrsOf types.raw // { check = _: false; });
+  };
+  config.eitherRightFail.foo = { };
+
+  # Test 1e: Ad-hoc check override on coercedType in coercedTo
+  options.coercedFromFail = mkOption {
+    type = types.coercedTo adhocCoercedFrom (x: { bar = 1; }) (types.lazyAttrsOf types.int);
+  };
+  config.coercedFromFail = {
+    foo = { };
+  };
+
+  # Test 1f: Ad-hoc check override on finalType in coercedTo
+  options.coercedToFail = mkOption {
+    type = types.coercedTo types.str (x: { }) adhocCoercedTo;
+  };
+  config.coercedToFail.foo = { };
+
+  # Test 1g: Ad-hoc check override wrapped in addCheck
+  options.addCheckNested = mkOption {
+    type = adhocAddCheck;
+  };
+  config.addCheckNested.foo = { };
+
+  # Test 2: Using addCheck should work correctly
+  options.addCheckPass = mkOption {
+    type = types.lazyAttrsOf properlyCheckedType;
+    default = { };
+  };
+  config.addCheckPass.bar.foo = "value";
+
+  # Test 3: addCheck should validate values properly
+  options.addCheckFail = mkOption {
+    type = types.lazyAttrsOf failingCheckedType;
+    default = { };
+  };
+  config.addCheckFail.bar.baz = "value"; # Missing required 'foo' attribute
+
+  # Test 4: Normal v2 types should work without coherence errors
+  options.normalPass = mkOption {
+    type = types.lazyAttrsOf (types.attrsOf types.int);
+    default = { };
+  };
+  config.normalPass.foo.bar = 42;
+
+  # Success assertion - only checks things that should succeed
+  options.result = mkOption {
+    type = types.bool;
+    default = false;
+  };
+  config.result = true;
+}
diff --git a/lib/types.nix b/lib/types.nix
index ae77c9fcf8cb..db4c2ddb97f3 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -106,6 +106,29 @@ let
     in
     if invalidDefs != [ ] then { message = "Definition values: ${showDefs invalidDefs}"; } else null;
 
+  # Check that a type with v2 merge has a coherent check attribute.
+  # Throws an error if the type uses an ad-hoc `type // { check }` override.
+  # Returns the last argument like `seq`, allowing usage: checkV2MergeCoherence loc type expr
+  checkV2MergeCoherence =
+    loc: type: result:
+    if type.check.isV2MergeCoherent or false then
+      result
+    else
+      throw ''
+        The option `${showOption loc}' has a type `${type.description}' that uses
+        an ad-hoc `type // { check = ...; }' override, which is incompatible with
+        the v2 merge mechanism.
+
+        Please use `lib.types.addCheck` instead of `type // { check }' to add
+        custom validation. For example:
+
+          lib.types.addCheck baseType (value: /* your check */)
+
+        instead of:
+
+          baseType // { check = value: /* your check */; }
+      '';
+
   outer_types = rec {
     isType = type: x: (x._type or "") == type;
 
@@ -711,7 +734,10 @@ let
             optionDescriptionPhrase (class: class == "noun" || class == "composite") elemType
           }";
           descriptionClass = "composite";
-          check = isList;
+          check = {
+            __functor = _self: isList;
+            isV2MergeCoherent = true;
+          };
           merge = {
             __functor =
               self: loc: defs:
@@ -824,7 +850,10 @@ let
             (if lazy then "lazy attribute set" else "attribute set")
             + " of ${optionDescriptionPhrase (class: class == "noun" || class == "composite") elemType}";
           descriptionClass = "composite";
-          check = isAttrs;
+          check = {
+            __functor = _self: isAttrs;
+            isV2MergeCoherent = true;
+          };
           merge = {
             __functor =
               self: loc: defs:
@@ -1236,7 +1265,10 @@ let
 
           name = "submodule";
 
-          check = x: isAttrs x || isFunction x || path.check x;
+          check = {
+            __functor = _self: x: isAttrs x || isFunction x || path.check x;
+            isV2MergeCoherent = true;
+          };
         in
         mkOptionType {
           inherit name;
@@ -1420,7 +1452,10 @@ let
                 ) t2
               }";
           descriptionClass = "conjunction";
-          check = x: t1.check x || t2.check x;
+          check = {
+            __functor = _self: x: t1.check x || t2.check x;
+            isV2MergeCoherent = true;
+          };
           merge = {
             __functor =
               self: loc: defs:
@@ -1430,7 +1465,7 @@ let
               let
                 t1CheckedAndMerged =
                   if t1.merge ? v2 then
-                    t1.merge.v2 { inherit loc defs; }
+                    checkV2MergeCoherence loc t1 (t1.merge.v2 { inherit loc defs; })
                   else
                     {
                       value = t1.merge loc defs;
@@ -1439,7 +1474,7 @@ let
                     };
                 t2CheckedAndMerged =
                   if t2.merge ? v2 then
-                    t2.merge.v2 { inherit loc defs; }
+                    checkV2MergeCoherence loc t2 (t2.merge.v2 { inherit loc defs; })
                   else
                     {
                       value = t2.merge loc defs;
@@ -1509,7 +1544,10 @@ let
           description = "${optionDescriptionPhrase (class: class == "noun") finalType} or ${
             optionDescriptionPhrase (class: class == "noun") coercedType
           } convertible to it";
-          check = x: (coercedType.check x && finalType.check (coerceFunc x)) || finalType.check x;
+          check = {
+            __functor = _self: x: (coercedType.check x && finalType.check (coerceFunc x)) || finalType.check x;
+            isV2MergeCoherent = true;
+          };
           merge = {
             __functor =
               self: loc: defs:
@@ -1524,10 +1562,16 @@ let
                     // {
                       value =
                         let
-                          merged = coercedType.merge.v2 {
-                            inherit loc;
-                            defs = [ def ];
-                          };
+                          merged =
+                            if coercedType.merge ? v2 then
+                              checkV2MergeCoherence loc coercedType (
+                                coercedType.merge.v2 {
+                                  inherit loc;
+                                  defs = [ def ];
+                                }
+                              )
+                            else
+                              null;
                         in
                         if coercedType.merge ? v2 then
                           if merged.headError == null then coerceFunc def.value else def.value
@@ -1540,10 +1584,12 @@ let
                 );
               in
               if finalType.merge ? v2 then
-                finalType.merge.v2 {
-                  inherit loc;
-                  defs = finalDefs;
-                }
+                checkV2MergeCoherence loc finalType (
+                  finalType.merge.v2 {
+                    inherit loc;
+                    defs = finalDefs;
+                  }
+                )
               else
                 {
                   value = finalType.merge loc finalDefs;
@@ -1576,7 +1622,10 @@ let
         if elemType.merge ? v2 then
           elemType
           // {
-            check = x: elemType.check x && check x;
+            check = {
+              __functor = _self: x: elemType.check x && check x;
+              isV2MergeCoherent = true;
+            };
             merge = {
               __functor =
                 self: loc: defs:
@@ -1584,7 +1633,7 @@ let
               v2 =
                 { loc, defs }:
                 let
-                  orig = elemType.merge.v2 { inherit loc defs; };
+                  orig = checkV2MergeCoherence loc elemType (elemType.merge.v2 { inherit loc defs; });
                   headError' = if orig.headError != null then orig.headError else checkDefsForError check loc defs;
                 in
                 orig

From 6016da54d8a4c468cab330247aaaa435e35369bf Mon Sep 17 00:00:00 2001
From: Qiming Chu <cchuqiming@gmail.com>
Date: Wed, 10 Sep 2025 15:33:46 +0800
Subject: [PATCH 2084/6226] ieda: 0-unstable-2025-06-30 ->
 0.1.0-unstable-2025-09-10

- iEDA released v0.1.0 at 2025-07-02:
https://gitee.com/oscc-project/iEDA/releases/tag/v0.1.0
- Remove postPatch to patches and update patches
- Add pkg-config, curl and tbb_2021 as dependencies

Signed-off-by: Qiming Chu <cchuqiming@gmail.com>
---
 pkgs/by-name/ie/ieda/fix-cmake-require.patch | 96 ++++++++++++++++++++
 pkgs/by-name/ie/ieda/package.nix             | 43 +++++----
 2 files changed, 119 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/by-name/ie/ieda/fix-cmake-require.patch

diff --git a/pkgs/by-name/ie/ieda/fix-cmake-require.patch b/pkgs/by-name/ie/ieda/fix-cmake-require.patch
new file mode 100644
index 000000000000..0810e40f6c08
--- /dev/null
+++ b/pkgs/by-name/ie/ieda/fix-cmake-require.patch
@@ -0,0 +1,96 @@
+diff --git a/src/operation/iPNP/CMakeLists.txt b/src/operation/iPNP/CMakeLists.txt
+index b8f308a6e..4749d5024 100644
+--- a/src/operation/iPNP/CMakeLists.txt
++++ b/src/operation/iPNP/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.5)
+ set (CMAKE_CXX_STANDARD 20)
+ 
+ add_subdirectory(api)
+diff --git a/src/third_party/pybind11/CMakeLists.txt b/src/third_party/pybind11/CMakeLists.txt
+index 0d9320388..5b5967713 100644
+--- a/src/third_party/pybind11/CMakeLists.txt
++++ b/src/third_party/pybind11/CMakeLists.txt
+@@ -5,7 +5,7 @@
+ # All rights reserved. Use of this source code is governed by a
+ # BSD-style license that can be found in the LICENSE file.
+ 
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # The `cmake_minimum_required(VERSION 3.4...3.22)` syntax does not work with
+ # some versions of VS that have a patched CMake 3.11. This forces us to emulate
+diff --git a/src/third_party/pybind11/tests/CMakeLists.txt b/src/third_party/pybind11/tests/CMakeLists.txt
+index 9beb268ed..417cd04d0 100644
+--- a/src/third_party/pybind11/tests/CMakeLists.txt
++++ b/src/third_party/pybind11/tests/CMakeLists.txt
+@@ -5,7 +5,7 @@
+ # All rights reserved. Use of this source code is governed by a
+ # BSD-style license that can be found in the LICENSE file.
+ 
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
+ # some versions of VS that have a patched CMake 3.11. This forces us to emulate
+diff --git a/src/third_party/pybind11/tests/test_cmake_build/installed_embed/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/installed_embed/CMakeLists.txt
+index f7d693998..2847142a4 100644
+--- a/src/third_party/pybind11/tests/test_cmake_build/installed_embed/CMakeLists.txt
++++ b/src/third_party/pybind11/tests/test_cmake_build/installed_embed/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
+ # some versions of VS that have a patched CMake 3.11. This forces us to emulate
+diff --git a/src/third_party/pybind11/tests/test_cmake_build/installed_function/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/installed_function/CMakeLists.txt
+index d7ca4db55..74322f598 100644
+--- a/src/third_party/pybind11/tests/test_cmake_build/installed_function/CMakeLists.txt
++++ b/src/third_party/pybind11/tests/test_cmake_build/installed_function/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.5)
+ project(test_installed_module CXX)
+ 
+ # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
+diff --git a/src/third_party/pybind11/tests/test_cmake_build/installed_target/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/installed_target/CMakeLists.txt
+index bc5e101f1..2d21a21de 100644
+--- a/src/third_party/pybind11/tests/test_cmake_build/installed_target/CMakeLists.txt
++++ b/src/third_party/pybind11/tests/test_cmake_build/installed_target/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
+ # some versions of VS that have a patched CMake 3.11. This forces us to emulate
+diff --git a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt
+index 58cdd7cfd..f9835f31e 100644
+--- a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt
++++ b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_embed/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
+ # some versions of VS that have a patched CMake 3.11. This forces us to emulate
+diff --git a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_function/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_function/CMakeLists.txt
+index 01557c439..6d96cc3b3 100644
+--- a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_function/CMakeLists.txt
++++ b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_function/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
+ # some versions of VS that have a patched CMake 3.11. This forces us to emulate
+diff --git a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt
+index ba82fdee2..6f8e04429 100644
+--- a/src/third_party/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt
++++ b/src/third_party/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.4)
++cmake_minimum_required(VERSION 3.5)
+ 
+ # The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
+ # some versions of VS that have a patched CMake 3.11. This forces us to emulate
diff --git a/pkgs/by-name/ie/ieda/package.nix b/pkgs/by-name/ie/ieda/package.nix
index 9efef4c1c61e..b33a3cefa371 100644
--- a/pkgs/by-name/ie/ieda/package.nix
+++ b/pkgs/by-name/ie/ieda/package.nix
@@ -21,38 +21,38 @@
   gmp,
   python3,
   onnxruntime,
+  pkg-config,
+  curl,
+  onetbb,
 }:
 let
   rootSrc = stdenv.mkDerivation {
     pname = "iEDA-src";
-    version = "2025-06-30";
+    version = "2025-09-10";
     src = fetchgit {
       url = "https://gitee.com/oscc-project/iEDA";
-      rev = "689f172c726c3934d49577f09adb5b09804f11e5";
-      sha256 = "sha256-JJePIn+NUScb+3o67vT31BoKHcfBuE9osV4SrcicFds=";
+      rev = "614a91b4d18ba7dc561315f2d5fdae4a5451f486";
+      sha256 = "sha256-xn1hpnSyO+jauYYhlsKjBkkD3RJ1GqbHtnWRe/My1R0=";
     };
 
     patches = [
       # This patch is to fix the build error caused by the missing of the header file,
       # and remove some libs or path that they hard-coded in the source code.
-      # Should be removed after we upstream these changes.
+      # Due to the way they organized the source code, it's hard to upstream this patch.
+      # So we have to maintain this patch locally.
       (fetchpatch {
-        url = "https://github.com/Emin017/iEDA/commit/c17e42a3673afd9c7ace9374f85290a85354bb78.patch";
-        hash = "sha256-xa1oSy3OZ5r0TigGywzpVPvpPnA7L6RIcNktfFen4AA=";
+        url = "https://github.com/Emin017/iEDA/commit/c6b642f3db6c156eaf4f1203612592c86e49e1b5.patch";
+        hash = "sha256-L0bmW7kadmLLng9rZOT1NpvniBpuD8SUqCfeH2cCrdg=";
       })
-      # This patch is to fix the compile error on the newer version of gcc/g++
-      # We remove some forward declarations which are not allowed in newer versions of gcc/g++
-      # Should be removed after we upstream these changes.
-      (fetchpatch {
-        url = "https://github.com/Emin017/iEDA/commit/f5464cc40a2c671c5d405f16b509e2fa8d54f7f1.patch";
-        hash = "sha256-uVMV/CjkX9oLexHJbQvnEDOET/ZqsEPreI6EQb3Z79s=";
-      })
-    ];
-
-    postPatch = ''
       # Comment out the iCTS test cases that will fail due to some linking issues on aarch64-linux
-      sed -i '17,28s/^/# /' src/operation/iCTS/test/CMakeLists.txt
-    '';
+      (fetchpatch {
+        url = "https://github.com/Emin017/iEDA/commit/87c5dded74bc452249e8e69f4a77dd1bed7445c2.patch";
+        hash = "sha256-1Hd0DYnB5lVAoAcB1la5tDlox4cuQqApWDiiWtqWN0Q=";
+      })
+      # Fix CMake version requirement to support newer CMake versions,
+      # Should be removed once upstream fixed it.
+      ./fix-cmake-require.patch
+    ];
 
     dontBuild = true;
     dontFixup = true;
@@ -66,7 +66,7 @@ let
 in
 stdenv.mkDerivation {
   pname = "iEDA";
-  version = "0-unstable-2025-06-30";
+  version = "0.1.0-unstable-2025-09-10";
 
   src = rootSrc;
 
@@ -77,6 +77,7 @@ stdenv.mkDerivation {
     bison
     python3
     tcl
+    pkg-config
   ];
 
   cmakeFlags = [
@@ -108,6 +109,8 @@ stdenv.mkDerivation {
     gmp
     tcl
     zlib
+    curl
+    onetbb
   ];
 
   postInstall = ''
@@ -128,7 +131,7 @@ stdenv.mkDerivation {
     runHook postInstallCheck
   '';
 
-  doInstallCheck = true;
+  doInstallCheck = !stdenv.hostPlatform.isAarch64; # Tests will fail on aarch64-linux, wait for upstream fix: https://github.com/microsoft/onnxruntime/issues/10038
 
   enableParallelBuild = true;
 

From 5ead8acd4fb8cbc9a3c038867a04cf2fc220d99a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 17:11:54 +0000
Subject: [PATCH 2085/6226] roave-backward-compatibility-check: 8.14.0 ->
 8.15.0

---
 .../ro/roave-backward-compatibility-check/package.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
index 2c1c0a83957d..cf2f87d731a9 100644
--- a/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
+++ b/pkgs/by-name/ro/roave-backward-compatibility-check/package.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "roave-backward-compatibility-check";
-  version = "8.14.0";
+  version = "8.15.0";
 
   src = fetchFromGitHub {
     owner = "Roave";
     repo = "BackwardCompatibilityCheck";
     tag = finalAttrs.version;
-    hash = "sha256-4rhIaPdyyLiIhVYC4KNKbPAbVsHKnK6BOsebFjmmDeI=";
+    hash = "sha256-vhoV8AkkcL1pDmHkpPYs5lD6TUcvMC6BXkQF1T2esIE=";
   };
 
-  vendorHash = "sha256-uZqstfVp5uY7Sec32XLK7RvuUtP8Hj21W7tayhhuf2g=";
+  vendorHash = "sha256-ADqWN0cF9hB+s9rfza0bQ3pB6NZ9NMzvDhN8sdL3Sg8=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 5ff4f029330c6d901d37aa9dcb1a54cc011a1842 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 17:19:53 +0000
Subject: [PATCH 2086/6226] python3Packages.netutils: 1.15.0 -> 1.15.1

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

diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix
index 87db48b04087..db49824623ab 100644
--- a/pkgs/development/python-modules/netutils/default.nix
+++ b/pkgs/development/python-modules/netutils/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "netutils";
-  version = "1.15.0";
+  version = "1.15.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "networktocode";
     repo = "netutils";
     tag = "v${version}";
-    hash = "sha256-BdxmzxnuccAb8BiE48KSYLXJzAaz7eSYMJA2bgSbWj4=";
+    hash = "sha256-bT/a6PhjNZ7vYXio7XOKNnzRfh7UqRn3+OYbhlYL3/I=";
   };
 
   build-system = [ poetry-core ];

From 0a01bb19d22e84b6517099fe0ecbdf52f776ec9d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 17:27:45 +0000
Subject: [PATCH 2087/6226] kubetui: 1.9.1 -> 1.10.0

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

diff --git a/pkgs/by-name/ku/kubetui/package.nix b/pkgs/by-name/ku/kubetui/package.nix
index 85dad428b3d4..50247a5ced0f 100644
--- a/pkgs/by-name/ku/kubetui/package.nix
+++ b/pkgs/by-name/ku/kubetui/package.nix
@@ -6,20 +6,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "kubetui";
-  version = "1.9.1";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "sarub0b0";
     repo = "kubetui";
     tag = "v${version}";
-    hash = "sha256-2bcFame21oj8kYJaGiBHcZspplLIDuag64AbLGwOvQs=";
+    hash = "sha256-/gKz83IygwDcfE7AQbQCTfNT1vSRVvxyCz4JVAEcYoY=";
   };
 
   checkFlags = [
     "--skip=workers::kube::store::tests::kubeconfigからstateを生成"
   ];
 
-  cargoHash = "sha256-PzGlTTx5cVnMoUx0VQi+s8VHNV/PJDu6bm1TZuHbaoE=";
+  cargoHash = "sha256-W5EDeeK8oaubxgRnnuR7ef8XRvORGyv5xfSkSHZKIPc=";
 
   meta = {
     homepage = "https://github.com/sarub0b0/kubetui";

From a21632529169c453417161151697318658d4c66d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Thu, 23 Oct 2025 18:26:57 +0100
Subject: [PATCH 2088/6226] esphome: 2025.9.3 -> 2025.10.2

---
 pkgs/by-name/es/esphome/dashboard.nix | 6 +++---
 pkgs/by-name/es/esphome/package.nix   | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/es/esphome/dashboard.nix b/pkgs/by-name/es/esphome/dashboard.nix
index 301bb8ae675b..56fe472dba8d 100644
--- a/pkgs/by-name/es/esphome/dashboard.nix
+++ b/pkgs/by-name/es/esphome/dashboard.nix
@@ -13,19 +13,19 @@
 
 buildPythonPackage rec {
   pname = "esphome-dashboard";
-  version = "20250814.0";
+  version = "20251013.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "dashboard";
     rev = "refs/tags/${version}";
-    hash = "sha256-WQsyv3s3LKKOwYEkX5GcAPnbH061q1ts7TU4HU6I8CI=";
+    hash = "sha256-PZf9YLtHqeR+5BRVv1yOMVt6NVlbJTj98ukGnO0RV0Q=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit src;
-    hash = "sha256-ShuJPS7qP2XZ3lwJrFeKRkQwX7tvyiC/0L7sGn0cMn8=";
+    hash = "sha256-wWDM4ODlZAjjDonzS4czdBPBaRS0Px2KUlE4AfsqNIQ=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index 5cc5a34e8202..15b30e08b904 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -34,14 +34,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2025.9.3";
+  version = "2025.10.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "esphome";
     tag = version;
-    hash = "sha256-9x4uf0gHCGYLq0gr0MoAp0sk9p82zdH41PaELph0fv0=";
+    hash = "sha256-aHDBRZ6o671zriV/rwgsZ57y91Z8Lwx/iiPhIHPzKbs=";
   };
 
   patches = [
@@ -171,6 +171,11 @@ python.pkgs.buildPythonApplication rec {
     # tries to import platformio, which is wrapped in an fhsenv
     "test_clean_build"
     "test_clean_build_empty_cache_dir"
+    "test_clean_all"
+    "test_clean_all_partial_exists"
+    # tries to use esptool, which is wrapped in an fhsenv
+    "test_upload_using_esptool_path_conversion"
+    "test_upload_using_esptool_with_file_path"
     # AssertionError: Expected 'run_external_command' to have been called once. Called 0 times.
     "test_run_platformio_cli_sets_environment_variables"
   ];

From 23040405a3e3119643b5a31975471f208796b331 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 23 Oct 2025 19:29:41 +0200
Subject: [PATCH 2089/6226] lasuite-meet{,-frontend}: 0.1.40 -> 0.1.41

https://github.com/suitenumerique/meet/releases/tag/v0.1.41
---
 pkgs/by-name/la/lasuite-meet-frontend/package.nix | 6 +++---
 pkgs/by-name/la/lasuite-meet/package.nix          | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/la/lasuite-meet-frontend/package.nix b/pkgs/by-name/la/lasuite-meet-frontend/package.nix
index 26692e8ae380..4ef971de43d3 100644
--- a/pkgs/by-name/la/lasuite-meet-frontend/package.nix
+++ b/pkgs/by-name/la/lasuite-meet-frontend/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage rec {
   pname = "lasuite-meet-frontend";
-  version = "0.1.40";
+  version = "0.1.41";
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "meet";
     tag = "v${version}";
-    hash = "sha256-jzMjLiNLLBBHo9/c/ufB59V6qMwjpx38sImFR+Q+wBE=";
+    hash = "sha256-QAzkRbAxtHa7Py4DDSc2/QHHyFHp+e+/uGmGzUPtFPI=";
   };
 
   sourceRoot = "source/src/frontend";
@@ -21,7 +21,7 @@ buildNpmPackage rec {
   npmDeps = fetchNpmDeps {
     inherit version src;
     sourceRoot = "source/src/frontend";
-    hash = "sha256-RtzLa0SPd76/8ml8R55Hx1MMwFcfDIt6wtcjKAGMDuI=";
+    hash = "sha256-UJMyOCtjr7e6YaRdIrlL+p3alw4k/MzgqqFreLesAaE=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix
index 8ea69995ee86..98812a18cb67 100644
--- a/pkgs/by-name/la/lasuite-meet/package.nix
+++ b/pkgs/by-name/la/lasuite-meet/package.nix
@@ -13,14 +13,14 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "lasuite-meet";
-  version = "0.1.40";
+  version = "0.1.41";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "suitenumerique";
     repo = "meet";
     tag = "v${version}";
-    hash = "sha256-jzMjLiNLLBBHo9/c/ufB59V6qMwjpx38sImFR+Q+wBE=";
+    hash = "sha256-QAzkRbAxtHa7Py4DDSc2/QHHyFHp+e+/uGmGzUPtFPI=";
   };
 
   sourceRoot = "source/src/backend";

From 40ef6070f47b125e58907a3e9cabd874f0f898cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Manuel=20B=C3=A4renz?= <mbaerenz@heilmannsoftware.de>
Date: Thu, 23 Oct 2025 16:55:48 +0200
Subject: [PATCH 2090/6226] haskellPackages.{clay,openapi3-code-generator}: Add
 turion as maintainer

---
 .../haskell-modules/configuration-hackage2nix/main.yaml         | 2 ++
 pkgs/development/haskell-modules/hackage-packages.nix           | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
index 977e75c6aa59..07a8abeb2963 100644
--- a/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
+++ b/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml
@@ -656,6 +656,7 @@ package-maintainers:
   turion:
     - Agda
     - cabal-gild
+    - clay
     - dunai
     - essence-of-live-coding
     - essence-of-live-coding-gloss
@@ -667,6 +668,7 @@ package-maintainers:
     - monad-bayes
     - monad-schedule
     - pulse-simple
+    - openapi3-code-generator
     - rhine
     - rhine-gloss
     - simple-affine-space
diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix
index 63160da06f2b..be9f813fe453 100644
--- a/pkgs/development/haskell-modules/hackage-packages.nix
+++ b/pkgs/development/haskell-modules/hackage-packages.nix
@@ -142305,6 +142305,7 @@ self: {
       testToolDepends = [ hspec-discover ];
       description = "CSS preprocessor as embedded Haskell";
       license = lib.licenses.bsd3;
+      maintainers = [ lib.maintainers.turion ];
     }
   ) { };
 
@@ -490320,6 +490321,7 @@ self: {
       description = "OpenAPI3 Haskell Client Code Generator";
       license = lib.licenses.mit;
       mainProgram = "openapi3-code-generator-exe";
+      maintainers = [ lib.maintainers.turion ];
     }
   ) { };
 

From 81618d1a820f25a42766ad0ae40877f96755f09e Mon Sep 17 00:00:00 2001
From: Thomas Zahner <thomas.zahner@protonmail.ch>
Date: Thu, 23 Oct 2025 16:14:24 +0200
Subject: [PATCH 2091/6226] lychee: 0.20.1 -> 0.21.0

---
 pkgs/by-name/ly/lychee/package.nix | 31 +++++++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ly/lychee/package.nix b/pkgs/by-name/ly/lychee/package.nix
index d2139a8f023c..44daa281a8ef 100644
--- a/pkgs/by-name/ly/lychee/package.nix
+++ b/pkgs/by-name/ly/lychee/package.nix
@@ -1,30 +1,48 @@
 {
   callPackage,
   lib,
-  rustPlatform,
+  stdenv,
+  buildPackages,
   fetchFromGitHub,
+  rustPlatform,
+  installShellFiles,
   pkg-config,
+  git,
   openssl,
   testers,
 }:
 
+let
+  canRun = stdenv.hostPlatform.emulatorAvailable buildPackages;
+  lychee = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/lychee${stdenv.hostPlatform.extensions.executable}";
+in
 rustPlatform.buildRustPackage rec {
   pname = "lychee";
-  version = "0.20.1";
+  version = "0.21.0";
 
   src = fetchFromGitHub {
     owner = "lycheeverse";
     repo = "lychee";
     rev = "lychee-v${version}";
-    hash = "sha256-yHIj45RfQch4y+V4Ht7cDMcg5MECejxsbjuE345I/to=";
+    hash = "sha256-zV3EVFFYU9fR5gXPTyYudE8rgAW3eDjOF3sTJMuXzh4=";
+    leaveDotGit = true; # used by lychee to determine latest commit date at build time
   };
 
-  cargoHash = "sha256-d3umjtXPBJbPRtNCuktYhJUPgKFmB8UEeewWMekDZRE=";
+  cargoHash = "sha256-1sqFjNil6KktpqrsXXgt3xtOz7eFQc2skkFHqmTMDg4=";
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+    git
+    installShellFiles
+  ];
 
   buildInputs = [ openssl ];
 
+  postFixup = lib.optionalString canRun ''
+    ${lychee} --generate man > lychee.1
+    installManPage lychee.1
+  '';
+
   cargoTestFlags = [
     # don't run doctests since they tend to use the network
     "--lib"
@@ -32,6 +50,8 @@ rustPlatform.buildRustPackage rec {
     "--tests"
   ];
 
+  checkType = "debug"; # compilation fails otherwise
+
   checkFlags = [
     #  Network errors for all of these tests
     # "error reading DNS system conf: No such file or directory (os error 2)" } }
@@ -44,6 +64,7 @@ rustPlatform.buildRustPackage rec {
     "--skip=cli::test_local_file"
     "--skip=client::tests"
     "--skip=collector::tests"
+    "--skip=commands::generate::tests::test_examples_work"
     "--skip=src/lib.rs"
     # Color error for those tests as we are not in a tty
     "--skip=formatters::response::color::tests::test_format_response_with_error_status"

From 55fa66ffe932e49ad2d51c9df375713a9eacbd79 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 20 Oct 2025 16:31:26 +0200
Subject: [PATCH 2092/6226] julia_110: fix build with cmake 4

---
 pkgs/development/compilers/julia/generic.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/compilers/julia/generic.nix b/pkgs/development/compilers/julia/generic.nix
index f1ef721d346c..0bd32f379562 100644
--- a/pkgs/development/compilers/julia/generic.nix
+++ b/pkgs/development/compilers/julia/generic.nix
@@ -61,6 +61,10 @@ stdenv.mkDerivation rec {
       --replace-fail 'cd $(dir $<) && $(TAR) jxf $(notdir $<)' \
                      'cd $(dir $<) && $(TAR) jxf $(notdir $<) && sed -i "s|/usr/bin/env perl|${lib.getExe buildPackages.perl}|" curl-$(CURL_VER)/scripts/cd2nroff'
   ''
+  + lib.optionalString (lib.versionOlder version "1.12") ''
+    substituteInPlace deps/tools/common.mk \
+      --replace-fail "CMAKE_COMMON := " "CMAKE_COMMON := ${lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10"} "
+  ''
   + lib.optionalString (lib.versionAtLeast version "1.12") ''
     substituteInPlace deps/openssl.mk \
       --replace-fail 'cd $(dir $<) && $(TAR) -zxf $<' \

From 0ec05f5dd8d065bcede1e67db9b904b4b827727f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 18:11:54 +0000
Subject: [PATCH 2093/6226] ejsonkms: 0.2.8 -> 0.2.9

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

diff --git a/pkgs/by-name/ej/ejsonkms/package.nix b/pkgs/by-name/ej/ejsonkms/package.nix
index 9aec4ac36228..9226f72ae75e 100644
--- a/pkgs/by-name/ej/ejsonkms/package.nix
+++ b/pkgs/by-name/ej/ejsonkms/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "ejsonkms";
-  version = "0.2.8";
+  version = "0.2.9";
 
   src = fetchFromGitHub {
     owner = "envato";
     repo = "ejsonkms";
     rev = "v${version}";
-    hash = "sha256-qsPn9opDyahyYSOXO9GB2RSHNZupXlAUIxPJRyVgqQo=";
+    hash = "sha256-IQZYpxY6t7W9a3PKc9o7+MbOOxsa0Hs1H8HneilrdBs=";
   };
 
-  vendorHash = "sha256-DovbNZBdJxLpdggaxbe90pqHjl4fp4D7IZT9Z/j3yLI=";
+  vendorHash = "sha256-xOp02g7F1rb3Zq8lbjvDrYrFrcT+msv/KUqQd2qVKdA=";
 
   ldflags = [
     "-X main.version=v${version}"

From 2a659cf1607390205bb55ab389833a5d40125cc3 Mon Sep 17 00:00:00 2001
From: emma b <ebdeeby@outlook.com>
Date: Wed, 22 Oct 2025 20:57:51 -0400
Subject: [PATCH 2094/6226] ly: 1.1.2 -> 1.2.0

---
 pkgs/by-name/ly/ly/deps.nix    | 27 ++++++++++++++++++---------
 pkgs/by-name/ly/ly/package.nix | 14 +++++++-------
 2 files changed, 25 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ly/ly/deps.nix b/pkgs/by-name/ly/ly/deps.nix
index 67982e9667a4..52c642a9f80e 100644
--- a/pkgs/by-name/ly/ly/deps.nix
+++ b/pkgs/by-name/ly/ly/deps.nix
@@ -89,27 +89,36 @@ let
 in
 linkFarm name [
   {
-    name = "clap-0.10.0-oBajB434AQBDh-Ei3YtoKIRxZacVPF1iSwp3IX_ZB8f0";
+    name = "clap-0.11.0-oBajB-HnAQDPCKYzwF7rO3qDFwRcD39Q0DALlTSz5H7e";
     path = fetchZigArtifact {
       name = "clap";
-      url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.10.0.tar.gz";
-      hash = "sha256-cbPGmVlIXwIuRPIfQoFXzwLulT4XEv8rQWcJUl1ueyo=";
+      url = "https://github.com/Hejsil/zig-clap/archive/refs/tags/0.11.0.tar.gz";
+      hash = "sha256-fDWd7EQYZuAlBlrpynBuznK89OiiX74xcZsekv84lkg=";
     };
   }
   {
-    name = "zigini-0.3.1-BSkB7XJGAAB2E-sKyzhTaQCBlYBL8yqzE4E_jmSY99sC";
+    name = "zigini-0.3.2-BSkB7WJJAADybd5DGd9MLCp6ikGGUq9wicxsjv0HF1Qc";
     path = fetchZigArtifact {
       name = "zigini";
-      url = "https://github.com/Kawaii-Ash/zigini/archive/2ed3d417f17fab5b0ee8cad8a63c6d62d7ac1042.tar.gz";
-      hash = "sha256-Zj9uU6EEHkNZ1cPIDgDj1E2CEpbmPmpJYjSSFnxxdf0=";
+      url = "https://github.com/AnErrupTion/zigini/archive/96ca1d9f1a7ec741f07ceb104dae2b3a7bdfd48a.tar.gz";
+      hash = "sha256-Hhc/+a8ToHI9RAJTIQ6Z3KZKQFvoPvd5ODz7HRbytdw=";
     };
   }
   {
-    name = "N-V-__8AAB9qAACwl56piR-krrhXSPxCvEskA52cmaTWXYk_";
+    name = "ini-0.1.0-YCQ9YkUnAAA7SjpLwvomwrngMn3TConSAlNgo7Q8ibMZ";
     path = fetchZigArtifact {
       name = "ini";
-      url = "https://github.com/ziglibs/ini/archive/e18d36665905c1e7ba0c1ce3e8780076b33e3002.tar.gz";
-      hash = "sha256-RQ6OPJBqqH7PCL+xiI58JT7vnIo6zbwpLWn+byZO5iM=";
+      url = "https://github.com/AnErrupTion/ini/archive/ac6e656157b2ac6c98392283a139b47c44a85d54.tar.gz";
+      hash = "sha256-rOXuHsd4WiLDODruQioADMWQ7UkNtx5LUdTcK2dve40=";
+    };
+  }
+  {
+    name = "N-V-__8AAGcUBQAa5vov1Yi_9AXEffFQ1e2KsXaK4dgygRKq";
+    path = fetchZigArtifact {
+      name = "termbox2";
+      url = "git+https://github.com/AnErrupTion/termbox2?ref=master#290ac6b8225aacfd16851224682b851b65fcb918";
+      hash = "sha256-of95/wJeCTWI3p7NxvnUlb618qffUZv2YxgBgzp+crs=";
+      rev = "290ac6b8225aacfd16851224682b851b65fcb918";
     };
   }
 ]
diff --git a/pkgs/by-name/ly/ly/package.nix b/pkgs/by-name/ly/ly/package.nix
index da8a7908cf37..f6461a3fb1d1 100644
--- a/pkgs/by-name/ly/ly/package.nix
+++ b/pkgs/by-name/ly/ly/package.nix
@@ -5,7 +5,7 @@
   linux-pam,
   libxcb,
   makeBinaryWrapper,
-  zig_0_14,
+  zig_0_15,
   callPackage,
   nixosTests,
   x11Support ? true,
@@ -13,19 +13,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ly";
-  version = "1.1.2";
+  version = "1.2.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
-    owner = "AnErrupTion";
+    owner = "fairyglade";
     repo = "ly";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xD1FLW8LT+6szfjZbP++qJThf4xxbmw4jRHB8TdrG70=";
+    hash = "sha256-2JOpC70uBvGk17edXDNeNhNqn2hHZBpOoQaUxN0IlLk=";
   };
 
   nativeBuildInputs = [
     makeBinaryWrapper
-    zig_0_14.hook
+    zig_0_15.hook
   ];
   buildInputs = [
     linux-pam
@@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
   postPatch = ''
     ln -s ${
       callPackage ./deps.nix {
-        zig = zig_0_14;
+        zig = zig_0_15;
       }
     } $ZIG_GLOBAL_CACHE_DIR/p
   '';
@@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "TUI display manager";
     license = lib.licenses.wtfpl;
-    homepage = "https://codeberg.org/AnErrupTion/ly";
+    homepage = "https://codeberg.org/fairyglade/ly";
     maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "ly";

From 02ee43ab9eef3286087a0e4669b9dccb6059307c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 18:15:44 +0000
Subject: [PATCH 2095/6226] ddns-go: 6.12.5 -> 6.13.0

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

diff --git a/pkgs/by-name/dd/ddns-go/package.nix b/pkgs/by-name/dd/ddns-go/package.nix
index 9b9df7745c68..74e9cba939ec 100644
--- a/pkgs/by-name/dd/ddns-go/package.nix
+++ b/pkgs/by-name/dd/ddns-go/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "ddns-go";
-  version = "6.12.5";
+  version = "6.13.0";
 
   src = fetchFromGitHub {
     owner = "jeessy2";
     repo = "ddns-go";
     rev = "v${version}";
-    hash = "sha256-8k3WxNSt+DvfdmWH/V3rAlOSHeyf+g5mmXQZghCf7K4=";
+    hash = "sha256-JGwTYvV0ZyT6gKAaoVPxyIPQzfFBWKkzTdwtMk/bSPc=";
   };
 
-  vendorHash = "sha256-f94Ox/8MQgy3yyLRTK0WFHebntSUAGlbr4/IY+wrz4w=";
+  vendorHash = "sha256-URPCqItQ/xg8p0EdkMS6z8vuSJ1YaCicsvyb+Jvj2CU=";
 
   ldflags = [
     "-X main.version=${version}"

From 5e37460bba0fd3a0e2092eb0a8e7f935f0936fd9 Mon Sep 17 00:00:00 2001
From: drafolin <derg@drafolin.ch>
Date: Thu, 23 Oct 2025 20:18:07 +0200
Subject: [PATCH 2096/6226] teamspeak6-client: 6.0.0-beta3.1 -> 6.0.0-beta3.2

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

diff --git a/pkgs/by-name/te/teamspeak6-client/package.nix b/pkgs/by-name/te/teamspeak6-client/package.nix
index 3f3b138a948f..582f2a470e40 100644
--- a/pkgs/by-name/te/teamspeak6-client/package.nix
+++ b/pkgs/by-name/te/teamspeak6-client/package.nix
@@ -30,11 +30,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "teamspeak6-client";
-  version = "6.0.0-beta3.1";
+  version = "6.0.0-beta3.2";
 
   src = fetchurl {
     url = "https://files.teamspeak-services.com/pre_releases/client/${finalAttrs.version}/teamspeak-client.tar.gz";
-    hash = "sha256-CWKyn49DSWgrkJyYcPwKUz2PBykvFQc1f7G/yvrHbWU=";
+    hash = "sha256-sZrYGonBw3BgUSExovs8GW5E54vhr3i/VR9eH9/qjWM=";
   };
 
   sourceRoot = ".";

From 620e6e2f3624377f2a5b679bd01faee79f85c9ac Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 23 Oct 2025 20:28:08 +0200
Subject: [PATCH 2097/6226] panotools: 2.9.22 -> 2.9.23

---
 pkgs/by-name/pa/panotools/cmake4.patch | 32 --------------------------
 pkgs/by-name/pa/panotools/package.nix  |  6 ++---
 2 files changed, 2 insertions(+), 36 deletions(-)
 delete mode 100644 pkgs/by-name/pa/panotools/cmake4.patch

diff --git a/pkgs/by-name/pa/panotools/cmake4.patch b/pkgs/by-name/pa/panotools/cmake4.patch
deleted file mode 100644
index 13d12cc103f8..000000000000
--- a/pkgs/by-name/pa/panotools/cmake4.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Subject: Vendor upstream patches (mercurial/sourceforge)
-Author: Andreas Metzler
-
-From:
-- https://sourceforge.net/p/panotools/libpano13/ci/698e20b4d296c1dbde9d010c3fb8d54050e56ddb/
-- https://sourceforge.net/p/panotools/libpano13/ci/6b0f2a5ef7a0490866fb224158d1dfbb8bf5896f/
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,8 +28,7 @@
- ## may need to edit the wxWidgets version number below.
- ##
- 
--# require at least cmake 3.0
--cmake_minimum_required(VERSION 3.0)
-+cmake_minimum_required(VERSION 3.12...4.0)
- if(POLICY CMP0074)
-   cmake_policy(SET CMP0074 NEW)
- endif()
-@@ -382,12 +382,12 @@
- endif()
- 
- # create TAGS file
--ADD_CUSTOM_COMMAND( OUTPUT ctags POST_BUILD
--                   COMMAND ctags-exuberant -e *.c *.h tools/*.c
-+ADD_CUSTOM_COMMAND( OUTPUT ${PROJECT_SOURCE_DIR}/TAGS
-+                   COMMAND ctags -e *.c *.h tools/*.c
-                    WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/
-                    COMMENT "Build TAGS file"
-                  )
--ADD_CUSTOM_TARGET( TAGS DEPENDS ctags)
-+ADD_CUSTOM_TARGET( TAGS DEPENDS ${PROJECT_SOURCE_DIR}/TAGS)
diff --git a/pkgs/by-name/pa/panotools/package.nix b/pkgs/by-name/pa/panotools/package.nix
index fe5e41c95c12..a5db44159eb3 100644
--- a/pkgs/by-name/pa/panotools/package.nix
+++ b/pkgs/by-name/pa/panotools/package.nix
@@ -11,15 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libpano13";
-  version = "2.9.22";
+  version = "2.9.23";
 
   src = fetchurl {
     url = "mirror://sourceforge/panotools/libpano13-${finalAttrs.version}.tar.gz";
-    hash = "sha256-r/xoMM2+ccKNJzHcv43qKs2m2f/UYJxtvzugxoRAqOM=";
+    hash = "sha256-58B203oUw5Q0liEV5H3b4YRSyj3lzkDiqu+nz1gV6ig=";
   };
 
-  patches = [ ./cmake4.patch ];
-
   strictDeps = true;
 
   nativeBuildInputs = [

From 088889b20a9ff787a8778036a91fa6066d3d5bcc Mon Sep 17 00:00:00 2001
From: netcrns <crns@protonmail.com>
Date: Tue, 14 Oct 2025 04:18:18 +0200
Subject: [PATCH 2098/6226] mudlet: 4.17.2 -> 4.19.1

as per #445447, this introduces an upstream patch
to update `cmake_minimum_required` to `3.25.1`
(thanks to @iedame for making sure this works)

this also removes the darwin-AppKit patch, as that
commit is merged in `Mudlet-4.19.1`
---
 pkgs/games/mudlet/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix
index 70beede3d01f..aca5db7c4707 100644
--- a/pkgs/games/mudlet/default.nix
+++ b/pkgs/games/mudlet/default.nix
@@ -58,21 +58,21 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "mudlet";
-  version = "4.17.2";
+  version = "4.19.1";
 
   src = fetchFromGitHub {
     owner = "Mudlet";
     repo = "Mudlet";
     rev = "Mudlet-${version}";
     fetchSubmodules = true;
-    hash = "sha256-K75frptePKfHeGQNXaX4lKsLwO6Rs6AAka6hvP8MA+k=";
+    hash = "sha256-I4RRIfHw9kZwxMlc9pvdtwPpq9EvNJU69WpGgZ+0uiw=";
   };
 
   patches = [
     (fetchpatch {
-      name = "darwin-AppKit.patch";
-      url = "https://github.com/Mudlet/Mudlet/commit/68cdd404f81a6d16c80068c45fe0f10802f08d9e.patch";
-      hash = "sha256-74FtcjOR/lu9ohtcoup0+gUfCQRznO48zMmb97INhdY=";
+      name = "cmake4-fix.patch";
+      url = "https://github.com/Mudlet/Mudlet/commit/933f2551fe3084f0fad6d8b971c6176fe154d8d7.patch?full_index=1";
+      hash = "sha256-MElSRhTaT1a5r/Pz3e7MTrzq0krjdspgW0woAB2C8jc=";
     })
   ];
 

From a252a82264ffeac466de02b672eb96b04c7532d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 18:35:37 +0000
Subject: [PATCH 2099/6226] parca-agent: 0.42.0 -> 0.43.0

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

diff --git a/pkgs/by-name/pa/parca-agent/package.nix b/pkgs/by-name/pa/parca-agent/package.nix
index 5945245a6fb6..14e88c000fea 100644
--- a/pkgs/by-name/pa/parca-agent/package.nix
+++ b/pkgs/by-name/pa/parca-agent/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule (finalAttrs: {
   pname = "parca-agent";
-  version = "0.42.0";
+  version = "0.43.0";
 
   src = fetchFromGitHub {
     owner = "parca-dev";
     repo = "parca-agent";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Q/F7BzkeoZQfGROHVYF9n3SGidy4EhCLSRz2xa8eSKY=";
+    hash = "sha256-xIe3s/7/raZuunR+Gx/icLHhT5VUNhcfBGbTqHybxu4=";
     fetchSubmodules = true;
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-nKLHe0MGdV05oSdDaaGN9elsAAzG6mfoT/ZZt+LcbI4=";
+  vendorHash = "sha256-UQnIGTZQOgPWqJcc75pyaMFh8P8JKvtvlGneo5F3NEM=";
 
   buildInputs = [
     stdenv.cc.libc.static

From dc12b5912482e81f19ed5854f25437cdaef20f22 Mon Sep 17 00:00:00 2001
From: XBagon <xbagon@outlook.de>
Date: Thu, 23 Oct 2025 18:47:24 +0200
Subject: [PATCH 2100/6226] gate: 0.53.0 -> 0.57.1

Diff: https://github.com/minekube/gate/compare/v0.53.0...v0.57.1
---
 pkgs/by-name/ga/gate/package.nix | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix
index 0bb69f91f75d..91fa29ed0e8c 100644
--- a/pkgs/by-name/ga/gate/package.nix
+++ b/pkgs/by-name/ga/gate/package.nix
@@ -6,7 +6,7 @@
 
 let
   pname = "gate";
-  version = "0.53.0";
+  version = "0.57.1";
 in
 buildGoModule {
   inherit pname version;
@@ -15,16 +15,21 @@ buildGoModule {
     owner = "minekube";
     repo = "gate";
     tag = "v${version}";
-    hash = "sha256-wrvq2opwT4bbplUljasWmT+JF3/lS8AyzBSfyUB3nUw=";
+    hash = "sha256-G4kmXGiogl/W6SYVWZyQsQE+6YO5Yggk8K4rH+t9znE=";
   };
 
-  vendorHash = "sha256-0NcfuCZHR4QHbMNqc+ilPouie+9k7FqOG/JdNX8uO8c=";
+  vendorHash = "sha256-2ZRfvjIGUznHjn7KA20uzEpVbI7EByNUYu6xALJEUfo=";
 
   ldflags = [
     "-s"
     "-w"
   ];
 
+  # this test requires network access, therefore it should not be run
+  preCheck = ''
+    rm ./pkg/edition/bedrock/geyser/managed/download_test.go
+  '';
+
   excludedPackages = [ ".web" ];
 
   meta = {

From f8be61e1437b14c10314b70edc20a0f8e61c9ea9 Mon Sep 17 00:00:00 2001
From: Ameer Taweel <ameertaweel2002@gmail.com>
Date: Thu, 23 Oct 2025 21:39:45 +0300
Subject: [PATCH 2101/6226] isponsorblocktv: 2.5.3 -> 2.6.1

---
 pkgs/by-name/is/isponsorblocktv/package.nix | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/is/isponsorblocktv/package.nix b/pkgs/by-name/is/isponsorblocktv/package.nix
index 1342fece96dd..ab97dd15c243 100644
--- a/pkgs/by-name/is/isponsorblocktv/package.nix
+++ b/pkgs/by-name/is/isponsorblocktv/package.nix
@@ -7,27 +7,21 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "isponsorblocktv";
-  version = "2.5.3";
+  version = "2.6.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dmunozv04";
     repo = "iSponsorBlockTV";
     tag = "v${version}";
-    hash = "sha256-vxTEec5SMq5zcX70PiRD61aDPJUySuBG0TBQH5Qw8ow=";
+    hash = "sha256-AGjLehhGYz8FyojSFmSYKLCkHAExtpQiukQnTNt1YoY=";
   };
 
   patches = [
     # Port iSponsorBlockTV to pyytlounge v3
     (fetchpatch {
-      url = "https://github.com/lukegb/iSponsorBlockTV/commit/3b50819fffbea23ef02f24726982a1b3313fa952.patch";
-      hash = "sha256-2adgGE3rBnp+/z+2iblWCxO+6qV9RHx0dqTxv/kjDJU=";
-    })
-
-    # Update setup_wizard for Textual v3
-    (fetchpatch {
-      url = "https://github.com/lukegb/iSponsorBlockTV/commit/4a3874b781f796ad32e40fc871fee7c080716171.patch";
-      hash = "sha256-kdfAaIuvQovst55sOmKv+zH/7JxN1JHI9aTF0c9fYAY=";
+      url = "https://github.com/ameertaweel/iSponsorBlockTV/commit/1809ca5a0d561bc9326a51e82118f290423ed3e6.patch";
+      hash = "sha256-v5YXfKUPTzpZPIkVSQF2VUe9EvclAH+kJyiiyUEe/HM=";
     })
   ];
 

From d8f52244e2dc4dac246a9b27812b671e8774580d Mon Sep 17 00:00:00 2001
From: netcrns <crns@protonmail.com>
Date: Thu, 23 Oct 2025 19:12:57 +0200
Subject: [PATCH 2102/6226] mudlet: mark darwin as broken

---
 pkgs/games/mudlet/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/games/mudlet/default.nix b/pkgs/games/mudlet/default.nix
index aca5db7c4707..f8638aaff306 100644
--- a/pkgs/games/mudlet/default.nix
+++ b/pkgs/games/mudlet/default.nix
@@ -176,6 +176,7 @@ stdenv.mkDerivation rec {
       felixalbrigtsen
     ];
     platforms = platforms.linux ++ platforms.darwin;
+    broken = stdenv.hostPlatform.isDarwin;
     license = licenses.gpl2Plus;
     mainProgram = "mudlet";
   };

From 1bb9574ac84270bc01f508953df418f1b230552c Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 15:54:21 -0300
Subject: [PATCH 2103/6226] nootka: fix build with cmake4

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

diff --git a/pkgs/by-name/no/nootka/package.nix b/pkgs/by-name/no/nootka/package.nix
index 7640384181eb..2df4170944e4 100644
--- a/pkgs/by-name/no/nootka/package.nix
+++ b/pkgs/by-name/no/nootka/package.nix
@@ -45,6 +45,11 @@ stdenv.mkDerivation (finalAttrs: {
     "-DENABLE_PULSEAUDIO=ON"
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "Application for practicing playing musical scores and ear training";
     mainProgram = "nootka";

From 27323e52cc79e88d972419d3f3e4971ade3572ff Mon Sep 17 00:00:00 2001
From: benaryorg <binary@benary.org>
Date: Thu, 23 Oct 2025 18:43:11 +0000
Subject: [PATCH 2104/6226] nixos/systemd: CPUAccounting is deprecated

systemd 258 has the following changes noted in systemd.resource-control(5):

> `CPUAccounting=` setting is deprecated, because it is always available on the unified cgroup hierarchy and such setting has no effect.

This commit removes it from the three services using it directly, as well as one instance of example text.

Signed-off-by: benaryorg <binary@benary.org>
---
 nixos/modules/services/cluster/kubernetes/kubelet.nix | 1 -
 nixos/modules/services/scheduling/prefect.nix         | 2 --
 nixos/modules/system/boot/systemd/user.nix            | 2 +-
 nixos/modules/virtualisation/waagent.nix              | 1 -
 4 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix
index 9ab5d0baf8c7..31616a22e1af 100644
--- a/nixos/modules/services/cluster/kubernetes/kubelet.nix
+++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix
@@ -364,7 +364,6 @@ in
         '';
         serviceConfig = {
           Slice = "kubernetes.slice";
-          CPUAccounting = true;
           MemoryAccounting = true;
           Restart = "on-failure";
           RestartSec = "1000ms";
diff --git a/nixos/modules/services/scheduling/prefect.nix b/nixos/modules/services/scheduling/prefect.nix
index 72179533cfe8..ae42d30168ab 100644
--- a/nixos/modules/services/scheduling/prefect.nix
+++ b/nixos/modules/services/scheduling/prefect.nix
@@ -173,7 +173,6 @@ in
           ProtectKernelLogs = true;
           ProtectControlGroups = true;
           MemoryAccounting = true;
-          CPUAccounting = true;
 
           ExecStart = "${pkgs.prefect}/bin/prefect server start --host ${cfg.host} --port ${toString cfg.port}";
           Restart = "always";
@@ -216,7 +215,6 @@ in
           ProtectKernelLogs = true;
           ProtectControlGroups = true;
           MemoryAccounting = true;
-          CPUAccounting = true;
           ExecStart = ''
             ${pkgs.prefect}/bin/prefect worker start \
               --pool ${poolName} \
diff --git a/nixos/modules/system/boot/systemd/user.nix b/nixos/modules/system/boot/systemd/user.nix
index 48903742a919..d9a9631fba92 100644
--- a/nixos/modules/system/boot/systemd/user.nix
+++ b/nixos/modules/system/boot/systemd/user.nix
@@ -71,7 +71,7 @@ in
     systemd.user.extraConfig = mkOption {
       default = "";
       type = types.lines;
-      example = "DefaultCPUAccounting=yes";
+      example = "DefaultTimeoutStartSec=60";
       description = ''
         Extra config options for systemd user instances. See {manpage}`systemd-user.conf(5)` for
         available options.
diff --git a/nixos/modules/virtualisation/waagent.nix b/nixos/modules/virtualisation/waagent.nix
index 407aa261b764..83113c1902df 100644
--- a/nixos/modules/virtualisation/waagent.nix
+++ b/nixos/modules/virtualisation/waagent.nix
@@ -370,7 +370,6 @@ in
         Type = "simple";
         Restart = "always";
         Slice = "azure.slice";
-        CPUAccounting = true;
         MemoryAccounting = true;
       };
     };

From 43cbf6939a8ff9645e9857868a80b5089eb07fc9 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Thu, 23 Oct 2025 17:12:01 +0200
Subject: [PATCH 2105/6226] nextcloud32: 32.0.0 -> 32.0.1

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

diff --git a/pkgs/servers/nextcloud/default.nix b/pkgs/servers/nextcloud/default.nix
index 2459ea7c64dd..af9700088145 100644
--- a/pkgs/servers/nextcloud/default.nix
+++ b/pkgs/servers/nextcloud/default.nix
@@ -65,8 +65,8 @@ in
   };
 
   nextcloud32 = generic {
-    version = "32.0.0";
-    hash = "sha256-V0SNVdm4cQLxfDY0cyA0ahslj2AXxjuVjHie/ULjRaM=";
+    version = "32.0.1";
+    hash = "sha256-WBCwbnVng4SXPY2GOH7jn0wIbXnfqS8V/LdDqro26qk=";
     packages = nextcloud32Packages;
   };
 

From 0f7ecd28e46063af29b2f034e1ceb4cf7992b614 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Thu, 23 Oct 2025 17:12:45 +0200
Subject: [PATCH 2106/6226] nextcloudPackages.apps: update

---
 pkgs/servers/nextcloud/packages/31.json | 26 ++++++++++++-------------
 pkgs/servers/nextcloud/packages/32.json | 26 ++++++++++++-------------
 2 files changed, 26 insertions(+), 26 deletions(-)

diff --git a/pkgs/servers/nextcloud/packages/31.json b/pkgs/servers/nextcloud/packages/31.json
index c3fb2b21b969..89d4f58322d4 100644
--- a/pkgs/servers/nextcloud/packages/31.json
+++ b/pkgs/servers/nextcloud/packages/31.json
@@ -200,9 +200,9 @@
     ]
   },
   "mail": {
-    "hash": "sha256-BvgDPCjgc5Hl93ueobErfuREhmjdoQBqOlXYpVJM9uo=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.10/mail-v5.5.10.tar.gz",
-    "version": "5.5.10",
+    "hash": "sha256-Y+xAJsRUlqZLCpMsgunm97+9pP6kAoLS8rAIm5KrVfE=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.11/mail-v5.5.11.tar.gz",
+    "version": "5.5.11",
     "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
@@ -230,9 +230,9 @@
     ]
   },
   "news": {
-    "hash": "sha256-C4A1kb41DCS3FtConpJ+g9TBEIlaUqW9YC6Ha3bj0Yw=",
-    "url": "https://github.com/nextcloud/news/releases/download/27.0.0/news.tar.gz",
-    "version": "27.0.0",
+    "hash": "sha256-K93swGriEwm1zBq9H7F4P2fHmTanYddFARfQp456bds=",
+    "url": "https://github.com/nextcloud/news/releases/download/27.0.1/news.tar.gz",
+    "version": "27.0.1",
     "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
     "homepage": "https://github.com/nextcloud/news",
     "licenses": [
@@ -380,19 +380,19 @@
     ]
   },
   "tables": {
-    "hash": "sha256-E68fyimEMBe0DJ2cOAIBs0+Psb8UVFFfLBZc/ESRzY8=",
-    "url": "https://github.com/nextcloud-releases/tables/releases/download/v0.9.5/tables-v0.9.5.tar.gz",
-    "version": "0.9.5",
-    "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
+    "hash": "sha256-0Dvw5BR5hfVW/bmZ4sD6RawL25jHv9bla/q7bbh1RgQ=",
+    "url": "https://github.com/nextcloud-releases/tables/releases/download/v1.0.0/tables-v1.0.0.tar.gz",
+    "version": "1.0.0",
+    "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n- Users, groups and teams\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
     "homepage": "https://github.com/nextcloud/tables",
     "licenses": [
       "agpl"
     ]
   },
   "tasks": {
-    "hash": "sha256-Upa3dl+b97UV3KXLlcxeS6OzFBTIW+e3U/T9QJT6Pmw=",
-    "url": "https://github.com/nextcloud/tasks/releases/download/v0.16.1/tasks.tar.gz",
-    "version": "0.16.1",
+    "hash": "sha256-h3u9xR3zguKvVWXA7CNSde2sEdvgsT18cYAHp8dKPSg=",
+    "url": "https://github.com/nextcloud/tasks/releases/download/v0.17.0/tasks.tar.gz",
+    "version": "0.17.0",
     "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.",
     "homepage": "https://github.com/nextcloud/tasks/",
     "licenses": [
diff --git a/pkgs/servers/nextcloud/packages/32.json b/pkgs/servers/nextcloud/packages/32.json
index b6fa15897823..4efd07211f29 100644
--- a/pkgs/servers/nextcloud/packages/32.json
+++ b/pkgs/servers/nextcloud/packages/32.json
@@ -180,9 +180,9 @@
     ]
   },
   "mail": {
-    "hash": "sha256-BvgDPCjgc5Hl93ueobErfuREhmjdoQBqOlXYpVJM9uo=",
-    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.10/mail-v5.5.10.tar.gz",
-    "version": "5.5.10",
+    "hash": "sha256-Y+xAJsRUlqZLCpMsgunm97+9pP6kAoLS8rAIm5KrVfE=",
+    "url": "https://github.com/nextcloud-releases/mail/releases/download/v5.5.11/mail-v5.5.11.tar.gz",
+    "version": "5.5.11",
     "description": "**💌 A mail app for Nextcloud**\n\n- **🚀 Integration with other Nextcloud apps!** Currently Contacts, Calendar & Files – more to come.\n- **📥 Multiple mail accounts!** Personal and company account? No problem, and a nice unified inbox. Connect any IMAP account.\n- **🔒 Send & receive encrypted mails!** Using the great [Mailvelope](https://mailvelope.com) browser extension.\n- **🙈 We’re not reinventing the wheel!** Based on the great [Horde](https://www.horde.org) libraries.\n- **📬 Want to host your own mail server?** We do not have to reimplement this as you could set up [Mail-in-a-Box](https://mailinabox.email)!\n\n## Ethical AI Rating\n\n### Priority Inbox\n\nPositive:\n* The software for training and inferencing of this model is open source.\n* The model is created and trained on-premises based on the user's own data.\n* The training data is accessible to the user, making it possible to check or correct for bias or optimise the performance and CO2 usage.\n\n### Thread Summaries (opt-in)\n\n**Rating:** 🟢/🟡/🟠/🔴\n\nThe rating depends on the installed text processing backend. See [the rating overview](https://docs.nextcloud.com/server/latest/admin_manual/ai/index.html) for details.\n\nLearn more about the Nextcloud Ethical AI Rating [in our blog](https://nextcloud.com/blog/nextcloud-ethical-ai-rating/).",
     "homepage": "https://github.com/nextcloud/mail#readme",
     "licenses": [
@@ -200,9 +200,9 @@
     ]
   },
   "news": {
-    "hash": "sha256-C4A1kb41DCS3FtConpJ+g9TBEIlaUqW9YC6Ha3bj0Yw=",
-    "url": "https://github.com/nextcloud/news/releases/download/27.0.0/news.tar.gz",
-    "version": "27.0.0",
+    "hash": "sha256-K93swGriEwm1zBq9H7F4P2fHmTanYddFARfQp456bds=",
+    "url": "https://github.com/nextcloud/news/releases/download/27.0.1/news.tar.gz",
+    "version": "27.0.1",
     "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
     "homepage": "https://github.com/nextcloud/news",
     "licenses": [
@@ -340,19 +340,19 @@
     ]
   },
   "tables": {
-    "hash": "sha256-E68fyimEMBe0DJ2cOAIBs0+Psb8UVFFfLBZc/ESRzY8=",
-    "url": "https://github.com/nextcloud-releases/tables/releases/download/v0.9.5/tables-v0.9.5.tar.gz",
-    "version": "0.9.5",
-    "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
+    "hash": "sha256-0Dvw5BR5hfVW/bmZ4sD6RawL25jHv9bla/q7bbh1RgQ=",
+    "url": "https://github.com/nextcloud-releases/tables/releases/download/v1.0.0/tables-v1.0.0.tar.gz",
+    "version": "1.0.0",
+    "description": "Manage data the way you need it.\n\nWith this app you are able to create your own tables with individual columns. You can start with a template or from scratch and add your wanted columns.\nYou can choose from the following column types:\n- Text line or rich text\n- Link to urls or other nextcloud resources\n- Numbers\n- Progress bar\n- Stars rating\n- Yes/No tick\n- Date and/or time\n- (Multi) selection\n- Users, groups and teams\n\nShare your tables and views with users and groups within your cloud.\n\nHave a good time and manage whatever you want.",
     "homepage": "https://github.com/nextcloud/tables",
     "licenses": [
       "agpl"
     ]
   },
   "tasks": {
-    "hash": "sha256-Upa3dl+b97UV3KXLlcxeS6OzFBTIW+e3U/T9QJT6Pmw=",
-    "url": "https://github.com/nextcloud/tasks/releases/download/v0.16.1/tasks.tar.gz",
-    "version": "0.16.1",
+    "hash": "sha256-h3u9xR3zguKvVWXA7CNSde2sEdvgsT18cYAHp8dKPSg=",
+    "url": "https://github.com/nextcloud/tasks/releases/download/v0.17.0/tasks.tar.gz",
+    "version": "0.17.0",
     "description": "Once enabled, a new Tasks menu will appear in your Nextcloud apps menu. From there you can add and delete tasks, edit their title, description, start and due dates and mark them as important. Tasks can be shared between users. Tasks can be synchronized using CalDav (each task list is linked to an Nextcloud calendar, to sync it to your local client: Thunderbird, Evolution, KDE Kontact, iCal … - just add the calendar as a remote calendar in your client). You can download your tasks as ICS files using the download button for each calendar.",
     "homepage": "https://github.com/nextcloud/tasks/",
     "licenses": [

From 3de5254b4bdafcc8f5f7a1fd05d334c9f6b30d17 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 19:01:24 +0000
Subject: [PATCH 2107/6226] mdserve: 0.4.1 -> 0.5.0

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

diff --git a/pkgs/by-name/md/mdserve/package.nix b/pkgs/by-name/md/mdserve/package.nix
index 227218955b9c..b87d34793030 100644
--- a/pkgs/by-name/md/mdserve/package.nix
+++ b/pkgs/by-name/md/mdserve/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdserve";
-  version = "0.4.1";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "jfernandez";
     repo = "mdserve";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-C9D6tr88EROo2rzu7t9HAeyKAxFOCZyN+sl7QpFgmI8=";
+    hash = "sha256-dYB49+vLcokCnJ8yH0ab+Ns/RPLzdxTN/PmkaKc+THs=";
   };
 
-  cargoHash = "sha256-RFCGb7wjO8/RsOlsABem5dy+ZfheZNihktqUCX3oDZo=";
+  cargoHash = "sha256-KszPB5xpfLw7DA/yMl5o6yRn5lHLF+6EAXnEdhD0qFE=";
 
   __darwinAllowLocalNetworking = true;
 

From 0afbc214eef0dce4e39b236d697762a37af9ff8a Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 16:09:00 -0300
Subject: [PATCH 2108/6226] microsoft-edge: 141.0.3537.92 -> 141.0.3537.99

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

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index 94ab92df4a06..e80f99193251 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -162,11 +162,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "141.0.3537.92";
+  version = "141.0.3537.99";
 
   src = fetchurl {
     url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
-    hash = "sha256-nN/TgbaxOrALzMB56TO9ZbxIjJPTCxxWyr2WOMvY6Kg=";
+    hash = "sha256-XMFAHCa7gGsSu9nFXkgvYX+CMY9nFgQEJLNKf+TodRw=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From 02c87eac98bba58ae5cebad7821fc530ab482f4e Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 16:16:16 -0300
Subject: [PATCH 2109/6226] nsplist: fix build with cmake4

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

diff --git a/pkgs/by-name/ns/nsplist/package.nix b/pkgs/by-name/ns/nsplist/package.nix
index 64cba193ce31..5b3007d3383c 100644
--- a/pkgs/by-name/ns/nsplist/package.nix
+++ b/pkgs/by-name/ns/nsplist/package.nix
@@ -27,6 +27,11 @@ stdenv.mkDerivation {
     flex -o src/NSPlistLexer.cpp <(tail --lines=+17 src/NSPlistLexer.l)
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     maintainers = with maintainers; [ matthewbauer ];
     description = "Parses .plist files";

From 5f7a6ddf8c0cb1649e0ac950d3e3370aa347c7d3 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Thu, 23 Oct 2025 21:15:54 +0200
Subject: [PATCH 2110/6226] paperless-ngx: 2.19.1 -> 2.19.2

https://github.com/paperless-ngx/paperless-ngx/releases/tag/v2.19.2
---
 pkgs/by-name/pa/paperless-ngx/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 80567181881a..780ad5ffd1af 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -28,13 +28,13 @@
   xorg,
 }:
 let
-  version = "2.19.1";
+  version = "2.19.2";
 
   src = fetchFromGitHub {
     owner = "paperless-ngx";
     repo = "paperless-ngx";
     tag = "v${version}";
-    hash = "sha256-J9e39c8AnEj+1lB+KrxsG3h4VjTo65an24IJ5mvACUE=";
+    hash = "sha256-+GIDtV6jsY7ZA8CV4ZmVoffFVvaJxhfnau9vu/mr+CY=";
   };
 
   python = python3.override {

From 088c4adc0a13161783e524c6891eb68da02d3b3d Mon Sep 17 00:00:00 2001
From: Sam <30577766+Samasaur1@users.noreply.github.com>
Date: Fri, 17 Oct 2025 10:26:09 -0500
Subject: [PATCH 2111/6226] apple-sdk_26-test: init

This should compile with the Xcode 26 toolchain, and should run on all
versions of macOS. On 26+, it should print "/private/tmp", while on
earlier versions it should print ":(".

It should fail to build in nixpkgs
---
 pkgs/by-name/ap/apple-sdk_26-test/package.nix | 19 +++++++++++++++++
 .../apple-sdk_26-test/src/apple-sdk_26-test.m | 21 +++++++++++++++++++
 .../ap/apple-sdk_26-test/src/meson.build      |  2 ++
 3 files changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/ap/apple-sdk_26-test/package.nix
 create mode 100644 pkgs/by-name/ap/apple-sdk_26-test/src/apple-sdk_26-test.m
 create mode 100644 pkgs/by-name/ap/apple-sdk_26-test/src/meson.build

diff --git a/pkgs/by-name/ap/apple-sdk_26-test/package.nix b/pkgs/by-name/ap/apple-sdk_26-test/package.nix
new file mode 100644
index 000000000000..dfb5aa59c7b8
--- /dev/null
+++ b/pkgs/by-name/ap/apple-sdk_26-test/package.nix
@@ -0,0 +1,19 @@
+{
+  lib,
+  stdenv,
+  meson,
+  ninja,
+}:
+
+stdenv.mkDerivation {
+  name = "apple-sdk_26-test";
+
+  src = ./src;
+
+  nativeBuildInputs = [
+    meson
+    ninja
+  ];
+
+  meta.mainProgram = "apple-sdk_26-test";
+}
diff --git a/pkgs/by-name/ap/apple-sdk_26-test/src/apple-sdk_26-test.m b/pkgs/by-name/ap/apple-sdk_26-test/src/apple-sdk_26-test.m
new file mode 100644
index 000000000000..21fc3af5253a
--- /dev/null
+++ b/pkgs/by-name/ap/apple-sdk_26-test/src/apple-sdk_26-test.m
@@ -0,0 +1,21 @@
+#include <stdio.h>
+#include <spawn.h>
+
+int main(int argc, char** argv, char** env) {
+    if (@available(macOS 26, *)) {
+        int ret;
+        pid_t pid;
+        posix_spawn_file_actions_t actions;
+        if ((ret = posix_spawn_file_actions_init(&actions))) {
+            printf("cannot create file_actions\n");
+        }
+        if ((ret = posix_spawn_file_actions_addchdir(&actions, "/tmp"))) {
+            printf("cannot add_chdir\n");
+        }
+        if ((ret = posix_spawnp(&pid, "pwd", &actions, NULL, argv, env))) {
+            printf("cannot spawn\n");
+        }
+    } else {
+        printf(":(\n");
+    }
+}
diff --git a/pkgs/by-name/ap/apple-sdk_26-test/src/meson.build b/pkgs/by-name/ap/apple-sdk_26-test/src/meson.build
new file mode 100644
index 000000000000..ef3a4c6179aa
--- /dev/null
+++ b/pkgs/by-name/ap/apple-sdk_26-test/src/meson.build
@@ -0,0 +1,2 @@
+project('apple-sdk_26-test', 'objc')
+executable('apple-sdk_26-test', 'apple-sdk_26-test.m', install : true)

From 23c079624b7cfe8f5e2de96be272d6dba8b94f41 Mon Sep 17 00:00:00 2001
From: Sam <30577766+Samasaur1@users.noreply.github.com>
Date: Fri, 17 Oct 2025 10:49:16 -0500
Subject: [PATCH 2112/6226] apple-sdk_26: init

---
 .../metadata/apple-oss-lockfile.json          | 178 ++++++++++++++++++
 .../ap/apple-sdk/metadata/versions.json       |   8 +
 pkgs/top-level/all-packages.nix               |   1 +
 3 files changed, 187 insertions(+)

diff --git a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json
index 2dc99f12620d..63890c9d9369 100644
--- a/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json
+++ b/pkgs/by-name/ap/apple-sdk/metadata/apple-oss-lockfile.json
@@ -888,5 +888,183 @@
       "hash": "sha256-o4tCuCAIgAYg/Li3wTs12mVWr5C/4vbwu1zi+kJ9d6w=",
       "version": "11417.121.6"
     }
+  },
+  "26.0": {
+    "CarbonHeaders": {
+      "hash": "sha256-nIPXnLr21yVnpBhx9K5q3l/nPARA6JL/dED08MeyhP8=",
+      "version": "18.1"
+    },
+    "CommonCrypto": {
+      "hash": "sha256-+qAwL6+s7di9cX/qXtapLkjCFoDuZaSYltRJEG4qekM=",
+      "version": "600035"
+    },
+    "IOAudioFamily": {
+      "hash": "sha256-A3iiAjjP29VdjMj40tLS5Q/ni4qeh9bBpnmNzeG2pIY=",
+      "version": "700.2"
+    },
+    "IOBDStorageFamily": {
+      "hash": "sha256-OcQUJ3nEfrpvWX/npnedJ4PECIGWFSLiM0PKoiH911w=",
+      "version": "26"
+    },
+    "IOCDStorageFamily": {
+      "hash": "sha256-p/2qM5zjXFDRb/DISpEHxQEdvmuLlRGt/Ygc71Yu2rI=",
+      "version": "62"
+    },
+    "IODVDStorageFamily": {
+      "hash": "sha256-1Sa8aZBGNtqJBNHva+YXxET6Wcdm2PgVrTzYT/8qrN4=",
+      "version": "46"
+    },
+    "IOFWDVComponents": {
+      "hash": "sha256-WkfkWnzRupEh20U7vjsTta89clhus6GTkOpXQWXw/bM=",
+      "version": "208"
+    },
+    "IOFireWireAVC": {
+      "hash": "sha256-qR9lSTa7PN5Z9Nis4tfuXlcZGMIU48dete/NPD0UBbE=",
+      "version": "436"
+    },
+    "IOFireWireFamily": {
+      "hash": "sha256-hmErAXjLWIelqJaCrB8J4IiIxyB7S6EHFY+AY9YhmKQ=",
+      "version": "492"
+    },
+    "IOFireWireSBP2": {
+      "hash": "sha256-Xk+PDnUaO9q46nQwHwTKf/QXtGclfs0wTWiUbcV7e4s=",
+      "version": "454"
+    },
+    "IOFireWireSerialBusProtocolTransport": {
+      "hash": "sha256-cM/VFhVWNVwdJYk+mme0UYttQd7eJwd7Hlo7KNRyHY0=",
+      "version": "262"
+    },
+    "IOGraphics": {
+      "hash": "sha256-iysZE42mOKZbFxSZBNspaBTCRKEKK38DFGBxZWQxZxI=",
+      "version": "599"
+    },
+    "IOHIDFamily": {
+      "hash": "sha256-YLnabX90g4Q8LxjwVuJF6KODCDxychWV+VJaNG9d8fI=",
+      "version": "2222.0.24"
+    },
+    "IOKitUser": {
+      "hash": "sha256-ngwi8YMUqE0q8j7Lr5cqJwi2V+IDu3ie3bduotHIUJU=",
+      "version": "100222.0.4"
+    },
+    "IONetworkingFamily": {
+      "hash": "sha256-ZF5ML41Y1l1liQn32qTkcl4mMvx9Xdizb9VgvTzVTL4=",
+      "version": "186"
+    },
+    "IOSerialFamily": {
+      "hash": "sha256-wVS4QTx6MBOS0VrwyCZ3s5Usezwaf8rWzmNnfdDTXTU=",
+      "version": "93"
+    },
+    "IOStorageFamily": {
+      "hash": "sha256-1FKSF622qeXPGngA3UmQ2M/IU1pdlMoYBPbXytUFDaQ=",
+      "version": "331"
+    },
+    "IOUSBFamily": {
+      "hash": "sha256-Z0E3TfKP49toYo1Fo9kElRap8CZ+mVDHy5RIexgJTpA=",
+      "version": "630.4.5"
+    },
+    "Libc": {
+      "hash": "sha256-k+HQ+qgye0ORFm0hU8WzE4ysbbEoFZ7wcbVl5giDH/E=",
+      "version": "1725.0.11"
+    },
+    "Libinfo": {
+      "hash": "sha256-4InBEPi0n2EMo/8mIBib1Im4iTKRcRJ4IlAcLCigVGk=",
+      "version": "600"
+    },
+    "Libm": {
+      "hash": "sha256-p4BndAag9d0XSMYWQ+c4myGv5qXbKx5E1VghudSbpTk=",
+      "version": "2026"
+    },
+    "Libnotify": {
+      "hash": "sha256-p8cJZlBYOFmI1NDHXGYjgcv8z9Ldc1amZuYlxxJfeVY=",
+      "version": "344.0.1"
+    },
+    "Librpcsvc": {
+      "hash": "sha256-UWYdCQ9QsBqwM01bWr+igINAHSdSluB/FrOclC5AjTI=",
+      "version": "31"
+    },
+    "Libsystem": {
+      "hash": "sha256-/NlSwPaoTVx+bl9hYsfz3C5MuLdqGv4vdAh0KDbDKmY=",
+      "version": "1356"
+    },
+    "OpenDirectory": {
+      "hash": "sha256-6fSl8PasCZSBfe0ftaePcBuSEO3syb6kK+mfDI6iR7A=",
+      "version": "146"
+    },
+    "Security": {
+      "hash": "sha256-oxOvZsDoNYZNiWf+MASHrR4Q2o5oaqvK2We51hH7CO8=",
+      "version": "61901.0.87.0.1"
+    },
+    "architecture": {
+      "hash": "sha256-PRNUrhzSOrwmxSPkKmV0LV7yEIik65sdkfKdBqcwFhU=",
+      "version": "282"
+    },
+    "configd": {
+      "hash": "sha256-58or+OQP788UgQKO7Y8k8pY/enaSqH971ks7xCPu8fA=",
+      "version": "1385.0.7"
+    },
+    "copyfile": {
+      "hash": "sha256-I9uDi5BDQKa7mO3XpHxv0d6PiROW2ueZ3vGfrsG0OJo=",
+      "version": "230.0.1.0.1"
+    },
+    "dtrace": {
+      "hash": "sha256-5HpH6Cg8vWWzOX5ADD//izKDvqGnzV05Giju8lmGeyA=",
+      "version": "413"
+    },
+    "dyld": {
+      "hash": "sha256-jzoFLwbms0rUwzyjYif/r6Rmr4kyn+as/bhc4paEPeY=",
+      "version": "1323.3"
+    },
+    "eap8021x": {
+      "hash": "sha256-17bseWT4OWMA8hF+YSDDjxhVyJpbpP2xwv8dGti1YoM=",
+      "version": "368.0.3"
+    },
+    "hfs": {
+      "hash": "sha256-OkgqZ03gwn2hTuHxZrPDmQOrY4Dwu7MrX+BfG+PTgvE=",
+      "version": "704.0.3.0.2"
+    },
+    "launchd": {
+      "hash": "sha256-8mW9bnuHmRXCx9py8Wy28C5b2QPICW0rlAps5njYa00=",
+      "version": "842.1.4"
+    },
+    "libclosure": {
+      "hash": "sha256-pvwfcbeEJmTEPdt6/lgVswiabLRG+sMN6VT5FwG7C4Q=",
+      "version": "96"
+    },
+    "libdispatch": {
+      "hash": "sha256-L0+Ho9dAlMXVpqFEGIcIMsJc0gULckRulUImNEZe5MU=",
+      "version": "1542.0.4"
+    },
+    "libmalloc": {
+      "hash": "sha256-482hgm1ESr3LWC/JhuQNGNu9smsa2Eap49/eH+YNAio=",
+      "version": "792.1.1"
+    },
+    "libplatform": {
+      "hash": "sha256-wGZ2Im81mRXx6epgj/tbOJpg89CEbAr0Z8oFEpkyNMU=",
+      "version": "359.1.2"
+    },
+    "libpthread": {
+      "hash": "sha256-VuMpQjxuMsdHsFq0q6QIWSWi88gVF2jNzIfti20Gkbw=",
+      "version": "539"
+    },
+    "mDNSResponder": {
+      "hash": "sha256-iRqCpPAQDRjgRbRz3s6q2oyzq6xo+w4FTBai79104Zo=",
+      "version": "2881.0.25"
+    },
+    "objc4": {
+      "hash": "sha256-Nlgr36yLvGkUJIEFQ5w8FAB0r2syEsRTw0KuUShNT8E=",
+      "version": "950"
+    },
+    "ppp": {
+      "hash": "sha256-FzHZ05o7JxwgTqz0e3D68b/DiLu2x2ErzGMh0U78fLo=",
+      "version": "1020.1.1"
+    },
+    "removefile": {
+      "hash": "sha256-Z5UD0mk/s80CQB0PZWDzSl2JWXmnVmwUvlNb28+hR3k=",
+      "version": "84"
+    },
+    "xnu": {
+      "hash": "sha256-Cuf7kPtsn4CPXqyZmxVsJlA5i+Ikryp8ezJyGrvT63c=",
+      "version": "12377.1.9"
+    }
   }
 }
diff --git a/pkgs/by-name/ap/apple-sdk/metadata/versions.json b/pkgs/by-name/ap/apple-sdk/metadata/versions.json
index 6c0b1ecabf46..303f456f9614 100644
--- a/pkgs/by-name/ap/apple-sdk/metadata/versions.json
+++ b/pkgs/by-name/ap/apple-sdk/metadata/versions.json
@@ -38,5 +38,13 @@
     ],
     "version": "15.5",
     "hash": "sha256-HBiSJuw1XBUK5R/8Sj65c3rftSEvQl/O9ZZVp/g1Amo="
+  },
+  "26": {
+    "urls": [
+      "https://swcdn.apple.com/content/downloads/27/62/093-35114-A_AAH24ZZQB5/yn87ru9qe9225m8hwq2ic3hjy5yc5vw7h9/CLTools_macOSNMOS_SDK.pkg",
+      "https://web.archive.org/web/20250915230423/https://swcdn.apple.com/content/downloads/27/62/093-35114-A_AAH24ZZQB5/yn87ru9qe9225m8hwq2ic3hjy5yc5vw7h9/CLTools_macOSNMOS_SDK.pkg"
+    ],
+    "version": "26.0",
+    "hash": "sha256-54UtisDXHCxs7vO4fZSWOYwxLbdouLxWwGisez+tlAc="
   }
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5634a13c2734..578a12485503 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8897,6 +8897,7 @@ with pkgs;
   apple-sdk_13 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "13"; };
   apple-sdk_14 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "14"; };
   apple-sdk_15 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "15"; };
+  apple-sdk_26 = callPackage ../by-name/ap/apple-sdk/package.nix { darwinSdkMajorVersion = "26"; };
 
   darwinMinVersionHook =
     deploymentTarget:

From e2734c5d78e0a1b7efc0d4615cf312db29fe7623 Mon Sep 17 00:00:00 2001
From: Sam <30577766+Samasaur1@users.noreply.github.com>
Date: Fri, 17 Oct 2025 10:49:16 -0500
Subject: [PATCH 2113/6226] apple-sdk_26-test: fix by using apple-sdk_26

This should now build in nixpkgs, with the same behavior as when using
the Xcode toolchain.
---
 pkgs/by-name/ap/apple-sdk_26-test/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ap/apple-sdk_26-test/package.nix b/pkgs/by-name/ap/apple-sdk_26-test/package.nix
index dfb5aa59c7b8..8ab0f959eced 100644
--- a/pkgs/by-name/ap/apple-sdk_26-test/package.nix
+++ b/pkgs/by-name/ap/apple-sdk_26-test/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   meson,
   ninja,
+  apple-sdk_26,
 }:
 
 stdenv.mkDerivation {
@@ -15,5 +16,9 @@ stdenv.mkDerivation {
     ninja
   ];
 
+  buildInputs = [
+    apple-sdk_26
+  ];
+
   meta.mainProgram = "apple-sdk_26-test";
 }

From fbc33babd6daeab7b227ce2c6215600d2e08e0a3 Mon Sep 17 00:00:00 2001
From: Sam <30577766+Samasaur1@users.noreply.github.com>
Date: Fri, 17 Oct 2025 12:22:55 -0500
Subject: [PATCH 2114/6226] apple-sdk_26-test: set min version to macOS 26

This should continue to behave the same on macOS 26+, but on earlier
versions it should simply crash with missing symbol errors
---
 pkgs/by-name/ap/apple-sdk_26-test/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ap/apple-sdk_26-test/package.nix b/pkgs/by-name/ap/apple-sdk_26-test/package.nix
index 8ab0f959eced..e177316c8dcd 100644
--- a/pkgs/by-name/ap/apple-sdk_26-test/package.nix
+++ b/pkgs/by-name/ap/apple-sdk_26-test/package.nix
@@ -4,6 +4,7 @@
   meson,
   ninja,
   apple-sdk_26,
+  darwinMinVersionHook
 }:
 
 stdenv.mkDerivation {
@@ -18,6 +19,7 @@ stdenv.mkDerivation {
 
   buildInputs = [
     apple-sdk_26
+    (darwinMinVersionHook "26.0")
   ];
 
   meta.mainProgram = "apple-sdk_26-test";

From f143866f6c2f49288907504366420ed777d9c15a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 19:19:45 +0000
Subject: [PATCH 2115/6226] tootik: 0.19.6 -> 0.19.7

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

diff --git a/pkgs/by-name/to/tootik/package.nix b/pkgs/by-name/to/tootik/package.nix
index 28a0a066ea02..fe23d7efd0eb 100644
--- a/pkgs/by-name/to/tootik/package.nix
+++ b/pkgs/by-name/to/tootik/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "tootik";
-  version = "0.19.6";
+  version = "0.19.7";
 
   src = fetchFromGitHub {
     owner = "dimkr";
     repo = "tootik";
     tag = "v${version}";
-    hash = "sha256-xbYmIH3dsZg2mL4coUwIAyQA5EhnTUOXs6Vu6ThfwUg=";
+    hash = "sha256-8ZvLdEeuPOcjZnumy6bwu5jeloSKa+vvSnH7VH0BI6g=";
   };
 
-  vendorHash = "sha256-hVhAtKW6O2wpmQS4l/O8ltt+aHxW6nDVpegOIip545c=";
+  vendorHash = "sha256-UENMw+kuZHD4x+gON3g3zNsH0Z3weRKpJZh58IiazLw=";
 
   nativeBuildInputs = [ openssl ];
 

From e7e541877fcce8e2cfedeec174d99525e657c81f Mon Sep 17 00:00:00 2001
From: Sam <30577766+Samasaur1@users.noreply.github.com>
Date: Fri, 17 Oct 2025 13:13:19 -0500
Subject: [PATCH 2116/6226] apple-sdk_26-test: drop

---
 pkgs/by-name/ap/apple-sdk_26-test/package.nix | 26 -------------------
 .../apple-sdk_26-test/src/apple-sdk_26-test.m | 21 ---------------
 .../ap/apple-sdk_26-test/src/meson.build      |  2 --
 3 files changed, 49 deletions(-)
 delete mode 100644 pkgs/by-name/ap/apple-sdk_26-test/package.nix
 delete mode 100644 pkgs/by-name/ap/apple-sdk_26-test/src/apple-sdk_26-test.m
 delete mode 100644 pkgs/by-name/ap/apple-sdk_26-test/src/meson.build

diff --git a/pkgs/by-name/ap/apple-sdk_26-test/package.nix b/pkgs/by-name/ap/apple-sdk_26-test/package.nix
deleted file mode 100644
index e177316c8dcd..000000000000
--- a/pkgs/by-name/ap/apple-sdk_26-test/package.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  lib,
-  stdenv,
-  meson,
-  ninja,
-  apple-sdk_26,
-  darwinMinVersionHook
-}:
-
-stdenv.mkDerivation {
-  name = "apple-sdk_26-test";
-
-  src = ./src;
-
-  nativeBuildInputs = [
-    meson
-    ninja
-  ];
-
-  buildInputs = [
-    apple-sdk_26
-    (darwinMinVersionHook "26.0")
-  ];
-
-  meta.mainProgram = "apple-sdk_26-test";
-}
diff --git a/pkgs/by-name/ap/apple-sdk_26-test/src/apple-sdk_26-test.m b/pkgs/by-name/ap/apple-sdk_26-test/src/apple-sdk_26-test.m
deleted file mode 100644
index 21fc3af5253a..000000000000
--- a/pkgs/by-name/ap/apple-sdk_26-test/src/apple-sdk_26-test.m
+++ /dev/null
@@ -1,21 +0,0 @@
-#include <stdio.h>
-#include <spawn.h>
-
-int main(int argc, char** argv, char** env) {
-    if (@available(macOS 26, *)) {
-        int ret;
-        pid_t pid;
-        posix_spawn_file_actions_t actions;
-        if ((ret = posix_spawn_file_actions_init(&actions))) {
-            printf("cannot create file_actions\n");
-        }
-        if ((ret = posix_spawn_file_actions_addchdir(&actions, "/tmp"))) {
-            printf("cannot add_chdir\n");
-        }
-        if ((ret = posix_spawnp(&pid, "pwd", &actions, NULL, argv, env))) {
-            printf("cannot spawn\n");
-        }
-    } else {
-        printf(":(\n");
-    }
-}
diff --git a/pkgs/by-name/ap/apple-sdk_26-test/src/meson.build b/pkgs/by-name/ap/apple-sdk_26-test/src/meson.build
deleted file mode 100644
index ef3a4c6179aa..000000000000
--- a/pkgs/by-name/ap/apple-sdk_26-test/src/meson.build
+++ /dev/null
@@ -1,2 +0,0 @@
-project('apple-sdk_26-test', 'objc')
-executable('apple-sdk_26-test', 'apple-sdk_26-test.m', install : true)

From d9ab8762935861e148d63ce078c35265a52fbe18 Mon Sep 17 00:00:00 2001
From: Robert Hensing <roberth@users.noreply.github.com>
Date: Thu, 23 Oct 2025 21:22:33 +0200
Subject: [PATCH 2117/6226] netlify-cli: add issue link

---
 pkgs/by-name/ne/netlify-cli/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ne/netlify-cli/package.nix b/pkgs/by-name/ne/netlify-cli/package.nix
index ceda6d70bf65..cdb3a637e605 100644
--- a/pkgs/by-name/ne/netlify-cli/package.nix
+++ b/pkgs/by-name/ne/netlify-cli/package.nix
@@ -22,6 +22,7 @@ buildNpmPackage rec {
 
   # Prevent postinstall script from running before package is built
   # See https://github.com/netlify/cli/blob/v23.9.2/scripts/postinstall.js#L70
+  # This currently breaks completions: https://github.com/NixOS/nixpkgs/issues/455005
   postPatch = ''
     touch .git
   '';

From 528569533c72b10440e0de1b786f2828c9f85c30 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 16:34:22 -0300
Subject: [PATCH 2118/6226] oatpp: fix build with cmake4

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

diff --git a/pkgs/by-name/oa/oatpp/package.nix b/pkgs/by-name/oa/oatpp/package.nix
index 92c52aa4a992..a0daeafbd9d0 100644
--- a/pkgs/by-name/oa/oatpp/package.nix
+++ b/pkgs/by-name/oa/oatpp/package.nix
@@ -21,6 +21,11 @@ stdenv.mkDerivation rec {
   # Tests fail on darwin. See https://github.com/NixOS/nixpkgs/pull/105419#issuecomment-735826894
   doCheck = !stdenv.hostPlatform.isDarwin;
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://oatpp.io/";
     description = "Light and powerful C++ web framework for highly scalable and resource-efficient web applications";

From c86b7a29980f95b6bce3942470256ad6953a49e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 19:45:35 +0000
Subject: [PATCH 2119/6226] goa: 3.21.5 -> 3.22.6

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

diff --git a/pkgs/by-name/go/goa/package.nix b/pkgs/by-name/go/goa/package.nix
index 4bb4e08820c8..3cb81e2aa6cf 100644
--- a/pkgs/by-name/go/goa/package.nix
+++ b/pkgs/by-name/go/goa/package.nix
@@ -6,15 +6,15 @@
 
 buildGoModule rec {
   pname = "goa";
-  version = "3.21.5";
+  version = "3.22.6";
 
   src = fetchFromGitHub {
     owner = "goadesign";
     repo = "goa";
     rev = "v${version}";
-    hash = "sha256-3MRxiZK6rLc0Drn3Ha7YOZO3IGNkQNEpzppZwYcZLwg=";
+    hash = "sha256-gDcdk5xRb/CeX5PlfgxTOLru1GHcU3fbFzISPhqe/u4=";
   };
-  vendorHash = "sha256-5XKAfUA3dh1Vgh72h1GeiheoL7E7jij3nAlncV5FjF8=";
+  vendorHash = "sha256-k1tKdU7QWgei8X+mhAYAZwRDkwInPFNyvKZcISjUGIg=";
 
   subPackages = [ "cmd/goa" ];
 

From 8010b9911dfe930ebb2178d3f5d6039383bb0cbc Mon Sep 17 00:00:00 2001
From: SkohTV <contact@skoh.dev>
Date: Thu, 23 Oct 2025 15:53:12 -0400
Subject: [PATCH 2120/6226] scribus: fix qt6.10 build

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

diff --git a/pkgs/by-name/sc/scribus/package.nix b/pkgs/by-name/sc/scribus/package.nix
index 66b884951460..59593ed3b1fd 100644
--- a/pkgs/by-name/sc/scribus/package.nix
+++ b/pkgs/by-name/sc/scribus/package.nix
@@ -116,6 +116,11 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/scribusproject/scribus/commit/ff6c6abfa8683028e548a269dee6a859b6f63335.patch";
       hash = "sha256-N4jve5feehsX5H0RXdxR4ableKL+c/rTyqCwkEf37Dk=";
     })
+    (fetchpatch {
+      name = "fix-qt6.10-build.patch";
+      url = "https://github.com/scribusproject/scribus/commit/13fc4f874354511e05bf91a48703b57b4c489715.patch";
+      hash = "sha256-+pbQ77SaTh04QX55wmS6WeuZf3IGe5nq3pmrhk68tb8=";
+    })
   ];
 
   meta = {

From 8a5c0deead7e641ae8696da64c1ee01c1078043a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 19:58:19 +0000
Subject: [PATCH 2121/6226] heynote: 2.6.1 -> 2.6.2

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

diff --git a/pkgs/by-name/he/heynote/package.nix b/pkgs/by-name/he/heynote/package.nix
index 7c3333def150..4f2ce9b7a6f8 100644
--- a/pkgs/by-name/he/heynote/package.nix
+++ b/pkgs/by-name/he/heynote/package.nix
@@ -7,11 +7,11 @@
 }:
 let
   pname = "heynote";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchurl {
     url = "https://github.com/heyman/heynote/releases/download/v${version}/Heynote_${version}_x86_64.AppImage";
-    sha256 = "sha256-NA7oKutjxj1Chv7EJ0V7L0uF1oMSZqh97Ly6UYbzhuQ=";
+    sha256 = "sha256-nA1FRjh9lKdTZXUfuECl5BlW5phYaoh7HOOCKDQuOGQ=";
   };
 
   appimageContents = appimageTools.extractType2 {

From b03bdc12127a7d4ba53dddcde861e33190111b66 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Thu, 23 Oct 2025 22:11:25 +0200
Subject: [PATCH 2122/6226] ruff: 0.14.1 -> 0.14.2

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

diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 7411af78662d..1f8b1afdd4a0 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -16,18 +16,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruff";
-  version = "0.14.1";
+  version = "0.14.2";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     tag = finalAttrs.version;
-    hash = "sha256-jBhlaLWoWp+sNsLBrHoT3J5dtdU1sZzuuhugw9UVw+c=";
+    hash = "sha256-bHcmnfbdPzCX/Eqy5o+hVqhggfsPwZeUVjXV9wF6fNE=";
   };
 
   cargoBuildFlags = [ "--package=ruff" ];
 
-  cargoHash = "sha256-shDP5j3mGpnFV0cuFmsWfPoOzJB/wSTUEjNUO+CIadg=";
+  cargoHash = "sha256-lAluzoRONfkyspcMCp7wNei0R3dgpAwwwpRAmbTNl1k=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 8e182d47d15679a8a79d9b89460ecf54f9bf0a64 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 20:12:05 +0000
Subject: [PATCH 2123/6226] k9s: 0.50.15 -> 0.50.16

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

diff --git a/pkgs/by-name/k9/k9s/package.nix b/pkgs/by-name/k9/k9s/package.nix
index 97f2b9fc7948..ea3b978a5f11 100644
--- a/pkgs/by-name/k9/k9s/package.nix
+++ b/pkgs/by-name/k9/k9s/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "k9s";
-  version = "0.50.15";
+  version = "0.50.16";
 
   src = fetchFromGitHub {
     owner = "derailed";
     repo = "k9s";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rTG2UtrVLlF+dFFJiNErYG6GL4ZQdwPlj1kdaLxh6TI=";
+    hash = "sha256-PYaVzUAQuy5LBkyJ3otWX1iRYWSkt4sD3HIvpGTOiQY=";
   };
 
   ldflags = [
@@ -32,7 +32,7 @@ buildGoModule (finalAttrs: {
 
   proxyVendor = true;
 
-  vendorHash = "sha256-Djz23/Ef7T7giE/KDsnbWnihwW37o40jevwVt8CbiQE=";
+  vendorHash = "sha256-KuF0CCabhEqF4yEtj3ARRM2DkYdXWWwCm4P0nruHjso=";
 
   # TODO investigate why some config tests are failing
   doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64);

From 1fbbd18ad6b85c98eb3c24820652b1967f7bb7a1 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Thu, 23 Oct 2025 21:12:12 +0100
Subject: [PATCH 2124/6226] vscode-extensions.augment.vscode-augment: init at
 0.603.0

---
 .../augment.vscode-augment/default.nix        | 23 +++++++++++++++++++
 .../editors/vscode/extensions/default.nix     |  2 ++
 2 files changed, 25 insertions(+)
 create mode 100644 pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix

diff --git a/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix b/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix
new file mode 100644
index 000000000000..b3e5278e5f39
--- /dev/null
+++ b/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  vscode-utils,
+}:
+
+vscode-utils.buildVscodeMarketplaceExtension {
+  mktplcRef = {
+    name = "vscode-augment";
+    publisher = "augment";
+    version = "0.603.0";
+    hash = "sha256-1CBZnBTu03iubIcIrUvCKeN6RtjKO3NUEXggdXTAwM8=";
+  };
+
+  meta = {
+    changelog = "https://marketplace.visualstudio.com/items/augment.vscode-augment/changelog";
+    description = "AI-powered coding assistant for VSCode";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=augment.vscode-augment";
+    homepage = "https://augmentcode.com/";
+    license = lib.licenses.unfree;
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    maintainers = [ lib.maintainers.matteopacini ];
+  };
+}
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 63cb59813f4f..b2b6e15dbe49 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -443,6 +443,8 @@ let
         };
       };
 
+      augment.vscode-augment = callPackage ./augment.vscode-augment { };
+
       azdavis.millet = callPackage ./azdavis.millet { };
 
       b4dm4n.vscode-nixpkgs-fmt = callPackage ./b4dm4n.vscode-nixpkgs-fmt { };

From c407ca6392b694f3e1cf89166a568a19171638f4 Mon Sep 17 00:00:00 2001
From: er0k <er0k@er0k.net>
Date: Wed, 22 Oct 2025 23:36:35 -0400
Subject: [PATCH 2125/6226] maintainers: add er0k

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 94f4899b4d51..e9507ed73db1 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7715,6 +7715,13 @@
     githubId = 3422442;
     name = "Ruben Maher";
   };
+  er0k = {
+    email = "er0k@er0k.net";
+    github = "er0k";
+    githubId = 916239;
+    name = "er0k";
+    keys = [ { fingerprint = "60DE 4570 2E31 81A2 AF87  F075 B005 BA3C 8EE8 108D"; } ];
+  };
   eraserhd = {
     email = "jason.m.felice@gmail.com";
     github = "eraserhd";

From 0b0687eb89862c86889212d43ef5a7193c46083d Mon Sep 17 00:00:00 2001
From: er0k <er0k@er0k.net>
Date: Wed, 22 Oct 2025 19:12:05 -0400
Subject: [PATCH 2126/6226] aws-vault: 7.2.0 -> 7.7.5, switch to maintained
 fork

fixes https://github.com/NixOS/nixpkgs/issues/454530

see also:
- https://github.com/Homebrew/homebrew-core/pull/226185
- https://github.com/99designs/aws-vault/issues/1269
- https://github.com/99designs/aws-vault/pull/1270
- https://github.com/ByteNess/aws-vault/releases
---
 pkgs/by-name/aw/aws-vault/package.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix
index 4a84309316c6..1b8f289f9c3e 100644
--- a/pkgs/by-name/aw/aws-vault/package.nix
+++ b/pkgs/by-name/aw/aws-vault/package.nix
@@ -9,16 +9,17 @@
 }:
 buildGoModule rec {
   pname = "aws-vault";
-  version = "7.2.0";
+  version = "7.7.5";
 
   src = fetchFromGitHub {
-    owner = "99designs";
+    owner = "ByteNess";
     repo = "aws-vault";
     rev = "v${version}";
-    hash = "sha256-Qs4vxFgehWQYYECBGBSU8YI/BHLwOQUO5wBlNEUzD7c=";
+    hash = "sha256-K91GNyvtjDO6UMU9cC+TbUdMWdXrPlKLU8u5cbEMdRA=";
   };
 
-  vendorHash = "sha256-4bJKDEZlO0DzEzTQ7m+SQuzhe+wKmL6wLueqgSz/46s=";
+  proxyVendor = true;
+  vendorHash = "sha256-3AL3vjKqzjrzgPrLLwIgWpn1hRB6soTMbaRly/fvziA=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -55,8 +56,11 @@ buildGoModule rec {
   meta = with lib; {
     description = "Vault for securely storing and accessing AWS credentials in development environments";
     mainProgram = "aws-vault";
-    homepage = "https://github.com/99designs/aws-vault";
+    homepage = "https://github.com/ByteNess/aws-vault";
     license = licenses.mit;
-    maintainers = with maintainers; [ zimbatm ];
+    maintainers = with maintainers; [
+      zimbatm
+      er0k
+    ];
   };
 }

From b531698d03a340441f2229fab95ba850045256a8 Mon Sep 17 00:00:00 2001
From: er0k <er0k@er0k.net>
Date: Thu, 23 Oct 2025 16:12:31 -0400
Subject: [PATCH 2127/6226] aws-vault: disable cgo

---
 pkgs/by-name/aw/aws-vault/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix
index 1b8f289f9c3e..f571c25b9782 100644
--- a/pkgs/by-name/aw/aws-vault/package.nix
+++ b/pkgs/by-name/aw/aws-vault/package.nix
@@ -26,6 +26,8 @@ buildGoModule rec {
     makeWrapper
   ];
 
+  env.CGO_ENABLED = "0";
+
   postInstall = ''
     # make xdg-open overrideable at runtime
     # aws-vault uses https://github.com/skratchdot/open-golang/blob/master/open/open.go to open links

From b72e3b389d0be6c32fc25c69e7f202ca590f5b07 Mon Sep 17 00:00:00 2001
From: drafolin <derg@drafolin.ch>
Date: Thu, 23 Oct 2025 22:15:49 +0200
Subject: [PATCH 2128/6226] teamspeak6-client: added drafolin to maintainers
 list

---
 pkgs/by-name/te/teamspeak6-client/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/te/teamspeak6-client/package.nix b/pkgs/by-name/te/teamspeak6-client/package.nix
index 582f2a470e40..fb7ca2a4be55 100644
--- a/pkgs/by-name/te/teamspeak6-client/package.nix
+++ b/pkgs/by-name/te/teamspeak6-client/package.nix
@@ -119,6 +119,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = lib.licenses.teamspeak;
     mainProgram = "TeamSpeak";
     maintainers = with lib.maintainers; [
+      drafolin
       gepbird
       jojosch
     ];

From de664dde49fd94f3c0297f466217b3d4b469d4d9 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sun, 28 Sep 2025 10:48:01 +0200
Subject: [PATCH 2129/6226] freebsd.libspl: fix meta attr

---
 pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix
index f8b4859a68eb..0aed42cbaa40 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libspl.nix
@@ -18,7 +18,7 @@ mkDerivation {
   alwaysKeepStatic = true;
 
   meta = with lib; {
-    platform = platforms.freebsd;
+    platforms = platforms.freebsd;
     license = licenses.cddl;
   };
 }

From 4e01dacc84cf329d9ac7ff5210c6b81eb21df1e0 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sun, 28 Sep 2025 10:49:55 +0200
Subject: [PATCH 2130/6226] rxvt-unicode: filter plugins for derivations

---
 pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix
index eec7b86883eb..a161e9544265 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix
@@ -16,7 +16,7 @@
 }:
 
 let
-  availablePlugins = rxvt-unicode-plugins;
+  availablePlugins = lib.filterAttrs (_: v: lib.isDerivation v) rxvt-unicode-plugins;
 
   # Transform the string "self" to the plugin itself.
   # It's needed for plugins like bidi who depends on the perl

From 972730affd94d7ef96ba367a9ec4a37a47462ff7 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sun, 28 Sep 2025 10:53:35 +0200
Subject: [PATCH 2131/6226] tests.buildRustCrate.test: filter tests for
 derivations

---
 pkgs/build-support/rust/build-rust-crate/test/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
index 208714152c56..c56f153b487e 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -917,6 +917,6 @@ rec {
       description = "Test cases for buildRustCrate";
       maintainers = [ ];
     };
-    constituents = builtins.attrValues tests;
+    constituents = builtins.attrValues (lib.filterAttrs (_: v: lib.isDerivation v) tests);
   };
 }

From cd6b9e73c542fe8bc503b3d8749dbece56cddfb6 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Sat, 4 Oct 2025 20:21:27 +0000
Subject: [PATCH 2132/6226] python3Packages.wgpu-py: 0.23.0 -> 0.25.0

---
 pkgs/development/python-modules/wgpu-py/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/wgpu-py/default.nix b/pkgs/development/python-modules/wgpu-py/default.nix
index 0760ef3f2270..a00c2e7f8ab8 100644
--- a/pkgs/development/python-modules/wgpu-py/default.nix
+++ b/pkgs/development/python-modules/wgpu-py/default.nix
@@ -29,6 +29,7 @@
   psutil,
   pypng,
   pytest,
+  rendercanvas,
   ruff,
   trio,
 
@@ -38,14 +39,14 @@
 }:
 buildPythonPackage rec {
   pname = "wgpu-py";
-  version = "0.23.0";
+  version = "0.25.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pygfx";
     repo = "wgpu-py";
     tag = "v${version}";
-    hash = "sha256-z9MRnhPSI+9lGS0UQ5VnSwdCGdYdNnqlDQmb8JAqmyc=";
+    hash = "sha256-TErwgzujuHafvSiNpfmga9GQtvGFFkDjBqe8eX/dlP8=";
   };
 
   postPatch =
@@ -63,11 +64,6 @@ buildPythonPackage rec {
     + ''
       substituteInPlace examples/compute_textures.py \
         --replace-fail 'import wgpu' 'import wgpu # run_example = false'
-    ''
-    # Tweak tests that fail due to a dependency of `wgpu-native`, `naga`, adding an `ir` module
-    + ''
-      substituteInPlace tests/test_wgpu_native_errors.py \
-        --replace-fail 'naga::' 'naga::ir::'
     '';
 
   # wgpu-py expects to have an appropriately named wgpu-native library in wgpu/resources
@@ -111,6 +107,8 @@ buildPythonPackage rec {
     psutil
     pypng
     pytest
+    # break circular dependency cycle
+    (rendercanvas.overrideAttrs { doInstallCheck = false; })
     ruff
     trio
   ];

From 6fb07ee11ae478fd208aaf7a482277e012bef515 Mon Sep 17 00:00:00 2001
From: "Braian A. Diez" <bdiez19@gmail.com>
Date: Thu, 23 Oct 2025 16:58:58 -0300
Subject: [PATCH 2133/6226] undercut-f1: init at 3.3.51

---
 pkgs/by-name/un/undercut-f1/deps.json   | 1007 +++++++++++++++++++++++
 pkgs/by-name/un/undercut-f1/package.nix |   98 +++
 2 files changed, 1105 insertions(+)
 create mode 100644 pkgs/by-name/un/undercut-f1/deps.json
 create mode 100644 pkgs/by-name/un/undercut-f1/package.nix

diff --git a/pkgs/by-name/un/undercut-f1/deps.json b/pkgs/by-name/un/undercut-f1/deps.json
new file mode 100644
index 000000000000..446e8c24aaf8
--- /dev/null
+++ b/pkgs/by-name/un/undercut-f1/deps.json
@@ -0,0 +1,1007 @@
+[
+  {
+    "pname": "AutoMapper",
+    "version": "14.0.0",
+    "hash": "sha256-gaq2pLkiuki7Pmlb6Ld3+x/hrnoue1zGVw8oGOpSsrw="
+  },
+  {
+    "pname": "AutoMapper.Collection",
+    "version": "11.0.0",
+    "hash": "sha256-zOXvQz0kcrc7PwiAUkYD3HtefETvsbaBzVzrbO/5fqo="
+  },
+  {
+    "pname": "Castle.Core",
+    "version": "5.0.0",
+    "hash": "sha256-o0dLsy0RfVOIggymFbUJMhfR3XDp6uFI3G1o4j9o2Lg="
+  },
+  {
+    "pname": "FFMpegCore",
+    "version": "5.2.0",
+    "hash": "sha256-YLJJchPe7vpiLTt6lwuPrdvgTm0xxz/4ELJOjnqWw5E="
+  },
+  {
+    "pname": "HarfBuzzSharp",
+    "version": "7.3.0.3",
+    "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.macOS",
+    "version": "7.3.0.3",
+    "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Win32",
+    "version": "7.3.0.3",
+    "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I="
+  },
+  {
+    "pname": "Humanizer.Core",
+    "version": "2.14.1",
+    "hash": "sha256-EXvojddPu+9JKgOG9NSQgUTfWq1RpOYw7adxDPKDJ6o="
+  },
+  {
+    "pname": "InMemoryLogger",
+    "version": "1.0.66",
+    "hash": "sha256-Co/4Mk5CEeEVMGG0vAEPmkKQzh8p6+mcvoClxXYDIa8="
+  },
+  {
+    "pname": "Instances",
+    "version": "3.0.1",
+    "hash": "sha256-vWfpCcQ/iTsVot9rug/TSu5nPCJ3JUyxzX6bP3uEtfM="
+  },
+  {
+    "pname": "Json.More.Net",
+    "version": "2.1.1",
+    "hash": "sha256-GeSZS/bROemFLq4uq7Fj5eRupOu/rqWKR58PkbJqWBU="
+  },
+  {
+    "pname": "JsonPointer.Net",
+    "version": "5.3.1",
+    "hash": "sha256-nV1r0doxPiApc2sEI4AulBz+arLWF2VSnHm9tymBJzE="
+  },
+  {
+    "pname": "JsonSchema.Net",
+    "version": "7.4.0",
+    "hash": "sha256-j6QMakexHXNAsf7emMnYgjTvnXSj0xCHgYLs184Z0p0="
+  },
+  {
+    "pname": "JsonSchema.Net.Generation",
+    "version": "5.1.1",
+    "hash": "sha256-7bMXejeds/8g0b3upesiLqzjE3KvyU7qT4FdyJhMGss="
+  },
+  {
+    "pname": "LiveChartsCore",
+    "version": "2.0.0-rc5.4",
+    "hash": "sha256-Qw1Iyld75RXpvGJn/EQvd+f4Jh1SVAoqjjl/I0ctyWw="
+  },
+  {
+    "pname": "LiveChartsCore.SkiaSharpView",
+    "version": "2.0.0-rc5.4",
+    "hash": "sha256-hlFYZu25Z2iTgoIL9cczN4BYYHzSXvzC7593e52x914="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.Connections.Abstractions",
+    "version": "9.0.10",
+    "hash": "sha256-w2tDobldb+kxZpJf2SwLYkvkgysgyo8jnZRzhAyW2FY="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.Http.Connections.Client",
+    "version": "9.0.10",
+    "hash": "sha256-E1RBf/lG+vJY2kMXb1rCFy2/7SUi8c6J/xn6nnZ7buk="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.Http.Connections.Common",
+    "version": "9.0.10",
+    "hash": "sha256-nWdTQRfznzjPeHZ3hQhJr1TSkcEr9Aenvj0PCe4DJ9k="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.SignalR.Client",
+    "version": "9.0.10",
+    "hash": "sha256-/HhDVi1MhSZCFEpA2AFCotl3/uba4O/rwX0o4XO6KIs="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.SignalR.Client.Core",
+    "version": "9.0.10",
+    "hash": "sha256-QtoZ/C1xj1Q1moxhwzqjbMGkWIZ6Eegm1y5TCUWSOJk="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.SignalR.Common",
+    "version": "9.0.10",
+    "hash": "sha256-s/YrLu1SwZvMG1ep9Sriz/nlhKkiAaVdsDc4Li8VVaY="
+  },
+  {
+    "pname": "Microsoft.AspNetCore.SignalR.Protocols.Json",
+    "version": "9.0.10",
+    "hash": "sha256-ERiXEu/r9FSOU93Qd9er/63avF6nEbAiowQ9Msbqk58="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.BannedApiAnalyzers",
+    "version": "3.3.4",
+    "hash": "sha256-YPTHTZ8xRPMLADdcVYRO/eq3O9uZjsD+OsGRZE+0+e8="
+  },
+  {
+    "pname": "Microsoft.CodeCoverage",
+    "version": "17.14.1",
+    "hash": "sha256-f8QytG8GvRoP47rO2KEmnDLxIpyesaq26TFjDdW40Gs="
+  },
+  {
+    "pname": "Microsoft.CSharp",
+    "version": "4.7.0",
+    "hash": "sha256-Enknv2RsFF68lEPdrf5M+BpV1kHoLTVRApKUwuk/pj0="
+  },
+  {
+    "pname": "Microsoft.Extensions.ApiDescription.Server",
+    "version": "6.0.5",
+    "hash": "sha256-RJjBWz+UHxkQE2s7CeGYdTZ218mCufrxl0eBykZdIt4="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration",
+    "version": "9.0.10",
+    "hash": "sha256-K16pSHfb71WhGqD7mzjrYaNBihU4tga90c6IOHsgRxw="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Abstractions",
+    "version": "9.0.10",
+    "hash": "sha256-sRv0yS2sbyli7eejtnpmd7UIAz4PwSt5/Po5Irc1j98="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Binder",
+    "version": "2.2.0",
+    "hash": "sha256-cigv0t9SntPWjJyRWMy3Q5KnuF17HoDyeKq26meTHoM="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Binder",
+    "version": "8.0.0",
+    "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Binder",
+    "version": "9.0.10",
+    "hash": "sha256-4NEBx28byvjjIzo0wQPIUUymk9AzSgPS4fu5IRxkIt4="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.CommandLine",
+    "version": "9.0.10",
+    "hash": "sha256-lgBXA1ovyeEqH9xmLNxxMB2/OLILt7AW6BXf+yc8wqs="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.EnvironmentVariables",
+    "version": "9.0.10",
+    "hash": "sha256-D4Myt5rp8jxOvuQ4zwo/1bfNfLDZHrBYx7+UDOnhWgA="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.FileExtensions",
+    "version": "9.0.10",
+    "hash": "sha256-I8ywPAfg7GPQgOuA5TPXuseurWKk7BmXsnaowF80XEQ="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Json",
+    "version": "9.0.10",
+    "hash": "sha256-ykcnGdvnx19q3dpwZ9A09k+6iIGNurVebe4nUaOBtng="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.UserSecrets",
+    "version": "9.0.10",
+    "hash": "sha256-t4ssmlaX/lVemYekfubS841MStq00+C2h2HY1HyZQvQ="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection",
+    "version": "9.0.10",
+    "hash": "sha256-f3r2msA/oV9gGdFn9OEr5bPAfINR17P+sS6/2/NnCuk="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "2.2.0",
+    "hash": "sha256-pf+UQToJnhAe8VuGjxyCTvua1nIX8n5NHzAUk3Jz38s="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "7.0.0",
+    "hash": "sha256-55lsa2QdX1CJn1TpW1vTnkvbGXKCeE9P0O6AkW49LaA="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "8.0.0",
+    "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "9.0.10",
+    "hash": "sha256-5rwFXG+Wjbf+TkXeWrkGVKV4wfvOryTPadEkEyPyKj4="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyModel",
+    "version": "8.0.0",
+    "hash": "sha256-qkCdwemqdZY/yIW5Xmh7Exv74XuE39T8aHGHCofoVgo="
+  },
+  {
+    "pname": "Microsoft.Extensions.Diagnostics",
+    "version": "9.0.10",
+    "hash": "sha256-QOjI52VFJne2OpvSPeoep/AcPXvwtr9AtvU0xdCIWog="
+  },
+  {
+    "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
+    "version": "9.0.10",
+    "hash": "sha256-FXJrBpG4UieCn9MLcNX25WbPycfZWdPg38/ZLckmAI0="
+  },
+  {
+    "pname": "Microsoft.Extensions.Features",
+    "version": "9.0.10",
+    "hash": "sha256-SVtG0MpqgdSRU4hLOe7uDY/MYo8o/70ZCEhCTjwMDCs="
+  },
+  {
+    "pname": "Microsoft.Extensions.FileProviders.Abstractions",
+    "version": "9.0.10",
+    "hash": "sha256-NJUg0fFe+djIUkdYhJDCG5A1JU9hhQ5GXGsz+gBEaFo="
+  },
+  {
+    "pname": "Microsoft.Extensions.FileProviders.Physical",
+    "version": "9.0.10",
+    "hash": "sha256-fqh0OzyoSouNpJkVp/stjqD2NInnBKX9n6JPx+HD5Q0="
+  },
+  {
+    "pname": "Microsoft.Extensions.FileSystemGlobbing",
+    "version": "9.0.10",
+    "hash": "sha256-m3gjvbPKl36XlrOzCjNHEhWjQcG8agZ5REc/EIOExmQ="
+  },
+  {
+    "pname": "Microsoft.Extensions.Hosting",
+    "version": "9.0.10",
+    "hash": "sha256-SImJyuK5D7uR0AjWFz6JwqvPZ5VVHPVK79T7vqTUs0g="
+  },
+  {
+    "pname": "Microsoft.Extensions.Hosting.Abstractions",
+    "version": "8.0.0",
+    "hash": "sha256-0JBx+wwt5p1SPfO4m49KxNOXPAzAU0A+8tEc/itvpQE="
+  },
+  {
+    "pname": "Microsoft.Extensions.Hosting.Abstractions",
+    "version": "9.0.10",
+    "hash": "sha256-CrysJ8NO0kx9smoGIk0Oz05RnISTUcPVjTLpRKeVBgQ="
+  },
+  {
+    "pname": "Microsoft.Extensions.Hosting.Systemd",
+    "version": "8.0.0",
+    "hash": "sha256-uIOHZNnFRu9mgyoGnZ4sqKJdfSsSjOv21RuF6TnqHco="
+  },
+  {
+    "pname": "Microsoft.Extensions.Http",
+    "version": "9.0.10",
+    "hash": "sha256-cDC63R943sHVw34V64A3weVY1KgrjhE3dCtDJfGLaQA="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging",
+    "version": "2.2.0",
+    "hash": "sha256-lY9axb6/MyPAhE+N8VtfCIpD80AFCtxUnnGxvb2koy8="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging",
+    "version": "8.0.0",
+    "hash": "sha256-Meh0Z0X7KyOEG4l0RWBcuHHihcABcvCyfUXgasmQ91o="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging",
+    "version": "9.0.10",
+    "hash": "sha256-/Et36NBhpMoxQzI+p/moW7knwYDfjI7Ma7DF7KIYn+Q="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "2.2.0",
+    "hash": "sha256-lJeKyhBnDc4stX2Wd7WpcG+ZKxPTFHILZSezKM2Fhws="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "8.0.0",
+    "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "9.0.10",
+    "hash": "sha256-PtYXXHi+mbdQMh2QtA57NbWlt+JEpXiey36zLzbKTmo="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Configuration",
+    "version": "9.0.10",
+    "hash": "sha256-z2lcPYfDld5XiqyLYRLBHe29rbO9j135W2U1HyoRXJI="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Console",
+    "version": "9.0.10",
+    "hash": "sha256-qM1mcbTK4YmzcWNC0U5f0cunB2CFafTsNzldH5g9Q7E="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Debug",
+    "version": "9.0.10",
+    "hash": "sha256-x3B8uLpMuIUru3LxEg1ZMYkE5QkcfFe9fMCSUO1kakM="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.EventLog",
+    "version": "9.0.10",
+    "hash": "sha256-TzOq62cH8KolfIvXnWapvPdmCdDxiKF7tg5ICE6iwEk="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.EventSource",
+    "version": "9.0.10",
+    "hash": "sha256-GGxnzocUi1se0kkysvkZ5QpN3p/N1VbrLkpeVPS18Ks="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "8.0.0",
+    "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "9.0.10",
+    "hash": "sha256-QTNhi83xhjJuIQ/3QffzQs/KY7avNyBMvnkuuSr3pBo="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
+    "version": "9.0.10",
+    "hash": "sha256-4YxwQH66IhJiJP53/Fy/lGBIEkVo4k+o/5QxzFQLhfQ="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "8.0.0",
+    "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "9.0.10",
+    "hash": "sha256-It7NQ+Ap/hrqFX3LXDVJqVz1Xl3j8QIapYDcG2MQ/7w="
+  },
+  {
+    "pname": "Microsoft.NET.Test.Sdk",
+    "version": "17.14.1",
+    "hash": "sha256-mZUzDFvFp7x1nKrcnRd0hhbNu5g8EQYt8SKnRgdhT/A="
+  },
+  {
+    "pname": "Microsoft.NETCore.Platforms",
+    "version": "1.1.0",
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
+  },
+  {
+    "pname": "Microsoft.NETCore.Targets",
+    "version": "1.1.0",
+    "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
+  },
+  {
+    "pname": "Microsoft.OpenApi",
+    "version": "1.2.3",
+    "hash": "sha256-OafkxXKnDmLZo5tjifjycax0n0F/OnWQTEZCntBMYR0="
+  },
+  {
+    "pname": "Microsoft.TestPlatform.ObjectModel",
+    "version": "17.14.1",
+    "hash": "sha256-QMf6O+w0IT+16Mrzo7wn+N20f3L1/mDhs/qjmEo1rYs="
+  },
+  {
+    "pname": "Microsoft.TestPlatform.TestHost",
+    "version": "17.14.1",
+    "hash": "sha256-1cxHWcvHRD7orQ3EEEPPxVGEkTpxom1/zoICC9SInJs="
+  },
+  {
+    "pname": "Microsoft.Win32.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg="
+  },
+  {
+    "pname": "Nerdbank.GitVersioning",
+    "version": "3.7.115",
+    "hash": "sha256-sqn+i7vvBgBUtm7j82mH+SpApgI2hsmL5DYfLm1Z7gw="
+  },
+  {
+    "pname": "NETStandard.Library",
+    "version": "1.6.1",
+    "hash": "sha256-iNan1ix7RtncGWC9AjAZ2sk70DoxOsmEOgQ10fXm4Pw="
+  },
+  {
+    "pname": "Newtonsoft.Json",
+    "version": "13.0.3",
+    "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
+  },
+  {
+    "pname": "NSubstitute",
+    "version": "5.0.0",
+    "hash": "sha256-E+eDNK6qzsN8MDbT0STfNeVKXf41aVe86v+ib9NgTMU="
+  },
+  {
+    "pname": "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-LXUPLX3DJxsU1Pd3UwjO1PO9NM2elNEDXeu2Mu/vNps="
+  },
+  {
+    "pname": "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-qeSqaUI80+lqw5MK4vMpmO0CZaqrmYktwp6L+vQAb0I="
+  },
+  {
+    "pname": "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
+  },
+  {
+    "pname": "runtime.native.System",
+    "version": "4.3.0",
+    "hash": "sha256-ZBZaodnjvLXATWpXXakFgcy6P+gjhshFXmglrL5xD5Y="
+  },
+  {
+    "pname": "runtime.native.System.IO.Compression",
+    "version": "4.3.0",
+    "hash": "sha256-DWnXs4vlKoU6WxxvCArTJupV6sX3iBbZh8SbqfHace8="
+  },
+  {
+    "pname": "runtime.native.System.Net.Http",
+    "version": "4.3.0",
+    "hash": "sha256-c556PyheRwpYhweBjSfIwEyZHnAUB8jWioyKEcp/2dg="
+  },
+  {
+    "pname": "runtime.native.System.Security.Cryptography.Apple",
+    "version": "4.3.0",
+    "hash": "sha256-2IhBv0i6pTcOyr8FFIyfPEaaCHUmJZ8DYwLUwJ+5waw="
+  },
+  {
+    "pname": "runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-Jy01KhtcCl2wjMpZWH+X3fhHcVn+SyllWFY8zWlz/6I="
+  },
+  {
+    "pname": "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-wyv00gdlqf8ckxEdV7E+Ql9hJIoPcmYEuyeWb5Oz3mM="
+  },
+  {
+    "pname": "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-zi+b4sCFrA9QBiSGDD7xPV27r3iHGlV99gpyVUjRmc4="
+  },
+  {
+    "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple",
+    "version": "4.3.0",
+    "hash": "sha256-serkd4A7F6eciPiPJtUyJyxzdAtupEcWIZQ9nptEzIM="
+  },
+  {
+    "pname": "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-gybQU6mPgaWV3rBG2dbH6tT3tBq8mgze3PROdsuWnX0="
+  },
+  {
+    "pname": "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-VsP72GVveWnGUvS/vjOQLv1U80H2K8nZ4fDAmI61Hm4="
+  },
+  {
+    "pname": "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-4yKGa/IrNCKuQ3zaDzILdNPD32bNdy6xr5gdJigyF5g="
+  },
+  {
+    "pname": "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-HmdJhhRsiVoOOCcUvAwdjpMRiyuSwdcgEv2j9hxi+Zc="
+  },
+  {
+    "pname": "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-pVFUKuPPIx0edQKjzRon3zKq8zhzHEzko/lc01V/jdw="
+  },
+  {
+    "pname": "Serilog",
+    "version": "2.10.0",
+    "hash": "sha256-+8wilkt+VVvW+KFWuLryj7cSFpz9D+sz92KYWICAcSE="
+  },
+  {
+    "pname": "Serilog",
+    "version": "3.1.0",
+    "hash": "sha256-1CDAp+AjfFjQqoLvKYp/j6pKTUfNOGfKVlWyqCGHo7k="
+  },
+  {
+    "pname": "Serilog",
+    "version": "3.1.1",
+    "hash": "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI="
+  },
+  {
+    "pname": "Serilog",
+    "version": "4.0.0",
+    "hash": "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw="
+  },
+  {
+    "pname": "Serilog.AspNetCore",
+    "version": "8.0.1",
+    "hash": "sha256-a07P+0co6QuLuUw09PvvpLf9gix88Nw3dACsnSRcuW4="
+  },
+  {
+    "pname": "Serilog.Extensions.Hosting",
+    "version": "8.0.0",
+    "hash": "sha256-OEVkEQoONawJF+SXeyqqgU0OGp9ubtt9aXT+rC25j4E="
+  },
+  {
+    "pname": "Serilog.Extensions.Logging",
+    "version": "8.0.0",
+    "hash": "sha256-GoWxCpkdahMvYd7ZrhwBxxTyjHGcs9ENNHJCp0la6iA="
+  },
+  {
+    "pname": "Serilog.Formatting.Compact",
+    "version": "2.0.0",
+    "hash": "sha256-c3STGleyMijY4QnxPuAz/NkJs1r+TZAPjlmAKLF4+3g="
+  },
+  {
+    "pname": "Serilog.Settings.Configuration",
+    "version": "8.0.0",
+    "hash": "sha256-JQ39fvhOFSUHE6r9DXJvLaZI+Lk7AYzuskQu3ux+hQg="
+  },
+  {
+    "pname": "Serilog.Sinks.Console",
+    "version": "5.0.0",
+    "hash": "sha256-UOVlegJLhs0vK1ml2DZCjFE5roDRZsGCAqD/53ZaZWI="
+  },
+  {
+    "pname": "Serilog.Sinks.Debug",
+    "version": "2.0.0",
+    "hash": "sha256-/PLVAE33lTdUEXdahkI5ddFiGZufWnvfsOodQsFB8sQ="
+  },
+  {
+    "pname": "Serilog.Sinks.File",
+    "version": "5.0.0",
+    "hash": "sha256-GKy9hwOdlu2W0Rw8LiPyEwus+sDtSOTl8a5l9uqz+SQ="
+  },
+  {
+    "pname": "Serilog.Sinks.File",
+    "version": "6.0.0",
+    "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="
+  },
+  {
+    "pname": "SharpWebview",
+    "version": "0.11.3",
+    "hash": "sha256-HLZw90EOVXFGL/pnPHeaAmRQLCxZHSsHvFO6c7RlRIw="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "2.88.9",
+    "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
+  },
+  {
+    "pname": "SkiaSharp.HarfBuzz",
+    "version": "2.88.9",
+    "hash": "sha256-JH8Jr25eftPfq0BztamvxfDcAZtnx/jLRj5DGCS5/G8="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Linux",
+    "version": "2.88.9",
+    "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "2.88.9",
+    "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "2.88.9",
+    "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
+  },
+  {
+    "pname": "Spectre.Console",
+    "version": "0.48.0",
+    "hash": "sha256-hr7BkVJ5v+NOPytlINjo+yoJetRUKmBhZbTMVKOMf2w="
+  },
+  {
+    "pname": "Swashbuckle.AspNetCore",
+    "version": "6.5.0",
+    "hash": "sha256-thAX5M8OihCU5Pmht5FzQPR7K+gbia580KnI8i9kwUw="
+  },
+  {
+    "pname": "Swashbuckle.AspNetCore.Swagger",
+    "version": "6.5.0",
+    "hash": "sha256-bKJG6fhLBB5rKoVm0nc4PfecBtDg/r2G1hrZ6Izryug="
+  },
+  {
+    "pname": "Swashbuckle.AspNetCore.SwaggerGen",
+    "version": "6.5.0",
+    "hash": "sha256-A+n8r9bM8UU0ZpzS5pHqa/JOX+cY0jTbfTH7XfwbCUM="
+  },
+  {
+    "pname": "Swashbuckle.AspNetCore.SwaggerUI",
+    "version": "6.5.0",
+    "hash": "sha256-BxYBRvabFUIRkZ67YbUY6djxbLPtmPlAfREeFNg8HZ4="
+  },
+  {
+    "pname": "System.AppContext",
+    "version": "4.3.0",
+    "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.3.0",
+    "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk="
+  },
+  {
+    "pname": "System.Collections",
+    "version": "4.3.0",
+    "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc="
+  },
+  {
+    "pname": "System.Collections.Concurrent",
+    "version": "4.3.0",
+    "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI="
+  },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "8.0.0",
+    "hash": "sha256-F7OVjKNwpqbUh8lTidbqJWYi476nsq9n+6k0+QVRo3w="
+  },
+  {
+    "pname": "System.CommandLine",
+    "version": "2.0.0-beta6.25358.103",
+    "hash": "sha256-bBd8zRElNoxv793V1bpRbc6etWvLq3I9AKR0/gmhmBY="
+  },
+  {
+    "pname": "System.Console",
+    "version": "4.3.0",
+    "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="
+  },
+  {
+    "pname": "System.Diagnostics.Debug",
+    "version": "4.3.0",
+    "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM="
+  },
+  {
+    "pname": "System.Diagnostics.DiagnosticSource",
+    "version": "4.3.0",
+    "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
+  },
+  {
+    "pname": "System.Diagnostics.EventLog",
+    "version": "6.0.0",
+    "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="
+  },
+  {
+    "pname": "System.Diagnostics.EventLog",
+    "version": "9.0.10",
+    "hash": "sha256-Nl5DqIAwczE10eWNlVz1UpAVO668eNdhyWq+Rfw+QI0="
+  },
+  {
+    "pname": "System.Diagnostics.Tools",
+    "version": "4.3.0",
+    "hash": "sha256-gVOv1SK6Ape0FQhCVlNOd9cvQKBvMxRX9K0JPVi8w0Y="
+  },
+  {
+    "pname": "System.Diagnostics.Tracing",
+    "version": "4.3.0",
+    "hash": "sha256-hCETZpHHGVhPYvb4C0fh4zs+8zv4GPoixagkLZjpa9Q="
+  },
+  {
+    "pname": "System.Globalization",
+    "version": "4.3.0",
+    "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI="
+  },
+  {
+    "pname": "System.Globalization.Calendars",
+    "version": "4.3.0",
+    "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc="
+  },
+  {
+    "pname": "System.Globalization.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk="
+  },
+  {
+    "pname": "System.IO",
+    "version": "4.3.0",
+    "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY="
+  },
+  {
+    "pname": "System.IO.Compression",
+    "version": "4.3.0",
+    "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA="
+  },
+  {
+    "pname": "System.IO.Compression.ZipFile",
+    "version": "4.3.0",
+    "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="
+  },
+  {
+    "pname": "System.IO.FileSystem",
+    "version": "4.3.0",
+    "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw="
+  },
+  {
+    "pname": "System.IO.FileSystem.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg="
+  },
+  {
+    "pname": "System.IO.Pipelines",
+    "version": "8.0.0",
+    "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
+  },
+  {
+    "pname": "System.Linq",
+    "version": "4.3.0",
+    "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
+  },
+  {
+    "pname": "System.Linq.Expressions",
+    "version": "4.3.0",
+    "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8="
+  },
+  {
+    "pname": "System.Memory",
+    "version": "4.5.5",
+    "hash": "sha256-EPQ9o1Kin7KzGI5O3U3PUQAZTItSbk9h/i4rViN3WiI="
+  },
+  {
+    "pname": "System.Net.Http",
+    "version": "4.3.0",
+    "hash": "sha256-UoBB7WPDp2Bne/fwxKF0nE8grJ6FzTMXdT/jfsphj8Q="
+  },
+  {
+    "pname": "System.Net.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-MY7Z6vOtFMbEKaLW9nOSZeAjcWpwCtdO7/W1mkGZBzE="
+  },
+  {
+    "pname": "System.Net.ServerSentEvents",
+    "version": "9.0.10",
+    "hash": "sha256-CbvTNiqbAvtR/zEHdRvfVM+6a/pX7S+8gFX+Yda4b1I="
+  },
+  {
+    "pname": "System.Net.Sockets",
+    "version": "4.3.0",
+    "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
+  },
+  {
+    "pname": "System.ObjectModel",
+    "version": "4.3.0",
+    "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q="
+  },
+  {
+    "pname": "System.Reflection",
+    "version": "4.3.0",
+    "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
+  },
+  {
+    "pname": "System.Reflection.Emit",
+    "version": "4.3.0",
+    "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU="
+  },
+  {
+    "pname": "System.Reflection.Emit.ILGeneration",
+    "version": "4.3.0",
+    "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
+  },
+  {
+    "pname": "System.Reflection.Emit.Lightweight",
+    "version": "4.3.0",
+    "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
+  },
+  {
+    "pname": "System.Reflection.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
+  },
+  {
+    "pname": "System.Reflection.Metadata",
+    "version": "8.0.0",
+    "hash": "sha256-dQGC30JauIDWNWXMrSNOJncVa1umR1sijazYwUDdSIE="
+  },
+  {
+    "pname": "System.Reflection.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
+  },
+  {
+    "pname": "System.Reflection.TypeExtensions",
+    "version": "4.3.0",
+    "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
+  },
+  {
+    "pname": "System.Resources.ResourceManager",
+    "version": "4.3.0",
+    "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
+  },
+  {
+    "pname": "System.Runtime",
+    "version": "4.3.0",
+    "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg="
+  },
+  {
+    "pname": "System.Runtime.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
+  },
+  {
+    "pname": "System.Runtime.Handles",
+    "version": "4.3.0",
+    "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
+  },
+  {
+    "pname": "System.Runtime.InteropServices",
+    "version": "4.3.0",
+    "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
+  },
+  {
+    "pname": "System.Runtime.InteropServices.RuntimeInformation",
+    "version": "4.3.0",
+    "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA="
+  },
+  {
+    "pname": "System.Runtime.Numerics",
+    "version": "4.3.0",
+    "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
+  },
+  {
+    "pname": "System.Security.Cryptography.Algorithms",
+    "version": "4.3.0",
+    "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8="
+  },
+  {
+    "pname": "System.Security.Cryptography.Cng",
+    "version": "4.3.0",
+    "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw="
+  },
+  {
+    "pname": "System.Security.Cryptography.Csp",
+    "version": "4.3.0",
+    "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ="
+  },
+  {
+    "pname": "System.Security.Cryptography.Encoding",
+    "version": "4.3.0",
+    "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss="
+  },
+  {
+    "pname": "System.Security.Cryptography.OpenSsl",
+    "version": "4.3.0",
+    "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4="
+  },
+  {
+    "pname": "System.Security.Cryptography.Primitives",
+    "version": "4.3.0",
+    "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318="
+  },
+  {
+    "pname": "System.Security.Cryptography.X509Certificates",
+    "version": "4.3.0",
+    "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0="
+  },
+  {
+    "pname": "System.Text.Encoding",
+    "version": "4.3.0",
+    "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg="
+  },
+  {
+    "pname": "System.Text.Encoding.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="
+  },
+  {
+    "pname": "System.Text.Encodings.Web",
+    "version": "8.0.0",
+    "hash": "sha256-IUQkQkV9po1LC0QsqrilqwNzPvnc+4eVvq+hCvq8fvE="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "8.0.0",
+    "hash": "sha256-XFcCHMW1u2/WujlWNHaIWkbW1wn8W4kI0QdrwPtWmow="
+  },
+  {
+    "pname": "System.Text.Json",
+    "version": "9.0.2",
+    "hash": "sha256-kftKUuGgZtF4APmp77U79ws76mEIi+R9+DSVGikA5y8="
+  },
+  {
+    "pname": "System.Text.RegularExpressions",
+    "version": "4.3.0",
+    "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="
+  },
+  {
+    "pname": "System.Threading",
+    "version": "4.3.0",
+    "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
+  },
+  {
+    "pname": "System.Threading.Channels",
+    "version": "9.0.10",
+    "hash": "sha256-1SSATu8rInAryjFE98mInmAfrPQ48KixeqqAjn4xp64="
+  },
+  {
+    "pname": "System.Threading.Tasks",
+    "version": "4.3.0",
+    "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
+  },
+  {
+    "pname": "System.Threading.Tasks.Extensions",
+    "version": "4.3.0",
+    "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc="
+  },
+  {
+    "pname": "System.Threading.Timer",
+    "version": "4.3.0",
+    "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s="
+  },
+  {
+    "pname": "System.Xml.ReaderWriter",
+    "version": "4.3.0",
+    "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="
+  },
+  {
+    "pname": "System.Xml.XDocument",
+    "version": "4.3.0",
+    "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI="
+  },
+  {
+    "pname": "TextCopy",
+    "version": "6.2.1",
+    "hash": "sha256-Lb+e9BwWdRFhxyshIIZAywhDFA5ql3uIV6iQTFUkGUA="
+  },
+  {
+    "pname": "Vezel.Cathode",
+    "version": "0.14.17",
+    "hash": "sha256-On2OfZXLTA5nQ5CY7Aat21Uqbp0J94Cr0+8+Hff1n9Q="
+  },
+  {
+    "pname": "Vezel.Cathode.Common",
+    "version": "0.14.17",
+    "hash": "sha256-FCxSaBzo8KW+cHNYhF9JzELVbhoMQm3yxEtoT4kJyQA="
+  },
+  {
+    "pname": "Vezel.Cathode.Extensions",
+    "version": "0.14.17",
+    "hash": "sha256-Bhp9yVpce0BbVfYcw2CtJHIqO122JgA0gOOuMg2SjTA="
+  },
+  {
+    "pname": "Wcwidth",
+    "version": "2.0.0",
+    "hash": "sha256-XLlZbsC/FZUHZjXsJepg3AlWnDCjW+AfYmct001YKV4="
+  },
+  {
+    "pname": "Whisper.net",
+    "version": "1.8.1",
+    "hash": "sha256-h1iUHXwaf641TgMKkW4sBQS3UoRNJBIIm6ioydFC9qQ="
+  },
+  {
+    "pname": "Whisper.net.Runtime",
+    "version": "1.8.1",
+    "hash": "sha256-zoOe2wL174lnYjY0tln43v76VZxuksZ6GzCPWvCjOCE="
+  },
+  {
+    "pname": "xunit",
+    "version": "2.5.0",
+    "hash": "sha256-cbUJZpTrX9Dk/Z10fjp9FTom0y57q4nzATqt7NzyLqE="
+  },
+  {
+    "pname": "xunit.abstractions",
+    "version": "2.0.3",
+    "hash": "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="
+  },
+  {
+    "pname": "xunit.analyzers",
+    "version": "1.2.0",
+    "hash": "sha256-6ZcGSbzIQtSSqh5RAmOLr7RbXSMqWkzzfVL3twSPcdM="
+  },
+  {
+    "pname": "xunit.assert",
+    "version": "2.5.0",
+    "hash": "sha256-kbjRf1VFYiZ11ZzahMAi79wP7OEL9uh/Mv4rLEUtEvk="
+  },
+  {
+    "pname": "xunit.core",
+    "version": "2.5.0",
+    "hash": "sha256-rnH1PDG1mj2iV/MRrzfgC4XXvnwsA9mXAKVEqMCSed0="
+  },
+  {
+    "pname": "xunit.extensibility.core",
+    "version": "2.5.0",
+    "hash": "sha256-pVss4yr9rvgtwx4I5mB+OKZTznwvc8ERq7nfB8LXc6c="
+  },
+  {
+    "pname": "xunit.extensibility.execution",
+    "version": "2.5.0",
+    "hash": "sha256-r3r8PU8XtHjQbSjduAjrpyqAOVmg7BCxOAgfpbKqSI0="
+  },
+  {
+    "pname": "xunit.runner.visualstudio",
+    "version": "2.5.0",
+    "hash": "sha256-cceyYc7bvuo+bRINIdOoO8R9JM9av68pPY9tJV4VGmI="
+  }
+]
diff --git a/pkgs/by-name/un/undercut-f1/package.nix b/pkgs/by-name/un/undercut-f1/package.nix
new file mode 100644
index 000000000000..c81c4712e628
--- /dev/null
+++ b/pkgs/by-name/un/undercut-f1/package.nix
@@ -0,0 +1,98 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  buildDotnetModule,
+  dotnetCorePackages,
+  ffmpeg,
+  mpg123,
+  webkitgtk_4_1,
+  nix-update-script,
+  versionCheckHook,
+  autoPatchelfHook,
+  makeWrapper,
+  gtk3,
+  openssl,
+  krb5,
+  icu,
+  zlib,
+}:
+buildDotnetModule rec {
+  pname = "undercut-f1";
+  version = "3.3.51";
+  src = fetchFromGitHub {
+    owner = "JustAman62";
+    repo = "undercut-f1";
+    tag = "v${version}";
+    hash = "sha256-jmA8j7uAbtjvXJTH+jG/HVc6Lk1NxBTzIGc8ttg36w4=";
+  };
+
+  projectFile = "UndercutF1.Console/UndercutF1.Console.csproj";
+
+  executables = [ "undercutf1" ];
+
+  dotnet-sdk = dotnetCorePackages.sdk_9_0;
+  dotnet-runtime = dotnetCorePackages.sdk_9_0;
+
+  nugetDeps = ./deps.json;
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    makeWrapper
+  ];
+
+  buildInputs = [
+    stdenv.cc.cc.lib
+    gtk3
+    webkitgtk_4_1
+    openssl
+    krb5
+    icu
+    zlib
+  ];
+
+  postPatch = ''
+    rm -f .config/dotnet-tools.json
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/undercutf1 \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          ffmpeg
+          mpg123
+        ]
+      }
+  '';
+
+  dotnetBuildFlags = [
+    "-p:PublishSingleFile=true"
+    "-p:IncludeNativeLibrariesForSelfExtract=true"
+    "-p:OverridePackageVersion=${version}"
+  ];
+
+  dotnetPublishFlags = [
+    "-p:PublishTrimmed=false"
+    "-p:OverridePackageVersion=${version}"
+  ];
+
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  installCheckPhase = ''
+    $out/bin/undercutf1 --version | grep -q "${version}"
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Open-source F1 Live Timing TUI client with replay, driver tracker and team-radio transcription";
+    homepage = "https://github.com/JustAman62/undercut-f1";
+    changelog = "https://github.com/JustAman62/undercut-f1/releases/tag/v${version}";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ linuxmobile ];
+    mainProgram = "undercutf1";
+    platforms = lib.platforms.linux;
+  };
+}

From 7c7306140105a275f5fad459d60ed09bc79848a0 Mon Sep 17 00:00:00 2001
From: "Braian A. Diez" <bdiez19@gmail.com>
Date: Thu, 23 Oct 2025 17:06:31 -0300
Subject: [PATCH 2134/6226] maintainers: add linuxmobile

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

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 94f4899b4d51..eeb7fee86e1a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14792,6 +14792,12 @@
     githubId = 74221543;
     name = "Moritz Goltdammer";
   };
+  linuxmobile = {
+    email = "bdiez19@gmail.com";
+    github = "linuxmobile";
+    githubId = 10554636;
+    name = "Braian A. Diez";
+  };
   linuxwhata = {
     email = "linuxwhata@qq.com";
     matrix = "@lwa:envs.net";

From 2e53bb82562a660ba32ecca7e86d01280967bc77 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 20:53:05 +0000
Subject: [PATCH 2135/6226] foundry: 1.4.1 -> 1.4.3

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

diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix
index c0fd7199c5cb..63b91c4b32ca 100644
--- a/pkgs/by-name/fo/foundry/package.nix
+++ b/pkgs/by-name/fo/foundry/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "foundry";
-  version = "1.4.1";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "foundry-rs";
     repo = "foundry";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aqJzroRXUT1zO+RyH5QE9ZedapfkIwRmZtAfn0GYEX4=";
+    hash = "sha256-SrkFfc9+cb3nDqEOj3gRkQq9aKOSfk3s7a3EGka5ACw=";
   };
 
-  cargoHash = "sha256-wmHC6Jpd+6VUjb21cCQEg11kLW0J4EM+FTQn/boQxRI=";
+  cargoHash = "sha256-PoPfuMNeK6ArZddBd0lsR2r8UrvRieqkxYZ8jCCxw5o=";
 
   nativeBuildInputs = [
     pkg-config

From 0270a6cb79f5dcd6c3926256aac1cdd23ef7d0fe Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 23 Oct 2025 14:00:32 -0700
Subject: [PATCH 2136/6226] windsurf: 1.12.21 -> 1.12.25

---
 pkgs/by-name/wi/windsurf/info.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json
index c77fe388253f..803b03a35fc6 100644
--- a/pkgs/by-name/wi/windsurf/info.json
+++ b/pkgs/by-name/wi/windsurf/info.json
@@ -1,20 +1,20 @@
 {
   "aarch64-darwin": {
-    "version": "1.12.21",
-    "vscodeVersion": "1.100.3",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/e070c40b16843043362e035ebe6169be63af2af9/Windsurf-darwin-arm64-1.12.21.zip",
-    "sha256": "6fefd31c02779b26938fcba1ca999311ee5ef6844e2dac81d504f2b4d6a0248e"
+    "version": "1.12.25",
+    "vscodeVersion": "1.105.0",
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/3dde4f1e45c3c089540abe588074eb5a4fe122c3/Windsurf-darwin-arm64-1.12.25.zip",
+    "sha256": "9fba99838189f4ad12ec35c0f0ee97e99652b43492fb19fe17908848a5f2b13c"
   },
   "x86_64-darwin": {
-    "version": "1.12.21",
-    "vscodeVersion": "1.100.3",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/e070c40b16843043362e035ebe6169be63af2af9/Windsurf-darwin-x64-1.12.21.zip",
-    "sha256": "eabd42f053f2d36ac1ac58c03d44cf22250d9fa064e625408db6356582a24812"
+    "version": "1.12.25",
+    "vscodeVersion": "1.105.0",
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/3dde4f1e45c3c089540abe588074eb5a4fe122c3/Windsurf-darwin-x64-1.12.25.zip",
+    "sha256": "893b0cf579b4fa4354f5f014b9caf8f0e7ae9f98b9bb0d4b597e2322863eb278"
   },
   "x86_64-linux": {
-    "version": "1.12.21",
-    "vscodeVersion": "1.100.3",
-    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/e070c40b16843043362e035ebe6169be63af2af9/Windsurf-linux-x64-1.12.21.tar.gz",
-    "sha256": "62323e395ec5981f45ecfdbc95eb875b712365b211cdf173596eed782f66da0f"
+    "version": "1.12.25",
+    "vscodeVersion": "1.105.0",
+    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/3dde4f1e45c3c089540abe588074eb5a4fe122c3/Windsurf-linux-x64-1.12.25.tar.gz",
+    "sha256": "c170f3249c95220b8e1b26feb4f2452d4a8be5dcbcfb2a1f1768fb0c0137101e"
   }
 }

From bd217ed50dc6775ee47a4cffe103d5e9c2f359cd Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 23 Oct 2025 14:04:06 -0700
Subject: [PATCH 2137/6226] _cuda.lib.selectManifests: init

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/_cuda/lib/default.nix        |  1 +
 .../cuda-modules/_cuda/lib/redist.nix         | 30 +++++++++++++++++++
 2 files changed, 31 insertions(+)

diff --git a/pkgs/development/cuda-modules/_cuda/lib/default.nix b/pkgs/development/cuda-modules/_cuda/lib/default.nix
index 3aa3aab7dafb..376abcd27f7b 100644
--- a/pkgs/development/cuda-modules/_cuda/lib/default.nix
+++ b/pkgs/development/cuda-modules/_cuda/lib/default.nix
@@ -33,6 +33,7 @@
     getNixSystems
     getRedistSystem
     mkRedistUrl
+    selectManifests
     ;
 
   # See ./strings.nix for documentation.
diff --git a/pkgs/development/cuda-modules/_cuda/lib/redist.nix b/pkgs/development/cuda-modules/_cuda/lib/redist.nix
index 613c10d88c32..3138097c1694 100644
--- a/pkgs/development/cuda-modules/_cuda/lib/redist.nix
+++ b/pkgs/development/cuda-modules/_cuda/lib/redist.nix
@@ -237,4 +237,34 @@
       )
       ++ [ relativePath ]
     );
+
+  /**
+    Function which accepts an attribute set mapping redistributable name to version and retrieves the corresponding
+    collection of manifests from `_cuda.manifests`. Additionally, the version provided is used to populate the
+    `release_label` field in the corresponding manifest if it is missing.
+
+    It is an error to provide a redistributable name and version for which there is no corresponding manifest.
+
+    # Type
+
+    ```
+    selectManifests :: (versions :: AttrSet RedistName Version) -> AttrSet RedistName Manifest
+    ```
+
+    # Inputs
+
+    `versions`
+
+    : An attribute set mapping redistributable name to manifest version
+  */
+  selectManifests = lib.mapAttrs (
+    name: version:
+    let
+      manifest = _cuda.manifests.${name}.${version};
+    in
+    manifest
+    // {
+      release_label = manifest.release_label or version;
+    }
+  );
 }

From a35e7ea278632d431a7d92dad96598f7dfbf3767 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 18:04:27 -0300
Subject: [PATCH 2138/6226] oonf-olsrd2: fix build with cmake4

---
 pkgs/by-name/oo/oonf-olsrd2/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/oo/oonf-olsrd2/package.nix b/pkgs/by-name/oo/oonf-olsrd2/package.nix
index 8f64185dd51b..8b5d6815d66e 100644
--- a/pkgs/by-name/oo/oonf-olsrd2/package.nix
+++ b/pkgs/by-name/oo/oonf-olsrd2/package.nix
@@ -31,6 +31,11 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Adhoc wireless mesh routing daemon";
     license = licenses.bsd3;

From c11ffb0642c1157dde12cc388ff9cd0b5c6368b5 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 23 Oct 2025 14:04:35 -0700
Subject: [PATCH 2139/6226] pkgs/top-level/cuda-packages.nix: tidy using
 _cuda.lib.selectManifests

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/top-level/cuda-packages.nix | 46 ++++++++++++++++++++------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix
index 6623c5b43b4f..3c90f71ed35e 100644
--- a/pkgs/top-level/cuda-packages.nix
+++ b/pkgs/top-level/cuda-packages.nix
@@ -5,10 +5,17 @@
   lib,
 }:
 let
-  selectManifests = lib.mapAttrs (name: version: _cuda.manifests.${name}.${version});
+  mkCudaPackages =
+    manifestVersions:
+    callPackage ../development/cuda-modules {
+      manifests = _cuda.lib.selectManifests manifestVersions;
+    };
 
-  cudaPackages_12_6 = callPackage ../development/cuda-modules {
-    manifests = selectManifests {
+  cudaPackages_12_6 =
+    let
+      inherit (cudaPackages_12_6.backendStdenv) hasJetsonCudaCapability;
+    in
+    mkCudaPackages {
       cublasmp = "0.6.0";
       cuda = "12.6.3";
       cudnn = "9.13.0";
@@ -22,12 +29,14 @@ let
       nvjpeg2000 = "0.9.0";
       nvpl = "25.5";
       nvtiff = "0.5.1";
-      tensorrt = if cudaPackages_12_6.backendStdenv.hasJetsonCudaCapability then "10.7.0" else "10.9.0";
+      tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
-  };
 
-  cudaPackages_12_8 = callPackage ../development/cuda-modules {
-    manifests = selectManifests {
+  cudaPackages_12_8 =
+    let
+      inherit (cudaPackages_12_8.backendStdenv) hasJetsonCudaCapability;
+    in
+    mkCudaPackages {
       cublasmp = "0.6.0";
       cuda = "12.8.1";
       cudnn = "9.13.0";
@@ -41,12 +50,14 @@ let
       nvjpeg2000 = "0.9.0";
       nvpl = "25.5";
       nvtiff = "0.5.1";
-      tensorrt = if cudaPackages_12_8.backendStdenv.hasJetsonCudaCapability then "10.7.0" else "10.9.0";
+      tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
-  };
 
-  cudaPackages_12_9 = callPackage ../development/cuda-modules {
-    manifests = selectManifests {
+  cudaPackages_12_9 =
+    let
+      inherit (cudaPackages_12_9.backendStdenv) hasJetsonCudaCapability;
+    in
+    mkCudaPackages {
       cublasmp = "0.6.0";
       cuda = "12.9.1";
       cudnn = "9.13.0";
@@ -60,12 +71,14 @@ let
       nvjpeg2000 = "0.9.0";
       nvpl = "25.5";
       nvtiff = "0.5.1";
-      tensorrt = if cudaPackages_12_9.backendStdenv.hasJetsonCudaCapability then "10.7.0" else "10.9.0";
+      tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
-  };
 
-  cudaPackages_13_0 = callPackage ../development/cuda-modules {
-    manifests = selectManifests {
+  cudaPackages_13_0 =
+    let
+      inherit (cudaPackages_13_0.backendStdenv) hasJetsonCudaCapability;
+    in
+    mkCudaPackages {
       cublasmp = "0.6.0";
       cuda = "13.0.2";
       cudnn = "9.13.0";
@@ -79,9 +92,8 @@ let
       nvjpeg2000 = "0.9.0";
       nvpl = "25.5";
       nvtiff = "0.5.1";
-      tensorrt = if cudaPackages_13_0.backendStdenv.hasJetsonCudaCapability then "10.7.0" else "10.9.0";
+      tensorrt = if hasJetsonCudaCapability then "10.7.0" else "10.9.0";
     };
-  };
 in
 {
   inherit

From f43d3a5fd10760ab66466af5e590503f6a1f5587 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 21:10:28 +0000
Subject: [PATCH 2140/6226] dprint-plugins.dprint-plugin-biome: 0.10.5 ->
 0.10.6

---
 pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
index 829393d9bec0..d189ce665f8f 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "Biome (JS/TS) wrapper plugin";
-  hash = "sha256-GHl8Uo2U6K1yirfjwuD43ixkVtGdbZ2qxk0cySRLXys=";
+  hash = "sha256-Ht63tW4FqykpuNlWtyw3cHD2HXs0b6U6Zo9Rd9AXqD8=";
   initConfig = {
     configExcludes = [ "**/node_modules" ];
     configKey = "biome";
@@ -16,6 +16,6 @@ mkDprintPlugin {
   };
   pname = "dprint-plugin-biome";
   updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json";
-  url = "https://plugins.dprint.dev/biome-0.10.5.wasm";
-  version = "0.10.5";
+  url = "https://plugins.dprint.dev/biome-0.10.6.wasm";
+  version = "0.10.6";
 }

From 16b39269d8e0d47ae8a6da6bebc0e1d15d539be5 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 23 Oct 2025 14:10:50 -0700
Subject: [PATCH 2141/6226] _cuda.db.bootstrap.cudaCapabilityToInfo: add 3.5,
 3.7, and 7.2, and fix Orin minCudaMajorMinorVersion

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/_cuda/db/bootstrap/cuda.nix  | 28 ++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix b/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix
index b90884d7eed8..4157dc9ddf65 100644
--- a/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix
+++ b/pkgs/development/cuda-modules/_cuda/db/bootstrap/cuda.nix
@@ -100,6 +100,22 @@
         }
       )
       {
+        # Tesla K40
+        "3.5" = {
+          archName = "Kepler";
+          minCudaMajorMinorVersion = "10.0";
+          dontDefaultAfterCudaMajorMinorVersion = "11.0";
+          maxCudaMajorMinorVersion = "11.8";
+        };
+
+        # Tesla K80
+        "3.7" = {
+          archName = "Kepler";
+          minCudaMajorMinorVersion = "10.0";
+          dontDefaultAfterCudaMajorMinorVersion = "11.0";
+          maxCudaMajorMinorVersion = "11.8";
+        };
+
         # Tesla/Quadro M series
         "5.0" = {
           archName = "Maxwell";
@@ -147,6 +163,16 @@
           dontDefaultAfterCudaMajorMinorVersion = "12.5";
         };
 
+        # Jetson AGX Xavier, Drive AGX Pegasus, Xavier NX
+        "7.2" = {
+          archName = "Volta";
+          minCudaMajorMinorVersion = "10.0";
+          # Note: without `cuda_compat`, maxCudaMajorMinorVersion is 11.8
+          # https://docs.nvidia.com/cuda/cuda-for-tegra-appnote/index.html#deployment-considerations-for-cuda-upgrade-package
+          maxCudaMajorMinorVersion = "12.2";
+          isJetson = true;
+        };
+
         # GTX/RTX Turing – GTX 1660 Ti, RTX 2060, RTX 2070, RTX 2080, Titan RTX, Quadro RTX 4000,
         # Quadro RTX 5000, Quadro RTX 6000, Quadro RTX 8000, Quadro T1000/T2000, Tesla T4
         "7.5" = {
@@ -171,7 +197,7 @@
         # Tegra T234 (Jetson Orin)
         "8.7" = {
           archName = "Ampere";
-          minCudaMajorMinorVersion = "11.5";
+          minCudaMajorMinorVersion = "11.4";
           isJetson = true;
         };
 

From c3885292d0176ea32056a176b6faf02c2ea8aba9 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 23 Oct 2025 14:11:42 -0700
Subject: [PATCH 2142/6226] _cuda.db.bootstrap.nvccCompatibilities: add back
 11.0-12.5

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/_cuda/db/bootstrap/nvcc.nix  | 199 +++++++++++++++++-
 1 file changed, 198 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix b/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
index 0b3c2de94876..7a1548f81645 100644
--- a/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
+++ b/pkgs/development/cuda-modules/_cuda/db/bootstrap/nvcc.nix
@@ -28,7 +28,204 @@
       ```
   */
   nvccCompatibilities = {
-    # Our baseline
+    # https://docs.nvidia.com/cuda/archive/11.0/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features
+    "11.0" = {
+      clang = {
+        maxMajorVersion = "9";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "9";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for Clang 10 and GCC 10
+    # https://docs.nvidia.com/cuda/archive/11.1.1/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features
+    "11.1" = {
+      clang = {
+        maxMajorVersion = "10";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "10";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for Clang 11
+    # https://docs.nvidia.com/cuda/archive/11.2.2/cuda-installation-guide-linux/index.html#system-requirements
+    "11.2" = {
+      clang = {
+        maxMajorVersion = "11";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "10";
+        minMajorVersion = "6";
+      };
+    };
+
+    # No changes from 11.2 to 11.3
+    "11.3" = {
+      clang = {
+        maxMajorVersion = "11";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "10";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for Clang 12 and GCC 11
+    # https://docs.nvidia.com/cuda/archive/11.4.4/cuda-toolkit-release-notes/index.html#cuda-general-new-features
+    # NOTE: There is a bug in the version of GLIBC that GCC 11 uses which causes it to fail to compile some CUDA
+    # code. As such, we skip it for this release, and do the bump in 11.6 (skipping 11.5).
+    # https://forums.developer.nvidia.com/t/cuda-11-5-samples-throw-multiple-error-attribute-malloc-does-not-take-arguments/192750/15
+    "11.4" = {
+      clang = {
+        maxMajorVersion = "12";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "10";
+        minMajorVersion = "6";
+      };
+    };
+
+    # No changes from 11.4 to 11.5
+    "11.5" = {
+      clang = {
+        maxMajorVersion = "12";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "10";
+        minMajorVersion = "6";
+      };
+    };
+
+    # No changes from 11.5 to 11.6
+    # However, as mentioned above, we add GCC 11 this release.
+    "11.6" = {
+      clang = {
+        maxMajorVersion = "12";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "11";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for Clang 13
+    # https://docs.nvidia.com/cuda/archive/11.7.1/cuda-toolkit-release-notes/index.html#cuda-compiler-new-features
+    "11.7" = {
+      clang = {
+        maxMajorVersion = "13";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "11";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for Clang 14
+    # https://docs.nvidia.com/cuda/archive/11.8.0/cuda-installation-guide-linux/index.html#system-requirements
+    "11.8" = {
+      clang = {
+        maxMajorVersion = "14";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "11";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for GCC 12
+    # https://docs.nvidia.com/cuda/archive/12.0.1/cuda-installation-guide-linux/index.html#system-requirements
+    "12.0" = {
+      clang = {
+        maxMajorVersion = "14";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "12";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for Clang 15
+    # https://docs.nvidia.com/cuda/archive/12.1.1/cuda-toolkit-release-notes/index.html#cuda-compilers-new-features
+    "12.1" = {
+      clang = {
+        maxMajorVersion = "15";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "12";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for Clang 16
+    # https://docs.nvidia.com/cuda/archive/12.2.2/cuda-installation-guide-linux/index.html#host-compiler-support-policy
+    "12.2" = {
+      clang = {
+        maxMajorVersion = "16";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "12";
+        minMajorVersion = "6";
+      };
+    };
+
+    # No changes from 12.2 to 12.3
+    # https://docs.nvidia.com/cuda/archive/12.3.2/cuda-installation-guide-linux/index.html#host-compiler-support-policy
+    "12.3" = {
+      clang = {
+        maxMajorVersion = "16";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "12";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Maximum Clang version is 17
+    # Minimum GCC version is still 6, but all versions prior to GCC 7.3 are deprecated.
+    # Maximum GCC version is 13.2
+    # https://docs.nvidia.com/cuda/archive/12.4.1/cuda-installation-guide-linux/index.html#host-compiler-support-policy
+    "12.4" = {
+      clang = {
+        maxMajorVersion = "17";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "13";
+        minMajorVersion = "6";
+      };
+    };
+
+    # No changes from 12.4 to 12.5
+    # https://docs.nvidia.com/cuda/archive/12.5.1/cuda-installation-guide-linux/index.html#host-compiler-support-policy
+    "12.5" = {
+      clang = {
+        maxMajorVersion = "17";
+        minMajorVersion = "7";
+      };
+      gcc = {
+        maxMajorVersion = "13";
+        minMajorVersion = "6";
+      };
+    };
+
+    # Added support for Clang 18
     # https://docs.nvidia.com/cuda/archive/12.6.0/cuda-installation-guide-linux/index.html#host-compiler-support-policy
     "12.6" = {
       clang = {

From bbd882103734bb55feb8358db243b24d73a78898 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Thu, 23 Oct 2025 23:05:40 +0200
Subject: [PATCH 2143/6226] wgpu-native: 25.0.2.2 -> 27.0.2.0

https://github.com/gfx-rs/wgpu-native/compare/v25.0.2.2...v27.0.2.0
---
 pkgs/by-name/wg/wgpu-native/package.nix | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/wg/wgpu-native/package.nix b/pkgs/by-name/wg/wgpu-native/package.nix
index 6a1b1fbacbaf..0ac8d12ce6ed 100644
--- a/pkgs/by-name/wg/wgpu-native/package.nix
+++ b/pkgs/by-name/wg/wgpu-native/package.nix
@@ -9,15 +9,15 @@
   callPackage,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wgpu-native";
-  version = "25.0.2.2";
+  version = "27.0.2.0";
 
   src = fetchFromGitHub {
     owner = "gfx-rs";
     repo = "wgpu-native";
-    tag = "v${version}";
-    hash = "sha256-ihA1pfTW6EHpihL4IUv7YTsU1SLkxEM6wUDr7NiHmLc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-sJEDCt8DTP6FjtbROVCZVD0we0OA07wjkiLnXoQfTuc=";
     fetchSubmodules = true;
   };
 
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
     "dev"
   ];
 
-  cargoHash = "sha256-8Axm9gIX6yW0ScV5SjB6AWlmlIeGuQYonWsGwcIH2os=";
+  cargoHash = "sha256-ZQiX7IZsbjlDzRNlYgpRnLfCKGAYnSwvACRMNkZPjbE=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
@@ -37,6 +37,8 @@ rustPlatform.buildRustPackage rec {
     vulkan-loader
   ];
 
+  env.WGPU_NATIVE_VERSION = finalAttrs.version;
+
   postInstall = ''
     rm $out/lib/libwgpu_native.a
     install -Dm644 ./ffi/wgpu.h -t $dev/include/webgpu
@@ -46,7 +48,7 @@ rustPlatform.buildRustPackage rec {
   passthru = {
     updateScript = nix-update-script { };
     examples = callPackage ./examples.nix {
-      inherit version src;
+      inherit (finalAttrs) version src;
     };
   };
 
@@ -59,4 +61,4 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [ niklaskorz ];
   };
-}
+})

From 53c2ede33d81afc18f538b125b130c40ea266f1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 23 Oct 2025 23:12:14 +0200
Subject: [PATCH 2144/6226] harlequin: fix eval when textual-textarea doesn't
 have pythonRelaxDeps

---
 pkgs/by-name/ha/harlequin/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix
index b12abb6b7a03..186fa4ae2c04 100644
--- a/pkgs/by-name/ha/harlequin/package.nix
+++ b/pkgs/by-name/ha/harlequin/package.nix
@@ -28,7 +28,7 @@ let
       });
 
       textual-textarea = super.textual-textarea.overridePythonAttrs (old: {
-        pythonRelaxDeps = old.pythonRelaxDeps ++ [ "textual" ];
+        pythonRelaxDeps = (old.pythonRelaxDeps or [ ]) ++ [ "textual" ];
       });
     };
   };

From b9fe891b60c61f49c3ab630ac9288cb0e715bbc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 23 Oct 2025 21:03:01 +0000
Subject: [PATCH 2145/6226] python3Packages.textual-textarea: 0.16.0 -> 0.17.1

---
 .../python-modules/textual-textarea/default.nix            | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/textual-textarea/default.nix b/pkgs/development/python-modules/textual-textarea/default.nix
index 89638f9586b6..8ab356d467ef 100644
--- a/pkgs/development/python-modules/textual-textarea/default.nix
+++ b/pkgs/development/python-modules/textual-textarea/default.nix
@@ -20,21 +20,18 @@
 
 buildPythonPackage rec {
   pname = "textual-textarea";
-  version = "0.16.0";
+  version = "0.17.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tconbeer";
     repo = "textual-textarea";
     tag = "v${version}";
-    hash = "sha256-AIt3UqfZbJBgAACxJHElhvAsJWk9I6zjdeRjBtI/FiA=";
+    hash = "sha256-E6Yw/NRjfrdCeERgM0jdjfmG9zL2GhY2qAWUB1XwFic=";
   };
 
   build-system = [ hatchling ];
 
-  pythonRelaxDeps = [
-    "tree-sitter-sql"
-  ];
   dependencies = [
     pyperclip
     textual

From 00338fa51ed66f8390ac49751b00cf18abe03beb Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Thu, 23 Oct 2025 23:11:11 +0200
Subject: [PATCH 2146/6226] python3Packages.wgpu-py: 0.25.0 -> 0.26.0

https://github.com/pygfx/wgpu-py/blob/v0.26.0/CHANGELOG.md
---
 pkgs/development/python-modules/wgpu-py/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/wgpu-py/default.nix b/pkgs/development/python-modules/wgpu-py/default.nix
index a00c2e7f8ab8..affdc5361208 100644
--- a/pkgs/development/python-modules/wgpu-py/default.nix
+++ b/pkgs/development/python-modules/wgpu-py/default.nix
@@ -39,14 +39,14 @@
 }:
 buildPythonPackage rec {
   pname = "wgpu-py";
-  version = "0.25.0";
+  version = "0.26.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pygfx";
     repo = "wgpu-py";
     tag = "v${version}";
-    hash = "sha256-TErwgzujuHafvSiNpfmga9GQtvGFFkDjBqe8eX/dlP8=";
+    hash = "sha256-TaWrodP1KtCLIKi+NOnq2U7CLGVEhnlJilD6Txt7vgo=";
   };
 
   postPatch =

From 4d8d0181fe3b299b7bad5455d394710b4dee73cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 21:20:00 +0000
Subject: [PATCH 2147/6226] kanboard: 1.2.47 -> 1.2.48

---
 pkgs/by-name/ka/kanboard/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ka/kanboard/package.nix b/pkgs/by-name/ka/kanboard/package.nix
index 5eb89e73d5fc..5c0ba4b216e4 100644
--- a/pkgs/by-name/ka/kanboard/package.nix
+++ b/pkgs/by-name/ka/kanboard/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "kanboard";
-  version = "1.2.47";
+  version = "1.2.48";
 
   src = fetchFromGitHub {
     owner = "kanboard";
     repo = "kanboard";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LedK1Ct4xz88r4gvN2jxOE/7Yg6rnrnjCHdhmn3tun4=";
+    hash = "sha256-qaVQ0urVdy5ADlLY7v9FJB8TSEuuopuX/XUYRzwbgY0=";
   };
 
   dontBuild = true;

From 6724debf6b282a581ef1f0379c23d8a5e6749069 Mon Sep 17 00:00:00 2001
From: Jiatao Liang <jtliang24@gmail.com>
Date: Tue, 26 Aug 2025 18:09:10 -0400
Subject: [PATCH 2148/6226] maintainers: add jtliang24

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 94f4899b4d51..df64bee49af2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -12881,6 +12881,12 @@
     github = "jthulhu";
     githubId = 23179762;
   };
+  jtliang24 = {
+    name = "Jiatao Liang";
+    email = "jtliang24@gmail.com";
+    github = "jtliang24";
+    githubId = 170479425;
+  };
   jtobin = {
     email = "jared@jtobin.io";
     github = "jtobin";

From 5bab9cf4efe3ddc21f63db5817e1710f75983d52 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 18:30:38 -0300
Subject: [PATCH 2149/6226] opengv: fix build with cmake4

---
 pkgs/by-name/op/opengv/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/op/opengv/package.nix b/pkgs/by-name/op/opengv/package.nix
index d1737c0d6579..9364ee8bf187 100644
--- a/pkgs/by-name/op/opengv/package.nix
+++ b/pkgs/by-name/op/opengv/package.nix
@@ -24,6 +24,11 @@ stdenv.mkDerivation (finalAttrs: {
     eigen
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1.3)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "Collection of computer vision methods for solving geometric vision problems";
     homepage = "https://github.com/laurentkneip/opengv";

From 0eabec273360a9cdf6ca62ab641ac36f2aa2f077 Mon Sep 17 00:00:00 2001
From: Jiatao Liang <jtliang24@gmail.com>
Date: Tue, 26 Aug 2025 18:06:13 -0400
Subject: [PATCH 2150/6226] artix-games-launcher: init at 2.20

Adding package for the Artix Games Launcher into nixpkgs
---
 .../ar/artix-games-launcher/package.nix       | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/ar/artix-games-launcher/package.nix

diff --git a/pkgs/by-name/ar/artix-games-launcher/package.nix b/pkgs/by-name/ar/artix-games-launcher/package.nix
new file mode 100644
index 000000000000..35fc2f7218a4
--- /dev/null
+++ b/pkgs/by-name/ar/artix-games-launcher/package.nix
@@ -0,0 +1,35 @@
+{
+  appimageTools,
+  stdenv,
+  fetchurl,
+  lib,
+}:
+let
+  pname = "artix-games-launcher";
+  version = "2.20";
+  src = fetchurl {
+    url = "https://web.archive.org/web/20250924101414/https://launch.artix.com/latest/Artix_Games_Launcher-x86_64.AppImage";
+    hash = "sha256-8eVXOm5g92wErWa6lbTXrCL04MWYlObjonHJk+oUI3E=";
+  };
+  appimageContents = appimageTools.extract {
+    inherit pname version src;
+  };
+in
+appimageTools.wrapType2 {
+  inherit pname version src;
+
+  extraInstallCommands = ''
+    mkdir -p $out/share/applications
+    install -m 444 -D ${appimageContents}/ArtixGamesLauncher.desktop $out/share/applications/ArtixGamesLauncher.desktop
+    install -m 444 -D ${appimageContents}/ArtixLogo.png $out/share/icons/ArtixLogo.png
+  '';
+
+  meta = {
+    description = "Launcher for games by Artix Entertainment";
+    homepage = "https://www.artix.com/downloads/artixlauncher";
+    license = lib.licenses.unfree;
+    mainProgram = "artix-game-launcher";
+    maintainers = with lib.maintainers; [ jtliang24 ];
+    platforms = [ "x86_64-linux" ];
+  };
+}

From 65850592530a3924a6ba3f3e4bfab6ed95753aea Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 23 Oct 2025 14:35:06 -0700
Subject: [PATCH 2151/6226] cudaPackages: remove cudaFlags alias

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/aliases.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/cuda-modules/aliases.nix b/pkgs/development/cuda-modules/aliases.nix
index 3eef4e7b6ae8..6acf3b21d7b6 100644
--- a/pkgs/development/cuda-modules/aliases.nix
+++ b/pkgs/development/cuda-modules/aliases.nix
@@ -10,11 +10,6 @@ final: _:
 builtins.mapAttrs mkRenamed {
   # A comment to prevent empty { } from collapsing into a single line
 
-  cudaFlags = {
-    path = "cudaPackages.flags";
-    package = final.flags;
-  };
-
   cudaVersion = {
     path = "cudaPackages.cudaMajorMinorVersion";
     package = final.cudaMajorMinorVersion;

From 14ce577fdd237cc2621d21034da91ee0f6e5a2da Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 23 Oct 2025 14:35:28 -0700
Subject: [PATCH 2152/6226] cudaPackages: remove cudaVersion alias

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/aliases.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/cuda-modules/aliases.nix b/pkgs/development/cuda-modules/aliases.nix
index 6acf3b21d7b6..b9f3a3187e14 100644
--- a/pkgs/development/cuda-modules/aliases.nix
+++ b/pkgs/development/cuda-modules/aliases.nix
@@ -10,11 +10,6 @@ final: _:
 builtins.mapAttrs mkRenamed {
   # A comment to prevent empty { } from collapsing into a single line
 
-  cudaVersion = {
-    path = "cudaPackages.cudaMajorMinorVersion";
-    package = final.cudaMajorMinorVersion;
-  };
-
   cudatoolkit-legacy-runfile = {
     path = "cudaPackages.cudatoolkit";
     package = final.cudatoolkit;

From b0f246bcbd7c155220beba3df5a634ccaabcefba Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 23 Oct 2025 14:35:57 -0700
Subject: [PATCH 2153/6226] cudaPackages: remove cudatoolkit-legacy-runfile
 alias

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/aliases.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/cuda-modules/aliases.nix b/pkgs/development/cuda-modules/aliases.nix
index b9f3a3187e14..17d420e9cea1 100644
--- a/pkgs/development/cuda-modules/aliases.nix
+++ b/pkgs/development/cuda-modules/aliases.nix
@@ -10,11 +10,6 @@ final: _:
 builtins.mapAttrs mkRenamed {
   # A comment to prevent empty { } from collapsing into a single line
 
-  cudatoolkit-legacy-runfile = {
-    path = "cudaPackages.cudatoolkit";
-    package = final.cudatoolkit;
-  };
-
   cusparselt = {
     path = "cudaPackages.libcusparse_lt";
     package = final.libcusparse_lt;

From 5dcd809d755efb71cfe6f83b4e1c1fc008974d9e Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 23 Oct 2025 14:38:50 -0700
Subject: [PATCH 2154/6226] cudaPackages: remove cusparselt alias

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/aliases.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/cuda-modules/aliases.nix b/pkgs/development/cuda-modules/aliases.nix
index 17d420e9cea1..73c0f6ed83a1 100644
--- a/pkgs/development/cuda-modules/aliases.nix
+++ b/pkgs/development/cuda-modules/aliases.nix
@@ -9,9 +9,4 @@ in
 final: _:
 builtins.mapAttrs mkRenamed {
   # A comment to prevent empty { } from collapsing into a single line
-
-  cusparselt = {
-    path = "cudaPackages.libcusparse_lt";
-    package = final.libcusparse_lt;
-  };
 }

From 6daea0bd870be50f4f081bea48e853a2be3ad8f8 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 18:44:15 -0300
Subject: [PATCH 2155/6226] openlierox: fix build with cmake4

---
 pkgs/by-name/op/openlierox/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/op/openlierox/package.nix b/pkgs/by-name/op/openlierox/package.nix
index f1fa65c403de..471d8986e18a 100644
--- a/pkgs/by-name/op/openlierox/package.nix
+++ b/pkgs/by-name/op/openlierox/package.nix
@@ -31,6 +31,15 @@ stdenv.mkDerivation (finalAttrs: {
     sed 1i'#include <libxml/parser.h>' -i include/XMLutils.h
     substituteInPlace src/common/StringUtils.cpp \
         --replace-fail "xmlErrorPtr" "const xmlError*"
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.4)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace CMakeOlxCommon.cmake \
+      --replace-fail "cmake_minimum_required(VERSION 2.4)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_policy(VERSION 2.4)" "cmake_policy(VERSION 3.10)" \
+      --replace-fail "cmake_policy(SET CMP0005 OLD)" "" \
+      --replace-fail "cmake_policy(SET CMP0003 OLD)" "" \
+      --replace-fail "cmake_policy(SET CMP0011 OLD)" ""
   '';
 
   strictDeps = true;

From ca1a928ec492cd6c1c00b05996d2cddc0bf106a4 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 18:58:16 -0300
Subject: [PATCH 2156/6226] openspades: fix build with cmake4

---
 pkgs/by-name/op/openspades/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/op/openspades/package.nix b/pkgs/by-name/op/openspades/package.nix
index 13e55f7d5a91..0fe5f3581a45 100644
--- a/pkgs/by-name/op/openspades/package.nix
+++ b/pkgs/by-name/op/openspades/package.nix
@@ -81,6 +81,12 @@ stdenv.mkDerivation rec {
   postPatch = ''
     sed -i 's,^wget .*,cp $devPak "$PAK_NAME",' Resources/downloadpak.sh
     patchShebangs Resources
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_policy(SET CMP0054 OLD)" ""
+    substituteInPlace Sources/AngelScript/projects/{cmake,cmake_addons}/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   postInstall = ''

From e998b1686ba7688e1755351aaf076bdf05fdc89b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 22:04:47 +0000
Subject: [PATCH 2157/6226] tinfoil-cli: 0.1.5 -> 0.10.1

---
 pkgs/by-name/ti/tinfoil-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ti/tinfoil-cli/package.nix b/pkgs/by-name/ti/tinfoil-cli/package.nix
index 95023383ba3c..e13aeefcd4dc 100644
--- a/pkgs/by-name/ti/tinfoil-cli/package.nix
+++ b/pkgs/by-name/ti/tinfoil-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "tinfoil-cli";
-  version = "0.1.5";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "tinfoilsh";
     repo = "tinfoil-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Aa+n1Yc3jzPT1Fbq1xhphBwq5mdxPwbCcGn4ikTABW8=";
+    hash = "sha256-ei3noC/RXUCfwLHjiYZ/+M1vjn/9g1JhTI2A4O4DJZM=";
   };
 
   vendorHash = "sha256-S+aiL1nY57gOXgaNwFXUk9xfUpFOok8XHYKBtQKHmOc=";

From f2d38ec7b8e01d49ca9beaa574276723609ef292 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 23 Oct 2025 22:10:38 +0000
Subject: [PATCH 2158/6226] linux_6_17: 6.17.4 -> 6.17.5

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 144d74916ee7..62ee69975403 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -40,8 +40,8 @@
         "lts": false
     },
     "6.17": {
-        "version": "6.17.4",
-        "hash": "sha256:1nwi0hzikziwkxm9xzf819wb3lsz93i1ns1nzybpbfkgdqli42h1",
+        "version": "6.17.5",
+        "hash": "sha256:1kibm4b3dvncw8dzxllxiza0923q6f2xlsng4gkln5n2x4vaypy0",
         "lts": false
     }
 }

From a041086e600fe605f1098061f4ac8893f804ce94 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 23 Oct 2025 22:10:40 +0000
Subject: [PATCH 2159/6226] linux_6_12: 6.12.54 -> 6.12.55

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 62ee69975403..33176be8bec1 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -30,8 +30,8 @@
         "lts": true
     },
     "6.12": {
-        "version": "6.12.54",
-        "hash": "sha256:0qny8c4r9rf55bvchs5vjplfldngmydn0j47a97c9vpgj0rws38v",
+        "version": "6.12.55",
+        "hash": "sha256:17zv8ail05wnbfl9yhgs4llapyk3f6qjjbfqbwx0clx61138z3rj",
         "lts": true
     },
     "6.16": {

From bc86b6d6a99cb42bcca0e7438da4597894a3ba8a Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 23 Oct 2025 22:10:43 +0000
Subject: [PATCH 2160/6226] linux_6_6: 6.6.113 -> 6.6.114

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 33176be8bec1..a51c482492b0 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -25,8 +25,8 @@
         "lts": true
     },
     "6.6": {
-        "version": "6.6.113",
-        "hash": "sha256:07n494cblmlfmn8l3kjalwlnb1f9xxxf8c31kkfr5lb1wk9cz58z",
+        "version": "6.6.114",
+        "hash": "sha256:0z5r1kmzf3ib0r5rbcmp3cgjyagf6wgdjynpjbhkm5727jh7ahfa",
         "lts": true
     },
     "6.12": {

From 899403631b0397dbf7f7791c7c57cb14d64114f0 Mon Sep 17 00:00:00 2001
From: Leah Amelia Chen <hi@pluie.me>
Date: Fri, 17 Oct 2025 21:22:53 +0200
Subject: [PATCH 2161/6226] ghostty{,-bin}: 1.2.2 -> 1.2.3

---
 pkgs/by-name/gh/ghostty-bin/package.nix | 4 ++--
 pkgs/by-name/gh/ghostty/package.nix     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gh/ghostty-bin/package.nix b/pkgs/by-name/gh/ghostty-bin/package.nix
index d94768be6023..597e81d8cf4f 100644
--- a/pkgs/by-name/gh/ghostty-bin/package.nix
+++ b/pkgs/by-name/gh/ghostty-bin/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "ghostty-bin";
-  version = "1.2.2";
+  version = "1.2.3";
 
   src = fetchurl {
     url = "https://release.files.ghostty.org/${finalAttrs.version}/Ghostty.dmg";
-    hash = "sha256-gSuOOWZUzKKihCGmqEnieJJ8iP4xFeoSQIL536ka454=";
+    hash = "sha256-817pHxFuKAJ6ufje9FCYx1dbRLQH/4g6Lc0phcSDIGs=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/by-name/gh/ghostty/package.nix b/pkgs/by-name/gh/ghostty/package.nix
index 735e9fb09bef..3c7ad6786dde 100644
--- a/pkgs/by-name/gh/ghostty/package.nix
+++ b/pkgs/by-name/gh/ghostty/package.nix
@@ -38,7 +38,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ghostty";
-  version = "1.2.2";
+  version = "1.2.3";
 
   outputs = [
     "out"
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ghostty-org";
     repo = "ghostty";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BTIH8G1GKrcoMasvlA3fje8f1vZvr4uuAUHfvZq6LVY=";
+    hash = "sha256-0tmLOJCrrEnVc/ZCp/e646DTddXjv249QcSwkaukL30=";
   };
 
   deps = callPackage ./deps.nix {

From 7bede7dd99b04ddfc02e94bf0c495253ae5be21d Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 19:32:23 -0300
Subject: [PATCH 2162/6226] opl3bankeditor: fix build with cmake4

---
 pkgs/tools/audio/opl3bankeditor/common.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/tools/audio/opl3bankeditor/common.nix b/pkgs/tools/audio/opl3bankeditor/common.nix
index 8c0ce9eabfee..63af82790a03 100644
--- a/pkgs/tools/audio/opl3bankeditor/common.nix
+++ b/pkgs/tools/audio/opl3bankeditor/common.nix
@@ -55,6 +55,11 @@ mkDerivation rec {
     rtmidi
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir $out/{bin,Applications}
     mv "${binname}.app" $out/Applications/

From 29d82a12fb29be775e1487f2008af5fac76c449d Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 23 Oct 2025 15:37:27 -0700
Subject: [PATCH 2163/6226] cudaPackages.tests.redists-installed: make broken
 assertion more descriptive

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/packages/tests/redists-installed.nix         | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/cuda-modules/packages/tests/redists-installed.nix b/pkgs/development/cuda-modules/packages/tests/redists-installed.nix
index 84c25c6b9f0e..6a0ee88ae883 100644
--- a/pkgs/development/cuda-modules/packages/tests/redists-installed.nix
+++ b/pkgs/development/cuda-modules/packages/tests/redists-installed.nix
@@ -40,7 +40,9 @@ linkedWithoutLicenses.overrideAttrs (
 
       brokenAssertions = prevAttrs.passthru.brokenAssertions or [ ] ++ [
         {
-          message = "No redists are available for the current platform (${backendStdenv.hostNixSystem}); ensure proper licenses are allowed";
+          message =
+            "No redists are available for the current NVIDIA system identifier (${backendStdenv.hostRedistSystem});"
+            + " ensure proper licenses are allowed and that the CUDA version in use supports the system";
           assertion = availableRedistsForPlatform != { };
         }
       ];

From ef23d46198af2fb60257448598dd78c2c65f9cf6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 22:39:17 +0000
Subject: [PATCH 2164/6226] python3Packages.brotli-asgi: 1.4.0 -> 1.5.0

---
 pkgs/development/python-modules/brotli-asgi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/brotli-asgi/default.nix b/pkgs/development/python-modules/brotli-asgi/default.nix
index 302057470abb..5f96e62edc5a 100644
--- a/pkgs/development/python-modules/brotli-asgi/default.nix
+++ b/pkgs/development/python-modules/brotli-asgi/default.nix
@@ -14,7 +14,7 @@
 }:
 let
   pname = "brotli-asgi";
-  version = "1.4.0";
+  version = "1.5.0";
 in
 buildPythonPackage {
   inherit pname version;
@@ -26,7 +26,7 @@ buildPythonPackage {
     owner = "fullonic";
     repo = "brotli-asgi";
     rev = "v${version}";
-    hash = "sha256-hQ6CSXnAoUSaKUSmE+2GHZemkFqd8Dc5+OvcUD7/r5Y=";
+    hash = "sha256-jOow5xrRvuBdg/dVEzAUgs1SxNLZqEItyW9OcvniTSY=";
   };
 
   propagatedBuildInputs = [

From 861b156b80c381b106d031a7c201f8ce8d364d1b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 22:44:19 +0000
Subject: [PATCH 2165/6226] dblab: 0.33.0 -> 0.34.1

---
 pkgs/by-name/db/dblab/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/db/dblab/package.nix b/pkgs/by-name/db/dblab/package.nix
index b41a2cfaaaf5..c4ceef8920c7 100644
--- a/pkgs/by-name/db/dblab/package.nix
+++ b/pkgs/by-name/db/dblab/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "dblab";
-  version = "0.33.0";
+  version = "0.34.1";
 
   src = fetchFromGitHub {
     owner = "danvergara";
     repo = "dblab";
     rev = "v${version}";
-    hash = "sha256-PFS/9/UdoClktsTnkcILUdjLC9yjvMf60Tgb70lQ5pE=";
+    hash = "sha256-9gQjO9u/wONqmJjt5ejztWlFkqsJ8HUyPp3j5OyZEz4=";
   };
 
-  vendorHash = "sha256-WxIlGdd3Si3Lyf9FZOCAepDlRo2F3EDRy00EawkZATY=";
+  vendorHash = "sha256-NhBT0dBS3jKgWHxCMVV6NUMcvqCbKS+tlm3y1YI/sAE=";
 
   ldflags = [ "-s -w -X main.version=${version}" ];
 

From cb8251d29048fd14dc3961bddc80fb37299f8827 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 19:48:29 -0300
Subject: [PATCH 2166/6226] owl: fix build with cmake4

---
 pkgs/by-name/ow/owl/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/ow/owl/package.nix b/pkgs/by-name/ow/owl/package.nix
index 1b8ba893537b..90f13b54b42b 100644
--- a/pkgs/by-name/ow/owl/package.nix
+++ b/pkgs/by-name/ow/owl/package.nix
@@ -27,6 +27,13 @@ stdenv.mkDerivation {
     libpcap
   ];
 
+  postPatch = ''
+    substituteInPlace googletest/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace googletest/{googlemock,googletest}/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6.4)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Open Apple Wireless Direct Link (AWDL) implementation written in C";
     homepage = "https://owlink.org/";

From 980211c36566405abd690a74df7593070fb846c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 22:54:49 +0000
Subject: [PATCH 2167/6226] isle-portable: 0-unstable-2025-10-06 ->
 0-unstable-2025-10-18

---
 pkgs/by-name/is/isle-portable/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/is/isle-portable/package.nix b/pkgs/by-name/is/isle-portable/package.nix
index 480b71fbbe65..82349c4ab717 100644
--- a/pkgs/by-name/is/isle-portable/package.nix
+++ b/pkgs/by-name/is/isle-portable/package.nix
@@ -29,13 +29,13 @@
 stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
   name = "isle-portable";
-  version = "0-unstable-2025-10-06";
+  version = "0-unstable-2025-10-18";
 
   src = fetchFromGitHub {
     owner = "isledecomp";
     repo = "isle-portable";
-    rev = "6ea82ae144b91874bd41fe32e9ffb82507a87ef0";
-    hash = "sha256-5BWMGjvAxyaI2KepbHgy9lYKorb5tWbqlZw2YkbQ7L0=";
+    rev = "b06f05ccf908e208bf8d139ac8adee0e6905803d";
+    hash = "sha256-VOfUK2kiTEQdkhO2cVyec3nJ5V3dbqFG0HPr6dOTVMs=";
     fetchSubmodules = true;
   };
 

From 6e18b0850e8ce7c94d011aff139068e679bc079a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 23:17:07 +0000
Subject: [PATCH 2168/6226] python3Packages.pydal: 20251012.3 -> 20251018.1

---
 pkgs/development/python-modules/pydal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pydal/default.nix b/pkgs/development/python-modules/pydal/default.nix
index e4c3b9a41bd8..04db786876f1 100644
--- a/pkgs/development/python-modules/pydal/default.nix
+++ b/pkgs/development/python-modules/pydal/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pydal";
-  version = "20251012.3";
+  version = "20251018.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-u5tT1hqd82gcWNIiVkx4V7E6Xwpc/TCm91D/tzPl/C4=";
+    hash = "sha256-WGMcxDY2SA9LYgqSUEf6rsBTBnXpYgqTuRGYBpA/hgk=";
   };
 
   build-system = [ setuptools ];

From e007b227f3f8d0e1183d714c858894c620b0d300 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 23:25:10 +0000
Subject: [PATCH 2169/6226] beam26Packages.ex_doc: 0.38.4 -> 0.39.0

---
 pkgs/development/beam-modules/ex_doc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix
index 5263899d4221..d0f121b41aa1 100644
--- a/pkgs/development/beam-modules/ex_doc/default.nix
+++ b/pkgs/development/beam-modules/ex_doc/default.nix
@@ -14,12 +14,12 @@
 
 let
   pname = "ex_doc";
-  version = "0.38.4";
+  version = "0.39.0";
   src = fetchFromGitHub {
     owner = "elixir-lang";
     repo = "${pname}";
     rev = "v${version}";
-    hash = "sha256-/gZczKm/IF5QQemrdcda9oKVIGDFSqdiu8YrBwT6Mtk=";
+    hash = "sha256-7f4TQgQIeWb+SRMYLsqnOWnPHY7Pqi8qtruVe8OaZRY=";
   };
 in
 mixRelease {

From b90b6cd4ee1300b14f18b3bf2e4bd7e882746507 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 23 Oct 2025 16:29:11 -0700
Subject: [PATCH 2170/6226] cudaPackages.nsight_compute: patch shebangs in
 scripts

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/packages/nsight_compute.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/cuda-modules/packages/nsight_compute.nix b/pkgs/development/cuda-modules/packages/nsight_compute.nix
index 0387e1c30e06..a172866713be 100644
--- a/pkgs/development/cuda-modules/packages/nsight_compute.nix
+++ b/pkgs/development/cuda-modules/packages/nsight_compute.nix
@@ -58,6 +58,8 @@ buildRedist {
     fi
 
     rm -rf host/${archDir}/Mesa/
+
+    patchShebangs .
   '';
 
   postInstall = ''

From af65ee8e9cdf62cc62a3ff9c76bb55591fcb01b1 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 20:29:15 -0300
Subject: [PATCH 2171/6226] playbar2: fix build with cmake4

---
 pkgs/applications/audio/playbar2/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/playbar2/default.nix b/pkgs/applications/audio/playbar2/default.nix
index f698a39440a6..1eff8ab97ee6 100644
--- a/pkgs/applications/audio/playbar2/default.nix
+++ b/pkgs/applications/audio/playbar2/default.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
   version = "2.5";
 
   src = fetchFromGitHub {
-    owner = "audoban";
+    owner = "jsmitar";
     repo = "PlayBar2";
     rev = "v${version}";
     sha256 = "0iv2m4flgaz2r0k7f6l0ca8p6cw8j8j2gin1gci2pg3l5g5khbch";
@@ -31,9 +31,14 @@ stdenv.mkDerivation rec {
 
   dontWrapQtApps = true;
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Mpris2 Client for Plasma5";
-    homepage = "https://github.com/audoban/PlayBar2";
+    homepage = "https://github.com/jsmitar/PlayBar2";
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = with maintainers; [ pjones ];

From 218fe975b3b36e992acc38e7431801dd0e2b1572 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 23 Oct 2025 16:34:47 -0700
Subject: [PATCH 2172/6226] cudaPackages: prefer autoPatchelfIgnoreMissingDeps
 to extraAutoPatchelfLibs

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/README.md                |  6 ++++++
 pkgs/development/cuda-modules/packages/cuda_compat.nix |  2 +-
 pkgs/development/cuda-modules/packages/cuda_nvprof.nix |  7 ++-----
 pkgs/development/cuda-modules/packages/cuquantum.nix   |  7 ++-----
 pkgs/development/cuda-modules/packages/libcublasmp.nix |  7 ++-----
 pkgs/development/cuda-modules/packages/libcudla.nix    |  2 +-
 pkgs/development/cuda-modules/packages/libcufile.nix   |  7 ++-----
 .../cuda-modules/packages/nsight_compute.nix           |  2 +-
 .../cuda-modules/packages/nsight_systems.nix           | 10 +++-------
 pkgs/development/cuda-modules/packages/tensorrt.nix    |  2 +-
 10 files changed, 21 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/cuda-modules/README.md b/pkgs/development/cuda-modules/README.md
index a826d48ca2f2..8b1b1856cb3f 100644
--- a/pkgs/development/cuda-modules/README.md
+++ b/pkgs/development/cuda-modules/README.md
@@ -46,6 +46,12 @@ not straightforward to include. These packages are:
 - `cudnn`:
   - `cudnn_samples`: requires FreeImage, which is abandoned and not packaged.
 
+> [!NOTE]
+>
+> When packaging redistributables, prefer `autoPatchelfIgnoreMissingDeps` to providing
+> paths to stubs with `extraAutoPatchelfLibs`; the stubs are meant to be used for
+> projects where linking against libraries available only at runtime is unavoidable.
+
 ### CUDA Compatibility
 
 [CUDA Compatibility](https://docs.nvidia.com/deploy/cuda-compatibility/),
diff --git a/pkgs/development/cuda-modules/packages/cuda_compat.nix b/pkgs/development/cuda-modules/packages/cuda_compat.nix
index 0a2f5e0e7cd7..09f04f143322 100644
--- a/pkgs/development/cuda-modules/packages/cuda_compat.nix
+++ b/pkgs/development/cuda-modules/packages/cuda_compat.nix
@@ -8,9 +8,9 @@ buildRedist {
   outputs = [ "out" ];
 
   autoPatchelfIgnoreMissingDeps = [
+    "libnvdla_runtime.so"
     "libnvrm_gpu.so"
     "libnvrm_mem.so"
-    "libnvdla_runtime.so"
   ];
 
   meta = {
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvprof.nix b/pkgs/development/cuda-modules/packages/cuda_nvprof.nix
index 202dfc389d34..2b8f1bbd379c 100644
--- a/pkgs/development/cuda-modules/packages/cuda_nvprof.nix
+++ b/pkgs/development/cuda-modules/packages/cuda_nvprof.nix
@@ -1,8 +1,6 @@
 {
   buildRedist,
-  cuda_cudart,
   cuda_cupti,
-  lib,
 }:
 buildRedist {
   redistName = "cuda";
@@ -17,12 +15,11 @@ buildRedist {
   ];
 
   buildInputs = [
-    (lib.getOutput "stubs" cuda_cudart)
     cuda_cupti
   ];
 
-  extraAutoPatchelfLibs = [
-    "${lib.getOutput "stubs" cuda_cudart}/lib/stubs"
+  autoPatchelfIgnoreMissingDeps = [
+    "libcuda.so.1"
   ];
 
   meta = {
diff --git a/pkgs/development/cuda-modules/packages/cuquantum.nix b/pkgs/development/cuda-modules/packages/cuquantum.nix
index 8f3c0a30d893..b9fed9c551c0 100644
--- a/pkgs/development/cuda-modules/packages/cuquantum.nix
+++ b/pkgs/development/cuda-modules/packages/cuquantum.nix
@@ -1,8 +1,6 @@
 {
   buildRedist,
   cuda_cudart,
-  cuda_nvml_dev,
-  lib,
   libcublas,
   libcurand,
   libcusolver,
@@ -22,15 +20,14 @@ buildRedist {
 
   buildInputs = [
     cuda_cudart
-    (lib.getOutput "stubs" cuda_nvml_dev) # for libnvidia-ml.so
     libcublas
     libcurand
     libcusolver
     libcutensor
   ];
 
-  extraAutoPatchelfLibs = [
-    "${lib.getOutput "stubs" cuda_nvml_dev}/lib/stubs"
+  autoPatchelfIgnoreMissingDeps = [
+    "libnvidia-ml.so.1"
   ];
 
   meta = {
diff --git a/pkgs/development/cuda-modules/packages/libcublasmp.nix b/pkgs/development/cuda-modules/packages/libcublasmp.nix
index 8c0b7a5482f9..cd77b6dcb56a 100644
--- a/pkgs/development/cuda-modules/packages/libcublasmp.nix
+++ b/pkgs/development/cuda-modules/packages/libcublasmp.nix
@@ -1,8 +1,6 @@
 {
   _cuda,
   buildRedist,
-  cuda_cudart,
-  lib,
   libcublas,
   libnvshmem,
   nccl,
@@ -21,14 +19,13 @@ buildRedist {
   # TODO: Looks like the minimum supported capability is 7.0 as of the latest:
   # https://docs.nvidia.com/cuda/cublasmp/getting_started/index.html
   buildInputs = [
-    (lib.getOutput "stubs" cuda_cudart)
     libcublas
     libnvshmem
     nccl
   ];
 
-  extraAutoPatchelfLibs = [
-    "${lib.getOutput "stubs" cuda_cudart}/lib/stubs"
+  autoPatchelfIgnoreMissingDeps = [
+    "libcuda.so.1"
   ];
 
   meta = {
diff --git a/pkgs/development/cuda-modules/packages/libcudla.nix b/pkgs/development/cuda-modules/packages/libcudla.nix
index 0c9f2da5492e..fc82b278786a 100644
--- a/pkgs/development/cuda-modules/packages/libcudla.nix
+++ b/pkgs/development/cuda-modules/packages/libcudla.nix
@@ -15,7 +15,7 @@ buildRedist {
     "stubs"
   ];
 
-  autoPatchelfIgnoreMissingDeps = lib.optionals backendStdenv.hasJetsonCudaCapability [
+  autoPatchelfIgnoreMissingDeps = [
     "libnvcudla.so"
   ];
 
diff --git a/pkgs/development/cuda-modules/packages/libcufile.nix b/pkgs/development/cuda-modules/packages/libcufile.nix
index 1d5fba212bec..c68303395213 100644
--- a/pkgs/development/cuda-modules/packages/libcufile.nix
+++ b/pkgs/development/cuda-modules/packages/libcufile.nix
@@ -1,7 +1,5 @@
 {
   buildRedist,
-  cuda_cudart,
-  lib,
   numactl,
   rdma-core,
 }:
@@ -20,13 +18,12 @@ buildRedist {
   allowFHSReferences = true;
 
   buildInputs = [
-    (lib.getOutput "stubs" cuda_cudart)
     numactl
     rdma-core
   ];
 
-  extraAutoPatchelfLibs = [
-    "${lib.getOutput "stubs" cuda_cudart}/lib/stubs"
+  autoPatchelfIgnoreMissingDeps = [
+    "libcuda.so.1"
   ];
 
   meta = {
diff --git a/pkgs/development/cuda-modules/packages/nsight_compute.nix b/pkgs/development/cuda-modules/packages/nsight_compute.nix
index a172866713be..6173decdff4d 100644
--- a/pkgs/development/cuda-modules/packages/nsight_compute.nix
+++ b/pkgs/development/cuda-modules/packages/nsight_compute.nix
@@ -85,8 +85,8 @@ buildRedist {
   '';
 
   autoPatchelfIgnoreMissingDeps = [
-    "libnvidia-ml.so.1"
     "libcuda.so.1"
+    "libnvidia-ml.so.1"
   ];
 
   meta = {
diff --git a/pkgs/development/cuda-modules/packages/nsight_systems.nix b/pkgs/development/cuda-modules/packages/nsight_systems.nix
index d12cc2c7b3b2..1bf7392494ed 100644
--- a/pkgs/development/cuda-modules/packages/nsight_systems.nix
+++ b/pkgs/development/cuda-modules/packages/nsight_systems.nix
@@ -2,8 +2,6 @@
   backendStdenv,
   boost178,
   buildRedist,
-  cuda_cudart,
-  cuda_nvml_dev,
   e2fsprogs,
   gst_all_1,
   lib,
@@ -97,8 +95,6 @@ buildRedist {
     qt6.qtwebengine
     qt6.qtwayland
     boost178
-    (lib.getOutput "stubs" cuda_cudart)
-    (lib.getOutput "stubs" cuda_nvml_dev)
     e2fsprogs
     gst_all_1.gst-plugins-base
     gst_all_1.gstreamer
@@ -132,9 +128,9 @@ buildRedist {
     patchelf --replace-needed libtiff.so.5 libtiff.so "''${!outputBin}/${hostDir}/Plugins/imageformats/libqtiff.so"
   '';
 
-  extraAutoPatchelfLibs = [
-    "${lib.getOutput "stubs" cuda_cudart}/lib/stubs"
-    "${lib.getOutput "stubs" cuda_nvml_dev}/lib/stubs"
+  autoPatchelfIgnoreMissingDeps = [
+    "libcuda.so.1"
+    "libnvidia-ml.so.1"
   ];
 
   meta = {
diff --git a/pkgs/development/cuda-modules/packages/tensorrt.nix b/pkgs/development/cuda-modules/packages/tensorrt.nix
index 0a1192090e90..377d8d19ee2f 100644
--- a/pkgs/development/cuda-modules/packages/tensorrt.nix
+++ b/pkgs/development/cuda-modules/packages/tensorrt.nix
@@ -87,7 +87,7 @@ buildRedist (
         fi
       '';
 
-    autoPatchelfIgnoreMissingDeps = optionals hasJetsonCudaCapability [
+    autoPatchelfIgnoreMissingDeps = optionals libcudla.meta.available [
       "libnvdla_compiler.so"
     ];
 

From 366d65722acf7c1b596d5bd00e0e81a4c3f9a38d Mon Sep 17 00:00:00 2001
From: Sam Estep <sam@samestep.com>
Date: Thu, 23 Oct 2025 18:59:54 -0400
Subject: [PATCH 2173/6226] caffe: fix build with cmake 4

---
 .../math/caffe/cmake-minimum-required.patch        | 10 ++++++++++
 pkgs/applications/science/math/caffe/default.nix   |  2 ++
 .../math/caffe/random-shuffle-includes.patch       | 14 ++++++++++++++
 3 files changed, 26 insertions(+)
 create mode 100644 pkgs/applications/science/math/caffe/cmake-minimum-required.patch
 create mode 100644 pkgs/applications/science/math/caffe/random-shuffle-includes.patch

diff --git a/pkgs/applications/science/math/caffe/cmake-minimum-required.patch b/pkgs/applications/science/math/caffe/cmake-minimum-required.patch
new file mode 100644
index 000000000000..218196a65a7b
--- /dev/null
+++ b/pkgs/applications/science/math/caffe/cmake-minimum-required.patch
@@ -0,0 +1,10 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 08f56a33..c5291fd7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.7)
++cmake_minimum_required(VERSION 3.10)
+ if(POLICY CMP0046)
+   cmake_policy(SET CMP0046 NEW)
+ endif()
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix
index a022fcd8e1dd..46f792e67ec5 100644
--- a/pkgs/applications/science/math/caffe/default.nix
+++ b/pkgs/applications/science/math/caffe/default.nix
@@ -112,9 +112,11 @@ stdenv.mkDerivation rec {
   propagatedBuildOutputs = [ ]; # otherwise propagates out -> bin cycle
 
   patches = [
+    ./cmake-minimum-required.patch
     ./darwin.patch
     ./glog-cmake.patch
     ./random-shuffle.patch
+    ./random-shuffle-includes.patch
     (fetchpatch {
       name = "support-opencv4";
       url = "https://github.com/BVLC/caffe/pull/6638/commits/0a04cc2ccd37ba36843c18fea2d5cbae6e7dd2b5.patch";
diff --git a/pkgs/applications/science/math/caffe/random-shuffle-includes.patch b/pkgs/applications/science/math/caffe/random-shuffle-includes.patch
new file mode 100644
index 000000000000..bfc1f4e459e9
--- /dev/null
+++ b/pkgs/applications/science/math/caffe/random-shuffle-includes.patch
@@ -0,0 +1,14 @@
+diff --git a/src/caffe/layers/hdf5_data_layer.cpp b/src/caffe/layers/hdf5_data_layer.cpp
+index 01213691..f42e7bea 100644
+--- a/src/caffe/layers/hdf5_data_layer.cpp
++++ b/src/caffe/layers/hdf5_data_layer.cpp
+@@ -6,7 +6,9 @@ TODO:
+   :: don't forget to update hdf5_daa_layer.cu accordingly
+ - add ability to shuffle filenames if flag is set
+ */
++#include <algorithm>
+ #include <fstream>  // NOLINT(readability/streams)
++#include <random>
+ #include <string>
+ #include <vector>
+ 

From e68bdabd632ed15be007fc969b8073f65347550d Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 20:43:27 -0300
Subject: [PATCH 2174/6226] podofo_0_9: fix build with cmake4

---
 pkgs/by-name/po/podofo_0_9/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/po/podofo_0_9/package.nix b/pkgs/by-name/po/podofo_0_9/package.nix
index 1d7bf196678c..68ffb35cac44 100644
--- a/pkgs/by-name/po/podofo_0_9/package.nix
+++ b/pkgs/by-name/po/podofo_0_9/package.nix
@@ -62,6 +62,9 @@ stdenv.mkDerivation rec {
         -e 's/LIBDIRNAME/CMAKE_INSTALL_LIBDIR/' -e "$failNoMatches"
     sed -ni src/podofo/libpodofo.pc.in \
         -e 's/^libdir=.*/libdir=@CMAKE_INSTALL_LIBDIR@/' -e "$failNoMatches"
+
+    substituteInPlace {src/podofo/,./}CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   meta = {

From 5b319cf2774a4bebfe2be2d1f2abf8037878492e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 23:43:47 +0000
Subject: [PATCH 2175/6226] nnd: 0.53 -> 0.56

---
 pkgs/by-name/nn/nnd/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nn/nnd/package.nix b/pkgs/by-name/nn/nnd/package.nix
index 1e00404c6824..5da77ad70a91 100644
--- a/pkgs/by-name/nn/nnd/package.nix
+++ b/pkgs/by-name/nn/nnd/package.nix
@@ -8,16 +8,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nnd";
-  version = "0.53";
+  version = "0.56";
 
   src = fetchFromGitHub {
     owner = "al13n321";
     repo = "nnd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZWiWxFMuzA7ikeLzLhDTKdKnoyIC48n/tf5fcnwEBq0=";
+    hash = "sha256-3xxb42dCnH41ufT6Thp/3z7Vs/Rlsxm6IOHMKi0jvQI=";
   };
 
-  cargoHash = "sha256-KTGCu0It2izalwfwdMqcpRdtX3zM/HIpy70JFuneXvQ=";
+  cargoHash = "sha256-PGPBNBg+71U201iSo1WYOOUJlWPi+njasGaXbhqmaVw=";
 
   meta = {
     description = "Debugger for Linux";

From 8af89d087539c7e161df2f14ecfdb76f4cf66241 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Thu, 23 Oct 2025 16:47:29 -0700
Subject: [PATCH 2176/6226] cudaPackages: allow expressions to be used with
 older versions of CUDA

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/packages/cuda_gdb.nix        |  22 +-
 .../cuda-modules/packages/cuda_nvprof.nix     |   6 +
 .../cuda-modules/packages/cuda_nvrtc.nix      |  12 +-
 .../cuda-modules/packages/libcudla.nix        |   5 +
 .../cuda-modules/packages/libcufile.nix       |   7 +-
 .../cuda-modules/packages/libcusolver.nix     |  13 +-
 .../cuda-modules/packages/libcusparse.nix     |  11 +-
 .../cuda-modules/packages/libnvjitlink.nix    |  10 +-
 .../cuda-modules/packages/nsight_compute.nix  | 182 +++++++------
 .../cuda-modules/packages/nsight_systems.nix  | 244 ++++++++++--------
 .../cuda-modules/packages/tensorrt.nix        |   2 +-
 11 files changed, 306 insertions(+), 208 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/cuda_gdb.nix b/pkgs/development/cuda-modules/packages/cuda_gdb.nix
index 0eb1e56f65c2..8dc2812fd325 100644
--- a/pkgs/development/cuda-modules/packages/cuda_gdb.nix
+++ b/pkgs/development/cuda-modules/packages/cuda_gdb.nix
@@ -23,17 +23,17 @@ buildRedist {
 
   allowFHSReferences = true;
 
-  buildInputs = [
-    gmp
-  ]
-  # aarch64, sbsa needs expat
-  ++ lib.optionals backendStdenv.hostPlatform.isAarch64 [ expat ]
-  # From 12.5, cuda-gdb comes with Python TUI wrappers
-  ++ lib.optionals (cudaAtLeast "12.5") [
-    libxcrypt-legacy
-    ncurses
-    python3
-  ];
+  buildInputs =
+    # only needs gmp from 12.0 and on
+    lib.optionals (cudaAtLeast "12.0") [ gmp ]
+    # aarch64, sbsa needs expat
+    ++ lib.optionals backendStdenv.hostPlatform.isAarch64 [ expat ]
+    # From 12.5, cuda-gdb comes with Python TUI wrappers
+    ++ lib.optionals (cudaAtLeast "12.5") [
+      libxcrypt-legacy
+      ncurses
+      python3
+    ];
 
   # Remove binaries requiring Python3 versions we do not have
   postInstall = lib.optionalString (cudaAtLeast "12.5") ''
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvprof.nix b/pkgs/development/cuda-modules/packages/cuda_nvprof.nix
index 2b8f1bbd379c..994e6ea1126d 100644
--- a/pkgs/development/cuda-modules/packages/cuda_nvprof.nix
+++ b/pkgs/development/cuda-modules/packages/cuda_nvprof.nix
@@ -1,6 +1,9 @@
 {
+  backendStdenv,
   buildRedist,
   cuda_cupti,
+  cudaAtLeast,
+  lib,
 }:
 buildRedist {
   redistName = "cuda";
@@ -10,6 +13,9 @@ buildRedist {
 
   outputs = [
     "out"
+  ]
+  # The `bin` and `lib` output are only available on SBSA starting with CUDA 11.8.
+  ++ lib.optionals (backendStdenv.hostRedistSystem != "linux-sbsa" || cudaAtLeast "11.8") [
     "bin"
     "lib"
   ];
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvrtc.nix b/pkgs/development/cuda-modules/packages/cuda_nvrtc.nix
index 88828bd15050..d3cc276ab67e 100644
--- a/pkgs/development/cuda-modules/packages/cuda_nvrtc.nix
+++ b/pkgs/development/cuda-modules/packages/cuda_nvrtc.nix
@@ -1,4 +1,8 @@
-{ buildRedist }:
+{
+  buildRedist,
+  cudaAtLeast,
+  lib,
+}:
 buildRedist {
   redistName = "cuda";
   pname = "cuda_nvrtc";
@@ -8,9 +12,9 @@ buildRedist {
     "dev"
     "include"
     "lib"
-    "static"
-    "stubs"
-  ];
+  ]
+  ++ lib.optionals (cudaAtLeast "11.5") [ "static" ]
+  ++ [ "stubs" ];
 
   allowFHSReferences = true;
 
diff --git a/pkgs/development/cuda-modules/packages/libcudla.nix b/pkgs/development/cuda-modules/packages/libcudla.nix
index fc82b278786a..a24a06b80b36 100644
--- a/pkgs/development/cuda-modules/packages/libcudla.nix
+++ b/pkgs/development/cuda-modules/packages/libcudla.nix
@@ -1,6 +1,7 @@
 {
   backendStdenv,
   buildRedist,
+  cudaMajorMinorVersion,
   lib,
 }:
 buildRedist {
@@ -17,6 +18,10 @@ buildRedist {
 
   autoPatchelfIgnoreMissingDeps = [
     "libnvcudla.so"
+  ]
+  ++ lib.optionals (cudaMajorMinorVersion == "11.8") [
+    "libcuda.so.1"
+    "libnvdla_runtime.so"
   ];
 
   platformAssertions = [
diff --git a/pkgs/development/cuda-modules/packages/libcufile.nix b/pkgs/development/cuda-modules/packages/libcufile.nix
index c68303395213..c32a0d0478f1 100644
--- a/pkgs/development/cuda-modules/packages/libcufile.nix
+++ b/pkgs/development/cuda-modules/packages/libcufile.nix
@@ -1,5 +1,7 @@
 {
   buildRedist,
+  cudaOlder,
+  lib,
   numactl,
   rdma-core,
 }:
@@ -17,14 +19,17 @@ buildRedist {
 
   allowFHSReferences = true;
 
+  # TODO(@connorbaker): At some point before 12.6, libcufile depends on libcublas.
   buildInputs = [
     numactl
     rdma-core
   ];
 
+  # Before 11.7 libcufile depends on itself for some reason.
   autoPatchelfIgnoreMissingDeps = [
     "libcuda.so.1"
-  ];
+  ]
+  ++ lib.optionals (cudaOlder "11.7") [ "libcufile.so.0" ];
 
   meta = {
     description = "Library to leverage GDS technology";
diff --git a/pkgs/development/cuda-modules/packages/libcusolver.nix b/pkgs/development/cuda-modules/packages/libcusolver.nix
index 90a9f6de8f37..0ff5e26d7d52 100644
--- a/pkgs/development/cuda-modules/packages/libcusolver.nix
+++ b/pkgs/development/cuda-modules/packages/libcusolver.nix
@@ -1,5 +1,6 @@
 {
   buildRedist,
+  cudaAtLeast,
   lib,
   libcublas,
   libcusparse,
@@ -18,11 +19,13 @@ buildRedist {
     "stubs"
   ];
 
-  buildInputs = [
-    (lib.getLib libcublas)
-    (lib.getLib libcusparse)
-    libnvjitlink
-  ];
+  buildInputs =
+    # Always depends on this
+    [ (lib.getLib libcublas) ]
+    # Dependency from 12.0 and on
+    ++ lib.optionals (cudaAtLeast "12.0") [ libnvjitlink ]
+    # Dependency from 12.1 and on
+    ++ lib.optionals (cudaAtLeast "12.1") [ (lib.getLib libcusparse) ];
 
   meta = {
     description = "Collection of dense and sparse direct linear solvers and Eigen solvers";
diff --git a/pkgs/development/cuda-modules/packages/libcusparse.nix b/pkgs/development/cuda-modules/packages/libcusparse.nix
index 9553d2da4903..959cbf8d343b 100644
--- a/pkgs/development/cuda-modules/packages/libcusparse.nix
+++ b/pkgs/development/cuda-modules/packages/libcusparse.nix
@@ -1,4 +1,9 @@
-{ buildRedist, libnvjitlink }:
+{
+  buildRedist,
+  cudaAtLeast,
+  lib,
+  libnvjitlink,
+}:
 buildRedist {
   redistName = "cuda";
   pname = "libcusparse";
@@ -12,7 +17,9 @@ buildRedist {
     "stubs"
   ];
 
-  buildInputs = [ libnvjitlink ];
+  buildInputs =
+    # Dependency from 12.0 and on
+    lib.optionals (cudaAtLeast "12.0") [ libnvjitlink ];
 
   meta = {
     description = "GPU-accelerated basic linear algebra subroutines for sparse matrix computations for unstructured sparsity";
diff --git a/pkgs/development/cuda-modules/packages/libnvjitlink.nix b/pkgs/development/cuda-modules/packages/libnvjitlink.nix
index 4124d3fa86a6..c641cea10d38 100644
--- a/pkgs/development/cuda-modules/packages/libnvjitlink.nix
+++ b/pkgs/development/cuda-modules/packages/libnvjitlink.nix
@@ -1,4 +1,8 @@
-{ buildRedist }:
+{
+  buildRedist,
+  cudaAtLeast,
+  lib,
+}:
 buildRedist {
   redistName = "cuda";
   pname = "libnvjitlink";
@@ -9,8 +13,8 @@ buildRedist {
     "include"
     "lib"
     "static"
-    "stubs"
-  ];
+  ]
+  ++ lib.optionals (cudaAtLeast "12.2") [ "stubs" ];
 
   meta = {
     description = "APIs which can be used at runtime to link together GPU device code";
diff --git a/pkgs/development/cuda-modules/packages/nsight_compute.nix b/pkgs/development/cuda-modules/packages/nsight_compute.nix
index 6173decdff4d..6f7f1d0772b2 100644
--- a/pkgs/development/cuda-modules/packages/nsight_compute.nix
+++ b/pkgs/development/cuda-modules/packages/nsight_compute.nix
@@ -2,12 +2,16 @@
   backendStdenv,
   buildRedist,
   cudaAtLeast,
+  cudaMajorMinorVersion,
   cudaOlder,
   e2fsprogs,
   elfutils,
   flags,
+  gst_all_1,
   lib,
-  qt6,
+  libjpeg8,
+  qt5 ? null,
+  qt6 ? null,
   rdma-core,
   ucx,
 }:
@@ -20,86 +24,116 @@ let
     .${backendStdenv.hostPlatform.system}
       or (throw "Unsupported system: ${backendStdenv.hostPlatform.system}");
 in
-buildRedist {
-  redistName = "cuda";
-  pname = "nsight_compute";
+buildRedist (
+  finalAttrs:
+  let
+    qt = if lib.versionOlder finalAttrs.version "2022.2.0" then qt5 else qt6;
+    qtwayland =
+      if lib.versions.major qt.qtbase.version == "5" then
+        lib.getBin qt.qtwayland
+      else
+        lib.getLib qt.qtwayland;
+    inherit (qt) wrapQtAppsHook qtwebengine qtwebview;
+  in
+  {
+    redistName = "cuda";
+    pname = "nsight_compute";
 
-  # NOTE(@connorbaker): It might be a problem that when nsight_compute contains hosts and targets of different
-  # architectures, that we patchelf just the binaries matching the builder's platform; autoPatchelfHook prints
-  # messages like
-  #   skipping [$out]/host/linux-desktop-glibc_2_11_3-x64/libQt6Core.so.6 because its architecture (x64) differs from
-  #   target (AArch64)
-  outputs = [ "out" ];
+    # NOTE(@connorbaker): It might be a problem that when nsight_compute contains hosts and targets of different
+    # architectures, that we patchelf just the binaries matching the builder's platform; autoPatchelfHook prints
+    # messages like
+    #   skipping [$out]/host/linux-desktop-glibc_2_11_3-x64/libQt6Core.so.6 because its architecture (x64) differs from
+    #   target (AArch64)
+    outputs = [ "out" ];
 
-  allowFHSReferences = true;
+    allowFHSReferences = true;
 
-  nativeBuildInputs = [ qt6.wrapQtAppsHook ];
+    nativeBuildInputs = [ wrapQtAppsHook ];
 
-  buildInputs = [
-    (lib.getLib qt6.qtwayland)
-    qt6.qtwebview
-    qt6.qtwebengine
-    rdma-core
-  ]
-  ++ lib.optionals (cudaOlder "12.7") [
-    e2fsprogs
-    ucx
-  ]
-  ++ lib.optionals (cudaAtLeast "12.9") [ elfutils ];
+    buildInputs = [
+      (lib.getLib qtwayland)
+      qtwebengine
+      qtwebview
+      rdma-core
+    ]
+    ++ lib.optionals (cudaMajorMinorVersion == "12.0" && backendStdenv.hostPlatform.isAarch64) [
+      libjpeg8
+    ]
+    ++ lib.optionals (cudaAtLeast "12.1" && cudaOlder "12.4") [
+      gst_all_1.gstreamer
+      gst_all_1.gst-plugins-base
+    ]
+    ++ lib.optionals (cudaAtLeast "12.0" && cudaOlder "12.7") [
+      e2fsprogs
+      ucx
+    ]
+    ++ lib.optionals (cudaAtLeast "12.9") [ elfutils ];
 
-  dontWrapQtApps = true;
+    dontWrapQtApps = true;
 
-  preInstall = ''
-    if [[ -d nsight-compute ]]; then
-      nixLog "Lifting components of Nsight Compute to the top level"
-      mv -v nsight-compute/*/* .
-      nixLog "Removing empty directories"
-      rmdir -pv nsight-compute/*
-    fi
+    preInstall = ''
+      if [[ -d nsight-compute ]]; then
+        nixLog "Lifting components of Nsight Compute to the top level"
+        mv -v nsight-compute/*/* .
+        nixLog "Removing empty directories"
+        rmdir -pv nsight-compute/*
+      fi
 
-    rm -rf host/${archDir}/Mesa/
+      rm -rf host/${archDir}/Mesa/
 
-    patchShebangs .
-  '';
-
-  postInstall = ''
-    moveToOutput 'ncu' "''${!outputBin}/bin"
-    moveToOutput 'ncu-ui' "''${!outputBin}/bin"
-    moveToOutput 'host/${archDir}' "''${!outputBin}/bin"
-    moveToOutput 'target/${archDir}' "''${!outputBin}/bin"
-    wrapQtApp "''${!outputBin}/bin/host/${archDir}/ncu-ui.bin"
-  ''
-  # NOTE(@connorbaker): No idea what this platform is or how to patchelf for it.
-  + lib.optionalString (flags.isJetsonBuild && cudaOlder "12.9") ''
-    nixLog "Removing QNX 700 target directory for Jetson builds"
-    rm -rfv "''${!outputBin}/target/qnx-700-t210-a64"
-  ''
-  + lib.optionalString (flags.isJetsonBuild && cudaAtLeast "12.8") ''
-    nixLog "Removing QNX 800 target directory for Jetson builds"
-    rm -rfv "''${!outputBin}/target/qnx-800-tegra-a64"
-  '';
-
-  # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
-  preFixup = ''
-    patchelf --replace-needed libtiff.so.5 libtiff.so "''${!outputBin}/bin/host/${archDir}/Plugins/imageformats/libqtiff.so"
-  '';
-
-  autoPatchelfIgnoreMissingDeps = [
-    "libcuda.so.1"
-    "libnvidia-ml.so.1"
-  ];
-
-  meta = {
-    description = "Interactive profiler for CUDA and NVIDIA OptiX";
-    longDescription = ''
-      NVIDIA Nsight Compute is an interactive profiler for CUDA and NVIDIA OptiX that provides detailed performance
-      metrics and API debugging via a user interface and command-line tool. Users can run guided analysis and compare
-      results with a customizable and data-driven user interface, as well as post-process and analyze results in their
-      own workflows.
+      patchShebangs .
     '';
-    homepage = "https://developer.nvidia.com/nsight-compute";
-    changelog = "https://docs.nvidia.com/nsight-compute/ReleaseNotes";
 
-    mainProgram = "ncu";
-  };
-}
+    postInstall = ''
+      moveToOutput 'ncu' "''${!outputBin}/bin"
+      moveToOutput 'ncu-ui' "''${!outputBin}/bin"
+      moveToOutput 'host/${archDir}' "''${!outputBin}/bin"
+      moveToOutput 'target/${archDir}' "''${!outputBin}/bin"
+      wrapQtApp "''${!outputBin}/bin/host/${archDir}/ncu-ui.bin"
+    ''
+    # NOTE(@connorbaker): No idea what this platform is or how to patchelf for it.
+    + lib.optionalString (flags.isJetsonBuild && cudaAtLeast "11.8" && cudaOlder "12.9") ''
+      nixLog "Removing QNX 700 target directory for Jetson builds"
+      rm -rfv "''${!outputBin}/target/qnx-700-t210-a64"
+    ''
+    + lib.optionalString (flags.isJetsonBuild && cudaAtLeast "12.8") ''
+      nixLog "Removing QNX 800 target directory for Jetson builds"
+      rm -rfv "''${!outputBin}/target/qnx-800-tegra-a64"
+    '';
+
+    # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
+    preFixup = ''
+      patchelf --replace-needed libtiff.so.5 libtiff.so "''${!outputBin}/bin/host/${archDir}/Plugins/imageformats/libqtiff.so"
+    '';
+
+    autoPatchelfIgnoreMissingDeps = [
+      "libcuda.so.1"
+      "libnvidia-ml.so.1"
+    ];
+
+    brokenAssertions = [
+      {
+        message = "Qt 5 is required and available";
+        assertion = lib.versionOlder finalAttrs.version "2022.2.0" -> qt5 != null;
+      }
+      {
+        message = "Qt 6 is required and available";
+        assertion = lib.versionAtLeast finalAttrs.version "2022.2.0" -> qt6 != null;
+      }
+    ];
+
+    meta = {
+      description = "Interactive profiler for CUDA and NVIDIA OptiX";
+      longDescription = ''
+        NVIDIA Nsight Compute is an interactive profiler for CUDA and NVIDIA OptiX that provides detailed performance
+        metrics and API debugging via a user interface and command-line tool. Users can run guided analysis and compare
+        results with a customizable and data-driven user interface, as well as post-process and analyze results in their
+        own workflows.
+      '';
+      homepage = "https://developer.nvidia.com/nsight-compute";
+      changelog = "https://docs.nvidia.com/nsight-compute/ReleaseNotes";
+
+      mainProgram = "ncu";
+    };
+  }
+)
diff --git a/pkgs/development/cuda-modules/packages/nsight_systems.nix b/pkgs/development/cuda-modules/packages/nsight_systems.nix
index 1bf7392494ed..3f575214a2ef 100644
--- a/pkgs/development/cuda-modules/packages/nsight_systems.nix
+++ b/pkgs/development/cuda-modules/packages/nsight_systems.nix
@@ -2,21 +2,21 @@
   backendStdenv,
   boost178,
   buildRedist,
+  cudaAtLeast,
   e2fsprogs,
   gst_all_1,
   lib,
   nss,
   numactl,
   pulseaudio,
-  qt6,
+  qt5 ? null,
+  qt6 ? null,
   rdma-core,
   ucx,
   wayland,
   xorg,
 }:
 let
-  qtwayland = lib.getLib qt6.qtwayland;
-  qtWaylandPlugins = "${qtwayland}/${qt6.qtbase.qtPluginPrefix}";
   # NOTE(@connorbaker): nsight_systems doesn't support Jetson, so no need for case splitting on aarch64-linux.
   hostDir =
     {
@@ -33,114 +33,144 @@ let
     .${backendStdenv.hostPlatform.system}
       or (throw "Unsupported system: ${backendStdenv.hostPlatform.system}");
 in
-buildRedist {
-  redistName = "cuda";
-  pname = "nsight_systems";
+buildRedist (
+  finalAttrs:
+  let
+    qt = if lib.strings.versionOlder finalAttrs.version "2022.4.2.1" then qt5 else qt6;
+    qtwayland =
+      if lib.versions.major qt.qtbase.version == "5" then
+        lib.getBin qt.qtwayland
+      else
+        lib.getLib qt.qtwayland;
+    qtWaylandPlugins = "${qtwayland}/${qt.qtbase.qtPluginPrefix}";
+    inherit (qt) wrapQtAppsHook qtwebengine;
+  in
+  {
+    redistName = "cuda";
+    pname = "nsight_systems";
 
-  allowFHSReferences = true;
+    allowFHSReferences = true;
 
-  outputs = [ "out" ];
+    outputs = [ "out" ];
 
-  # An ad hoc replacement for
-  # https://github.com/ConnorBaker/cuda-redist-find-features/issues/11
-  env.rmPatterns = toString [
-    "${hostDir}/lib{arrow,jpeg}*"
-    "${hostDir}/lib{ssl,ssh,crypto}*"
-    "${hostDir}/libboost*"
-    "${hostDir}/libexec"
-    "${hostDir}/libstdc*"
-    "${hostDir}/python/bin/python"
-    "${hostDir}/Mesa"
-  ];
+    # An ad hoc replacement for
+    # https://github.com/ConnorBaker/cuda-redist-find-features/issues/11
+    env.rmPatterns = toString [
+      "${hostDir}/lib{arrow,jpeg}*"
+      "${hostDir}/lib{ssl,ssh,crypto}*"
+      "${hostDir}/libboost*"
+      "${hostDir}/libexec"
+      "${hostDir}/libstdc*"
+      "${hostDir}/python/bin/python"
+      "${hostDir}/Mesa"
+    ];
 
-  # NOTE(@connorbaker): nsight-exporter and nsight-sys are deprecated scripts wrapping nsys, it's fine to remove them.
-  prePatch = ''
-    if [[ -d bin ]]; then
-      nixLog "Removing bin wrapper scripts"
-      for knownWrapper in bin/{nsys{,-ui},nsight-{exporter,sys}}; do
-        [[ -e $knownWrapper ]] && rm -v "$knownWrapper"
-      done
-      unset -v knownWrapper
+    # NOTE(@connorbaker): nsight-exporter and nsight-sys are deprecated scripts wrapping nsys, it's fine to remove them.
+    prePatch = ''
+      if [[ -d bin ]]; then
+        nixLog "Removing bin wrapper scripts"
+        for knownWrapper in bin/{nsys{,-ui},nsight-{exporter,sys}}; do
+          [[ -e $knownWrapper ]] && rm -v "$knownWrapper"
+        done
+        unset -v knownWrapper
 
-      nixLog "Removing empty bin directory"
-      rmdir -v bin
-    fi
+        nixLog "Removing empty bin directory"
+        rmdir -v bin
+      fi
 
-    if [[ -d nsight-systems ]]; then
-      nixLog "Lifting components of Nsight System to the top level"
-      mv -v nsight-systems/*/* .
-      nixLog "Removing empty nsight-systems directory"
-      rmdir -pv nsight-systems/*
-    fi
-  '';
-
-  postPatch = ''
-    for path in $rmPatterns; do
-      rm -r "$path"
-    done
-    patchShebangs nsight-systems
-  '';
-
-  nativeBuildInputs = [ qt6.wrapQtAppsHook ];
-
-  dontWrapQtApps = true;
-
-  buildInputs = [
-    qt6.qtdeclarative
-    qt6.qtsvg
-    qt6.qtimageformats
-    qt6.qtpositioning
-    qt6.qtscxml
-    qt6.qttools
-    qt6.qtwebengine
-    qt6.qtwayland
-    boost178
-    e2fsprogs
-    gst_all_1.gst-plugins-base
-    gst_all_1.gstreamer
-    nss
-    numactl
-    pulseaudio
-    qt6.qtbase
-    qtWaylandPlugins
-    rdma-core
-    ucx
-    wayland
-    xorg.libXcursor
-    xorg.libXdamage
-    xorg.libXrandr
-    xorg.libXtst
-  ]
-  # NOTE(@connorbaker): Seems to be required only for aarch64-linux.
-  ++ lib.optionals backendStdenv.hostPlatform.isAarch64 [
-    gst_all_1.gst-plugins-bad
-  ];
-
-  postInstall = ''
-    moveToOutput '${hostDir}' "''${!outputBin}"
-    moveToOutput '${targetDir}' "''${!outputBin}"
-    moveToOutput 'bin' "''${!outputBin}"
-    wrapQtApp "''${!outputBin}/${hostDir}/nsys-ui.bin"
-  '';
-
-  # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
-  preFixup = ''
-    patchelf --replace-needed libtiff.so.5 libtiff.so "''${!outputBin}/${hostDir}/Plugins/imageformats/libqtiff.so"
-  '';
-
-  autoPatchelfIgnoreMissingDeps = [
-    "libcuda.so.1"
-    "libnvidia-ml.so.1"
-  ];
-
-  meta = {
-    description = "System-wide performance analysis and visualization tool";
-    longDescription = ''
-      NVIDIA Nsight Systems is a system-wide performance analysis tool designed to visualize an application's
-      algorithms, identify the largest opportunities to optimize, and tune to scale efficiently across any quantity or
-      size of CPUs and GPUs, from large servers to our smallest systems-on-a-chip (SoCs).
+      if [[ -d nsight-systems ]]; then
+        nixLog "Lifting components of Nsight System to the top level"
+        mv -v nsight-systems/*/* .
+        nixLog "Removing empty nsight-systems directory"
+        rmdir -pv nsight-systems/*
+      fi
     '';
-    homepage = "https://developer.nvidia.com/nsight-systems";
-    changelog = "https://docs.nvidia.com/nsight-systems/ReleaseNotes";
-  };
-}
+
+    postPatch = ''
+      for path in $rmPatterns; do
+        rm -r "$path"
+      done
+      patchShebangs nsight-systems
+    '';
+
+    nativeBuildInputs = [ wrapQtAppsHook ];
+
+    dontWrapQtApps = true;
+
+    # TODO(@connorbaker): Fix dependencies for earlier (CUDA <12.6) versions of nsight_systems.
+    buildInputs = [
+      qt6.qtdeclarative
+      qt6.qtsvg
+      qt6.qtimageformats
+      qt6.qtpositioning
+      qt6.qtscxml
+      qt6.qttools
+      qtwebengine
+      qt6.qtwayland
+      boost178
+      e2fsprogs
+      gst_all_1.gst-plugins-base
+      gst_all_1.gstreamer
+      nss
+      numactl
+      pulseaudio
+      qt6.qtbase
+      qtWaylandPlugins
+      rdma-core
+      ucx
+      wayland
+      xorg.libXcursor
+      xorg.libXdamage
+      xorg.libXrandr
+      xorg.libXtst
+    ]
+    # NOTE(@connorbaker): Seems to be required only for aarch64-linux.
+    ++ lib.optionals (backendStdenv.hostPlatform.isAarch64 && cudaAtLeast "11.8") [
+      gst_all_1.gst-plugins-bad
+    ];
+
+    postInstall = ''
+      moveToOutput '${hostDir}' "''${!outputBin}"
+      moveToOutput '${targetDir}' "''${!outputBin}"
+      moveToOutput 'bin' "''${!outputBin}"
+      wrapQtApp "''${!outputBin}/${hostDir}/nsys-ui.bin"
+    '';
+
+    # lib needs libtiff.so.5, but nixpkgs provides libtiff.so.6
+    preFixup = ''
+      patchelf --replace-needed libtiff.so.5 libtiff.so "''${!outputBin}/${hostDir}/Plugins/imageformats/libqtiff.so"
+    '';
+
+    autoPatchelfIgnoreMissingDeps = [
+      "libcuda.so.1"
+      "libnvidia-ml.so.1"
+    ];
+
+    brokenAssertions = [
+      {
+        # Boost 1.70 has been deprecated in Nixpkgs; releases older than the one for CUDA 11.8 are not supported.
+        message = "Boost 1.70 is required and available";
+        assertion = lib.versionAtLeast finalAttrs.version "2022.4.2.1";
+      }
+      {
+        message = "Qt 5 is required and available";
+        assertion = lib.versionOlder finalAttrs.version "2022.4.2.1" -> qt5 != null;
+      }
+      {
+        message = "Qt 6 is required and available";
+        assertion = lib.versionAtLeast finalAttrs.version "2022.4.2.1" -> qt6 != null;
+      }
+    ];
+
+    meta = {
+      description = "System-wide performance analysis and visualization tool";
+      longDescription = ''
+        NVIDIA Nsight Systems is a system-wide performance analysis tool designed to visualize an application's
+        algorithms, identify the largest opportunities to optimize, and tune to scale efficiently across any quantity or
+        size of CPUs and GPUs, from large servers to our smallest systems-on-a-chip (SoCs).
+      '';
+      homepage = "https://developer.nvidia.com/nsight-systems";
+      changelog = "https://docs.nvidia.com/nsight-systems/ReleaseNotes";
+    };
+  }
+)
diff --git a/pkgs/development/cuda-modules/packages/tensorrt.nix b/pkgs/development/cuda-modules/packages/tensorrt.nix
index 377d8d19ee2f..0a1192090e90 100644
--- a/pkgs/development/cuda-modules/packages/tensorrt.nix
+++ b/pkgs/development/cuda-modules/packages/tensorrt.nix
@@ -87,7 +87,7 @@ buildRedist (
         fi
       '';
 
-    autoPatchelfIgnoreMissingDeps = optionals libcudla.meta.available [
+    autoPatchelfIgnoreMissingDeps = optionals hasJetsonCudaCapability [
       "libnvdla_compiler.so"
     ];
 

From 0f8c7a22dc3dfb7adb0c9436ce72391e6f61d494 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 20:52:10 -0300
Subject: [PATCH 2177/6226] pololu-tic: 1.8.1 -> 1.8.3

---
 pkgs/by-name/po/pololu-tic/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/pololu-tic/package.nix b/pkgs/by-name/po/pololu-tic/package.nix
index 9ba193adc77c..1e4324362ff0 100644
--- a/pkgs/by-name/po/pololu-tic/package.nix
+++ b/pkgs/by-name/po/pololu-tic/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pololu-tic";
-  version = "1.8.1";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
     owner = "pololu";
     repo = "pololu-tic-software";
     tag = finalAttrs.version;
-    hash = "sha256-C/v5oaC5zZwm+j9CbFaDW+ebzHxPVb8kZLg9c0HyPbc=";
+    hash = "sha256-NqYaWWBEcq0nw4pHKpZWwbkTwnlVLB1VsC/M9zjxkHg=";
   };
 
   outputs = [

From c363a1748db092b9d6fa9a6c2550c365760663b2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 23:52:18 +0000
Subject: [PATCH 2178/6226] _1password-gui: 8.11.12 -> 8.11.14

---
 pkgs/by-name/_1/_1password-gui/sources.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json
index 35bbf591fd53..60fc6b2e723b 100644
--- a/pkgs/by-name/_1/_1password-gui/sources.json
+++ b/pkgs/by-name/_1/_1password-gui/sources.json
@@ -1,28 +1,28 @@
 {
   "stable": {
     "linux": {
-      "version": "8.11.12",
+      "version": "8.11.14",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.12.x64.tar.gz",
-          "hash": "sha256-znzmaEYOLVw6nUBk20oMdSngkO8iiSTHvM1y/t3Z55Y="
+          "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.14.x64.tar.gz",
+          "hash": "sha256-LdGw2AVDiQXwGAz9abEeoCosQUdr5q978OMo+kXATIc="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.12.arm64.tar.gz",
-          "hash": "sha256-ENuvB8GExhHWjJ97JV0qc2cIn9HqXb202dzIxu1fz2A="
+          "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.14.arm64.tar.gz",
+          "hash": "sha256-U+wJEH5NwWuPV+Oy6RJ+dki4lJB2A9aOVjvRSkm6zfY="
         }
       }
     },
     "darwin": {
-      "version": "8.11.12",
+      "version": "8.11.14",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.12-x86_64.zip",
-          "hash": "sha256-mr7DsYIEh21pHQX0cq9JlTZ4lHhkyYHCmwMaxEiK+5g="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.14-x86_64.zip",
+          "hash": "sha256-GXbwYxFNw6R8UdKxPL6k2lQF4uabFRgaEKNaFzecnZ0="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.12-aarch64.zip",
-          "hash": "sha256-34ylS5Xq9By6nuUkEmLoi0wR5hAQx1vBhrYFq4mjSDs="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.14-aarch64.zip",
+          "hash": "sha256-rViZC9b6kOaqkNNJibABmWu0Z5PEtBQE0jGtaUdd4LY="
         }
       }
     }

From 9534c1b6e94686fa64342764200e4ef3aa57446e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 23 Oct 2025 23:56:43 +0000
Subject: [PATCH 2179/6226] python3Packages.avwx-engine: 1.9.5 -> 1.9.6

---
 pkgs/development/python-modules/avwx-engine/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/avwx-engine/default.nix b/pkgs/development/python-modules/avwx-engine/default.nix
index 16de66d199ef..4250381a5ee9 100644
--- a/pkgs/development/python-modules/avwx-engine/default.nix
+++ b/pkgs/development/python-modules/avwx-engine/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "avwx-engine";
-  version = "1.9.5";
+  version = "1.9.6";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "avwx-rest";
     repo = "avwx-engine";
     tag = version;
-    hash = "sha256-zhXUzePbgwmBIP7yMT/FcPYdSZC3qJtwEwkHtlfmv3Q=";
+    hash = "sha256-RxQm1n+U2UTzg1QlPwmOaPUWUptAj30URHfs9Degf/c=";
   };
 
   build-system = [ hatchling ];

From c4eb0c1a50349a4f55bc669d9e85bc40da091a38 Mon Sep 17 00:00:00 2001
From: matthewcroughan <matt@croughan.sh>
Date: Fri, 24 Oct 2025 01:07:08 +0100
Subject: [PATCH 2180/6226] 64tass: rename to _64tass

---
 pkgs/by-name/{64/64tass => _6/_64tass}/package.nix | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename pkgs/by-name/{64/64tass => _6/_64tass}/package.nix (100%)

diff --git a/pkgs/by-name/64/64tass/package.nix b/pkgs/by-name/_6/_64tass/package.nix
similarity index 100%
rename from pkgs/by-name/64/64tass/package.nix
rename to pkgs/by-name/_6/_64tass/package.nix

From fc85cd76829493197f1b6d7de5445f5946742349 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 23 Oct 2025 17:17:32 -0700
Subject: [PATCH 2181/6226] perlPackages.ImageExifTool: 13.25 -> 13.39

Diff: https://github.com/exiftool/exiftool/compare/13.25...13.39

Changelog: https://github.com/exiftool/exiftool/blob/13.39/Changes
---
 .../perl-modules/ImageExifTool/default.nix         | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/perl-modules/ImageExifTool/default.nix b/pkgs/development/perl-modules/ImageExifTool/default.nix
index 073cb0423682..3fbc9517de02 100644
--- a/pkgs/development/perl-modules/ImageExifTool/default.nix
+++ b/pkgs/development/perl-modules/ImageExifTool/default.nix
@@ -1,7 +1,7 @@
 {
   buildPerlPackage,
   exiftool,
-  fetchurl,
+  fetchFromGitHub,
   gitUpdater,
   lib,
   shortenPerlShebang,
@@ -11,11 +11,13 @@
 
 buildPerlPackage rec {
   pname = "Image-ExifTool";
-  version = "13.25";
+  version = "13.39";
 
-  src = fetchurl {
-    url = "https://exiftool.org/Image-ExifTool-${version}.tar.gz";
-    hash = "sha256-HNVVFEhGooKYeDvr86tFIjUnPHg1hBCBPj1Ok8ZTsfo=";
+  src = fetchFromGitHub {
+    owner = "exiftool";
+    repo = "exiftool";
+    tag = version;
+    hash = "sha256-GPm3HOt7fNMbXRrV5V+ykJAfhww1O6NrD0l/7hA2i28=";
   };
 
   nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin shortenPerlShebang;
@@ -34,7 +36,7 @@ buildPerlPackage rec {
       command = "${lib.getExe exiftool} -ver";
       package = exiftool;
     };
-    updateScript = gitUpdater { url = "https://github.com/exiftool/exiftool.git"; };
+    updateScript = gitUpdater { };
   };
 
   meta = {

From b58cb912e388f596db97536b8acf17b1747a0110 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 23 Oct 2025 17:18:56 -0700
Subject: [PATCH 2182/6226] perlPackages.ImageExifTool: use versionCheckHook

---
 .../perl-modules/ImageExifTool/default.nix           | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/perl-modules/ImageExifTool/default.nix b/pkgs/development/perl-modules/ImageExifTool/default.nix
index 3fbc9517de02..b264606cd05a 100644
--- a/pkgs/development/perl-modules/ImageExifTool/default.nix
+++ b/pkgs/development/perl-modules/ImageExifTool/default.nix
@@ -1,12 +1,11 @@
 {
   buildPerlPackage,
-  exiftool,
   fetchFromGitHub,
   gitUpdater,
   lib,
   shortenPerlShebang,
   stdenv,
-  testers,
+  versionCheckHook,
 }:
 
 buildPerlPackage rec {
@@ -30,12 +29,11 @@ buildPerlPackage rec {
     shortenPerlShebang $out/bin/exiftool
   '';
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "-ver";
+
   passthru = {
-    tests.version = testers.testVersion {
-      inherit version;
-      command = "${lib.getExe exiftool} -ver";
-      package = exiftool;
-    };
     updateScript = gitUpdater { };
   };
 

From 552cc19b4e6f66b02aad0c8a243aee50a1970cbf Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 21:22:18 -0300
Subject: [PATCH 2183/6226] rcon: fix build with cmake4

---
 pkgs/by-name/rc/rcon/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/rc/rcon/package.nix b/pkgs/by-name/rc/rcon/package.nix
index 48fd4373a3f8..813c63b646e0 100644
--- a/pkgs/by-name/rc/rcon/package.nix
+++ b/pkgs/by-name/rc/rcon/package.nix
@@ -33,6 +33,13 @@ stdenv.mkDerivation rec {
     pcre
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace tests/CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/n0la/rcon";
     description = "Source RCON client for command line";

From 2b15d269b8132c56868590b54b76ed72bde42253 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 00:30:39 +0000
Subject: [PATCH 2184/6226] caesura: 0.25.2 -> 0.26.0

---
 pkgs/by-name/ca/caesura/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/caesura/package.nix b/pkgs/by-name/ca/caesura/package.nix
index 812674c5767b..bb1ed2b88df5 100644
--- a/pkgs/by-name/ca/caesura/package.nix
+++ b/pkgs/by-name/ca/caesura/package.nix
@@ -30,16 +30,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "caesura";
-  version = "0.25.2";
+  version = "0.26.0";
 
   src = fetchFromGitHub {
     owner = "RogueOneEcho";
     repo = "caesura";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rpaOFmD/0/c5F6TIS7vGn7G3+rLOoBZKMW/HuzroUxM=";
+    hash = "sha256-atB7IrG9KchFOc1EXChlsqlrZs7mQ9tiXmdw1SptLI0=";
   };
 
-  cargoHash = "sha256-agdhYEhhw3gMdZmYiQZVeLARkMsYQ/AWLTrpiaH0mtA=";
+  cargoHash = "sha256-Iz/RYmuCc5XuyktYIN/zDrbyPpRU2eps0yqExPu+5J8=";
 
   nativeBuildInputs = [
     makeBinaryWrapper

From de292cafd13bd2c09ffa1c5f33e623c696e4593d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 00:31:05 +0000
Subject: [PATCH 2185/6226] livebook: 0.17.2 -> 0.17.3

---
 pkgs/development/beam-modules/livebook/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/beam-modules/livebook/default.nix b/pkgs/development/beam-modules/livebook/default.nix
index 03c2d5111f87..47d5e548c3a9 100644
--- a/pkgs/development/beam-modules/livebook/default.nix
+++ b/pkgs/development/beam-modules/livebook/default.nix
@@ -9,7 +9,7 @@
 
 beamPackages.mixRelease rec {
   pname = "livebook";
-  version = "0.17.2";
+  version = "0.17.3";
 
   inherit (beamPackages) elixir;
 
@@ -21,7 +21,7 @@ beamPackages.mixRelease rec {
     owner = "livebook-dev";
     repo = "livebook";
     tag = "v${version}";
-    hash = "sha256-9AlvEqyQJvcRbAuuxF5Q5S9hG96vaQYVBYwPYp4lGQM=";
+    hash = "sha256-WElJgW2TxjeUgv6GZwq+hcgl6n4xr8mmCBPqoOGc1+w=";
   };
 
   mixFodDeps = beamPackages.fetchMixDeps {

From cdbeb5479707504f6f4d800643ccd6c8e5059e25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 00:36:20 +0000
Subject: [PATCH 2186/6226] haproxy: 3.2.6 -> 3.2.7

---
 pkgs/by-name/ha/haproxy/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix
index c352baf14319..27e19e2c0e90 100644
--- a/pkgs/by-name/ha/haproxy/package.nix
+++ b/pkgs/by-name/ha/haproxy/package.nix
@@ -43,11 +43,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "haproxy";
-  version = "3.2.6";
+  version = "3.2.7";
 
   src = fetchurl {
     url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz";
-    hash = "sha256-rWMLawtz4dEYrM5Fj+wb8efQ5ClTDyZo7FgvT4u3jmU=";
+    hash = "sha256-Hwrp37CzGeLVy25M35MaCHetiOAJDEbPFvrwCPv1Qng=";
   };
 
   buildInputs = [

From a53f158c5ac4be74530145c238df9241f520d0e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 00:45:50 +0000
Subject: [PATCH 2187/6226] crystal-dock: 2.14 -> 2.15

---
 pkgs/by-name/cr/crystal-dock/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cr/crystal-dock/package.nix b/pkgs/by-name/cr/crystal-dock/package.nix
index c755886c5425..a43bc1fcf2bc 100644
--- a/pkgs/by-name/cr/crystal-dock/package.nix
+++ b/pkgs/by-name/cr/crystal-dock/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "crystal-dock";
-  version = "2.14";
+  version = "2.15";
 
   src = fetchFromGitHub {
     owner = "dangvd";
     repo = "crystal-dock";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-szW3zIgwy0a9NmEax6xemeCdjs3//r7BRfUDeLv+VxE=";
+    hash = "sha256-XFq4T39El5MjaWRSnaimonjdj+HGOAydNmEOehgGWX4=";
   };
 
   nativeBuildInputs = [

From 3ce310e86ed8e86850d9a9b2e9a4629e44a3a4db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 00:53:08 +0000
Subject: [PATCH 2188/6226] libphonenumber: 9.0.16 -> 9.0.17

---
 pkgs/by-name/li/libphonenumber/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libphonenumber/package.nix b/pkgs/by-name/li/libphonenumber/package.nix
index 59f49425cb65..1d891e5fd5ae 100644
--- a/pkgs/by-name/li/libphonenumber/package.nix
+++ b/pkgs/by-name/li/libphonenumber/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libphonenumber";
-  version = "9.0.16";
+  version = "9.0.17";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "libphonenumber";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+WXxeRsL++60VstR7GN7alrLG0rOQJbtrC7qaZaOPlY=";
+    hash = "sha256-xw159QIBNloMks/888shAEPdfd4WKmIGDRpmJ4h2JsE=";
   };
 
   patches = [

From 8deab44fce596034ab7ccb6a95a38afd8d29b5f7 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 21:55:08 -0300
Subject: [PATCH 2189/6226] ringracers: fix build with cmake4

---
 pkgs/by-name/ri/ringracers/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ri/ringracers/package.nix b/pkgs/by-name/ri/ringracers/package.nix
index 8cb144d870cc..27d7eebb7e7d 100644
--- a/pkgs/by-name/ri/ringracers/package.nix
+++ b/pkgs/by-name/ri/ringracers/package.nix
@@ -85,6 +85,11 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  postPatch = ''
+    substituteInPlace src/acs/vm/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Kart racing video game based on Sonic Robo Blast 2 (SRB2), itself based on a modified version of Doom Legacy";
     homepage = "https://kartkrew.org";

From ea7e6cf35fdae37dd79ab43567385e38f8b0ac9f Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 22:16:01 -0300
Subject: [PATCH 2190/6226] argagg: fix build with cmake4

---
 pkgs/by-name/ar/argagg/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ar/argagg/package.nix b/pkgs/by-name/ar/argagg/package.nix
index b38cbd6b3e45..96b449861fc1 100644
--- a/pkgs/by-name/ar/argagg/package.nix
+++ b/pkgs/by-name/ar/argagg/package.nix
@@ -20,6 +20,11 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required( VERSION 2.8 )" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     homepage = "https://github.com/vietjtnguyen/argagg";
     description = "Argument Aggregator";

From 8084c2116fa352f1ed1d14a8866e41dfc8171cdb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 01:26:55 +0000
Subject: [PATCH 2191/6226] lcm: 1.5.1 -> 1.5.2

---
 pkgs/by-name/lc/lcm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lc/lcm/package.nix b/pkgs/by-name/lc/lcm/package.nix
index dd2c4df711f6..a0904490e776 100644
--- a/pkgs/by-name/lc/lcm/package.nix
+++ b/pkgs/by-name/lc/lcm/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lcm";
-  version = "1.5.1";
+  version = "1.5.2";
 
   src = fetchFromGitHub {
     owner = "lcm-proj";
     repo = "lcm";
     rev = "v${version}";
-    hash = "sha256-043AJzalfx+qcCoxQgPU4T/DcUH0pXOE4v1aJaW3aXs=";
+    hash = "sha256-72fytJY+uXEHGdZ7N+0g+JK7ALb2e2ZtJuvhiGIMHiA=";
   };
 
   outputs = [

From f13b5008a228014c1c6536c16c3b32c91334da6e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 01:31:45 +0000
Subject: [PATCH 2192/6226] libmsquic: 2.5.4 -> 2.5.5

---
 pkgs/by-name/li/libmsquic/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libmsquic/package.nix b/pkgs/by-name/li/libmsquic/package.nix
index 0b57f55611a6..01d422b17e32 100644
--- a/pkgs/by-name/li/libmsquic/package.nix
+++ b/pkgs/by-name/li/libmsquic/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmsquic";
-  version = "2.5.4";
+  version = "2.5.5";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "msquic";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-si9g67j/A6sbsCWWxs2YhZpXhx34GpxWNOFnWtaqnEQ=";
+    hash = "sha256-V1QAY1E6prAtEDkUVOuBExHaDw91+fW3OKYZr2bQavQ=";
     fetchSubmodules = true;
   };
 

From b315300bfb739285ea24a94cf4d28e09cb19b2a5 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 23 Oct 2025 22:40:15 -0300
Subject: [PATCH 2193/6226] appimageupdate: 2.0.0-alpha-1-20230526 ->
 2.0.0-alpha-1-20251018

---
 pkgs/by-name/ap/appimageupdate/package.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ap/appimageupdate/package.nix b/pkgs/by-name/ap/appimageupdate/package.nix
index b0ff7b158f7e..1ffd5111dd79 100644
--- a/pkgs/by-name/ap/appimageupdate/package.nix
+++ b/pkgs/by-name/ap/appimageupdate/package.nix
@@ -19,26 +19,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "appimageupdate";
-  version = "2.0.0-alpha-1-20230526";
+  version = "2.0.0-alpha-1-20251018";
 
   src = fetchFromGitHub {
     owner = "AppImageCommunity";
     repo = "AppImageUpdate";
     rev = finalAttrs.version;
-    hash = "sha256-b2RqSw0Ksn9OLxQV9+3reBiqrty+Kx9OwV93jlvuPnY=";
+    hash = "sha256-S3MRBTtPc4S6lqvAZpbZFgOVgsX6GpHZ8PkwEtipT1M=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "include-algorithm-header.patch";
-      url = "https://github.com/AppImageCommunity/AppImageUpdate/commit/5e91de84aba775ba8d3a4771e4f7f06056f9b764.patch";
-      hash = "sha256-RX2HFAlGsEjXona7cL3WdwwiiA0u9CnfvHMC6S0DeLY=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace CMakeLists.txt \
-      --replace-fail 'VERSION 1-alpha' 'VERSION ${finalAttrs.version}' \
       --replace-fail 'env LC_ALL=C date -u "+%Y-%m-%d %H:%M:%S %Z"' 'bash -c "echo 1970-01-01 00:00:01 UTC"' \
       --replace-fail 'git rev-parse --short HEAD' 'bash -c "echo unknown"' \
       --replace-fail '<local dev build>' '<nixpkgs build>'

From 554252cf6a0050f61038ae18c14bfb96c974e012 Mon Sep 17 00:00:00 2001
From: Kylie McClain <kylie@somas.is>
Date: Thu, 23 Oct 2025 21:38:53 -0400
Subject: [PATCH 2194/6226] kde-rounded-corners: add upstream patch for Qt
 >=6.10

---
 .../kwin-decorations/kde-rounded-corners/default.nix      | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
index d808ae3690a8..f90fa9a68697 100644
--- a/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
+++ b/pkgs/data/themes/kwin-decorations/kde-rounded-corners/default.nix
@@ -1,6 +1,7 @@
 {
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   cmake,
   extra-cmake-modules,
   wrapQtAppsHook,
@@ -23,6 +24,13 @@ stdenv.mkDerivation rec {
     hash = "sha256-ef63PVG0JOHY4zyq5M5oAAcxtfhm1XOvpsxgSeXvgDo=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      url = "https://github.com/matinlotfali/KDE-Rounded-Corners/commit/5d63212e65ed06ca65a2a7f0ad2436045b839ddd.patch";
+      hash = "sha256-wfjxMKRmJu3gflldNvWLghw5oFyyxY2ml1lsl/TVzxI=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     extra-cmake-modules

From deceeb08449cb693b8289c9e7a85b9068235ee02 Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Thu, 23 Oct 2025 18:56:35 -0700
Subject: [PATCH 2195/6226] =?UTF-8?q?unicode-paracode:=20Fix=20crash=20on?=
 =?UTF-8?q?=20Python=20=E2=89=A5=203.13?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/by-name/un/unicode-paracode/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/un/unicode-paracode/package.nix b/pkgs/by-name/un/unicode-paracode/package.nix
index 2b3ac152a4ce..8a3d7028f74b 100644
--- a/pkgs/by-name/un/unicode-paracode/package.nix
+++ b/pkgs/by-name/un/unicode-paracode/package.nix
@@ -19,6 +19,14 @@ python3Packages.buildPythonApplication rec {
     sha256 = "sha256-FHAlZ5HID/FE9+YR7Dmc3Uh7E16QKORoD8g9jgTeQdY=";
   };
 
+  patches = [
+    # Fix 3.13+ mutable locals()
+    (fetchurl {
+      url = "https://github.com/garabik/unicode/commit/412952b9b4730263f5b560924b84f8934ea4ba21.patch";
+      hash = "sha256-Rfm6Jc7V5n7ggQzA/yeDrYedGMWqRkeUX6FRCUkBWcI=";
+    })
+  ];
+
   ucdtxt = fetchurl {
     url = "https://www.unicode.org/Public/16.0.0/ucd/UnicodeData.txt";
     sha256 = "sha256-/1jlgjvQlRZlZKAG5H0RETCBPc+L8jTvefpRqHDttI8=";

From 90e9deaf5b869b59ab30a677d39d25cb26531a4e Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 23 Oct 2025 22:04:01 -0400
Subject: [PATCH 2196/6226] prettier: remove unneeded package.json when
 updating

---
 pkgs/by-name/pr/prettier/package.json | 224 --------------------------
 pkgs/by-name/pr/prettier/update.sh    |   1 +
 2 files changed, 1 insertion(+), 224 deletions(-)
 delete mode 100644 pkgs/by-name/pr/prettier/package.json

diff --git a/pkgs/by-name/pr/prettier/package.json b/pkgs/by-name/pr/prettier/package.json
deleted file mode 100644
index 2d29e8208a94..000000000000
--- a/pkgs/by-name/pr/prettier/package.json
+++ /dev/null
@@ -1,224 +0,0 @@
-{
-  "name": "prettier",
-  "version": "3.6.2",
-  "description": "Prettier is an opinionated code formatter",
-  "bin": "./bin/prettier.cjs",
-  "repository": "prettier/prettier",
-  "funding": "https://github.com/prettier/prettier?sponsor=1",
-  "homepage": "https://prettier.io",
-  "author": "James Long",
-  "type": "module",
-  "license": "MIT",
-  "main": "./src/index.cjs",
-  "browser": "./standalone.js",
-  "unpkg": "./standalone.js",
-  "exports": {
-    ".": {
-      "types": "./src/index.d.ts",
-      "require": "./src/index.cjs",
-      "default": "./src/index.js"
-    },
-    "./standalone": "./src/standalone.js",
-    "./plugins/*": "./src/plugins/*.js",
-    "./*": "./*"
-  },
-  "engines": {
-    "node": ">=18"
-  },
-  "files": [
-    "index.js",
-    "standalone.js",
-    "src",
-    "bin"
-  ],
-  "dependencies": {
-    "@angular/compiler": "20.0.5",
-    "@babel/code-frame": "7.27.1",
-    "@babel/parser": "7.27.7",
-    "@babel/types": "7.27.7",
-    "@glimmer/syntax": "0.94.9",
-    "@prettier/cli": "0.9.0",
-    "@prettier/html-tags": "1.0.0",
-    "@prettier/parse-srcset": "3.1.0",
-    "@typescript-eslint/typescript-estree": "8.34.1",
-    "@typescript-eslint/visitor-keys": "8.34.1",
-    "acorn": "8.15.0",
-    "acorn-jsx": "5.3.2",
-    "angular-estree-parser": "12.1.0",
-    "angular-html-parser": "8.1.0",
-    "camelcase": "8.0.0",
-    "ci-info": "4.2.0",
-    "cjk-regex": "3.3.0",
-    "collapse-white-space": "1.0.6",
-    "css-units-list": "2.1.0",
-    "dashify": "2.0.0",
-    "deno-path-from-file-url": "0.0.3",
-    "diff": "8.0.2",
-    "editorconfig": "0.15.3",
-    "emoji-regex": "10.4.0",
-    "escape-string-regexp": "5.0.0",
-    "espree": "10.4.0",
-    "fast-glob": "3.3.3",
-    "fast-json-stable-stringify": "2.1.0",
-    "file-entry-cache": "10.1.1",
-    "find-cache-directory": "6.0.0",
-    "flow-parser": "0.274.1",
-    "get-east-asian-width": "1.3.0",
-    "get-stdin": "9.0.0",
-    "graphql": "16.11.0",
-    "hermes-parser": "0.29.0",
-    "html-element-attributes": "3.4.0",
-    "html-ua-styles": "0.0.8",
-    "ignore": "7.0.5",
-    "import-meta-resolve": "4.1.0",
-    "index-to-position": "1.1.0",
-    "is-es5-identifier-name": "1.0.0",
-    "jest-docblock": "30.0.1",
-    "json5": "2.2.3",
-    "leven": "4.0.0",
-    "linguist-languages": "8.0.0",
-    "meriyah": "6.1.3",
-    "micromatch": "4.0.8",
-    "minimist": "1.2.8",
-    "n-readlines": "1.0.1",
-    "outdent": "0.8.0",
-    "oxc-parser": "0.75.0",
-    "parse-json": "8.3.0",
-    "picocolors": "1.1.1",
-    "please-upgrade-node": "3.2.0",
-    "postcss": "8.5.6",
-    "postcss-less": "6.0.0",
-    "postcss-media-query-parser": "0.2.3",
-    "postcss-scss": "4.0.9",
-    "postcss-selector-parser": "2.2.3",
-    "postcss-values-parser": "2.0.1",
-    "regexp-util": "2.0.3",
-    "remark-footnotes": "2.0.0",
-    "remark-math": "3.0.1",
-    "remark-parse": "8.0.3",
-    "sdbm": "2.0.0",
-    "search-closest": "1.1.0",
-    "smol-toml": "1.3.4",
-    "strip-ansi": "7.1.0",
-    "to-fast-properties": "4.0.0",
-    "trim-newlines": "5.0.0",
-    "typescript": "5.8.3",
-    "unicode-regex": "4.1.2",
-    "unified": "9.2.2",
-    "url-or-path": "2.6.1",
-    "vnopts": "2.0.2",
-    "wcwidth.js": "2.0.0",
-    "yaml": "1.10.2",
-    "yaml-unist-parser": "2.0.5"
-  },
-  "devDependencies": {
-    "@babel/generator": "7.27.5",
-    "@eslint-react/eslint-plugin": "1.52.2",
-    "@eslint/js": "9.29.0",
-    "@stylistic/eslint-plugin": "5.0.0",
-    "@types/estree": "1.0.8",
-    "@typescript-eslint/eslint-plugin": "8.34.1",
-    "@typescript-eslint/parser": "8.34.1",
-    "browserslist": "4.25.1",
-    "browserslist-to-esbuild": "2.1.1",
-    "buffer": "6.0.3",
-    "c8": "10.1.3",
-    "cross-env": "7.0.3",
-    "cspell": "9.1.1",
-    "enquirer": "2.4.1",
-    "esbuild": "0.25.5",
-    "esbuild-plugins-node-modules-polyfill": "1.7.1",
-    "esbuild-visualizer": "0.7.0",
-    "eslint": "9.29.0",
-    "eslint-config-prettier": "10.1.5",
-    "eslint-formatter-friendly": "7.0.0",
-    "eslint-plugin-compat": "6.0.2",
-    "eslint-plugin-jest": "29.0.1",
-    "eslint-plugin-n": "17.20.0",
-    "eslint-plugin-regexp": "2.9.0",
-    "eslint-plugin-simple-import-sort": "12.1.1",
-    "eslint-plugin-unicorn": "59.0.1",
-    "esm-utils": "4.4.2",
-    "globals": "16.2.0",
-    "jest": "30.0.3",
-    "jest-light-runner": "0.7.9",
-    "jest-snapshot-serializer-ansi": "2.2.1",
-    "jest-snapshot-serializer-raw": "2.0.0",
-    "jest-watch-typeahead": "3.0.1",
-    "knip": "5.61.2",
-    "magic-string": "0.30.17",
-    "nano-spawn": "1.0.2",
-    "node-style-text": "0.0.8",
-    "npm-run-all2": "8.0.4",
-    "prettier": "3.6.1",
-    "pretty-bytes": "7.0.0",
-    "pretty-ms": "9.2.0",
-    "rollup-plugin-license": "3.6.0",
-    "semver": "7.7.2",
-    "serialize-javascript": "6.0.2",
-    "snapshot-diff": "0.10.0",
-    "tempy": "3.1.0",
-    "tinybench": "4.0.1",
-    "ts-expect": "1.3.0"
-  },
-  "resolutions": {
-    "trim": "1.0.1"
-  },
-  "scripts": {
-    "prepublishOnly": "echo \"Error: must publish from dist/\" && exit 1",
-    "test": "jest",
-    "test:dev-package": "cross-env INSTALL_PACKAGE=1 yarn test",
-    "test:production": "cross-env NODE_ENV=production yarn test",
-    "test:production-standalone": "cross-env TEST_STANDALONE=1 yarn test:production",
-    "test:production-lint": "eslint dist/prettier --config=./scripts/bundle-eslint-config.js --quiet --format friendly",
-    "perf": "yarn && yarn build && cross-env NODE_ENV=production node ./dist/prettier/bin/prettier.cjs",
-    "perf:inspect": "yarn && yarn build && cross-env NODE_ENV=production node --inspect-brk ./dist/prettier/bin/prettier.cjs",
-    "perf:benchmark": "yarn perf --debug-benchmark",
-    "perf:compare": "./scripts/benchmark/compare.sh",
-    "lint": "run-p --continue-on-error \"lint:*\"",
-    "lint:typecheck": "tsc",
-    "lint:eslint": "cross-env EFF_NO_LINK_RULES=true eslint . --format friendly",
-    "lint:changelog": "node ./scripts/lint-changelog.js",
-    "lint:prettier": "prettier . --check --cache",
-    "lint:spellcheck": "cspell --no-progress --relative --dot --gitignore",
-    "lint:deps": "node ./scripts/check-deps.js",
-    "lint:knip": "knip",
-    "lint:format-test": "node ./scripts/format-test-lint.js",
-    "fix": "run-s --continue-on-error fix:eslint fix:prettier",
-    "fix:eslint": "yarn lint:eslint --fix",
-    "fix:prettier": "yarn lint:prettier --write",
-    "build": "node ./scripts/build/build.js",
-    "build:website": "node ./scripts/build-website.js",
-    "gen:changelog": "node ./scripts/generate-changelog.js",
-    "debug": "node bin/prettier.js --ignore-path=.prettierignore --plugin=./packages/plugin-oxc/index.js --plugin=./packages/plugin-hermes/index.js",
-    "debug:watch": "node --watch bin/prettier.js --ignore-path=.prettierignore --plugin=./packages/plugin-oxc/index.js --plugin=./packages/plugin-hermes/index.js",
-    "debug:inspect": "node --inspect-brk bin/prettier.js --ignore-path=.prettierignore --plugin=./packages/plugin-oxc/index.js --plugin=./packages/plugin-hermes/index.js"
-  },
-  "c8": {
-    "reporter": [
-      "lcov",
-      "text"
-    ],
-    "all": true,
-    "include": [
-      "src/**",
-      "bin/**"
-    ],
-    "exclude": [
-      "bin/prettier.js",
-      "src/standalone.js",
-      "src/index.cjs",
-      "src/document/debug.js",
-      "src/utils/unexpected-node-error.js",
-      "src/language-js/types/estree.d.ts",
-      "src/**/**/*.d.ts"
-    ]
-  },
-  "browserslist": [
-    ">0.5%",
-    "not dead",
-    "not op_mini all"
-  ],
-  "preferUnplugged": true,
-  "packageManager": "yarn@4.9.2"
-}
diff --git a/pkgs/by-name/pr/prettier/update.sh b/pkgs/by-name/pr/prettier/update.sh
index 0a6ddfa94da1..623a5a8f0d63 100755
--- a/pkgs/by-name/pr/prettier/update.sh
+++ b/pkgs/by-name/pr/prettier/update.sh
@@ -45,3 +45,4 @@ update-source-version "${package}" "${latest_version}"
 echo "Update yarn offline cache hash…"
 nix-build --attr "${package}.src"
 yarn-berry-fetcher missing-hashes result/yarn.lock >"${package_dir}/missing-hashes.json"
+rm -f "${package_dir}/package.json"

From c9869223b8a579911cdb42a85c03a98d00b184e6 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 23 Oct 2025 22:04:33 -0400
Subject: [PATCH 2197/6226] prettier: clean up files in root of outPath

---
 pkgs/by-name/pr/prettier/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/prettier/package.nix b/pkgs/by-name/pr/prettier/package.nix
index 6ab2d90cfd06..8dfbef2faab4 100644
--- a/pkgs/by-name/pr/prettier/package.nix
+++ b/pkgs/by-name/pr/prettier/package.nix
@@ -153,10 +153,11 @@ stdenv.mkDerivation (finalAttrs: {
     yarn install --immutable
     yarn build --clean
 
-    cp --recursive dist/prettier "$out"
+    mkdir -p $out/lib/node_modules
+    cp --recursive dist/prettier "$out/lib/node_modules/prettier"
 
     makeBinaryWrapper "${lib.getExe nodejs}" "$out/bin/prettier" \
-      --add-flags "$out/bin/prettier.cjs"
+      --add-flags "$out/lib/node_modules/prettier/bin/prettier.cjs"
   ''
   + lib.optionalString (builtins.length plugins > 0) ''
     wrapProgram $out/bin/prettier --add-flags "${

From 2597cbe7afeb1ea89c64028009512dbb66e02b51 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 23 Oct 2025 22:04:44 -0400
Subject: [PATCH 2198/6226] prettier: make plugin bundling actually work

---
 pkgs/by-name/pr/prettier/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pr/prettier/package.nix b/pkgs/by-name/pr/prettier/package.nix
index 8dfbef2faab4..c9886eb4fff8 100644
--- a/pkgs/by-name/pr/prettier/package.nix
+++ b/pkgs/by-name/pr/prettier/package.nix
@@ -98,12 +98,12 @@ let
     # Arguments
 
     plugin
-    : Attribute set with `.packageName` and `.outPath` defined
+    : Attribute set with `.pname` and `.outPath` defined
   */
   nodeEntryPointOf =
     plugin:
     let
-      pluginDir = "${plugin.outPath}/lib/node_modules/${plugin.packageName}";
+      pluginDir = "${plugin.outPath}/lib/node_modules/${plugin.pname}";
 
       packageJsonAttrs = builtins.fromJSON (builtins.readFile "${pluginDir}/package.json");
 
@@ -118,10 +118,10 @@ let
       pathAbsoluteFallback
     else
       lib.warn ''
-        ${plugin.packageName}: error context, tried finding entry point under;
+        ${plugin.pname}: error context, tried finding entry point under;
         pathAbsoluteNaive -> ${pathAbsoluteNaive}
         pathAbsoluteFallback -> ${pathAbsoluteFallback}
-      '' throw ''${plugin.packageName}: does not provide parse-able entry point'';
+      '' throw ''${plugin.pname}: does not provide parse-able entry point'';
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "prettier";

From ed895a3bfc19c7a4d8b20d43e2b2afc70d685514 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 02:05:47 +0000
Subject: [PATCH 2199/6226] prometheus-nut-exporter: 3.2.1 -> 3.2.2

---
 pkgs/servers/monitoring/prometheus/nut-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/nut-exporter.nix b/pkgs/servers/monitoring/prometheus/nut-exporter.nix
index 051c26dce25c..357e056dafc1 100644
--- a/pkgs/servers/monitoring/prometheus/nut-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/nut-exporter.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "nut-exporter";
-  version = "3.2.1";
+  version = "3.2.2";
 
   src = fetchFromGitHub {
     owner = "DRuggeri";
     repo = "nut_exporter";
     rev = "v${version}";
-    sha256 = "sha256-TqBwvOuhcnQbJBfzJ8nc3EYVo8fyCPwne+vEYZeX9/I=";
+    sha256 = "sha256-p1IUJOSY7dXAzSPBpKvDKvy4etM3q3oI5OXg6l+3KLw=";
   };
 
   vendorHash = "sha256-cMZ4GSal03LIZi7ESr/sQx8zLHNepOTZGEEsdvsNhec=";

From fdd903c161dd0181a5ab857f15dadb2262d2fb52 Mon Sep 17 00:00:00 2001
From: hellodword <46193371+hellodword@users.noreply.github.com>
Date: Fri, 24 Oct 2025 01:57:42 +0000
Subject: [PATCH 2200/6226] openssl: fix mingwW64 build

---
 .../openssl/3.5/fix-mingw-linking.patch       | 33 +++++++++++++++++++
 .../development/libraries/openssl/default.nix |  3 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/libraries/openssl/3.5/fix-mingw-linking.patch

diff --git a/pkgs/development/libraries/openssl/3.5/fix-mingw-linking.patch b/pkgs/development/libraries/openssl/3.5/fix-mingw-linking.patch
new file mode 100644
index 000000000000..ac1750664a5b
--- /dev/null
+++ b/pkgs/development/libraries/openssl/3.5/fix-mingw-linking.patch
@@ -0,0 +1,33 @@
+From af3a3f8205968f9e652efa7adf2a359f4eb9d9cc Mon Sep 17 00:00:00 2001
+From: Alexandr Nedvedicky <sashan@openssl.org>
+Date: Mon, 6 Oct 2025 09:33:09 +0200
+Subject: [PATCH] OPENSSL_SYS_WINDOWS is also enabled for mingw build
+
+the test_n() in bioprinttest.c must differentiate between
+MSVC runtime libc and ming runtime libc. The function
+_set_printf_count_output() must be called when openssl
+is linked with MSVC libc only.
+
+Fixes #28679
+
+Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
+Reviewed-by: Tom Cosgrove <tom.cosgrove@arm.com>
+Reviewed-by: Neil Horman <nhorman@openssl.org>
+(Merged from https://github.com/openssl/openssl/pull/28759)
+---
+ test/bioprinttest.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/test/bioprinttest.c b/test/bioprinttest.c
+index bd99b9820ecc0..28730631bc201 100644
+--- a/test/bioprinttest.c
++++ b/test/bioprinttest.c
+@@ -541,7 +541,7 @@ static int test_n(int i)
+         ptrdiff_t t;
+     } n = { 0 };
+ 
+-#if defined(OPENSSL_SYS_WINDOWS)
++#if defined(_set_printf_count_output)
+     /*
+      * MS CRT is special and throws an exception when %n is used even
+      * in non-*_s versions of printf routines, and there is a special function
diff --git a/pkgs/development/libraries/openssl/default.nix b/pkgs/development/libraries/openssl/default.nix
index 0d4e99a4394b..b4816e8cdecc 100644
--- a/pkgs/development/libraries/openssl/default.nix
+++ b/pkgs/development/libraries/openssl/default.nix
@@ -422,6 +422,9 @@ in
         else
           ./3.5/use-etc-ssl-certs.patch
       )
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isMinGW [
+      ./3.5/fix-mingw-linking.patch
     ];
 
     withDocs = true;

From 42454e57de5487e63b162edc61505810b3971194 Mon Sep 17 00:00:00 2001
From: Ben Wolsieffer <benwolsieffer@gmail.com>
Date: Thu, 23 Oct 2025 21:14:28 -0400
Subject: [PATCH 2201/6226] libtheora: apply ARMv7 conditionals to all 32-bit
 ARM

armv6l (and presumably armv5tel) have the same problems as armv7l, so
change the conditional from isArmv7 to isAarch32.

Fixes building ffmpeg on armv6l.
---
 pkgs/by-name/li/libtheora/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libtheora/package.nix b/pkgs/by-name/li/libtheora/package.nix
index f372aada393a..e23fb1c0cdc5 100644
--- a/pkgs/by-name/li/libtheora/package.nix
+++ b/pkgs/by-name/li/libtheora/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   patches = lib.optionals stdenv.hostPlatform.isMinGW [ ./mingw-remove-export.patch ];
 
-  postPatch = lib.optionalString stdenv.hostPlatform.isArmv7 ''
+  postPatch = lib.optionalString stdenv.hostPlatform.isAarch32 ''
     patchShebangs lib/arm/arm2gnu.pl
   '';
 
@@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     validatePkgConfig
   ]
-  ++ lib.optionals stdenv.hostPlatform.isArmv7 [
+  ++ lib.optionals stdenv.hostPlatform.isAarch32 [
     # Needed to run lib/arm/arm2gnu.pl for ARM assembly optimizations
     perl
   ];

From 16ab20b72e96ccc970b8695b9017f849c223511c Mon Sep 17 00:00:00 2001
From: Anders Kaseorg <andersk@mit.edu>
Date: Thu, 23 Oct 2025 19:20:54 -0700
Subject: [PATCH 2202/6226] =?UTF-8?q?mozillavpn:=202.31.1=20=E2=86=92=202.?=
 =?UTF-8?q?32.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Anders Kaseorg <andersk@mit.edu>
---
 pkgs/by-name/mo/mozillavpn/package.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix
index a854164749f2..924bd54e79bc 100644
--- a/pkgs/by-name/mo/mozillavpn/package.nix
+++ b/pkgs/by-name/mo/mozillavpn/package.nix
@@ -4,6 +4,7 @@
   cargo,
   cmake,
   fetchFromGitHub,
+  fetchpatch,
   go,
   lib,
   libcap,
@@ -22,15 +23,21 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mozillavpn";
-  version = "2.31.1";
+  version = "2.32.0";
   src = fetchFromGitHub {
     owner = "mozilla-mobile";
     repo = "mozilla-vpn-client";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-+Aexwj/iNIhriiUrMhtj2c9S3e5jGN7OvREXUzi/03s=";
+    hash = "sha256-STp/BCh3gELF0UgkMF2uUV9U5JgTNsqoh+Cog8fQy2c=";
   };
-  patches = [ ];
+  patches = [
+    # VPN-7309: Qt 6.10 QML loading fixes (#10832)
+    (fetchpatch {
+      url = "https://github.com/mozilla-mobile/mozilla-vpn-client/commit/5e7a26efd5acc3cdeeda8d1954459bff1a7e373e.patch";
+      hash = "sha256-CdvEuASPNYzQwyCMKXWZObOHH55WRFsxGYlEP8b20Mc=";
+    })
+  ];
 
   netfilter = buildGoModule {
     pname = "${finalAttrs.pname}-netfilter";

From f93e34eff95dd5d527734db42a8986ee942e0249 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 02:24:59 +0000
Subject: [PATCH 2203/6226] tfswitch: 1.7.0 -> 1.8.0

---
 pkgs/by-name/tf/tfswitch/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix
index f6162a40b3db..dcb3dbd95972 100644
--- a/pkgs/by-name/tf/tfswitch/package.nix
+++ b/pkgs/by-name/tf/tfswitch/package.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "tfswitch";
-  version = "1.7.0";
+  version = "1.8.0";
 
   src = fetchFromGitHub {
     owner = "warrensbox";
     repo = "terraform-switcher";
     rev = "v${version}";
-    sha256 = "sha256-Lxczo2zlBqDyHAcGPR1UM1s8tR4+F80YeNI0JJXLN30=";
+    sha256 = "sha256-9N6C2y+lGyWSJgDiPsMKo03ji6lhq+0OI1idi1VcrAA=";
   };
 
-  vendorHash = "sha256-JnfRdircsabRP1O8dSs8/OGwTSvv4xmIXeFQsnbpb5o=";
+  vendorHash = "sha256-4qZ5egtNN0O+ESkvavprNd6Xtxh/eyD5INolqKXo674=";
 
   # Disable tests since it requires network access and relies on the
   # presence of release.hashicorp.com

From 22fe46215c012f5bf44b854413791a24d7a11dc4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 02:33:58 +0000
Subject: [PATCH 2204/6226] ansel: 0-unstable-2025-10-07 ->
 0-unstable-2025-10-23

---
 pkgs/by-name/an/ansel/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix
index b38642dc3616..4ec69a015e2c 100644
--- a/pkgs/by-name/an/ansel/package.nix
+++ b/pkgs/by-name/an/ansel/package.nix
@@ -82,13 +82,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "ansel";
-  version = "0-unstable-2025-10-07";
+  version = "0-unstable-2025-10-23";
 
   src = fetchFromGitHub {
     owner = "aurelienpierreeng";
     repo = "ansel";
-    rev = "486d5585f3a3fe2075f2903f5b2e36518dd82e37";
-    hash = "sha256-jXTxgStRsp8+Z7JLtwI6+OLd0n/wX58Mxg1dbzDb0p0=";
+    rev = "9658941ac8e644f0bdc96700a59f822cccf8f44b";
+    hash = "sha256-fQnWSIRH7pJglBBpafwKy40J91RivTH7TTQIyQCiuow=";
     fetchSubmodules = true;
   };
 

From ad23c591bb74cbc0e6438653acb57a89d908b907 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 02:53:50 +0000
Subject: [PATCH 2205/6226] rumdl: 0.0.162 -> 0.0.166

---
 pkgs/by-name/ru/rumdl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/rumdl/package.nix b/pkgs/by-name/ru/rumdl/package.nix
index a0eac951ca98..b920521248a0 100644
--- a/pkgs/by-name/ru/rumdl/package.nix
+++ b/pkgs/by-name/ru/rumdl/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rumdl";
-  version = "0.0.162";
+  version = "0.0.166";
 
   src = fetchFromGitHub {
     owner = "rvben";
     repo = "rumdl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aCduiCO49YWeqET3nezI1EYkz+IbTR+uIy7FXHbkYCo=";
+    hash = "sha256-I63/GJa0bqJY2BHDmjcNDKSiglCygvpN4XBp/kQ6mEg=";
   };
 
-  cargoHash = "sha256-o9NqTdMEoYFZC69Raf0v6fHUKnbN2K+rV3LK6rtjG/k=";
+  cargoHash = "sha256-Uh28HFWQhbJtYpKjUI0TuM0NRLpWnu+zQvt3gkGqKyU=";
 
   cargoBuildFlags = [
     "--bin=rumdl"

From dc7095a86e0e21072331c7817bd570b41e112840 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Fri, 24 Oct 2025 06:26:39 +0300
Subject: [PATCH 2206/6226] treewide: remove deprecated lib functions that had
 warning for more than 2 years

---
 doc/release-notes/rl-2511.section.md          | 16 ++++
 lib/customisation.nix                         |  1 -
 lib/default.nix                               |  3 -
 lib/modules.nix                               |  6 --
 lib/options.nix                               |  2 -
 lib/sources.nix                               | 16 ----
 lib/strings.nix                               | 81 -------------------
 lib/tests/modules/types.nix                   |  2 +-
 lib/types.nix                                 | 19 +----
 nixos/modules/programs/pay-respects.nix       |  4 +-
 .../haskell-modules/lib/default.nix           |  6 --
 11 files changed, 20 insertions(+), 136 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index f83792f0a3cd..3b4cc77e6e1d 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -342,16 +342,32 @@
 
 ### Breaking changes {#sec-nixpkgs-release-25.11-lib-breaking}
 
+- `lib.literalExample` has been removed, use `lib.literalExpression` instead, or use `lib.literalMD` for a non-Nix description.
+
+- `lib.replaceChars` has been removed, it was a deprecated alias of `lib.replaceStrings`.
+
+- `lib.readPathsFromFile` has been removed, use a list instead
+
 - `lib.mapAttrsFlatten` has been removed, following its deprecation in NixOS 24.11. Use `lib.attrsets.mapAttrsToList` instead.
 
+- `lib.strings.isCoercibleToString` has been in favor of either `lib.strings.isStringLike` or `lib.strings.isConvertibleWithToString`. Only use the latter if it needs to return true for null, numbers, booleans, or a list of those.
+
+- `lib.types.string` has been removed. See [this pull request](https://github.com/NixOS/nixpkgs/pull/66346) for better alternative types like `lib.types.str`.
+
+- `lib.modules.defaultPriority` has been removed, please use `lib.modules.defaultOverridePriority` instead.
+
 - `lib.attrsets.cartesianProductOfSets` has been removed, following its deprecation in NixOS 24.11. Use `lib.attrsets.cartesianProduct` instead.
 
+- `lib.sources.pathType`, `lib.sources.pathIsDirectory` and `lib.sources.pathIsRegularFile` have been replaced by `lib.filesystem.pathType`, `lib.filesystem.pathIsDirectory` and `lib.filesystem.pathIsRegularFile` respectively.
+
 - `lib.attrsets.zip` has been removed, following its deprecation in 2013. Use `lib.attrsets.zipAttrsWith` instead.
 
 - `lib.attrsets.zipWithNames` has been removed, following its deprecation in 2009. Use `lib.attrsets.zipAttrsWithNames` instead.
 
 - `lib.options.mkPackageOptionMD` has been removed, following its deprecation in NixOS 24.11. Use `lib.options.mkPackageOption` instead.
 
+- `haskell.lib.addOptparseApplicativeCompletionScripts` has been removed, use `haskellPackages.generateOptparseApplicativeCompletions` instead.
+
 - The `buildPythonPackage` and `buildPythonApplication` functions now require
   an explicit `format` attribute. Previously the default format used setuptools
   and called `setup.py` from the source tree, which is deprecated.
diff --git a/lib/customisation.nix b/lib/customisation.nix
index 39b59d7cdf6f..9319fad0b822 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -22,7 +22,6 @@ let
     filterAttrs
     optionalString
     flip
-    pathIsDirectory
     head
     pipe
     isDerivation
diff --git a/lib/default.nix b/lib/default.nix
index cbb58e302504..afd9ecd2154c 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -344,7 +344,6 @@ let
         escapeRegex
         escapeURL
         escapeXML
-        replaceChars
         lowerChars
         upperChars
         toLower
@@ -377,7 +376,6 @@ let
         fixedWidthNumber
         toInt
         toIntBase10
-        readPathsFromFile
         fileContents
         ;
       inherit (self.stringsWithDeps)
@@ -495,7 +493,6 @@ let
         optionAttrSetToDocList'
         scrubOptionValue
         literalExpression
-        literalExample
         showOption
         showOptionWithDefLocs
         showFiles
diff --git a/lib/modules.nix b/lib/modules.nix
index 42e88dbbf625..5f6d803da233 100644
--- a/lib/modules.nix
+++ b/lib/modules.nix
@@ -1468,11 +1468,6 @@ let
   mkForce = mkOverride 50;
   mkVMOverride = mkOverride 10; # used by ‘nixos-rebuild build-vm’
 
-  defaultPriority =
-    warnIf (oldestSupportedReleaseIsAtLeast 2305)
-      "lib.modules.defaultPriority is deprecated, please use lib.modules.defaultOverridePriority instead."
-      defaultOverridePriority;
-
   mkFixStrictness = warn "lib.mkFixStrictness has no effect and will be removed. It returns its argument unmodified, so you can just remove any calls." id;
 
   mkOrder = priority: content: {
@@ -2162,7 +2157,6 @@ private
   inherit
     defaultOrderPriority
     defaultOverridePriority
-    defaultPriority
     doRename
     evalModules
     evalOptionValue # for use by lib.types
diff --git a/lib/options.nix b/lib/options.nix
index 75f8bfa2535c..b1db6ff76e46 100644
--- a/lib/options.nix
+++ b/lib/options.nix
@@ -684,8 +684,6 @@ rec {
         inherit text;
       };
 
-  literalExample = lib.warn "lib.literalExample is deprecated, use lib.literalExpression instead, or use lib.literalMD for a non-Nix description." literalExpression;
-
   /**
     For use in the `defaultText` and `example` option attributes. Causes the
     given MD text to be inserted verbatim in the documentation, for when
diff --git a/lib/sources.nix b/lib/sources.nix
index 4d67ea30b62c..78335bd9f06d 100644
--- a/lib/sources.nix
+++ b/lib/sources.nix
@@ -509,22 +509,6 @@ let
 
 in
 {
-
-  pathType =
-    lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2305)
-      "lib.sources.pathType has been moved to lib.filesystem.pathType."
-      lib.filesystem.pathType;
-
-  pathIsDirectory =
-    lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2305)
-      "lib.sources.pathIsDirectory has been moved to lib.filesystem.pathIsDirectory."
-      lib.filesystem.pathIsDirectory;
-
-  pathIsRegularFile =
-    lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2305)
-      "lib.sources.pathIsRegularFile has been moved to lib.filesystem.pathIsRegularFile."
-      lib.filesystem.pathIsRegularFile;
-
   inherit
     pathIsGitRepo
     commitIdFromGitRepo
diff --git a/lib/strings.nix b/lib/strings.nix
index 77d7bb939eb5..5d3183bcef06 100644
--- a/lib/strings.nix
+++ b/lib/strings.nix
@@ -1467,9 +1467,6 @@ rec {
       [ "\"" "'" "<" ">" "&" ]
       [ "&quot;" "&apos;" "&lt;" "&gt;" "&amp;" ];
 
-  # warning added 12-12-2022
-  replaceChars = lib.warn "lib.replaceChars is a deprecated alias of lib.replaceStrings." builtins.replaceStrings;
-
   # Case conversion utilities.
   lowerChars = stringToCharacters "abcdefghijklmnopqrstuvwxyz";
   upperChars = stringToCharacters "ABCDEFGHIJKLMNOPQRSTUVWXYZ";
@@ -2578,30 +2575,6 @@ rec {
     in
     lib.warnIf (!precise) "Imprecise conversion from float to string ${result}" result;
 
-  /**
-    Check whether a value `val` can be coerced to a string.
-
-    :::{.warning}
-    Soft-deprecated function. While the original implementation is available as
-    `isConvertibleWithToString`, consider using `isStringLike` instead, if suitable.
-    :::
-
-    # Inputs
-
-    `val`
-    : 1\. Function argument
-
-    # Type
-
-    ```
-    isCoercibleToString :: a -> bool
-    ```
-  */
-  isCoercibleToString =
-    lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2305)
-      "lib.strings.isCoercibleToString is deprecated in favor of either isStringLike or isConvertibleWithToString. Only use the latter if it needs to return true for null, numbers, booleans and list of similarly coercibles."
-      isConvertibleWithToString;
-
   /**
     Check whether a list or other value `x` can be passed to toString.
 
@@ -2842,60 +2815,6 @@ rec {
     else
       parsedInput;
 
-  /**
-    Read a list of paths from `file`, relative to the `rootPath`.
-    Lines beginning with `#` are treated as comments and ignored.
-    Whitespace is significant.
-
-    :::{.warning}
-    This function is deprecated and should be avoided.
-    :::
-
-    :::{.note}
-    This function is not performant and should be avoided.
-    :::
-
-    # Inputs
-
-    `rootPath`
-    : 1\. Function argument
-
-    `file`
-    : 2\. Function argument
-
-    # Type
-
-    ```
-    readPathsFromFile :: string -> string -> [string]
-    ```
-
-    # Examples
-    :::{.example}
-    ## `lib.strings.readPathsFromFile` usage example
-
-    ```nix
-    readPathsFromFile /prefix
-      ./pkgs/development/libraries/qt-5/5.4/qtbase/series
-    => [ "/prefix/dlopen-resolv.patch" "/prefix/tzdir.patch"
-         "/prefix/dlopen-libXcursor.patch" "/prefix/dlopen-openssl.patch"
-         "/prefix/dlopen-dbus.patch" "/prefix/xdg-config-dirs.patch"
-         "/prefix/nix-profiles-library-paths.patch"
-         "/prefix/compose-search-path.patch" ]
-    ```
-
-    :::
-  */
-  readPathsFromFile = lib.warn "lib.readPathsFromFile is deprecated, use a list instead." (
-    rootPath: file:
-    let
-      lines = lib.splitString "\n" (readFile file);
-      removeComments = lib.filter (line: line != "" && !(lib.hasPrefix "#" line));
-      relativePaths = removeComments lines;
-      absolutePaths = map (path: rootPath + "/${path}") relativePaths;
-    in
-    absolutePaths
-  );
-
   /**
     Read the contents of a file removing the trailing \n
 
diff --git a/lib/tests/modules/types.nix b/lib/tests/modules/types.nix
index e860dbac3319..3127ece89e49 100644
--- a/lib/tests/modules/types.nix
+++ b/lib/tests/modules/types.nix
@@ -380,7 +380,7 @@ in
       assert (pathWith { absolute = null; }).description == "path";
       assert (pathWith { inStore = false; }).description == "path not in the Nix store";
       assert (pathWith { inStore = null; }).description == "path";
-      assert (separatedString "").description == "Concatenated string";
+      assert (separatedString "").description == "strings concatenated with \"\"";
       assert (separatedString ",").description == "strings concatenated with \",\"";
       assert (separatedString "\n").description == ''strings concatenated with "\n"'';
       assert (separatedString ":").description == "strings concatenated with \":\"";
diff --git a/lib/types.nix b/lib/types.nix
index ae77c9fcf8cb..4e20492909c7 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -559,11 +559,7 @@ let
         sep:
         mkOptionType rec {
           name = "separatedString";
-          description =
-            if sep == "" then
-              "Concatenated string" # for types.string.
-            else
-              "strings concatenated with ${builtins.toJSON sep}";
+          description = "strings concatenated with ${builtins.toJSON sep}";
           descriptionClass = "noun";
           check = isString;
           merge = loc: defs: concatStringsSep sep (getValues defs);
@@ -578,19 +574,6 @@ let
       commas = separatedString ",";
       envVar = separatedString ":";
 
-      # Deprecated; should not be used because it quietly concatenates
-      # strings, which is usually not what you want.
-      # We use a lib.warn because `deprecationMessage` doesn't trigger in nested types such as `attrsOf string`
-      string =
-        lib.warn
-          "The type `types.string` is deprecated. See https://github.com/NixOS/nixpkgs/pull/66346 for better alternative types."
-          (
-            separatedString ""
-            // {
-              name = "string";
-            }
-          );
-
       passwdEntry =
         entryType:
         addCheck entryType (str: !(hasInfix ":" str || hasInfix "\n" str))
diff --git a/nixos/modules/programs/pay-respects.nix b/nixos/modules/programs/pay-respects.nix
index 71d5c8f0e51d..b8fc8e374936 100644
--- a/nixos/modules/programs/pay-respects.nix
+++ b/nixos/modules/programs/pay-respects.nix
@@ -16,7 +16,7 @@ let
     mkOption
     mkPackageOption
     optionalString
-    replaceChars
+    replaceStrings
     substring
     toLower
     types
@@ -142,7 +142,7 @@ in
               description = "The model used by `pay-respects` to generate command corrections.";
             };
             locale = mkOption {
-              default = toLower (replaceChars [ "_" ] [ "-" ] (substring 0 5 config.i18n.defaultLocale));
+              default = toLower (replaceStrings [ "_" ] [ "-" ] (substring 0 5 config.i18n.defaultLocale));
               example = "nl-be";
               type = str;
               description = ''
diff --git a/pkgs/development/haskell-modules/lib/default.nix b/pkgs/development/haskell-modules/lib/default.nix
index b544c80db937..306176d32fc7 100644
--- a/pkgs/development/haskell-modules/lib/default.nix
+++ b/pkgs/development/haskell-modules/lib/default.nix
@@ -339,12 +339,6 @@ rec {
   # packagesFromDirectory : { directory : Directory, ... } -> HaskellPackageOverrideSet
   packagesFromDirectory = compose.packagesFromDirectory;
 
-  addOptparseApplicativeCompletionScripts =
-    exeName: pkg:
-    lib.warn "addOptparseApplicativeCompletionScripts is deprecated in favor of haskellPackages.generateOptparseApplicativeCompletions. Please change ${pkg.name} to use the latter and make sure it uses its matching haskell.packages set!" (
-      compose.__generateOptparseApplicativeCompletion exeName pkg
-    );
-
   /*
     Modify a Haskell package to add shell completion scripts for the
     given executable produced by it. These completion scripts will be

From 90630742fa834d124bbdcb47a659d480762d5e30 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 03:40:56 +0000
Subject: [PATCH 2207/6226] python3Packages.subarulink: 0.7.14 -> 0.7.15

---
 pkgs/development/python-modules/subarulink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix
index 9ad9a47f2d80..ed0f5abbfbf8 100644
--- a/pkgs/development/python-modules/subarulink/default.nix
+++ b/pkgs/development/python-modules/subarulink/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "subarulink";
-  version = "0.7.14";
+  version = "0.7.15";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "G-Two";
     repo = "subarulink";
     tag = "v${version}";
-    hash = "sha256-iZWDi7vT1AQI7WbGOQZw2gE+3ht4YKnHO58ALrUGfIg=";
+    hash = "sha256-7ymvnxZOpqVitUDHuHxYbYRl2Dnlgvuh+nXXUgE7cXo=";
   };
 
   build-system = [ setuptools ];

From 7694c872a1131dcbea51ca5420884ce48e86fe6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 23 Oct 2025 20:39:42 -0700
Subject: [PATCH 2208/6226] webp-pixbuf-loader: 0.2.6 -> 0.2.7

Diff: https://github.com/aruiz/webp-pixbuf-loader/compare/0.2.6...0.2.7
---
 pkgs/by-name/we/webp-pixbuf-loader/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/we/webp-pixbuf-loader/package.nix b/pkgs/by-name/we/webp-pixbuf-loader/package.nix
index 188fa813d5a2..431b8431f353 100644
--- a/pkgs/by-name/we/webp-pixbuf-loader/package.nix
+++ b/pkgs/by-name/we/webp-pixbuf-loader/package.nix
@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "webp-pixbuf-loader";
-  version = "0.2.6";
+  version = "0.2.7";
 
   src = fetchFromGitHub {
     owner = "aruiz";
     repo = "webp-pixbuf-loader";
     rev = version;
-    sha256 = "sha256-2GDH5+YCwb2mPdMfEscmWDOzdGnWRcppE+4rcDCZog4=";
+    sha256 = "sha256-IJEweV2ACFp+Ua2ESrRUNApXWBg3NED60FDKijYO5TI=";
   };
 
   nativeBuildInputs = [

From 58db6be1d8d74ca0b181ae90dd277cde9b8736e2 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 24 Oct 2025 00:59:17 -0300
Subject: [PATCH 2209/6226] romdirfs: fix build with cmake4

---
 pkgs/by-name/ro/romdirfs/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ro/romdirfs/package.nix b/pkgs/by-name/ro/romdirfs/package.nix
index 00b6543cc1ac..11ef69a039e6 100644
--- a/pkgs/by-name/ro/romdirfs/package.nix
+++ b/pkgs/by-name/ro/romdirfs/package.nix
@@ -24,6 +24,11 @@ gccStdenv.mkDerivation rec {
   ];
   buildInputs = [ fuse ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "FUSE for access Playstation 2 IOP IOPRP images and BIOS dumps";
     homepage = "https://github.com/mlafeldt/romdirfs";

From e0445679b4407d82f3f5aca108221e960c33bb19 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 24 Oct 2025 01:06:01 -0300
Subject: [PATCH 2210/6226] rpiplay: fix build with cmake4

---
 pkgs/by-name/rp/rpiplay/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/rp/rpiplay/package.nix b/pkgs/by-name/rp/rpiplay/package.nix
index d12cda394593..9080106042e9 100644
--- a/pkgs/by-name/rp/rpiplay/package.nix
+++ b/pkgs/by-name/rp/rpiplay/package.nix
@@ -52,6 +52,11 @@ stdenv.mkDerivation {
     gst_all_1.gst-plugins-ugly
   ];
 
+  postPatch = ''
+    substituteInPlace {lib/playfair/,lib/llhttp/,lib/,renderers/,./}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.4.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     broken = stdenv.hostPlatform.isDarwin;
     homepage = "https://github.com/FD-/RPiPlay";

From b9ae5776dbb01b1bcee11554cd4f32247da0d9a3 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Fri, 24 Oct 2025 04:30:44 +0000
Subject: [PATCH 2211/6226] flutter335: 3.35.5 -> 3.35.7

---
 .../compilers/flutter/versions/3_35/data.json | 74 +++++++++----------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/compilers/flutter/versions/3_35/data.json b/pkgs/development/compilers/flutter/versions/3_35/data.json
index f383afef4294..6d04fcf6b864 100644
--- a/pkgs/development/compilers/flutter/versions/3_35/data.json
+++ b/pkgs/development/compilers/flutter/versions/3_35/data.json
@@ -1,17 +1,17 @@
 {
-  "version": "3.35.5",
-  "engineVersion": "d3d45dcf251823c1769909cd43698d126db38deb",
+  "version": "3.35.7",
+  "engineVersion": "035316565ad77281a75305515e4682e6c4c6f7ca",
   "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=",
   "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416",
   "channel": "stable",
   "engineHashes": {
     "aarch64-linux": {
-      "aarch64-linux": "sha256-0g9ozn4aamUI85j11xEwW6Xv61APIpuLSmg6I0cHiiM=",
-      "x86_64-linux": "sha256-0g9ozn4aamUI85j11xEwW6Xv61APIpuLSmg6I0cHiiM="
+      "aarch64-linux": "sha256-v2L0MQRTXvWngb8fu/AR9iofq2CDq1HFedXE8cSzOws=",
+      "x86_64-linux": "sha256-v2L0MQRTXvWngb8fu/AR9iofq2CDq1HFedXE8cSzOws="
     },
     "x86_64-linux": {
-      "aarch64-linux": "sha256-tXUALuEJZUiUoVOV6vxfdjrSSUe4Mm4Nax+j9lvVCJM=",
-      "x86_64-linux": "sha256-tXUALuEJZUiUoVOV6vxfdjrSSUe4Mm4Nax+j9lvVCJM="
+      "aarch64-linux": "sha256-RKfKhFwlwVEguWqI6OinTqdCM3yNTP/5PwevREmS4Nk=",
+      "x86_64-linux": "sha256-RKfKhFwlwVEguWqI6OinTqdCM3yNTP/5PwevREmS4Nk="
     }
   },
   "dartVersion": "3.9.2",
@@ -21,53 +21,53 @@
     "x86_64-darwin": "sha256-mjWHCF5voWLKlqBKYhl2OKg2aDx0pyIQ1TlF6k4MQz0=",
     "aarch64-darwin": "sha256-1rAfqatlOdphdi6dZSfUfKywAbdwRn6ijo60isjV3Lw="
   },
-  "flutterHash": "sha256-EVJ/2Qk5r9CL/WObLsH3J/KW/ota6HgkAUYNgLYZwkw=",
+  "flutterHash": "sha256-0GI3P11vys6JU+H5MXKznHTItOXZwap7bxHzgj6umc4=",
   "artifactHashes": {
     "android": {
-      "aarch64-darwin": "sha256-XU2WMX8lYGZgERKcUXXRCG0i+v+NeJQt05ZcwVEPkwE=",
-      "aarch64-linux": "sha256-SDJXjztXecAQPwDgZlg3Lk04LRVmuVLhEoC1nPTlDw0=",
-      "x86_64-darwin": "sha256-XU2WMX8lYGZgERKcUXXRCG0i+v+NeJQt05ZcwVEPkwE=",
-      "x86_64-linux": "sha256-SDJXjztXecAQPwDgZlg3Lk04LRVmuVLhEoC1nPTlDw0="
+      "aarch64-darwin": "sha256-BbwfmKPmxZUPVoZEE687vudBCBPzVM/C9ehPEAPr6Jw=",
+      "aarch64-linux": "sha256-Pgc/ybLcRFJkbGUI2eY689yxOv2VyKdO/F5vGkTg/tM=",
+      "x86_64-darwin": "sha256-BbwfmKPmxZUPVoZEE687vudBCBPzVM/C9ehPEAPr6Jw=",
+      "x86_64-linux": "sha256-Pgc/ybLcRFJkbGUI2eY689yxOv2VyKdO/F5vGkTg/tM="
     },
     "fuchsia": {
-      "aarch64-darwin": "sha256-6XXdeFJJCPz4GXjtHODNUUlVxOC+wsxQHlk1utB1hro=",
-      "aarch64-linux": "sha256-6XXdeFJJCPz4GXjtHODNUUlVxOC+wsxQHlk1utB1hro=",
-      "x86_64-darwin": "sha256-6XXdeFJJCPz4GXjtHODNUUlVxOC+wsxQHlk1utB1hro=",
-      "x86_64-linux": "sha256-6XXdeFJJCPz4GXjtHODNUUlVxOC+wsxQHlk1utB1hro="
+      "aarch64-darwin": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=",
+      "aarch64-linux": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=",
+      "x86_64-darwin": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM=",
+      "x86_64-linux": "sha256-qpHjEpuIK1hI6ga1qr0Q/t5S2Jjk8oUpnkeXsIeu7UM="
     },
     "ios": {
-      "aarch64-darwin": "sha256-aWAK+2tSlp8UJ1kMjewIbxthGctiovXNgSjGEJVW/7w=",
-      "aarch64-linux": "sha256-aWAK+2tSlp8UJ1kMjewIbxthGctiovXNgSjGEJVW/7w=",
-      "x86_64-darwin": "sha256-aWAK+2tSlp8UJ1kMjewIbxthGctiovXNgSjGEJVW/7w=",
-      "x86_64-linux": "sha256-aWAK+2tSlp8UJ1kMjewIbxthGctiovXNgSjGEJVW/7w="
+      "aarch64-darwin": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=",
+      "aarch64-linux": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=",
+      "x86_64-darwin": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY=",
+      "x86_64-linux": "sha256-ZjNJhDXqv9dg9Gn62TRYX1Vb4Qn0adS5nxxpYZOGsgY="
     },
     "linux": {
-      "aarch64-darwin": "sha256-2ggkx/GSox34XxRfHJM3ipf9wqsR4rKYfn8Mzo4NmqI=",
-      "aarch64-linux": "sha256-2ggkx/GSox34XxRfHJM3ipf9wqsR4rKYfn8Mzo4NmqI=",
-      "x86_64-darwin": "sha256-uObm7ogCp1JEMJ7CFeIzcN/ore6VPGvmvhsEYiXroWY=",
-      "x86_64-linux": "sha256-uObm7ogCp1JEMJ7CFeIzcN/ore6VPGvmvhsEYiXroWY="
+      "aarch64-darwin": "sha256-TB9BOiV1Z1cKJKusNW4O0oJEJCt9XmWN+g4yCXtyepc=",
+      "aarch64-linux": "sha256-TB9BOiV1Z1cKJKusNW4O0oJEJCt9XmWN+g4yCXtyepc=",
+      "x86_64-darwin": "sha256-7BocNpo89xSXNy6yob+EESVfalm2olwR/knVfq9I1VA=",
+      "x86_64-linux": "sha256-7BocNpo89xSXNy6yob+EESVfalm2olwR/knVfq9I1VA="
     },
     "macos": {
-      "aarch64-darwin": "sha256-VBJntqCFoTAS+8FwxroCmSarfx9yqL5n4Q5oWz1JgII=",
-      "aarch64-linux": "sha256-VBJntqCFoTAS+8FwxroCmSarfx9yqL5n4Q5oWz1JgII=",
-      "x86_64-darwin": "sha256-VBJntqCFoTAS+8FwxroCmSarfx9yqL5n4Q5oWz1JgII=",
-      "x86_64-linux": "sha256-VBJntqCFoTAS+8FwxroCmSarfx9yqL5n4Q5oWz1JgII="
+      "aarch64-darwin": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=",
+      "aarch64-linux": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=",
+      "x86_64-darwin": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c=",
+      "x86_64-linux": "sha256-vnV12shNi630OuyWTey/31vsmAcF7UMEgfdBZBXWc4c="
     },
     "universal": {
-      "aarch64-darwin": "sha256-dXJmnOZunesXmUAGt32LE+hXB2b3KNhauSYeduPuK70=",
-      "aarch64-linux": "sha256-xWvFZH3RcTMuV2wn6bpEe4eiKdjGy7u/YlxZrqfOCQA=",
-      "x86_64-darwin": "sha256-9anTlYdSTIK1go8dxZ0TqfWQNz0YTCEGEESvXw+nTec=",
-      "x86_64-linux": "sha256-5DQ+4pPBtmc391cm446Ql6OtSGz3DLtO4pI3ueX0jUY="
+      "aarch64-darwin": "sha256-oPUDsJxKbbWEH1XgxOFoBnVYJAjgeCBKIrYtBafWtWU=",
+      "aarch64-linux": "sha256-ae6UH4K09lcl7UZzD/WKFxWUKEZQsLmizODs/RMKcis=",
+      "x86_64-darwin": "sha256-wxDWrT35CUIEQaKeIK0adr0oPfv6to60Z6R+8zrwhmU=",
+      "x86_64-linux": "sha256-CxvOlq8nxeY5esRanl2N7oO4RFgBTwQcRdS7Pp/5tt8="
     },
     "web": {
-      "aarch64-darwin": "sha256-duX+iGMFQ18nJIT49V1ZeyXTV+9Z8oDot0jgeonmVHA=",
-      "aarch64-linux": "sha256-duX+iGMFQ18nJIT49V1ZeyXTV+9Z8oDot0jgeonmVHA=",
-      "x86_64-darwin": "sha256-duX+iGMFQ18nJIT49V1ZeyXTV+9Z8oDot0jgeonmVHA=",
-      "x86_64-linux": "sha256-duX+iGMFQ18nJIT49V1ZeyXTV+9Z8oDot0jgeonmVHA="
+      "aarch64-darwin": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=",
+      "aarch64-linux": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=",
+      "x86_64-darwin": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o=",
+      "x86_64-linux": "sha256-T+LR7Yo2hEy24u3aS+ehp9nyRBB+3dNDyF6jw1oOd1o="
     },
     "windows": {
-      "x86_64-darwin": "sha256-aZ7owKiUsfuV6UqlO9I8aD1aWVjA55sOHdq+pgaLJGQ=",
-      "x86_64-linux": "sha256-aZ7owKiUsfuV6UqlO9I8aD1aWVjA55sOHdq+pgaLJGQ="
+      "x86_64-darwin": "sha256-xTWgw8JE/4R9UcdZmLEbMk+yL2V3zfAIXDRli9XYe5k=",
+      "x86_64-linux": "sha256-xTWgw8JE/4R9UcdZmLEbMk+yL2V3zfAIXDRli9XYe5k="
     }
   },
   "pubspecLock": {

From 6b3e25c4ee2c0294d66d354a2a335967daa2153a Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 24 Oct 2025 01:38:31 -0300
Subject: [PATCH 2212/6226] ghostscript: add maintainer iedame

---
 pkgs/by-name/gh/ghostscript/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gh/ghostscript/package.nix b/pkgs/by-name/gh/ghostscript/package.nix
index 70512dcc9f65..38b90bc90cd6 100644
--- a/pkgs/by-name/gh/ghostscript/package.nix
+++ b/pkgs/by-name/gh/ghostscript/package.nix
@@ -247,7 +247,10 @@ stdenv.mkDerivation rec {
     '';
     license = lib.licenses.agpl3Plus;
     platforms = lib.platforms.all;
-    maintainers = [ lib.maintainers.tobim ];
+    maintainers = with lib.maintainers; [
+      tobim
+      iedame
+    ];
     mainProgram = "gs";
   };
 }

From 7032f00b7018e995c1ae9bcd5daa81a82bf8a16e Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 24 Oct 2025 01:41:52 -0300
Subject: [PATCH 2213/6226] openlierox: add maintainer iedame

---
 pkgs/by-name/op/openlierox/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/openlierox/package.nix b/pkgs/by-name/op/openlierox/package.nix
index f1fa65c403de..d1f507852c2a 100644
--- a/pkgs/by-name/op/openlierox/package.nix
+++ b/pkgs/by-name/op/openlierox/package.nix
@@ -73,7 +73,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://openlierox.net";
     license = lib.licenses.lgpl2Plus;
     mainProgram = "openlierox";
-    maintainers = with lib.maintainers; [ tomasajt ];
+    maintainers = with lib.maintainers; [
+      tomasajt
+      iedame
+    ];
     platforms = lib.platforms.linux;
   };
 })

From 5ee9f2b2870636560217eceb063c60d15189a2e0 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 24 Oct 2025 01:44:57 -0300
Subject: [PATCH 2214/6226] sgt-puzzles: add maintainer iedame

---
 pkgs/by-name/sg/sgt-puzzles/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/sg/sgt-puzzles/package.nix b/pkgs/by-name/sg/sgt-puzzles/package.nix
index d4922c96a5b9..3799e5ded952 100644
--- a/pkgs/by-name/sg/sgt-puzzles/package.nix
+++ b/pkgs/by-name/sg/sgt-puzzles/package.nix
@@ -94,6 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [
       raskin
       tomfitzhenry
+      iedame
     ];
     platforms = lib.platforms.linux;
     homepage = "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/";

From 5fb09fe30f1bed054b2a2e084b930d3356e0c016 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 24 Oct 2025 01:46:49 -0300
Subject: [PATCH 2215/6226] _1password-gui: add maintainer iedame

---
 pkgs/by-name/_1/_1password-gui/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/_1/_1password-gui/package.nix b/pkgs/by-name/_1/_1password-gui/package.nix
index f942a934d246..5d16e783a215 100644
--- a/pkgs/by-name/_1/_1password-gui/package.nix
+++ b/pkgs/by-name/_1/_1password-gui/package.nix
@@ -35,6 +35,7 @@ let
       timstott
       sebtm
       bdd
+      iedame
     ];
     platforms = [
       "x86_64-linux"

From 31effc85fb9d5eda73f3d4977b66c90828adccd3 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 24 Oct 2025 01:47:55 -0300
Subject: [PATCH 2216/6226] _1password-cli: add maintainer iedame

---
 pkgs/by-name/_1/_1password-cli/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix
index 203aac1dbe54..67ea511875f7 100644
--- a/pkgs/by-name/_1/_1password-cli/package.nix
+++ b/pkgs/by-name/_1/_1password-cli/package.nix
@@ -93,6 +93,7 @@ stdenv.mkDerivation {
     maintainers = with lib.maintainers; [
       joelburget
       khaneliman
+      iedame
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     license = lib.licenses.unfree;

From c12ef358e318de3093724d5bceb8d38bf979ba04 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 24 Oct 2025 01:49:22 -0300
Subject: [PATCH 2217/6226] librepcb: add maintainer iedame

---
 pkgs/applications/science/electronics/librepcb/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix
index 34abc1d75534..24be9314b6b2 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -54,6 +54,7 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [
       luz
       thoughtpolice
+      iedame
     ];
     license = licenses.gpl3Plus;
     platforms = platforms.linux;

From a6bb782c220ad5710cc6b48db28fef1f6b87e067 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 24 Oct 2025 01:50:40 -0300
Subject: [PATCH 2218/6226] img2pdf: add maintainer iedame

---
 pkgs/development/python-modules/img2pdf/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/img2pdf/default.nix b/pkgs/development/python-modules/img2pdf/default.nix
index 29b055ba916a..09450c1e77db 100644
--- a/pkgs/development/python-modules/img2pdf/default.nix
+++ b/pkgs/development/python-modules/img2pdf/default.nix
@@ -103,6 +103,7 @@ buildPythonPackage rec {
     maintainers = with lib.maintainers; [
       veprbl
       dotlambda
+      iedame
     ];
   };
 }

From 77e77ee70b372678d9843ee42098cd512fdf6c23 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 24 Oct 2025 01:54:11 -0300
Subject: [PATCH 2219/6226] ringracers: add maintainer iedame

---
 pkgs/by-name/ri/ringracers/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ri/ringracers/package.nix b/pkgs/by-name/ri/ringracers/package.nix
index 27d7eebb7e7d..91c0c367050d 100644
--- a/pkgs/by-name/ri/ringracers/package.nix
+++ b/pkgs/by-name/ri/ringracers/package.nix
@@ -98,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with maintainers; [
       donovanglover
       thehans255
+      iedame
     ];
     mainProgram = "ringracers";
   };

From 21a467d472e10944f3b444583083a98a88c4e09b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 05:03:54 +0000
Subject: [PATCH 2220/6226] python3Packages.dashscope: 1.24.6 -> 1.24.7

---
 pkgs/development/python-modules/dashscope/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dashscope/default.nix b/pkgs/development/python-modules/dashscope/default.nix
index 97a7ae8a5085..8739c4c9cc25 100644
--- a/pkgs/development/python-modules/dashscope/default.nix
+++ b/pkgs/development/python-modules/dashscope/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "dashscope";
-  version = "1.24.6";
+  version = "1.24.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dashscope";
     repo = "dashscope-sdk-python";
     tag = "v${version}";
-    hash = "sha256-kHvNg8yPlZyAr7Qgncv+axgG9sOKTjvxYnRojO5ih1g=";
+    hash = "sha256-Hss6kCE8lkstRZlFX9V+q91N2Zcp0aVbx89WpBR2uC4=";
   };
 
   build-system = [ setuptools ];

From 6cd43ab264b6b90b85b3f7026cc84073a83285ab Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 24 Oct 2025 01:57:54 -0300
Subject: [PATCH 2221/6226] appcleaner: add maintainer iedame

---
 pkgs/by-name/ap/appcleaner/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ap/appcleaner/package.nix b/pkgs/by-name/ap/appcleaner/package.nix
index 8f03b1dc92c2..c353691274a7 100644
--- a/pkgs/by-name/ap/appcleaner/package.nix
+++ b/pkgs/by-name/ap/appcleaner/package.nix
@@ -25,12 +25,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Uninstall unwanted apps";
     homepage = "https://freemacsoft.net/appcleaner";
-    license = licenses.unfree;
+    license = lib.licenses.unfree;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = with maintainers; [ emilytrau ];
-    platforms = platforms.darwin;
+    maintainers = with lib.maintainers; [
+      emilytrau
+      iedame
+    ];
+    platforms = lib.platforms.darwin;
   };
 })

From c0de979c7314a2222c2e993fa544a738f60ad21c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 05:06:35 +0000
Subject: [PATCH 2222/6226] supercronic: 0.2.35 -> 0.2.38

---
 pkgs/by-name/su/supercronic/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/su/supercronic/package.nix b/pkgs/by-name/su/supercronic/package.nix
index 06e50fbb3495..d7b08a39e6b1 100644
--- a/pkgs/by-name/su/supercronic/package.nix
+++ b/pkgs/by-name/su/supercronic/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "supercronic";
-  version = "0.2.35";
+  version = "0.2.38";
 
   src = fetchFromGitHub {
     owner = "aptible";
     repo = "supercronic";
     rev = "v${version}";
-    hash = "sha256-SGW/G9Ud0xsNwD+EXDegh6cGAr4cWeoah7IY6yTREWo=";
+    hash = "sha256-/+jGi1l9q7nlT5uRJVtFk490XuAw8Fi5QOdMnLUTac4=";
   };
 
-  vendorHash = "sha256-q2uH9kY0s1UM2uy6F/x1S0RqIfqXpV5KxnHJLLoAjZY=";
+  vendorHash = "sha256-+fEAlt6KBXfyzfDffde/XmWBXre8w41Q1zr7CfRX9bs=";
 
   excludedPackages = [ "cronexpr/cronexpr" ];
 

From 08c9779fbf4e83d994b9652af80319e7978feac1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 05:14:36 +0000
Subject: [PATCH 2223/6226] re-isearch: 2.20220925.4.0a-unstable-2025-10-17 ->
 2.20220925.4.0a-unstable-2025-10-22

---
 pkgs/by-name/re/re-isearch/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix
index 45cad3b370a8..69ea481a4a2e 100644
--- a/pkgs/by-name/re/re-isearch/package.nix
+++ b/pkgs/by-name/re/re-isearch/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation {
   pname = "re-Isearch";
-  version = "2.20220925.4.0a-unstable-2025-10-17";
+  version = "2.20220925.4.0a-unstable-2025-10-22";
 
   src = fetchFromGitHub {
     owner = "re-Isearch";
     repo = "re-Isearch";
-    rev = "4487eae1f59e9e9b4affdb612c217f63cf20b0ca";
-    hash = "sha256-VZ7b/SOWDrDN3eN2ZpH+GxfCJVPABWTIKBUJkE1XFDM=";
+    rev = "749fa527c3d70aba1d82e4e1376e1fefb84ac06b";
+    hash = "sha256-AvptVlu3aU+vSYfoeHsUryHTixLnlq4HYkoisskBTdA=";
   };
 
   patches = [

From 2e9d838795edcec2b79dda0284acf27ee34b1ecc Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 24 Oct 2025 14:24:14 +0900
Subject: [PATCH 2224/6226] nixos/rtkit: fix hardening

---
 nixos/modules/security/rtkit.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/rtkit.nix b/nixos/modules/security/rtkit.nix
index d7c6df17f03b..f2cd256468da 100644
--- a/nixos/modules/security/rtkit.nix
+++ b/nixos/modules/security/rtkit.nix
@@ -64,7 +64,7 @@ in
         ];
 
         # Needs to verify the user of the processes.
-        PrivateUsers = "full";
+        PrivateUsers = false;
         # Needs to access other processes to modify their scheduling modes.
         ProcSubset = "all";
         ProtectProc = "default";

From 2dc2bc98aed1c3f5d20a353e8e8bec23b4d68dc3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 05:31:13 +0000
Subject: [PATCH 2225/6226] python3Packages.israel-rail-api: 0.1.3 -> 0.1.4

---
 pkgs/development/python-modules/israel-rail-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/israel-rail-api/default.nix b/pkgs/development/python-modules/israel-rail-api/default.nix
index 2a5c46e00199..4265ecb5d55b 100644
--- a/pkgs/development/python-modules/israel-rail-api/default.nix
+++ b/pkgs/development/python-modules/israel-rail-api/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "israel-rail-api";
-  version = "0.1.3";
+  version = "0.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sh0oki";
     repo = "israel-rail-api";
     tag = "v${version}";
-    hash = "sha256-viIETVCW3YSwJOsFxkYoi0Ko9vXQEP9d+fjQAlb142c=";
+    hash = "sha256-vYMqMrvLQsy0MSfYAdlXqV1rF76A/cqkttWh47J8xn8=";
   };
 
   build-system = [ setuptools ];

From dbed2e725b881a88fd0b58be7123be0a90decee2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 05:47:32 +0000
Subject: [PATCH 2226/6226] python3Packages.sensai-utils: 1.5.0 -> 1.6.0

---
 pkgs/development/python-modules/sensai-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sensai-utils/default.nix b/pkgs/development/python-modules/sensai-utils/default.nix
index 34860d2885b4..fce62362d9c9 100644
--- a/pkgs/development/python-modules/sensai-utils/default.nix
+++ b/pkgs/development/python-modules/sensai-utils/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "sensai-utils";
-  version = "1.5.0";
+  version = "1.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "opcode81";
     repo = "sensAI-utils";
     tag = "v${version}";
-    hash = "sha256-bAbgamJjB+NpPnZHqYOrOhatGGgjzy558BrF3GwHOHE=";
+    hash = "sha256-E/9pCkSvKeGW1wlO6+YD0glbPrt4aJ7NZ0Kss2VbGdE=";
   };
 
   build-system = [ setuptools ];

From e4f0a45ad3b2c56d67f369d4a109b413363060d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 05:56:59 +0000
Subject: [PATCH 2227/6226] python3Packages.coiled: 1.127.0 -> 1.128.2

---
 pkgs/development/python-modules/coiled/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/coiled/default.nix b/pkgs/development/python-modules/coiled/default.nix
index 138b6e66d295..88d7381ddfa3 100644
--- a/pkgs/development/python-modules/coiled/default.nix
+++ b/pkgs/development/python-modules/coiled/default.nix
@@ -39,12 +39,12 @@
 
 buildPythonPackage rec {
   pname = "coiled";
-  version = "1.127.0";
+  version = "1.128.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-qMwZQC2ctMtuI5lysJ5YNVuT/lzqWQiEJnJPCUmKZbw=";
+    hash = "sha256-COG7HEu+6fmbM5LHjHpdVcd5F1BQnyPosabTyJH2GeE=";
   };
 
   build-system = [

From 8cf7fbde4824d83109e5c5d0d29c0c23a41632ee Mon Sep 17 00:00:00 2001
From: Samuel Holland <samuel@sholland.org>
Date: Fri, 24 Oct 2025 00:47:13 -0500
Subject: [PATCH 2228/6226] rust: Enable bootstrap on
 powerpc64le-unknown-linux-musl

Official tarballs for this target have been built since version 1.85.0.

Link: https://github.com/rust-lang/rust/pull/133801
---
 pkgs/development/compilers/rust/1_89.nix        | 1 +
 pkgs/development/compilers/rust/print-hashes.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/pkgs/development/compilers/rust/1_89.nix b/pkgs/development/compilers/rust/1_89.nix
index 768d02987ff3..c84289c03c85 100644
--- a/pkgs/development/compilers/rust/1_89.nix
+++ b/pkgs/development/compilers/rust/1_89.nix
@@ -74,6 +74,7 @@ import ./default.nix
       aarch64-apple-darwin = "87baeb57fb29339744ac5f99857f0077b12fa463217fc165dfd8f77412f38118";
       powerpc64-unknown-linux-gnu = "30d97f8d757c6ff171815c8af36eed85e44401a58c5e04f25b721c7776ed8337";
       powerpc64le-unknown-linux-gnu = "80db8e203357a050780fb8a2cdc027b81d5ae1634fa999c3be69cf8a2e10bbf6";
+      powerpc64le-unknown-linux-musl = "88d370dec3c382db9f1227822c725bab88621904c60f8f950745fa2e903264a4";
       riscv64gc-unknown-linux-gnu = "3885629641fd670e50c9e6553bdc6505457ef2163757a27dbf33fbc6351b2161";
       s390x-unknown-linux-gnu = "696dad74886467a5092ee8bd2265aaab85039fc563803166966c7cae389e2ef7";
       loongarch64-unknown-linux-gnu = "171696c45e4a91ccf17a239f00d5a3a8bbd40125d7a274506e1630423d714bec";
diff --git a/pkgs/development/compilers/rust/print-hashes.sh b/pkgs/development/compilers/rust/print-hashes.sh
index 42dbbc340273..44df681237c4 100755
--- a/pkgs/development/compilers/rust/print-hashes.sh
+++ b/pkgs/development/compilers/rust/print-hashes.sh
@@ -19,6 +19,7 @@ PLATFORMS=(
   aarch64-apple-darwin
   powerpc64-unknown-linux-gnu
   powerpc64le-unknown-linux-gnu
+  powerpc64le-unknown-linux-musl
   riscv64gc-unknown-linux-gnu
   s390x-unknown-linux-gnu
   loongarch64-unknown-linux-gnu

From df09e626b8f664d32f64f89e09ce6d9644249265 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 06:10:10 +0000
Subject: [PATCH 2229/6226] trezor-suite: 25.10.1 -> 25.10.2

---
 pkgs/by-name/tr/trezor-suite/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/trezor-suite/package.nix b/pkgs/by-name/tr/trezor-suite/package.nix
index 17682c637a59..a50a7d9341c7 100644
--- a/pkgs/by-name/tr/trezor-suite/package.nix
+++ b/pkgs/by-name/tr/trezor-suite/package.nix
@@ -10,7 +10,7 @@
 
 let
   pname = "trezor-suite";
-  version = "25.10.1";
+  version = "25.10.2";
 
   suffix =
     {
@@ -24,8 +24,8 @@ let
     hash =
       {
         # curl -Lfs https://github.com/trezor/trezor-suite/releases/download/v${version}/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
-        aarch64-linux = "sha512-dqtnWxybR+QTc1cvh72Nm7zkDh7zy6qbAh36b4IGGjARb8X/cEkGMIR2t9E/5pylW6z5gBC7ZpthvdjsiKi1dg==";
-        x86_64-linux = "sha512-NBja0kDi43DQ/nJKfAR5+vwbDG/JLr1NKi2OT8CQ5PNeV7Q+4vW5NjsQ9eZyaFwDwSxMPlSzYE3nKcjW0XSiWA==";
+        aarch64-linux = "sha512-0fGDyJ+l6TIaf3+tvS6ei18+JyNKqWLuH5rn1MSwdcpGW+5PeVj7nfHk0NVsKH+oeNpUQ9JXDlNKOmLH/eCxRg==";
+        x86_64-linux = "sha512-0gWpCbVcD42xJCfABesX7ylJpO7AIK/vM81z+EB83taPkgJ2yJBB71NxvDlVBjTCX8Am5INWOPRnnOFGKLQ7gA==";
       }
       .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   };

From a8dfff653f760f5310b5d545d5da188c83bc097c Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Fri, 24 Oct 2025 08:17:24 +0200
Subject: [PATCH 2230/6226] claude-code: 2.0.25 -> 2.0.26

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
---
 .../vscode/extensions/anthropic.claude-code/default.nix     | 4 ++--
 pkgs/by-name/cl/claude-code/package-lock.json               | 4 ++--
 pkgs/by-name/cl/claude-code/package.nix                     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 378d852bb39a..6bf2f09eee95 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "2.0.25";
-    hash = "sha256-I4z39qCDraRbpFlgUPW6KQcuALZYRqlLT6poJzs/8d8=";
+    version = "2.0.26";
+    hash = "sha256-5wEIWlqKVBs7pwzsIAFtAjGWHTjlLI/LzCs+8M0LL9Q=";
   };
 
   meta = {
diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index e90b62d35f7a..585972837213 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.0.25",
+  "version": "2.0.26",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.0.25",
+      "version": "2.0.26",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index f6a6d9d7b6b8..868cfd4469a3 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,14 +7,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.0.25";
+  version = "2.0.26";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-ix/JSPBLnvCPtyqJ6beAaOpuimphpkrkIw5HCdeeGkM=";
+    hash = "sha256-4roXnR6y3jFr7uCZFKTFOyahPjnhJuyVFXunQ89flL4=";
   };
 
-  npmDepsHash = "sha256-NjmCmOwepKaSZ+vji0sUlZ1nSkcG02kNokGe37YYtX0=";
+  npmDepsHash = "sha256-fEXaPqT9TxDb3uWJRRGIJMP2NffUBDGpPY2uJc6DP0k=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 0b3f44aac172cf012203ffeb4fb85d282d4ca5b9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 06:25:32 +0000
Subject: [PATCH 2231/6226] fleet: 4.73.5 -> 4.75.1

---
 pkgs/by-name/fl/fleet/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fl/fleet/package.nix b/pkgs/by-name/fl/fleet/package.nix
index 2ef8fca196cb..3c9428f7c219 100644
--- a/pkgs/by-name/fl/fleet/package.nix
+++ b/pkgs/by-name/fl/fleet/package.nix
@@ -7,15 +7,15 @@
 
 buildGoModule (finalAttrs: {
   pname = "fleet";
-  version = "4.73.5";
+  version = "4.75.1";
 
   src = fetchFromGitHub {
     owner = "fleetdm";
     repo = "fleet";
     tag = "fleet-v${finalAttrs.version}";
-    hash = "sha256-66ABReCDIxL+uwwK3IWnKR+UPJd5DBSE+bNUk+2LbQA=";
+    hash = "sha256-0vnGdcCq3sHTS7CxlnYMYxr0KZr9exrrU+4lIeGkv+0=";
   };
-  vendorHash = "sha256-T4UrUUHAWqInLRH7ZxQlfV1W1rvmhUFsfEeXQdNmRD4=";
+  vendorHash = "sha256-SMQskb2Sth1Wi02e/EwT/z+dUsxGBN7gd/H3f33Oq1M=";
 
   subPackages = [
     "cmd/fleet"

From e92214c3a47111a34063c474d92a210372e9e8bf Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Fri, 24 Oct 2025 07:15:22 +0100
Subject: [PATCH 2232/6226] top-level: use parentheses to group checks

Group `throwIfNot` chains with parentheses to improve readability and
hint to nixfmt the intended formatting.

This makes the result visually closer to the pre-nixfmt layout:

    checked =
      throwIfNot (lib.isList overlays) "The overlays argument to nixpkgs must be a list."
      lib.foldr (x: throwIfNot (lib.isFunction x) "All overlays passed to nixpkgs must be functions.") (r: r) overlays
      throwIfNot (lib.isList crossOverlays) "The crossOverlays argument to nixpkgs must be a list."
      lib.foldr (x: throwIfNot (lib.isFunction x) "All crossOverlays passed to nixpkgs must be functions.") (r: r) crossOverlays
      ;
---
 pkgs/top-level/default.nix | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 12329d0af82f..421e0299e2d8 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -79,17 +79,16 @@ let
   inherit (lib) throwIfNot;
 
   checked =
-    throwIfNot (lib.isList overlays) "The overlays argument to nixpkgs must be a list." lib.foldr
-      (x: throwIfNot (lib.isFunction x) "All overlays passed to nixpkgs must be functions.")
-      (r: r)
-      overlays
-      throwIfNot
-      (lib.isList crossOverlays)
-      "The crossOverlays argument to nixpkgs must be a list."
-      lib.foldr
-      (x: throwIfNot (lib.isFunction x) "All crossOverlays passed to nixpkgs must be functions.")
-      (r: r)
-      crossOverlays;
+    (throwIfNot (lib.isList overlays) "The overlays argument to nixpkgs must be a list.")
+      (lib.foldr (
+        x: throwIfNot (lib.isFunction x) "All overlays passed to nixpkgs must be functions."
+      ) lib.id overlays)
+      (throwIfNot (lib.isList crossOverlays) "The crossOverlays argument to nixpkgs must be a list.")
+      (
+        lib.foldr (
+          x: throwIfNot (lib.isFunction x) "All crossOverlays passed to nixpkgs must be functions."
+        ) lib.id crossOverlays
+      );
 
   localSystem = lib.systems.elaborate args.localSystem;
 

From 321006d2d98fb4c8ed73075f5d97650db57af528 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Fri, 24 Oct 2025 07:19:22 +0100
Subject: [PATCH 2233/6226] top-level: simplify `checked` using `lib.all`

---
 pkgs/top-level/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/default.nix b/pkgs/top-level/default.nix
index 421e0299e2d8..ecfef757909e 100644
--- a/pkgs/top-level/default.nix
+++ b/pkgs/top-level/default.nix
@@ -80,14 +80,10 @@ let
 
   checked =
     (throwIfNot (lib.isList overlays) "The overlays argument to nixpkgs must be a list.")
-      (lib.foldr (
-        x: throwIfNot (lib.isFunction x) "All overlays passed to nixpkgs must be functions."
-      ) lib.id overlays)
+      (throwIfNot (lib.all lib.isFunction overlays) "All overlays passed to nixpkgs must be functions.")
       (throwIfNot (lib.isList crossOverlays) "The crossOverlays argument to nixpkgs must be a list.")
       (
-        lib.foldr (
-          x: throwIfNot (lib.isFunction x) "All crossOverlays passed to nixpkgs must be functions."
-        ) lib.id crossOverlays
+        throwIfNot (lib.all lib.isFunction crossOverlays) "All crossOverlays passed to nixpkgs must be functions."
       );
 
   localSystem = lib.systems.elaborate args.localSystem;

From 7f4c029bee948f068d906c45d2dd5a766bd3d5de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 06:33:01 +0000
Subject: [PATCH 2234/6226] gatus: 5.27.0 -> 5.28.0

---
 pkgs/by-name/ga/gatus/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix
index 8a3c18f95d77..468f319a936b 100644
--- a/pkgs/by-name/ga/gatus/package.nix
+++ b/pkgs/by-name/ga/gatus/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "gatus";
-  version = "5.27.0";
+  version = "5.28.0";
 
   src = fetchFromGitHub {
     owner = "TwiN";
     repo = "gatus";
     rev = "v${version}";
-    hash = "sha256-fyubtcmAuH6ayHvfj0bYNrYu1Xs0q7mDO+G9SklWc7o=";
+    hash = "sha256-p60iqMzTch3dX+REaiKuLflIHLunGFI2JWx/TGo30g0=";
   };
 
   vendorHash = "sha256-vvYnNFRpDTaNBX30btvSrwmhimPobio/zAs7zQnZ7b8=";

From 976d0a3714c360381baaafc18626529c8ef3fffd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 06:33:24 +0000
Subject: [PATCH 2235/6226] cloud-nuke: 0.43.0 -> 0.44.0

---
 pkgs/by-name/cl/cloud-nuke/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/cloud-nuke/package.nix b/pkgs/by-name/cl/cloud-nuke/package.nix
index ea1ad5cb8345..4c864981240e 100644
--- a/pkgs/by-name/cl/cloud-nuke/package.nix
+++ b/pkgs/by-name/cl/cloud-nuke/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "cloud-nuke";
-  version = "0.43.0";
+  version = "0.44.0";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = "cloud-nuke";
     tag = "v${version}";
-    hash = "sha256-TDZiX4Ik07Ysz3I7gdEF8SVJnt+EBPlH0RBIaE7+1KQ=";
+    hash = "sha256-6lbEThaszG3yw1HKqtHWKRpcmb7933mAlU1fra+h19c=";
   };
 
   vendorHash = "sha256-Qml8P9m8quUZAarsS7h3TGbcXBCJ2fRD3uyi8Do+lAw=";

From 132f71fa5def5344b0596068b42321efac6747d5 Mon Sep 17 00:00:00 2001
From: Ameer Taweel <ameertaweel2002@gmail.com>
Date: Fri, 24 Oct 2025 09:38:24 +0300
Subject: [PATCH 2236/6226] miniflux: 2.2.13 -> 2.2.14

https://miniflux.app/releases/2.2.14.html
https://github.com/miniflux/v2/releases/tag/2.2.14
diff: https://github.com/miniflux/v2/compare/v2.2.13...2.2.14
---
 nixos/doc/manual/release-notes/rl-2511.section.md | 2 ++
 nixos/modules/services/web-apps/miniflux.nix      | 6 ++++--
 nixos/tests/miniflux.nix                          | 3 ---
 pkgs/by-name/mi/miniflux/package.nix              | 6 +++---
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index fa660adecf23..a4b6c2ac7147 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -317,6 +317,8 @@ and [release notes for v18](https://goteleport.com/docs/changelog/#1800-070325).
 
 - The systemd target `kbrequest.target` is now unset by default, instead of being forcibly symlinked to `rescue.target`. In case you were relying on this behavior (Alt + ArrowUp on the tty causing the current target to be changed to `rescue.target`), you can restore it by setting `systemd.targets.rescue.aliases = [ "kbrequest.target" ];` in your configuration.
 
+- `miniflux` no longer uses the hstore PostgreSQL extension. Having the extension would prevent Miniflux from starting. In case you are managing your `miniflux` PostgreSQL database externally, disable the extension with `DROP EXTENSION IF EXISTS hstore;`.
+
 ## Other Notable Changes {#sec-release-25.11-notable-changes}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix
index e4ffc1677626..dac5f508aa70 100644
--- a/nixos/modules/services/web-apps/miniflux.nix
+++ b/nixos/modules/services/web-apps/miniflux.nix
@@ -20,9 +20,11 @@ let
   boolToInt = b: if b then 1 else 0;
 
   pgbin = "${config.services.postgresql.package}/bin";
+  # The hstore extension is no longer needed as of v2.2.14
+  # and would prevent Miniflux from starting.
   preStart = pkgs.writeScript "miniflux-pre-start" ''
     #!${pkgs.runtimeShell}
-    ${pgbin}/psql "miniflux" -c "CREATE EXTENSION IF NOT EXISTS hstore"
+    ${pgbin}/psql "miniflux" -c "DROP EXTENSION IF EXISTS hstore"
   '';
 in
 
@@ -39,7 +41,7 @@ in
         description = ''
           Whether a PostgreSQL database should be automatically created and
           configured on the local host. If set to `false`, you need provision a
-          database yourself and make sure to create the hstore extension in it.
+          database yourself.
         '';
       };
 
diff --git a/nixos/tests/miniflux.nix b/nixos/tests/miniflux.nix
index 87415eeff7c7..549dd4966439 100644
--- a/nixos/tests/miniflux.nix
+++ b/nixos/tests/miniflux.nix
@@ -80,9 +80,6 @@ in
             host sameuser miniflux samenet scram-sha-256
           '';
         };
-        systemd.services.postgresql-setup.postStart = lib.mkAfter ''
-          psql -tAd miniflux -c 'CREATE EXTENSION hstore;'
-        '';
         networking.firewall.allowedTCPPorts = [ config.services.postgresql.settings.port ];
       };
     externalDb =
diff --git a/pkgs/by-name/mi/miniflux/package.nix b/pkgs/by-name/mi/miniflux/package.nix
index 190b50d5847c..1b44b1b6e6b5 100644
--- a/pkgs/by-name/mi/miniflux/package.nix
+++ b/pkgs/by-name/mi/miniflux/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "miniflux";
-  version = "2.2.13";
+  version = "2.2.14";
 
   src = fetchFromGitHub {
     owner = "miniflux";
     repo = "v2";
     tag = finalAttrs.version;
-    hash = "sha256-u3YnABf+ik7q29JtOSlK+UlInLRq5mMlH7vIDpxOOvk=";
+    hash = "sha256-x6I5PMlQtsjvFtEyoaKKE6if3I0IBIyps4kPQL4c8aw=";
   };
 
-  vendorHash = "sha256-JBT3BUFbPrSpkeZUoGiJJaeiSyXu8y+xcHWPNpxo3cU=";
+  vendorHash = "sha256-X/6YvAhIHSOS3qaoR6/pa2b7EziZzx8B+CbYrJ9/mcM=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From b1a1a6e7d0d79e575fc75d79a945340565f1f31b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 06:47:04 +0000
Subject: [PATCH 2237/6226] gdevelop: 5.5.243 -> 5.5.244

---
 pkgs/by-name/gd/gdevelop/darwin.nix  | 2 +-
 pkgs/by-name/gd/gdevelop/linux.nix   | 2 +-
 pkgs/by-name/gd/gdevelop/package.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gd/gdevelop/darwin.nix b/pkgs/by-name/gd/gdevelop/darwin.nix
index 52f8ec40f443..f97425ccc806 100644
--- a/pkgs/by-name/gd/gdevelop/darwin.nix
+++ b/pkgs/by-name/gd/gdevelop/darwin.nix
@@ -18,7 +18,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}-universal-mac.zip";
-    hash = "sha256-DO6IJbTESDnRtwHw0o+VkjjZiRBSynfPQ179qbNFBO0=";
+    hash = "sha256-rrPRIOnVPC7Moh+ewRbsV81oO7WridpUUoaOnEqm43o=";
   };
 
   sourceRoot = ".";
diff --git a/pkgs/by-name/gd/gdevelop/linux.nix b/pkgs/by-name/gd/gdevelop/linux.nix
index 6a541057c287..89b881330ab0 100644
--- a/pkgs/by-name/gd/gdevelop/linux.nix
+++ b/pkgs/by-name/gd/gdevelop/linux.nix
@@ -13,7 +13,7 @@ let
     if stdenv.hostPlatform.system == "x86_64-linux" then
       fetchurl {
         url = "https://github.com/4ian/GDevelop/releases/download/v${version}/GDevelop-5-${version}.AppImage";
-        hash = "sha256-Tmnl9TagqphoDSMKu0Ny3guJZgEkd8IvdxlmQ+s7378=";
+        hash = "sha256-IfgeeH+vNjIi0adrmXIjjX41qUxIWpoH2eX+Bd7h9AA=";
       }
     else
       throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}";
diff --git a/pkgs/by-name/gd/gdevelop/package.nix b/pkgs/by-name/gd/gdevelop/package.nix
index b6eb2fff6102..bf42256f33ff 100644
--- a/pkgs/by-name/gd/gdevelop/package.nix
+++ b/pkgs/by-name/gd/gdevelop/package.nix
@@ -4,7 +4,7 @@
   callPackage,
 }:
 let
-  version = "5.5.243";
+  version = "5.5.244";
   pname = "gdevelop";
   meta = {
     description = "Graphical Game Development Studio";

From d4dc6d74c7ec4adaf7e0429400656c371d24f688 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 07:22:48 +0000
Subject: [PATCH 2238/6226] k0sctl: 0.26.0 -> 0.27.0

---
 pkgs/by-name/k0/k0sctl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/k0/k0sctl/package.nix b/pkgs/by-name/k0/k0sctl/package.nix
index 89a56eaa52e5..abd4e8659bcf 100644
--- a/pkgs/by-name/k0/k0sctl/package.nix
+++ b/pkgs/by-name/k0/k0sctl/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "k0sctl";
-  version = "0.26.0";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "k0sproject";
     repo = "k0sctl";
     tag = "v${version}";
-    hash = "sha256-N6fXTjZaI+T3rRKDf9yK8KioGjeOaPvyTJi7BFUKi6Q=";
+    hash = "sha256-4Oo5WYDlnZmrjYq5sA3IhkxXZV1eNOAbydMeZpL2Pa4=";
   };
 
   vendorHash = "sha256-Tzs7PYOulszUFK4PLHPzxxmkpHVo2+h/hG83aHG8Bm0=";

From b3d1d35293f260d2342f63e4e049d738e99f42ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 07:44:36 +0000
Subject: [PATCH 2239/6226] gtree: 1.11.8 -> 1.11.9

---
 pkgs/by-name/gt/gtree/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gt/gtree/package.nix b/pkgs/by-name/gt/gtree/package.nix
index e8c30a0a0c39..68adfa1cfd64 100644
--- a/pkgs/by-name/gt/gtree/package.nix
+++ b/pkgs/by-name/gt/gtree/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "gtree";
-  version = "1.11.8";
+  version = "1.11.9";
 
   src = fetchFromGitHub {
     owner = "ddddddO";
     repo = "gtree";
     rev = "v${version}";
-    hash = "sha256-IBsfE0Y/LzXIaQdbXv1ZOslwj2U5fAhYIo67BixwDMY=";
+    hash = "sha256-JLYHFSlT6mSkBmpOD9ls80uC0lGaCYmcLeRaUc+NqjE=";
   };
 
-  vendorHash = "sha256-jGFEKwe0eglsj3U2jdlfMKYsMvwSu/z0EX+heCKQP0c=";
+  vendorHash = "sha256-vgwop6QaYsUp65WHxQeZd141Hz4z/pgIvZAJFx3Zztg=";
 
   subPackages = [
     "cmd/gtree"

From a4b5a1e55040ba4e587981a7e84d4ac1e1e09642 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 24 Oct 2025 11:08:31 +0300
Subject: [PATCH 2240/6226] zbar: add qtwayland for users with
 QT_QPA_PLATFORM=wayland

---
 pkgs/tools/graphics/zbar/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index 08cf27e3f0a0..8d77795366a2 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -9,6 +9,7 @@
   libX11,
   libv4l,
   qtbase,
+  qtwayland,
   qtx11extras,
   wrapQtAppsHook,
   wrapGAppsHook3,
@@ -92,6 +93,7 @@ stdenv.mkDerivation rec {
     libv4l
     gtk3
     qtbase
+    qtwayland
     qtx11extras
   ];
 

From eab0304b9d714fa84fdf857053be066a92b0aa05 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 08:24:33 +0000
Subject: [PATCH 2241/6226] terraform-mcp-server: 0.3.1 -> 0.3.2

---
 pkgs/by-name/te/terraform-mcp-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/terraform-mcp-server/package.nix b/pkgs/by-name/te/terraform-mcp-server/package.nix
index 15dcbd4326f3..904523ee8470 100644
--- a/pkgs/by-name/te/terraform-mcp-server/package.nix
+++ b/pkgs/by-name/te/terraform-mcp-server/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "terraform-mcp-server";
-  version = "0.3.1";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "hashicorp";
     repo = "terraform-mcp-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ck2bwlonkcnZ6DoiVIupjefBRGKLROzfUY+PjkW1yE4=";
+    hash = "sha256-FcjeEp+uwlfezGlmBd2nSTdfnXuPnSDTxTPlP6CtcrE=";
   };
 
-  vendorHash = "sha256-bWh2ttw6q5+iOSskqxRG4UisoROlx87PTrvXfYYuzng=";
+  vendorHash = "sha256-ObNuenbCmmbkRPKUmdMg+ERfUV+RiS2OEOneJOmteZU=";
 
   ldflags = [
     "-X main.version=${finalAttrs.version}"

From 178044c6dfc6fc376682894e97e614df7f157f68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 08:26:14 +0000
Subject: [PATCH 2242/6226] mongodb-ce: 8.0.14 -> 8.0.15

---
 pkgs/by-name/mo/mongodb-ce/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix
index 2cf0fd98afa8..aaa611dffaf6 100644
--- a/pkgs/by-name/mo/mongodb-ce/package.nix
+++ b/pkgs/by-name/mo/mongodb-ce/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mongodb-ce";
-  version = "8.0.14";
+  version = "8.0.15";
 
   src =
     finalAttrs.passthru.sources.${stdenv.hostPlatform.system}
@@ -54,19 +54,19 @@ stdenv.mkDerivation (finalAttrs: {
     sources = {
       "x86_64-linux" = fetchurl {
         url = "https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2404-${finalAttrs.version}.tgz";
-        hash = "sha256-nmqDMu8O3bUveGnUNjISs8o3mVX9cNgIQNG3+m9ctUs=";
+        hash = "sha256-hHlTsXbzDBhesK6hrGV27zXBBd7uEFlt/5QDJFn5aFA=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-ubuntu2404-${finalAttrs.version}.tgz";
-        hash = "sha256-Os4aK+r5SBzgtkRz81FcRywTgs5gKzGTOZfb/Z8H2ns=";
+        hash = "sha256-th67W8GA62AcKlASxafYBZLM2j+kZGuk4N706nXQKQ0=";
       };
       "x86_64-darwin" = fetchurl {
         url = "https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${finalAttrs.version}.tgz";
-        hash = "sha256-x4pFuAFgp+7n/knezCwjasXh4c338kXdjA7L259bRKw=";
+        hash = "sha256-MBNmctpSZjHZyYkUyt6q/uGmSGRdRD+7GHrh/Aj+bmA=";
       };
       "aarch64-darwin" = fetchurl {
         url = "https://fastdl.mongodb.org/osx/mongodb-macos-arm64-${finalAttrs.version}.tgz";
-        hash = "sha256-apcmzl8HIWaP8I3OjTX2Vzcwx5ruztqPFDzoLf8Fn14=";
+        hash = "sha256-3yXoOMD6S90XErUWCctCMV5aulljrvXsVGEUBvHmk5w=";
       };
     };
     updateScript =

From b98e4f535c82b3fec1052a812fedabbdfd14cb54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 08:30:14 +0000
Subject: [PATCH 2243/6226] python3Packages.metaflow: 2.18.12 -> 2.19.0

---
 pkgs/development/python-modules/metaflow/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/metaflow/default.nix b/pkgs/development/python-modules/metaflow/default.nix
index e5a5ef10b41e..fa6892b17517 100644
--- a/pkgs/development/python-modules/metaflow/default.nix
+++ b/pkgs/development/python-modules/metaflow/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "metaflow";
-  version = "2.18.12";
+  version = "2.19.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Netflix";
     repo = "metaflow";
     tag = version;
-    hash = "sha256-GHalg2jH8MGJySS2kMyLW04my8d+DTJmiFmexeqJUnY=";
+    hash = "sha256-MMPkQ1cjl/Sid4RyvP04xIDb6Xtr5S+LdJTOYgo0LFQ=";
   };
 
   build-system = [

From 61dc356440e01984798de80b32db047c93bfd25d Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 24 Oct 2025 10:37:50 +0200
Subject: [PATCH 2244/6226] glm: Add patch to fix on big-endian, mark broken on
 non-Linux big-endian

---
 .../gl/glm/1001-glm-Fix-packing-on-BE.patch   | 181 ++++++++++++++++++
 pkgs/by-name/gl/glm/package.nix               |   9 +
 2 files changed, 190 insertions(+)
 create mode 100644 pkgs/by-name/gl/glm/1001-glm-Fix-packing-on-BE.patch

diff --git a/pkgs/by-name/gl/glm/1001-glm-Fix-packing-on-BE.patch b/pkgs/by-name/gl/glm/1001-glm-Fix-packing-on-BE.patch
new file mode 100644
index 000000000000..d4dafa87be08
--- /dev/null
+++ b/pkgs/by-name/gl/glm/1001-glm-Fix-packing-on-BE.patch
@@ -0,0 +1,181 @@
+From 06ce42e72324b32b1f4c37c646e99950c2bd5f6b Mon Sep 17 00:00:00 2001
+From: Max Rees <maxcrees@me.com>
+Date: Sun, 15 Mar 2020 15:13:27 -0400
+Subject: [PATCH] Fix test suite on big endian platforms
+
+---
+ glm/gtc/packing.inl      | 55 ++++++++++++++++++++++++++++++++++++++++
+ test/gtc/gtc_packing.cpp |  3 ++-
+ 2 files changed, 57 insertions(+), 1 deletion(-)
+
+diff --git a/glm/gtc/packing.inl b/glm/gtc/packing.inl
+index 8c906e16c1..b1c99a5076 100644
+--- a/glm/gtc/packing.inl
++++ b/glm/gtc/packing.inl
+@@ -9,6 +9,9 @@
+ #include "../detail/type_half.hpp"
+ #include <cstring>
+ #include <limits>
++extern "C" {
++#include <endian.h>
++}
+ 
+ namespace glm{
+ namespace detail
+@@ -183,9 +186,15 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 3;
+ 			uint y : 3;
+ 			uint z : 2;
++#else
++			uint z : 2;
++			uint y : 3;
++			uint x : 3;
++#endif
+ 		} data;
+ 		uint8 pack;
+ 	};
+@@ -194,8 +203,13 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 4;
+ 			uint y : 4;
++#else
++			uint y : 4;
++			uint x : 4;
++#endif
+ 		} data;
+ 		uint8 pack;
+ 	};
+@@ -204,10 +218,17 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 4;
+ 			uint y : 4;
+ 			uint z : 4;
+ 			uint w : 4;
++#else
++			uint w : 4;
++			uint z : 4;
++			uint y : 4;
++			uint x : 4;
++#endif
+ 		} data;
+ 		uint16 pack;
+ 	};
+@@ -216,9 +237,15 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 5;
+ 			uint y : 6;
+ 			uint z : 5;
++#else
++			uint z : 5;
++			uint y : 6;
++			uint x : 5;
++#endif
+ 		} data;
+ 		uint16 pack;
+ 	};
+@@ -227,10 +254,17 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 5;
+ 			uint y : 5;
+ 			uint z : 5;
+ 			uint w : 1;
++#else
++			uint w : 1;
++			uint z : 5;
++			uint y : 5;
++			uint x : 5;
++#endif
+ 		} data;
+ 		uint16 pack;
+ 	};
+@@ -239,10 +273,17 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 10;
+ 			uint y : 10;
+ 			uint z : 10;
+ 			uint w : 2;
++#else
++			uint w : 2;
++			uint z : 10;
++			uint y : 10;
++			uint x : 10;
++#endif
+ 		} data;
+ 		uint32 pack;
+ 	};
+@@ -251,10 +292,17 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			int x : 10;
+ 			int y : 10;
+ 			int z : 10;
+ 			int w : 2;
++#else
++			int w : 2;
++			int z : 10;
++			int y : 10;
++			int x : 10;
++#endif
+ 		} data;
+ 		uint32 pack;
+ 	};
+@@ -263,10 +311,17 @@ namespace detail
+ 	{
+ 		struct
+ 		{
++#if BYTE_ORDER == LITTLE_ENDIAN
+ 			uint x : 9;
+ 			uint y : 9;
+ 			uint z : 9;
+ 			uint w : 5;
++#else
++			uint w : 5;
++			uint z : 9;
++			uint y : 9;
++			uint x : 9;
++#endif
+ 		} data;
+ 		uint32 pack;
+ 	};
+diff --git a/test/gtc/gtc_packing.cpp b/test/gtc/gtc_packing.cpp
+index df5b3bb1a9..fbaaa5bccd 100644
+--- a/test/gtc/gtc_packing.cpp
++++ b/test/gtc/gtc_packing.cpp
+@@ -4,6 +4,7 @@
+ #include <glm/ext/vector_relational.hpp>
+ #include <cstdio>
+ #include <vector>
++#include <arpa/inet.h>
+ 
+ void print_bits(float const& s)
+ {
+@@ -156,7 +157,7 @@ int test_U3x10_1x2()
+ 
+ 	glm::u8vec4 const v0(0xff, 0x77, 0x0, 0x33);
+ 	glm::uint32 const p0 = *reinterpret_cast<glm::uint32 const*>(&v0[0]);
+-	glm::uint32 const r0 = 0x330077ff;
++	glm::uint32 const r0 = htonl(0xff770033);
+ 
+ 	Error += p0 == r0 ? 0 : 1;
+ 
diff --git a/pkgs/by-name/gl/glm/package.nix b/pkgs/by-name/gl/glm/package.nix
index d9daa49d4f4c..f5dd16d62101 100644
--- a/pkgs/by-name/gl/glm/package.nix
+++ b/pkgs/by-name/gl/glm/package.nix
@@ -21,6 +21,12 @@ stdenv.mkDerivation rec {
     "doc"
   ];
 
+  patches = lib.optionals stdenv.hostPlatform.isLinux [
+    # Remove when https://github.com/g-truc/glm/pull/1001 merged & in release.
+    # Relies on <endian.h>, Linux-specific
+    ./1001-glm-Fix-packing-on-BE.patch
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   env.NIX_CFLAGS_COMPILE =
@@ -62,6 +68,9 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/g-truc/glm";
     license = licenses.mit;
     platforms = platforms.unix;
+    # https://github.com/g-truc/glm/issues/897 indicates that packing isn't implemented properly on non-LE.
+    # Patch from https://github.com/g-truc/glm/pull/1001 currently relies on Linux-only header.
+    broken = !stdenv.hostPlatform.isLittleEndian && !stdenv.hostPlatform.isLinux;
     maintainers = with maintainers; [ smancill ];
   };
 }

From b3d75f7b455ec22a1280d18189f120c40ecd5cd9 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <sergei@zimmerman.foo>
Date: Thu, 9 Oct 2025 22:21:33 +0300
Subject: [PATCH 2245/6226] ci/pinned: update

This gives us Nix 2.32 for use in CI's Eval job and nixfmt 1.1.0.

From the nixpkgs-unstable channel:
https://hydra.nixos.org/build/311062898#tabs-buildinputs

Changes for treefmt-nix:
https://github.com/numtide/treefmt-nix/compare/5eda4ee8121f97b218f7cc73f5172098d458f1d1...f56b1934f5f8fcab8deb5d38d42fd692632b47c2

Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
---
 ci/pinned.json                                | 12 ++++++------
 nixos/tests/k3s/auto-deploy-charts.nix        | 19 ++++++++++---------
 .../misc/openmodelica/omlibrary/fakegit.nix   |  6 +++---
 pkgs/by-name/te/textadept/package.nix         |  6 +++---
 4 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/ci/pinned.json b/ci/pinned.json
index 4d5456837b2c..4451869289fd 100644
--- a/ci/pinned.json
+++ b/ci/pinned.json
@@ -9,9 +9,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "e57b3b16ad8758fd681511a078f35c416a8cc939",
-      "url": "https://github.com/NixOS/nixpkgs/archive/e57b3b16ad8758fd681511a078f35c416a8cc939.tar.gz",
-      "hash": "04zp6jjd4xr6jfps84p8yh5ym5962mii4825fn75lqk14sz4rq56"
+      "revision": "d5faa84122bc0a1fd5d378492efce4e289f8eac1",
+      "url": "https://github.com/NixOS/nixpkgs/archive/d5faa84122bc0a1fd5d378492efce4e289f8eac1.tar.gz",
+      "hash": "0r2pkx7m1pb0fzfhb74jkr8y5qhs2b93sak5bd5rabvbm2zn36zs"
     },
     "treefmt-nix": {
       "type": "Git",
@@ -22,9 +22,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "5eda4ee8121f97b218f7cc73f5172098d458f1d1",
-      "url": "https://github.com/numtide/treefmt-nix/archive/5eda4ee8121f97b218f7cc73f5172098d458f1d1.tar.gz",
-      "hash": "1vqns9hjhmbnhdq2xvcmdxng11jrmcn9lpk2ncfh1f969z9lj8y9"
+      "revision": "f56b1934f5f8fcab8deb5d38d42fd692632b47c2",
+      "url": "https://github.com/numtide/treefmt-nix/archive/f56b1934f5f8fcab8deb5d38d42fd692632b47c2.tar.gz",
+      "hash": "1klcfmqb4q4vvy9kdm5i9ddl26rhlyhf1mrd5aw1d4529bqnq5b5"
     }
   },
   "version": 5
diff --git a/nixos/tests/k3s/auto-deploy-charts.nix b/nixos/tests/k3s/auto-deploy-charts.nix
index 827640b02fd4..18339e201482 100644
--- a/nixos/tests/k3s/auto-deploy-charts.nix
+++ b/nixos/tests/k3s/auto-deploy-charts.nix
@@ -82,15 +82,16 @@ import ../make-test-python.nix (
             values-file = testChart // {
               # Remove unsafeDiscardStringContext workaround when Nix can convert a string to a path
               # https://github.com/NixOS/nix/issues/12407
-              values = /.
-              + builtins.unsafeDiscardStringContext (
-                builtins.toFile "k3s-test-chart-values.yaml" ''
-                  runCommand: "echo 'Hello, file!'"
-                  image:
-                    repository: test.local/test
-                    tag: local
-                ''
-              );
+              values =
+                /.
+                + builtins.unsafeDiscardStringContext (
+                  builtins.toFile "k3s-test-chart-values.yaml" ''
+                    runCommand: "echo 'Hello, file!'"
+                    image:
+                      repository: test.local/test
+                      tag: local
+                  ''
+                );
             };
             # advanced chart that should get installed in the "test" namespace with a custom
             # timeout and overridden values
diff --git a/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix b/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix
index b0509a8e97a9..6ad49d7655ba 100644
--- a/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix
+++ b/pkgs/applications/science/misc/openmodelica/omlibrary/fakegit.nix
@@ -29,9 +29,9 @@ stdenv.mkDerivation {
 
   buildCommand = ''
     mkdir -pv $out/repos
-    ${lib.concatMapStrings (
-      r: "cp -r ${fetchgit r} $out/repos/${hashname r}\n"
-    ) (import ./src-libs.nix)}
+    ${lib.concatMapStrings (r: "cp -r ${fetchgit r} $out/repos/${hashname r}\n") (
+      import ./src-libs.nix
+    )}
 
     ${mkscript "$out/bin/checkout-git.sh" ''
       if test "$#" -ne 4; then
diff --git a/pkgs/by-name/te/textadept/package.nix b/pkgs/by-name/te/textadept/package.nix
index 92f2175245c9..18f4fb1a6bf7 100644
--- a/pkgs/by-name/te/textadept/package.nix
+++ b/pkgs/by-name/te/textadept/package.nix
@@ -36,9 +36,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   ''
   + lib.concatStringsSep "\n" (
-    lib.mapAttrsToList (
-      name: params: "ln -s ${fetchurl params} $PWD/build/_deps/${name}"
-    ) (import ./deps.nix)
+    lib.mapAttrsToList (name: params: "ln -s ${fetchurl params} $PWD/build/_deps/${name}") (
+      import ./deps.nix
+    )
   );
 
   meta = {

From b8bf170aa9119754a9e284e50644dde8cccc5390 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Fri, 24 Oct 2025 10:41:41 +0200
Subject: [PATCH 2246/6226] ocamlPackages.dockerfile: 8.3.2 -> 8.3.3

---
 .../development/ocaml-modules/dockerfile/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/dockerfile/default.nix b/pkgs/development/ocaml-modules/dockerfile/default.nix
index f052e9be0e40..7b738a49adfd 100644
--- a/pkgs/development/ocaml-modules/dockerfile/default.nix
+++ b/pkgs/development/ocaml-modules/dockerfile/default.nix
@@ -8,15 +8,15 @@
   alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "dockerfile";
-  version = "8.3.2";
+  version = "8.3.3";
 
   src = fetchFromGitHub {
     owner = "ocurrent";
     repo = "ocaml-dockerfile";
-    tag = version;
-    hash = "sha256-L4TjCf8SaNMxqkrr+AoL/Lx2oWgf2owJFs26lu68ejs=";
+    tag = finalAttrs.version;
+    hash = "sha256-F58KnC4YpsS0ehmi6efFMT+WG5BDuYfQOA1RsFVtO/8=";
   };
 
   propagatedBuildInputs = [
@@ -35,8 +35,8 @@ buildDunePackage rec {
     description = "Interface for creating Dockerfiles";
     homepage = "https://www.ocurrent.org/ocaml-dockerfile/dockerfile/Dockerfile/index.html";
     downloadPage = "https://github.com/ocurrent/ocaml-dockerfile";
-    changelog = "https://github.com/ocurrent/ocaml-dockerfile/blob/v${version}/CHANGES.md";
+    changelog = "https://github.com/ocurrent/ocaml-dockerfile/blob/${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.ethancedwards8 ];
   };
-}
+})

From e9c0f4d15df6dce7906ef13a82256525a5a6266f Mon Sep 17 00:00:00 2001
From: Thore Sommer <thore.sommer@tum.de>
Date: Fri, 24 Oct 2025 10:47:28 +0200
Subject: [PATCH 2247/6226] intel-ipsec-mb: add package for 2.0.1

---
 pkgs/by-name/in/intel-ipsec-mb/package.nix | 41 ++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pkgs/by-name/in/intel-ipsec-mb/package.nix

diff --git a/pkgs/by-name/in/intel-ipsec-mb/package.nix b/pkgs/by-name/in/intel-ipsec-mb/package.nix
new file mode 100644
index 000000000000..b7a503daca89
--- /dev/null
+++ b/pkgs/by-name/in/intel-ipsec-mb/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nasm,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "intel-ipsec-mb";
+  version = "2.0.1";
+
+  src = fetchFromGitHub {
+    owner = "intel";
+    repo = "intel-ipsec-mb";
+    rev = "v${version}";
+    hash = "sha256-k/NoPMKbiWZ25tdomsPpv2gfhQuBHxzX6KRT1UY88Ko=";
+  };
+
+  sourceRoot = "source/lib";
+
+  nativeBuildInputs = [ nasm ];
+
+  makeFlags = [
+    "PREFIX=$(out)"
+    "NOLDCONFIG=y"
+  ];
+
+  meta = with lib; {
+    description = "Intel Multi-Buffer Crypto for IPsec Library";
+    longDescription = ''
+      Intel Multi-Buffer Crypto for IPsec Library provides software crypto
+      acceleration primarily targeting packet processing applications.
+      It supports a variety of use cases including IPsec, TLS, wireless (RAN), cable,
+      and MPEG DRM.
+    '';
+    homepage = "https://github.com/intel/intel-ipsec-mb";
+    license = licenses.bsd3;
+    platforms = [ "x86_64-linux" ];
+    maintainers = [ ];
+  };
+}

From 4fd550b3eabd0fce718dc90e2d9a526662df762b Mon Sep 17 00:00:00 2001
From: Thore Sommer <thore.sommer@tum.de>
Date: Fri, 24 Oct 2025 10:47:55 +0200
Subject: [PATCH 2248/6226] dpdk: add intel-ipsec-mb as dependency

intel-ipsec-mb for some of the cryptodev features
---
 pkgs/by-name/dp/dpdk/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/dp/dpdk/package.nix b/pkgs/by-name/dp/dpdk/package.nix
index 502a87814de9..74c2b4a34cd1 100644
--- a/pkgs/by-name/dp/dpdk/package.nix
+++ b/pkgs/by-name/dp/dpdk/package.nix
@@ -11,6 +11,7 @@
   libbpf,
   zlib,
   elfutils,
+  intel-ipsec-mb,
   jansson,
   openssl,
   libpcap,
@@ -54,6 +55,7 @@ stdenv.mkDerivation rec {
     jansson
     libbpf
     elfutils
+    intel-ipsec-mb
     libpcap
     numactl
     openssl.dev

From 2b52c7060621c64c4996933b9a8ace2cd09af5f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 08:49:44 +0000
Subject: [PATCH 2249/6226] xremap: 0.14.1 -> 0.14.2

---
 pkgs/by-name/xr/xremap/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/xr/xremap/package.nix b/pkgs/by-name/xr/xremap/package.nix
index f0187e972ffd..f5573c08cc7b 100644
--- a/pkgs/by-name/xr/xremap/package.nix
+++ b/pkgs/by-name/xr/xremap/package.nix
@@ -6,16 +6,16 @@
 }:
 let
   pname = "xremap";
-  version = "0.14.1";
+  version = "0.14.2";
 
   src = fetchFromGitHub {
     owner = "xremap";
     repo = "xremap";
     tag = "v${version}";
-    hash = "sha256-80Fzf5hnRBWx0NxV1z8majc7JbDNj0DZSRNkbPvI7Ck=";
+    hash = "sha256-5BHet5kKpmJFpjga7QZoLPydtzs5iPX5glxP4YvsYx0=";
   };
 
-  cargoHash = "sha256-T/UMNRPGpXjrSqq+cNVtCckYRQbJJAF5tUwWnrIjj8M=";
+  cargoHash = "sha256-NZNLO+wmzEdIZPp5Zu81m/ux8Au+8EMq31QpuZN9l5w=";
 
   buildXremap =
     {

From f031ffe4aed92d483775b5a49825ffbfc2b6b6e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 08:51:01 +0000
Subject: [PATCH 2250/6226] libretro.bluemsx: 0-unstable-2025-09-27 ->
 0-unstable-2025-10-24

---
 pkgs/applications/emulators/libretro/cores/bluemsx.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/bluemsx.nix b/pkgs/applications/emulators/libretro/cores/bluemsx.nix
index 21d55863beb9..39b99eb8e1de 100644
--- a/pkgs/applications/emulators/libretro/cores/bluemsx.nix
+++ b/pkgs/applications/emulators/libretro/cores/bluemsx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "bluemsx";
-  version = "0-unstable-2025-09-27";
+  version = "0-unstable-2025-10-24";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "bluemsx-libretro";
-    rev = "7074551cf50ebdae78c8cce4e77560f9fc4575ca";
-    hash = "sha256-kmG0LCvWG+4wM+hwZ8TYQid12nZuQpNbaljym+glbz4=";
+    rev = "3a2855e30c7f39a41064ca36264e9bf9f6170f8e";
+    hash = "sha256-k0j15MqmgaTrUc/FoZHuIyALCnMJXeSkx4dfnfrfG5o=";
   };
 
   meta = {

From e4a151636821584465d884e163a47ade605d246f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 08:54:05 +0000
Subject: [PATCH 2251/6226] google-cloud-sql-proxy: 2.18.2 -> 2.18.3

---
 pkgs/by-name/go/google-cloud-sql-proxy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
index 43ffc3eda1fa..8fd3e16d27c3 100644
--- a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
+++ b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule rec {
   pname = "google-cloud-sql-proxy";
-  version = "2.18.2";
+  version = "2.18.3";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "cloud-sql-proxy";
     rev = "v${version}";
-    hash = "sha256-c37/364fAm4FR3TQ55zKRUVWr2rr7SZUMRlTJKEIc8c=";
+    hash = "sha256-Lwg6p7qVFMH3rXxGT6lc5My9WovhpDzb4S5b/4ECcgg=";
   };
 
   subPackages = [ "." ];
 
-  vendorHash = "sha256-nrrf7+6uaKHvrJg8mrqjbyJxDjZhO4KKPd9+nIX+8A0=";
+  vendorHash = "sha256-gZFzRUy/OWNppFAi+1fAHNBYZgmDgjKUc9kyCSWF58g=";
 
   checkFlags = [
     "-short"

From 599f19fc5c23c3ecf090f5bd34cdd3e6850c5bd1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 08:56:48 +0000
Subject: [PATCH 2252/6226] python3Packages.opower: 0.15.7 -> 0.15.8

---
 pkgs/development/python-modules/opower/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix
index cd4514db013c..31cf3259a85c 100644
--- a/pkgs/development/python-modules/opower/default.nix
+++ b/pkgs/development/python-modules/opower/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "opower";
-  version = "0.15.7";
+  version = "0.15.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tronikos";
     repo = "opower";
     tag = "v${version}";
-    hash = "sha256-NB3Hoieykkcf+EHjW77aOUdbJj5fSUTmJ5EPGlp4LXw=";
+    hash = "sha256-JauglgXrzfznyst0UdG8KyAXyzjnUkK7TJVdGhp0PVk=";
   };
 
   build-system = [ setuptools ];

From f8b6ec93b208690205463a49626338b4887faa87 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 09:07:51 +0000
Subject: [PATCH 2253/6226] python3Packages.slixmpp: 1.11.0 -> 1.12.0

---
 pkgs/development/python-modules/slixmpp/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix
index f297951a08b1..eebd1e6dabc9 100644
--- a/pkgs/development/python-modules/slixmpp/default.nix
+++ b/pkgs/development/python-modules/slixmpp/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "slixmpp";
-  version = "1.11.0";
+  version = "1.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hQxfOxlkpQdCWlGSdotZY6eHkJr6M3xkkRv4bR0urPM=";
+    hash = "sha256-dGn23K9XQv1i4OZu5EfFM4p0UgwZgqcHhOe3kN7y/dU=";
   };
 
   patches = [
@@ -41,7 +41,7 @@ buildPythonPackage rec {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname src;
-    hash = "sha256-z0X9s36n1p31boxoe6Er0Ieirinaehoucsi89oDAS0c=";
+    hash = "sha256-eKXQeZ2RLHsTZmYszws4fCHgeiSO9wsrRbPkVV1gqZY=";
   };
 
   dependencies = [

From 19b93bd09ea2221f7b4893e5ac857634add7f129 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Fri, 24 Oct 2025 11:11:43 +0200
Subject: [PATCH 2254/6226] ocamlPackages.mirage-ptime: 5.1.0 -> 5.2.0

---
 pkgs/development/ocaml-modules/mirage-ptime/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/mirage-ptime/default.nix b/pkgs/development/ocaml-modules/mirage-ptime/default.nix
index 8d981684899a..fddd9a832657 100644
--- a/pkgs/development/ocaml-modules/mirage-ptime/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-ptime/default.nix
@@ -3,7 +3,7 @@
   buildDunePackage,
   fetchurl,
   ptime,
-  version ? "5.1.0",
+  version ? "5.2.0",
 }:
 
 buildDunePackage {
@@ -13,7 +13,7 @@ buildDunePackage {
 
   src = fetchurl {
     url = "https://github.com/mirage/mirage-ptime/releases/download/v${version}/mirage-ptime-${version}.tbz";
-    hash = "sha256-6bPbMTZeGolRMMN4nmrc+ZZ3HqjnAWtj4V7L4fOKKfY=";
+    hash = "sha256-YOWpJrfQKG9khCwPb5lZXtf+fip4N0B1AAn2Y9zRLyg=";
   };
 
   propagatedBuildInputs = [ ptime ];

From becc6875057f374b92df86f5c1372f7a9e69f6ee Mon Sep 17 00:00:00 2001
From: linsui <36977733+linsui@users.noreply.github.com>
Date: Fri, 24 Oct 2025 17:15:51 +0800
Subject: [PATCH 2255/6226] jami: fix build with Qt 6.10

---
 pkgs/by-name/ja/jami/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ja/jami/package.nix b/pkgs/by-name/ja/jami/package.nix
index d3505139e1ac..2debaf3a2ac5 100644
--- a/pkgs/by-name/ja/jami/package.nix
+++ b/pkgs/by-name/ja/jami/package.nix
@@ -229,8 +229,8 @@ stdenv.mkDerivation rec {
   qwindowkit-src = fetchFromGitHub {
     owner = "stdware";
     repo = "qwindowkit";
-    rev = "758b00cb6c2d924be3a1ea137ec366dc33a5132d";
-    hash = "sha256-qpVsF4gUX2noG9nKgjNP7FCEe59okZtDA8R/aZOef7Q=";
+    rev = "0131d673092ab18afd69fac84f4a17ad2ba615f2";
+    hash = "sha256-jajgLOj0h/byt3+fSbCpV3VPUoHxijUsKw/0BOwbXTw=";
     fetchSubmodules = true;
   };
 
@@ -239,6 +239,7 @@ stdenv.mkDerivation rec {
     cp -R --no-preserve=mode,ownership ${qwindowkit-src} qwindowkit
     substituteInPlace CMakeLists.txt \
       --replace-fail 'add_subdirectory(3rdparty/zxing-cpp EXCLUDE_FROM_ALL)' 'find_package(ZXing)'
+    sed -i -e '/pkg_check_modules/i FIND_PACKAGE(PkgConfig REQUIRED)' src/libclient/CMakeLists.txt
   '';
 
   preConfigure = ''

From f04ab690484f926070423431e1bb5b1a63ad96b2 Mon Sep 17 00:00:00 2001
From: benaryorg <binary@benary.org>
Date: Fri, 24 Oct 2025 09:23:46 +0000
Subject: [PATCH 2256/6226] pkgs/ceph: self-contained package

Moving all of the custom dependency magic into the package allows us to move it to the by-name hierarchy a lot easier.

This however also means breaking any overrides used downstream for the affected dependencies:

- fmt
- lua
- arrow-cpp

The last one is now also exposed via passthru for overriding purposes.
All expressions evaluate to the same values though.

Signed-off-by: benaryorg <binary@benary.org>
---
 pkgs/tools/filesystems/ceph/default.nix | 21 ++++++++++++++-------
 pkgs/top-level/all-packages.nix         | 17 +----------------
 2 files changed, 15 insertions(+), 23 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 5e8bc57366ed..1aea3ea3b5ff 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -6,13 +6,19 @@
   fetchFromGitHub,
   fetchPypi,
   fetchpatch2,
+  callPackage,
 
   # Build time
   autoconf,
   automake,
   cmake,
   ensureNewerSourcesHook,
-  fmt,
+  # To see which `fmt` version Ceph upstream recommends, check its `src/fmt` submodule.
+  #
+  # Ceph does not currently build with `fmt_10`; see https://github.com/NixOS/nixpkgs/issues/281027#issuecomment-1899128557
+  # If we want to switch for that before upstream fixes it, use this patch:
+  # https://github.com/NixOS/nixpkgs/pull/281858#issuecomment-1899648638
+  fmt_9,
   git,
   libtool,
   makeWrapper,
@@ -25,7 +31,7 @@
   nixosTests,
 
   # Runtime dependencies
-  arrow-cpp,
+  ceph-arrow-cpp ? callPackage ./arrow-cpp-19.nix { },
   babeltrace,
   # Note when trying to upgrade boost:
   # * When upgrading Ceph, it's recommended to check which boost version Ceph uses on Fedora,
@@ -55,7 +61,8 @@
   libxml2,
   lmdb,
   lttng-ust,
-  lua,
+  # Ceph currently requires >= 5.3
+  lua5_4,
   lvm2,
   lz4,
   oath-toolkit,
@@ -105,7 +112,6 @@
   libxfs ? null,
   liburing ? null,
   zfs ? null,
-  ...
 }:
 
 # We must have one crypto library
@@ -398,7 +404,7 @@ rec {
       autoconf # `autoreconf` is called, e.g. for `qatlib_ext`
       automake # `aclocal` is called, e.g. for `qatlib_ext`
       cmake
-      fmt
+      fmt_9
       git
       makeWrapper
       libtool # used e.g. for `qatlib_ext`
@@ -417,7 +423,7 @@ rec {
     buildInputs =
       cryptoLibsMap.${cryptoStr}
       ++ [
-        arrow-cpp
+        ceph-arrow-cpp
         babeltrace
         boost'
         bzip2
@@ -437,7 +443,7 @@ rec {
         libxml2
         lmdb
         lttng-ust
-        lua
+        lua5_4
         lvm2 # according to `debian/control` file, e.g. `pvs` command used by `src/ceph-volume/ceph_volume/api/lvm.py`
         lz4
         malloc
@@ -594,6 +600,7 @@ rec {
     passthru = {
       inherit version;
       inherit python; # to be able to test our overridden packages above individually with `nix-build -A`
+      arrow-cpp = ceph-arrow-cpp;
       tests = {
         inherit (nixosTests)
           ceph-multi-node
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e885b3756794..6409aa7e6003 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2346,22 +2346,7 @@ with pkgs;
   cemu-ti = qt5.callPackage ../applications/science/math/cemu-ti { };
 
   libceph = ceph.lib;
-  inherit
-    (callPackages ../tools/filesystems/ceph {
-      lua = lua5_4; # Ceph currently requires >= 5.3
-
-      # To see which `fmt` version Ceph upstream recommends, check its `src/fmt` submodule.
-      #
-      # Ceph does not currently build with `fmt_11`; see https://github.com/NixOS/nixpkgs/issues/281027#issuecomment-1899128557
-      # If we want to switch for that before upstream fixes it, use this patch:
-      # https://github.com/NixOS/nixpkgs/pull/281858#issuecomment-1899648638
-      fmt = fmt_9;
-
-      # Remove once Ceph supports arrow-cpp >= 20, see:
-      # * https://tracker.ceph.com/issues/71269
-      # * https://github.com/NixOS/nixpkgs/issues/406306
-      arrow-cpp = callPackage ../tools/filesystems/ceph/arrow-cpp-19.nix { };
-    })
+  inherit (callPackages ../tools/filesystems/ceph { })
     ceph
     ceph-client
     ;

From 08cf303961207893a3f1ad4f1d0cca31f9932642 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 09:27:27 +0000
Subject: [PATCH 2257/6226] velocity: 3.4.0-unstable-2025-10-16 ->
 3.4.0-unstable-2025-10-23

---
 pkgs/by-name/ve/velocity/deps.json   | 142 +++++++++++++--------------
 pkgs/by-name/ve/velocity/package.nix |   6 +-
 2 files changed, 74 insertions(+), 74 deletions(-)

diff --git a/pkgs/by-name/ve/velocity/deps.json b/pkgs/by-name/ve/velocity/deps.json
index e1b3449497ea..7d6b36dba278 100644
--- a/pkgs/by-name/ve/velocity/deps.json
+++ b/pkgs/by-name/ve/velocity/deps.json
@@ -661,102 +661,102 @@
    "jar": "sha256-wmJ0R0s4RLzbfYPPc6eFNm+EtFO8F6GRz6T4/D4CIjQ=",
    "pom": "sha256-3Etrgt7DQXBSvBc7lC+5asogUIpLmkfp8b2yQAXkPuc="
   },
-  "io/netty#netty-buffer/4.2.5.Final": {
-   "jar": "sha256-3XR8KTv2gur7LDmx74hmHQOu1ULYQIpp5498Bs6b1Xs=",
-   "pom": "sha256-+jvLNiXnbkm4KPxs2ObM/xxTjyxWLWEDGgKBGItOzJk="
+  "io/netty#netty-buffer/4.2.7.Final": {
+   "jar": "sha256-uBYTyO0iscw57M8qKL0MHUVh+y5eVCBhYX70zh0ii/U=",
+   "pom": "sha256-6mGx9EqNui22yX8iou5DGsVil430rDlUcei28oZtwH4="
   },
-  "io/netty#netty-codec-base/4.2.5.Final": {
-   "jar": "sha256-ZevstZFFd/Z5lP6w3UsdVNd+Alh4I4cBA5EAk98XVso=",
-   "pom": "sha256-Nt7PQ+hpHymPJwGDBf+80tazqfgRw+u2NEOZerFetBI="
+  "io/netty#netty-codec-base/4.2.7.Final": {
+   "jar": "sha256-Y2BBW3yHFgr83l59SUbDVTm58EPoFmyRp//5XMYGfZ8=",
+   "pom": "sha256-Mu41Sjk4YJqMC/Ay9GxwqzJ9eFVR0mmDdwyakDIJKPo="
   },
-  "io/netty#netty-codec-compression/4.2.5.Final": {
-   "jar": "sha256-GjlLIhGjGWQxAJANs+V+uuAV3Tkp+uV1mGsappWxfgM=",
-   "pom": "sha256-Mvvtf2zeQ5jkjn3l08jHTD7ymwKIb/tQ1kYkP/lmQiA="
+  "io/netty#netty-codec-compression/4.2.7.Final": {
+   "jar": "sha256-7dU600mRgEMBpGVxET2P+01vZ+bYdGdNr7uRVyQnXLM=",
+   "pom": "sha256-uAzpd/6sX//UviPOI03TtvtMNXVrJRL7AdzcAdinSoc="
   },
-  "io/netty#netty-codec-haproxy/4.2.5.Final": {
-   "jar": "sha256-qdk1CPi0CJhOXCWHfBL89/FV3sq6etzooTyNJCTKQZ4=",
-   "pom": "sha256-rXDI4xaT6A7R7w0avs3t33YyKBPRuziNJdMXc1OBHfs="
+  "io/netty#netty-codec-haproxy/4.2.7.Final": {
+   "jar": "sha256-bwnVN5FKpGWJE4TIpM8NuXfdkAmgtzqBoFDwpsv6lfc=",
+   "pom": "sha256-Rc/v9/EyJXbOPaHMuoo0i0ANceNu1UVGEm1q1ZcJBPo="
   },
-  "io/netty#netty-codec-http/4.2.5.Final": {
-   "jar": "sha256-+ltOm0fVZmxQeEo3/fb70g9DC+6U0lQ+jiJOMZS9shE=",
-   "pom": "sha256-u2EeuknTKj3hyiYG5Lpi0QNA04FiGWamWvOOnzcVTa0="
+  "io/netty#netty-codec-http/4.2.7.Final": {
+   "jar": "sha256-KYTdOEIKYcTdaPysxR/8Uo60b3P3eVza/bOk1vy3aGI=",
+   "pom": "sha256-hQc6wlleQUiRi1psLnAZMtedm+GNTx212S1qojlj4oA="
   },
-  "io/netty#netty-codec-marshalling/4.2.5.Final": {
-   "jar": "sha256-tbMAHA1W6+zjEkoqjf5+nnNQnZqzhCPy4PMe27KdWDY=",
-   "pom": "sha256-jD+p6mlUF80oxCtDbRfhOLaqW4mJtP7RxLQXZcOeCx0="
+  "io/netty#netty-codec-marshalling/4.2.7.Final": {
+   "jar": "sha256-5VCtt1jupDqkneAOdBiwmJMXEdSjHWLmXEGwmUyVsjc=",
+   "pom": "sha256-77XNFeXpIODSbygJ+aiRp5fxOJ9hEX5VFLfmNaOPmjM="
   },
-  "io/netty#netty-codec-protobuf/4.2.5.Final": {
-   "jar": "sha256-8+kJdquyUHbwQ2mRWU8YmgVojxdOhxIgGiDO+QtdRuU=",
-   "pom": "sha256-9N2ofsIrP4Scp9QXjM5lVvDURgLX3x/JQ9WFjK1ZcPs="
+  "io/netty#netty-codec-protobuf/4.2.7.Final": {
+   "jar": "sha256-SyUlm2916/x38BSgj2m60BkRbU9cpUj9xB89rYwN4zE=",
+   "pom": "sha256-Ub3X5EMhhkFp9Oqt7RQaaXLBhkh+/fAa59t/3jaQcSU="
   },
-  "io/netty#netty-codec/4.2.5.Final": {
-   "jar": "sha256-ldefnyrnzpAJD6DhIgCAjZ5K2mKAxRb5xbFbgbc4RSc=",
-   "pom": "sha256-BoPfFBysofMIKQbfgxoe+GdqTcbTIQUQMDy48HVJ950="
+  "io/netty#netty-codec/4.2.7.Final": {
+   "jar": "sha256-XzaWWDgXiZmMBCqY8C2nHZw5iEu7T3/VgoL3ZeCcoDE=",
+   "pom": "sha256-5FSK3jVlANmEy7jJP9iEZacPdWHlGbyV6y/O7s4bKjE="
   },
-  "io/netty#netty-common/4.2.5.Final": {
-   "jar": "sha256-SwTG+QaQjqcQARfXUp4FW6To+s9ibTklKVotoiOxOk0=",
-   "pom": "sha256-20vxaZsgxg214QCuYs49jnZNqu9OGr9MLqKt4kXpzdI="
+  "io/netty#netty-common/4.2.7.Final": {
+   "jar": "sha256-I0W8DtWEP6V6pJ66Z1KUhcOh1CD88EKTJMgiDHqA6aY=",
+   "pom": "sha256-/jMRoayD8KGH/n2+Be6B6Ef2JvmtkN2wx4WusJ0Y/DM="
   },
-  "io/netty#netty-handler/4.2.5.Final": {
-   "jar": "sha256-VPDE56/mSwJ6jkTPqdgsWsyklCFjtlgP6s9N4tpkF8g=",
-   "pom": "sha256-MK1O0cFi4lwQxYZvc4BXYLl3+Vty/aZcJWFdy/ikc5g="
+  "io/netty#netty-handler/4.2.7.Final": {
+   "jar": "sha256-IdBjQJwS287EbTgMiFag97altou18dAF6wZbTWQUbLM=",
+   "pom": "sha256-79QqDJKAKPlJsWREfBtOFt7eccgihRppL1hzEhTr0oM="
   },
-  "io/netty#netty-parent/4.2.5.Final": {
-   "pom": "sha256-FTTxAc+z3mlU4XAyaFzkJdZHaVHeA9KeC8egC9rimZs="
+  "io/netty#netty-parent/4.2.7.Final": {
+   "pom": "sha256-56FYFCV9GpaNpyU3yRUscw7d9uf9Wj581wJuVclladM="
   },
-  "io/netty#netty-resolver/4.2.5.Final": {
-   "jar": "sha256-f+RoI2Art+TpZvXTCX1JnmOfsmCsbCEB7gALqZlWEnU=",
-   "pom": "sha256-r5azHqO2vIjoatYM58BZ4j68MNUh4bCWQ1rR/JKAJho="
+  "io/netty#netty-resolver/4.2.7.Final": {
+   "jar": "sha256-fk1WmGfmwIQ3+yGiIOoBwpSw448BFJtoPIlaG82ShDg=",
+   "pom": "sha256-F6vZjvgRyuBYbZ41xMUUZ3GXLrJy+Fek2eDDBe0hs5g="
   },
-  "io/netty#netty-transport-classes-epoll/4.2.5.Final": {
-   "jar": "sha256-t4GKIt8uuYksOHNM5RoTo/xz9gRbLAwXSI2sb0+xGuE=",
-   "pom": "sha256-JSTG6SuvgtaRLethiDY52MNtSsxhGEF4Zk3xcQxvFhs="
+  "io/netty#netty-transport-classes-epoll/4.2.7.Final": {
+   "jar": "sha256-RJKUjmp2lDmOUZfPFe0uIdZmKnOdAQrmZvonbnIihTw=",
+   "pom": "sha256-RoQ5xbLK4wAXuv2XaqJJfEiA/aYSSyPBrUKQt5CMXA8="
   },
-  "io/netty#netty-transport-classes-io_uring/4.2.5.Final": {
-   "jar": "sha256-eGqI2zhSIo1QyL1V5hyp0EmurxWAK4VzertMD7kC2Ec=",
-   "pom": "sha256-JGGbc9y7TaRAylfgYtSJ3vUR7cGcALy4tP/gCwBd86g="
+  "io/netty#netty-transport-classes-io_uring/4.2.7.Final": {
+   "jar": "sha256-/5ZodMYvU+0HKWLxv128Sf3dS9PGC/yafhfONLOax68=",
+   "pom": "sha256-fEFSqfVOcE6KSVjdiggLCaW3d6jqcxjxKNfOM4ayqic="
   },
-  "io/netty#netty-transport-classes-kqueue/4.2.5.Final": {
-   "jar": "sha256-P45empwDvk2wIVPiuj0o8dfEYEYXtH7J8nqZqAl69wg=",
-   "pom": "sha256-fEXK6S/QjZMPhrnsd16WiBie+Ms0VZMYcjAZi0pB4Dg="
+  "io/netty#netty-transport-classes-kqueue/4.2.7.Final": {
+   "jar": "sha256-o+sclK4aa+nh0exSw/XFEKdbBLjvHqhrfnez8Sh648w=",
+   "pom": "sha256-mtwTZN1F7chJ933s8SVy3FR4XPbqx5wuhqdyXRGhczM="
   },
-  "io/netty#netty-transport-native-epoll/4.2.5.Final": {
-   "jar": "sha256-gMmYUyacv1OSQ2C16Z2+gbCZFcqX3XHAFkp5ZkrT7RQ=",
-   "pom": "sha256-XXjoG/qvHv8MoaAWwFY6fmpskg9vYAdjXbRyMdtIHhs="
+  "io/netty#netty-transport-native-epoll/4.2.7.Final": {
+   "jar": "sha256-vc+Af3LZqbf5hklxcQdlLKcVMkVwLomTnM63D4zKsY8=",
+   "pom": "sha256-ygZltZ4tBvqQRF5G/UBaYumOhrFL9TwC0eyCUYE8Vto="
   },
-  "io/netty#netty-transport-native-epoll/4.2.5.Final/linux-aarch_64": {
-   "jar": "sha256-58rjjoCrVXxuqCnxSlv3/3QG9ZEr09pnCJWiegFUQwo="
+  "io/netty#netty-transport-native-epoll/4.2.7.Final/linux-aarch_64": {
+   "jar": "sha256-LwxzCdffSKiPs3TALPtEbhoeX7WX+wLXc8cKwH2iwmg="
   },
-  "io/netty#netty-transport-native-epoll/4.2.5.Final/linux-x86_64": {
-   "jar": "sha256-h+TjnoNCHO1Y9OCdzJkgpzZUTxE6lurb8SgWsEViKvI="
+  "io/netty#netty-transport-native-epoll/4.2.7.Final/linux-x86_64": {
+   "jar": "sha256-fzlcj9vmmQ92ZECLV9kZBCQBuJMXj8uki+vxphv3hhg="
   },
-  "io/netty#netty-transport-native-io_uring/4.2.5.Final": {
-   "jar": "sha256-G6yc5FBTpSmQEf2W9NOywpFnrH4R0jig+7/IgE3MKrw=",
-   "pom": "sha256-z6EQRHOtojYkkB1k7iBM61Euh4IeaRgSS2DpCLAkQgY="
+  "io/netty#netty-transport-native-io_uring/4.2.7.Final": {
+   "jar": "sha256-mKjWMVHe0xcscfhVIDrhlpgvAFIZaso7a6l9PoXUJgk=",
+   "pom": "sha256-Q543Rm1v45ZZHsS6JjVcjkRMOB0j9wVMIKL9isXJe0I="
   },
-  "io/netty#netty-transport-native-io_uring/4.2.5.Final/linux-aarch_64": {
-   "jar": "sha256-VYOo0DLAclkVfTEv+wQjbvk3yFakpp1ZpdmlA0O4EDY="
+  "io/netty#netty-transport-native-io_uring/4.2.7.Final/linux-aarch_64": {
+   "jar": "sha256-hPw53BAZ9KbFJEsdealxTLZ/BFu9rk/vJvSYHm9nrb4="
   },
-  "io/netty#netty-transport-native-io_uring/4.2.5.Final/linux-x86_64": {
-   "jar": "sha256-8Tb8qT44ZzaOwvQDMrPTddjCKY06yNLqOohtIs6lh20="
+  "io/netty#netty-transport-native-io_uring/4.2.7.Final/linux-x86_64": {
+   "jar": "sha256-wjZQn1W/khZm8CMu/rdWMnm2y0YNnko2xKukDSIXv2I="
   },
-  "io/netty#netty-transport-native-kqueue/4.2.5.Final": {
-   "jar": "sha256-rr9gy2LUD+q/pjaVUe5aj6pELNixgXL8LxQoFbsmUDw=",
-   "pom": "sha256-TtTZxdXYadsSG88D0nG2by6GCEsnY+W9TZcdiwp82yo="
+  "io/netty#netty-transport-native-kqueue/4.2.7.Final": {
+   "jar": "sha256-8BrzuSyghzja6ep5E3jCiF8wXSEK0W48VxZVueJr0Dw=",
+   "pom": "sha256-/0QzBLr/YGgE922pFg73w/Kh7mZcZe9it74n1vfAMqM="
   },
-  "io/netty#netty-transport-native-kqueue/4.2.5.Final/osx-aarch_64": {
-   "jar": "sha256-T7yUPQqQu3FC7qDMqdZYXIHcN5g+ANxwhKOSEjJpkUo="
+  "io/netty#netty-transport-native-kqueue/4.2.7.Final/osx-aarch_64": {
+   "jar": "sha256-dkemlVjj1Jo1J4HCroGpfha0QtfGVloGtK4PFSmEidU="
   },
-  "io/netty#netty-transport-native-kqueue/4.2.5.Final/osx-x86_64": {
-   "jar": "sha256-w/pmI401PBlBmwFysdazuaS1mvOgS/bsAiXZamk0D9o="
+  "io/netty#netty-transport-native-kqueue/4.2.7.Final/osx-x86_64": {
+   "jar": "sha256-opwItolXRqrKeW5ypCm8cF9AJn/rNfdc2Pu81N5t6Z8="
   },
-  "io/netty#netty-transport-native-unix-common/4.2.5.Final": {
-   "jar": "sha256-znLyQj2jEvnZZV/lT0oLVZneVPuRYOvX7D+ycwr4q8M=",
-   "pom": "sha256-TQGNBAkDVC8OitiqHHYeOfQ67Ou5GBCanvP1N+WRcmI="
+  "io/netty#netty-transport-native-unix-common/4.2.7.Final": {
+   "jar": "sha256-c2cDs/bRJ+GC9b6Ii24VcysMCNZjTgByU1KmqdGZdLI=",
+   "pom": "sha256-EnhcnEoH0qFDJYYWRWrqw6bgIqoXJBeYA04x+LDtHqk="
   },
-  "io/netty#netty-transport/4.2.5.Final": {
-   "jar": "sha256-ArTpqs4SYLENANeBb7Quoj+wVobte3+45q1Ozz2mH/8=",
-   "pom": "sha256-PcP4jk6N0k7Bf6EDeuRDJGOtR6Iv8jjmuD/RRJeCMPQ="
+  "io/netty#netty-transport/4.2.7.Final": {
+   "jar": "sha256-qtxvsFwU+3iTaMo/hUchVJxy9sDYF5i7zPneG7cWiSs=",
+   "pom": "sha256-zQTiYzq09WBE6aFdUV6ZyBY4iZ2vB9gJdhlzp8DPnqo="
   },
   "it/unimi/dsi#fastutil/8.5.15": {
    "jar": "sha256-z/62ZzvfHm5Dd9aE3y9VrDWc9c9t9hPgXmLe7qUAk2o=",
diff --git a/pkgs/by-name/ve/velocity/package.nix b/pkgs/by-name/ve/velocity/package.nix
index eeaa7d7a482f..82e035b2c226 100644
--- a/pkgs/by-name/ve/velocity/package.nix
+++ b/pkgs/by-name/ve/velocity/package.nix
@@ -35,13 +35,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "velocity";
-  version = "3.4.0-unstable-2025-10-16";
+  version = "3.4.0-unstable-2025-10-23";
 
   src = fetchFromGitHub {
     owner = "PaperMC";
     repo = "Velocity";
-    rev = "4cd3b6869729484887b4fa58b7a6c3b007710a10";
-    hash = "sha256-SGZqKsAI8QW65B2u0tn7NwciwjViExvxv6UdoHkzheI=";
+    rev = "b6b6b20fe97cd9cb0d6b4e817d3e7db72aca2d8d";
+    hash = "sha256-UHkioSGKikYxHq/petnJSHpvx/ioH01N6FSl0176YVA=";
   };
 
   nativeBuildInputs = [

From c90c2fbc91a21ca7e563e9f0b267837bd429ac17 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 09:33:10 +0000
Subject: [PATCH 2258/6226] screenly-cli: 1.0.4 -> 1.0.5

---
 pkgs/by-name/sc/screenly-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sc/screenly-cli/package.nix b/pkgs/by-name/sc/screenly-cli/package.nix
index c29787e15efa..654a9c543dd6 100644
--- a/pkgs/by-name/sc/screenly-cli/package.nix
+++ b/pkgs/by-name/sc/screenly-cli/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "screenly-cli";
-  version = "1.0.4";
+  version = "1.0.5";
 
   src = fetchFromGitHub {
     owner = "screenly";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-6whyTCfmBx+PS40ML8VNR5WvIfnUCMxos7KCCbtHXAo=";
+    hash = "sha256-OSol+KVfxL/bz9qwT9u8MmjPQ11qqFYWnVQLXfcA6pQ=";
   };
 
-  cargoHash = "sha256-LG6/+/Ibw7mh854ue6L74DLK4WocmDWqK8FvsEascYw=";
+  cargoHash = "sha256-znob9SvnE1y9yX/tTJY7jjJx/TnLTmoRRokScj5H1Yg=";
 
   nativeBuildInputs = [
     pkg-config

From 56d71be11e769402d8ca1b279373ff0707797e6c Mon Sep 17 00:00:00 2001
From: benaryorg <binary@benary.org>
Date: Fri, 24 Oct 2025 09:34:59 +0000
Subject: [PATCH 2259/6226] pkgs/ceph: client as output

Moving the ceph client to a separate output allows moving the entire package to the by-name structure more easily.

Signed-off-by: benaryorg <binary@benary.org>
---
 pkgs/tools/filesystems/ceph/default.nix | 478 ++++++++++++------------
 pkgs/top-level/all-packages.nix         |   6 +-
 2 files changed, 237 insertions(+), 247 deletions(-)

diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix
index 1aea3ea3b5ff..a468bc88985d 100644
--- a/pkgs/tools/filesystems/ceph/default.nix
+++ b/pkgs/tools/filesystems/ceph/default.nix
@@ -373,262 +373,254 @@ let
     hash = "sha256-zlgp28C81SZbaFJ4yvQk4ZgYz4K/aZqtcISTO8LscSU=";
   };
 in
-rec {
-  ceph = stdenv.mkDerivation {
-    pname = "ceph";
-    inherit src version;
+stdenv.mkDerivation rec {
+  pname = "ceph";
+  inherit src version;
 
-    patches = [
-      ./boost-1.85.patch
+  patches = [
+    ./boost-1.85.patch
 
-      (fetchpatch2 {
-        name = "ceph-boost-1.86-uuid.patch";
-        url = "https://github.com/ceph/ceph/commit/01306208eac492ee0e67bff143fc32d0551a2a6f.patch?full_index=1";
-        hash = "sha256-OnDrr72inzGXXYxPFQevsRZImSvI0uuqFHqtFU2dPQE=";
-      })
+    (fetchpatch2 {
+      name = "ceph-boost-1.86-uuid.patch";
+      url = "https://github.com/ceph/ceph/commit/01306208eac492ee0e67bff143fc32d0551a2a6f.patch?full_index=1";
+      hash = "sha256-OnDrr72inzGXXYxPFQevsRZImSvI0uuqFHqtFU2dPQE=";
+    })
 
-      # See:
-      # * <https://github.com/boostorg/python/issues/394>
-      # * <https://aur.archlinux.org/cgit/aur.git/commit/?h=ceph&id=8c5cc7d8deec002f7596b6d0860859a0a718f12b>
-      # * <https://github.com/ceph/ceph/pull/60999>
-      ./boost-1.86-PyModule.patch
+    # See:
+    # * <https://github.com/boostorg/python/issues/394>
+    # * <https://aur.archlinux.org/cgit/aur.git/commit/?h=ceph&id=8c5cc7d8deec002f7596b6d0860859a0a718f12b>
+    # * <https://github.com/ceph/ceph/pull/60999>
+    ./boost-1.86-PyModule.patch
 
-      (fetchpatch2 {
-        name = "ceph-cmake-4.patch";
-        url = "https://gitlab.alpinelinux.org/ashpool/aports/-/raw/d22b70eafe33c3daabe4eea6913c5be87d9463ad/community/ceph19/cpp_redis.patch";
-        hash = "sha256-wxPIsYt25CjXhJ6kmr/MXwFD58Sl4y4W+r9jAMND+uw=";
-      })
-    ];
+    (fetchpatch2 {
+      name = "ceph-cmake-4.patch";
+      url = "https://gitlab.alpinelinux.org/ashpool/aports/-/raw/d22b70eafe33c3daabe4eea6913c5be87d9463ad/community/ceph19/cpp_redis.patch";
+      hash = "sha256-wxPIsYt25CjXhJ6kmr/MXwFD58Sl4y4W+r9jAMND+uw=";
+    })
+  ];
 
-    nativeBuildInputs = [
-      autoconf # `autoreconf` is called, e.g. for `qatlib_ext`
-      automake # `aclocal` is called, e.g. for `qatlib_ext`
-      cmake
-      fmt_9
-      git
-      makeWrapper
-      libtool # used e.g. for `qatlib_ext`
-      nasm
-      pkg-config
-      python
-      python.pkgs.python # for the toPythonPath function
-      python.pkgs.wrapPython
-      which
-      (ensureNewerSourcesHook { year = "1980"; })
-      # for building docs/man-pages presumably
-      doxygen
-      graphviz
-    ];
+  nativeBuildInputs = [
+    autoconf # `autoreconf` is called, e.g. for `qatlib_ext`
+    automake # `aclocal` is called, e.g. for `qatlib_ext`
+    cmake
+    fmt_9
+    git
+    makeWrapper
+    libtool # used e.g. for `qatlib_ext`
+    nasm
+    pkg-config
+    python
+    python.pkgs.python # for the toPythonPath function
+    python.pkgs.wrapPython
+    which
+    (ensureNewerSourcesHook { year = "1980"; })
+    # for building docs/man-pages presumably
+    doxygen
+    graphviz
+  ];
 
-    buildInputs =
-      cryptoLibsMap.${cryptoStr}
-      ++ [
-        ceph-arrow-cpp
-        babeltrace
-        boost'
-        bzip2
-        # Adding `ceph-python-env` here adds the env's `site-packages` to `PYTHONPATH` during the build.
-        # This is important, otherwise the build system may not find the Python deps and then
-        # silently skip installing ceph-volume and other Ceph python tools.
-        ceph-python-env
-        cryptsetup
-        cunit
-        e2fsprogs # according to `debian/control` file, `ceph-volume` is supposed to use it
-        gperf
-        gtest
-        icu
-        libcap
-        libnbd
-        libnl
-        libxml2
-        lmdb
-        lttng-ust
-        lua5_4
-        lvm2 # according to `debian/control` file, e.g. `pvs` command used by `src/ceph-volume/ceph_volume/api/lvm.py`
-        lz4
-        malloc
-        oath-toolkit
-        openldap
-        optLibatomic_ops
-        optLibs3
-        optYasm
-        parted # according to `debian/control` file, used by `src/ceph-volume/ceph_volume/util/disk.py`
-        rdkafka
-        rocksdb'
-        snappy
-        openssh # according to `debian/control` file, `ssh` command used by `cephadm`
-        sqlite
-        utf8proc
-        xfsprogs # according to `debian/control` file, `ceph-volume` is supposed to use it
-        zlib
-        zstd
-      ]
-      ++ lib.optionals stdenv.hostPlatform.isLinux [
-        keyutils
-        libcap_ng
-        liburing
-        libuuid
-        linuxHeaders
-        optLibaio
-        optLibxfs
-        optZfs
-        rabbitmq-c
-        rdma-core
-        udev
-        util-linux
-      ]
-      ++ lib.optionals hasRadosgw [
-        optCurl
-        optExpat
-        optFuse
-        optLibedit
-      ];
-
-    # Picked up, amongst others, by `wrapPythonPrograms`.
-    pythonPath = [
+  buildInputs =
+    cryptoLibsMap.${cryptoStr}
+    ++ [
+      ceph-arrow-cpp
+      babeltrace
+      boost'
+      bzip2
+      # Adding `ceph-python-env` here adds the env's `site-packages` to `PYTHONPATH` during the build.
+      # This is important, otherwise the build system may not find the Python deps and then
+      # silently skip installing ceph-volume and other Ceph python tools.
       ceph-python-env
-      "${placeholder "out"}/${ceph-python-env.sitePackages}"
-    ];
-
-    # * `unset AS` because otherwise the Ceph CMake build errors with
-    #       configure: error: No modern nasm or yasm found as required. Nasm should be v2.11.01 or later (v2.13 for AVX512) and yasm should be 1.2.0 or later.
-    #   because the code at
-    #       https://github.com/intel/isa-l/blob/633add1b569fe927bace3960d7c84ed9c1b38bb9/configure.ac#L99-L191
-    #   doesn't even consider using `nasm` or `yasm` but instead uses `$AS`
-    #   from `gcc-wrapper`.
-    #   (Ceph's error message is extra confusing, because it says
-    #   `No modern nasm or yasm found` when in fact it found e.g. `nasm`
-    #   but then uses `$AS` instead.
-    # * replace /sbin and /bin based paths with direct nix store paths
-    # * increase the `command` buffer size since 2 nix store paths cannot fit within 128 characters
-    preConfigure = ''
-      unset AS
-
-      substituteInPlace src/common/module.c \
-        --replace "char command[128];" "char command[256];" \
-        --replace "/sbin/modinfo"  "${kmod}/bin/modinfo" \
-        --replace "/sbin/modprobe" "${kmod}/bin/modprobe" \
-        --replace "/bin/grep" "${gnugrep}/bin/grep"
-
-      # Patch remount to use full path to mount(8), otherwise ceph-fuse fails when run
-      # from a systemd unit for example.
-      substituteInPlace src/client/fuse_ll.cc \
-        --replace-fail "mount -i -o remount" "${util-linux}/bin/mount -i -o remount"
-
-      # The install target needs to be in PYTHONPATH for "*.pth support" check to succeed
-      export PYTHONPATH=$PYTHONPATH:$lib/${sitePackages}:$out/${sitePackages}
-      patchShebangs src/
-    '';
-
-    cmakeFlags = [
-      "-DCMAKE_INSTALL_DATADIR=${placeholder "lib"}/lib"
-
-      "-DWITH_CEPHFS_SHELL:BOOL=ON"
-      "-DWITH_SYSTEMD:BOOL=OFF"
-      # `WITH_JAEGER` requires `thrift` as a depenedncy (fine), but the build fails with:
-      #     CMake Error at src/opentelemetry-cpp-stamp/opentelemetry-cpp-build-Release.cmake:49 (message):
-      #     Command failed: 2
-      #
-      #        'make' 'opentelemetry_trace' 'opentelemetry_exporter_jaeger_trace'
-      #
-      #     See also
-      #
-      #        /build/ceph-18.2.0/build/src/opentelemetry-cpp/src/opentelemetry-cpp-stamp/opentelemetry-cpp-build-*.log
-      # and that file contains:
-      #     /build/ceph-18.2.0/src/jaegertracing/opentelemetry-cpp/exporters/jaeger/src/TUDPTransport.cc: In member function 'virtual void opentelemetry::v1::exporter::jaeger::TUDPTransport::close()':
-      #     /build/ceph-18.2.0/src/jaegertracing/opentelemetry-cpp/exporters/jaeger/src/TUDPTransport.cc:71:7: error: '::close' has not been declared; did you mean 'pclose'?
-      #       71 |     ::THRIFT_CLOSESOCKET(socket_);
-      #          |       ^~~~~~~~~~~~~~~~~~
-      # Looks like `close()` is somehow not included.
-      # But the relevant code is already removed in `open-telemetry` 1.10: https://github.com/open-telemetry/opentelemetry-cpp/pull/2031
-      # So it's probably not worth trying to fix that for this Ceph version,
-      # and instead just disable Ceph's Jaeger support.
-      "-DWITH_JAEGER:BOOL=OFF"
-      "-DWITH_TESTS:BOOL=OFF"
-
-      # Use our own libraries, where possible
-      "-DWITH_SYSTEM_ARROW:BOOL=ON" # Only used if other options enable Arrow support.
-      "-DWITH_SYSTEM_BOOST:BOOL=ON"
-      "-DWITH_SYSTEM_GTEST:BOOL=ON"
-      "-DWITH_SYSTEM_ROCKSDB:BOOL=ON"
-      "-DWITH_SYSTEM_UTF8PROC:BOOL=ON"
-      "-DWITH_SYSTEM_ZSTD:BOOL=ON"
-
-      # Use our own python libraries too, see:
-      #     https://github.com/NixOS/nixpkgs/pull/344993#issuecomment-2391046329
-      "-DCEPHADM_BUNDLED_DEPENDENCIES=none"
-
-      # TODO breaks with sandbox, tries to download stuff with npm
-      "-DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF"
-      # WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now
-      ''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}''
+      cryptsetup
+      cunit
+      e2fsprogs # according to `debian/control` file, `ceph-volume` is supposed to use it
+      gperf
+      gtest
+      icu
+      libcap
+      libnbd
+      libnl
+      libxml2
+      lmdb
+      lttng-ust
+      lua5_4
+      lvm2 # according to `debian/control` file, e.g. `pvs` command used by `src/ceph-volume/ceph_volume/api/lvm.py`
+      lz4
+      malloc
+      oath-toolkit
+      openldap
+      optLibatomic_ops
+      optLibs3
+      optYasm
+      parted # according to `debian/control` file, used by `src/ceph-volume/ceph_volume/util/disk.py`
+      rdkafka
+      rocksdb'
+      snappy
+      openssh # according to `debian/control` file, `ssh` command used by `cephadm`
+      sqlite
+      utf8proc
+      xfsprogs # according to `debian/control` file, `ceph-volume` is supposed to use it
+      zlib
+      zstd
     ]
-    ++ lib.optional stdenv.hostPlatform.isLinux "-DWITH_SYSTEM_LIBURING=ON";
-
-    preBuild =
-      # The legacy-option-headers target is not correctly empbedded in the build graph.
-      # It also contains some internal race conditions that we work around by building with `-j 1`.
-      # Upstream discussion for additional context at https://tracker.ceph.com/issues/63402.
-      ''
-        cmake --build . --target legacy-option-headers -j 1
-      '';
-
-    postFixup = ''
-      wrapPythonPrograms
-      wrapProgram $out/bin/ceph-mgr --prefix PYTHONPATH ":" "$(toPythonPath ${placeholder "out"}):$(toPythonPath ${ceph-python-env})"
-
-      # Test that ceph-volume exists since the build system has a tendency to
-      # silently drop it with misconfigurations.
-      test -f $out/bin/ceph-volume
-    '';
-
-    outputs = [
-      "out"
-      "lib"
-      "dev"
-      "doc"
-      "man"
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      keyutils
+      libcap_ng
+      liburing
+      libuuid
+      linuxHeaders
+      optLibaio
+      optLibxfs
+      optZfs
+      rabbitmq-c
+      rdma-core
+      udev
+      util-linux
+    ]
+    ++ lib.optionals hasRadosgw [
+      optCurl
+      optExpat
+      optFuse
+      optLibedit
     ];
 
-    doCheck = false; # uses pip to install things from the internet
+  # Picked up, amongst others, by `wrapPythonPrograms`.
+  pythonPath = [
+    ceph-python-env
+    "${placeholder "out"}/${ceph-python-env.sitePackages}"
+  ];
 
-    # Takes 7+h to build with 2 cores.
-    requiredSystemFeatures = [ "big-parallel" ];
+  # * `unset AS` because otherwise the Ceph CMake build errors with
+  #       configure: error: No modern nasm or yasm found as required. Nasm should be v2.11.01 or later (v2.13 for AVX512) and yasm should be 1.2.0 or later.
+  #   because the code at
+  #       https://github.com/intel/isa-l/blob/633add1b569fe927bace3960d7c84ed9c1b38bb9/configure.ac#L99-L191
+  #   doesn't even consider using `nasm` or `yasm` but instead uses `$AS`
+  #   from `gcc-wrapper`.
+  #   (Ceph's error message is extra confusing, because it says
+  #   `No modern nasm or yasm found` when in fact it found e.g. `nasm`
+  #   but then uses `$AS` instead.
+  # * replace /sbin and /bin based paths with direct nix store paths
+  # * increase the `command` buffer size since 2 nix store paths cannot fit within 128 characters
+  preConfigure = ''
+    unset AS
 
-    meta = getMeta "Distributed storage system";
+    substituteInPlace src/common/module.c \
+      --replace "char command[128];" "char command[256];" \
+      --replace "/sbin/modinfo"  "${kmod}/bin/modinfo" \
+      --replace "/sbin/modprobe" "${kmod}/bin/modprobe" \
+      --replace "/bin/grep" "${gnugrep}/bin/grep"
 
-    passthru = {
-      inherit version;
-      inherit python; # to be able to test our overridden packages above individually with `nix-build -A`
-      arrow-cpp = ceph-arrow-cpp;
-      tests = {
-        inherit (nixosTests)
-          ceph-multi-node
-          ceph-single-node
-          ceph-single-node-bluestore
-          ceph-single-node-bluestore-dmcrypt
-          ;
-      };
+    # Patch remount to use full path to mount(8), otherwise ceph-fuse fails when run
+    # from a systemd unit for example.
+    substituteInPlace src/client/fuse_ll.cc \
+      --replace-fail "mount -i -o remount" "${util-linux}/bin/mount -i -o remount"
+
+    # The install target needs to be in PYTHONPATH for "*.pth support" check to succeed
+    export PYTHONPATH=$PYTHONPATH:$lib/${sitePackages}:$out/${sitePackages}
+    patchShebangs src/
+  '';
+
+  cmakeFlags = [
+    "-DCMAKE_INSTALL_DATADIR=${placeholder "lib"}/lib"
+
+    "-DWITH_CEPHFS_SHELL:BOOL=ON"
+    "-DWITH_SYSTEMD:BOOL=OFF"
+    # `WITH_JAEGER` requires `thrift` as a depenedncy (fine), but the build fails with:
+    #     CMake Error at src/opentelemetry-cpp-stamp/opentelemetry-cpp-build-Release.cmake:49 (message):
+    #     Command failed: 2
+    #
+    #        'make' 'opentelemetry_trace' 'opentelemetry_exporter_jaeger_trace'
+    #
+    #     See also
+    #
+    #        /build/ceph-18.2.0/build/src/opentelemetry-cpp/src/opentelemetry-cpp-stamp/opentelemetry-cpp-build-*.log
+    # and that file contains:
+    #     /build/ceph-18.2.0/src/jaegertracing/opentelemetry-cpp/exporters/jaeger/src/TUDPTransport.cc: In member function 'virtual void opentelemetry::v1::exporter::jaeger::TUDPTransport::close()':
+    #     /build/ceph-18.2.0/src/jaegertracing/opentelemetry-cpp/exporters/jaeger/src/TUDPTransport.cc:71:7: error: '::close' has not been declared; did you mean 'pclose'?
+    #       71 |     ::THRIFT_CLOSESOCKET(socket_);
+    #          |       ^~~~~~~~~~~~~~~~~~
+    # Looks like `close()` is somehow not included.
+    # But the relevant code is already removed in `open-telemetry` 1.10: https://github.com/open-telemetry/opentelemetry-cpp/pull/2031
+    # So it's probably not worth trying to fix that for this Ceph version,
+    # and instead just disable Ceph's Jaeger support.
+    "-DWITH_JAEGER:BOOL=OFF"
+    "-DWITH_TESTS:BOOL=OFF"
+
+    # Use our own libraries, where possible
+    "-DWITH_SYSTEM_ARROW:BOOL=ON" # Only used if other options enable Arrow support.
+    "-DWITH_SYSTEM_BOOST:BOOL=ON"
+    "-DWITH_SYSTEM_GTEST:BOOL=ON"
+    "-DWITH_SYSTEM_ROCKSDB:BOOL=ON"
+    "-DWITH_SYSTEM_UTF8PROC:BOOL=ON"
+    "-DWITH_SYSTEM_ZSTD:BOOL=ON"
+
+    # Use our own python libraries too, see:
+    #     https://github.com/NixOS/nixpkgs/pull/344993#issuecomment-2391046329
+    "-DCEPHADM_BUNDLED_DEPENDENCIES=none"
+
+    # TODO breaks with sandbox, tries to download stuff with npm
+    "-DWITH_MGR_DASHBOARD_FRONTEND:BOOL=OFF"
+    # WITH_XFS has been set default ON from Ceph 16, keeping it optional in nixpkgs for now
+    ''-DWITH_XFS=${if optLibxfs != null then "ON" else "OFF"}''
+  ]
+  ++ lib.optional stdenv.hostPlatform.isLinux "-DWITH_SYSTEM_LIBURING=ON";
+
+  preBuild =
+    # The legacy-option-headers target is not correctly empbedded in the build graph.
+    # It also contains some internal race conditions that we work around by building with `-j 1`.
+    # Upstream discussion for additional context at https://tracker.ceph.com/issues/63402.
+    ''
+      cmake --build . --target legacy-option-headers -j 1
+    '';
+
+  postFixup = ''
+    wrapPythonPrograms
+    wrapProgram $out/bin/ceph-mgr --prefix PYTHONPATH ":" "$(toPythonPath ${placeholder "out"}):$(toPythonPath ${ceph-python-env})"
+
+    # Test that ceph-volume exists since the build system has a tendency to
+    # silently drop it with misconfigurations.
+    test -f $out/bin/ceph-volume
+
+    mkdir -p $client/{bin,etc,${sitePackages},share/bash-completion/completions}
+    cp -r $out/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $client/bin
+    cp -r $out/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $client/bin
+    cp -r $out/bin/rbd-replay* $client/bin
+    cp -r $out/sbin/mount.ceph $client/bin
+    cp -r $out/sbin/mount.fuse.ceph $client/bin
+    ln -s bin $client/sbin
+    cp -r $out/${sitePackages}/* $client/${sitePackages}
+    cp -r $out/etc/bash_completion.d $client/share/bash-completion/completions
+    # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths
+    substituteInPlace $client/bin/ceph          --replace $out $client
+    substituteInPlace $client/bin/.ceph-wrapped --replace $out $client
+  '';
+
+  outputs = [
+    "out"
+    "lib"
+    "client"
+    "dev"
+    "doc"
+    "man"
+  ];
+
+  doCheck = false; # uses pip to install things from the internet
+
+  # Takes 7+h to build with 2 cores.
+  requiredSystemFeatures = [ "big-parallel" ];
+
+  meta = getMeta "Distributed storage system";
+
+  passthru = {
+    inherit version;
+    inherit python; # to be able to test our overridden packages above individually with `nix-build -A`
+    arrow-cpp = ceph-arrow-cpp;
+    tests = {
+      inherit (nixosTests)
+        ceph-multi-node
+        ceph-single-node
+        ceph-single-node-bluestore
+        ceph-single-node-bluestore-dmcrypt
+        ;
     };
   };
-
-  ceph-client =
-    runCommand "ceph-client-${version}"
-      {
-        meta = getMeta "Tools needed to mount Ceph's RADOS Block Devices/Cephfs";
-      }
-      ''
-        mkdir -p $out/{bin,etc,${sitePackages},share/bash-completion/completions}
-        cp -r ${ceph}/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $out/bin
-        cp -r ${ceph}/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $out/bin
-        cp -r ${ceph}/bin/rbd-replay* $out/bin
-        cp -r ${ceph}/sbin/mount.ceph $out/bin
-        cp -r ${ceph}/sbin/mount.fuse.ceph $out/bin
-        ln -s bin $out/sbin
-        cp -r ${ceph}/${sitePackages}/* $out/${sitePackages}
-        cp -r ${ceph}/etc/bash_completion.d $out/share/bash-completion/completions
-        # wrapPythonPrograms modifies .ceph-wrapped, so lets just update its paths
-        substituteInPlace $out/bin/ceph          --replace ${ceph} $out
-        substituteInPlace $out/bin/.ceph-wrapped --replace ${ceph} $out
-      '';
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6409aa7e6003..3c053a094c79 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2345,11 +2345,9 @@ with pkgs;
 
   cemu-ti = qt5.callPackage ../applications/science/math/cemu-ti { };
 
+  ceph = callPackage ../tools/filesystems/ceph { };
   libceph = ceph.lib;
-  inherit (callPackages ../tools/filesystems/ceph { })
-    ceph
-    ceph-client
-    ;
+  ceph-client = ceph.client;
   ceph-dev = ceph;
 
   clementine = libsForQt5.callPackage ../applications/audio/clementine {

From 72ccd1e2cbb5afde01115c223eae80e0ec5b925d Mon Sep 17 00:00:00 2001
From: benaryorg <binary@benary.org>
Date: Fri, 24 Oct 2025 09:38:19 +0000
Subject: [PATCH 2260/6226] pkgs/ceph: move to by-name

Signed-off-by: benaryorg <binary@benary.org>
---
 pkgs/{tools/filesystems => by-name/ce}/ceph/arrow-cpp-19.nix     | 0
 pkgs/{tools/filesystems => by-name/ce}/ceph/boost-1.85.patch     | 0
 .../filesystems => by-name/ce}/ceph/boost-1.86-PyModule.patch    | 0
 .../ce}/ceph/old-python-packages/cryptography-vectors.nix        | 0
 .../ce}/ceph/old-python-packages/cryptography.nix                | 0
 ...y-Cherry-pick-fix-for-CVE-2023-49083-on-cryptography-40.patch | 0
 .../ce}/ceph/old-python-packages/trustme.nix                     | 0
 .../filesystems/ceph/default.nix => by-name/ce/ceph/package.nix} | 0
 pkgs/top-level/all-packages.nix                                  | 1 -
 9 files changed, 1 deletion(-)
 rename pkgs/{tools/filesystems => by-name/ce}/ceph/arrow-cpp-19.nix (100%)
 rename pkgs/{tools/filesystems => by-name/ce}/ceph/boost-1.85.patch (100%)
 rename pkgs/{tools/filesystems => by-name/ce}/ceph/boost-1.86-PyModule.patch (100%)
 rename pkgs/{tools/filesystems => by-name/ce}/ceph/old-python-packages/cryptography-vectors.nix (100%)
 rename pkgs/{tools/filesystems => by-name/ce}/ceph/old-python-packages/cryptography.nix (100%)
 rename pkgs/{tools/filesystems => by-name/ce}/ceph/old-python-packages/python-cryptography-Cherry-pick-fix-for-CVE-2023-49083-on-cryptography-40.patch (100%)
 rename pkgs/{tools/filesystems => by-name/ce}/ceph/old-python-packages/trustme.nix (100%)
 rename pkgs/{tools/filesystems/ceph/default.nix => by-name/ce/ceph/package.nix} (100%)

diff --git a/pkgs/tools/filesystems/ceph/arrow-cpp-19.nix b/pkgs/by-name/ce/ceph/arrow-cpp-19.nix
similarity index 100%
rename from pkgs/tools/filesystems/ceph/arrow-cpp-19.nix
rename to pkgs/by-name/ce/ceph/arrow-cpp-19.nix
diff --git a/pkgs/tools/filesystems/ceph/boost-1.85.patch b/pkgs/by-name/ce/ceph/boost-1.85.patch
similarity index 100%
rename from pkgs/tools/filesystems/ceph/boost-1.85.patch
rename to pkgs/by-name/ce/ceph/boost-1.85.patch
diff --git a/pkgs/tools/filesystems/ceph/boost-1.86-PyModule.patch b/pkgs/by-name/ce/ceph/boost-1.86-PyModule.patch
similarity index 100%
rename from pkgs/tools/filesystems/ceph/boost-1.86-PyModule.patch
rename to pkgs/by-name/ce/ceph/boost-1.86-PyModule.patch
diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography-vectors.nix b/pkgs/by-name/ce/ceph/old-python-packages/cryptography-vectors.nix
similarity index 100%
rename from pkgs/tools/filesystems/ceph/old-python-packages/cryptography-vectors.nix
rename to pkgs/by-name/ce/ceph/old-python-packages/cryptography-vectors.nix
diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix b/pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix
similarity index 100%
rename from pkgs/tools/filesystems/ceph/old-python-packages/cryptography.nix
rename to pkgs/by-name/ce/ceph/old-python-packages/cryptography.nix
diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/python-cryptography-Cherry-pick-fix-for-CVE-2023-49083-on-cryptography-40.patch b/pkgs/by-name/ce/ceph/old-python-packages/python-cryptography-Cherry-pick-fix-for-CVE-2023-49083-on-cryptography-40.patch
similarity index 100%
rename from pkgs/tools/filesystems/ceph/old-python-packages/python-cryptography-Cherry-pick-fix-for-CVE-2023-49083-on-cryptography-40.patch
rename to pkgs/by-name/ce/ceph/old-python-packages/python-cryptography-Cherry-pick-fix-for-CVE-2023-49083-on-cryptography-40.patch
diff --git a/pkgs/tools/filesystems/ceph/old-python-packages/trustme.nix b/pkgs/by-name/ce/ceph/old-python-packages/trustme.nix
similarity index 100%
rename from pkgs/tools/filesystems/ceph/old-python-packages/trustme.nix
rename to pkgs/by-name/ce/ceph/old-python-packages/trustme.nix
diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/by-name/ce/ceph/package.nix
similarity index 100%
rename from pkgs/tools/filesystems/ceph/default.nix
rename to pkgs/by-name/ce/ceph/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 3c053a094c79..a65617f48b5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2345,7 +2345,6 @@ with pkgs;
 
   cemu-ti = qt5.callPackage ../applications/science/math/cemu-ti { };
 
-  ceph = callPackage ../tools/filesystems/ceph { };
   libceph = ceph.lib;
   ceph-client = ceph.client;
   ceph-dev = ceph;

From 8ef63df9e88fada173ea90694822e06418a47837 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Fri, 24 Oct 2025 11:44:03 +0200
Subject: [PATCH 2261/6226] alacritty{-graphics}: make it possible to use
 different versions when the fork lags behind

---
 pkgs/by-name/al/alacritty/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix
index 7ff0058a9bf3..8e73175d216b 100644
--- a/pkgs/by-name/al/alacritty/package.nix
+++ b/pkgs/by-name/al/alacritty/package.nix
@@ -42,9 +42,9 @@ let
     wayland
   ];
 in
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "alacritty";
-  version = "0.15.1" + lib.optionalString withGraphics "-graphics";
+  version = if !withGraphics then "0.15.1" else "0.15.0-graphics";
 
   src =
     # by default we want the official package
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
       fetchFromGitHub {
         owner = "alacritty";
         repo = "alacritty";
-        tag = "v${version}";
+        tag = "v${finalAttrs.version}";
         hash = "sha256-/yERMNfCFLPb1S17Y9OacVH8UobDIIZDhM2qPzf5Vds=";
       }
     # optionally we want to build the sixels feature fork
@@ -60,7 +60,7 @@ rustPlatform.buildRustPackage rec {
       fetchFromGitHub {
         owner = "ayosec";
         repo = "alacritty";
-        tag = "v${version}";
+        tag = "v${finalAttrs.version}";
         hash = "sha256-n8vO6Q4bzWLaOqg8YhZ+aLOtBBTQ9plKIEJHXq+hhnM=";
       };
 
@@ -152,6 +152,6 @@ rustPlatform.buildRustPackage rec {
       rvdp
     ];
     platforms = lib.platforms.unix;
-    changelog = "https://github.com/alacritty/alacritty/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/alacritty/alacritty/blob/v${finalAttrs.version}/CHANGELOG.md";
   };
-}
+})

From a7162adedcd584ce78fc386aea0d767edd88565d Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Fri, 24 Oct 2025 11:26:11 +0200
Subject: [PATCH 2262/6226] alacritty: 0.15.1 -> 0.16.1

Diff: https://github.com/alacritty/alacritty/compare/v0.15.1...v0.16.1

Changelog: https://github.com/alacritty/alacritty/blob/v0.16.1/CHANGELOG.md
---
 pkgs/by-name/al/alacritty/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix
index 8e73175d216b..e69ca9e4a765 100644
--- a/pkgs/by-name/al/alacritty/package.nix
+++ b/pkgs/by-name/al/alacritty/package.nix
@@ -44,7 +44,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "alacritty";
-  version = if !withGraphics then "0.15.1" else "0.15.0-graphics";
+  version = if !withGraphics then "0.16.1" else "0.15.0-graphics";
 
   src =
     # by default we want the official package
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
         owner = "alacritty";
         repo = "alacritty";
         tag = "v${finalAttrs.version}";
-        hash = "sha256-/yERMNfCFLPb1S17Y9OacVH8UobDIIZDhM2qPzf5Vds=";
+        hash = "sha256-IOPhnJ76kZ2djJjxJEUwWPvHDeeXbJAn1ClipTH7nWs=";
       }
     # optionally we want to build the sixels feature fork
     else
@@ -66,7 +66,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash =
     if !withGraphics then
-      "sha256-uXwefUV1NAKqwwPIWj4Slkx0c5b+RfLR3caTb42fc4M="
+      "sha256-OBhrd4q44LCUGnjDEedhrOuoSC2UFR90IKSQfEPY/Q4="
     else
       "sha256-UtxZFqU974N+YcHoEHifBjNSyaVuMvuc1clTDgUPuoQ=";
 

From 70ce85815a0e962ceb7ec2bc92e2d7474a472ab9 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Fri, 24 Oct 2025 11:26:58 +0200
Subject: [PATCH 2263/6226] alacritty-graphics: 0.15.0-graphics ->
 0.16.0-graphics

Diff: https://github.com/ayosec/alacritty/compare/v0.15.0-graphics...v0.16.0-graphics

Changelog: https://github.com/alacritty/alacritty/blob/v0.16.0-graphics/CHANGELOG.md
---
 pkgs/by-name/al/alacritty/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix
index e69ca9e4a765..f4d900bed9cd 100644
--- a/pkgs/by-name/al/alacritty/package.nix
+++ b/pkgs/by-name/al/alacritty/package.nix
@@ -44,7 +44,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "alacritty";
-  version = if !withGraphics then "0.16.1" else "0.15.0-graphics";
+  version = if !withGraphics then "0.16.1" else "0.16.0-graphics";
 
   src =
     # by default we want the official package
@@ -61,14 +61,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
         owner = "ayosec";
         repo = "alacritty";
         tag = "v${finalAttrs.version}";
-        hash = "sha256-n8vO6Q4bzWLaOqg8YhZ+aLOtBBTQ9plKIEJHXq+hhnM=";
+        hash = "sha256-JbsHozYMh7hFMAsu823IcVZTzvMEGQP+oKpUnlmM7Nk=";
       };
 
   cargoHash =
     if !withGraphics then
       "sha256-OBhrd4q44LCUGnjDEedhrOuoSC2UFR90IKSQfEPY/Q4="
     else
-      "sha256-UtxZFqU974N+YcHoEHifBjNSyaVuMvuc1clTDgUPuoQ=";
+      "sha256-fsTs37w4CvYvFN8ZgWxMA2hmgW0hJcIvhLiuhYxs4+Y=";
 
   nativeBuildInputs = [
     cmake

From 7a220f81fe72a071d0312d23f14b4a54ef6ffe25 Mon Sep 17 00:00:00 2001
From: r-vdp <ramses@well-founded.dev>
Date: Fri, 24 Oct 2025 11:32:52 +0200
Subject: [PATCH 2264/6226] alacritty: make sure to put the right values for
 the homepage and changelog

---
 pkgs/by-name/al/alacritty/package.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix
index f4d900bed9cd..78fc353cda62 100644
--- a/pkgs/by-name/al/alacritty/package.nix
+++ b/pkgs/by-name/al/alacritty/package.nix
@@ -144,7 +144,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Cross-platform, GPU-accelerated terminal emulator";
-    homepage = "https://github.com/alacritty/alacritty";
+    homepage =
+      if !withGraphics then
+        "https://github.com/alacritty/alacritty"
+      else
+        "https://github.com/ayosec/alacritty";
     license = lib.licenses.asl20;
     mainProgram = "alacritty";
     maintainers = with lib.maintainers; [
@@ -152,6 +156,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
       rvdp
     ];
     platforms = lib.platforms.unix;
-    changelog = "https://github.com/alacritty/alacritty/blob/v${finalAttrs.version}/CHANGELOG.md";
+    changelog =
+      if !withGraphics then
+        "https://github.com/alacritty/alacritty/blob/v${finalAttrs.version}/CHANGELOG.md"
+      else
+        "https://github.com/ayosec/alacritty/blob/v${finalAttrs.version}/CHANGELOG.md";
   };
 })

From 4cacea8f9147088fb3d410593a0b892e08002eed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 09:49:25 +0000
Subject: [PATCH 2265/6226] python3Packages.msgraph-sdk: 1.46.0 -> 1.47.0

---
 pkgs/development/python-modules/msgraph-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/msgraph-sdk/default.nix b/pkgs/development/python-modules/msgraph-sdk/default.nix
index abc8d81b78a5..adcf9271a8ba 100644
--- a/pkgs/development/python-modules/msgraph-sdk/default.nix
+++ b/pkgs/development/python-modules/msgraph-sdk/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "msgraph-sdk";
-  version = "1.46.0";
+  version = "1.47.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "microsoftgraph";
     repo = "msgraph-sdk-python";
     tag = "v${version}";
-    hash = "sha256-PAFRK+PLHG87ilD7Nslmj33bif2vBD6/SWmWMkv8HIY=";
+    hash = "sha256-/S9dJ5eeYG7I+COizOb3TpaYpx7Qu+R5brRxbLuV3F8=";
   };
 
   build-system = [ flit-core ];

From cceab587f8c0fbcd46502c5aa7d99510a8cacfc9 Mon Sep 17 00:00:00 2001
From: chillcicada <2210227279@qq.com>
Date: Fri, 24 Oct 2025 18:02:05 +0800
Subject: [PATCH 2266/6226] qq: 3.2.19-2025-09-04 -> 3.2.20-2025-10-23

---
 pkgs/by-name/qq/qq/sources.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix
index 4580d8932b2a..04c0bf153bd8 100644
--- a/pkgs/by-name/qq/qq/sources.nix
+++ b/pkgs/by-name/qq/qq/sources.nix
@@ -1,12 +1,12 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2025-10-11
+# Last updated: 2025-10-24
 { fetchurl }:
 let
   any-darwin = {
-    version = "6.9.81-2025-09-29";
+    version = "6.9.82-2025-10-23";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.81_250929_01.dmg";
-      hash = "sha256-OfHkY+hf1ZOKWnq+YewuweFz0+Qiib4KB37SuA2p7yg=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.82_251023_01.dmg";
+      hash = "sha256-oBhThy9NC0W6gyztHQCL88NDdQrYHzZ27RAzTGcyyRY=";
     };
   };
 in
@@ -14,17 +14,17 @@ in
   aarch64-darwin = any-darwin;
   x86_64-darwin = any-darwin;
   aarch64-linux = {
-    version = "3.2.19-2025-09-04";
+    version = "3.2.20-2025-10-23";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.19_250904_arm64_01.deb";
-      hash = "sha256-OqBRxDfTz9w4cFeDSKeysPlqxaJtrp96PZieXnsjGhA=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.20_251023_arm64_01.deb";
+      hash = "sha256-m90k4S0BAA3R4alRl+1ZfLK3q35LnCVBMUOcJpALIYU=";
     };
   };
   x86_64-linux = {
-    version = "3.2.19-2025-09-04";
+    version = "3.2.20-2025-10-23";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.19_250904_amd64_01.deb";
-      hash = "sha256-5M3kykJCmFZZ0VTG/K+nYRt7SIUzvc3O6yPW8ebx45A=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.20_251023_amd64_01.deb";
+      hash = "sha256-PIq2FPB+LpnyfzE51o9eulw93/BofPrlU+PqUyYlh2M=";
     };
   };
 }

From e62b35ebf716d0b65c5acaea31b190656b46e350 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 10:02:42 +0000
Subject: [PATCH 2267/6226] ruffle: 0.2.0-nightly-2025-10-18 ->
 0.2.0-nightly-2025-10-24

---
 pkgs/by-name/ru/ruffle/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix
index 2350c2d3f4c2..451c505b9fd7 100644
--- a/pkgs/by-name/ru/ruffle/package.nix
+++ b/pkgs/by-name/ru/ruffle/package.nix
@@ -27,13 +27,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruffle";
-  version = "0.2.0-nightly-2025-10-18";
+  version = "0.2.0-nightly-2025-10-24";
 
   src = fetchFromGitHub {
     owner = "ruffle-rs";
     repo = "ruffle";
     tag = lib.strings.removePrefix "0.2.0-" finalAttrs.version;
-    hash = "sha256-rFgaquwcQK2U+1qSlxI+VT5OJPftbj4pcMJih71Gl2A=";
+    hash = "sha256-zp+2kILsWkRVDX5q7rCI294VCOz8C3PleDPgED3n+LM=";
   };
 
   postPatch =
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
                        "OpenH264Version(${major}, ${minor}, ${patch})"
     '';
 
-  cargoHash = "sha256-6Q3KBrrfL50AkFkDuxXWKqPtc2ClI3j1WpE/x9ASOJk=";
+  cargoHash = "sha256-Eo9wLL/Xj/mWto3cRSxAv5dMf+jLOUUk5wCd8voQEeQ=";
   cargoBuildFlags = lib.optional withRuffleTools "--workspace";
 
   env =

From 6741751801286f5b32073a1229b4fdcf97b22d0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 21 Oct 2025 17:02:43 +0200
Subject: [PATCH 2268/6226] nixos/facter: add networking configuration

This adds automatic network configuration based on detected hardware:

- networking/default.nix: Auto-configure DHCP on physical interfaces
  Detects Ethernet, WLAN, USB-Link, and generic network interfaces,
  automatically enabling DHCP on each. Excludes loopback and mainframe
  interfaces. Sets networking.useDHCP and per-interface useDHCP.

- networking/intel.nix: Intel WiFi firmware detection
  Auto-enables firmware for Intel 2200BG and 3945ABG wireless cards
  based on PCI vendor/device IDs.

- networking/initrd.nix: Network drivers in initrd
  Loads network controller drivers when boot.initrd.network.enable
  is set, enabling network boot scenarios.

Builds on PR #454847 (boot & storage).
Part of incremental upstreaming from nixos-facter-modules.
---
 nixos/modules/hardware/facter/default.nix     |  1 +
 .../hardware/facter/networking/default.nix    | 69 +++++++++++++++++++
 .../hardware/facter/networking/initrd.nix     | 20 ++++++
 .../hardware/facter/networking/intel.nix      | 57 +++++++++++++++
 4 files changed, 147 insertions(+)
 create mode 100644 nixos/modules/hardware/facter/networking/default.nix
 create mode 100644 nixos/modules/hardware/facter/networking/initrd.nix
 create mode 100644 nixos/modules/hardware/facter/networking/intel.nix

diff --git a/nixos/modules/hardware/facter/default.nix b/nixos/modules/hardware/facter/default.nix
index 324471b16e70..f2719b55b8ce 100644
--- a/nixos/modules/hardware/facter/default.nix
+++ b/nixos/modules/hardware/facter/default.nix
@@ -7,6 +7,7 @@
   imports = [
     ./disk.nix
     ./keyboard.nix
+    ./networking
     ./system.nix
   ];
 
diff --git a/nixos/modules/hardware/facter/networking/default.nix b/nixos/modules/hardware/facter/networking/default.nix
new file mode 100644
index 000000000000..dfbc54c8396d
--- /dev/null
+++ b/nixos/modules/hardware/facter/networking/default.nix
@@ -0,0 +1,69 @@
+{ config, lib, ... }:
+let
+  # Filter network interfaces from facter report to only those suitable for DHCP
+  physicalInterfaces = lib.filter (
+    iface:
+    # Only include network interfaces suitable for DHCP:
+    # - Ethernet (most common)
+    # - WLAN (WiFi)
+    # - USB-Link (USB network adapters, tethering)
+    # - Network Interface (generic/unknown type)
+    # This implicitly excludes: Loopback, mainframe-specific interfaces (CTC, IUCV, HSI, ESCON)
+    # See: https://github.com/numtide/hwinfo/blob/ea251a74b88dcd53aebdd381194ab43d10fbbd79/src/ids/src/class#L817-L874
+    let
+      validTypes = [
+        "Ethernet"
+        "WLAN"
+        "USB-Link"
+        "Network Interface"
+      ];
+    in
+    lib.elem (iface.sub_class.name or "") validTypes
+  ) (config.hardware.facter.report.hardware.network_interface or [ ]);
+
+  # Extract interface names from unix_device_names
+  detectedInterfaceNames = lib.concatMap (iface: iface.unix_device_names or [ ]) physicalInterfaces;
+
+  # Get the interface names from the configuration (which defaults to detectedInterfaceNames)
+  interfaceNames = config.hardware.facter.detected.dhcp.interfaces;
+
+  # Generate per-interface DHCP config
+  perInterfaceConfig = lib.listToAttrs (
+    lib.map (name: {
+      inherit name;
+      value = {
+        useDHCP = lib.mkDefault true;
+      };
+    }) interfaceNames
+  );
+in
+{
+  imports = [
+    ./initrd.nix
+    ./intel.nix
+  ];
+
+  options.hardware.facter.detected.dhcp = {
+    enable = lib.mkEnableOption "Facter dhcp module" // {
+      default = builtins.length config.hardware.facter.report.hardware.network_interface or [ ] > 0;
+      defaultText = "hardware dependent";
+    };
+
+    interfaces = lib.mkOption {
+      type = lib.types.listOf lib.types.str;
+      default = detectedInterfaceNames;
+      defaultText = lib.literalExpression "automatically detected from facter report";
+      description = "List of network interface names to configure with DHCP. Defaults to auto-detected physical interfaces.";
+      example = [
+        "eth0"
+        "wlan0"
+      ];
+    };
+  };
+  config = lib.mkIf config.hardware.facter.detected.dhcp.enable {
+    networking.useDHCP = lib.mkDefault true;
+
+    # Per-interface DHCP configuration
+    networking.interfaces = perInterfaceConfig;
+  };
+}
diff --git a/nixos/modules/hardware/facter/networking/initrd.nix b/nixos/modules/hardware/facter/networking/initrd.nix
new file mode 100644
index 000000000000..56be802b7cd9
--- /dev/null
+++ b/nixos/modules/hardware/facter/networking/initrd.nix
@@ -0,0 +1,20 @@
+{ lib, config, ... }:
+let
+  facterLib = import ../lib.nix lib;
+
+  inherit (config.hardware.facter) report;
+in
+{
+  options.hardware.facter.detected.boot.initrd.networking.kernelModules = lib.mkOption {
+    type = lib.types.listOf lib.types.str;
+    default = lib.uniqueStrings (facterLib.collectDrivers (report.hardware.network_controller or [ ]));
+    defaultText = "hardware dependent";
+    description = ''
+      List of kernel modules to include in the initrd to support networking.
+    '';
+  };
+
+  config = lib.mkIf config.boot.initrd.network.enable {
+    boot.initrd.kernelModules = config.hardware.facter.detected.boot.initrd.networking.kernelModules;
+  };
+}
diff --git a/nixos/modules/hardware/facter/networking/intel.nix b/nixos/modules/hardware/facter/networking/intel.nix
new file mode 100644
index 000000000000..4ae693a3c636
--- /dev/null
+++ b/nixos/modules/hardware/facter/networking/intel.nix
@@ -0,0 +1,57 @@
+{ lib, config, ... }:
+let
+  inherit (config.hardware.facter) report;
+  cfg = config.hardware.facter.detected.networking.intel;
+in
+{
+  options.hardware.facter.detected.networking.intel = with lib; {
+    _2200BG.enable = mkEnableOption "the Facter Intel 2200BG module" // {
+
+      default = lib.any (
+        {
+          vendor ? { },
+          device ? { },
+          ...
+        }:
+        # vendor (0x8086) Intel Corp.
+        (vendor.value or 0) == 32902
+        && (lib.elem (device.value or 0) [
+          4163 # 0x1043
+          4175 # 0x104f
+          16928 # 0x4220
+          16929 # 0x4221
+          16931 # 0x4223
+          16932 # 0x4224
+        ])
+      ) (report.hardware.network_controller or [ ]);
+
+      defaultText = "hardware dependent";
+    };
+    _3945ABG.enable = mkEnableOption "the Facter Intel 3945ABG module" // {
+
+      default = lib.any (
+        {
+          vendor ? { },
+          device ? { },
+          ...
+        }:
+        # vendor (0x8086) Intel Corp.
+        (vendor.value or 0) == 32902
+        && (lib.elem (device.value or 0) [
+          16937 # 0x4229
+          16938 # 0x4230
+          16930 # 0x4222
+          16935 # 0x4227
+        ])
+      ) (report.hardware.network_controller or [ ]);
+
+      defaultText = "hardware dependent";
+    };
+  };
+
+  config = {
+    networking.enableIntel2200BGFirmware = lib.mkIf cfg._2200BG.enable (lib.mkDefault true);
+    hardware.enableRedistributableFirmware = lib.mkIf cfg._3945ABG.enable (lib.mkDefault true);
+  };
+
+}

From 8abe37a60a4cb2c368052b82b3aa10f42770e978 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 10:51:25 +0000
Subject: [PATCH 2269/6226] google-alloydb-auth-proxy: 1.13.6 -> 1.13.7

---
 pkgs/by-name/go/google-alloydb-auth-proxy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix
index 51f97ea70509..0ce2fbc74f62 100644
--- a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix
+++ b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule rec {
   pname = "google-alloydb-auth-proxy";
-  version = "1.13.6";
+  version = "1.13.7";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "alloydb-auth-proxy";
     tag = "v${version}";
-    hash = "sha256-d3YMyvUoNfU32pcStsriBCCiyMPHRZrJzHgrnBRmUL4=";
+    hash = "sha256-I0AyOY9aM6XoKQ4D+KYR3AytUfPpK4TRQNRy+T8ZmN4=";
   };
 
   subPackages = [ "." ];
 
-  vendorHash = "sha256-DobqGejaRrCy8RJyydepnTVp9IdeM9X6A+3uUgH15iM=";
+  vendorHash = "sha256-IhGAvn30Hd1vu4w19jKkjtbhh7gbATsLep0rli4ibK8=";
 
   checkFlags = [
     "-short"

From 74ae5481522f7e9b23536fbdf41ad5475daa0ba6 Mon Sep 17 00:00:00 2001
From: Jan Christoph Bischko <con-f-use@gmx.net>
Date: Fri, 24 Oct 2025 13:02:44 +0200
Subject: [PATCH 2270/6226] mackup: 0.8.41 -> 0.9.3

---
 pkgs/by-name/ma/mackup/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ma/mackup/package.nix b/pkgs/by-name/ma/mackup/package.nix
index 63113960f5ec..f3594b8a3b72 100644
--- a/pkgs/by-name/ma/mackup/package.nix
+++ b/pkgs/by-name/ma/mackup/package.nix
@@ -1,19 +1,20 @@
 {
-  lib,
-  python3Packages,
   fetchFromGitHub,
+  lib,
   procps,
+  python3Packages,
+  stdenv,
 }:
 python3Packages.buildPythonApplication rec {
   pname = "mackup";
-  version = "0.8.41";
+  version = "0.9.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lra";
     repo = "mackup";
     rev = "${version}";
-    hash = "sha256-eWSBl8BTg2FLI21DQcnepBFPF08bfm0V8lYB4mMbAiw=";
+    hash = "sha256-ysVABY/PWwqbWEATpzIrMkppHExOxDcia5HFr+VGQQc=";
   };
 
   postPatch = ''
@@ -21,9 +22,9 @@ python3Packages.buildPythonApplication rec {
       --replace-fail '"/usr/bin/pgrep"' '"${lib.getExe' procps "pgrep"}"' \
   '';
 
-  build-system = with python3Packages; [ poetry-core ];
+  build-system = with python3Packages; [ hatchling ];
 
-  dependencies = with python3Packages; [ docopt ];
+  dependencies = with python3Packages; [ docopt-ng ];
 
   pythonImportsCheck = [ "mackup" ];
 
@@ -32,7 +33,7 @@ python3Packages.buildPythonApplication rec {
   pytestFlagsArray = [ "tests/*.py" ];
 
   # Disabling tests failing on darwin due to a missing pgrep binary on procps
-  disabledTests = [ "test_is_process_running" ];
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [ "test_is_process_running" ];
 
   meta = {
     description = "A tool to keep your application settings in sync (OS X/Linux)";

From c73a8e1a6d8e6550f1d82f019110ab47cb1cbdd5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 11:04:58 +0000
Subject: [PATCH 2271/6226] sourcepawn-studio: 8.1.7 -> 8.1.8

---
 pkgs/by-name/so/sourcepawn-studio/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/so/sourcepawn-studio/package.nix b/pkgs/by-name/so/sourcepawn-studio/package.nix
index 8aa53afedefe..b2c65c0c7a50 100644
--- a/pkgs/by-name/so/sourcepawn-studio/package.nix
+++ b/pkgs/by-name/so/sourcepawn-studio/package.nix
@@ -8,16 +8,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sourcepawn-studio";
-  version = "8.1.7";
+  version = "8.1.8";
 
   src = fetchFromGitHub {
     owner = "Sarrus1";
     repo = "sourcepawn-studio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-f7mBsBITBmgoGfiAzdQpZQnSY/9WYJ91uCJxCu755tU=";
+    hash = "sha256-piUgAvU5tbsYydEiF+70BAZVBK2t6SzG18MLf9cN+xM=";
   };
 
-  cargoHash = "sha256-NQHetE5z8pgTtPjbc9PK3X4FEw7fL7n+ZGyzmQ5JBPM=";
+  cargoHash = "sha256-Cy8YPcmRWEyG6b4kouuj7KVmq2wBL8akw9v9sB30eF4=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 8e04ff9cd168a6c8c85202794a997e1505c3a4bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 11:11:29 +0000
Subject: [PATCH 2272/6226] cloudlog: 2.7.5 -> 2.7.6

---
 pkgs/by-name/cl/cloudlog/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/cloudlog/package.nix b/pkgs/by-name/cl/cloudlog/package.nix
index ac2d3346ef86..e65f863b9e48 100644
--- a/pkgs/by-name/cl/cloudlog/package.nix
+++ b/pkgs/by-name/cl/cloudlog/package.nix
@@ -9,13 +9,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "cloudlog";
-  version = "2.7.5";
+  version = "2.7.6";
 
   src = fetchFromGitHub {
     owner = "magicbug";
     repo = "Cloudlog";
     rev = version;
-    hash = "sha256-Lb20SrwFQybMNmxgmztAm2/9PBcukgt03W93C743oM8=";
+    hash = "sha256-p9PmWRKvKGGZrexZJwYtb+LYto9npZ606QVo4pvDBak=";
   };
 
   postPatch = ''

From 4e00b476f664a43b3bfd8c353493d7924843cfc1 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 24 Oct 2025 13:11:37 +0200
Subject: [PATCH 2273/6226] matrix-appservice-irc: 3.0.5 -> 4.0.0

Diff: https://github.com/matrix-org/matrix-appservice-irc/compare/refs/tags/3.0.5...refs/tags/4.0.0

Changelog: https://github.com/matrix-org/matrix-appservice-irc/releases/tag/4.0.0
---
 pkgs/by-name/ma/matrix-appservice-irc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-appservice-irc/package.nix b/pkgs/by-name/ma/matrix-appservice-irc/package.nix
index ff937c86c511..69a6be233806 100644
--- a/pkgs/by-name/ma/matrix-appservice-irc/package.nix
+++ b/pkgs/by-name/ma/matrix-appservice-irc/package.nix
@@ -14,19 +14,19 @@
 
 let
   pname = "matrix-appservice-irc";
-  version = "3.0.5";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "matrix-appservice-irc";
     tag = version;
-    hash = "sha256-R/Up4SNWl2AAaeyPJe6OOKFrwIOIvDw/guJxgBuZNC4=";
+    hash = "sha256-bM1CUuFRBOg/4y50gI7ZLwnrbBU6pZlqyitTI2WeVsA=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     name = "${pname}-${version}-offline-cache";
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-EJJyGVM4WMVQFWcTjgKHvRFWn40sXNi/vg/bypJ1hMU=";
+    hash = "sha256-JHSHhkfDGAra6Lq2QB5ngkLo1jR+vrWeux+LYORciZ8=";
   };
 
 in

From 9c6aaa12c82ac6cd5ddd3968a4ddf4ebd6d7399b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 11:15:52 +0000
Subject: [PATCH 2274/6226] automatic-timezoned: 2.0.93 -> 2.0.96

---
 pkgs/by-name/au/automatic-timezoned/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix
index bc990312581b..e68e56272081 100644
--- a/pkgs/by-name/au/automatic-timezoned/package.nix
+++ b/pkgs/by-name/au/automatic-timezoned/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "automatic-timezoned";
-  version = "2.0.93";
+  version = "2.0.96";
 
   src = fetchFromGitHub {
     owner = "maxbrunet";
     repo = "automatic-timezoned";
     rev = "v${version}";
-    sha256 = "sha256-EJxHmzNJvWtchFnptTK03jyPWMzFKO6jxte30xipdM8=";
+    sha256 = "sha256-Y2dx0Y5wfYXewJkf7W2YgupdTfwsJg7MTPsFpLmJ9k8=";
   };
 
-  cargoHash = "sha256-kfsc7QXvRczatRwvPeMPXuD6GC9qd6zBwUd3EYXALSc=";
+  cargoHash = "sha256-c5KDy767GxZwTwrcjsnfEQVlFiYxmjSdpFx07ymMtBE=";
 
   meta = {
     description = "Automatically update system timezone based on location";

From 1727ed07b5461b53b99c868c067cae5a7a912ed1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 11:16:07 +0000
Subject: [PATCH 2275/6226] warp-terminal: 0.2025.10.15.08.12.stable_01 ->
 0.2025.10.22.08.13.stable_01

---
 pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index 3d70418c08f5..bb5dd9214d4c 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-kcTQTOxe2swK8Ntn2mYesgK1Jo9+xlYQtu6MsZVr+yk=",
-    "version": "0.2025.10.15.08.12.stable_01"
+    "hash": "sha256-8yv7R86ABmVSkedA+SPzZWvlXxLm6CHskTInpFbqvkQ=",
+    "version": "0.2025.10.22.08.13.stable_01"
   },
   "linux_x86_64": {
-    "hash": "sha256-VqJteZNtupyL/wV21NCe3yY4PGtL39QO5P7eHRf6v5g=",
-    "version": "0.2025.10.15.08.12.stable_01"
+    "hash": "sha256-dGn556xWjKJMixQF/PYJNCE5u9orPbvX3lsRQbOQbec=",
+    "version": "0.2025.10.22.08.13.stable_01"
   },
   "linux_aarch64": {
-    "hash": "sha256-B/VicadRluk0Pkg6vqzbNm6k59YkRvgfN58phfQSpXc=",
-    "version": "0.2025.10.15.08.12.stable_01"
+    "hash": "sha256-UO3kAgzsnFWOXLORfuj5fhlTfUzgK1C0QbUEQvBq2fE=",
+    "version": "0.2025.10.22.08.13.stable_01"
   }
 }

From 440b010fc466e8958a1b3e30f18ea057c39831a0 Mon Sep 17 00:00:00 2001
From: Marc Jakobi <marc.jakobi@tiko.energy>
Date: Fri, 24 Oct 2025 13:07:20 +0200
Subject: [PATCH 2276/6226] luajitPackages.lux-lua: symlink to 5.1 directory

---
 pkgs/development/lua-modules/lux-lua.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/lua-modules/lux-lua.nix b/pkgs/development/lua-modules/lux-lua.nix
index e85eb41f0966..2f9d5ba9e04d 100644
--- a/pkgs/development/lua-modules/lux-lua.nix
+++ b/pkgs/development/lua-modules/lux-lua.nix
@@ -16,7 +16,8 @@
 }:
 let
   luaMajorMinor = lib.take 2 (lib.splitVersion lua.version);
-  luaVersionDir = if isLuaJIT then "jit" else lib.concatStringsSep "." luaMajorMinor;
+  luxLuaVersionDir = if isLuaJIT then "jit" else lib.concatStringsSep "." luaMajorMinor;
+  luaVersionDir = if isLuaJIT then "5.1" else lib.concatStringsSep "." luaMajorMinor;
   luaFeature = if isLuaJIT then "luajit" else "lua${lib.concatStringsSep "" luaMajorMinor}";
 in
 toLuaModule (
@@ -75,7 +76,7 @@ toLuaModule (
       cp -r target/dist/share $out
       cp -r target/dist/lib $out
       mkdir -p $out/lib/lua
-      ln -s $out/share/lux-lua/${luaVersionDir} $out/lib/lua/${luaVersionDir}
+      ln -s $out/share/lux-lua/${luxLuaVersionDir} $out/lib/lua/${luaVersionDir}
       runHook postInstall
     '';
 

From e6a7e4a4a1946c1e3fe81034a0b38332b2516ad0 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 24 Oct 2025 13:19:44 +0200
Subject: [PATCH 2277/6226] electron-source.electron_36: 36.9.4 -> 36.9.5

- Changelog: https://github.com/electron/electron/releases/tag/v36.9.5
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.9.4...v36.9.5
---
 pkgs/development/tools/electron/info.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 3cce8d230af4..14447b632b1f 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -56,10 +56,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-7+WcLF6RjoN+MZyo4nVr8n/PpJHbzn12VSXsv6LfwH0=",
+                    "hash": "sha256-2oJRD32zDb26fieeW+q+n/8xlF9V7GgePYhRn6QSuKs=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v36.9.4"
+                    "tag": "v36.9.5"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1321,7 +1321,7 @@
         "electron_yarn_hash": "0hm126bl9cscs2mjb3yx2yr4b22agqp9r0c5kv25r3lvc020r9pk",
         "modules": "135",
         "node": "22.19.0",
-        "version": "36.9.4"
+        "version": "36.9.5"
     },
     "37": {
         "chrome": "138.0.7204.251",

From 0adc0f1cd33fe1b3a391086a8858d3210c2c7684 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 24 Oct 2025 13:20:44 +0200
Subject: [PATCH 2278/6226] electron-source.electron_37: 37.6.1 -> 37.7.1

- Changelog: https://github.com/electron/electron/releases/tag/v37.7.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.6.1...v37.7.1
---
 pkgs/development/tools/electron/info.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 14447b632b1f..8a5fa2380914 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1380,10 +1380,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-7b9JFee1fNw23ufv5oEHKuP/JQFDFdfryD74n2maKRY=",
+                    "hash": "sha256-gq7gu3ZhV2W02oQUtRFSAJfcCchB8zflqexllmg9GCU=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v37.6.1"
+                    "tag": "v37.7.1"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -1717,10 +1717,10 @@
             },
             "src/third_party/electron_node": {
                 "args": {
-                    "hash": "sha256-UiyMCw/ci9btcROpq6pJd5ur92hJzfRLjn6Bl2k7mcY=",
+                    "hash": "sha256-mguNvnynyvdqpk3JEgmKTI1vMRMeiD1jICsK6gqkvLQ=",
                     "owner": "nodejs",
                     "repo": "node",
-                    "tag": "v22.19.0"
+                    "tag": "v22.20.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2652,8 +2652,8 @@
         },
         "electron_yarn_hash": "0hm126bl9cscs2mjb3yx2yr4b22agqp9r0c5kv25r3lvc020r9pk",
         "modules": "136",
-        "node": "22.19.0",
-        "version": "37.6.1"
+        "node": "22.20.0",
+        "version": "37.7.1"
     },
     "38": {
         "chrome": "140.0.7339.133",

From f8f356ad35b111a157214b72a4c87727e56aa4a7 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 24 Oct 2025 13:29:41 +0200
Subject: [PATCH 2279/6226] electron-source.electron_38: 38.2.2 -> 38.4.0

- Changelog: https://github.com/electron/electron/releases/tag/v38.4.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v38.2.2...v38.4.0
---
 pkgs/development/tools/electron/info.json | 36 +++++++++++------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 8a5fa2380914..9c91b2ad7be5 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -2656,7 +2656,7 @@
         "version": "37.7.1"
     },
     "38": {
-        "chrome": "140.0.7339.133",
+        "chrome": "140.0.7339.240",
         "chromium": {
             "deps": {
                 "gn": {
@@ -2665,15 +2665,15 @@
                     "version": "0-unstable-2025-07-29"
                 }
             },
-            "version": "140.0.7339.133"
+            "version": "140.0.7339.240"
         },
         "chromium_npm_hash": "sha256-R2gOpfPOUAmnsnUTIvzDPHuHNzL/b2fwlyyfTrywEcI=",
         "deps": {
             "src": {
                 "args": {
-                    "hash": "sha256-POp5cNxLJqEgGvTCpbZhurSnAmGrIg+LeKRG6iy626Y=",
+                    "hash": "sha256-lO84baZNQgchjmLnSUQ4y2Yi1MEH8d0omB612F4vCxM=",
                     "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
-                    "tag": "140.0.7339.133",
+                    "tag": "140.0.7339.240",
                     "url": "https://chromium.googlesource.com/chromium/src.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -2712,10 +2712,10 @@
             },
             "src/electron": {
                 "args": {
-                    "hash": "sha256-OuBvNX/Nw/9Zg+xirSEo43eIiypBkZmw9DbJe6CFA6k=",
+                    "hash": "sha256-HKUJyRtN5I/xOKyTfP3bHTwZ6AmpbWVzfT4BR3t9SOQ=",
                     "owner": "electron",
                     "repo": "electron",
-                    "tag": "v38.2.2"
+                    "tag": "v38.4.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -2937,8 +2937,8 @@
             },
             "src/third_party/dawn": {
                 "args": {
-                    "hash": "sha256-gDtFhalOMFWR25XLVbYB/GE1lSQd1ClZ8h175qkC6PU=",
-                    "rev": "8550f9c1ff8859d25cc49bdfacef083cff2c5121",
+                    "hash": "sha256-ulw+gDGpUn8uWuNedlfQADwnSYYbPWpHN5Q+pJbwKGc=",
+                    "rev": "67be7fddacc4f4bcb21d0cf7bf8bb18752d8fb08",
                     "url": "https://dawn.googlesource.com/dawn.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3009,8 +3009,8 @@
             },
             "src/third_party/devtools-frontend/src": {
                 "args": {
-                    "hash": "sha256-tA+6iKBfJVrlT+1UH55vqa5JCONweZeD/zWfNHHD+Kw=",
-                    "rev": "5dbb6f71a9bd613c0403242c7c021652fbf155fd",
+                    "hash": "sha256-7YwrN+MizCnfcwDHWsYkZaTbN2qmCHcixX6KHhCPrXs=",
+                    "rev": "725edaaf06b966e670194d0376d50be0c25deb13",
                     "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3049,10 +3049,10 @@
             },
             "src/third_party/electron_node": {
                 "args": {
-                    "hash": "sha256-UiyMCw/ci9btcROpq6pJd5ur92hJzfRLjn6Bl2k7mcY=",
+                    "hash": "sha256-mguNvnynyvdqpk3JEgmKTI1vMRMeiD1jICsK6gqkvLQ=",
                     "owner": "nodejs",
                     "repo": "node",
-                    "tag": "v22.19.0"
+                    "tag": "v22.20.0"
                 },
                 "fetcher": "fetchFromGitHub"
             },
@@ -3644,8 +3644,8 @@
             },
             "src/third_party/skia": {
                 "args": {
-                    "hash": "sha256-YiGzqaht1r8/dDz0C4fpKsPEIplm33dPce2UpLkYTZ0=",
-                    "rev": "1fdbea293a53b270e3f5e74c92cc6670d68412ff",
+                    "hash": "sha256-88ezOArtEdPJZACmgyjJ2Jf5biSlyoDYMJBZ7wwPt7Q=",
+                    "rev": "f3ff281f2330f2948888a9cc0ba921bbdc107da8",
                     "url": "https://skia.googlesource.com/skia.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3967,8 +3967,8 @@
             },
             "src/v8": {
                 "args": {
-                    "hash": "sha256-x8a8VYFrAZ0huj3WRlczrhg0quXx4cztz8nDs9ToWYg=",
-                    "rev": "fdb12b460f148895f6af2ff0e0d870ff8889f154",
+                    "hash": "sha256-/XuTD8ENQutrbBt5sJYHuG/87q00J2fACSBBkeEHTYs=",
+                    "rev": "b7ed978e41b4bac7802b206404d0e2f3d09f31ac",
                     "url": "https://chromium.googlesource.com/v8/v8.git"
                 },
                 "fetcher": "fetchFromGitiles"
@@ -3976,7 +3976,7 @@
         },
         "electron_yarn_hash": "1knhw3blk3bl2a8nl58ik272qj2q0cpqiih5gcsds1na3bbkbn2z",
         "modules": "139",
-        "node": "22.19.0",
-        "version": "38.2.2"
+        "node": "22.20.0",
+        "version": "38.4.0"
     }
 }

From eb98ae6a736ecfcdd1d83bc58b1ef7d3e2af3755 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 24 Oct 2025 13:30:01 +0200
Subject: [PATCH 2280/6226] electron_36-bin: 36.9.4 -> 36.9.5

- Changelog: https://github.com/electron/electron/releases/tag/v36.9.5
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.9.4...v36.9.5
---
 pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 831ecfe99323..594d5c8f3d10 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -12,14 +12,14 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "4b6e5402936969a2988d3151483ac9693d92b52d44121ff7539de34c277527cb",
-            "aarch64-linux": "423d042d719c74b8199324fac0c551143168eb8dcb876032541f5f6970b0216a",
-            "armv7l-linux": "9ad5aecb5c61f8509afb26f7c07c8a985b753da0be531a85b6982ccf572dcd74",
-            "headers": "0fv8hz55xk76vksj8sagfhja0xx03ks8awi3sbmlinjb9m02hb9p",
-            "x86_64-darwin": "a0fa047f4eb4671d5787d96f45587c7d11a9e81c953c8e3e347b6fcd51b26938",
-            "x86_64-linux": "1912195a813a8e112ce51b6778919d09d2c40bd9b3d22095d97cbebb27a491ba"
+            "aarch64-darwin": "73eb08fd541e6105d448735f2f820a7e0f63ff07e836ca05462dc2c01028e7df",
+            "aarch64-linux": "f7e9a3079f2276b907c39e0bad0ded08d6846274823d4371256a82e7a47fab27",
+            "armv7l-linux": "4ec9c4ec03f17b9cb2ac6a2eca7d2bef3e0ab3b70b73ba1a3b9a12baef350e5c",
+            "headers": "06na5h0bx4nbb2hv867warr19dgk7ilz0w8j4mmkxmv33x7w65bd",
+            "x86_64-darwin": "fce84ddaba4999b83c0501f9e4bbbf811965b76b67ad81452bc918db88c09c61",
+            "x86_64-linux": "52d6364aeed68116320f8cd6f7d7b6ad185da011ff212755f18c604696628616"
         },
-        "version": "36.9.4"
+        "version": "36.9.5"
     },
     "37": {
         "hashes": {

From 00f6898b83251ef602f7bef995830d6428fdfa78 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 24 Oct 2025 13:30:04 +0200
Subject: [PATCH 2281/6226] electron-chromedriver_36: 36.9.4 -> 36.9.5

- Changelog: https://github.com/electron/electron/releases/tag/v36.9.5
- Diff: https://github.com/electron/electron/compare/refs/tags/v36.9.4...v36.9.5
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index b82d9158fb5f..3b737f982e1b 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -12,14 +12,14 @@
     },
     "36": {
         "hashes": {
-            "aarch64-darwin": "cb8f83dc0d17d42d9e7691e27c78cc7a09aa94723b5b6989fd0dbc5f15c8aacf",
-            "aarch64-linux": "1dfb29c36d2e35ed8b02153d196c002c88cf0383b2e77ca4b7f4c4f9cac04a7e",
-            "armv7l-linux": "cab78070335eee86a80e0205759ed197a7cce9503118ecab91a9823774748c52",
-            "headers": "0fv8hz55xk76vksj8sagfhja0xx03ks8awi3sbmlinjb9m02hb9p",
-            "x86_64-darwin": "b4fefa2bf0b081cbe5c5d3a28ae3337878157702160d4181adfdcd1cb58b871e",
-            "x86_64-linux": "6a41bb459459f9280eac7d8775a53ad2b3dddb2556b2f7fa9b3458041ac9ef90"
+            "aarch64-darwin": "ad47b3386cf39ed2dfc830d4806850b784a4939a9ca132055a5b1a11f8a88835",
+            "aarch64-linux": "9b5765533abb3efc4860ea567f4f84a2ffa904d93ea19acdc118d8d4087e82b1",
+            "armv7l-linux": "9ea179c3d0c74fd51cff21d9be9bb91e11fb71f33688903574e3cc939ef8cb1a",
+            "headers": "06na5h0bx4nbb2hv867warr19dgk7ilz0w8j4mmkxmv33x7w65bd",
+            "x86_64-darwin": "f61eb6e6c9259a495e872113c5e18f9b6b3a49b658a9dd1035945aadcb40cf38",
+            "x86_64-linux": "ea24ba5853422fd1b555087aea0be59ee8bbfa98c48d65291aaee4006ceea180"
         },
-        "version": "36.9.4"
+        "version": "36.9.5"
     },
     "37": {
         "hashes": {

From 5ce8e083d7f223032bd3d648a2ec56311c127077 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 24 Oct 2025 13:30:07 +0200
Subject: [PATCH 2282/6226] electron_37-bin: 37.6.1 -> 37.7.1

- Changelog: https://github.com/electron/electron/releases/tag/v37.7.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.6.1...v37.7.1
---
 pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 594d5c8f3d10..6de99baa8ed2 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -23,14 +23,14 @@
     },
     "37": {
         "hashes": {
-            "aarch64-darwin": "90283ffbf443f3675deaad5b5c8011e04418d87215a0788e74056d5613e6dc84",
-            "aarch64-linux": "0e6a05cc3cdb2b2434b83284a33f50c448b15c85d762595770daf8eddd6d76ba",
-            "armv7l-linux": "de9a357d441af534c8f6e865e766ff625dc3cf0059be18283769424f7b853e11",
-            "headers": "0pxwny0ynvyqb3zqnharc4mkgj6acipqra1jjmf4hbr2a8m5fnc6",
-            "x86_64-darwin": "c6840760d48163badc3f253a4a6d6c432ab582b4df304389a1123f90d8313ed4",
-            "x86_64-linux": "d2bf4fe94de47fb28d45911fbbadb91acf42ee64dc96033797a80515dbec3965"
+            "aarch64-darwin": "20cf3973cfab6cde93904209845d620d3221fd49bbf39918ed28fb140d0a8e6a",
+            "aarch64-linux": "15e237fb17f7d6bfefabee229d1585204db0d7e230c118a3d5ce8fd49af7405d",
+            "armv7l-linux": "14278dd5061358521133addd0e025e466f8012640e390753df2fa92f13eae451",
+            "headers": "0p2h0517di52sziqycn0dbf9knsg243lkrbiqv2h2f5pwnskhw3w",
+            "x86_64-darwin": "ca911295a582114438f9977e4aef18a42782da0b1fd5627cc1bf7744b2548a88",
+            "x86_64-linux": "aebb0b0d7c1cb7673753766219cd828cbf6c2e86e8b29a9571284d0f7cbc963d"
         },
-        "version": "37.6.1"
+        "version": "37.7.1"
     },
     "38": {
         "hashes": {

From 60e59334ad84516648d68c052f2737136b7a8198 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 24 Oct 2025 13:30:09 +0200
Subject: [PATCH 2283/6226] electron-chromedriver_37: 37.6.1 -> 37.7.1

- Changelog: https://github.com/electron/electron/releases/tag/v37.7.1
- Diff: https://github.com/electron/electron/compare/refs/tags/v37.6.1...v37.7.1
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 3b737f982e1b..965c08e6ff2a 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -23,14 +23,14 @@
     },
     "37": {
         "hashes": {
-            "aarch64-darwin": "9a4e31dfd00edabd2cbbf109954a022e1b078e13fd5409beb3a97b6cbca54b31",
-            "aarch64-linux": "5b5ba468654a3755c9e22f9314317dca9fc8c1233c2d7ceba0fd503a9298b30b",
-            "armv7l-linux": "6f9033d862f953c95f383a6e857bae4c168cfd010f28938e5633ef8825f56014",
-            "headers": "0pxwny0ynvyqb3zqnharc4mkgj6acipqra1jjmf4hbr2a8m5fnc6",
-            "x86_64-darwin": "15b8a79ea7f4b7c8c62332f259d02f866e95dc7e6e08d795c249c93bc354dc9e",
-            "x86_64-linux": "4790138a0815e9bf12b4f1405a806fa6ec658b9ab834166272f9eba785970353"
+            "aarch64-darwin": "fba6e9342f6414f08bb49466a8cb7028b44042342a64b55a212565af3b674bfb",
+            "aarch64-linux": "c4ee6ff8d3a3a96217557360bda4271fb49ab2383b8962f458fa0b6dc77ff8e2",
+            "armv7l-linux": "1c9d6799f14c14699fee37af08af515777f4da436b9998ba74a69613e7e957da",
+            "headers": "0p2h0517di52sziqycn0dbf9knsg243lkrbiqv2h2f5pwnskhw3w",
+            "x86_64-darwin": "066d453bd62f02ecb1ddf10cfb064e6200c2af1842bd5963546f37c03eebd426",
+            "x86_64-linux": "2ce28af3e7481126d5dd9dcacdeeed39778a28892e5c594b10c0cfba06400ddb"
         },
-        "version": "37.6.1"
+        "version": "37.7.1"
     },
     "38": {
         "hashes": {

From 4fe33d15c383c9abc57e3eb4cac3f362ac7f5843 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 24 Oct 2025 13:30:12 +0200
Subject: [PATCH 2284/6226] electron_38-bin: 38.2.2 -> 38.4.0

- Changelog: https://github.com/electron/electron/releases/tag/v38.4.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v38.2.2...v38.4.0
---
 pkgs/development/tools/electron/binary/info.json | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index 6de99baa8ed2..d5d96c3f8457 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -34,13 +34,13 @@
     },
     "38": {
         "hashes": {
-            "aarch64-darwin": "323d805132db09f92b9766ff5f6845ce106c22a543b0f7a4a663d5270a76db22",
-            "aarch64-linux": "ab46f8f2b137ec1774d9a9b949697a84212cf8b4d13c67b32d8d41b0c03e5ca0",
-            "armv7l-linux": "5b9ba133ec784f7e7d14f0ec7ab867edd31c053c5f95ec188bd77895132ed192",
-            "headers": "096wv1fp5m6nlsv11hsa2jj4yr8mb8pjh16s7ip5amj0phlx5783",
-            "x86_64-darwin": "55fef7f835d471973627c511965ef090e097e07eb7a5292b3ff52a81595ea8c8",
-            "x86_64-linux": "84855f9262b6b5a2cd9944795bf5c7e11b301cb53bdd586d0912e310feec0674"
+            "aarch64-darwin": "0895d02b29b26f33fc984aa0fc06005093f6128343ecce42da89855c14c22aac",
+            "aarch64-linux": "e4567921b645c8c396835b5ba2144bd104d04a7be1582bb937c53fed21170a0d",
+            "armv7l-linux": "c485210cb616057d04ee8537308c2aec76581554e793d4f5e8da0e04a1b6105c",
+            "headers": "006xw8afgy4irkfyia1idh8nvv5n6xn59gzbqjmzqslv7b1kyz95",
+            "x86_64-darwin": "483b6185c9a0e24eed8a8d5dfcc6fdfb22790f21dc84434083fd75f998f361f3",
+            "x86_64-linux": "8e0b7f6f1eb6ceb7ac04bc6be09acc58a6ab96c3ca6f53d663b0a619c0bf06f2"
         },
-        "version": "38.2.2"
+        "version": "38.4.0"
     }
 }

From a6760c4a186274f6989e6e2f776f4aeab15fa374 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 24 Oct 2025 13:30:15 +0200
Subject: [PATCH 2285/6226] electron-chromedriver_38: 38.2.2 -> 38.4.0

- Changelog: https://github.com/electron/electron/releases/tag/v38.4.0
- Diff: https://github.com/electron/electron/compare/refs/tags/v38.2.2...v38.4.0
---
 .../tools/electron/chromedriver/info.json          | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 965c08e6ff2a..641805a3b778 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -34,13 +34,13 @@
     },
     "38": {
         "hashes": {
-            "aarch64-darwin": "5e353ab266b42c80145ce4d39f359016bfff58f534032e565f16f3d0be7bb726",
-            "aarch64-linux": "8ac413b566389f0c4daa1c94fc595248a59da6587c4db4e9e0693c4a2caf37fa",
-            "armv7l-linux": "d1abf283b0af0d1c6daba8eca1668378ed29ab68d1493a370337b99652eb7466",
-            "headers": "096wv1fp5m6nlsv11hsa2jj4yr8mb8pjh16s7ip5amj0phlx5783",
-            "x86_64-darwin": "964260edb04cd53b8448daa5a6392ff78d5123c56368c3f8708a431cac03c619",
-            "x86_64-linux": "f6bbb6ca7b5a1033576c8634e98a2538ae4fc085e5caccc03d7c036b45f030ac"
+            "aarch64-darwin": "7249795788e05d625944f0c0234928eb8176ff0ac03177628d06606975bcfbbe",
+            "aarch64-linux": "f47d45fb8c153fee979564bca8491e2588f0848f03087bb38573ebfbe62e63aa",
+            "armv7l-linux": "36c65512c5eec0ab9741a06e91b38a503de00c1e39cf177db676f5c665f357f4",
+            "headers": "006xw8afgy4irkfyia1idh8nvv5n6xn59gzbqjmzqslv7b1kyz95",
+            "x86_64-darwin": "e3a3dfc38b5f45ad884d2ac8eb165331247c5dbed030f925508fc8ff95a53f1e",
+            "x86_64-linux": "af7e2c995608b2635ea484ed2589a7ff7f79e3b05dd8c14a332f78c13b2a6892"
         },
-        "version": "38.2.2"
+        "version": "38.4.0"
     }
 }

From 78b661a8004ec1c2bcc23c1a0adef413edc7af0e Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Fri, 24 Oct 2025 13:32:27 +0200
Subject: [PATCH 2286/6226] ocamlPackages.ninja_utils: 0.9.0 -> 1.0.0

---
 .../ocaml-modules/ninja_utils/default.nix      | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/ninja_utils/default.nix b/pkgs/development/ocaml-modules/ninja_utils/default.nix
index 6d92745caacb..9740694f71bf 100644
--- a/pkgs/development/ocaml-modules/ninja_utils/default.nix
+++ b/pkgs/development/ocaml-modules/ninja_utils/default.nix
@@ -1,19 +1,21 @@
 {
   lib,
-  fetchzip,
+  fetchFromGitHub,
   buildDunePackage,
   re,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "ninja_utils";
-  version = "0.9.0";
+  version = "1.0.0";
 
   minimalOCamlVersion = "4.12";
 
-  src = fetchzip {
-    url = "https://github.com/CatalaLang/ninja_utils/archive/refs/tags/${version}.tar.gz";
-    hash = "sha256-VSj1IXfczoI3lSAtOqQPIqsxX+HgyxKzlssKd7By/Lo=";
+  src = fetchFromGitHub {
+    owner = "CatalaLang";
+    repo = "ninja_utils";
+    tag = finalAttrs.version;
+    hash = "sha256-2OYsZVk7/KYHXHTqAAEyVEHzcUCC+vBRU1s1XdfnWaE=";
   };
 
   propagatedBuildInputs = [ re ];
@@ -22,6 +24,6 @@ buildDunePackage rec {
     description = "Small library used to generate Ninja build files";
     homepage = "https://github.com/CatalaLang/ninja_utils";
     license = lib.licenses.asl20;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.stepbrobd ];
   };
-}
+})

From fcbd896014528070a8a597606d2d3a23d523485a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 11:35:24 +0000
Subject: [PATCH 2287/6226] chirp: 0.4.0-unstable-2025-10-14 ->
 0.4.0-unstable-2025-10-23

---
 pkgs/by-name/ch/chirp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix
index 25f2d3ce8076..dcdc2a67546c 100644
--- a/pkgs/by-name/ch/chirp/package.nix
+++ b/pkgs/by-name/ch/chirp/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "chirp";
-  version = "0.4.0-unstable-2025-10-14";
+  version = "0.4.0-unstable-2025-10-23";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kk7ds";
     repo = "chirp";
-    rev = "1e7dd4b2b83980dba5020b3787fa4c3f4dc5b68a";
-    hash = "sha256-zzkppK0B1udSODKwLOJtE0kEQVLWD9xMhNvnH0wzoK0=";
+    rev = "8116c3782a6b6b7112cc372f0b423853d3645f5a";
+    hash = "sha256-64QKsdNL5HcjYHMH1H03Nm5PqH5ypkpeX9uqN2GdnuI=";
   };
 
   nativeBuildInputs = [

From edc593f20ae494da6bb43f801f256858315878e7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 22 Oct 2025 19:27:24 +0000
Subject: [PATCH 2288/6226] python3Packages.imageio: 2.37.0 -> 2.37.1

Diff: https://github.com/imageio/imageio/compare/v2.37.0...v2.37.1

Changelog: https://github.com/imageio/imageio/blob/v2.37.1/CHANGELOG.md
---
 .../python-modules/imageio/default.nix        | 26 ++-----------------
 1 file changed, 2 insertions(+), 24 deletions(-)

diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix
index 68dcc85cf483..8811e6c7ce27 100644
--- a/pkgs/development/python-modules/imageio/default.nix
+++ b/pkgs/development/python-modules/imageio/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   isPyPy,
-  fetchpatch,
 
   # build-system
   setuptools,
@@ -44,29 +43,16 @@ in
 
 buildPythonPackage rec {
   pname = "imageio";
-  version = "2.37.0";
+  version = "2.37.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "imageio";
     repo = "imageio";
     tag = "v${version}";
-    hash = "sha256-/nxJxZrTYX7F2grafIWwx9SyfR47ZXyaUwPHMEOdKkI=";
+    hash = "sha256-eNS++8pD+m51IxRR23E98K0f3rwNez/UiByA+PSfUH8=";
   };
 
-  patches = [
-    (fetchpatch {
-      # https://github.com/imageio/imageio/issues/1139
-      # https://github.com/imageio/imageio/pull/1144
-      name = "fix-pyav-13-1-compat";
-      url = "https://github.com/imageio/imageio/commit/eadfc5906f5c2c3731f56a582536dbc763c3a7a9.patch";
-      excludes = [
-        "setup.py"
-      ];
-      hash = "sha256-ycsW1YXtiO3ZecIF1crYaX6vg/nRW4bF4So5uWCVzME=";
-    })
-  ];
-
   postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
     substituteInPlace tests/test_core.py \
       --replace-fail 'ctypes.util.find_library("GL")' '"${libgl}"'
@@ -112,14 +98,6 @@ buildPythonPackage rec {
 
   pytestFlags = [ "--test-images=file://${test_images}" ];
 
-  disabledTests = [
-    # These should have had `needs_internet` mark applied but don't so far.
-    # See https://github.com/imageio/imageio/pull/1142
-    "test_read_stream"
-    "test_uri_reading"
-    "test_trim_filter"
-  ];
-
   disabledTestMarks = [ "needs_internet" ];
 
   # These tests require the old and vulnerable freeimage binaries; skip.

From d9b3891fe8d7351be3965f533ce2f2338de989ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 11:48:42 +0000
Subject: [PATCH 2289/6226] cargo-nextest: 0.9.106 -> 0.9.108

---
 pkgs/by-name/ca/cargo-nextest/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix
index d8b989e13460..2089b3bee2c4 100644
--- a/pkgs/by-name/ca/cargo-nextest/package.nix
+++ b/pkgs/by-name/ca/cargo-nextest/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-nextest";
-  version = "0.9.106";
+  version = "0.9.108";
 
   src = fetchFromGitHub {
     owner = "nextest-rs";
     repo = "nextest";
     rev = "cargo-nextest-${version}";
-    hash = "sha256-jgxoEKl6kAF8dj6TB42nSXE8Ez/da/yagbVVHcC0L0Q=";
+    hash = "sha256-DY/FNtlNQg9Ym6PKo6UqSuWzGC3cDhbNU6MKTDxIaU4=";
   };
 
-  cargoHash = "sha256-XM9N74w5lbQFC6uZO3Vy45puZxSe6bthZwOQVrLv3ac=";
+  cargoHash = "sha256-uQH9d+9VByXe/lL4Ybz07p+iYWUhbATMBCu7mYKxOSE=";
 
   cargoBuildFlags = [
     "-p"

From c6f8d6bf54ed5831e1526d66da145b3dd04f1837 Mon Sep 17 00:00:00 2001
From: Felix Breidenstein <mail@felixbreidenstein.de>
Date: Fri, 24 Oct 2025 14:09:08 +0200
Subject: [PATCH 2290/6226] prometheus-storagebox-exporter: Fix typo and add me
 as maintainer

---
 pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix b/pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix
index f9b5b50b1696..f27b93433e8c 100644
--- a/pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-storagebox-exporter/package.nix
@@ -19,11 +19,12 @@ buildGoModule rec {
 
   meta = {
     description = "Prometheus exporter for Hetzner storage boxes";
-    homepage = "https://github.com/fleaz/prometheus-storage-exporter";
+    homepage = "https://github.com/fleaz/prometheus-storagebox-exporter";
     license = lib.licenses.mit;
     mainProgram = "prometheus-storagebox-exporter";
     maintainers = with lib.maintainers; [
       erethon
+      fleaz
     ];
   };
 }

From 0e6c2a2595ad24da85b1086cb228ae931daabcec Mon Sep 17 00:00:00 2001
From: Zhaith Izaliel <zhaith.izaliel@ethereal-edelweiss.cloud>
Date: Fri, 24 Oct 2025 14:22:58 +0200
Subject: [PATCH 2291/6226] nixos/iio-niri: move from programs to services/misc

The module was wrongly put in programs following PR #454551 and we didn't catch it during review. This commit fixes that issue so the path is compliant to the guidelines.
---
 nixos/modules/module-list.nix                          | 2 +-
 nixos/modules/{programs => services/misc}/iio-niri.nix | 0
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename nixos/modules/{programs => services/misc}/iio-niri.nix (100%)

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2f84328f30d4..4d37bdd41875 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -240,7 +240,6 @@
   ./programs/iay.nix
   ./programs/iftop.nix
   ./programs/iio-hyprland.nix
-  ./programs/iio-niri.nix
   ./programs/immersed.nix
   ./programs/iotop.nix
   ./programs/java.nix
@@ -857,6 +856,7 @@
   ./services/misc/heisenbridge.nix
   ./services/misc/homepage-dashboard.nix
   ./services/misc/ihaskell.nix
+  ./services/misc/iio-niri.nix
   ./services/misc/input-remapper.nix
   ./services/misc/invidious-router.nix
   ./services/misc/irkerd.nix
diff --git a/nixos/modules/programs/iio-niri.nix b/nixos/modules/services/misc/iio-niri.nix
similarity index 100%
rename from nixos/modules/programs/iio-niri.nix
rename to nixos/modules/services/misc/iio-niri.nix

From bdcdbfb403984fed97e6d9b8bc67bd6dd1115d3d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 12:34:07 +0000
Subject: [PATCH 2292/6226] libminc: 2.4.06 -> 2.4.07

---
 pkgs/by-name/li/libminc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libminc/package.nix b/pkgs/by-name/li/libminc/package.nix
index c30eab86fe5b..207f215e5653 100644
--- a/pkgs/by-name/li/libminc/package.nix
+++ b/pkgs/by-name/li/libminc/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libminc";
-  version = "2.4.06";
+  version = "2.4.07";
 
   src = fetchFromGitHub {
     owner = "BIC-MNI";
     repo = "libminc";
     tag = "release-${finalAttrs.version}";
-    hash = "sha256-HTt3y0AFM9pkEkWPb9cDmvUz4iBQWfpX7wLF9Vlg8hc=";
+    hash = "sha256-F5c0S4fybkrdpDJQ0nz6MvTdjq1qM1nJVxXuxXbCeSI=";
   };
 
   postPatch = ''

From 1bbcb16d61c7c755529c4f2a3dd5449fa02d86e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Fri, 24 Oct 2025 12:37:26 +0000
Subject: [PATCH 2293/6226] ceph: Re-add comment, remove unnecessary rec

---
 pkgs/by-name/ce/ceph/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ce/ceph/package.nix b/pkgs/by-name/ce/ceph/package.nix
index a468bc88985d..4f8371cd7d2b 100644
--- a/pkgs/by-name/ce/ceph/package.nix
+++ b/pkgs/by-name/ce/ceph/package.nix
@@ -31,6 +31,10 @@
   nixosTests,
 
   # Runtime dependencies
+
+  # Remove once Ceph supports arrow-cpp >= 20, see:
+  # * https://tracker.ceph.com/issues/71269
+  # * https://github.com/NixOS/nixpkgs/issues/406306
   ceph-arrow-cpp ? callPackage ./arrow-cpp-19.nix { },
   babeltrace,
   # Note when trying to upgrade boost:
@@ -373,7 +377,7 @@ let
     hash = "sha256-zlgp28C81SZbaFJ4yvQk4ZgYz4K/aZqtcISTO8LscSU=";
   };
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "ceph";
   inherit src version;
 

From ecbfebd5f8be49158abc315feeaed2a6ad81b098 Mon Sep 17 00:00:00 2001
From: Fernando Rodrigues <alpha@sigmasquadron.net>
Date: Fri, 24 Oct 2025 23:27:04 +1100
Subject: [PATCH 2294/6226] xen: patch with XSA-476

            Xen Security Advisory CVE-2025-58149 / XSA-476

         Incorrect removal of permissions on PCI device unplug

When passing through PCI devices, the detach logic in libxl won't remove
access permissions to any 64bit memory BARs the device might have.  As a
result a domain can still have access any 64bit memory BAR when such
device is no longer assigned to the domain.

For PV domains the permission leak allows the domain itself to map the memory
in the page-tables.  For HVM it would require a compromised device model or
stubdomain to map the leaked memory into the HVM domain p2m.

Signed-off-by: Fernando Rodrigues <alpha@sigmasquadron.net>
---
 pkgs/by-name/xe/xen/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/xe/xen/package.nix b/pkgs/by-name/xe/xen/package.nix
index e5910918c62f..e8645badd14d 100644
--- a/pkgs/by-name/xe/xen/package.nix
+++ b/pkgs/by-name/xe/xen/package.nix
@@ -225,6 +225,12 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://xenbits.xen.org/xsa/xsa475-2.patch";
       hash = "sha256-7MKtDAJpihpfcBK+hyBFGCP6gHWs2cdgTks8B439b2s=";
     })
+
+    # XSA 476
+    (fetchpatch {
+      url = "https://xenbits.xen.org/xsa/xsa476-4.20.patch";
+      hash = "sha256-nZUHcMr9RpQqrazG+RtTw+/s1gzqN1D565RuQjuALTQ=";
+    })
   ];
 
   outputs = [

From 1af2746f1964659bb10faac5e0cfb391d90fd44b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 12:39:17 +0000
Subject: [PATCH 2295/6226] werf: 2.51.0 -> 2.51.1

---
 pkgs/by-name/we/werf/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix
index aa6b909aa062..e907e3f79c11 100644
--- a/pkgs/by-name/we/werf/package.nix
+++ b/pkgs/by-name/we/werf/package.nix
@@ -10,17 +10,17 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "werf";
-  version = "2.51.0";
+  version = "2.51.1";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZvEX834FLSQ5va5hbWxDibx0D6r9RZ8y4S6kNhVUEpM=";
+    hash = "sha256-8tmBzwvuYv3FvSNFpu51fYZP1nqQHtfKioY6eycf7W8=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-qy0eDvDSvudNRSmYwl3YUOpZJ/I0GQ6ITUVQCZCG4eU=";
+  vendorHash = "sha256-v2/b618nKua8+y7Imyz3+expBQlIS13TWkNRMh2NCVo=";
 
   subPackages = [ "cmd/werf" ];
 

From 3b63975e4cfdec14118a1b7e2527614269ccfd93 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 10 Oct 2025 14:59:49 +0200
Subject: [PATCH 2296/6226] typst: 0.13.1 -> 0.14.0

---
 pkgs/by-name/ty/typst/package.nix | 25 ++++++++++++++++++-------
 1 file changed, 18 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix
index dffa2109626d..5656247c28d3 100644
--- a/pkgs/by-name/ty/typst/package.nix
+++ b/pkgs/by-name/ty/typst/package.nix
@@ -12,16 +12,22 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "typst";
-  version = "0.13.1";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "typst";
     repo = "typst";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vbBwIQt4xWZaKpXgFwDsRQIQ0mmsQPRR39m8iZnnuj0=";
+    hash = "sha256-Sdl60VNjrSVj8YFZR/b2WOzN8taZ6wsJx5FnED9XQbw=";
+    leaveDotGit = true;
+    postFetch = ''
+      cd $out
+      git rev-parse HEAD > COMMIT
+      rm -rf .git
+    '';
   };
 
-  cargoHash = "sha256-4kVj2BODEFjLcrh5sxfcgsdLF2Zd3K1GnhA4DEz1Nl4=";
+  cargoHash = "sha256-6o7IbDBJU+FGYezfm37Z4eBBWa7G06vFbopI0FqJu7c=";
 
   nativeBuildInputs = [
     installShellFiles
@@ -35,14 +41,19 @@ rustPlatform.buildRustPackage (finalAttrs: {
   env = {
     GEN_ARTIFACTS = "artifacts";
     OPENSSL_NO_VENDOR = true;
-    # to not have "unknown hash" in help output
-    TYPST_VERSION = finalAttrs.version;
   };
 
   # Fix for "Found argument '--test-threads' which wasn't expected, or isn't valid in this context"
   postPatch = ''
-    substituteInPlace tests/src/tests.rs --replace-fail 'ARGS.num_threads' 'ARGS.test_threads'
-    substituteInPlace tests/src/args.rs --replace-fail 'num_threads' 'test_threads'
+    substituteInPlace tests/src/tests.rs --replace-fail \
+      'ARGS.num_threads' \
+      'ARGS.test_threads'
+    substituteInPlace tests/src/args.rs --replace-fail \
+      'num_threads' \
+      'test_threads'
+    substituteInPlace crates/typst-cli/build.rs --replace-fail \
+      '"cargo:rustc-env=TYPST_COMMIT_SHA={}", typst_commit_sha()' \
+      "\"cargo:rustc-env=TYPST_COMMIT_SHA={}\", \"$(cat COMMIT | cut -c1-8)\""
   '';
 
   postInstall = ''

From e6edb4dffd2273502d9a16880315072b01eeef83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 12:57:16 +0000
Subject: [PATCH 2297/6226] trickest-cli: 2.1.4 -> 2.1.5

---
 pkgs/by-name/tr/trickest-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/trickest-cli/package.nix b/pkgs/by-name/tr/trickest-cli/package.nix
index 0e2f3c3a2b69..c1b89dd2e06b 100644
--- a/pkgs/by-name/tr/trickest-cli/package.nix
+++ b/pkgs/by-name/tr/trickest-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "trickest-cli";
-  version = "2.1.4";
+  version = "2.1.5";
 
   src = fetchFromGitHub {
     owner = "trickest";
     repo = "trickest-cli";
     tag = "v${version}";
-    hash = "sha256-zE52gBcajw62sSyjd50PDiC6cTLQl8r18UL2XIoLkY0=";
+    hash = "sha256-4KVrDUmart2jGKFOGmHeBoy8ctA5wOYNRt2Udrf82/I=";
   };
 
   vendorHash = "sha256-Ae0fNzYOAeCMrNFVhw4VvG/BkOMcguIMiBvLGt7wxEo=";

From 5e76166896ae9747d30263807d5a2f106eb7fd9b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 12:58:26 +0000
Subject: [PATCH 2298/6226] python3Packages.pyocd: 0.39.0 -> 0.40.0

---
 pkgs/development/python-modules/pyocd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyocd/default.nix b/pkgs/development/python-modules/pyocd/default.nix
index 76415696d58d..50d26bb5e8d8 100644
--- a/pkgs/development/python-modules/pyocd/default.nix
+++ b/pkgs/development/python-modules/pyocd/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "pyocd";
-  version = "0.39.0";
+  version = "0.40.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyocd";
     repo = "pyOCD";
     tag = "v${version}";
-    hash = "sha256-/jFH6h8RmLupSyzf4mXNzhfbuAAfqkfWFSfQmGMVDRE=";
+    hash = "sha256-rF2sr7aL2kceo1zBwBZcOYpAc0CTohF/1TbGF95iyIk=";
   };
 
   pythonRelaxDeps = [ "capstone" ];

From d26eb65aa2bf9f6fadc14b005963a391c317647e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 12:59:04 +0000
Subject: [PATCH 2299/6226] flashmq: 1.23.1 -> 1.23.2

---
 pkgs/by-name/fl/flashmq/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fl/flashmq/package.nix b/pkgs/by-name/fl/flashmq/package.nix
index 6f76b375d314..37bf3f49f16e 100644
--- a/pkgs/by-name/fl/flashmq/package.nix
+++ b/pkgs/by-name/fl/flashmq/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flashmq";
-  version = "1.23.1";
+  version = "1.23.2";
 
   src = fetchFromGitHub {
     owner = "halfgaar";
     repo = "FlashMQ";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-to+BCn7/fa1YcjCudrOY0otzEkIx9ocSwkUnFGnjuxU=";
+    hash = "sha256-v/gc9YVIBTQP8/wnYKucBQci/8oz+Xo9BTorAV6Jxqs=";
   };
 
   nativeBuildInputs = [

From 7778178dfda48f83c36f5a8479698d27adad5285 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:01:43 +0200
Subject: [PATCH 2300/6226] python312Packages.mypy-boto3-account: 1.40.0 ->
 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index cda7504ab743..598c088f092b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -50,8 +50,8 @@ in
       "sha256-hY5aShO9E5zMwPSUUucjgG2Bod0lAm51BZyLP/1JLgY=";
 
   mypy-boto3-account =
-    buildMypyBoto3Package "account" "1.40.0"
-      "sha256-isNBcceGQXkVPZQ9XNVGt9eCHxUidaHVJbuPmSjYOcc=";
+    buildMypyBoto3Package "account" "1.40.58"
+      "sha256-ZZe7b7krR5JrDWUS+YZcZGbFrRemvX7Ohz8xWPtVGDQ=";
 
   mypy-boto3-acm =
     buildMypyBoto3Package "acm" "1.40.0"

From 59fffe5f80325fce71af39b034a498070ad96166 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:01:46 +0200
Subject: [PATCH 2301/6226] python312Packages.mypy-boto3-appfabric: 1.40.15 ->
 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 598c088f092b..2656e9439880 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -98,8 +98,8 @@ in
       "sha256-Unxc01GzvKZGiKlW3o3ZrEZXthJPlMY1tu0vnUgYmq4=";
 
   mypy-boto3-appfabric =
-    buildMypyBoto3Package "appfabric" "1.40.15"
-      "sha256-wLCPBODUaTw6VdnbZ0bD9BzIVTPuGpVlZfeGBZY95B8=";
+    buildMypyBoto3Package "appfabric" "1.40.57"
+      "sha256-X7RcwPwiYMSaj7QN8NHekxaLyzG7A+LcvJSElkeKZm0=";
 
   mypy-boto3-appflow =
     buildMypyBoto3Package "appflow" "1.40.17"

From 6c4804e03cf06260fc96b3608564ccc10cc9c48d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:01:48 +0200
Subject: [PATCH 2302/6226] 
 python312Packages.mypy-boto3-application-autoscaling: 1.40.0 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 2656e9439880..16b64152706b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -110,8 +110,8 @@ in
       "sha256-JYfNdS/e3ftDshlXoVVTfw2+zQUuGy+rpdM0dIrD7dM=";
 
   mypy-boto3-application-autoscaling =
-    buildMypyBoto3Package "application-autoscaling" "1.40.0"
-      "sha256-XMvGnZjdb8sQ8QES1CkZD7VkditEdudUGPVaYwF25Fk=";
+    buildMypyBoto3Package "application-autoscaling" "1.40.58"
+      "sha256-94en37HywYX3u+7hR13d0wLmtjc1HyHclMMQotzL2dQ=";
 
   mypy-boto3-application-insights =
     buildMypyBoto3Package "application-insights" "1.40.55"

From 6d726be521c97794e3603ce9e21e634cbe9a2595 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:01:50 +0200
Subject: [PATCH 2303/6226] python312Packages.mypy-boto3-autoscaling: 1.40.27
 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 16b64152706b..2c1c12193a35 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -150,8 +150,8 @@ in
       "sha256-p8jnTJigD8QuLe3vjZwE7ZyGgBblpSdM0II0Cr/xFS8=";
 
   mypy-boto3-autoscaling =
-    buildMypyBoto3Package "autoscaling" "1.40.27"
-      "sha256-lnejEICkgHqQWfiN3LyNIHzDjfpgP2GlAr6acRP/wFo=";
+    buildMypyBoto3Package "autoscaling" "1.40.57"
+      "sha256-haVFlPVqDuB6ZjhQ7ZOF57jfC8mNGXStDhzuMnObeiw=";
 
   mypy-boto3-autoscaling-plans =
     buildMypyBoto3Package "autoscaling-plans" "1.40.54"

From 0e2d6ac1c734628e4ea15ca000a6fc095087a480 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:01:53 +0200
Subject: [PATCH 2304/6226] python312Packages.mypy-boto3-ce: 1.40.40 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 2c1c12193a35..5b036932c075 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -182,8 +182,8 @@ in
       "sha256-UzM2sg9jxU/kU6kmMizVJwYLqq+nrZi+D6GLHYPdmJQ=";
 
   mypy-boto3-ce =
-    buildMypyBoto3Package "ce" "1.40.40"
-      "sha256-ygUnU/oDBQPqmRfZ6jKMnvVXdORQkBuC57UyXjV6Xi0=";
+    buildMypyBoto3Package "ce" "1.40.57"
+      "sha256-CkrC654ywHbtXrfbACWlJlQzIi7DeftaKmk/uLyIML4=";
 
   mypy-boto3-chime =
     buildMypyBoto3Package "chime" "1.40.19"

From e6bff553cdddb0a437981fe8f3441b5dc959a4df Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:01:55 +0200
Subject: [PATCH 2305/6226] python312Packages.mypy-boto3-chime-sdk-voice:
 1.40.42 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5b036932c075..686141a3af74 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -206,8 +206,8 @@ in
       "sha256-knAtab953lppnI8SioY6V3nMN6pt/l5p4XEsE3CpDGc=";
 
   mypy-boto3-chime-sdk-voice =
-    buildMypyBoto3Package "chime-sdk-voice" "1.40.42"
-      "sha256-axa2niA9HlLpV9Tf01p0fG2GhK2lNlCM/O8LLPHQVRc=";
+    buildMypyBoto3Package "chime-sdk-voice" "1.40.58"
+      "sha256-yJHnaO8KvjYYWiJF8c4lrnf6Px2FyjSsMZsSjVFdkE0=";
 
   mypy-boto3-cleanrooms =
     buildMypyBoto3Package "cleanrooms" "1.40.45"

From d3f9e91b6847db643b0e5391b61930785cf5aa97 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:01:56 +0200
Subject: [PATCH 2306/6226] python312Packages.mypy-boto3-cloudformation:
 1.40.44 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 686141a3af74..5faac0a23cf4 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -226,8 +226,8 @@ in
       "sha256-fFnHwgB8r239cpVnWSfeiGO1MNOxkXn9MNMUA5ohm04=";
 
   mypy-boto3-cloudformation =
-    buildMypyBoto3Package "cloudformation" "1.40.44"
-      "sha256-PYL1UEOCyGrRlaG4CiqC9zWHw34bY2hk67hd1DvXmls=";
+    buildMypyBoto3Package "cloudformation" "1.40.57"
+      "sha256-/JUfWJH6NFtSVpc/OKhDbYCkKJxcYh1S/py3v2Q0i34=";
 
   mypy-boto3-cloudfront =
     buildMypyBoto3Package "cloudfront" "1.40.55"

From e71d09614a3bc270651da48c1126219644d33b97 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:01:57 +0200
Subject: [PATCH 2307/6226] python312Packages.mypy-boto3-cloudhsm: 1.40.15 ->
 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5faac0a23cf4..6416164e43a5 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -234,8 +234,8 @@ in
       "sha256-3md69cxJv7R4cXqznJtz4+r6MvFw22EckaYzCfBJS28=";
 
   mypy-boto3-cloudhsm =
-    buildMypyBoto3Package "cloudhsm" "1.40.15"
-      "sha256-qr7Okanc/7cgrb31a6mxb23S8nvw3iztCcbGNHcMIhk=";
+    buildMypyBoto3Package "cloudhsm" "1.40.57"
+      "sha256-XlV7rtzGlcL4iTrJmADZQdlvtAJFBDEUlP1kkeI9kQU=";
 
   mypy-boto3-cloudhsmv2 =
     buildMypyBoto3Package "cloudhsmv2" "1.40.20"

From 51d1e78905fd5e1a25f80d9a7c0d3a975551f41b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:01:58 +0200
Subject: [PATCH 2308/6226] python312Packages.mypy-boto3-cloudhsmv2: 1.40.20 ->
 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 6416164e43a5..21c70d0d0684 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -238,8 +238,8 @@ in
       "sha256-XlV7rtzGlcL4iTrJmADZQdlvtAJFBDEUlP1kkeI9kQU=";
 
   mypy-boto3-cloudhsmv2 =
-    buildMypyBoto3Package "cloudhsmv2" "1.40.20"
-      "sha256-t5daUK4Nv1R+9uvRYdbOvDWP77A1GhH34w4XkCdIkb0=";
+    buildMypyBoto3Package "cloudhsmv2" "1.40.57"
+      "sha256-T9ek0te0KDC5Z3kdsprbEm9LvmlfbSW7Nnoi5s4hGWg=";
 
   mypy-boto3-cloudsearch =
     buildMypyBoto3Package "cloudsearch" "1.40.17"

From b12c9de1ee0e3ec5be1fe1c0c13cec43acbe3416 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:00 +0200
Subject: [PATCH 2309/6226] python312Packages.mypy-boto3-cloudtrail-data:
 1.40.17 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 21c70d0d0684..4a7c3df358be 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -254,8 +254,8 @@ in
       "sha256-aV+fpcURVMZv7jOsZ/LF6edo4doNZPtCwdG4YEGKMYc=";
 
   mypy-boto3-cloudtrail-data =
-    buildMypyBoto3Package "cloudtrail-data" "1.40.17"
-      "sha256-ghgArlI9Z/rk9kM6k6b+0x/Fugp7q25+uV+Y2dZFtSU=";
+    buildMypyBoto3Package "cloudtrail-data" "1.40.58"
+      "sha256-ywvJwaPTrQIoZ6xrQtK1/7FFVMM59ls1HOCUFSA9Pv0=";
 
   mypy-boto3-cloudwatch =
     buildMypyBoto3Package "cloudwatch" "1.40.38"

From c53eabf91d59d769efe68a760284c3044b7147c0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:01 +0200
Subject: [PATCH 2310/6226] python312Packages.mypy-boto3-codebuild: 1.40.8 ->
 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 4a7c3df358be..7825a6fc3357 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -266,8 +266,8 @@ in
       "sha256-XqaCY0uawL5BKmcTl1D3uz1EgsKn3wtph036TX07/Fg=";
 
   mypy-boto3-codebuild =
-    buildMypyBoto3Package "codebuild" "1.40.8"
-      "sha256-D3uNdpK45WYJfwf1mr12+e+7uw0dj7ChCmSDel0cNw4=";
+    buildMypyBoto3Package "codebuild" "1.40.58"
+      "sha256-IluCF13Ch70pP6vikKKgr0eN/SeiFLb8Cnxio6S58AU=";
 
   mypy-boto3-codecatalyst =
     buildMypyBoto3Package "codecatalyst" "1.40.0"

From b9ef6ccfcc927cd4a8fc4f8debc55e42eeea38b7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:03 +0200
Subject: [PATCH 2311/6226] python312Packages.mypy-boto3-codeguru-reviewer:
 1.40.20 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 7825a6fc3357..72f5ae1dd4b1 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -282,8 +282,8 @@ in
       "sha256-1YBZlgDBAmYmkSgI0BGWAlyDGwSEjISd+NDqk2PPlbI=";
 
   mypy-boto3-codeguru-reviewer =
-    buildMypyBoto3Package "codeguru-reviewer" "1.40.20"
-      "sha256-ijOEA6FwLfHIUa+Tt6OQek7oJ4bJf4tRG+Q2QeIh1Rk=";
+    buildMypyBoto3Package "codeguru-reviewer" "1.40.57"
+      "sha256-0gWiYnCPGcCc4CWDKOrlQxYjnGzB+rC8bWPBth4W5ZQ=";
 
   mypy-boto3-codeguru-security =
     buildMypyBoto3Package "codeguru-security" "1.40.17"

From d79f21eec377eb04cc9ca5b3d98b198923c7cf02 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:04 +0200
Subject: [PATCH 2312/6226] python312Packages.mypy-boto3-codestar-connections:
 1.40.18 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 72f5ae1dd4b1..da4e282659d9 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -302,8 +302,8 @@ in
       "sha256-B9Aq+hh9BOzCIYMkS21IZYb3tNCnKnV2OpSIo48aeJM=";
 
   mypy-boto3-codestar-connections =
-    buildMypyBoto3Package "codestar-connections" "1.40.18"
-      "sha256-NNVGx+fN0apfT84GbtQjK6YX30bIomIPUaK9RFOsrVQ=";
+    buildMypyBoto3Package "codestar-connections" "1.40.58"
+      "sha256-cAx1/vNghHwT3nx9ExfLw9jS/T6TqVkVhmXZrqI+OHQ=";
 
   mypy-boto3-codestar-notifications =
     buildMypyBoto3Package "codestar-notifications" "1.40.55"

From a6b65ab18888ac8f6d1a9a11ce871b4714ca8dd2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:06 +0200
Subject: [PATCH 2313/6226] python312Packages.mypy-boto3-cognito-identity:
 1.40.15 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index da4e282659d9..887881b93298 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -310,8 +310,8 @@ in
       "sha256-MWnreUSpk4QdquRu1X4/HL9imPSYgl4fJz1BxJvcyPk=";
 
   mypy-boto3-cognito-identity =
-    buildMypyBoto3Package "cognito-identity" "1.40.15"
-      "sha256-dcRx6MHTZl2tdroNAqvkTtj74tbMULAlw5pkWs57NOk=";
+    buildMypyBoto3Package "cognito-identity" "1.40.57"
+      "sha256-IvcJJ7cUxoykNC7fryAtZ3w1WMypqj0jgBUoo/rGA7Q=";
 
   mypy-boto3-cognito-idp =
     buildMypyBoto3Package "cognito-idp" "1.40.14"

From 7db5478c6a51eb876bf61fabf32a4b584cc67849 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:07 +0200
Subject: [PATCH 2314/6226] python312Packages.mypy-boto3-comprehendmedical:
 1.40.18 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 887881b93298..40005c161544 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -326,8 +326,8 @@ in
       "sha256-8lrg38NrNjdyZ/8qKsD1glKqnzrwPvkQ1RAk3qiCi3Q=";
 
   mypy-boto3-comprehendmedical =
-    buildMypyBoto3Package "comprehendmedical" "1.40.18"
-      "sha256-z/pN67x0vam1aGd+24ZJHSdOp04A/Di179ymtUw/61Q=";
+    buildMypyBoto3Package "comprehendmedical" "1.40.57"
+      "sha256-P/frAydh31frX9xNis2vyi2XbswpcA0BJXW8TJKncFg=";
 
   mypy-boto3-compute-optimizer =
     buildMypyBoto3Package "compute-optimizer" "1.40.0"

From 7b2f3042afa7a020aebac96a6f9707080126ba1c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:08 +0200
Subject: [PATCH 2315/6226] python312Packages.mypy-boto3-config: 1.40.35 ->
 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 40005c161544..6dfc6ad3a972 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -334,8 +334,8 @@ in
       "sha256-CSfC9Kg73LydRU5aH4kqdc0pJWqEf98ebu6FOBE7oVU=";
 
   mypy-boto3-config =
-    buildMypyBoto3Package "config" "1.40.35"
-      "sha256-MIxmEy+/mlDwWKpHrb0jo8Yu1C7+xP6JRNvUeDmlfZ0=";
+    buildMypyBoto3Package "config" "1.40.58"
+      "sha256-Nan0PBHJ2VtjEhORN0OdUC9TCuCNtOpICQ8WRHn6/YI=";
 
   mypy-boto3-connect =
     buildMypyBoto3Package "connect" "1.40.52"

From 1bcb42be1609550615e020f328a82cbc8e6a656e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:09 +0200
Subject: [PATCH 2316/6226] python312Packages.mypy-boto3-connect: 1.40.52 ->
 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 6dfc6ad3a972..edc223f46d7e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -338,8 +338,8 @@ in
       "sha256-Nan0PBHJ2VtjEhORN0OdUC9TCuCNtOpICQ8WRHn6/YI=";
 
   mypy-boto3-connect =
-    buildMypyBoto3Package "connect" "1.40.52"
-      "sha256-Y4inB+VA4aWEsef389vf2K0K6uvGxsAugtetxnKCSfU=";
+    buildMypyBoto3Package "connect" "1.40.57"
+      "sha256-bLIiGOeSI9DCIxqUQx6+g5wnidyceT7lxbj5i0rhpdg=";
 
   mypy-boto3-connect-contact-lens =
     buildMypyBoto3Package "connect-contact-lens" "1.40.0"

From 2ae73ef056cabb1314de3a3cc0e20a9139ad68d9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:10 +0200
Subject: [PATCH 2317/6226] python312Packages.mypy-boto3-connect-contact-lens:
 1.40.0 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index edc223f46d7e..a0274ffd01f6 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -342,8 +342,8 @@ in
       "sha256-bLIiGOeSI9DCIxqUQx6+g5wnidyceT7lxbj5i0rhpdg=";
 
   mypy-boto3-connect-contact-lens =
-    buildMypyBoto3Package "connect-contact-lens" "1.40.0"
-      "sha256-sRuNGX0Xy9sQmHpWZtjbMYTSFgAzTAuNke4uHINz9q8=";
+    buildMypyBoto3Package "connect-contact-lens" "1.40.58"
+      "sha256-yP3OeePZc8Fb257lzsB8rQsahaz5/zqiH+XAQUUf9Ls=";
 
   mypy-boto3-connectcampaigns =
     buildMypyBoto3Package "connectcampaigns" "1.40.0"

From 61229d05cc49a3676c3131df075b19762ea1b123 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:11 +0200
Subject: [PATCH 2318/6226] python312Packages.mypy-boto3-connectparticipant:
 1.40.18 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a0274ffd01f6..b53a8c283d69 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -354,8 +354,8 @@ in
       "sha256-T4E5rin+Y0DJWARRqzA7agLwcF11v4CGy/Fe/x/F7vY=";
 
   mypy-boto3-connectparticipant =
-    buildMypyBoto3Package "connectparticipant" "1.40.18"
-      "sha256-FT+D1wlBL1dYus9PuLPxIxhj17WCg1nYqzT3dUn32+g=";
+    buildMypyBoto3Package "connectparticipant" "1.40.57"
+      "sha256-BiKly8tW0MFacKF8mG80xsITdxegCcG3sKal7axoGf0=";
 
   mypy-boto3-controltower =
     buildMypyBoto3Package "controltower" "1.40.0"

From bc35479ab8409b36eec91938d00c0664a6a95134 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:12 +0200
Subject: [PATCH 2319/6226] python312Packages.mypy-boto3-cur: 1.40.17 ->
 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b53a8c283d69..a85fb8707cc3 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -362,8 +362,8 @@ in
       "sha256-boRrDWiYtyKWUimJ7yb3uYPGSB/tmI2sEXNFacAPDic=";
 
   mypy-boto3-cur =
-    buildMypyBoto3Package "cur" "1.40.17"
-      "sha256-QRwEUkDj7S0/VuQrcwuPWqKnzXEN6NYUSakhT+9T2wk=";
+    buildMypyBoto3Package "cur" "1.40.58"
+      "sha256-XL3m3E1aFsbSVOvKg6bydMYLWaGRYL0RxcZA04Z9T0A=";
 
   mypy-boto3-customer-profiles =
     buildMypyBoto3Package "customer-profiles" "1.40.54"

From e4b033f61188a8c662e949109f6a7ededed0aa13 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:15 +0200
Subject: [PATCH 2320/6226] python312Packages.mypy-boto3-devicefarm: 1.40.0 ->
 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a85fb8707cc3..4760ad188681 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -394,8 +394,8 @@ in
       "sha256-QDNLIgNekgueP8XNyBbRpT1NbD+ZwxQ2OzWU4aF9/GM=";
 
   mypy-boto3-devicefarm =
-    buildMypyBoto3Package "devicefarm" "1.40.0"
-      "sha256-6v65flOExW7V8UfoyPaBcUQDYjhJ2jyuQpXMZW+ajCI=";
+    buildMypyBoto3Package "devicefarm" "1.40.57"
+      "sha256-qekCLt6+vbE6AKkuNG6x/0m72NDOK2v8uCAP6gYWHTY=";
 
   mypy-boto3-devops-guru =
     buildMypyBoto3Package "devops-guru" "1.40.17"

From 35cf4ede045d04fdd51a44b606a71104f305c9c0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:16 +0200
Subject: [PATCH 2321/6226] python312Packages.mypy-boto3-directconnect: 1.40.10
 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 4760ad188681..464b40593ad7 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -402,8 +402,8 @@ in
       "sha256-cDV8kPjBB3Mu5cqsAVsRjTk6KMozwEMHx/Fu0SRp5EQ=";
 
   mypy-boto3-directconnect =
-    buildMypyBoto3Package "directconnect" "1.40.10"
-      "sha256-ZM9nCSSzMmRjyxnypQcaORwYXiXMXz25Gw2dJlOVcc0=";
+    buildMypyBoto3Package "directconnect" "1.40.57"
+      "sha256-tmPAUD/9Y/HxJHzYyiRd+U/0emjnaz8LGRy4y9VeIpk=";
 
   mypy-boto3-discovery =
     buildMypyBoto3Package "discovery" "1.40.19"

From d93b812fbb72ac2ff76b9afec8a5d59e9eea5525 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:17 +0200
Subject: [PATCH 2322/6226] python312Packages.mypy-boto3-discovery: 1.40.19 ->
 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 464b40593ad7..991c49b212d9 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -406,8 +406,8 @@ in
       "sha256-tmPAUD/9Y/HxJHzYyiRd+U/0emjnaz8LGRy4y9VeIpk=";
 
   mypy-boto3-discovery =
-    buildMypyBoto3Package "discovery" "1.40.19"
-      "sha256-dq0rCFW8Cc9nQkRNNYaZs092nOjLqdob7rziv/WDNfo=";
+    buildMypyBoto3Package "discovery" "1.40.58"
+      "sha256-Agrg2tHTdQfvdDeTEE054rMzKKwEiFWdcLjMFrItn9U=";
 
   mypy-boto3-dlm =
     buildMypyBoto3Package "dlm" "1.40.54"

From 9cc9b6a4d2863421b20570bbf5450e8d1ef76d5c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:18 +0200
Subject: [PATCH 2323/6226] python312Packages.mypy-boto3-dms: 1.40.43 ->
 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 991c49b212d9..bfd0bcd68cc6 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -414,8 +414,8 @@ in
       "sha256-cCVm6rzKk9TX7/LamWAPgN/nGWzwlbx/e+v/rDeAPRY=";
 
   mypy-boto3-dms =
-    buildMypyBoto3Package "dms" "1.40.43"
-      "sha256-Is9yMouO7WxY/P7ViK+s8Y1q8Y7KvTvY7X/H4ndeG6s=";
+    buildMypyBoto3Package "dms" "1.40.58"
+      "sha256-wGVRK+B6DoxsK++kNZEWQdWozrpPHr7jGOzq3D52xE4=";
 
   mypy-boto3-docdb =
     buildMypyBoto3Package "docdb" "1.40.53"

From d78019ae734f8c86c4fd2613078e32a03aa3078d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:19 +0200
Subject: [PATCH 2324/6226] python312Packages.mypy-boto3-docdb-elastic: 1.40.0
 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index bfd0bcd68cc6..3da7e4c70d4a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -422,8 +422,8 @@ in
       "sha256-yHfHczjN4v+5IoQy9WuSEGWnhKiF70xJxsxiYHj/s+Y=";
 
   mypy-boto3-docdb-elastic =
-    buildMypyBoto3Package "docdb-elastic" "1.40.0"
-      "sha256-TKVaVd92g+2bV5NNRnLuVZQw0lZycTyeyjB6UgV+iHc=";
+    buildMypyBoto3Package "docdb-elastic" "1.40.58"
+      "sha256-km3Ehr7fWD0uXhLAa/I/5shLYcCFk8zoZLSc6XlTJMs=";
 
   mypy-boto3-drs =
     buildMypyBoto3Package "drs" "1.40.0"

From 7b96709fd3814ecd192677836af7e6fd5466896b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:20 +0200
Subject: [PATCH 2325/6226] python312Packages.mypy-boto3-drs: 1.40.0 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 3da7e4c70d4a..ea4f605307c8 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -426,8 +426,8 @@ in
       "sha256-km3Ehr7fWD0uXhLAa/I/5shLYcCFk8zoZLSc6XlTJMs=";
 
   mypy-boto3-drs =
-    buildMypyBoto3Package "drs" "1.40.0"
-      "sha256-dtw54zAzP4HddWx0kZr7SzxmWiKCiiP6g4+aDRRid2k=";
+    buildMypyBoto3Package "drs" "1.40.58"
+      "sha256-tT1e3Z4awdzkq63uP99dhKQruzr6u3gMSRI8xsxxPCY=";
 
   mypy-boto3-ds =
     buildMypyBoto3Package "ds" "1.40.55"

From 0f8fc700d7aa321326dfc1bcdece34e7b53a2663 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:21 +0200
Subject: [PATCH 2326/6226] python312Packages.mypy-boto3-ebs: 1.40.15 ->
 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ea4f605307c8..f2a221ae02f0 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -442,8 +442,8 @@ in
       "sha256-TgENR4bY5AHy0hqJkTq63jApASafB6agMPFPYDlzJ7A=";
 
   mypy-boto3-ebs =
-    buildMypyBoto3Package "ebs" "1.40.15"
-      "sha256-jtkx0kbI7SB74U5uWyGdVhKMlsy/T82lz3P89k8LMPA=";
+    buildMypyBoto3Package "ebs" "1.40.58"
+      "sha256-eKwS+FXicnxiHr2aTDG+ih6kDxQ24NLCkI9XPt2LjvQ=";
 
   mypy-boto3-ec2 =
     buildMypyBoto3Package "ec2" "1.40.55"

From 65f39d780c3ea084fc036bd317a66183a985a773 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:22 +0200
Subject: [PATCH 2327/6226] python312Packages.mypy-boto3-ec2: 1.40.55 ->
 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index f2a221ae02f0..7b32024f7b83 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -446,8 +446,8 @@ in
       "sha256-eKwS+FXicnxiHr2aTDG+ih6kDxQ24NLCkI9XPt2LjvQ=";
 
   mypy-boto3-ec2 =
-    buildMypyBoto3Package "ec2" "1.40.55"
-      "sha256-jMHwCR2d2aIiVyzdB/g/XdW53XR4Kqd0XQAF87CEkSo=";
+    buildMypyBoto3Package "ec2" "1.40.57"
+      "sha256-xwovEWhQ6Zo2cLB1OGIz3128wkjwz0LF6XgIaJiSx7o=";
 
   mypy-boto3-ec2-instance-connect =
     buildMypyBoto3Package "ec2-instance-connect" "1.40.20"

From 7f5c7ef644b413d07609a704a2e1231802f8bfe4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:23 +0200
Subject: [PATCH 2328/6226] python312Packages.mypy-boto3-ec2-instance-connect:
 1.40.20 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 7b32024f7b83..e59c60c400aa 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -450,8 +450,8 @@ in
       "sha256-xwovEWhQ6Zo2cLB1OGIz3128wkjwz0LF6XgIaJiSx7o=";
 
   mypy-boto3-ec2-instance-connect =
-    buildMypyBoto3Package "ec2-instance-connect" "1.40.20"
-      "sha256-x5DKz6GllTWBgkzFPnZehs7Fh3YgWGZlnJG/chPqds4=";
+    buildMypyBoto3Package "ec2-instance-connect" "1.40.57"
+      "sha256-NoZvHoanGVZhfvYyVTKcpF8RTd1ZZ2BuYCQ+QG6xPy0=";
 
   mypy-boto3-ecr =
     buildMypyBoto3Package "ecr" "1.40.0"

From 4310008b896121ed9aeff9ae043b4ab0f314f839 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:24 +0200
Subject: [PATCH 2329/6226] python312Packages.mypy-boto3-ecr: 1.40.0 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e59c60c400aa..1cded195a48f 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -454,8 +454,8 @@ in
       "sha256-NoZvHoanGVZhfvYyVTKcpF8RTd1ZZ2BuYCQ+QG6xPy0=";
 
   mypy-boto3-ecr =
-    buildMypyBoto3Package "ecr" "1.40.0"
-      "sha256-dzPkK8ipL/2Tvr8DQ68TP9UmmP/r0yPYL/3nVc4oaH8=";
+    buildMypyBoto3Package "ecr" "1.40.58"
+      "sha256-MZGkIOxN8ey10r3CpN4ul+mD3/rpxOE4wqpNKDkSqYU=";
 
   mypy-boto3-ecr-public =
     buildMypyBoto3Package "ecr-public" "1.40.15"

From 7794be4220354add09b8614f6a06ade5043953cf Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:25 +0200
Subject: [PATCH 2330/6226] python312Packages.mypy-boto3-ecr-public: 1.40.15 ->
 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 1cded195a48f..62cfaca721e1 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -458,8 +458,8 @@ in
       "sha256-MZGkIOxN8ey10r3CpN4ul+mD3/rpxOE4wqpNKDkSqYU=";
 
   mypy-boto3-ecr-public =
-    buildMypyBoto3Package "ecr-public" "1.40.15"
-      "sha256-mkaBmHn3LsOHnH4kTWkGbCsL4w/TrPBt/pBXnj+1Ai8=";
+    buildMypyBoto3Package "ecr-public" "1.40.58"
+      "sha256-gyNKT8yjYFgDgEvBgUIvC0iVKIOLaCbLWcF9eYzQWUQ=";
 
   mypy-boto3-ecs =
     buildMypyBoto3Package "ecs" "1.40.43"

From ac04d1d4b02bcb741abb10d78d9d09b0228b9f57 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:30 +0200
Subject: [PATCH 2331/6226] python312Packages.mypy-boto3-forecastquery: 1.40.15
 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 62cfaca721e1..fea0ce270f19 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -550,8 +550,8 @@ in
       "sha256-PMEWvzCP8gTKwsV9oIjqIB7jIMDZDjLqdPO/G7nnfDc=";
 
   mypy-boto3-forecastquery =
-    buildMypyBoto3Package "forecastquery" "1.40.15"
-      "sha256-QPQz6ou7edU28tUPuoFq4v3Hnz/uASm46c7TMSOy+WY=";
+    buildMypyBoto3Package "forecastquery" "1.40.57"
+      "sha256-isp1Xxwze6EL2Be4I881yiGnQh9zcXVPXZ768Cz/Y68=";
 
   mypy-boto3-frauddetector =
     buildMypyBoto3Package "frauddetector" "1.40.19"

From ef6acfc2c4dbcd8ad93fb9bddb9b100f5ab37efd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:34 +0200
Subject: [PATCH 2332/6226] python312Packages.mypy-boto3-healthlake: 1.40.20 ->
 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index fea0ce270f19..0cfb246f9c97 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -601,8 +601,8 @@ in
       "sha256-c/QCgM8mWIAe76C7e3+g9z3i/ukvOz9QGungofo2hY8=";
 
   mypy-boto3-healthlake =
-    buildMypyBoto3Package "healthlake" "1.40.20"
-      "sha256-CzEuUubTbrx+BsfOfRgqjykewZfsnMqRNAqWalAfS9o=";
+    buildMypyBoto3Package "healthlake" "1.40.58"
+      "sha256-7ZJCrUmzKbFx9Aa4liqUCdNlZGS6fv0FHtifdm3vofw=";
 
   mypy-boto3-iam =
     buildMypyBoto3Package "iam" "1.40.0"

From 7cdbd615c1b3060b6f6665a2643f1d3599c1e0a9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:34 +0200
Subject: [PATCH 2333/6226] python312Packages.mypy-boto3-iam: 1.40.0 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 0cfb246f9c97..ab13c98b95a2 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -605,8 +605,8 @@ in
       "sha256-7ZJCrUmzKbFx9Aa4liqUCdNlZGS6fv0FHtifdm3vofw=";
 
   mypy-boto3-iam =
-    buildMypyBoto3Package "iam" "1.40.0"
-      "sha256-uQCsVXN1Qo8LvDeqJP3SkB4ttwGK5E4Kr5nsD4SijUQ=";
+    buildMypyBoto3Package "iam" "1.40.57"
+      "sha256-2ILXHYhDkrjE4wDTrYcvdPXiTXTAFKT+2R8dLB6KZMc=";
 
   mypy-boto3-identitystore =
     buildMypyBoto3Package "identitystore" "1.40.54"

From 89ffb7b60a78341c5c6dea0193a9409148e3b3d0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:36 +0200
Subject: [PATCH 2334/6226] python312Packages.mypy-boto3-inspector2: 1.40.6 ->
 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ab13c98b95a2..083227b9ff9b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -625,8 +625,8 @@ in
       "sha256-9+HawjY2kx6JE+UABDKApvTYLzQqx/eBQ3ORQ5M0fq0=";
 
   mypy-boto3-inspector2 =
-    buildMypyBoto3Package "inspector2" "1.40.6"
-      "sha256-A8fOl2LR+moh+/OAjPY3iufppLaFSxHlwMjxzZbyfOU=";
+    buildMypyBoto3Package "inspector2" "1.40.57"
+      "sha256-SPXw1zpz4Dug1fcjVUO1Wis20kTAZeEmpyopd2vDGAg=";
 
   mypy-boto3-internetmonitor =
     buildMypyBoto3Package "internetmonitor" "1.40.0"

From fe2b92b0082d05e6be2974dac16749b476212f46 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:37 +0200
Subject: [PATCH 2335/6226] python312Packages.mypy-boto3-internetmonitor:
 1.40.0 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 083227b9ff9b..bf35c589a6f1 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -629,8 +629,8 @@ in
       "sha256-SPXw1zpz4Dug1fcjVUO1Wis20kTAZeEmpyopd2vDGAg=";
 
   mypy-boto3-internetmonitor =
-    buildMypyBoto3Package "internetmonitor" "1.40.0"
-      "sha256-mZfvKN+x91U1yjBwo4pKZN6jCnUMbl8SnwWF3IMx+ko=";
+    buildMypyBoto3Package "internetmonitor" "1.40.58"
+      "sha256-mj2Pf4PNgBS0sBbTkKuszIcaBHf5kTwNzR3BYgoI5JM=";
 
   mypy-boto3-iot =
     buildMypyBoto3Package "iot" "1.40.0"

From 4fd9d664502ca6f234ba09b44b8e0b78a3f21cfd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:38 +0200
Subject: [PATCH 2336/6226] python312Packages.mypy-boto3-iot: 1.40.0 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index bf35c589a6f1..19c819245626 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -633,8 +633,8 @@ in
       "sha256-mj2Pf4PNgBS0sBbTkKuszIcaBHf5kTwNzR3BYgoI5JM=";
 
   mypy-boto3-iot =
-    buildMypyBoto3Package "iot" "1.40.0"
-      "sha256-0AUK0HaqmoLVbbLDcsagUZX7KkFF9zU7obO0BmcK8+s=";
+    buildMypyBoto3Package "iot" "1.40.57"
+      "sha256-BZHAr9Qja9pNVrNd7dDmc/+bKfqmzAUJPoPJUMgJLk0=";
 
   mypy-boto3-iot-data =
     buildMypyBoto3Package "iot-data" "1.40.55"

From c17b45cd38eae2e818a312e162b8856d5094d03b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:39 +0200
Subject: [PATCH 2337/6226] python312Packages.mypy-boto3-iot-jobs-data: 1.40.0
 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 19c819245626..d77def9a73ad 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -641,8 +641,8 @@ in
       "sha256-bMEIZVMtrTmhfJTyVdpeBcGOPbIEwgEWGWYb9coHDPk=";
 
   mypy-boto3-iot-jobs-data =
-    buildMypyBoto3Package "iot-jobs-data" "1.40.0"
-      "sha256-NH8dQFWdA5jiZnCFGcfDV1RI/fULth9kI1kNlmV2z8Y=";
+    buildMypyBoto3Package "iot-jobs-data" "1.40.58"
+      "sha256-Pj9T478mOGNl9aEIa6AtrDpEJe+8Ygkl2oQ/Lr4trEM=";
 
   mypy-boto3-iot1click-devices =
     buildMypyBoto3Package "iot1click-devices" "1.35.93"

From 314c306a8a2740867df6a2b6e444c8cd87a9182f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:41 +0200
Subject: [PATCH 2338/6226] python312Packages.mypy-boto3-iotanalytics: 1.40.16
 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d77def9a73ad..4445c548a604 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -653,8 +653,8 @@ in
       "sha256-LFuz5/nCZGpSfgqyswxn80VzxXsqzZlBFqPtPJ8bzgo=";
 
   mypy-boto3-iotanalytics =
-    buildMypyBoto3Package "iotanalytics" "1.40.16"
-      "sha256-kLN+S5x9XMO8TovR57hwXnqQvC6K+JwHncgmrLFOpFY=";
+    buildMypyBoto3Package "iotanalytics" "1.40.57"
+      "sha256-uMwtG8llpdxfUCF6Lro1Y7MnozX18kXacZJe91i5rjI=";
 
   mypy-boto3-iotdeviceadvisor =
     buildMypyBoto3Package "iotdeviceadvisor" "1.40.55"

From ff500341b261a7e869931269da90f0be8f7dd6fc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:43 +0200
Subject: [PATCH 2339/6226] python312Packages.mypy-boto3-iotevents: 1.40.15 ->
 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 4445c548a604..41811de6285c 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -661,8 +661,8 @@ in
       "sha256-/W7eNwqtW8gJNJ/Z1W5jDo/wQXcbXOXfJYG+DaMR1QE=";
 
   mypy-boto3-iotevents =
-    buildMypyBoto3Package "iotevents" "1.40.15"
-      "sha256-Q1s5t45DKkIeolXDh6fhoiYVomIdFTTZyhiGkSrlNgo=";
+    buildMypyBoto3Package "iotevents" "1.40.58"
+      "sha256-j/LzJRyYqyThvR4MzPrSVJvlpHDhFkb4Hm5TjXdeWqY=";
 
   mypy-boto3-iotevents-data =
     buildMypyBoto3Package "iotevents-data" "1.40.15"

From 2db9102c25b02d6d850ef60ca9092e859119efb1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:44 +0200
Subject: [PATCH 2340/6226] python312Packages.mypy-boto3-iotfleetwise: 1.40.0
 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 41811de6285c..bde3c137f2e2 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -673,8 +673,8 @@ in
       "sha256-SeJi6Z/TJAiqL6+21CMP6iZF/Skv1hnmldPrJpOHUfo=";
 
   mypy-boto3-iotfleetwise =
-    buildMypyBoto3Package "iotfleetwise" "1.40.0"
-      "sha256-PER1D68w6wBvHUH5CGEn4H1zku92vhcwWDFRpoXZlmg=";
+    buildMypyBoto3Package "iotfleetwise" "1.40.57"
+      "sha256-tjXQosCpHEcQpE/xqOxwTS+phiDyhFJy+54AqOg0L4s=";
 
   mypy-boto3-iotsecuretunneling =
     buildMypyBoto3Package "iotsecuretunneling" "1.40.18"

From f36ccbec98b94d0f59f805611172407964ee135f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:45 +0200
Subject: [PATCH 2341/6226] python312Packages.mypy-boto3-iotsecuretunneling:
 1.40.18 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index bde3c137f2e2..26dcd4dd0cda 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -677,8 +677,8 @@ in
       "sha256-tjXQosCpHEcQpE/xqOxwTS+phiDyhFJy+54AqOg0L4s=";
 
   mypy-boto3-iotsecuretunneling =
-    buildMypyBoto3Package "iotsecuretunneling" "1.40.18"
-      "sha256-AS7G6I5JR2tkq1m+cx+9PFaIhe7QwWH0DF/7vuIY+zQ=";
+    buildMypyBoto3Package "iotsecuretunneling" "1.40.57"
+      "sha256-Hr1pVnskDI8b7R8mDCATnCS/nnag/Ac6A1tnQvXt/KU=";
 
   mypy-boto3-iotsitewise =
     buildMypyBoto3Package "iotsitewise" "1.40.26"

From 3bf7ec4572bad8b9d4885f1d538831497c670651 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:46 +0200
Subject: [PATCH 2342/6226] python312Packages.mypy-boto3-iotsitewise: 1.40.26
 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 26dcd4dd0cda..e94c1be8ffda 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -681,8 +681,8 @@ in
       "sha256-Hr1pVnskDI8b7R8mDCATnCS/nnag/Ac6A1tnQvXt/KU=";
 
   mypy-boto3-iotsitewise =
-    buildMypyBoto3Package "iotsitewise" "1.40.26"
-      "sha256-nGCezdRTJ4uq7aSd0mGSOvk+/Rn4KKeCAc++KgPxRAg=";
+    buildMypyBoto3Package "iotsitewise" "1.40.57"
+      "sha256-bPzbWMPCtXFvtOqIUXQkFUIThq9Qy5PPPlLBgz6+VgY=";
 
   mypy-boto3-iotthingsgraph =
     buildMypyBoto3Package "iotthingsgraph" "1.40.55"

From 9e354cbeb99b0c1147577161d2fbe543799bf3a3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:48 +0200
Subject: [PATCH 2343/6226] python312Packages.mypy-boto3-ivschat: 1.40.0 ->
 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e94c1be8ffda..429e0a5bb2ef 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -705,8 +705,8 @@ in
       "sha256-gumv3tmf4bQa6HvlTAYh7yK0cE1jn3Gprt9l1iHgXqo=";
 
   mypy-boto3-ivschat =
-    buildMypyBoto3Package "ivschat" "1.40.0"
-      "sha256-mtWPF8wmFGLC0PqkKX/UiYT6/VG7FfgrbsqTqRIOgsA=";
+    buildMypyBoto3Package "ivschat" "1.40.57"
+      "sha256-DBh1NtsQTcmYUXEGwlHwjIwJt1NMh6+7h46uehwH4Jc=";
 
   mypy-boto3-kafka =
     buildMypyBoto3Package "kafka" "1.40.54"

From f34200dc99ee80b889c53dbb4a27b19ea1669036 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:50 +0200
Subject: [PATCH 2344/6226] 
 python312Packages.mypy-boto3-kinesis-video-archived-media: 1.40.17 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 429e0a5bb2ef..73055ebd1437 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -733,8 +733,8 @@ in
       "sha256-T3T3FeI6jc4GK0D2pPL/ECPOxvQbRSHwvBVnmIOn5o4=";
 
   mypy-boto3-kinesis-video-archived-media =
-    buildMypyBoto3Package "kinesis-video-archived-media" "1.40.17"
-      "sha256-wKaV5LpNWviCW+R1kiEEUdi91BE42Q5/fdq7FpqkGaM=";
+    buildMypyBoto3Package "kinesis-video-archived-media" "1.40.58"
+      "sha256-mPmbOx2SZNvglOqTuo/d3F0CMh5Syka/WYpU4Imvbjg=";
 
   mypy-boto3-kinesis-video-media =
     buildMypyBoto3Package "kinesis-video-media" "1.40.55"

From a3c87ea167c48f0f1e9b02d0cca2e92f4cc291c8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:51 +0200
Subject: [PATCH 2345/6226] 
 python312Packages.mypy-boto3-kinesis-video-webrtc-storage: 1.40.0 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 73055ebd1437..21bca56c1f89 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -745,8 +745,8 @@ in
       "sha256-3XwZsjSiQmed7Msz2HHP796iY9x2nSyd6aMglkv3Lfo=";
 
   mypy-boto3-kinesis-video-webrtc-storage =
-    buildMypyBoto3Package "kinesis-video-webrtc-storage" "1.40.0"
-      "sha256-cnUWkJfPyd7G9ClFFWNXHFwuSqmTcUHwluPBeF4qO8o=";
+    buildMypyBoto3Package "kinesis-video-webrtc-storage" "1.40.58"
+      "sha256-+nZT13/2ejl3kUvOyVdX0CWwxKqkGvhvXBAhhezhmXI=";
 
   mypy-boto3-kinesisanalytics =
     buildMypyBoto3Package "kinesisanalytics" "1.40.17"

From 9284e23a96c766e496c9c6b25626623551a93c6d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:52 +0200
Subject: [PATCH 2346/6226] python312Packages.mypy-boto3-kinesisanalyticsv2:
 1.40.14 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 21bca56c1f89..513f211e7a98 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -753,8 +753,8 @@ in
       "sha256-OU9dcphpwEqoTDleItqOluVxpu73KbWUU3bwflXKO9M=";
 
   mypy-boto3-kinesisanalyticsv2 =
-    buildMypyBoto3Package "kinesisanalyticsv2" "1.40.14"
-      "sha256-rb9scmO7uC9WmimwoCkWyM11yfOSZHQgQR2w1PkRRo0=";
+    buildMypyBoto3Package "kinesisanalyticsv2" "1.40.57"
+      "sha256-82KGarHSOh1YMCqtWLoyi/89vYbRoTbcbhvpaSUg4pU=";
 
   mypy-boto3-kinesisvideo =
     buildMypyBoto3Package "kinesisvideo" "1.40.19"

From 273ff1cfc33ff308657506cb24ec7c6ba270ecc7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:54 +0200
Subject: [PATCH 2347/6226] python312Packages.mypy-boto3-lambda: 1.40.50 ->
 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 513f211e7a98..13b044dd7a32 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -769,8 +769,8 @@ in
       "sha256-IcUBufhnr3GfgJ0FG/JTwo0EgNZBtgKvTd6TtyttWRQ=";
 
   mypy-boto3-lambda =
-    buildMypyBoto3Package "lambda" "1.40.50"
-      "sha256-pwngrGlAeDqtCP9c+Yx4miFYQLqxfkaMpeIjBa0K6gU=";
+    buildMypyBoto3Package "lambda" "1.40.58"
+      "sha256-/hAC13DhFceFPsSXdosY2lKO/ThElyB/xegyV+T9hXM=";
 
   mypy-boto3-lex-models =
     buildMypyBoto3Package "lex-models" "1.40.54"

From 2b4995af64b8b29daf2999c4328b92e1d63154c9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:55 +0200
Subject: [PATCH 2348/6226] python312Packages.mypy-boto3-lexv2-models: 1.40.0
 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 13b044dd7a32..5443662558e7 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -781,8 +781,8 @@ in
       "sha256-Bt0APaVZxgwASjYTMUctwbsb7u2ZFOf5a3UlComKWxs=";
 
   mypy-boto3-lexv2-models =
-    buildMypyBoto3Package "lexv2-models" "1.40.0"
-      "sha256-FgQalWvHO0Zzisw9CLKIKeNchDh5DMHjos2OIyXto40=";
+    buildMypyBoto3Package "lexv2-models" "1.40.57"
+      "sha256-iuyQjOLs2xMNfgdJCkloVdwEsgPe4UaQwAdl5tGs6OY=";
 
   mypy-boto3-lexv2-runtime =
     buildMypyBoto3Package "lexv2-runtime" "1.40.54"

From fc0cfb597543d713387ac1251c359f07aa059566 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:58 +0200
Subject: [PATCH 2349/6226] python312Packages.mypy-boto3-macie2: 1.40.16 ->
 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5443662558e7..2306311803a9 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -833,8 +833,8 @@ in
       "sha256-3LzaMWu1lPzmKx8+Knc9OdwgElOMumhkt9iEn1gShCY=";
 
   mypy-boto3-macie2 =
-    buildMypyBoto3Package "macie2" "1.40.16"
-      "sha256-JKGY573KRt5XWgLVcNvlNgTdFYHC7Qj/YNcdODmUF00=";
+    buildMypyBoto3Package "macie2" "1.40.58"
+      "sha256-Fp2Uu6kufalQEePs8y5DhIaWhsU/GVa723G5TpFAWIY=";
 
   mypy-boto3-managedblockchain =
     buildMypyBoto3Package "managedblockchain" "1.40.15"

From c49f78534d08f12813f3a6dfacd0708bf4d21208 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:02:59 +0200
Subject: [PATCH 2350/6226] 
 python312Packages.mypy-boto3-managedblockchain-query: 1.40.0 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 2306311803a9..ec8eb9aff28d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -841,8 +841,8 @@ in
       "sha256-YBNBXwG0T7a805OPXYmCvqh8wHubtMG3QW38/eCCuB4=";
 
   mypy-boto3-managedblockchain-query =
-    buildMypyBoto3Package "managedblockchain-query" "1.40.0"
-      "sha256-lw7LeVq/o8RFK9P62vQ7iR+jZfH/OOZY2AirYqDltSw=";
+    buildMypyBoto3Package "managedblockchain-query" "1.40.58"
+      "sha256-YC5sNBnH5wS6JSCfPK7cp08WXgBLaDypDRBALMciLQQ=";
 
   mypy-boto3-marketplace-catalog =
     buildMypyBoto3Package "marketplace-catalog" "1.40.55"

From 416d3b608ef52c6d6bd6948630fc529e01f7dc8a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:01 +0200
Subject: [PATCH 2351/6226] 
 python312Packages.mypy-boto3-marketplacecommerceanalytics: 1.40.16 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ec8eb9aff28d..3a8a05bbf719 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -853,8 +853,8 @@ in
       "sha256-pagUH5QLYtbx88TE9470AJOHxG29ALGxZioROq3rqTE=";
 
   mypy-boto3-marketplacecommerceanalytics =
-    buildMypyBoto3Package "marketplacecommerceanalytics" "1.40.16"
-      "sha256-7gZOd0TBAWyyY7g85UXAjp4miV08qfB20B6YQww360w=";
+    buildMypyBoto3Package "marketplacecommerceanalytics" "1.40.58"
+      "sha256-KPHuiCiseplHyGWKyh3xFSIj+Qet9hsqSva6rmHsFyA=";
 
   mypy-boto3-mediaconnect =
     buildMypyBoto3Package "mediaconnect" "1.40.55"

From baccf38f6bfe547ccc6f4107dd6635658371b24b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:02 +0200
Subject: [PATCH 2352/6226] python312Packages.mypy-boto3-medialive: 1.40.45 ->
 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 3a8a05bbf719..2615b73b3a27 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -865,8 +865,8 @@ in
       "sha256-oxrbkvlpIII2Ib8hMF0UnZ6PNFYnDHceA6V9M1thF18=";
 
   mypy-boto3-medialive =
-    buildMypyBoto3Package "medialive" "1.40.45"
-      "sha256-rF8r53gdOYPeFJ5VqUWLiQ9rNaUAIb1tS5E9TSHgrms=";
+    buildMypyBoto3Package "medialive" "1.40.57"
+      "sha256-aKl6hRCX4XskRVgRlzPKmKKMWqXAwGmetvY7z34Iam4=";
 
   mypy-boto3-mediapackage =
     buildMypyBoto3Package "mediapackage" "1.40.15"

From 4bff58f5f071df675ecf5cabe2b58b0747b804d8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:04 +0200
Subject: [PATCH 2353/6226] python312Packages.mypy-boto3-mediatailor: 1.40.42
 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 2615b73b3a27..be68cfba438c 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -889,8 +889,8 @@ in
       "sha256-hkzc8MTCssJPCjME7CMCVewYgNf9Gz/c68hAC3fuKnE=";
 
   mypy-boto3-mediatailor =
-    buildMypyBoto3Package "mediatailor" "1.40.42"
-      "sha256-wTzLtvXBVTEs1ywAw8sL92Xzyo9TOscaIptPE1oHrUg=";
+    buildMypyBoto3Package "mediatailor" "1.40.58"
+      "sha256-uluvMcbKZz3KA0V7KMEGbRr9CVYIPDhGTTY5oJHjHic=";
 
   mypy-boto3-medical-imaging =
     buildMypyBoto3Package "medical-imaging" "1.40.54"

From c39bc144d5b2d306a5c0ec9898a7f3bdf60f8d61 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:05 +0200
Subject: [PATCH 2354/6226] python312Packages.mypy-boto3-mgh: 1.40.18 ->
 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index be68cfba438c..9300a75a2d1a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -905,8 +905,8 @@ in
       "sha256-idAuSb9+u1KVh13BBNSgXYkqKHZHcSfQ3rVxiDBLdVU=";
 
   mypy-boto3-mgh =
-    buildMypyBoto3Package "mgh" "1.40.18"
-      "sha256-6PlBNNCfxt4MLqmDPM6icIyutPGyXd54AWKHxCTQ024=";
+    buildMypyBoto3Package "mgh" "1.40.58"
+      "sha256-xQLJrW35xDhr8leBNsKzqfg4B5DQKH8adV5sjIR63kI=";
 
   mypy-boto3-mgn =
     buildMypyBoto3Package "mgn" "1.40.0"

From 0cc8002c7eb02525545dc87722485c0d8161427f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:06 +0200
Subject: [PATCH 2355/6226] python312Packages.mypy-boto3-mgn: 1.40.0 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 9300a75a2d1a..e180a9d6887d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -909,8 +909,8 @@ in
       "sha256-xQLJrW35xDhr8leBNsKzqfg4B5DQKH8adV5sjIR63kI=";
 
   mypy-boto3-mgn =
-    buildMypyBoto3Package "mgn" "1.40.0"
-      "sha256-XyB7/8zj4pU/+cxqhEf2WMoBoo/J12lOrlL0WD2Nhic=";
+    buildMypyBoto3Package "mgn" "1.40.58"
+      "sha256-cZzoyjZ3fLtqta684chs4rcACPS19Q1mV1GTaNeRe20=";
 
   mypy-boto3-migration-hub-refactor-spaces =
     buildMypyBoto3Package "migration-hub-refactor-spaces" "1.40.55"

From 65bb961e907a3550dadf846ea67b51f669448218 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:08 +0200
Subject: [PATCH 2356/6226] python312Packages.mypy-boto3-mwaa: 1.40.0 ->
 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e180a9d6887d..b4d63a21844a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -937,8 +937,8 @@ in
       "sha256-+VSk5ytyDwIkg8Ur15vjBmURPwXvZkRT5UEKPTWNgO8=";
 
   mypy-boto3-mwaa =
-    buildMypyBoto3Package "mwaa" "1.40.0"
-      "sha256-w/km0Eq/rEX182tDtxVsFCm3bK2pUr1Fh6ZnsX6thAI=";
+    buildMypyBoto3Package "mwaa" "1.40.57"
+      "sha256-84N2KuK/XAPJqnmeDuWNpC5X6NRodH0luXfP+ZjH0pQ=";
 
   mypy-boto3-neptune =
     buildMypyBoto3Package "neptune" "1.40.38"

From 15df5ea141932c82788b8b33f793f71a8ba12a88 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:09 +0200
Subject: [PATCH 2357/6226] python312Packages.mypy-boto3-neptunedata: 1.40.0 ->
 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b4d63a21844a..9ad5d7ef1296 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -945,8 +945,8 @@ in
       "sha256-3vbUWdYw7jqTM5TPM3btPROlXPW1xR+3cI29ImVrt1w=";
 
   mypy-boto3-neptunedata =
-    buildMypyBoto3Package "neptunedata" "1.40.0"
-      "sha256-5aD/9ACgD/76bPpbZlqHXn0biTxr9wyiLpTyIdxMKYs=";
+    buildMypyBoto3Package "neptunedata" "1.40.58"
+      "sha256-8Lxw5GiiQYiGZJkitfEnPdRGw4lOSSF88s8y7hBWnF4=";
 
   mypy-boto3-network-firewall =
     buildMypyBoto3Package "network-firewall" "1.40.55"

From 08bfb474a27b19d9e0275cc90954fa8da5ffc038 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:11 +0200
Subject: [PATCH 2358/6226] python312Packages.mypy-boto3-oam: 1.40.0 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 9ad5d7ef1296..dd816979f0e0 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -961,8 +961,8 @@ in
       "sha256-gs9eGyRaZN7Fsl0D5fSqtTiYZ+Exp0s8QW/X8ZR7guA=";
 
   mypy-boto3-oam =
-    buildMypyBoto3Package "oam" "1.40.0"
-      "sha256-Db3tb9qhUNtdqKVVgq2Z80wVWCA9g7B8YpqR1FmgleQ=";
+    buildMypyBoto3Package "oam" "1.40.57"
+      "sha256-jobSOTxwJ6mzhr4O+opLrCvGuq4MMRe+zjhHWpq4JsA=";
 
   mypy-boto3-omics =
     buildMypyBoto3Package "omics" "1.40.20"

From 4ff5d8087c8720ed41de279f3d1d0a80e1acc46a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:12 +0200
Subject: [PATCH 2359/6226] python312Packages.mypy-boto3-omics: 1.40.20 ->
 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index dd816979f0e0..b155bd23ad87 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -965,8 +965,8 @@ in
       "sha256-jobSOTxwJ6mzhr4O+opLrCvGuq4MMRe+zjhHWpq4JsA=";
 
   mypy-boto3-omics =
-    buildMypyBoto3Package "omics" "1.40.20"
-      "sha256-I53YcVk2rMNP+4WrD+6kvo85OhKrvJoE2YR3UBeIgEY=";
+    buildMypyBoto3Package "omics" "1.40.58"
+      "sha256-weugGpAmdljYGGImQm7Ic46FH/H1RrQqe0Vkc0sWhTQ=";
 
   mypy-boto3-opensearch =
     buildMypyBoto3Package "opensearch" "1.40.0"

From e137571e3dc50321f1d46d24796b97fc6a9dc5bc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:13 +0200
Subject: [PATCH 2360/6226] python312Packages.mypy-boto3-opensearchserverless:
 1.40.24 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b155bd23ad87..4194d61fe4ec 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -973,8 +973,8 @@ in
       "sha256-DduRVsWhYZPX+mQAj1j1kA00rilUHKA4SnmehgS4hYU=";
 
   mypy-boto3-opensearchserverless =
-    buildMypyBoto3Package "opensearchserverless" "1.40.24"
-      "sha256-dWkO3WKxcMFLF4UvFLAgAv1vfJZYqwua6s+CYGhTF0g=";
+    buildMypyBoto3Package "opensearchserverless" "1.40.58"
+      "sha256-jSoHGhya7mWGoyUCTfLRgqyrmG6TIpS4SVUjSAer0eM=";
 
   mypy-boto3-opsworks =
     buildMypyBoto3Package "opsworks" "1.40.0"

From ae6ca3e0ecb0d6cd7f2698c3b06fa42eb0ba747b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:16 +0200
Subject: [PATCH 2361/6226] python312Packages.mypy-boto3-personalize-events:
 1.40.18 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 4194d61fe4ec..1905808db322 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1017,8 +1017,8 @@ in
       "sha256-pn+Zpzpa5SBhnzzo1yVcQzFi3u3Wbf93AvOL4Xu+yqQ=";
 
   mypy-boto3-personalize-events =
-    buildMypyBoto3Package "personalize-events" "1.40.18"
-      "sha256-ot000kDzq6Dle+9d9EWXHM7kLIzA4Se7X1w24dEhLVg=";
+    buildMypyBoto3Package "personalize-events" "1.40.58"
+      "sha256-cSxcEUfHRBITijZot4XhvijEAfsPWlPu1ZGf6cF2tbQ=";
 
   mypy-boto3-personalize-runtime =
     buildMypyBoto3Package "personalize-runtime" "1.40.54"

From 266ba2fbcce82f0591d911f7fb85edae20276009 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:17 +0200
Subject: [PATCH 2362/6226] python312Packages.mypy-boto3-pinpoint-email:
 1.40.15 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 1905808db322..1f24a68179ba 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1033,8 +1033,8 @@ in
       "sha256-zhekW0Dk58LRUfyVd6slsy3tKu31j/cGEYfkvpLrmnA=";
 
   mypy-boto3-pinpoint-email =
-    buildMypyBoto3Package "pinpoint-email" "1.40.15"
-      "sha256-MZ3FLJdyo1RoUFj6baYu4dR9T8/0nCilk5RRZ+0wvQQ=";
+    buildMypyBoto3Package "pinpoint-email" "1.40.58"
+      "sha256-SRvim/6rT3H/OHT1FZRx6PyPUV2GGh5nk83EXhVi5gc=";
 
   mypy-boto3-pinpoint-sms-voice =
     buildMypyBoto3Package "pinpoint-sms-voice" "1.40.54"

From acca7c651be0eeb0fc08217cd5eda301b287c7a6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:18 +0200
Subject: [PATCH 2363/6226] python312Packages.mypy-boto3-pinpoint-sms-voice-v2:
 1.40.14 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 1f24a68179ba..85e604a11c68 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1041,8 +1041,8 @@ in
       "sha256-3c8he41vrrQwW64aGB5ExykWVPqGfj73P0gZBYoqsW0=";
 
   mypy-boto3-pinpoint-sms-voice-v2 =
-    buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.40.14"
-      "sha256-Jogfc4bdSgo6ufRjkX+jC6tCcjF2QEF5Wc5a3tZxjPM=";
+    buildMypyBoto3Package "pinpoint-sms-voice-v2" "1.40.57"
+      "sha256-n20s8GSpRLcaGXyPJs0KOUwGBOf6a2q22fe1kph/GUk=";
 
   mypy-boto3-pipes =
     buildMypyBoto3Package "pipes" "1.40.0"

From 0980ffc7d8255615e7f502e0f4030ed8812d5a50 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:22 +0200
Subject: [PATCH 2364/6226] python312Packages.mypy-boto3-redshift-data: 1.40.0
 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 85e604a11c68..b88b0626b75c 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1097,8 +1097,8 @@ in
       "sha256-S2Kq4+up5zWfLS2rM14qwmzLd1h13hz8YURBq9O715w=";
 
   mypy-boto3-redshift-data =
-    buildMypyBoto3Package "redshift-data" "1.40.0"
-      "sha256-rJnEK9W8zZ6hxp5YvysRaxk01vaCv3+zpE9GSdRb1jA=";
+    buildMypyBoto3Package "redshift-data" "1.40.57"
+      "sha256-G8yP5UD+srdmTHkuwC5A05L47Piun60kHoPzWG7MvGM=";
 
   mypy-boto3-redshift-serverless =
     buildMypyBoto3Package "redshift-serverless" "1.40.0"

From 317d9b06ca852afebc41bc9d7c0fec0814e205a6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:23 +0200
Subject: [PATCH 2365/6226] python312Packages.mypy-boto3-resiliencehub: 1.40.0
 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b88b0626b75c..8ed7e08d74f3 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1109,8 +1109,8 @@ in
       "sha256-uVQIk3XxR7mwd/sY5TQk6jy6m5qzr0pMu/0Q4fItu3U=";
 
   mypy-boto3-resiliencehub =
-    buildMypyBoto3Package "resiliencehub" "1.40.0"
-      "sha256-PaBrmTZ/EpFDH94bw/zQqRcLiQrOQlKrIHQgXcuR0Qo=";
+    buildMypyBoto3Package "resiliencehub" "1.40.58"
+      "sha256-EHVAJ8ElONBpXvZoXfuL7UbHNOYZyZN6ABHViQg+a5k=";
 
   mypy-boto3-resource-explorer-2 =
     buildMypyBoto3Package "resource-explorer-2" "1.40.46"

From 1fc7c712ca1952ce599ba5bbdeea83c4c6962aa4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:25 +0200
Subject: [PATCH 2366/6226] python312Packages.mypy-boto3-route53: 1.40.23 ->
 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 8ed7e08d74f3..f5da36c2f131 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1133,8 +1133,8 @@ in
       "sha256-CoF3Aw759lxUzg9iRCfKofDkbq/idAIy4Eu4L7yrRL0=";
 
   mypy-boto3-route53 =
-    buildMypyBoto3Package "route53" "1.40.23"
-      "sha256-0cvqZsSwlq6o5XE+U9Vh3/+7I4ZhVAtlZ7Qlm5KuI1I=";
+    buildMypyBoto3Package "route53" "1.40.57"
+      "sha256-GcfGVmcrqgC3MAoqJWrzUXFDr6b9QeSTOP8uCBpnzCc=";
 
   mypy-boto3-route53-recovery-cluster =
     buildMypyBoto3Package "route53-recovery-cluster" "1.40.18"

From 01372af8a0c3f018832ac5b2bcfbccb3428d9079 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:26 +0200
Subject: [PATCH 2367/6226] 
 python312Packages.mypy-boto3-route53-recovery-cluster: 1.40.18 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index f5da36c2f131..443d3e255562 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1137,8 +1137,8 @@ in
       "sha256-GcfGVmcrqgC3MAoqJWrzUXFDr6b9QeSTOP8uCBpnzCc=";
 
   mypy-boto3-route53-recovery-cluster =
-    buildMypyBoto3Package "route53-recovery-cluster" "1.40.18"
-      "sha256-2eARoNdjICq+9/NDLcgCikBIQV9WNDb8UUKGtfJA6Yw=";
+    buildMypyBoto3Package "route53-recovery-cluster" "1.40.57"
+      "sha256-EIwRua248SviAlBapRfoxIpCi0ydWw5h5keOZqMA2Zw=";
 
   mypy-boto3-route53-recovery-control-config =
     buildMypyBoto3Package "route53-recovery-control-config" "1.40.54"

From 1bd865db778feacb4f8c3b62631a850d4bcbf1a8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:27 +0200
Subject: [PATCH 2368/6226] python312Packages.mypy-boto3-rum: 1.40.0 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 443d3e255562..d5710bf32473 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1157,8 +1157,8 @@ in
       "sha256-wY1ypBS0J/0JvGJ7rc8HL52onwypC0FgkS4Zz6FKqpg=";
 
   mypy-boto3-rum =
-    buildMypyBoto3Package "rum" "1.40.0"
-      "sha256-+fgiX8rSj53vuJuuTOX26sipW3xiFDt7ik7r65alHcw=";
+    buildMypyBoto3Package "rum" "1.40.58"
+      "sha256-eZwpjtTCEt+DnFfHxJCVjBKDxA5qQkBS/1gk0zKb9ug=";
 
   mypy-boto3-s3 =
     buildMypyBoto3Package "s3" "1.40.26"

From 9d2f33ec9b6e368052e0c9e9bfbada227a896428 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:29 +0200
Subject: [PATCH 2369/6226] python312Packages.mypy-boto3-sagemaker: 1.40.27 ->
 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d5710bf32473..2d0455404754 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1173,8 +1173,8 @@ in
       "sha256-HPAyUwvfUNZl3Ts3H0evVO7UifAiiwrDPyYJ4titkqA=";
 
   mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.40.27"
-      "sha256-OlMvXXiV/PGIqL4IRQuyRpm4RboyH+SDnQKJ2HWuqsw=";
+    buildMypyBoto3Package "sagemaker" "1.40.58"
+      "sha256-B+fvgMfQyME1sgZSifnqHY2W4vr05/IKl4F9duP4VLE=";
 
   mypy-boto3-sagemaker-a2i-runtime =
     buildMypyBoto3Package "sagemaker-a2i-runtime" "1.40.16"

From 04b7d4ad4fe4b23b8c139d0619bf12e3e381f37c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:30 +0200
Subject: [PATCH 2370/6226] python312Packages.mypy-boto3-sagemaker-a2i-runtime:
 1.40.16 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 2d0455404754..d75095efe1c1 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1177,8 +1177,8 @@ in
       "sha256-B+fvgMfQyME1sgZSifnqHY2W4vr05/IKl4F9duP4VLE=";
 
   mypy-boto3-sagemaker-a2i-runtime =
-    buildMypyBoto3Package "sagemaker-a2i-runtime" "1.40.16"
-      "sha256-Mab/cO02qbhVylLWHL4aGfgMArujecXpsOgfMG7OLTk=";
+    buildMypyBoto3Package "sagemaker-a2i-runtime" "1.40.57"
+      "sha256-hM+OvqETv0u6Kk1ZgfzgNWgBTPamBH0oO+5W4hlUgeM=";
 
   mypy-boto3-sagemaker-edge =
     buildMypyBoto3Package "sagemaker-edge" "1.40.17"

From 5cb60725797ed0e9c07b1c3c41468e0b09e936ed Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:31 +0200
Subject: [PATCH 2371/6226] python312Packages.mypy-boto3-sagemaker-edge:
 1.40.17 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d75095efe1c1..92d2fcac2eac 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1181,8 +1181,8 @@ in
       "sha256-hM+OvqETv0u6Kk1ZgfzgNWgBTPamBH0oO+5W4hlUgeM=";
 
   mypy-boto3-sagemaker-edge =
-    buildMypyBoto3Package "sagemaker-edge" "1.40.17"
-      "sha256-ZhD8T6Mp5M3Kofd462vX3HsEbazpYFOf1HJ3L9xUhGU=";
+    buildMypyBoto3Package "sagemaker-edge" "1.40.58"
+      "sha256-jmK+l8D36ydnlSEHYxDO/e9XuMp79P1QLdjjFRcFn6w=";
 
   mypy-boto3-sagemaker-featurestore-runtime =
     buildMypyBoto3Package "sagemaker-featurestore-runtime" "1.40.17"

From 38c4ce69e1d9d8cca4e27f1763b5943710e60bae Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:32 +0200
Subject: [PATCH 2372/6226] python312Packages.mypy-boto3-savingsplans: 1.40.20
 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 92d2fcac2eac..a1f1dc81b56e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1201,8 +1201,8 @@ in
       "sha256-NuIRRV2eq/OSMyeqKuZXGFfjzGQpX41Gx5Tv9l/2jOo=";
 
   mypy-boto3-savingsplans =
-    buildMypyBoto3Package "savingsplans" "1.40.20"
-      "sha256-N/xsDqZvv3aARvATVE5QV8yGoj7ubCrgp2TTApcfz1g=";
+    buildMypyBoto3Package "savingsplans" "1.40.58"
+      "sha256-hwVYt4TCYXK6G8N0x52swjdf/k1roNzwRhYl8JO4VM0=";
 
   mypy-boto3-scheduler =
     buildMypyBoto3Package "scheduler" "1.40.20"

From c5aed7c86934916fe5d28fb353a671a2c2574615 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:34 +0200
Subject: [PATCH 2373/6226] python312Packages.mypy-boto3-securitylake: 1.40.0
 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a1f1dc81b56e..e387eac647cd 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1225,8 +1225,8 @@ in
       "sha256-0DkWoaAhZ0w3CXYtQgvABDZ+PeCIjB9asQkDGSl1/oU=";
 
   mypy-boto3-securitylake =
-    buildMypyBoto3Package "securitylake" "1.40.0"
-      "sha256-DrmDjFx8N9pqL2tikWd1PD0qvBX2oI2Y9+WiDvAlOgE=";
+    buildMypyBoto3Package "securitylake" "1.40.58"
+      "sha256-bwX8OJWCayO3dpMuhB9VelSzhl/y+vVch0hY8w2NFm0=";
 
   mypy-boto3-serverlessrepo =
     buildMypyBoto3Package "serverlessrepo" "1.40.17"

From 32670dcc8a001d1565a7653d3b2fbe199ed229ec Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:37 +0200
Subject: [PATCH 2374/6226] python312Packages.mypy-boto3-sesv2: 1.40.0 ->
 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e387eac647cd..d76e3a7aca57 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1253,8 +1253,8 @@ in
       "sha256-cmGVTHQ2BGpeKYymXfxMrX+AfuHky6DTNwxL0pK4NEU=";
 
   mypy-boto3-sesv2 =
-    buildMypyBoto3Package "sesv2" "1.40.0"
-      "sha256-aGK44+fTKwT+5o4bcqz1GvOm/9gpP3oX82Eta/uXc8w=";
+    buildMypyBoto3Package "sesv2" "1.40.58"
+      "sha256-e5n43zgh7Eo0CO6p3m3hC86lk5eAT9gBS8aluLFYORM=";
 
   mypy-boto3-shield =
     buildMypyBoto3Package "shield" "1.40.17"

From 93f31ccf503777d3c890dae72d1e968592f7cb73 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:39 +0200
Subject: [PATCH 2375/6226] python312Packages.mypy-boto3-sns: 1.40.1 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d76e3a7aca57..ffba39436500 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1285,8 +1285,8 @@ in
       "sha256-MVXzb+7NvziTkEQuuo3GQdoHrrnL9859f0i07qQGnYc=";
 
   mypy-boto3-sns =
-    buildMypyBoto3Package "sns" "1.40.1"
-      "sha256-4G2J2xDIM2QJY2XGMKFE1Zyj4P22Y7vWtzvRgW0eU9s=";
+    buildMypyBoto3Package "sns" "1.40.57"
+      "sha256-O+SB0ntnaEzGUHq/GJAE8tCPLcIaTcuWIJ850rv0Vz8=";
 
   mypy-boto3-sqs =
     buildMypyBoto3Package "sqs" "1.40.35"

From 9155c6b6b52c7cf217ba3513966d5ae7972ce444 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:41 +0200
Subject: [PATCH 2376/6226] python312Packages.mypy-boto3-ssm-incidents: 1.40.0
 -> 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ffba39436500..289beb5a92bb 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1301,8 +1301,8 @@ in
       "sha256-OUZn5wWVxirqeyEIrPgIbBwG2ikudihKJo/WJItVkLM=";
 
   mypy-boto3-ssm-incidents =
-    buildMypyBoto3Package "ssm-incidents" "1.40.0"
-      "sha256-EX4a0R3N6pWZpybsRofvsZ7Z5eQCu7eczEOHyr2S+h4=";
+    buildMypyBoto3Package "ssm-incidents" "1.40.57"
+      "sha256-qk/18pIl23+NoiPHM39hFIhJx0sTxhR/JJmRf9ePpx4=";
 
   mypy-boto3-ssm-sap =
     buildMypyBoto3Package "ssm-sap" "1.40.20"

From 1c7b6fccf2ec5fe2be479a19322f4b03218c4d02 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:43 +0200
Subject: [PATCH 2377/6226] python312Packages.mypy-boto3-storagegateway: 1.40.0
 -> 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 289beb5a92bb..ccdf8e496d7b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1325,8 +1325,8 @@ in
       "sha256-t+4xYTbTLkXRoDyteBCVljSb3v2P/sBLLEUmpQm6U80=";
 
   mypy-boto3-storagegateway =
-    buildMypyBoto3Package "storagegateway" "1.40.0"
-      "sha256-LwQqfbpqRaGyridCiI73LjQjsQn+h6Gc2HDt3AKt8dI=";
+    buildMypyBoto3Package "storagegateway" "1.40.58"
+      "sha256-aRgrg0Mpzc+gk2GIPjofavpf6IkMNW3kB+vU6aNelhk=";
 
   mypy-boto3-sts =
     buildMypyBoto3Package "sts" "1.40.0"

From ddee26b9503456037d20adf8786f0164ec239524 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:45 +0200
Subject: [PATCH 2378/6226] python312Packages.mypy-boto3-synthetics: 1.40.44 ->
 1.40.58

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ccdf8e496d7b..b984af1c5c4d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1345,8 +1345,8 @@ in
       "sha256-zer2dqLkBLe1CA5I6+9DavQPvVLtrGFoxi50BRDOI3s=";
 
   mypy-boto3-synthetics =
-    buildMypyBoto3Package "synthetics" "1.40.44"
-      "sha256-777DKmK4DKxIWhXp+Mu7TQ8wNdfnzz4+0fJyPVGx0R0=";
+    buildMypyBoto3Package "synthetics" "1.40.58"
+      "sha256-naC16by9nRoZvRfSIIYJdk4jT/lxqUDeogtGb+q+avk=";
 
   mypy-boto3-textract =
     buildMypyBoto3Package "textract" "1.40.0"

From 7d7d1000dea095c553cc683e7d7e7e31b19627fd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:48 +0200
Subject: [PATCH 2379/6226] python312Packages.mypy-boto3-workdocs: 1.40.19 ->
 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b984af1c5c4d..b1967bff262e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1409,8 +1409,8 @@ in
       "sha256-B+hgPZPqVl2YpsBxmkVph+L9lMv7PzJAevqMEXHAXSQ=";
 
   mypy-boto3-workdocs =
-    buildMypyBoto3Package "workdocs" "1.40.19"
-      "sha256-4EAAV8OhTKmJV0EbOJvwLUj1sxxuPzZetqt3rJo+ZTA=";
+    buildMypyBoto3Package "workdocs" "1.40.57"
+      "sha256-12d4SbtVxKDSBedA1F2VnopqBKowjuIKboHZpIKEwAc=";
 
   mypy-boto3-worklink =
     buildMypyBoto3Package "worklink" "1.35.0"

From 48e51278c3b7186ec2c425880294bc0b97cf2ab3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:50 +0200
Subject: [PATCH 2380/6226] python312Packages.mypy-boto3-workmail: 1.40.22 ->
 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b1967bff262e..6c846721f944 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1417,8 +1417,8 @@ in
       "sha256-AgK4Xg1dloJmA+h4+mcBQQVTvYKjLCk5tPDbl/ItCVQ=";
 
   mypy-boto3-workmail =
-    buildMypyBoto3Package "workmail" "1.40.22"
-      "sha256-Qnuq7/wu/rlW3mr4oCJ5isJJd9SHxzZA/cSiayVpTI0=";
+    buildMypyBoto3Package "workmail" "1.40.57"
+      "sha256-S5/42kRGzK1BTxE8Sp6XY93kljykbQK0YYCwQM+sJxY=";
 
   mypy-boto3-workmailmessageflow =
     buildMypyBoto3Package "workmailmessageflow" "1.40.20"

From c30e5bc603a32c84e72e2ff584c287f0a95c6331 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:51 +0200
Subject: [PATCH 2381/6226] python312Packages.mypy-boto3-workspaces: 1.40.10 ->
 1.40.57

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 6c846721f944..757afb5a46bf 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1425,8 +1425,8 @@ in
       "sha256-wOW0p/aZvOe3zQc9eIAirP4NmiVUUSxIeUwEIWbK4Eo=";
 
   mypy-boto3-workspaces =
-    buildMypyBoto3Package "workspaces" "1.40.10"
-      "sha256-6PTGF3akduOS0VRS43ykcKzK25iyQb+bqvpCe+BM9Qw=";
+    buildMypyBoto3Package "workspaces" "1.40.57"
+      "sha256-+oG3ZMlb+/IVTxwecuyGetXhW6ZcJDbAzJ1Vm8uWGvY=";
 
   mypy-boto3-workspaces-web =
     buildMypyBoto3Package "workspaces-web" "1.40.54"

From 1692f84fd5f5c4257bd59144272dcc87d2d54066 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:54 +0200
Subject: [PATCH 2382/6226] python313Packages.botocore-stubs: 1.40.56 ->
 1.40.58

---
 pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index 7857f852ee6d..46371954ae06 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.40.56";
+  version = "1.40.58";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-qpU1uKD3E1sGJQTjnny8g/s/ALLU3CurphcENrSUtpY=";
+    hash = "sha256-wnA+zO6JYraxCYF7Em4cSFM1pn7+V0uZ8uMMgsDyWJY=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 54e48f2699b8377cea5a4d94a8e4c17c0d01b2bd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:03:58 +0200
Subject: [PATCH 2383/6226] python313Packages.boto3-stubs: 1.40.56 -> 1.40.58

---
 pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index e9f72aa92c71..1835b5af4d80 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -358,13 +358,13 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.40.56";
+  version = "1.40.58";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-5WRFI+/39Qut5en0okVEtA+EnpBRlJ41ASA6IGJ/QmM=";
+    hash = "sha256-sFNouS4oNbynsBXznAD9YcNcsSerN+lTYdx6qZN7lo4=";
   };
 
   build-system = [ setuptools ];

From 1b890680cbf4c896967681df20ebe35e0f899494 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 15:06:46 +0200
Subject: [PATCH 2384/6226] python313Packages.iamdata: 0.1.202510231 ->
 0.1.202510241

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202510231...v0.1.202510241

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202510241
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 87c473b3b94f..1447f52790df 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202510231";
+  version = "0.1.202510241";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-pTe0WN4PXkVd8P3y0yq/mV1tRY1g9WO+uSdV9DaV/xo=";
+    hash = "sha256-IvNPgYjNdvMlIiLwL1rDilimAnCDn5JhwwMtY4xGXoU=";
   };
 
   build-system = [ hatchling ];

From e43a84b67478fd9a4e7c96a6dc8fdcaeaa8f0301 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 24 Oct 2025 15:11:41 +0200
Subject: [PATCH 2385/6226] workflows/eval: fix eval report with formatting
 changes

The Eval report which tests performance between Nix/Lix versions on
update of `ci/pinned` wrongly returned errors, when only the special
attribute `release-checks` changed. Since this reads in all of Nixpkgs,
it will change with any formatting change that is introduced at the same
time via update of any of `treefmt`'s formatters.
---
 .github/workflows/eval.yml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 8ad860a1aed8..dee31e1f5328 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -279,12 +279,11 @@ jobs:
                         const diff = JSON.parse(
                           readFileSync(path.join(artifact, system, 'diff.json'), 'utf-8'),
                         )
-                        const attrs = [].concat(
-                          diff.added,
-                          diff.removed,
-                          diff.changed,
-                          diff.rebuilds
-                        )
+                        const attrs = []
+                          .concat(diff.added, diff.removed, diff.changed, diff.rebuilds)
+                          // There are some special attributes, which are ignored for rebuilds.
+                          // These only have a single path component, because they lack the `.<system>` suffix.
+                          .filter((attr) => attr.split('.').length > 1)
                         if (attrs.length > 0) {
                           core.setFailed(
                             `${version} on ${system} has changed outpaths!\nNote: Please make sure to update ci/pinned.json separately from changes to other packages.`,

From 1f81501af3a36cf200293cb5e3012b6fbd48f1a0 Mon Sep 17 00:00:00 2001
From: Sam Estep <sam@samestep.com>
Date: Fri, 24 Oct 2025 09:15:32 -0400
Subject: [PATCH 2386/6226] cppe: fix build with cmake 4

---
 .../cp/cppe/cmake-minimum-required.patch      | 22 +++++++++++++++++++
 pkgs/by-name/cp/cppe/package.nix              |  4 ++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/by-name/cp/cppe/cmake-minimum-required.patch

diff --git a/pkgs/by-name/cp/cppe/cmake-minimum-required.patch b/pkgs/by-name/cp/cppe/cmake-minimum-required.patch
new file mode 100644
index 000000000000..caf44cfd2d6c
--- /dev/null
+++ b/pkgs/by-name/cp/cppe/cmake-minimum-required.patch
@@ -0,0 +1,22 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 5d5d359..ba8992c 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,5 +1,5 @@
+-cmake_minimum_required(VERSION 3.0.0)
+-cmake_policy(VERSION 3.0.0)
++cmake_minimum_required(VERSION 3.10)
++cmake_policy(VERSION 3.10)
+ 
+ project(cppe LANGUAGES CXX)
+ 
+diff --git a/cppe/CMakeLists.txt b/cppe/CMakeLists.txt
+index 6780f18..17ac4b9 100644
+--- a/cppe/CMakeLists.txt
++++ b/cppe/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0.0)
++cmake_minimum_required(VERSION 3.10)
+ project(cppe-core VERSION 0.3.1 LANGUAGES CXX)
+ 
+ include(GNUInstallDirs)
diff --git a/pkgs/by-name/cp/cppe/package.nix b/pkgs/by-name/cp/cppe/package.nix
index ff4757daab1a..7848b889b615 100644
--- a/pkgs/by-name/cp/cppe/package.nix
+++ b/pkgs/by-name/cp/cppe/package.nix
@@ -17,6 +17,10 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-guM7+ZWDJLcAUJtPkKLvC4LYSA2eBvER7cgwPZ7FxHw=";
   };
 
+  patches = [
+    ./cmake-minimum-required.patch
+  ];
+
   nativeBuildInputs = [ cmake ] ++ lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ];
 
   cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ];

From 94b9cca422b6e68849eab718702dce485300c8f6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 24 Oct 2025 13:29:03 +0000
Subject: [PATCH 2387/6226] python3Packages.yamlfix: skip tests broken by click
 update

Broken since click was updated to 8.2.1 in
https://github.com/NixOS/nixpkgs/pull/448189
---
 pkgs/development/python-modules/yamlfix/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix
index 1c1cda272d74..0454fc8f2efe 100644
--- a/pkgs/development/python-modules/yamlfix/default.nix
+++ b/pkgs/development/python-modules/yamlfix/default.nix
@@ -52,6 +52,12 @@ buildPythonPackage rec {
     "-Wignore::ResourceWarning"
   ];
 
+  disabledTestPaths = [
+    # Broken since click was updated to 8.2.1 in https://github.com/NixOS/nixpkgs/pull/448189
+    # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr'
+    "tests/e2e/test_cli.py"
+  ];
+
   meta = {
     description = "Python YAML formatter that keeps your comments";
     homepage = "https://github.com/lyz-code/yamlfix";

From d86fa7ed2b019eb86e82cecef250601122a32a6f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 24 Oct 2025 13:31:36 +0000
Subject: [PATCH 2388/6226] python3Packages.yamlfix: cleanup, add
 versionCheckHook

---
 .../python-modules/yamlfix/default.nix        | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix
index 0454fc8f2efe..2c1524627516 100644
--- a/pkgs/development/python-modules/yamlfix/default.nix
+++ b/pkgs/development/python-modules/yamlfix/default.nix
@@ -1,16 +1,23 @@
 {
   lib,
   buildPythonPackage,
-  click,
   fetchFromGitHub,
-  maison,
+
+  # build-system
   pdm-backend,
+  setuptools,
+
+  # dependencies
+  click,
+  maison,
   pydantic,
+  ruyaml,
+
+  # tests
   pytest-freezegun,
   pytest-xdist,
   pytestCheckHook,
-  ruyaml,
-  setuptools,
+  versionCheckHook,
   writableTmpDirAsHomeHook,
 }:
 
@@ -27,8 +34,8 @@ buildPythonPackage rec {
   };
 
   build-system = [
-    setuptools
     pdm-backend
+    setuptools
   ];
 
   dependencies = [
@@ -43,7 +50,9 @@ buildPythonPackage rec {
     pytest-xdist
     pytestCheckHook
     writableTmpDirAsHomeHook
+    versionCheckHook
   ];
+  versionCheckProgramArg = "--version";
 
   pythonImportsCheck = [ "yamlfix" ];
 

From 573630e63fcd8244099d4a4525bfc58dd9f33882 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 13:33:11 +0000
Subject: [PATCH 2389/6226] obs-studio-plugins.obs-vnc: 0.6.1 -> 0.6.2

---
 pkgs/applications/video/obs-studio/plugins/obs-vnc.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vnc.nix b/pkgs/applications/video/obs-studio/plugins/obs-vnc.nix
index b502735cf32f..4b364e96e80a 100644
--- a/pkgs/applications/video/obs-studio/plugins/obs-vnc.nix
+++ b/pkgs/applications/video/obs-studio/plugins/obs-vnc.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "obs-vnc";
-  version = "0.6.1";
+  version = "0.6.2";
 
   src = fetchFromGitHub {
     owner = "norihiro";
     repo = "obs-vnc";
     tag = "${finalAttrs.version}";
-    hash = "sha256-eTvKACeVFFw6DOFAiWaG/m14jYyzZc61e79S8oVWrCs=";
+    hash = "sha256-bveTfyhHH7RAM24Lp0mWlt52ao9Rn6vCuKjfQH+B8Rw=";
   };
 
   nativeBuildInputs = [

From 8e6011c707dcc6ea2c726d486a325f2a728ff638 Mon Sep 17 00:00:00 2001
From: Sam Estep <sam@samestep.com>
Date: Fri, 24 Oct 2025 09:34:02 -0400
Subject: [PATCH 2390/6226] libsForQt5.kdiagram: fix build with cmake 4

---
 .../kdiagram/cmake-minimum-required.patch     | 34 +++++++++++++++++++
 .../libraries/kdiagram/default.nix            |  3 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/libraries/kdiagram/cmake-minimum-required.patch

diff --git a/pkgs/development/libraries/kdiagram/cmake-minimum-required.patch b/pkgs/development/libraries/kdiagram/cmake-minimum-required.patch
new file mode 100644
index 000000000000..e41de5e30ac7
--- /dev/null
+++ b/pkgs/development/libraries/kdiagram/cmake-minimum-required.patch
@@ -0,0 +1,34 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 12dbdbb..22495bb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 3.10)
+ 
+ project( kdiagram )
+ 
+diff --git a/src/KChart/CMakeLists.txt b/src/KChart/CMakeLists.txt
+index 676b71f..a9a2928 100644
+--- a/src/KChart/CMakeLists.txt
++++ b/src/KChart/CMakeLists.txt
+@@ -359,6 +359,7 @@ install(EXPORT KChartTargets
+ ecm_generate_pri_file(
+     BASE_NAME KChart
+     LIB_NAME KChart
++    VERSION ${KCHARTLIB_VERSION}
+     DEPS "widgets svg"
+     FILENAME_VAR PRI_FILENAME
+     INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/KChart
+diff --git a/src/KGantt/CMakeLists.txt b/src/KGantt/CMakeLists.txt
+index 107d762..5cbb254 100644
+--- a/src/KGantt/CMakeLists.txt
++++ b/src/KGantt/CMakeLists.txt
+@@ -183,6 +183,7 @@ install(EXPORT KGanttTargets
+ ecm_generate_pri_file(
+     BASE_NAME KGantt
+     LIB_NAME KGantt
++    VERSION ${KGANTTLIB_VERSION}
+     DEPS "widgets printsupport"
+     FILENAME_VAR PRI_FILENAME
+     INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR}/KGantt
diff --git a/pkgs/development/libraries/kdiagram/default.nix b/pkgs/development/libraries/kdiagram/default.nix
index 6d52a84c97b8..e280ffbc21ac 100644
--- a/pkgs/development/libraries/kdiagram/default.nix
+++ b/pkgs/development/libraries/kdiagram/default.nix
@@ -18,6 +18,9 @@ mkDerivation rec {
     rev = "v${version}";
     sha256 = "sha256-Se131GZE12wqdfN/V4id1pphUvteSrmMaKZ0+lqg1z8=";
   };
+  patches = [
+    ./cmake-minimum-required.patch
+  ];
   nativeBuildInputs = [
     extra-cmake-modules
     qttools

From d1174b712f24ea711d039fdd8fcac0243c57fa58 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 24 Oct 2025 15:23:58 +0200
Subject: [PATCH 2391/6226] meshcentral: 1.1.51 -> 1.1.53

ChangeLogs:
* https://github.com/Ylianst/MeshCentral/releases/tag/1.1.52
* https://github.com/Ylianst/MeshCentral/releases/tag/1.1.53
---
 pkgs/tools/admin/meshcentral/default.nix  |    8 +-
 pkgs/tools/admin/meshcentral/package.json |   42 +-
 pkgs/tools/admin/meshcentral/yarn.lock    | 2215 +++++++++++----------
 3 files changed, 1155 insertions(+), 1110 deletions(-)

diff --git a/pkgs/tools/admin/meshcentral/default.nix b/pkgs/tools/admin/meshcentral/default.nix
index 1e8aa27a4b52..c61f2af145f4 100644
--- a/pkgs/tools/admin/meshcentral/default.nix
+++ b/pkgs/tools/admin/meshcentral/default.nix
@@ -8,11 +8,11 @@
 }:
 
 yarn2nix-moretea.mkYarnPackage {
-  version = "1.1.51";
+  version = "1.1.53";
 
   src = fetchzip {
-    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.51.tgz";
-    sha256 = "1l3x1rhcw38pg0rh27qyfg2dm5biwnyzicdd6l07c3km4x6xi5pr";
+    url = "https://registry.npmjs.org/meshcentral/-/meshcentral-1.1.53.tgz";
+    sha256 = "1wjmvw7cymyjx0hii7kzmmrn7lmc3lj0hsll1nz32z11gnixdvbq";
   };
 
   patches = [
@@ -24,7 +24,7 @@ yarn2nix-moretea.mkYarnPackage {
 
   offlineCache = fetchYarnDeps {
     yarnLock = ./yarn.lock;
-    hash = "sha256-jmsRlHJgSrUtXwRcfX+tMH4SmrKVtD7gEK1+oW5mYIs=";
+    hash = "sha256-jrBRexn5xc0OiBDf9fFDe2ZB3PcFVSuOChGCUWU4hcs=";
   };
 
   # Tarball has CRLF line endings. This makes patching difficult, so let's convert them.
diff --git a/pkgs/tools/admin/meshcentral/package.json b/pkgs/tools/admin/meshcentral/package.json
index 89bea4a15907..d244d8ed06c4 100644
--- a/pkgs/tools/admin/meshcentral/package.json
+++ b/pkgs/tools/admin/meshcentral/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meshcentral",
-  "version": "1.1.51",
+  "version": "1.1.53",
   "keywords": [
     "Remote Device Management",
     "Remote Device Monitoring",
@@ -37,7 +37,7 @@
     "sample-config-advanced.json"
   ],
   "dependencies": {
-    "@seald-io/nedb": "4.0.4",
+    "@seald-io/nedb": "4.1.2",
     "archiver": "7.0.1",
     "body-parser": "1.20.3",
     "cbor": "5.2.0",
@@ -50,9 +50,10 @@
     "minimist": "1.2.8",
     "multiparty": "4.2.3",
     "node-forge": "1.3.1",
+    "otplib": "12.0.1",
     "ua-client-hints-js": "0.1.2",
     "ua-parser-js": "1.0.40",
-    "ws": "8.18.0",
+    "ws": "8.18.3",
     "yauzl": "2.10.0"
   },
   "engines": {
@@ -85,55 +86,56 @@
     "ipcheck": "0.1.0",
     "minimist": "1.2.8",
     "multiparty": "4.2.3",
-    "@seald-io/nedb": "*",
+    "@seald-io/nedb": "4.1.2",
     "node-forge": "1.3.1",
     "ua-parser-js": "1.0.40",
     "ua-client-hints-js": "0.1.2",
-    "ws": "8.18.0",
+    "ws": "8.18.3",
     "yauzl": "2.10.0",
     "node-windows": "0.1.14",
     "loadavg-windows": "1.1.1",
     "node-sspi": "0.2.10",
     "ldapauth-fork": "5.0.5",
-    "ssh2": "1.16.0",
+    "ssh2": "1.17.0",
     "svg-captcha": "1.4.0",
     "image-size": "2.0.2",
     "acme-client": "4.2.5",
-    "aedes": "0.39.0",
-    "mysql2": "3.11.4",
+    "aedes": "0.51.3",
+    "mysql2": "3.15.1",
     "@mysql/xdevapi": "8.0.33",
     "mongodb": "4.17.2",
-    "pg": "8.14.1",
-    "mariadb": "3.4.0",
+    "@mongodb-js/saslprep": "1.3.1",
+    "pg": "8.16.3",
+    "mariadb": "3.4.5",
     "acebase": "1.29.5",
     "sqlite3": "5.1.7",
-    "node-vault": "0.10.2",
-    "https-proxy-agent": "7.0.2",
+    "node-vault": "0.10.5",
+    "https-proxy-agent": "7.0.6",
     "mongojs": "3.1.0",
     "nodemailer": "6.10.1",
-    "@sendgrid/mail": "*",
+    "@sendgrid/mail": "8.1.6",
     "jsdom": "22.1.0",
     "esprima": "4.0.1",
     "html-minifier-terser": "7.2.0",
     "@crowdsec/express-bouncer": "0.1.0",
-    "prom-client": "*",
+    "prom-client": "15.1.3",
     "archiver-zip-encrypted": "2.0.0",
     "googleapis": "128.0.0",
     "webdav": "5.8.0",
-    "minio": "8.0.2",
+    "minio": "8.0.6",
     "wildleek": "2.0.0",
     "yub": "0.11.1",
     "otplib": "12.0.1",
-    "twilio": "4.19.0",
-    "plivo": "4.58.0",
+    "twilio": "4.23.0",
+    "plivo": "4.75.1",
     "telnyx": "1.25.5",
-    "telegram": "2.19.8",
+    "telegram": "2.26.22",
     "input": "1.0.1",
     "discord.js": "14.6.0",
-    "@xmpp/client": "0.13.1",
+    "@xmpp/client": "0.13.6",
     "node-pushover": "1.0.0",
     "zulip": "0.1.0",
-    "web-push": "3.6.6",
+    "web-push": "3.6.7",
     "firebase-admin": "12.7.0",
     "modern-syslog": "1.2.0",
     "syslog": "0.1.1-1",
diff --git a/pkgs/tools/admin/meshcentral/yarn.lock b/pkgs/tools/admin/meshcentral/yarn.lock
index c30057e2dbb8..40d2650403fd 100644
--- a/pkgs/tools/admin/meshcentral/yarn.lock
+++ b/pkgs/tools/admin/meshcentral/yarn.lock
@@ -40,383 +40,380 @@
     "@smithy/util-utf8" "^2.0.0"
     tslib "^2.6.2"
 
-"@aws-sdk/client-cognito-identity@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.895.0.tgz#7d0a49eb8587ba8629a9c27dcb7dc931a9618636"
-  integrity sha512-IwU2LiIqDSq4wj8WtDkWAkKbjnV24EOufqXzcLQfr/QJKd0qkGKeVImOVPXPT8wtksEpB0ViVOpIEyML3BqvAg==
+"@aws-sdk/client-cognito-identity@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.916.0.tgz#acebab71db8c58fd73cf384e6bf1b5ed0c0ac360"
+  integrity sha512-MGpWcn350e/liZrsh8gdJMcBKwE4/pcNvSr3Dw+tB+ZVZlVFdHGFyeQVaknz8UWZXrfUK5KCbvahotmaQOs1pg==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/credential-provider-node" "3.895.0"
-    "@aws-sdk/middleware-host-header" "3.893.0"
-    "@aws-sdk/middleware-logger" "3.893.0"
-    "@aws-sdk/middleware-recursion-detection" "3.893.0"
-    "@aws-sdk/middleware-user-agent" "3.895.0"
-    "@aws-sdk/region-config-resolver" "3.893.0"
-    "@aws-sdk/types" "3.893.0"
-    "@aws-sdk/util-endpoints" "3.895.0"
-    "@aws-sdk/util-user-agent-browser" "3.893.0"
-    "@aws-sdk/util-user-agent-node" "3.895.0"
-    "@smithy/config-resolver" "^4.2.2"
-    "@smithy/core" "^3.11.1"
-    "@smithy/fetch-http-handler" "^5.2.1"
-    "@smithy/hash-node" "^4.1.1"
-    "@smithy/invalid-dependency" "^4.1.1"
-    "@smithy/middleware-content-length" "^4.1.1"
-    "@smithy/middleware-endpoint" "^4.2.3"
-    "@smithy/middleware-retry" "^4.2.4"
-    "@smithy/middleware-serde" "^4.1.1"
-    "@smithy/middleware-stack" "^4.1.1"
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/node-http-handler" "^4.2.1"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/smithy-client" "^4.6.3"
-    "@smithy/types" "^4.5.0"
-    "@smithy/url-parser" "^4.1.1"
-    "@smithy/util-base64" "^4.1.0"
-    "@smithy/util-body-length-browser" "^4.1.0"
-    "@smithy/util-body-length-node" "^4.1.0"
-    "@smithy/util-defaults-mode-browser" "^4.1.3"
-    "@smithy/util-defaults-mode-node" "^4.1.3"
-    "@smithy/util-endpoints" "^3.1.2"
-    "@smithy/util-middleware" "^4.1.1"
-    "@smithy/util-retry" "^4.1.2"
-    "@smithy/util-utf8" "^4.1.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/credential-provider-node" "3.916.0"
+    "@aws-sdk/middleware-host-header" "3.914.0"
+    "@aws-sdk/middleware-logger" "3.914.0"
+    "@aws-sdk/middleware-recursion-detection" "3.914.0"
+    "@aws-sdk/middleware-user-agent" "3.916.0"
+    "@aws-sdk/region-config-resolver" "3.914.0"
+    "@aws-sdk/types" "3.914.0"
+    "@aws-sdk/util-endpoints" "3.916.0"
+    "@aws-sdk/util-user-agent-browser" "3.914.0"
+    "@aws-sdk/util-user-agent-node" "3.916.0"
+    "@smithy/config-resolver" "^4.4.0"
+    "@smithy/core" "^3.17.1"
+    "@smithy/fetch-http-handler" "^5.3.4"
+    "@smithy/hash-node" "^4.2.3"
+    "@smithy/invalid-dependency" "^4.2.3"
+    "@smithy/middleware-content-length" "^4.2.3"
+    "@smithy/middleware-endpoint" "^4.3.5"
+    "@smithy/middleware-retry" "^4.4.5"
+    "@smithy/middleware-serde" "^4.2.3"
+    "@smithy/middleware-stack" "^4.2.3"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/node-http-handler" "^4.4.3"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/smithy-client" "^4.9.1"
+    "@smithy/types" "^4.8.0"
+    "@smithy/url-parser" "^4.2.3"
+    "@smithy/util-base64" "^4.3.0"
+    "@smithy/util-body-length-browser" "^4.2.0"
+    "@smithy/util-body-length-node" "^4.2.1"
+    "@smithy/util-defaults-mode-browser" "^4.3.4"
+    "@smithy/util-defaults-mode-node" "^4.2.6"
+    "@smithy/util-endpoints" "^3.2.3"
+    "@smithy/util-middleware" "^4.2.3"
+    "@smithy/util-retry" "^4.2.3"
+    "@smithy/util-utf8" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/client-sso@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.895.0.tgz#a371d996f301b50c789b6a75167951263e402541"
-  integrity sha512-AQHk6iJrwce/NwZa5/Njy0ZGoHdxWCajkgufhXk53L0kRiC3vUPPWEV1m1F3etQWhaUsatcO2xtRuKvLpe4zgA==
+"@aws-sdk/client-sso@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/client-sso/-/client-sso-3.916.0.tgz#627792ab588a004fc0874a060b3466e21328b5b6"
+  integrity sha512-Eu4PtEUL1MyRvboQnoq5YKg0Z9vAni3ccebykJy615xokVZUdA3di2YxHM/hykDQX7lcUC62q9fVIvh0+UNk/w==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/middleware-host-header" "3.893.0"
-    "@aws-sdk/middleware-logger" "3.893.0"
-    "@aws-sdk/middleware-recursion-detection" "3.893.0"
-    "@aws-sdk/middleware-user-agent" "3.895.0"
-    "@aws-sdk/region-config-resolver" "3.893.0"
-    "@aws-sdk/types" "3.893.0"
-    "@aws-sdk/util-endpoints" "3.895.0"
-    "@aws-sdk/util-user-agent-browser" "3.893.0"
-    "@aws-sdk/util-user-agent-node" "3.895.0"
-    "@smithy/config-resolver" "^4.2.2"
-    "@smithy/core" "^3.11.1"
-    "@smithy/fetch-http-handler" "^5.2.1"
-    "@smithy/hash-node" "^4.1.1"
-    "@smithy/invalid-dependency" "^4.1.1"
-    "@smithy/middleware-content-length" "^4.1.1"
-    "@smithy/middleware-endpoint" "^4.2.3"
-    "@smithy/middleware-retry" "^4.2.4"
-    "@smithy/middleware-serde" "^4.1.1"
-    "@smithy/middleware-stack" "^4.1.1"
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/node-http-handler" "^4.2.1"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/smithy-client" "^4.6.3"
-    "@smithy/types" "^4.5.0"
-    "@smithy/url-parser" "^4.1.1"
-    "@smithy/util-base64" "^4.1.0"
-    "@smithy/util-body-length-browser" "^4.1.0"
-    "@smithy/util-body-length-node" "^4.1.0"
-    "@smithy/util-defaults-mode-browser" "^4.1.3"
-    "@smithy/util-defaults-mode-node" "^4.1.3"
-    "@smithy/util-endpoints" "^3.1.2"
-    "@smithy/util-middleware" "^4.1.1"
-    "@smithy/util-retry" "^4.1.2"
-    "@smithy/util-utf8" "^4.1.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/middleware-host-header" "3.914.0"
+    "@aws-sdk/middleware-logger" "3.914.0"
+    "@aws-sdk/middleware-recursion-detection" "3.914.0"
+    "@aws-sdk/middleware-user-agent" "3.916.0"
+    "@aws-sdk/region-config-resolver" "3.914.0"
+    "@aws-sdk/types" "3.914.0"
+    "@aws-sdk/util-endpoints" "3.916.0"
+    "@aws-sdk/util-user-agent-browser" "3.914.0"
+    "@aws-sdk/util-user-agent-node" "3.916.0"
+    "@smithy/config-resolver" "^4.4.0"
+    "@smithy/core" "^3.17.1"
+    "@smithy/fetch-http-handler" "^5.3.4"
+    "@smithy/hash-node" "^4.2.3"
+    "@smithy/invalid-dependency" "^4.2.3"
+    "@smithy/middleware-content-length" "^4.2.3"
+    "@smithy/middleware-endpoint" "^4.3.5"
+    "@smithy/middleware-retry" "^4.4.5"
+    "@smithy/middleware-serde" "^4.2.3"
+    "@smithy/middleware-stack" "^4.2.3"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/node-http-handler" "^4.4.3"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/smithy-client" "^4.9.1"
+    "@smithy/types" "^4.8.0"
+    "@smithy/url-parser" "^4.2.3"
+    "@smithy/util-base64" "^4.3.0"
+    "@smithy/util-body-length-browser" "^4.2.0"
+    "@smithy/util-body-length-node" "^4.2.1"
+    "@smithy/util-defaults-mode-browser" "^4.3.4"
+    "@smithy/util-defaults-mode-node" "^4.2.6"
+    "@smithy/util-endpoints" "^3.2.3"
+    "@smithy/util-middleware" "^4.2.3"
+    "@smithy/util-retry" "^4.2.3"
+    "@smithy/util-utf8" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/core@3.894.0":
-  version "3.894.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.894.0.tgz#e926a2ce0d925d03353bd0b643852960ecb1a6ff"
-  integrity sha512-7zbO31NV2FaocmMtWOg/fuTk3PC2Ji2AC0Fi2KqrppEDIcwLlTTuT9w/rdu/93Pz+wyUhCxWnDc0tPbwtCLs+A==
+"@aws-sdk/core@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/core/-/core-3.916.0.tgz#ea11b485f837f1773e174f8a4ed82ecce9f163f7"
+  integrity sha512-1JHE5s6MD5PKGovmx/F1e01hUbds/1y3X8rD+Gvi/gWVfdg5noO7ZCerpRsWgfzgvCMZC9VicopBqNHCKLykZA==
   dependencies:
-    "@aws-sdk/types" "3.893.0"
-    "@aws-sdk/xml-builder" "3.894.0"
-    "@smithy/core" "^3.11.1"
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/signature-v4" "^5.2.1"
-    "@smithy/smithy-client" "^4.6.3"
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-base64" "^4.1.0"
-    "@smithy/util-body-length-browser" "^4.1.0"
-    "@smithy/util-middleware" "^4.1.1"
-    "@smithy/util-utf8" "^4.1.0"
+    "@aws-sdk/types" "3.914.0"
+    "@aws-sdk/xml-builder" "3.914.0"
+    "@smithy/core" "^3.17.1"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/signature-v4" "^5.3.3"
+    "@smithy/smithy-client" "^4.9.1"
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-base64" "^4.3.0"
+    "@smithy/util-middleware" "^4.2.3"
+    "@smithy/util-utf8" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-cognito-identity@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.895.0.tgz#2266eea0e82576604e88ce5db281a98eaaabd69f"
-  integrity sha512-MxKRfRBM+5yRoAWmF9icfP4NrRYyD5BaQRl+uR5EhT8mxuImMj0tyY9g/fUwKjxNPJ2LKFtrgadZSXUOB+OkNg==
+"@aws-sdk/credential-provider-cognito-identity@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.916.0.tgz#a036c86e148bf709248d4d297d7e683d1a04a84a"
+  integrity sha512-B0KoCIzEb5e98qaIF6PyXVBEvbi7yyInSoSSpP7ZmlRxanB4an/h54q5QwHPN+zGBqrGBiXbz9HvOLP2c29yww==
   dependencies:
-    "@aws-sdk/client-cognito-identity" "3.895.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/client-cognito-identity" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-env@3.894.0":
-  version "3.894.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.894.0.tgz#2f3a9a9efb9c9405c6a3e5acaf51afdc13d0fde9"
-  integrity sha512-2aiQJIRWOuROPPISKgzQnH/HqSfucdk5z5VMemVH3Mm2EYOrzBwmmiiFpmSMN3ST+sE8c7gusqycUchP+KfALQ==
+"@aws-sdk/credential-provider-env@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-env/-/credential-provider-env-3.916.0.tgz#c76861ec87f9edf227af62474411bf54ca04805d"
+  integrity sha512-3gDeqOXcBRXGHScc6xb7358Lyf64NRG2P08g6Bu5mv1Vbg9PKDyCAZvhKLkG7hkdfAM8Yc6UJNhbFxr1ud/tCQ==
   dependencies:
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-http@3.894.0":
-  version "3.894.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.894.0.tgz#7f1126d7e6d5f48f12d2ca67b7de07759631549b"
-  integrity sha512-Z5QQpqFRflszrT+lUq6+ORuu4jRDcpgCUSoTtlhczidMqfdOSckKmK3chZEfmUUJPSwoFQZ7EiVTsX3c886fBg==
+"@aws-sdk/credential-provider-http@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-http/-/credential-provider-http-3.916.0.tgz#b46e51c5cc65364c5fde752b4d016b5b747c6d89"
+  integrity sha512-NmooA5Z4/kPFJdsyoJgDxuqXC1C6oPMmreJjbOPqcwo6E/h2jxaG8utlQFgXe5F9FeJsMx668dtxVxSYnAAqHQ==
   dependencies:
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/fetch-http-handler" "^5.2.1"
-    "@smithy/node-http-handler" "^4.2.1"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/smithy-client" "^4.6.3"
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-stream" "^4.3.2"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/fetch-http-handler" "^5.3.4"
+    "@smithy/node-http-handler" "^4.4.3"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/smithy-client" "^4.9.1"
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-stream" "^4.5.4"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-ini@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.895.0.tgz#27f0265c1e2b2aeae10b020de048a065ac9840e1"
-  integrity sha512-uIh7N4IN/yIk+qYMAkVpVkjhB90SGKSfaXEVcnmxzBDG6e5304HKT0esqoCVZvtFfLKasjm2TOpalM5l3fi/dA==
+"@aws-sdk/credential-provider-ini@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.916.0.tgz#53ecde76adaf2d0dcec195801053347a47e20a87"
+  integrity sha512-iR0FofvdPs87o6MhfNPv0F6WzB4VZ9kx1hbvmR7bSFCk7l0gc7G4fHJOg4xg2lsCptuETboX3O/78OQ2Djeakw==
   dependencies:
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/credential-provider-env" "3.894.0"
-    "@aws-sdk/credential-provider-http" "3.894.0"
-    "@aws-sdk/credential-provider-process" "3.894.0"
-    "@aws-sdk/credential-provider-sso" "3.895.0"
-    "@aws-sdk/credential-provider-web-identity" "3.895.0"
-    "@aws-sdk/nested-clients" "3.895.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/credential-provider-imds" "^4.1.2"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/shared-ini-file-loader" "^4.2.0"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/credential-provider-env" "3.916.0"
+    "@aws-sdk/credential-provider-http" "3.916.0"
+    "@aws-sdk/credential-provider-process" "3.916.0"
+    "@aws-sdk/credential-provider-sso" "3.916.0"
+    "@aws-sdk/credential-provider-web-identity" "3.916.0"
+    "@aws-sdk/nested-clients" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/credential-provider-imds" "^4.2.3"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/shared-ini-file-loader" "^4.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-node@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.895.0.tgz#76dca377418447714544eeceb7423a693ce6c14a"
-  integrity sha512-7xsBCmkBUz+2sNqNsDJ1uyQsBvwhNFzwFt8wX39WrFJTpTQh3uNQ5g8QH21BbkKqIFKCLdvgHgwt3Ub5RGVuPA==
+"@aws-sdk/credential-provider-node@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-node/-/credential-provider-node-3.916.0.tgz#a95b85ae40d10aef45c821b19f5b0f7929af46ee"
+  integrity sha512-8TrMpHqct0zTalf2CP2uODiN/PH9LPdBC6JDgPVK0POELTT4ITHerMxIhYGEiKN+6E4oRwSjM/xVTHCD4nMcrQ==
   dependencies:
-    "@aws-sdk/credential-provider-env" "3.894.0"
-    "@aws-sdk/credential-provider-http" "3.894.0"
-    "@aws-sdk/credential-provider-ini" "3.895.0"
-    "@aws-sdk/credential-provider-process" "3.894.0"
-    "@aws-sdk/credential-provider-sso" "3.895.0"
-    "@aws-sdk/credential-provider-web-identity" "3.895.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/credential-provider-imds" "^4.1.2"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/shared-ini-file-loader" "^4.2.0"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/credential-provider-env" "3.916.0"
+    "@aws-sdk/credential-provider-http" "3.916.0"
+    "@aws-sdk/credential-provider-ini" "3.916.0"
+    "@aws-sdk/credential-provider-process" "3.916.0"
+    "@aws-sdk/credential-provider-sso" "3.916.0"
+    "@aws-sdk/credential-provider-web-identity" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/credential-provider-imds" "^4.2.3"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/shared-ini-file-loader" "^4.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-process@3.894.0":
-  version "3.894.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.894.0.tgz#bf779c4d3e6e21e6fb0b6ebbb79a135b4b9341bb"
-  integrity sha512-VU74GNsj+SsO+pl4d+JimlQ7+AcderZaC6bFndQssQdFZ5NRad8yFNz5Xbec8CPJr+z/VAwHib6431F5nYF46g==
+"@aws-sdk/credential-provider-process@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-process/-/credential-provider-process-3.916.0.tgz#7c5aa9642a0e1c2a2791d85fe1bedfecae73672e"
+  integrity sha512-SXDyDvpJ1+WbotZDLJW1lqP6gYGaXfZJrgFSXIuZjHb75fKeNRgPkQX/wZDdUvCwdrscvxmtyJorp2sVYkMcvA==
   dependencies:
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/shared-ini-file-loader" "^4.2.0"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/shared-ini-file-loader" "^4.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-sso@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.895.0.tgz#e24ecfe1a9194ff87a51c89bbe00df1cd339bcf7"
-  integrity sha512-bZCcHUZGz+XlCaK0KEOHGHkMtlwIvnpxJvlZtSCVaBdX/IgouxaB42fxChflxSMRWF45ygdezfky4i17f6vC4w==
+"@aws-sdk/credential-provider-sso@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.916.0.tgz#b99ff591e758a56eefe7b05f1e77efe8f28f8c16"
+  integrity sha512-gu9D+c+U/Dp1AKBcVxYHNNoZF9uD4wjAKYCjgSN37j4tDsazwMEylbbZLuRNuxfbXtizbo4/TiaxBXDbWM7AkQ==
   dependencies:
-    "@aws-sdk/client-sso" "3.895.0"
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/token-providers" "3.895.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/shared-ini-file-loader" "^4.2.0"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/client-sso" "3.916.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/token-providers" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/shared-ini-file-loader" "^4.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/credential-provider-web-identity@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.895.0.tgz#ae98946cd639258b912eea90a6c82e8dc89a88b8"
-  integrity sha512-tKbXbOp2xrL02fxKvB7ko1E4Uvyy5TF9qi5pT2MVWNnfSsBlUM80aJ6tyUPKWXdUTdAlPrU3XcwgQl/DnnRa9A==
+"@aws-sdk/credential-provider-web-identity@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.916.0.tgz#8c5f6cf52cd9e091b020f46ebdaa7f52a6834ba9"
+  integrity sha512-VFnL1EjHiwqi2kR19MLXjEgYBuWViCuAKLGSFGSzfFF/+kSpamVrOSFbqsTk8xwHan8PyNnQg4BNuusXwwLoIw==
   dependencies:
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/nested-clients" "3.895.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/shared-ini-file-loader" "^4.2.0"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/nested-clients" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/shared-ini-file-loader" "^4.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
 "@aws-sdk/credential-providers@^3.186.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.895.0.tgz#fa7b3e3ce1bb76b8b2fd058380a5ad91effe29d4"
-  integrity sha512-YAOjBCHKOqWIn1nFOMd1q3Za0h3wzTmcEpZdplhOq7EDlWEOTPGu+NuX2sdZx6fsMWCMzogFJdvV/p8lUXtHcg==
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/credential-providers/-/credential-providers-3.916.0.tgz#4456bd310ca92ebcd71285aa61e758550ab4b133"
+  integrity sha512-wazu2awF69ohF3AaDlYkD+tanaqwJ309o9GawNg3o1oW7orhdcvh6P8BftSjuIzuAMiauvQquxcUrNTLxHtvOA==
   dependencies:
-    "@aws-sdk/client-cognito-identity" "3.895.0"
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/credential-provider-cognito-identity" "3.895.0"
-    "@aws-sdk/credential-provider-env" "3.894.0"
-    "@aws-sdk/credential-provider-http" "3.894.0"
-    "@aws-sdk/credential-provider-ini" "3.895.0"
-    "@aws-sdk/credential-provider-node" "3.895.0"
-    "@aws-sdk/credential-provider-process" "3.894.0"
-    "@aws-sdk/credential-provider-sso" "3.895.0"
-    "@aws-sdk/credential-provider-web-identity" "3.895.0"
-    "@aws-sdk/nested-clients" "3.895.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/config-resolver" "^4.2.2"
-    "@smithy/core" "^3.11.1"
-    "@smithy/credential-provider-imds" "^4.1.2"
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/client-cognito-identity" "3.916.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/credential-provider-cognito-identity" "3.916.0"
+    "@aws-sdk/credential-provider-env" "3.916.0"
+    "@aws-sdk/credential-provider-http" "3.916.0"
+    "@aws-sdk/credential-provider-ini" "3.916.0"
+    "@aws-sdk/credential-provider-node" "3.916.0"
+    "@aws-sdk/credential-provider-process" "3.916.0"
+    "@aws-sdk/credential-provider-sso" "3.916.0"
+    "@aws-sdk/credential-provider-web-identity" "3.916.0"
+    "@aws-sdk/nested-clients" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/config-resolver" "^4.4.0"
+    "@smithy/core" "^3.17.1"
+    "@smithy/credential-provider-imds" "^4.2.3"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-host-header@3.893.0":
-  version "3.893.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.893.0.tgz#1a4b14c11cff158b383e2b859be5c468d2c2c162"
-  integrity sha512-qL5xYRt80ahDfj9nDYLhpCNkDinEXvjLe/Qen/Y/u12+djrR2MB4DRa6mzBCkLkdXDtf0WAoW2EZsNCfGrmOEQ==
+"@aws-sdk/middleware-host-header@3.914.0":
+  version "3.914.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-host-header/-/middleware-host-header-3.914.0.tgz#7e962c3d18c1ecc98606eab09a98dcf1b3402835"
+  integrity sha512-7r9ToySQ15+iIgXMF/h616PcQStByylVkCshmQqcdeynD/lCn2l667ynckxW4+ql0Q+Bo/URljuhJRxVJzydNA==
   dependencies:
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-logger@3.893.0":
-  version "3.893.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.893.0.tgz#4ecb20ee0771a2f3afdc07c1310b97251d3854e2"
-  integrity sha512-ZqzMecjju5zkBquSIfVfCORI/3Mge21nUY4nWaGQy+NUXehqCGG4W7AiVpiHGOcY2cGJa7xeEkYcr2E2U9U0AA==
+"@aws-sdk/middleware-logger@3.914.0":
+  version "3.914.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-logger/-/middleware-logger-3.914.0.tgz#222d50ec69447715d6954eb6db0029f11576227b"
+  integrity sha512-/gaW2VENS5vKvJbcE1umV4Ag3NuiVzpsANxtrqISxT3ovyro29o1RezW/Avz/6oJqjnmgz8soe9J1t65jJdiNg==
   dependencies:
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-recursion-detection@3.893.0":
-  version "3.893.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.893.0.tgz#9fde6f10e72fcbd8ce4f0eea629c07ca64ce86ba"
-  integrity sha512-H7Zotd9zUHQAr/wr3bcWHULYhEeoQrF54artgsoUGIf/9emv6LzY89QUccKIxYd6oHKNTrTyXm9F0ZZrzXNxlg==
+"@aws-sdk/middleware-recursion-detection@3.914.0":
+  version "3.914.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.914.0.tgz#bf65759cf303f271b22770e7f9675034b4ced946"
+  integrity sha512-yiAjQKs5S2JKYc+GrkvGMwkUvhepXDigEXpSJqUseR/IrqHhvGNuOxDxq+8LbDhM4ajEW81wkiBbU+Jl9G82yQ==
   dependencies:
-    "@aws-sdk/types" "3.893.0"
+    "@aws-sdk/types" "3.914.0"
     "@aws/lambda-invoke-store" "^0.0.1"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/types" "^4.5.0"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/middleware-user-agent@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.895.0.tgz#bf1276999ff84a3d53f9f80397033fc1b4bd8f05"
-  integrity sha512-JUqQW2RPp4I95wZ/Im9fTiaX3DF55oJgeoiNlLdHkQZPSNNS/pT1WMWMReSvJdcfSNU3xSUaLtI+h4mQjQUDbQ==
+"@aws-sdk/middleware-user-agent@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.916.0.tgz#a0894ae6d70d7a81b2572ee69ed0d3049d39dfce"
+  integrity sha512-mzF5AdrpQXc2SOmAoaQeHpDFsK2GE6EGcEACeNuoESluPI2uYMpuuNMYrUufdnIAIyqgKlis0NVxiahA5jG42w==
   dependencies:
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/types" "3.893.0"
-    "@aws-sdk/util-endpoints" "3.895.0"
-    "@smithy/core" "^3.11.1"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@aws-sdk/util-endpoints" "3.916.0"
+    "@smithy/core" "^3.17.1"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/nested-clients@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.895.0.tgz#b11c26eb5d2b09a2f6c1901bc73084e76ff8d849"
-  integrity sha512-8w1ihfYgvds6kfal/qJXQQrHRsKYh2nujSyzWMo2TMKMze9WPZA93G4mRbRtKtbSuQ66mVWePH8Cksq35ABu2Q==
+"@aws-sdk/nested-clients@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/nested-clients/-/nested-clients-3.916.0.tgz#2f79b924dd6c25cc3c40f6a0453097ae7a512702"
+  integrity sha512-tgg8e8AnVAer0rcgeWucFJ/uNN67TbTiDHfD+zIOPKep0Z61mrHEoeT/X8WxGIOkEn4W6nMpmS4ii8P42rNtnA==
   dependencies:
     "@aws-crypto/sha256-browser" "5.2.0"
     "@aws-crypto/sha256-js" "5.2.0"
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/middleware-host-header" "3.893.0"
-    "@aws-sdk/middleware-logger" "3.893.0"
-    "@aws-sdk/middleware-recursion-detection" "3.893.0"
-    "@aws-sdk/middleware-user-agent" "3.895.0"
-    "@aws-sdk/region-config-resolver" "3.893.0"
-    "@aws-sdk/types" "3.893.0"
-    "@aws-sdk/util-endpoints" "3.895.0"
-    "@aws-sdk/util-user-agent-browser" "3.893.0"
-    "@aws-sdk/util-user-agent-node" "3.895.0"
-    "@smithy/config-resolver" "^4.2.2"
-    "@smithy/core" "^3.11.1"
-    "@smithy/fetch-http-handler" "^5.2.1"
-    "@smithy/hash-node" "^4.1.1"
-    "@smithy/invalid-dependency" "^4.1.1"
-    "@smithy/middleware-content-length" "^4.1.1"
-    "@smithy/middleware-endpoint" "^4.2.3"
-    "@smithy/middleware-retry" "^4.2.4"
-    "@smithy/middleware-serde" "^4.1.1"
-    "@smithy/middleware-stack" "^4.1.1"
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/node-http-handler" "^4.2.1"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/smithy-client" "^4.6.3"
-    "@smithy/types" "^4.5.0"
-    "@smithy/url-parser" "^4.1.1"
-    "@smithy/util-base64" "^4.1.0"
-    "@smithy/util-body-length-browser" "^4.1.0"
-    "@smithy/util-body-length-node" "^4.1.0"
-    "@smithy/util-defaults-mode-browser" "^4.1.3"
-    "@smithy/util-defaults-mode-node" "^4.1.3"
-    "@smithy/util-endpoints" "^3.1.2"
-    "@smithy/util-middleware" "^4.1.1"
-    "@smithy/util-retry" "^4.1.2"
-    "@smithy/util-utf8" "^4.1.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/middleware-host-header" "3.914.0"
+    "@aws-sdk/middleware-logger" "3.914.0"
+    "@aws-sdk/middleware-recursion-detection" "3.914.0"
+    "@aws-sdk/middleware-user-agent" "3.916.0"
+    "@aws-sdk/region-config-resolver" "3.914.0"
+    "@aws-sdk/types" "3.914.0"
+    "@aws-sdk/util-endpoints" "3.916.0"
+    "@aws-sdk/util-user-agent-browser" "3.914.0"
+    "@aws-sdk/util-user-agent-node" "3.916.0"
+    "@smithy/config-resolver" "^4.4.0"
+    "@smithy/core" "^3.17.1"
+    "@smithy/fetch-http-handler" "^5.3.4"
+    "@smithy/hash-node" "^4.2.3"
+    "@smithy/invalid-dependency" "^4.2.3"
+    "@smithy/middleware-content-length" "^4.2.3"
+    "@smithy/middleware-endpoint" "^4.3.5"
+    "@smithy/middleware-retry" "^4.4.5"
+    "@smithy/middleware-serde" "^4.2.3"
+    "@smithy/middleware-stack" "^4.2.3"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/node-http-handler" "^4.4.3"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/smithy-client" "^4.9.1"
+    "@smithy/types" "^4.8.0"
+    "@smithy/url-parser" "^4.2.3"
+    "@smithy/util-base64" "^4.3.0"
+    "@smithy/util-body-length-browser" "^4.2.0"
+    "@smithy/util-body-length-node" "^4.2.1"
+    "@smithy/util-defaults-mode-browser" "^4.3.4"
+    "@smithy/util-defaults-mode-node" "^4.2.6"
+    "@smithy/util-endpoints" "^3.2.3"
+    "@smithy/util-middleware" "^4.2.3"
+    "@smithy/util-retry" "^4.2.3"
+    "@smithy/util-utf8" "^4.2.0"
     tslib "^2.6.2"
 
-"@aws-sdk/region-config-resolver@3.893.0":
-  version "3.893.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.893.0.tgz#570dfd2314b3f71eb263557bb06fea36b5188cd6"
-  integrity sha512-/cJvh3Zsa+Of0Zbg7vl9wp/kZtdb40yk/2+XcroAMVPO9hPvmS9r/UOm6tO7FeX4TtkRFwWaQJiTZTgSdsPY+Q==
+"@aws-sdk/region-config-resolver@3.914.0":
+  version "3.914.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/region-config-resolver/-/region-config-resolver-3.914.0.tgz#b6d2825081195ce1c634b8c92b1e19b08f140008"
+  integrity sha512-KlmHhRbn1qdwXUdsdrJ7S/MAkkC1jLpQ11n+XvxUUUCGAJd1gjC7AjxPZUM7ieQ2zcb8bfEzIU7al+Q3ZT0u7Q==
   dependencies:
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-config-provider" "^4.1.0"
-    "@smithy/util-middleware" "^4.1.1"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/config-resolver" "^4.4.0"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/token-providers@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.895.0.tgz#6fc09c3aee81fb6c4430724ded1dda88d57775ac"
-  integrity sha512-vJqrEHFFGRZ3ok5T+jII00sa2DQ3HdVkTBIfM0DcrcPssqDV18VKdA767qiBdIEN/cygjdBg8Ri/cuq6ER9BeQ==
+"@aws-sdk/token-providers@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/token-providers/-/token-providers-3.916.0.tgz#e824fd44a553c4047b769caf22a94fd2705c9f1d"
+  integrity sha512-13GGOEgq5etbXulFCmYqhWtpcEQ6WI6U53dvXbheW0guut8fDFJZmEv7tKMTJgiybxh7JHd0rWcL9JQND8DwoQ==
   dependencies:
-    "@aws-sdk/core" "3.894.0"
-    "@aws-sdk/nested-clients" "3.895.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/shared-ini-file-loader" "^4.2.0"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/core" "3.916.0"
+    "@aws-sdk/nested-clients" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/shared-ini-file-loader" "^4.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/types@3.893.0", "@aws-sdk/types@^3.222.0":
-  version "3.893.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.893.0.tgz#1afbdb9d62bf86caeac380e3cac11a051076400a"
-  integrity sha512-Aht1nn5SnA0N+Tjv0dzhAY7CQbxVtmq1bBR6xI0MhG7p2XYVh1wXuKTzrldEvQWwA3odOYunAfT9aBiKZx9qIg==
+"@aws-sdk/types@3.914.0", "@aws-sdk/types@^3.222.0":
+  version "3.914.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/types/-/types-3.914.0.tgz#175cf9a4b2267aafbb110fe1316e6827de951fdb"
+  integrity sha512-kQWPsRDmom4yvAfyG6L1lMmlwnTzm1XwMHOU+G5IFlsP4YEaMtXidDzW/wiivY0QFrhfCz/4TVmu0a2aPU57ug==
   dependencies:
-    "@smithy/types" "^4.5.0"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/util-endpoints@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.895.0.tgz#d3881250cecc40fa9d721a33661c1aaa64aba643"
-  integrity sha512-MhxBvWbwxmKknuggO2NeMwOVkHOYL98pZ+1ZRI5YwckoCL3AvISMnPJgfN60ww6AIXHGpkp+HhpFdKOe8RHSEg==
+"@aws-sdk/util-endpoints@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-endpoints/-/util-endpoints-3.916.0.tgz#ab54249b8090cd66fe14aa8518097107a2595196"
+  integrity sha512-bAgUQwvixdsiGNcuZSDAOWbyHlnPtg8G8TyHD6DTfTmKTHUW6tAn+af/ZYJPXEzXhhpwgJqi58vWnsiDhmr7NQ==
   dependencies:
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/types" "^4.5.0"
-    "@smithy/url-parser" "^4.1.1"
-    "@smithy/util-endpoints" "^3.1.2"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/types" "^4.8.0"
+    "@smithy/url-parser" "^4.2.3"
+    "@smithy/util-endpoints" "^3.2.3"
     tslib "^2.6.2"
 
 "@aws-sdk/util-locate-window@^3.0.0":
@@ -426,33 +423,33 @@
   dependencies:
     tslib "^2.6.2"
 
-"@aws-sdk/util-user-agent-browser@3.893.0":
-  version "3.893.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.893.0.tgz#be0aac5c73a30c2a03aedb2e3501bb277bad79a1"
-  integrity sha512-PE9NtbDBW6Kgl1bG6A5fF3EPo168tnkj8TgMcT0sg4xYBWsBpq0bpJZRh+Jm5Bkwiw9IgTCLjEU7mR6xWaMB9w==
+"@aws-sdk/util-user-agent-browser@3.914.0":
+  version "3.914.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.914.0.tgz#ed29fd87f6ffba6f53615894a5e969cb9013af59"
+  integrity sha512-rMQUrM1ECH4kmIwlGl9UB0BtbHy6ZuKdWFrIknu8yGTRI/saAucqNTh5EI1vWBxZ0ElhK5+g7zOnUuhSmVQYUA==
   dependencies:
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/types" "^4.8.0"
     bowser "^2.11.0"
     tslib "^2.6.2"
 
-"@aws-sdk/util-user-agent-node@3.895.0":
-  version "3.895.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.895.0.tgz#f8bcfff850f2685d10099a7496dc70d6c6525356"
-  integrity sha512-lLRC7BAFOPtJk4cZC0Q0MZBMCGF109QpGnug3L3n/2TJW02Sinz9lzA0ykBpYXe9j60LjIYSENCg+F4DZE5vxg==
+"@aws-sdk/util-user-agent-node@3.916.0":
+  version "3.916.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.916.0.tgz#3ab5fdb9f45345f19f426941ece71988b31bf58d"
+  integrity sha512-CwfWV2ch6UdjuSV75ZU99N03seEUb31FIUrXBnwa6oONqj/xqXwrxtlUMLx6WH3OJEE4zI3zt5PjlTdGcVwf4g==
   dependencies:
-    "@aws-sdk/middleware-user-agent" "3.895.0"
-    "@aws-sdk/types" "3.893.0"
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/types" "^4.5.0"
+    "@aws-sdk/middleware-user-agent" "3.916.0"
+    "@aws-sdk/types" "3.914.0"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@aws-sdk/xml-builder@3.894.0":
-  version "3.894.0"
-  resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.894.0.tgz#7110e86622345d3da220a2ed5259a30a91dec4bc"
-  integrity sha512-E6EAMc9dT1a2DOdo4zyOf3fp5+NJ2wI+mcm7RaW1baFIWDwcb99PpvWoV7YEiK7oaBDshuOEGWKUSYXdW+JYgA==
+"@aws-sdk/xml-builder@3.914.0":
+  version "3.914.0"
+  resolved "https://registry.yarnpkg.com/@aws-sdk/xml-builder/-/xml-builder-3.914.0.tgz#4e98b479856113db877d055e7b008065c50266d4"
+  integrity sha512-k75evsBD5TcIjedycYS7QXQ98AmOtbnxRJOPtCo0IwYRmy7UvqgS/gBL5SmrIqeV6FDSYRQMgdBxSMp6MLmdew==
   dependencies:
-    "@smithy/types" "^4.5.0"
+    "@smithy/types" "^4.8.0"
     fast-xml-parser "5.2.5"
     tslib "^2.6.2"
 
@@ -461,7 +458,7 @@
   resolved "https://registry.yarnpkg.com/@aws/lambda-invoke-store/-/lambda-invoke-store-0.0.1.tgz#92d792a7dda250dfcb902e13228f37a81be57c8f"
   integrity sha512-ORHRQ2tmvnBXc8t/X9Z8IcSbBA4xTLKuN873FopzklHMeqBst7YG0d+AX97inkvDX+NChYtSr+qGfcqGFaI8Zw==
 
-"@babel/cli@^7.16.0":
+"@babel/cli@^7.26.4":
   version "7.28.3"
   resolved "https://registry.yarnpkg.com/@babel/cli/-/cli-7.28.3.tgz#f33693753bc103ab0084a5776ccf8ab8a140038b"
   integrity sha512-n1RU5vuCX0CsaqaXm9I0KUCNKNQMy5epmzl/xdSSm70bSqhg9GWhgeosypyQLc0bK24+Xpk1WGzZlI9pJtkZdg==
@@ -487,24 +484,24 @@
     picocolors "^1.1.1"
 
 "@babel/compat-data@^7.27.2":
-  version "7.28.4"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.28.4.tgz#96fdf1af1b8859c8474ab39c295312bfb7c24b04"
-  integrity sha512-YsmSKC29MJwf0gF8Rjjrg5LQCmyh+j/nD8/eP7f+BeoQTKYqs9RoWbjGOdy0+1Ekr68RJZMUOPVQaQisnIo4Rw==
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.28.5.tgz#a8a4962e1567121ac0b3b487f52107443b455c7f"
+  integrity sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==
 
-"@babel/core@^7.16.5":
-  version "7.28.4"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.28.4.tgz#12a550b8794452df4c8b084f95003bce1742d496"
-  integrity sha512-2BCOP7TN8M+gVDj7/ht3hsaO/B/n5oDbiAyyvnRlNOs+u1o+JWNYTQrmpuNp1/Wq2gcFrI01JAW+paEKDMx/CA==
+"@babel/core@^7.26.0":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.28.5.tgz#4c81b35e51e1b734f510c99b07dfbc7bbbb48f7e"
+  integrity sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==
   dependencies:
     "@babel/code-frame" "^7.27.1"
-    "@babel/generator" "^7.28.3"
+    "@babel/generator" "^7.28.5"
     "@babel/helper-compilation-targets" "^7.27.2"
     "@babel/helper-module-transforms" "^7.28.3"
     "@babel/helpers" "^7.28.4"
-    "@babel/parser" "^7.28.4"
+    "@babel/parser" "^7.28.5"
     "@babel/template" "^7.27.2"
-    "@babel/traverse" "^7.28.4"
-    "@babel/types" "^7.28.4"
+    "@babel/traverse" "^7.28.5"
+    "@babel/types" "^7.28.5"
     "@jridgewell/remapping" "^2.3.5"
     convert-source-map "^2.0.0"
     debug "^4.1.0"
@@ -512,13 +509,13 @@
     json5 "^2.2.3"
     semver "^6.3.1"
 
-"@babel/generator@^7.28.3", "@babel/generator@^7.4.0":
-  version "7.28.3"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.3.tgz#9626c1741c650cbac39121694a0f2d7451b8ef3e"
-  integrity sha512-3lSpxGgvnmZznmBkCRnVREPUFJv2wrv9iAoFDvADJc0ypmdOxdUtcLeBgBJ6zE0PMeTKnxeQzyk0xTBq4Ep7zw==
+"@babel/generator@^7.28.5", "@babel/generator@^7.4.0":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.28.5.tgz#712722d5e50f44d07bc7ac9fe84438742dd61298"
+  integrity sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==
   dependencies:
-    "@babel/parser" "^7.28.3"
-    "@babel/types" "^7.28.2"
+    "@babel/parser" "^7.28.5"
+    "@babel/types" "^7.28.5"
     "@jridgewell/gen-mapping" "^0.3.12"
     "@jridgewell/trace-mapping" "^0.3.28"
     jsesc "^3.0.2"
@@ -573,10 +570,10 @@
   resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz#54da796097ab19ce67ed9f88b47bb2ec49367687"
   integrity sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==
 
-"@babel/helper-validator-identifier@^7.27.1":
-  version "7.27.1"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz#a7054dcc145a967dd4dc8fee845a57c1316c9df8"
-  integrity sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==
+"@babel/helper-validator-identifier@^7.27.1", "@babel/helper-validator-identifier@^7.28.5":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz#010b6938fab7cb7df74aa2bbc06aa503b8fe5fb4"
+  integrity sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==
 
 "@babel/helper-validator-option@^7.27.1":
   version "7.27.1"
@@ -591,7 +588,7 @@
     "@babel/template" "^7.27.2"
     "@babel/types" "^7.28.4"
 
-"@babel/node@^7.16.5":
+"@babel/node@^7.26.0":
   version "7.28.0"
   resolved "https://registry.yarnpkg.com/@babel/node/-/node-7.28.0.tgz#fe52d05121ca064e6919215ffe54fea480a8746f"
   integrity sha512-6u1Mmn3SIMUH8uwTq543L062X3JDgms9HPf06o/pIGdDjeD/zNQ+dfZPQD27sCyvtP0ZOlJtwnl2RIdPe9bHeQ==
@@ -603,12 +600,12 @@
     regenerator-runtime "^0.14.0"
     v8flags "^3.1.1"
 
-"@babel/parser@^7.27.2", "@babel/parser@^7.28.3", "@babel/parser@^7.28.4", "@babel/parser@^7.4.3":
-  version "7.28.4"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.4.tgz#da25d4643532890932cc03f7705fe19637e03fa8"
-  integrity sha512-yZbBqeM6TkpP9du/I2pUZnJsRMGGvOuIrhjzC1AwHwW+6he4mni6Bp/m8ijn0iOuZuPI2BfkCoSRunpyjnrQKg==
+"@babel/parser@^7.27.2", "@babel/parser@^7.28.5", "@babel/parser@^7.4.3":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.28.5.tgz#0b0225ee90362f030efd644e8034c99468893b08"
+  integrity sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==
   dependencies:
-    "@babel/types" "^7.28.4"
+    "@babel/types" "^7.28.5"
 
 "@babel/plugin-syntax-jsx@^7.27.1":
   version "7.27.1"
@@ -617,7 +614,7 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.27.1"
 
-"@babel/plugin-transform-react-jsx@^7.16.5":
+"@babel/plugin-transform-react-jsx@^7.25.9":
   version "7.27.1"
   resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.27.1.tgz#1023bc94b78b0a2d68c82b5e96aed573bcfb9db0"
   integrity sha512-2KH4LWGSrJIkVf5tSiBFYuXDAoWRq2MMwgivCf+93dd0GQi8RXLjKA/0EvRnVV5G0hrHczsquXuD01L8s6dmBw==
@@ -639,6 +636,11 @@
     pirates "^4.0.6"
     source-map-support "^0.5.16"
 
+"@babel/runtime@^7.23.8", "@babel/runtime@^7.24.5":
+  version "7.28.4"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.28.4.tgz#a70226016fabe25c5783b2f22d3e1c9bc5ca3326"
+  integrity sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==
+
 "@babel/template@^7.27.2", "@babel/template@^7.4.0":
   version "7.27.2"
   resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.27.2.tgz#fa78ceed3c4e7b63ebf6cb39e5852fca45f6809d"
@@ -648,26 +650,26 @@
     "@babel/parser" "^7.27.2"
     "@babel/types" "^7.27.1"
 
-"@babel/traverse@^7.27.1", "@babel/traverse@^7.28.3", "@babel/traverse@^7.28.4", "@babel/traverse@^7.4.3":
-  version "7.28.4"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.4.tgz#8d456101b96ab175d487249f60680221692b958b"
-  integrity sha512-YEzuboP2qvQavAcjgQNVgsvHIDv6ZpwXvcvjmyySP2DIMuByS/6ioU5G9pYrWHM6T2YDfc7xga9iNzYOs12CFQ==
+"@babel/traverse@^7.27.1", "@babel/traverse@^7.28.3", "@babel/traverse@^7.28.5", "@babel/traverse@^7.4.3":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.28.5.tgz#450cab9135d21a7a2ca9d2d35aa05c20e68c360b"
+  integrity sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==
   dependencies:
     "@babel/code-frame" "^7.27.1"
-    "@babel/generator" "^7.28.3"
+    "@babel/generator" "^7.28.5"
     "@babel/helper-globals" "^7.28.0"
-    "@babel/parser" "^7.28.4"
+    "@babel/parser" "^7.28.5"
     "@babel/template" "^7.27.2"
-    "@babel/types" "^7.28.4"
+    "@babel/types" "^7.28.5"
     debug "^4.3.1"
 
-"@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.28.2", "@babel/types@^7.28.4", "@babel/types@^7.4.0":
-  version "7.28.4"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.4.tgz#0a4e618f4c60a7cd6c11cb2d48060e4dbe38ac3a"
-  integrity sha512-bkFqkLhh3pMBUQQkpVgWDWq/lqzc2678eUyDlTBhRqhCHFguYYGM0Efga7tYk4TogG/3x0EEl66/OQ+WGbWB/Q==
+"@babel/types@^7.27.1", "@babel/types@^7.27.3", "@babel/types@^7.28.4", "@babel/types@^7.28.5", "@babel/types@^7.4.0":
+  version "7.28.5"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.28.5.tgz#10fc405f60897c35f07e85493c932c7b5ca0592b"
+  integrity sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==
   dependencies:
     "@babel/helper-string-parser" "^7.27.1"
-    "@babel/helper-validator-identifier" "^7.27.1"
+    "@babel/helper-validator-identifier" "^7.28.5"
 
 "@buttercup/fetch@^0.2.1":
   version "0.2.1"
@@ -697,24 +699,24 @@
   resolved "https://registry.yarnpkg.com/@cryptography/aes/-/aes-0.1.1.tgz#0096726a6a2a2cfc2e8bddf3997e98e49f1a224d"
   integrity sha512-PcYz4FDGblO6tM2kSC+VzhhK62vml6k6/YAkiWtyPvrgJVfnDRoHGDtKn5UiaRRUrvUTTocBpvc2rRgTCqxjsg==
 
-"@dabh/diagnostics@^2.0.2":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.3.tgz#7f7e97ee9a725dffc7808d93668cc984e1dc477a"
-  integrity sha512-hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA==
+"@dabh/diagnostics@^2.0.8":
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/@dabh/diagnostics/-/diagnostics-2.0.8.tgz#ead97e72ca312cf0e6dd7af0d300b58993a31a5e"
+  integrity sha512-R4MSXTVnuMzGD7bzHdW2ZhhdPC/igELENcq5IjEverBvq5hn1SXCWcsi6eSsdWP0/Ur+SItRRjAktmdoX/8R/Q==
   dependencies:
-    colorspace "1.1.x"
+    "@so-ric/colorspace" "^1.1.6"
     enabled "2.0.x"
     kuler "^2.0.0"
 
 "@discordjs/builders@^1.3.0":
-  version "1.11.3"
-  resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-1.11.3.tgz#14b8b027e16b73136924faecaf1819b94711647c"
-  integrity sha512-p3kf5eV49CJiRTfhtutUCeivSyQ/l2JlKodW1ZquRwwvlOWmG9+6jFShX6x8rUiYhnP6wKI96rgN/SXMy5e5aw==
+  version "1.12.2"
+  resolved "https://registry.yarnpkg.com/@discordjs/builders/-/builders-1.12.2.tgz#d49c3796e75a6e6533e6bd4ca0de0b3716725a5a"
+  integrity sha512-AugKmrgRJOHXEyMkABH/hXpAmIBKbYokCEl9VAM4Kh6FvkdobQ+Zhv7AR6K+y5hS7+VQ7gKXPYCe1JQmV07H1g==
   dependencies:
     "@discordjs/formatters" "^0.6.1"
     "@discordjs/util" "^1.1.1"
     "@sapphire/shapeshift" "^4.0.0"
-    discord-api-types "^0.38.16"
+    discord-api-types "^0.38.26"
     fast-deep-equal "^3.1.3"
     ts-mixer "^6.0.4"
     tslib "^2.6.3"
@@ -854,9 +856,9 @@
   integrity sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==
 
 "@google-cloud/firestore@^7.7.0":
-  version "7.11.5"
-  resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-7.11.5.tgz#7932e07a79ab2488e707de3494acb6216377fa03"
-  integrity sha512-61xGOvRPi6Zg7b9JslD844dXRatwk+RtnXs4c4KtCdg30TkExRHx9QfJgnoIMvuffYBgDtzOdhvecUgTPboi/A==
+  version "7.11.6"
+  resolved "https://registry.yarnpkg.com/@google-cloud/firestore/-/firestore-7.11.6.tgz#0a2b26e215aa4f903267f82370450753b84db16a"
+  integrity sha512-EW/O8ktzwLfyWBOsNuhRoMi8lrC3clHM5LVFhGvO1HCsLozCOOXRAlHrYBoE6HL42Sc8yYMuCb2XqcnJ4OOEpw==
   dependencies:
     "@opentelemetry/api" "^1.3.0"
     fast-deep-equal "^3.1.1"
@@ -883,9 +885,9 @@
   integrity sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g==
 
 "@google-cloud/storage@^7.7.0":
-  version "7.17.1"
-  resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-7.17.1.tgz#4f998c4b63e0537272ac44f5e7751e046ecaca1d"
-  integrity sha512-2FMQbpU7qK+OtBPaegC6n+XevgZksobUGo6mGKnXNmeZpvLiAo1gTAE3oTKsrMGDV4VtL8Zzpono0YsK/Q7Iqg==
+  version "7.17.2"
+  resolved "https://registry.yarnpkg.com/@google-cloud/storage/-/storage-7.17.2.tgz#dd6ed7a60c5f917612dd665f292541cb2624b243"
+  integrity sha512-6xN0KNO8L/LIA5zu3CJwHkJiB6n65eykBLOb0E+RooiHYgX8CSao6lvQiKT9TBk2gL5g33LL3fmhDodZnt56rw==
   dependencies:
     "@google-cloud/paginator" "^5.0.0"
     "@google-cloud/projectify" "^4.0.0"
@@ -1002,10 +1004,17 @@
   resolved "https://registry.yarnpkg.com/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz#9299f82874bab9e4c7f9c48d865becbfe8d6907c"
   integrity sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==
 
+"@mongodb-js/saslprep@1.3.1":
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.3.1.tgz#a7d6cfc085f801e51ba5cbec6aa84cad858e1d2d"
+  integrity sha512-6nZrq5kfAz0POWyhljnbWQQJQ5uT8oE2ddX303q1uY0tWsivWKgBDXBBvuFPwOqRRalXJuVO9EjOdVtuhLX0zg==
+  dependencies:
+    sparse-bitfield "^3.0.3"
+
 "@mongodb-js/saslprep@^1.1.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.3.0.tgz#75bb770b4b0908047b6c6ac2ec841047660e1c82"
-  integrity sha512-zlayKCsIjYb7/IdfqxorK5+xUMyi4vOKcFy10wKJYc63NSdKI8mNME+uJqfatkPmOSMMUiojrL58IePKBm3gvQ==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@mongodb-js/saslprep/-/saslprep-1.3.2.tgz#51e5cad2f24b8759702d9cc185da0a3ef3784bad"
+  integrity sha512-QgA5AySqB27cGTXBFmnpifAi7HxoGUeezwo6p9dI03MuDB6Pp33zgclqVb6oVK3j6I9Vesg0+oojW2XxB59SGg==
   dependencies:
     sparse-bitfield "^3.0.3"
 
@@ -1189,14 +1198,14 @@
   resolved "https://registry.yarnpkg.com/@seald-io/binary-search-tree/-/binary-search-tree-1.0.3.tgz#165a9a456eaa30d15885b25db83861bcce2c6a74"
   integrity sha512-qv3jnwoakeax2razYaMsGI/luWdliBLHTdC6jU55hQt1hcFqzauH/HsBollQ7IR4ySTtYhT+xyHoijpA16C+tA==
 
-"@seald-io/nedb@4.0.4":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@seald-io/nedb/-/nedb-4.0.4.tgz#a6f5dd63a2dde0e141f1862da1e0806141791732"
-  integrity sha512-CUNcMio7QUHTA+sIJ/DC5JzVNNsHe743TPmC4H5Gij9zDLMbmrCT2li3eVB72/gF63BPS8pWEZrjlAMRKA8FDw==
+"@seald-io/nedb@4.1.2":
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/@seald-io/nedb/-/nedb-4.1.2.tgz#cacd7253d9826b51495d024ca768dea3fe63e853"
+  integrity sha512-bDr6TqjBVS2rDyYM9CPxAnotj5FuNL9NF8o7h7YyFXM7yruqT4ddr+PkSb2mJvvw991bqdftazkEo38gykvaww==
   dependencies:
     "@seald-io/binary-search-tree" "^1.0.3"
-    localforage "^1.9.0"
-    util "^0.12.4"
+    localforage "^1.10.0"
+    util "^0.12.5"
 
 "@sendgrid/client@^8.1.5":
   version "8.1.6"
@@ -1213,7 +1222,7 @@
   dependencies:
     deepmerge "^4.2.2"
 
-"@sendgrid/mail@*":
+"@sendgrid/mail@8.1.6":
   version "8.1.6"
   resolved "https://registry.yarnpkg.com/@sendgrid/mail/-/mail-8.1.6.tgz#9c253c13d49867fdb6f7df1360643825236eef22"
   integrity sha512-/ZqxUvKeEztU9drOoPC/8opEPOk+jLlB2q4+xpx6HVLq6aFu3pMpalkTpAQz8XfRfpLp8O25bh6pGPcHDCYpqg==
@@ -1238,79 +1247,80 @@
   resolved "https://registry.yarnpkg.com/@sideway/pinpoint/-/pinpoint-2.0.0.tgz#cff8ffadc372ad29fd3f78277aeb29e632cc70df"
   integrity sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==
 
-"@smithy/abort-controller@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.1.1.tgz#9b3872ab6b2c061486175c281dadc0a853260533"
-  integrity sha512-vkzula+IwRvPR6oKQhMYioM3A/oX/lFCZiwuxkQbRhqJS2S4YRY2k7k/SyR2jMf3607HLtbEwlRxi0ndXHMjRg==
+"@smithy/abort-controller@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/abort-controller/-/abort-controller-4.2.3.tgz#4615da3012b580ac3d1f0ee7b57ed7d7880bb29b"
+  integrity sha512-xWL9Mf8b7tIFuAlpjKtRPnHrR8XVrwTj5NPYO/QwZPtc0SDLsPxb56V5tzi5yspSMytISHybifez+4jlrx0vkQ==
   dependencies:
-    "@smithy/types" "^4.5.0"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@smithy/config-resolver@^4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.2.2.tgz#3f6a3c163f9b5b7f852d7d1817bc9e3b2136fa5f"
-  integrity sha512-IT6MatgBWagLybZl1xQcURXRICvqz1z3APSCAI9IqdvfCkrA7RaQIEfgC6G/KvfxnDfQUDqFV+ZlixcuFznGBQ==
+"@smithy/config-resolver@^4.4.0":
+  version "4.4.0"
+  resolved "https://registry.yarnpkg.com/@smithy/config-resolver/-/config-resolver-4.4.0.tgz#9a33b7dd9b7e0475802acef53f41555257e104cd"
+  integrity sha512-Kkmz3Mup2PGp/HNJxhCWkLNdlajJORLSjwkcfrj0E7nu6STAEdcMR1ir5P9/xOmncx8xXfru0fbUYLlZog/cFg==
   dependencies:
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-config-provider" "^4.1.0"
-    "@smithy/util-middleware" "^4.1.1"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-config-provider" "^4.2.0"
+    "@smithy/util-endpoints" "^3.2.3"
+    "@smithy/util-middleware" "^4.2.3"
     tslib "^2.6.2"
 
-"@smithy/core@^3.11.1", "@smithy/core@^3.12.0":
-  version "3.12.0"
-  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.12.0.tgz#81bb6a2a113e334ddaede9d502ff17ce4d8a2cc6"
-  integrity sha512-zJeAgogZfbwlPGL93y4Z/XNeIN37YCreRUd6YMIRvaq+6RnBK8PPYYIQ85Is/GglPh3kNImD5riDCXbVSDpCiQ==
+"@smithy/core@^3.17.1":
+  version "3.17.1"
+  resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.17.1.tgz#644aa4046b31c82d2c17276bcef2c6b78245dfeb"
+  integrity sha512-V4Qc2CIb5McABYfaGiIYLTmo/vwNIK7WXI5aGveBd9UcdhbOMwcvIMxIw/DJj1S9QgOMa/7FBkarMdIC0EOTEQ==
   dependencies:
-    "@smithy/middleware-serde" "^4.1.1"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-base64" "^4.1.0"
-    "@smithy/util-body-length-browser" "^4.1.0"
-    "@smithy/util-middleware" "^4.1.1"
-    "@smithy/util-stream" "^4.3.2"
-    "@smithy/util-utf8" "^4.1.0"
-    "@smithy/uuid" "^1.0.0"
+    "@smithy/middleware-serde" "^4.2.3"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-base64" "^4.3.0"
+    "@smithy/util-body-length-browser" "^4.2.0"
+    "@smithy/util-middleware" "^4.2.3"
+    "@smithy/util-stream" "^4.5.4"
+    "@smithy/util-utf8" "^4.2.0"
+    "@smithy/uuid" "^1.1.0"
     tslib "^2.6.2"
 
-"@smithy/credential-provider-imds@^4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.1.2.tgz#68662c873dbe812c13159cb2be3c4ba8aeb52149"
-  integrity sha512-JlYNq8TShnqCLg0h+afqe2wLAwZpuoSgOyzhYvTgbiKBWRov+uUve+vrZEQO6lkdLOWPh7gK5dtb9dS+KGendg==
+"@smithy/credential-provider-imds@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/credential-provider-imds/-/credential-provider-imds-4.2.3.tgz#b35d0d1f1b28f415e06282999eba2d53eb10a1c5"
+  integrity sha512-hA1MQ/WAHly4SYltJKitEsIDVsNmXcQfYBRv2e+q04fnqtAX5qXaybxy/fhUeAMCnQIdAjaGDb04fMHQefWRhw==
   dependencies:
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/types" "^4.5.0"
-    "@smithy/url-parser" "^4.1.1"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/types" "^4.8.0"
+    "@smithy/url-parser" "^4.2.3"
     tslib "^2.6.2"
 
-"@smithy/fetch-http-handler@^5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.2.1.tgz#fe284a00f1b3a35edf9fba454d287b7f74ef20af"
-  integrity sha512-5/3wxKNtV3wO/hk1is+CZUhL8a1yy/U+9u9LKQ9kZTkMsHaQjJhc3stFfiujtMnkITjzWfndGA2f7g9Uh9vKng==
+"@smithy/fetch-http-handler@^5.3.4":
+  version "5.3.4"
+  resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.3.4.tgz#af6dd2f63550494c84ef029a5ceda81ef46965d3"
+  integrity sha512-bwigPylvivpRLCm+YK9I5wRIYjFESSVwl8JQ1vVx/XhCw0PtCi558NwTnT2DaVCl5pYlImGuQTSwMsZ+pIavRw==
   dependencies:
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/querystring-builder" "^4.1.1"
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-base64" "^4.1.0"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/querystring-builder" "^4.2.3"
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-base64" "^4.3.0"
     tslib "^2.6.2"
 
-"@smithy/hash-node@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.1.1.tgz#86ceca92487492267e944e4f4507106b731e7971"
-  integrity sha512-H9DIU9WBLhYrvPs9v4sYvnZ1PiAI0oc8CgNQUJ1rpN3pP7QADbTOUjchI2FB764Ub0DstH5xbTqcMJu1pnVqxA==
+"@smithy/hash-node@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/hash-node/-/hash-node-4.2.3.tgz#c85711fca84e022f05c71b921f98cb6a0f48e5ca"
+  integrity sha512-6+NOdZDbfuU6s1ISp3UOk5Rg953RJ2aBLNLLBEcamLjHAg1Po9Ha7QIB5ZWhdRUVuOUrT8BVFR+O2KIPmw027g==
   dependencies:
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-buffer-from" "^4.1.0"
-    "@smithy/util-utf8" "^4.1.0"
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-buffer-from" "^4.2.0"
+    "@smithy/util-utf8" "^4.2.0"
     tslib "^2.6.2"
 
-"@smithy/invalid-dependency@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.1.1.tgz#2511335ff889944701c7d2a3b1e4a4d6fe9ddfab"
-  integrity sha512-1AqLyFlfrrDkyES8uhINRlJXmHA2FkG+3DY8X+rmLSqmFwk3DJnvhyGzyByPyewh2jbmV+TYQBEfngQax8IFGg==
+"@smithy/invalid-dependency@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/invalid-dependency/-/invalid-dependency-4.2.3.tgz#4f126ddde90fe3d69d522fc37256ee853246c1ec"
+  integrity sha512-Cc9W5DwDuebXEDMpOpl4iERo8I0KFjTnomK2RMdhhR87GwrSmUmwMxS4P5JdRf+LsjOdIqumcerwRgYMr/tZ9Q==
   dependencies:
-    "@smithy/types" "^4.5.0"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
 "@smithy/is-array-buffer@^2.2.0":
@@ -1320,200 +1330,200 @@
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/is-array-buffer@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-4.1.0.tgz#d18a2f22280e7173633cb91a9bdb6f3d8a6560b8"
-  integrity sha512-ePTYUOV54wMogio+he4pBybe8fwg4sDvEVDBU8ZlHOZXbXK3/C0XfJgUCu6qAZcawv05ZhZzODGUerFBPsPUDQ==
-  dependencies:
-    tslib "^2.6.2"
-
-"@smithy/middleware-content-length@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.1.1.tgz#eaea7bd14c7a0b64aef87b8c372c2a04d7b9cb72"
-  integrity sha512-9wlfBBgTsRvC2JxLJxv4xDGNBrZuio3AgSl0lSFX7fneW2cGskXTYpFxCdRYD2+5yzmsiTuaAJD1Wp7gWt9y9w==
-  dependencies:
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/types" "^4.5.0"
-    tslib "^2.6.2"
-
-"@smithy/middleware-endpoint@^4.2.3", "@smithy/middleware-endpoint@^4.2.4":
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.2.4.tgz#d815d27b7869a66ee97b41932053ca5d5ec6315e"
-  integrity sha512-FZ4hzupOmthm8Q8ujYrd0I+/MHwVMuSTdkDtIQE0xVuvJt9pLT6Q+b0p4/t+slDyrpcf+Wj7SN+ZqT5OryaaZg==
-  dependencies:
-    "@smithy/core" "^3.12.0"
-    "@smithy/middleware-serde" "^4.1.1"
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/shared-ini-file-loader" "^4.2.0"
-    "@smithy/types" "^4.5.0"
-    "@smithy/url-parser" "^4.1.1"
-    "@smithy/util-middleware" "^4.1.1"
-    tslib "^2.6.2"
-
-"@smithy/middleware-retry@^4.2.4":
-  version "4.3.0"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.3.0.tgz#453c9668b013fbfa900957857f74f3b15936b384"
-  integrity sha512-qhEX9745fAxZvtLM4bQJAVC98elWjiMO2OiHl1s6p7hUzS4QfZO1gXUYNwEK8m0J6NoCD5W52ggWxbIDHI0XSg==
-  dependencies:
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/service-error-classification" "^4.1.2"
-    "@smithy/smithy-client" "^4.6.4"
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-middleware" "^4.1.1"
-    "@smithy/util-retry" "^4.1.2"
-    "@smithy/uuid" "^1.0.0"
-    tslib "^2.6.2"
-
-"@smithy/middleware-serde@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.1.1.tgz#cfb99f53c744d7730928235cbe66cc7ff8a8a9b2"
-  integrity sha512-lh48uQdbCoj619kRouev5XbWhCwRKLmphAif16c4J6JgJ4uXjub1PI6RL38d3BLliUvSso6klyB/LTNpWSNIyg==
-  dependencies:
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/types" "^4.5.0"
-    tslib "^2.6.2"
-
-"@smithy/middleware-stack@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.1.1.tgz#1d533fde4ccbb62d7fc0f0b8ac518b7e4791e311"
-  integrity sha512-ygRnniqNcDhHzs6QAPIdia26M7e7z9gpkIMUe/pK0RsrQ7i5MblwxY8078/QCnGq6AmlUUWgljK2HlelsKIb/A==
-  dependencies:
-    "@smithy/types" "^4.5.0"
-    tslib "^2.6.2"
-
-"@smithy/node-config-provider@^4.2.2":
-  version "4.2.2"
-  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.2.2.tgz#ede9ac2f689cfdf26815a53fadf139e6aa77bdbb"
-  integrity sha512-SYGTKyPvyCfEzIN5rD8q/bYaOPZprYUPD2f5g9M7OjaYupWOoQFYJ5ho+0wvxIRf471i2SR4GoiZ2r94Jq9h6A==
-  dependencies:
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/shared-ini-file-loader" "^4.2.0"
-    "@smithy/types" "^4.5.0"
-    tslib "^2.6.2"
-
-"@smithy/node-http-handler@^4.2.1":
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.2.1.tgz#d7ab8e31659030d3d5a68f0982f15c00b1e67a0c"
-  integrity sha512-REyybygHlxo3TJICPF89N2pMQSf+p+tBJqpVe1+77Cfi9HBPReNjTgtZ1Vg73exq24vkqJskKDpfF74reXjxfw==
-  dependencies:
-    "@smithy/abort-controller" "^4.1.1"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/querystring-builder" "^4.1.1"
-    "@smithy/types" "^4.5.0"
-    tslib "^2.6.2"
-
-"@smithy/property-provider@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.1.1.tgz#6e11ae6729840314afed05fd6ab48f62c654116b"
-  integrity sha512-gm3ZS7DHxUbzC2wr8MUCsAabyiXY0gaj3ROWnhSx/9sPMc6eYLMM4rX81w1zsMaObj2Lq3PZtNCC1J6lpEY7zg==
-  dependencies:
-    "@smithy/types" "^4.5.0"
-    tslib "^2.6.2"
-
-"@smithy/protocol-http@^5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.2.1.tgz#33f2b8e4e1082c3ae0372d1322577e6fa71d7824"
-  integrity sha512-T8SlkLYCwfT/6m33SIU/JOVGNwoelkrvGjFKDSDtVvAXj/9gOT78JVJEas5a+ETjOu4SVvpCstKgd0PxSu/aHw==
-  dependencies:
-    "@smithy/types" "^4.5.0"
-    tslib "^2.6.2"
-
-"@smithy/querystring-builder@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.1.1.tgz#4d35c1735de8214055424045a117fa5d1d5cdec1"
-  integrity sha512-J9b55bfimP4z/Jg1gNo+AT84hr90p716/nvxDkPGCD4W70MPms0h8KF50RDRgBGZeL83/u59DWNqJv6tEP/DHA==
-  dependencies:
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-uri-escape" "^4.1.0"
-    tslib "^2.6.2"
-
-"@smithy/querystring-parser@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.1.1.tgz#21b861439b2db16abeb0a6789b126705fa25eea1"
-  integrity sha512-63TEp92YFz0oQ7Pj9IuI3IgnprP92LrZtRAkE3c6wLWJxfy/yOPRt39IOKerVr0JS770olzl0kGafXlAXZ1vng==
-  dependencies:
-    "@smithy/types" "^4.5.0"
-    tslib "^2.6.2"
-
-"@smithy/service-error-classification@^4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.1.2.tgz#06839c332f4620a4b80c78a0c32377732dc6697a"
-  integrity sha512-Kqd8wyfmBWHZNppZSMfrQFpc3M9Y/kjyN8n8P4DqJJtuwgK1H914R471HTw7+RL+T7+kI1f1gOnL7Vb5z9+NgQ==
-  dependencies:
-    "@smithy/types" "^4.5.0"
-
-"@smithy/shared-ini-file-loader@^4.2.0":
+"@smithy/is-array-buffer@^4.2.0":
   version "4.2.0"
-  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.2.0.tgz#e4717242686bf611bd1a5d6f79870abe480c1c99"
-  integrity sha512-OQTfmIEp2LLuWdxa8nEEPhZmiOREO6bcB6pjs0AySf4yiZhl6kMOfqmcwcY8BaBPX+0Tb+tG7/Ia/6mwpoZ7Pw==
-  dependencies:
-    "@smithy/types" "^4.5.0"
-    tslib "^2.6.2"
-
-"@smithy/signature-v4@^5.2.1":
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.2.1.tgz#0048489d2f1b3c888382595a085edd31967498f8"
-  integrity sha512-M9rZhWQLjlQVCCR37cSjHfhriGRN+FQ8UfgrYNufv66TJgk+acaggShl3KS5U/ssxivvZLlnj7QH2CUOKlxPyA==
-  dependencies:
-    "@smithy/is-array-buffer" "^4.1.0"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-hex-encoding" "^4.1.0"
-    "@smithy/util-middleware" "^4.1.1"
-    "@smithy/util-uri-escape" "^4.1.0"
-    "@smithy/util-utf8" "^4.1.0"
-    tslib "^2.6.2"
-
-"@smithy/smithy-client@^4.6.3", "@smithy/smithy-client@^4.6.4":
-  version "4.6.4"
-  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.6.4.tgz#3a66bb71c91dadf1806adab664ba2e164a1139ab"
-  integrity sha512-qL7O3VDyfzCSN9r+sdbQXGhaHtrfSJL30En6Jboj0I3bobf2g1/T0eP2L4qxqrEW26gWhJ4THI4ElVVLjYyBHg==
-  dependencies:
-    "@smithy/core" "^3.12.0"
-    "@smithy/middleware-endpoint" "^4.2.4"
-    "@smithy/middleware-stack" "^4.1.1"
-    "@smithy/protocol-http" "^5.2.1"
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-stream" "^4.3.2"
-    tslib "^2.6.2"
-
-"@smithy/types@^4.5.0":
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.5.0.tgz#850e334662a1ef1286c35814940c80880400a370"
-  integrity sha512-RkUpIOsVlAwUIZXO1dsz8Zm+N72LClFfsNqf173catVlvRZiwPy0x2u0JLEA4byreOPKDZPGjmPDylMoP8ZJRg==
+  resolved "https://registry.yarnpkg.com/@smithy/is-array-buffer/-/is-array-buffer-4.2.0.tgz#b0f874c43887d3ad44f472a0f3f961bcce0550c2"
+  integrity sha512-DZZZBvC7sjcYh4MazJSGiWMI2L7E0oCiRHREDzIxi/M2LY79/21iXt6aPLHge82wi5LsuRF5A06Ds3+0mlh6CQ==
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/url-parser@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.1.1.tgz#0e9a5e72b3cf9d7ab7305f9093af5528d9debaf6"
-  integrity sha512-bx32FUpkhcaKlEoOMbScvc93isaSiRM75pQ5IgIBaMkT7qMlIibpPRONyx/0CvrXHzJLpOn/u6YiDX2hcvs7Dg==
+"@smithy/middleware-content-length@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-content-length/-/middleware-content-length-4.2.3.tgz#b7d1d79ae674dad17e35e3518db4b1f0adc08964"
+  integrity sha512-/atXLsT88GwKtfp5Jr0Ks1CSa4+lB+IgRnkNrrYP0h1wL4swHNb0YONEvTceNKNdZGJsye+W2HH8W7olbcPUeA==
   dependencies:
-    "@smithy/querystring-parser" "^4.1.1"
-    "@smithy/types" "^4.5.0"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@smithy/util-base64@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-4.1.0.tgz#5965026081d9aef4a8246f5702807570abe538b2"
-  integrity sha512-RUGd4wNb8GeW7xk+AY5ghGnIwM96V0l2uzvs/uVHf+tIuVX2WSvynk5CxNoBCsM2rQRSZElAo9rt3G5mJ/gktQ==
+"@smithy/middleware-endpoint@^4.3.5":
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.3.5.tgz#c22f82f83f0b5cc6c0866a2a87b65bc2e79af352"
+  integrity sha512-SIzKVTvEudFWJbxAaq7f2GvP3jh2FHDpIFI6/VAf4FOWGFZy0vnYMPSRj8PGYI8Hjt29mvmwSRgKuO3bK4ixDw==
   dependencies:
-    "@smithy/util-buffer-from" "^4.1.0"
-    "@smithy/util-utf8" "^4.1.0"
+    "@smithy/core" "^3.17.1"
+    "@smithy/middleware-serde" "^4.2.3"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/shared-ini-file-loader" "^4.3.3"
+    "@smithy/types" "^4.8.0"
+    "@smithy/url-parser" "^4.2.3"
+    "@smithy/util-middleware" "^4.2.3"
     tslib "^2.6.2"
 
-"@smithy/util-body-length-browser@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-browser/-/util-body-length-browser-4.1.0.tgz#636bdf4bc878c546627dab4b9b0e4db31b475be7"
-  integrity sha512-V2E2Iez+bo6bUMOTENPr6eEmepdY8Hbs+Uc1vkDKgKNA/brTJqOW/ai3JO1BGj9GbCeLqw90pbbH7HFQyFotGQ==
+"@smithy/middleware-retry@^4.4.5":
+  version "4.4.5"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.4.5.tgz#5bdb6ba1be6a97272b79fdac99db40c5e7ab81e0"
+  integrity sha512-DCaXbQqcZ4tONMvvdz+zccDE21sLcbwWoNqzPLFlZaxt1lDtOE2tlVpRSwcTOJrjJSUThdgEYn7HrX5oLGlK9A==
+  dependencies:
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/service-error-classification" "^4.2.3"
+    "@smithy/smithy-client" "^4.9.1"
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-middleware" "^4.2.3"
+    "@smithy/util-retry" "^4.2.3"
+    "@smithy/uuid" "^1.1.0"
+    tslib "^2.6.2"
+
+"@smithy/middleware-serde@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-serde/-/middleware-serde-4.2.3.tgz#a827e9c4ea9e51c79cca4d6741d582026a8b53eb"
+  integrity sha512-8g4NuUINpYccxiCXM5s1/V+uLtts8NcX4+sPEbvYQDZk4XoJfDpq5y2FQxfmUL89syoldpzNzA0R9nhzdtdKnQ==
+  dependencies:
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/types" "^4.8.0"
+    tslib "^2.6.2"
+
+"@smithy/middleware-stack@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/middleware-stack/-/middleware-stack-4.2.3.tgz#5a315aa9d0fd4faaa248780297c8cbacc31c2eba"
+  integrity sha512-iGuOJkH71faPNgOj/gWuEGS6xvQashpLwWB1HjHq1lNNiVfbiJLpZVbhddPuDbx9l4Cgl0vPLq5ltRfSaHfspA==
+  dependencies:
+    "@smithy/types" "^4.8.0"
+    tslib "^2.6.2"
+
+"@smithy/node-config-provider@^4.3.3":
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/@smithy/node-config-provider/-/node-config-provider-4.3.3.tgz#44140a1e6bc666bcf16faf68c35d3dae4ba8cad5"
+  integrity sha512-NzI1eBpBSViOav8NVy1fqOlSfkLgkUjUTlohUSgAEhHaFWA3XJiLditvavIP7OpvTjDp5u2LhtlBhkBlEisMwA==
+  dependencies:
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/shared-ini-file-loader" "^4.3.3"
+    "@smithy/types" "^4.8.0"
+    tslib "^2.6.2"
+
+"@smithy/node-http-handler@^4.4.3":
+  version "4.4.3"
+  resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.4.3.tgz#fb2d16719cb4e8df0c189e8bde60e837df5c0c5b"
+  integrity sha512-MAwltrDB0lZB/H6/2M5PIsISSwdI5yIh6DaBB9r0Flo9nx3y0dzl/qTMJPd7tJvPdsx6Ks/cwVzheGNYzXyNbQ==
+  dependencies:
+    "@smithy/abort-controller" "^4.2.3"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/querystring-builder" "^4.2.3"
+    "@smithy/types" "^4.8.0"
+    tslib "^2.6.2"
+
+"@smithy/property-provider@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/property-provider/-/property-provider-4.2.3.tgz#a6c82ca0aa1c57f697464bee496f3fec58660864"
+  integrity sha512-+1EZ+Y+njiefCohjlhyOcy1UNYjT+1PwGFHCxA/gYctjg3DQWAU19WigOXAco/Ql8hZokNehpzLd0/+3uCreqQ==
+  dependencies:
+    "@smithy/types" "^4.8.0"
+    tslib "^2.6.2"
+
+"@smithy/protocol-http@^5.3.3":
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/@smithy/protocol-http/-/protocol-http-5.3.3.tgz#55b35c18bdc0f6d86e78f63961e50ba4ff1c5d73"
+  integrity sha512-Mn7f/1aN2/jecywDcRDvWWWJF4uwg/A0XjFMJtj72DsgHTByfjRltSqcT9NyE9RTdBSN6X1RSXrhn/YWQl8xlw==
+  dependencies:
+    "@smithy/types" "^4.8.0"
+    tslib "^2.6.2"
+
+"@smithy/querystring-builder@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-builder/-/querystring-builder-4.2.3.tgz#ca273ae8c21fce01a52632202679c0f9e2acf41a"
+  integrity sha512-LOVCGCmwMahYUM/P0YnU/AlDQFjcu+gWbFJooC417QRB/lDJlWSn8qmPSDp+s4YVAHOgtgbNG4sR+SxF/VOcJQ==
+  dependencies:
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-uri-escape" "^4.2.0"
+    tslib "^2.6.2"
+
+"@smithy/querystring-parser@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/querystring-parser/-/querystring-parser-4.2.3.tgz#b6d7d5cd300b4083c62d9bd30915f782d01f503e"
+  integrity sha512-cYlSNHcTAX/wc1rpblli3aUlLMGgKZ/Oqn8hhjFASXMCXjIqeuQBei0cnq2JR8t4RtU9FpG6uyl6PxyArTiwKA==
+  dependencies:
+    "@smithy/types" "^4.8.0"
+    tslib "^2.6.2"
+
+"@smithy/service-error-classification@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/service-error-classification/-/service-error-classification-4.2.3.tgz#ecb41dd514841eebb93e91012ae5e343040f6828"
+  integrity sha512-NkxsAxFWwsPsQiwFG2MzJ/T7uIR6AQNh1SzcxSUnmmIqIQMlLRQDKhc17M7IYjiuBXhrQRjQTo3CxX+DobS93g==
+  dependencies:
+    "@smithy/types" "^4.8.0"
+
+"@smithy/shared-ini-file-loader@^4.3.3":
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.3.3.tgz#1d5162cd3a14f57e4fde56f65aa188e8138c1248"
+  integrity sha512-9f9Ixej0hFhroOK2TxZfUUDR13WVa8tQzhSzPDgXe5jGL3KmaM9s8XN7RQwqtEypI82q9KHnKS71CJ+q/1xLtQ==
+  dependencies:
+    "@smithy/types" "^4.8.0"
+    tslib "^2.6.2"
+
+"@smithy/signature-v4@^5.3.3":
+  version "5.3.3"
+  resolved "https://registry.yarnpkg.com/@smithy/signature-v4/-/signature-v4-5.3.3.tgz#5ff13cfaa29cb531061c2582cb599b39e040e52e"
+  integrity sha512-CmSlUy+eEYbIEYN5N3vvQTRfqt0lJlQkaQUIf+oizu7BbDut0pozfDjBGecfcfWf7c62Yis4JIEgqQ/TCfodaA==
+  dependencies:
+    "@smithy/is-array-buffer" "^4.2.0"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-hex-encoding" "^4.2.0"
+    "@smithy/util-middleware" "^4.2.3"
+    "@smithy/util-uri-escape" "^4.2.0"
+    "@smithy/util-utf8" "^4.2.0"
+    tslib "^2.6.2"
+
+"@smithy/smithy-client@^4.9.1":
+  version "4.9.1"
+  resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.9.1.tgz#a36e456e837121b2ded6f7d5f1f30b205c446e20"
+  integrity sha512-Ngb95ryR5A9xqvQFT5mAmYkCwbXvoLavLFwmi7zVg/IowFPCfiqRfkOKnbc/ZRL8ZKJ4f+Tp6kSu6wjDQb8L/g==
+  dependencies:
+    "@smithy/core" "^3.17.1"
+    "@smithy/middleware-endpoint" "^4.3.5"
+    "@smithy/middleware-stack" "^4.2.3"
+    "@smithy/protocol-http" "^5.3.3"
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-stream" "^4.5.4"
+    tslib "^2.6.2"
+
+"@smithy/types@^4.8.0":
+  version "4.8.0"
+  resolved "https://registry.yarnpkg.com/@smithy/types/-/types-4.8.0.tgz#e6f65e712478910b74747081e6046e68159f767d"
+  integrity sha512-QpELEHLO8SsQVtqP+MkEgCYTFW0pleGozfs3cZ183ZBj9z3VC1CX1/wtFMK64p+5bhtZo41SeLK1rBRtd25nHQ==
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/util-body-length-node@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-4.1.0.tgz#646750e4af58f97254a5d5cfeaba7d992f0152ec"
-  integrity sha512-BOI5dYjheZdgR9XiEM3HJcEMCXSoqbzu7CzIgYrx0UtmvtC3tC2iDGpJLsSRFffUpy8ymsg2ARMP5fR8mtuUQQ==
+"@smithy/url-parser@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/url-parser/-/url-parser-4.2.3.tgz#82508f273a3f074d47d0919f7ce08028c6575c2f"
+  integrity sha512-I066AigYvY3d9VlU3zG9XzZg1yT10aNqvCaBTw9EPgu5GrsEl1aUkcMvhkIXascYH1A8W0LQo3B1Kr1cJNcQEw==
+  dependencies:
+    "@smithy/querystring-parser" "^4.2.3"
+    "@smithy/types" "^4.8.0"
+    tslib "^2.6.2"
+
+"@smithy/util-base64@^4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-base64/-/util-base64-4.3.0.tgz#5e287b528793aa7363877c1a02cd880d2e76241d"
+  integrity sha512-GkXZ59JfyxsIwNTWFnjmFEI8kZpRNIBfxKjv09+nkAWPt/4aGaEWMM04m4sxgNVWkbt2MdSvE3KF/PfX4nFedQ==
+  dependencies:
+    "@smithy/util-buffer-from" "^4.2.0"
+    "@smithy/util-utf8" "^4.2.0"
+    tslib "^2.6.2"
+
+"@smithy/util-body-length-browser@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-browser/-/util-body-length-browser-4.2.0.tgz#04e9fc51ee7a3e7f648a4b4bcdf96c350cfa4d61"
+  integrity sha512-Fkoh/I76szMKJnBXWPdFkQJl2r9SjPt3cMzLdOB6eJ4Pnpas8hVoWPYemX/peO0yrrvldgCUVJqOAjUrOLjbxg==
+  dependencies:
+    tslib "^2.6.2"
+
+"@smithy/util-body-length-node@^4.2.1":
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/@smithy/util-body-length-node/-/util-body-length-node-4.2.1.tgz#79c8a5d18e010cce6c42d5cbaf6c1958523e6fec"
+  integrity sha512-h53dz/pISVrVrfxV1iqXlx5pRg3V2YWFcSQyPyXZRrZoZj4R4DeWRDo1a7dd3CPTcFi3kE+98tuNyD2axyZReA==
   dependencies:
     tslib "^2.6.2"
 
@@ -1525,96 +1535,95 @@
     "@smithy/is-array-buffer" "^2.2.0"
     tslib "^2.6.2"
 
-"@smithy/util-buffer-from@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-4.1.0.tgz#21f9e644a0eb41226d92e4eff763f76a7db7e9cc"
-  integrity sha512-N6yXcjfe/E+xKEccWEKzK6M+crMrlwaCepKja0pNnlSkm6SjAeLKKA++er5Ba0I17gvKfN/ThV+ZOx/CntKTVw==
+"@smithy/util-buffer-from@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-buffer-from/-/util-buffer-from-4.2.0.tgz#7abd12c4991b546e7cee24d1e8b4bfaa35c68a9d"
+  integrity sha512-kAY9hTKulTNevM2nlRtxAG2FQ3B2OR6QIrPY3zE5LqJy1oxzmgBGsHLWTcNhWXKchgA0WHW+mZkQrng/pgcCew==
   dependencies:
-    "@smithy/is-array-buffer" "^4.1.0"
+    "@smithy/is-array-buffer" "^4.2.0"
     tslib "^2.6.2"
 
-"@smithy/util-config-provider@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-config-provider/-/util-config-provider-4.1.0.tgz#6a07d73446c1e9a46d7a3c125f2a9301060bc957"
-  integrity sha512-swXz2vMjrP1ZusZWVTB/ai5gK+J8U0BWvP10v9fpcFvg+Xi/87LHvHfst2IgCs1i0v4qFZfGwCmeD/KNCdJZbQ==
+"@smithy/util-config-provider@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-config-provider/-/util-config-provider-4.2.0.tgz#2e4722937f8feda4dcb09672c59925a4e6286cfc"
+  integrity sha512-YEjpl6XJ36FTKmD+kRJJWYvrHeUvm5ykaUS5xK+6oXffQPHeEM4/nXlZPe+Wu0lsgRUcNZiliYNh/y7q9c2y6Q==
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/util-defaults-mode-browser@^4.1.3":
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.1.4.tgz#a967e994d4581682891f7252c7a42a2d6c1841e4"
-  integrity sha512-mLDJ1s4eA3vwOGaQOEPlg5LB4LdZUUMpB5UMOMofeGhWqiS7WR7dTpLiNi9zVn+YziKUd3Af5NLfxDs7NJqmIw==
+"@smithy/util-defaults-mode-browser@^4.3.4":
+  version "4.3.4"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.4.tgz#ed96651c32ac0de55b066fcb07a296837373212f"
+  integrity sha512-qI5PJSW52rnutos8Bln8nwQZRpyoSRN6k2ajyoUHNMUzmWqHnOJCnDELJuV6m5PML0VkHI+XcXzdB+6awiqYUw==
   dependencies:
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/smithy-client" "^4.6.4"
-    "@smithy/types" "^4.5.0"
-    bowser "^2.11.0"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/smithy-client" "^4.9.1"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@smithy/util-defaults-mode-node@^4.1.3":
-  version "4.1.4"
-  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.1.4.tgz#ce6b88431db4c5b42933904fd0051c91415c41ab"
-  integrity sha512-pjX2iMTcOASaSanAd7bu6i3fcMMezr3NTr8Rh64etB0uHRZi+Aw86DoCxPESjY4UTIuA06hhqtTtw95o//imYA==
+"@smithy/util-defaults-mode-node@^4.2.6":
+  version "4.2.6"
+  resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.6.tgz#01b7ff4605f6f981972083fee22d036e5dc4be38"
+  integrity sha512-c6M/ceBTm31YdcFpgfgQAJaw3KbaLuRKnAz91iMWFLSrgxRpYm03c3bu5cpYojNMfkV9arCUelelKA7XQT36SQ==
   dependencies:
-    "@smithy/config-resolver" "^4.2.2"
-    "@smithy/credential-provider-imds" "^4.1.2"
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/property-provider" "^4.1.1"
-    "@smithy/smithy-client" "^4.6.4"
-    "@smithy/types" "^4.5.0"
+    "@smithy/config-resolver" "^4.4.0"
+    "@smithy/credential-provider-imds" "^4.2.3"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/property-provider" "^4.2.3"
+    "@smithy/smithy-client" "^4.9.1"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@smithy/util-endpoints@^3.1.2":
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.1.2.tgz#be4005c8616923d453347048ef26a439267b2782"
-  integrity sha512-+AJsaaEGb5ySvf1SKMRrPZdYHRYSzMkCoK16jWnIMpREAnflVspMIDeCVSZJuj+5muZfgGpNpijE3mUNtjv01Q==
+"@smithy/util-endpoints@^3.2.3":
+  version "3.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/util-endpoints/-/util-endpoints-3.2.3.tgz#8bbb80f1ad5769d9f73992c5979eea3b74d7baa9"
+  integrity sha512-aCfxUOVv0CzBIkU10TubdgKSx5uRvzH064kaiPEWfNIvKOtNpu642P4FP1hgOFkjQIkDObrfIDnKMKkeyrejvQ==
   dependencies:
-    "@smithy/node-config-provider" "^4.2.2"
-    "@smithy/types" "^4.5.0"
+    "@smithy/node-config-provider" "^4.3.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@smithy/util-hex-encoding@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-4.1.0.tgz#9b27cf0c25d0de2c8ebfe75cc20df84e5014ccc9"
-  integrity sha512-1LcueNN5GYC4tr8mo14yVYbh/Ur8jHhWOxniZXii+1+ePiIbsLZ5fEI0QQGtbRRP5mOhmooos+rLmVASGGoq5w==
+"@smithy/util-hex-encoding@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-hex-encoding/-/util-hex-encoding-4.2.0.tgz#1c22ea3d1e2c3a81ff81c0a4f9c056a175068a7b"
+  integrity sha512-CCQBwJIvXMLKxVbO88IukazJD9a4kQ9ZN7/UMGBjBcJYvatpWk+9g870El4cB8/EJxfe+k+y0GmR9CAzkF+Nbw==
   dependencies:
     tslib "^2.6.2"
 
-"@smithy/util-middleware@^4.1.1":
-  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.1.1.tgz#e19749a127499c9bdada713a8afd807d92d846e2"
-  integrity sha512-CGmZ72mL29VMfESz7S6dekqzCh8ZISj3B+w0g1hZFXaOjGTVaSqfAEFAq8EGp8fUL+Q2l8aqNmt8U1tglTikeg==
+"@smithy/util-middleware@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/util-middleware/-/util-middleware-4.2.3.tgz#7c73416a6e3d3207a2d34a1eadd9f2b6a9811bd6"
+  integrity sha512-v5ObKlSe8PWUHCqEiX2fy1gNv6goiw6E5I/PN2aXg3Fb/hse0xeaAnSpXDiWl7x6LamVKq7senB+m5LOYHUAHw==
   dependencies:
-    "@smithy/types" "^4.5.0"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@smithy/util-retry@^4.1.2":
-  version "4.1.2"
-  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.1.2.tgz#8d28c27cf69643e173c75cc18ff0186deb7cefed"
-  integrity sha512-NCgr1d0/EdeP6U5PSZ9Uv5SMR5XRRYoVr1kRVtKZxWL3tixEL3UatrPIMFZSKwHlCcp2zPLDvMubVDULRqeunA==
+"@smithy/util-retry@^4.2.3":
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/@smithy/util-retry/-/util-retry-4.2.3.tgz#b1e5c96d96aaf971b68323ff8ba8754f914f22a0"
+  integrity sha512-lLPWnakjC0q9z+OtiXk+9RPQiYPNAovt2IXD3CP4LkOnd9NpUsxOjMx1SnoUVB7Orb7fZp67cQMtTBKMFDvOGg==
   dependencies:
-    "@smithy/service-error-classification" "^4.1.2"
-    "@smithy/types" "^4.5.0"
+    "@smithy/service-error-classification" "^4.2.3"
+    "@smithy/types" "^4.8.0"
     tslib "^2.6.2"
 
-"@smithy/util-stream@^4.3.2":
-  version "4.3.2"
-  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.3.2.tgz#7ce40c266b1e828d73c27e545959cda4f42fd61f"
-  integrity sha512-Ka+FA2UCC/Q1dEqUanCdpqwxOFdf5Dg2VXtPtB1qxLcSGh5C1HdzklIt18xL504Wiy9nNUKwDMRTVCbKGoK69g==
+"@smithy/util-stream@^4.5.4":
+  version "4.5.4"
+  resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.5.4.tgz#bfc60e2714c2065b8e7e91ca921cc31c73efdbd4"
+  integrity sha512-+qDxSkiErejw1BAIXUFBSfM5xh3arbz1MmxlbMCKanDDZtVEQ7PSKW9FQS0Vud1eI/kYn0oCTVKyNzRlq+9MUw==
   dependencies:
-    "@smithy/fetch-http-handler" "^5.2.1"
-    "@smithy/node-http-handler" "^4.2.1"
-    "@smithy/types" "^4.5.0"
-    "@smithy/util-base64" "^4.1.0"
-    "@smithy/util-buffer-from" "^4.1.0"
-    "@smithy/util-hex-encoding" "^4.1.0"
-    "@smithy/util-utf8" "^4.1.0"
+    "@smithy/fetch-http-handler" "^5.3.4"
+    "@smithy/node-http-handler" "^4.4.3"
+    "@smithy/types" "^4.8.0"
+    "@smithy/util-base64" "^4.3.0"
+    "@smithy/util-buffer-from" "^4.2.0"
+    "@smithy/util-hex-encoding" "^4.2.0"
+    "@smithy/util-utf8" "^4.2.0"
     tslib "^2.6.2"
 
-"@smithy/util-uri-escape@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-4.1.0.tgz#ed4a5c498f1da07122ca1e3df4ca3e2c67c6c18a"
-  integrity sha512-b0EFQkq35K5NHUYxU72JuoheM6+pytEVUGlTwiFxWFpmddA+Bpz3LgsPRIpBk8lnPE47yT7AF2Egc3jVnKLuPg==
+"@smithy/util-uri-escape@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-uri-escape/-/util-uri-escape-4.2.0.tgz#096a4cec537d108ac24a68a9c60bee73fc7e3a9e"
+  integrity sha512-igZpCKV9+E/Mzrpq6YacdTQ0qTiLm85gD6N/IrmyDvQFA4UnU3d5g3m8tMT/6zG/vVkWSU+VxeUyGonL62DuxA==
   dependencies:
     tslib "^2.6.2"
 
@@ -1626,21 +1635,29 @@
     "@smithy/util-buffer-from" "^2.2.0"
     tslib "^2.6.2"
 
-"@smithy/util-utf8@^4.1.0":
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-4.1.0.tgz#912c33c1a06913f39daa53da79cb8f7ab740d97b"
-  integrity sha512-mEu1/UIXAdNYuBcyEPbjScKi/+MQVXNIuY/7Cm5XLIWe319kDrT5SizBE95jqtmEXoDbGoZxKLCMttdZdqTZKQ==
+"@smithy/util-utf8@^4.2.0":
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/@smithy/util-utf8/-/util-utf8-4.2.0.tgz#8b19d1514f621c44a3a68151f3d43e51087fed9d"
+  integrity sha512-zBPfuzoI8xyBtR2P6WQj63Rz8i3AmfAaJLuNG8dWsfvPe8lO4aCPYLn879mEgHndZH1zQ2oXmG8O1GGzzaoZiw==
   dependencies:
-    "@smithy/util-buffer-from" "^4.1.0"
+    "@smithy/util-buffer-from" "^4.2.0"
     tslib "^2.6.2"
 
-"@smithy/uuid@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@smithy/uuid/-/uuid-1.0.0.tgz#a0fd3aa879d57e2f2fd6a7308deee864a412e1cf"
-  integrity sha512-OlA/yZHh0ekYFnbUkmYBDQPE6fGfdrvgz39ktp8Xf+FA6BfxLejPTMDOG0Nfk5/rDySAz1dRbFf24zaAFYVXlQ==
+"@smithy/uuid@^1.1.0":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@smithy/uuid/-/uuid-1.1.0.tgz#9fd09d3f91375eab94f478858123387df1cda987"
+  integrity sha512-4aUIteuyxtBUhVdiQqcDhKFitwfd9hqoSDYY2KRXiWtgoWJ9Bmise+KfEPDiVHWeJepvF8xJO9/9+WDIciMFFw==
   dependencies:
     tslib "^2.6.2"
 
+"@so-ric/colorspace@^1.1.6":
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/@so-ric/colorspace/-/colorspace-1.1.6.tgz#62515d8b9f27746b76950a83bde1af812d91923b"
+  integrity sha512-/KiKkpHNOBgkFJwu9sh48LkHSMYGyuTcSFK/qMBdnOAlrRJzRSXAOFB5qwzaVQuDl8wAvHVMkaASQDReTahxuw==
+  dependencies:
+    color "^5.0.2"
+    text-hex "1.0.x"
+
 "@tokenizer/token@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@tokenizer/token/-/token-0.3.0.tgz#fe98a93fe789247e998c75e74e9c7c63217aa276"
@@ -1677,9 +1694,9 @@
     "@types/node" "*"
 
 "@types/express-serve-static-core@^4.17.33":
-  version "4.19.6"
-  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz#e01324c2a024ff367d92c66f48553ced0ab50267"
-  integrity sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==
+  version "4.19.7"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.19.7.tgz#f1d306dcc03b1aafbfb6b4fe684cce8a31cffc10"
+  integrity sha512-FvPtiIf1LfhzsaIXhv/PHan/2FeQBbtBDtfX2QfvPxdUelMDEckK08SM6nqo1MIZY3RUlfA+HV8+hFUSio78qg==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
@@ -1687,16 +1704,16 @@
     "@types/send" "*"
 
 "@types/express@^4.17.20":
-  version "4.17.23"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.23.tgz#35af3193c640bfd4d7fe77191cd0ed411a433bef"
-  integrity sha512-Crp6WY9aTYP3qPi2wGDo9iUe/rceX01UMhnF1jmwDcKCFM6cx7YhGP/Mpr3y9AASpfHixIG0E6azCcL5OcDHsQ==
+  version "4.17.24"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.24.tgz#7d4be463143e9f2f146ef805a619076ce4aaec26"
+  integrity sha512-Mbrt4SRlXSTWryOnHAh2d4UQ/E7n9lZyGSi6KgX+4hkuL9soYbLOVXVhnk/ODp12YsGc95f4pOvqywJ6kngUwg==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^4.17.33"
     "@types/qs" "*"
     "@types/serve-static" "*"
 
-"@types/geojson@^7946.0.14":
+"@types/geojson@^7946.0.16":
   version "7946.0.16"
   resolved "https://registry.yarnpkg.com/@types/geojson/-/geojson-7946.0.16.tgz#8ebe53d69efada7044454e3305c19017d97ced2a"
   integrity sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==
@@ -1736,22 +1753,22 @@
   resolved "https://registry.yarnpkg.com/@types/ms/-/ms-2.1.0.tgz#052aa67a48eccc4309d7f0191b7e41434b90bb78"
   integrity sha512-GsCCIZDE/p3i96vtEqx+7dBUGXrc7zeSK3wwPHIaRThS+9OhWIXRqzs4d6k1SVU8g91DrNRWxWUGhp5KXQb2VA==
 
-"@types/node@*", "@types/node@>=13.7.0":
-  version "24.5.2"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.5.2.tgz#52ceb83f50fe0fcfdfbd2a9fab6db2e9e7ef6446"
-  integrity sha512-FYxk1I7wPv3K2XBaoyH2cTnocQEu8AOZ60hPbsyukMPLv5/5qr7V1i8PLHdl6Zf87I+xZXFvPCXYjiTFq+YSDQ==
+"@types/node@*", "@types/node@>=13.7.0", "@types/node@^24.0.13":
+  version "24.9.1"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-24.9.1.tgz#b7360b3c789089e57e192695a855aa4f6981a53c"
+  integrity sha512-QoiaXANRkSXK6p0Duvt56W208du4P9Uye9hWLWgGMDTEoKPhuenzNcC4vGUmrNkiOKTlIrBoyNQYNpSwfEZXSg==
   dependencies:
-    undici-types "~7.12.0"
+    undici-types "~7.16.0"
 
 "@types/node@^14.14.14":
   version "14.18.63"
   resolved "https://registry.yarnpkg.com/@types/node/-/node-14.18.63.tgz#1788fa8da838dbb5f9ea994b834278205db6ca2b"
   integrity sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==
 
-"@types/node@^22.0.1", "@types/node@^22.5.4":
-  version "22.18.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.18.6.tgz#38172ef0b65e09d1a4fc715eb09a7d5decfdc748"
-  integrity sha512-r8uszLPpeIWbNKtvWRt/DbVi5zbqZyj1PTmhRMqBMvDnaz1QpmSKujUtJLrqGZeoM8v72MfYggDceY4K1itzWQ==
+"@types/node@^22.0.1":
+  version "22.18.12"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-22.18.12.tgz#e165d87bc25d7bf6d3657035c914db7485de84fb"
+  integrity sha512-BICHQ67iqxQGFSzfCFTT7MRQ5XcBjG5aeKh5Ok38UBbPe5fxTyE+aHFxwVrGyr8GNlqFMLKD1D3P2K/1ks8tog==
   dependencies:
     undici-types "~6.21.0"
 
@@ -1765,6 +1782,13 @@
   resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.7.tgz#50ae4353eaaddc04044279812f52c8c65857dbcb"
   integrity sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==
 
+"@types/readable-stream@^4.0.0":
+  version "4.0.22"
+  resolved "https://registry.yarnpkg.com/@types/readable-stream/-/readable-stream-4.0.22.tgz#882fda4f17b6580acb257df3f22ca69c05470b29"
+  integrity sha512-/FFhJpfCLAPwAcN3mFycNUa77ddnr8jTgF5VmSNetaemWB2cIlfCA9t0YTM3JAT0wOcv8D4tjPo7pkDhK3EJIg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/request@^2.48.8":
   version "2.48.13"
   resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.13.tgz#abdf4256524e801ea8fdda54320f083edb5a6b80"
@@ -1776,21 +1800,28 @@
     form-data "^2.5.5"
 
 "@types/send@*":
-  version "0.17.5"
-  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.5.tgz#d991d4f2b16f2b1ef497131f00a9114290791e74"
-  integrity sha512-z6F2D3cOStZvuk2SaP6YrwkNO65iTZcwA2ZkSABegdkAh/lf+Aa/YQndZVfmEXT5vgAp6zv06VQ3ejSVjAny4w==
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/@types/send/-/send-1.2.1.tgz#6a784e45543c18c774c049bff6d3dbaf045c9c74"
+  integrity sha512-arsCikDvlU99zl1g69TcAB3mzZPpxgw0UQnaHeC1Nwb015xp8bknZv5rIfri9xTOcMuaVgvabfIRA7PSZVuZIQ==
+  dependencies:
+    "@types/node" "*"
+
+"@types/send@<1":
+  version "0.17.6"
+  resolved "https://registry.yarnpkg.com/@types/send/-/send-0.17.6.tgz#aeb5385be62ff58a52cd5459daa509ae91651d25"
+  integrity sha512-Uqt8rPBE8SY0RK8JB1EzVOIZ32uqy8HwdxCnoCOsYrvnswqmFZ/k+9Ikidlk/ImhsdvBsloHbAlewb2IEBV/Og==
   dependencies:
     "@types/mime" "^1"
     "@types/node" "*"
 
 "@types/serve-static@*":
-  version "1.15.8"
-  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.8.tgz#8180c3fbe4a70e8f00b9f70b9ba7f08f35987877"
-  integrity sha512-roei0UY3LhpOJvjbIP6ZZFngyLKl5dskOtDhxY5THRSpO+ZI+nzJ+m5yUMzGrp89YRa7lvknKkMYjqQFGwA7Sg==
+  version "1.15.10"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.15.10.tgz#768169145a778f8f5dfcb6360aead414a3994fee"
+  integrity sha512-tRs1dB+g8Itk72rlSI2ZrW6vZg0YrLI81iQSTkMmOqnqCaNr/8Ek4VwWcN5vZgCYWbg/JJSGBlUaYGAOP73qBw==
   dependencies:
     "@types/http-errors" "*"
     "@types/node" "*"
-    "@types/send" "*"
+    "@types/send" "<1"
 
 "@types/tough-cookie@*":
   version "4.0.5"
@@ -1834,7 +1865,7 @@
   dependencies:
     base-64 "^1.0.0"
 
-"@xmpp/client-core@^0.13.1":
+"@xmpp/client-core@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/client-core/-/client-core-0.13.3.tgz#88f4eaac9cf10a218d7891212c9b031c4946101f"
   integrity sha512-pOtCozET4BxJZU7aWykT+PFBGaxT/Sl8mC0E3X6QgL7/2Vo39lz2KIhkcvtSwMC8myuaB+klOBrifuKLo3IajA==
@@ -1843,32 +1874,32 @@
     "@xmpp/jid" "^0.13.2"
     "@xmpp/xml" "^0.13.3"
 
-"@xmpp/client@0.13.1":
-  version "0.13.1"
-  resolved "https://registry.yarnpkg.com/@xmpp/client/-/client-0.13.1.tgz#6c8db3cd308479ef17b8f78e2eda9a68b4ebd2d6"
-  integrity sha512-DA+pOkWliTKN5C0Bod4rqlZ4hj/CiqQDHRhQgpx7Y/69qsUwK8M/9C02qylpyZSL2TFGzOM6ZMhr/jlMCsL9jQ==
+"@xmpp/client@0.13.6":
+  version "0.13.6"
+  resolved "https://registry.yarnpkg.com/@xmpp/client/-/client-0.13.6.tgz#852b9c2b4d255831e031cb3f4e9d480867349990"
+  integrity sha512-e4JTcJQ20HEE1VfO2Wrq/y8ujlNZ8L4jmctX/9uhsZ/46GrNFh8uQJUSRMvaf4LV+T9xV55yu1yGDxjZYjwLsg==
   dependencies:
-    "@babel/cli" "^7.16.0"
-    "@babel/core" "^7.16.5"
-    "@babel/node" "^7.16.5"
-    "@babel/plugin-transform-react-jsx" "^7.16.5"
-    "@xmpp/client-core" "^0.13.1"
-    "@xmpp/iq" "^0.13.1"
-    "@xmpp/middleware" "^0.13.1"
-    "@xmpp/reconnect" "^0.13.1"
-    "@xmpp/resolve" "^0.13.1"
-    "@xmpp/resource-binding" "^0.13.1"
-    "@xmpp/sasl" "^0.13.1"
-    "@xmpp/sasl-anonymous" "^0.13.1"
-    "@xmpp/sasl-plain" "^0.13.1"
-    "@xmpp/sasl-scram-sha-1" "^0.13.1"
-    "@xmpp/session-establishment" "^0.13.1"
-    "@xmpp/starttls" "^0.13.1"
-    "@xmpp/stream-features" "^0.13.1"
-    "@xmpp/stream-management" "^0.13.1"
-    "@xmpp/tcp" "^0.13.1"
-    "@xmpp/tls" "^0.13.1"
-    "@xmpp/websocket" "^0.13.1"
+    "@babel/cli" "^7.26.4"
+    "@babel/core" "^7.26.0"
+    "@babel/node" "^7.26.0"
+    "@babel/plugin-transform-react-jsx" "^7.25.9"
+    "@xmpp/client-core" "^0.13.3"
+    "@xmpp/iq" "^0.13.3"
+    "@xmpp/middleware" "^0.13.3"
+    "@xmpp/reconnect" "^0.13.2"
+    "@xmpp/resolve" "^0.13.3"
+    "@xmpp/resource-binding" "^0.13.3"
+    "@xmpp/sasl" "^0.13.6"
+    "@xmpp/sasl-anonymous" "^0.13.2"
+    "@xmpp/sasl-plain" "^0.13.2"
+    "@xmpp/sasl-scram-sha-1" "^0.13.2"
+    "@xmpp/session-establishment" "^0.13.3"
+    "@xmpp/starttls" "^0.13.3"
+    "@xmpp/stream-features" "^0.13.2"
+    "@xmpp/stream-management" "^0.13.3"
+    "@xmpp/tcp" "^0.13.3"
+    "@xmpp/tls" "^0.13.3"
+    "@xmpp/websocket" "^0.13.3"
     babel-plugin-jsx-pragmatic "^1.0.2"
 
 "@xmpp/connection-tcp@^0.13.3":
@@ -1906,7 +1937,7 @@
   resolved "https://registry.yarnpkg.com/@xmpp/id/-/id-0.13.2.tgz#f10e014374300b465c0263346d909d8301b54519"
   integrity sha512-LhSzcaPvjddvL+u/xNAuu6tNtxWR7HZPTyMUck8tyYnbwsXaJQ6sDoS8AEQE8o7iW5E31xJUTOktYd/s6HMo3w==
 
-"@xmpp/iq@^0.13.1":
+"@xmpp/iq@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/iq/-/iq-0.13.3.tgz#c9761fb754cc119b2f7b08e996d9fea266db6336"
   integrity sha512-sGeyGF4OnYGTZw3PhQaYLYlE8+LRZfYijT/ESGqhY2ed9gm0U4TCR8C8s5oT7Puu6S6smdHehcvYCrcFEeQyBw==
@@ -1921,7 +1952,7 @@
   resolved "https://registry.yarnpkg.com/@xmpp/jid/-/jid-0.13.2.tgz#117d69b455f607735ad569e23ff40529a6681f16"
   integrity sha512-OuYrxiNdlmXgMFPJqnbZSKe/bdn1wxtc1ASEadrizI9h6T1y7tAEl5YpXFWYb+fdAL9vRD+bGCxrDUrm1er/LQ==
 
-"@xmpp/middleware@^0.13.1", "@xmpp/middleware@^0.13.3":
+"@xmpp/middleware@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/middleware/-/middleware-0.13.3.tgz#aec98c9afd80b74a3c8f1d91defc3a9f5da4a6d1"
   integrity sha512-zZTsqLaHnfTqMBDyZh01HLYUgcHLmbalVfC32CsEcjPG5/bIete9sOUVPaiGH1cicMgi3O7WZK512RvQFcBbwA==
@@ -1931,14 +1962,14 @@
     "@xmpp/xml" "^0.13.3"
     koa-compose "^4.1.0"
 
-"@xmpp/reconnect@^0.13.1":
+"@xmpp/reconnect@^0.13.2":
   version "0.13.2"
   resolved "https://registry.yarnpkg.com/@xmpp/reconnect/-/reconnect-0.13.2.tgz#0ba0230807d5ea4f147e0eaf7b4562225a7306aa"
   integrity sha512-FWCC+dzi23N7H99PYPqWZa7oRPNp9G7yYzMZwOpeiVporbNy+op3yUbCszo3YA3XVEsuLRQ1aQJ8evLo+GD5ow==
   dependencies:
     "@xmpp/events" "^0.13.2"
 
-"@xmpp/resolve@^0.13.1":
+"@xmpp/resolve@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/resolve/-/resolve-0.13.3.tgz#0e965032e00631ed9c78e9861fdac51e536ab19a"
   integrity sha512-HL86p0a2CI0ILFYUR8vPR77ZXwxQ0xXLLRnyb88TjQ/eNbYsc1gmdXjELE0xRCfQblXZsETvUwWv5RofTYAgrQ==
@@ -1947,35 +1978,35 @@
     "@xmpp/xml" "^0.13.3"
     node-fetch "^3.3.2"
 
-"@xmpp/resource-binding@^0.13.1":
+"@xmpp/resource-binding@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/resource-binding/-/resource-binding-0.13.3.tgz#15e67c76acf39c902364408691d057c8f1ef4064"
   integrity sha512-cph/8vJ5sRHVg7Njx8rR27xAVmKWACSx95jlOw7LmUSTRSxZDw2wHsqie76HxUD5fPszOsTh/Ph7Fw1532aRUQ==
   dependencies:
     "@xmpp/xml" "^0.13.3"
 
-"@xmpp/sasl-anonymous@^0.13.1":
+"@xmpp/sasl-anonymous@^0.13.2":
   version "0.13.2"
   resolved "https://registry.yarnpkg.com/@xmpp/sasl-anonymous/-/sasl-anonymous-0.13.2.tgz#d6ea4eb6febe8a8c1a7c0578d5798f930b4778ef"
   integrity sha512-0fI9+A+Vptcyv8+o8J2veRnodtnKahJDy5fappIZbmXLrv4JcrVBChQDWULyta0Hez9M3XWoIyuhp4pyz0IU/Q==
   dependencies:
     sasl-anonymous "^0.1.0"
 
-"@xmpp/sasl-plain@^0.13.1":
+"@xmpp/sasl-plain@^0.13.2":
   version "0.13.2"
   resolved "https://registry.yarnpkg.com/@xmpp/sasl-plain/-/sasl-plain-0.13.2.tgz#e4ce2dba38d1960a4dbe70ffea8cada2e69eadef"
   integrity sha512-zwS/q+Vd4YsLdnZjmCuS1JCacWWg2Vd3ecqpBmIV3S394s1Mgiwdnd2bVRen5S0kl/de+VzHg/DRLuYvC94SUg==
   dependencies:
     sasl-plain "^0.1.0"
 
-"@xmpp/sasl-scram-sha-1@^0.13.1":
+"@xmpp/sasl-scram-sha-1@^0.13.2":
   version "0.13.2"
   resolved "https://registry.yarnpkg.com/@xmpp/sasl-scram-sha-1/-/sasl-scram-sha-1-0.13.2.tgz#47f240ce25a200004696f76dde5e376db86f04b7"
   integrity sha512-qHwooR3m8/BsuG17tK50ZKO97HITG+k6Chjk/pSjRfKG5Fm3mWh2U8K98QWNpJYbgVm9amkIQ0tbTaw+/kMjvQ==
   dependencies:
     sasl-scram-sha-1 "^1.3.0"
 
-"@xmpp/sasl@^0.13.1":
+"@xmpp/sasl@^0.13.6":
   version "0.13.6"
   resolved "https://registry.yarnpkg.com/@xmpp/sasl/-/sasl-0.13.6.tgz#b6a1948ae56db5cea6aee362c6ddd63d5d6ea6e1"
   integrity sha512-0WueO7QlHK1F0K7iaC/zW60Y6NIjOccHZlb1WRS1jdHmHqwTLWM8AQTAZMvtxWLDz8oUDiVUKEOJTdIvy9bXow==
@@ -1985,14 +2016,14 @@
     "@xmpp/xml" "^0.13.3"
     saslmechanisms "^0.1.1"
 
-"@xmpp/session-establishment@^0.13.1":
+"@xmpp/session-establishment@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/session-establishment/-/session-establishment-0.13.3.tgz#2ab32981292b4c747ce54753d22925d1678c6415"
   integrity sha512-dQhH7aIzsqyMRsjMIuER4UBCxQgvDUHjkmNoeIbUZX5bYJuGeET90tZ4eNAq6yXnpSGJiKoXVfVBxNoiXovfgA==
   dependencies:
     "@xmpp/xml" "^0.13.3"
 
-"@xmpp/starttls@^0.13.1":
+"@xmpp/starttls@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/starttls/-/starttls-0.13.3.tgz#2e5202e2877e7b277597c79f186987a0c3b7689e"
   integrity sha512-FjKrpahL/yBiRlMUL4d88I5N5PxQN2Mirx39Q0kyo479Nj1OY4dTA78Iy5+tsbsBYO3j5aE2tRoLhUQaMPGvBQ==
@@ -2001,26 +2032,26 @@
     "@xmpp/tls" "^0.13.3"
     "@xmpp/xml" "^0.13.3"
 
-"@xmpp/stream-features@^0.13.1":
+"@xmpp/stream-features@^0.13.2":
   version "0.13.2"
   resolved "https://registry.yarnpkg.com/@xmpp/stream-features/-/stream-features-0.13.2.tgz#3554050b38b708289c85254b4fe4fcb52086e26b"
   integrity sha512-eyxFEEDSfNvG4ybvAYTYkjaUcaytu8sAqT8DfWwrWzCkPgfRzpexsxb9yhe8hAVrvPLavOyr+zh4raUQf4Ogkg==
 
-"@xmpp/stream-management@^0.13.1":
+"@xmpp/stream-management@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/stream-management/-/stream-management-0.13.3.tgz#e6119c3711e2c6f5ffb348471cddc640b6ff266f"
   integrity sha512-hdQAyp6FldEkBktou/mbb7MPOe/EzBxP3sIjWvNQXwRMV8AJxAXyi+DhnW5sigRQoeTJJB0FGTxOlFDeXWGhPg==
   dependencies:
     "@xmpp/xml" "^0.13.3"
 
-"@xmpp/tcp@^0.13.1":
+"@xmpp/tcp@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/tcp/-/tcp-0.13.3.tgz#7dad798e71e875fffb5794816b11eba1f6379196"
   integrity sha512-WUjAsPVQAr/DTNJGxXOqXEviFvI5Gzp/18TuCJEssAjyHv1Pr7Qn6PjAersIPidEKqVfapNyHOmgyLePh1kAqQ==
   dependencies:
     "@xmpp/connection-tcp" "^0.13.3"
 
-"@xmpp/tls@^0.13.1", "@xmpp/tls@^0.13.3":
+"@xmpp/tls@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/tls/-/tls-0.13.3.tgz#e978a3de0bbb717655cda0563ebab5bef8ca5148"
   integrity sha512-oeXbkzu2i2LkpvPQ4B3RourYnktoUpkWeUS7jRB4wHvdy6ecEli593R+DYVCWr3Hvj+3l40MkyRQSmZp4S7tVg==
@@ -2028,7 +2059,7 @@
     "@xmpp/connection" "^0.13.3"
     "@xmpp/connection-tcp" "^0.13.3"
 
-"@xmpp/websocket@^0.13.1":
+"@xmpp/websocket@^0.13.3":
   version "0.13.3"
   resolved "https://registry.yarnpkg.com/@xmpp/websocket/-/websocket-0.13.3.tgz#0418d1ab276b73a198876a8fcbdf773f3bad5b26"
   integrity sha512-RXZJFecaAlotqhAdNohO0SoP8Rx3eJrl18c78gxybAhNaCexFbuMJIvSj91L/b8bOErJtFMTwreWeMfzP6Ijiw==
@@ -2110,41 +2141,38 @@ acorn@^8.15.0:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.15.0.tgz#a360898bc415edaac46c8241f6383975b930b816"
   integrity sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==
 
-aedes-packet@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/aedes-packet/-/aedes-packet-1.0.0.tgz#2eea46f97c925b0a1f4d03f4f1fe5ef887b100f1"
-  integrity sha512-zGcB+O60jjgSo5dGZd9wnSfQWi0oqBFQDe9Br0vqWaSVtkOc0zkLg0xRKSppbly56J6q9EHSteHdrHjW90+h4A==
-
-aedes-persistence@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/aedes-persistence/-/aedes-persistence-6.0.0.tgz#e9eb15288a3be1a8e9fc7f231df2237ca0978eb1"
-  integrity sha512-LVk80Mg6bCfQgbcyo16ipuFo5KdORVxtzFAMmaisE3Hkydwt5H9I02gmF5IPADF5zPk0RfYxumQ4IIV1+jEp7Q==
+aedes-packet@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/aedes-packet/-/aedes-packet-3.0.0.tgz#402868a6768dfaf1221a743a0a521244fbc7416b"
+  integrity sha512-swASey0BxGs4/npZGWoiVDmnEyPvVFIRY6l2LVKL4rbiW8IhcIGDLfnb20Qo8U20itXlitAKPQ3MVTEbOGG5ZA==
   dependencies:
-    aedes-packet "^1.0.0"
-    from2 "^2.1.0"
-    qlobber "^3.0.2"
+    mqtt-packet "^7.0.0"
 
-aedes@0.39.0:
-  version "0.39.0"
-  resolved "https://registry.yarnpkg.com/aedes/-/aedes-0.39.0.tgz#125e2f1e53a600f3a0bfde26431997deed27f117"
-  integrity sha512-AV7pN4Ogt4tNNgNNabKjsC7Cw7bMMNjQH1hua4zQV0TFf/QEBPVu1YDZMH3Lrrt2XziydQzmBrBc5aAQvAq5FQ==
+aedes-persistence@^9.1.2:
+  version "9.1.2"
+  resolved "https://registry.yarnpkg.com/aedes-persistence/-/aedes-persistence-9.1.2.tgz#9fb4ab373a96ed17bce62414721b1b3843dc5685"
+  integrity sha512-2Wlr5pwIK0eQOkiTwb8ZF6C20s8UPUlnsJ4kXYePZ3JlQl0NbBA176mzM8wY294BJ5wybpNc9P5XEQxqadRNcQ==
   dependencies:
-    aedes-packet "^1.0.0"
-    aedes-persistence "^6.0.0"
-    bulk-write-stream "^2.0.0"
-    end-of-stream "^1.4.1"
+    aedes-packet "^3.0.0"
+    qlobber "^7.0.0"
+
+aedes@0.51.3:
+  version "0.51.3"
+  resolved "https://registry.yarnpkg.com/aedes/-/aedes-0.51.3.tgz#cd393d6e427ada6f6ae2fcd2df53a2744c86cad8"
+  integrity sha512-aQfiI9w3RbqnowNCdcGMmCtxBFXN9bhJFcuZm24U5/NU06V3MCl42jWK2GUnu8rOypR2Ahi/aEcgq3w7CMcycg==
+  dependencies:
+    aedes-packet "^3.0.0"
+    aedes-persistence "^9.1.2"
+    end-of-stream "^1.4.4"
     fastfall "^1.5.1"
-    fastparallel "^2.3.0"
-    fastseries "^1.7.2"
-    from2 "^2.3.0"
-    mqemitter "^3.0.0"
-    mqtt-packet "^6.1.2"
-    pump "^3.0.0"
-    retimer "^2.0.0"
+    fastparallel "^2.4.1"
+    fastseries "^2.0.0"
+    hyperid "^3.2.0"
+    mqemitter "^6.0.0"
+    mqtt-packet "^9.0.0"
+    retimer "^4.0.0"
     reusify "^1.0.4"
-    shortid "^2.2.14"
-    through2 "^3.0.1"
-    uuid "^3.3.2"
+    uuid "^10.0.0"
 
 aes-js@^3.1.2:
   version "3.1.2"
@@ -2158,7 +2186,7 @@ agent-base@6, agent-base@^6.0.2:
   dependencies:
     debug "4"
 
-agent-base@^7.0.2, agent-base@^7.1.2:
+agent-base@^7.1.2:
   version "7.1.4"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-7.1.4.tgz#e3cd76d4c548ee895d3c3fd8dc1f6c5b9032e7a8"
   integrity sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==
@@ -2444,21 +2472,14 @@ aws4@^1.12.0:
   resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.13.2.tgz#0aa167216965ac9474ccfa83892cfb6b3e1e52ef"
   integrity sha512-lHe62zvbTB5eEABUVi/AwVh0ZKY9rMMDhmm+eeyuuUQbQ3+J+fONVQOZyj+DdrvD4BY33uYniyRJ4UJIaSKAfw==
 
-axios@0.26.1, axios@^0.26.1:
+axios@0.26.1:
   version "0.26.1"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.26.1.tgz#1ede41c51fcf51bbbd6fd43669caaa4f0495aaa9"
   integrity sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==
   dependencies:
     follow-redirects "^1.14.8"
 
-axios@^0.21.1:
-  version "0.21.4"
-  resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.4.tgz#c67b90dc0568e5c1cf2b0b858c43ba28e2eda575"
-  integrity sha512-ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg==
-  dependencies:
-    follow-redirects "^1.14.0"
-
-axios@^1.12.0, axios@^1.2.2:
+axios@^1.12.0, axios@^1.2.2, axios@^1.6.0, axios@^1.8.3:
   version "1.12.2"
   resolved "https://registry.yarnpkg.com/axios/-/axios-1.12.2.tgz#6c307390136cf7a2278d09cec63b136dfc6e6da7"
   integrity sha512-vMJzPewAlRyOgxV2dU0Cuz2O8zzzx9VYtbJOaBgXFeLc4IV/Eg50n4LowmehOOR61S8ZMpc2K5Sa7g6A4jfkUw==
@@ -2468,9 +2489,9 @@ axios@^1.12.0, axios@^1.2.2:
     proxy-from-env "^1.1.0"
 
 b4a@^1.6.4:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.7.2.tgz#aefbe7aaf52fe53c3270f87cf72c33c61bc3174b"
-  integrity sha512-DyUOdz+E8R6+sruDpQNOaV0y/dBbV6X/8ZkxrDcR0Ifc3BgKlpgG0VAtfOozA0eMtJO5GGe9FsZhueLs00pTww==
+  version "1.7.3"
+  resolved "https://registry.yarnpkg.com/b4a/-/b4a-1.7.3.tgz#24cf7ccda28f5465b66aec2bac69e32809bf112f"
+  integrity sha512-5Q2mfq2WfGuFp3uS//0s6baOJLMoVduPYVeNmDYxu5OUA1/cBfvr2RIS7vi62LdNj/urk1hfmj867I3qt6uZ7Q==
 
 babel-plugin-jsx-pragmatic@^1.0.2:
   version "1.0.2"
@@ -2510,9 +2531,9 @@ balanced-match@^1.0.0:
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 bare-events@^2.7.0:
-  version "2.7.0"
-  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.7.0.tgz#46596dae9c819c5891eb2dcc8186326ed5a6da54"
-  integrity sha512-b3N5eTW1g7vXkw+0CXh/HazGTcO5KYuu/RCNaJbDMPI6LHDi+7qe8EmxKUVe1sUbY2KZOVZFyj62x0OEz9qyAA==
+  version "2.8.1"
+  resolved "https://registry.yarnpkg.com/bare-events/-/bare-events-2.8.1.tgz#121afaeee9e9a8eb92e71d125bc85753d39913d0"
+  integrity sha512-oxSAxTS1hRfnyit2CL5QpAOS5ixfBjj6ex3yTNvXyY/kE719jQ/IjuESJBK2w5v4wwQRAHGseVJXx9QBYOtFGQ==
 
 base-64@^0.1.0:
   version "0.1.0"
@@ -2534,10 +2555,10 @@ base64url@3.x.x:
   resolved "https://registry.yarnpkg.com/base64url/-/base64url-3.0.1.tgz#6399d572e2bc3f90a9a8b22d5dbb0a32d33f788d"
   integrity sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==
 
-baseline-browser-mapping@^2.8.3:
-  version "2.8.6"
-  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.8.6.tgz#c37dea4291ed8d01682f85661dbe87967028642e"
-  integrity sha512-wrH5NNqren/QMtKUEEJf7z86YjfqW/2uw3IL3/xpqZUC95SSVIFXYQeeGjL6FT/X68IROu6RMehZQS5foy2BXw==
+baseline-browser-mapping@^2.8.19:
+  version "2.8.20"
+  resolved "https://registry.yarnpkg.com/baseline-browser-mapping/-/baseline-browser-mapping-2.8.20.tgz#6766cf270f3668d20b6712b9c54cc911b87da714"
+  integrity sha512-JMWsdF+O8Orq3EMukbUN1QfbLK9mX2CkUmQBcW2T0s8OmdAUL5LLM/6wFwSrqXzlXB13yhyK9gTKS1rIizOduQ==
 
 bcrypt-pbkdf@^1.0.0, bcrypt-pbkdf@^1.0.2:
   version "1.0.2"
@@ -2600,6 +2621,16 @@ bl@^4.0.2, bl@^4.0.3:
     inherits "^2.0.4"
     readable-stream "^3.4.0"
 
+bl@^6.0.8:
+  version "6.1.4"
+  resolved "https://registry.yarnpkg.com/bl/-/bl-6.1.4.tgz#107fb9c9a4d0507d8c064b50ba7036deee9fcfa6"
+  integrity sha512-ZV/9asSuknOExbM/zPPA8z00lc1ihPKWaStHkkQrxHNeYx+yY+TmF+v80dpv2G0mv3HVXBu7ryoAsxbFFhf4eg==
+  dependencies:
+    "@types/readable-stream" "^4.0.0"
+    buffer "^6.0.3"
+    inherits "^2.0.4"
+    readable-stream "^4.2.0"
+
 block-stream2@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/block-stream2/-/block-stream2-2.1.0.tgz#ac0c5ef4298b3857796e05be8ebed72196fa054b"
@@ -2680,15 +2711,15 @@ browser-or-node@^2.1.1:
   integrity sha512-8CVjaLJGuSKMVTxJ2DpBl5XnlNDiT4cQFeuCJJrvJmts9YrTZDizTX7PjC2s6W4x+MBGZeEY6dGMrF04/6Hgqg==
 
 browserslist@^4.24.0:
-  version "4.26.2"
-  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.26.2.tgz#7db3b3577ec97f1140a52db4936654911078cef3"
-  integrity sha512-ECFzp6uFOSB+dcZ5BK/IBaGWssbSYBHvuMeMt3MMFyhI0Z8SqGgEkBLARgpRH3hutIgPVsALcMwbDrJqPxQ65A==
+  version "4.27.0"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.27.0.tgz#755654744feae978fbb123718b2f139bc0fa6697"
+  integrity sha512-AXVQwdhot1eqLihwasPElhX2tAZiBjWdJ9i/Zcj2S6QYIjkx62OKSfnobkriB81C3l4w0rVy3Nt4jaTBltYEpw==
   dependencies:
-    baseline-browser-mapping "^2.8.3"
-    caniuse-lite "^1.0.30001741"
-    electron-to-chromium "^1.5.218"
-    node-releases "^2.0.21"
-    update-browserslist-db "^1.1.3"
+    baseline-browser-mapping "^2.8.19"
+    caniuse-lite "^1.0.30001751"
+    electron-to-chromium "^1.5.238"
+    node-releases "^2.0.26"
+    update-browserslist-db "^1.1.4"
 
 bson@^1.1.4:
   version "1.1.6"
@@ -2722,7 +2753,7 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.2.tgz#2b146a6fd72e80b4f55d255f35ed59a3a9a41bd5"
   integrity sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==
 
-buffer@^5.5.0, buffer@^5.6.0:
+buffer@^5.2.1, buffer@^5.5.0, buffer@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/buffer/-/buffer-5.7.1.tgz#ba62e7c13133053582197160851a8f648e99eed0"
   integrity sha512-EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ==
@@ -2755,14 +2786,6 @@ buildcheck@~0.0.6:
   resolved "https://registry.yarnpkg.com/buildcheck/-/buildcheck-0.0.6.tgz#89aa6e417cfd1e2196e3f8fe915eb709d2fe4238"
   integrity sha512-8f9ZJCUXyT1M35Jx7MkBgmBMo3oHTTBIPLiY9xyL0pl3T5RwcPEY8cUHr5LBNfu/fk6c2T4DJZuVM/8ZZT2D2A==
 
-bulk-write-stream@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/bulk-write-stream/-/bulk-write-stream-2.0.1.tgz#085bdc65caf19ceece4ff365fdb951ef0c6e3db8"
-  integrity sha512-XWOLjgHtpDasHfwM8oO4df1JoZwa7/OwTsXDzh4rUTo+9CowzeOFBZz43w+H14h1fyq+xl28tVIBrdjcjj4Gug==
-  dependencies:
-    inherits "^2.0.3"
-    readable-stream "^3.1.1"
-
 byte-length@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/byte-length/-/byte-length-1.0.2.tgz#ba5a5909240b0121c079b7f7b15248d6f08223cc"
@@ -2846,10 +2869,10 @@ camelcase@^5.0.0:
   resolved "https://registry.yarnpkg.com/camelcase/-/camelcase-5.3.1.tgz#e3c9b31569e106811df242f715725a1f4c494320"
   integrity sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==
 
-caniuse-lite@^1.0.30001741:
-  version "1.0.30001743"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001743.tgz#50ff91a991220a1ee2df5af00650dd5c308ea7cd"
-  integrity sha512-e6Ojr7RV14Un7dz6ASD0aZDmQPT/A+eZU+nuTNfjqmRrmkmQlnTNWH0SKmqagx9PeW87UVqapSurtAXifmtdmw==
+caniuse-lite@^1.0.30001751:
+  version "1.0.30001751"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001751.tgz#dacd5d9f4baeea841641640139d2b2a4df4226ad"
+  integrity sha512-A0QJhug0Ly64Ii3eIqHu5X51ebln3k4yTUkY1j8drqpWHVreg/VLijN48cZ1bYPiqOQuqpkIKnzr/Ul8V+p6Cw==
 
 caseless@~0.12.0:
   version "0.12.0"
@@ -2906,12 +2929,13 @@ chownr@^2.0.0:
   integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
 
 cipher-base@^1.0.1, cipher-base@^1.0.3:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.6.tgz#8fe672437d01cd6c4561af5334e0cc50ff1955f7"
-  integrity sha512-3Ek9H3X6pj5TgenXYtNWdaBon1tgYCaebd+XPg0keyjEbEfkD4KkmAxkQ/i1vYvxdcT5nscLBfq9VJRmCBcFSw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/cipher-base/-/cipher-base-1.0.7.tgz#bd094bfef42634ccfd9e13b9fc73274997111e39"
+  integrity sha512-Mz9QMT5fJe7bKI7MH31UilT5cEK5EHHRCccw/YRFsRY47AuNgaV6HY3rscp0/I4Q+tTW/5zoqpSeRRI54TkDWA==
   dependencies:
     inherits "^2.0.4"
     safe-buffer "^5.2.1"
+    to-buffer "^1.2.2"
 
 clean-css@~5.3.2:
   version "5.3.3"
@@ -2969,7 +2993,7 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha512-RpAVKQA5T63xEj6/giIbUEtZwJ4UFIc3ZtvEkiaUERylqe8xb5IvqcgOurZLahv93CLKfxcw5YI+DZcUBRyLXA==
 
-color-convert@^1.9.0, color-convert@^1.9.3:
+color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
@@ -2983,44 +3007,47 @@ color-convert@^2.0.1:
   dependencies:
     color-name "~1.1.4"
 
+color-convert@^3.0.1:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-3.1.2.tgz#cef9e0fd4cb90b07c14697b3fa70af9d7f4870f1"
+  integrity sha512-UNqkvCDXstVck3kdowtOTWROIJQwafjOfXSmddoDrXo4cewMKmusCeF22Q24zvjR8nwWib/3S/dfyzPItPEiJg==
+  dependencies:
+    color-name "^2.0.0"
+
 color-name@1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==
 
-color-name@^1.0.0, color-name@~1.1.4:
+color-name@^2.0.0:
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/color-name/-/color-name-2.0.2.tgz#85054825a23e6d6f81d3503f660c4c4a2a15f04f"
+  integrity sha512-9vEt7gE16EW7Eu7pvZnR0abW9z6ufzhXxGXZEVU9IqPdlsUiMwJeJfRtq0zePUmnbHGT9zajca7mX8zgoayo4A==
+
+color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-string@^1.6.0:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4"
-  integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==
+color-string@^2.0.0:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/color-string/-/color-string-2.1.2.tgz#db1dd52414cc9037ada8fa7d936b8e9f6c3366c9"
+  integrity sha512-RxmjYxbWemV9gKu4zPgiZagUxbH3RQpEIO77XoSSX0ivgABDZ+h8Zuash/EMFLTI4N9QgFPOJ6JQpPZKFxa+dA==
   dependencies:
-    color-name "^1.0.0"
-    simple-swizzle "^0.2.2"
+    color-name "^2.0.0"
 
 color-support@^1.1.3:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
   integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
-color@^3.1.3:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/color/-/color-3.2.1.tgz#3544dc198caf4490c3ecc9a790b54fe9ff45e164"
-  integrity sha512-aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==
+color@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/color/-/color-5.0.2.tgz#712ec894007ab27b37207732d182784e001b4a3d"
+  integrity sha512-e2hz5BzbUPcYlIRHo8ieAhYgoajrJr+hWoceg6E345TPsATMUKqDgzt8fSXZJJbxfpiPzkWyphz8yn8At7q3fA==
   dependencies:
-    color-convert "^1.9.3"
-    color-string "^1.6.0"
-
-colorspace@1.1.x:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/colorspace/-/colorspace-1.1.4.tgz#8d442d1186152f60453bf8070cd66eb364e59243"
-  integrity sha512-BgvKJiuVu1igBUF2kEjRCZXol6wiiGbY5ipL/oVPwm0BL9sIpMIzM8IK7vwuxIIzOXMV3Ey5w+vxhm0rR/TN8w==
-  dependencies:
-    color "^3.1.3"
-    text-hex "1.0.x"
+    color-convert "^3.0.1"
+    color-string "^2.0.0"
 
 combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
@@ -3163,9 +3190,9 @@ core-js@^2.4.0:
   integrity sha512-Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ==
 
 core-js@^3.30.2:
-  version "3.45.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.45.1.tgz#5810e04a1b4e9bc5ddaa4dd12e702ff67300634d"
-  integrity sha512-L4NPsJlCfZsPeXukyzHFlg/i7IIVwHSItR0wg0FLNqYClJ4MQYTYLbC7EkjKYRLZF2iof2MUgN0EGy7MdQFChg==
+  version "3.46.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.46.0.tgz#323a092b96381a9184d0cd49ee9083b2f93373bb"
+  integrity sha512-vDMm9B0xnqqZ8uSBpZ8sNtRtOdmfShrvT6h2TuQGLs0Is+cR0DYbj/KWP6ALVNbWPpqA/qPLoOuppJN07humpA==
 
 core-util-is@1.0.2:
   version "1.0.2"
@@ -3453,19 +3480,19 @@ destroy@1.2.0:
   integrity sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==
 
 detect-libc@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.1.tgz#9f1e511ace6bb525efea4651345beac424dac7b9"
-  integrity sha512-ecqj/sy1jcK1uWrwpR67UhYrIFQ+5WlGxth34WquCbamhFA6hkkwiu37o6J5xCHdo1oixJRfVRw+ywV+Hq/0Aw==
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/detect-libc/-/detect-libc-2.1.2.tgz#689c5dcdc1900ef5583a4cb9f6d7b473742074ad"
+  integrity sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==
 
 discord-api-types@^0.37.12, discord-api-types@^0.37.41:
   version "0.37.120"
   resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.37.120.tgz#ad7209930509c4cee3efddbacc77a1b18cf66d34"
   integrity sha512-7xpNK0EiWjjDFp2nAhHXezE4OUWm7s1zhc/UXXN6hnFFU8dfoPHgV0Hx0RPiCa3ILRpdeh152icc68DGCyXYIw==
 
-discord-api-types@^0.38.1, discord-api-types@^0.38.16:
-  version "0.38.26"
-  resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.38.26.tgz#d30f6bf0a4725b0a5ea46e0a12cef0b8880bbc9a"
-  integrity sha512-xpmPviHjIJ6dFu1eNwNDIGQ3N6qmPUUYFVAx/YZ64h7ZgPkTcKjnciD8bZe8Vbeji7yS5uYljyciunpq0J5NSw==
+discord-api-types@^0.38.1, discord-api-types@^0.38.26:
+  version "0.38.31"
+  resolved "https://registry.yarnpkg.com/discord-api-types/-/discord-api-types-0.38.31.tgz#023c7f18662dc4a44a22798300f44e4b148cafb1"
+  integrity sha512-kC94ANsk8ackj8ENTuO8joTNEL0KtymVhHy9dyEC/s4QAZ7GCx40dYEzQaadyo8w+oP0X8QydE/nzAWRylTGtQ==
 
 discord.js@14.6.0:
   version "14.6.0"
@@ -3579,10 +3606,10 @@ ee-first@1.1.1:
   resolved "https://registry.yarnpkg.com/ee-first/-/ee-first-1.1.1.tgz#590c61156b0ae2f4f0255732a158b266bc56b21d"
   integrity sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==
 
-electron-to-chromium@^1.5.218:
-  version "1.5.223"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.223.tgz#cf9b1aebba1c8ee5e50d1c9e198229e15bc87b28"
-  integrity sha512-qKm55ic6nbEmagFlTFczML33rF90aU+WtrJ9MdTCThrcvDNdUHN4p6QfVN78U06ZmguqXIyMPyYhw2TrbDUwPQ==
+electron-to-chromium@^1.5.238:
+  version "1.5.240"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.5.240.tgz#bfd946570a723aa3754370065d02e23e30824774"
+  integrity sha512-OBwbZjWgrCOH+g6uJsA2/7Twpas2OlepS9uvByJjR2datRDuKGYeD+nP8lBBks2qnB7bGJNHDUx7c/YLaT3QMQ==
 
 emoji-regex@^7.0.1:
   version "7.0.3"
@@ -3621,7 +3648,7 @@ encoding@^0.1.12:
   dependencies:
     iconv-lite "^0.6.2"
 
-end-of-stream@^1.1.0, end-of-stream@^1.4.1:
+end-of-stream@^1.1.0, end-of-stream@^1.4.1, end-of-stream@^1.4.4:
   version "1.4.5"
   resolved "https://registry.yarnpkg.com/end-of-stream/-/end-of-stream-1.4.5.tgz#7344d711dea40e0b74abc2ed49778743ccedb08c"
   integrity sha512-ooEGc6HP26xXq/N+GCGOT0JKCLDGrq2bQUZrQ7gyrJiZANJ/8YDTxTpQBXGMn+WbIQXNVpyWymm7KYVICQnyOg==
@@ -3958,6 +3985,14 @@ fast-fifo@^1.2.0, fast-fifo@^1.3.2:
   resolved "https://registry.yarnpkg.com/fast-fifo/-/fast-fifo-1.3.2.tgz#286e31de96eb96d38a97899815740ba2a4f3640c"
   integrity sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==
 
+fast-unique-numbers@^8.0.13:
+  version "8.0.13"
+  resolved "https://registry.yarnpkg.com/fast-unique-numbers/-/fast-unique-numbers-8.0.13.tgz#3c87232061ff5f408a216e1f0121232f76f695d7"
+  integrity sha512-7OnTFAVPefgw2eBJ1xj2PGGR9FwYzSUso9decayHgCDX4sJkHLdcsYTytTg+tYv+wKF3U8gJuSBz2jJpQV4u/g==
+  dependencies:
+    "@babel/runtime" "^7.23.8"
+    tslib "^2.6.2"
+
 fast-xml-parser@5.2.5:
   version "5.2.5"
   resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-5.2.5.tgz#4809fdfb1310494e341098c25cb1341a01a9144a"
@@ -3979,7 +4014,7 @@ fastfall@^1.5.1:
   dependencies:
     reusify "^1.0.0"
 
-fastparallel@^2.3.0:
+fastparallel@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/fastparallel/-/fastparallel-2.4.1.tgz#0d984a5813ffa67f30b4a5cb4cb8cbe61c7ee5a5"
   integrity sha512-qUmhxPgNHmvRjZKBFUNI0oZuuH9OlSIOXmJ98lhKPxMZZ7zS/Fi0wRHOihDSz0R1YiIOjxzOY4bq65YTcdBi2Q==
@@ -3987,13 +4022,10 @@ fastparallel@^2.3.0:
     reusify "^1.0.4"
     xtend "^4.0.2"
 
-fastseries@^1.7.2:
-  version "1.7.2"
-  resolved "https://registry.yarnpkg.com/fastseries/-/fastseries-1.7.2.tgz#d22ce13b9433dff3388d91dbd6b8bda9b21a0f4b"
-  integrity sha512-dTPFrPGS8SNSzAt7u/CbMKCJ3s01N04s4JFbORHcmyvVfVKmbhMD1VtRbh5enGHxkaQDqWyLefiKOGGmohGDDQ==
-  dependencies:
-    reusify "^1.0.0"
-    xtend "^4.0.0"
+fastseries@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/fastseries/-/fastseries-2.0.0.tgz#d43eb975f6175dd83457d1d68fbd30f936ec7f2b"
+  integrity sha512-XBU9RXeoYc2/VnvMhplAxEmZLfIk7cvTBu+xwoBuTI8pL19E03cmca17QQycKIdxgwCeFA/a4u27gv1h3ya5LQ==
 
 faye-websocket@0.11.4:
   version "0.11.4"
@@ -4108,7 +4140,7 @@ fn.name@1.x.x:
   resolved "https://registry.yarnpkg.com/fn.name/-/fn.name-1.1.0.tgz#26cad8017967aea8731bc42961d04a3d5988accc"
   integrity sha512-GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==
 
-follow-redirects@^1.14.0, follow-redirects@^1.14.8, follow-redirects@^1.15.6:
+follow-redirects@^1.14.8, follow-redirects@^1.15.6:
   version "1.15.11"
   resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.15.11.tgz#777d73d72a92f8ec4d2e410eb47352a56b8e8340"
   integrity sha512-deG2P0JfjrTxl50XGCDyfI97ZGVCxIpfKYmfyrQ54n5FO/0gfIES8C/Psl6kWVDolizcaaxZJnTS0QSMxvnsBQ==
@@ -4195,14 +4227,6 @@ fresh@0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==
 
-from2@^2.1.0, from2@^2.3.0:
-  version "2.3.0"
-  resolved "https://registry.yarnpkg.com/from2/-/from2-2.3.0.tgz#8bfb5502bde4a4d36cfdeea007fcca21d7e382af"
-  integrity sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==
-  dependencies:
-    inherits "^2.0.1"
-    readable-stream "^2.0.0"
-
 fs-constants@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/fs-constants/-/fs-constants-1.0.0.tgz#6be0de9be998ce16af8afc24497b9ee9b7ccd9ad"
@@ -4298,6 +4322,11 @@ generate-function@^2.3.1:
   dependencies:
     is-property "^1.0.2"
 
+generator-function@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/generator-function/-/generator-function-2.0.1.tgz#0e75dd410d1243687a0ba2e951b94eedb8f737a2"
+  integrity sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==
+
 gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
   resolved "https://registry.yarnpkg.com/gensync/-/gensync-1.0.0-beta.2.tgz#32a6ee76c3d7f52d46b2b1ae5d93fea8580a25e0"
@@ -4324,7 +4353,7 @@ get-intrinsic@^1.2.4, get-intrinsic@^1.2.5, get-intrinsic@^1.2.6, get-intrinsic@
     hasown "^2.0.2"
     math-intrinsics "^1.1.0"
 
-get-proto@^1.0.0, get-proto@^1.0.1:
+get-proto@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/get-proto/-/get-proto-1.0.1.tgz#150b3f2743869ef3e851ec0c49d15b1d14d00ee1"
   integrity sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==
@@ -4701,24 +4730,22 @@ http-signature@~1.4.0:
     jsprim "^2.0.2"
     sshpk "^1.18.0"
 
-http_ece@1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/http_ece/-/http_ece-1.1.0.tgz#74780c6eb32d8ddfe9e36a83abcd81fe0cd4fb75"
-  integrity sha512-bptAfCDdPJxOs5zYSe7Y3lpr772s1G346R4Td5LgRUeCwIGpCGDUTJxRrhTNcAXbx37spge0kWEIH7QAYWNTlA==
-  dependencies:
-    urlsafe-base64 "~1.0.0"
+http_ece@1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/http_ece/-/http_ece-1.2.0.tgz#84d5885f052eae8c9b075eee4d2eb5105f114479"
+  integrity sha512-JrF8SSLVmcvc5NducxgyOrKXe3EsyHMgBFgSaIUGmArKe+rwr0uphRkRXvwiom3I+fpIfoItveHrfudL8/rxuA==
 
 httpreq@*:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/httpreq/-/httpreq-1.1.1.tgz#b8818316cdfd6b1bfb0f68b822fa1306cd24be68"
   integrity sha512-uhSZLPPD2VXXOSN8Cni3kIsoFHaU2pT/nySEU/fHr/ePbqHYr0jeiQRmUKLEirC09SFPsdMoA7LU7UXMd/w0Kw==
 
-https-proxy-agent@7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.2.tgz#e2645b846b90e96c6e6f347fb5b2e41f1590b09b"
-  integrity sha512-NmLNjm6ucYwtcUmL7JQC1ZQ57LmHP4lT15FQ8D61nak1rO6DH+fz5qNK2Ap5UN4ZapYICE3/0KodcLYSPsPbaA==
+https-proxy-agent@7.0.6, https-proxy-agent@^7.0.0, https-proxy-agent@^7.0.1:
+  version "7.0.6"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9"
+  integrity sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==
   dependencies:
-    agent-base "^7.0.2"
+    agent-base "^7.1.2"
     debug "4"
 
 https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
@@ -4729,14 +4756,6 @@ https-proxy-agent@^5.0.0, https-proxy-agent@^5.0.1:
     agent-base "6"
     debug "4"
 
-https-proxy-agent@^7.0.0, https-proxy-agent@^7.0.1:
-  version "7.0.6"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz#da8dfeac7da130b05c2ba4b59c9b6cd66611a6b9"
-  integrity sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==
-  dependencies:
-    agent-base "^7.1.2"
-    debug "4"
-
 humanize-ms@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/humanize-ms/-/humanize-ms-1.2.1.tgz#c46e3159a293f6b896da29316d8b6fe8bb79bbed"
@@ -4744,6 +4763,15 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
+hyperid@^3.2.0:
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/hyperid/-/hyperid-3.3.0.tgz#2042bb296b7f1d5ba0797a5705469af0899c8556"
+  integrity sha512-7qhCVT4MJIoEsNcbhglhdmBKb09QtcmJNiIQGq7js/Khf5FtQQ9bzcAuloeqBeee7XD7JqDeve9KNlQya5tSGQ==
+  dependencies:
+    buffer "^5.2.1"
+    uuid "^8.3.2"
+    uuid-parse "^1.1.0"
+
 iconv-lite@0.4.24:
   version "0.4.24"
   resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b"
@@ -4758,6 +4786,13 @@ iconv-lite@0.6.3, iconv-lite@^0.6.2, iconv-lite@^0.6.3:
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
+iconv-lite@^0.7.0:
+  version "0.7.0"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.7.0.tgz#c50cd80e6746ca8115eb98743afa81aa0e147a3e"
+  integrity sha512-cf6L2Ds3h57VVmkZe+Pn+5APsT7FpqJtEhhieDCvrE2MK5Qk9MyffgQyuxQTm6BChfeZNtcOLHp9IcWRVcIcBQ==
+  dependencies:
+    safer-buffer ">= 2.1.2 < 3.0.0"
+
 ieee754@^1.1.13, ieee754@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
@@ -4894,11 +4929,6 @@ is-arrayish@^0.2.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==
 
-is-arrayish@^0.3.1:
-  version "0.3.4"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.4.tgz#1ee5553818511915685d33bb13d31bf854e5059d"
-  integrity sha512-m6UrgzFVUYawGBh1dUsWR5M2Clqic9RVXC/9f8ceNlv2IcO9j9J/z8UoCLPqtsPBFNzEpfR3xftohbfqDx8EQA==
-
 is-async-function@^2.0.0:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/is-async-function/-/is-async-function-2.1.1.tgz#3e69018c8e04e73b738793d020bfe884b9fd3523"
@@ -4942,7 +4972,7 @@ is-callable@^1.2.7:
   resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.7.tgz#3bc2a85ea742d9e36205dcacdd72ca1fdc51b055"
   integrity sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==
 
-is-core-module@^2.16.0:
+is-core-module@^2.16.1:
   version "2.16.1"
   resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.16.1.tgz#2a98801a849f43e2add644fbb6bc6229b19a4ef4"
   integrity sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==
@@ -4996,12 +5026,13 @@ is-fullwidth-code-point@^3.0.0:
   integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==
 
 is-generator-function@^1.0.10, is-generator-function@^1.0.7:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.0.tgz#bf3eeda931201394f57b5dba2800f91a238309ca"
-  integrity sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/is-generator-function/-/is-generator-function-1.1.2.tgz#ae3b61e3d5ea4e4839b90bad22b02335051a17d5"
+  integrity sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==
   dependencies:
-    call-bound "^1.0.3"
-    get-proto "^1.0.0"
+    call-bound "^1.0.4"
+    generator-function "^2.0.0"
+    get-proto "^1.0.1"
     has-tostringtag "^1.0.2"
     safe-regex-test "^1.1.0"
 
@@ -5503,7 +5534,7 @@ loadavg-windows@1.1.1:
   dependencies:
     weak-daemon "1.0.3"
 
-localforage@^1.9.0:
+localforage@^1.10.0:
   version "1.10.0"
   resolved "https://registry.yarnpkg.com/localforage/-/localforage-1.10.0.tgz#5c465dc5f62b2807c3a84c0c6a1b1b3212781dd4"
   integrity sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==
@@ -5614,7 +5645,7 @@ lru-cache@6.0.0, lru-cache@^6.0.0:
   dependencies:
     yallist "^4.0.0"
 
-lru-cache@^10.2.0, lru-cache@^10.3.0:
+lru-cache@^10.2.0, lru-cache@^10.4.3:
   version "10.4.3"
   resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.4.3.tgz#410fc8a17b70e598013df257c2446b7f3383f119"
   integrity sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==
@@ -5687,16 +5718,16 @@ make-fetch-happen@^9.1.0:
     socks-proxy-agent "^6.0.0"
     ssri "^8.0.0"
 
-mariadb@3.4.0:
-  version "3.4.0"
-  resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-3.4.0.tgz#3dc2e918f000b39df9e1c2139604a4b2ebaa8d1c"
-  integrity sha512-hdRPcAzs+MTxK5VG1thBW18gGTlw6yWBe9YnLB65GLo7q0fO5DWsgomIevV/pXSaWRmD3qi6ka4oSFRTExRiEQ==
+mariadb@3.4.5:
+  version "3.4.5"
+  resolved "https://registry.yarnpkg.com/mariadb/-/mariadb-3.4.5.tgz#27ccfcb4fab3d7805ec4e365ff61f76fe7bd8c70"
+  integrity sha512-gThTYkhIS5rRqkVr+Y0cIdzr+GRqJ9sA2Q34e0yzmyhMCwyApf3OKAC1jnF23aSlIOqJuyaUFUcj7O1qZslmmQ==
   dependencies:
-    "@types/geojson" "^7946.0.14"
-    "@types/node" "^22.5.4"
+    "@types/geojson" "^7946.0.16"
+    "@types/node" "^24.0.13"
     denque "^2.1.0"
     iconv-lite "^0.6.3"
-    lru-cache "^10.3.0"
+    lru-cache "^10.4.3"
 
 math-intrinsics@^1.1.0:
   version "1.1.0"
@@ -5821,10 +5852,10 @@ minimist@~0.0.1:
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-0.0.10.tgz#de3f98543dbf96082be48ad1a0c7cda836301dcf"
   integrity sha512-iotkTvxc+TwOm5Ieim8VnSNvCDjCK9S8G3scJ50ZthspSxa7jx50jkhYduuAtAjvfDUwSgOwf8+If99AlOEhyw==
 
-minio@8.0.2:
-  version "8.0.2"
-  resolved "https://registry.yarnpkg.com/minio/-/minio-8.0.2.tgz#ea1703ff52dcf610ba6d4e2ece8c5627f664d581"
-  integrity sha512-7ipWbtgzzboctf+McK+2cXwCrNOhuboTA/O1g9iWa0gH8R4GkeyFWwk12aVDEHdzjPiG8wxnjwfHS7pgraKuHw==
+minio@8.0.6:
+  version "8.0.6"
+  resolved "https://registry.yarnpkg.com/minio/-/minio-8.0.6.tgz#ec736e3e3ead1f450af5b9b28256c28e52a83dd0"
+  integrity sha512-sOeh2/b/XprRmEtYsnNRFtOqNRTPDvYtMWh+spWlfsuCV/+IdxNeKVUMKLqI7b5Dr07ZqCPuaRGU/rB9pZYVdQ==
   dependencies:
     async "^3.2.4"
     block-stream2 "^2.1.0"
@@ -5976,23 +6007,32 @@ mongojs@3.1.0:
     thunky "^1.1.0"
     to-mongodb-core "^2.0.0"
 
-mqemitter@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/mqemitter/-/mqemitter-3.0.0.tgz#427733ce397be39304c2279bd84358d5525cf577"
-  integrity sha512-1HduoiTFngBGFEKCGvfCpGfPM/3g58xtDW9fmuHpbnRieC01uAi3yJE/F1YsUrzH8p441l10kosYzi3HhJYnrQ==
+mqemitter@^6.0.0:
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/mqemitter/-/mqemitter-6.0.2.tgz#f99ab435de886082e005e1577d1070cecc63f695"
+  integrity sha512-8RGlznQx/Nb1xC3xKUFXHWov7pn7JdH++YVwlr6SLT6k3ft1h+ImGqZdVudbdKruFckIq9wheq9s4hgCivJDow==
   dependencies:
-    fastparallel "^2.3.0"
-    qlobber "^3.1.0"
+    fastparallel "^2.4.1"
+    qlobber "^8.0.1"
 
-mqtt-packet@^6.1.2:
-  version "6.10.0"
-  resolved "https://registry.yarnpkg.com/mqtt-packet/-/mqtt-packet-6.10.0.tgz#c8b507832c4152e3e511c0efa104ae4a64cd418f"
-  integrity sha512-ja8+mFKIHdB1Tpl6vac+sktqy3gA8t9Mduom1BA75cI+R9AHnZOiaBQwpGiWnaVJLDGRdNhQmFaAqd7tkKSMGA==
+mqtt-packet@^7.0.0:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/mqtt-packet/-/mqtt-packet-7.1.2.tgz#80364910a99de5d127d0b0c9a915cfb6111790bf"
+  integrity sha512-FFZbcZ2omsf4c5TxEQfcX9hI+JzDpDKPT46OmeIBpVA7+t32ey25UNqlqNXTmeZOr5BLsSIERpQQLsFWJS94SQ==
   dependencies:
     bl "^4.0.2"
     debug "^4.1.1"
     process-nextick-args "^2.0.1"
 
+mqtt-packet@^9.0.0:
+  version "9.0.2"
+  resolved "https://registry.yarnpkg.com/mqtt-packet/-/mqtt-packet-9.0.2.tgz#fe6ae2c36fe3f269d11b3fe663b53648f3b3700a"
+  integrity sha512-MvIY0B8/qjq7bKxdN1eD+nrljoeaai+qjLJgfRn3TiMuz0pamsIWY2bFODPZMSNmabsLANXsLl4EMoWvlaTZWA==
+  dependencies:
+    bl "^6.0.8"
+    debug "^4.3.4"
+    process-nextick-args "^2.0.1"
+
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -6022,15 +6062,15 @@ mute-stream@0.0.5:
   resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.5.tgz#8fbfabb0a98a253d3184331f9e8deb7372fac6c0"
   integrity sha512-EbrziT4s8cWPmzr47eYVW3wimS4HsvlnV5ri1xw1aR6JQo/OrJX5rkl32K/QQHdxeabJETtfeaROGhd8W7uBgg==
 
-mysql2@3.11.4:
-  version "3.11.4"
-  resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.11.4.tgz#08658b6285adbace7d43b2eaa18efddb85f99501"
-  integrity sha512-Z2o3tY4Z8EvSRDwknaC40MdZ3+m0sKbpnXrShQLdxPrAvcNli7jLrD2Zd2IzsRMw4eK9Yle500FDmlkIqp+krg==
+mysql2@3.15.1:
+  version "3.15.1"
+  resolved "https://registry.yarnpkg.com/mysql2/-/mysql2-3.15.1.tgz#c04e3b944768132618bded85b7cf2fa8397033e0"
+  integrity sha512-WZMIRZstT2MFfouEaDz/AGFnGi1A2GwaDe7XvKTdRJEYiAHbOrh4S3d8KFmQeh11U85G+BFjIvS1Di5alusZsw==
   dependencies:
     aws-ssl-profiles "^1.1.1"
     denque "^2.1.0"
     generate-function "^2.3.1"
-    iconv-lite "^0.6.3"
+    iconv-lite "^0.7.0"
     long "^5.2.1"
     lru.min "^1.0.0"
     named-placeholders "^1.1.3"
@@ -6044,16 +6084,11 @@ named-placeholders@^1.1.3:
   dependencies:
     lru-cache "^7.14.1"
 
-nan@^2.13.2, nan@^2.19.0, nan@^2.20.0:
+nan@^2.13.2, nan@^2.19.0, nan@^2.23.0:
   version "2.23.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.23.0.tgz#24aa4ddffcc37613a2d2935b97683c1ec96093c6"
   integrity sha512-1UxuyYGdoQHcGg87Lkqm3FzefucTa0NAiOcuRsDmysep3c1LVCRK2krrUDafMWtjSG04htvAmvg96+SDknOmgQ==
 
-nanoid@^3.3.8:
-  version "3.3.11"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.11.tgz#4f4f112cefbe303202f2199838128936266d185b"
-  integrity sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==
-
 napi-build-utils@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/napi-build-utils/-/napi-build-utils-2.0.0.tgz#13c22c0187fcfccce1461844136372a47ddc027e"
@@ -6098,9 +6133,9 @@ no-case@^3.0.4:
     tslib "^2.0.3"
 
 node-abi@^3.3.0:
-  version "3.77.0"
-  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.77.0.tgz#3ad90d5c9d45663420e5aa4ff58dbf4e3625419a"
-  integrity sha512-DSmt0OEcLoK4i3NuscSbGjOf3bqiDEutejqENSplMSFA/gmB8mkED9G4pKWnPl7MDU4rSHebKPHeitpDfyH0cQ==
+  version "3.78.0"
+  resolved "https://registry.yarnpkg.com/node-abi/-/node-abi-3.78.0.tgz#fd0ecbd0aa89857b98da06bd3909194abb0821ba"
+  integrity sha512-E2wEyrgX/CqvicaQYU3Ze1PFGjc4QYPGsjUrlYkqAE0WjHEZwgOsGMPMzkMse4LjJbDmaEuDX3CM036j5K2DSQ==
   dependencies:
     semver "^7.3.5"
 
@@ -6183,10 +6218,10 @@ node-pushover@1.0.0:
   dependencies:
     httpreq "*"
 
-node-releases@^2.0.21:
-  version "2.0.21"
-  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.21.tgz#f59b018bc0048044be2d4c4c04e4c8b18160894c"
-  integrity sha512-5b0pgg78U3hwXkCM8Z9b2FJdPZlr9Psr9V2gQPESdGHqbntyFJKFW4r5TeWGFzafGY3hzs1JC62VEQMbl1JFkw==
+node-releases@^2.0.26:
+  version "2.0.26"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.26.tgz#fdfa272f2718a1309489d18aef4ef5ba7f5dfb52"
+  integrity sha512-S2M9YimhSjBSvYnlr5/+umAnPHE++ODwt5e2Ij6FoX45HA/s4vHdkDx1eax2pAPeAOqu4s9b7ppahsyEFdVqQA==
 
 node-sspi@0.2.10:
   version "0.2.10"
@@ -6201,14 +6236,14 @@ node-uuid@~1.4.0:
   resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
   integrity sha512-TkCET/3rr9mUuRp+CpO7qfgT++aAxfDRaalQhwPFzI9BY/2rCDn6OfpZOVggi1AXfTPpfkTrg5f5WQx5G1uLxA==
 
-node-vault@0.10.2:
-  version "0.10.2"
-  resolved "https://registry.yarnpkg.com/node-vault/-/node-vault-0.10.2.tgz#d5629c2e88744183474bba2ce54e1e08c4d15e8e"
-  integrity sha512-//uc9/YImE7Dx0QHdwMiAzLaOumiKUnOUP8DymgtkZ8nsq6/V2LKvEu6kw91Lcruw8lWUfj4DO7CIXNPRWBuuA==
+node-vault@0.10.5:
+  version "0.10.5"
+  resolved "https://registry.yarnpkg.com/node-vault/-/node-vault-0.10.5.tgz#f86818435387ddb4508875120c06096ec09cdaa3"
+  integrity sha512-sIyB/5296U2tMT7hH1nrkoYUXkRxuLsG40fgUHaBhzM+G/uyBKBo+QNsvKqE5FNq24QJM+tr97N+knLQiEEcSg==
   dependencies:
     debug "^4.3.4"
     mustache "^4.2.0"
-    postman-request "^2.88.1-postman.33"
+    postman-request "^2.88.1-postman.42"
     tv4 "^1.3.0"
 
 node-windows@0.1.14:
@@ -6716,12 +6751,12 @@ pend@~1.2.0:
   resolved "https://registry.yarnpkg.com/pend/-/pend-1.2.0.tgz#7a57eb550a6783f9115331fcf4663d5c8e007a50"
   integrity sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==
 
-pg-cloudflare@^1.1.1:
+pg-cloudflare@^1.2.7:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/pg-cloudflare/-/pg-cloudflare-1.2.7.tgz#a1f3d226bab2c45ae75ea54d65ec05ac6cfafbef"
   integrity sha512-YgCtzMH0ptvZJslLM1ffsY4EuGaU0cx4XSdXLRFae8bPP4dS5xL1tNB3k2o/N64cHJpwU7dxKli/nZ2lUa5fLg==
 
-pg-connection-string@^2.7.0:
+pg-connection-string@^2.9.1:
   version "2.9.1"
   resolved "https://registry.yarnpkg.com/pg-connection-string/-/pg-connection-string-2.9.1.tgz#bb1fd0011e2eb76ac17360dc8fa183b2d3465238"
   integrity sha512-nkc6NpDcvPVpZXxrreI/FOtX3XemeLl8E0qFr6F2Lrm/I8WOnaWNhIPK2Z7OHpw7gh5XJThi6j6ppgNoaT1w4w==
@@ -6731,17 +6766,17 @@ pg-int8@1.0.1:
   resolved "https://registry.yarnpkg.com/pg-int8/-/pg-int8-1.0.1.tgz#943bd463bf5b71b4170115f80f8efc9a0c0eb78c"
   integrity sha512-WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw==
 
-pg-pool@^3.8.0:
+pg-pool@^3.10.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/pg-pool/-/pg-pool-3.10.1.tgz#481047c720be2d624792100cac1816f8850d31b2"
   integrity sha512-Tu8jMlcX+9d8+QVzKIvM/uJtp07PKr82IUOYEphaWcoBhIYkoHpLXN3qO59nAI11ripznDsEzEv8nUxBVWajGg==
 
-pg-protocol@^1.8.0:
+pg-protocol@^1.10.3:
   version "1.10.3"
   resolved "https://registry.yarnpkg.com/pg-protocol/-/pg-protocol-1.10.3.tgz#ac9e4778ad3f84d0c5670583bab976ea0a34f69f"
   integrity sha512-6DIBgBQaTKDJyxnXaLiLR8wBpQQcGWuAESkRBX/t6OwA8YsqP+iVSiond2EDy6Y/dsGk8rh/jtax3js5NeV7JQ==
 
-pg-types@^2.1.0:
+pg-types@2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/pg-types/-/pg-types-2.2.0.tgz#2d0250d636454f7cfa3b6ae0382fdfa8063254a3"
   integrity sha512-qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA==
@@ -6752,20 +6787,20 @@ pg-types@^2.1.0:
     postgres-date "~1.0.4"
     postgres-interval "^1.1.0"
 
-pg@8.14.1:
-  version "8.14.1"
-  resolved "https://registry.yarnpkg.com/pg/-/pg-8.14.1.tgz#2e3d1f287b64797cdfc8d1ba000f61a7ff8d66ed"
-  integrity sha512-0TdbqfjwIun9Fm/r89oB7RFQ0bLgduAhiIqIXOsyKoiC/L54DbuAAzIEN/9Op0f1Po9X7iCPXGoa/Ah+2aI8Xw==
+pg@8.16.3:
+  version "8.16.3"
+  resolved "https://registry.yarnpkg.com/pg/-/pg-8.16.3.tgz#160741d0b44fdf64680e45374b06d632e86c99fd"
+  integrity sha512-enxc1h0jA/aq5oSDMvqyW3q89ra6XIIDZgCX9vkMrnz5DFTw/Ny3Li2lFQ+pt3L6MCgm/5o2o8HW9hiJji+xvw==
   dependencies:
-    pg-connection-string "^2.7.0"
-    pg-pool "^3.8.0"
-    pg-protocol "^1.8.0"
-    pg-types "^2.1.0"
-    pgpass "1.x"
+    pg-connection-string "^2.9.1"
+    pg-pool "^3.10.1"
+    pg-protocol "^1.10.3"
+    pg-types "2.2.0"
+    pgpass "1.0.5"
   optionalDependencies:
-    pg-cloudflare "^1.1.1"
+    pg-cloudflare "^1.2.7"
 
-pgpass@1.x:
+pgpass@1.0.5:
   version "1.0.5"
   resolved "https://registry.yarnpkg.com/pgpass/-/pgpass-1.0.5.tgz#9b873e4a564bb10fa7a7dbd55312728d422a223d"
   integrity sha512-FdW9r/jQZhSeohs1Z3sI1yxFQNFvMcnmfuj4WBMUTxOrAyLMaTcE1aAMBiTlbMNaXvBCQuVi0R7hd8udDSP7ug==
@@ -6804,13 +6839,13 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
-plivo@4.58.0:
-  version "4.58.0"
-  resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.58.0.tgz#bd6b2ded17319049f6a1d2dde7985b2ff7ae93db"
-  integrity sha512-AFxxxYgVaqx+09aDZoLeg5Tv7xPI7CBU/f3DOtvOVbFnqZZZByPTkuGzUZ3oeit7+yTklzQt4o5DfpNDB9LgNA==
+plivo@4.75.1:
+  version "4.75.1"
+  resolved "https://registry.yarnpkg.com/plivo/-/plivo-4.75.1.tgz#c9d0e8fdb47f4072edc989e139140e687bac5fd8"
+  integrity sha512-u6SOF1s3ccdp5v7yl8RYmZUHmnUfsNHsE5DRe4XLozaJlObsKG45kEYliMNTHTHZ6GEdc6Wm8hsD0ZcfIhkn7g==
   dependencies:
     "@types/node" "^14.14.14"
-    axios "^0.21.1"
+    axios "^1.8.3"
     base-64 "^0.1.0"
     build-url "^1.0.10"
     form-data "^4.0.0"
@@ -6851,10 +6886,10 @@ postgres-interval@^1.1.0:
   dependencies:
     xtend "^4.0.0"
 
-postman-request@^2.88.1-postman.33:
-  version "2.88.1-postman.43"
-  resolved "https://registry.yarnpkg.com/postman-request/-/postman-request-2.88.1-postman.43.tgz#98aef15a01003d86cd943f844fa2bf6b11434fed"
-  integrity sha512-5ivoZnMvnX47/HA7mk2GQubZsnXptlJGVyO0hLV3MTK/MDgJVnB/q3bUgzU4KhwG8OBxe2L8uqv3ZpK6mp+RdA==
+postman-request@^2.88.1-postman.42:
+  version "2.88.1-postman.45"
+  resolved "https://registry.yarnpkg.com/postman-request/-/postman-request-2.88.1-postman.45.tgz#c91b071acf260d682040a2e4b337166e8a3395bc"
+  integrity sha512-Fn4Lh1sgA1IUQz4W64dXEaU/kLmB5LbTLOycR567i9BStpn5/0j5PJTwURAfQ0XPpEKAPDfrz5PzBud1TJ1XGg==
   dependencies:
     "@postman/form-data" "~3.1.1"
     "@postman/tough-cookie" "~4.1.3-postman.1"
@@ -6910,7 +6945,7 @@ process@^0.11.10:
   resolved "https://registry.yarnpkg.com/process/-/process-0.11.10.tgz#7332300e840161bda3e69a1d1d91a7d4bc16f182"
   integrity sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==
 
-prom-client@*:
+prom-client@15.1.3:
   version "15.1.3"
   resolved "https://registry.yarnpkg.com/prom-client/-/prom-client-15.1.3.tgz#69fa8de93a88bc9783173db5f758dc1c69fa8fc2"
   integrity sha512-6ZiOBfCywsD4k1BN9IX0uZhF+tJkV8q8llP64G5Hajs4JOeVLPCwpPVcpXy3BwYiUGgyJzsJJQeOIv7+hDSq8g==
@@ -6994,10 +7029,15 @@ punycode@^2.1.1, punycode@^2.3.0, punycode@^2.3.1:
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5"
   integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==
 
-qlobber@^3.0.2, qlobber@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/qlobber/-/qlobber-3.1.0.tgz#b8c8e067496de17bdbf3cd843cf53ece09c8d211"
-  integrity sha512-B7EU6Hv9g4BeJiB7qtOjn9wwgqVpcWE5c4/86O0Yoj7fmAvgwXrdG1E+QF13S/+TX5XGUl7toizP0gzXR2Saug==
+qlobber@^7.0.0:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/qlobber/-/qlobber-7.0.1.tgz#2346664844d35cb99b8d80c8dc8a74264c078c69"
+  integrity sha512-FsFg9lMuMEFNKmTO9nV7tlyPhx8BmskPPjH2akWycuYVTtWaVwhW5yCHLJQ6Q+3mvw5cFX2vMfW2l9z2SiYAbg==
+
+qlobber@^8.0.1:
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/qlobber/-/qlobber-8.0.1.tgz#8a8ef18401ca451c9ebc2afe58a1b04c38f476ca"
+  integrity sha512-O+Wd1chXj5YE1DwmD+ae0bXiSLehmnS3czlC1R9FL/Nt/3q8uMS1bIHmg2lJfCoiimCxClWM8AAuJrF0EvNiog==
 
 qs@6.13.0:
   version "6.13.0"
@@ -7097,7 +7137,7 @@ read-pkg@^3.0.0:
     normalize-package-data "^2.3.2"
     path-type "^3.0.0"
 
-"readable-stream@2 || 3", readable-stream@3, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0, readable-stream@^3.6.2:
+readable-stream@3, readable-stream@^3.1.1, readable-stream@^3.4.0, readable-stream@^3.6.0, readable-stream@^3.6.2:
   version "3.6.2"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-3.6.2.tgz#56a9b36ea965c00c5a93ef31eb111a0f11056967"
   integrity sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==
@@ -7106,7 +7146,7 @@ read-pkg@^3.0.0:
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.3.5, readable-stream@^2.3.8:
+readable-stream@^2.0.5, readable-stream@^2.3.5, readable-stream@^2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.8.tgz#91125e8042bba1b9887f49345f6277027ce8be9b"
   integrity sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==
@@ -7119,7 +7159,7 @@ readable-stream@^2.0.0, readable-stream@^2.0.5, readable-stream@^2.3.5, readable
     string_decoder "~1.1.1"
     util-deprecate "~1.0.1"
 
-readable-stream@^4.0.0, readable-stream@^4.7.0:
+readable-stream@^4.0.0, readable-stream@^4.2.0, readable-stream@^4.7.0:
   version "4.7.0"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-4.7.0.tgz#cedbd8a1146c13dfff8dab14068028d58c15ac91"
   integrity sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==
@@ -7257,11 +7297,11 @@ resolve-from@^4.0.0:
   integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==
 
 resolve@^1.10.0:
-  version "1.22.10"
-  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.10.tgz#b663e83ffb09bbf2386944736baae803029b8b39"
-  integrity sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==
+  version "1.22.11"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.22.11.tgz#aad857ce1ffb8bfa9b0b1ac29f1156383f68c262"
+  integrity sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==
   dependencies:
-    is-core-module "^2.16.0"
+    is-core-module "^2.16.1"
     path-parse "^1.0.7"
     supports-preserve-symlinks-flag "^1.0.0"
 
@@ -7273,10 +7313,12 @@ restore-cursor@^1.0.1:
     exit-hook "^1.0.0"
     onetime "^1.0.0"
 
-retimer@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/retimer/-/retimer-2.0.0.tgz#e8bd68c5e5a8ec2f49ccb5c636db84c04063bbca"
-  integrity sha512-KLXY85WkEq2V2bKex/LOO1ViXVn2KGYe4PYysAdYdjmraYIUsVkXu8O4am+8+5UbaaGl1qho4aqAAPHNQ4GSbg==
+retimer@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/retimer/-/retimer-4.0.0.tgz#41a8c09710281013ee83ef3a5f8279c02b5a4a8e"
+  integrity sha512-fZIVtvbOsQsxNSDhpdPOX4lx5Ss2ni+S72AUBitARpFhtA3UzrAjQ6gDtypB2/+l7L+1VQgAgpvAKY66mElH0w==
+  dependencies:
+    worker-timers "^7.0.75"
 
 retry-request@^7.0.0:
   version "7.0.2"
@@ -7455,9 +7497,9 @@ semver@^6.0.0, semver@^6.3.1:
   integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==
 
 semver@^7.3.5, semver@^7.5.4:
-  version "7.7.2"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.2.tgz#67d99fdcd35cec21e6f8b87a7fd515a33f982b58"
-  integrity sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==
+  version "7.7.3"
+  resolved "https://registry.yarnpkg.com/semver/-/semver-7.7.3.tgz#4b5f4143d007633a8dc671cd0a6ef9147b8bb946"
+  integrity sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==
 
 send@0.19.0:
   version "0.19.0"
@@ -7562,13 +7604,6 @@ shebang-regex@^3.0.0:
   resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172"
   integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==
 
-shortid@^2.2.14:
-  version "2.2.17"
-  resolved "https://registry.yarnpkg.com/shortid/-/shortid-2.2.17.tgz#ea87297a36b7edd10a57818fbac5be798e0994bb"
-  integrity sha512-GpbM3gLF1UUXZvQw6MCyulHkWbRseNO4cyBEZresZRorwl1+SLu1ZdqgVtuwqz8mB6RpwPkm541mYSqrKyJSaA==
-  dependencies:
-    nanoid "^3.3.8"
-
 side-channel-list@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/side-channel-list/-/side-channel-list-1.0.0.tgz#10cb5984263115d3b7a0e336591e290a830af8ad"
@@ -7633,13 +7668,6 @@ simple-get@^4.0.0:
     once "^1.3.1"
     simple-concat "^1.0.0"
 
-simple-swizzle@^0.2.2:
-  version "0.2.4"
-  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.4.tgz#a8d11a45a11600d6a1ecdff6363329e3648c3667"
-  integrity sha512-nAu1WFPQSMNr2Zn9PGSZK9AGn4t/y97lEm+MXTtUDwfP0ksAIX4nO+6ruD9Jwut4C49SB1Ws+fbXsm/yScWOHw==
-  dependencies:
-    is-arrayish "^0.3.1"
-
 slash@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-2.0.0.tgz#de552851a1759df3a8f206535442f5ec4ddeab44"
@@ -7783,16 +7811,16 @@ sqlstring@^2.3.2:
   resolved "https://registry.yarnpkg.com/sqlstring/-/sqlstring-2.3.3.tgz#2ddc21f03bce2c387ed60680e739922c65751d0c"
   integrity sha512-qC9iz2FlN7DQl3+wjwn3802RTyjCx7sDvfQEXchwa6CWOx07/WVfh91gBmQ9fahw8snwGEWU3xGzOt4tFyHLxg==
 
-ssh2@1.16.0:
-  version "1.16.0"
-  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.16.0.tgz#79221d40cbf4d03d07fe881149de0a9de928c9f0"
-  integrity sha512-r1X4KsBGedJqo7h8F5c4Ybpcr5RjyP+aWIG007uBPRjmdQWfEiVLzSK71Zji1B9sKxwaCvD8y8cwSkYrlLiRRg==
+ssh2@1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/ssh2/-/ssh2-1.17.0.tgz#dc686e8e3abdbd4ad95d46fa139615903c12258c"
+  integrity sha512-wPldCk3asibAjQ/kziWQQt1Wh3PgDFpC0XpwclzKcdT1vql6KeYxf5LIt4nlFkUeR8WuphYMKqUA56X4rjbfgQ==
   dependencies:
     asn1 "^0.2.6"
     bcrypt-pbkdf "^1.0.2"
   optionalDependencies:
     cpu-features "~0.0.10"
-    nan "^2.20.0"
+    nan "^2.23.0"
 
 sshpk@^1.18.0:
   version "1.18.0"
@@ -8142,10 +8170,10 @@ teeny-request@^9.0.0:
     stream-events "^1.0.5"
     uuid "^9.0.0"
 
-telegram@2.19.8:
-  version "2.19.8"
-  resolved "https://registry.yarnpkg.com/telegram/-/telegram-2.19.8.tgz#d6c0217e67e2cc9513e4904c033ecd4b296293f7"
-  integrity sha512-yaBRPILM0FSEbKKcnMR4Q463DpasAGOvUEcGrlW7xmYMAEntxIdoFLXrZnpNDaubncx6lc1M9cecMvlTkg6taQ==
+telegram@2.26.22:
+  version "2.26.22"
+  resolved "https://registry.yarnpkg.com/telegram/-/telegram-2.26.22.tgz#16beb73e52403b5d5bcc4602226e39dc24217333"
+  integrity sha512-EIj7Yrjiu0Yosa3FZ/7EyPg9s6UiTi/zDQrFmR/2Mg7pIUU+XjAit1n1u9OU9h2oRnRM5M+67/fxzQluZpaJJg==
   dependencies:
     "@cryptography/aes" "^0.1.1"
     async-mutex "^0.3.0"
@@ -8213,14 +8241,6 @@ thirty-two@^1.0.2:
   resolved "https://registry.yarnpkg.com/thirty-two/-/thirty-two-1.0.2.tgz#4ca2fffc02a51290d2744b9e3f557693ca6b627a"
   integrity sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA==
 
-through2@^3.0.1:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/through2/-/through2-3.0.2.tgz#99f88931cfc761ec7678b41d5d7336b5b6a07bf4"
-  integrity sha512-enaDQ4MUyP2W6ZyT6EsMzqBPZaM/avg8iuo+l2d3QCs0J+6RaqkHV/2/lOwDTueBHeJ/2LG9lrLW3d5rWPucuQ==
-  dependencies:
-    inherits "^2.0.4"
-    readable-stream "2 || 3"
-
 through2@^4.0.2:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/through2/-/through2-4.0.2.tgz#a7ce3ac2a7a8b0b966c80e7c49f0484c3b239764"
@@ -8243,10 +8263,10 @@ tiny-inflate@^1.0.2:
   resolved "https://registry.yarnpkg.com/tiny-inflate/-/tiny-inflate-1.0.3.tgz#122715494913a1805166aaf7c93467933eea26c4"
   integrity sha512-pkY1fj1cKHb2seWDy0B16HeWyczlJA9/WW3u3c4z/NiWDsO3DOU5D7nhTLE9CF0yXv/QZFY7sEJmj24dK+Rrqw==
 
-to-buffer@^1.2.0, to-buffer@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.2.1.tgz#2ce650cdb262e9112a18e65dc29dcb513c8155e0"
-  integrity sha512-tB82LpAIWjhLYbqjx3X4zEeHN6M8CiuOEy2JY8SEQVdYRe3CCHOFaqrBW1doLDrfpWhplcW7BL+bO3/6S3pcDQ==
+to-buffer@^1.2.0, to-buffer@^1.2.1, to-buffer@^1.2.2:
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/to-buffer/-/to-buffer-1.2.2.tgz#ffe59ef7522ada0a2d1cb5dfe03bb8abc3cdc133"
+  integrity sha512-db0E3UJjcFhpDhAF4tLo03oli3pwl3dbnzXOUIlRKrp+ldk/VUxzpWYZENsw2SZiuBjHAk7DfB0VU7NKdpb6sw==
   dependencies:
     isarray "^2.0.5"
     safe-buffer "^5.2.1"
@@ -8358,12 +8378,12 @@ tweetnacl@^1.0.1:
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-1.0.3.tgz#ac0af71680458d8a6378d0d0d050ab1407d35596"
   integrity sha512-6rt+RN7aOi1nGMyC4Xa5DdYiukl2UWCbcJft7YhxReBGQD7OAM8Pbxw6YMo4r2diNEA8FEmu32YOn9rhaiE5yw==
 
-twilio@4.19.0:
-  version "4.19.0"
-  resolved "https://registry.yarnpkg.com/twilio/-/twilio-4.19.0.tgz#b0cc25eb397490ed3e41f031ab5c79697a9065ee"
-  integrity sha512-4tM1LNM5LeUvnko4kIqIreY6vmjIo5Ag5jMEhjTDPj+GES82MnkfSkJv8N1k5/ZmeSvIdk5hjI87GB/DpDDePQ==
+twilio@4.23.0:
+  version "4.23.0"
+  resolved "https://registry.yarnpkg.com/twilio/-/twilio-4.23.0.tgz#46b69c231fc7aa9488a7bde09b8659da8c459a56"
+  integrity sha512-LdNBQfOe0dY2oJH2sAsrxazpgfFQo5yXGxe96QA8UWB5uu+433PrUbkv8gQ5RmrRCqUTPQ0aOrIyAdBr1aB03Q==
   dependencies:
-    axios "^0.26.1"
+    axios "^1.6.0"
     dayjs "^1.11.9"
     https-proxy-agent "^5.0.0"
     jsonwebtoken "^9.0.0"
@@ -8479,10 +8499,10 @@ undici-types@~6.21.0:
   resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-6.21.0.tgz#691d00af3909be93a7faa13be61b3a5b50ef12cb"
   integrity sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==
 
-undici-types@~7.12.0:
-  version "7.12.0"
-  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.12.0.tgz#15c5c7475c2a3ba30659529f5cdb4674b622fafb"
-  integrity sha512-goOacqME2GYyOZZfb5Lgtu+1IDmAlAEu5xnD3+xTzS10hT0vzpf0SPjkXwAw9Jm+4n/mQGDP3LO8CPbYROeBfQ==
+undici-types@~7.16.0:
+  version "7.16.0"
+  resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.16.0.tgz#ffccdff36aea4884cbfce9a750a0580224f58a46"
+  integrity sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==
 
 undici@^5.11.0, undici@^5.22.0:
   version "5.29.0"
@@ -8520,10 +8540,10 @@ unpipe@1.0.0, unpipe@~1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==
 
-update-browserslist-db@^1.1.3:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz#348377dd245216f9e7060ff50b15a1b740b75420"
-  integrity sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==
+update-browserslist-db@^1.1.4:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/update-browserslist-db/-/update-browserslist-db-1.1.4.tgz#7802aa2ae91477f255b86e0e46dbc787a206ad4a"
+  integrity sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==
   dependencies:
     escalade "^3.2.0"
     picocolors "^1.1.1"
@@ -8551,11 +8571,6 @@ url-template@^2.0.8:
   resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
   integrity sha512-XdVKMF4SJ0nP/O7XIPB0JwAEuT9lDIYnNsK8yGVe43y0AWoKeJNdv3ZNWh7ksJ6KqQFjOO6ox/VEitLnaVNufw==
 
-urlsafe-base64@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/urlsafe-base64/-/urlsafe-base64-1.0.0.tgz#23f89069a6c62f46cf3a1d3b00169cefb90be0c6"
-  integrity sha512-RtuPeMy7c1UrHwproMZN9gN6kiZ0SvJwRaEzwZY0j9MypEkFqyBaKv176jvlPtg58Zh36bOkS0NFABXMHvvGCA==
-
 utf-8-validate@^5.0.2, utf-8-validate@^5.0.5:
   version "5.0.10"
   resolved "https://registry.yarnpkg.com/utf-8-validate/-/utf-8-validate-5.0.10.tgz#d7d10ea39318171ca982718b6b96a8d2442571a2"
@@ -8573,7 +8588,7 @@ util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
   integrity sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==
 
-util@^0.12.3, util@^0.12.4:
+util@^0.12.3, util@^0.12.5:
   version "0.12.5"
   resolved "https://registry.yarnpkg.com/util/-/util-0.12.5.tgz#5f17a6059b73db61a875668781a1c2b136bd6fbc"
   integrity sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==
@@ -8589,6 +8604,11 @@ utils-merge@1.0.1, utils-merge@1.x.x, utils-merge@^1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==
 
+uuid-parse@^1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/uuid-parse/-/uuid-parse-1.1.0.tgz#7061c5a1384ae0e1f943c538094597e1b5f3a65b"
+  integrity sha512-OdmXxA8rDsQ7YpNVbKSJkNzTw2I+S5WsbMDnCtIWSQaosNAcWtFuI/YK1TjzUI6nbkgiqEyh8gWngfcv8Asd9A==
+
 uuid@^10.0.0:
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-10.0.0.tgz#5a95aa454e6e002725c79055fd42aaba30ca6294"
@@ -8675,13 +8695,13 @@ web-encoding@^1.1.5:
   optionalDependencies:
     "@zxing/text-encoding" "0.9.0"
 
-web-push@3.6.6:
-  version "3.6.6"
-  resolved "https://registry.yarnpkg.com/web-push/-/web-push-3.6.6.tgz#592facb26116187136b0d543768ef85675791ac8"
-  integrity sha512-SyteEck9fiCskNmPxs/GFhJsZrIyLfRvjWNmcUwULLJyCU0f1oxo2sWTokXA1mDAq9vxk4e4gVcb/8agq73NkQ==
+web-push@3.6.7:
+  version "3.6.7"
+  resolved "https://registry.yarnpkg.com/web-push/-/web-push-3.6.7.tgz#5f5e645951153e37ef90a6ddea5c150ea0f709e1"
+  integrity sha512-OpiIUe8cuGjrj3mMBFWY+e4MMIkW3SVT+7vEIjvD9kejGUypv8GPDf84JdPWskK8zMRIJ6xYGm+Kxr8YkPyA0A==
   dependencies:
     asn1.js "^5.3.0"
-    http_ece "1.1.0"
+    http_ece "1.2.0"
     https-proxy-agent "^7.0.0"
     jws "^4.0.0"
     minimist "^1.2.5"
@@ -8884,12 +8904,12 @@ winston-transport@^4.9.0:
     triple-beam "^1.3.0"
 
 winston@^3.3.3:
-  version "3.17.0"
-  resolved "https://registry.yarnpkg.com/winston/-/winston-3.17.0.tgz#74b8665ce9b4ea7b29d0922cfccf852a08a11423"
-  integrity sha512-DLiFIXYC5fMPxaRg832S6F5mJYvePtmO5G9v9IgUFPhXm9/GkXarH/TUrBAVzhTCzAj9anE/+GjrgXp/54nOgw==
+  version "3.18.3"
+  resolved "https://registry.yarnpkg.com/winston/-/winston-3.18.3.tgz#93ac10808c8e1081d723bc8811cd2f445ddfdcd1"
+  integrity sha512-NoBZauFNNWENgsnC9YpgyYwOVrl2m58PpQ8lNHjV3kosGs7KJ7Npk9pCUE+WJlawVSe8mykWDKWFSVfs3QO9ww==
   dependencies:
     "@colors/colors" "^1.6.0"
-    "@dabh/diagnostics" "^2.0.2"
+    "@dabh/diagnostics" "^2.0.8"
     async "^3.2.3"
     is-stream "^2.0.0"
     logform "^2.7.0"
@@ -8910,6 +8930,34 @@ wordwrap@~0.0.2:
   resolved "https://registry.yarnpkg.com/wordwrap/-/wordwrap-0.0.3.tgz#a3d5da6cd5c0bc0008d37234bbaf1bed63059107"
   integrity sha512-1tMA907+V4QmxV7dbRvb4/8MaRALK6q9Abid3ndMYnbyo8piisCmeONVqVSXqQA3KaP4SLt5b7ud6E2sqP8TFw==
 
+worker-timers-broker@^6.1.8:
+  version "6.1.8"
+  resolved "https://registry.yarnpkg.com/worker-timers-broker/-/worker-timers-broker-6.1.8.tgz#08f64e5931b77fadc55f0c7388c077a7dd17e4c7"
+  integrity sha512-FUCJu9jlK3A8WqLTKXM9E6kAmI/dR1vAJ8dHYLMisLNB/n3GuaFIjJ7pn16ZcD1zCOf7P6H62lWIEBi+yz/zQQ==
+  dependencies:
+    "@babel/runtime" "^7.24.5"
+    fast-unique-numbers "^8.0.13"
+    tslib "^2.6.2"
+    worker-timers-worker "^7.0.71"
+
+worker-timers-worker@^7.0.71:
+  version "7.0.71"
+  resolved "https://registry.yarnpkg.com/worker-timers-worker/-/worker-timers-worker-7.0.71.tgz#f96138bafbcfaabea116603ce23956e05e76db6a"
+  integrity sha512-ks/5YKwZsto1c2vmljroppOKCivB/ma97g9y77MAAz2TBBjPPgpoOiS1qYQKIgvGTr2QYPT3XhJWIB6Rj2MVPQ==
+  dependencies:
+    "@babel/runtime" "^7.24.5"
+    tslib "^2.6.2"
+
+worker-timers@^7.0.75:
+  version "7.1.8"
+  resolved "https://registry.yarnpkg.com/worker-timers/-/worker-timers-7.1.8.tgz#f53072c396ac4264fd3027914f4ab793c92d90be"
+  integrity sha512-R54psRKYVLuzff7c1OTFcq/4Hue5Vlz4bFtNEIarpSiCYhpifHU3aIQI29S84o1j87ePCYqbmEJPqwBTf+3sfw==
+  dependencies:
+    "@babel/runtime" "^7.24.5"
+    tslib "^2.6.2"
+    worker-timers-broker "^6.1.8"
+    worker-timers-worker "^7.0.71"
+
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
   resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
@@ -8969,21 +9017,16 @@ write-file-atomic@^2.4.2:
     imurmurhash "^0.1.4"
     signal-exit "^3.0.2"
 
-ws@8.18.0:
-  version "8.18.0"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.0.tgz#0d7505a6eafe2b0e712d232b42279f53bc289bbc"
-  integrity sha512-8VbfWfHLbbwu3+N6OKsOMpBdT4kXPDDB9cJk2bJ6mh9ucxdlnNvH1e+roYkKmN9Nxw2yjz7VzeO9oOz2zJ04Pw==
+ws@8.18.3, ws@^8.13.0, ws@^8.18.0, ws@^8.9.0:
+  version "8.18.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472"
+  integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==
 
 ws@^7.4.6:
   version "7.5.10"
   resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.10.tgz#58b5c20dc281633f6c19113f39b349bd8bd558d9"
   integrity sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==
 
-ws@^8.13.0, ws@^8.18.0, ws@^8.9.0:
-  version "8.18.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472"
-  integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg==
-
 xml-crypto@^2.1.3:
   version "2.1.6"
   resolved "https://registry.yarnpkg.com/xml-crypto/-/xml-crypto-2.1.6.tgz#c51a016cc8391fc1d9ebd9abc589e4c08b62d652"

From ded5cbebe1ccc4ad2831c896df7f8ef3063c15f9 Mon Sep 17 00:00:00 2001
From: Sam Estep <sam@samestep.com>
Date: Fri, 24 Oct 2025 10:04:14 -0400
Subject: [PATCH 2392/6226] libsForQt5.qtcurve: fix build with cmake 4

---
 pkgs/data/themes/qtcurve/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/data/themes/qtcurve/default.nix b/pkgs/data/themes/qtcurve/default.nix
index 9339cdbf3380..2265c3550aed 100644
--- a/pkgs/data/themes/qtcurve/default.nix
+++ b/pkgs/data/themes/qtcurve/default.nix
@@ -39,6 +39,11 @@ mkDerivation rec {
   };
 
   patches = [
+    # Fix build with CMake 4
+    (fetchpatch {
+      url = "https://github.com/KDE/qtcurve/commit/d2c84577505641e647fbb64bce825b3e0a4129f5.patch";
+      sha256 = "sha256-WBmzlVDxRNXZmi6c03cR1MuIr+hBaeFXgNLzhsv0bZo=";
+    })
     # Remove unnecessary constexpr, this is not allowed in C++14
     (fetchpatch {
       url = "https://github.com/KDE/qtcurve/commit/ee2228ea2f18ac5da9b434ee6089381df815aa94.patch";

From 112f4ba4f3d7f96567ea710531e12a7e62652f38 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 24 Oct 2025 14:12:35 +0000
Subject: [PATCH 2393/6226] python3Packages.ufmt: cleanup

---
 .../python-modules/ufmt/default.nix           | 30 ++++++++++++-------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/ufmt/default.nix b/pkgs/development/python-modules/ufmt/default.nix
index 7f55664ad786..91e01ec1beff 100644
--- a/pkgs/development/python-modules/ufmt/default.nix
+++ b/pkgs/development/python-modules/ufmt/default.nix
@@ -1,20 +1,28 @@
 {
   lib,
-  black,
   buildPythonPackage,
-  click,
   fetchFromGitHub,
+
+  # build-system
   flit-core,
+
+  # dependencies
+  black,
+  click,
   libcst,
   moreorless,
-  pygls,
-  pythonOlder,
   tomlkit,
   trailrunner,
-  ruff-api,
   typing-extensions,
-  unittestCheckHook,
   usort,
+
+  # optional-dependencies
+  pygls,
+  ruff-api,
+
+  # tests
+  unittestCheckHook,
+  versionCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -22,8 +30,6 @@ buildPythonPackage rec {
   version = "2.8.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "omnilib";
     repo = "ufmt";
@@ -51,17 +57,19 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     unittestCheckHook
+    versionCheckHook
   ]
   ++ lib.flatten (builtins.attrValues optional-dependencies);
+  versionCheckProgramArg = "--version";
 
   pythonImportsCheck = [ "ufmt" ];
 
-  meta = with lib; {
+  meta = {
     description = "Safe, atomic formatting with black and usort";
     homepage = "https://github.com/omnilib/ufmt";
     changelog = "https://github.com/omnilib/ufmt/blob/${version}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "ufmt";
   };
 }

From 644dcf5ebb3b7d4c56d698abd32cf170271fe78d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 24 Oct 2025 14:13:15 +0000
Subject: [PATCH 2394/6226] python3Packages.ufmt: skip tests broken by click
 update

https://github.com/NixOS/nixpkgs/pull/448189
---
 pkgs/development/python-modules/ufmt/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/ufmt/default.nix b/pkgs/development/python-modules/ufmt/default.nix
index 91e01ec1beff..2b1e370f697d 100644
--- a/pkgs/development/python-modules/ufmt/default.nix
+++ b/pkgs/development/python-modules/ufmt/default.nix
@@ -37,6 +37,13 @@ buildPythonPackage rec {
     hash = "sha256-oEvvXUju7qne3pCwnrckplMs0kBJavB669qieXJZPKw=";
   };
 
+  # Broken since click was updated to 8.2.1 in https://github.com/NixOS/nixpkgs/pull/448189
+  # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr'
+  postPatch = ''
+    substituteInPlace ufmt/tests/__init__.py \
+      --replace-fail "from .cli import CliTest" ""
+  '';
+
   build-system = [ flit-core ];
 
   dependencies = [

From 4657098de0563da6de7b518f20a5c877094b35c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 14:22:37 +0000
Subject: [PATCH 2395/6226] enzyme: 0.0.203 -> 0.0.204

---
 pkgs/by-name/en/enzyme/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix
index 9a980e79477b..8ee122dc321b 100644
--- a/pkgs/by-name/en/enzyme/package.nix
+++ b/pkgs/by-name/en/enzyme/package.nix
@@ -7,13 +7,13 @@
 }:
 llvmPackages.stdenv.mkDerivation rec {
   pname = "enzyme";
-  version = "0.0.203";
+  version = "0.0.204";
 
   src = fetchFromGitHub {
     owner = "EnzymeAD";
     repo = "Enzyme";
     rev = "v${version}";
-    hash = "sha256-PfV50pGDGWx4Ih8x8V0ib+Oti71oH90ODepiDN+q4tU=";
+    hash = "sha256-s5gddwMq2S4m+OtX9FHWqHTa8GaVXQm+08qRI+dGENA=";
   };
 
   postPatch = ''

From c0827891b518608d3696e90560d764f9a27ef1b0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 14:28:19 +0000
Subject: [PATCH 2396/6226] python3Packages.meilisearch: 0.37.0 -> 0.37.1

---
 pkgs/development/python-modules/meilisearch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix
index c51821ed6ec2..f016298f35ea 100644
--- a/pkgs/development/python-modules/meilisearch/default.nix
+++ b/pkgs/development/python-modules/meilisearch/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "meilisearch";
-  version = "0.37.0";
+  version = "0.37.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "meilisearch";
     repo = "meilisearch-python";
     tag = "v${version}";
-    hash = "sha256-KKJ93WvkbQEtyRgROT3uGShLSwOaKrOpPDNyMJLqQ4M=";
+    hash = "sha256-yPZs8PIwrb4LhaEGX3vLvTJwo6Rb9zbChtq1Wbgh9cw=";
   };
 
   build-system = [ setuptools ];

From 99271ca28ef55a79b305722737a71054ca43f263 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 24 Oct 2025 14:04:55 +0000
Subject: [PATCH 2397/6226] python3Packages.scikit-bio: cleanup

---
 .../python-modules/scikit-bio/default.nix     | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix
index ef4e4ed9719b..10e635b53b65 100644
--- a/pkgs/development/python-modules/scikit-bio/default.nix
+++ b/pkgs/development/python-modules/scikit-bio/default.nix
@@ -3,24 +3,27 @@
   buildPythonPackage,
   fetchFromGitHub,
 
+  # build-system
   setuptools,
   cython,
   oldest-supported-numpy,
 
-  requests,
+  # dependencies
+  array-api-compat,
+  biom-format,
   decorator,
+  h5py,
   natsort,
   numpy,
   pandas,
-  scipy,
-  h5py,
-  biom-format,
-  statsmodels,
   patsy,
-  array-api-compat,
+  requests,
+  scipy,
+  statsmodels,
 
-  python,
+  # tests
   pytestCheckHook,
+  python,
 }:
 
 buildPythonPackage rec {
@@ -42,20 +45,22 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
-    requests
+    array-api-compat
+    biom-format
     decorator
+    h5py
     natsort
     numpy
     pandas
-    scipy
-    h5py
-    biom-format
-    statsmodels
     patsy
-    array-api-compat
+    requests
+    scipy
+    statsmodels
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   # only the $out dir contains the built cython extensions, so we run the tests inside there
   enabledTestPaths = [ "${placeholder "out"}/${python.sitePackages}/skbio" ];
@@ -63,8 +68,10 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "skbio" ];
 
   meta = {
-    homepage = "http://scikit-bio.org/";
     description = "Data structures, algorithms and educational resources for bioinformatics";
+    homepage = "http://scikit-bio.org/";
+    downloadPage = "https://github.com/scikit-bio/scikit-bio";
+    changelog = "https://github.com/scikit-bio/scikit-bio/blob/${version}/CHANGELOG.md";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ tomasajt ];
   };

From 0d8c133ee49b412cf73cab7cda8124af49896729 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 24 Oct 2025 14:29:59 +0000
Subject: [PATCH 2398/6226] python3Packages.scikit-bio: disable tests on darwin

---
 pkgs/development/python-modules/scikit-bio/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/scikit-bio/default.nix b/pkgs/development/python-modules/scikit-bio/default.nix
index 10e635b53b65..151ae1f21f42 100644
--- a/pkgs/development/python-modules/scikit-bio/default.nix
+++ b/pkgs/development/python-modules/scikit-bio/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -65,6 +66,10 @@ buildPythonPackage rec {
   # only the $out dir contains the built cython extensions, so we run the tests inside there
   enabledTestPaths = [ "${placeholder "out"}/${python.sitePackages}/skbio" ];
 
+  # The trick above makes test collection fail on darwin:
+  # PermissionError: [Errno 1] Operation not permitted: '/nix/.Trashes'
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
   pythonImportsCheck = [ "skbio" ];
 
   meta = {

From ca546889125a63710d3d6684633870553aaed26c Mon Sep 17 00:00:00 2001
From: Tomas Harkema <tomas@harkema.io>
Date: Sun, 5 Jan 2025 23:22:28 +0100
Subject: [PATCH 2399/6226] udisk2: build with btrfs and lvm2

---
 pkgs/os-specific/linux/udisks/2-default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index 76f8d5ae7eb4..e3b9ea635d73 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -36,6 +36,8 @@
   ntfs3g,
   nixosTests,
   udevCheckHook,
+  libiscsi,
+  libconfig,
 }:
 
 stdenv.mkDerivation rec {
@@ -114,6 +116,8 @@ stdenv.mkDerivation rec {
     libatasmart
     polkit
     util-linux
+    libiscsi
+    libconfig
   ];
 
   preConfigure = "NOCONFIGURE=1 ./autogen.sh";
@@ -125,6 +129,10 @@ stdenv.mkDerivation rec {
     "--with-systemdsystemunitdir=$(out)/etc/systemd/system"
     "--with-udevdir=$(out)/lib/udev"
     "--with-tmpfilesdir=no"
+    "--enable-all-modules"
+    "--enable-btrfs"
+    "--enable-lvm2"
+    "--enable-smart"
   ];
 
   makeFlags = [

From 7f88e745c9896495dfa543f8336d8aadad2249e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 14:51:38 +0000
Subject: [PATCH 2400/6226] fzf-git-sh: 0-unstable-2025-10-12 ->
 0-unstable-2025-10-21

---
 pkgs/by-name/fz/fzf-git-sh/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fz/fzf-git-sh/package.nix b/pkgs/by-name/fz/fzf-git-sh/package.nix
index d09f9670debe..3395c14ed862 100644
--- a/pkgs/by-name/fz/fzf-git-sh/package.nix
+++ b/pkgs/by-name/fz/fzf-git-sh/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fzf-git-sh";
-  version = "0-unstable-2025-10-12";
+  version = "0-unstable-2025-10-21";
 
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = "fzf-git.sh";
-    rev = "279050e2eba5b9f4c5b057ca7dbc7e02e67315a1";
-    hash = "sha256-l7xVch0YYFSGuz9CFAr9lWqsbFeq+jcjyzN7XovRKFc=";
+    rev = "c823ffd521cb4a3a65a5cf87f1b1104ef651c3de";
+    hash = "sha256-G5b6s3p4Lrh2YQyBKE3Lzh78USR1tKlR/YqTMr3mXsI=";
   };
 
   dontBuild = true;

From 27413a10fe147777f250d34c50080c88d5777061 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Fri, 24 Oct 2025 11:15:32 +0200
Subject: [PATCH 2401/6226] ocamlPackages.http-mirage-client: fix test on
 darwin, migrate source

---
 .../ocaml-modules/http-mirage-client/default.nix     | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/ocaml-modules/http-mirage-client/default.nix b/pkgs/development/ocaml-modules/http-mirage-client/default.nix
index 58f9852e8c86..4689be5ce7f0 100644
--- a/pkgs/development/ocaml-modules/http-mirage-client/default.nix
+++ b/pkgs/development/ocaml-modules/http-mirage-client/default.nix
@@ -12,14 +12,16 @@
   mirage-crypto-rng,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "http-mirage-client";
   version = "0.0.10";
 
   minimalOCamlVersion = "4.08";
 
+  __darwinAllowLocalNetworking = true;
+
   src = fetchurl {
-    url = "https://github.com/roburio/http-mirage-client/releases/download/v${version}/http-mirage-client-${version}.tbz";
+    url = "https://github.com/robur-coop/http-mirage-client/releases/download/v${finalAttrs.version}/http-mirage-client-${finalAttrs.version}.tbz";
     hash = "sha256-AXEIH1TIAayD4LkFv0yGD8OYvcdC/AJnGudGlkjcWLY=";
   };
 
@@ -40,9 +42,9 @@ buildDunePackage rec {
 
   meta = {
     description = "HTTP client for MirageOS";
-    homepage = "https://github.com/roburio/http-mirage-client";
+    homepage = "https://github.com/robur-coop/http-mirage-client";
+    changelog = "https://github.com/robur-coop/http-mirage-client/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.vbgl ];
   };
-
-}
+})

From 355a7677bac897ce575f89364db8333e6c9bc366 Mon Sep 17 00:00:00 2001
From: "git@71rd.net" <git@71rd.net>
Date: Thu, 25 Sep 2025 23:35:34 +0000
Subject: [PATCH 2402/6226] chickenPackages_5.chickenEggs.botan: mark broken

Mark the chicken-scheme bindings for botan as broken.
The package only supports the botan2 library that has been deprecated
and is being removed
---
 pkgs/development/compilers/chicken/5/overrides.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix
index 861c47348091..5ea7a8bd71e6 100644
--- a/pkgs/development/compilers/chicken/5/overrides.nix
+++ b/pkgs/development/compilers/chicken/5/overrides.nix
@@ -31,7 +31,7 @@ in
   breadline = addToBuildInputs pkgs.readline;
   blas = addToBuildInputsWithPkgConfig pkgs.blas;
   blosc = addToBuildInputs pkgs.c-blosc;
-  botan = addToBuildInputsWithPkgConfig pkgs.botan2;
+  botan = broken;
   cairo =
     old:
     (addToBuildInputsWithPkgConfig pkgs.cairo old)

From 0a6777c2a1f9fa0a7ee0bc24f8742ad04ceb3509 Mon Sep 17 00:00:00 2001
From: "git@71rd.net" <git@71rd.net>
Date: Thu, 25 Sep 2025 23:24:14 +0000
Subject: [PATCH 2403/6226] botan2: remove

Removing botan2 from nixpkgs.
Botan2 has been end-of-life since 2025-01-01 and was replaced with Botan3.

Fixes: #445861
---
 pkgs/development/libraries/botan/default.nix | 18 ++----------------
 pkgs/top-level/aliases.nix                   |  1 +
 pkgs/top-level/all-packages.nix              |  1 -
 3 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
index 9cfa9570b7f9..03f0f0918412 100644
--- a/pkgs/development/libraries/botan/default.nix
+++ b/pkgs/development/libraries/botan/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  fetchpatch,
   fetchurl,
   pkgsStatic,
   python3,
@@ -146,7 +145,7 @@ let
 
       doCheck = true;
 
-      passthru.tests = lib.optionalAttrs (lib.versionAtLeast version "3") {
+      passthru.tests = {
         static = pkgsStatic.botan3;
       };
 
@@ -159,7 +158,7 @@ let
           thillux
           nikstur
         ];
-        platforms = platforms.unix ++ lib.optionals (lib.versionAtLeast version "3.0") platforms.windows;
+        platforms = platforms.unix ++ platforms.windows;
         license = licenses.bsd2;
       };
     });
@@ -169,17 +168,4 @@ in
     version = "3.9.0";
     hash = "sha256-jD8oS1jd1C6OQ+n6hqcSnYfqfD93aoDT2mPsIHIrCIM=";
   };
-
-  botan2 = common {
-    version = "2.19.5";
-    hash = "sha256-3+6g4KbybWckxK8B2pp7iEh62y2Bunxy/K9S21IsmtQ=";
-    patches = [
-      # Fix build with gcc15
-      (fetchpatch {
-        name = "botan2-add-include-cstdint-gcc15.patch";
-        url = "https://src.fedoraproject.org/rpms/botan2/raw/c3fb7a3800df117e7ef8a7617ac8eacb31a4464a/f/f765f0b312f2998498f629d93369babfb2c975b4.patch";
-        hash = "sha256-8Yhxd5TCgxUMtRiv3iq5sQaVjDF+b9slppm38/6l6lw=";
-      })
-    ];
-  };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dc6dc101c845..cf220f6995a7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -563,6 +563,7 @@ mapAliases {
   boost184 = throw "Boost 1.84 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24
   boost185 = throw "Boost 1.85 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24
   boost_process = throw "boost_process has been removed as it is included in regular boost"; # Added 2024-05-01
+  botan2 = throw "botan2 has been removed as it is EOL"; # Added 2025-10-20
   bower2nix = throw "bower2nix has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
   bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30
   bpftool = throw "'bpftool' has been renamed to/replaced by 'bpftools'"; # Converted to throw 2024-10-17
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a65617f48b5d..860d0312cc45 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7012,7 +7012,6 @@ with pkgs;
       # botan3 only sensibly works with libcxxStdenv when building static binaries
       stdenv = if stdenv.hostPlatform.isStatic then buildPackages.libcxxStdenv else stdenv;
     })
-    botan2
     botan3
     ;
   botanEsdm = botan3.override { withEsdm = true; };

From 35548a7fc32464466a29aaf232c2cf86d9fd3112 Mon Sep 17 00:00:00 2001
From: jkachmar <j@mercury.com>
Date: Thu, 23 Oct 2025 17:38:32 -0400
Subject: [PATCH 2404/6226] honeycomb-refinery: 1.19.0 -> 3.0.0

---
 ...T-env-var-that-disables-Redis-requir.patch | 39 +++++++------------
 .../by-name/ho/honeycomb-refinery/package.nix | 34 ++++++++++------
 2 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/pkgs/by-name/ho/honeycomb-refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch b/pkgs/by-name/ho/honeycomb-refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch
index 301f549138e1..71dbff392aa5 100644
--- a/pkgs/by-name/ho/honeycomb-refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch
+++ b/pkgs/by-name/ho/honeycomb-refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch
@@ -1,37 +1,24 @@
-From 301de689a1f7fae8ee6d0d5bbbe155a351b1b927 Mon Sep 17 00:00:00 2001
-From: Jade Lovelace <jadel@mercury.com>
-Date: Wed, 9 Nov 2022 11:02:02 -0800
-Subject: [PATCH] add NO_REDIS_TEST env-var that disables Redis-requiring tests
+From f2d2d869a4aa58430415d0969f5e80ece0142ad2 Mon Sep 17 00:00:00 2001
+From: jkachmar <j@mercury.com>
+Date: Thu, 23 Oct 2025 17:36:48 -0400
+Subject: [PATCH] disable tests that require redis
 
 ---
- internal/peer/peers_test.go | 7 +++++++
- 1 file changed, 7 insertions(+)
+ internal/peer/peers_test.go | 4 ++++
+ 1 file changed, 4 insertions(+), 0 deletions(-)
 
 diff --git a/internal/peer/peers_test.go b/internal/peer/peers_test.go
-index 5ec7f81..c64b1b4 100644
+index dae54067d8..b33ebc4979 100644
 --- a/internal/peer/peers_test.go
 +++ b/internal/peer/peers_test.go
-@@ -2,6 +2,7 @@ package peer
+@@ -86,6 +86,10 @@
+ }
  
- import (
- 	"context"
-+	"os"
- 	"testing"
- 	"time"
- 
-@@ -26,6 +27,12 @@ func TestNewPeers(t *testing.T) {
- 		t.Errorf("received %T expected %T", i, &filePeers{})
- 	}
- 
-+	// Allow skipping test requiring redis, since Nix builds without redis
-+	// available
+ func TestPeerShutdown(t *testing.T) {
++	// Skip tests requiring Redis so that nixpkgs can build & test refinery.
 +	if os.Getenv("NO_REDIS_TEST") != "" {
-+		t.Skip("Skipping redis-requiring test");
++		t.Skip("Skipping Redis-requiring test");
 +	}
-+
- 	c = &config.MockConfig{
+ 	c := &config.MockConfig{
  		GetPeerListenAddrVal: "0.0.0.0:8081",
  		PeerManagementType:   "redis",
--- 
-2.37.1
-
diff --git a/pkgs/by-name/ho/honeycomb-refinery/package.nix b/pkgs/by-name/ho/honeycomb-refinery/package.nix
index 690636870e80..38bad5f83538 100644
--- a/pkgs/by-name/ho/honeycomb-refinery/package.nix
+++ b/pkgs/by-name/ho/honeycomb-refinery/package.nix
@@ -2,17 +2,19 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "honeycomb-refinery";
-  version = "1.19.0";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "honeycombio";
     repo = "refinery";
-    rev = "v${version}";
-    hash = "sha256-SU9JbyUuBMqPw4XcoF5s8CgBn7+V/rHBAwpXJk373jg=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-jt8aEqglGXzBL5UDOz8e7qRDmE3RnMb2y+eLFI9jJSE=";
   };
 
   NO_REDIS_TEST = true;
@@ -24,23 +26,33 @@ buildGoModule rec {
     ./0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch
   ];
 
-  excludedPackages = [ "cmd/test_redimem" ];
+  excludedPackages = [
+    "LICENSES"
+    "cmd/test_redimem"
+  ];
 
   ldflags = [
     "-s"
     "-w"
-    "-X main.BuildID=${version}"
+    "-X main.BuildID=${finalAttrs.version}"
   ];
 
-  vendorHash = "sha256-0M05JGLdmKivRTN8ZdhAm+JtXTlYAC31wFS82g3NenI=";
+  vendorHash = "sha256-/1IT3GxKANBltetRKxP/jUG05GGbg9mc7aWEcbrwUT0=";
 
   doCheck = true;
 
-  meta = with lib; {
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgram = "${placeholder "out"}/bin/${finalAttrs.meta.mainProgram}";
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     homepage = "https://github.com/honeycombio/refinery";
     description = "Tail-sampling proxy for OpenTelemetry";
-    license = licenses.asl20;
-    maintainers = [ ];
     mainProgram = "refinery";
+    license = lib.licenses.asl20;
+    teams = [ lib.teams.mercury ];
   };
-}
+})

From a0587707298dfa41ed78fafa85dbcc0acfaffa55 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 15:00:11 +0000
Subject: [PATCH 2405/6226] clouddrive2: 0.9.10 -> 0.9.11

---
 pkgs/by-name/cl/clouddrive2/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix
index b13edb43edf6..549f05163c0a 100644
--- a/pkgs/by-name/cl/clouddrive2/package.nix
+++ b/pkgs/by-name/cl/clouddrive2/package.nix
@@ -11,16 +11,16 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "clouddrive2";
-  version = "0.9.10";
+  version = "0.9.11";
 
   src = fetchurl {
     url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";
     hash =
       {
-        x86_64-linux = "sha256-moj3gSrnkBcsZ9GrvsJBvwW0tB1Yyg7iRXd9SsXaRYY=";
-        aarch64-linux = "sha256-v4YJKoTS/KRec3mqZdDTtAuPb6HI1G4c/rQoLan59KE=";
-        x86_64-darwin = "sha256-93zuCvQE2sQDFwK3nmRELa5EGosAcY4D0E5yqREVXOY=";
-        aarch64-darwin = "sha256-5FvpzSbql92QrTr24yxcCi1t9uDTfgqamEZq7VWx618=";
+        x86_64-linux = "sha256-mj/GuC7au36ku+obmSBU6w8mj0lNHBYVHYQoljwIsY4=";
+        aarch64-linux = "sha256-stYjbqYb4aKEdxvcRS1r96B43V5ZBWsOlXnMueqqRz4=";
+        x86_64-darwin = "sha256-nWLhMgBaR4LdUiN6hoL/ZIYAAaQaPsyV44lAg0Femis=";
+        aarch64-darwin = "sha256-Ihe5XoAlDLWTjSD99mhZVz3PkLfgUKkxP6As3isX32U=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
   };

From ed3c48ad60185d56d9ae9dd2c9006e386263496d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 15:03:32 +0000
Subject: [PATCH 2406/6226] python3Packages.coinmetrics-api-client:
 2025.9.30.16 -> 2025.10.21.15

---
 .../python-modules/coinmetrics-api-client/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
index 752d3d28bc57..715f73172aa7 100644
--- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix
+++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "coinmetrics-api-client";
-  version = "2025.9.30.16";
+  version = "2025.10.21.15";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "coinmetrics_api_client";
-    hash = "sha256-PnFQGfGXwDzSwGuQiEOuFsYVpSQnZE+w+2BWQ2SkxX0=";
+    hash = "sha256-OtC6Sy32faZAZqMVUure4RmPj2LCe4Ifwy+5xmZ0g8U=";
   };
 
   pythonRelaxDeps = [ "typer" ];

From cc2a0b5e4fb8c3f4a54a2d300d3042bd6c149f6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 15:06:19 +0000
Subject: [PATCH 2407/6226] python3Packages.langfuse: 3.7.0 -> 3.8.1

---
 pkgs/development/python-modules/langfuse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langfuse/default.nix b/pkgs/development/python-modules/langfuse/default.nix
index f8f9bb0c89c1..8719249383e2 100644
--- a/pkgs/development/python-modules/langfuse/default.nix
+++ b/pkgs/development/python-modules/langfuse/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "langfuse";
-  version = "3.7.0";
+  version = "3.8.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langfuse";
     repo = "langfuse-python";
     tag = "v${version}";
-    hash = "sha256-eq6uOb4C3Kbdi+I6Fcl0qWgey57BmrATqzvtDLjDMnw=";
+    hash = "sha256-HXg7p3yfRXK13FLxkfCaKxZxDkXX8Y274ZVKL17Zj0A=";
   };
 
   build-system = [ poetry-core ];

From 255e1c3cb99de0ed78a9e2de00975c9503a80eae Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Fri, 24 Oct 2025 17:10:15 +0200
Subject: [PATCH 2408/6226] nixos/tests/nextcloud: fix eval

---
 nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix | 1 -
 nixos/tests/nextcloud/with-postgresql-and-redis.nix          | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix b/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix
index fd02a0c1d3b3..336cdbc3db84 100644
--- a/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix
+++ b/nixos/tests/nextcloud/with-declarative-redis-and-secrets.nix
@@ -35,7 +35,6 @@ runTest (
               logLevel = "debug";
             };
             extraAppsEnable = true;
-            extraApps.notify_push = config.services.nextcloud.package.packages.apps.notify_push;
             # This test also validates that we can use an "external" database
             database.createLocally = false;
             config = {
diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
index 3a6b73bfe4e9..ed4eea689fd0 100644
--- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix
+++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix
@@ -39,7 +39,7 @@ runTest (
             };
             extraAppsEnable = true;
             extraApps = with config.services.nextcloud.package.packages.apps; {
-              inherit notify_push notes;
+              inherit notes;
             };
             settings.trusted_proxies = [ "::1" ];
           };

From 2025aff9cecb628608ada9f336ed668d30dd5caf Mon Sep 17 00:00:00 2001
From: Shogo Takata <shogo-takata@st.go.tuat.ac.jp>
Date: Fri, 24 Oct 2025 08:09:13 -0700
Subject: [PATCH 2409/6226] btrfs-assistant: fix build failure

Apply patch to disable -Werror.
---
 pkgs/by-name/bt/btrfs-assistant/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/bt/btrfs-assistant/package.nix b/pkgs/by-name/bt/btrfs-assistant/package.nix
index 08b6df49b264..64be27f6899b 100644
--- a/pkgs/by-name/bt/btrfs-assistant/package.nix
+++ b/pkgs/by-name/bt/btrfs-assistant/package.nix
@@ -12,6 +12,7 @@
   util-linux,
   enableSnapper ? true,
   nix-update-script,
+  fetchpatch,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,6 +26,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-hFWYT+YIgnqBigpPkGdsLj6rcg4CjJffAyXlR23QP0Y=";
   };
 
+  patches = [
+    # Disable -Werror
+    # https://gitlab.com/btrfs-assistant/btrfs-assistant/-/issues/134
+    (fetchpatch {
+      url = "https://gitlab.com/btrfs-assistant/btrfs-assistant/-/commit/edc0a13bac5189a1a910f5adab01b2d5b60c76f6.diff";
+      hash = "sha256-kGyp5OaSGk4OvhtyNSygJEW+wAJksK8opxtLPbhA+10=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     git

From 98a16089ef58d31311fdc177fdf07189658b3fb8 Mon Sep 17 00:00:00 2001
From: "git@71rd.net" <git@71rd.net>
Date: Mon, 20 Oct 2025 14:08:05 +0000
Subject: [PATCH 2410/6226] botan3: move to by-name

---
 pkgs/by-name/bo/botan3/package.nix           | 165 ++++++++++++++++++
 pkgs/development/libraries/botan/default.nix | 171 -------------------
 pkgs/top-level/all-packages.nix              |   7 -
 3 files changed, 165 insertions(+), 178 deletions(-)
 create mode 100644 pkgs/by-name/bo/botan3/package.nix
 delete mode 100644 pkgs/development/libraries/botan/default.nix

diff --git a/pkgs/by-name/bo/botan3/package.nix b/pkgs/by-name/bo/botan3/package.nix
new file mode 100644
index 000000000000..7a52f1d1b89b
--- /dev/null
+++ b/pkgs/by-name/bo/botan3/package.nix
@@ -0,0 +1,165 @@
+{
+  lib,
+  stdenv,
+  buildPackages,
+  fetchurl,
+  pkgsStatic,
+  python3,
+  docutils,
+  bzip2,
+  zlib,
+  jitterentropy,
+  darwin,
+  esdm,
+  tpm2-tss,
+  static ? stdenv.hostPlatform.isStatic, # generates static libraries *only*
+  windows,
+
+  # build ESDM RNG plugin
+  withEsdm ? false,
+  # useful, but have to disable tests for now, as /dev/tpmrm0 is not accessible
+  withTpm2 ? false,
+  policy ? null,
+}:
+
+assert lib.assertOneOf "policy" policy [
+  # no explicit policy is given. The defaults by the library are used
+  null
+  # only allow BSI approved algorithms, FFI and SHAKE for XMSS
+  "bsi"
+  # only allow NIST approved algorithms in FIPS 140
+  "fips140"
+  # only allow "modern" algorithms
+  "modern"
+];
+
+let
+  stdenv' = if static then buildPackages.libxccStdenv else stdenv;
+in
+stdenv'.mkDerivation (finalAttrs: {
+  version = "3.9.0";
+  pname = "botan";
+
+  __structuredAttrs = true;
+  enableParallelBuilding = true;
+  strictDeps = true;
+
+  outputs = [
+    "bin"
+    "out"
+    "dev"
+    "doc"
+    "man"
+  ];
+
+  src = fetchurl {
+    url = "http://botan.randombit.net/releases/Botan-${finalAttrs.version}.tar.xz";
+    hash = "sha256-jD8oS1jd1C6OQ+n6hqcSnYfqfD93aoDT2mPsIHIrCIM=";
+  };
+
+  nativeBuildInputs = [
+    python3
+    docutils
+  ];
+
+  buildInputs = [
+    bzip2
+    zlib
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && withTpm2) [
+    tpm2-tss
+  ]
+  ++ lib.optionals (lib.versionAtLeast finalAttrs.version "3.6.0" && !stdenv.hostPlatform.isMinGW) [
+    jitterentropy
+  ]
+  ++
+    lib.optionals
+      (lib.versionAtLeast finalAttrs.version "3.7.0" && withEsdm && !stdenv.hostPlatform.isMinGW)
+      [
+        esdm
+      ]
+  ++ lib.optionals (stdenv.hostPlatform.isMinGW) [
+    windows.pthreads
+  ];
+
+  buildTargets = [
+    "cli"
+  ]
+  ++ lib.optionals finalAttrs.finalPackage.doCheck [ "tests" ]
+  ++ lib.optionals static [ "static" ]
+  ++ lib.optionals (!static) [ "shared" ];
+
+  botanConfigureFlags = [
+    "--prefix=${placeholder "out"}"
+    "--bindir=${placeholder "bin"}/bin"
+    "--docdir=${placeholder "doc"}/share/doc"
+    "--mandir=${placeholder "man"}/share/man"
+    "--no-install-python-module"
+    "--build-targets=${lib.concatStringsSep "," finalAttrs.buildTargets}"
+    "--with-bzip2"
+    "--with-zlib"
+    "--with-rst2man"
+    "--cpu=${stdenv.hostPlatform.parsed.cpu.name}"
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    "--cc=clang"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && withTpm2) [
+    "--with-tpm2"
+  ]
+  ++ lib.optionals (lib.versionAtLeast finalAttrs.version "3.6.0" && !stdenv.hostPlatform.isMinGW) [
+    "--enable-modules=jitter_rng"
+  ]
+  ++
+    lib.optionals
+      (lib.versionAtLeast finalAttrs.version "3.7.0" && withEsdm && !stdenv.hostPlatform.isMinGW)
+      [
+        "--enable-modules=esdm_rng"
+      ]
+  ++ lib.optionals (lib.versionAtLeast finalAttrs.version "3.8.0" && policy != null) [
+    "--module-policy=${policy}"
+  ]
+  ++ lib.optionals (lib.versionAtLeast finalAttrs.version "3.8.0" && policy == "bsi") [
+    "--enable-module=ffi"
+    "--enable-module=shake"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isMinGW) [
+    "--os=mingw"
+  ];
+
+  configurePhase = ''
+    runHook preConfigure
+    python configure.py ''${botanConfigureFlags[@]}
+    runHook postConfigure
+  '';
+
+  preInstall = ''
+    if [ -d src/scripts ]; then
+      patchShebangs src/scripts
+    fi
+  '';
+
+  postInstall = ''
+    cd "$out"/lib/pkgconfig
+    ln -s botan-*.pc botan.pc || true
+  '';
+
+  doCheck = true;
+
+  passthru.tests = {
+    static = pkgsStatic.botan3;
+  };
+
+  meta = with lib; {
+    description = "Cryptographic algorithms library";
+    homepage = "https://botan.randombit.net";
+    mainProgram = "botan";
+    maintainers = with maintainers; [
+      raskin
+      thillux
+      nikstur
+    ];
+    platforms = platforms.unix ++ platforms.windows;
+    license = licenses.bsd2;
+  };
+})
diff --git a/pkgs/development/libraries/botan/default.nix b/pkgs/development/libraries/botan/default.nix
deleted file mode 100644
index 03f0f0918412..000000000000
--- a/pkgs/development/libraries/botan/default.nix
+++ /dev/null
@@ -1,171 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pkgsStatic,
-  python3,
-  docutils,
-  bzip2,
-  zlib,
-  jitterentropy,
-  darwin,
-  esdm,
-  tpm2-tss,
-  static ? stdenv.hostPlatform.isStatic, # generates static libraries *only*
-  windows,
-
-  # build ESDM RNG plugin
-  withEsdm ? false,
-  # useful, but have to disable tests for now, as /dev/tpmrm0 is not accessible
-  withTpm2 ? false,
-  policy ? null,
-}:
-
-assert lib.assertOneOf "policy" policy [
-  # no explicit policy is given. The defaults by the library are used
-  null
-  # only allow BSI approved algorithms, FFI and SHAKE for XMSS
-  "bsi"
-  # only allow NIST approved algorithms in FIPS 140
-  "fips140"
-  # only allow "modern" algorithms
-  "modern"
-];
-
-let
-  common =
-    {
-      version,
-      hash,
-      patches ? [ ],
-    }:
-    stdenv.mkDerivation (finalAttrs: {
-      pname = "botan";
-      inherit version;
-
-      __structuredAttrs = true;
-      enableParallelBuilding = true;
-      strictDeps = true;
-
-      outputs = [
-        "bin"
-        "out"
-        "dev"
-        "doc"
-        "man"
-      ];
-
-      src = fetchurl {
-        url = "http://botan.randombit.net/releases/Botan-${finalAttrs.version}.tar.xz";
-        inherit hash;
-      };
-
-      inherit patches;
-
-      nativeBuildInputs = [
-        python3
-        docutils
-      ];
-
-      buildInputs = [
-        bzip2
-        zlib
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isLinux && withTpm2) [
-        tpm2-tss
-      ]
-      ++ lib.optionals (lib.versionAtLeast version "3.6.0" && !stdenv.hostPlatform.isMinGW) [
-        jitterentropy
-      ]
-      ++ lib.optionals (lib.versionAtLeast version "3.7.0" && withEsdm && !stdenv.hostPlatform.isMinGW) [
-        esdm
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isMinGW) [
-        windows.pthreads
-      ];
-
-      buildTargets = [
-        "cli"
-      ]
-      ++ lib.optionals finalAttrs.finalPackage.doCheck [ "tests" ]
-      ++ lib.optionals static [ "static" ]
-      ++ lib.optionals (!static) [ "shared" ];
-
-      botanConfigureFlags = [
-        "--prefix=${placeholder "out"}"
-        "--bindir=${placeholder "bin"}/bin"
-        "--docdir=${placeholder "doc"}/share/doc"
-        "--mandir=${placeholder "man"}/share/man"
-        "--no-install-python-module"
-        "--build-targets=${lib.concatStringsSep "," finalAttrs.buildTargets}"
-        "--with-bzip2"
-        "--with-zlib"
-        "--with-rst2man"
-        "--cpu=${stdenv.hostPlatform.parsed.cpu.name}"
-      ]
-      ++ lib.optionals stdenv.cc.isClang [
-        "--cc=clang"
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isLinux && withTpm2) [
-        "--with-tpm2"
-      ]
-      ++ lib.optionals (lib.versionAtLeast version "3.6.0" && !stdenv.hostPlatform.isMinGW) [
-        "--enable-modules=jitter_rng"
-      ]
-      ++ lib.optionals (lib.versionAtLeast version "3.7.0" && withEsdm && !stdenv.hostPlatform.isMinGW) [
-        "--enable-modules=esdm_rng"
-      ]
-      ++ lib.optionals (lib.versionAtLeast version "3.8.0" && policy != null) [
-        "--module-policy=${policy}"
-      ]
-      ++ lib.optionals (lib.versionAtLeast version "3.8.0" && policy == "bsi") [
-        "--enable-module=ffi"
-        "--enable-module=shake"
-      ]
-      ++ lib.optionals (stdenv.hostPlatform.isMinGW) [
-        "--os=mingw"
-      ];
-
-      configurePhase = ''
-        runHook preConfigure
-        python configure.py ''${botanConfigureFlags[@]}
-        runHook postConfigure
-      '';
-
-      preInstall = ''
-        if [ -d src/scripts ]; then
-          patchShebangs src/scripts
-        fi
-      '';
-
-      postInstall = ''
-        cd "$out"/lib/pkgconfig
-        ln -s botan-*.pc botan.pc || true
-      '';
-
-      doCheck = true;
-
-      passthru.tests = {
-        static = pkgsStatic.botan3;
-      };
-
-      meta = with lib; {
-        description = "Cryptographic algorithms library";
-        homepage = "https://botan.randombit.net";
-        mainProgram = "botan";
-        maintainers = with maintainers; [
-          raskin
-          thillux
-          nikstur
-        ];
-        platforms = platforms.unix ++ platforms.windows;
-        license = licenses.bsd2;
-      };
-    });
-in
-{
-  botan3 = common {
-    version = "3.9.0";
-    hash = "sha256-jD8oS1jd1C6OQ+n6hqcSnYfqfD93aoDT2mPsIHIrCIM=";
-  };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 860d0312cc45..5882db3d8534 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7007,13 +7007,6 @@ with pkgs;
 
   boost = boost187;
 
-  inherit
-    (callPackages ../development/libraries/botan {
-      # botan3 only sensibly works with libcxxStdenv when building static binaries
-      stdenv = if stdenv.hostPlatform.isStatic then buildPackages.libcxxStdenv else stdenv;
-    })
-    botan3
-    ;
   botanEsdm = botan3.override { withEsdm = true; };
 
   c-ares = callPackage ../development/libraries/c-ares { };

From 032a192de6910eba9b12ed520ca9b7eaa2861264 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 24 Oct 2025 14:14:36 +0000
Subject: [PATCH 2411/6226] ufmt: move to by-name

---
 pkgs/by-name/uf/ufmt/package.nix | 1 +
 pkgs/top-level/all-packages.nix  | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/uf/ufmt/package.nix

diff --git a/pkgs/by-name/uf/ufmt/package.nix b/pkgs/by-name/uf/ufmt/package.nix
new file mode 100644
index 000000000000..6c1728c35114
--- /dev/null
+++ b/pkgs/by-name/uf/ufmt/package.nix
@@ -0,0 +1 @@
+{ python3Packages }: with python3Packages; toPythonApplication ufmt
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a65617f48b5d..01f43f329f73 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4204,8 +4204,6 @@ with pkgs;
     libjpeg_turbo = libjpeg_turbo.override { enableJava = true; };
   };
 
-  ufmt = with python3Packages; toPythonApplication ufmt;
-
   unbound-with-systemd = unbound.override {
     withSystemd = true;
   };

From ad8112717c29a7ca425fd8fefa467e822e1f1af3 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 24 Oct 2025 13:32:37 +0000
Subject: [PATCH 2412/6226] yamlfix: move to by-name

---
 pkgs/by-name/ya/yamlfix/package.nix | 1 +
 pkgs/top-level/all-packages.nix     | 2 --
 2 files changed, 1 insertion(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/ya/yamlfix/package.nix

diff --git a/pkgs/by-name/ya/yamlfix/package.nix b/pkgs/by-name/ya/yamlfix/package.nix
new file mode 100644
index 000000000000..a51f5ccde843
--- /dev/null
+++ b/pkgs/by-name/ya/yamlfix/package.nix
@@ -0,0 +1 @@
+{ python3Packages }: with python3Packages; toPythonApplication yamlfix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a65617f48b5d..248019a6b6e2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4307,8 +4307,6 @@ with pkgs;
     fixup_yarn_lock
     ;
 
-  yamlfix = with python3Packages; toPythonApplication yamlfix;
-
   yamllint = with python3Packages; toPythonApplication yamllint;
 
   # To expose more packages for Yi, override the extraPackages arg.

From 63abb2d7d7e2f2d3a470c1d7ed5ace124798731e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 15:25:12 +0000
Subject: [PATCH 2413/6226] python3Packages.uxsim: 1.10.1 -> 1.10.2

---
 pkgs/development/python-modules/uxsim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/uxsim/default.nix b/pkgs/development/python-modules/uxsim/default.nix
index 09509821cf59..3ee7edd3fd3c 100644
--- a/pkgs/development/python-modules/uxsim/default.nix
+++ b/pkgs/development/python-modules/uxsim/default.nix
@@ -18,14 +18,14 @@
 }:
 buildPythonPackage rec {
   pname = "uxsim";
-  version = "1.10.1";
+  version = "1.10.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "toruseo";
     repo = "UXsim";
     tag = "v${version}";
-    hash = "sha256-yKXlu78E2zE6JqpTtS/Xd4ityA0oxe90RiocHCJIO4E=";
+    hash = "sha256-GK1tD0STBCR0Z/JHdhrgLun6t2snJqi/oFGUOeiXk6c=";
   };
 
   patches = [ ./add-qt-plugin-path-to-env.patch ];

From 78f92255c2cf46f5bb1cac0c3823530096310759 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Wed, 22 Oct 2025 14:19:09 +0200
Subject: [PATCH 2414/6226] bat-extras: also test nushell

---
 .../misc/bat-extras/buildBatExtrasPkg.nix     |  2 ++
 .../tools/misc/bat-extras/modules/batpipe.nix |  7 +++++++
 pkgs/tools/misc/bat-extras/modules/core.nix   |  2 ++
 .../batpipe-skip-detection-tests.patch        | 20 +++++++++++++++++++
 4 files changed, 31 insertions(+)
 create mode 100644 pkgs/tools/misc/bat-extras/patches/batpipe-skip-detection-tests.patch

diff --git a/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix b/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
index 34a526ff9e26..e4aaeedbd12b 100644
--- a/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
+++ b/pkgs/tools/misc/bat-extras/buildBatExtrasPkg.nix
@@ -8,6 +8,7 @@
   fish,
   getconf,
   makeWrapper,
+  nushell,
   zsh,
 }:
 let
@@ -49,6 +50,7 @@ stdenv.mkDerivation (
       bat
       bash
       fish
+      nushell
       zsh
     ]
     ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]);
diff --git a/pkgs/tools/misc/bat-extras/modules/batpipe.nix b/pkgs/tools/misc/bat-extras/modules/batpipe.nix
index 1f1a0352094f..c8c9a754923d 100644
--- a/pkgs/tools/misc/bat-extras/modules/batpipe.nix
+++ b/pkgs/tools/misc/bat-extras/modules/batpipe.nix
@@ -1,4 +1,6 @@
 {
+  lib,
+  stdenv,
   buildBatExtrasPkg,
   less,
   procps,
@@ -9,8 +11,13 @@ buildBatExtrasPkg {
     less
     procps
   ];
+
   patches = [
     ../patches/batpipe-skip-outdated-test.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    ../patches/batpipe-skip-detection-tests.patch
   ];
+
   meta.description = "Less (and soon bat) preprocessor for viewing more types of files in the terminal";
 }
diff --git a/pkgs/tools/misc/bat-extras/modules/core.nix b/pkgs/tools/misc/bat-extras/modules/core.nix
index b7469055f903..f145b666d21d 100644
--- a/pkgs/tools/misc/bat-extras/modules/core.nix
+++ b/pkgs/tools/misc/bat-extras/modules/core.nix
@@ -7,6 +7,7 @@
   fish,
   getconf,
   nix-update-script,
+  nushell,
   zsh,
 }:
 stdenv.mkDerivation {
@@ -41,6 +42,7 @@ stdenv.mkDerivation {
   nativeCheckInputs = [
     bash
     fish
+    nushell
     zsh
   ]
   ++ (lib.optionals stdenv.hostPlatform.isDarwin [ getconf ]);
diff --git a/pkgs/tools/misc/bat-extras/patches/batpipe-skip-detection-tests.patch b/pkgs/tools/misc/bat-extras/patches/batpipe-skip-detection-tests.patch
new file mode 100644
index 000000000000..b051545647a8
--- /dev/null
+++ b/pkgs/tools/misc/bat-extras/patches/batpipe-skip-detection-tests.patch
@@ -0,0 +1,20 @@
+diff --git a/test/suite/batpipe.sh b/test/suite/batpipe.sh
+index e834f6e..da87411 100644
+--- a/test/suite/batpipe.sh
++++ b/test/suite/batpipe.sh
+@@ -12,6 +12,7 @@ test:detected_bash_shell() {
+ 
+ test:detected_fish_shell() {
+ 	description "Test it can detect a fish shell."
++	skip "This test fails in the Nix sandbox"
+ 
+ 	# Note: We don't use bash's `-c` option when testing with a fake fish shell.
+ 	# Bash `-c` will automatically exec() into the last process, which loses the
+@@ -28,6 +29,7 @@ test:detected_fish_shell() {
+ 
+ test:detected_nu_shell() {
+ 	description "Test it can detect a nushell shell."
++	skip "This test fails in the Nix sandbox"
+ 
+ 	# Note: We don't use bash's `-c` option when testing with a fake nu shell.
+ 	# Bash `-c` will automatically exec() into the last process, which loses the

From 46e297cf987ef4fb1eb3b4eac1f978a4c2b80316 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Wed, 22 Oct 2025 13:40:04 +0200
Subject: [PATCH 2415/6226] bat-extras.batgrep: disable tests

---
 pkgs/tools/misc/bat-extras/modules/batgrep.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/tools/misc/bat-extras/modules/batgrep.nix b/pkgs/tools/misc/bat-extras/modules/batgrep.nix
index 8ce898761c5b..72fc2ee8c076 100644
--- a/pkgs/tools/misc/bat-extras/modules/batgrep.nix
+++ b/pkgs/tools/misc/bat-extras/modules/batgrep.nix
@@ -11,5 +11,8 @@ buildBatExtrasPkg {
     coreutils
     ripgrep
   ];
+  # The tests are broken with the new bat 0.26.0
+  # https://github.com/eth-p/bat-extras/issues/143
+  doCheck = false;
   meta.description = "Quickly search through and highlight files using ripgrep";
 }

From 0dd1a07886192139b60ce8d3b4a97f8057c3cac8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 15:40:28 +0000
Subject: [PATCH 2416/6226] tigerbeetle: 0.16.61 -> 0.16.62

---
 pkgs/by-name/ti/tigerbeetle/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ti/tigerbeetle/package.nix b/pkgs/by-name/ti/tigerbeetle/package.nix
index d0b465fa8b17..ec13d6d2b992 100644
--- a/pkgs/by-name/ti/tigerbeetle/package.nix
+++ b/pkgs/by-name/ti/tigerbeetle/package.nix
@@ -10,14 +10,14 @@ let
   platform =
     if stdenvNoCC.hostPlatform.isDarwin then "universal-macos" else stdenvNoCC.hostPlatform.system;
   hash = builtins.getAttr platform {
-    "universal-macos" = "sha256-m/T1Ns8mmifODTLoQ426Co/07rg/kpq/XewNKozDStE=";
-    "x86_64-linux" = "sha256-ClQLzae+8xd9Jb9fGRJ3u/SAYSlk/bxgSITDxSIbS7U=";
-    "aarch64-linux" = "sha256-G2l2636rhXbhegdehSJj6VQpOYHe1Lp8jsBaG53kzUk=";
+    "universal-macos" = "sha256-4lpJxXRwngBUdImBrIeuLVU6GJr6n6g/71bueuZTFj8=";
+    "x86_64-linux" = "sha256-5rJHyFRrU5N5wYIohISBRuwH7WfrSDUyHHmCppSvcfM=";
+    "aarch64-linux" = "sha256-CSB6PGr/EGV/ZdxfWMwY/R9/pObQRSASYE3Cp4cm1/E=";
   };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tigerbeetle";
-  version = "0.16.61";
+  version = "0.16.62";
 
   src = fetchzip {
     url = "https://github.com/tigerbeetle/tigerbeetle/releases/download/${finalAttrs.version}/tigerbeetle-${platform}.zip";

From a02f8b117602b46fcaf0115919ed3c2f99ef9aa0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 15:42:13 +0000
Subject: [PATCH 2417/6226] oci-cli: 3.68.0 -> 3.68.1

---
 pkgs/by-name/oc/oci-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix
index 563f9e457e56..43d447569ad5 100644
--- a/pkgs/by-name/oc/oci-cli/package.nix
+++ b/pkgs/by-name/oc/oci-cli/package.nix
@@ -25,14 +25,14 @@ in
 
 py.pkgs.buildPythonApplication rec {
   pname = "oci-cli";
-  version = "3.68.0";
+  version = "3.68.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "oracle";
     repo = "oci-cli";
     tag = "v${version}";
-    hash = "sha256-gkMTfF77yfjx4CxhJ+mpNA1HsDjXMBMwDaI67dJF/8I=";
+    hash = "sha256-BvVVCK4vh3RT6ypvlhNk1oiY607cVFHaG/Ttu8ws5hA=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 63404a95fb910362f81798effe812f2a93006080 Mon Sep 17 00:00:00 2001
From: Daniel Schaefer <dhs@frame.work>
Date: Fri, 24 Oct 2025 23:47:21 +0800
Subject: [PATCH 2418/6226] wireless-regdb: Fix homepage

Old homepage URL doesn't exist anymore.

Signed-off-by: Daniel Schaefer <dhs@frame.work>
---
 pkgs/by-name/wi/wireless-regdb/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/wi/wireless-regdb/package.nix b/pkgs/by-name/wi/wireless-regdb/package.nix
index f07d4f3e2652..a7b6b5bc2d73 100644
--- a/pkgs/by-name/wi/wireless-regdb/package.nix
+++ b/pkgs/by-name/wi/wireless-regdb/package.nix
@@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec {
 
   meta = with lib; {
     description = "Wireless regulatory database for CRDA";
-    homepage = "http://wireless.kernel.org/en/developers/Regulatory/";
+    homepage = "https://wireless.docs.kernel.org/en/latest/en/developers/regulatory/wireless-regdb.html";
     license = licenses.isc;
     platforms = platforms.all;
     maintainers = with maintainers; [ fpletz ];

From 3b88e192f80788d98452c45e22dc8847a2cdf8f7 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 24 Oct 2025 17:44:57 +0200
Subject: [PATCH 2419/6226] kubazip: init at 0.3.5

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/ku/kubazip/package.nix | 44 +++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 pkgs/by-name/ku/kubazip/package.nix

diff --git a/pkgs/by-name/ku/kubazip/package.nix b/pkgs/by-name/ku/kubazip/package.nix
new file mode 100644
index 000000000000..1b3d786290a9
--- /dev/null
+++ b/pkgs/by-name/ku/kubazip/package.nix
@@ -0,0 +1,44 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  cmake,
+  ninja,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "kubazip";
+  version = "0.3.5";
+
+  src = fetchFromGitHub {
+    owner = "kuba--";
+    repo = "zip";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-wNkIYuwwXo7v3vNaOnRZt1tcd0RGjDvCUqDGdvJzVdo=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
+  ];
+
+  doCheck = true;
+
+  meta = {
+    description = "Portable, simple zip library written in C";
+    homepage = "https://github.com/kuba--/zip";
+    changelog = "https://github.com/kuba--/zip/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ marcin-serwin ];
+  };
+})

From e688d84301470b1366c448dbc585afe33335687f Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 24 Oct 2025 17:44:57 +0200
Subject: [PATCH 2420/6226] tic-80: use system kubazip

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/ti/tic-80/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ti/tic-80/package.nix b/pkgs/by-name/ti/tic-80/package.nix
index b9f6e9cc6b17..8d90bf1d68c2 100644
--- a/pkgs/by-name/ti/tic-80/package.nix
+++ b/pkgs/by-name/ti/tic-80/package.nix
@@ -7,6 +7,7 @@
   rake,
   curl,
   fetchFromGitHub,
+  kubazip,
   libGL,
   libGLU,
   libX11,
@@ -37,7 +38,7 @@ stdenv.mkDerivation {
     hash = "sha256-UjBnXxYZ5gfk58sI1qek5fkKpJ7LzOVmrxdjVgONcXc=";
     # TIC-80 vendors its dependencies as submodules. For the following dependencies,
     # there are no (or no compatible) packages in nixpkgs yet, so we use the vendored
-    # ones as a fill-in: kubazip, wasm, squirrel, pocketpy, argparse, naett,
+    # ones as a fill-in: wasm, squirrel, pocketpy, argparse, naett,
     # sdlgpu, mruby.
     fetchSubmodules = true;
   };
@@ -90,6 +91,7 @@ stdenv.mkDerivation {
     rake
   ];
   buildInputs = [
+    kubazip
     libGL
     libGLU
     libX11

From be4f4feaa2f87322729a993519def7bc80059dcc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 15:59:02 +0000
Subject: [PATCH 2421/6226] chhoto-url: 6.4.0 -> 6.4.1

---
 pkgs/by-name/ch/chhoto-url/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix
index f6add0a52d8f..d8f2319f06f8 100644
--- a/pkgs/by-name/ch/chhoto-url/package.nix
+++ b/pkgs/by-name/ch/chhoto-url/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "chhoto-url";
-  version = "6.4.0";
+  version = "6.4.1";
 
   src = fetchFromGitHub {
     owner = "SinTan1729";
     repo = "chhoto-url";
     tag = finalAttrs.version;
-    hash = "sha256-IghMhr1ksoTWPvuQ66XfXWrNgPAmS39OqjdhwpElD3U=";
+    hash = "sha256-1XMZSQpZxkeIW7SLNl/crOYDz1QyWC/SUkFk+tgCQgg=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/actix";
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
   '';
 
-  cargoHash = "sha256-cxw0Gg80UHvkjBXGt7tKMEinfhS2aT4fZ7oDzNNHnX8=";
+  cargoHash = "sha256-kwZRGXaStcDiZOMMZrOWp6vD4JiwRa6r2e5b2cH1Fk4=";
 
   postInstall = ''
     mkdir -p $out/share/chhoto-url

From d64d5cd05c3e46d3638353bca908d13f50f9b78f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 16:03:03 +0000
Subject: [PATCH 2422/6226] rbspy: 0.38.0 -> 0.39.0

---
 pkgs/by-name/rb/rbspy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/rb/rbspy/package.nix b/pkgs/by-name/rb/rbspy/package.nix
index 69851711c9fc..4a43845313aa 100644
--- a/pkgs/by-name/rb/rbspy/package.nix
+++ b/pkgs/by-name/rb/rbspy/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rbspy";
-  version = "0.38.0";
+  version = "0.39.0";
 
   src = fetchFromGitHub {
     owner = "rbspy";
     repo = "rbspy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6pQoCPwrIKaEUYgaHNgFLz+bY4p+ImlhZ2l2vehA4Ic=";
+    hash = "sha256-xTaulxPgHc4UTHqgh8ASn75RGtAbhTWHVdV/JyDFNPc=";
   };
 
-  cargoHash = "sha256-6Q1ebXEknP3qEiU5qMXhHykRwahMZEVXGJGE4EToohA=";
+  cargoHash = "sha256-Y0mfd1ETISzzLErV2gXjW0CgVmJP5wcJUavrIJuG86k=";
 
   doCheck = true;
 

From 965ea7b1ea1d9c5125234928919e27bde81ce21c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 29 Sep 2025 11:27:38 +0200
Subject: [PATCH 2423/6226] linux: get rid of drvAttrs

This is in principle, what Alyssa was already doing[1], but I re-did it
because rebasing this against reformats felt too annoying. The previous
attempt was reverted because of unrelated regressions in the chain.

The `drvAttrs` function made the entire code far more cluttered, harder
to understand and didn't serve a real purpose since it was just used a
single time.

I also got rid of the `kernelConf`-variable and decided to directly use
`stdenv.hostPlatform.linux-kernel`, making it more clear where the
attributes are actually coming from.

[1] f521f4613355f8628fe378dad4c41d3fd8886966

Co-authored-by: Alyssa Ross <hi@alyssa.is>
---
 .../linux/kernel/manual-config.nix            | 941 +++++++++---------
 1 file changed, 463 insertions(+), 478 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 33dcd77fcbb3..807fd00e504f 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -102,453 +102,11 @@ lib.makeOverridable (
       optional
       optionals
       optionalString
-      optionalAttrs
       maintainers
       teams
       platforms
       ;
 
-    drvAttrs =
-      config_: kernelConf: kernelPatches: configfile:
-      let
-        # Folding in `ubootTools` in the default nativeBuildInputs is problematic, as
-        # it makes updating U-Boot cumbersome, since it will go above the current
-        # threshold of rebuilds
-        #
-        # To prevent these needless rounds of staging for U-Boot builds, we can
-        # limit the inclusion of ubootTools to target platforms where uImage *may*
-        # be produced.
-        #
-        # This command lists those (kernel-named) platforms:
-        #     .../linux $ grep -l uImage ./arch/*/Makefile | cut -d'/' -f3 | sort
-        #
-        # This is still a guesstimation, but since none of our cached platforms
-        # coincide in that list, this gives us "perfect" decoupling here.
-        linuxPlatformsUsingUImage = [
-          "arc"
-          "arm"
-          "csky"
-          "mips"
-          "powerpc"
-          "sh"
-          "sparc"
-          "xtensa"
-        ];
-        needsUbootTools = lib.elem stdenv.hostPlatform.linuxArch linuxPlatformsUsingUImage;
-
-        config =
-          let
-            attrName = attr: "CONFIG_" + attr;
-          in
-          {
-            isSet = attr: hasAttr (attrName attr) config;
-
-            getValue = attr: if config.isSet attr then getAttr (attrName attr) config else null;
-
-            isYes = attr: (config.getValue attr) == "y";
-
-            isNo = attr: (config.getValue attr) == "n";
-
-            isModule = attr: (config.getValue attr) == "m";
-
-            isEnabled = attr: (config.isModule attr) || (config.isYes attr);
-
-            isDisabled = attr: (!(config.isSet attr)) || (config.isNo attr);
-          }
-          // config_;
-
-        isModular = config.isYes "MODULES";
-        withRust = config.isYes "RUST";
-
-        target = kernelConf.target or "vmlinux";
-
-        buildDTBs = kernelConf.DTB or false;
-
-        # Dependencies that are required to build kernel modules
-        moduleBuildDependencies = [
-          pahole
-          perl
-          elfutils
-          # module makefiles often run uname commands to find out the kernel version
-          (buildPackages.deterministic-uname.override { inherit modDirVersion; })
-        ]
-        ++ optional (lib.versionAtLeast version "5.13") zstd
-        ++ optionals withRust [
-          rustc-unwrapped
-          rust-bindgen-unwrapped
-        ];
-
-      in
-      (optionalAttrs isModular {
-        outputs = [
-          "out"
-          "dev"
-          "modules"
-        ];
-      })
-      // {
-        __structuredAttrs = true;
-
-        passthru = rec {
-          inherit
-            version
-            modDirVersion
-            config
-            kernelPatches
-            configfile
-            moduleBuildDependencies
-            stdenv
-            ;
-          inherit
-            isZen
-            isHardened
-            isLibre
-            withRust
-            ;
-          isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true;
-          baseVersion = lib.head (lib.splitString "-rc" version);
-          kernelOlder = lib.versionOlder baseVersion;
-          kernelAtLeast = lib.versionAtLeast baseVersion;
-        };
-
-        inherit src;
-
-        depsBuildBuild = [ buildPackages.stdenv.cc ];
-        nativeBuildInputs = [
-          bison
-          flex
-          perl
-          bc
-          openssl
-          rsync
-          gmp
-          libmpc
-          mpfr
-          elfutils
-          zstd
-          python3Minimal
-          kmod
-          hexdump
-        ]
-        ++ optional needsUbootTools ubootTools
-        ++ optionals (lib.versionAtLeast version "5.2") [
-          cpio
-          pahole
-          zlib
-        ]
-        ++ optionals withRust [
-          rustc-unwrapped
-          rust-bindgen-unwrapped
-        ];
-
-        env = {
-          RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc;
-
-          # avoid leaking Rust source file names into the final binary, which adds
-          # a false dependency on rust-lib-src on targets with uncompressed kernels
-          KRUSTFLAGS = lib.optionalString withRust "--remap-path-prefix ${rustPlatform.rustLibSrc}=/";
-        };
-
-        patches =
-          # kernelPatches can contain config changes and no actual patch
-          lib.filter (p: p != null) (map (p: p.patch) kernelPatches)
-          # Required for deterministic builds along with some postPatch magic.
-          ++ optional (lib.versionOlder version "5.19") ./randstruct-provide-seed.patch
-          ++ optional (lib.versionAtLeast version "5.19") ./randstruct-provide-seed-5.19.patch
-          # Linux 5.12 marked certain PowerPC-only symbols as GPL, which breaks
-          # OpenZFS; this was fixed in Linux 5.19 so we backport the fix
-          # https://github.com/openzfs/zfs/pull/13367
-          ++
-            optional
-              (
-                lib.versionAtLeast version "5.12" && lib.versionOlder version "5.19" && stdenv.hostPlatform.isPower
-              )
-              (fetchpatch {
-                url = "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/patch/?id=d9e5c3e9e75162f845880535957b7fd0b4637d23";
-                hash = "sha256-bBOyJcP6jUvozFJU0SPTOf3cmnTQ6ZZ4PlHjiniHXLU=";
-              });
-
-        postPatch = ''
-          # Ensure that depmod gets resolved through PATH
-          sed -i Makefile -e 's|= /sbin/depmod|= depmod|'
-
-          # Some linux-hardened patches now remove certain files in the scripts directory, so the file may not exist.
-          [[ -f scripts/ld-version.sh ]] && patchShebangs scripts/ld-version.sh
-
-          # Set randstruct seed to a deterministic but diversified value. Note:
-          # we could have instead patched gen-random-seed.sh to take input from
-          # the buildFlags, but that would require also patching the kernel's
-          # toplevel Makefile to add a variable export. This would be likely to
-          # cause future patch conflicts.
-          for file in scripts/gen-randstruct-seed.sh scripts/gcc-plugins/gen-random-seed.sh; do
-            if [ -f "$file" ]; then
-              substituteInPlace "$file" \
-                --replace NIXOS_RANDSTRUCT_SEED \
-                $(echo ${randstructSeed}${src} ${placeholder "configfile"} | sha256sum | cut -d ' ' -f 1 | tr -d '\n')
-              break
-            fi
-          done
-
-          patchShebangs scripts
-
-          # also patch arch-specific install scripts
-          for i in $(find arch -name install.sh); do
-              patchShebangs "$i"
-          done
-
-          # unset $src because the build system tries to use it and spams a bunch of warnings
-          # see: https://github.com/torvalds/linux/commit/b1992c3772e69a6fd0e3fc81cd4d2820c8b6eca0
-          unset src
-        '';
-
-        configurePhase = ''
-          runHook preConfigure
-
-          mkdir build
-          export buildRoot="$(pwd)/build"
-
-          echo "manual-config configurePhase buildRoot=$buildRoot pwd=$PWD"
-
-          if [ -f "$buildRoot/.config" ]; then
-            echo "Could not link $buildRoot/.config : file exists"
-            exit 1
-          fi
-          ln -sv ${configfile} $buildRoot/.config
-
-          # reads the existing .config file and prompts the user for options in
-          # the current kernel source that are not found in the file.
-          make "''${makeFlags[@]}" oldconfig
-          runHook postConfigure
-
-          make "''${makeFlags[@]}" prepare
-          actualModDirVersion="$(cat $buildRoot/include/config/kernel.release)"
-          if [ "$actualModDirVersion" != "${modDirVersion}" ]; then
-            echo "Error: modDirVersion ${modDirVersion} specified in the Nix expression is wrong, it should be: $actualModDirVersion"
-            exit 1
-          fi
-
-          buildFlags+=("KBUILD_BUILD_TIMESTAMP=$(date -u -d @$SOURCE_DATE_EPOCH)")
-
-          cd $buildRoot
-        '';
-
-        buildFlags = [
-          "KBUILD_BUILD_VERSION=1-NixOS"
-          target
-          "vmlinux" # for "perf" and things like that
-          "scripts_gdb"
-        ]
-        ++ optional isModular "modules"
-        ++ optionals buildDTBs [
-          "dtbs"
-          "DTC_FLAGS=-@"
-        ]
-        ++ extraMakeFlags;
-
-        installFlags = [
-          "INSTALL_PATH=${placeholder "out"}"
-        ]
-        ++ (optional isModular "INSTALL_MOD_PATH=${placeholder "modules"}")
-        ++ optionals buildDTBs [
-          "dtbs_install"
-          "INSTALL_DTBS_PATH=${placeholder "out"}/dtbs"
-        ];
-
-        preInstall =
-          let
-            # All we really need to do here is copy the final image and System.map to $out,
-            # and use the kernel's modules_install, firmware_install, dtbs_install, etc. targets
-            # for the rest. Easy, right?
-            #
-            # Unfortunately for us, the obvious way of getting the built image path,
-            # make -s image_name, does not work correctly, because some architectures
-            # (*cough* aarch64 *cough*) change KBUILD_IMAGE on the fly in their install targets,
-            # so we end up attempting to install the thing we didn't actually build.
-            #
-            # Thankfully, there's a way out that doesn't involve just hardcoding everything.
-            #
-            # The kernel has an install target, which runs a pretty simple shell script
-            # (located at scripts/install.sh or arch/$arch/boot/install.sh, depending on
-            # which kernel version you're looking at) that tries to do something sensible.
-            #
-            # (it would be great to hijack this script immediately, as it has all the
-            #   information we need passed to it and we don't need it to try and be smart,
-            #   but unfortunately, the exact location of the scripts differs between kernel
-            #   versions, and they're seemingly not considered to be public API at all)
-            #
-            # One of the ways it tries to discover what "something sensible" actually is
-            # is by delegating to what's supposed to be a user-provided install script
-            # located at ~/bin/installkernel.
-            #
-            # (the other options are:
-            #   - a distribution-specific script at /sbin/installkernel,
-            #        which we can't really create in the sandbox easily
-            #   - an architecture-specific script at arch/$arch/boot/install.sh,
-            #        which attempts to guess _something_ and usually guesses very wrong)
-            #
-            # More specifically, the install script exec's into ~/bin/installkernel, if one
-            # exists, with the following arguments:
-            #
-            # $1: $KERNELRELEASE - full kernel version string
-            # $2: $KBUILD_IMAGE - the final image path
-            # $3: System.map - path to System.map file, seemingly hardcoded everywhere
-            # $4: $INSTALL_PATH - path to the destination directory as specified in installFlags
-            #
-            # $2 is exactly what we want, so hijack the script and use the knowledge given to it
-            # by the makefile overlords for our own nefarious ends.
-            #
-            # Note that the makefiles specifically look in ~/bin/installkernel, and
-            # writeShellScriptBin writes the script to <store path>/bin/installkernel,
-            # so HOME needs to be set to just the store path.
-            #
-            # FIXME: figure out a less roundabout way of doing this.
-            installkernel = buildPackages.writeShellScriptBin "installkernel" ''
-              cp -av $2 $4
-              cp -av $3 $4
-            '';
-          in
-          ''
-            installFlags+=("-j$NIX_BUILD_CORES")
-            export HOME=${installkernel}
-          '';
-
-        # Some image types need special install targets (e.g. uImage is installed with make uinstall on arm)
-        installTargets = [
-          (kernelConf.installTarget or (
-            if target == "uImage" && stdenv.hostPlatform.linuxArch == "arm" then
-              "uinstall"
-            else if
-              (target == "zImage" || target == "Image.gz" || target == "vmlinuz.efi")
-              && builtins.elem stdenv.hostPlatform.linuxArch [
-                "arm"
-                "arm64"
-                "parisc"
-                "riscv"
-              ]
-            then
-              "zinstall"
-            else
-              "install"
-          )
-          )
-        ];
-
-        # We remove a bunch of stuff that is symlinked from other places to save space,
-        # which trips the broken symlink check. So, just skip it. We'll know if it explodes.
-        dontCheckForBrokenSymlinks = true;
-
-        postInstall = optionalString isModular ''
-          mkdir -p $dev
-          cp vmlinux $dev/
-
-          mkdir -p $dev/lib/modules/${modDirVersion}/build/scripts
-          cp -rL ../scripts/gdb/ $dev/lib/modules/${modDirVersion}/build/scripts
-
-          if [ -z "''${dontStrip-}" ]; then
-            installFlags+=("INSTALL_MOD_STRIP=1")
-          fi
-          make modules_install "''${makeFlags[@]}" "''${installFlags[@]}"
-          unlink $modules/lib/modules/${modDirVersion}/build
-
-          mkdir -p $dev/lib/modules/${modDirVersion}/{build,source}
-
-          # To save space, exclude a bunch of unneeded stuff when copying.
-          (cd .. && rsync --archive --prune-empty-dirs \
-              --exclude='/build/' \
-              * $dev/lib/modules/${modDirVersion}/source/)
-
-          cd $dev/lib/modules/${modDirVersion}/source
-
-          cp $buildRoot/{.config,Module.symvers} $dev/lib/modules/${modDirVersion}/build
-          make modules_prepare "''${makeFlags[@]}" O=$dev/lib/modules/${modDirVersion}/build
-
-          # For reproducibility, removes accidental leftovers from a `cc1` call
-          # from a `try-run` call from the Makefile
-          rm -f $dev/lib/modules/${modDirVersion}/build/.[0-9]*.d
-
-          # Keep some extra files on some arches (powerpc, aarch64)
-          for f in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do
-            if [ -f "$buildRoot/$f" ]; then
-              mkdir -p "$(dirname $dev/lib/modules/${modDirVersion}/build/$f)"
-              cp $buildRoot/$f $dev/lib/modules/${modDirVersion}/build/$f
-            fi
-          done
-
-          # !!! No documentation on how much of the source tree must be kept
-          # If/when kernel builds fail due to missing files, you can add
-          # them here. Note that we may see packages requiring headers
-          # from drivers/ in the future; it adds 50M to keep all of its
-          # headers on 3.10 though.
-
-          chmod u+w -R ..
-          buildArchDir="$dev/lib/modules/${modDirVersion}/build/arch"
-
-          # Remove unused arches
-          for d in $(cd arch/; ls); do
-            if [ -d "$buildArchDir/$d" ]; then continue; fi
-            if [ -d "$buildArchDir/arm64" ] && [ "$d" = arm ]; then continue; fi
-            rm -rf arch/$d
-          done
-
-          # Remove all driver-specific code (50M of which is headers)
-          rm -fR drivers
-
-          # Keep all headers
-          find .  -type f -name '*.h' -print0 | xargs -0 -r chmod u-w
-
-          # Keep linker scripts (they are required for out-of-tree modules on aarch64)
-          find .  -type f -name '*.lds' -print0 | xargs -0 -r chmod u-w
-
-          # Keep root and arch-specific Makefiles
-          chmod u-w Makefile arch/*/Makefile*
-
-          # Keep whole scripts dir
-          chmod u-w -R scripts
-
-          # Delete everything not kept
-          find . -type f -perm -u=w -print0 | xargs -0 -r rm
-
-          # Delete empty directories
-          find -empty -type d -delete
-        '';
-
-        requiredSystemFeatures = [ "big-parallel" ];
-
-        meta = {
-          # https://github.com/NixOS/nixpkgs/pull/345534#issuecomment-2391238381
-          broken = withRust && lib.versionOlder version "6.12";
-
-          description =
-            "The Linux kernel"
-            + (
-              if kernelPatches == [ ] then
-                ""
-              else
-                " (with patches: " + lib.concatStringsSep ", " (map (x: x.name) kernelPatches) + ")"
-            );
-          license = lib.licenses.gpl2Only;
-          homepage = "https://www.kernel.org/";
-          maintainers = [ maintainers.thoughtpolice ];
-          teams = [ teams.linux-kernel ];
-          platforms = platforms.linux;
-          badPlatforms =
-            lib.optionals (lib.versionOlder version "4.15") [
-              "riscv32-linux"
-              "riscv64-linux"
-            ]
-            ++ lib.optional (lib.versionOlder version "5.19") "loongarch64-linux";
-          timeout = 14400; # 4 hours
-          identifiers.cpeParts = {
-            part = "o";
-            vendor = "linux";
-            product = "linux_kernel";
-            inherit version;
-            update = "*";
-          };
-        }
-        // extraMeta;
-      };
-
     commonMakeFlags = import ./common-flags.nix {
       inherit
         lib
@@ -557,49 +115,476 @@ lib.makeOverridable (
         extraMakeFlags
         ;
     };
+
+    # Folding in `ubootTools` in the default nativeBuildInputs is problematic, as
+    # it makes updating U-Boot cumbersome, since it will go above the current
+    # threshold of rebuilds
+    #
+    # To prevent these needless rounds of staging for U-Boot builds, we can
+    # limit the inclusion of ubootTools to target platforms where uImage *may*
+    # be produced.
+    #
+    # This command lists those (kernel-named) platforms:
+    #     .../linux $ grep -l uImage ./arch/*/Makefile | cut -d'/' -f3 | sort
+    #
+    # This is still a guesstimation, but since none of our cached platforms
+    # coincide in that list, this gives us "perfect" decoupling here.
+    linuxPlatformsUsingUImage = [
+      "arc"
+      "arm"
+      "csky"
+      "mips"
+      "powerpc"
+      "sh"
+      "sparc"
+      "xtensa"
+    ];
+    needsUbootTools = lib.elem stdenv.hostPlatform.linuxArch linuxPlatformsUsingUImage;
+
+    configHelpers =
+      let
+        attrName = attr: "CONFIG_" + attr;
+      in
+      {
+        isSet = attr: hasAttr (attrName attr) config;
+
+        getValue = attr: if configHelpers.isSet attr then getAttr (attrName attr) config else null;
+
+        isYes = attr: (configHelpers.getValue attr) == "y";
+
+        isNo = attr: (configHelpers.getValue attr) == "n";
+
+        isModule = attr: (configHelpers.getValue attr) == "m";
+
+        isEnabled = attr: (configHelpers.isModule attr) || (configHelpers.isYes attr);
+
+        isDisabled = attr: (!(configHelpers.isSet attr)) || (configHelpers.isNo attr);
+      }
+      // config;
+
+    isModular = configHelpers.isYes "MODULES";
+    withRust = configHelpers.isYes "RUST";
+
+    target = stdenv.hostPlatform.linux-kernel.target or "vmlinux";
+
+    buildDTBs = stdenv.hostPlatform.linux-kernel.DTB or false;
+
+    # Dependencies that are required to build kernel modules
+    moduleBuildDependencies = [
+      pahole
+      perl
+      elfutils
+      # module makefiles often run uname commands to find out the kernel version
+      (buildPackages.deterministic-uname.override { inherit modDirVersion; })
+    ]
+    ++ optional (lib.versionAtLeast version "5.13") zstd
+    ++ optionals withRust [
+      rustc-unwrapped
+      rust-bindgen-unwrapped
+    ];
   in
 
-  stdenv.mkDerivation (
-    builtins.foldl' lib.recursiveUpdate { } [
-      (drvAttrs config stdenv.hostPlatform.linux-kernel kernelPatches configfile)
-      {
-        inherit pname version;
+  stdenv.mkDerivation {
+    inherit pname version src;
 
-        enableParallelBuilding = true;
+    __structuredAttrs = true;
 
-        hardeningDisable = [
-          "bindnow"
-          "format"
-          "fortify"
-          "stackprotector"
-          "pic"
-          "pie"
-        ];
+    enableParallelBuilding = true;
 
-        makeFlags = [
-          "O=$(buildRoot)"
+    hardeningDisable = [
+      "bindnow"
+      "format"
+      "fortify"
+      "stackprotector"
+      "pic"
+      "pie"
+    ];
 
-          # We have a `modules` variable in the environment for our
-          # split output, but the kernel Makefiles also define their
-          # own `modules` variable. Their definition wins, but Make
-          # remembers that the variable was originally from the
-          # environment and exports it to all the build recipes. This
-          # breaks the build with an “Argument list too long” error due
-          # to passing the huge list of every module object file in the
-          # environment of every process invoked by every build recipe.
-          #
-          # We use `--eval` here to undefine the inherited environment
-          # variable before any Makefiles are read, ensuring that the
-          # kernel’s definition creates a new, unexported variable.
-          "--eval=undefine modules"
-        ]
-        ++ commonMakeFlags;
+    ${if isModular then "outputs" else null} = [
+      "out"
+      "dev"
+      "modules"
+    ];
 
-        passthru = { inherit commonMakeFlags; };
+    # We remove a bunch of stuff that is symlinked from other places to save space,
+    # which trips the broken symlink check. So, just skip it. We'll know if it explodes.
+    dontCheckForBrokenSymlinks = true;
 
-        karch = stdenv.hostPlatform.linuxArch;
-      }
-      (optionalAttrs (pos != null) { inherit pos; })
+    patches =
+      # kernelPatches can contain config changes and no actual patch
+      lib.filter (p: p != null) (map (p: p.patch) kernelPatches)
+      # Required for deterministic builds along with some postPatch magic.
+      ++ optional (lib.versionOlder version "5.19") ./randstruct-provide-seed.patch
+      ++ optional (lib.versionAtLeast version "5.19") ./randstruct-provide-seed-5.19.patch
+      # Linux 5.12 marked certain PowerPC-only symbols as GPL, which breaks
+      # OpenZFS; this was fixed in Linux 5.19 so we backport the fix
+      # https://github.com/openzfs/zfs/pull/13367
+      ++
+        optional
+          (
+            lib.versionAtLeast version "5.12" && lib.versionOlder version "5.19" && stdenv.hostPlatform.isPower
+          )
+          (fetchpatch {
+            url = "https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/patch/?id=d9e5c3e9e75162f845880535957b7fd0b4637d23";
+            hash = "sha256-bBOyJcP6jUvozFJU0SPTOf3cmnTQ6ZZ4PlHjiniHXLU=";
+          });
+
+    buildFlags = [
+      "KBUILD_BUILD_VERSION=1-NixOS"
+      stdenv.hostPlatform.linux-kernel.target
+      "vmlinux" # for "perf" and things like that
+      "scripts_gdb"
     ]
-  )
+    ++ optional isModular "modules"
+    ++ optionals buildDTBs [
+      "dtbs"
+      "DTC_FLAGS=-@"
+    ]
+    ++ extraMakeFlags;
+
+    installFlags = [
+      "INSTALL_PATH=${placeholder "out"}"
+    ]
+    ++ (optional isModular "INSTALL_MOD_PATH=${placeholder "modules"}")
+    ++ optionals buildDTBs [
+      "dtbs_install"
+      "INSTALL_DTBS_PATH=${placeholder "out"}/dtbs"
+    ];
+
+    depsBuildBuild = [ buildPackages.stdenv.cc ];
+    nativeBuildInputs = [
+      bison
+      flex
+      perl
+      bc
+      openssl
+      rsync
+      gmp
+      libmpc
+      mpfr
+      elfutils
+      zstd
+      python3Minimal
+      kmod
+      hexdump
+    ]
+    ++ optional needsUbootTools ubootTools
+    ++ optionals (lib.versionAtLeast version "5.2") [
+      cpio
+      pahole
+      zlib
+    ]
+    ++ optionals withRust [
+      rustc-unwrapped
+      rust-bindgen-unwrapped
+    ];
+
+    env = {
+      RUST_LIB_SRC = lib.optionalString withRust rustPlatform.rustLibSrc;
+
+      # avoid leaking Rust source file names into the final binary, which adds
+      # a false dependency on rust-lib-src on targets with uncompressed kernels
+      KRUSTFLAGS = lib.optionalString withRust "--remap-path-prefix ${rustPlatform.rustLibSrc}=/";
+    };
+
+    makeFlags = [
+      "O=$(buildRoot)"
+
+      # We have a `modules` variable in the environment for our
+      # split output, but the kernel Makefiles also define their
+      # own `modules` variable. Their definition wins, but Make
+      # remembers that the variable was originally from the
+      # environment and exports it to all the build recipes. This
+      # breaks the build with an “Argument list too long” error due
+      # to passing the huge list of every module object file in the
+      # environment of every process invoked by every build recipe.
+      #
+      # We use `--eval` here to undefine the inherited environment
+      # variable before any Makefiles are read, ensuring that the
+      # kernel’s definition creates a new, unexported variable.
+      "--eval=undefine modules"
+    ]
+    ++ commonMakeFlags;
+
+    postPatch = ''
+      # Ensure that depmod gets resolved through PATH
+      sed -i Makefile -e 's|= /sbin/depmod|= depmod|'
+
+      # Some linux-hardened patches now remove certain files in the scripts directory, so the file may not exist.
+      [[ -f scripts/ld-version.sh ]] && patchShebangs scripts/ld-version.sh
+
+      # Set randstruct seed to a deterministic but diversified value. Note:
+      # we could have instead patched gen-random-seed.sh to take input from
+      # the buildFlags, but that would require also patching the kernel's
+      # toplevel Makefile to add a variable export. This would be likely to
+      # cause future patch conflicts.
+      for file in scripts/gen-randstruct-seed.sh scripts/gcc-plugins/gen-random-seed.sh; do
+        if [ -f "$file" ]; then
+          substituteInPlace "$file" \
+            --replace NIXOS_RANDSTRUCT_SEED \
+            $(echo ${randstructSeed}${src} ${placeholder "configfile"} | sha256sum | cut -d ' ' -f 1 | tr -d '\n')
+          break
+        fi
+      done
+
+      patchShebangs scripts
+
+      # also patch arch-specific install scripts
+      for i in $(find arch -name install.sh); do
+          patchShebangs "$i"
+      done
+
+      # unset $src because the build system tries to use it and spams a bunch of warnings
+      # see: https://github.com/torvalds/linux/commit/b1992c3772e69a6fd0e3fc81cd4d2820c8b6eca0
+      unset src
+    '';
+
+    configurePhase = ''
+      runHook preConfigure
+
+      mkdir build
+      export buildRoot="$(pwd)/build"
+
+      echo "manual-config configurePhase buildRoot=$buildRoot pwd=$PWD"
+
+      if [ -f "$buildRoot/.config" ]; then
+        echo "Could not link $buildRoot/.config : file exists"
+        exit 1
+      fi
+      ln -sv ${configfile} $buildRoot/.config
+
+      # reads the existing .config file and prompts the user for options in
+      # the current kernel source that are not found in the file.
+      make "''${makeFlags[@]}" oldconfig
+      runHook postConfigure
+
+      make "''${makeFlags[@]}" prepare
+      actualModDirVersion="$(cat $buildRoot/include/config/kernel.release)"
+      if [ "$actualModDirVersion" != "${modDirVersion}" ]; then
+        echo "Error: modDirVersion ${modDirVersion} specified in the Nix expression is wrong, it should be: $actualModDirVersion"
+        exit 1
+      fi
+
+      buildFlags+=("KBUILD_BUILD_TIMESTAMP=$(date -u -d @$SOURCE_DATE_EPOCH)")
+
+      cd $buildRoot
+    '';
+
+    postInstall = optionalString isModular ''
+      mkdir -p $dev
+      cp vmlinux $dev/
+
+      mkdir -p $dev/lib/modules/${modDirVersion}/build/scripts
+      cp -rL ../scripts/gdb/ $dev/lib/modules/${modDirVersion}/build/scripts
+
+      if [ -z "''${dontStrip-}" ]; then
+        installFlags+=("INSTALL_MOD_STRIP=1")
+      fi
+      make modules_install "''${makeFlags[@]}" "''${installFlags[@]}"
+      unlink $modules/lib/modules/${modDirVersion}/build
+
+      mkdir -p $dev/lib/modules/${modDirVersion}/{build,source}
+
+      # To save space, exclude a bunch of unneeded stuff when copying.
+      (cd .. && rsync --archive --prune-empty-dirs \
+          --exclude='/build/' \
+          * $dev/lib/modules/${modDirVersion}/source/)
+
+      cd $dev/lib/modules/${modDirVersion}/source
+
+      cp $buildRoot/{.config,Module.symvers} $dev/lib/modules/${modDirVersion}/build
+      make modules_prepare "''${makeFlags[@]}" O=$dev/lib/modules/${modDirVersion}/build
+
+      # For reproducibility, removes accidental leftovers from a `cc1` call
+      # from a `try-run` call from the Makefile
+      rm -f $dev/lib/modules/${modDirVersion}/build/.[0-9]*.d
+
+      # Keep some extra files on some arches (powerpc, aarch64)
+      for f in arch/powerpc/lib/crtsavres.o arch/arm64/kernel/ftrace-mod.o; do
+        if [ -f "$buildRoot/$f" ]; then
+          mkdir -p "$(dirname $dev/lib/modules/${modDirVersion}/build/$f)"
+          cp $buildRoot/$f $dev/lib/modules/${modDirVersion}/build/$f
+        fi
+      done
+
+      # !!! No documentation on how much of the source tree must be kept
+      # If/when kernel builds fail due to missing files, you can add
+      # them here. Note that we may see packages requiring headers
+      # from drivers/ in the future; it adds 50M to keep all of its
+      # headers on 3.10 though.
+
+      chmod u+w -R ..
+      buildArchDir="$dev/lib/modules/${modDirVersion}/build/arch"
+
+      # Remove unused arches
+      for d in $(cd arch/; ls); do
+        if [ -d "$buildArchDir/$d" ]; then continue; fi
+        if [ -d "$buildArchDir/arm64" ] && [ "$d" = arm ]; then continue; fi
+        rm -rf arch/$d
+      done
+
+      # Remove all driver-specific code (50M of which is headers)
+      rm -fR drivers
+
+      # Keep all headers
+      find .  -type f -name '*.h' -print0 | xargs -0 -r chmod u-w
+
+      # Keep linker scripts (they are required for out-of-tree modules on aarch64)
+      find .  -type f -name '*.lds' -print0 | xargs -0 -r chmod u-w
+
+      # Keep root and arch-specific Makefiles
+      chmod u-w Makefile arch/*/Makefile*
+
+      # Keep whole scripts dir
+      chmod u-w -R scripts
+
+      # Delete everything not kept
+      find . -type f -perm -u=w -print0 | xargs -0 -r rm
+
+      # Delete empty directories
+      find -empty -type d -delete
+    '';
+
+    preInstall =
+      let
+        # All we really need to do here is copy the final image and System.map to $out,
+        # and use the kernel's modules_install, firmware_install, dtbs_install, etc. targets
+        # for the rest. Easy, right?
+        #
+        # Unfortunately for us, the obvious way of getting the built image path,
+        # make -s image_name, does not work correctly, because some architectures
+        # (*cough* aarch64 *cough*) change KBUILD_IMAGE on the fly in their install targets,
+        # so we end up attempting to install the thing we didn't actually build.
+        #
+        # Thankfully, there's a way out that doesn't involve just hardcoding everything.
+        #
+        # The kernel has an install target, which runs a pretty simple shell script
+        # (located at scripts/install.sh or arch/$arch/boot/install.sh, depending on
+        # which kernel version you're looking at) that tries to do something sensible.
+        #
+        # (it would be great to hijack this script immediately, as it has all the
+        #   information we need passed to it and we don't need it to try and be smart,
+        #   but unfortunately, the exact location of the scripts differs between kernel
+        #   versions, and they're seemingly not considered to be public API at all)
+        #
+        # One of the ways it tries to discover what "something sensible" actually is
+        # is by delegating to what's supposed to be a user-provided install script
+        # located at ~/bin/installkernel.
+        #
+        # (the other options are:
+        #   - a distribution-specific script at /sbin/installkernel,
+        #        which we can't really create in the sandbox easily
+        #   - an architecture-specific script at arch/$arch/boot/install.sh,
+        #        which attempts to guess _something_ and usually guesses very wrong)
+        #
+        # More specifically, the install script exec's into ~/bin/installkernel, if one
+        # exists, with the following arguments:
+        #
+        # $1: $KERNELRELEASE - full kernel version string
+        # $2: $KBUILD_IMAGE - the final image path
+        # $3: System.map - path to System.map file, seemingly hardcoded everywhere
+        # $4: $INSTALL_PATH - path to the destination directory as specified in installFlags
+        #
+        # $2 is exactly what we want, so hijack the script and use the knowledge given to it
+        # by the makefile overlords for our own nefarious ends.
+        #
+        # Note that the makefiles specifically look in ~/bin/installkernel, and
+        # writeShellScriptBin writes the script to <store path>/bin/installkernel,
+        # so HOME needs to be set to just the store path.
+        #
+        # FIXME: figure out a less roundabout way of doing this.
+        installkernel = buildPackages.writeShellScriptBin "installkernel" ''
+          cp -av $2 $4
+          cp -av $3 $4
+        '';
+      in
+      ''
+        installFlags+=("-j$NIX_BUILD_CORES")
+        export HOME=${installkernel}
+      '';
+
+    requiredSystemFeatures = [ "big-parallel" ];
+
+    passthru = rec {
+      inherit
+        version
+        modDirVersion
+        config
+        kernelPatches
+        configfile
+        moduleBuildDependencies
+        stdenv
+        commonMakeFlags
+        ;
+      inherit
+        isZen
+        isHardened
+        isLibre
+        withRust
+        ;
+      isXen = lib.warn "The isXen attribute is deprecated. All Nixpkgs kernels that support it now have Xen enabled." true;
+      baseVersion = lib.head (lib.splitString "-rc" version);
+      kernelOlder = lib.versionOlder baseVersion;
+      kernelAtLeast = lib.versionAtLeast baseVersion;
+    };
+
+    # Some image types need special install targets (e.g. uImage is installed with make uinstall on arm)
+    installTargets = [
+      (stdenv.hostPlatform.linux-kernel.installTarget or (
+        if target == "uImage" && stdenv.hostPlatform.linuxArch == "arm" then
+          "uinstall"
+        else if
+          (target == "zImage" || target == "Image.gz" || target == "vmlinuz.efi")
+          && builtins.elem stdenv.hostPlatform.linuxArch [
+            "arm"
+            "arm64"
+            "parisc"
+            "riscv"
+          ]
+        then
+          "zinstall"
+        else
+          "install"
+      )
+      )
+    ];
+
+    karch = stdenv.hostPlatform.linuxArch;
+
+    pos = lib.optionalDrvAttr (pos != null) pos;
+
+    meta = {
+      # https://github.com/NixOS/nixpkgs/pull/345534#issuecomment-2391238381
+      broken = withRust && lib.versionOlder version "6.12";
+
+      description =
+        "The Linux kernel"
+        + (
+          if kernelPatches == [ ] then
+            ""
+          else
+            " (with patches: " + lib.concatStringsSep ", " (map (x: x.name) kernelPatches) + ")"
+        );
+      license = lib.licenses.gpl2Only;
+      homepage = "https://www.kernel.org/";
+      maintainers = [ maintainers.thoughtpolice ];
+      teams = [ teams.linux-kernel ];
+      platforms = platforms.linux;
+      badPlatforms =
+        lib.optionals (lib.versionOlder version "4.15") [
+          "riscv32-linux"
+          "riscv64-linux"
+        ]
+        ++ lib.optional (lib.versionOlder version "5.19") "loongarch64-linux";
+      timeout = 14400; # 4 hours
+      identifiers.cpeParts = {
+        part = "o";
+        vendor = "linux";
+        product = "linux_kernel";
+        inherit version;
+        update = "*";
+      };
+    }
+    // extraMeta;
+  }
 )

From 845e340ed98ef6d8a5c5d7069663f2cd034e508a Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 29 Sep 2025 11:45:57 +0200
Subject: [PATCH 2424/6226] linux: drop hacky passing around of positions

This is something I introduced in 63185299f4c8beecac7e204dc20394f38e68a477
to make sure the `version`/`src` attributes point to the files that declare
the version such that we get pinged by ofborg for updates.

This is long obsolete since the versions are maintained in a JSON file
now. Also, the kernel team is listed as owner in the ci/OWNERS file for
the entire subtree, so we definitely get pinged by CI nowadays.

Hence, remove the hackery.
---
 pkgs/os-specific/linux/kernel/generic.nix     | 59 +++++++------------
 .../linux/kernel/manual-config.nix            |  4 --
 2 files changed, 20 insertions(+), 43 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index cd3fc4a73b21..0121686b086a 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -24,6 +24,8 @@ let
   overridableKernel = lib.makeOverridable (
     # The kernel source tarball.
     {
+      pname ? "linux",
+
       src,
 
       # The kernel version.
@@ -96,25 +98,6 @@ let
     # files.
 
     let
-      # Dirty hack to make sure that `version` & `src` have
-      # `<nixpkgs/pkgs/os-specific/linux/kernel/linux-x.y.nix>` as position
-      # when using `builtins.unsafeGetAttrPos`.
-      #
-      # This is to make sure that ofborg actually detects changes in the kernel derivation
-      # and pings all maintainers.
-      #
-      # For further context, see https://github.com/NixOS/nixpkgs/pull/143113#issuecomment-953319957
-      basicArgs = removeAttrs args (
-        lib.filter (
-          x:
-          !(builtins.elem x [
-            "version"
-            "pname"
-            "src"
-          ])
-        ) (lib.attrNames args)
-      );
-
       # Combine the `features' attribute sets of all the kernel patches.
       kernelFeatures = lib.foldr (x: y: (x.features or { }) // y) (
         {
@@ -298,26 +281,25 @@ let
         };
       }; # end of configfile derivation
 
-      kernel = (callPackage ./manual-config.nix { inherit lib stdenv buildPackages; }) (
-        basicArgs
-        // {
-          inherit
-            kernelPatches
-            randstructSeed
-            extraMakeFlags
-            extraMeta
-            configfile
-            modDirVersion
-            ;
-          pos = builtins.unsafeGetAttrPos "version" args;
+      kernel = (callPackage ./manual-config.nix { inherit lib stdenv buildPackages; }) {
+        inherit
+          pname
+          version
+          src
+          kernelPatches
+          randstructSeed
+          extraMakeFlags
+          extraMeta
+          configfile
+          modDirVersion
+          ;
 
-          config = {
-            CONFIG_MODULES = "y";
-            CONFIG_FW_LOADER = "y";
-            CONFIG_RUST = if withRust then "y" else "n";
-          };
-        }
-      );
+        config = {
+          CONFIG_MODULES = "y";
+          CONFIG_FW_LOADER = "y";
+          CONFIG_RUST = if withRust then "y" else "n";
+        };
+      };
 
     in
     kernel.overrideAttrs (
@@ -326,7 +308,6 @@ let
         passthru =
           previousAttrs.passthru or { }
           // extraPassthru
-          // basicArgs
           // {
             features = kernelFeatures;
             inherit
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/manual-config.nix
index 807fd00e504f..0839eaa9fdd9 100644
--- a/pkgs/os-specific/linux/kernel/manual-config.nix
+++ b/pkgs/os-specific/linux/kernel/manual-config.nix
@@ -51,8 +51,6 @@ lib.makeOverridable (
     version,
     # The kernel pname (should be set for variants)
     pname ? "linux",
-    # Position of the Linux build expression
-    pos ? null,
     # Additional kernel make flags
     extraMakeFlags ? [ ],
     # The name of the kernel module directory
@@ -551,8 +549,6 @@ lib.makeOverridable (
 
     karch = stdenv.hostPlatform.linuxArch;
 
-    pos = lib.optionalDrvAttr (pos != null) pos;
-
     meta = {
       # https://github.com/NixOS/nixpkgs/pull/345534#issuecomment-2391238381
       broken = withRust && lib.versionOlder version "6.12";

From 1965f3c77d37f0f03b77ebb9095a9222646baeb5 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Mon, 29 Sep 2025 12:13:05 +0200
Subject: [PATCH 2425/6226] linux: manual-config.nix -> build.nix

Since I started touching this subsystem, I found the name confusing
since this is the part where we actually compile the kernel and we have
a ready-to-use configuration.

The stated goal of the commit introducing it[1] is to provide a function
to

> make it possible to build a kernel with a user provided .config.

Considering that this is supposed to be a differentiation from other
build mechanisms and nowadays this is the only way to build kernels in
nixpkgs, I figured that `build.nix` is a better name.

`pkgs.linuxManualConfig` isn't renamed on purpose: Kloenk and I are
planning to do more involved work and it may become necessary to change
parts of the API. So asking users to do a migration now just to add
another one soon isn't worth it.

[1] bf7467cbb1f08470854db73ee2c07d9f896aefc8
---
 doc/packages/linux.section.md                                 | 4 ++--
 .../os-specific/linux/kernel/{manual-config.nix => build.nix} | 0
 pkgs/os-specific/linux/kernel/generic.nix                     | 2 +-
 pkgs/top-level/linux-kernels.nix                              | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/os-specific/linux/kernel/{manual-config.nix => build.nix} (100%)

diff --git a/doc/packages/linux.section.md b/doc/packages/linux.section.md
index 8551c77d940d..9722b22fd2f5 100644
--- a/doc/packages/linux.section.md
+++ b/doc/packages/linux.section.md
@@ -5,7 +5,7 @@ The Nix expressions to build the Linux kernel are in [`pkgs/os-specific/linux/ke
 The function [`pkgs.buildLinux`](https://github.com/NixOS/nixpkgs/blob/d77bda728d5041c1294a68fb25c79e2d161f62b9/pkgs/os-specific/linux/kernel/generic.nix) builds a kernel with [common configuration values](https://github.com/NixOS/nixpkgs/blob/d77bda728d5041c1294a68fb25c79e2d161f62b9/pkgs/os-specific/linux/kernel/common-config.nix).
 This is the preferred option unless you have a very specific use case.
 Most kernels packaged in Nixpkgs are built that way, and it will also generate kernels suitable for NixOS.
-[`pkgs.linuxManualConfig`](https://github.com/NixOS/nixpkgs/blob/d77bda728d5041c1294a68fb25c79e2d161f62b9/pkgs/os-specific/linux/kernel/manual-config.nix) requires a complete configuration to be passed.
+[`pkgs.linuxManualConfig`](https://github.com/NixOS/nixpkgs/blob/d77bda728d5041c1294a68fb25c79e2d161f62b9/pkgs/os-specific/linux/kernel/build.nix) requires a complete configuration to be passed.
 It has fewer additional features than `pkgs.buildLinux`, which provides common configuration values and exposes the `features` attribute, as explained below.
 
 Both functions have an argument `kernelPatches` which should be a list of `{name, patch, extraConfig}` attribute sets, where `name` is the name of the patch (which is included in the kernel’s `meta.description` attribute), `patch` is the patch itself (possibly compressed), and `extraConfig` (optional) is a string specifying extra options to be concatenated to the kernel configuration file (`.config`).
@@ -75,7 +75,7 @@ pkgs.linuxPackages_custom {
 
 :::
 
-Additional attributes can be used with `linuxManualConfig` for further customisation instead of `linuxPackages_custom`. You're encouraged to read [the `pkgs.linuxManualConfig` source code](https://github.com/NixOS/nixpkgs/blob/d77bda728d5041c1294a68fb25c79e2d161f62b9/pkgs/os-specific/linux/kernel/manual-config.nix) to understand how to use them.
+Additional attributes can be used with `linuxManualConfig` for further customisation instead of `linuxPackages_custom`. You're encouraged to read [the `pkgs.linuxManualConfig` source code](https://github.com/NixOS/nixpkgs/blob/d77bda728d5041c1294a68fb25c79e2d161f62b9/pkgs/os-specific/linux/kernel/build.nix) to understand how to use them.
 
 To edit the `.config` file for Linux X.Y from within Nix, proceed as follows:
 
diff --git a/pkgs/os-specific/linux/kernel/manual-config.nix b/pkgs/os-specific/linux/kernel/build.nix
similarity index 100%
rename from pkgs/os-specific/linux/kernel/manual-config.nix
rename to pkgs/os-specific/linux/kernel/build.nix
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 0121686b086a..8eecd334df70 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -281,7 +281,7 @@ let
         };
       }; # end of configfile derivation
 
-      kernel = (callPackage ./manual-config.nix { inherit lib stdenv buildPackages; }) {
+      kernel = (callPackage ./build.nix { inherit lib stdenv buildPackages; }) {
         inherit
           pname
           version
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 0a43f3394372..879f525ab0cb 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -815,7 +815,7 @@ in
     linux_mptcp = throw "'linux_mptcp' has been moved to https://github.com/teto/mptcp-flake";
   };
 
-  manualConfig = callPackage ../os-specific/linux/kernel/manual-config.nix { };
+  manualConfig = callPackage ../os-specific/linux/kernel/build.nix { };
 
   customPackage =
     {

From dcd19e2ebf69d8693e709660dabcb2df2c39acc1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 16:11:15 +0000
Subject: [PATCH 2426/6226] phpExtensions.blackfire: 1.92.42 -> 1.92.48

---
 pkgs/by-name/bl/blackfire/php-probe.nix | 42 ++++++++++++-------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix
index 531d21ac4992..c8046c46e19b 100644
--- a/pkgs/by-name/bl/blackfire/php-probe.nix
+++ b/pkgs/by-name/bl/blackfire/php-probe.nix
@@ -16,52 +16,52 @@ let
   phpMajor = lib.versions.majorMinor php.version;
   inherit (stdenv.hostPlatform) system;
 
-  version = "1.92.42";
+  version = "1.92.48";
 
   hashes = {
     "x86_64-linux" = {
       system = "amd64";
       hash = {
-        "8.1" = "sha256-vj/Z7fGQqUfWOpCi2TV4tiu2LCdTPhUJXeinL09LgeM=";
-        "8.2" = "sha256-K1h0fH9PH/LT+8EecJ0GTJxpuc4hszG9mbcvNc/6bEs=";
-        "8.3" = "sha256-U0meas8ZMPnlDuMsMoGLYBZsRBrrSmTSuryhFRmzZ/4=";
-        "8.4" = "sha256-znvTd6QR+rfRQG1w0SEWgEDxzBWiVWOf7VH25b2Sryo=";
+        "8.1" = "sha256-QrZxLPpybFhx07zaorbziEumcTFhPvcr7Jp+YPev978=";
+        "8.2" = "sha256-tdKr+LWQVC1yFUpJeUMDXbADNf5YEDbtFQaKDDBPH5g=";
+        "8.3" = "sha256-1Bix9VvBj2fJxFrLe3oQgOoWUw56yBOBgHr5TFVy/kM=";
+        "8.4" = "sha256-WAPBF6WC2zjE8lcs+oYlDc4uw9AL3xh74BwthTGWRR0=";
       };
     };
     "i686-linux" = {
       system = "i386";
       hash = {
-        "8.1" = "sha256-B2FcYKVz4sDSUlI5QifUCbX7XZME2XqaAhUVnHH+C2s=";
-        "8.2" = "sha256-k6C7Wl9O0icBQjYOjO0Hy0NitKbM9TOxTV0F4OM04LQ=";
-        "8.3" = "sha256-4EaRYLJ1I7oH0Ux1/IrOD67iWVKx9GU1uMVUA0AwrRk=";
-        "8.4" = "sha256-aNcl27Do6NoCuUHiFeDwTSVU1m0imxrMR+yiyq7/owQ=";
+        "8.1" = "sha256-sVvlvZU1orXVcoL//6LREjKoolBMYCbp1kdLGmu2n5A=";
+        "8.2" = "sha256-+ki66xW3g/LB2gtkb2RR3NOQa53ni+ZwcyMMz9sAPlY=";
+        "8.3" = "sha256-OyljLCFUyrdKh11760t9KdqJ4PX2dVYNEL09xJZed3Q=";
+        "8.4" = "sha256-QH8vFkFDGyR+MaSX5cVfxPN8MOfyAuWhMKVfqPUhjnk=";
       };
     };
     "aarch64-linux" = {
       system = "arm64";
       hash = {
-        "8.1" = "sha256-5PcD4HnlZmgkP+fsZhBaDGbDQCoQ/Om3om3cpouTF8s=";
-        "8.2" = "sha256-wIa2Yv4q0d3jtNvMAFTq8d3Gznl88uhqyvCBtwJtMkY=";
-        "8.3" = "sha256-Fwhv7rVGsmXFcBR5E17S4tt1mEzYlxbzaz996sqbwxs=";
-        "8.4" = "sha256-ftsKeJ/TOJAavNt8VGSzJR+Bo/KcW+o5Dym2flbHxag=";
+        "8.1" = "sha256-1mgubWu32VjdoQSzHrdpGOBeh0cwPUwplMg4KlZZT0o=";
+        "8.2" = "sha256-7xc4lLE6ZHUstFxTWQ9ACdGuM+gk5oDGvKwFew65Mpk=";
+        "8.3" = "sha256-yBSSEb6clcn01Jl3rsVrak5xaOgYq8NuWE/m+hwtzxY=";
+        "8.4" = "sha256-+YdfU0t9r1rqK0FYKkZYvJXSFscmSZqn59mpEYBdgck=";
       };
     };
     "aarch64-darwin" = {
       system = "arm64";
       hash = {
-        "8.1" = "sha256-MR4Icjufw5dSxRKv1gJPP38Vow+PZp2/OofKOGkr/Nk=";
-        "8.2" = "sha256-RRwF0NKhGxZH0SNOGzr2eVg6ZDDThNgd9HBgv+Q9wCw=";
-        "8.3" = "sha256-91uv7sxf19+12/Rja1SehbIKBiE+teZv+F0lOi7KUEQ=";
-        "8.4" = "sha256-v4SnkF4DtPpB5TBiSnJYJs+KRI5IpIcKeQECVCrkdLw=";
+        "8.1" = "sha256-xadHLt5wwbjYVFPJ85Crim2jwpCFIB3u3UrKguo5dKs=";
+        "8.2" = "sha256-yypsjRm5wQFWpnxwki0ySmabhW4OnRuxghCgF3g/gC8=";
+        "8.3" = "sha256-xbZnN0FAMSb5PKU6UFjC60+d/Y9rINyFjrBsJpSKUhA=";
+        "8.4" = "sha256-7iX3Pa7+hxY4rKM9hfaoMJWwGC8MbYjOpSY+iP3vUhc=";
       };
     };
     "x86_64-darwin" = {
       system = "amd64";
       hash = {
-        "8.1" = "sha256-HzBzT8pTsc/iIMDcEQlb24f8EIYdhRqxKjb7FxB6OaY=";
-        "8.2" = "sha256-Tr9quIzQWmSMHpvZ18u2OoCP16CHpcbWxKyZeY4zJJM=";
-        "8.3" = "sha256-PmPxE29qwHJKSaTdoZQiJcwobkDMKMEcEB8ZZWFonb4=";
-        "8.4" = "sha256-f+Hn9yCtaDmWendB85ca4+6xd9eG3y+5tLTV7Qi9lPA=";
+        "8.1" = "sha256-CpbeEqyi/QyapWuZQI16E6cNalvRZVCmvHy2dv/RSQo=";
+        "8.2" = "sha256-v68HLqnFKm88LAMbC8VCJgdWSuW4fWCQyPm1kNgG/K4=";
+        "8.3" = "sha256-QLsyUKKbqi/1leNKqADbvsRmwe2f387tQ4NlKGiftOc=";
+        "8.4" = "sha256-hc+BxTod1UcMYIBsiC/MPE9IbNO1/q+MIU+xv6dF/YU=";
       };
     };
   };

From ed6e532faa85d1093a02f7cfaf4a48f7cbf54547 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 16:11:32 +0000
Subject: [PATCH 2427/6226] keycloak: 26.4.1 -> 26.4.2

---
 pkgs/by-name/ke/keycloak/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix
index c9ee2bbe0b7b..c0e4d6f5665d 100644
--- a/pkgs/by-name/ke/keycloak/package.nix
+++ b/pkgs/by-name/ke/keycloak/package.nix
@@ -24,11 +24,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "keycloak";
-  version = "26.4.1";
+  version = "26.4.2";
 
   src = fetchzip {
     url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip";
-    hash = "sha256-TUTTBsxRuk907OLFxFyABuOGMaO7EjqnzD0eEQVfl98=";
+    hash = "sha256-Gq4nfr3rzd58TpAM1EYoj3R856IWcR3sz63Au3UanwQ=";
   };
 
   nativeBuildInputs = [

From ddee9d53fdc36038851b4ad8e5f3e3c2ff7ec273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20St=C3=BChrk?= <andy@hammerhartes.de>
Date: Fri, 24 Oct 2025 17:56:52 +0200
Subject: [PATCH 2428/6226] treewide: remove myself as maintainer from most
 packages

This mostly has been reality for a while now. I still use some of the
packages, but don't have the capacity to maintain them.
---
 maintainers/team-list.nix                                        | 1 -
 nixos/tests/aesmd.nix                                            | 1 -
 pkgs/by-name/pu/pulumi/package.nix                               | 1 -
 pkgs/by-name/pu/pulumi/plugins/pulumi-aws-native/package.nix     | 1 -
 pkgs/by-name/pu/pulumi/plugins/pulumi-azure-native/package.nix   | 1 -
 pkgs/by-name/pu/pulumi/plugins/pulumi-command/package.nix        | 1 -
 pkgs/by-name/pu/pulumi/plugins/pulumi-random/package.nix         | 1 -
 .../pu/pulumi/plugins/pulumi-yandex-unofficial/package.nix       | 1 -
 pkgs/by-name/sg/sgx-azure-dcap-client/package.nix                | 1 -
 pkgs/by-name/sg/sgx-ssl/package.nix                              | 1 -
 10 files changed, 10 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 89fcb5dc007e..39e07c3294cc 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -1260,7 +1260,6 @@ with lib.maintainers;
       samasaur
       stephank
       trepetti
-      trundle
     ];
     scope = "Maintain Swift compiler suite for NixOS.";
     shortName = "Swift";
diff --git a/nixos/tests/aesmd.nix b/nixos/tests/aesmd.nix
index b7939508b0e3..f541cba289bf 100644
--- a/nixos/tests/aesmd.nix
+++ b/nixos/tests/aesmd.nix
@@ -3,7 +3,6 @@
   name = "aesmd";
   meta = {
     maintainers = with lib.maintainers; [
-      trundle
       veehaitch
     ];
   };
diff --git a/pkgs/by-name/pu/pulumi/package.nix b/pkgs/by-name/pu/pulumi/package.nix
index e981ff31fedc..ee00476e5003 100644
--- a/pkgs/by-name/pu/pulumi/package.nix
+++ b/pkgs/by-name/pu/pulumi/package.nix
@@ -187,7 +187,6 @@ buildGoModule rec {
     license = lib.licenses.asl20;
     mainProgram = "pulumi";
     maintainers = with lib.maintainers; [
-      trundle
       veehaitch
       tie
     ];
diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-aws-native/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-aws-native/package.nix
index af57f166b702..38f8b999164f 100644
--- a/pkgs/by-name/pu/pulumi/plugins/pulumi-aws-native/package.nix
+++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-aws-native/package.nix
@@ -33,7 +33,6 @@ mkPulumiPackage rec {
     license = licenses.asl20;
     maintainers = with maintainers; [
       veehaitch
-      trundle
     ];
   };
 }
diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-azure-native/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-azure-native/package.nix
index 75356bff0221..9d8798999e50 100644
--- a/pkgs/by-name/pu/pulumi/plugins/pulumi-azure-native/package.nix
+++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-azure-native/package.nix
@@ -38,7 +38,6 @@ mkPulumiPackage rec {
     license = licenses.asl20;
     maintainers = with maintainers; [
       veehaitch
-      trundle
     ];
   };
 }
diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-command/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-command/package.nix
index 30910187208b..8e6c919b3e46 100644
--- a/pkgs/by-name/pu/pulumi/plugins/pulumi-command/package.nix
+++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-command/package.nix
@@ -32,7 +32,6 @@ mkPulumiPackage rec {
     license = licenses.asl20;
     maintainers = with maintainers; [
       veehaitch
-      trundle
     ];
   };
 }
diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-random/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-random/package.nix
index 63461ae13713..1180c64ee6b7 100644
--- a/pkgs/by-name/pu/pulumi/plugins/pulumi-random/package.nix
+++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-random/package.nix
@@ -22,7 +22,6 @@ mkPulumiPackage rec {
     license = licenses.asl20;
     maintainers = with maintainers; [
       veehaitch
-      trundle
     ];
   };
 }
diff --git a/pkgs/by-name/pu/pulumi/plugins/pulumi-yandex-unofficial/package.nix b/pkgs/by-name/pu/pulumi/plugins/pulumi-yandex-unofficial/package.nix
index f74d82ec1268..11729d2e29f2 100644
--- a/pkgs/by-name/pu/pulumi/plugins/pulumi-yandex-unofficial/package.nix
+++ b/pkgs/by-name/pu/pulumi/plugins/pulumi-yandex-unofficial/package.nix
@@ -25,7 +25,6 @@ mkPulumiPackage rec {
     maintainers = with maintainers; [
       tie
       veehaitch
-      trundle
     ];
     mainProgram = cmdRes;
   };
diff --git a/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix b/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
index bbb193b325eb..136bb5bc3474 100644
--- a/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
+++ b/pkgs/by-name/sg/sgx-azure-dcap-client/package.nix
@@ -90,7 +90,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/microsoft/azure-dcap-client";
     maintainers = with lib.maintainers; [
       phlip9
-      trundle
       veehaitch
     ];
     platforms = [ "x86_64-linux" ];
diff --git a/pkgs/by-name/sg/sgx-ssl/package.nix b/pkgs/by-name/sg/sgx-ssl/package.nix
index 18bf86f99435..cac1c5e28a75 100644
--- a/pkgs/by-name/sg/sgx-ssl/package.nix
+++ b/pkgs/by-name/sg/sgx-ssl/package.nix
@@ -84,7 +84,6 @@ stdenv.mkDerivation {
     homepage = "https://github.com/intel/intel-sgx-ssl";
     maintainers = with lib.maintainers; [
       phlip9
-      trundle
       veehaitch
     ];
     platforms = [ "x86_64-linux" ];

From b56dc8916f5dc76028488c45e0ac732126139223 Mon Sep 17 00:00:00 2001
From: Minijackson <minijackson@riseup.net>
Date: Fri, 24 Oct 2025 09:48:49 +0200
Subject: [PATCH 2429/6226] doc: add warnings to Jellyfin warning in 25.11
 release notes

---
 doc/release-notes/rl-2511.section.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 77bdf0b9bdaf..5aad9fd75b75 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -304,6 +304,9 @@
 - `jellyfin` was updated to `10.11.x`, which includes heavy backend changes.
   Make sure to backup your data and configuration directories
   and read the [Jellyfin 10.11.0 release announcement](https://jellyfin.org/posts/jellyfin-release-10.11.0/).
+  **Important:** make sure you're running Jellyfin version `10.10.7` before upgrading,
+  and beware that the migration may take several hours depending on your library size and state.
+  The process must not be interrupted.
 
 - A new hardening flag, `glibcxxassertions` was made available, corresponding to the glibc `_GLIBCXX_ASSERTIONS` option.
 

From 2738fdb521feaee4feb47fdc96e67664d80e6ce7 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 24 Oct 2025 13:26:16 -0300
Subject: [PATCH 2430/6226] vmmlib: 1.6.2 -> 1.14.0

---
 pkgs/by-name/vm/vmmlib/disable-cpack.patch | 11 -----------
 pkgs/by-name/vm/vmmlib/package.nix         | 23 ++++++++++++++++------
 2 files changed, 17 insertions(+), 17 deletions(-)
 delete mode 100644 pkgs/by-name/vm/vmmlib/disable-cpack.patch

diff --git a/pkgs/by-name/vm/vmmlib/disable-cpack.patch b/pkgs/by-name/vm/vmmlib/disable-cpack.patch
deleted file mode 100644
index 8b9a7983a928..000000000000
--- a/pkgs/by-name/vm/vmmlib/disable-cpack.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -ur a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	1970-01-01 00:00:01.000000000 +0000
-+++ b/CMakeLists.txt	2016-02-19 08:49:30.053759000 +0000
-@@ -178,6 +178,5 @@
- install(FILES ${DOCS} DESTINATION share/vmmlib COMPONENT dev)
- 
- include(DoxygenRule) # must be after all targets
--include(CPackConfig)
- include(CTest)
--include(PackageConfig)
-+
diff --git a/pkgs/by-name/vm/vmmlib/package.nix b/pkgs/by-name/vm/vmmlib/package.nix
index 3a15b69d453a..426a4c04fd80 100644
--- a/pkgs/by-name/vm/vmmlib/package.nix
+++ b/pkgs/by-name/vm/vmmlib/package.nix
@@ -9,18 +9,21 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.6.2";
+  version = "1.14.0";
   pname = "vmmlib";
 
   src = fetchFromGitHub {
-    owner = "VMML";
+    owner = "Eyescale";
     repo = "vmmlib";
-    rev = "release-${version}";
-    sha256 = "0sn6jl1r5k6ka0vkjsdnn14hb95dqq8158dapby6jk72wqj9kdml";
+    tag = "${version}";
+    hash = "sha256-QEfeQcE66XbsFTN/Fojgldem5C+RhbOBmRyBX3sfUrg=";
+
+    fetchSubmodules = true;
   };
 
-  patches = [
-    ./disable-cpack.patch # disable the need of cpack/rpm
+  cmakeFlags = [
+    # Prevent -Werror=deprecated-copy from failing the build
+    "-DCMAKE_CXX_FLAGS=-Wno-error=deprecated-copy"
   ];
 
   nativeBuildInputs = [
@@ -32,6 +35,14 @@ stdenv.mkDerivation rec {
     lapack
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "include(CPackConfig)" ""
+    substituteInPlace CMake/common/Common.cmake \
+      --replace-fail "cmake_minimum_required(VERSION 3.1 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   doCheck = !stdenv.hostPlatform.isDarwin;
 
   checkTarget = "test";

From 88608440c2ffae6de57bbf10dd29d4b744f46412 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 16:26:22 +0000
Subject: [PATCH 2431/6226] files-cli: 2.15.121 -> 2.15.126

---
 pkgs/by-name/fi/files-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix
index 19649c847950..f673af2539e1 100644
--- a/pkgs/by-name/fi/files-cli/package.nix
+++ b/pkgs/by-name/fi/files-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "files-cli";
-  version = "2.15.121";
+  version = "2.15.126";
 
   src = fetchFromGitHub {
     repo = "files-cli";
     owner = "files-com";
     rev = "v${version}";
-    hash = "sha256-Lf+kWLmCMbP0FIPxmtroakv1RayqTqMrFhYpVBoHqiA=";
+    hash = "sha256-eZK3boCydiecyrdAaDaMiNQH5vqPR2itWG6qRd2S1Bc=";
   };
 
-  vendorHash = "sha256-GygNBB7ydaq11vU2wY9i/ZHmmLomMDKr4cJSdpcEoxk=";
+  vendorHash = "sha256-4HIu3KraynnBe5Vn74PFIlvWUvT/yk5hfwGiOiRnKgM=";
 
   ldflags = [
     "-s"

From dcc495f16da2a56b0f183c772ac64ad36cc6cd71 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 16:38:37 +0000
Subject: [PATCH 2432/6226] python3Packages.bentoml: 1.4.26 -> 1.4.27

---
 pkgs/development/python-modules/bentoml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix
index 7052616eb80a..b17d9fcac1ae 100644
--- a/pkgs/development/python-modules/bentoml/default.nix
+++ b/pkgs/development/python-modules/bentoml/default.nix
@@ -80,7 +80,7 @@
 }:
 
 let
-  version = "1.4.26";
+  version = "1.4.27";
   aws = [ fs-s3fs ];
   grpc = [
     grpcio
@@ -130,7 +130,7 @@ let
     owner = "bentoml";
     repo = "BentoML";
     tag = "v${version}";
-    hash = "sha256-ORddC+rbK1vWwgY2vGNPoR9ot/a0EhU72HHubYTk+ac=";
+    hash = "sha256-B1slcxNIqT6+xRQkTTCXFjUyFfiBv5En+gYY6lAJJuU=";
   };
 in
 buildPythonPackage {

From 175a0fc138fee3161c19623a154c34546cbbc96a Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@users.noreply.github.com>
Date: Sun, 31 Aug 2025 12:54:42 -0700
Subject: [PATCH 2433/6226] ceph: patch getopt path at build time

---
 nixos/modules/services/network-filesystems/ceph.nix | 2 --
 pkgs/by-name/ce/ceph/package.nix                    | 9 +++++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix
index fa9c7955afde..c5d7e365fe67 100644
--- a/nixos/modules/services/network-filesystems/ceph.nix
+++ b/nixos/modules/services/network-filesystems/ceph.nix
@@ -45,8 +45,6 @@ let
       partOf = [ "ceph-${daemonType}.target" ];
       wantedBy = [ "ceph-${daemonType}.target" ];
 
-      path = [ pkgs.getopt ];
-
       # Don't start services that are not yet initialized
       unitConfig.ConditionPathExists = "/var/lib/${stateDirectory}/keyring";
       startLimitBurst =
diff --git a/pkgs/by-name/ce/ceph/package.nix b/pkgs/by-name/ce/ceph/package.nix
index 4f8371cd7d2b..3003e8893957 100644
--- a/pkgs/by-name/ce/ceph/package.nix
+++ b/pkgs/by-name/ce/ceph/package.nix
@@ -52,6 +52,7 @@
   cunit,
   e2fsprogs,
   doxygen,
+  getopt,
   gperf,
   graphviz,
   gnugrep,
@@ -518,6 +519,10 @@ stdenv.mkDerivation {
     substituteInPlace src/client/fuse_ll.cc \
       --replace-fail "mount -i -o remount" "${util-linux}/bin/mount -i -o remount"
 
+    substituteInPlace src/{ceph-osd-prestart.sh,ceph-post-file.in,init-ceph.in} \
+       --replace-fail "GETOPT=/usr/local/bin/getopt" "GETOPT=${getopt}/bin/getopt" \
+       --replace-fail "GETOPT=getopt" "GETOPT=${getopt}/bin/getopt"
+
     # The install target needs to be in PYTHONPATH for "*.pth support" check to succeed
     export PYTHONPATH=$PYTHONPATH:$lib/${sitePackages}:$out/${sitePackages}
     patchShebangs src/
@@ -584,6 +589,10 @@ stdenv.mkDerivation {
     # silently drop it with misconfigurations.
     test -f $out/bin/ceph-volume
 
+    # Assert that getopt patch from preConfigure covered all instances
+    ! grep -F -r 'GETOPT=getopt' $out
+    ! grep -F -r 'GETOPT=/usr/local/bin/getopt' $out
+
     mkdir -p $client/{bin,etc,${sitePackages},share/bash-completion/completions}
     cp -r $out/bin/{ceph,.ceph-wrapped,rados,rbd,rbdmap} $client/bin
     cp -r $out/bin/ceph-{authtool,conf,dencoder,rbdnamer,syn} $client/bin

From 705e80fc2cc761e973c1982d0f414e33037ae205 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 24 Oct 2025 16:44:40 +0000
Subject: [PATCH 2434/6226] vimPlugins.venv-selector-nvim: init at 2025-10-21

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 73bf6c5e54ee..21a4b22f4d4b 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -16146,6 +16146,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  venv-selector-nvim = buildVimPlugin {
+    pname = "venv-selector.nvim";
+    version = "2025-10-21";
+    src = fetchFromGitHub {
+      owner = "linux-cultist";
+      repo = "venv-selector.nvim";
+      rev = "9d528643ab17795c69dc42ce018120c397a36f8b";
+      sha256 = "03jag019p5kfwghff0f1w0xk3sfkpza71pprpm7gnwxi49y77pvi";
+    };
+    meta.homepage = "https://github.com/linux-cultist/venv-selector.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   verilog_systemverilog-vim = buildVimPlugin {
     pname = "verilog_systemverilog.vim";
     version = "2024-10-13";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index fade945e948b..99fd521eb44c 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1239,6 +1239,7 @@ https://github.com/KabbAmine/vCoolor.vim/,,
 https://github.com/junegunn/vader.vim/,,
 https://github.com/vague-theme/vague.nvim/,HEAD,
 https://github.com/jbyuki/venn.nvim/,,
+https://github.com/linux-cultist/venv-selector.nvim/,HEAD,
 https://github.com/vhda/verilog_systemverilog.vim/,,
 https://github.com/vifm/vifm.vim/,,
 https://github.com/Konfekt/vim-CtrlXA/,,

From a38cdcdf945da4b478fd5b5f01a5375d466269e2 Mon Sep 17 00:00:00 2001
From: Yuri <hi@yuri.li>
Date: Fri, 24 Oct 2025 18:48:11 +0200
Subject: [PATCH 2435/6226] feishin 0.20.1 -> 0.21.2

---
 pkgs/by-name/fe/feishin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix
index 400ac62181f7..466457283ebc 100644
--- a/pkgs/by-name/fe/feishin/package.nix
+++ b/pkgs/by-name/fe/feishin/package.nix
@@ -12,13 +12,13 @@
 }:
 let
   pname = "feishin";
-  version = "0.20.1";
+  version = "0.21.2";
 
   src = fetchFromGitHub {
     owner = "jeffvli";
     repo = "feishin";
     tag = "v${version}";
-    hash = "sha256-WJMaLMrv6LSw/wxn7EZOSYqwAlgW3UkeYvxV4vEkCfM=";
+    hash = "sha256-F5m0hsN1BLfiUcl2Go54bpFnN8ktn6Rqa/df1xxoCA4=";
   };
 
   electron = electron_36;
@@ -39,7 +39,7 @@ buildNpmPackage {
       src
       ;
     fetcherVersion = 2;
-    hash = "sha256-8di4WZ30oE4q3l8Nthgihk6q+ob/Mz/UrofrtsLFzhc=";
+    hash = "sha256-5jEXdQMZ6a0JuhjPS1eZOIGsIGQHd6nKPI02eeR35pg=";
   };
 
   env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";

From b4a5d57b82458325ea41c296b253e1ec77421149 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 17:01:46 +0000
Subject: [PATCH 2436/6226] mbake: 1.4.2.post1 -> 1.4.3

---
 pkgs/by-name/mb/mbake/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mb/mbake/package.nix b/pkgs/by-name/mb/mbake/package.nix
index 5ad1b65acbee..a9e69f8e4146 100644
--- a/pkgs/by-name/mb/mbake/package.nix
+++ b/pkgs/by-name/mb/mbake/package.nix
@@ -9,14 +9,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "mbake";
-  version = "1.4.2.post1";
+  version = "1.4.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "EbodShojaei";
     repo = "bake";
     tag = "v${version}";
-    hash = "sha256-3wEVlxPO5Hyemm6uM6+W/nhaY64xygfLCjlJgTHzuTg=";
+    hash = "sha256-afVXgS3OTYygfMYsz4zO+THau/8CUU/AWVT2bPDq9sg=";
   };
 
   build-system = [

From 0fda0e38cfb6949fde8a0917fcd89f759b01de13 Mon Sep 17 00:00:00 2001
From: Yuri <hi@yuri.li>
Date: Fri, 24 Oct 2025 19:04:04 +0200
Subject: [PATCH 2437/6226] Fix Darwin build error

---
 pkgs/by-name/fe/feishin/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix
index 466457283ebc..681819df852d 100644
--- a/pkgs/by-name/fe/feishin/package.nix
+++ b/pkgs/by-name/fe/feishin/package.nix
@@ -96,7 +96,7 @@ buildNpmPackage {
   ''
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/{Applications,bin}
-    cp -r release/build/**/Feishin.app $out/Applications/
+    cp -r dist/**/Feishin.app $out/Applications/
     makeWrapper $out/Applications/Feishin.app/Contents/MacOS/Feishin $out/bin/feishin
   ''
   + lib.optionalString stdenv.hostPlatform.isLinux ''

From f527620e4082a67c301f2b008825b42abc2b9f3b Mon Sep 17 00:00:00 2001
From: loudgolem <phanirithvij2000@gmail.com>
Date: Fri, 24 Oct 2025 22:39:33 +0530
Subject: [PATCH 2438/6226] apprise: licenses.bsd3 -> bsd2

It was changed after https://github.com/caronc/apprise/commit/34e52e5d9285f2612244560aca13abf3b2fe6dc1
---
 pkgs/development/python-modules/apprise/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/apprise/default.nix b/pkgs/development/python-modules/apprise/default.nix
index 4bf5cedaa077..3f7d2cf211f0 100644
--- a/pkgs/development/python-modules/apprise/default.nix
+++ b/pkgs/development/python-modules/apprise/default.nix
@@ -72,7 +72,7 @@ buildPythonPackage rec {
     description = "Push Notifications that work with just about every platform";
     homepage = "https://github.com/caronc/apprise";
     changelog = "https://github.com/caronc/apprise/releases/tag/v${version}";
-    license = lib.licenses.bsd3;
+    license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [ getchoo ];
     mainProgram = "apprise";
   };

From f6d81d86335cff66fe970a124c24ffc0abbfe6d5 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Fri, 24 Oct 2025 19:13:17 +0200
Subject: [PATCH 2439/6226] {palemoon-bin,palemoon-gtk2-bin}: 33.9.0.1 ->
 33.9.1

---
 pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix
index 96e0a2ab8a93..10841acb7672 100644
--- a/pkgs/applications/networking/browsers/palemoon/bin.nix
+++ b/pkgs/applications/networking/browsers/palemoon/bin.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "palemoon-bin";
-  version = "33.9.0.1";
+  version = "33.9.1";
 
   src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}";
 
@@ -173,11 +173,11 @@ stdenv.mkDerivation (finalAttrs: {
       {
         gtk3 = fetchzip {
           urls = urlRegionVariants "gtk3";
-          hash = "sha256-QhER20l8GP0wQ0pDVwBZbYb2FImbX0kiUS9RCcR7gvg=";
+          hash = "sha256-muFqS3NpYX0Walhd+RFIZh7pUKQ5ZbPMZJasm9+rqTE=";
         };
         gtk2 = fetchzip {
           urls = urlRegionVariants "gtk2";
-          hash = "sha256-13lq59H8xGNbZHalZo87xAaoQg61t2v+B/LXnPoEyoU=";
+          hash = "sha256-lRFXpv+dp3ALVSiEDwE4kiaVjBX5XuVZeugEr+St53I=";
         };
       };
 

From 715a86abe3b40912b96370f35dc99330d3c776e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 24 Oct 2025 10:14:13 -0700
Subject: [PATCH 2440/6226] python3Packages.aiotarfile: 0.5.1 -> 0.5.2

Diff: https://github.com/rhelmot/aiotarfile/compare/v0.5.1...v0.5.2

Changelog: https://github.com/rhelmot/aiotarfile/commits/v0.5.2
---
 .../python-modules/aiotarfile/default.nix          | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/aiotarfile/default.nix b/pkgs/development/python-modules/aiotarfile/default.nix
index fe9cfbd2fb83..84068164ee63 100644
--- a/pkgs/development/python-modules/aiotarfile/default.nix
+++ b/pkgs/development/python-modules/aiotarfile/default.nix
@@ -1,10 +1,8 @@
 {
   lib,
   fetchFromGitHub,
-  nix-update-script,
   buildPythonPackage,
   unittestCheckHook,
-  pythonOlder,
   cargo,
   rustc,
   rustPlatform,
@@ -12,21 +10,19 @@
 
 buildPythonPackage rec {
   pname = "aiotarfile";
-  version = "0.5.1";
+  version = "0.5.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "rhelmot";
     repo = "aiotarfile";
     tag = "v${version}";
-    hash = "sha256-DslG+XxIYb04I3B7m0fmRmE3hFCczF039QhSVdHGPL8=";
+    hash = "sha256-V88cvVw6ss7iiojhlqDd2frG/gCEH0YKTP0IpgeFASw=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-e3NbFlBQu9QkGnIwqy2OmlQFVHjlfpMVRFWD2ADGGSc=";
+    hash = "sha256-Yf6N615X9ZB+HDp3xehMc3kjKbdsSbIJrqARRXwCRDQ=";
   };
 
   nativeBuildInputs = [
@@ -42,12 +38,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aiotarfile" ];
 
-  passthru.updateScript = nix-update-script { };
-
   meta = {
     description = "Stream-based, asynchronous tarball processing";
     homepage = "https://github.com/rhelmot/aiotarfile";
-    changelog = "https://github.com/rhelmot/aiotarfile/commits/v{version}";
+    changelog = "https://github.com/rhelmot/aiotarfile/commits/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ nicoo ];
   };

From 274de6a8cf3e1a8d64a6a1e700d885c765eb52fe Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 24 Oct 2025 14:23:27 -0300
Subject: [PATCH 2441/6226] lxqt.lxqt-build-tools_0_13: fix build with cmake4

---
 pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
index abb1611778da..e08032f99160 100644
--- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
@@ -33,6 +33,10 @@ stdenv.mkDerivation rec {
     # Without this, dependants fail to link.
     substituteInPlace cmake/modules/LXQtCompilerSettings.cmake \
       --replace-fail AppleClang Clang
+  ''
+  + lib.optionalString (lib.versionOlder version "2.2.1") ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [

From 67bf5838945fbe9ea2d8202c75d890ba053e1a38 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 24 Oct 2025 19:28:18 +0200
Subject: [PATCH 2442/6226] sdl-jstest: 2018-06-15 -> 0.2.2-unstable-2025-03-27

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/sd/sdl-jstest/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sd/sdl-jstest/package.nix b/pkgs/by-name/sd/sdl-jstest/package.nix
index 5292d012d0df..57e47ca9ef61 100644
--- a/pkgs/by-name/sd/sdl-jstest/package.nix
+++ b/pkgs/by-name/sd/sdl-jstest/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation {
   pname = "sdl-jstest";
-  version = "2018-06-15";
+  version = "0.2.2-unstable-2025-03-27";
 
   src = fetchFromGitHub {
     owner = "Grumbel";
     repo = "sdl-jstest";
-    rev = "aafbdb1ed3e687583037ba55ae88b1210d6ce98b";
-    hash = "sha256-Mw+ENOVZ0O8WercdDNLAAkNMPZ2NyxSa+nMtgNmXjFw=";
+    rev = "917d27b3b45a335137bd2c8597f8bcf2bac8a569";
+    hash = "sha256-lUHI72fcIEllbcieUrp9A/iKSjUHqmKOUXbzdXCV5jE=";
     fetchSubmodules = true;
   };
 

From c3d3ec654c91eb7768e95a696717850a4e8846da Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 24 Oct 2025 18:35:24 +0100
Subject: [PATCH 2443/6226] nixosTests.nixseparatedebuginfod: remove

Without the change the attribute refers to deleted file:

    + nix build --no-link -f. nixosTests.nixseparatedebuginfod
    error:
       error: path 'nixos/tests/nixseparatedebuginfod.nix' does not exist
---
 nixos/tests/all-tests.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 3af4002a6aa2..f0c348a3e22f 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1069,7 +1069,6 @@ in
     _module.args.withNg = true;
   };
   nixpkgs = pkgs.callPackage ../modules/misc/nixpkgs/test.nix { inherit evalMinimalConfig; };
-  nixseparatedebuginfod = runTest ./nixseparatedebuginfod.nix;
   nixseparatedebuginfod2 = runTest ./nixseparatedebuginfod2.nix;
   node-red = runTest ./node-red.nix;
   nomad = runTest ./nomad.nix;

From 514f43f77c269e4476e19acd1b0b32bde13f9b35 Mon Sep 17 00:00:00 2001
From: Tim Brooks <brooks@skoorb.net>
Date: Thu, 23 Oct 2025 22:34:09 +0200
Subject: [PATCH 2444/6226] onedrive: 2.5.6 -> 2.5.7

---
 pkgs/by-name/on/onedrive/package.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/on/onedrive/package.nix b/pkgs/by-name/on/onedrive/package.nix
index 64a0077d23b1..5b0199afa241 100644
--- a/pkgs/by-name/on/onedrive/package.nix
+++ b/pkgs/by-name/on/onedrive/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "onedrive";
-  version = "2.5.6";
+  version = "2.5.7";
 
   src = fetchFromGitHub {
     owner = "abraunegg";
     repo = "onedrive";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-AFaz1RkrtsdTZfaWobdcADbzsAhbdCzJPkQX6Pa7hN8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-IllPh4YJvoAAyXDmSNwWDHN/EUtUuUqS7TOnBpr3Yts=";
   };
 
   outputs = [
@@ -68,10 +68,8 @@ stdenv.mkDerivation (finalAttrs: {
       --fish contrib/completions/complete.fish \
       --zsh contrib/completions/complete.zsh
 
-    for s in $out/lib/systemd/user/onedrive.service $out/lib/systemd/system/onedrive@.service; do
-      substituteInPlace $s \
-        --replace-fail "/usr/bin/sleep" "${coreutils}/bin/sleep"
-    done
+    substituteInPlace $out/lib/systemd/user/onedrive.service $out/lib/systemd/system/onedrive@.service \
+      --replace-fail "/bin/sh -c 'sleep 15'" "${coreutils}/bin/sleep 15"
   '';
 
   passthru = {

From ee740be6b3db6b0214eea5febe909232f36c2ef3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 17:55:45 +0000
Subject: [PATCH 2445/6226] lunatask: 2.1.12 -> 2.1.13

---
 pkgs/by-name/lu/lunatask/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lu/lunatask/package.nix b/pkgs/by-name/lu/lunatask/package.nix
index af5ac7909264..c48b157b5f9d 100644
--- a/pkgs/by-name/lu/lunatask/package.nix
+++ b/pkgs/by-name/lu/lunatask/package.nix
@@ -6,12 +6,12 @@
 }:
 
 let
-  version = "2.1.12";
+  version = "2.1.13";
   pname = "lunatask";
 
   src = fetchurl {
     url = "https://github.com/lunatask/lunatask/releases/download/v${version}/Lunatask-${version}.AppImage";
-    hash = "sha256-2wYUvAersPFNJILtNV5m7den1o6OOB2jxa0ZwqwQlx0=";
+    hash = "sha256-OxkhXBaoXaq7NvlZerQV9AwX85nMS/HBgH6KpugJeMU=";
   };
 
   appimageContents = appimageTools.extract {

From a132d13bd2cda9ce77934ac531e65acfcf193804 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 18:12:00 +0000
Subject: [PATCH 2446/6226] waymore: 6.4 -> 6.5

---
 pkgs/by-name/wa/waymore/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wa/waymore/package.nix b/pkgs/by-name/wa/waymore/package.nix
index 3c7085943b33..7a4670514c67 100644
--- a/pkgs/by-name/wa/waymore/package.nix
+++ b/pkgs/by-name/wa/waymore/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "waymore";
-  version = "6.4";
+  version = "6.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "xnl-h4ck3r";
     repo = "waymore";
     tag = "v${version}";
-    hash = "sha256-XIzUT9OYdtiBAdGYxeCSv89gxYqlvE7wAijt+WJqk2k=";
+    hash = "sha256-3nvdbQydtnk/tod2WyJLAGKKjwTv6Z6JA7+qwqgp2o4=";
   };
 
   preBuild = ''

From c0c664b3273ae1abd901c48188c8e44ff86d7061 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Fri, 24 Oct 2025 18:59:37 +0100
Subject: [PATCH 2447/6226] nixos/immich: reindex VectorChord indexes on update

VectorChord requires its indexes to be reindexed when the extension is
updated. [1]
This commit adds functionality to save the current version of the
extension before performing an update, and then compare it with the
updated version to decide whether it should reindex Immich's indexes.
This complexity is needed to avoid reindexing every time PostgreSQL is
started, as it is an expensive operation that would slow down startup.

[1]: https://docs.immich.app/administration/postgres-standalone/#updating-vectorchord
---
 nixos/modules/services/web-apps/immich.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/nixos/modules/services/web-apps/immich.nix b/nixos/modules/services/web-apps/immich.nix
index 21a92a5a627b..23017629a329 100644
--- a/nixos/modules/services/web-apps/immich.nix
+++ b/nixos/modules/services/web-apps/immich.nix
@@ -323,7 +323,11 @@ in
           "vchord"
         ];
         sqlFile = pkgs.writeText "immich-pgvectors-setup.sql" (
+          # save previous version of vectorchord to trigger reindex on update
+          lib.optionalString cfg.database.enableVectorChord ''
+            SELECT COALESCE(installed_version, ''') AS vchord_version_before FROM pg_available_extensions WHERE name = 'vchord' \gset
           ''
+          + ''
             ${lib.concatMapStringsSep "\n" (ext: "CREATE EXTENSION IF NOT EXISTS \"${ext}\";") extensions}
             ${lib.concatMapStringsSep "\n" (ext: "ALTER EXTENSION \"${ext}\" UPDATE;") extensions}
             ALTER SCHEMA public OWNER TO ${cfg.database.user};
@@ -332,6 +336,17 @@ in
             ALTER SCHEMA vectors OWNER TO ${cfg.database.user};
             GRANT SELECT ON TABLE pg_vector_index_stat TO ${cfg.database.user};
           ''
+          # trigger reindex if vectorchord updates
+          # https://docs.immich.app/administration/postgres-standalone/#updating-vectorchord
+          + lib.optionalString cfg.database.enableVectorChord ''
+            SELECT COALESCE(installed_version, ''') AS vchord_version_after FROM pg_available_extensions WHERE name = 'vchord' \gset
+
+            SELECT (:'vchord_version_before' != ''' AND :'vchord_version_before' != :'vchord_version_after') AS has_vchord_updated \gset
+            \if :has_vchord_updated
+              REINDEX INDEX face_index;
+              REINDEX INDEX clip_index;
+            \endif
+          ''
         );
       in
       [

From bf41851cc49fa2d99eef382fca9a099132364898 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 18:22:25 +0000
Subject: [PATCH 2448/6226] wit-bindgen: 0.46.0 -> 0.47.0

---
 pkgs/by-name/wi/wit-bindgen/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wi/wit-bindgen/package.nix b/pkgs/by-name/wi/wit-bindgen/package.nix
index 1c1e22d7c819..0e950640a512 100644
--- a/pkgs/by-name/wi/wit-bindgen/package.nix
+++ b/pkgs/by-name/wi/wit-bindgen/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "wit-bindgen";
-  version = "0.46.0";
+  version = "0.47.0";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wit-bindgen";
     rev = "v${version}";
-    hash = "sha256-PBvFa5BrgtKC8f999JJsCdFz34w/xZD57qBFW510oeI=";
+    hash = "sha256-yeL97ljyfxH7qiCeLngYEnIV2ZZp8v5i7TAhv/wfXcc=";
   };
 
-  cargoHash = "sha256-5nz7+2pB5F63vvCecYpp3ExBDIqbRU3MwLNfmMdA2vE=";
+  cargoHash = "sha256-fkaNgWpKOSuZXe2FEM4Llqn8hw0fokejGYJNgsxwliI=";
 
   # Some tests fail because they need network access to install the `wasm32-unknown-unknown` target.
   # However, GitHub Actions ensures a proper build.

From ac683faa12245baebfe649de1b4fc7c5258a0f5b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 18:27:25 +0000
Subject: [PATCH 2449/6226] python3Packages.google-cloud-websecurityscanner:
 1.17.3 -> 1.18.0

---
 .../google-cloud-websecurityscanner/default.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
index 14ba809b0cad..db9a3aab3652 100644
--- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-websecurityscanner";
-  version = "1.17.3";
+  version = "1.18.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_websecurityscanner";
     inherit version;
-    hash = "sha256-Bmi8LH4HtxlnLsDtpSG1BQYp5yg4gEaKzLxPIUwPemM=";
+    hash = "sha256-JjW9Rifp3BZIjAzs94trQj1RJAHLzll+tDksV/e1rag=";
   };
 
   build-system = [ setuptools ];

From 8904efe3ce69d05b0464a34e735da7719ee32343 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 24 Oct 2025 18:32:54 +0000
Subject: [PATCH 2450/6226] python3Packages.ufmt: fix cli tests by fetching
 upstream patch

https://github.com/omnilib/ufmt/issues/260
---
 .../development/python-modules/ufmt/default.nix | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/ufmt/default.nix b/pkgs/development/python-modules/ufmt/default.nix
index 2b1e370f697d..7537b44f8d60 100644
--- a/pkgs/development/python-modules/ufmt/default.nix
+++ b/pkgs/development/python-modules/ufmt/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
 
   # build-system
   flit-core,
@@ -37,12 +38,16 @@ buildPythonPackage rec {
     hash = "sha256-oEvvXUju7qne3pCwnrckplMs0kBJavB669qieXJZPKw=";
   };
 
-  # Broken since click was updated to 8.2.1 in https://github.com/NixOS/nixpkgs/pull/448189
-  # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr'
-  postPatch = ''
-    substituteInPlace ufmt/tests/__init__.py \
-      --replace-fail "from .cli import CliTest" ""
-  '';
+  patches = [
+    # Fix click 8.2.x incompatibility
+    # TypeError: CliRunner.__init__() got an unexpected keyword argument 'mix_stderr'
+    # https://github.com/omnilib/ufmt/pull/260
+    (fetchpatch2 {
+      name = "fix-click-incompatibility.patch";
+      url = "https://github.com/omnilib/ufmt/pull/260/commits/7980d7cd0a29fbd287e10d939248ef7c9d38a660.patch";
+      hash = "sha256-97/jQVGCC+PXk8uxyF/M7XlLuVqJ5SgQZd/MXkaiO70=";
+    })
+  ];
 
   build-system = [ flit-core ];
 

From b8879e615acc63778b1c998ac8177ffa17a04551 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 24 Oct 2025 18:29:24 +0000
Subject: [PATCH 2451/6226] python3Packages.paddlex: 3.1.4 -> 3.3.5

Diff: https://github.com/PaddlePaddle/PaddleX/compare/v3.1.4...v3.3.5

Changelog: https://github.com/PaddlePaddle/PaddleX/releases/tag/v3.3.5
---
 pkgs/development/python-modules/paddlex/default.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/paddlex/default.nix b/pkgs/development/python-modules/paddlex/default.nix
index 731d46ce7c02..041c05eb0bed 100644
--- a/pkgs/development/python-modules/paddlex/default.nix
+++ b/pkgs/development/python-modules/paddlex/default.nix
@@ -51,21 +51,27 @@ let
 in
 buildPythonPackage rec {
   pname = "paddlex";
-  version = "3.1.4";
+  version = "3.3.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PaddlePaddle";
     repo = "PaddleX";
     tag = "v${version}";
-    hash = "sha256-Oc8fgAv8T/9PjxW8yU31t3m3CUxFuAXdVS71BGhtlJo=";
+    hash = "sha256-rxVfkvi/uOetMbR3pHN+apjqtvgTq5rwLc0gkhI6OvU=";
   };
 
   build-system = [ setuptools ];
 
+  pythonRemoveDeps = [
+    # unpackaged
+    "aistudio-sdk"
+    "modelscope"
+  ];
   pythonRelaxDeps = [
     "numpy"
     "pandas"
+    "pyyaml"
   ];
 
   dependencies = [

From 3d8f124bd8fab1c218f605b5d513e3e72eb82f92 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 18:42:55 +0000
Subject: [PATCH 2452/6226] python3Packages.pyswitchbot: 0.71.0 -> 0.72.0

---
 pkgs/development/python-modules/pyswitchbot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix
index d574d63d4daf..9f6538c14cee 100644
--- a/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/pkgs/development/python-modules/pyswitchbot/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pyswitchbot";
-  version = "0.71.0";
+  version = "0.72.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "pySwitchbot";
     tag = version;
-    hash = "sha256-MFWeU3KaCtEEvsNuSlLrWxZTYgER+/A6nF2yCvmGgTk=";
+    hash = "sha256-ouvsAZe3HeaSMdCdia+ttliKMxqNtps/TbHBkri/iaw=";
   };
 
   build-system = [ setuptools ];

From 41a4bb5acdc672360ae701cbe1fabeef9b342cba Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Fri, 24 Oct 2025 20:49:40 +0200
Subject: [PATCH 2453/6226] orogene: drop

Vulnerable to CVE-2025-62518 without replacement
---
 pkgs/by-name/or/orogene/package.nix           |   61 -
 .../or/orogene/update-outdated-lockfile.patch | 3785 -----------------
 pkgs/top-level/aliases.nix                    |    1 +
 3 files changed, 1 insertion(+), 3846 deletions(-)
 delete mode 100644 pkgs/by-name/or/orogene/package.nix
 delete mode 100644 pkgs/by-name/or/orogene/update-outdated-lockfile.patch

diff --git a/pkgs/by-name/or/orogene/package.nix b/pkgs/by-name/or/orogene/package.nix
deleted file mode 100644
index 3d000c9c8909..000000000000
--- a/pkgs/by-name/or/orogene/package.nix
+++ /dev/null
@@ -1,61 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-  pkg-config,
-  openssl,
-  versionCheckHook,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "orogene";
-  version = "0.3.34";
-
-  src = fetchFromGitHub {
-    owner = "orogene";
-    repo = "orogene";
-    tag = "v${version}";
-    hash = "sha256-GMWrlvZZ2xlcvcRG3u8jS8KiewHpyX0brNe4pmCpHbM=";
-    fetchSubmodules = true;
-  };
-
-  cargoPatches = [
-    # Workaround to avoid "error[E0282]"
-    # ref: https://github.com/orogene/orogene/pull/315
-    ./update-outdated-lockfile.patch
-  ];
-
-  cargoHash = "sha256-I08mqyogEuadp+V10svMmCm0i0zOZWiocOpM9E3lgag=";
-
-  nativeBuildInputs = [
-    pkg-config
-  ];
-
-  buildInputs = [
-    openssl
-  ];
-
-  preCheck = ''
-    export CI=true
-    export HOME=$(mktemp -d)
-  '';
-
-  doInstallCheck = true;
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
-  versionCheckProgram = "${placeholder "out"}/bin/oro";
-  versionCheckProgramArg = "--version";
-
-  meta = with lib; {
-    description = "Package manager for tools that use node_modules";
-    homepage = "https://github.com/orogene/orogene";
-    changelog = "https://github.com/orogene/orogene/blob/${src.rev}/CHANGELOG.md";
-    license = with licenses; [
-      asl20
-      isc
-    ];
-    maintainers = with maintainers; [ figsoda ];
-    mainProgram = "oro";
-  };
-}
diff --git a/pkgs/by-name/or/orogene/update-outdated-lockfile.patch b/pkgs/by-name/or/orogene/update-outdated-lockfile.patch
deleted file mode 100644
index d56073fdb227..000000000000
--- a/pkgs/by-name/or/orogene/update-outdated-lockfile.patch
+++ /dev/null
@@ -1,3785 +0,0 @@
-diff --git a/Cargo.lock b/Cargo.lock
-index 2655ed26..a26cbb5d 100644
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -4,9 +4,9 @@ version = 3
- 
- [[package]]
- name = "addr2line"
--version = "0.21.0"
-+version = "0.22.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
-+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
- dependencies = [
-  "gimli",
- ]
-@@ -19,20 +19,20 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
- 
- [[package]]
- name = "ahash"
--version = "0.7.6"
-+version = "0.7.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
-+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
- dependencies = [
-- "getrandom 0.2.10",
-+ "getrandom 0.2.15",
-  "once_cell",
-  "version_check",
- ]
- 
- [[package]]
- name = "aho-corasick"
--version = "1.1.1"
-+version = "1.1.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
-+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
- dependencies = [
-  "memchr",
- ]
-@@ -54,63 +54,64 @@ dependencies = [
- 
- [[package]]
- name = "anstream"
--version = "0.6.4"
-+version = "0.6.15"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44"
-+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
- dependencies = [
-  "anstyle",
-  "anstyle-parse",
-  "anstyle-query",
-  "anstyle-wincon",
-  "colorchoice",
-+ "is_terminal_polyfill",
-  "utf8parse",
- ]
- 
- [[package]]
- name = "anstyle"
--version = "1.0.4"
-+version = "1.0.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87"
-+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
- 
- [[package]]
- name = "anstyle-parse"
--version = "0.2.2"
-+version = "0.2.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140"
-+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
- dependencies = [
-  "utf8parse",
- ]
- 
- [[package]]
- name = "anstyle-query"
--version = "1.0.0"
-+version = "1.1.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
-+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
- dependencies = [
-- "windows-sys 0.48.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
- name = "anstyle-wincon"
--version = "3.0.1"
-+version = "3.0.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628"
-+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
- dependencies = [
-  "anstyle",
-- "windows-sys 0.48.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
- name = "anyhow"
--version = "1.0.75"
-+version = "1.0.86"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6"
-+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
- 
- [[package]]
- name = "arrayref"
--version = "0.3.7"
-+version = "0.3.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
-+checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a"
- 
- [[package]]
- name = "arrayvec"
-@@ -145,8 +146,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
- dependencies = [
-  "concurrent-queue",
-- "event-listener",
-+ "event-listener 2.5.3",
-+ "futures-core",
-+]
-+
-+[[package]]
-+name = "async-channel"
-+version = "2.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
-+dependencies = [
-+ "concurrent-queue",
-+ "event-listener-strategy",
-  "futures-core",
-+ "pin-project-lite",
- ]
- 
- [[package]]
-@@ -164,9 +177,9 @@ dependencies = [
- 
- [[package]]
- name = "async-compression"
--version = "0.4.3"
-+version = "0.4.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bb42b2197bf15ccb092b62c74515dbd8b86d0effd934795f6687c93b6e679a2c"
-+checksum = "fec134f64e2bc57411226dfc4e52dec859ddfc7e711fc5e07b612584f000e4aa"
- dependencies = [
-  "flate2",
-  "futures-core",
-@@ -177,30 +190,29 @@ dependencies = [
- 
- [[package]]
- name = "async-executor"
--version = "1.5.4"
-+version = "1.13.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2c1da3ae8dabd9c00f453a329dfe1fb28da3c0a72e2478cdcd93171740c20499"
-+checksum = "d7ebdfa2ebdab6b1760375fa7d6f382b9f486eac35fc994625a00e89280bdbb7"
- dependencies = [
-- "async-lock",
-  "async-task",
-  "concurrent-queue",
-- "fastrand 2.0.1",
-- "futures-lite",
-+ "fastrand 2.1.0",
-+ "futures-lite 2.3.0",
-  "slab",
- ]
- 
- [[package]]
- name = "async-global-executor"
--version = "2.3.1"
-+version = "2.4.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f1b6f5d7df27bd294849f8eec66ecfc63d11814df7a4f5d74168a2394467b776"
-+checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
- dependencies = [
-- "async-channel",
-+ "async-channel 2.3.1",
-  "async-executor",
-- "async-io",
-- "async-lock",
-+ "async-io 2.3.3",
-+ "async-lock 3.4.0",
-  "blocking",
-- "futures-lite",
-+ "futures-lite 2.3.0",
-  "once_cell",
-  "tokio",
- ]
-@@ -211,47 +223,94 @@ version = "1.13.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "0fc5b45d93ef0529756f812ca52e44c221b35341892d3dcc34132ac02f3dd2af"
- dependencies = [
-- "async-lock",
-+ "async-lock 2.8.0",
-  "autocfg",
-  "cfg-if",
-  "concurrent-queue",
-- "futures-lite",
-+ "futures-lite 1.13.0",
-  "log",
-  "parking",
-- "polling",
-- "rustix 0.37.24",
-+ "polling 2.8.0",
-+ "rustix 0.37.27",
-  "slab",
-- "socket2 0.4.9",
-+ "socket2 0.4.10",
-  "waker-fn",
- ]
- 
-+[[package]]
-+name = "async-io"
-+version = "2.3.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
-+dependencies = [
-+ "async-lock 3.4.0",
-+ "cfg-if",
-+ "concurrent-queue",
-+ "futures-io",
-+ "futures-lite 2.3.0",
-+ "parking",
-+ "polling 3.7.2",
-+ "rustix 0.38.34",
-+ "slab",
-+ "tracing",
-+ "windows-sys 0.52.0",
-+]
-+
- [[package]]
- name = "async-lock"
- version = "2.8.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b"
- dependencies = [
-- "event-listener",
-+ "event-listener 2.5.3",
-+]
-+
-+[[package]]
-+name = "async-lock"
-+version = "3.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
-+dependencies = [
-+ "event-listener 5.3.1",
-+ "event-listener-strategy",
-+ "pin-project-lite",
- ]
- 
- [[package]]
- name = "async-process"
--version = "1.7.0"
-+version = "1.8.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7a9d28b1d97e08915212e2e45310d47854eafa69600756fc735fb788f75199c9"
-+checksum = "ea6438ba0a08d81529c69b36700fa2f95837bfe3e776ab39cde9c14d9149da88"
- dependencies = [
-- "async-io",
-- "async-lock",
-- "autocfg",
-+ "async-io 1.13.0",
-+ "async-lock 2.8.0",
-+ "async-signal",
-  "blocking",
-  "cfg-if",
-- "event-listener",
-- "futures-lite",
-- "rustix 0.37.24",
-- "signal-hook",
-+ "event-listener 3.1.0",
-+ "futures-lite 1.13.0",
-+ "rustix 0.38.34",
-  "windows-sys 0.48.0",
- ]
- 
-+[[package]]
-+name = "async-signal"
-+version = "0.2.9"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dfb3634b73397aa844481f814fad23bbf07fdb0eabec10f2eb95e58944b1ec32"
-+dependencies = [
-+ "async-io 2.3.3",
-+ "async-lock 3.4.0",
-+ "atomic-waker",
-+ "cfg-if",
-+ "futures-core",
-+ "futures-io",
-+ "rustix 0.38.34",
-+ "signal-hook-registry",
-+ "slab",
-+ "windows-sys 0.52.0",
-+]
-+
- [[package]]
- name = "async-std"
- version = "1.12.0"
-@@ -259,16 +318,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "62565bb4402e926b29953c785397c6dc0391b7b446e45008b0049eb43cec6f5d"
- dependencies = [
-  "async-attributes",
-- "async-channel",
-+ "async-channel 1.9.0",
-  "async-global-executor",
-- "async-io",
-- "async-lock",
-+ "async-io 1.13.0",
-+ "async-lock 2.8.0",
-  "async-process",
-  "crossbeam-utils",
-  "futures-channel",
-  "futures-core",
-  "futures-io",
-- "futures-lite",
-+ "futures-lite 1.13.0",
-  "gloo-timers",
-  "kv-log-macro",
-  "log",
-@@ -296,19 +355,19 @@ dependencies = [
- 
- [[package]]
- name = "async-task"
--version = "4.4.1"
-+version = "4.7.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b9441c6b2fe128a7c2bf680a44c34d0df31ce09e5b7e401fcca3faa483dbc921"
-+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
- 
- [[package]]
- name = "async-trait"
--version = "0.1.73"
-+version = "0.1.81"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bc00ceb34980c03614e35a3a4e218276a0a824e911d07651cd0d858a51e8c0f0"
-+checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
-@@ -319,17 +378,17 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
- 
- [[package]]
- name = "autocfg"
--version = "1.1.0"
-+version = "1.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
-+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
- 
- [[package]]
- name = "backon"
--version = "0.4.1"
-+version = "0.4.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0c1a6197b2120bb2185a267f6515038558b019e92b832bb0320e96d66268dcf9"
-+checksum = "d67782c3f868daa71d3533538e98a8e13713231969def7536e8039606fc46bf0"
- dependencies = [
-- "fastrand 1.9.0",
-+ "fastrand 2.1.0",
-  "futures-core",
-  "pin-project",
-  "tokio",
-@@ -337,9 +396,9 @@ dependencies = [
- 
- [[package]]
- name = "backtrace"
--version = "0.3.69"
-+version = "0.3.73"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
-+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
- dependencies = [
-  "addr2line",
-  "cc",
-@@ -367,9 +426,15 @@ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
- 
- [[package]]
- name = "base64"
--version = "0.21.4"
-+version = "0.21.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
-+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
-+
-+[[package]]
-+name = "base64"
-+version = "0.22.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
- 
- [[package]]
- name = "bincode"
-@@ -388,9 +453,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
- 
- [[package]]
- name = "bitflags"
--version = "2.4.0"
-+version = "2.6.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
-+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
- 
- [[package]]
- name = "bitvec"
-@@ -415,31 +480,28 @@ dependencies = [
- 
- [[package]]
- name = "blocking"
--version = "1.4.0"
-+version = "1.6.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "94c4ef1f913d78636d78d538eec1f18de81e481f44b1be0a81060090530846e1"
-+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
- dependencies = [
-- "async-channel",
-- "async-lock",
-+ "async-channel 2.3.1",
-  "async-task",
-- "fastrand 2.0.1",
-  "futures-io",
-- "futures-lite",
-+ "futures-lite 2.3.0",
-  "piper",
-- "tracing",
- ]
- 
- [[package]]
- name = "bumpalo"
--version = "3.14.0"
-+version = "3.16.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec"
-+checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c"
- 
- [[package]]
- name = "bytecheck"
--version = "0.6.11"
-+version = "0.6.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8b6372023ac861f6e6dc89c8344a8f398fb42aaba2b5dbc649ca0c0e9dbcb627"
-+checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2"
- dependencies = [
-  "bytecheck_derive",
-  "ptr_meta",
-@@ -448,9 +510,9 @@ dependencies = [
- 
- [[package]]
- name = "bytecheck_derive"
--version = "0.6.11"
-+version = "0.6.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a7ec4c6f261935ad534c0c22dbef2201b45918860eb1c574b972bd213a76af61"
-+checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
- dependencies = [
-  "proc-macro2",
-  "quote",
-@@ -459,15 +521,15 @@ dependencies = [
- 
- [[package]]
- name = "bytecount"
--version = "0.6.4"
-+version = "0.6.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ad152d03a2c813c80bb94fedbf3a3f02b28f793e39e7c214c8a0bcc196343de7"
-+checksum = "5ce89b21cab1437276d2650d57e971f9d548a2d9037cc231abdc0562b97498ce"
- 
- [[package]]
- name = "bytemuck"
--version = "1.14.0"
-+version = "1.16.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6"
-+checksum = "102087e286b4677862ea56cf8fc58bb2cdfa8725c40ffb80fe3a008eb7f2fc83"
- 
- [[package]]
- name = "byteorder"
-@@ -487,9 +549,9 @@ dependencies = [
- 
- [[package]]
- name = "bytes"
--version = "1.5.0"
-+version = "1.7.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
-+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
- 
- [[package]]
- name = "cacache"
-@@ -500,7 +562,7 @@ dependencies = [
-  "async-std",
-  "digest",
-  "either",
-- "futures 0.3.28",
-+ "futures 0.3.30",
-  "hex",
-  "libc",
-  "memmap2",
-@@ -526,7 +588,7 @@ dependencies = [
-  "async-std",
-  "digest",
-  "either",
-- "futures 0.3.28",
-+ "futures 0.3.30",
-  "hex",
-  "libc",
-  "memmap2",
-@@ -545,12 +607,9 @@ dependencies = [
- 
- [[package]]
- name = "cc"
--version = "1.0.83"
-+version = "1.1.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0"
--dependencies = [
-- "libc",
--]
-+checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
- 
- [[package]]
- name = "cfg-if"
-@@ -560,16 +619,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
- 
- [[package]]
- name = "chrono"
--version = "0.4.31"
-+version = "0.4.38"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38"
-+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
- dependencies = [
-  "android-tzdata",
-  "iana-time-zone",
-  "js-sys",
-  "num-traits",
-  "wasm-bindgen",
-- "windows-targets 0.48.5",
-+ "windows-targets 0.52.6",
- ]
- 
- [[package]]
-@@ -583,9 +642,9 @@ dependencies = [
- 
- [[package]]
- name = "clap"
--version = "4.4.6"
-+version = "4.5.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d04704f56c2cde07f43e8e2c154b43f216dc5c92fc98ada720177362f953b956"
-+checksum = "0fbb260a053428790f3de475e304ff84cdbc4face759ea7a3e64c1edd938a7fc"
- dependencies = [
-  "clap_builder",
-  "clap_derive",
-@@ -593,33 +652,33 @@ dependencies = [
- 
- [[package]]
- name = "clap_builder"
--version = "4.4.6"
-+version = "4.5.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0e231faeaca65ebd1ea3c737966bf858971cd38c3849107aa3ea7de90a804e45"
-+checksum = "64b17d7ea74e9f833c7dbf2cbe4fb12ff26783eda4782a8975b72f895c9b4d99"
- dependencies = [
-  "anstream",
-  "anstyle",
-  "clap_lex",
-- "strsim",
-+ "strsim 0.11.1",
- ]
- 
- [[package]]
- name = "clap_derive"
--version = "4.4.2"
-+version = "4.5.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0862016ff20d69b84ef8247369fabf5c008a7417002411897d40ee1f4532b873"
-+checksum = "501d359d5f3dcaf6ecdeee48833ae73ec6e42723a1e52419c79abf9507eec0a0"
- dependencies = [
-  "heck",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
- name = "clap_lex"
--version = "0.5.1"
-+version = "0.7.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cd7cc57abe963c6d3b9d8be5b06ba7c8957a930305ca90304f24ef040aa6f961"
-+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
- 
- [[package]]
- name = "color_quant"
-@@ -629,35 +688,34 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
- 
- [[package]]
- name = "colorchoice"
--version = "1.0.0"
-+version = "1.0.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
-+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
- 
- [[package]]
- name = "colored"
--version = "2.0.4"
-+version = "2.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2674ec482fbc38012cf31e6c42ba0177b431a0cb6f15fe40efa5aab1bda516f6"
-+checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8"
- dependencies = [
-- "is-terminal",
-  "lazy_static",
-  "windows-sys 0.48.0",
- ]
- 
- [[package]]
- name = "concurrent-queue"
--version = "2.3.0"
-+version = "2.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400"
-+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
- dependencies = [
-  "crossbeam-utils",
- ]
- 
- [[package]]
- name = "config"
--version = "0.13.3"
-+version = "0.13.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d379af7f68bfc21714c6c7dea883544201741d2ce8274bb12fa54f89507f52a7"
-+checksum = "23738e11972c7643e4ec947840fc463b6a571afcd3e735bdfce7d03c7a784aca"
- dependencies = [
-  "async-trait",
-  "lazy_static",
-@@ -668,15 +726,15 @@ dependencies = [
- 
- [[package]]
- name = "console"
--version = "0.15.7"
-+version = "0.15.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
-+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
- dependencies = [
-  "encode_unicode",
-  "lazy_static",
-  "libc",
-  "unicode-width",
-- "windows-sys 0.45.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -691,9 +749,9 @@ dependencies = [
- 
- [[package]]
- name = "core-foundation"
--version = "0.9.3"
-+version = "0.9.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146"
-+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
- dependencies = [
-  "core-foundation-sys",
-  "libc",
-@@ -701,46 +759,42 @@ dependencies = [
- 
- [[package]]
- name = "core-foundation-sys"
--version = "0.8.4"
-+version = "0.8.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa"
-+checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
- 
- [[package]]
- name = "cpufeatures"
--version = "0.2.9"
-+version = "0.2.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1"
-+checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
- dependencies = [
-  "libc",
- ]
- 
- [[package]]
- name = "crc32fast"
--version = "1.3.2"
-+version = "1.4.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d"
-+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
- dependencies = [
-  "cfg-if",
- ]
- 
- [[package]]
- name = "crossbeam-channel"
--version = "0.5.8"
-+version = "0.5.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200"
-+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
- dependencies = [
-- "cfg-if",
-  "crossbeam-utils",
- ]
- 
- [[package]]
- name = "crossbeam-utils"
--version = "0.8.16"
-+version = "0.8.20"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294"
--dependencies = [
-- "cfg-if",
--]
-+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
- 
- [[package]]
- name = "crypto-common"
-@@ -772,7 +826,7 @@ dependencies = [
-  "ident_case",
-  "proc-macro2",
-  "quote",
-- "strsim",
-+ "strsim 0.10.0",
-  "syn 1.0.109",
- ]
- 
-@@ -818,9 +872,9 @@ dependencies = [
- 
- [[package]]
- name = "deadpool-runtime"
--version = "0.1.3"
-+version = "0.1.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "63dfa964fe2a66f3fde91fc70b267fe193d822c7e603e2a675a49a7f46ad3f49"
-+checksum = "092966b41edc516079bdf31ec78a2e0588d1d0c08f78b91d8307215928642b2b"
- 
- [[package]]
- name = "debugid"
-@@ -834,9 +888,12 @@ dependencies = [
- 
- [[package]]
- name = "deranged"
--version = "0.3.8"
-+version = "0.3.11"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f2696e8a945f658fd14dc3b87242e6b80cd0f36ff04ea560fa39082368847946"
-+checksum = "b42b6fa04a440b495c8b04d0e71b707c585f83cb9cb28cf8cd0d976c315e31b4"
-+dependencies = [
-+ "powerfmt",
-+]
- 
- [[package]]
- name = "derive_builder"
-@@ -924,9 +981,9 @@ checksum = "56ce8c6da7551ec6c462cbaf3bfbc75131ebbfa1c944aeaa9dab51ca1c5f0c3b"
- 
- [[package]]
- name = "either"
--version = "1.9.0"
-+version = "1.13.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
-+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
- 
- [[package]]
- name = "embed-resource"
-@@ -949,9 +1006,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f"
- 
- [[package]]
- name = "encoding_rs"
--version = "0.8.33"
-+version = "0.8.34"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1"
-+checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
- dependencies = [
-  "cfg-if",
- ]
-@@ -964,30 +1021,51 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
- 
- [[package]]
- name = "errno"
--version = "0.3.4"
-+version = "0.3.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "add4f07d43996f76ef320709726a556a9d4f965d9410d8d0271132d2f8293480"
-+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
- dependencies = [
-- "errno-dragonfly",
-  "libc",
-- "windows-sys 0.48.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
--name = "errno-dragonfly"
--version = "0.1.2"
-+name = "event-listener"
-+version = "2.5.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-+
-+[[package]]
-+name = "event-listener"
-+version = "3.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf"
-+checksum = "d93877bcde0eb80ca09131a08d23f0a5c18a620b01db137dba666d18cd9b30c2"
- dependencies = [
-- "cc",
-- "libc",
-+ "concurrent-queue",
-+ "parking",
-+ "pin-project-lite",
- ]
- 
- [[package]]
- name = "event-listener"
--version = "2.5.3"
-+version = "5.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
-+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
-+dependencies = [
-+ "concurrent-queue",
-+ "parking",
-+ "pin-project-lite",
-+]
-+
-+[[package]]
-+name = "event-listener-strategy"
-+version = "0.5.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
-+dependencies = [
-+ "event-listener 5.3.1",
-+ "pin-project-lite",
-+]
- 
- [[package]]
- name = "fastrand"
-@@ -1000,29 +1078,29 @@ dependencies = [
- 
- [[package]]
- name = "fastrand"
--version = "2.0.1"
-+version = "2.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5"
-+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
- 
- [[package]]
- name = "fdeflate"
--version = "0.3.0"
-+version = "0.3.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10"
-+checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645"
- dependencies = [
-  "simd-adler32",
- ]
- 
- [[package]]
- name = "filetime"
--version = "0.2.22"
-+version = "0.2.23"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0"
-+checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
- dependencies = [
-  "cfg-if",
-  "libc",
-- "redox_syscall 0.3.5",
-- "windows-sys 0.48.0",
-+ "redox_syscall 0.4.1",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -1045,9 +1123,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
- 
- [[package]]
- name = "flate2"
--version = "1.0.27"
-+version = "1.0.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
-+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
- dependencies = [
-  "crc32fast",
-  "miniz_oxide",
-@@ -1067,11 +1145,11 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
- 
- [[package]]
- name = "fontconfig-parser"
--version = "0.5.3"
-+version = "0.5.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "674e258f4b5d2dcd63888c01c68413c51f565e8af99d2f7701c7b81d79ef41c4"
-+checksum = "c1fcfcd44ca6e90c921fee9fa665d530b21ef1327a4c1a6c5250ea44b776ada7"
- dependencies = [
-- "roxmltree",
-+ "roxmltree 0.20.0",
- ]
- 
- [[package]]
-@@ -1103,9 +1181,9 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
- 
- [[package]]
- name = "form_urlencoded"
--version = "1.2.0"
-+version = "1.2.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652"
-+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
- dependencies = [
-  "percent-encoding",
- ]
-@@ -1124,9 +1202,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678"
- 
- [[package]]
- name = "futures"
--version = "0.3.28"
-+version = "0.3.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40"
-+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
- dependencies = [
-  "futures-channel",
-  "futures-core",
-@@ -1139,9 +1217,9 @@ dependencies = [
- 
- [[package]]
- name = "futures-channel"
--version = "0.3.28"
-+version = "0.3.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2"
-+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
- dependencies = [
-  "futures-core",
-  "futures-sink",
-@@ -1149,15 +1227,15 @@ dependencies = [
- 
- [[package]]
- name = "futures-core"
--version = "0.3.28"
-+version = "0.3.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c"
-+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
- 
- [[package]]
- name = "futures-executor"
--version = "0.3.28"
-+version = "0.3.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0"
-+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
- dependencies = [
-  "futures-core",
-  "futures-task",
-@@ -1166,9 +1244,9 @@ dependencies = [
- 
- [[package]]
- name = "futures-io"
--version = "0.3.28"
-+version = "0.3.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964"
-+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
- 
- [[package]]
- name = "futures-lite"
-@@ -1185,40 +1263,53 @@ dependencies = [
-  "waker-fn",
- ]
- 
-+[[package]]
-+name = "futures-lite"
-+version = "2.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
-+dependencies = [
-+ "fastrand 2.1.0",
-+ "futures-core",
-+ "futures-io",
-+ "parking",
-+ "pin-project-lite",
-+]
-+
- [[package]]
- name = "futures-macro"
--version = "0.3.28"
-+version = "0.3.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72"
-+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
- name = "futures-sink"
--version = "0.3.28"
-+version = "0.3.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e"
-+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
- 
- [[package]]
- name = "futures-task"
--version = "0.3.28"
-+version = "0.3.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65"
-+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
- 
- [[package]]
- name = "futures-timer"
--version = "3.0.2"
-+version = "3.0.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
-+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
- 
- [[package]]
- name = "futures-util"
--version = "0.3.28"
-+version = "0.3.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533"
-+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
- dependencies = [
-  "futures 0.1.31",
-  "futures-channel",
-@@ -1257,9 +1348,9 @@ dependencies = [
- 
- [[package]]
- name = "getrandom"
--version = "0.2.10"
-+version = "0.2.15"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
-+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
- dependencies = [
-  "cfg-if",
-  "js-sys",
-@@ -1280,9 +1371,9 @@ dependencies = [
- 
- [[package]]
- name = "gimli"
--version = "0.28.0"
-+version = "0.29.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"
-+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
- 
- [[package]]
- name = "gloo-timers"
-@@ -1298,17 +1389,36 @@ dependencies = [
- 
- [[package]]
- name = "h2"
--version = "0.3.21"
-+version = "0.3.26"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833"
-+checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
- dependencies = [
-- "bytes 1.5.0",
-+ "bytes 1.7.1",
-  "fnv",
-  "futures-core",
-  "futures-sink",
-  "futures-util",
-- "http",
-- "indexmap 1.9.3",
-+ "http 0.2.12",
-+ "indexmap 2.3.0",
-+ "slab",
-+ "tokio",
-+ "tokio-util",
-+ "tracing",
-+]
-+
-+[[package]]
-+name = "h2"
-+version = "0.4.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
-+dependencies = [
-+ "atomic-waker",
-+ "bytes 1.7.1",
-+ "fnv",
-+ "futures-core",
-+ "futures-sink",
-+ "http 1.1.0",
-+ "indexmap 2.3.0",
-  "slab",
-  "tokio",
-  "tokio-util",
-@@ -1326,21 +1436,27 @@ dependencies = [
- 
- [[package]]
- name = "hashbrown"
--version = "0.14.1"
-+version = "0.14.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
-+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
- 
- [[package]]
- name = "heck"
--version = "0.4.1"
-+version = "0.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
-+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
- 
- [[package]]
- name = "hermit-abi"
--version = "0.3.3"
-+version = "0.3.9"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
-+
-+[[package]]
-+name = "hermit-abi"
-+version = "0.4.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7"
-+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
- 
- [[package]]
- name = "hex"
-@@ -1350,11 +1466,11 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
- 
- [[package]]
- name = "home"
--version = "0.5.5"
-+version = "0.5.9"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb"
-+checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
- dependencies = [
-- "windows-sys 0.48.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -1370,23 +1486,57 @@ dependencies = [
- 
- [[package]]
- name = "http"
--version = "0.2.9"
-+version = "0.2.12"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
-+dependencies = [
-+ "bytes 1.7.1",
-+ "fnv",
-+ "itoa",
-+]
-+
-+[[package]]
-+name = "http"
-+version = "1.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482"
-+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
- dependencies = [
-- "bytes 1.5.0",
-+ "bytes 1.7.1",
-  "fnv",
-  "itoa",
- ]
- 
- [[package]]
- name = "http-body"
--version = "0.4.5"
-+version = "0.4.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
-+dependencies = [
-+ "bytes 1.7.1",
-+ "http 0.2.12",
-+ "pin-project-lite",
-+]
-+
-+[[package]]
-+name = "http-body"
-+version = "1.0.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
-+dependencies = [
-+ "bytes 1.7.1",
-+ "http 1.1.0",
-+]
-+
-+[[package]]
-+name = "http-body-util"
-+version = "0.1.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1"
-+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
- dependencies = [
-- "bytes 1.5.0",
-- "http",
-+ "bytes 1.7.1",
-+ "futures-util",
-+ "http 1.1.0",
-+ "http-body 1.0.1",
-  "pin-project-lite",
- ]
- 
-@@ -1400,7 +1550,7 @@ dependencies = [
-  "async-trait",
-  "bincode",
-  "cacache 11.7.1",
-- "http",
-+ "http 0.2.12",
-  "http-cache-semantics",
-  "httpdate",
-  "miette",
-@@ -1417,7 +1567,7 @@ checksum = "166fed9ab4881ce1383fb854c41fbd947a067d87986955badb500a2c1c8fd1af"
- dependencies = [
-  "anyhow",
-  "async-trait",
-- "http",
-+ "http 0.2.12",
-  "http-cache",
-  "http-cache-semantics",
-  "reqwest",
-@@ -1429,11 +1579,11 @@ dependencies = [
- 
- [[package]]
- name = "http-cache-semantics"
--version = "1.0.1"
-+version = "1.0.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "14246388577086faaaa56fb59f0b94e288800fecfff75918a237813297cdda17"
-+checksum = "7aec9f678bca3f4a15194b980f20ed9bfe0dd38e8d298c65c559a93dfbd6380a"
- dependencies = [
-- "http",
-+ "http 0.2.12",
-  "http-serde",
-  "serde",
-  "time",
-@@ -1445,7 +1595,7 @@ version = "1.1.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "6f560b665ad9f1572cfcaf034f7fb84338a7ce945216d64a90fd81f046a3caee"
- dependencies = [
-- "http",
-+ "http 0.2.12",
-  "serde",
- ]
- 
-@@ -1456,10 +1606,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "6e9b187a72d63adbfba487f48095306ac823049cb504ee195541e91c7775f5ad"
- dependencies = [
-  "anyhow",
-- "async-channel",
-+ "async-channel 1.9.0",
-  "base64 0.13.1",
-- "futures-lite",
-- "http",
-+ "futures-lite 1.13.0",
-+ "http 0.2.12",
-  "infer",
-  "pin-project-lite",
-  "rand 0.7.3",
-@@ -1472,9 +1622,9 @@ dependencies = [
- 
- [[package]]
- name = "httparse"
--version = "1.8.0"
-+version = "1.9.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
-+checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
- 
- [[package]]
- name = "httpdate"
-@@ -1490,41 +1640,76 @@ checksum = "02296996cb8796d7c6e3bc2d9211b7802812d36999a51bb754123ead7d37d026"
- 
- [[package]]
- name = "hyper"
--version = "0.14.27"
-+version = "0.14.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468"
-+checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
- dependencies = [
-- "bytes 1.5.0",
-+ "bytes 1.7.1",
-  "futures-channel",
-  "futures-core",
-  "futures-util",
-- "h2",
-- "http",
-- "http-body",
-+ "h2 0.3.26",
-+ "http 0.2.12",
-+ "http-body 0.4.6",
-  "httparse",
-  "httpdate",
-  "itoa",
-  "pin-project-lite",
-- "socket2 0.4.9",
-+ "socket2 0.5.7",
-  "tokio",
-  "tower-service",
-  "tracing",
-  "want",
- ]
- 
-+[[package]]
-+name = "hyper"
-+version = "1.4.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "50dfd22e0e76d0f662d429a5f80fcaf3855009297eab6a0a9f8543834744ba05"
-+dependencies = [
-+ "bytes 1.7.1",
-+ "futures-channel",
-+ "futures-util",
-+ "h2 0.4.5",
-+ "http 1.1.0",
-+ "http-body 1.0.1",
-+ "httparse",
-+ "httpdate",
-+ "itoa",
-+ "pin-project-lite",
-+ "smallvec",
-+ "tokio",
-+]
-+
- [[package]]
- name = "hyper-tls"
- version = "0.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
- dependencies = [
-- "bytes 1.5.0",
-- "hyper",
-+ "bytes 1.7.1",
-+ "hyper 0.14.30",
-  "native-tls",
-  "tokio",
-  "tokio-native-tls",
- ]
- 
-+[[package]]
-+name = "hyper-util"
-+version = "0.1.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3ab92f4f49ee4fb4f997c784b7a2e0fa70050211e0b6a287f898c3c9785ca956"
-+dependencies = [
-+ "bytes 1.7.1",
-+ "futures-util",
-+ "http 1.1.0",
-+ "http-body 1.0.1",
-+ "hyper 1.4.1",
-+ "pin-project-lite",
-+ "tokio",
-+]
-+
- [[package]]
- name = "hypermelon"
- version = "0.5.5"
-@@ -1533,16 +1718,16 @@ checksum = "a21d32b951725c7efe88bac17f191cf2bb0028cce32d1acb3cd087755a0719b2"
- 
- [[package]]
- name = "iana-time-zone"
--version = "0.1.57"
-+version = "0.1.60"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613"
-+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
- dependencies = [
-  "android_system_properties",
-  "core-foundation-sys",
-  "iana-time-zone-haiku",
-  "js-sys",
-  "wasm-bindgen",
-- "windows 0.48.0",
-+ "windows-core 0.52.0",
- ]
- 
- [[package]]
-@@ -1562,9 +1747,9 @@ checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
- 
- [[package]]
- name = "idna"
--version = "0.4.0"
-+version = "0.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
-+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
- dependencies = [
-  "unicode-bidi",
-  "unicode-normalization",
-@@ -1589,19 +1774,19 @@ dependencies = [
- 
- [[package]]
- name = "indexmap"
--version = "2.0.2"
-+version = "2.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
-+checksum = "de3fc2e30ba82dd1b3911c8de1ffc143c74a914a14e99514d7637e3099df5ea0"
- dependencies = [
-  "equivalent",
-- "hashbrown 0.14.1",
-+ "hashbrown 0.14.5",
- ]
- 
- [[package]]
- name = "indicatif"
--version = "0.17.7"
-+version = "0.17.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fb28741c9db9a713d93deb3bb9515c20788cef5815265bee4980e87bde7e0f25"
-+checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3"
- dependencies = [
-  "console",
-  "instant",
-@@ -1619,23 +1804,22 @@ checksum = "64e9829a50b42bb782c1df523f78d332fe371b10c661e78b7a3c34b0198e9fac"
- 
- [[package]]
- name = "insta"
--version = "1.33.0"
-+version = "1.39.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1aa511b2e298cd49b1856746f6bb73e17036bcd66b25f5e92cdcdbec9bd75686"
-+checksum = "810ae6042d48e2c9e9215043563a58a80b877bc863228a74cf10c49d4620a6f5"
- dependencies = [
-  "console",
-  "lazy_static",
-  "linked-hash-map",
-  "serde",
-  "similar",
-- "yaml-rust",
- ]
- 
- [[package]]
- name = "instant"
--version = "0.1.12"
-+version = "0.1.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
-+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
- dependencies = [
-  "cfg-if",
-  "js-sys",
-@@ -1649,7 +1833,7 @@ version = "1.0.11"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
- dependencies = [
-- "hermit-abi",
-+ "hermit-abi 0.3.9",
-  "libc",
-  "windows-sys 0.48.0",
- ]
-@@ -1660,12 +1844,6 @@ version = "0.1.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "4b3f7cef34251886990511df1c61443aa928499d598a9473929ab5a90a527304"
- 
--[[package]]
--name = "ioctl-sys"
--version = "0.8.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8bd11f3a29434026f5ff98c730b668ba74b1033637b8817940b54d040696133c"
--
- [[package]]
- name = "iovec"
- version = "0.1.4"
-@@ -1677,9 +1855,9 @@ dependencies = [
- 
- [[package]]
- name = "ipnet"
--version = "2.8.0"
-+version = "2.9.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6"
-+checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
- 
- [[package]]
- name = "is-docker"
-@@ -1692,13 +1870,13 @@ dependencies = [
- 
- [[package]]
- name = "is-terminal"
--version = "0.4.9"
-+version = "0.4.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cb0889898416213fab133e1d33a0e5858a48177452750691bde3666d0fdbaf8b"
-+checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
- dependencies = [
-- "hermit-abi",
-- "rustix 0.38.17",
-- "windows-sys 0.48.0",
-+ "hermit-abi 0.3.9",
-+ "libc",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -1713,39 +1891,45 @@ dependencies = [
- 
- [[package]]
- name = "is_ci"
--version = "1.1.1"
-+version = "1.2.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7655c9839580ee829dfacba1d1278c2b7883e50a277ff7541299489d6bdfdc45"
-+
-+[[package]]
-+name = "is_terminal_polyfill"
-+version = "1.70.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb"
-+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
- 
- [[package]]
- name = "itoa"
--version = "1.0.9"
-+version = "1.0.11"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
-+checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
- 
- [[package]]
- name = "jpeg-decoder"
--version = "0.3.0"
-+version = "0.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bc0000e42512c92e31c2252315bda326620a4e034105e900c98ec492fa077b3e"
-+checksum = "f5d4a7da358eff58addd2877a45865158f0d78c911d43a5784ceb7bbf52833b0"
- 
- [[package]]
- name = "js-sys"
--version = "0.3.64"
-+version = "0.3.69"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a"
-+checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
- dependencies = [
-  "wasm-bindgen",
- ]
- 
- [[package]]
- name = "junction"
--version = "1.0.0"
-+version = "1.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ca39ef0d69b18e6a2fd14c2f0a1d593200f4a4ed949b240b5917ab51fac754cb"
-+checksum = "1c9c415a9b7b1e86cd5738f39d34c9e78c765da7fb1756dbd7d31b3b0d2e7afa"
- dependencies = [
-  "scopeguard",
-- "winapi",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -1788,15 +1972,25 @@ dependencies = [
- 
- [[package]]
- name = "lazy_static"
--version = "1.4.0"
-+version = "1.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
- 
- [[package]]
- name = "libc"
--version = "0.2.149"
-+version = "0.2.155"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
-+
-+[[package]]
-+name = "libredox"
-+version = "0.1.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
-+checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
-+dependencies = [
-+ "bitflags 2.6.0",
-+ "libc",
-+]
- 
- [[package]]
- name = "linked-hash-map"
-@@ -1812,15 +2006,15 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
- 
- [[package]]
- name = "linux-raw-sys"
--version = "0.4.8"
-+version = "0.4.14"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3852614a3bd9ca9804678ba6be5e3b8ce76dfc902cae004e3e0c44051b6e88db"
-+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
- 
- [[package]]
- name = "lock_api"
--version = "0.4.10"
-+version = "0.4.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c1cc9717a20b1bb222f333e6a92fd32f7d8a18ddc5a3191a11af45dcbf4dcd16"
-+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
- dependencies = [
-  "autocfg",
-  "scopeguard",
-@@ -1828,9 +2022,9 @@ dependencies = [
- 
- [[package]]
- name = "log"
--version = "0.4.20"
-+version = "0.4.22"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
-+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
- dependencies = [
-  "value-bag",
- ]
-@@ -1858,9 +2052,9 @@ dependencies = [
- 
- [[package]]
- name = "memchr"
--version = "2.6.4"
-+version = "2.7.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167"
-+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
- 
- [[package]]
- name = "memmap2"
-@@ -1900,7 +2094,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
-@@ -1911,9 +2105,9 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
- 
- [[package]]
- name = "mime_guess"
--version = "2.0.4"
-+version = "2.0.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
-+checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e"
- dependencies = [
-  "mime",
-  "unicase",
-@@ -1927,9 +2121,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
- 
- [[package]]
- name = "miniz_oxide"
--version = "0.7.1"
-+version = "0.7.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
-+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
- dependencies = [
-  "adler",
-  "simd-adler32",
-@@ -1937,25 +2131,31 @@ dependencies = [
- 
- [[package]]
- name = "mio"
--version = "0.8.8"
-+version = "1.0.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
-+checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4"
- dependencies = [
-+ "hermit-abi 0.3.9",
-  "libc",
-  "wasi 0.11.0+wasi-snapshot-preview1",
-- "windows-sys 0.48.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
- name = "mockito"
--version = "1.2.0"
-+version = "1.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f8d3038e23466858569c2d30a537f691fa0d53b51626630ae08262943e3bbb8b"
-+checksum = "09b34bd91b9e5c5b06338d392463e1318d683cf82ec3d3af4014609be6e2108d"
- dependencies = [
-  "assert-json-diff",
-+ "bytes 1.7.1",
-  "colored",
-- "futures 0.3.28",
-- "hyper",
-+ "futures-util",
-+ "http 1.1.0",
-+ "http-body 1.0.1",
-+ "http-body-util",
-+ "hyper 1.4.1",
-+ "hyper-util",
-  "log",
-  "rand 0.8.5",
-  "regex",
-@@ -1980,7 +2180,7 @@ dependencies = [
-  "console_error_panic_hook",
-  "dashmap",
-  "flate2",
-- "futures 0.3.28",
-+ "futures 0.3.30",
-  "io_tee",
-  "js-sys",
-  "miette",
-@@ -2004,17 +2204,16 @@ dependencies = [
-  "url",
-  "wasm-bindgen",
-  "wasm-bindgen-futures",
-- "wasm-streams",
-+ "wasm-streams 0.3.0",
-  "which",
- ]
- 
- [[package]]
- name = "native-tls"
--version = "0.2.11"
-+version = "0.2.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
-+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
- dependencies = [
-- "lazy_static",
-  "libc",
-  "log",
-  "openssl",
-@@ -2034,7 +2233,7 @@ dependencies = [
-  "colored",
-  "console_error_panic_hook",
-  "dashmap",
-- "futures 0.3.28",
-+ "futures 0.3.30",
-  "indexmap 1.9.3",
-  "indicatif",
-  "insta",
-@@ -2102,11 +2301,17 @@ dependencies = [
-  "winapi",
- ]
- 
-+[[package]]
-+name = "num-conv"
-+version = "0.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
-+
- [[package]]
- name = "num-traits"
--version = "0.2.16"
-+version = "0.2.19"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
-+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
- dependencies = [
-  "autocfg",
- ]
-@@ -2117,7 +2322,7 @@ version = "1.16.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
- dependencies = [
-- "hermit-abi",
-+ "hermit-abi 0.3.9",
-  "libc",
- ]
- 
-@@ -2129,24 +2334,24 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
- 
- [[package]]
- name = "object"
--version = "0.32.1"
-+version = "0.36.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
-+checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e"
- dependencies = [
-  "memchr",
- ]
- 
- [[package]]
- name = "once_cell"
--version = "1.18.0"
-+version = "1.19.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
-+checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
- 
- [[package]]
- name = "open"
--version = "5.0.0"
-+version = "5.3.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cfabf1927dce4d6fdf563d63328a0a506101ced3ec780ca2135747336c98cef8"
-+checksum = "61a877bf6abd716642a53ef1b89fb498923a4afca5c754f9050b4d081c05c4b3"
- dependencies = [
-  "is-wsl",
-  "libc",
-@@ -2155,11 +2360,11 @@ dependencies = [
- 
- [[package]]
- name = "openssl"
--version = "0.10.57"
-+version = "0.10.66"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c"
-+checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
- dependencies = [
-- "bitflags 2.4.0",
-+ "bitflags 2.6.0",
-  "cfg-if",
-  "foreign-types",
-  "libc",
-@@ -2176,7 +2381,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
-@@ -2187,9 +2392,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
- 
- [[package]]
- name = "openssl-sys"
--version = "0.9.93"
-+version = "0.9.103"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d"
-+checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
- dependencies = [
-  "cc",
-  "libc",
-@@ -2204,9 +2409,9 @@ dependencies = [
-  "anyhow",
-  "async-std",
-  "async-trait",
-- "base64 0.21.4",
-+ "base64 0.21.7",
-  "chrono",
-- "futures 0.3.28",
-+ "futures 0.3.30",
-  "http-cache-reqwest",
-  "indexmap 1.9.3",
-  "maplit",
-@@ -2263,7 +2468,7 @@ name = "oro-npm-account"
- version = "0.3.34"
- dependencies = [
-  "async-std",
-- "base64 0.21.4",
-+ "base64 0.21.7",
-  "dialoguer",
-  "kdl",
-  "miette",
-@@ -2370,13 +2575,13 @@ dependencies = [
- 
- [[package]]
- name = "os_info"
--version = "3.7.0"
-+version = "3.8.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e"
-+checksum = "ae99c7fa6dd38c7cafe1ec085e804f8f555a2f8659b0dbe03f1f9963a9b51092"
- dependencies = [
-  "log",
-  "serde",
-- "winapi",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -2393,9 +2598,9 @@ checksum = "c1b04fb49957986fdce4d6ee7a65027d55d4b6d2265e5848bbb507b58ccfdb6f"
- 
- [[package]]
- name = "parking"
--version = "2.1.1"
-+version = "2.2.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e52c774a4c39359c1d1c52e43f73dd91a75a614652c825408eec30c95a9b2067"
-+checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
- 
- [[package]]
- name = "parking_lot"
-@@ -2410,12 +2615,12 @@ dependencies = [
- 
- [[package]]
- name = "parking_lot"
--version = "0.12.1"
-+version = "0.12.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
-+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
- dependencies = [
-  "lock_api",
-- "parking_lot_core 0.9.8",
-+ "parking_lot_core 0.9.10",
- ]
- 
- [[package]]
-@@ -2434,15 +2639,15 @@ dependencies = [
- 
- [[package]]
- name = "parking_lot_core"
--version = "0.9.8"
-+version = "0.9.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "93f00c865fe7cabf650081affecd3871070f26767e7b2070a3ffae14c654b447"
-+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
- dependencies = [
-  "cfg-if",
-  "libc",
-- "redox_syscall 0.3.5",
-+ "redox_syscall 0.5.3",
-  "smallvec",
-- "windows-targets 0.48.5",
-+ "windows-targets 0.52.6",
- ]
- 
- [[package]]
-@@ -2453,18 +2658,18 @@ checksum = "8835116a5c179084a830efb3adc117ab007512b535bc1a21c991d3b32a6b44dd"
- 
- [[package]]
- name = "percent-encoding"
--version = "2.3.0"
-+version = "2.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94"
-+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
- 
- [[package]]
- name = "petgraph"
--version = "0.6.4"
-+version = "0.6.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
-+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
- dependencies = [
-  "fixedbitset",
-- "indexmap 2.0.2",
-+ "indexmap 2.3.0",
- ]
- 
- [[package]]
-@@ -2475,29 +2680,29 @@ checksum = "5be167a7af36ee22fe3115051bc51f6e6c7054c9348e28deb4f49bd6f705a315"
- 
- [[package]]
- name = "pin-project"
--version = "1.1.3"
-+version = "1.1.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fda4ed1c6c173e3fc7a83629421152e01d7b1f9b7f65fb301e490e8cfc656422"
-+checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3"
- dependencies = [
-  "pin-project-internal",
- ]
- 
- [[package]]
- name = "pin-project-internal"
--version = "1.1.3"
-+version = "1.1.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
-+checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
- name = "pin-project-lite"
--version = "0.2.13"
-+version = "0.2.14"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
-+checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02"
- 
- [[package]]
- name = "pin-utils"
-@@ -2507,26 +2712,26 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
- 
- [[package]]
- name = "piper"
--version = "0.2.1"
-+version = "0.2.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4"
-+checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
- dependencies = [
-  "atomic-waker",
-- "fastrand 2.0.1",
-+ "fastrand 2.1.0",
-  "futures-io",
- ]
- 
- [[package]]
- name = "pkg-config"
--version = "0.3.27"
-+version = "0.3.30"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"
-+checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
- 
- [[package]]
- name = "png"
--version = "0.17.10"
-+version = "0.17.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64"
-+checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1"
- dependencies = [
-  "bitflags 1.3.2",
-  "crc32fast",
-@@ -2551,6 +2756,21 @@ dependencies = [
-  "windows-sys 0.48.0",
- ]
- 
-+[[package]]
-+name = "polling"
-+version = "3.7.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
-+dependencies = [
-+ "cfg-if",
-+ "concurrent-queue",
-+ "hermit-abi 0.4.0",
-+ "pin-project-lite",
-+ "rustix 0.38.34",
-+ "tracing",
-+ "windows-sys 0.52.0",
-+]
-+
- [[package]]
- name = "poloto"
- version = "17.2.1"
-@@ -2563,15 +2783,24 @@ dependencies = [
- 
- [[package]]
- name = "portable-atomic"
--version = "1.4.3"
-+version = "1.7.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "da544ee218f0d287a911e9c99a39a8c9bc8fcad3cb8db5959940044ecfc67265"
-+
-+[[package]]
-+name = "powerfmt"
-+version = "0.2.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "31114a898e107c51bb1609ffaf55a0e011cf6a4d7f1170d0015a165082c0338b"
-+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
- 
- [[package]]
- name = "ppv-lite86"
--version = "0.2.17"
-+version = "0.2.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-+checksum = "dee4364d9f3b902ef14fab8a1ddffb783a1cb6b4bba3bfc1fa3922732c7de97f"
-+dependencies = [
-+ "zerocopy",
-+]
- 
- [[package]]
- name = "pretty_assertions"
-@@ -2583,35 +2812,11 @@ dependencies = [
-  "yansi",
- ]
- 
--[[package]]
--name = "proc-macro-error"
--version = "1.0.4"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
--dependencies = [
-- "proc-macro-error-attr",
-- "proc-macro2",
-- "quote",
-- "syn 1.0.109",
-- "version_check",
--]
--
--[[package]]
--name = "proc-macro-error-attr"
--version = "1.0.4"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
--dependencies = [
-- "proc-macro2",
-- "quote",
-- "version_check",
--]
--
- [[package]]
- name = "proc-macro2"
--version = "1.0.68"
-+version = "1.0.86"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5b1106fec09662ec6dd98ccac0f81cef56984d0b49f75c92d8cbad76e20c005c"
-+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
- dependencies = [
-  "unicode-ident",
- ]
-@@ -2638,9 +2843,9 @@ dependencies = [
- 
- [[package]]
- name = "quote"
--version = "1.0.33"
-+version = "1.0.36"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
-+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
- dependencies = [
-  "proc-macro2",
- ]
-@@ -2710,7 +2915,7 @@ version = "0.6.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
- dependencies = [
-- "getrandom 0.2.10",
-+ "getrandom 0.2.15",
- ]
- 
- [[package]]
-@@ -2739,45 +2944,54 @@ dependencies = [
- 
- [[package]]
- name = "redox_syscall"
--version = "0.3.5"
-+version = "0.4.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
-+checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
- dependencies = [
-  "bitflags 1.3.2",
- ]
- 
-+[[package]]
-+name = "redox_syscall"
-+version = "0.5.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4"
-+dependencies = [
-+ "bitflags 2.6.0",
-+]
-+
- [[package]]
- name = "redox_users"
--version = "0.4.3"
-+version = "0.4.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b033d837a7cf162d7993aded9304e30a83213c648b6e389db233191f891e5c2b"
-+checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
- dependencies = [
-- "getrandom 0.2.10",
-- "redox_syscall 0.2.16",
-+ "getrandom 0.2.15",
-+ "libredox",
-  "thiserror",
- ]
- 
- [[package]]
- name = "reflink-copy"
--version = "0.1.9"
-+version = "0.1.19"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d7e3e017e993f86feeddf8a7fb609ca49f89082309e328e27aefd4a25bb317a4"
-+checksum = "dc31414597d1cd7fdd2422798b7652a6329dda0fe0219e6335a13d5bcaa9aeb6"
- dependencies = [
-  "cfg-if",
-- "ioctl-sys",
-- "windows 0.51.1",
-+ "rustix 0.38.34",
-+ "windows",
- ]
- 
- [[package]]
- name = "regex"
--version = "1.9.6"
-+version = "1.10.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff"
-+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
- dependencies = [
-  "aho-corasick",
-  "memchr",
-- "regex-automata 0.3.9",
-- "regex-syntax 0.7.5",
-+ "regex-automata 0.4.7",
-+ "regex-syntax 0.8.4",
- ]
- 
- [[package]]
-@@ -2791,13 +3005,13 @@ dependencies = [
- 
- [[package]]
- name = "regex-automata"
--version = "0.3.9"
-+version = "0.4.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9"
-+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
- dependencies = [
-  "aho-corasick",
-  "memchr",
-- "regex-syntax 0.7.5",
-+ "regex-syntax 0.8.4",
- ]
- 
- [[package]]
-@@ -2808,35 +3022,35 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
- 
- [[package]]
- name = "regex-syntax"
--version = "0.7.5"
-+version = "0.8.4"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"
-+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
- 
- [[package]]
- name = "rend"
--version = "0.4.1"
-+version = "0.4.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "a2571463863a6bd50c32f94402933f03457a3fbaf697a707c5be741e459f08fd"
-+checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c"
- dependencies = [
-  "bytecheck",
- ]
- 
- [[package]]
- name = "reqwest"
--version = "0.11.22"
-+version = "0.11.27"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b"
-+checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
- dependencies = [
-- "async-compression 0.4.3",
-- "base64 0.21.4",
-- "bytes 1.5.0",
-+ "async-compression 0.4.12",
-+ "base64 0.21.7",
-+ "bytes 1.7.1",
-  "encoding_rs",
-  "futures-core",
-  "futures-util",
-- "h2",
-- "http",
-- "http-body",
-- "hyper",
-+ "h2 0.3.26",
-+ "http 0.2.12",
-+ "http-body 0.4.6",
-+ "hyper 0.14.30",
-  "hyper-tls",
-  "ipnet",
-  "js-sys",
-@@ -2847,9 +3061,11 @@ dependencies = [
-  "once_cell",
-  "percent-encoding",
-  "pin-project-lite",
-+ "rustls-pemfile",
-  "serde",
-  "serde_json",
-  "serde_urlencoded",
-+ "sync_wrapper",
-  "system-configuration",
-  "tokio",
-  "tokio-native-tls",
-@@ -2858,7 +3074,7 @@ dependencies = [
-  "url",
-  "wasm-bindgen",
-  "wasm-bindgen-futures",
-- "wasm-streams",
-+ "wasm-streams 0.4.0",
-  "web-sys",
-  "winreg 0.50.0",
- ]
-@@ -2871,7 +3087,7 @@ checksum = "4531c89d50effe1fac90d095c8b133c20c5c714204feee0bfc3fd158e784209d"
- dependencies = [
-  "anyhow",
-  "async-trait",
-- "http",
-+ "http 0.2.12",
-  "reqwest",
-  "serde",
-  "task-local-extensions",
-@@ -2887,10 +3103,10 @@ dependencies = [
-  "anyhow",
-  "async-trait",
-  "chrono",
-- "futures 0.3.28",
-- "getrandom 0.2.10",
-- "http",
-- "hyper",
-+ "futures 0.3.30",
-+ "getrandom 0.2.15",
-+ "http 0.2.12",
-+ "hyper 0.14.30",
-  "parking_lot 0.11.2",
-  "reqwest",
-  "reqwest-middleware",
-@@ -2939,21 +3155,22 @@ dependencies = [
- 
- [[package]]
- name = "rgb"
--version = "0.8.36"
-+version = "0.8.45"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "20ec2d3e3fc7a92ced357df9cebd5a10b6fb2aa1ee797bf7e9ce2f17dffc8f59"
-+checksum = "ade4539f42266ded9e755c605bdddf546242b2c961b03b06a7375260788a0523"
- dependencies = [
-  "bytemuck",
- ]
- 
- [[package]]
- name = "rkyv"
--version = "0.7.42"
-+version = "0.7.44"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0200c8230b013893c0b2d6213d6ec64ed2b9be2e0e016682b7224ff82cff5c58"
-+checksum = "5cba464629b3394fc4dbc6f940ff8f5b4ff5c7aef40f29166fd4ad12acbc99c0"
- dependencies = [
-  "bitvec",
-  "bytecheck",
-+ "bytes 1.7.1",
-  "hashbrown 0.12.3",
-  "ptr_meta",
-  "rend",
-@@ -2965,9 +3182,9 @@ dependencies = [
- 
- [[package]]
- name = "rkyv_derive"
--version = "0.7.42"
-+version = "0.7.44"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b2e06b915b5c230a17d7a736d1e2e63ee753c256a8614ef3f5147b13a4f5541d"
-+checksum = "a7dddfff8de25e6f62b9d64e6e432bf1c6736c57d20323e15ee10435fbda7c65"
- dependencies = [
-  "proc-macro2",
-  "quote",
-@@ -2981,7 +3198,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "bdc23d1ace03d6b8153c7d16f0708cd80b61ee8e80304954803354e67e40d150"
- dependencies = [
-  "log",
-- "roxmltree",
-+ "roxmltree 0.18.1",
-  "simplecss",
-  "siphasher",
-  "svgtypes 0.9.0",
-@@ -2996,11 +3213,17 @@ dependencies = [
-  "xmlparser",
- ]
- 
-+[[package]]
-+name = "roxmltree"
-+version = "0.20.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6c20b6793b5c2fa6553b250154b78d6d0db37e72700ae35fad9387a46f487c97"
-+
- [[package]]
- name = "rustc-demangle"
--version = "0.1.23"
-+version = "0.1.24"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
-+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
- 
- [[package]]
- name = "rustc_version"
-@@ -3013,9 +3236,9 @@ dependencies = [
- 
- [[package]]
- name = "rustix"
--version = "0.37.24"
-+version = "0.37.27"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4279d76516df406a8bd37e7dff53fd37d1a093f997a3c34a5c21658c126db06d"
-+checksum = "fea8ca367a3a01fe35e6943c400addf443c0f57670e6ec51196f71a4b8762dd2"
- dependencies = [
-  "bitflags 1.3.2",
-  "errno",
-@@ -3027,15 +3250,24 @@ dependencies = [
- 
- [[package]]
- name = "rustix"
--version = "0.38.17"
-+version = "0.38.34"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f25469e9ae0f3d0047ca8b93fc56843f38e6774f0914a107ff8b41be8be8e0b7"
-+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
- dependencies = [
-- "bitflags 2.4.0",
-+ "bitflags 2.6.0",
-  "errno",
-  "libc",
-- "linux-raw-sys 0.4.8",
-- "windows-sys 0.48.0",
-+ "linux-raw-sys 0.4.14",
-+ "windows-sys 0.52.0",
-+]
-+
-+[[package]]
-+name = "rustls-pemfile"
-+version = "1.0.4"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
-+dependencies = [
-+ "base64 0.21.7",
- ]
- 
- [[package]]
-@@ -3056,9 +3288,9 @@ dependencies = [
- 
- [[package]]
- name = "ryu"
--version = "1.0.15"
-+version = "1.0.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
-+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
- 
- [[package]]
- name = "same-file"
-@@ -3071,11 +3303,11 @@ dependencies = [
- 
- [[package]]
- name = "schannel"
--version = "0.1.22"
-+version = "0.1.23"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
-+checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
- dependencies = [
-- "windows-sys 0.48.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -3092,11 +3324,11 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
- 
- [[package]]
- name = "security-framework"
--version = "2.9.2"
-+version = "2.11.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de"
-+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
- dependencies = [
-- "bitflags 1.3.2",
-+ "bitflags 2.6.0",
-  "core-foundation",
-  "core-foundation-sys",
-  "libc",
-@@ -3105,9 +3337,9 @@ dependencies = [
- 
- [[package]]
- name = "security-framework-sys"
--version = "2.9.1"
-+version = "2.11.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a"
-+checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf"
- dependencies = [
-  "core-foundation-sys",
-  "libc",
-@@ -3115,15 +3347,15 @@ dependencies = [
- 
- [[package]]
- name = "semver"
--version = "1.0.19"
-+version = "1.0.23"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ad977052201c6de01a8ef2aa3378c4bd23217a056337d1d6da40468d267a4fb0"
-+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
- 
- [[package]]
- name = "sentry"
--version = "0.31.7"
-+version = "0.31.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0097a48cd1999d983909f07cb03b15241c5af29e5e679379efac1c06296abecc"
-+checksum = "6ce4b57f1b521f674df7a1d200be8ff5d74e3712020ee25b553146657b5377d5"
- dependencies = [
-  "httpdate",
-  "native-tls",
-@@ -3140,9 +3372,9 @@ dependencies = [
- 
- [[package]]
- name = "sentry-backtrace"
--version = "0.31.7"
-+version = "0.31.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "18a7b80fa1dd6830a348d38a8d3a9761179047757b7dca29aef82db0118b9670"
-+checksum = "58cc8d4e04a73de8f718dc703943666d03f25d3e9e4d0fb271ca0b8c76dfa00e"
- dependencies = [
-  "backtrace",
-  "once_cell",
-@@ -3152,9 +3384,9 @@ dependencies = [
- 
- [[package]]
- name = "sentry-contexts"
--version = "0.31.7"
-+version = "0.31.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7615dc588930f1fd2e721774f25844ae93add2dbe2d3c2f995ce5049af898147"
-+checksum = "6436c1bad22cdeb02179ea8ef116ffc217797c028927def303bc593d9320c0d1"
- dependencies = [
-  "hostname",
-  "libc",
-@@ -3166,9 +3398,9 @@ dependencies = [
- 
- [[package]]
- name = "sentry-core"
--version = "0.31.7"
-+version = "0.31.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8f51264e4013ed9b16558cce43917b983fa38170de2ca480349ceb57d71d6053"
-+checksum = "901f761681f97db3db836ef9e094acdd8756c40215326c194201941947164ef1"
- dependencies = [
-  "once_cell",
-  "rand 0.8.5",
-@@ -3179,9 +3411,9 @@ dependencies = [
- 
- [[package]]
- name = "sentry-debug-images"
--version = "0.31.7"
-+version = "0.31.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2fe6180fa564d40bb942c9f0084ffb5de691c7357ead6a2b7a3154fae9e401dd"
-+checksum = "afdb263e73d22f39946f6022ed455b7561b22ff5553aca9be3c6a047fa39c328"
- dependencies = [
-  "findshlibs",
-  "once_cell",
-@@ -3190,9 +3422,9 @@ dependencies = [
- 
- [[package]]
- name = "sentry-panic"
--version = "0.31.7"
-+version = "0.31.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "323160213bba549f9737317b152af116af35c0410f4468772ee9b606d3d6e0fa"
-+checksum = "74fbf1c163f8b6a9d05912e1b272afa27c652e8b47ea60cb9a57ad5e481eea99"
- dependencies = [
-  "sentry-backtrace",
-  "sentry-core",
-@@ -3200,9 +3432,9 @@ dependencies = [
- 
- [[package]]
- name = "sentry-tracing"
--version = "0.31.7"
-+version = "0.31.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "38033822128e73f7b6ca74c1631cef8868890c6cb4008a291cf73530f87b4eac"
-+checksum = "82eabcab0a047040befd44599a1da73d3adb228ff53b5ed9795ae04535577704"
- dependencies = [
-  "sentry-backtrace",
-  "sentry-core",
-@@ -3212,9 +3444,9 @@ dependencies = [
- 
- [[package]]
- name = "sentry-types"
--version = "0.31.7"
-+version = "0.31.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0e663b3eb62ddfc023c9cf5432daf5f1a4f6acb1df4d78dd80b740b32dd1a740"
-+checksum = "da956cca56e0101998c8688bc65ce1a96f00673a0e58e663664023d4c7911e82"
- dependencies = [
-  "debugid",
-  "hex",
-@@ -3229,9 +3461,9 @@ dependencies = [
- 
- [[package]]
- name = "serde"
--version = "1.0.188"
-+version = "1.0.204"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
-+checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
- dependencies = [
-  "serde_derive",
- ]
-@@ -3260,13 +3492,13 @@ dependencies = [
- 
- [[package]]
- name = "serde_derive"
--version = "1.0.188"
-+version = "1.0.204"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
-+checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
-@@ -3277,17 +3509,18 @@ checksum = "e578a843d40b4189a4d66bba51d7684f57da5bd7c304c64e14bd63efbef49509"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
- name = "serde_json"
--version = "1.0.107"
-+version = "1.0.122"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
-+checksum = "784b6203951c57ff748476b126ccb5e8e2959a5c19e5c617ab1956be3dbc68da"
- dependencies = [
-- "indexmap 2.0.2",
-+ "indexmap 2.3.0",
-  "itoa",
-+ "memchr",
-  "ryu",
-  "serde",
- ]
-@@ -3363,21 +3596,11 @@ version = "1.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
- 
--[[package]]
--name = "signal-hook"
--version = "0.3.17"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801"
--dependencies = [
-- "libc",
-- "signal-hook-registry",
--]
--
- [[package]]
- name = "signal-hook-registry"
--version = "1.4.1"
-+version = "1.4.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
-+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
- dependencies = [
-  "libc",
- ]
-@@ -3396,9 +3619,9 @@ checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a"
- 
- [[package]]
- name = "similar"
--version = "2.2.1"
-+version = "2.6.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "420acb44afdae038210c99e69aae24109f32f15500aa708e81d46c9f29d55fcf"
-+checksum = "1de1d4f81173b03af4c0cbed3c898f6bff5b870e4a7f5d6f4057d62a7a4b686e"
- 
- [[package]]
- name = "simplecss"
-@@ -3426,9 +3649,9 @@ dependencies = [
- 
- [[package]]
- name = "smallvec"
--version = "1.11.1"
-+version = "1.13.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
-+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
- 
- [[package]]
- name = "smawk"
-@@ -3438,9 +3661,9 @@ checksum = "b7c388c1b5e93756d0c740965c41e8822f866621d41acbdf6336a6a168f8840c"
- 
- [[package]]
- name = "socket2"
--version = "0.4.9"
-+version = "0.4.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662"
-+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
- dependencies = [
-  "libc",
-  "winapi",
-@@ -3448,12 +3671,12 @@ dependencies = [
- 
- [[package]]
- name = "socket2"
--version = "0.5.4"
-+version = "0.5.7"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e"
-+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
- dependencies = [
-  "libc",
-- "windows-sys 0.48.0",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -3462,7 +3685,7 @@ version = "9.2.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "da7a2b3c2bc9693bcb40870c4e9b5bf0d79f9cb46273321bf855ec513e919082"
- dependencies = [
-- "base64 0.21.4",
-+ "base64 0.21.7",
-  "digest",
-  "hex",
-  "miette",
-@@ -3488,6 +3711,12 @@ version = "0.10.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
- 
-+[[package]]
-+name = "strsim"
-+version = "0.11.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
-+
- [[package]]
- name = "supports-color"
- version = "2.1.0"
-@@ -3509,9 +3738,9 @@ dependencies = [
- 
- [[package]]
- name = "supports-unicode"
--version = "2.0.0"
-+version = "2.1.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4b6c2cb240ab5dd21ed4906895ee23fe5a48acdbd15a3ce388e7b62a9b66baf7"
-+checksum = "f850c19edd184a205e883199a261ed44471c81e39bd95b1357f5febbef00e77a"
- dependencies = [
-  "is-terminal",
- ]
-@@ -3559,15 +3788,21 @@ dependencies = [
- 
- [[package]]
- name = "syn"
--version = "2.0.38"
-+version = "2.0.72"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
-+checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af"
- dependencies = [
-  "proc-macro2",
-  "quote",
-  "unicode-ident",
- ]
- 
-+[[package]]
-+name = "sync_wrapper"
-+version = "0.1.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
-+
- [[package]]
- name = "system-configuration"
- version = "0.5.1"
-@@ -3597,13 +3832,13 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
- 
- [[package]]
- name = "tar"
--version = "0.4.40"
-+version = "0.4.41"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb"
-+checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909"
- dependencies = [
-  "filetime",
-  "libc",
-- "xattr 1.0.1",
-+ "xattr 1.3.1",
- ]
- 
- [[package]]
-@@ -3617,15 +3852,14 @@ dependencies = [
- 
- [[package]]
- name = "tempfile"
--version = "3.8.0"
-+version = "3.10.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef"
-+checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
- dependencies = [
-  "cfg-if",
-- "fastrand 2.0.1",
-- "redox_syscall 0.3.5",
-- "rustix 0.38.17",
-- "windows-sys 0.48.0",
-+ "fastrand 2.1.0",
-+ "rustix 0.38.34",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -3659,36 +3893,34 @@ dependencies = [
- 
- [[package]]
- name = "test-case"
--version = "3.2.1"
-+version = "3.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c8f1e820b7f1d95a0cdbf97a5df9de10e1be731983ab943e56703ac1b8e9d425"
-+checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8"
- dependencies = [
-  "test-case-macros",
- ]
- 
- [[package]]
- name = "test-case-core"
--version = "3.2.1"
-+version = "3.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "54c25e2cb8f5fcd7318157634e8838aa6f7e4715c96637f969fabaccd1ef5462"
-+checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f"
- dependencies = [
-  "cfg-if",
-- "proc-macro-error",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
- name = "test-case-macros"
--version = "3.2.1"
-+version = "3.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "37cfd7bbc88a0104e304229fba519bdc45501a30b760fb72240342f1289ad257"
-+checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
- dependencies = [
-- "proc-macro-error",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
-  "test-case-core",
- ]
- 
-@@ -3705,29 +3937,29 @@ dependencies = [
- 
- [[package]]
- name = "thiserror"
--version = "1.0.49"
-+version = "1.0.63"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
-+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
- dependencies = [
-  "thiserror-impl",
- ]
- 
- [[package]]
- name = "thiserror-impl"
--version = "1.0.49"
-+version = "1.0.63"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
-+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
- name = "thread_local"
--version = "1.1.7"
-+version = "1.1.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152"
-+checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c"
- dependencies = [
-  "cfg-if",
-  "once_cell",
-@@ -3735,12 +3967,14 @@ dependencies = [
- 
- [[package]]
- name = "time"
--version = "0.3.29"
-+version = "0.3.36"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "426f806f4089c493dcac0d24c29c01e2c38baf8e30f1b716ee37e83d200b18fe"
-+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
- dependencies = [
-  "deranged",
-  "itoa",
-+ "num-conv",
-+ "powerfmt",
-  "serde",
-  "time-core",
-  "time-macros",
-@@ -3754,10 +3988,11 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
- 
- [[package]]
- name = "time-macros"
--version = "0.2.15"
-+version = "0.2.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "4ad70d68dba9e1f8aceda7aa6711965dfec1cac869f311a51bd08b3a2ccbce20"
-+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
- dependencies = [
-+ "num-conv",
-  "time-core",
- ]
- 
-@@ -3788,9 +4023,9 @@ dependencies = [
- 
- [[package]]
- name = "tinyvec"
--version = "1.6.0"
-+version = "1.8.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
-+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
- dependencies = [
-  "tinyvec_macros",
- ]
-@@ -3803,21 +4038,18 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
- 
- [[package]]
- name = "tokio"
--version = "1.32.0"
-+version = "1.39.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "17ed6077ed6cd6c74735e21f37eb16dc3935f96878b1fe961074089cc80893f9"
-+checksum = "daa4fb1bc778bd6f04cbfc4bb2d06a7396a8f299dc33ea1900cedaa316f467b1"
- dependencies = [
-  "backtrace",
-- "bytes 1.5.0",
-+ "bytes 1.7.1",
-  "libc",
-  "mio",
-- "num_cpus",
-- "parking_lot 0.12.1",
-+ "parking_lot 0.12.3",
-  "pin-project-lite",
-- "signal-hook-registry",
-- "socket2 0.5.4",
-- "tokio-macros",
-- "windows-sys 0.48.0",
-+ "socket2 0.5.7",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -3831,17 +4063,6 @@ dependencies = [
-  "log",
- ]
- 
--[[package]]
--name = "tokio-macros"
--version = "2.1.0"
--source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e"
--dependencies = [
-- "proc-macro2",
-- "quote",
-- "syn 2.0.38",
--]
--
- [[package]]
- name = "tokio-native-tls"
- version = "0.3.1"
-@@ -3854,16 +4075,15 @@ dependencies = [
- 
- [[package]]
- name = "tokio-util"
--version = "0.7.9"
-+version = "0.7.11"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d"
-+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
- dependencies = [
-- "bytes 1.5.0",
-+ "bytes 1.7.1",
-  "futures-core",
-  "futures-sink",
-  "pin-project-lite",
-  "tokio",
-- "tracing",
- ]
- 
- [[package]]
-@@ -3883,11 +4103,10 @@ checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
- 
- [[package]]
- name = "tracing"
--version = "0.1.37"
-+version = "0.1.40"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
-+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
- dependencies = [
-- "cfg-if",
-  "pin-project-lite",
-  "tracing-attributes",
-  "tracing-core",
-@@ -3895,31 +4114,32 @@ dependencies = [
- 
- [[package]]
- name = "tracing-appender"
--version = "0.2.2"
-+version = "0.2.3"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "09d48f71a791638519505cefafe162606f706c25592e4bde4d97600c0195312e"
-+checksum = "3566e8ce28cc0a3fe42519fc80e6b4c943cc4c8cef275620eb8dac2d3d4e06cf"
- dependencies = [
-  "crossbeam-channel",
-+ "thiserror",
-  "time",
-  "tracing-subscriber",
- ]
- 
- [[package]]
- name = "tracing-attributes"
--version = "0.1.26"
-+version = "0.1.27"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
-+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
- name = "tracing-core"
--version = "0.1.31"
-+version = "0.1.32"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
-+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
- dependencies = [
-  "once_cell",
-  "valuable",
-@@ -3927,9 +4147,9 @@ dependencies = [
- 
- [[package]]
- name = "tracing-indicatif"
--version = "0.3.5"
-+version = "0.3.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "57e05fe4a1c906d94b275d8aeb8ff8b9deaca502aeb59ae8ab500a92b8032ac8"
-+checksum = "069580424efe11d97c3fef4197fa98c004fa26672cc71ad8770d224e23b1951d"
- dependencies = [
-  "indicatif",
-  "tracing",
-@@ -3939,20 +4159,20 @@ dependencies = [
- 
- [[package]]
- name = "tracing-log"
--version = "0.1.3"
-+version = "0.2.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
-+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
- dependencies = [
-- "lazy_static",
-  "log",
-+ "once_cell",
-  "tracing-core",
- ]
- 
- [[package]]
- name = "tracing-subscriber"
--version = "0.3.17"
-+version = "0.3.18"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
-+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
- dependencies = [
-  "matchers",
-  "nu-ansi-term",
-@@ -3968,9 +4188,9 @@ dependencies = [
- 
- [[package]]
- name = "try-lock"
--version = "0.2.4"
-+version = "0.2.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed"
-+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
- 
- [[package]]
- name = "tsify"
-@@ -3993,7 +4213,7 @@ dependencies = [
-  "proc-macro2",
-  "quote",
-  "serde_derive_internals",
-- "syn 2.0.38",
-+ "syn 2.0.72",
- ]
- 
- [[package]]
-@@ -4028,9 +4248,9 @@ dependencies = [
- 
- [[package]]
- name = "unicode-bidi"
--version = "0.3.13"
-+version = "0.3.15"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460"
-+checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
- 
- [[package]]
- name = "unicode-bidi-mirroring"
-@@ -4064,18 +4284,18 @@ checksum = "3b09c83c3c29d37506a3e260c08c03743a6bb66a9cd432c6934ab501a190571f"
- 
- [[package]]
- name = "unicode-normalization"
--version = "0.1.22"
-+version = "0.1.23"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
-+checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
- dependencies = [
-  "tinyvec",
- ]
- 
- [[package]]
- name = "unicode-script"
--version = "0.5.5"
-+version = "0.5.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7d817255e1bed6dfd4ca47258685d14d2bdcfbc64fdc9e3819bd5848057b8ecc"
-+checksum = "ad8d71f5726e5f285a935e9fe8edfd53f0491eb6e9a5774097fdabee7cd8c9cd"
- 
- [[package]]
- name = "unicode-vo"
-@@ -4085,17 +4305,17 @@ checksum = "b1d386ff53b415b7fe27b50bb44679e2cc4660272694b7b6f3326d8480823a94"
- 
- [[package]]
- name = "unicode-width"
--version = "0.1.11"
-+version = "0.1.13"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
-+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
- 
- [[package]]
- name = "ureq"
--version = "2.8.0"
-+version = "2.10.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f5ccd538d4a604753ebc2f17cd9946e89b77bf87f6a8e2309667c6f2e87855e3"
-+checksum = "72139d247e5f97a3eff96229a7ae85ead5328a39efe76f8bf5a06313d505b6ea"
- dependencies = [
-- "base64 0.21.4",
-+ "base64 0.22.1",
-  "log",
-  "native-tls",
-  "once_cell",
-@@ -4104,9 +4324,9 @@ dependencies = [
- 
- [[package]]
- name = "url"
--version = "2.4.1"
-+version = "2.5.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5"
-+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
- dependencies = [
-  "form_urlencoded",
-  "idna",
-@@ -4120,7 +4340,7 @@ version = "0.29.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "63b6bb4e62619d9f68aa2d8a823fea2bff302340a1f2d45c264d5b0be170832e"
- dependencies = [
-- "base64 0.21.4",
-+ "base64 0.21.7",
-  "data-url",
-  "flate2",
-  "imagesize",
-@@ -4149,15 +4369,15 @@ dependencies = [
- 
- [[package]]
- name = "utf8parse"
--version = "0.2.1"
-+version = "0.2.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
-+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
- 
- [[package]]
- name = "uuid"
--version = "1.4.1"
-+version = "1.10.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "79daa5ed5740825c40b389c5e50312b9c86df53fccd33f281df655642b43869d"
-+checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314"
- dependencies = [
-  "serde",
- ]
-@@ -4170,9 +4390,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d"
- 
- [[package]]
- name = "value-bag"
--version = "1.4.1"
-+version = "1.9.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d92ccd67fb88503048c01b59152a04effd0782d035a83a6d256ce6085f08f4a3"
-+checksum = "5a84c137d37ab0142f0f2ddfe332651fdbf252e7b7dbb4e67b6c1f1b2e925101"
- 
- [[package]]
- name = "vcpkg"
-@@ -4182,9 +4402,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
- 
- [[package]]
- name = "version_check"
--version = "0.9.4"
-+version = "0.9.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
-+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
- 
- [[package]]
- name = "vswhom"
-@@ -4231,9 +4451,9 @@ dependencies = [
- 
- [[package]]
- name = "vte_generate_state_changes"
--version = "0.1.1"
-+version = "0.1.2"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d257817081c7dffcdbab24b9e62d2def62e2ff7d00b1c20062551e6cccc145ff"
-+checksum = "2e369bee1b05d510a7b4ed645f5faa90619e05437111783ea5848f28d97d3c2e"
- dependencies = [
-  "proc-macro2",
-  "quote",
-@@ -4241,15 +4461,15 @@ dependencies = [
- 
- [[package]]
- name = "waker-fn"
--version = "1.1.1"
-+version = "1.2.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
-+checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
- 
- [[package]]
- name = "walkdir"
--version = "2.4.0"
-+version = "2.5.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
-+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
- dependencies = [
-  "same-file",
-  "winapi-util",
-@@ -4278,9 +4498,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
- 
- [[package]]
- name = "wasm-bindgen"
--version = "0.2.87"
-+version = "0.2.92"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342"
-+checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
- dependencies = [
-  "cfg-if",
-  "wasm-bindgen-macro",
-@@ -4288,24 +4508,24 @@ dependencies = [
- 
- [[package]]
- name = "wasm-bindgen-backend"
--version = "0.2.87"
-+version = "0.2.92"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd"
-+checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
- dependencies = [
-  "bumpalo",
-  "log",
-  "once_cell",
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
-  "wasm-bindgen-shared",
- ]
- 
- [[package]]
- name = "wasm-bindgen-futures"
--version = "0.4.37"
-+version = "0.4.42"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03"
-+checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
- dependencies = [
-  "cfg-if",
-  "js-sys",
-@@ -4315,9 +4535,9 @@ dependencies = [
- 
- [[package]]
- name = "wasm-bindgen-macro"
--version = "0.2.87"
-+version = "0.2.92"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d"
-+checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
- dependencies = [
-  "quote",
-  "wasm-bindgen-macro-support",
-@@ -4325,22 +4545,22 @@ dependencies = [
- 
- [[package]]
- name = "wasm-bindgen-macro-support"
--version = "0.2.87"
-+version = "0.2.92"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b"
-+checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
- dependencies = [
-  "proc-macro2",
-  "quote",
-- "syn 2.0.38",
-+ "syn 2.0.72",
-  "wasm-bindgen-backend",
-  "wasm-bindgen-shared",
- ]
- 
- [[package]]
- name = "wasm-bindgen-shared"
--version = "0.2.87"
-+version = "0.2.92"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1"
-+checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
- 
- [[package]]
- name = "wasm-streams"
-@@ -4355,13 +4575,26 @@ dependencies = [
-  "web-sys",
- ]
- 
-+[[package]]
-+name = "wasm-streams"
-+version = "0.4.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129"
-+dependencies = [
-+ "futures-util",
-+ "js-sys",
-+ "wasm-bindgen",
-+ "wasm-bindgen-futures",
-+ "web-sys",
-+]
-+
- [[package]]
- name = "wasm-timer"
- version = "0.2.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "be0ecb0db480561e9a7642b5d3e4187c128914e58aa84330b9493e3eb68c5e7f"
- dependencies = [
-- "futures 0.3.28",
-+ "futures 0.3.30",
-  "js-sys",
-  "parking_lot 0.11.2",
-  "pin-utils",
-@@ -4372,9 +4605,9 @@ dependencies = [
- 
- [[package]]
- name = "web-sys"
--version = "0.3.64"
-+version = "0.3.69"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b"
-+checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
- dependencies = [
-  "js-sys",
-  "wasm-bindgen",
-@@ -4382,9 +4615,9 @@ dependencies = [
- 
- [[package]]
- name = "weezl"
--version = "0.1.7"
-+version = "0.1.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb"
-+checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
- 
- [[package]]
- name = "which"
-@@ -4395,7 +4628,7 @@ dependencies = [
-  "either",
-  "home",
-  "once_cell",
-- "rustix 0.38.17",
-+ "rustix 0.38.34",
- ]
- 
- [[package]]
-@@ -4416,11 +4649,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
- 
- [[package]]
- name = "winapi-util"
--version = "0.1.6"
-+version = "0.1.8"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
-+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
- dependencies = [
-- "winapi",
-+ "windows-sys 0.52.0",
- ]
- 
- [[package]]
-@@ -4431,39 +4664,75 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
- 
- [[package]]
- name = "windows"
--version = "0.48.0"
-+version = "0.58.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f"
-+checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6"
- dependencies = [
-- "windows-targets 0.48.5",
-+ "windows-core 0.58.0",
-+ "windows-targets 0.52.6",
- ]
- 
- [[package]]
--name = "windows"
--version = "0.51.1"
-+name = "windows-core"
-+version = "0.52.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9"
-+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
- dependencies = [
-- "windows-core",
-- "windows-targets 0.48.5",
-+ "windows-targets 0.52.6",
- ]
- 
- [[package]]
- name = "windows-core"
--version = "0.51.1"
-+version = "0.58.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64"
-+checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99"
- dependencies = [
-- "windows-targets 0.48.5",
-+ "windows-implement",
-+ "windows-interface",
-+ "windows-result",
-+ "windows-strings",
-+ "windows-targets 0.52.6",
- ]
- 
- [[package]]
--name = "windows-sys"
--version = "0.45.0"
-+name = "windows-implement"
-+version = "0.58.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.72",
-+]
-+
-+[[package]]
-+name = "windows-interface"
-+version = "0.58.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.72",
-+]
-+
-+[[package]]
-+name = "windows-result"
-+version = "0.2.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
-+checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e"
- dependencies = [
-- "windows-targets 0.42.2",
-+ "windows-targets 0.52.6",
-+]
-+
-+[[package]]
-+name = "windows-strings"
-+version = "0.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10"
-+dependencies = [
-+ "windows-result",
-+ "windows-targets 0.52.6",
- ]
- 
- [[package]]
-@@ -4476,18 +4745,12 @@ dependencies = [
- ]
- 
- [[package]]
--name = "windows-targets"
--version = "0.42.2"
-+name = "windows-sys"
-+version = "0.52.0"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
-+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
- dependencies = [
-- "windows_aarch64_gnullvm 0.42.2",
-- "windows_aarch64_msvc 0.42.2",
-- "windows_i686_gnu 0.42.2",
-- "windows_i686_msvc 0.42.2",
-- "windows_x86_64_gnu 0.42.2",
-- "windows_x86_64_gnullvm 0.42.2",
-- "windows_x86_64_msvc 0.42.2",
-+ "windows-targets 0.52.6",
- ]
- 
- [[package]]
-@@ -4506,10 +4769,20 @@ dependencies = [
- ]
- 
- [[package]]
--name = "windows_aarch64_gnullvm"
--version = "0.42.2"
-+name = "windows-targets"
-+version = "0.52.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
-+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-+dependencies = [
-+ "windows_aarch64_gnullvm 0.52.6",
-+ "windows_aarch64_msvc 0.52.6",
-+ "windows_i686_gnu 0.52.6",
-+ "windows_i686_gnullvm",
-+ "windows_i686_msvc 0.52.6",
-+ "windows_x86_64_gnu 0.52.6",
-+ "windows_x86_64_gnullvm 0.52.6",
-+ "windows_x86_64_msvc 0.52.6",
-+]
- 
- [[package]]
- name = "windows_aarch64_gnullvm"
-@@ -4518,10 +4791,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
- 
- [[package]]
--name = "windows_aarch64_msvc"
--version = "0.42.2"
-+name = "windows_aarch64_gnullvm"
-+version = "0.52.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
-+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
- 
- [[package]]
- name = "windows_aarch64_msvc"
-@@ -4530,10 +4803,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
- 
- [[package]]
--name = "windows_i686_gnu"
--version = "0.42.2"
-+name = "windows_aarch64_msvc"
-+version = "0.52.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
-+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
- 
- [[package]]
- name = "windows_i686_gnu"
-@@ -4542,10 +4815,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
- 
- [[package]]
--name = "windows_i686_msvc"
--version = "0.42.2"
-+name = "windows_i686_gnu"
-+version = "0.52.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-+
-+[[package]]
-+name = "windows_i686_gnullvm"
-+version = "0.52.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
-+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
- 
- [[package]]
- name = "windows_i686_msvc"
-@@ -4554,10 +4833,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
- 
- [[package]]
--name = "windows_x86_64_gnu"
--version = "0.42.2"
-+name = "windows_i686_msvc"
-+version = "0.52.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
-+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
- 
- [[package]]
- name = "windows_x86_64_gnu"
-@@ -4566,10 +4845,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
- 
- [[package]]
--name = "windows_x86_64_gnullvm"
--version = "0.42.2"
-+name = "windows_x86_64_gnu"
-+version = "0.52.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
-+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
- 
- [[package]]
- name = "windows_x86_64_gnullvm"
-@@ -4578,10 +4857,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
- 
- [[package]]
--name = "windows_x86_64_msvc"
--version = "0.42.2"
-+name = "windows_x86_64_gnullvm"
-+version = "0.52.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
-+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
- 
- [[package]]
- name = "windows_x86_64_msvc"
-@@ -4589,6 +4868,12 @@ version = "0.48.5"
- source = "registry+https://github.com/rust-lang/crates.io-index"
- checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
- 
-+[[package]]
-+name = "windows_x86_64_msvc"
-+version = "0.52.6"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-+
- [[package]]
- name = "winreg"
- version = "0.10.1"
-@@ -4610,18 +4895,18 @@ dependencies = [
- 
- [[package]]
- name = "wiremock"
--version = "0.5.19"
-+version = "0.5.22"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "c6f71803d3a1c80377a06221e0530be02035d5b3e854af56c6ece7ac20ac441d"
-+checksum = "13a3a53eaf34f390dd30d7b1b078287dd05df2aa2e21a589ccb80f5c7253c2e9"
- dependencies = [
-  "assert-json-diff",
-  "async-trait",
-- "base64 0.21.4",
-+ "base64 0.21.7",
-  "deadpool",
-- "futures 0.3.28",
-+ "futures 0.3.30",
-  "futures-timer",
-  "http-types",
-- "hyper",
-+ "hyper 0.14.30",
-  "log",
-  "once_cell",
-  "regex",
-@@ -4650,11 +4935,13 @@ dependencies = [
- 
- [[package]]
- name = "xattr"
--version = "1.0.1"
-+version = "1.3.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "f4686009f71ff3e5c4dbcf1a282d0a44db3f021ba69350cd42086b3e5f1c6985"
-+checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f"
- dependencies = [
-  "libc",
-+ "linux-raw-sys 0.4.14",
-+ "rustix 0.38.34",
- ]
- 
- [[package]]
-@@ -4665,27 +4952,39 @@ checksum = "66fee0b777b0f5ac1c69bb06d361268faafa61cd4682ae064a171c16c433e9e4"
- 
- [[package]]
- name = "xxhash-rust"
--version = "0.8.7"
-+version = "0.8.12"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b"
-+checksum = "6a5cbf750400958819fb6178eaa83bee5cd9c29a26a40cc241df8c70fdd46984"
- 
- [[package]]
--name = "yaml-rust"
--version = "0.4.5"
-+name = "yansi"
-+version = "0.5.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
-+
-+[[package]]
-+name = "zerocopy"
-+version = "0.6.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "56c1936c4cc7a1c9ab21a1ebb602eb942ba868cbd44a99cb7cdc5892335e1c85"
-+checksum = "854e949ac82d619ee9a14c66a1b674ac730422372ccb759ce0c39cabcf2bf8e6"
- dependencies = [
-- "linked-hash-map",
-+ "byteorder",
-+ "zerocopy-derive",
- ]
- 
- [[package]]
--name = "yansi"
--version = "0.5.1"
-+name = "zerocopy-derive"
-+version = "0.6.6"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "09041cd90cf85f7f8b2df60c646f853b7f535ce68f85244eb6731cf89fa498ec"
-+checksum = "125139de3f6b9d625c39e2efdd73d41bdac468ccd556556440e322be0e1bbd91"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.72",
-+]
- 
- [[package]]
- name = "zeroize"
--version = "1.6.0"
-+version = "1.8.1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9"
-+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dc6dc101c845..0e545850a3de 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2030,6 +2030,7 @@ mapAliases {
   openvdb_11 = throw "'openvdb_11' has been removed in favor of the latest version'"; # Added 2025-05-03
   opera = throw "'opera' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-05-19
   orchis = throw "'orchis' has been renamed to/replaced by 'orchis-theme'"; # Converted to throw 2024-10-17
+  orogene = throw "'orogene' uses a wasm-specific fork of async-tar that is vulnerable to CVE-2025-62518, which is not supported by its upstream"; # Added 2025-10-24
   ortp = throw "'ortp' has been moved to 'linphonePackages.ortp'"; # Added 2025-09-20
   omping = throw "'omping' has been removed because its upstream has been archived"; # Added 2025-05-10
   onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20

From bddba77fb5842ce783259b74f78259dc056afd85 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 18:53:14 +0000
Subject: [PATCH 2454/6226] source-meta-json-schema: 11.11.1 -> 12.0.0

---
 pkgs/by-name/so/source-meta-json-schema/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/so/source-meta-json-schema/package.nix b/pkgs/by-name/so/source-meta-json-schema/package.nix
index b47e596c1a42..ed3639ded3b5 100644
--- a/pkgs/by-name/so/source-meta-json-schema/package.nix
+++ b/pkgs/by-name/so/source-meta-json-schema/package.nix
@@ -5,7 +5,7 @@
   cmake,
 }:
 let
-  version = "11.11.1";
+  version = "12.0.0";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "source-meta-json-schema";
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "sourcemeta";
     repo = "jsonschema";
     rev = "v${version}";
-    hash = "sha256-JB37vOFoThc3wsaeMJ/BqGO27HQaA8bqtaA2avNSn7A=";
+    hash = "sha256-fhY/DNuQWzVWQC/Ur0Ksp5eW3S7flV2jEaVQiva160Q=";
   };
 
   nativeBuildInputs = [

From 53ab25d4b0f2e123d9087c81b6ef6ecb1624c63a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 20:54:30 +0200
Subject: [PATCH 2455/6226] python313Packages.google-cloud-websecurityscanner:
 remove disabled

Removed pythonOlder dependency and its usage.
---
 .../python-modules/google-cloud-websecurityscanner/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
index db9a3aab3652..c2b5a2fb06fa 100644
--- a/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-websecurityscanner/default.nix
@@ -8,7 +8,6 @@
   protobuf,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "1.18.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     pname = "google_cloud_websecurityscanner";
     inherit version;

From bd1dd973f93344d1354888cc22a298bef9f708c6 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Fri, 24 Oct 2025 20:54:35 +0200
Subject: [PATCH 2456/6226] pods: add passthru.updateScript

---
 pkgs/by-name/po/pods/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/po/pods/package.nix b/pkgs/by-name/po/pods/package.nix
index 7661c420a333..65624a8d27ef 100644
--- a/pkgs/by-name/po/pods/package.nix
+++ b/pkgs/by-name/po/pods/package.nix
@@ -16,6 +16,7 @@
   libadwaita,
   libpanel,
   vte-gtk4,
+  nix-update-script,
 }:
 
 stdenv.mkDerivation rec {
@@ -55,6 +56,10 @@ stdenv.mkDerivation rec {
     vte-gtk4
   ];
 
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
   meta = {
     description = "Podman desktop application";
     homepage = "https://github.com/marhkb/pods";

From e2177e05f422efa5e739fc33152be23684fce2ea Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Fri, 24 Oct 2025 18:55:34 +0000
Subject: [PATCH 2457/6226] pods: 2.1.2 -> 2.2.0

---
 pkgs/by-name/po/pods/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/po/pods/package.nix b/pkgs/by-name/po/pods/package.nix
index 65624a8d27ef..da33a2ac1782 100644
--- a/pkgs/by-name/po/pods/package.nix
+++ b/pkgs/by-name/po/pods/package.nix
@@ -21,18 +21,18 @@
 
 stdenv.mkDerivation rec {
   pname = "pods";
-  version = "2.1.2";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "marhkb";
     repo = "pods";
     tag = "v${version}";
-    hash = "sha256-S84Qb+hySjIxcznuA7Sh8n9XFvdZpf32Yznb1Sj+owY=";
+    hash = "sha256-m+0XjxY0nDAJbVX3r/Jfg+G+RU8Q51e0ZXxkdH69SiQ=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-UBInZdoluWXq1jm2rhS5wBwXQ/zYFPSEeWhpSmkc2aY=";
+    hash = "sha256-ssLiGYBz8fh0oci/pVaeEEIruA691tdEOUyEFssNUXU=";
   };
 
   nativeBuildInputs = [

From 31ab496e09e0b5ff8230eb7135c6b688f4f94990 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 20:56:28 +0200
Subject: [PATCH 2458/6226] python313Packages.coinmetrics-api-client: remove
 disabled

Removed pythonOlder dependency and its version restriction.
---
 .../python-modules/coinmetrics-api-client/default.nix          | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
index 715f73172aa7..61380e80a8ff 100644
--- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix
+++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix
@@ -9,7 +9,6 @@
   pytest-mock,
   pytestCheckHook,
   python-dateutil,
-  pythonOlder,
   pyyaml,
   requests,
   tqdm,
@@ -22,8 +21,6 @@ buildPythonPackage rec {
   version = "2025.10.21.15";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   __darwinAllowLocalNetworking = true;
 
   src = fetchPypi {

From 4d5440416eee72b4da6d8cf12f46b9d07dba7418 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 20:58:00 +0200
Subject: [PATCH 2459/6226]   python313Packages.meilisearch: modernize

---
 pkgs/development/python-modules/meilisearch/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix
index f016298f35ea..352f91bf8914 100644
--- a/pkgs/development/python-modules/meilisearch/default.nix
+++ b/pkgs/development/python-modules/meilisearch/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   camel-converter,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
   requests,
 }:
@@ -13,8 +12,6 @@ buildPythonPackage rec {
   version = "0.37.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "meilisearch";
     repo = "meilisearch-python";
@@ -39,7 +36,7 @@ buildPythonPackage rec {
     description = "Client for the Meilisearch API";
     homepage = "https://github.com/meilisearch/meilisearch-python";
     changelog = "https://github.com/meilisearch/meilisearch-python/releases/tag/${src.tag}";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }

From ca0f1b7b98bfa1fb5d9e917a2082c0e5bd0690b5 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Sun, 28 Sep 2025 10:55:46 +0200
Subject: [PATCH 2460/6226] various: eval more package sets

---
 pkgs/applications/editors/eclipse/default.nix |  2 +-
 .../rust/build-rust-crate/test/default.nix    |  5 +-
 pkgs/data/json-schema/default.nix             |  2 +-
 pkgs/data/misc/nixos-artwork/default.nix      |  4 +-
 pkgs/top-level/all-packages.nix               | 56 ++++++++++---------
 pkgs/top-level/java-packages.nix              |  5 +-
 6 files changed, 39 insertions(+), 35 deletions(-)

diff --git a/pkgs/applications/editors/eclipse/default.nix b/pkgs/applications/editors/eclipse/default.nix
index 1af06cdb0ba8..c43d9cb3179d 100644
--- a/pkgs/applications/editors/eclipse/default.nix
+++ b/pkgs/applications/editors/eclipse/default.nix
@@ -148,6 +148,6 @@ generatedEclipses
 
   ### Plugins
 
-  plugins = callPackage ./plugins.nix { };
+  plugins = lib.recurseIntoAttrs (callPackage ./plugins.nix { });
 
 }
diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix
index c56f153b487e..50e045921387 100644
--- a/pkgs/build-support/rust/build-rust-crate/test/default.nix
+++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix
@@ -228,7 +228,7 @@ let
 in
 rec {
 
-  tests =
+  tests = lib.recurseIntoAttrs (
     let
       cases = rec {
         libPath = {
@@ -910,7 +910,8 @@ rec {
                 test -x '${pkg}/bin/rcgen' && touch $out
               ''
           );
-    };
+    }
+  );
   test = releaseTools.aggregate {
     name = "buildRustCrate-tests";
     meta = {
diff --git a/pkgs/data/json-schema/default.nix b/pkgs/data/json-schema/default.nix
index f12bab479074..5033e5b1f71b 100644
--- a/pkgs/data/json-schema/default.nix
+++ b/pkgs/data/json-schema/default.nix
@@ -24,5 +24,5 @@ let
 in
 {
   # Exported to `pkgs`
-  inherit jsonSchemaCatalogs;
+  jsonSchemaCatalogs = lib.recurseIntoAttrs jsonSchemaCatalogs;
 }
diff --git a/pkgs/data/misc/nixos-artwork/default.nix b/pkgs/data/misc/nixos-artwork/default.nix
index 4814232fbfe7..180cc89b8dd7 100644
--- a/pkgs/data/misc/nixos-artwork/default.nix
+++ b/pkgs/data/misc/nixos-artwork/default.nix
@@ -1,5 +1,5 @@
-{ callPackage }:
+{ callPackage, lib }:
 
 {
-  wallpapers = callPackage ./wallpapers.nix { };
+  wallpapers = lib.recurseIntoAttrs (callPackage ./wallpapers.nix { });
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index abeaa1582649..40b7ffbcc588 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1459,9 +1459,11 @@ with pkgs;
     rxvt-unicode-unwrapped = rxvt-unicode-unwrapped-emoji;
   };
 
-  rxvt-unicode-plugins = import ../applications/terminal-emulators/rxvt-unicode-plugins {
-    inherit callPackage;
-  };
+  rxvt-unicode-plugins = recurseIntoAttrs (
+    import ../applications/terminal-emulators/rxvt-unicode-plugins {
+      inherit callPackage;
+    }
+  );
 
   rxvt-unicode-unwrapped = callPackage ../applications/terminal-emulators/rxvt-unicode { };
 
@@ -1616,7 +1618,7 @@ with pkgs;
     withDriver = false;
   };
 
-  fedora-backgrounds = callPackage ../data/misc/fedora-backgrounds { };
+  fedora-backgrounds = recurseIntoAttrs (callPackage ../data/misc/fedora-backgrounds { });
 
   coconut = with python312Packages; toPythonApplication coconut;
 
@@ -2449,7 +2451,7 @@ with pkgs;
 
   libotf = callPackage ../tools/inputmethods/m17n-lib/otf.nix { };
 
-  skkDictionaries = callPackages ../tools/inputmethods/skk/skk-dicts { };
+  skkDictionaries = recurseIntoAttrs (callPackages ../tools/inputmethods/skk/skk-dicts { });
 
   ibus = callPackage ../tools/inputmethods/ibus { };
 
@@ -3299,7 +3301,7 @@ with pkgs;
 
   buildNpmPackage = callPackage ../build-support/node/build-npm-package { };
 
-  npmHooks = callPackage ../build-support/node/build-npm-package/hooks { };
+  npmHooks = recurseIntoAttrs (callPackage ../build-support/node/build-npm-package/hooks { });
 
   inherit (callPackages ../build-support/node/fetch-npm-deps { })
     fetchNpmDeps
@@ -5822,7 +5824,7 @@ with pkgs;
     enableQt = true;
   };
 
-  octave-kernel = callPackage ../applications/editors/jupyter-kernels/octave { };
+  octave-kernel = recurseIntoAttrs (callPackage ../applications/editors/jupyter-kernels/octave { });
 
   octavePackages = recurseIntoAttrs octave.pkgs;
 
@@ -5830,8 +5832,8 @@ with pkgs;
   #
   # Set default PHP interpreter, extensions and packages
   php = php84;
-  phpExtensions = php.extensions;
-  phpPackages = php.packages;
+  phpExtensions = recurseIntoAttrs php.extensions;
+  phpPackages = recurseIntoAttrs php.packages;
 
   # Import PHP84 interpreter, extensions and packages
   php84 = callPackage ../development/interpreters/php/8.4.nix {
@@ -8206,7 +8208,9 @@ with pkgs;
   nv-codec-headers-11 = nv-codec-headers.override { majorVersion = "11"; };
   nv-codec-headers-12 = nv-codec-headers.override { majorVersion = "12"; };
 
-  nvidiaCtkPackages = callPackage ../by-name/nv/nvidia-container-toolkit/packages.nix { };
+  nvidiaCtkPackages = recurseIntoAttrs (
+    callPackage ../by-name/nv/nvidia-container-toolkit/packages.nix { }
+  );
   inherit (nvidiaCtkPackages)
     nvidia-docker
     ;
@@ -9323,7 +9327,7 @@ with pkgs;
   icingaweb2-ipl = callPackage ../servers/icingaweb2/ipl.nix { };
   icingaweb2-thirdparty = callPackage ../servers/icingaweb2/thirdparty.nix { };
   icingaweb2 = callPackage ../servers/icingaweb2 { };
-  icingaweb2Modules = {
+  icingaweb2Modules = recurseIntoAttrs {
     theme-april = callPackage ../servers/icingaweb2/theme-april { };
     theme-lsd = callPackage ../servers/icingaweb2/theme-lsd { };
     theme-particles = callPackage ../servers/icingaweb2/theme-particles { };
@@ -9976,7 +9980,7 @@ with pkgs;
 
   elegant-sddm = libsForQt5.callPackage ../data/themes/elegant-sddm { };
 
-  error-inject = callPackages ../os-specific/linux/error-inject { };
+  error-inject = recurseIntoAttrs (callPackages ../os-specific/linux/error-inject { });
 
   ffado = callPackage ../os-specific/linux/ffado { };
   ffado-mixer = callPackage ../os-specific/linux/ffado { withMixer = true; };
@@ -10678,9 +10682,9 @@ with pkgs;
 
   themes = name: callPackage (../data/misc/themes + ("/" + name + ".nix")) { };
 
-  tex-gyre = callPackages ../data/fonts/tex-gyre { };
+  tex-gyre = recurseIntoAttrs (callPackages ../data/fonts/tex-gyre { });
 
-  tex-gyre-math = callPackages ../data/fonts/tex-gyre-math { };
+  tex-gyre-math = recurseIntoAttrs (callPackages ../data/fonts/tex-gyre-math { });
 
   xkeyboard_config = xkeyboard-config;
 
@@ -10893,7 +10897,7 @@ with pkgs;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  deadbeefPlugins = {
+  deadbeefPlugins = recurseIntoAttrs {
     headerbar-gtk3 = callPackage ../applications/audio/deadbeef/plugins/headerbar-gtk3.nix { };
     lyricbar = callPackage ../applications/audio/deadbeef/plugins/lyricbar.nix { };
     mpris2 = callPackage ../applications/audio/deadbeef/plugins/mpris2.nix { };
@@ -11791,13 +11795,11 @@ with pkgs;
 
   moolticute = libsForQt5.callPackage ../applications/misc/moolticute { };
 
-  mopidyPackages =
-    (callPackages ../applications/audio/mopidy {
+  mopidyPackages = recurseIntoAttrs (
+    callPackages ../applications/audio/mopidy {
       python = python3;
-    })
-    // {
-      __attrsFailEvaluation = true;
-    };
+    }
+  );
 
   inherit (mopidyPackages)
     mopidy
@@ -12338,7 +12340,7 @@ with pkgs;
 
   cura = libsForQt5.callPackage ../applications/misc/cura { };
 
-  curaPlugins = callPackage ../applications/misc/cura/plugins.nix { };
+  curaPlugins = recurseIntoAttrs (callPackage ../applications/misc/cura/plugins.nix { });
 
   prusa-slicer = callPackage ../applications/misc/prusa-slicer {
     # Build with clang even on Linux, because GCC uses absolutely obscene amounts of memory
@@ -12828,7 +12830,7 @@ with pkgs;
     xwaylandSupport = false;
   };
 
-  inherit (windowmaker) dockapps;
+  dockapps = recurseIntoAttrs windowmaker.dockapps;
 
   wofi-pass = callPackage ../../pkgs/tools/security/pass/wofi-pass.nix { };
 
@@ -12936,7 +12938,7 @@ with pkgs;
 
   youtube-viewer = perlPackages.WWWYoutubeViewer;
 
-  zathuraPkgs = callPackage ../applications/misc/zathura { };
+  zathuraPkgs = recurseIntoAttrs (callPackage ../applications/misc/zathura { });
   zathura = zathuraPkgs.zathuraWrapper;
 
   zeroc-ice-cpp11 = zeroc-ice.override { cpp11 = true; };
@@ -14187,7 +14189,7 @@ with pkgs;
 
   lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { };
 
-  openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { };
+  openlilylib-fonts = recurseIntoAttrs (callPackage ../misc/lilypond/fonts.nix { });
 
   nixDependencies = recurseIntoAttrs (
     callPackage ../tools/package-management/nix/dependencies-scope.nix { }
@@ -14364,7 +14366,7 @@ with pkgs;
 
   nixpkgs-manual = callPackage ../../doc/doc-support/package.nix { };
 
-  nixos-artwork = callPackage ../data/misc/nixos-artwork { };
+  nixos-artwork = recurseIntoAttrs (callPackage ../data/misc/nixos-artwork { });
 
   nixos-rebuild = callPackage ../os-specific/linux/nixos-rebuild { };
 
@@ -14563,7 +14565,7 @@ with pkgs;
 
   buildDartApplication = callPackage ../build-support/dart/build-dart-application { };
 
-  dartHooks = callPackage ../build-support/dart/build-dart-application/hooks { };
+  dartHooks = recurseIntoAttrs (callPackage ../build-support/dart/build-dart-application/hooks { });
 
   httraqt = libsForQt5.callPackage ../tools/backup/httrack/qt.nix { };
 
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index fd91ab54cda7..c5f7ebd013fa 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -5,7 +5,7 @@ with pkgs;
 {
   inherit (pkgs) openjfx17 openjfx21 openjfx23;
 
-  compiler =
+  compiler = lib.recurseIntoAttrs (
     let
       # merge meta.platforms of both packages so that dependent packages and hydra build them
       mergeMetaPlatforms =
@@ -79,7 +79,8 @@ with pkgs;
         in
         lib.mapAttrs (name: drv: mkLinuxDarwin drv semeruDarwin.${name}) semeruLinux
       );
-    };
+    }
+  );
 }
 // lib.optionalAttrs config.allowAliases {
   jogl_2_4_0 = throw "'jogl_2_4_0' is renamed to/replaced by 'jogl'";

From a84015a940f1618305e0f206c84343cc4d19f723 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 21:03:35 +0200
Subject: [PATCH 2461/6226] python313Packages.slixmpp: remove disabled

Remove the restriction on Python version for slixmpp.
---
 pkgs/development/python-modules/slixmpp/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/slixmpp/default.nix b/pkgs/development/python-modules/slixmpp/default.nix
index eebd1e6dabc9..ee478927da57 100644
--- a/pkgs/development/python-modules/slixmpp/default.nix
+++ b/pkgs/development/python-modules/slixmpp/default.nix
@@ -13,7 +13,6 @@
   pytestCheckHook,
   replaceVars,
   rustPlatform,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -21,8 +20,6 @@ buildPythonPackage rec {
   version = "1.12.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-dGn23K9XQv1i4OZu5EfFM4p0UgwZgqcHhOe3kN7y/dU=";

From 19059a828873205b7396cae6dee5f0373fccc7c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 19:13:10 +0000
Subject: [PATCH 2462/6226] esphome: 2025.10.2 -> 2025.10.3

---
 pkgs/by-name/es/esphome/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index 15b30e08b904..c8cbf161b47e 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -34,14 +34,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2025.10.2";
+  version = "2025.10.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "esphome";
     tag = version;
-    hash = "sha256-aHDBRZ6o671zriV/rwgsZ57y91Z8Lwx/iiPhIHPzKbs=";
+    hash = "sha256-k/wqS5koXQ/hGhDNhxuv/t496+f0YPHZibkUjRyCjwo=";
   };
 
   patches = [

From 2ab76f6080a10a6d9477de6317825031060d6fe6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 21:16:44 +0200
Subject: [PATCH 2463/6226] python313Packages.netutils: remove disabled

Removed pythonOlder restriction for version 3.8.
---
 pkgs/development/python-modules/netutils/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/netutils/default.nix b/pkgs/development/python-modules/netutils/default.nix
index db49824623ab..26784e013ca5 100644
--- a/pkgs/development/python-modules/netutils/default.nix
+++ b/pkgs/development/python-modules/netutils/default.nix
@@ -7,7 +7,6 @@
   napalm,
   poetry-core,
   pytestCheckHook,
-  pythonOlder,
   pyyaml,
   toml,
 }:
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "1.15.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "networktocode";
     repo = "netutils";

From ed043063e326a6be5ae950bca5ee344169441499 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 21:17:46 +0200
Subject: [PATCH 2464/6226] python313Packages.avwx-engine: modernize

---
 pkgs/development/python-modules/avwx-engine/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/avwx-engine/default.nix b/pkgs/development/python-modules/avwx-engine/default.nix
index 4250381a5ee9..63afb979742a 100644
--- a/pkgs/development/python-modules/avwx-engine/default.nix
+++ b/pkgs/development/python-modules/avwx-engine/default.nix
@@ -10,7 +10,6 @@
   pytest-cov-stub,
   pytestCheckHook,
   python-dateutil,
-  pythonOlder,
   rapidfuzz,
   scipy,
   shapely,
@@ -23,8 +22,6 @@ buildPythonPackage rec {
   version = "1.9.6";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "avwx-rest";
     repo = "avwx-engine";
@@ -76,7 +73,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Aviation Weather parsing engine";
     homepage = "https://github.com/avwx-rest/avwx-engine";
-    changelog = "https://github.com/avwx-rest/avwx-engine/blob/${version}/changelog.md";
+    changelog = "https://github.com/avwx-rest/avwx-engine/blob/${src.tag}/changelog.md";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From dc2d44c24ccb57c73fd9357969de5e6b2aae6066 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 21:19:01 +0200
Subject: [PATCH 2465/6226] python313Packages.pyswitchbot: remove disabled

Removed pythonOlder dependency and its usage.
---
 pkgs/development/python-modules/pyswitchbot/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix
index 9f6538c14cee..b231fd1d0980 100644
--- a/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/pkgs/development/python-modules/pyswitchbot/default.nix
@@ -7,7 +7,6 @@
   cryptography,
   fetchFromGitHub,
   pyopenssl,
-  pythonOlder,
   pytest-asyncio,
   pytestCheckHook,
   requests,
@@ -19,8 +18,6 @@ buildPythonPackage rec {
   version = "0.72.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "pySwitchbot";

From 59c56ee77849846bcc5edd516ca0c984b56c47b2 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 24 Oct 2025 18:57:12 +0000
Subject: [PATCH 2466/6226] python3Packages.torcheval: disable tests

---
 .../python-modules/torcheval/default.nix      | 159 +-----------------
 1 file changed, 4 insertions(+), 155 deletions(-)

diff --git a/pkgs/development/python-modules/torcheval/default.nix b/pkgs/development/python-modules/torcheval/default.nix
index d3ffd678a761..8dcc5f6bbe2f 100644
--- a/pkgs/development/python-modules/torcheval/default.nix
+++ b/pkgs/development/python-modules/torcheval/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -9,17 +8,6 @@
 
   # dependencies
   typing-extensions,
-
-  # tests
-  cython,
-  numpy,
-  pytest-timeout,
-  pytest-xdist,
-  pytestCheckHook,
-  scikit-image,
-  scikit-learn,
-  torchtnt-nightly,
-  torchvision,
 }:
 let
   pname = "torcheval";
@@ -30,7 +18,7 @@ buildPythonPackage {
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "pytorch";
+    owner = "meta-pytorch";
     repo = "torcheval";
     # Upstream has not created a tag for this version
     # https://github.com/pytorch/torcheval/issues/215
@@ -38,158 +26,19 @@ buildPythonPackage {
     hash = "sha256-aVr4qKKE+dpBcJEi1qZJBljFLUl8d7D306Dy8uOojJE=";
   };
 
-  # Patches are only applied to usages of numpy within tests,
-  # which are only used for testing purposes (see dev-requirements.txt)
-  postPatch =
-    # numpy's `np.NAN` was changed to `np.nan` when numpy 2 was released
-    ''
-      substituteInPlace tests/metrics/classification/test_accuracy.py tests/metrics/functional/classification/test_accuracy.py \
-        --replace-fail "np.NAN" "np.nan"
-    ''
-
-    # `unittest.TestCase.assertEquals` does not exist;
-    # the correct symbol is `unittest.TestCase.assertEqual`
-    + ''
-      substituteInPlace tests/metrics/test_synclib.py \
-        --replace-fail "tc.assertEquals" "tc.assertEqual"
-    '';
-
   build-system = [ setuptools ];
 
   dependencies = [ typing-extensions ];
 
   pythonImportsCheck = [ "torcheval" ];
 
-  nativeCheckInputs = [
-    cython
-    numpy
-    pytest-timeout
-    pytest-xdist
-    pytestCheckHook
-    scikit-image
-    scikit-learn
-    torchtnt-nightly
-    torchvision
-  ];
-
-  pytestFlags = [
-    "-v"
-  ];
-
-  enabledTestPaths = [
-    "tests/"
-  ];
-
-  disabledTestPaths = [
-    # -- tests/metrics/audio/test_fad.py --
-    # Touch filesystem and require network access.
-    # torchaudio.utils.download_asset("models/vggish.pt") -> PermissionError: [Errno 13] Permission denied: '/homeless-shelter'
-    "tests/metrics/audio/test_fad.py::TestFAD::test_vggish_fad"
-    "tests/metrics/audio/test_fad.py::TestFAD::test_vggish_fad_merge"
-
-    # -- tests/metrics/image/test_fid.py --
-    # Touch filesystem and require network access.
-    # models.inception_v3(weights=weights) -> PermissionError: [Errno 13] Permission denied: '/homeless-shelter'
-    "tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_invalid_input"
-    "tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_random_data_custom_model"
-    "tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_random_data_default_model"
-    "tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_with_dissimilar_inputs"
-    "tests/metrics/image/test_fid.py::TestFrechetInceptionDistance::test_fid_with_similar_inputs"
-
-    # -- tests/metrics/functional/text/test_perplexity.py --
-    # AssertionError: Scalars are not close!
-    # Expected 3.537154912949 but got 3.53715443611145
-    "tests/metrics/functional/text/test_perplexity.py::Perplexity::test_perplexity_with_ignore_index"
-
-    # -- tests/metrics/image/test_psnr.py --
-    # AssertionError: Scalars are not close!
-    # Expected 7.781850814819336 but got 7.781772613525391
-    "tests/metrics/image/test_psnr.py::TestPeakSignalNoiseRatio::test_psnr_with_random_data"
-
-    # -- tests/metrics/regression/test_mean_squared_error.py --
-    # AssertionError: Scalars are not close!
-    # Expected -640.4547729492188 but got -640.4707641601562
-    "tests/metrics/regression/test_mean_squared_error.py::TestMeanSquaredError::test_mean_squared_error_class_update_input_shape_different"
-
-    # -- tests/metrics/window/test_mean_squared_error.py --
-    # AssertionError: Scalars are not close!
-    # Expected 0.0009198983898386359 but got 0.0009198188781738281
-    "tests/metrics/window/test_mean_squared_error.py::TestMeanSquaredError::test_mean_squared_error_class_update_input_shape_different"
-  ]
-
-  # These tests error on darwin platforms.
-  # NotImplementedError: The operator 'c10d::allgather_' is not currently implemented for the mps device
-  #
-  # Applying the suggested environment variable `PYTORCH_ENABLE_MPS_FALLBACK=1;` causes the tests to fail,
-  # as using the CPU instead of the MPS causes the tensors to be on the wrong device:
-  # RuntimeError: ProcessGroupGloo::allgather: invalid tensor type at index 0;
-  # Expected TensorOptions(dtype=float, device=cpu, ...), got TensorOptions(dtype=float, device=mps:0, ...)
-  ++ lib.optional stdenv.hostPlatform.isDarwin [
-    # -- tests/metrics/test_synclib.py --
-    "tests/metrics/test_synclib.py::SynclibTest::test_complex_mixed_state_sync"
-    "tests/metrics/test_synclib.py::SynclibTest::test_complex_mixed_state_sync"
-    "tests/metrics/test_synclib.py::SynclibTest::test_empty_tensor_list_sync_state"
-    "tests/metrics/test_synclib.py::SynclibTest::test_sync_dtype_and_shape"
-    "tests/metrics/test_synclib.py::SynclibTest::test_tensor_list_sync_states"
-    "tests/metrics/test_synclib.py::SynclibTest::test_tensor_dict_sync_states"
-    "tests/metrics/test_synclib.py::SynclibTest::test_tensor_sync_states"
-    # -- tests/metrics/test_toolkit.py --
-    "tests/metrics/test_toolkit.py::MetricToolkitTest::test_metric_sync"
-    "tests/metrics/test_toolkit.py::MetricCollectionToolkitTest::test_metric_collection_sync"
-
-    # Cannot access local process over IPv6 (nodename nor servname provided) even with __darwinAllowLocalNetworking
-    # Will hang, or appear to hang, with an 5 minute (default) timeout per test
-    "tests/metrics/aggregation/test_auc.py"
-    "tests/metrics/aggregation/test_cat.py"
-    "tests/metrics/aggregation/test_max.py"
-    "tests/metrics/aggregation/test_mean.py"
-    "tests/metrics/aggregation/test_min.py"
-    "tests/metrics/aggregation/test_sum.py"
-    "tests/metrics/aggregation/test_throughput.py"
-    "tests/metrics/classification/test_accuracy.py"
-    "tests/metrics/classification/test_auprc.py"
-    "tests/metrics/classification/test_auroc.py"
-    "tests/metrics/classification/test_binned_auprc.py"
-    "tests/metrics/classification/test_binned_auroc.py"
-    "tests/metrics/classification/test_binned_precision_recall_curve.py"
-    "tests/metrics/classification/test_confusion_matrix.py"
-    "tests/metrics/classification/test_f1_score.py"
-    "tests/metrics/classification/test_normalized_entropy.py"
-    "tests/metrics/classification/test_precision_recall_curve.py"
-    "tests/metrics/classification/test_precision.py"
-    "tests/metrics/classification/test_recall_at_fixed_precision.py"
-    "tests/metrics/classification/test_recall.py"
-    "tests/metrics/functional/classification/test_auroc.py"
-    "tests/metrics/ranking/test_click_through_rate.py::TestClickThroughRate::test_ctr_with_valid_input"
-    "tests/metrics/ranking/test_hit_rate.py::TestHitRate::test_hitrate_with_valid_input"
-    "tests/metrics/ranking/test_reciprocal_rank.py::TestReciprocalRank::test_mrr_with_valid_input"
-    "tests/metrics/ranking/test_retrieval_precision.py::TestRetrievalPrecision::test_retrieval_precision_multiple_updates_1_query"
-    "tests/metrics/ranking/test_retrieval_precision.py::TestRetrievalPrecision::test_retrieval_precision_multiple_updates_n_queries_without_nan"
-    "tests/metrics/ranking/test_weighted_calibration.py::TestWeightedCalibration::test_weighted_calibration_with_valid_input"
-    "tests/metrics/regression/test_mean_squared_error.py"
-    "tests/metrics/regression/test_r2_score.py"
-    "tests/metrics/test_synclib.py::SynclibTest::test_gather_uneven_multidim"
-    "tests/metrics/test_synclib.py::SynclibTest::test_gather_uneven"
-    "tests/metrics/test_synclib.py::SynclibTest::test_numeric_sync_state"
-    "tests/metrics/test_synclib.py::SynclibTest::test_sync_list_length"
-    "tests/metrics/text/test_bleu.py::TestBleu::test_bleu_multiple_examples_per_update"
-    "tests/metrics/text/test_bleu.py::TestBleu::test_bleu_multiple_updates"
-    "tests/metrics/text/test_perplexity.py::TestPerplexity::test_perplexity_with_ignore_index"
-    "tests/metrics/text/test_perplexity.py::TestPerplexity::test_perplexity"
-    "tests/metrics/text/test_word_error_rate.py::TestWordErrorRate::test_word_error_rate_with_valid_input"
-    "tests/metrics/text/test_word_information_lost.py::TestWordInformationLost::test_word_information_lost"
-    "tests/metrics/text/test_word_information_preserved.py::TestWordInformationPreserved::test_word_information_preserved_with_valid_input"
-    "tests/metrics/window/test_auroc.py"
-    "tests/metrics/window/test_click_through_rate.py::TestClickThroughRate::test_ctr_with_valid_input"
-    "tests/metrics/window/test_mean_squared_error.py"
-    "tests/metrics/window/test_normalized_entropy.py::TestWindowedBinaryNormalizedEntropy::test_ne_with_valid_input"
-    "tests/metrics/window/test_weighted_calibration.py::TestWindowedWeightedCalibration::test_weighted_calibration_with_valid_input"
-  ];
+  # Tests are very flaky and computationally intensive
+  doCheck = false;
 
   meta = {
     description = "Rich collection of performant PyTorch model metrics and tools for PyTorch model evaluations";
     homepage = "https://pytorch.org/torcheval";
-    changelog = "https://github.com/pytorch/torcheval/releases/tag/${version}";
+    changelog = "https://github.com/meta-pytorch/torcheval/releases/tag/${version}";
 
     platforms = lib.platforms.unix;
     license = [ lib.licenses.bsd3 ];

From ac527d27cee66cce38f24f0d760b5bc9fcd12e34 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Fri, 24 Oct 2025 12:21:55 -0700
Subject: [PATCH 2467/6226] xremap: refactor

---
 pkgs/by-name/xr/xremap/package.nix | 94 +++++++++++++-----------------
 1 file changed, 41 insertions(+), 53 deletions(-)

diff --git a/pkgs/by-name/xr/xremap/package.nix b/pkgs/by-name/xr/xremap/package.nix
index f5573c08cc7b..eb7939f9f189 100644
--- a/pkgs/by-name/xr/xremap/package.nix
+++ b/pkgs/by-name/xr/xremap/package.nix
@@ -3,83 +3,71 @@
   rustPlatform,
   fetchFromGitHub,
   pkg-config,
+  xremap,
+
+  withVariant ? "wlroots",
 }:
 let
-  pname = "xremap";
-  version = "0.14.2";
-
-  src = fetchFromGitHub {
-    owner = "xremap";
-    repo = "xremap";
-    tag = "v${version}";
-    hash = "sha256-5BHet5kKpmJFpjga7QZoLPydtzs5iPX5glxP4YvsYx0=";
-  };
-
-  cargoHash = "sha256-NZNLO+wmzEdIZPp5Zu81m/ux8Au+8EMq31QpuZN9l5w=";
-
-  buildXremap =
-    {
-      suffix ? "",
-      features ? [ ],
-      descriptionSuffix ? "",
-    }:
-    assert descriptionSuffix != "" && features != [ ];
-    rustPlatform.buildRustPackage {
-      pname = "${pname}${suffix}";
-      inherit version src cargoHash;
-
-      nativeBuildInputs = [ pkg-config ];
-
-      buildNoDefaultFeatures = true;
-      buildFeatures = features;
-
-      meta = {
-        description =
-          "Key remapper for X11 and Wayland"
-          + lib.optionalString (descriptionSuffix != "") " (${descriptionSuffix} support)";
-        homepage = "https://github.com/xremap/xremap";
-        changelog = "https://github.com/xremap/xremap/blob/${src.tag}/CHANGELOG.md";
-        license = lib.licenses.mit;
-        mainProgram = "xremap";
-        maintainers = [ lib.maintainers.hakan-demirli ];
-        platforms = lib.platforms.linux;
-      };
-    };
-
   variants = {
-    x11 = buildXremap {
+    x11 = {
       features = [ "x11" ];
       descriptionSuffix = "X11";
     };
-    gnome = buildXremap {
+    gnome = {
       suffix = "-gnome";
       features = [ "gnome" ];
       descriptionSuffix = "Gnome";
     };
-    kde = buildXremap {
+    kde = {
       suffix = "-kde";
       features = [ "kde" ];
       descriptionSuffix = "KDE";
     };
-    wlroots = buildXremap {
+    wlroots = {
       suffix = "-wlroots";
       features = [ "wlroots" ];
       descriptionSuffix = "wlroots";
     };
-    hyprland = buildXremap {
+    hyprland = {
       suffix = "-hyprland";
       features = [ "hypr" ];
       descriptionSuffix = "Hyprland";
     };
   };
 
+  variant = variants.${withVariant} or null;
 in
-variants.wlroots.overrideAttrs (finalAttrs: {
-  passthru = {
-    gnome = variants.gnome;
-    kde = variants.kde;
-    wlroots = variants.wlroots;
-    hyprland = variants.hyprland;
-    x11 = variants.x11;
+assert (
+  lib.assertMsg (variant != null)
+    "Unknown variant ${withVariant}: expected one of ${lib.concatStringsSep ", " (lib.attrNames variants)}"
+);
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "xremap${variant.suffix or ""}";
+  version = "0.14.2";
+
+  src = fetchFromGitHub {
+    owner = "xremap";
+    repo = "xremap";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-5BHet5kKpmJFpjga7QZoLPydtzs5iPX5glxP4YvsYx0=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildNoDefaultFeatures = true;
+  buildFeatures = variant.features;
+
+  cargoHash = "sha256-NZNLO+wmzEdIZPp5Zu81m/ux8Au+8EMq31QpuZN9l5w=";
+
+  passthru = lib.mapAttrs (name: lib.const (xremap.override { withVariant = name; })) variants;
+
+  meta = {
+    description = "Key remapper for X11 and Wayland (${variant.descriptionSuffix} support)";
+    homepage = "https://github.com/xremap/xremap";
+    changelog = "https://github.com/xremap/xremap/blob/v${finalAttrs.version}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    mainProgram = "xremap";
+    maintainers = [ lib.maintainers.hakan-demirli ];
+    platforms = lib.platforms.linux;
   };
 })

From 4a915bd9a780720ed475961eaf428141dc69f6b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 19:27:57 +0000
Subject: [PATCH 2468/6226] gruvbox-gtk-theme: 0-unstable-2025-10-14 ->
 0-unstable-2025-10-23

---
 pkgs/by-name/gr/gruvbox-gtk-theme/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix
index 20aacc85f170..61a638bc6447 100644
--- a/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix
+++ b/pkgs/by-name/gr/gruvbox-gtk-theme/package.nix
@@ -68,13 +68,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
   stdenvNoCC.mkDerivation
   {
     inherit pname;
-    version = "0-unstable-2025-10-14";
+    version = "0-unstable-2025-10-23";
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
       repo = "Gruvbox-GTK-Theme";
-      rev = "99c0a8e13b6d9f9f72fa2541a1eb872b4aed27c5";
-      hash = "sha256-bxW1lJn8HuWttiQStLz1+7YCUKlvVYiJ8ra6NCf9gdY=";
+      rev = "578cd220b5ff6e86b078a6111d26bb20ec8c733f";
+      hash = "sha256-RXoPj/aj9OCTIi8xWatG0QpDAUh102nFOipdSIiqt7o=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];

From 289039bd524d512303c81dfc234104038ceab7fb Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Fri, 24 Oct 2025 13:29:02 -0600
Subject: [PATCH 2469/6226] jetbrains: 2025.2 -> 2025.2.4

jetbrains.dataspell: 2025.2.1 -> 2025.2.2
jetbrains.gateway: 2025.2.3 -> 2025.2.4
jetbrains.goland: 2025.2.3 -> 2025.2.4
jetbrains.idea-community: 2025.2.3 -> 2025.2.4
jetbrains.idea-ultimate: 2025.2.3 -> 2025.2.4
jetbrains.mps: 2025.2 -> 2025.2.1
jetbrains.phpstorm: 2025.2.3 -> 2025.2.4
jetbrains.pycharm-community: 2025.2.3 -> 2025.2.4
jetbrains.pycharm-professional: 2025.2.3 -> 2025.2.4
jetbrains.ruby-mine: 2025.2.3 -> 2025.2.4
jetbrains.webstorm: 2025.2.3 -> 2025.2.4
---
 .../editors/jetbrains/bin/versions.json       | 352 +++++++++---------
 1 file changed, 176 insertions(+), 176 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json
index 0d796db6a6d7..fc2b6a0b256e 100644
--- a/pkgs/applications/editors/jetbrains/bin/versions.json
+++ b/pkgs/applications/editors/jetbrains/bin/versions.json
@@ -27,75 +27,75 @@
     "dataspell": {
       "update-channel": "DataSpell RELEASE",
       "url-template": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz",
-      "version": "2025.2.1",
-      "sha256": "ea3d1a3539b93850326b0126e32b5d6d02b9530ee86dc0b079877967464316f6",
-      "url": "https://download.jetbrains.com/python/dataspell-2025.2.1.tar.gz",
-      "build_number": "252.26199.84"
+      "version": "2025.2.2",
+      "sha256": "32cdc6178f4046b3056c50184fd5157eef0658875a6ff17c64eb451d1fb0f4fb",
+      "url": "https://download.jetbrains.com/python/dataspell-2025.2.2.tar.gz",
+      "build_number": "252.27397.107"
     },
     "gateway": {
       "update-channel": "Gateway RELEASE",
       "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "2f698af2112fe1e7172c0602916d401dd9d3a34942fc80dc151d587924325684",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.3.tar.gz",
-      "build_number": "252.26830.122"
+      "version": "2025.2.4",
+      "sha256": "8fcf16255ff0bdc2b25132abd6c7a30d577c73bf6106c17a96320b6a1abac4b2",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.4.tar.gz",
+      "build_number": "252.27397.101"
     },
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "06d9e18cc840e5bc68db6802ed90cfd5c8629d8c434e51aee6e4a93dad56b3e1",
-      "url": "https://download.jetbrains.com/go/goland-2025.2.3.tar.gz",
-      "build_number": "252.26830.102"
+      "version": "2025.2.4",
+      "sha256": "fb42978d55271e6fa3165b1d010b3e0bacb8cd5c4f4073712332c62f32d2ebab",
+      "url": "https://download.jetbrains.com/go/goland-2025.2.4.tar.gz",
+      "build_number": "252.27397.100"
     },
     "idea-community": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "6b7c671e97b1419ca22ff4c4a32e7ca51577e4177589bfd321bd9a26df16c9ba",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.3.tar.gz",
-      "build_number": "252.26830.84"
+      "version": "2025.2.4",
+      "sha256": "3c152de654fa948e12e5fba4c04ed0200e472556a8081ddc2d4c22e5831d6020",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.4.tar.gz",
+      "build_number": "252.27397.103"
     },
     "idea-ultimate": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "4a54ae8a17d6427f07d2450324132f59391279c6b1094de02f73e408deb5a23c",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.3.tar.gz",
-      "build_number": "252.26830.84"
+      "version": "2025.2.4",
+      "sha256": "4d909f989d7fa0a002f5bc669e002e8ab336ee7091f32756a74549cd8c11f432",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.4.tar.gz",
+      "build_number": "252.27397.103"
     },
     "mps": {
       "update-channel": "MPS RELEASE",
       "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
-      "version": "2025.2",
-      "sha256": "619bfe35ee4f922582e9ebb12ff11b0374eddffa570f7f9abe480f50226b5788",
-      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2.tar.gz",
-      "build_number": "252.23892.529"
+      "version": "2025.2.1",
+      "sha256": "cfbe530d0385cf3e9ccc2f18f43db25525e0024abdbcd3203bd66fb77fc6f3b4",
+      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2.1.tar.gz",
+      "build_number": "252.26199.587"
     },
     "phpstorm": {
       "update-channel": "PhpStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "b34ddb64cc84b9ca29b7d171c71296aab8bd87d7a6d7eb11c410e0e59a81a51d",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.3.tar.gz",
-      "build_number": "252.26830.95",
+      "version": "2025.2.4",
+      "sha256": "ad2413006344762fb46dc47246e983053b08f763df5c0a2ba0f70ede79a76c3d",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.4.tar.gz",
+      "build_number": "252.27397.112",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "c56b987c2ddec9fadfb77db7a920a86bf933cec0ed3acd72b0f34ead53f7b5a0",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.3.tar.gz",
-      "build_number": "252.26830.99"
+      "version": "2025.2.4",
+      "sha256": "5290837893379aeff204d006dd0eeff030df9fb5d9328d619b6c90ddf3f0292e",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.4.tar.gz",
+      "build_number": "252.27397.106"
     },
     "pycharm-professional": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "58f6165ea8ace65e708c607bec49d20d46b8d5908045ae31703353a184e59a05",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.3.tar.gz",
-      "build_number": "252.26830.99"
+      "version": "2025.2.4",
+      "sha256": "f1613a171ab07ba0e7ccd13cb537af4da8920c89cf4a13c64a3f7ae72e803701",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.4.tar.gz",
+      "build_number": "252.27397.106"
     },
     "rider": {
       "update-channel": "Rider RELEASE",
@@ -108,10 +108,10 @@
     "ruby-mine": {
       "update-channel": "RubyMine RELEASE",
       "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "cf989d2e3851eb19db747eae0ee5cf4898645209397f955ac28870454a2a390e",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.3.tar.gz",
-      "build_number": "252.26830.94"
+      "version": "2025.2.4",
+      "sha256": "9249ee0e99e24b3898065c5328f56814fb1a8b53afc192e81e7b70e0982eb116",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.4.tar.gz",
+      "build_number": "252.27397.109"
     },
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
@@ -124,10 +124,10 @@
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "00c82eded289fbd6fdb170314b4402d508175dffcbe1d7ffcc8370da6b400e71",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.3.tar.gz",
-      "build_number": "252.26830.93"
+      "version": "2025.2.4",
+      "sha256": "218d0cb6acd1f63c9b2877738af808279796d3d7e13318b54b021c8526d49b86",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.4.tar.gz",
+      "build_number": "252.27397.92"
     },
     "writerside": {
       "update-channel": "Writerside EAP",
@@ -166,75 +166,75 @@
     "dataspell": {
       "update-channel": "DataSpell RELEASE",
       "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz",
-      "version": "2025.2.1",
-      "sha256": "5568a7fb516694b4b2434454192f7525b8699e7852bda3caaba684ae455dc788",
-      "url": "https://download.jetbrains.com/python/dataspell-2025.2.1-aarch64.tar.gz",
-      "build_number": "252.26199.84"
+      "version": "2025.2.2",
+      "sha256": "6881781e1020272cf3ceb4e50da66e24cbc4f35535e568131353cbfbd9d81968",
+      "url": "https://download.jetbrains.com/python/dataspell-2025.2.2-aarch64.tar.gz",
+      "build_number": "252.27397.107"
     },
     "gateway": {
       "update-channel": "Gateway RELEASE",
       "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "c8a585a24709231223c7c2cc0a44978bf6c0973e7f8a8a40a4a3b0f66481959b",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.3-aarch64.tar.gz",
-      "build_number": "252.26830.122"
+      "version": "2025.2.4",
+      "sha256": "feecd98be28ce72ebdbc0d7d31d2c0bbc1fa968dc5f0fc093804398839ee4826",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.101"
     },
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "09d897264b991a0f63e07b3b34f0878e2967ffbf504748881c43c2b21d638976",
-      "url": "https://download.jetbrains.com/go/goland-2025.2.3-aarch64.tar.gz",
-      "build_number": "252.26830.102"
+      "version": "2025.2.4",
+      "sha256": "09e5790b20c5ca952af8c86a6094e83aa250d9eb751d144800ba83701d3512a8",
+      "url": "https://download.jetbrains.com/go/goland-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.100"
     },
     "idea-community": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "f51d2e9428a7d9c3999cc9dfab5fbcccba73d894098724cc5e35865a21932090",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.3-aarch64.tar.gz",
-      "build_number": "252.26830.84"
+      "version": "2025.2.4",
+      "sha256": "7d7a7d54eb55b13206ead9c3ab115b05998a0a510c13ebf0b33541270112523c",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.103"
     },
     "idea-ultimate": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "42d0e7c9dbb7c0701883e4801bb77c56415817a41556388373bf71c96b3ab94e",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.3-aarch64.tar.gz",
-      "build_number": "252.26830.84"
+      "version": "2025.2.4",
+      "sha256": "f5687e1d0dc416d6f0fb89495d2b4ad4639d4896497db245272d1fe697b1037b",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.103"
     },
     "mps": {
       "update-channel": "MPS RELEASE",
       "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz",
-      "version": "2025.2",
-      "sha256": "619bfe35ee4f922582e9ebb12ff11b0374eddffa570f7f9abe480f50226b5788",
-      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2.tar.gz",
-      "build_number": "252.23892.529"
+      "version": "2025.2.1",
+      "sha256": "cfbe530d0385cf3e9ccc2f18f43db25525e0024abdbcd3203bd66fb77fc6f3b4",
+      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2.1.tar.gz",
+      "build_number": "252.26199.587"
     },
     "phpstorm": {
       "update-channel": "PhpStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "96840878a9f648642265899459f867bcdd943ff3f420d4c2df4d49ef3381c05a",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.3-aarch64.tar.gz",
-      "build_number": "252.26830.95",
+      "version": "2025.2.4",
+      "sha256": "60638fee7ed81f75bae931b96d540aa80e8753709f138b60a766a6e29771a3da",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.112",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "c22683d0e88bfe0b377055197398d62a56e99269de600b28c0100e79400562a5",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.3-aarch64.tar.gz",
-      "build_number": "252.26830.99"
+      "version": "2025.2.4",
+      "sha256": "31613bce32e229fc85b991d060e521df13977c6dcf2325df0a0de924c199cd78",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.106"
     },
     "pycharm-professional": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "41bcc2549f3f60d35d1d3bd0e16edd5b3614f23df499b30cd649bb4ba6148314",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.3-aarch64.tar.gz",
-      "build_number": "252.26830.99"
+      "version": "2025.2.4",
+      "sha256": "91569e7ba9988af1aa4d9973f52dfa8af8a94f32a53faa8457c7ba17d25f43b3",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.106"
     },
     "rider": {
       "update-channel": "Rider RELEASE",
@@ -247,10 +247,10 @@
     "ruby-mine": {
       "update-channel": "RubyMine RELEASE",
       "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "ed784cb51ab7272fbf6728f896321c039cb07c4979abbda2ea4a1962783c8da8",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.3-aarch64.tar.gz",
-      "build_number": "252.26830.94"
+      "version": "2025.2.4",
+      "sha256": "4071efa011638cf96f50962b4a7cdf1a28bbdc58af0ebc4c96ddfcc44de48621",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.109"
     },
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
@@ -263,10 +263,10 @@
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "57c58ac9164ff4450371709063fca141d79bc104d2454442fcc146ccefc0771b",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.3-aarch64.tar.gz",
-      "build_number": "252.26830.93"
+      "version": "2025.2.4",
+      "sha256": "1a424cb2a6c82b4fd23e087264a91dfce3a8e78d49c8988f461deafa1aa73d37",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.92"
     },
     "writerside": {
       "update-channel": "Writerside EAP",
@@ -305,75 +305,75 @@
     "dataspell": {
       "update-channel": "DataSpell RELEASE",
       "url-template": "https://download.jetbrains.com/python/dataspell-{version}.dmg",
-      "version": "2025.2.1",
-      "sha256": "f02bbae2d0f33b46cd5c7c2d21600851aa58b15665739df7bdcb4c333d12cda0",
-      "url": "https://download.jetbrains.com/python/dataspell-2025.2.1.dmg",
-      "build_number": "252.26199.84"
+      "version": "2025.2.2",
+      "sha256": "9573f0450a6eb1877bf53705533c886962ea5985c83c7a2ef642cea796b8eae0",
+      "url": "https://download.jetbrains.com/python/dataspell-2025.2.2.dmg",
+      "build_number": "252.27397.107"
     },
     "gateway": {
       "update-channel": "Gateway RELEASE",
       "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg",
-      "version": "2025.2.3",
-      "sha256": "71b066de7abd66e3c8934f16a4a0a59c5608e739918c985161874434bcb7decd",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.3.dmg",
-      "build_number": "252.26830.122"
+      "version": "2025.2.4",
+      "sha256": "1d308fc4f4a1649cd51834babe17028ff763347fd461f43d2f9fffeb0ac6d47d",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.4.dmg",
+      "build_number": "252.27397.101"
     },
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}.dmg",
-      "version": "2025.2.3",
-      "sha256": "cd99bab6debfbeebfddeba1a431f1b45287b5d78023cca5d09a054c8ffab1012",
-      "url": "https://download.jetbrains.com/go/goland-2025.2.3.dmg",
-      "build_number": "252.26830.102"
+      "version": "2025.2.4",
+      "sha256": "0a54191caca25c4ef4f82a2fd44bbd90b44a59054034aa586e5c53d6fe7257b6",
+      "url": "https://download.jetbrains.com/go/goland-2025.2.4.dmg",
+      "build_number": "252.27397.100"
     },
     "idea-community": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}.dmg",
-      "version": "2025.2.3",
-      "sha256": "aa7552de772595734f54c0d9fe69dbcba3243d2ae9b05385cad7d488cdc6d9fe",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.3.dmg",
-      "build_number": "252.26830.84"
+      "version": "2025.2.4",
+      "sha256": "0a064d890b8152cb2d34a2b712e5850eabd15aa7fdeaaa64c047d32a1f0a07d4",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.4.dmg",
+      "build_number": "252.27397.103"
     },
     "idea-ultimate": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg",
-      "version": "2025.2.3",
-      "sha256": "deff8866b958542d6f91797ae26415aba50f4e15a889eba41557c3c0bca2482b",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.3.dmg",
-      "build_number": "252.26830.84"
+      "version": "2025.2.4",
+      "sha256": "045f0d832c9d9d3360dfaf82aece11c125b6ba1c879c86bc19568f3ee77e24e6",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.4.dmg",
+      "build_number": "252.27397.103"
     },
     "mps": {
       "update-channel": "MPS RELEASE",
       "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg",
-      "version": "2025.2",
-      "sha256": "7fd49bfac7e9150e2827d7c6b9f1ad24405963b50efa948492e3ec3202b0ac84",
-      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2-macos.dmg",
-      "build_number": "252.23892.529"
+      "version": "2025.2.1",
+      "sha256": "e0b2644918ffe76b10001fc7904a58b2ec88cda2d317b10508d3bac784a490b2",
+      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2.1-macos.dmg",
+      "build_number": "252.26199.587"
     },
     "phpstorm": {
       "update-channel": "PhpStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg",
-      "version": "2025.2.3",
-      "sha256": "d221d5cd46ba1297925ac8437108339c9153edbb06d406fa2d512c17ec0b62ca",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.3.dmg",
-      "build_number": "252.26830.95",
+      "version": "2025.2.4",
+      "sha256": "ad55cc42a605da0495cfb965e4d13e0de6ab29f04b50d97457dab724628c96bb",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.4.dmg",
+      "build_number": "252.27397.112",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}.dmg",
-      "version": "2025.2.3",
-      "sha256": "793438a14147ccabf961ca062f8b62d0c4de652f36c46f6ddcce12214d9d6775",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.3.dmg",
-      "build_number": "252.26830.99"
+      "version": "2025.2.4",
+      "sha256": "2542b457478d14062aa14217f695b7ac078b447e3d1628eb7c1963e1223aa4e4",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.4.dmg",
+      "build_number": "252.27397.106"
     },
     "pycharm-professional": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}.dmg",
-      "version": "2025.2.3",
-      "sha256": "1c4ebaf6880dee7af500acb3f05362b70a921894566c9f4c6ab61e6229b10fc6",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.3.dmg",
-      "build_number": "252.26830.99"
+      "version": "2025.2.4",
+      "sha256": "26a7bbaf2fb5d101bfa68ba085913a598c8898594f265044f56fd2c9ac051c06",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.4.dmg",
+      "build_number": "252.27397.106"
     },
     "rider": {
       "update-channel": "Rider RELEASE",
@@ -386,10 +386,10 @@
     "ruby-mine": {
       "update-channel": "RubyMine RELEASE",
       "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg",
-      "version": "2025.2.3",
-      "sha256": "4e8c66fb8914ad107072923ff7d7e71771a5a4a24331e405e9b9a93c1751b7ea",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.3.dmg",
-      "build_number": "252.26830.94"
+      "version": "2025.2.4",
+      "sha256": "2f418dbf559fcab77f4df7c602b8c6de996e4360bfa69feae7f1f0a9d1ecc1bf",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.4.dmg",
+      "build_number": "252.27397.109"
     },
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
@@ -402,10 +402,10 @@
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg",
-      "version": "2025.2.3",
-      "sha256": "69670d0be318ffa64ad00a1d0a4964a171a2557f128cab859f7e6546143957f3",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.3.dmg",
-      "build_number": "252.26830.93"
+      "version": "2025.2.4",
+      "sha256": "dadcde8679597d7bb9d11518207b36a0b44a76407b84bbe7ebedba54db7bd8de",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.4.dmg",
+      "build_number": "252.27397.92"
     },
     "writerside": {
       "update-channel": "Writerside EAP",
@@ -444,75 +444,75 @@
     "dataspell": {
       "update-channel": "DataSpell RELEASE",
       "url-template": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg",
-      "version": "2025.2.1",
-      "sha256": "819e671e9928b7e7e5c46bd51d94464a79972ceb85e8d0922306120c6f87959a",
-      "url": "https://download.jetbrains.com/python/dataspell-2025.2.1-aarch64.dmg",
-      "build_number": "252.26199.84"
+      "version": "2025.2.2",
+      "sha256": "a2a9cc1c0c515399206568e66add7693718918cef58fc16025effde3d768371b",
+      "url": "https://download.jetbrains.com/python/dataspell-2025.2.2-aarch64.dmg",
+      "build_number": "252.27397.107"
     },
     "gateway": {
       "update-channel": "Gateway RELEASE",
       "url-template": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg",
-      "version": "2025.2.3",
-      "sha256": "b5577a050a14880c0e9fd8f7e7d7ef51a56d9f3f66770815601aac992d377609",
-      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.3-aarch64.dmg",
-      "build_number": "252.26830.122"
+      "version": "2025.2.4",
+      "sha256": "22925a4f01d7c0e8a6b1820fb635584aa1ffd1f89652443243e625a379d31854",
+      "url": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.101"
     },
     "goland": {
       "update-channel": "GoLand RELEASE",
       "url-template": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg",
-      "version": "2025.2.3",
-      "sha256": "bb89e8761b5988bf6230cb7e5b79520db4fc5e2a1e9fe31847991e4a108b2071",
-      "url": "https://download.jetbrains.com/go/goland-2025.2.3-aarch64.dmg",
-      "build_number": "252.26830.102"
+      "version": "2025.2.4",
+      "sha256": "d122e1f1109f31373d4a479b99278f569da7cf3b9fea88b1b2077c6d598813bf",
+      "url": "https://download.jetbrains.com/go/goland-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.100"
     },
     "idea-community": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIC-{version}-aarch64.dmg",
-      "version": "2025.2.3",
-      "sha256": "bfee440c818c1ae59f35da858387a7d8fea7b677df157d2c2b29d061328979e2",
-      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.3-aarch64.dmg",
-      "build_number": "252.26830.84"
+      "version": "2025.2.4",
+      "sha256": "c4e1ae63bf8683d12d307d6eca13f9ddb688df932608eb258a1c66ee5d45b6c3",
+      "url": "https://download.jetbrains.com/idea/ideaIC-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.103"
     },
     "idea-ultimate": {
       "update-channel": "IntelliJ IDEA RELEASE",
       "url-template": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg",
-      "version": "2025.2.3",
-      "sha256": "c45c1e686793a1b5b8fe61bab25c11164833d312c8431f0038c2576453919f85",
-      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.3-aarch64.dmg",
-      "build_number": "252.26830.84"
+      "version": "2025.2.4",
+      "sha256": "2b5504f86c6969ed0564483b6886390cfc1bb1b3ab99e658881d60edf57c481f",
+      "url": "https://download.jetbrains.com/idea/ideaIU-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.103"
     },
     "mps": {
       "update-channel": "MPS RELEASE",
       "url-template": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg",
-      "version": "2025.2",
-      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2-macos-aarch64.dmg",
-      "sha256": "5f1822a639b199ec3c2ca7f2352277bfc1727e4e46976bdab71fabf7fe62a280",
-      "build_number": "252.23892.529"
+      "version": "2025.2.1",
+      "url": "https://download.jetbrains.com/mps/2025.2/MPS-2025.2.1-macos-aarch64.dmg",
+      "sha256": "d409c82b06cab622dc469d6929e291e40b81b21e1e4b784833d07eb7697f5f61",
+      "build_number": "252.26199.587"
     },
     "phpstorm": {
       "update-channel": "PhpStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg",
-      "version": "2025.2.3",
-      "sha256": "632306f73bff15b893b0b8b11b3103632d7439a5fe3598f8eb4f0bd74d63a3a0",
-      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.3-aarch64.dmg",
-      "build_number": "252.26830.95",
+      "version": "2025.2.4",
+      "sha256": "d05c2e3e9106646bdf93731a034dcd82a359c7a91601d6456ed8ea88a75c3546",
+      "url": "https://download.jetbrains.com/webide/PhpStorm-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.112",
       "version-major-minor": "2022.3"
     },
     "pycharm-community": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-community-{version}-aarch64.dmg",
-      "version": "2025.2.3",
-      "sha256": "3a78b1bae9ff20383686fec267070edacb96640736ce942d915b99a665bf3844",
-      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.3-aarch64.dmg",
-      "build_number": "252.26830.99"
+      "version": "2025.2.4",
+      "sha256": "0b945c8687bf678baa51315ee4cbbfe3e24736fd029fed2ce527ff1563a1278b",
+      "url": "https://download.jetbrains.com/python/pycharm-community-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.106"
     },
     "pycharm-professional": {
       "update-channel": "PyCharm RELEASE",
       "url-template": "https://download.jetbrains.com/python/pycharm-professional-{version}-aarch64.dmg",
-      "version": "2025.2.3",
-      "sha256": "7ace5fcfad27a3fd3274059fbbead5cf1b6890a44a025d81c77c45251b66f939",
-      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.3-aarch64.dmg",
-      "build_number": "252.26830.99"
+      "version": "2025.2.4",
+      "sha256": "bd1b97e396ed3e880973266db57ecde02af7f6810fcdb3da3899a88806473527",
+      "url": "https://download.jetbrains.com/python/pycharm-professional-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.106"
     },
     "rider": {
       "update-channel": "Rider RELEASE",
@@ -525,10 +525,10 @@
     "ruby-mine": {
       "update-channel": "RubyMine RELEASE",
       "url-template": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg",
-      "version": "2025.2.3",
-      "sha256": "01b07add7a9cca6a09d4ab7f001b03fe1827ba117a3e8d25faed5c787f4f775a",
-      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.3-aarch64.dmg",
-      "build_number": "252.26830.94"
+      "version": "2025.2.4",
+      "sha256": "6971de2913d969bd1d3edc775cb88f2ad6507c0c0a62177812ab546bd043dea9",
+      "url": "https://download.jetbrains.com/ruby/RubyMine-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.109"
     },
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
@@ -541,10 +541,10 @@
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
       "url-template": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg",
-      "version": "2025.2.3",
-      "sha256": "370a43bb2461722eb4e2444ceca083d015991d5a53439cab1863ca9053524f67",
-      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.3-aarch64.dmg",
-      "build_number": "252.26830.93"
+      "version": "2025.2.4",
+      "sha256": "9b0cbc4745a6e1ec2e9fdff4b3df5a12897ccd814746d515dfd52ccb2744fc4e",
+      "url": "https://download.jetbrains.com/webstorm/WebStorm-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.92"
     },
     "writerside": {
       "update-channel": "Writerside EAP",

From 237d12de10594da226ca8fa20b018c8a07fc4a8f Mon Sep 17 00:00:00 2001
From: birkb <birk@batchworks.de>
Date: Fri, 24 Oct 2025 19:48:08 +0200
Subject: [PATCH 2470/6226] drbd driver: 9.2.14 -> 9.2.15

Signed-off-by: birkb <birk@batchworks.de>
---
 pkgs/os-specific/linux/drbd/driver.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/drbd/driver.nix b/pkgs/os-specific/linux/drbd/driver.nix
index dadfeb107d0d..cb0d86eda25e 100644
--- a/pkgs/os-specific/linux/drbd/driver.nix
+++ b/pkgs/os-specific/linux/drbd/driver.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "drbd";
-  version = "9.2.14";
+  version = "9.2.15";
 
   src = fetchurl {
     url = "https://pkg.linbit.com//downloads/drbd/9/drbd-${finalAttrs.version}.tar.gz";
-    hash = "sha256-x8onWPTyBnKt17xofivVlU+42nq1XtCo9i14kSOSd98=";
+    hash = "sha256-bKaL7wtjlSbUkLRlMSrGYjab0jdS8lu5bgScTbfpllE=";
   };
 
   hardeningDisable = [ "pic" ];
@@ -57,6 +57,6 @@ stdenv.mkDerivation (finalAttrs: {
       DRBD is a software-based, shared-nothing, replicated storage solution
       mirroring the content of block devices (hard disks, partitions, logical volumes, and so on) between hosts.
     '';
-    broken = kernel.kernelAtLeast "6.16"; # several build errors with 6.16.x kernel versions
+    broken = kernel.kernelOlder "5.11" || kernel.kernelAtLeast "6.17";
   };
 })

From 9a4f08fb7cf3ba88e59c292e8c4c0e611217bf0d Mon Sep 17 00:00:00 2001
From: James Ward <james@jamesward.com>
Date: Fri, 24 Oct 2025 13:31:47 -0600
Subject: [PATCH 2471/6226] jetbrains.plugins: update

---
 .../editors/jetbrains/plugins/plugins.json    | 1004 +++++++++--------
 1 file changed, 503 insertions(+), 501 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json
index 64106106ab64..16be4989c04a 100644
--- a/pkgs/applications/editors/jetbrains/plugins/plugins.json
+++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json
@@ -17,17 +17,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip"
       },
       "name": "ideavim"
     },
@@ -36,7 +36,7 @@
         "idea-ultimate"
       ],
       "builds": {
-        "252.26830.84": "https://plugins.jetbrains.com/files/631/870935/python-252.26830.84.zip"
+        "252.27397.103": "https://plugins.jetbrains.com/files/631/882374/python-252.27397.103.zip"
       },
       "name": "python"
     },
@@ -47,7 +47,7 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/1347/770332/scala-intellij-bin-2025.1.25.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/1347/861692/scala-intellij-bin-2025.2.30.zip"
+        "252.27397.103": "https://plugins.jetbrains.com/files/1347/882283/scala-intellij-bin-2025.2.48.zip"
       },
       "name": "scala"
     },
@@ -68,17 +68,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip"
       },
       "name": "stringmanipulation"
     },
@@ -99,17 +99,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip"
       },
       "name": "handlebars-mustache"
     },
@@ -130,17 +130,17 @@
       ],
       "builds": {
         "251.25410.129": null,
-        "252.23892.529": "https://plugins.jetbrains.com/files/6954/809234/Kotlin-252.23892.360-IJ.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/6954/870901/Kotlin-252.26830.84-IJ.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/6954/861041/Kotlin-252.26199.169-IJ.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/6954/870901/Kotlin-252.26830.84-IJ.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/6954/870901/Kotlin-252.26830.84-IJ.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/6954/870901/Kotlin-252.26830.84-IJ.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/6954/870901/Kotlin-252.26830.84-IJ.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/6954/870901/Kotlin-252.26830.84-IJ.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/6954/870901/Kotlin-252.26830.84-IJ.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/6954/870901/Kotlin-252.26830.84-IJ.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/6954/870901/Kotlin-252.26830.84-IJ.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/6954/870901/Kotlin-252.26830.84-IJ.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip"
       },
       "name": "kotlin"
     },
@@ -161,17 +161,17 @@
       ],
       "builds": {
         "251.25410.129": null,
-        "252.23892.529": null,
-        "252.26830.102": "https://plugins.jetbrains.com/files/6981/871946/ini-252.26830.99.zip",
+        "252.26199.587": null,
         "252.26830.109": "https://plugins.jetbrains.com/files/6981/871946/ini-252.26830.99.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/6981/871946/ini-252.26830.99.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/6981/871946/ini-252.26830.99.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/6981/871946/ini-252.26830.99.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/6981/871946/ini-252.26830.99.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/6981/871946/ini-252.26830.99.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/6981/871946/ini-252.26830.99.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/6981/871946/ini-252.26830.99.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/6981/871946/ini-252.26830.99.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip"
       },
       "name": "ini"
     },
@@ -192,17 +192,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip"
       },
       "name": "acejump"
     },
@@ -223,17 +223,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip"
       },
       "name": "grep-console"
     },
@@ -254,17 +254,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip"
       },
       "name": "file-watchers"
     },
@@ -275,7 +275,7 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/7179/767851/MavenHelper-4.30.0-IJ2022.2.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/7179/767851/MavenHelper-4.30.0-IJ2022.2.zip"
+        "252.27397.103": "https://plugins.jetbrains.com/files/7179/767851/MavenHelper-4.30.0-IJ2022.2.zip"
       },
       "name": "maven-helper"
     },
@@ -296,17 +296,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip"
       },
       "name": "cucumber-for-java"
     },
@@ -316,8 +316,8 @@
         "phpstorm"
       ],
       "builds": {
-        "252.26830.84": "https://plugins.jetbrains.com/files/7219/770179/Symfony_Plugin-2025.1.280.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/7219/770179/Symfony_Plugin-2025.1.280.zip"
+        "252.27397.103": "https://plugins.jetbrains.com/files/7219/770179/Symfony_Plugin-2025.1.280.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/7219/770179/Symfony_Plugin-2025.1.280.zip"
       },
       "name": "symfony-plugin"
     },
@@ -327,8 +327,8 @@
         "phpstorm"
       ],
       "builds": {
-        "252.26830.84": "https://plugins.jetbrains.com/files/7320/855846/PHP_Annotations-12.0.1.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/7320/855846/PHP_Annotations-12.0.1.zip"
+        "252.27397.103": "https://plugins.jetbrains.com/files/7320/855846/PHP_Annotations-12.0.1.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/7320/855846/PHP_Annotations-12.0.1.zip"
       },
       "name": "php-annotations"
     },
@@ -346,14 +346,14 @@
       ],
       "builds": {
         "251.25410.129": null,
-        "252.26830.102": "https://plugins.jetbrains.com/files/7322/866568/python-ce-252.26830.24.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/7322/866568/python-ce-252.26830.24.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/7322/866568/python-ce-252.26830.24.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/7322/866568/python-ce-252.26830.24.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/7322/866568/python-ce-252.26830.24.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/7322/866568/python-ce-252.26830.24.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/7322/866568/python-ce-252.26830.24.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/7322/866568/python-ce-252.26830.24.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/7322/882365/python-ce-252.27397.103.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/7322/882365/python-ce-252.27397.103.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/7322/882365/python-ce-252.27397.103.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/7322/882365/python-ce-252.27397.103.zip"
       },
       "name": "python-community-edition"
     },
@@ -373,18 +373,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/7391/875464/asciidoctor-intellij-plugin-0.44.9.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/7391/875464/asciidoctor-intellij-plugin-0.44.9.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/7391/875464/asciidoctor-intellij-plugin-0.44.9.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/7391/875464/asciidoctor-intellij-plugin-0.44.9.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/7391/875464/asciidoctor-intellij-plugin-0.44.9.zip",
-        "252.26830.46": "https://plugins.jetbrains.com/files/7391/875464/asciidoctor-intellij-plugin-0.44.9.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/7391/875464/asciidoctor-intellij-plugin-0.44.9.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/7391/875464/asciidoctor-intellij-plugin-0.44.9.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/7391/875464/asciidoctor-intellij-plugin-0.44.9.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/7391/875464/asciidoctor-intellij-plugin-0.44.9.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/7391/875464/asciidoctor-intellij-plugin-0.44.9.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/7391/875464/asciidoctor-intellij-plugin-0.44.9.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.26830.109": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.26830.136": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.26830.83": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip"
       },
       "name": "asciidoc"
     },
@@ -405,17 +405,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.23892.529": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.26830.102": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "252.26199.587": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
         "252.26830.109": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
         "252.26830.136": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
         "252.26830.46": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
         "252.26830.83": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.26830.84": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.26830.93": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.26830.94": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.26830.95": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.26830.99": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar"
+        "252.27397.100": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "252.27397.103": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "252.27397.106": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "252.27397.109": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "252.27397.112": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "252.27397.92": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar"
       },
       "name": "wakatime"
     },
@@ -436,17 +436,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip"
       },
       "name": "gittoolbox"
     },
@@ -467,17 +467,17 @@
       ],
       "builds": {
         "251.25410.129": null,
-        "252.23892.529": null,
-        "252.26830.102": "https://plugins.jetbrains.com/files/7724/871939/clouds-docker-impl-252.26830.99.zip",
+        "252.26199.587": null,
         "252.26830.109": "https://plugins.jetbrains.com/files/7724/871939/clouds-docker-impl-252.26830.99.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/7724/871939/clouds-docker-impl-252.26830.99.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/7724/871939/clouds-docker-impl-252.26830.99.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/7724/871939/clouds-docker-impl-252.26830.99.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/7724/871939/clouds-docker-impl-252.26830.99.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/7724/871939/clouds-docker-impl-252.26830.99.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/7724/871939/clouds-docker-impl-252.26830.99.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/7724/871939/clouds-docker-impl-252.26830.99.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/7724/871939/clouds-docker-impl-252.26830.99.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip"
       },
       "name": "docker"
     },
@@ -497,18 +497,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/8097/796399/graphql-252.23892.201.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
+        "251.25410.129": null,
+        "252.26199.587": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip"
       },
       "name": "graphql"
     },
@@ -528,16 +528,16 @@
       ],
       "builds": {
         "251.25410.129": null,
-        "252.23892.529": null,
-        "252.26830.102": null,
+        "252.26199.587": null,
         "252.26830.109": null,
         "252.26830.46": null,
         "252.26830.83": null,
-        "252.26830.84": null,
-        "252.26830.93": null,
-        "252.26830.94": null,
-        "252.26830.95": null,
-        "252.26830.99": null
+        "252.27397.100": null,
+        "252.27397.103": null,
+        "252.27397.106": null,
+        "252.27397.109": null,
+        "252.27397.112": null,
+        "252.27397.92": null
       },
       "name": "-deprecated-rust"
     },
@@ -557,16 +557,16 @@
       ],
       "builds": {
         "251.25410.129": null,
-        "252.23892.529": null,
-        "252.26830.102": null,
+        "252.26199.587": null,
         "252.26830.109": null,
         "252.26830.46": null,
         "252.26830.83": null,
-        "252.26830.84": null,
-        "252.26830.93": null,
-        "252.26830.94": null,
-        "252.26830.95": null,
-        "252.26830.99": null
+        "252.27397.100": null,
+        "252.27397.103": null,
+        "252.27397.106": null,
+        "252.27397.109": null,
+        "252.27397.112": null,
+        "252.27397.92": null
       },
       "name": "-deprecated-rust-beta"
     },
@@ -587,17 +587,17 @@
       ],
       "builds": {
         "251.25410.129": null,
-        "252.23892.529": null,
-        "252.26830.102": "https://plugins.jetbrains.com/files/8195/871151/toml-252.26830.93.zip",
+        "252.26199.587": null,
         "252.26830.109": "https://plugins.jetbrains.com/files/8195/871151/toml-252.26830.93.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/8195/871151/toml-252.26830.93.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/8195/871151/toml-252.26830.93.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/8195/871151/toml-252.26830.93.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/8195/871151/toml-252.26830.93.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/8195/871151/toml-252.26830.93.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/8195/871151/toml-252.26830.93.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/8195/871151/toml-252.26830.93.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/8195/871151/toml-252.26830.93.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip"
       },
       "name": "toml"
     },
@@ -608,7 +608,7 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/8327/809293/Minecraft_Development-2025.1-1.8.6.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/8327/809294/Minecraft_Development-2025.2-1.8.6.zip"
+        "252.27397.103": "https://plugins.jetbrains.com/files/8327/809294/Minecraft_Development-2025.2-1.8.6.zip"
       },
       "name": "minecraft-development"
     },
@@ -629,17 +629,17 @@
       ],
       "builds": {
         "251.25410.129": null,
-        "252.23892.529": "https://plugins.jetbrains.com/files/8554/826552/featuresTrainer-252.23892.514.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/8554/854483/featuresTrainer-252.26199.84.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip"
       },
       "name": "ide-features-trainer"
     },
@@ -660,17 +660,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip"
       },
       "name": "nixidea"
     },
@@ -691,17 +691,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/9164/796366/gherkin-252.23892.201.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip"
       },
       "name": "gherkin"
     },
@@ -722,17 +722,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip"
       },
       "name": "-env-files"
     },
@@ -742,8 +742,8 @@
         "idea-ultimate"
       ],
       "builds": {
-        "252.26830.102": "https://plugins.jetbrains.com/files/9568/866545/go-plugin-252.26830.24.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/9568/866545/go-plugin-252.26830.24.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/9568/882349/go-plugin-252.27397.103.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/9568/882349/go-plugin-252.27397.103.zip"
       },
       "name": "go"
     },
@@ -764,17 +764,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
-        "252.23892.529": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
-        "252.26830.102": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
+        "252.26199.587": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
         "252.26830.109": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
         "252.26830.136": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
         "252.26830.46": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
         "252.26830.83": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
-        "252.26830.84": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
-        "252.26830.93": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
-        "252.26830.94": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
-        "252.26830.95": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
-        "252.26830.99": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar"
+        "252.27397.100": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
+        "252.27397.103": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
+        "252.27397.106": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
+        "252.27397.109": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
+        "252.27397.112": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
+        "252.27397.92": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar"
       },
       "name": "ansi-highlighter-premium"
     },
@@ -795,17 +795,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip"
       },
       "name": "key-promoter-x"
     },
@@ -826,17 +826,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip"
       },
       "name": "randomness"
     },
@@ -857,17 +857,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip"
       },
       "name": "csv-editor"
     },
@@ -888,17 +888,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip"
       },
       "name": "rainbow-brackets"
     },
@@ -919,17 +919,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip"
       },
       "name": "dot-language"
     },
@@ -950,17 +950,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip"
       },
       "name": "hocon"
     },
@@ -980,16 +980,16 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip"
+        "252.27397.103": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip"
       },
       "name": "go-template"
     },
@@ -1009,18 +1009,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/11058/873994/Extra_Icons-2025.1.15.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/11058/873994/Extra_Icons-2025.1.15.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/11058/873994/Extra_Icons-2025.1.15.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/11058/873994/Extra_Icons-2025.1.15.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/11058/873994/Extra_Icons-2025.1.15.zip",
-        "252.26830.46": "https://plugins.jetbrains.com/files/11058/873994/Extra_Icons-2025.1.15.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/11058/873994/Extra_Icons-2025.1.15.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/11058/873994/Extra_Icons-2025.1.15.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/11058/873994/Extra_Icons-2025.1.15.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/11058/873994/Extra_Icons-2025.1.15.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/11058/873994/Extra_Icons-2025.1.15.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/11058/873994/Extra_Icons-2025.1.15.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.26830.109": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.26830.136": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.26830.83": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip"
       },
       "name": "extra-icons"
     },
@@ -1040,18 +1040,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/11349/871361/aws-toolkit-jetbrains-standalone-3.96.251.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/11349/871355/aws-toolkit-jetbrains-standalone-3.96.252.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/11349/871355/aws-toolkit-jetbrains-standalone-3.96.252.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/11349/871355/aws-toolkit-jetbrains-standalone-3.96.252.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/11349/871355/aws-toolkit-jetbrains-standalone-3.96.252.zip",
-        "252.26830.46": "https://plugins.jetbrains.com/files/11349/871355/aws-toolkit-jetbrains-standalone-3.96.252.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/11349/871355/aws-toolkit-jetbrains-standalone-3.96.252.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/11349/871355/aws-toolkit-jetbrains-standalone-3.96.252.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/11349/871355/aws-toolkit-jetbrains-standalone-3.96.252.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/11349/871355/aws-toolkit-jetbrains-standalone-3.96.252.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/11349/871355/aws-toolkit-jetbrains-standalone-3.96.252.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/11349/871355/aws-toolkit-jetbrains-standalone-3.96.252.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/11349/879073/aws-toolkit-jetbrains-standalone-3.97.251.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.26830.109": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.26830.136": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.26830.83": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip"
       },
       "name": "aws-toolkit"
     },
@@ -1081,17 +1081,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip"
       },
       "name": "vscode-keymap"
     },
@@ -1112,17 +1112,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip"
       },
       "name": "eclipse-keymap"
     },
@@ -1143,17 +1143,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip"
       },
       "name": "rainbow-csv"
     },
@@ -1174,17 +1174,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip"
       },
       "name": "visual-studio-keymap"
     },
@@ -1205,17 +1205,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip"
       },
       "name": "indent-rainbow"
     },
@@ -1236,17 +1236,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip"
       },
       "name": "protocol-buffers"
     },
@@ -1267,17 +1267,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.23892.529": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.26830.102": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "252.26199.587": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "252.26830.109": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "252.26830.136": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "252.26830.46": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "252.26830.83": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.26830.84": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.26830.93": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.26830.94": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.26830.95": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.26830.99": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
+        "252.27397.100": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "252.27397.103": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "252.27397.106": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "252.27397.109": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "252.27397.112": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "252.27397.92": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
       },
       "name": "darcula-pitch-black"
     },
@@ -1298,17 +1298,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.23892.529": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.26830.102": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "252.26199.587": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
         "252.26830.109": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
         "252.26830.136": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
         "252.26830.46": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
         "252.26830.83": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.26830.84": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.26830.93": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.26830.94": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.26830.95": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.26830.99": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar"
+        "252.27397.100": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "252.27397.103": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "252.27397.106": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "252.27397.109": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "252.27397.112": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "252.27397.92": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar"
       },
       "name": "mario-progress-bar"
     },
@@ -1329,17 +1329,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.23892.529": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.26830.102": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
+        "252.26199.587": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
         "252.26830.109": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
         "252.26830.136": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
         "252.26830.46": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
         "252.26830.83": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.26830.84": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.26830.93": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.26830.94": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.26830.95": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.26830.99": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar"
+        "252.27397.100": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
+        "252.27397.103": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
+        "252.27397.106": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
+        "252.27397.109": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
+        "252.27397.112": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
+        "252.27397.92": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar"
       },
       "name": "which-key"
     },
@@ -1359,18 +1359,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.26830.46": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.26830.109": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.26830.136": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.26830.83": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip"
       },
       "name": "extra-toolwindow-colorful-icons"
     },
@@ -1390,18 +1390,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.26830.46": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.26830.109": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.26830.136": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.26830.83": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip"
       },
       "name": "github-copilot"
     },
@@ -1422,17 +1422,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
       },
       "name": "netbeans-6-5-keymap"
     },
@@ -1453,17 +1453,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip"
       },
       "name": "catppuccin-theme"
     },
@@ -1484,17 +1484,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip"
       },
       "name": "codeglance-pro"
     },
@@ -1514,18 +1514,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/18922/875516/GerryThemes.jar",
-        "252.23892.529": "https://plugins.jetbrains.com/files/18922/875516/GerryThemes.jar",
-        "252.26830.102": "https://plugins.jetbrains.com/files/18922/875516/GerryThemes.jar",
-        "252.26830.109": "https://plugins.jetbrains.com/files/18922/875516/GerryThemes.jar",
-        "252.26830.136": "https://plugins.jetbrains.com/files/18922/875516/GerryThemes.jar",
-        "252.26830.46": "https://plugins.jetbrains.com/files/18922/875516/GerryThemes.jar",
-        "252.26830.83": "https://plugins.jetbrains.com/files/18922/875516/GerryThemes.jar",
-        "252.26830.84": "https://plugins.jetbrains.com/files/18922/875516/GerryThemes.jar",
-        "252.26830.93": "https://plugins.jetbrains.com/files/18922/875516/GerryThemes.jar",
-        "252.26830.94": "https://plugins.jetbrains.com/files/18922/875516/GerryThemes.jar",
-        "252.26830.95": "https://plugins.jetbrains.com/files/18922/875516/GerryThemes.jar",
-        "252.26830.99": "https://plugins.jetbrains.com/files/18922/875516/GerryThemes.jar"
+        "251.25410.129": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.26199.587": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.26830.109": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.26830.136": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.26830.46": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.26830.83": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.27397.100": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.27397.103": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.27397.106": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.27397.109": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.27397.112": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.27397.92": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar"
       },
       "name": "gerry-themes"
     },
@@ -1546,17 +1546,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip"
       },
       "name": "better-direnv"
     },
@@ -1577,17 +1577,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip"
       },
       "name": "mermaid"
     },
@@ -1608,17 +1608,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip"
       },
       "name": "ferris"
     },
@@ -1639,17 +1639,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip"
       },
       "name": "code-complexity"
     },
@@ -1670,17 +1670,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip"
       },
       "name": "developer-tools"
     },
@@ -1696,14 +1696,14 @@
         "webstorm"
       ],
       "builds": {
-        "252.26830.102": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip"
       },
       "name": "dev-containers"
     },
@@ -1716,7 +1716,7 @@
       "builds": {
         "252.26830.136": "https://plugins.jetbrains.com/files/22407/875264/intellij-rust-252.26830.136.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/22407/875264/intellij-rust-252.26830.136.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/22407/875264/intellij-rust-252.26830.136.zip"
+        "252.27397.103": "https://plugins.jetbrains.com/files/22407/875264/intellij-rust-252.26830.136.zip"
       },
       "name": "rust"
     },
@@ -1736,18 +1736,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/22707/865828/continue-intellij-extension-1.0.46.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/22707/865828/continue-intellij-extension-1.0.46.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/22707/865828/continue-intellij-extension-1.0.46.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/22707/865828/continue-intellij-extension-1.0.46.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/22707/865828/continue-intellij-extension-1.0.46.zip",
-        "252.26830.46": "https://plugins.jetbrains.com/files/22707/865828/continue-intellij-extension-1.0.46.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/22707/865828/continue-intellij-extension-1.0.46.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/22707/865828/continue-intellij-extension-1.0.46.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/22707/865828/continue-intellij-extension-1.0.46.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/22707/865828/continue-intellij-extension-1.0.46.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/22707/865828/continue-intellij-extension-1.0.46.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/22707/865828/continue-intellij-extension-1.0.46.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.26830.109": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.26830.136": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.26830.83": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip"
       },
       "name": "continue"
     },
@@ -1768,17 +1768,17 @@
       ],
       "builds": {
         "251.25410.129": null,
-        "252.23892.529": "https://plugins.jetbrains.com/files/22857/826717/vcs-gitlab-IU-252.23892.515-IU.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/22857/856960/vcs-gitlab-IU-252.26199.97-IU.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip"
       },
       "name": "gitlab"
     },
@@ -1799,17 +1799,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip"
       },
       "name": "catppuccin-icons"
     },
@@ -1830,17 +1830,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip"
       },
       "name": "mermaid-chart"
     },
@@ -1861,17 +1861,17 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
         "252.26830.109": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
         "252.26830.136": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
         "252.26830.83": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip"
+        "252.27397.100": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip"
       },
       "name": "oxocarbon"
     },
@@ -1891,18 +1891,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/23927/873992/Extra_IDE_Tweaks_Subscription-2025.1.13.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/23927/873992/Extra_IDE_Tweaks_Subscription-2025.1.13.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/23927/873992/Extra_IDE_Tweaks_Subscription-2025.1.13.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/23927/873992/Extra_IDE_Tweaks_Subscription-2025.1.13.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/23927/873992/Extra_IDE_Tweaks_Subscription-2025.1.13.zip",
-        "252.26830.46": "https://plugins.jetbrains.com/files/23927/873992/Extra_IDE_Tweaks_Subscription-2025.1.13.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/23927/873992/Extra_IDE_Tweaks_Subscription-2025.1.13.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/23927/873992/Extra_IDE_Tweaks_Subscription-2025.1.13.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/23927/873992/Extra_IDE_Tweaks_Subscription-2025.1.13.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/23927/873992/Extra_IDE_Tweaks_Subscription-2025.1.13.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/23927/873992/Extra_IDE_Tweaks_Subscription-2025.1.13.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/23927/873992/Extra_IDE_Tweaks_Subscription-2025.1.13.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.26830.109": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.26830.136": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.26830.83": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip"
       },
       "name": "extra-ide-tweaks"
     },
@@ -1922,18 +1922,18 @@
         "webstorm"
       ],
       "builds": {
-        "251.25410.129": "https://plugins.jetbrains.com/files/24559/873995/Extra_Tools_Pack-2025.1.17.zip",
-        "252.23892.529": "https://plugins.jetbrains.com/files/24559/873995/Extra_Tools_Pack-2025.1.17.zip",
-        "252.26830.102": "https://plugins.jetbrains.com/files/24559/873995/Extra_Tools_Pack-2025.1.17.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/24559/873995/Extra_Tools_Pack-2025.1.17.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/24559/873995/Extra_Tools_Pack-2025.1.17.zip",
-        "252.26830.46": "https://plugins.jetbrains.com/files/24559/873995/Extra_Tools_Pack-2025.1.17.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/24559/873995/Extra_Tools_Pack-2025.1.17.zip",
-        "252.26830.84": "https://plugins.jetbrains.com/files/24559/873995/Extra_Tools_Pack-2025.1.17.zip",
-        "252.26830.93": "https://plugins.jetbrains.com/files/24559/873995/Extra_Tools_Pack-2025.1.17.zip",
-        "252.26830.94": "https://plugins.jetbrains.com/files/24559/873995/Extra_Tools_Pack-2025.1.17.zip",
-        "252.26830.95": "https://plugins.jetbrains.com/files/24559/873995/Extra_Tools_Pack-2025.1.17.zip",
-        "252.26830.99": "https://plugins.jetbrains.com/files/24559/873995/Extra_Tools_Pack-2025.1.17.zip"
+        "251.25410.129": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.26199.587": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.26830.109": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.26830.136": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.26830.46": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.26830.83": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.27397.100": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.27397.103": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.27397.106": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.27397.109": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.27397.112": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.27397.92": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip"
       },
       "name": "extra-tools-pack"
     },
@@ -1950,15 +1950,15 @@
         "webstorm"
       ],
       "builds": {
-        "252.26830.102": null,
         "252.26830.109": null,
         "252.26830.136": null,
         "252.26830.46": null,
         "252.26830.83": null,
-        "252.26830.84": null,
-        "252.26830.93": null,
-        "252.26830.94": null,
-        "252.26830.95": null
+        "252.27397.100": null,
+        "252.27397.103": null,
+        "252.27397.109": null,
+        "252.27397.112": null,
+        "252.27397.92": null
       },
       "name": "nix-lsp"
     },
@@ -1978,16 +1978,16 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/26084/804883/markdtask-2025.2.zip",
-        "252.26830.102": null,
         "252.26830.109": null,
         "252.26830.136": null,
         "252.26830.46": null,
         "252.26830.83": null,
-        "252.26830.84": null,
-        "252.26830.93": null,
-        "252.26830.94": null,
-        "252.26830.95": null,
-        "252.26830.99": null
+        "252.27397.100": null,
+        "252.27397.103": null,
+        "252.27397.106": null,
+        "252.27397.109": null,
+        "252.27397.112": null,
+        "252.27397.92": null
       },
       "name": "markdtask"
     }
@@ -1999,9 +1999,9 @@
     "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip": "sha256-GO0bXJsHx9O1A6M9NUCv9m4JwKHs5plwSssgx+InNqE=",
     "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip": "sha256-zX1nEdq84wwQvGhV664V5bNBPVTI4zWo306JtjXcGkE=",
     "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip": "sha256-XKv4jEKOk2O++VdHycGoLgICsusULbWRlQ0J5p+KgAE=",
-    "https://plugins.jetbrains.com/files/11058/873994/Extra_Icons-2025.1.15.zip": "sha256-uLDveZZrKi0RD+KeXgH3e4kDn70L/PxUrEyS3h5FV4g=",
-    "https://plugins.jetbrains.com/files/11349/871355/aws-toolkit-jetbrains-standalone-3.96.252.zip": "sha256-sZhyIm1s9FRGaL4Tw5lkKHKvhFqbx1KnUHbB28fZqmg=",
-    "https://plugins.jetbrains.com/files/11349/871361/aws-toolkit-jetbrains-standalone-3.96.251.zip": "sha256-v0soM5OJPpfowXES5lXh443qAcrVw8TxFY7vgSuc82g=",
+    "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip": "sha256-kc/C/c9zsMVO0ZrPI6XH/P9X4XaoprJxo3v9ZlWVCiw=",
+    "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip": "sha256-Un5ZwdJNDuR6Gkox9WiY6Ab8IY9YwBiSIogbeaYeciM=",
+    "https://plugins.jetbrains.com/files/11349/879073/aws-toolkit-jetbrains-standalone-3.97.251.zip": "sha256-QV0oxBSRsQVU+kLzRgaOSU0f7NcQPBXWHBiUvcry3KA=",
     "https://plugins.jetbrains.com/files/12024/834783/ReSharperPlugin.CognitiveComplexity-2025.2.0.zip": "sha256-XDBmYpBpLhuLGTB8aP0csK1NBEncmMUPKWoPJx2AVao=",
     "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip": "sha256-obbLL8n6gK8oFw8NnJbdAylPHfTv4GheBDnVFOUpwL0=",
     "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip": "sha256-V3Vk6UYLUSiSmypD+g0DCX1sPw3/wZqvLxFhbkTqY34=",
@@ -2012,19 +2012,19 @@
     "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip": "sha256-5qDjLRMNwn+1QVN8cKUYlakQ8aBRiTyGuA7se3l9BI0=",
     "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip": "sha256-eKwDE+PMtYhrGbDDZPS5cimssH+1xV4GF6RXXg/3urU=",
     "https://plugins.jetbrains.com/files/1347/770332/scala-intellij-bin-2025.1.25.zip": "sha256-h9GNGjqTc+h+x/0TRilKmqGoPsxhPmXIKoGC/s4/PKg=",
-    "https://plugins.jetbrains.com/files/1347/861692/scala-intellij-bin-2025.2.30.zip": "sha256-cfHmeInFoymKaqBNqhquPN1pde+hRpk61P9mibAuC+s=",
+    "https://plugins.jetbrains.com/files/1347/882283/scala-intellij-bin-2025.2.48.zip": "sha256-FUirdeHtISeqLDzBKNEViFg9EMqMGlh2xD9PhIMD9ZA=",
     "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip": "sha256-ZYn365EY8+VP1TKM4wBotMj1hYbSSr4J1K5oIZlE2SE=",
     "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip": "sha256-WK9ukN6g2tCmeljFXwv3F+xFI/VZKlIeFs8DXqPcIKA=",
     "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar": "sha256-eXInfAqY3yEZRXCAuv3KGldM1pNKEioNwPB0rIGgJFw=",
     "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar": "sha256-mB09zvUg1hLXl9lgW1NEU+DyVel1utZv6s+mFykckYY=",
     "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar": "sha256-Qujmu2j8nrgkbsRc+ei/musrNAI1UPC3vhwIjv53zxY=",
     "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip": "sha256-upipz12aBnfW5I+IpO7FFmrSyQNTqNWxYn4Bghu4LV4=",
-    "https://plugins.jetbrains.com/files/16604/857267/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.14.zip": "sha256-g07e6dfHkNbdiG54cqGBChxNsEHQ/5kMBhLlGkK6di4=",
-    "https://plugins.jetbrains.com/files/17718/859668/github-copilot-intellij-1.5.57-243.zip": "sha256-UN+4+QhGHloiSuaSf5KwTCaSorYBLb0h2OusmOjd64k=",
+    "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip": "sha256-5n8iX6LJ7mm95pUABEXzr7IjZuDdiBvrBY8qYoFaxTU=",
+    "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip": "sha256-PArPmySjlt/i/GKwm7qZxzjJh9xN2QAKaWTCFMN+yuE=",
     "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip": "sha256-KrzZTKZMQqoEMw+vDUv2jjs0EX0leaPBkU8H/ecq/oI=",
     "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip": "sha256-F37RoWSV96ofEw7ckvhSS4nHaXUJOBuWecEhzaH2Zk4=",
     "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip": "sha256-v/BwU04VevdH7I40yiU7wOMn6CsFmSc63TKAVAcMiJI=",
-    "https://plugins.jetbrains.com/files/18922/875516/GerryThemes.jar": "sha256-G7LFG73y4i3ZtduZjKQKmNA+Kv1N+5WUZwxoo9vV0Eo=",
+    "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar": "sha256-ohVw2m/BeXssfTfsBm28RXrEW0gmqUmI/Q3Ob/SdTC4=",
     "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip": "sha256-hoFfIid7lClHDiT+ZH3H+tFSvWYb1tSRZH1iif+kWrM=",
     "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip": "sha256-QTh77pyi4lh7V0DGPFx9kERjFCop219d76wTDwD0SYY=",
     "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip": "sha256-N66Bh0AwHmg5N9PNguRAGtpJ/dLMWMp3rxjTgz9poFo=",
@@ -2033,21 +2033,23 @@
     "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip": "sha256-lOPUSxlbgagD0SuXTw+fEdwTxxfUHP1Kl6L+u/oa4fs=",
     "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip": "sha256-uwonawWIgXi9OXZlQaZl/GDt/iHqsyAKV7ifCgcMqWU=",
     "https://plugins.jetbrains.com/files/22407/875264/intellij-rust-252.26830.136.zip": "sha256-6UI1p3SzOgdQg7NjWQJv7r6qAVcTOktwTkuvO7/b5ls=",
-    "https://plugins.jetbrains.com/files/22707/865828/continue-intellij-extension-1.0.46.zip": "sha256-RyE9IPYalQptgZP206bq03pkK34N/bQPc13fQniLOCc=",
-    "https://plugins.jetbrains.com/files/22857/826717/vcs-gitlab-IU-252.23892.515-IU.zip": "sha256-1fkImbCktws9WcnJSwnMiZ7ULc3hKj9TiFXuNDf+L/U=",
+    "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip": "sha256-7553kxXry5sEJJn+Za4RsfUJGn/roAap8qDkaHjhfXQ=",
+    "https://plugins.jetbrains.com/files/22857/856960/vcs-gitlab-IU-252.26199.97-IU.zip": "sha256-dJM8j5aLWD6elv46HtXUhPvYWTdAE77m/jwRqztIwDk=",
     "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip": "sha256-bTqJlTkoOyBm370Ks6kFpvxzRJJ7CSucT298YBQtl/M=",
     "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip": "sha256-fE0M8jYTYVIC0bbBDY9fWB+mgGcVIFkeee0VTAMXt2E=",
     "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip": "sha256-ssaSY1I6FopLBgVKHUyjBrqzxHLSuI/swtDfQWJ7gxU=",
     "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip": "sha256-952sONSgui6bSVFYfRhx1PbHWHas24y0SdHl5QhNIdQ=",
-    "https://plugins.jetbrains.com/files/23927/873992/Extra_IDE_Tweaks_Subscription-2025.1.13.zip": "sha256-hcJAYJPMQVrGJZwuaz/5xuKtJOIlwYpVsqPqCclAZL8=",
-    "https://plugins.jetbrains.com/files/24559/873995/Extra_Tools_Pack-2025.1.17.zip": "sha256-CfIlfFC659GPN4DJFTctleSF0RvGMjvcxP35Hj8QMLM=",
+    "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip": "sha256-mAJXZSYib+vH2DPsoLOfV+9wW9fWyUM/nXkwDwqg6FI=",
+    "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip": "sha256-sM8SLxkLnIXhkz2xoLV7uJ7oqNMAhliKQwDkSx2GKX4=",
     "https://plugins.jetbrains.com/files/26084/804883/markdtask-2025.2.zip": "sha256-2Vrm9k4ZqqpWl/EgDrAFNTpUeBhDSYt48JhAWlSWY1A=",
-    "https://plugins.jetbrains.com/files/631/870935/python-252.26830.84.zip": "sha256-euot7m1AZOBRvyijKldXCVomgXFw2OGlhg9Zro8snEU=",
+    "https://plugins.jetbrains.com/files/631/882374/python-252.27397.103.zip": "sha256-v3EO4oMT8CaJJRWikKYKC4TyQ2uyCnP+o5nxLg94+1E=",
     "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip": "sha256-34s7pOsqMaGoVYhCuAZtylNwplQOtNQJUppepsl4F4Q=",
     "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip": "sha256-iWKLgk+eWhUmv/lH9+B2HI97d++EYvLwGgtRsJf4aSE=",
-    "https://plugins.jetbrains.com/files/6954/809234/Kotlin-252.23892.360-IJ.zip": "sha256-pQGVguF7zzzasLm2tlmtvqiPtdFN4Q5NKRwYx1r62fM=",
+    "https://plugins.jetbrains.com/files/6954/861041/Kotlin-252.26199.169-IJ.zip": "sha256-Fk/Df5MthwTWnhxv/u8/n2ITMLzZXKogj0tRRyPi5Zw=",
     "https://plugins.jetbrains.com/files/6954/870901/Kotlin-252.26830.84-IJ.zip": "sha256-C1JXMUNESJ29psA661Z8/R5Jj1155YjVXdgDFcBY01k=",
+    "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip": "sha256-zzSRwttzhbdhyV/De6a1TDSg5746iosG91LBSAeLcUQ=",
     "https://plugins.jetbrains.com/files/6981/871946/ini-252.26830.99.zip": "sha256-hETXYiz7bXDOWXjK9tUWST/VzaKdfU4hluuDWF3FTGY=",
+    "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip": "sha256-GaYYYsyBjAcWsBY3W+qx1Frx7GGbNdGIHg+gHnPHdJg=",
     "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip": "sha256-BW47ZEUINVnhV0RZ1np7Dkf3lfyrtKoZ9ej/SVct2Xs=",
     "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip": "sha256-KcRoHqvCcC6qRz58DHkQ6AFqnpyqPhETekuMWBQYYw8=",
     "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip": "sha256-jNHP/vaCaolmvNUQRGmIgSR1ykjDtKqyJ69UIn5cz70=",
@@ -2058,25 +2060,25 @@
     "https://plugins.jetbrains.com/files/7219/770179/Symfony_Plugin-2025.1.280.zip": "sha256-SgldikXjVx6hUw3LqcN8/NxLLBfnr/LUc/SrIIACl7k=",
     "https://plugins.jetbrains.com/files/7320/855846/PHP_Annotations-12.0.1.zip": "sha256-FQmHb4oo9TgXiJ4b7EEEELagOx31C9iQtsTRoqxCnO4=",
     "https://plugins.jetbrains.com/files/7322/866568/python-ce-252.26830.24.zip": "sha256-7Tkcnl2km29lxQtBIX0ahKXShy16Lk1EBiwmKZBjpIc=",
-    "https://plugins.jetbrains.com/files/7391/875464/asciidoctor-intellij-plugin-0.44.9.zip": "sha256-3QMCwQ+rBIC+dgws5LbyilccnXCYPyDA37GypJEE36s=",
+    "https://plugins.jetbrains.com/files/7322/882365/python-ce-252.27397.103.zip": "sha256-RjzA95Pc+UWa1XJklCw2qs6cLL0X8rlMedaxYt5L/G8=",
+    "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip": "sha256-k2nL2OupoiqQHkLAauo/bLJ2hQ5HVAXrGEQMkVel0eE=",
     "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar": "sha256-DobKZKokueqq0z75d2Fo3BD8mWX9+LpGdT9C7Eu2fHc=",
     "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip": "sha256-o6HEc0RuM/GRZL0ke+Zrr8uSZGMLL0dDlubuwHdnGJc=",
     "https://plugins.jetbrains.com/files/7724/871939/clouds-docker-impl-252.26830.99.zip": "sha256-abY9ZqQ0z80B2l6HNUJxF3ZyLdLjCYo0K6Y5mlDOZvc=",
-    "https://plugins.jetbrains.com/files/8097/711188/graphql-251.23774.318.zip": "sha256-O+gSW36MwqQqUiZBQl8J4NFNK+jFowtT9k1ykhSraxM=",
-    "https://plugins.jetbrains.com/files/8097/796399/graphql-252.23892.201.zip": "sha256-eLh0p5vDNG7fUV7pqbIbkL30dpPj19NE9JbwcDwxZXs=",
+    "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip": "sha256-Y8yrKgPQVa/VnJIxoIBYsukBGlSPoX6GWnEdypTOUC0=",
     "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip": "sha256-wN3+7++f6i0MvEmOTiWZgAW1QzM5HiD7jSAMS8jWC5s=",
     "https://plugins.jetbrains.com/files/8195/871151/toml-252.26830.93.zip": "sha256-trwXodrcUo1SHloOm6hQa3IUBS9F+VxK5jYvOxtSOI8=",
+    "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip": "sha256-MVzOzED2tWhoq6p0p2j5f6Gd/TPbIyom4Cu/jdNwekk=",
     "https://plugins.jetbrains.com/files/8327/809293/Minecraft_Development-2025.1-1.8.6.zip": "sha256-mePVZa+63bheH85ylkbX9oOX1Nq/IYLAGHHseOJx520=",
     "https://plugins.jetbrains.com/files/8327/809294/Minecraft_Development-2025.2-1.8.6.zip": "sha256-NOuzQ+CL+Z8n5gwMBaberLyMvS5KNmXKwZ+j88+SFqU=",
-    "https://plugins.jetbrains.com/files/8554/826552/featuresTrainer-252.23892.514.zip": "sha256-AQLuTcRERFq2ZfzOqUGMte/pLe7/3g6G+9UqNMuUYiY=",
+    "https://plugins.jetbrains.com/files/8554/854483/featuresTrainer-252.26199.84.zip": "sha256-euvA9ZNcFcQ6iZ5AC6tpyeJKTkAGzIq4jJ2sdLF0Fno=",
     "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip": "sha256-evHs8vwjnUSjN20ewZaMCpKHQbbjOmN+TspNqOMhihM=",
     "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip": "sha256-JShheBoOBiWM9HubMUJvBn4H3DnWykvqPyrmetaCZiM=",
     "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip": "sha256-Boy61dRieXmWrnTMfqqYZbdG/DNQ24KdguKN2fcZ+eg=",
-    "https://plugins.jetbrains.com/files/9164/796366/gherkin-252.23892.201.zip": "sha256-KrC3EK4wYLSxWywF8I8nVx6tkclr1wAMya1Z1XF0QY8=",
     "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip": "sha256-y66kYTYD+R9Sert2JHWGwFFIgc5UJTssZrjgvzOjljk=",
     "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip": "sha256-0c/2qbuu+M6z0gvpme+Mkv23JlQKNTUU+9GL9mh2IFw=",
     "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip": "sha256-N0DNEtF3FDcRirfjfSCCVUbDIA4SB35F/9XY1tPXXmg=",
-    "https://plugins.jetbrains.com/files/9568/866545/go-plugin-252.26830.24.zip": "sha256-6cm6rsco5560iq9FKQzShq3j0j/Ol3x1ubRbAMbEy9k=",
+    "https://plugins.jetbrains.com/files/9568/882349/go-plugin-252.27397.103.zip": "sha256-bEDB8GfqxmY1Pqco2mYW55QQvleidHYOdjyj6sWEpKE=",
     "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar": "sha256-XYCD4kOHDeIKhti0T175xhBHR8uscaFN4c9CNlUaCDs=",
     "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar": "sha256-mp1k2BdksxbGH4zUp/7DnjcGi5OXJ7UekCfX6dWZOtU=",
     "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip": "sha256-Mzmmq0RzMKZeKfBSo7FHvzeEtPGIrwqEDLAONQEsR1M=",

From 224693a10fd2245c37606775185af10e9523c19c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 24 Oct 2025 19:36:30 +0000
Subject: [PATCH 2472/6226] python3Packages.bambi: 0.15.0 -> 0.16.0

Diff: https://github.com/bambinos/bambi/compare/0.15.0...0.16.0

Changelog: https://github.com/bambinos/bambi/releases/tag/0.16.0
---
 pkgs/development/python-modules/bambi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bambi/default.nix b/pkgs/development/python-modules/bambi/default.nix
index 8c80e22a62ef..905fc1d0b2cf 100644
--- a/pkgs/development/python-modules/bambi/default.nix
+++ b/pkgs/development/python-modules/bambi/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "bambi";
-  version = "0.15.0";
+  version = "0.16.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bambinos";
     repo = "bambi";
     tag = version;
-    hash = "sha256-G8RKTccsJRcLgTQPTOXAgK6ViVEwIQydUwdAexEJ2bc=";
+    hash = "sha256-EKcURfC4IpLGzr5ibzVlUnRHIhwPP+kYYusW9Mk8R/s=";
   };
 
   build-system = [

From 6d8b8f0766c87b354bc12e98d2cc32d7f7425557 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 19:41:00 +0000
Subject: [PATCH 2473/6226] quarkus: 3.28.3 -> 3.28.5

---
 pkgs/by-name/qu/quarkus/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qu/quarkus/package.nix b/pkgs/by-name/qu/quarkus/package.nix
index b86793c4208e..7ca69a5dbdf0 100644
--- a/pkgs/by-name/qu/quarkus/package.nix
+++ b/pkgs/by-name/qu/quarkus/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quarkus-cli";
-  version = "3.28.3";
+  version = "3.28.5";
 
   src = fetchurl {
     url = "https://github.com/quarkusio/quarkus/releases/download/${finalAttrs.version}/quarkus-cli-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ulB6jy3J1vKe1rO17p8Vw0V8C/sDcXYcuu6b2e3L6Ps=";
+    hash = "sha256-uXDZIFqH+PgI0MSZb3SYFpQm2XMFdXBdPZrjb7DT1Bg=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 60c4dd820e9b039b91c89f8100125df3e48e981c Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 24 Oct 2025 23:54:07 +0400
Subject: [PATCH 2474/6226] =?UTF-8?q?python313Packages.rioxarray:=200.19.0?=
 =?UTF-8?q?=20=E2=86=92=200.20.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/python-modules/rioxarray/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/rioxarray/default.nix b/pkgs/development/python-modules/rioxarray/default.nix
index 6623edcdb7ae..5bdd716bd6f9 100644
--- a/pkgs/development/python-modules/rioxarray/default.nix
+++ b/pkgs/development/python-modules/rioxarray/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "rioxarray";
-  version = "0.19.0";
+  version = "0.20.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "corteva";
     repo = "rioxarray";
     tag = version;
-    hash = "sha256-tNcBuMyBVDVPbmujfn4WauquutOEn727lxcR19hfyuE=";
+    hash = "sha256-yLWCDaAcwQT2C0Nt1GaIA3NWXe6k2CDkBAr3rsm8eQs=";
   };
 
   build-system = [ setuptools ];
@@ -56,8 +56,6 @@ buildPythonPackage rec {
     # Fails with small numerical errors on GDAL 3.11
     "test_rasterio_vrt_gcps"
     "test_reproject__gcps"
-    # https://github.com/corteva/rioxarray/issues/862
-    "test_merge_datasets__mask_and_scale"
   ]
   ++ lib.optionals stdenv.hostPlatform.isAarch64 [
     # numerical errors

From a8a0ecdd2d906b820cee4f32397948eda3f7bf7e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 19:54:50 +0000
Subject: [PATCH 2475/6226] hubble: 1.18.0 -> 1.18.3

---
 pkgs/by-name/hu/hubble/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hu/hubble/package.nix b/pkgs/by-name/hu/hubble/package.nix
index 169b1fa18d71..acdaa3c222dd 100644
--- a/pkgs/by-name/hu/hubble/package.nix
+++ b/pkgs/by-name/hu/hubble/package.nix
@@ -9,13 +9,13 @@
 
 buildGo124Module rec {
   pname = "hubble";
-  version = "1.18.0";
+  version = "1.18.3";
 
   src = fetchFromGitHub {
     owner = "cilium";
     repo = "hubble";
     tag = "v${version}";
-    hash = "sha256-ZJnfy9s80VJxH6XXPvERupPmMfMJ0SfbeWybJL5QjDw=";
+    hash = "sha256-9TY7at4k3IrxJJ4HmAW9oeQX3Wg0V/LGVDNGYfBOvSA=";
   };
 
   nativeBuildInputs = [

From 8528cae1b3e6d9fec24e75794866dc60ac261867 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 22 Oct 2025 18:20:22 +0200
Subject: [PATCH 2476/6226] checkov: 3.2.484 -> 3.2.486

Diff: https://github.com/bridgecrewio/checkov/compare/3.2.484...3.2.486

Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.486
---
 pkgs/by-name/ch/checkov/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix
index fee85858873f..431aae748d97 100644
--- a/pkgs/by-name/ch/checkov/package.nix
+++ b/pkgs/by-name/ch/checkov/package.nix
@@ -37,14 +37,14 @@ with py.pkgs;
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.484";
+  version = "3.2.486";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     tag = version;
-    hash = "sha256-XgFTYP4xE3Q3t4kOM9EDpjDSw3DcZs1SArP80ut+h+s=";
+    hash = "sha256-EP7sygn2GSqJbf977kKD+C80gUvIabSLrgbb0OiVCy4=";
   };
 
   pythonRelaxDeps = [

From a2ac7120285af29fa725a69bf44e3bff2f8df115 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 21:56:19 +0200
Subject: [PATCH 2477/6226] checkov: 3.2.486 -> 3.2.487

Diff: https://github.com/bridgecrewio/checkov/compare/3.2.486...3.2.487

Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.487
---
 pkgs/by-name/ch/checkov/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix
index 431aae748d97..bde4d86e74f0 100644
--- a/pkgs/by-name/ch/checkov/package.nix
+++ b/pkgs/by-name/ch/checkov/package.nix
@@ -37,14 +37,14 @@ with py.pkgs;
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.486";
+  version = "3.2.487";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     tag = version;
-    hash = "sha256-EP7sygn2GSqJbf977kKD+C80gUvIabSLrgbb0OiVCy4=";
+    hash = "sha256-g+1/3NbLVCOTWMuo8Jn7JlSgOFvum1tvnjBm3paj7is=";
   };
 
   pythonRelaxDeps = [

From e30ba0572fdb2f8294a5bb05050a5591f7cfbfac Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 24 Oct 2025 19:59:38 +0000
Subject: [PATCH 2478/6226] python3Packages.pyqtgraph: skip crashing test

---
 .../python-modules/pyqtgraph/default.nix            | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix
index 7e4ba8303c7e..bb44eef839e6 100644
--- a/pkgs/development/python-modules/pyqtgraph/default.nix
+++ b/pkgs/development/python-modules/pyqtgraph/default.nix
@@ -20,7 +20,7 @@ in
 buildPythonPackage rec {
   pname = "pyqtgraph";
   version = "0.13.7";
-  format = "pyproject";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyqtgraph";
@@ -29,9 +29,9 @@ buildPythonPackage rec {
     hash = "sha256-MUwg1v6oH2TGmJ14Hp9i6KYierJbzPggK59QaHSXHVA=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     numpy
     scipy
     pyopengl
@@ -69,10 +69,15 @@ buildPythonPackage rec {
       "test_rescaleData"
     ];
 
+  disabledTestPaths = [
+    # Segmentation fault
+    "tests/test_qpainterpathprivate.py"
+  ];
+
   meta = {
     description = "Scientific Graphics and GUI Library for Python";
     homepage = "https://www.pyqtgraph.org/";
-    changelog = "https://github.com/pyqtgraph/pyqtgraph/blob/master/CHANGELOG";
+    changelog = "https://github.com/pyqtgraph/pyqtgraph/blob/${src.tag}/CHANGELOG";
     license = lib.licenses.mit;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [

From 83aa556af332abcaba29ca610d499d76488790ad Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 11 Oct 2025 18:08:43 +0200
Subject: [PATCH 2479/6226] gcovr: build from source, enable tests

---
 pkgs/by-name/gc/gcovr/package.nix | 44 ++++++++++++++++++++++++-------
 1 file changed, 34 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/gc/gcovr/package.nix b/pkgs/by-name/gc/gcovr/package.nix
index e56391df68d6..d7efae7c4556 100644
--- a/pkgs/by-name/gc/gcovr/package.nix
+++ b/pkgs/by-name/gc/gcovr/package.nix
@@ -1,7 +1,10 @@
 {
+  stdenv,
   lib,
   python3Packages,
-  fetchPypi,
+  fetchFromGitHub,
+  writableTmpDirAsHomeHook,
+  gitMinimal,
 }:
 
 python3Packages.buildPythonPackage rec {
@@ -11,9 +14,11 @@ python3Packages.buildPythonPackage rec {
 
   disabled = python3Packages.pythonOlder "3.9";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-jqDPIxdrECnyjbZ51xLKZHezgHCXw3VcE1vcU7Uc+nI=";
+  src = fetchFromGitHub {
+    owner = "gcovr";
+    repo = "gcovr";
+    tag = version;
+    hash = "sha256-v3jNODYD9qa3mwttfuldhhIHrfR5LcsZ+WNWiOWb35E=";
   };
 
   build-system = with python3Packages; [
@@ -44,17 +49,36 @@ python3Packages.buildPythonPackage rec {
       ++ lib.optionals (pythonOlder "3.11") [ tomli ]
     );
 
-  # There are no unit tests in the pypi tarball. Most of the unit tests on the
-  # github repository currently only work with gcc5, so we just disable them.
-  # See also: https://github.com/gcovr/gcovr/issues/206
-  # Despite the CI passing many GCC version, ~300 tests are failing on nixos
-  doCheck = false;
-
   pythonImportsCheck = [
     "gcovr"
     "gcovr.configuration"
   ];
 
+  preCheck = ''
+    rm -rf src # this causes some pycache issues
+    rm -rf admin/bump_version.py
+    export CC_REFERENCE="gcc-${lib.versions.major stdenv.cc.version}"
+  '';
+
+  nativeCheckInputs = with python3Packages; [
+    writableTmpDirAsHomeHook
+    pytestCheckHook
+    pytest-timeout
+    yaxmldiff
+    nox
+    requests
+    gitMinimal
+  ];
+
+  disabledTests = [
+    # too fragile
+    "test_build"
+    "test_example"
+    # assert 40 == 30 on log levels
+    "test_multiple_output_formats_to_stdout"
+    "test_multiple_output_formats_to_stdout_1"
+  ];
+
   meta = {
     description = "Python script for summarizing gcov data";
     homepage = "https://www.gcovr.com/";

From efb1e653eb55a4bf54d8b25db16dd4b27eae655f Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Fri, 24 Oct 2025 22:11:58 +0200
Subject: [PATCH 2480/6226] zeal: fix build with qt 6.10

---
 pkgs/by-name/ze/zeal/package.nix  |  2 ++
 pkgs/by-name/ze/zeal/qt6_10.patch | 34 +++++++++++++++++++++++++++++++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/by-name/ze/zeal/qt6_10.patch

diff --git a/pkgs/by-name/ze/zeal/package.nix b/pkgs/by-name/ze/zeal/package.nix
index 5c410836489c..fbcb0ce56783 100644
--- a/pkgs/by-name/ze/zeal/package.nix
+++ b/pkgs/by-name/ze/zeal/package.nix
@@ -23,6 +23,8 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-9tlo7+namWNWrWVQNqaOvtK4NQIdb0p8qvFrrbUamOo=";
   };
 
+  patches = [ ./qt6_10.patch ];
+
   nativeBuildInputs = [
     cmake
     extra-cmake-modules
diff --git a/pkgs/by-name/ze/zeal/qt6_10.patch b/pkgs/by-name/ze/zeal/qt6_10.patch
new file mode 100644
index 000000000000..574c063a3b75
--- /dev/null
+++ b/pkgs/by-name/ze/zeal/qt6_10.patch
@@ -0,0 +1,34 @@
+diff --git a/src/libs/ui/docsetsdialog.cpp b/src/libs/ui/docsetsdialog.cpp
+index 8c9fe63..5c73480 100644
+--- a/src/libs/ui/docsetsdialog.cpp
++++ b/src/libs/ui/docsetsdialog.cpp
+@@ -360,7 +360,7 @@ void DocsetsDialog::downloadCompleted()
+         QTemporaryFile *tmpFile = m_tmpFiles[docsetName];
+         if (!tmpFile) {
+             tmpFile = new QTemporaryFile(QStringLiteral("%1/%2.XXXXXX.tmp").arg(Core::Application::cacheLocation(), docsetName), this);
+-            tmpFile->open();
++            (void)tmpFile->open();
+             m_tmpFiles.insert(docsetName, tmpFile);
+         }
+ 
+@@ -403,7 +403,7 @@ void DocsetsDialog::downloadProgress(qint64 received, qint64 total)
+         QTemporaryFile *tmpFile = m_tmpFiles[docsetName];
+         if (!tmpFile) {
+             tmpFile = new QTemporaryFile(QStringLiteral("%1/%2.XXXXXX.tmp").arg(Core::Application::cacheLocation(), docsetName), this);
+-            tmpFile->open();
++            (void)tmpFile->open();
+             m_tmpFiles.insert(docsetName, tmpFile);
+         }
+ 
+diff --git a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
+index 476c2f5..f49da88 100644
+--- a/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
++++ b/src/libs/ui/qxtglobalshortcut/CMakeLists.txt
+@@ -42,6 +42,7 @@ elseif(UNIX AND X11_FOUND)
+         find_package(Qt5 COMPONENTS X11Extras REQUIRED)
+         target_link_libraries(QxtGlobalShortcut Qt5::X11Extras)
+     else()
++        find_package(Qt6 REQUIRED COMPONENTS GuiPrivate)
+         target_link_libraries(QxtGlobalShortcut Qt${QT_VERSION_MAJOR}::GuiPrivate)
+     endif()
+ 

From 8f5f8402cfd679e59d691e955689ce65eced22f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 20:21:48 +0000
Subject: [PATCH 2481/6226] iosevka: 33.3.2 -> 33.3.3

---
 pkgs/by-name/io/iosevka/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix
index f41c80aa8e9a..36ad6f70487e 100644
--- a/pkgs/by-name/io/iosevka/package.nix
+++ b/pkgs/by-name/io/iosevka/package.nix
@@ -56,16 +56,16 @@ assert (extraParameters != null) -> set != null;
 
 buildNpmPackage rec {
   pname = "Iosevka${toString set}";
-  version = "33.3.2";
+  version = "33.3.3";
 
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
     rev = "v${version}";
-    hash = "sha256-qJfywH5rwfgTy8k7Db3vC09Lx+UP50iWSsXnTIQWJQo=";
+    hash = "sha256-/e65hFA8GabDrHjQ+9MthSTxUku9af0LT4W1ENI+LYc=";
   };
 
-  npmDepsHash = "sha256-MzeUHVJXmtLWNh2iNA0RiXw1fi5Cf/sWeCQG2YCMxvU=";
+  npmDepsHash = "sha256-QJ3h8NdhCG+lkZ5392akKk+pVHiqmnt+DsC3imixNnw=";
 
   nativeBuildInputs = [
     remarshal

From 5ccff9f985a69b28568a316bfabdf486cbea3501 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 20:31:46 +0000
Subject: [PATCH 2482/6226] python3Packages.djangocms-alias: 2.0.5 -> 3.0.2

---
 pkgs/development/python-modules/djangocms-alias/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/djangocms-alias/default.nix b/pkgs/development/python-modules/djangocms-alias/default.nix
index 16a0ac09a369..86f0a0a027de 100644
--- a/pkgs/development/python-modules/djangocms-alias/default.nix
+++ b/pkgs/development/python-modules/djangocms-alias/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "djangocms-alias";
-  version = "2.0.5";
+  version = "3.0.2";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "django-cms";
     repo = "djangocms-alias";
     tag = version;
-    hash = "sha256-sMMqX4+R4VZveIEV779WqYnZYH/fqZihyxFDAKwlWn0=";
+    hash = "sha256-70Gs+Ys26ypq5RXkPTxxMDFz/OCBvvAVnSIUQ3P1OV8=";
   };
 
   build-system = [ setuptools ];

From 869de83cc42e356851f2e21a604607440ed5bf9c Mon Sep 17 00:00:00 2001
From: Arthur Gautier <arthur.gautier@arista.com>
Date: Fri, 24 Oct 2025 13:30:58 -0700
Subject: [PATCH 2483/6226] modules/image/repart: fixup partitions example

`fat` is not a valid value for `Format`

See https://www.freedesktop.org/software/systemd/man/latest/repart.d.html#Format=
---
 nixos/modules/image/repart.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/image/repart.nix b/nixos/modules/image/repart.nix
index 1f276590f9c2..8f892b96438b 100644
--- a/nixos/modules/image/repart.nix
+++ b/nixos/modules/image/repart.nix
@@ -223,7 +223,7 @@ in
             }
             repartConfig = {
               Type = "esp";
-              Format = "fat";
+              Format = "vfat";
             };
           };
           "20-root" = {

From e162c391c127cd2129bba71b936ec366d8553e74 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Fri, 24 Oct 2025 22:58:36 +0200
Subject: [PATCH 2484/6226] ycmd: escape python in description

---
 pkgs/by-name/yc/ycmd/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/yc/ycmd/package.nix b/pkgs/by-name/yc/ycmd/package.nix
index 520dd5f23461..6978a1b60085 100644
--- a/pkgs/by-name/yc/ycmd/package.nix
+++ b/pkgs/by-name/yc/ycmd/package.nix
@@ -130,7 +130,7 @@ stdenv.mkDerivation {
 
       ...  then set something similar to following in `programs.vim.extraConfig`;
 
-          let g:ycm_server_python_interpreter = "${python3.interpreter}"
+          let g:ycm_server_python_interpreter = "''${python3.interpreter}"
     '';
     mainProgram = "ycmd";
     homepage = "https://github.com/ycm-core/ycmd";

From 7acdf2b380b6a9d94a219b7123f80619f2bfb2d8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 21:04:46 +0000
Subject: [PATCH 2485/6226] lux-cli: 0.18.5 -> 0.18.7

---
 pkgs/by-name/lu/lux-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix
index bc98bbf076a2..cd31f73f87ef 100644
--- a/pkgs/by-name/lu/lux-cli/package.nix
+++ b/pkgs/by-name/lu/lux-cli/package.nix
@@ -18,18 +18,18 @@
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lux-cli";
 
-  version = "0.18.5";
+  version = "0.18.7";
 
   src = fetchFromGitHub {
     owner = "lumen-oss";
     repo = "lux";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ut9MSHl2eE4krf5yLpXdAxPARFuHP+cG8HlY7DqmETw=";
+    hash = "sha256-nZslDD09PfETa0a3LuZGXlj7GETXTXK9vH8kpb40i9Y=";
   };
 
   buildAndTestSubdir = "lux-cli";
 
-  cargoHash = "sha256-I730Fq9F46aLGeEwMmbeOXIkFWNvskmBl+NuPDfx/ss=";
+  cargoHash = "sha256-+j0Rs4aO+1BZ5fWN1we+MM9sJcXsupVF3LajhjJeoTA=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 08ebcac976e89c6c1b398d0c2f3b0f1b83cbf916 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Fri, 24 Oct 2025 23:12:59 +0200
Subject: [PATCH 2486/6226] harper: 0.69.0 -> 0.70.0

Changelog: https://github.com/Automattic/harper/releases/tag/v0.70.0
Diff: https://github.com/Automattic/harper/compare/v0.69.0...v0.70.0
---
 .../vscode/extensions/elijah-potter.harper/default.nix      | 2 +-
 pkgs/by-name/ha/harper/package.nix                          | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix
index 29260baf3a36..2cc632eb5b82 100644
--- a/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/elijah-potter.harper/default.nix
@@ -13,7 +13,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     name = "harper";
     publisher = "elijah-potter";
     version = harper.version;
-    hash = "sha256-VvXErcIqM37huOvPhfGtY+1N4j4N1en1C5bRPjClqZk=";
+    hash = "sha256-KyN3WXJIZVgMe4zoxI6ijmltDLLvHOeYbuxLAYX+x0k=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix
index 92ca11739862..1df595fa96ba 100644
--- a/pkgs/by-name/ha/harper/package.nix
+++ b/pkgs/by-name/ha/harper/package.nix
@@ -7,18 +7,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "harper";
-  version = "0.69.0";
+  version = "0.70.0";
 
   src = fetchFromGitHub {
     owner = "Automattic";
     repo = "harper";
     rev = "v${version}";
-    hash = "sha256-OLGIQ2ISZwuResmuxRhbFpBtSPs/73q6haEW5qeh6Qg=";
+    hash = "sha256-ksSr2styk0uDEOGrxAVRqW549oaGdzahejaJ5paYNf0=";
   };
 
   buildAndTestSubdir = "harper-ls";
 
-  cargoHash = "sha256-zSuitQ0URnWDPNuBc1bkVWddnYTjyU41uXe9oSYYsoU=";
+  cargoHash = "sha256-w4nwOzKV3yshvLzMeJyv32ihFv5yE+r7gNOF01zTYrU=";
 
   passthru.updateScript = nix-update-script { };
 

From 6316481cdb129ce568d9e913a65d495e8ae69a1d Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 24 Oct 2025 22:13:42 +0100
Subject: [PATCH 2487/6226] xdg-desktop-portal-phosh: drop incorrect
 `updateScript`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The update script fails to eval:

    $ nix-shell maintainers/scripts/update.nix --argstr package xdg-desktop-portal-phosh
    error:
       … while calling the 'derivationStrict' builtin
         at «nix-internal»/derivation-internal.nix:37:12:
           36|
           37|   strict = derivationStrict drvAttrs;
             |            ^
           38|

       … while evaluating derivation 'nixpkgs-update-script'
         whose name attribute is located at pkgs/stdenv/generic/make-derivation.nix:544:13

       … while evaluating attribute 'shellHook' of derivation 'nixpkgs-update-script'
         at maintainers/scripts/update.nix:275:3:
          274|   '';
          275|   shellHook = ''
             |   ^
          276|     unset shellHook # do not contaminate nested shells

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: attribute 'updateScript' missing
       at pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix:76:20:
           75|   passthru = {
           76|     updateScript = lib.updateScript { };
             |                    ^
           77|   };
---
 pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix
index f65cfd986a98..f36161e79090 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-phosh/package.nix
@@ -72,10 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
     ./cargo_lock_deps_version.patch
   ];
 
-  passthru = {
-    updateScript = lib.updateScript { };
-  };
-
   meta = with lib; {
     description = "A backend implementation for xdg-desktop-portal that is using GTK/GNOME/Phosh to provide interfaces that aren't provided by the GTK portal";
     homepage = "https://gitlab.gnome.org/guidog/xdg-desktop-portal-phosh";

From 1865951dbe743455a7dab6703630004492e8bbf6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 21:19:13 +0000
Subject: [PATCH 2488/6226] github-mcp-server: 0.18.0 -> 0.19.1

---
 pkgs/by-name/gi/github-mcp-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix
index 30f03e0d90ac..76c41030464a 100644
--- a/pkgs/by-name/gi/github-mcp-server/package.nix
+++ b/pkgs/by-name/gi/github-mcp-server/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "github-mcp-server";
-  version = "0.18.0";
+  version = "0.19.1";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "github-mcp-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tVKzJlj3zemoKOr18r+1ElfbqBdJa4La1x0fFVxPO1U=";
+    hash = "sha256-/i/Gk47IZtTGHUJ3ok9Y2LDTRHqlz0N4IrNmyRqSTNk=";
   };
 
   vendorHash = "sha256-esd4Ly8cbN3z9fxC1j4wQqotV2ULqK3PDf1bEovewUY=";

From 6e9987b691521b08337899bf5dc19ca6a5b0bcea Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 24 Oct 2025 23:24:11 +0200
Subject: [PATCH 2489/6226] python3Packages.pyngrok: 7.4.0 -> 7.4.1

---
 pkgs/development/python-modules/pyngrok/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix
index 9006101f4278..9a0fefb7cb67 100644
--- a/pkgs/development/python-modules/pyngrok/default.nix
+++ b/pkgs/development/python-modules/pyngrok/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pyngrok";
-  version = "7.4.0";
+  version = "7.4.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-H3hv7Y0Va5m//XEwlqfsjIEYH5Scj1ySD2gg6S1rmHY=";
+    hash = "sha256-rYY3c4ztW9uIwosIf+o5ylUoYMLTAASsAQM8D460824=";
   };
 
   build-system = [

From 7d846170c21951a0bcc21e9b9302b6929f616bfe Mon Sep 17 00:00:00 2001
From: Nikola Knezevic <nikola@knezevic.ch>
Date: Wed, 22 Oct 2025 11:33:39 +0200
Subject: [PATCH 2490/6226] prek: 0.2.4 -> 0.2.11

The link to changelogs is here:

- https://github.com/j178/prek/releases/tag/v0.2.11
- https://github.com/j178/prek/releases/tag/v0.2.10
- https://github.com/j178/prek/releases/tag/v0.2.9
- https://github.com/j178/prek/releases/tag/v0.2.8
- https://github.com/j178/prek/releases/tag/v0.2.5

This fixes the issue with prek raised in https://github.com/NixOS/nixpkgs/issues/455265.
The tarmagedon issue in prek was fixed with https://github.com/j178/prek/pull/952
---
 pkgs/by-name/pr/prek/package.nix | 34 +++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/prek/package.nix b/pkgs/by-name/pr/prek/package.nix
index b4099c6c1285..3b04daf72b4a 100644
--- a/pkgs/by-name/pr/prek/package.nix
+++ b/pkgs/by-name/pr/prek/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "prek";
-  version = "0.2.4";
+  version = "0.2.11";
 
   src = fetchFromGitHub {
     owner = "j178";
     repo = "prek";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XvNvVWEmJpsY2AxTYLT0/4IiJ2QTI4mWwDleMmZ2LgA=";
+    hash = "sha256-wzbvofNOAtqbjO5//ECu1FeZrS0FyDvFZPKxC0fOJnE=";
   };
 
-  cargoHash = "sha256-PDYCO1ggKwtMR9tnokY7JqVM03FWsO4c2L4GV+7TKu4=";
+  cargoHash = "sha256-KVGdAPyUlPCgcx1DpZbfNRNmALdJvzOcsv3WQy3Q7OI=";
 
   preBuild = ''
     version312_str=$(${python312}/bin/python -c 'import sys; print(sys.version_info[:3])')
@@ -38,6 +38,13 @@ rustPlatform.buildRustPackage (finalAttrs: {
     export TMP=$TEMP
     export TMPDIR=$TEMP
     export PREK_INTERNAL__TEST_DIR=$TEMP
+
+    export UV_PROJECT_ENVIRONMENT="$(mktemp -d)"
+    cleanup() {
+        rm -rf "$UV_PROJECT_ENVIRONMENT"
+        rm -rf "$TEMP"
+    }
+    trap cleanup EXIT
   '';
 
   __darwinAllowLocalNetworking = true;
@@ -58,6 +65,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "node"
     "script"
     "check_useless_excludes_remote"
+    "run_worktree"
     # "meta_hooks"
     "reuse_env"
     "docker::docker"
@@ -99,8 +107,28 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "builtin_hooks_workspace_mode"
     "fix_byte_order_marker_hook"
     "fix_byte_order_marker"
+    "check_merge_conflict_hook"
+    "check_merge_conflict_without_assume_flag"
+    "check_symlinks_hook_unix"
+    "check_xml_hook"
+    "check_xml_with_features"
+    "detect_private_key_hook"
+    "no_commit_to_branch_hook"
+    "no_commit_to_branch_hook_with_custom_branches"
+    "no_commit_to_branch_hook_with_patterns"
     # does not properly use TMP
     "hook_impl"
+    # problems with environment
+    "try_repo_specific_hook"
+    "try_repo_specific_rev"
+    # lua path is hardcoded
+    "lua::additional_dependencies"
+    "lua::health_check"
+    "lua::hook_stderr"
+    "lua::lua_environment"
+    "lua::remote_hook"
+    # error message differs
+    "run_in_non_git_repo"
   ];
 
   meta = {

From 95008177a17ccd37160b433ceeb0eb59c8415930 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 21:36:17 +0000
Subject: [PATCH 2491/6226] gh-gei: 1.19 -> 1.20.0

---
 pkgs/by-name/gh/gh-gei/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix
index d6337a2f645b..109f15e2ea78 100644
--- a/pkgs/by-name/gh/gh-gei/package.nix
+++ b/pkgs/by-name/gh/gh-gei/package.nix
@@ -7,13 +7,13 @@
 
 buildDotnetModule rec {
   pname = "gh-gei";
-  version = "1.19";
+  version = "1.20.0";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "gh-gei";
     rev = "v${version}";
-    hash = "sha256-3c9wrBm7sKrQaNhAe5uwGEEXQEfSLHBJJ/XFC2pc12Q=";
+    hash = "sha256-00+yHDvDTJux2XKhJ3u1W1SrYArFGJtYusT/adC2XDE=";
   };
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx;

From 290f7d59d57fc817f643a30df1eab69efaee25bb Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Fri, 24 Oct 2025 23:23:29 +0200
Subject: [PATCH 2492/6226] qgnomeplatform: fix build with qt 6.10

---
 .../libraries/qgnomeplatform/default.nix      |   3 +
 .../libraries/qgnomeplatform/qt6_10.patch     | 140 ++++++++++++++++++
 2 files changed, 143 insertions(+)
 create mode 100644 pkgs/development/libraries/qgnomeplatform/qt6_10.patch

diff --git a/pkgs/development/libraries/qgnomeplatform/default.nix b/pkgs/development/libraries/qgnomeplatform/default.nix
index 22ba9ead8c96..7bae9ca2c6e2 100644
--- a/pkgs/development/libraries/qgnomeplatform/default.nix
+++ b/pkgs/development/libraries/qgnomeplatform/default.nix
@@ -36,6 +36,9 @@ stdenv.mkDerivation rec {
     # Backport cursor fix for Qt6 apps
     # Adjusted from https://github.com/FedoraQt/QGnomePlatform/pull/138
     ./qt6-cursor-fix.patch
+
+    # fixing build with Qt>=6.10
+    ./qt6_10.patch
   ];
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/qgnomeplatform/qt6_10.patch b/pkgs/development/libraries/qgnomeplatform/qt6_10.patch
new file mode 100644
index 000000000000..93466e80ef28
--- /dev/null
+++ b/pkgs/development/libraries/qgnomeplatform/qt6_10.patch
@@ -0,0 +1,140 @@
+diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
+index e6dcf06..287824c 100644
+--- a/src/common/CMakeLists.txt
++++ b/src/common/CMakeLists.txt
+@@ -3,6 +3,10 @@ set(common_SRCS
+     gnomesettings.cpp
+ )
+ 
++if(QT_VERSION_MAJOR EQUAL 6)
++    find_package(Qt6 REQUIRED COMPONENTS GuiPrivate)
++endif()
++
+ add_library(qgnomeplatform${LIBQGNOMEPLATFORM_SUFFIX} SHARED ${common_SRCS})
+ target_link_libraries(qgnomeplatform${LIBQGNOMEPLATFORM_SUFFIX}
+     Qt${QT_VERSION_MAJOR}::Core
+diff --git a/src/decoration/CMakeLists.txt b/src/decoration/CMakeLists.txt
+index a6fb227..7b6647c 100644
+--- a/src/decoration/CMakeLists.txt
++++ b/src/decoration/CMakeLists.txt
+@@ -8,6 +8,11 @@ set(decoration_SRCS
+     qgnomeplatformdecoration.cpp
+ )
+ 
++if(QT_VERSION_MAJOR EQUAL 6)
++    find_package(Qt6 REQUIRED COMPONENTS GuiPrivate)
++    find_package(Qt6 REQUIRED COMPONENTS WaylandClientPrivate)
++endif()
++
+ add_library(qgnomeplatformdecoration MODULE ${decoration_SRCS})
+ target_link_libraries(qgnomeplatformdecoration
+     qgnomeplatform${LIBQGNOMEPLATFORM_SUFFIX}
+diff --git a/src/decoration/qgnomeplatformdecoration.cpp b/src/decoration/qgnomeplatformdecoration.cpp
+index a719cb3..79c0be0 100644
+--- a/src/decoration/qgnomeplatformdecoration.cpp
++++ b/src/decoration/qgnomeplatformdecoration.cpp
+@@ -616,8 +616,12 @@ void QGnomePlatformDecoration::processMouseTop(QWaylandInputDevice *inputDevice,
+         if (local.x() <= margins().left()) {
+             //top left bit
+ #if QT_CONFIG(cursor)
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++            waylandWindow()->applyCursor(inputDevice, Qt::SizeFDiagCursor);
++#else
+             waylandWindow()->setMouseCursor(inputDevice, Qt::SizeFDiagCursor);
+ #endif
++#endif
+ #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
+             startResize(inputDevice, WL_SHELL_SURFACE_RESIZE_TOP_LEFT, b);
+ #else
+@@ -626,8 +630,12 @@ void QGnomePlatformDecoration::processMouseTop(QWaylandInputDevice *inputDevice,
+         } else if (local.x() > window()->width() + margins().left()) {
+             //top right bit
+ #if QT_CONFIG(cursor)
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++            waylandWindow()->applyCursor(inputDevice, Qt::SizeBDiagCursor);
++#else
+             waylandWindow()->setMouseCursor(inputDevice, Qt::SizeBDiagCursor);
+ #endif
++#endif
+ #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
+             startResize(inputDevice, WL_SHELL_SURFACE_RESIZE_TOP_RIGHT, b);
+ #else
+@@ -636,8 +644,12 @@ void QGnomePlatformDecoration::processMouseTop(QWaylandInputDevice *inputDevice,
+         } else {
+             //top resize bit
+ #if QT_CONFIG(cursor)
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++            waylandWindow()->applyCursor(inputDevice, Qt::SplitVCursor);
++#else
+             waylandWindow()->setMouseCursor(inputDevice, Qt::SplitVCursor);
+ #endif
++#endif
+ #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
+             startResize(inputDevice, WL_SHELL_SURFACE_RESIZE_TOP, b);
+ #else
+@@ -682,8 +694,12 @@ void QGnomePlatformDecoration::processMouseBottom(QWaylandInputDevice *inputDevi
+     if (local.x() <= margins().left()) {
+         //bottom left bit
+ #if QT_CONFIG(cursor)
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++        waylandWindow()->applyCursor(inputDevice, Qt::SizeBDiagCursor);
++#else
+         waylandWindow()->setMouseCursor(inputDevice, Qt::SizeBDiagCursor);
+ #endif
++#endif
+ #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
+         startResize(inputDevice, WL_SHELL_SURFACE_RESIZE_BOTTOM_LEFT, b);
+ #else
+@@ -692,8 +708,12 @@ void QGnomePlatformDecoration::processMouseBottom(QWaylandInputDevice *inputDevi
+     } else if (local.x() > window()->width() + margins().right()) {
+         //bottom right bit
+ #if QT_CONFIG(cursor)
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++        waylandWindow()->applyCursor(inputDevice, Qt::SizeFDiagCursor);
++#else
+         waylandWindow()->setMouseCursor(inputDevice, Qt::SizeFDiagCursor);
+ #endif
++#endif
+ #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
+         startResize(inputDevice, WL_SHELL_SURFACE_RESIZE_BOTTOM_RIGHT, b);
+ #else
+@@ -702,8 +722,12 @@ void QGnomePlatformDecoration::processMouseBottom(QWaylandInputDevice *inputDevi
+     } else {
+         //bottom bit
+ #if QT_CONFIG(cursor)
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++        waylandWindow()->applyCursor(inputDevice, Qt::SplitVCursor);
++#else
+         waylandWindow()->setMouseCursor(inputDevice, Qt::SplitVCursor);
+ #endif
++#endif
+ #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
+         startResize(inputDevice, WL_SHELL_SURFACE_RESIZE_BOTTOM, b);
+ #else
+@@ -717,8 +741,12 @@ void QGnomePlatformDecoration::processMouseLeft(QWaylandInputDevice *inputDevice
+     Q_UNUSED(local)
+     Q_UNUSED(mods)
+ #if QT_CONFIG(cursor)
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++    waylandWindow()->applyCursor(inputDevice, Qt::SplitHCursor);
++#else
+     waylandWindow()->setMouseCursor(inputDevice, Qt::SplitHCursor);
+ #endif
++#endif
+ #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
+         startResize(inputDevice, WL_SHELL_SURFACE_RESIZE_LEFT, b);
+ #else
+@@ -731,8 +759,12 @@ void QGnomePlatformDecoration::processMouseRight(QWaylandInputDevice *inputDevic
+     Q_UNUSED(local)
+     Q_UNUSED(mods)
+ #if QT_CONFIG(cursor)
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++    waylandWindow()->applyCursor(inputDevice, Qt::SplitHCursor);
++#else
+     waylandWindow()->setMouseCursor(inputDevice, Qt::SplitHCursor);
+ #endif
++#endif
+ #if (QT_VERSION < QT_VERSION_CHECK(5, 13, 0))
+         startResize(inputDevice, WL_SHELL_SURFACE_RESIZE_RIGHT, b);
+ #else
+

From 114dae2060d1bd61a3df48e9c1e114c8b179a5ea Mon Sep 17 00:00:00 2001
From: jkachmar <j@mercury.com>
Date: Fri, 24 Oct 2025 17:58:27 -0400
Subject: [PATCH 2493/6226] honeycomb-refinery: fix redis test timeout

---
 ...T-env-var-that-disables-Redis-requir.patch | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ho/honeycomb-refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch b/pkgs/by-name/ho/honeycomb-refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch
index 71dbff392aa5..a8abf61ab301 100644
--- a/pkgs/by-name/ho/honeycomb-refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch
+++ b/pkgs/by-name/ho/honeycomb-refinery/0001-add-NO_REDIS_TEST-env-var-that-disables-Redis-requir.patch
@@ -1,11 +1,12 @@
-From f2d2d869a4aa58430415d0969f5e80ece0142ad2 Mon Sep 17 00:00:00 2001
+From ce22aed5afa89c9b591d865bdfcc84a739929a01 Mon Sep 17 00:00:00 2001
 From: jkachmar <j@mercury.com>
-Date: Thu, 23 Oct 2025 17:36:48 -0400
+Date: Fri, 24 Oct 2025 17:56:22 -0400
 Subject: [PATCH] disable tests that require redis
 
 ---
  internal/peer/peers_test.go | 4 ++++
- 1 file changed, 4 insertions(+), 0 deletions(-)
+ pubsub/pubsub_test.go       | 1 -
+ 2 files changed, 4 insertions(+), 1 deletion(-)
 
 diff --git a/internal/peer/peers_test.go b/internal/peer/peers_test.go
 index dae54067d8..b33ebc4979 100644
@@ -22,3 +23,15 @@ index dae54067d8..b33ebc4979 100644
  	c := &config.MockConfig{
  		GetPeerListenAddrVal: "0.0.0.0:8081",
  		PeerManagementType:   "redis",
+diff --git a/pubsub/pubsub_test.go b/pubsub/pubsub_test.go
+index 4ad630ff96..dff6981926 100644
+--- a/pubsub/pubsub_test.go
++++ b/pubsub/pubsub_test.go
+@@ -17,7 +17,6 @@
+ )
+ 
+ var types = []string{
+-	"goredis",
+ 	"local",
+ }
+ 

From e49ea48bd032d7011a874b933fd36f08e59b7330 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 21:59:04 +0000
Subject: [PATCH 2494/6226] asciinema-agg: 1.6.0 -> 1.7.0

---
 pkgs/by-name/as/asciinema-agg/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/as/asciinema-agg/package.nix b/pkgs/by-name/as/asciinema-agg/package.nix
index 764bb078cd42..43ee2bc72845 100644
--- a/pkgs/by-name/as/asciinema-agg/package.nix
+++ b/pkgs/by-name/as/asciinema-agg/package.nix
@@ -6,18 +6,18 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "agg";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "asciinema";
     repo = "agg";
     rev = "v${version}";
-    hash = "sha256-FjAf/rhyxsm4LHoko4QRA9t5e+qKIgO2kSd48Zmf224=";
+    hash = "sha256-6UenPE6mmmvliaIuGdQj/FrlmoJvmBJgfo0hW+uRaxM=";
   };
 
   strictDeps = true;
 
-  cargoHash = "sha256-CeXcpSD/6qPzA8nrSyC3oDFBpjFYNfDPySQxSOZPlgc=";
+  cargoHash = "sha256-VpbjvrMhzS1zrcMNWBjTLda6o3ea2cwpnEDUouwyp8w=";
 
   meta = with lib; {
     description = "Command-line tool for generating animated GIF files from asciicast v2 files produced by asciinema terminal recorder";

From 24f41c6fad2025d69ea8b0a2c1b07c06800ed3bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 21:59:09 +0000
Subject: [PATCH 2495/6226] postgresqlPackages.pg_partman: 5.3.0 -> 5.3.1

---
 pkgs/servers/sql/postgresql/ext/pg_partman.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_partman.nix b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
index 0fee40dfa741..cba7355f595b 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_partman.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_partman.nix
@@ -7,13 +7,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_partman";
-  version = "5.3.0";
+  version = "5.3.1";
 
   src = fetchFromGitHub {
     owner = "pgpartman";
     repo = "pg_partman";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Lib7UY06qjv95ndwx3sjPBcL5MtsLNx8IVOpZ1CgDG8=";
+    hash = "sha256-LK+z/0puUuNLz2ah/SDaxxyLS/On/cmCBhKNwTLa7Pk=";
   };
 
   meta = {

From 0443b98ab3aa88d5eb7ff231781d679be89868e8 Mon Sep 17 00:00:00 2001
From: sternenseemann <sternenseemann@systemli.org>
Date: Fri, 24 Oct 2025 23:48:17 +0200
Subject: [PATCH 2496/6226] buildPython*: unconditionally add .override

To be able to splice, we can't fail to eval before returning an
attribute set. By checking for f ? override, we need to force f which
isn't always possible, whereas mirrorFunctionArgs serves as an
indirection which wraps the inner thunks in an attribute set that can
always be returned. Fortunately, there should be no case when f
evaluates successfully and does not have the override attribute, so we
can just remove the condition.

This fixes evaluation of buildPython* based packages in certain splicing
situations by being lazier. An example of this is
pkgsCross.ghcjs.buildPackages.nixpkgs-openjdk-updater on staging right
now (ff5098e).
---
 pkgs/development/interpreters/python/python-packages-base.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/python-packages-base.nix b/pkgs/development/interpreters/python/python-packages-base.nix
index 19a46dc7ee74..e3a92bef52f3 100644
--- a/pkgs/development/interpreters/python/python-packages-base.nix
+++ b/pkgs/development/interpreters/python/python-packages-base.nix
@@ -39,7 +39,7 @@ let
       else
         result
     )
-    // lib.optionalAttrs (f ? override) {
+    // {
       # Support overriding `f` itself, e.g. `buildPythonPackage.override { }`.
       # Ensure `makeOverridablePythonPackage` is applied to the result.
       override = lib.mirrorFunctionArgs f.override (fdrv: makeOverridablePythonPackage (f.override fdrv));

From 1bb735ce5d5d1df20dfdbfb9b6a3090ae8ffae33 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 22:15:51 +0000
Subject: [PATCH 2497/6226] home-assistant-custom-components.sun2: 3.4.2b0 ->
 3.4.2b1

---
 .../servers/home-assistant/custom-components/sun2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/sun2/package.nix b/pkgs/servers/home-assistant/custom-components/sun2/package.nix
index a2c1ee9428ee..86f62b43fc90 100644
--- a/pkgs/servers/home-assistant/custom-components/sun2/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/sun2/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "pnbruckner";
   domain = "sun2";
-  version = "3.4.2b0";
+  version = "3.4.2b1";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "ha-sun2";
     tag = version;
-    hash = "sha256-M+ClqFOeZUw5Rk5vaNnyRBeXU+yTSYTk70TJqcqtehU=";
+    hash = "sha256-UjJWJX8Upkhu85QNj89ozLDuTFXbrXsFWo/6uRkIFjM=";
   };
 
   meta = rec {

From eeb1cc7f5dd0c461ef33f38eff8878d40b49a360 Mon Sep 17 00:00:00 2001
From: Tom Herbers <mail@tomherbers.de>
Date: Fri, 24 Oct 2025 16:38:40 +0200
Subject: [PATCH 2498/6226] batman-adv: 2025.3 -> 2025.4

Changelog: https://www.open-mesh.org/news/124
---
 pkgs/os-specific/linux/batman-adv/version.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/batman-adv/version.nix b/pkgs/os-specific/linux/batman-adv/version.nix
index 43e854979fff..9b2d7f98cf68 100644
--- a/pkgs/os-specific/linux/batman-adv/version.nix
+++ b/pkgs/os-specific/linux/batman-adv/version.nix
@@ -1,14 +1,14 @@
 {
-  version = "2025.3";
+  version = "2025.4";
 
   # To get these, run:
   #
   # ```
-  # for tool in alfred batctl batman-adv; do nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2025.3/$tool-2025.3.tar.gz --type sha256 | xargs nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri; done
+  # for tool in alfred batctl batman-adv; do nix-prefetch-url https://downloads.open-mesh.org/batman/releases/batman-adv-2025.4/$tool-2025.4.tar.gz --type sha256 | xargs nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri; done
   # ```
   sha256 = {
-    alfred = "sha256-+wTI22Y6bh0dyeRnEvyr6Ctz0MC0fkC00WEAAu9RCXU=";
-    batctl = "sha256-cERLGCyF0MJxTZFFdBJJgIAbt0PRYm7iehefoiBm/cI=";
-    batman-adv = "sha256-vggjoJNr9Z4q8tEVp+JjF/giC5mPSDMldGWvK2/+HOg=";
+    alfred = "sha256-g3VHVHjtHNQTnJAAF1p9FAfujdkZoLfJ2/fRUJWIBIU=";
+    batctl = "sha256-Vmqk/XQ1Xo1d0r0hwl6YzAaOd/0I4Z+AuOK17d58jmU=";
+    batman-adv = "sha256-YkkKj4tYwC6Bkhbz6WMkmYRkXT5GAVagQ7c/xT4k+G0=";
   };
 }

From cd137a9e2c258116b3e2626d6bbddaec5b4cebb4 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 24 Oct 2025 22:37:47 +0000
Subject: [PATCH 2499/6226] harlequin: 2.2.1 -> 2.3.0

Diff: https://github.com/tconbeer/harlequin/compare/v2.2.1...v2.3.0

Changelog: https://github.com/tconbeer/harlequin/releases/tag/v2.3.0
---
 pkgs/by-name/ha/harlequin/package.nix | 36 +++++----------------------
 1 file changed, 6 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix
index 186fa4ae2c04..4562f8e5fd88 100644
--- a/pkgs/by-name/ha/harlequin/package.nix
+++ b/pkgs/by-name/ha/harlequin/package.nix
@@ -10,40 +10,16 @@
   withPostgresAdapter ? true,
   withBigQueryAdapter ? true,
 }:
-let
-  # Using textual 5.3.0 to avoid error at runtime
-  # https://github.com/tconbeer/harlequin/issues/841
-  python = python3Packages.python.override {
-    self = python3Packages.python;
-    packageOverrides = self: super: {
-      textual = super.textual.overridePythonAttrs (old: rec {
-        version = "5.3.0";
-
-        src = fetchFromGitHub {
-          owner = "Textualize";
-          repo = "textual";
-          tag = "v${version}";
-          hash = "sha256-J7Sb4nv9wOl1JnR6Ky4XS9HZHABKtNKPB3uYfC/UGO4=";
-        };
-      });
-
-      textual-textarea = super.textual-textarea.overridePythonAttrs (old: {
-        pythonRelaxDeps = (old.pythonRelaxDeps or [ ]) ++ [ "textual" ];
-      });
-    };
-  };
-  pythonPackages = python.pkgs;
-in
-pythonPackages.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "harlequin";
-  version = "2.2.1";
+  version = "2.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tconbeer";
     repo = "harlequin";
     tag = "v${version}";
-    hash = "sha256-uBHzoawvhEeRjcvm+R3nft37cEv+1sqx9crYUbC7pRo=";
+    hash = "sha256-CbbqbnspQ4XZmNpE1CmD+zg2okFRTx95gQUVUqoOq9U=";
   };
 
   pythonRelaxDeps = [
@@ -57,12 +33,12 @@ pythonPackages.buildPythonApplication rec {
     "tree-sitter-sql"
   ];
 
-  build-system = with pythonPackages; [ hatchling ];
+  build-system = with python3Packages; [ hatchling ];
 
   nativeBuildInputs = [ glibcLocales ];
 
   dependencies =
-    with pythonPackages;
+    with python3Packages;
     [
       click
       duckdb
@@ -94,7 +70,7 @@ pythonPackages.buildPythonApplication rec {
     updateScript = nix-update-script { };
   };
 
-  nativeCheckInputs = with pythonPackages; [
+  nativeCheckInputs = with python3Packages; [
     pytest-asyncio
     pytestCheckHook
     versionCheckHook

From 7fda7553e5121ca64334c29d40bbf19bd115bfe9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 24 Oct 2025 22:41:00 +0000
Subject: [PATCH 2500/6226] python3Packages.timm: 1.0.20 -> 1.0.21

Diff: https://github.com/huggingface/pytorch-image-models/compare/v1.0.20...v1.0.21

Changelog: https://github.com/huggingface/pytorch-image-models/blob/v1.0.21/README.md#whats-new
---
 pkgs/development/python-modules/timm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix
index a6d4f8636326..12aa93b3c876 100644
--- a/pkgs/development/python-modules/timm/default.nix
+++ b/pkgs/development/python-modules/timm/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "timm";
-  version = "1.0.20";
+  version = "1.0.21";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "pytorch-image-models";
     tag = "v${version}";
-    hash = "sha256-OdbhL7vDeNMCEROfEI37T162k5iQ02Qdcwr3aObVqPQ=";
+    hash = "sha256-8TYK6bTaCBFpnIwiOWTzz4Rk9P37tu0XzvRIVlH+b1Q=";
   };
 
   build-system = [ pdm-backend ];

From 5718392006caa0540397deae999c1a4b4b15410f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 22:44:47 +0000
Subject: [PATCH 2501/6226] codebuff: 1.0.502 -> 1.0.506

---
 pkgs/by-name/co/codebuff/package-lock.json | 8 ++++----
 pkgs/by-name/co/codebuff/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/co/codebuff/package-lock.json b/pkgs/by-name/co/codebuff/package-lock.json
index 583fda7eb3e0..513b3e924bd2 100644
--- a/pkgs/by-name/co/codebuff/package-lock.json
+++ b/pkgs/by-name/co/codebuff/package-lock.json
@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "codebuff": "^1.0.502"
+        "codebuff": "^1.0.506"
       }
     },
     "node_modules/chownr": {
@@ -18,9 +18,9 @@
       }
     },
     "node_modules/codebuff": {
-      "version": "1.0.502",
-      "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.502.tgz",
-      "integrity": "sha512-gI1e7Hf+gnZux9O+NjhkGrR9kXltycLEvwMmULJ+2t72mk1bvDrCjRuzIZ5AFWxUeZsCj/rVtBpoJail9Qz7Og==",
+      "version": "1.0.506",
+      "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.506.tgz",
+      "integrity": "sha512-9iviqvCGCd6JB3POccbRkaW05NlhTrh1mHDC9UX5nkGDhge9DRUMpjwycg/IX4OsWPdSvR6dkW4p5cLvy1/8OQ==",
       "cpu": [
         "x64",
         "arm64"
diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix
index 8cb7214c6d23..51872f011859 100644
--- a/pkgs/by-name/co/codebuff/package.nix
+++ b/pkgs/by-name/co/codebuff/package.nix
@@ -6,14 +6,14 @@
 
 buildNpmPackage rec {
   pname = "codebuff";
-  version = "1.0.502";
+  version = "1.0.506";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz";
-    hash = "sha256-2bskaDG7T/27Re1X4ZXsUrcu1WBb1+iuVcAOqWBRw8w=";
+    hash = "sha256-T+cevGbgTvZGdy8l2C5m3By9WhHIEZ1n2MOhxWzN1Hg=";
   };
 
-  npmDepsHash = "sha256-zqtV6AB2N8M9WqVc1JpfEOIoAyxoVEY3zO7WQiwwpQc=";
+  npmDepsHash = "sha256-hGMhkbVpG8ed0VS1gm8VPPGaEq7LapjF/MXS7mUO0HU=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From e949f530c6d28e5c2cf3603b28136b60991a997d Mon Sep 17 00:00:00 2001
From: Carl Andersson <git@lillecarl.com>
Date: Sat, 25 Oct 2025 00:03:48 +0200
Subject: [PATCH 2502/6226] etcd: 3.5.22 -> 3.5.24

Builds with 1.24.9 according to https://github.com/etcd-io/etcd/blob/main/CHANGELOG/CHANGELOG-3.5.md#v3524-2025-10-22
Removes patching

Fixes #454788
---
 pkgs/servers/etcd/3_5/default.nix | 40 ++++++++++++-------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/pkgs/servers/etcd/3_5/default.nix b/pkgs/servers/etcd/3_5/default.nix
index c7a96d2af453..5ca80ba041c5 100644
--- a/pkgs/servers/etcd/3_5/default.nix
+++ b/pkgs/servers/etcd/3_5/default.nix
@@ -1,8 +1,6 @@
 {
-  applyPatches,
-  buildGoModule,
+  buildGo124Module,
   fetchFromGitHub,
-  fetchpatch,
   k3s,
   lib,
   nixosTests,
@@ -10,27 +8,19 @@
 }:
 
 let
-  version = "3.5.22";
-  etcdSrcHash = "sha256-tS1IFMxfb8Vk9HJTAK+BGPZiVE3ls4Q2DQSerALOQCc=";
-  etcdServerVendorHash = "sha256-ul3R0c6RoCqLvlD2dfso1KwfHjsHfzQiUVJZJmz28ks=";
-  etcdUtlVendorHash = "sha256-S2pje2fTDaZwf6jnyE2YXWcs/fgqF51nxCVfEwg0Gsw=";
-  etcdCtlVendorHash = "sha256-lZ6o0oWUsc3WiCa87ynm7UAG6VxTf81a301QMSPOvW0=";
+  version = "3.5.24";
+  etcdSrcHash = "sha256-8qzgMiA/ATSFR5XTzWQhK1SmykHkT/FqBNG0RO93H9w=";
+  etcdServerVendorHash = "sha256-yCazbIcCOuabYDu7Tl0UTx47UiF/Rhg5O6r2kb+w4SY=";
+  etcdUtlVendorHash = "sha256-v8JQmyvHhvz7l8i8kwXVX9sAylElVSUnxKD5oUwQDUw=";
+  etcdCtlVendorHash = "sha256-UNdomi/3Q92CEsUYkt49vFF1Dp1QIFGK7wF/08U3dio=";
 
-  src = applyPatches {
-    src = fetchFromGitHub {
-      owner = "etcd-io";
-      repo = "etcd";
-      tag = "v${version}";
-      hash = etcdSrcHash;
-    };
-
-    patches = [
-      (fetchpatch {
-        url = "https://github.com/etcd-io/etcd/commit/31650ab0c8df43af05fc4c13b48ffee59271eec7.patch";
-        hash = "sha256-Q94HOLFx2fnb61wMQsAUT4sIBXfxXqW9YEayukQXX18=";
-      })
-    ];
+  src = fetchFromGitHub {
+    owner = "etcd-io";
+    repo = "etcd";
+    tag = "v${version}";
+    hash = etcdSrcHash;
   };
+
   env = {
     CGO_ENABLED = 0;
   };
@@ -45,7 +35,7 @@ let
     platforms = platforms.darwin ++ platforms.linux;
   };
 
-  etcdserver = buildGoModule {
+  etcdserver = buildGo124Module {
     pname = "etcdserver";
 
     inherit
@@ -72,7 +62,7 @@ let
     ldflags = [ "-X go.etcd.io/etcd/api/v3/version.GitSHA=GitNotFound" ];
   };
 
-  etcdutl = buildGoModule {
+  etcdutl = buildGo124Module {
     pname = "etcdutl";
 
     inherit
@@ -87,7 +77,7 @@ let
     modRoot = "./etcdutl";
   };
 
-  etcdctl = buildGoModule {
+  etcdctl = buildGo124Module {
     pname = "etcdctl";
 
     inherit

From 1af8f7cdda42a8e82f9cca8e8197d7e563edc5dc Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 24 Oct 2025 22:50:28 +0000
Subject: [PATCH 2503/6226] uutils-coreutils: 0.2.2 -> 0.3.0

Diff: https://github.com/uutils/coreutils/compare/0.2.2...0.3.0

Changelog: https://github.com/uutils/coreutils/releases/tag/0.3.0
---
 pkgs/by-name/uu/uutils-coreutils/package.nix     |  6 +++---
 .../uutils-coreutils/selinux_no_auto_detect.diff | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/uu/uutils-coreutils/package.nix b/pkgs/by-name/uu/uutils-coreutils/package.nix
index dfa3b0e8f117..1b1c2bf067df 100644
--- a/pkgs/by-name/uu/uutils-coreutils/package.nix
+++ b/pkgs/by-name/uu/uutils-coreutils/package.nix
@@ -21,19 +21,19 @@ assert selinuxSupport -> lib.meta.availableOn stdenv.hostPlatform libselinux;
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "uutils-coreutils";
-  version = "0.2.2";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "uutils";
     repo = "coreutils";
     tag = finalAttrs.version;
-    hash = "sha256-VcwdCi40Tm8J3t0qFSFGvRwW6B5cCDj1wm+H3i20axo=";
+    hash = "sha256-qvHNV3oy89CVR4LtrxFQJpev3yhHXy2Fh5PTik7Eo8g=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
     name = "uutils-coreutils-${finalAttrs.version}";
-    hash = "sha256-/QNOrfqdMviOVP1Fzorc6RAsgLDSKtg/MXfXJEzxwMc=";
+    hash = "sha256-yJHp8FCk7W6EDhO/MLrhui50RHW4GOwPQnQmfkdkWd8=";
   };
 
   patches = [
diff --git a/pkgs/by-name/uu/uutils-coreutils/selinux_no_auto_detect.diff b/pkgs/by-name/uu/uutils-coreutils/selinux_no_auto_detect.diff
index 1d76fbb412bf..5257c07d8756 100644
--- a/pkgs/by-name/uu/uutils-coreutils/selinux_no_auto_detect.diff
+++ b/pkgs/by-name/uu/uutils-coreutils/selinux_no_auto_detect.diff
@@ -1,10 +1,10 @@
 diff --git a/GNUmakefile b/GNUmakefile
-index 20dc731d3..400e5b84f 100644
+index e4bc5f435..b677d119c 100644
 --- a/GNUmakefile
 +++ b/GNUmakefile
-@@ -69,19 +69,6 @@ TOYBOX_SRC  := $(TOYBOX_ROOT)/toybox-$(TOYBOX_VER)
- #------------------------------------------------------------------------
- OS ?= $(shell uname -s)
+@@ -76,19 +76,6 @@ ifeq ($(OS),Windows_NT)
+ endif
+ LN ?= ln -sf
  
 -ifdef SELINUX_ENABLED
 -	override SELINUX_ENABLED := 0
@@ -21,8 +21,8 @@ index 20dc731d3..400e5b84f 100644
 -
  # Possible programs
  PROGS       := \
- 	base32 \
-@@ -200,8 +187,10 @@ endif
+ 	arch \
+@@ -224,8 +211,10 @@ endif
  
  ifneq ($(OS),Windows_NT)
  	PROGS := $(PROGS) $(UNIX_PROGS)
@@ -31,6 +31,6 @@ index 20dc731d3..400e5b84f 100644
 -	PROGS := $(PROGS) $(SELINUX_PROGS)
 +		PROGS := $(PROGS) $(SELINUX_PROGS)
 +	endif
- # Always use external libstdbuf when building with make (Unix only)
- 	CARGOFLAGS += --features feat_external_libstdbuf
  endif
+ 
+ UTILS ?= $(filter-out $(SKIP_UTILS),$(PROGS))

From 9533003603484c6d86a1f8269cefa1513137efbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 24 Oct 2025 15:31:40 -0700
Subject: [PATCH 2504/6226] python3Packages.aioairzone: 1.0.1 -> 1.0.2

Diff: https://github.com/Noltari/aioairzone/compare/1.0.1...1.0.2

Changelog: https://github.com/Noltari/aioairzone/releases/tag/1.0.2
---
 pkgs/development/python-modules/aioairzone/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/aioairzone/default.nix b/pkgs/development/python-modules/aioairzone/default.nix
index 296967728fd0..734ff01b2686 100644
--- a/pkgs/development/python-modules/aioairzone/default.nix
+++ b/pkgs/development/python-modules/aioairzone/default.nix
@@ -3,22 +3,19 @@
   aiohttp,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "aioairzone";
-  version = "1.0.1";
+  version = "1.0.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "Noltari";
     repo = "aioairzone";
     tag = version;
-    hash = "sha256-pFbX92UxhNcbHjU1Leoyr225Q6lCHT3hfv/mLSm7y2c=";
+    hash = "sha256-eNSsBlLn6Go+2gQ8IHEzFOQPRuJM8nLqwIaDvXLgthY=";
   };
 
   build-system = [ setuptools ];

From 10ff775efbd69b63cd8849f21ace824ca5e4597e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 24 Oct 2025 15:45:24 -0700
Subject: [PATCH 2505/6226] python3Packages.aioautomower: 2.2.2 -> 2.3.1

Diff: https://github.com/Thomas55555/aioautomower/compare/v2.2.2...v2.3.1

Changelog: https://github.com/Thomas55555/aioautomower/releases/tag/v2.3.1
---
 pkgs/development/python-modules/aioautomower/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix
index b612ede06c2c..693f150c9d22 100644
--- a/pkgs/development/python-modules/aioautomower/default.nix
+++ b/pkgs/development/python-modules/aioautomower/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "aioautomower";
-  version = "2.2.2";
+  version = "2.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "Thomas55555";
     repo = "aioautomower";
     tag = "v${version}";
-    hash = "sha256-ds/wNPaZYQ8Tk/GyqYrWYL99oU73JWc/3KBsMULBass=";
+    hash = "sha256-M0BAErX5S3BjP+YSv+j2m453T4+U4uHV6N0kWmc42ls=";
   };
 
   postPatch = ''

From 44d7eb31366dc86793612877d1cfd8a3d7517d79 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Oct 2025 19:27:36 +0200
Subject: [PATCH 2506/6226] python313Packages.holidays: 0.82 -> 0.83

Diff: https://github.com/vacanza/python-holidays/compare/v0.82...v0.83

Changelog: https://github.com/vacanza/python-holidays/releases/tag/v0.83
---
 pkgs/development/python-modules/holidays/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index 10e386867eca..b83ebb22b8fc 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "holidays";
-  version = "0.82";
+  version = "0.83";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "vacanza";
     repo = "python-holidays";
     tag = "v${version}";
-    hash = "sha256-H+qG9GqSPFODn0kWSIY/XJ1wAPI/iArCWR3yG+pFZXE=";
+    hash = "sha256-GlOydhDSg03uZUxLXDoaT/Jq3DMk+HsSxBtPQE9DQ3U=";
   };
 
   build-system = [

From 2f003f5be8b32857dc37659596656e8d176f5623 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Oct 2025 19:34:23 +0200
Subject: [PATCH 2507/6226] python313Packages.holidays: modernize

---
 pkgs/development/python-modules/holidays/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index b83ebb22b8fc..fcf735dd999c 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -8,7 +8,6 @@
   polib,
   pytestCheckHook,
   python-dateutil,
-  pythonOlder,
   setuptools,
 }:
 
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "0.83";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "vacanza";
     repo = "python-holidays";
@@ -57,12 +54,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "holidays" ];
 
-  meta = with lib; {
+  meta = {
     description = "Generate and work with holidays in Python";
     homepage = "https://github.com/vacanza/python-holidays";
     changelog = "https://github.com/vacanza/python-holidays/releases/tag/${src.tag}";
-    license = licenses.mit;
-    maintainers = with maintainers; [
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
       fab
       jluttine
     ];

From b14dabb63699291a8cc9fd56e039812a86c7a243 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 24 Oct 2025 15:36:07 -0700
Subject: [PATCH 2508/6226] python3Packages.pyprobeplus: 1.1.1 -> 1.1.2

Diff: https://github.com/pantherale0/pyprobeplus/compare/1.1.1...1.1.2

Changelog: https://github.com/pantherale0/pyprobeplus/releases/tag/1.1.2
---
 pkgs/development/python-modules/pyprobeplus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyprobeplus/default.nix b/pkgs/development/python-modules/pyprobeplus/default.nix
index 8e101a11d796..2e95175f44a3 100644
--- a/pkgs/development/python-modules/pyprobeplus/default.nix
+++ b/pkgs/development/python-modules/pyprobeplus/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pyprobeplus";
-  version = "1.1.1";
+  version = "1.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pantherale0";
     repo = "pyprobeplus";
     tag = version;
-    hash = "sha256-pD8o+Wb9X1yTMPh1eY1PwOc5KR2W5KoxDDQ/otHz6zI=";
+    hash = "sha256-CJbQs0xZHdXNPX71G1KrrHHV58gXaQsUHGcX9P8E+iY=";
   };
 
   build-system = [ setuptools ];

From 7220e7811a7e6b0e8aa4eae4a384e984de00f780 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 24 Oct 2025 15:29:56 -0700
Subject: [PATCH 2509/6226] home-assistant: 2025.10.3 -> 2025.10.4

Diff: https://github.com/home-assistant/core/compare/2025.10.3...2025.10.4

Changelog: https://github.com/home-assistant/core/releases/tag/2025.10.4
---
 pkgs/servers/home-assistant/component-packages.nix | 2 +-
 pkgs/servers/home-assistant/default.nix            | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index b3e71a10d3bb..f45e2ac8cbf4 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2025.10.3";
+  version = "2025.10.4";
   components = {
     "3_day_blinds" =
       ps: with ps; [
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 2c683a7cbda1..575e174a89a1 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -330,7 +330,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2025.10.3";
+  hassVersion = "2025.10.4";
 
 in
 python.pkgs.buildPythonApplication rec {
@@ -351,13 +351,13 @@ python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     tag = version;
-    hash = "sha256-b4yNS1uNoZSnTpYr3bVvSru/2KUe2d/xfe1tiAWibCg=";
+    hash = "sha256-CaS/37Pastpoeb6fXLiChVcQXNqVJMaXV04HGnNFlL0=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-BjPva2mxlArG9yDnk9PpjpdLiL2MA4Eeb8AP1nkoqKk=";
+    hash = "sha256-Ue1Aat8aSEXHUSIl2ji1cQaZEnVRgY7+PBHB9mQBJ6I=";
   };
 
   build-system = with python.pkgs; [

From bb7bd70090f4f8ceb570d9e1ba75741f981c1050 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 23:06:04 +0000
Subject: [PATCH 2510/6226] renode-dts2repl: 0-unstable-2025-09-30 ->
 0-unstable-2025-10-24

---
 pkgs/by-name/re/renode-dts2repl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix
index bb5a04aaa472..e21c24425717 100644
--- a/pkgs/by-name/re/renode-dts2repl/package.nix
+++ b/pkgs/by-name/re/renode-dts2repl/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication {
   pname = "renode-dts2repl";
-  version = "0-unstable-2025-09-30";
+  version = "0-unstable-2025-10-24";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "antmicro";
     repo = "dts2repl";
-    rev = "5035830ab3cdf39445f130f1c2630a444b598c1a";
-    hash = "sha256-J3SVS91TM+EdXCTLIS8Obd4f0qgZXe8EouCJ7Xt01po=";
+    rev = "84e0ab4e3eaebfde0debffd15c925c9c4d06d9f6";
+    hash = "sha256-1pOAeXaFna5rBCn2R+nVBUdZdpwAl4/1G+kE9tuXqII=";
   };
 
   nativeBuildInputs = [

From a938e2f7ea6c3e55d4d1b82f52e2f47038b73bcd Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Wed, 22 Oct 2025 02:32:00 +0800
Subject: [PATCH 2511/6226] python3Packages.fenics-ffcx: 0.9.0 -> 0.10.0

---
 pkgs/development/python-modules/fenics-ffcx/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/fenics-ffcx/default.nix b/pkgs/development/python-modules/fenics-ffcx/default.nix
index c0b212d7b01d..2ce03df4821e 100644
--- a/pkgs/development/python-modules/fenics-ffcx/default.nix
+++ b/pkgs/development/python-modules/fenics-ffcx/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
@@ -16,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "fenics-ffcx";
-  version = "0.9.0";
+  version = "0.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fenics";
     repo = "ffcx";
     tag = "v${version}";
-    hash = "sha256-eAV//RLbrxyhqgbZ2DiR7qML7xfgPn0/Seh+2no0x8w=";
+    hash = "sha256-i8fawnXWxIHfOvb0nK4/bzhrzfRJJACMCkFZKtdUwkU=";
   };
 
   pythonRelaxDeps = [
@@ -53,8 +52,6 @@ buildPythonPackage rec {
     addBinToPathHook
   ];
 
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-error=unused-command-line-argument";
-
   meta = {
     homepage = "https://fenicsproject.org";
     downloadPage = "https://github.com/fenics/ffcx";

From c0f391c5ec66d7ea28c264e0503bcca51b94b8e8 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Wed, 22 Oct 2025 02:57:48 +0800
Subject: [PATCH 2512/6226] slepc: shellHook -> setupHook

---
 pkgs/by-name/sl/slepc/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sl/slepc/package.nix b/pkgs/by-name/sl/slepc/package.nix
index 02a989552844..fa217811adff 100644
--- a/pkgs/by-name/sl/slepc/package.nix
+++ b/pkgs/by-name/sl/slepc/package.nix
@@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   pythonImportsCheck = [ "slepc4py" ];
 
-  shellHook = ./setup-hook.sh;
+  setupHook = ./setup-hook.sh;
 
   meta = {
     description = "Scalable Library for Eigenvalue Problem Computations";

From e3c7cc511b82cf28447250c7606ec3eea90e3aa1 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Wed, 22 Oct 2025 03:29:51 +0800
Subject: [PATCH 2513/6226] python3Packages.fenics-dolfinx: 0.9.0.post1 ->
 0.10.0.post1

---
 pkgs/by-name/do/dolfinx/package.nix             |  6 ++++--
 .../python-modules/fenics-dolfinx/default.nix   | 17 ++++-------------
 2 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/do/dolfinx/package.nix b/pkgs/by-name/do/dolfinx/package.nix
index 383b7132bb81..16a5b11a8364 100644
--- a/pkgs/by-name/do/dolfinx/package.nix
+++ b/pkgs/by-name/do/dolfinx/package.nix
@@ -12,6 +12,7 @@
   kahip,
   adios2,
   python3Packages,
+  darwinMinVersionHook,
   catch2_3,
   withParmetis ? false,
 }:
@@ -25,14 +26,14 @@ let
   );
 in
 stdenv.mkDerivation (finalAttrs: {
-  version = "0.9.0.post1";
+  version = "0.10.0.post1";
   pname = "dolfinx";
 
   src = fetchFromGitHub {
     owner = "fenics";
     repo = "dolfinx";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-4IIx7vUZeDwOGVdyC2PBvfhVjrmGZeVQKAwgDYScbY0=";
+    hash = "sha256-ZsaEcJdvsf3dxJ739/CU20+drjbAvuc/HkIGCfh9U5A=";
   };
 
   preConfigure = ''
@@ -48,6 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
     dolfinxPackages.kahip
     dolfinxPackages.scotch
   ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin (darwinMinVersionHook "13.3")
   ++ lib.optional withParmetis dolfinxPackages.parmetis;
 
   propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/fenics-dolfinx/default.nix b/pkgs/development/python-modules/fenics-dolfinx/default.nix
index 34f1bcd37087..f37135fffab6 100644
--- a/pkgs/development/python-modules/fenics-dolfinx/default.nix
+++ b/pkgs/development/python-modules/fenics-dolfinx/default.nix
@@ -16,6 +16,7 @@
 
   # buildInputs
   dolfinx,
+  darwinMinVersionHook,
 
   # dependency
   numpy,
@@ -63,7 +64,6 @@ buildPythonPackage rec {
   pyproject = true;
 
   pythonRelaxDeps = [
-    "cffi"
     "fenics-ufl"
   ];
 
@@ -87,7 +87,8 @@ buildPythonPackage rec {
 
   buildInputs = [
     fenicsPackages.dolfinx
-  ];
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin (darwinMinVersionHook "13.3");
 
   dependencies = [
     numpy
@@ -102,8 +103,6 @@ buildPythonPackage rec {
     (mpi4py.override { inherit (fenicsPackages) mpi; })
   ];
 
-  doCheck = true;
-
   nativeCheckInputs = [
     scipy
     matplotlib
@@ -113,21 +112,13 @@ buildPythonPackage rec {
   ];
 
   preCheck = ''
-    rm -rf dolfinx
+    cd test
   '';
 
   pythonImportsCheck = [
     "dolfinx"
   ];
 
-  disabledTests = [
-    # require cffi<1.17
-    "test_cffi_expression"
-    "test_hexahedron_mesh"
-    # https://github.com/FEniCS/dolfinx/issues/1104
-    "test_cube_distance"
-  ];
-
   passthru = {
     tests = {
       complex = fenics-dolfinx.override {

From 052419cfd064a6c62ae8a710e06f9e357a3fe9a3 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Mon, 20 Oct 2025 04:50:06 +0800
Subject: [PATCH 2514/6226] python3Packages.pyprecice: 3.2.1 -> 3.3.1

Changelog: https://github.com/precice/python-bindings/releases/tag/v3.3.1
---
 .../python-modules/pyprecice/default.nix      | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/pyprecice/default.nix b/pkgs/development/python-modules/pyprecice/default.nix
index 01b60f0e6ceb..574a91cc8e6e 100644
--- a/pkgs/development/python-modules/pyprecice/default.nix
+++ b/pkgs/development/python-modules/pyprecice/default.nix
@@ -5,9 +5,9 @@
 
   # build-system
   cython,
-  pip,
   pkgconfig,
   setuptools,
+  setuptools-git-versioning,
 
   # dependencies
   mpi4py,
@@ -17,38 +17,38 @@
 
 buildPythonPackage rec {
   pname = "pyprecice";
-  version = "3.2.1";
+  version = "3.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "precice";
     repo = "python-bindings";
     tag = "v${version}";
-    hash = "sha256-8AM2wbPX54UaMO4MzLOV0TljLTAPOqR9gUbtT2McNjs=";
+    hash = "sha256-NkTrMZ7UKB5O2jIlhLhgkOm8ZeWJA1FoursA1df7XOk=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools>=61,<72" "setuptools"
-  '';
-
   build-system = [
     cython
-    pip
     pkgconfig
     setuptools
+    setuptools-git-versioning
   ];
 
   dependencies = [
     numpy
     mpi4py
+  ];
+
+  buildInputs = [
     precice
   ];
 
-  # Disable Test because everything depends on open mpi which requires network
+  # no official test instruction
   doCheck = false;
 
-  # Do not use pythonImportsCheck because this will also initialize mpi which requires a network interface
+  pythonImportsCheck = [
+    "precice"
+  ];
 
   meta = {
     description = "Python language bindings for preCICE";

From 939b5a9d4b48b90d205b308fbb0f2c682a49a7c7 Mon Sep 17 00:00:00 2001
From: Mauricio Collares <mauricio@collares.org>
Date: Fri, 24 Oct 2025 20:17:40 -0300
Subject: [PATCH 2515/6226] python3Packages.gmpy2: handle Python 3.13.8's new
 to_bytes behavior

---
 pkgs/development/python-modules/gmpy2/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix
index 8bf54bc24bc3..ff9b834ca501 100644
--- a/pkgs/development/python-modules/gmpy2/default.nix
+++ b/pkgs/development/python-modules/gmpy2/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
   isPyPy,
   setuptools,
   gmp,
@@ -30,6 +31,14 @@ buildPythonPackage rec {
     hash = "sha256-wrMN3kqLnjItoybKYeo4Pp2M0uma7Kg0JEQM8lr6OI0=";
   };
 
+  patches = [
+    (fetchpatch2 {
+      name = "fix-to_bytes-tests.patch";
+      url = "https://github.com/aleaxit/gmpy/commit/1903841667e7a6842bdead90bd7798b99de5b7be.patch?full_index=1";
+      hash = "sha256-rlssUIkQ1RCRSu5eCXKJ2lNa/oIoLzf9sxJuNfDrVmk=";
+    })
+  ];
+
   build-system = [ setuptools ];
 
   buildInputs = [

From d4f70867612c2f3a0b159366a0fa490cc929804b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 23:19:22 +0000
Subject: [PATCH 2516/6226] vgmtools: 0.1-unstable-2025-08-20 ->
 0.1-unstable-2025-10-22

---
 pkgs/by-name/vg/vgmtools/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vg/vgmtools/package.nix b/pkgs/by-name/vg/vgmtools/package.nix
index f71bec903e13..ce0e16aadba4 100644
--- a/pkgs/by-name/vg/vgmtools/package.nix
+++ b/pkgs/by-name/vg/vgmtools/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation {
   pname = "vgmtools";
-  version = "0.1-unstable-2025-08-20";
+  version = "0.1-unstable-2025-10-22";
 
   src = fetchFromGitHub {
     owner = "vgmrips";
     repo = "vgmtools";
-    rev = "7e071f9fff11031e6bbe3ccc73d180be08727804";
-    hash = "sha256-GTdMLDGVAeV4aIrnKYc/NE1FVU5DS1TspeTcx4qwUQA=";
+    rev = "606db7fa229389b80bccb4c6e28b3d71dfddc984";
+    hash = "sha256-kOkBIN1/FG6snpriLiu8ZMqGa2MXOC79zUZwGrMyk/A=";
   };
 
   nativeBuildInputs = [

From 9dd1fc3b06b853d5d8e870674a52a3c372b51bd5 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Sat, 25 Oct 2025 01:25:40 +0200
Subject: [PATCH 2517/6226] wasmtime: 38.0.1 -> 38.0.3

---
 pkgs/by-name/wa/wasmtime/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/wasmtime/package.nix b/pkgs/by-name/wa/wasmtime/package.nix
index 28e6b2958b4f..3788dee242c9 100644
--- a/pkgs/by-name/wa/wasmtime/package.nix
+++ b/pkgs/by-name/wa/wasmtime/package.nix
@@ -13,20 +13,20 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wasmtime";
-  version = "38.0.1";
+  version = "38.0.3";
 
   src = fetchFromGitHub {
     owner = "bytecodealliance";
     repo = "wasmtime";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Arb4wUIJx3OyE8wbshotpy5Br7ZHHA7zXP98uGm/gyo=";
+    hash = "sha256-eszpPYtueCuAMIVrWKagS1qFCWGd0rVFTsCqRYaSGu4=";
     fetchSubmodules = true;
   };
 
   # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.
   auditable = false;
 
-  cargoHash = "sha256-ZF+uaMjhBMdLPp8TP4DnPB23igOE92YuhQ1US65NNRk=";
+  cargoHash = "sha256-agTF0GszX1f6oqo9oIPMD/GSmwbL8Ovg52TmtPq/z78=";
   cargoBuildFlags = [
     "--package"
     "wasmtime-cli"

From 9d86e39babaad9961b726d0fc0b210421a4470fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 23:26:30 +0000
Subject: [PATCH 2518/6226] python3Packages.snakemake: 9.13.2 -> 9.13.4

---
 pkgs/by-name/sn/snakemake/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sn/snakemake/package.nix b/pkgs/by-name/sn/snakemake/package.nix
index 8311043ad298..b039621ce98a 100644
--- a/pkgs/by-name/sn/snakemake/package.nix
+++ b/pkgs/by-name/sn/snakemake/package.nix
@@ -10,14 +10,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "snakemake";
-  version = "9.13.2";
+  version = "9.13.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake";
     tag = "v${version}";
-    hash = "sha256-7XEs+BTy6xPQidbuafrzELvfNjpzU9RcatXpRwHZ+1A=";
+    hash = "sha256-SNI9MS1rQ7G27HBeORQ83JOCaCNgp+6h5GeK6sXU2Lg=";
   };
 
   postPatch = ''

From 828686b4041ffc47f2df4925ecb19501bb9aac14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Fri, 24 Oct 2025 10:46:58 -0400
Subject: [PATCH 2519/6226] waydroid: add nftables support

---
 pkgs/by-name/wa/waydroid/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/wa/waydroid/package.nix b/pkgs/by-name/wa/waydroid/package.nix
index 7c69c637fe9c..4d6920f37407 100644
--- a/pkgs/by-name/wa/waydroid/package.nix
+++ b/pkgs/by-name/wa/waydroid/package.nix
@@ -12,11 +12,13 @@
   lxc,
   iproute2,
   iptables,
+  nftables,
   util-linux,
   wrapGAppsHook3,
   wl-clipboard,
   runtimeShell,
   nix-update-script,
+  withNftables ? false,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -65,6 +67,10 @@ python3Packages.buildPythonApplication rec {
     "USE_SYSTEMD=0"
     "SYSCONFDIR=$(out)/etc"
   ];
+  postInstall = lib.optionalString withNftables ''
+    substituteInPlace $out/lib/waydroid/data/scripts/waydroid-net.sh \
+      --replace-fail 'LXC_USE_NFT="false"' 'LXC_USE_NFT="true"'
+  '';
 
   preFixup = ''
     makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
@@ -76,7 +82,7 @@ python3Packages.buildPythonApplication rec {
           dnsmasq
           getent
           iproute2
-          iptables
+          (if withNftables then nftables else iptables)
         ]
       }
 

From 1fec77ff0339bae6ab8d9ba9cf32be4fb13477f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Fri, 24 Oct 2025 10:48:56 -0400
Subject: [PATCH 2520/6226] waydroid-nftables: init

---
 doc/release-notes/rl-2511.section.md | 2 ++
 pkgs/top-level/all-packages.nix      | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 77bdf0b9bdaf..68af70fe5783 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -294,6 +294,8 @@
 
 - `forgejo-runner`: The upgrade to version 11 brings a license change from MIT to GPLv3-or-later.
 
+- `waydroid-nftables`: New variant of `waydroid` that supports nftables instead of iptables.
+
 - `lisp-modules` were brought in sync with the [June 2025 Quicklisp release](http://blog.quicklisp.org/2025/07/june-2025-quicklisp-dist-now-available.html).
 
 - `ffmpeg_8`, `ffmpeg_8-headless`, and `ffmpeg_8-full` have been added. The default version of FFmpeg remains ffmpeg_7 for now, though this may change before release.
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 46202b57e9a7..516072da033e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1133,6 +1133,8 @@ with pkgs;
 
   vprof = with python3Packages; toPythonApplication vprof;
 
+  waydroid-nftables = waydroid.override { withNftables = true; };
+
   winbox = winbox3;
   winbox3 = callPackage ../tools/admin/winbox {
     wine = wineWowPackages.stable;

From 098c4d08d7dff9673a1cf1af6b477b3595932f10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Fri, 24 Oct 2025 19:36:13 -0400
Subject: [PATCH 2521/6226] nixos/waydroid: use waydroid-nftables by default if
 nftables is enabled

---
 nixos/doc/manual/release-notes/rl-2511.section.md | 2 ++
 nixos/modules/virtualisation/waydroid.nix         | 5 ++++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 9189ed2088c8..33eaeeec5cec 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -305,6 +305,8 @@ and [release notes for v18](https://goteleport.com/docs/changelog/#1800-070325).
 
 - `vmalert` now supports multiple instances with the option `services.vmalert.instances."".enable`
 
+- [`virtualisation.waydroid.package`](#opt-virtualisation.waydroid.package) now defaults to `waydroid-nftables` on systems with nftables enabled.
+
 - [`services.victorialogs.package`](#opt-services.victorialogs.package) now defaults to `victorialogs`, as `victoriametrics` no longer contains the VictoriaLogs binaries.
 
 - The `services.traccar.settings` attribute has been reworked. Instead of the previous flat attribute set the new implementation uses nested attribute sets. You need to update you configuration manually. For instance, `services.traccar.settings.loggerConsole` becomes `services.traccar.settings.logger.console`.
diff --git a/nixos/modules/virtualisation/waydroid.nix b/nixos/modules/virtualisation/waydroid.nix
index a26bddc393ae..706ee115ba8c 100644
--- a/nixos/modules/virtualisation/waydroid.nix
+++ b/nixos/modules/virtualisation/waydroid.nix
@@ -25,7 +25,10 @@ in
 
   options.virtualisation.waydroid = {
     enable = lib.mkEnableOption "Waydroid";
-    package = lib.mkPackageOption pkgs "waydroid" { };
+    package = lib.mkPackageOption pkgs "waydroid" { } // {
+      default = if config.networking.nftables.enable then pkgs.waydroid-nftables else pkgs.waydroid;
+      defaultText = lib.literalExpression ''if config.networking.nftables.enable then pkgs.waydroid-nftables else pkgs.waydroid'';
+    };
   };
 
   config = lib.mkIf cfg.enable {

From eefac3fff41592c1af9341762eabecac3f4d4fa8 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Fri, 24 Oct 2025 20:04:31 -0400
Subject: [PATCH 2522/6226] firefox: add booxter as maintainer

---
 .../networking/browsers/firefox/packages/firefox.nix         | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
index 4718b256ce42..0aa499a963d8 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
@@ -19,7 +19,10 @@ buildMozillaMach rec {
     changelog = "https://www.mozilla.org/en-US/firefox/${version}/releasenotes/";
     description = "Web browser built from Firefox source tree";
     homepage = "http://www.mozilla.com/en-US/firefox/";
-    maintainers = with lib.maintainers; [ hexa ];
+    maintainers = with lib.maintainers; [
+      booxter # darwin
+      hexa
+    ];
     platforms = lib.platforms.unix;
     broken = stdenv.buildPlatform.is32bit;
     # since Firefox 60, build on 32-bit platforms fails with "out of memory".

From 64da6dbca5086ae247e2b57137cf360955db5bb6 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Fri, 24 Oct 2025 20:04:45 -0400
Subject: [PATCH 2523/6226] thunderbird: add booxter as maintainer

---
 .../applications/networking/mailreaders/thunderbird/packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
index 7e2698aee6da..2daec752a2ff 100644
--- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
+++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix
@@ -59,6 +59,7 @@ let
         homepage = "https://thunderbird.net/";
         mainProgram = "thunderbird";
         maintainers = with lib.maintainers; [
+          booxter # darwin
           lovesegfault
           pierron
           vcunat

From 10116045ccd0a32d878adb3626da8a5b6d6cad82 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 00:09:36 +0000
Subject: [PATCH 2524/6226] vimPlugins.avante-nvim: 0.0.27-unstable-2025-10-18
 -> 0.0.27-unstable-2025-10-22

---
 .../vim/plugins/non-generated/avante-nvim/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
index 492b9c5f6a5b..a2d0940a2056 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
@@ -12,12 +12,12 @@
   pkgs,
 }:
 let
-  version = "0.0.27-unstable-2025-10-18";
+  version = "0.0.27-unstable-2025-10-22";
   src = fetchFromGitHub {
     owner = "yetone";
     repo = "avante.nvim";
-    rev = "cc7a41262e4dc38003b7578c3553a75c0ec4b8d2";
-    hash = "sha256-L6fOo3OPfMtClmyGW1Bn7YDJtuTKO6F66D1oYsii5so=";
+    rev = "164a86db6e5da78bc42310691a26b22d0763ceca";
+    hash = "sha256-hNKkb0PdKPC2m1a0stgCkAxk2P4uL8WiqiGpOY79Efo=";
   };
   avante-nvim-lib = rustPlatform.buildRustPackage {
     pname = "avante-nvim-lib";

From b492a2431486ffeeb17b48594a500b82173ffe2f Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss@proton.me>
Date: Thu, 16 Oct 2025 16:55:10 +0300
Subject: [PATCH 2525/6226] slumber: 4.1.0 -> 4.2.0

---
 pkgs/by-name/sl/slumber/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix
index 79d12bfbe85c..e3760ae1dd59 100644
--- a/pkgs/by-name/sl/slumber/package.nix
+++ b/pkgs/by-name/sl/slumber/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "slumber";
-  version = "4.1.0";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "LucasPickering";
     repo = "slumber";
     tag = "v${version}";
-    hash = "sha256-JPKzubGwtXV7CmuPqEIvFKPoug17Z4Jeg+dgIBMTOU4=";
+    hash = "sha256-wEQPyp0J7p2TuJwH/fQv5fhenUY3MNIq0oazFJAj9lM=";
   };
 
-  cargoHash = "sha256-1ReNwfV1M8k5pGeXBvd28UEKfys0ylraP4Q0AoL/L5Y=";
+  cargoHash = "sha256-Nz/Z2KJ8jJAsTASwnvleRpJ88UHGe7dktO0FkCOPdu4=";
 
   meta = {
     description = "Terminal-based HTTP/REST client";

From 1c9710063c8219e5f5a0ee87609faccee2e8707b Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss@proton.me>
Date: Thu, 16 Oct 2025 16:55:57 +0300
Subject: [PATCH 2526/6226] slumber: remove rec

---
 pkgs/by-name/sl/slumber/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix
index e3760ae1dd59..c9f0edbb47d3 100644
--- a/pkgs/by-name/sl/slumber/package.nix
+++ b/pkgs/by-name/sl/slumber/package.nix
@@ -4,14 +4,14 @@
   rustPlatform,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "slumber";
   version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "LucasPickering";
     repo = "slumber";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-wEQPyp0J7p2TuJwH/fQv5fhenUY3MNIq0oazFJAj9lM=";
   };
 
@@ -20,9 +20,9 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Terminal-based HTTP/REST client";
     homepage = "https://slumber.lucaspickering.me";
-    changelog = "https://github.com/LucasPickering/slumber/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/LucasPickering/slumber/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     mainProgram = "slumber";
     maintainers = with lib.maintainers; [ javaes ];
   };
-}
+})

From bf3af1ab33b5bb45ad0483711600546fd27b9800 Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss@proton.me>
Date: Thu, 16 Oct 2025 16:58:15 +0300
Subject: [PATCH 2527/6226] slumber: add version check hook, update script

---
 pkgs/by-name/sl/slumber/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/sl/slumber/package.nix b/pkgs/by-name/sl/slumber/package.nix
index c9f0edbb47d3..f412ef12f5e0 100644
--- a/pkgs/by-name/sl/slumber/package.nix
+++ b/pkgs/by-name/sl/slumber/package.nix
@@ -2,6 +2,8 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
+  versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -17,6 +19,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-Nz/Z2KJ8jJAsTASwnvleRpJ88UHGe7dktO0FkCOPdu4=";
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Terminal-based HTTP/REST client";
     homepage = "https://slumber.lucaspickering.me";

From 007307973c7183cc2d529b83b1a1e81e14b85ebe Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Sat, 25 Oct 2025 01:45:40 +0100
Subject: [PATCH 2528/6226] nixos/tests/immich-vectorchord-reindex: init

---
 nixos/tests/all-tests.nix                     |  1 +
 .../web-apps/immich-vectorchord-reindex.nix   | 74 +++++++++++++++++++
 pkgs/by-name/im/immich/package.nix            |  2 +-
 3 files changed, 76 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/web-apps/immich-vectorchord-reindex.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 3af4002a6aa2..198cbba66966 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -733,6 +733,7 @@ in
   immich = runTest ./web-apps/immich.nix;
   immich-public-proxy = runTest ./web-apps/immich-public-proxy.nix;
   immich-vectorchord-migration = runTest ./web-apps/immich-vectorchord-migration.nix;
+  immich-vectorchord-reindex = runTest ./web-apps/immich-vectorchord-reindex.nix;
   incron = runTest ./incron.nix;
   incus = pkgs.recurseIntoAttrs (
     handleTest ./incus {
diff --git a/nixos/tests/web-apps/immich-vectorchord-reindex.nix b/nixos/tests/web-apps/immich-vectorchord-reindex.nix
new file mode 100644
index 000000000000..65cd403feca7
--- /dev/null
+++ b/nixos/tests/web-apps/immich-vectorchord-reindex.nix
@@ -0,0 +1,74 @@
+{ ... }:
+{
+  name = "immich-vectorchord-reindex";
+
+  nodes.machine =
+    { lib, pkgs, ... }:
+    {
+      # These tests need a little more juice
+      virtualisation = {
+        cores = 2;
+        memorySize = 2048;
+        diskSize = 4096;
+      };
+
+      services.immich = {
+        enable = true;
+        environment.IMMICH_LOG_LEVEL = "verbose";
+      };
+
+      services.postgresql.extensions = lib.mkForce (ps: [
+        ps.pgvector
+        # pin vectorchord to an older version simulate version bump
+        (ps.vectorchord.overrideAttrs (prevAttrs': rec {
+          version = "0.5.2";
+          src = pkgs.fetchFromGitHub {
+            owner = "tensorchord";
+            repo = "vectorchord";
+            tag = version;
+            hash = "sha256-KGwiY5t1ivFiYex3D20y3sdiu3CT9LCDd2fPnRE56jM=";
+          };
+
+          cargoDeps = pkgs.rustPlatform.fetchCargoVendor {
+            inherit src;
+            hash = "sha256-Vn3c/xuUpQzERJ74I0qbvufTZtW3goefPa5B/nOUO48=";
+          };
+        }))
+      ]);
+
+      specialisation."immich-vectorchord-upgraded".configuration = {
+        # needs to be lower than mkForce, otherwise it does not get rid of the previous version
+        services.postgresql.extensions = lib.mkOverride 40 (ps: [
+          ps.pgvector
+          ps.vectorchord
+        ]);
+      };
+
+    };
+
+  testScript =
+    { nodes, ... }:
+    let
+      specBase = "${nodes.machine.system.build.toplevel}/specialisation";
+      vectorchordUpgraded = "${specBase}/immich-vectorchord-upgraded";
+    in
+    ''
+      def immich_works():
+        machine.wait_for_unit("immich-server.service")
+
+        machine.wait_for_open_port(2283) # Server
+        machine.wait_for_open_port(3003) # Machine learning
+        machine.succeed("curl --fail http://localhost:2283/")
+
+      immich_works()
+
+      machine.succeed("${vectorchordUpgraded}/bin/switch-to-configuration test")
+
+      # just tests that reindexing is triggered
+      machine.wait_until_succeeds(
+        "journalctl -o cat -u postgresql-setup.service | grep 'REINDEX'"
+      )
+
+      immich_works()
+    '';
+}
diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index 9ebb052dbb2f..a354d5dbbe5d 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -251,7 +251,7 @@ stdenv.mkDerivation {
 
   passthru = {
     tests = {
-      inherit (nixosTests) immich immich-vectorchord-migration;
+      inherit (nixosTests) immich immich-vectorchord-migration immich-vectorchord-reindex;
     };
 
     machine-learning = immich-machine-learning;

From 936c86ea0cf9a5dd82f12147a083e60f281b1165 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@users.noreply.github.com>
Date: Mon, 1 Sep 2025 09:39:37 -0700
Subject: [PATCH 2529/6226] ceph: compile with systemd support flag

---
 pkgs/by-name/ce/ceph/package.nix | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ce/ceph/package.nix b/pkgs/by-name/ce/ceph/package.nix
index 3003e8893957..e2b1d67d4759 100644
--- a/pkgs/by-name/ce/ceph/package.nix
+++ b/pkgs/by-name/ce/ceph/package.nix
@@ -107,6 +107,7 @@
 
   # Linux Only Dependencies
   linuxHeaders,
+  systemd,
   util-linux,
   libuuid,
   udev,
@@ -117,6 +118,7 @@
   libxfs ? null,
   liburing ? null,
   zfs ? null,
+  withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
 }:
 
 # We must have one crypto library
@@ -402,6 +404,20 @@ stdenv.mkDerivation {
       url = "https://gitlab.alpinelinux.org/ashpool/aports/-/raw/d22b70eafe33c3daabe4eea6913c5be87d9463ad/community/ceph19/cpp_redis.patch";
       hash = "sha256-wxPIsYt25CjXhJ6kmr/MXwFD58Sl4y4W+r9jAMND+uw=";
     })
+
+    # See:
+    # * <https://github.com/ceph/ceph/pull/55560>
+    # * <https://github.com/ceph/ceph/pull/60575>
+    (fetchpatch2 {
+      name = "ceph-systemd-sans-cluster-name.patch";
+      url = "https://github.com/ceph/ceph/commit/5659920c7c128cb8d9552580dbe23dd167a56c31.patch?full_index=1";
+      hash = "sha256-Uch8ZghyTowUvSq0p/RxiVpdG1Yqlww9inpVksO6zyk=";
+    })
+    (fetchpatch2 {
+      name = "ceph-systemd-prefix.patch";
+      url = "https://github.com/ceph/ceph/commit/9b38df488d7101b02afa834ea518fd52076d582a.patch?full_index=1";
+      hash = "sha256-VcbJhCGTUdNISBd6P96Mm5M3fFVmZ8r7pMl+srQmnIQ=";
+    })
   ];
 
   nativeBuildInputs = [
@@ -519,6 +535,9 @@ stdenv.mkDerivation {
     substituteInPlace src/client/fuse_ll.cc \
       --replace-fail "mount -i -o remount" "${util-linux}/bin/mount -i -o remount"
 
+    substituteInPlace systemd/*.service.in \
+      --replace-quiet "/bin/kill" "${util-linux}/bin/kill"
+
     substituteInPlace src/{ceph-osd-prestart.sh,ceph-post-file.in,init-ceph.in} \
        --replace-fail "GETOPT=/usr/local/bin/getopt" "GETOPT=${getopt}/bin/getopt" \
        --replace-fail "GETOPT=getopt" "GETOPT=${getopt}/bin/getopt"
@@ -532,7 +551,8 @@ stdenv.mkDerivation {
     "-DCMAKE_INSTALL_DATADIR=${placeholder "lib"}/lib"
 
     "-DWITH_CEPHFS_SHELL:BOOL=ON"
-    "-DWITH_SYSTEMD:BOOL=OFF"
+    "-DWITH_SYSTEMD:BOOL=${if withSystemd then "ON" else "OFF"}"
+    "-DSYSTEMD_SYSTEM_UNIT_DIR=${placeholder "out"}/lib/systemd/system"
     # `WITH_JAEGER` requires `thrift` as a depenedncy (fine), but the build fails with:
     #     CMake Error at src/opentelemetry-cpp-stamp/opentelemetry-cpp-build-Release.cmake:49 (message):
     #     Command failed: 2

From a9573affd8f546a45c025e2178da13241c1039f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 00:52:37 +0000
Subject: [PATCH 2530/6226] django-upgrade: 1.29.0 -> 1.29.1

---
 pkgs/by-name/dj/django-upgrade/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dj/django-upgrade/package.nix b/pkgs/by-name/dj/django-upgrade/package.nix
index 109d43977213..228db44bb066 100644
--- a/pkgs/by-name/dj/django-upgrade/package.nix
+++ b/pkgs/by-name/dj/django-upgrade/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "django-upgrade";
-  version = "1.29.0";
+  version = "1.29.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "adamchainz";
     repo = "django-upgrade";
     tag = version;
-    hash = "sha256-ALAwOm+j0Gpx3ZiO8nyTDrJNqR9WaFSxLxAgTarNQeM=";
+    hash = "sha256-NnVFMItWiTL82LMxDKeGofaestRBfZFVjTKFjbJFmmU=";
   };
 
   build-system = [ python3Packages.setuptools ];

From 5afffaa30fd74cbd61483e801241d181406d9909 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 00:56:16 +0000
Subject: [PATCH 2531/6226] python3Packages.ultralytics: 8.3.217 -> 8.3.221

---
 pkgs/development/python-modules/ultralytics/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ultralytics/default.nix b/pkgs/development/python-modules/ultralytics/default.nix
index fc6b924b7c8b..4ae7aecd7d08 100644
--- a/pkgs/development/python-modules/ultralytics/default.nix
+++ b/pkgs/development/python-modules/ultralytics/default.nix
@@ -33,14 +33,14 @@
 
 buildPythonPackage rec {
   pname = "ultralytics";
-  version = "8.3.217";
+  version = "8.3.221";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ultralytics";
     repo = "ultralytics";
     tag = "v${version}";
-    hash = "sha256-e/t+6sO9V+iwSxJUZ5VhP18DZSUOfm8jmlP9Pib/RyU=";
+    hash = "sha256-oQuiAq1QJlgrEDk26/+pcIifFBO/ckH1qG7niEXbMIo=";
   };
 
   build-system = [ setuptools ];

From 3488184ee710295168ebc83b1b9dce641005e9cc Mon Sep 17 00:00:00 2001
From: Farid Zakaria <farid.m.zakaria@gmail.com>
Date: Tue, 21 Oct 2025 08:37:46 -0700
Subject: [PATCH 2532/6226] kaitai-struct-cpp-stl-runtime: init at 0.11

Co-authored-by: Zexin Yuan <gh@yzx9.xyz>
---
 .../kaitai-struct-cpp-stl-runtime/package.nix | 73 +++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 pkgs/by-name/ka/kaitai-struct-cpp-stl-runtime/package.nix

diff --git a/pkgs/by-name/ka/kaitai-struct-cpp-stl-runtime/package.nix b/pkgs/by-name/ka/kaitai-struct-cpp-stl-runtime/package.nix
new file mode 100644
index 000000000000..07e1fb8a7eee
--- /dev/null
+++ b/pkgs/by-name/ka/kaitai-struct-cpp-stl-runtime/package.nix
@@ -0,0 +1,73 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  gtest,
+  zlib,
+  copyPkgconfigItems,
+  makePkgconfigItem,
+  lib,
+  testers,
+  ctestCheckHook,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "kaitai-struct-cpp-stl-runtime";
+  version = "0.11";
+
+  src = fetchFromGitHub {
+    owner = "kaitai-io";
+    repo = "kaitai_struct_cpp_stl_runtime";
+    tag = finalAttrs.version;
+    sha256 = "sha256-2glGPf08bkzvnkLpQIaG2qiy/yO+bZ14hjIaCKou2vU=";
+  };
+
+  doCheck = true;
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    copyPkgconfigItems
+    ctestCheckHook
+  ];
+
+  buildInputs = [
+    zlib
+    gtest
+  ];
+
+  strictDeps = true;
+
+  # https://github.com/kaitai-io/kaitai_struct_cpp_stl_runtime/issues/82
+  pkgconfigItems = [
+    (makePkgconfigItem rec {
+      name = "kaitai-struct-cpp-stl-runtime";
+      inherit (finalAttrs) version;
+      cflags = [ "-I${variables.includedir}" ];
+      libs = [
+        "-L${variables.libdir}"
+        "-lkaitai_struct_cpp_stl_runtime"
+      ];
+      variables = {
+        includedir = "${placeholder "dev"}/include";
+        libdir = "${placeholder "out"}/lib";
+      };
+      inherit (finalAttrs.meta) description;
+    })
+  ];
+
+  passthru = {
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  meta = {
+    pkgConfigModules = [ "kaitai-struct-cpp-stl-runtime" ];
+    description = "Kaitai Struct C++ STL Runtime Library";
+    homepage = "https://github.com/kaitai-io/kaitai_struct_cpp_stl_runtime";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fzakaria ];
+  };
+})

From a4b398b32983135fdf529839d18c8b5f767e3add Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 01:04:32 +0000
Subject: [PATCH 2533/6226] trealla: 2.83.18 -> 2.84.1

---
 pkgs/by-name/tr/trealla/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix
index 564f77dfc856..81f506b4df04 100644
--- a/pkgs/by-name/tr/trealla/package.nix
+++ b/pkgs/by-name/tr/trealla/package.nix
@@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [
 ];
 stdenv.mkDerivation (finalAttrs: {
   pname = "trealla";
-  version = "2.83.18";
+  version = "2.84.1";
 
   src = fetchFromGitHub {
     owner = "trealla-prolog";
     repo = "trealla";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8JaX/4W8olwLb1pU2qzqmqXFI1BgFPl+hsbEBqk5SF4=";
+    hash = "sha256-zbU0fdCqWafwUzF857jVHxHWPUChfNl4kAHuOKbkfaA=";
   };
 
   postPatch = ''

From 01fcfc8c8b2f9830f2fbc8ec330b8130ddd5e1f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 01:05:33 +0000
Subject: [PATCH 2534/6226] svtplay-dl: 4.137 -> 4.151

---
 pkgs/by-name/sv/svtplay-dl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sv/svtplay-dl/package.nix b/pkgs/by-name/sv/svtplay-dl/package.nix
index 350eb6bc22f8..5cc621dcb9df 100644
--- a/pkgs/by-name/sv/svtplay-dl/package.nix
+++ b/pkgs/by-name/sv/svtplay-dl/package.nix
@@ -22,7 +22,7 @@ let
     requests-mock
     ;
 
-  version = "4.137";
+  version = "4.151";
 
 in
 
@@ -35,7 +35,7 @@ buildPythonApplication {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    hash = "sha256-KBX2YfDyEu9nwlaZlOw+4FKy+hhLncVr8xhXn7XhvAU=";
+    hash = "sha256-MqV49Xi0pwP8kVXPPmOOYvZpQ6ZtWbeWZc+Qo0i30/g=";
   };
 
   build-system = [ setuptools ];

From 25aaea544f1255068ddbff4b9eb8cb3ee7b5d438 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 24 Oct 2025 22:17:15 -0300
Subject: [PATCH 2535/6226] smuview: fix build with cmake4

---
 pkgs/by-name/sm/smuview/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/sm/smuview/package.nix b/pkgs/by-name/sm/smuview/package.nix
index 3338e873b5bd..6bfedfac5d09 100644
--- a/pkgs/by-name/sm/smuview/package.nix
+++ b/pkgs/by-name/sm/smuview/package.nix
@@ -53,6 +53,15 @@ stdenv.mkDerivation {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez ];
 
+  postPatch = ''
+    substituteInPlace external/pybind11_2.11_dev1/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.4)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace external/QtFindReplaceDialog/dialogs/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace manual/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Qt based source measure unit GUI for sigrok";
     mainProgram = "smuview";

From 99a82700258a8c7df48c2b41d268a24640d6992f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 24 Oct 2025 18:20:00 -0700
Subject: [PATCH 2536/6226] qutebrowser: 3.5.1 -> 3.6.0

Diff: https://github.com/qutebrowser/qutebrowser/compare/v3.5.1...v3.6.0

Changelog: https://github.com/qutebrowser/qutebrowser/blob/v3.6.0/doc/changelog.asciidoc
---
 pkgs/by-name/qu/qutebrowser/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix
index e8ee8dc2f6cc..a6b143f65a2a 100644
--- a/pkgs/by-name/qu/qutebrowser/package.nix
+++ b/pkgs/by-name/qu/qutebrowser/package.nix
@@ -26,15 +26,15 @@ let
   isQt6 = lib.versions.major qt6Packages.qtbase.version == "6";
   pdfjs =
     let
-      version = "5.3.31";
+      version = "5.4.296";
     in
     fetchzip {
       url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip";
-      hash = "sha256-8QNFCIRSaF0y98P1mmx0u+Uf0/Zd7nYlFGXp9SkURTc=";
+      hash = "sha256-UQ7sYOh7s95mfzH2ZbfDyEvUZiXr7MI3u0WY8WNHWv4=";
       stripRoot = false;
     };
 
-  version = "3.5.1";
+  version = "3.6.0";
 in
 
 python3.pkgs.buildPythonApplication {
@@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication {
 
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz";
-    hash = "sha256-gmu6MooINXJI1eWob6qwpzZVSXQ5rVTSaeISBVkms44=";
+    hash = "sha256-XBtRjAiBvSMRFwdW1RZK2ZQnxwhzdjfK5O6SZrHUZ7w=";
   };
 
   # Needs tox

From fd29e89e92cd57f2dd61b9509116e652e6c73335 Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss@proton.me>
Date: Sat, 25 Oct 2025 04:23:13 +0300
Subject: [PATCH 2537/6226] sampo: init at 0.12.0

---
 pkgs/by-name/sa/sampo/package.nix | 49 +++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 pkgs/by-name/sa/sampo/package.nix

diff --git a/pkgs/by-name/sa/sampo/package.nix b/pkgs/by-name/sa/sampo/package.nix
new file mode 100644
index 000000000000..97c632438477
--- /dev/null
+++ b/pkgs/by-name/sa/sampo/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+  pkg-config,
+  openssl,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "sampo";
+  version = "0.12.0";
+
+  src = fetchFromGitHub {
+    owner = "bruits";
+    repo = "sampo";
+    tag = "sampo-v${finalAttrs.version}";
+    hash = "sha256-0E9dvyu6mGbuMH8Lf/rVTn3skVq9kaVjQG2eLH8a2IY=";
+  };
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ openssl ];
+
+  cargoHash = "sha256-gooShQWJY9UKYq99o7qhyz6ROK+VXYG2PpygdVWG0iM=";
+
+  cargoBuildFlags = [
+    "-p"
+    "sampo"
+  ];
+  cargoTestFlags = finalAttrs.cargoBuildFlags;
+
+  env.OPENSSL_NO_VENDOR = true;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Automate changelogs, versioning, and publishing—even for monorepos across multiple package registries";
+    homepage = "https://github.com/bruits/sampo";
+    changelog = "https://github.com/bruits/sampo/blob/sampo-v${finalAttrs.version}/crates/sampo/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nartsiss ];
+    mainProgram = "sampo";
+  };
+})

From 3ad5b986ba042e4b54988bbb5195bbfba08e6583 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sat, 2 Aug 2025 19:01:10 -0400
Subject: [PATCH 2538/6226] krane: 3.7.4 -> 3.8.1

---
 pkgs/by-name/kr/krane/Gemfile.lock | 43 ++++++++--------
 pkgs/by-name/kr/krane/gemset.nix   | 80 +++++++++++++-----------------
 2 files changed, 56 insertions(+), 67 deletions(-)

diff --git a/pkgs/by-name/kr/krane/Gemfile.lock b/pkgs/by-name/kr/krane/Gemfile.lock
index 575ec68cb184..3b24fe405760 100644
--- a/pkgs/by-name/kr/krane/Gemfile.lock
+++ b/pkgs/by-name/kr/krane/Gemfile.lock
@@ -1,14 +1,14 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (8.0.2)
+    activesupport (8.1.0)
       base64
-      benchmark (>= 0.3)
       bigdecimal
       concurrent-ruby (~> 1.0, >= 1.3.1)
       connection_pool (>= 2.2.5)
       drb
       i18n (>= 1.6, < 2)
+      json
       logger (>= 1.4.2)
       minitest (>= 5.1)
       securerandom (>= 0.3)
@@ -17,15 +17,14 @@ GEM
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
     base64 (0.3.0)
-    benchmark (0.4.1)
-    bigdecimal (3.2.2)
+    bigdecimal (3.3.1)
     colorize (0.8.1)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.3)
+    connection_pool (2.5.4)
     domain_name (0.6.20240107)
     drb (2.2.3)
     ejson (1.5.3)
-    faraday (2.13.2)
+    faraday (2.14.0)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
@@ -39,11 +38,11 @@ GEM
       base64 (~> 0.2)
       faraday (>= 1.0, < 3.a)
     google-logging-utils (0.2.0)
-    googleauth (1.14.0)
+    googleauth (1.15.1)
       faraday (>= 1.0, < 3.a)
       google-cloud-env (~> 2.2)
       google-logging-utils (~> 0.1)
-      jwt (>= 1.4, < 3.0)
+      jwt (>= 1.4, < 4.0)
       multi_json (~> 1.11)
       os (>= 0.9, < 2.0)
       signet (>= 0.16, < 2.a)
@@ -53,17 +52,17 @@ GEM
       http-form_data (~> 2.2)
       llhttp-ffi (~> 0.5.0)
     http-accept (1.7.0)
-    http-cookie (1.0.8)
+    http-cookie (1.1.0)
       domain_name (~> 0.5)
     http-form_data (2.3.0)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.12.2)
+    json (2.15.1)
     jsonpath (1.1.5)
       multi_json
-    jwt (2.10.2)
+    jwt (3.1.2)
       base64
-    krane (3.7.4)
+    krane (3.8.1)
       activesupport (>= 5.0)
       colorize (~> 0.8)
       concurrent-ruby (~> 1.1)
@@ -74,7 +73,7 @@ GEM
       multi_json
       statsd-instrument (>= 2.8, < 3.9)
       thor (>= 1.0, < 2.0)
-    kubeclient (4.12.0)
+    kubeclient (4.13.0)
       http (>= 3.0, < 6.0)
       jsonpath (~> 1.0)
       recursive-open-struct (~> 1.1, >= 1.1.1)
@@ -86,14 +85,14 @@ GEM
     mime-types (3.7.0)
       logger
       mime-types-data (~> 3.2025, >= 3.2025.0507)
-    mime-types-data (3.2025.0708)
-    minitest (5.25.5)
-    multi_json (1.16.0)
+    mime-types-data (3.2025.0924)
+    minitest (5.26.0)
+    multi_json (1.17.0)
     net-http (0.6.0)
       uri
     netrc (0.11.0)
     os (1.1.4)
-    ostruct (0.6.2)
+    ostruct (0.6.3)
     public_suffix (6.0.2)
     rake (13.3.0)
     recursive-open-struct (1.3.1)
@@ -104,16 +103,16 @@ GEM
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
     securerandom (0.4.1)
-    signet (0.20.0)
+    signet (0.21.0)
       addressable (~> 2.8)
       faraday (>= 0.17.5, < 3.a)
-      jwt (>= 1.5, < 3.0)
+      jwt (>= 1.5, < 4.0)
       multi_json (~> 1.10)
     statsd-instrument (3.8.0)
-    thor (1.3.2)
+    thor (1.4.0)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    uri (1.0.3)
+    uri (1.0.4)
 
 PLATFORMS
   ruby
@@ -122,4 +121,4 @@ DEPENDENCIES
   krane
 
 BUNDLED WITH
-   2.6.9
+   2.7.1
diff --git a/pkgs/by-name/kr/krane/gemset.nix b/pkgs/by-name/kr/krane/gemset.nix
index ca64d83b87ad..05c292060499 100644
--- a/pkgs/by-name/kr/krane/gemset.nix
+++ b/pkgs/by-name/kr/krane/gemset.nix
@@ -2,12 +2,12 @@
   activesupport = {
     dependencies = [
       "base64"
-      "benchmark"
       "bigdecimal"
       "concurrent-ruby"
       "connection_pool"
       "drb"
       "i18n"
+      "json"
       "logger"
       "minitest"
       "securerandom"
@@ -18,10 +18,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pm40y64wfc50a9sj87kxvil2102rmpdcbv82zf0r40vlgdwsrc5";
+      sha256 = "02h73s0cimsfx81vgkaw1jx4cnhp3gs6qslk2qmbqyxy4l3z9bfl";
       type = "gem";
     };
-    version = "8.0.2";
+    version = "8.1.0";
   };
   addressable = {
     dependencies = [ "public_suffix" ];
@@ -44,25 +44,15 @@
     };
     version = "0.3.0";
   };
-  benchmark = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1kicilpma5l0lwayqjb5577bm0hbjndj2gh150xz09xsgc1l1vyl";
-      type = "gem";
-    };
-    version = "0.4.1";
-  };
   bigdecimal = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1p2szbr4jdvmwaaj2kxlbv1rp0m6ycbgfyp0kjkkkswmniv5y21r";
+      sha256 = "0612spks81fvpv2zrrv3371lbs6mwd7w6g5zafglyk75ici1x87a";
       type = "gem";
     };
-    version = "3.2.2";
+    version = "3.3.1";
   };
   colorize = {
     groups = [ "default" ];
@@ -89,10 +79,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg";
+      sha256 = "02p7l47gvchbvnbag6kb4x2hg8n28r25ybslyvrr2q214wir5qg9";
       type = "gem";
     };
-    version = "2.5.3";
+    version = "2.5.4";
   };
   domain_name = {
     groups = [ "default" ];
@@ -134,10 +124,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "06ia9z1wxydn0nmddinnjr93qdv856gi3i87h0fycy5y7cp7c6aw";
+      sha256 = "1ka175ci0q9ylpcy651pjj580diplkaskycn4n7jcmbyv7jwz6c6";
       type = "gem";
     };
-    version = "2.13.2";
+    version = "2.14.0";
   };
   faraday-net_http = {
     dependencies = [ "net-http" ];
@@ -212,10 +202,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jai8xv2rmhz8nb6vxg4whq6aldmkbyjsn3hvk9w740qg48xxrv2";
+      sha256 = "096bsg1z4yyqxrdmnxdbb45g94dr2fb8hf2av40kcmqd7n4n06fn";
       type = "gem";
     };
-    version = "1.14.0";
+    version = "1.15.1";
   };
   http = {
     dependencies = [
@@ -249,10 +239,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19hsskzk5zpv14mnf07pq71hfk1fsjwfjcw616pgjjzjbi2f0kxi";
+      sha256 = "06dvmngd4hwrr6k774i1h6c50h2l8nww9f1id0wvrvi72l6yd99q";
       type = "gem";
     };
-    version = "1.0.8";
+    version = "1.1.0";
   };
   http-form_data = {
     groups = [ "default" ];
@@ -280,10 +270,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1x5b8ipv6g0z44wgc45039k04smsyf95h2m5m67mqq35sa5a955s";
+      sha256 = "128bp3mihh175l9wm7hgg9sdisp6hd3kf36fw01iksqnq7kv5hdi";
       type = "gem";
     };
-    version = "2.12.2";
+    version = "2.15.1";
   };
   jsonpath = {
     dependencies = [ "multi_json" ];
@@ -302,10 +292,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1x64l31nkqjwfv51s2vsm0yqq4cwzrlnji12wvaq761myx3fxq9i";
+      sha256 = "0dfm4bhl4fzn076igh0bmh2v1vphcrxdv6ldc46hdd3bkbqr2sdg";
       type = "gem";
     };
-    version = "2.10.2";
+    version = "3.1.2";
   };
   krane = {
     dependencies = [
@@ -324,10 +314,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pf71cvx3c57znasj2mr5fvia47iz6zhviy1yjz1wiqnd39bv85j";
+      sha256 = "0mgim57lx8dqdygzzy4qlmq2rmrh0hf8cz1ihx1zqm5477ywg4wj";
       type = "gem";
     };
-    version = "3.7.4";
+    version = "3.8.1";
   };
   kubeclient = {
     dependencies = [
@@ -340,10 +330,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1g89qd1hhf111zy9djlzblzz06pnv59zmamh6fk06wvnih7vj446";
+      sha256 = "14q6vsfrlmz1ja3p4qh58a5m2ljd24hmn33750rr7qb18jqndxji";
       type = "gem";
     };
-    version = "4.12.0";
+    version = "4.13.0";
   };
   llhttp-ffi = {
     dependencies = [
@@ -388,30 +378,30 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nxrxm1g02a049zcjv859pzjbkwy22ljlz97r6jd5n42scvb92ch";
+      sha256 = "0a27k4jcrx7pvb0p59fn1frh14iy087c2aygrdkmgwsrbshvqxpj";
       type = "gem";
     };
-    version = "3.2025.0708";
+    version = "3.2025.0924";
   };
   minitest = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr";
+      sha256 = "0c1c9lr7h0bnf48xj5sylg2cs2awrb0hfxwimiz4yfl6kz87m0gm";
       type = "gem";
     };
-    version = "5.25.5";
+    version = "5.26.0";
   };
   multi_json = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0dknzbz2awgwp09gkvbw0423r53bc8ziwchrg2g852crnqh327qi";
+      sha256 = "06sabsvnw0x1aqdcswc6bqrqz6705548bfd8z22jxgxfjrn1yn3n";
       type = "gem";
     };
-    version = "1.16.0";
+    version = "1.17.0";
   };
   net-http = {
     dependencies = [ "uri" ];
@@ -449,10 +439,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1h6gazp5837xbz1aqvq9x0a5ffpw32nhvknn931a4074k6i04wvd";
+      sha256 = "04nrir9wdpc4izqwqbysxyly8y7hsfr4fsv69rw91lfi9d5fv8lm";
       type = "gem";
     };
-    version = "0.6.2";
+    version = "0.6.3";
   };
   public_suffix = {
     groups = [ "default" ];
@@ -522,10 +512,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18s7xiclzajp9w9cmq8k28iy5ig1zpx1zv1mrm416cb2c0m0wrmw";
+      sha256 = "0nydm087m5c3j85gvzvz30w1qb9pl2lzpznw746jha29ybxyj5yn";
       type = "gem";
     };
-    version = "0.20.0";
+    version = "0.21.0";
   };
   statsd-instrument = {
     groups = [ "default" ];
@@ -542,10 +532,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f";
+      sha256 = "0gcarlmpfbmqnjvwfz44gdjhcmm634di7plcx2zdgwdhrhifhqw7";
       type = "gem";
     };
-    version = "1.3.2";
+    version = "1.4.0";
   };
   tzinfo = {
     dependencies = [ "concurrent-ruby" ];
@@ -563,9 +553,9 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
+      sha256 = "0jrl2vkdvc5aq8q3qvjmmrgjxfm784w8h7fal19qg7q7gh9msj1l";
       type = "gem";
     };
-    version = "1.0.3";
+    version = "1.0.4";
   };
 }

From b98a7b453975b2b0e6cc70430d1dba2cffb899bd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 01:32:24 +0000
Subject: [PATCH 2539/6226] jdk8: 8u462-b08 -> 8u472-b08

---
 pkgs/development/compilers/openjdk/8/source.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/8/source.json b/pkgs/development/compilers/openjdk/8/source.json
index ba66b2d05b20..d6ef95341b3c 100644
--- a/pkgs/development/compilers/openjdk/8/source.json
+++ b/pkgs/development/compilers/openjdk/8/source.json
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-CQZKhDojo+a4vZsIzRM/KoUfR17LedQYBWCRJxDFJUM=",
+  "hash": "sha256-2TN7JG42h9tYJNUzL2OLsbCWdKjWcvRf/4L9jfVfRSQ=",
   "owner": "openjdk",
   "repo": "jdk8u",
-  "rev": "refs/tags/jdk8u462-b08"
+  "rev": "refs/tags/jdk8u472-b08"
 }

From 192864ec3e946e586c3f7e0830fb12e14538a25a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 01:33:54 +0000
Subject: [PATCH 2540/6226] sgt-puzzles: 20251011.d928126 -> 20251021.790f585

---
 pkgs/by-name/sg/sgt-puzzles/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sg/sgt-puzzles/package.nix b/pkgs/by-name/sg/sgt-puzzles/package.nix
index d4922c96a5b9..e4f2f026b5eb 100644
--- a/pkgs/by-name/sg/sgt-puzzles/package.nix
+++ b/pkgs/by-name/sg/sgt-puzzles/package.nix
@@ -18,11 +18,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sgt-puzzles";
-  version = "20251011.d928126";
+  version = "20251021.790f585";
 
   src = fetchurl {
     url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${finalAttrs.version}.tar.gz";
-    hash = "sha256-/Iazd5voyNRocz68qILv5NoytZehKFX40a2vr+7YKqE=";
+    hash = "sha256-4EZgFswP0oqjS0OZbkyTHCs7dKm2PgUKpsJWssQAvQ4=";
   };
 
   sgt-puzzles-menu = fetchurl {

From 7ff5b5aa31d1dc5b50cfacb35e1030466b9ed56d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 01:51:36 +0000
Subject: [PATCH 2541/6226] nixpacks: 1.40.0 -> 1.41.0

---
 pkgs/by-name/ni/nixpacks/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ni/nixpacks/package.nix b/pkgs/by-name/ni/nixpacks/package.nix
index 92624a32469e..3178423bddd4 100644
--- a/pkgs/by-name/ni/nixpacks/package.nix
+++ b/pkgs/by-name/ni/nixpacks/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nixpacks";
-  version = "1.40.0";
+  version = "1.41.0";
 
   src = fetchFromGitHub {
     owner = "railwayapp";
     repo = "nixpacks";
     rev = "v${version}";
-    hash = "sha256-vF0vkUuvQR5z3v7LJmzpuvyLjuDjUL3HFIUzRKPojCs=";
+    hash = "sha256-y2zrXS56fSsPaVmJcUxTMYhOroYjcNKepuI9tmdORsY=";
   };
 
-  cargoHash = "sha256-lVdGIQxRREG7EYtQAzXzBx3Mg5bRopIe5rlGkNY3kTI=";
+  cargoHash = "sha256-Oom7CC8WBHd3hEQ62hQU91YbC4ydtdQuhAH6LFRN+P8=";
 
   # skip test due FHS dependency
   doCheck = false;

From 1cfa1527855ff8d734c90f7a372e3c50d6855583 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 02:10:46 +0000
Subject: [PATCH 2542/6226] rxvt-unicode-plugins.tabbedex: 19.21 -> 22.32

---
 .../rxvt-unicode-plugins/urxvt-tabbedex/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
index da50d1b751ba..e1b3ff6233fa 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "urxvt-tabbedex";
-  version = "19.21";
+  version = "22.32";
 
   src = fetchFromGitHub {
     owner = "mina86";
     repo = "urxvt-tabbedex";
     rev = "v${version}";
-    sha256 = "06msd156h6r8ss7qg66sjz5jz8613qfq2yvp0pc24i6mxzj8vl77";
+    sha256 = "sha256-4+4iPFoy1j5xjXRM5kBauhff44Y7/ik/+ZLZ1prc+Xo=";
   };
 
   nativeBuildInputs = [ perl ];

From d8b3346300e343c0af8f33e2b3e2cb06c17eff5f Mon Sep 17 00:00:00 2001
From: Randy Eckenrode <randy@largeandhighquality.com>
Date: Mon, 22 Sep 2025 18:53:09 -0400
Subject: [PATCH 2543/6226] libiio: fix build on Darwin

The framework is not built on Darwin; always link against the dylib.
---
 pkgs/by-name/li/libiio/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/li/libiio/package.nix b/pkgs/by-name/li/libiio/package.nix
index 1c0690012b57..0add09932f8c 100644
--- a/pkgs/by-name/li/libiio/package.nix
+++ b/pkgs/by-name/li/libiio/package.nix
@@ -83,6 +83,11 @@ stdenv.mkDerivation rec {
   + lib.optionalString pythonSupport ''
     # Hardcode path to the shared library into the bindings.
     sed "s#@libiio@#$lib/lib/libiio${stdenv.hostPlatform.extensions.sharedLibrary}#g" ${./hardcode-library-path.patch} | patch -p1
+  ''
+  + lib.optionalString (pythonSupport && stdenv.hostPlatform.isDarwin) ''
+    # Because we’re not building the framework, always use the dylib.
+    substituteInPlace bindings/python/setup.py.cmakein \
+      --replace-fail '"iio" if "Darwin" in _system() else' ""
   '';
 
   postInstall = lib.optionalString pythonSupport ''

From 8c87d0717a99091d4d0fed3206ef2edba55e317e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 02:30:46 +0000
Subject: [PATCH 2544/6226] organicmaps: 2025.10.07-1 -> 2025.10.23-22

---
 pkgs/applications/misc/organicmaps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/organicmaps/default.nix b/pkgs/applications/misc/organicmaps/default.nix
index c8964cdd63f7..34a35397b4d7 100644
--- a/pkgs/applications/misc/organicmaps/default.nix
+++ b/pkgs/applications/misc/organicmaps/default.nix
@@ -33,13 +33,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "organicmaps";
-  version = "2025.10.07-1";
+  version = "2025.10.23-22";
 
   src = fetchFromGitHub {
     owner = "organicmaps";
     repo = "organicmaps";
     tag = "${finalAttrs.version}-android";
-    hash = "sha256-132C3k8KvnQNC/AOoBlikl+AsRQdaaH00U3AFA4jo1Q=";
+    hash = "sha256-4TSN4G5tUvtzSXASDfOE1xiitQx9wE2/ZydFwpov+UM=";
     fetchSubmodules = true;
   };
 

From 973e844252bb7154613204aa1e471a866c676d5d Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 24 Oct 2025 23:50:16 -0300
Subject: [PATCH 2545/6226] rttr: fix build with cmake4

---
 pkgs/by-name/rt/rttr/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/rt/rttr/package.nix b/pkgs/by-name/rt/rttr/package.nix
index 9cf8dee8a877..da0822946ccc 100644
--- a/pkgs/by-name/rt/rttr/package.nix
+++ b/pkgs/by-name/rt/rttr/package.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation rec {
     "-DBUILD_PACKAGE=OFF"
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     broken = stdenv.hostPlatform.isDarwin;
     description = "C++ Reflection Library";

From 2840de58ce0727db2b0683f42e1d69567d9464dc Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 24 Oct 2025 23:56:42 -0300
Subject: [PATCH 2546/6226] rtl_fm_streamer: fix build with cmake4

---
 pkgs/by-name/rt/rtl_fm_streamer/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/rt/rtl_fm_streamer/package.nix b/pkgs/by-name/rt/rtl_fm_streamer/package.nix
index ff1857e6d2cf..435744ea7666 100644
--- a/pkgs/by-name/rt/rtl_fm_streamer/package.nix
+++ b/pkgs/by-name/rt/rtl_fm_streamer/package.nix
@@ -25,6 +25,9 @@ stdenv.mkDerivation (finalAttrs: {
 
     substituteInPlace rtl-sdr.rules \
       --replace 'MODE:="0666"' 'ENV{ID_SOFTWARE_RADIO}="1", MODE="0660", GROUP="plugdev"'
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [

From cf27651d1c16728fad6e3004a874ec37f9bd0de6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 03:18:25 +0000
Subject: [PATCH 2547/6226] python3Packages.python-on-whales: 0.78.0 -> 0.79.0

---
 pkgs/development/python-modules/python-on-whales/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-on-whales/default.nix b/pkgs/development/python-modules/python-on-whales/default.nix
index f7634cad9267..4fbee3742271 100644
--- a/pkgs/development/python-modules/python-on-whales/default.nix
+++ b/pkgs/development/python-modules/python-on-whales/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "python-on-whales";
-  version = "0.78.0";
+  version = "0.79.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gabrieldemarmiesse";
     repo = "python-on-whales";
     tag = "v${version}";
-    hash = "sha256-mpCBqFxxFxljhoTveLmk4XfqngiQPsufqr927hSwNfA=";
+    hash = "sha256-MvuTItl3OhYybg36Zizt96FqdY0oh0bfqqMd4mssLGA=";
   };
 
   build-system = [ setuptools ];

From eeb97d3469811ac4f474544b095a7e9c6b1430bc Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 00:36:00 -0300
Subject: [PATCH 2548/6226] unicorn-angr: fix build with cmake4

---
 pkgs/by-name/un/unicorn-angr/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/un/unicorn-angr/package.nix b/pkgs/by-name/un/unicorn-angr/package.nix
index d85ac29a12d2..1153f0aad872 100644
--- a/pkgs/by-name/un/unicorn-angr/package.nix
+++ b/pkgs/by-name/un/unicorn-angr/package.nix
@@ -33,6 +33,11 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Lightweight multi-platform CPU emulator library";
     homepage = "https://www.unicorn-engine.org";

From 85bfc050a434c3cf7477939a90b4e42151b336d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 24 Oct 2025 20:47:31 -0700
Subject: [PATCH 2549/6226] python3Packages.homeassistant-stubs: 2025.10.3 ->
 2025.10.4

Diff: https://github.com/KapJI/homeassistant-stubs/compare/2025.10.3...2025.10.4

Changelog: https://github.com/KapJI/homeassistant-stubs/releases/tag/2025.10.4
---
 pkgs/servers/home-assistant/stubs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 920d1626d39b..734b755fc961 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2025.10.3";
+  version = "2025.10.4";
   pyproject = true;
 
   disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     tag = version;
-    hash = "sha256-A4nzqyjuYGgFJQR7pTg1fNzSzwcdXumiECLpYBOM+TM=";
+    hash = "sha256-1ZV9lgueBKALUuvnHVGSb2C24auljdI07KkbLsaEe54=";
   };
 
   build-system = [

From d21ba13bc49f2c1eebaf5d9b9088ae5df8b9d4f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 03:50:22 +0000
Subject: [PATCH 2550/6226] kubelogin-oidc: 1.34.1 -> 1.34.2

---
 pkgs/by-name/ku/kubelogin-oidc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ku/kubelogin-oidc/package.nix b/pkgs/by-name/ku/kubelogin-oidc/package.nix
index b2ffae8d0c14..d8c4cd110a3b 100644
--- a/pkgs/by-name/ku/kubelogin-oidc/package.nix
+++ b/pkgs/by-name/ku/kubelogin-oidc/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "kubelogin";
-  version = "1.34.1";
+  version = "1.34.2";
 
   src = fetchFromGitHub {
     owner = "int128";
     repo = "kubelogin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zAIiNpzYr4aVR4O93y9S9aiGUgeg9xlj7wFn4vh43zY=";
+    hash = "sha256-Uk8zsOrX1mrOofl6pUCTPUye463fyCKDcK09IA6uwtw=";
   };
 
   subPackages = [ "." ];
@@ -22,7 +22,7 @@ buildGoModule (finalAttrs: {
     "-X main.version=v${finalAttrs.version}"
   ];
 
-  vendorHash = "sha256-LF6Esggl7ygC/t9lCZGzZIZtukCbMFCAo2RFLbvEnoU=";
+  vendorHash = "sha256-WZ7tJufvgclC6xKQNXmVcf0HAmqBH9bKSu3TFzWSYdI=";
 
   # test all packages
   preCheck = ''

From 2e083d98c3fa5a34987982b41a9d247bc0c54ef2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 03:52:51 +0000
Subject: [PATCH 2551/6226] restate: 1.5.2 -> 1.5.3

---
 pkgs/by-name/re/restate/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/restate/package.nix b/pkgs/by-name/re/restate/package.nix
index dbdc2eca0ece..9d049aaac69c 100644
--- a/pkgs/by-name/re/restate/package.nix
+++ b/pkgs/by-name/re/restate/package.nix
@@ -25,16 +25,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "restate";
-  version = "1.5.2";
+  version = "1.5.3";
 
   src = fetchFromGitHub {
     owner = "restatedev";
     repo = "restate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lLZuzjx/DKr00GWPTkSncGT2j9M/xUU84Alxqia8IvQ=";
+    hash = "sha256-5sGVVJ8Y90yJoikQnPeGbZhNlSR/d3EkMct9isSWies=";
   };
 
-  cargoHash = "sha256-2z0RcttfwbhehS8k4vu5d1Np0pRWSCIeQk8paH7hJuY=";
+  cargoHash = "sha256-+Yc7u6q4U4MwT5eHnxHC2DCG66SmEyRfNMeMqSO+GeQ=";
 
   env = {
     PROTOC = lib.getExe protobuf;

From 47c2e3ba5806eb1564514f6cc29addbe01ae4faf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 24 Oct 2025 21:12:30 -0700
Subject: [PATCH 2552/6226] python3Packages.pycync: init at 0.4.2

---
 .../python-modules/pycync/default.nix         | 49 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/python-modules/pycync/default.nix

diff --git a/pkgs/development/python-modules/pycync/default.nix b/pkgs/development/python-modules/pycync/default.nix
new file mode 100644
index 000000000000..62dcf3c65b36
--- /dev/null
+++ b/pkgs/development/python-modules/pycync/default.nix
@@ -0,0 +1,49 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  lib,
+  pytest-asyncio,
+  pytest-mock,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "pycync";
+  version = "0.4.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Kinachi249";
+    repo = "pycync";
+    tag = "v${version}";
+    hash = "sha256-PDCS+ucfO5RRvTshGGjxir3ez7L405k5tL5svMxZMsg=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    aiohttp
+  ];
+
+  pythonImportsCheck = [ "pycync" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytest-mock
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    cd tests
+  '';
+
+  meta = {
+    changelog = "https://github.com/Kinachi249/pycync/releases/tag/${src.tag}";
+    description = "Python API library for Cync smart devices";
+    homepage = "https://github.com/Kinachi249/pycync";
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 99a8ce5fcd78..99a863ce8772 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12828,6 +12828,8 @@ self: super: with self; {
 
   pycycling = callPackage ../development/python-modules/pycycling { };
 
+  pycync = callPackage ../development/python-modules/pycync { };
+
   pycyphal = callPackage ../development/python-modules/pycyphal { };
 
   pydaikin = callPackage ../development/python-modules/pydaikin { };

From ae1e0c93480629b8a31fbc6dfb43a3286c2f9786 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 24 Oct 2025 21:13:19 -0700
Subject: [PATCH 2553/6226] home-assistant: support cync component

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index f45e2ac8cbf4..f961ebe21c10 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -1057,7 +1057,8 @@
       ];
     "cync" =
       ps: with ps; [
-      ]; # missing inputs: pycync
+        pycync
+      ];
     "dacia" =
       ps: with ps; [
       ];
@@ -7138,6 +7139,7 @@
     "cpuspeed"
     "crownstone"
     "cups"
+    "cync"
     "daikin"
     "datadog"
     "date"

From 510019a094097aa7bbf2aa6243f9448cda10a4ff Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 25 Oct 2025 04:16:50 +0000
Subject: [PATCH 2554/6226] linux_xanmod: 6.12.54 -> 6.12.55

- Changelog: https://dl.xanmod.org/changelog/6.12/ChangeLog-6.12.55-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/6.12.54-xanmod1..6.12.55-xanmod1?from_project_id=51590166
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 6b27f1331d29..7a35a989c1f3 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -15,8 +15,8 @@ let
   variants = {
     # ./update-xanmod.sh lts
     lts = {
-      version = "6.12.54";
-      hash = "sha256-8ZeVHP8voR4GJfBB1iM8ZDx4QgCd83tJ7IkpJNW63ME=";
+      version = "6.12.55";
+      hash = "sha256-JxCRiUw8dwxsEhPrvNRRRRvVSTE6JFluLRZZ4C2yoqo=";
       isLTS = true;
     };
     # ./update-xanmod.sh main

From cbe292296e2736a90f4e6730faf922031987f10c Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Sat, 25 Oct 2025 04:20:08 +0000
Subject: [PATCH 2555/6226] linux_xanmod_latest: 6.17.4 -> 6.17.5

- Changelog: https://dl.xanmod.org/changelog/6.17/ChangeLog-6.17.5-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/6.17.4-xanmod1..6.17.5-xanmod1?from_project_id=51590166
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 7a35a989c1f3..aa1b6de6dab0 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -21,8 +21,8 @@ let
     };
     # ./update-xanmod.sh main
     main = {
-      version = "6.17.4";
-      hash = "sha256-UHfZwK0qIVhiKw8OpE8i+V2BRav6Fsju8E5rO5WRwVA=";
+      version = "6.17.5";
+      hash = "sha256-w07UZmKXZ59h5DVzqH2ECzIMmeXyLfrq83FcTN5TVXo=";
     };
   };
 

From adc2205fb40fd8310c63d5b2be2fe7ea79ec52d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 04:29:33 +0000
Subject: [PATCH 2556/6226] p3x-onenote: 2025.10.101 -> 2025.10.103

---
 pkgs/by-name/p3/p3x-onenote/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/p3/p3x-onenote/package.nix b/pkgs/by-name/p3/p3x-onenote/package.nix
index f6db91c7c2cb..61277ca37b5b 100644
--- a/pkgs/by-name/p3/p3x-onenote/package.nix
+++ b/pkgs/by-name/p3/p3x-onenote/package.nix
@@ -8,7 +8,7 @@
 
 let
   pname = "p3x-onenote";
-  version = "2025.10.101";
+  version = "2025.10.103";
 
   plat =
     {
@@ -22,7 +22,7 @@ let
     {
       aarch64-linux = "sha256-FB6+0Ze3d/6QETgtMtc6GztnPdSy5s7k67qsAtFdsyM=";
       armv7l-linux = "sha256-Q45tfcGrNjd9wXt+VhXhaHrC4w68lRUIuB4cJSW5NDE=";
-      x86_64-linux = "sha256-h2U9EctjyM4FlVe/pPMWugCIe9tQ4Av4/HOcWWSUNEI=";
+      x86_64-linux = "sha256-sDzwEhoPEfa21zBwD0IYoRdz4VHeTSUL0biHbbWE+Dc=";
     }
     .${stdenv.hostPlatform.system};
 

From 6c8c69dd58b7e77c3d61b61257bffe79087f887e Mon Sep 17 00:00:00 2001
From: loner <2788892716@qq.com>
Date: Fri, 24 Oct 2025 01:34:50 +0800
Subject: [PATCH 2557/6226] gitfetch: init at 1.2.1

---
 pkgs/by-name/gi/gitfetch/package.nix | 46 ++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/by-name/gi/gitfetch/package.nix

diff --git a/pkgs/by-name/gi/gitfetch/package.nix b/pkgs/by-name/gi/gitfetch/package.nix
new file mode 100644
index 000000000000..7f0f5636a118
--- /dev/null
+++ b/pkgs/by-name/gi/gitfetch/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  python3Packages,
+  fetchFromGitHub,
+  gh,
+  nix-update-script,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "gitfetch";
+  version = "1.2.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Matars";
+    repo = "gitfetch";
+    tag = "v${version}";
+    hash = "sha256-2cOfVv/snhluazyjwDuHEbbMq3cK+bsKYnnRmby0JDo=";
+  };
+
+  build-system = with python3Packages; [ setuptools ];
+
+  dependencies = with python3Packages; [
+    requests
+    readchar
+  ];
+
+  makeWrapperArgs = [
+    "--prefix PATH : ${
+      lib.makeBinPath [
+        gh
+      ]
+    }"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Neofetch-style CLI tool for git provider statistics";
+    homepage = "https://github.com/Matars/gitfetch";
+    mainProgram = "gitfetch";
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ lonerOrz ];
+  };
+}

From cee01fe2c16da2d972b56c595d96b53fdd8ecc3f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 04:36:27 +0000
Subject: [PATCH 2558/6226] magic-vlsi: 8.3.555 -> 8.3.568

---
 pkgs/by-name/ma/magic-vlsi/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix
index ab6c05ec0095..2e7dd207f7cb 100644
--- a/pkgs/by-name/ma/magic-vlsi/package.nix
+++ b/pkgs/by-name/ma/magic-vlsi/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "magic-vlsi";
-  version = "8.3.555";
+  version = "8.3.568";
 
   src = fetchFromGitHub {
     owner = "RTimothyEdwards";
     repo = "magic";
     tag = "${version}";
-    sha256 = "sha256-O/W2gWdL4z7JSAv+ZvTkQ6ApKLhrg4UwGde68qSwq3c=";
+    sha256 = "sha256-H9hPXsOBDBs1v5UzgcuoUC6D7+JYZ45WhHlyzwCPoqk=";
     leaveDotGit = true;
   };
 

From 8d05f6fe3a0ceb97caee74c92257c7eb0d57ff15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 24 Oct 2025 21:20:37 -0700
Subject: [PATCH 2559/6226] python3Packages.victron-vrm: init at 0.1.8

---
 .../python-modules/victron-vrm/default.nix    | 50 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/victron-vrm/default.nix

diff --git a/pkgs/development/python-modules/victron-vrm/default.nix b/pkgs/development/python-modules/victron-vrm/default.nix
new file mode 100644
index 000000000000..fdb916295599
--- /dev/null
+++ b/pkgs/development/python-modules/victron-vrm/default.nix
@@ -0,0 +1,50 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  lib,
+  pydantic,
+  pytest-asyncio,
+  pytestCheckHook,
+  pytz,
+}:
+
+buildPythonPackage rec {
+  pname = "victron-vrm";
+  version = "0.1.8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "KSoft-Si";
+    repo = "vrm-client";
+    tag = "v${version}";
+    hash = "sha256-NxkMUwiFD8C7Nrtd7cjoFvdkbAOJkIIt+TPtkous8Nc=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    aiohttp
+    pydantic
+    pytz
+  ];
+
+  pythonImportsCheck = [ "victron_vrm" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  # tests connect to vrmapi.victronenergy.com
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/KSoft-Si/vrm-client/releases/tag/${src.tag}";
+    description = "Async Python client for the Victron Energy VRM API";
+    homepage = "https://github.com/KSoft-Si/vrm-client";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 99a8ce5fcd78..c999a0863d35 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19799,6 +19799,8 @@ self: super: with self; {
 
   vharfbuzz = callPackage ../development/python-modules/vharfbuzz { };
 
+  victron-vrm = callPackage ../development/python-modules/victron-vrm { };
+
   videocr = callPackage ../development/python-modules/videocr { };
 
   vidstab = callPackage ../development/python-modules/vidstab { };

From d133c228eb61ddbc781a008b5b02f19031fba911 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 24 Oct 2025 21:21:32 -0700
Subject: [PATCH 2560/6226] home-assistant: support victron_remote_monitoring
 component

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index f45e2ac8cbf4..b6d25bfb6704 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -6525,7 +6525,8 @@
       ];
     "victron_remote_monitoring" =
       ps: with ps; [
-      ]; # missing inputs: victron-vrm
+        victron-vrm
+      ];
     "vilfo" =
       ps: with ps; [
         vilfo-api-client
@@ -7933,6 +7934,7 @@
     "version"
     "vesync"
     "vicare"
+    "victron_remote_monitoring"
     "vilfo"
     "vizio"
     "vlc_telnet"

From 0ba98e7dab4989e1c72ec551083e3c6678cfb19a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 04:45:54 +0000
Subject: [PATCH 2561/6226] vscode-extensions.pkief.material-icon-theme: 5.27.0
 -> 5.28.0

---
 .../vscode/extensions/pkief.material-icon-theme/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix b/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix
index 109e1ffdf423..a9c961c9ab9c 100644
--- a/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix
@@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "material-icon-theme";
     publisher = "PKief";
-    version = "5.27.0";
-    hash = "sha256-vP5jMijMIKHUmvSaTX+eEO6Z3dzUCR6S/ZdPxjJHIT8=";
+    version = "5.28.0";
+    hash = "sha256-VZFeEaWe5JZQegOJ674vHxQAFuWFG5lttnWwSQ5AY5g=";
   };
   meta = {
     description = "Material Design Icons for Visual Studio Code";

From af37c3c0516478c2d255d4a3d4a373e26499e9b2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 04:54:41 +0000
Subject: [PATCH 2562/6226] astal.source: 0-unstable-2025-10-09 ->
 0-unstable-2025-10-23

---
 pkgs/development/libraries/astal/source.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/astal/source.nix b/pkgs/development/libraries/astal/source.nix
index 7c121da0a806..3a962db76812 100644
--- a/pkgs/development/libraries/astal/source.nix
+++ b/pkgs/development/libraries/astal/source.nix
@@ -7,15 +7,15 @@ let
   originalDrv = fetchFromGitHub {
     owner = "Aylur";
     repo = "astal";
-    rev = "71b008e5fb59e0a992724db78d54a5ddcf234515";
-    hash = "sha256-vMhDAwwSrwMd5xWcTiA56fsk7LRz4tHOsKhrt2hXi48=";
+    rev = "189bf73016c26d7d32729a913d6436cd7b1a0885";
+    hash = "sha256-U2r3/DKgr9Fq1yqWLCbKMSqRf8a1JctD0kj/ftBClsg=";
   };
 in
 originalDrv.overrideAttrs (
   final: prev: {
     name = "${final.pname}-${final.version}"; # fetchFromGitHub already defines name
     pname = "astal-source";
-    version = "0-unstable-2025-10-09";
+    version = "0-unstable-2025-10-23";
 
     meta = prev.meta // {
       description = "Building blocks for creating custom desktop shells (source)";

From ecaa9d148d83c8912d3ae0e15f572c94c3ab2692 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 04:59:09 +0000
Subject: [PATCH 2563/6226] python3Packages.jupyterhub: 5.4.1 -> 5.4.2

---
 pkgs/development/python-modules/jupyterhub/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jupyterhub/default.nix b/pkgs/development/python-modules/jupyterhub/default.nix
index 99dd4133d88b..b111ab1d01a5 100644
--- a/pkgs/development/python-modules/jupyterhub/default.nix
+++ b/pkgs/development/python-modules/jupyterhub/default.nix
@@ -51,14 +51,14 @@
 
 buildPythonPackage rec {
   pname = "jupyterhub";
-  version = "5.4.1";
+  version = "5.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jupyterhub";
     repo = "jupyterhub";
     tag = version;
-    hash = "sha256-8hClknn0GfXbfXEzoYnb6qCXby7MU6BUDVoAG80UgNA=";
+    hash = "sha256-eSYoLoPWHQ/HHAFW6X262hrIrmUxDxrYEzVFiwGVqCs=";
   };
 
   npmDeps = fetchNpmDeps {

From 48c3c413c7b03024bb6cb62da99cba1de6d307ad Mon Sep 17 00:00:00 2001
From: adeci <alex.decious@gmail.com>
Date: Sat, 25 Oct 2025 00:50:31 -0400
Subject: [PATCH 2564/6226] upstream fix qt6 find_package in cmakelist

---
 pkgs/by-name/hy/hyprsysteminfo/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/hy/hyprsysteminfo/package.nix b/pkgs/by-name/hy/hyprsysteminfo/package.nix
index e5b54b5e5bcd..f25ffc8a2165 100644
--- a/pkgs/by-name/hy/hyprsysteminfo/package.nix
+++ b/pkgs/by-name/hy/hyprsysteminfo/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   qt6,
   pkg-config,
@@ -23,6 +24,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-KDxT9B+1SATWiZdUBAQvZu17vk3xmyXcw2Zy56bdWbY=";
   };
 
+  patches = [
+    # Fix Qt6::WaylandClientPrivate not found
+    # https://github.com/hyprwm/hyprsysteminfo/pull/21
+    (fetchpatch {
+      url = "https://github.com/hyprwm/hyprsysteminfo/commit/fe81610278676d26ff47f62770ac238220285d3a.patch";
+      hash = "sha256-rfKyV0gkfXEhTcPHlAB+yxZ+92umBV22YOK9aLMMBhM=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config

From fc95927c022999f71e92f3c97114e4dee58af053 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 05:12:54 +0000
Subject: [PATCH 2565/6226] python3Packages.flake8-bugbear: 24.12.12 ->
 25.10.21

---
 pkgs/development/python-modules/flake8-bugbear/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix
index 6f09f07af8f2..7322c6a0a3a3 100644
--- a/pkgs/development/python-modules/flake8-bugbear/default.nix
+++ b/pkgs/development/python-modules/flake8-bugbear/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "flake8-bugbear";
-  version = "24.12.12";
+  version = "25.10.21";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "PyCQA";
     repo = "flake8-bugbear";
     tag = version;
-    hash = "sha256-ZMIpQUF+aXiq2NG0v19UwhWszrW/l50aJmG4YDV0+Wg=";
+    hash = "sha256-4ZTi1w+L0M6LCB4G+OxHBnUV0f6s/JPY6tKOt1zh7So=";
   };
 
   propagatedBuildInputs = [

From 0a65ebd12f08bff22f396f9803acb6a1413a7ca9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 05:24:45 +0000
Subject: [PATCH 2566/6226] python3Packages.gphoto2: 2.6.2 -> 2.6.3

---
 pkgs/development/python-modules/gphoto2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gphoto2/default.nix b/pkgs/development/python-modules/gphoto2/default.nix
index b9475c9dedc8..50ea60c8caa3 100644
--- a/pkgs/development/python-modules/gphoto2/default.nix
+++ b/pkgs/development/python-modules/gphoto2/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "gphoto2";
-  version = "2.6.2";
+  version = "2.6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jim-easterbrook";
     repo = "python-gphoto2";
     tag = "v${version}";
-    hash = "sha256-Z480HR9AlwJQI1yi8+twzHV9PMcTKWqtvoNw6ohV+6M=";
+    hash = "sha256-inxKfZ/u7b9Kx1ytmEKJsK2PnnrhSI54A2Dm6Mtxnmc=";
   };
 
   build-system = [

From cf064d3097bae8210bd5f4fd1ed44b50d4b91633 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 05:37:46 +0000
Subject: [PATCH 2567/6226] python3Packages.glyphslib: 6.12.0 -> 6.12.2

---
 pkgs/development/python-modules/glyphslib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix
index 52ee9e3beec2..081a4fd3bfc9 100644
--- a/pkgs/development/python-modules/glyphslib/default.nix
+++ b/pkgs/development/python-modules/glyphslib/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "glyphslib";
-  version = "6.12.0";
+  version = "6.12.2";
 
   pyproject = true;
 
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "googlefonts";
     repo = "glyphsLib";
     tag = "v${version}";
-    hash = "sha256-5Ae6oj3tbAvcKsSkDdIHhGi2I63sGDEByt00reTBQGQ=";
+    hash = "sha256-w9n9IWd3E9Bd9pggdFe9PZXx235k81oWL9BpdyerShQ=";
   };
 
   build-system = [ setuptools-scm ];

From ec9fec4a71b214fe6df6c70b0e7dbd9771b30de8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 05:54:01 +0000
Subject: [PATCH 2568/6226] distroshelf: 1.0.13 -> 1.0.15

---
 pkgs/by-name/di/distroshelf/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/distroshelf/package.nix b/pkgs/by-name/di/distroshelf/package.nix
index c9e75e756a4d..24b00d5daacf 100644
--- a/pkgs/by-name/di/distroshelf/package.nix
+++ b/pkgs/by-name/di/distroshelf/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "distroshelf";
-  version = "1.0.13";
+  version = "1.0.15";
 
   src = fetchFromGitHub {
     owner = "ranfdev";
     repo = "DistroShelf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2R5jDstnzCTG6UfynsO2aeX6eST4cZIEHNdP9OLDKrw=";
+    hash = "sha256-4rNdp0g/QaiLnKGC4baYAq29dxluyZ+9TgeBlqidRp0=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From fa452845e0c99895e1a71f4d51e8c6f43e372501 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sat, 25 Oct 2025 05:58:35 +0000
Subject: [PATCH 2569/6226] libcava: 0.10.4 -> 0.10.6

---
 pkgs/by-name/li/libcava/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libcava/package.nix b/pkgs/by-name/li/libcava/package.nix
index cd0516a98fe4..0067bd5e99df 100644
--- a/pkgs/by-name/li/libcava/package.nix
+++ b/pkgs/by-name/li/libcava/package.nix
@@ -8,13 +8,13 @@
 cava.overrideAttrs (old: rec {
   pname = "libcava";
   # fork may not be updated when we update upstream
-  version = "0.10.4";
+  version = "0.10.6";
 
   src = fetchFromGitHub {
     owner = "LukashonakV";
     repo = "cava";
     tag = version;
-    hash = "sha256-9eTDqM+O1tA/3bEfd1apm8LbEcR9CVgELTIspSVPMKM=";
+    hash = "sha256-63be1wypMiqhPA6sjMebmFE6yKpTj/bUE53sMWun554=";
   };
 
   nativeBuildInputs = old.nativeBuildInputs ++ [

From 0397f9fae241cf4e2068baf74c363c68d93df4b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 06:02:06 +0000
Subject: [PATCH 2570/6226] python3Packages.safehttpx: 0.1.6 -> 0.1.7

---
 pkgs/development/python-modules/safehttpx/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/safehttpx/default.nix b/pkgs/development/python-modules/safehttpx/default.nix
index d7a9fd27b514..95614467399f 100644
--- a/pkgs/development/python-modules/safehttpx/default.nix
+++ b/pkgs/development/python-modules/safehttpx/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "safehttpx";
-  version = "0.1.6";
+  version = "0.1.7";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-s1a/yCzuOiTDlblKLb6rvtYK/xql+jtf6XxPJFbrzkI=";
+    hash = "sha256-2yAcCXjEHt24u0gPPu5Z3WcwT92RZGA16dmnIASanSM=";
   };
 
   build-system = [

From 95074e787b8b35105d8807cb885f9586601a16bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 06:16:16 +0000
Subject: [PATCH 2571/6226] python3Packages.google-cloud-translate: 3.21.1 ->
 3.22.0

---
 .../python-modules/google-cloud-translate/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix
index fcab6d14a0fc..fa7e505a8d16 100644
--- a/pkgs/development/python-modules/google-cloud-translate/default.nix
+++ b/pkgs/development/python-modules/google-cloud-translate/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-translate";
-  version = "3.21.1";
+  version = "3.22.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_translate";
     inherit version;
-    hash = "sha256-dg8l4bl5/qalncpE/8io3HCGk8UK43o5Vo/xKExTS+I=";
+    hash = "sha256-yaDlK4VG8AlkBiifa+dB+Q6kGhTAWpjpbSkr/vGsfnM=";
   };
 
   build-system = [ setuptools ];

From c402aec62986761838f4952f1b9eedbfae0eeed5 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 25 Oct 2025 13:15:48 +0800
Subject: [PATCH 2572/6226] wayland: add darwin to badPlatforms

---
 pkgs/development/libraries/wayland/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/wayland/default.nix b/pkgs/development/libraries/wayland/default.nix
index 31be22e39c43..90d7384bb5bc 100644
--- a/pkgs/development/libraries/wayland/default.nix
+++ b/pkgs/development/libraries/wayland/default.nix
@@ -107,7 +107,8 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://wayland.freedesktop.org/";
     license = licenses.mit; # Expat version
     platforms = platforms.unix;
-    broken = stdenv.hostPlatform.isDarwin; # requires more work: https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/481
+    # requires more work: https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/481
+    badPlatforms = lib.platforms.darwin;
     maintainers = with maintainers; [
       codyopel
       qyliss

From 53e6f03c6be16e6f23b376724855807286063bcd Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sat, 25 Oct 2025 12:01:20 +0530
Subject: [PATCH 2573/6226] waybar: pin libcava in waybar

---
 pkgs/by-name/wa/waybar/package.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wa/waybar/package.nix b/pkgs/by-name/wa/waybar/package.nix
index e2ac48057949..d915092c3346 100644
--- a/pkgs/by-name/wa/waybar/package.nix
+++ b/pkgs/by-name/wa/waybar/package.nix
@@ -14,7 +14,6 @@
   gtkmm3,
   iniparser,
   jsoncpp,
-  libcava,
   libdbusmenu-gtk3,
   libevdev,
   libinotify-kqueue,
@@ -81,9 +80,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-mGiBZjfvtZZkSHrha4UF2l1Ogbij8J//r2h4gcZAJ6w=";
   };
 
+  libcavaSrc = fetchFromGitHub {
+    owner = "LukashonakV";
+    repo = "cava";
+    tag = "0.10.4";
+    hash = "sha256-9eTDqM+O1tA/3bEfd1apm8LbEcR9CVgELTIspSVPMKM=";
+  };
+
   postUnpack = lib.optional cavaSupport ''
     pushd "$sourceRoot"
-    cp -R --no-preserve=mode,ownership ${libcava.src} subprojects/cava-0.10.4
+    cp -R --no-preserve=mode,ownership ${finalAttrs.libcavaSrc} subprojects/cava-0.10.4
     patchShebangs .
     popd
   '';

From 4e5a67c396435892e73c8fdf70a228bd924060c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 06:45:57 +0000
Subject: [PATCH 2574/6226] libretro.genesis-plus-gx: 0-unstable-2025-10-17 ->
 0-unstable-2025-10-23

---
 .../emulators/libretro/cores/genesis-plus-gx.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
index ee411c1283e6..c17c8fb73dbf 100644
--- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
+++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "genesis-plus-gx";
-  version = "0-unstable-2025-10-17";
+  version = "0-unstable-2025-10-23";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "Genesis-Plus-GX";
-    rev = "a2fa5673736922540978c73f4610b82e71de3cf8";
-    hash = "sha256-CGxfucym0HyrIUZoDFJU5lfq4t5yfnOaJqqggDoQWp8=";
+    rev = "cecccacf767b1c8e86af3e315223b052a7f81b95";
+    hash = "sha256-x2ClmCtWIF9HS8Yb+8cNm9MSxwcwSm05G+hZGWBz2OY=";
   };
 
   meta = {

From f89b079591c41fcd28841e146f80364bc18ca838 Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss@proton.me>
Date: Sat, 25 Oct 2025 09:41:02 +0300
Subject: [PATCH 2575/6226] kide: init at 1.0.40

---
 pkgs/by-name/ki/kide/package.nix | 63 ++++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 pkgs/by-name/ki/kide/package.nix

diff --git a/pkgs/by-name/ki/kide/package.nix b/pkgs/by-name/ki/kide/package.nix
new file mode 100644
index 000000000000..ae5cdbde45d9
--- /dev/null
+++ b/pkgs/by-name/ki/kide/package.nix
@@ -0,0 +1,63 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  fetchNpmDeps,
+  cargo-tauri,
+  nodejs,
+  npmHooks,
+  pkg-config,
+  wrapGAppsHook4,
+  openssl,
+  webkitgtk_4_1,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "kide";
+  version = "1.0.40";
+
+  src = fetchFromGitHub {
+    owner = "openobserve";
+    repo = "kide";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-lRkFPS+hkACj3CxWde4B7phHUMh+2643Jgd0Wt3nUSo=";
+  };
+
+  cargoHash = "sha256-/PdUaSW7YMFDgMFqA+7ePNPraPhMSNqFaONIEFubtNc=";
+
+  npmDeps = fetchNpmDeps {
+    inherit (finalAttrs) pname version src;
+    hash = "sha256-1BY2oEnpldl+m8hUg9bszAyR67M8ErbcNaNE676c9hU=";
+  };
+
+  nativeBuildInputs = [
+    cargo-tauri.hook
+    nodejs
+    npmHooks.npmConfigHook
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook4 ];
+
+  buildInputs = [
+    openssl
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    webkitgtk_4_1
+  ];
+
+  cargoRoot = "src-tauri";
+  buildAndTestSubdir = finalAttrs.cargoRoot;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Fast and lightweight Kubernetes IDE";
+    homepage = "https://github.com/openobserve/kide";
+    changelog = "https://github.com/openobserve/kide/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.asl20;
+    inherit (cargo-tauri.hook.meta) platforms;
+    maintainers = with lib.maintainers; [ nartsiss ];
+    mainProgram = "kide";
+  };
+})

From 37bcb08fa8a3a6b0bcaad3c109d2ec9ad829811d Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss@proton.me>
Date: Thu, 16 Oct 2025 12:18:08 +0300
Subject: [PATCH 2576/6226] stasis: init at 0.5.0

---
 pkgs/by-name/st/stasis/package.nix | 67 ++++++++++++++++++++++++++++++
 1 file changed, 67 insertions(+)
 create mode 100644 pkgs/by-name/st/stasis/package.nix

diff --git a/pkgs/by-name/st/stasis/package.nix b/pkgs/by-name/st/stasis/package.nix
new file mode 100644
index 000000000000..916cbb056f6e
--- /dev/null
+++ b/pkgs/by-name/st/stasis/package.nix
@@ -0,0 +1,67 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+  wayland-scanner,
+  wayland,
+  wayland-protocols,
+  dbus,
+  pkg-config,
+  libinput,
+  udev,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "stasis";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "saltnpepper97";
+    repo = "stasis";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-gJB/y6jSBJZjBTQB9sxbVpllSfF6jwKOEeLqlgIStMA=";
+  };
+
+  cargoHash = "sha256-JX0imd+FuuBq8d3FAYEQ+LLZQV39f8Iu9ftLASs00Fc=";
+
+  nativeBuildInputs = [
+    pkg-config
+    wayland-scanner
+  ];
+
+  buildInputs = [
+    wayland
+    wayland-protocols
+    dbus
+    libinput
+    udev
+  ];
+
+  #There are no tests
+  doCheck = false;
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Modern idle manager for Wayland";
+    longDescription = ''
+      Stasis is a smart idle manager for Wayland that understands context.
+      It automatically prevents idle when watching videos, reading documents,
+      or playing music, while allowing idle when appropriate. Features include
+      media-aware idle handling, application-specific inhibitors, Wayland idle
+      inhibitor protocol support, and flexible configuration using the RUNE
+      configuration language.
+    '';
+    homepage = "https://github.com/saltnpepper97/stasis";
+    changelog = "https://github.com/saltnpepper97/stasis/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nartsiss ];
+    platforms = lib.platforms.linux;
+    mainProgram = "stasis";
+  };
+})

From 5c3d3aff7c5a7ecf30a7877b94e56b0f7e27be88 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 07:07:11 +0000
Subject: [PATCH 2577/6226] python3Packages.moyopy: 0.6.0 -> 0.7.1

---
 pkgs/development/python-modules/moyopy/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/moyopy/default.nix b/pkgs/development/python-modules/moyopy/default.nix
index 60895d011a39..b27d6bb2066d 100644
--- a/pkgs/development/python-modules/moyopy/default.nix
+++ b/pkgs/development/python-modules/moyopy/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "moyopy";
-  version = "0.6.0";
+  version = "0.7.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "spglib";
     repo = "moyo";
     tag = "v${version}";
-    hash = "sha256-4Dete4rtkfs0Ytf0YSdyDNP51C8GlaxKdQlS1l8hj44=";
+    hash = "sha256-XWOFYzDYCICVtaIpo9bH8P1YwV9QmR108DUb0GDMPM4=";
   };
 
   sourceRoot = "${src.name}/moyopy";
@@ -46,7 +46,7 @@ buildPythonPackage rec {
       sourceRoot
       cargoRoot
       ;
-    hash = "sha256-z45jmkPKfX7kYefFaU/F6SopK0dI6xtgrkllaergtwI=";
+    hash = "sha256-LfC0ptYH+wMq9yaS+vkLAoQJiuLONo3Ol1v7eS7gLeI=";
   };
 
   build-system = [

From 187dee28f549095dadca5f9547c93b08f2f4e598 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 07:23:09 +0000
Subject: [PATCH 2578/6226] inadyn: 2.12.0 -> 2.13.0

---
 pkgs/by-name/in/inadyn/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/in/inadyn/package.nix b/pkgs/by-name/in/inadyn/package.nix
index 09963d89646e..5604347c85a4 100644
--- a/pkgs/by-name/in/inadyn/package.nix
+++ b/pkgs/by-name/in/inadyn/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "inadyn";
-  version = "2.12.0";
+  version = "2.13.0";
 
   src = fetchFromGitHub {
     owner = "troglobit";
     repo = "inadyn";
     rev = "v${version}";
-    sha256 = "sha256-aQHJtnMDaHF1XY9lwQVR6f78Zk2UI7OC3Oxt1r1KMak=";
+    sha256 = "sha256-R+DlhRZOwL/hBZAu4L7w7DAoHy1/1m8wsidSxByO74E=";
   };
 
   nativeBuildInputs = [

From 304b4f4943ab12f89658f596e867b867a8972fd3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 07:49:41 +0000
Subject: [PATCH 2579/6226] bign-handheld-thumbnailer: 1.1.3 -> 1.2.0

---
 pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix
index b6cbffb51dd9..290f197fd0a2 100644
--- a/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix
+++ b/pkgs/by-name/bi/bign-handheld-thumbnailer/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bign-handheld-thumbnailer";
-  version = "1.1.3";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "MateusRodCosta";
     repo = "bign-handheld-thumbnailer";
     tag = "v${version}";
-    hash = "sha256-qS1bKEkZPmNMfiLUZVlx8EAXMMYCcGGTTZFhWwlZ3gQ=";
+    hash = "sha256-+iWf5ybCUHlZz3Ybw3bwLKzlsmiVwep2alVDvL9bG2A=";
   };
 
-  cargoHash = "sha256-LyT0HDR51/bYnXtavgtff1nCKuJn41UmZuH/uJmykkk=";
+  cargoHash = "sha256-vfTbfg1CAbc//UZtI5trw6znqnNGy6AiCSQNE68vch8=";
 
   strictDeps = true;
 

From 075b9f93733fae4a297cf6c4c492e17f425add1b Mon Sep 17 00:00:00 2001
From: Sirn Thanabulpong <sirn@ogsite.net>
Date: Sat, 18 Oct 2025 11:55:38 +0900
Subject: [PATCH 2580/6226] flatpak: patch trigger paths

---
 pkgs/by-name/fl/flatpak/package.nix | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix
index 6412d8166338..76d396fe2498 100644
--- a/pkgs/by-name/fl/flatpak/package.nix
+++ b/pkgs/by-name/fl/flatpak/package.nix
@@ -151,6 +151,31 @@ stdenv.mkDerivation (finalAttrs: {
 
     substituteInPlace doc/meson.build \
       --replace-fail '$MESON_INSTALL_DESTDIR_PREFIX/@1@/@2@' '@1@/@2@'
+
+    substituteInPlace triggers/gtk-icon-cache.trigger \
+      --replace-fail '/usr/share/icons/hicolor/index.theme' '/run/current-system/sw/share/icons/hicolor/index.theme'
+  '';
+
+  # Fixup PATHs in trigger scripts
+  postInstall = ''
+    wrapProgram $out/share/flatpak/triggers/desktop-database.trigger --prefix PATH : ${
+      lib.makeBinPath [
+        desktop-file-utils
+      ]
+    }
+
+    wrapProgram $out/share/flatpak/triggers/gtk-icon-cache.trigger --prefix PATH : ${
+      lib.makeBinPath [
+        coreutils
+        gtk3
+      ]
+    }
+
+    wrapProgram $out/share/flatpak/triggers/mime-database.trigger --prefix PATH : ${
+      lib.makeBinPath [
+        shared-mime-info
+      ]
+    }
   '';
 
   strictDeps = true;

From f2a9d096b78315f21002d21f7ec67bf96396ddae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 07:58:30 +0000
Subject: [PATCH 2581/6226] python3Packages.reflex-hosting-cli: 0.1.57 ->
 0.1.58

---
 .../development/python-modules/reflex-hosting-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reflex-hosting-cli/default.nix b/pkgs/development/python-modules/reflex-hosting-cli/default.nix
index 5bbdedf73e80..1201883e23fc 100644
--- a/pkgs/development/python-modules/reflex-hosting-cli/default.nix
+++ b/pkgs/development/python-modules/reflex-hosting-cli/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "reflex-hosting-cli";
-  version = "0.1.57";
+  version = "0.1.58";
   pyproject = true;
 
   # source is not published https://github.com/reflex-dev/reflex/issues/3762
   src = fetchPypi {
     pname = "reflex_hosting_cli";
     inherit version;
-    hash = "sha256-We51f2pHqC4bR7ofKVVRqNZ++S3x3NAz9Zz8l9S/5wY=";
+    hash = "sha256-yQOqRJRKck+90KbMZr0XT5vjKWfar2CStyBKGrOpJy8=";
   };
 
   pythonRelaxDeps = [

From f1f26b85c0450aee7e7f4e61a9d93db7529f5465 Mon Sep 17 00:00:00 2001
From: Yorick van Pelt <yorick@yorickvanpelt.nl>
Date: Sat, 25 Oct 2025 10:10:23 +0200
Subject: [PATCH 2582/6226] victoriametrics: patch go version req in
 vendor/modules.txt and by regex

---
 pkgs/by-name/vi/victoriametrics/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix
index 704465fd1b83..86ed9eb77f8f 100644
--- a/pkgs/by-name/vi/victoriametrics/package.nix
+++ b/pkgs/by-name/vi/victoriametrics/package.nix
@@ -52,8 +52,8 @@ buildGoModule (finalAttrs: {
     rm -f app/vmui/packages/vmui/web/{go.mod,main.go}
 
     # Allow older go versions
-    substituteInPlace go.mod \
-      --replace-fail "go 1.25.3" "go ${finalAttrs.passthru.go.version}"
+    sed -i go.mod -e 's/^go .*/go ${finalAttrs.passthru.go.version}/'
+    sed -i vendor/modules.txt -e 's/## explicit; go .*/## explicit; go ${finalAttrs.passthru.go.version}/'
 
     # Increase timeouts in tests to prevent failure on heavily loaded builders
     substituteInPlace lib/storage/storage_test.go \

From 041b74115dcaaa10b7b9ac73d5ec0e0edeec57a6 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Sat, 25 Oct 2025 08:17:39 +0000
Subject: [PATCH 2583/6226] magic-wormhole: 0.20.0 -> 0.21.0

https://github.com/magic-wormhole/magic-wormhole/blob/refs/tags/0.21.0/NEWS.md
https://github.com/magic-wormhole/magic-wormhole/compare/refs/tags/0.20.0...refs/tags/0.21.0
---
 .../python-modules/magic-wormhole/default.nix  | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index 810a97f6e641..850224bbeb70 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -3,7 +3,6 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
   installShellFiles,
 
   # build-system
@@ -32,8 +31,9 @@
   # tests
   net-tools,
   unixtools,
-  magic-wormhole-transit-relay,
+  hypothesis,
   magic-wormhole-mailbox-server,
+  magic-wormhole-transit-relay,
   pytestCheckHook,
   pytest-twisted,
 
@@ -42,25 +42,16 @@
 
 buildPythonPackage rec {
   pname = "magic-wormhole";
-  version = "0.20.0";
+  version = "0.21.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "magic-wormhole";
     repo = "magic-wormhole";
     tag = version;
-    hash = "sha256-YjzdznZZ/0YTU83f3jlOr6+yOWQ++R1wU9IZDrfAMpo=";
+    hash = "sha256-gsNdV6JvxsdlyPOSn07nTrvU4ju+3si3SQhyN8ZX/ac=";
   };
 
-  patches = [
-    # TODO: drop when updating beyond version 0.20.0
-    (fetchpatch {
-      name = "SubchannelDemultiplex._pending_opens-fix-type.patch";
-      url = "https://github.com/magic-wormhole/magic-wormhole/commit/6d7f48786b5506df5b6a254bc4e37f6bf5d75593.patch";
-      hash = "sha256-28YH3enyQ9rTT56OU7FfFonb9l8beJ9QRgPoItzrgu4=";
-    })
-  ];
-
   postPatch =
     # enable tests by fixing the location of the wormhole binary
     ''
@@ -106,6 +97,7 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
+    hypothesis
     magic-wormhole-mailbox-server
     magic-wormhole-transit-relay
     pytestCheckHook

From 4e6310a337b2f7fa600348c1679ae62dddb93d21 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 08:29:12 +0000
Subject: [PATCH 2584/6226] terragrunt: 0.91.1 -> 0.91.5

---
 pkgs/by-name/te/terragrunt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix
index 569231fc8773..09fa59d731d2 100644
--- a/pkgs/by-name/te/terragrunt/package.nix
+++ b/pkgs/by-name/te/terragrunt/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGo125Module (finalAttrs: {
   pname = "terragrunt";
-  version = "0.91.1";
+  version = "0.91.5";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = "terragrunt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GbPPBEl41p3sI31WuGquvnI+pVQ5zXpGey7zHjsKfw8=";
+    hash = "sha256-/XvqS3lTeoSuqF5NDcXmh2H60AOXn15jETKMUSaJx1w=";
   };
 
   nativeBuildInputs = [

From 39f0287facdcaf9a7eb12911eff14311137f6299 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 08:40:08 +0000
Subject: [PATCH 2585/6226] home-assistant-custom-components.octopus_energy:
 17.0.2 -> 17.0.3

---
 .../custom-components/octopus_energy/package.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix
index 650bc4b690cc..2ea548044e08 100644
--- a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
   owner = "BottlecapDave";
   domain = "octopus_energy";
-  version = "17.0.2";
+  version = "17.0.3";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "HomeAssistant-OctopusEnergy";
     tag = "v${version}";
-    hash = "sha256-K6Jb1fu76wx4v0HLsC8FxX+F/+UlCmUBKSFtUlLTPNc=";
+    hash = "sha256-mogPWl+3BqGSURH7jnbJYB/68ijc1lkfSAc6HfwZWFw=";
   };
 
   dependencies = [ pydantic ];

From 41948ab6a5c65068935788048699b4db782bfb8b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 08:41:10 +0000
Subject: [PATCH 2586/6226] weaviate: 1.33.1 -> 1.33.2

---
 pkgs/by-name/we/weaviate/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/we/weaviate/package.nix b/pkgs/by-name/we/weaviate/package.nix
index 8de555ee8328..772483eceab1 100644
--- a/pkgs/by-name/we/weaviate/package.nix
+++ b/pkgs/by-name/we/weaviate/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "weaviate";
-  version = "1.33.1";
+  version = "1.33.2";
 
   src = fetchFromGitHub {
     owner = "weaviate";
     repo = "weaviate";
     rev = "v${version}";
-    hash = "sha256-Y8oqZMBV7e24+uytiNCkUGC76vA3WW08TDS44eJb04E=";
+    hash = "sha256-+QchAvIBJcbrwveeGHXFC+96oD5Uy/+lqMV/vxRPzbk=";
   };
 
   vendorHash = "sha256-KiDU9fw/4vIhI0XbEzUfw+HhopJniVeGhFVJBbLkixU=";

From d8dfcd8ea7c0162db7fcb27cad0cf10d447be280 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 08:47:39 +0000
Subject: [PATCH 2587/6226] python3Packages.google-cloud-texttospeech: 2.31.0
 -> 2.33.0

---
 .../python-modules/google-cloud-texttospeech/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
index 5341b129dd2d..34a877b8c988 100644
--- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-texttospeech";
-  version = "2.31.0";
+  version = "2.33.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_texttospeech";
     inherit version;
-    hash = "sha256-HwwMZEjxdeHi9j2W+xOvXZq+5pcLuyLB5ANvUxNqVYg=";
+    hash = "sha256-MRFXt0IQzEd38UiramK8LMJLP1Kn3BBsCgIjwYMLYY8=";
   };
 
   build-system = [ setuptools ];

From a5df7f369e35750cc8f7c12529805036c765a9fa Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 25 Oct 2025 10:48:37 +0200
Subject: [PATCH 2588/6226] python313Packages.google-cloud-translate: remove
 disabled

---
 .../python-modules/google-cloud-translate/default.nix          | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-translate/default.nix b/pkgs/development/python-modules/google-cloud-translate/default.nix
index fa7e505a8d16..c0914efd7b3c 100644
--- a/pkgs/development/python-modules/google-cloud-translate/default.nix
+++ b/pkgs/development/python-modules/google-cloud-translate/default.nix
@@ -11,7 +11,6 @@
   protobuf,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
@@ -20,8 +19,6 @@ buildPythonPackage rec {
   version = "3.22.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     pname = "google_cloud_translate";
     inherit version;

From 3904b740da1239af27a2dcfaf8a6caf887b5a527 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 25 Oct 2025 10:50:08 +0200
Subject: [PATCH 2589/6226] python313Packages.glyphslib: add changelog to meta

---
 pkgs/development/python-modules/glyphslib/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/glyphslib/default.nix b/pkgs/development/python-modules/glyphslib/default.nix
index 081a4fd3bfc9..c5a929139e2e 100644
--- a/pkgs/development/python-modules/glyphslib/default.nix
+++ b/pkgs/development/python-modules/glyphslib/default.nix
@@ -54,6 +54,7 @@ buildPythonPackage rec {
   meta = {
     description = "Bridge from Glyphs source files (.glyphs) to UFOs and Designspace files via defcon and designspaceLib";
     homepage = "https://github.com/googlefonts/glyphsLib";
+    changelog = "https://github.com/googlefonts/glyphsLib/releases/tag/${src.tag}";
     license = lib.licenses.asl20;
     maintainers = [ ];
   };

From cb915ed4ff6e2d51fe133c912133373190b5188c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 25 Oct 2025 10:53:24 +0200
Subject: [PATCH 2590/6226] python313Packages.flake8-bugbear: modernize

---
 .../python-modules/flake8-bugbear/default.nix       | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/flake8-bugbear/default.nix b/pkgs/development/python-modules/flake8-bugbear/default.nix
index 7322c6a0a3a3..265a76820dc5 100644
--- a/pkgs/development/python-modules/flake8-bugbear/default.nix
+++ b/pkgs/development/python-modules/flake8-bugbear/default.nix
@@ -8,14 +8,13 @@
   pythonOlder,
   hypothesis,
   hypothesmith,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "flake8-bugbear";
   version = "25.10.21";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PyCQA";
@@ -24,7 +23,9 @@ buildPythonPackage rec {
     hash = "sha256-4ZTi1w+L0M6LCB4G+OxHBnUV0f6s/JPY6tKOt1zh7So=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     attrs
     flake8
   ];
@@ -36,10 +37,12 @@ buildPythonPackage rec {
     hypothesmith
   ];
 
+  pythonImportsCheck = [ "bugbear" ];
+
   meta = with lib; {
     description = "Plugin for Flake8 to find bugs and design problems";
     homepage = "https://github.com/PyCQA/flake8-bugbear";
-    changelog = "https://github.com/PyCQA/flake8-bugbear/blob/${version}/README.rst#change-log";
+    changelog = "https://github.com/PyCQA/flake8-bugbear/blob/${src.tag}/README.rst#change-log";
     longDescription = ''
       A plugin for flake8 finding likely bugs and design problems in your
       program.

From ec788027d17d86ae169ddb9c70ed897f69f9637f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 09:05:47 +0000
Subject: [PATCH 2591/6226] python3Packages.google-cloud-workstations: 0.5.15
 -> 0.6.0

---
 .../python-modules/google-cloud-workstations/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-workstations/default.nix b/pkgs/development/python-modules/google-cloud-workstations/default.nix
index 8ebd364bb461..f893c6534c92 100644
--- a/pkgs/development/python-modules/google-cloud-workstations/default.nix
+++ b/pkgs/development/python-modules/google-cloud-workstations/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-workstations";
-  version = "0.5.15";
+  version = "0.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_workstations";
     inherit version;
-    hash = "sha256-/lpcGxxc1razAXmESpn6JfVYkqj5gRoLiyWM3vXlqWk=";
+    hash = "sha256-/CwdmF9fSTDPXbWTq3o+ZaWvgd/F2wVB7zboSOQ7+GY=";
   };
 
   build-system = [ setuptools ];

From 03c1349a2c0b71907abe4d57c84ae0afefc90aa2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 25 Oct 2025 11:10:41 +0200
Subject: [PATCH 2592/6226] python313Packages.clickclick: disable failing test

- modernize
---
 .../python-modules/clickclick/default.nix     | 34 ++++++++++++-------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/clickclick/default.nix b/pkgs/development/python-modules/clickclick/default.nix
index 170ffd907128..666755eac583 100644
--- a/pkgs/development/python-modules/clickclick/default.nix
+++ b/pkgs/development/python-modules/clickclick/default.nix
@@ -1,19 +1,20 @@
 {
   lib,
   buildPythonPackage,
+  click,
   fetchFromGitea,
   flake8,
-  click,
-  pyyaml,
-  six,
-  pytestCheckHook,
   pytest-cov-stub,
+  pytestCheckHook,
+  pyyaml,
+  setuptools,
+  six,
 }:
 
 buildPythonPackage rec {
   pname = "clickclick";
   version = "20.10.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchFromGitea {
     domain = "codeberg.org";
@@ -23,23 +24,32 @@ buildPythonPackage rec {
     hash = "sha256-gefU6CI4ibtvonsaKZmuffuUNUioBn5ODs72BI5zXOw=";
   };
 
-  nativeCheckInputs = [
-    pytestCheckHook
-    pytest-cov-stub
-  ];
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     flake8
     click
     pyyaml
     six
   ];
 
-  # test_cli asserts on exact quoting style of output
-  disabledTests = [ "test_cli" ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov-stub
+  ];
+
+  pythonImportsCheck = [ "clickclick" ];
+
+  disabledTests = [
+    # Tests asserts on exact quoting style of output
+    "test_choice_default"
+    "test_cli"
+  ];
 
   meta = with lib; {
     description = "Click command line utilities";
     homepage = "https://codeberg.org/hjacobs/python-clickclick/";
     license = licenses.asl20;
+    maintainers = [ ];
   };
 }

From 93ef27018606f440e47f0b824a4177e3f688225d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 09:14:19 +0000
Subject: [PATCH 2593/6226] home-manager: 0-unstable-2025-10-18 ->
 0-unstable-2025-10-25

---
 pkgs/by-name/ho/home-manager/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix
index 9c018c365756..1af40524d040 100644
--- a/pkgs/by-name/ho/home-manager/package.nix
+++ b/pkgs/by-name/ho/home-manager/package.nix
@@ -19,14 +19,14 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "home-manager";
-  version = "0-unstable-2025-10-18";
+  version = "0-unstable-2025-10-25";
 
   src = fetchFromGitHub {
     name = "home-manager-source";
     owner = "nix-community";
     repo = "home-manager";
-    rev = "870883ba11ba1c84f756c0c1f9fa74cdb2a16c1e";
-    hash = "sha256-OxGcFcQdfOK8veZkPdQuqXIotFYiy4sBQB58dMNLeHY=";
+    rev = "c644cb018f9fdec55f5ac2afb4713a8c7beb757c";
+    hash = "sha256-6LNSptFYhiAd0M/maJoixJw7V0Kp5BSoMRtIahcfu3M=";
   };
 
   nativeBuildInputs = [

From 150dc7aff5852d151459cea57665be816d7570bd Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Thu, 23 Oct 2025 15:21:36 +0200
Subject: [PATCH 2594/6226] wireshark: 4.4.9 -> 4.6.0

---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index a030ed2c47fe..1d74c153494f 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -25,6 +25,7 @@
   libpcap,
   libsmi,
   libssh,
+  libxml2,
   lua5_4,
   lz4,
   makeWrapper,
@@ -56,7 +57,7 @@ assert withQt -> qt6 != null;
 
 stdenv.mkDerivation rec {
   pname = "wireshark-${if withQt then "qt" else "cli"}";
-  version = "4.4.9";
+  version = "4.6.0";
 
   outputs = [
     "out"
@@ -67,7 +68,7 @@ stdenv.mkDerivation rec {
     repo = "wireshark";
     owner = "wireshark";
     rev = "v${version}";
-    hash = "sha256-0+uPXSNabsYNGn+4753WNoUBe9lJ2EH3i3J36lqI4Ak=";
+    hash = "sha256-XkHcVN3xCYwnS69nJ4/AT76Iaggt1GXA6JWi+IG15IM=";
   };
 
   patches = [
@@ -111,6 +112,7 @@ stdenv.mkDerivation rec {
     libpcap
     libsmi
     libssh
+    libxml2
     lua5_4
     lz4
     minizip

From 96764e567f02ed89f29f36ded39a29ed2dc53e1a Mon Sep 17 00:00:00 2001
From: Erlend Hamberg <erlend@hamberg.no>
Date: Sat, 25 Oct 2025 11:20:17 +0200
Subject: [PATCH 2595/6226] lean4: 4.23.0 -> 4.24.0

---
 pkgs/by-name/le/lean4/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/le/lean4/package.nix b/pkgs/by-name/le/lean4/package.nix
index 565042ebc3d1..fab3716094e5 100644
--- a/pkgs/by-name/le/lean4/package.nix
+++ b/pkgs/by-name/le/lean4/package.nix
@@ -15,7 +15,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lean4";
-  version = "4.23.0";
+  version = "4.24.0";
 
   # Using a vendored version rather than nixpkgs' version to match the exact version required by
   # Lean.  Apparently, even a slight version change can impact greatly the final performance.
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "leanprover";
     repo = "lean4";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wcB3HxSNukIOttjrfvDQB5IkmhYG9w/UMeOfCQ1+lvo=";
+    hash = "sha256-m0DjKjFia5F5rCVMgn2xxPbbU/5uy7g84FUXSBPgy3w=";
   };
 
   postPatch =

From e519322e9f969e8bef8c0c92d205a6b7ad87115c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 09:26:24 +0000
Subject: [PATCH 2596/6226] n8n: 1.115.3 -> 1.116.2

---
 pkgs/by-name/n8/n8n/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix
index 382c583f0475..ad76b10d9ed7 100644
--- a/pkgs/by-name/n8/n8n/package.nix
+++ b/pkgs/by-name/n8/n8n/package.nix
@@ -17,19 +17,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "n8n";
-  version = "1.115.3";
+  version = "1.116.2";
 
   src = fetchFromGitHub {
     owner = "n8n-io";
     repo = "n8n";
     tag = "n8n@${finalAttrs.version}";
-    hash = "sha256-9UDPckn+0xtwZcLaHCzhC4yKdDqjat0F4nHuxVdIRMA=";
+    hash = "sha256-pHrJ/l3L+asf0ZXcWVvOzzdoDYnAUvaR9GxB/m/jvzU=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-mJJIdLtJ3E4eMub4szJA+40ZL4WkLNupwqvq3JnFxtk=";
+    hash = "sha256-uBnb781B84Rm9gbco7p5iDp18sfjbULbedaRIk7kaLE=";
   };
 
   nativeBuildInputs = [

From 7e5d1fe1780ef08114a7db470e22e5cf74c179cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 09:30:21 +0000
Subject: [PATCH 2597/6226] plasmusic-toolbar: 3.6.0 -> 3.7.0

---
 pkgs/by-name/pl/plasmusic-toolbar/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pl/plasmusic-toolbar/package.nix b/pkgs/by-name/pl/plasmusic-toolbar/package.nix
index 4b71b298b1e2..c02c5a6da7b2 100644
--- a/pkgs/by-name/pl/plasmusic-toolbar/package.nix
+++ b/pkgs/by-name/pl/plasmusic-toolbar/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "plasmusic-toolbar";
-  version = "3.6.0";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "ccatterina";
     repo = "plasmusic-toolbar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Vs+aMTVaRaPuiFvLbW+BgOzdzPGYb3mEKdZqQyoSwC4=";
+    hash = "sha256-yCsNvco01dy72f8g1+BCYXo1yx/ERdfggLYchj/UXcw=";
   };
 
   installPhase = ''

From c4eedf844eca4cc775f4f51c21d82ae749a6a602 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 09:33:42 +0000
Subject: [PATCH 2598/6226] mcp-grafana: 0.7.6 -> 0.7.8

---
 pkgs/by-name/mc/mcp-grafana/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mc/mcp-grafana/package.nix b/pkgs/by-name/mc/mcp-grafana/package.nix
index 5e17fda1e8fb..fa0d1aee195a 100644
--- a/pkgs/by-name/mc/mcp-grafana/package.nix
+++ b/pkgs/by-name/mc/mcp-grafana/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "mcp-grafana";
-  version = "0.7.6";
+  version = "0.7.8";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "mcp-grafana";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ue/o2T9tLE7y4CCwOxEWd44LPwtI1szkyf5v9a9zdZ0=";
+    hash = "sha256-NFEFPvcq6BMfwnaybAMKZEtP5kCicPr36nLOqaqsm9A=";
   };
 
-  vendorHash = "sha256-unoLSUasCUbFbml6q1lBCE0YBFENFkrpxXpXoZSo49s=";
+  vendorHash = "sha256-XgbTwyiRZgq6sg3AML+RlUhnx7YTOe5VlBZq665/T6g=";
 
   ldflags = [
     "-s"

From d8f1a7b5b2e1597c69c3562890a76eb6a17612bc Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 25 Oct 2025 10:37:05 +0100
Subject: [PATCH 2599/6226] mpv: backport ffmpeg-8 support

Without the change `mpv` fails to build on` staging` as:

    ../demux/demux_mkv.c: In function 'demux_mkv_open_sub':
    ../demux/demux_mkv.c:2203:32: error: 'FF_PROFILE_ARIB_PROFILE_A' undeclared (first use in this function); did you mean 'AV_PROFILE_ARIB_PROFILE_A'?
     2203 |                 lav->profile = FF_PROFILE_ARIB_PROFILE_A;
          |                                ^~~~~~~~~~~~~~~~~~~~~~~~~
          |                                AV_PROFILE_ARIB_PROFILE_A
---
 pkgs/applications/video/mpv/default.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix
index b11bccf732b1..0ea229fa5f45 100644
--- a/pkgs/applications/video/mpv/default.nix
+++ b/pkgs/applications/video/mpv/default.nix
@@ -9,6 +9,7 @@
   config,
   docutils,
   fetchFromGitHub,
+  fetchpatch,
   ffmpeg,
   freefont_ttf,
   freetype,
@@ -112,6 +113,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-x8cDczKIX4+KrvRxZ+72TGlEQHd4Kx7naq0CSoOZGHA=";
   };
 
+  patches = [
+    # ffmpeg-8 compat:
+    #   https://github.com/mpv-player/mpv/pull/16145
+    (fetchpatch {
+      name = "ffmpeg-8.patch";
+      url = "https://github.com/mpv-player/mpv/commit/26b29fba02a2782f68e2906f837d21201fc6f1b9.patch";
+      hash = "sha256-ANNoTtIJBARHbm5IgrE0eEZyzmNhOnbVgve7iqCBzQg=";
+    })
+  ];
+
   postPatch = lib.concatStringsSep "\n" [
     # Don't reference compile time dependencies or create a build outputs cycle
     # between out and dev

From 60fc64db39959842d6ae82d0ab860ad033429dba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 09:43:14 +0000
Subject: [PATCH 2600/6226] python3Packages.cohere: 5.19.0 -> 5.20.0

---
 pkgs/development/python-modules/cohere/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cohere/default.nix b/pkgs/development/python-modules/cohere/default.nix
index 8ddebb9208f5..c7d59b403351 100644
--- a/pkgs/development/python-modules/cohere/default.nix
+++ b/pkgs/development/python-modules/cohere/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "cohere";
-  version = "5.19.0";
+  version = "5.20.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cohere-ai";
     repo = "cohere-python";
     tag = version;
-    hash = "sha256-AT3ZnIjs/xd0+cDR4s7uxui38liz4Iy+7EQ4Rw0vjqA=";
+    hash = "sha256-Y0IxKKq1D7tRzbNSjWDuLYEpRChRA89t91BstvE8Tng=";
   };
 
   build-system = [ poetry-core ];

From 50fdfc5a0759dc87f83b11c1bfd7fad0f0bac741 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 25 Oct 2025 12:04:00 +0200
Subject: [PATCH 2601/6226] python313Packages.google-cloud-workstations: remove
 disabled

Removed dependency on pythonOlder for version 3.8.
---
 .../python-modules/google-cloud-workstations/default.nix       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-workstations/default.nix b/pkgs/development/python-modules/google-cloud-workstations/default.nix
index f893c6534c92..435e1af48a26 100644
--- a/pkgs/development/python-modules/google-cloud-workstations/default.nix
+++ b/pkgs/development/python-modules/google-cloud-workstations/default.nix
@@ -10,7 +10,6 @@
   protobuf,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
@@ -19,8 +18,6 @@ buildPythonPackage rec {
   version = "0.6.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     pname = "google_cloud_workstations";
     inherit version;

From 7a0d05be3efdc8e759fa2e036c598566e7b92f90 Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Sat, 25 Oct 2025 12:07:10 +0200
Subject: [PATCH 2602/6226] python3Packages.pyshark: adds fixes for wireshark
 4.6.0

---
 pkgs/development/python-modules/pyshark/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/pyshark/default.nix b/pkgs/development/python-modules/pyshark/default.nix
index 3df8c781aaa2..e2cb49c23797 100644
--- a/pkgs/development/python-modules/pyshark/default.nix
+++ b/pkgs/development/python-modules/pyshark/default.nix
@@ -35,6 +35,12 @@ buildPythonPackage rec {
       url = "https://github.com/KimiNewt/pyshark/commit/7142c5bf88abcd4c65c81052a00226d6155dda42.patch";
       hash = "sha256-Ti7cwRyYSbF4a4pEEV9FntNevkV/JVXNqACQWzoma7g=";
     })
+    # fixes tests that failed related to elastic-mapping
+    # remove fix if this is ever merged upstream
+    (fetchpatch {
+      url = "https://github.com/KimiNewt/pyshark/commit/0e1d8d0e06108f2887c3147c93049de63b475f8a.patch";
+      hash = "sha256-fpgiBHcfS/TGYIB65ioZJrWUuDIrLxxXqGVJ9y18b2w=";
+    })
     (replaceVars ./hardcode-tshark-path.patch {
       tshark = lib.getExe' wireshark-cli "tshark";
     })

From 80ee38741ad67cfa7b2ce30bd7e844065bca0e35 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sat, 25 Oct 2025 15:37:52 +0530
Subject: [PATCH 2603/6226] libdisplay-info_0_2: init at 0.2.0

for niri, cosmic-comp, pin libdisplay-info
---
 pkgs/by-name/co/cosmic-comp/package.nix        |  4 ++--
 pkgs/by-name/li/libdisplay-info/package.nix    |  6 +++---
 .../by-name/li/libdisplay-info_0_2/package.nix | 18 ++++++++++++++++++
 pkgs/by-name/ni/niri/package.nix               |  4 ++--
 pkgs/by-name/we/weston/package.nix             |  4 ++--
 5 files changed, 27 insertions(+), 9 deletions(-)
 create mode 100644 pkgs/by-name/li/libdisplay-info_0_2/package.nix

diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix
index 1011e2cfc43c..8ab4bf69962e 100644
--- a/pkgs/by-name/co/cosmic-comp/package.nix
+++ b/pkgs/by-name/co/cosmic-comp/package.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
   libcosmicAppHook,
   pkg-config,
-  libdisplay-info,
+  libdisplay-info_0_2,
   libgbm,
   libinput,
   pixman,
@@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   buildInputs = [
-    libdisplay-info
+    libdisplay-info_0_2
     libgbm
     libinput
     pixman
diff --git a/pkgs/by-name/li/libdisplay-info/package.nix b/pkgs/by-name/li/libdisplay-info/package.nix
index efa503d495a2..020c587cb7c6 100644
--- a/pkgs/by-name/li/libdisplay-info/package.nix
+++ b/pkgs/by-name/li/libdisplay-info/package.nix
@@ -10,7 +10,7 @@
   v4l-utils,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libdisplay-info";
   version = "0.3.0";
 
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
     domain = "gitlab.freedesktop.org";
     owner = "emersion";
     repo = "libdisplay-info";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "sha256-nXf2KGovNKvcchlHlzKBkAOeySMJXgxMpbi5z9gLrdc=";
   };
 
@@ -44,4 +44,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     maintainers = with maintainers; [ pedrohlc ];
   };
-}
+})
diff --git a/pkgs/by-name/li/libdisplay-info_0_2/package.nix b/pkgs/by-name/li/libdisplay-info_0_2/package.nix
new file mode 100644
index 000000000000..802dc582ebd2
--- /dev/null
+++ b/pkgs/by-name/li/libdisplay-info_0_2/package.nix
@@ -0,0 +1,18 @@
+{
+  libdisplay-info,
+  fetchFromGitLab,
+}:
+
+libdisplay-info.overrideAttrs (
+  finalAttrs: oldAttrs: {
+    version = "0.2.0";
+
+    src = fetchFromGitLab {
+      domain = "gitlab.freedesktop.org";
+      owner = "emersion";
+      repo = "libdisplay-info";
+      rev = finalAttrs.version;
+      sha256 = "sha256-6xmWBrPHghjok43eIDGeshpUEQTuwWLXNHg7CnBUt3Q=";
+    };
+  }
+)
diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix
index 52dee4964bcd..43f4d7c45ff1 100644
--- a/pkgs/by-name/ni/niri/package.nix
+++ b/pkgs/by-name/ni/niri/package.nix
@@ -4,7 +4,7 @@
   eudev,
   fetchFromGitHub,
   installShellFiles,
-  libdisplay-info,
+  libdisplay-info_0_2,
   libglvnd,
   libinput,
   libxkbcommon,
@@ -58,7 +58,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ];
 
   buildInputs = [
-    libdisplay-info
+    libdisplay-info_0_2
     libglvnd # For libEGL
     libinput
     libxkbcommon
diff --git a/pkgs/by-name/we/weston/package.nix b/pkgs/by-name/we/weston/package.nix
index 4a07300af6b4..3980a633deae 100644
--- a/pkgs/by-name/we/weston/package.nix
+++ b/pkgs/by-name/we/weston/package.nix
@@ -10,7 +10,7 @@
   wayland-scanner,
   cairo,
   libGL,
-  libdisplay-info,
+  libdisplay-info_0_2,
   libdrm,
   libevdev,
   libinput,
@@ -76,7 +76,7 @@ stdenv.mkDerivation rec {
   buildInputs = [
     cairo
     libGL
-    libdisplay-info
+    libdisplay-info_0_2
     libdrm
     libevdev
     libinput

From f9b985c647a3c9a96ba1f5e51fc9dc9bb73660ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 10:12:02 +0000
Subject: [PATCH 2604/6226] stackit-cli: 0.44.1 -> 0.45.0

---
 pkgs/by-name/st/stackit-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix
index f3cb1f54e5d6..48fda0c614f6 100644
--- a/pkgs/by-name/st/stackit-cli/package.nix
+++ b/pkgs/by-name/st/stackit-cli/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "stackit-cli";
-  version = "0.44.1";
+  version = "0.45.0";
 
   src = fetchFromGitHub {
     owner = "stackitcloud";
     repo = "stackit-cli";
     rev = "v${version}";
-    hash = "sha256-ppD7Jp04J5K99ND3BMGklyttg8SIH+zZBG1tEfHW990=";
+    hash = "sha256-fZ1SlWmPfxhUrLU7mzhM1IP93QgCg2EO3b1JjFDTkcY=";
   };
 
-  vendorHash = "sha256-2dhc4RpT5ceEBeS/VkuNR9ll7lZ9N/QlkvCCOtVO5XM=";
+  vendorHash = "sha256-pgO+KN6s9MNsOaTiiX4xxsVYPPE5KoTDvG9R8vlRiTw=";
 
   subPackages = [ "." ];
 

From 21a1861b14c7645de67678a70a872dab7783a280 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 25 Oct 2025 12:38:15 +0200
Subject: [PATCH 2605/6226] python313Packages.google-cloud-texttospeech: remove
 disabled

---
 .../python-modules/google-cloud-texttospeech/default.nix       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
index 34a877b8c988..1286c6facfd3 100644
--- a/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
+++ b/pkgs/development/python-modules/google-cloud-texttospeech/default.nix
@@ -8,7 +8,6 @@
   protobuf,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "2.33.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     pname = "google_cloud_texttospeech";
     inherit version;

From ba90933f6e88b572332bb1383e115dcba1712c9b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 10:39:49 +0000
Subject: [PATCH 2606/6226] comaps: 2025.10.16-1 -> 2025.10.20-1

---
 pkgs/by-name/co/comaps/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/comaps/package.nix b/pkgs/by-name/co/comaps/package.nix
index be08d8e2d773..5667c5231ed1 100644
--- a/pkgs/by-name/co/comaps/package.nix
+++ b/pkgs/by-name/co/comaps/package.nix
@@ -36,14 +36,14 @@ let
 in
 organicmaps.overrideAttrs (oldAttrs: rec {
   pname = "comaps";
-  version = "2025.10.16-1";
+  version = "2025.10.20-1";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "comaps";
     repo = "comaps";
     tag = "v${version}";
-    hash = "sha256-2pnAYc5Ru1OK7ecCN1kKryAPPdxUIGQp9x2y4MosRl8=";
+    hash = "sha256-9L7wyIXieKkKSrudnmPyiLPu4Jfp10xWi5o5lGslLWc=";
     fetchSubmodules = true;
   };
 

From 89107568862b2f21f790e955797f330589797980 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 25 Oct 2025 12:42:29 +0200
Subject: [PATCH 2607/6226] python313Packages.pyngrok: remove disabled

---
 pkgs/development/python-modules/pyngrok/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyngrok/default.nix b/pkgs/development/python-modules/pyngrok/default.nix
index 9a0fefb7cb67..f08e4fe6a250 100644
--- a/pkgs/development/python-modules/pyngrok/default.nix
+++ b/pkgs/development/python-modules/pyngrok/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchPypi,
   setuptools,
   pyyaml,
@@ -12,8 +11,6 @@ buildPythonPackage rec {
   version = "7.4.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-rYY3c4ztW9uIwosIf+o5ylUoYMLTAASsAQM8D460824=";

From 6442144f0a4c68fd3baa529a7d189464938b4d57 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 07:43:35 -0300
Subject: [PATCH 2608/6226] taskserver: fix build with cmake4

---
 pkgs/by-name/ta/taskserver/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ta/taskserver/package.nix b/pkgs/by-name/ta/taskserver/package.nix
index 7d424cc874c0..5112984aaf6a 100644
--- a/pkgs/by-name/ta/taskserver/package.nix
+++ b/pkgs/by-name/ta/taskserver/package.nix
@@ -35,6 +35,11 @@ stdenv.mkDerivation rec {
       makeWrapper  $pkipath/$i $out/bin/taskd-pki-$i \
         --prefix PATH : ${lib.makeBinPath [ gnutls ]}
     done
+
+    substituteInPlace {doc/,src/,./}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_policy(SET CMP0037 OLD)" ""
   '';
 
   buildInputs = [

From b4794520a9edcad2263d9813d68ab04590f1796d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 08:57:45 +0000
Subject: [PATCH 2609/6226] python3Packages.notion-client: 2.5.0 -> 2.6.0

---
 pkgs/development/python-modules/notion-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/notion-client/default.nix b/pkgs/development/python-modules/notion-client/default.nix
index 2463b925176a..9ad8b02c58b5 100644
--- a/pkgs/development/python-modules/notion-client/default.nix
+++ b/pkgs/development/python-modules/notion-client/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "notion-client";
-  version = "2.5.0";
+  version = "2.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "ramnes";
     repo = "notion-sdk-py";
     tag = version;
-    hash = "sha256-5SuSfjKs5+2lAVyzK3JVk1naiaYYYBF+X2I+k53Fqx4=";
+    hash = "sha256-kUeZhnQwZ+To5NCo7jtQsTfX1kQotbAHDcHf2qwGOIs=";
   };
 
   nativeBuildInputs = [ setuptools ];

From dadfbbb816a6fbd7764c2adb71ae5f167833588c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 25 Oct 2025 12:30:03 +0200
Subject: [PATCH 2610/6226] python313Packages.notion-client: modernize

---
 .../python-modules/notion-client/default.nix  | 24 +++++++------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/notion-client/default.nix b/pkgs/development/python-modules/notion-client/default.nix
index 9ad8b02c58b5..cc60507b7515 100644
--- a/pkgs/development/python-modules/notion-client/default.nix
+++ b/pkgs/development/python-modules/notion-client/default.nix
@@ -1,14 +1,14 @@
 {
   lib,
+  anyio,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
-  pytestCheckHook,
-  setuptools,
-  anyio,
   httpx,
   pytest-asyncio,
+  pytest-cov-stub,
   pytest-vcr,
+  pytestCheckHook,
+  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -16,8 +16,6 @@ buildPythonPackage rec {
   version = "2.6.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "ramnes";
     repo = "notion-sdk-py";
@@ -25,26 +23,22 @@ buildPythonPackage rec {
     hash = "sha256-kUeZhnQwZ+To5NCo7jtQsTfX1kQotbAHDcHf2qwGOIs=";
   };
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [ httpx ];
-
-  # disable coverage options as they don't provide us value, and they break the default pytestCheckHook
-  preCheck = ''
-    sed -i '/addopts/d' ./setup.cfg
-  '';
+  dependencies = [ httpx ];
 
   nativeCheckInputs = [
-    pytestCheckHook
     anyio
     pytest-asyncio
+    pytest-cov-stub
     pytest-vcr
+    pytestCheckHook
   ];
 
   pythonImportsCheck = [ "notion_client" ];
 
   disabledTests = [
-    # requires network access
+    # Test requires network access
     "test_api_http_response_error"
   ];
 

From 93a062629c0d0507b2a271addb0ed92181e3f6d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 10:56:54 +0000
Subject: [PATCH 2611/6226] vscode-extensions.visualjj.visualjj: 0.18.0 ->
 0.19.0

---
 .../vscode/extensions/visualjj.visualjj/default.nix    | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
index 00f10447ca60..6d1eb3fee9f0 100644
--- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix
@@ -11,26 +11,26 @@ vscode-utils.buildVscodeMarketplaceExtension {
       sources = {
         "x86_64-linux" = {
           arch = "linux-x64";
-          hash = "sha256-WhCUOHS2y1NNTEs3Oo6lHz1YcQmj/9zcLFNi7dIO2Hs=";
+          hash = "sha256-zhn3pZ8Q6clAsYXsdHGMYZJHMGL8VGIUs7fsmUkU2nE=";
         };
         "x86_64-darwin" = {
           arch = "darwin-x64";
-          hash = "sha256-M3ZC9lq0hVoBaxzaOuzeKRy7iAPsPgi+2IHU0KaujmI=";
+          hash = "sha256-ubs0zMmPP/YBBZ3Nn41R8b4E2Rwi83xK6EKhsaUHXsk=";
         };
         "aarch64-linux" = {
           arch = "linux-arm64";
-          hash = "sha256-ElqAiZGulYiSVay74UC04C0lKSHo1AwhtE05To8ir84=";
+          hash = "sha256-GUNJFIiCSXpw/lIfHOerbbs/j3KAut75u08wCktTqCk=";
         };
         "aarch64-darwin" = {
           arch = "darwin-arm64";
-          hash = "sha256-x7sZdxjouRBuCz5po+54HJ5Cdc9oEk5REplfQmNdvB4=";
+          hash = "sha256-fL8OmeekDzj3t5lFirc4C5kYlaAGh4/BanmWsPj2BGI=";
         };
       };
     in
     {
       name = "visualjj";
       publisher = "visualjj";
-      version = "0.18.0";
+      version = "0.19.0";
     }
     // sources.${stdenvNoCC.hostPlatform.system}
       or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}");

From 0b120fef819880e00add965ce6b987d8453ac08e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 25 Oct 2025 13:40:06 +0200
Subject: [PATCH 2612/6226] python313Packages.sqlglot: 27.6.0 -> 27.28.1

Diff: https://github.com/tobymao/sqlglot/compare/v27.6.0...v27.28.1

Changelog: https://github.com/tobymao/sqlglot/blob/v27.28.1/CHANGELOG.md
---
 pkgs/development/python-modules/sqlglot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sqlglot/default.nix b/pkgs/development/python-modules/sqlglot/default.nix
index 0499fd11382d..35e507549ccf 100644
--- a/pkgs/development/python-modules/sqlglot/default.nix
+++ b/pkgs/development/python-modules/sqlglot/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "sqlglot";
-  version = "27.6.0";
+  version = "27.28.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     repo = "sqlglot";
     owner = "tobymao";
     tag = "v${version}";
-    hash = "sha256-/+hrbyAQJHbKzjaBr9ssuXuKpbCSWAarLa5oX5NqfOc=";
+    hash = "sha256-DGpxKIlSRwKKXhZGDTTQb8a3iAzy8a7h9/PKHPCuq+g=";
   };
 
   build-system = [

From a962f0534e1bd8bfe7440621747405c2720ef124 Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sat, 25 Oct 2025 13:40:44 +0200
Subject: [PATCH 2613/6226] stalwart-mail: 0.13.4 -> 0.14.0

---
 pkgs/by-name/st/stalwart-mail/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix
index f1d9a2a723f7..e99bccc85287 100644
--- a/pkgs/by-name/st/stalwart-mail/package.nix
+++ b/pkgs/by-name/st/stalwart-mail/package.nix
@@ -20,16 +20,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "stalwart-mail" + (lib.optionalString stalwartEnterprise "-enterprise");
-  version = "0.13.4";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "stalwartlabs";
     repo = "stalwart";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1WKmSgDZ3c6+fFKH9+kgrxFYthKQqE1455bFHlVCGhU=";
+    hash = "sha256-KH68lFF1eqYZiI5AjzDRX6Z21MQ9At4jH6x9jsQzejE=";
   };
 
-  cargoHash = "sha256-i6AvyX4RObB9aa+TYvsOW8i9WTcYx8ddP/Jmyr8PWMY=";
+  cargoHash = "sha256-pjmAIC7g8SbMxZvTgaXH8GrRPhITDjC5psJpfT+vV6M=";
 
   nativeBuildInputs = [
     pkg-config

From 8f840f9f0d2e012d3eeb604be27b95b9f0fba1d5 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 08:42:00 -0300
Subject: [PATCH 2614/6226] volk_2: fix build with cmake4

---
 pkgs/by-name/vo/volk_2/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/vo/volk_2/package.nix b/pkgs/by-name/vo/volk_2/package.nix
index 4ce83db262f2..bc8f9c803f63 100644
--- a/pkgs/by-name/vo/volk_2/package.nix
+++ b/pkgs/by-name/vo/volk_2/package.nix
@@ -58,6 +58,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   doCheck = true;
 
+  postPatch = ''
+    substituteInPlace cpu_features/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     homepage = "http://libvolk.org/";
     description = "Vector Optimized Library of Kernels (version 2.5.0 - for GR 3.8)";

From 68d5328122d008e7cfc70d1fb14e173fefc4f6c5 Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Sat, 25 Oct 2025 00:38:25 +0200
Subject: [PATCH 2615/6226] graalvm-oracle_25: bump hashes, use archive URL

---
 .../compilers/graalvm/graalvm-oracle/hashes.nix  | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
index bb75fa8142c7..2a0202554eb6 100644
--- a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
+++ b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
@@ -6,20 +6,20 @@
 {
   "25" = {
     "aarch64-linux" = {
-      hash = "sha256-pGirVIPXTz0p39qpybKbKSYaOp5JeG0hxKnACwbBVuo=";
-      url = "https://download.oracle.com/graalvm/25/latest/graalvm-jdk-25_linux-aarch64_bin.tar.gz";
+      hash = "sha256-7dd1ZcdlcKbfXzjlPVRSQQLywbHPdO69n1Hn/Bn2Z80=";
+      url = "https://download.oracle.com/graalvm/25/archive/graalvm-jdk-25.0.1_linux-aarch64_bin.tar.gz";
     };
     "x86_64-linux" = {
-      hash = "sha256-BNuoXdzg33UtbWngR2Z2/a0JmLfaXToPmq0f5uP/ocU=";
-      url = "https://download.oracle.com/graalvm/25/latest/graalvm-jdk-25_linux-x64_bin.tar.gz";
+      hash = "sha256-1KsCuhAp5jnwM3T9+RwkLh0NSQeYgOGvGTLqe3xDGDc=";
+      url = "https://download.oracle.com/graalvm/25/archive/graalvm-jdk-25.0.1_linux-x64_bin.tar.gz";
     };
     "x86_64-darwin" = {
-      hash = "sha256-+Z4+6kgIoLc7VZ4oxGRs8JHfEtakwGX+80ZkqxcpkTc=";
-      url = "https://download.oracle.com/graalvm/25/latest/graalvm-jdk-25_macos-x64_bin.tar.gz";
+      hash = "sha256-p2LKHZoWPjJ5C5KG869MFjaXKf8nmZ2NurYNe+Fs/y8=";
+      url = "https://download.oracle.com/graalvm/25/archive/graalvm-jdk-25.0.1_macos-x64_bin.tar.gz";
     };
     "aarch64-darwin" = {
-      hash = "sha256-bnfxewEInf2wxUzOiqk2hH4qAZ4BEEGIE7SbO9l03JA=";
-      url = "https://download.oracle.com/graalvm/25/latest/graalvm-jdk-25_macos-aarch64_bin.tar.gz";
+      hash = "sha256-Gd/UmtES5ubCve3FB8aFm/ISlPpMFk8b5nDUacZbeZM=";
+      url = "https://download.oracle.com/graalvm/25/archive/graalvm-jdk-25.0.1_macos-aarch64_bin.tar.gz";
     };
   };
   "17" = {

From 60ea37771541df0383159b5c6f59cdc14934b02d Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 08:47:39 -0300
Subject: [PATCH 2616/6226] wdt: fix build with cmake4

---
 pkgs/by-name/wd/wdt/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/wd/wdt/package.nix b/pkgs/by-name/wd/wdt/package.nix
index 42ff4f8d080d..b4cd2c1e59ef 100644
--- a/pkgs/by-name/wd/wdt/package.nix
+++ b/pkgs/by-name/wd/wdt/package.nix
@@ -51,6 +51,11 @@ stdenv.mkDerivation {
     };
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Warp speed Data Transfer";
     homepage = "https://github.com/facebook/wdt";

From d3bd0b531a09e185dc6f47089b1f5dce3b6c6ebc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 11:50:33 +0000
Subject: [PATCH 2617/6226] python3Packages.google-cloud-vision: 3.10.2 ->
 3.11.0

---
 .../python-modules/google-cloud-vision/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix
index f6aa2a3fae52..f7e2a5a66046 100644
--- a/pkgs/development/python-modules/google-cloud-vision/default.nix
+++ b/pkgs/development/python-modules/google-cloud-vision/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-vision";
-  version = "3.10.2";
+  version = "3.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_vision";
     inherit version;
-    hash = "sha256-ZJOA+quJM0QLYyv4gHLAw4KgjUmrArwLT7qCGIKuF2U=";
+    hash = "sha256-w8tX3yzxUuvmLrqumx1d7/Wiauxb1uHH9n5Ev29FGPQ=";
   };
 
   build-system = [ setuptools ];

From de7ce4e724324add70be97c02b0a4d77f666bd9a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 25 Oct 2025 14:00:15 +0200
Subject: [PATCH 2618/6226] python313Packages.google-cloud-vision: remove
 disabled

---
 .../development/python-modules/google-cloud-vision/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-vision/default.nix b/pkgs/development/python-modules/google-cloud-vision/default.nix
index f7e2a5a66046..5d232589127e 100644
--- a/pkgs/development/python-modules/google-cloud-vision/default.nix
+++ b/pkgs/development/python-modules/google-cloud-vision/default.nix
@@ -8,7 +8,6 @@
   protobuf,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "3.11.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     pname = "google_cloud_vision";
     inherit version;

From e059a98bd44d58a18c21444359115a5e1935c6d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 12:01:38 +0000
Subject: [PATCH 2619/6226] odhcp6c: 0-unstable-2025-10-17 ->
 0-unstable-2025-10-21

---
 pkgs/by-name/od/odhcp6c/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/od/odhcp6c/package.nix b/pkgs/by-name/od/odhcp6c/package.nix
index c156d412dbbd..fa6b0f113122 100644
--- a/pkgs/by-name/od/odhcp6c/package.nix
+++ b/pkgs/by-name/od/odhcp6c/package.nix
@@ -8,12 +8,12 @@
 
 stdenv.mkDerivation {
   pname = "odhcp6c";
-  version = "0-unstable-2025-10-17";
+  version = "0-unstable-2025-10-21";
 
   src = fetchgit {
     url = "https://git.openwrt.org/project/odhcp6c.git";
-    rev = "d7afeea2b9650c64fcf915cbb3369577247b96ed";
-    hash = "sha256-6L/yY8u5JBw1oywj2pg+0rW2397KBNAejrg5VKpYxLw=";
+    rev = "77e1ae21e67f81840024ffe5bb7cf69a8fb0d2f0";
+    hash = "sha256-aOW0rOGd4YwnfXjsUj6HHy8zf0FJYFjsKMWJ5yhUl5g=";
   };
 
   nativeBuildInputs = [ cmake ];

From 5f947e6070b375dc522cc8067040295b24da928b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 25 Oct 2025 14:02:38 +0200
Subject: [PATCH 2620/6226] python313Packages.publicsuffixlist: 1.0.2.20251018
 -> 1.0.2.20251025

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20251025-gha/CHANGES.md
---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 20dcc2496782..3b2ea890fa96 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20251018";
+  version = "1.0.2.20251025";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-QDIAZa0slqNRcDoJ7pOuFIzntlCfbIfNrjvPmSznYdI=";
+    hash = "sha256-LDvywIPdR3bJayk8waoPzaTg48RKCurG0ZUToxtMaM8=";
   };
 
   build-system = [ setuptools ];

From 152540fd0746da708cba8aa302dc01d668cd662f Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 20 Oct 2025 06:54:08 -0300
Subject: [PATCH 2621/6226] wv2: fix build with cmake4

---
 .../by-name/wv/wv2/fix-libtool-location.patch | 22 +++++++++++++++++++
 pkgs/by-name/wv/wv2/package.nix               | 10 ++++++++-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/wv/wv2/fix-libtool-location.patch

diff --git a/pkgs/by-name/wv/wv2/fix-libtool-location.patch b/pkgs/by-name/wv/wv2/fix-libtool-location.patch
new file mode 100644
index 000000000000..8b647de55e41
--- /dev/null
+++ b/pkgs/by-name/wv/wv2/fix-libtool-location.patch
@@ -0,0 +1,22 @@
+--- a/cmake/MacroCreateLibtoolFile.cmake
++++ b/cmake/MacroCreateLibtoolFile.cmake
+@@ -9,7 +9,7 @@
+ ENDMACRO (GET_TARGET_PROPERTY_WITH_DEFAULT)
+ 
+ MACRO(CREATE_LIBTOOL_FILE _target _install_DIR)
+-  GET_TARGET_PROPERTY(_target_location ${_target} LOCATION)
++
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_static_lib ${_target} STATIC_LIB "")
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dependency_libs ${_target} LT_DEPENDENCY_LIBS "")
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_current ${_target} LT_VERSION_CURRENT 0)
+@@ -19,8 +19,8 @@
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_shouldnotlink ${_target} LT_SHOULDNOTLINK yes)
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlopen ${_target} LT_DLOPEN "")
+   GET_TARGET_PROPERTY_WITH_DEFAULT(_target_dlpreopen ${_target} LT_DLPREOPEN "")
+-  GET_FILENAME_COMPONENT(_laname ${_target_location} NAME_WE)
+-  GET_FILENAME_COMPONENT(_soname ${_target_location} NAME)
++  SET(_laname "lib${_target}")
++  SET(_soname "${_laname}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+   SET(_laname ${PROJECT_BINARY_DIR}/${_laname}.la)
+   FILE(WRITE ${_laname} "# ${_laname} - a libtool library file\n")
+   FILE(WRITE ${_laname} "# Generated by CMake ${CMAKE_VERSION} (like GNU libtool)\n")
diff --git a/pkgs/by-name/wv/wv2/package.nix b/pkgs/by-name/wv/wv2/package.nix
index 1908fdf4e4be..2fa145158f29 100644
--- a/pkgs/by-name/wv/wv2/package.nix
+++ b/pkgs/by-name/wv/wv2/package.nix
@@ -17,7 +17,10 @@ stdenv.mkDerivation rec {
     sha256 = "1p1qxr8z5bsiq8pvlina3c8c1vjcb5d96bs3zz4jj3nb20wnsawz";
   };
 
-  patches = [ ./fix-include.patch ];
+  patches = [
+    ./fix-include.patch
+    ./fix-libtool-location.patch
+  ];
 
   # Newer versions of clang default to C++17, which removes some deprecated APIs such as bind1st.
   # Setting the language version to C++14 makes them available again.
@@ -40,6 +43,11 @@ stdenv.mkDerivation rec {
 
   env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2";
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "Excellent MS Word filter lib, used in most Office suites";
     mainProgram = "wv2-config";

From c3be7650d3dbe8dd97f3c1cfc0ca3d40425badab Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 25 Oct 2025 14:11:19 +0200
Subject: [PATCH 2622/6226] python313Packages.iamdata: 0.1.202510241 ->
 0.1.202510251

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202510241...v0.1.202510251

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202510251
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 1447f52790df..f6d8a1f5da7d 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202510241";
+  version = "0.1.202510251";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-IvNPgYjNdvMlIiLwL1rDilimAnCDn5JhwwMtY4xGXoU=";
+    hash = "sha256-n+P6I36zHR19ruqsycMpeGlSjwK3mmkPiaifEB1vW+s=";
   };
 
   build-system = [ hatchling ];

From c3a45d30e68db11ef31ee01e6aa727e7c5c99c00 Mon Sep 17 00:00:00 2001
From: David Knaack <davidkna@users.noreply.github.com>
Date: Sat, 25 Oct 2025 14:11:45 +0200
Subject: [PATCH 2623/6226] starship: 1.23.0 -> 1.24.0

---
 pkgs/by-name/st/starship/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/starship/package.nix b/pkgs/by-name/st/starship/package.nix
index 78872f201a2b..9195f9d024dc 100644
--- a/pkgs/by-name/st/starship/package.nix
+++ b/pkgs/by-name/st/starship/package.nix
@@ -12,13 +12,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "starship";
-  version = "1.23.0";
+  version = "1.24.0";
 
   src = fetchFromGitHub {
     owner = "starship";
     repo = "starship";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5Euhbuu1uiJ5HJNlPs9sUoGcc5QWqXqNmEH0jpfGLlc=";
+    hash = "sha256-kb7LHEhtVXzdoRPWMb4JA2REc/V5n21iX+ussWCaaPA=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ''
   );
 
-  cargoHash = "sha256-cxDWaPlNK7POJ3GhA21NlJ6q62bqHdA/4sru5pLkvOA=";
+  cargoHash = "sha256-xd3rYRJzJspmaQAsTw0lQifHdzB++BtJAjE12GsrLdE=";
 
   nativeCheckInputs = [
     gitMinimal

From 0731872d157c1b4293da996de2acf766e6b76816 Mon Sep 17 00:00:00 2001
From: Aurelia <git@acuteaura.net>
Date: Sun, 19 Oct 2025 15:33:21 +0200
Subject: [PATCH 2624/6226] adjustor: init at 3.11.8

based of work from #347279 by @toast003

Co-authored-by: Toast <39011842+toast003@users.noreply.github.com>
Co-authored-by: qzylinra <225773816+qzylinra@users.noreply.github.com>
---
 .../services/hardware/handheld-daemon.nix     | 28 +++++++++-
 pkgs/by-name/ad/adjustor/package.nix          | 55 +++++++++++++++++++
 pkgs/by-name/ha/handheld-daemon/package.nix   | 23 +++++---
 3 files changed, 95 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/by-name/ad/adjustor/package.nix

diff --git a/nixos/modules/services/hardware/handheld-daemon.nix b/nixos/modules/services/hardware/handheld-daemon.nix
index 81ee3fcf5ddd..9a599c4009da 100644
--- a/nixos/modules/services/hardware/handheld-daemon.nix
+++ b/nixos/modules/services/hardware/handheld-daemon.nix
@@ -7,6 +7,10 @@
 with lib;
 let
   cfg = config.services.handheld-daemon;
+  hhdPackage = cfg.package.override {
+    withAdjustor = cfg.adjustor.enable;
+    adjustor = cfg.adjustor.package;
+  };
 in
 {
   options.services.handheld-daemon = {
@@ -18,6 +22,18 @@ in
       package = mkPackageOption pkgs "handheld-daemon-ui" { };
     };
 
+    adjustor = {
+      enable = mkEnableOption "Handheld Daemon TDP control plugin";
+      package = mkPackageOption pkgs "adjustor" { };
+      loadAcpiCallModule = mkOption {
+        type = types.bool;
+        description = ''
+          Whether to load the acpi_call kernel module.
+          Required for TDP control by adjustor on most devices.
+        '';
+      };
+    };
+
     user = mkOption {
       type = types.str;
       description = ''
@@ -28,13 +44,19 @@ in
 
   config = mkIf cfg.enable {
     services.handheld-daemon.ui.enable = mkDefault true;
+    services.handheld-daemon.adjustor.loadAcpiCallModule = mkDefault cfg.adjustor.enable;
     environment.systemPackages = [
-      cfg.package
+      hhdPackage
     ]
     ++ lib.optional cfg.ui.enable cfg.ui.package;
     services.udev.packages = [ cfg.package ];
     systemd.packages = [ cfg.package ];
 
+    boot.kernelModules = mkIf cfg.adjustor.loadAcpiCallModule [ "acpi_call" ];
+    boot.extraModulePackages = mkIf cfg.adjustor.loadAcpiCallModule [
+      config.boot.kernelPackages.acpi_call
+    ];
+
     systemd.services.handheld-daemon = {
       description = "Handheld Daemon";
 
@@ -48,7 +70,7 @@ in
       ];
 
       serviceConfig = {
-        ExecStart = "${lib.getExe cfg.package} --user ${cfg.user}";
+        ExecStart = "${lib.getExe hhdPackage} --user ${cfg.user}";
         Nice = "-12";
         Restart = "on-failure";
         RestartSec = "10";
@@ -56,5 +78,5 @@ in
     };
   };
 
-  meta.maintainers = [ maintainers.appsforartists ];
+  meta.maintainers = [ maintainers.toast ];
 }
diff --git a/pkgs/by-name/ad/adjustor/package.nix b/pkgs/by-name/ad/adjustor/package.nix
new file mode 100644
index 000000000000..74bb9d0916f4
--- /dev/null
+++ b/pkgs/by-name/ad/adjustor/package.nix
@@ -0,0 +1,55 @@
+{
+  fetchFromGitHub,
+  lib,
+  python3Packages,
+  # Dependencies
+  kmod,
+  util-linux,
+}:
+python3Packages.buildPythonPackage rec {
+  pname = "adjustor";
+  version = "3.11.8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "hhd-dev";
+    repo = "adjustor";
+    tag = "v${version}";
+    hash = "sha256-BS0zV8nan61fTUs3v6nmGBuqPEDjATxBG792ZrrreAI=";
+  };
+
+  # This package relies on several programs expected to be on the user's PATH.
+  # We take a more reproducible approach by patching the absolute path to each of these required
+  # binaries.
+  postPatch = ''
+    substituteInPlace src/adjustor/core/acpi.py \
+      --replace-fail '"modprobe"' '"${lib.getExe' kmod "modprobe"}"'
+    substituteInPlace src/adjustor/fuse/utils.py \
+      --replace-fail 'f"mount' 'f"${lib.getExe' util-linux "mount"}'
+  '';
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
+    rich
+    pyroute2
+    fuse
+    pygobject3
+    dbus-python
+    kmod
+  ];
+
+  # This package doesn't have upstream tests.
+  doCheck = false;
+
+  meta = {
+    homepage = "https://github.com/hhd-dev/adjustor/";
+    description = "Adjustor TDP plugin for Handheld Daemon";
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.toast ];
+    mainProgram = "hhd";
+  };
+}
diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix
index 4c06d473ee3e..1ba5c143e19f 100644
--- a/pkgs/by-name/ha/handheld-daemon/package.nix
+++ b/pkgs/by-name/ha/handheld-daemon/package.nix
@@ -2,6 +2,7 @@
   lib,
   python3Packages,
   fetchFromGitHub,
+  withAdjustor ? false,
 
   # dependencies
   systemd,
@@ -13,6 +14,7 @@
   lsof,
   btrfs-progs,
   util-linux,
+  adjustor,
 }:
 python3Packages.buildPythonApplication rec {
   pname = "handheld-daemon";
@@ -79,14 +81,19 @@ python3Packages.buildPythonApplication rec {
     setuptools
   ];
 
-  dependencies = with python3Packages; [
-    evdev
-    pyserial
-    pyyaml
-    rich
-    setuptools
-    xlib
-  ];
+  dependencies =
+    with python3Packages;
+    [
+      evdev
+      pyserial
+      pyyaml
+      rich
+      setuptools
+      xlib
+    ]
+    ++ lib.optionals withAdjustor [
+      adjustor
+    ];
 
   # This package doesn't have upstream tests.
   doCheck = false;

From 6b79257c90e8e5d1c8f3e0e39802711c88f6f2a7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 25 Oct 2025 14:24:24 +0200
Subject: [PATCH 2625/6226] python313Packages.checkdmarc: modernize

---
 .../development/python-modules/checkdmarc/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/checkdmarc/default.nix b/pkgs/development/python-modules/checkdmarc/default.nix
index d924a10a2a63..32ad00aaf1e0 100644
--- a/pkgs/development/python-modules/checkdmarc/default.nix
+++ b/pkgs/development/python-modules/checkdmarc/default.nix
@@ -21,9 +21,7 @@
 buildPythonPackage rec {
   pname = "checkdmarc";
   version = "5.10.12";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "domainaware";
@@ -32,7 +30,10 @@ buildPythonPackage rec {
     hash = "sha256-XbBdBef3+kt26XP5GDH5rgHYGh8xIjHUUVOcdeVICLs=";
   };
 
-  pythonRelaxDeps = [ "xmltodict" ];
+  pythonRelaxDeps = [
+    "cryptography"
+    "xmltodict"
+  ];
 
   build-system = [ hatchling ];
 
@@ -69,10 +70,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Parser for SPF and DMARC DNS records";
-    mainProgram = "checkdmarc";
     homepage = "https://github.com/domainaware/checkdmarc";
     changelog = "https://github.com/domainaware/checkdmarc/blob/${src.tag}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "checkdmarc";
   };
 }

From 8972e6760f9c953e97105cc8373a4ab9ecaf706d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 12:25:01 +0000
Subject: [PATCH 2626/6226] vulkan-caps-viewer: 4.02 -> 4.03

---
 pkgs/tools/graphics/vulkan-caps-viewer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
index c55b7275388a..29478c872a2f 100644
--- a/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
+++ b/pkgs/tools/graphics/vulkan-caps-viewer/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vulkan-caps-viewer";
-  version = "4.02";
+  version = "4.03";
 
   src = fetchFromGitHub {
     owner = "SaschaWillems";
     repo = "VulkanCapsViewer";
     rev = version;
-    hash = "sha256-89W/1E9IJaPUzeki0vegXzprGFAFIgb1mRx0OMC4+ec=";
+    hash = "sha256-LaZdQ5w7QYaD3Nxl9ML30kGws8Yyr3c0jzO3ElUvJ/I=";
     # Note: this derivation strictly requires vulkan-header to be the same it was developed against.
     # To help us, they've put it in a git-submodule.
     # The result will work with any vulkan-loader version.

From 8cd6597f5e3d3c63ad6144e9e10600cd449fe8b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 12:31:39 +0000
Subject: [PATCH 2627/6226] c2patool: 0.23.4 -> 0.24.0

---
 pkgs/by-name/c2/c2patool/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix
index e5d5c2952b49..23e21acdc82c 100644
--- a/pkgs/by-name/c2/c2patool/package.nix
+++ b/pkgs/by-name/c2/c2patool/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "c2patool";
-  version = "0.23.4";
+  version = "0.24.0";
 
   src = fetchFromGitHub {
     owner = "contentauth";
     repo = "c2pa-rs";
     tag = "c2patool-v${finalAttrs.version}";
-    hash = "sha256-6y7IKuYnwSSrfe44U+fNU8Q9YdHOq2Btvie6ZqTIBRw=";
+    hash = "sha256-rjw2gej36l5s4xvUp1XKxyzhWNff2wswOYrsIP78VZ0=";
   };
 
-  cargoHash = "sha256-JnbvX/EkvatP/xlY+cTtRjVV+Rz2jjFIsqIvOFXqB5Q=";
+  cargoHash = "sha256-ZRmlTys0lX5FkgYBD81bdeHbX6viZW4hfFqpcq+S4WY=";
 
   # use the non-vendored openssl
   env.OPENSSL_NO_VENDOR = 1;

From d2c39d0a24fe6301b8d687d61838bb81acb151a6 Mon Sep 17 00:00:00 2001
From: Maciej Zonski <me@zonni.pl>
Date: Sat, 18 Oct 2025 09:12:13 +0200
Subject: [PATCH 2628/6226] nixos/coolercontrol: fix nvidia support

---
 nixos/modules/programs/coolercontrol.nix      | 28 +++++--------------
 .../system/coolercontrol/coolercontrold.nix   |  6 ++++
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/programs/coolercontrol.nix b/nixos/modules/programs/coolercontrol.nix
index 03aa774ad846..000fb091bcc6 100644
--- a/nixos/modules/programs/coolercontrol.nix
+++ b/nixos/modules/programs/coolercontrol.nix
@@ -13,18 +13,16 @@ in
   options = {
     programs.coolercontrol = {
       enable = lib.mkEnableOption "CoolerControl GUI & its background services";
-
-      nvidiaSupport = lib.mkOption {
-        type = lib.types.bool;
-        default = lib.elem "nvidia" config.services.xserver.videoDrivers;
-        defaultText = lib.literalExpression "lib.elem \"nvidia\" config.services.xserver.videoDrivers";
-        description = ''
-          Enable support for Nvidia GPUs.
-        '';
-      };
     };
   };
 
+  imports = [
+    # Added 2025-10-25
+    (lib.mkRemovedOptionModule [ "programs" "coolercontrol" "nvidiaSupport" ] ''
+      This option is deprecated as Nvidia drivers are automatically loaded at runtime.
+    '')
+  ];
+
   ##### implementation
   config = lib.mkIf cfg.enable (
     lib.mkMerge [
@@ -47,18 +45,6 @@ in
           };
         };
       }
-
-      # Nvidia support
-      (lib.mkIf cfg.nvidiaSupport {
-        systemd.services.coolercontrold.path =
-          let
-            nvidiaPkg = config.hardware.nvidia.package;
-          in
-          [
-            nvidiaPkg # nvidia-smi
-            nvidiaPkg.settings # nvidia-settings
-          ];
-      })
     ]
   );
 
diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix
index 394bd3f6a393..7bdaa624ac68 100644
--- a/pkgs/applications/system/coolercontrol/coolercontrold.nix
+++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix
@@ -4,6 +4,7 @@
   libdrm,
   coolercontrol,
   runtimeShell,
+  addDriverRunpath,
 }:
 
 {
@@ -20,6 +21,7 @@ rustPlatform.buildRustPackage {
   cargoHash = "sha256-ZyYyQcaYd3VZ7FL0Hki33JO3LscPfBT5gl+nw2cXvUs=";
 
   buildInputs = [ libdrm ];
+  nativeBuildInputs = [ addDriverRunpath ];
 
   postPatch = ''
     # copy the frontend static resources to a directory for embedding
@@ -37,6 +39,10 @@ rustPlatform.buildRustPackage {
       --replace-fail '/usr/bin' "$out/bin"
   '';
 
+  postFixup = ''
+    addDriverRunpath "$out/bin/coolercontrold"
+  '';
+
   passthru.tests.version = testers.testVersion {
     package = coolercontrol.coolercontrold;
     # coolercontrold prints its version with "v" prefix

From a177cbb0457f77b305a8d62016dbabca5123d411 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 09:32:46 -0300
Subject: [PATCH 2629/6226] ripes: fix build with cmake4

---
 pkgs/by-name/ri/ripes/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ri/ripes/package.nix b/pkgs/by-name/ri/ripes/package.nix
index 8508f0280c85..b5a537e03fa0 100644
--- a/pkgs/by-name/ri/ripes/package.nix
+++ b/pkgs/by-name/ri/ripes/package.nix
@@ -27,6 +27,9 @@ stdenv.mkDerivation rec {
     rm -r external/VSRTL/external/cereal
     substituteInPlace {src/serializers.h,src/io/iobase.h} \
       --replace-fail "VSRTL/external/cereal/include/cereal/cereal.hpp" "cereal/cereal.hpp"
+
+    substituteInPlace external/libelfin/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [

From ec3410f6b768c8ec9388cd7c8e1adf222b7279cb Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 09:43:19 -0300
Subject: [PATCH 2630/6226] qscreenshot: fix build with cmake4

---
 pkgs/by-name/qs/qscreenshot/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/qs/qscreenshot/package.nix b/pkgs/by-name/qs/qscreenshot/package.nix
index 9c8beae294a3..c6356a75b665 100644
--- a/pkgs/by-name/qs/qscreenshot/package.nix
+++ b/pkgs/by-name/qs/qscreenshot/package.nix
@@ -27,6 +27,12 @@ stdenv.mkDerivation {
     libsForQt5.qtbase
     libsForQt5.qtx11extras
   ];
+
+  postPatch = ''
+    substituteInPlace qScreenshot/{CMakeLists.txt,cmake/modules/version.cmake} \
+      --replace-fail "cmake_minimum_required( VERSION 3.2.0 )" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Simple creation and editing of screenshots";
     mainProgram = "qScreenshot";

From 64509e8cac5028f782ae1a3e1f2615d5799c41fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 12:52:29 +0000
Subject: [PATCH 2631/6226] monkeysAudio: 11.62 -> 11.65

---
 pkgs/by-name/mo/monkeysAudio/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix
index 7536d3243a24..09069839e705 100644
--- a/pkgs/by-name/mo/monkeysAudio/package.nix
+++ b/pkgs/by-name/mo/monkeysAudio/package.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "11.62";
+  version = "11.65";
   pname = "monkeys-audio";
 
   src = fetchzip {
     url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
-    hash = "sha256-qOzGOm5fzeV818Dv09A0+jieKRgvH3XbEGFmfsbtg3g=";
+    hash = "sha256-XMvSab5ekbFyYptTqe0bfSkbptuTvbbRPc1r3IZL+Jk=";
     stripRoot = false;
   };
 

From a70a245a08e858f2489ac159ce5dfa2d03d95ed4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 12:55:07 +0000
Subject: [PATCH 2632/6226] signal-cli: 0.13.20 -> 0.13.21

---
 pkgs/by-name/si/signal-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/signal-cli/package.nix b/pkgs/by-name/si/signal-cli/package.nix
index f03e1139e6e0..636e00480ba6 100644
--- a/pkgs/by-name/si/signal-cli/package.nix
+++ b/pkgs/by-name/si/signal-cli/package.nix
@@ -12,12 +12,12 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "signal-cli";
-  version = "0.13.20";
+  version = "0.13.21";
 
   # Building from source would be preferred, but is much more involved.
   src = fetchurl {
     url = "https://github.com/AsamK/signal-cli/releases/download/v${finalAttrs.version}/signal-cli-${finalAttrs.version}.tar.gz";
-    hash = "sha256-MFgR2c+XhzgxO6jv7e30rTf7bRVa5gxnzVOLnemXYY8=";
+    hash = "sha256-c5oRMzrQ3cZ6nl0Qlo6DrDT0D6lAyZbuI1G1P8C0558=";
   };
 
   buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [

From 71bac67d54fb5760b26e89127bb45082ce4b3203 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 09:56:28 -0300
Subject: [PATCH 2633/6226] qpid-cpp: fix build with cmake4

---
 pkgs/by-name/qp/qpid-cpp/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/qp/qpid-cpp/package.nix b/pkgs/by-name/qp/qpid-cpp/package.nix
index 61f415e6480b..53e52140f2ae 100644
--- a/pkgs/by-name/qp/qpid-cpp/package.nix
+++ b/pkgs/by-name/qp/qpid-cpp/package.nix
@@ -43,6 +43,11 @@ stdenv.mkDerivation rec {
     sed -i '/managementgen/d' CMakeLists.txt
     sed -i '/ENV/d' src/CMakeLists.txt
     sed -i '/management/d' CMakeLists.txt
+
+    substituteInPlace {./,examples/}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.7 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_policy(SET CMP0022 OLD)" ""
   '';
 
   env.NIX_CFLAGS_COMPILE = toString (

From fc919c8ed9b7789ae5ae5fbd1ba74e8a97d1d784 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 15 Oct 2025 00:28:30 +0200
Subject: [PATCH 2634/6226] inkscape: fix build with poppler 25.10.0

---
 pkgs/applications/graphics/inkscape/default.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 3bb56a1eab85..4220b8d1de2f 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -99,13 +99,23 @@ stdenv.mkDerivation (finalAttrs: {
     })
     (fetchpatch {
       name = "fix-build-poppler-25.06.0.patch";
-      url = "https://gitlab.com/inkscape/inkscape/-/commit/97bd8f29a61e691ceea98ca2444b974cf4256ae0.patch";
+      url = "https://gitlab.com/inkscape/inkscape/-/commit/40f5b15b7e29908b79c54e81db6f340936102e08.patch";
       hash = "sha256-bYRd/KUh/7qFb7x0EuUgQYA9P8abcTf5XS67gzaAiXA=";
     })
     (fetchpatch {
       name = "fix-build-poppler-25.07.0.patch";
-      url = "https://gitlab.com/inkscape/inkscape/-/commit/ce52c5f96106ae5747171663a46831f21aa52d95.patch";
-      hash = "sha256-3Yj+neSRSSQPeeZkHJ0P6v3Sis/lg9xiygktI6Z+zDY=";
+      url = "https://gitlab.com/inkscape/inkscape/-/commit/8ae83ca81bbaebcc0ff0abe82300d56d2c94e6f9.patch";
+      hash = "sha256-s7UMnv1pAiQA/HL5CEdBwCn4v/tsphc0MSnBJAoqolY=";
+    })
+    (fetchpatch {
+      name = "fix-build-poppler-25.09.0.patch";
+      url = "https://gitlab.com/inkscape/inkscape/-/commit/f48b429827dca510b41a5671d467e574ef348625.patch";
+      hash = "sha256-9CfmkTGMVHjZiiE3zvi4YOrytcir8a7O2z3PrhjcohI=";
+    })
+    (fetchpatch {
+      name = "fix-build-poppler-25.10.0.patch";
+      url = "https://gitlab.com/inkscape/inkscape/-/commit/4dba481fe898c6317696d50b109f5aed8f269c19.patch";
+      hash = "sha256-FFCkMU+Ec2qobG4ru89NPcM9Gxw8ZyFV+6jpW8ZwgE4=";
     })
   ];
 

From 8d1421d42d5f10ac4fa5f0f67a3524b4a9399254 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 15 Oct 2025 02:04:47 +0200
Subject: [PATCH 2635/6226] scribus: fix build with poppler 25.10.0

---
 pkgs/by-name/sc/scribus/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/sc/scribus/package.nix b/pkgs/by-name/sc/scribus/package.nix
index 59593ed3b1fd..27f35267d259 100644
--- a/pkgs/by-name/sc/scribus/package.nix
+++ b/pkgs/by-name/sc/scribus/package.nix
@@ -121,6 +121,16 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/scribusproject/scribus/commit/13fc4f874354511e05bf91a48703b57b4c489715.patch";
       hash = "sha256-+pbQ77SaTh04QX55wmS6WeuZf3IGe5nq3pmrhk68tb8=";
     })
+    (fetchpatch {
+      name = "fix-build-poppler-25.09.0.patch";
+      url = "https://github.com/scribusproject/scribus/commit/f0cfe30019a514bdaf38b78590451e2c5b9b5420.patch";
+      hash = "sha256-ONQ3BzGhouO+0zqYUObuJC3NUCFi1PWq6qoRvuSZJws=";
+    })
+    (fetchpatch {
+      name = "fix-build-poppler-25.10.0.patch";
+      url = "https://github.com/scribusproject/scribus/commit/3c1fc34fae1aa26fceb65b6bdf631a7f00b03c3c.patch";
+      hash = "sha256-xTwzbT3h4+5hb6Y/sNmzkfDN2LJGOLP1v/WBVsmZXkk=";
+    })
   ];
 
   meta = {

From 208ee33632ea061c7a51bd4b73cd8f96c1e42738 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 15 Oct 2025 02:28:30 +0200
Subject: [PATCH 2636/6226] gdal: fix build with poppler 25.10.0

---
 pkgs/by-name/gd/gdal/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix
index 6345581434ce..0ae4be009a2d 100644
--- a/pkgs/by-name/gd/gdal/package.nix
+++ b/pkgs/by-name/gd/gdal/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   callPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   useMinimalFeatures ? false,
   useArmadillo ? (!useMinimalFeatures),
@@ -92,6 +93,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-CFQF3vDhhXsAnIfUcn6oTQ4Xm+GH/36dqSGc0HvyEJ0=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "fix-build-poppler-25.10.0.patch";
+      url = "https://github.com/OSGeo/gdal/commit/a716a6cd5ffd779b30950f046fce91878fc97b9d.patch";
+      hash = "sha256-dSotpnTiMjt3Bz63hpNjF5juZ3JsjIpD59/67cR9rNU=";
+    })
+  ];
+
   nativeBuildInputs = [
     bison
     cmake

From dc67679d752c061fc9e1c7484c89a9948a5b7ec6 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 15 Oct 2025 02:58:41 +0200
Subject: [PATCH 2637/6226] libreoffice-fresh: fix build with poppler 25.10.0

---
 pkgs/applications/office/libreoffice/default.nix | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 5ffc54eedcc4..e7b91b251781 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -314,6 +314,19 @@ stdenv.mkDerivation (finalAttrs: {
     # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking
     ./readd-explicit-zlib-link.patch
 
+    # Backport patch to fix build with Poppler 25.09
+    (fetchpatch2 {
+      url = "https://github.com/LibreOffice/core/commit/7848e02819c007026952a3fdc9da0961333dc079.patch";
+      includes = [ "sdext/*" ];
+      hash = "sha256-Nw6GFmkFy13w/ktCxw5s7SHL34auP1BQ9JvQnQ65aVU=";
+    })
+  ]
+  ++ lib.optionals (lib.versionAtLeast version "25.8") [
+    # Fix build with Poppler 25.10
+    (fetchpatch2 {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/41e58e117c356af2be83993595caf61f9f30cc89/poppler-25.10.patch";
+      hash = "sha256-KMsjDtRRH8Vy/FXaVwxUo0Ww10PCE0sK8+ZL0Ja2kJQ=";
+    })
   ]
   ++ lib.optionals (variant == "collabora") [
     # Backport patch to fix build with Poppler 25.05

From c0cc2616e8575e627b4cfb519d9b9ec5ce98b025 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Wed, 15 Oct 2025 11:11:29 +0200
Subject: [PATCH 2638/6226] libreoffice-still: fix build with poppler 25.10.0

---
 pkgs/applications/office/libreoffice/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index e7b91b251781..213ae69d8f86 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -335,6 +335,11 @@ stdenv.mkDerivation (finalAttrs: {
       includes = [ "sdext/*" ];
       hash = "sha256-8yipl5ln1yCNfVM8SuWowsw1Iy/SXIwbdT1ZfNw4cJA=";
     })
+    # Fix build with Poppler 25.10
+    (fetchpatch2 {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/f5241554e4a0f6fd95ac4e5cc398a30243407e6a/fix_build_with_poppler_25.10.patch";
+      hash = "sha256-lbPOkc1HeT5Qsp6XfVyVJtmvSL68qTrmbd3q9lvKSu8=";
+    })
   ]
   ++ lib.optionals (variant == "collabora") [
     ./fix-unpack-collabora.patch

From e3e8f13c341434e02c4d52327f602e56b49c6d1d Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Tue, 14 Oct 2025 23:48:35 +0200
Subject: [PATCH 2639/6226] =?UTF-8?q?poppler:=2025.07.0=20=E2=86=92=2025.1?=
 =?UTF-8?q?0.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.freedesktop.org/poppler/poppler/-/blob/poppler-25.10.0/NEWS
https://gitlab.freedesktop.org/poppler/poppler/-/compare/poppler-25.07.0...poppler-25.10.0
---
 pkgs/development/libraries/poppler/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix
index 04b36cb31536..279ec8500636 100644
--- a/pkgs/development/libraries/poppler/default.nix
+++ b/pkgs/development/libraries/poppler/default.nix
@@ -55,13 +55,13 @@ let
     domain = "gitlab.freedesktop.org";
     owner = "poppler";
     repo = "test";
-    rev = "c79c6839e859dbee6b73ac260788fa2de8618ba4";
-    hash = "sha256-j66AsBUnFpO5athVgQmf4vcyXxYcJ/plJtHg+3vXG4Y=";
+    rev = "9d5011815a14c157ba25bb160187842fb81579a5";
+    hash = "sha256-sA5f235IJpzzzHqpwHM3zCZC2Yh0ztA6PZa84j/6tfY=";
   };
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "poppler-${suffix}";
-  version = "25.07.0"; # beware: updates often break cups-filters build, check scribus too!
+  version = "25.10.0"; # beware: updates often break cups-filters build, check scribus too!
 
   outputs = [
     "out"
@@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://poppler.freedesktop.org/poppler-${finalAttrs.version}.tar.xz";
-    hash = "sha256-xQSpBm29/r43etU87GQf2XHulsTh6Mp05snAPUbYF64=";
+    hash = "sha256-a16btk2rsVeHoU2xZ1KRx6+vk4dDjMk6T7f2rsTub+A=";
   };
 
   nativeBuildInputs = [

From 33b3ec2cb92075dcfae4778beb1314d28f63984b Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Fri, 24 Oct 2025 22:05:00 +0200
Subject: [PATCH 2640/6226] pods: fix CVE-2025-62518

Patch has to be vendored, as upstream has since bumped dependencies (not including tokio-tar)
---
 pkgs/by-name/po/pods/cve-2025-62516.patch | 200 ++++++++++++++++++++++
 pkgs/by-name/po/pods/package.nix          |  22 ++-
 2 files changed, 216 insertions(+), 6 deletions(-)
 create mode 100644 pkgs/by-name/po/pods/cve-2025-62516.patch

diff --git a/pkgs/by-name/po/pods/cve-2025-62516.patch b/pkgs/by-name/po/pods/cve-2025-62516.patch
new file mode 100644
index 000000000000..6163c8b82b18
--- /dev/null
+++ b/pkgs/by-name/po/pods/cve-2025-62516.patch
@@ -0,0 +1,200 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index e799bfd1..efd6601a 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -86,6 +86,21 @@ dependencies = [
+  "zbus",
+ ]
+ 
++[[package]]
++name = "astral-tokio-tar"
++version = "0.5.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ec179a06c1769b1e42e1e2cbe74c7dcdb3d6383c838454d063eaac5bbb7ebbe5"
++dependencies = [
++ "filetime",
++ "futures-core",
++ "libc",
++ "portable-atomic",
++ "rustc-hash",
++ "tokio",
++ "tokio-stream",
++]
++
+ [[package]]
+ name = "async-broadcast"
+ version = "0.7.2"
+@@ -147,12 +162,6 @@ version = "0.13.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+ 
+-[[package]]
+-name = "bitflags"
+-version = "1.3.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+-
+ [[package]]
+ name = "bitflags"
+ version = "2.9.0"
+@@ -213,7 +222,7 @@ version = "0.20.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "ae50b5510d86cf96ac2370e66d8dc960882f3df179d6a5a1e52bd94a1416c0f7"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+  "cairo-sys-rs",
+  "glib",
+  "libc",
+@@ -833,7 +842,7 @@ version = "0.20.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "707b819af8059ee5395a2de9f2317d87a53dbad8846a2f089f0bb44703f37686"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+  "futures-channel",
+  "futures-core",
+  "futures-executor",
+@@ -1368,9 +1377,9 @@ version = "0.1.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+  "libc",
+- "redox_syscall 0.5.10",
++ "redox_syscall",
+ ]
+ 
+ [[package]]
+@@ -1488,7 +1497,7 @@ version = "0.29.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "71e2746dc3a24dd78b3cfcb7be93368c6de9963d30f43a6a73998a9cf4b17b46"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+  "cfg-if",
+  "cfg_aliases",
+  "libc",
+@@ -1842,6 +1851,7 @@ version = "2.2.0"
+ dependencies = [
+  "anyhow",
+  "ashpd",
++ "astral-tokio-tar",
+  "futures",
+  "gettext-rs",
+  "gtk4",
+@@ -1860,11 +1870,16 @@ dependencies = [
+  "syslog",
+  "tokio",
+  "tokio-stream",
+- "tokio-tar",
+  "vte",
+  "vte4",
+ ]
+ 
++[[package]]
++name = "portable-atomic"
++version = "1.11.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
++
+ [[package]]
+ name = "powerfmt"
+ version = "0.2.0"
+@@ -1973,22 +1988,13 @@ dependencies = [
+  "getrandom 0.3.2",
+ ]
+ 
+-[[package]]
+-name = "redox_syscall"
+-version = "0.3.5"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29"
+-dependencies = [
+- "bitflags 1.3.2",
+-]
+-
+ [[package]]
+ name = "redox_syscall"
+ version = "0.5.10"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+ ]
+ 
+ [[package]]
+@@ -2026,6 +2032,12 @@ version = "0.1.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
+ 
++[[package]]
++name = "rustc-hash"
++version = "2.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
++
+ [[package]]
+ name = "rustc_version"
+ version = "0.4.1"
+@@ -2041,7 +2053,7 @@ version = "1.0.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+  "errno",
+  "libc",
+  "linux-raw-sys",
+@@ -2434,20 +2446,6 @@ dependencies = [
+  "tokio",
+ ]
+ 
+-[[package]]
+-name = "tokio-tar"
+-version = "0.3.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9d5714c010ca3e5c27114c1cdeb9d14641ace49874aa5626d7149e47aedace75"
+-dependencies = [
+- "filetime",
+- "futures-core",
+- "libc",
+- "redox_syscall 0.3.5",
+- "tokio",
+- "tokio-stream",
+-]
+-
+ [[package]]
+ name = "toml"
+ version = "0.8.20"
+@@ -2862,7 +2860,7 @@ version = "0.39.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
+ dependencies = [
+- "bitflags 2.9.0",
++ "bitflags",
+ ]
+ 
+ [[package]]
+diff --git a/Cargo.toml b/Cargo.toml
+index 9a0b95d7..7d818fbf 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -8,6 +8,7 @@ edition = "2024"
+ adw = { version = "0.7", package = "libadwaita", features = ["v1_7"] }
+ anyhow = "1"
+ ashpd = { version = "0.11", default-features = false, features = ["gtk4", "tokio"] }
++astral-tokio-tar = { version = "0.5.6", default-features = false }
+ futures = { version = "0.3", default-features = false }
+ gettext-rs = { version = "=0.7.0", features = ["gettext-system"] }
+ gtk = { version = "0.9", package = "gtk4", features = ["gnome_47"] }
+@@ -25,7 +26,6 @@ sourceview5 = { version = "0.9" }
+ syslog = "7"
+ tokio = "1"
+ tokio-stream = { version = "0.1", default-features = false }
+-tokio-tar = { version = "0.3", default-features = false }
+ vte = { version = "0.15", default-features = false }
+ vte4 = "0.8"
+ 
diff --git a/pkgs/by-name/po/pods/package.nix b/pkgs/by-name/po/pods/package.nix
index da33a2ac1782..7c2cc9b1066e 100644
--- a/pkgs/by-name/po/pods/package.nix
+++ b/pkgs/by-name/po/pods/package.nix
@@ -2,6 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  applyPatches,
+  fetchpatch2,
   cargo,
   desktop-file-utils,
   glib,
@@ -23,16 +25,24 @@ stdenv.mkDerivation rec {
   pname = "pods";
   version = "2.2.0";
 
-  src = fetchFromGitHub {
-    owner = "marhkb";
-    repo = "pods";
-    tag = "v${version}";
-    hash = "sha256-m+0XjxY0nDAJbVX3r/Jfg+G+RU8Q51e0ZXxkdH69SiQ=";
+  src = applyPatches {
+    name = "pods-patched";
+    src = fetchFromGitHub {
+      owner = "marhkb";
+      repo = "pods";
+      tag = "v${version}";
+      hash = "sha256-m+0XjxY0nDAJbVX3r/Jfg+G+RU8Q51e0ZXxkdH69SiQ=";
+    };
+
+    # Based on upstream PR: https://github.com/marhkb/pods/pull/895
+    # which cannot be merged into 2.2.0 because dependencies were bumped since its release.
+    # Hopefully 2.2.1 will be released soon
+    patches = [ ./cve-2025-62516.patch ];
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-ssLiGYBz8fh0oci/pVaeEEIruA691tdEOUyEFssNUXU=";
+    hash = "sha256-GBWaGCNXYCiT/favrIYB30VGMMoQQk1iUh4GTNPerK8=";
   };
 
   nativeBuildInputs = [

From de228a6a4884e2e8c5231dbffc88d495a5c01a38 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Fri, 24 Oct 2025 22:07:57 +0200
Subject: [PATCH 2641/6226] pods: add versionCheckHook

---
 pkgs/by-name/po/pods/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/po/pods/package.nix b/pkgs/by-name/po/pods/package.nix
index 7c2cc9b1066e..634e08a6cdd9 100644
--- a/pkgs/by-name/po/pods/package.nix
+++ b/pkgs/by-name/po/pods/package.nix
@@ -18,6 +18,7 @@
   libadwaita,
   libpanel,
   vte-gtk4,
+  versionCheckHook,
   nix-update-script,
 }:
 
@@ -66,6 +67,10 @@ stdenv.mkDerivation rec {
     vte-gtk4
   ];
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
   passthru = {
     updateScript = nix-update-script { };
   };

From 871433928bac8f3052719328280b714cadfbe9d8 Mon Sep 17 00:00:00 2001
From: botnk <github-botnk@korz.dev>
Date: Sat, 25 Oct 2025 13:11:48 +0000
Subject: [PATCH 2642/6226] zed-editor: 0.209.5 -> 0.209.6

Changelog: https://github.com/zed-industries/zed/releases/tag/v0.209.6
---
 pkgs/by-name/ze/zed-editor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 5aade7dcf8d3..8bca83223718 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -101,7 +101,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.209.5";
+  version = "0.209.6";
 
   outputs = [
     "out"
@@ -114,7 +114,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-p5qKbNPf7j4HiYv+Ej7df131z8xL09egbyOUwIkYC5Q=";
+    hash = "sha256-KHOex6Noths886oE62BN4NE/DCMmU5VjiP+xN2YnVmc=";
   };
 
   postPatch = ''
@@ -134,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm -r $out/git/*/candle-book/
   '';
 
-  cargoHash = "sha256-6LBBa6CDLrEkyazZuqDj2wj41KQnhp3NRw5AlaUtxj0=";
+  cargoHash = "sha256-u/dD7qHvc+ipKd6Jy9/HtPiLMa537zKUSAbjUFMQorA=";
 
   nativeBuildInputs = [
     cmake

From cdd27b6057223d6899fa6bab589845da9d85e448 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 20:11:52 -0300
Subject: [PATCH 2643/6226] lobster: fix build with cmake4

---
 pkgs/by-name/lo/lobster/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/lo/lobster/package.nix b/pkgs/by-name/lo/lobster/package.nix
index 8ab45486ae5e..b8a2826bf3d3 100644
--- a/pkgs/by-name/lo/lobster/package.nix
+++ b/pkgs/by-name/lo/lobster/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   callPackage,
 
@@ -22,6 +23,14 @@ stdenv.mkDerivation (finalAttrs: {
     sha256 = "sha256-YGtjoRBGOqkcHaiZNPVFOoeLitJTG/M0I08EPZVCfj0=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "cmake-fix.patch";
+      url = "https://github.com/aardappel/lobster/commit/a5f46ed65cad43ea70c8a6af5ea2fd5a018c8941.patch?full_index=1";
+      hash = "sha256-91pmoTPLD2Fo2SuCKngdRxXFUty5lOyA4oX8zaJ0ON0=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
   buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [
     libGL

From 772a6a6e5331ad0f23e5d773bb7d8cef3c1a1c87 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Sat, 25 Oct 2025 12:52:26 +0000
Subject: [PATCH 2644/6226] models-dev: 0-unstable-2025-10-08 ->
 0-unstable-2025-10-24

- Removed patch as it's no longer needed in Bun 1.3.0+
---
 pkgs/by-name/mo/models-dev/package.nix        | 22 ++++++++++---------
 .../post-build-rename-index-file.patch        | 18 ---------------
 2 files changed, 12 insertions(+), 28 deletions(-)
 delete mode 100644 pkgs/by-name/mo/models-dev/post-build-rename-index-file.patch

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index 001aff6bbac9..3ddd98aeb6e7 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -8,12 +8,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "models-dev";
-  version = "0-unstable-2025-10-08";
+  version = "0-unstable-2025-10-24";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "8d397086d8971c91b27919b8a3945f5ac21bc61f";
-    hash = "sha256-r0k6b9vaAeKZl1mknQc1wyRiJcPB3/OWlqspOgqw/Us=";
+    rev = "1548a725f07c2c6113379a8c5566c2e4c4dfc91f";
+    hash = "sha256-SgZFdjoSlmRS+eMbAIVPsDnwDEmzA/YFhgdHij3Qq38=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -37,9 +37,18 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
        export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
 
+       # NOTE: Starting with Bun 1.3.0, isolated builds became the default
+       # behavior. In isolated builds, each package receives its own
+       # `.node_modules` subdirectory containing only the dependencies
+       # explicitly declared in that package's `package.json`. Since our build
+       # process copies only the root-level `.node_modules` directory, we must
+       # use `--linker=hoisted` to consolidate all dependencies there. Without
+       # this flag, we would need to copy every individual `.node_modules`
+       # subdirectory from each package.
        bun install \
          --force \
          --frozen-lockfile \
+         --linker=hoisted \
          --no-progress \
          --production
 
@@ -72,13 +81,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ bun ];
 
-  patches = [
-    # In bun 1.2.13 (release-25.05) HTML entrypoints get content hashes
-    # appended → index.html becomes index-pq8vj7za.html in ./dist. So, we
-    # rename the index file back to index.html
-    ./post-build-rename-index-file.patch
-  ];
-
   configurePhase = ''
     runHook preConfigure
 
diff --git a/pkgs/by-name/mo/models-dev/post-build-rename-index-file.patch b/pkgs/by-name/mo/models-dev/post-build-rename-index-file.patch
deleted file mode 100644
index 2af79dbc92f9..000000000000
--- a/pkgs/by-name/mo/models-dev/post-build-rename-index-file.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git i/packages/web/script/build.ts w/packages/web/script/build.ts
-index 9bdcdb3..e9ce1c9 100755
---- i/packages/web/script/build.ts
-+++ w/packages/web/script/build.ts
-@@ -14,6 +14,13 @@ for await (const file of new Bun.Glob("./public/*").scan()) {
-   await Bun.write(file.replace("./public/", "./dist/"), Bun.file(file));
- }
- 
-+const distFiles = await fs.readdir("./dist");
-+const htmlFile = distFiles.find(file => file.startsWith("index-") && file.endsWith(".html"));
-+
-+if (htmlFile) {
-+  await fs.rename(`./dist/${htmlFile}`, "./dist/index.html");
-+}
-+
- let html = await Bun.file("./dist/index.html").text();
- html = html.replace("<!--static-->", Rendered);
- await Bun.write("./dist/index.html", html);

From 7b6288a6b47ff03cb1217c43d45ff357410c2142 Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sat, 25 Oct 2025 19:01:25 +0530
Subject: [PATCH 2645/6226] lact: 0.8.1 -> 0.8.2

---
 pkgs/by-name/la/lact/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/la/lact/package.nix b/pkgs/by-name/la/lact/package.nix
index f54ef55f417b..6a0f2c0e2176 100644
--- a/pkgs/by-name/la/lact/package.nix
+++ b/pkgs/by-name/la/lact/package.nix
@@ -23,16 +23,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lact";
-  version = "0.8.1";
+  version = "0.8.2";
 
   src = fetchFromGitHub {
     owner = "ilya-zlobintsev";
     repo = "LACT";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bgMQTiNeJR6zPTy/YpQ0oI1oGBzCf+VtBUn6pgADZAY=";
+    hash = "sha256-ZfUzsSdMLv6IaSbLkz9LBvdB4cS4oBE+R5toi9T7vR0=";
   };
 
-  cargoHash = "sha256-VxyYnX6AW+AS4NOB1XZXi2Dyrf4rtJzKHXMYwgLY6pQ=";
+  cargoHash = "sha256-K1/D5vi88Wjcvu/KZOkVr4q2MdMHTkhtyV8k8bvcGwg=";
 
   nativeBuildInputs = [
     pkg-config

From a0fd4f4de8834d6b240fe4bc32a07e97b55b2f48 Mon Sep 17 00:00:00 2001
From: dot-file <Random145@tutamail.com>
Date: Sat, 25 Oct 2025 16:31:51 +0300
Subject: [PATCH 2646/6226] nixos/ly: reformat

---
 nixos/modules/services/display-managers/ly.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/display-managers/ly.nix b/nixos/modules/services/display-managers/ly.nix
index 07e3dd25dd5b..d9505c440a43 100644
--- a/nixos/modules/services/display-managers/ly.nix
+++ b/nixos/modules/services/display-managers/ly.nix
@@ -65,9 +65,7 @@ in
       package = mkPackageOption pkgs [ "ly" ] { };
 
       settings = mkOption {
-        type =
-          with lib.types;
-          attrsOf iniFmt.lib.types.atom;
+        type = with lib.types; attrsOf iniFmt.lib.types.atom;
         default = { };
         example = {
           load = false;

From 4244b2e4eeaff50b145c489760838299bdb7039b Mon Sep 17 00:00:00 2001
From: illustris <rharikrishnan95@gmail.com>
Date: Wed, 8 Oct 2025 09:53:15 +0530
Subject: [PATCH 2647/6226] hadoop: fix build with cmake 4

---
 .../networking/cluster/hadoop/containerExecutor.nix          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix b/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix
index 778ed6261df0..2f8b27c170fd 100644
--- a/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix
+++ b/pkgs/applications/networking/cluster/hadoop/containerExecutor.nix
@@ -21,13 +21,16 @@ stdenv.mkDerivation (finalAttrs: {
     "hadoop-${finalAttrs.version}-src/hadoop-yarn-project/hadoop-yarn/"
     + "hadoop-yarn-server/hadoop-yarn-server-nodemanager/src";
 
+  postPatch = ''
+    sed -i -r 's/(cmake_minimum_required\(VERSION) [0-9.]+/\1 3.10/' CMakeLists.txt
+  '';
   nativeBuildInputs = [ cmake ];
   buildInputs = [ openssl ];
   cmakeFlags = [ "-DHADOOP_CONF_DIR=/run/wrappers/yarn-nodemanager/etc/hadoop" ];
 
   installPhase = ''
     mkdir $out
-    mv target/var/empty/local/bin $out/
+    mv target/usr/local/bin $out/
   '';
 
   meta = with lib; {

From c756996f0fc11d29e704cd72b5a4238849b2bb0e Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sat, 25 Oct 2025 13:26:13 +0000
Subject: [PATCH 2648/6226] uwsm: 0.23.3 -> 0.24.1

---
 pkgs/by-name/uw/uwsm/package.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix
index 3080fde6c372..6b3b676410b6 100644
--- a/pkgs/by-name/uw/uwsm/package.nix
+++ b/pkgs/by-name/uw/uwsm/package.nix
@@ -29,22 +29,15 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "uwsm";
-  version = "0.23.3";
+  version = "0.24.1";
 
   src = fetchFromGitHub {
     owner = "Vladimir-csp";
     repo = "uwsm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UP9Ztps5oWl0bdXhSlE4SCxHFprUf74DWygJy6GvO4k=";
+    hash = "sha256-x8Nx0Y4pIOjcN0aYSfTi3WyjzF/wzzgLpNrjpI2s/O0=";
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://github.com/Vladimir-csp/uwsm/commit/bd4db0fd1880b9b798e8f67e2d4c5e4ca2a28aca.patch?full_index=1";
-      hash = "sha256-GxGwy9BkpBKZGkG00+bVIh6iDNBgRG1f1f9GUKm3ERw=";
-    })
-  ];
-
   nativeBuildInputs = [
     makeBinaryWrapper
     meson

From 761d6a8f08a9c8757fdf9b70987406849dd49a4a Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 10:07:49 -0300
Subject: [PATCH 2649/6226] wv2: fix build on darwin

Co-authored-by: Sizhe Zhao <prc.zhao@outlook.com>
---
 pkgs/by-name/wv/wv2/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/wv/wv2/package.nix b/pkgs/by-name/wv/wv2/package.nix
index 2fa145158f29..5fabc08f05d0 100644
--- a/pkgs/by-name/wv/wv2/package.nix
+++ b/pkgs/by-name/wv/wv2/package.nix
@@ -7,6 +7,7 @@
   libgsf,
   glib,
   libxml2,
+  libiconvReal,
 }:
 
 stdenv.mkDerivation rec {
@@ -39,7 +40,8 @@ stdenv.mkDerivation rec {
     libgsf
     glib
     libxml2
-  ];
+  ]
+  ++ lib.optional stdenv.hostPlatform.isDarwin libiconvReal;
 
   env.NIX_CFLAGS_COMPILE = "-I${libxml2.dev}/include/libxml2";
 

From ce36981c6150fe026ffe1680829a4abbf8776bd7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 13:38:53 +0000
Subject: [PATCH 2650/6226] libhv: 1.3.3 -> 1.3.4

---
 pkgs/by-name/li/libhv/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libhv/package.nix b/pkgs/by-name/li/libhv/package.nix
index c7fabd5eb5c6..f764e0f0000b 100644
--- a/pkgs/by-name/li/libhv/package.nix
+++ b/pkgs/by-name/li/libhv/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libhv";
-  version = "1.3.3";
+  version = "1.3.4";
 
   src = fetchFromGitHub {
     owner = "ithewei";
     repo = "libhv";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-N2YD84eORA5nDpeeqy9jCvRx86PkRaKLzI6LF1AnHtU=";
+    hash = "sha256-YIWXdAZsWeSdtPtBaf/t9t68dFKw2nY0bvgMrzCEE5U=";
   };
 
   nativeBuildInputs = [ cmake ];

From d854715ef9934a44d4897cf49094f761ffd83389 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 13:42:43 +0000
Subject: [PATCH 2651/6226] python3Packages.roadrecon: 1.7.0 -> 1.7.1

---
 pkgs/development/python-modules/roadrecon/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/roadrecon/default.nix b/pkgs/development/python-modules/roadrecon/default.nix
index 3eb00bdd7ec2..c7bf9a716579 100644
--- a/pkgs/development/python-modules/roadrecon/default.nix
+++ b/pkgs/development/python-modules/roadrecon/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "roadrecon";
-  version = "1.7.0";
+  version = "1.7.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-JJJPQcgZOdqyAXYgLmCQuNBhSGwg8WIDW8+2jfVyvyc=";
+    hash = "sha256-v8IUnJlREtKMnhJtdKtChcxM/IKNKRuHA79V38zxLGY=";
   };
 
   pythonRelaxDeps = [ "flask" ];

From 1bb0ec5adcf4e7d2a78474ee211e5197f191d173 Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <kaction.cc@gmail.com>
Date: Fri, 3 Oct 2025 21:25:32 +0000
Subject: [PATCH 2652/6226] python3.pkgs.icalendar: build offline documentation

---
 .../python-modules/icalendar/default.nix            | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix
index c483932f3d4f..9da87158c5e0 100644
--- a/pkgs/development/python-modules/icalendar/default.nix
+++ b/pkgs/development/python-modules/icalendar/default.nix
@@ -9,12 +9,19 @@
   tzdata,
   hypothesis,
   pytestCheckHook,
+  sphinxHook,
+  sphinx-copybutton,
+  pydata-sphinx-theme,
 }:
 
 buildPythonPackage rec {
   version = "6.3.1";
   pname = "icalendar";
   pyproject = true;
+  outputs = [
+    "out"
+    "doc"
+  ];
 
   src = fetchFromGitHub {
     owner = "collective";
@@ -39,6 +46,12 @@ buildPythonPackage rec {
     tzdata
   ];
 
+  nativeBuildInputs = [
+    sphinxHook
+    sphinx-copybutton
+    pydata-sphinx-theme
+  ];
+
   nativeCheckInputs = [
     hypothesis
     pytestCheckHook

From dbd1944cbe2d449c9ad85f745915248a1d5a4e06 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 13:49:47 +0000
Subject: [PATCH 2653/6226] cargo-tarpaulin: 0.34.0 -> 0.34.1

---
 pkgs/by-name/ca/cargo-tarpaulin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-tarpaulin/package.nix b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
index bbd62f25a976..4a894b86e891 100644
--- a/pkgs/by-name/ca/cargo-tarpaulin/package.nix
+++ b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-tarpaulin";
-  version = "0.34.0";
+  version = "0.34.1";
 
   src = fetchFromGitHub {
     owner = "xd009642";
     repo = "tarpaulin";
     tag = version;
-    hash = "sha256-G7tzOprDzf+rC7PYPdjlX5VeJwADzpp3JOSK4t55zfA=";
+    hash = "sha256-HJgcFQrHINm4BPfZ4c5ZHQYBTSBVYdSl/n0qBlSsNOI=";
   };
 
-  cargoHash = "sha256-RI+8QQSrxjXsfrqqoJ56UIG4rnhww0gqtjF59j43agU=";
+  cargoHash = "sha256-/IIO462dN1v7r05uDGo+QbH8gkSGa93StjLleP/KUPw=";
 
   nativeBuildInputs = [
     pkg-config

From 7a16e6212633ae74414052dad8ac21d03d972920 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Sat, 25 Oct 2025 14:53:50 +0100
Subject: [PATCH 2654/6226] nixos/clickhouse: tests: Add basic Selenium test

---
 nixos/tests/clickhouse/default.nix |   6 ++
 nixos/tests/clickhouse/ui.nix      | 118 +++++++++++++++++++++++++++++
 2 files changed, 124 insertions(+)
 create mode 100644 nixos/tests/clickhouse/ui.nix

diff --git a/nixos/tests/clickhouse/default.nix b/nixos/tests/clickhouse/default.nix
index 88e01fcb1fdb..1299eb199f67 100644
--- a/nixos/tests/clickhouse/default.nix
+++ b/nixos/tests/clickhouse/default.nix
@@ -28,4 +28,10 @@
       inherit package;
     };
   };
+  ui = runTest {
+    imports = [ ./ui.nix ];
+    _module.args = {
+      inherit package;
+    };
+  };
 }
diff --git a/nixos/tests/clickhouse/ui.nix b/nixos/tests/clickhouse/ui.nix
new file mode 100644
index 000000000000..b49d8a8d8861
--- /dev/null
+++ b/nixos/tests/clickhouse/ui.nix
@@ -0,0 +1,118 @@
+{
+  lib,
+  pkgs,
+  package,
+  ...
+}:
+
+{
+  name = "clickhouse-ui";
+
+  nodes = {
+    browser =
+      {
+        config,
+        pkgs,
+        ...
+      }:
+      {
+        environment.systemPackages =
+          let
+            clickhouseSeleniumScript =
+              pkgs.writers.writePython3Bin "clickhouse-selenium-script"
+                {
+                  libraries = with pkgs.python3Packages; [ selenium ];
+                }
+                ''
+                  from selenium import webdriver
+                  from selenium.webdriver.common.by import By
+                  from selenium.webdriver.firefox.options import Options
+                  from selenium.webdriver.support.ui import WebDriverWait
+
+                  options = Options()
+                  options.add_argument("--headless")
+                  service = webdriver.FirefoxService(executable_path="${lib.getExe pkgs.geckodriver}")  # noqa: E501
+
+                  driver = webdriver.Firefox(options=options, service=service)
+                  driver.implicitly_wait(10)
+                  driver.get("http://clickhouse:8123/play")
+
+                  wait = WebDriverWait(driver, 60)
+
+                  assert len(driver.find_elements(
+                    By.ID, "query_div")) == 1
+
+                  server_info_element = driver.find_element(
+                    By.XPATH, "//span[@id='server_info']")
+                  assert "${
+                    lib.strings.replaceStrings [ "-stable" "-lts" ] [ "" "" ] package.version
+                  }" in server_info_element.text
+
+                  # Shouldn't show before query done
+                  assert len(driver.find_elements(
+                    By.CSS_SELECTOR, ".row-number")) == 0
+
+                  query_box = driver.find_element(
+                    By.XPATH, "//textarea[@id='query']")
+                  query_box.click()
+                  query_box.send_keys("SELECT 1")
+
+                  query_run_button = driver.find_element(
+                    By.XPATH, "//button[@id='run']").click()
+
+                  # Now verify results shown
+                  assert len(driver.find_elements(
+                    By.XPATH, "//div[@id='check-mark']")) == 1
+
+                  assert len(driver.find_elements(
+                    By.CSS_SELECTOR, ".row-number")) == 2
+
+                  driver.close()
+                '';
+          in
+          with pkgs;
+          [
+            curl
+            firefox-unwrapped
+            geckodriver
+            clickhouseSeleniumScript
+          ];
+      };
+
+    clickhouse =
+      { config, pkgs, ... }:
+      {
+        networking.firewall.allowedTCPPorts = [
+          8123
+          9000
+        ];
+
+        environment.etc = {
+          "clickhouse-server/config.d/listen.xml".text = ''
+            <clickhouse>
+              <listen_host>::</listen_host>
+            </clickhouse>
+          '';
+        };
+
+        services.clickhouse = {
+          enable = true;
+          inherit package;
+        };
+      };
+  };
+
+  testScript = ''
+    clickhouse.wait_for_unit("clickhouse")
+    clickhouse.wait_for_open_port(8123)
+    clickhouse.wait_for_open_port(9000)
+
+    browser.systemctl("start network-online.target")
+    browser.wait_for_unit("network-online.target")
+
+    browser.succeed("curl -kLs http://clickhouse:8123/play | grep 'ClickHouse Query'")
+
+    # Ensure the application is actually rendered by the Javascript
+    browser.succeed("PYTHONUNBUFFERED=1 clickhouse-selenium-script")
+  '';
+}

From 59d8696fe6a33d833c7873f11e9cf7e2f45f3d29 Mon Sep 17 00:00:00 2001
From: Daniel Fahey <daniel.fahey@pm.me>
Date: Fri, 24 Oct 2025 21:29:20 +0100
Subject: [PATCH 2655/6226] python3Packages.vllm: fix Blackwell support

This corrects the approach taken in b1cef6ca8d5dc66099a5f17f26724a1175a0ed72, which disabled Blackwell (SM100+) support due to CUTLASS API incompatibility.

My original diagnosis was incorrect: FlashMLA's SM100 kernels don't need newer CUTLASS APIs; they actually need CUTLASS v3.9.0 (pinned in FlashMLA's git submodule). The incompatibility is with vLLM's FlashMLA fork and CUTLASS v4.x APIs altogether.

This commit packages both CUTLASS versions: v3.9.0 for FlashMLA and v4.0.0 for the main vLLM build, allowing Blackwell support to work correctly. Although this subtlety can easily be expressed in the Nix derivation it was reported upstream in https://github.com/vllm-project/vllm/issues/27425
---
 .../python-modules/vllm/default.nix           | 39 ++++++++++++-------
 1 file changed, 25 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/vllm/default.nix b/pkgs/development/python-modules/vllm/default.nix
index d710af5d7a93..ca759392b585 100644
--- a/pkgs/development/python-modules/vllm/default.nix
+++ b/pkgs/development/python-modules/vllm/default.nix
@@ -104,6 +104,20 @@ let
     hash = "sha256-HJY+Go1viPkSVZPEs/NyMtYJzas4mMLiIZF3kNX+WgA=";
   };
 
+  # FlashMLA's Blackwell (SM100) kernels were developed against CUTLASS v3.9.0
+  # (since https://github.com/vllm-project/FlashMLA/commit/9c5dfab6d1746b4a27af14f440e7afd5c01ece68)
+  # and are currently incompatible with CUTLASS v4.x APIs. The rest of the vLLM
+  # build uses a newer CUTLASS, so we package both versions.
+  # See upstream issue: https://github.com/vllm-project/vllm/issues/27425
+  # See git submodule commit at:
+  # https://github.com/vllm-project/FlashMLA/tree/${flashmla.src.rev}/csrc
+  cutlass-flashmla = fetchFromGitHub {
+    owner = "NVIDIA";
+    repo = "cutlass";
+    tag = "v3.9.0";
+    hash = "sha256-Q6y/Z6vahASeSsfxvZDwbMFHGx8CnsF90IlveeVLO9g=";
+  };
+
   flashmla = stdenv.mkDerivation {
     pname = "flashmla";
     # https://github.com/vllm-project/FlashMLA/blob/${src.rev}/setup.py
@@ -123,7 +137,7 @@ let
     # flashmla normally relies on `git submodule update` to fetch cutlass
     buildPhase = ''
       rm -rf csrc/cutlass
-      ln -sf ${cutlass} csrc/cutlass
+      ln -sf ${cutlass-flashmla} csrc/cutlass
     '';
 
     installPhase = ''
@@ -199,19 +213,16 @@ let
         "8.9"
         "9.0"
         "9.0a"
-        # Blackwell (SM100+) capabilities temporarily disabled due to CUTLASS API incompatibility
-        # FlashMLA kernels require CUTLASS v4.2.1+ APIs not available in bundled v4.0.0
-        # TODO: Re-enable when vLLM upgrades CUTLASS (see https://github.com/vllm-project/vllm/pull/24673)
-        # "10.0"
-        # "10.0a"
-        # "10.1"
-        # "10.1a"
-        # "10.3"
-        # "10.3a"
-        # "12.0"
-        # "12.0a"
-        # "12.1"
-        # "12.1a"
+        "10.0"
+        "10.0a"
+        "10.1"
+        "10.1a"
+        "10.3"
+        "10.3a"
+        "12.0"
+        "12.0a"
+        "12.1"
+        "12.1a"
       ];
       ptx = lists.map (x: "${x}+PTX") real;
     in

From ec3c92aa0bff63d5879deb5ca1553d84ef30e1a1 Mon Sep 17 00:00:00 2001
From: FlameFlag <57304299+FlameFlag@users.noreply.github.com>
Date: Fri, 3 Oct 2025 16:47:48 +0300
Subject: [PATCH 2656/6226] soundsource: 5.8.7 -> 5.8.9

---
 pkgs/by-name/so/soundsource/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/so/soundsource/package.nix b/pkgs/by-name/so/soundsource/package.nix
index 8f7f4cfa72d0..36627734a3ec 100644
--- a/pkgs/by-name/so/soundsource/package.nix
+++ b/pkgs/by-name/so/soundsource/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "soundsource";
-  version = "5.8.7";
+  version = "5.8.9";
 
   src = fetchurl {
-    url = "https://web.archive.org/web/20250920134707/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip";
-    hash = "sha256-amcHFv8aKahruqSr5cmGzDQJ80bwyrymQRZ+uY0hTXY=";
+    url = "https://web.archive.org/web/20251025135445/https://cdn.rogueamoeba.com/soundsource/download/SoundSource.zip";
+    hash = "sha256-qjX+po4wOS2VzHfxSsVTysrFiP+ngoliler4RSM4dk8=";
   };
 
   dontUnpack = true;

From c628014efe5d53f2738d2790aefd1c6d8b18f4eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 14:10:00 +0000
Subject: [PATCH 2657/6226] libretro.dosbox-pure: 0-unstable-2025-10-18 ->
 0-unstable-2025-10-25

---
 pkgs/applications/emulators/libretro/cores/dosbox-pure.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
index 24f19eda10f4..180cf0bb6301 100644
--- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
+++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "dosbox-pure";
-  version = "0-unstable-2025-10-18";
+  version = "0-unstable-2025-10-25";
 
   src = fetchFromGitHub {
     owner = "schellingb";
     repo = "dosbox-pure";
-    rev = "fe0bdab8a04eedb912634d89ad8137de75529cff";
-    hash = "sha256-kF69s5rGp4XWtoaDWTu66VoUFjba0BFNBdKuA0OKkms=";
+    rev = "11a9e9e451b5013c6a19d58b26bbc75316f4080d";
+    hash = "sha256-+dD1JWYvD03pzW97PZbick3+GdriowrDCylww+YyBls=";
   };
 
   hardeningDisable = [ "format" ];

From b4f7340116c962d959a34ae26379a822aeaa2c42 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 14:13:20 +0000
Subject: [PATCH 2658/6226] pyradio: 0.9.3.11.19 -> 0.9.3.11.20

---
 pkgs/by-name/py/pyradio/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/py/pyradio/package.nix b/pkgs/by-name/py/pyradio/package.nix
index 38f39b35f89e..f294c5138555 100644
--- a/pkgs/by-name/py/pyradio/package.nix
+++ b/pkgs/by-name/py/pyradio/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "pyradio";
-  version = "0.9.3.11.19";
+  version = "0.9.3.11.20";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "coderholic";
     repo = "pyradio";
     tag = version;
-    hash = "sha256-fjTaURYY2pSb3mod4Vffbczmyxsn0/4SAXkb68mRhQA=";
+    hash = "sha256-dcs9kwuS1/pNtBPhj6Z1VAHFJw/ajwzc2aTWGU/h4W0=";
   };
 
   nativeBuildInputs = [

From 8a88da361816391180f311512703972ca4c94bca Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 11:15:47 -0300
Subject: [PATCH 2659/6226] lxqt.compton-conf: fix build with cmake4

---
 pkgs/desktops/lxqt/compton-conf/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/desktops/lxqt/compton-conf/default.nix b/pkgs/desktops/lxqt/compton-conf/default.nix
index fdb5fa86417d..f7fb175bcbd7 100644
--- a/pkgs/desktops/lxqt/compton-conf/default.nix
+++ b/pkgs/desktops/lxqt/compton-conf/default.nix
@@ -43,6 +43,11 @@ stdenv.mkDerivation rec {
       --replace-fail "DESTINATION \"\''${LXQT_ETC_XDG_DIR}" "DESTINATION \"etc/xdg" \
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   passthru.updateScript = gitUpdater { };
 
   meta = with lib; {

From bf281c646d633f72524b5b5c60f00bdda367a092 Mon Sep 17 00:00:00 2001
From: ZHAO Jin-Xiang <xiaoxiangmoe@gmail.com>
Date: Sun, 5 Oct 2025 16:18:45 +0800
Subject: [PATCH 2660/6226] cherry-studio: 1.5.11 -> 1.6.5

---
 .../ch/cherry-studio/missing-hashes.json      | 74 +++++++++++++------
 pkgs/by-name/ch/cherry-studio/package.nix     | 37 ++++++----
 2 files changed, 75 insertions(+), 36 deletions(-)

diff --git a/pkgs/by-name/ch/cherry-studio/missing-hashes.json b/pkgs/by-name/ch/cherry-studio/missing-hashes.json
index 95f0f12aaa98..5a930e546f9e 100644
--- a/pkgs/by-name/ch/cherry-studio/missing-hashes.json
+++ b/pkgs/by-name/ch/cherry-studio/missing-hashes.json
@@ -1,4 +1,12 @@
 {
+  "@biomejs/cli-darwin-arm64@npm:2.2.4": "5cd937e3a57ce9ba97e63e1062fd2b2cdfa1ba6506bee78e9b62a5e1499b8d9845e7a197e62de98a284012505a5abdd1b66a203613972166e46628ca02567e19",
+  "@biomejs/cli-darwin-x64@npm:2.2.4": "75cd8b221a7e4be8871650e0494016dc4116974fce8fff2e8f9cf085745abafcfa9e06a08c845f1d01f6a87d45fb5a5672972fbb51fbd891f35a49ec15cd2ce0",
+  "@biomejs/cli-linux-arm64-musl@npm:2.2.4": "5deb4f40d412442e81cbaf878d3e1adbf1fdae22cf5d178f5d56ce984bc6566962f99f162d7347201de0500a317ee3727ef32730b0ee6237a0814755f1ed7307",
+  "@biomejs/cli-linux-arm64@npm:2.2.4": "20c86551b3b71c342264e60cc9ceab2c16bfef935f318701d384dec26721e38757f94811a108cdabd3360b99309be44bb005388290d91f11b5869aba80d13a1d",
+  "@biomejs/cli-linux-x64-musl@npm:2.2.4": "6163fa95778bcee9b79aedb36117df9865f0f784bbb8bf55ba6df4544fd3b7fa5cf3e32eb77d863034d480c3c7c5014dadc5d137b8688e64e64e5093d5c1be1c",
+  "@biomejs/cli-linux-x64@npm:2.2.4": "84fbf9d4b681ad4426c5de492b4ab9200a15d4f61a71c69d4b6bfbe8f03f46e69bb951a93a85d71e0073bcf3ee1874530dad2eac3dbdd72c6084dfb59c83a1fd",
+  "@biomejs/cli-win32-arm64@npm:2.2.4": "39d4e2ac5a41b7c092bc9a3ef1889a557b47eb15f9057db823681c1483702ee6fe96a5b2e54a444ca6e867db5d41f2e9f6a1a6dd86d13fcb686dab5d19d02333",
+  "@biomejs/cli-win32-x64@npm:2.2.4": "741c77e74d4fcfbf74f3f5db2e29cb6bca90cd7b1c5e6af3b0cc8b5c3210b0b1f82019733e9849d18fa9fc4fe96fb4633974a2146447cc914249caf0636741e7",
   "@esbuild/aix-ppc64@npm:0.25.8": "37fc14b17214c1f6bf41175029b62a43664a6a5a5b802614fe1d837bbf7abf5eaf2f6b735b6a446ebcfabb632e038c8ad9cccd87a259c45a1846689f8527874a",
   "@esbuild/android-arm64@npm:0.25.8": "e367e989238292ccee72013511dde1aef2d2160d8d5d669a12272f693cf9a0970fac9d7835178b3c46ed6936a0c4b29d21d58ed11851a3697bf98b4320be4b74",
   "@esbuild/android-arm@npm:0.25.8": "cbfa2c802d8931e5f4d06582f20573cb34774ab713b4712c37eb15bfab6f90b693878b661de2a3bb9c81eecf45b37e0ddf2e9c79ef4ff932bbc37da588c40183",
@@ -57,19 +65,20 @@
   "@napi-rs/system-ocr-darwin-x64@npm:1.0.2": "92b68b7e6a4be82b24fcc952d2c820e07bf68fb625d3c69edbcbf13227be508302f87ba9b0ff50d415c76ac16493d11040b6cc55a5b25f4414f3af5c00ab4597",
   "@napi-rs/system-ocr-win32-arm64-msvc@npm:1.0.2": "5c6945c5053380ee33df277df77ac813cc44763e9f305ea0b0990d3960269676ffe88bdd33038fa378d055c9986b7ecc31cbabc7f8fb51e077c59364a9ea29ec",
   "@napi-rs/system-ocr-win32-x64-msvc@npm:1.0.2": "9d6ebdaa753cea6f6e2e5b1b01ba293a7cd79ffd265bf5144f96f09bd596df21612662d7f62973886dd75725a029971cc3f11451ab95933bca5441b02593f352",
-  "@parcel/watcher-android-arm64@npm:2.5.1": "f99d569e4f6cf78a1b0097fb9d4682cb201a74370ae440c531da4e1d5021e46141bfcdf8ef708b51a5b9cb1c30f78eea933ce75216d5eeb7b969a2ad27c68e4a",
-  "@parcel/watcher-darwin-arm64@npm:2.5.1": "973c7ef3c94608da9cd1b20b18b9a7de2fb46fe44553731fe372b640de524491976150d0845f3d5953b74ed8ea469cb8d18a48651d0e5fb82f549a6b46b54f79",
-  "@parcel/watcher-darwin-x64@npm:2.5.1": "848c5516aed9c36e14751200dbbf57e83c0bd46cdab0932df33db120e66b9596de18eeb98980e319efde84014f67d9e7924d7555383d8ffcefe35c501166b84b",
-  "@parcel/watcher-freebsd-x64@npm:2.5.1": "cbd2b7884bc92422edabc0c74c3fbc06512bb7300fc137aaff2e96f46f61e5272265a0b5d230acc82a0e777b0c11661f0b8b7f89a9342c0920b752436dd2c750",
-  "@parcel/watcher-linux-arm-glibc@npm:2.5.1": "f2e1ec14dbb0f85a84a75f55fd7721598694976ba3ad439832b57e558b0d9240cc80ff83053fb8cf7caffb0592d51bb39d325112763ec1734924b49d4ba9c144",
-  "@parcel/watcher-linux-arm-musl@npm:2.5.1": "83344c7ecda2e79db59d711bcee0c3fa26922989139c031bd762cf3d5bfb191797e22e9ed6072690b822dfd62629623ba4e7eedb3c41930a987fc3d4106000e1",
-  "@parcel/watcher-linux-arm64-glibc@npm:2.5.1": "562231feb159a294752378bebecc69a2d33366a9d877835844578799f8536398006e0e570849f9e2db04085a3ea82131459cd10fd6b42dea10cd73bd0c9ca13e",
-  "@parcel/watcher-linux-arm64-musl@npm:2.5.1": "f62db52a90ebbaa29ca9900e6b9bd3fc6e5c650741bbde9a2742cbc332c678b753fc6a596d67659394fd9262aa826463ea667d18cc554bcaaac9e8da1a2a29d0",
-  "@parcel/watcher-linux-x64-glibc@npm:2.5.1": "425e557991fde5092d6a9e20be71810600415e5fa157dca0b39bd8db86653d3ee7b037305261c8782d1a065f2a64d235e17b57876b26f5bb0dd7a9bdbe364690",
-  "@parcel/watcher-linux-x64-musl@npm:2.5.1": "4dbb066ba9478c8b8de39e3c1083cbb74f86f03eaf4445603e69909d6c072134644316faa20a2445419b9fe1a8063ade7b5331a5766d807ee0b15b8a70c59a2d",
-  "@parcel/watcher-win32-arm64@npm:2.5.1": "e015314d6b9b727cbe25eedf963ca8b23bf6d4e78d3c28008bd0d2657940ad54a271330486df3a93a5f1a30f2b8d052d14415b85cc7e7b747c6c73b5dc055628",
-  "@parcel/watcher-win32-ia32@npm:2.5.1": "920b6ad6a2095aeb9c2d329c5118472a3c14669fa93eaa99aa8050c76c5c2d3d76d92677167ed748c2ac5487c568d5df16d5d94f4bc7c354094fccd8e0d6350c",
-  "@parcel/watcher-win32-x64@npm:2.5.1": "8f1c8e41ec9f86e4dcd0d4db0a077742d5dcc853f15ea888387183e34e2efcff09fd1cc9ec46fc1121b9ad4ddc0e221283f2ffb23cfd7dbcbb8b03060b461963",
+  "@oxlint-tsgolint/darwin-arm64@npm:0.2.0": "89b0844bb4be9406efbda457fcf9be852039f6c48dc24547135451417e98fe1cd5c0a13a66cd559cad1b70901fc6ee55532dc9975929384c09e071256e6cfb70",
+  "@oxlint-tsgolint/darwin-x64@npm:0.2.0": "307de5743240c6f01d7087c6c620b608b0c51d36431df7e345a6699939ea16129494c449b6dd8351277bc37c92ba1e92020cc1155a88efbe2a124f44fc78b5b1",
+  "@oxlint-tsgolint/linux-arm64@npm:0.2.0": "4292cc00a8f5b6d06eb83abd8bfb80b369eb5d7ede91b6e80716bf81a81df557b47a59690a3af7ab858008ce4d02b50c74bbe0fc7530eaadbcc12cd8f1ff0c4c",
+  "@oxlint-tsgolint/linux-x64@npm:0.2.0": "c73ebab4bc4c7891873043479ee89894a575ba93f91fc0793cfc2f38f68d58b8b09980c5c9ebd037c404687e38d2f15966e9bfeab9685b40522266ef909fb047",
+  "@oxlint-tsgolint/win32-arm64@npm:0.2.0": "6735f85196fc4c2aa5885cb7bf8b956b460f6b003589959bb83d0cab049a7fe8257a228e7bba403dba08e57b944c2a78c97087ded3e104edb340d964f604fd77",
+  "@oxlint-tsgolint/win32-x64@npm:0.2.0": "3621b288e32c42bc71ff33b083e5ae7c941a6b13654d10a1647ebe706fe3077ae581fc85cffc70ca6d956d610abeeb254fc19ecfc3d3ecb4dde2ce1ef3b5be03",
+  "@oxlint/darwin-arm64@npm:1.15.0": "f6350a1c41a9056730dcd2cf7c10475a179f9561b01587e02becbb690c40ad597ed2796c9798c709ef8fcd43f789fea99734e51cb307f5ae9a35484fa0b95122",
+  "@oxlint/darwin-x64@npm:1.15.0": "ee808953fb0091ae283bac113b393a7cbf7820b26d5f8447d9a6b4357202260f9ef0612fb4fdb4ce7e386945c3bf5eb2ecaa5950d32f1e3400b6f0a977c9bfed",
+  "@oxlint/linux-arm64-gnu@npm:1.15.0": "fce42e368fff682bfdd374cc414e1f942dc37a168c58d1ca3ab67f3ea11596aa7f0a7f7ed59bef7d1701708df283f6b076ea89f6684f3ce9efcdccf8db392dee",
+  "@oxlint/linux-arm64-musl@npm:1.15.0": "35029e792bbfe5eb70dfeecd59a20f7cfc7b55f88ed15c3d02fa5ce64f12e4136b640a245f432e195217dec028f1f389c6236c079d35de2309e68b1f6bf9e8b6",
+  "@oxlint/linux-x64-gnu@npm:1.15.0": "959f2887182015cd034a877fc0f8c5beaeb95a1800978a8ad3c1ba036ff3d3308fe0c4bbd99094cdc24b83bdd0314e638e376670a5b8ba6e1c926adb94110e4d",
+  "@oxlint/linux-x64-musl@npm:1.15.0": "47e0ced945de40ae987067d25c1c8968b5650efd2ea1baa3319677d197130376ab7077d71c2dc940d8ab4bb2fed41d9049dd10e9312f7f1039cf42e68ace06d6",
+  "@oxlint/win32-arm64@npm:1.15.0": "d5e2933f5cff87c4e2a676e14345a1874b8c806b65ac662384a8ce93f8855132d6ea6092bee370f531e8d80d9bdd62721659f38370b0841476c4fc488d4e850a",
+  "@oxlint/win32-x64@npm:1.15.0": "f54c36908a63656f2a8e803ab94be45d7b59bfcbe7519ec951d1ae2f42f9019d247c97a1e61a1d74acaa05bba19873999c15a2cd1dc0cefc4e2a7a5be92e88c6",
   "@rolldown/binding-android-arm64@npm:1.0.0-beta.34": "98334e08fe3f9acafa1e0c337d74138a93892dbb2b03e53b79ab3fff5cecb34406493af97e454b3c76e27ac1f9f65496d54cf7c904a2cdba4bf1eabddb5bbd50",
   "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.34": "d753421b3ee4da8ed6b67072064947a17122e138609652ce5534e97aff420e63a463c2fab0a678a1b0483b1e323c8392d671e5c8b415ade92f54e98235ebde62",
   "@rolldown/binding-darwin-arm64@npm:1.0.0-beta.9-commit.d91dfb5": "a4636b96d36bfaccc655f9de258cef17daedd025463309657ed213b63b4226aeb6901eaa05d00d577e486bfb4d4ef99ee1457d8d7a8b5170afe07c86d2a5c18d",
@@ -97,16 +106,35 @@
   "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.34": "70bbbc04e01c437a58c89f7b8ec249a9e43eb7b4336323efaf7abf46fa6445f087ee1286edb454658b9f4f4e54daf906059cc8484613be2d5b174c905dc44518",
   "@rolldown/binding-win32-x64-msvc@npm:1.0.0-beta.9-commit.d91dfb5": "9e50f65fb7ad451a6eb4f9305650605e7a4efdd6873ad9412520edb8fd4c7f0bb67aa9922dbf1bad055c01a0de677eace73abf4285409cb9defae93956a83b24",
   "@rollup/rollup-linux-x64-gnu@npm:4.45.1": "baf9081b367a5f557cfcd17ae60b196c00a933e87c5b16045efa312cb142518c91706ae3e6a4be1d09f7fbf2b133d386fc4ff3f6dd2d5b7149ac139af4a63391",
-  "@swc/core-darwin-arm64@npm:1.11.21": "6f228ce5497f8b797d9b838af6d51c8fc27d1643d13b033ed762ab5247047da91efa3e61f38040b5ff326bfb6af0ed663f5ec8319574db1c0e355d64c9c2b665",
-  "@swc/core-darwin-x64@npm:1.11.21": "8f7fcf910f17ab6d30fe55d7498f0ff2ac47e1e0fad749e01151891d5257f49c6354dae31917cc5097230940f9a068fcd981441e7c9581b1373e9e9c4d1ff9aa",
-  "@swc/core-linux-arm-gnueabihf@npm:1.11.21": "5f0d964b13b3c138fe0b3249b852db4330707d4584ed5d5b0b71fb72023e3b35f3faa88c6b8f49970f7adee57976e7e1fc9115be194b91f435249b6531602e1c",
-  "@swc/core-linux-arm64-gnu@npm:1.11.21": "203995730e55bfe640055a7adbb0c6b133c698aa018394d0338d00d311b10f874e46cdc0579585fb443505a3361b3da185436ad9fea553ecbed697a4f810ea7e",
-  "@swc/core-linux-arm64-musl@npm:1.11.21": "9618139c32eefd5acf184fc0c5e09986f170cec1069296a274c32b694a5a2129ae7aa21b8d016d5c186574929f05d456c6f4babdd0e528021dee4c51605da2d8",
-  "@swc/core-linux-x64-gnu@npm:1.11.21": "886a4f4a3ad6d0d3b437a250bf36b0395b34f4731381ce1cbbe43b05fb7ab4aa12a23c3f0e33bc4b2703ebcdad9a7e3fc18b7481a79e372ecc331c1e3eca1437",
-  "@swc/core-linux-x64-musl@npm:1.11.21": "069f33ba7b9376494f7345efed1c845e201857bbe5ba165ca8026760989344eaf0e5efbbc7f711a6c776385aa5ad383cee75543687c024854acb296c4e4752c1",
-  "@swc/core-win32-arm64-msvc@npm:1.11.21": "05ea5df6614075ec8487a91cb047a30aebeef3f142232a2feb0a475c85f2d64a876aef4183849f43480b9b5786afad7b3cb2bc1f53060d71ab6ff439a71317f3",
-  "@swc/core-win32-ia32-msvc@npm:1.11.21": "ad1ba754c36131238f2ac8ec51ffc4b987888b45b3008c0fbdd31d85d6fc039f8dd9c5d188c24cb72c4f4f345090a4dcfbcbfd840e954b7aeeb2974e0baf0e4a",
-  "@swc/core-win32-x64-msvc@npm:1.11.21": "0fb0c108c2e4a3bd82251f7552c9daa8c243829617bee7d954d1b0e021214184ead5c08dd108b3a5ac2d501797db794246a25867970ef2082f844f47b5b25070",
+  "@swc/core-darwin-arm64@npm:1.13.3": "f3cdf75ccc7b66d8c4b2bb7a5664542a904821bd7f08f91e3e399112dcb4436ee9a7df306a80e58a80a31b20b9b69f830a2dca91d74e62bbe6c72cde84c75d66",
+  "@swc/core-darwin-x64@npm:1.13.3": "c3515f878f50eb6730da948c10aec867b16f64fefbbc72fdfd9bde385ce84cfc606e87534dd77fbc817fc08bb144a2ea61e1c3e5fffd6b2e9a68b71eebb49a77",
+  "@swc/core-linux-arm-gnueabihf@npm:1.13.3": "8ec4f056982f779e55ad7d52f4f5ee4928ee48620977b2c4d3f47232d5cea119f47adaad9ca7bb7b1f261535ce5c19c0b2506c41da76e90c7fc7fc3a0e505d06",
+  "@swc/core-linux-arm64-gnu@npm:1.13.3": "d2804f542f5f78681ad4cc643dd32c7c948d94b7d2878fadcc465d0cbc4480147ed99298b4eed8f3c5d9cceba8bd1b1cc0f79e1754f23d6af5ccdcb6616b37b6",
+  "@swc/core-linux-arm64-musl@npm:1.13.3": "5d62f789505e5d72a08add9c35a12d85c23c18068dc627fb97deaea8be6d4910e2fd7afb63c03bbcefdf95a45ab4bf0c8534edf12d177c7facd2571d1c0ec2a5",
+  "@swc/core-linux-x64-gnu@npm:1.13.3": "a3d17ea9fb821fbced3d251fb03558bc25d29d5c289f96d87001f2ce17838c6de4e31365da9b95d21ed68b1dcfb6790c34457d7e0ce5c8a38dac7c0ed51937db",
+  "@swc/core-linux-x64-musl@npm:1.13.3": "fc7f7197f7fac7c068fd408d454ad62ff91f956db603d17b6133db7f28f606899fcd31075ca206970e9fce6a69a9e18dc33a82e1094ec142fc906b02be3a5d19",
+  "@swc/core-win32-arm64-msvc@npm:1.13.3": "bb4b197e4ffbf02dd5d3714af345fd41f7b6d6606d08f88f164be468ddade90c2e9912964b7da18863246ebe5b368dfd6a6f52fae4ffa517ab52f73d3cd9b8b3",
+  "@swc/core-win32-ia32-msvc@npm:1.13.3": "c244aa591eb71dac4316b2062e19217710f76fa217c84517e3c64c5cbbfa6a74ccab3322a92f183d47f34fff371bc1ddce93ad2c88c2f72a0265a6d009b0dbeb",
+  "@swc/core-win32-x64-msvc@npm:1.13.3": "b1ab6ee1ce12249259995c2997586e289225eb12066c95d14f829152a48a389eb5a3f99312f7953e4f62a1e0468c61900d59e3583be53b64d7854df2a4716b80",
+  "@tailwindcss/oxide-android-arm64@npm:4.1.13": "fbdff27e98b9781cd54b1e959b8ab5dc60ef7a9dd9cb0b01b947441f0e88c9b0e25b66a72de37c8a099e09e444f38e134f33be13490af6d35070c6f9375a55b0",
+  "@tailwindcss/oxide-darwin-arm64@npm:4.1.13": "1814b1f5773b1e5f70f86bcb533733bc64ffe9b01200d999981052dbfac2c05c92e3a79c08aa42a78725dadaa04b67652b4466738494a94135dce5d2996ae4be",
+  "@tailwindcss/oxide-darwin-x64@npm:4.1.13": "bfb11311a1d76631543dcfdbba1fa9a96464bd4730d51c8b6694745de62f08f93d07f5763aaea5895e3f35998d185be44373605a8d6da95b2df4a2db9a450d55",
+  "@tailwindcss/oxide-freebsd-x64@npm:4.1.13": "e7ed50f10e35bbc3ef46a0bf8b12a478ec09de8fb4d2054605106b2f9402eda8a2c0e2521a85cb740ad0407ff4c9aa367021b1577e5cd75fac91a365cbf55804",
+  "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.1.13": "bd882a8a8c34e6d6f6318fd4e717995e811a0eee322e2de37a9abd6e488bc2771fd0ba14bbca237e3e544a2d9fc9c1cf33620a77eb45cf1848d03ee27b17baef",
+  "@tailwindcss/oxide-linux-arm64-gnu@npm:4.1.13": "9d575d7e6b7fae40e363c8de6f7d8db06e057c9b1cec12279e2e794e07af22d1866de0f2e7d7387d6de505e03efd042385b862303b89438cb903458ffd351fd3",
+  "@tailwindcss/oxide-linux-arm64-musl@npm:4.1.13": "9a43e73d911da442b9014f90c5dada89fa58d114f92509c8a706cd26fe17630abf3de8ae1cb32e651389ca2349ce42f99b8d4837eafc399cfef65e9894e61013",
+  "@tailwindcss/oxide-linux-x64-gnu@npm:4.1.13": "15ba6fea2bd318e0053497e73638bffae4501762536796483442ef8dd6600d9085cb29916573286acab15533fe10139853e11f4c1fc59ba4da3192c0b0915b56",
+  "@tailwindcss/oxide-linux-x64-musl@npm:4.1.13": "364d9299460d703c0ef4d8fbe413f30288233e2aee81f1a77984a8c7831e4e997a4c49bfe0f16d0495b7102444db6abc82b75bac99babe4b78929fd906a5136e",
+  "@tailwindcss/oxide-wasm32-wasi@npm:4.1.13": "39f07aca836ff9c24c498af84d504fd1e28e21d7eb9202156217ae9ce519274532d5dfa6056c5ae62d175753e2cf74d6f0d6077f28c3c0b75dca468573eed9f0",
+  "@tailwindcss/oxide-win32-arm64-msvc@npm:4.1.13": "99c2cbdcb0144164f84ba2a31241232a7bb2cf68201e8f0c22da57be47a92a2b5302ec3c1f822fe48cb49ba4e1dc587374b07f004360c3de724c3ad5f9ba4b0f",
+  "@tailwindcss/oxide-win32-x64-msvc@npm:4.1.13": "ce35239ff4439e717aec9c31f5315ece74b47e444eccb288ee195ac63d84699d4116397e87698e717f7dd1b8b27be1049f3605e04fb7a78b720d25cde5b82340",
+  "@typescript/native-preview-darwin-arm64@npm:7.0.0-dev.20250915.1": "9aaa1e3b19f80dd19df4e0aeeba682ab8df25855a0673dc8e4fa9a60fdf5c330f66776c7fac0ed0d4308792e115f75dc6e6fa9c0557647715b4d35c4fd440927",
+  "@typescript/native-preview-darwin-x64@npm:7.0.0-dev.20250915.1": "44b68a689879364b150b38d9075814d5d502fae9188b7b73b630c5812e0a4f2c3fe07b854f5df6ddc87802a5bbc566b9240f187c78de855d647654980d5508e0",
+  "@typescript/native-preview-linux-arm64@npm:7.0.0-dev.20250915.1": "9f7b57723ffba13e32e535f5de7cd98e8b607b3609c8cc830b97c09415e1a0a93b09555da12d9994efbbfdcbdfb1e2724b9ee4fa272490757241493f3e15934b",
+  "@typescript/native-preview-linux-arm@npm:7.0.0-dev.20250915.1": "b39223bc14371d963bc6614c8b0e0215c81a2a39cbed686e0848a47511c379e23491a8b086d2b44df7f519994ef2314039153b1101d6ad188c61f0fadad2f1e8",
+  "@typescript/native-preview-linux-x64@npm:7.0.0-dev.20250915.1": "c4efcb6cd0ca92eb12f31f6032d2025d3771a9e6ef98f5fe22de97cc6bc4b09e8793fd5e3bf3136a6bf5999534db299794a5d7f59a7ba42dcf4b49ffa538783d",
+  "@typescript/native-preview-win32-arm64@npm:7.0.0-dev.20250915.1": "e32b96a6fff599b138965903c50c546290ea257f812f6c5ad85d84d9c2550039d314f1eb801f00728aecbe757f39a7361f890dcc39798277c2c662c7c3caff84",
+  "@typescript/native-preview-win32-x64@npm:7.0.0-dev.20250915.1": "6df4add8a206102964baf252953444ef21861d89eeba7936311e8bd4ac2c37b01e3a870fcb1fe6bed6b2b402ed80cc229bdf11e4c13bf32b6fe942e4f11abf10",
   "dmg-license@npm:1.0.11": "feef35cfb45270a72daadcca9584be5cb840f924448b9d4e543fcd61f1b6d471151049f277c91de1d8b003fad6203d0176066a5f427a01df5fb073402cb8c8b7",
   "iconv-corefoundation@npm:1.1.7": "bc6f08ac421e5e92ed20f3825f123fd705e036612b2b6aa687958de753c06f32e54f0203ef55540869e3ee189eaea15e43a2757f3a90e555c4dd512c9422da43",
   "lightningcss-darwin-arm64@npm:1.30.1": "bbdce4ee14b3952699e6d07c539cf4bd678853bfd974e3107742198dac38dfa6d40c6ea80163a7026aff662dd7d3a462a2bee9a18448c75c788659ceebe2746a",
diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix
index 2c02468c7299..5e8bc1f788c4 100644
--- a/pkgs/by-name/ch/cherry-studio/package.nix
+++ b/pkgs/by-name/ch/cherry-studio/package.nix
@@ -4,8 +4,8 @@
   fetchFromGitHub,
   yarn-berry_4,
   nodejs,
-  python3,
   electron_37,
+  autoPatchelfHook,
   makeWrapper,
   writableTmpDirAsHomeHook,
   makeDesktopItem,
@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "cherry-studio";
-  version = "1.5.11";
+  version = "1.6.5";
 
   src = fetchFromGitHub {
     owner = "CherryHQ";
     repo = "cherry-studio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-XJFqoluI3ZwmqxhKpJANqOxkYP3Va7pXXyWOHSLopwc=";
+    hash = "sha256-9oEMnGaloY3tFY/qpjTlYbO7n1ORIK49s3N9SGSMvHE=";
   };
 
   postPatch = ''
@@ -42,17 +42,18 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-k23HzIN8QAkV/IREM5fHHeaMjO+cIthpLNrLKn4g7tY=";
+    hash = "sha256-LstTTVKXVL6hIC5TiUKeBIcDFaRPdmEjO2LmvVXB7dQ=";
   };
 
   nativeBuildInputs = [
     yarn-berry.yarnBerryConfigHook
     yarn-berry
+    autoPatchelfHook
     makeWrapper
     writableTmpDirAsHomeHook
     copyDesktopItems
-    (python3.withPackages (ps: with ps; [ setuptools ]))
     nodejs
+    (nodejs.python.withPackages (ps: with ps; [ setuptools ]))
   ];
 
   env = {
@@ -63,11 +64,15 @@ stdenv.mkDerivation (finalAttrs: {
   buildPhase = ''
     runHook preBuild
 
+    cp -r "${electron.dist}" $HOME/.electron-dist
+    chmod -R u+w $HOME/.electron-dist
+
     yarn run electron-vite build
-    yarn run electron-builder --linux --dir \
-      --config electron-builder.yml \
-      -c.electronDist="${electron}/libexec/electron" \
-      -c.electronVersion=${electron.version}
+    yarn run electron-builder --dir \
+      --config=electron-builder.yml \
+      --config.mac.identity=null \
+      --config.electronDist="$HOME/.electron-dist" \
+      --config.electronVersion=${electron.version}
 
     runHook postBuild
   '';
@@ -88,7 +93,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   installPhase = ''
     runHook preInstall
-
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    mkdir -p $out/Applications
+    mv "dist/mac-${stdenv.hostPlatform.darwinArch}/Cherry Studio.app" "$out/Applications/Cherry Studio.app"
+  ''
+  + lib.optionalString stdenv.hostPlatform.isLinux ''
     mkdir -p $out/opt/cherry-studio
     ${
       if stdenv.hostPlatform.isAarch64 then
@@ -102,7 +112,8 @@ stdenv.mkDerivation (finalAttrs: {
       --add-flags $out/opt/cherry-studio/resources/app.asar \
       --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \
       --add-flags ${lib.escapeShellArg commandLineArgs}
-
+  ''
+  + ''
     runHook postInstall
   '';
 
@@ -113,8 +124,8 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/CherryHQ/cherry-studio";
     changelog = "https://github.com/CherryHQ/cherry-studio/releases/tag/v${finalAttrs.version}";
     mainProgram = "cherry-studio";
-    platforms = lib.platforms.linux;
-    maintainers = [ ];
+    platforms = with lib.platforms; linux ++ darwin;
+    maintainers = with lib.maintainers; [ xiaoxiangmoe ];
     license = with lib.licenses; [ agpl3Only ];
   };
 })

From 07dbd17ee4cfab0f671c0aac791aada0436e495d Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sat, 25 Oct 2025 18:24:55 +0400
Subject: [PATCH 2661/6226] libhv: modernize

---
 pkgs/by-name/li/libhv/package.nix | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/li/libhv/package.nix b/pkgs/by-name/li/libhv/package.nix
index f764e0f0000b..54e168cb80ee 100644
--- a/pkgs/by-name/li/libhv/package.nix
+++ b/pkgs/by-name/li/libhv/package.nix
@@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ithewei";
     repo = "libhv";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-YIWXdAZsWeSdtPtBaf/t9t68dFKw2nY0bvgMrzCEE5U=";
   };
 
@@ -26,19 +26,19 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    "-DENABLE_UDS=ON"
-    "-DWITH_MQTT=ON"
-    "-DWITH_CURL=ON"
-    "-DWITH_NGHTTP2=ON"
-    "-DWITH_OPENSSL=ON"
-    "-DWITH_KCP=ON"
+    (lib.cmakeBool "ENABLE_UDS" true)
+    (lib.cmakeBool "WITH_MQTT" true)
+    (lib.cmakeBool "WITH_CURL" true)
+    (lib.cmakeBool "WITH_NGHTTP2" true)
+    (lib.cmakeBool "WITH_OPENSSL" true)
+    (lib.cmakeBool "WITH_KCP" true)
   ];
 
-  meta = with lib; {
+  meta = {
     description = "C/c++ network library for developing TCP/UDP/SSL/HTTP/WebSocket/MQTT client/server";
     homepage = "https://github.com/ithewei/libhv";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ sikmir ];
-    platforms = platforms.unix;
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ sikmir ];
+    platforms = lib.platforms.unix;
   };
 })

From a8e4d926ea8c91b14fd4295a718e1d07b0d0b2ee Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Sat, 25 Oct 2025 16:25:42 +0200
Subject: [PATCH 2662/6226] floorp-bin: 12.2.1 -> 12.3.3

Release notes: https://blog.floorp.app/en/release/12.3.0.html

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 .../fl/floorp-bin-unwrapped/sources.json       | 18 +++++++++---------
 pkgs/by-name/fl/floorp-bin-unwrapped/update.sh |  2 +-
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json
index ae953ee261b9..d58ae3701fb3 100644
--- a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json
+++ b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json
@@ -1,21 +1,21 @@
 {
-  "version": "12.2.1",
+  "version": "12.3.3",
   "sources": {
     "aarch64-linux": {
-      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.2.1/floorp-linux-aarch64.tar.xz",
-      "sha256": "bacc6f31dbda6a2bbb5e9b3541511750d835feb1b161092bd801b8c5feaae249"
+      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.3.3/floorp-linux-aarch64.tar.xz",
+      "sha256": "ad2a957493f2ad9aea294ca0322c6b744f6c1188fbefbd772c0a5c0e65832456"
     },
     "x86_64-linux": {
-      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.2.1/floorp-linux-amd64.tar.xz",
-      "sha256": "cac00263e6cea2a4490d597a6287a7902a72907ad0ed6676a959873104b049d2"
+      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.3.3/floorp-linux-x86_64.tar.xz",
+      "sha256": "9bcbfadbae583cdd8a45ab3735fa08e0f613151645fc8ae5ee716cbb6140b76c"
     },
     "aarch64-darwin": {
-      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.2.1/floorp-macOS-universal.dmg",
-      "sha256": "7b086811976c394767f9fcf4880d5a114b6d2e8d4f12703c1529fc61eb89eacd"
+      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.3.3/floorp-macOS-universal.dmg",
+      "sha256": "0f9c3d2efe228f63c8f7c95aae19eee137f2a4ddfa980cdedf0d1da4fc4a975c"
     },
     "x86_64-darwin": {
-      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.2.1/floorp-macOS-universal.dmg",
-      "sha256": "7b086811976c394767f9fcf4880d5a114b6d2e8d4f12703c1529fc61eb89eacd"
+      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.3.3/floorp-macOS-universal.dmg",
+      "sha256": "0f9c3d2efe228f63c8f7c95aae19eee137f2a4ddfa980cdedf0d1da4fc4a975c"
     }
   }
 }
diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh b/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh
index 5be8138e7af5..3d0b87d688f2 100755
--- a/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh
+++ b/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh
@@ -31,7 +31,7 @@ jq '
       | map(
           if .url | contains("linux-aarch64") then
             {key: "aarch64-linux", value: .}
-          elif .url | contains("linux-amd64") then
+          elif .url | contains("linux-x86_64") then
             {key: "x86_64-linux", value: .}
           elif .url | contains("macOS-universal") then
             [{key: "aarch64-darwin", value: .}, {key: "x86_64-darwin", value: .}]

From 5dc74d8951a2294aef6e2710edbfafdcf20b1ccf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 14:27:42 +0000
Subject: [PATCH 2663/6226] jdk17: 17.0.17+8 -> 17.0.17+10

---
 pkgs/development/compilers/openjdk/17/source.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/17/source.json b/pkgs/development/compilers/openjdk/17/source.json
index 2b5813a3fd68..110fdf3a2223 100644
--- a/pkgs/development/compilers/openjdk/17/source.json
+++ b/pkgs/development/compilers/openjdk/17/source.json
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-xwi7Co0DiEx9IohwiQHpislv/50NdGuHVQINJcasBdY=",
+  "hash": "sha256-U2/ZQ9m3fi2rni2RAXyr5laDvNq0T5M2wZX+FdmCwFc=",
   "owner": "openjdk",
   "repo": "jdk17u",
-  "rev": "refs/tags/jdk-17.0.17+8"
+  "rev": "refs/tags/jdk-17.0.17+10"
 }

From f097d3fea1014776bf5aa777503c287373258bb4 Mon Sep 17 00:00:00 2001
From: SkohTV <contact@skoh.dev>
Date: Fri, 24 Oct 2025 19:20:36 -0400
Subject: [PATCH 2664/6226] soxt: unstable-2019-06-14 -> 1.4.2

---
 pkgs/by-name/so/soxt/package.nix | 30 +++++++++++++++++-------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/so/soxt/package.nix b/pkgs/by-name/so/soxt/package.nix
index f94c07c912a1..31fa46242c2f 100644
--- a/pkgs/by-name/so/soxt/package.nix
+++ b/pkgs/by-name/so/soxt/package.nix
@@ -1,5 +1,5 @@
 {
-  fetchhg,
+  fetchFromGitHub,
   lib,
   stdenv,
   cmake,
@@ -11,15 +11,16 @@
   libGL,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "soxt";
-  version = "unstable-2019-06-14";
+  version = "1.4.2";
 
-  src = fetchhg {
-    url = "https://bitbucket.org/Coin3D/soxt";
-    rev = "85e135bb266fbb17e47fc336b876a576a239c15c";
-    sha256 = "0vk5cgn53yqf7csqdnlnyyhi4mbgx4wlsq70613p5fgxlvxzhcym";
-    fetchSubrepos = true;
+  src = fetchFromGitHub {
+    owner = "coin3d";
+    repo = "soxt";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ji3rukL8QOErsjx06A61d65O5wxhw4jkEEKIa4EDhUg=";
+    fetchSubmodules = true;
   };
 
   nativeBuildInputs = [ cmake ];
@@ -32,11 +33,14 @@ stdenv.mkDerivation {
     libXmu
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://bitbucket.org/Coin3D/coin/wiki/Home";
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
     description = "GUI binding for using Open Inventor with Xt/Motif";
-    maintainers = with maintainers; [ tmplt ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [
+      tmplt
+      skohtv
+    ];
+    platforms = lib.platforms.linux;
   };
-}
+})

From 660b533b7ab1f707939a73a24c7e91bf8e59adfa Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 11:39:45 -0300
Subject: [PATCH 2665/6226] lxqt.libfm-qt_1_4: fix build with cmake4

---
 pkgs/desktops/lxqt/libfm-qt/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index 222b4e839514..1bbec0fcda3b 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -67,6 +67,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = gitUpdater { };
 
+  postPatch = lib.optionals (version == "1.4.0") ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     homepage = "https://github.com/lxqt/libfm-qt";
     description = "Core library of PCManFM-Qt (Qt binding for libfm)";

From b779719b234da3cc28cc9014ae6f6ba2a0879bec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Sat, 25 Oct 2025 08:42:20 -0600
Subject: [PATCH 2666/6226] linux/hardened/patches/6.12: v6.12.43-hardened1 ->
 v6.12.50-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index f9138a4b60ed..c8661d3a0fb0 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -2,11 +2,11 @@
     "6.12": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.12.43-hardened1.patch",
-            "sha256": "10hp4718agz7bj4wnis7g1c8ahnwn5917a5v88y9iwawrjm9148v",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.43-hardened1/linux-hardened-v6.12.43-hardened1.patch"
+            "name": "linux-hardened-v6.12.50-hardened1.patch",
+            "sha256": "0bzq364d6i7wis9sdljjkzmbvjnv45hmyqikmxagps2rdh57916p",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.50-hardened1/linux-hardened-v6.12.50-hardened1.patch"
         },
-        "sha256": "1vmxywg11z946i806sg7rk7jr9px87spmwwbzjxpps2nsjybpjqg",
-        "version": "6.12.43"
+        "sha256": "19bjzhxasj4r6m1lhsa486a96axfigbm06kqa2lwa7y2s5sbsdf4",
+        "version": "6.12.50"
     }
 }

From a862063c5db7c0e506b883abc0bbc8776af1624c Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Sat, 25 Oct 2025 23:20:08 +0800
Subject: [PATCH 2667/6226] wechat: 4.1.0.34-29721 -> 4.1.2.16-30516 for darwin

---
 pkgs/by-name/we/wechat/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix
index 2fce20ac0308..8caaf5591dc7 100644
--- a/pkgs/by-name/we/wechat/package.nix
+++ b/pkgs/by-name/we/wechat/package.nix
@@ -30,14 +30,14 @@ let
       # https://dldir1.qq.com/weixin/mac/mac-release.xml
       any-darwin =
         let
-          version = "4.1.0.34-29721";
+          version = "4.1.2.16-30516";
           version' = lib.replaceString "-" "_" version;
         in
         {
           inherit version;
           src = fetchurl {
             url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg";
-            hash = "sha256-UwQrU4uVCKnAYXFSnlIfXQbBxyR3KNn6f1Mp4bCSAZI=";
+            hash = "sha256-aMInN9sEOfEKXrRYTcHu69hzN9iO3hJ5jLvK9D0QKwU=";
           };
         };
     in

From 33aae1a07da4648ef8dc2580eedec489115b1788 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 15:24:07 +0000
Subject: [PATCH 2668/6226] hyprlandPlugins.hypr-dynamic-cursors:
 0-unstable-2025-10-12 -> 0-unstable-2025-10-23

---
 .../hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix
index 92299aaa88d6..2368ed33d678 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-dynamic-cursors.nix
@@ -7,13 +7,13 @@
 
 mkHyprlandPlugin {
   pluginName = "hypr-dynamic-cursors";
-  version = "0-unstable-2025-10-12";
+  version = "0-unstable-2025-10-23";
 
   src = fetchFromGitHub {
     owner = "VirtCode";
     repo = "hypr-dynamic-cursors";
-    rev = "d0e9f7320711fc83967cf6b172e8ed40c565631b";
-    hash = "sha256-Zr9eBntl3vfoIjmgSF9MgDAW+YGbYa1auttah7qqqTc=";
+    rev = "7336d7a7cf81422d0d8a574e9e9ba6fe8eab8dfc";
+    hash = "sha256-ZaiEZnsm7LlpDL/C/D4vO5QHgv9GdFrO9Fd2qlyvVRc=";
   };
 
   dontUseCmakeConfigure = true;

From 7b646716558d025eacba4ccc26bbf8ecc8d441eb Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Sun, 19 Oct 2025 10:17:25 -0300
Subject: [PATCH 2669/6226] etcd_3_5: move to pkgs/by-name

---
 .../etcd/3_5/default.nix => by-name/et/etcd_3_5/package.nix}  | 0
 pkgs/{servers/etcd/3_5 => by-name/et/etcd_3_5}/update.sh      | 4 ++--
 pkgs/top-level/all-packages.nix                               | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)
 rename pkgs/{servers/etcd/3_5/default.nix => by-name/et/etcd_3_5/package.nix} (100%)
 rename pkgs/{servers/etcd/3_5 => by-name/et/etcd_3_5}/update.sh (95%)

diff --git a/pkgs/servers/etcd/3_5/default.nix b/pkgs/by-name/et/etcd_3_5/package.nix
similarity index 100%
rename from pkgs/servers/etcd/3_5/default.nix
rename to pkgs/by-name/et/etcd_3_5/package.nix
diff --git a/pkgs/servers/etcd/3_5/update.sh b/pkgs/by-name/et/etcd_3_5/update.sh
similarity index 95%
rename from pkgs/servers/etcd/3_5/update.sh
rename to pkgs/by-name/et/etcd_3_5/update.sh
index dc428420cbc9..7cc2632205fb 100755
--- a/pkgs/servers/etcd/3_5/update.sh
+++ b/pkgs/by-name/et/etcd_3_5/update.sh
@@ -30,7 +30,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
     ETCD_SRC_HASH=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $ETCD_SRC_HASH)
 
     setKV () {
-        sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "$ETCD_PATH/default.nix"
+        sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "$ETCD_PATH/package.nix"
     }
 
     setKV version $LATEST_VERSION
@@ -63,7 +63,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
     # `git` flag here is to be used by local maintainers to speed up the bump process
     if [ $# -eq 1 ] && [ "$1" = "git" ]; then
         git switch -c "package-$ETCD_PKG_NAME-$LATEST_VERSION"
-        git add "$ETCD_PATH"/default.nix
+        git add "$ETCD_PATH"/package.nix
         git commit -m "$ETCD_PKG_NAME: $OLD_VERSION -> $LATEST_VERSION
 
 Release: https://github.com/etcd-io/etcd/releases/tag/$LATEST_TAG"
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e474e7028100..7f9772a9ea4b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9250,7 +9250,6 @@ with pkgs;
   dodgy = with python3Packages; toPythonApplication dodgy;
 
   etcd = etcd_3_5;
-  etcd_3_5 = callPackage ../servers/etcd/3_5 { };
 
   prosody = callPackage ../servers/xmpp/prosody {
     withExtraLibs = [ ];

From fdd3d694bc035d11375c66b027b526b2006a4930 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Sun, 19 Oct 2025 14:17:55 -0300
Subject: [PATCH 2670/6226] etcd_3_6: fix update script

---
 pkgs/by-name/et/etcd_3_6/update.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/et/etcd_3_6/update.sh b/pkgs/by-name/et/etcd_3_6/update.sh
index 1330f88d9085..8bcc05d986ca 100755
--- a/pkgs/by-name/et/etcd_3_6/update.sh
+++ b/pkgs/by-name/et/etcd_3_6/update.sh
@@ -30,7 +30,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
     ETCD_SRC_HASH=$(nix hash to-sri --type sha256 $ETCD_SRC_HASH)
 
     setKV () {
-        sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "$ETCD_PATH/default.nix"
+        sed -i "s|$1 = \".*\"|$1 = \"${2:-}\"|" "$ETCD_PATH/package.nix"
     }
 
     setKV version $LATEST_VERSION
@@ -63,7 +63,7 @@ if [ ! "$OLD_VERSION" = "$LATEST_VERSION" ]; then
     # `git` flag here is to be used by local maintainers to speed up the bump process
     if [ $# -eq 1 ] && [ "$1" = "git" ]; then
         git switch -c "package-$ETCD_PKG_NAME-$LATEST_VERSION"
-        git add "$ETCD_PATH"/default.nix
+        git add "$ETCD_PATH"/package.nix
         git commit -m "$ETCD_PKG_NAME: $OLD_VERSION -> $LATEST_VERSION
 
 Release: https://github.com/etcd-io/etcd/releases/tag/$LATEST_TAG"

From 9b09e0ee623a271f9292083d6d62550034758486 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Sun, 19 Oct 2025 10:20:36 -0300
Subject: [PATCH 2671/6226] etcd: move to pkgs/by-name

---
 pkgs/{servers => by-name/et}/etcd/README.md | 0
 pkgs/by-name/et/etcd/package.nix            | 3 +++
 pkgs/top-level/all-packages.nix             | 2 --
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename pkgs/{servers => by-name/et}/etcd/README.md (100%)
 create mode 100644 pkgs/by-name/et/etcd/package.nix

diff --git a/pkgs/servers/etcd/README.md b/pkgs/by-name/et/etcd/README.md
similarity index 100%
rename from pkgs/servers/etcd/README.md
rename to pkgs/by-name/et/etcd/README.md
diff --git a/pkgs/by-name/et/etcd/package.nix b/pkgs/by-name/et/etcd/package.nix
new file mode 100644
index 000000000000..1d70cbf0fd3b
--- /dev/null
+++ b/pkgs/by-name/et/etcd/package.nix
@@ -0,0 +1,3 @@
+{ etcd_3_5 }:
+
+etcd_3_5
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7f9772a9ea4b..6c7bd51f416c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -9249,8 +9249,6 @@ with pkgs;
 
   dodgy = with python3Packages; toPythonApplication dodgy;
 
-  etcd = etcd_3_5;
-
   prosody = callPackage ../servers/xmpp/prosody {
     withExtraLibs = [ ];
     withExtraLuaPackages = _: [ ];

From 68768c9564dd0f6b474776e643c308129ad293bc Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Sun, 19 Oct 2025 12:41:54 -0300
Subject: [PATCH 2672/6226] etcd: refactor tests for all versions

---
 nixos/tests/all-tests.nix                     |  3 +-
 nixos/tests/etcd/default.nix                  | 43 +++++++++++++++++++
 .../etcd/{etcd-cluster.nix => multi-node.nix} | 10 ++---
 .../tests/etcd/{etcd.nix => single-node.nix}  | 13 +++---
 pkgs/by-name/et/etcd_3_4/package.nix          |  3 ++
 pkgs/by-name/et/etcd_3_5/package.nix          |  6 +--
 pkgs/by-name/et/etcd_3_6/package.nix          |  6 +--
 7 files changed, 62 insertions(+), 22 deletions(-)
 create mode 100644 nixos/tests/etcd/default.nix
 rename nixos/tests/etcd/{etcd-cluster.nix => multi-node.nix} (97%)
 rename nixos/tests/etcd/{etcd.nix => single-node.nix} (74%)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index df47807b44b7..7e911dc85a88 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -516,8 +516,7 @@ in
   ergochat = runTest ./ergochat.nix;
   esphome = runTest ./esphome.nix;
   etc = pkgs.callPackage ../modules/system/etc/test.nix { inherit evalMinimalConfig; };
-  etcd = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./etcd/etcd.nix;
-  etcd-cluster = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./etcd/etcd-cluster.nix;
+  etcd = import ./etcd/default.nix { inherit pkgs runTest; };
   etebase-server = runTest ./etebase-server.nix;
   etesync-dav = runTest ./etesync-dav.nix;
   evcc = runTest ./evcc.nix;
diff --git a/nixos/tests/etcd/default.nix b/nixos/tests/etcd/default.nix
new file mode 100644
index 000000000000..96add9670a95
--- /dev/null
+++ b/nixos/tests/etcd/default.nix
@@ -0,0 +1,43 @@
+{
+  pkgs,
+  runTest,
+  ...
+}:
+
+let
+  testEtcd =
+    path: oPkgs:
+    runTest (
+      let
+        etcdPkgs = pkgs // oPkgs;
+      in
+      pkgs.lib.recursiveUpdate {
+        meta = {
+          maintainers = etcdPkgs.etcd.meta.maintainers;
+          platforms = [
+            "aarch64-linux"
+            "x86_64-linux"
+          ];
+        };
+      } (import path etcdPkgs)
+    );
+  testEtcdPkg = pkg: path: testEtcd path { etcd = pkg; };
+  testEtcd_3_4 = testEtcdPkg pkgs.etcd_3_4;
+  testEtcd_3_5 = testEtcdPkg pkgs.etcd_3_5;
+  testEtcd_3_6 = testEtcdPkg pkgs.etcd_3_6;
+in
+
+{
+  "3_4" = {
+    multi-node = testEtcd_3_4 ./multi-node.nix;
+    single-node = testEtcd_3_4 ./single-node.nix;
+  };
+  "3_5" = {
+    multi-node = testEtcd_3_5 ./multi-node.nix;
+    single-node = testEtcd_3_5 ./single-node.nix;
+  };
+  "3_6" = {
+    multi-node = testEtcd_3_6 ./multi-node.nix;
+    single-node = testEtcd_3_6 ./single-node.nix;
+  };
+}
diff --git a/nixos/tests/etcd/etcd-cluster.nix b/nixos/tests/etcd/multi-node.nix
similarity index 97%
rename from nixos/tests/etcd/etcd-cluster.nix
rename to nixos/tests/etcd/multi-node.nix
index aa66c8498356..0ce36d0f14b6 100644
--- a/nixos/tests/etcd/etcd-cluster.nix
+++ b/nixos/tests/etcd/multi-node.nix
@@ -1,6 +1,5 @@
-# This test runs simple etcd cluster
+{ pkgs, etcd, ... }:
 
-{ lib, pkgs, ... }:
 let
   runWithOpenSSL =
     file: cmd:
@@ -77,6 +76,7 @@ let
     services = {
       etcd = {
         enable = true;
+        package = etcd;
         keyFile = etcd_key;
         certFile = etcd_cert;
         trustedCaFile = ca_pem;
@@ -99,10 +99,9 @@ let
     networking.firewall.allowedTCPPorts = [ 2380 ];
   };
 in
-{
-  name = "etcd-cluster";
 
-  meta.maintainers = with lib.maintainers; [ offline ];
+{
+  name = "etcd-multi-node";
 
   nodes = {
     node1 =
@@ -170,4 +169,5 @@ in
         node1.succeed("etcdctl put /foo/bar 'Hello degraded world'")
         node1.succeed("etcdctl get /foo/bar | grep 'Hello degraded world'")
   '';
+
 }
diff --git a/nixos/tests/etcd/etcd.nix b/nixos/tests/etcd/single-node.nix
similarity index 74%
rename from nixos/tests/etcd/etcd.nix
rename to nixos/tests/etcd/single-node.nix
index 9c423ef35185..0d2bdea166d9 100644
--- a/nixos/tests/etcd/etcd.nix
+++ b/nixos/tests/etcd/single-node.nix
@@ -1,11 +1,13 @@
-# This test runs simple etcd node
-{ lib, ... }:
+{ etcd, ... }:
+
 {
-  name = "etcd";
-  meta.maintainers = with lib.maintainers; [ offline ];
+  name = "etcd-single-node";
 
   nodes.node = {
-    services.etcd.enable = true;
+    services.etcd = {
+      enable = true;
+      package = etcd;
+    };
   };
 
   testScript = ''
@@ -19,4 +21,5 @@
         node.succeed("etcdctl put /foo/bar 'Hello world'")
         node.succeed("etcdctl get /foo/bar | grep 'Hello world'")
   '';
+
 }
diff --git a/pkgs/by-name/et/etcd_3_4/package.nix b/pkgs/by-name/et/etcd_3_4/package.nix
index 19e6a6c62411..50397a79c6f3 100644
--- a/pkgs/by-name/et/etcd_3_4/package.nix
+++ b/pkgs/by-name/et/etcd_3_4/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nixosTests,
 }:
 
 buildGoModule rec {
@@ -36,6 +37,8 @@ buildGoModule rec {
     install -Dm755 bin/* bin/functional/cmd/* -t $out/bin
   '';
 
+  passthru.tests = nixosTests.etcd."3_4";
+
   meta = {
     description = "Distributed reliable key-value store for the most critical data of a distributed system";
     downloadPage = "https://github.com/etcd-io/etcd/";
diff --git a/pkgs/by-name/et/etcd_3_5/package.nix b/pkgs/by-name/et/etcd_3_5/package.nix
index 5ca80ba041c5..b5b67dc32c4b 100644
--- a/pkgs/by-name/et/etcd_3_5/package.nix
+++ b/pkgs/by-name/et/etcd_3_5/package.nix
@@ -101,11 +101,7 @@ symlinkJoin {
     deps = {
       inherit etcdserver etcdutl etcdctl;
     };
-
-    tests = {
-      inherit (nixosTests) etcd etcd-cluster;
-      k3s = k3s.passthru.tests.etcd;
-    };
+    tests = nixosTests.etcd."3_5";
     updateScript = ./update.sh;
   };
 
diff --git a/pkgs/by-name/et/etcd_3_6/package.nix b/pkgs/by-name/et/etcd_3_6/package.nix
index c7f75ac9d091..f4bfc90780bc 100644
--- a/pkgs/by-name/et/etcd_3_6/package.nix
+++ b/pkgs/by-name/et/etcd_3_6/package.nix
@@ -132,11 +132,7 @@ symlinkJoin {
     deps = {
       inherit etcdserver etcdutl etcdctl;
     };
-    # Fix-Me: Tests for etcd 3.6 needs work.
-    # tests = {
-    #   inherit (nixosTests) etcd etcd-cluster;
-    #   k3s = k3s.passthru.tests.etcd;
-    # };
+    tests = nixosTests.etcd."3_6";
     updateScript = ./update.sh;
   };
 

From 838c1fde159893b8fd59fac25318c3982831d739 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 24 Oct 2025 23:24:33 -0300
Subject: [PATCH 2673/6226] t4kcommon: fix build with cmake4

Co-authored-by: Michael Daniels <mdaniels5757@gmail.com>
---
 pkgs/by-name/t4/t4kcommon/linebreak-fix.patch | 17 +++++++++++++++++
 pkgs/by-name/t4/t4kcommon/package.nix         |  7 +++++++
 2 files changed, 24 insertions(+)
 create mode 100644 pkgs/by-name/t4/t4kcommon/linebreak-fix.patch

diff --git a/pkgs/by-name/t4/t4kcommon/linebreak-fix.patch b/pkgs/by-name/t4/t4kcommon/linebreak-fix.patch
new file mode 100644
index 000000000000..a13cdd4a917e
--- /dev/null
+++ b/pkgs/by-name/t4/t4kcommon/linebreak-fix.patch
@@ -0,0 +1,17 @@
+--- a/src/linebreak/CMakeLists.txt
++++ b/src/linebreak/CMakeLists.txt
+@@ -72,12 +72,12 @@
+   ${LINEBREAK_BINARY_DIR} 
+   ${LINEBREAK_SOURCE_DIR} 
+   ${CMAKE_CURRENT_BINARY_DIR})
+-  
++add_library(linebreak STATIC ${LINEBREAK_SOURCES} ${LINEBREAK_HEADERS})
+ if (ICONV_FOUND)
+   include_directories(${ICONV_INCLUDE_DIR})
+   target_link_libraries(linebreak ${ICONV_LIBRARY})
+ endif (ICONV_FOUND)
+-add_library(linebreak STATIC ${LINEBREAK_SOURCES} ${LINEBREAK_HEADERS})
++
+ 
+ #project_source_group("${GROUP_CODE}" LINEBREAK_SOURCES LINEBREAK_HEADERS)
+ 
diff --git a/pkgs/by-name/t4/t4kcommon/package.nix b/pkgs/by-name/t4/t4kcommon/package.nix
index 956002f5a0e7..f59e0309260d 100644
--- a/pkgs/by-name/t4/t4kcommon/package.nix
+++ b/pkgs/by-name/t4/t4kcommon/package.nix
@@ -32,6 +32,8 @@ stdenv.mkDerivation rec {
       url = "https://salsa.debian.org/tux4kids-pkg-team/t4kcommon/raw/f7073fa384f5a725139f54844e59b57338b69dc7/debian/patches/libpng16.patch";
       hash = "sha256-auQ8VvOyvLE1PD2dfeHZJV+MzIt1OtUa7OcOqsXTAYI=";
     })
+    # Fix "Cannot specify link libraries for target "linebreak" which is not built by this project."
+    ./linebreak-fix.patch
   ];
 
   # Workaround build failure on -fno-common toolchains like upstream
@@ -55,6 +57,11 @@ stdenv.mkDerivation rec {
     libxml2
   ];
 
+  postPatch = ''
+    substituteInPlace {src/,./}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Library of code shared between tuxmath and tuxtype";
     homepage = "https://github.com/tux4kids/t4kcommon";

From ad51f81af56b644e4dffa83d0814332a8bb22c74 Mon Sep 17 00:00:00 2001
From: superherointj <5861043+superherointj@users.noreply.github.com>
Date: Sun, 19 Oct 2025 14:23:44 -0300
Subject: [PATCH 2674/6226] etcd_3_6: 3.6.4 -> 3.6.5

https://github.com/etcd-io/etcd/releases/tag/v3.6.5
---
 pkgs/by-name/et/etcd_3_6/package.nix | 25 +++++++++----------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/et/etcd_3_6/package.nix b/pkgs/by-name/et/etcd_3_6/package.nix
index f4bfc90780bc..49a2ad7f92c1 100644
--- a/pkgs/by-name/et/etcd_3_6/package.nix
+++ b/pkgs/by-name/et/etcd_3_6/package.nix
@@ -1,8 +1,7 @@
 {
   applyPatches,
-  buildGoModule,
+  buildGo124Module,
   fetchFromGitHub,
-  fetchpatch,
   installShellFiles,
   k3s,
   lib,
@@ -12,11 +11,11 @@
 }:
 
 let
-  version = "3.6.4";
-  etcdSrcHash = "sha256-otz+06cOD2MVnMZWKId1GN+MeZfnDbdudiYfVCKdzuo=";
-  etcdCtlVendorHash = "sha256-kTH+s/SY+xwo6kt6iPJ7XDhin0jPk0FBr0eOe/717bE=";
-  etcdUtlVendorHash = "sha256-P0yx9YMMD9vT7N6LOlo26EAOi+Dj33p3ZjAYEoaL19A=";
-  etcdServerVendorHash = "sha256-kgbCT1JxI98W89veCItB7ZfW4d9D3/Ip3tOuFKEX9v4=";
+  version = "3.6.5";
+  etcdSrcHash = "sha256-d0Ujg9ynnnSW0PYYYrNEmPtLnYW2HcCl+zcVo8ACiS0=";
+  etcdCtlVendorHash = "sha256-5r3Q+AfWp23tzbYQoD1hXEzRttJrUUKQSpcEV3GIlOE=";
+  etcdUtlVendorHash = "sha256-funO7EEJs28w4sk4sHVA/KR1TiHumVKNs0Gn/xFl4ig=";
+  etcdServerVendorHash = "sha256-OtWpX5A+kyQej2bueTqmNf62oKmXGQzjexzXlK/XJms=";
 
   src = applyPatches {
     src = fetchFromGitHub {
@@ -25,12 +24,6 @@ let
       tag = "v${version}";
       hash = etcdSrcHash;
     };
-    patches = [
-      (fetchpatch {
-        url = "https://github.com/etcd-io/etcd/commit/31650ab0c8df43af05fc4c13b48ffee59271eec7.patch";
-        hash = "sha256-Q94HOLFx2fnb61wMQsAUT4sIBXfxXqW9YEayukQXX18=";
-      })
-    ];
   };
 
   env = {
@@ -46,7 +39,7 @@ let
     platforms = lib.platforms.darwin ++ lib.platforms.linux;
   };
 
-  etcdserver = buildGoModule {
+  etcdserver = buildGo124Module {
     pname = "etcdserver";
 
     inherit
@@ -73,7 +66,7 @@ let
     ldflags = [ "-X go.etcd.io/etcd/api/v3/version.GitSHA=GitNotFound" ];
   };
 
-  etcdutl = buildGoModule {
+  etcdutl = buildGo124Module {
     pname = "etcdutl";
 
     inherit
@@ -99,7 +92,7 @@ let
     '';
   };
 
-  etcdctl = buildGoModule {
+  etcdctl = buildGo124Module {
     pname = "etcdctl";
 
     inherit

From 09822a4e05d129e016d748ed6dd16ae809f7875f Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Tue, 21 Oct 2025 15:41:38 -0300
Subject: [PATCH 2675/6226] etcd_3_4: 3.4.37 -> 3.4.38

Release: https://github.com/etcd-io/etcd/releases/tag/v3.4.38
---
 pkgs/by-name/et/etcd_3_4/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/et/etcd_3_4/package.nix b/pkgs/by-name/et/etcd_3_4/package.nix
index 50397a79c6f3..ac404468b339 100644
--- a/pkgs/by-name/et/etcd_3_4/package.nix
+++ b/pkgs/by-name/et/etcd_3_4/package.nix
@@ -1,23 +1,23 @@
 {
   lib,
-  buildGoModule,
+  buildGo124Module,
   fetchFromGitHub,
   nixosTests,
 }:
 
-buildGoModule rec {
+buildGo124Module rec {
   pname = "etcd";
-  version = "3.4.37";
+  version = "3.4.38";
 
   src = fetchFromGitHub {
     owner = "etcd-io";
     repo = "etcd";
     rev = "v${version}";
-    hash = "sha256-PZ+8hlxSwayR1yvjHmStMDur9e1uc2s+YB8qdz+42mA=";
+    hash = "sha256-+fRmz52ZqQTL8JJmSsufoVJP/FGHez9LliEwGsoCE7s=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-VeB0A+freNwgETQMIokiOPWovGq1FANUexnzxVg2aRA=";
+  vendorHash = "sha256-CqeSRyWDw1nCKlAI46iJXT5XjI3elxufx87QIlHwp1w=";
 
   preBuild = ''
     go mod tidy

From 7183516418735ee01119a7cb02d0df4d9fc451d1 Mon Sep 17 00:00:00 2001
From: Mauricio Collares <mauricio@collares.org>
Date: Sat, 25 Oct 2025 09:25:12 -0300
Subject: [PATCH 2676/6226] python313Packages.gmpy2: try to reenable tests

---
 pkgs/development/python-modules/gmpy2/default.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/pkgs/development/python-modules/gmpy2/default.nix b/pkgs/development/python-modules/gmpy2/default.nix
index ff9b834ca501..33712b519afc 100644
--- a/pkgs/development/python-modules/gmpy2/default.nix
+++ b/pkgs/development/python-modules/gmpy2/default.nix
@@ -59,18 +59,6 @@ buildPythonPackage rec {
     mpmath
   ];
 
-  disabledTests =
-    lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
-      # issue with some overflow logic
-      "test_mpz_to_bytes"
-      "test_mpz_from_bytes"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # TypeError: mpq() requires numeric or string argument
-      # not sure why it only fails on Darwin
-      "test_mpq_from_Decimal"
-    ];
-
   pythonImportsCheck = [ "gmpy2" ];
 
   passthru.tests = {

From 27262bebd8c9af00e5e76eabf7ae33115f395ea6 Mon Sep 17 00:00:00 2001
From: Shea Levy <shea@shealevy.com>
Date: Sat, 25 Oct 2025 12:29:25 -0400
Subject: [PATCH 2677/6226] nix-plugins: 16.0.0 -> 16.0.1

---
 pkgs/by-name/ni/nix-plugins/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nix-plugins/package.nix b/pkgs/by-name/ni/nix-plugins/package.nix
index 9a1215c4185f..eb9fb26dafb1 100644
--- a/pkgs/by-name/ni/nix-plugins/package.nix
+++ b/pkgs/by-name/ni/nix-plugins/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nix-plugins";
-  version = "16.0.0";
+  version = "16.0.1";
 
   src = fetchFromGitHub {
     owner = "shlevy";
     repo = "nix-plugins";
     rev = version;
-    hash = "sha256-yofHs1IyAkyMqrWlLkmnX+CmH+qsvlhKN1YZM4nRf1M=";
+    hash = "sha256-1P5oVXSx/hGK5MB2grxWtmqsKGtTEmT1XD5+NSsLFUw=";
   };
 
   nativeBuildInputs = [

From e2bc41caa23ef4feb337c063a5e71e1a0008ece7 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 13:38:27 -0300
Subject: [PATCH 2678/6226] lxqt.libqtxdg_3_12: fix build with cmake4

---
 pkgs/desktops/lxqt/libqtxdg/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
index b5b23b1569a8..891ab5149f5a 100644
--- a/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -57,6 +57,11 @@ stdenv.mkDerivation (finalAttrs: {
     )
   '';
 
+  postPatch = lib.optionals (version == "3.12.0") ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   passthru.updateScript = gitUpdater { };
 
   meta = {

From df67cc01be304f6954a534297001a3767883be25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 16:38:56 +0000
Subject: [PATCH 2679/6226] discordo: 0-unstable-2025-10-16 ->
 0-unstable-2025-10-22

---
 pkgs/by-name/di/discordo/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/di/discordo/package.nix b/pkgs/by-name/di/discordo/package.nix
index 5972d119479e..8c0ff1bb75bc 100644
--- a/pkgs/by-name/di/discordo/package.nix
+++ b/pkgs/by-name/di/discordo/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "discordo";
-  version = "0-unstable-2025-10-16";
+  version = "0-unstable-2025-10-22";
 
   src = fetchFromGitHub {
     owner = "ayn2op";
     repo = "discordo";
-    rev = "9a1bdac4fbb715374acc88f59e2ca614b72a5b2c";
-    hash = "sha256-pCY82Xzlq+QVOpr3aTthfcPXjTjuKfO63oqDD7Hl/sc=";
+    rev = "55e31cfb477ffdb2cdba8fc81db84f45574fe218";
+    hash = "sha256-x8ZIcMEtnya32BuHN7HgG8WbLu+fPOiFrAAI49alpbM=";
   };
 
-  vendorHash = "sha256-lYlVr9sKceCaOFpv7owCeaP9PyZWh/U9lUrGjUh98hk=";
+  vendorHash = "sha256-UVjwirGN1A8SJRLr6L4bweFcwkXJolHrF6kRST2ShRA=";
 
   env.CGO_ENABLED = 0;
 

From 2a142c2c3103d8ebeeb96004fad862f3c2415a71 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 13:43:37 -0300
Subject: [PATCH 2680/6226] lxqt.qtermwidget_1_4: fix build with cmake4

---
 pkgs/desktops/lxqt/qtermwidget/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix
index 9cf2f488b91d..594665c1b20a 100644
--- a/pkgs/desktops/lxqt/qtermwidget/default.nix
+++ b/pkgs/desktops/lxqt/qtermwidget/default.nix
@@ -40,6 +40,11 @@ stdenv.mkDerivation rec {
 
   passthru.updateScript = gitUpdater { };
 
+  postPatch = lib.optionals (version == "1.4.0") ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     broken = stdenv.hostPlatform.isDarwin;
     homepage = "https://github.com/lxqt/qtermwidget";

From 7dae1ff5db8d53ef257cb6f6163168419cf121b4 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 24 Oct 2025 10:11:29 +0300
Subject: [PATCH 2681/6226] python3.pkgs.pyqtgraph: modernize attributes

A followup to #455351 .
---
 .../python-modules/pyqtgraph/default.nix         | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix
index bb44eef839e6..dfa33aba6ff7 100644
--- a/pkgs/development/python-modules/pyqtgraph/default.nix
+++ b/pkgs/development/python-modules/pyqtgraph/default.nix
@@ -3,15 +3,23 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   scipy,
   numpy,
-  pyqt6,
   pyopengl,
+
+  # buildInputs
+  pyqt6,
+
+  # tests
   qt6,
   pytestCheckHook,
   freefont_ttf,
   makeFontsConf,
-  setuptools,
 }:
 
 let
@@ -29,7 +37,9 @@ buildPythonPackage rec {
     hash = "sha256-MUwg1v6oH2TGmJ14Hp9i6KYierJbzPggK59QaHSXHVA=";
   };
 
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+  ];
 
   dependencies = [
     numpy

From 3f1bc451cf2afa345a2191d9dc0c9b5c9fe458da Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 24 Oct 2025 10:14:58 +0300
Subject: [PATCH 2682/6226] python312.pkgs.pyqtgraph: fix test causing segfault
 with Qt 6.10

Fixes #455139 .
---
 .../python-modules/pyqtgraph/default.nix        | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pyqtgraph/default.nix b/pkgs/development/python-modules/pyqtgraph/default.nix
index dfa33aba6ff7..fcc6e51f8bbf 100644
--- a/pkgs/development/python-modules/pyqtgraph/default.nix
+++ b/pkgs/development/python-modules/pyqtgraph/default.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
 
   # build-system
   setuptools,
@@ -37,6 +38,17 @@ buildPythonPackage rec {
     hash = "sha256-MUwg1v6oH2TGmJ14Hp9i6KYierJbzPggK59QaHSXHVA=";
   };
 
+  patches = [
+    # Fixes a segmentation fault in tests with Qt 6.10. See:
+    # https://github.com/pyqtgraph/pyqtgraph/issues/3390
+    # The patch is the merge commit of:
+    # https://github.com/pyqtgraph/pyqtgraph/pull/3370
+    (fetchpatch {
+      url = "https://github.com/pyqtgraph/pyqtgraph/commit/bf38b8527e778c9c0bb653bc0df7bb36018dcbae.patch";
+      hash = "sha256-Tv4QK/OZvmDO3MOjswjch7DpF96U1uRN0dr8NIQ7+LY=";
+    })
+  ];
+
   build-system = [
     setuptools
   ];
@@ -79,11 +91,6 @@ buildPythonPackage rec {
       "test_rescaleData"
     ];
 
-  disabledTestPaths = [
-    # Segmentation fault
-    "tests/test_qpainterpathprivate.py"
-  ];
-
   meta = {
     description = "Scientific Graphics and GUI Library for Python";
     homepage = "https://www.pyqtgraph.org/";

From 11bc0ce89c63294555b44ab7f5a39d36954b48b4 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 14:03:35 -0300
Subject: [PATCH 2683/6226] mt32emu-smf2wav: fix build with cmake4

---
 pkgs/by-name/mt/mt32emu-smf2wav/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/mt/mt32emu-smf2wav/package.nix b/pkgs/by-name/mt/mt32emu-smf2wav/package.nix
index ea3bd25ef941..63ec93ce6da5 100644
--- a/pkgs/by-name/mt/mt32emu-smf2wav/package.nix
+++ b/pkgs/by-name/mt/mt32emu-smf2wav/package.nix
@@ -21,6 +21,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     sed -i -e '/add_subdirectory(mt32emu)/d' CMakeLists.txt
+    # This directly resolves the 'The dependency target "mt32emu" ... does not exist' error.
+    sed -i -e '/add_dependencies(mt32emu-smf2wav mt32emu)/d' CMakeLists.txt
+
+    substituteInPlace {./,mt32emu_smf2wav/,mt32emu_smf2wav/libsmf/}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [

From d1239f586bcd25e779f687d2c151b9dd1ce8af19 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sat, 25 Oct 2025 20:07:42 +0300
Subject: [PATCH 2684/6226] volk_2: remove

---
 pkgs/by-name/vo/volk_2/package.nix | 72 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 2 files changed, 1 insertion(+), 72 deletions(-)
 delete mode 100644 pkgs/by-name/vo/volk_2/package.nix

diff --git a/pkgs/by-name/vo/volk_2/package.nix b/pkgs/by-name/vo/volk_2/package.nix
deleted file mode 100644
index bc8f9c803f63..000000000000
--- a/pkgs/by-name/vo/volk_2/package.nix
+++ /dev/null
@@ -1,72 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  python3,
-  enableModTool ? true,
-  removeReferencesTo,
-  fetchpatch,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "volk";
-  # Version 2.5.1 seems to cause a build issue for aarch64-darwin[1], and for
-  # gnuradio 3.8 on all platforms[2]. Hence we pin this package to 2.5.0 and
-  # use it for GR 3.8 for all platforms.
-  #
-  # [1]: https://github.com/NixOS/nixpkgs/pull/160152#issuecomment-1043380478A
-  # [2]: https://github.com/NixOS/nixpkgs/pull/330477#issuecomment-2254477735
-  version = "2.5.0";
-
-  src = fetchFromGitHub {
-    owner = "gnuradio";
-    repo = "volk";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-XvX6emv30bSB29EFm6aC+j8NGOxWqHCNv0Hxtdrq/jc=";
-    fetchSubmodules = true;
-  };
-
-  patches = [
-    (fetchpatch {
-      url = "https://raw.githubusercontent.com/macports/macports-ports/e83a55ef196d4283be438c052295b2fc44f3df5b/science/volk/files/patch-cpu_features-add-support-for-ARM64.diff";
-      hash = "sha256-MNUntVvKZC4zuQsxGQCItaUaaQ1d31re2qjyPFbySmI=";
-      extraPrefix = "";
-    })
-  ];
-
-  cmakeFlags = [
-    (lib.cmakeBool "ENABLE_MODTOOL" enableModTool)
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [
-    # offset 14335 in1: -1.03372 in2: -1.03371 tolerance was: 1e-05
-    # volk_32f_log2_32f: fail on arch neon
-    "-DCMAKE_CTEST_ARGUMENTS=--exclude-regex;qa_volk_32f_log2_32f"
-  ];
-
-  postInstall = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
-    remove-references-to -t ${stdenv.cc} $(readlink -f $out/lib/libvolk.so)
-  '';
-
-  nativeBuildInputs = [
-    cmake
-    python3
-    python3.pkgs.mako
-    python3.pkgs.distutils
-    removeReferencesTo
-  ];
-
-  doCheck = true;
-
-  postPatch = ''
-    substituteInPlace cpu_features/CMakeLists.txt \
-      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
-  '';
-
-  meta = {
-    homepage = "http://libvolk.org/";
-    description = "Vector Optimized Library of Kernels (version 2.5.0 - for GR 3.8)";
-    license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ doronbehar ];
-  };
-})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f05860c36aa9..d3bca75e037a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2762,6 +2762,7 @@ mapAliases {
   vmware-horizon-client = throw "'vmware-horizon-client' has been renamed to 'omnissa-horizon-client'"; # Added 2025-04-24
   vocal = throw "'vocal' has been archived upstream. Consider using 'gnome-podcasts' or 'kasts' instead."; # Added 2025-04-12
   void = throw "'void' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
+  volk_2 = throw "'volk_2' has been removed after not being used by any package for a long time"; # Added 2025-10-25
   volnoti = throw "'volnoti' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   voxelands = throw "'voxelands' has been removed due to lack of upstream maintenance"; # Added 2025-08-30
   vtk_9 = lib.warnOnInstantiate "'vtk_9' has been renamed to 'vtk_9_5'" vtk_9_5; # Added 2025-07-18

From 89420eeaa15c6b5cab9d4058166db6020fbbbe56 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 14:36:20 -0300
Subject: [PATCH 2685/6226] monosat: fix build with cmake4

---
 pkgs/by-name/mo/monosat/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/mo/monosat/package.nix b/pkgs/by-name/mo/monosat/package.nix
index c5fbc9824ebe..02a828ceb247 100644
--- a/pkgs/by-name/mo/monosat/package.nix
+++ b/pkgs/by-name/mo/monosat/package.nix
@@ -47,7 +47,10 @@ let
   core = stdenv.mkDerivation {
     name = "${pname}-${version}";
     inherit src patches;
-    postPatch = commonPostPatch;
+    postPatch = commonPostPatch + ''
+      substituteInPlace CMakeLists.txt \
+        --replace-fail "cmake_minimum_required(VERSION 3.02)" "cmake_minimum_required(VERSION 3.10)"
+    '';
     nativeBuildInputs = [ cmake ];
     buildInputs = [
       zlib

From 10751d7a36a3aea75650364a62ab5b3fcfa9bb4f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 17:48:45 +0000
Subject: [PATCH 2686/6226] hath-rust: 1.13.0 -> 1.13.1

---
 pkgs/by-name/ha/hath-rust/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/hath-rust/package.nix b/pkgs/by-name/ha/hath-rust/package.nix
index ff75eaa3a185..bb1918b01075 100644
--- a/pkgs/by-name/ha/hath-rust/package.nix
+++ b/pkgs/by-name/ha/hath-rust/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hath-rust";
-  version = "1.13.0";
+  version = "1.13.1";
 
   src = fetchFromGitHub {
     owner = "james58899";
     repo = "hath-rust";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-81nt+epuZGWxmIEdTAsQJUxLOZjfMFl9SJNJILo9o+8=";
+    hash = "sha256-3fi18oarPXe9vUhn4MkyLWA4I2d6PtcbW+rpEYsq8/o=";
   };
 
-  cargoHash = "sha256-7529DN55X6XbAxqXhTYSBL0c+/2fOKc4oyFnvMmEDeU=";
+  cargoHash = "sha256-/n4GwqK2i2YwH1q7U29PZh9JzDTuEbP3YRJktsknQeM=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";

From c3135c6c1c2c65dc97be992e3e3fa2a923fce019 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 17:51:12 +0000
Subject: [PATCH 2687/6226] openlist: 4.1.4 -> 4.1.5

---
 pkgs/by-name/op/openlist/frontend.nix | 8 ++++----
 pkgs/by-name/op/openlist/package.nix  | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/op/openlist/frontend.nix b/pkgs/by-name/op/openlist/frontend.nix
index a366940e7d5c..4b3f85879b93 100644
--- a/pkgs/by-name/op/openlist/frontend.nix
+++ b/pkgs/by-name/op/openlist/frontend.nix
@@ -10,18 +10,18 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "openlist-frontend";
-  version = "4.1.4";
+  version = "4.1.5";
 
   src = fetchFromGitHub {
     owner = "OpenListTeam";
     repo = "OpenList-Frontend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-crQm74JxVhEDbFQKWJzE6T6qKVMaQbJilI9hoGIxUYU=";
+    hash = "sha256-J/6ZebKn7z5oagXF8in4PX9kMbdzBtqiwOgQdznYNzM=";
   };
 
   i18n = fetchzip {
     url = "https://github.com/OpenListTeam/OpenList-Frontend/releases/download/v${finalAttrs.version}/i18n.tar.gz";
-    hash = "sha256-4v+hNQl7tSm331CPpqYGMIJXEeOSB0QyQNeQCL5zeFg=";
+    hash = "sha256-rpLHflA5EHxmc2ST0AhDnFOXbI5aE4jdedHOEFZ9+RY=";
     stripRoot = false;
   };
 
@@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-8wP57qIUGGccLX4oKkqQmibAoAHwnORhBFp80d+ltA4=";
+    hash = "sha256-Ge+uwFGvEtRgYf5zkwYbNfBONXoVxlw4pmu25nY4HTc=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/op/openlist/package.nix b/pkgs/by-name/op/openlist/package.nix
index 0c316517fc24..eb6bb8ec2754 100644
--- a/pkgs/by-name/op/openlist/package.nix
+++ b/pkgs/by-name/op/openlist/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "openlist";
-  version = "4.1.4";
+  version = "4.1.5";
 
   src = fetchFromGitHub {
     owner = "OpenListTeam";
     repo = "OpenList";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CNnDPA/zByhR6GOmzxOZRc8F/QqGIxTGSIKXOCwlwwg=";
+    hash = "sha256-x4cuymUzfMe49R9PRyD14f6piP4iR8AoYkvEfdRBKcE=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -33,7 +33,7 @@ buildGoModule (finalAttrs: {
   frontend = callPackage ./frontend.nix { };
 
   proxyVendor = true;
-  vendorHash = "sha256-MHqQ/2FrqxufSa9OG3MWkm401qeIszK9rpgDR0jdCo4=";
+  vendorHash = "sha256-7LbJlattHOMYUKeqwg+E+X3NQO8p4mwqmtpd2I98JAI=";
 
   buildInputs = [ fuse ];
 

From 3650899c4b0ef31fed34763ae3d3e8777269060b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 18:01:37 +0000
Subject: [PATCH 2688/6226] xenia-canary: 0-unstable-2025-10-18 ->
 0-unstable-2025-10-24

---
 pkgs/by-name/xe/xenia-canary/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/xe/xenia-canary/package.nix b/pkgs/by-name/xe/xenia-canary/package.nix
index fe0f2a08303e..0caea3fa85c1 100644
--- a/pkgs/by-name/xe/xenia-canary/package.nix
+++ b/pkgs/by-name/xe/xenia-canary/package.nix
@@ -19,14 +19,14 @@
 }:
 llvmPackages_20.stdenv.mkDerivation {
   pname = "xenia-canary";
-  version = "0-unstable-2025-10-18";
+  version = "0-unstable-2025-10-24";
 
   src = fetchFromGitHub {
     owner = "xenia-canary";
     repo = "xenia-canary";
     fetchSubmodules = true;
-    rev = "a1a33b9939e8bc95555bbecafeac97413b73ddea";
-    hash = "sha256-2+YOYxmumSHV8gHvKlOGUahcA/p/8drqXqkgy7udVpk=";
+    rev = "5d01ac0c45e04d99364888a6e391697bee5ab12d";
+    hash = "sha256-elbWtd1isE+B+JESWzSp5WhkjpsrHrIp1qGTZN5B0Yw=";
   };
 
   dontConfigure = true;

From c7db3c41e6a6b60e25538aff086ac3e24c6fb985 Mon Sep 17 00:00:00 2001
From: Sirius902 <10891979+Sirius902@users.noreply.github.com>
Date: Sat, 25 Oct 2025 10:55:31 -0700
Subject: [PATCH 2689/6226] openmw: fix build with Qt 6.10

---
 ...tly-convert-QByteArray-to-const-char.patch | 122 ++++++++++++++++++
 pkgs/by-name/op/openmw/package.nix            |   6 +
 2 files changed, 128 insertions(+)
 create mode 100644 pkgs/by-name/op/openmw/0001-Do-not-implicitly-convert-QByteArray-to-const-char.patch

diff --git a/pkgs/by-name/op/openmw/0001-Do-not-implicitly-convert-QByteArray-to-const-char.patch b/pkgs/by-name/op/openmw/0001-Do-not-implicitly-convert-QByteArray-to-const-char.patch
new file mode 100644
index 000000000000..f35c72c93b39
--- /dev/null
+++ b/pkgs/by-name/op/openmw/0001-Do-not-implicitly-convert-QByteArray-to-const-char.patch
@@ -0,0 +1,122 @@
+From 0de42e9a1640e74b2c94ce16ecaf7367ece5f4b0 Mon Sep 17 00:00:00 2001
+From: elsid <elsid.mail@gmail.com>
+Date: Sun, 5 Oct 2025 23:40:17 +0200
+Subject: [PATCH] Do not implicitly convert QByteArray to const char*
+
+Operators supporting this conversion can be disabled via
+QT_NO_CAST_FROM_BYTEARRAY breaking the build. For example:
+
+https://koschei.fedoraproject.org//package/openmw
+https://kojipkgs.fedoraproject.org/work/tasks/5096/137735096/build.log
+
+Backported to OpenMW 0.49.x
+
+Co-authored-by: Sirius902 <10891979+Sirius902@users.noreply.github.com>
+---
+ apps/opencs/model/world/nestedtableproxymodel.cpp |  4 +++-
+ apps/opencs/view/world/util.cpp                   |  5 +++--
+ components/files/qtconversion.cpp                 | 11 ++++++-----
+ components/vfs/qtconversion.cpp                   | 11 ++++++-----
+ 4 files changed, 18 insertions(+), 13 deletions(-)
+
+diff --git a/apps/opencs/model/world/nestedtableproxymodel.cpp b/apps/opencs/model/world/nestedtableproxymodel.cpp
+index f542ce4def..5278710e4a 100644
+--- a/apps/opencs/model/world/nestedtableproxymodel.cpp
++++ b/apps/opencs/model/world/nestedtableproxymodel.cpp
+@@ -13,7 +13,9 @@ CSMWorld::NestedTableProxyModel::NestedTableProxyModel(
+ {
+     const int parentRow = parent.row();
+ 
+-    mId = std::string(parentModel->index(parentRow, 0).data().toString().toUtf8());
++    const QByteArray utf8 = parentModel->index(parentRow, 0).data().toString().toUtf8();
++
++    mId = std::string(utf8.constData(), utf8.size());
+ 
+     QAbstractProxyModel::setSourceModel(parentModel);
+ 
+diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
+index dfb587cd96..5fd32d78b4 100644
+--- a/apps/opencs/view/world/util.cpp
++++ b/apps/opencs/view/world/util.cpp
+@@ -363,11 +363,12 @@ void CSVWorld::CommandDelegate::setEditorData(QWidget* editor, const QModelIndex
+     {
+         if (!variant.isValid())
+ #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
+-            variant = QVariant(editor->property(n).metaType(), (const void*)nullptr);
++            variant = QVariant(editor->property(n.constData()).metaType(), (const void*)nullptr);
++            editor->setProperty(n.constData(), variant);
+ #else
+             variant = QVariant(editor->property(n).userType(), (const void*)nullptr);
++            editor->setProperty(n, variant);
+ #endif
+-        editor->setProperty(n, variant);
+     }
+ }
+ 
+diff --git a/components/files/qtconversion.cpp b/components/files/qtconversion.cpp
+index d56832cb78..ac7ca6ec8b 100644
+--- a/components/files/qtconversion.cpp
++++ b/components/files/qtconversion.cpp
+@@ -1,8 +1,9 @@
+-
+ #include "qtconversion.hpp"
+ 
+ #include <components/misc/strings/conversion.hpp>
+ 
++#include <string_view>
++
+ QString Files::pathToQString(const std::filesystem::path& path)
+ {
+     const auto tmp = path.u8string();
+@@ -17,12 +18,12 @@ QString Files::pathToQString(std::filesystem::path&& path)
+ 
+ std::filesystem::path Files::pathFromQString(QStringView path)
+ {
+-    const auto tmp = path.toUtf8();
+-    return std::filesystem::path{ Misc::StringUtils::stringToU8String(tmp) };
++    const QByteArray tmp = path.toUtf8();
++    return std::filesystem::path(Misc::StringUtils::stringToU8String(std::string_view(tmp.constData(), tmp.size())));
+ }
+ 
+ std::filesystem::path Files::pathFromQString(QString&& path)
+ {
+-    const auto tmp = path.toUtf8();
+-    return std::filesystem::path{ Misc::StringUtils::stringToU8String(tmp) };
++    const QByteArray tmp = path.toUtf8();
++    return std::filesystem::path(Misc::StringUtils::stringToU8String(std::string_view(tmp.constData(), tmp.size())));
+ }
+diff --git a/components/vfs/qtconversion.cpp b/components/vfs/qtconversion.cpp
+index 472e3dd0b4..fc8a0fb78e 100644
+--- a/components/vfs/qtconversion.cpp
++++ b/components/vfs/qtconversion.cpp
+@@ -1,8 +1,9 @@
+-
+ #include "qtconversion.hpp"
+ 
+ #include <components/misc/strings/conversion.hpp>
+ 
++#include <string_view>
++
+ QString VFS::Path::normalizedToQString(NormalizedView path)
+ {
+     return QString::fromUtf8(path.value().data(), path.value().size());
+@@ -15,12 +16,12 @@ QString VFS::Path::normalizedToQString(Normalized&& path)
+ 
+ VFS::Path::Normalized VFS::Path::normalizedFromQString(QStringView path)
+ {
+-    const auto tmp = path.toUtf8();
+-    return Normalized{ tmp };
++    const QByteArray tmp = path.toUtf8();
++    return Normalized(std::string_view(tmp.constData(), tmp.size()));
+ }
+ 
+ VFS::Path::Normalized VFS::Path::normalizedFromQString(QString&& path)
+ {
+-    const auto tmp = path.toUtf8();
+-    return Normalized{ tmp };
++    const QByteArray tmp = std::move(path).toUtf8();
++    return Normalized(std::string_view(tmp.constData(), tmp.size()));
+ }
+-- 
+2.51.0
+
diff --git a/pkgs/by-name/op/openmw/package.nix b/pkgs/by-name/op/openmw/package.nix
index 0720f976e1c7..35a9fa87bb99 100644
--- a/pkgs/by-name/op/openmw/package.nix
+++ b/pkgs/by-name/op/openmw/package.nix
@@ -85,6 +85,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Eyjn3jPpo0d7XENg0Ea/3MN60lZBSUAMkz1UtTiIP80=";
   };
 
+  patches = [
+    # https://gitlab.com/OpenMW/openmw/-/merge_requests/4941
+    # FIXME: Remove after next release
+    ./0001-Do-not-implicitly-convert-QByteArray-to-const-char.patch
+  ];
+
   postPatch = ''
     sed '1i#include <memory>' -i components/myguiplatform/myguidatamanager.cpp # gcc12
   ''

From eb8fc2e6e92a55127cdc502312498749599ffcd4 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Sat, 25 Oct 2025 20:13:54 +0200
Subject: [PATCH 2690/6226] alacritty-graphics: 0.16.0 -> 0.16.1

---
 pkgs/by-name/al/alacritty/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix
index 78fc353cda62..fb0e5ce3bc96 100644
--- a/pkgs/by-name/al/alacritty/package.nix
+++ b/pkgs/by-name/al/alacritty/package.nix
@@ -44,7 +44,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "alacritty";
-  version = if !withGraphics then "0.16.1" else "0.16.0-graphics";
+  version = if !withGraphics then "0.16.1" else "0.16.1-graphics";
 
   src =
     # by default we want the official package
@@ -61,14 +61,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
         owner = "ayosec";
         repo = "alacritty";
         tag = "v${finalAttrs.version}";
-        hash = "sha256-JbsHozYMh7hFMAsu823IcVZTzvMEGQP+oKpUnlmM7Nk=";
+        hash = "sha256-e+o0GLy05qXEY4T57dCuqhukTKBSm1WIHzPUV8uswRI=";
       };
 
   cargoHash =
     if !withGraphics then
       "sha256-OBhrd4q44LCUGnjDEedhrOuoSC2UFR90IKSQfEPY/Q4="
     else
-      "sha256-fsTs37w4CvYvFN8ZgWxMA2hmgW0hJcIvhLiuhYxs4+Y=";
+      "sha256-VR+URXqsB9zCOSow/f/aWXUlrp6j2XeK0zKESQGzMek=";
 
   nativeBuildInputs = [
     cmake

From 41172b3f6718f17c96aa0ad76ff6aa3446cb01d3 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Sat, 25 Oct 2025 20:14:17 +0200
Subject: [PATCH 2691/6226] alacritty-graphics: Make afh a maintainer

---
 pkgs/by-name/al/alacritty/package.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/al/alacritty/package.nix b/pkgs/by-name/al/alacritty/package.nix
index fb0e5ce3bc96..e84329a308d5 100644
--- a/pkgs/by-name/al/alacritty/package.nix
+++ b/pkgs/by-name/al/alacritty/package.nix
@@ -151,10 +151,17 @@ rustPlatform.buildRustPackage (finalAttrs: {
         "https://github.com/ayosec/alacritty";
     license = lib.licenses.asl20;
     mainProgram = "alacritty";
-    maintainers = with lib.maintainers; [
-      Br1ght0ne
-      rvdp
-    ];
+    maintainers =
+      with lib.maintainers;
+      if !withGraphics then
+        [
+          Br1ght0ne
+          rvdp
+        ]
+      else
+        [
+          afh
+        ];
     platforms = lib.platforms.unix;
     changelog =
       if !withGraphics then

From 3b2174d91d6d586eb009fef11681013a0afbb60d Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 15:41:35 -0300
Subject: [PATCH 2692/6226] nanodbc: fix build with cmake4

---
 pkgs/by-name/na/nanodbc/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/na/nanodbc/package.nix b/pkgs/by-name/na/nanodbc/package.nix
index dcad1610d292..38e4ca34ad4d 100644
--- a/pkgs/by-name/na/nanodbc/package.nix
+++ b/pkgs/by-name/na/nanodbc/package.nix
@@ -20,6 +20,9 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     cp ${catch2}/include/catch2/catch.hpp test/catch/catch.hpp
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0.0)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [ cmake ];

From e4e0b934c7709594fa90c9693f4e752c77ac5869 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 25 Oct 2025 20:45:21 +0200
Subject: [PATCH 2693/6226] pslib: fix build

---
 pkgs/by-name/ps/pslib/cmake4.patch | 18 ++++++++++++++++++
 pkgs/by-name/ps/pslib/package.nix  |  8 ++++----
 2 files changed, 22 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/by-name/ps/pslib/cmake4.patch

diff --git a/pkgs/by-name/ps/pslib/cmake4.patch b/pkgs/by-name/ps/pslib/cmake4.patch
new file mode 100644
index 000000000000..7fe5bc3d94e7
--- /dev/null
+++ b/pkgs/by-name/ps/pslib/cmake4.patch
@@ -0,0 +1,18 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 58a5b45..b41e6a3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,3 +1,5 @@
++cmake_minimum_required(VERSION 3.10)
++
+ PROJECT(pslib C)
+ option(ENABLE_BMP   "Build with BMP support" ON)
+
+@@ -73,7 +75,6 @@ INCLUDE(CheckFunctionExists)
+ INCLUDE(TestBigEndian)
+ test_big_endian(WORDS_BIGENDIAN)
+
+-SUBDIRS( src )
+ SET(SOURCES
+        src/pslib.c
+        src/ps_memory.c
\ No newline at end of file
diff --git a/pkgs/by-name/ps/pslib/package.nix b/pkgs/by-name/ps/pslib/package.nix
index e11d87fc2db3..81bf538df8d9 100644
--- a/pkgs/by-name/ps/pslib/package.nix
+++ b/pkgs/by-name/ps/pslib/package.nix
@@ -21,6 +21,10 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-gaWNvBLuUUy0o+HWCOyG6KmzxDrYCY6PV3WbA/jjH64=";
   };
 
+  patches = [
+    ./cmake4.patch
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -33,10 +37,6 @@ stdenv.mkDerivation rec {
     libtiff
   ];
 
-  env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {
-    NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
-  };
-
   doCheck = true;
 
   outputs = [

From 631a9ddbab434c6576b32a341604bce95885432a Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Sat, 25 Oct 2025 14:23:37 -0400
Subject: [PATCH 2694/6226] mongodb-7_0: 7.0.24 -> 7.0.25

Fixes: CVE-2025-11979
---
 pkgs/servers/nosql/mongodb/7.0.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/nosql/mongodb/7.0.nix b/pkgs/servers/nosql/mongodb/7.0.nix
index 2009607e8421..17f3be0cd410 100644
--- a/pkgs/servers/nosql/mongodb/7.0.nix
+++ b/pkgs/servers/nosql/mongodb/7.0.nix
@@ -21,8 +21,8 @@ let
 in
 buildMongoDB {
   inherit avxSupport;
-  version = "7.0.24";
-  sha256 = "sha256-ANPg60OAxwwq1FhRTMOQ0dHBOuKpob1sXnAZMJWhtds=";
+  version = "7.0.25";
+  sha256 = "sha256-RAJg1uXGZKi9qOPvW9UK/j0JFTftL8YwGcE7YnZ4Tks=";
   patches = [
     # ModuleNotFoundError: No module named 'mongo_tooling_metrics':
     # NameError: name 'SConsToolingMetrics' is not defined:

From 22a85fd72fef8eb021d22e5abcf6dba2d0ee4e2e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 18:49:01 +0000
Subject: [PATCH 2695/6226] universal-ctags: 6.2.0 -> 6.2.1

---
 pkgs/by-name/un/universal-ctags/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/un/universal-ctags/package.nix b/pkgs/by-name/un/universal-ctags/package.nix
index 87fb6ab8bdd1..484317717d18 100644
--- a/pkgs/by-name/un/universal-ctags/package.nix
+++ b/pkgs/by-name/un/universal-ctags/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "universal-ctags";
-  version = "6.2.0";
+  version = "6.2.1";
 
   src = fetchFromGitHub {
     owner = "universal-ctags";
     repo = "ctags";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-M2MuVWUsN9kBRF4OAavTYQGPUYvzNmP30AWnW1SendU=";
+    hash = "sha256-x5ZlWTNUc1J/yslKHc8rCIl9LtNTN/HTaAJpFyF0KRI=";
   };
 
   depsBuildBuild = [

From 71946749e6543f946ce983b640792c770b60a494 Mon Sep 17 00:00:00 2001
From: azahi <azat@bahawi.net>
Date: Sat, 25 Oct 2025 21:54:56 +0300
Subject: [PATCH 2696/6226] iaito: 6.0.0 -> 6.0.4

---
 .../ia/iaito/package.nix}                     | 80 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 37 insertions(+), 45 deletions(-)
 rename pkgs/{tools/security/iaito/default.nix => by-name/ia/iaito/package.nix} (50%)

diff --git a/pkgs/tools/security/iaito/default.nix b/pkgs/by-name/ia/iaito/package.nix
similarity index 50%
rename from pkgs/tools/security/iaito/default.nix
rename to pkgs/by-name/ia/iaito/package.nix
index c4fbb6987fc4..8eb467c7aca3 100644
--- a/pkgs/tools/security/iaito/default.nix
+++ b/pkgs/by-name/ia/iaito/package.nix
@@ -1,53 +1,43 @@
 {
-  lib,
-  stdenv,
   fetchFromGitHub,
+  lib,
   meson,
   ninja,
   pkg-config,
   python3,
-  qtbase,
-  qttools,
+  qt6Packages,
   radare2,
-  wrapQtAppsHook,
+  stdenv,
 }:
-
-let
-  pname = "iaito";
-  version = "6.0.0";
-
-  main_src = fetchFromGitHub rec {
-    owner = "radareorg";
-    repo = pname;
-    tag = version;
-    hash = "sha256-bwGKHc2jlf1C/25CEoDUCLr6zOhAJES7+PvcGVyO8To=";
-    name = repo;
-  };
-
-  translations_src = fetchFromGitHub rec {
-    owner = "radareorg";
-    repo = "iaito-translations";
-    rev = "e66b3a962a7fc7dfd730764180011ecffbb206bf";
-    hash = "sha256-6NRTZ/ydypsB5TwbivvwOH9TEMAff/LH69hCXTvMPp8=";
-    name = repo;
-  };
-in
 stdenv.mkDerivation (finalAttrs: {
-  inherit pname version;
+  pname = "iaito";
+  version = "6.0.4";
 
   srcs = [
-    main_src
-    translations_src
+    (fetchFromGitHub {
+      owner = "radareorg";
+      repo = "iaito";
+      tag = finalAttrs.version;
+      hash = "sha256-99SuUTwHcpyJ5V9Cnanm6ylH3NVgyk3TmDoaFVwFE4E=";
+      name = "main";
+    })
+    (fetchFromGitHub {
+      owner = "radareorg";
+      repo = "iaito-translations";
+      rev = "e66b3a962a7fc7dfd730764180011ecffbb206bf";
+      hash = "sha256-6NRTZ/ydypsB5TwbivvwOH9TEMAff/LH69hCXTvMPp8=";
+      name = "translations";
+    })
   ];
-  sourceRoot = "${main_src.name}/src";
+  sourceRoot = "main/src";
 
   postUnpack = ''
-    chmod -R u+w ${translations_src.name}
+    chmod -R u+w translations
   '';
 
   postPatch = ''
     substituteInPlace common/ResourcePaths.cpp \
-      --replace "/app/share/iaito/translations" "$out/share/iaito/translations"
+      --replace-fail "/app/share/iaito/translations" "$out/share/iaito/translations"
   '';
 
   nativeBuildInputs = [
@@ -55,18 +45,22 @@ stdenv.mkDerivation (finalAttrs: {
     ninja
     pkg-config
     python3
-    qttools
-    wrapQtAppsHook
+    qt6Packages.qttools
+    qt6Packages.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    qt6Packages.qtbase
     radare2
   ];
 
+  mesonFlags = [
+    "-Dwith_qt6=true"
+  ];
+
   postBuild = ''
-    pushd ../../../${translations_src.name}
-    make build -j$NIX_BUILD_CORES PREFIX=$out
+    pushd ../../../translations
+    make build -j $NIX_BUILD_CORES PREFIX=$out
     popd
   '';
 
@@ -78,24 +72,24 @@ stdenv.mkDerivation (finalAttrs: {
     install -m644 -Dt $out/share/applications ../org.radare.iaito.desktop
     install -m644 -Dt $out/share/pixmaps ../img/org.radare.iaito.svg
 
-    pushd ../../../${translations_src.name}
+    pushd ../../../translations
     make install -j$NIX_BUILD_CORES PREFIX=$out
     popd
 
     runHook postInstall
   '';
 
-  meta = with lib; {
-    description = "Official Qt frontend of radare2";
+  meta = {
+    description = "Official radare2 GUI";
     longDescription = ''
       iaito is the official graphical interface for radare2, a libre reverse
       engineering framework.
     '';
     homepage = "https://radare.org/n/iaito.html";
     changelog = "https://github.com/radareorg/iaito/releases/tag/${finalAttrs.version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ azahi ];
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.azahi ];
+    platforms = lib.platforms.linux;
     mainProgram = "iaito";
-    platforms = platforms.linux;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e474e7028100..97f3d630db99 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3052,8 +3052,6 @@ with pkgs;
 
   hyphenDicts = recurseIntoAttrs (callPackages ../development/libraries/hyphen/dictionaries.nix { });
 
-  iaito = libsForQt5.callPackage ../tools/security/iaito { };
-
   icemon = libsForQt5.callPackage ../applications/networking/icemon { };
 
   icepeak = haskell.lib.compose.justStaticExecutables haskellPackages.icepeak;

From b466f5f870f891b40399ca394f48e73adb21f819 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 16:01:42 -0300
Subject: [PATCH 2697/6226] nanodbc: mark as broken on darwin

---
 pkgs/by-name/na/nanodbc/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/na/nanodbc/package.nix b/pkgs/by-name/na/nanodbc/package.nix
index 38e4ca34ad4d..8c50f2bfd68f 100644
--- a/pkgs/by-name/na/nanodbc/package.nix
+++ b/pkgs/by-name/na/nanodbc/package.nix
@@ -41,5 +41,6 @@ stdenv.mkDerivation rec {
     description = "Small C++ wrapper for the native C ODBC API";
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.bzizou ];
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From 62d59194b85e576a8614bdb5bd598203af1a9b10 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Sat, 23 Aug 2025 20:43:47 -0700
Subject: [PATCH 2698/6226] pkgs/development/compilers/llvm: use
 makeScopeWithSplicing'

Co-authored-by: Luna Nova <git@lunnova.dev>
Co-authored-by: Emily <vcs@emily.moe>
---
 .../compilers/llvm/common/bolt/default.nix    |   4 +-
 .../compilers/llvm/common/clang/default.nix   |  10 +-
 .../compilers/llvm/common/default.nix         | 362 +++++++++---------
 .../compilers/llvm/common/flang/default.nix   |   8 +-
 .../compilers/llvm/common/libclc/default.nix  |  18 +-
 .../compilers/llvm/common/lld/default.nix     |   4 +-
 .../compilers/llvm/common/llvm/default.nix    |   4 +-
 .../compilers/llvm/common/mlir/default.nix    |   6 +-
 pkgs/development/compilers/llvm/default.nix   |  11 +-
 pkgs/stdenv/darwin/default.nix                | 297 +++++++-------
 10 files changed, 346 insertions(+), 378 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/bolt/default.nix b/pkgs/development/compilers/llvm/common/bolt/default.nix
index e36d2f143dde..68d0afabee6c 100644
--- a/pkgs/development/compilers/llvm/common/bolt/default.nix
+++ b/pkgs/development/compilers/llvm/common/bolt/default.nix
@@ -12,7 +12,7 @@
   libclang,
   version,
   python3,
-  buildLlvmTools,
+  buildLlvmPackages,
   patches ? [ ],
   devExtraCmakeFlags ? [ ],
   fetchpatch,
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")
+    (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmPackages.tblgen}/bin/llvm-tblgen")
   ]
   ++ devExtraCmakeFlags;
 
diff --git a/pkgs/development/compilers/llvm/common/clang/default.nix b/pkgs/development/compilers/llvm/common/clang/default.nix
index b08194a435db..9d0441dd50b3 100644
--- a/pkgs/development/compilers/llvm/common/clang/default.nix
+++ b/pkgs/development/compilers/llvm/common/clang/default.nix
@@ -12,7 +12,7 @@
   release_version,
   version,
   python3,
-  buildLlvmTools,
+  buildLlvmPackages,
   fixDarwinDylibNames,
   enableManpages ? false,
   enableClangToolsExtra ? true,
@@ -96,9 +96,9 @@ stdenv.mkDerivation (
       (lib.cmakeBool "CLANGD_BUILD_XPC" false)
       (lib.cmakeBool "LLVM_ENABLE_RTTI" true)
       (lib.cmakeBool "LLVM_INCLUDE_TESTS" false)
-      (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")
-      (lib.cmakeFeature "CLANG_TABLEGEN" "${buildLlvmTools.tblgen}/bin/clang-tblgen")
-      (lib.cmakeFeature "CLANG_TIDY_CONFUSABLE_CHARS_GEN" "${buildLlvmTools.tblgen}/bin/clang-tidy-confusable-chars-gen")
+      (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmPackages.tblgen}/bin/llvm-tblgen")
+      (lib.cmakeFeature "CLANG_TABLEGEN" "${buildLlvmPackages.tblgen}/bin/clang-tblgen")
+      (lib.cmakeFeature "CLANG_TIDY_CONFUSABLE_CHARS_GEN" "${buildLlvmPackages.tblgen}/bin/clang-tidy-confusable-chars-gen")
     ]
     ++ lib.optional (lib.versionAtLeast release_version "20") (
       lib.cmakeFeature "LLVM_DIR" "${libllvm.dev}/lib/cmake/llvm"
@@ -115,7 +115,7 @@ stdenv.mkDerivation (
     ]
     ++ lib.optionals (lib.versionOlder release_version "20") [
       # clang-pseudo removed in LLVM20: https://github.com/llvm/llvm-project/commit/ed8f78827895050442f544edef2933a60d4a7935
-      (lib.cmakeFeature "CLANG_PSEUDO_GEN" "${buildLlvmTools.tblgen}/bin/clang-pseudo-gen")
+      (lib.cmakeFeature "CLANG_PSEUDO_GEN" "${buildLlvmPackages.tblgen}/bin/clang-pseudo-gen")
     ]
     ++ devExtraCmakeFlags;
 
diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index bb6631b60f5b..5da66a77aad2 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -1,28 +1,22 @@
 {
   lowPrio,
-  newScope,
   pkgs,
   targetPackages,
   lib,
   stdenv,
-  libxcrypt,
-  substitute,
-  replaceVars,
   fetchFromGitHub,
-  fetchpatch,
-  fetchpatch2,
   overrideCC,
   wrapCCWith,
   wrapBintoolsWith,
   buildPackages,
-  buildLlvmTools, # tools, but from the previous stage, for cross
-  targetLlvmLibraries, # libraries, but from the next stage, for cross
-  targetLlvm,
+  makeScopeWithSplicing',
+  otherSplices,
+  splicePackages,
   # This is the default binutils, but with *this* version of LLD rather
   # than the default LLVM version's, if LLD is the choice. We use these for
   # the `useLLVM` bootstrapping below.
-  bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc,
-  bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools,
+  bootBintoolsNoLibc,
+  bootBintools,
   darwin,
   gitRelease ? null,
   officialRelease ? null,
@@ -110,11 +104,31 @@ let
       };
   };
 
-  tools = lib.makeExtensible (
-    tools:
+  buildLlvmPackages = otherSplices.selfBuildHost;
+in
+makeScopeWithSplicing' {
+  inherit otherSplices;
+  extra =
+    spliced0:
+    args
+    // metadata
+    // {
+      inherit buildLlvmPackages;
+      targetLlvm = spliced0.llvm.__spliced._targetTarget or llvm;
+    };
+  f =
+    self:
     let
-      callPackage = newScope (tools // args // metadata);
+      targetLlvmPackages =
+        if otherSplices.selfTargetTarget == { } then self else otherSplices.selfTargetTarget;
+
+      # FIXME: This is a tragic and unprincipled hack, but I don’t
+      # know what would actually be good instead.
+      newScope = scope: self.newScope ({ inherit (args) stdenv; } // scope);
+      callPackage = newScope { };
+
       clangVersion = lib.versions.major metadata.release_version;
+
       mkExtraBuildCommands0 =
         cc:
         ''
@@ -134,37 +148,40 @@ let
               ln -s "${lib.getLib cc}/lib/clang/${clangVersion}/include" "$rsrc"
             ''
         );
+
       mkExtraBuildCommandsBasicRt =
         cc:
         mkExtraBuildCommands0 cc
         + ''
-          ln -s "${targetLlvmLibraries.compiler-rt-no-libc.out}/lib" "$rsrc/lib"
+          ln -s "${targetLlvmPackages.compiler-rt-no-libc.out}/lib" "$rsrc/lib"
         '';
+
       mkExtraBuildCommands =
         cc:
         mkExtraBuildCommands0 cc
         + ''
-          ln -s "${targetLlvmLibraries.compiler-rt.out}/lib" "$rsrc/lib"
-          ln -s "${targetLlvmLibraries.compiler-rt.out}/share" "$rsrc/share"
+          ln -s "${targetLlvmPackages.compiler-rt.out}/lib" "$rsrc/lib"
+          ln -s "${targetLlvmPackages.compiler-rt.out}/share" "$rsrc/share"
         '';
 
-      bintoolsNoLibc' = if bootBintoolsNoLibc == null then tools.bintoolsNoLibc else bootBintoolsNoLibc;
-      bintools' = if bootBintools == null then tools.bintools else bootBintools;
+      bintoolsNoLibc' = if bootBintoolsNoLibc == null then self.bintoolsNoLibc else bootBintoolsNoLibc;
+      bintools' = if bootBintools == null then self.bintools else bootBintools;
     in
     {
-      libllvm = callPackage ./llvm {
-      };
+      inherit (metadata) release_version;
+
+      libllvm = callPackage ./llvm { };
 
       # `llvm` historically had the binaries.  When choosing an output explicitly,
       # we need to reintroduce `outputSpecified` to get the expected behavior e.g. of lib.get*
-      llvm = tools.libllvm;
+      llvm = self.libllvm;
 
       tblgen = callPackage ./tblgen.nix {
         patches =
           builtins.filter
             # Crude method to drop polly patches if present, they're not needed for tblgen.
             (p: (!lib.hasInfix "-polly" p))
-            tools.libllvm.patches;
+            self.libllvm.patches;
         clangPatches = [
           # Would take tools.libclang.patches, but this introduces a cycle due
           # to replacements depending on the llvm outpath (e.g. the LLVMgold patch).
@@ -173,20 +190,19 @@ let
         ];
       };
 
-      libclang = callPackage ./clang {
-      };
+      libclang = callPackage ./clang { };
 
-      clang-unwrapped = tools.libclang;
+      clang-unwrapped = self.libclang;
 
       llvm-manpages = lowPrio (
-        tools.libllvm.override {
+        self.libllvm.override {
           enableManpages = true;
           python3 = pkgs.python3; # don't use python-boot
         }
       );
 
       clang-manpages = lowPrio (
-        tools.libclang.override {
+        self.libclang.override {
           enableManpages = true;
           python3 = pkgs.python3; # don't use python-boot
         }
@@ -198,55 +214,59 @@ let
       # pick clang appropriate for package set we are targeting
       clang =
         if stdenv.targetPlatform.libc == null then
-          tools.clangNoLibc
+          self.clangNoLibc
         else if stdenv.targetPlatform.isDarwin then
-          tools.systemLibcxxClang
+          self.systemLibcxxClang
         else if stdenv.targetPlatform.useLLVM or false then
-          tools.clangUseLLVM
+          self.clangUseLLVM
         else if (pkgs.targetPackages.stdenv or args.stdenv).cc.isGNU then
-          tools.libstdcxxClang
+          self.libstdcxxClang
         else
-          tools.libcxxClang;
+          self.libcxxClang;
 
       libstdcxxClang = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
+        cc = self.clang-unwrapped;
         # libstdcxx is taken from gcc in an ad-hoc way in cc-wrapper.
         libcxx = null;
-        extraPackages = [ targetLlvmLibraries.compiler-rt ];
+        extraPackages = [ targetLlvmPackages.compiler-rt ];
         extraBuildCommands = mkExtraBuildCommands cc;
       };
 
       libcxxClang = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
-        libcxx = targetLlvmLibraries.libcxx;
-        extraPackages = [ targetLlvmLibraries.compiler-rt ];
+        cc = self.clang-unwrapped;
+        libcxx = targetLlvmPackages.libcxx;
+        extraPackages = [ targetLlvmPackages.compiler-rt ];
         extraBuildCommands = mkExtraBuildCommands cc;
       };
 
       # Darwin uses the system libc++ by default. It is set up as its own clang definition so that `libcxxClang`
       # continues to use the libc++ from LLVM.
       systemLibcxxClang = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
+        cc = self.clang-unwrapped;
         libcxx = darwin.libcxx;
-        extraPackages = [ targetLlvmLibraries.compiler-rt ];
+        extraPackages = [ targetLlvmPackages.compiler-rt ];
         extraBuildCommands = mkExtraBuildCommands cc;
       };
 
-      lld = callPackage ./lld {
-      };
+      lld = callPackage ./lld { };
 
-      lldbPlugins = lib.makeExtensible (
-        lldbPlugins:
-        let
-          callPackage = newScope (lldbPlugins // tools // args // metadata);
-        in
-        lib.recurseIntoAttrs { llef = callPackage ./lldb-plugins/llef.nix { }; }
+      lldbPlugins = lib.recurseIntoAttrs (
+        lib.makeScopeWithSplicing'
+          {
+            inherit splicePackages newScope;
+          }
+          {
+            otherSplices = lib.mapAttrs (_: selfSplice: selfSplice.lldbPlugins or { }) otherSplices;
+            f = selfLldbPlugins: {
+              llef = selfLldbPlugins.callPackage ./lldb-plugins/llef.nix { };
+            };
+          }
       );
 
       lldb = callPackage ./lldb { };
 
       lldb-manpages = lowPrio (
-        tools.lldb.override {
+        self.lldb.override {
           enableManpages = true;
           python3 = pkgs.python3; # don't use python-boot
         }
@@ -262,27 +282,29 @@ let
       bintools-unwrapped = callPackage ./bintools.nix { };
 
       bintoolsNoLibc = wrapBintoolsWith {
-        bintools = tools.bintools-unwrapped;
+        bintools = self.bintools-unwrapped;
         libc = targetPackages.preLibcHeaders;
       };
 
-      bintools = wrapBintoolsWith { bintools = tools.bintools-unwrapped; };
+      bintools = wrapBintoolsWith {
+        bintools = self.bintools-unwrapped;
+      };
 
       clangUseLLVM = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
-        libcxx = targetLlvmLibraries.libcxx;
+        cc = self.clang-unwrapped;
+        libcxx = targetLlvmPackages.libcxx;
         bintools = bintools';
         extraPackages = [
-          targetLlvmLibraries.compiler-rt
+          targetLlvmPackages.compiler-rt
         ]
         ++ lib.optionals (!stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD) [
-          targetLlvmLibraries.libunwind
+          targetLlvmPackages.libunwind
         ];
         extraBuildCommands = mkExtraBuildCommands cc;
         nixSupport.cc-cflags = [
           "-rtlib=compiler-rt"
           "-Wno-unused-command-line-argument"
-          "-B${targetLlvmLibraries.compiler-rt}/lib"
+          "-B${targetLlvmPackages.compiler-rt}/lib"
         ]
         ++ lib.optional (
           !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD
@@ -295,16 +317,16 @@ let
         ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
         nixSupport.cc-ldflags = lib.optionals (
           !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD
-        ) [ "-L${targetLlvmLibraries.libunwind}/lib" ];
+        ) [ "-L${targetLlvmPackages.libunwind}/lib" ];
       };
 
       clangWithLibcAndBasicRtAndLibcxx = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
+        cc = self.clang-unwrapped;
         # This is used to build compiler-rt. Make sure to use the system libc++ on Darwin.
-        libcxx = if stdenv.hostPlatform.isDarwin then darwin.libcxx else targetLlvmLibraries.libcxx;
+        libcxx = if stdenv.hostPlatform.isDarwin then darwin.libcxx else targetLlvmPackages.libcxx;
         bintools = bintools';
         extraPackages = [
-          targetLlvmLibraries.compiler-rt-no-libc
+          targetLlvmPackages.compiler-rt-no-libc
         ]
         ++
           lib.optionals
@@ -312,13 +334,13 @@ let
               !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin
             )
             [
-              targetLlvmLibraries.libunwind
+              targetLlvmPackages.libunwind
             ];
         extraBuildCommands = mkExtraBuildCommandsBasicRt cc;
         nixSupport.cc-cflags = [
           "-rtlib=compiler-rt"
           "-Wno-unused-command-line-argument"
-          "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"
+          "-B${targetLlvmPackages.compiler-rt-no-libc}/lib"
         ]
         ++ lib.optional (
           !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin
@@ -331,50 +353,50 @@ let
         ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
         nixSupport.cc-ldflags = lib.optionals (
           !stdenv.targetPlatform.isWasm && !stdenv.targetPlatform.isFreeBSD && !stdenv.targetPlatform.isDarwin
-        ) [ "-L${targetLlvmLibraries.libunwind}/lib" ];
+        ) [ "-L${targetLlvmPackages.libunwind}/lib" ];
       };
 
       clangWithLibcAndBasicRt = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
+        cc = self.clang-unwrapped;
         libcxx = null;
         bintools = bintools';
-        extraPackages = [ targetLlvmLibraries.compiler-rt-no-libc ];
+        extraPackages = [ targetLlvmPackages.compiler-rt-no-libc ];
         extraBuildCommands = mkExtraBuildCommandsBasicRt cc;
         nixSupport.cc-cflags = [
           "-rtlib=compiler-rt"
-          "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"
+          "-B${targetLlvmPackages.compiler-rt-no-libc}/lib"
           "-nostdlib++"
         ]
         ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
       };
 
       clangNoLibcWithBasicRt = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
+        cc = self.clang-unwrapped;
         libcxx = null;
         bintools = bintoolsNoLibc';
-        extraPackages = [ targetLlvmLibraries.compiler-rt-no-libc ];
+        extraPackages = [ targetLlvmPackages.compiler-rt-no-libc ];
         extraBuildCommands = mkExtraBuildCommandsBasicRt cc;
         nixSupport.cc-cflags = [
           "-rtlib=compiler-rt"
-          "-B${targetLlvmLibraries.compiler-rt-no-libc}/lib"
+          "-B${targetLlvmPackages.compiler-rt-no-libc}/lib"
         ]
         ++ lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
       };
 
       clangNoLibcNoRt = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
+        cc = self.clang-unwrapped;
         libcxx = null;
         bintools = bintoolsNoLibc';
         extraPackages = [ ];
-        # "-nostartfiles" used to be needed for pkgsLLVM, causes problems so don't include it.
         extraBuildCommands = mkExtraBuildCommands0 cc;
+        # "-nostartfiles" used to be needed for pkgsLLVM, causes problems so don't include it.
         nixSupport.cc-cflags = lib.optional stdenv.targetPlatform.isWasm "-fno-exceptions";
       };
 
       # This is an "oddly ordered" bootstrap just for Darwin. Probably
       # don't want it otherwise.
       clangNoCompilerRtWithLibc = wrapCCWith rec {
-        cc = tools.clang-unwrapped;
+        cc = self.clang-unwrapped;
         libcxx = null;
         bintools = bintools';
         extraPackages = [ ];
@@ -383,126 +405,102 @@ let
       };
 
       # Aliases
-      clangNoCompilerRt = tools.clangNoLibcNoRt;
-      clangNoLibc = tools.clangNoLibcWithBasicRt;
-      clangNoLibcxx = tools.clangWithLibcAndBasicRt;
+      clangNoCompilerRt = self.clangNoLibcNoRt;
+      clangNoLibc = self.clangNoLibcWithBasicRt;
+      clangNoLibcxx = self.clangWithLibcAndBasicRt;
+
+      compiler-rt-libc = callPackage ./compiler-rt (
+        let
+          # temp rename to avoid infinite recursion
+          stdenv =
+            # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.
+            if args.stdenv.hostPlatform.isDarwin then
+              overrideCC darwin.bootstrapStdenv buildLlvmPackages.clangWithLibcAndBasicRtAndLibcxx
+            else if args.stdenv.hostPlatform.useLLVM or false then
+              overrideCC args.stdenv buildLlvmPackages.clangWithLibcAndBasicRtAndLibcxx
+            else
+              args.stdenv;
+        in
+        {
+          inherit stdenv;
+        }
+      );
+
+      compiler-rt-no-libc = callPackage ./compiler-rt {
+        doFakeLibgcc = stdenv.hostPlatform.useLLVM or false;
+        stdenv =
+          # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.
+          if stdenv.hostPlatform.isDarwin then
+            overrideCC darwin.bootstrapStdenv buildLlvmPackages.clangNoLibcNoRt
+          else
+            overrideCC stdenv buildLlvmPackages.clangNoLibcNoRt;
+      };
+
+      compiler-rt =
+        if
+          stdenv.hostPlatform.libc == null
+          # Building the with-libc compiler-rt and WASM doesn't yet work,
+          # because wasilibc doesn't provide some expected things. See
+          # compiler-rt's file for further details.
+          || stdenv.hostPlatform.isWasm
+          # Failing `#include <term.h>` in
+          # `lib/sanitizer_common/sanitizer_platform_limits_freebsd.cpp`
+          # sanitizers, not sure where to get it.
+          || stdenv.hostPlatform.isFreeBSD
+        then
+          self.compiler-rt-no-libc
+        else
+          self.compiler-rt-libc;
+
+      stdenv = overrideCC stdenv buildLlvmPackages.clang;
+
+      libcxxStdenv = overrideCC stdenv buildLlvmPackages.libcxxClang;
+
+      libcxx = callPackage ./libcxx {
+        stdenv =
+          if stdenv.hostPlatform.isDarwin then
+            overrideCC darwin.bootstrapStdenv buildLlvmPackages.clangWithLibcAndBasicRt
+          else
+            overrideCC stdenv buildLlvmPackages.clangWithLibcAndBasicRt;
+      };
+
+      libunwind = callPackage ./libunwind {
+        stdenv = overrideCC stdenv buildLlvmPackages.clangWithLibcAndBasicRt;
+      };
+
+      openmp = callPackage ./openmp { };
 
       mlir = callPackage ./mlir { };
 
       libclc = callPackage ./libclc { };
     }
     // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "19") {
-      bolt = callPackage ./bolt {
-      };
+      bolt = callPackage ./bolt { };
     }
     // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "20") {
-      flang = callPackage ./flang {
-        mlir = tools.mlir;
+      flang = callPackage ./flang { };
+
+      libc-overlay = callPackage ./libc {
+        isFullBuild = false;
+        # Use clang due to "gnu::naked" not working on aarch64.
+        # Issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77882
+        stdenv = overrideCC stdenv buildLlvmPackages.clang;
       };
-    }
-  );
 
-  libraries = lib.makeExtensible (
-    libraries:
-    let
-      callPackage = newScope (libraries // buildLlvmTools // args // metadata);
-    in
-    (
-      {
-        compiler-rt-libc = callPackage ./compiler-rt (
-          let
-            # temp rename to avoid infinite recursion
-            stdenv =
-              # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.
-              if args.stdenv.hostPlatform.isDarwin then
-                overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx
-              else if args.stdenv.hostPlatform.useLLVM or false then
-                overrideCC args.stdenv buildLlvmTools.clangWithLibcAndBasicRtAndLibcxx
-              else
-                args.stdenv;
-          in
-          {
-            inherit stdenv;
-          }
-        );
-
-        compiler-rt-no-libc = callPackage ./compiler-rt {
-          doFakeLibgcc = stdenv.hostPlatform.useLLVM or false;
-          stdenv =
-            # Darwin needs to use a bootstrap stdenv to avoid an infinite recursion when cross-compiling.
-            if stdenv.hostPlatform.isDarwin then
-              overrideCC darwin.bootstrapStdenv buildLlvmTools.clangNoLibcNoRt
-            else
-              overrideCC stdenv buildLlvmTools.clangNoLibcNoRt;
-        };
-
-        compiler-rt =
-          if
-            stdenv.hostPlatform.libc == null
-            # Building the with-libc compiler-rt and WASM doesn't yet work,
-            # because wasilibc doesn't provide some expected things. See
-            # compiler-rt's file for further details.
-            || stdenv.hostPlatform.isWasm
-            # Failing `#include <term.h>` in
-            # `lib/sanitizer_common/sanitizer_platform_limits_freebsd.cpp`
-            # sanitizers, not sure where to get it.
-            || stdenv.hostPlatform.isFreeBSD
-          then
-            libraries.compiler-rt-no-libc
+      libc-full = callPackage ./libc {
+        isFullBuild = true;
+        # Use clang due to "gnu::naked" not working on aarch64.
+        # Issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77882
+        stdenv = overrideCC stdenv buildLlvmPackages.clangNoLibcNoRt;
+        cmake =
+          if stdenv.targetPlatform.libc == "llvm" then buildPackages.cmakeMinimal else buildPackages.cmake;
+        python3 =
+          if stdenv.targetPlatform.libc == "llvm" then
+            buildPackages.python3Minimal
           else
-            libraries.compiler-rt-libc;
+            buildPackages.python3;
+      };
 
-        stdenv = overrideCC stdenv buildLlvmTools.clang;
-
-        libcxxStdenv = overrideCC stdenv buildLlvmTools.libcxxClang;
-
-        libcxx = callPackage ./libcxx {
-          stdenv =
-            if stdenv.hostPlatform.isDarwin then
-              overrideCC darwin.bootstrapStdenv buildLlvmTools.clangWithLibcAndBasicRt
-            else
-              overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;
-        };
-
-        libunwind = callPackage ./libunwind {
-          stdenv = overrideCC stdenv buildLlvmTools.clangWithLibcAndBasicRt;
-        };
-
-        openmp = callPackage ./openmp {
-        };
-      }
-      // lib.optionalAttrs (lib.versionAtLeast metadata.release_version "20") {
-        libc-overlay = callPackage ./libc {
-          isFullBuild = false;
-          # Use clang due to "gnu::naked" not working on aarch64.
-          # Issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77882
-          stdenv = overrideCC stdenv buildLlvmTools.clang;
-        };
-
-        libc-full = callPackage ./libc {
-          isFullBuild = true;
-          # Use clang due to "gnu::naked" not working on aarch64.
-          # Issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77882
-          stdenv = overrideCC stdenv buildLlvmTools.clangNoLibcNoRt;
-          cmake =
-            if stdenv.targetPlatform.libc == "llvm" then buildPackages.cmakeMinimal else buildPackages.cmake;
-          python3 =
-            if stdenv.targetPlatform.libc == "llvm" then
-              buildPackages.python3Minimal
-            else
-              buildPackages.python3;
-        };
-
-        libc = if stdenv.targetPlatform.libc == "llvm" then libraries.libc-full else libraries.libc-overlay;
-      }
-    )
-  );
-
-  noExtend = extensible: lib.attrsets.removeAttrs extensible [ "extend" ];
-in
-{
-  inherit tools libraries;
-  inherit (metadata) release_version;
+      libc = if stdenv.targetPlatform.libc == "llvm" then self.libc-full else self.libc-overlay;
+    };
 }
-// (noExtend libraries)
-// (noExtend tools)
diff --git a/pkgs/development/compilers/llvm/common/flang/default.nix b/pkgs/development/compilers/llvm/common/flang/default.nix
index 4a452c0dc962..8092236e5180 100644
--- a/pkgs/development/compilers/llvm/common/flang/default.nix
+++ b/pkgs/development/compilers/llvm/common/flang/default.nix
@@ -15,7 +15,7 @@
   mlir,
   version,
   python3,
-  buildLlvmTools,
+  buildLlvmPackages,
   devExtraCmakeFlags ? [ ],
 }:
 
@@ -64,11 +64,11 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
     (lib.cmakeFeature "LLVM_DIR" "${libllvm.dev}/lib/cmake/llvm")
-    (lib.cmakeFeature "LLVM_TOOLS_BINARY_DIR" "${buildLlvmTools.tblgen}/bin/")
-    (lib.cmakeFeature "LLVM_EXTERNAL_LIT" "${buildLlvmTools.tblgen}/bin/llvm-lit")
+    (lib.cmakeFeature "LLVM_TOOLS_BINARY_DIR" "${buildLlvmPackages.tblgen}/bin/")
+    (lib.cmakeFeature "LLVM_EXTERNAL_LIT" "${buildLlvmPackages.tblgen}/bin/llvm-lit")
     (lib.cmakeFeature "CLANG_DIR" "${libclang.dev}/lib/cmake/clang")
     (lib.cmakeFeature "MLIR_DIR" "${mlir.dev}/lib/cmake/mlir")
-    (lib.cmakeFeature "MLIR_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/mlir-tblgen")
+    (lib.cmakeFeature "MLIR_TABLEGEN_EXE" "${buildLlvmPackages.tblgen}/bin/mlir-tblgen")
     (lib.cmakeFeature "MLIR_TABLEGEN_TARGET" "MLIR-TBLGen")
     (lib.cmakeBool "LLVM_BUILD_EXAMPLES" false)
     (lib.cmakeBool "LLVM_ENABLE_PLUGINS" false)
diff --git a/pkgs/development/compilers/llvm/common/libclc/default.nix b/pkgs/development/compilers/llvm/common/libclc/default.nix
index f1ae54c0a9a5..c4dfa242606f 100644
--- a/pkgs/development/compilers/llvm/common/libclc/default.nix
+++ b/pkgs/development/compilers/llvm/common/libclc/default.nix
@@ -6,7 +6,7 @@
   monorepoSrc,
   llvm,
   buildPackages,
-  buildLlvmTools,
+  buildLlvmPackages,
   ninja,
   cmake,
   python3,
@@ -15,7 +15,7 @@
 }:
 let
   spirv-llvm-translator = buildPackages.spirv-llvm-translator.override {
-    inherit (buildLlvmTools) llvm;
+    inherit (buildLlvmPackages) llvm;
   };
 
   # The build requires an unwrapped clang but wrapped clang++ thus we need to
@@ -23,7 +23,7 @@ let
   # unwrapped clang++
   clang-only = runCommand "clang-only" { } ''
     mkdir -p "$out"/bin
-    ln -s "${lib.getExe' buildLlvmTools.clang.cc "clang"}" "$out"/bin
+    ln -s "${lib.getExe' buildLlvmPackages.clang.cc "clang"}" "$out"/bin
   '';
 in
 stdenv.mkDerivation (finalAttrs: {
@@ -59,13 +59,13 @@ stdenv.mkDerivation (finalAttrs: {
     lib.optionalString (lib.versionOlder release_version "19") ''
       substituteInPlace CMakeLists.txt \
         --replace-fail 'find_program( LLVM_CLANG clang PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
-                  'find_program( LLVM_CLANG clang PATHS "${buildLlvmTools.clang.cc}/bin" NO_DEFAULT_PATH )' \
+                  'find_program( LLVM_CLANG clang PATHS "${buildLlvmPackages.clang.cc}/bin" NO_DEFAULT_PATH )' \
         --replace-fail 'find_program( LLVM_AS llvm-as PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
-                  'find_program( LLVM_AS llvm-as PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \
+                  'find_program( LLVM_AS llvm-as PATHS "${buildLlvmPackages.llvm}/bin" NO_DEFAULT_PATH )' \
         --replace-fail 'find_program( LLVM_LINK llvm-link PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
-                  'find_program( LLVM_LINK llvm-link PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \
+                  'find_program( LLVM_LINK llvm-link PATHS "${buildLlvmPackages.llvm}/bin" NO_DEFAULT_PATH )' \
         --replace-fail 'find_program( LLVM_OPT opt PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
-                  'find_program( LLVM_OPT opt PATHS "${buildLlvmTools.llvm}/bin" NO_DEFAULT_PATH )' \
+                  'find_program( LLVM_OPT opt PATHS "${buildLlvmPackages.llvm}/bin" NO_DEFAULT_PATH )' \
         --replace-fail 'find_program( LLVM_SPIRV llvm-spirv PATHS ''${LLVM_TOOLS_BINARY_DIR} NO_DEFAULT_PATH )' \
                   'find_program( LLVM_SPIRV llvm-spirv PATHS "${spirv-llvm-translator}/bin" NO_DEFAULT_PATH )'
     ''
@@ -74,13 +74,13 @@ stdenv.mkDerivation (finalAttrs: {
         ''
           substituteInPlace CMakeLists.txt \
             --replace-fail 'COMMAND prepare_builtins' \
-                           'COMMAND ${buildLlvmTools.libclc.dev}/bin/prepare_builtins'
+                           'COMMAND ${buildLlvmPackages.libclc.dev}/bin/prepare_builtins'
         ''
       else
         ''
           substituteInPlace CMakeLists.txt \
             --replace-fail 'set( prepare_builtins_exe prepare_builtins )' \
-                           'set( prepare_builtins_exe ${buildLlvmTools.libclc.dev}/bin/prepare_builtins )'
+                           'set( prepare_builtins_exe ${buildLlvmPackages.libclc.dev}/bin/prepare_builtins )'
         ''
     );
 
diff --git a/pkgs/development/compilers/llvm/common/lld/default.nix b/pkgs/development/compilers/llvm/common/lld/default.nix
index 5e82ae65b357..b9c9152ec98d 100644
--- a/pkgs/development/compilers/llvm/common/lld/default.nix
+++ b/pkgs/development/compilers/llvm/common/lld/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   llvm_meta,
   release_version,
-  buildLlvmTools,
+  buildLlvmPackages,
   monorepoSrc ? null,
   src ? null,
   runCommand,
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     (lib.cmakeFeature "LLD_INSTALL_PACKAGE_DIR" "${placeholder "dev"}/lib/cmake/lld")
-    (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")
+    (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmPackages.tblgen}/bin/llvm-tblgen")
   ]
   ++ devExtraCmakeFlags;
 
diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix
index 09f335244d68..a7821a0d976a 100644
--- a/pkgs/development/compilers/llvm/common/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/common/llvm/default.nix
@@ -22,7 +22,7 @@
   zlib,
   which,
   sysctl,
-  buildLlvmTools,
+  buildLlvmPackages,
   updateAutotoolsGnuConfigScriptsHook,
   enableManpages ? false,
   enableSharedLibraries ? !stdenv.hostPlatform.isStatic,
@@ -468,7 +468,7 @@ stdenv.mkDerivation (
           (lib.cmakeFeature "LLVM_INSTALL_PACKAGE_DIR" "${placeholder "dev"}/lib/cmake/llvm")
           (lib.cmakeBool "LLVM_ENABLE_RTTI" true)
           (lib.cmakeBool "LLVM_LINK_LLVM_DYLIB" enableSharedLibraries)
-          (lib.cmakeFeature "LLVM_TABLEGEN" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")
+          (lib.cmakeFeature "LLVM_TABLEGEN" "${buildLlvmPackages.tblgen}/bin/llvm-tblgen")
         ];
       in
       flagsForLlvmConfig
diff --git a/pkgs/development/compilers/llvm/common/mlir/default.nix b/pkgs/development/compilers/llvm/common/mlir/default.nix
index 3d39c9a25d72..ec4944c34aaf 100644
--- a/pkgs/development/compilers/llvm/common/mlir/default.nix
+++ b/pkgs/development/compilers/llvm/common/mlir/default.nix
@@ -3,7 +3,7 @@
   stdenv,
   llvm_meta,
   release_version,
-  buildLlvmTools,
+  buildLlvmPackages,
   monorepoSrc,
   runCommand,
   cmake,
@@ -63,8 +63,8 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "LLVM_HOST_TRIPLE" stdenv.hostPlatform.config)
     (lib.cmakeFeature "LLVM_DEFAULT_TARGET_TRIPLE" stdenv.hostPlatform.config)
     (lib.cmakeBool "LLVM_ENABLE_DUMP" true)
-    (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/llvm-tblgen")
-    (lib.cmakeFeature "MLIR_TABLEGEN_EXE" "${buildLlvmTools.tblgen}/bin/mlir-tblgen")
+    (lib.cmakeFeature "LLVM_TABLEGEN_EXE" "${buildLlvmPackages.tblgen}/bin/llvm-tblgen")
+    (lib.cmakeFeature "MLIR_TABLEGEN_EXE" "${buildLlvmPackages.tblgen}/bin/mlir-tblgen")
     (lib.cmakeBool "LLVM_BUILD_LLVM_DYLIB" (!stdenv.hostPlatform.isStatic))
   ]
   ++ lib.optionals stdenv.hostPlatform.isStatic [
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index c24f97a97400..a36ab46664fd 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -13,6 +13,7 @@
   bootBintoolsNoLibc ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintoolsNoLibc,
   bootBintools ? if stdenv.targetPlatform.linker == "lld" then null else pkgs.bintools,
   llvmVersions ? { },
+  generateSplicesForMkScope,
   patchesFn ? lib.id,
   # Allows passthrough to packages via newScope in ./common/default.nix.
   # This makes it possible to do
@@ -59,19 +60,17 @@ let
         callPackage ./common (
           {
             inherit (stdenvAdapters) overrideCC;
-            buildLlvmTools = buildPackages."llvmPackages_${attrName}".tools;
-            targetLlvmLibraries =
-              # Allow overriding targetLlvmLibraries; this enables custom runtime builds.
-              packageSetArgs.targetLlvmLibraries or targetPackages."llvmPackages_${attrName}".libraries
-                or llvmPackages."${attrName}".libraries;
-            targetLlvm = targetPackages."llvmPackages_${attrName}".llvm or llvmPackages."${attrName}".llvm;
             inherit
               officialRelease
               gitRelease
               monorepoSrc
               version
               patchesFn
+              bootBintools
+              bootBintoolsNoLibc
               ;
+
+            otherSplices = generateSplicesForMkScope "llvmPackages_${attrName}";
           }
           // packageSetArgs # Allow overrides.
         )
diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 4fa9b5454aed..5ae9dc61036a 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -466,98 +466,87 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
           }
         );
 
-        llvmPackages =
-          super.llvmPackages
-          // (
-            let
-              tools = super.llvmPackages.tools.extend (
-                selfTools: _: {
-                  libclang = self.stdenv.mkDerivation {
-                    name = "bootstrap-stage0-clang";
-                    version = "boot";
-                    outputs = [
-                      "out"
-                      "lib"
-                    ];
-                    buildCommand = ''
-                      mkdir -p $out/lib
-                      ln -s $out $lib
-                      ln -s ${bootstrapTools}/bin       $out/bin
-                      ln -s ${bootstrapTools}/lib/clang $out/lib
-                      ln -s ${bootstrapTools}/include   $out
-                    '';
-                    passthru = {
-                      isFromBootstrapFiles = true;
-                      hardeningUnsupportedFlags = [
-                        "fortify3"
-                        "pacret"
-                        "shadowstack"
-                        "stackclashprotection"
-                        "zerocallusedregs"
-                      ];
-                    };
-                  };
-                  libllvm = self.stdenv.mkDerivation {
-                    name = "bootstrap-stage0-llvm";
-                    outputs = [
-                      "out"
-                      "lib"
-                    ];
-                    buildCommand = ''
-                      mkdir -p $out/bin $out/lib
-                      ln -s $out $lib
-                      for tool in ${toString super.darwin.binutils-unwrapped.llvm_cmds}; do
-                        cctoolsTool=''${tool//-/_}
-                        toolsrc="${bootstrapTools}/bin/$cctoolsTool"
-                        if [ -e "$toolsrc" ]; then
-                          ln -s "$toolsrc" $out/bin/llvm-$tool
-                        fi
-                      done
-                      ln -s ${bootstrapTools}/bin/dsymutil $out/bin/dsymutil
-                      ln -s ${bootstrapTools}/bin/llvm-readtapi $out/bin/llvm-readtapi
-                      ln -s ${bootstrapTools}/lib/libLLVM* $out/lib
-                    '';
-                    passthru.isFromBootstrapFiles = true;
-                  };
-                  llvm-manpages = self.llvmPackages.libllvm;
-                  lld = self.stdenv.mkDerivation {
-                    name = "bootstrap-stage0-lld";
-                    buildCommand = "";
-                    passthru = {
-                      isLLVM = true;
-                      isFromBootstrapFiles = true;
-                    };
-                  };
-                }
-              );
-              libraries = super.llvmPackages.libraries.extend (
-                _: _: {
-                  compiler-rt = self.stdenv.mkDerivation {
-                    name = "bootstrap-stage0-compiler-rt";
-                    buildCommand = ''
-                      mkdir -p $out/lib $out/share
-                      ln -s ${bootstrapTools}/lib/libclang_rt* $out/lib
-                      ln -s ${bootstrapTools}/lib/darwin       $out/lib
-                    '';
-                    passthru.isFromBootstrapFiles = true;
-                  };
-                  libcxx = self.stdenv.mkDerivation {
-                    name = "bootstrap-stage0-libcxx";
-                    buildCommand = ''
-                      mkdir -p $out/lib $out/include
-                      ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib
-                      ln -s ${bootstrapTools}/include/c++      $out/include
-                    '';
-                    passthru = {
-                      isLLVM = true;
-                      isFromBootstrapFiles = true;
-                    };
-                  };
-                }
-              );
-            in
-            { inherit tools libraries; } // tools // libraries
-          );
+        llvmPackages = super.llvmPackages.overrideScope (
+          selfLlvmPackages: _: {
+            libclang = self.stdenv.mkDerivation {
+              name = "bootstrap-stage0-clang";
+              version = "boot";
+              outputs = [
+                "out"
+                "lib"
+              ];
+              buildCommand = ''
+                mkdir -p $out/lib
+                ln -s $out $lib
+                ln -s ${bootstrapTools}/bin       $out/bin
+                ln -s ${bootstrapTools}/lib/clang $out/lib
+                ln -s ${bootstrapTools}/include   $out
+              '';
+              passthru = {
+                isFromBootstrapFiles = true;
+                hardeningUnsupportedFlags = [
+                  "fortify3"
+                  "pacret"
+                  "shadowstack"
+                  "stackclashprotection"
+                  "zerocallusedregs"
+                ];
+              };
+            };
+            libllvm = self.stdenv.mkDerivation {
+              name = "bootstrap-stage0-llvm";
+              outputs = [
+                "out"
+                "lib"
+              ];
+              buildCommand = ''
+                mkdir -p $out/bin $out/lib
+                ln -s $out $lib
+                for tool in ${toString super.darwin.binutils-unwrapped.llvm_cmds}; do
+                  cctoolsTool=''${tool//-/_}
+                  toolsrc="${bootstrapTools}/bin/$cctoolsTool"
+                  if [ -e "$toolsrc" ]; then
+                    ln -s "$toolsrc" $out/bin/llvm-$tool
+                  fi
+                done
+                ln -s ${bootstrapTools}/bin/dsymutil $out/bin/dsymutil
+                ln -s ${bootstrapTools}/bin/llvm-readtapi $out/bin/llvm-readtapi
+                ln -s ${bootstrapTools}/lib/libLLVM* $out/lib
+              '';
+              passthru.isFromBootstrapFiles = true;
+            };
+            llvm-manpages = self.llvmPackages.libllvm;
+            lld = self.stdenv.mkDerivation {
+              name = "bootstrap-stage0-lld";
+              buildCommand = "";
+              passthru = {
+                isLLVM = true;
+                isFromBootstrapFiles = true;
+              };
+            };
+            compiler-rt = self.stdenv.mkDerivation {
+              name = "bootstrap-stage0-compiler-rt";
+              buildCommand = ''
+                mkdir -p $out/lib $out/share
+                ln -s ${bootstrapTools}/lib/libclang_rt* $out/lib
+                ln -s ${bootstrapTools}/lib/darwin       $out/lib
+              '';
+              passthru.isFromBootstrapFiles = true;
+            };
+            libcxx = self.stdenv.mkDerivation {
+              name = "bootstrap-stage0-libcxx";
+              buildCommand = ''
+                mkdir -p $out/lib $out/include
+                ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib
+                ln -s ${bootstrapTools}/include/c++      $out/include
+              '';
+              passthru = {
+                isLLVM = true;
+                isFromBootstrapFiles = true;
+              };
+            };
+          }
+        );
       };
 
       extraPreHook = ''
@@ -682,12 +671,9 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
           }
         );
 
-        llvmPackages =
-          let
-            tools = super.llvmPackages.tools.extend (_: _: llvmToolsPackages prevStage);
-            libraries = super.llvmPackages.libraries.extend (_: _: llvmLibrariesPackages prevStage);
-          in
-          super.llvmPackages // { inherit tools libraries; } // tools // libraries;
+        llvmPackages = super.llvmPackages.overrideScope (
+          _: _: llvmToolsPackages prevStage // llvmLibrariesPackages prevStage
+        );
       };
 
       extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [
@@ -833,14 +819,14 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
               }
             );
 
-            llvmPackages =
-              let
-                tools = super.llvmPackages.tools.extend (
-                  _: _: llvmToolsPackages prevStage // { inherit (prevStage.llvmPackages) clangNoCompilerRtWithLibc; }
-                );
-                libraries = super.llvmPackages.libraries.extend (_: _: llvmLibrariesPackages prevStage);
-              in
-              super.llvmPackages // { inherit tools libraries; } // tools // libraries;
+            llvmPackages = super.llvmPackages.overrideScope (
+              _: _:
+              llvmToolsPackages prevStage
+              // llvmLibrariesPackages prevStage
+              // {
+                inherit (prevStage.llvmPackages) clangNoCompilerRtWithLibc;
+              }
+            );
           }
         ];
 
@@ -915,11 +901,7 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
               }
             );
 
-            llvmPackages =
-              let
-                libraries = super.llvmPackages.libraries.extend (_: _: llvmLibrariesPackages prevStage);
-              in
-              super.llvmPackages // { inherit libraries; } // libraries;
+            llvmPackages = super.llvmPackages.overrideScope (_: _: llvmLibrariesPackages prevStage);
           }
         ];
 
@@ -989,49 +971,45 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
               }
             );
 
-            llvmPackages =
-              let
-                tools = super.llvmPackages.tools.extend (
-                  _: _:
-                  llvmToolsPackages prevStage
-                  // {
-                    systemLibcxxClang = super.wrapCCWith rec {
-                      nativeTools = false;
-                      nativeLibc = false;
+            llvmPackages = super.llvmPackages.overrideScope (
+              _: _:
+              llvmToolsPackages prevStage
+              // llvmLibrariesPackages prevStage
+              // {
+                systemLibcxxClang = super.wrapCCWith rec {
+                  nativeTools = false;
+                  nativeLibc = false;
 
-                      inherit (prevStage) expand-response-params;
+                  inherit (prevStage) expand-response-params;
 
-                      extraPackages = [ self.llvmPackages.compiler-rt ];
+                  extraPackages = [ self.llvmPackages.compiler-rt ];
 
-                      extraBuildCommands = ''
-                        rsrc="$out/resource-root"
-                        mkdir "$rsrc"
-                        ln -s "${lib.getLib cc}/lib/clang/${lib.versions.major (lib.getVersion cc)}/include" "$rsrc"
-                        echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-                        ln -s "${prevStage.llvmPackages.compiler-rt.out}/lib" "$rsrc/lib"
-                        ln -s "${prevStage.llvmPackages.compiler-rt.out}/share" "$rsrc/share"
-                      '';
+                  extraBuildCommands = ''
+                    rsrc="$out/resource-root"
+                    mkdir "$rsrc"
+                    ln -s "${lib.getLib cc}/lib/clang/${lib.versions.major (lib.getVersion cc)}/include" "$rsrc"
+                    echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+                    ln -s "${prevStage.llvmPackages.compiler-rt.out}/lib" "$rsrc/lib"
+                    ln -s "${prevStage.llvmPackages.compiler-rt.out}/share" "$rsrc/share"
+                  '';
 
-                      cc = self.llvmPackages.clang-unwrapped;
-                      bintools = self.darwin.binutils;
+                  cc = self.llvmPackages.clang-unwrapped;
+                  bintools = self.darwin.binutils;
 
-                      isClang = true;
-                      libc = self.darwin.libSystem;
-                      inherit (self.darwin) libcxx;
+                  isClang = true;
+                  libc = self.darwin.libSystem;
+                  inherit (self.darwin) libcxx;
 
-                      inherit lib;
-                      inherit (self)
-                        stdenvNoCC
-                        coreutils
-                        gnugrep
-                        runtimeShell
-                        ;
-                    };
-                  }
-                );
-                libraries = super.llvmPackages.libraries.extend (_: _: llvmLibrariesPackages prevStage);
-              in
-              super.llvmPackages // { inherit tools libraries; } // tools // libraries;
+                  inherit lib;
+                  inherit (self)
+                    stdenvNoCC
+                    coreutils
+                    gnugrep
+                    runtimeShell
+                    ;
+                };
+              }
+            );
           }
         ];
 
@@ -1241,22 +1219,15 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
               "llvmPackages_${lib.versions.major prevStage.llvmPackages.release_version}" =
                 let
                   llvmVersion = lib.versions.major prevStage.llvmPackages.release_version;
-                  tools = super."llvmPackages_${llvmVersion}".tools.extend (_: _: llvmToolsPackages prevStage);
-                  libraries = super."llvmPackages_${llvmVersion}".libraries.extend (
-                    _: _:
-                    llvmLibrariesPackages prevStage
-                    # Avoid depending on llvm-manpages from the bootstrap, which brings a bunch of Python dependencies
-                    # into the bootstrap. This means that there are no man pages in darwin.binutils, but they are still
-                    # available from llvm-manpages, ld64, and cctools.
-                    // {
-                      inherit (super."llvmPackages_${llvmVersion}") llvm-manpages;
-                    }
-                    // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) {
-                      inherit (prevStage.llvmPackages) clang;
-                    }
-                  );
                 in
-                super."llvmPackages_${llvmVersion}" // { inherit tools libraries; } // tools // libraries;
+                super."llvmPackages_${llvmVersion}".overrideScope (
+                  _: _:
+                  llvmToolsPackages prevStage
+                  // llvmLibrariesPackages prevStage
+                  // {
+                    inherit (super."llvmPackages_${llvmVersion}") llvm-manpages;
+                  }
+                );
             }
           ];
       };

From 5418ad3ed95a051ef40754db50da7c6934186b66 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Mon, 8 Sep 2025 17:04:43 -0700
Subject: [PATCH 2699/6226] rocmPackages.llvm: use llvmPackages.overrideScope

Uses new overrideScope feature to override base LLVM packages
without risking leaking incorrect non-overridden packages
from the base LLVM version.

To achieve no rebuilds or new attrs:
- Explicit list of packages to expose in an inherit instead
  of the entire scope
- Noting where workarounds for lack of overrideScope should
  be removed in a followup such as re-attaching a
  replaceVars patch or disabling separate tblgen package,
  but are kept for now to avoid a rebuild

To avoid a large formatting diff a small helper has
been introduced that allows an overrideScope call with a single
arg, convincing nixfmt not to indent the scope body further.
---
 .../rocm-modules/6/llvm/default.nix           | 106 ++++++++++--------
 1 file changed, 57 insertions(+), 49 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/6/llvm/default.nix
index e545c23c1da3..cb95a21041b7 100644
--- a/pkgs/development/rocm-modules/6/llvm/default.nix
+++ b/pkgs/development/rocm-modules/6/llvm/default.nix
@@ -10,7 +10,6 @@
   runCommand,
   symlinkJoin,
   rdfind,
-  wrapBintoolsWith,
   zstd,
   zlib,
   gcc-unwrapped,
@@ -32,7 +31,7 @@
   withLto ? true,
   # whether rocm stdenv uses libcxx (clang c++ stdlib) instead of gcc stdlibc++
   withLibcxx ? false,
-}@args:
+}:
 
 let
   version = "6.4.3";
@@ -142,6 +141,28 @@ let
     stdenv.cc.cc
     stdenv.cc.bintools
   ];
+  # Hacky way to avoid nixfmt indenting the entire scope body suggested by @emilazy
+  overrideLlvmPackagesRocm =
+    f:
+    let
+      overridenScope = llvmPackagesRocm.overrideScope (final: prev: f { inherit final prev; });
+    in
+    {
+      inherit (overridenScope)
+        # Expose only a limited set of packages that we care about for ROCm
+        bintools
+        compiler-rt
+        compiler-rt-libc
+        clang
+        clang-unwrapped
+        libcxx
+        lld
+        llvm
+        rocm-toolchain
+        rocmClangStdenv
+        openmp
+        ;
+    };
   sysrootCompiler =
     {
       cc,
@@ -258,13 +279,8 @@ let
     ]
   );
 in
-rec {
-  inherit (llvmPackagesRocm) libcxx;
-  inherit args;
-  # Pass through original attrs for debugging where non-overridden llvm/clang is getting used
-  # llvm-orig = llvmPackagesRocm.llvm; # nix why-depends --derivation .#rocmPackages.clr .#rocmPackages.llvm.llvm-orig
-  # clang-orig = llvmPackagesRocm.clang; # nix why-depends --derivation .#rocmPackages.clr .#rocmPackages.llvm.clang-orig
-  llvm = llvmPackagesRocm.llvm.overrideAttrs (old: {
+overrideLlvmPackagesRocm (s: {
+  libllvm = (s.prev.libllvm.override { }).overrideAttrs (old: {
     patches = old.patches ++ [
       (fetchpatch {
         # fix compile error in tools/gold/gold-plugin.cpp
@@ -310,8 +326,7 @@ rec {
     meta = old.meta // llvmMeta;
   });
   lld =
-    (llvmPackagesRocm.lld.override {
-      libllvm = llvm;
+    (s.prev.lld.override {
     }).overrideAttrs
       (old: {
         dontStrip = profilableStdenv;
@@ -336,8 +351,7 @@ rec {
         meta = old.meta // llvmMeta;
       });
   clang-unwrapped = (
-    (llvmPackagesRocm.clang-unwrapped.override {
-      libllvm = llvm;
+    (s.prev.clang-unwrapped.override {
       enableClangToolsExtra = false;
     }).overrideAttrs
       (
@@ -373,10 +387,10 @@ rec {
               url = "https://github.com/GZGavinZhao/rocm-llvm-project/commit/6d296f879b0fed830c54b2a9d26240da86c8bb3a.patch";
               relative = "clang";
             })
-            # FIXME: Needed due to https://github.com/NixOS/nixpkgs/issues/375431
-            # Once we can switch to overrideScope this can be removed
+            # FIXME: Temporarily kept for rebuild avoidance
+            # Should be dropped in followup and we no longer need to filter out the original application
             (replaceVars ./../../../compilers/llvm/common/clang/clang-at-least-16-LLVMgold-path.patch {
-              libllvmLibdir = "${llvm.lib}/lib";
+              libllvmLibdir = "${s.final.libllvm.lib}/lib";
             })
           ];
           hardeningDisable = [ "all" ];
@@ -397,6 +411,7 @@ rec {
           __structuredAttrs = true;
           # https://github.com/llvm/llvm-project/blob/6976deebafa8e7de993ce159aa6b82c0e7089313/clang/cmake/caches/DistributionExample-stage2.cmake#L9-L11
           cmakeFlags =
+            # TODO: Remove in followup, tblgen now works correctly but would rebuild
             (builtins.filter tablegenUsage old.cmakeFlags)
             ++ commonCmakeFlags
             ++ lib.optionals (!withLibcxx) [
@@ -426,6 +441,7 @@ rec {
   # in the right order
   # and expects its libc to be in the sysroot
   rocm-toolchain =
+    with s.final;
     (sysrootCompiler {
       cc = clang-unwrapped;
       name = "rocm-toolchain";
@@ -458,42 +474,31 @@ rec {
       isClang = true;
       isGNU = false;
     };
-  compiler-rt-libc =
-    (llvmPackagesRocm.compiler-rt-libc.override {
-      libllvm = llvm;
-    }).overrideAttrs
-      (old: {
-        patches = old.patches ++ [
-          (fetchpatch {
-            name = "Fix-missing-main-function-in-float16-bfloat16-support-checks.patch";
-            url = "https://github.com/ROCm/llvm-project/commit/68d8b3846ab1e6550910f2a9a685690eee558af2.patch";
-            hash = "sha256-Db+L1HFMWVj4CrofsGbn5lnMoCzEcU+7q12KKFb17/g=";
-            relative = "compiler-rt";
-          })
-          (fetchpatch {
-            # Fixes fortify hardening compile error related to openat usage
-            hash = "sha256-pgpN1q1vIQrPXHPxNSZ6zfgV2EflHO5Amzl+2BDjXbs=";
-            url = "https://github.com/llvm/llvm-project/commit/155b7a12820ec45095988b6aa6e057afaf2bc892.patch";
-            relative = "compiler-rt";
-          })
-        ];
-        meta = old.meta // llvmMeta;
-      });
-  compiler-rt = compiler-rt-libc;
-  bintools = wrapBintoolsWith {
-    bintools = llvmPackagesRocm.bintools-unwrapped.override {
-      inherit lld llvm;
-    };
-  };
+  compiler-rt-libc = s.prev.compiler-rt-libc.overrideAttrs (old: {
+    patches = old.patches ++ [
+      (fetchpatch {
+        name = "Fix-missing-main-function-in-float16-bfloat16-support-checks.patch";
+        url = "https://github.com/ROCm/llvm-project/commit/68d8b3846ab1e6550910f2a9a685690eee558af2.patch";
+        hash = "sha256-Db+L1HFMWVj4CrofsGbn5lnMoCzEcU+7q12KKFb17/g=";
+        relative = "compiler-rt";
+      })
+      (fetchpatch {
+        # Fixes fortify hardening compile error related to openat usage
+        hash = "sha256-pgpN1q1vIQrPXHPxNSZ6zfgV2EflHO5Amzl+2BDjXbs=";
+        url = "https://github.com/llvm/llvm-project/commit/155b7a12820ec45095988b6aa6e057afaf2bc892.patch";
+        relative = "compiler-rt";
+      })
+    ];
+    meta = old.meta // llvmMeta;
+  });
+  compiler-rt = s.final.compiler-rt-libc;
+  clang = s.final.rocm-toolchain;
 
-  clang = rocm-toolchain;
-
-  rocmClangStdenv = overrideCC (
-    if withLibcxx then llvmPackagesRocm.libcxxStdenv else llvmPackagesRocm.stdenv
-  ) clang;
+  rocmClangStdenv = with s.final; overrideCC (if withLibcxx then libcxxStdenv else stdenv) clang;
 
   # Projects
   openmp =
+    with s.final;
     (llvmPackagesRocm.openmp.override {
       llvm = llvm;
       targetLlvm = llvm;
@@ -521,4 +526,7 @@ rec {
           libffi
         ];
       });
-}
+  # AMD has a separate MLIR impl which we package under rocmPackages.rocmlir
+  # It would be an error to rely on the original mlir package from this scope
+  mlir = null;
+})

From 9106b7cd224f99e4833e2f5340bdcc1cfb79df1a Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Tue, 21 Oct 2025 21:09:05 -0700
Subject: [PATCH 2700/6226] pkgs/stdenv/darwin: rebuild avoidance for LLVM
 scope

- Setting recurseForDerivations again post overrideScope
- Hackily propagating initial value llvmPackages.override
---
 pkgs/stdenv/darwin/default.nix | 297 +++++++++++++++++++--------------
 1 file changed, 168 insertions(+), 129 deletions(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 5ae9dc61036a..f7c5262acc98 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -466,87 +466,91 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
           }
         );
 
-        llvmPackages = super.llvmPackages.overrideScope (
-          selfLlvmPackages: _: {
-            libclang = self.stdenv.mkDerivation {
-              name = "bootstrap-stage0-clang";
-              version = "boot";
-              outputs = [
-                "out"
-                "lib"
-              ];
-              buildCommand = ''
-                mkdir -p $out/lib
-                ln -s $out $lib
-                ln -s ${bootstrapTools}/bin       $out/bin
-                ln -s ${bootstrapTools}/lib/clang $out/lib
-                ln -s ${bootstrapTools}/include   $out
-              '';
-              passthru = {
-                isFromBootstrapFiles = true;
-                hardeningUnsupportedFlags = [
-                  "fortify3"
-                  "pacret"
-                  "shadowstack"
-                  "stackclashprotection"
-                  "zerocallusedregs"
+        llvmPackages =
+          (super.llvmPackages.overrideScope (
+            selfLlvmPackages: _: {
+              libclang = self.stdenv.mkDerivation {
+                name = "bootstrap-stage0-clang";
+                version = "boot";
+                outputs = [
+                  "out"
+                  "lib"
                 ];
+                buildCommand = ''
+                  mkdir -p $out/lib
+                  ln -s $out $lib
+                  ln -s ${bootstrapTools}/bin       $out/bin
+                  ln -s ${bootstrapTools}/lib/clang $out/lib
+                  ln -s ${bootstrapTools}/include   $out
+                '';
+                passthru = {
+                  isFromBootstrapFiles = true;
+                  hardeningUnsupportedFlags = [
+                    "fortify3"
+                    "pacret"
+                    "shadowstack"
+                    "stackclashprotection"
+                    "zerocallusedregs"
+                  ];
+                };
               };
-            };
-            libllvm = self.stdenv.mkDerivation {
-              name = "bootstrap-stage0-llvm";
-              outputs = [
-                "out"
-                "lib"
-              ];
-              buildCommand = ''
-                mkdir -p $out/bin $out/lib
-                ln -s $out $lib
-                for tool in ${toString super.darwin.binutils-unwrapped.llvm_cmds}; do
-                  cctoolsTool=''${tool//-/_}
-                  toolsrc="${bootstrapTools}/bin/$cctoolsTool"
-                  if [ -e "$toolsrc" ]; then
-                    ln -s "$toolsrc" $out/bin/llvm-$tool
-                  fi
-                done
-                ln -s ${bootstrapTools}/bin/dsymutil $out/bin/dsymutil
-                ln -s ${bootstrapTools}/bin/llvm-readtapi $out/bin/llvm-readtapi
-                ln -s ${bootstrapTools}/lib/libLLVM* $out/lib
-              '';
-              passthru.isFromBootstrapFiles = true;
-            };
-            llvm-manpages = self.llvmPackages.libllvm;
-            lld = self.stdenv.mkDerivation {
-              name = "bootstrap-stage0-lld";
-              buildCommand = "";
-              passthru = {
-                isLLVM = true;
-                isFromBootstrapFiles = true;
+              libllvm = self.stdenv.mkDerivation {
+                name = "bootstrap-stage0-llvm";
+                outputs = [
+                  "out"
+                  "lib"
+                ];
+                buildCommand = ''
+                  mkdir -p $out/bin $out/lib
+                  ln -s $out $lib
+                  for tool in ${toString super.darwin.binutils-unwrapped.llvm_cmds}; do
+                    cctoolsTool=''${tool//-/_}
+                    toolsrc="${bootstrapTools}/bin/$cctoolsTool"
+                    if [ -e "$toolsrc" ]; then
+                      ln -s "$toolsrc" $out/bin/llvm-$tool
+                    fi
+                  done
+                  ln -s ${bootstrapTools}/bin/dsymutil $out/bin/dsymutil
+                  ln -s ${bootstrapTools}/bin/llvm-readtapi $out/bin/llvm-readtapi
+                  ln -s ${bootstrapTools}/lib/libLLVM* $out/lib
+                '';
+                passthru.isFromBootstrapFiles = true;
               };
-            };
-            compiler-rt = self.stdenv.mkDerivation {
-              name = "bootstrap-stage0-compiler-rt";
-              buildCommand = ''
-                mkdir -p $out/lib $out/share
-                ln -s ${bootstrapTools}/lib/libclang_rt* $out/lib
-                ln -s ${bootstrapTools}/lib/darwin       $out/lib
-              '';
-              passthru.isFromBootstrapFiles = true;
-            };
-            libcxx = self.stdenv.mkDerivation {
-              name = "bootstrap-stage0-libcxx";
-              buildCommand = ''
-                mkdir -p $out/lib $out/include
-                ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib
-                ln -s ${bootstrapTools}/include/c++      $out/include
-              '';
-              passthru = {
-                isLLVM = true;
-                isFromBootstrapFiles = true;
+              llvm-manpages = self.llvmPackages.libllvm;
+              lld = self.stdenv.mkDerivation {
+                name = "bootstrap-stage0-lld";
+                buildCommand = "";
+                passthru = {
+                  isLLVM = true;
+                  isFromBootstrapFiles = true;
+                };
               };
-            };
-          }
-        );
+              compiler-rt = self.stdenv.mkDerivation {
+                name = "bootstrap-stage0-compiler-rt";
+                buildCommand = ''
+                  mkdir -p $out/lib $out/share
+                  ln -s ${bootstrapTools}/lib/libclang_rt* $out/lib
+                  ln -s ${bootstrapTools}/lib/darwin       $out/lib
+                '';
+                passthru.isFromBootstrapFiles = true;
+              };
+              libcxx = self.stdenv.mkDerivation {
+                name = "bootstrap-stage0-libcxx";
+                buildCommand = ''
+                  mkdir -p $out/lib $out/include
+                  ln -s ${bootstrapTools}/lib/libc++.dylib $out/lib
+                  ln -s ${bootstrapTools}/include/c++      $out/include
+                '';
+                passthru = {
+                  isLLVM = true;
+                  isFromBootstrapFiles = true;
+                };
+              };
+            }
+          ))
+          // {
+            inherit (super.llvmPackages) override;
+          };
       };
 
       extraPreHook = ''
@@ -671,9 +675,13 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
           }
         );
 
-        llvmPackages = super.llvmPackages.overrideScope (
-          _: _: llvmToolsPackages prevStage // llvmLibrariesPackages prevStage
-        );
+        llvmPackages =
+          (super.llvmPackages.overrideScope (
+            _: _: llvmToolsPackages prevStage // llvmLibrariesPackages prevStage
+          ))
+          // {
+            inherit (super.llvmPackages) override;
+          };
       };
 
       extraNativeBuildInputs = lib.optionals localSystem.isAarch64 [
@@ -819,14 +827,18 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
               }
             );
 
-            llvmPackages = super.llvmPackages.overrideScope (
-              _: _:
-              llvmToolsPackages prevStage
-              // llvmLibrariesPackages prevStage
+            llvmPackages =
+              (super.llvmPackages.overrideScope (
+                _: _:
+                llvmToolsPackages prevStage
+                // llvmLibrariesPackages prevStage
+                // {
+                  inherit (prevStage.llvmPackages) clangNoCompilerRtWithLibc;
+                }
+              ))
               // {
-                inherit (prevStage.llvmPackages) clangNoCompilerRtWithLibc;
-              }
-            );
+                inherit (super.llvmPackages) override;
+              };
           }
         ];
 
@@ -901,7 +913,9 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
               }
             );
 
-            llvmPackages = super.llvmPackages.overrideScope (_: _: llvmLibrariesPackages prevStage);
+            llvmPackages = (super.llvmPackages.overrideScope (_: _: llvmLibrariesPackages prevStage)) // {
+              inherit (super.llvmPackages) override;
+            };
           }
         ];
 
@@ -971,45 +985,49 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
               }
             );
 
-            llvmPackages = super.llvmPackages.overrideScope (
-              _: _:
-              llvmToolsPackages prevStage
-              // llvmLibrariesPackages prevStage
+            llvmPackages =
+              (super.llvmPackages.overrideScope (
+                _: _:
+                llvmToolsPackages prevStage
+                // llvmLibrariesPackages prevStage
+                // {
+                  systemLibcxxClang = super.wrapCCWith rec {
+                    nativeTools = false;
+                    nativeLibc = false;
+
+                    inherit (prevStage) expand-response-params;
+
+                    extraPackages = [ self.llvmPackages.compiler-rt ];
+
+                    extraBuildCommands = ''
+                      rsrc="$out/resource-root"
+                      mkdir "$rsrc"
+                      ln -s "${lib.getLib cc}/lib/clang/${lib.versions.major (lib.getVersion cc)}/include" "$rsrc"
+                      echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
+                      ln -s "${prevStage.llvmPackages.compiler-rt.out}/lib" "$rsrc/lib"
+                      ln -s "${prevStage.llvmPackages.compiler-rt.out}/share" "$rsrc/share"
+                    '';
+
+                    cc = self.llvmPackages.clang-unwrapped;
+                    bintools = self.darwin.binutils;
+
+                    isClang = true;
+                    libc = self.darwin.libSystem;
+                    inherit (self.darwin) libcxx;
+
+                    inherit lib;
+                    inherit (self)
+                      stdenvNoCC
+                      coreutils
+                      gnugrep
+                      runtimeShell
+                      ;
+                  };
+                }
+              ))
               // {
-                systemLibcxxClang = super.wrapCCWith rec {
-                  nativeTools = false;
-                  nativeLibc = false;
-
-                  inherit (prevStage) expand-response-params;
-
-                  extraPackages = [ self.llvmPackages.compiler-rt ];
-
-                  extraBuildCommands = ''
-                    rsrc="$out/resource-root"
-                    mkdir "$rsrc"
-                    ln -s "${lib.getLib cc}/lib/clang/${lib.versions.major (lib.getVersion cc)}/include" "$rsrc"
-                    echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags
-                    ln -s "${prevStage.llvmPackages.compiler-rt.out}/lib" "$rsrc/lib"
-                    ln -s "${prevStage.llvmPackages.compiler-rt.out}/share" "$rsrc/share"
-                  '';
-
-                  cc = self.llvmPackages.clang-unwrapped;
-                  bintools = self.darwin.binutils;
-
-                  isClang = true;
-                  libc = self.darwin.libSystem;
-                  inherit (self.darwin) libcxx;
-
-                  inherit lib;
-                  inherit (self)
-                    stdenvNoCC
-                    coreutils
-                    gnugrep
-                    runtimeShell
-                    ;
-                };
-              }
-            );
+                inherit (super.llvmPackages) override;
+              };
           }
         ];
 
@@ -1220,14 +1238,18 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
                 let
                   llvmVersion = lib.versions.major prevStage.llvmPackages.release_version;
                 in
-                super."llvmPackages_${llvmVersion}".overrideScope (
+                (super."llvmPackages_${llvmVersion}".overrideScope (
                   _: _:
                   llvmToolsPackages prevStage
                   // llvmLibrariesPackages prevStage
                   // {
                     inherit (super."llvmPackages_${llvmVersion}") llvm-manpages;
                   }
-                );
+                ))
+                // {
+                  inherit (super."llvmPackages_${llvmVersion}") override;
+                  recurseForDerivations = true;
+                };
             }
           ];
       };
@@ -1259,7 +1281,24 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
     assert prevStage.libiconv == prevStage.darwin.libiconv;
 
     {
-      inherit (prevStage) config overlays stdenv;
+      inherit (prevStage) config overlays;
+      # This should be done in the `overrideScope` above, but it causes rebuilds.
+      # TODO: Move it there once https://github.com/NixOS/nixpkgs/pull/445668 is merged.
+      stdenv = prevStage.stdenv // {
+        overrides =
+          self: super:
+          (prevStage.stdenv.overrides self super)
+          // lib.optionalAttrs (super.stdenv.targetPlatform == localSystem) (
+            let
+              llvmVersion = lib.versions.major prevStage.llvmPackages.release_version;
+            in
+            {
+              "llvmPackages_${llvmVersion}" = prevStage."llvmPackages_${llvmVersion}" // {
+                inherit (prevStage) clang;
+              };
+            }
+          );
+      };
     }
   )
 ]

From 210060e66cff887497896dbf6daecbca0204ceb1 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 24 Oct 2025 20:18:58 +0100
Subject: [PATCH 2701/6226] =?UTF-8?q?llvmPackages.openmp:=20don=E2=80=99t?=
 =?UTF-8?q?=20use=20a=20target=20platform=20LLVM?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was used in 4b07aeae16811bcb6ab2cef67133180bcb30ed67 to get
what was actually a *host* LLVM in practice, when the `buildHost`
LLVM package set was included in the `callPackage` scope used for
libraries. It should no longer be necessary and is now quite confusing.
---
 pkgs/development/compilers/llvm/common/default.nix       | 9 +--------
 .../development/compilers/llvm/common/openmp/default.nix | 3 +--
 pkgs/development/rocm-modules/6/llvm/default.nix         | 1 -
 3 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index 5da66a77aad2..617237089f9c 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -108,14 +108,7 @@ let
 in
 makeScopeWithSplicing' {
   inherit otherSplices;
-  extra =
-    spliced0:
-    args
-    // metadata
-    // {
-      inherit buildLlvmPackages;
-      targetLlvm = spliced0.llvm.__spliced._targetTarget or llvm;
-    };
+  extra = _spliced0: args // metadata // { inherit buildLlvmPackages; };
   f =
     self:
     let
diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix
index 2e293d41d8c9..d3bd81530bd3 100644
--- a/pkgs/development/compilers/llvm/common/openmp/default.nix
+++ b/pkgs/development/compilers/llvm/common/openmp/default.nix
@@ -9,7 +9,6 @@
   cmake,
   ninja,
   llvm,
-  targetLlvm,
   lit,
   clang-unwrapped,
   perl,
@@ -62,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    (if stdenv.buildPlatform == stdenv.hostPlatform then llvm else targetLlvm)
+    llvm
   ]
   ++ lib.optionals (ompdSupport && ompdGdbSupport) [
     python3
diff --git a/pkgs/development/rocm-modules/6/llvm/default.nix b/pkgs/development/rocm-modules/6/llvm/default.nix
index cb95a21041b7..3b03a66574c2 100644
--- a/pkgs/development/rocm-modules/6/llvm/default.nix
+++ b/pkgs/development/rocm-modules/6/llvm/default.nix
@@ -501,7 +501,6 @@ overrideLlvmPackagesRocm (s: {
     with s.final;
     (llvmPackagesRocm.openmp.override {
       llvm = llvm;
-      targetLlvm = llvm;
       clang-unwrapped = clang-unwrapped;
     }).overrideAttrs
       (old: {

From 8b6e86acfbc0aa28df1dfcc47b4d3d24e3a44483 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 25 Oct 2025 01:30:16 +0100
Subject: [PATCH 2702/6226] llvmPackages: remove unnecessary use of `pkgs`

---
 pkgs/development/compilers/llvm/common/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index 617237089f9c..a4bdde8f06b9 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -212,7 +212,7 @@ makeScopeWithSplicing' {
           self.systemLibcxxClang
         else if stdenv.targetPlatform.useLLVM or false then
           self.clangUseLLVM
-        else if (pkgs.targetPackages.stdenv or args.stdenv).cc.isGNU then
+        else if (targetPackages.stdenv or stdenv).cc.isGNU then
           self.libstdcxxClang
         else
           self.libcxxClang;

From 3a8c4943058806489f27a55559016d22ee46efe7 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 25 Oct 2025 17:03:53 +0100
Subject: [PATCH 2703/6226] llvmPackages: remove things made unnecessary by
 splicing

---
 pkgs/development/compilers/llvm/common/default.nix | 14 ++++++--------
 .../compilers/llvm/common/libclc/default.nix       |  2 +-
 .../compilers/llvm/common/openmp/default.nix       |  2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index a4bdde8f06b9..6ea553a5723e 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -8,7 +8,6 @@
   overrideCC,
   wrapCCWith,
   wrapBintoolsWith,
-  buildPackages,
   makeScopeWithSplicing',
   otherSplices,
   splicePackages,
@@ -23,6 +22,10 @@
   monorepoSrc ? null,
   version ? null,
   patchesFn ? lib.id,
+  cmake,
+  cmakeMinimal,
+  python3,
+  python3Minimal,
   # Allows passthrough to packages via newScope. This makes it possible to
   # do `(llvmPackages.override { <someLlvmDependency> = bar; }).clang` and get
   # an llvmPackages whose packages are overridden in an internally consistent way.
@@ -485,13 +488,8 @@ makeScopeWithSplicing' {
         # Use clang due to "gnu::naked" not working on aarch64.
         # Issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77882
         stdenv = overrideCC stdenv buildLlvmPackages.clangNoLibcNoRt;
-        cmake =
-          if stdenv.targetPlatform.libc == "llvm" then buildPackages.cmakeMinimal else buildPackages.cmake;
-        python3 =
-          if stdenv.targetPlatform.libc == "llvm" then
-            buildPackages.python3Minimal
-          else
-            buildPackages.python3;
+        cmake = if stdenv.targetPlatform.libc == "llvm" then cmakeMinimal else cmake;
+        python3 = if stdenv.targetPlatform.libc == "llvm" then python3Minimal else python3;
       };
 
       libc = if stdenv.targetPlatform.libc == "llvm" then self.libc-full else self.libc-overlay;
diff --git a/pkgs/development/compilers/llvm/common/libclc/default.nix b/pkgs/development/compilers/llvm/common/libclc/default.nix
index c4dfa242606f..304ee54d8a7a 100644
--- a/pkgs/development/compilers/llvm/common/libclc/default.nix
+++ b/pkgs/development/compilers/llvm/common/libclc/default.nix
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (lib.versionAtLeast release_version "19") [
     clang-only
-    buildLlvmTools.llvm
+    llvm
     spirv-llvm-translator
   ];
   buildInputs = [ llvm ];
diff --git a/pkgs/development/compilers/llvm/common/openmp/default.nix b/pkgs/development/compilers/llvm/common/openmp/default.nix
index d3bd81530bd3..a08376522d9e 100644
--- a/pkgs/development/compilers/llvm/common/openmp/default.nix
+++ b/pkgs/development/compilers/llvm/common/openmp/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     cmake
-    python3.pythonOnBuildForHost
+    python3
     perl
     ninja
     pkg-config

From 2d6ca409d6a1e0df6ceaeb2f84230ee371d9b524 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sat, 25 Oct 2025 02:02:30 +0100
Subject: [PATCH 2704/6226] llvmPackages: add comments about suspicious things

---
 pkgs/development/compilers/llvm/common/default.nix       | 8 +++++++-
 pkgs/development/compilers/llvm/common/flang/default.nix | 1 +
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index 6ea553a5723e..28e29cb43a61 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -319,6 +319,9 @@ makeScopeWithSplicing' {
       clangWithLibcAndBasicRtAndLibcxx = wrapCCWith rec {
         cc = self.clang-unwrapped;
         # This is used to build compiler-rt. Make sure to use the system libc++ on Darwin.
+        #
+        # FIXME: This should almost certainly use
+        # `stdenv.targetPlatform` and `targetPackages.darwin.libcxx`.
         libcxx = if stdenv.hostPlatform.isDarwin then darwin.libcxx else targetLlvmPackages.libcxx;
         bintools = bintools';
         extraPackages = [
@@ -488,10 +491,13 @@ makeScopeWithSplicing' {
         # Use clang due to "gnu::naked" not working on aarch64.
         # Issue: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=77882
         stdenv = overrideCC stdenv buildLlvmPackages.clangNoLibcNoRt;
+        # FIXME: This should almost certainly be `stdenv.hostPlatform`.
         cmake = if stdenv.targetPlatform.libc == "llvm" then cmakeMinimal else cmake;
         python3 = if stdenv.targetPlatform.libc == "llvm" then python3Minimal else python3;
       };
 
-      libc = if stdenv.targetPlatform.libc == "llvm" then self.libc-full else self.libc-overlay;
+      libc =
+        # FIXME: This should almost certainly be `stdenv.hostPlatform`.
+        if stdenv.targetPlatform.libc == "llvm" then self.libc-full else self.libc-overlay;
     };
 }
diff --git a/pkgs/development/compilers/llvm/common/flang/default.nix b/pkgs/development/compilers/llvm/common/flang/default.nix
index 8092236e5180..335633d7d19c 100644
--- a/pkgs/development/compilers/llvm/common/flang/default.nix
+++ b/pkgs/development/compilers/llvm/common/flang/default.nix
@@ -64,6 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "CMAKE_VERBOSE_MAKEFILE" true)
     (lib.cmakeFeature "LLVM_DIR" "${libllvm.dev}/lib/cmake/llvm")
+    # TODO: Needs patches and the `lit` package like other LLVM builds?
     (lib.cmakeFeature "LLVM_TOOLS_BINARY_DIR" "${buildLlvmPackages.tblgen}/bin/")
     (lib.cmakeFeature "LLVM_EXTERNAL_LIT" "${buildLlvmPackages.tblgen}/bin/llvm-lit")
     (lib.cmakeFeature "CLANG_DIR" "${libclang.dev}/lib/cmake/clang")

From 991b73606a526299a19d36cf32a196d72313e7ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 19:09:21 +0000
Subject: [PATCH 2705/6226] procfd: 1.1.0 -> 1.2.0

---
 pkgs/by-name/pr/procfd/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/procfd/package.nix b/pkgs/by-name/pr/procfd/package.nix
index 53f12202e087..16aa478eacdb 100644
--- a/pkgs/by-name/pr/procfd/package.nix
+++ b/pkgs/by-name/pr/procfd/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "procfd";
-  version = "1.1.0";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "deshaw";
     repo = "procfd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-M2VFy7WqvoxgzEpS0qd7nGLRt2pKGZlfU9uUHlwDC7Y=";
+    hash = "sha256-KhnSHtPT9H9CWotwQIA9gFvwgm0PKsmDjQS817PxMw0=";
   };
 
-  cargoHash = "sha256-YmUzcJ8SM3iwjeDZXWBrDcT793ZyF6QdwxuYDh69xZw=";
+  cargoHash = "sha256-srFXs+h+ZMXeWRwGQUAqMACJG4ZUgztWr2ff6sRfkU8=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From a5f9102dcd20203a1afea4d5217ef768f4151158 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Sat, 25 Oct 2025 21:24:08 +0200
Subject: [PATCH 2706/6226] gnudatalanguage: fix build

---
 .../development/interpreters/gnudatalanguage/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/interpreters/gnudatalanguage/default.nix b/pkgs/development/interpreters/gnudatalanguage/default.nix
index 154c23aa18ac..328ecd9dfe02 100644
--- a/pkgs/development/interpreters/gnudatalanguage/default.nix
+++ b/pkgs/development/interpreters/gnudatalanguage/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   wrapGAppsHook3,
   readline,
@@ -121,6 +122,14 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://github.com/gnudatalanguage/gdl/commit/b648a63c5070f38e90167f858a79ba6f01dad1d3.patch?full_index=1";
+      includes = [ "CMakeLists.txt" ];
+      hash = "sha256-lYtAstI21Up4RArf6pXnjiTwJ3Omoisw43Ih1H2Wc0s=";
+    })
+  ];
+
   postPatch = ''
     substituteInPlace CMakeLists.txt \
       --replace-fail 'FATAL_ERROR "The src' 'WARNING "The src' \

From e0b36839ec92ea595d5cf1fad85941c887893db4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 19:29:51 +0000
Subject: [PATCH 2707/6226] oxigraph: 0.5.1 -> 0.5.2

---
 pkgs/by-name/ox/oxigraph/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ox/oxigraph/package.nix b/pkgs/by-name/ox/oxigraph/package.nix
index fed65b4f3fc6..35e4fa2da880 100644
--- a/pkgs/by-name/ox/oxigraph/package.nix
+++ b/pkgs/by-name/ox/oxigraph/package.nix
@@ -13,17 +13,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "oxigraph";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "oxigraph";
     repo = "oxigraph";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-58PGRQlDziVENgm7OKPAzXXi4BkOJqytGCxxIXB2smc=";
+    hash = "sha256-ptTrJbLGS7GkLGO40mbpdPkrcspaUE33kRZ8g9Qtb0o=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-GQ+7dyQ1LyYK8RYImsqVMEQvIC5pRQUVYYgO4FOShaE=";
+  cargoHash = "sha256-AuUGra9ejPRKWWpXWLmcwGuZRKIuCYTdifpnwuuHnnQ=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook

From 651f4d9f68e6b5cb42bf0ebd9def561860777da3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 19:31:12 +0000
Subject: [PATCH 2708/6226] mopac: 23.2 -> 23.2.1

---
 pkgs/by-name/mo/mopac/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mo/mopac/package.nix b/pkgs/by-name/mo/mopac/package.nix
index 180a4a692986..24406e3a619a 100644
--- a/pkgs/by-name/mo/mopac/package.nix
+++ b/pkgs/by-name/mo/mopac/package.nix
@@ -13,13 +13,13 @@ assert blas.isILP64 == lapack.isILP64;
 
 stdenv.mkDerivation rec {
   pname = "mopac";
-  version = "23.2";
+  version = "23.2.1";
 
   src = fetchFromGitHub {
     owner = "openmopac";
     repo = "mopac";
     rev = "v${version}";
-    hash = "sha256-P2BEXzclHJHSoaIIgCKVC3j63Af+J6rO0acwjv9ybbA=";
+    hash = "sha256-2+6mIxawYOqgsKRWDBLXMhP53VJTTGFN4AKunq4YD4o=";
   };
 
   nativeBuildInputs = [

From aa4d4c745c7da68d66ed25313973909181f212a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 19:38:15 +0000
Subject: [PATCH 2709/6226] lockbook: 25.10.13 -> 25.10.23

---
 pkgs/by-name/lo/lockbook/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lo/lockbook/package.nix b/pkgs/by-name/lo/lockbook/package.nix
index 60173444ec93..67d995610d14 100644
--- a/pkgs/by-name/lo/lockbook/package.nix
+++ b/pkgs/by-name/lo/lockbook/package.nix
@@ -12,16 +12,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "lockbook";
-  version = "25.10.13";
+  version = "25.10.23";
 
   src = fetchFromGitHub {
     owner = "lockbook";
     repo = "lockbook";
     tag = version;
-    hash = "sha256-TxNJpHQc18VVEnETNGpDSOn5yh+vHRyha8wXfipyyII=";
+    hash = "sha256-WZ6XbsIqoLfVRtxnqBPaspQQPYdn4gOrsz5WPrKFiH4=";
   };
 
-  cargoHash = "sha256-UBzngkgfTObhoh9MSq80gZqpJtmB6hFDtW2dYuGgQB4=";
+  cargoHash = "sha256-t7/UK/PwnUyw61mw9BlSQuT0qSeBKvFaKkS2ocmAViE=";
 
   doCheck = false; # there are no cli tests
   cargoBuildFlags = [

From 7de4aa31692b5936709b47c400f2a9aec6720d78 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 19:38:25 +0000
Subject: [PATCH 2710/6226] lockbook-desktop: 25.10.13 -> 25.10.23

---
 pkgs/by-name/lo/lockbook-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix
index 1e1cff27153f..5140f291ad1c 100644
--- a/pkgs/by-name/lo/lockbook-desktop/package.nix
+++ b/pkgs/by-name/lo/lockbook-desktop/package.nix
@@ -18,16 +18,16 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "lockbook-desktop";
-  version = "25.10.13";
+  version = "25.10.23";
 
   src = fetchFromGitHub {
     owner = "lockbook";
     repo = "lockbook";
     tag = version;
-    hash = "sha256-TxNJpHQc18VVEnETNGpDSOn5yh+vHRyha8wXfipyyII=";
+    hash = "sha256-WZ6XbsIqoLfVRtxnqBPaspQQPYdn4gOrsz5WPrKFiH4=";
   };
 
-  cargoHash = "sha256-UBzngkgfTObhoh9MSq80gZqpJtmB6hFDtW2dYuGgQB4=";
+  cargoHash = "sha256-t7/UK/PwnUyw61mw9BlSQuT0qSeBKvFaKkS2ocmAViE=";
 
   nativeBuildInputs = [
     pkg-config

From b3f62db201c5324ba03df121bc05c9c84ac35d3f Mon Sep 17 00:00:00 2001
From: 1000101 <b1000101@pm.me>
Date: Sat, 25 Oct 2025 14:57:08 +0200
Subject: [PATCH 2711/6226] pdfsam-basic: fix

---
 .../misc/pdfsam-basic/default.nix             | 104 ++++++++++++------
 pkgs/top-level/all-packages.nix               |   4 +-
 2 files changed, 69 insertions(+), 39 deletions(-)

diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix
index 2d73912750a6..b5c131015efb 100644
--- a/pkgs/applications/misc/pdfsam-basic/default.nix
+++ b/pkgs/applications/misc/pdfsam-basic/default.nix
@@ -3,63 +3,95 @@
   stdenv,
   makeDesktopItem,
   fetchurl,
-  jdk21,
+  temurin-jre-bin-21,
+  javaPackages,
   wrapGAppsHook3,
-  glib,
+  dpkg,
+  xorg,
+  gtk3,
+  libGL,
+  alsa-lib,
   nix-update-script,
+  desktop-file-utils,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "pdfsam-basic";
-  version = "5.3.2";
+  version = "5.4.1";
 
   src = fetchurl {
-    url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam-basic_${version}-1_amd64.deb";
-    hash = "sha256-Y0Q9uT6cyxIYTX0JxoS0r3TamPT1iLXr94Zex30AeWo=";
+    url = "https://github.com/torakiki/pdfsam/releases/download/v${finalAttrs.version}/pdfsam-basic_${finalAttrs.version}-1_amd64.deb";
+    hash = "sha256-iM0avC0YwxaB2prWbiKJZ9Fzd/HcdDWJg5IWRmNlVkM=";
   };
 
-  unpackPhase = ''
-    ar vx ${src}
-    tar xvf data.tar.gz
-  '';
-
-  nativeBuildInputs = [ wrapGAppsHook3 ];
-  buildInputs = [ glib ];
-
-  preFixup = ''
-    gappsWrapperArgs+=(--set JAVA_HOME "${jdk21}" --set PDFSAM_JAVA_PATH "${jdk21}")
-  '';
+  nativeBuildInputs = [
+    dpkg
+    wrapGAppsHook3
+    desktop-file-utils
+  ];
 
   installPhase = ''
-    cp -R opt/pdfsam-basic/ $out/
-    mkdir -p "$out"/share/icons
-    cp --recursive ${desktopItem}/share/applications $out/share
-    cp $out/icon.svg "$out"/share/icons/pdfsam-basic.svg
+    runHook preInstall
+    desktop-file-edit usr/share/applications/pdfsam-basic.desktop \
+         --set-key="Exec" --set-value="pdfsam-basic %F" \
+         --set-key="Path" --set-value="$out/share/pdfsam-basic" \
+         --set-icon="pdfsam-basic"
+       mkdir $out
+       cp -r usr/share $out/share
+       mkdir $out/share/pdfsam-basic
+       cp -r opt/pdfsam-basic/lib $out/share/pdfsam-basic/lib
+       install -Dm0644 opt/pdfsam-basic/splash.png $out/share/pdfsam-basic/splash.png
+       install -Dm0644 opt/pdfsam-basic/icon.svg $out/share/icons/hicolor/scalable/apps/pdfsam-basic.svg
+       mkdir $out/bin
+       makeWrapper ${temurin-jre-bin-21}/bin/java $out/bin/pdfsam-basic \
+         "''${gappsWrapperArgs[@]}" \
+         --set JAVA_HOME ${temurin-jre-bin-21} \
+         --set PDFSAM_JAVA_PATH ${temurin-jre-bin-21} \
+         --prefix LD_LIBRARY_PATH : ${
+           lib.makeLibraryPath [
+             javaPackages.openjfx23 # PDFSam Basic requires JDK 21 and JavaFX 23 https://github.com/torakiki/pdfsam/issues/785#issuecomment-3446564717
+             xorg.libXxf86vm
+             xorg.libXtst
+             gtk3
+             libGL
+             alsa-lib
+           ]
+         } \
+         --add-flags ${
+           lib.escapeShellArg (
+             lib.escapeShellArgs [
+               "--enable-preview"
+               "--module-path"
+               "${placeholder "out"}/share/pdfsam-basic/lib"
+               "--module"
+               "org.pdfsam.basic/org.pdfsam.basic.App"
+               "-Xmx512M"
+               "-splash:${placeholder "out"}/share/pdfsam-basic/splash.png"
+               "-Dapp.name=\"pdfsam-basic\""
+               "-Dapp.pid=\"$$\""
+               "-Dapp.home=\"${placeholder "out"}/share/pdfsam-basic\""
+               "-Dbasedir=\"${placeholder "out"}/share/pdfsam-basic\""
+               "-Dprism.lcdtext=false"
+             ]
+           )
+         }
+    runHook postInstall
   '';
 
-  desktopItem = makeDesktopItem {
-    name = pname;
-    exec = pname;
-    icon = pname;
-    comment = meta.description;
-    desktopName = "PDFsam Basic";
-    genericName = "PDF Split and Merge";
-    mimeTypes = [ "application/pdf" ];
-    categories = [ "Office" ];
-  };
+  dontWrapGApps = true;
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/torakiki/pdfsam";
     description = "Multi-platform software designed to extract pages, split, merge, mix and rotate PDF files";
     mainProgram = "pdfsam-basic";
-    sourceProvenance = with sourceTypes; [
+    sourceProvenance = with lib.sourceTypes; [
       binaryBytecode
       binaryNativeCode
     ];
-    license = licenses.agpl3Plus;
+    license = lib.licenses.agpl3Plus;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [ _1000101 ];
+    maintainers = with lib.maintainers; [ _1000101 ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e474e7028100..600b396b0b5d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11922,9 +11922,7 @@ with pkgs;
     lua = lua5;
   };
 
-  pdfsam-basic = callPackage ../applications/misc/pdfsam-basic {
-    jdk21 = openjdk21.override { enableJavaFX = true; };
-  };
+  pdfsam-basic = callPackage ../applications/misc/pdfsam-basic { };
 
   mupdf-headless = mupdf.override {
     enableX11 = false;

From e324c72211f075e07fca3debaa65d8f03eb1ec5b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 19:47:24 +0000
Subject: [PATCH 2712/6226] url-parser: 2.1.10 -> 2.1.11

---
 pkgs/by-name/ur/url-parser/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ur/url-parser/package.nix b/pkgs/by-name/ur/url-parser/package.nix
index dfed0d748921..54a9f90f2aa2 100644
--- a/pkgs/by-name/ur/url-parser/package.nix
+++ b/pkgs/by-name/ur/url-parser/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "url-parser";
-  version = "2.1.10";
+  version = "2.1.11";
 
   src = fetchFromGitHub {
     owner = "thegeeklab";
     repo = "url-parser";
     tag = "v${version}";
-    hash = "sha256-5QpcioReUAO11QOLbU+KtUd4Zs+hi/lvNvEzDpDQbhU=";
+    hash = "sha256-5llWyqIO5vsjvf8NChssgWaiJ9ENUN72sy4shjmA9co=";
   };
 
-  vendorHash = "sha256-3TOUdwBq6TgzZIDtaoIoi2ur83DmAjBfi1ILJIGpyJU=";
+  vendorHash = "sha256-SHW/l1TVq5zzYcjhkIMbF5yF5KKIbMfPgrASNQ9A3VU=";
 
   ldflags = [
     "-s"

From 5641e202cbe5f1217be7601c6469d7abc2e4c02b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 24 Oct 2025 21:40:43 -0700
Subject: [PATCH 2713/6226] python3Packages.pydroplet: init at 2.3.4

---
 .../python-modules/pydroplet/default.nix      | 43 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/python-modules/pydroplet/default.nix

diff --git a/pkgs/development/python-modules/pydroplet/default.nix b/pkgs/development/python-modules/pydroplet/default.nix
new file mode 100644
index 000000000000..e31c9ab1f77e
--- /dev/null
+++ b/pkgs/development/python-modules/pydroplet/default.nix
@@ -0,0 +1,43 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytest-asyncio,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "pydroplet";
+  version = "2.3.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Hydrific";
+    repo = "pydroplet";
+    tag = "v${version}";
+    hash = "sha256-cVftXG7sKDpGRRb2jLlFxgCH2+rA6hLYTUqWL1kvh+E=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+  ];
+
+  pythonImportsCheck = [ "pydroplet" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/Hydrific/pydroplet/releases/tag/${src.tag}";
+    description = "Package to connect to a Droplet device";
+    homepage = "https://github.com/Hydrific/pydroplet";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 99a8ce5fcd78..7d789e51b7fd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12922,6 +12922,8 @@ self: super: with self; {
 
   pydroid-ipcam = callPackage ../development/python-modules/pydroid-ipcam { };
 
+  pydroplet = callPackage ../development/python-modules/pydroplet { };
+
   pydruid = callPackage ../development/python-modules/pydruid { };
 
   pydsdl = callPackage ../development/python-modules/pydsdl { };

From eccb2065026e28fe71fa2b2617f02efc37e012bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 24 Oct 2025 21:41:32 -0700
Subject: [PATCH 2714/6226] home-assistant: support droplet component

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index f45e2ac8cbf4..c559f4fcde51 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -1329,7 +1329,8 @@
       ];
     "droplet" =
       ps: with ps; [
-      ]; # missing inputs: pydroplet
+        pydroplet
+      ];
     "dsmr" =
       ps: with ps; [
         dsmr-parser
@@ -7174,6 +7175,7 @@
     "downloader"
     "dremel_3d_printer"
     "drop_connect"
+    "droplet"
     "dsmr"
     "dsmr_reader"
     "duckdns"

From e97de913d245b32ba9c6131035737a8e1065b49a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 19:52:13 +0000
Subject: [PATCH 2715/6226] fiddler-everywhere: 7.3.0 -> 7.4.0

---
 pkgs/by-name/fi/fiddler-everywhere/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fi/fiddler-everywhere/package.nix b/pkgs/by-name/fi/fiddler-everywhere/package.nix
index bdfac5e09e92..93baba61ba20 100644
--- a/pkgs/by-name/fi/fiddler-everywhere/package.nix
+++ b/pkgs/by-name/fi/fiddler-everywhere/package.nix
@@ -8,11 +8,11 @@
 
 let
   pname = "fiddler-everywhere";
-  version = "7.3.0";
+  version = "7.4.0";
 
   src = fetchurl {
     url = "https://downloads.getfiddler.com/linux/fiddler-everywhere-${version}.AppImage";
-    hash = "sha256-M1SMWtIdgYpC+cwrN8Z6T+7tj4y07hho3akuy9j/l98=";
+    hash = "sha256-9YkYy+vzW88rpcYTrCsfQXXJL8W8W4D84Cf8e9zEcJg=";
   };
 
   appimageContents = appimageTools.extract {

From 2610da31cd053a3408b08d97d7ee343c9f033727 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Sat, 25 Oct 2025 16:52:39 -0300
Subject: [PATCH 2716/6226] vimPlugins.showkeys: init at 2025-05-24

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 21a4b22f4d4b..55462b830b32 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -13822,6 +13822,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  showkeys = buildVimPlugin {
+    pname = "showkeys";
+    version = "2025-05-24";
+    src = fetchFromGitHub {
+      owner = "nvzone";
+      repo = "showkeys";
+      rev = "cb0a50296f11f1e585acffba8c253b9e8afc1f84";
+      sha256 = "1cvgfxvi5l753hn9ijzbb8x9bi2n12gd6n9j8lcvcq9xv43d4zws";
+    };
+    meta.homepage = "https://github.com/nvzone/showkeys/";
+    meta.hydraPlatforms = [ ];
+  };
+
   sidekick-nvim = buildVimPlugin {
     pname = "sidekick.nvim";
     version = "2025-10-20";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 99fd521eb44c..65593dd83c55 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1061,6 +1061,7 @@ https://github.com/jaxbot/semantic-highlight.vim/,,
 https://github.com/numirias/semshi/,,
 https://github.com/junegunn/seoul256.vim/,,
 https://github.com/osyo-manga/shabadou.vim/,,
+https://github.com/nvzone/showkeys/,HEAD,
 https://github.com/folke/sidekick.nvim/,HEAD,
 https://github.com/AndrewRadev/sideways.vim/,,
 https://github.com/skim-rs/skim.vim/,,

From da39deb6731eb17a04388c06156c78c791236e06 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 25 Oct 2025 15:53:45 -0400
Subject: [PATCH 2717/6226] ocamlPackages.dns: 10.2.1 -> 10.2.2

Diff: https://github.com/mirage/ocaml-dns/compare/v10.2.1...v10.2.2
---
 pkgs/development/ocaml-modules/dns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/dns/default.nix b/pkgs/development/ocaml-modules/dns/default.nix
index 1c44a92bf2a1..539005aac186 100644
--- a/pkgs/development/ocaml-modules/dns/default.nix
+++ b/pkgs/development/ocaml-modules/dns/default.nix
@@ -18,13 +18,13 @@
 
 buildDunePackage (finalAttrs: {
   pname = "dns";
-  version = "10.2.1";
+  version = "10.2.2";
 
   minimalOCamlVersion = "4.13";
 
   src = fetchurl {
     url = "https://github.com/mirage/ocaml-dns/releases/download/v${finalAttrs.version}/dns-${finalAttrs.version}.tbz";
-    hash = "sha256-tIjPTFFP1X1KLLKbmdQjSuaEXv8NXnmxBZ93n3NCR4o=";
+    hash = "sha256-USPXFn9fs6WrcM8LPMyWUInsRA3Aft6r+MBWjuc3p/A=";
   };
 
   propagatedBuildInputs = [

From a0086fb8bafd94537ff19b9fa749e6cffe5fa589 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 20:05:12 +0000
Subject: [PATCH 2718/6226] python3Packages.huey: 2.5.3 -> 2.5.4

---
 pkgs/development/python-modules/huey/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/huey/default.nix b/pkgs/development/python-modules/huey/default.nix
index c91c7ffd8c0b..47dad295c46e 100644
--- a/pkgs/development/python-modules/huey/default.nix
+++ b/pkgs/development/python-modules/huey/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "huey";
-  version = "2.5.3";
+  version = "2.5.4";
 
   format = "pyproject";
 
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "coleifer";
     repo = "huey";
     tag = version;
-    hash = "sha256-Avy5aMYoeIhO7Q83s2W4o6RBMaVFdRBqa7HGNIGNOqE=";
+    hash = "sha256-PIMnPb6QQh20/LPfk8LaidhLHMrL8dHigLigyy2ki4Q=";
   };
 
   nativeBuildInputs = [

From 93ed0a8ab3e79bf2b8ca3164614cfeb3b5221520 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 25 Oct 2025 20:06:34 +0000
Subject: [PATCH 2719/6226] python3Packages.setuptools-dso: cleanup, skip
 failing test on darwin

---
 .../python-modules/setuptools-dso/default.nix | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/setuptools-dso/default.nix b/pkgs/development/python-modules/setuptools-dso/default.nix
index 62244825237e..5c33d1fd89b8 100644
--- a/pkgs/development/python-modules/setuptools-dso/default.nix
+++ b/pkgs/development/python-modules/setuptools-dso/default.nix
@@ -1,10 +1,15 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # tests
   nose2,
   pytestCheckHook,
-  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -12,10 +17,11 @@ buildPythonPackage rec {
   version = "2.12.2";
   pyproject = true;
 
-  src = fetchPypi {
-    pname = "setuptools_dso";
-    inherit version;
-    hash = "sha256-evt2+T0Tzp2iRQJnbY8tTbw9o1xiRflfJ9+fp0RQeaQ=";
+  src = fetchFromGitHub {
+    owner = "epics-base";
+    repo = "setuptools_dso";
+    tag = version;
+    hash = "sha256-YYm3mTA443vcD/4vHa7EgPzvDDzBic64NWWJDQYQHKs=";
   };
 
   build-system = [ setuptools ];
@@ -25,10 +31,16 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  meta = with lib; {
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # distutils.compilers.C.errors.CompileError: command '/nix/store/...-clang-wrapper-21.1.2/bin/clang' failed with exit code 1
+    # fatal error: 'string' file not found
+    "test_cxx"
+  ];
+
+  meta = {
     description = "Setuptools extension for building non-Python Dynamic Shared Objects";
     homepage = "https://github.com/mdavidsaver/setuptools_dso";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ marius851000 ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ marius851000 ];
   };
 }

From ff7d6c7e4d5cf68bd872a030942cc23514df6d05 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 25 Oct 2025 19:14:18 +0000
Subject: [PATCH 2720/6226] python3Packages.tilequant: fix build, cleanup

---
 .../python-modules/tilequant/default.nix      | 37 +++++++++++--------
 1 file changed, 22 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/tilequant/default.nix b/pkgs/development/python-modules/tilequant/default.nix
index 0d5816150f96..15e879c0f5f4 100644
--- a/pkgs/development/python-modules/tilequant/default.nix
+++ b/pkgs/development/python-modules/tilequant/default.nix
@@ -1,13 +1,16 @@
 {
   lib,
   buildPythonPackage,
-  click,
-  fetchPypi,
-  ordered-set,
-  pillow,
-  pythonOlder,
+  fetchFromGitHub,
+
+  # build-system
   setuptools,
   setuptools-dso,
+
+  # dependencies
+  click,
+  ordered-set,
+  pillow,
   sortedcollections,
 }:
 
@@ -16,19 +19,23 @@ buildPythonPackage rec {
   version = "1.2.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-0i7brL/hn8SOj3q/rpOcOQ9QW/4Mew2fr0Y42k4K9UI=";
+  src = fetchFromGitHub {
+    owner = "SkyTemple";
+    repo = "tilequant";
+    tag = version;
+    # Fetch tilequant source files
+    fetchSubmodules = true;
+    hash = "sha256-MgyKLwVdL2DRR8J88q7Q57rQiX4FTOlQ5rTY3UuhaJM=";
   };
 
-  pythonRelaxDeps = [ "pillow" ];
-
   build-system = [
     setuptools
+    setuptools-dso
   ];
 
+  pythonRelaxDeps = [
+    "click"
+  ];
   dependencies = [
     click
     ordered-set
@@ -41,12 +48,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "tilequant" ];
 
-  meta = with lib; {
+  meta = {
     description = "Tool for quantizing image colors using tile-based palette restrictions";
     homepage = "https://github.com/SkyTemple/tilequant";
     changelog = "https://github.com/SkyTemple/tilequant/releases/tag/${version}";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ marius851000 ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ marius851000 ];
     mainProgram = "tilequant";
   };
 }

From 1e7bed452d71cd2fcd8e87dd360865fa9e97b667 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 8 Oct 2025 21:17:58 +0000
Subject: [PATCH 2721/6226] fire: 1.5.0b-unstable-2025-09-20 -> 1.5.0

---
 pkgs/by-name/fi/fire/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/fi/fire/package.nix b/pkgs/by-name/fi/fire/package.nix
index c5d17a81a6ff..4d250aa84026 100644
--- a/pkgs/by-name/fi/fire/package.nix
+++ b/pkgs/by-name/fi/fire/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   fetchFromGitHub,
   runCommand,
-  unstableGitUpdater,
+  gitUpdater,
   catch2_3,
   cmake,
   fontconfig,
@@ -78,14 +78,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fire";
-  version = "1.5.0b-unstable-2025-09-20";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "jerryuhoo";
     repo = "Fire";
-    rev = "34a424a4fc50984213b6e98e3aaae3dcb8e960c4";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-ZTsZ/J5aeyjg4pxhjjIkgoTB5sSg2jpeKAp/uc4V+aQ=";
+    hash = "sha256-i8viPGErCuLSuRWstDtLwQ3XBz9gfiHin7Zvvq8l3kA=";
   };
 
   postPatch =
@@ -162,7 +162,7 @@ stdenv.mkDerivation (finalAttrs: {
     patchelf --add-rpath ${lib.makeLibraryPath x11Libs} $out/bin/Fire
   '';
 
-  passthru.updateScript = unstableGitUpdater { tagPrefix = "v"; };
+  passthru.updateScript = gitUpdater { rev-prefix = "v"; };
 
   meta = {
     description = "Multi-band distortion plugin by Wings";

From 6583a4efcd4e326c619a7171091eadf0930c916c Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 25 Oct 2025 16:26:35 -0400
Subject: [PATCH 2722/6226] minify: 2.23.1 -> 2.24.5

Changelog: https://github.com/tdewolff/minify/releases/tag/v2.24.5
---
 pkgs/by-name/mi/minify/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mi/minify/package.nix b/pkgs/by-name/mi/minify/package.nix
index 695615cac367..4aef64b4ca4c 100644
--- a/pkgs/by-name/mi/minify/package.nix
+++ b/pkgs/by-name/mi/minify/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "minify";
-  version = "2.23.1";
+  version = "2.24.5";
 
   src = fetchFromGitHub {
     owner = "tdewolff";
     repo = "minify";
     rev = "v${version}";
-    hash = "sha256-v0KLQlf2WhI18uanVtvWfX6/7s9ZtfPM5AGyEIHZf54=";
+    hash = "sha256-0OmL/HG4pt2iDha6NcQoUKWz2u9vsLH6QzYhHb+mTL0=";
   };
 
-  vendorHash = "sha256-Btc5d/wwDmjhyDZwAIHDSbXuh8xqq/nIjTAkPsdeHU4=";
+  vendorHash = "sha256-QS0vffGJaaDhXvc7ylJmFJ1s83kaIqFWsBXNWVozt1k=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From e7da7318ae901cc2890100cae9fdc854aec7d6e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 20:27:50 +0000
Subject: [PATCH 2723/6226] ghostfolio: 2.209.0 -> 2.211.0

---
 pkgs/by-name/gh/ghostfolio/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix
index 1a2a7f5880a0..5e3d2437af2f 100644
--- a/pkgs/by-name/gh/ghostfolio/package.nix
+++ b/pkgs/by-name/gh/ghostfolio/package.nix
@@ -11,13 +11,13 @@
 
 buildNpmPackage rec {
   pname = "ghostfolio";
-  version = "2.209.0";
+  version = "2.211.0";
 
   src = fetchFromGitHub {
     owner = "ghostfolio";
     repo = "ghostfolio";
     tag = version;
-    hash = "sha256-2tXapVGZ3p+Fq/CD8XOcUMHRwQUiIZdm+Rl+xQL5HBI=";
+    hash = "sha256-RoIOk0MIf1IAQLPO4MwemkXqQfJuDZtYYqn+OS6IUb0=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-WtvCSQzzokZ9tGMp7G7M1ZfoPxjQ5OiVNR4Wa4A7vTE=";
+  npmDepsHash = "sha256-Isy32xdxWlsGflqtcDJ6/lNaCA+IRbEOP8Z/BI0uV0s=";
 
   nativeBuildInputs = [
     prisma

From f0715c03b8b1453a9163ab34126a0990ecea5a76 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Sat, 25 Oct 2025 22:28:11 +0200
Subject: [PATCH 2724/6226] bindle: mark as vulnerable

---
 pkgs/by-name/bi/bindle/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/bi/bindle/package.nix b/pkgs/by-name/bi/bindle/package.nix
index 97e6c2589aa7..e056c6205d5f 100644
--- a/pkgs/by-name/bi/bindle/package.nix
+++ b/pkgs/by-name/bi/bindle/package.nix
@@ -42,5 +42,9 @@ rustPlatform.buildRustPackage rec {
     license = licenses.asl20;
     maintainers = [ ];
     platforms = platforms.unix;
+
+    knownVulnerabilities = [
+      "'bindle' is vulnerable to CVE-2025-62518 and upstream has been archived"
+    ];
   };
 }

From 1a70c49e9ba47b4958f87c725efdf76470c8d5b4 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Fri, 24 Oct 2025 22:40:50 +0200
Subject: [PATCH 2725/6226] bindle: drop

---
 pkgs/by-name/bi/bindle/package.nix | 50 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 2 files changed, 1 insertion(+), 50 deletions(-)
 delete mode 100644 pkgs/by-name/bi/bindle/package.nix

diff --git a/pkgs/by-name/bi/bindle/package.nix b/pkgs/by-name/bi/bindle/package.nix
deleted file mode 100644
index e056c6205d5f..000000000000
--- a/pkgs/by-name/bi/bindle/package.nix
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-  pkg-config,
-  openssl,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "bindle";
-  version = "0.9.1";
-
-  src = fetchFromGitHub {
-    owner = "deislabs";
-    repo = "bindle";
-    rev = "v${version}";
-    sha256 = "sha256-xehn74fqP0tEtP4Qy9TRGv+P2QoHZLxRHzGoY5cQuv0=";
-  };
-
-  postPatch = ''
-    rm .cargo/config
-  '';
-
-  doCheck = false; # Tests require a network
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ openssl ];
-
-  cargoHash = "sha256-cTgR1yp6TFwotm5VEG5e0O7R1zCMbQmcH2zmRmF7cjI=";
-
-  cargoBuildFlags = [
-    "--bin"
-    "bindle"
-    "--bin"
-    "bindle-server"
-    "--all-features"
-  ];
-
-  meta = with lib; {
-    description = "Object Storage for Collections";
-    homepage = "https://github.com/deislabs/bindle";
-    license = licenses.asl20;
-    maintainers = [ ];
-    platforms = platforms.unix;
-
-    knownVulnerabilities = [
-      "'bindle' is vulnerable to CVE-2025-62518 and upstream has been archived"
-    ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dc6dc101c845..fd7b5da4ff27 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -538,6 +538,7 @@ mapAliases {
   betterbird-unwrapped = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25
   bfc = throw "bfc has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
   bibata-extra-cursors = throw "bibata-cursors has been removed as it was broken"; # Added 2024-07-15
+  bindle = throw "bindle has been removed since it is vulnerable to CVE-2025-62518 and upstream has been archived"; # Added 2025-10-24
   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
   bitcoin-unlimited = throw "bitcoin-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15

From a2649fc89b69dc039abb55545d55cf6c3a0b559e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 20:31:12 +0000
Subject: [PATCH 2726/6226] crawley: 1.7.13 -> 1.7.14

---
 pkgs/by-name/cr/crawley/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cr/crawley/package.nix b/pkgs/by-name/cr/crawley/package.nix
index b1df12bffedc..41eb38b66268 100644
--- a/pkgs/by-name/cr/crawley/package.nix
+++ b/pkgs/by-name/cr/crawley/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule rec {
   pname = "crawley";
-  version = "1.7.13";
+  version = "1.7.14";
 
   src = fetchFromGitHub {
     owner = "s0rg";
     repo = "crawley";
     rev = "v${version}";
-    hash = "sha256-36pdesO1jfCMue4Equ+qFpkjN2tXbOpQ32P9a/c+7aA=";
+    hash = "sha256-2TE7WbW8wm0PSJSLRVIvHd7f8pzJghO40l4LVAtuO0g=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
-  vendorHash = "sha256-IyrySlg2zj+vqrFR821zdysVguh4UZG1bxnC+GVoLr4=";
+  vendorHash = "sha256-igLEQT08Yeq0WCdK0I8Bsn9NewKM9Dj/Nfh6lsGk+KM=";
 
   ldflags = [
     "-w"

From a486f07159278710c6f20bafc9b0fb46bec593db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 20:32:04 +0000
Subject: [PATCH 2727/6226] home-assistant-custom-components.solax_modbus:
 2025.10.4 -> 2025.10.6

---
 .../home-assistant/custom-components/solax_modbus/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
index 5a27ddd671eb..96316e9241e5 100644
--- a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "wills106";
   domain = "solax_modbus";
-  version = "2025.10.4";
+  version = "2025.10.6";
 
   src = fetchFromGitHub {
     owner = "wills106";
     repo = "homeassistant-solax-modbus";
     tag = version;
-    hash = "sha256-ai9Dt68TM2qDbWhypct6KdMwsLbrnDocL6GIR7D0guw=";
+    hash = "sha256-BZ/UcBTZyaLAuJ34blC3KdFRIGRR4Qe1tkJqJAP21IA=";
   };
 
   dependencies = [ pymodbus ];

From ee94892bd8d6c32cbce6d366cef1bfdd4b573999 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 17:34:12 -0300
Subject: [PATCH 2728/6226] postgresql13Packages.lantern: fix build with cmake4

---
 pkgs/servers/sql/postgresql/ext/lantern.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/servers/sql/postgresql/ext/lantern.nix b/pkgs/servers/sql/postgresql/ext/lantern.nix
index 449be22a31ec..f4cb17b0d4c7 100644
--- a/pkgs/servers/sql/postgresql/ext/lantern.nix
+++ b/pkgs/servers/sql/postgresql/ext/lantern.nix
@@ -21,6 +21,9 @@ postgresqlBuildExtension (finalAttrs: {
   };
 
   postPatch = ''
+    substituteInPlace lantern_hnsw/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.3)" "cmake_minimum_required(VERSION 3.10)"
+
     patchShebangs --build lantern_hnsw/scripts/link_llvm_objects.sh
   '';
 

From 34b1ef71a6d8fc1c59c5f622c993998212bd4a6f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 20:44:44 +0000
Subject: [PATCH 2729/6226] python3Packages.prophet: 1.2.0 -> 1.2.1

---
 pkgs/development/python-modules/prophet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/prophet/default.nix b/pkgs/development/python-modules/prophet/default.nix
index 63b037e2c07a..e9fdf7136f6b 100644
--- a/pkgs/development/python-modules/prophet/default.nix
+++ b/pkgs/development/python-modules/prophet/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "prophet";
-  version = "1.2.0";
+  version = "1.2.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "facebook";
     repo = "prophet";
     tag = "v${version}";
-    hash = "sha256-SCd/PhchLbkb63HEEmRlfX2VruLo2jpweRkidgqNzE8=";
+    hash = "sha256-rG21Q4V0XQjReIHd7vV/aFOUvnLEw/dm8AobXRDUfuA=";
   };
 
   sourceRoot = "${src.name}/python";

From 1dda4a087c5faacc62433871bf5f66c2b1aa34fb Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Sat, 25 Oct 2025 22:45:35 +0200
Subject: [PATCH 2730/6226] stalwart-mail: Fix RiscV cross-compilation

---
 pkgs/by-name/st/stalwart-mail/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix
index e99bccc85287..e5b3bf0d62a6 100644
--- a/pkgs/by-name/st/stalwart-mail/package.nix
+++ b/pkgs/by-name/st/stalwart-mail/package.nix
@@ -31,8 +31,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-pjmAIC7g8SbMxZvTgaXH8GrRPhITDjC5psJpfT+vV6M=";
 
-  nativeBuildInputs = [
+  depsBuildBuild = [
     pkg-config
+    zstd
+  ];
+
+  nativeBuildInputs = [
     protobuf
     rustPlatform.bindgenHook
   ];

From db5f53dc540dea261a85f623ca4fc1c089da9ed7 Mon Sep 17 00:00:00 2001
From: Redlonghead <git@beardit.net>
Date: Wed, 15 Oct 2025 19:11:42 -0500
Subject: [PATCH 2731/6226] pakku: 1.2.1 -> 1.3.2

---
 pkgs/by-name/pa/pakku/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/pakku/package.nix b/pkgs/by-name/pa/pakku/package.nix
index a2797f8228d7..aabd286227cd 100644
--- a/pkgs/by-name/pa/pakku/package.nix
+++ b/pkgs/by-name/pa/pakku/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pakku";
-  version = "1.2.1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "juraj-hrivnak";
     repo = "Pakku";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-hWQq2awZV07wX4jK9K/QoXekrlZukuDv6CtY1O09ZkQ=";
+    hash = "sha256-PVET+A9LVWnqLCXz3R9EP7gk6GOViSzhRLrXTjNFPaA=";
   };
 
   gradleBuildTask = "jvmJar";

From 8106c50594681ca62cfe7e0e11c5be433f95f9b4 Mon Sep 17 00:00:00 2001
From: Redlonghead <git@beardit.net>
Date: Sun, 19 Oct 2025 21:27:29 -0500
Subject: [PATCH 2732/6226] pakku: fix update script

---
 pkgs/by-name/pa/pakku/package.nix | 8 +-------
 pkgs/by-name/pa/pakku/update.sh   | 5 +++++
 2 files changed, 6 insertions(+), 7 deletions(-)
 create mode 100755 pkgs/by-name/pa/pakku/update.sh

diff --git a/pkgs/by-name/pa/pakku/package.nix b/pkgs/by-name/pa/pakku/package.nix
index aabd286227cd..aca01a279a31 100644
--- a/pkgs/by-name/pa/pakku/package.nix
+++ b/pkgs/by-name/pa/pakku/package.nix
@@ -6,7 +6,6 @@
   makeWrapper,
   fetchFromGitHub,
   versionCheckHook,
-  nix-update-script,
   installShellFiles,
   stripJavaArchivesHook,
 }:
@@ -64,12 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      "--subpackage"
-      "mitmCache"
-    ];
-  };
+  passthru.updateScript = ./update.sh;
 
   meta = {
     description = "Multiplatform modpack manager for Minecraft: Java Edition";
diff --git a/pkgs/by-name/pa/pakku/update.sh b/pkgs/by-name/pa/pakku/update.sh
new file mode 100755
index 000000000000..14e2b06f2479
--- /dev/null
+++ b/pkgs/by-name/pa/pakku/update.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nix-update
+
+nix-update pakku
+$(nix-build -A pakku.mitmCache.updateScript)

From 964195d1cd0bd2d7bc4d92eefdf6d6ca9468952d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 20:56:21 +0000
Subject: [PATCH 2733/6226] python3Packages.types-regex: 2025.9.18.20250921 ->
 2025.10.23.20251023

---
 pkgs/development/python-modules/types-regex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/types-regex/default.nix b/pkgs/development/python-modules/types-regex/default.nix
index 669d7361fca4..13c18db616f3 100644
--- a/pkgs/development/python-modules/types-regex/default.nix
+++ b/pkgs/development/python-modules/types-regex/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-regex";
-  version = "2025.9.18.20250921";
+  version = "2025.10.23.20251023";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_regex";
     inherit version;
-    hash = "sha256-4XAMIbHDEpDkpt1iWE7R8dadcE7RZ2toqO2i0dJCDD8=";
+    hash = "sha256-dfAjvwrwV+AVennpnmZpBTe+uzXZA9uPKbTlwtO+54I=";
   };
 
   build-system = [

From 394fcb974bc3dd9d54a065b166ebc05debd25df4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 25 Oct 2025 23:13:32 +0200
Subject: [PATCH 2734/6226] nixos/synapse-auto-compressor: remove alias usage

---
 nixos/modules/services/matrix/synapse-auto-compressor.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/matrix/synapse-auto-compressor.nix b/nixos/modules/services/matrix/synapse-auto-compressor.nix
index 54838328e80d..3c91e3873b00 100644
--- a/nixos/modules/services/matrix/synapse-auto-compressor.nix
+++ b/nixos/modules/services/matrix/synapse-auto-compressor.nix
@@ -30,7 +30,7 @@ in
   options = {
     services.synapse-auto-compressor = {
       enable = lib.mkEnableOption "synapse-auto-compressor";
-      package = lib.mkPackageOption pkgs "rust-synapse-state-compress" { };
+      package = lib.mkPackageOption pkgs "rust-synapse-compress-state" { };
       postgresUrl = lib.mkOption {
         default =
           let

From 0d73e38bd891b480e99c13e022627d20825880f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 21:15:59 +0000
Subject: [PATCH 2735/6226] python3Packages.google-cloud-shell: 1.12.1 ->
 1.13.0

---
 .../development/python-modules/google-cloud-shell/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-shell/default.nix b/pkgs/development/python-modules/google-cloud-shell/default.nix
index 8fd3e422f84b..0831b31b1e30 100644
--- a/pkgs/development/python-modules/google-cloud-shell/default.nix
+++ b/pkgs/development/python-modules/google-cloud-shell/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-shell";
-  version = "1.12.1";
+  version = "1.13.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_shell";
     inherit version;
-    hash = "sha256-nRuFxyxtJmKiI0BtV8VEu8mRZ5JU2S0gGU9aef9I6Zg=";
+    hash = "sha256-B6SZJm7rGZDIFbF0kHPcBidBF0d+ONIKtUcpjwslkgE=";
   };
 
   build-system = [ setuptools ];

From a780fc9b08c925f26a44c955c3bb23d90b46a5ce Mon Sep 17 00:00:00 2001
From: azahi <azat@bahawi.net>
Date: Sun, 26 Oct 2025 00:20:28 +0300
Subject: [PATCH 2736/6226] nelm: 1.14.1 -> 1.16.0

---
 pkgs/by-name/ne/nelm/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ne/nelm/package.nix b/pkgs/by-name/ne/nelm/package.nix
index 17eb53bbe9f2..962726cc8abd 100644
--- a/pkgs/by-name/ne/nelm/package.nix
+++ b/pkgs/by-name/ne/nelm/package.nix
@@ -9,24 +9,23 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "nelm";
-  version = "1.14.1";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "nelm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yAd+4Up5SDVlrwa/46lQmCS257T16Wf6PSo7an07H8I=";
+    hash = "sha256-PDWx/J6OmF5/daZr5c66CD3uMjS8GL3U1dRwMlXjS5Y=";
   };
 
-  vendorHash = "sha256-yd9qSQi7ktbI9b5eaTc98TjhxDsBVvh9qrf3+F2Twu4=";
+  vendorHash = "sha256-+57gKrXOzlKH5VRdZyKxOyg90aSKowPO9JPHVN92/GA=";
 
   subPackages = [ "cmd/nelm" ];
 
   ldflags = [
     "-s"
     "-w"
-    "-X github.com/werf/nelm/internal/common.Brand=Nelm"
-    "-X github.com/werf/nelm/internal/common.Version=${finalAttrs.version}"
+    "-X github.com/werf/nelm/pkg/common.Version=${finalAttrs.version}"
   ];
 
   nativeBuildInputs = [ installShellFiles ];

From 28c4c5b16666d373fd7bb559ad6ddbea62f73d22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 23 Sep 2025 01:13:59 +0000
Subject: [PATCH 2737/6226] elasticmq-server-bin: 1.6.14 -> 1.6.15

---
 pkgs/by-name/el/elasticmq-server-bin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/el/elasticmq-server-bin/package.nix b/pkgs/by-name/el/elasticmq-server-bin/package.nix
index 6b1d2860f4bc..5490d46aced7 100644
--- a/pkgs/by-name/el/elasticmq-server-bin/package.nix
+++ b/pkgs/by-name/el/elasticmq-server-bin/package.nix
@@ -15,11 +15,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "elasticmq-server";
-  version = "1.6.14";
+  version = "1.6.15";
 
   src = fetchurl {
     url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/elasticmq-server-${finalAttrs.version}.jar";
-    sha256 = "sha256-HVllLHz6zutonaLFwgyQKYSZxfp5QMslxf/PlzGWyG4=";
+    sha256 = "sha256-alxRZFx+Ulk4KYnlIVOClajk2MmfnfUooku2dMJd7c4=";
   };
 
   # don't do anything?

From 5a32e5f9823586d8b6f14e2408b044da23fed048 Mon Sep 17 00:00:00 2001
From: azahi <azat@bahawi.net>
Date: Sun, 26 Oct 2025 00:26:23 +0300
Subject: [PATCH 2738/6226] tbls: 1.90.0 -> 1.91.1

---
 pkgs/by-name/tb/tbls/package.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix
index 588da1a82ca5..24daf0ce3d22 100644
--- a/pkgs/by-name/tb/tbls/package.nix
+++ b/pkgs/by-name/tb/tbls/package.nix
@@ -1,29 +1,31 @@
 {
-  lib,
-  stdenv,
   buildGoModule,
   fetchFromGitHub,
   installShellFiles,
-  testers,
-  tbls,
+  lib,
+  stdenv,
+  versionCheckHook,
 }:
 
 buildGoModule rec {
   pname = "tbls";
-  version = "1.90.0";
+  version = "1.91.1";
 
   src = fetchFromGitHub {
     owner = "k1LoW";
     repo = "tbls";
     tag = "v${version}";
-    hash = "sha256-1CiiRmooy1KG6WsdRyLkttiEGX0ObPyJ/s97DcQXwUU=";
+    hash = "sha256-H0gL8EDJLIUhW5zV57zmWs2VU21GmqyKNTqB6AiXrKk=";
   };
 
-  vendorHash = "sha256-hupOff2cJ+UrJFgMyDu3XYvEjyE/XvvyqiQq408wJsw=";
+  vendorHash = "sha256-HE3/h77APsNRitAAo4R/5tWrX36IPcJRAUFv6M6P6x4=";
 
   excludedPackages = [ "scripts/jsonschema" ];
 
-  nativeBuildInputs = [ installShellFiles ];
+  nativeBuildInputs = [
+    installShellFiles
+    versionCheckHook
+  ];
 
   ldflags = [
     "-s"
@@ -46,11 +48,9 @@ buildGoModule rec {
       --zsh <($out/bin/tbls completion zsh)
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = tbls;
-    command = "tbls version";
-    inherit version;
-  };
+  doInstallCheck = true;
+
+  versionCheckProgramArg = "version";
 
   meta = {
     description = "Tool to generate documentation based on a database structure";

From 713b2512daf422f4f7e5a844d229aa0d74eb66e0 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 18:44:11 -0300
Subject: [PATCH 2739/6226] mirtk: fix build with cmake4

---
 pkgs/by-name/mi/mirtk/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/mi/mirtk/package.nix b/pkgs/by-name/mi/mirtk/package.nix
index 04710e107ec5..ddbcbb0db5a3 100644
--- a/pkgs/by-name/mi/mirtk/package.nix
+++ b/pkgs/by-name/mi/mirtk/package.nix
@@ -46,6 +46,15 @@ stdenv.mkDerivation {
     rm CMake/Modules/FindTBB.cmake
     substituteInPlace CMake/Modules/CMakeLists.txt \
       --replace-fail '"FindTBB.cmake"' ""
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.4 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+
+    substituteInPlace CMake/Basis/{BasisSettings.cmake,ProjectTools.cmake,configure_script.cmake.in} \
+      --replace-fail "cmake_minimum_required (VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+
+    substituteInPlace {ThirdParty/LBFGS,Packages/Deformable,Packages/Mapping,Packages/Scripting,Packages/Viewer}/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   postInstall = ''

From c905d0aa952ccbef0113ddc9e48e0a453156b4e3 Mon Sep 17 00:00:00 2001
From: Danny Breyfogle <27653146+dbreyfogle@users.noreply.github.com>
Date: Thu, 23 Oct 2025 21:21:15 -0700
Subject: [PATCH 2740/6226] github-copilot-cli: fix build by switching from
 buildNpmPackage to stdenv.mkDerivation

---
 .../gi/github-copilot-cli/package-lock.json   | 58 -------------------
 .../by-name/gi/github-copilot-cli/package.nix | 27 ++++++---
 2 files changed, 20 insertions(+), 65 deletions(-)
 delete mode 100644 pkgs/by-name/gi/github-copilot-cli/package-lock.json

diff --git a/pkgs/by-name/gi/github-copilot-cli/package-lock.json b/pkgs/by-name/gi/github-copilot-cli/package-lock.json
deleted file mode 100644
index 2d53b9d57986..000000000000
--- a/pkgs/by-name/gi/github-copilot-cli/package-lock.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-  "name": "@github/copilot",
-  "version": "0.0.328",
-  "lockfileVersion": 3,
-  "requires": true,
-  "packages": {
-    "": {
-      "name": "@github/copilot",
-      "version": "0.0.328",
-      "dependencies": {
-        "keytar-forked-forked": "^7.10.2",
-        "node-pty": "npm:@devm33/node-pty@^1.0.8"
-      },
-      "bin": {
-        "copilot": "index.js"
-      },
-      "engines": {
-        "node": ">=22"
-      }
-    },
-    "node_modules/keytar-forked-forked": {
-      "version": "7.10.3",
-      "resolved": "https://registry.npmjs.org/keytar-forked-forked/-/keytar-forked-forked-7.10.3.tgz",
-      "integrity": "sha512-ipErTUO1NPXmngYhnMrda0yOIOPSNbVJ2BRjk3kNozLx3UmGICnzCfEDemuLY6HgP+rV0c9F+Opt+89+Ydbw6w==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "node-addon-api": "^8.3.0"
-      }
-    },
-    "node_modules/node-addon-api": {
-      "version": "8.5.0",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.5.0.tgz",
-      "integrity": "sha512-/bRZty2mXUIFY/xU5HLvveNHlswNJej+RnxBjOMkidWfwZzgTbPG1E3K5TOxRLOR+5hX7bSofy8yf1hZevMS8A==",
-      "license": "MIT",
-      "engines": {
-        "node": "^18 || ^20 || >= 21"
-      }
-    },
-    "node_modules/node-pty": {
-      "name": "@devm33/node-pty",
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/@devm33/node-pty/-/node-pty-1.0.9.tgz",
-      "integrity": "sha512-5yzbTTywkaFk1iRwte2aWEpyDfcpDjCofVD1BiOUQI+fsCvp/+RdJnB4jgnULrdlWOEWuBf+bg4/NZKVApPhoQ==",
-      "hasInstallScript": true,
-      "license": "MIT",
-      "dependencies": {
-        "node-addon-api": "^7.1.0"
-      }
-    },
-    "node_modules/node-pty/node_modules/node-addon-api": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.1.tgz",
-      "integrity": "sha512-5m3bsyrjFWE1xf7nz7YXdN4udnVtXK6/Yfgn5qnahL6bCkf2yKt4k3nuTKAtT4r3IG8JNR2ncsIMdZuAzJjHQQ==",
-      "license": "MIT"
-    }
-  }
-}
diff --git a/pkgs/by-name/gi/github-copilot-cli/package.nix b/pkgs/by-name/gi/github-copilot-cli/package.nix
index 2006f6db64d3..89d99bd3cd4e 100644
--- a/pkgs/by-name/gi/github-copilot-cli/package.nix
+++ b/pkgs/by-name/gi/github-copilot-cli/package.nix
@@ -1,11 +1,14 @@
 {
   lib,
-  buildNpmPackage,
+  stdenv,
   fetchzip,
+  nodejs,
+  makeBinaryWrapper,
+  versionCheckHook,
   nix-update-script,
 }:
 
-buildNpmPackage (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "github-copilot-cli";
   version = "0.0.328";
 
@@ -14,15 +17,25 @@ buildNpmPackage (finalAttrs: {
     hash = "sha256-9oTaVjvwyS8KY8N5kUEiAs+l6vEd/BZ0AGJI0p9Jie0=";
   };
 
-  npmDepsHash = "sha256-WK6t3IW4uF+MDu7Y5GRinbm8iDcYB8RhJ15GE9VBcjQ=";
+  nativeBuildInputs = [ makeBinaryWrapper ];
 
-  postPatch = ''
-    cp ${./package-lock.json} package-lock.json
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/node_modules/@github/copilot
+    cp -r . $out/lib/node_modules/@github/copilot
+
+    mkdir -p $out/bin
+    makeBinaryWrapper ${nodejs}/bin/node $out/bin/copilot \
+      --add-flags "$out/lib/node_modules/@github/copilot/index.js"
+
+    runHook postInstall
   '';
 
-  dontNpmBuild = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
 
-  passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "GitHub Copilot CLI brings the power of Copilot coding agent directly to your terminal";

From 797fe1d3b68319d838716cd605535864fc1c0d43 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 18 Oct 2025 14:01:48 +0000
Subject: [PATCH 2741/6226] python3Packages.fmpy: 0.3.23 -> 0.3.26

Diff: https://github.com/CATIA-Systems/FMPy/compare/v0.3.23...v0.3.26
---
 .../python-modules/fmpy/default.nix           | 161 +++++++++---------
 1 file changed, 83 insertions(+), 78 deletions(-)

diff --git a/pkgs/development/python-modules/fmpy/default.nix b/pkgs/development/python-modules/fmpy/default.nix
index 9401238f13c6..e7e77cf891d3 100644
--- a/pkgs/development/python-modules/fmpy/default.nix
+++ b/pkgs/development/python-modules/fmpy/default.nix
@@ -1,45 +1,47 @@
 {
   lib,
   stdenv,
-  fetchurl,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
-  cmake,
-  sundials,
-  lapack,
-  attrs,
-  lark,
-  lxml,
-  rpclib,
-  msgpack,
-  numpy,
-  scipy,
-  pytz,
-  dask,
-  requests,
-  matplotlib,
-  pyqtgraph,
-  notebook,
-  plotly,
-  hatchling,
-  pyside6,
-  jinja2,
-  flask,
-  dash,
-  dash-bootstrap-components,
+
+  # patches
   qt6,
   fmpy,
-  runCommand,
-  enableRemoting ? true,
-  versionCheckHook,
-  fmi-reference-fmus,
   replaceVars,
+
+  # nativeBuildInputs
+  cmake,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  attrs,
+  jinja2,
+  lark,
+  lxml,
+  msgpack,
+  nbformat,
+  numpy,
+  pyside6,
+
+  # preBuild
+  rpclib,
+
+  # tests
+  versionCheckHook,
+
+  # passthru
+  sundials,
+  lapack,
+  runCommand,
+  fmi-reference-fmus,
+
+  enableRemoting ? true,
 }:
 buildPythonPackage rec {
   pname = "fmpy";
-  version = "0.3.23";
-  disabled = pythonOlder "3.10";
+  version = "0.3.26";
   pyproject = true;
 
   # Bumping version? Make sure to look through the commit history for
@@ -47,47 +49,11 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "CATIA-Systems";
     repo = "FMPy";
-    rev = "v${version}";
+    tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-4jBYOymurGCbjT0WQjIRNsztwOXBYVTGLdc4kNSTOZw=";
+    hash = "sha256-NAaROHrZ8OPmj/3lWFk9hNrrlqsDbscGdDn6G7xfFeQ=";
   };
 
-  nativeBuildInputs = [
-    cmake
-  ];
-
-  build-system = [
-    hatchling
-  ];
-
-  dependencies = [
-    pyqtgraph
-    pyside6
-    attrs
-    lark
-    lxml
-    msgpack
-    numpy
-    scipy
-    pytz
-    dask
-    requests
-    matplotlib
-    pyqtgraph
-    notebook
-    plotly
-    rpclib
-    fmpy.passthru.cvode
-    pyside6
-    jinja2
-    flask
-    dash
-    dash-bootstrap-components
-  ];
-
-  dontUseCmakeConfigure = true;
-  dontUseCmakeBuildDir = true;
-
   patches = [
     (replaceVars ./0001-gui-override-Qt6-libexec-path.patch {
       qt6libexec = "${qt6.qtbase}/libexec/";
@@ -106,9 +72,33 @@ buildPythonPackage rec {
   # Make forced includes of other systems' artifacts optional in order
   # to pass build (otherwise vendored upstream from CI)
   postPatch = ''
-    sed --in-place 's/force-include/source/g' pyproject.toml
+    substituteInPlace pyproject.toml \
+      --replace-fail "force-include" "source"
   '';
 
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    attrs
+    cmake
+    jinja2
+    lark
+    lxml
+    msgpack
+    nbformat
+    numpy
+    pyside6
+  ];
+
+  dontUseCmakeConfigure = true;
+  dontUseCmakeBuildDir = true;
+
   # Don't run upstream build scripts as they are too specialized.
   # cvode is already built, so we only need to build native binaries.
   # We run these cmake builds and then run the standard
@@ -118,9 +108,10 @@ buildPythonPackage rec {
     cmakeConfigurePhase
     cmake --build native/src/build --config Release
   ''
+  # reimplementation of native/build_remoting.py
+  # 2025-10-25: fix cmake 4 compatibility
   + lib.optionalString (enableRemoting && stdenv.hostPlatform.isLinux) ''
-    # reimplementation of native/build_remoting.py
-    cmakeFlags="-S native/remoting -B remoting/linux64 -D RPCLIB=${rpclib}"
+    cmakeFlags="-S native/remoting -B remoting/linux64 -D RPCLIB=${rpclib} -D CMAKE_POLICY_VERSION_MINIMUM=3.10"
     cmakeConfigurePhase
     cmake --build remoting/linux64 --config Release
   ''
@@ -147,22 +138,33 @@ buildPythonPackage rec {
     "fmpy.sundials"
   ];
 
-  nativeInstallCheckInputs = [
+  nativeCheckInputs = [
     versionCheckHook
   ];
+  versionCheckProgramArg = "--version";
 
   passthru = {
     # From sundials, build only the CVODE solver. C.f.
     # src/native/build_cvode.py
     cvode =
-      (sundials.overrideAttrs (prev: {
+      (sundials.overrideAttrs (prev: rec {
         # hash copied from native/build_cvode.py
         version = "5.3.0";
-        src = fetchurl {
-          url = "https://github.com/LLNL/sundials/releases/download/v5.3.0/sundials-5.3.0.tar.gz";
-          sha256 = "88dff7e11a366853d8afd5de05bf197a8129a804d9d4461fb64297f1ef89bca7";
+        src = fetchFromGitHub {
+          owner = "LLNL";
+          repo = "sundials";
+          tag = "v${version}";
+          hash = "sha256-8TvIGhrB9Rq9GgWqeyPTcYFrgn6Q79VkhkLuucNKlg0=";
         };
 
+        # Fix CMake 4 compatibility
+        postPatch = ''
+          substituteInPlace config/SundialsPOSIXTimers.cmake \
+            --replace-fail \
+              "CMAKE_MINIMUM_REQUIRED(VERSION 3.0.2)" \
+              "CMAKE_MINIMUM_REQUIRED(VERSION 3.10)"
+        '';
+
         cmakeFlags =
           prev.cmakeFlags
           ++ lib.mapAttrsToList (option: enable: lib.cmakeBool option enable) {
@@ -174,6 +176,8 @@ buildPythonPackage rec {
             BUILD_IDA = false;
             BUILD_IDAS = false;
             BUILD_KINSOL = false;
+
+            BUILD_SHARED_LIBS = true;
           };
 
         # FMPy searches for sundials without the "lib"-prefix; strip it
@@ -205,7 +209,7 @@ buildPythonPackage rec {
       for fmu in $(find ${fmi-reference-fmus}/*.fmu ! -name "Clocks.fmu"); do
         name=$(basename $fmu)
         echo "--- START $name ---"
-        ${fmpy}/bin/fmpy simulate $fmu \
+        ${lib.getExe fmpy} simulate $fmu \
           --fmi-logging \
           --output-file $out/$name.csv \
           | tee $out/$name.out
@@ -227,5 +231,6 @@ buildPythonPackage rec {
     # builds. C.f.
     # <https://github.com/CATIA-Systems/FMPy/blob/v0.3.23/pyproject.toml?plain=1#L71-L112>
     platforms = lib.platforms.x86_64 ++ [ "i686-windows" ];
+    mainProgram = "fmpy";
   };
 }

From 86c2c5fe685563e15e2d8a8f03d11dc8824981c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 21:58:36 +0000
Subject: [PATCH 2742/6226] diesel-cli: 2.3.2 -> 2.3.3

---
 pkgs/by-name/di/diesel-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix
index 164b69372ccc..909dd6d31e9c 100644
--- a/pkgs/by-name/di/diesel-cli/package.nix
+++ b/pkgs/by-name/di/diesel-cli/package.nix
@@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [
 
 rustPlatform.buildRustPackage rec {
   pname = "diesel-cli";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchCrate {
     inherit version;
     crateName = "diesel_cli";
-    hash = "sha256-JNDFXBNmwCWpk+Lub453wS+7lVMZcdiJBmPoVAedpug=";
+    hash = "sha256-AgPESgFLnL3jiYBP8DiWb0hLzsx5tJA+gcO/fdV5Cvo=";
   };
 
-  cargoHash = "sha256-qfXa6DuuhKbXCdOvhuPNx6xlDIouoDVJUMob9Fc5XgI=";
+  cargoHash = "sha256-yco4l/4UiYnqnZZLYm3EkHmYiQJhMC2xloFg0brDfsg=";
 
   nativeBuildInputs = [
     installShellFiles

From 5fb74394795f2fb312d7b089873771e4a557b5be Mon Sep 17 00:00:00 2001
From: loner <2788892716@qq.com>
Date: Wed, 22 Oct 2025 14:14:33 +0800
Subject: [PATCH 2743/6226] kazumi: 1.8.4 -> 1.8.6

---
 pkgs/by-name/ka/kazumi/gitHashes.json    | 18 +++++------
 pkgs/by-name/ka/kazumi/package.nix       | 15 ++++-----
 pkgs/by-name/ka/kazumi/pubspec.lock.json | 40 ++++++++++++------------
 3 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/pkgs/by-name/ka/kazumi/gitHashes.json b/pkgs/by-name/ka/kazumi/gitHashes.json
index 86b1353b07cd..88ecda4e668b 100644
--- a/pkgs/by-name/ka/kazumi/gitHashes.json
+++ b/pkgs/by-name/ka/kazumi/gitHashes.json
@@ -1,12 +1,12 @@
 {
   "desktop_webview_window": "sha256-l5n57iKLgsH4TaBYRaTDEPznzljI0jfOGcvxyYcIW6M=",
-  "media_kit": "sha256-Z/VqTp3ch1G8TvTw0lxhaGN8peK0X2kulPgPFvjWjt8=",
-  "media_kit_libs_android_video": "sha256-Z/VqTp3ch1G8TvTw0lxhaGN8peK0X2kulPgPFvjWjt8=",
-  "media_kit_libs_ios_video": "sha256-Z/VqTp3ch1G8TvTw0lxhaGN8peK0X2kulPgPFvjWjt8=",
-  "media_kit_libs_linux": "sha256-Z/VqTp3ch1G8TvTw0lxhaGN8peK0X2kulPgPFvjWjt8=",
-  "media_kit_libs_macos_video": "sha256-Z/VqTp3ch1G8TvTw0lxhaGN8peK0X2kulPgPFvjWjt8=",
-  "media_kit_libs_video": "sha256-Z/VqTp3ch1G8TvTw0lxhaGN8peK0X2kulPgPFvjWjt8=",
-  "media_kit_libs_windows_video": "sha256-Z/VqTp3ch1G8TvTw0lxhaGN8peK0X2kulPgPFvjWjt8=",
-  "media_kit_video": "sha256-Z/VqTp3ch1G8TvTw0lxhaGN8peK0X2kulPgPFvjWjt8=",
-  "webview_windows": "sha256-4QUctMjeu4fPPJz4X37ZpPn4aHrPuctX0U+wSufQGsQ="
+  "media_kit": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=",
+  "media_kit_libs_android_video": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=",
+  "media_kit_libs_ios_video": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=",
+  "media_kit_libs_linux": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=",
+  "media_kit_libs_macos_video": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=",
+  "media_kit_libs_video": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=",
+  "media_kit_libs_windows_video": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=",
+  "media_kit_video": "sha256-nzbpzzc/39qvnjkX5d3tfOE/dG0C7Wgr93Ru3cA2CmY=",
+  "webview_windows": "sha256-6Uk4H2SYhjrs1+/27FmlWopDyM09Mc7SqFJ4syg3dDU="
 }
diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix
index e1e6162582bd..0d62a00e6a0e 100644
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@@ -17,13 +17,13 @@
 }:
 
 let
-  version = "1.8.4";
+  version = "1.8.6";
 
   src = fetchFromGitHub {
     owner = "Predidit";
     repo = "Kazumi";
     tag = version;
-    hash = "sha256-Porwr8lrw8jRfpCF2vyWvk+CpO2rWmnBftoV42OCqCY=";
+    hash = "sha256-/CtWN9E9O0PS9uzRfywO3QECkZvS8qy0CJfb3oellw4=";
   };
 in
 flutter335.buildFlutterApplication {
@@ -65,10 +65,11 @@ flutter335.buildFlutterApplication {
         inherit (src) passthru;
 
         postPatch = ''
-          sed -i '/set(LIBMPV_ZIP_URL/,/if(MEDIA_KIT_LIBS_AVAILABLE)/{//!d; /set(LIBMPV_ZIP_URL/d}' media_kit_video/linux/CMakeLists.txt
-          sed -i '/if(MEDIA_KIT_LIBS_AVAILABLE)/i set(LIBMPV_HEADER_UNZIP_DIR "${mpv-unwrapped.dev}/include/mpv")' media_kit_video/linux/CMakeLists.txt
-          sed -i '/if(MEDIA_KIT_LIBS_AVAILABLE)/i set(LIBMPV_PATH "${mpv-unwrapped}/lib")' media_kit_video/linux/CMakeLists.txt
-          sed -i '/if(MEDIA_KIT_LIBS_AVAILABLE)/i set(LIBMPV_UNZIP_DIR "${mpv-unwrapped}/lib")' media_kit_video/linux/CMakeLists.txt
+          sed -i '/if(ARCH_NAME STREQUAL "x86_64")/,/if(MEDIA_KIT_LIBS_AVAILABLE)/{ /if(MEDIA_KIT_LIBS_AVAILABLE)/!d; /set(LIBMPV_ZIP_URL/d }' media_kit_video/linux/CMakeLists.txt
+          sed -i '/if(MEDIA_KIT_LIBS_AVAILABLE)/i \
+            set(LIBMPV_UNZIP_DIR "${mpv-unwrapped}/lib")\n\
+            set(LIBMPV_PATH "${mpv-unwrapped}/lib")\n\
+            set(LIBMPV_HEADER_UNZIP_DIR "${mpv-unwrapped.dev}/include/mpv")' media_kit_video/linux/CMakeLists.txt
         '';
 
         installPhase = ''
@@ -127,7 +128,7 @@ flutter335.buildFlutterApplication {
     homepage = "https://github.com/Predidit/Kazumi";
     mainProgram = "kazumi";
     license = lib.licenses.gpl3Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ lonerOrz ];
     platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json
index 723fc6bce211..b3d0bf23f777 100644
--- a/pkgs/by-name/ka/kazumi/pubspec.lock.json
+++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json
@@ -394,7 +394,7 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "main",
+        "ref": "f95c8d09e66a73dce5465770f6fb41e4a13fad44",
         "resolved-ref": "f95c8d09e66a73dce5465770f6fb41e4a13fad44",
         "url": "https://github.com/Predidit/linux_webview_window.git"
       },
@@ -969,8 +969,8 @@
       "dependency": "direct main",
       "description": {
         "path": "media_kit",
-        "ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
-        "resolved-ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
+        "ref": "8c4b795d373243d1d64fea932ba497696fd89925",
+        "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -980,8 +980,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/android/media_kit_libs_android_video",
-        "ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
-        "resolved-ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
+        "ref": "8c4b795d373243d1d64fea932ba497696fd89925",
+        "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -991,8 +991,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/ios/media_kit_libs_ios_video",
-        "ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
-        "resolved-ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
+        "ref": "8c4b795d373243d1d64fea932ba497696fd89925",
+        "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1002,8 +1002,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/linux/media_kit_libs_linux",
-        "ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
-        "resolved-ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
+        "ref": "8c4b795d373243d1d64fea932ba497696fd89925",
+        "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1013,8 +1013,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/macos/media_kit_libs_macos_video",
-        "ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
-        "resolved-ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
+        "ref": "8c4b795d373243d1d64fea932ba497696fd89925",
+        "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1024,8 +1024,8 @@
       "dependency": "direct main",
       "description": {
         "path": "libs/universal/media_kit_libs_video",
-        "ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
-        "resolved-ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
+        "ref": "8c4b795d373243d1d64fea932ba497696fd89925",
+        "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1035,8 +1035,8 @@
       "dependency": "direct overridden",
       "description": {
         "path": "libs/windows/media_kit_libs_windows_video",
-        "ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
-        "resolved-ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
+        "ref": "8c4b795d373243d1d64fea932ba497696fd89925",
+        "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -1046,8 +1046,8 @@
       "dependency": "direct main",
       "description": {
         "path": "media_kit_video",
-        "ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
-        "resolved-ref": "56469d210b66828d8e4c7938d0d9d864f1beeea4",
+        "ref": "8c4b795d373243d1d64fea932ba497696fd89925",
+        "resolved-ref": "8c4b795d373243d1d64fea932ba497696fd89925",
         "url": "https://github.com/Predidit/media-kit.git"
       },
       "source": "git",
@@ -2133,8 +2133,8 @@
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "main",
-        "resolved-ref": "0ce605b21d2389b1d35d86d052b756aab2fdb9e7",
+        "ref": "4399f68beab25d51b277e37e3949f9fb2d6d8304",
+        "resolved-ref": "4399f68beab25d51b277e37e3949f9fb2d6d8304",
         "url": "https://github.com/Predidit/flutter-webview-windows.git"
       },
       "source": "git",
@@ -2223,6 +2223,6 @@
   },
   "sdks": {
     "dart": ">=3.8.0 <4.0.0",
-    "flutter": ">=3.35.5"
+    "flutter": ">=3.35.6"
   }
 }

From ce244d5f3b674e8ad9dd88b56d466eeb18c86dd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 25 Oct 2025 14:59:29 -0700
Subject: [PATCH 2744/6226] edgetx: fix build with CMake 4

---
 pkgs/by-name/ed/edgetx/package.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ed/edgetx/package.nix b/pkgs/by-name/ed/edgetx/package.nix
index 4cb6662c086c..def2ad783618 100644
--- a/pkgs/by-name/ed/edgetx/package.nix
+++ b/pkgs/by-name/ed/edgetx/package.nix
@@ -15,6 +15,7 @@
   miniz,
   yaml-cpp,
   udevCheckHook,
+  applyPatches,
   # List of targets to build simulators for
   targetsToBuild ? import ./targets.nix,
 }:
@@ -36,6 +37,12 @@ let
       libclang
     ]
   );
+
+  # paches are needed to fix build with CMake 4
+  yaml-cppSrc = applyPatches {
+    inherit (yaml-cpp) src;
+    patches = yaml-cpp.patches or [ ];
+  };
 in
 
 stdenv.mkDerivation (finalAttrs: {
@@ -93,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
     # Unvendoring these libraries is infeasible. At least lets reuse the same sources.
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GOOGLETEST" "${gtest.src}")
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MINIZ" "${miniz.src}")
-    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${yaml-cpp.src}")
+    (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_YAML-CPP" "${yaml-cppSrc}")
     # Custom library https://github.com/edgetx/maxLibQt.
     (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_MAXLIBQT" "${maxlibqt}")
     (lib.cmakeFeature "DFU_UTIL_ROOT_DIR" "${lib.getBin dfu-util}/bin")

From 716e2f892a25e81a7b4c9d00bde6ee1dcb190940 Mon Sep 17 00:00:00 2001
From: Maciej Zonski <me@zonni.pl>
Date: Fri, 24 Oct 2025 18:11:04 +0200
Subject: [PATCH 2745/6226] coolercontrol: 2.1.0 -> 3.0.1

---
 nixos/modules/programs/coolercontrol.nix      |  2 --
 .../coolercontrol/coolercontrol-liqctld.nix   | 34 -------------------
 .../coolercontrol/coolercontrol-ui-data.nix   |  2 +-
 .../system/coolercontrol/coolercontrold.nix   | 19 ++++++++---
 .../system/coolercontrol/default.nix          | 11 +++---
 5 files changed, 22 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix

diff --git a/nixos/modules/programs/coolercontrol.nix b/nixos/modules/programs/coolercontrol.nix
index 000fb091bcc6..7103526d79b5 100644
--- a/nixos/modules/programs/coolercontrol.nix
+++ b/nixos/modules/programs/coolercontrol.nix
@@ -34,13 +34,11 @@ in
 
         systemd = {
           packages = with pkgs.coolercontrol; [
-            coolercontrol-liqctld
             coolercontrold
           ];
 
           # https://github.com/NixOS/nixpkgs/issues/81138
           services = {
-            coolercontrol-liqctld.wantedBy = [ "multi-user.target" ];
             coolercontrold.wantedBy = [ "multi-user.target" ];
           };
         };
diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix b/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix
deleted file mode 100644
index 2dc770421e9f..000000000000
--- a/pkgs/applications/system/coolercontrol/coolercontrol-liqctld.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{ python3 }:
-
-{
-  version,
-  src,
-  meta,
-}:
-
-python3.pkgs.buildPythonApplication {
-  pname = "coolercontrol-liqctld";
-  inherit version src;
-  sourceRoot = "${src.name}/coolercontrol-liqctld";
-  format = "pyproject";
-
-  nativeBuildInputs = with python3.pkgs; [ setuptools ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    liquidctl
-    setproctitle
-    fastapi
-    uvicorn
-  ];
-
-  postInstall = ''
-    install -Dm444 "${src}/packaging/systemd/coolercontrol-liqctld.service" -t "$out/lib/systemd/system"
-    substituteInPlace "$out/lib/systemd/system/coolercontrol-liqctld.service" \
-      --replace-fail '/usr/bin' "$out/bin"
-  '';
-
-  meta = meta // {
-    description = "${meta.description} (Liquidctl Daemon)";
-    mainProgram = "coolercontrol-liqctld";
-  };
-}
diff --git a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix
index 0f687c9d5278..d2af32efee38 100644
--- a/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix
+++ b/pkgs/applications/system/coolercontrol/coolercontrol-ui-data.nix
@@ -11,7 +11,7 @@ buildNpmPackage {
   inherit version src;
   sourceRoot = "${src.name}/coolercontrol-ui";
 
-  npmDepsHash = "sha256-FFVCE3/E+eiTvTeU53cc1Mdbrl5J3+YgYUYltpnGXz0=";
+  npmDepsHash = "sha256-MhMHo6wjkaSCyevwzAKCvSsJTmAq9rYFG1ZVUAkRc0Y=";
 
   postBuild = ''
     cp -r dist $out
diff --git a/pkgs/applications/system/coolercontrol/coolercontrold.nix b/pkgs/applications/system/coolercontrol/coolercontrold.nix
index 7bdaa624ac68..50987847a587 100644
--- a/pkgs/applications/system/coolercontrol/coolercontrold.nix
+++ b/pkgs/applications/system/coolercontrol/coolercontrold.nix
@@ -5,6 +5,8 @@
   coolercontrol,
   runtimeShell,
   addDriverRunpath,
+  python3Packages,
+  liquidctl,
 }:
 
 {
@@ -18,10 +20,16 @@ rustPlatform.buildRustPackage {
   inherit version src;
   sourceRoot = "${src.name}/coolercontrold";
 
-  cargoHash = "sha256-ZyYyQcaYd3VZ7FL0Hki33JO3LscPfBT5gl+nw2cXvUs=";
+  cargoHash = "sha256-4aSEEBtxwTyAx5CPa2fDBhx5U+Ql2X/tKPQHLIsm3I0=";
 
   buildInputs = [ libdrm ];
-  nativeBuildInputs = [ addDriverRunpath ];
+
+  nativeBuildInputs = [
+    addDriverRunpath
+    python3Packages.wrapPython
+  ];
+
+  pythonPath = [ liquidctl ];
 
   postPatch = ''
     # copy the frontend static resources to a directory for embedding
@@ -41,12 +49,15 @@ rustPlatform.buildRustPackage {
 
   postFixup = ''
     addDriverRunpath "$out/bin/coolercontrold"
+
+    buildPythonPath "$pythonPath"
+    wrapProgram "$out/bin/coolercontrold" \
+      --prefix PATH : $program_PATH \
+      --prefix PYTHONPATH : $program_PYTHONPATH
   '';
 
   passthru.tests.version = testers.testVersion {
     package = coolercontrol.coolercontrold;
-    # coolercontrold prints its version with "v" prefix
-    version = "v${version}";
   };
 
   meta = meta // {
diff --git a/pkgs/applications/system/coolercontrol/default.nix b/pkgs/applications/system/coolercontrol/default.nix
index 009525ec8eb3..d11e7f40aa6c 100644
--- a/pkgs/applications/system/coolercontrol/default.nix
+++ b/pkgs/applications/system/coolercontrol/default.nix
@@ -5,20 +5,23 @@
 }:
 
 let
-  version = "2.1.0";
+  version = "3.0.1";
 
   src = fetchFromGitLab {
     owner = "coolercontrol";
     repo = "coolercontrol";
     rev = version;
-    hash = "sha256-xIc0ZecQGyjMQWVaucKomu7SbaHy+ymg5dkOjHjtJ9c=";
+    hash = "sha256-PvEj3xYJVpHNfd5p7kyw+eW9S/g1FB/YiFgWEJDDbus=";
   };
 
   meta = {
     description = "Monitor and control your cooling devices";
     homepage = "https://gitlab.com/coolercontrol/coolercontrol";
     license = lib.licenses.gpl3Plus;
-    platforms = [ "x86_64-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
     maintainers = with lib.maintainers; [
       codifryed
       OPNA2608
@@ -33,6 +36,4 @@ in
   coolercontrold = applySharedDetails (callPackage ./coolercontrold.nix { });
 
   coolercontrol-gui = applySharedDetails (callPackage ./coolercontrol-gui.nix { });
-
-  coolercontrol-liqctld = applySharedDetails (callPackage ./coolercontrol-liqctld.nix { });
 }

From ed6551c9e74fefb28909b8b9730adf2b3ba9846c Mon Sep 17 00:00:00 2001
From: Farid Zakaria <farid.m.zakaria@gmail.com>
Date: Wed, 22 Oct 2025 21:47:25 -0700
Subject: [PATCH 2746/6226] jart-jsoncpp: init at 0-unstable-2025-10-23

---
 pkgs/by-name/ja/jart-jsoncpp/package.nix | 82 ++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 pkgs/by-name/ja/jart-jsoncpp/package.nix

diff --git a/pkgs/by-name/ja/jart-jsoncpp/package.nix b/pkgs/by-name/ja/jart-jsoncpp/package.nix
new file mode 100644
index 000000000000..2af52e608153
--- /dev/null
+++ b/pkgs/by-name/ja/jart-jsoncpp/package.nix
@@ -0,0 +1,82 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  copyPkgconfigItems,
+  makePkgconfigItem,
+  lib,
+  testers,
+  ctestCheckHook,
+  ninja,
+  double-conversion,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "json.cpp";
+  version = "0-unstable-2025-10-25";
+
+  src = fetchFromGitHub {
+    owner = "jart";
+    repo = "json.cpp";
+    rev = "6ec4e44a5bbaadbe677473378c3d2133644c58a1";
+    hash = "sha256-kUFtyFPoHGCFWTGRD8SoBsqHYCplGPw/AcpMR9T0Ffk=";
+  };
+
+  doCheck = true;
+
+  cmakeFlags = [
+    (lib.cmakeBool "JSON_CPP_BUILD_TESTS" true)
+    (lib.cmakeBool "DOUBLE_CONVERSION_VENDORED" false)
+    (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries)
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    copyPkgconfigItems
+    ctestCheckHook
+    ninja
+  ];
+
+  buildInputs = [
+    double-conversion
+  ];
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  passthru = {
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
+  # https://github.com/jart/json.cpp/issues/17
+  pkgconfigItems = [
+    (makePkgconfigItem rec {
+      name = "json.cpp";
+      inherit (finalAttrs) version;
+      cflags = [ "-I${variables.includedir}" ];
+      libs = [
+        "-L${variables.libdir}"
+        "-ljson"
+      ];
+      libsPrivate = [
+        # nixpkgs double-conversion does not support pkg-config
+        # as of yet.
+        "-ldouble-conversion"
+      ];
+      variables = {
+        includedir = "${placeholder "dev"}/include";
+        libdir = "${placeholder "out"}/lib";
+      };
+      inherit (finalAttrs.meta) description;
+    })
+  ];
+
+  meta = {
+    pkgConfigModules = [ "json.cpp" ];
+    description = "JSON for Classic C++";
+    homepage = "https://github.com/jart/json.cpp";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fzakaria ];
+  };
+})

From af1485d333a51ad86421963ed4ed4f6877fd89c3 Mon Sep 17 00:00:00 2001
From: hustlerone <nine-ball@tutanota.com>
Date: Sat, 25 Oct 2025 20:50:03 +0300
Subject: [PATCH 2747/6226] pkgs/buffybox: 3.3.0 -> 3.4.2-unstable-2025-10-25

Co-authored-by: Colin <colin@uninsane.org>
---
 .../modules/services/hardware/buffyboard.nix  |  1 -
 pkgs/by-name/bu/buffybox/package.nix          | 21 ++++---------------
 2 files changed, 4 insertions(+), 18 deletions(-)

diff --git a/nixos/modules/services/hardware/buffyboard.nix b/nixos/modules/services/hardware/buffyboard.nix
index f6cab16138c0..379fff07c71b 100644
--- a/nixos/modules/services/hardware/buffyboard.nix
+++ b/nixos/modules/services/hardware/buffyboard.nix
@@ -132,7 +132,6 @@ in
         ))
       ];
       wantedBy = [ "getty.target" ];
-      before = [ "getty.target" ];
     };
   };
 }
diff --git a/pkgs/by-name/bu/buffybox/package.nix b/pkgs/by-name/bu/buffybox/package.nix
index 9e07c3591857..37f670b19e8c 100644
--- a/pkgs/by-name/bu/buffybox/package.nix
+++ b/pkgs/by-name/bu/buffybox/package.nix
@@ -1,6 +1,5 @@
 {
   fetchFromGitLab,
-  fetchpatch2,
   inih,
   lib,
   libdrm,
@@ -16,30 +15,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "buffybox";
-  version = "3.3.0";
+  version = "3.4.2-unstable-2025-10-25";
+  # 3.4.2 would be preferred but there are 3 commits past 3.4.2 that are really nice to have
 
   src = fetchFromGitLab {
     domain = "gitlab.postmarketos.org";
     owner = "postmarketOS";
     repo = "buffybox";
     fetchSubmodules = true; # to use its vendored lvgl
-    rev = "dce41a6f07a2b63c3136409b7bcd0078299fadf9";
-    hash = "sha256-n5RQg7kGS+lg7sRe5Defl3nDEha0vhc/FbwywD5wBsg=";
+    rev = "437ff2cbd7fd35ba6ca2d46624e7fcf8c5f3f954";
+    hash = "sha256-1GRsntNc3byHmZKLG/ZRXvbo96DjmLrA0bVYtMAlKsQ=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # This fixes a bug that might annoy you if you use something like PKCS#11
-      url = "https://gitlab.postmarketos.org/postmarketOS/buffybox/-/commit/d8214b522a3cc72cd4639a1dd114103a02e9218c.patch";
-      hash = "sha256-WxKuioJ1Fo5ARRYF/R4yULDVB4pq11phljzVGdWTV6s=";
-    })
-    (fetchpatch2 {
-      # Fixes up UB
-      url = "https://gitlab.postmarketos.org/postmarketOS/buffybox/-/commit/4e13c312241420cbb3e5cc7d4f0dd3e5d17449be.patch";
-      hash = "sha256-7yX6gGsptwijx+ZedSJWJKhwaoBVpxIbGK+ZiMLsIhc=";
-    })
-  ];
-
   depsBuildBuild = [
     pkg-config
   ];

From 28e2ca30c4f6a20721c146a2930303903fb1fd1d Mon Sep 17 00:00:00 2001
From: Colin <colin@uninsane.org>
Date: Sat, 25 Oct 2025 22:17:26 +0000
Subject: [PATCH 2748/6226] nixos/buffyboard: document
 `quirks.ignore_unused_terminals` option

---
 nixos/modules/services/hardware/buffyboard.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/nixos/modules/services/hardware/buffyboard.nix b/nixos/modules/services/hardware/buffyboard.nix
index 379fff07c71b..26b83882c12b 100644
--- a/nixos/modules/services/hardware/buffyboard.nix
+++ b/nixos/modules/services/hardware/buffyboard.nix
@@ -109,6 +109,22 @@ in
               This has a negative performance impact.
             '';
           };
+          options.quirks.ignore_unused_terminals = mkOption {
+            type = types.nullOr types.bool;
+            default = null;
+            description = ''
+              If true, buffyboard won't automatically update the layout of a new terminal and
+              draw the keyboard, if the terminal is not opened by any process. In this case
+              SIGUSR1 should be sent to buffyboard to update the layout. This quirk was introduced
+              to resolve a race between buffyboard and systemd-logind according to the following scenario:
+              - A user switches to a new virtual terminal
+              - Buffyboard opens the terminal and changes the number of rows
+              - systemd-logind sees that the terminal is opened by some other process and don't start getty@.service
+
+              The race is resolved by enabling this option and installing a drop-in file
+              for getty@.service that sends SIGUSR1 to buffyboard.
+            '';
+          };
         };
         default = { };
       };

From 5d528a08e7f2e8b2079dfe7f6eb7cf3d4e75c57a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 25 Oct 2025 13:36:46 -0700
Subject: [PATCH 2749/6226] trilinos: 12.12.1 -> 16.1.0

Diff: https://github.com/trilinos/Trilinos/compare/trilinos-release-12-12-1...trilinos-release-16-1-0
---
 pkgs/by-name/tr/trilinos/package.nix | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/tr/trilinos/package.nix b/pkgs/by-name/tr/trilinos/package.nix
index 45331a18cc98..062ed1ef2561 100644
--- a/pkgs/by-name/tr/trilinos/package.nix
+++ b/pkgs/by-name/tr/trilinos/package.nix
@@ -60,15 +60,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "trilinos";
-  # Xyce 7.4 requires version 12.12.1
-  # nixpkgs-update: no auto update
-  version = "12.12.1";
+  version = "16.1.0";
 
   src = fetchFromGitHub {
     owner = "trilinos";
     repo = "Trilinos";
     tag = "trilinos-release-${lib.replaceStrings [ "." ] [ "-" ] version}";
-    sha256 = "sha256-Nqjr7RAlUHm6vs87a1P84Y7BIZEL0Vs/A1Z6dykfv+o=";
+    hash = "sha256-9Yn79kt7JHS30lc+qImSbLOU3Cdb87S3xmlm3v9G1uo=";
   };
 
   nativeBuildInputs = [
@@ -95,11 +93,6 @@ stdenv.mkDerivation rec {
         cmakeFlagsArray+=(${flagsBase})
       '';
 
-  postInstall = ''
-    # remove dangling symlink
-    rm $out/lib/cmake/tribits/doc/developers_guide/TribitsBuildReference.html
-  '';
-
   passthru = {
     inherit withMPI;
   };

From f02fb9defbb5189fd666ad6a332a633a338b0e41 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 22:46:35 +0000
Subject: [PATCH 2750/6226] roddhjav-apparmor-rules: 0-unstable-2025-10-14 ->
 0-unstable-2025-10-25

---
 pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
index 9f19be05bf64..408bfe92a9c6 100644
--- a/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
+++ b/pkgs/by-name/ro/roddhjav-apparmor-rules/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "roddhjav-apparmor-rules";
-  version = "0-unstable-2025-10-14";
+  version = "0-unstable-2025-10-25";
 
   src = fetchFromGitHub {
     owner = "roddhjav";
     repo = "apparmor.d";
-    rev = "f85802feeaa5f414184398b38e9916cfd5a2e25c";
-    hash = "sha256-JlG7TpLICeRrTl+4MVe9UUF4nezeHiKcE+C8pwsca4M=";
+    rev = "6aaa6e79183d489c84f9baad821354e72b322c46";
+    hash = "sha256-fDjajIA06USViGWNKvnqg2V6dc1Hzqt/9q8PbKWvKxA=";
   };
 
   dontConfigure = true;

From 70c7d6b44ce12bd1600810fa989cea78b2d39c01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 23 Oct 2025 16:57:47 -0700
Subject: [PATCH 2751/6226] python3Packages.mat2: 0.13.5 -> 0.14.0

Diff: https://github.com/jvoisin/mat2/compare/0.13.5...0.14.0

Changelog: https://github.com/jvoisin/mat2/blob/0.14.0/CHANGELOG.md
---
 .../python-modules/mat2/bubblewrap-path.patch | 35 -------------
 .../python-modules/mat2/default.nix           | 52 +++++++------------
 2 files changed, 20 insertions(+), 67 deletions(-)
 delete mode 100644 pkgs/development/python-modules/mat2/bubblewrap-path.patch

diff --git a/pkgs/development/python-modules/mat2/bubblewrap-path.patch b/pkgs/development/python-modules/mat2/bubblewrap-path.patch
deleted file mode 100644
index 2c71930b6df8..000000000000
--- a/pkgs/development/python-modules/mat2/bubblewrap-path.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff --git a/libmat2/bubblewrap.py b/libmat2/bubblewrap.py
-index 970d5dd..5d3c0b7 100644
---- a/libmat2/bubblewrap.py
-+++ b/libmat2/bubblewrap.py
-@@ -22,11 +22,7 @@ CalledProcessError = subprocess.CalledProcessError
- 
- 
- def _get_bwrap_path() -> str:
--    which_path = shutil.which('bwrap')
--    if which_path:
--        return which_path
--
--    raise RuntimeError("Unable to find bwrap")  # pragma: no cover
-+    return '@bwrap@'
- 
- 
- def _get_bwrap_args(tempdir: str,
-@@ -37,16 +33,11 @@ def _get_bwrap_args(tempdir: str,
- 
-     # XXX: use --ro-bind-try once all supported platforms
-     # have a bubblewrap recent enough to support it.
--    ro_bind_dirs = ['/usr', '/lib', '/lib64', '/bin', '/sbin', '/etc/alternatives', cwd]
-+    ro_bind_dirs = ['/nix/store', cwd]
-     for bind_dir in ro_bind_dirs:
-         if os.path.isdir(bind_dir):  # pragma: no cover
-             ro_bind_args.extend(['--ro-bind', bind_dir, bind_dir])
- 
--    ro_bind_files = ['/etc/ld.so.cache']
--    for bind_file in ro_bind_files:
--        if os.path.isfile(bind_file):  # pragma: no cover
--            ro_bind_args.extend(['--ro-bind', bind_file, bind_file])
--
-     args = ro_bind_args + \
-         ['--dev', '/dev',
-          '--proc', '/proc',
diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix
index 19ec148450c4..f91a9e412482 100644
--- a/pkgs/development/python-modules/mat2/default.nix
+++ b/pkgs/development/python-modules/mat2/default.nix
@@ -3,18 +3,19 @@
   stdenv,
   buildPythonPackage,
   pytestCheckHook,
-  fetchFromGitLab,
+  fetchFromGitHub,
   fetchpatch,
   replaceVars,
-  bubblewrap,
   exiftool,
   ffmpeg,
   setuptools,
   wrapGAppsHook3,
   gdk-pixbuf,
+  gnome,
   gobject-introspection,
   librsvg,
   poppler_gi,
+  webp-pixbuf-loader,
   mutagen,
   pygobject3,
   pycairo,
@@ -24,33 +25,17 @@
 
 buildPythonPackage rec {
   pname = "mat2";
-  version = "0.13.5";
+  version = "0.14.0";
   pyproject = true;
 
-  src = fetchFromGitLab {
-    domain = "0xacab.org";
+  src = fetchFromGitHub {
     owner = "jvoisin";
     repo = "mat2";
     tag = version;
-    hash = "sha256-ivFgH/88DBucZRaO/OMsLlwJCjv/VQXb6AiKWhZ8XH0=";
+    hash = "sha256-JTt2/PuSxOXXHUuRP42y8jxw09mNMMz1piJM4ldnjq0=";
   };
 
   patches = [
-    (fetchpatch {
-      name = "exiftool-13.25-compat.patch";
-      url = "https://0xacab.org/jvoisin/mat2/-/commit/473903b70e1b269a6110242a9c098a10c18554e2.patch";
-      hash = "sha256-vxxjAFwiTDlcTT3ZlfhOG4rlzBJS+LhLoA++8y2hEok=";
-    })
-    (fetchpatch {
-      name = "fix-test-on-python313.patch";
-      url = "https://0xacab.org/jvoisin/mat2/-/commit/f07344444d6d2f04a1f93e2954f4910b194bee0c.patch";
-      hash = "sha256-y756sKkjGO11A2lrRsXAwWgupOZ00u0cDypvkbsiNbY=";
-    })
-    (fetchpatch {
-      name = "fix-test-on-python312.patch";
-      url = "https://0xacab.org/jvoisin/mat2/-/commit/7a8ea224bc327b8ee929379d577c74968ea1c352.patch";
-      hash = "sha256-pPiYhoql5WhjhLKvd6y3OnvxORSbXIGCsZMc7UH3i1Q=";
-    })
     # hardcode paths to some binaries
     (replaceVars ./paths.patch {
       exiftool = lib.getExe exiftool;
@@ -64,11 +49,6 @@ buildPythonPackage rec {
     ./executable-name.patch
     # hardcode path to mat2 executable
     ./tests.patch
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isLinux) [
-    (replaceVars ./bubblewrap-path.patch {
-      bwrap = lib.getExe bubblewrap;
-    })
   ];
 
   postPatch = ''
@@ -86,7 +66,6 @@ buildPythonPackage rec {
 
   buildInputs = [
     gdk-pixbuf
-    librsvg
     poppler_gi
   ];
 
@@ -97,6 +76,15 @@ buildPythonPackage rec {
   ];
 
   postInstall = ''
+    export GDK_PIXBUF_MODULE_FILE="${
+      gnome._gdkPixbufCacheBuilder_DO_NOT_USE {
+        extraLoaders = [
+          librsvg
+          webp-pixbuf-loader
+        ];
+      }
+    }"
+
     install -Dm 444 data/mat2.svg -t "$out/share/icons/hicolor/scalable/apps"
     install -Dm 444 doc/mat2.1 -t "$out/share/man/man1"
   ''
@@ -106,12 +94,12 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
-  meta = with lib; {
+  meta = {
     description = "Handy tool to trash your metadata";
-    homepage = "https://0xacab.org/jvoisin/mat2";
-    changelog = "https://0xacab.org/jvoisin/mat2/-/blob/${version}/CHANGELOG.md";
-    license = licenses.lgpl3Plus;
+    homepage = "https://github.com/jvoisin/mat2";
+    changelog = "https://github.com/jvoisin/mat2/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.lgpl3Plus;
     mainProgram = "mat2";
-    maintainers = with maintainers; [ dotlambda ];
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }

From e3ea0e3229336f5843de7e71d94c19ae44aaa717 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 25 Oct 2025 15:50:06 -0700
Subject: [PATCH 2752/6226] python3Packages.mat2: run versionCheckHook

---
 pkgs/development/python-modules/mat2/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/mat2/default.nix b/pkgs/development/python-modules/mat2/default.nix
index f91a9e412482..f6ff184eb2c0 100644
--- a/pkgs/development/python-modules/mat2/default.nix
+++ b/pkgs/development/python-modules/mat2/default.nix
@@ -21,6 +21,7 @@
   pycairo,
   dolphinIntegration ? false,
   kdePackages,
+  versionCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -94,6 +95,9 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
   meta = {
     description = "Handy tool to trash your metadata";
     homepage = "https://github.com/jvoisin/mat2";

From 482a6f91c9ca3b939fff9fedbe4bcdaf52c7f54f Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Sun, 28 Sep 2025 19:04:54 +0100
Subject: [PATCH 2753/6226] 
 home-assistant-custom-components.hass-scene_presets: init at 2.3.1

---
 .../hass-scene_presets/package.nix            | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-components/hass-scene_presets/package.nix

diff --git a/pkgs/servers/home-assistant/custom-components/hass-scene_presets/package.nix b/pkgs/servers/home-assistant/custom-components/hass-scene_presets/package.nix
new file mode 100644
index 000000000000..9fc48a0a5b5e
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/hass-scene_presets/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildHomeAssistantComponent,
+  nix-update-script,
+}:
+
+buildHomeAssistantComponent rec {
+  owner = "Hypfer";
+  domain = "scene_presets";
+  version = "2.3.1";
+
+  src = fetchFromGitHub {
+    owner = "Hypfer";
+    repo = "hass-scene_presets";
+    tag = version;
+    hash = "sha256-ESu7+65IeXYZLLqlkRlJA7+Ggo+X+YoWcpmMQiNzOTM=";
+  };
+
+  postInstall = ''
+    mkdir -p "$out/custom_components/scene_presets/userdata/custom/assets"
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/Hypfer/hass-scene_presets/releases/tag/${src.tag}";
+    description = "Hue-like scene presets for lights in Home Assistant";
+    homepage = "https://github.com/Hypfer/hass-scene_presets";
+    maintainers = with lib.maintainers; [ jpds ];
+    license = lib.licenses.asl20;
+  };
+}

From fa5b66304310935695144e8aae43cd2315224b63 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 23:15:16 +0000
Subject: [PATCH 2754/6226] syshud: 0-unstable-2025-10-06 ->
 0-unstable-2025-10-25

---
 pkgs/by-name/sy/syshud/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sy/syshud/package.nix b/pkgs/by-name/sy/syshud/package.nix
index 3fe9f6367f87..6bf5a0ed818d 100644
--- a/pkgs/by-name/sy/syshud/package.nix
+++ b/pkgs/by-name/sy/syshud/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "syshud";
-  version = "0-unstable-2025-10-06";
+  version = "0-unstable-2025-10-25";
 
   src = fetchFromGitHub {
     owner = "System64fumo";
     repo = "syshud";
-    rev = "60d3e362cf6983e7d7ebea7584a8bd84eb815f4c";
-    hash = "sha256-GxJWGRm7N/TgvAtuWXjusyUT7Pnuw0uIySp6i6Kn7Gs=";
+    rev = "57594787b68da8f221deb03295df21cc0b239b03";
+    hash = "sha256-8kXBcu2hUefV7ZEfqZdxg6Dz3vgxhekaZEhEqERP4ro=";
   };
 
   postPatch = ''

From 992b828a3b103bac3e126e72a155138049eb02ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 23:26:12 +0000
Subject: [PATCH 2755/6226] python3Packages.aioshelly: 13.14.0 -> 13.15.0

---
 pkgs/development/python-modules/aioshelly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioshelly/default.nix b/pkgs/development/python-modules/aioshelly/default.nix
index d14346e06d53..cc3dd6553951 100644
--- a/pkgs/development/python-modules/aioshelly/default.nix
+++ b/pkgs/development/python-modules/aioshelly/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "aioshelly";
-  version = "13.14.0";
+  version = "13.15.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = "aioshelly";
     tag = version;
-    hash = "sha256-yhmX5TFikTP9JbO089sHqm8QzC52z9f9JxK19qHhDyI=";
+    hash = "sha256-1LiBWoZNSvhTAYf5VDo4gmfTz1oiKgrkAseDOm1kYYI=";
   };
 
   build-system = [ setuptools ];

From b0a9ff0c0bb217a1c4c5efad3cfe302094f7e2fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 25 Oct 2025 14:51:49 -0700
Subject: [PATCH 2756/6226] edgetx: 2.11.2 -> 2.11.3

Diff: https://github.com/EdgeTX/edgetx/compare/v2.11.2...v2.11.3
---
 pkgs/by-name/ed/edgetx/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ed/edgetx/package.nix b/pkgs/by-name/ed/edgetx/package.nix
index def2ad783618..ff523a052d32 100644
--- a/pkgs/by-name/ed/edgetx/package.nix
+++ b/pkgs/by-name/ed/edgetx/package.nix
@@ -47,14 +47,14 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "edgetx";
-  version = "2.11.2";
+  version = "2.11.3";
 
   src = fetchFromGitHub {
     owner = "EdgeTX";
     repo = "edgetx";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-F3T1lX0FSSUIQxSlqLQHj7JrfF+20Ndv63zDA0sRzFQ=";
+    hash = "sha256-vlJsfebTWhdh6HDpUEA1QJJSVGMlcL49XFwIx4A9zHs=";
   };
 
   nativeBuildInputs = [
@@ -175,6 +175,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     mainProgram = "companion" + lib.concatStrings (lib.take 2 (lib.splitVersion finalAttrs.version));
     homepage = "https://edgetx.org/";
+    changelog = "https://github.com/EdgeTX/edgetx/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl2Only;
     platforms = [
       "i686-linux"

From db427484a7f8edd18ac7b5d892e86c54761b30fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Oct 2025 23:54:23 +0000
Subject: [PATCH 2757/6226] alpaca: 8.1.1 -> 8.2.2

---
 pkgs/by-name/al/alpaca/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix
index d7817a81488c..7cbb756bd831 100644
--- a/pkgs/by-name/al/alpaca/package.nix
+++ b/pkgs/by-name/al/alpaca/package.nix
@@ -24,14 +24,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "alpaca";
-  version = "8.1.1";
+  version = "8.2.2";
   pyproject = false; # Built with meson
 
   src = fetchFromGitHub {
     owner = "Jeffser";
     repo = "Alpaca";
     tag = version;
-    hash = "sha256-zZYz7hJocjhxFqsPgUj2jjNLOsoyHWLsZUBmCJyc87M=";
+    hash = "sha256-i1qNLV+oKkZlS/v8jfJJc67lJBuW6j2Uz93vb1StD6g=";
   };
 
   nativeBuildInputs = [

From 3fa2e51915a5171a591bfb237ee16e5bc93a6ef7 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 21:02:25 -0300
Subject: [PATCH 2758/6226] orthanc-plugin-dicomweb: fix build with cmake4

---
 pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix b/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix
index 97f005210d66..5670e6bf3e12 100644
--- a/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix
+++ b/pkgs/by-name/or/orthanc-plugin-dicomweb/package.nix
@@ -54,6 +54,9 @@ stdenv.mkDerivation (finalAttrs: {
     ln -s ${axios} ThirdPartyDownloads/axios-0.19.0.tar.gz
     ln -s ${font-awesome} ThirdPartyDownloads/Font-Awesome-4.7.0.tar.gz
     ln -s ${babel-polyfill} ThirdPartyDownloads/babel-polyfill-6.26.0.min.js.gz
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   SourceRoot = "${finalAttrs.src.name}/Build";

From 27f8b56333101ef98ebcde4a27d0d7c2e01cc28b Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sun, 26 Oct 2025 02:09:22 +0200
Subject: [PATCH 2759/6226] pykdl: 1.5.1 -> 1.5.3

---
 pkgs/development/python-modules/pykdl/default.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/development/python-modules/pykdl/default.nix b/pkgs/development/python-modules/pykdl/default.nix
index 6670f6d145d0..49409e6bb131 100644
--- a/pkgs/development/python-modules/pykdl/default.nix
+++ b/pkgs/development/python-modules/pykdl/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   toPythonModule,
-  fetchpatch,
   cmake,
   pybind11,
   orocos-kdl,
@@ -17,15 +16,6 @@ toPythonModule (
 
     sourceRoot = "${orocos-kdl.src.name}/python_orocos_kdl";
 
-    patches = [
-      # Support system pybind11; the vendored copy doesn't support Python 3.11
-      (fetchpatch {
-        url = "https://github.com/orocos/orocos_kinematics_dynamics/commit/e25a13fc5820dbca6b23d10506407bca9bcdd25f.patch";
-        hash = "sha256-NGMVGEYsa7hVX+SgRZgeSm93BqxFR1uiyFvzyF5H0Y4=";
-        stripLen = 1;
-      })
-    ];
-
     # Fix hardcoded installation path
     postPatch = ''
       substituteInPlace CMakeLists.txt \

From 407bf38ca1a4f825685bf19e9d14eb92e965977a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 00:26:08 +0000
Subject: [PATCH 2760/6226] tbox: 1.7.7 -> 1.7.8

---
 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 16f26e2d82d4..0077ef701cfd 100644
--- a/pkgs/by-name/tb/tbox/package.nix
+++ b/pkgs/by-name/tb/tbox/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tbox";
-  version = "1.7.7";
+  version = "1.7.8";
 
   src = fetchFromGitHub {
     owner = "tboox";
     repo = "tbox";
     rev = "v${version}";
-    hash = "sha256-piPfPg3NAvP2zhWgtPlNvlAHoqIU77TE/kd1B/6GIuc=";
+    hash = "sha256-lAuazxlPOfZ7gWGS0pQ22Yk3PjgrB9wlxNkq1TTVEoM=";
   };
 
   configureFlags = [

From 27974ac3bd50b89bf156ddb26b0819c5b2829d8e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 00:29:19 +0000
Subject: [PATCH 2761/6226] cdncheck: 1.2.6 -> 1.2.7

---
 pkgs/by-name/cd/cdncheck/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix
index a9c669125dd5..3adab037a612 100644
--- a/pkgs/by-name/cd/cdncheck/package.nix
+++ b/pkgs/by-name/cd/cdncheck/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "cdncheck";
-  version = "1.2.6";
+  version = "1.2.7";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cdncheck";
     tag = "v${version}";
-    hash = "sha256-MZA9PkDftUyHqcC5i9QLvMTq+q1m7MVEkMPyD4EiWtk=";
+    hash = "sha256-Tit9AJ6V20vutd4veymlyi9thstcf6+sefHfhGeRQ68=";
   };
 
-  vendorHash = "sha256-tPhWKjaoUHQq6MdhktSZpfF7651YKeWd9ecg8V3E6aQ=";
+  vendorHash = "sha256-n0/9VLnB4y0YSbc6fu9SP0sWfGFSh7QgZfJkHMJB80U=";
 
   subPackages = [ "cmd/cdncheck/" ];
 

From 8f64809f5615b2f914c4cf768447512b0567dfbe Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 25 Oct 2025 20:44:31 -0400
Subject: [PATCH 2762/6226] Revert "python3Packages.smolagents: temporary fix
 for transformers compat"

No longer needed.

This reverts commit e362bff9a3541b66413594874135d3cb720f0e59.
---
 pkgs/development/python-modules/smolagents/default.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/pkgs/development/python-modules/smolagents/default.nix b/pkgs/development/python-modules/smolagents/default.nix
index 86e6a46ea26a..651f53a55a50 100644
--- a/pkgs/development/python-modules/smolagents/default.nix
+++ b/pkgs/development/python-modules/smolagents/default.nix
@@ -62,15 +62,6 @@ buildPythonPackage rec {
     hash = "sha256-X9tJfNxF2icULyma0dWIQEllY9oKaCB+MQ4JJTdzhz4=";
   };
 
-  # TODO: remove at the next release
-  # ImportError: cannot import name 'require_soundfile' from 'transformers.testing_utils'
-  # Caused by: https://github.com/huggingface/transformers/commit/1ecd52e50a31e7c344c32564e0484d7e9a0f2256
-  # Fixed in: https://github.com/huggingface/smolagents/pull/1625
-  postPatch = ''
-    substituteInPlace tests/test_types.py \
-      --replace-fail "require_soundfile" "require_torchcodec"
-  '';
-
   build-system = [ setuptools ];
 
   dependencies = [

From 4a0b8d6ae82613cef811caab7f6125cb9ca80bd9 Mon Sep 17 00:00:00 2001
From: Zaechus <zaechus@pm.me>
Date: Sat, 25 Oct 2025 19:12:12 -0600
Subject: [PATCH 2763/6226] endless-sky: 0.10.14 -> 0.10.16

---
 pkgs/by-name/en/endless-sky/package.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/en/endless-sky/package.nix b/pkgs/by-name/en/endless-sky/package.nix
index dcca64a2730c..ea0ad87f3fef 100644
--- a/pkgs/by-name/en/endless-sky/package.nix
+++ b/pkgs/by-name/en/endless-sky/package.nix
@@ -3,9 +3,12 @@
   stdenv,
   fetchFromGitHub,
   SDL2,
+  libavif,
   libpng,
   libjpeg,
+  libogg,
   libX11,
+  flac,
   glew,
   openal,
   cmake,
@@ -17,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "endless-sky";
-  version = "0.10.14";
+  version = "0.10.16";
 
   src = fetchFromGitHub {
     owner = "endless-sky";
     repo = "endless-sky";
     tag = "v${version}";
-    hash = "sha256-/jW9TXmK2xgHUQe6H+WSCHPQthxvoNepdkdnOD3sXXo=";
+    hash = "sha256-QO7Yv8H7hvavyOG/G9+HZh+a7XlCAf7fyPlszvOF91M=";
   };
 
   patches = [
@@ -47,9 +50,12 @@ stdenv.mkDerivation rec {
 
   buildInputs = [
     SDL2
+    libavif
     libpng
     libjpeg
+    libogg
     libX11
+    flac
     glew
     openal
     libmad

From 09ef84adeb8a369791400939136841c3751b5086 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sun, 26 Oct 2025 09:21:36 +0800
Subject: [PATCH 2764/6226] quba: add updateScript

---
 pkgs/by-name/qu/quba/package.nix | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/qu/quba/package.nix b/pkgs/by-name/qu/quba/package.nix
index 18e95f6bc801..f042912153c1 100644
--- a/pkgs/by-name/qu/quba/package.nix
+++ b/pkgs/by-name/qu/quba/package.nix
@@ -4,12 +4,21 @@
   appimageTools,
   fetchurl,
   _7zz,
+  writeShellScript,
+  nix-update,
+  common-updater-scripts,
 }:
 
 let
   pname = "quba";
   version = "1.4.2";
 
+  passthru.updateScript = writeShellScript "update-quiet" ''
+    ${lib.getExe nix-update} --system=x86_64-linux quba
+    hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix eval --raw --file . quba.src.url --system aarch64-darwin)))
+    ${lib.getExe' common-updater-scripts "update-source-version"} quba $hash --system=aarch64-darwin --ignore-same-version
+  '';
+
   meta = {
     description = "Viewer for electronic invoices";
     homepage = "https://github.com/ZUGFeRD/quba-viewer";
@@ -25,13 +34,14 @@ let
     hash = "sha256-3goMWN5GeQaLJimUKbjozJY/zJmqc9Mvy2+6bVSt1p0=";
   };
 
-  appimageContents = appimageTools.extractType1 { inherit pname version src; };
+  appimageContents = appimageTools.extractType2 { inherit pname version src; };
 
-  linux = appimageTools.wrapType1 {
+  linux = appimageTools.wrapType2 {
     inherit
       pname
       version
       src
+      passthru
       meta
       ;
 
@@ -44,7 +54,12 @@ let
   };
 
   darwin = stdenvNoCC.mkDerivation {
-    inherit pname version meta;
+    inherit
+      pname
+      version
+      passthru
+      meta
+      ;
 
     src = fetchurl {
       url = "https://github.com/ZUGFeRD/quba-viewer/releases/download/v${version}/Quba-${version}-universal.dmg";

From f6ba5043257eacb20851be1ff438aa7efcad49c5 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Sun, 26 Oct 2025 03:21:50 +0200
Subject: [PATCH 2765/6226] azahar: fix build with qt 6.10

---
 pkgs/by-name/az/azahar/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix
index 723afbd6da93..5bf7c063134b 100644
--- a/pkgs/by-name/az/azahar/package.nix
+++ b/pkgs/by-name/az/azahar/package.nix
@@ -44,6 +44,7 @@
   nix-update-script,
   darwinMinVersionHook,
   apple-sdk_12,
+  fetchpatch2,
 }:
 let
   inherit (lib)
@@ -65,6 +66,12 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     # https://github.com/azahar-emu/azahar/pull/1305
     ./fix-zstd-seekable-include.patch
+
+    # TODO: Remove in next release
+    (fetchpatch2 {
+      url = "https://github.com/azahar-emu/azahar/commit/1f483e1d335374482845d0325ac8b13af3162c53.patch?full_index=1";
+      hash = "sha256-9rmRbv7VFMhHly5qTGaeBLpvtWMu6HkCGUUM+t78Meg=";
+    })
   ];
 
   strictDeps = true;

From 9a250cad2341b8ad6bfbf2c19b9d2bb6629ffad3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 01:46:21 +0000
Subject: [PATCH 2766/6226] lsp-plugins: 1.2.23 -> 1.2.24

---
 pkgs/by-name/ls/lsp-plugins/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ls/lsp-plugins/package.nix b/pkgs/by-name/ls/lsp-plugins/package.nix
index 1874f7502232..5c5e0ecbd65b 100644
--- a/pkgs/by-name/ls/lsp-plugins/package.nix
+++ b/pkgs/by-name/ls/lsp-plugins/package.nix
@@ -21,7 +21,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lsp-plugins";
-  version = "1.2.23";
+  version = "1.2.24";
 
   outputs = [
     "out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://github.com/lsp-plugins/lsp-plugins/releases/download/${finalAttrs.version}/lsp-plugins-src-${finalAttrs.version}.tar.gz";
-    hash = "sha256-GxjSnDsEPiXbaJ9khSvgQZeVONxWf4WJilurHpSf14w=";
+    hash = "sha256-rDKf3PqRa+lLZcHGQNRXBGkcnhkMNdE9Jok4n3/btGM=";
   };
 
   # By default, GStreamer plugins are installed right alongside GStreamer itself

From e2af535267998163855eb86f43fba7704477c610 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Sun, 26 Oct 2025 01:52:09 +0000
Subject: [PATCH 2767/6226] libime: 1.1.11 -> 1.1.12

Diff: https://github.com/fcitx/libime/compare/1.1.11...1.1.12
---
 pkgs/by-name/li/libime/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libime/package.nix b/pkgs/by-name/li/libime/package.nix
index 83c0aa518c91..e343ffe2b0fa 100644
--- a/pkgs/by-name/li/libime/package.nix
+++ b/pkgs/by-name/li/libime/package.nix
@@ -30,13 +30,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "libime";
-  version = "1.1.11";
+  version = "1.1.12";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "libime";
     tag = version;
-    hash = "sha256-C9l7VBSUdSpnt+8ghdmLljZXHFswTyi/ItqeeYTjF4Y=";
+    hash = "sha256-LqbwXpmqUCbaKHaaE9pOrHb1Qdp20/S3QEf9F4/3oiE=";
     fetchSubmodules = true;
   };
 

From 99cf3535d90a5e24a0857ad1c2e66d7b0d0d25c1 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Sun, 26 Oct 2025 01:52:13 +0000
Subject: [PATCH 2768/6226] fcitx5: 5.1.14 -> 5.1.15

Diff: https://github.com/fcitx/fcitx5/compare/5.1.14...5.1.15
---
 pkgs/tools/inputmethods/fcitx5/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix
index 2430a7eb7f68..e2f98fb417cc 100644
--- a/pkgs/tools/inputmethods/fcitx5/default.nix
+++ b/pkgs/tools/inputmethods/fcitx5/default.nix
@@ -45,13 +45,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "fcitx5";
-  version = "5.1.14";
+  version = "5.1.15";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-wLJZyoWjf02+m8Kw+IcfbZY2NnjMGtCWur2+w141eS4=";
+    hash = "sha256-g9qDdDx+y/Vmky3pjlG77wsVERWB7ZpnDw+edhYw9Ss=";
   };
 
   prePatch = ''

From 2e6b05850e10202c95c8846835fe2c950cde515f Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Sun, 26 Oct 2025 01:52:17 +0000
Subject: [PATCH 2769/6226] fcitx5-anthy: 5.1.7 -> 5.1.8

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix
index 40fca5e8278a..609f75a25ee9 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-anthy.nix
@@ -13,11 +13,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-anthy";
-  version = "5.1.7";
+  version = "5.1.8";
 
   src = fetchurl {
     url = "https://download.fcitx-im.org/fcitx5/fcitx5-anthy/${pname}-${version}.tar.zst";
-    hash = "sha256-lY5GFbeIee7u1NsLbkYt6BvST9lidvZLpaylL0wE2+0=";
+    hash = "sha256-O/fpLWh5eE22lZEz4cyI60Xf/rTWpTCWjAib3y0Yac8=";
   };
 
   nativeBuildInputs = [

From 1b7af43ca5a16c1fa4e7640fff1bab4e7c607b13 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Sun, 26 Oct 2025 01:52:19 +0000
Subject: [PATCH 2770/6226] fcitx5-chewing: 5.1.8 -> 5.1.9

Diff: https://github.com/fcitx/fcitx5-chewing/compare/5.1.8...5.1.9
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
index fec6db51d888..37dc4795f020 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chewing.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-chewing";
-  version = "5.1.8";
+  version = "5.1.9";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-On8lbZL7hyY399a/q6iCNkDvRljv3zirzEO1wIG+MNE=";
+    hash = "sha256-xl6jNC1tud121rnUFsphF0A739W16Vb9Qx4v1+vu99U=";
   };
 
   nativeBuildInputs = [

From e7eb129bbf6122c1556f69f4178e0374338b9d93 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sun, 26 Oct 2025 09:57:36 +0800
Subject: [PATCH 2771/6226] quba: 1.4.2 -> 1.5.0

---
 pkgs/by-name/qu/quba/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/qu/quba/package.nix b/pkgs/by-name/qu/quba/package.nix
index f042912153c1..0b3cf029a91b 100644
--- a/pkgs/by-name/qu/quba/package.nix
+++ b/pkgs/by-name/qu/quba/package.nix
@@ -11,12 +11,12 @@
 
 let
   pname = "quba";
-  version = "1.4.2";
+  version = "1.5.0";
 
   passthru.updateScript = writeShellScript "update-quiet" ''
     ${lib.getExe nix-update} --system=x86_64-linux quba
     hash=$(nix hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix eval --raw --file . quba.src.url --system aarch64-darwin)))
-    ${lib.getExe' common-updater-scripts "update-source-version"} quba $hash --system=aarch64-darwin --ignore-same-version
+    ${lib.getExe' common-updater-scripts "update-source-version"} quba $(nix eval --raw --file . quba.version) $hash --system=aarch64-darwin --ignore-same-version
   '';
 
   meta = {
@@ -31,7 +31,7 @@ let
 
   src = fetchurl {
     url = "https://github.com/ZUGFeRD/quba-viewer/releases/download/v${version}/Quba-${version}.AppImage";
-    hash = "sha256-3goMWN5GeQaLJimUKbjozJY/zJmqc9Mvy2+6bVSt1p0=";
+    hash = "sha256-xB1r8DNFOFQQx+MeGC1mWhf7PuMavM7DyYRBlEjAZ8k=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
@@ -63,7 +63,7 @@ let
 
     src = fetchurl {
       url = "https://github.com/ZUGFeRD/quba-viewer/releases/download/v${version}/Quba-${version}-universal.dmg";
-      hash = "sha256-q7va2D9AT0BoPhfkub/RFQxGyF12uFaCDpSYIxslqMc=";
+      hash = "sha256-niuU1zkxNRmCYxzto3g6i6Z3k5KCAgVIVQMgOLZJnSE=";
     };
 
     unpackCmd = "7zz x -bd -osource -xr'!*/Applications' -xr'!*com.apple.provenance' $curSrc";

From 7e60a3b84c07e3dcc836b46bf134befa607e388f Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sun, 26 Oct 2025 10:16:51 +0800
Subject: [PATCH 2772/6226] qovery-cli: 1.2.6 -> 1.52.0

Diff: https://github.com/Qovery/qovery-cli/compare/v1.2.6...v1.52.0

Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v1.52.0
---
 pkgs/by-name/qo/qovery-cli/package.nix | 47 ++++++++++++++++----------
 1 file changed, 30 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/qo/qovery-cli/package.nix b/pkgs/by-name/qo/qovery-cli/package.nix
index 5e8ae9bec2ef..1e93754bb9e8 100644
--- a/pkgs/by-name/qo/qovery-cli/package.nix
+++ b/pkgs/by-name/qo/qovery-cli/package.nix
@@ -4,43 +4,56 @@
   buildGoModule,
   fetchFromGitHub,
   installShellFiles,
-  qovery-cli,
-  testers,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "qovery-cli";
-  version = "1.2.6";
+  version = "1.52.0";
 
   src = fetchFromGitHub {
     owner = "Qovery";
     repo = "qovery-cli";
-    tag = "v${version}";
-    hash = "sha256-NxrhZmRbkQNj2K4b6Em4cAdssJRdwEKbdGy8EThN4JY=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-m6NdZ4K0FAZvTloworoK3Lluu9ySCGfS4L216ImByb8=";
   };
 
-  vendorHash = "sha256-GKW89qzyuvwCUvN0i+LgU36Vtr5XuvgXIxwnMlGSTFg=";
+  vendorHash = "sha256-9rAAeJVKBndb4w3LNJLLBvkX5me/Y3GnA55SYGOxqi4=";
+
+  env.CGO_ENABLED = 0;
+
+  ldflags = [ "-X github.com/qovery/qovery-cli/utils.Version=v${finalAttrs.version}" ];
 
   nativeBuildInputs = [ installShellFiles ];
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
-    installShellCompletion --cmd ${pname} \
-      --bash <($out/bin/${pname} completion bash) \
-      --fish <($out/bin/${pname} completion fish) \
-      --zsh <($out/bin/${pname} completion zsh)
+    installShellCompletion --cmd qovery-cli \
+      --bash <($out/bin/qovery-cli completion bash) \
+      --fish <($out/bin/qovery-cli completion fish) \
+      --zsh <($out/bin/qovery-cli completion zsh)
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = qovery-cli;
-    command = "HOME=$(mktemp -d); ${pname} version";
-  };
+  # need network
+  doCheck = false;
+
+  doInstallCheck = true;
+
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  versionCheckKeepEnvironment = [ "HOME" ];
+
+  versionCheckProgramArg = "version";
 
   meta = {
     description = "Qovery Command Line Interface";
     homepage = "https://github.com/Qovery/qovery-cli";
-    changelog = "https://github.com/Qovery/qovery-cli/releases/tag/v${version}";
+    changelog = "https://github.com/Qovery/qovery-cli/releases/tag/v${finalAttrs.version}";
     license = with lib.licenses; [ asl20 ];
     maintainers = with lib.maintainers; [ fab ];
     mainProgram = "qovery-cli";
   };
-}
+})

From 9289ae7be23ab4f75689f4d5b3b0412d7f892832 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 26 Oct 2025 10:17:17 +0800
Subject: [PATCH 2773/6226] pantheon.elementary-files: 7.1.5 -> 7.1.6

https://github.com/elementary/files/compare/7.1.5...7.1.6
---
 pkgs/desktops/pantheon/apps/elementary-files/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
index 89c4f06872b5..1fbd44a3e8ec 100644
--- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix
@@ -26,7 +26,7 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-files";
-  version = "7.1.5";
+  version = "7.1.6";
 
   outputs = [
     "out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     owner = "elementary";
     repo = "files";
     rev = version;
-    hash = "sha256-fS285BRTP/i50WE4oM+xgoj6cBgas+dQ6WdK9WebURQ=";
+    hash = "sha256-z6trjczB+ZLPvWO/R41PTSA1tSBIVD/kMF12TupwId4=";
   };
 
   nativeBuildInputs = [

From 0b8b18cd2b74852ad0a00a9aa4c41d76ecd84dd3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 02:23:06 +0000
Subject: [PATCH 2774/6226] stasis: 0.5.0 -> 0.5.1

---
 pkgs/by-name/st/stasis/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/stasis/package.nix b/pkgs/by-name/st/stasis/package.nix
index 916cbb056f6e..54dbec552df9 100644
--- a/pkgs/by-name/st/stasis/package.nix
+++ b/pkgs/by-name/st/stasis/package.nix
@@ -14,16 +14,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "stasis";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "saltnpepper97";
     repo = "stasis";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gJB/y6jSBJZjBTQB9sxbVpllSfF6jwKOEeLqlgIStMA=";
+    hash = "sha256-tRw5sHj3nEwcEviEKKcfSUyY16MjsFzLcmnb0/AtAME=";
   };
 
-  cargoHash = "sha256-JX0imd+FuuBq8d3FAYEQ+LLZQV39f8Iu9ftLASs00Fc=";
+  cargoHash = "sha256-qfS/AR4XjFUeYpz7tNJ31B5fkVsxvXlwFpNe8U3J94o=";
 
   nativeBuildInputs = [
     pkg-config

From 0c738595d0033921bfcd4ebf052bb0fe62ec9278 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sun, 26 Oct 2025 10:24:36 +0800
Subject: [PATCH 2775/6226] qmmp: 2.2.8 -> 2.3.0

---
 pkgs/by-name/qm/qmmp/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/qm/qmmp/package.nix b/pkgs/by-name/qm/qmmp/package.nix
index 0006efa17170..e8484a125b40 100644
--- a/pkgs/by-name/qm/qmmp/package.nix
+++ b/pkgs/by-name/qm/qmmp/package.nix
@@ -52,13 +52,13 @@
 # Qmmp installs working .desktop file(s) all by itself, so we don't need to
 # handle that.
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qmmp";
-  version = "2.2.8";
+  version = "2.3.0";
 
   src = fetchurl {
-    url = "https://qmmp.ylsoftware.com/files/qmmp/2.2/${pname}-${version}.tar.bz2";
-    hash = "sha256-cwqXoGOkmOs32p4vgZjf5XBpPmpsfyshDVgb2H27k4o=";
+    url = "https://qmmp.ylsoftware.com/files/qmmp/2.3/qmmp-${finalAttrs.version}.tar.bz2";
+    hash = "sha256-AcPjA2fIhReM0RVZTSD2lKR6NS/X5l/PVyLhKsgzMGM=";
   };
 
   nativeBuildInputs = [
@@ -107,12 +107,12 @@ stdenv.mkDerivation rec {
     libsamplerate
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Qt-based audio player that looks like Winamp";
     mainProgram = "qmmp";
     homepage = "https://qmmp.ylsoftware.com/";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = [ maintainers.bjornfor ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
+    maintainers = [ lib.maintainers.bjornfor ];
   };
-}
+})

From e5a05993d58bf02e4026151c0d10f49473f4182d Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Sun, 26 Oct 2025 10:34:00 +0800
Subject: [PATCH 2776/6226] qmidinet: 0.9.4 -> 1.0.1

---
 pkgs/by-name/qm/qmidinet/package.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/qm/qmidinet/package.nix b/pkgs/by-name/qm/qmidinet/package.nix
index ba981125e1ac..31e537b371ed 100644
--- a/pkgs/by-name/qm/qmidinet/package.nix
+++ b/pkgs/by-name/qm/qmidinet/package.nix
@@ -2,33 +2,35 @@
   stdenv,
   lib,
   fetchurl,
+  cmake,
   pkg-config,
   alsa-lib,
   libjack2,
-  libsForQt5,
+  qt6,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "0.9.4";
+  version = "1.0.1";
   pname = "qmidinet";
 
   src = fetchurl {
     url = "mirror://sourceforge/qmidinet/qmidinet-${finalAttrs.version}.tar.gz";
-    sha256 = "sha256-7Ui4kUgYgpPVAaaINrd6WGZoYon5UuHszGVaHafb/p0=";
+    hash = "sha256-9V1KXK6LAYxM+kei14pof93hZQUDs7/ywRaSz6pwyyk=";
   };
 
   hardeningDisable = [ "format" ];
 
   buildInputs = [
-    libsForQt5.qtbase
-    libsForQt5.qttools
+    qt6.qtbase
+    qt6.qttools
     alsa-lib
     libjack2
   ];
 
   nativeBuildInputs = [
+    cmake
     pkg-config
-    libsForQt5.wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   meta = {

From afd532ae76659e0a2557aa412699b47e5bf6c1e1 Mon Sep 17 00:00:00 2001
From: Gavin John <gavinnjohn@gmail.com>
Date: Sat, 25 Oct 2025 19:36:54 -0700
Subject: [PATCH 2777/6226] cosmic-initial-setup: mark as nixpkgs-update: no
 auto update

---
 pkgs/by-name/co/cosmic-initial-setup/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/co/cosmic-initial-setup/package.nix b/pkgs/by-name/co/cosmic-initial-setup/package.nix
index 252c3898567a..50d475808d86 100644
--- a/pkgs/by-name/co/cosmic-initial-setup/package.nix
+++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix
@@ -16,6 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-initial-setup";
   version = "1.0.0-beta.3";
 
+  # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-initial-setup";

From 084f8034d5989ab509ef729549474271f0b20341 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 02:40:54 +0000
Subject: [PATCH 2778/6226] static-web-server: 2.38.1 -> 2.39.0

---
 pkgs/by-name/st/static-web-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/static-web-server/package.nix b/pkgs/by-name/st/static-web-server/package.nix
index a63834f958fc..75ee43e817b3 100644
--- a/pkgs/by-name/st/static-web-server/package.nix
+++ b/pkgs/by-name/st/static-web-server/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "static-web-server";
-  version = "2.38.1";
+  version = "2.39.0";
 
   src = fetchFromGitHub {
     owner = "static-web-server";
     repo = "static-web-server";
     rev = "v${version}";
-    hash = "sha256-fcD1jd9kwm/jCYdvNGEnanLO/wUKeYy5OqOeQE2lGP4=";
+    hash = "sha256-iprQlSHO+ac7v1odVoS/9IU+Zov8/xh1l9pm1PJE8fs=";
   };
 
-  cargoHash = "sha256-rfhRMQb7MX2722wcMk35qATav6WFFULy3Ix3WcC7r4M=";
+  cargoHash = "sha256-rNrGlgUvPezX7RnKhprRjl9DiJ/Crt4phmxnfY9tNXA=";
 
   # Some tests rely on timestamps newer than 18 Nov 1974 00:00:00
   preCheck = ''

From daa8c8d7ecc00889b6ad5eed50e3021c7085ffcf Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 26 Oct 2025 10:42:01 +0800
Subject: [PATCH 2779/6226] pantheon-tweaks: 2.4.0 -> 2.5.0

https://github.com/pantheon-tweaks/pantheon-tweaks/compare/2.4.0...2.5.0
---
 pkgs/by-name/pa/pantheon-tweaks/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/pantheon-tweaks/package.nix b/pkgs/by-name/pa/pantheon-tweaks/package.nix
index b18666199594..f2b8bdc485b8 100644
--- a/pkgs/by-name/pa/pantheon-tweaks/package.nix
+++ b/pkgs/by-name/pa/pantheon-tweaks/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pantheon-tweaks";
-  version = "2.4.0";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "pantheon-tweaks";
     repo = "pantheon-tweaks";
     rev = version;
-    hash = "sha256-/fHhVErLIQMSRkri6vqc11yZr0YaLeQTUh986If8mVg=";
+    hash = "sha256-cCrHGOo7dZc28hbZD6Zv8Dw4Ks5JTDsm6A6nkmpUAxk=";
   };
 
   nativeBuildInputs = [

From ceb53c2180c0dea8a0313548a87c7305d39c9d92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 25 Oct 2025 19:51:33 -0700
Subject: [PATCH 2780/6226] python3Packages.mlflow: unpin cryptography

---
 pkgs/development/python-modules/mlflow/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/mlflow/default.nix b/pkgs/development/python-modules/mlflow/default.nix
index 827ac4bc8686..79cee0a8c20e 100644
--- a/pkgs/development/python-modules/mlflow/default.nix
+++ b/pkgs/development/python-modules/mlflow/default.nix
@@ -83,6 +83,7 @@ buildPythonPackage rec {
   };
 
   pythonRelaxDeps = [
+    "cryptography"
     "gunicorn"
     "importlib-metadata"
     "packaging"

From 4ca6fa7dc8fddef215461d1f6b85f1a5be996ffa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 25 Oct 2025 20:00:14 -0700
Subject: [PATCH 2781/6226] python3Packages.clldutils: use unversioned
 bibtexparser

Python packages' dependencies may only contain unversioned attributes.
---
 pkgs/development/python-modules/clldutils/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/clldutils/default.nix b/pkgs/development/python-modules/clldutils/default.nix
index 1dc7cc8de508..93e318059b08 100644
--- a/pkgs/development/python-modules/clldutils/default.nix
+++ b/pkgs/development/python-modules/clldutils/default.nix
@@ -4,7 +4,7 @@
   buildPythonPackage,
   colorlog,
   fetchFromGitHub,
-  bibtexparser_2,
+  bibtexparser,
   git,
   lxml,
   markdown,
@@ -36,7 +36,7 @@ buildPythonPackage rec {
 
   dependencies = [
     attrs
-    bibtexparser_2
+    bibtexparser
     colorlog
     lxml
     markdown
@@ -55,6 +55,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
+    broken = lib.versionOlder bibtexparser.version "2";
     changelog = "https://github.com/clld/clldutils/blob/${src.tag}/CHANGES.md";
     description = "Utilities for clld apps without the overhead of requiring pyramid, rdflib et al";
     homepage = "https://github.com/clld/clldutils";

From 241a0d2826b821027854b1bbf9a9b615d9f8363f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 25 Oct 2025 20:07:01 -0700
Subject: [PATCH 2782/6226] python3Packages.py-stringmatching: use unversioned
 numpy

Python packages' dependencies may only contain unversioned attributes.
---
 .../development/python-modules/py-stringmatching/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/py-stringmatching/default.nix b/pkgs/development/python-modules/py-stringmatching/default.nix
index 4ec1fe9cfad0..e1b4f98718d7 100644
--- a/pkgs/development/python-modules/py-stringmatching/default.nix
+++ b/pkgs/development/python-modules/py-stringmatching/default.nix
@@ -8,7 +8,7 @@
   setuptools,
 
   # dependencies
-  numpy_1,
+  numpy,
   six,
 
   # tests
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
-    numpy_1
+    numpy
     six
   ];
 
@@ -47,6 +47,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "py_stringmatching" ];
 
   meta = with lib; {
+    broken = lib.versionAtLeast numpy.version "2";
     description = "Python string matching library including string tokenizers and string similarity measures";
     homepage = "https://github.com/anhaidgroup/py_stringmatching";
     changelog = "https://github.com/anhaidgroup/py_stringmatching/blob/v${version}/CHANGES.txt";

From 359efceeed8f045ebf09a3a5c1c7029eee23ac16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 25 Oct 2025 20:12:09 -0700
Subject: [PATCH 2783/6226] python3Packages.monotonic-alignment-search: run
 tests

---
 .../monotonic-alignment-search/default.nix           | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/monotonic-alignment-search/default.nix b/pkgs/development/python-modules/monotonic-alignment-search/default.nix
index 552ba96f80af..261a53d33b6c 100644
--- a/pkgs/development/python-modules/monotonic-alignment-search/default.nix
+++ b/pkgs/development/python-modules/monotonic-alignment-search/default.nix
@@ -6,10 +6,13 @@
   # build-system
   setuptools,
   cython,
-  numpy_2,
+  numpy,
 
   # dependencies
   torch,
+
+  # tests
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -27,14 +30,17 @@ buildPythonPackage rec {
   build-system = [
     setuptools
     cython
-    numpy_2
+    numpy
   ];
 
   dependencies = [
+    numpy
     torch
   ];
 
-  enabledTestPaths = [ "tests" ];
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "monotonic_alignment_search" ];
 

From ed3e0dc19073f8813006f6ff5d0a3c682730515f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 25 Oct 2025 20:26:20 -0700
Subject: [PATCH 2784/6226] alpaca: use bibtexparser_2

It's required by clldutils, which kokoro transitively depends on.
---
 pkgs/by-name/al/alpaca/package.nix | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix
index d7817a81488c..3351add4c03b 100644
--- a/pkgs/by-name/al/alpaca/package.nix
+++ b/pkgs/by-name/al/alpaca/package.nix
@@ -22,7 +22,14 @@
   pipewire,
 }:
 
-python3Packages.buildPythonApplication rec {
+let
+  pythonPackages = python3Packages.overrideScope (
+    self: super: {
+      bibtexparser = self.bibtexparser_2;
+    }
+  );
+in
+pythonPackages.buildPythonApplication rec {
   pname = "alpaca";
   version = "8.1.1";
   pyproject = false; # Built with meson
@@ -56,7 +63,7 @@ python3Packages.buildPythonApplication rec {
   ];
 
   dependencies =
-    with python3Packages;
+    with pythonPackages;
     [
       pygobject3
       requests
@@ -74,7 +81,7 @@ python3Packages.buildPythonApplication rec {
     ]
     ++ lib.flatten (builtins.attrValues optional-dependencies);
 
-  optional-dependencies = with python3Packages; {
+  optional-dependencies = with pythonPackages; {
     speech-to-text = [
       openai-whisper
       pyaudio

From 070a683623d936a067eb9e3e62a9c1144c624316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 25 Oct 2025 20:28:51 -0700
Subject: [PATCH 2785/6226] phonemizer: use bibtexparser_2

It's required by clldutils, which segments depends on.
---
 pkgs/by-name/ph/phonemizer/package.nix | 13 +++++++++++++
 pkgs/top-level/all-packages.nix        |  2 --
 2 files changed, 13 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/ph/phonemizer/package.nix

diff --git a/pkgs/by-name/ph/phonemizer/package.nix b/pkgs/by-name/ph/phonemizer/package.nix
new file mode 100644
index 000000000000..1a49b263f00c
--- /dev/null
+++ b/pkgs/by-name/ph/phonemizer/package.nix
@@ -0,0 +1,13 @@
+{
+  python3Packages,
+}:
+
+let
+  pythonPackages = python3Packages.overrideScope (
+    self: super: {
+      bibtexparser = self.bibtexparser_2;
+    }
+  );
+in
+with pythonPackages;
+toPythonApplication phonemizer
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b7f19fb3a1df..911fdc7cdb23 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13038,8 +13038,6 @@ with pkgs;
   cri-o = callPackage ../applications/virtualization/cri-o/wrapper.nix { };
   cri-o-unwrapped = callPackage ../applications/virtualization/cri-o { };
 
-  phonemizer = with python3Packages; toPythonApplication phonemizer;
-
   ### GAMES
 
   inherit (callPackages ../games/fteqw { })

From 42c39ab634fdff8e8fdb04fce8f19d5e91e8b936 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 03:39:01 +0000
Subject: [PATCH 2786/6226] hugo: 0.151.2 -> 0.152.2

---
 pkgs/by-name/hu/hugo/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix
index c29355592438..751af66bee41 100644
--- a/pkgs/by-name/hu/hugo/package.nix
+++ b/pkgs/by-name/hu/hugo/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "hugo";
-  version = "0.151.2";
+  version = "0.152.2";
 
   src = fetchFromGitHub {
     owner = "gohugoio";
     repo = "hugo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jCHKXqIQBeSyhkusTbygaoyqifayc6jFXY9ot/oWmtM=";
+    hash = "sha256-nSWeCRhbaEgr54VDstBKnouUeWR1JjLXEqtYUcEMdyQ=";
   };
 
-  vendorHash = "sha256-KJCpZ7rX2v98n7EXbfwL2wf6pLMDMHX7Mnugyh+nx6k=";
+  vendorHash = "sha256-3cIz3SWV/3vYhCgFEGAa+mOaUCzsJurkI2rPtVANE38=";
 
   checkFlags =
     let

From d8174ac656a1ffbaf971a3c015748a10acb658fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 03:50:50 +0000
Subject: [PATCH 2787/6226] grav: 1.7.50.2 -> 1.7.50.3

---
 pkgs/by-name/gr/grav/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gr/grav/package.nix b/pkgs/by-name/gr/grav/package.nix
index 89ea0e66bcca..97bba7bfb987 100644
--- a/pkgs/by-name/gr/grav/package.nix
+++ b/pkgs/by-name/gr/grav/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "1.7.50.2";
+  version = "1.7.50.3";
 in
 stdenvNoCC.mkDerivation {
   pname = "grav";
@@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation {
 
   src = fetchzip {
     url = "https://github.com/getgrav/grav/releases/download/${version}/grav-admin-v${version}.zip";
-    hash = "sha256-UaaROMdUNFX6gcbJnfRn9CopZ3nuIMD91CkHnujtnE4=";
+    hash = "sha256-W4JuW5NEko38AbLrLOGWYsRvehPV7+tX2Hq1tTZ22EY=";
   };
 
   patches = [

From 9f8d7a326e7fda7d0203f89c68a1f44a01730927 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 03:55:16 +0000
Subject: [PATCH 2788/6226] python3Packages.ha-mqtt-discoverable: 0.21.0 ->
 0.22.1

---
 .../python-modules/ha-mqtt-discoverable/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
index 7ec606f2aa9a..3d63444e20e5 100644
--- a/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
+++ b/pkgs/development/python-modules/ha-mqtt-discoverable/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "ha-mqtt-discoverable";
-  version = "0.21.0";
+  version = "0.22.1";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "unixorn";
     repo = "ha-mqtt-discoverable";
     tag = "v${version}";
-    hash = "sha256-p9qzK2pQDDLB6UVGNWYMd8M5/NicNbM4bnffxen48hQ=";
+    hash = "sha256-6xUfR9LR8xphex6EVX3u9VKjtvHhTX1EkC8KGPFtJzk=";
   };
 
   pythonRelaxDeps = [

From 1cf54fe9eddfcd5e5b55b0f6dfa72d93e3c7b9da Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 26 Oct 2025 05:24:27 +0100
Subject: [PATCH 2789/6226] python3Packages.psycopg: 3.2.11 -> 3.2.12

https://github.com/psycopg/psycopg/blob/3.2.12/docs/news.rst#current-release
---
 pkgs/development/python-modules/psycopg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix
index b65bf79ac52e..c360a08e7791 100644
--- a/pkgs/development/python-modules/psycopg/default.nix
+++ b/pkgs/development/python-modules/psycopg/default.nix
@@ -34,13 +34,13 @@
 
 let
   pname = "psycopg";
-  version = "3.2.11";
+  version = "3.2.12";
 
   src = fetchFromGitHub {
     owner = "psycopg";
     repo = "psycopg";
     tag = version;
-    hash = "sha256-x7ca/A6K0nbcKs2iv5f2rPct5GLd2E7lymT5QZC2B/g=";
+    hash = "sha256-g1mms12EqRiln5dK/BmBa9dd9duSPRgRIiZkVmSRaYI=";
   };
 
   patches = [

From 2c8de3ce1f520ae3a5f8ef86592b0e6c48e30150 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 04:37:53 +0000
Subject: [PATCH 2790/6226] jdk11: 11.0.29+5 -> 11.0.29+7

---
 pkgs/development/compilers/openjdk/11/source.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/11/source.json b/pkgs/development/compilers/openjdk/11/source.json
index ab37d28ec1be..04380496e601 100644
--- a/pkgs/development/compilers/openjdk/11/source.json
+++ b/pkgs/development/compilers/openjdk/11/source.json
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-u8SWC0T4rmQVV3TKfEW1/rCT8KWNsL5hZtUW3pXBIfA=",
+  "hash": "sha256-nFRxcL9fkh9NhDVTUwwOXhmFRBVPTq79zeUsWBdmIfk=",
   "owner": "openjdk",
   "repo": "jdk11u",
-  "rev": "refs/tags/jdk-11.0.29+5"
+  "rev": "refs/tags/jdk-11.0.29+7"
 }

From 1538c38939a0e9ceec30d14bf8fbc2db03175161 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 26 Oct 2025 05:45:38 +0100
Subject: [PATCH 2791/6226] python3Packages.tlds: 2025082700 -> 2025102200

https://github.com/kichik/tlds/compare/2025082700...2025102200
---
 pkgs/development/python-modules/tlds/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tlds/default.nix b/pkgs/development/python-modules/tlds/default.nix
index c07b7d8d6a91..51e7cfc95063 100644
--- a/pkgs/development/python-modules/tlds/default.nix
+++ b/pkgs/development/python-modules/tlds/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "tlds";
-  version = "2025082700";
+  version = "2025102200";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kichik";
     repo = "tlds";
     tag = version;
-    hash = "sha256-sMK+jglwhF8FX8yLDHBtheudfg20MOJhk+zHznQ0hbk=";
+    hash = "sha256-rulYXgVjzPcb5cBi57u4uzR6KDCp+NUaUMzi1o/SrN4=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 15cf89dd7a2f3c044a6d2f049b73170b4ba5f913 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 10:23:29 -0300
Subject: [PATCH 2792/6226] http-getter: fix build with cmake4

---
 pkgs/by-name/ht/http-getter/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ht/http-getter/package.nix b/pkgs/by-name/ht/http-getter/package.nix
index 956b5ff22bca..28e95f29aa76 100644
--- a/pkgs/by-name/ht/http-getter/package.nix
+++ b/pkgs/by-name/ht/http-getter/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   curl,
   pkg-config,
@@ -18,6 +19,14 @@ stdenv.mkDerivation {
     sha256 = "0plyqqwfm9bysichda0w3akbdxf6279wd4mx8mda0c4mxd4xy9nl";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "cmake4-fix";
+      url = "https://github.com/tohojo/http-getter/commit/a3646c4cd5f4558f942c2323bbeb83d82a6ce8c1.patch?full_index=1";
+      hash = "sha256-/fQP0AlEKm/hDj9POGjdAPoW4Z+UExaNnk9PbvW22uE=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config

From 5fcd91e377ffb9b1c929808bd56ef7d4b8317809 Mon Sep 17 00:00:00 2001
From: qbisi <qbisicwate@gmail.com>
Date: Sun, 26 Oct 2025 12:53:50 +0800
Subject: [PATCH 2793/6226] slepc: use slepcPackages scope

---
 pkgs/by-name/sl/slepc/package.nix | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/sl/slepc/package.nix b/pkgs/by-name/sl/slepc/package.nix
index 02a989552844..abb62b84377a 100644
--- a/pkgs/by-name/sl/slepc/package.nix
+++ b/pkgs/by-name/sl/slepc/package.nix
@@ -3,16 +3,22 @@
   stdenv,
   fetchFromGitLab,
   python3Packages,
-  arpack-mpi,
+  arpack,
   petsc,
-  mpi,
   mpiCheckPhaseHook,
   pythonSupport ? false,
   withExamples ? false,
   withArpack ? stdenv.hostPlatform.isLinux,
 }:
-assert petsc.mpiSupport;
-assert pythonSupport -> petsc.pythonSupport;
+let
+  slepcPackages = petsc.petscPackages.overrideScope (
+    final: prev: {
+      inherit pythonSupport;
+      mpiSupport = true;
+      arpack = final.callPackage arpack.override { useMpi = true; };
+    }
+  );
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "slepc";
   version = "3.24.0";
@@ -50,10 +56,10 @@ stdenv.mkDerivation (finalAttrs: {
     ];
 
   buildInputs = [
-    mpi
+    slepcPackages.mpi
   ]
   ++ lib.optionals withArpack [
-    arpack-mpi
+    slepcPackages.arpack
   ];
 
   propagatedBuildInputs = [

From 5f16a5067da471d50253d1e1a394750fa6073ebf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 26 Oct 2025 06:29:10 +0100
Subject: [PATCH 2794/6226] pinnwand: disable failing test due to click 8.2
 update

---
 pkgs/by-name/pi/pinnwand/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/pi/pinnwand/package.nix b/pkgs/by-name/pi/pinnwand/package.nix
index 3e7431e3c67a..60574a57c7b9 100644
--- a/pkgs/by-name/pi/pinnwand/package.nix
+++ b/pkgs/by-name/pi/pinnwand/package.nix
@@ -46,6 +46,8 @@ buildPythonApplication rec {
   disabledTestPaths = [
     # out-of-date browser tests
     "test/e2e"
+    # click 8.2.0 exits with 2 instead of 0 when no args are passed
+    "test/integration/test_command.py::test_main"
   ];
 
   __darwinAllowLocalNetworking = true;

From 07026ac7bd8adfc45dc0add4debfcee1a7f186b5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 05:42:50 +0000
Subject: [PATCH 2795/6226] python3Packages.posix-ipc: 1.3.0 -> 1.3.2

---
 pkgs/development/python-modules/posix-ipc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/posix-ipc/default.nix b/pkgs/development/python-modules/posix-ipc/default.nix
index 3612880c2103..18f418eadaa0 100644
--- a/pkgs/development/python-modules/posix-ipc/default.nix
+++ b/pkgs/development/python-modules/posix-ipc/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "posix-ipc";
-  version = "1.3.0";
+  version = "1.3.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "osvenskan";
     repo = "posix_ipc";
     rev = "rel${version}";
-    hash = "sha256-icytv2Cv7rVmlSARtx9ld5Kgo+Xba5fHUUjeKAUnGDM=";
+    hash = "sha256-Ehhk+IM3gTW6t6Cvc9AVAB9bscC0CMc6wQFgrZuCPz0=";
   };
 
   pythonImportsCheck = [ "posix_ipc" ];

From e46241b93341277cd382b92560fe50255c7ed54f Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 19:27:59 -0300
Subject: [PATCH 2796/6226] libsnark: fix build with cmake4

---
 pkgs/by-name/li/libsnark/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/li/libsnark/package.nix b/pkgs/by-name/li/libsnark/package.nix
index 52871ae2f69b..319efa5e155b 100644
--- a/pkgs/by-name/li/libsnark/package.nix
+++ b/pkgs/by-name/li/libsnark/package.nix
@@ -41,6 +41,13 @@ stdenv.mkDerivation {
     fetchSubmodules = true;
   };
 
+  postPatch = ''
+    substituteInPlace {,depends/{libff,libfqfft}/}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace depends/gtest/{,googlemock/,googletest/}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6.4)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     broken = withProcps; # Despite procps having a valid pkg-config file, CMake doesn't seem to be able to find it.
     description = "C++ library for zkSNARKs";

From ec212ce238feb98f60925abebb1ded418ca38245 Mon Sep 17 00:00:00 2001
From: ZeStig <69384921+zstg@users.noreply.github.com>
Date: Mon, 13 Oct 2025 19:13:33 +0530
Subject: [PATCH 2797/6226] vicinae: init at 0.15.5

---
 pkgs/by-name/vi/vicinae/package.nix | 101 ++++++++++++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 pkgs/by-name/vi/vicinae/package.nix

diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix
new file mode 100644
index 000000000000..0574940e3908
--- /dev/null
+++ b/pkgs/by-name/vi/vicinae/package.nix
@@ -0,0 +1,101 @@
+{
+  cmake,
+  cmark-gfm,
+  fetchFromGitHub,
+  fetchNpmDeps,
+  grpc-tools,
+  kdePackages,
+  lib,
+  libqalculate,
+  minizip,
+  ninja,
+  nodejs,
+  npmHooks,
+  pkg-config,
+  protobuf,
+  qt6,
+  rapidfuzz-cpp,
+  stdenv,
+  wayland,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "vicinae";
+  version = "0.15.5";
+
+  src = fetchFromGitHub {
+    owner = "vicinaehq";
+    repo = "vicinae";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-3pKexTUWfohL/S/yWsVMShmtMlBFI9zsd7NFzySKG0w=";
+  };
+
+  apiDeps = fetchNpmDeps {
+    src = "${finalAttrs.src}/typescript/api";
+    hash = "sha256-dSHEzw15lSRRbldl9PljuWFf2htdG+HgSeKPAB88RBg=";
+  };
+
+  extensionManagerDeps = fetchNpmDeps {
+    src = "${finalAttrs.src}/typescript/extension-manager";
+    hash = "sha256-TCT7uZRZn4rsLA/z2yLeK5Bt4DJPmdSC4zkmuCxTtc8=";
+  };
+
+  cmakeFlags = lib.mapAttrsToList lib.cmakeFeature {
+    "VICINAE_GIT_TAG" = "v${finalAttrs.version}";
+    "VICINAE_PROVENANCE" = "nix";
+    "INSTALL_NODE_MODULES" = "OFF";
+    "CMAKE_INSTALL_PREFIX" = placeholder "out";
+    "CMAKE_INSTALL_DATAROOTDIR" = "share";
+    "CMAKE_INSTALL_BINDIR" = "bin";
+    "CMAKE_INSTALL_LIBDIR" = "lib";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    ninja
+    nodejs
+    pkg-config
+    protobuf
+    qt6.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    cmark-gfm
+    grpc-tools
+    kdePackages.layer-shell-qt
+    kdePackages.qtkeychain
+    libqalculate
+    minizip
+    nodejs
+    protobuf
+    qt6.qtbase
+    qt6.qtsvg
+    qt6.qtwayland
+    rapidfuzz-cpp
+    wayland
+  ];
+
+  postPatch = ''
+    local postPatchHooks=()
+    source ${npmHooks.npmConfigHook}/nix-support/setup-hook
+    npmRoot=typescript/api npmDeps=${finalAttrs.apiDeps} npmConfigHook
+    npmRoot=typescript/extension-manager npmDeps=${finalAttrs.extensionManagerDeps} npmConfigHook
+  '';
+
+  qtWrapperArgs = [
+    "--prefix PATH :  ${
+      lib.makeBinPath [
+        nodejs
+        (placeholder "out")
+      ]
+    }"
+  ];
+
+  meta = {
+    description = "A focused launcher for your desktop — native, fast, extensible";
+    homepage = "https://github.com/vicinaehq/vicinae";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ zstg ];
+    platforms = lib.platforms.linux;
+    mainProgram = "vicinae";
+  };
+})

From 2b10fe9ea90568f97d570bbb2a7e54e0d2a30e9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 26 Oct 2025 06:41:56 +0100
Subject: [PATCH 2798/6226] solfege: add missing build inputs

Fixes these ./configure messages:

  $ nix-build -A solfege | grep " no$"
  [... checking whether we are cross compiling... no ...]
  checking for swig... no
  checking for lilypond... no
  checking for gs... no
  checking for xml2po... no
  checking for xsltproc... no
  checking for /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/html/chunk.xsl... no
---
 pkgs/by-name/so/solfege/package.nix | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/pkgs/by-name/so/solfege/package.nix b/pkgs/by-name/so/solfege/package.nix
index d3c8d113f75c..6c202d51f075 100644
--- a/pkgs/by-name/so/solfege/package.nix
+++ b/pkgs/by-name/so/solfege/package.nix
@@ -4,16 +4,21 @@
   autoconf,
   automake,
   csound,
+  docbook-xsl-ns,
   fetchurl,
   gdk-pixbuf,
   gettext,
+  ghostscript,
+  gnome-doc-utils,
   gobject-introspection,
   gtk3,
   librsvg,
+  libxslt,
   lilypond,
   mpg123,
   pkg-config,
   python3Packages,
+  swig,
   texinfo,
   timidity,
   txt2man,
@@ -46,10 +51,16 @@ python3Packages.buildPythonApplication rec {
   nativeBuildInputs = [
     autoconf
     automake
+    docbook-xsl-ns
     gdk-pixbuf
     gettext
+    ghostscript
+    gnome-doc-utils
     gobject-introspection
+    libxslt
+    lilypond
     pkg-config
+    swig
     texinfo
     txt2man
     wrapGAppsHook3
@@ -65,6 +76,10 @@ python3Packages.buildPythonApplication rec {
     pygobject3
   ];
 
+  configureFlags = [
+    "--enable-docbook-stylesheet=${docbook-xsl-ns}/share/xml/docbook-xsl-ns/html/chunk.xsl"
+  ];
+
   preBuild = ''
     sed -i -e 's|wav_player=.*|wav_player=${alsa-utils}/bin/aplay|' \
            -e 's|midi_player=.*|midi_player=${timidity}/bin/timidity|' \

From 0f4e226176b329b0e49c87a2cbe22482350d1486 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 07:09:47 -0300
Subject: [PATCH 2799/6226] lolcode: fix build with cmake4

---
 pkgs/by-name/lo/lolcode/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/lo/lolcode/package.nix b/pkgs/by-name/lo/lolcode/package.nix
index ff96112289c1..0a61347d282c 100644
--- a/pkgs/by-name/lo/lolcode/package.nix
+++ b/pkgs/by-name/lo/lolcode/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   pkg-config,
   doxygen,
   cmake,
@@ -20,6 +21,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-VMBW3/sw+1kI6iuOckSPU1TIeY6QORcSfFLFkRYw3Gs=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "cmake4-fix";
+      url = "https://github.com/justinmeza/lci/commit/42ac17a22ddce737664b39a50442e6623a7e51a2.patch?full_index=1";
+      hash = "sha256-UwsR13lAkSz4gFHS28MyS9Nd7oyfQR+0BCp2lFs5UP4=";
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
     cmake

From 6f4c0c8c0521e09a12e50a3952d8f32d36db0fc1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Sun, 26 Oct 2025 07:04:54 +0100
Subject: [PATCH 2800/6226] solfege: build HTML help

Getting the HTML help files requires explicit building. Instructions
found in <solfege_src>/help/README.

With this change we can now successfully open "Help -> User manual".

Fixes: https://github.com/NixOS/nixpkgs/issues/455659
---
 pkgs/by-name/so/solfege/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/so/solfege/package.nix b/pkgs/by-name/so/solfege/package.nix
index 6c202d51f075..6098a00ac197 100644
--- a/pkgs/by-name/so/solfege/package.nix
+++ b/pkgs/by-name/so/solfege/package.nix
@@ -90,6 +90,10 @@ python3Packages.buildPythonApplication rec {
            default.config
   '';
 
+  postBuild = ''
+    make help/C/index.html
+  '';
+
   dontWrapGApps = true;
 
   preFixup = ''

From 7482ed02c7b96d1f57bf50f08980de02e666b9b5 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 22 Oct 2025 12:12:00 -0300
Subject: [PATCH 2801/6226] mbpoll: fix build with cmake4

---
 pkgs/by-name/mb/mbpoll/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/mb/mbpoll/package.nix b/pkgs/by-name/mb/mbpoll/package.nix
index eeaca80fcbc3..206b2d29b3c8 100644
--- a/pkgs/by-name/mb/mbpoll/package.nix
+++ b/pkgs/by-name/mb/mbpoll/package.nix
@@ -4,6 +4,7 @@
   cmake,
   pkg-config,
   fetchFromGitHub,
+  fetchpatch,
   libmodbus,
 }:
 
@@ -18,6 +19,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-rO3j/p7MABlxcwRAZm26u7wgODGFTtetSDhPWPzTuEA=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "cmake4-fix";
+      url = "https://github.com/epsilonrt/mbpoll/commit/baad0efca89f0d8fe370591283d87a6e8e7dee4c.patch?full_index=1";
+      hash = "sha256-QwrfNeGbirYSrXvGI1lItwNBDN2d6VDF8yjvgcGELxE=";
+    })
+  ];
+
   buildInputs = [ libmodbus ];
   nativeBuildInputs = [
     cmake

From a01ac0648cce549c8ea4d2741b0f0a7781d1c766 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 09:27:48 +0200
Subject: [PATCH 2802/6226] nixos/i18n: lib.filterAttrs -> lib.removeAttrs

---
 nixos/modules/config/i18n.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 1e6c35a4ea31..60ccc6dcfe55 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -12,7 +12,7 @@ let
   ]
   ++ lib.pipe config.i18n.extraLocaleSettings [
     # See description of extraLocaleSettings for why is this ignored here.
-    (lib.filterAttrs (n: v: n != "LANGUAGE"))
+    (x: lib.removeAttrs x [ "LANGUAGE" ])
     (lib.mapAttrs (n: v: (sanitizeUTF8Capitalization v)))
     (lib.mapAttrsToList (LCRole: lang: lang + "/" + (config.i18n.localeCharsets.${LCRole} or "UTF-8")))
   ]

From e090d24809f42ecb4d3f50f7239352aaa1471321 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 09:30:31 +0200
Subject: [PATCH 2803/6226] nixos/thinkfan: lib.filterAttrs -> lib.removeAttrs

---
 nixos/modules/services/hardware/thinkfan.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix
index d5d1f23f1d98..daf865252653 100644
--- a/nixos/modules/services/hardware/thinkfan.nix
+++ b/nixos/modules/services/hardware/thinkfan.nix
@@ -101,14 +101,12 @@ let
   # removes NixOS special and unused attributes
   sensorToConf =
     { type, query, ... }@args:
-    (lib.filterAttrs (
-      k: v:
-      v != null
-      && !(lib.elem k [
+    (lib.filterAttrs (k: v: v != null) (
+      lib.removeAttrs args [
         "type"
         "query"
-      ])
-    ) args)
+      ]
+    ))
     // {
       "${type}" = query;
     };

From 5bf55cee1fe411a33d96492abc55c5de3a56fd30 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 09:33:37 +0200
Subject: [PATCH 2804/6226] nixos/public-inbox: lib.filterAttrs ->
 lib.removeAttrs

---
 nixos/modules/services/mail/public-inbox.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/mail/public-inbox.nix b/nixos/modules/services/mail/public-inbox.nix
index 0933d2dd535d..353db2e2207c 100644
--- a/nixos/modules/services/mail/public-inbox.nix
+++ b/nixos/modules/services/mail/public-inbox.nix
@@ -403,7 +403,7 @@ in
       }
     ];
     services.public-inbox.settings = filterAttrsRecursive (n: v: v != null) {
-      publicinbox = mapAttrs (n: filterAttrs (n: v: n != "description")) cfg.inboxes;
+      publicinbox = mapAttrs (n: v: removeAttrs v [ "description" ]) cfg.inboxes;
     };
     users = {
       users.public-inbox = {

From e3366549da1d62b3d4e516ad3ac9824b7ea05c5c Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 09:36:55 +0200
Subject: [PATCH 2805/6226] nixos/grafana: lib.filterAttrs -> lib.removeAttrs

---
 nixos/modules/services/monitoring/grafana.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix
index 9aad9e21fa6e..46da20bec8ad 100644
--- a/nixos/modules/services/monitoring/grafana.nix
+++ b/nixos/modules/services/monitoring/grafana.nix
@@ -126,7 +126,7 @@ let
       '';
 
   # Get a submodule without any embedded metadata:
-  _filter = x: filterAttrs (k: v: k != "_module") x;
+  _filter = x: removeAttrs x [ "_module" ];
 
   # https://grafana.com/docs/grafana/latest/administration/provisioning/#datasources
   grafanaTypes.datasourceConfig = types.submodule {

From 71644ede59a910ebddc207458031faca4e6c1111 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 09:38:21 +0200
Subject: [PATCH 2806/6226] nixos/authelia: lib.filterAttrs -> lib.removeAttrs

---
 nixos/modules/services/security/authelia.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/security/authelia.nix b/nixos/modules/services/security/authelia.nix
index 5dc438473a1d..059337e3a425 100644
--- a/nixos/modules/services/security/authelia.nix
+++ b/nixos/modules/services/security/authelia.nix
@@ -270,7 +270,7 @@ let
     lib.updateManyAttrsByPath [
       {
         path = lib.init pathList;
-        update = old: lib.filterAttrs (n: v: n != (lib.last pathList)) old;
+        update = old: lib.removeAttrs old [ (lib.last pathList) ];
       }
     ] set;
 in

From dbe03e152ce5fb1cabaf59d24cd5f80bd471b018 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 09:39:41 +0200
Subject: [PATCH 2807/6226] nixos/prometheus-exporters/mail: lib.filterAttrs ->
 lib.removeAttrs

---
 .../modules/services/monitoring/prometheus/exporters/mail.nix  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix
index 7dc40293d464..61ca738fdd31 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/mail.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/mail.nix
@@ -15,6 +15,7 @@ let
     nameValuePair
     toLower
     filterAttrs
+    removeAttrs
     escapeShellArg
     literalExpression
     mkIf
@@ -41,7 +42,7 @@ let
           )
         else
           nameValuePair (toLower name) value
-      ) (filterAttrs (n: _: !(n == "_module")) cfg.configuration)
+      ) (removeAttrs cfg.configuration [ "_module" ])
     )
   );
 

From 77bd06103070b993b5045f9aaf1a01bba9641bf4 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 09:40:48 +0200
Subject: [PATCH 2808/6226] nixos/systemd: lib.filterAttrs -> lib.removeAttrs

---
 nixos/modules/system/boot/systemd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix
index c7e81bb44335..3c827c3d6627 100644
--- a/nixos/modules/system/boot/systemd.nix
+++ b/nixos/modules/system/boot/systemd.nix
@@ -592,7 +592,7 @@ in
             '';
 
         enabledUpstreamSystemUnits = filter (n: !elem n cfg.suppressedSystemUnits) upstreamSystemUnits;
-        enabledUnits = filterAttrs (n: v: !elem n cfg.suppressedSystemUnits) cfg.units;
+        enabledUnits = removeAttrs cfg.units cfg.suppressedSystemUnits;
 
       in
       {

From ed0701411f348c2a947b7ca26e752efe606961b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 06:24:45 +0000
Subject: [PATCH 2809/6226] _86Box-with-roms: 5.1 -> 5.2

---
 pkgs/by-name/_8/_86Box/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/_8/_86Box/package.nix b/pkgs/by-name/_8/_86Box/package.nix
index ba0c7f5e5871..00d56eba252d 100644
--- a/pkgs/by-name/_8/_86Box/package.nix
+++ b/pkgs/by-name/_8/_86Box/package.nix
@@ -40,13 +40,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "86Box";
-  version = "5.1";
+  version = "5.2";
 
   src = fetchFromGitHub {
     owner = "86Box";
     repo = "86Box";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EkKqDkVK0QpGC/1F5DDHzlD05/JVnMZ6rSLuT2OPoHo=";
+    hash = "sha256-JcKLtREGSNA0IOGM5kqFjAya155KeYV/nqynG4dVv4w=";
   };
 
   patches = [ ./darwin.patch ];
@@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: {
       owner = "86Box";
       repo = "roms";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-ek/TbQJfrYXmpAmYeL8uSehsKxh1oDil7ebW4oFr7Cs=";
+      hash = "sha256-DmOxQ+E7bHF5St70YqPbIzMoADS8dtp2nDXvrhcAVw4=";
     };
     updateScript = ./update.sh;
   };

From 10d44ba76e7f9c7db0910be363c22f01f95cb9ea Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Fri, 24 Oct 2025 00:07:01 -0700
Subject: [PATCH 2810/6226] mattermost: 10.5.12 -> 10.11.4

---
 pkgs/by-name/ma/mattermost/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index 1b8e7e4ab3a6..e2dc15a2ead6 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -18,11 +18,11 @@
     # the version regex here as well.
     #
     # Ensure you also check ../mattermostLatest/package.nix.
-    regex = "^v(10\\.5\\.[0-9]+)$";
-    version = "10.5.12";
-    srcHash = "sha256-VaW+rA0UeIZhGU9BlYZgyznAOtLN+JI7UPbMRPCwTww=";
-    vendorHash = "sha256-vxUxSkj1EwgMtPpCGJSA9jCDBeLrWhecdwq4KBThhj4=";
-    npmDepsHash = "sha256-tIeuDUZbqgqooDm5TRfViiTT5OIyN0BPwvJdI+wf7p0=";
+    regex = "^v(10\\.11\\.[0-9]+)$";
+    version = "10.11.4";
+    srcHash = "sha256-gSVoO0paAwvxEeZkcCP81oxMcSu/H8n3Tr+2OEXuFyM=";
+    vendorHash = "sha256-DS4OC3eQffD/8yLE01gnTJXwV77G7rWk4kqA/rTCtJw=";
+    npmDepsHash = "sha256-p9dq31qw0EZDQIl2ysKE38JgDyLA6XvSv+VtHuRh+8A=";
     lockfileOverlay = ''
       unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")
     '';

From 8370c8f930e11abe7bae3092fb44ba0eef202e92 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sat, 25 Oct 2025 23:23:14 -0700
Subject: [PATCH 2811/6226] mattermostLatest: 10.12.1 -> 11.0.2

---
 pkgs/by-name/ma/mattermostLatest/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix
index 726da1dfb70c..47305a7125eb 100644
--- a/pkgs/by-name/ma/mattermostLatest/package.nix
+++ b/pkgs/by-name/ma/mattermostLatest/package.nix
@@ -10,11 +10,11 @@ mattermost.override {
     # See https://docs.mattermost.com/about/mattermost-server-releases.html
     # and make sure the version regex is up to date here.
     # Ensure you also check ../mattermost/package.nix for ESR releases.
-    regex = "^v(10\\.[0-9]+\\.[0-9]+)$";
-    version = "10.12.1";
-    srcHash = "sha256-PL55NKypsLA+H19cS99iIsMI3IBb6vLvAbAVLZyg+sE=";
-    vendorHash = "sha256-DS4OC3eQffD/8yLE01gnTJXwV77G7rWk4kqA/rTCtJw=";
-    npmDepsHash = "sha256-O9iX6hnwkEHK0kkHqWD6RYXqoSEW6zs+utiYHnt54JY=";
+    regex = "^v(11\\.[0-9]+\\.[0-9]+)$";
+    version = "11.0.2";
+    srcHash = "sha256-2w9v/ktmqSwzcylq8ayRDZD5BsHo9tBL+9X3GRNlvd0=";
+    vendorHash = "sha256-JkQvj92q5FZjQWB5gGCsAz7EpHO+IckBSFoFEFi3v0A=";
+    npmDepsHash = "sha256-YU6FDsMX0QIGFatUDRos/AkgwljIBeI5w/TJt/lglw0=";
     lockfileOverlay = ''
       unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")
     '';

From b9daf908d9a0b38ff35fdebe2c29f0b7199450ec Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 12:31:45 +0200
Subject: [PATCH 2812/6226] maubot/plugins: builtins.any -> builtins.elem

---
 pkgs/tools/networking/maubot/plugins/generated.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/networking/maubot/plugins/generated.nix b/pkgs/tools/networking/maubot/plugins/generated.nix
index dbaee26f8853..9e7bf10ac8c3 100644
--- a/pkgs/tools/networking/maubot/plugins/generated.nix
+++ b/pkgs/tools/networking/maubot/plugins/generated.nix
@@ -69,7 +69,7 @@ lib.flip builtins.mapAttrs json (
             );
           in
           spdxLicenses.${spdx};
-        broken = builtins.any (x: x == null) reqDeps;
+        broken = builtins.elem null reqDeps;
       };
     }
     // lib.optionalAttrs (entry.isPoetry or false) {

From d25929342857a2d893f407f0ae3860b35c4cb4c1 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 12:32:36 +0200
Subject: [PATCH 2813/6226] ruby-modules/testing: lib.any -> lib.elem

---
 pkgs/development/ruby-modules/testing/stubs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/ruby-modules/testing/stubs.nix b/pkgs/development/ruby-modules/testing/stubs.nix
index b0258988888f..614dcd822f4a 100644
--- a/pkgs/development/ruby-modules/testing/stubs.nix
+++ b/pkgs/development/ruby-modules/testing/stubs.nix
@@ -14,7 +14,7 @@ let
         builtins.toJSON (
           lib.filterAttrs (
             n: v:
-            builtins.any (x: x == n) [
+            builtins.elem n [
               "name"
               "system"
             ]

From c9a5d0c51fe05fff9754b5967292027716528da8 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 12:33:12 +0200
Subject: [PATCH 2814/6226] sleek-grub-theme: lib.any -> lib.elem

---
 pkgs/by-name/sl/sleek-grub-theme/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sl/sleek-grub-theme/package.nix b/pkgs/by-name/sl/sleek-grub-theme/package.nix
index 186993f6fbd2..e7ae9353fbb4 100644
--- a/pkgs/by-name/sl/sleek-grub-theme/package.nix
+++ b/pkgs/by-name/sl/sleek-grub-theme/package.nix
@@ -6,7 +6,7 @@
   withStyle ? "light", # use override to specify one of "dark" / "orange" / "bigSur"
 }:
 
-assert builtins.any (s: withStyle == s) [
+assert builtins.elem withStyle [
   "light"
   "dark"
   "orange"

From b0196cc429d3efe4c2248523a0cd520ed69aa719 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 12:34:21 +0200
Subject: [PATCH 2815/6226] otb: builtins.any -> builtins.elem

---
 pkgs/by-name/ot/otb/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ot/otb/package.nix b/pkgs/by-name/ot/otb/package.nix
index 4de37605c62c..5febf925ebfc 100644
--- a/pkgs/by-name/ot/otb/package.nix
+++ b/pkgs/by-name/ot/otb/package.nix
@@ -59,7 +59,7 @@ let
     # https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/issues/2454#note_112821
     "fftw"
   ];
-  itkIsInDepsToRemove = dep: builtins.any (d: d == dep.name) itkDepsToRemove;
+  itkIsInDepsToRemove = dep: builtins.elem dep.name itkDepsToRemove;
 
   # remove after https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/-/issues/2451
   otbSwig = swig.overrideAttrs (oldArgs: {

From 1da7dfe371b4aa51539e42664c3c608eb596ee77 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 12:35:44 +0200
Subject: [PATCH 2816/6226] inspircd: lib.any -> lib.elem

---
 pkgs/by-name/in/inspircd/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/in/inspircd/package.nix b/pkgs/by-name/in/inspircd/package.nix
index 6245b34a2a7d..1980e8707107 100644
--- a/pkgs/by-name/in/inspircd/package.nix
+++ b/pkgs/by-name/in/inspircd/package.nix
@@ -24,7 +24,7 @@ let
   # libcs in nixpkgs (musl and glibc).
   compatible =
     lib: drv:
-    lib.any (lic: lic == (drv.meta.license or { })) [
+    lib.elem (drv.meta.license or { }) [
       lib.licenses.mit # musl
       lib.licenses.lgpl2Plus # glibc
     ];

From ff17d6952f83d33bade139c9644f894edfeec93f Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 12:36:41 +0200
Subject: [PATCH 2817/6226] pypy: lib.any -> lib.elem

---
 pkgs/development/interpreters/python/pypy/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/pypy/default.nix b/pkgs/development/interpreters/python/pypy/default.nix
index c030a464e133..7c8ef2fbfb80 100644
--- a/pkgs/development/interpreters/python/pypy/default.nix
+++ b/pkgs/development/interpreters/python/pypy/default.nix
@@ -116,7 +116,7 @@ stdenv.mkDerivation rec {
   ]
   ++
     lib.optionals
-      (lib.any (l: l == optimizationLevel) [
+      (lib.elem optimizationLevel [
         "0"
         "1"
         "2"

From ae61c38e7b662d51bca294f03a30f764da284d39 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 12:43:41 +0200
Subject: [PATCH 2818/6226] jupyter: lib.any -> lib.elem

---
 pkgs/applications/editors/jupyter/kernel.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/jupyter/kernel.nix b/pkgs/applications/editors/jupyter/kernel.nix
index 4496b943997b..2a72d84c47f7 100644
--- a/pkgs/applications/editors/jupyter/kernel.nix
+++ b/pkgs/applications/editors/jupyter/kernel.nix
@@ -62,7 +62,7 @@ in
                 "logo64"
                 "extraPaths"
               ];
-              kernel = lib.filterAttrs (n: v: (lib.any (x: x == n) allowedKernelKeys)) unfilteredKernel;
+              kernel = lib.filterAttrs (n: v: (lib.elem n allowedKernelKeys)) unfilteredKernel;
               config = builtins.toJSON (
                 kernel
                 // {

From bab26e47e6031c67092a4ffdb7b873d80d9142f8 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 12:44:46 +0200
Subject: [PATCH 2819/6226] zynaddsubfx: lib.any -> lib.elem

---
 pkgs/applications/audio/zynaddsubfx/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix
index da5abd1baccb..9cde53585717 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/default.nix
@@ -48,7 +48,7 @@
   ctestCheckHook,
 }:
 
-assert builtins.any (g: guiModule == g) [
+assert builtins.elem guiModule [
   "fltk"
   "ntk"
   "zest"

From 09cedbd72e28780f35078ce4be06ff9de4b931f4 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 12:45:33 +0200
Subject: [PATCH 2820/6226] wordpress: lib.any -> lib.elem

---
 pkgs/servers/web-apps/wordpress/packages/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/servers/web-apps/wordpress/packages/default.nix b/pkgs/servers/web-apps/wordpress/packages/default.nix
index 5fafdd153413..c7630cbeb1a5 100644
--- a/pkgs/servers/web-apps/wordpress/packages/default.nix
+++ b/pkgs/servers/web-apps/wordpress/packages/default.nix
@@ -43,7 +43,7 @@ let
           license,
           ...
         }@args:
-        assert lib.any (x: x == type) [
+        assert lib.elem type [
           "plugin"
           "theme"
           "language"

From aab15d28a721b4b2a112f69298da5a9240dd8ad1 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 12:46:31 +0200
Subject: [PATCH 2821/6226] nixos/tests/sftpgo: lib.any -> lib.elem

---
 nixos/tests/sftpgo.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/sftpgo.nix b/nixos/tests/sftpgo.nix
index c2090c8bb180..6d18c1c5581f 100644
--- a/nixos/tests/sftpgo.nix
+++ b/nixos/tests/sftpgo.nix
@@ -25,7 +25,7 @@ let
     groupName:
     # users.users attrset
     user:
-    lib.any (x: x == user.name) config.users.groups.${groupName}.members;
+    lib.elem user.name config.users.groups.${groupName}.members;
 
   # Generates a valid SFTPGo user configuration for a given user
   # Will be converted to JSON and loaded on application startup.

From 36baa254b473f3038640f27180ef0aeb26bf57e3 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 12:47:42 +0200
Subject: [PATCH 2822/6226] nixos/i18n: lib.any -> lib.elem

---
 nixos/modules/config/i18n.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 1e6c35a4ea31..4a022b3aaa6f 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -30,12 +30,12 @@ in
       glibcLocales = lib.mkOption {
         type = lib.types.path;
         default = pkgs.glibcLocales.override {
-          allLocales = lib.any (x: x == "all") config.i18n.supportedLocales;
+          allLocales = lib.elem "all" config.i18n.supportedLocales;
           locales = config.i18n.supportedLocales;
         };
         defaultText = lib.literalExpression ''
           pkgs.glibcLocales.override {
-            allLocales = lib.any (x: x == "all") config.i18n.supportedLocales;
+            allLocales = lib.elem "all" config.i18n.supportedLocales;
             locales = config.i18n.supportedLocales;
           }
         '';

From 271514bd188987c00e6bdc3085857537abd14a89 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 12:48:58 +0200
Subject: [PATCH 2823/6226] nixos/mpdscribble: lib.any -> lib.elem

---
 nixos/modules/services/audio/mpdscribble.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/audio/mpdscribble.nix b/nixos/modules/services/audio/mpdscribble.nix
index 967853ffc85c..39dab7105968 100644
--- a/nixos/modules/services/audio/mpdscribble.nix
+++ b/nixos/modules/services/audio/mpdscribble.nix
@@ -130,7 +130,7 @@ in
     passwordFile = lib.mkOption {
       default =
         if localMpd then
-          (lib.findFirst (c: lib.any (x: x == "read") c.permissions) {
+          (lib.findFirst (c: lib.elem "read" c.permissions) {
             passwordFile = null;
           } mpdCfg.credentials).passwordFile
         else

From 487d055482ce487ed143f6d6dab5f543abde7cef Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 24 Oct 2025 12:58:48 +0900
Subject: [PATCH 2824/6226] uwsgi: builtins.any -> lib.elem

---
 pkgs/by-name/uw/uwsgi/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/uw/uwsgi/package.nix b/pkgs/by-name/uw/uwsgi/package.nix
index 6886ba53cae8..bab49fb7b286 100644
--- a/pkgs/by-name/uw/uwsgi/package.nix
+++ b/pkgs/by-name/uw/uwsgi/package.nix
@@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   # this is a hack to make the php plugin link with session.so (which on nixos is a separate package)
   # the hack works in coordination with ./additional-php-ldflags.patch
-  UWSGICONFIG_PHP_LDFLAGS = lib.optionalString (builtins.any (x: x.name == "php") needed) (
+  UWSGICONFIG_PHP_LDFLAGS = lib.optionalString (lib.elem "php" needed) (
     lib.concatStringsSep "," [
       "-Wl"
       "-rpath=${php-embed.extensions.session}/lib/php/extensions/"
@@ -176,7 +176,7 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  postFixup = lib.optionalString (builtins.any (x: x.name == "php") needed) ''
+  postFixup = lib.optionalString (lib.elem "php" needed) ''
     wrapProgram $out/bin/uwsgi --set PHP_INI_SCAN_DIR ${php-embed}/lib
   '';
 

From 40136127024391e92d9b0a0eeca32b7b87a639fb Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 24 Oct 2025 13:00:21 +0900
Subject: [PATCH 2825/6226] distrho-ports: lib.any -> lib.elem

---
 pkgs/by-name/di/distrho-ports/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/di/distrho-ports/package.nix b/pkgs/by-name/di/distrho-ports/package.nix
index f0271b3555ad..366b6960f415 100644
--- a/pkgs/by-name/di/distrho-ports/package.nix
+++ b/pkgs/by-name/di/distrho-ports/package.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation {
 
   env.NIX_CFLAGS_COMPILE = toString [ "-fpermissive" ];
 
-  postFixup = lib.optionalString (lib.any (x: x == "vitalium") plugins || plugins == [ ]) ''
+  postFixup = lib.optionalString (lib.elem "vitalium" plugins || plugins == [ ]) ''
     for file in \
       $out/lib/lv2/vitalium.lv2/vitalium.so \
       $out/lib/vst/vitalium.so \

From 8cd4c67f2590eb4fdc7b97889f3534c1fe8b4474 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 06:33:08 +0000
Subject: [PATCH 2826/6226] python3Packages.pylitterbot: 2024.2.6 -> 2024.2.7

---
 pkgs/development/python-modules/pylitterbot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix
index 33590b96fecc..918ad759c9a7 100644
--- a/pkgs/development/python-modules/pylitterbot/default.nix
+++ b/pkgs/development/python-modules/pylitterbot/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "pylitterbot";
-  version = "2024.2.6";
+  version = "2024.2.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "natekspencer";
     repo = "pylitterbot";
     tag = "v${version}";
-    hash = "sha256-oQuEo0np+e+HfsQoWbv84BNpxNJQO3ZjocaCfllqkts=";
+    hash = "sha256-gBY9+cd0DKqzHKyB86NzfKkULjVXn3oBSHxyRhmMAno=";
   };
 
   pythonRelaxDeps = [ "deepdiff" ];

From f156bd830b496e6d6384b75aca70e54ee567bd69 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 13:18:58 +0200
Subject: [PATCH 2827/6226] nixos/orangefs: lib.mapAttrsToList -> lib.attrNames

---
 nixos/modules/services/network-filesystems/orangefs/server.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/network-filesystems/orangefs/server.nix b/nixos/modules/services/network-filesystems/orangefs/server.nix
index 99d7b27011c2..6e5a356b97fc 100644
--- a/nixos/modules/services/network-filesystems/orangefs/server.nix
+++ b/nixos/modules/services/network-filesystems/orangefs/server.nix
@@ -7,7 +7,7 @@
 let
   cfg = config.services.orangefs.server;
 
-  aliases = lib.mapAttrsToList (alias: url: alias) cfg.servers;
+  aliases = lib.attrNames cfg.servers;
 
   # Maximum handle number is 2^63
   maxHandle = 9223372036854775806;

From 266c8f0a4fe13abd48ddc886d37e6b03c6855832 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 13:19:37 +0200
Subject: [PATCH 2828/6226] nixos/dhcpcd: lib.mapAttrsToList -> lib.attrNames

---
 nixos/modules/services/networking/dhcpcd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix
index 7b78140b0563..20ed8da1123c 100644
--- a/nixos/modules/services/networking/dhcpcd.nix
+++ b/nixos/modules/services/networking/dhcpcd.nix
@@ -30,7 +30,7 @@ let
     map (i: i.name) (
       lib.filter (i: if i.useDHCP != null then !i.useDHCP else i.ipv4.addresses != [ ]) interfaces
     )
-    ++ lib.mapAttrsToList (i: _: i) config.networking.sits
+    ++ lib.attrNames config.networking.sits
     ++ lib.concatLists (lib.attrValues (lib.mapAttrs (n: v: v.interfaces) config.networking.bridges))
     ++ lib.flatten (
       lib.concatMap (

From ddb37e12c22291f000e1ed41d1a50961f2dd3e8a Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 13:20:27 +0200
Subject: [PATCH 2829/6226] nixos/networkd: lib.mapAttrsToList -> lib.attrNames

---
 nixos/modules/tasks/network-interfaces-systemd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix
index 653fafb9b216..6245563f4317 100644
--- a/nixos/modules/tasks/network-interfaces-systemd.nix
+++ b/nixos/modules/tasks/network-interfaces-systemd.nix
@@ -347,7 +347,7 @@ in
                         driverOpt:
                         assertTrace (elem driverOpt (knownOptions ++ unknownOptions))
                           "The bond.driverOption `${driverOpt}` cannot be mapped to the list of known networkd bond options. Please add it to the mapping above the assert or to `unknownOptions` should it not exist in networkd."
-                      ) (mapAttrsToList (k: _: k) do);
+                      ) (attrNames do);
                       "";
                     # get those driverOptions that have been set
                     filterSystemdOptions = filterAttrs (sysDOpt: kOpts: any (kOpt: do ? ${kOpt}) kOpts.optNames);

From 92aa43a0dfd9fa25ce9e74fc73582d8aacff9864 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 13:21:34 +0200
Subject: [PATCH 2830/6226] pypy3: lib.mapAttrsToList -> lib.attrsNames

---
 pkgs/development/interpreters/python/pypy/prebuilt.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/pypy/prebuilt.nix b/pkgs/development/interpreters/python/pypy/prebuilt.nix
index ef0350d93818..2737917c63b5 100644
--- a/pkgs/development/interpreters/python/pypy/prebuilt.nix
+++ b/pkgs/development/interpreters/python/pypy/prebuilt.nix
@@ -181,7 +181,7 @@ stdenv.mkDerivation {
     description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
     mainProgram = "pypy";
     license = licenses.mit;
-    platforms = lib.mapAttrsToList (arch: _: arch) downloadUrls;
+    platforms = lib.attrNames downloadUrls;
   };
 
 }

From 7720a6246fca66838f4811d581bdd329a0d38e49 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 13:22:09 +0200
Subject: [PATCH 2831/6226] pypy: lib.mapAttrsToList -> lib.attrsNames

---
 pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
index fc8fdf79208c..e5893818407b 100644
--- a/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
+++ b/pkgs/development/interpreters/python/pypy/prebuilt_2_7.nix
@@ -175,7 +175,7 @@ stdenv.mkDerivation {
     homepage = "http://pypy.org/";
     description = "Fast, compliant alternative implementation of the Python language (${pythonVersion})";
     license = licenses.mit;
-    platforms = lib.mapAttrsToList (arch: _: arch) downloadUrls;
+    platforms = lib.attrNames downloadUrls;
   };
 
 }

From 784f7044686c2872d872a9c6088496d948cb6609 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 13:23:51 +0200
Subject: [PATCH 2832/6226] nixos/kubelet: lib.mapAttrsToList -> lib.attrValues

---
 nixos/modules/services/cluster/kubernetes/kubelet.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/cluster/kubernetes/kubelet.nix b/nixos/modules/services/cluster/kubernetes/kubelet.nix
index 9ab5d0baf8c7..94f2bfaa28ac 100644
--- a/nixos/modules/services/cluster/kubernetes/kubelet.nix
+++ b/nixos/modules/services/cluster/kubernetes/kubelet.nix
@@ -108,9 +108,7 @@ let
       };
     };
 
-  taints = concatMapStringsSep "," (v: "${v.key}=${v.value}:${v.effect}") (
-    mapAttrsToList (n: v: v) cfg.taints
-  );
+  taints = concatMapStringsSep "," (v: "${v.key}=${v.value}:${v.effect}") (attrValues cfg.taints);
 in
 {
   imports = [

From 1b42cb3018b81be411825ec5beadac8ce89c0633 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 13:24:36 +0200
Subject: [PATCH 2833/6226] nixos/nginx: lib.mapAttrsToList -> lib.attrValues

---
 nixos/modules/services/web-servers/nginx/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix
index 26fe0bbac7aa..aa18102fd766 100644
--- a/nixos/modules/services/web-servers/nginx/default.nix
+++ b/nixos/modules/services/web-servers/nginx/default.nix
@@ -10,7 +10,7 @@ with lib;
 let
   cfg = config.services.nginx;
   inherit (config.security.acme) certs;
-  vhostsConfigs = mapAttrsToList (vhostName: vhostConfig: vhostConfig) virtualHosts;
+  vhostsConfigs = attrValues virtualHosts;
   acmeEnabledVhosts = filter (
     vhostConfig: vhostConfig.enableACME || vhostConfig.useACMEHost != null
   ) vhostsConfigs;

From 20739c715fb9f4a3018a19de4e23883ab00b8bc5 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 13:25:17 +0200
Subject: [PATCH 2834/6226] idris-modules: lib.mapAttrsToList -> lib.attrValues

---
 pkgs/development/idris-modules/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/idris-modules/default.nix b/pkgs/development/idris-modules/default.nix
index 9c7ba500961c..c333fa9064f1 100644
--- a/pkgs/development/idris-modules/default.nix
+++ b/pkgs/development/idris-modules/default.nix
@@ -65,7 +65,7 @@ let
 
       # The set of libraries that comes with idris
 
-      builtins = pkgs.lib.mapAttrsToList (name: value: value) builtins_;
+      builtins = pkgs.lib.attrValues builtins_;
 
       # Libraries
 

From cfa888025e0ada695c0db384695403e79d531492 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 13:26:10 +0200
Subject: [PATCH 2835/6226] androidenv/tests: lib.mapAttrsToList ->
 lib.attrValues

---
 pkgs/development/mobile/androidenv/test-suite.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/mobile/androidenv/test-suite.nix b/pkgs/development/mobile/androidenv/test-suite.nix
index cc03d2fe3261..ad77963605f3 100644
--- a/pkgs/development/mobile/androidenv/test-suite.nix
+++ b/pkgs/development/mobile/androidenv/test-suite.nix
@@ -19,7 +19,7 @@ in
 stdenv.mkDerivation {
   name = "androidenv-test-suite";
   version = lib.substring 0 8 (builtins.hashFile "sha256" ./repo.json);
-  buildInputs = lib.mapAttrsToList (name: value: value) all-tests;
+  buildInputs = lib.attrValues all-tests;
 
   buildCommand = ''
     touch $out

From 23dc60f80fa689cd790bb0d0c0fcedd351ffe9ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 06:33:53 +0000
Subject: [PATCH 2836/6226] python3Packages.ttn-client: 1.2.1 -> 1.2.2

---
 pkgs/development/python-modules/ttn-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ttn-client/default.nix b/pkgs/development/python-modules/ttn-client/default.nix
index a6aecc553194..52776272cd22 100644
--- a/pkgs/development/python-modules/ttn-client/default.nix
+++ b/pkgs/development/python-modules/ttn-client/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "ttn-client";
-  version = "1.2.1";
+  version = "1.2.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "angelnu";
     repo = "thethingsnetwork_python_client";
     tag = "v${version}";
-    hash = "sha256-dWEXoqW4JyYeLFLS3J4CaRJ45wjdVf8wrtMGCKgBds8=";
+    hash = "sha256-B3AN0VqMhQoqqPjUf/JTWYdyVQVXt+QsBbqsooDsuDE=";
   };
 
   build-system = [ hatchling ];

From d3c814cf8d509b5912f1a22069e6fbc2f1de82be Mon Sep 17 00:00:00 2001
From: iamanaws <78835633+Iamanaws@users.noreply.github.com>
Date: Sat, 25 Oct 2025 23:37:20 -0700
Subject: [PATCH 2837/6226] mongodb-atlas-cli: 1.49.0 -> 1.50.0

---
 pkgs/by-name/mo/mongodb-atlas-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
index 8cbb211b2bae..954f55e351b8 100644
--- a/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
+++ b/pkgs/by-name/mo/mongodb-atlas-cli/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "mongodb-atlas-cli";
-  version = "1.49.0";
+  version = "1.50.0";
 
   src = fetchFromGitHub {
     owner = "mongodb";
     repo = "mongodb-atlas-cli";
     tag = "atlascli/v${version}";
-    hash = "sha256-thip1zWOQJOKrShf8O1erIUdYuqLg6VaMqMRV/a7/dg=";
+    hash = "sha256-vo2vfnGKp71S9mVGK5SVi8YqNLjedzfjJhh5uK/pb4E=";
   };
 
-  vendorHash = "sha256-HtdZ+wfibcqKoTf5BT5nNX4+m7bP/f2gvkvA+PnYb2s=";
+  vendorHash = "sha256-qcB8Hgp/4kVsEo32E6I4GMSBbRByPTyk3Oas2CpS4Xc=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From fe92a36417e813e93c4ff25e0d2b39f0f1382b30 Mon Sep 17 00:00:00 2001
From: iamanaws <78835633+Iamanaws@users.noreply.github.com>
Date: Sat, 25 Oct 2025 23:28:40 -0700
Subject: [PATCH 2838/6226] mongodb-compass: 1.47.1 -> 1.48.0

---
 pkgs/by-name/mo/mongodb-compass/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix
index 2497a1809e75..d8f1dab7baea 100644
--- a/pkgs/by-name/mo/mongodb-compass/package.nix
+++ b/pkgs/by-name/mo/mongodb-compass/package.nix
@@ -40,7 +40,7 @@
 
 let
   pname = "mongodb-compass";
-  version = "1.47.1";
+  version = "1.48.0";
 
   selectSystem =
     attrs:
@@ -55,9 +55,9 @@ let
       }
     }";
     hash = selectSystem {
-      x86_64-linux = "sha256-L+IhvRqUllrFkntYeuE+3Ox59U60fu0P2VP6Zb/1ORA=";
-      x86_64-darwin = "sha256-NYgXtCdrny6pKACYmWDHvrlCOJupyP4GqobDr+13WqU=";
-      aarch64-darwin = "sha256-mZ6bLY6hnOhPb2pxPKpiVQpF3ffZlC265QvkIIjpM9A=";
+      x86_64-linux = "sha256-lmg+zfUUT4dAObJzEmGzBCmnHkc6rkPKk1XIfmZ6uJc=";
+      x86_64-darwin = "sha256-T7MF1TYBPbTg2VBWImA38xN+eCs1ZKT2e5TzHYi08KE=";
+      aarch64-darwin = "sha256-zKSmhU0p87+2SFzA7ZdMy/p/cw8K5JtYfC5np6HnjBg=";
     };
   };
 

From bb22a7a11434aa5ac371e4e2b33c7031e6fabbe9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 06:40:29 +0000
Subject: [PATCH 2839/6226] servo: 0.0.1-unstable-2025-10-22 ->
 0.0.1-unstable-2025-10-26

---
 pkgs/by-name/se/servo/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index 96cf22b68d7e..a6f2107f14ea 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -66,13 +66,13 @@ in
 
 rustPlatform.buildRustPackage {
   pname = "servo";
-  version = "0.0.1-unstable-2025-10-22";
+  version = "0.0.1-unstable-2025-10-26";
 
   src = fetchFromGitHub {
     owner = "servo";
     repo = "servo";
-    rev = "efc8c0f6647e542e35bac732585bc3aef6578028";
-    hash = "sha256-mLXs0OaOLD12hFQ8w/3xnDV+4fhjRKToRjZZMPDJ9X8=";
+    rev = "504a8d819f207833240b90fe5d61e81ff9f5d82b";
+    hash = "sha256-mToBb9bcdUx7ZWQkax88SLqTS85lUNMGK1sYASWGt4o=";
     # Breaks reproducibility depending on whether the picked commit
     # has other ref-names or not, which may change over time, i.e. with
     # "ref-names: HEAD -> main" as long this commit is the branch HEAD
@@ -82,7 +82,7 @@ rustPlatform.buildRustPackage {
     '';
   };
 
-  cargoHash = "sha256-POMWoM5NVeas/t1XivqBDrhZy7qRvIL3e01Wu3893L4=";
+  cargoHash = "sha256-vyfiMsJlxt7dG9FeZ1XL6Qb7oma4pB+Aq7heaWKiyvY=";
 
   # set `HOME` to a temp dir for write access
   # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)

From 0c5642c8c35faadbae14382c1f4b5b3035395bd4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 06:41:32 +0000
Subject: [PATCH 2840/6226] cljfmt: 0.14.0 -> 0.15.3

---
 pkgs/by-name/cl/cljfmt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/cljfmt/package.nix b/pkgs/by-name/cl/cljfmt/package.nix
index 0cf64938e770..81f7d56faaf0 100644
--- a/pkgs/by-name/cl/cljfmt/package.nix
+++ b/pkgs/by-name/cl/cljfmt/package.nix
@@ -8,11 +8,11 @@
 
 buildGraalvmNativeImage (finalAttrs: {
   pname = "cljfmt";
-  version = "0.14.0";
+  version = "0.15.3";
 
   src = fetchurl {
     url = "https://github.com/weavejester/cljfmt/releases/download/${finalAttrs.version}/cljfmt-${finalAttrs.version}-standalone.jar";
-    hash = "sha256-A12co+7Ux9rGCcBMRMqwTH7s4hllfs0Ku/+HFQJ4XGE=";
+    hash = "sha256-DlPnni5p0zdauAtBEoCrh6S/STT8nvZJAJ90VjXlZLA=";
   };
 
   extraNativeImageBuildArgs = [

From 0b9a9d7552b975f4a6bd81145c36b3382d35b2a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 07:06:10 +0000
Subject: [PATCH 2841/6226] oh-my-zsh: 2025-10-15 -> 2025-10-23

---
 pkgs/by-name/oh/oh-my-zsh/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/oh/oh-my-zsh/package.nix b/pkgs/by-name/oh/oh-my-zsh/package.nix
index 352805263d4b..a26fdebf39b5 100644
--- a/pkgs/by-name/oh/oh-my-zsh/package.nix
+++ b/pkgs/by-name/oh/oh-my-zsh/package.nix
@@ -19,14 +19,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2025-10-15";
+  version = "2025-10-23";
   pname = "oh-my-zsh";
 
   src = fetchFromGitHub {
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    rev = "d1c04d8a33f9127d03b69617c5367db5ceebc8a7";
-    sha256 = "sha256-Nt/7UZJl+7Kw7trMByuyhjE7RnccgAzW1oNwKsIx3Jw=";
+    rev = "99017b8eac3d7d0e5ba01c7bf0cf9c6d38985536";
+    sha256 = "sha256-/q9BRzRAzD5iepT2i0y72K4kPAZiJCPbX45boD2V7aU=";
   };
 
   strictDeps = true;

From 77b21ceee59da541a4ad1b8b1b49abaa4c16427a Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 26 Oct 2025 00:06:26 -0700
Subject: [PATCH 2842/6226] ponyc: 0.59.0 -> 0.60.3

Enabling parallel building and checking takes the compile time down by
7 minutes on my 24 core EPYC 4.
---
 pkgs/by-name/po/ponyc/package.nix | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/po/ponyc/package.nix b/pkgs/by-name/po/ponyc/package.nix
index f8595316d4e3..2068b56ed7da 100644
--- a/pkgs/by-name/po/ponyc/package.nix
+++ b/pkgs/by-name/po/ponyc/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  nix-update-script,
   stdenv,
   fetchFromGitHub,
   apple-sdk_13,
@@ -24,13 +25,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ponyc";
-  version = "0.59.0";
+  version = "0.60.3";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     tag = version;
-    hash = "sha256-4gDv8UWTk0RWVNC4PU70YKSK9fIMbWBsQbHboVls2BA=";
+    hash = "sha256-VlmIy2i7BZ8jK96KVnTzdjyXWTyOuWE5M3yNp7gcVCA=";
     fetchSubmodules = true;
   };
 
@@ -42,12 +43,12 @@ stdenv.mkDerivation rec {
     hash = "sha256-5xDg1duixLoWIuy59WT0r5ZBAvTR6RPP7YrhBYkMxc8=";
   };
 
-  googletestRev = "1.15.2";
+  googletestRev = "1.17.0";
   googletest = fetchFromGitHub {
     owner = "google";
     repo = "googletest";
     rev = "v${googletestRev}";
-    hash = "sha256-1OJ2SeSscRBNr7zZ/a8bJGIqAnhkg45re0j3DtPfcXM=";
+    hash = "sha256-HIHMxAUR4bjmFLoltJeIAVSulVQ6kVuIT2Ku+lwAx/4=";
   };
 
   nativeBuildInputs = [
@@ -99,7 +100,7 @@ stdenv.mkDerivation rec {
     # Replace downloads with local copies.
     substituteInPlace lib/CMakeLists.txt \
         --replace-fail "https://github.com/google/benchmark/archive/v$benchmarkRev.tar.gz" "$NIX_BUILD_TOP/deps/benchmark-$benchmarkRev.tar" \
-        --replace-fail "https://github.com/google/googletest/archive/refs/tags/v$googletestRev.tar.gz" "$NIX_BUILD_TOP/deps/googletest-$googletestRev.tar"
+        --replace-fail "https://github.com/google/googletest/releases/download/v$googletestRev/googletest-$googletestRev.tar.gz" "$NIX_BUILD_TOP/deps/googletest-$googletestRev.tar"
   '';
 
   preBuild = ''
@@ -115,6 +116,8 @@ stdenv.mkDerivation rec {
     make configure "''${extraFlags[@]}"
   '';
 
+  enableParallelBuilding = true;
+
   makeFlags = [
     "PONYC_VERSION=${version}"
     "prefix=${placeholder "out"}"
@@ -128,6 +131,8 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
+  enableParallelChecking = true;
+
   nativeCheckInputs = [ procps ];
 
   installPhase = ''
@@ -156,7 +161,10 @@ stdenv.mkDerivation rec {
   # Stripping breaks linking for ponyc
   dontStrip = true;
 
-  passthru.tests.pony-corral = pony-corral;
+  passthru = {
+    tests.pony-corral = pony-corral;
+    updateScript = nix-update-script { };
+  };
 
   meta = with lib; {
     description = "Pony is an Object-oriented, actor-model, capabilities-secure, high performance programming language";

From 194e3c2fc68954ada8cdff95cb2b6d600d21ecd6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 07:12:31 +0000
Subject: [PATCH 2843/6226] fzf: 0.66.0 -> 0.66.1

---
 pkgs/by-name/fz/fzf/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix
index 69a42f183d84..988bf8ff2c83 100644
--- a/pkgs/by-name/fz/fzf/package.nix
+++ b/pkgs/by-name/fz/fzf/package.nix
@@ -12,13 +12,13 @@
 
 buildGoModule rec {
   pname = "fzf";
-  version = "0.66.0";
+  version = "0.66.1";
 
   src = fetchFromGitHub {
     owner = "junegunn";
     repo = "fzf";
     rev = "v${version}";
-    hash = "sha256-4cspznuGPhTFSUM9yYvPoytX27CKenp/oAMqWpT5JrE=";
+    hash = "sha256-0dq4m5SGu37AGVUoFLgP40vjBTu6cYoUgB+ZhyfKi+M=";
   };
 
   vendorHash = "sha256-uFXHoseFOxGIGPiWxWfDl339vUv855VHYgSs9rnDyuI=";

From e9785d201744534423725c832a0be4110e9db96f Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 24 Oct 2025 13:00:57 +0900
Subject: [PATCH 2844/6226] libvgm: lib.lists.any -> lib.lists.elem

---
 pkgs/by-name/li/libvgm/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libvgm/package.nix b/pkgs/by-name/li/libvgm/package.nix
index 6c39efabcb72..d500f0d9a8e5 100644
--- a/pkgs/by-name/li/libvgm/package.nix
+++ b/pkgs/by-name/li/libvgm/package.nix
@@ -106,9 +106,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "More modular rewrite of most components from VGMPlay";
     homepage = "https://github.com/ValleyBell/libvgm";
     license =
-      if
-        (enableEmulation && (withAllEmulators || (lib.lists.any (core: core == "WSWAN_ALL") emulators)))
-      then
+      if (enableEmulation && (withAllEmulators || (lib.lists.elem "WSWAN_ALL" emulators))) then
         lib.licenses.unfree # https://github.com/ValleyBell/libvgm/issues/43
       else
         lib.licenses.gpl2Only;

From ec7699106bc26a24a0d15eb5ad73d9e0f4ff406f Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 24 Oct 2025 13:01:33 +0900
Subject: [PATCH 2845/6226] calibre: lib.lists.any -> lib.lists.elem

---
 pkgs/by-name/ca/calibre/package.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix
index 56642f9be070..b2a79c1e18ed 100644
--- a/pkgs/by-name/ca/calibre/package.nix
+++ b/pkgs/by-name/ca/calibre/package.nix
@@ -142,14 +142,12 @@ stdenv.mkDerivation (finalAttrs: {
         # the following are distributed with calibre, but we use upstream instead
         odfpy
       ]
-      ++
-        lib.optionals (lib.lists.any (p: p == stdenv.hostPlatform.system) pyqt6-webengine.meta.platforms)
-          [
-            # much of calibre's functionality is usable without a web
-            # browser, so we enable building on platforms which qtwebengine
-            # does not support by simply omitting qtwebengine.
-            pyqt6-webengine
-          ]
+      ++ lib.optionals (lib.lists.elem stdenv.hostPlatform.system pyqt6-webengine.meta.platforms) [
+        # much of calibre's functionality is usable without a web
+        # browser, so we enable building on platforms which qtwebengine
+        # does not support by simply omitting qtwebengine.
+        pyqt6-webengine
+      ]
       ++ lib.optional unrarSupport unrardll
     ))
     piper-tts

From 574cb2c5411dddf3df5b9309e04bd8a6bc78b643 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 24 Oct 2025 13:04:18 +0900
Subject: [PATCH 2846/6226] nixos/i18n: lib.any -> lib.elem

---
 nixos/modules/config/i18n.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/config/i18n.nix b/nixos/modules/config/i18n.nix
index 4a022b3aaa6f..6d8a7289b238 100644
--- a/nixos/modules/config/i18n.nix
+++ b/nixos/modules/config/i18n.nix
@@ -149,7 +149,7 @@ in
         (
           !(
             (lib.subtractLists config.i18n.supportedLocales aggregatedLocales) == [ ]
-            || lib.any (x: x == "all") config.i18n.supportedLocales
+            || lib.elem "all" config.i18n.supportedLocales
           )
         )
         ''

From 428342cce1a1726ba6555d1d76885e516733dcf7 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 24 Oct 2025 13:07:48 +0900
Subject: [PATCH 2847/6226] nixos/ifstate: builtins.any -> builtins.elem

---
 nixos/modules/services/networking/ifstate.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ifstate.nix b/nixos/modules/services/networking/ifstate.nix
index ddd95d33d131..41997a039ec0 100644
--- a/nixos/modules/services/networking/ifstate.nix
+++ b/nixos/modules/services/networking/ifstate.nix
@@ -198,7 +198,7 @@ in
         {
           assertion =
             initrdCfg.package.passthru.features.withWireguard
-            || !(builtins.any (kind: kind == "wireguard") initrdInterfaceTypes);
+            || !(builtins.elem "wireguard" initrdInterfaceTypes);
           message = "IfState initrd package is configured without the `wireguard` feature, but wireguard interfaces are configured. Please see the `boot.initrd.network.ifstate.package` option.";
         }
         {

From 9842083cd0dc66cfb60f4dc4f27ec548620b6fe2 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 24 Oct 2025 13:09:16 +0900
Subject: [PATCH 2848/6226] nixos/prometheus-exporters/node: lib.any ->
 lib.elem

---
 .../services/monitoring/prometheus/exporters/node.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
index c543ac9a206e..2c4a82f0e044 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/node.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix
@@ -13,11 +13,11 @@ let
     types
     concatStringsSep
     concatMapStringsSep
-    any
+    elem
     optionals
     ;
-  collectorIsEnabled = final: any (collector: (final == collector)) cfg.enabledCollectors;
-  collectorIsDisabled = final: any (collector: (final == collector)) cfg.disabledCollectors;
+  collectorIsEnabled = final: elem final cfg.enabledCollectors;
+  collectorIsDisabled = final: elem final cfg.disabledCollectors;
 in
 {
   port = 9100;

From 2ec989b32271f25780da23c634c6c9acf18e28a9 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 24 Oct 2025 13:10:12 +0900
Subject: [PATCH 2849/6226] nixos/librespeed: lib.any -> lib.elem

---
 nixos/modules/services/web-apps/librespeed.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-apps/librespeed.nix b/nixos/modules/services/web-apps/librespeed.nix
index 1ffc382a3d8e..2f7658339751 100644
--- a/nixos/modules/services/web-apps/librespeed.nix
+++ b/nixos/modules/services/web-apps/librespeed.nix
@@ -338,10 +338,10 @@ in
                 proxy_buffering off;
                 proxy_request_buffering off;
               ''
-              + lib.optionalString (lib.any (m: m.name == "brotli") config.services.nginx.additionalModules) ''
+              + lib.optionalString (lib.elem "brotli" config.services.nginx.additionalModules) ''
                 brotli off;
               ''
-              + lib.optionalString (lib.any (m: m.name == "zstd") config.services.nginx.additionalModules) ''
+              + lib.optionalString (lib.elem "zstd" config.services.nginx.additionalModules) ''
                 zstd off;
               '';
             };

From 6992ef3a7f429899075a04226aafa4c215ec9c05 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 24 Oct 2025 13:13:34 +0900
Subject: [PATCH 2850/6226] nixos/kernel_config: lib.any -> lib.elem

---
 nixos/modules/system/boot/kernel_config.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/system/boot/kernel_config.nix b/nixos/modules/system/boot/kernel_config.nix
index 8ca9c96006a4..2cf34e899cae 100644
--- a/nixos/modules/system/boot/kernel_config.nix
+++ b/nixos/modules/system/boot/kernel_config.nix
@@ -6,7 +6,7 @@ let
     locs: defs:
     if defs == [ ] then
       abort "This case should never happen."
-    else if any (x: x == false) (getValues defs) then
+    else if elem false (getValues defs) then
       false
     else
       true;

From b827f37cb83f65f7199902dc6b3f9436aaf75991 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 24 Oct 2025 13:16:20 +0900
Subject: [PATCH 2851/6226] nixos/dolibarr: lib.any -> lib.elem

---
 nixos/modules/services/web-apps/dolibarr.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-apps/dolibarr.nix b/nixos/modules/services/web-apps/dolibarr.nix
index 0a669ccad2a7..2ed5bbccd6e2 100644
--- a/nixos/modules/services/web-apps/dolibarr.nix
+++ b/nixos/modules/services/web-apps/dolibarr.nix
@@ -6,9 +6,9 @@
 }:
 let
   inherit (lib)
-    any
     boolToString
     concatStringsSep
+    elem
     isBool
     isString
     mapAttrsToList
@@ -46,7 +46,7 @@ let
 
       toStr =
         k: v:
-        if (any (str: k == str) secretKeys) then
+        if (elem k secretKeys) then
           v
         else if isString v then
           "'${v}'"

From a0546493c1497a1b53489bdb382ff7869b8e2267 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 24 Oct 2025 13:21:12 +0900
Subject: [PATCH 2852/6226] nixos/tests/kubernetes: lib.any -> lib.elem

---
 nixos/tests/kubernetes/base.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/tests/kubernetes/base.nix b/nixos/tests/kubernetes/base.nix
index ff943ef17763..8a6756b8f9e5 100644
--- a/nixos/tests/kubernetes/base.nix
+++ b/nixos/tests/kubernetes/base.nix
@@ -18,9 +18,7 @@ let
     }:
     let
       masterName = head (
-        filter (machineName: any (role: role == "master") machines.${machineName}.roles) (
-          attrNames machines
-        )
+        filter (machineName: lib.elem "master" machines.${machineName}.roles) (attrNames machines)
       );
       master = machines.${masterName};
       extraHosts = ''

From 6c05d7bb17283232f4ff6c99fd796017e0c76ac9 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 24 Oct 2025 13:22:30 +0900
Subject: [PATCH 2853/6226] zfs: lib.any -> lib.elem

---
 pkgs/os-specific/linux/zfs/generic.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix
index 457d4cb144e6..9513e3e7a85d 100644
--- a/pkgs/os-specific/linux/zfs/generic.nix
+++ b/pkgs/os-specific/linux/zfs/generic.nix
@@ -57,7 +57,7 @@ let
 
     let
       inherit (lib)
-        any
+        elem
         optionalString
         optionals
         optional
@@ -66,11 +66,11 @@ let
 
       smartmon = smartmontools.override { inherit enableMail; };
 
-      buildKernel = any (n: n == configFile) [
+      buildKernel = elem configFile [
         "kernel"
         "all"
       ];
-      buildUser = any (n: n == configFile) [
+      buildUser = elem configFile [
         "user"
         "all"
       ];

From 021192c0bfd963766c0a6548a8f23fdf7c3605a5 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 24 Oct 2025 13:25:14 +0900
Subject: [PATCH 2854/6226] make-derivation: lib.any -> builtins.elem

---
 pkgs/stdenv/generic/make-derivation.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix
index b27e59860e39..d00df6ff4139 100644
--- a/pkgs/stdenv/generic/make-derivation.nix
+++ b/pkgs/stdenv/generic/make-derivation.nix
@@ -426,7 +426,7 @@ let
 
       concretizeFlagImplications =
         flag: impliesFlags: list:
-        if any (x: x == flag) list then (list ++ impliesFlags) else list;
+        if builtins.elem flag list then (list ++ impliesFlags) else list;
 
       hardeningDisable' = unique (
         pipe hardeningDisable [

From f27d0fdfcf69e46262d403615bf7fcecba638a23 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 26 Oct 2025 16:15:13 +0900
Subject: [PATCH 2855/6226] curl-impersonate-chrome: lib.mapAttrsToList ->
 lib.attrValues

---
 pkgs/by-name/cu/curl-impersonate/chrome/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/cu/curl-impersonate/chrome/default.nix b/pkgs/by-name/cu/curl-impersonate/chrome/default.nix
index 2eb2ae9dc09e..06807d44aba7 100644
--- a/pkgs/by-name/cu/curl-impersonate/chrome/default.nix
+++ b/pkgs/by-name/cu/curl-impersonate/chrome/default.nix
@@ -175,9 +175,7 @@ stdenv.mkDerivation rec {
 
     # Find the correct boringssl source file
     boringssl-source = builtins.head (
-      lib.mapAttrsToList (_: file: file) (
-        lib.filterAttrs (name: _: lib.strings.hasPrefix "boringssl-" name) passthru.deps
-      )
+      lib.attrValues (lib.filterAttrs (name: _: lib.strings.hasPrefix "boringssl-" name) passthru.deps)
     );
     boringssl-go-modules =
       (buildGoModule {

From 3603b3dd9df7883f359ec9f783c65aa260037e33 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 26 Oct 2025 15:27:16 +0800
Subject: [PATCH 2856/6226] nixosTests.vscodium.wayland: Mark as broken

---
 nixos/tests/vscodium.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/nixos/tests/vscodium.nix b/nixos/tests/vscodium.nix
index 8badad20b03c..7cb0871ac9bc 100644
--- a/nixos/tests/vscodium.nix
+++ b/nixos/tests/vscodium.nix
@@ -45,6 +45,10 @@ let
           turion
         ];
 
+        # x86_64: https://github.com/NixOS/nixpkgs/pull/452801#issuecomment-3415680343
+        # aarch64: https://github.com/NixOS/nixpkgs/issues/207234
+        meta.broken = name == "wayland";
+
         enableOCR = true;
 
         testScript = ''

From 19e9f55436dc2bbb0fc45346a3ba26e118fb1f6c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 07:28:15 +0000
Subject: [PATCH 2857/6226] kodiPackages.controller-topology-project: 1.0.7 ->
 1.0.8

---
 .../video/kodi/addons/controller-topology-project/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
index c8cf97449ff9..fc2bc01b8a5b 100644
--- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
+++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix
@@ -8,13 +8,13 @@
 let
   drv = stdenv.mkDerivation rec {
     pname = "controller-topology-project";
-    version = "1.0.7";
+    version = "1.0.8";
 
     src = fetchFromGitHub {
       owner = "kodi-game";
       repo = "controller-topology-project";
       rev = "v${version}";
-      sha256 = "sha256-LzwMKsoip+ajmmk4qUJynOmhhf3Auivn8Af8VRGWkTA=";
+      sha256 = "sha256-hYakxkGAF6kh2nTLwKdnLVqtQLvEgayvexTfqvfoLuw=";
     };
 
     postPatch = ''

From 99e482376210fd1d22b7e5193186a778df29a9ef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 07:33:46 +0000
Subject: [PATCH 2858/6226] linuxKernel.kernels.linux_lqx: 6.17.4 -> 6.17.5

---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index d08ce40a4f20..e6ec7052f1fc 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -23,9 +23,9 @@ let
     };
     # ./update-zen.py lqx
     lqx = {
-      version = "6.17.4"; # lqx
+      version = "6.17.5"; # lqx
       suffix = "lqx1"; # lqx
-      sha256 = "0i45jbxm9bzb43wjqzbc6nkspj93b9fi1vv7zlrvydwphlg3xwwn"; # lqx
+      sha256 = "1jgwpxw1h27kphj0rrf1b9dbhj4jlycr6lnykv8dhf3m0p5vjn46"; # lqx
       isLqx = true;
     };
   };

From d59267104cb7e8111a7e97413e5101cf7523b22f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 07:50:22 +0000
Subject: [PATCH 2859/6226] pocket-id: 1.13.1 -> 1.14.0

---
 pkgs/by-name/po/pocket-id/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix
index f62f30e20992..80a237992883 100644
--- a/pkgs/by-name/po/pocket-id/package.nix
+++ b/pkgs/by-name/po/pocket-id/package.nix
@@ -11,18 +11,18 @@
 
 buildGo125Module (finalAttrs: {
   pname = "pocket-id";
-  version = "1.13.1";
+  version = "1.14.0";
 
   src = fetchFromGitHub {
     owner = "pocket-id";
     repo = "pocket-id";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ayMPyc90bnkIhYfBQ8SgcKayjUQSyrcp5SOLGHTKQwE=";
+    hash = "sha256-5F3XchB3kl54Sm45yD9giRd1K3xwPNhFAVYILyY3f2Q=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/backend";
 
-  vendorHash = "sha256-+HF1zAWA6Ak7uJqWCcTXrttTy1sPA8bN+/No95eqFTU=";
+  vendorHash = "sha256-CmhPURPNwcpmD9shLrQPVKFGBirEMjq0Z4lmgMCpxS8=";
 
   env.CGO_ENABLED = 0;
   ldflags = [
@@ -49,7 +49,7 @@ buildGo125Module (finalAttrs: {
     pnpmDeps = pnpm_10.fetchDeps {
       inherit (finalAttrs) pname version src;
       fetcherVersion = 1;
-      hash = "sha256-IVrp5qWYMgud9ryLidrUowWWBHZ2lMrJp0cfPPHpXls=";
+      hash = "sha256-/e1zBHdy3exqbMvlv0Jth7vpJd7DDnWXGfMV+Cdr56I=";
     };
 
     env.BUILD_OUTPUT_PATH = "dist";

From 304362fae97890f1a0018690b13be68c3980a79a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 07:50:35 +0000
Subject: [PATCH 2860/6226] python3Packages.groq: 0.32.0 -> 0.33.0

---
 pkgs/development/python-modules/groq/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/groq/default.nix b/pkgs/development/python-modules/groq/default.nix
index 70db8134153d..f0e60c517667 100644
--- a/pkgs/development/python-modules/groq/default.nix
+++ b/pkgs/development/python-modules/groq/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "groq";
-  version = "0.32.0";
+  version = "0.33.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "groq";
     repo = "groq-python";
     tag = "v${version}";
-    hash = "sha256-31doHBwdZWlEb1tk0OjfLciPhde0kfiMY6heiXDvnWI=";
+    hash = "sha256-DR5/g/SQZ1445k2nF9cXzyaoGz3QNKvwNPBY5kWngRM=";
   };
 
   postPatch = ''

From 13a03bda6d4c95367d1a4e8bc088d385d26a77ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 08:00:17 +0000
Subject: [PATCH 2861/6226] qgit: 2.12 -> 2.13

---
 pkgs/applications/version-management/qgit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/version-management/qgit/default.nix b/pkgs/applications/version-management/qgit/default.nix
index cc946a3e78d1..cb654c45de32 100644
--- a/pkgs/applications/version-management/qgit/default.nix
+++ b/pkgs/applications/version-management/qgit/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qgit";
-  version = "2.12";
+  version = "2.13";
 
   src = fetchFromGitHub {
     owner = "tibirna";
     repo = "qgit";
     rev = "qgit-${finalAttrs.version}";
-    hash = "sha256-q81nY9D/8riMTFP8gDRbY2PjVo+NwRu/XEN1Yn0P/pk=";
+    hash = "sha256-hOx6FYccutycp+F3iesj48STFeBM/2r5cw2f5FkBIjY=";
   };
 
   nativeBuildInputs = [

From 868fc39bdd451e0052d96ec82ff521efe45740ea Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 25 Oct 2025 13:41:46 +0200
Subject: [PATCH 2862/6226] python313Packages.sqlframe: 3.38.2 -> 3.43.7

Changelog: https://github.com/eakmanrq/sqlframe/releases/tag/v3.43.7
---
 .../python-modules/sqlframe/default.nix       | 58 ++++++++++++++-----
 1 file changed, 44 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/sqlframe/default.nix b/pkgs/development/python-modules/sqlframe/default.nix
index e5d4dca2f152..07c5ae20ed3e 100644
--- a/pkgs/development/python-modules/sqlframe/default.nix
+++ b/pkgs/development/python-modules/sqlframe/default.nix
@@ -7,16 +7,30 @@
   setuptools-scm,
 
   # dependencies
+  more-itertools,
   prettytable,
   sqlglot,
   typing-extensions,
 
-  # tests
-  databricks-sql-connector,
-  duckdb,
-  findspark,
+  # optional-dependencies
+  # bigquery
   google-cloud-bigquery,
+  google-cloud-bigquery-storage,
+  # duckdb
+  duckdb,
+  pandas,
+  # openai
+  openai,
+  # postgres
+  psycopg2,
+  # spark
   pyspark,
+  # databricks-sql-connector
+  databricks-sql-connector,
+
+  # tests
+  findspark,
+  pytest-forked,
   pytest-postgresql,
   pytest-xdist,
   pytestCheckHook,
@@ -24,43 +38,59 @@
 
 buildPythonPackage rec {
   pname = "sqlframe";
-  version = "3.38.2";
+  version = "3.43.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eakmanrq";
     repo = "sqlframe";
     tag = "v${version}";
-    hash = "sha256-ekDt9vsHdHhUNaQghG3EaM82FRZYdw+gaxENcurSayk=";
+    hash = "sha256-qrKNn13wFEqvMQYzHH8T1pga1EUaVIt701p0k4eXw9c=";
   };
 
-  build-system = [
-    setuptools-scm
-  ];
+  build-system = [ setuptools-scm ];
 
   dependencies = [
+    more-itertools
     prettytable
     sqlglot
     typing-extensions
   ];
 
+  optional-dependencies = {
+    bigquery = [
+      google-cloud-bigquery
+      google-cloud-bigquery-storage
+    ]
+    ++ google-cloud-bigquery.optional-dependencies.pandas;
+    duckdb = [
+      duckdb
+      pandas
+    ];
+    openai = [ openai ];
+    pandas = [ pandas ];
+    postgres = [ psycopg2 ];
+    spark = [ pyspark ];
+    databricks = [ databricks-sql-connector ];
+  };
+
   pythonImportsCheck = [ "sqlframe" ];
 
   nativeCheckInputs = [
-    databricks-sql-connector
-    duckdb
     findspark
-    google-cloud-bigquery
-    pyspark
+    pytest-forked
     pytest-postgresql
     pytest-xdist
     pytestCheckHook
-  ];
+  ]
+  ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   disabledTests = [
     # Requires google-cloud credentials
     # google.auth.exceptions.DefaultCredentialsErro
     "test_activate_bigquery_default_dataset"
+    # AttributeError: module 'sqlglot.expressions' has no attribute 'Acos'
+    "test_unquoted_identifiers"
   ];
 
   disabledTestPaths = [

From 58727a9bc1f46d70517ec3aaf110880b307231cd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 25 Oct 2025 13:44:09 +0200
Subject: [PATCH 2863/6226] python313Packages.narwhals: 2.6.0 -> 2.9.0

Changelog: https://github.com/narwhals-dev/narwhals/releases/tag/v2.9.0
---
 pkgs/development/python-modules/narwhals/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/narwhals/default.nix b/pkgs/development/python-modules/narwhals/default.nix
index abb7a87dac64..9f000c226bf3 100644
--- a/pkgs/development/python-modules/narwhals/default.nix
+++ b/pkgs/development/python-modules/narwhals/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "narwhals";
-  version = "2.6.0";
+  version = "2.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "narwhals-dev";
     repo = "narwhals";
     tag = "v${version}";
-    hash = "sha256-peD5CLp5YCLPrOmXnoezT+gAJLf7zSb0xdhV+PhC/XI=";
+    hash = "sha256-b+Y6MAt0E4XIAO7Ctr+2UDnVTkhPoN/C3WWolEPh/es=";
   };
 
   build-system = [ hatchling ];

From bbb2f43e8b0e1bfc204587ffe9c02071eff7cff9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 08:12:55 +0000
Subject: [PATCH 2864/6226] serie: 0.5.2 -> 0.5.3

---
 pkgs/by-name/se/serie/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/serie/package.nix b/pkgs/by-name/se/serie/package.nix
index 70da4c34d9c5..ab0a72d1c9b0 100644
--- a/pkgs/by-name/se/serie/package.nix
+++ b/pkgs/by-name/se/serie/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "serie";
-  version = "0.5.2";
+  version = "0.5.3";
 
   src = fetchFromGitHub {
     owner = "lusingander";
     repo = "serie";
     rev = "v${version}";
-    hash = "sha256-b2Ys49561nBn+U8pDQHewrxd351PLGIQr0qK51eYuCk=";
+    hash = "sha256-HzAgPCAHOdxXPwPWPPU9VaNrVJL42TlbYMD/n7AeOH8=";
   };
 
-  cargoHash = "sha256-KhLDaEPC5CIApMbxoGkO58QJ3bGkDlEjGJzdFa8UZKw=";
+  cargoHash = "sha256-dRR3Zr2QM1yDDxiKqugwMtz5f5ted0oHSdR47XUTQUc=";
 
   nativeCheckInputs = [ gitMinimal ];
 

From 2f9f2dbc34a5e2c958e93b9d947f3a7a543bde0d Mon Sep 17 00:00:00 2001
From: zimward <zimward@zimward.moe>
Date: Thu, 23 Oct 2025 09:32:19 +0200
Subject: [PATCH 2865/6226] splitcode: 0.31.3 -> 0.31.4

---
 pkgs/by-name/sp/splitcode/package.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/sp/splitcode/package.nix b/pkgs/by-name/sp/splitcode/package.nix
index 7de43dca3747..47c43e745c40 100644
--- a/pkgs/by-name/sp/splitcode/package.nix
+++ b/pkgs/by-name/sp/splitcode/package.nix
@@ -7,18 +7,15 @@
   zlib,
   nix-update-script,
 }:
-let
-  version = "0.31.3";
-in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "splitcode";
-  inherit version;
+  version = "0.31.4";
 
   src = fetchFromGitHub {
     owner = "pachterlab";
     repo = "splitcode";
-    tag = "v${version}";
-    hash = "sha256-EEYjBo52jPCSnv5WSGsXhfZEjsBCHdGerVPOZfShXBU=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-jaZptrF5HSQSe2KQdBNPprhsVZ2FSudZFgWPn9zQq3A=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -28,6 +25,12 @@ stdenv.mkDerivation {
     zlib
   ];
 
+  postPatch = ''
+    # https://github.com/pachterlab/splitcode/pull/46
+    substituteInPlace CMakeLists.txt \
+      --replace-fail 2.8.12 3.10
+  '';
+
   doCheck = true;
   checkPhase = ''
     mkdir func_tests
@@ -49,4 +52,4 @@ stdenv.mkDerivation {
       "aarch64-linux"
     ];
   };
-}
+})

From f1539eb8c0933ee3c534a44d7e2f7bc255dc0d92 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 26 Oct 2025 12:06:18 +0400
Subject: [PATCH 2866/6226] =?UTF-8?q?LAStools:=202.0.3=20=E2=86=92=202.0.4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/la/LAStools/cmake.diff           | 57 -------------------
 pkgs/by-name/la/LAStools/drop-64-suffix.patch | 17 +++---
 pkgs/by-name/la/LAStools/package.nix          |  6 +-
 3 files changed, 9 insertions(+), 71 deletions(-)
 delete mode 100644 pkgs/by-name/la/LAStools/cmake.diff

diff --git a/pkgs/by-name/la/LAStools/cmake.diff b/pkgs/by-name/la/LAStools/cmake.diff
deleted file mode 100644
index a28719d01b80..000000000000
--- a/pkgs/by-name/la/LAStools/cmake.diff
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git i/CMakeLists.txt w/CMakeLists.txt
-index 6a0ea6e..70de632 100644
---- i/CMakeLists.txt
-+++ w/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 3.1 FATAL_ERROR)
-+cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
- set(CMAKE_SUPPRESS_REGENERATION true)
- set(CMAKE_CXX_STANDARD 17)
- project("LAStools" CXX C)
-diff --git i/LASlib/CMakeLists.txt w/LASlib/CMakeLists.txt
-index 5efb193..907b381 100644
---- i/LASlib/CMakeLists.txt
-+++ w/LASlib/CMakeLists.txt
-@@ -1,4 +1,4 @@
--cmake_minimum_required(VERSION 2.8 FATAL_ERROR)
-+cmake_minimum_required(VERSION 3.10 FATAL_ERROR)
- set(CMAKE_SUPPRESS_REGENERATION true)
- project("LASlib")
- 
-diff --git i/LASlib/src/CMakeLists.txt w/LASlib/src/CMakeLists.txt
-index 51dca48..28242e6 100644
---- i/LASlib/src/CMakeLists.txt
-+++ w/LASlib/src/CMakeLists.txt
-@@ -70,7 +70,7 @@ file(GLOB_RECURSE LAS_INCLUDES
- 
- add_library(LASlib ${LAS_SRC} ${LAZ_SRC_FULL})
- set_property(TARGET LASlib PROPERTY POSITION_INDEPENDENT_CODE ON)
--set_property(TARGET LASlib PROPERTY CXX_STANDARD 11)
-+set_property(TARGET LASlib PROPERTY CXX_STANDARD 14)
- 
- if (BUILD_SHARED_LIBS)
- 	target_compile_definitions(LASlib PRIVATE "COMPILE_AS_DLL")
-diff --git i/src/CMakeLists.txt w/src/CMakeLists.txt
-index ebdf98a..3b66b82 100644
---- i/src/CMakeLists.txt
-+++ w/src/CMakeLists.txt
-@@ -5,6 +5,7 @@ add_definitions(-DNDEBUG )
- 
- include_directories(../LASzip/src)
- include_directories(../LASlib/inc)
-+include_directories(.)
- 
- set(GEOPROJECTION_TARGETS
- 	laszip
-diff --git i/src/geoprojectionconverter.cpp w/src/geoprojectionconverter.cpp
-index 1e3298d..5306c32 100644
---- i/src/geoprojectionconverter.cpp
-+++ w/src/geoprojectionconverter.cpp
-@@ -33,6 +33,7 @@
- */
- #include "geoprojectionconverter.hpp"
- 
-+#include <algorithm>
- #include <math.h>
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/pkgs/by-name/la/LAStools/drop-64-suffix.patch b/pkgs/by-name/la/LAStools/drop-64-suffix.patch
index 2090baeb3b2b..ef065fc61be2 100644
--- a/pkgs/by-name/la/LAStools/drop-64-suffix.patch
+++ b/pkgs/by-name/la/LAStools/drop-64-suffix.patch
@@ -1,13 +1,10 @@
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -32,6 +32,6 @@ endforeach(TARGET)
- foreach(TARGET ${ALL_TARGETS})
- 	target_link_libraries(${TARGET} LASlib)
- 	set_target_properties(${TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin64)
--	set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${TARGET}64)
-+	set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${TARGET})
- 	install(TARGETS ${TARGET} RUNTIME DESTINATION bin)
+@@ -40,6 +41,6 @@
+   set_property(TARGET ${TARGET} PROPERTY CXX_STANDARD 17)
+   target_link_libraries(${TARGET} LASlib ${CMAKE_DL_LIBS})
+   set_target_properties(${TARGET} PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/../bin64)
+-  set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${TARGET}64)
++  set_target_properties(${TARGET} PROPERTIES OUTPUT_NAME ${TARGET})
+   install(TARGETS ${TARGET} RUNTIME DESTINATION bin)
  endforeach(TARGET)
--- 
-2.28.0
-
diff --git a/pkgs/by-name/la/LAStools/package.nix b/pkgs/by-name/la/LAStools/package.nix
index 6c8ffce71017..f19157f28750 100644
--- a/pkgs/by-name/la/LAStools/package.nix
+++ b/pkgs/by-name/la/LAStools/package.nix
@@ -7,19 +7,17 @@
 
 stdenv.mkDerivation rec {
   pname = "LAStools";
-  version = "2.0.3";
+  version = "2.0.4";
 
   src = fetchFromGitHub {
     owner = "LAStools";
     repo = "LAStools";
     rev = "v${version}";
-    sha256 = "sha256-IyZjM8YvIVB0VPNuEhmHHw7EuKw5RanB2qhCnBD1fRY=";
+    sha256 = "sha256-ow7zcvkenJ2j+tj2TxuEtK0dQEwzUtJ9f0wzt5/qimM=";
   };
 
   patches = [
     ./drop-64-suffix.patch # necessary to prevent '64' from being appended to the names of the executables
-    # https://github.com/lastools/LAStools/pull/234
-    ./cmake.diff
   ];
 
   hardeningDisable = [

From b0e92dd067ba7d33bff3fdc2401ae73db2ee54f5 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Sun, 26 Oct 2025 12:10:27 +0400
Subject: [PATCH 2867/6226] LAStools: modernize

---
 pkgs/by-name/la/LAStools/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/la/LAStools/package.nix b/pkgs/by-name/la/LAStools/package.nix
index f19157f28750..35da3703adb5 100644
--- a/pkgs/by-name/la/LAStools/package.nix
+++ b/pkgs/by-name/la/LAStools/package.nix
@@ -5,15 +5,15 @@
   cmake,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "LAStools";
   version = "2.0.4";
 
   src = fetchFromGitHub {
     owner = "LAStools";
     repo = "LAStools";
-    rev = "v${version}";
-    sha256 = "sha256-ow7zcvkenJ2j+tj2TxuEtK0dQEwzUtJ9f0wzt5/qimM=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ow7zcvkenJ2j+tj2TxuEtK0dQEwzUtJ9f0wzt5/qimM=";
   };
 
   patches = [
@@ -30,12 +30,12 @@ stdenv.mkDerivation rec {
     cmake
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Software for rapid LiDAR processing";
     homepage = "http://lastools.org/";
-    license = licenses.unfree;
-    maintainers = with maintainers; [ stephenwithph ];
-    teams = [ teams.geospatial ];
-    platforms = platforms.unix;
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [ stephenwithph ];
+    teams = [ lib.teams.geospatial ];
+    platforms = lib.platforms.unix;
   };
-}
+})

From 872f3028e4d9e20118c45812cb6cc86d29619b03 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 26 Oct 2025 05:33:43 -0300
Subject: [PATCH 2868/6226] opentx: fix build with cmake4

---
 pkgs/applications/misc/opentx/default.nix     | 10 +++++++
 .../fix-cmake-qt-linking-and-location.patch   | 27 +++++++++++++++++++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/applications/misc/opentx/fix-cmake-qt-linking-and-location.patch

diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix
index c3e100db084b..2d3389ff0faa 100644
--- a/pkgs/applications/misc/opentx/default.nix
+++ b/pkgs/applications/misc/opentx/default.nix
@@ -26,6 +26,10 @@ mkDerivation rec {
     sha256 = "sha256-F3zykJhKuIpLQSTjn7mcdjEmgRAlwCZpkTaKQR9ve3g=";
   };
 
+  patches = [
+    # fix error "The LOCATION property may not be read from target" and ensure proper linking of Qt modules so build don't fail
+    ./fix-cmake-qt-linking-and-location.patch
+  ];
   nativeBuildInputs = [
     cmake
     gcc-arm-embedded
@@ -44,6 +48,12 @@ mkDerivation rec {
     sed -i companion/src/burnconfigdialog.cpp \
       -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|' \
       -e 's|/usr/.*bin/avrdude|${avrdude}/bin/avrdude|'
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_policy(SET CMP0023 OLD)" "cmake_policy(SET CMP0023 NEW)"
+    substituteInPlace companion/src/thirdparty/maxlibqt/src/widgets/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.12)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   cmakeFlags = [
diff --git a/pkgs/applications/misc/opentx/fix-cmake-qt-linking-and-location.patch b/pkgs/applications/misc/opentx/fix-cmake-qt-linking-and-location.patch
new file mode 100644
index 000000000000..857fca37716c
--- /dev/null
+++ b/pkgs/applications/misc/opentx/fix-cmake-qt-linking-and-location.patch
@@ -0,0 +1,27 @@
+--- a/companion/src/CMakeLists.txt
++++ b/companion/src/CMakeLists.txt
+@@ -313,8 +313,8 @@
+ qt5_wrap_cpp(companion_SRCS ${companion_MOC_HDRS})
+ 
+ add_executable(${COMPANION_NAME} MACOSX_BUNDLE ${WIN_EXECUTABLE_TYPE} ${companion_SRCS} ${icon_RC})
+-target_link_libraries(${COMPANION_NAME} PRIVATE generaledit modeledit qcustomplot shared ${CPN_COMMON_LIB})
+-
++target_link_libraries(${COMPANION_NAME} PRIVATE generaledit modeledit qcustomplot shared ${CPN_COMMON_LIB}
++Qt5::Network Qt5::PrintSupport)
+ PrintTargetReport("${COMPANION_NAME}")
+ 
+ ############# Standalone simulator ###############
+@@ -371,11 +371,11 @@
+   string(TOLOWER ${PCB} FLAVOUR)
+ endif()
+ if(POLICY CMP0026)
+-  cmake_policy(SET CMP0026 OLD)  # https://cmake.org/cmake/help/v3.0/policy/CMP0026.html
++  cmake_policy(SET CMP0026 NEW)  # https://cmake.org/cmake/help/v3.0/policy/CMP0026.html
+ endif()
+ 
+ if(SIMU_TARGET)
+-  get_property(current_plugin TARGET opentx-${FLAVOUR}-simulator PROPERTY LOCATION)
++  set(current_plugin $<TARGET_FILE:opentx-${FLAVOUR}-simulator>)
+   list(APPEND simulator_plugins "${current_plugin}")
+ endif()
+ 

From 991423c5e9d2eaf53db3e5c428c12470b97534b2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 08:49:28 +0000
Subject: [PATCH 2869/6226] javaPackages.compiler.openjdk25: 25+36 -> 25.0.1+8

---
 pkgs/development/compilers/openjdk/25/source.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/25/source.json b/pkgs/development/compilers/openjdk/25/source.json
index b34a8438ef74..26056e281d80 100644
--- a/pkgs/development/compilers/openjdk/25/source.json
+++ b/pkgs/development/compilers/openjdk/25/source.json
@@ -1,6 +1,6 @@
 {
-  "hash": "sha256-5kQ7xPyWGk/weVYVVNEFPUF1HspfisqcPHA+DM6Q35c=",
+  "hash": "sha256-t5eUiWhAst3Aa16YVx7sMaHK6BHwLWyvxGfTq0C+Z4M=",
   "owner": "openjdk",
   "repo": "jdk25u",
-  "rev": "refs/tags/jdk-25+36"
+  "rev": "refs/tags/jdk-25.0.1+8"
 }

From 471e2931e83a2102d6392c36b2d48ff6ada2a83b Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sun, 26 Oct 2025 14:24:10 +0530
Subject: [PATCH 2870/6226] nixos/stage-1: fix nix parsing error

```
error: A definition for option `boot.initrd.systemd.extraBin.mount' is not of type `absolute path'. Definition values:
       - In `/nix/store/h259dzilgbvpfsnlcyims14jrcdnx8fk-source/nixos/modules/tasks/filesystems/zfs.nix':
           {
             zfs = "/nix/store/hxg3s5l92y9n9m48p872i62dn5ck33hx-zfs-user-2.4.0-rc3/sbin/mount.zfs";
           }

```
Fixes https://github.com/NixOS/nixpkgs/pull/414391#issuecomment-3448084329
---
 nixos/modules/tasks/filesystems/zfs.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 7b39d58248c4..a65e0c00feba 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -798,7 +798,7 @@ in
           extraBin = {
             zpool = "${cfgZfs.package}/sbin/zpool";
             zfs = "${cfgZfs.package}/sbin/zfs";
-            mount.zfs = "${cfgZfs.package}/sbin/mount.zfs";
+            "mount.zfs" = "${cfgZfs.package}/sbin/mount.zfs";
             awk = "${pkgs.gawk}/bin/awk";
           };
           storePaths = [

From 49e498c6d5b25ee95c457dde97ad3959a63d4d35 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 09:12:31 +0000
Subject: [PATCH 2871/6226] necesse-server: 1.0.1-20495154 -> 1.0.1-20510020

---
 pkgs/by-name/ne/necesse-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/necesse-server/package.nix b/pkgs/by-name/ne/necesse-server/package.nix
index c1e39ebe2d40..9875535313ed 100644
--- a/pkgs/by-name/ne/necesse-server/package.nix
+++ b/pkgs/by-name/ne/necesse-server/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "1.0.1-20495154";
+  version = "1.0.1-20510020";
   urlVersion = lib.replaceStrings [ "." ] [ "-" ] version;
 
 in
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {
 
   src = fetchzip {
     url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip";
-    hash = "sha256-1k+4ywYjVddAb4yyGx1Fi/RXMyJzPIiQIyUzA0VhpAI=";
+    hash = "sha256-e2pnyexvl0mbhlX2Y+4NKJz1VqR1LoV9VlSfqOgXy7E=";
   };
 
   # removing packaged jre since we use our own

From 52b867cd39f780b0b4857608127e443b3af68dad Mon Sep 17 00:00:00 2001
From: 7karni <7karni@proton.me>
Date: Sat, 25 Oct 2025 19:58:12 +0530
Subject: [PATCH 2872/6226] sunvox: added desktop entry for application
 launchers

use makeDesktopItem and copyDesktopItems as suggested in review
---
 pkgs/by-name/su/sunvox/package.nix | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/su/sunvox/package.nix b/pkgs/by-name/su/sunvox/package.nix
index 41d80a042a91..4afee56add8f 100644
--- a/pkgs/by-name/su/sunvox/package.nix
+++ b/pkgs/by-name/su/sunvox/package.nix
@@ -4,14 +4,15 @@
   fetchzip,
   alsa-lib,
   autoPatchelfHook,
+  copyDesktopItems,
   libglvnd,
   libjack2,
   libX11,
   libXi,
+  makeDesktopItem,
   makeWrapper,
   SDL2,
 }:
-
 let
   platforms = {
     "x86_64-linux" = "linux_x86_64";
@@ -41,6 +42,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs =
     lib.optionals stdenv.hostPlatform.isLinux [
       autoPatchelfHook
+      copyDesktopItems
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
       makeWrapper
@@ -58,6 +60,21 @@ stdenv.mkDerivation (finalAttrs: {
     libjack2
   ];
 
+  desktopItems = lib.optionals stdenv.hostPlatform.isLinux [
+    (makeDesktopItem {
+      name = "sunvox";
+      exec = "sunvox";
+      desktopName = "SunVox";
+      genericName = "Modular Synthesizer";
+      comment = "Modular synthesizer with pattern-based sequencer";
+      categories = [
+        "AudioVideo"
+        "Audio"
+        "Midi"
+      ];
+    })
+  ];
+
   dontConfigure = true;
   dontBuild = true;
 

From f91c5e3f4ff75f0d78450fcae8563ae548e8142b Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sun, 26 Oct 2025 10:41:15 +0100
Subject: [PATCH 2873/6226] claude-code: 2.0.26 -> 2.0.27

---
 .../vscode/extensions/anthropic.claude-code/default.nix     | 4 ++--
 pkgs/by-name/cl/claude-code/package-lock.json               | 4 ++--
 pkgs/by-name/cl/claude-code/package.nix                     | 6 +++---
 pkgs/by-name/cl/claude-code/update.sh                       | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 6bf2f09eee95..65cb6118b3b2 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "2.0.26";
-    hash = "sha256-5wEIWlqKVBs7pwzsIAFtAjGWHTjlLI/LzCs+8M0LL9Q=";
+    version = "2.0.27";
+    hash = "sha256-4zifN9Wf7Tp+qrIvjf3iBPqu8wtedCAu1v93lDBAGbo=";
   };
 
   meta = {
diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 585972837213..5686f33d15e2 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.0.26",
+  "version": "2.0.27",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.0.26",
+      "version": "2.0.27",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 868cfd4469a3..3a6e2899a2f8 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,14 +7,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.0.26";
+  version = "2.0.27";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-4roXnR6y3jFr7uCZFKTFOyahPjnhJuyVFXunQ89flL4=";
+    hash = "sha256-ZxwEnUWCtgrGhgtUjcWcMgLqzaajwE3pG7iSIfaS3ic=";
   };
 
-  npmDepsHash = "sha256-fEXaPqT9TxDb3uWJRRGIJMP2NffUBDGpPY2uJc6DP0k=";
+  npmDepsHash = "sha256-cBhHQYHmLtGhLfaK//L48qGZCF+u6N/OsLTTpNA2t+E==";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json
diff --git a/pkgs/by-name/cl/claude-code/update.sh b/pkgs/by-name/cl/claude-code/update.sh
index bb64ea3631c1..a3fe5d871a99 100755
--- a/pkgs/by-name/cl/claude-code/update.sh
+++ b/pkgs/by-name/cl/claude-code/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell --pure --keep NIX_PATH -i bash --packages nodejs nix-update git
+#!nix-shell --pure --keep NIX_PATH -i bash --packages nodejs nix-update git cacert
 
 set -euo pipefail
 

From 06a27e2fca7bf1d4a913392a2b9d8d4aab35199f Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 26 Oct 2025 17:50:34 +0800
Subject: [PATCH 2874/6226] mate.mate-notification-daemon: 1.28.3 -> 1.28.5

https://github.com/mate-desktop/mate-notification-daemon/compare/v1.28.3...v1.28.5
---
 .../mate/mate-notification-daemon/default.nix  | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/mate/mate-notification-daemon/default.nix b/pkgs/desktops/mate/mate-notification-daemon/default.nix
index 2d71ec226d46..027faa67898f 100644
--- a/pkgs/desktops/mate/mate-notification-daemon/default.nix
+++ b/pkgs/desktops/mate/mate-notification-daemon/default.nix
@@ -1,7 +1,9 @@
 {
   lib,
   stdenv,
-  fetchurl,
+  fetchFromGitHub,
+  autoconf-archive,
+  autoreconfHook,
   pkg-config,
   gettext,
   glib,
@@ -11,6 +13,7 @@
   gtk-layer-shell,
   gtk3,
   libxml2,
+  mate-common,
   mate-desktop,
   mate-panel,
   wrapGAppsHook3,
@@ -19,17 +22,22 @@
 
 stdenv.mkDerivation rec {
   pname = "mate-notification-daemon";
-  version = "1.28.3";
+  version = "1.28.5";
 
-  src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    hash = "sha256-4Azssf+fdbnMwmRFWORDQ7gJQe20A3fdgQDtOSKt9BM=";
+  src = fetchFromGitHub {
+    owner = "mate-desktop";
+    repo = "mate-notification-daemon";
+    tag = "v${version}";
+    hash = "sha256-6N6lD63JL9xAtALn9URjYiCEhMZBC9TfIsrdalyY3YY=";
   };
 
   nativeBuildInputs = [
+    autoconf-archive
+    autoreconfHook
     pkg-config
     gettext
     libxml2 # for xmllint
+    mate-common # mate-common.m4 macros
     wrapGAppsHook3
   ];
 

From 397661e49959a67a8bb4432b7b026f132a8adaef Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 26 Oct 2025 10:06:24 +0000
Subject: [PATCH 2875/6226] calibre refactor test skipping code

---
 pkgs/by-name/ca/calibre/package.nix | 48 +++++++++++++++++------------
 1 file changed, 29 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix
index 56642f9be070..c3a560e19f79 100644
--- a/pkgs/by-name/ca/calibre/package.nix
+++ b/pkgs/by-name/ca/calibre/package.nix
@@ -221,29 +221,39 @@ stdenv.mkDerivation (finalAttrs: {
   installCheckInputs = with python3Packages; [
     psutil
   ];
-  installCheckPhase = ''
-    runHook preInstallCheck
+  installCheckPhase =
+    let
+      excludedTestNames = [
+        "test_7z" # we don't include 7z support
+        "test_zstd" # we don't include zstd support
+        "test_qt" # we don't include svg or webp support
+        "test_import_of_all_python_modules" # explores actual file paths, gets confused
+        "test_websocket_basic" # flaky
 
-    ETN='--exclude-test-name'
-    EXCLUDED_FLAGS=(
-      $ETN 'test_7z'  # we don't include 7z support
-      $ETN 'test_zstd'  # we don't include zstd support
-      $ETN 'test_qt'  # we don't include svg or webp support
-      $ETN 'test_import_of_all_python_modules'  # explores actual file paths, gets confused
-      $ETN 'test_websocket_basic'  # flakey
-      # hangs with cuda enabled, also:
-      # eglInitialize: Failed to get system egl display
-      # Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory
-      $ETN 'test_recipe_browser_webengine'
+        # hangs with cuda enabled, also:
+        # eglInitialize: Failed to get system egl display
+        # Failed to connect to socket /run/dbus/system_bus_socket: No such file or directory
+        "test_recipe_browser_webengine"
+      ]
+      ++ lib.optionals stdenv.hostPlatform.isAarch64 [
+        # https://github.com/microsoft/onnxruntime/issues/10038
+        "test_piper"
+      ]
+      ++ lib.optionals (!unrarSupport) [
+        "test_unrar"
+      ];
 
-      ${lib.optionalString stdenv.hostPlatform.isAarch64 "$ETN 'test_piper'"} # https://github.com/microsoft/onnxruntime/issues/10038
-      ${lib.optionalString (!unrarSupport) "$ETN 'test_unrar'"}
-    )
+      testFlags = lib.concatStringsSep " " (
+        lib.map (testName: "--exclude-test-name ${testName}") excludedTestNames
+      );
+    in
+    ''
+      runHook preInstallCheck
 
-    python setup.py test ''${EXCLUDED_FLAGS[@]}
+      python setup.py test ${testFlags}
 
-    runHook postInstallCheck
-  '';
+      runHook postInstallCheck
+    '';
 
   passthru.updateScript = nix-update-script {
     extraArgs = [ "--url=https://github.com/kovidgoyal/calibre" ];

From 59c8a1e672b7eb4b151adc15f41906d89b900bc1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 26 Oct 2025 10:06:41 +0000
Subject: [PATCH 2876/6226] calibre: skip crashing test on aarch64-linux

---
 pkgs/by-name/ca/calibre/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix
index c3a560e19f79..eaad1cb706c1 100644
--- a/pkgs/by-name/ca/calibre/package.nix
+++ b/pkgs/by-name/ca/calibre/package.nix
@@ -238,6 +238,12 @@ stdenv.mkDerivation (finalAttrs: {
       ++ lib.optionals stdenv.hostPlatform.isAarch64 [
         # https://github.com/microsoft/onnxruntime/issues/10038
         "test_piper"
+
+        # terminate called after throwing an instance of 'onnxruntime::OnnxRuntimeException'
+        #  what():  /build/source/include/onnxruntime/core/common/logging/logging.h:371
+        # static const onnxruntime::logging::Logger& onnxruntime::logging::LoggingManager::DefaultLogger()
+        # Attempt to use DefaultLogger but none has been registered.
+        "test_plugins"
       ]
       ++ lib.optionals (!unrarSupport) [
         "test_unrar"

From 56177afcb2d20edfa163664cb7ee9b0ced3c44b0 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Sun, 26 Oct 2025 11:11:10 +0100
Subject: [PATCH 2877/6226] doc/release-notes/rl-2511.section.md: Add note
 about changed powerpc64-linux glibc ELF ABI default

---
 doc/release-notes/rl-2511.section.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index 68af70fe5783..48738995e96b 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -68,6 +68,9 @@
 
 - `base16-builder` node package has been removed due to lack of upstream maintenance.
 
+- The default glibc ELF ABI for the powerpc64-linux platform has been changed from ELFv2 back to ELFv1, due to the latter having less remaining issues when bootstrapping & building Nixpkgs packages on hardware.
+  If glibc ELFv2 is desired, use a fuller target triplet like `powerpc64-unknown-linux-gnuabielfv2` or the provided `ppc64-elfv2` platform example.
+
 - `python3Packages.bjoern` has been removed, as the upstream is unmaintained and it depends on a 14-year-old version of http-parser with numerous vulnerabilities.
 
 - `buildGoModule` removes the compatibility layer of `CGO_ENABLED` not specified via `env`.

From 4fad6a24314997b566b0f03e77a6dc464164ffff Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sun, 26 Oct 2025 18:29:58 +0800
Subject: [PATCH 2878/6226] paper-plane: fix build with cmake4

---
 pkgs/by-name/pa/paper-plane/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/pa/paper-plane/package.nix b/pkgs/by-name/pa/paper-plane/package.nix
index 065a5354c571..c817c0f70e86 100644
--- a/pkgs/by-name/pa/paper-plane/package.nix
+++ b/pkgs/by-name/pa/paper-plane/package.nix
@@ -53,6 +53,12 @@ let
       rev = "2589c3fd46925f5d57e4ec79233cd1bd0f5d0c09";
       hash = "sha256-mbhxuJjrV3nC8Ja7N0WWF9ByHovJLmoLLuuzoU4khjU=";
     };
+    postPatch = ''
+      substituteInPlace CMakeLists.txt \
+        --replace-fail "cmake_minimum_required(VERSION 3.0.2 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+      substituteInPlace td/generate/tl-parser/CMakeLists.txt \
+        --replace-fail "cmake_minimum_required(VERSION 3.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
+    '';
   });
   rlottie-paperplane = rlottie.overrideAttrs (prev: {
     pname = "rlottie-paperplane";

From 3eb7d3ace500df0340621b6d1fbcab75bc839d1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 26 Oct 2025 10:39:41 +0000
Subject: [PATCH 2879/6226] python3Packages.textual-textarea: 0.17.1 -> 0.17.2

---
 pkgs/development/python-modules/textual-textarea/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/textual-textarea/default.nix b/pkgs/development/python-modules/textual-textarea/default.nix
index 8ab356d467ef..ff311a5b988c 100644
--- a/pkgs/development/python-modules/textual-textarea/default.nix
+++ b/pkgs/development/python-modules/textual-textarea/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "textual-textarea";
-  version = "0.17.1";
+  version = "0.17.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tconbeer";
     repo = "textual-textarea";
     tag = "v${version}";
-    hash = "sha256-E6Yw/NRjfrdCeERgM0jdjfmG9zL2GhY2qAWUB1XwFic=";
+    hash = "sha256-y+2WvqD96eYkDEJn5qCGfGFNiJFAcF4KWWNgAIZUqJo=";
   };
 
   build-system = [ hatchling ];

From 7ab424fff56010da6f1ffd891e0500a1e170bd1f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 10:45:30 +0000
Subject: [PATCH 2880/6226] terraform-providers.integrations_github: 6.6.0 ->
 6.7.0

---
 .../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 a9c2baab64d6..a0c4d261d8aa 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -741,11 +741,11 @@
     "vendorHash": null
   },
   "integrations_github": {
-    "hash": "sha256-rmIoyGlkw2f56UwD0mfI5MiHPDFDuhtsoPmerIrJcGs=",
+    "hash": "sha256-OexDIuEHRSOeHq0lRZcaaezdQpm5tgINGcka6jk+bK0=",
     "homepage": "https://registry.terraform.io/providers/integrations/github",
     "owner": "integrations",
     "repo": "terraform-provider-github",
-    "rev": "v6.6.0",
+    "rev": "v6.7.0",
     "spdx": "MIT",
     "vendorHash": null
   },

From 79318f5c434d63adc64421b2131461dab31ecbe8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 11:01:14 +0000
Subject: [PATCH 2881/6226] terraform-providers.datadog_datadog: 3.76.0 ->
 3.77.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 a9c2baab64d6..614a50428d6d 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -264,13 +264,13 @@
     "vendorHash": "sha256-3o6YRDrq4rQhNAFyqiGJrAoxuAykWw85OExRGSE3kGI="
   },
   "datadog_datadog": {
-    "hash": "sha256-NJjU+x4AWXuBKdszE4AmebodhPLEoX70DjvYXTBrolY=",
+    "hash": "sha256-6TWsoB6v7mqln4qcq1Dhk8GnkNVUFGyZhR9sJ1Ri/yU=",
     "homepage": "https://registry.terraform.io/providers/DataDog/datadog",
     "owner": "DataDog",
     "repo": "terraform-provider-datadog",
-    "rev": "v3.76.0",
+    "rev": "v3.77.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-3RqIhSu7C770Zl7QngqKMNdo40DGDoZSQpuABQxajK8="
+    "vendorHash": "sha256-9Xl32qeUvpvID4+REuQZlCFarz8cEdtOzROU4jrordw="
   },
   "datadrivers_nexus": {
     "hash": "sha256-Lm5CZ+eBDUNIL2KuK/iKc5dTif7P+E9II714vwvYuyU=",

From 4804f1233df51dc0e04f86613a0c2640342e7897 Mon Sep 17 00:00:00 2001
From: Gabriel Maguire <gabrielmaguire@proton.me>
Date: Mon, 19 Aug 2024 22:13:28 -0400
Subject: [PATCH 2882/6226] maintainers: add GabrielMaguire

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 1a80919715aa..bb777bcd9e45 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9033,6 +9033,12 @@
     githubId = 1313787;
     name = "Gabriella Gonzalez";
   };
+  GabrielMaguire = {
+    email = "gabrielmaguire@proton.me";
+    github = "GabrielMaguire";
+    githubId = 39974571;
+    name = "Gabriel Maguire";
+  };
   gabyx = {
     email = "gnuetzi@gmail.com";
     github = "gabyx";

From 315ea55a65a720bbd661380ad04aa918525e80f8 Mon Sep 17 00:00:00 2001
From: Gabriel Maguire <gabrielmaguire@proton.me>
Date: Mon, 19 Aug 2024 22:14:14 -0400
Subject: [PATCH 2883/6226] chicago95: init at 3.0.1

---
 pkgs/by-name/ch/chicago95/package.nix | 51 +++++++++++++++++++++++++++
 1 file changed, 51 insertions(+)
 create mode 100644 pkgs/by-name/ch/chicago95/package.nix

diff --git a/pkgs/by-name/ch/chicago95/package.nix b/pkgs/by-name/ch/chicago95/package.nix
new file mode 100644
index 000000000000..d3a9e61289a7
--- /dev/null
+++ b/pkgs/by-name/ch/chicago95/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  gtk3,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "chicago95";
+  version = "3.0.1";
+
+  src = fetchFromGitHub {
+    owner = "grassmunk";
+    repo = "Chicago95";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-EHcDIct2VeTsjbQWnKB2kwSFNb97dxuydAu+i/VquBA=";
+  };
+
+  nativeBuildInputs = [ gtk3 ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/themes
+    mv Theme/Chicago95 $out/share/themes
+
+    mkdir -p $out/share/icons
+    mv Icons/Chicago95 $out/share/icons
+    gtk-update-icon-cache $out/share/icons/Chicago95
+
+    mkdir -p $out/share/sddm/themes
+    tar -xzf KDE/SDDM/Chicago95.tar.gz -C "$out/share/sddm/themes/"
+
+    mkdir -p $out/share/fonts
+    cp Fonts/vga_font/* $out/share/fonts
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Windows 95 theme for GTK";
+    homepage = "https://github.com/grassmunk/Chicago95";
+    changelog = "https://github.com/grassmunk/Chicago95/releases/tag/v${finalAttrs.version}";
+    license = with lib.licenses; [
+      gpl3Plus
+      mit
+    ];
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ GabrielMaguire ];
+  };
+})

From 10f01ded353d5a76c6acbecaa0ac5e5063f60c13 Mon Sep 17 00:00:00 2001
From: Luigi Sartor Piucco <luigipiucco@gmail.com>
Date: Fri, 16 Oct 2020 19:41:03 -0300
Subject: [PATCH 2884/6226] zsh plugins: use omz-compatible paths

The `programs.zsh.ohMyZsh.customPkgs` option expects that arguments
passed to it will have a zsh plugin/theme/completion in a path like
`$out/share/zsh/{plugins,themes,completions}`, and copies whatever is
inside those to `$ZSH_CUSTOM`.

However, some packages actually unpacked to `$out/share`, without the
proper folder structure, so they never got copied to `$ZSH_CUSTOM` and
caused "not found" errors on zsh startup.

This commit fixes that, and maintains compatibility with other packages
that might still expect a flattened structure. This is done though a
symlink.
---
 pkgs/by-name/zs/zsh-autosuggestions/package.nix    |  6 +++++-
 pkgs/by-name/zs/zsh-bd/package.nix                 | 14 ++++++++++----
 .../zs/zsh-fast-syntax-highlighting/package.nix    |  2 +-
 .../zs/zsh-history-substring-search/package.nix    |  6 +++++-
 pkgs/by-name/zs/zsh-nix-shell/package.nix          |  5 +++--
 pkgs/by-name/zs/zsh-powerlevel10k/package.nix      | 11 ++++++-----
 pkgs/by-name/zs/zsh-powerlevel9k/package.nix       |  5 +++--
 7 files changed, 33 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/zs/zsh-autosuggestions/package.nix b/pkgs/by-name/zs/zsh-autosuggestions/package.nix
index 9afe6b870916..1710b482d7b8 100644
--- a/pkgs/by-name/zs/zsh-autosuggestions/package.nix
+++ b/pkgs/by-name/zs/zsh-autosuggestions/package.nix
@@ -20,8 +20,12 @@ stdenv.mkDerivation rec {
   strictDeps = true;
 
   installPhase = ''
+    install -D zsh-autosuggestions.plugin.zsh \
+      $out/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh
     install -D zsh-autosuggestions.zsh \
-      $out/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+      $out/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
+    ln -s $out/share/zsh/plugins/zsh-autosuggestions \
+      $out/share/zsh-autosuggestions
   '';
 
   meta = with lib; {
diff --git a/pkgs/by-name/zs/zsh-bd/package.nix b/pkgs/by-name/zs/zsh-bd/package.nix
index 843ffc135ca5..24d1d8c390c0 100644
--- a/pkgs/by-name/zs/zsh-bd/package.nix
+++ b/pkgs/by-name/zs/zsh-bd/package.nix
@@ -19,10 +19,16 @@ stdenv.mkDerivation {
   dontBuild = true;
 
   installPhase = ''
-    mkdir -p $out/share/zsh-bd
-    cp {.,$out/share/zsh-bd}/bd.zsh
-    cd $out/share/zsh-bd
-    ln -s bd{,.plugin}.zsh
+    runHook preInstall
+
+    install -D bd.zsh \
+      $out/share/plugins/zsh-bd/bd.zsh
+    ln -s $out/share/plugins/zsh-bd/bd.zsh \
+      $out/share/plugins/zsh-bd/bd.plugin.zsh
+    ln -s $out/share/plugins/zsh-bd \
+      $out/share/zsh-bd
+
+    runHook postInstall
   '';
 
   meta = {
diff --git a/pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix b/pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix
index d3b6129e4592..d7cbdab2ef1c 100644
--- a/pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix
+++ b/pkgs/by-name/zs/zsh-fast-syntax-highlighting/package.nix
@@ -20,7 +20,7 @@ stdenvNoCC.mkDerivation rec {
   dontBuild = true;
 
   installPhase = ''
-    plugindir="$out/share/zsh/site-functions"
+    plugindir="$out/share/zsh/plugins/fast-syntax-highlighting"
 
     mkdir -p "$plugindir"
     cp -r -- {,_,-,.}fast-* *chroma themes "$plugindir"/
diff --git a/pkgs/by-name/zs/zsh-history-substring-search/package.nix b/pkgs/by-name/zs/zsh-history-substring-search/package.nix
index e291025f6ee1..61af2fec16ac 100644
--- a/pkgs/by-name/zs/zsh-history-substring-search/package.nix
+++ b/pkgs/by-name/zs/zsh-history-substring-search/package.nix
@@ -17,8 +17,12 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
   installPhase = ''
+    install -D zsh-history-substring-search.plugin.zsh \
+      "$out/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.plugin.zsh"
     install -D zsh-history-substring-search.zsh \
-      "$out/share/zsh-history-substring-search/zsh-history-substring-search.zsh"
+      "$out/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh"
+    ln -s $out/share/zsh/plugins/zsh-history-substring-search \
+      $out/share/zsh-history-substring-search
   '';
 
   meta = with lib; {
diff --git a/pkgs/by-name/zs/zsh-nix-shell/package.nix b/pkgs/by-name/zs/zsh-nix-shell/package.nix
index 75bf5db1c4e5..48d4c6497796 100644
--- a/pkgs/by-name/zs/zsh-nix-shell/package.nix
+++ b/pkgs/by-name/zs/zsh-nix-shell/package.nix
@@ -22,8 +22,9 @@ stdenv.mkDerivation rec {
   strictDeps = true;
   buildInputs = [ bash ];
   installPhase = ''
-    install -D nix-shell.plugin.zsh --target-directory=$out/share/zsh-nix-shell
-    install -D scripts/* --target-directory=$out/share/zsh-nix-shell/scripts
+    install -D nix-shell.plugin.zsh --target-directory=$out/share/zsh/plugins/zsh-nix-shell
+    install -D scripts/* --target-directory=$out/share/zsh/plugins/zsh-nix-shell/scripts
+    ln -s $out/share/zsh/plugins/zsh-nix-shell $out/share/zsh-nix-shell
   '';
 
   meta = with lib; {
diff --git a/pkgs/by-name/zs/zsh-powerlevel10k/package.nix b/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
index 2435105d33d0..cbc33168774e 100644
--- a/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
+++ b/pkgs/by-name/zs/zsh-powerlevel10k/package.nix
@@ -32,11 +32,12 @@ stdenv.mkDerivation (finalAttrs: {
   installPhase = ''
     runHook preInstall
 
-    install -D powerlevel10k.zsh-theme --target-directory=$out/share/zsh-powerlevel10k
-    install -D powerlevel9k.zsh-theme --target-directory=$out/share/zsh-powerlevel10k
-    install -D config/* --target-directory=$out/share/zsh-powerlevel10k/config
-    install -D internal/* --target-directory=$out/share/zsh-powerlevel10k/internal
-    cp -R gitstatus $out/share/zsh-powerlevel10k/gitstatus
+    install -D powerlevel10k.zsh-theme --target-directory=$out/share/zsh/themes/powerlevel10k
+    install -D powerlevel9k.zsh-theme --target-directory=$out/share/zsh/themes/powerlevel10k
+    install -D config/* --target-directory=$out/share/zsh/themes/powerlevel10k/config
+    install -D internal/* --target-directory=$out/share/zsh/themes/powerlevel10k/internal
+    cp -R gitstatus $out/share/zsh/themes/powerlevel10k/gitstatus
+    ln -s $out/share/zsh/themes/powerlevel10k $out/share/zsh-powerlevel10k
 
     runHook postInstall
   '';
diff --git a/pkgs/by-name/zs/zsh-powerlevel9k/package.nix b/pkgs/by-name/zs/zsh-powerlevel9k/package.nix
index a9ec9e8d1a00..e66aa6e9995d 100644
--- a/pkgs/by-name/zs/zsh-powerlevel9k/package.nix
+++ b/pkgs/by-name/zs/zsh-powerlevel9k/package.nix
@@ -16,8 +16,9 @@ stdenv.mkDerivation {
 
   strictDeps = true;
   installPhase = ''
-    install -D powerlevel9k.zsh-theme --target-directory=$out/share/zsh-powerlevel9k
-    install -D functions/* --target-directory=$out/share/zsh-powerlevel9k/functions
+    install -D powerlevel9k.zsh-theme --target-directory=$out/share/zsh/themes/powerlevel9k
+    install -D functions/* --target-directory=$out/share/zsh/themes/powerlevel9k/functions
+    ln -s $out/share/zsh/themes/powerlevel9k $out/share/zsh-powerlevel9k
   '';
 
   meta = {

From e0187e35bb161828942b750c08f819b13b2eceee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 11:30:48 +0000
Subject: [PATCH 2885/6226] terraform-providers.yandex-cloud_yandex: 0.165.0 ->
 0.168.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 a9c2baab64d6..806d34a1e1e5 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1489,12 +1489,12 @@
     "vendorHash": "sha256-Y6zsbhLNehO3i/BRjKggVhcM15Qesbd6HbARFH/arM8="
   },
   "yandex-cloud_yandex": {
-    "hash": "sha256-6g4/ZuZ63LcRWcZ/WCdflqSEBk+Qkx2KcPnMLyXaauI=",
+    "hash": "sha256-jzACS+vNAiUp7GJt3jO8lTbQZpSj5vUhB1aD0iRi6Gk=",
     "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
     "owner": "yandex-cloud",
     "repo": "terraform-provider-yandex",
-    "rev": "v0.165.0",
+    "rev": "v0.168.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-2UCLAK9MtDD0RF34MPdaD4E7n3cDjbn1emU2Vu7c2zs="
+    "vendorHash": "sha256-NCUk8tBJnIKziowss/nm6pEgI2Yn/q6hnfvoMTTP8nQ="
   }
 }

From 91d563cc2cfda276d81bec3df863962893afc694 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 11:31:47 +0000
Subject: [PATCH 2886/6226] terraform-providers.ns1-terraform_ns1: 2.7.1 ->
 2.7.2

---
 .../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 a9c2baab64d6..ad1b9a7c445c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -958,13 +958,13 @@
     "vendorHash": "sha256-45psSf69IetY0o8LjBDEv2GnOxaOzaQcPCnV2YHPXGs="
   },
   "ns1-terraform_ns1": {
-    "hash": "sha256-JJ+Zcf7r8bB1a8l+DtHhjT4Ce2VqRIkD1fS+EWI6QtI=",
+    "hash": "sha256-S0ji/gZsbMTgug7DwPODAcPx3IfRaw1JHYPJ6V+tqeM=",
     "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1",
     "owner": "ns1-terraform",
     "repo": "terraform-provider-ns1",
-    "rev": "v2.7.1",
+    "rev": "v2.7.2",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-HC2MCVF3gS4nXKplC1pGrdjbhjRzr03ajqZ7pQIgSOc="
+    "vendorHash": "sha256-TBMJn9UIRub0N2yI+eGgPMvxSsPQo+xRSMB7qDO8lyw="
   },
   "numtide_linuxbox": {
     "hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=",

From 62f9db3750b983261ed9111273c7af8f01feba24 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 11:32:01 +0000
Subject: [PATCH 2887/6226] terraform-providers.tencentcloudstack_tencentcloud:
 1.82.30 -> 1.82.32

---
 .../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 a9c2baab64d6..7f61a9690fdf 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1309,11 +1309,11 @@
     "vendorHash": "sha256-9GjhP/Oh2HlVuMcuXFhS7MUmF3eS4qlUsW5XhugaK14="
   },
   "tencentcloudstack_tencentcloud": {
-    "hash": "sha256-Feuf+efTnYMK1398u0HvEkDNxNWFM/mZo4N6hZ/Fo/Y=",
+    "hash": "sha256-e9Mr5QK0MFtk2IRakLCy2smkwKBau5sAH8BE/IIfp3A=",
     "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
     "owner": "tencentcloudstack",
     "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.82.30",
+    "rev": "v1.82.32",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 3e385089ba22e23456bc6f334f52f7da94ab67b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 11:36:13 +0000
Subject: [PATCH 2888/6226] terraform-providers.pagerduty_pagerduty: 3.30.3 ->
 3.30.4

---
 .../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 a9c2baab64d6..67f64b2a18be 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1075,11 +1075,11 @@
     "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw="
   },
   "pagerduty_pagerduty": {
-    "hash": "sha256-vVhZOPKtxKye4RkEYo9VS0BZmIUdEjLKtJHh108PmP0=",
+    "hash": "sha256-ydLlwg7gnyp0tbDWUzYgigqycgTnfoJRswH61kD0P4k=",
     "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
     "owner": "PagerDuty",
     "repo": "terraform-provider-pagerduty",
-    "rev": "v3.30.3",
+    "rev": "v3.30.4",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 5172d806152af0779df9e6be7b01f37724f1697c Mon Sep 17 00:00:00 2001
From: Lukas Wurzinger <lukas@wrz.one>
Date: Sun, 26 Oct 2025 12:39:07 +0100
Subject: [PATCH 2889/6226] nixos/rsync: remove assertion

---
 nixos/modules/services/misc/rsync.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/nixos/modules/services/misc/rsync.nix b/nixos/modules/services/misc/rsync.nix
index 0a262a076621..f0768bf2771c 100644
--- a/nixos/modules/services/misc/rsync.nix
+++ b/nixos/modules/services/misc/rsync.nix
@@ -119,15 +119,6 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    assertions = [
-      {
-        assertion = lib.all (job: job.sources != [ ]) (lib.attrValues cfg.jobs);
-        message = ''
-          At least one source directory must be provided to rsync.
-        '';
-      }
-    ];
-
     systemd = lib.mkMerge (
       lib.mapAttrsToList (
         jobName: job:

From 9be1d6b9063f3821365c80cd20e9037d4c1ed230 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Sat, 25 Oct 2025 19:16:15 +0200
Subject: [PATCH 2890/6226] m1n1: add option to build with chainloading support

Co-authored-by: Jasi <normalcea@posteo.net>
---
 pkgs/by-name/m1/m1n1/package.nix | 37 +++++++++++++++++++++++++++++---
 1 file changed, 34 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/m1/m1n1/package.nix b/pkgs/by-name/m1/m1n1/package.nix
index 960f27cef605..052c7e694266 100644
--- a/pkgs/by-name/m1/m1n1/package.nix
+++ b/pkgs/by-name/m1/m1n1/package.nix
@@ -7,8 +7,30 @@
   python3Packages,
   nix-update-script,
   nixos-icons,
+  buildPackages,
   customLogo ? "${nixos-icons}/share/icons/hicolor/256x256/apps/nix-snowflake.png",
+  withChainloading ? false,
 }:
+
+let
+  stdenvOpts = {
+    targetPlatform.system = "aarch64-none-elf";
+    targetPlatform.rust.rustcTarget = "${stdenv.hostPlatform.parsed.cpu.name}-unknown-none-softfloat";
+    targetPlatform.rust.rustcTargetSpec = "${stdenv.hostPlatform.parsed.cpu.name}-unknown-none-softfloat";
+  };
+  rust = buildPackages.rust.override {
+    stdenv = lib.recursiveUpdate buildPackages.stdenv stdenvOpts;
+  };
+  rustPackages = rust.packages.stable.overrideScope (
+    f: p: {
+      rustc-unwrapped = p.rustc-unwrapped.override {
+        stdenv = lib.recursiveUpdate p.rustc-unwrapped.stdenv stdenvOpts;
+      };
+    }
+  );
+  rustPlatform = buildPackages.makeRustPlatform rustPackages;
+
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "m1n1";
   version = "1.5.2";
@@ -17,9 +39,12 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "AsahiLinux";
     repo = "m1n1";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/TQpR/3OUM4OIrfv6cBgZigyLR0VKw6Rd1v9465wy3o=";
+    hash = "sha256-rxop5r+EVXnp1OVkGT6MUwcl6yNTJxJSJuruZiaou7g=";
+    fetchSubmodules = true;
   };
 
+  cargoVendorDir = ".";
+
   postPatch = lib.optionalString (customLogo != null) ''
     magick ${customLogo} -resize 128x128 data/custom_128.png
     magick ${customLogo} -resize 256x256 data/custom_256.png
@@ -27,6 +52,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     imagemagick
+  ]
+  ++ lib.optionals withChainloading [
+    rustPackages.rustc
+    rustPackages.cargo
+    rustPlatform.cargoSetupHook
   ];
 
   postConfigure = ''
@@ -40,8 +70,9 @@ stdenv.mkDerivation (finalAttrs: {
   makeFlags = [
     "ARCH=${stdenv.cc.targetPrefix}"
     "RELEASE=1"
-    (lib.optionalString (customLogo != null) "LOGO=custom")
-  ];
+  ]
+  ++ lib.optional (customLogo != null) "LOGO=custom"
+  ++ lib.optional withChainloading "CHAINLOADING=1";
 
   enableParallelBuilding = true;
 

From d71a7793bafa5d6e7be61fcd3020f47e25c0a276 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 11:51:08 +0000
Subject: [PATCH 2891/6226] terraform-providers.rootlyhq_rootly: 4.3.2 -> 4.3.3

---
 .../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 a9c2baab64d6..321af2908384 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1129,11 +1129,11 @@
     "vendorHash": "sha256-M2lJKmIR66lQKFkInjizn68ax2Gq4sim5Y3vZKyDhZ8="
   },
   "rootlyhq_rootly": {
-    "hash": "sha256-HlUjEeyomuLqlKFq5U+dpgyBOxrxHALqywVbJM9Fm/s=",
+    "hash": "sha256-4YjmP7DMaqsDADi0+B39Wn0CA2M3MEhV3VKA+M/gHMg=",
     "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
     "owner": "rootlyhq",
     "repo": "terraform-provider-rootly",
-    "rev": "v4.3.2",
+    "rev": "v4.3.3",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-auyQLDDQ+tfMQCqICDR5tfvaYrO89Eani7lAsfoPwwU="
   },

From ab5d4a1c7c6135d3bb39cfc7bc2313b4c71c2b7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 11:51:47 +0000
Subject: [PATCH 2892/6226] terraform-providers.terraform-lxd_lxd: 2.5.0 ->
 2.6.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 a9c2baab64d6..f8c150cd03f9 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1336,13 +1336,13 @@
     "vendorHash": "sha256-SF11E60OQiRdf+Pf6XyJg60yGRnGOcSzhrYccrWaeYE="
   },
   "terraform-lxd_lxd": {
-    "hash": "sha256-ToK0Zua7e4CPm+8ZLIVw+dpt4bbahqWvvCKhjrAeW7s=",
+    "hash": "sha256-bbu7GRwIWcAFB/ZcB47IFlaloUt3D05l6QKTQMSljFU=",
     "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd",
     "owner": "terraform-lxd",
     "repo": "terraform-provider-lxd",
-    "rev": "v2.5.0",
+    "rev": "v2.6.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-zGHbDQhr1UjF6jcK4NHw90eTVrC+R76G8Fg7vJht20c="
+    "vendorHash": "sha256-yUQaUkqc8Q8vLtfBWsgzraxIiRWAEKZVOAycIFc5r5c="
   },
   "terraform-provider-openstack_openstack": {
     "hash": "sha256-vACjj5wo2zqNls0VgKeylEW5rrsNv1jz5iKoEywBAEc=",

From a1323219b159aa865308b16c588277b12fda6371 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 11:55:49 +0000
Subject: [PATCH 2893/6226] terraform-providers.spacelift-io_spacelift: 1.35.0
 -> 1.35.1

---
 .../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 a9c2baab64d6..e2a7bd376d8f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1228,13 +1228,13 @@
     "vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8="
   },
   "spacelift-io_spacelift": {
-    "hash": "sha256-yOsvmx4N550Sb5Qri3aAT6f9w46vec6/sx4uP2oOc6k=",
+    "hash": "sha256-lmg7PUwcX1NwuyBEGcZZJbRhpUT9eVUQAf740gk9aAU=",
     "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift",
     "owner": "spacelift-io",
     "repo": "terraform-provider-spacelift",
-    "rev": "v1.35.0",
+    "rev": "v1.35.1",
     "spdx": "MIT",
-    "vendorHash": "sha256-DLiS2fqr/gNdZGkhvqjdgpICY0QTlE/Ejl3m29Vanm4="
+    "vendorHash": "sha256-cX5K221Jnq701Nb+2bC1LmXVL7YvkZ8dkc2wYjDNOSw="
   },
   "splunk-terraform_signalfx": {
     "hash": "sha256-ia+1xcAQp0UIkkn9NgOkne8g+FmcnCCo5NxXjw/Q6AI=",

From 81cced04726132189d7b5d2ba549aad978cdcf83 Mon Sep 17 00:00:00 2001
From: Yongun Seong <nevivurn@nevi.dev>
Date: Sun, 26 Oct 2025 20:44:31 +0900
Subject: [PATCH 2894/6226] perlPackages.XMLSAX: fix building on non-default
 perl

---
 pkgs/top-level/perl-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4c712e9d854e..24fedadff18c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -38852,7 +38852,7 @@ with self;
     ];
     postPatch = ''
       substituteInPlace Makefile.PL \
-        --replace-fail "\$(PERL)" "${lib.getExe buildPackages.perl}"
+        --replace-fail "\$(PERL)" "${lib.getExe perl.perlOnBuild}"
     '';
     meta = {
       description = "Simple API for XML";

From 95ed3219e30cf7a8e83e470e78e14cd3d18f3b4d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 12:01:01 +0000
Subject: [PATCH 2895/6226] terraform-providers.sysdiglabs_sysdig: 2.1.0 ->
 3.0.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 a9c2baab64d6..a838fbac2424 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1273,11 +1273,11 @@
     "vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo="
   },
   "sysdiglabs_sysdig": {
-    "hash": "sha256-nLZgUNWv2e3yTl7/ntSP//BNAaidJxzYA5+v2pJCYDM=",
+    "hash": "sha256-b30SVfem2G3lBX9J5KGyxow0KK7kksOZLZ9135PyYPY=",
     "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
     "owner": "sysdiglabs",
     "repo": "terraform-provider-sysdig",
-    "rev": "v2.1.0",
+    "rev": "v3.0.1",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50="
   },

From b82a02668c0a1467511eca4e55ea675bdf831fea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 12:01:03 +0000
Subject: [PATCH 2896/6226] terraform-providers.splunk-terraform_signalfx:
 9.22.1 -> 9.22.2

---
 .../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 a9c2baab64d6..7744be962e81 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1237,11 +1237,11 @@
     "vendorHash": "sha256-DLiS2fqr/gNdZGkhvqjdgpICY0QTlE/Ejl3m29Vanm4="
   },
   "splunk-terraform_signalfx": {
-    "hash": "sha256-ia+1xcAQp0UIkkn9NgOkne8g+FmcnCCo5NxXjw/Q6AI=",
+    "hash": "sha256-kErd5DLViYA9yHyBAHxntPRJET9QmpCMWcpbFx/Qwhk=",
     "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
     "owner": "splunk-terraform",
     "repo": "terraform-provider-signalfx",
-    "rev": "v9.22.1",
+    "rev": "v9.22.2",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-epwHFW1lGk/HUtv5bS0Dyi59POjICsoJln2xgmH5320="
   },

From 1b1b7f51ae0c0143e2a023554da80c188c287734 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 12:02:04 +0000
Subject: [PATCH 2897/6226] terraform-providers.hashicorp_azurerm: 4.49.0 ->
 4.50.0

---
 .../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 a9c2baab64d6..fc554eb51f26 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -516,11 +516,11 @@
     "vendorHash": null
   },
   "hashicorp_azurerm": {
-    "hash": "sha256-y1bQcrFb6BPdE/xVz+UKH0pwMIQ/j32LNk4QAKISYCQ=",
+    "hash": "sha256-sWSz/ixfrJOf5hS5PV70jXfsAD+nhL3PS8wLLGnndQI=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
     "owner": "hashicorp",
     "repo": "terraform-provider-azurerm",
-    "rev": "v4.49.0",
+    "rev": "v4.50.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From c7fb07af4080580f17375c10f5048da5acc2debb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 12:06:57 +0000
Subject: [PATCH 2898/6226] terraform-providers.huaweicloud_huaweicloud: 1.79.1
 -> 1.79.2

---
 .../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 a9c2baab64d6..fb52820cab34 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -705,11 +705,11 @@
     "vendorHash": "sha256-jwDezL9gI6A9pCdD1CUgEOJT8dqVuPX/sFjTO4Jiqs4="
   },
   "huaweicloud_huaweicloud": {
-    "hash": "sha256-8hAfZZuRzQ/Q2yEPBclpRGbuBfT1GvOyg5Y9xS8x9Lw=",
+    "hash": "sha256-X/pEv7osVytLe16B/ERbp8izuPLtMb/TeMiQVI0jZWc=",
     "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
     "owner": "huaweicloud",
     "repo": "terraform-provider-huaweicloud",
-    "rev": "v1.79.1",
+    "rev": "v1.79.2",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 55762a9efcf769ee48e7b99bc32e48a394a73ad9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 12:10:59 +0000
Subject: [PATCH 2899/6226] terraform-providers.ibm-cloud_ibm: 1.84.1 -> 1.84.3

---
 .../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 a9c2baab64d6..9fe0ebd482f2 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -714,11 +714,11 @@
     "vendorHash": null
   },
   "ibm-cloud_ibm": {
-    "hash": "sha256-JrBH2tmzJJSO/AekVXg0IdsUa41Lt/LpfRwSrDkZcIY=",
+    "hash": "sha256-QnXzIWs6Ts6qAz9qiTT+9Zd7gKx3tQGswgDH2D7z7gw=",
     "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
     "owner": "IBM-Cloud",
     "repo": "terraform-provider-ibm",
-    "rev": "v1.84.1",
+    "rev": "v1.84.3",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-AfdcXD39h5y+AJF7pQ76qxH7FgOp/ya5AWFo/pAUoxc="
   },

From 1cfb98a1745234c89cf6c099d51a1d22e499dfaa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 12:15:32 +0000
Subject: [PATCH 2900/6226] terraform-providers.scaleway_scaleway: 2.60.4 ->
 2.60.5

---
 .../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 a9c2baab64d6..b2b43ca0c7b6 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1174,13 +1174,13 @@
     "vendorHash": "sha256-OqbnkuEy9w6F1DxmlYhRNYhBaYhWV0FtMK4wdwSybh8="
   },
   "scaleway_scaleway": {
-    "hash": "sha256-FT9V0qAs6NSULqOMsW9uolc1WgueUnU4vfL4rntMA1A=",
+    "hash": "sha256-ArjX1/OCR9rKGAGg4o5Rd98n8n8l7+Toz5XlH5A/LSE=",
     "homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
     "owner": "scaleway",
     "repo": "terraform-provider-scaleway",
-    "rev": "v2.60.4",
+    "rev": "v2.60.5",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-OcKCtH4ciGrKwidTQC+yTWMyMfShJMsTnsKOyBxwLDg="
+    "vendorHash": "sha256-PWUXuCrZz78ggiXo4DVb/C75cB8gzbQD9H0vdJZCUII="
   },
   "scottwinkler_shell": {
     "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",

From 75b86995ff4448d6a46733f2e2cd0e5dbc6e704f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 12:17:05 +0000
Subject: [PATCH 2901/6226] terraform-providers.linode_linode: 3.4.0 -> 3.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 a9c2baab64d6..537b6945bd48 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -832,13 +832,13 @@
     "vendorHash": "sha256-b9+0YLuv9AVszGDQ2v+VbYameN16PCdE3jUhL9efK6M="
   },
   "linode_linode": {
-    "hash": "sha256-ofgX6ih/UHd1Lm36KgS7BG8QY7ENhywHY2IhQ/ebfqM=",
+    "hash": "sha256-DMvmTryqgZyhuaDL3cslwMhMnj1x8iNsE5yyhehhANo=",
     "homepage": "https://registry.terraform.io/providers/linode/linode",
     "owner": "linode",
     "repo": "terraform-provider-linode",
-    "rev": "v3.4.0",
+    "rev": "v3.5.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-iZGbGd16fHtYKXh25O7LLcrjwm4Ceeak5dTN9t5rZGk="
+    "vendorHash": "sha256-8LbFq29JvQX3Trn81fr3YMjFwW+OTWAyK6OVAkh0I3A="
   },
   "loafoe_htpasswd": {
     "hash": "sha256-ALTyTTVyS2HHenmk8HVwtQenCmJX05kyXifJTzzmnHE=",

From ef25b2796a951b6c28e1b3edc2c3ac73b943d9b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 12:20:44 +0000
Subject: [PATCH 2902/6226] terraform-providers.mongodb_mongodbatlas: 2.0.1 ->
 2.1.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 a9c2baab64d6..d971c099f804 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -913,13 +913,13 @@
     "vendorHash": "sha256-5cqj1O57snU+NoVqmWc/KIGnowQNMww+rJxYfIPvHWU="
   },
   "mongodb_mongodbatlas": {
-    "hash": "sha256-evMjL6I9q80olTkuigJLbAHTDU4nYXNaMVf8cq6yZsM=",
+    "hash": "sha256-a5oTDhV1e0wX7HR1xyZM1KM9D4/8EghhKFF0PkvPjqM=",
     "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas",
     "owner": "mongodb",
     "repo": "terraform-provider-mongodbatlas",
-    "rev": "v2.0.1",
+    "rev": "v2.1.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-BWItAEI+ST5wN/CyTHljFJvutJiDHYjV4HEeLtmhC2o="
+    "vendorHash": "sha256-MejX7qApT4Aq/LzUExpi92yCb4Id/yfY6z/rduOs+so="
   },
   "namecheap_namecheap": {
     "hash": "sha256-fHH9sHI1mqQ9q9nX9DHJ0qfEfmDB4/2uzyVvUuIAF18=",

From f1a6d55717db8b78026b58c2bfc0a6822748f83c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 12:23:08 +0000
Subject: [PATCH 2903/6226] terraform-providers.hashicorp_awscc: 1.60.0 ->
 1.61.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 a9c2baab64d6..6f60e227ddee 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -498,13 +498,13 @@
     "vendorHash": "sha256-93DyqAPi6hirke0KyR6gggC7cgAZOOByUIIA6C+6LZU="
   },
   "hashicorp_awscc": {
-    "hash": "sha256-Zv333wYeP8mpCBWxRbGQoxKI0p+zooUOnUB5Pp0CyRg=",
+    "hash": "sha256-SrJQG1F9V/HThL6TDduT/qEA2x3tzII56+JMVDFpqEk=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
     "owner": "hashicorp",
     "repo": "terraform-provider-awscc",
-    "rev": "v1.60.0",
+    "rev": "v1.61.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-LCmk72ySR7Ncb+sqKYXP2PLbO3dirXwBhdEdis+49VA="
+    "vendorHash": "sha256-WKshejs/cOtCGpMLxrnzRV+eKDPkPWIjK2nvwDodoDk="
   },
   "hashicorp_azuread": {
     "hash": "sha256-9vGXzFLRaQPXECcFtZMnbhHQvEm0FeGwYm4K9utpZf4=",

From 46e6c8845fb16b658dce4109c77d7933d14353d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 12:23:30 +0000
Subject: [PATCH 2904/6226] terraform-providers.exoscale_exoscale: 0.65.1 ->
 0.66.0

---
 .../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 a9c2baab64d6..9dd4069658b2 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -372,11 +372,11 @@
     "vendorHash": "sha256-BzlSPZ11K9wZXd66jh3CAL+5qco6m0Hb/QiVtAi1Ub8="
   },
   "exoscale_exoscale": {
-    "hash": "sha256-tTFGYzDwx7VXzS287eNUUjsAuwY/Rh2zuOsGwLT6BRU=",
+    "hash": "sha256-w7OI4cieF5RtClKUrlnOTE0HSmI1lZ8X+hqMJpzQENo=",
     "homepage": "https://registry.terraform.io/providers/exoscale/exoscale",
     "owner": "exoscale",
     "repo": "terraform-provider-exoscale",
-    "rev": "v0.65.1",
+    "rev": "v0.66.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From f23e2596f7c18cc2767d8a31bc464d68c66b5ff4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 12:25:11 +0000
Subject: [PATCH 2905/6226] terraform-providers.grafana_grafana: 4.11.1 ->
 4.12.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 a9c2baab64d6..a9343e4f5131 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -462,13 +462,13 @@
     "vendorHash": "sha256-UmlhKa2SVgrhRc1EOO9sEkherIS77CP+hkAL3Y79h3U="
   },
   "grafana_grafana": {
-    "hash": "sha256-wpzR+IhA0L3o8ng1PcB9wyIpaOg6wC5L7kyaXepHvO4=",
+    "hash": "sha256-RHADl2x2Tr22P53PJ0gXrAmxe+1mm6A3k0B8+92iDYg=",
     "homepage": "https://registry.terraform.io/providers/grafana/grafana",
     "owner": "grafana",
     "repo": "terraform-provider-grafana",
-    "rev": "v4.11.1",
+    "rev": "v4.12.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-FTzmvIgv0pPczM/QLyUvNQ0eDVGvlx7nFQneiw/9sAo="
+    "vendorHash": "sha256-xCwnCYP3QjIGkO844rczU6cHd6Pk8SKzRfO3mJK3XVc="
   },
   "gridscale_gridscale": {
     "hash": "sha256-XdBGD94kMLcB3ycZABVT+skiPg7rYyR4ycfvnubj6JM=",

From 2b7277cf9e23234f85cf12ca3e79c09fabfc4e44 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 12:33:33 +0000
Subject: [PATCH 2906/6226] x42-plugins: 20250512 -> 20251025

---
 pkgs/by-name/x4/x42-plugins/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/x4/x42-plugins/package.nix b/pkgs/by-name/x4/x42-plugins/package.nix
index f235f1babda8..5f25bdc3a550 100644
--- a/pkgs/by-name/x4/x42-plugins/package.nix
+++ b/pkgs/by-name/x4/x42-plugins/package.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation rec {
   pname = "x42-plugins";
-  version = "20250512";
+  version = "20251025";
 
   src = fetchurl {
     url = "https://gareus.org/misc/x42-plugins/${pname}-${version}.tar.xz";
-    hash = "sha256-HBENTb1BGxBDIOWtswCe6t0mEzVNZf65NhLjsfE4KYk=";
+    hash = "sha256-ZY9KGtkLqjdUVo2BCOO/gnVo+19Ewx2gkj1zsWKxUS8=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 09e80b0b768fe937ace0e58b2c97caa47a697a30 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 26 Oct 2025 13:35:20 +0100
Subject: [PATCH 2907/6226] linux/build: re-expose `config` with its helper
 functions

In #448835 I renamed `config` to `configHelpers` to save a
`config_ = config;`, however `config` having the `is*` helpers is kinda
public API (as proven by NixOS modules failing to evaluate).

As a result, this commit adds the helpers back to `config` that is
exposed by the kernel derivation.

Apologies, I'm pretty sure I fixed that before locally and it just got
lost during a rebase :(
---
 pkgs/os-specific/linux/kernel/build.nix | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/build.nix b/pkgs/os-specific/linux/kernel/build.nix
index 0839eaa9fdd9..da50861fb459 100644
--- a/pkgs/os-specific/linux/kernel/build.nix
+++ b/pkgs/os-specific/linux/kernel/build.nix
@@ -90,6 +90,8 @@ lib.makeOverridable (
     # Provide defaults. Note that we support `null` so that callers don't need to use optionalAttrs,
     # which can lead to unnecessary strictness and infinite recursions.
     modDirVersion_ = if modDirVersion == null then lib.versions.pad 3 version else modDirVersion;
+
+    config_ = config;
   in
   let
     # Shadow the un-defaulted parameter; don't want null.
@@ -139,29 +141,29 @@ lib.makeOverridable (
     ];
     needsUbootTools = lib.elem stdenv.hostPlatform.linuxArch linuxPlatformsUsingUImage;
 
-    configHelpers =
+    config =
       let
         attrName = attr: "CONFIG_" + attr;
       in
       {
         isSet = attr: hasAttr (attrName attr) config;
 
-        getValue = attr: if configHelpers.isSet attr then getAttr (attrName attr) config else null;
+        getValue = attr: if config.isSet attr then getAttr (attrName attr) config else null;
 
-        isYes = attr: (configHelpers.getValue attr) == "y";
+        isYes = attr: (config.getValue attr) == "y";
 
-        isNo = attr: (configHelpers.getValue attr) == "n";
+        isNo = attr: (config.getValue attr) == "n";
 
-        isModule = attr: (configHelpers.getValue attr) == "m";
+        isModule = attr: (config.getValue attr) == "m";
 
-        isEnabled = attr: (configHelpers.isModule attr) || (configHelpers.isYes attr);
+        isEnabled = attr: (config.isModule attr) || (config.isYes attr);
 
-        isDisabled = attr: (!(configHelpers.isSet attr)) || (configHelpers.isNo attr);
+        isDisabled = attr: (!(config.isSet attr)) || (config.isNo attr);
       }
-      // config;
+      // config_;
 
-    isModular = configHelpers.isYes "MODULES";
-    withRust = configHelpers.isYes "RUST";
+    isModular = config.isYes "MODULES";
+    withRust = config.isYes "RUST";
 
     target = stdenv.hostPlatform.linux-kernel.target or "vmlinux";
 

From 06c79febc49f15771cda1ac6ba75657fb4078bc6 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 09:49:48 -0300
Subject: [PATCH 2908/6226] h3, h3_3: fix build with cmake4

---
 pkgs/development/misc/h3/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/misc/h3/default.nix b/pkgs/development/misc/h3/default.nix
index 83228cb58460..ea7dc1db013f 100644
--- a/pkgs/development/misc/h3/default.nix
+++ b/pkgs/development/misc/h3/default.nix
@@ -36,7 +36,8 @@ let
         (lib.cmakeBool "ENABLE_FORMAT" false)
         (lib.cmakeBool "ENABLE_LINTING" false)
         (lib.cmakeBool "BUILD_FILTERS" withFilters)
-      ];
+      ]
+      ++ (lib.optionals (lib.versionOlder version "4.0.0") [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ]);
 
       meta = {
         homepage = "https://h3geo.org/";

From b6e94ea295040c37f4c556060a51e12a0dd3178b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 12:50:57 +0000
Subject: [PATCH 2909/6226] 
 terraform-providers.opentelekomcloud_opentelekomcloud: 1.36.50 -> 1.36.51

---
 .../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 a9c2baab64d6..c88be1aa9800 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1030,13 +1030,13 @@
     "vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI="
   },
   "opentelekomcloud_opentelekomcloud": {
-    "hash": "sha256-PC8IKp4HirFgdz9azof88jBz+mGr0vqjwtbuIMNHp4U=",
+    "hash": "sha256-VrhloC601pG6jcBbrKc/ldhtWwzJzhkLdHj1/UPOUqk=",
     "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud",
     "owner": "opentelekomcloud",
     "repo": "terraform-provider-opentelekomcloud",
-    "rev": "v1.36.50",
+    "rev": "v1.36.51",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-SWWB8WX/cSaLPfr6XxsKnW5ufmuGrU3nx8neGvphvJg="
+    "vendorHash": "sha256-57F7YS7r+/O8qSWfNhrT/5XAaq7CfX7RchY/45WBauw="
   },
   "opsgenie_opsgenie": {
     "hash": "sha256-+msy9kPAryR0Ll5jKOd47DMjeMxEdSIfKZZKVHohQGY=",

From d55a60610578c4e8b60f8d2c573c69acd503813a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 12:51:26 +0000
Subject: [PATCH 2910/6226] terraform-providers.newrelic_newrelic: 3.72.3 ->
 3.73.0

---
 .../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 a9c2baab64d6..a76f14dd79bd 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -949,11 +949,11 @@
     "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0="
   },
   "newrelic_newrelic": {
-    "hash": "sha256-6hBzwp9FG/eL7SPWuEkMvZ/phHabmnJ+oTF/lUn02fQ=",
+    "hash": "sha256-/vHE+Eys773WyYMDe7xG3p0pgKvRc9U73s4jSDijNxY=",
     "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
     "owner": "newrelic",
     "repo": "terraform-provider-newrelic",
-    "rev": "v3.72.3",
+    "rev": "v3.73.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-45psSf69IetY0o8LjBDEv2GnOxaOzaQcPCnV2YHPXGs="
   },

From 9a908d45752c854c6b0e07b47d01c86f9c84fecb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 12:54:25 +0000
Subject: [PATCH 2911/6226] terraform-providers.opsgenie_opsgenie: 0.6.37 ->
 0.6.38

---
 .../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 a9c2baab64d6..d19b8d29eeab 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1039,11 +1039,11 @@
     "vendorHash": "sha256-SWWB8WX/cSaLPfr6XxsKnW5ufmuGrU3nx8neGvphvJg="
   },
   "opsgenie_opsgenie": {
-    "hash": "sha256-+msy9kPAryR0Ll5jKOd47DMjeMxEdSIfKZZKVHohQGY=",
+    "hash": "sha256-Mhpqi/9qgkRXZ/b2u2VFsJQBYwVgrJ5boqszvUKFu7A=",
     "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie",
     "owner": "opsgenie",
     "repo": "terraform-provider-opsgenie",
-    "rev": "v0.6.37",
+    "rev": "v0.6.38",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From b0ab7112ea84db2b7abd322c15cb695ad1093243 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 13:01:06 +0000
Subject: [PATCH 2912/6226] terraform-providers.oracle_oci: 7.22.0 -> 7.23.0

---
 .../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 a9c2baab64d6..4050790a202c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1048,11 +1048,11 @@
     "vendorHash": null
   },
   "oracle_oci": {
-    "hash": "sha256-LnR1bXTr+j7tKALZll/dwUI+o9TepPGS0mAHGxYK7g0=",
+    "hash": "sha256-KrsIw2GQNA3Nlhui4Ib8HwuBuQPCZaecKvws6A18mcI=",
     "homepage": "https://registry.terraform.io/providers/oracle/oci",
     "owner": "oracle",
     "repo": "terraform-provider-oci",
-    "rev": "v7.22.0",
+    "rev": "v7.23.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From b5aec7b41d4ed37842ee351289dbec03f6dab515 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 13:04:02 +0000
Subject: [PATCH 2913/6226] terraform-providers.equinix_equinix: 4.3.0 -> 4.4.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 a9c2baab64d6..5aaca3356098 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -363,13 +363,13 @@
     "vendorHash": "sha256-Q3H/6mpkWn1Gw0NRMtKtkBRGHjPJZGBFdGwfalyQ4Z0="
   },
   "equinix_equinix": {
-    "hash": "sha256-QE8ukiQHZqhSsZyFnInIpnGvsSlFuFMun7paK/Z3HTM=",
+    "hash": "sha256-QO0XcYXfRNRpyEMxS0c80e3lr0Zf4j+6feb8hu5NPq0=",
     "homepage": "https://registry.terraform.io/providers/equinix/equinix",
     "owner": "equinix",
     "repo": "terraform-provider-equinix",
-    "rev": "v4.3.0",
+    "rev": "v4.4.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-BzlSPZ11K9wZXd66jh3CAL+5qco6m0Hb/QiVtAi1Ub8="
+    "vendorHash": "sha256-LuOymPvWBQs29fghb7uDW6PSAibMmC9igdLMpuhf2vw="
   },
   "exoscale_exoscale": {
     "hash": "sha256-tTFGYzDwx7VXzS287eNUUjsAuwY/Rh2zuOsGwLT6BRU=",

From 816edb555224080250eb6ca7e380ca8593b96493 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sun, 26 Oct 2025 09:06:06 -0400
Subject: [PATCH 2914/6226] forgejo: 13.0.1 -> 13.0.2

Changelog: https://codeberg.org/forgejo/forgejo/releases/tag/v13.0.2
---
 pkgs/by-name/fo/forgejo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix
index fa6f913ef6b2..5e22cdf065b2 100644
--- a/pkgs/by-name/fo/forgejo/package.nix
+++ b/pkgs/by-name/fo/forgejo/package.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "13.0.1";
-  hash = "sha256-P8ZIBV0pVo3cn9Yroe67Bt+/7KEdz/gBGSypmUz5V2g=";
+  version = "13.0.2";
+  hash = "sha256-5am/WiRo+ma2ArhnKxQ6cpFl2q7R4g4UwtdnSY/+RIM=";
   npmDepsHash = "sha256-7WjcMsKPtKUWJfDrJc65ZXq2tjK8+8DnqwINj+0XyiQ=";
   vendorHash = "sha256-PHItbU27d9ouykUlhr9owylMpF+3wz2vc8c0UTR1RVU=";
   lts = false;

From f3c0eca258545540cc1dfad60464da69c2b75083 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 13:06:19 +0000
Subject: [PATCH 2915/6226] terraform-providers.baidubce_baiducloud: 1.22.11 ->
 1.22.12

---
 .../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 a9c2baab64d6..b577f59c5805 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -91,11 +91,11 @@
     "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM="
   },
   "baidubce_baiducloud": {
-    "hash": "sha256-zKkXfSIVVW0QxQB/fJNowy1mQPfXlv6HFcNaNlBSIvY=",
+    "hash": "sha256-2SXMBb/Ho7OOhqYzQHw2Seg3oi1B5aIa1Q606TVZQvY=",
     "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
     "owner": "baidubce",
     "repo": "terraform-provider-baiducloud",
-    "rev": "v1.22.11",
+    "rev": "v1.22.12",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 8905c2b03c9fbcf58cd9911969406547de85c153 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 13:07:04 +0000
Subject: [PATCH 2916/6226] terraform-providers.hashicorp_google: 7.7.0 ->
 7.8.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 a9c2baab64d6..417aa366ac21 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -561,13 +561,13 @@
     "vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU="
   },
   "hashicorp_google": {
-    "hash": "sha256-9PhfOOqtJWMy65aoQ1TuCpIBNYmIglHPxq2dfWvzVGM=",
+    "hash": "sha256-ozIqR6M7E6Y6Zvw7ymdVeW49v5a2jt9axacM/0TvXc8=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google",
     "owner": "hashicorp",
     "repo": "terraform-provider-google",
-    "rev": "v7.7.0",
+    "rev": "v7.8.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-vRvBFktCOlp8oIr3hYj5x5v6FrG6OrEbWq/mMUjLGAc="
+    "vendorHash": "sha256-kSFeWcuoym3FJP/E/diWuafEv1sffYinAzCjZ6z7B84="
   },
   "hashicorp_google-beta": {
     "hash": "sha256-S6Q1hxH67pCgB1f+bgW8tOyo5L9t8pcnhWmyMZPE/0A=",

From eb51b9a531e082b5c8bbe3f7abb85550692df9b6 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Sun, 26 Oct 2025 09:07:55 -0400
Subject: [PATCH 2917/6226] forgejo-lts: 11.0.6 -> 11.0.7

Changelog: https://codeberg.org/forgejo/forgejo/releases/tag/v11.0.7
---
 pkgs/by-name/fo/forgejo/generic.nix | 9 ---------
 pkgs/by-name/fo/forgejo/lts.nix     | 4 ++--
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix
index b0820560c1e1..1db5124e8fd5 100644
--- a/pkgs/by-name/fo/forgejo/generic.nix
+++ b/pkgs/by-name/fo/forgejo/generic.nix
@@ -12,7 +12,6 @@
   bash,
   brotli,
   buildGoModule,
-  fetchpatch,
   forgejo,
   git,
   gzip,
@@ -84,14 +83,6 @@ buildGoModule rec {
 
   patches = [
     ./static-root-path.patch
-  ]
-  ++ lib.optionals lts [
-    (fetchpatch {
-      # fix for go 1.25.2 stricter ipv6 parsing, remove for LTS > 11.0.6
-      name = "fix-test-ipv6-go125.patch";
-      url = "https://codeberg.org/forgejo/forgejo/commit/0d9a8e3fa2cf9228290ed1a9a5767e6ba204edd7.patch";
-      hash = "sha256-AM4/kgCXSU5Bj8aOObm6qyeL1SEpeFhmlT42lMJ2o08=";
-    })
   ];
 
   postPatch = ''
diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix
index 86d29a924da5..74fd06a8370b 100644
--- a/pkgs/by-name/fo/forgejo/lts.nix
+++ b/pkgs/by-name/fo/forgejo/lts.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "11.0.6";
-  hash = "sha256-7rX0B1db0HbZa/em3hX+yzAi4rqsDysJPx3dIInGxpY=";
+  version = "11.0.7";
+  hash = "sha256-svNysySAE50rgTXTyPiZDv0lQfYGgdgoc5+9GXxv3Bw=";
   npmDepsHash = "sha256-1lY08jBTx3DRhoaup02076EL9n85y57WCsS/cNcM4aw=";
   vendorHash = "sha256-Jh8u+iCBhYdKcLj4IzcKtJBnzvclvUeYbR/hjMN+cPs=";
   lts = true;

From 0c30180598ef43c3a57545dad9411fd87777e7fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 13:08:59 +0000
Subject: [PATCH 2918/6226] terraform-providers.sacloud_sakuracloud: 2.31.0 ->
 2.31.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 a9c2baab64d6..87507b611bad 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1147,11 +1147,11 @@
     "vendorHash": null
   },
   "sacloud_sakuracloud": {
-    "hash": "sha256-TiSsNgmkZMk71IKFTxoQLDHRNHUGsdbfo/6CEEEwDEs=",
+    "hash": "sha256-kiAl/qdLbXzBCwgms3Y7TD/Ez2Hq0ifZ1SLVIPa9Bmk=",
     "homepage": "https://registry.terraform.io/providers/sacloud/sakuracloud",
     "owner": "sacloud",
     "repo": "terraform-provider-sakuracloud",
-    "rev": "v2.31.0",
+    "rev": "v2.31.1",
     "spdx": "Apache-2.0",
     "vendorHash": "sha256-BREv9hd6Oa/S8NjpRoLcF8uUFykEyffQO0LCuA3WFmc="
   },

From 1ffbe7411a9015aae4e3012c4209241dd87ceb51 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 13:11:44 +0000
Subject: [PATCH 2919/6226] terraform-providers.lxc_incus: 0.5.1 -> 1.0.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 a9c2baab64d6..9a2db9b85da4 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -859,13 +859,13 @@
     "vendorHash": "sha256-vcuUt3WIo1TnLApch410JgtyCzliQRYMQQQ2Z9diDZ8="
   },
   "lxc_incus": {
-    "hash": "sha256-ecTodsExnc96AoyYKutPLNu5UQrVObcWQwFUcv9oCB4=",
+    "hash": "sha256-N+3OHJGK67iITA8DGDMZSYmCdkhPkXRlv4NzOLpu4y8=",
     "homepage": "https://registry.terraform.io/providers/lxc/incus",
     "owner": "lxc",
     "repo": "terraform-provider-incus",
-    "rev": "v0.5.1",
+    "rev": "v1.0.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-gyU+RiCtf5gl5RDuAalYHgXqvU2sioxnL6ZfOwn6vYE="
+    "vendorHash": "sha256-eTCRjnC86O2q6YZj6ltOfiBKbFCeFR1zsF3QiJ73SYA="
   },
   "marcofranssen_dexidp": {
     "hash": "sha256-un+jAmcK1MYljcAFyIHw0AFmvz4GltAsWxTOd/zXxyU=",

From 5a962612117891de8e3e7b346029439f0878b7c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 13:14:01 +0000
Subject: [PATCH 2920/6226] terraform-providers.hashicorp_consul: 2.22.0 ->
 2.22.1

---
 .../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 a9c2baab64d6..d3790f4dc58b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -534,13 +534,13 @@
     "vendorHash": "sha256-bD8BHhP4jxBRnFjmZE1MMkBn2/sMqNEaxTlQRMj2Crw="
   },
   "hashicorp_consul": {
-    "hash": "sha256-kLoJKnqbjsrzBqFNPpG59UOYlp2UKYsS7b6cu5xImp8=",
+    "hash": "sha256-SlXzhH9EQJAAcSAog6XzbeenzseXNEUfXdYtURpUcUw=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/consul",
     "owner": "hashicorp",
     "repo": "terraform-provider-consul",
-    "rev": "v2.22.0",
+    "rev": "v2.22.1",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-ODAqEy04jptTR2dggCm9Vs2xxVt02SVVgGAUa06+9YY="
+    "vendorHash": "sha256-HQXioE9mbc+0Qf6MGiXKXSfmbUUtkUafA01GEXbLQfE="
   },
   "hashicorp_dns": {
     "hash": "sha256-+M4i5tvGrjGRBwB9bFp6YYhbz3qGRcg9W6PhD59Rfbk=",

From 5874ae321174463312d8fcf43ae221cdb6ff1b05 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Sun, 7 Sep 2025 17:45:37 -0500
Subject: [PATCH 2921/6226] spark_4_0: init at 4.0.1

---
 .../networking/cluster/spark/default.nix      | 19 +++++++++++++++++--
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix
index 2609c4fd0a2b..606f79ad3706 100644
--- a/pkgs/applications/networking/cluster/spark/default.nix
+++ b/pkgs/applications/networking/cluster/spark/default.nix
@@ -8,6 +8,8 @@
   RSupport ? true,
   R,
   nixosTests,
+  # needeed in situations where hadoop's jdk version is too old
+  jdk21_headless,
 }:
 
 let
@@ -28,7 +30,15 @@ let
         R
         pysparkPython
         ;
-      inherit (finalAttrs.hadoop) jdk;
+      jdk =
+        if
+          (
+            (lib.versionAtLeast finalAttrs.version "4") && (lib.versionOlder finalAttrs.hadoop.jdk.version "21")
+          )
+        then
+          jdk21_headless
+        else
+          finalAttrs.hadoop.jdk;
       src = fetchzip {
         url =
           with finalAttrs;
@@ -96,12 +106,17 @@ in
   # we strictly adhere to the EOL timeline, despite 3.3.4 being released one day before (2023-12-08).
   # A better policy is to keep these versions around, and clean up EOL versions just before
   # a new NixOS release.
+  spark_4_0 = spark {
+    pname = "spark";
+    version = "4.0.1";
+    hash = "sha256-AW+EQ83b4orJO3+dUPPDlTRAH/D94U7KQBKvKjguChY=";
+  };
   spark_3_5 = spark {
     pname = "spark";
     version = "3.5.5";
     hash = "sha256-vzcWgIfHPhN3nyrxdk3f0p4fW3MpQ+FuEPnWPw0xNPg=";
   };
-  spark_3_4 = spark rec {
+  spark_3_4 = spark {
     pname = "spark";
     version = "3.4.4";
     hash = "sha256-GItHmthLhG7y0XSF3QINCyE7wYFb0+lPZmYLUuMa4Ww=";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d73fc31da43e..329bca9896bb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6359,11 +6359,13 @@ with pkgs;
   samplebrain = libsForQt5.callPackage ../applications/audio/samplebrain { };
 
   inherit (callPackages ../applications/networking/cluster/spark { })
+    spark_4_0
     spark_3_5
     spark_3_4
     ;
   spark3 = spark_3_5;
   spark = spark3;
+  spark4 = spark_4_0;
 
   inherit
     ({

From 07969eeb4d65629e448854a6f3e02675a23845e1 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Sun, 7 Sep 2025 17:45:59 -0500
Subject: [PATCH 2922/6226] spark: 3.5.5 -> 4.0.1

---
 pkgs/top-level/all-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 329bca9896bb..3bb9625bf467 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6364,8 +6364,8 @@ with pkgs;
     spark_3_4
     ;
   spark3 = spark_3_5;
-  spark = spark3;
   spark4 = spark_4_0;
+  spark = spark_4_0;
 
   inherit
     ({

From d05b014ad4b64296465f195af72ec7d5a39f6fa0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 13:21:08 +0000
Subject: [PATCH 2923/6226] terraform-providers.hashicorp_google-beta: 7.7.0 ->
 7.8.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 a9c2baab64d6..6778c5a77925 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -570,13 +570,13 @@
     "vendorHash": "sha256-vRvBFktCOlp8oIr3hYj5x5v6FrG6OrEbWq/mMUjLGAc="
   },
   "hashicorp_google-beta": {
-    "hash": "sha256-S6Q1hxH67pCgB1f+bgW8tOyo5L9t8pcnhWmyMZPE/0A=",
+    "hash": "sha256-ejjyVzNQY8w1kvZyvuIMGSDhu5jea1/6TFiIG5bvrSw=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
     "owner": "hashicorp",
     "repo": "terraform-provider-google-beta",
-    "rev": "v7.7.0",
+    "rev": "v7.8.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-xNiVciw6AWwgInSBIYjjqFjEOA6YFImebxIy/w0D/h4="
+    "vendorHash": "sha256-tc7PInjXPEAI/sYtrYZsQxQV3Gk04ov/4SBQ1fHqkIQ="
   },
   "hashicorp_helm": {
     "hash": "sha256-i4ceWiEXJYL1x9DmqAfcUidiW5+x/sRCxevDz4MnzHs=",

From c5da4e6fcb6886fe9a6ba6769041d5a55afacddc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 13:21:30 +0000
Subject: [PATCH 2924/6226] terraform-providers.spotinst_spotinst: 1.228.0 ->
 1.229.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 a9c2baab64d6..38c956ad8a5b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1246,13 +1246,13 @@
     "vendorHash": "sha256-epwHFW1lGk/HUtv5bS0Dyi59POjICsoJln2xgmH5320="
   },
   "spotinst_spotinst": {
-    "hash": "sha256-bbQ7WDizMnCF95E/iXOSSx0e5K2wMtUW39OxT/45Jn4=",
+    "hash": "sha256-h1GtNFwf5zVM3/0AJHpyF9GpMm1pbPbNkEconmrthpk=",
     "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
     "owner": "spotinst",
     "repo": "terraform-provider-spotinst",
-    "rev": "v1.228.0",
+    "rev": "v1.229.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-huHeWKzq/4cHAU4P7q9bOiJ2cAFqevZ80BsCyPiujxw="
+    "vendorHash": "sha256-45cgtu5LzP3ydkHl3RpB0tw0Lz101bL1TpTKl0pnyKc="
   },
   "statuscakedev_statuscake": {
     "hash": "sha256-zXBZZA+2uRN2FeGrayq0a4EBk7T+PvlBIwbuxwM7yBc=",

From b749616e891668a31b2d2fa0c7910e56d4371536 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 13:22:03 +0000
Subject: [PATCH 2925/6226] terraform-providers.f5networks_bigip: 1.24.0 ->
 1.24.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 a9c2baab64d6..fcc35839d455 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -381,11 +381,11 @@
     "vendorHash": null
   },
   "f5networks_bigip": {
-    "hash": "sha256-oJIIhIBQXx5u2OwYcyMo4uRdzWdWLz2PlO9r9ZSRIzo=",
+    "hash": "sha256-iUKdsdJ38GE5Q0rbLpnWthKBFBylfe59rfjmQGbCDY0=",
     "homepage": "https://registry.terraform.io/providers/F5Networks/bigip",
     "owner": "F5Networks",
     "repo": "terraform-provider-bigip",
-    "rev": "v1.24.0",
+    "rev": "v1.24.1",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 90b1f66e989fe628d1508c43031c4fca18b02f62 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 26 Oct 2025 22:22:20 +0900
Subject: [PATCH 2926/6226] dockerTools: fix throw on invalid compressor

---
 pkgs/build-support/docker/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 9cd3aa0a7c18..8aedf460eb0d 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -113,7 +113,7 @@ let
   compressorForImage =
     compressor: imageName:
     compressors.${compressor}
-      or (throw "in docker image ${imageName}: compressor must be one of: [${toString builtins.attrNames compressors}]");
+      or (throw "in docker image ${imageName}: compressor must be one of: [${toString (builtins.attrNames compressors)}]");
 
 in
 rec {

From 439dd6f145f908cee723d020041dc860fd1c0b56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 13:35:01 +0000
Subject: [PATCH 2927/6226] vscode-extensions.csharpier.csharpier-vscode: 2.0.8
 -> 2.1.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 54f9f27ef5f1..2557b9a5c787 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1092,8 +1092,8 @@ let
         mktplcRef = {
           name = "csharpier-vscode";
           publisher = "csharpier";
-          version = "2.0.8";
-          hash = "sha256-rMc5ywTxVu6Dtxkzai4XQk1W2slCuT2j93p1zc6qtOI=";
+          version = "2.1.0";
+          hash = "sha256-CEge0EZr9DTNBpPQ71tqsVsA8ljgamB1gMBh8CZTTZE=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/csharpier.csharpier-vscode/changelog";

From 08532c3ee6bf40104a57ee6ea782d62ffc4f2843 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 17 Oct 2025 15:16:39 -0300
Subject: [PATCH 2928/6226] pro-office-calculator: move to by-name

---
 .../pr/pro-office-calculator/package.nix}                       | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{games/pro-office-calculator/default.nix => by-name/pr/pro-office-calculator/package.nix} (100%)

diff --git a/pkgs/games/pro-office-calculator/default.nix b/pkgs/by-name/pr/pro-office-calculator/package.nix
similarity index 100%
rename from pkgs/games/pro-office-calculator/default.nix
rename to pkgs/by-name/pr/pro-office-calculator/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bfb14a45b91d..26f21d514c44 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13260,8 +13260,6 @@ with pkgs;
 
   fmodex = callPackage ../games/doom-ports/zandronum/fmod.nix { };
 
-  pro-office-calculator = libsForQt5.callPackage ../games/pro-office-calculator { };
-
   qgo = libsForQt5.callPackage ../games/qgo { };
 
   anki = callPackage ../games/anki {

From f082792652ce50109505138ceed42252a48d8220 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 26 Oct 2025 10:38:24 -0300
Subject: [PATCH 2929/6226] pro-office-calculator: modernize

---
 .../pr/pro-office-calculator/package.nix      | 30 ++++++++++---------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/pr/pro-office-calculator/package.nix b/pkgs/by-name/pr/pro-office-calculator/package.nix
index 88894e2fb99d..05e5f044009a 100644
--- a/pkgs/by-name/pr/pro-office-calculator/package.nix
+++ b/pkgs/by-name/pr/pro-office-calculator/package.nix
@@ -1,37 +1,39 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
   tinyxml-2,
   cmake,
-  qtbase,
-  qtmultimedia,
+  qt5,
 }:
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   version = "1.0.13";
   pname = "pro-office-calculator";
 
   src = fetchFromGitHub {
     owner = "RobJinman";
     repo = "pro_office_calc";
-    rev = "v${version}";
-    sha256 = "1v75cysargmp4fk7px5zgib1p6h5ya4w39rndbzk614fcnv0iipd";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-7cYItmWOBDP/ajanwYnyBZobVny/9HumI7e+rLRn5ew=";
   };
 
   buildInputs = [
-    qtbase
-    qtmultimedia
+    qt5.qtbase
+    qt5.qtmultimedia
     tinyxml-2
   ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    qt5.wrapQtAppsHook
+  ];
 
-  meta = with lib; {
+  meta = {
     description = "Completely normal office calculator";
     mainProgram = "procalc";
     homepage = "https://proofficecalculator.com/";
-    maintainers = [ maintainers.pmiddend ];
-    platforms = platforms.linux;
-    license = licenses.gpl3;
+    maintainers = with lib.maintainers; [ pmiddend ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl3Only;
   };
-}
+})

From 139b686affb90d7bb873cfbf01e6b040e5cf58c0 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 26 Oct 2025 10:38:52 -0300
Subject: [PATCH 2930/6226] pro-office-calculator: add maintainer iedame

---
 pkgs/by-name/pr/pro-office-calculator/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/pr/pro-office-calculator/package.nix b/pkgs/by-name/pr/pro-office-calculator/package.nix
index 05e5f044009a..d423abb0238b 100644
--- a/pkgs/by-name/pr/pro-office-calculator/package.nix
+++ b/pkgs/by-name/pr/pro-office-calculator/package.nix
@@ -32,7 +32,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Completely normal office calculator";
     mainProgram = "procalc";
     homepage = "https://proofficecalculator.com/";
-    maintainers = with lib.maintainers; [ pmiddend ];
+    maintainers = with lib.maintainers; [
+      pmiddend
+      iedame
+    ];
     platforms = lib.platforms.linux;
     license = lib.licenses.gpl3Only;
   };

From 41515fc94c7a0677388af5e2d9e13cd17621f117 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 13:39:05 +0000
Subject: [PATCH 2931/6226] vscode-extensions.yy0931.vscode-sqlite3-editor:
 1.0.208 -> 1.0.210

---
 .../extensions/yy0931.vscode-sqlite3-editor/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix b/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix
index b7c8acc9d1fa..e2f36e392fdb 100644
--- a/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix
@@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "vscode-sqlite3-editor";
     publisher = "yy0931";
-    version = "1.0.208";
-    hash = "sha256-4NOyMHp42RS7qsx0Zy86kqQzKgQkh3WprRoEI6GIXvg=";
+    version = "1.0.210";
+    hash = "sha256-SuLGdTDZssXu5NeBhdFyT1+MIWo9B7BohG7YfB0SX7I=";
   };
   meta = {
     changelog = "https://marketplace.visualstudio.com/items/yy0931.vscode-sqlite3-editor/changelog";

From f24f3e939e758ae84d8f66f54dbf93705d11c354 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 26 Oct 2025 13:42:27 +0000
Subject: [PATCH 2932/6226] gleam: skip failing tests on x86_64-darwin

---
 pkgs/by-name/gl/gleam/package.nix | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/pkgs/by-name/gl/gleam/package.nix b/pkgs/by-name/gl/gleam/package.nix
index c19b47f20abb..92c711dac5e3 100644
--- a/pkgs/by-name/gl/gleam/package.nix
+++ b/pkgs/by-name/gl/gleam/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
   git,
@@ -46,6 +47,26 @@ rustPlatform.buildRustPackage (finalAttrs: {
   checkFlags = [
     # Makes a network request
     "--skip=tests::echo::echo_dict"
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+    # Snapshot tests fail because a warning is shown on stdout
+    # warn: CPU lacks AVX support, strange crashes may occur. Reinstall Bun or use *-baseline build:
+    #   https://github.com/oven-sh/bun/releases/download/bun-v1.3.1/bun-darwin-x64-baseline.zip
+    "--skip=tests::echo::echo_bitarray"
+    "--skip=tests::echo::echo_bool"
+    "--skip=tests::echo::echo_charlist"
+    "--skip=tests::echo::echo_circular_reference"
+    "--skip=tests::echo::echo_custom_type"
+    "--skip=tests::echo::echo_float"
+    "--skip=tests::echo::echo_function"
+    "--skip=tests::echo::echo_importing_module_named_inspect"
+    "--skip=tests::echo::echo_int"
+    "--skip=tests::echo::echo_list"
+    "--skip=tests::echo::echo_nil"
+    "--skip=tests::echo::echo_singleton"
+    "--skip=tests::echo::echo_string"
+    "--skip=tests::echo::echo_tuple"
+    "--skip=tests::echo::echo_with_message"
   ];
 
   doInstallCheck = true;

From 752ad8a2cbc696f0c61a5423dc9e2c866aec2582 Mon Sep 17 00:00:00 2001
From: skwig <skwig@users.noreply.github.com>
Date: Thu, 15 May 2025 18:43:40 +0200
Subject: [PATCH 2933/6226] maintainers: add skwig

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index bb777bcd9e45..e73124f9fa3a 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -24158,6 +24158,11 @@
     name = "Sebastian Kowalak";
     matrix = "@scl:tchncs.de";
   };
+  skwig = {
+    name = "skwig";
+    github = "skwig";
+    githubId = 16136203;
+  };
   skyesoss = {
     name = "Skye Soss";
     matrix = "@skyesoss:matrix.org";

From 6c530bb7739ecbe2715cade9316796cff765328e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 13:46:43 +0000
Subject: [PATCH 2934/6226] vscode-extensions.fstarlang.fstar-vscode-assistant:
 0.21.0 -> 0.22.0

---
 .../extensions/fstarlang.fstar-vscode-assistant/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix b/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix
index 927de91fccee..89cf74e10627 100644
--- a/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix
@@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "fstar-vscode-assistant";
     publisher = "FStarLang";
-    version = "0.21.0";
-    hash = "sha256-p1Gh7HKcEXGiObzFt0P/hGS0e5g8ekktmAqSWi6sJwA=";
+    version = "0.22.0";
+    hash = "sha256-jDHVN34f/HlE74+uXt4tx8cDjh9pG4nKZG5CaHKT9oE=";
   };
   meta = {
     description = "Interactive editing mode VS Code extension for F*";

From b3727a30c47a48a535e9b8a1e9adfd2c6fd83af1 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 26 Oct 2025 14:56:44 +0100
Subject: [PATCH 2935/6226] artyFX: fix build with cmake4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Tracking: Build Failures with CMake 4 #445447
---
 pkgs/by-name/ar/artyFX/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ar/artyFX/package.nix b/pkgs/by-name/ar/artyFX/package.nix
index 79e2ebeed923..3c9e24e534a5 100644
--- a/pkgs/by-name/ar/artyFX/package.nix
+++ b/pkgs/by-name/ar/artyFX/package.nix
@@ -40,6 +40,15 @@ stdenv.mkDerivation rec {
     ntk
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'cmake_minimum_required (VERSION 2.6)' \
+      'cmake_minimum_required(VERSION 4.0)'
+    substituteInPlace src/avtk/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required (VERSION 2.6)' \
+      'cmake_minimum_required(VERSION 4.0)'
+  '';
+
   meta = with lib; {
     homepage = "http://openavproductions.com/artyfx/";
     description = "LV2 plugin bundle of artistic realtime effects";

From bff2f650945052f7ca0692effb40afa1db4e2a33 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 13:59:41 +0000
Subject: [PATCH 2936/6226] vscode-extensions.bradlc.vscode-tailwindcss:
 0.14.28 -> 0.14.29

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 54f9f27ef5f1..0da50646586e 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -773,8 +773,8 @@ let
         mktplcRef = {
           name = "vscode-tailwindcss";
           publisher = "bradlc";
-          version = "0.14.28";
-          hash = "sha256-xq12b0i0TsYZ5XxF1t9c2YrV7wAROjEjdLgBg3ZaLi0=";
+          version = "0.14.29";
+          hash = "sha256-58/yM4xP8ewpegNlVSWnyFIoAmEd7E/CigQgae7OgZY=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/bradlc.vscode-tailwindcss/changelog";

From 6a3084d1a13e59e93d2bbb7e445c8e5898ca68b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 13:59:44 +0000
Subject: [PATCH 2937/6226] vscode-extensions.danielsanmedium.dscodegpt:
 3.14.135 -> 3.14.158

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 54f9f27ef5f1..a92512bd741b 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1154,8 +1154,8 @@ let
         mktplcRef = {
           publisher = "DanielSanMedium";
           name = "dscodegpt";
-          version = "3.14.135";
-          hash = "sha256-y7qfBzXqyGrZXrpIkbMA1TDEQsKcfPCLmllypNu51G0=";
+          version = "3.14.158";
+          hash = "sha256-c+5CJqjn7dmwDgNcaaDBapi3T8OI+5UnPJj9+t8sWng=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog";

From 4d333e074ef53a43643090a58c359d1d7972ac39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 14:21:09 +0000
Subject: [PATCH 2938/6226] vscode-extensions.vue.volar: 3.1.1 -> 3.1.2

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 54f9f27ef5f1..09aaedf8b979 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5140,8 +5140,8 @@ let
         mktplcRef = {
           name = "volar";
           publisher = "Vue";
-          version = "3.1.1";
-          hash = "sha256-l5x7fLznJGm2dPAbJlz4/5BDikM45h1W9GkmoC4Sv7k=";
+          version = "3.1.2";
+          hash = "sha256-DgLGTxUWBSjDr9m+lfmAPteZv1mX7OOlYynCrd+zU0o=";
         };
         meta = {
           changelog = "https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md";

From f085167e16bb5a1206b9c6b70ec7fa91cffe1565 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 14:23:15 +0000
Subject: [PATCH 2939/6226] rime-wanxiang: 13.1.7 -> 13.1.9

---
 pkgs/by-name/ri/rime-wanxiang/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ri/rime-wanxiang/package.nix b/pkgs/by-name/ri/rime-wanxiang/package.nix
index 87e37b0ebc9d..448ec74d24a7 100644
--- a/pkgs/by-name/ri/rime-wanxiang/package.nix
+++ b/pkgs/by-name/ri/rime-wanxiang/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rime-wanxiang";
-  version = "13.1.7";
+  version = "13.1.9";
 
   src = fetchFromGitHub {
     owner = "amzxyz";
     repo = "rime_wanxiang";
     tag = "v" + finalAttrs.version;
-    hash = "sha256-meuTuzrj2i4ByJ4TV638a6N1AVb0MrIhdRxXl6sPRoE=";
+    hash = "sha256-OQhjOXJ0wyJfMx9GMkmTdhf9vF6tX4t8o7a1xl6s6wk=";
   };
 
   installPhase = ''

From 5efe0caa2d04d818b1617ae57d7daf4499c9dda6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 26 Oct 2025 14:24:20 +0000
Subject: [PATCH 2940/6226] codex: 0.47.0 -> 0.50.0

---
 pkgs/by-name/co/codex/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index 51d3144c37b4..3be9b3d74537 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -14,18 +14,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codex";
-  version = "0.47.0";
+  version = "0.50.0";
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "codex";
     tag = "rust-v${finalAttrs.version}";
-    hash = "sha256-5AyatNXgHuia656OuSDozQzQv80bNHncgLN1X23bfM4=";
+    hash = "sha256-8qNQ92VV0aog3USzeAMqWXws7kaQ//6/A/M85USTTXY=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/codex-rs";
 
-  cargoHash = "sha256-PQ1NxwNBaI48gQ4GGoricA/j7vpsnaLlL6st5P+CTHk=";
+  cargoHash = "sha256-T6Zt5U2aCJWflwKzTbJXwK+BeE7L6IP4WAmISitrpRg=";
 
   nativeBuildInputs = [
     installShellFiles

From 037324b6f878b732d102a6cb8ef327c71087eb42 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 26 Oct 2025 15:23:14 +0100
Subject: [PATCH 2941/6226] kapitonov-plugins-pack: fix build

---
 pkgs/by-name/ka/kapitonov-plugins-pack/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
index a7586ec00d2d..5fe18fb1265a 100644
--- a/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
+++ b/pkgs/by-name/ka/kapitonov-plugins-pack/package.nix
@@ -49,6 +49,9 @@ stdenv.mkDerivation rec {
     zita-resampler
   ];
 
+  # Fix linking issues with C++ code generated by Faust
+  env.NIX_LDFLAGS = "-lstdc++ -lm";
+
   meta = with lib; {
     description = "Set of LADSPA and LV2 plugins for guitar sound processing";
     homepage = "https://github.com/olegkapitonov/Kapitonov-Plugins-Pack";

From 3f68f91b3600a29ec1bbef2c68840e60fcc3925d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 14:26:27 +0000
Subject: [PATCH 2942/6226] vscode-extensions.ms-pyright.pyright: 1.1.406 ->
 1.1.407

---
 .../editors/vscode/extensions/ms-pyright.pyright/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix
index d5f1568372ad..f8fcfcf39cb0 100644
--- a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     publisher = "ms-pyright";
     name = "pyright";
-    version = "1.1.406";
-    hash = "sha256-Lz8x/op0RUluE7R6xssg2nVviT0O1tZXUopzKt0f99U=";
+    version = "1.1.407";
+    hash = "sha256-x236ExuITXKqDoRgjDhnq9WnBbI1DvIIW/PXEYx2oVA=";
   };
 
   meta = {

From 531f1237ff772a7e69f9c299eb98806619f5959b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 14:38:07 +0000
Subject: [PATCH 2943/6226] nuclei-templates: 10.3.0 -> 10.3.1

---
 pkgs/by-name/nu/nuclei-templates/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nu/nuclei-templates/package.nix b/pkgs/by-name/nu/nuclei-templates/package.nix
index 2421f3b7a5d9..b5d84c866380 100644
--- a/pkgs/by-name/nu/nuclei-templates/package.nix
+++ b/pkgs/by-name/nu/nuclei-templates/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "nuclei-templates";
-  version = "10.3.0";
+  version = "10.3.1";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "nuclei-templates";
     tag = "v${version}";
-    hash = "sha256-WzPH3uyRAseN51gpmezfD0Mcbjh2K2mSkRbo3LFShG4=";
+    hash = "sha256-ZiqTusOcWv3XRQaxOlu8MojQHBbCue7IIyPI078YP04=";
   };
 
   installPhase = ''

From 6e1120075914a7438ee663b70e96bdaff581c989 Mon Sep 17 00:00:00 2001
From: FlameFlag <57304299+FlameFlag@users.noreply.github.com>
Date: Sun, 26 Oct 2025 16:23:05 +0200
Subject: [PATCH 2944/6226] koboldcpp: 1.99.4 -> 1.100.1

Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.100.1
Diff: https://github.com/LostRuins/koboldcpp/compare/v1.99.4...v1.100.1
---
 pkgs/by-name/ko/koboldcpp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index b21669dee58b..a10023223288 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -41,13 +41,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "koboldcpp";
-  version = "1.99.4";
+  version = "1.100.1";
 
   src = fetchFromGitHub {
     owner = "LostRuins";
     repo = "koboldcpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ilBrTMtY6bhns2GcwDckGq4+RqzgzBCg0HJJ4QUx8Co=";
+    hash = "sha256-Z3yPsC7WDFHwXVInnu96ZVWAjn6XyN0aVviwGkvoe1A=";
   };
 
   enableParallelBuilding = true;
@@ -96,7 +96,7 @@ effectiveStdenv.mkDerivation (finalAttrs: {
 
     install -Dm755 koboldcpp.py "$out/bin/koboldcpp.unwrapped"
     cp *.so "$out/bin"
-    cp *.embd "$out/bin"
+    cp embd_res/*.embd "$out/bin"
 
     ${lib.optionalString metalSupport ''
       cp *.metal "$out/bin"

From 72a85b5e53dd19778145610cc54c23b51f3e2b67 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Fri, 24 Oct 2025 19:39:28 +0200
Subject: [PATCH 2945/6226] cargo-binstall: 1.15.7 -> 1.15.9

Changelog: https://github.com/cargo-bins/cargo-binstall/releases/tag/v1.15.9
Updating to 1.15.9 fixes CVE-2025-62518
---
 pkgs/by-name/ca/cargo-binstall/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix
index 5d4da28fb530..62fb1e8873d5 100644
--- a/pkgs/by-name/ca/cargo-binstall/package.nix
+++ b/pkgs/by-name/ca/cargo-binstall/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-binstall";
-  version = "1.15.7";
+  version = "1.15.9";
 
   src = fetchFromGitHub {
     owner = "cargo-bins";
     repo = "cargo-binstall";
-    rev = "v${version}";
-    hash = "sha256-EQhEI4MqYNwjqb8awROTLfxjGsoPKeT7VHt642uSgCc=";
+    tag = "v${version}";
+    hash = "sha256-v/tilaoDLZDV0VbMTT/DfqSNO4Ezyu3AWGzMftMubqc=";
   };
 
-  cargoHash = "sha256-a9X8L4AZWhlcQ5lVo0I1GL2wpCjOClNuZLy+GwHJDcA=";
+  cargoHash = "sha256-itYqZi1tSWVwqGfNFSBh4/+PoLrQZQTnla4lOCjoX8Q=";
 
   nativeBuildInputs = [
     pkg-config

From b3c050b9c8de02a7e5e791081b4ee7e92450e264 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Fri, 24 Oct 2025 20:00:18 +0200
Subject: [PATCH 2946/6226] cargo-binstall: add versionCheckHook

---
 pkgs/by-name/ca/cargo-binstall/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix
index 62fb1e8873d5..b7e8dbaa5f5d 100644
--- a/pkgs/by-name/ca/cargo-binstall/package.nix
+++ b/pkgs/by-name/ca/cargo-binstall/package.nix
@@ -6,6 +6,7 @@
   bzip2,
   xz,
   zstd,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -57,6 +58,10 @@ rustPlatform.buildRustPackage rec {
     "--skip=gh_api_client::test::test_gh_api_client_cargo_binstall_v0_20_1"
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "-V";
+
   meta = {
     description = "Tool for installing rust binaries as an alternative to building from source";
     mainProgram = "cargo-binstall";

From e0d786a7e73f81116029e0eec99220291a3080ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 14:51:32 +0000
Subject: [PATCH 2947/6226] redpanda-client: 25.2.9 -> 25.2.10

---
 pkgs/by-name/re/redpanda-client/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/redpanda-client/package.nix b/pkgs/by-name/re/redpanda-client/package.nix
index 66aa912bcff2..7b7b3c22f9c9 100644
--- a/pkgs/by-name/re/redpanda-client/package.nix
+++ b/pkgs/by-name/re/redpanda-client/package.nix
@@ -7,12 +7,12 @@
   stdenv,
 }:
 let
-  version = "25.2.9";
+  version = "25.2.10";
   src = fetchFromGitHub {
     owner = "redpanda-data";
     repo = "redpanda";
     rev = "v${version}";
-    sha256 = "sha256-wjYYpFCuHd7r9d0s3rT7CTyRzVviO6g6t9i+R/5+aXQ=";
+    sha256 = "sha256-kw/nQjIwNZGEfFRmBqNdXQPVadK0BQY3ha6S4E0Bc8A=";
   };
 in
 buildGoModule rec {

From e634b9ec1f9a9fc4de89330bec56efbd3823aa6b Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Sun, 26 Oct 2025 10:52:08 -0400
Subject: [PATCH 2948/6226] buildMozillaMach: remove wrapGAppsHook3 from darwin
 deps

The wrapper is used on platforms other than darwin.
---
 pkgs/build-support/build-mozilla-mach/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index 834654bee746..909b4edd1e23 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -362,9 +362,11 @@ buildStdenv.mkDerivation {
     rustc
     unzip
     which
+  ]
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    pkg-config
     wrapGAppsHook3
   ]
-  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ rsync ]
   ++ lib.optionals stdenv.hostPlatform.isx86 [ nasm ]
   ++ lib.optionals crashreporterSupport [

From 86b945dad3e9820a9e6b3c6bc35edb80337a02ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 14:52:39 +0000
Subject: [PATCH 2949/6226] vscode-extensions.github.codespaces: 1.17.4 ->
 1.17.5

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 54f9f27ef5f1..421a3e2b0e51 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1898,8 +1898,8 @@ let
         mktplcRef = {
           publisher = "github";
           name = "codespaces";
-          version = "1.17.4";
-          hash = "sha256-0fhPOtHpjafuo+oCCRmLKYI7Q22eE3vliH9q//ab6Ag=";
+          version = "1.17.5";
+          hash = "sha256-xv7Yx2chKqKnC7tKcvXUKrL5DBW0eFT8hi0p9shwX04=";
         };
 
         meta = {

From 7567ff1653c08e1cb34e0861988c8231bb7d2bd1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 15:07:37 +0000
Subject: [PATCH 2950/6226] vscode-extensions.vscjava.vscode-java-pack: 0.30.3
 -> 0.30.4

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 54f9f27ef5f1..a042459bb8a6 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5074,8 +5074,8 @@ let
         mktplcRef = {
           name = "vscode-java-pack";
           publisher = "vscjava";
-          version = "0.30.3";
-          hash = "sha256-O6Elqkaf2oTpPxWIctrgD1NrDhkeOaCNKuRI4VFhmZ8=";
+          version = "0.30.4";
+          hash = "sha256-R7I1nLRkaQghlVs7eezzFbwTSiNSEJS2abIrMqv7654=";
         };
         meta = {
           description = "Popular extensions for Java development that provides Java IntelliSense, debugging, testing, Maven/Gradle support, project management and more";

From c361bdb969c10de74a36e08ab672c89169c46c8b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 15:10:45 +0000
Subject: [PATCH 2951/6226] vscode-extensions.42crunch.vscode-openapi: 4.38.0
 -> 4.40.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 54f9f27ef5f1..42dea4dec167 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -89,8 +89,8 @@ let
         mktplcRef = {
           publisher = "42Crunch";
           name = "vscode-openapi";
-          version = "4.38.0";
-          hash = "sha256-J9hZhPrHkJEFkiyD8eACiJwbsPfYGMK42FkcwkTQ0RE=";
+          version = "4.40.0";
+          hash = "sha256-nV7RZpDd+15YmINKrFSIlFurC955bnE4A8esrKWYVnE=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/42Crunch.vscode-openapi/changelog";

From 5ff4fe320b6879e5796de51b30c7f7d09d5ffb79 Mon Sep 17 00:00:00 2001
From: Malik <abdelmalik.najhi@stud.hs-kempten.de>
Date: Fri, 7 Mar 2025 19:17:10 +0100
Subject: [PATCH 2952/6226] Datalad: add malik to maintainers

---
 pkgs/development/python-modules/datalad/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix
index c335d6a75b5e..316749a6a69f 100644
--- a/pkgs/development/python-modules/datalad/default.nix
+++ b/pkgs/development/python-modules/datalad/default.nix
@@ -240,6 +240,6 @@ buildPythonPackage rec {
     description = "Keep code, data, containers under control with git and git-annex";
     homepage = "https://www.datalad.org";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ renesat ];
+    maintainers = with lib.maintainers; [ renesat malik ];
   };
 }

From 3e9ccb1686b9a0d84d37816eadca5415bd693b14 Mon Sep 17 00:00:00 2001
From: Malik <abdelmalik.najhi@stud.hs-kempten.de>
Date: Fri, 7 Mar 2025 19:18:47 +0100
Subject: [PATCH 2953/6226] datalad: add git-annex to PATH in wrapper

Add git-annex per wrapper

Co-authored-by: h7x4 <h7x4@nani.wtf>
---
 .../development/python-modules/datalad/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix
index 316749a6a69f..17fd95ce75a8 100644
--- a/pkgs/development/python-modules/datalad/default.nix
+++ b/pkgs/development/python-modules/datalad/default.nix
@@ -62,6 +62,7 @@ buildPythonPackage rec {
   };
 
   postPatch = ''
+    # remove after release with https://github.com/datalad/datalad/commit/d8eac5682d794b2460d732a2c7637acefecfeb82
     substituteInPlace datalad/distribution/create_sibling.py \
       --replace-fail "/bin/ls" "${coreutils}/bin/ls"
     # Remove vendorized versioneer.py
@@ -119,9 +120,11 @@ buildPythonPackage rec {
 
   postInstall = ''
     installShellCompletion --cmd datalad \
-         --bash <($out/bin/datalad shell-completion) \
-         --zsh  <($out/bin/datalad shell-completion)
-    wrapProgram $out/bin/datalad --prefix PYTHONPATH : "$PYTHONPATH"
+      --bash <($out/bin/datalad shell-completion) \
+      --zsh  <($out/bin/datalad shell-completion)
+    wrapProgram $out/bin/datalad \
+      --prefix PATH : "${git-annex}/bin" \
+      --prefix PYTHONPATH : "$PYTHONPATH"
   '';
 
   preCheck = ''
@@ -240,6 +243,9 @@ buildPythonPackage rec {
     description = "Keep code, data, containers under control with git and git-annex";
     homepage = "https://www.datalad.org";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ renesat malik ];
+    maintainers = with lib.maintainers; [
+      renesat
+      malik
+    ];
   };
 }

From 8cd51bd98a331abad04ec442390107116af8d873 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 26 Oct 2025 15:21:14 +0000
Subject: [PATCH 2954/6226] portmidi: 2.0.6 -> 2.0.7

Changes: https://github.com/PortMidi/portmidi/releases/tag/v2.0.7
---
 pkgs/by-name/po/portmidi/missing-header.diff | 12 ------------
 pkgs/by-name/po/portmidi/package.nix         |  9 ++-------
 2 files changed, 2 insertions(+), 19 deletions(-)
 delete mode 100644 pkgs/by-name/po/portmidi/missing-header.diff

diff --git a/pkgs/by-name/po/portmidi/missing-header.diff b/pkgs/by-name/po/portmidi/missing-header.diff
deleted file mode 100644
index 1fa1f147014e..000000000000
--- a/pkgs/by-name/po/portmidi/missing-header.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/porttime/ptmacosx_mach.c b/porttime/ptmacosx_mach.c
-index 10c3554..712a974 100755
---- a/porttime/ptmacosx_mach.c
-+++ b/porttime/ptmacosx_mach.c
-@@ -12,6 +12,7 @@
- 
- #include "porttime.h"
- #include "sys/time.h"
-+#include "sys/qos.h"
- #include "pthread.h"
- 
- #ifndef NSEC_PER_MSEC
diff --git a/pkgs/by-name/po/portmidi/package.nix b/pkgs/by-name/po/portmidi/package.nix
index 67fdecd0f655..89806fc8ff0f 100644
--- a/pkgs/by-name/po/portmidi/package.nix
+++ b/pkgs/by-name/po/portmidi/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "portmidi";
-  version = "2.0.6";
+  version = "2.0.7";
 
   src = fetchFromGitHub {
     owner = "portmidi";
     repo = "portmidi";
     rev = "v${version}";
-    sha256 = "sha256-ou+zN4XnR+QaWC/hzgtThVbeZ/3UVLTpZ9O+eQSGVBs=";
+    sha256 = "sha256-kmyjOsjLG56Qqrf6DqgOTpt4A4aCMvCI3koiUoKzwrE=";
   };
 
   cmakeFlags = [
@@ -24,11 +24,6 @@ stdenv.mkDerivation rec {
     "-DCMAKE_RUNTIME_OUTPUT_DIRECTORY=Release"
   ];
 
-  patches = [
-    # Add missing header include
-    ./missing-header.diff
-  ];
-
   postInstall =
     let
       ext = stdenv.hostPlatform.extensions.sharedLibrary;

From 3ff9afad433d50fbd11025c313f57f48176d2159 Mon Sep 17 00:00:00 2001
From: Malik <abdelmalik.najhi@stud.hs-kempten.de>
Date: Wed, 15 Oct 2025 18:05:59 +0200
Subject: [PATCH 2955/6226] datalad: 1.2.1 -> 1.2.2

---
 pkgs/development/python-modules/datalad/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix
index 17fd95ce75a8..53a768445bc6 100644
--- a/pkgs/development/python-modules/datalad/default.nix
+++ b/pkgs/development/python-modules/datalad/default.nix
@@ -51,20 +51,17 @@
 
 buildPythonPackage rec {
   pname = "datalad";
-  version = "1.2.1";
+  version = "1.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "datalad";
     repo = "datalad";
     tag = version;
-    hash = "sha256-QcKhMiJNlETlxmRoPwKKGYK7zKbJ0pQpbRZDyJ+yrN0=";
+    hash = "sha256-OjWOWdfAQoCQzc2EH5hBhJ3G/Z62U9oRgv8tp23L/Qw=";
   };
 
   postPatch = ''
-    # remove after release with https://github.com/datalad/datalad/commit/d8eac5682d794b2460d732a2c7637acefecfeb82
-    substituteInPlace datalad/distribution/create_sibling.py \
-      --replace-fail "/bin/ls" "${coreutils}/bin/ls"
     # Remove vendorized versioneer.py
     rm versioneer.py
   '';

From 008874d7b32a171fec94ed50c323c772c84e8cbc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 15:28:06 +0000
Subject: [PATCH 2956/6226] integrity-scrub: 0.6.5 -> 0.6.6

---
 pkgs/by-name/in/integrity-scrub/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/in/integrity-scrub/package.nix b/pkgs/by-name/in/integrity-scrub/package.nix
index 83257185c2ed..51ebd8da0602 100644
--- a/pkgs/by-name/in/integrity-scrub/package.nix
+++ b/pkgs/by-name/in/integrity-scrub/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "integrity-scrub";
-  version = "0.6.5";
+  version = "0.6.6";
 
   src = fetchFromGitHub {
     owner = "illdefined";
     repo = "integrity-scrub";
     tag = version;
-    hash = "sha256-oWS6HxdZ8tGeIRGpfHHkNhNdepBjhhdgTjKmxElNPbk=";
+    hash = "sha256-OLO64R9AYpHSkIwk2arka5EEzCWusZPWsBhy5HEDIQI=";
   };
 
-  cargoHash = "sha256-3LC3eZNmHG6OFIvQzmvs4BCSX0CVpwaYhZM2H2YoY4M=";
+  cargoHash = "sha256-sS4z5NImUdk0EnQ+BGPofFZtXZsomfUXXbHNDmVqAos=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 

From b1d5f11624333110ca40a83e479506a12b0c46d2 Mon Sep 17 00:00:00 2001
From: chillcicada <2210227279@qq.com>
Date: Sun, 26 Oct 2025 23:28:42 +0800
Subject: [PATCH 2957/6226] ovito: 3.12.2 -> 3.14.1; modernize

---
 pkgs/by-name/ov/ovito/package.nix | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ov/ovito/package.nix b/pkgs/by-name/ov/ovito/package.nix
index dd2378ce1b75..ab4eaaa8e06b 100644
--- a/pkgs/by-name/ov/ovito/package.nix
+++ b/pkgs/by-name/ov/ovito/package.nix
@@ -16,17 +16,18 @@
   python3,
   qt6Packages,
   copyDesktopItems,
+  nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ovito";
-  version = "3.12.2";
+  version = "3.14.1";
 
   src = fetchFromGitLab {
     owner = "stuko";
     repo = "ovito";
-    rev = "v${version}";
-    hash = "sha256-qpKQAO2f1TfspqjbCLA/3ERWdMeknKe0a54yd9PZbsA=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-SKE07bk/8cZ2etQtLrGZyp2DrNiyVk6mrgxlvJmG+Xk=";
     fetchSubmodules = true;
   };
   patches = [ ./zstd.patch ];
@@ -81,18 +82,22 @@ stdenv.mkDerivation rec {
       install -Dm644 ${icon} $out/share/pixmaps/ovito.png
     '';
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "Scientific visualization and analysis software for atomistic and particle simulation data";
     mainProgram = "ovito";
     homepage = "https://ovito.org";
-    license = with licenses; [
+    changelog = "https://docs.ovito.org/new_features.html";
+    license = with lib.licenses; [
       gpl3Only
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       twhitehead
       chn
+      chillcicada
     ];
     broken = stdenv.hostPlatform.isDarwin; # clang-11: error: no such file or directory: '$-DOVITO_COPYRIGHT_NOTICE=...
   };
-}
+})

From 6c6bc149ddd9dab65657873ab33dc37c2b420b64 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 15:30:04 +0000
Subject: [PATCH 2958/6226] synapse-admin-etkecc: 0.11.1-etke48 ->
 0.11.1-etke49

---
 pkgs/by-name/sy/synapse-admin-etkecc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
index d1aa50ba853f..57f5d44815c4 100644
--- a/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
+++ b/pkgs/by-name/sy/synapse-admin-etkecc/package.nix
@@ -17,18 +17,18 @@ assert lib.asserts.assertMsg (
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "synapse-admin-etkecc";
-  version = "0.11.1-etke48";
+  version = "0.11.1-etke49";
 
   src = fetchFromGitHub {
     owner = "etkecc";
     repo = "synapse-admin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1bxkC91OPXPjwPgbjRlCvUth/Q7w7O4WeW3vYaGmo5A=";
+    hash = "sha256-PbqO+Y740GWqfh584W6OS4HeQtO6Rkz6lc5IaTjadq0=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = finalAttrs.src + "/yarn.lock";
-    hash = "sha256-Vv/keQXNBxBDgKXNBHLFuNDNHEnEWJuFa/pU+ejpDCY=";
+    hash = "sha256-4o6TVbOSDm7btMDd4ItQR+jCFNZGhTXvycqcIh0FQnk=";
   };
 
   nativeBuildInputs = [

From 1fafd0d58da9837a9790fc4172897b091b5b2aaa Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sun, 26 Oct 2025 15:29:30 +0000
Subject: [PATCH 2959/6226] ncdu: 2.9.1 -> 2.9.2

Changes: https://dev.yorhel.nl/ncdu/changes2
---
 pkgs/by-name/nc/ncdu/package.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/nc/ncdu/package.nix b/pkgs/by-name/nc/ncdu/package.nix
index ddc2ab69c617..8e9003322412 100644
--- a/pkgs/by-name/nc/ncdu/package.nix
+++ b/pkgs/by-name/nc/ncdu/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchurl,
-  fetchpatch2,
   ncurses,
   pkg-config,
   zig_0_15,
@@ -14,21 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ncdu";
-  version = "2.9.1";
+  version = "2.9.2";
 
   src = fetchurl {
     url = "https://dev.yorhel.nl/download/ncdu-${finalAttrs.version}.tar.gz";
-    hash = "sha256-v9EJThQA7onP1ZIA6rlA8CXM3AwjgGcQXJhKPEhXv34=";
+    hash = "sha256-6RE1KBy2ZWnyykwLrCdyRpkeflJSTAyoy6PeXI6Bzsk=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # Fix infinite loop when reading config file on Zig 0.15.2
-      url = "https://code.blicky.net/yorhel/ncdu/commit/f45224457687a55aa885aca8e7300f1fbf0af59b.patch";
-      hash = "sha256-80Igx1MOINdeufCsNoisNo3dJ2iUTpZIxyXy/KzQ1Ng=";
-    })
-  ];
-
   nativeBuildInputs = [
     zig_0_15.hook
     installShellFiles

From c019de0c9411d81a1eda9d117a11f9cedc10607f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 15:35:58 +0000
Subject: [PATCH 2960/6226] python3Packages.pytapo: 3.3.49 -> 3.3.51

---
 pkgs/development/python-modules/pytapo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytapo/default.nix b/pkgs/development/python-modules/pytapo/default.nix
index 852802ede046..88945a91ea02 100644
--- a/pkgs/development/python-modules/pytapo/default.nix
+++ b/pkgs/development/python-modules/pytapo/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pytapo";
-  version = "3.3.49";
+  version = "3.3.51";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-urAGAcSoJ8AkHHIPEBEfk08Y34URVN/sX0N4WkIcUR4=";
+    hash = "sha256-Pog5q/tXNz+RRZXJdb2/qG3BeaHUTYtlzOkM5Twr6js=";
   };
 
   build-system = [ setuptools ];

From b3a031375a8c6cfe3a834d7d1420fcdf675b5069 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 15:39:54 +0000
Subject: [PATCH 2961/6226] ecspresso: 2.6.1 -> 2.6.2

---
 pkgs/by-name/ec/ecspresso/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ec/ecspresso/package.nix b/pkgs/by-name/ec/ecspresso/package.nix
index 9c4ba0d8f086..7928e5d1f210 100644
--- a/pkgs/by-name/ec/ecspresso/package.nix
+++ b/pkgs/by-name/ec/ecspresso/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "ecspresso";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchFromGitHub {
     owner = "kayac";
     repo = "ecspresso";
     tag = "v${version}";
-    hash = "sha256-kZKfhGOxtuZM6oytt/36AW8R2XVoKuLZdaj7NvoRWGA=";
+    hash = "sha256-9C/OJ1rnH77jcF3hDr2uyXcNViAkM84LjmkJsKmQkXo=";
   };
 
   subPackages = [

From a11215be73131bdb093b5085286f5d75eb7b1e4a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 26 Oct 2025 16:50:57 +0100
Subject: [PATCH 2962/6226] kea: mark broken on darwin

---
 pkgs/by-name/ke/kea/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ke/kea/package.nix b/pkgs/by-name/ke/kea/package.nix
index 43ca2558e173..18754620d86f 100644
--- a/pkgs/by-name/ke/kea/package.nix
+++ b/pkgs/by-name/ke/kea/package.nix
@@ -119,6 +119,8 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   meta = {
+    # error: in-class initializer for static data member is not a constant expression
+    broken = stdenv.hostPlatform.isDarwin;
     changelog = "https://gitlab.isc.org/isc-projects/kea/-/wikis/Release-Notes/release-notes-${finalAttrs.version}";
     homepage = "https://kea.isc.org/";
     description = "High-performance, extensible DHCP server by ISC";

From 5d673c219bd60b18ec2d87d27844cf8273be908d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 4 Oct 2025 07:43:19 +0000
Subject: [PATCH 2963/6226] quantframe: 1.5.3 -> 1.5.4

---
 pkgs/by-name/qu/quantframe/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qu/quantframe/package.nix b/pkgs/by-name/qu/quantframe/package.nix
index b30f8a02ec6b..3be23108664b 100644
--- a/pkgs/by-name/qu/quantframe/package.nix
+++ b/pkgs/by-name/qu/quantframe/package.nix
@@ -17,13 +17,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "quantframe";
-  version = "1.5.3";
+  version = "1.5.4";
 
   src = fetchFromGitHub {
     owner = "Kenya-DK";
     repo = "quantframe-react";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-afTiQzHat6k+BF8EhYhd0o0FzYjq7GpnOnjRhjXASG8=";
+    hash = "sha256-PCfejmL+dztzw2bBZxXzZlXBiSLO/eRgvP9jLK/G8PQ=";
   };
 
   postPatch = ''

From d38bf033dc578bcc3757ecb3fdda7755f65421bc Mon Sep 17 00:00:00 2001
From: Danil Suetin <suetin085@proton.me>
Date: Wed, 22 Oct 2025 23:35:53 +0200
Subject: [PATCH 2964/6226] ubertooth: fix build with cmake4

---
 .../ub/ubertooth/fix-cmake4-build.patch       | 37 +++++++++++++++++++
 pkgs/by-name/ub/ubertooth/package.nix         |  5 +++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/by-name/ub/ubertooth/fix-cmake4-build.patch

diff --git a/pkgs/by-name/ub/ubertooth/fix-cmake4-build.patch b/pkgs/by-name/ub/ubertooth/fix-cmake4-build.patch
new file mode 100644
index 000000000000..a27afae6f686
--- /dev/null
+++ b/pkgs/by-name/ub/ubertooth/fix-cmake4-build.patch
@@ -0,0 +1,37 @@
+commit 111bb8d98b4ff1897c36ff23806c492e9a313457
+Author: Will Dillon <william@housedillon.com>
+Date:   Mon Aug 11 13:58:40 2025 -0700
+
+    Update CMAKE version
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ea0dfa6..9f1bcb3 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -20,7 +20,7 @@
+ #
+ #top level cmake project for ubertooth lib + tools
+ 
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.10)
+ project(ubertooth_all)
+ set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake/modules
+ 	CACHE STRING "CMake module path")
+diff --git a/misc/CMakeLists.txt b/misc/CMakeLists.txt
+index f728056..4336fb0 100644
+--- a/misc/CMakeLists.txt
++++ b/misc/CMakeLists.txt
+@@ -1,2 +1,2 @@
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.10)
+ add_subdirectory(udev)
+diff --git a/misc/udev/CMakeLists.txt b/misc/udev/CMakeLists.txt
+index a7d4ed0..f7dcaf8 100644
+--- a/misc/udev/CMakeLists.txt
++++ b/misc/udev/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8)
++cmake_minimum_required(VERSION 3.10)
+ 
+ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux")
+     SET(SYSTEM_IS_LINUX TRUE)
diff --git a/pkgs/by-name/ub/ubertooth/package.nix b/pkgs/by-name/ub/ubertooth/package.nix
index 9663fa2812f9..294d772515b4 100644
--- a/pkgs/by-name/ub/ubertooth/package.nix
+++ b/pkgs/by-name/ub/ubertooth/package.nix
@@ -24,6 +24,11 @@ stdenv.mkDerivation rec {
 
   sourceRoot = "${src.name}/host";
 
+  patches = [
+    # https://github.com/greatscottgadgets/ubertooth/pull/546
+    ./fix-cmake4-build.patch
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config

From 25556b8b9b3a5376d61a7c14bb60a92e029248fe Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Sun, 26 Oct 2025 17:10:53 +0100
Subject: [PATCH 2965/6226] languagetool-rust: 2.1.5 -> 3.0.0

https://github.com/jeertmans/languagetool-rust/releases/tag/v3.0.0
---
 pkgs/by-name/la/languagetool-rust/package.nix | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/la/languagetool-rust/package.nix b/pkgs/by-name/la/languagetool-rust/package.nix
index c90d9800baf7..55764d9e6739 100644
--- a/pkgs/by-name/la/languagetool-rust/package.nix
+++ b/pkgs/by-name/la/languagetool-rust/package.nix
@@ -6,20 +6,21 @@
   installShellFiles,
   pkg-config,
   openssl,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
   pname = "languagetool-rust";
-  version = "2.1.5";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
     owner = "jeertmans";
     repo = "languagetool-rust";
     rev = "v${version}";
-    hash = "sha256-8YgSxAF4DA1r7ylj6rx+fGubvT7MeiRQeowuiu0GWwQ=";
+    hash = "sha256-LHlM+PJbBqsgOwK9Mw8oVVP+dq4IBFhxjRaXLIGxZPg=";
   };
 
-  cargoHash = "sha256-MIGoGEd/N2qlcawYRLMuac4SexHEMJnOS+FbPFJIsso=";
+  cargoHash = "sha256-VfvdIjNIHpvN370/3y2XXxaIyEL9+tG0OcnONhs9Z2I=";
 
   buildFeatures = [ "full" ];
 
@@ -31,6 +32,9 @@ rustPlatform.buildRustPackage rec {
 
   checkFlags = [
     # requires network access
+    "--skip=api::server::tests::test_server_annotate"
+    "--skip=api::server::tests::test_server_check_multiple_and_join"
+    "--skip=api::server::tests::test_server_check_multiple_and_join_without_context"
     "--skip=server::tests::test_server_check_data"
     "--skip=server::tests::test_server_check_text"
     "--skip=server::tests::test_server_languages"
@@ -39,12 +43,15 @@ rustPlatform.buildRustPackage rec {
     "--skip=test_match_positions_2"
     "--skip=test_match_positions_3"
     "--skip=test_match_positions_4"
-    "--skip=src/lib/lib.rs"
+    "--skip=src/lib.rs"
     "--skip=test_basic_check_data"
     "--skip=test_basic_check_file"
     "--skip=test_basic_check_files"
+    "--skip=test_basic_check_no_errors"
+    "--skip=test_basic_check_ping"
     "--skip=test_basic_check_piped"
     "--skip=test_basic_check_text"
+    "--skip=test_basic_check_stdin_verbose"
     "--skip=test_check_with_dict"
     "--skip=test_check_with_dicts"
     "--skip=test_check_with_disabled_categories"
@@ -78,11 +85,13 @@ rustPlatform.buildRustPackage rec {
       --zsh <($out/bin/ltrs completions zsh)
   '';
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
     description = "LanguageTool API in Rust";
     homepage = "https://github.com/jeertmans/languagetool-rust";
-    license = licenses.mit;
-    maintainers = with maintainers; [ name-snrl ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ name-snrl ];
     mainProgram = "ltrs";
   };
 }

From 7b74d9b4996955c6ed4c97a9c1e6e850a05c4811 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 16:20:22 +0000
Subject: [PATCH 2966/6226] inkcut: 2.1.6 -> 2.1.7

---
 pkgs/by-name/in/inkcut/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/in/inkcut/package.nix b/pkgs/by-name/in/inkcut/package.nix
index 4510cbe1ee42..e4613461d4fa 100644
--- a/pkgs/by-name/in/inkcut/package.nix
+++ b/pkgs/by-name/in/inkcut/package.nix
@@ -9,14 +9,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "inkcut";
-  version = "2.1.6";
+  version = "2.1.7";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "inkcut";
     repo = "inkcut";
     tag = "v${version}";
-    hash = "sha256-qfgzJTFr4VTV/x4PVnUKJzIndfjXB8z2jTWLXvadBuY=";
+    hash = "sha256-inB3yR4ykepN5rYzyPlXW/J/HuSxGs6EDhshpa7n7o8=";
   };
 
   postPatch = ''

From 30151dae235cb5d31951c64b762422137b9cc477 Mon Sep 17 00:00:00 2001
From: Dee Anzorge <d.anzorge@gmail.com>
Date: Sun, 26 Oct 2025 17:57:05 +0100
Subject: [PATCH 2967/6226] postgresqlPackages.rum: 1.3.14 -> 1.3.15

Changes: https://github.com/postgrespro/rum/releases/tag/1.3.15
---
 pkgs/servers/sql/postgresql/ext/rum.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/rum.nix b/pkgs/servers/sql/postgresql/ext/rum.nix
index 99f0d336d525..ef2df4c7f458 100644
--- a/pkgs/servers/sql/postgresql/ext/rum.nix
+++ b/pkgs/servers/sql/postgresql/ext/rum.nix
@@ -8,13 +8,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "rum";
-  version = "1.3.14";
+  version = "1.3.15";
 
   src = fetchFromGitHub {
     owner = "postgrespro";
     repo = "rum";
     tag = finalAttrs.version;
-    hash = "sha256-VsfpxQqRBu9bIAP+TfMRXd+B3hSjuhU2NsutocNiCt8=";
+    hash = "sha256-iOx7u0JURBUUFerRlg3DuidFeBmGFOXz8mu20mQeopo=";
   };
 
   makeFlags = [ "USE_PGXS=1" ];
@@ -29,11 +29,6 @@ postgresqlBuildExtension (finalAttrs: {
   };
 
   meta = {
-    # PostgreSQL 18 support issue upstream: https://github.com/postgrespro/rum/issues/156
-    # Check after next package update.
-    broken = lib.warnIf (finalAttrs.version != "1.3.14") "Is postgresql18Packages.rum still broken?" (
-      lib.versionAtLeast postgresql.version "18"
-    );
     description = "Full text search index method for PostgreSQL";
     homepage = "https://github.com/postgrespro/rum";
     license = lib.licenses.postgresql;

From 72b60a91f1a03ba2ddc1b77d8573c906ebe5b0e0 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sun, 26 Oct 2025 10:54:33 +0200
Subject: [PATCH 2968/6226] aliases: remove outdated and header comments

These header comments won't be useful anymore with keep-sorted sorting,
while the comment about nixops is just outdated.
---
 pkgs/top-level/aliases.nix | 59 --------------------------------------
 1 file changed, 59 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 146ab3252589..062e87e4a848 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -368,7 +368,6 @@ mapAliases {
   # Added 2018-07-16 preserve, reason: forceSystem should not be used directly in Nixpkgs.
   forceSystem = system: _: (import self.path { localSystem = { inherit system; }; });
 
-  ### _ ###
   _0verkill = throw "'_0verkill' has been removed due to lack of maintenance"; # Added 2025-08-27
   _1password = lib.warnOnInstantiate "_1password has been renamed to _1password-cli to better follow upstream name usage" _1password-cli; # Added 2024-10-24
   _2048-cli = throw "'_2048-cli' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07
@@ -377,9 +376,6 @@ mapAliases {
   _5etools = throw "'_5etools' has been removed, as upstream is in a questionable legal position and the build was broken."; # Added 2025-05-05
   "7z2hashcat" =
     throw "'7z2hashcat' has been renamed to '_7z2hashcat' as the former isn't a valid variable name."; # Added 2024-11-27
-
-  ### A ###
-
   AusweisApp2 = ausweisapp; # Added 2023-11-08
   a4term = a4; # Added 2023-10-06
   abseil-cpp_202301 = throw "abseil-cpp_202301 has been removed as it was unused in tree"; # Added 2025-08-09
@@ -507,9 +503,6 @@ mapAliases {
   awf = throw "'awf' has been removed as the upstream project was archived in 2021"; # Added 2025-10-03
   aws-env = throw "aws-env has been removed as the upstream project was unmaintained"; # Added 2024-06-11
   aws-google-auth = throw "aws-google-auth has been removed as the upstream project was unmaintained"; # Added 2024-07-31
-
-  ### B ###
-
   backlight-auto = throw "'backlight-auto' has been removed as it relies on Zig 0.12 which has been dropped."; # Added 2025-08-22
   badtouch = authoscope; # Project was renamed, added 20210626
   badwolf = throw "'badwolf' has been removed due to being unmaintained"; # Added 2025-04-15
@@ -598,8 +591,6 @@ mapAliases {
 
   bzrtp = throw "'bzrtp' has been moved to 'linphonePackages.bzrtp'"; # Added 2025-09-20
 
-  ### C ###
-
   caffeWithCuda = throw "caffeWithCuda has been removed, as it was broken and required CUDA 10"; # Added 2024-11-20
   calcium = throw "'calcium' has been removed as it has been merged into 'flint3'"; # Added 2025-03-28
   calculix = calculix-ccx; # Added 2024-12-18
@@ -747,8 +738,6 @@ mapAliases {
   cligh = throw "'cligh' has been removed since it was unmaintained and its upstream deleted"; # Added 2025-05-05
   cq-editor = throw "cq-editor has been removed, as it use a dependency that was disabled since python 3.8 and was last updated in 2021"; # Added 2024-05-13
 
-  ### D ###
-
   dale = throw "dale has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
   dap = throw "'dap' has been removed because it doesn't compile and has been unmaintained since 2014"; # Added 2025-05-10
   daq = throw "'daq' has been removed as it is unmaintained and broken. Snort2 has also been removed, which depended on this"; # Added 2025-05-21
@@ -823,8 +812,6 @@ mapAliases {
   dwfv = throw "'dwfv' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   dylibbundler = throw "'dylibbundler' has been renamed to/replaced by 'macdylibbundler'"; # Converted to throw 2024-10-17
 
-  ### E ###
-
   EBTKS = ebtks; # Added 2024-01-21
   eask = eask-cli; # Added 2024-09-05
   easyloggingpp = throw "easyloggingpp has been removed, as it is deprecated upstream and does not build with CMake 4"; # Added 2025-09-17
@@ -849,7 +836,6 @@ mapAliases {
 
   elixir_ls = elixir-ls; # Added 2023-03-20
 
-  # Emacs
   emacs28 = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
   emacs28-gtk2 = throw "emacs28-gtk2 was removed because GTK2 is EOL; migrate to emacs28{,-gtk3,-nox} or to more recent versions of Emacs."; # Added 2024-09-20
   emacs28-gtk3 = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
@@ -904,8 +890,6 @@ mapAliases {
   ethabi = throw "ethabi has been removed due to lack of maintainence upstream and no updates in Nixpkgs"; # Added 2024-07-16
   eww-wayland = lib.warnOnInstantiate "eww now can build for X11 and wayland simultaneously, so `eww-wayland` is deprecated, use the normal `eww` package instead." eww; # Added 2024-02-17
 
-  ### F ###
-
   f3d_egl = lib.warnOnInstantiate "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # added 2025-07-18
   factor-lang-scope = throw "'factor-lang-scope' has been renamed to 'factorPackages'"; # added 2024-11-28
   fahcontrol = throw "fahcontrol has been removed because the download is no longer available"; # added 2024-09-24
@@ -990,8 +974,6 @@ mapAliases {
   fcitx5-unikey = qt6Packages.fcitx5-unikey; # Added 2024-03-01
   fcitx5-with-addons = qt6Packages.fcitx5-with-addons; # Added 2024-03-01
 
-  ### G ###
-
   g4music = gapless; # Added 2024-07-26
   g4py = throw "'g4py' has been renamed to/replaced by 'python3Packages.geant4'"; # Converted to throw 2024-10-17
   gamecube-tools = throw "gamecube-tools was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
@@ -1191,7 +1173,6 @@ mapAliases {
   guile-sdl = throw "guile-sdl has been removed, as it was broken"; # Added 2025-08-25
   gutenprintBin = gutenprint-bin; # Added 2025-08-21
   gxneur = throw "'gxneur' has been removed due to lack of maintenance and reliance on gnome2 and 2to3."; # Added 2025-08-17
-  ### H ###
 
   hacksaw = throw "'hacksaw' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   hacpack = throw "hacpack has been removed from nixpkgs, as it has been taken down upstream"; # added 2025-09-26
@@ -1222,8 +1203,6 @@ mapAliases {
   hyprswitch = throw "hyprswitch has been renamed to hyprshell"; # Added 2025-06-01
   hyprwall = throw "hyprwall has been removed as the repository is deleted"; # Added 2024-12-27
 
-  ### I ###
-
   i3-gaps = i3; # Added 2023-01-03
   i3nator = throw "'i3nator' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   ibniz = throw "ibniz has been removed because it fails to compile and the source url is dead"; # Added 2025-04-07
@@ -1263,8 +1242,6 @@ mapAliases {
   iv = throw "iv has been removed as it was no longer required for neuron and broken"; # Added 2025-04-18
   ix = throw "ix has been removed from Nixpkgs, as the ix.io pastebin has been offline since Dec. 2023"; # Added 2025-04-11
 
-  ### J ###
-
   jack2Full = throw "'jack2Full' has been renamed to/replaced by 'jack2'"; # Converted to throw 2024-10-17
   jack_rack = throw "'jack_rack' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
   jami-client-qt = jami-client; # Added 2022-11-06
@@ -1278,13 +1255,10 @@ mapAliases {
   jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2024-08-07
   jscoverage = throw "jscoverage has been removed, as it was broken"; # Added 2025-08-25
 
-  # Julia
   julia_16-bin = throw "'julia_16-bin' has been removed from nixpkgs as it has reached end of life"; # Added 2024-10-08
 
   jush = throw "jush has been removed from nixpkgs because it is unmaintained"; # Added 2024-05-28
 
-  ### K ###
-
   k2pdfopt = throw "'k2pdfopt' has been removed from nixpkgs as it was broken"; # Added 2025-09-27
   k3s_1_26 = throw "'k3s_1_26' has been removed from nixpkgs as it has reached end of life"; # Added 2024-05-20
   k3s_1_27 = throw "'k3s_1_27' has been removed from nixpkgs as it has reached end of life on 2024-06-28"; # Added 2024-06-01
@@ -1332,8 +1306,6 @@ mapAliases {
   kubei = kubeclarity; # Added 2023-05-20
   kubo-migrator-all-fs-repo-migrations = kubo-fs-repo-migrations; # Added 2024-09-24
 
-  ### L ###
-
   l3afpad = throw "'l3afpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-09-14
   languageMachines = {
     ticcutils = ticcutils;
@@ -1465,8 +1437,6 @@ mapAliases {
   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
   llama = walk; # Added 2023-01-23
   lincity_ng = lib.warnOnInstantiate "lincity_ng has been renamed to lincity-ng" lincity-ng; # Added 2025-10-09
-
-  # Linux kernels
   linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;
   linux-rt_5_15 = linuxKernel.kernels.linux_rt_5_15;
   linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4;
@@ -1681,8 +1651,6 @@ mapAliases {
   lzma = throw "'lzma' has been renamed to/replaced by 'xz'"; # Converted to throw 2024-10-17
   lzwolf = throw "'lzwolf' has been removed because it's no longer maintained upstream. Consider using 'ecwolf'"; # Added 2025-03-02
 
-  ### M ###
-
   ma1sd = throw "ma1sd was dropped as it is unmaintained"; # Added 2024-07-10
   mac = monkeysAudio; # Added 2024-11-30
   MACS2 = macs2; # Added 2023-06-12
@@ -1832,8 +1800,6 @@ mapAliases {
   mysql = throw "'mysql' has been renamed to/replaced by 'mariadb'"; # Converted to throw 2024-10-17
   mesa_drivers = throw "'mesa_drivers' has been removed, use 'pkgs.mesa' instead."; # Converted to throw 2024-07-11
 
-  ### N ###
-
   n98-magerun = throw "n98-magerun doesn't support new PHP newer than 8.1"; # Added 2025-10-03
   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
@@ -1934,8 +1900,6 @@ mapAliases {
     else
       nixfmt;
 
-  # When the nixops_unstable alias is removed, nixops_unstable_minimal can be renamed to nixops_unstable.
-
   nixosTest = testers.nixosTest; # Added 2022-05-05
   nm-tray = throw "'nm-tray' has been removed, as it only works with Plasma 5"; # Added 2025-08-30
   nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17
@@ -1962,8 +1926,6 @@ mapAliases {
   nvidia-podman = throw "podman should use the Container Device Interface (CDI) instead. See https://web.archive.org/web/20240729183805/https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/install-guide.html#configuring-podman"; # Added 2024-08-02
   nvidia-thrust = throw "nvidia-thrust has been removed because the project was deprecated. Use cudaPackages.cuda_cccl"; # Added 2023-12-04
 
-  ### O ###
-
   o = orbiton; # Added 2023-04-09
   oathToolkit = oath-toolkit; # Added 2022-04-04
   oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17
@@ -2066,8 +2028,6 @@ mapAliases {
   ''; # Added 2025-03-15;
   oysttyer = throw "oysttyer has been removed; it is no longer maintained because of Twitter disabling free API access"; # Added 2024-09-23
 
-  ### P ###
-
   pax-rs = throw "'pax-rs' has been removed because upstream has disappeared"; # Added 2025-01-25
   PageEdit = pageedit; # Added 2024-01-21
   passky-desktop = throw "passky-desktop has been removed, as it was unmaintained and blocking the Electron 29 removal."; # Added 2025-02-24
@@ -2277,8 +2237,6 @@ mapAliases {
   pythonPackages = python.pkgs; # Added 2022-01-11
   pypy39 = throw "pypy 3.9 has been removed, use pypy 3.10 instead"; # Added 2025-01-03
 
-  ### Q ###
-
   qbittorrent-qt5 = throw "'qbittorrent-qt5' has been removed as qBittorrent 5 dropped support for Qt 5. Please use 'qbittorrent'"; # Added 2024-09-30
   qcachegrind = throw "'qcachegrind' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
   qflipper = qFlipper; # Added 2022-02-11
@@ -2311,8 +2269,6 @@ mapAliases {
   qv2ray = throw "'qv2ray' has been removed as it was unmaintained"; # Added 2025-06-03
   qxw = throw "'qxw' has been removed due to lack of maintenance upstream. Consider using 'crosswords' instead"; # Added 2024-10-19
 
-  ### R ###
-
   rabbitmq-java-client = throw "rabbitmq-java-client has been removed due to its dependency on Python2 and a lack of maintenance within the nixpkgs tree"; # Added 2025-03-29
   rabbitvcs = throw "rabbitvcs has been removed from nixpkgs, because it was broken"; # Added 2024-07-15
   racket_7_9 = throw "Racket 7.9 has been removed because it is insecure. Consider using 'racket' instead."; # Added 2024-12-06
@@ -2384,8 +2340,6 @@ mapAliases {
   rtlwifi_new-firmware = throw "'rtlwifi_new-firmware' has been renamed to/replaced by 'rtw88-firmware'"; # Converted to throw 2024-10-17
   rtw88-firmware = throw "rtw88-firmware has been removed because linux-firmware now contains it."; # Added 2024-06-28
 
-  ### S ###
-
   SDL_classic = SDL1; # Added 2024-09-03
   SDL1 = throw "'SDL1' has been removed as development ended long ago with SDL 2.0 replacing it, use SDL_compat instead"; # Added 2025-03-27
   SDL_gpu = throw "'SDL_gpu' has been removed due to lack of upstream maintenance and known users"; # Added 2025-03-15
@@ -2561,8 +2515,6 @@ mapAliases {
   syncthing-tray = throw "syncthing-tray has been removed because it is broken and unmaintained"; # Added 2025-05-18
   syndicate_utils = throw "'syndicate_utils' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
 
-  ### T ###
-
   t1lib = throw "'t1lib' has been removed as it was broken and unmaintained upstream."; # Added 2025-06-11
   tabula = throw "tabula has been removed from nixpkgs, as it was broken"; # Added 2024-07-15
   tailor = throw "'tailor' has been removed from nixpkgs, as it was unmaintained upstream."; # Added 2024-11-02
@@ -2686,8 +2638,6 @@ mapAliases {
   typst-lsp = throw "'typst-lsp' has been removed due to lack of upstream maintenance, consider using 'tinymist' instead"; # Added 2025-01-25
   typst-preview = throw "The features of 'typst-preview' have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07
 
-  ### U ###
-
   uade123 = uade; # Added 2022-07-30
   uae = throw "'uae' has been removed due to lack of upstream maintenance. Consider using 'fsuae' instead."; # Added 2025-06-11
   uberwriter = throw "'uberwriter' has been renamed to/replaced by 'apostrophe'"; # Converted to throw 2024-10-17
@@ -2722,8 +2672,6 @@ mapAliases {
   util-linuxCurses = util-linux; # Added 2022-04-12
   utillinux = util-linux; # Added 2020-11-24, keep until node2nix is phased out, see https://github.com/NixOS/nixpkgs/issues/229475
 
-  ### V ###
-
   v8 = throw "`v8` has been removed as it's unmaintained for several years and has vulnerabilites. Please migrate to `nodejs.libv8`"; # Added 2024-12-21
   validphys2 = throw "validphys2 has been removed, since it has a broken dependency that was removed"; # Added 2024-08-21
   vamp = {
@@ -2777,7 +2725,6 @@ mapAliases {
   vuze = throw "'vuze' was removed because it is unmaintained upstream and insecure (CVE-2018-13417). BiglyBT is a maintained fork."; # Added 2024-11-22
   vwm = throw "'vwm' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
 
-  ### W ###
   w_scan = throw "'w_scan' has been removed due to lack of upstream maintenance"; # Added 2025-08-29
   waitron = throw "'waitron' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   wakatime = wakatime-cli; # 2024-05-30
@@ -2828,8 +2775,6 @@ mapAliases {
   write_stylus = styluslabs-write-bin; # Added 2024-10-09
   wxGTK33 = wxwidgets_3_3; # Added 2025-07-20
 
-  ### X ###
-
   x11idle = throw "'x11idle' has been removed as the upstream is no longer available. Please see 'xprintidle' as an alternative"; # Added 2025-03-10
   x509-limbo = throw "'x509-limbo' has been removed from nixpkgs"; # Added 2024-10-22
   xarchive = throw "'xarchive' has been removed due to lack of maintenance upstream. Consider using 'file-roller' instead"; # Added 2024-10-19
@@ -2872,8 +2817,6 @@ mapAliases {
   xwaylandvideobridge = makePlasma5Throw "xwaylandvideobridge"; # Added 2024-09-27
   xxv = throw "'xxv' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
 
-  ### Y ###
-
   yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2024-10-17
   yaml-cpp_0_3 = throw "yaml-cpp_0_3 has been removed, as it was unused"; # Added 2025-09-16
   yesplaymusic = throw "YesPlayMusic has been removed as it was broken, unmaintained, and used deprecated Node and Electron versions"; # Added 2024-12-13
@@ -2895,8 +2838,6 @@ mapAliases {
   yuzu-mainline = throw "yuzu-mainline has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
   yuzuPackages = throw "yuzuPackages has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
 
-  ### Z ###
-
   z3_4_11 = throw "'z3_4_11' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
   z3_4_12 = throw "'z3_4_12' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
   z3_4_13 = throw "'z3_4_13' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18

From 1e6cb6baab7439565184df2237740bca4be964a5 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sun, 26 Oct 2025 11:16:36 +0200
Subject: [PATCH 2969/6226] aliases: remove unsorted section and move preserve
 to the top

---
 pkgs/top-level/aliases.nix | 98 +++++++++++++++++---------------------
 1 file changed, 43 insertions(+), 55 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 062e87e4a848..84b10dbb7e39 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -365,8 +365,28 @@ let
 in
 
 mapAliases {
-  # Added 2018-07-16 preserve, reason: forceSystem should not be used directly in Nixpkgs.
-  forceSystem = system: _: (import self.path { localSystem = { inherit system; }; });
+  forceSystem = system: _: (import self.path { localSystem = { inherit system; }; }); # Added 2018-07-16 preserve, reason: forceSystem should not be used directly in Nixpkgs.
+
+  # TODO: Remove from Nixpkgs and eventually turn into throws.
+  system = stdenv.hostPlatform.system; # Added 2021-10-22
+  buildPlatform = stdenv.buildPlatform; # Added 2023-01-09
+  hostPlatform = stdenv.hostPlatform; # Added 2023-01-09
+  targetPlatform = stdenv.targetPlatform; # Added 2023-01-09
+
+  # LLVM packages for (integration) testing that should not be used inside Nixpkgs:
+  llvmPackages_latest = llvmPackages_21;
+  llvmPackages_git = (callPackages ../development/compilers/llvm { }).git;
+  # these are for convenience, not for backward compat., and shouldn't expire until the package is deprecated.
+  clang18Stdenv = lowPrio llvmPackages_18.stdenv;
+  clang19Stdenv = lowPrio llvmPackages_19.stdenv;
+
+  # Various to preserve
+  autoReconfHook = throw "You meant 'autoreconfHook', with a lowercase 'r'."; # preserve, reason: common typo
+  elasticsearch7Plugins = elasticsearchPlugins; # preserve, reason: until v8
+  fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve, reason: common typo
+  fuse2fs = if stdenv.hostPlatform.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too.
+  wlroots = wlroots_0_19; # preserve, reason: wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release
+  wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name
 
   _0verkill = throw "'_0verkill' has been removed due to lack of maintenance"; # Added 2025-08-27
   _1password = lib.warnOnInstantiate "_1password has been renamed to _1password-cli to better follow upstream name usage" _1password-cli; # Added 2024-10-24
@@ -490,7 +510,6 @@ mapAliases {
   autoconf264 = throw "'autoconf264' has been removed in favor of 'autoconf'"; # Added 2025-07-21
   automake111x = throw "'automake111x' has been removed in favor of 'automake'"; # Added 2025-07-21
   autopanosiftc = throw "'autopanosiftc' has been removed, as it is unmaintained upstream"; # Added 2025-10-07
-  autoReconfHook = throw "You meant 'autoreconfHook', with a lowercase 'r'."; # preserve, reason: common typo
   autoreconfHook264 = throw "'autoreconfHook264' has been removed in favor of 'autoreconfHook'"; # Added 2025-07-21
   aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14
   authy = throw "'authy' has been removed since it reached end of life"; # Added 2024-04-19
@@ -728,10 +747,6 @@ mapAliases {
   cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17
   cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09
 
-  # these are for convenience, not for backward compat., and shouldn't expire until the package is deprecated.
-  clang18Stdenv = lowPrio llvmPackages_18.stdenv; # preserve, reason: see above
-  clang19Stdenv = lowPrio llvmPackages_19.stdenv; # preserve, reason: see above
-
   clang-tools_18 = llvmPackages_18.clang-tools; # Added 2024-04-22
   clang-tools_19 = llvmPackages_19.clang-tools; # Added 2024-08-21
 
@@ -828,7 +843,6 @@ mapAliases {
   edid-decode = v4l-utils; # Added 2025-06-20
   eidolon = throw "eidolon was removed as it is unmaintained upstream."; # Added 2025-05-28
   eintopf = lauti; # Project was renamed, added 2025-05-01
-  elasticsearch7Plugins = elasticsearchPlugins; # preserve, reason: until v8
   electronplayer = throw "'electronplayer' has been removed as it had been discontinued upstream since October 2024"; # Added 2024-12-17
   elm-github-install = throw "'elm-github-install' has been removed as it is abandoned upstream and only supports Elm 0.18.0"; # Added 2025-08-25
   element-desktop-wayland = throw "element-desktop-wayland has been removed. Consider setting NIXOS_OZONE_WL=1 via 'environment.sessionVariables' instead"; # Added 2024-12-17
@@ -904,7 +918,6 @@ mapAliases {
   inherit (luaPackages) fennel; # Added 2022-09-24
   ferdi = throw "'ferdi' has been removed, upstream does not exist anymore and the package is insecure"; # Added 2024-08-22
   fetchbower = throw "fetchbower has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
-  fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve, reason: common typo
   ffmpeg_5 = throw "ffmpeg_5 has been removed, please use another version"; # Added 2024-07-12
   ffmpeg_5-headless = throw "ffmpeg_5-headless has been removed, please use another version"; # Added 2024-07-12
   ffmpeg_5-full = throw "ffmpeg_5-full has been removed, please use another version"; # Added 2024-07-12
@@ -955,6 +968,7 @@ mapAliases {
   fractal-next = fractal; # added 2023-11-25
   framework-system-tools = framework-tool; # added 2023-12-09
   francis = kdePackages.francis; # added 2024-07-13
+  freebsdCross = freebsd; # Added 2024-09-06
   freecad-qt6 = freecad; # added 2025-06-14
   freecad-wayland = freecad; # added 2025-06-14
   freeimage = throw "freeimage was removed due to numerous vulnerabilities"; # Added 2025-10-23
@@ -962,7 +976,6 @@ mapAliases {
   freerdpUnstable = freerdp; # added 2025-03-25
   frostwire = throw "frostwire was removed, as it was broken due to reproducibility issues, use `frostwire-bin` package instead."; # added 2024-05-17
   ftjam = throw "ftjam was removed, as it hasn't been updated since 2007 and fails to build"; # added 2025-01-02
-  fuse2fs = if stdenv.hostPlatform.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too.
   fuse-common = throw "fuse-common was removed, because the udev rule was early included by systemd-udevd and the config is done by NixOS module `programs.fuse`"; # added 2024-09-29
   fusee-launcher = throw "'fusee-launcher' was removed as upstream removed the original source repository fearing legal repercussions"; # added 2025-07-05
   futuresql = libsForQt5.futuresql; # added 2023-11-11
@@ -1275,6 +1288,7 @@ mapAliases {
   kanidm_1_3 = throw "'kanidm_1_3' has been removed as it has reached end of life"; # Added 2025-03-10
   kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18
   kanidmWithSecretProvisioning_1_4 = throw "'kanidmWithSecretProvisioning_1_4' has been removed as it has reached end of life"; # Added 2025-06-18
+  kalendar = merkuro; # Added 2023-08-24
   kbibtex = throw "'kbibtex' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
   kcli = throw "kcli has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
   kdbplus = throw "'kdbplus' has been removed from nixpkgs"; # Added 2024-05-06
@@ -1285,6 +1299,7 @@ mapAliases {
   kexi = makePlasma5Throw "kexi";
   keyfinger = throw "keyfinder has been removed as it was abandoned upstream and did not build; consider using mixxx or keyfinder-cli"; # Addd 2024-08-25
   keysmith = throw "'keysmith' has been renamed to/replaced by 'libsForQt5.kdeGear.keysmith'"; # Converted to throw 2024-10-17
+  kfloppy = throw "kfloppy has been removed upstream in KDE Gear 23.08"; # Added 2023-08-24
   kgx = gnome-console; # Added 2022-02-19
   khoj = throw "khoj has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
   kibana7 = throw "Kibana 7.x has been removed from nixpkgs as it depends on an end of life Node.js version and received no maintenance in time."; # Added 2023-10-30
@@ -1540,8 +1555,6 @@ mapAliases {
 
   lizardfs = throw "lizardfs has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
 
-  llvmPackages_git = (callPackages ../development/compilers/llvm { }).git; # Added 2024-08-02
-
   llvmPackages_9 = throw "llvmPackages_9 has been removed from nixpkgs"; # Added 2024-04-08
   llvm_9 = throw "llvm_9 has been removed from nixpkgs"; # Added 2024-04-08
   lld_9 = throw "lld_9 has been removed from nixpkgs"; # Added 2024-04-08
@@ -1813,6 +1826,7 @@ mapAliases {
   netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22
   netbox_3_7 = throw "netbox 3.7 series has been removed as it was EOL"; # Added 2025-04-23
   netbox_4_1 = throw "netbox 4.1 series has been removed as it was EOL"; # Added 2025-10-14
+  netbsdCross = netbsd; # Added 2024-09-06
   netsurf = recurseIntoAttrs {
     browser = lib.warnOnInstantiate "'netsurf.browser' has been renamed to 'netsurf-browser'" netsurf-browser; # Added 2025-03-26
     buildsystem = lib.warnOnInstantiate "'netsurf.buildsystem' has been renamed to 'netsurf-buildsystem'" netsurf-buildsystem; # Added 2025-03-26
@@ -1944,6 +1958,7 @@ mapAliases {
   openai-whisper-cpp = whisper-cpp; # Added 2024-12-13
   openbabel2 = throw "openbabel2 has been removed, as it was unused and unmaintained upstream; please use openbabel"; # Added 2025-09-17
   openbabel3 = openbabel; # Added 2025-09-17
+  openbsdCross = openbsd; # Added 2024-09-06
   opencv2 = throw "opencv2 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20
   opencv3 = throw "opencv3 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20
   openafs_1_8 = openafs; # Added 2022-08-22
@@ -2077,6 +2092,21 @@ mapAliases {
   pidgin-msn-pecan = throw "'pidgin-msn-pecan' has been removed as it's unmaintained upstream and doesn't work with escargot"; # Added 2025-09-17
   pidgin-opensteamworks = throw "'pidgin-opensteamworks' has been removed as it is unmaintained and no longer works with Steam."; # Added 2025-09-17
   pidgin-skypeweb = throw "'pidgin-skypeweb' has been removed since Skype was shut down in May 2025"; # Added 2025-09-15
+  pidgin-indicator = pidginPackages.pidgin-indicator; # Added 2023-07-17
+  pidgin-latex = pidginPackages.pidgin-latex; # Added 2023-07-17
+  pidgin-carbons = pidginPackages.pidgin-carbons; # Added 2023-07-17
+  pidgin-xmpp-receipts = pidginPackages.pidgin-xmpp-receipts; # Added 2023-07-17
+  pidgin-otr = pidginPackages.pidgin-otr; # Added 2023-07-17
+  pidgin-osd = pidginPackages.pidgin-osd; # Added 2023-07-17
+  pidgin-sipe = pidginPackages.pidgin-sipe; # Added 2023-07-17
+  pidgin-window-merge = pidginPackages.pidgin-window-merge; # Added 2023-07-17
+  purple-discord = pidginPackages.purple-discord; # Added 2023-07-17
+  purple-googlechat = pidginPackages.purple-googlechat; # Added 2023-07-17
+  purple-lurch = pidginPackages.purple-lurch; # Added 2023-07-17
+  purple-mm-sms = pidginPackages.purple-mm-sms; # Added 2023-07-17
+  purple-plugin-pack = pidginPackages.purple-plugin-pack; # Added 2023-07-17
+  purple-slack = pidginPackages.purple-slack; # Added 2023-07-17
+  purple-xmpp-http-upload = pidginPackages.purple-xmpp-http-upload; # Added 2023-07-17
   pilipalax = throw "'pilipalax' has been removed from nixpkgs due to it not being maintained"; # Added 2025-07-25
   pio = throw "pio has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28
@@ -2539,6 +2569,7 @@ mapAliases {
   tclx = tclPackages.tclx; # Added 2024-10-02
   tcp-cutter = throw "tcp-cutter has been removed because it fails to compile and the source url is dead"; # Added 2025-05-25
   tdesktop = telegram-desktop; # Added 2023-04-07
+  tdlib-purple = pidginPackages.tdlib-purple; # Added 2023-07-17
   tdom = tclPackages.tdom; # Added 2024-10-02
   teamspeak_client = teamspeak3; # Added 2024-11-07
   teamspeak5_client = teamspeak6-client; # Added 2025-01-29
@@ -2758,7 +2789,6 @@ mapAliases {
   wireguard-vanity-address = throw "'wireguard-vanity-address' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
   wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17
   wlroots_0_16 = throw "'wlroots_0_16' has been removed in favor of newer versions"; # Added 2024-07-14
-  wlroots = wlroots_0_19; # preserve, reason: wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release
   woof = throw "'woof' has been removed as it is broken and unmaintained upstream"; # Added 2025-09-04
   wdomirror = throw "'wdomirror' has been removed as it is unmaintained upstream, Consider using 'wl-mirror' instead"; # Added 2025-09-04
   wordpress6_3 = throw "'wordpress6_3' has been removed in favor of the latest version"; # Added 2024-08-03
@@ -2767,7 +2797,6 @@ mapAliases {
   wordpress_6_5 = throw "'wordpress_6_5' has been removed in favor of the latest version"; # Added 2024-11-11
   wordpress_6_6 = throw "'wordpress_6_6' has been removed in favor of the latest version"; # Added 2024-11-17
   worldengine-cli = throw "'worldengine-cli' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
-  wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name
   wpa_supplicant_ro_ssids = lib.warnOnInstantiate "Deprecated package: Please use wpa_supplicant instead. Read-only SSID patches are now upstream!" wpa_supplicant;
   wrapLisp_old = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
   wmii_hg = wmii; # Added 2022-04-26
@@ -2883,46 +2912,5 @@ mapAliases {
   }); # Added 2023-02-06
   zyn-fusion = zynaddsubfx; # Added 2022-08-05
   zz = throw "'zz' has been removed because it was archived in 2022 and had no maintainer"; # added 2024-05-10
-
-  ### UNSORTED ###
-
-  inherit (stdenv.hostPlatform) system; # Added 2021-10-22
-  inherit (stdenv) buildPlatform hostPlatform targetPlatform; # Added 2023-01-09
-
-  freebsdCross = freebsd; # Added 2024-09-06
-  netbsdCross = netbsd; # Added 2024-09-06
-  openbsdCross = openbsd; # Added 2024-09-06
-
-  # LLVM packages for (integration) testing that should not be used inside Nixpkgs:
-  llvmPackages_latest = llvmPackages_21;
-
-  /*
-    If these are in the scope of all-packages.nix, they cause collisions
-      between mixed versions of qt. See:
-    https://github.com/NixOS/nixpkgs/pull/101369
-  */
-
-  kalendar = merkuro; # Renamed in 23.08
-  kfloppy = throw "kfloppy has been removed upstream in KDE Gear 23.08"; # Added 2023-08-24
-
-  inherit (pidginPackages)
-    pidgin-indicator
-    pidgin-latex
-    pidgin-carbons
-    pidgin-xmpp-receipts
-    pidgin-otr
-    pidgin-osd
-    pidgin-sipe
-    pidgin-window-merge
-    purple-discord
-    purple-googlechat
-    purple-lurch
-    purple-mm-sms
-    purple-plugin-pack
-    purple-slack
-    purple-xmpp-http-upload
-    tdlib-purple
-    ;
-
 }
 // plasma5Throws

From 76450e915519dcd4036edb015b689e88118ac2f9 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sun, 26 Oct 2025 11:16:50 +0200
Subject: [PATCH 2970/6226] aliases: remove inherit

---
 pkgs/top-level/aliases.nix | 30 ++++++++++++------------------
 1 file changed, 12 insertions(+), 18 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 84b10dbb7e39..3cddb5ccb555 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -543,7 +543,7 @@ mapAliases {
   BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12
   beam_nox = throw "beam_nox has been removed in favor of beam_minimal or beamMinimalPackages"; # Added 2025-04-01
   beatsabermodmanager = throw "'beatsabermodmanager' has been removed due to lack of upstream maintainenance. Consider using 'bs-manager' instead"; # Added 2025-03-18
-  inherit (beetsPackages) beets-unstable;
+  beets-unstable = beetsPackages.beets-unstable; # Added 2025-09-24
   belcard = throw "'belcard' has been moved to 'linphonePackages.belcard'"; # Added 2025-09-20
   belle-sip = throw "'belle-sip' has been moved to 'linphonePackages.belle-sip'"; # Added 2025-09-20
   belr = throw "'belr' has been moved to 'linphonePackages.belr'"; # Added 2025-09-20
@@ -915,7 +915,7 @@ mapAliases {
   fbjni = throw "fbjni has been removed, as it was broken"; # Added 2025-08-25
   fcitx5-catppuccin = catppuccin-fcitx5; # Added 2024-06-19
   fdr = throw "fdr has been removed, as it cannot be built from source and depends on Python 2.x"; # Added 2025-03-19
-  inherit (luaPackages) fennel; # Added 2022-09-24
+  fennel = luaPackages.fennel; # Added 2022-09-24
   ferdi = throw "'ferdi' has been removed, upstream does not exist anymore and the package is insecure"; # Added 2024-08-22
   fetchbower = throw "fetchbower has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
   ffmpeg_5 = throw "ffmpeg_5 has been removed, please use another version"; # Added 2024-07-12
@@ -1075,15 +1075,13 @@ mapAliases {
   git-credential-1password = throw "'git-credential-1password' has been removed, as the upstream project is deleted."; # Added 2024-05-20
   git-stree = throw "'git-stree' has been deprecated by upstream. Upstream recommends using 'git-subrepo' as a replacement."; # Added 2025-05-05
 
-  gitAndTools = self // {
-    darcsToGit = darcs-to-git; # Added 2021-01-14
-    gitAnnex = git-annex; # Added 2021-01-14
-    gitBrunch = git-brunch; # Added 2021-01-14
-    gitFastExport = git-fast-export; # Added 2021-01-14
-    gitRemoteGcrypt = git-remote-gcrypt; # Added 2021-01-14
-    svn_all_fast_export = svn-all-fast-export; # Added 2021-01-14
-    topGit = top-git; # Added 2021-01-14
-  };
+  gitAndTools.darcsToGit = darcs-to-git; # Added 2021-01-14
+  gitAndTools.gitAnnex = git-annex; # Added 2021-01-14
+  gitAndTools.gitBrunch = git-brunch; # Added 2021-01-14
+  gitAndTools.gitFastExport = git-fast-export; # Added 2021-01-14
+  gitAndTools.gitRemoteGcrypt = git-remote-gcrypt; # Added 2021-01-14
+  gitAndTools.svn_all_fast_export = svn-all-fast-export; # Added 2021-01-14
+  gitAndTools.topGit = top-git; # Added 2021-01-14
   gitversion = throw "'gitversion' has been removed because it produced a broken build and was unmaintained"; # Added 2025-08-30
   givaro_3 = throw "'givaro_3' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07
   givaro_3_7 = throw "'givaro_3_7' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07
@@ -2049,7 +2047,7 @@ mapAliases {
   p2pvc = throw "p2pvc has been removed as it is unmaintained upstream and depends on OpenCV 2"; # Added 2024-08-20
   packet-cli = throw "'packet-cli' has been renamed to/replaced by 'metal-cli'"; # Converted to throw 2024-10-17
   paco = throw "'paco' has been removed as it has been abandoned"; # Added 2025-04-30
-  inherit (perlPackages) pacup;
+  pacup = perlPackages.pacup; # Added 2025-01-21
   pal = throw "pal has been removed, as it was broken"; # Added 2025-08-25
   panopticon = throw "'panopticon' has been removed because it is unmaintained upstream"; # Added 2025-01-25
   paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14
@@ -2111,12 +2109,8 @@ mapAliases {
   pio = throw "pio has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28
   pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead."; # Added 2023-03-09
-  platformioPackages = {
-    inherit
-      platformio-core
-      platformio-chrootenv
-      ;
-  }; # Added 2025-09-04
+  platformioPackages.platformio-core = platformio-core; # Added 2025-09-04
+  platformioPackages.platformio-chrootenv = platformio-chrootenv; # Added 2025-09-04
   platypus = throw "platypus is unmaintained and has not merged Python3 support"; # Added 2025-03-20
   pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17
   plex-media-player = throw "'plex-media-player' has been discontinued, the new official client is available as 'plex-desktop'"; # Added 2025-05-28

From a5420fe470ea088098fd9fbe223f3e31006dc14f Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sun, 26 Oct 2025 13:24:32 +0200
Subject: [PATCH 2971/6226] aliases: convert '' to " in throws

---
 pkgs/top-level/aliases.nix | 72 +++++++++++++++++++-------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3cddb5ccb555..f4e758601817 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1065,12 +1065,12 @@ mapAliases {
   gnupg22 = throw "'gnupg22' is end-of-life. Consider using 'gnupg24' instead"; # Added 2025-01-05
   go_1_22 = throw "Go 1.22 is end-of-life and 'go_1_22' has been removed. Please use a newer Go toolchain."; # Added 2024-03-28
   go_1_23 = throw "Go 1.23 is end-of-life and 'go_1_23' has been removed. Please use a newer Go toolchain."; # Added 2025-08-13
-  gogs = throw ''
+  gogs = throw "
     Gogs development has stalled. Also, it has several unpatched, critical vulnerabilities that
     weren't addressed within a year: https://github.com/gogs/gogs/issues/7777
 
     Consider migrating to forgejo or gitea.
-  ''; # Added 2024-10-12
+  "; # Added 2024-10-12
   git-backup = throw "git-backup has been removed, as it has been abandoned upstream. Consider using git-backup-go instead."; # Added 2024-07-16
   git-credential-1password = throw "'git-credential-1password' has been removed, as the upstream project is deleted."; # Added 2024-05-20
   git-stree = throw "'git-stree' has been deprecated by upstream. Upstream recommends using 'git-subrepo' as a replacement."; # Added 2025-05-05
@@ -1511,7 +1511,7 @@ mapAliases {
   linux_6_13_hardened = linuxKernel.kernels.linux_6_13_hardened; # Added 2021-08-16
   linuxPackages_6_14_hardened = linuxKernel.packages.linux_6_14_hardened; # Added 2021-08-16
   linux_6_14_hardened = linuxKernel.kernels.linux_6_14_hardened; # Added 2021-08-16
-  linuxPackages_latest_hardened = throw ''
+  linuxPackages_latest_hardened = throw "
     The attribute `linuxPackages_hardened_latest' was dropped because the hardened patches
     frequently lag behind the upstream kernel. In some cases this meant that this attribute
     had to refer to an older kernel[1] because the latest hardened kernel was EOL and
@@ -1521,7 +1521,7 @@ mapAliases {
     and use a versioned attribute, e.g. `linuxPackages_5_10_hardened'.
 
     [1] for more context: https://github.com/NixOS/nixpkgs/pull/133587
-  ''; # Added 2021-08-16
+  "; # Added 2021-08-16
   linux_latest_hardened = linuxPackages_latest_hardened; # Added 2021-08-16
 
   linuxPackages_hardened = linuxKernel.packages.linux_hardened; # Added 2025-08-10
@@ -1621,31 +1621,31 @@ mapAliases {
   luci-go = throw "luci-go has been removed since it was unused and failing to build for 5 months"; # Added 2025-08-27
   lumail = throw "'lumail' has been removed since its upstream is unavailable"; # Added 2025-05-07
   lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18
-  lxd = throw ''
+  lxd = throw "
     LXD has been removed from NixOS due to lack of Nixpkgs maintenance.
     Consider migrating or switching to Incus, or remove from your configuration.
     https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/
-  ''; # Added 2025-09-05
-  lxd-lts = throw ''
+  "; # Added 2025-09-05
+  lxd-lts = throw "
     LXD has been removed from NixOS due to lack of Nixpkgs maintenance.
     Consider migrating or switching to Incus, or remove from your configuration.
     https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/
-  ''; # Added 2025-09-05
-  lxd-ui = throw ''
+  "; # Added 2025-09-05
+  lxd-ui = throw "
     LXD has been removed from NixOS due to lack of Nixpkgs maintenance.
     Consider migrating or switching to Incus, or remove from your configuration.
     https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/
-  ''; # Added 2025-09-05
-  lxd-unwrapped = throw ''
+  "; # Added 2025-09-05
+  lxd-unwrapped = throw "
     LXD has been removed from NixOS due to lack of Nixpkgs maintenance.
     Consider migrating or switching to Incus, or remove from your configuration.
     https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/
-  ''; # Added 2025-09-05
-  lxd-unwrapped-lts = throw ''
+  "; # Added 2025-09-05
+  lxd-unwrapped-lts = throw "
     LXD has been removed from NixOS due to lack of Nixpkgs maintenance.
     Consider migrating or switching to Incus, or remove from your configuration.
     https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/
-  ''; # Added 2025-09-05
+  "; # Added 2025-09-05
 
   lxde = {
     gtk2-x11 = throw "'lxde.gtk2-x11' has been removed. Use 'gtk2-x11' directly."; # added 2025-08-31
@@ -1682,31 +1682,31 @@ mapAliases {
   manta = throw "manta does not support python3, and development has been abandoned upstream"; # Added 2025-03-17
   manticore = throw "manticore is no longer maintained since 2020, and doesn't build since smlnj-110.99.7.1"; # Added 2025-05-17
 
-  maple-mono-NF = throw ''
+  maple-mono-NF = throw "
     maple-mono-NF had been moved to maple-mono.NF.
     for installing all maple-mono:
       fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono)
-  ''; # Added 2025-03-16
-  maple-mono-otf = throw ''
+  "; # Added 2025-03-16
+  maple-mono-otf = throw "
     maple-mono-otf had been moved to maple-mono.opentype.
     for installing all maple-mono:
       fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono)
-  ''; # Added 2025-03-16
-  maple-mono-woff2 = throw ''
+  "; # Added 2025-03-16
+  maple-mono-woff2 = throw "
     maple-mono-woff2 had been moved to maple-mono.woff2.
     for installing all maple-mono:
       fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono)
-  ''; # Added 2025-03-16
-  maple-mono-SC-NF = throw ''
+  "; # Added 2025-03-16
+  maple-mono-SC-NF = throw "
     mono-SC-NF had been superseded by maple-mono.NF-CN.
     for installing all maple-mono:
       fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono)
-  ''; # Added 2025-03-16
-  maple-mono-autohint = throw ''
+  "; # Added 2025-03-16
+  maple-mono-autohint = throw "
     maple-mono-autohint had been moved to maple-mono.truetype-autohint.
     for installing all maple-mono:
       fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono)
-  ''; # Added 2025-03-16
+  "; # Added 2025-03-16
 
   mapmap = throw "'mapmap' has been removed as it has been unmaintained since 2021"; # Added 2025-05-17
   markets = throw "'markets' has been removed as it was archived upstream in 2023"; # Added 2025-04-17
@@ -1847,7 +1847,7 @@ mapAliases {
   newt-go = fosrl-newt; # Added 2025-06-24
   notes-up = throw "'notes-up' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
   notify-sharp = throw "'notify-sharp' has been removed as it was unmaintained and depends on deprecated dbus-sharp versions"; # Added 2025-08-25
-  nextcloud30 = throw ''
+  nextcloud30 = throw "
     Nextcloud v30 has been removed from `nixpkgs` as the support for is dropped
     by upstream in 2025-09. Please upgrade to at least Nextcloud v31 by declaring
 
@@ -1857,13 +1857,13 @@ mapAliases {
 
     WARNING: if you were on Nextcloud 29 you have to upgrade to Nextcloud 30
     first on 25.05 because Nextcloud doesn't support upgrades across multiple major versions!
-  ''; # Added 2025-09-25
+  "; # Added 2025-09-25
   nextcloud30Packages = throw "Nextcloud 30 is EOL!"; # Added 2025-09-25
   nextcloud-news-updater = throw "nextcloud-news-updater has been removed because the project is unmaintained"; # Added 2025-03-28
   nixForLinking = throw "nixForLinking has been removed, use `nixVersions.nixComponents_<version>` instead"; # Added 2025-08-14
   nagiosPluginsOfficial = monitoring-plugins; # Added 2017-08-07
   neochat = makePlasma5Throw "neochat"; # added 2022-05-10
-  nerdfonts = throw ''
+  nerdfonts = throw "
     nerdfonts has been separated into individual font packages under the namespace nerd-fonts.
     For example change:
       fonts.packages = [
@@ -1878,7 +1878,7 @@ mapAliases {
       ]
     or for all fonts
       fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts)
-  ''; # Added 2024-11-09
+  "; # Added 2024-11-09
   networkmanager_strongswan = networkmanager-strongswan; # added 2025-06-29
   newlibCross = newlib; # Added 2024-09-06
   newlib-nanoCross = newlib-nano; # Added 2024-09-06
@@ -2031,14 +2031,14 @@ mapAliases {
   overrideLibcxx = "overrideLibcxx has beeen removed, as it was no longer used and Darwin now uses libc++ from the latest SDK; see the Nixpkgs 25.11 release notes for details"; # Added 2025-09-15
   overrideSDK = "overrideSDK has been removed as it was a legacy compatibility stub. See <https://nixos.org/manual/nixpkgs/stable/#sec-darwin-legacy-frameworks-overrides> for migration instructions"; # Added 2025-08-04
   ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24
-  oxygen-icons5 = throw ''
+  oxygen-icons5 = throw "
     The top-level oxygen-icons5 alias has been removed.
 
     Please explicitly use kdePackages.oxygen-icons for the latest Qt 6-based version,
     or libsForQt5.oxygen-icons5 for the deprecated Qt 5 version.
 
     Note that Qt 5 versions of most KDE software will be removed in NixOS 25.11.
-  ''; # Added 2025-03-15;
+  "; # Added 2025-03-15;
   oysttyer = throw "oysttyer has been removed; it is no longer maintained because of Twitter disabling free API access"; # Added 2024-09-23
 
   pax-rs = throw "'pax-rs' has been removed because upstream has disappeared"; # Added 2025-01-25
@@ -2119,14 +2119,14 @@ mapAliases {
   pltScheme = racket; # Added 2013-02-24
   poac = cabinpkg; # Added 2025-01-22
   podofo010 = podofo_0_10; # Added 2025-06-01
-  polkit-kde-agent = throw ''
+  polkit-kde-agent = throw "
     The top-level polkit-kde-agent alias has been removed.
 
     Please explicitly use kdePackages.polkit-kde-agent-1 for the latest Qt 6-based version,
     or libsForQt5.polkit-kde-agent for the deprecated Qt 5 version.
 
     Note that Qt 5 versions of most KDE software will be removed in NixOS 25.11.
-  ''; # Added 2025-03-07
+  "; # Added 2025-03-07
   polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25
   poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03
   posix_man_pages = throw "'posix_man_pages' has been renamed to/replaced by 'man-pages-posix'"; # Converted to throw 2024-10-17
@@ -2379,11 +2379,11 @@ mapAliases {
   sane-backends-git = throw "'sane-backends-git' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2024-10-17
   samtools_0_1_19 = throw "'samtools_0_1_19' has been removed because it is unmaintained. Consider using 'samtools' instead"; # Added 2025-05-10
   scantailor = scantailor-advanced; # Added 2022-05-26
-  schildichat-web = throw ''
+  schildichat-web = throw "
     schildichat has been removed as it is severely lacking behind the Element upstream and does not receive regular security fixes.
     Please participate in upstream discussion on getting out new releases:
     https://github.com/SchildiChat/schildichat-desktop/issues/212
-    https://github.com/SchildiChat/schildichat-desktop/issues/215''; # Added 2023-12-05
+    https://github.com/SchildiChat/schildichat-desktop/issues/215"; # Added 2023-12-05
   schildichat-desktop = schildichat-web; # Added 2023-12-07
   schildichat-desktop-wayland = schildichat-web; # Added 2023-12-07
   scitoken-cpp = scitokens-cpp; # Added 2024-02-12
@@ -2761,12 +2761,12 @@ mapAliases {
   wavebox = throw "'wavebox' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-24
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_104;
   watershot = throw "'watershot' has been removed as it is unmaintained upstream and no longer works"; # Added 2025-06-01
-  wayfireApplications-unwrapped = throw ''
+  wayfireApplications-unwrapped = throw "
     'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire'
     'wayfireApplications-unwrapped.wayfirePlugins' has been renamed to/replaced by 'wayfirePlugins'
     'wayfireApplications-unwrapped.wcm' has been renamed to/replaced by 'wayfirePlugins.wcm'
     'wayfireApplications-unwrapped.wlroots' has been removed
-  ''; # Add 2023-07-29
+  "; # Add 2023-07-29
   waypoint = throw "waypoint has been removed from nixpkgs as the upstream project was archived"; # Added 2024-04-24
   wcurl = throw "'wcurl' has been removed due to being bundled with 'curl'"; # Added 2025-07-04
   webfontkitgenerator = webfont-bundler; # Added 2025-07-27

From 48ce0739044bd6eba83c3a43bd4ad1046399cdad Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sun, 26 Oct 2025 11:28:55 +0200
Subject: [PATCH 2972/6226] aliases: keep-sorted

---
 pkgs/top-level/aliases.nix | 1243 +++++++++++++++++-------------------
 1 file changed, 591 insertions(+), 652 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f4e758601817..068fa356eae7 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -388,47 +388,48 @@ mapAliases {
   wlroots = wlroots_0_19; # preserve, reason: wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release
   wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name
 
+  # keep-sorted start case=no numeric=yes block=yes
+
+  "7z2hashcat" =
+    throw "'7z2hashcat' has been renamed to '_7z2hashcat' as the former isn't a valid variable name."; # Added 2024-11-27
   _0verkill = throw "'_0verkill' has been removed due to lack of maintenance"; # Added 2025-08-27
   _1password = lib.warnOnInstantiate "_1password has been renamed to _1password-cli to better follow upstream name usage" _1password-cli; # Added 2024-10-24
+  _5etools = throw "'_5etools' has been removed, as upstream is in a questionable legal position and the build was broken."; # Added 2025-05-05
   _2048-cli = throw "'_2048-cli' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07
   _2048-cli-curses = throw "'_2048-cli-curses' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07
   _2048-cli-terminal = throw "'_2048-cli-curses' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07
-  _5etools = throw "'_5etools' has been removed, as upstream is in a questionable legal position and the build was broken."; # Added 2025-05-05
-  "7z2hashcat" =
-    throw "'7z2hashcat' has been renamed to '_7z2hashcat' as the former isn't a valid variable name."; # Added 2024-11-27
-  AusweisApp2 = ausweisapp; # Added 2023-11-08
   a4term = a4; # Added 2023-10-06
   abseil-cpp_202301 = throw "abseil-cpp_202301 has been removed as it was unused in tree"; # Added 2025-08-09
   abseil-cpp_202501 = throw "abseil-cpp_202501 has been removed as it was unused in tree"; # Added 2025-09-15
   abseil-cpp_202505 = throw "abseil-cpp_202505 has been removed as it was unused in tree"; # Added 2025-09-15
   acorn = throw "acorn has been removed as the upstream project was archived"; # Added 2024-04-27
   acousticbrainz-client = throw "acousticbrainz-client has been removed since the AcousticBrainz project has been shut down"; # Added 2024-06-04
+  addOpenGLRunpath = throw "addOpenGLRunpath has been removed. Use addDriverRunpath instead."; # Converted to throw 2024-11-17
   adminer-pematon = adminneo; # Added 2025-02-20
   adminerneo = adminneo; # Added 2025-02-27
-  adtool = throw "'adtool' has been removed, as it was broken and unmaintained"; # Added 2024-02-14
   adobe-reader = throw "'adobe-reader' has been removed, as it was broken, outdated and insecure"; # added 2025-05-31
   adom = throw "'adom' has been removed, as it was broken and unmaintained"; # added 2024-05-09
   adoptopenjdk-bin = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin`"; # Added 2024-05-09
   adoptopenjdk-bin-17-packages-darwin = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-17`."; # Added 2024-05-09
   adoptopenjdk-bin-17-packages-linux = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-17`."; # Added 2024-05-09
+  adoptopenjdk-hotspot-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-8`."; # Added 2024-05-09
   adoptopenjdk-hotspot-bin-11 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-11`."; # Added 2024-05-09
   adoptopenjdk-hotspot-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `temurin-bin-17`."; # Added 2024-05-09
   adoptopenjdk-hotspot-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `temurin-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-hotspot-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-8`."; # Added 2024-05-09
   adoptopenjdk-jre-bin = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-jre-bin`."; # Added 2024-05-09
+  adoptopenjdk-jre-hotspot-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-jre-bin-8`."; # Added 2024-05-09
   adoptopenjdk-jre-hotspot-bin-11 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-jre-bin-11`."; # Added 2024-05-09
   adoptopenjdk-jre-hotspot-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `temurin-jre-bin-17`."; # Added 2024-05-09
   adoptopenjdk-jre-hotspot-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `temurin-jre-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-jre-hotspot-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-jre-bin-8`."; # Added 2024-05-09
+  adoptopenjdk-jre-openj9-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-jre-bin-8`."; # Added 2024-05-09
   adoptopenjdk-jre-openj9-bin-11 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-jre-bin-11`."; # Added 2024-05-09
   adoptopenjdk-jre-openj9-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `semeru-jre-bin-17`."; # Added 2024-05-09
   adoptopenjdk-jre-openj9-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `semeru-jre-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-jre-openj9-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-jre-bin-8`."; # Added 2024-05-09
+  adoptopenjdk-openj9-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-bin-8`."; # Added 2024-05-09
   adoptopenjdk-openj9-bin-11 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-bin-11`."; # Added 2024-05-09
   adoptopenjdk-openj9-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `semeru-bin-17`."; # Added 2024-05-09
   adoptopenjdk-openj9-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `semeru-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-openj9-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-bin-8`."; # Added 2024-05-09
-  addOpenGLRunpath = throw "addOpenGLRunpath has been removed. Use addDriverRunpath instead."; # Converted to throw 2024-11-17
+  adtool = throw "'adtool' has been removed, as it was broken and unmaintained"; # Added 2024-02-14
   aeon = throw "aeon has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-07-15
   afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21
   afpfs-ng = throw "'afpfs-ng' has been removed as it was broken and unmaintained for 10 years"; # Added 2025-05-17
@@ -444,38 +445,38 @@ mapAliases {
   alass = throw "'alass' has been removed due to being unmaintained upstream"; # Added 2025-01-25
   alsaLib = throw "'alsaLib' has been renamed to/replaced by 'alsa-lib'"; # Converted to throw 2024-10-17
   alsaOss = throw "'alsaOss' has been renamed to/replaced by 'alsa-oss'"; # Converted to throw 2024-10-17
-  alsaPluginWrapper = throw "'alsaPluginWrapper' has been renamed to/replaced by 'alsa-plugins-wrapper'"; # Converted to throw 2024-10-17
   alsaPlugins = throw "'alsaPlugins' has been renamed to/replaced by 'alsa-plugins'"; # Converted to throw 2024-10-17
+  alsaPluginWrapper = throw "'alsaPluginWrapper' has been renamed to/replaced by 'alsa-plugins-wrapper'"; # Converted to throw 2024-10-17
   alsaTools = throw "'alsaTools' has been renamed to/replaced by 'alsa-tools'"; # Converted to throw 2024-10-17
   alsaUtils = throw "'alsaUtils' has been renamed to/replaced by 'alsa-utils'"; # Converted to throw 2024-10-17
   amazon-qldb-shell = throw "'amazon-qldb-shell' has been removed due to being unmaintained upstream"; # Added 2025-07-30
   amdvlk = throw "'amdvlk' has been removed since it was deprecated by AMD. Its replacement, RADV, is enabled by default."; # Added 2025-09-20
+  anbox = throw "'anbox' has been removed as the upstream project is unmaintained, see https://github.com/anbox/.github/blob/main/profile/README.md"; # Added 2025-01-04
   android-udev-rules = throw "'android-udev-rules' has been removed due to being superseded by built-in systemd uaccess rules."; # Added 2025-10-21
-  angelfish = throw "'angelfish' has been renamed to/replaced by 'libsForQt5.kdeGear.angelfish'"; # Converted to throw 2024-10-17
-  animeko = throw "'animeko' has been removed since it is unmaintained"; # Added 2025-08-20
-  ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11
-  ansible_2_15 = throw "Ansible 2.15 goes end of life in 2024/11 and can't be supported throughout the 24.11 release cycle"; # Added 2024-11-08
-  ansible-language-server = throw "ansible-language-server was removed, because it was unmaintained in nixpkgs."; # Added 2025-09-24
-  ansible-later = throw "ansible-later has been discontinued. The author recommends switching to ansible-lint"; # Added 2025-08-24
-  antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4. Please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21
   androidndkPkgs_21 = throw "androidndkPkgs_21 has been removed, as it is EOL"; # Added 2025-08-09
   androidndkPkgs_23 = throw "androidndkPkgs_23 has been removed, as it is EOL"; # Added 2025-08-09
   androidndkPkgs_23b = throw "androidndkPkgs_23b has been removed, as it is EOL"; # Added 2025-08-09
   androidndkPkgs_24 = throw "androidndkPkgs_24 has been removed, as it is EOL"; # Added 2025-08-09
   androidndkPkgs_25 = throw "androidndkPkgs_25 has been removed, as it is EOL"; # Added 2025-08-09
   androidndkPkgs_26 = throw "androidndkPkgs_26 has been removed, as it is EOL"; # Added 2025-08-09
-  ankisyncd = throw "ankisyncd is dead, use anki-sync-server instead"; # Added 2024-08-10
-  ao = libfive; # Added 2024-10-11
-  anbox = throw "'anbox' has been removed as the upstream project is unmaintained, see https://github.com/anbox/.github/blob/main/profile/README.md"; # Added 2025-01-04
-  antic = throw "'antic' has been removed as it has been merged into 'flint3'"; # Added 2025-03-28
   anevicon = throw "'anevicon' has been removed because the upstream repository no longer exists"; # Added 2025-01-26
+  angelfish = throw "'angelfish' has been renamed to/replaced by 'libsForQt5.kdeGear.angelfish'"; # Converted to throw 2024-10-17
+  animeko = throw "'animeko' has been removed since it is unmaintained"; # Added 2025-08-20
+  ankisyncd = throw "ankisyncd is dead, use anki-sync-server instead"; # Added 2024-08-10
+  ansible-language-server = throw "ansible-language-server was removed, because it was unmaintained in nixpkgs."; # Added 2025-09-24
+  ansible-later = throw "ansible-later has been discontinued. The author recommends switching to ansible-lint"; # Added 2025-08-24
+  ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11
+  ansible_2_15 = throw "Ansible 2.15 goes end of life in 2024/11 and can't be supported throughout the 24.11 release cycle"; # Added 2024-11-08
+  antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4. Please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21
+  antic = throw "'antic' has been removed as it has been merged into 'flint3'"; # Added 2025-03-28
+  antimicroX = throw "'antimicroX' has been renamed to/replaced by 'antimicrox'"; # Converted to throw 2024-10-17
+  antlr4_8 = throw "antlr4_8 has been removed. Consider using a more recent version of antlr4"; # Added 2025-10-20
+  ao = libfive; # Added 2024-10-11
+  apacheAnt = ant; # Added 2024-11-28
   apacheKafka_3_5 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2024-06-13
   apacheKafka_3_6 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2024-11-27
   apacheKafka_3_7 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2025-09-27
   apacheKafka_3_8 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2025-09-27
-  antimicroX = throw "'antimicroX' has been renamed to/replaced by 'antimicrox'"; # Converted to throw 2024-10-17
-  antlr4_8 = throw "antlr4_8 has been removed. Consider using a more recent version of antlr4"; # Added 2025-10-20
-  apacheAnt = ant; # Added 2024-11-28
   apparmor-kernel-patches = throw "'apparmor-kernel-patches' has been removed as they were unmaintained, irrelevant and effectively broken"; # Added 2025-04-20
   appimagekit = throw "'appimagekit' has been removed as it was broken in nixpkgs and archived upstream"; # Added 2025-04-19
   apple-sdk_10_12 = throw "apple-sdk_10_12 was removed as Nixpkgs no longer supports macOS 10.12; see the 25.05 release notes"; # Added 2024-10-27
@@ -492,9 +493,9 @@ mapAliases {
   ardour_7 = throw "ardour_7 has been removed because it relies on gtk2, please use ardour instead."; # Aded 2025-10-04
   argo = argo-workflows; # Added 2025-02-01
   aria = aria2; # Added 2024-03-26
-  artim-dark = aritim-dark; # Added 2025-07-27
   armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11
   arrayfire = throw "arrayfire was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
+  artim-dark = aritim-dark; # Added 2025-07-27
   aseprite-unfree = aseprite; # Added 2023-08-26
   asitop = macpm; # 'macpm' is a better-maintained downstream; keep 'asitop' for backwards-compatibility
   asterisk_18 = throw "asterisk_18: Asterisk 18 is end of life and has been removed"; # Added 2025-10-19
@@ -506,42 +507,43 @@ mapAliases {
   ats = throw "'ats' has been removed as it is unmaintained for 10 years and broken"; # Added 2025-05-17
   audaciousQt5 = throw "'audaciousQt5' has been removed, since audacious is built with Qt 6 now"; # Added 2024-07-06
   auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02
+  aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14
+  AusweisApp2 = ausweisapp; # Added 2023-11-08
+  authy = throw "'authy' has been removed since it reached end of life"; # Added 2024-04-19
+  autoadb = throw "'autoadb' has been removed due to lack of maintenance upstream"; # Added 2025-01-25
   autoconf213 = throw "'autoconf213' has been removed in favor of 'autoconf'"; # Added 2025-07-21
   autoconf264 = throw "'autoconf264' has been removed in favor of 'autoconf'"; # Added 2025-07-21
   automake111x = throw "'automake111x' has been removed in favor of 'automake'"; # Added 2025-07-21
   autopanosiftc = throw "'autopanosiftc' has been removed, as it is unmaintained upstream"; # Added 2025-10-07
   autoreconfHook264 = throw "'autoreconfHook264' has been removed in favor of 'autoreconfHook'"; # Added 2025-07-21
-  aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14
-  authy = throw "'authy' has been removed since it reached end of life"; # Added 2024-04-19
-  autoadb = throw "'autoadb' has been removed due to lack of maintenance upstream"; # Added 2025-01-25
   av-98 = throw "'av-98' has been removed because it has been broken since at least November 2024."; # Added 2025-10-03
   avldrums-lv2 = throw "'avldrums-lv2' has been renamed to/replaced by 'x42-avldrums'"; # Converted to throw 2024-10-17
   avr-sim = throw "'avr-sim' has been removed as it was broken and unmaintained. Possible alternatives are 'simavr', SimulAVR and AVRStudio."; # Added 2025-05-31
-  axmldec = throw "'axmldec' has been removed as it was broken and unmaintained for 8 years"; # Added 2025-05-17
   awesome-4-0 = awesome; # Added 2022-05-05
   awf = throw "'awf' has been removed as the upstream project was archived in 2021"; # Added 2025-10-03
   aws-env = throw "aws-env has been removed as the upstream project was unmaintained"; # Added 2024-06-11
   aws-google-auth = throw "aws-google-auth has been removed as the upstream project was unmaintained"; # Added 2024-07-31
+  axmldec = throw "'axmldec' has been removed as it was broken and unmaintained for 8 years"; # Added 2025-05-17
   backlight-auto = throw "'backlight-auto' has been removed as it relies on Zig 0.12 which has been dropped."; # Added 2025-08-22
   badtouch = authoscope; # Project was renamed, added 20210626
   badwolf = throw "'badwolf' has been removed due to being unmaintained"; # Added 2025-04-15
   baget = throw "'baget' has been removed due to being unmaintained"; # Added 2023-03-19
   bandwidth = throw "'bandwidth' has been removed due to lack of maintenance"; # Added 2025-09-01
   banking = saldo; # added 2025-08-29
+  bareboxTools = throw "bareboxTools has been removed due to lack of interest in maintaining it in nixpkgs"; # Added 2025-04-19
+  barrier = throw "'barrier' has been removed as it is unmaintained. Consider 'deskflow' or 'input-leap' instead."; # Added 2025-09-29
   base16-builder = throw "'base16-builder' has been removed due to being unmaintained"; # Added 2025-06-03
   baserow = throw "baserow has been removed, due to lack of maintenance"; # Added 2025-08-02
-  bashInteractive_5 = throw "'bashInteractive_5' has been renamed to/replaced by 'bashInteractive'"; # Converted to throw 2024-10-17
   bash_5 = throw "'bash_5' has been renamed to/replaced by 'bash'"; # Converted to throw 2024-10-17
-  barrier = throw "'barrier' has been removed as it is unmaintained. Consider 'deskflow' or 'input-leap' instead."; # Added 2025-09-29
-  bareboxTools = throw "bareboxTools has been removed due to lack of interest in maintaining it in nixpkgs"; # Added 2025-04-19
+  bashInteractive_5 = throw "'bashInteractive_5' has been renamed to/replaced by 'bashInteractive'"; # Converted to throw 2024-10-17
   bazel_5 = throw "bazel_5 has been removed as it is EOL"; # Added 2025-08-09
   bazel_6 = throw "bazel_6 has been removed as it will be EOL by the release of Nixpkgs 25.11"; # Added 2025-08-19
   bc-decaf = throw "'bc-decaf' has been moved to 'linphonePackages.bc-decaf'"; # Added 2025-09-20
   bc-soci = throw "'bc-soci' has been moved to 'linphonePackages.bc-soci'"; # Added 2025-09-20
   bctoolbox = throw "'bctoolbox' has been moved to 'linphonePackages.bctoolbox'"; # Added 2025-09-20
   bcunit = throw "'bcunit' has been moved to 'linphonePackages.bcunit'"; # Added 2025-09-20
-  BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12
   beam_nox = throw "beam_nox has been removed in favor of beam_minimal or beamMinimalPackages"; # Added 2025-04-01
+  BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12
   beatsabermodmanager = throw "'beatsabermodmanager' has been removed due to lack of upstream maintainenance. Consider using 'bs-manager' instead"; # Added 2025-03-18
   beets-unstable = beetsPackages.beets-unstable; # Added 2025-09-24
   belcard = throw "'belcard' has been moved to 'linphonePackages.belcard'"; # Added 2025-09-20
@@ -552,15 +554,20 @@ mapAliases {
   bfc = throw "bfc has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
   bibata-extra-cursors = throw "bibata-cursors has been removed as it was broken"; # Added 2024-07-15
   bindle = throw "bindle has been removed since it is vulnerable to CVE-2025-62518 and upstream has been archived"; # Added 2025-10-24
+  bird = throw "The bird alias was ambiguous and has been removed for the time being. Please explicitly choose bird2 or bird3."; # Added 2025-01-11
+  bisq-desktop = throw "bisq-desktop has been removed because OpenJFX 11 was removed"; # Added 2024-11-17
   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
   bitcoin-unlimited = throw "bitcoin-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15
   bitcoind-abc = throw "bitcoind-abc has been removed due to a lack of maintanance"; # Added 2025-06-17
   bitcoind-unlimited = throw "bitcoind-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15
-  bird = throw "The bird alias was ambiguous and has been removed for the time being. Please explicitly choose bird2 or bird3."; # Added 2025-01-11
-  bisq-desktop = throw "bisq-desktop has been removed because OpenJFX 11 was removed"; # Added 2024-11-17
   bitmeter = throw "bitmeter has been removed, use `x42-meter 18` from the x42-plugins pkg instead."; # Added 2025-10-03
   bitwarden = bitwarden-desktop; # Added 2024-02-25
+  bitwarden_rs = vaultwarden; # Added 2021-07-01
+  bitwarden_rs-mysql = vaultwarden-mysql; # Added 2021-07-01
+  bitwarden_rs-postgresql = vaultwarden-postgresql; # Added 2021-07-01
+  bitwarden_rs-sqlite = vaultwarden-sqlite; # Added 2021-07-01
+  bitwarden_rs-vault = vaultwarden-vault; # Added 2021-07-01
   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-with-packages =
     args:
@@ -586,67 +593,53 @@ mapAliases {
   bridgand = throw "'brigand' has been removed due to being unmaintained"; # Added 2025-04-30
   brogue = lib.warnOnInstantiate "Use 'brogue-ce' instead of 'brogue' for updated releases" brogue-ce; # Added 2025-10-04
   bs-platform = throw "'bs-platform' was removed as it was broken, development ended and 'melange' has superseded it"; # Added 2024-07-29
-  buf-language-server = throw "'buf-language-server' was removed as its development has moved to the 'buf' package"; # Added 2024-11-15
-
   budgie = throw "The `budgie` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14
   budgiePlugins = throw "The `budgiePlugins` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14
+  buf-language-server = throw "'buf-language-server' was removed as its development has moved to the 'buf' package"; # Added 2024-11-15
   buildBarebox = throw "buildBarebox has been removed due to lack of interest in maintaining it in nixpkgs"; # Added 2025-04-19
   buildBowerComponents = throw "buildBowerComponents has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
+  buildFHSUserEnv = throw "'buildFHSUserEnv' has been renamed to 'buildFHSEnv' and was removed in 25.11"; # Converted to throw 2025-06-01
+  buildFHSUserEnvBubblewrap = throw "'buildFHSUserEnvBubblewrap' has been renamed to 'buildFHSEnvBubblewrap' and was removed in 25.11"; # Converted to throw 2025-06-01
+  buildFHSUserEnvChroot = throw "'buildFHSUserEnvChroot' has been renamed to 'buildFHSEnvChroot' and was removed in 25.11"; # Converted to throw 2025-06-01
   buildGo122Module = throw "Go 1.22 is end-of-life, and 'buildGo122Module' has been removed. Please use a newer builder version."; # Added 2025-03-28
   buildGo123Module = throw "Go 1.23 is end-of-life, and 'buildGo123Module' has been removed. Please use a newer builder version."; # Added 2025-08-13
   buildGoPackage = throw "`buildGoPackage` has been deprecated and removed, see the Go section in the nixpkgs manual for details"; # Added 2024-11-18
   buildXenPackage = throw "'buildXenPackage' has been removed as a custom Xen build can now be achieved by simply overriding 'xen'."; # Added 2025-05-12
-
   bwidget = tclPackages.bwidget; # Added 2024-10-02
-  buildFHSUserEnv = throw "'buildFHSUserEnv' has been renamed to 'buildFHSEnv' and was removed in 25.11"; # Converted to throw 2025-06-01
-  buildFHSUserEnvChroot = throw "'buildFHSUserEnvChroot' has been renamed to 'buildFHSEnvChroot' and was removed in 25.11"; # Converted to throw 2025-06-01
-  buildFHSUserEnvBubblewrap = throw "'buildFHSUserEnvBubblewrap' has been renamed to 'buildFHSEnvBubblewrap' and was removed in 25.11"; # Converted to throw 2025-06-01
-
-  bitwarden_rs = vaultwarden; # Added 2021-07-01
-  bitwarden_rs-mysql = vaultwarden-mysql; # Added 2021-07-01
-  bitwarden_rs-postgresql = vaultwarden-postgresql; # Added 2021-07-01
-  bitwarden_rs-sqlite = vaultwarden-sqlite; # Added 2021-07-01
-  bitwarden_rs-vault = vaultwarden-vault; # Added 2021-07-01
-
   bzrtp = throw "'bzrtp' has been moved to 'linphonePackages.bzrtp'"; # Added 2025-09-20
-
   caffeWithCuda = throw "caffeWithCuda has been removed, as it was broken and required CUDA 10"; # Added 2024-11-20
   calcium = throw "'calcium' has been removed as it has been merged into 'flint3'"; # Added 2025-03-28
   calculix = calculix-ccx; # Added 2024-12-18
   calligra = kdePackages.calligra; # Added 2024-09-27
   callPackage_i686 = pkgsi686Linux.callPackage;
-  cargo-asm = throw "'cargo-asm' has been removed due to lack of upstream maintenance. Consider 'cargo-show-asm' as an alternative."; # Added 2025-01-29
-  cask = emacs.pkgs.cask; # Added 2022-11-12
-  catch = throw "catch has been removed. Please upgrade to catch2 or catch2_3"; # Added 2025-08-21
-  catcli = throw "catcli has been superseded by gocatcli"; # Added 2025-04-19
   canonicalize-jars-hook = stripJavaArchivesHook; # Added 2024-03-17
   cardboard = throw "cardboard has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
+  cargo-asm = throw "'cargo-asm' has been removed due to lack of upstream maintenance. Consider 'cargo-show-asm' as an alternative."; # Added 2025-01-29
   cargo-deps = throw "cargo-deps has been removed as the repository is deleted"; # Added 2024-04-09
   cargo-espflash = espflash; # Added 2024-02-09
-  cargo-kcov = throw "'cargo-kcov' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   cargo-information = throw "'cargo-information' has been removed due to being merged upstream into 'cargo'"; # Added 2025-03-09
   cargo-inspect = throw "'cargo-inspect' has been removed due to lack of upstream maintenance. Upstream recommends cargo-expand."; # Added 2025-01-26
+  cargo-kcov = throw "'cargo-kcov' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   cargo-web = throw "'cargo-web' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
   cargonode = throw "'cargonode' has been removed due to lack of upstream maintenance"; # Added 2025-06-18
+  cask = emacs.pkgs.cask; # Added 2022-11-12
   cassandra_3_0 = throw "'cassandra_3_0' has been removed has it reached end-of-life"; # Added 2025-03-23
   cassandra_3_11 = throw "'cassandra_3_11' has been removed has it reached end-of-life"; # Added 2025-03-23
-  cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; # Added 2023-09-05
   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
+  catch = throw "catch has been removed. Please upgrade to catch2 or catch2_3"; # Added 2025-08-21
+  catcli = throw "catcli has been superseded by gocatcli"; # Added 2025-04-19
+  cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; # Added 2023-09-05
   cde = throw "'cde' has been removed as it is unmaintained and broken"; # Added 2025-05-17
   centerim = throw "centerim has been removed due to upstream disappearing"; # Added 2025-04-18
   cereal_1_3_0 = throw "cereal_1_3_0 has been removed as it was unused; use cereal intsead"; # Added 2025-09-12
   cereal_1_3_2 = throw "cereal_1_3_2 is now the only version and has been renamed to cereal"; # Added 2025-09-12
   certmgr-selfsigned = certmgr; # Added 2023-11-30
   cgal_4 = throw "cgal_4 has been removed as it is obsolete use cgal instead"; # Added 2024-12-30
-
   challenger = taler-challenger; # Added 2024-09-04
   charmcraft = throw "charmcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # added 2025-09-18
   chatgpt-retrieval-plugin = throw "chatgpt-retrieval-plugin has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
-  check_smartmon = nagiosPlugins.check_smartmon; # Added 2024-05-03
-  check_systemd = nagiosPlugins.check_systemd; # Added 2024-05-03
-  check_zfs = nagiosPlugins.check_zfs; # Added 2024-05-03
   check-esxi-hardware = nagiosPlugins.check_esxi_hardware; # Added 2024-05-03
   check-mssql-health = nagiosPlugins.check_mssql_health; # Added 2024-05-03
   check-nwc-health = nagiosPlugins.check_nwc_health; # Added 2024-05-03
@@ -654,77 +647,108 @@ mapAliases {
   check-ups-health = nagiosPlugins.check_ups_health; # Added 2024-05-03
   check-uptime = nagiosPlugins.check_uptime; # Added 2024-05-03
   check-wmiplus = nagiosPlugins.check_wmi_plus; # Added 2024-05-03
+  check_smartmon = nagiosPlugins.check_smartmon; # Added 2024-05-03
+  check_systemd = nagiosPlugins.check_systemd; # Added 2024-05-03
+  check_zfs = nagiosPlugins.check_zfs; # Added 2024-05-03
   checkSSLCert = nagiosPlugins.check_ssl_cert; # Added 2024-05-03
   chiaki4deck = chiaki-ng; # Added 2024-08-04
+  chkrootkit = throw "chkrootkit has been removed as it is unmaintained and archived upstream and didn't even work on NixOS"; # Added 2025-09-12
   chocolateDoom = chocolate-doom; # Added 2023-05-01
   ChowCentaur = chow-centaur; # Added 2024-06-12
-  ChowPhaser = chow-phaser; # Added 2024-06-12
   ChowKick = chow-kick; # Added 2024-06-12
+  ChowPhaser = chow-phaser; # Added 2024-06-12
   CHOWTapeModel = chow-tape-model; # Added 2024-06-12
-  chkrootkit = throw "chkrootkit has been removed as it is unmaintained and archived upstream and didn't even work on NixOS"; # Added 2025-09-12
   chromatic = throw "chromatic has been removed due to being unmaintained and failing to build"; # Added 2025-04-18
   chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27
+  ci-edit = throw "'ci-edit' has been removed due to lack of maintenance upstream"; # Added 2025-08-26
   cinnamon-common = cinnamon; # Added 2025-08-06
   citra = throw "citra has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
-  citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
   citra-canary = throw "citra-canary has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
-  ci-edit = throw "'ci-edit' has been removed due to lack of maintenance upstream"; # Added 2025-08-26
+  citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
+  clamsmtp = throw "'clamsmtp' has been removed as it is unmaintained and broken"; # Added 2025-05-17
+  clang9Stdenv = throw "clang9Stdenv has been removed from nixpkgs"; # Added 2024-04-08
+  clang12Stdenv = throw "clang12Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  clang13Stdenv = throw "clang13Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  clang14Stdenv = throw "clang14Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  clang15Stdenv = throw "clang15Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
+  clang16Stdenv = throw "clang16Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  clang17Stdenv = throw "clang17Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  clang-sierraHack = throw "clang-sierraHack has been removed because it solves a problem that no longer seems to exist. Hey, what were you even doing with that thing anyway?"; # Added 2024-10-05
+  clang-sierraHack-stdenv = clang-sierraHack; # Added 2024-10-05
+  clang-tools_9 = throw "clang-tools_9 has been removed from nixpkgs"; # Added 2024-04-08
+  clang-tools_12 = throw "clang-tools_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  clang-tools_13 = throw "clang-tools_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  clang-tools_14 = throw "clang-tools_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  clang-tools_15 = throw "clang-tools_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
+  clang-tools_16 = throw "clang-tools_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  clang-tools_17 = throw "clang-tools_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  clang-tools_18 = llvmPackages_18.clang-tools; # Added 2024-04-22
+  clang-tools_19 = llvmPackages_19.clang-tools; # Added 2024-08-21
+  clang_9 = throw "clang_9 has been removed from nixpkgs"; # Added 2024-04-08
+  clang_12 = throw "clang_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  clang_13 = throw "clang_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  clang_14 = throw "clang_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  clang_15 = throw "clang_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
+  clang_16 = throw "clang_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  clang_17 = throw "clang_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19
+  clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17
+  clasp = clingo; # added 2022-12-22
+  claws-mail-gtk3 = throw "'claws-mail-gtk3' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2024-10-17
+  cli-visualizer = throw "'cli-visualizer' has been removed as the upstream repository is gone"; # Added 2025-06-05
+  cligh = throw "'cligh' has been removed since it was unmaintained and its upstream deleted"; # Added 2025-05-05
+  clipbuzz = throw "clipbuzz has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09
   cloog = throw "cloog has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
   cloog_0_18_0 = throw "cloog_0_18_0 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
   cloogppl = throw "cloogppl has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
-  clamsmtp = throw "'clamsmtp' has been removed as it is unmaintained and broken"; # Added 2025-05-17
-  clang-sierraHack = throw "clang-sierraHack has been removed because it solves a problem that no longer seems to exist. Hey, what were you even doing with that thing anyway?"; # Added 2024-10-05
-  clang-sierraHack-stdenv = clang-sierraHack; # Added 2024-10-05
-  cli-visualizer = throw "'cli-visualizer' has been removed as the upstream repository is gone"; # Added 2025-06-05
-  clipbuzz = throw "clipbuzz has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09
   cloudlogoffline = throw "cloudlogoffline has been removed"; # added 2025-05-18
+  clubhouse-cli = throw "'clubhouse-cli' has been removed due to lack of interest to maintain it in Nixpkgs and failing to build."; # added 2025-04-21
   clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  CoinMP = coinmp; # Added 2024-06-12
-  code-browser-gtk = throw "'code-browser-gtk' has been removed, as it was broken since 22.11"; # Added 2025-08-22
+  cockroachdb-bin = cockroachdb; # 2024-03-15
   code-browser-gtk2 = throw "'code-browser-gtk2' has been removed, as it was broken since 22.11"; # Added 2025-08-22
+  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
+  codimd = throw "'codimd' has been renamed to/replaced by 'hedgedoc'"; # Converted to throw 2024-10-17
   cog = throw "'cog' has been removed as it depends on unmaintained libraries"; # Added 2025-10-08
+  CoinMP = coinmp; # Added 2024-06-12
   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
   colloid-kde = throw "'colloid-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'xcolor', 'gcolor3', 'eyedropper' or 'gpick' instead"; # Added 2024-10-19
   colorstorm = throw "'colorstorm' has been removed because it was unmaintained in nixpkgs and upstream was rewritten."; # Added 2025-06-15
+  concurrencykit = throw "'concurrencykit' has been renamed to/replaced by 'libck'"; # Converted to throw 2024-10-17
+  conduwuit = throw "'conduwuit' has been removed as the upstream repository has been deleted. Consider migrating to 'matrix-conduit', 'matrix-continuwuity' or 'matrix-tuwunel' instead."; # Added 2025-08-08
   cone = throw "cone has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
   connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27
+  containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09
   copilot-language-server-fhs = lib.warnOnInstantiate "The package set `copilot-language-server-fhs` has been renamed to `copilot-language-server`." copilot-language-server; # Added 2025-09-07
   copper = throw "'copper' has been removed, as it was broken since 22.11"; # Added 2025-08-22
   cordless = throw "'cordless' has been removed due to being archived upstream. Consider using 'discordo' instead."; # Added 2025-06-07
+  corepack_18 = nodejs_18; # Added 2025-04-23
   coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
   corretto19 = throw "Corretto 19 was removed as it has reached its end of life"; # Added 2024-08-01
   cosmic-tasks = tasks; # Added 2024-07-04
   cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15
+  cq-editor = throw "cq-editor has been removed, as it use a dependency that was disabled since python 3.8 and was last updated in 2021"; # Added 2024-05-13
+  crack_attack = throw "'crack_attack' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
+  crackmapexec = throw "'crackmapexec' has been removed as it was unmaintained. Use 'netexec' instead"; # 2024-08-11
+  create-react-app = throw "'create-react-app' has been removed as it was deprecated. Upstream suggests using a framework for React."; # Added 2025-05-17
   crispyDoom = crispy-doom; # Added 2023-05-01
+  critcl = tclPackages.critcl; # Added 2024-10-02
   cromite = throw "'cromite' has been removed from nixpkgs due to it not being maintained"; # Added 2025-06-12
   crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06
+  crunchy-cli = throw "'crunchy-cli' was sunset, see <https://github.com/crunchy-labs/crunchy-cli/issues/362>"; # Added 2025-03-26
   crystal_1_2 = throw "'crystal_1_2' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13
   crystal_1_7 = throw "'crystal_1_7' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13
   crystal_1_8 = throw "'crystal_1_8' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13
   crystal_1_9 = throw "'crystal_1_9' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13
   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
   crystal_1_12 = throw "'crystal_1_12' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-19
-  clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19
-  clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17
-  clasp = clingo; # added 2022-12-22
-  claws-mail-gtk3 = throw "'claws-mail-gtk3' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2024-10-17
-  clubhouse-cli = throw "'clubhouse-cli' has been removed due to lack of interest to maintain it in Nixpkgs and failing to build."; # added 2025-04-21
-  cockroachdb-bin = cockroachdb; # 2024-03-15
-  codimd = throw "'codimd' has been renamed to/replaced by 'hedgedoc'"; # Converted to throw 2024-10-17
-  concurrencykit = throw "'concurrencykit' has been renamed to/replaced by 'libck'"; # Converted to throw 2024-10-17
-  conduwuit = throw "'conduwuit' has been removed as the upstream repository has been deleted. Consider migrating to 'matrix-conduit', 'matrix-continuwuity' or 'matrix-tuwunel' instead."; # Added 2025-08-08
-  containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09
-  crack_attack = throw "'crack_attack' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
-  crackmapexec = throw "'crackmapexec' has been removed as it was unmaintained. Use 'netexec' instead"; # 2024-08-11
-  create-react-app = throw "'create-react-app' has been removed as it was deprecated. Upstream suggests using a framework for React."; # Added 2025-05-17
-  critcl = tclPackages.critcl; # Added 2024-10-02
-  crunchy-cli = throw "'crunchy-cli' was sunset, see <https://github.com/crunchy-labs/crunchy-cli/issues/362>"; # Added 2025-03-26
+  cstore_fdw = throw "'cstore_fdw' has been removed. Use 'postgresqlPackages.cstore_fdw' instead."; # Added 2025-07-19
+  cudaPackages_10 = throw "CUDA 10 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
   cudaPackages_10_0 = throw "CUDA 10.0 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
   cudaPackages_10_1 = throw "CUDA 10.1 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
   cudaPackages_10_2 = throw "CUDA 10.2 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
-  cudaPackages_10 = throw "CUDA 10 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
+  cudaPackages_11 = throw "CUDA 11 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_11_0 = throw "CUDA 11.0 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_11_1 = throw "CUDA 11.1 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_11_2 = throw "CUDA 11.2 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
@@ -734,7 +758,6 @@ mapAliases {
   cudaPackages_11_6 = throw "CUDA 11.6 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_11_7 = throw "CUDA 11.7 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_11_8 = throw "CUDA 11.8 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
-  cudaPackages_11 = throw "CUDA 11 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_12_0 = throw "CUDA 12.0 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_12_1 = throw "CUDA 12.1 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_12_2 = throw "CUDA 12.2 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
@@ -746,19 +769,12 @@ mapAliases {
   cutemarked-ng = throw "'cutemarked-ng' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.ghostwriter' instead"; # Added 2024-12-27
   cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17
   cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09
-
-  clang-tools_18 = llvmPackages_18.clang-tools; # Added 2024-04-22
-  clang-tools_19 = llvmPackages_19.clang-tools; # Added 2024-08-21
-
-  cligh = throw "'cligh' has been removed since it was unmaintained and its upstream deleted"; # Added 2025-05-05
-  cq-editor = throw "cq-editor has been removed, as it use a dependency that was disabled since python 3.8 and was last updated in 2021"; # Added 2024-05-13
-
   dale = throw "dale has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
   dap = throw "'dap' has been removed because it doesn't compile and has been unmaintained since 2014"; # Added 2025-05-10
   daq = throw "'daq' has been removed as it is unmaintained and broken. Snort2 has also been removed, which depended on this"; # Added 2025-05-21
   darling = throw "'darling' has been removed due to vendoring Python2"; # Added 2025-05-10
-  dart_stable = throw "'dart_stable' has been renamed to/replaced by 'dart'"; # Converted to throw 2024-10-17
   dart-sass-embedded = throw "dart-sass-embedded has been removed from nixpkgs, as it is now included in Dart Sass itself."; # Added 2023-10-25
+  dart_stable = throw "'dart_stable' has been renamed to/replaced by 'dart'"; # Converted to throw 2024-10-17
   dat = nodePackages.dat; # Added 2020-02-04
   dave = throw "'dave' has been removed as it has been archived upstream. Consider using 'webdav' instead"; # Added 2025-02-03
   daytona-bin = throw "'daytona-bin' has been removed, as it was unmaintained in nixpkgs"; # Added 2025-07-21
@@ -788,36 +804,36 @@ mapAliases {
   directvnc = throw "'directvnc' has been removed as it was unmaintained upstream since 2015 and failed to build with gcc 14"; # Added 2025-05-17
   diskonaut = throw "'diskonaut' was removed due to lack of upstream maintenance"; # Added 2025-01-25
   dispad = throw "dispad has been remove because it doesn't compile and has been unmaintained since 2014"; # Added 2025-04-25
-  dleyna-core = dleyna; # Added 2025-04-19
   dleyna-connector-dbus = dleyna; # Added 2025-04-19
+  dleyna-core = dleyna; # Added 2025-04-19
   dleyna-renderer = dleyna; # Added 2025-04-19
   dleyna-server = dleyna; # Added 2025-04-19
   dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2024-10-17
   dnscrypt-proxy2 = dnscrypt-proxy; # Added 2023-02-02
   dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14
   docear = throw "Docear was removed because it was unmaintained upstream. JabRef, Zotero, or Mendeley are potential replacements."; # Added 2024-11-02
-  docker_24 = throw "'docker_24' has been removed because it has been unmaintained since June 2024. Use docker_25 or newer instead."; # Added 2024-12-21
-  docker_26 = throw "'docker_26' has been removed because it has been unmaintained since February 2025. Use docker_28 or newer instead."; # Added 2025-06-21
-  docker_27 = throw "'docker_27' has been removed because it has been unmaintained since May 2025. Use docker_28 or newer instead."; # Added 2025-06-15
   docker-compose_1 = throw "'docker-compose_1' has been removed because it has been unmaintained since May 2021. Use docker-compose instead."; # Added 2024-07-29
   docker-distribution = distribution; # Added 2023-12-26
   docker-sync = throw "'docker-sync' has been removed because it was broken and unmaintained"; # Added 2025-08-26
+  docker_24 = throw "'docker_24' has been removed because it has been unmaintained since June 2024. Use docker_25 or newer instead."; # Added 2024-12-21
+  docker_26 = throw "'docker_26' has been removed because it has been unmaintained since February 2025. Use docker_28 or newer instead."; # Added 2025-06-21
+  docker_27 = throw "'docker_27' has been removed because it has been unmaintained since May 2025. Use docker_28 or newer instead."; # Added 2025-06-15
   dockerfile-language-server-nodejs = lib.warnOnInstantiate "'dockerfile-language-server-nodejs' has been renamed to 'dockerfile-language-server'" dockerfile-language-server; # Added 2025-09-12
   dolphin-emu-beta = dolphin-emu; # Added 2023-02-11
   dolphinEmu = throw "'dolphinEmu' has been renamed to/replaced by 'dolphin-emu'"; # Converted to throw 2024-10-17
   dolphinEmuMaster = throw "'dolphinEmuMaster' has been renamed to/replaced by 'dolphin-emu-beta'"; # Converted to throw 2024-10-17
-  dotty = scala_3; # Added 2023-08-20
   dotnet-netcore = throw "'dotnet-netcore' has been renamed to/replaced by 'dotnet-runtime'"; # Converted to throw 2024-10-17
   dotnet-sdk_2 = throw "'dotnet-sdk_2' has been renamed to/replaced by 'dotnetCorePackages.sdk_2_1'"; # Converted to throw 2024-10-17
   dotnet-sdk_3 = throw "'dotnet-sdk_3' has been renamed to/replaced by 'dotnetCorePackages.sdk_3_1'"; # Converted to throw 2024-10-17
   dotnet-sdk_5 = throw "'dotnet-sdk_5' has been renamed to/replaced by 'dotnetCorePackages.sdk_5_0'"; # Converted to throw 2024-10-17
   dotnetenv = throw "'dotnetenv' has been removed because it was unmaintained in Nixpkgs"; # Added 2025-07-11
+  dotty = scala_3; # Added 2023-08-20
   dovecot_fts_xapian = throw "'dovecot_fts_xapian' has been removed because it was unmaintained in Nixpkgs. Consider using dovecot-fts-flatcurve instead"; # Added 2025-08-16
   downonspot = throw "'downonspot' was removed because upstream has been taken down by a cease and desist"; # Added 2025-01-25
   dozenal = throw "dozenal has been removed because it does not compile and only minimal functionality"; # Added 2025-03-30
+  drush = throw "drush as a standalone package has been removed because it's no longer supported as a standalone tool"; # Added 2024-02-20
   dsd = throw "dsd has been removed, as it was broken and lack of upstream maintenance"; # Added 2025-08-25
   dstat = throw "'dstat' has been removed because it has been unmaintained since 2020. Use 'dool' instead."; # Added 2025-01-21
-  drush = throw "drush as a standalone package has been removed because it's no longer supported as a standalone tool"; # Added 2024-02-20
   dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03
   dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03
   du-dust = dust; # Added 2024-01-19
@@ -826,30 +842,26 @@ mapAliases {
   dump1090 = dump1090-fa; # Added 2024-02-12
   dwfv = throw "'dwfv' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   dylibbundler = throw "'dylibbundler' has been renamed to/replaced by 'macdylibbundler'"; # Converted to throw 2024-10-17
-
-  EBTKS = ebtks; # Added 2024-01-21
   eask = eask-cli; # Added 2024-09-05
   easyloggingpp = throw "easyloggingpp has been removed, as it is deprecated upstream and does not build with CMake 4"; # Added 2025-09-17
   eboard = throw "'eboard' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.knights' instead"; # Added 2024-10-19
+  EBTKS = ebtks; # Added 2024-01-21
+  ec2-utils = amazon-ec2-utils; # Added 2022-02-01
   ec2_ami_tools = throw "'ec2_ami_tools' has been renamed to/replaced by 'ec2-ami-tools'"; # Converted to throw 2024-10-17
   ec2_api_tools = throw "'ec2_api_tools' has been renamed to/replaced by 'ec2-api-tools'"; # Converted to throw 2024-10-17
-  ec2-utils = amazon-ec2-utils; # Added 2022-02-01
-
   ecryptfs-helper = throw "'ecryptfs-helper' has been removed, for filesystem-level encryption, use fscrypt"; # Added 2025-04-08
   edbrowse = throw "'edbrowse' has been removed as it was unmaintained in Nixpkgs"; # Added 2025-05-18
-  edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01
-  edgedb = throw "edgedb replaced to gel because of change of upstream"; # Added 2025-02-24
   edge-runtime = throw "'edge-runtime' was removed as it was unused, unmaintained, likely insecure and failed to build"; # Added 2025-05-18
+  edgedb = throw "edgedb replaced to gel because of change of upstream"; # Added 2025-02-24
   edid-decode = v4l-utils; # Added 2025-06-20
+  edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01
   eidolon = throw "eidolon was removed as it is unmaintained upstream."; # Added 2025-05-28
   eintopf = lauti; # Project was renamed, added 2025-05-01
   electronplayer = throw "'electronplayer' has been removed as it had been discontinued upstream since October 2024"; # Added 2024-12-17
-  elm-github-install = throw "'elm-github-install' has been removed as it is abandoned upstream and only supports Elm 0.18.0"; # Added 2025-08-25
   element-desktop-wayland = throw "element-desktop-wayland has been removed. Consider setting NIXOS_OZONE_WL=1 via 'environment.sessionVariables' instead"; # Added 2024-12-17
   elementsd-simplicity = throw "'elementsd-simplicity' has been removed due to lack of maintenance, consider using 'elementsd' instead"; # Added 2025-06-04
-
   elixir_ls = elixir-ls; # Added 2023-03-20
-
+  elm-github-install = throw "'elm-github-install' has been removed as it is abandoned upstream and only supports Elm 0.18.0"; # Added 2025-08-25
   emacs28 = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
   emacs28-gtk2 = throw "emacs28-gtk2 was removed because GTK2 is EOL; migrate to emacs28{,-gtk3,-nox} or to more recent versions of Emacs."; # Added 2024-09-20
   emacs28-gtk3 = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
@@ -864,9 +876,8 @@ mapAliases {
   emacs29-pgtk = throw "Emacs 29 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
   emacsMacport = emacs-macport; # Added 2023-08-10
   emacsNativeComp = emacs; # Added 2022-06-08
-  emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2024-10-17
   emacsPackages = emacs.pkgs; # Added 2025-03-02
-
+  emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2024-10-17
   embree2 = throw "embree2 has been removed, as it is unmaintained upstream and depended on tbb_2020"; # Added 2025-09-14
   EmptyEpsilon = empty-epsilon; # Added 2024-07-14
   emulationstation = throw "emulationstation was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
@@ -877,50 +888,51 @@ mapAliases {
   epdfview = throw "'epdfview' has been removed due to lack of maintenance upstream. Consider using 'qpdfview' instead"; # Added 2024-10-19
   ephemeral = throw "'ephemeral' has been archived upstream since 2022-04-02"; # added 2025-04-12
   epoxy = throw "'epoxy' has been renamed to/replaced by 'libepoxy'"; # Converted to throw 2024-10-17
-
   eris-go = throw "'eris-go' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   eriscmd = throw "'eriscmd' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
-
+  erlang-ls = throw "'erlang-ls' has been removed as it has been archived upstream. Consider using 'erlang-language-platform' instead"; # Added 2025-10-02
   erlang_24 = throw "erlang_24 has been removed as it is unmaintained upstream"; # Added 2024-12-26
+  erlang_25 = throw "erlang_25 has been removed as it is unmaintained upstream"; # added 2025-03-31
   erlang_27-rc3 = throw "erlang_27-rc3 has been removed in favor of erlang_27"; # added 2024-05-20
+  erlang_language_platform = throw "erlang_language_platform has been renamed erlang-language-platform"; # added 2025-04-04
   erlang_nox = throw "erlang_nox has been removed in favor of beam_minimal.packages.erlang or beamMinimalPackages.erlang"; # added 2025-04-01
   erlangR24 = throw "erlangR24 has been removed in favor of erlang_24"; # added 2024-05-24
-  erlangR24_odbc = throw "erlangR24_odbc has been removed in favor of erlang_24_odbc"; # added 2024-05-24
   erlangR24_javac = throw "erlangR24_javac has been removed in favor of erlang_24_javac"; # added 2024-05-24
+  erlangR24_odbc = throw "erlangR24_odbc has been removed in favor of erlang_24_odbc"; # added 2024-05-24
   erlangR24_odbc_javac = throw "erlangR24_odbc_javac has been removed in favor of erlang_24_odbc_javac"; # added 2024-05-24
-  erlang_25 = throw "erlang_25 has been removed as it is unmaintained upstream"; # added 2025-03-31
   erlangR25 = throw "erlangR25 has been removed as it is unmaintained upstream"; # added 2024-05-24
-  erlangR25_odbc = throw "erlangR25_odbc has been removed as it is unmaintained upstream"; # added 2024-05-24
   erlangR25_javac = throw "erlangR25_javac has been removed as it is unmaintained upstream"; # added 2024-05-24
+  erlangR25_odbc = throw "erlangR25_odbc has been removed as it is unmaintained upstream"; # added 2024-05-24
   erlangR25_odbc_javac = throw "erlangR25_odbc_javac has been removed as it is unmaintained upstream"; # added 2024-05-24
   erlangR26 = throw "erlangR26 has been removed in favor of erlang_26"; # added 2024-05-24
-  erlangR26_odbc = throw "erlangR26_odbc has been removed in favor of erlang_26_odbc"; # added 2024-05-24
   erlangR26_javac = throw "erlangR26_javac has been removed in favor of erlang_26_javac"; # added 2024-05-24
+  erlangR26_odbc = throw "erlangR26_odbc has been removed in favor of erlang_26_odbc"; # added 2024-05-24
   erlangR26_odbc_javac = throw "erlangR26_odbc_javac has been removed in favor of erlang_26_odbc_javac"; # added 2024-05-24
-
-  erlang-ls = throw "'erlang-ls' has been removed as it has been archived upstream. Consider using 'erlang-language-platform' instead"; # Added 2025-10-02
-  erlang_language_platform = throw "erlang_language_platform has been renamed erlang-language-platform"; # added 2025-04-04
   est-sfs = throw "'est-sfs' has been removed as it was unmaintained in Nixpkgs"; # Added 2025-05-18
   ethabi = throw "ethabi has been removed due to lack of maintainence upstream and no updates in Nixpkgs"; # Added 2024-07-16
   eww-wayland = lib.warnOnInstantiate "eww now can build for X11 and wayland simultaneously, so `eww-wayland` is deprecated, use the normal `eww` package instead." eww; # Added 2024-02-17
-
   f3d_egl = lib.warnOnInstantiate "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # added 2025-07-18
   factor-lang-scope = throw "'factor-lang-scope' has been renamed to 'factorPackages'"; # added 2024-11-28
   fahcontrol = throw "fahcontrol has been removed because the download is no longer available"; # added 2024-09-24
   fahviewer = throw "fahviewer has been removed because the download is no longer available"; # added 2024-09-24
   fam = throw "'fam' (aliased to 'gamin') has been removed as it is unmaintained upstream"; # Added 2024-04-19
-  faustStk = faustPhysicalModeling; # Added 2023-05-16
   fastnlo = throw "'fastnlo' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2024-10-17
   fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03
+  faustStk = faustPhysicalModeling; # Added 2023-05-16
   fbjni = throw "fbjni has been removed, as it was broken"; # Added 2025-08-25
   fcitx5-catppuccin = catppuccin-fcitx5; # Added 2024-06-19
+  fcitx5-chinese-addons = qt6Packages.fcitx5-chinese-addons; # Added 2024-03-01
+  fcitx5-configtool = qt6Packages.fcitx5-configtool; # Added 2024-03-01
+  fcitx5-skk-qt = qt6Packages.fcitx5-skk-qt; # Added 2024-03-01
+  fcitx5-unikey = qt6Packages.fcitx5-unikey; # Added 2024-03-01
+  fcitx5-with-addons = qt6Packages.fcitx5-with-addons; # Added 2024-03-01
   fdr = throw "fdr has been removed, as it cannot be built from source and depends on Python 2.x"; # Added 2025-03-19
   fennel = luaPackages.fennel; # Added 2022-09-24
   ferdi = throw "'ferdi' has been removed, upstream does not exist anymore and the package is insecure"; # Added 2024-08-22
   fetchbower = throw "fetchbower has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
   ffmpeg_5 = throw "ffmpeg_5 has been removed, please use another version"; # Added 2024-07-12
-  ffmpeg_5-headless = throw "ffmpeg_5-headless has been removed, please use another version"; # Added 2024-07-12
   ffmpeg_5-full = throw "ffmpeg_5-full has been removed, please use another version"; # Added 2024-07-12
+  ffmpeg_5-headless = throw "ffmpeg_5-headless has been removed, please use another version"; # Added 2024-07-12
   FIL-plugins = fil-plugins; # Added 2024-06-12
   fileschanged = throw "'fileschanged' has been removed as it is unmaintained upstream"; # Added 2024-04-19
   filesender = throw "'filesender' has been removed because of its simplesamlphp dependency"; # Added 2025-10-17
@@ -964,7 +976,6 @@ mapAliases {
   forgejo-actions-runner = forgejo-runner; # Added 2024-04-04
   fornalder = throw "'fornalder' has been removed as it is unmaintained upstream"; # Added 2025-01-25
   foundationdb71 = throw "foundationdb71 has been removed; please upgrade to foundationdb73"; # Added 2024-12-28
-
   fractal-next = fractal; # added 2023-11-25
   framework-system-tools = framework-tool; # added 2023-12-09
   francis = kdePackages.francis; # added 2024-07-13
@@ -980,13 +991,6 @@ mapAliases {
   fusee-launcher = throw "'fusee-launcher' was removed as upstream removed the original source repository fearing legal repercussions"; # added 2025-07-05
   futuresql = libsForQt5.futuresql; # added 2023-11-11
   fx_cast_bridge = fx-cast-bridge; # added 2023-07-26
-
-  fcitx5-chinese-addons = qt6Packages.fcitx5-chinese-addons; # Added 2024-03-01
-  fcitx5-configtool = qt6Packages.fcitx5-configtool; # Added 2024-03-01
-  fcitx5-skk-qt = qt6Packages.fcitx5-skk-qt; # Added 2024-03-01
-  fcitx5-unikey = qt6Packages.fcitx5-unikey; # Added 2024-03-01
-  fcitx5-with-addons = qt6Packages.fcitx5-with-addons; # Added 2024-03-01
-
   g4music = gapless; # Added 2024-07-26
   g4py = throw "'g4py' has been renamed to/replaced by 'python3Packages.geant4'"; # Converted to throw 2024-10-17
   gamecube-tools = throw "gamecube-tools was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
@@ -999,9 +1003,6 @@ mapAliases {
   garage_1_x = lib.warnOnInstantiate "'garage_1_x' has been renamed to 'garage_1'" garage_1; # Added 2025-06-23
   garage_2_0_0 = throw "'garage_2_0_0' has been removed. Use 'garage_2' instead."; # Added 2025-09-16
   gbl = throw "'gbl' has been removed because the upstream repository no longer exists"; # Added 2025-01-26
-  gcc48 = throw "gcc48 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-10
-  gcc49 = throw "gcc49 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11
-  gcc49Stdenv = throw "gcc49Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11
   gcc6 = throw "gcc6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
   gcc6Stdenv = throw "gcc6Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
   gcc7 = throw "gcc7 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
@@ -1017,6 +1018,9 @@ mapAliases {
   gcc11Stdenv = throw "gcc11Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc12 = throw "gcc12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc12Stdenv = throw "gcc12Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gcc48 = throw "gcc48 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-10
+  gcc49 = throw "gcc49 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11
+  gcc49Stdenv = throw "gcc49Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11
   gcc-arm-embedded-6 = throw "gcc-arm-embedded-6 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
   gcc-arm-embedded-7 = throw "gcc-arm-embedded-7 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
   gcc-arm-embedded-8 = throw "gcc-arm-embedded-8 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
@@ -1025,25 +1029,25 @@ mapAliases {
   gcc-arm-embedded-11 = throw "gcc-arm-embedded-11 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
   gcc-arm-embedded-12 = throw "gcc-arm-embedded-12 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
   gccgo12 = throw "gccgo12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
-  gcj = gcj6; # Added 2024-09-13
   gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
+  gcj = gcj6; # Added 2024-09-13
   gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15
-  gdc = throw "gdc has been removed from Nixpkgs, as recent versions require complex bootstrapping"; # Added 2025-08-08
   gdc11 = throw "gdc11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gdc = throw "gdc has been removed from Nixpkgs, as recent versions require complex bootstrapping"; # Added 2025-08-08
   gdmd = throw "gdmd has been removed from Nixpkgs, as it depends on GDC which was removed"; # Added 2025-08-08
   gdome2 = throw "'gdome2' has been removed from nixpkgs, as it is umaintained and obsolete"; # Added 2024-12-29
   geocode-glib = throw "'geocode-glib' has been removed, as it was unused and used outdated libraries"; # Added 2025-04-16
   geos_3_9 = throw "geos_3_9 has been removed from nixpkgs. Please use a more recent 'geos' instead."; # Added 2025-09-21
   geos_3_11 = throw "geos_3_11 has been removed from nixpkgs. Please use a more recent 'geos' instead."; # Added 2024-11-29
   gfbgraph = throw "'gfbgraph' has been removed as it was archived upstream and unused in nixpkgs"; # Added 2025-04-20
-  gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10
-  gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11
   gfortran7 = throw "gfortran7 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
   gfortran8 = throw "gfortran8 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
   gfortran9 = throw "gfortran9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gfortran10 = throw "gfortran10 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gfortran11 = throw "gfortran11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gfortran12 = throw "gfortran12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10
+  gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11
   gg = go-graft; # Added 2025-03-07
   ggobi = throw "'ggobi' has been removed from Nixpkgs, as it is unmaintained and broken"; # Added 2025-05-18
   ghostwriter = makePlasma5Throw "ghostwriter"; # Added 2023-03-18
@@ -1051,30 +1055,10 @@ mapAliases {
   gimp3-with-plugins = gimp-with-plugins; # added 2025-10-03
   gimp3Plugins = gimpPlugins; # added 2025-10-03
   git-annex-utils = throw "'git-annex-utils' has been removed as it is unmaintained"; # Added 2025-05-18
-  git-codeowners = throw "'git-codeowners' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  gjay = throw "'gjay' has been removed as it is unmaintained upstream"; # Added 2025-05-25
-  gmni = throw "gmni has been removed as it is no longer maintained upstream"; # Added 2025-05-02
-  gmp5 = throw "'gmp5' has been removed as it is unmaintained. Consider using 'gmp' instead"; # Added 2024-10-28
-  gmpc = throw "'gmpc' has been removed due to lack of maintenance upstream. Consider using 'plattenalbum' instead"; # Added 2024-09-14
-  gmtk = throw "'gmtk' has been removed due to lack of maintenance upstream"; # Added 2024-09-14
-  gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14
-  gnome-latex = throw "'gnome-latex' has been superseded by 'enter-tex'"; # Added 2024-09-18
-  gnome-settings-daemon43 = throw "'gnome-settings-daemon43' has been removed since it is no longer used by Pantheon."; # Added 2024-09-22
-  gnu-cobol = gnucobol; # Added 2024-09-17
-  gnupg1orig = throw "'gnupg1orig' has been removed due to lack of active upstream maintainance. Consider using 'gnupg' instead"; # Added 2025-01-11
-  gnupg22 = throw "'gnupg22' is end-of-life. Consider using 'gnupg24' instead"; # Added 2025-01-05
-  go_1_22 = throw "Go 1.22 is end-of-life and 'go_1_22' has been removed. Please use a newer Go toolchain."; # Added 2024-03-28
-  go_1_23 = throw "Go 1.23 is end-of-life and 'go_1_23' has been removed. Please use a newer Go toolchain."; # Added 2025-08-13
-  gogs = throw "
-    Gogs development has stalled. Also, it has several unpatched, critical vulnerabilities that
-    weren't addressed within a year: https://github.com/gogs/gogs/issues/7777
-
-    Consider migrating to forgejo or gitea.
-  "; # Added 2024-10-12
   git-backup = throw "git-backup has been removed, as it has been abandoned upstream. Consider using git-backup-go instead."; # Added 2024-07-16
+  git-codeowners = throw "'git-codeowners' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   git-credential-1password = throw "'git-credential-1password' has been removed, as the upstream project is deleted."; # Added 2024-05-20
   git-stree = throw "'git-stree' has been deprecated by upstream. Upstream recommends using 'git-subrepo' as a replacement."; # Added 2025-05-05
-
   gitAndTools.darcsToGit = darcs-to-git; # Added 2021-01-14
   gitAndTools.gitAnnex = git-annex; # Added 2021-01-14
   gitAndTools.gitBrunch = git-brunch; # Added 2021-01-14
@@ -1085,6 +1069,7 @@ mapAliases {
   gitversion = throw "'gitversion' has been removed because it produced a broken build and was unmaintained"; # Added 2025-08-30
   givaro_3 = throw "'givaro_3' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07
   givaro_3_7 = throw "'givaro_3_7' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07
+  gjay = throw "'gjay' has been removed as it is unmaintained upstream"; # Added 2025-05-25
   gkraken = throw "'gkraken' has been deprecated by upstream. Consider using the replacement 'coolercontrol' instead."; # Added 2024-11-22
   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
@@ -1093,18 +1078,23 @@ mapAliases {
   glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08
   glxinfo = mesa-demos; # Added 2024-07-04
   gmailieer = throw "'gmailieer' has been renamed to/replaced by 'lieer'"; # Converted to throw 2024-10-17
+  gmni = throw "gmni has been removed as it is no longer maintained upstream"; # Added 2025-05-02
   gmnisrv = throw "'gmnisrv' has been removed due to lack of maintenance upstream"; # Added 2025-06-07
   gmock = throw "'gmock' has been renamed to/replaced by 'gtest'"; # Converted to throw 2024-10-17
   gmp4 = throw "'gmp4' is end-of-life, consider using 'gmp' instead"; # Added 2024-12-24
+  gmp5 = throw "'gmp5' has been removed as it is unmaintained. Consider using 'gmp' instead"; # Added 2024-10-28
+  gmpc = throw "'gmpc' has been removed due to lack of maintenance upstream. Consider using 'plattenalbum' instead"; # Added 2024-09-14
+  gmtk = throw "'gmtk' has been removed due to lack of maintenance upstream"; # Added 2024-09-14
+  gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14
   gn1924 = throw "gn1924 has been removed because it was broken and no longer used by envoy."; # Added 2024-11-03
-  gnat-bootstrap11 = throw "gnat-bootstrap11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
-  gnat-bootstrap12 = throw "gnat-bootstrap12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gnat11 = throw "gnat11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gnat12 = throw "gnat12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gnat12Packages = throw "gnat12Packages has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
-  gnatboot = gnat-bootstrap; # Added 2023-04-07
+  gnat-bootstrap11 = throw "gnat-bootstrap11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gnat-bootstrap12 = throw "gnat-bootstrap12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gnatboot11 = throw "gnatboot11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gnatboot12 = throw "gnatboot12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
+  gnatboot = gnat-bootstrap; # Added 2023-04-07
   gnatcoll-core = gnatPackages.gnatcoll-core; # Added 2024-02-25
   gnatcoll-db2ada = gnatPackages.gnatcoll-db2ada; # Added 2024-02-25
   gnatcoll-gmp = gnatPackages.gnatcoll-gmp; # Added 2024-02-25
@@ -1120,15 +1110,20 @@ mapAliases {
   gnatcoll-xref = gnatPackages.gnatcoll-xref; # Added 2024-02-25
   gnatcoll-zlib = gnatPackages.gnatcoll-zlib; # Added 2024-02-25
   gnatinspect = gnatPackages.gnatinspect; # Added 2024-02-25
+  gnome3 = throw "'gnome3' has been renamed to/replaced by 'gnome'"; # Converted to throw 2024-10-17
   gnome-dictionary = throw "'gnome-dictionary' has been removed as it has been archived upstream. Consider using 'wordbook' instead"; # Added 2024-09-14
   gnome-firmware-updater = gnome-firmware; # added 2022-04-14
   gnome-hexgl = throw "'gnome-hexgl' has been removed due to lack of maintenance upstream"; # Added 2024-09-14
+  gnome-latex = throw "'gnome-latex' has been superseded by 'enter-tex'"; # Added 2024-09-18
   gnome-passwordsafe = gnome-secrets; # added 2022-01-30
   gnome-resources = resources; # added 2023-12-10
-  gnome3 = throw "'gnome3' has been renamed to/replaced by 'gnome'"; # Converted to throw 2024-10-17
+  gnome-settings-daemon43 = throw "'gnome-settings-daemon43' has been removed since it is no longer used by Pantheon."; # Added 2024-09-22
   gnome_mplayer = throw "'gnome_mplayer' has been removed due to lack of maintenance upstream. Consider using 'celluloid' instead"; # Added 2024-09-14
+  gnu-cobol = gnucobol; # Added 2024-09-17
   gnubik = throw "'gnubik' has been removed due to lack of maintainance upstream and its dependency on GTK 2"; # Added 2025-09-16
   gnufdisk = throw "'gnufdisk' has been removed due to lack of maintenance upstream"; # Added 2024-12-31
+  gnupg1orig = throw "'gnupg1orig' has been removed due to lack of active upstream maintainance. Consider using 'gnupg' instead"; # Added 2025-01-11
+  gnupg22 = throw "'gnupg22' is end-of-life. Consider using 'gnupg24' instead"; # Added 2025-01-05
   gnuradio3_8 = throw "gnuradio3_8 has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18
   gnuradio3_8Minimal = throw "gnuradio3_8Minimal has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18
   gnuradio3_8Packages = throw "gnuradio3_8Minimal has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18
@@ -1138,11 +1133,19 @@ mapAliases {
   gnustep = throw "The gnustep scope has been replaced with top-level packages: gnustep-back, -base, -gui, -libobjc, -make, -systempreferences; gorm, gworkspace, projectcenter."; # Added 2025-01-25
   go-thumbnailer = thud; # Added 2023-09-21
   go-upower-notify = upower-notify; # Added 2024-07-21
+  go_1_22 = throw "Go 1.22 is end-of-life and 'go_1_22' has been removed. Please use a newer Go toolchain."; # Added 2024-03-28
+  go_1_23 = throw "Go 1.23 is end-of-life and 'go_1_23' has been removed. Please use a newer Go toolchain."; # Added 2025-08-13
   gobby5 = throw "'gobby5' has been renamed to/replaced by 'gobby'"; # Converted to throw 2024-10-17
   godot-export-templates = lib.warnOnInstantiate "godot-export-templates has been renamed to godot-export-templates-bin" godot-export-templates-bin; # Added 2025-03-27
   godot_4-export-templates = lib.warnOnInstantiate "godot_4-export-templates has been renamed to godot_4-export-templates-bin" godot_4-export-templates-bin; # Added 2025-03-27
   godot_4_3-export-templates = lib.warnOnInstantiate "godot_4_3-export-templates has been renamed to godot_4_3-export-templates-bin" godot_4_3-export-templates-bin; # Added 2025-03-27
   godot_4_4-export-templates = lib.warnOnInstantiate "godot_4_4-export-templates has been renamed to godot_4_4-export-templates-bin" godot_4_4-export-templates-bin; # Added 2025-03-27
+  gogs = throw "
+    Gogs development has stalled. Also, it has several unpatched, critical vulnerabilities that
+    weren't addressed within a year: https://github.com/gogs/gogs/issues/7777
+
+    Consider migrating to forgejo or gitea.
+  "; # Added 2024-10-12
   goldwarden = throw "'goldwarden' has been removed, as it no longer works with new Bitwarden versions and is abandoned upstream"; # Added 2025-09-16
   googler = throw "'googler' has been removed, as it no longer works and is abandoned upstream"; # Added 2025-04-01
   gpicview = throw "'gpicview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'loupe', 'gthumb' or 'image-roll' instead"; # Added 2024-09-15
@@ -1174,8 +1177,8 @@ mapAliases {
   gsignond = throw "'gsignond' and its plugins have been removed due to lack of maintenance upstream"; # added 2025-04-17
   gsignondPlugins = throw "'gsignondPlugins' have been removed alongside 'gsignond' due to lack of maintenance upstream and depending on libsoup_2"; # added 2025-04-17
   gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
-  gtk-engine-bluecurve = throw "'gtk-engine-bluecurve' has been removed as it has been archived upstream."; # Added 2024-12-04
   gtk2fontsel = throw "'gtk2fontsel' has been removed due to lack of maintenance upstream. GTK now has a built-in font chooser so it's no longer needed for newer apps"; # Added 2024-10-19
+  gtk-engine-bluecurve = throw "'gtk-engine-bluecurve' has been removed as it has been archived upstream."; # Added 2024-12-04
   gtkcord4 = dissent; # Added 2024-03-10
   gtkextra = throw "'gtkextra' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
   gtkperf = throw "'gtkperf' has been removed due to lack of maintenance upstream"; # Added 2024-09-14
@@ -1184,7 +1187,6 @@ mapAliases {
   guile-sdl = throw "guile-sdl has been removed, as it was broken"; # Added 2025-08-25
   gutenprintBin = gutenprint-bin; # Added 2025-08-21
   gxneur = throw "'gxneur' has been removed due to lack of maintenance and reliance on gnome2 and 2to3."; # Added 2025-08-17
-
   hacksaw = throw "'hacksaw' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   hacpack = throw "hacpack has been removed from nixpkgs, as it has been taken down upstream"; # added 2025-09-26
   haka = throw "haka has been removed because it failed to build and was unmaintained for 9 years"; # Added 2025-03-11
@@ -1199,9 +1201,9 @@ mapAliases {
   hiddify-app = throw "hiddify-app has been removed, since it is unmaintained"; # added 2025-08-20
   himitsu-firefox = throw "himitsu-firefox has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
   hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21
+  hmetis = throw "'hmetis' has been removed as it was unmaintained and the upstream was unavailable"; # Added 2025-05-05
   hoarder = throw "'hoarder' has been renamed to 'karakeep'"; # Added 2025-04-21
   hobbes = throw "hobbes has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-20
-  hmetis = throw "'hmetis' has been removed as it was unmaintained and the upstream was unavailable"; # Added 2025-05-05
   hop-cli = throw "hop-cli has been removed as the service has been shut-down"; # Added 2024-08-13
   hpmyroom = throw "hpmyroom has been removed because it has been marked as broken since May 2024."; # Added 2025-10-11
   hpp-fcl = coal; # Added 2024-11-15
@@ -1213,32 +1215,32 @@ mapAliases {
   hyprlauncher = throw "hyprlauncher has been removed as the repository is deleted"; # Added 2024-12-27
   hyprswitch = throw "hyprswitch has been renamed to hyprshell"; # Added 2025-06-01
   hyprwall = throw "hyprwall has been removed as the repository is deleted"; # Added 2024-12-27
-
   i3-gaps = i3; # Added 2023-01-03
   i3nator = throw "'i3nator' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  ibniz = throw "ibniz has been removed because it fails to compile and the source url is dead"; # Added 2025-04-07
-  ib-tws = throw "ib-tws has been removed from nixpkgs as it was broken"; # Added 2024-07-15
   ib-controller = throw "ib-controller has been removed from nixpkgs as it was broken"; # Added 2024-07-15
+  ib-tws = throw "ib-tws has been removed from nixpkgs as it was broken"; # Added 2024-07-15
   ibm-sw-tpm2 = throw "ibm-sw-tpm2 has been removed, as it was broken"; # Added 2025-08-25
+  ibniz = throw "ibniz has been removed because it fails to compile and the source url is dead"; # Added 2025-04-07
   icuReal = throw "icuReal has been removed from nixpkgs as a mistake"; # Added 2025-02-18
   ikos = throw "ikos has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
-  imagemagick7Big = throw "'imagemagick7Big' has been renamed to/replaced by 'imagemagickBig'"; # Converted to throw 2024-10-17
   imagemagick7 = throw "'imagemagick7' has been renamed to/replaced by 'imagemagick'"; # Converted to throw 2024-10-17
   imagemagick7_light = throw "'imagemagick7_light' has been renamed to/replaced by 'imagemagick_light'"; # Converted to throw 2024-10-17
+  imagemagick7Big = throw "'imagemagick7Big' has been renamed to/replaced by 'imagemagickBig'"; # Converted to throw 2024-10-17
   imaginer = throw "'imaginer' has been removed due to lack of upstream maintenance"; # Added 2025-08-15
   immersed-vr = lib.warnOnInstantiate "'immersed-vr' has been renamed to 'immersed'" immersed; # Added 2024-08-11
   inconsolata-nerdfont = lib.warnOnInstantiate "inconsolata-nerdfont is redundant. Use nerd-fonts.inconsolata instead." nerd-fonts.inconsolata; # Added 2024-11-10
   incrtcl = tclPackages.incrtcl; # Added 2024-10-02
-  input-utils = throw "The input-utils package was dropped since it was unmaintained."; # Added 2024-06-21
   inotifyTools = inotify-tools; # Added 2015-09-01
+  input-utils = throw "The input-utils package was dropped since it was unmaintained."; # Added 2024-06-21
   insync-emblem-icons = throw "'insync-emblem-icons' has been removed, use 'insync-nautilus' instead"; # Added 2025-05-14
   inter-ui = throw "'inter-ui' has been renamed to/replaced by 'inter'"; # Converted to throw 2024-10-17
+  invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05
   invoiceplane = throw "'invoiceplane' doesn't support non-EOL PHP versions"; # Added 2025-10-03
   ioccheck = throw "ioccheck was dropped since it was unmaintained."; # Added 2025-07-06
   ipfs = kubo; # Added 2022-09-27
+  ipfs-migrator = kubo-migrator; # Added 2022-09-27
   ipfs-migrator-all-fs-repo-migrations = kubo-fs-repo-migrations; # Added 2022-09-27
   ipfs-migrator-unwrapped = kubo-migrator-unwrapped; # Added 2022-09-27
-  ipfs-migrator = kubo-migrator; # Added 2022-09-27
   iproute = throw "'iproute' has been renamed to/replaced by 'iproute2'"; # Converted to throw 2024-10-17
   ir.lv2 = ir-lv2; # Added 2025-09-37
   irrlichtmt = throw "irrlichtmt has been removed because it was moved into the Minetest repo"; # Added 2024-08-12
@@ -1246,47 +1248,51 @@ mapAliases {
   isl_0_14 = throw "isl_0_14 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
   isl_0_17 = throw "isl_0_17 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
   isl_0_24 = throw "isl_0_24 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-10-18
-  istatmenus = throw "istatmenus has beend renamed to istat-menus"; # Added 2025-05-05
   iso-flags-png-320x420 = lib.warnOnInstantiate "iso-flags-png-320x420 has been renamed to iso-flags-png-320x240" iso-flags-png-320x240; # Added 2024-07-17
+  istatmenus = throw "istatmenus has beend renamed to istat-menus"; # Added 2025-05-05
   itktcl = tclPackages.itktcl; # Added 2024-10-02
   itpp = throw "itpp has been removed, as it was broken"; # Added 2025-08-25
   iv = throw "iv has been removed as it was no longer required for neuron and broken"; # Added 2025-04-18
   ix = throw "ix has been removed from Nixpkgs, as the ix.io pastebin has been offline since Dec. 2023"; # Added 2025-04-11
-
   jack2Full = throw "'jack2Full' has been renamed to/replaced by 'jack2'"; # Converted to throw 2024-10-17
   jack_rack = throw "'jack_rack' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
-  jami-client-qt = jami-client; # Added 2022-11-06
   jami-client = jami; # Added 2023-02-10
+  jami-client-qt = jami-client; # Added 2022-11-06
   jami-daemon = jami.daemon; # Added 2023-02-10
   javacard-devkit = throw "javacard-devkit was dropped due to having a dependency on the Oracle JDK, as well as being several years out-of-date."; # Added 2024-11-01
   jd-cli = throw "jd-cli has been removed due to upstream being unmaintained since 2019. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30
   jd-gui = throw "jd-gui has been removed due to a dependency on the dead JCenter Bintray. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30
+  jdk19 = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01
+  jdk19_headless = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01
+  jdk20 = throw "OpenJDK 20 was removed as it has reached its end of life"; # Added 2024-08-01
+  jdk20_headless = throw "OpenJDK 20 was removed as it has reached its end of life"; # Added 2024-08-01
+  jdk22 = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24
+  jdk22_headless = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24
+  jdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
+  jdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
+  jdkdistro = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
   jikespg = throw "'jikespg' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
   jing = jing-trang; # Added 2025-09-18
+  jre8Plugin = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
+  jrePlugin = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
   jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2024-08-07
   jscoverage = throw "jscoverage has been removed, as it was broken"; # Added 2025-08-25
-
   julia_16-bin = throw "'julia_16-bin' has been removed from nixpkgs as it has reached end of life"; # Added 2024-10-08
-
   jush = throw "jush has been removed from nixpkgs because it is unmaintained"; # Added 2024-05-28
-
   k2pdfopt = throw "'k2pdfopt' has been removed from nixpkgs as it was broken"; # Added 2025-09-27
   k3s_1_26 = throw "'k3s_1_26' has been removed from nixpkgs as it has reached end of life"; # Added 2024-05-20
   k3s_1_27 = throw "'k3s_1_27' has been removed from nixpkgs as it has reached end of life on 2024-06-28"; # Added 2024-06-01
   k3s_1_28 = throw "'k3s_1_28' has been removed from nixpkgs as it has reached end of life"; # Added 2024-12-15
   k3s_1_29 = throw "'k3s_1_29' has been removed from nixpkgs as it has reached end of life"; # Added 2025-05-05
   k3s_1_30 = throw "'k3s_1_30' has been removed from nixpkgs as it has reached end of life"; # Added 2025-09-01
-  # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016" Added 2022-01-04
-  # now kube3d/k3d will take its place
-  kube3d = k3d; # Added 2022-07-05
   kafkacat = throw "'kafkacat' has been renamed to/replaced by 'kcat'"; # Converted to throw 2024-10-17
   kak-lsp = kakoune-lsp; # Added 2024-04-01
+  kalendar = merkuro; # Added 2023-08-24
   kanidm = lib.warnOnInstantiate "'kanidm' will be removed before 26.05. You must use a versioned package, e.g. 'kanidm_1_x'." kanidm_1_7; # Added 2025-09-01
-  kanidmWithSecretProvisioning = lib.warnOnInstantiate "'kanidmWithSecretProvisioning' will be removed before 26.05. You must use a versioned package, e.g. 'kanidmWithSecretProvisioning_1_x'." kanidmWithSecretProvisioning_1_7; # Added 2025-09-01
   kanidm_1_3 = throw "'kanidm_1_3' has been removed as it has reached end of life"; # Added 2025-03-10
   kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18
+  kanidmWithSecretProvisioning = lib.warnOnInstantiate "'kanidmWithSecretProvisioning' will be removed before 26.05. You must use a versioned package, e.g. 'kanidmWithSecretProvisioning_1_x'." kanidmWithSecretProvisioning_1_7; # Added 2025-09-01
   kanidmWithSecretProvisioning_1_4 = throw "'kanidmWithSecretProvisioning_1_4' has been removed as it has reached end of life"; # Added 2025-06-18
-  kalendar = merkuro; # Added 2023-08-24
   kbibtex = throw "'kbibtex' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
   kcli = throw "kcli has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
   kdbplus = throw "'kdbplus' has been removed from nixpkgs"; # Added 2024-05-06
@@ -1316,9 +1322,11 @@ mapAliases {
   krun = throw "'krun' has been renamed to/replaced by 'muvm'"; # Added 2025-05-01
   krunner-pass = throw "'krunner-pass' has been removed, as it only works on Plasma 5"; # Added 2025-08-30
   krunner-translator = throw "'krunner-translator' has been removed, as it only works on Plasma 5"; # Added 2025-08-30
+  # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016" Added 2022-01-04
+  # now kube3d/k3d will take its place
+  kube3d = k3d; # Added 2022-07-05
   kubei = kubeclarity; # Added 2023-05-20
   kubo-migrator-all-fs-repo-migrations = kubo-fs-repo-migrations; # Added 2024-09-24
-
   l3afpad = throw "'l3afpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-09-14
   languageMachines = {
     ticcutils = ticcutils;
@@ -1332,10 +1340,10 @@ mapAliases {
     frogdata = frogdata;
     test = frog.tests.simple;
   }; # Added 2025-10-07
-  larynx = piper-tts; # Added 2023-05-09
-  LASzip = laszip; # Added 2024-06-12
-  LASzip2 = laszip_2; # Added 2024-06-12
   lanzaboote-tool = throw "lanzaboote-tool has been removed due to lack of integration maintenance with nixpkgs. Consider using the Nix expressions provided by https://github.com/nix-community/lanzaboote"; # Added 2025-07-23
+  larynx = piper-tts; # Added 2023-05-09
+  LASzip2 = laszip_2; # Added 2024-06-12
+  LASzip = laszip; # Added 2024-06-12
   latencytop = throw "'latencytop' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   latinmodern-math = lmmath; # Added 2020-03-17
   latte-dock = throw "'latte-dock' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
@@ -1352,16 +1360,16 @@ mapAliases {
   libav_11 = libav; # Added 2024-08-25
   libav_12 = libav; # Added 2024-08-25
   libav_all = libav; # Added 2024-08-25
-  libayatana-indicator-gtk3 = libayatana-indicator; # Added 2022-10-18
   libayatana-appindicator-gtk3 = libayatana-appindicator; # Added 2022-10-18
+  libayatana-indicator-gtk3 = libayatana-indicator; # Added 2022-10-18
   libbencodetools = bencodetools; # Added 2022-07-30
-  libbpf_1 = libbpf; # Added 2022-12-06
-  libbson = mongoc; # Added 2024-03-11
   libbitcoin = throw "libbitcoin has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
   libbitcoin-client = throw "libbitcoin-client has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
   libbitcoin-explorer = throw "libbitcoin-explorer has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
   libbitcoin-network = throw "libbitcoin-network has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
   libbitcoin-protocol = throw "libbitcoin-protocol has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
+  libbpf_1 = libbpf; # Added 2022-12-06
+  libbson = mongoc; # Added 2024-03-11
   libchop = throw "libchop has been removed due to failing to build and being unmaintained upstream"; # Added 2025-05-02
   libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
   libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
@@ -1371,8 +1379,6 @@ mapAliases {
   libgadu = throw "'libgadu' has been removed as upstream is unmaintained and has no dependents or maintainers in Nixpkgs"; # Added 2025-05-17
   libgcrypt_1_8 = throw "'libgcrypt_1_8' is end-of-life. Consider using 'libgcrypt' instead"; # Added 2025-01-05
   libgda = lib.warnOnInstantiate "'libgda' has been renamed to 'libgda5'" libgda5; # Added 2025-01-21
-  lightly-boehs = throw "'lightly-boehs' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  lightly-qt = throw "'lightly-qt' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   libgme = game-music-emu; # Added 2022-07-20
   libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22
   libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17
@@ -1404,14 +1410,14 @@ mapAliases {
   LibreArp = librearp; # Added 2024-06-12
   LibreArp-lv2 = librearp-lv2; # Added 2024-06-12
   libreddit = throw "'libreddit' has been removed because it is unmaintained upstream. Consider using 'redlib', a maintained fork"; # Added 2024-07-17
-  librtlsdr = rtl-sdr; # Added 2023-02-18
   libreoffice-qt6 = libreoffice-qt; # Added 2025-08-30
-  libreoffice-qt6-unwrapped = libreoffice-qt.unwrapped; # Added 2025-08-30
   libreoffice-qt6-fresh = libreoffice-qt-fresh; # Added 2025-08-30
   libreoffice-qt6-fresh-unwrapped = libreoffice-qt-fresh.unwrapped; # Added 2025-08-30
   libreoffice-qt6-still = libreoffice-qt-still; # Added 2025-08-30
   libreoffice-qt6-still-unwrapped = libreoffice-qt-still.unwrapped; # Added 2025-08-30
+  libreoffice-qt6-unwrapped = libreoffice-qt.unwrapped; # Added 2025-08-30
   librewolf-wayland = librewolf; # Added 2022-11-15
+  librtlsdr = rtl-sdr; # Added 2023-02-18
   libseat = throw "'libseat' has been renamed to/replaced by 'seatd'"; # Converted to throw 2024-10-17
   libsForQt515 = libsForQt5; # Added 2022-11-24
   libsmartcols = lib.warnOnInstantiate "'util-linux' should be used instead of 'libsmartcols'" util-linux; # Added 2025-09-03
@@ -1424,93 +1430,96 @@ mapAliases {
   libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2024-10-17
   libtorrentRasterbar-1_2_x = throw "'libtorrentRasterbar-1_2_x' has been renamed to/replaced by 'libtorrent-rasterbar-1_2_x'"; # Converted to throw 2024-10-17
   libtorrentRasterbar-2_0_x = throw "'libtorrentRasterbar-2_0_x' has been renamed to/replaced by 'libtorrent-rasterbar-2_0_x'"; # Converted to throw 2024-10-17
+  libtransmission = lib.warnOnInstantiate (transmission3Warning {
+    prefix = "lib";
+  }) libtransmission_3; # Added 2024-06-10
   libungif = throw "'libungif' has been renamed to/replaced by 'giflib'"; # Converted to throw 2024-10-17
   libusb = throw "'libusb' has been renamed to/replaced by 'libusb1'"; # Converted to throw 2024-10-17
+  libviper = throw "'libviper' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
+  libviperfx = throw "'libviperfx' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
   libvpx_1_8 = throw "libvpx_1_8 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libvpx'"; # Added 2024-07-26
   libwnck3 = libwnck; # Added 2021-06-23
   libxplayer-plparser = throw "libxplayer-plparser has been removed as the upstream project was archived"; # Added 2024-12-27
   libzapojit = throw "'libzapojit' has been removed due to lack of upstream maintenance and archival"; # Added 2025-04-16
   licensor = throw "'licensor' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01
+  lightly-boehs = throw "'lightly-boehs' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
+  lightly-qt = throw "'lightly-qt' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   lightstep-tracer-cpp = throw "lightstep-tracer-cpp is deprecated since 2022-08-29; the upstream recommends migration to opentelemetry projects."; # Added 2023-10-18
   ligo = throw "ligo has been removed from nixpkgs for lack of maintainance"; # Added 2025-06-03
   lima-bin = lib.warnOnInstantiate "lima-bin has been replaced by lima" lima; # Added 2025-05-13
   lime3ds = throw "lime3ds is deprecated, use 'azahar' instead."; # Added 2025-03-22
   lime = throw "'lime' has been removed due to being unmaintained"; # Added 2025-03-20
   limesctl = throw "limesctl has been removed because it is insignificant."; # Added 2024-11-25
+  lincity_ng = lib.warnOnInstantiate "lincity_ng has been renamed to lincity-ng" lincity-ng; # Added 2025-10-09
   linenoise-ng = throw "'linenoise-ng' has been removed as the upstream project was archived. Consider using 'linenoise' instead."; # Added 2025-05-05
   linphone = linphonePackages.linphone-desktop; # Added 2025-09-20
-  lispPackages_new = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  lispPackages = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  lispPackagesFor = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  litecoin = throw "litecoin has been removed as nobody was maintaining it and the packaged version had known vulnerabilities"; # Added 2024-11-24
-  litecoind = throw "litecoind has been removed as nobody was maintaining it and the packaged version had known vulnerabilities"; # Added 2024-11-24
-  Literate = literate; # Added 2024-06-12
-  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
-  llama = walk; # Added 2023-01-23
-  lincity_ng = lib.warnOnInstantiate "lincity_ng has been renamed to lincity-ng" lincity-ng; # Added 2025-10-09
+  linux-libre = linuxPackages-libre.kernel;
+  linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4;
   linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;
   linux-rt_5_15 = linuxKernel.kernels.linux_rt_5_15;
-  linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4;
   linux-rt_6_1 = linuxKernel.kernels.linux_rt_6_1;
-  linuxPackages_4_19 = linuxKernel.packages.linux_4_19;
-  linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
-  linuxPackages_5_10 = linuxKernel.packages.linux_5_10;
-  linuxPackages_5_15 = linuxKernel.packages.linux_5_15;
-  linuxPackages_6_1 = linuxKernel.packages.linux_6_1;
-  linuxPackages_6_6 = linuxKernel.packages.linux_6_6;
-  linuxPackages_6_9 = linuxKernel.packages.linux_6_9;
-  linuxPackages_6_10 = linuxKernel.packages.linux_6_10;
-  linuxPackages_6_11 = linuxKernel.packages.linux_6_11;
-  linuxPackages_6_12 = linuxKernel.packages.linux_6_12;
-  linuxPackages_6_13 = linuxKernel.packages.linux_6_13;
-  linuxPackages_6_14 = linuxKernel.packages.linux_6_14;
-  linuxPackages_6_15 = linuxKernel.packages.linux_6_15;
-  linuxPackages_6_16 = linuxKernel.packages.linux_6_16;
-  linuxPackages_6_17 = linuxKernel.packages.linux_6_17;
-  linuxPackages_ham = linuxKernel.packages.linux_ham;
-  linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
-  linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;
-  linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;
-  linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2;
-  linuxPackages_rpi3 = linuxKernel.packages.linux_rpi3;
-  linuxPackages_rpi4 = linuxKernel.packages.linux_rpi4;
-  linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10;
-  linuxPackages_rt_5_15 = linuxKernel.packages.linux_rt_5_15;
-  linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4;
-  linuxPackages_rt_6_1 = linuxKernel.packages.linux_rt_6_1;
   linux_4_19 = linuxKernel.kernels.linux_4_19;
   linux_5_4 = linuxKernel.kernels.linux_5_4;
+  linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened; # Added 2025-08-10
   linux_5_10 = linuxKernel.kernels.linux_5_10;
+  linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened; # Added 2025-08-10
   linux_5_15 = linuxKernel.kernels.linux_5_15;
+  linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened; # Added 2025-08-10
   linux_6_1 = linuxKernel.kernels.linux_6_1;
+  linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened; # Added 2025-08-10
   linux_6_6 = linuxKernel.kernels.linux_6_6;
+  linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened; # Added 2025-08-10
   linux_6_9 = linuxKernel.kernels.linux_6_9;
   linux_6_10 = linuxKernel.kernels.linux_6_10;
   linux_6_11 = linuxKernel.kernels.linux_6_11;
   linux_6_12 = linuxKernel.kernels.linux_6_12;
+  linux_6_12_hardened = linuxKernel.kernels.linux_6_12_hardened; # Added 2025-08-10
   linux_6_13 = linuxKernel.kernels.linux_6_13;
+  linux_6_13_hardened = linuxKernel.kernels.linux_6_13_hardened; # Added 2021-08-16
   linux_6_14 = linuxKernel.kernels.linux_6_14;
+  linux_6_14_hardened = linuxKernel.kernels.linux_6_14_hardened; # Added 2021-08-16
   linux_6_15 = linuxKernel.kernels.linux_6_15;
   linux_6_16 = linuxKernel.kernels.linux_6_16;
   linux_6_17 = linuxKernel.kernels.linux_6_17;
   linux_ham = linuxKernel.kernels.linux_ham;
+  linux_hardened = linuxPackages_hardened.kernel; # Added 2025-08-10
+  linux_latest-libre = linuxPackages_latest-libre.kernel;
+  linux_latest_hardened = linuxPackages_latest_hardened; # Added 2021-08-16
   linux_rpi0 = linuxKernel.kernels.linux_rpi1;
-  linux_rpi02w = linuxKernel.kernels.linux_rpi3;
   linux_rpi1 = linuxKernel.kernels.linux_rpi1;
   linux_rpi2 = linuxKernel.kernels.linux_rpi2;
+  linux_rpi02w = linuxKernel.kernels.linux_rpi3;
   linux_rpi3 = linuxKernel.kernels.linux_rpi3;
   linux_rpi4 = linuxKernel.kernels.linux_rpi4;
-
-  linuxPackages_xen_dom0 = linuxPackages; # Added 2021-04-04
-  linuxPackages_latest_xen_dom0 = linuxPackages_latest; # Added 2021-04-04
-  linuxPackages_xen_dom0_hardened = linuxPackages_hardened; # Added 2021-04-04
-  linuxPackages_latest_xen_dom0_hardened = linuxPackages_latest_hardened; # Added 2021-04-04
+  linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; # Converted to throw 2024-01-09
+  linuxPackages-libre = linuxKernel.packages.linux_libre;
+  linuxPackages_4_19 = linuxKernel.packages.linux_4_19;
+  linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
+  linuxPackages_5_4_hardened = linuxKernel.packages.linux_5_4_hardened; # Added 2025-08-10
+  linuxPackages_5_10 = linuxKernel.packages.linux_5_10;
+  linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened; # Added 2025-08-10
+  linuxPackages_5_15 = linuxKernel.packages.linux_5_15;
+  linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened; # Added 2025-08-10
+  linuxPackages_6_1 = linuxKernel.packages.linux_6_1;
+  linuxPackages_6_1_hardened = linuxKernel.packages.linux_6_1_hardened; # Added 2025-08-10
+  linuxPackages_6_6 = linuxKernel.packages.linux_6_6;
+  linuxPackages_6_6_hardened = linuxKernel.packages.linux_6_6_hardened; # Added 2025-08-10
+  linuxPackages_6_9 = linuxKernel.packages.linux_6_9;
+  linuxPackages_6_10 = linuxKernel.packages.linux_6_10;
+  linuxPackages_6_11 = linuxKernel.packages.linux_6_11;
+  linuxPackages_6_12 = linuxKernel.packages.linux_6_12;
+  linuxPackages_6_12_hardened = linuxKernel.packages.linux_6_12_hardened; # Added 2025-08-10
+  linuxPackages_6_13 = linuxKernel.packages.linux_6_13;
   linuxPackages_6_13_hardened = linuxKernel.packages.linux_6_13_hardened; # Added 2021-08-16
-  linux_6_13_hardened = linuxKernel.kernels.linux_6_13_hardened; # Added 2021-08-16
+  linuxPackages_6_14 = linuxKernel.packages.linux_6_14;
   linuxPackages_6_14_hardened = linuxKernel.packages.linux_6_14_hardened; # Added 2021-08-16
-  linux_6_14_hardened = linuxKernel.kernels.linux_6_14_hardened; # Added 2021-08-16
+  linuxPackages_6_15 = linuxKernel.packages.linux_6_15;
+  linuxPackages_6_16 = linuxKernel.packages.linux_6_16;
+  linuxPackages_6_17 = linuxKernel.packages.linux_6_17;
+  linuxPackages_ham = linuxKernel.packages.linux_ham;
+  linuxPackages_hardened = linuxKernel.packages.linux_hardened; # Added 2025-08-10
+  linuxPackages_latest-libre = linuxKernel.packages.linux_latest_libre;
   linuxPackages_latest_hardened = throw "
     The attribute `linuxPackages_hardened_latest' was dropped because the hardened patches
     frequently lag behind the upstream kernel. In some cases this meant that this attribute
@@ -1522,104 +1531,72 @@ mapAliases {
 
     [1] for more context: https://github.com/NixOS/nixpkgs/pull/133587
   "; # Added 2021-08-16
-  linux_latest_hardened = linuxPackages_latest_hardened; # Added 2021-08-16
-
-  linuxPackages_hardened = linuxKernel.packages.linux_hardened; # Added 2025-08-10
-  linux_hardened = linuxPackages_hardened.kernel; # Added 2025-08-10
-  linuxPackages_5_4_hardened = linuxKernel.packages.linux_5_4_hardened; # Added 2025-08-10
-  linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened; # Added 2025-08-10
-  linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened; # Added 2025-08-10
-  linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened; # Added 2025-08-10
-  linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened; # Added 2025-08-10
-  linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened; # Added 2025-08-10
-  linuxPackages_6_1_hardened = linuxKernel.packages.linux_6_1_hardened; # Added 2025-08-10
-  linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened; # Added 2025-08-10
-  linuxPackages_6_6_hardened = linuxKernel.packages.linux_6_6_hardened; # Added 2025-08-10
-  linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened; # Added 2025-08-10
-  linuxPackages_6_12_hardened = linuxKernel.packages.linux_6_12_hardened; # Added 2025-08-10
-  linux_6_12_hardened = linuxKernel.kernels.linux_6_12_hardened; # Added 2025-08-10
-
+  linuxPackages_latest_xen_dom0 = linuxPackages_latest; # Added 2021-04-04
+  linuxPackages_latest_xen_dom0_hardened = linuxPackages_latest_hardened; # Added 2021-04-04
+  linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
+  linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;
+  linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2;
+  linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;
+  linuxPackages_rpi3 = linuxKernel.packages.linux_rpi3;
+  linuxPackages_rpi4 = linuxKernel.packages.linux_rpi4;
+  linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4;
+  linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10;
+  linuxPackages_rt_5_15 = linuxKernel.packages.linux_rt_5_15;
+  linuxPackages_rt_6_1 = linuxKernel.packages.linux_rt_6_1;
   linuxPackages_testing_bcachefs = throw "'linuxPackages_testing_bcachefs' has been removed, please use 'linuxPackages_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; # Converted to throw 2024-01-09
-  linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; # Converted to throw 2024-01-09
-
-  linuxPackages-libre = linuxKernel.packages.linux_libre;
-  linux-libre = linuxPackages-libre.kernel;
-  linuxPackages_latest-libre = linuxKernel.packages.linux_latest_libre;
-  linux_latest-libre = linuxPackages_latest-libre.kernel;
-
+  linuxPackages_xen_dom0 = linuxPackages; # Added 2021-04-04
+  linuxPackages_xen_dom0_hardened = linuxPackages_hardened; # Added 2021-04-04
   linuxstopmotion = stopmotion; # Added 2024-11-01
-
+  lispPackages = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
+  lispPackages_new = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
+  lispPackagesFor = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
+  litecoin = throw "litecoin has been removed as nobody was maintaining it and the packaged version had known vulnerabilities"; # Added 2024-11-24
+  litecoind = throw "litecoind has been removed as nobody was maintaining it and the packaged version had known vulnerabilities"; # Added 2024-11-24
+  Literate = literate; # Added 2024-06-12
+  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
-
   lizardfs = throw "lizardfs has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
-
-  llvmPackages_9 = throw "llvmPackages_9 has been removed from nixpkgs"; # Added 2024-04-08
-  llvm_9 = throw "llvm_9 has been removed from nixpkgs"; # Added 2024-04-08
+  llama = walk; # Added 2023-01-23
   lld_9 = throw "lld_9 has been removed from nixpkgs"; # Added 2024-04-08
-  lldb_9 = throw "lldb_9 has been removed from nixpkgs"; # Added 2024-04-08
-  clang_9 = throw "clang_9 has been removed from nixpkgs"; # Added 2024-04-08
-  clang9Stdenv = throw "clang9Stdenv has been removed from nixpkgs"; # Added 2024-04-08
-  clang-tools_9 = throw "clang-tools_9 has been removed from nixpkgs"; # Added 2024-04-08
-
-  llvmPackages_12 = throw "llvmPackages_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  llvm_12 = throw "llvm_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   lld_12 = throw "lld_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  lldb_12 = throw "lldb_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  clang_12 = throw "clang_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  clang12Stdenv = throw "clang12Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  clang-tools_12 = throw "clang-tools_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-
-  llvmPackages_13 = throw "llvmPackages_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  llvm_13 = throw "llvm_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   lld_13 = throw "lld_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  lldb_13 = throw "lldb_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  clang_13 = throw "clang_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  clang13Stdenv = throw "clang13Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  clang-tools_13 = throw "clang-tools_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-
-  llvmPackages_14 = throw "llvmPackages_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  llvm_14 = throw "llvm_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   lld_14 = throw "lld_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  lldb_14 = throw "lldb_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  clang_14 = throw "clang_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  clang14Stdenv = throw "clang14Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-  clang-tools_14 = throw "clang-tools_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
-
-  llvmPackages_15 = throw "llvmPackages_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
-  llvm_15 = throw "llvm_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
   lld_15 = throw "lld_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
-  lldb_15 = throw "lldb_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
-  clang_15 = throw "clang_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
-  clang15Stdenv = throw "clang15Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
-  clang-tools_15 = throw "clang-tools_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
-
-  llvmPackages_16 = throw "llvmPackages_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  llvm_16 = throw "llvm_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   lld_16 = throw "lld_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  lldb_16 = throw "lldb_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  mlir_16 = throw "mlir_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  clang_16 = throw "clang_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  clang16Stdenv = throw "clang16Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  clang-tools_16 = throw "clang-tools_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-
-  llvmPackages_17 = throw "llvmPackages_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  llvm_17 = throw "llvm_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   lld_17 = throw "lld_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  lldb_9 = throw "lldb_9 has been removed from nixpkgs"; # Added 2024-04-08
+  lldb_12 = throw "lldb_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  lldb_13 = throw "lldb_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  lldb_14 = throw "lldb_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  lldb_15 = throw "lldb_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
+  lldb_16 = throw "lldb_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   lldb_17 = throw "lldb_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  mlir_17 = throw "mlir_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  clang_17 = throw "clang_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  clang17Stdenv = throw "clang17Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  clang-tools_17 = throw "clang-tools_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-
+  llvm_9 = throw "llvm_9 has been removed from nixpkgs"; # Added 2024-04-08
+  llvm_12 = throw "llvm_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  llvm_13 = throw "llvm_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  llvm_14 = throw "llvm_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  llvm_15 = throw "llvm_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
+  llvm_16 = throw "llvm_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  llvm_17 = throw "llvm_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  llvmPackages_9 = throw "llvmPackages_9 has been removed from nixpkgs"; # Added 2024-04-08
+  llvmPackages_12 = throw "llvmPackages_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  llvmPackages_13 = throw "llvmPackages_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  llvmPackages_14 = throw "llvmPackages_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
+  llvmPackages_15 = throw "llvmPackages_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
+  llvmPackages_16 = throw "llvmPackages_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  llvmPackages_17 = throw "llvmPackages_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   lobster-two = throw "'lobster-two' has been renamed to/replaced by 'google-fonts'"; # Converted to throw 2024-10-17
   loc = throw "'loc' has been removed due to lack of upstream maintenance. Consider 'tokei' as an alternative."; # Added 2025-01-25
   loco-cli = loco; # Added 2025-02-24
   loop = throw "'loop' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
+  LPCNet = lpcnet; # Added 2025-05-05
+  lpcnetfreedv = throw "lpcnetfreedv was removed in favor of LPCNet"; # Added 2025-05-05
   ltwheelconf = throw "'ltwheelconf' has been removed because it is obsolete"; # Added 2025-05-07
-  luna-icons = throw "luna-icons has been removed as it was removed upstream"; # Added 2024-10-29
   lucene = throw "lucene has been removed since it was both wildly out of date and was not even built properly for 4 years"; # Added 2025-04-10
   luci-go = throw "luci-go has been removed since it was unused and failing to build for 5 months"; # Added 2025-08-27
   lumail = throw "'lumail' has been removed since its upstream is unavailable"; # Added 2025-05-07
+  luna-icons = throw "luna-icons has been removed as it was removed upstream"; # Added 2024-10-29
   lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18
   lxd = throw "
     LXD has been removed from NixOS due to lack of Nixpkgs maintenance.
@@ -1646,7 +1623,6 @@ mapAliases {
     Consider migrating or switching to Incus, or remove from your configuration.
     https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/
   "; # Added 2025-09-05
-
   lxde = {
     gtk2-x11 = throw "'lxde.gtk2-x11' has been removed. Use 'gtk2-x11' directly."; # added 2025-08-31
     lxappearance = throw "'lxappearance' has been moved to top-level. Use 'lxappearance' directly"; # added 2025-08-31
@@ -1657,11 +1633,9 @@ mapAliases {
     lxsession = throw "'lxsession' has been moved to top-level. Use 'lxsession' directly"; # added 2025-08-31
     lxtask = throw "'lxtask' has been moved to top-level. Use 'lxtask' directly"; # added 2025-08-31
   };
-
   lxdvdrip = throw "'lxdvdrip' has been removed due to lack of upstream maintenance."; # Added 2025-06-09
   lzma = throw "'lzma' has been renamed to/replaced by 'xz'"; # Converted to throw 2024-10-17
   lzwolf = throw "'lzwolf' has been removed because it's no longer maintained upstream. Consider using 'ecwolf'"; # Added 2025-03-02
-
   ma1sd = throw "ma1sd was dropped as it is unmaintained"; # Added 2024-07-10
   mac = monkeysAudio; # Added 2024-11-30
   MACS2 = macs2; # Added 2023-06-12
@@ -1672,16 +1646,16 @@ mapAliases {
   mailman-rss = throw "The mailman-rss package was dropped since it was unmaintained."; # Added 2024-06-21
   mailnag = throw "mailnag has been removed because it has been marked as broken since 2022."; # Added 2025-10-12
   mailnagWithPlugins = throw "mailnagWithPlugins has been removed because mailnag has been marked as broken since 2022."; # Added 2025-10-12
-  melmatcheq.lv2 = melmatcheq-lv2; # Added 2025-09-27
-  mariadb_105 = throw "'mariadb_105' has been removed because it reached its End of Life. Consider upgrading to 'mariadb_106'."; # Added 2025-04-26
-  mariadb_110 = throw "mariadb_110 has been removed from nixpkgs, please switch to another version like mariadb_114"; # Added 2024-08-15
-  mariadb-client = hiPrio mariadb.client; # added 2019.07.28
   maligned = throw "maligned was deprecated upstream in favor of x/tools/go/analysis/passes/fieldalignment"; # Added 2024-08-24
-  manicode = throw "manicode has been renamed to codebuff"; # Added 2024-12-10
   manaplus = throw "manaplus has been removed, as it was broken"; # Added 2025-08-25
+  manicode = throw "manicode has been renamed to codebuff"; # Added 2024-12-10
   manta = throw "manta does not support python3, and development has been abandoned upstream"; # Added 2025-03-17
   manticore = throw "manticore is no longer maintained since 2020, and doesn't build since smlnj-110.99.7.1"; # Added 2025-05-17
-
+  maple-mono-autohint = throw "
+    maple-mono-autohint had been moved to maple-mono.truetype-autohint.
+    for installing all maple-mono:
+      fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono)
+  "; # Added 2025-03-16
   maple-mono-NF = throw "
     maple-mono-NF had been moved to maple-mono.NF.
     for installing all maple-mono:
@@ -1692,36 +1666,33 @@ mapAliases {
     for installing all maple-mono:
       fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono)
   "; # Added 2025-03-16
-  maple-mono-woff2 = throw "
-    maple-mono-woff2 had been moved to maple-mono.woff2.
-    for installing all maple-mono:
-      fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono)
-  "; # Added 2025-03-16
   maple-mono-SC-NF = throw "
     mono-SC-NF had been superseded by maple-mono.NF-CN.
     for installing all maple-mono:
       fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono)
   "; # Added 2025-03-16
-  maple-mono-autohint = throw "
-    maple-mono-autohint had been moved to maple-mono.truetype-autohint.
+  maple-mono-woff2 = throw "
+    maple-mono-woff2 had been moved to maple-mono.woff2.
     for installing all maple-mono:
       fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono)
   "; # Added 2025-03-16
-
   mapmap = throw "'mapmap' has been removed as it has been unmaintained since 2021"; # Added 2025-05-17
+  mariadb-client = hiPrio mariadb.client; # added 2019.07.28
+  mariadb_105 = throw "'mariadb_105' has been removed because it reached its End of Life. Consider upgrading to 'mariadb_106'."; # Added 2025-04-26
+  mariadb_110 = throw "mariadb_110 has been removed from nixpkgs, please switch to another version like mariadb_114"; # Added 2024-08-15
   markets = throw "'markets' has been removed as it was archived upstream in 2023"; # Added 2025-04-17
   marwaita-manjaro = lib.warnOnInstantiate "marwaita-manjaro has been renamed to marwaita-teal" marwaita-teal; # Added 2024-07-08
   marwaita-peppermint = lib.warnOnInstantiate "marwaita-peppermint has been renamed to marwaita-red" marwaita-red; # Added 2024-07-01
-  marwaita-ubuntu = lib.warnOnInstantiate "marwaita-ubuntu has been renamed to marwaita-orange" marwaita-orange; # Added 2024-07-08
   marwaita-pop_os = lib.warnOnInstantiate "marwaita-pop_os has been renamed to marwaita-yellow" marwaita-yellow; # Added 2024-10-29
+  marwaita-ubuntu = lib.warnOnInstantiate "marwaita-ubuntu has been renamed to marwaita-orange" marwaita-orange; # Added 2024-07-08
   masari = throw "masari has been removed as it was abandoned upstream"; # Added 2024-07-11
   material-kwin-decoration = throw "'material-kwin-decoration' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   mathematica9 = throw "mathematica9 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20
   mathematica10 = throw "mathematica10 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20
   mathematica11 = throw "mathematica11 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20
   mathlibtools = throw "mathlibtools has been removed as it was archived upstream in 2023"; # Added 2025-07-09
-  matomo_5 = matomo; # Added 2024-12-12
   matomo-beta = throw "matomo-beta has been removed as it mostly just pointed to the latest matomo release, use `matomo.overrideAttrs` to access a specific beta version instead"; # Added 2025-01-15
+  matomo_5 = matomo; # Added 2024-12-12
   matrique = throw "'matrique' has been renamed to/replaced by 'spectral'"; # Converted to throw 2024-10-17
   matrix-sliding-sync = throw "matrix-sliding-sync has been removed as matrix-synapse 114.0 and later covers its functionality"; # Added 2024-10-20
   matrix-synapse-tools = recurseIntoAttrs {
@@ -1730,60 +1701,64 @@ mapAliases {
   }; # Added 2025-02-20
   mcomix3 = mcomix; # Added 2022-06-05
   mdt = md-tui; # Added 2024-09-03
-  meilisearch_1_11 = throw "'meilisearch_1_11' has been removed, as it is no longer supported"; # Added 2025-10-03
   mediastreamer = throw "'mediastreamer' has been moved to 'linphonePackages.mediastreamer2'"; # Added 2025-09-20
   mediastreamer-openh264 = throw "'mediastreamer-openh264' has been moved to 'linphonePackages.msopenh264'"; # Added 2025-09-20
+  meilisearch_1_11 = throw "'meilisearch_1_11' has been removed, as it is no longer supported"; # Added 2025-10-03
+  melmatcheq.lv2 = melmatcheq-lv2; # Added 2025-09-27
   meme = throw "'meme' has been renamed to/replaced by 'meme-image-generator'"; # Converted to throw 2024-10-17
   memorymapping = throw "memorymapping has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05
   memorymappingHook = throw "memorymapping has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05
   memstream = throw "memstream has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05
   memstreamHook = throw "memstream has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05
+  mesa_drivers = throw "'mesa_drivers' has been removed, use 'pkgs.mesa' instead."; # Converted to throw 2024-07-11
   meteo = throw "'meteo' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
   mhwaveedit = throw "'mkwaveedit' has been removed due to lack of maintenance upstream. Consider using 'audacity' or 'tenacity' instead"; # Added 2024-09-15
   microcodeAmd = microcode-amd; # Added 2024-09-08
   microcodeIntel = microcode-intel; # Added 2024-09-08
   micropad = throw "micropad has been removed, since it was unmaintained and blocked the Electron 27 removal."; # Added 2025-02-24
   microsoft_gsl = microsoft-gsl; # Added 2023-05-26
+  MIDIVisualizer = midivisualizer; # Added 2024-06-12
   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 = midori; # Added 2025-05-19
-  MIDIVisualizer = midivisualizer; # Added 2024-06-12
   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
   mikutter = throw "'mikutter' has been removed because the package was broken and had no maintainers"; # Added 2024-10-01
   mime-types = mailcap; # Added 2022-01-21
   minecraft = throw "'minecraft' has been removed because the package was broken. Consider using 'prismlauncher' instead"; # Added 2025-09-06
   minetest = luanti; # Added 2024-11-11
+  minetest-touch = luanti-client; # Added 2024-08-12
   minetestclient = luanti-client; # Added 2024-11-11
   minetestserver = luanti-server; # Added 2024-11-11
-  minetest-touch = luanti-client; # Added 2024-08-12
   minizip2 = pkgs.minizip-ng; # Added 2022-12-28
   miru = throw "'miru' has been removed due to lack maintenance"; # Added 2025-08-21
+  mlir_16 = throw "mlir_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
+  mlir_17 = throw "mlir_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   mmsd = throw "'mmsd' has been removed due to being unmaintained upstream. Consider using 'mmsd-tng' instead"; # Added 2025-06-07
   mmutils = throw "'mmutils' has been removed due to being unmaintained upstream"; # Added 2025-08-29
   moar = lib.warnOnInstantiate "`moar` has been renamed to `moor` by upstream in v2.0.0. See https://github.com/walles/moor/pull/305 for more." pkgs.moor; # Added 2025-09-02
-  mod_dnssd = throw "'mod_dnssd' has been renamed to/replaced by 'apacheHttpdPackages.mod_dnssd'"; # Converted to throw 2024-10-17
-  mod_fastcgi = throw "'mod_fastcgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_fastcgi'"; # Converted to throw 2024-10-17
-  mod_python = throw "'mod_python' has been renamed to/replaced by 'apacheHttpdPackages.mod_python'"; # Converted to throw 2024-10-17
-  mod_wsgi = throw "'mod_wsgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_wsgi'"; # Converted to throw 2024-10-17
   mod_ca = throw "'mod_ca' has been renamed to/replaced by 'apacheHttpdPackages.mod_ca'"; # Converted to throw 2024-10-17
   mod_crl = throw "'mod_crl' has been renamed to/replaced by 'apacheHttpdPackages.mod_crl'"; # Converted to throw 2024-10-17
   mod_csr = throw "'mod_csr' has been renamed to/replaced by 'apacheHttpdPackages.mod_csr'"; # Converted to throw 2024-10-17
+  mod_dnssd = throw "'mod_dnssd' has been renamed to/replaced by 'apacheHttpdPackages.mod_dnssd'"; # Converted to throw 2024-10-17
+  mod_fastcgi = throw "'mod_fastcgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_fastcgi'"; # Converted to throw 2024-10-17
   mod_ocsp = throw "'mod_ocsp' has been renamed to/replaced by 'apacheHttpdPackages.mod_ocsp'"; # Converted to throw 2024-10-17
+  mod_pkcs12 = throw "'mod_pkcs12' has been renamed to/replaced by 'apacheHttpdPackages.mod_pkcs12'"; # Converted to throw 2024-10-17
+  mod_python = throw "'mod_python' has been renamed to/replaced by 'apacheHttpdPackages.mod_python'"; # Converted to throw 2024-10-17
   mod_scep = throw "'mod_scep' has been renamed to/replaced by 'apacheHttpdPackages.mod_scep'"; # Converted to throw 2024-10-17
   mod_spkac = throw "'mod_spkac' has been renamed to/replaced by 'apacheHttpdPackages.mod_spkac'"; # Converted to throw 2024-10-17
-  mod_pkcs12 = throw "'mod_pkcs12' has been renamed to/replaced by 'apacheHttpdPackages.mod_pkcs12'"; # Converted to throw 2024-10-17
   mod_timestamp = throw "'mod_timestamp' has been renamed to/replaced by 'apacheHttpdPackages.mod_timestamp'"; # Converted to throw 2024-10-17
-  monitor = pantheon.elementary-monitor; # Added 2025-10-10
-  mono-addins = throw "mono-addins has been removed due to its dependency on the removed mono4. Consider alternative frameworks or migrate to newer .NET technologies."; # Added 2025-08-25
-  mono4 = mono6; # Added 2025-08-25
-  mono5 = mono6; # Added 2025-08-25
+  mod_wsgi = throw "'mod_wsgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_wsgi'"; # Converted to throw 2024-10-17
   monero = throw "'monero' has been renamed to/replaced by 'monero-cli'"; # Converted to throw 2024-10-17
   mongodb-4_4 = throw "mongodb-4_4 has been removed, it's end of life since April 2024"; # Added 2024-04-11
   mongodb-5_0 = throw "mongodb-5_0 has been removed, it's end of life since October 2024"; # Added 2024-10-01
   mongodb-6_0 = throw "mongodb-6_0 has been removed, it's end of life since July 2025"; # Added 2025-07-23
+  monitor = pantheon.elementary-monitor; # Added 2025-10-10
+  mono4 = mono6; # Added 2025-08-25
+  mono5 = mono6; # Added 2025-08-25
+  mono-addins = throw "mono-addins has been removed due to its dependency on the removed mono4. Consider alternative frameworks or migrate to newer .NET technologies."; # Added 2025-08-25
   monotoneViz = throw "monotoneViz was removed because it relies on a broken version of graphviz"; # added 2025-10-19
-  moralerspace-nf = throw "moralerspace-nf has been removed, use moralerspace instead."; # Added 2025-08-30
   moralerspace-hwnf = throw "moralerspace-hwnf has been removed, use moralerspace-hw instead."; # Added 2025-08-30
+  moralerspace-nf = throw "moralerspace-nf has been removed, use moralerspace instead."; # Added 2025-08-30
   morty = throw "morty has been removed, as searxng removed support for it and it was unmaintained."; # Added 2025-09-26
   moz-phab = mozphab; # Added 2022-08-09
   mp3info = throw "'mp3info' has been removed due to lack of maintenance upstream. Consider using 'eartag' or 'tagger' instead"; # Added 2024-09-14
@@ -1791,15 +1766,15 @@ mapAliases {
   mpc-cli = mpc; # Added 2024-10-14
   mpc_cli = mpc; # Added 2024-10-14
   mpd_clientlib = throw "'mpd_clientlib' has been renamed to/replaced by 'libmpdclient'"; # Converted to throw 2024-10-17
-  mpdWithFeatures = lib.warnOnInstantiate "mpdWithFeatures has been replaced by mpd.override" mpd.override; # Added 2025-08-08
   mpdevil = plattenalbum; # Added 2024-05-22
+  mpdWithFeatures = lib.warnOnInstantiate "mpdWithFeatures has been replaced by mpd.override" mpd.override; # Added 2025-08-08
   mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10
   mpris-discord-rpc = throw "'mpris-discord-rpc' has been renamed to 'music-discord-rpc'."; # Added 2025-09-14
   mq-cli = throw "'mq-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   mrkd = throw "'mrkd' has been removed as it is unmaintained since 2021"; # Added 2024-12-21
   mrxvt = throw "'mrxvt' has been removed due to lack of maintainence upstream"; # Added 2025-09-25
-  msp430NewlibCross = msp430Newlib; # Added 2024-09-06
   msgpack = throw "msgpack has been split into msgpack-c and msgpack-cxx"; # Added 2025-09-14
+  msp430NewlibCross = msp430Newlib; # Added 2024-09-06
   mumps_par = lib.warnOnInstantiate "mumps_par has been renamed to mumps-mpi" mumps-mpi; # Added 2025-05-07
   mupdf_1_17 = throw "'mupdf_1_17' has been removed due to being outdated and insecure. Consider using 'mupdf' instead."; # Added 2024-08-22
   music-player = throw "'music-player' has been removed due to lack of maintenance upstream. Consider using 'fum' or 'termusic' instead."; # Added 2025-05-02
@@ -1807,19 +1782,42 @@ mapAliases {
   mutt-with-sidebar = mutt; # Added 2022-09-17
   mutter43 = throw "'mutter43' has been removed since it is no longer used by Pantheon."; # Added 2024-09-22
   mx-puppet-discord = throw "mx-puppet-discord was removed since the packaging was unmaintained and was the sole user of sha1 hashes in nixpkgs"; # Added 2025-07-24
-  mysql-client = hiPrio mariadb.client;
   mysql = throw "'mysql' has been renamed to/replaced by 'mariadb'"; # Converted to throw 2024-10-17
-  mesa_drivers = throw "'mesa_drivers' has been removed, use 'pkgs.mesa' instead."; # Converted to throw 2024-07-11
-
+  mysql-client = hiPrio mariadb.client;
   n98-magerun = throw "n98-magerun doesn't support new PHP newer than 8.1"; # Added 2025-10-03
+  nagiosPluginsOfficial = monitoring-plugins; # Added 2017-08-07
   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
   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 = ncdu; # Added 2022-07-22
   neardal = throw "neardal has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29
+  neochat = makePlasma5Throw "neochat"; # added 2022-05-10
   neocities-cli = neocities; # Added 2024-07-31
   neocomp = throw "neocomp has been remove because it fails to build and was unmaintained upstream"; # Added 2025-04-28
+  nerdfonts =
+    throw
+      "
+    nerdfonts has been separated into individual font packages under the namespace nerd-fonts.
+    For example change:
+      fonts.packages = [
+        ...
+        (pkgs.nerdfonts.override { fonts = [ "
+      0
+      xproto
+      " "
+      DroidSansMono
+      " ]; })
+      ]
+    to
+      fonts.packages = [
+        ...
+        pkgs.nerd-fonts._0xproto
+        pkgs.nerd-fonts.droid-sans-mono
+      ]
+    or for all fonts
+      fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts)
+  "; # Added 2024-11-09
   netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02
   netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22
   netbox_3_7 = throw "netbox 3.7 series has been removed as it was EOL"; # Added 2025-04-23
@@ -1844,9 +1842,10 @@ mapAliases {
     nsgenbind = lib.warnOnInstantiate "'netsurf.nsgenbind' has been renamed to 'nsgenbind'" nsgenbind; # Added 2025-03-26
   };
   nettools = net-tools; # Added 2025-06-11
+  networkmanager_strongswan = networkmanager-strongswan; # added 2025-06-29
+  newlib-nanoCross = newlib-nano; # Added 2024-09-06
+  newlibCross = newlib; # Added 2024-09-06
   newt-go = fosrl-newt; # Added 2025-06-24
-  notes-up = throw "'notes-up' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
-  notify-sharp = throw "'notify-sharp' has been removed as it was unmaintained and depends on deprecated dbus-sharp versions"; # Added 2025-08-25
   nextcloud30 = throw "
     Nextcloud v30 has been removed from `nixpkgs` as the support for is dropped
     by upstream in 2025-09. Please upgrade to at least Nextcloud v31 by declaring
@@ -1860,28 +1859,6 @@ mapAliases {
   "; # Added 2025-09-25
   nextcloud30Packages = throw "Nextcloud 30 is EOL!"; # Added 2025-09-25
   nextcloud-news-updater = throw "nextcloud-news-updater has been removed because the project is unmaintained"; # Added 2025-03-28
-  nixForLinking = throw "nixForLinking has been removed, use `nixVersions.nixComponents_<version>` instead"; # Added 2025-08-14
-  nagiosPluginsOfficial = monitoring-plugins; # Added 2017-08-07
-  neochat = makePlasma5Throw "neochat"; # added 2022-05-10
-  nerdfonts = throw "
-    nerdfonts has been separated into individual font packages under the namespace nerd-fonts.
-    For example change:
-      fonts.packages = [
-        ...
-        (pkgs.nerdfonts.override { fonts = [ "0xproto" "DroidSansMono" ]; })
-      ]
-    to
-      fonts.packages = [
-        ...
-        pkgs.nerd-fonts._0xproto
-        pkgs.nerd-fonts.droid-sans-mono
-      ]
-    or for all fonts
-      fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts)
-  "; # Added 2024-11-09
-  networkmanager_strongswan = networkmanager-strongswan; # added 2025-06-29
-  newlibCross = newlib; # Added 2024-09-06
-  newlib-nanoCross = newlib-nano; # Added 2024-09-06
   nfstrace = throw "nfstrace has been removed, as it was broken"; # Added 2025-08-25
   nix-direnv-flakes = nix-direnv; # Added 2021-11-09
   nix-ld-rs = nix-ld; # Added 2024-08-17
@@ -1890,6 +1867,7 @@ mapAliases {
   nix-repl = throw "nix-repl has been removed because it's not maintained anymore, use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903"; # Added 2018-08-26
   nix-simple-deploy = throw "'nix-simple-deploy' has been removed as it is broken and unmaintained"; # Added 2024-08-17
   nix-universal-prefetch = throw "The nix-universal-prefetch package was dropped since it was unmaintained."; # Added 2024-06-21
+  nix_2_3 = throw "'nix_2_3' has been removed, because it was unmaintained and insecure."; # Converted to throw 2025-07-24
   nixFlakes = throw "'nixFlakes' has been renamed to/replaced by 'nixVersions.stable'"; # Converted to throw 2024-10-17
   nixfmt-classic =
     (
@@ -1901,9 +1879,6 @@ mapAliases {
         lib.id
     )
       haskellPackages.nixfmt.bin;
-  nixStable = nixVersions.stable; # Added 2022-01-24
-  nixUnstable = throw "nixUnstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest."; # Converted to throw 2024-04-22
-  nix_2_3 = throw "'nix_2_3' has been removed, because it was unmaintained and insecure."; # Converted to throw 2025-07-24
   nixfmt-rfc-style =
     if lib.oldestSupportedReleaseIsAtLeast 2511 then
       lib.warnOnInstantiate
@@ -1911,16 +1886,17 @@ mapAliases {
         nixfmt # Added 2025-07-14
     else
       nixfmt;
-
+  nixForLinking = throw "nixForLinking has been removed, use `nixVersions.nixComponents_<version>` instead"; # Added 2025-08-14
   nixosTest = testers.nixosTest; # Added 2022-05-05
+  nixStable = nixVersions.stable; # Added 2022-01-24
+  nixUnstable = throw "nixUnstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest."; # Converted to throw 2024-04-22
   nm-tray = throw "'nm-tray' has been removed, as it only works with Plasma 5"; # Added 2025-08-30
   nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17
   noah = throw "'noah' has been removed because it was broken and its upstream archived"; # Added 2025-05-10
-  nodejs_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23
-  nodejs-slim_18 = nodejs_18; # Added 2025-04-23
-  corepack_18 = nodejs_18; # Added 2025-04-23
   nodejs-18_x = nodejs_18; # Added 2022-11-06
   nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06
+  nodejs-slim_18 = nodejs_18; # Added 2025-04-23
+  nodejs_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23
   nomacs-qt6 = nomacs; # Added 2025-08-30
   nomad_1_4 = throw "nomad_1_4 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02
   nomad_1_5 = throw "nomad_1_5 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02
@@ -1928,6 +1904,8 @@ mapAliases {
   nomad_1_7 = throw "nomad_1_7 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-03-27
   nomad_1_8 = throw "nomad_1_8 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-03-27
   norouter = throw "norouter has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29
+  notes-up = throw "'notes-up' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
+  notify-sharp = throw "'notify-sharp' has been removed as it was unmaintained and depends on deprecated dbus-sharp versions"; # Added 2025-08-25
   noto-fonts-cjk = throw "'noto-fonts-cjk' has been renamed to/replaced by 'noto-fonts-cjk-sans'"; # Converted to throw 2024-10-17
   noto-fonts-emoji = noto-fonts-color-emoji; # Added 2023-09-09
   noto-fonts-extra = noto-fonts; # Added 2023-04-08
@@ -1937,7 +1915,6 @@ mapAliases {
   nux = throw "nux has been removed because it has been abandoned for 4 years"; # Added 2025-03-22
   nvidia-podman = throw "podman should use the Container Device Interface (CDI) instead. See https://web.archive.org/web/20240729183805/https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/install-guide.html#configuring-podman"; # Added 2024-08-02
   nvidia-thrust = throw "nvidia-thrust has been removed because the project was deprecated. Use cudaPackages.cuda_cccl"; # Added 2023-12-04
-
   o = orbiton; # Added 2023-04-09
   oathToolkit = oath-toolkit; # Added 2022-04-04
   oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17
@@ -1948,22 +1925,29 @@ mapAliases {
   odoo15 = throw "odoo15 has been removed from nixpkgs as it is unsupported; migrate to a newer version of odoo"; # Added 2025-05-06
   offrss = throw "offrss has been removed due to lack of upstream maintenance; consider using another rss reader"; # Added 2025-06-01
   oil = lib.warnOnInstantiate "Oil has been replaced with the faster native C++ version and renamed to 'oils-for-unix'. See also https://github.com/oils-for-unix/oils/wiki/Oils-Deployments" oils-for-unix; # Added 2024-10-22
+  omping = throw "'omping' has been removed because its upstream has been archived"; # Added 2025-05-10
   onevpl-intel-gpu = lib.warnOnInstantiate "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04
+  onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20
+  onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03
+  onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03
+  onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03
   onscripter-en = throw "onscripter-en has been removed due to lack of maintenance in both upstream and Nixpkgs; onscripter is available instead"; # Added 2025-10-17
   onthespot = throw "onethespot has been removed due to lack of upstream maintenance"; # Added 2025-09-26
+  oobicpl = throw "oobicpl was removed as it is unmaintained upstream"; # Added 2025-04-26
   opae = throw "opae has been removed because it has been marked as broken since June 2023."; # Added 2025-10-11
+  open-timeline-io = lib.warnOnInstantiate "'open-timeline-io' has been renamed to 'opentimelineio'" opentimelineio; # Added 2025-08-10
+  openafs_1_8 = openafs; # Added 2022-08-22
   openai-triton-llvm = triton-llvm; # added 2024-07-18
   openai-whisper-cpp = whisper-cpp; # Added 2024-12-13
   openbabel2 = throw "openbabel2 has been removed, as it was unused and unmaintained upstream; please use openbabel"; # Added 2025-09-17
   openbabel3 = openbabel; # Added 2025-09-17
   openbsdCross = openbsd; # Added 2024-09-06
-  opencv2 = throw "opencv2 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20
-  opencv3 = throw "opencv3 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20
-  openafs_1_8 = openafs; # Added 2022-08-22
   opencl-clang = throw "opencl-clang has been integrated into intel-graphics-compiler"; # Added 2025-09-10
   opencl-info = throw "opencl-info has been removed, as the upstream is unmaintained; consider using 'clinfo' instead"; # Added 2024-06-12
   opencomposite-helper = throw "opencomposite-helper has been removed from nixpkgs as it causes issues with some applications. See https://wiki.nixos.org/wiki/VR#OpenComposite for the recommended setup"; # Added 2024-09-07
   openconnect_gnutls = openconnect; # Added 2022-03-29
+  opencv2 = throw "opencv2 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20
+  opencv3 = throw "opencv3 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20
   opendylan = throw "opendylan has been removed from nixpkgs as it was broken"; # Added 2024-07-15
   opendylan_bin = throw "opendylan_bin has been removed from nixpkgs as it was broken"; # Added 2024-07-15
   openelec-dvb-firmware = throw "'openelec-dvb-firmware' has been renamed to/replaced by 'libreelec-dvb-firmware'"; # Converted to throw 2024-10-17
@@ -1973,21 +1957,12 @@ mapAliases {
   openisns = throw "'openisns' has been renamed to/replaced by 'open-isns'"; # Converted to throw 2024-10-17
   openjdk19 = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01
   openjdk19_headless = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01
-  jdk19 = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01
-  jdk19_headless = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01
   openjdk20 = throw "OpenJDK 20 was removed as it has reached its end of life"; # Added 2024-08-01
   openjdk20_headless = throw "OpenJDK 20 was removed as it has reached its end of life"; # Added 2024-08-01
-  jdk20 = throw "OpenJDK 20 was removed as it has reached its end of life"; # Added 2024-08-01
-  jdk20_headless = throw "OpenJDK 20 was removed as it has reached its end of life"; # Added 2024-08-01
   openjdk22 = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24
   openjdk22_headless = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24
-  jdk22 = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24
-  jdk22_headless = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24
   openjdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
   openjdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
-  jdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
-  jdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
-  oobicpl = throw "oobicpl was removed as it is unmaintained upstream"; # Added 2025-04-26
   openjfx11 = throw "OpenJFX 11 was removed as it has reached its end of life"; # Added 2024-10-07
   openjfx19 = throw "OpenJFX 19 was removed as it has reached its end of life"; # Added 2024-08-01
   openjfx20 = throw "OpenJFX 20 was removed as it has reached its end of life"; # Added 2024-08-01
@@ -2002,29 +1977,20 @@ mapAliases {
   openssl_3_0 = openssl_3; # Added 2022-06-27
   opensycl = lib.warnOnInstantiate "'opensycl' has been renamed to 'adaptivecpp'" adaptivecpp; # Added 2024-12-04
   opensyclWithRocm = lib.warnOnInstantiate "'opensyclWithRocm' has been renamed to 'adaptivecppWithRocm'" adaptivecppWithRocm; # Added 2024-12-04
-  open-timeline-io = lib.warnOnInstantiate "'open-timeline-io' has been renamed to 'opentimelineio'" opentimelineio; # Added 2025-08-10
   opentofu-ls = lib.warnOnInstantiate "'opentofu-ls' has been renamed to 'tofu-ls'" tofu-ls; # Added 2025-06-10
   opentracing-cpp = throw "'opentracingc-cpp' has been removed as it was archived upstream in 2024"; # Added 2025-10-19
   openvdb_11 = throw "'openvdb_11' has been removed in favor of the latest version'"; # Added 2025-05-03
+  openvswitch-lts = throw "openvswitch-lts has been removed. Please use the latest version available under openvswitch"; # Added 2024-08-24
   opera = throw "'opera' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-05-19
+  oraclejdk8 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
+  oraclejdk8distro = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
+  oraclejdk11 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
+  oraclejdk = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
+  oraclejre8 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
+  oraclejre = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
   orchis = throw "'orchis' has been renamed to/replaced by 'orchis-theme'"; # Converted to throw 2024-10-17
   orogene = throw "'orogene' uses a wasm-specific fork of async-tar that is vulnerable to CVE-2025-62518, which is not supported by its upstream"; # Added 2025-10-24
   ortp = throw "'ortp' has been moved to 'linphonePackages.ortp'"; # Added 2025-09-20
-  omping = throw "'omping' has been removed because its upstream has been archived"; # Added 2025-05-10
-  onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20
-  onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03
-  onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03
-  onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03
-  openvswitch-lts = throw "openvswitch-lts has been removed. Please use the latest version available under openvswitch"; # Added 2024-08-24
-  oraclejdk = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  oraclejdk8 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  oraclejre = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  oraclejre8 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  jrePlugin = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  jre8Plugin = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  jdkdistro = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  oraclejdk8distro = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  oraclejdk11 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
   OSCAR = oscar; # Added 2024-06-12
   osm2xmap = throw "osm2xmap has been removed, as it is unmaintained upstream and depended on old dependencies with broken builds"; # Added 2025-09-16
   osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2024-10-17
@@ -2040,23 +2006,22 @@ mapAliases {
     Note that Qt 5 versions of most KDE software will be removed in NixOS 25.11.
   "; # Added 2025-03-15;
   oysttyer = throw "oysttyer has been removed; it is no longer maintained because of Twitter disabling free API access"; # Added 2024-09-23
-
-  pax-rs = throw "'pax-rs' has been removed because upstream has disappeared"; # Added 2025-01-25
-  PageEdit = pageedit; # Added 2024-01-21
-  passky-desktop = throw "passky-desktop has been removed, as it was unmaintained and blocking the Electron 29 removal."; # Added 2025-02-24
   p2pvc = throw "p2pvc has been removed as it is unmaintained upstream and depends on OpenCV 2"; # Added 2024-08-20
   packet-cli = throw "'packet-cli' has been renamed to/replaced by 'metal-cli'"; # Converted to throw 2024-10-17
   paco = throw "'paco' has been removed as it has been abandoned"; # Added 2025-04-30
   pacup = perlPackages.pacup; # Added 2025-01-21
+  PageEdit = pageedit; # Added 2024-01-21
   pal = throw "pal has been removed, as it was broken"; # Added 2025-08-25
   panopticon = throw "'panopticon' has been removed because it is unmaintained upstream"; # Added 2025-01-25
-  paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14
   paperless = throw "'paperless' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2024-10-17
-  pathsFromGraph = throw "pathsFromGraph has been removed, use closureInfo instead"; # Added 2025-01-23
   paperless-ng = paperless-ngx; # Added 2022-04-11
+  paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14
   partition-manager = makePlasma5Throw "partitionmanager"; # Added 2024-01-08
+  passky-desktop = throw "passky-desktop has been removed, as it was unmaintained and blocking the Electron 29 removal."; # Added 2025-02-24
   patchelfStable = patchelf; # Added 2024-01-25
+  pathsFromGraph = throw "pathsFromGraph has been removed, use closureInfo instead"; # Added 2025-01-23
   paup = paup-cli; # Added 2024-09-11
+  pax-rs = throw "'pax-rs' has been removed because upstream has disappeared"; # Added 2025-01-25
   pcp = throw "'pcp' has been removed because the upstream repo was archived and it hasn't been updated since 2021"; # Added 2025-09-23
   pcre16 = throw "'pcre16' has been removed because it is obsolete. Consider migrating to 'pcre2' instead."; # Added 2025-05-29
   pcsctools = pcsc-tools; # Added 2023-12-07
@@ -2065,20 +2030,29 @@ mapAliases {
   pds = lib.warnOnInstantiate "'pds' has been renamed to 'bluesky-pds'" bluesky-pds; # Added 2025-08-20
   pdsadmin = lib.warnOnInstantiate "'pdsadmin' has been renamed to 'bluesky-pdsadmin'" bluesky-pdsadmin; # Added 2025-08-20
   peach = asouldocs; # Added 2022-08-28
+  pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23
   perceptual-diff = throw "perceptual-diff was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   percona-server_innovation = lib.warnOnInstantiate "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-server; # Added 2024-10-13
   percona-server_lts = percona-server; # Added 2024-10-13
   percona-xtrabackup_innovation = lib.warnOnInstantiate "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-xtrabackup; # Added 2024-10-13
   percona-xtrabackup_lts = percona-xtrabackup; # Added 2024-10-13
-  peroxide = throw "'peroxide' has been dropped due to lack of upstream maintenance."; # Added 2025-03-31
-  pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23
   perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead"; # Added 2023-09-09
   perldevelPackages = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead"; # Added 2023-09-09
+  peroxide = throw "'peroxide' has been dropped due to lack of upstream maintenance."; # Added 2025-03-31
   peruse = throw "'peruse' has been removed as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
   petrinizer = throw "'petrinizer' has been removed, as it was broken and unmaintained"; # added 2024-05-09
   pg-gvm = throw "pg-gvm has been moved to postgresql.pkgs.pg-gvm to make it work with all versions of PostgreSQL"; # added 2024-11-30
+  pg_cron = throw "'pg_cron' has been removed. Use 'postgresqlPackages.pg_cron' instead."; # Added 2025-07-19
+  pg_hll = throw "'pg_hll' has been removed. Use 'postgresqlPackages.pg_hll' instead."; # Added 2025-07-19
+  pg_repack = throw "'pg_repack' has been removed. Use 'postgresqlPackages.pg_repack' instead."; # Added 2025-07-19
+  pg_similarity = throw "'pg_similarity' has been removed. Use 'postgresqlPackages.pg_similarity' instead."; # Added 2025-07-19
+  pg_topn = throw "'pg_topn' has been removed. Use 'postgresqlPackages.pg_topn' instead."; # Added 2025-07-19
   pgadmin = pgadmin4; # Added 2022-01-14
+  pgf1 = throw "'pgf1' has been removed since it is unmaintained. Consider using 'pgf' instead"; # Added 2025-05-10
   pgf_graphics = throw "pgf_graphics was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
+  pgjwt = throw "'pgjwt' has been removed. Use 'postgresqlPackages.pgjwt' instead."; # Added 2025-07-19
+  pgroonga = throw "'pgroonga' has been removed. Use 'postgresqlPackages.pgroonga' instead."; # Added 2025-07-19
+  pgtap = throw "'pgtap' has been removed. Use 'postgresqlPackages.pgtap' instead."; # Added 2025-07-19
   pharo-spur64 = pharo; # Added 2022-08-03
   phlare = throw "'phlare' has been removed as the upstream project was archived."; # Added 2025-03-27
   php81 = throw "php81 is EOL";
@@ -2086,91 +2060,19 @@ mapAliases {
   php81Packages = php81;
   picom-next = picom; # Added 2024-02-13
   pict-rs_0_3 = throw "pict-rs_0_3 has been removed, as it was an outdated version and no longer compiled"; # Added 2024-08-20
+  pidgin-carbons = pidginPackages.pidgin-carbons; # Added 2023-07-17
+  pidgin-indicator = pidginPackages.pidgin-indicator; # Added 2023-07-17
+  pidgin-latex = pidginPackages.pidgin-latex; # Added 2023-07-17
   pidgin-mra = throw "'pidgin-mra' has been removed since mail.ru agent service has stopped functioning in 2024."; # Added 2025-09-17
   pidgin-msn-pecan = throw "'pidgin-msn-pecan' has been removed as it's unmaintained upstream and doesn't work with escargot"; # Added 2025-09-17
   pidgin-opensteamworks = throw "'pidgin-opensteamworks' has been removed as it is unmaintained and no longer works with Steam."; # Added 2025-09-17
-  pidgin-skypeweb = throw "'pidgin-skypeweb' has been removed since Skype was shut down in May 2025"; # Added 2025-09-15
-  pidgin-indicator = pidginPackages.pidgin-indicator; # Added 2023-07-17
-  pidgin-latex = pidginPackages.pidgin-latex; # Added 2023-07-17
-  pidgin-carbons = pidginPackages.pidgin-carbons; # Added 2023-07-17
-  pidgin-xmpp-receipts = pidginPackages.pidgin-xmpp-receipts; # Added 2023-07-17
-  pidgin-otr = pidginPackages.pidgin-otr; # Added 2023-07-17
   pidgin-osd = pidginPackages.pidgin-osd; # Added 2023-07-17
+  pidgin-otr = pidginPackages.pidgin-otr; # Added 2023-07-17
   pidgin-sipe = pidginPackages.pidgin-sipe; # Added 2023-07-17
+  pidgin-skypeweb = throw "'pidgin-skypeweb' has been removed since Skype was shut down in May 2025"; # Added 2025-09-15
   pidgin-window-merge = pidginPackages.pidgin-window-merge; # Added 2023-07-17
-  purple-discord = pidginPackages.purple-discord; # Added 2023-07-17
-  purple-googlechat = pidginPackages.purple-googlechat; # Added 2023-07-17
-  purple-lurch = pidginPackages.purple-lurch; # Added 2023-07-17
-  purple-mm-sms = pidginPackages.purple-mm-sms; # Added 2023-07-17
-  purple-plugin-pack = pidginPackages.purple-plugin-pack; # Added 2023-07-17
-  purple-slack = pidginPackages.purple-slack; # Added 2023-07-17
-  purple-xmpp-http-upload = pidginPackages.purple-xmpp-http-upload; # Added 2023-07-17
+  pidgin-xmpp-receipts = pidginPackages.pidgin-xmpp-receipts; # Added 2023-07-17
   pilipalax = throw "'pilipalax' has been removed from nixpkgs due to it not being maintained"; # Added 2025-07-25
-  pio = throw "pio has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28
-  pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead."; # Added 2023-03-09
-  platformioPackages.platformio-core = platformio-core; # Added 2025-09-04
-  platformioPackages.platformio-chrootenv = platformio-chrootenv; # Added 2025-09-04
-  platypus = throw "platypus is unmaintained and has not merged Python3 support"; # Added 2025-03-20
-  pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17
-  plex-media-player = throw "'plex-media-player' has been discontinued, the new official client is available as 'plex-desktop'"; # Added 2025-05-28
-  pn = throw "'pn' has been removed as upstream was archived in 2020"; # Added 2025-10-17
-  plots = throw "'plots' has been replaced by 'gnome-graphs'"; # Added 2025-02-05
-  pltScheme = racket; # Added 2013-02-24
-  poac = cabinpkg; # Added 2025-01-22
-  podofo010 = podofo_0_10; # Added 2025-06-01
-  polkit-kde-agent = throw "
-    The top-level polkit-kde-agent alias has been removed.
-
-    Please explicitly use kdePackages.polkit-kde-agent-1 for the latest Qt 6-based version,
-    or libsForQt5.polkit-kde-agent for the deprecated Qt 5 version.
-
-    Note that Qt 5 versions of most KDE software will be removed in NixOS 25.11.
-  "; # Added 2025-03-07
-  polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25
-  poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03
-  posix_man_pages = throw "'posix_man_pages' has been renamed to/replaced by 'man-pages-posix'"; # Converted to throw 2024-10-17
-  posterazor = throw "posterazor was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
-  powerdns = pdns; # Added 2022-03-28
-  postfixadmin = throw "'postfixadmin' has been removed due to lack of maintenance and missing support for PHP >8.1"; # Added 2025-10-03
-  presage = throw "presage has been removed, as it has been unmaintained since 2018"; # Added 2024-03-24
-  preserves-nim = throw "'preserves-nim' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
-  projectm = throw "Since version 4, 'projectm' has been split into 'libprojectm' (the library) and 'projectm-sdl-cpp' (the SDL2 frontend). ProjectM 3 has been moved to 'projectm_3'"; # Added 2024-11-10
-
-  cstore_fdw = throw "'cstore_fdw' has been removed. Use 'postgresqlPackages.cstore_fdw' instead."; # Added 2025-07-19
-  pg_cron = throw "'pg_cron' has been removed. Use 'postgresqlPackages.pg_cron' instead."; # Added 2025-07-19
-  pg_hll = throw "'pg_hll' has been removed. Use 'postgresqlPackages.pg_hll' instead."; # Added 2025-07-19
-  pg_repack = throw "'pg_repack' has been removed. Use 'postgresqlPackages.pg_repack' instead."; # Added 2025-07-19
-  pg_similarity = throw "'pg_similarity' has been removed. Use 'postgresqlPackages.pg_similarity' instead."; # Added 2025-07-19
-  pg_topn = throw "'pg_topn' has been removed. Use 'postgresqlPackages.pg_topn' instead."; # Added 2025-07-19
-  pgf1 = throw "'pgf1' has been removed since it is unmaintained. Consider using 'pgf' instead"; # Added 2025-05-10
-  pgjwt = throw "'pgjwt' has been removed. Use 'postgresqlPackages.pgjwt' instead."; # Added 2025-07-19
-  pgroonga = throw "'pgroonga' has been removed. Use 'postgresqlPackages.pgroonga' instead."; # Added 2025-07-19
-  pgtap = throw "'pgtap' has been removed. Use 'postgresqlPackages.pgtap' instead."; # Added 2025-07-19
-  plv8 = throw "'plv8' has been removed. Use 'postgresqlPackages.plv8' instead."; # Added 2025-07-19
-  postcss-cli = throw "postcss-cli has been removed because it was broken"; # added 2025-03-24
-  postgis = throw "'postgis' has been removed. Use 'postgresqlPackages.postgis' instead."; # Added 2025-07-19
-  tegaki-zinnia-japanese = throw "'tegaki-zinnia-japanese' has been removed due to lack of maintenance"; # Added 2025-09-10
-  tet = throw "'tet' has been removed for lack of maintenance"; # Added 2025-10-12
-  tex-match = throw "'tex-match' has been removed due to lack of maintenance upstream. Consider using 'hieroglyphic' instead"; # Added 2024-09-24
-  texinfo5 = throw "'texinfo5' has been removed from nixpkgs"; # Added 2024-09-10
-  timescaledb = throw "'timescaledb' has been removed. Use 'postgresqlPackages.timescaledb' instead."; # Added 2025-07-19
-  thrust = throw "'thrust' has been removed due to lack of maintenance"; # Added 2025-08-21
-  tsearch_extras = throw "'tsearch_extras' has been removed from nixpkgs"; # Added 2024-12-15
-
-  postgresql_12 = throw "postgresql_12 has been removed since it reached its EOL upstream"; # Added 2024-11-14
-  postgresql_12_jit = throw "postgresql_12 has been removed since it reached its EOL upstream"; # Added 2024-11-14
-  postgresql12Packages = throw "postgresql_12 has been removed since it reached its EOL upstream"; # Added 2024-11-14
-  postgresql12JitPackages = throw "postgresql_12 has been removed since it reached its EOL upstream"; # Added 2024-11-14
-
-  # Ever since building with JIT by default, those are the same.
-  postgresqlJitPackages = postgresqlPackages; # Added 2025-04-12
-  postgresql13JitPackages = postgresql13Packages; # Added 2025-04-12
-  postgresql14JitPackages = postgresql14Packages; # Added 2025-04-12
-  postgresql15JitPackages = postgresql15Packages; # Added 2025-04-12
-  postgresql16JitPackages = postgresql16Packages; # Added 2025-04-12
-  postgresql17JitPackages = postgresql17Packages; # Added 2025-04-12
-
   # pinentry was using multiple outputs, this emulates the old interface for i.e. home-manager
   # soon: throw "'pinentry' has been removed. Pick an appropriate variant like 'pinentry-curses' or 'pinentry-gnome3'";
   pinentry = pinentry-all // {
@@ -2190,57 +2092,107 @@ mapAliases {
     ];
   }; # added 2024-01-15
   pinentry_qt5 = throw "'pinentry_qt5' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2024-10-17
+  pio = throw "pio has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   piper-train = throw "piper-train is now part of the piper package using the `withTrain` override"; # Added 2025-09-03
+  pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead."; # Added 2023-03-09
+  pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28
   pivx = throw "pivx has been removed as it was marked as broken"; # Added 2024-07-15
   pivxd = throw "pivxd has been removed as it was marked as broken"; # Added 2024-07-15
-
   plasma-applet-volumewin7mixer = throw "'plasma-applet-volumewin7mixer' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   plasma-pass = throw "'plasma-pass' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   plasma-theme-switcher = throw "'plasma-theme-switcher' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
+  platformioPackages.platformio-chrootenv = platformio-chrootenv; # Added 2025-09-04
+  platformioPackages.platformio-core = platformio-core; # Added 2025-09-04
+  platypus = throw "platypus is unmaintained and has not merged Python3 support"; # Added 2025-03-20
+  pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17
+  plex-media-player = throw "'plex-media-player' has been discontinued, the new official client is available as 'plex-desktop'"; # Added 2025-05-28
   PlistCpp = plistcpp; # Added 2024-01-05
+  plots = throw "'plots' has been replaced by 'gnome-graphs'"; # Added 2025-02-05
+  pltScheme = racket; # Added 2013-02-24
+  plv8 = throw "'plv8' has been removed. Use 'postgresqlPackages.plv8' instead."; # Added 2025-07-19
+  pn = throw "'pn' has been removed as upstream was archived in 2020"; # Added 2025-10-17
+  poac = cabinpkg; # Added 2025-01-22
   pocket-updater-utility = pupdate; # Added 2024-01-25
+  podofo010 = podofo_0_10; # Added 2025-06-01
   polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18
+  polkit-kde-agent = throw "
+    The top-level polkit-kde-agent alias has been removed.
+
+    Please explicitly use kdePackages.polkit-kde-agent-1 for the latest Qt 6-based version,
+    or libsForQt5.polkit-kde-agent for the deprecated Qt 5 version.
+
+    Note that Qt 5 versions of most KDE software will be removed in NixOS 25.11.
+  "; # Added 2025-03-07
+  polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25
   poppler_utils = poppler-utils; # Added 2025-02-27
+  poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03
+  posix_man_pages = throw "'posix_man_pages' has been renamed to/replaced by 'man-pages-posix'"; # Converted to throw 2024-10-17
+  postcss-cli = throw "postcss-cli has been removed because it was broken"; # added 2025-03-24
+  posterazor = throw "posterazor was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
+  postfixadmin = throw "'postfixadmin' has been removed due to lack of maintenance and missing support for PHP >8.1"; # Added 2025-10-03
+  postgis = throw "'postgis' has been removed. Use 'postgresqlPackages.postgis' instead."; # Added 2025-07-19
+  postgresql12JitPackages = throw "postgresql_12 has been removed since it reached its EOL upstream"; # Added 2024-11-14
+  postgresql12Packages = throw "postgresql_12 has been removed since it reached its EOL upstream"; # Added 2024-11-14
+  postgresql13JitPackages = postgresql13Packages; # Added 2025-04-12
+  postgresql14JitPackages = postgresql14Packages; # Added 2025-04-12
+  postgresql15JitPackages = postgresql15Packages; # Added 2025-04-12
+  postgresql16JitPackages = postgresql16Packages; # Added 2025-04-12
+  postgresql17JitPackages = postgresql17Packages; # Added 2025-04-12
+  postgresql_12 = throw "postgresql_12 has been removed since it reached its EOL upstream"; # Added 2024-11-14
+  postgresql_12_jit = throw "postgresql_12 has been removed since it reached its EOL upstream"; # Added 2024-11-14
+  # Ever since building with JIT by default, those are the same.
+  postgresqlJitPackages = postgresqlPackages; # Added 2025-04-12
   pot = throw "'pot' has been removed as it requires libsoup 2.4 which is EOL"; # Added 2025-10-09
+  powerdns = pdns; # Added 2022-03-28
   powerline-rs = throw "'powerline-rs' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
   prboom-plus = throw "'prboom-plus' has been removed since it is unmaintained upstream."; # Added 2025-09-14
   premake3 = throw "'premake3' has been removed since it is unmaintained. Consider using 'premake' instead"; # Added 2025-05-10
+  presage = throw "presage has been removed, as it has been unmaintained since 2018"; # Added 2024-03-24
+  preserves-nim = throw "'preserves-nim' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   prismlauncher-qt5 = throw "'prismlauncher-qt5' has been removed from nixpkgs. Please use 'prismlauncher'"; # Added 2024-04-20
   prismlauncher-qt5-unwrapped = throw "'prismlauncher-qt5-unwrapped' has been removed from nixpkgs. Please use 'prismlauncher-unwrapped'"; # Added 2024-04-20
   private-gpt = throw "'private-gpt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2025-07-28
   probe-rs = probe-rs-tools; # Added 2024-05-23
   probe-run = throw "probe-run is deprecated upstream.  Use probe-rs instead."; # Added 2024-05-23
   proj_7 = throw "proj_7 has been removed, as it was broken and unused"; # Added 2025-09-16
+  projectm = throw "Since version 4, 'projectm' has been split into 'libprojectm' (the library) and 'projectm-sdl-cpp' (the SDL2 frontend). ProjectM 3 has been moved to 'projectm_3'"; # Added 2024-11-10
   prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31
   prometheus-dovecot-exporter = dovecot_exporter; # Added 2024-06-10
-  prometheus-openldap-exporter = throw "'prometheus-openldap-exporter' has been removed from nixpkgs, as it was unmaintained"; # Added 2024-09-01
   prometheus-minio-exporter = throw "'prometheus-minio-exporter' has been removed from nixpkgs, use Minio's built-in Prometheus integration instead"; # Added 2024-06-10
+  prometheus-openldap-exporter = throw "'prometheus-openldap-exporter' has been removed from nixpkgs, as it was unmaintained"; # Added 2024-09-01
   prometheus-tor-exporter = throw "'prometheus-tor-exporter' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-10-30
+  protobuf3_21 = protobuf_21; # Added 2023-10-05
+  protobuf3_23 = protobuf_23; # Added 2023-10-05
+  protobuf3_24 = protobuf_24; # Added 2023-10-05
   protobuf_23 = throw "'protobuf_23' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-04-20
   protobuf_24 = throw "'protobuf_24' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-07-14
   protobuf_26 = throw "'protobuf_26' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-06-29
   protobuf_28 = throw "'protobuf_28' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-06-14
-  protobuf3_24 = protobuf_24; # Added 2023-10-05
-  protobuf3_23 = protobuf_23; # Added 2023-10-05
-  protobuf3_21 = protobuf_21; # Added 2023-10-05
   protoc-gen-connect-es = throw "'protoc-gen-connect-es' has been removed because it is deprecated upstream. Functionality has been integrated into 'protoc-gen-es' v2."; # Added 2025-02-18
-  protonup = protonup-ng; # Added 2022-11-06
-  protonvpn-cli = throw "protonvpn-cli source code was removed from upstream. Use protonvpn-gui instead."; # Added 2025-10-16
-  protonvpn-cli_2 = throw "protonvpn-cli_2 has been removed due to being deprecated. Use protonvpn-gui instead."; # Added 2025-10-16
-  protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12
   proton-caller = throw "'proton-caller' has been removed from nixpkgs due to being unmaintained and lack of upstream maintenance."; # Added 2025-09-25
   proton-vpn-local-agent = lib.warnOnInstantiate "'proton-vpn-local-agent' has been renamed to 'python3Packages.proton-vpn-local-agent'" (
     python3Packages.toPythonApplication python3Packages.proton-vpn-local-agent
   ); # Added 2025-04-23
+  protonup = protonup-ng; # Added 2022-11-06
+  protonvpn-cli = throw "protonvpn-cli source code was removed from upstream. Use protonvpn-gui instead."; # Added 2025-10-16
+  protonvpn-cli_2 = throw "protonvpn-cli_2 has been removed due to being deprecated. Use protonvpn-gui instead."; # Added 2025-10-16
+  protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12
   proxmark3-rrg = proxmark3; # Added 2023-07-25
   psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14
   psstop = throw "'psstop' has been removed because the upstream repo has been archived"; # Added 2025-05-10
   ptask = throw "'ptask' has been removed because its upstream is unavailable"; # Added 2025-05-10
+  purple-discord = pidginPackages.purple-discord; # Added 2023-07-17
   purple-facebook = throw "'purple-facebook' has been removed as it is unmaintained and doesn't support e2ee enforced by facebook."; # Added 2025-09-17
-  purple-signald = throw "'purple-signald' has been removed due to lack of upstream maintenance"; # Added 2025-05-17
-  purple-matrix = throw "'purple-matrix' has been unmaintained since April 2022, so it was removed."; # Added 2025-09-01
+  purple-googlechat = pidginPackages.purple-googlechat; # Added 2023-07-17
   purple-hangouts = throw "'purple-hangouts' has been removed as Hangouts Classic is obsolete and migrated to Google Chat."; # Added 2025-09-17
+  purple-lurch = pidginPackages.purple-lurch; # Added 2023-07-17
+  purple-matrix = throw "'purple-matrix' has been unmaintained since April 2022, so it was removed."; # Added 2025-09-01
+  purple-mm-sms = pidginPackages.purple-mm-sms; # Added 2023-07-17
+  purple-plugin-pack = pidginPackages.purple-plugin-pack; # Added 2023-07-17
+  purple-signald = throw "'purple-signald' has been removed due to lack of upstream maintenance"; # Added 2025-05-17
+  purple-slack = pidginPackages.purple-slack; # Added 2023-07-17
   purple-vk-plugin = throw "'purple-vk-plugin' has been removed as upstream repository was deleted and no active forks are found."; # Added 2025-09-17
+  purple-xmpp-http-upload = pidginPackages.purple-xmpp-http-upload; # Added 2023-07-17
   pwndbg = throw "'pwndbg' has been removed due to dependency version incompatibilities that are infeasible to maintain in nixpkgs. Use the downstream flake that pwndbg provides instead: https://github.com/pwndbg/pwndbg"; # Added 2025-02-09
   pxlib = throw "pxlib has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28
   pxview = throw "pxview has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28
@@ -2248,19 +2200,18 @@ mapAliases {
   pyo3-pack = maturin; # Added 2019-08-30
   pypi2nix = throw "pypi2nix has been removed due to being unmaintained"; # Added 2023-06-02
   pypolicyd-spf = spf-engine; # Added 2022-10-09
+  pypy39 = throw "pypy 3.9 has been removed, use pypy 3.10 instead"; # Added 2025-01-03
   pypy39Packages = throw "pypy 3.9 has been removed, use pypy 3.10 instead"; # Added 2025-01-07
-  python = python2; # Added 2022-01-11
-  python-swiftclient = throw "'python-swiftclient' has been renamed to/replaced by 'swiftclient'"; # Converted to throw 2024-10-17
-  pythonFull = python2Full; # Added 2022-01-11
   python3Full = throw "python3Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
   python310Full = throw "python310Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
   python311Full = throw "python311Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
   python312Full = throw "python312Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
   python313Full = throw "python313Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
   python314Full = throw "python314Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
+  python = python2; # Added 2022-01-11
+  python-swiftclient = throw "'python-swiftclient' has been renamed to/replaced by 'swiftclient'"; # Converted to throw 2024-10-17
+  pythonFull = python2Full; # Added 2022-01-11
   pythonPackages = python.pkgs; # Added 2022-01-11
-  pypy39 = throw "pypy 3.9 has been removed, use pypy 3.10 instead"; # Added 2025-01-03
-
   qbittorrent-qt5 = throw "'qbittorrent-qt5' has been removed as qBittorrent 5 dropped support for Qt 5. Please use 'qbittorrent'"; # Added 2024-09-30
   qcachegrind = throw "'qcachegrind' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
   qflipper = qFlipper; # Added 2022-02-11
@@ -2268,11 +2219,11 @@ mapAliases {
   qrscan = throw "qrscan has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-19
   qscintilla = libsForQt5.qscintilla; # Added 2023-09-20
   qscintilla-qt6 = qt6Packages.qscintilla; # Added 2023-09-20
-  qt-video-wlr = throw "'qt-video-wlr' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
-  qt515 = qt5; # Added 2022-11-24
   qt5ct = throw "'qt5ct' has been renamed to/replaced by 'libsForQt5.qt5ct'"; # Converted to throw 2024-10-17
   qt5Full = throw "qt5Full has been removed. Please use individual packages instead."; # Added 2025-10-18
   qt6ct = qt6Packages.qt6ct; # Added 2023-03-07
+  qt515 = qt5; # Added 2022-11-24
+  qt-video-wlr = throw "'qt-video-wlr' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
   qtchan = throw "'qtchan' has been removed due to lack of maintenance upstream"; # Added 2025-07-01
   qtcurve = throw "'qtcurve' has been renamed to/replaced by 'libsForQt5.qtcurve'"; # Converted to throw 2024-10-17
   qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12
@@ -2292,7 +2243,6 @@ mapAliases {
   quicksynergy = throw "'quicksynergy' has been removed due to lack of maintenance upstream. Consider using 'deskflow' instead."; # Added 2025-06-18
   qv2ray = throw "'qv2ray' has been removed as it was unmaintained"; # Added 2025-06-03
   qxw = throw "'qxw' has been removed due to lack of maintenance upstream. Consider using 'crosswords' instead"; # Added 2024-10-19
-
   rabbitmq-java-client = throw "rabbitmq-java-client has been removed due to its dependency on Python2 and a lack of maintenance within the nixpkgs tree"; # Added 2025-03-29
   rabbitvcs = throw "rabbitvcs has been removed from nixpkgs, because it was broken"; # Added 2024-07-15
   racket_7_9 = throw "Racket 7.9 has been removed because it is insecure. Consider using 'racket' instead."; # Added 2024-12-06
@@ -2312,22 +2262,23 @@ mapAliases {
   relibc = throw "relibc has been removed due to lack of maintenance"; # Added 2024-09-02
   remotebox = throw "remotebox has been removed because it was unmaintained and broken for a long time"; # Added 2025-09-11
   replay-sorcery = throw "replay-sorcery has been removed as it is unmaintained upstream. Consider using gpu-screen-recorder or obs-studio instead."; # Added 2024-07-13
+  responsively-app = throw "'responsively-app' has been removed due to lack of maintainance upstream."; # Added 2025-06-25
   restinio_0_6 = throw "restinio_0_6 has been removed from nixpkgs as it's not needed by downstream packages"; # Added 2024-07-04
   retroarchBare = retroarch-bare; # Added 2024-11-23
   retroarchFull = retroarch-full; # Added 2024-11-23
   retroshare06 = retroshare; # Added 2020-11-07
   rewind-ai = throw "'rewind-ai' has been removed due to lack of of maintenance upstream"; # Added 2025-08-03
-  responsively-app = throw "'responsively-app' has been removed due to lack of maintainance upstream."; # Added 2025-06-25
   rftg = throw "'rftg' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   rigsofrods = rigsofrods-bin; # Added 2023-03-22
-  ring-daemon = throw "'ring-daemon' has been renamed to/replaced by 'jami-daemon'"; # Converted to throw 2024-10-17
   riko4 = throw "'riko4' has been removed as it was unmaintained, failed to build and dependend on outdated libraries"; # Added 2025-05-18
+  ring-daemon = throw "'ring-daemon' has been renamed to/replaced by 'jami-daemon'"; # Converted to throw 2024-10-17
   rippled = throw "rippled has been removed as it was broken and had not been updated since 2022"; # Added 2024-11-25
   rippled-validator-keys-tool = throw "rippled-validator-keys-tool has been removed as it was broken and had not been updated since 2022"; # Added 2024-11-25
   river = throw "'river' has been renamed to/replaced by 'river-classic'"; # Added 2025-08-30
   rke2_1_29 = throw "'rke2_1_29' has been removed from nixpkgs as it has reached end of life"; # Added 2025-05-05
   rke2_testing = throw "'rke2_testing' has been removed from nixpkgs as the RKE2 testing channel no longer serves releases"; # Added 2025-06-02
   rl_json = tclPackages.rl_json; # Added 2025-05-03
+  rnix-hashes = throw "'rnix-hashes' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   rockbox_utility = rockbox-utility; # Added 2022-03-17
   rockcraft = throw "rockcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # added 2025-09-18
   rocmPackages_5 = throw "ROCm 5 has been removed in favor of newer versions"; # Added 2025-02-18
@@ -2336,20 +2287,23 @@ mapAliases {
   rofi-wayland-unwrapped = throw "'rofi-wayland-unwrapped' has been merged into 'rofi-unwrapped'"; # Added 2025-09-06
   root5 = throw "root5 has been removed from nixpkgs because it's a legacy version"; # Added 2025-07-17
   rote = throw "rote has been removed due to lack of upstream maintenance"; # Added 2025-09-10
-  rnix-hashes = throw "'rnix-hashes' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   rpiboot-unstable = throw "'rpiboot-unstable' has been renamed to/replaced by 'rpiboot'"; # Converted to throw 2024-10-17
   rquickshare-legacy = throw "The legacy version depends on insecure package libsoup2, please use the main version"; # Added 2025-10-09
   rr-unstable = rr; # Added 2022-09-17
+  # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix,
+  # due to it being inside the linuxPackagesFor function.
+  rtlwifi_new-firmware = throw "'rtlwifi_new-firmware' has been renamed to/replaced by 'rtw88-firmware'"; # Converted to throw 2024-10-17
+  rtw88-firmware = throw "rtw88-firmware has been removed because linux-firmware now contains it."; # Added 2024-06-28
   rtx = mise; # Added 2024-01-05
+  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_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
   rubyPackages_3_1 = throw "rubyPackages_3_1 has been removed, as it is has reached end‐of‐life upstream"; # Added 2025-10-12
   rubyPackages_3_2 = throw "rubyPackages_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-zoom = throw "'ruby-zoom' has been removed due to lack of maintaince and had not been updated since 2020"; # Added 2025-08-24
   rucksack = throw "rucksack was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
+  run-scaled = throw "run-scaled has been removed due to being deprecated. Consider using run_scaled from 'xpra' instead"; # Added 2025-03-17
   runCommandNoCC = runCommand; # Added 2021-08-15
   runCommandNoCCLocal = runCommandLocal; # Added 2021-08-15
-  run-scaled = throw "run-scaled has been removed due to being deprecated. Consider using run_scaled from 'xpra' instead"; # Added 2025-03-17
   rust-synapse-state-compress = rust-synapse-compress-state; # Added 2025-03-08
   rustc-wasm32 = rustc; # Added 2023-12-01
   rustfilt = throw "'rustfilt' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
@@ -2358,70 +2312,64 @@ mapAliases {
   rxvt_unicode-with-plugins = throw "'rxvt_unicode-with-plugins' has been renamed to/replaced by 'rxvt-unicode'"; # Converted to throw 2024-10-17
   ryujinx = throw "'ryujinx' has been replaced by 'ryubing' as the new upstream"; # Added 2025-07-30
   ryujinx-greemdev = ryubing; # Added 2025-01-20
-
-  # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix,
-  # due to it being inside the linuxPackagesFor function.
-  rtlwifi_new-firmware = throw "'rtlwifi_new-firmware' has been renamed to/replaced by 'rtw88-firmware'"; # Converted to throw 2024-10-17
-  rtw88-firmware = throw "rtw88-firmware has been removed because linux-firmware now contains it."; # Added 2024-06-28
-
-  SDL_classic = SDL1; # Added 2024-09-03
-  SDL1 = throw "'SDL1' has been removed as development ended long ago with SDL 2.0 replacing it, use SDL_compat instead"; # Added 2025-03-27
-  SDL_gpu = throw "'SDL_gpu' has been removed due to lack of upstream maintenance and known users"; # Added 2025-03-15
-  SDL_image_2_0 = throw "'SDL_image_2_0' has been removed in favor of the latest version"; # Added 2025-04-20
-  SDL2_mixer_2_0 = throw "'SDL2_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27
-  SDL2_classic = throw "'SDL2_classic' has been removed. Consider upgrading to 'sdl2-compat', also available as 'SDL2'."; # Added 2025-05-20
-  SDL2_classic_image = throw "'SDL2_classic_image' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_image' built with 'sdl2-compat'."; # Added 2025-05-20
-  SDL2_classic_mixer_2_0 = throw "'SDL2_classic_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27
-  SDL2_classic_mixer = throw "'SDL2_classic_mixer' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_mixer' built with 'sdl2-compat'."; # Added 2025-05-20
-  SDL2_classic_ttf = throw "'SDL2_classic_ttf' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_ttf' built with 'sdl2-compat'."; # Added 2025-05-20
   s2n = throw "'s2n' has been renamed to/replaced by 's2n-tls'"; # Converted to throw 2024-10-17
+  samtools_0_1_19 = throw "'samtools_0_1_19' has been removed because it is unmaintained. Consider using 'samtools' instead"; # Added 2025-05-10
   sandboxfs = throw "'sandboxfs' has been removed due to being unmaintained, consider using linux namespaces for sandboxing instead"; # Added 2024-06-06
   sane-backends-git = throw "'sane-backends-git' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2024-10-17
-  samtools_0_1_19 = throw "'samtools_0_1_19' has been removed because it is unmaintained. Consider using 'samtools' instead"; # Added 2025-05-10
   scantailor = scantailor-advanced; # Added 2022-05-26
+  schildichat-desktop = schildichat-web; # Added 2023-12-07
+  schildichat-desktop-wayland = schildichat-web; # Added 2023-12-07
   schildichat-web = throw "
     schildichat has been removed as it is severely lacking behind the Element upstream and does not receive regular security fixes.
     Please participate in upstream discussion on getting out new releases:
     https://github.com/SchildiChat/schildichat-desktop/issues/212
     https://github.com/SchildiChat/schildichat-desktop/issues/215"; # Added 2023-12-05
-  schildichat-desktop = schildichat-web; # Added 2023-12-07
-  schildichat-desktop-wayland = schildichat-web; # Added 2023-12-07
   scitoken-cpp = scitokens-cpp; # Added 2024-02-12
   scry = throw "'scry' has been removed as it was archived upstream. Use 'crystalline' instead"; # Added 2025-02-12
   scudcloud = throw "'scudcloud' has been removed as it was archived by upstream"; # Added 2025-07-24
+  SDL1 = throw "'SDL1' has been removed as development ended long ago with SDL 2.0 replacing it, use SDL_compat instead"; # Added 2025-03-27
+  SDL2_classic = throw "'SDL2_classic' has been removed. Consider upgrading to 'sdl2-compat', also available as 'SDL2'."; # Added 2025-05-20
+  SDL2_classic_image = throw "'SDL2_classic_image' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_image' built with 'sdl2-compat'."; # Added 2025-05-20
+  SDL2_classic_mixer = throw "'SDL2_classic_mixer' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_mixer' built with 'sdl2-compat'."; # Added 2025-05-20
+  SDL2_classic_mixer_2_0 = throw "'SDL2_classic_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27
+  SDL2_classic_ttf = throw "'SDL2_classic_ttf' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_ttf' built with 'sdl2-compat'."; # Added 2025-05-20
+  SDL2_mixer_2_0 = throw "'SDL2_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27
+  SDL_classic = SDL1; # Added 2024-09-03
+  SDL_gpu = throw "'SDL_gpu' has been removed due to lack of upstream maintenance and known users"; # Added 2025-03-15
+  SDL_image_2_0 = throw "'SDL_image_2_0' has been removed in favor of the latest version"; # Added 2025-04-20
   seafile-server = throw "'seafile-server' has been removed as it is unmaintained"; # Added 2025-08-21
   seahub = throw "'seahub' has been removed as it is unmaintained"; # Added 2025-08-21
   semeru-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01
   semeru-jre-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01
   sensu = throw "sensu has been removed as the upstream project is deprecated. Consider using `sensu-go`"; # Added 2024-10-28
+  sequoia = sequoia-sq; # Added 2023-06-26
   serial-unit-testing = throw "'serial-unit-testing' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   serious-sans = throw "'serious-sans' has been renamed to 'serious-shanns', which is not currently packaged"; # Added 2025-01-26
   session-desktop-appimage = session-desktop; # Added 2022-08-31
   setserial = throw "'setserial' has been removed as it had been abandoned upstream"; # Added 2025-05-18
-  sequoia = sequoia-sq; # Added 2023-06-26
   sexp = sexpp; # Added 2023-07-03
   sgrep = throw "'sgrep' has been removed as it was unmaintained upstream since 1998 and broken with gcc 14"; # Added 2025-05-17
+  shadered = throw "shadered has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   shallot = throw "'shallot' has been removed as it is broken and the upstream repository was removed. Consider using 'mkp224o'"; # Added 2025-03-16
+  sheesy-cli = throw "'sheesy-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
   shell-hist = throw "'shell-hist' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   shipyard = jumppad; # Added 2023-06-06
+  shout = nodePackages.shout; # Added unknown; moved 2024-10-19
   siduck76-st = st-snazzy; # Added 2024-12-24
   sierra-breeze-enhanced = throw "'sierra-breeze-enhanced' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  signald = throw "'signald' has been removed due to lack of upstream maintenance"; # Added 2025-05-17
-  signaldctl = throw "'signaldctl' has been removed due to lack of upstream maintenance"; # Added 2025-05-17
   signal-desktop-beta = throw "signal-desktop-beta has been removed to make the signal-desktop package easier to maintain"; # Added 2024-11-20
   signal-desktop-source = lib.warnOnInstantiate "'signal-desktop-source' is now exposed at 'signal-desktop'." signal-desktop; # Added 2025-04-16
-  silc_server = throw "'silc_server' has been removed because it is unmaintained"; # Added 2025-05-12
+  signald = throw "'signald' has been removed due to lack of upstream maintenance"; # Added 2025-05-17
+  signaldctl = throw "'signaldctl' has been removed due to lack of upstream maintenance"; # Added 2025-05-17
   silc_client = throw "'silc_client' has been removed because it is unmaintained"; # Added 2025-05-12
+  silc_server = throw "'silc_server' has been removed because it is unmaintained"; # Added 2025-05-12
   simplesamlphp = throw "'simplesamlphp' was removed because it was unmaintained in nixpkgs"; # Added 2025-10-17
   siproxd = throw "'siproxd' has been removed as it was unmaintained and incompatible with newer libosip versions"; # Added 2025-05-18
-  sisco.lv2 = throw "'sisco.lv2' has been removed as it was unmaintained and broken"; # Added 2025-08-26
   sipwitch = throw "'sipwitch' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
-  shadered = throw "shadered has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
-  sheesy-cli = throw "'sheesy-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
-  shout = nodePackages.shout; # Added unknown; moved 2024-10-19
+  sisco.lv2 = throw "'sisco.lv2' has been removed as it was unmaintained and broken"; # Added 2025-08-26
   sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21
-  skypeexport = throw "'skypeexport' was removed since Skype has been shut down in May 2025"; # Added 2025-09-15
   SkypeExport = skypeexport; # Added 2024-06-12
+  skypeexport = throw "'skypeexport' was removed since Skype has been shut down in May 2025"; # Added 2025-09-15
   skypeforlinux = throw "Skype has been shut down in May 2025"; # Added 2025-05-05
   slack-dark = throw "'slack-dark' has been renamed to/replaced by 'slack'"; # Converted to throw 2024-10-17
   sladeUnstable = slade-unstable; # Added 2025-08-26
@@ -2436,43 +2384,41 @@ mapAliases {
   snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # Added 2024-03-04
   snort2 = throw "snort2 has been removed as it is deprecated and unmaintained by upstream. Consider using snort (snort3) package instead."; # 2025-05-21
   snowman = throw "snowman has been removed as it is unmaintained by upstream"; # 2025-10-12
+  solana-validator = throw "'solana-validator' is obsoleted by solana-cli, which also includes the validator binary"; # Added 2024-12-20
   soldat-unstable = opensoldat; # Added 2022-07-02
   somatic-sniper = throw "somatic-sniper has been removed as it was archived in 2020 and fails to build."; # Added 2025-10-14
+  sonusmix = throw "'sonusmix' has been removed due to lack of maintenance"; # Added 2025-08-27
   soulseekqt = throw "'soulseekqt' has been removed due to lack of maintenance in Nixpkgs in a long time. Consider using 'nicotine-plus' or 'slskd' instead."; # Added 2025-06-07
   soundkonverter = throw "'soundkonverter' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20
   soundOfSorting = sound-of-sorting; # Added 2023-07-07
-  SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12
-  SPAdes = spades; # Added 2024-06-12
-  spago = spago-legacy; # Added 2025-09-23, pkgs.spago should become spago@next which hasn't been packaged yet
-  spark2014 = gnatprove; # Added 2024-02-25
-  space-orbit = throw "'space-orbit' has been removed because it is unmaintained; Debian upstream stopped tracking it in 2011."; # Added 2025-06-08
-  spatialite_gui = throw "spatialite_gui has been renamed to spatialite-gui"; # Added 2025-01-12
-  spatialite_tools = throw "spatialite_tools has been renamed to spatialite-tools"; # Added 2025-02-06
-  sonusmix = throw "'sonusmix' has been removed due to lack of maintenance"; # Added 2025-08-27
-
+  source-han-sans-japanese = source-han-sans; # Added 2020-02-10
+  source-han-sans-korean = source-han-sans; # Added 2020-02-10
+  source-han-sans-simplified-chinese = source-han-sans; # Added 2020-02-10
+  source-han-sans-traditional-chinese = source-han-sans; # Added 2020-02-10
+  source-han-serif-japanese = source-han-serif; # Added 2020-02-10
+  source-han-serif-korean = source-han-serif; # Added 2020-02-10
+  source-han-serif-simplified-chinese = source-han-serif; # Added 2020-02-10
+  source-han-serif-traditional-chinese = source-han-serif; # Added 2020-02-10
   sourceHanSansPackages = {
     japanese = source-han-sans; # Added 2020-02-10
     korean = source-han-sans; # Added 2020-02-10
     simplified-chinese = source-han-sans; # Added 2020-02-10
     traditional-chinese = source-han-sans; # Added 2020-02-10
   };
-  source-han-sans-japanese = source-han-sans; # Added 2020-02-10
-  source-han-sans-korean = source-han-sans; # Added 2020-02-10
-  source-han-sans-simplified-chinese = source-han-sans; # Added 2020-02-10
-  source-han-sans-traditional-chinese = source-han-sans; # Added 2020-02-10
   sourceHanSerifPackages = {
     japanese = source-han-serif; # Added 2020-02-10
     korean = source-han-serif; # Added 2020-02-10
     simplified-chinese = source-han-serif; # Added 2020-02-10
     traditional-chinese = source-han-serif; # Added 2020-02-10
   };
-  source-han-serif-japanese = source-han-serif; # Added 2020-02-10
-  source-han-serif-korean = source-han-serif; # Added 2020-02-10
-  source-han-serif-simplified-chinese = source-han-serif; # Added 2020-02-10
-  source-han-serif-traditional-chinese = source-han-serif; # Added 2020-02-10
-
   sourcehut = throw "'sourcehut.*' has been removed due to being broken and unmaintained"; # Added 2025-06-15
-  solana-validator = throw "'solana-validator' is obsoleted by solana-cli, which also includes the validator binary"; # Added 2024-12-20
+  SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12
+  space-orbit = throw "'space-orbit' has been removed because it is unmaintained; Debian upstream stopped tracking it in 2011."; # Added 2025-06-08
+  SPAdes = spades; # Added 2024-06-12
+  spago = spago-legacy; # Added 2025-09-23, pkgs.spago should become spago@next which hasn't been packaged yet
+  spark2014 = gnatprove; # Added 2024-02-25
+  spatialite_gui = throw "spatialite_gui has been renamed to spatialite-gui"; # Added 2025-01-12
+  spatialite_tools = throw "spatialite_tools has been renamed to spatialite-tools"; # Added 2025-02-06
   spectral = throw "'spectral' has been renamed to/replaced by 'neochat'"; # Converted to throw 2024-10-17
   # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell
   spidermonkey = throw "'spidermonkey' has been renamed to/replaced by 'spidermonkey_91'"; # Converted to throw 2024-10-17
@@ -2481,8 +2427,8 @@ mapAliases {
   spidermonkey_102 = throw "'spidermonkey_102' is EOL since 2023/03"; # Added 2024-08-07
   spotify-unwrapped = spotify; # added 2022-11-06
   spring = throw "spring has been removed, as it had been broken since 2023 (it was a game; maybe you’re thinking of spring-boot-cli?)"; # Added 2025-09-16
-  springLobby = throw "springLobby has been removed, as it had been broken since 2023"; # Added 2025-09-16
   spring-boot = throw "'spring-boot' has been renamed to/replaced by 'spring-boot-cli'"; # Converted to throw 2024-10-17
+  springLobby = throw "springLobby has been removed, as it had been broken since 2023"; # Added 2025-09-16
   sqlbag = throw "sqlbag has been removed because it has been marked as broken since May 2024."; # Added 2025-10-11
   sqldeveloper = throw "sqldeveloper was dropped due to being severely out-of-date and having a dependency on JavaFX for Java 8, which we do not support"; # Added 2024-11-02
   srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09
@@ -2490,6 +2436,8 @@ mapAliases {
   starpls-bin = starpls; # Added 2024-10-30
   starspace = throw "starspace has been removed from nixpkgs, as it was broken"; # Added 2024-07-15
   station = throw "station has been removed from nixpkgs, as there were no committers among its maintainers to unblock security issues"; # added 2025-06-16
+  steam-run-native = steam-run; # added 2022-02-21
+  steam-small = steam; # Added 2024-09-12
   steamcontroller = throw "'steamcontroller' has been removed due to lack of upstream maintenance. Consider using 'sc-controller' instead."; # Added 2025-09-20
   steamPackages = {
     steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable"; # Added 2024-10-16
@@ -2500,8 +2448,6 @@ mapAliases {
     steam-runtime-wrapped = throw "`steamPackages.steam-runtime-wrapped` has been removed, as it's no longer supported or necessary"; # Added 2024-10-16
     steamcmd = lib.warnOnInstantiate "`steamPackages.steamcmd` has been moved to top level as `steamcmd`" steamcmd; # Added 2024-10-16
   };
-  steam-small = steam; # Added 2024-09-12
-  steam-run-native = steam-run; # added 2022-02-21
   StormLib = stormlib; # Added 2024-01-21
   strawberry-qt5 = throw "strawberry-qt5 has been replaced by strawberry"; # Added 2024-11-22 and updated 2025-07-19
   strawberry-qt6 = throw "strawberry-qt6 has been replaced by strawberry"; # Added 2025-07-19
@@ -2520,35 +2466,34 @@ mapAliases {
   sumokoin = throw "sumokoin has been removed as it was abandoned upstream"; # Added 2024-11-23
   supertag = throw "supertag has been removed as it was abandoned upstream and fails to build"; # Added 2025-04-20
   suyu = throw "suyu has been removed from nixpkgs, as it is subject to a DMCA takedown"; # Added 2025-05-12
-  swiProlog = lib.warnOnInstantiate "swiProlog has been renamed to swi-prolog" swi-prolog; # Added 2024-09-07
-  swiPrologWithGui = lib.warnOnInstantiate "swiPrologWithGui has been renamed to swi-prolog-gui" swi-prolog-gui; # Added 2024-09-07
   swig1 = throw "swig1 has been removed as it is obsolete"; # Added 2024-08-23
   swig2 = throw "swig2 has been removed as it is obsolete"; # Added 2024-08-23
   swig3 = throw "swig3 has been removed as it is obsolete"; # Added 2024-11-18
   swig4 = swig; # Added 2024-09-12
   swigWithJava = throw "swigWithJava has been removed as the main swig package has supported Java since 2009"; # Added 2024-09-12
-  swtpm-tpm2 = throw "'swtpm-tpm2' has been renamed to/replaced by 'swtpm'"; # Converted to throw 2024-10-17
+  swiProlog = lib.warnOnInstantiate "swiProlog has been renamed to swi-prolog" swi-prolog; # Added 2024-09-07
+  swiPrologWithGui = lib.warnOnInstantiate "swiPrologWithGui has been renamed to swi-prolog-gui" swi-prolog-gui; # Added 2024-09-07
   swt_jdk8 = throw "'swt_jdk8' has been removed due to being unused and broken for a long time"; # Added 2025-01-07
+  swtpm-tpm2 = throw "'swtpm-tpm2' has been renamed to/replaced by 'swtpm'"; # Converted to throw 2024-10-17
   Sylk = sylk; # Added 2024-06-12
   symbiyosys = sby; # Added 2024-08-18
   syn2mas = throw "'syn2mas' has been removed. It has been integrated into the main matrix-authentication-service CLI as a subcommand: 'mas-cli syn2mas'."; # Added 2025-07-07
   sync = taler-sync; # Added 2024-09-04
   syncall = "'syncall' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   syncthing-cli = throw "'syncthing-cli' has been renamed to/replaced by 'syncthing'"; # Converted to throw 2024-10-17
-  syncthingtray-qt6 = syncthingtray; # Added 2024-03-06
   syncthing-tray = throw "syncthing-tray has been removed because it is broken and unmaintained"; # Added 2025-05-18
+  syncthingtray-qt6 = syncthingtray; # Added 2024-03-06
   syndicate_utils = throw "'syndicate_utils' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
-
   t1lib = throw "'t1lib' has been removed as it was broken and unmaintained upstream."; # Added 2025-06-11
   tabula = throw "tabula has been removed from nixpkgs, as it was broken"; # Added 2024-07-15
   tailor = throw "'tailor' has been removed from nixpkgs, as it was unmaintained upstream."; # Added 2024-11-02
-  tangogps = throw "'tangogps' has been renamed to/replaced by 'foxtrotgps'"; # Converted to throw 2024-10-17
   tamgamp.lv2 = tamgamp-lv2; # Added 2025-09-27
-  taskwarrior = lib.warnOnInstantiate "taskwarrior was replaced by taskwarrior3, which requires manual transition from taskwarrior 2.6, read upstream's docs: https://taskwarrior.org/docs/upgrade-3/" taskwarrior2; # Added 2024-08-14
+  tangogps = throw "'tangogps' has been renamed to/replaced by 'foxtrotgps'"; # Converted to throw 2024-10-17
   taplo-cli = taplo; # Added 2022-07-30
   taplo-lsp = taplo; # Added 2022-07-30
   targetcli = targetcli-fb; # Added 2025-03-14
   taro = taproot-assets; # Added 2023-07-04
+  taskwarrior = lib.warnOnInstantiate "taskwarrior was replaced by taskwarrior3, which requires manual transition from taskwarrior 2.6, read upstream's docs: https://taskwarrior.org/docs/upgrade-3/" taskwarrior2; # Added 2024-08-14
   tbb = onetbb; # Added 2025-09-14
   tbb_2020 = throw "tbb_2020 has been removed because it is unmaintained upstream and had no remaining users; use onetbb"; # Added 2025-09-14
   tbb_2021 = throw "tbb_2021 has been removed because it is unmaintained upstream and had no remaining users; use onetbb"; # Added 2025-09-13
@@ -2565,45 +2510,50 @@ mapAliases {
   tdesktop = telegram-desktop; # Added 2023-04-07
   tdlib-purple = pidginPackages.tdlib-purple; # Added 2023-07-17
   tdom = tclPackages.tdom; # Added 2024-10-02
-  teamspeak_client = teamspeak3; # Added 2024-11-07
   teamspeak5_client = teamspeak6-client; # Added 2025-01-29
+  teamspeak_client = teamspeak3; # Added 2024-11-07
   teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # Added 2024-08-23
+  tegaki-zinnia-japanese = throw "'tegaki-zinnia-japanese' has been removed due to lack of maintenance"; # Added 2025-09-10
   telepathy-gabble = throw "'telepathy-gabble' has been removed as it was unmaintained, unused, broken and used outdated libraries"; # Added 2025-04-20
   telepathy-logger = throw "'telepathy-logger' has been removed as it was unmaintained, unused and broken"; # Added 2025-04-20
   teleport_13 = throw "teleport 13 has been removed as it is EOL. Please upgrade to Teleport 14 or later"; # Added 2024-05-26
   teleport_14 = throw "teleport 14 has been removed as it is EOL. Please upgrade to Teleport 15 or later"; # Added 2024-10-18
   teleport_15 = throw "teleport 15 has been removed as it is EOL. Please upgrade to Teleport 16 or later"; # Added 2025-03-28
   temporalite = throw "'temporalite' has been removed as it is obsolete and unmaintained, please use 'temporal-cli' instead (with `temporal server start-dev`)"; # Added 2025-06-26
-  terminus-nerdfont = lib.warnOnInstantiate "terminus-nerdfont is redundant. Use nerd-fonts.terminess-ttf instead." nerd-fonts.terminess-ttf; # Added 2024-11-10
-  temurin-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01
-  temurin-jre-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01
-  temurin-bin-19 = throw "Temurin 19 has been removed as it has reached its end of life"; # Added 2024-08-01
-  temurin-jre-bin-19 = throw "Temurin 19 has been removed as it has reached its end of life"; # Added 2024-08-01
-  temurin-bin-18 = throw "Temurin 18 has been removed as it has reached its end of life"; # Added 2024-08-01
-  temurin-jre-bin-18 = throw "Temurin 18 has been removed as it has reached its end of life"; # Added 2024-08-01
   temurin-bin-16 = throw "Temurin 16 has been removed as it has reached its end of life"; # Added 2024-08-01
-  temurin-jre-bin-22 = throw "Temurin 22 has been removed as it has reached its end of life"; # Added 2024-09-24
+  temurin-bin-18 = throw "Temurin 18 has been removed as it has reached its end of life"; # Added 2024-08-01
+  temurin-bin-19 = throw "Temurin 19 has been removed as it has reached its end of life"; # Added 2024-08-01
+  temurin-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01
   temurin-bin-22 = throw "Temurin 22 has been removed as it has reached its end of life"; # Added 2024-09-24
   temurin-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04
+  temurin-jre-bin-18 = throw "Temurin 18 has been removed as it has reached its end of life"; # Added 2024-08-01
+  temurin-jre-bin-19 = throw "Temurin 19 has been removed as it has reached its end of life"; # Added 2024-08-01
+  temurin-jre-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01
+  temurin-jre-bin-22 = throw "Temurin 22 has been removed as it has reached its end of life"; # Added 2024-09-24
   temurin-jre-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04
   tepl = libgedit-tepl; # Added 2024-04-29
+  terminus-nerdfont = lib.warnOnInstantiate "terminus-nerdfont is redundant. Use nerd-fonts.terminess-ttf instead." nerd-fonts.terminess-ttf; # Added 2024-11-10
   termplay = throw "'termplay' has been removed due to lack of maintenance upstream"; # Added 2025-01-25
   testVersion = testers.testVersion; # Added 2022-04-20
-  textual-paint = throw "'textual-paint' has been removed as it is broken"; # Added 2025-09-10
+  tet = throw "'tet' has been removed for lack of maintenance"; # Added 2025-10-12
+  tex-match = throw "'tex-match' has been removed due to lack of maintenance upstream. Consider using 'hieroglyphic' instead"; # Added 2024-09-24
   texinfo4 = throw "'texinfo4' has been removed in favor of the latest version"; # Added 2025-06-08
+  texinfo5 = throw "'texinfo5' has been removed from nixpkgs"; # Added 2024-09-10
+  textual-paint = throw "'textual-paint' has been removed as it is broken"; # Added 2025-09-10
   tezos-rust-libs = ligo; # Added 2025-06-03
   tfplugindocs = terraform-plugin-docs; # Added 2023-11-01
+  thefuck = throw "'thefuck' has been removed due to lack of maintenance upstream and incompatible with python 3.12+. Consider using 'pay-respects' instead"; # Added 2025-05-30
   theLoungePlugins = throw "'theLoungePlugins' has been removed due to only containing throws"; # Added 2025-09-25
   thiefmd = throw "'thiefmd' has been removed due to lack of maintenance upstream and incompatible with newer Pandoc. Please use 'apostrophe' or 'folio' instead"; # Added 2025-02-20
-  thefuck = throw "'thefuck' has been removed due to lack of maintenance upstream and incompatible with python 3.12+. Consider using 'pay-respects' instead"; # Added 2025-05-30
+  thrust = throw "'thrust' has been removed due to lack of maintenance"; # Added 2025-08-21
   thunderbird-128 = throw "Thunderbird 128 support ended in August 2025";
   thunderbird-128-unwrapped = throw "Thunderbird 128 support ended in August 2025";
-  invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05
   ticpp = throw "'ticpp' has been removed due to being unmaintained"; # Added 2025-09-10
-  tijolo = throw "'tijolo' has been removed due to being unmaintained"; # Added 2024-12-27
-  timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2024-10-17
   tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22
+  tijolo = throw "'tijolo' has been removed due to being unmaintained"; # Added 2024-12-27
   timelens = throw "'timelens' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
+  timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2024-10-17
+  timescaledb = throw "'timescaledb' has been removed. Use 'postgresqlPackages.timescaledb' instead."; # Added 2025-07-19
   tinyxml2 = throw "The 'tinyxml2' alias has been removed, use 'tinyxml' for https://sourceforge.net/projects/tinyxml/ or 'tinyxml-2' for https://github.com/leethomason/tinyxml2"; # Added 2025-10-11
   tix = tclPackages.tix; # Added 2024-10-02
   tkcvs = tkrev; # Added 2022-03-07
@@ -2617,9 +2567,14 @@ mapAliases {
   ton = throw "'ton' has been removed as there were insufficient maintainer resources to keep up with updates"; # Added 2025-04-27
   tooling-language-server = deputy; # Added 2025-06-22
   tor-browser-bundle-bin = tor-browser; # Added 2023-09-23
-  torrenttools = throw "torrenttools has been removed due to lack of maintanance upstream"; # Added 2025-04-06
   torq = throw "torq has been removed because the project went closed source"; # Added 2024-11-24
+  torrenttools = throw "torrenttools has been removed due to lack of maintanance upstream"; # Added 2025-04-06
   torzu = throw "torzu has been removed from nixpkgs, as it is subject to a DMCA takedown"; # Added 2025-05-12
+  tracker = lib.warnOnInstantiate "tracker has been renamed to tinysparql" tinysparql; # Added 2024-09-30
+  tracker-miners = lib.warnOnInstantiate "tracker-miners has been renamed to localsearch" localsearch; # Added 2024-09-30
+  transcode = throw "transcode has been removed as it is unmaintained"; # Added 2024-12-11
+  transfig = fig2dev; # Added 2022-02-15
+  transifex-client = transifex-cli; # Added 2023-12-29
   transmission = lib.warnOnInstantiate (transmission3Warning { }) transmission_3; # Added 2024-06-10
   transmission-gtk = lib.warnOnInstantiate (transmission3Warning {
     suffix = "-gtk";
@@ -2629,30 +2584,21 @@ mapAliases {
   }) transmission_3-qt; # Added 2024-06-10
   treefmt1 = throw "treefmt1 has been removed as it is not maintained anymore. Consider using `treefmt` instead."; # 2025-03-06
   treefmt2 = lib.warnOnInstantiate "treefmt2 has been renamed to treefmt" treefmt; # 2025-03-06
-  libtransmission = lib.warnOnInstantiate (transmission3Warning {
-    prefix = "lib";
-  }) libtransmission_3; # Added 2024-06-10
-  lpcnetfreedv = throw "lpcnetfreedv was removed in favor of LPCNet"; # Added 2025-05-05
-  LPCNet = lpcnet; # Added 2025-05-05
-  tracker = lib.warnOnInstantiate "tracker has been renamed to tinysparql" tinysparql; # Added 2024-09-30
-  tracker-miners = lib.warnOnInstantiate "tracker-miners has been renamed to localsearch" localsearch; # Added 2024-09-30
-  transcode = throw "transcode has been removed as it is unmaintained"; # Added 2024-12-11
-  transfig = fig2dev; # Added 2022-02-15
-  transifex-client = transifex-cli; # Added 2023-12-29
   trenchbroom = throw "trenchbroom was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
-  trfl = throw "trfl has been removed, because it has not received an update for 3 years and was broken"; # Added 2024-07-25
   trezor_agent = trezor-agent; # Added 2024-01-07
+  trfl = throw "trfl has been removed, because it has not received an update for 3 years and was broken"; # Added 2024-07-25
   trilium-next-desktop = trilium-desktop; # Added 2025-08-30
   trilium-next-server = trilium-server; # Added 2025-08-30
   trojita = throw "'trojita' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20
   trust-dns = hickory-dns; # Added 2024-08-07
+  tsearch_extras = throw "'tsearch_extras' has been removed from nixpkgs"; # Added 2024-12-15
   tt-rss = throw "'tt-rss' has been removed, as it was discontinued on 2025-11-01"; # Added 2025-10-03
   tt-rss-plugin-auth-ldap = throw "'tt-rss-plugin-auth-ldap' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
   tt-rss-plugin-data-migration = throw "'tt-rss-plugin-data-migration' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
   tt-rss-plugin-feediron = throw "'tt-rss-plugin-feediron' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
+  tt-rss-plugin-feedly = throw "'tt-rss-plugin-feedly' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
   tt-rss-plugin-ff-instagram = throw "'tt-rss-plugin-ff-instagram' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
   tt-rss-plugin-freshapi = throw "'tt-rss-plugin-freshapi' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
-  tt-rss-plugin-feedly = throw "'tt-rss-plugin-feedly' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
   ttyrec = throw "'ttyrec' has been renamed to/replaced by 'ovh-ttyrec'"; # Converted to throw 2024-10-17
   tuic = throw "`tuic` has been removed due to lack of upstream maintenance, consider using other tuic implementations"; # Added 2025-02-08
   tumpa = throw "tumpa has been removed, as it is broken"; # Added 2024-07-15
@@ -2662,7 +2608,6 @@ mapAliases {
   typst-fmt = typstfmt; # Added 2023-07-15
   typst-lsp = throw "'typst-lsp' has been removed due to lack of upstream maintenance, consider using 'tinymist' instead"; # Added 2025-01-25
   typst-preview = throw "The features of 'typst-preview' have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07
-
   uade123 = uade; # Added 2022-07-30
   uae = throw "'uae' has been removed due to lack of upstream maintenance. Consider using 'fsuae' instead."; # Added 2025-06-11
   uberwriter = throw "'uberwriter' has been renamed to/replaced by 'apostrophe'"; # Converted to throw 2024-10-17
@@ -2672,12 +2617,12 @@ mapAliases {
   unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17
   unicorn-emu = throw "'unicorn-emu' has been renamed to/replaced by 'unicorn'"; # Converted to throw 2024-10-17
   uniffi-bindgen = throw "uniffi-bindgen has been removed since upstream no longer provides a standalone package for the CLI"; # Added 2023-05-27
-  unifi-poller = unpoller; # Added 2022-11-24
-  unifi-video = throw "unifi-video has been removed as it has been unsupported upstream since 2021"; # Added 2024-10-01
   unifi5 = throw "'unifi5' has been removed since its required MongoDB version is EOL."; # Added 2024-04-11
   unifi6 = throw "'unifi6' has been removed since its required MongoDB version is EOL."; # Added 2024-04-11
   unifi7 = throw "'unifi7' has been removed since it is vulnerable to CVE-2024-42025 and its required MongoDB version is EOL."; # Added 2024-10-01
   unifi8 = throw "'unifi8' has been removed. Use `pkgs.unifi` instead."; # Converted to throw 2025-05-10
+  unifi-poller = unpoller; # Added 2022-11-24
+  unifi-video = throw "unifi-video has been removed as it has been unsupported upstream since 2021"; # Added 2024-10-01
   unifiLTS = throw "'unifiLTS' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Added 2024-04-11
   unifiStable = throw "'unifiStable' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Converted to throw 2024-04-11
   unl0kr = throw "'unl0kr' is now included with buffybox. Use `pkgs.buffybox` instead."; # Removed 2024-12-20
@@ -2692,26 +2637,25 @@ mapAliases {
   urxvt_tabbedex = throw "'urxvt_tabbedex' has been renamed to/replaced by 'rxvt-unicode-plugins.tabbedex'"; # Converted to throw 2024-10-17
   urxvt_theme_switch = throw "'urxvt_theme_switch' has been renamed to/replaced by 'rxvt-unicode-plugins.theme-switch'"; # Converted to throw 2024-10-17
   urxvt_vtwheel = throw "'urxvt_vtwheel' has been renamed to/replaced by 'rxvt-unicode-plugins.vtwheel'"; # Converted to throw 2024-10-17
-  ut2004Packages = throw "UT2004 requires libstdc++5 which is not supported by nixpkgs anymore"; # Added 2024-11-24
   ut2004demo = ut2004Packages; # Added 2024-11-24
+  ut2004Packages = throw "UT2004 requires libstdc++5 which is not supported by nixpkgs anymore"; # Added 2024-11-24
   util-linuxCurses = util-linux; # Added 2022-04-12
   utillinux = util-linux; # Added 2020-11-24, keep until node2nix is phased out, see https://github.com/NixOS/nixpkgs/issues/229475
-
   v8 = throw "`v8` has been removed as it's unmaintained for several years and has vulnerabilites. Please migrate to `nodejs.libv8`"; # Added 2024-12-21
+  vaapiIntel = intel-vaapi-driver; # Added 2023-05-31
+  vaapiVdpau = libva-vdpau-driver; # Added 2024-06-05
   validphys2 = throw "validphys2 has been removed, since it has a broken dependency that was removed"; # Added 2024-08-21
+  valum = throw "'valum' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   vamp = {
     vampSDK = vamp-plugin-sdk; # Added 2020-03-26
   };
-  vaapiIntel = intel-vaapi-driver; # Added 2023-05-31
-  vaapiVdpau = libva-vdpau-driver; # Added 2024-06-05
-  valum = throw "'valum' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
-  vaultwarden-vault = vaultwarden.webvault; # Added 2022-12-13
   varnish74 = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31
   varnish74Packages = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31
   varnish75 = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 2025-03-29
   varnish75Packages = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 2025-03-29
   varnish76 = throw "varnish 7.6 is EOL. Either use the LTS or upgrade."; # Added 2025-05-15
   varnish76Packages = throw "varnish 7.6 is EOL. Either use the LTS or upgrade."; # Added 2025-05-15
+  vaultwarden-vault = vaultwarden.webvault; # Added 2022-12-13
   vbetool = throw "'vbetool' has been removed as it is broken and not maintained upstream."; # Added 2025-06-11
   vc_0_7 = throw "'vc_0_7' has been removed as it was broken, unused in nixpkgs and unmaintained"; # Added 2025-10-20
   vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
@@ -2721,14 +2665,12 @@ mapAliases {
   veriT = verit; # Added 2025-08-21
   vieb = throw "'vieb' has been removed as it doesn't satisfy our security criteria for browsers."; # Added 2025-06-25
   ViennaRNA = viennarna; # Added 2023-08-23
-  vimHugeX = vim-full; # Added 2022-12-04
   vim_configurable = vim-full; # Added 2022-12-04
-  vinagre = throw "'vinagre' has been removed as it has been archived upstream. Consider using 'gnome-connections' or 'remmina' instead"; # Added 2024-09-14
-  libviper = throw "'libviper' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
-  libviperfx = throw "'libviperfx' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
+  vimHugeX = vim-full; # Added 2022-12-04
   vimix-cursor-theme = throw "'vimix-cursor-theme' has been superseded by 'vimix-cursors'"; # Added 2025-03-04
-  viper4linux-gui = throw "'viper4linux-gui' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
+  vinagre = throw "'vinagre' has been removed as it has been archived upstream. Consider using 'gnome-connections' or 'remmina' instead"; # Added 2024-09-14
   viper4linux = throw "'viper4linux' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
+  viper4linux-gui = throw "'viper4linux-gui' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
   virt-manager-qt = throw "'virt-manager-qt' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20
   virtkey = throw "'virtkey' has been removed, as it was unmaintained, abandoned upstream, and relied on gtk2."; # Added 2025-10-12
   virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17
@@ -2749,18 +2691,17 @@ mapAliases {
   vtkWithQt5 = throw "'vtkWithQt5' has been removed. Consider using 'vtkWithQt6' instead."; # Added 2025-09-06
   vuze = throw "'vuze' was removed because it is unmaintained upstream and insecure (CVE-2018-13417). BiglyBT is a maintained fork."; # Added 2024-11-22
   vwm = throw "'vwm' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
-
   w_scan = throw "'w_scan' has been removed due to lack of upstream maintenance"; # Added 2025-08-29
   waitron = throw "'waitron' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   wakatime = wakatime-cli; # 2024-05-30
-  wavm = throw "wavm has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
   wal_e = throw "wal_e was removed as it is unmaintained upstream and depends on the removed boto package; upstream recommends using wal-g or pgbackrest"; # Added 2024-09-22
+  wapp = tclPackages.wapp; # Added 2024-10-02
   warsow = throw "'warsow' has been removed as it is unmaintained and is broken"; # Added 2025-10-09
   warsow-engine = throw "'warsow-engine' has been removed as it is unmaintained and is broken"; # Added 2025-10-09
-  wapp = tclPackages.wapp; # Added 2024-10-02
-  wavebox = throw "'wavebox' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-24
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_104;
   watershot = throw "'watershot' has been removed as it is unmaintained upstream and no longer works"; # Added 2025-06-01
+  wavebox = throw "'wavebox' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-24
+  wavm = throw "wavm has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
   wayfireApplications-unwrapped = throw "
     'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire'
     'wayfireApplications-unwrapped.wayfirePlugins' has been renamed to/replaced by 'wayfirePlugins'
@@ -2769,6 +2710,7 @@ mapAliases {
   "; # Add 2023-07-29
   waypoint = throw "waypoint has been removed from nixpkgs as the upstream project was archived"; # Added 2024-04-24
   wcurl = throw "'wcurl' has been removed due to being bundled with 'curl'"; # Added 2025-07-04
+  wdomirror = throw "'wdomirror' has been removed as it is unmaintained upstream, Consider using 'wl-mirror' instead"; # Added 2025-09-04
   webfontkitgenerator = webfont-bundler; # Added 2025-07-27
   webkitgtk = throw "'webkitgtk' attribute has been removed from nixpkgs, use attribute with ABI version set explicitly"; # Added 2025-06-11
   webkitgtk_4_0 = throw "'webkitgtk_4_0' has been removed, port to `libsoup_3` and switch to `webkitgtk_4_1`"; # Added 2025-10-08
@@ -2776,15 +2718,15 @@ mapAliases {
   wg-bond = throw "'wg-bond' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   whatsapp-for-linux = wasistlos; # Added 2025-01-30
   wifi-password = throw "'wifi-password' has been removed as it was unmaintained upstream"; # Added 2025-08-29
-  wineWayland = wine-wayland;
-  winhelpcgi = throw "'winhelpcgi' has been removed as it was unmaintained upstream and broken with GCC 14"; # Added 2025-06-14
   win-pvdrivers = throw "'win-pvdrivers' has been removed as it was subject to the Xen build machine compromise (XSN-01) and has open security vulnerabilities (XSA-468)"; # Added 2025-08-29
   win-virtio = virtio-win; # Added 2023-10-17
+  wineWayland = wine-wayland;
+  winhelpcgi = throw "'winhelpcgi' has been removed as it was unmaintained upstream and broken with GCC 14"; # Added 2025-06-14
   wireguard-vanity-address = throw "'wireguard-vanity-address' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
   wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17
   wlroots_0_16 = throw "'wlroots_0_16' has been removed in favor of newer versions"; # Added 2024-07-14
+  wmii_hg = wmii; # Added 2022-04-26
   woof = throw "'woof' has been removed as it is broken and unmaintained upstream"; # Added 2025-09-04
-  wdomirror = throw "'wdomirror' has been removed as it is unmaintained upstream, Consider using 'wl-mirror' instead"; # Added 2025-09-04
   wordpress6_3 = throw "'wordpress6_3' has been removed in favor of the latest version"; # Added 2024-08-03
   wordpress6_4 = throw "'wordpress6_4' has been removed in favor of the latest version"; # Added 2024-08-03
   wordpress6_5 = wordpress_6_5; # Added 2024-08-03
@@ -2792,12 +2734,10 @@ mapAliases {
   wordpress_6_6 = throw "'wordpress_6_6' has been removed in favor of the latest version"; # Added 2024-11-17
   worldengine-cli = throw "'worldengine-cli' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
   wpa_supplicant_ro_ssids = lib.warnOnInstantiate "Deprecated package: Please use wpa_supplicant instead. Read-only SSID patches are now upstream!" wpa_supplicant;
-  wrapLisp_old = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  wmii_hg = wmii; # Added 2022-04-26
   wrapGAppsHook = wrapGAppsHook3; # Added 2024-03-26
+  wrapLisp_old = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
   write_stylus = styluslabs-write-bin; # Added 2024-10-09
   wxGTK33 = wxwidgets_3_3; # Added 2025-07-20
-
   x11idle = throw "'x11idle' has been removed as the upstream is no longer available. Please see 'xprintidle' as an alternative"; # Added 2025-03-10
   x509-limbo = throw "'x509-limbo' has been removed from nixpkgs"; # Added 2024-10-22
   xarchive = throw "'xarchive' has been removed due to lack of maintenance upstream. Consider using 'file-roller' instead"; # Added 2024-10-19
@@ -2814,21 +2754,21 @@ mapAliases {
   xen_4_18 = throw "Due to technical challenges involving building older versions of Xen with newer dependencies, the Xen Project Hypervisor Maintenance Team decided to switch to a latest-only support cycle. As Xen 4.18 would have been the 'n-1' version, it was removed"; # Added 2024-10-05
   xen_4_19 = throw "Use 'xen' instead"; # Added 2024-10-05
   xenPackages = throw "The attributes in the xenPackages set have been promoted to the top-level. (xenPackages.xen_4_19 -> xen)"; # Added 2024-10-05
-  xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22
   xflux = throw "'xflux' has been removed as it was unmaintained"; # Added 2025-08-22
+  xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22
   xineLib = throw "'xineLib' has been renamed to/replaced by 'xine-lib'"; # Converted to throw 2024-10-17
   xineUI = throw "'xineUI' has been renamed to/replaced by 'xine-ui'"; # Converted to throw 2024-10-17
   xinput_calibrator = xinput-calibrator; # Added 2025-08-28
   xjump = throw "'xjump' has been removed as it is unmaintained"; # Added 2025-08-22
   xlsxgrep = throw "'xlsxgrep' has been dropped due to lack of maintenance."; # Added 2024-11-01
+  xmake-core-sv = throw "'xmake-core-sv' has been removed, use 'libsv' instead"; # Added 2024-10-10
   xmlada = gnatPackages.xmlada; # Added 2024-02-25
   xmlroff = throw "'xmlroff' has been removed as it is unmaintained and broken"; # Added 2025-05-18
   xmr-stak = throw "xmr-stak has been removed from nixpkgs because it was broken"; # Added 2024-07-15
-  xmake-core-sv = throw "'xmake-core-sv' has been removed, use 'libsv' instead"; # Added 2024-10-10
   xo = throw "Use 'dbtpl' instead of 'xo'"; # Added 2025-09-28
+  xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18
   xorg-autoconf = util-macros; # Added 2025-08-18
   xournal = throw "'xournal' has been removed due to lack of activity upstream and depending on gnome2. Consider using 'xournalpp' instead."; # Added 2024-12-06
-  xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18
   xplayer = throw "xplayer has been removed as the upstream project was archived"; # Added 2024-12-27
   xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14
   xsd = throw "'xsd' has been removed."; # Added 2025-04-02
@@ -2839,34 +2779,32 @@ mapAliases {
   xvfb_run = throw "'xvfb_run' has been renamed to/replaced by 'xvfb-run'"; # Converted to throw 2024-10-17
   xwaylandvideobridge = makePlasma5Throw "xwaylandvideobridge"; # Added 2024-09-27
   xxv = throw "'xxv' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-
+  yabar = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10
+  yabar-unstable = yabar; # Added 2025-06-10
   yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2024-10-17
-  yaml-cpp_0_3 = throw "yaml-cpp_0_3 has been removed, as it was unused"; # Added 2025-09-16
-  yesplaymusic = throw "YesPlayMusic has been removed as it was broken, unmaintained, and used deprecated Node and Electron versions"; # Added 2024-12-13
   yafaray-core = libyafaray; # Added 2022-09-23
+  yaml-cpp_0_3 = throw "yaml-cpp_0_3 has been removed, as it was unused"; # Added 2025-09-16
   yamlpath = throw "'yamlpath' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   yandex-browser = throw "'yandex-browser' has been removed, as it was broken and unmaintained"; # Added 2025-04-17
   yandex-browser-beta = throw "'yandex-browser-beta' has been removed, as it was broken and unmaintained"; # Added 2025-04-17
   yandex-browser-corporate = throw "'yandex-browser-corporate' has been removed, as it was broken and unmaintained"; # Added 2025-04-17
-  youtrack_2022_3 = throw "'youtrack_2022_3' has been removed as it was deprecated. Please update to the 'youtrack' package."; # Added 2024-10-17
-  yabar = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10
-  yabar-unstable = yabar; # Added 2025-06-10
   yeahwm = throw "'yeahwm' has been removed, as it was broken and unmaintained upstream."; # Added 2025-06-12
+  yesplaymusic = throw "YesPlayMusic has been removed as it was broken, unmaintained, and used deprecated Node and Electron versions"; # Added 2024-12-13
+  youtrack_2022_3 = throw "'youtrack_2022_3' has been removed as it was deprecated. Please update to the 'youtrack' package."; # Added 2024-10-17
   yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27
   yubikey-manager-qt = throw "'yubikey-manager-qt' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07
   yubikey-personalization-gui = throw "'yubikey-personalization-gui' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07
+  yuzu = throw "yuzu has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
   yuzu-ea = throw "yuzu-ea has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
   yuzu-early-access = throw "yuzu-early-access has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
-  yuzu = throw "yuzu has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
   yuzu-mainline = throw "yuzu-mainline has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
   yuzuPackages = throw "yuzuPackages has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
-
+  z3_4_8 = throw "'z3_4_8' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
+  z3_4_8_5 = throw "'z3_4_8_5' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
   z3_4_11 = throw "'z3_4_11' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
   z3_4_12 = throw "'z3_4_12' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
   z3_4_13 = throw "'z3_4_13' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
   z3_4_14 = throw "'z3_4_14' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
-  z3_4_8_5 = throw "'z3_4_8_5' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
-  z3_4_8 = throw "'z3_4_8' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
   zabbix50 = throw "'zabbix50' has been removed, it would have reached its End of Life a few days after the release of NixOS 25.05. Consider upgrading to 'zabbix60' or 'zabbix70'."; # Added 2025-04-22
   zabbix64 = throw "'zabbix64' has been removed because it reached its End of Life. Consider upgrading to 'zabbix70'."; # Added 2025-04-22
   zandronum-alpha = throw "'zandronum-alpha' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19
@@ -2880,9 +2818,9 @@ mapAliases {
     zeroad-unwrapped = lib.warnOnInstantiate "'zeroadPackages.zeroad-unwrapped' has been renamed to 'zeroad-unwrapped'" zeroad-unwrapped; # Added 2025-03-22
   };
   zeromq4 = zeromq; # Added 2024-11-03
+  zfs_2_1 = throw "zfs 2.1 has been removed as it is EOL. Please upgrade to a newer version"; # Added 2024-12-25
   zfsStable = zfs; # Added 2024-02-26
   zfsUnstable = zfs_unstable; # Added 2024-02-26
-  zfs_2_1 = throw "zfs 2.1 has been removed as it is EOL. Please upgrade to a newer version"; # Added 2024-12-25
   zig_0_9 = throw "zig 0.9 has been removed, upgrade to a newer version instead"; # Added 2025-01-24
   zig_0_10 = throw "zig 0.10 has been removed, upgrade to a newer version instead"; # Added 2025-01-24
   zig_0_11 = throw "zig 0.11 has been removed, upgrade to a newer version instead"; # Added 2025-04-09
@@ -2892,19 +2830,20 @@ mapAliases {
   zimlib = throw "'zimlib' has been removed because it was an outdated and unused version of 'libzim'"; # Added 2025-03-07
   zinc = zincsearch; # Added 2023-05-28
   zint = zint-qt; # Added 2025-05-15
+  zk-shell = throw "zk-shell has been removed as it was broken and unmaintained"; # Added 2024-08-10
+  zkg = throw "'zkg' has been replaced by 'zeek'"; # Added 2023-10-20
   zombietrackergps = throw "'zombietrackergps' has been dropped, as it depends on KDE Gear 5 and is unmaintained"; # Added 2025-08-20
   zotify = throw "zotify has been removed due to lack of upstream maintenance"; # Added 2025-09-26
   zplugin = throw "'zplugin' has been renamed to/replaced by 'zinit'"; # Converted to throw 2024-10-17
-  zk-shell = throw "zk-shell has been removed as it was broken and unmaintained"; # Added 2024-08-10
-  zkg = throw "'zkg' has been replaced by 'zeek'"; # Added 2023-10-20
-  zsh-git-prompt = throw "zsh-git-prompt was removed as it is unmaintained upstream"; # Added 2025-08-28
-  zsh-history = throw "'zsh-history' has been removed as it was unmaintained"; # Added 2025-04-17
   zq = zed.overrideAttrs (old: {
     meta = old.meta // {
       mainProgram = "zq";
     };
   }); # Added 2023-02-06
+  zsh-git-prompt = throw "zsh-git-prompt was removed as it is unmaintained upstream"; # Added 2025-08-28
+  zsh-history = throw "'zsh-history' has been removed as it was unmaintained"; # Added 2025-04-17
   zyn-fusion = zynaddsubfx; # Added 2022-08-05
   zz = throw "'zz' has been removed because it was archived in 2022 and had no maintainer"; # added 2024-05-10
+  # keep-sorted end
 }
 // plasma5Throws

From 3dbd480c246edadf2df40a1b82271a7edde2a7fc Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Sun, 26 Oct 2025 11:31:02 +0200
Subject: [PATCH 2973/6226] .git-blame-ignore-revs: add keep-sorted aliases
 commit

---
 .git-blame-ignore-revs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index 21b1a014d933..e4a336ee6d0f 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -300,3 +300,6 @@ f7611cad5154a9096faa26d156a4079577bfae17
 90e7159c559021ac4f4cc1222000f08a91feff69 # !autorebase nix-shell --run treefmt
 c283f32d296564fd649ef3ed268c1f1f7b199c49 # !autorebase nix-shell --run treefmt
 91a8fee3aaf79348aa2dc1552a29fc1b786c5133 # !autorebase nix-shell --run treefmt
+
+# aliases: keep-sorted
+48ce0739044bd6eba83c3a43bd4ad1046399cdad # !autorebase nix-shell --run treefmt

From 40692331a0f929679c09f66025342b4d115fc498 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 17:12:33 +0000
Subject: [PATCH 2974/6226] nightfox-gtk-theme: 0-unstable-2025-10-14 ->
 0-unstable-2025-10-23

---
 pkgs/by-name/ni/nightfox-gtk-theme/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix
index a6b70b350318..19cb96f8b529 100644
--- a/pkgs/by-name/ni/nightfox-gtk-theme/package.nix
+++ b/pkgs/by-name/ni/nightfox-gtk-theme/package.nix
@@ -70,13 +70,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
   stdenvNoCC.mkDerivation
   {
     inherit pname;
-    version = "0-unstable-2025-10-14";
+    version = "0-unstable-2025-10-23";
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
       repo = "Nightfox-GTK-Theme";
-      rev = "0ca46a44ec83bb44b3ae687aaa756dcd528349be";
-      hash = "sha256-j7hWzwgSdoCEdMFDp6sJ1O01bRX7peUmJXh3qoR5L1c=";
+      rev = "f0212f2aa0d3d6cc0b313020d2d0122f313eafc9";
+      hash = "sha256-KZR5vuMQnLa7AK77YB11BqgqwQHVVFfIe/rXzcocbwk=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];

From 111f1c9f7fa86bf23b5379f767dc593c70f4e86a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 17:21:59 +0000
Subject: [PATCH 2975/6226] docfx: 2.78.3 -> 2.78.4

---
 pkgs/by-name/do/docfx/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/do/docfx/package.nix b/pkgs/by-name/do/docfx/package.nix
index e1d14f4f4f61..c54ab12aabf3 100644
--- a/pkgs/by-name/do/docfx/package.nix
+++ b/pkgs/by-name/do/docfx/package.nix
@@ -6,12 +6,12 @@
 
 buildDotnetGlobalTool {
   pname = "docfx";
-  version = "2.78.3";
+  version = "2.78.4";
 
   dotnet-sdk = dotnetCorePackages.sdk_8_0;
   dotnet-runtime = dotnetCorePackages.runtime_8_0;
 
-  nugetHash = "sha256-hLb6OmxqXOOxFaq/N+aZ0sAzEYjU0giX3c1SWQtKDbs=";
+  nugetHash = "sha256-VvrKQjOnQ7RGp1hP+Bldi7CaM6qpfp4InB5rESISqEg=";
 
   meta = {
     description = "Build your technical documentation site with docfx, with landing pages, markdown, API reference docs for .NET, REST API and more";

From c3de6560800c6b17cb1dcce740f837076b58295f Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Sun, 26 Oct 2025 22:52:17 +0530
Subject: [PATCH 2976/6226] vicinae: add dawnofmidnight as maintainer

See https://github.com/NixOS/nixpkgs/pull/451675#discussion_r2463921396
---
 maintainers/maintainer-list.nix     | 6 ++++++
 pkgs/by-name/vi/vicinae/package.nix | 5 ++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 13fe420f2c3b..6fb7d5c01638 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5970,6 +5970,12 @@
     githubId = 49904992;
     name = "Dawid Sowa";
   };
+  dawnofmidnight = {
+    email = "dawnofmidnight@duck.com";
+    github = "dawnofmidnight";
+    githubId = 78233879;
+    name = "whispers";
+  };
   dawoox = {
     email = "contact@antoinebellanger.fr";
     github = "Dawoox";
diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix
index 0574940e3908..4d1821001131 100644
--- a/pkgs/by-name/vi/vicinae/package.nix
+++ b/pkgs/by-name/vi/vicinae/package.nix
@@ -94,7 +94,10 @@ stdenv.mkDerivation (finalAttrs: {
     description = "A focused launcher for your desktop — native, fast, extensible";
     homepage = "https://github.com/vicinaehq/vicinae";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ zstg ];
+    maintainers = with lib.maintainers; [
+      dawnofmidnight
+      zstg
+    ];
     platforms = lib.platforms.linux;
     mainProgram = "vicinae";
   };

From eedef5d79c0d8a6f1b69527fcc3092ad4d829477 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 26 Oct 2025 18:26:20 +0100
Subject: [PATCH 2977/6226] pdns-recursor: 5.2.5 -> 5.2.6

Fixes CVE-2025-59023 and CVE-2025-59024.
https://doc.powerdns.com/recursor/security-advisories/powerdns-advisory-2025-06.html

Changes:
https://doc.powerdns.com/recursor/changelog/5.2.html#change-5.2.6
---
 pkgs/by-name/pd/pdns-recursor/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pd/pdns-recursor/package.nix b/pkgs/by-name/pd/pdns-recursor/package.nix
index bf5c07b37059..30bdb7190cad 100644
--- a/pkgs/by-name/pd/pdns-recursor/package.nix
+++ b/pkgs/by-name/pd/pdns-recursor/package.nix
@@ -20,11 +20,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pdns-recursor";
-  version = "5.2.5";
+  version = "5.2.6";
 
   src = fetchurl {
     url = "https://downloads.powerdns.com/releases/pdns-recursor-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-qKZXp6vW6dI3zdJnU/fc9czVuMSKyBILCNK41XodhWo=";
+    hash = "sha256-INt/KcULGvsensXF6LIZ0RKtrPK4rPPaQW/yR+JaxAc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From 94c619a196079ee32f1b9f8dac1c67e50e571b29 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 17:36:13 +0000
Subject: [PATCH 2978/6226] home-assistant-custom-components.systemair: 1.0.11
 -> 1.0.13

---
 .../home-assistant/custom-components/systemair/package.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/systemair/package.nix b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
index f2b13e6ff225..492ca06408b6 100644
--- a/pkgs/servers/home-assistant/custom-components/systemair/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
@@ -10,13 +10,13 @@
 buildHomeAssistantComponent rec {
   owner = "AN3Orik";
   domain = "systemair";
-  version = "1.0.11";
+  version = "1.0.13";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "systemair";
     tag = "v${version}";
-    hash = "sha256-/M9ErhtggyaY8ZZyhdPSoVCGqrhAQ9/RMRyl34Ks3mc=";
+    hash = "sha256-qQC9QzNgCa1NEjCA4wh4Au9VL2tOLh94l/O/ZjrCAuY=";
   };
 
   postPatch = ''

From 81e609e813016ffcc8af59fe311b863ea0136cc3 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 26 Oct 2025 18:23:37 +0100
Subject: [PATCH 2979/6226] libreoffice-fresh: Fix build

The patch is part of libreoffice 25.8.2.1.
---
 pkgs/applications/office/libreoffice/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 213ae69d8f86..5dac65d51741 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -313,7 +313,8 @@ stdenv.mkDerivation (finalAttrs: {
 
     # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking
     ./readd-explicit-zlib-link.patch
-
+  ]
+  ++ lib.optionals (lib.versionOlder version "25.8.2.1") [
     # Backport patch to fix build with Poppler 25.09
     (fetchpatch2 {
       url = "https://github.com/LibreOffice/core/commit/7848e02819c007026952a3fdc9da0961333dc079.patch";
@@ -321,10 +322,10 @@ stdenv.mkDerivation (finalAttrs: {
       hash = "sha256-Nw6GFmkFy13w/ktCxw5s7SHL34auP1BQ9JvQnQ65aVU=";
     })
   ]
-  ++ lib.optionals (lib.versionAtLeast version "25.8") [
+  ++ lib.optionals (lib.versionAtLeast version "25.8.2.2") [
     # Fix build with Poppler 25.10
     (fetchpatch2 {
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/41e58e117c356af2be83993595caf61f9f30cc89/poppler-25.10.patch";
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-fresh/-/raw/f7b0e4385108b95c134599502a7bccf0a41925c8/poppler-25.10.patch";
       hash = "sha256-KMsjDtRRH8Vy/FXaVwxUo0Ww10PCE0sK8+ZL0Ja2kJQ=";
     })
   ]

From b6badb34ac9757d733667c24b115cab8e2c2acb9 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 26 Oct 2025 18:38:42 +0100
Subject: [PATCH 2980/6226] kdePackages.calligra: Fix build with Poppler 25.10

---
 pkgs/kde/gear/calligra/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/kde/gear/calligra/default.nix b/pkgs/kde/gear/calligra/default.nix
index 6cbdeb223aa4..b0d1e99c9b0c 100644
--- a/pkgs/kde/gear/calligra/default.nix
+++ b/pkgs/kde/gear/calligra/default.nix
@@ -1,6 +1,7 @@
 {
   mkKdeDerivation,
   lib,
+  fetchpatch,
   boost,
   eigen,
   gsl,
@@ -26,6 +27,14 @@
 mkKdeDerivation {
   pname = "calligra";
 
+  patches = [
+    # Fix build with Poppler 25.10
+    (fetchpatch {
+      url = "https://invent.kde.org/office/calligra/-/commit/45e8b302bce1d318f310ea13599d7ce84acc477e.patch";
+      hash = "sha256-TECB3eo24+gI8TXL8gw9BIdFWqw0JBKCWpoNVqBSan8=";
+    })
+  ];
+
   extraBuildInputs = [
     boost
     eigen

From c9b78f12c8bdf0fbed91aa5c46f111eaf0fa7875 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sun, 26 Oct 2025 18:43:12 +0100
Subject: [PATCH 2981/6226] libreoffice-still: actually fix build with poppler
 25.10.0

---
 pkgs/applications/office/libreoffice/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 5dac65d51741..8da0b046cba1 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -321,6 +321,11 @@ stdenv.mkDerivation (finalAttrs: {
       includes = [ "sdext/*" ];
       hash = "sha256-Nw6GFmkFy13w/ktCxw5s7SHL34auP1BQ9JvQnQ65aVU=";
     })
+    # Fix build with Poppler 25.10
+    (fetchpatch2 {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/f5241554e4a0f6fd95ac4e5cc398a30243407e6a/fix_build_with_poppler_25.10.patch";
+      hash = "sha256-lbPOkc1HeT5Qsp6XfVyVJtmvSL68qTrmbd3q9lvKSu8=";
+    })
   ]
   ++ lib.optionals (lib.versionAtLeast version "25.8.2.2") [
     # Fix build with Poppler 25.10

From 188d1c79ee8d918d0eb188597f9e280ee7837101 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 26 Oct 2025 09:44:13 -0700
Subject: [PATCH 2982/6226] spotdl: 4.4.2 -> 4.4.3

Diff: https://github.com/spotDL/spotify-downloader/compare/v4.4.2...v4.4.3

Changelog: https://github.com/spotDL/spotify-downloader/releases/tag/v4.4.3
---
 pkgs/by-name/sp/spotdl/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sp/spotdl/package.nix b/pkgs/by-name/sp/spotdl/package.nix
index faff6ff7b5e8..e1b2e3984899 100644
--- a/pkgs/by-name/sp/spotdl/package.nix
+++ b/pkgs/by-name/sp/spotdl/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "spotdl";
-  version = "4.4.2";
+  version = "4.4.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "spotDL";
     repo = "spotify-downloader";
     tag = "v${version}";
-    hash = "sha256-guQ8fIA20wtCkB5CkU7zg/INE+g8/fvQfIs5TNteQGo=";
+    hash = "sha256-opbbcYjsR+xuo2uQ7Ic/2+BfkiwdEe1xD/whRonDBWo=";
   };
 
   build-system = with python3Packages; [ hatchling ];
@@ -50,8 +50,8 @@ python3Packages.buildPythonApplication rec {
     pyfakefs
     pytest-mock
     pytest-subprocess
-    pytest-vcr
     pytestCheckHook
+    vcrpy
     writableTmpDirAsHomeHook
   ];
 
@@ -65,6 +65,8 @@ python3Packages.buildPythonApplication rec {
     "tests/utils/test_m3u.py"
     "tests/utils/test_metadata.py"
     "tests/utils/test_search.py"
+    # TypeError: 'LocalPath' object is not subscriptable
+    "tests/utils/test_config.py"
   ];
 
   disabledTests = [

From 4012960e5c858369dfe96f39a297392d76d08187 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 17:52:40 +0000
Subject: [PATCH 2983/6226] python3Packages.homematicip: 2.3.0 -> 2.3.1

---
 pkgs/development/python-modules/homematicip/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix
index f8067d443cb9..650989898d04 100644
--- a/pkgs/development/python-modules/homematicip/default.nix
+++ b/pkgs/development/python-modules/homematicip/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "homematicip";
-  version = "2.3.0";
+  version = "2.3.1";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "hahn-th";
     repo = "homematicip-rest-api";
     tag = version;
-    hash = "sha256-yH9Yis6NyKD+mSjaff0S9J6UtoVceML06ny50/6aG/0=";
+    hash = "sha256-QDqBi2XbMdokUyRNJacDPa/VqESp4NCUHLByBuayd1g=";
   };
 
   build-system = [

From bec1263c29035e6b53a7bf3922386459ee93885d Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Sun, 26 Oct 2025 18:53:09 +0100
Subject: [PATCH 2984/6226] switchfin: fix meta.mainProgram

---
 pkgs/by-name/sw/switchfin/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/sw/switchfin/package.nix b/pkgs/by-name/sw/switchfin/package.nix
index c3e64cfe49e8..bc4323401687 100644
--- a/pkgs/by-name/sw/switchfin/package.nix
+++ b/pkgs/by-name/sw/switchfin/package.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/dragonflylee/switchfin/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = [ lib.maintainers.k900 ];
-    mainProgram = "switchfin";
+    mainProgram = "Switchfin";
     platforms = lib.platforms.all;
   };
 }

From 55d9b0996dd83b04ea144caaa7cdfb0063c48a3e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 18:07:28 +0000
Subject: [PATCH 2985/6226] ledger-live-desktop: 2.131.0 -> 2.131.1

---
 pkgs/by-name/le/ledger-live-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix
index 60d2a6f6a6db..c201fa010d2a 100644
--- a/pkgs/by-name/le/ledger-live-desktop/package.nix
+++ b/pkgs/by-name/le/ledger-live-desktop/package.nix
@@ -8,11 +8,11 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.131.0";
+  version = "2.131.1";
 
   src = fetchurl {
     url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-GOKXW3yhYuk9hDNqVeC/btFkxiT6URF9TtHy8uN5iXI=";
+    hash = "sha256-O5pdrnnAfDrgP8s4A0R/mf7Mx6U2VWPNqaky+rExzgc=";
   };
 
   appimageContents = appimageTools.extractType2 {

From ae9ac990c7aafb3d2ddf33a4db5eaee85a4ca12c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dyego=20Aur=C3=A9lio?= <dyegoaurelio@gmail.com>
Date: Sun, 26 Oct 2025 15:10:21 -0300
Subject: [PATCH 2986/6226] forge-mtg: fix audio support in forge-adventure
 mode

The forge-adventure executable uses LWJGL3 backend which requires native
audio libraries for sound playback.

This change adds alsa-lib to the library path for forge-adventure,
enabling proper audio functionality.
---
 pkgs/by-name/fo/forge-mtg/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fo/forge-mtg/package.nix b/pkgs/by-name/fo/forge-mtg/package.nix
index dba8c1a69e88..750be8e31532 100644
--- a/pkgs/by-name/fo/forge-mtg/package.nix
+++ b/pkgs/by-name/fo/forge-mtg/package.nix
@@ -7,6 +7,7 @@
   makeWrapper,
   openjdk,
   libGL,
+  alsa-lib,
   makeDesktopItem,
   copyDesktopItems,
   imagemagick,
@@ -106,7 +107,12 @@ maven.buildMavenPackage {
       chmod 555 $out/share/forge/$commandToInstall.sh
       PREFIX_CMD=""
       if [ "$commandToInstall" = "forge-adventure" ]; then
-        PREFIX_CMD="--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libGL ]}"
+        PREFIX_CMD="--prefix LD_LIBRARY_PATH : ${
+          lib.makeLibraryPath [
+            libGL
+            alsa-lib
+          ]
+        }"
       fi
 
       makeWrapper $out/share/forge/$commandToInstall.sh $out/bin/$commandToInstall \

From ceaf71d96530764ca4be909a8a5c0ea78eb72314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 26 Oct 2025 11:10:23 -0700
Subject: [PATCH 2987/6226] python3Packages.xgrammar: update dependencies

---
 pkgs/development/python-modules/xgrammar/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/xgrammar/default.nix b/pkgs/development/python-modules/xgrammar/default.nix
index 6a1a1549293f..a84c28aeec4b 100644
--- a/pkgs/development/python-modules/xgrammar/default.nix
+++ b/pkgs/development/python-modules/xgrammar/default.nix
@@ -12,15 +12,16 @@
 
   # dependencies
   mlx-lm,
+  numpy,
   pydantic,
-  sentencepiece,
-  tiktoken,
   torch,
   transformers,
   triton,
 
   # tests
   pytestCheckHook,
+  sentencepiece,
+  tiktoken,
   writableTmpDirAsHomeHook,
 }:
 
@@ -50,9 +51,8 @@ buildPythonPackage rec {
   dontUseCmakeConfigure = true;
 
   dependencies = [
+    numpy
     pydantic
-    sentencepiece
-    tiktoken
     torch
     transformers
   ]
@@ -65,6 +65,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
+    sentencepiece
+    tiktoken
     writableTmpDirAsHomeHook
   ];
 

From 4205c7ae76826cd801d0840c133b5a7ee59175e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 26 Oct 2025 11:13:59 -0700
Subject: [PATCH 2988/6226] python3Packages.pymobiledevice3: 4.27.6 -> 5.0.0

Diff: https://github.com/doronz88/pymobiledevice3/compare/v4.27.6...v5.0.0

Changelog: https://github.com/doronz88/pymobiledevice3/releases/tag/v5.0.0
---
 pkgs/development/python-modules/pymobiledevice3/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pymobiledevice3/default.nix b/pkgs/development/python-modules/pymobiledevice3/default.nix
index f621a696435f..41aed7fd6c41 100644
--- a/pkgs/development/python-modules/pymobiledevice3/default.nix
+++ b/pkgs/development/python-modules/pymobiledevice3/default.nix
@@ -43,19 +43,18 @@
   uvicorn,
   wsproto,
   xonsh,
-  zeroconf,
 }:
 
 buildPythonPackage rec {
   pname = "pymobiledevice3";
-  version = "4.27.6";
+  version = "5.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "doronz88";
     repo = "pymobiledevice3";
     tag = "v${version}";
-    hash = "sha256-UOB8cNswgTKIRXU7KOr6rgc+oqj2DUu4BKqFljsQSw8=";
+    hash = "sha256-1TMzG4q7eE65Uqeihf3EycdxTQ8f8x8EfNwZx4a5AhE=";
   };
 
   build-system = [
@@ -101,7 +100,6 @@ buildPythonPackage rec {
     uvicorn
     wsproto
     xonsh
-    zeroconf
   ]
   ++ fastapi.optional-dependencies.all;
 

From cc7bc329da8361bffa0f958399818890328aff16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 26 Oct 2025 11:19:04 -0700
Subject: [PATCH 2989/6226] python3Packages.py-aosmith: 1.0.14 -> 1.0.15

Diff: https://github.com/bdr99/py-aosmith/compare/1.0.14...1.0.15
---
 pkgs/development/python-modules/py-aosmith/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/py-aosmith/default.nix b/pkgs/development/python-modules/py-aosmith/default.nix
index e4277c5281dd..916634dbe2d9 100644
--- a/pkgs/development/python-modules/py-aosmith/default.nix
+++ b/pkgs/development/python-modules/py-aosmith/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "py-aosmith";
-  version = "1.0.14";
+  version = "1.0.15";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "bdr99";
     repo = "py-aosmith";
     tag = version;
-    hash = "sha256-73kiSrjPDuvSMK8pZMCPns6vm2NhE+9F7GpWEPKR7Ec=";
+    hash = "sha256-sh0UYa4POpcwRKBNAliidFzMUI4VxektT27YLXmTwfY=";
   };
 
   build-system = [ poetry-core ];

From 0c869c07ba633cad92ac4bfff4bd8a6f339d4d49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 26 Oct 2025 11:21:10 -0700
Subject: [PATCH 2990/6226] python3Packages.pyezvizapi: 1.0.3.6 -> 1.0.4.1

Diff: https://github.com/RenierM26/pyEzvizApi/compare/1.0.3.6...1.0.4.1

Changelog: https://github.com/RenierM26/pyEzvizApi/releases/tag/1.0.4.1
---
 pkgs/development/python-modules/pyezvizapi/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyezvizapi/default.nix b/pkgs/development/python-modules/pyezvizapi/default.nix
index 82095b71ee38..3edb4e3683be 100644
--- a/pkgs/development/python-modules/pyezvizapi/default.nix
+++ b/pkgs/development/python-modules/pyezvizapi/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  aiohttp,
   paho-mqtt,
   pandas,
   pycryptodome,
@@ -12,19 +13,20 @@
 
 buildPythonPackage rec {
   pname = "pyezvizapi";
-  version = "1.0.3.6";
+  version = "1.0.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "RenierM26";
     repo = "pyEzvizApi";
     tag = version;
-    hash = "sha256-vuMgTPOzNsfeMhqeDa03AwCL+jUO+COGJFjvfsUMLIY=";
+    hash = "sha256-BuGBEYoAZ8m5OUwzNUQC84lll5sP0BZq6bVRRCHsGcI=";
   };
 
   build-system = [ setuptools ];
 
   dependencies = [
+    aiohttp
     paho-mqtt
     pandas
     pycryptodome

From 0531ce0be00a2699f64b044e096c63fd9e9b41a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 26 Oct 2025 11:31:18 -0700
Subject: [PATCH 2991/6226] python3Packages.vegehub: 0.1.24 -> 0.1.25

Diff: https://github.com/Thulrus/VegeHubPyPiLib/compare/V0.1.24...V0.1.25

Changelog: https://github.com/Thulrus/VegeHubPyPiLib/releases/tag/V0.1.25
---
 pkgs/development/python-modules/vegehub/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/vegehub/default.nix b/pkgs/development/python-modules/vegehub/default.nix
index ae7b272fb8bf..a110601dbac3 100644
--- a/pkgs/development/python-modules/vegehub/default.nix
+++ b/pkgs/development/python-modules/vegehub/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "vegehub";
-  version = "0.1.24";
+  version = "0.1.25";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Thulrus";
     repo = "VegeHubPyPiLib";
     tag = "V${version}";
-    hash = "sha256-W/5kvertNC7w2IS/N5k06cDyNFgel2s4/znR+Lz5RJU=";
+    hash = "sha256-jdD+vYcnrwPVJhVBVvB7ULcD1KrOudUC2K/agxHLnwY=";
   };
 
   postPatch = ''
@@ -40,6 +40,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
+    changelog = "https://github.com/Thulrus/VegeHubPyPiLib/releases/tag/${src.tag}";
     description = "Basic package for simplifying interactions with the Vegetronix VegeHub";
     homepage = "https://github.com/Thulrus/VegeHubPyPiLib";
     license = lib.licenses.gpl3Plus;

From 495f2b6ba69e83eeaff299e804339d4d91bd57ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 18:52:01 +0000
Subject: [PATCH 2992/6226] supersonic: 0.18.1 -> 0.19.0

---
 pkgs/by-name/su/supersonic/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/su/supersonic/package.nix b/pkgs/by-name/su/supersonic/package.nix
index c89aa1c23c17..a123aee689ea 100644
--- a/pkgs/by-name/su/supersonic/package.nix
+++ b/pkgs/by-name/su/supersonic/package.nix
@@ -18,16 +18,16 @@
 
 buildGoModule rec {
   pname = "supersonic" + lib.optionalString waylandSupport "-wayland";
-  version = "0.18.1";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "dweymouth";
     repo = "supersonic";
     tag = "v${version}";
-    hash = "sha256-NzgmkxG58XvaxcIcu9J0VeRjCQ922rJOp3IWX49dgIU=";
+    hash = "sha256-GMmIUDgbFFrOqDJ13C0o1fHg1tiWSjbCm36VPD7/IGw=";
   };
 
-  vendorHash = "sha256-dG5D7a13TbVurjqFbKwiZ5IOPul39sCmyPCCzRx0NEY=";
+  vendorHash = "sha256-FQmaxDIVWCxyFdgz03aNRXFyi8UeMeCqiVHNZOqq/8Q=";
 
   nativeBuildInputs = [
     copyDesktopItems

From 66737dcdb4b3ba0d526151e4083f28478022fb8e Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 7 Jun 2025 03:39:22 +0200
Subject: [PATCH 2993/6226] maintainers/scripts/remove-old-aliases: detect and
 avoid more complex cases

---
 maintainers/scripts/remove-old-aliases.py | 31 ++++++++++++++++++-----
 1 file changed, 24 insertions(+), 7 deletions(-)

diff --git a/maintainers/scripts/remove-old-aliases.py b/maintainers/scripts/remove-old-aliases.py
index 3c5f8edc50ad..fcef5c58a631 100755
--- a/maintainers/scripts/remove-old-aliases.py
+++ b/maintainers/scripts/remove-old-aliases.py
@@ -42,11 +42,12 @@ def process_args() -> argparse.Namespace:
 
 def get_date_lists(
     txt: list[str], cutoffdate: datetimedate, only_throws: bool
-) -> tuple[list[str], list[str], list[str]]:
+) -> tuple[list[str], list[str], list[str], list[str]]:
     """get a list of lines in which the date is older than $cutoffdate"""
     date_older_list: list[str] = []
     date_older_throw_list: list[str] = []
     date_sep_line_list: list[str] = []
+    date_too_complex_list: list[str] = []
 
     for lineno, line in enumerate(txt, start=1):
         line = line.rstrip()
@@ -70,11 +71,17 @@ def get_date_lists(
             continue
 
         if "=" not in line:
-            date_sep_line_list.append(f"{lineno} {line}")
+            date_sep_line_list.append(f"{lineno:>5} {line}")
         # 'if' lines could be complicated
         elif "if " in line and "if =" not in line:
-            print(f"RESOLVE MANUALLY {line}")
-        elif "throw" in line:
+            date_too_complex_list.append(f"{lineno:>5} {line}")
+        elif "= with " in line:
+            date_too_complex_list.append(f"{lineno:>5} {line}")
+        elif "lib.warnOnInstantiate" in line:
+            date_too_complex_list.append(f"{lineno:>5} {line}")
+        elif '"' in line:
+            date_too_complex_list.append(f"{lineno:>5} {line}")
+        elif " = throw" in line:
             date_older_throw_list.append(line)
         elif not only_throws:
             date_older_list.append(line)
@@ -82,6 +89,7 @@ def get_date_lists(
     return (
         date_older_list,
         date_sep_line_list,
+        date_too_complex_list,
         date_older_throw_list,
     )
 
@@ -180,10 +188,14 @@ def main() -> None:
     date_older_list: list[str] = []
     date_sep_line_list: list[str] = []
     date_older_throw_list: list[str] = []
+    date_too_complex_list: list[str] = []
 
-    date_older_list, date_sep_line_list, date_older_throw_list = get_date_lists(
-        txt, cutoffdate, only_throws
-    )
+    (
+        date_older_list,
+        date_sep_line_list,
+        date_too_complex_list,
+        date_older_throw_list,
+    ) = get_date_lists(txt, cutoffdate, only_throws)
 
     converted_to_throw: list[tuple[str, str]] = []
     if date_older_list:
@@ -197,6 +209,11 @@ def main() -> None:
         for l_n in date_older_throw_list:
             print(l_n)
 
+    if date_too_complex_list:
+        print(" Too complex, resolve manually. ".center(100, "-"))
+        for l_n in date_too_complex_list:
+            print(l_n)
+
     if date_sep_line_list:
         print(" On separate line, resolve manually. ".center(100, "-"))
         for l_n in date_sep_line_list:

From 2d3f108bb67a3f2cefaa538e86a2f82f1387d20d Mon Sep 17 00:00:00 2001
From: Peder Bergebakken Sundt <pbsds@hotmail.com>
Date: Sat, 7 Jun 2025 04:10:27 +0200
Subject: [PATCH 2994/6226] maintainers/scripts/remove-old-aliases: handle
 `inherit (x) y;`

Man this script is not very nice
---
 maintainers/scripts/remove-old-aliases.py | 40 ++++++++++++++++-------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/maintainers/scripts/remove-old-aliases.py b/maintainers/scripts/remove-old-aliases.py
index fcef5c58a631..78a2fb0ab6ac 100755
--- a/maintainers/scripts/remove-old-aliases.py
+++ b/maintainers/scripts/remove-old-aliases.py
@@ -70,7 +70,10 @@ def get_date_lists(
         ):
             continue
 
-        if "=" not in line:
+        if line.lstrip().startswith("inherit (") and ";" in line:
+            if not only_throws:
+                date_older_list.append(line)
+        elif "=" not in line:
             date_sep_line_list.append(f"{lineno:>5} {line}")
         # 'if' lines could be complicated
         elif "if " in line and "if =" not in line:
@@ -99,18 +102,31 @@ def convert_to_throw(date_older_list: list[str]) -> list[tuple[str, str]]:
     converted_list = []
     for line in date_older_list.copy():
         indent: str = " " * (len(line) - len(line.lstrip()))
-        before_equal = ""
-        after_equal = ""
-        try:
-            before_equal, after_equal = (x.strip() for x in line.split("=", maxsplit=2))
-        except ValueError as err:
-            print(err, line, "\n")
-            date_older_list.remove(line)
-            continue
 
-        alias = before_equal
-        alias_unquoted = before_equal.strip('"')
-        replacement = next(x.strip(";:") for x in after_equal.split())
+        if "=" not in line:
+            assert "inherit (" in line
+            before, sep, after = line.partition("inherit (")
+            inside, sep, after = after.partition(")")
+            if not sep:
+                print(f"FAILED ON {line}")
+                continue
+            alias, *_ = after.strip().split(";")[0].split()
+            replacement = f"{inside.strip()}.{alias}"
+
+        else:
+            before_equal = ""
+            after_equal = ""
+            try:
+                before_equal, after_equal = (x.strip() for x in line.split("=", maxsplit=2))
+            except ValueError as err:
+                print(err, line, "\n")
+                date_older_list.remove(line)
+                continue
+
+            alias = before_equal
+            replacement = next(x.strip(";:") for x in after_equal.split())
+
+        alias_unquoted = alias.strip('"')
         replacement = replacement.removeprefix("pkgs.")
 
         converted = (

From 10bada972ea925bb8bb99e117acb11e297e38a26 Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Sun, 26 Oct 2025 19:54:47 +0100
Subject: [PATCH 2995/6226] rxvt-unicode-plugins.{bidi,tabbedex}: specify
 licenses

---
 .../rxvt-unicode-plugins/urxvt-bidi/default.nix                | 3 +++
 .../rxvt-unicode-plugins/urxvt-tabbedex/default.nix            | 1 +
 2 files changed, 4 insertions(+)

diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix
index ec2d08862ecd..ff7c1b1a2d7d 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-bidi/default.nix
@@ -32,5 +32,8 @@ perlPackages.buildPerlPackage rec {
     homepage = "https://github.com/mkamensky/Text-Bidi";
     maintainers = with maintainers; [ doronbehar ];
     platforms = with platforms; unix;
+    # Quote from the README:
+    # same terms as the Perl 5 programming language system itself
+    license = perlPackages.perl.meta.license;
   };
 }
diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
index e1b3ff6233fa..98fb59bf9795 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode-plugins/urxvt-tabbedex/default.nix
@@ -25,5 +25,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/mina86/urxvt-tabbedex";
     maintainers = [ ];
     platforms = with platforms; unix;
+    license = lib.licenses.gpl3Plus;
   };
 }

From 22e163ef4c7e9bd88cd9aadcef4027458796486b Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Sun, 26 Oct 2025 19:56:23 +0100
Subject: [PATCH 2996/6226] rxvt-unicode: skip unfree plugins by default

---
 pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix
index a161e9544265..8bd75245da0e 100644
--- a/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix
+++ b/pkgs/applications/terminal-emulators/rxvt-unicode/wrapper.nix
@@ -16,7 +16,9 @@
 }:
 
 let
-  availablePlugins = lib.filterAttrs (_: v: lib.isDerivation v) rxvt-unicode-plugins;
+  availablePlugins = lib.filterAttrs (
+    _: v: (lib.isDerivation v && (v.meta.license.free or false))
+  ) rxvt-unicode-plugins;
 
   # Transform the string "self" to the plugin itself.
   # It's needed for plugins like bidi who depends on the perl

From e7e429d2b86ccd2e3dfbadcfc66c663126306213 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 26 Oct 2025 12:15:28 -0700
Subject: [PATCH 2997/6226] imagemagick: 7.1.2-7 -> 7.1.2-8

Diff: https://github.com/ImageMagick/ImageMagick/compare/7.1.2-7...7.1.2-8

Changelog: https://github.com/ImageMagick/Website/blob/main/ChangeLog.md
---
 pkgs/applications/graphics/ImageMagick/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix
index 5d294fc73a28..47ac7b7b66d6 100644
--- a/pkgs/applications/graphics/ImageMagick/default.nix
+++ b/pkgs/applications/graphics/ImageMagick/default.nix
@@ -85,13 +85,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "imagemagick";
-  version = "7.1.2-7";
+  version = "7.1.2-8";
 
   src = fetchFromGitHub {
     owner = "ImageMagick";
     repo = "ImageMagick";
     tag = finalAttrs.version;
-    hash = "sha256-9ARCYftoXiilpJoj+Y+aLCEqLmhHFYSrHfgA5DQHbGo=";
+    hash = "sha256-2jSQ59Wi6/1dbS/AgM1DfW6WlwoYuJlnTLoM8Mc6Ji8=";
   };
 
   outputs = [

From 65bb095948c39864dae69a71ddd30e2150c75778 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Sat, 5 Apr 2025 20:22:19 -0400
Subject: [PATCH 2998/6226] ci: fix issues found by zizmor

Co-authored-by: Thomas Gerbet <thomas@gerbet.me>
---
 .github/workflows/backport.yml           | 1 +
 .github/workflows/build.yml              | 1 +
 .github/workflows/check.yml              | 2 ++
 .github/workflows/eval.yml               | 8 +++++++-
 .github/workflows/labels.yml             | 1 +
 .github/workflows/lint.yml               | 3 +++
 .github/workflows/merge-group.yml        | 1 +
 .github/workflows/periodic-merge-24h.yml | 3 ++-
 .github/workflows/periodic-merge-6h.yml  | 3 ++-
 .github/workflows/periodic-merge.yml     | 5 +++++
 .github/workflows/pr.yml                 | 1 +
 .github/workflows/reviewers.yml          | 4 +++-
 .github/workflows/test.yml               | 1 +
 13 files changed, 30 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 011e09a0023e..17a103c4ca7d 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -40,6 +40,7 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           token: ${{ steps.app-token.outputs.token }}
+          persist-credentials: false
 
       - name: Log current API rate limits
         env:
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 918c82c94bbe..26d71b846369 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -46,6 +46,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Checkout the merge commit
         uses: ./.github/actions/checkout
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 0ee1146a4982..f55ff86dfdcf 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -34,6 +34,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           path: trusted
           sparse-checkout: |
             ci/github-script
@@ -73,6 +74,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Checkout merge and target commits
         uses: ./.github/actions/checkout
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index dee31e1f5328..97d5c114acb0 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -34,6 +34,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           path: trusted
           sparse-checkout: |
             ci/supportedVersions.nix
@@ -41,6 +42,7 @@ jobs:
       - name: Check out the PR at the test merge commit
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           ref: ${{ inputs.mergedSha }}
           path: untrusted
           sparse-checkout: |
@@ -84,6 +86,7 @@ jobs:
 
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Check out the PR at merged and target commits
         uses: ./.github/actions/checkout
@@ -155,6 +158,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Check out the PR at the target commit
         uses: ./.github/actions/checkout
@@ -181,8 +185,9 @@ jobs:
       - name: Compare against the target branch
         env:
           AUTHOR_ID: ${{ github.event.pull_request.user.id }}
+          TARGET_SHA: ${{ inputs.mergedSha }}
         run: |
-          git -C nixpkgs/trusted diff --name-only ${{ inputs.mergedSha }} \
+          git -C nixpkgs/trusted diff --name-only "$TARGET_SHA" \
             | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json
 
           # Use the target branch to get accurate maintainer info
@@ -318,6 +323,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Checkout the merge commit
         uses: ./.github/actions/checkout
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 3e520139bc28..74838ebb52ae 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -46,6 +46,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: |
             ci/github-script
 
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index cb7a61edad83..358e090a7b2b 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -26,6 +26,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Checkout the merge commit
         uses: ./.github/actions/checkout
@@ -60,6 +61,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Checkout the merge commit
         uses: ./.github/actions/checkout
@@ -87,6 +89,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: .github/actions
       - name: Checkout merge and target commits
         uses: ./.github/actions/checkout
diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml
index 6ae96f0900f7..24ab1095ea7d 100644
--- a/.github/workflows/merge-group.yml
+++ b/.github/workflows/merge-group.yml
@@ -24,6 +24,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout: |
             ci/supportedSystems.json
 
diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml
index 63e3dfd13887..481a54191349 100644
--- a/.github/workflows/periodic-merge-24h.yml
+++ b/.github/workflows/periodic-merge-24h.yml
@@ -43,4 +43,5 @@ jobs:
       from: ${{ matrix.pairs.from }}
       into: ${{ matrix.pairs.into }}
     name: ${{ matrix.pairs.name || format('{0} → {1}', matrix.pairs.from, matrix.pairs.into) }}
-    secrets: inherit
+    secrets:
+      NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
diff --git a/.github/workflows/periodic-merge-6h.yml b/.github/workflows/periodic-merge-6h.yml
index 054ac713fe74..edd4cb0b2df6 100644
--- a/.github/workflows/periodic-merge-6h.yml
+++ b/.github/workflows/periodic-merge-6h.yml
@@ -42,4 +42,5 @@ jobs:
       from: ${{ matrix.pairs.from }}
       into: ${{ matrix.pairs.into }}
     name: ${{ format('{0} → {1}', matrix.pairs.from, matrix.pairs.into) }}
-    secrets: inherit
+    secrets:
+      NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
diff --git a/.github/workflows/periodic-merge.yml b/.github/workflows/periodic-merge.yml
index 04c80ae9735c..606c03866e6f 100644
--- a/.github/workflows/periodic-merge.yml
+++ b/.github/workflows/periodic-merge.yml
@@ -11,6 +11,9 @@ on:
         description: Target branch to merge into.
         required: true
         type: string
+    secrets:
+      NIXPKGS_CI_APP_PRIVATE_KEY:
+        required: true
 
 defaults:
   run:
@@ -32,6 +35,8 @@ jobs:
           permission-pull-requests: write
 
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
 
       - name: Find merge base between two branches
         if: contains(inputs.from, ' ')
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index d443d68cdad9..1ba548a4c44e 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -34,6 +34,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout-cone-mode: true # default, for clarity
           sparse-checkout: |
             ci/github-script
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 245970531477..22ac1bb5bcd4 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -29,6 +29,7 @@ jobs:
       - name: Check out the PR at the base commit
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           path: trusted
           sparse-checkout: ci
 
@@ -146,6 +147,7 @@ jobs:
         if: ${{ steps.app-token.outputs.token }}
         env:
           GH_TOKEN: ${{ github.token }}
+          APP_GH_TOKEN: ${{ steps.app-token.outputs.token }}
           REPOSITORY: ${{ github.repository }}
           NUMBER: ${{ github.event.number }}
           AUTHOR: ${{ github.event.pull_request.user.login }}
@@ -156,7 +158,7 @@ jobs:
           # There appears to be no API to request reviews based on GitHub IDs
           jq -r 'keys[]' comparison/maintainers.json \
             | while read -r id; do gh api /user/"$id" --jq .login; done \
-            | GH_TOKEN=${{ steps.app-token.outputs.token }} result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR"
+            | GH_TOKEN="$APP_GH_TOKEN" result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR"
 
       - name: Log current API rate limits (app-token)
         if: ${{ steps.app-token.outputs.token }}
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4431e89954f3..67b416a6dfb2 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,6 +21,7 @@ jobs:
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
+          persist-credentials: false
           sparse-checkout-cone-mode: true # default, for clarity
           sparse-checkout: |
             ci/github-script

From 83316e2faa6130208351bf0194ecc6ef41127fda Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 26 Oct 2025 16:35:30 -0300
Subject: [PATCH 2999/6226] nnpdf: fix build with cmake4

---
 pkgs/by-name/nn/nnpdf/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/nn/nnpdf/package.nix b/pkgs/by-name/nn/nnpdf/package.nix
index 80caef6f3ae1..b1e55a6d998b 100644
--- a/pkgs/by-name/nn/nnpdf/package.nix
+++ b/pkgs/by-name/nn/nnpdf/package.nix
@@ -30,6 +30,9 @@ stdenv.mkDerivation rec {
       substituteInPlace $file \
         --replace "-march=nocona -mtune=haswell" ""
     done
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.0.2)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [

From d58c255cb5b7392500108772c33f49aa26af2a4b Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Fri, 24 Oct 2025 20:38:57 +0200
Subject: [PATCH 3000/6226] cotton: mark as vulnerable to CVE-2025-62518

---
 pkgs/by-name/co/cotton/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/co/cotton/package.nix b/pkgs/by-name/co/cotton/package.nix
index 1d0de589da87..cfa45e587c4f 100644
--- a/pkgs/by-name/co/cotton/package.nix
+++ b/pkgs/by-name/co/cotton/package.nix
@@ -26,5 +26,9 @@ rustPlatform.buildRustPackage {
       dit7ya
       figsoda
     ];
+
+    knownVulnerabilities = [
+      "'cotton' is vulnerable to CVE-2025-62518"
+    ];
   };
 }

From 7ac7b3e3a8b484f7312cf83e6dd17f951471425a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 19:48:29 +0000
Subject: [PATCH 3001/6226] fsautocomplete: 0.79.2 -> 0.80.1

---
 pkgs/by-name/fs/fsautocomplete/deps.json   | 28 +++++++++++-----------
 pkgs/by-name/fs/fsautocomplete/package.nix |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/fs/fsautocomplete/deps.json b/pkgs/by-name/fs/fsautocomplete/deps.json
index a2725fb90ca0..af2f65f1f53d 100644
--- a/pkgs/by-name/fs/fsautocomplete/deps.json
+++ b/pkgs/by-name/fs/fsautocomplete/deps.json
@@ -61,8 +61,8 @@
   },
   {
     "pname": "fantomas",
-    "version": "7.0.1",
-    "hash": "sha256-2aGD6Kjh83gmssRqqZ/Uihi7VbNqNUelX4otIfCuhTI="
+    "version": "7.0.3",
+    "hash": "sha256-0XlfV7SxXPDnk/CjkUesJSaH0cxlNHJ+Jj86zNUhkNA="
   },
   {
     "pname": "Fantomas.Client",
@@ -76,8 +76,8 @@
   },
   {
     "pname": "fsharp-analyzers",
-    "version": "0.32.1",
-    "hash": "sha256-le6rPnAF7cKGBZ2w8H2u9glK+6rT2ZjiAVnrkH2IhrM="
+    "version": "0.33.0",
+    "hash": "sha256-inPKPeLTaImrj4uiEy/vpru1cestNr/s/qgyRsgvwPc="
   },
   {
     "pname": "FSharp.Analyzers.Build",
@@ -86,8 +86,8 @@
   },
   {
     "pname": "FSharp.Analyzers.SDK",
-    "version": "0.32.1",
-    "hash": "sha256-JOqyzBUVMm1wx9g0YZmAZghj3/9f7nh9YenVt4mQI0M="
+    "version": "0.33.1",
+    "hash": "sha256-bx4DTUakeLlwbAUxZZpNK8E0sGa7B6UvN1rX6nFOZf0="
   },
   {
     "pname": "FSharp.Compiler.Service",
@@ -206,8 +206,8 @@
   },
   {
     "pname": "Ionide.Analyzers",
-    "version": "0.14.7",
-    "hash": "sha256-capdHUKfY3W8QYgg5Q6/dRggEF6w/yQ9rEKIh+VQLlc="
+    "version": "0.14.9",
+    "hash": "sha256-41vXbwlwWbM/iwbrqA+lhsxpMochokM9xsOsgKlKqXg="
   },
   {
     "pname": "Ionide.KeepAChangelog.Tasks",
@@ -221,18 +221,18 @@
   },
   {
     "pname": "Ionide.ProjInfo",
-    "version": "0.71.2",
-    "hash": "sha256-mQM7nVZL/rwFKlt+esfygistjilIDfySMnZmHS5IFv0="
+    "version": "0.72.0",
+    "hash": "sha256-zu9ssScreEgwFQb0YOgVfAFxTEoGLjsLiMbWIdf2zkg="
   },
   {
     "pname": "Ionide.ProjInfo.FCS",
-    "version": "0.71.2",
-    "hash": "sha256-TJCBJpv6OEsT/3enqjsW7JaSd0P+idlqJR5UR3jhaSI="
+    "version": "0.72.0",
+    "hash": "sha256-udtCva1gKPo6rJpsCCVI+DCY2ilUwSFQ9P9XCysNcto="
   },
   {
     "pname": "Ionide.ProjInfo.ProjectSystem",
-    "version": "0.71.2",
-    "hash": "sha256-Agja7VwF/MbOOieLVJWv42z+l6hWhVw1V0dNrVAJ0Ks="
+    "version": "0.72.0",
+    "hash": "sha256-ilUr29oAONpGm76Dc1ocSfu33p0Gyr9VhiNfMoxyKfI="
   },
   {
     "pname": "LinkDotNet.StringBuilder",
diff --git a/pkgs/by-name/fs/fsautocomplete/package.nix b/pkgs/by-name/fs/fsautocomplete/package.nix
index 0aad9b17f73c..faefd3877c28 100644
--- a/pkgs/by-name/fs/fsautocomplete/package.nix
+++ b/pkgs/by-name/fs/fsautocomplete/package.nix
@@ -9,13 +9,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "fsautocomplete";
-  version = "0.79.2";
+  version = "0.80.1";
 
   src = fetchFromGitHub {
     owner = "fsharp";
     repo = "FsAutoComplete";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-GJ2ld2RF7utrgHszgrG8RCWimPJ2Za+kZzQOOu/qUqA=";
+    hash = "sha256-ad589R2SXOvnXcNAEhwjOpITv5ptnIR7BUamFgTLF+k=";
   };
 
   nugetDeps = ./deps.json;

From 5a3bf2b1a4a5b3a8a7e92766a5d0eadebe04caa3 Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Sun, 26 Oct 2025 20:40:05 +0100
Subject: [PATCH 3002/6226] cotton: drop

---
 pkgs/by-name/co/cotton/package.nix | 34 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 2 files changed, 1 insertion(+), 34 deletions(-)
 delete mode 100644 pkgs/by-name/co/cotton/package.nix

diff --git a/pkgs/by-name/co/cotton/package.nix b/pkgs/by-name/co/cotton/package.nix
deleted file mode 100644
index cfa45e587c4f..000000000000
--- a/pkgs/by-name/co/cotton/package.nix
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-}:
-
-rustPlatform.buildRustPackage {
-  pname = "cotton";
-  version = "0-unstable-2023-09-13";
-
-  src = fetchFromGitHub {
-    owner = "danielhuang";
-    repo = "cotton";
-    rev = "df9d79a4b0bc4b140e87ddd7795924a93775a864";
-    sha256 = "sha256-ZMQaVMH8cuOb4PQ19g0pAFAMwP8bR60+eWFhiXk1bYE=";
-  };
-
-  cargoHash = "sha256-y162tjxPGZQiYBJxFk4QN9ZqSH8jrqa5Y961Sx2zrRs=";
-
-  meta = with lib; {
-    description = "Package manager for JavaScript projects";
-    mainProgram = "cotton";
-    homepage = "https://github.com/danielhuang/cotton";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [
-      dit7ya
-      figsoda
-    ];
-
-    knownVulnerabilities = [
-      "'cotton' is vulnerable to CVE-2025-62518"
-    ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dc6dc101c845..6407e2409fd1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -683,6 +683,7 @@ mapAliases {
   coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
   corretto19 = throw "Corretto 19 was removed as it has reached its end of life"; # Added 2024-08-01
   cosmic-tasks = tasks; # Added 2024-07-04
+  cotton = throw "'cotton' has been removed since it is vulnerable to CVE-2025-62518 and upstream is unmaintained"; # Added 2025-10-26
   cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15
   crispyDoom = crispy-doom; # Added 2023-05-01
   cromite = throw "'cromite' has been removed from nixpkgs due to it not being maintained"; # Added 2025-06-12

From 4a8996ada854acdbb15d5dfbbcdedb8311064818 Mon Sep 17 00:00:00 2001
From: iofq <cjriddz@protonmail.com>
Date: Sun, 26 Oct 2025 14:50:55 -0500
Subject: [PATCH 3003/6226] vimPlugins.dart-nvim: init at 2025-10-23

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 55462b830b32..e7e0f02c161d 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -3872,6 +3872,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  dart-nvim = buildVimPlugin {
+    pname = "dart.nvim";
+    version = "2025-10-23";
+    src = fetchFromGitHub {
+      owner = "iofq";
+      repo = "dart.nvim";
+      rev = "71421e7ef5aee8267e24dc562fdd07a83bda192e";
+      sha256 = "1jny6xq5ami3msa8b22hp7yrraljwg7vfkwj7rps8j7whrdxkfjh";
+    };
+    meta.homepage = "https://github.com/iofq/dart.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   dart-vim-plugin = buildVimPlugin {
     pname = "dart-vim-plugin";
     version = "2024-07-02";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 65593dd83c55..573cf666c92a 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -297,6 +297,7 @@ https://github.com/JachymPutta/dailies.nvim/,HEAD,
 https://github.com/Koalhack/darcubox-nvim/,HEAD,
 https://github.com/ptdewey/darkearth-nvim/,HEAD,
 https://github.com/dart-lang/dart-vim-plugin/,,
+https://github.com/iofq/dart.nvim/,HEAD,
 https://github.com/rizzatti/dash.vim/,HEAD,
 https://github.com/nvimdev/dashboard-nvim/,,
 https://github.com/Shougo/ddc-filter-matcher_head/,HEAD,

From 5c1efadfb35feefd7d46abffd392a51da6102f2a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 19:52:24 +0000
Subject: [PATCH 3004/6226] gofumpt: 0.9.1 -> 0.9.2

---
 pkgs/by-name/go/gofumpt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/gofumpt/package.nix b/pkgs/by-name/go/gofumpt/package.nix
index e17cab3def16..3568eb7bae23 100644
--- a/pkgs/by-name/go/gofumpt/package.nix
+++ b/pkgs/by-name/go/gofumpt/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "gofumpt";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "mvdan";
     repo = "gofumpt";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2JahPQQfiYfctMi7AqNB9Y1dS1Pg8usLtzM2wSlC5E0=";
+    hash = "sha256-ngqg8YJHqW08hvZp+E+RLLjGArOZJov7/xKCMAWFI1E=";
   };
 
-  vendorHash = "sha256-ziqhBWkfWQ0T+gLFqv352PtNcpyCTRFHBfV6iilVGLs=";
+  vendorHash = "sha256-qCXpFxTZIhDDvvwytvftBnMwOHopO6/FkBWcLZhBDp8=";
 
   env.CGO_ENABLED = "0";
 

From c9697413f7dcc0fbe82f8c3cea826207b30fa368 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 26 Oct 2025 13:04:08 -0700
Subject: [PATCH 3005/6226] antlr4: add sarahec as maintainer

---
 pkgs/development/tools/parsing/antlr/4.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/tools/parsing/antlr/4.nix b/pkgs/development/tools/parsing/antlr/4.nix
index cb7176f5d5a4..0352698f42f4 100644
--- a/pkgs/development/tools/parsing/antlr/4.nix
+++ b/pkgs/development/tools/parsing/antlr/4.nix
@@ -86,6 +86,7 @@ let
           sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
           license = lib.licenses.bsd3;
           platforms = lib.platforms.unix;
+          maintainers = with lib.maintainers; [ sarahec ];
         };
       };
 
@@ -119,6 +120,7 @@ let
             homepage = "https://www.antlr.org/";
             license = lib.licenses.bsd3;
             platforms = lib.platforms.unix;
+            maintainers = with lib.maintainers; [ sarahec ];
           };
         };
       };

From cae5e7645a94dd0052e82c0d4cc745a30c3c026c Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 26 Oct 2025 13:09:56 -0700
Subject: [PATCH 3006/6226] python3Packages.antlr4-python3-runtime: add sarahec
 as maintainer

---
 .../python-modules/antlr4-python3-runtime/default.nix            | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
index 2c446ac30517..3419557f3cad 100644
--- a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
+++ b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
@@ -41,5 +41,6 @@ buildPythonPackage rec {
     mainProgram = "pygrun";
     homepage = "https://www.antlr.org/";
     license = licenses.bsd3;
+    maintainers = with maintainers; [ sarahec ];
   };
 }

From df4de3d07fb19cbdc0d8f29757a545a8358280b9 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 26 Oct 2025 13:10:44 -0700
Subject: [PATCH 3007/6226] python3Packages.antlr4-python3-runtime: cleanup
 derivation

Remove \`with lib;`\" and outdated \`pythonOlder\`, use modern build.
---
 .../antlr4-python3-runtime/default.nix               | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
index 3419557f3cad..80da163424a1 100644
--- a/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
+++ b/pkgs/development/python-modules/antlr4-python3-runtime/default.nix
@@ -10,13 +10,11 @@ buildPythonPackage rec {
   pname = "antlr4-python3-runtime";
   inherit (antlr4.runtime.cpp) version src;
 
-  format = "pyproject";
-
-  disabled = python.pythonOlder "3.6";
+  pyproject = true;
 
   sourceRoot = "${src.name}/runtime/Python3";
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
   postPatch = ''
     substituteInPlace tests/TestIntervalSet.py \
@@ -36,11 +34,11 @@ buildPythonPackage rec {
     runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Runtime for ANTLR";
     mainProgram = "pygrun";
     homepage = "https://www.antlr.org/";
-    license = licenses.bsd3;
-    maintainers = with maintainers; [ sarahec ];
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ sarahec ];
   };
 }

From 1952c54ab6f3671099752a88e50399d6439ac4a3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 20:16:52 +0000
Subject: [PATCH 3008/6226] python3Packages.cyclonedx-python-lib: 11.2.0 ->
 11.4.0

---
 .../python-modules/cyclonedx-python-lib/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
index 593485dbef97..53e8e075d1e4 100644
--- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
+++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
@@ -23,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "cyclonedx-python-lib";
-  version = "11.2.0";
+  version = "11.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     owner = "CycloneDX";
     repo = "cyclonedx-python-lib";
     tag = "v${version}";
-    hash = "sha256-HfHZKOae83ASym1MSlVb0+aVWpyziDgQEQxLzWMM/MQ=";
+    hash = "sha256-fCumFp9ubzCtTrO0r/R/OF83cc0v4XX5K/2vfxQrT84=";
   };
 
   pythonRelaxDeps = [ "py-serializable" ];

From 1eda4f74ab36acf5028957844bcb6b68158cd467 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Sun, 26 Oct 2025 21:19:02 +0100
Subject: [PATCH 3009/6226] ledger: 3.3.2 -> 3.4.1

---
 pkgs/by-name/le/ledger/package.nix | 32 ++----------------------------
 1 file changed, 2 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/le/ledger/package.nix b/pkgs/by-name/le/ledger/package.nix
index 94cd731c36ea..6b36c4cb2647 100644
--- a/pkgs/by-name/le/ledger/package.nix
+++ b/pkgs/by-name/le/ledger/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch2,
   cmake,
   boost,
   gmp,
@@ -21,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ledger";
-  version = "3.3.2";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "ledger";
     repo = "ledger";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Uym4s8EyzXHlISZqThcb6P1H5bdgD9vmdIOLkk5ikG0=";
+    hash = "sha256-yk6/4ImUzgZY8O7MmQMwFkuJ/pMXo6W5TAA0GGIxYgg=";
   };
 
   # by default, it will query the python interpreter for it's sitepackages location
@@ -37,29 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail 'DESTINATION ''${Python_SITEARCH}' 'DESTINATION "${placeholder "py"}/${python3.sitePackages}"'
   '';
 
-  patches = [
-    (fetchpatch2 {
-      name = "ledger-boost-1.85-compat.patch";
-      url = "https://github.com/ledger/ledger/commit/46207852174feb5c76c7ab894bc13b4f388bf501.patch";
-      hash = "sha256-X0NSN60sEFLvcfMmtVoxC7fidcr5tJUlFVQ/E8qfLss=";
-    })
-    (fetchpatch2 {
-      name = "ledger-boost-1.86-compat-1.patch";
-      url = "https://github.com/ledger/ledger/commit/f6750ed89b46926d1f0859f3b25d18ed62ac219e.patch";
-      hash = "sha256-pktwotuMbZcR2DpZccMqV13524avKvazDX/+Ki6h69g=";
-    })
-    (fetchpatch2 {
-      name = "ledger-boost-1.86-compat-2.patch";
-      url = "https://github.com/ledger/ledger/commit/62f626fa73bd6832028f43c204c43cf15bd5f409.patch";
-      hash = "sha256-cazhSxadNpiA6ofZxS8JALOPy88cNPM/jKHaUYk8pBw=";
-    })
-    (fetchpatch2 {
-      name = "ledger-boost-1.86-compat-3.patch";
-      url = "https://github.com/ledger/ledger/commit/124398c35be573324cf2384c08b99b4476f29e2b.patch";
-      hash = "sha256-N3dUrqNsOiVgedoYmyfYllK+4lvKdMxc8iq0+DgEbxc=";
-    })
-  ];
-
   outputs = [
     "out"
     "dev"
@@ -99,10 +75,6 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "BUILD_DOCS" true)
     (lib.cmakeBool "USE_PYTHON" usePython)
     (lib.cmakeBool "USE_GPGME" gpgmeSupport)
-
-    # CMake 4 dropped support of versions lower than 3.5, and versions
-    # lower than 3.10 are deprecated.
-    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10")
   ];
 
   installTargets = [

From 485dba63953063592681d7473623ed3a0b5a94d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 20:19:24 +0000
Subject: [PATCH 3010/6226] python3Packages.sqlfmt: 0.28.1 -> 0.28.2

---
 pkgs/development/python-modules/sqlfmt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sqlfmt/default.nix b/pkgs/development/python-modules/sqlfmt/default.nix
index 1acdfcfa0664..da67f58c661d 100644
--- a/pkgs/development/python-modules/sqlfmt/default.nix
+++ b/pkgs/development/python-modules/sqlfmt/default.nix
@@ -27,7 +27,7 @@
 
 buildPythonPackage rec {
   pname = "sqlfmt";
-  version = "0.28.1";
+  version = "0.28.2";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -36,7 +36,7 @@ buildPythonPackage rec {
     owner = "tconbeer";
     repo = "sqlfmt";
     tag = "v${version}";
-    hash = "sha256-H896Ey4iJFuvcLLvLilN/6nN4gxpvv3VJKIjivEDwMU=";
+    hash = "sha256-9SO3G8SQOkxxSyro9dwSI6oH6BT8Rd66WqM5bvdVQkg=";
   };
 
   build-system = [ hatchling ];

From aa762c8c3154393fbed4c069bc692c71ba01c387 Mon Sep 17 00:00:00 2001
From: Alexis Hildebrandt <afh@surryhill.net>
Date: Sun, 26 Oct 2025 21:19:58 +0100
Subject: [PATCH 3011/6226] ledger: Add afh to maintainers

---
 pkgs/by-name/le/ledger/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/le/ledger/package.nix b/pkgs/by-name/le/ledger/package.nix
index 6b36c4cb2647..e3a4acd82250 100644
--- a/pkgs/by-name/le/ledger/package.nix
+++ b/pkgs/by-name/le/ledger/package.nix
@@ -107,6 +107,9 @@ stdenv.mkDerivation (finalAttrs: {
       their data, there really is no alternative.
     '';
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ jwiegley ];
+    maintainers = with lib.maintainers; [
+      jwiegley
+      afh
+    ];
   };
 })

From 3c738597b91ac7a90ed3c996082d98b825d63c8b Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 21 Oct 2025 16:15:21 -0700
Subject: [PATCH 3012/6226] python3Packages.beancount: disable broken tests on
 Darwin

---
 pkgs/development/python-modules/beancount/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/beancount/default.nix b/pkgs/development/python-modules/beancount/default.nix
index 90b763598e74..91afb6fe23ab 100644
--- a/pkgs/development/python-modules/beancount/default.nix
+++ b/pkgs/development/python-modules/beancount/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   bison,
   buildPythonPackage,
   click,
@@ -51,6 +52,12 @@ buildPythonPackage rec {
     mv beancount tests
   '';
 
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # Cannot run the gpg-agent. If needed, implement as passthru tests.
+    "test_read_encrypted_file"
+    "test_include_encrypted"
+  ];
+
   pythonImportsCheck = [ "beancount" ];
 
   meta = {

From b574e175e39bdadc3836b278d40116d4e5a45b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9-Paul=20D=2E?=
 <44802527+godelized@users.noreply.github.com>
Date: Sun, 21 Sep 2025 19:15:11 +0200
Subject: [PATCH 3013/6226] nixos/anubis: add support for a dedicated
 RuntimeDirectory per instance

---
 nixos/modules/services/networking/anubis.md  |  28 ++
 nixos/modules/services/networking/anubis.nix |  58 +++-
 nixos/tests/anubis.nix                       | 282 ++++++++++++++-----
 3 files changed, 288 insertions(+), 80 deletions(-)

diff --git a/nixos/modules/services/networking/anubis.md b/nixos/modules/services/networking/anubis.md
index 533ece7bfbd3..af5d3cf997bc 100644
--- a/nixos/modules/services/networking/anubis.md
+++ b/nixos/modules/services/networking/anubis.md
@@ -8,6 +8,34 @@ between a reverse proxy and the service to be protected.
 This module is designed to use Unix domain sockets as the socket paths can be automatically configured for multiple
 instances, but TCP sockets are also supported.
 
+Configuring multiple instances may look like the following.
+
+Notes:
+
+- Each instance as its runtime directory set to `anubis/anubis-<instance name>`.
+- When a single instance is declared with unix sockets, the runtime directory `anubis` is allowed for backward
+  compatibility.
+
+```nix
+{
+  services.anubis.instances."instance-1" = {
+    # Runtime directory: "anubis/anubis-instance-1".
+    settings = {
+      BIND = "/run/anubis/anubis-instance-1/anubis.sock";
+      TARGET = "http://localhost:8001";
+    };
+  };
+
+  services.anubis.instances."instance-2" = {
+    # Runtime directory: "anubis/anubis-instance-2".
+    settings = {
+      BIND = "/run/anubis/anubis-instance-2/anubis.sock";
+      TARGET = "http://localhost:8002";
+    };
+  };
+}
+```
+
 A minimal configuration with [nginx](#opt-services.nginx.enable) may look like the following:
 
 ```nix
diff --git a/nixos/modules/services/networking/anubis.nix b/nixos/modules/services/networking/anubis.nix
index 968595d303d1..cb1ca0ee293e 100644
--- a/nixos/modules/services/networking/anubis.nix
+++ b/nixos/modules/services/networking/anubis.nix
@@ -12,6 +12,28 @@ let
   enabledInstances = lib.filterAttrs (_: conf: conf.enable) cfg.instances;
   instanceName = name: if name == "" then "anubis" else "anubis-${name}";
 
+  unixAddr = network: addr: lib.strings.optionalString (network == "unix") addr;
+  unixSocketAddrs =
+    settings:
+    lib.filter (x: x != "") [
+      (unixAddr settings.BIND_NETWORK settings.BIND)
+      (unixAddr settings.METRICS_BIND_NETWORK settings.METRICS_BIND)
+    ];
+
+  runtimeDirectoryPrefix = name: "/run/anubis/${instanceName name}/";
+  instanceUsesUnixSockets = instance: lib.length (unixSocketAddrs instance.settings) > 0;
+  instanceUsesDedicatedRuntimeDirectory =
+    name: instance:
+    lib.any (lib.hasPrefix (runtimeDirectoryPrefix name)) (unixSocketAddrs instance.settings);
+  useDedicatedRuntimeDirectory =
+    # Set when:
+    # - Multiple instances are configured to use unix sockets.
+    # - At least one instance uses the new runtime directory prefix: /run/anubis/anubis-<instance name>.
+    lib.count instanceUsesUnixSockets (lib.attrValues enabledInstances) > 1
+    || lib.any (attrs: instanceUsesDedicatedRuntimeDirectory attrs.name attrs.value) (
+      lib.attrsToList enabledInstances
+    );
+
   commonSubmodule =
     isDefault:
     let
@@ -185,6 +207,7 @@ let
         default = "/run/anubis/${instanceName name}.sock";
         description = ''
           The address that Anubis listens to. See Go's [`net.Listen`](https://pkg.go.dev/net#Listen) for syntax.
+          Use the prefix ${runtimeDirectoryPrefix "<instance name>"} when configuring multiple instances.
 
           Defaults to Unix domain sockets. To use TCP sockets, set this to a TCP address and `BIND_NETWORK` to `"tcp"`.
         '';
@@ -196,6 +219,7 @@ let
         description = ''
           The address Anubis' metrics server listens to. See Go's [`net.Listen`](https://pkg.go.dev/net#Listen) for
           syntax.
+          Use the prefix ${runtimeDirectoryPrefix "<instance name>"} when configuring multiple instances.
 
           The metrics server is enabled by default and may be disabled. However, due to implementation details, this is
           only possible by setting a command line flag. See {option}`services.anubis.defaultOptions.extraFlags` for an
@@ -245,6 +269,25 @@ in
   };
 
   config = lib.mkIf (enabledInstances != { }) {
+    warnings = [
+      "RuntimeDirectory is going to be migrated from `anubis` to `anubis/anubis-<instance name>`, update BIND and METRICS_BIND to ${runtimeDirectoryPrefix "<instance name>"} if using unix sockets"
+    ];
+
+    assertions =
+      let
+        validInstanceUnixSocketAddrs =
+          { name, value }:
+          lib.all (lib.hasPrefix (runtimeDirectoryPrefix name)) (unixSocketAddrs value.settings);
+      in
+      [
+        {
+          assertion =
+            !useDedicatedRuntimeDirectory
+            || lib.all validInstanceUnixSocketAddrs (lib.attrsToList enabledInstances);
+          message = "use the prefix ${runtimeDirectoryPrefix "<instance name>"} in BIND and METRICS_BIND when configuring multiple instances";
+        }
+      ];
+
     users.users = lib.mkIf (cfg.defaultOptions.user == "anubis") {
       anubis = {
         isSystemUser = true;
@@ -288,19 +331,14 @@ in
             (lib.singleton (lib.getExe cfg.package)) ++ instance.extraFlags
           );
           RuntimeDirectory =
-            if
-              lib.any (lib.hasPrefix "/run/anubis") (
-                with instance.settings;
-                [
-                  BIND
-                  METRICS_BIND
-                ]
-              )
-            then
+            if useDedicatedRuntimeDirectory then
+              "anubis/${instanceName name}"
+            else if instanceUsesUnixSockets instance then
+              # `dedicatedRuntimeDirectory = false`: /run/anubis may still be used.
+              # Warning: `anubis` will be deprecated eventually.
               "anubis"
             else
               null;
-
           # hardening
           NoNewPrivileges = true;
           CapabilityBoundingSet = null;
diff --git a/nixos/tests/anubis.nix b/nixos/tests/anubis.nix
index 761c31d6b8c6..b2b3b2f8fa82 100644
--- a/nixos/tests/anubis.nix
+++ b/nixos/tests/anubis.nix
@@ -1,4 +1,36 @@
 { lib, ... }:
+let
+  legacyBotPolicyJSON = ''
+    {
+      "bots": [
+        {
+          "import": "(data)/bots/_deny-pathological.yaml"
+        },
+        {
+          "import": "(data)/meta/ai-block-aggressive.yaml"
+        },
+        {
+          "import": "(data)/crawlers/_allow-good.yaml"
+        },
+        {
+          "import": "(data)/bots/aggressive-brazilian-scrapers.yaml"
+        },
+        {
+          "import": "(data)/common/keep-internet-working.yaml"
+        },
+        {
+          "name": "generic-browser",
+          "user_agent_regex": "Mozilla|Opera",
+          "action": "CHALLENGE"
+        }
+      ],
+      "dnsbl": false,
+      "status_codes": {
+        "CHALLENGE": 200,
+        "DENY": 200
+      }
+    }'';
+in
 {
   name = "anubis";
   meta.maintainers = with lib.maintainers; [
@@ -7,57 +39,75 @@
     ryand56
   ];
 
-  nodes.machine =
+  nodes.machineLegacy =
     { config, pkgs, ... }:
     {
       services.anubis = {
         defaultOptions = {
-          # Get default botPolicy
-          botPolicy = lib.importJSON "${config.services.anubis.package.src}/data/botPolicies.json";
+          botPolicy = builtins.fromJSON legacyBotPolicyJSON;
           settings = {
             DIFFICULTY = 3;
             USER_DEFINED_DEFAULT = true;
           };
         };
-        instances = {
-          "".settings = {
+
+        instances."".settings = {
+          TARGET = "http://localhost:8080";
+          DIFFICULTY = 5;
+          USER_DEFINED_INSTANCE = true;
+        };
+
+        instances."tcp" = {
+          user = "anubis-tcp";
+          group = "anubis-tcp";
+          settings = {
             TARGET = "http://localhost:8080";
-            DIFFICULTY = 5;
-            USER_DEFINED_INSTANCE = true;
-          };
-
-          "tcp" = {
-            user = "anubis-tcp";
-            group = "anubis-tcp";
-            settings = {
-              TARGET = "http://localhost:8080";
-              BIND = ":9000";
-              BIND_NETWORK = "tcp";
-              METRICS_BIND = ":9001";
-              METRICS_BIND_NETWORK = "tcp";
-            };
-          };
-
-          "unix-upstream" = {
-            group = "nginx";
-            settings.TARGET = "unix:///run/nginx/nginx.sock";
-          };
-
-          "botPolicy-default" = {
-            botPolicy = null;
-            settings.TARGET = "http://localhost:8080";
-          };
-
-          "botPolicy-file" = {
-            settings = {
-              TARGET = "http://localhost:8080";
-              POLICY_FNAME = "/etc/anubis-botPolicy.json";
-            };
+            BIND = "127.0.0.1:9000";
+            BIND_NETWORK = "tcp";
+            METRICS_BIND = "127.0.0.1:9001";
+            METRICS_BIND_NETWORK = "tcp";
           };
         };
       };
 
-      # Empty json for testing
+      users.users.nginx.extraGroups = [ config.users.groups.anubis.name ];
+      services.nginx = {
+        enable = true;
+        recommendedProxySettings = true;
+        virtualHosts."basic.localhost".locations = {
+          "/".proxyPass = "http://unix:${config.services.anubis.instances."".settings.BIND}";
+          "/metrics".proxyPass = "http://unix:${config.services.anubis.instances."".settings.METRICS_BIND}";
+        };
+
+        virtualHosts."tcp.localhost".locations = {
+          "/".proxyPass = "http://${config.services.anubis.instances."tcp".settings.BIND}";
+          "/metrics".proxyPass = "http://${config.services.anubis.instances."tcp".settings.METRICS_BIND}";
+        };
+
+        # emulate an upstream with nginx, listening on tcp and unix sockets.
+        virtualHosts."upstream.localhost" = {
+          default = true; # make nginx match this vhost for `localhost`
+          listen = [
+            { addr = "unix:/run/nginx/nginx.sock"; }
+            {
+              addr = "localhost";
+              port = 8080;
+            }
+          ];
+          locations."/" = {
+            tryFiles = "$uri $uri/index.html =404";
+            root = pkgs.runCommand "anubis-test-upstream" { } ''
+              mkdir $out
+              echo "it works" >> $out/index.html
+            '';
+          };
+        };
+      };
+    };
+
+  nodes.machine =
+    { config, pkgs, ... }:
+    {
       environment.etc."anubis-botPolicy.json".text = lib.generators.toJSON { } {
         bots = [
           {
@@ -68,8 +118,73 @@
         ];
       };
 
+      services.anubis = {
+        defaultOptions = {
+          botPolicy = builtins.fromJSON legacyBotPolicyJSON;
+          settings = {
+            DIFFICULTY = 3;
+            USER_DEFINED_DEFAULT = true;
+          };
+        };
+
+        instances."".settings = {
+          TARGET = "http://localhost:8080";
+          DIFFICULTY = 5;
+          USER_DEFINED_INSTANCE = true;
+          BIND = "/run/anubis/anubis/anubis.sock";
+          METRICS_BIND = "/run/anubis/anubis/anubis-metrics.sock";
+        };
+
+        instances."tcp" = {
+          user = "anubis-tcp";
+          group = "anubis-tcp";
+          settings = {
+            TARGET = "http://localhost:8080";
+            BIND = "127.0.0.1:9000";
+            BIND_NETWORK = "tcp";
+            METRICS_BIND = "127.0.0.1:9001";
+            METRICS_BIND_NETWORK = "tcp";
+          };
+        };
+
+        instances."another-unix-listen" = {
+          settings = {
+            TARGET = "http://localhost:8080";
+            BIND = "/run/anubis/anubis-another-unix-listen/anubis.sock";
+            METRICS_BIND = "/run/anubis/anubis-another-unix-listen/anubis-metrics.sock";
+          };
+        };
+
+        instances."unix-upstream" = {
+          group = "nginx";
+          settings = {
+            BIND = "/run/anubis/anubis-unix-upstream/anubis.sock";
+            METRICS_BIND = "/run/anubis/anubis-unix-upstream/anubis-metrics.sock";
+            TARGET = "unix:///run/nginx/nginx.sock";
+          };
+        };
+
+        instances."botPolicy-default" = {
+          botPolicy = null;
+          settings = {
+            TARGET = "http://localhost:8080";
+            BIND = "/run/anubis/anubis-botPolicy-default/anubis.sock";
+            METRICS_BIND = "/run/anubis/anubis-botPolicy-default/anubis-metrics.sock";
+          };
+        };
+
+        instances."botPolicy-file" = {
+          settings = {
+            TARGET = "http://localhost:8080";
+            POLICY_FNAME = "/etc/anubis-botPolicy.json";
+            BIND = "/run/anubis/anubis-botPolicy-file/anubis.sock";
+            METRICS_BIND = "/run/anubis/anubis-botPolicy-file/anubis-metrics.sock";
+          };
+        };
+      };
+
       # support
-      users.users.nginx.extraGroups = [ config.services.anubis.defaultOptions.group ];
+      users.users.nginx.extraGroups = [ config.users.groups.anubis.name ];
       services.nginx = {
         enable = true;
         recommendedProxySettings = true;
@@ -79,12 +194,21 @@
         };
 
         virtualHosts."tcp.localhost".locations = {
-          "/".proxyPass = "http://localhost:9000";
-          "/metrics".proxyPass = "http://localhost:9001";
+          "/".proxyPass = "http://${config.services.anubis.instances."tcp".settings.BIND}";
+          "/metrics".proxyPass = "http://${config.services.anubis.instances."tcp".settings.METRICS_BIND}";
+        };
+
+        virtualHosts."another-unix-listen".locations = {
+          "/".proxyPass = "http://unix:${
+            config.services.anubis.instances."another-unix-listen".settings.BIND
+          }";
+          "/metrics".proxyPass = "http://unix:${
+            config.services.anubis.instances."another-unix-listen".settings.METRICS_BIND
+          }";
         };
 
         virtualHosts."unix.localhost".locations = {
-          "/".proxyPass = "http://unix:${config.services.anubis.instances.unix-upstream.settings.BIND}";
+          "/".proxyPass = "http://unix:${config.services.anubis.instances."unix-upstream".settings.BIND}";
         };
 
         # emulate an upstream with nginx, listening on tcp and unix sockets.
@@ -109,43 +233,61 @@
     };
 
   testScript = ''
-    for unit in ["nginx", "anubis", "anubis-tcp", "anubis-unix-upstream"]:
-      machine.wait_for_unit(unit + ".service")
+    with subtest("Legacy anubis service configuration: supports only a single RuntimeDirectory"):
+      for unit in ["nginx", "anubis", "anubis-tcp"]:
+        machineLegacy.wait_for_unit(unit + ".service")
 
-    for port in [9000, 9001]:
-      machine.wait_for_open_port(port)
+      machineLegacy.wait_for_open_unix_socket("/run/anubis/anubis.sock")
+      machineLegacy.wait_for_open_unix_socket("/run/anubis/anubis-metrics.sock")
 
-    for instance in ["anubis", "anubis-unix-upstream"]:
-      machine.wait_for_open_unix_socket(f"/run/anubis/{instance}.sock")
-      machine.wait_for_open_unix_socket(f"/run/anubis/{instance}-metrics.sock")
+      # Default unix socket mode with 1 instance listening on unix sockets.
+      machineLegacy.succeed('curl -f http://localhost:8080 | grep "it works"')
+      machineLegacy.succeed('curl -f http://basic.localhost | grep "it works"')
+      machineLegacy.succeed('curl -f http://basic.localhost -H "User-Agent: Mozilla" | grep anubis')
+      machineLegacy.succeed('curl -f http://basic.localhost/metrics | grep anubis_challenges_issued')
 
-    # Default unix socket mode
-    machine.succeed('curl -f http://basic.localhost | grep "it works"')
-    machine.succeed('curl -f http://basic.localhost -H "User-Agent: Mozilla" | grep anubis')
-    machine.succeed('curl -f http://basic.localhost/metrics | grep anubis_challenges_issued')
+      # TCP mode.
+      machineLegacy.succeed('curl -f http://tcp.localhost -H "User-Agent: Mozilla" | grep anubis')
+      machineLegacy.succeed('curl -f http://tcp.localhost/metrics | grep anubis_challenges_issued')
 
-    # TCP mode
-    machine.succeed('curl -f http://tcp.localhost -H "User-Agent: Mozilla" | grep anubis')
-    machine.succeed('curl -f http://tcp.localhost/metrics | grep anubis_challenges_issued')
+    with subtest("Dedicated RuntimeDirectory"):
+      for unit in ["nginx", "anubis", "anubis-another-unix-listen", "anubis-tcp", "anubis-unix-upstream"]:
+        machine.wait_for_unit(unit + ".service")
 
-    # Upstream is a unix socket mode
-    machine.succeed('curl -f http://unix.localhost/index.html | grep "it works"')
+      for port in [9000, 9001]:
+        machine.wait_for_open_port(port)
 
-    # Default user-defined environment variables
-    machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "USER_DEFINED_DEFAULT"')
-    machine.succeed('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "USER_DEFINED_DEFAULT"')
+      machine.wait_for_open_unix_socket("/run/anubis/anubis/anubis.sock")
+      machine.wait_for_open_unix_socket("/run/anubis/anubis/anubis-metrics.sock")
+      for instance in ["another-unix-listen", "unix-upstream"]:
+        machine.wait_for_open_unix_socket(f"/run/anubis/anubis-{instance}/anubis.sock")
+        machine.wait_for_open_unix_socket(f"/run/anubis/anubis-{instance}/anubis-metrics.sock")
 
-    # Instance-specific user-specified environment variables
-    machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "USER_DEFINED_INSTANCE"')
-    machine.fail('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "USER_DEFINED_INSTANCE"')
+      machine.succeed('curl -f http://basic.localhost | grep "it works"')
+      machine.succeed('curl -f http://basic.localhost -H "User-Agent: Mozilla" | grep anubis')
+      machine.succeed('curl -f http://basic.localhost/metrics | grep anubis_challenges_issued')
 
-    # Make sure defaults don't overwrite themselves
-    machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "DIFFICULTY=5"')
-    machine.succeed('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "DIFFICULTY=3"')
+      machine.succeed('curl -f http://another-unix-listen.localhost -H "User-Agent: Mozilla" | grep anubis')
+      machine.succeed('curl -f http://another-unix-listen.localhost/metrics | grep anubis_challenges_issued')
 
-    # Check correct BotPolicy settings are applied
-    machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "POLICY_FNAME=/nix/store"')
-    machine.fail('cat /run/current-system/etc/systemd/system/anubis-botPolicy-default.service | grep "POLICY_FNAME="')
-    machine.succeed('cat /run/current-system/etc/systemd/system/anubis-botPolicy-file.service | grep "POLICY_FNAME=/etc/anubis-botPolicy.json"')
+      # Upstream is a unix socket mode.
+      machine.succeed('curl -f http://unix.localhost/index.html | grep "it works"')
+
+      # Default user-defined environment variables.
+      machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "USER_DEFINED_DEFAULT"')
+      machine.succeed('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "USER_DEFINED_DEFAULT"')
+
+      # Instance-specific user-specified environment variables.
+      machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "USER_DEFINED_INSTANCE"')
+      machine.fail('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "USER_DEFINED_INSTANCE"')
+
+      # Make sure defaults don't overwrite themselves.
+      machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "DIFFICULTY=5"')
+      machine.succeed('cat /run/current-system/etc/systemd/system/anubis-tcp.service | grep "DIFFICULTY=3"')
+
+      # Check correct BotPolicy settings are applied
+      machine.succeed('cat /run/current-system/etc/systemd/system/anubis.service | grep "POLICY_FNAME=/nix/store"')
+      machine.fail('cat /run/current-system/etc/systemd/system/anubis-botPolicy-default.service | grep "POLICY_FNAME="')
+      machine.succeed('cat /run/current-system/etc/systemd/system/anubis-botPolicy-file.service | grep "POLICY_FNAME=/etc/anubis-botPolicy.json"')
   '';
 }

From ed873e4e3d2769bd5d3ef22d79e5f3ce267d020f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 20:39:32 +0000
Subject: [PATCH 3014/6226] beam26Packages.hex: 2.2.2 -> 2.3.1

---
 pkgs/development/beam-modules/hex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/beam-modules/hex/default.nix b/pkgs/development/beam-modules/hex/default.nix
index c773d15241c0..75d44154d76e 100644
--- a/pkgs/development/beam-modules/hex/default.nix
+++ b/pkgs/development/beam-modules/hex/default.nix
@@ -18,13 +18,13 @@ let
     self:
     stdenv.mkDerivation rec {
       pname = "hex";
-      version = "2.2.2";
+      version = "2.3.1";
 
       src = fetchFromGitHub {
         owner = "hexpm";
         repo = "hex";
         rev = "v${version}";
-        sha256 = "sha256-Qih10OeI7KsnAthAW0yuH+YL8uoeLy7tOVn9rdkGA4M=";
+        sha256 = "sha256-1LFWyxXR33qsvbzkBfUVgcT1/w1FuQDy3PBsRscyTpk=";
       };
 
       setupHook = writeText "setupHook.sh" ''

From 1acaf6b89b3579e30061d9da1820d3cc4bc87665 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sat, 25 Oct 2025 17:26:43 -0700
Subject: [PATCH 3015/6226] kismet: 2023-07-R2 -> 2025-09-R1

---
 pkgs/by-name/ki/kismet/package.nix | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ki/kismet/package.nix b/pkgs/by-name/ki/kismet/package.nix
index deba8d723e87..43677310ba31 100644
--- a/pkgs/by-name/ki/kismet/package.nix
+++ b/pkgs/by-name/ki/kismet/package.nix
@@ -6,6 +6,7 @@
   elfutils,
   fetchFromGitHub,
   glib,
+  libbtbb,
   libcap,
   libmicrohttpd,
   libnl,
@@ -13,6 +14,7 @@
   libusb1,
   libwebsockets,
   lm_sensors,
+  mosquitto,
   networkmanager,
   nix-update-script,
   nixosTests,
@@ -22,6 +24,7 @@
   protobuf,
   protobufc,
   python3,
+  rtl-sdr-librtlsdr,
   sqlite,
   withNetworkManager ? false,
   withPython ? stdenv.buildPlatform.canExecute stdenv.hostPlatform,
@@ -31,13 +34,13 @@
 
 stdenv.mkDerivation (finalPackage: {
   pname = "kismet";
-  version = "2023-07-R2";
+  version = "2025-09-R1";
 
   src = fetchFromGitHub {
     owner = "kismetwireless";
     repo = "kismet";
     tag = "kismet-${finalPackage.version}";
-    hash = "sha256-QwTjjZHnrlATFvHK9PLDTt76UjfZdzCmV6uXVgIMIYg=";
+    hash = "sha256-bwgeBIa5P1he0azWBu1YTXS9EGlHdJK8hS6A5Rj9XU4=";
   };
 
   postPatch = ''
@@ -76,6 +79,7 @@ stdenv.mkDerivation (finalPackage: {
   buildInputs = [
     binutils
     elfutils
+    libbtbb
     libcap
     libmicrohttpd
     libnl
@@ -83,9 +87,11 @@ stdenv.mkDerivation (finalPackage: {
     openssl
     libusb1
     libwebsockets
+    mosquitto
     pcre2
     protobuf
     protobufc
+    rtl-sdr-librtlsdr
     sqlite
     zlib
   ]

From 6b87a0569a151d38f692664aa22b63f8222a95a1 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sat, 25 Oct 2025 17:29:36 -0700
Subject: [PATCH 3016/6226] nixos/kismet: fix module typechecking

70ab11c2f2ed1c8375da40d891f428139146a05d added the new v2 merge, which
performs typechecking at the same time as merging. We need to opt out of
this optimization, as it changes the behavior of the module and results
in eval errors.
---
 nixos/modules/services/networking/kismet.nix | 87 +++++++++++++++-----
 1 file changed, 68 insertions(+), 19 deletions(-)

diff --git a/nixos/modules/services/networking/kismet.nix b/nixos/modules/services/networking/kismet.nix
index 4e14e9fd51d4..c7d44846b178 100644
--- a/nixos/modules/services/networking/kismet.nix
+++ b/nixos/modules/services/networking/kismet.nix
@@ -28,7 +28,14 @@ let
     typeOf
     match
     ;
-  inherit (lib.lists) all isList flatten;
+  inherit (lib.lists)
+    all
+    isList
+    head
+    tail
+    flatten
+    foldl'
+    ;
   inherit (lib.attrsets)
     attrsToList
     filterAttrs
@@ -48,19 +55,60 @@ let
     in
     prev
     // {
-      check = value: prev.check value && (override type value);
+      check =
+        value:
+        let
+          prevResult = builtins.tryEval (prev.check value);
+          nextResult = builtins.tryEval (override type value);
+        in
+        prevResult.success && prevResult.value && nextResult.success && nextResult.value;
+
+      # We need to typecheck prior to merging, so deoptimize in case prev.merge is a functor.
+      merge = opts: prev.merge opts;
     };
 
   # Deep listOf.
-  listOf' = deep types.listOf (type: value: all type.check value);
+  inherit (types) listOf;
+  listOf' = deep listOf (type: value: all type.check value);
 
   # Deep attrsOf.
-  attrsOf' = deep types.attrsOf (type: value: all (item: type.check item.value) (attrsToList value));
+  inherit (types) attrsOf;
+  attrsOf' = deep attrsOf (type: value: all (item: type.check item.value) (attrsToList value));
+
+  # Deep either and oneOf that performs typecheck prior to merging.
+  inherit (types) either;
+  either' =
+    first: second:
+    let
+      prev = either first second;
+    in
+    prev
+    // {
+      check =
+        value:
+        let
+          firstResult = builtins.tryEval (first.check value);
+          secondResult = builtins.tryEval (second.check value);
+        in
+        firstResult.success && firstResult.value || secondResult.success && secondResult.value;
+
+      # We need to typecheck prior to merging, so deoptimize in case prev.merge is a functor.
+      merge = opts: prev.merge opts;
+    };
+
+  oneOf' =
+    ts:
+    let
+      head' =
+        if ts == [ ] then throw "types.oneOf needs to get at least one type in its argument" else head ts;
+      tail' = tail ts;
+    in
+    foldl' either' head' tail';
 
   # Kismet config atoms.
   atom =
     with types;
-    oneOf [
+    oneOf' [
       number
       bool
       str
@@ -68,7 +116,10 @@ let
 
   # Composite types.
   listOfAtom = listOf' atom;
-  atomOrList = with types; either atom listOfAtom;
+  atomOrList = oneOf' [
+    atom
+    listOfAtom
+  ];
   lists = listOf' atomOrList;
   kvPair = attrsOf' atomOrList;
   kvPairs = listOf' kvPair;
@@ -80,19 +131,17 @@ let
   # Toplevel config type.
   topLevel =
     let
-      topLevel' =
-        with types;
-        oneOf [
-          headerKvPairs
-          headerKvPair
-          kvPairs
-          kvPair
-          listOfAtom
-          lists
-          atom
-        ];
+      topLevel' = oneOf' [
+        headerKvPairs
+        headerKvPair
+        kvPairs
+        kvPair
+        listOfAtom
+        lists
+        atom
+      ];
     in
-    topLevel'
+    attrsOf' topLevel'
     // {
       description = "Kismet config stanza";
     };
@@ -239,7 +288,7 @@ in
         https://www.kismetwireless.net/docs/readme/configuring/configfiles/
       '';
       default = { };
-      type = with types; attrsOf topLevel;
+      type = topLevel;
       example = literalExpression ''
         {
           /* Examples for atoms */

From 436ca6d2f146cbb4080b5bbd0cd7dcac097b703c Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sat, 25 Oct 2025 17:29:59 -0700
Subject: [PATCH 3017/6226] tests/kismet: add nettools to environment

---
 nixos/tests/kismet.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/tests/kismet.nix b/nixos/tests/kismet.nix
index 878a341cedea..b4f2aac21184 100644
--- a/nixos/tests/kismet.nix
+++ b/nixos/tests/kismet.nix
@@ -69,7 +69,7 @@ in
         };
 
       station =
-        { config, ... }:
+        { config, pkgs, ... }:
         {
           networking.interfaces.eth1.ipv4.addresses = lib.mkForce [
             {
@@ -98,10 +98,11 @@ in
               inherit serverAddress;
             };
           };
+          environment.systemPackages = [ pkgs.nettools ];
         };
 
       monitor =
-        { config, ... }:
+        { config, pkgs, ... }:
         {
           networking.interfaces.eth1.ipv4.addresses = lib.mkForce [
             {
@@ -189,10 +190,10 @@ in
             };
           };
 
-          environment.systemPackages = with pkgs; [
+          environment.systemPackages = [
             config.services.kismet.package
             config.services.vwifi.package
-            jq
+            pkgs.jq
           ];
         };
     };

From 42060c40fd43c114af7010980168f8dcba734d3b Mon Sep 17 00:00:00 2001
From: Sefa Eyeoglu <contact@scrumplex.net>
Date: Sun, 26 Oct 2025 19:26:35 +0100
Subject: [PATCH 3018/6226] wivrn: fix build against Qt 6.10

Signed-off-by: Sefa Eyeoglu <contact@scrumplex.net>
---
 pkgs/by-name/wi/wivrn/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/wi/wivrn/package.nix b/pkgs/by-name/wi/wivrn/package.nix
index 447af13452dc..de7275675457 100644
--- a/pkgs/by-name/wi/wivrn/package.nix
+++ b/pkgs/by-name/wi/wivrn/package.nix
@@ -90,6 +90,15 @@ stdenv.mkDerivation (finalAttrs: {
     fi
   '';
 
+  patches = [
+    # See https://github.com/WiVRn/WiVRn/pull/557
+    (fetchpatch {
+      name = "wivrn-fix-qt6.10-build.patch";
+      url = "https://github.com/WiVRn/WiVRn/commit/2204fdd39682cfc052556d58fdb9404dd8ecf63f.patch?full_index=1";
+      hash = "sha256-05MLfJNCznBt6eaggUfSk1jaNDB2/eou6CfexUkIHZE=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     git

From a58e7f5991113709e34c5acea8a4fb010fe40d3a Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 26 Oct 2025 16:56:52 -0400
Subject: [PATCH 3019/6226] mpw: drop

Upstream development has moved from
https://gitlab.com/MasterPassword/MasterPassword to
https://gitlab.com/spectre.app/cli.

We package Spectre.app's CLI as `spectre-cli`.
---
 pkgs/by-name/mp/mpw/package.nix | 79 ---------------------------------
 pkgs/top-level/aliases.nix      |  1 +
 2 files changed, 1 insertion(+), 79 deletions(-)
 delete mode 100644 pkgs/by-name/mp/mpw/package.nix

diff --git a/pkgs/by-name/mp/mpw/package.nix b/pkgs/by-name/mp/mpw/package.nix
deleted file mode 100644
index 495b1384b873..000000000000
--- a/pkgs/by-name/mp/mpw/package.nix
+++ /dev/null
@@ -1,79 +0,0 @@
-{
-  lib,
-  stdenv,
-  cmake,
-  fetchFromGitLab,
-  json_c,
-  libsodium,
-  libxml2,
-  ncurses,
-}:
-
-let
-  rev = "22796663dcad81684ab24308d9db570f6781ba2c";
-
-in
-stdenv.mkDerivation rec {
-  name = "mpw-${version}-${builtins.substring 0 8 rev}";
-  version = "2.6";
-
-  src = fetchFromGitLab {
-    owner = "MasterPassword";
-    repo = "MasterPassword";
-    sha256 = "1f2vqacgbyam1mazawrfim8zwp38gnwf5v3xkkficsfnv789g6fw";
-    inherit rev;
-  };
-
-  sourceRoot = "${src.name}/platform-independent/c/cli";
-
-  postPatch = ''
-    rm build
-    substituteInPlace mpw-cli-tests \
-      --replace '/usr/bin/env bash' ${stdenv.shell} \
-      --replace ./mpw ./build/mpw
-  '';
-
-  cmakeFlags = [
-    "-Dmpw_version=${version}"
-    "-DBUILD_MPW_TESTS=ON"
-  ];
-
-  nativeBuildInputs = [ cmake ];
-
-  buildInputs = [
-    json_c
-    libxml2
-    libsodium
-    ncurses
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm755 mpw                    $out/bin/mpw
-    install -Dm644 ../mpw.completion.bash $out/share/bash-completion/completions/_mpw
-    install -Dm644 ../../../../README.md  $out/share/doc/mpw/README.md
-
-    runHook postInstall
-  '';
-
-  # Some tests are expected to fail on ARM64
-  # See: https://gitlab.com/spectre.app/cli/-/issues/27#note_962950844 (mpw is a predecessor to spectre-cli and this issue is relevant to mpw as well)
-  doCheck = !(stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64);
-
-  checkPhase = ''
-    runHook preCheck
-
-    ../mpw-cli-tests
-
-    runHook postCheck
-  '';
-
-  meta = with lib; {
-    description = "Stateless password management solution";
-    mainProgram = "mpw";
-    homepage = "https://masterpasswordapp.com/";
-    license = licenses.gpl3;
-    platforms = platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3824493cd4ee..2f22eff888bc 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1771,6 +1771,7 @@ mapAliases {
   mpdWithFeatures = lib.warnOnInstantiate "mpdWithFeatures has been replaced by mpd.override" mpd.override; # Added 2025-08-08
   mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10
   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
   mq-cli = throw "'mq-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   mrkd = throw "'mrkd' has been removed as it is unmaintained since 2021"; # Added 2024-12-21
   mrxvt = throw "'mrxvt' has been removed due to lack of maintainence upstream"; # Added 2025-09-25

From ce4921c4dcd9a05f5f0a22f107ad6009362786ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 20:59:18 +0000
Subject: [PATCH 3020/6226] yamlfmt: 0.19.0 -> 0.20.0

---
 pkgs/by-name/ya/yamlfmt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ya/yamlfmt/package.nix b/pkgs/by-name/ya/yamlfmt/package.nix
index d94724591543..fce075e3f7aa 100644
--- a/pkgs/by-name/ya/yamlfmt/package.nix
+++ b/pkgs/by-name/ya/yamlfmt/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "yamlfmt";
-  version = "0.19.0";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "yamlfmt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SIjWBXhi5uy34KySxMCTrTDdXXvtVCWWj4LhYcXq5MU=";
+    hash = "sha256-KMIkll7seKslvb4ErelpKxWg/T2P9FLYKfTyAEWlbWk=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > "$out/.git_head"

From 1a9867167dd7c954a01ef78b03cf8ca7a7d0a30d Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Sat, 5 Apr 2025 20:22:25 -0400
Subject: [PATCH 3021/6226] ci: add zizmor check and configuration

`zizmor` is a tool that uses static analysis to find potential security
issues in GitHub Actions [0]. (Yes, it's a bit absurd that GitHub
made a CI system so complicated that tools like this were created, but
I digress.)

Given our increase in GHA usage recently, I think this is a good step
towards keeping our security posture in tip-top shape. (It also keeps
with the theme of automating as many things as possible!)

The rule related to the usages of dangerous-triggers have been disabled
to avoid false-positives. Explanations about the usage of
`pull_request_target` and expectations around its usage can be found in
`.github/workflows/README.md`.

[0]: https://woodruffw.github.io/zizmor/

Co-authored-by: Thomas Gerbet <thomas@gerbet.me>
---
 .github/zizmor.yml | 12 ++++++++++++
 ci/default.nix     |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 .github/zizmor.yml

diff --git a/.github/zizmor.yml b/.github/zizmor.yml
new file mode 100644
index 000000000000..f1b71580ebca
--- /dev/null
+++ b/.github/zizmor.yml
@@ -0,0 +1,12 @@
+# This file defines the ignore rules for zizmor.
+#
+# For rules that contain a high number of false positives, prefer listing them here
+# instead of adding ignore comments. Note that zizmor cannot ignore by line-within-a-string, so
+# there are some ignore items that encompass multiple problems within one `run` block. An issue
+# tracking this is at https://github.com/woodruffw/zizmor/issues/648.
+#
+# For more info, see the documentation: https://woodruffw.github.io/zizmor/usage/#ignoring-results
+
+rules:
+  dangerous-triggers:
+    disable: true
diff --git a/ci/default.nix b/ci/default.nix
index 7b7424f4f5be..972c679a1492 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -136,6 +136,8 @@ let
             [ "--config=${config}" ];
           includes = [ "*.md" ];
         };
+
+        programs.zizmor.enable = true;
       };
       fs = pkgs.lib.fileset;
       nixFilesSrc = fs.toSource {

From ff0ee1354bbc6738e729e9ba6b97cebc901ae5a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 21:10:00 +0000
Subject: [PATCH 3022/6226] python3Packages.clarifai: 11.8.5 -> 11.9.0

---
 pkgs/development/python-modules/clarifai/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/clarifai/default.nix b/pkgs/development/python-modules/clarifai/default.nix
index df0b08508270..132a0c0fa52a 100644
--- a/pkgs/development/python-modules/clarifai/default.nix
+++ b/pkgs/development/python-modules/clarifai/default.nix
@@ -32,7 +32,7 @@
 
 buildPythonPackage rec {
   pname = "clarifai";
-  version = "11.8.5";
+  version = "11.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     owner = "Clarifai";
     repo = "clarifai-python";
     tag = version;
-    hash = "sha256-c0lCbkHOIbzgaVLyGfJ8mbgtePTpv+PbsmErI4ZuLq4=";
+    hash = "sha256-LTBAexfexeZ/Woe2GMaIArGy/ufFkgPdkstzSKCkYIU=";
   };
 
   pythonRelaxDeps = [

From 5b700e758eaa08cd8ba3850166aa6d14fdcef724 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 21:10:43 +0000
Subject: [PATCH 3023/6226] lint-staged: 16.2.5 -> 16.2.6

---
 pkgs/by-name/li/lint-staged/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix
index 0dc439ea64c9..7fd417a9886c 100644
--- a/pkgs/by-name/li/lint-staged/package.nix
+++ b/pkgs/by-name/li/lint-staged/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "lint-staged";
-  version = "16.2.5";
+  version = "16.2.6";
 
   src = fetchFromGitHub {
     owner = "okonet";
     repo = "lint-staged";
     rev = "v${version}";
-    hash = "sha256-9SsdcF294v6/PAsz/cJXsqUbloSy24HHG7z7bCKUHaw=";
+    hash = "sha256-d4DB1kVUwO9+VF90BZjSAAH3/KyjmbJ4yfXOMOX23Wc=";
   };
 
-  npmDepsHash = "sha256-/hknNGUG02jFEYfYNM/eShiNptktJcc4XGAG3klfryA=";
+  npmDepsHash = "sha256-L0X3v5Ekd8qt8A9TTtgGsnv1WV1HKcRwAiHpf5zP3oo=";
 
   dontNpmBuild = true;
 

From 31b39c8b9412c424f74f3134f1a763ce43e4c8bd Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 26 Oct 2025 18:01:00 -0300
Subject: [PATCH 3024/6226] yabause: fix build with cmake4

---
 pkgs/applications/emulators/yabause/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/emulators/yabause/default.nix b/pkgs/applications/emulators/yabause/default.nix
index 7273d9e40e39..6e4b807d7bf0 100644
--- a/pkgs/applications/emulators/yabause/default.nix
+++ b/pkgs/applications/emulators/yabause/default.nix
@@ -18,7 +18,7 @@ mkDerivation rec {
   version = "0.9.15";
 
   src = fetchurl {
-    url = "https://download.tuxfamily.org/yabause/releases/${version}/${pname}-${version}.tar.gz";
+    url = "https://web.archive.org/web/20250129091147/http://free.downloads.tuxfamily.net/yabause/releases/${version}/yabause-${version}.tar.gz";
     sha256 = "1cn2rjjb7d9pkr4g5bqz55vd4pzyb7hg94cfmixjkzzkw0zw8d23";
   };
 
@@ -47,8 +47,16 @@ mkDerivation rec {
     "-DYAB_NETWORK=ON"
     "-DYAB_OPTIMIZED_DMA=ON"
     "-DYAB_PORTS=qt"
+    "-DSH2_DYNAREC=OFF" # https://github.com/Yabause/yabause/issues/270
   ];
 
+  postPatch = ''
+    substituteInPlace {./,src/,src/runner/}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace src/{c68k,musashi}/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Open-source Sega Saturn emulator";
     mainProgram = "yabause";

From 7d0a2711b0e3db9d81f7d7a3c6c2b65825a30d19 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 26 Oct 2025 22:19:45 +0100
Subject: [PATCH 3025/6226] home-assistant-custom-components.local_luftdaten:
 drop async-timeout dependency

The dependency was undeclared and can simply be replaced with stdlib
functionality.
---
 .../local_luftdaten/async-timeout.patch       | 31 +++++++++++++++++++
 .../local_luftdaten/package.nix               |  4 +++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-components/local_luftdaten/async-timeout.patch

diff --git a/pkgs/servers/home-assistant/custom-components/local_luftdaten/async-timeout.patch b/pkgs/servers/home-assistant/custom-components/local_luftdaten/async-timeout.patch
new file mode 100644
index 000000000000..7872436b96dc
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/local_luftdaten/async-timeout.patch
@@ -0,0 +1,31 @@
+From 06a6b3ff1ae181f9972b47838569d658ba4b3d9c Mon Sep 17 00:00:00 2001
+From: Martin Weinelt <hexa@darmstadt.ccc.de>
+Date: Sat, 4 Oct 2025 14:45:02 +0200
+Subject: [PATCH] Use the python native asyncio timeout function
+
+instead of depending on the undeclared async-timeout package.
+---
+ custom_components/local_luftdaten/sensor.py | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/custom_components/local_luftdaten/sensor.py b/custom_components/local_luftdaten/sensor.py
+index 4f4f5b4..82ea041 100644
+--- a/custom_components/local_luftdaten/sensor.py
++++ b/custom_components/local_luftdaten/sensor.py
+@@ -12,7 +12,6 @@
+ import asyncio
+ from typing import Optional
+ import aiohttp
+-import async_timeout
+ import datetime
+ 
+ import json
+@@ -170,7 +169,7 @@ async def async_update(self):
+             responseData = None
+             try:
+                 _LOGGER.debug("Get data from %s", str(self._resource))
+-                with async_timeout.timeout(30):
++                async with asyncio.timeout(30):
+                     response = await self._session.get(self._resource)
+                 responseData = await response.text()
+                 _LOGGER.debug("Received data: %s", str(self.data))
diff --git a/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix b/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix
index 19c5cc3d4d0e..34139c980a59 100644
--- a/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/local_luftdaten/package.nix
@@ -16,6 +16,10 @@ buildHomeAssistantComponent rec {
     hash = "sha256-68clZgS7Qo62srcZWD3Un9BnNSwQUBr4Z5oBMTC9m8o=";
   };
 
+  # https://github.com/lichtteil/local_luftdaten/pull/70
+  # Replace undeclared async-timeout dependency with native asyncio.timeout
+  patches = [ ./async-timeout.patch ];
+
   meta = with lib; {
     changelog = "https://github.com/lichtteil/local_luftdaten/releases/tag/${version}";
     description = "Custom component for Home Assistant that integrates your (own) local Luftdaten sensor (air quality/particle sensor) without using the cloud";

From 99d206c976135c28d3c0da7e895da5be93a38347 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 21:28:54 +0000
Subject: [PATCH 3026/6226] klipper: 0.13.0-unstable-2025-09-26 ->
 0.13.0-unstable-2025-10-23

---
 pkgs/servers/klipper/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix
index acd755224619..81c297d1b898 100644
--- a/pkgs/servers/klipper/default.nix
+++ b/pkgs/servers/klipper/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "klipper";
-  version = "0.13.0-unstable-2025-09-26";
+  version = "0.13.0-unstable-2025-10-23";
 
   src = fetchFromGitHub {
     owner = "KevinOConnor";
     repo = "klipper";
-    rev = "af17c8c238ba8cdeaaabb87b25a3ca2375b47c11";
-    sha256 = "sha256-n3t58gsPXxlf2DnrofI28/0ZRC4EwnZvoFKxgxZ9vYA=";
+    rev = "6465921a5adb3a3335494598463066a6c3540cb5";
+    sha256 = "sha256-UKLJ+sf2g6BSbF+aNZ+QGcqVjFkV5GX9Sei6BCdqQL4=";
   };
 
   sourceRoot = "${src.name}/klippy";

From fe8ec962bf4243aef705ee4a10a3b5d2b03be3ff Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Wed, 22 Oct 2025 21:11:36 -0700
Subject: [PATCH 3027/6226] yubihsm-setup: init at 2.3.3

---
 .../by-name/yu/yubihsm-setup/cargo-lock.patch | 403 ++++++++++++++++++
 pkgs/by-name/yu/yubihsm-setup/package.nix     |  51 +++
 2 files changed, 454 insertions(+)
 create mode 100644 pkgs/by-name/yu/yubihsm-setup/cargo-lock.patch
 create mode 100644 pkgs/by-name/yu/yubihsm-setup/package.nix

diff --git a/pkgs/by-name/yu/yubihsm-setup/cargo-lock.patch b/pkgs/by-name/yu/yubihsm-setup/cargo-lock.patch
new file mode 100644
index 000000000000..c24c7c8888af
--- /dev/null
+++ b/pkgs/by-name/yu/yubihsm-setup/cargo-lock.patch
@@ -0,0 +1,403 @@
+From 5acf0a321cd3393d145e7b158d21f790e1e94a39 Mon Sep 17 00:00:00 2001
+From: Morgan Jones <me@numin.it>
+Date: Wed, 22 Oct 2025 21:01:34 -0700
+Subject: [PATCH] Update Cargo.lock
+
+---
+ Cargo.lock | 240 ++++++++++-------------------------------------------
+ 1 file changed, 44 insertions(+), 196 deletions(-)
+
+diff --git a/Cargo.lock b/Cargo.lock
+index 1fd1883..f555e92 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1,21 +1,12 @@
+ # This file is automatically @generated by Cargo.
+ # It is not intended for manual editing.
+-version = 3
++version = 4
+ 
+ [[package]]
+ name = "aho-corasick"
+-version = "0.6.10"
++version = "1.1.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "81ce3d38065e618af2d7b77e10c5ad9a069859b4be3c2250f674af3840d9c8a5"
+-dependencies = [
+- "memchr",
+-]
+-
+-[[package]]
+-name = "aho-corasick"
+-version = "0.7.18"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f"
++checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+ dependencies = [
+  "memchr",
+ ]
+@@ -42,9 +33,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "base64"
+-version = "0.13.0"
++version = "0.13.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd"
++checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+ 
+ [[package]]
+ name = "bitflags"
+@@ -52,12 +43,6 @@ version = "1.3.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+ 
+-[[package]]
+-name = "cfg-if"
+-version = "1.0.0"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+-
+ [[package]]
+ name = "clap"
+ version = "2.34.0"
+@@ -69,7 +54,7 @@ dependencies = [
+  "bitflags",
+  "strsim",
+  "textwrap",
+- "unicode-width",
++ "unicode-width 0.1.14",
+  "vec_map",
+ ]
+ 
+@@ -81,19 +66,13 @@ checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba"
+ 
+ [[package]]
+ name = "getopts"
+-version = "0.2.21"
++version = "0.2.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5"
++checksum = "cfe4fbac503b8d1f88e6676011885f34b7174f46e59956bba534ba83abded4df"
+ dependencies = [
+- "unicode-width",
++ "unicode-width 0.2.2",
+ ]
+ 
+-[[package]]
+-name = "heck"
+-version = "0.4.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+-
+ [[package]]
+ name = "hermit-abi"
+ version = "0.1.19"
+@@ -105,15 +84,15 @@ dependencies = [
+ 
+ [[package]]
+ name = "lazy_static"
+-version = "1.4.0"
++version = "1.5.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
++checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+ 
+ [[package]]
+ name = "libc"
+-version = "0.2.126"
++version = "0.2.177"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
++checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+ 
+ [[package]]
+ name = "libyubihsm-sys"
+@@ -124,42 +103,21 @@ dependencies = [
+ 
+ [[package]]
+ name = "log"
+-version = "0.3.9"
++version = "0.4.28"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
+-dependencies = [
+- "log 0.4.17",
+-]
+-
+-[[package]]
+-name = "log"
+-version = "0.4.17"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
+-dependencies = [
+- "cfg-if",
+-]
++checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+ 
+ [[package]]
+ name = "memchr"
+-version = "2.5.0"
++version = "2.7.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
++checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+ 
+ [[package]]
+ name = "pkg-config"
+-version = "0.3.25"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1df8c4ec4b0627e53bdf214615ad287367e482558cf84b109250b37464dc03ae"
+-
+-[[package]]
+-name = "proc-macro2"
+-version = "1.0.69"
++version = "0.3.32"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
+-dependencies = [
+- "unicode-ident",
+-]
++checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+ 
+ [[package]]
+ name = "quick-error"
+@@ -167,15 +125,6 @@ version = "1.2.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0"
+ 
+-[[package]]
+-name = "quote"
+-version = "1.0.33"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+-dependencies = [
+- "proc-macro2",
+-]
+-
+ [[package]]
+ name = "rand"
+ version = "0.3.23"
+@@ -225,54 +174,38 @@ dependencies = [
+ 
+ [[package]]
+ name = "regex"
+-version = "0.2.11"
++version = "1.12.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9329abc99e39129fcceabd24cf5d85b4671ef7c29c50e972bc5afe32438ec384"
++checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
+ dependencies = [
+- "aho-corasick 0.6.10",
++ "aho-corasick",
+  "memchr",
+- "regex-syntax 0.5.6",
+- "thread_local",
+- "utf8-ranges",
++ "regex-automata",
++ "regex-syntax",
+ ]
+ 
+ [[package]]
+-name = "regex"
+-version = "1.5.6"
++name = "regex-automata"
++version = "0.4.13"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1"
++checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+ dependencies = [
+- "aho-corasick 0.7.18",
++ "aho-corasick",
+  "memchr",
+- "regex-syntax 0.6.26",
+-]
+-
+-[[package]]
+-name = "regex-syntax"
+-version = "0.5.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7"
+-dependencies = [
+- "ucd-util",
++ "regex-syntax",
+ ]
+ 
+ [[package]]
+ name = "regex-syntax"
+-version = "0.6.26"
++version = "0.8.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
++checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
+ 
+ [[package]]
+ name = "rustc-serialize"
+-version = "0.3.24"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
+-
+-[[package]]
+-name = "rustversion"
+-version = "1.0.14"
++version = "0.3.25"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4"
++checksum = "fe834bc780604f4674073badbad26d7219cadfb4a2275802db12cbae17498401"
+ 
+ [[package]]
+ name = "rusty_secrets"
+@@ -294,114 +227,32 @@ dependencies = [
+  "quick-error",
+ ]
+ 
+-[[package]]
+-name = "serde"
+-version = "1.0.190"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "91d3c334ca1ee894a2c6f6ad698fe8c435b76d504b13d436f0685d648d6d96f7"
+-dependencies = [
+- "serde_derive",
+-]
+-
+-[[package]]
+-name = "serde_derive"
+-version = "1.0.190"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "67c5609f394e5c2bd7fc51efda478004ea80ef42fee983d5c67a65e34f32c0e3"
+-dependencies = [
+- "proc-macro2",
+- "quote",
+- "syn 2.0.38",
+-]
+-
+ [[package]]
+ name = "strsim"
+ version = "0.8.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
+ 
+-[[package]]
+-name = "strum"
+-version = "0.24.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
+-
+-[[package]]
+-name = "strum_macros"
+-version = "0.24.3"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
+-dependencies = [
+- "heck",
+- "proc-macro2",
+- "quote",
+- "rustversion",
+- "syn 1.0.109",
+-]
+-
+-[[package]]
+-name = "syn"
+-version = "1.0.109"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+-dependencies = [
+- "proc-macro2",
+- "quote",
+- "unicode-ident",
+-]
+-
+-[[package]]
+-name = "syn"
+-version = "2.0.38"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b"
+-dependencies = [
+- "proc-macro2",
+- "quote",
+- "unicode-ident",
+-]
+-
+ [[package]]
+ name = "textwrap"
+ version = "0.11.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+ dependencies = [
+- "unicode-width",
++ "unicode-width 0.1.14",
+ ]
+ 
+-[[package]]
+-name = "thread_local"
+-version = "0.3.6"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
+-dependencies = [
+- "lazy_static",
+-]
+-
+-[[package]]
+-name = "ucd-util"
+-version = "0.1.8"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c85f514e095d348c279b1e5cd76795082cf15bd59b93207832abe0b1d8fed236"
+-
+-[[package]]
+-name = "unicode-ident"
+-version = "1.0.12"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+-
+ [[package]]
+ name = "unicode-width"
+-version = "0.1.9"
++version = "0.1.14"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973"
++checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+ 
+ [[package]]
+-name = "utf8-ranges"
+-version = "1.0.5"
++name = "unicode-width"
++version = "0.2.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7fcfc827f90e53a02eaef5e535ee14266c1d569214c6aa70133a624d8a3164ba"
++checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
+ 
+ [[package]]
+ name = "vec_map"
+@@ -433,12 +284,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+ 
+ [[package]]
+ name = "yubihsm-setup"
+-version = "2.3.1"
++version = "2.3.3"
+ dependencies = [
+  "base64",
+  "clap",
+  "lazy_static",
+- "regex 1.5.6",
++ "regex",
+  "rusty_secrets",
+  "scan_dir",
+  "yubihsmrs",
+@@ -446,14 +297,11 @@ dependencies = [
+ 
+ [[package]]
+ name = "yubihsmrs"
+-version = "2.1.3"
++version = "2.1.4"
+ dependencies = [
+  "lazy_static",
+  "libyubihsm-sys",
+- "log 0.3.9",
+- "regex 0.2.11",
++ "log",
++ "regex",
+  "rustc-serialize",
+- "serde",
+- "strum",
+- "strum_macros",
+ ]
diff --git a/pkgs/by-name/yu/yubihsm-setup/package.nix b/pkgs/by-name/yu/yubihsm-setup/package.nix
new file mode 100644
index 000000000000..50fedb2c0213
--- /dev/null
+++ b/pkgs/by-name/yu/yubihsm-setup/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  fetchpatch,
+  pkg-config,
+  yubihsm-shell,
+}:
+
+rustPlatform.buildRustPackage (finalPackage: {
+  pname = "yubihsm-setup";
+  version = "2.3.3";
+
+  src = fetchFromGitHub {
+    owner = "Yubico";
+    repo = "yubihsm-setup";
+    tag = finalPackage.version;
+    hash = "sha256-ScpcEDNWLhywtcPPG84vZyIAQ5lF07udmGsmsyc3+iU=";
+  };
+
+  yubihsmrs = fetchFromGitHub {
+    owner = "Yubico";
+    repo = "yubihsmrs";
+    tag = "2.1.4";
+    hash = "sha256-MQwp2dkAkPNyclDgRhHWRHZ9y4LC+bGIeLBv8CgMGXY=";
+  };
+
+  prePatch = ''
+    ln -s $yubihsmrs yubihsmrs
+    substituteInPlace Cargo.toml --replace-fail ../yubihsmrs/ ./yubihsmrs/
+  '';
+
+  nativeBuildInputs = [ pkg-config ];
+
+  buildInputs = [ yubihsm-shell ];
+
+  # https://github.com/Yubico/yubihsm-setup/pull/20
+  cargoPatches = [ ./cargo-lock.patch ];
+
+  cargoHash = "sha256-Mk0uGNb0WGygSqocpo566sVHs13zvoFBbAevJj4OSBM=";
+
+  meta = {
+    description = "Tool to easily set up a YubiHSM device";
+    homepage = "https://github.com/Yubico/yubihsm-setup";
+    maintainers = with lib.maintainers; [
+      numinit
+    ];
+    license = lib.licenses.asl20;
+    platforms = lib.platforms.all;
+  };
+})

From cee451b649168abddd9ca03cf626be465badcece Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 26 Oct 2025 22:49:57 +0100
Subject: [PATCH 3028/6226] librenms: 25.9.1 -> 25.10.0

Fixes CVE-2025-62411 and CVE-2025-62412.
https://github.com/librenms/librenms/security/advisories/GHSA-frc6-pwgr-c28w
https://github.com/librenms/librenms/security/advisories/GHSA-6g2v-66ch-6xmh

Changes:
https://github.com/librenms/librenms/releases/tag/25.10.0
---
 pkgs/by-name/li/librenms/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix
index c0ec91adee0e..c0f33c267998 100644
--- a/pkgs/by-name/li/librenms/package.nix
+++ b/pkgs/by-name/li/librenms/package.nix
@@ -27,16 +27,16 @@ let
 in
 phpPackage.buildComposerProject2 rec {
   pname = "librenms";
-  version = "25.9.1";
+  version = "25.10.0";
 
   src = fetchFromGitHub {
     owner = "librenms";
     repo = "librenms";
     tag = version;
-    sha256 = "sha256-EDdXPhPi5gJXIMniMloLWDuW3BmajxEKJM2Tkgxn36Q=";
+    hash = "sha256-SzDSeWTnsXy274H2mkGIHOsW26EoL7aony7Xcb+e+h4=";
   };
 
-  vendorHash = "sha256-Tc4pW7UNY7Tvu0UJLifV24UW06xQSQG1W3+jkzvm0iw=";
+  vendorHash = "sha256-OYQsgwbxsXsOM+sn0mJcABtyXVQAKBa6/ghfbZR1jX4=";
 
   php = phpPackage;
 
@@ -103,7 +103,7 @@ phpPackage.buildComposerProject2 rec {
     substituteInPlace $out/LibreNMS/__init__.py --replace-fail '"/usr/bin/env", "php"' '"${phpPackage}/bin/php"'
     substituteInPlace $out/snmp-scan.py --replace-fail '"/usr/bin/env", "php"' '"${phpPackage}/bin/php"'
 
-    substituteInPlace $out/lnms --replace-fail '\App\Checks::runningUser();' '//\App\Checks::runningUser(); //removed as nix forces ownership to root'
+    substituteInPlace $out/app/Listeners/CommandStartingListener.php --replace-fail '\App\Checks::runningUser();' '//\App\Checks::runningUser(); //removed as nix forces ownership to root'
 
     wrapProgram $out/daily.sh --prefix PATH : ${phpPackage}/bin
 

From 4e00e02cb8306d5171d860ba8db5385d862926b6 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 26 Oct 2025 19:06:09 -0300
Subject: [PATCH 3029/6226] protobuf_27: fix build by pinning abseil to 202407

---
 pkgs/top-level/all-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 911fdc7cdb23..2599fcdf0939 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8342,7 +8342,10 @@ with pkgs;
         # More recent versions of abseil seem to be missing absl::if_constexpr
         abseil-cpp = abseil-cpp_202407;
       };
-      protobuf_27 = callPackage ../development/libraries/protobuf/27.nix { };
+      protobuf_27 = callPackage ../development/libraries/protobuf/27.nix {
+        # More recent versions of abseil seem to be missing absl::if_constexpr
+        abseil-cpp = abseil-cpp_202407;
+      };
       protobuf_25 = callPackage ../development/libraries/protobuf/25.nix { };
       protobuf_21 = callPackage ../development/libraries/protobuf/21.nix {
         abseil-cpp = abseil-cpp_202103;

From afed1365ffaeb7b799632c73da1788d4c84f1582 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 22 Oct 2025 04:49:36 +0100
Subject: [PATCH 3030/6226] qt6Packages.qxlsx: add fix for qt 6.10

`qxlsx` is failing to build with `nix-pkg-review`, with this error:

qxlsx> CMake Error at CMakeLists.txt:167 (target_link_libraries):
qxlsx>   Target "QXlsx" links to:
qxlsx>
qxlsx>     Qt6::GuiPrivate
qxlsx>
qxlsx>   but the target was not found.

The upstream `qxlsx` has been patched to fix this, but as a new upstream
version has not been released, this fix is not present in `nixpkgs` even
though `nixpkgs` has now bumped `qt6` to version 6.10.0 in PR 449572.

Thus, directly apply the patch made in this commit:
https://github.com/QtExcel/QXlsx/commit/90d762625750c6b2c73f6cd96b633e9158aed72e
---
 pkgs/development/libraries/qxlsx/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/libraries/qxlsx/default.nix b/pkgs/development/libraries/qxlsx/default.nix
index a9280ae76f47..59b734382ab6 100644
--- a/pkgs/development/libraries/qxlsx/default.nix
+++ b/pkgs/development/libraries/qxlsx/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   qtbase,
 }:
@@ -17,6 +18,14 @@ stdenv.mkDerivation rec {
     hash = "sha256-twOlAiLE0v7+9nWo/Gd+oiKT1umL3UnG1Xa0zDG7u7s=";
   };
 
+  patches = [
+    # Fix for Qt 6.10, can likely be removed when version bump passes v1.5.0.
+    (fetchpatch {
+      url = "https://github.com/QtExcel/QXlsx/commit/90d762625750c6b2c73f6cd96b633e9158aed72e.patch";
+      hash = "sha256-/0xLrkjuJGZRocK1EyBhuaUmg0usueQz2F340DkQhb0=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [ qtbase ];
 

From 51f85f77c0864f5a72887b929875b42384e70727 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 22:21:07 +0000
Subject: [PATCH 3031/6226] zoom-us: 6.6.0.4410 -> 6.6.5.5215

---
 pkgs/by-name/zo/zoom-us/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index 54bcc294ed12..a2c41fd90d4a 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -54,25 +54,25 @@ let
   # Zoom versions are released at different times per platform and often with different versions.
   # We write them on three lines like this (rather than using {}) so that the updater script can
   # find where to edit them.
-  versions.aarch64-darwin = "6.6.0.64511";
-  versions.x86_64-darwin = "6.6.0.64511";
+  versions.aarch64-darwin = "6.6.5.67181";
+  versions.x86_64-darwin = "6.6.5.67181";
 
   # This is the fallback version so that evaluation can produce a meaningful result.
-  versions.x86_64-linux = "6.6.0.4410";
+  versions.x86_64-linux = "6.6.5.5215";
 
   srcs = {
     aarch64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
       name = "zoomusInstallerFull.pkg";
-      hash = "sha256-2GdiJ/2K3TDF6nvVaIBVLJHgasx1e22aS4rhP30L2/o=";
+      hash = "sha256-u8jRZNtVM6QdFcrBK5BcO4yPCAMNmKUv1aGRGqdORGw=";
     };
     x86_64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
-      hash = "sha256-td0EltgpfSGlyo9Pg/4qS8qUdELP+A97iY9z3g19MW8=";
+      hash = "sha256-pKCzrW4Y9YFTS2FyLQR9WA+6oC2hdzzExpEN/VH3PnA=";
     };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
-      hash = "sha256-KTg6VO1GT/8ppXFevGDx0br9JGl9rdUtuBzHmnjiOuk=";
+      hash = "sha256-sh1PbAxLGd5zsBO6lsIJV7Z22o9A15xAdopdJZ17ZUw=";
     };
   };
 

From 5ef9cad89bffae0849d4a5d02fb704229c046a9e Mon Sep 17 00:00:00 2001
From: nat <nat@nekopon.pl>
Date: Sun, 26 Oct 2025 23:24:25 +0100
Subject: [PATCH 3032/6226] uefisettings: 0-unstable-2024-11-28 ->
 0-unstable-2025-07-29, fix updateScript

---
 pkgs/by-name/ue/uefisettings/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ue/uefisettings/package.nix b/pkgs/by-name/ue/uefisettings/package.nix
index 8461b065bead..873239cfbb22 100644
--- a/pkgs/by-name/ue/uefisettings/package.nix
+++ b/pkgs/by-name/ue/uefisettings/package.nix
@@ -1,24 +1,24 @@
 {
   fetchFromGitHub,
   lib,
+  nix-update-script,
   rustPlatform,
-  unstableGitUpdater,
 }:
 
 rustPlatform.buildRustPackage {
-  name = "uefisettings";
-  version = "0-unstable-2024-11-28";
+  pname = "uefisettings";
+  version = "0-unstable-2025-07-29";
 
   src = fetchFromGitHub {
     owner = "linuxboot";
     repo = "uefisettings";
-    rev = "f4d12fbdb32d1bc355dd37d5077add0a0a049be4";
-    hash = "sha256-f6CTmnY/BzIP/nfHa3Q4HWd1Ee+b7C767FB/8A4DUUM=";
+    rev = "149bc92970949d44be641ae1e3e942220d7390e7";
+    hash = "sha256-n6RWqNKkfighoGpQkCWB7TEQ0lLo6cwGUBLN7lv3TrA=";
   };
 
-  passthru.updateScript = unstableGitUpdater { };
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; };
 
-  cargoHash = "sha256-adCC5o17j6tuffymiLUn2SEPlrjMzYn6a74/4a9HI/w=";
+  cargoHash = "sha256-CQn5esC31hCwEqZYX8OKeyJrwIKuo7x3aAZExBEcdB4=";
 
   checkFlags = [
     # Expects filesystem access to /proc and rootfs

From 560552a983a277cfbe7058b612f97e4ea313bcdf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 22:25:56 +0000
Subject: [PATCH 3033/6226] python3Packages.dnf4: 4.23.0 -> 4.24.0

---
 pkgs/development/python-modules/dnf4/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dnf4/default.nix b/pkgs/development/python-modules/dnf4/default.nix
index 980e49b917b6..f1670daac402 100644
--- a/pkgs/development/python-modules/dnf4/default.nix
+++ b/pkgs/development/python-modules/dnf4/default.nix
@@ -18,7 +18,7 @@ in
 
 buildPythonPackage rec {
   pname = "dnf4";
-  version = "4.23.0";
+  version = "4.24.0";
   format = "other";
 
   outputs = [
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "rpm-software-management";
     repo = "dnf";
     tag = version;
-    hash = "sha256-qlOnFtEURhyxfsprhRaYUj141vZJp8qMjLpP1wGxikw=";
+    hash = "sha256-zzWOc2I9YW5gjsS2Umfx6GGgY4B3pdia0E2KHHtAH2s=";
   };
 
   patches = [ ./fix-python-install-dir.patch ];

From ae2f6f2c74092df3d0d4812e6264525e2095328f Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Sun, 26 Oct 2025 20:04:19 +0000
Subject: [PATCH 3034/6226] stellarium: fix build on qt610

---
 .../applications/science/astronomy/stellarium/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix
index e883582bdcc8..ca6a9c36fa21 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/applications/science/astronomy/stellarium/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   perl,
   wrapGAppsHook3,
@@ -37,6 +38,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-9uQ6u1+dSszmKG8eY6kSXhqsCPRGw6tulCTCrLByIxc=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/stellarium/-/raw/ab559b6e9349569278f83c2dfc83990e971a8cb2/qt-6.10.patch";
+      hash = "sha256-a7zC9IQOj93VnPy8Bj/fLe4oJux7I4Edgj5OaKI4TZU=";
+    })
+  ];
+
   postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
     substituteInPlace CMakeLists.txt \
       --replace-fail 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \

From ce0937bc1d8da74461df0c27e6bae698fa69c547 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Sun, 26 Oct 2025 22:34:16 +0000
Subject: [PATCH 3035/6226] stellarium: migrate to pkgs/by-name

---
 .../st/stellarium/package.nix}                | 36 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 14 insertions(+), 24 deletions(-)
 rename pkgs/{applications/science/astronomy/stellarium/default.nix => by-name/st/stellarium/package.nix} (87%)

diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/by-name/st/stellarium/package.nix
similarity index 87%
rename from pkgs/applications/science/astronomy/stellarium/default.nix
rename to pkgs/by-name/st/stellarium/package.nix
index ca6a9c36fa21..28b977fc7117 100644
--- a/pkgs/applications/science/astronomy/stellarium/default.nix
+++ b/pkgs/by-name/st/stellarium/package.nix
@@ -6,19 +6,11 @@
   cmake,
   perl,
   wrapGAppsHook3,
-  wrapQtAppsHook,
-  qtbase,
-  qtcharts,
-  qtpositioning,
-  qtmultimedia,
-  qtserialport,
-  qtwayland,
-  qtwebengine,
+  qt6,
+  qt6Packages,
   calcmysky,
-  qxlsx,
   indilib,
   libnova,
-  qttools,
   exiv2,
   nlopt,
   testers,
@@ -50,26 +42,26 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \
                 'SET(CMAKE_INSTALL_PREFIX "${placeholder "out"}/Applications/Stellarium.app/Contents")'
     substituteInPlace src/CMakeLists.txt \
-      --replace-fail "\''${_qt_bin_dir}/../" "${qtmultimedia}/lib/qt-6/"
+      --replace-fail "\''${_qt_bin_dir}/../" "${qt6.qtmultimedia}/lib/qt-6/"
   '';
 
   nativeBuildInputs = [
     cmake
     perl
     wrapGAppsHook3
-    wrapQtAppsHook
-    qttools
+    qt6.wrapQtAppsHook
+    qt6.qttools
   ];
 
   buildInputs = [
-    qtbase
-    qtcharts
-    qtpositioning
-    qtmultimedia
-    qtserialport
-    qtwebengine
+    qt6.qtbase
+    qt6.qtcharts
+    qt6.qtpositioning
+    qt6.qtmultimedia
+    qt6.qtserialport
+    qt6.qtwebengine
     calcmysky
-    qxlsx
+    qt6Packages.qxlsx
     indilib
     libnova
     exiv2
@@ -77,7 +69,7 @@ stdenv.mkDerivation (finalAttrs: {
     nlopt
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
-    qtwayland
+    qt6.qtwayland
   ];
 
   preConfigure = ''
@@ -88,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   # fatal error: 'QtSerialPort/QSerialPortInfo' file not found
-  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-F${qtserialport}/lib";
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.hostPlatform.isDarwin "-F${qt6.qtserialport}/lib";
 
   dontWrapGApps = true;
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 486b519307ce..bc2b17fbb49b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14232,8 +14232,6 @@ with pkgs;
 
   spyder = with python3.pkgs; toPythonApplication spyder;
 
-  stellarium = qt6Packages.callPackage ../applications/science/astronomy/stellarium { };
-
   tulip = libsForQt5.callPackage ../applications/science/misc/tulip {
     python3 = python312; # fails to build otherwise
   };

From c462b28b8c9ff045b9faa0beebd768e65868ab2a Mon Sep 17 00:00:00 2001
From: kuflierl <41301536+kuflierl@users.noreply.github.com>
Date: Sun, 26 Oct 2025 23:31:59 +0100
Subject: [PATCH 3036/6226] memos: fix update script

nix-update now requires the pname to match

Co-Authored-By: eljamm <fedi.jamoussi@protonmail.ch>
Co-Authored-By: Redlonghead <git@beardit.net>
---
 pkgs/by-name/me/memos/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix
index dfd9ea5bce99..e03386ab3af7 100644
--- a/pkgs/by-name/me/memos/package.nix
+++ b/pkgs/by-name/me/memos/package.nix
@@ -23,8 +23,8 @@ let
   };
 
   memos-protobuf-gen = stdenvNoCC.mkDerivation {
-    name = "memos-protobuf-gen";
-    inherit src;
+    pname = "memos-protobuf-gen";
+    inherit version src;
 
     nativeBuildInputs = [
       buf

From d314657d1195d6dd43a2fcbdacb77e06156c5f7c Mon Sep 17 00:00:00 2001
From: kuflierl <41301536+kuflierl@users.noreply.github.com>
Date: Sun, 26 Oct 2025 23:37:02 +0100
Subject: [PATCH 3037/6226] memos: 0.25.1 -> 0.25.2

---
 pkgs/by-name/me/memos/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix
index e03386ab3af7..e7bf782eb759 100644
--- a/pkgs/by-name/me/memos/package.nix
+++ b/pkgs/by-name/me/memos/package.nix
@@ -14,12 +14,12 @@
   protoc-gen-validate,
 }:
 let
-  version = "0.25.1";
+  version = "0.25.2";
   src = fetchFromGitHub {
     owner = "usememos";
     repo = "memos";
     rev = "v${version}";
-    hash = "sha256-5CeeOpdXs+6Vus4er8JVhJM0a7BKtGsF4SPdOoX5xQk=";
+    hash = "sha256-Yag+OxhlWEhWumnB620QREm4G99osKzQNlGN+1YBMTQ=";
   };
 
   memos-protobuf-gen = stdenvNoCC.mkDerivation {
@@ -52,7 +52,7 @@ let
 
     outputHashMode = "recursive";
     outputHashAlgo = "sha256";
-    outputHash = "sha256-BOBnNcBp/vjTaS7N1z5kRWZoKokJXEMNs5rS32ZBtKU=";
+    outputHash = "sha256-j9jBxhDi1COowOh5sDjOuVJdHf2/RSwZ0cQUD/j2jt0=";
   };
 
   memos-web = stdenvNoCC.mkDerivation (finalAttrs: {
@@ -62,7 +62,7 @@ let
       inherit (finalAttrs) pname version src;
       sourceRoot = "${finalAttrs.src.name}/web";
       fetcherVersion = 1;
-      hash = "sha256-qY3jPbdEy+lWoBV/xKNTGQ58xvcoBoG0vPwN5f9+wj4=";
+      hash = "sha256-qvxOY7ASAlYbT5Ju/8b3qiE9KgXkDIj1MZuVH0hmCOA=";
     };
     pnpmRoot = "web";
     nativeBuildInputs = [
@@ -93,7 +93,7 @@ buildGoModule {
     memos-protobuf-gen
     ;
 
-  vendorHash = "sha256-+v2OElo2ZC0OEhNsNe23J0PR0y1opm/HckW+vUmJ8e4=";
+  vendorHash = "sha256-Eihp7Kcu8AiPL2VEypxx8+8JwjHI8htoOv69xGrp560=";
 
   preBuild = ''
     rm -rf server/router/frontend/dist

From c2dc892cbd568d5b1ec9b329295cc7a3f59c8e1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 22:55:57 +0000
Subject: [PATCH 3038/6226] sscg: 3.0.8 -> 4.0.0

---
 pkgs/by-name/ss/sscg/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ss/sscg/package.nix b/pkgs/by-name/ss/sscg/package.nix
index b9c1f004d7df..5e31229127d7 100644
--- a/pkgs/by-name/ss/sscg/package.nix
+++ b/pkgs/by-name/ss/sscg/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sscg";
-  version = "3.0.8";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "sgallagher";
     repo = "sscg";
     tag = "sscg-${finalAttrs.version}";
-    hash = "sha256-vHZuBjFs7sGIMGFWyqaW0SzzDDsrszlLmLREJtjLH2g=";
+    hash = "sha256-Z/Cea9m2v+M+t69gx/Y6IGAUZ/p5ZsTA80+fvUvqvYc=";
   };
 
   nativeBuildInputs = [

From 7be48ca291d0e8e37b1a244cdb01037141b77948 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 22:58:12 +0000
Subject: [PATCH 3039/6226] steel: 0-unstable-2025-10-14 ->
 0-unstable-2025-10-24

---
 pkgs/by-name/st/steel/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/steel/package.nix b/pkgs/by-name/st/steel/package.nix
index a8c8b564d97d..22c890941c55 100644
--- a/pkgs/by-name/st/steel/package.nix
+++ b/pkgs/by-name/st/steel/package.nix
@@ -19,13 +19,13 @@
 }:
 rustPlatform.buildRustPackage {
   pname = "steel";
-  version = "0-unstable-2025-10-14";
+  version = "0-unstable-2025-10-24";
 
   src = fetchFromGitHub {
     owner = "mattwparas";
     repo = "steel";
-    rev = "c83d48f657f28017912cc3c1b604c33ab5de0a41";
-    hash = "sha256-VVrMXpJwcaUTSR6AElkc7Xu8If0/bUzKklOyo87CdLI=";
+    rev = "0b89c955668a48e8aab4344d5f7d3a44360ec73e";
+    hash = "sha256-hbjCJeWJi71mY+2oW8KOIuYppYL2YIhwImm8GFxD9O4=";
   };
 
   cargoHash = "sha256-CrmQhOfh7SQ5GvBywmYkfU6wMlgZq2x61+T+mIeQ7z4=";

From a390a7ff298d21ed40517eb5d493a75940f10912 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Sun, 26 Oct 2025 23:01:55 +0000
Subject: [PATCH 3040/6226] home-assistant-custom-components.scene_presets:
 Move to correct directory name

---
 .../{hass-scene_presets => scene_presets}/package.nix             | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename pkgs/servers/home-assistant/custom-components/{hass-scene_presets => scene_presets}/package.nix (100%)

diff --git a/pkgs/servers/home-assistant/custom-components/hass-scene_presets/package.nix b/pkgs/servers/home-assistant/custom-components/scene_presets/package.nix
similarity index 100%
rename from pkgs/servers/home-assistant/custom-components/hass-scene_presets/package.nix
rename to pkgs/servers/home-assistant/custom-components/scene_presets/package.nix

From f2c4f45972709ec33144b324707a4c5231bbd2a7 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Sun, 26 Oct 2025 23:00:52 +0000
Subject: [PATCH 3041/6226] home-assistant-custom-components.scene_presets:
 Build frontend asset

---
 .../custom-components/scene_presets/package.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/servers/home-assistant/custom-components/scene_presets/package.nix b/pkgs/servers/home-assistant/custom-components/scene_presets/package.nix
index 9fc48a0a5b5e..96a63b8ddb50 100644
--- a/pkgs/servers/home-assistant/custom-components/scene_presets/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/scene_presets/package.nix
@@ -2,7 +2,10 @@
   lib,
   fetchFromGitHub,
   buildHomeAssistantComponent,
+  fetchNpmDeps,
   nix-update-script,
+  nodejs,
+  npmHooks,
 }:
 
 buildHomeAssistantComponent rec {
@@ -17,7 +20,21 @@ buildHomeAssistantComponent rec {
     hash = "sha256-ESu7+65IeXYZLLqlkRlJA7+Ggo+X+YoWcpmMQiNzOTM=";
   };
 
+  npmDeps = fetchNpmDeps {
+    inherit src;
+    hash = "sha256-whBM/Z6ib8YNP3BgpJgU2O9ruxovUI84E5/ZbpHK26Y=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    npmHooks.npmConfigHook
+    npmHooks.npmBuildHook
+  ];
+
+  npmBuildScript = "build";
+
   postInstall = ''
+    # Create custom presets directory to satisfy Python set-up code
     mkdir -p "$out/custom_components/scene_presets/userdata/custom/assets"
   '';
 

From 7f88a8b9efaf0e08e63e3806b2b3f42fd83fde91 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 26 Oct 2025 23:51:25 +0100
Subject: [PATCH 3042/6226] buildHomeAssistantComponent: drop build phase

This change unbreaks the use of custom build hooks.
---
 .../servers/home-assistant/build-custom-component/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/servers/home-assistant/build-custom-component/default.nix b/pkgs/servers/home-assistant/build-custom-component/default.nix
index 58d1cc369bc2..9a49355b2320 100644
--- a/pkgs/servers/home-assistant/build-custom-component/default.nix
+++ b/pkgs/servers/home-assistant/build-custom-component/default.nix
@@ -22,10 +22,6 @@ home-assistant.python.pkgs.buildPythonPackage (
     pname = "${owner}/${domain}";
     inherit version format;
 
-    buildPhase = ''
-      true
-    '';
-
     installPhase = ''
       runHook preInstall
 

From c3208dd3f9ed00642720f45299951a407195389c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 26 Oct 2025 23:58:35 +0100
Subject: [PATCH 3043/6226] home-assistant-custom-components.auth-header: drop

This package has been archived since now there are two working OIDC
components for Home Assistant.
---
 .../custom-components/auth-header/package.nix | 26 -------------------
 1 file changed, 26 deletions(-)
 delete mode 100644 pkgs/servers/home-assistant/custom-components/auth-header/package.nix

diff --git a/pkgs/servers/home-assistant/custom-components/auth-header/package.nix b/pkgs/servers/home-assistant/custom-components/auth-header/package.nix
deleted file mode 100644
index cf158a2231a5..000000000000
--- a/pkgs/servers/home-assistant/custom-components/auth-header/package.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  lib,
-  buildHomeAssistantComponent,
-  fetchFromGitHub,
-}:
-
-buildHomeAssistantComponent rec {
-  owner = "BeryJu";
-  domain = "auth_header";
-  version = "1.12";
-
-  src = fetchFromGitHub {
-    inherit owner;
-    repo = "hass-auth-header";
-    tag = "v${version}";
-    hash = "sha256-BPG/G6IM95g9ip2OsPmcAebi2ZvKHUpFzV4oquOFLPM=";
-  };
-
-  meta = with lib; {
-    changelog = "https://github.com/BeryJu/hass-auth-header/releases/tag/v${version}";
-    description = "Home Assistant custom component which allows you to delegate authentication to a reverse proxy";
-    homepage = "https://github.com/BeryJu/hass-auth-header";
-    maintainers = with maintainers; [ mjm ];
-    license = licenses.gpl3;
-  };
-}

From 61e9dd04186f428fb87de3dbfee852a1180502fb Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 27 Oct 2025 00:06:51 +0100
Subject: [PATCH 3044/6226] home-assistant-custom-components.opensprinkler:
 rename from hass-opensprinkler

This matches package attribute with manifest domain.
---
 .../{hass-opensprinkler => opensprinkler}/package.nix             | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename pkgs/servers/home-assistant/custom-components/{hass-opensprinkler => opensprinkler}/package.nix (100%)

diff --git a/pkgs/servers/home-assistant/custom-components/hass-opensprinkler/package.nix b/pkgs/servers/home-assistant/custom-components/opensprinkler/package.nix
similarity index 100%
rename from pkgs/servers/home-assistant/custom-components/hass-opensprinkler/package.nix
rename to pkgs/servers/home-assistant/custom-components/opensprinkler/package.nix

From 86d96d42b77142ba1063fbbbacedd82ca010505f Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 27 Oct 2025 00:09:47 +0100
Subject: [PATCH 3045/6226] home-assistant-custom-components.ecoflow_cloud:
 rename from hassio-ecoflow-cloud

This matches package attribute with manifest domain.
---
 .../{hassio-ecoflow-cloud => ecoflow_cloud}/package.nix           | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename pkgs/servers/home-assistant/custom-components/{hassio-ecoflow-cloud => ecoflow_cloud}/package.nix (100%)

diff --git a/pkgs/servers/home-assistant/custom-components/hassio-ecoflow-cloud/package.nix b/pkgs/servers/home-assistant/custom-components/ecoflow_cloud/package.nix
similarity index 100%
rename from pkgs/servers/home-assistant/custom-components/hassio-ecoflow-cloud/package.nix
rename to pkgs/servers/home-assistant/custom-components/ecoflow_cloud/package.nix

From 441028ed560c79ffd1e0142f2a22b83a74f24258 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 23:12:00 +0000
Subject: [PATCH 3046/6226] python3Packages.python-snoo: 0.9.0 -> 0.10.0

---
 pkgs/development/python-modules/python-snoo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-snoo/default.nix b/pkgs/development/python-modules/python-snoo/default.nix
index 05239538a597..044b5491edab 100644
--- a/pkgs/development/python-modules/python-snoo/default.nix
+++ b/pkgs/development/python-modules/python-snoo/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "python-snoo";
-  version = "0.9.0";
+  version = "0.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Lash-L";
     repo = "python-snoo";
     tag = "v${version}";
-    hash = "sha256-HLX8eVhAZbydZNbBAwi7F4qloZImPZlts4CDyFLIeGE=";
+    hash = "sha256-p0cKIDdSQwryagvHGjydSTR4O5lAPO7UMhw+tSIxZrY=";
   };
 
   postPatch = ''

From 7bff6223a9bce201d89550e06d2105ab1542dcac Mon Sep 17 00:00:00 2001
From: Petr Portnov <mrjarviscraft@gmail.com>
Date: Mon, 27 Oct 2025 02:13:10 +0300
Subject: [PATCH 3047/6226] chatzone-desktop: 5.4.1 -> 5.5.0

---
 pkgs/by-name/ch/chatzone-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chatzone-desktop/package.nix b/pkgs/by-name/ch/chatzone-desktop/package.nix
index 8937af5b3287..f589409a1c01 100644
--- a/pkgs/by-name/ch/chatzone-desktop/package.nix
+++ b/pkgs/by-name/ch/chatzone-desktop/package.nix
@@ -10,10 +10,10 @@
 
 let
   pname = "chatzone-desktop";
-  version = "5.4.1";
+  version = "5.5.0";
   src = fetchurl {
-    url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.4.1/872/chatzone-desktop-linux-5.4.1.AppImage";
-    hash = "sha256-ONr8rIP7oXtafACkW4fDHfYew83F4R8un+hGdVI75iA=";
+    url = "https://cdn1.ozone.ru/s3/chatzone-clients/ci/5.5.0/925/chatzone-desktop-linux-5.5.0.AppImage";
+    hash = "sha256-2Ly0qABTqleqH0AoAIJ+JNYFyoikxZroiFrYwSxBtdw=";
   };
   appimageContents = appimageTools.extract { inherit pname version src; };
 in

From 3a7f0d28b007bb374c485cc990a96f6ab1575946 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Mon, 27 Oct 2025 00:09:04 +0100
Subject: [PATCH 3048/6226] olivetin: 2025.7.29 -> 2025.10.24

Changelog: https://github.com/OliveTin/OliveTin/releases/tag/2025.10.24
Diff: https://github.com/OliveTin/OliveTin/compare/2025.7.29...2025.10.24
---
 pkgs/by-name/ol/olivetin/package.nix | 4 ++--
 pkgs/by-name/ol/olivetin/update.sh   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ol/olivetin/package.nix b/pkgs/by-name/ol/olivetin/package.nix
index 3d37a3f8e8ed..5b07c1029b34 100644
--- a/pkgs/by-name/ol/olivetin/package.nix
+++ b/pkgs/by-name/ol/olivetin/package.nix
@@ -86,13 +86,13 @@ buildGoModule (
 
   {
     pname = "olivetin";
-    version = "2025.7.29";
+    version = "2025.10.24";
 
     src = fetchFromGitHub {
       owner = "OliveTin";
       repo = "OliveTin";
       tag = finalAttrs.version;
-      hash = "sha256-QNwPc+qr26S2hl4deLVx58Xh9hkSfZyrxrdaO1NCTDc=";
+      hash = "sha256-JarySndKRjyY2zu8QAntx9xr4vnK7/fp/zz5ibOB+ok=";
     };
 
     modRoot = "service";
diff --git a/pkgs/by-name/ol/olivetin/update.sh b/pkgs/by-name/ol/olivetin/update.sh
index 88436b64bb58..72c12040457f 100755
--- a/pkgs/by-name/ol/olivetin/update.sh
+++ b/pkgs/by-name/ol/olivetin/update.sh
@@ -3,7 +3,7 @@
 
 set -euo pipefail
 
-nix-update olivetin --src-only
+nix-update olivetin --src-only --version-regex '^(2\d+\.\d+\.\d+)$'
 update-source-version olivetin --source-key=gen --ignore-same-version
 update-source-version olivetin --source-key=webui.npmDeps --ignore-same-version
 update-source-version olivetin --source-key=goModules --ignore-same-version

From 97611f2087a7dbdd1daed94f2b4f0e2b584ca470 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 27 Oct 2025 00:18:10 +0100
Subject: [PATCH 3049/6226] python3Packages.benqprojector: 0.1.8 -> 0.1.9

https://github.com/rrooggiieerr/benqprojector.py/releases/tag/0.1.9
---
 pkgs/development/python-modules/benqprojector/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/benqprojector/default.nix b/pkgs/development/python-modules/benqprojector/default.nix
index 9097b9312db7..d923e31a0d5c 100644
--- a/pkgs/development/python-modules/benqprojector/default.nix
+++ b/pkgs/development/python-modules/benqprojector/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "benqprojector";
-  version = "0.1.8";
+  version = "0.1.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rrooggiieerr";
     repo = "benqprojector.py";
     tag = version;
-    hash = "sha256-BttaLpjiybjeoJhOXfo6Qlox4bRqf9auvNg/wtm9gMQ=";
+    hash = "sha256-oG6djfmBnZyb4YpB6zqzHlcmQx+l+LF5xwCdf/NOb1Q=";
   };
 
   build-system = [

From 68735fa397153e3c60d5a512cb48c65fa01b2287 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 27 Oct 2025 00:18:30 +0100
Subject: [PATCH 3050/6226] home-assistant-custom-components.benqprojector:
 0.1.3 -> 0.1.4

https://github.com/rrooggiieerr/homeassistant-benqprojector/releases/tag/0.1.4
---
 .../custom-components/benqprojector/package.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/benqprojector/package.nix b/pkgs/servers/home-assistant/custom-components/benqprojector/package.nix
index 2ae968131d14..380d18832233 100644
--- a/pkgs/servers/home-assistant/custom-components/benqprojector/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/benqprojector/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "rrooggiieerr";
   domain = "benqprojector";
-  version = "0.1.3";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "homeassistant-benqprojector";
     tag = version;
-    hash = "sha256-iAFmXL10QqudECsS9u9w7KBETzu9aWCg1EBbFR1ff+o=";
+    hash = "sha256-BiAqEVZSbroxw46thsU1psjP9JEEZaGRLWgpT/lQTHI=";
   };
 
   dependencies = [ benqprojector ];

From 1deba7997bfb809096ed3825a9538a98b57f01f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 23:45:57 +0000
Subject: [PATCH 3051/6226] starlark: 0-unstable-2025-09-06 ->
 0-unstable-2025-10-24

---
 pkgs/by-name/st/starlark/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/starlark/package.nix b/pkgs/by-name/st/starlark/package.nix
index 6ce52ceafc6a..4effde335c3c 100644
--- a/pkgs/by-name/st/starlark/package.nix
+++ b/pkgs/by-name/st/starlark/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule {
   pname = "starlark";
-  version = "0-unstable-2025-09-06";
+  version = "0-unstable-2025-10-24";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "starlark-go";
-    rev = "bf296ed553ea1715656054a7f64ac6a6dd161360";
-    hash = "sha256-ijZvmR9oFsIvpindO1RSi01USr2bhBATvVEQtYlgP/A=";
+    rev = "6d2315cd1916ff6bc9ab3d6b3415e29da31df64d";
+    hash = "sha256-GAxcKJHrvTPK2IvK3AEhNvYcFZw7mkaubXNiFnsiqDo=";
   };
 
   vendorHash = "sha256-8drlCBy+KROyqXzm/c+HBe/bMVOyvwRoLHxOApJhMfo=";

From 3d1883b693f41fcc02f2bc85460399c503e5bc38 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 26 Oct 2025 23:45:58 +0000
Subject: [PATCH 3052/6226] python3Packages.pylint-odoo: 9.3.21 -> 9.3.22

---
 pkgs/development/python-modules/pylint-odoo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pylint-odoo/default.nix b/pkgs/development/python-modules/pylint-odoo/default.nix
index c9a6d80ed969..6e67fa12b5ea 100644
--- a/pkgs/development/python-modules/pylint-odoo/default.nix
+++ b/pkgs/development/python-modules/pylint-odoo/default.nix
@@ -8,14 +8,14 @@
 }:
 buildPythonPackage rec {
   pname = "pylint-odoo";
-  version = "9.3.21";
+  version = "9.3.22";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "OCA";
     repo = "pylint-odoo";
     tag = "v${version}";
-    hash = "sha256-qNZHk8bl1mxaLzS55oV29iKGDfIKumQgME1V9PIx4vQ=";
+    hash = "sha256-qSeDnfZCdEtXAXeAJ+mEbDH5Fbxj9ghiucwlz1mIMnI=";
   };
 
   pythonRelaxDeps = [

From b0284bb2f958cc0e8ac829c483ae29993fdc49cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 00:00:04 +0000
Subject: [PATCH 3053/6226] copilot-language-server: 1.385.0 -> 1.388.0

---
 pkgs/by-name/co/copilot-language-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix
index 08a6f855d874..70e6e4ab0cf3 100644
--- a/pkgs/by-name/co/copilot-language-server/package.nix
+++ b/pkgs/by-name/co/copilot-language-server/package.nix
@@ -10,11 +10,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "copilot-language-server";
-  version = "1.385.0";
+  version = "1.388.0";
 
   src = fetchzip {
     url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
-    hash = "sha256-AzMLicQHP3r8RZIkf/jqlU2n78bliLwam9t1DUgqvzw=";
+    hash = "sha256-qFFLDy1/4w5Qlp3wcWlISoBMYVNHCsVLW27JBuoCcMk=";
     stripRoot = false;
   };
 

From 25b4acf2eacda5546ab89394aa8b877ac52a8538 Mon Sep 17 00:00:00 2001
From: Daniel Fahey <daniel.fahey@pm.me>
Date: Mon, 20 Oct 2025 09:39:53 +0100
Subject: [PATCH 3054/6226] python3Packages.affinegap: init at 1.12

---
 .../python-modules/affinegap/default.nix      | 50 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/affinegap/default.nix

diff --git a/pkgs/development/python-modules/affinegap/default.nix b/pkgs/development/python-modules/affinegap/default.nix
new file mode 100644
index 000000000000..6d315b347729
--- /dev/null
+++ b/pkgs/development/python-modules/affinegap/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  cython,
+  setuptools,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "affinegap";
+  version = "1.12";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dedupeio";
+    repo = "affinegap";
+    tag = "v${version}";
+    hash = "sha256-9eX41eoME5Vdtq+c04eQbMYnViy6QKOhKkafrkeMylI=";
+  };
+
+  build-system = [
+    cython
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  # Prevent importing from source during test collection (only $out has compiled extensions)
+  preCheck = ''
+    rm -rf affinegap
+  '';
+
+  pythonImportsCheck = [
+    "affinegap"
+  ];
+
+  meta = {
+    description = "Cython implementation of the affine gap string distance";
+    homepage = "https://github.com/dedupeio/affinegap";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ daniel-fahey ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 99a8ce5fcd78..23224850d8a5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -124,6 +124,8 @@ self: super: with self; {
 
   affine-gaps = callPackage ../development/python-modules/affine-gaps { };
 
+  affinegap = callPackage ../development/python-modules/affinegap { };
+
   afsapi = callPackage ../development/python-modules/afsapi { };
 
   agate = callPackage ../development/python-modules/agate { };

From 0d1deaa35fdf15527790c1fc0b239b2c70933f34 Mon Sep 17 00:00:00 2001
From: Daniel Fahey <daniel.fahey@pm.me>
Date: Mon, 20 Oct 2025 09:40:23 +0100
Subject: [PATCH 3055/6226] python3Packages.categorical-distance: init at
 1.9-unstable-2020-03-31

---
 .../categorical-distance/default.nix          | 53 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/development/python-modules/categorical-distance/default.nix

diff --git a/pkgs/development/python-modules/categorical-distance/default.nix b/pkgs/development/python-modules/categorical-distance/default.nix
new file mode 100644
index 000000000000..451474d2f848
--- /dev/null
+++ b/pkgs/development/python-modules/categorical-distance/default.nix
@@ -0,0 +1,53 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  unstableGitUpdater,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  numpy,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage {
+  pname = "categorical-distance";
+  version = "1.9-unstable-2020-03-31";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dedupeio";
+    repo = "categorical-distance";
+    rev = "07d079fd412ccf06cdb200b3cd2cfa4b67f78722";
+    hash = "sha256-zSjSrlFiRus/T2XZdakLQpF1u/LV0VNWwrc8lhss6kU=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    numpy
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "categorical"
+  ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Compare similarity of categorical variables using Jaccard index";
+    homepage = "https://github.com/dedupeio/categorical-distance";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ daniel-fahey ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 23224850d8a5..8f81677a7725 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2397,6 +2397,8 @@ self: super: with self; {
     };
   };
 
+  categorical-distance = callPackage ../development/python-modules/categorical-distance { };
+
   catkin-pkg = callPackage ../development/python-modules/catkin-pkg { };
 
   catppuccin = callPackage ../development/python-modules/catppuccin { };

From d3edbad75fba40eb8e7dadc375ddcb8343de29c9 Mon Sep 17 00:00:00 2001
From: Daniel Fahey <daniel.fahey@pm.me>
Date: Mon, 20 Oct 2025 09:41:17 +0100
Subject: [PATCH 3056/6226] python3Packages.dedupe-levenshtein-search: init at
 1.4.5

---
 .../dedupe-levenshtein-search/default.nix     | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/dedupe-levenshtein-search/default.nix

diff --git a/pkgs/development/python-modules/dedupe-levenshtein-search/default.nix b/pkgs/development/python-modules/dedupe-levenshtein-search/default.nix
new file mode 100644
index 000000000000..40527a894cd4
--- /dev/null
+++ b/pkgs/development/python-modules/dedupe-levenshtein-search/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "dedupe-levenshtein-search";
+  version = "1.4.5";
+  pyproject = true;
+
+  # NOTE: This is a fork of mattandahalfew/Levenshtein_search created for MIT licensing.
+  # TODO: Evaluate if upstream version could be used instead.
+  src = fetchFromGitHub {
+    owner = "dedupeio";
+    repo = "Levenshtein_search";
+    tag = "v${version}";
+    hash = "sha256-YhsZA28H4OUkQEBtJ+9OXJld4Z/PJbOPqAQQ9qaXSjk=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "Levenshtein_search"
+  ];
+
+  meta = {
+    description = "Search through documents for approximately matching strings using Levenshtein distance";
+    homepage = "https://github.com/dedupeio/Levenshtein_search";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ daniel-fahey ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8f81677a7725..5c331334d060 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3536,6 +3536,8 @@ self: super: with self; {
 
   decorator = callPackage ../development/python-modules/decorator { };
 
+  dedupe-levenshtein-search = callPackage ../development/python-modules/dedupe-levenshtein-search { };
+
   deebot-client = callPackage ../development/python-modules/deebot-client { };
 
   deemix = callPackage ../development/python-modules/deemix { };

From 2ba14e65cb413e739768b17e30c8687aa39c266b Mon Sep 17 00:00:00 2001
From: Daniel Fahey <daniel.fahey@pm.me>
Date: Mon, 20 Oct 2025 09:42:16 +0100
Subject: [PATCH 3057/6226] python3Packages.pyhacrf-datamade: init at
 0.2.8-unstable-2025-05-16

---
 .../pyhacrf-datamade/default.nix              | 71 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyhacrf-datamade/default.nix

diff --git a/pkgs/development/python-modules/pyhacrf-datamade/default.nix b/pkgs/development/python-modules/pyhacrf-datamade/default.nix
new file mode 100644
index 000000000000..db850e5809ff
--- /dev/null
+++ b/pkgs/development/python-modules/pyhacrf-datamade/default.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  unstableGitUpdater,
+
+  # build-system
+  cython,
+  numpy,
+  setuptools,
+
+  # dependencies
+  dedupe-pylbfgs,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage {
+  pname = "pyhacrf-datamade";
+  # Tagged release requested upstream in https://github.com/dedupeio/pyhacrf/issues/57
+  version = "0.2.8-unstable-2025-05-16";
+  pyproject = true;
+
+  # NOTE: This is a fork of dirko/pyhacrf maintained by dedupeio
+  src = fetchFromGitHub {
+    owner = "dedupeio";
+    repo = "pyhacrf";
+    rev = "899aa6c2c48e5afe8fb40727ffd6070e4ba71c31";
+    hash = "sha256-MVkOChDblu7A/ve51SYqO7lNoTXwh37bHjnZd+NvzK0=";
+  };
+
+  build-system = [
+    cython
+    numpy
+    setuptools
+  ];
+
+  dependencies = [
+    dedupe-pylbfgs
+    numpy
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  # Change to temp directory so pytest imports from installed package in $out, not source
+  preCheck = ''
+    export TEST_DIR=$(mktemp -d)
+    cp -r pyhacrf/tests $TEST_DIR/
+    pushd $TEST_DIR
+  '';
+
+  postCheck = ''
+    popd
+  '';
+
+  pythonImportsCheck = [
+    "pyhacrf"
+  ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Hidden alignment conditional random field for classifying string pairs";
+    homepage = "https://github.com/dedupeio/pyhacrf";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ daniel-fahey ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5c331334d060..f568dda5a799 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13187,6 +13187,8 @@ self: super: with self; {
 
   pygtrie = callPackage ../development/python-modules/pygtrie { };
 
+  pyhacrf-datamade = callPackage ../development/python-modules/pyhacrf-datamade { };
+
   pyhamcrest = callPackage ../development/python-modules/pyhamcrest { };
 
   pyhanko = callPackage ../development/python-modules/pyhanko { };

From a21f05cdb18db9b048c8bcbefb3b8f784d884c56 Mon Sep 17 00:00:00 2001
From: Daniel Fahey <daniel.fahey@pm.me>
Date: Mon, 20 Oct 2025 09:43:41 +0100
Subject: [PATCH 3058/6226] python3Packages.dedupe-pylbfgs: init at 0.2.0.16

---
 .../python-modules/dedupe-pylbfgs/default.nix | 59 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/development/python-modules/dedupe-pylbfgs/default.nix

diff --git a/pkgs/development/python-modules/dedupe-pylbfgs/default.nix b/pkgs/development/python-modules/dedupe-pylbfgs/default.nix
new file mode 100644
index 000000000000..83b031473cd9
--- /dev/null
+++ b/pkgs/development/python-modules/dedupe-pylbfgs/default.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  cython,
+  numpy,
+  setuptools,
+
+  # tests
+  pytest-cov-stub,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "dedupe-pylbfgs";
+  version = "0.2.0.16";
+  pyproject = true;
+
+  # NOTE: This is a fork of larsmans/pylbfgs maintained by dedupeio
+  src = fetchFromGitHub {
+    owner = "dedupeio";
+    repo = "pylbfgs";
+    tag = "${version}";
+    hash = "sha256-H416dgZQxyqsnhmlK5keW8cJWY6gea4mebVuP0IEVOU=";
+  };
+
+  build-system = [
+    cython
+    numpy
+    setuptools
+  ];
+
+  dependencies = [
+    numpy
+  ];
+
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  # Prevent importing from source during test collection (only $out has compiled extensions)
+  preCheck = ''
+    rm -rf lbfgs
+  '';
+
+  pythonImportsCheck = [
+    "lbfgs"
+  ];
+
+  meta = {
+    description = "Python wrapper for L-BFGS and OWL-QN optimization algorithms";
+    homepage = "https://github.com/dedupeio/pylbfgs";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ daniel-fahey ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f568dda5a799..b50cb59036bd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3538,6 +3538,8 @@ self: super: with self; {
 
   dedupe-levenshtein-search = callPackage ../development/python-modules/dedupe-levenshtein-search { };
 
+  dedupe-pylbfgs = callPackage ../development/python-modules/dedupe-pylbfgs { };
+
   deebot-client = callPackage ../development/python-modules/deebot-client { };
 
   deemix = callPackage ../development/python-modules/deemix { };

From 1e34678aa1b3f8f9e58a8a42fb30b1c4bfdd27e6 Mon Sep 17 00:00:00 2001
From: Daniel Fahey <daniel.fahey@pm.me>
Date: Mon, 20 Oct 2025 09:44:17 +0100
Subject: [PATCH 3059/6226] python3Packages.doublemetaphone: init at 1.2i

---
 .../doublemetaphone/default.nix               | 50 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/doublemetaphone/default.nix

diff --git a/pkgs/development/python-modules/doublemetaphone/default.nix b/pkgs/development/python-modules/doublemetaphone/default.nix
new file mode 100644
index 000000000000..a5fe45fea786
--- /dev/null
+++ b/pkgs/development/python-modules/doublemetaphone/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  cython,
+  setuptools,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "doublemetaphone";
+  version = "1.2i";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dedupeio";
+    repo = "doublemetaphone";
+    tag = "v${version}";
+    hash = "sha256-VPJqHxQHLiLSko+aJYTIgISluHPARgQN5pYWYxP9QKQ=";
+  };
+
+  build-system = [
+    cython
+    setuptools
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  # Prevent importing from source during test collection (only $out has compiled extensions)
+  preCheck = ''
+    rm -rf doublemetaphone
+  '';
+
+  pythonImportsCheck = [
+    "doublemetaphone"
+  ];
+
+  meta = {
+    description = "Python wrapper for Double Metaphone phonetic encoding algorithm";
+    homepage = "https://github.com/dedupeio/doublemetaphone";
+    license = lib.licenses.artistic1;
+    maintainers = with lib.maintainers; [ daniel-fahey ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b50cb59036bd..51b4db69a23e 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4377,6 +4377,8 @@ self: super: with self; {
 
   dotwiz = callPackage ../development/python-modules/dotwiz { };
 
+  doublemetaphone = callPackage ../development/python-modules/doublemetaphone { };
+
   doubleratchet = callPackage ../development/python-modules/doubleratchet { };
 
   doubles = callPackage ../development/python-modules/doubles { };

From 2b85955dd123ed564d9e0f0f7f693dcaad305619 Mon Sep 17 00:00:00 2001
From: Daniel Fahey <daniel.fahey@pm.me>
Date: Mon, 20 Oct 2025 09:44:45 +0100
Subject: [PATCH 3060/6226] python3Packages.highered: init at
 0.2.1-unstable-2020-03-31

---
 .../python-modules/highered/default.nix       | 58 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/development/python-modules/highered/default.nix

diff --git a/pkgs/development/python-modules/highered/default.nix b/pkgs/development/python-modules/highered/default.nix
new file mode 100644
index 000000000000..b9025a0c4c67
--- /dev/null
+++ b/pkgs/development/python-modules/highered/default.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  unstableGitUpdater,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  pyhacrf-datamade,
+  numpy,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage {
+  pname = "highered";
+  version = "0.2.1-unstable-2020-03-31";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dedupeio";
+    repo = "highered";
+    rev = "5e6e505e182ff91b1620535a491ad4a3d98ef71e";
+    hash = "sha256-sDOAB0QabJ/WJYSIZ31J12kSDQADQUilE2SmGPjXmZo=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    pyhacrf-datamade
+    numpy
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  # No tests in repository
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "highered"
+  ];
+
+  passthru.updateScript = unstableGitUpdater { };
+
+  meta = {
+    description = "Learnable edit distance using CRF (Conditional Random Fields)";
+    homepage = "https://github.com/dedupeio/highered";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ daniel-fahey ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 51b4db69a23e..5a14083c93e6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6658,6 +6658,8 @@ self: super: with self; {
 
   highdicom = callPackage ../development/python-modules/highdicom { };
 
+  highered = callPackage ../development/python-modules/highered { };
+
   highspy = callPackage ../development/python-modules/highspy { };
 
   hightime = callPackage ../development/python-modules/hightime { };

From 5ad8a6252cc43adb82e9dd6fa5c43f42463924ea Mon Sep 17 00:00:00 2001
From: Daniel Fahey <daniel.fahey@pm.me>
Date: Mon, 20 Oct 2025 09:45:21 +0100
Subject: [PATCH 3061/6226] python3Packages.simplecosine: init at 1.2

---
 .../python-modules/simplecosine/default.nix   | 50 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/simplecosine/default.nix

diff --git a/pkgs/development/python-modules/simplecosine/default.nix b/pkgs/development/python-modules/simplecosine/default.nix
new file mode 100644
index 000000000000..0709c1325387
--- /dev/null
+++ b/pkgs/development/python-modules/simplecosine/default.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  numpy,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "simplecosine";
+  version = "1.2";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dedupeio";
+    repo = "simplecosine";
+    tag = "v${version}";
+    hash = "sha256-TNQnSbCh7o5JsxvfljRGSNwptwpLHmVw9gyk0TELDek=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    numpy
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "simplecosine"
+  ];
+
+  meta = {
+    description = "Simple cosine distance calculation for string comparison";
+    homepage = "https://github.com/dedupeio/simplecosine";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ daniel-fahey ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5a14083c93e6..1c5af03f62f4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16852,6 +16852,8 @@ self: super: with self; {
 
   simplebayes = callPackage ../development/python-modules/simplebayes { };
 
+  simplecosine = callPackage ../development/python-modules/simplecosine { };
+
   simpleeval = callPackage ../development/python-modules/simpleeval { };
 
   simplefin4py = callPackage ../development/python-modules/simplefin4py { };

From e36a5b759d897e5a210b3663d5f941ec2a90c146 Mon Sep 17 00:00:00 2001
From: Daniel Fahey <daniel.fahey@pm.me>
Date: Mon, 20 Oct 2025 09:45:49 +0100
Subject: [PATCH 3062/6226] python3Packages.zope-index: init at 8.0

---
 .../python-modules/zope-index/default.nix     | 64 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 66 insertions(+)
 create mode 100644 pkgs/development/python-modules/zope-index/default.nix

diff --git a/pkgs/development/python-modules/zope-index/default.nix b/pkgs/development/python-modules/zope-index/default.nix
new file mode 100644
index 000000000000..93c2cf8d90ff
--- /dev/null
+++ b/pkgs/development/python-modules/zope-index/default.nix
@@ -0,0 +1,64 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  btrees,
+  persistent,
+  zope-interface,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "zope-index";
+  version = "8.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "zopefoundation";
+    repo = "zope.index";
+    tag = "${version}";
+    hash = "sha256-dHapd/+pJh6qzVx9FGSMmPsGbz8NhAoPqufXm3FOuM8=";
+  };
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "setuptools ==" "setuptools >="
+  '';
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    btrees
+    persistent
+    zope-interface
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "zope.index"
+  ];
+
+  pythonNamespaces = [
+    "zope"
+  ];
+
+  meta = {
+    description = "Full-text indexing and searching for Zope";
+    homepage = "https://github.com/zopefoundation/zope.index";
+    changelog = "https://github.com/zopefoundation/zope.index/blob/${version}/CHANGES.rst";
+    license = lib.licenses.zpl21;
+    maintainers = with lib.maintainers; [ daniel-fahey ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1c5af03f62f4..08b687547a6d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20660,6 +20660,8 @@ self: super: with self; {
 
   zope-i18nmessageid = callPackage ../development/python-modules/zope-i18nmessageid { };
 
+  zope-index = callPackage ../development/python-modules/zope-index { };
+
   zope-interface = callPackage ../development/python-modules/zope-interface { };
 
   zope-lifecycleevent = callPackage ../development/python-modules/zope-lifecycleevent { };

From b77e8364f49d42d2469de43ac08a0cf0bee30a9b Mon Sep 17 00:00:00 2001
From: Daniel Fahey <daniel.fahey@pm.me>
Date: Mon, 20 Oct 2025 09:46:20 +0100
Subject: [PATCH 3063/6226] python3Packages.dedupe: init at 3.0.3

---
 .../python-modules/dedupe/default.nix         | 106 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 2 files changed, 108 insertions(+)
 create mode 100644 pkgs/development/python-modules/dedupe/default.nix

diff --git a/pkgs/development/python-modules/dedupe/default.nix b/pkgs/development/python-modules/dedupe/default.nix
new file mode 100644
index 000000000000..fd8f38f70d4b
--- /dev/null
+++ b/pkgs/development/python-modules/dedupe/default.nix
@@ -0,0 +1,106 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  cython,
+  setuptools,
+
+  # dependencies
+  affinegap,
+  btrees,
+  categorical-distance,
+  dedupe-levenshtein-search,
+  doublemetaphone,
+  haversine,
+  highered,
+  numpy,
+  scikit-learn,
+  simplecosine,
+  zope-index,
+  dedupe,
+
+  # tests
+  pytest-cov-stub,
+  pytestCheckHook,
+  python,
+  runCommand,
+}:
+
+buildPythonPackage rec {
+  pname = "dedupe";
+  version = "3.0.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "dedupeio";
+    repo = "dedupe";
+    tag = "v${version}";
+    hash = "sha256-tfBJeaeZw5w5OwM+AOfy9H6P2zbShjN/kuzEbpxATHI=";
+  };
+
+  build-system = [
+    cython
+    setuptools
+  ];
+
+  dependencies = [
+    affinegap
+    btrees
+    categorical-distance
+    dedupe-levenshtein-search
+    doublemetaphone
+    haversine
+    highered
+    numpy
+    scikit-learn
+    simplecosine
+    zope-index
+  ];
+
+  nativeCheckInputs = [
+    pytest-cov-stub
+    pytestCheckHook
+  ];
+
+  # Remove source directory so pytest imports compiled extension from $out
+  preCheck = ''
+    rm -rf dedupe
+  '';
+
+  pythonImportsCheck = [
+    "dedupe"
+  ];
+
+  passthru.tests.benchmarks =
+    runCommand "dedupe-benchmarks-test"
+      {
+        nativeBuildInputs = [ (python.withPackages (ps: [ dedupe ])) ];
+      }
+      ''
+        # Copy benchmarks to writable location
+        cp -r ${src}/benchmarks benchmarks
+        chmod -R +w benchmarks
+        cd benchmarks
+
+        # Run all three canonical benchmarks
+        for benchmark in canonical canonical_gazetteer canonical_matching; do
+          echo "Running $benchmark benchmark..."
+          # Redirect stderr to /dev/null (`2>/dev/null`) to suppress Python 3.13
+          # multiprocessing resource tracker warnings from scikit-learn/joblib subprocesses
+          # `|| exit 1` provides fail-fast behavior: exit immediately if any benchmark fails
+          PYTHONPATH=$PWD python -m benchmarks.$benchmark 2>/dev/null || exit 1
+        done
+
+        touch $out
+      '';
+
+  meta = {
+    description = "Library for accurate and scalable fuzzy matching, deduplication and entity resolution";
+    homepage = "https://github.com/dedupeio/dedupe";
+    changelog = "https://github.com/dedupeio/dedupe/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ daniel-fahey ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 08b687547a6d..67eba7d8c0ec 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3536,6 +3536,8 @@ self: super: with self; {
 
   decorator = callPackage ../development/python-modules/decorator { };
 
+  dedupe = callPackage ../development/python-modules/dedupe { };
+
   dedupe-levenshtein-search = callPackage ../development/python-modules/dedupe-levenshtein-search { };
 
   dedupe-pylbfgs = callPackage ../development/python-modules/dedupe-pylbfgs { };

From ab6b71be3ae15e011b3ee51637279de2e8cf449b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 00:13:16 +0000
Subject: [PATCH 3064/6226] filebeat8: 8.19.5 -> 8.19.6

---
 pkgs/by-name/fi/filebeat8/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix
index 7049466c32a5..6d427f5ceca7 100644
--- a/pkgs/by-name/fi/filebeat8/package.nix
+++ b/pkgs/by-name/fi/filebeat8/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule rec {
   pname = "filebeat";
-  version = "8.19.5";
+  version = "8.19.6";
 
   src = fetchFromGitHub {
     owner = "elastic";
     repo = "beats";
     tag = "v${version}";
-    hash = "sha256-0s0ZGVEPl8NsNj6uWDXsTn0COwexmNNTPt85dk2Xi80=";
+    hash = "sha256-bqgO+dj0EXjEPZKmC31MiPtcgwnitkb0GKuDlqJJw+I=";
   };
 
   proxyVendor = true; # darwin/linux hash mismatch
 
-  vendorHash = "sha256-dr7jtXx5+51JOvLgasNWdjwaPaOMKBWSHiGYZBOAuMs=";
+  vendorHash = "sha256-RcpOENxElWbbwt1aXQWDRvQ9cQj4aSewzfzkM+bLSoo=";
 
   subPackages = [ "filebeat" ];
 

From 041ec29d337399fa84ebfe606ffc2ce276e3d98e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 00:15:23 +0000
Subject: [PATCH 3065/6226] v2ray-domain-list-community: 20251020145026 ->
 20251026234004

---
 pkgs/by-name/v2/v2ray-domain-list-community/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
index 06fc594b1fff..fdc6171a71d1 100644
--- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
+++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
@@ -9,12 +9,12 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20251020145026";
+    version = "20251026234004";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-9S1R4f6F4IIuNOKT61k8paoKJpkAq3yuh5IpcdC+6vI=";
+      hash = "sha256-bZM47aPNLvdkmmCFyie/dlUs9JdGPngkdmGrVzDl8as=";
     };
     vendorHash = "sha256-HmIXpF7P3J+lPXpmWWoFpSYAu5zbBQSDrj6S88LgWSU=";
     meta = with lib; {

From b9e518470a0b86791808bebf94b6818ce3f360e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 00:22:31 +0000
Subject: [PATCH 3066/6226] postfix: 3.10.4 -> 3.10.5

---
 pkgs/by-name/po/postfix/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/postfix/package.nix b/pkgs/by-name/po/postfix/package.nix
index e615ebd3568e..e801abfa0c04 100644
--- a/pkgs/by-name/po/postfix/package.nix
+++ b/pkgs/by-name/po/postfix/package.nix
@@ -74,11 +74,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "postfix";
-  version = "3.10.4";
+  version = "3.10.5";
 
   src = fetchurl {
     url = "https://de.postfix.org/ftpmirror/official/postfix-${version}.tar.gz";
-    hash = "sha256-z7ZoYf6PlkeH3a6rFfPKPn7z3nMPlxca/EpeyjOMpEQ=";
+    hash = "sha256-apJr9wIXOGGwjkm8tR/KOi8mn5ozf3LvFZv0YFIIfjU=";
   };
 
   nativeBuildInputs = [

From 68e12d566ff212d0c5624a147b3d456cc84c303c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 00:27:07 +0000
Subject: [PATCH 3067/6226] der-ascii: 0.6.0 -> 0.7.0

---
 pkgs/by-name/de/der-ascii/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/de/der-ascii/package.nix b/pkgs/by-name/de/der-ascii/package.nix
index af2bb299196f..85b8e13fbb90 100644
--- a/pkgs/by-name/de/der-ascii/package.nix
+++ b/pkgs/by-name/de/der-ascii/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "der-ascii";
-  version = "0.6.0";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "der-ascii";
     rev = "v${version}";
-    sha256 = "sha256-xGzxq5AHvzLUOp9VUcI9JMwrCpVIrpDvenWUOEBP6pA=";
+    sha256 = "sha256-i4rNeNDE7bIsO04haMKsbJmyvQRhhEt3I7UxmfTtL78=";
   };
   vendorHash = null;
 

From a1210c557f3df4f239b2edef31111a77cbfd5f27 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 00:29:48 +0000
Subject: [PATCH 3068/6226] golly: 4.3 -> 5.0

---
 pkgs/by-name/go/golly/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/golly/package.nix b/pkgs/by-name/go/golly/package.nix
index 1388a41d10b8..5c291cdaf216 100644
--- a/pkgs/by-name/go/golly/package.nix
+++ b/pkgs/by-name/go/golly/package.nix
@@ -13,10 +13,10 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "golly";
-  version = "4.3";
+  version = "5.0";
 
   src = fetchurl {
-    hash = "sha256-UdJHgGPn7FDN4rYTgfPBAoYE5FGC43TP8OFBmYIqCB0=";
+    hash = "sha256-WDXN5CgVP5uEC6lKQ1nlyybrMC56wBoJfNf1pcgwNhE=";
     url = "mirror://sourceforge/project/golly/golly/golly-${finalAttrs.version}/golly-${finalAttrs.version}-src.tar.gz";
   };
 

From 3261ab06006349e0697975ba4e2377d840f0a3a3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 00:36:53 +0000
Subject: [PATCH 3069/6226] limine: 10.1.1 -> 10.2.0

---
 pkgs/by-name/li/limine/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index c37a67fdc47f..9b34ffa7890e 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -47,14 +47,14 @@ in
 # as bootloader for various platforms and corresponding binary and helper files.
 stdenv.mkDerivation (finalAttrs: {
   pname = "limine";
-  version = "10.1.1";
+  version = "10.2.0";
 
   # We don't use the Git source but the release tarball, as the source has a
   # `./bootstrap` script performing network access to download resources.
   # Packaging that in Nix is very cumbersome.
   src = fetchurl {
     url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
-    hash = "sha256-pDhA8N7a5cTorIW8OgCimOxxfZ2slUhp3K+cb8KIAzc=";
+    hash = "sha256-eKoKjRJ+JbawucYXNvYrRMtkdybnxB3G1xk/7KR4YSI=";
   };
 
   enableParallelBuilding = true;

From c2ee20c24ac856073a0892b21139b23c3705b87f Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 20 Sep 2025 18:28:42 -0400
Subject: [PATCH 3070/6226] python3Packages.pyipv8:
 3.0.2197-unstable-2025-07-29 -> 3.1

Diff: https://github.com/Tribler/py-ipv8/compare/db39b85f4c28880dee24d1b59d8eae8ca8b9c03d...3.1

Release notes: https://github.com/Tribler/py-ipv8/releases/tag/3.1
---
 .../python-modules/pyipv8/default.nix         | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/pyipv8/default.nix b/pkgs/development/python-modules/pyipv8/default.nix
index b9c4b2fc6b62..5465c546cbad 100644
--- a/pkgs/development/python-modules/pyipv8/default.nix
+++ b/pkgs/development/python-modules/pyipv8/default.nix
@@ -1,33 +1,37 @@
 {
   lib,
   fetchPypi,
-  buildPythonPackage,
-  fetchFromGitHub,
-  cryptography,
-  libnacl,
   aiohttp,
   aiohttp-apispec,
-  pyopenssl,
-  pyasn1,
-  marshmallow,
-  typing-extensions,
-  packaging,
   apispec,
+  buildPythonPackage,
+  cryptography,
+  fetchFromGitHub,
+  libnacl,
+  marshmallow,
+  packaging,
+  pyasn1,
+  pyopenssl,
+  setuptools,
+  pytestCheckHook,
+  typing-extensions,
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "pyipv8";
-  version = "3.0.2197-unstable-2025-07-29";
-  format = "setuptools";
+  version = "3.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tribler";
     repo = "py-ipv8";
-    rev = "db39b85f4c28880dee24d1b59d8eae8ca8b9c03d";
-    hash = "sha256-VIcBPzpK8Cdaz/dRp9QK/MtK41jm8rs/pxnLS716FNM=";
+    tag = version;
+    hash = "sha256-HamjKVuBPSicoP/GldO5kg2Eay50ti03wzeNaPAl0qI=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     cryptography
     libnacl
     aiohttp
@@ -40,7 +44,11 @@ buildPythonPackage {
     apispec
   ];
 
-  doCheck = false;
+  doCheck = true;
+
+  __darwinAllowLocalNetworking = true;
+
+  nativeCheckInputs = [ pytestCheckHook ];
 
   meta = with lib; {
     description = "Python implementation of Tribler's IPv8 p2p-networking layer";

From e6225a8eb3c2e8cc3f08155d6a7be7b9cb01f609 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 19:16:02 -0300
Subject: [PATCH 3071/6226] librepcb: fix build with cmake4

---
 .../science/electronics/librepcb/default.nix             | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix
index 34abc1d75534..4beee81b114d 100644
--- a/pkgs/applications/science/electronics/librepcb/default.nix
+++ b/pkgs/applications/science/electronics/librepcb/default.nix
@@ -48,6 +48,15 @@ stdenv.mkDerivation rec {
 
   cargoRoot = "libs/librepcb/rust-core";
 
+  postPatch = ''
+    substituteInPlace libs/muparser/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 3.1.0)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace libs/type_safe{/,/external/debug_assert/}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace libs/googletest{/,/googlemock/,/googletest/}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Free EDA software to develop printed circuit boards";
     homepage = "https://librepcb.org/";

From 616d33536c59f18b25b3027df4fd275367e9a34d Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 26 Oct 2025 20:42:46 -0400
Subject: [PATCH 3072/6226] tribler: 8.2.3 -> 8.2.3-unstable-2025-10-14

Diff: https://github.com/Tribler/tribler/compare/v8.2.3...3e5bc56a15c568d0ba41262cad63155445e062da
---
 pkgs/by-name/tr/tribler/package.nix | 65 +++++++++++++----------------
 1 file changed, 28 insertions(+), 37 deletions(-)

diff --git a/pkgs/by-name/tr/tribler/package.nix b/pkgs/by-name/tr/tribler/package.nix
index 8fcbc3aa3ff2..17cd26773c38 100644
--- a/pkgs/by-name/tr/tribler/package.nix
+++ b/pkgs/by-name/tr/tribler/package.nix
@@ -1,26 +1,23 @@
 {
   lib,
-  stdenv,
   python312,
-  makeWrapper,
   nix-update-script,
   fetchFromGitHub,
-  rustPlatform,
   buildNpmPackage,
   nodejs_24,
   wrapGAppsHook3,
   libappindicator-gtk3,
 }:
 let
-  version = "8.2.3";
+  version = "8.2.3-unstable-2025-10-14";
   python3 = python312;
   nodejs = nodejs_24;
 
   src = fetchFromGitHub {
     owner = "tribler";
     repo = "Tribler";
-    tag = "v${version}";
-    hash = "sha256-yThl3HhPtwi/pK5Rcr2ClVLY8uCnIyfvdc53A8gjKDg=";
+    rev = "3e5bc56a15c568d0ba41262cad63155445e062da";
+    hash = "sha256-zGh2nVcJyOwVfPEdU8ZDgANFt0KnTqEXU3I3ZOGot2c=";
   };
 
   tribler-webui = buildNpmPackage {
@@ -59,7 +56,6 @@ python3.pkgs.buildPythonApplication {
 
   dependencies = with python3.pkgs; [
     # requirements.txt
-    bitarray
     configobj
     pyipv8
     ipv8-rust-tunnels
@@ -68,12 +64,17 @@ python3.pkgs.buildPythonApplication {
     pillow
     pony
     pystray
+
+    # build/requirements.txt
+    cx-freeze
+    requests
   ];
 
+  nativeBuildInputs = [ wrapGAppsHook3 ];
+
   buildInputs = with python3.pkgs; [
     # setup.py requirements
     pygobject3
-    setuptools
     # sphinx requirements
     sphinxHook
     sphinx
@@ -81,43 +82,40 @@ python3.pkgs.buildPythonApplication {
     sphinx-rtd-theme
     astroid
     # tray icon deps
-    wrapGAppsHook3
     libappindicator-gtk3
     # test phase requirements
     pytestCheckHook
-
   ];
 
   outputs = [
     "out"
   ];
 
+  postPatch = ''
+    # fix the entrypoint
+    substituteInPlace build/setup.py --replace-fail '"tribler=tribler.run:main"' '"tribler=tribler.run:main_sync"'
+    substituteInPlace src/run_tribler.py --replace-fail 'if __name__ == "__main__":' 'def main_sync():'
+
+    # ValueError: ZIP does not support timestamps before 1980
+    substituteInPlace build/win/build.py --replace-fail "if {'setup.py', 'bdist_wheel'}.issubset(sys.argv):" "if True:"
+
+    # copy the built webui
+    rm -r src/tribler/ui
+    ln -s ${tribler-webui} src/tribler/ui
+  '';
+
   buildPhase = ''
-          # fix the entrypoint
-          substituteInPlace build/setup.py --replace-fail '"tribler=tribler.run:main"' '"tribler=tribler.run:main_sync"'
-          substituteInPlace src/run_tribler.py --replace-fail 'if __name__ == "__main__":' 'def main_sync():'
+    runHook preBuild
 
-          # copy the built webui
-          rm -r src/tribler/ui
-          ln -s ${tribler-webui} src/tribler/ui
+    export GITHUB_TAG=v${version}
+    python3 build/debian/update_metainfo.py
+    python3 build/setup.py bdist_wheel
 
-          # build the docs
-    # FIXME:      make doc SPHINXBUILD=${lib.getExe' python3.pkgs.sphinx "sphinx-build"}
-
-          # build the wheel
-          substituteInPlace build/win/build.py --replace-fail "if {'setup.py', 'bdist_wheel'}.issubset(sys.argv):" "if True:"
-          export GITHUB_TAG=v${version}
-          python3 build/debian/update_metainfo.py
-          python3 build/setup.py bdist_wheel
-
-        runHook pytestCheckHook
-
-          # build the docs
-        runHook sphinxHook
+    runHook postBuild
   '';
 
   postInstall = ''
-    ln -s ${tribler-webui} $out/lib/python3.12/site-packages/tribler/ui
+    ln -s ${tribler-webui} $out/lib/python*/site-packages/tribler/ui
   '';
 
   preFixup = ''
@@ -126,10 +124,6 @@ python3.pkgs.buildPythonApplication {
     )
   '';
 
-  postFixup = ''
-    runHook wrapGAppsHook3
-  '';
-
   disabledTests = [
     "test_request_for_version"
     "test_establish_connection"
@@ -139,9 +133,6 @@ python3.pkgs.buildPythonApplication {
     "test_get_set_explicit"
   ];
 
-  disabledTestPaths = [
-  ];
-
   passthru.updateScript = nix-update-script { };
 
   meta = {

From ee6ac02323a86276058cd24647bf3bb0e0cf17e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 01:07:25 +0000
Subject: [PATCH 3073/6226] pywal16: 3.8.10 -> 3.8.11

---
 pkgs/by-name/py/pywal16/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/py/pywal16/package.nix b/pkgs/by-name/py/pywal16/package.nix
index 727a29407e14..34b5ce10dc67 100644
--- a/pkgs/by-name/py/pywal16/package.nix
+++ b/pkgs/by-name/py/pywal16/package.nix
@@ -9,14 +9,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "pywal16";
-  version = "3.8.10";
+  version = "3.8.11";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "eylles";
     repo = "pywal16";
     tag = version;
-    hash = "sha256-OSWv6Pxmd5U1xydL45dVT6m7gu4Rx6Yln3R4dTFZoVE=";
+    hash = "sha256-BZd8ditvcLLJDCWaWtSEUkOBgLM2LvtX5UbKOMz7eno=";
   };
 
   build-system = [ python3.pkgs.setuptools ];

From 91745e6a270d8bd920e158073575f66467823240 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 01:12:11 +0000
Subject: [PATCH 3074/6226] python3Packages.google-cloud-bigtable: 2.33.0 ->
 2.34.0

---
 .../python-modules/google-cloud-bigtable/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-bigtable/default.nix b/pkgs/development/python-modules/google-cloud-bigtable/default.nix
index 59bdc18cf49c..e9731f1ff1bd 100644
--- a/pkgs/development/python-modules/google-cloud-bigtable/default.nix
+++ b/pkgs/development/python-modules/google-cloud-bigtable/default.nix
@@ -25,13 +25,13 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-bigtable";
-  version = "2.33.0";
+  version = "2.34.0";
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "python-bigtable";
     tag = "v${version}";
-    hash = "sha256-32+UMTfnSncDsSnN54MjRE4eL1PXsUdblnxe/rj5Pqc=";
+    hash = "sha256-KPibMigfBJ2sE/QVgTjr7901dzj+/hWbOYz92naUxMw=";
   };
 
   pyproject = true;

From b993988f7ffff859d090c907b6b8a826783490a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 01:34:00 +0000
Subject: [PATCH 3075/6226] mirrord: 3.167.0 -> 3.168.1

---
 pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json
index 711c78a223cd..82bdb877d1c0 100644
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -1,21 +1,21 @@
 {
-  "version": "3.167.0",
+  "version": "3.168.1",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.167.0/mirrord_linux_x86_64",
-      "hash": "sha256-7LxoI0y82Hy2Vi7SveKgkKw1Bv5AzcMceBbV1FDhock="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.168.1/mirrord_linux_x86_64",
+      "hash": "sha256-guBC7Zuh5xT+d/lcJVwDLZ++tMy97mcLZo31XkkU2HM="
     },
     "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.167.0/mirrord_linux_aarch64",
-      "hash": "sha256-a4SuVF1e02IjAt//DgSdJ3dy4GfDaNhOHOwrZHio7OY="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.168.1/mirrord_linux_aarch64",
+      "hash": "sha256-ScKDz4nc4N0mjdaN2mBIJfXckZJZkQ32OValSl3JbQ8="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.167.0/mirrord_mac_universal",
-      "hash": "sha256-pqIjHduZMwsR6zXEURkKfixkY+FLy4oIE+aPPUX904M="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.168.1/mirrord_mac_universal",
+      "hash": "sha256-tSpVWlfbJQi2Ww1Ovc2BPXfeb/Bm7vgfDDPKyMfLZMg="
     },
     "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.167.0/mirrord_mac_universal",
-      "hash": "sha256-pqIjHduZMwsR6zXEURkKfixkY+FLy4oIE+aPPUX904M="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.168.1/mirrord_mac_universal",
+      "hash": "sha256-tSpVWlfbJQi2Ww1Ovc2BPXfeb/Bm7vgfDDPKyMfLZMg="
     }
   }
 }

From 594420d4ef97cfcb86dfdd3c7ede5e1fc4802d0c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 01:35:13 +0000
Subject: [PATCH 3076/6226] pocketbase: 0.30.4 -> 0.31.0

---
 pkgs/by-name/po/pocketbase/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/po/pocketbase/package.nix b/pkgs/by-name/po/pocketbase/package.nix
index 5eab2ef9c561..b9b3d2c0eab5 100644
--- a/pkgs/by-name/po/pocketbase/package.nix
+++ b/pkgs/by-name/po/pocketbase/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "pocketbase";
-  version = "0.30.4";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "pocketbase";
     repo = "pocketbase";
     rev = "v${version}";
-    hash = "sha256-n2xBwonQOEk2LVQePxdO/PraM75FFDmOqZ9fIL2xd+I=";
+    hash = "sha256-YCYihhPq24JdJKAU8zr4h4z131zj4BN3Qh/y5tHmyRs=";
   };
 
-  vendorHash = "sha256-Zo0b0MTIRpLGPIg288ROFPIdHfMzZdFLbFZPAffWPxU=";
+  vendorHash = "sha256-wsPJIlsq4Q26cce69a0oqEalfDrNIMVFt8ufdj+WId4=";
 
   # This is the released subpackage from upstream repo
   subPackages = [ "examples/base" ];

From 7bbc87010f68ee1e6f478bb624ef0197dcdd571b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 01:43:48 +0000
Subject: [PATCH 3077/6226] chezmoi: 2.66.1 -> 2.66.2

---
 pkgs/by-name/ch/chezmoi/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ch/chezmoi/package.nix b/pkgs/by-name/ch/chezmoi/package.nix
index 150a2545838b..c5020954c8d1 100644
--- a/pkgs/by-name/ch/chezmoi/package.nix
+++ b/pkgs/by-name/ch/chezmoi/package.nix
@@ -7,13 +7,13 @@
 
 buildGo125Module (finalAttrs: {
   pname = "chezmoi";
-  version = "2.66.1";
+  version = "2.66.2";
 
   src = fetchFromGitHub {
     owner = "twpayne";
     repo = "chezmoi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DwMkfS+D9o10Dk3jEzgkDcSoblbpoimN6RPV2iZTLcg=";
+    hash = "sha256-TYEVMxebA4dvWMmgx4bMv1UKO2YGH+D+lZuiAu8ZmI4=";
   };
 
   vendorHash = "sha256-g9bzsmLKJ7pCmTnO8N9Um1FDBvQA0mqw14fwGYMb/K0=";

From 95b801922e5da79737defc6a9eeec3c4b4426e13 Mon Sep 17 00:00:00 2001
From: Ludovico Piero <lewdovico@gnuweeb.org>
Date: Sun, 19 Oct 2025 05:20:20 +0900
Subject: [PATCH 3078/6226] bicpl: unstable-2024-05-14 -> 0-unstable-2025-10-24

Signed-off-by: Ludovico Piero <lewdovico@gnuweeb.org>
---
 pkgs/by-name/bi/bicpl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bi/bicpl/package.nix b/pkgs/by-name/bi/bicpl/package.nix
index 32c0e6e1bf16..c783217ab8cb 100644
--- a/pkgs/by-name/bi/bicpl/package.nix
+++ b/pkgs/by-name/bi/bicpl/package.nix
@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation {
   pname = "bicpl";
-  version = "unstable-2024-05-14";
+  version = "0-unstable-2025-10-24";
 
   # master is not actively maintained, using develop and develop-apple branches
   src = fetchFromGitHub {
     owner = "BIC-MNI";
     repo = "bicpl";
-    rev = "7e1e791483cf135fe29b8eecd7a360aa892823ae";
-    hash = "sha256-SvbtPUfEYp3IGivG+5yFdJF904miyMk+s15zwW7e7b4=";
+    rev = "dc9828841e38c6b7c523f3ab8a4c23eeb9e4272b";
+    hash = "sha256-wU/Qmtk6rbwxYqealV2On7W0schrYH85oKIUCpT4IXQ=";
   };
 
   nativeBuildInputs = [ cmake ];

From c71eb32439bc96d2708c611f4db8304fd21bb919 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 01:53:42 +0000
Subject: [PATCH 3079/6226] gemini-cli-bin: 0.9.0 -> 0.10.0

---
 pkgs/by-name/ge/gemini-cli-bin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ge/gemini-cli-bin/package.nix b/pkgs/by-name/ge/gemini-cli-bin/package.nix
index bc741ab07287..5ed70043cd35 100644
--- a/pkgs/by-name/ge/gemini-cli-bin/package.nix
+++ b/pkgs/by-name/ge/gemini-cli-bin/package.nix
@@ -8,11 +8,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "gemini-cli-bin";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchurl {
     url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js";
-    hash = "sha256-nUuO+03WqWjW8GGQNyVBdDSVEKNBDDsDta7MP6YzcX8=";
+    hash = "sha256-jwyx5HWjPi2S5GQFxV+VeuwrmjmLi+F1nzw4YMfNSiA=";
   };
 
   dontUnpack = true;

From 48f92d0ea5ac55c8942f372f3a80811c9d8f8112 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 11 Oct 2025 20:23:58 -0400
Subject: [PATCH 3080/6226] maintainers/scripts/remove-old-aliases: add support
 for creating warnings

Also revert the addition of the "elif '"' in line:" condition:
lines with quotes are generally OK.

Co-authored-by: Emily <vcs@emily.moe>
---
 maintainers/scripts/remove-old-aliases.py | 129 ++++++++++++++--------
 1 file changed, 84 insertions(+), 45 deletions(-)

diff --git a/maintainers/scripts/remove-old-aliases.py b/maintainers/scripts/remove-old-aliases.py
index 78a2fb0ab6ac..c7d1292b3e1e 100755
--- a/maintainers/scripts/remove-old-aliases.py
+++ b/maintainers/scripts/remove-old-aliases.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env nix-shell
 #!nix-shell -i python3 -p "python3.withPackages(ps: with ps; [ ])" nix
 """
-A program to remove old aliases or convert old aliases to throws
+Converts old aliases to warnings, converts old warnings to throws, and removes old throws.
 Example usage:
 ./maintainers/scripts/remove-old-aliases.py --year 2018 --file ./pkgs/top-level/aliases.nix
 
@@ -31,21 +31,40 @@ def process_args() -> argparse.Namespace:
     arg_parser.add_argument(
         "--only-throws",
         action="store_true",
-        help="only operate on throws. e.g remove throws older than $date",
+        help="Deprecated, use --only throws instead",
+    )
+    arg_parser.add_argument(
+        "--only",
+        choices=["aliases", "warnings", "throws"],
+        help="Only act on the specified types"
+        "(i.e. only act on entries that are 'normal' aliases, warnings, or throws)."
+        "Can be repeated.",
+        action="append",
+        dest="operate_on",
     )
     arg_parser.add_argument("--file", required=True, type=Path, help="alias file")
     arg_parser.add_argument(
         "--dry-run", action="store_true", help="don't modify files, only print results"
     )
-    return arg_parser.parse_args()
+
+    parsed = arg_parser.parse_args()
+
+    if parsed.only_throws:
+        parsed.operate_on.append("throws")
+
+    if parsed.operate_on is None:
+        parsed.operate_on = ["aliases", "warnings", "throws"]
+
+    return parsed
 
 
 def get_date_lists(
-    txt: list[str], cutoffdate: datetimedate, only_throws: bool
-) -> tuple[list[str], list[str], list[str], list[str]]:
+    txt: list[str], cutoffdate: datetimedate
+) -> tuple[list[str], list[str], list[str], list[str], list[str]]:
     """get a list of lines in which the date is older than $cutoffdate"""
     date_older_list: list[str] = []
     date_older_throw_list: list[str] = []
+    date_older_warning_list: list[str] = []
     date_sep_line_list: list[str] = []
     date_too_complex_list: list[str] = []
 
@@ -71,8 +90,7 @@ def get_date_lists(
             continue
 
         if line.lstrip().startswith("inherit (") and ";" in line:
-            if not only_throws:
-                date_older_list.append(line)
+            date_older_list.append(line)
         elif "=" not in line:
             date_sep_line_list.append(f"{lineno:>5} {line}")
         # 'if' lines could be complicated
@@ -80,13 +98,14 @@ def get_date_lists(
             date_too_complex_list.append(f"{lineno:>5} {line}")
         elif "= with " in line:
             date_too_complex_list.append(f"{lineno:>5} {line}")
-        elif "lib.warnOnInstantiate" in line:
-            date_too_complex_list.append(f"{lineno:>5} {line}")
-        elif '"' in line:
-            date_too_complex_list.append(f"{lineno:>5} {line}")
+        elif "lib.warnOnInstantiate" in line or "warning" in line:
+            if 'lib.warnOnInstantiate "' in line:
+                date_older_warning_list.append(line)
+            else:
+                date_too_complex_list.append(f"{lineno:>5} {line}")
         elif " = throw" in line:
             date_older_throw_list.append(line)
-        elif not only_throws:
+        else:
             date_older_list.append(line)
 
     return (
@@ -94,13 +113,14 @@ def get_date_lists(
         date_sep_line_list,
         date_too_complex_list,
         date_older_throw_list,
+        date_older_warning_list,
     )
 
 
-def convert_to_throw(date_older_list: list[str]) -> list[tuple[str, str]]:
-    """convert a list of lines to throws"""
-    converted_list = []
-    for line in date_older_list.copy():
+def convert(lines: list[str], convert_to: str) -> list[tuple[str, str]]:
+    """convert a list of lines to either "throws" or "warnings"."""
+    converted_lines = {}
+    for line in lines.copy():
         indent: str = " " * (len(line) - len(line.lstrip()))
 
         if "=" not in line:
@@ -117,10 +137,14 @@ def convert_to_throw(date_older_list: list[str]) -> list[tuple[str, str]]:
             before_equal = ""
             after_equal = ""
             try:
-                before_equal, after_equal = (x.strip() for x in line.split("=", maxsplit=2))
+                before_equal, after_equal = (
+                    x.strip() for x in line.split("=", maxsplit=2)
+                )
+                if after_equal.startswith("lib.warnOnInstantiate"):
+                    after_equal = after_equal.split("\"", maxsplit=3)[2].strip()
             except ValueError as err:
                 print(err, line, "\n")
-                date_older_list.remove(line)
+                lines.remove(line)
                 continue
 
             alias = before_equal
@@ -129,32 +153,40 @@ def convert_to_throw(date_older_list: list[str]) -> list[tuple[str, str]]:
         alias_unquoted = alias.strip('"')
         replacement = replacement.removeprefix("pkgs.")
 
-        converted = (
-            f"{indent}{alias} = throw \"'{alias_unquoted}' has been"
-            f" renamed to/replaced by '{replacement}'\";"
-            f" # Converted to throw {datetime.today().strftime('%Y-%m-%d')}"
-        )
-        converted_list.append((line, converted))
+        if convert_to == "throws":
+            converted = (
+                f"{indent}{alias} = throw \"'{alias_unquoted}' has been"
+                f" renamed to/replaced by '{replacement}'\";"
+                f" # Converted to throw {datetime.today().strftime('%Y-%m-%d')}"
+            )
+            converted_lines[line] = converted
+        elif convert_to == "warnings":
+            converted = (
+                f"{indent}{alias} = lib.warnOnInstantiate \"'{alias_unquoted}' has been"
+                f" renamed to/replaced by '{replacement}'\" {replacement};"
+                f" # Converted to warning {datetime.today().strftime('%Y-%m-%d')}"
+            )
+            converted_lines[line] = converted
+        else:
+            raise ValueError("'convert_to' must be either 'throws' or 'warnings'")
 
-    return converted_list
+    return converted_lines
 
 
 def generate_text_to_write(
     txt: list[str],
-    date_older_list: list[str],
-    converted_to_throw: list[tuple[str, str]],
-    date_older_throw_list: list[str],
+    converted_lines: dict[str, str],
 ) -> list[str]:
     """generate a list of text to be written to the aliasfile"""
     text_to_write: list[str] = []
     for line in txt:
         text_to_append: str = ""
-        if converted_to_throw:
-            for tupl in converted_to_throw:
-                if line == tupl[0]:
-                    text_to_append = f"{tupl[1]}\n"
-        if line not in date_older_list and line not in date_older_throw_list:
-            text_to_append = f"{line}\n"
+        try:
+            new_line = converted_lines[line]
+            if new_line is not None:
+                text_to_write.append(f"{new_line}\n")
+        except KeyError:
+            text_to_write.append(f"{line}\n")
         if text_to_append:
             text_to_write.append(text_to_append)
 
@@ -195,15 +227,15 @@ def main() -> None:
     """main"""
     args = process_args()
 
-    only_throws = args.only_throws
     aliasfile = Path(args.file).absolute()
     cutoffdate = (datetime.strptime(f"{args.year}-{args.month}-01", "%Y-%m-%d")).date()
 
     txt: list[str] = (aliasfile.read_text(encoding="utf-8")).splitlines()
 
     date_older_list: list[str] = []
-    date_sep_line_list: list[str] = []
+    date_older_warning_list: list[str] = []
     date_older_throw_list: list[str] = []
+    date_sep_line_list: list[str] = []
     date_too_complex_list: list[str] = []
 
     (
@@ -211,18 +243,27 @@ def main() -> None:
         date_sep_line_list,
         date_too_complex_list,
         date_older_throw_list,
-    ) = get_date_lists(txt, cutoffdate, only_throws)
+        date_older_warning_list,
+    ) = get_date_lists(txt, cutoffdate)
 
-    converted_to_throw: list[tuple[str, str]] = []
-    if date_older_list:
-        converted_to_throw = convert_to_throw(date_older_list)
-        print(" Will be converted to throws. ".center(100, "-"))
+    converted_lines: dict[str, str] = {}
+
+    if date_older_list and "aliases" in args.operate_on:
+        converted_lines.update(convert(date_older_list, "warnings"))
+        print(" Will be converted to warnings. ".center(100, "-"))
         for l_n in date_older_list:
             print(l_n)
 
-    if date_older_throw_list:
+    if date_older_warning_list and "warnings" in args.operate_on:
+        converted_lines.update(convert(date_older_warning_list, "throws"))
+        print(" Will be converted to throws. ".center(100, "-"))
+        for l_n in date_older_warning_list:
+            print(l_n)
+
+    if date_older_throw_list and "throws" in args.operate_on:
         print(" Will be removed. ".center(100, "-"))
         for l_n in date_older_throw_list:
+            converted_lines[l_n] = None
             print(l_n)
 
     if date_too_complex_list:
@@ -236,9 +277,7 @@ def main() -> None:
             print(l_n)
 
     if not args.dry_run:
-        text_to_write = generate_text_to_write(
-            txt, date_older_list, converted_to_throw, date_older_throw_list
-        )
+        text_to_write = generate_text_to_write(txt, converted_lines)
         write_file(aliasfile, text_to_write)
 
 

From 33ff593758f2064956462623095bb8425a73b7e5 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 11 Oct 2025 20:51:08 -0400
Subject: [PATCH 3081/6226] aliases: reword to avoid "if " showing up in
 strings

The script tries to avoid complex aliases, which includes aliases with if expressions. But it is not smart enough to recognize if it is in a string or not!

Fortunately, it's case sensitive.
---
 pkgs/top-level/aliases.nix | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 068fa356eae7..2c9609a10107 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -467,7 +467,7 @@ mapAliases {
   ansible-later = throw "ansible-later has been discontinued. The author recommends switching to ansible-lint"; # Added 2025-08-24
   ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11
   ansible_2_15 = throw "Ansible 2.15 goes end of life in 2024/11 and can't be supported throughout the 24.11 release cycle"; # Added 2024-11-08
-  antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4. Please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21
+  antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4. If you are interested in maintaining a newer version, please see https://github.com/NixOS/nixpkgs/pull/332259"; # Added 2024-08-21
   antic = throw "'antic' has been removed as it has been merged into 'flint3'"; # Added 2025-03-28
   antimicroX = throw "'antimicroX' has been renamed to/replaced by 'antimicrox'"; # Converted to throw 2024-10-17
   antlr4_8 = throw "antlr4_8 has been removed. Consider using a more recent version of antlr4"; # Added 2025-10-20
@@ -1164,12 +1164,12 @@ mapAliases {
   grafana_reporter = grafana-reporter; # Added 2024-06-09
   grapefruit = throw "'grapefruit' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23
   graphite-kde-theme = throw "'graphite-kde-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  graylog-3_3 = throw "graylog 3.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 3.x to latest series."; # Added 2023-10-09
-  graylog-4_0 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09
-  graylog-4_3 = throw "graylog 4.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 4.x to latest series."; # Added 2023-10-09
-  graylog-5_0 = throw "graylog 5.0.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.0.x to latest series."; # Added 2024-02-15
-  graylog-5_1 = throw "graylog 5.1.x is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.1.x to latest series."; # Added 2024-10-16
-  graylog-5_2 = throw "graylog 5.2 is EOL. Please consider downgrading nixpkgs if you need an upgrade from 5.2 to latest series."; # Added 2025-03-21
+  graylog-3_3 = throw "graylog 3.x is EOL. If you need an upgrade from 3.x to latest series, please consider downgrading nixpkgs."; # Added 2023-10-09
+  graylog-4_0 = throw "graylog 4.x is EOL. If you need an upgrade from 4.x to latest series, please consider downgrading nixpkgs."; # Added 2023-10-09
+  graylog-4_3 = throw "graylog 4.x is EOL. If you need an upgrade from 4.x to latest series, please consider downgrading nixpkgs."; # Added 2023-10-09
+  graylog-5_0 = throw "graylog 5.0.x is EOL. If you need an upgrade from 5.0.x to latest series, please consider downgrading nixpkgs."; # Added 2024-02-15
+  graylog-5_1 = throw "graylog 5.1.x is EOL. If you need an upgrade from 5.1.x to latest series, please consider downgrading nixpkgs."; # Added 2024-10-16
+  graylog-5_2 = throw "graylog 5.2.x is EOL. If you need an upgrade from 5.2.x to latest series, please consider downgrading nixpkgs."; # Added 2025-03-21
   green-pdfviewer = throw "'green-pdfviewer' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   gringo = clingo; # added 2022-11-27
   grub2_full = grub2; # Added 2022-11-18
@@ -1898,11 +1898,11 @@ mapAliases {
   nodejs-slim_18 = nodejs_18; # Added 2025-04-23
   nodejs_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23
   nomacs-qt6 = nomacs; # Added 2025-08-30
-  nomad_1_4 = throw "nomad_1_4 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02
-  nomad_1_5 = throw "nomad_1_5 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02
-  nomad_1_6 = throw "nomad_1_6 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-02-02
-  nomad_1_7 = throw "nomad_1_7 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-03-27
-  nomad_1_8 = throw "nomad_1_8 is no longer supported upstream. You can switch to using a newer version of the nomad package, or revert to older nixpkgs if you cannot upgrade"; # Added 2025-03-27
+  nomad_1_4 = throw "nomad_1_4 is no longer supported upstream. You can switch to using a newer version of the nomad package. If you cannot upgrade, you can revert to older nixpkgs."; # Added 2025-02-02
+  nomad_1_5 = throw "nomad_1_5 is no longer supported upstream. You can switch to using a newer version of the nomad package. If you cannot upgrade, you can revert to older nixpkgs."; # Added 2025-02-02
+  nomad_1_6 = throw "nomad_1_6 is no longer supported upstream. You can switch to using a newer version of the nomad package. If you cannot upgrade, you can revert to older nixpkgs."; # Added 2025-02-02
+  nomad_1_7 = throw "nomad_1_7 is no longer supported upstream. You can switch to using a newer version of the nomad package. If you cannot upgrade, you can revert to older nixpkgs."; # Added 2025-03-27
+  nomad_1_8 = throw "nomad_1_8 is no longer supported upstream. You can switch to using a newer version of the nomad package. If you cannot upgrade, you can revert to older nixpkgs."; # Added 2025-03-27
   norouter = throw "norouter has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29
   notes-up = throw "'notes-up' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
   notify-sharp = throw "'notify-sharp' has been removed as it was unmaintained and depends on deprecated dbus-sharp versions"; # Added 2025-08-25
@@ -2604,7 +2604,7 @@ mapAliases {
   tumpa = throw "tumpa has been removed, as it is broken"; # Added 2024-07-15
   turbogit = throw "turbogit has been removed as it is unmaintained upstream and depends on an insecure version of libgit2"; # Added 2024-08-25
   tvbrowser-bin = tvbrowser; # Added 2023-03-02
-  tvheadend = throw "tvheadend has been removed as it nobody was willing to maintain it and it was stuck on an unmaintained version that required FFmpeg 4. Please see https://github.com/NixOS/nixpkgs/pull/332259 if you are interested in maintaining a newer version"; # Added 2024-08-21
+  tvheadend = throw "tvheadend has been removed as it nobody was willing to maintain it and it was stuck on an unmaintained version that required FFmpeg 4. If you are interested in maintaining a newer version, please see https://github.com/NixOS/nixpkgs/pull/332259."; # Added 2024-08-21
   typst-fmt = typstfmt; # Added 2023-07-15
   typst-lsp = throw "'typst-lsp' has been removed due to lack of upstream maintenance, consider using 'tinymist' instead"; # Added 2025-01-25
   typst-preview = throw "The features of 'typst-preview' have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07

From b9114bae0d04d5c53da1304738e992e4fab799bc Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sat, 11 Oct 2025 20:53:14 -0400
Subject: [PATCH 3082/6226] aliases: actually throw instead of assigning string

Co-authored-by: Emily <vcs@emily.moe>
---
 pkgs/top-level/aliases.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 2c9609a10107..1f04cbfe8002 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1994,8 +1994,8 @@ mapAliases {
   OSCAR = oscar; # Added 2024-06-12
   osm2xmap = throw "osm2xmap has been removed, as it is unmaintained upstream and depended on old dependencies with broken builds"; # Added 2025-09-16
   osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2024-10-17
-  overrideLibcxx = "overrideLibcxx has beeen removed, as it was no longer used and Darwin now uses libc++ from the latest SDK; see the Nixpkgs 25.11 release notes for details"; # Added 2025-09-15
-  overrideSDK = "overrideSDK has been removed as it was a legacy compatibility stub. See <https://nixos.org/manual/nixpkgs/stable/#sec-darwin-legacy-frameworks-overrides> for migration instructions"; # Added 2025-08-04
+  overrideLibcxx = throw "overrideLibcxx has been removed, as it was no longer used and Darwin now uses libc++ from the latest SDK; see the Nixpkgs 25.11 release notes for details"; # Added 2025-09-15
+  overrideSDK = throw "overrideSDK has been removed as it was a legacy compatibility stub. See <https://nixos.org/manual/nixpkgs/stable/#sec-darwin-legacy-frameworks-overrides> for migration instructions"; # Added 2025-08-04
   ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24
   oxygen-icons5 = throw "
     The top-level oxygen-icons5 alias has been removed.
@@ -2479,7 +2479,7 @@ mapAliases {
   symbiyosys = sby; # Added 2024-08-18
   syn2mas = throw "'syn2mas' has been removed. It has been integrated into the main matrix-authentication-service CLI as a subcommand: 'mas-cli syn2mas'."; # Added 2025-07-07
   sync = taler-sync; # Added 2024-09-04
-  syncall = "'syncall' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
+  syncall = throw "'syncall' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   syncthing-cli = throw "'syncthing-cli' has been renamed to/replaced by 'syncthing'"; # Converted to throw 2024-10-17
   syncthing-tray = throw "syncthing-tray has been removed because it is broken and unmaintained"; # Added 2025-05-18
   syncthingtray-qt6 = syncthingtray; # Added 2024-03-06

From 08bd155e0a2b29c6ef6d6c8ec73064d4bfc4b1b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 03:07:03 +0000
Subject: [PATCH 3083/6226] kibi: 0.2.2 -> 0.3.0

---
 pkgs/by-name/ki/kibi/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ki/kibi/package.nix b/pkgs/by-name/ki/kibi/package.nix
index cb2512e7e0cf..dd8b58ce5ea5 100644
--- a/pkgs/by-name/ki/kibi/package.nix
+++ b/pkgs/by-name/ki/kibi/package.nix
@@ -7,15 +7,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "kibi";
-  version = "0.2.2";
+  version = "0.3.0";
 
-  cargoHash = "sha256-7SOkREsGiolT5LxLAbjZe3aAYBT/AlhlOXDlDmoei9w=";
+  cargoHash = "sha256-gXkwqmmFGNEJY7an3KWlRuLL5WuCH4P0n7BrLNsZ9/A=";
 
   src = fetchFromGitHub {
     owner = "ilai-deutel";
     repo = "kibi";
     rev = "v${version}";
-    sha256 = "sha256-ox1qKWxJlUIFzEqeyzG2kqZix3AHnOKFrlpf6O5QM+k=";
+    sha256 = "sha256-6uDpTQ97eNgM1lCiYPWS5QPxMNcPF3Ix14VaGiTY4Kc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 959c8ab35140ac27f2695c413b8e74edbfdc645e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 03:09:49 +0000
Subject: [PATCH 3084/6226] pixelflasher: 8.9.0.1 -> 8.9.1.0

---
 pkgs/by-name/pi/pixelflasher/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pi/pixelflasher/package.nix b/pkgs/by-name/pi/pixelflasher/package.nix
index 8f04e6dc0e2e..047b1e94e092 100644
--- a/pkgs/by-name/pi/pixelflasher/package.nix
+++ b/pkgs/by-name/pi/pixelflasher/package.nix
@@ -10,14 +10,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "pixelflasher";
-  version = "8.9.0.1";
+  version = "8.9.1.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "badabing2005";
     repo = "PixelFlasher";
     tag = "v${version}";
-    hash = "sha256-VDneBXHmU1yebDCUSFsuaRiPU8pE1MlfWIwvfBoI9wk=";
+    hash = "sha256-/B0AZesAwB94y4o+5+f0L0vnbgVaUaCP4gEcDCViH/c=";
   };
 
   desktopItems = [

From 154385372e4ced4b7798af328d19cfdd117b530d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 03:13:17 +0000
Subject: [PATCH 3085/6226] home-assistant-custom-components.fellow:
 0-unstable-2025-10-06 -> 0-unstable-2025-10-21

---
 .../home-assistant/custom-components/fellow/package.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/fellow/package.nix b/pkgs/servers/home-assistant/custom-components/fellow/package.nix
index ba184bd05e9c..a4ec793a3f31 100644
--- a/pkgs/servers/home-assistant/custom-components/fellow/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/fellow/package.nix
@@ -10,13 +10,13 @@
 buildHomeAssistantComponent {
   owner = "NewsGuyTor";
   domain = "fellow";
-  version = "0-unstable-2025-10-06";
+  version = "0-unstable-2025-10-21";
 
   src = fetchFromGitHub {
     owner = "NewsGuyTor";
     repo = "FellowAiden-HomeAssistant";
-    rev = "c0b724e2ac3174b99fcb7d05a9c63a3ac6ce03b4";
-    hash = "sha256-gK9lVFehqRWq7HQd+VPJB/iaIvLdHu51XxyfM14aY0s=";
+    rev = "c801347b9654dc469fa6b446a4e7fd88071d318e";
+    hash = "sha256-UZgNJGI3em5PluL5u7k0pEH8fGUYinoWSJjVAhuulSo=";
   };
 
   passthru.updateScript = unstableGitUpdater { };

From b4fa5112fa67cf27926da8132233f939c908c503 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 03:13:36 +0000
Subject: [PATCH 3086/6226] qtalarm: 3.0.0 -> 3.0.1

---
 pkgs/by-name/qt/qtalarm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qt/qtalarm/package.nix b/pkgs/by-name/qt/qtalarm/package.nix
index e2d5d08587ee..d052eca2251d 100644
--- a/pkgs/by-name/qt/qtalarm/package.nix
+++ b/pkgs/by-name/qt/qtalarm/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qtalarm";
-  version = "3.0.0";
+  version = "3.0.1";
 
   src = fetchFromGitHub {
     owner = "CountMurphy";
     repo = "QTalarm";
     tag = finalAttrs.version;
-    hash = "sha256-lliVj9OaddkQgSzJ8F6A06V/seRnDqGJkxj4cKoDdyo=";
+    hash = "sha256-IN/XdR8J5uMIAjb1G2kzuLDtO972RLKSy3Ceh9CcHWw=";
   };
 
   buildInputs = [

From 6d5e9616fc636a62345a4e1dc5aeace2cc552d56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 03:14:12 +0000
Subject: [PATCH 3087/6226] python3Packages.pythonqwt: 0.14.6 -> 0.15.0

---
 pkgs/development/python-modules/pythonqwt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pythonqwt/default.nix b/pkgs/development/python-modules/pythonqwt/default.nix
index ebc7969b5c48..95bf6e16fab8 100644
--- a/pkgs/development/python-modules/pythonqwt/default.nix
+++ b/pkgs/development/python-modules/pythonqwt/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "pythonqwt";
-  version = "0.14.6";
+  version = "0.15.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PlotPyStack";
     repo = "PythonQwt";
     tag = "v${version}";
-    hash = "sha256-D7iZ/737x+f63clnH41S8DtmBXDMf01A04UBKsHTJwA=";
+    hash = "sha256-S67k5kfGqB6Ezr2XMlW3x/ya6MW6df2cFrGEqlsLOhk=";
   };
 
   build-system = [

From b9f109b71e21d6d07f62821ba54e480a025c754e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 03:30:08 +0000
Subject: [PATCH 3088/6226] debian-devscripts: 2.25.20 -> 2.25.21

---
 pkgs/by-name/de/debian-devscripts/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix
index 15d694cd4442..a9ec8c5e9203 100644
--- a/pkgs/by-name/de/debian-devscripts/package.nix
+++ b/pkgs/by-name/de/debian-devscripts/package.nix
@@ -30,14 +30,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "debian-devscripts";
-  version = "2.25.20";
+  version = "2.25.21";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "debian";
     repo = "devscripts";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TpS4Gb6HZfCO42PSMyQ6qC1uUYAGkC9r4DHz4tofYKw=";
+    hash = "sha256-5X3bhtUSCBUzIZ3EScppnK+VS2IxnmDwqt2BwQG4fMA=";
   };
 
   patches = [

From b81e3028eb4fa6def2387134d9ed213c79736902 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 03:53:41 +0000
Subject: [PATCH 3089/6226] s7: 11.7-unstable-2025-10-20 ->
 11.7-unstable-2025-10-26

---
 pkgs/by-name/s7/s7/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix
index 6d8aa7a2c2f9..f4f741529e75 100644
--- a/pkgs/by-name/s7/s7/package.nix
+++ b/pkgs/by-name/s7/s7/package.nix
@@ -26,14 +26,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "s7";
-  version = "11.7-unstable-2025-10-20";
+  version = "11.7-unstable-2025-10-26";
 
   src = fetchFromGitLab {
     domain = "cm-gitlab.stanford.edu";
     owner = "bil";
     repo = "s7";
-    rev = "479045bf9445789c6a0a0252dd6fc092f2b0b507";
-    hash = "sha256-F7IPAjIlfZcuj9Of0wDYQWPTAWWZO9z6/FbjHwZlJAo=";
+    rev = "6fc94288ed46533527b1ddb24c3b162a9d0f7ab7";
+    hash = "sha256-kJhvgZ/GTSSplmY6bzHxHhtgukssepBsSWD7kwXwnps=";
   };
 
   buildInputs =

From 74aaeb373c0638bec9889d073d4b9f1e135812f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 04:01:33 +0000
Subject: [PATCH 3090/6226] taskwarrior-tui: 0.26.3 -> 0.26.4

---
 pkgs/by-name/ta/taskwarrior-tui/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ta/taskwarrior-tui/package.nix b/pkgs/by-name/ta/taskwarrior-tui/package.nix
index b595a4b8ee27..9ca19b9b21d2 100644
--- a/pkgs/by-name/ta/taskwarrior-tui/package.nix
+++ b/pkgs/by-name/ta/taskwarrior-tui/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "taskwarrior-tui";
-  version = "0.26.3";
+  version = "0.26.4";
 
   src = fetchFromGitHub {
     owner = "kdheepak";
     repo = "taskwarrior-tui";
     rev = "v${version}";
-    sha256 = "sha256-8PFGlsm9B6qHRrY7YIPwknmGS+Peg5MWd0kMT173wIQ=";
+    sha256 = "sha256-Ubl2xSFb5ZJ/5JqNI0In3hX6SxZd4g/AEq+CLdN2FsE=";
   };
 
-  cargoHash = "sha256-y5tHZIsbHLU9acIUM/QUx1T0eLK/E/jR+XXys5JnGjU=";
+  cargoHash = "sha256-lq2mqMrhcRX2gX7youx8NrZEKmEOJYuhIsHHixuQmmk=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 43bdcb4b834dd2b3ffa0b84c90f91b2863c00010 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 04:19:59 +0000
Subject: [PATCH 3091/6226] all-the-package-names: 2.0.2241 -> 2.0.2247

---
 pkgs/by-name/al/all-the-package-names/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix
index b405cef7f1f4..c1099d396515 100644
--- a/pkgs/by-name/al/all-the-package-names/package.nix
+++ b/pkgs/by-name/al/all-the-package-names/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "all-the-package-names";
-  version = "2.0.2241";
+  version = "2.0.2247";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-jiHYGxESaEKQ6g4Bz7fZNz24PFmF/PWKc3ySqZzFDa8=";
+    hash = "sha256-IK94a6XOTOqyUnMPfjV3GzKUpf0WpPwINbhxzbTvAKA=";
   };
 
-  npmDepsHash = "sha256-KtfzWr8I0fmZfIgkVAohgd0UlJY1DeP6Q0n8e7YENrs=";
+  npmDepsHash = "sha256-sdCRKOtwDEixjCZdg1Tl5CXvfAcFOIWK7Iw17h1caOE=";
 
   passthru.updateScript = nix-update-script { };
 

From dccb31d13758bb839bd74028c228251d4243f5d7 Mon Sep 17 00:00:00 2001
From: chillcicada <2210227279@qq.com>
Date: Mon, 27 Oct 2025 12:26:49 +0800
Subject: [PATCH 3092/6226] typora: 1.11.5 -> 1.12.2; modernize

---
 pkgs/by-name/ty/typora/package.nix | 39 ++++++++++++++++++++++--------
 pkgs/by-name/ty/typora/update.sh   | 12 +++++++++
 2 files changed, 41 insertions(+), 10 deletions(-)
 create mode 100755 pkgs/by-name/ty/typora/update.sh

diff --git a/pkgs/by-name/ty/typora/package.nix b/pkgs/by-name/ty/typora/package.nix
index 9cf0bde5ae6c..4a87315d3a67 100644
--- a/pkgs/by-name/ty/typora/package.nix
+++ b/pkgs/by-name/ty/typora/package.nix
@@ -22,14 +22,27 @@
 
 let
   pname = "typora";
-  version = "1.11.5";
-  src = fetchurl {
-    urls = [
-      "https://download.typora.io/linux/typora_${version}_amd64.deb"
-      "https://downloads.typoraio.cn/linux/typora_${version}_amd64.deb"
-    ];
-    hash = "sha256-CpUF8pRLzR3RzFD85Cobbmo3BInaeCee0NWKsmelPGs=";
-  };
+  version = "1.12.2";
+
+  src =
+    fetchurl
+      {
+        x86_64-linux = {
+          urls = [
+            "https://download.typora.io/linux/typora_${version}_amd64.deb"
+            "https://downloads.typoraio.cn/linux/typora_${version}_amd64.deb"
+          ];
+          hash = "sha256-g5GB4hc1cphnOXcVV+YR+YULJOzWAslio3yXjW9MGOk=";
+        };
+        aarch64-linux = {
+          urls = [
+            "https://download.typora.io/linux/typora_${version}_arm64.deb"
+            "https://downloads.typoraio.cn/linux/typora_${version}_arm64.deb"
+          ];
+          hash = "sha256-br9kn3P4Pzbef6u581YcX8c0uiB/c1pKqGogLX3sruw=";
+        };
+      }
+      .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
 
   typoraBase = stdenv.mkDerivation {
     inherit pname version src;
@@ -116,7 +129,7 @@ let
 
 in
 stdenv.mkDerivation {
-  inherit pname version;
+  inherit pname version src;
 
   dontUnpack = true;
   dontConfigure = true;
@@ -132,11 +145,17 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
+  passthru.updateScript = ./update.sh;
+
   meta = {
     description = "A minimal Markdown editor and reader.";
     homepage = "https://typora.io/";
+    changelog = "https://typora.io/releases/all";
     license = lib.licenses.unfree;
-    maintainers = with lib.maintainers; [ npulidomateo ];
+    maintainers = with lib.maintainers; [
+      npulidomateo
+      chillcicada
+    ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "typora";
   };
diff --git a/pkgs/by-name/ty/typora/update.sh b/pkgs/by-name/ty/typora/update.sh
new file mode 100755
index 000000000000..21f2c63395c8
--- /dev/null
+++ b/pkgs/by-name/ty/typora/update.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl common-updater-scripts
+
+set -euo pipefail
+
+version=$(curl -s "https://typora.io/#linux" | sed -E -n 's/.*typora_([0-9.]+)_amd64.*/\1/p')
+
+amd64_hash=$(nix-hash --type sha256 --to-sri $(nix-prefetch-url https://download.typora.io/linux/typora_${version}_amd64.deb))
+update-source-version typora $version $amd64_hash --system=x86_64-linux --ignore-same-version
+
+arm64_hash=$(nix-hash --type sha256 --to-sri $(nix-prefetch-url https://download.typora.io/linux/typora_${version}_arm64.deb))
+update-source-version typora $version $arm64_hash --system=aarch64-linux --ignore-same-version

From 3f4c966a679cd14cae3f9914a0e4f195e804ffb1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 04:36:09 +0000
Subject: [PATCH 3093/6226] python3Packages.publicsuffixlist: 1.0.2.20251025 ->
 1.0.2.20251027

---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 3b2ea890fa96..8ed70224f776 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20251025";
+  version = "1.0.2.20251027";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-LDvywIPdR3bJayk8waoPzaTg48RKCurG0ZUToxtMaM8=";
+    hash = "sha256-anbYf4eCK8QIdLWYYx1PG4sImXK2lWMd0oAlsonvb1Q=";
   };
 
   build-system = [ setuptools ];

From 6753792aff493343c98387d2746d7d505294b751 Mon Sep 17 00:00:00 2001
From: Lemon Lam <alemonmk@users.noreply.github.com>
Date: Tue, 5 Aug 2025 12:53:43 +0800
Subject: [PATCH 3094/6226] nixos/warpgate: init

---
 .../manual/release-notes/rl-2511.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 nixos/modules/services/security/warpgate.nix  | 444 ++++++++++++++++++
 nixos/tests/all-tests.nix                     |   1 +
 nixos/tests/warpgate.nix                      |  49 ++
 5 files changed, 497 insertions(+)
 create mode 100644 nixos/modules/services/security/warpgate.nix
 create mode 100644 nixos/tests/warpgate.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 8b3a14483687..fff675121edb 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -80,6 +80,8 @@
 
 - [Corteza](https://cortezaproject.org/), a low-code platform. Available as [services.corteza](#opt-services.corteza.enable).
 
+- [Warpgate](https://warpgate.null.page), a SSH, HTTPS, MySQL and Postgres bastion. Available as [services.warpgate](#opt-services.warpgate.enable). Note that you need to run `warpgate recover-access` to recover builtin admin account, as the initialisation script uses a throwaway value to initialise its database.
+
 - [TuneD](https://tuned-project.org/), a system tuning service for Linux. Available as [services.tuned](#opt-services.tuned.enable).
 
 - [yubikey-manager](https://github.com/Yubico/yubikey-manager), a tool for configuring YubiKey devices. Available as [programs.yubikey-manager](#opt-programs.yubikey-manager.enable).
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2b98c1cc23e1..88748d8af01a 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1497,6 +1497,7 @@
   ./services/security/vault-agent.nix
   ./services/security/vault.nix
   ./services/security/vaultwarden/default.nix
+  ./services/security/warpgate.nix
   ./services/security/yubikey-agent.nix
   ./services/system/automatic-timezoned.nix
   ./services/system/bpftune.nix
diff --git a/nixos/modules/services/security/warpgate.nix b/nixos/modules/services/security/warpgate.nix
new file mode 100644
index 000000000000..a52d0eefcb42
--- /dev/null
+++ b/nixos/modules/services/security/warpgate.nix
@@ -0,0 +1,444 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.warpgate;
+  yaml = pkgs.formats.yaml { };
+in
+{
+  options.services.warpgate =
+    let
+      inherit (lib.types)
+        nullOr
+        enum
+        str
+        bool
+        port
+        listOf
+        attrsOf
+        submodule
+        ;
+      inherit (lib.options) mkOption mkPackageOption literalExpression;
+    in
+    {
+      enable = mkOption {
+        description = ''
+          Whether to enable Warpgate.
+          This module will initialize Warpgate base on your config automatically. Please run `warpgate recover-access` to gain access.
+        '';
+        type = bool;
+        default = false;
+      };
+
+      package = mkPackageOption pkgs "warpgate" { };
+
+      databaseUrlFile = mkOption {
+        description = ''
+          Path to file containing database connection string with credentials.
+          Should be a one line file with: `database_url: <protocol>://<username>:<password>@<host>/<database>`.
+          See [SeaORM documentation](https://www.sea-ql.org/SeaORM/docs/install-and-config/connection/).
+        '';
+        type = nullOr str;
+        default = null;
+      };
+
+      settings = mkOption {
+        description = "Warpgate configuration.";
+        type = submodule {
+          freeformType = yaml.type;
+          options = {
+            sso_providers = mkOption {
+              description = "Configure OIDC single sign-on providers.";
+              default = [ ];
+              type = listOf (submodule {
+                freeformType = yaml.type;
+                options = {
+                  name = mkOption {
+                    description = "Internal identifier of SSO provider.";
+                    type = str;
+                  };
+                  label = mkOption {
+                    description = "SSO provider name displayed on login page.";
+                    type = str;
+                  };
+                  provider = mkOption {
+                    description = "SSO provider configurations.";
+                    type = attrsOf yaml.type;
+                  };
+                };
+              });
+              example = literalExpression ''
+                [
+                  {
+                    name = "3rd party SSO";
+                    label = "ACME SSO";
+                    provider = {
+                      type = "custom";
+                      client_id = "123...";
+                      client_secret = "BC...";
+                      issuer_url = "https://sso.acme.inc";
+                      scopes = ["email"];
+                    };
+                  }
+                  {
+                    ...
+                  }
+                ]
+              '';
+            };
+            recordings = {
+              enable = mkOption {
+                description = "Whether to enable session recording.";
+                default = true;
+                type = bool;
+              };
+              path = mkOption {
+                description = "Path to store session recordings.";
+                default = "/var/lib/warpgate/recordings";
+                type = str;
+              };
+            };
+            external_host = mkOption {
+              description = ''
+                Configure the domain name of this Warpgate instance.
+                See [HTTP domain binding](https://warpgate.null.page/http-domain-binding/).
+              '';
+              default = null;
+              type = nullOr str;
+            };
+            database_url = mkOption {
+              description = ''
+                Database connection string.
+                See [SeaORM documentation](https://www.sea-ql.org/SeaORM/docs/install-and-config/connection/).
+              '';
+              default = "sqlite:/var/lib/warpgate/db";
+              type = nullOr str;
+            };
+            ssh = {
+              enable = mkOption {
+                description = "Whether to enable SSH listener.";
+                default = false;
+                type = bool;
+              };
+              listen = mkOption {
+                description = "Listen endpoint of SSH listener.";
+                default = "[::]:2222";
+                type = str;
+              };
+              external_port = mkOption {
+                description = "The SSH listener is reachable via this port externally.";
+                default = null;
+                type = nullOr port;
+              };
+              keys = mkOption {
+                description = "Path to store SSH host & client keys.";
+                default = "/var/lib/warpgate/ssh-keys";
+                type = str;
+              };
+              host_key_verification = mkOption {
+                description = "Specify host key verification action when connecting to a SSH target with unknown/differing host key.";
+                default = "prompt";
+                type = enum [
+                  "prompt"
+                  "auto_accept"
+                  "auto_reject"
+                ];
+              };
+              inactivity_timeout = mkOption {
+                description = "How long can user be inactive until Warpgate terminates the connection.";
+                default = "5m";
+                type = str;
+              };
+              keepalive_interval = mkOption {
+                description = "If nothing is received from the client for this amount of time, server will send a keepalive message.";
+                default = null;
+                type = nullOr str;
+              };
+            };
+            http = {
+              listen = mkOption {
+                description = "Listen endpoint of HTTP listener.";
+                default = "[::]:8888";
+                type = str;
+              };
+              external_port = mkOption {
+                description = "The HTTP listener is reachable via this port externally.";
+                default = null;
+                type = nullOr port;
+              };
+              certificate = mkOption {
+                description = "Path to HTTPS listener certificate.";
+                default = "/var/lib/warpgate/tls.certificate.pem";
+                type = str;
+              };
+              key = mkOption {
+                description = "Path to HTTPS listener private key.";
+                default = "/var/lib/warpgate/tls.key.pem";
+                type = str;
+              };
+              sni_certificates = mkOption {
+                description = "Certificates for additional domains.";
+                default = [ ];
+                type = listOf (submodule {
+                  freeformType = yaml.type;
+                  options = {
+                    certificate = mkOption {
+                      description = "Path to certificate.";
+                      default = "";
+                      type = str;
+                    };
+                    key = mkOption {
+                      description = "Path to private key.";
+                      default = "";
+                      type = str;
+                    };
+                  };
+                });
+                example = literalExpression ''
+                  [
+                    {
+                      certificate = "/var/lib/warpgate/example.tld.pem";
+                      key = "/var/lib/warpgate/example.tld.key.pem";
+                    }
+                    {
+                      ...
+                    }
+                  ]
+                '';
+              };
+              trust_x_forwarded_headers = mkOption {
+                description = ''
+                  Trust X-Forwarded-* headers. Required when being reverse proxied.
+                  See [Running behind a reverse proxy](https://warpgate.null.page/reverse-proxy/).
+                '';
+                default = false;
+                type = bool;
+              };
+              session_max_age = mkOption {
+                description = "How long until a logged in session expires.";
+                default = "30m";
+                type = str;
+              };
+              cookie_max_age = mkOption {
+                description = "How long until logged in cookie expires.";
+                default = "1day";
+                type = str;
+              };
+            };
+            mysql = {
+              enable = mkOption {
+                description = "Whether to enable MySQL listener.";
+                default = false;
+                type = bool;
+              };
+              listen = mkOption {
+                description = "Listen endpoint of MySQL listener.";
+                default = "[::]:33306";
+                type = str;
+              };
+              external_port = mkOption {
+                description = "The MySQL listener is reachable via this port externally.";
+                default = null;
+                type = nullOr port;
+              };
+              certificate = mkOption {
+                description = "Path to MySQL listener certificate.";
+                default = "/var/lib/warpgate/tls.certificate.pem";
+                type = str;
+              };
+              key = mkOption {
+                description = "Path to MySQL listener private key.";
+                default = "/var/lib/warpgate/tls.key.pem";
+                type = str;
+              };
+            };
+            postgres = {
+              enable = mkOption {
+                description = "Whether to enable PostgreSQL listener.";
+                default = false;
+                type = bool;
+              };
+              listen = mkOption {
+                description = "Listen endpoint of PostgreSQL listener.";
+                default = "[::]:55432";
+                type = str;
+              };
+              external_port = mkOption {
+                description = "The PostgreSQL listener is reachable via this port externally.";
+                default = null;
+                type = nullOr str;
+              };
+              certificate = mkOption {
+                description = "Path to PostgreSQL listener certificate.";
+                default = "/var/lib/warpgate/tls.certificate.pem";
+                type = str;
+              };
+              key = mkOption {
+                description = "Path to PostgreSQL listener private key.";
+                default = "/var/lib/warpgate/tls.key.pem";
+                type = str;
+              };
+            };
+            log = {
+              retention = mkOption {
+                description = "How long Warpgate keep its logs.";
+                default = "7days";
+                type = str;
+              };
+              send_to = mkOption {
+                description = ''
+                  Path of UNIX socket of log forwarder.
+                  See [Log forwarding](https://warpgate.null.page/log-forwarding/);
+                '';
+                default = null;
+                type = nullOr str;
+              };
+            };
+            config_provider = mkOption {
+              description = ''
+                Source of truth of users.
+                DO NOT change this, Warpgate only implemented database provider.
+              '';
+              default = "database";
+              type = enum [
+                "file"
+                "database"
+              ];
+            };
+          };
+        };
+        default = { };
+        example = {
+          ssh = {
+            enable = true;
+            listen = "[::]:2211";
+          };
+          http = {
+            listen = "[::]:8011";
+          };
+        };
+      };
+    };
+
+  config =
+    let
+      inherit (lib.lists)
+        any
+        map
+        head
+        reverseList
+        ;
+      inherit (lib.strings) splitString toIntBase10;
+
+      preStartScript = pkgs.writers.writeBash "warpgate-init" ''
+        CFGFILE=/var/lib/warpgate/config.yaml
+        if [ ! -O $CFGFILE ] || [ ! -s $CFGFILE ]; then
+          INITPWD=$(tr -dc 'A-Za-z0-9!?%=' </dev/urandom 2>/dev/null | head -c 16)
+          ${lib.getExe cfg.package} \
+            --config $CFGFILE unattended-setup \
+            --data-path /var/lib/warpgate \
+            --http-port 8888 \
+            --admin-password $INITPWD
+        fi
+        ${
+          if cfg.databaseUrlFile != null then
+            ''
+              sed -e '/^database_url: null/d' ${yaml.generate "warpgate-config" cfg.settings} > $CFGFILE
+              cat /run/credentials/warpgate.service/databaseUrl >> $CFGFILE
+            ''
+          else
+            "cp --no-preserve=ownership ${yaml.generate "warpgate-config" cfg.settings} $CFGFILE"
+        }
+      '';
+      bindOnPrivilegedPorts = any (x: toIntBase10 x < 1025) (
+        map (x: head (reverseList (splitString ":" x))) (
+          [ cfg.settings.http.listen ]
+          ++ lib.optional cfg.settings.ssh.enable cfg.settings.ssh.listen
+          ++ lib.optional cfg.settings.mysql.enable cfg.settings.mysql.listen
+          ++ lib.optional cfg.settings.postgres.enable cfg.settings.postgres.listen
+        )
+      );
+    in
+    lib.mkIf cfg.enable {
+      assertions = [
+        {
+          assertion = !((cfg.databaseUrlFile != null) && (cfg.settings.database_url != null));
+          message = "You cannot configure databaseUrlFile and settings.database_url at the same time.";
+        }
+        {
+          assertion = !((cfg.databaseUrlFile == null) && (cfg.settings.database_url == null));
+          message = "Either databaseUrlFile or settings.database_url must be set; Set the other to null.";
+        }
+      ];
+
+      environment.systemPackages = [ cfg.package ];
+
+      systemd.services.warpgate = {
+        description = "Warpgate smart bastion";
+        wantedBy = [ "multi-user.target" ];
+        after = [ "network.target" ];
+        startLimitBurst = 5;
+        serviceConfig = {
+          LoadCredential = "${
+            if cfg.databaseUrlFile != null then "databaseUrl:${cfg.databaseUrlFile}" else ""
+          }";
+          ExecStartPre = preStartScript;
+          ExecStart = "${lib.getExe cfg.package} --config /var/lib/warpgate/config.yaml run";
+          DynamicUser = true;
+          RestartSec = 3;
+          Restart = "on-failure";
+          StateDirectory = "warpgate";
+          StateDirectoryMode = "0700";
+          LockPersonality = true;
+          MemoryDenyWriteExecute = true;
+          NoNewPrivileges = true;
+          PrivateTmp = true;
+          ProtectHome = true;
+          PrivateDevices = true;
+          DeviceAllow = [
+            "/dev/null rw"
+            "/dev/urandom r"
+          ];
+          DevicePolicy = "strict";
+          ProtectHostname = true;
+          ProtectKernelLogs = true;
+          ProtectKernelModules = true;
+          ProtectKernelTunables = true;
+          RestrictNamespaces = true;
+          ProtectProc = "invisible";
+          ProtectSystem = "full";
+          ProtectClock = true;
+          ProtectControlGroups = true;
+          RestrictRealtime = true;
+          RestrictSUIDSGID = true;
+          RemoveIPC = true;
+          RestrictAddressFamilies = [
+            "AF_INET"
+            "AF_INET6"
+            "AF_UNIX"
+          ];
+          SystemCallArchitectures = "native";
+          SystemCallFilter = [
+            "@system-service"
+            "~@privileged"
+          ];
+        }
+        // (
+          if bindOnPrivilegedPorts then
+            {
+              AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
+              CapabilityBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
+            }
+          else
+            {
+              PrivateUsers = true;
+            }
+        );
+      };
+    };
+
+  meta.maintainers = with lib.maintainers; [ alemonmk ];
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 3af4002a6aa2..b7f47487738b 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1609,6 +1609,7 @@ in
   vsftpd = runTest ./vsftpd.nix;
   waagent = runTest ./waagent.nix;
   wakapi = runTest ./wakapi.nix;
+  warpgate = runTest ./warpgate.nix;
   warzone2100 = runTest ./warzone2100.nix;
   wasabibackend = runTest ./wasabibackend.nix;
   wastebin = runTest ./wastebin.nix;
diff --git a/nixos/tests/warpgate.nix b/nixos/tests/warpgate.nix
new file mode 100644
index 000000000000..64ec9bd6dc22
--- /dev/null
+++ b/nixos/tests/warpgate.nix
@@ -0,0 +1,49 @@
+{
+  name = "warpgate";
+
+  nodes = {
+    machine = {
+      services.warpgate = {
+        enable = true;
+      };
+    };
+
+    machine2 = {
+      environment.etc."warpgate-db-url".text = "database: sqlite:/var/lib/warpgate/db/";
+      services.warpgate = {
+        enable = true;
+        databaseUrlFile = "/etc/warpgate-db-url";
+        settings = {
+          database_url = null;
+        };
+      };
+    };
+
+    machine3 = {
+      services.warpgate = {
+        enable = true;
+        settings = {
+          http.listen = "[::]:443";
+        };
+      };
+    };
+  };
+
+  testScript = ''
+    machine.wait_for_unit("warpgate.service")
+    machine.wait_for_open_port(8888)
+    machine.succeed("stat /var/lib/warpgate/db/db.sqlite3")
+    machine.succeed("curl -k --fail https://localhost:8888/@warpgate")
+    machine.shutdown()
+
+    machine2.wait_for_unit("warpgate.service")
+    machine2.wait_for_open_port(8888)
+    machine2.succeed("curl -k --fail https://localhost:8888/@warpgate")
+    machine2.shutdown()
+
+    machine3.wait_for_unit("warpgate.service")
+    machine3.wait_for_open_port(443)
+    machine3.succeed("curl -k --fail https://localhost/@warpgate")
+    machine3.shutdown()
+  '';
+}

From 5bf1bfdab4bb235c4bde1c6116ec6e03c5417b4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 04:44:34 +0000
Subject: [PATCH 3095/6226] flameshot: 13.1.0 -> 13.2.0

---
 pkgs/by-name/fl/flameshot/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix
index 021707044ad7..7eeda3cd9147 100644
--- a/pkgs/by-name/fl/flameshot/package.nix
+++ b/pkgs/by-name/fl/flameshot/package.nix
@@ -18,13 +18,13 @@ assert stdenv.hostPlatform.isDarwin -> (!enableWlrSupport);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flameshot";
-  version = "13.1.0";
+  version = "13.2.0";
 
   src = fetchFromGitHub {
     owner = "flameshot-org";
     repo = "flameshot";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Wg0jc1AqgetaESmTyhzAHx3zal/5DMDum7fzhClqeck=";
+    hash = "sha256-oQMM2BUY6gpBjSRboR1YMZLIi6p0EmrHps7Y6YI7ytU=";
   };
 
   cmakeFlags = [

From 72db794e92940cc5e9871708c951d8df4eb3054d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 05:00:49 +0000
Subject: [PATCH 3096/6226] retool: 2.4.3 -> 2.4.4

---
 pkgs/by-name/re/retool/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/retool/package.nix b/pkgs/by-name/re/retool/package.nix
index 7bab9561e755..590046496d13 100644
--- a/pkgs/by-name/re/retool/package.nix
+++ b/pkgs/by-name/re/retool/package.nix
@@ -8,7 +8,7 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "retool";
-  version = "2.4.3";
+  version = "2.4.4";
 
   pyproject = true;
   disabled = python3.pkgs.pythonOlder "3.10";
@@ -17,7 +17,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "unexpectedpanda";
     repo = "retool";
     tag = "v${version}";
-    hash = "sha256-uYzsHraA5LX+5wZWSAO7lOFhssd7LojftLP5pufgUcc=";
+    hash = "sha256-hWCMxWcjjFF5xg7WrF4wjwGneoQCEUp+4oe+CieElcQ=";
   };
 
   nativeBuildInputs = with python3.pkgs; [

From 42d8af6acb5f0c34ad5e40065a20ee3b67877994 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 05:15:23 +0000
Subject: [PATCH 3097/6226] moonlight: 1.3.32 -> 1.3.33

---
 pkgs/by-name/mo/moonlight/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix
index 8bbb329261fc..2a79d8e68aa3 100644
--- a/pkgs/by-name/mo/moonlight/package.nix
+++ b/pkgs/by-name/mo/moonlight/package.nix
@@ -12,13 +12,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "moonlight";
-  version = "1.3.32";
+  version = "1.3.33";
 
   src = fetchFromGitHub {
     owner = "moonlight-mod";
     repo = "moonlight";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aXap/wUjjJTCy2eq7p7BL6ZYOVZEBVY4/YkrDtbIj2Q=";
+    hash = "sha256-lQpl6ecQfQ7KzEIytH3k4hLtvq+KkTL+3IR2ZukdZWM=";
   };
 
   nativeBuildInputs = [
@@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: {
     buildInputs = [ nodejs_22 ];
 
     fetcherVersion = 2;
-    hash = "sha256-gv+PHGbo0IiPgcxi0RAvsNmGLHWZar3SB4eW7NbJRJY=";
+    hash = "sha256-PRlgwyePFpFdQRcojGDEC4ESZEGTJf1Ad9EFgm8hmKY=";
   };
 
   env = {

From c3577d05342810422de1572927d8e3b65e8b9c41 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 05:25:44 +0000
Subject: [PATCH 3098/6226] python3Packages.pwdlib: 0.2.1 -> 0.3.0

---
 pkgs/development/python-modules/pwdlib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pwdlib/default.nix b/pkgs/development/python-modules/pwdlib/default.nix
index d698cd66401c..f2b9c98227c7 100644
--- a/pkgs/development/python-modules/pwdlib/default.nix
+++ b/pkgs/development/python-modules/pwdlib/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pwdlib";
-  version = "0.2.1";
+  version = "0.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "frankie567";
     repo = "pwdlib";
     tag = "v${version}";
-    hash = "sha256-aPrgn5zfKk72QslGzb0acCNnZ7m3lyIBjvu4yhfZhSQ=";
+    hash = "sha256-0ye/CYlDW73Y2HGKjSdk7LniVkQ6OznoO/qnypRCmBQ=";
   };
 
   build-system = [

From 97d95da2cd150d475b355e540e6ddd45fc25c7c9 Mon Sep 17 00:00:00 2001
From: chillcicada <2210227279@qq.com>
Date: Mon, 27 Oct 2025 13:45:55 +0800
Subject: [PATCH 3099/6226] wpsoffice-cn: improve packaging

---
 pkgs/by-name/wp/wpsoffice-cn/package.nix | 63 +++++++++++++-----------
 pkgs/by-name/wp/wpsoffice-cn/sources.nix |  3 +-
 pkgs/by-name/wp/wpsoffice-cn/update.sh   |  6 +--
 3 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/pkgs/by-name/wp/wpsoffice-cn/package.nix b/pkgs/by-name/wp/wpsoffice-cn/package.nix
index 45852245a759..e12be7e8ca3e 100644
--- a/pkgs/by-name/wp/wpsoffice-cn/package.nix
+++ b/pkgs/by-name/wp/wpsoffice-cn/package.nix
@@ -1,27 +1,29 @@
 {
   lib,
   stdenv,
-  dpkg,
   autoPatchelfHook,
+  runCommandLocal,
+  curl,
+  coreutils,
+  cacert,
+  # wpsoffice dependencies
   alsa-lib,
-  at-spi2-core,
+  libjpeg,
   libtool,
   libxkbcommon,
+  nss,
   nspr,
   udev,
   gtk3,
   libgbm,
   libusb1,
+  unixODBC,
+  libmysqlclient,
   libsForQt5,
   xorg,
+  # wpsoffice runtime dependencies
   cups,
   pango,
-  bzip2,
-  libmysqlclient,
-  runCommandLocal,
-  curl,
-  coreutils,
-  cacert,
 }:
 
 let
@@ -32,10 +34,9 @@ let
   fetch =
     {
       url,
-      uri,
       hash,
     }:
-    runCommandLocal "wpsoffice-cn-${version}-src"
+    runCommandLocal "wpsoffice-cn-${version}.deb"
       {
         outputHashAlgo = "sha256";
         outputHash = hash;
@@ -50,9 +51,10 @@ let
       }
       ''
         readonly SECURITY_KEY="7f8faaaa468174dc1c9cd62e5f218a5b"
+        prefix="https://wps-linux-personal.wpscdn.cn"
 
         timestamp10=$(date '+%s')
-        md5hash=($(printf '%s' "$SECURITY_KEY${uri}$timestamp10" | md5sum))
+        md5hash=($(printf '%s' "$SECURITY_KEY''${${url}#$prefix}$timestamp10" | md5sum))
 
         curl --retry 3 --retry-delay 3 "${url}?t=$timestamp10&k=$md5hash" > $out
       '';
@@ -68,24 +70,20 @@ in
 stdenv.mkDerivation {
   inherit pname src version;
 
-  unpackCmd = "dpkg -x $src .";
-  sourceRoot = ".";
-
-  nativeBuildInputs = [
-    dpkg
-    autoPatchelfHook
-  ];
+  nativeBuildInputs = [ autoPatchelfHook ];
 
   buildInputs = [
     alsa-lib
-    at-spi2-core
+    libjpeg
     libtool
     libxkbcommon
+    nss
     nspr
     udev
     gtk3
     libgbm
     libusb1
+    unixODBC
     libsForQt5.qtbase
     xorg.libXdamage
     xorg.libXtst
@@ -101,9 +99,17 @@ stdenv.mkDerivation {
     pango
   ];
 
-  autoPatchelfIgnoreMissingDeps = [
-    "libpeony.so.3"
-  ];
+  unpackPhase = ''
+    # Unpack the .deb file
+    ar x $src
+    tar -xf data.tar.xz
+
+    # Remove unneeded files
+    rm -rf usr/share/{fonts,locale}
+    rm -f usr/bin/misc
+    rm -rf opt/kingsoft/wps-office/{desktops,INSTALL}
+    rm -f opt/kingsoft/wps-office/office6/lib{peony-wpsprint-menu-plugin,bz2,jpeg,stdc++,gcc_s,odbc*,nss*,dbus-1}.so*
+  '';
 
   installPhase = ''
     runHook preInstall
@@ -127,8 +133,6 @@ stdenv.mkDerivation {
   '';
 
   preFixup = ''
-    # libbz2 dangling symlink
-    ln -sf ${bzip2.out}/lib/libbz2.so $out/opt/kingsoft/wps-office/office6/libbz2.so
     # dlopen dependency
     patchelf --add-needed libudev.so.1 $out/opt/kingsoft/wps-office/office6/addons/cef/libcef.so
     # libmysqlclient dependency
@@ -138,19 +142,20 @@ stdenv.mkDerivation {
 
   passthru.updateScript = ./update.sh;
 
-  meta = with lib; {
+  meta = {
     description = "Office suite, formerly Kingsoft Office";
-    homepage = "https://www.wps.com";
+    homepage = "https://www.wps.cn";
     platforms = [ "x86_64-linux" ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     hydraPlatforms = [ ];
-    license = licenses.unfree;
-    maintainers = with maintainers; [
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [
       mlatus
       th0rgal
       wineee
       pokon548
       chillcicada
     ];
+    mainProgram = "wps";
   };
 }
diff --git a/pkgs/by-name/wp/wpsoffice-cn/sources.nix b/pkgs/by-name/wp/wpsoffice-cn/sources.nix
index 9d00360fd99f..2d882c757308 100644
--- a/pkgs/by-name/wp/wpsoffice-cn/sources.nix
+++ b/pkgs/by-name/wp/wpsoffice-cn/sources.nix
@@ -1,10 +1,9 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2025-09-15
+# Last updated: 2025-10-27
 {
   version = "12.1.2.22571";
   x86_64 = {
     url = "https://wps-linux-personal.wpscdn.cn/wps/download/ep/Linux2023/22571/wps-office_12.1.2.22571.AK.preread.sw_480057_amd64.deb";
-    uri = "/wps/download/ep/Linux2023/22571/wps-office_12.1.2.22571.AK.preread.sw_480057_amd64.deb";
     hash = "sha256-aB1EWP0Ev5WuAuzih3ybD23qaRRTUjlES1emas+sUDA=";
   };
 }
diff --git a/pkgs/by-name/wp/wpsoffice-cn/update.sh b/pkgs/by-name/wp/wpsoffice-cn/update.sh
index 501bdec5ad63..af186c592407 100755
--- a/pkgs/by-name/wp/wpsoffice-cn/update.sh
+++ b/pkgs/by-name/wp/wpsoffice-cn/update.sh
@@ -13,12 +13,11 @@ payload=$(curl -s "https://www.wps.cn/product/wpslinux")
 version=$(echo "$payload" | grep -oP '(?<=banner_txt">)[^<]+')
 
 amd64_url=$(echo "$payload" | grep -oP "downLoad\('[^']*'" | head -1 | sed "s/downLoad('//;s/'$//")
-amd64_uri="${amd64_url#$prefix}"
 
 timestamp10=$(date '+%s')
-md5hash=($(printf '%s' "$SECURITY_KEY$amd64_uri$timestamp10" | md5sum))
+amd64_md5hash=($(printf '%s' "$SECURITY_KEY${amd64_url#$prefix}$timestamp10" | md5sum))
 
-amd64_hash=$(nix-prefetch-url --name "wpsoffice-cn-$version.deb" "$amd64_url?t=$timestamp10&k=$md5hash")
+amd64_hash=$(nix-prefetch-url --name "wpsoffice-cn-$version.deb" "$amd64_url?t=$timestamp10&k=$amd64_md5hash")
 
 amd64_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$amd64_hash")
 
@@ -29,7 +28,6 @@ cat > sources.nix << EOF
   version = "$version";
   x86_64 = {
     url = "$amd64_url";
-    uri = "$amd64_uri";
     hash = "$amd64_hash";
   };
 }

From aa339c586718b1ecf33b395dacac85844d3467a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 05:57:53 +0000
Subject: [PATCH 3100/6226] vacuum-go: 0.18.9 -> 0.19.1

---
 pkgs/by-name/va/vacuum-go/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix
index 1f08a8b343fd..c34a640aeead 100644
--- a/pkgs/by-name/va/vacuum-go/package.nix
+++ b/pkgs/by-name/va/vacuum-go/package.nix
@@ -7,17 +7,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "vacuum-go";
-  version = "0.18.9";
+  version = "0.19.1";
 
   src = fetchFromGitHub {
     owner = "daveshanley";
     repo = "vacuum";
     # using refs/tags because simple version gives: 'the given path has multiple possibilities' error
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uXNSwp+Qqw8drSt+SN20AjoJG9Pmaz0WCozFq8jEv2o=";
+    hash = "sha256-MJM8gwSMwdr83NN2Rt6hGf2tJUrmMdhUp5QtylsldtM=";
   };
 
-  vendorHash = "sha256-+GkxN20mZD/ZBTCjmjiDcEAJix2Ssn9HsNrUtQkrI18=";
+  vendorHash = "sha256-w3TSTM0WezYuajMPSy5OIWb5coE+SgIRuJISe1kYokg=";
 
   env.CGO_ENABLED = 0;
   ldflags = [

From c88a5062eccbbbc4fde134ce7363dc66df669bc9 Mon Sep 17 00:00:00 2001
From: bahrom04 <magdiyevbahrom@gmail.com>
Date: Mon, 27 Oct 2025 11:07:27 +0500
Subject: [PATCH 3101/6226] hunspellDict.uz_UZ: update 0.1.0 hash

---
 pkgs/by-name/hu/hunspell/dictionaries.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/hu/hunspell/dictionaries.nix b/pkgs/by-name/hu/hunspell/dictionaries.nix
index 487ebe3ec86c..a621a93e3daa 100644
--- a/pkgs/by-name/hu/hunspell/dictionaries.nix
+++ b/pkgs/by-name/hu/hunspell/dictionaries.nix
@@ -831,7 +831,7 @@ rec {
       owner = "uzbek-net";
       repo = "uz-hunspell";
       tag = version;
-      hash = "sha256-EUYhnUWUy45AYGH+HoxaFFCBVnotsIm4GlpMBgnHxdo=";
+      hash = "sha256-l3Ll+mKjAndEcBX6jxTVEyHkMzuQpPDj+2kY5qtwzh8=";
     };
 
     shortName = "uz-uz";

From e1afd1e79d21c9c74463aa8966aed72f91599d27 Mon Sep 17 00:00:00 2001
From: Andrew Zah <zah@andrewzah.com>
Date: Mon, 20 Oct 2025 02:14:34 +0900
Subject: [PATCH 3102/6226] far2l: fix build issue related to cmake 4

---
 pkgs/by-name/fa/far2l/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/fa/far2l/package.nix b/pkgs/by-name/fa/far2l/package.nix
index 22c4ee27f6fa..ffb13b202ca0 100644
--- a/pkgs/by-name/fa/far2l/package.nix
+++ b/pkgs/by-name/fa/far2l/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   fetchFromGitHub,
   makeWrapper,
   cmake,
@@ -52,6 +53,14 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-a/k36O19z/lHnETOGIbTJ7BNAI5zOQxVUSp+nIM08i4=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "cmake4-fix";
+      url = "https://github.com/elfmz/far2l/commit/97ac0a3a0f29110a330d8f8634775e024561e817.patch?full_index=1";
+      hash = "sha256-LlCKgFPxoRrb2nD+PARsJCpUXqMO0rLyNbuvLh949fU=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     ninja

From 43fb145cbfd591b866f7debca8cb995b4057d19f Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Mon, 27 Oct 2025 06:30:56 +0000
Subject: [PATCH 3103/6226] commit: 4.3 -> 4.4

Diff: https://github.com/sonnyp/Commit/compare/v4.3...v4.4
---
 pkgs/by-name/co/commit/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/commit/package.nix b/pkgs/by-name/co/commit/package.nix
index 954e5ff444b8..19e68775bf79 100644
--- a/pkgs/by-name/co/commit/package.nix
+++ b/pkgs/by-name/co/commit/package.nix
@@ -10,6 +10,7 @@
   gtk4,
   gtksourceview5,
   libadwaita,
+  libportal,
   libspelling,
   meson,
   ninja,
@@ -20,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "commit";
-  version = "4.3";
+  version = "4.4";
 
   src = fetchFromGitHub {
     owner = "sonnyp";
     repo = "Commit";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-yNzMFOd0IN5EUKG7ztCEbQzQ9RHc+D4iC1OiBauMSwE=";
+    hash = "sha256-ACgt1xZTiHYiCTUvfQ+KP5TYm8tMimGizK1dn9UXzao=";
     fetchSubmodules = true;
   };
 
@@ -65,6 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     gjs
     gtksourceview5
     libadwaita
+    libportal
     libspelling
   ];
 

From e8a255e6ae8f91621dc3ffd51c7208a8437fbadf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 07:16:48 +0000
Subject: [PATCH 3104/6226] supabase-cli: 2.53.5 -> 2.54.8

---
 pkgs/by-name/su/supabase-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix
index 4554d70990a3..67bd8b05d94c 100644
--- a/pkgs/by-name/su/supabase-cli/package.nix
+++ b/pkgs/by-name/su/supabase-cli/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "supabase-cli";
-  version = "2.53.5";
+  version = "2.54.8";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-U91G/5eWj+ZHCq9GU9R+gSYhwez99xi6t4VWsnYpjtI=";
+    hash = "sha256-iU2NFb97458ouDYuTwgCIYtBpM11MXPWS4hV/Q4IDMs=";
   };
 
-  vendorHash = "sha256-ST1j+UXGs3mBf5NYe+sp+QXjHsey9ATOFdriIEBJpKM=";
+  vendorHash = "sha256-JhPKfSFQxFwH5nIYIO3mACdDfURIhuISs1tANiCfWSk=";
 
   ldflags = [
     "-s"

From c3b601e8d99bd24f2c31794435764919925fa499 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 07:24:54 +0000
Subject: [PATCH 3105/6226] cursor-cli: 0-unstable-2025-10-20 ->
 0-unstable-2025-10-22

---
 pkgs/by-name/cu/cursor-cli/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix
index 58215b6618de..55d794f0ac5c 100644
--- a/pkgs/by-name/cu/cursor-cli/package.nix
+++ b/pkgs/by-name/cu/cursor-cli/package.nix
@@ -9,26 +9,26 @@ let
   inherit (stdenv) hostPlatform;
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2025.10.20-f1b214f/linux/x64/agent-cli-package.tar.gz";
-      hash = "sha256-v6wGVuKrK4JFFaJN55le5+wZV7LI9Bc70Osc05F0PeQ=";
+      url = "https://downloads.cursor.com/lab/2025.10.22-f894c20/linux/x64/agent-cli-package.tar.gz";
+      hash = "sha256-bblnHWrPXJ9UmStfjUis1jLYLyawRchF0+UBMmPHy7M=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2025.10.20-f1b214f/linux/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-j3z3K2tt2wl54OjLMPudGnCP2+9U2dOspM0G0Ob68Ds=";
+      url = "https://downloads.cursor.com/lab/2025.10.22-f894c20/linux/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-MnL1TLI7ggi9qaicUN//8o3EJoCPd0gF9KKfekIhUM0=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2025.10.20-f1b214f/darwin/x64/agent-cli-package.tar.gz";
-      hash = "sha256-KRECUSqYohrCiF3YySZeJ0MaRhb7h+O+KyqCfpCbV8w=";
+      url = "https://downloads.cursor.com/lab/2025.10.22-f894c20/darwin/x64/agent-cli-package.tar.gz";
+      hash = "sha256-UEQyHEopNKf5uDUlZVzTESXVi8e2wHp83cD01diAISY=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2025.10.20-f1b214f/darwin/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-4S1HMPielrUwP5pyA/tp1FuByge9dcRx2XndTFnBKbY=";
+      url = "https://downloads.cursor.com/lab/2025.10.22-f894c20/darwin/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-18u5K/4Mc9+R32umaBWD5chgMoatkd/ZSMCiPElmPJU=";
     };
   };
 in
 stdenv.mkDerivation {
   pname = "cursor-cli";
-  version = "0-unstable-2025-10-20";
+  version = "0-unstable-2025-10-22";
 
   src = sources.${hostPlatform.system};
 

From dd9fbf60a7167fe933a1ee5fee01a7f9476d5771 Mon Sep 17 00:00:00 2001
From: Sam <30577766+Samasaur1@users.noreply.github.com>
Date: Sun, 26 Oct 2025 00:00:02 -0700
Subject: [PATCH 3106/6226] qt6.qtbase: override bad cmakeFlag in setup hook;
 fix finding frameworks

This essentially applies https://github.com/NixOS/nixpkgs/pull/455592 to
qtbase (and thus all packages depending on Qt on Darwin) without
rebuilding the world.

We're doing this so that Qt-based applications will be fixed faster than
the time it takes to wait for a staging cycle.
---
 pkgs/development/libraries/qt-6/modules/qtbase/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
index ab35d1906f73..b16805ed09c2 100644
--- a/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtbase/default.nix
@@ -292,6 +292,9 @@ stdenv.mkDerivation rec {
     # When this variable is not set, cmake tries to execute xcodebuild
     # to query the version.
     "-DQT_INTERNAL_XCODE_VERSION=0.1"
+    # This should be removed once https://github.com/NixOS/nixpkgs/pull/455592 makes it to master
+    # as it will become redundant.
+    "-DCMAKE_FIND_FRAMEWORK=FIRST"
   ]
   ++ lib.optionals isCrossBuild [
     "-DQT_HOST_PATH=${pkgsBuildBuild.qt6.qtbase}"

From 826567fc2347835a802670ad6bf20a8e4fd61ce5 Mon Sep 17 00:00:00 2001
From: EarthenGarland <>
Date: Wed, 22 Oct 2025 17:38:14 +0300
Subject: [PATCH 3107/6226] linuxKernel.kernels.linux_rt_{}: modify update
 script for sha256 -> hash

---
 pkgs/os-specific/linux/kernel/update-rt.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/update-rt.sh b/pkgs/os-specific/linux/kernel/update-rt.sh
index a9e0577fae92..38221e97716f 100755
--- a/pkgs/os-specific/linux/kernel/update-rt.sh
+++ b/pkgs/os-specific/linux/kernel/update-rt.sh
@@ -55,8 +55,8 @@ update-if-needed() {
         echo "$nixattr: $cur (up-to-date)"
         return
     fi
-    khash=$(nix-prefetch-url "$mirror/v${major}.x/linux-${kversion}.tar.xz")
-    phash=$(nix-prefetch-url "$mirror/projects/rt/${branch}/older/patch-${new}.patch.xz")
+    khash=$(nix-prefetch-url "$mirror/v${major}.x/linux-${kversion}.tar.xz" | nix-hash --type sha256 --to-sri)
+    phash=$(nix-prefetch-url "$mirror/projects/rt/${branch}/older/patch-${new}.patch.xz" | nix-hash --type sha256 --to-sri)
     if [ "$cur" ]; then
         msg="$nixattr: $cur -> $new"
     else
@@ -69,8 +69,8 @@ update-if-needed() {
     sed -i "$file" \
         -e "s/$cur/$new/" \
         -e "s|kernel/v[0-9]*|kernel/v$major|" \
-        -e "1,/.patch.xz/ s/sha256 = .*/sha256 = \"$khash\";/" \
-        -e "1,/.patch.xz/! s/sha256 = .*/sha256 = \"$phash\";/"
+        -e "1,/.patch.xz/ s|hash = .*|hash = \"$khash\";|" \
+        -e "1,/.patch.xz/! s|hash = .*|hash = \"$phash\";|"
     if [ "${COMMIT:-}" ]; then
         git add "$file"
         git commit -m "$msg"

From 9c13cbe1b5487107a5c1f2ace25ab38ae9305efa Mon Sep 17 00:00:00 2001
From: EarthenGarland <>
Date: Fri, 24 Oct 2025 16:05:24 +0300
Subject: [PATCH 3108/6226] linuxKernel.kernels.linux_rt_6_6: sha256 -> hash

---
 pkgs/os-specific/linux/kernel/linux-rt-6.6.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
index 5ce2e345bc97..d6783e3f3fe4 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-6.6.nix
@@ -29,7 +29,7 @@ buildLinux (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-      sha256 = "08la2f8w5w2x0l9nmvzsmbwa951xyshhvdhwwhfyjmka66zr4zbc";
+      hash = "sha256-bH2SvzFqVukd5By2DaH2PZSk+Kr672oTBV3wwpETiiI=";
     };
 
     kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
           name = "rt";
           patch = fetchurl {
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "01z2dwl54hfqfyc8xmlz6kaw522s55jsdrdw31pjnzkn6rxf7zbf";
+            hash = "sha256-bv3jejZ2fitvGLzlpmUpWojC1TSf1o6Yd9hBUihv4gc=";
           };
         };
       in

From f6ae789da3c133a3889a49e084fbb77f6b803a20 Mon Sep 17 00:00:00 2001
From: EarthenGarland <>
Date: Fri, 24 Oct 2025 16:06:26 +0300
Subject: [PATCH 3109/6226] linuxKernel.kernels.linux_rt_6_1: sha256 -> hash

---
 pkgs/os-specific/linux/kernel/linux-rt-6.1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
index 508da7ec98cd..25ee763a96b2 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-6.1.nix
@@ -29,7 +29,7 @@ buildLinux (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v6.x/linux-${kversion}.tar.xz";
-      sha256 = "13i2l04pmba7dksz2p5kwxgr5bydc5lp7284d4wfsnjf425i9fyl";
+      hash = "sha256-1LsUiyBOWu04aQSJc2lhza+SX+ezXPH1bEetegmgIo4=";
     };
 
     kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
           name = "rt";
           patch = fetchurl {
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "1smah5wa4lrgb13li025lpj80yxay4g13m7c4i09whxcgxhc294k";
+            hash = "sha256-kyTBYH+sQ55AJOzUER7xqnuA5KVFgEhHWC9ToniBquo=";
           };
         };
       in

From 57b4fd20badd0f8ef1346f9126bc9eb1a0cc9e6c Mon Sep 17 00:00:00 2001
From: EarthenGarland <>
Date: Fri, 24 Oct 2025 16:07:18 +0300
Subject: [PATCH 3110/6226] linuxKernel.kernels.linux_rt_5_15: sha256 -> hash

---
 pkgs/os-specific/linux/kernel/linux-rt-5.15.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
index 822d06217b1e..a694cf30d818 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.15.nix
@@ -29,7 +29,7 @@ buildLinux (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-      sha256 = "0hd4p76qv29zlr0iik4j9y9qynyqisk6bgfiqcwkk7gr6bf81l13";
+      hash = "sha256-I9CA3DL5nTk5w9G9ZaaO2FuPk0+SzBhBpj+Jjc25pEE=";
     };
 
     kernelPatches =
@@ -38,7 +38,7 @@ buildLinux (
           name = "rt";
           patch = fetchurl {
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "15n1l3b0yq7hl2zady3s3a3zym82clyycvf5icavvd68758sdp25";
+            hash = "sha256-RdymUTnItL0Vi8Vt5j1lAlX/hxp6+Ka+oPBgD9agwZY=";
           };
         };
       in

From 342a27929bf8d88ea5d71cc7fe76899e3286228d Mon Sep 17 00:00:00 2001
From: EarthenGarland <>
Date: Fri, 24 Oct 2025 16:08:07 +0300
Subject: [PATCH 3111/6226] linuxKernel.kernels.linux_rt_5_10: sha256 -> hash

---
 pkgs/os-specific/linux/kernel/linux-rt-5.10.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
index c3c11fd7cd94..85fb35f38dbf 100644
--- a/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
+++ b/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix
@@ -25,7 +25,7 @@ buildLinux (
 
     src = fetchurl {
       url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
-      sha256 = "17wxs8i8vd5ivv99ra0sri3wmkw5c22wsaw8nf1xcvys2kmpa7hk";
+      hash = "sha256-Ex516xTab9aDs4grzYVghc/KR8waqJzS3rG0jSLSnZ8=";
     };
 
     kernelPatches =
@@ -34,7 +34,7 @@ buildLinux (
           name = "rt";
           patch = fetchurl {
             url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
-            sha256 = "1nqdshpcf775cmb1kqcq939b7qx6wsy91pf0l0vsd3rdpixidzyk";
+            hash = "sha256-0/8We7wtj6Y3oMDdkLzmpuOz0kiY4RlWZeUcxy7UDds=";
           };
         };
       in

From 38dd88e38a911e25bc205aa4ed6c365d67a804f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 07:36:29 +0000
Subject: [PATCH 3112/6226] tokyonight-gtk-theme: 0-unstable-2025-10-14 ->
 0-unstable-2025-10-23

---
 pkgs/by-name/to/tokyonight-gtk-theme/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
index d7570353e5cb..08031e8f6c9a 100644
--- a/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
+++ b/pkgs/by-name/to/tokyonight-gtk-theme/package.nix
@@ -71,13 +71,13 @@ lib.checkListOfEnum "${pname}: colorVariants" colorVariantList colorVariants lib
   stdenvNoCC.mkDerivation
   {
     inherit pname;
-    version = "0-unstable-2025-10-14";
+    version = "0-unstable-2025-10-23";
 
     src = fetchFromGitHub {
       owner = "Fausto-Korpsvart";
       repo = "Tokyonight-GTK-Theme";
-      rev = "9d67b24f1d326816a645ba47933f9986a1ff8a23";
-      hash = "sha256-KsVa5tAi8mPmfSxtO34swNErRgAprBV6xr1+2rkCXCI=";
+      rev = "6c340e058e84c1975a038a8e5d1e384477225dc0";
+      hash = "sha256-7H2n9wTaW8Db1RejWK071ITV1j5KIuzfql0Tx9WT6zM=";
     };
 
     propagatedUserEnvPkgs = [ gtk-engine-murrine ];

From 10760f8ce61c8996877e458a3b55a8b78c6a9e24 Mon Sep 17 00:00:00 2001
From: goatastronaut0212 <goatastronaut0212@outlook.com>
Date: Mon, 27 Oct 2025 14:46:07 +0700
Subject: [PATCH 3113/6226] maintainers: remove astronaut0212

---
 maintainers/maintainer-list.nix                             | 6 ------
 pkgs/by-name/ca/caprine/package.nix                         | 1 -
 .../tools/inputmethods/ibus-engines/ibus-bamboo/default.nix | 2 +-
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 7ca954e260cd..f5a59cd265ae 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2360,12 +2360,6 @@
     name = "Vincent Fischer";
     keys = [ { fingerprint = "BF47 81E1 F304 1ADF 18CE  C401 DE16 C7D1 536D A72F"; } ];
   };
-  astronaut0212 = {
-    email = "goatastronaut0212@outlook.com";
-    github = "goatastronaut0212";
-    githubId = 119769817;
-    name = "goatastronaut0212";
-  };
   asymmetric = {
     email = "lorenzo@mailbox.org";
     github = "asymmetric";
diff --git a/pkgs/by-name/ca/caprine/package.nix b/pkgs/by-name/ca/caprine/package.nix
index 17d78ba28d9b..a59ef46cfc20 100644
--- a/pkgs/by-name/ca/caprine/package.nix
+++ b/pkgs/by-name/ca/caprine/package.nix
@@ -90,7 +90,6 @@ buildNpmPackage rec {
     homepage = "https://github.com/sindresorhus/caprine";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      astronaut0212
       khaneliman
     ];
     inherit (electron.meta) platforms;
diff --git a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
index 3341b2ff2ed5..df9a14bddd2c 100644
--- a/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
+++ b/pkgs/tools/inputmethods/ibus-engines/ibus-bamboo/default.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/BambooEngine/ibus-bamboo";
     license = licenses.gpl3;
     platforms = platforms.linux;
-    maintainers = with maintainers; [ astronaut0212 ];
+    maintainers = [ ];
   };
 }

From 623b33839a5d5f43491ce25a20c30f92cc7549d9 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 27 Oct 2025 09:01:17 +0100
Subject: [PATCH 3114/6226] workflows/backport: persist credentials

This was added when introducing zizmor. It appears that the backport
action actually needs these credentials to persist, to be able to push
the branch.
---
 .github/workflows/backport.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 17a103c4ca7d..1826675c7501 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -40,7 +40,7 @@ jobs:
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           token: ${{ steps.app-token.outputs.token }}
-          persist-credentials: false
+          persist-credentials: true
 
       - name: Log current API rate limits
         env:

From 52f305407cc41dfd5cd9238b8d192cd570ad7b84 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Mon, 27 Oct 2025 11:41:56 +0400
Subject: [PATCH 3115/6226] kibi: modernize

---
 pkgs/by-name/ki/kibi/package.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ki/kibi/package.nix b/pkgs/by-name/ki/kibi/package.nix
index dd8b58ce5ea5..268ba30f54a7 100644
--- a/pkgs/by-name/ki/kibi/package.nix
+++ b/pkgs/by-name/ki/kibi/package.nix
@@ -5,7 +5,7 @@
   makeWrapper,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "kibi";
   version = "0.3.0";
 
@@ -14,22 +14,27 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "ilai-deutel";
     repo = "kibi";
-    rev = "v${version}";
-    sha256 = "sha256-6uDpTQ97eNgM1lCiYPWS5QPxMNcPF3Ix14VaGiTY4Kc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-6uDpTQ97eNgM1lCiYPWS5QPxMNcPF3Ix14VaGiTY4Kc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
   postInstall = ''
     install -Dm644 syntax.d/* -t $out/share/kibi/syntax.d
+    install -Dm644 kibi.desktop -t $out/share/applications
+    install -Dm0644 assets/logo.svg $out/share/icons/hicolor/scalable/apps/kibi.svg
     wrapProgram $out/bin/kibi --prefix XDG_DATA_DIRS : "$out/share"
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Text editor in ≤1024 lines of code, written in Rust";
     homepage = "https://github.com/ilai-deutel/kibi";
-    license = licenses.mit;
-    maintainers = with maintainers; [ robertodr ];
+    license = with lib.licenses; [
+      asl20
+      mit
+    ];
+    maintainers = with lib.maintainers; [ robertodr ];
     mainProgram = "kibi";
   };
-}
+})

From c499a89db4c6748bbd0453012d13c0f8e1fc065c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 08:17:44 +0000
Subject: [PATCH 3116/6226] slint-lsp: 1.13.1 -> 1.14.1

---
 pkgs/by-name/sl/slint-lsp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sl/slint-lsp/package.nix b/pkgs/by-name/sl/slint-lsp/package.nix
index 2edeb1b5674e..ff24feebaa9b 100644
--- a/pkgs/by-name/sl/slint-lsp/package.nix
+++ b/pkgs/by-name/sl/slint-lsp/package.nix
@@ -15,14 +15,14 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "slint-lsp";
-  version = "1.13.1";
+  version = "1.14.1";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-XEs7zJWocRZgVPPDM/IxOOwE7ofh+b7A/TJrQw/mMOo=";
+    hash = "sha256-gVRoca4u1TVArDF226JWzLQJhUAIWA2JDyQ3Wo87AkA=";
   };
 
-  cargoHash = "sha256-DAoqfnis95oEPBgYeOdR3zUVdoKbay780iJ6zVkxdDU=";
+  cargoHash = "sha256-f3RLJnxoEUm7gsfqj86wXgfOj9woGmisONv0RZAQCGc=";
 
   rpathLibs = [
     fontconfig

From ca2e941373ff95da145c7fa2d44c0eb8bb07c913 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 27 Oct 2025 08:21:25 +0000
Subject: [PATCH 3117/6226] jellyfin-web: 10.11.0 -> 10.11.1

---
 pkgs/by-name/je/jellyfin-web/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix
index 9b2adf43eef9..1fd996138e24 100644
--- a/pkgs/by-name/je/jellyfin-web/package.nix
+++ b/pkgs/by-name/je/jellyfin-web/package.nix
@@ -13,7 +13,7 @@
 }:
 buildNpmPackage rec {
   pname = "jellyfin-web";
-  version = "10.11.0";
+  version = "10.11.1";
 
   src =
     assert version == jellyfin.version;
@@ -21,7 +21,7 @@ buildNpmPackage rec {
       owner = "jellyfin";
       repo = "jellyfin-web";
       rev = "v${version}";
-      hash = "sha256-LcZNfFXM2dFHeUheSnri1t4eBYvlCfF2wlaqWlh+U7A=";
+      hash = "sha256-1T2+9o/K8w7Roflb/LWOYabuol14fHK4fnMxkrf2L88=";
     };
 
   nodejs = nodejs_20; # does not build with 22
@@ -31,7 +31,7 @@ buildNpmPackage rec {
       --replace-fail "git describe --always --dirty" "echo ${src.rev}" \
   '';
 
-  npmDepsHash = "sha256-w3xMbkxNGFEBR2K1PhJW6pr943DfJvyQvILiF0VuLlw=";
+  npmDepsHash = "sha256-5vNlT9RhY/I+nHVjMfJAsBqPT8ndOJe4KO0Ysl2t1tY=";
 
   preBuild = ''
     # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart

From 795c9ef35e34376cc4e530aa4e4409fbfcd83d60 Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 27 Oct 2025 08:21:58 +0000
Subject: [PATCH 3118/6226] jellyfin: 10.11.0 -> 10.11.1

---
 pkgs/by-name/je/jellyfin/nuget-deps.json | 4 ++--
 pkgs/by-name/je/jellyfin/package.nix     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/je/jellyfin/nuget-deps.json b/pkgs/by-name/je/jellyfin/nuget-deps.json
index c82b74619fea..03a118c5a9e3 100644
--- a/pkgs/by-name/je/jellyfin/nuget-deps.json
+++ b/pkgs/by-name/je/jellyfin/nuget-deps.json
@@ -1346,8 +1346,8 @@
   },
   {
     "pname": "z440.atl.core",
-    "version": "7.5.0",
-    "hash": "sha256-denTZd9A4zV2Plg7PtRf6bc1gzXzxgTWPp1bs1NShwA="
+    "version": "7.6.0",
+    "hash": "sha256-J5wLcYuVNETDwrokDGWM5qcKGO4xyJFjJRe2F/v7OxA="
   },
   {
     "pname": "zlib.net-mutliplatform",
diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix
index 53dbebbb2b56..b1bf8c3edadb 100644
--- a/pkgs/by-name/je/jellyfin/package.nix
+++ b/pkgs/by-name/je/jellyfin/package.nix
@@ -13,13 +13,13 @@
 
 buildDotnetModule rec {
   pname = "jellyfin";
-  version = "10.11.0"; # ensure that jellyfin-web has matching version
+  version = "10.11.1"; # ensure that jellyfin-web has matching version
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin";
     rev = "v${version}";
-    hash = "sha256-8kvN2ZugmjjgSMepDdP9tc48362b6w+RpIsp/IXaivM=";
+    hash = "sha256-8D8cwAqu+cfTR1SwwHTtPnMG2iaLTWSYoAig6g2jsTA=";
   };
 
   propagatedBuildInputs = [ sqlite ];

From b7eef3bb56e361ab9a63a0bf4300778af3e890c8 Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Mon, 27 Oct 2025 09:28:29 +0100
Subject: [PATCH 3119/6226] libreoffice-collabora: comment out the duplicate
 patch

Fix duplication introduced in #455940 while fixing the build of other branches
---
 pkgs/applications/office/libreoffice/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 8da0b046cba1..705fa91eaef4 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -341,11 +341,14 @@ stdenv.mkDerivation (finalAttrs: {
       includes = [ "sdext/*" ];
       hash = "sha256-8yipl5ln1yCNfVM8SuWowsw1Iy/SXIwbdT1ZfNw4cJA=";
     })
-    # Fix build with Poppler 25.10
-    (fetchpatch2 {
-      url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/f5241554e4a0f6fd95ac4e5cc398a30243407e6a/fix_build_with_poppler_25.10.patch";
-      hash = "sha256-lbPOkc1HeT5Qsp6XfVyVJtmvSL68qTrmbd3q9lvKSu8=";
-    })
+    # Currently included in the condition above
+    # Uncomment if Collabora is again the only version needing it
+    # Remove if Collabora is updated far enough not to need it anymore
+    ## Fix build with Poppler 25.10
+    #(fetchpatch2 {
+    #  url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/f5241554e4a0f6fd95ac4e5cc398a30243407e6a/fix_build_with_poppler_25.10.patch";
+    #  hash = "sha256-lbPOkc1HeT5Qsp6XfVyVJtmvSL68qTrmbd3q9lvKSu8=";
+    #})
   ]
   ++ lib.optionals (variant == "collabora") [
     ./fix-unpack-collabora.patch

From 3e459bd9d9d2922917c4f39d4b35fac3ca0df6e9 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Mon, 27 Oct 2025 06:32:21 +0000
Subject: [PATCH 3120/6226] letterpress: 2.1 -> 2.2

Changelog: https://gitlab.gnome.org/World/Letterpress/-/releases/2.2
Diff: https://gitlab.gnome.org/World/Letterpress/-/compare/2.1..2.2
---
 pkgs/by-name/le/letterpress/package.nix | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/le/letterpress/package.nix b/pkgs/by-name/le/letterpress/package.nix
index e83eaa0811cf..89092dd68145 100644
--- a/pkgs/by-name/le/letterpress/package.nix
+++ b/pkgs/by-name/le/letterpress/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   fetchFromGitLab,
-  fetchpatch,
   wrapGAppsHook4,
   appstream,
   blueprint-compiler,
@@ -18,25 +17,16 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "letterpress";
-  version = "2.1";
+  version = "2.2";
 
   src = fetchFromGitLab {
     domain = "gitlab.gnome.org";
     owner = "World";
     repo = "letterpress";
     rev = version;
-    hash = "sha256-9U8iH3V4WMljdtWLmb0RlexLeAN5StJ0c9RlEB2E7Xs=";
+    hash = "sha256-cqLodI6UjdLCKLGGcSIbXu1+LOcq2DE00V+lVS7OBMg=";
   };
 
-  patches = [
-    # Fix application segmentation fault on file chooser dialog opening
-    # https://gitlab.gnome.org/World/Letterpress/-/merge_requests/16
-    (fetchpatch {
-      url = "https://gitlab.gnome.org/World/Letterpress/-/commit/15059eacca14204d1092a6e32ef30c6ce4df6d36.patch";
-      hash = "sha256-pjg/O9advtkZ0l73GQtL/GYcTWeOs5l3VGOdnsZCWI0=";
-    })
-  ];
-
   runtimeDeps = [
     jp2a
   ];
@@ -81,6 +71,7 @@ python3Packages.buildPythonApplication rec {
       High-res output can still be viewed comfortably by lowering the zoom factor.
     '';
     homepage = "https://apps.gnome.org/Letterpress/";
+    changelog = "https://gitlab.gnome.org/World/Letterpress/-/releases/${version}";
     license = licenses.gpl3Plus;
     maintainers = [ maintainers.dawidd6 ];
     teams = [ teams.gnome-circle ];

From 26e5c8f22b6e184dfc41601b5379e2416ad47efd Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Mon, 27 Oct 2025 06:32:31 +0000
Subject: [PATCH 3121/6226] lock: 1.8.0 -> 1.8.1

Diff: https://github.com/konstantintutsch/Lock/compare/v1.8.0...v1.8.1
---
 pkgs/by-name/lo/lock/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lo/lock/package.nix b/pkgs/by-name/lo/lock/package.nix
index e4c969a6b776..efba345158d5 100644
--- a/pkgs/by-name/lo/lock/package.nix
+++ b/pkgs/by-name/lo/lock/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lock";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "konstantintutsch";
     repo = "Lock";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-t472uLuuT5QPmfxkRP6wPalblMU68iD2wyKOxSrJfeU=";
+    hash = "sha256-W51V5Nz4TSN6F0/XOvn9givUIfAnI0SefooUQyj1AqM=";
   };
 
   strictDeps = true;

From 6aa361c23e107c6c13aa94e971590c37961ee7ca Mon Sep 17 00:00:00 2001
From: Haris <git@haris.paris>
Date: Mon, 27 Oct 2025 09:46:47 +0100
Subject: [PATCH 3122/6226] teams-for-linux: add maintainer HarisDotParis

---
 pkgs/by-name/te/teams-for-linux/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index 8791ec8783c7..064f9c3b10c5 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -132,6 +132,7 @@ buildNpmPackage rec {
       qjoly
       chvp
       khaneliman
+      HarisDotParis
     ];
     platforms = with lib.platforms; darwin ++ linux;
   };

From 9d24cf1d16ec0bb35d1ecb29fa67ea93f930678c Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Sun, 26 Oct 2025 01:52:21 +0000
Subject: [PATCH 3123/6226] fcitx5-chinese-addons: 5.1.9 -> 5.1.10

Diff: https://github.com/fcitx/fcitx5-chinese-addons/compare/5.1.9...5.1.10
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
index 90919a8c05b6..8a5d88de0cb0 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix
@@ -34,13 +34,13 @@ in
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-chinese-addons";
-  version = "5.1.9";
+  version = "5.1.10";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-xHLd7X9IdYTsVyqbghVzdC2i9AVipFHKRxP2Zqq7zGw=";
+    hash = "sha256-kVBDfr8NKsQQQX69N3/fVqJgObRNSX2p0GNSUjbZvcg=";
   };
 
   nativeBuildInputs = [

From 02eccd4dc104c32f5c96d2857667ab3e0a113d3f Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Sun, 26 Oct 2025 01:52:23 +0000
Subject: [PATCH 3124/6226] fcitx5-configtool: 5.1.10 -> 5.1.11

Diff: https://github.com/fcitx/fcitx5-configtool/compare/5.1.10...5.1.11
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
index caf4dc8be63c..42624da68c7c 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-configtool.nix
@@ -31,13 +31,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-configtool";
-  version = "5.1.10";
+  version = "5.1.11";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-Py2UDBQRqvT7kwZeQIXKrIjGAbOjjxEyEfO5tdtizW4=";
+    hash = "sha256-SEQelUMigcqs0C+jY+A/dfncEogzU1e5tjP+wK+MylM=";
   };
 
   cmakeFlags = [

From e3ff110b4a3187b813288f51727c30754b74bf9f Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Sun, 26 Oct 2025 01:52:26 +0000
Subject: [PATCH 3125/6226] fcitx5-hangul: 5.1.7 -> 5.1.8

Diff: https://github.com/fcitx/fcitx5-hangul/compare/5.1.7...5.1.8
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
index 71c46f893bc0..2f36dd961401 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-hangul.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-hangul";
-  version = "5.1.7";
+  version = "5.1.8";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-66VW/hzKMVwXd7ktPQHrVbsWazKedS+/giTLIh5fkwo=";
+    hash = "sha256-6aBn0muWbmdxqUCrrXDRd4MZP7QUMX1ZHcAUdTF9Kys=";
   };
 
   nativeBuildInputs = [

From 5bbbe9c40d346836c4c052c98239c6e55147fb42 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Sun, 26 Oct 2025 01:52:28 +0000
Subject: [PATCH 3126/6226] fcitx5-m17n: 5.1.4 -> 5.1.5

Diff: https://github.com/fcitx/fcitx5-m17n/compare/5.1.4...5.1.5
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
index 5b67a02e4689..76c76e229c80 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-m17n.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-m17n";
-  version = "5.1.4";
+  version = "5.1.5";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-TJMJGjO9V6EOzxt6Z7rwOfIQWK38XolDhUKbjbNUGhA=";
+    hash = "sha256-gvR//H+Kf/pYv6Avr0No8PZO7hAnOHj16v6n+tDXgkU=";
   };
 
   nativeBuildInputs = [

From d738b98de2331427dfd7d929bb50fba8b8472e47 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Sun, 26 Oct 2025 01:52:30 +0000
Subject: [PATCH 3127/6226] qt6Packages.fcitx5-qt: 5.1.10 -> 5.1.11

Diff: https://github.com/fcitx/fcitx5-qt/compare/5.1.10...5.1.11
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix | 21 ++------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
index efc7719e6c8b..60de5a67b019 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix
@@ -10,38 +10,21 @@
   qtwayland,
   wrapQtAppsHook,
   wayland,
-  fetchpatch2,
 }:
 let
   majorVersion = lib.versions.major qtbase.version;
 in
 stdenv.mkDerivation rec {
   pname = "fcitx5-qt${majorVersion}";
-  version = "5.1.10";
+  version = "5.1.11";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-qt";
     rev = version;
-    hash = "sha256-JhmaAAJ1fevCPItVnneUCAalnDDaCjjkAl9QRhSkBk4=";
+    hash = "sha256-Nr8WnEm6z16NrXxuGEP4uQ6mxe8sUYtOxVgWMmFrWVE=";
   };
 
-  patches = [
-    # TODO: remove on next release
-    (fetchpatch2 {
-      url = "https://github.com/fcitx/fcitx5-qt/commit/46a07a85d191fd77a1efc39c8ed43d0cd87788d2.patch?full_index=1";
-      hash = "sha256-qv8Rj6YoFdMQLOB2R9LGgwCHKdhEji0Sg67W37jSIac=";
-    })
-    (fetchpatch2 {
-      url = "https://github.com/fcitx/fcitx5-qt/commit/6ac4fdd8e90ff9c25a5219e15e83740fa38c9c71.patch?full_index=1";
-      hash = "sha256-x0OdlIVmwVuq2TfBlgmfwaQszXLxwRFVf+gEU224uVA=";
-    })
-    (fetchpatch2 {
-      url = "https://github.com/fcitx/fcitx5-qt/commit/1d07f7e8d6a7ae8651eda658f87ab0c9df08bef4.patch?full_index=1";
-      hash = "sha256-22tKD7sbsTJcNqur9/Uf+XAvMvA7tzNQ9hUCMm+E+E0=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace qt${majorVersion}/platforminputcontext/CMakeLists.txt \
       --replace \$"{CMAKE_INSTALL_QT${majorVersion}PLUGINDIR}" $out/${qtbase.qtPluginPrefix}

From 6b59e403ad7354f1647585dc8dcd86f4181f5bef Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Sun, 26 Oct 2025 01:52:33 +0000
Subject: [PATCH 3128/6226] fcitx5-rime: 5.1.11 -> 5.1.12

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
index 43872c8b4f67..166940e436c4 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-rime.nix
@@ -16,11 +16,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-rime";
-  version = "5.1.11";
+  version = "5.1.12";
 
   src = fetchurl {
     url = "https://download.fcitx-im.org/fcitx5/${pname}/${pname}-${version}.tar.zst";
-    hash = "sha256-cc/B99tdVVWnvdl7dYYQlIvk8F2xXUOr6sF36yxQZfY=";
+    hash = "sha256-A7x7PQiyPAprJRg1tdk1Amq7pAhe8ney2KX9+9F0mK4=";
   };
 
   cmakeFlags = [

From 32085c5f4ba7ae3dce38dc43c6aa7382dc239b54 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Sun, 26 Oct 2025 01:52:35 +0000
Subject: [PATCH 3129/6226] fcitx5-skk: 5.1.7 -> 5.1.8

Diff: https://github.com/fcitx/fcitx5-skk/compare/5.1.7...5.1.8
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
index e85712781d50..46abbdf069bf 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-skk.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-skk";
-  version = "5.1.7";
+  version = "5.1.8";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-WMkcZSocanhWMn9kiWyB07jEW4x84G07kAYvn5heenc=";
+    hash = "sha256-1omxT31hKe7gQ5BARJ+0tIp4RT5eM+Tjufd6s/PxBoY=";
   };
 
   nativeBuildInputs = [

From f069d426b1b85ce88ed2c9293ebe1e38adfa0e8d Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Sun, 26 Oct 2025 01:52:39 +0000
Subject: [PATCH 3130/6226] fcitx5-table-extra: 5.1.8 -> 5.1.9

Diff: https://github.com/fcitx/fcitx5-table-extra/compare/5.1.8...5.1.9
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
index 5b4b1ce3a263..ad4b33829f81 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-table-extra.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-table-extra";
-  version = "5.1.8";
+  version = "5.1.9";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-FrVkSDLH6lYQbhvcxtX/IQpRC3dphsHu7xVdgnDNcgg=";
+    hash = "sha256-ISfpS48J9gfnYTKCgfV0XQ30J/yYoX+HbyNQDIEHVdw=";
   };
 
   nativeBuildInputs = [

From e80d4a704d7ca7b079e6540929c53757f752b4fb Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Sun, 26 Oct 2025 01:52:42 +0000
Subject: [PATCH 3131/6226] fcitx5-unikey: 5.1.7 -> 5.1.8

Diff: https://github.com/fcitx/fcitx5-unikey/compare/5.1.7...5.1.8
---
 pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
index f1d4f6523e43..991536fe2146 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-unikey.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "fcitx5-unikey";
-  version = "5.1.7";
+  version = "5.1.8";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-unikey";
     rev = version;
-    hash = "sha256-ve+vu/bK3GYgjn9KxuOsFZFi9eymi1TFlzUHu4fJAkk=";
+    hash = "sha256-Yeyk6c4bjsxTi8DvRBGip/gayKaOvO6R5PGYkc0uUdk=";
   };
 
   nativeBuildInputs = [

From 471dfbb38ce63541f5d774b59bb2cf3f2a16fd46 Mon Sep 17 00:00:00 2001
From: Vonfry <dev@vonfry.name>
Date: Mon, 27 Oct 2025 07:52:57 +0000
Subject: [PATCH 3132/6226] fcitx5: 5.1.15 -> 5.1.16

Diff: https://github.com/fcitx/fcitx5/compare/5.1.15...5.1.16
---
 pkgs/tools/inputmethods/fcitx5/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix
index e2f98fb417cc..ea67b9f186e6 100644
--- a/pkgs/tools/inputmethods/fcitx5/default.nix
+++ b/pkgs/tools/inputmethods/fcitx5/default.nix
@@ -45,13 +45,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "fcitx5";
-  version = "5.1.15";
+  version = "5.1.16";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = pname;
     rev = version;
-    hash = "sha256-g9qDdDx+y/Vmky3pjlG77wsVERWB7ZpnDw+edhYw9Ss=";
+    hash = "sha256-aedYDpxYeUXadJnV+u1cQrNGoiW8WZKAgP4eNcvkScI=";
   };
 
   prePatch = ''

From 78c1d0ba4ed1fce051f751d3e3ba91358c798f3c Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Thu, 3 Jul 2025 00:16:46 +0200
Subject: [PATCH 3133/6226] linux: Enable Virtualbox guest modules

The mainline Linux kernel modules for VirtualBox guests are enabled by
many other distros. It seems reasonable to assume that they are stable
and functional enough at this point. The modules include vboxguest,
vboxvideo and vboxsf. So enable them for NixOS too.

This provides an overview about what other Linux distros do:

* [Arch](https://archlinux.org/packages/?sort=&q=virtualbox&maintainer=&flagged=)
  * [Enabled mainline](https://gitlab.archlinux.org/archlinux/packaging/packages/linux/-/commit/4ce5aa26d45f2ec30ffb926f3450ae225226dc41) Virtualbox guest kernel modules
  * No guest modules package, only guest utils

* [Alpine](https://pkgs.alpinelinux.org/packages?name=*virtualbox*&branch=edge&repo=&arch=x86_64&origin=&flagged=&maintainer=)
  * [Enabled mainline](https://gitlab.alpinelinux.org/alpine/aports/-/blob/master/main/linux-lts/lts.x86_64.config?__goaway_challenge=cookie&__goaway_id=6d9c6ce73df12ad9d4edd231da8d2b12&__goaway_referer=https%3A%2F%2Fgithub.com%2F#L2750) Virtualbox guest kernel modules
  * no guest modules package, only guest utils

* [openSUSE](https://software.opensuse.org/search?q=virtualbox&baseproject=openSUSE%3AFactory)
  * [Enabled mainline](https://software.opensuse.org/package/kernel-default) Virtualbox guest kernel modules
  * 3rd-party modules are shipped with host modules in one package
    * [Stable](https://software.opensuse.org/package/virtualbox-kmp-default)
    * [LTS](https://software.opensuse.org/package/virtualbox-kmp-longterm)

* [Debian](https://packages.debian.org/search?suite=sid&searchon=names&keywords=virtualbox)
  * [Enabled mainline](https://salsa.debian.org/search?search=vbox&nav_source=navbar&project_id=18670&group_id=2107&search_code=true&repository_ref=debian%2Flatest) Virtualbox guest kernel modules
  * No guest modules package, only guest utils
  * [File search for vboxguest.ko](https://packages.debian.org/search?suite=bookworm&arch=any&mode=exactfilename&searchon=contents&keywords=vboxguest.ko), only shipped by the kernel package

* [Gentoo](https://packages.gentoo.org/packages/search?q=virtualbox)
  * [Enabled mainline](https://github.com/projg2/fedora-kernel-config-for-gentoo/blob/6.12.8-gentoo/kernel-x86_64-fedora.config#L8486) Virtualbox guest kernel modules
  * [Packaged 3rd-party](https://packages.gentoo.org/packages/app-emulation/virtualbox-guest-modules) kernel modules for guests

* [Fedora](https://packages.fedoraproject.org/search?query=virtualbox)
  * [Enabled mainline](https://src.fedoraproject.org/rpms/kernel/c/5d7cf4582847852950c9650e68943241cf68468a) Virtualbox guest kernel modules
  * No guest modules package, only guest utils

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/os-specific/linux/kernel/common-config.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 4fa16a094bdc..cb70dfbeeccf 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -975,12 +975,6 @@ let
 
       UDMABUF = yes;
 
-      # VirtualBox guest drivers in the kernel conflict with the ones in the
-      # official additions package and prevent the vboxsf module from loading,
-      # so disable them for now.
-      VBOXGUEST = option no;
-      DRM_VBOXVIDEO = option no;
-
       XEN = option yes;
       XEN_DOM0 = option yes;
       PCI_XEN = option yes;

From cc949077f04ac3d33f24b9057e14b1109ee5b8d7 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Mon, 27 Oct 2025 08:59:01 +0000
Subject: [PATCH 3134/6226] tahoe-lafs: 1.20.0 -> 1.20.0-unstable-2025-10-12

https://github.com/tahoe-lafs/tahoe-lafs/compare/refs/tags/tahoe-lafs-1.20.0...7b96d16aba511fd34dcc0c14c9db754229e19531
---
 pkgs/by-name/ta/tahoe-lafs/package.nix | 44 +++++++-------------------
 1 file changed, 11 insertions(+), 33 deletions(-)

diff --git a/pkgs/by-name/ta/tahoe-lafs/package.nix b/pkgs/by-name/ta/tahoe-lafs/package.nix
index 7d8f4d3a089c..5ff134b95b73 100644
--- a/pkgs/by-name/ta/tahoe-lafs/package.nix
+++ b/pkgs/by-name/ta/tahoe-lafs/package.nix
@@ -1,47 +1,25 @@
 {
   lib,
-  python3,
+  python3Packages,
   fetchFromGitHub,
   texinfo,
   versionCheckHook,
 }:
 
-let
-  python = python3.override {
-    self = python;
-    packageOverrides = self: super: {
-      # tahoe-lafs is incompatible with magic-wormhole >= 0.19.0
-      # TODO: unpin, when https://tahoe-lafs.org/trac/tahoe-lafs/ticket/4180 is fixed
-      magic-wormhole = super.magic-wormhole.overridePythonAttrs (oldAttrs: rec {
-        version = "0.18.0";
-
-        src = fetchFromGitHub {
-          owner = "magic-wormhole";
-          repo = "magic-wormhole";
-          tag = version;
-          hash = "sha256-FQ7m6hkJcFZaE+ptDALq/gijn/RcAM1Zvzi2+xpoXBU=";
-        };
-
-        nativeCheckInputs = lib.filter (
-          input: (input.pname or null) != "pytest-twisted"
-        ) oldAttrs.nativeCheckInputs;
-
-        doCheck = false;
-      });
-    };
-  };
-  python3Packages = python.pkgs;
-in
 python3Packages.buildPythonApplication rec {
   pname = "tahoe-lafs";
-  version = "1.20.0";
+  version = "1.20.0-unstable-2025-10-12";
   pyproject = true;
 
+  # workaround required to build an unstable version
+  # TODO: when moving to a tagged version, remove this and the workaround for versionCheckHook
+  env.SETUPTOOLS_SCM_PRETEND_VERSION = builtins.elemAt (builtins.split "-" version) 0;
+
   src = fetchFromGitHub {
     owner = "tahoe-lafs";
     repo = "tahoe-lafs";
-    tag = "tahoe-lafs-${version}";
-    hash = "sha256-9qaL4GmdjClviKTnwAxaTywvJChQ5cVVgWs1IkFxhIY=";
+    rev = "7b96d16aba511fd34dcc0c14c9db754229e19531";
+    hash = "sha256-7qMeyL0j0D6Yos7qDhhplinKPV87Vu72dbE4eWql/g4=";
   };
 
   outputs = [
@@ -89,8 +67,8 @@ python3Packages.buildPythonApplication rec {
       eliot
       filelock
       foolscap
-      future
       klein
+      legacy-cgi
       magic-wormhole
       netifaces
       psutil
@@ -139,13 +117,13 @@ python3Packages.buildPythonApplication rec {
     ++ [
       versionCheckHook
     ];
-  versionCheckProgram = "${placeholder "out"}/bin/tahoe";
+
   versionCheckProgramArg = "--version";
 
   checkPhase = ''
     runHook preCheck
 
-    runHook versionCheckHook
+    version=$SETUPTOOLS_SCM_PRETEND_VERSION runHook versionCheckHook
     trial --rterrors allmydata
 
     runHook postCheck

From 5ef030a22cd4651b45f6d71c7fe3bb157a252967 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Mon, 27 Oct 2025 08:59:01 +0000
Subject: [PATCH 3135/6226] tahoe-lafs: install man pages

---
 pkgs/by-name/ta/tahoe-lafs/package.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ta/tahoe-lafs/package.nix b/pkgs/by-name/ta/tahoe-lafs/package.nix
index 5ff134b95b73..0850840ca3fb 100644
--- a/pkgs/by-name/ta/tahoe-lafs/package.nix
+++ b/pkgs/by-name/ta/tahoe-lafs/package.nix
@@ -2,6 +2,7 @@
   lib,
   python3Packages,
   fetchFromGitHub,
+  installShellFiles,
   texinfo,
   versionCheckHook,
 }:
@@ -26,6 +27,7 @@ python3Packages.buildPythonApplication rec {
     "out"
     "doc"
     "info"
+    "man"
   ];
 
   # Remove broken and expensive tests.
@@ -46,13 +48,16 @@ python3Packages.buildPythonApplication rec {
     hatchling
   ];
 
-  nativeBuildInputs = with python3Packages; [
-    # docs
+  nativeBuildInputs = # docs
+  [
+    installShellFiles
+    texinfo
+  ]
+  ++ (with python3Packages; [
     recommonmark
     sphinx
     sphinx-rtd-theme
-    texinfo
-  ];
+  ]);
 
   dependencies =
     with python3Packages;
@@ -99,6 +104,8 @@ python3Packages.buildPythonApplication rec {
       make info
       mkdir -p "$info/share/info"
       cp -rv _build/texinfo/*.info "$info/share/info"
+
+      installManPage man/man*/*
     )
   '';
 

From a04143ad7f817c0e80664e6677eebc9b0134d3aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 09:01:54 +0000
Subject: [PATCH 3136/6226] python3Packages.django-mfa3: 1.0.0 -> 1.1.0

---
 pkgs/development/python-modules/django-mfa3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-mfa3/default.nix b/pkgs/development/python-modules/django-mfa3/default.nix
index 2f7cfff01122..bace45bf13c9 100644
--- a/pkgs/development/python-modules/django-mfa3/default.nix
+++ b/pkgs/development/python-modules/django-mfa3/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "django-mfa3";
-  version = "1.0.0";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "xi";
     repo = "django-mfa3";
     tag = version;
-    hash = "sha256-bgIzrSM8KP6uQHvn393NWYw9DODdHLMqKn6pgw3EG/w=";
+    hash = "sha256-J31NiqOysOS6FFDCaCiPAJUBvD0Xu99sIykLxfk0M3U=";
   };
 
   build-system = [ setuptools ];

From b8ba0d99b69e49eab921507b1023de6cc0dc3f9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Mon, 27 Oct 2025 10:06:52 +0100
Subject: [PATCH 3137/6226] orocos-kdl: nit, move a comment to a better place

---
 pkgs/by-name/or/orocos-kdl/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/or/orocos-kdl/package.nix b/pkgs/by-name/or/orocos-kdl/package.nix
index 1353be09928f..0e3d40810d9e 100644
--- a/pkgs/by-name/or/orocos-kdl/package.nix
+++ b/pkgs/by-name/or/orocos-kdl/package.nix
@@ -14,9 +14,8 @@ stdenv.mkDerivation rec {
     owner = "orocos";
     repo = "orocos_kinematics_dynamics";
     tag = "${version}";
-    # Needed to build Python bindings
     hash = "sha256-4pPU+6uMMYLGq2V46wmg6lHFVhwFXrEg7PfnWGAI2is=";
-    fetchSubmodules = true;
+    fetchSubmodules = true; # Needed to build Python bindings
   };
 
   sourceRoot = "${src.name}/orocos_kdl";

From f28ea3aee230c0b632f7c946999b24a63424c2ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 09:10:29 +0000
Subject: [PATCH 3138/6226] kubernetes-helmPlugins.helm-dt: 0.4.10 -> 0.4.11

---
 .../networking/cluster/helm/plugins/helm-dt.nix             | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix
index f41ab8f499a7..3253dc38c6a5 100644
--- a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix
+++ b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix
@@ -5,16 +5,16 @@
 }:
 buildGoModule rec {
   pname = "helm-dt";
-  version = "0.4.10";
+  version = "0.4.11";
 
   src = fetchFromGitHub {
     owner = "vmware-labs";
     repo = "distribution-tooling-for-helm";
     rev = "refs/tags/v${version}";
-    hash = "sha256-2Owm5x42R+BXGPrTz4Kaw8vboy4G6Jx93JWganOUlfo=";
+    hash = "sha256-k7+t52UU5dfElD7885AppO2+mccjQwh2mRImByUfAaE=";
   };
 
-  vendorHash = "sha256-CIVgNS74V75etC9WBzoxu6aoMHlUYxWd22h2NG1uNn0=";
+  vendorHash = "sha256-dkE3eYZnaS+kC0kDVxaFW/Ev15TY2MY3m5xgPof7Y18=";
 
   ldflags = [
     "-s"

From e0542c0eb985dd341d0fd78475bfe67c4a4f815f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 09:16:58 +0000
Subject: [PATCH 3139/6226] museum: 1.2.11 -> 1.2.15

---
 pkgs/by-name/mu/museum/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix
index 1e7f96439ff2..2a6d2cb31a2b 100644
--- a/pkgs/by-name/mu/museum/package.nix
+++ b/pkgs/by-name/mu/museum/package.nix
@@ -10,17 +10,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "museum";
-  version = "1.2.11";
+  version = "1.2.15";
 
   src = fetchFromGitHub {
     owner = "ente-io";
     repo = "ente";
     sparseCheckout = [ "server" ];
     tag = "photos-v${finalAttrs.version}";
-    hash = "sha256-GSHWEbnBn2nS2aQ1lQU8Vpp8lEQiPBfmU7BsfXADVXs=";
+    hash = "sha256-NP9ow5CUr2JNzajj2IOiWmcXs1hTbuHTufa64pbj+l4=";
   };
 
-  vendorHash = "sha256-5o2nOFBwMY3qHyMWp+NDRkxf/2egTzWCiGMzY3No4OY=";
+  vendorHash = "sha256-napF55nA/9P8l5lddnEHQMjLXWSyTzgblIQCbSZ20MA=";
 
   sourceRoot = "${finalAttrs.src.name}/server";
 

From 9a4f7a19e46a99d2a35c28ba3b929e4d7d03f3e1 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Mon, 27 Oct 2025 10:22:05 +0100
Subject: [PATCH 3140/6226] go-csp-collector: init at
 0.0.16-unstable-2025-10-10

---
 pkgs/by-name/go/go-csp-collector/package.nix | 49 ++++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 pkgs/by-name/go/go-csp-collector/package.nix

diff --git a/pkgs/by-name/go/go-csp-collector/package.nix b/pkgs/by-name/go/go-csp-collector/package.nix
new file mode 100644
index 000000000000..73046b614b05
--- /dev/null
+++ b/pkgs/by-name/go/go-csp-collector/package.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "go-csp-collector";
+  version = "0.0.16-unstable-2025-10-10";
+
+  src = fetchFromGitHub {
+    owner = "jacobbednarz";
+    repo = "go-csp-collector";
+    rev = "a0cf22ac6d1f5c8972bf53671ba174767d2adcd5";
+    hash = "sha256-xFvO8ZuJQ5luCDOTPHtVeb1+3VvIKSwjt2TqkxBIY58=";
+  };
+
+  vendorHash = "sha256-SrQahSHO5ZIkcLR3BR5CR5BTStW1pH1Ij1Eql0b3tuU=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.Rev=${finalAttrs.version}"
+  ];
+
+  postInstall = ''
+    install -Dm644 init/go-csp-collector.service $out/lib/systemd/system/go-csp-collector.service
+
+    substituteInPlace $out/lib/systemd/system/go-csp-collector.service \
+      --replace-fail "/usr/local/bin/go-csp-collector" "$out/bin/go-csp-collector"
+  '';
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "-version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "A content security policy violation collector written in Golang";
+    homepage = "https://github.com/jacobbednarz/go-csp-collector";
+    changelog = "https://github.com/jacobbednarz/go-csp-collector/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    mainProgram = "go-csp-collector";
+    maintainers = with lib.maintainers; [ stepbrobd ];
+  };
+})

From 9245cfdd2df77770342c7d749c6dbda98e8ad7e4 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 27 Oct 2025 06:20:32 +0000
Subject: [PATCH 3141/6226] amiberry: backport cmake-4 fix

Without the change the buidl fails in `master` as
https://hydra.nixos.org/build/310522154:

    CMake Error at external/capsimage/CMakeLists.txt:1 (cmake_minimum_required):
      Compatibility with CMake < 3.5 has been removed from CMake.

Co-authored-by: Rafael Ieda <60272+iedame@users.noreply.github.com>
---
 pkgs/by-name/am/amiberry/package.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/by-name/am/amiberry/package.nix b/pkgs/by-name/am/amiberry/package.nix
index 5bae30e36630..384fbcd30146 100644
--- a/pkgs/by-name/am/amiberry/package.nix
+++ b/pkgs/by-name/am/amiberry/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   copyDesktopItems,
   makeWrapper,
@@ -28,6 +29,15 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-EOoVJYefX2pQ2Zz9bLD1RS47u/+7ZWTMwZYha0juF64=";
   };
 
+  patches = [
+    # cmake-4 support
+    (fetchpatch {
+      name = "cmake-4.patch";
+      url = "https://github.com/BlitterStudio/amiberry/commit/dbd85a37147603875b9ca51a9409c65a26c0d60a.patch?full_index=1";
+      hash = "sha256-w8Z9yhNafbXWv3nV8GDNpks2R1+M12uG1mWWrwVaEUk=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     copyDesktopItems

From f9fa267a304820e633f4261d498f7eefc235aa71 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 09:27:51 +0000
Subject: [PATCH 3142/6226] riffdiff: 3.5.0 -> 3.5.1

---
 pkgs/by-name/ri/riffdiff/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix
index 98fc4ccfb2f6..77763b38dc6e 100644
--- a/pkgs/by-name/ri/riffdiff/package.nix
+++ b/pkgs/by-name/ri/riffdiff/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "riffdiff";
-  version = "3.5.0";
+  version = "3.5.1";
 
   src = fetchFromGitHub {
     owner = "walles";
     repo = "riff";
     tag = version;
-    hash = "sha256-qA20sLiGqDtIPWBNww+WXM5AG162RPTdkUPoJ0PLiYY=";
+    hash = "sha256-SRr4yFv6fulBN/HNM3uCVLXS6pcspi5X5hXvQJg1sDI=";
   };
 
-  cargoHash = "sha256-omwKOstRXIAUDgLUFqmtxu77JJzAOASzbjLEImad1cE=";
+  cargoHash = "sha256-86nBxitdA8deJHRQqLM/JWcpSX/u6C4cofJAbYj5Ijs=";
 
   passthru = {
     tests.version = testers.testVersion { package = riffdiff; };

From 7b6dee44ab50db88b7a203074870f28f77ba5ab0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 09:28:59 +0000
Subject: [PATCH 3143/6226] basedpyright: 1.31.7 -> 1.32.1

---
 pkgs/by-name/ba/basedpyright/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix
index f8ca0692cc0f..92bcd13f2e96 100644
--- a/pkgs/by-name/ba/basedpyright/package.nix
+++ b/pkgs/by-name/ba/basedpyright/package.nix
@@ -18,16 +18,16 @@
 
 buildNpmPackage rec {
   pname = "basedpyright";
-  version = "1.31.7";
+  version = "1.32.1";
 
   src = fetchFromGitHub {
     owner = "detachhead";
     repo = "basedpyright";
     tag = "v${version}";
-    hash = "sha256-mC+qnEI2a7tGjIIZxRzGY+VyfYnTY1brCKGHU3KOf0Q=";
+    hash = "sha256-bxqUH5MYwp8MLD8ve8afgN3qe3hCPRu0l7QO7m1ZSzA=";
   };
 
-  npmDepsHash = "sha256-dwtMl5dFpol+J+cM6EHiwO+F93Iyurwx9Kr317IGtVw=";
+  npmDepsHash = "sha256-zNmZ4wXxe31NnQ+VlTLoPM2zTDmKdw1D28pi/roybdQ=";
   npmWorkspace = "packages/pyright";
 
   preBuild = ''

From 7497fb1c9694e625a5d03b223ce58ec2fab695f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 09:35:37 +0000
Subject: [PATCH 3144/6226] ov: 0.44.0 -> 0.45.1

---
 pkgs/by-name/ov/ov/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ov/ov/package.nix b/pkgs/by-name/ov/ov/package.nix
index 6d5668124ee4..8b2446df004f 100644
--- a/pkgs/by-name/ov/ov/package.nix
+++ b/pkgs/by-name/ov/ov/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "ov";
-  version = "0.44.0";
+  version = "0.45.1";
 
   src = fetchFromGitHub {
     owner = "noborus";
     repo = "ov";
     tag = "v${version}";
-    hash = "sha256-GsOxN+Ya90PeGdICbghj/eFJK7gOLAG/Bk0/zoStxgQ=";
+    hash = "sha256-Ptzlz+9mBKSPmogT4PVnimHw/wsQMQpfPo8MX1AocdM=";
   };
 
-  vendorHash = "sha256-faJjRFtnl7KdCAe+nFE793+cejQggauhJtvKdt9IRvY=";
+  vendorHash = "sha256-iAwlD6G+80Ci9pGANqbcmVjoRto7FMBSSDKsI6lpv/k=";
 
   ldflags = [
     "-s"

From 2f34e223fddde77ec2f41b11ddd1ce92ab0bd223 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 27 Oct 2025 10:36:54 +0100
Subject: [PATCH 3145/6226] python313Packages.ttn-client: modernize

Updated changelog URL to use dynamic tag reference.
---
 pkgs/development/python-modules/ttn-client/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/ttn-client/default.nix b/pkgs/development/python-modules/ttn-client/default.nix
index 52776272cd22..c2628967ccc5 100644
--- a/pkgs/development/python-modules/ttn-client/default.nix
+++ b/pkgs/development/python-modules/ttn-client/default.nix
@@ -6,7 +6,6 @@
   hatchling,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -14,8 +13,6 @@ buildPythonPackage rec {
   version = "1.2.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "angelnu";
     repo = "thethingsnetwork_python_client";
@@ -42,7 +39,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module to fetch/receive and parse uplink messages from The Thinks Network";
     homepage = "https://github.com/angelnu/thethingsnetwork_python_client";
-    changelog = "https://github.com/angelnu/thethingsnetwork_python_client/releases/tag/v${version}";
+    changelog = "https://github.com/angelnu/thethingsnetwork_python_client/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From e30ee35619434c64c699a5732589e141afebb8a8 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Mon, 27 Oct 2025 10:37:24 +0100
Subject: [PATCH 3146/6226] nixos/go-csp-collector: init module

---
 nixos/modules/module-list.nix                 |   1 +
 .../services/monitoring/go-csp-collector.nix  | 106 ++++++++++++++++++
 2 files changed, 107 insertions(+)
 create mode 100644 nixos/modules/services/monitoring/go-csp-collector.nix

diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 36ccab4792b2..5a1d97e6d296 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -990,6 +990,7 @@
   ./services/monitoring/gitwatch.nix
   ./services/monitoring/glances.nix
   ./services/monitoring/glpi-agent.nix
+  ./services/monitoring/go-csp-collector.nix
   ./services/monitoring/goss.nix
   ./services/monitoring/grafana-image-renderer.nix
   ./services/monitoring/grafana-reporter.nix
diff --git a/nixos/modules/services/monitoring/go-csp-collector.nix b/nixos/modules/services/monitoring/go-csp-collector.nix
new file mode 100644
index 000000000000..6fafbb840740
--- /dev/null
+++ b/nixos/modules/services/monitoring/go-csp-collector.nix
@@ -0,0 +1,106 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  cfg = config.services.go-csp-collector;
+
+  inherit (lib)
+    boolToString
+    concatStringsSep
+    getExe
+    isBool
+    literalExpression
+    maintainers
+    mapAttrsToList
+    mkEnableOption
+    mkIf
+    mkOption
+    mkPackageOption
+    types
+    ;
+
+  settingsToArgs =
+    settings:
+    concatStringsSep " " (
+      mapAttrsToList (
+        name: value:
+        let
+          flag = "-${name}";
+        in
+        if isBool value then "${flag}=${boolToString value}" else "${flag} ${toString value}"
+      ) settings
+    );
+in
+{
+  meta.maintainers = with maintainers; [ stepbrobd ];
+
+  options.services.go-csp-collector = {
+    enable = mkEnableOption "go-csp-collector, a content security policy violation collector";
+
+    package = mkPackageOption pkgs "go-csp-collector" { };
+
+    settings = mkOption {
+      type = types.submodule {
+        freeformType =
+          with types;
+          attrsOf (oneOf [
+            bool
+            path
+            str
+          ]);
+
+        options = {
+          port = mkOption {
+            type = types.port;
+            description = "The port to listen on.";
+            default = 8080;
+            example = 8080;
+          };
+
+          output-format = mkOption {
+            type = types.enum [
+              "text"
+              "json"
+            ];
+            description = "Define how the violation reports are formatted for output.";
+            default = "text";
+            example = "text";
+          };
+        };
+      };
+
+      description = ''
+        Settings for go-csp-collector. See
+        <https://github.com/jacobbednarz/go-csp-collector> for supported options.
+      '';
+
+      default = { };
+
+      example = literalExpression ''
+        {
+          debug = true;
+          health-check-path = "/health";
+        }
+      '';
+    };
+  };
+
+  config = mkIf cfg.enable {
+    systemd.packages = [ cfg.package ];
+    systemd.services.go-csp-collector = {
+      description = "CSP violation collector";
+      wantedBy = [ "multi-user.target" ];
+      after = [ "network.target" ];
+      serviceConfig = {
+        ReadOnlyPaths = cfg.settings.filter-file or "";
+        ExecStart = [
+          ""
+          "${getExe cfg.package} ${settingsToArgs cfg.settings}"
+        ];
+      };
+    };
+  };
+}

From 53b7bada953d64829e4c75fc3ebd3ffdad58ae74 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Sun, 26 Oct 2025 17:16:54 +0100
Subject: [PATCH 3147/6226] nixos/go-csp-collector: init test

---
 nixos/tests/all-tests.nix                    |  1 +
 nixos/tests/go-csp-collector.nix             | 66 ++++++++++++++++++++
 pkgs/by-name/go/go-csp-collector/package.nix |  6 +-
 3 files changed, 72 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/go-csp-collector.nix

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 025c628344d8..099c37d27839 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -639,6 +639,7 @@ in
   gns3-server = runTest ./gns3-server.nix;
   gnupg = runTest ./gnupg.nix;
   go-camo = runTest ./go-camo.nix;
+  go-csp-collector = runTest ./go-csp-collector.nix;
   go-httpbin = runTest ./go-httpbin.nix;
   go-neb = runTest ./go-neb.nix;
   goatcounter = runTest ./goatcounter.nix;
diff --git a/nixos/tests/go-csp-collector.nix b/nixos/tests/go-csp-collector.nix
new file mode 100644
index 000000000000..ec75b51506ff
--- /dev/null
+++ b/nixos/tests/go-csp-collector.nix
@@ -0,0 +1,66 @@
+{ lib, ... }:
+
+{
+  name = "go-csp-collector";
+  meta.maintainers = with lib.maintainers; [ stepbrobd ];
+
+  nodes.machine =
+    { pkgs, ... }:
+    {
+      services.go-csp-collector = {
+        enable = true;
+        settings = {
+          debug = true;
+          port = 9999;
+          health-check-path = "/health";
+          filter-file = pkgs.writeText "filter" "chrome-extension://";
+        };
+      };
+    };
+
+  testScript = ''
+    import json
+
+    # health check
+    machine.wait_for_unit("go-csp-collector.service")
+    machine.wait_for_open_port(9999)
+    machine.succeed("curl -f http://localhost:9999/health")
+
+    # send valid csp report
+    machine.succeed(
+      "curl -f -X POST http://127.0.0.1:9999/ "
+      "-H 'Content-Type: application/csp-report' "
+      "-d '" + json.dumps({
+        "csp-report": {
+          "document-uri": "https://example.com/",
+          "referrer": "https://example.com/",
+          "violated-directive": "script-src",
+          "effective-directive": "script-src",
+          "original-policy": "script-src 'self'",
+          "blocked-uri": "https://example.org/malicious.js",
+          "status-code": 200
+        }
+      }) + "'"
+    )
+    logs = machine.succeed("journalctl -u go-csp-collector.service")
+    assert "level=debug" in logs, "debug mode not enabled"
+    assert "blocked_uri" in logs, "csp report not logged"
+    assert "https://example.org/malicious.js" in logs, "blocked uri not in logs"
+
+    # check rejection
+    machine.fail(
+      "curl -f -X POST http://[::1]:9999/ "
+      "-H 'Content-Type: application/csp-report' "
+      "-d '" + json.dumps({
+        "csp-report": {
+          "document-uri": "https://example.com/",
+          "blocked-uri": "chrome-extension://something",
+          "violated-directive": "script-src"
+        }
+      }) + "'"
+    )
+    logs = machine.succeed("journalctl -u go-csp-collector.service")
+    assert "invalid resource" in logs, "filter rejection not logged"
+    assert "chrome-extension://" in logs, "filtered uri pattern not in logs"
+  '';
+}
diff --git a/pkgs/by-name/go/go-csp-collector/package.nix b/pkgs/by-name/go/go-csp-collector/package.nix
index 73046b614b05..c8437b2b122b 100644
--- a/pkgs/by-name/go/go-csp-collector/package.nix
+++ b/pkgs/by-name/go/go-csp-collector/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   versionCheckHook,
   nix-update-script,
+  nixosTests,
 }:
 
 buildGoModule (finalAttrs: {
@@ -36,7 +37,10 @@ buildGoModule (finalAttrs: {
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "-version";
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    updateScript = nix-update-script { };
+    tests.service = nixosTests.go-csp-collector;
+  };
 
   meta = {
     description = "A content security policy violation collector written in Golang";

From bfc0010652f64893e70954c94ad15744581ce0a9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 27 Oct 2025 10:38:19 +0100
Subject: [PATCH 3148/6226] python313Packages.cyclonedx-python-lib: remove
 disabled

Removed dependency on pythonOlder and disabled condition for version 3.9.
---
 .../python-modules/cyclonedx-python-lib/default.nix            | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
index 53e8e075d1e4..e885e4da84ad 100644
--- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
+++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
@@ -11,7 +11,6 @@
   py-serializable,
   poetry-core,
   pytestCheckHook,
-  pythonOlder,
   requirements-parser,
   sortedcontainers,
   setuptools,
@@ -26,8 +25,6 @@ buildPythonPackage rec {
   version = "11.4.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cyclonedx-python-lib";

From c0b341a313f9f609ea181bc3cedaa46c63dc606b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 27 Oct 2025 10:39:25 +0100
Subject: [PATCH 3149/6226] python313Packages.publicsuffixlist: remove disabled

Remove restriction for Python version older than 3.7.
---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 8ed70224f776..80818f8347eb 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -4,7 +4,6 @@
   fetchPypi,
   pandoc,
   pytestCheckHook,
-  pythonOlder,
   requests,
   setuptools,
 }:
@@ -14,8 +13,6 @@ buildPythonPackage rec {
   version = "1.0.2.20251027";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-anbYf4eCK8QIdLWYYx1PG4sImXK2lWMd0oAlsonvb1Q=";

From 5a604a74fbe8e544b696b03265b0043f119f5154 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 09:42:16 +0000
Subject: [PATCH 3150/6226] forecast: 0-unstable-2025-10-09 ->
 0-unstable-2025-10-21

---
 pkgs/by-name/fo/forecast/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix
index 10484c3b568b..23cd12fdb1c2 100644
--- a/pkgs/by-name/fo/forecast/package.nix
+++ b/pkgs/by-name/fo/forecast/package.nix
@@ -16,13 +16,13 @@
 
 rustPlatform.buildRustPackage {
   pname = "forecast";
-  version = "0-unstable-2025-10-09";
+  version = "0-unstable-2025-10-21";
 
   src = fetchFromGitHub {
     owner = "cosmic-utils";
     repo = "forecast";
-    rev = "f4dca2317007bc3316b22456e36a76d50500ccc8";
-    hash = "sha256-zbL4a5haggMJEN7vbe+v026Qo4BFZvtoH8QaZPmpcBw=";
+    rev = "8f04cafd809d58bdd46556b66f3aa4574e81fcbd";
+    hash = "sha256-DRShCI/tBh/a3IM/UH8yujlJyEeqGJ+kbnqSF8AibS0=";
   };
 
   cargoHash = "sha256-di7zjwI0/6NB2cAih3d7iqwSb+o/607jbgJN1MtbZX8=";

From 41b63a6bd8bfc235cd9f15d12523156acdd54798 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 27 Oct 2025 10:43:33 +0100
Subject: [PATCH 3151/6226] python313Packages.google-cloud-shell: remove
 disabled

Removed the restriction for Python version older than 3.7.
---
 pkgs/development/python-modules/google-cloud-shell/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-shell/default.nix b/pkgs/development/python-modules/google-cloud-shell/default.nix
index 0831b31b1e30..ff87c32cbe2a 100644
--- a/pkgs/development/python-modules/google-cloud-shell/default.nix
+++ b/pkgs/development/python-modules/google-cloud-shell/default.nix
@@ -9,7 +9,6 @@
   protobuf,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
@@ -18,8 +17,6 @@ buildPythonPackage rec {
   version = "1.13.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     pname = "google_cloud_shell";
     inherit version;

From ed5a409899b3f21a0d680892f306ef35ff8d9668 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 27 Oct 2025 10:47:44 +0100
Subject: [PATCH 3152/6226] python313Packages.roadrecon: modernize

Removed pythonOlder dependency and updated build inputs.
---
 .../development/python-modules/roadrecon/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/roadrecon/default.nix b/pkgs/development/python-modules/roadrecon/default.nix
index c7bf9a716579..81e137aae936 100644
--- a/pkgs/development/python-modules/roadrecon/default.nix
+++ b/pkgs/development/python-modules/roadrecon/default.nix
@@ -10,7 +10,6 @@
   marshmallow,
   marshmallow-sqlalchemy,
   openpyxl,
-  pythonOlder,
   roadlib,
   setuptools,
   sqlalchemy,
@@ -21,8 +20,6 @@ buildPythonPackage rec {
   version = "1.7.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-v8IUnJlREtKMnhJtdKtChcxM/IKNKRuHA79V38zxLGY=";
@@ -30,11 +27,9 @@ buildPythonPackage rec {
 
   pythonRelaxDeps = [ "flask" ];
 
-  nativeBuildInputs = [
-    setuptools
-  ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     aiohttp
     flask
     flask-cors
@@ -47,6 +42,9 @@ buildPythonPackage rec {
     sqlalchemy
   ];
 
+  # Module has no tests
+  doCheck = false;
+
   pythonImportsCheck = [ "roadtools.roadrecon" ];
 
   meta = with lib; {

From a6e1ec3a9b6eee87a25fc10f6c97f81694f0f730 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 15:27:11 +0900
Subject: [PATCH 3153/6226] nixos/minetest-server: replace systemd `script`
 with `ExecStart`

---
 nixos/modules/services/games/minetest-server.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/games/minetest-server.nix b/nixos/modules/services/games/minetest-server.nix
index d1718d3bca9d..49b0f88d9674 100644
--- a/nixos/modules/services/games/minetest-server.nix
+++ b/nixos/modules/services/games/minetest-server.nix
@@ -172,12 +172,9 @@ in
       serviceConfig.Restart = "always";
       serviceConfig.User = "minetest";
       serviceConfig.Group = "minetest";
-
-      script = ''
-        cd /var/lib/minetest
-
-        exec ${pkgs.minetest}/bin/minetest ${lib.escapeShellArgs flags}
-      '';
+      serviceConfig.StateDirectory = "minetest";
+      serviceConfig.WorkingDirectory = "/var/lib/minetest";
+      serviceConfig.ExecStart = "${pkgs.minetest}/bin/minetest ${lib.escapeShellArgs flags}";
     };
   };
 }

From 6de18eedae0032e495f47193ac6af560463f4455 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 15:30:02 +0900
Subject: [PATCH 3154/6226] nixos/journaldriver: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/logging/journaldriver.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/logging/journaldriver.nix b/nixos/modules/services/logging/journaldriver.nix
index efb53de0b484..d9f0ccd39d97 100644
--- a/nixos/modules/services/logging/journaldriver.nix
+++ b/nixos/modules/services/logging/journaldriver.nix
@@ -91,12 +91,12 @@ in
   config = mkIf cfg.enable {
     systemd.services.journaldriver = {
       description = "Stackdriver Logging journal forwarder";
-      script = "${pkgs.journaldriver}/bin/journaldriver";
       wants = [ "network-online.target" ];
       after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
 
       serviceConfig = {
+        ExecStart = lib.getExe pkgs.journaldriver;
         Restart = "always";
         DynamicUser = true;
 

From 0b49e6b9dc3c60a7693e99dbcbed3cf83765c209 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 15:30:49 +0900
Subject: [PATCH 3155/6226] nixos/dictd: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/misc/dictd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix
index b216459b2d9b..3de6ccb1896e 100644
--- a/nixos/modules/services/misc/dictd.nix
+++ b/nixos/modules/services/misc/dictd.nix
@@ -78,7 +78,7 @@ in
         # with code 143 instead of exiting with code 0.
         serviceConfig.SuccessExitStatus = [ 143 ];
         serviceConfig.Type = "forking";
-        script = "${pkgs.dict}/sbin/dictd -s -c ${dictdb}/share/dictd/dictd.conf --locale en_US.UTF-8";
+        serviceConfig.ExecStart = "${pkgs.dict}/sbin/dictd -s -c ${dictdb}/share/dictd/dictd.conf --locale en_US.UTF-8";
       };
     };
 }

From 6c7013d8f99ae0b9644dca1367dee2224670c92a Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 15:34:33 +0900
Subject: [PATCH 3156/6226] nixos/nm-file-secret-agent: replace systemd
 `script` with `ExecStart`

---
 nixos/modules/services/networking/nm-file-secret-agent.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/nm-file-secret-agent.nix b/nixos/modules/services/networking/nm-file-secret-agent.nix
index 669a6e208deb..4a1a36244cca 100644
--- a/nixos/modules/services/networking/nm-file-secret-agent.nix
+++ b/nixos/modules/services/networking/nm-file-secret-agent.nix
@@ -125,7 +125,7 @@ in
       after = [ "NetworkManager.service" ];
       wantedBy = [ "multi-user.target" ];
       restartTriggers = [ nmFileSecretAgentConfigFile ];
-      script = "${lib.getExe cfg.ensureProfiles.secrets.package} --conf ${nmFileSecretAgentConfigFile}";
+      serviceConfig.ExecStart = "${lib.getExe cfg.ensureProfiles.secrets.package} --conf ${nmFileSecretAgentConfigFile}";
     };
   };
 }

From 428fd47816673a6721870e127e1c4230fb7cf461 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 15:35:58 +0900
Subject: [PATCH 3157/6226] nixos/paperless: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/misc/paperless.nix | 9 +++------
 nixos/tests/paperless.nix                 | 4 ++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix
index 14bb792790a7..04759856ac7a 100644
--- a/nixos/modules/services/misc/paperless.nix
+++ b/nixos/modules/services/misc/paperless.nix
@@ -664,6 +664,9 @@ in
           serviceConfig = {
             User = cfg.user;
             WorkingDirectory = cfg.dataDir;
+            ExecStart = "${manage}/bin/paperless-manage document_exporter ${cfg.exporter.directory} ${
+              lib.cli.toCommandLineShellGNU { } cfg.exporter.settings
+            }";
           };
           unitConfig =
             let
@@ -682,13 +685,7 @@ in
               OnFailure = services;
               OnSuccess = services;
             };
-          enableStrictShellChecks = true;
           path = [ manage ];
-          script = ''
-            paperless-manage document_exporter ${cfg.exporter.directory} ${
-              lib.cli.toCommandLineShellGNU { } cfg.exporter.settings
-            }
-          '';
         };
       })
     ]
diff --git a/nixos/tests/paperless.nix b/nixos/tests/paperless.nix
index 3f215febda7c..64610e584e01 100644
--- a/nixos/tests/paperless.nix
+++ b/nixos/tests/paperless.nix
@@ -116,9 +116,9 @@
           assert "1 timers listed." in timers, "incorrect number of timers"
 
           # Double check that our attrset option override works as expected
-          cmdline = node.succeed("grep 'paperless-manage' $(systemctl cat paperless-exporter | grep ExecStart | cut -f 2 -d=)")
+          cmdline = node.succeed("systemctl cat paperless-exporter | grep ExecStart | grep 'paperless-manage' | cut -f 2 -d=")
           print(f"Exporter command line {cmdline!r}")
-          assert cmdline.strip() == "paperless-manage document_exporter /var/lib/paperless/export --compare-checksums --delete --no-progress-bar --no-thumbnail", "Unexpected exporter command line"
+          assert cmdline.strip().endswith("paperless-manage document_exporter /var/lib/paperless/export --compare-checksums --delete --no-progress-bar --no-thumbnail"), "Unexpected exporter command line"
 
     test_paperless(simple)
     simple.send_monitor_command("quit")

From 6e31242835c384d130b3ec333c8f4b8ad9ba262f Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 15:37:54 +0900
Subject: [PATCH 3158/6226] nixos/docker-registry: replace systemd `script`
 with `ExecStart`

---
 nixos/modules/services/misc/docker-registry.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix
index 2c2a59052d1b..094c54d8f1b9 100644
--- a/nixos/modules/services/misc/docker-registry.nix
+++ b/nixos/modules/services/misc/docker-registry.nix
@@ -143,11 +143,9 @@ in
       description = "Docker Container Registry";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
-      script = ''
-        ${cfg.package}/bin/registry serve ${configFile}
-      '';
 
       serviceConfig = {
+        ExecStart = "${lib.getExe cfg.package} serve ${configFile}";
         User = "docker-registry";
         WorkingDirectory = cfg.storagePath;
         AmbientCapabilities = lib.mkIf (cfg.port < 1024) "cap_net_bind_service";

From 0d841cc8bb08b08573ad75c5f4629b63c0e753e1 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 15:41:20 +0900
Subject: [PATCH 3159/6226] nixos/prometheus-exporters/pgbouncer: replace
 systemd `script` with `ExecStart`

---
 .../services/monitoring/prometheus/exporters/pgbouncer.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix b/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix
index 4b9cc658bf4a..380f49fbba01 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix
@@ -139,9 +139,9 @@ in
 
   serviceOpts = {
     after = [ "pgbouncer.service" ];
-    script = concatStringsSep " " (
+    serviceConfig.ExecStart = concatStringsSep " " (
       [
-        "exec -- ${escapeShellArg (getExe cfg.package)}"
+        "${escapeShellArg (getExe cfg.package)}"
         "--web.listen-address ${cfg.listenAddress}:${toString cfg.port}"
       ]
       ++ optionals (cfg.connectionString != null) [

From 2a7a145b9627a6e00272a759a1fcf83758982507 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 15:43:25 +0900
Subject: [PATCH 3160/6226] nixos/xray: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/networking/xray.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/xray.nix b/nixos/modules/services/networking/xray.nix
index 1d0d514d2e48..fc638f7ce766 100644
--- a/nixos/modules/services/networking/xray.nix
+++ b/nixos/modules/services/networking/xray.nix
@@ -93,10 +93,8 @@ with lib;
         description = "xray Daemon";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-        script = ''
-          exec "${cfg.package}/bin/xray" -config "$CREDENTIALS_DIRECTORY/config.json"
-        '';
         serviceConfig = {
+          ExecStart = "${cfg.package}/bin/xray -config %d/config.json";
           DynamicUser = true;
           LoadCredential = "config.json:${settingsFile}";
           CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_BIND_SERVICE";

From 3827112a15891d70406e4c697c50f3d3dbe694e4 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 15:43:57 +0900
Subject: [PATCH 3161/6226] nixos/jboss: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/web-servers/jboss/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-servers/jboss/default.nix b/nixos/modules/services/web-servers/jboss/default.nix
index 88bd1071b35b..516f887022b8 100644
--- a/nixos/modules/services/web-servers/jboss/default.nix
+++ b/nixos/modules/services/web-servers/jboss/default.nix
@@ -93,7 +93,7 @@ in
   config = mkIf config.services.jboss.enable {
     systemd.services.jboss = {
       description = "JBoss server";
-      script = "${jbossService}/bin/control start";
+      serviceConfig.ExecStart = "${jbossService}/bin/control start";
       wantedBy = [ "multi-user.target" ];
     };
   };

From 99951533a31a2bd49824f2f1d59f70894b02128c Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 15:44:36 +0900
Subject: [PATCH 3162/6226] nixos/xinetd: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/networking/xinetd.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix
index 71a258fbfee1..bff2898e8e05 100644
--- a/nixos/modules/services/networking/xinetd.nix
+++ b/nixos/modules/services/networking/xinetd.nix
@@ -143,8 +143,7 @@ in
       description = "xinetd server";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      path = [ pkgs.xinetd ];
-      script = "exec xinetd -syslog daemon -dontfork -stayalive -f ${configFile}";
+      serviceConfig.ExecStart = "${lib.getExe pkgs.xinetd} -syslog daemon -dontfork -stayalive -f ${configFile}";
     };
   };
 }

From d19e1ded7909feb51e9d93a4cb503b264bec19f3 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 15:46:05 +0900
Subject: [PATCH 3163/6226] nixos/svnserve: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/misc/svnserve.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/misc/svnserve.nix b/nixos/modules/services/misc/svnserve.nix
index b72e6186c1cd..716eed8d35cd 100644
--- a/nixos/modules/services/misc/svnserve.nix
+++ b/nixos/modules/services/misc/svnserve.nix
@@ -40,8 +40,8 @@ in
     systemd.services.svnserve = {
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      preStart = "mkdir -p ${cfg.svnBaseDir}";
-      script = "${pkgs.subversion.out}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/run/svnserve.pid";
+      services.ExecStartPre = "${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.svnBaseDir}";
+      services.ExecStart = "${pkgs.subversion.out}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/run/svnserve.pid";
     };
   };
 }

From 0057cd287e9157c9b1c8b8036bcc1c692656eaaf Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 15:50:47 +0900
Subject: [PATCH 3164/6226] nixos/opengfw: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/networking/opengfw.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/networking/opengfw.nix b/nixos/modules/services/networking/opengfw.nix
index 4b92a230842d..911e0ea1cfe2 100644
--- a/nixos/modules/services/networking/opengfw.nix
+++ b/nixos/modules/services/networking/opengfw.nix
@@ -379,16 +379,17 @@ in
           ${optionalString (settings != null) "ln -sf ${settings} config.yaml"}
         '';
 
-        script = ''
-          ${config.security.wrapperDir}/OpenGFW \
-            -f ${cfg.logFormat} \
-            -l ${cfg.logLevel} \
-            ${optionalString (cfg.pcapReplay != null) "-p ${cfg.pcapReplay}"} \
-            -c config.yaml \
-            rules.yaml
-        '';
-
         serviceConfig = rec {
+          ExecStart =
+            let
+              args = lib.cli.toCommandLineShellGNU { } {
+                f = cfg.logFormat;
+                l = cfg.logLevel;
+                p = cfg.pcapReplay;
+                c = "config.yaml";
+              };
+            in
+            "${config.security.wrapperDir}/OpenGFW ${args} rules.yaml";
           WorkingDirectory = cfg.dir;
           ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -HUP $MAINPID";
           Restart = "always";

From 04f4eb3a3ef10e785f905f84ca87b99b14be6c4f Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 15:52:14 +0900
Subject: [PATCH 3165/6226] nixos/oidentd: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/networking/oidentd.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/oidentd.nix b/nixos/modules/services/networking/oidentd.nix
index 159da0913995..e3c38cf2dfd6 100644
--- a/nixos/modules/services/networking/oidentd.nix
+++ b/nixos/modules/services/networking/oidentd.nix
@@ -32,7 +32,7 @@ with lib;
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig.Type = "forking";
-      script = "${pkgs.oidentd}/sbin/oidentd -u oidentd -g nogroup";
+      serviceConfig.ExecStart = "${lib.getExe pkgs.oidentd} -u oidentd -g nogroup";
     };
 
     users.users.oidentd = {

From 137a04832dd8bfe0d3142fd4858421c7c882ae7e Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 15:53:21 +0900
Subject: [PATCH 3166/6226] nixos/ostinato: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/networking/ostinato.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/ostinato.nix b/nixos/modules/services/networking/ostinato.nix
index cfe7f934bf36..9006a8b97e7b 100644
--- a/nixos/modules/services/networking/ostinato.nix
+++ b/nixos/modules/services/networking/ostinato.nix
@@ -108,9 +108,7 @@ in
     systemd.services.drone = {
       description = "Ostinato agent-controller";
       wantedBy = [ "multi-user.target" ];
-      script = ''
-        ${pkg}/bin/drone ${toString cfg.port} ${configFile}
-      '';
+      serviceConfig.ExecStart = "${pkg}/bin/drone ${toString cfg.port} ${configFile}";
     };
 
   };

From ec776ce5b9a2fa9b3cbe17c7796f9c27fb765c27 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 15:56:34 +0900
Subject: [PATCH 3167/6226] nixos/dnscache: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/networking/dnscache.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix
index f360aa86c7b8..938033a8583f 100644
--- a/nixos/modules/services/networking/dnscache.nix
+++ b/nixos/modules/services/networking/dnscache.nix
@@ -108,17 +108,16 @@ in
         daemontools
         djbdns
       ];
+      environment.FORWARDONLY = lib.mkIf cfg.forwardOnly "1";
       preStart = ''
         rm -rf /var/lib/dnscache
         dnscache-conf dnscache dnscache /var/lib/dnscache ${config.services.dnscache.ip}
         rm -rf /var/lib/dnscache/root
         ln -sf ${dnscache-root} /var/lib/dnscache/root
       '';
-      script = ''
-        cd /var/lib/dnscache/
-        ${lib.optionalString cfg.forwardOnly "export FORWARDONLY=1"}
-        exec ./run
-      '';
+      serviceConfig.StateDirectory = "dnscache";
+      serviceConfig.WorkingDirectory = "/var/lib/dnscache";
+      serviceConfig.ExecStart = "/var/lib/dnscache/run";
     };
   };
 }

From c1237fb6de4b656a9d2c0bd773f12f89155ba16b Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 15:57:43 +0900
Subject: [PATCH 3168/6226] nixos/slurm: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/computing/slurm/slurm.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 4d01d4533f67..989053da173b 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -475,15 +475,13 @@ in
             ''}
           '';
 
-          script = ''
-            export SLURM_CONF=${configPath}
-            exec ${cfg.package}/bin/slurmdbd -D
-          '';
+          environment.SLURM_CONF = configPath;
 
           serviceConfig = {
             RuntimeDirectory = "slurmdbd";
             Type = "simple";
             PIDFile = "/run/slurmdbd.pid";
+            ExecStart = "${lib.getExe' cfg.package "slurmdbd"} -D";
             ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
           };
         };

From c882420159d79dfebc88540c5dc6f48f32c8e1e9 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 16:02:50 +0900
Subject: [PATCH 3169/6226] nixos/toxvpn: replace systemd `script` with
 `ExecStart`

Also replace `preStart` with `RuntimeDirectory`, which does the same
thing in this case.
---
 nixos/modules/services/networking/toxvpn.nix | 25 ++++++++++----------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix
index 112c86187666..4688e410cee4 100644
--- a/nixos/modules/services/networking/toxvpn.nix
+++ b/nixos/modules/services/networking/toxvpn.nix
@@ -43,20 +43,19 @@ with lib;
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
 
-      preStart = ''
-        mkdir -p /run/toxvpn || true
-        chown toxvpn /run/toxvpn
-      '';
-
-      path = [ pkgs.toxvpn ];
-
-      script = ''
-        exec toxvpn -i ${config.services.toxvpn.localip} -l /run/toxvpn/control -u toxvpn -p ${toString config.services.toxvpn.port} ${
-          lib.concatMapStringsSep " " (x: "-a ${x}") config.services.toxvpn.auto_add_peers
-        }
-      '';
-
       serviceConfig = {
+        ExecStart =
+          let
+            args = lib.cli.toCommandLineShellGNU { } {
+              i = config.services.toxvpn.localip;
+              l = "/run/toxvpn/control";
+              u = "toxvpn";
+              p = config.services.toxvpn.port;
+              a = config.services.toxvpn.auto_add_peers;
+            };
+          in
+          "${lib.getExe pkgs.toxvpn} ${args}";
+        RuntimeDirectory = "toxvpn";
         KillMode = "process";
         Restart = "on-success";
         Type = "notify";

From 80fc03bc0b658e41630220742d75ece0d41440f4 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 16:04:53 +0900
Subject: [PATCH 3170/6226] nixos/tailscale: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/networking/tailscale.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix
index 0b6e110d2caa..b673d29bb40e 100644
--- a/nixos/modules/services/networking/tailscale.nix
+++ b/nixos/modules/services/networking/tailscale.nix
@@ -240,10 +240,8 @@ in
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         Type = "oneshot";
+        ExecStart = "${lib.getExe cfg.package} set ${escapeShellArgs cfg.extraSetFlags}";
       };
-      script = ''
-        ${lib.getExe cfg.package} set ${escapeShellArgs cfg.extraSetFlags}
-      '';
     };
 
     boot.kernel.sysctl = mkIf (cfg.useRoutingFeatures == "server" || cfg.useRoutingFeatures == "both") {

From a78dc8d25177c7c7c39a6b360aa1d46425532a9b Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 16:05:26 +0900
Subject: [PATCH 3171/6226] nixos/oink: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/networking/oink.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/oink.nix b/nixos/modules/services/networking/oink.nix
index 5c76a7de5036..bc255ffc6ba9 100644
--- a/nixos/modules/services/networking/oink.nix
+++ b/nixos/modules/services/networking/oink.nix
@@ -84,8 +84,8 @@ in
       description = "Dynamic DNS client for Porkbun";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      script = "${cfg.package}/bin/oink -c ${oinkConfig}";
       serviceConfig = {
+        ExecStart = "${lib.getExe cfg.package} -c ${oinkConfig}";
         Restart = "on-failure";
         RestartSec = "10";
       };

From a708caed88ef731e954ae605fc3679654f71e3c0 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 16:06:16 +0900
Subject: [PATCH 3172/6226] nixos/dkimproxy-out: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/mail/dkimproxy-out.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/mail/dkimproxy-out.nix b/nixos/modules/services/mail/dkimproxy-out.nix
index 2fefcd6b68a2..168bbdd5a1a9 100644
--- a/nixos/modules/services/mail/dkimproxy-out.nix
+++ b/nixos/modules/services/mail/dkimproxy-out.nix
@@ -109,10 +109,8 @@ in
             chown -R dkimproxy-out:dkimproxy-out "${keydir}"
           fi
         '';
-        script = ''
-          exec ${pkgs.dkimproxy}/bin/dkimproxy.out --conf_file=${configfile}
-        '';
         serviceConfig = {
+          ExecStart = "${pkgs.dkimproxy}/bin/dkimproxy.out --conf_file=${configfile}";
           User = "dkimproxy-out";
           PermissionsStartOnly = true;
         };

From 80f93e2a6a7a1f5d8ed4c384bb5e5859a78bc421 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 16:07:08 +0900
Subject: [PATCH 3173/6226] nixos/tinydns: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/networking/tinydns.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/tinydns.nix b/nixos/modules/services/networking/tinydns.nix
index 145357b828b1..709f751ee825 100644
--- a/nixos/modules/services/networking/tinydns.nix
+++ b/nixos/modules/services/networking/tinydns.nix
@@ -58,10 +58,11 @@ with lib;
         ln -sf ${pkgs.writeText "tinydns-data" config.services.tinydns.data} data
         tinydns-data
       '';
-      script = ''
-        cd /var/lib/tinydns
-        exec ./run
-      '';
+      serviceConfig = {
+        StateDirectory = "tinydns";
+        WorkingDirectory = "/var/lib/tinydns";
+        ExecStart = "/var/lib/tinydns/run";
+      };
     };
   };
 }

From 6b2172233cef44a9a2deb23b4ecd542f2c2eeda5 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 16:08:16 +0900
Subject: [PATCH 3174/6226] nixos/bluemap: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/web-apps/bluemap.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-apps/bluemap.nix b/nixos/modules/services/web-apps/bluemap.nix
index 5829b7c3e0dd..bd01d6470186 100644
--- a/nixos/modules/services/web-apps/bluemap.nix
+++ b/nixos/modules/services/web-apps/bluemap.nix
@@ -298,10 +298,8 @@ in
         Type = "oneshot";
         Group = "nginx";
         UMask = "026";
+        ExecStart = "${lib.getExe pkgs.bluemap} -c ${configFolder} -gs -r";
       };
-      script = ''
-        ${lib.getExe pkgs.bluemap} -c ${configFolder} -gs -r
-      '';
     };
 
     systemd.timers."render-bluemap-maps" = lib.mkIf cfg.enableRender {

From e7b38d45d2fc25bded747e4b3dc5929574008527 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 16:09:06 +0900
Subject: [PATCH 3175/6226] nixos/wakapi: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/web-apps/wakapi.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-apps/wakapi.nix b/nixos/modules/services/web-apps/wakapi.nix
index 6634e4894546..4533d322d2b8 100644
--- a/nixos/modules/services/web-apps/wakapi.nix
+++ b/nixos/modules/services/web-apps/wakapi.nix
@@ -143,10 +143,6 @@ in
       ++ optional (cfg.database.dialect == "postgres") "postgresql.target";
       wantedBy = [ "multi-user.target" ];
 
-      script = ''
-        exec ${getExe cfg.package} -config ${settingsFile}
-      '';
-
       serviceConfig = {
         Environment = mkMerge [
           (mkIf (cfg.passwordSalt != null) "WAKAPI_PASSWORD_SALT=${cfg.passwordSalt}")
@@ -157,6 +153,8 @@ in
           (lib.optional (cfg.passwordSaltFile != null) cfg.passwordSaltFile)
           ++ (lib.optional (cfg.smtpPasswordFile != null) cfg.smtpPasswordFile);
 
+        ExecStart = "${getExe cfg.package} -config ${settingsFile}";
+
         User = config.users.users.wakapi.name;
         Group = config.users.users.wakapi.group;
 

From 56f0444d0459f96413b5a10a77b3ba343236870f Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 16:10:38 +0900
Subject: [PATCH 3176/6226] nixos/pommed: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/hardware/pommed.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/hardware/pommed.nix b/nixos/modules/services/hardware/pommed.nix
index 3bb53ce4603a..ba627c009efd 100644
--- a/nixos/modules/services/hardware/pommed.nix
+++ b/nixos/modules/services/hardware/pommed.nix
@@ -51,7 +51,7 @@ in
     systemd.services.pommed = {
       description = "Pommed Apple Hotkeys Daemon";
       wantedBy = [ "multi-user.target" ];
-      script = "${pkgs.pommed_light}/bin/pommed -f";
+      serviceConfig.ExecStart = "${lib.getExe pkgs.pommed_light} -f";
     };
   };
 }

From eb7cd01c2ead6adb3e3219fc1e041e3f16329e26 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 16:11:49 +0900
Subject: [PATCH 3177/6226] nixos/part-db: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/web-apps/part-db.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-apps/part-db.nix b/nixos/modules/services/web-apps/part-db.nix
index 086cf8b31213..eb110d4362c0 100644
--- a/nixos/modules/services/web-apps/part-db.nix
+++ b/nixos/modules/services/web-apps/part-db.nix
@@ -200,6 +200,7 @@ in
           requires = [ "postgresql.target" ];
           wantedBy = [ "multi-user.target" ];
           serviceConfig = {
+            ExecStart = "${lib.getExe cfg.phpPackage} ${lib.getExe' cfg.package "console"} doctrine:migrations:migrate --no-interaction";
             Type = "oneshot";
             RemainAfterExit = true;
             User = "part-db";
@@ -207,10 +208,6 @@ in
           restartTriggers = [
             cfg.package
           ];
-          script = ''
-            set -euo pipefail
-            ${lib.getExe cfg.phpPackage} ${lib.getExe' cfg.package "console"} doctrine:migrations:migrate --no-interaction
-          '';
         };
 
         phpfpm-part-db = {

From 9e0d1baaeed96ee7a4da8afa53abee14e69966bb Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 16:13:55 +0900
Subject: [PATCH 3178/6226] nixos/cloudlog: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/web-apps/cloudlog.nix | 21 +++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/web-apps/cloudlog.nix b/nixos/modules/services/web-apps/cloudlog.nix
index bec59aa779e1..a0ec5fe4134b 100644
--- a/nixos/modules/services/web-apps/cloudlog.nix
+++ b/nixos/modules/services/web-apps/cloudlog.nix
@@ -383,37 +383,44 @@ in
         cloudlog-upload-lotw = {
           description = "Upload QSOs to LoTW if certs have been provided";
           enable = cfg.upload-lotw.enable;
-          script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/lotw/lotw_upload";
+          serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/lotw/lotw_upload";
+          serviceConfig.Type = "oneshot";
         };
         cloudlog-update-lotw-users = {
           description = "Update LOTW Users Database";
           enable = cfg.update-lotw-users.enable;
-          script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/lotw/load_users";
+          serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/lotw/load_users";
+          serviceConfig.Type = "oneshot";
         };
         cloudlog-update-dok = {
           description = "Update DOK File for autocomplete";
           enable = cfg.update-dok.enable;
-          script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_dok";
+          serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/update/update_dok";
+          serviceConfig.Type = "oneshot";
         };
         cloudlog-update-clublog-scp = {
           description = "Update Clublog SCP Database File";
           enable = cfg.update-clublog-scp.enable;
-          script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_clublog_scp";
+          serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/update/update_clublog_scp";
+          serviceConfig.Type = "oneshot";
         };
         cloudlog-update-wwff = {
           description = "Update WWFF File for autocomplete";
           enable = cfg.update-wwff.enable;
-          script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_wwff";
+          serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/update/update_wwff";
+          serviceConfig.Type = "oneshot";
         };
         cloudlog-upload-qrz = {
           description = "Upload QSOs to QRZ Logbook";
           enable = cfg.upload-qrz.enable;
-          script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/qrz/upload";
+          serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/qrz/upload";
+          serviceConfig.Type = "oneshot";
         };
         cloudlog-update-sota = {
           description = "Update SOTA File for autocomplete";
           enable = cfg.update-sota.enable;
-          script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_sota";
+          serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/update/update_sota";
+          serviceConfig.Type = "oneshot";
         };
       };
       timers = {

From a130b2140a971e1fff56c0bbb5d391a8943e76fb Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 16:15:46 +0900
Subject: [PATCH 3179/6226] nixos/ircd-hybrid: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/networking/ircd-hybrid/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix
index 95e19636edaf..1504a93d9203 100644
--- a/nixos/modules/services/networking/ircd-hybrid/default.nix
+++ b/nixos/modules/services/networking/ircd-hybrid/default.nix
@@ -152,7 +152,7 @@ in
       wants = [ "network-online.target" ];
       after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
-      script = "${ircdService}/bin/control start";
+      serviceConfig.ExecStart = "${ircdService}/bin/control start";
     };
   };
 }

From 198c4d4677e61886a340eb38f6921a86658a7495 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 16:17:58 +0900
Subject: [PATCH 3180/6226] nixos/boinc: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/computing/boinc/client.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix
index 8467e4b297c1..a0d244337be8 100644
--- a/nixos/modules/services/computing/boinc/client.nix
+++ b/nixos/modules/services/computing/boinc/client.nix
@@ -99,10 +99,8 @@ in
       description = "BOINC Client";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      script = ''
-        exec ${fhsEnvExecutable} --dir ${cfg.dataDir} ${allowRemoteGuiRpcFlag}
-      '';
       serviceConfig = {
+        ExecStart = "${fhsEnvExecutable} --dir ${cfg.dataDir} ${allowRemoteGuiRpcFlag}";
         User = "boinc";
         Nice = 10;
       };

From 32b4f7df807b6ecb5b728727c9c3e55995637f1d Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 16:18:38 +0900
Subject: [PATCH 3181/6226] nixos/nghttpx: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/networking/nghttpx/default.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/nghttpx/default.nix b/nixos/modules/services/networking/nghttpx/default.nix
index 40eba4849adc..a9ae12ac6c62 100644
--- a/nixos/modules/services/networking/nghttpx/default.nix
+++ b/nixos/modules/services/networking/nghttpx/default.nix
@@ -115,11 +115,9 @@ in
       nghttpx = {
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
-        script = ''
-          ${pkgs.nghttp2}/bin/nghttpx --conf=${configurationFile}
-        '';
 
         serviceConfig = {
+          ExecStart = "${pkgs.nghttp2}/bin/nghttpx --conf=${configurationFile}";
           Restart = "on-failure";
           RestartSec = 60;
         };

From 2ed2c0afa8d5d37950b4aeab40c875a2f1ce8697 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 16:19:58 +0900
Subject: [PATCH 3182/6226] nixos/redsocks: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/networking/redsocks.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/redsocks.nix b/nixos/modules/services/networking/redsocks.nix
index 852dcc8ff431..1c4ef08fdc7f 100644
--- a/nixos/modules/services/networking/redsocks.nix
+++ b/nixos/modules/services/networking/redsocks.nix
@@ -276,7 +276,7 @@ in
         description = "Redsocks";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-        script = "${pkgs.redsocks}/bin/redsocks -c ${configfile}";
+        serviceConfig.ExecStart = "${lib.getExe pkgs.redsocks} -c ${configfile}";
       };
 
       networking.firewall.extraCommands = iptables;

From 8f76db5966865f922608145623ba9949a224d570 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 16:29:08 +0900
Subject: [PATCH 3183/6226] nixos/geth: replace systemd `script` with
 `ExecStart`

---
 .../services/blockchain/ethereum/geth.nix     | 68 ++++++++++---------
 1 file changed, 37 insertions(+), 31 deletions(-)

diff --git a/nixos/modules/services/blockchain/ethereum/geth.nix b/nixos/modules/services/blockchain/ethereum/geth.nix
index 570c556ef849..f58ca9d9819a 100644
--- a/nixos/modules/services/blockchain/ethereum/geth.nix
+++ b/nixos/modules/services/blockchain/ethereum/geth.nix
@@ -206,6 +206,43 @@ in
           after = [ "network.target" ];
 
           serviceConfig = {
+            ExecStart =
+              let
+                args = lib.cli.toCommandLineShellGNU { } {
+                  inherit (cfg)
+                    syncmode
+                    gcmode
+                    port
+                    maxpeers
+                    ;
+                  nousb = true;
+                  ipcdisable = true;
+                  datadir = dataDir;
+                  ${cfg.network} = true;
+
+                  http = cfg.http.enable;
+                  "http.addr" = if cfg.http.enable then cfg.http.address else null;
+                  "http.port" = if cfg.http.enable then cfg.http.port else null;
+                  "http.api" = if cfg.http.apis != null then lib.concatStringsSep "," cfg.http.apis else null;
+
+                  ws = cfg.websocket.enable;
+                  "ws.addr" = if cfg.websocket.enable then cfg.websocket.address else null;
+                  "ws.port" = if cfg.websocket.enable then cfg.websocket.port else null;
+                  "ws.api" = if cfg.websocket.apis != null then lib.concatStringsSep "," cfg.websocket.apis else null;
+
+                  metrics = cfg.metrics.enable;
+                  "metrics.addr" = if cfg.metrics.enable then cfg.metrics.address else null;
+                  "metrics.port" = if cfg.metrics.enable then cfg.metrics.port else null;
+
+                  "authrpc.addr" = cfg.authrpc.address;
+                  "authrpc.port" = cfg.authrpc.port;
+                  "authrpc.vhosts" = lib.concatStringsSep "," cfg.authrpc.vhosts;
+                  "authrpc.jwtsecret" =
+                    if cfg.authrpc.jwtsecret != "" then cfg.authrpc.jwtsecret else "${dataDir}/geth/jwtsecret";
+                };
+              in
+              "${lib.getExe cfg.package} ${args} ${lib.escapeShellArgs cfg.extraArgs}";
+
             DynamicUser = true;
             Restart = "always";
             StateDirectory = stateDir;
@@ -217,37 +254,6 @@ in
             PrivateDevices = "true";
             MemoryDenyWriteExecute = "true";
           };
-
-          script = ''
-            ${cfg.package}/bin/geth \
-              --nousb \
-              --ipcdisable \
-              ${lib.optionalString (cfg.network != null) ''--${cfg.network}''} \
-              --syncmode ${cfg.syncmode} \
-              --gcmode ${cfg.gcmode} \
-              --port ${toString cfg.port} \
-              --maxpeers ${toString cfg.maxpeers} \
-              ${lib.optionalString cfg.http.enable ''--http --http.addr ${cfg.http.address} --http.port ${toString cfg.http.port}''} \
-              ${
-                lib.optionalString (cfg.http.apis != null) ''--http.api ${lib.concatStringsSep "," cfg.http.apis}''
-              } \
-              ${lib.optionalString cfg.websocket.enable ''--ws --ws.addr ${cfg.websocket.address} --ws.port ${toString cfg.websocket.port}''} \
-              ${
-                lib.optionalString (
-                  cfg.websocket.apis != null
-                ) ''--ws.api ${lib.concatStringsSep "," cfg.websocket.apis}''
-              } \
-              ${lib.optionalString cfg.metrics.enable ''--metrics --metrics.addr ${cfg.metrics.address} --metrics.port ${toString cfg.metrics.port}''} \
-              --authrpc.addr ${cfg.authrpc.address} --authrpc.port ${toString cfg.authrpc.port} --authrpc.vhosts ${lib.concatStringsSep "," cfg.authrpc.vhosts} \
-              ${
-                if (cfg.authrpc.jwtsecret != "") then
-                  ''--authrpc.jwtsecret ${cfg.authrpc.jwtsecret}''
-                else
-                  ''--authrpc.jwtsecret ${dataDir}/geth/jwtsecret''
-              } \
-              ${lib.escapeShellArgs cfg.extraArgs} \
-              --datadir ${dataDir}
-          '';
         }
       ))
     ) eachGeth;

From 36386aa8b88ad9afba5d6b0da44417f21593bbec Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 16:29:50 +0900
Subject: [PATCH 3184/6226] nixos/soteria: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/security/soteria.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/security/soteria.nix b/nixos/modules/security/soteria.nix
index 3b2f8349c4e5..1e2b59e5714d 100644
--- a/nixos/modules/security/soteria.nix
+++ b/nixos/modules/security/soteria.nix
@@ -36,8 +36,8 @@ in
       wants = [ "graphical-session.target" ];
       after = [ "graphical-session.target" ];
 
-      script = lib.getExe cfg.package;
       serviceConfig = {
+        ExecStart = lib.getExe cfg.package;
         Type = "simple";
         Restart = "on-failure";
         RestartSec = 1;

From d681e38b9c831657ceac3938f2e43d483d178568 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 5 Oct 2025 16:32:12 +0900
Subject: [PATCH 3185/6226] nixos/nexus: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/web-apps/nexus.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixos/modules/services/web-apps/nexus.nix
index 1a97c88900f9..8afba754315f 100644
--- a/nixos/modules/services/web-apps/nexus.nix
+++ b/nixos/modules/services/web-apps/nexus.nix
@@ -142,9 +142,8 @@ in
         fi
       '';
 
-      script = "${cfg.package}/bin/nexus run";
-
       serviceConfig = {
+        ExecStart = "${cfg.package}/bin/nexus run";
         User = cfg.user;
         Group = cfg.group;
         PrivateTmp = true;

From d7a2c9e69fe0cbbe67979f7f6d3c93e5d0c0c237 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Thu, 9 Oct 2025 18:29:39 +0900
Subject: [PATCH 3186/6226] nixos/silverbullet: replace systemd `script` with
 `ExecStart`

---
 nixos/modules/services/web-apps/silverbullet.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/silverbullet.nix b/nixos/modules/services/web-apps/silverbullet.nix
index 789fafb68f7f..6d14842ebebc 100644
--- a/nixos/modules/services/web-apps/silverbullet.nix
+++ b/nixos/modules/services/web-apps/silverbullet.nix
@@ -95,7 +95,6 @@ in
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
-      preStart = lib.mkIf (!lib.hasPrefix "/var/lib/" cfg.spaceDir) "mkdir -p '${cfg.spaceDir}'";
       serviceConfig = {
         Type = "simple";
         User = "${cfg.user}";
@@ -104,6 +103,9 @@ in
         StateDirectory = lib.mkIf (lib.hasPrefix "/var/lib/" cfg.spaceDir) (
           lib.last (lib.splitString "/" cfg.spaceDir)
         );
+        ExecStartPre = lib.mkIf (
+          !lib.hasPrefix "/var/lib/" cfg.spaceDir
+        ) "${lib.getExe' pkgs.coreutils "mkdir"} -p '${cfg.spaceDir}'";
         ExecStart =
           "${lib.getExe cfg.package} --port ${toString cfg.listenPort} --hostname '${cfg.listenAddress}' '${cfg.spaceDir}' "
           + lib.concatStringsSep " " cfg.extraArgs;

From b58e464a7fffe913319ea4634835663f7c0c170d Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:27:23 +0900
Subject: [PATCH 3187/6226] nixos/zigbee2mqtt: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/home-automation/zigbee2mqtt.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/home-automation/zigbee2mqtt.nix b/nixos/modules/services/home-automation/zigbee2mqtt.nix
index d02cc7484991..0bf3a636c18e 100644
--- a/nixos/modules/services/home-automation/zigbee2mqtt.nix
+++ b/nixos/modules/services/home-automation/zigbee2mqtt.nix
@@ -79,6 +79,7 @@ in
       after = [ "network.target" ];
       environment.ZIGBEE2MQTT_DATA = cfg.dataDir;
       serviceConfig = {
+        ExecStartPre = "${lib.getExe' pkgs.coreutils "cp"} --no-preserve=mode ${configFile} '${cfg.dataDir}/configuration.yaml'";
         ExecStart = "${cfg.package}/bin/zigbee2mqtt";
         User = "zigbee2mqtt";
         Group = "zigbee2mqtt";
@@ -129,9 +130,6 @@ in
         ];
         UMask = "0077";
       };
-      preStart = ''
-        cp --no-preserve=mode ${configFile} "${cfg.dataDir}/configuration.yaml"
-      '';
     };
 
     users.users.zigbee2mqtt = {

From 9a4f125b885254f8216b5c95da1d422f5181543f Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:27:33 +0900
Subject: [PATCH 3188/6226] nixos/journalbeat: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/logging/journalbeat.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/logging/journalbeat.nix b/nixos/modules/services/logging/journalbeat.nix
index af178a3838d2..acd178234ab7 100644
--- a/nixos/modules/services/logging/journalbeat.nix
+++ b/nixos/modules/services/logging/journalbeat.nix
@@ -71,12 +71,12 @@ in
       wantedBy = [ "multi-user.target" ];
       wants = [ "elasticsearch.service" ];
       after = [ "elasticsearch.service" ];
-      preStart = ''
-        mkdir -p ${cfg.stateDir}/data
-        mkdir -p ${cfg.stateDir}/logs
-      '';
       serviceConfig = {
         StateDirectory = cfg.stateDir;
+        ExecStartPre = [
+          "${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.stateDir}/data"
+          "${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.stateDir}/logs"
+        ];
         ExecStart = ''
           ${cfg.package}/bin/journalbeat \
             -c ${journalbeatYml} \

From 01679461417290ad3ea9e73e38309f2f874bb29c Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:27:46 +0900
Subject: [PATCH 3189/6226] nixos/autofs: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/misc/autofs.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix
index e258fb20b7ea..edfefac1fdf2 100644
--- a/nixos/modules/services/misc/autofs.nix
+++ b/nixos/modules/services/misc/autofs.nix
@@ -88,14 +88,11 @@ in
       wants = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
 
-      preStart = ''
-        # There should be only one autofs service managed by systemd, so this should be safe.
-        rm -f /tmp/autofs-running
-      '';
-
       serviceConfig = {
         Type = "forking";
         PIDFile = "/run/autofs.pid";
+        # There should be only one autofs service managed by systemd, so this should be safe.
+        ExecStartPre = "${lib.getExe' pkgs.coreutils "rm"} -f /tmp/autofs-running";
         ExecStart = "${pkgs.autofs5}/bin/automount ${lib.optionalString cfg.debug "-d"} -p /run/autofs.pid -t ${builtins.toString cfg.timeout} ${autoMaster}";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
       };

From d85d3827871e8a0c3fcfe32428948b629df9970d Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:27:53 +0900
Subject: [PATCH 3190/6226] nixos/gollum: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/misc/gollum.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix
index ccfa63d3823d..a6793362d188 100644
--- a/nixos/modules/services/misc/gollum.nix
+++ b/nixos/modules/services/misc/gollum.nix
@@ -138,17 +138,13 @@ in
       description = "Gollum wiki";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      path = [ pkgs.git ];
-
-      preStart = ''
-        # This is safe to be run on an existing repo
-        git init ${cfg.stateDir}
-      '';
 
       serviceConfig = {
         User = cfg.user;
         Group = cfg.group;
         WorkingDirectory = cfg.stateDir;
+        # This is safe to be run on an existing repo
+        ExecStartPre = "${lib.getExe pkgs.git} init ${cfg.stateDir}";
         ExecStart = ''
           ${cfg.package}/bin/gollum \
             --port ${toString cfg.port} \

From 558d4428352fd3832cd6ca52a4d0ebb4912ff238 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:28:04 +0900
Subject: [PATCH 3191/6226] nixos/tandoor-recipes: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/misc/tandoor-recipes.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/misc/tandoor-recipes.nix b/nixos/modules/services/misc/tandoor-recipes.nix
index 549b3ad5fa3d..10d28c390a38 100644
--- a/nixos/modules/services/misc/tandoor-recipes.nix
+++ b/nixos/modules/services/misc/tandoor-recipes.nix
@@ -119,6 +119,12 @@ in
       after = lib.optional cfg.database.createLocally "postgresql.target";
 
       serviceConfig = {
+        ExecStartPre = [
+          "${lib.getExe' pkgs.coreutils "ln"} -sf ${manage} tandoor-recipes-manage"
+
+          # Let django migrate the DB as needed
+          "${lib.getExe pkg} migrate"
+        ];
         ExecStart = ''
           ${pkg.python.pkgs.gunicorn}/bin/gunicorn recipes.wsgi
         '';
@@ -172,13 +178,6 @@ in
 
       wantedBy = [ "multi-user.target" ];
 
-      preStart = ''
-        ln -sf ${manage} tandoor-recipes-manage
-
-        # Let django migrate the DB as needed
-        ${pkg}/bin/tandoor-recipes migrate
-      '';
-
       environment = env // {
         PYTHONPATH = "${pkg.python.pkgs.makePythonPath pkg.propagatedBuildInputs}:${pkg}/lib/tandoor-recipes";
       };

From 5d41770eb3ebb3953588ed8bfb0e2aa00b37ffa3 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:28:15 +0900
Subject: [PATCH 3192/6226] nixos/freeradius: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/networking/freeradius.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/networking/freeradius.nix b/nixos/modules/services/networking/freeradius.nix
index cd766f919579..569734f6d70b 100644
--- a/nixos/modules/services/networking/freeradius.nix
+++ b/nixos/modules/services/networking/freeradius.nix
@@ -13,11 +13,9 @@ let
     wantedBy = [ "multi-user.target" ];
     after = [ "network.target" ];
     wants = [ "network.target" ];
-    preStart = ''
-      ${cfg.package}/bin/radiusd -C -d ${cfg.configDir} -l stdout
-    '';
 
     serviceConfig = {
+      ExecStartPre = "${cfg.package}/bin/radiusd -C -d ${cfg.configDir} -l stdout";
       ExecStart =
         "${cfg.package}/bin/radiusd -f -d ${cfg.configDir} -l stdout" + lib.optionalString cfg.debug " -xx";
       ExecReload = [

From c657e20f5ae2c6caf9f6bd06f7d1da123fa765b5 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:28:24 +0900
Subject: [PATCH 3193/6226] nixos/pangolin: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/networking/pangolin.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/pangolin.nix b/nixos/modules/services/networking/pangolin.nix
index 9b5bdb9d3690..ee7d1458ed70 100644
--- a/nixos/modules/services/networking/pangolin.nix
+++ b/nixos/modules/services/networking/pangolin.nix
@@ -241,11 +241,6 @@ in
           requires = [ "network.target" ];
           after = [ "network.target" ];
 
-          preStart = ''
-            mkdir -p ${cfg.dataDir}/config
-            cp -f ${cfgFile} ${cfg.dataDir}/config/config.yml
-          '';
-
           serviceConfig = {
             User = "pangolin";
             Group = "fossorial";
@@ -317,6 +312,11 @@ in
               "~@swap:EPERM"
               "~@timer:EPERM"
             ];
+
+            ExecStartPre = [
+              "${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.dataDir}/config"
+              "${lib.getExe' pkgs.coreutils "cp"} -f ${cfgFile} ${cfg.dataDir}/config/config.yml"
+            ];
             ExecStart = lib.getExe cfg.package;
           };
         };

From 32ee33f5a06f701cd0d668c6acc5b5c6a0069894 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:28:33 +0900
Subject: [PATCH 3194/6226] nixos/pdnsd: replace `preStart` with `ExecStartPre`

---
 nixos/modules/services/networking/pdnsd.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/pdnsd.nix b/nixos/modules/services/networking/pdnsd.nix
index cda55cc2a7e8..abc78b5d569b 100644
--- a/nixos/modules/services/networking/pdnsd.nix
+++ b/nixos/modules/services/networking/pdnsd.nix
@@ -80,13 +80,13 @@ in
     systemd.services.pdnsd = {
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
-      preStart = ''
-        mkdir -p "${cfg.cacheDir}"
-        touch "${cfg.cacheDir}/pdnsd.cache"
-        chown -R ${pdnsdUser}:${pdnsdGroup} "${cfg.cacheDir}"
-      '';
       description = "pdnsd";
       serviceConfig = {
+        ExecStartPre = [
+          "${lib.getExe' pkgs.coreutils "mkdir"} -p '${cfg.cacheDir}'"
+          "${lib.getExe' pkgs.coreutils "touch"} '${cfg.cacheDir}/pdnsd.cache'"
+          "${lib.getExe' pkgs.coreutils "chown"} -R ${pdnsdUser}:${pdnsdGroup} '${cfg.cacheDir}'"
+        ];
         ExecStart = "${pdnsd}/bin/pdnsd -c ${pdnsdConf}";
       };
     };

From a12e0d41ceea7dc776801674c52b2a790dccb2f1 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:28:48 +0900
Subject: [PATCH 3195/6226] nixos/smokeping: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/networking/smokeping.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index d15f8689dd73..5990c0d4fa2e 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -337,12 +337,12 @@ in
       serviceConfig = {
         User = cfg.user;
         Restart = "on-failure";
+        ExecStartPre = [
+          "${cfg.package}/bin/smokeping --check --config=${configPath}"
+          "${cfg.package}/bin/smokeping --static --config=${configPath}"
+        ];
         ExecStart = "${cfg.package}/bin/smokeping --config=/etc/smokeping.conf --nodaemon";
       };
-      preStart = ''
-        ${cfg.package}/bin/smokeping --check --config=${configPath}
-        ${cfg.package}/bin/smokeping --static --config=${configPath}
-      '';
     };
 
     systemd.tmpfiles.rules = [

From 0148fd3f5e976f9898347582a88cb53595f5a68b Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:28:57 +0900
Subject: [PATCH 3196/6226] nixos/twingate: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/networking/twingate.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/twingate.nix b/nixos/modules/services/networking/twingate.nix
index 4e9edf6bb23d..14baae06bc89 100644
--- a/nixos/modules/services/networking/twingate.nix
+++ b/nixos/modules/services/networking/twingate.nix
@@ -17,7 +17,7 @@ in
   config = lib.mkIf cfg.enable {
     systemd.packages = [ cfg.package ];
     systemd.services.twingate = {
-      preStart = "cp -r --update=none ${cfg.package}/etc/twingate/. /etc/twingate/";
+      serviceConfig.ExecStartPre = "${lib.getExe' pkgs.coreutils "cp"} -r --update=none ${cfg.package}/etc/twingate/. /etc/twingate/";
       wantedBy = [ "multi-user.target" ];
     };
 

From 05fe126c8f8d553e91654775d4a15f8db410a989 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:29:04 +0900
Subject: [PATCH 3197/6226] nixos/zerobin: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/networking/zerobin.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/zerobin.nix b/nixos/modules/services/networking/zerobin.nix
index 96cf4cc7148d..0673070d1ee6 100644
--- a/nixos/modules/services/networking/zerobin.nix
+++ b/nixos/modules/services/networking/zerobin.nix
@@ -91,14 +91,14 @@ in
       enable = true;
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
+      serviceConfig.ExecStartPre = [
+        "${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.dataDir}"
+        "${lib.getExe' pkgs.coreutils "chown"} ${cfg.user} ${cfg.dataDir}"
+      ];
       serviceConfig.ExecStart = "${pkgs.zerobin}/bin/zerobin ${cfg.listenAddress} ${toString cfg.listenPort} false ${cfg.user} ${cfg.group} ${zerobin_config}";
       serviceConfig.PrivateTmp = "yes";
       serviceConfig.User = cfg.user;
       serviceConfig.Group = cfg.group;
-      preStart = ''
-        mkdir -p ${cfg.dataDir}
-        chown ${cfg.user} ${cfg.dataDir}
-      '';
     };
   };
 }

From 67938a0b324f94f76247ed0c4c0c4b4c943d2b9b Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:29:19 +0900
Subject: [PATCH 3198/6226] nixos/hologram-agent: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/security/hologram-agent.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixos/modules/services/security/hologram-agent.nix
index 21bedc4fabd2..6152a57ffb8c 100644
--- a/nixos/modules/services/security/hologram-agent.nix
+++ b/nixos/modules/services/security/hologram-agent.nix
@@ -55,10 +55,8 @@ in
         "network-link-dummy0.service"
         "network-addresses-dummy0.service"
       ];
-      preStart = ''
-        /run/current-system/sw/bin/rm -fv /run/hologram.sock
-      '';
       serviceConfig = {
+        ExecStartPre = "/run/current-system/sw/bin/rm -fv /run/hologram.sock";
         ExecStart = "${pkgs.hologram}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}";
       };
     };

From 7227679c5147e3b94cf321d1cea242d53ea03c26 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:29:27 +0900
Subject: [PATCH 3199/6226] nixos/glitchtip: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/web-apps/glitchtip.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-apps/glitchtip.nix b/nixos/modules/services/web-apps/glitchtip.nix
index 6a74cda886a1..54ddf7f542b6 100644
--- a/nixos/modules/services/web-apps/glitchtip.nix
+++ b/nixos/modules/services/web-apps/glitchtip.nix
@@ -236,11 +236,8 @@ in
         glitchtip = commonService // {
           description = "GlitchTip";
 
-          preStart = ''
-            ${lib.getExe pkg} migrate
-          '';
-
           serviceConfig = commonServiceConfig // {
+            ExecStartPre = "${lib.getExe pkg} migrate";
             ExecStart = ''
               ${lib.getExe python.pkgs.gunicorn} \
                 --bind=${cfg.listenAddress}:${toString cfg.port} \

From d075ef1ef3d7bcc2118e9367595d996c916fc038 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:29:38 +0900
Subject: [PATCH 3200/6226] nixos/mediagoblin: replace `preStart` with
 `ExecStartPre`

---
 .../modules/services/web-apps/mediagoblin.nix | 34 +++++++++----------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/services/web-apps/mediagoblin.nix b/nixos/modules/services/web-apps/mediagoblin.nix
index 081bfa763f9b..934afe082dae 100644
--- a/nixos/modules/services/web-apps/mediagoblin.nix
+++ b/nixos/modules/services/web-apps/mediagoblin.nix
@@ -310,19 +310,6 @@ in
       in
       {
         mediagoblin-celeryd = lib.recursiveUpdate serviceDefaults {
-          # we cannot change DEFAULT.data_dir inside mediagoblin.ini because of an annoying bug
-          # https://todo.sr.ht/~mediagoblin/mediagoblin/57
-          preStart = ''
-            cp --remove-destination ${
-              pkgs.writeText "mediagoblin.ini" (
-                lib.generators.toINI { } (lib.filterAttrsRecursive (n: v: n != "plugins") cfg.settings)
-                + "\n"
-                + lib.generators.toINI { mkKeyValue = mkSubSectionKeyValue 2; } {
-                  inherit (cfg.settings.mediagoblin) plugins;
-                }
-              )
-            } /var/lib/mediagoblin/mediagoblin.ini
-          '';
           serviceConfig = {
             Environment = [
               "CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_celery"
@@ -331,6 +318,19 @@ in
               "MEDIAGOBLIN_CONFIG=/var/lib/mediagoblin/mediagoblin.ini"
               "PASTE_CONFIG=${pasteConfig}"
             ];
+            # we cannot change DEFAULT.data_dir inside mediagoblin.ini because of an annoying bug
+            # https://todo.sr.ht/~mediagoblin/mediagoblin/57
+            ExecStartPre = ''
+              ${lib.getExe' pkgs.coreutils "cp"} --remove-destination ${
+                pkgs.writeText "mediagoblin.ini" (
+                  lib.generators.toINI { } (lib.filterAttrsRecursive (n: v: n != "plugins") cfg.settings)
+                  + "\n"
+                  + lib.generators.toINI { mkKeyValue = mkSubSectionKeyValue 2; } {
+                    inherit (cfg.settings.mediagoblin) plugins;
+                  }
+                )
+              } /var/lib/mediagoblin/mediagoblin.ini
+            '';
             ExecStart = "${lib.getExe' finalPackage "celery"} worker --loglevel=INFO";
           };
           unitConfig.Description = "MediaGoblin Celery";
@@ -345,16 +345,16 @@ in
             "mediagoblin-celeryd.service"
             "postgresql.target"
           ];
-          preStart = ''
-            cp --remove-destination ${pasteConfig} /var/lib/mediagoblin/paste.ini
-            ${lib.getExe' finalPackage "gmg"} dbupdate
-          '';
           serviceConfig = {
             Environment = [
               "CELERY_ALWAYS_EAGER=false"
               "GI_TYPELIB_PATH=${GI_TYPELIB_PATH}"
               "GST_PLUGIN_PATH=${GST_PLUGIN_PATH}"
             ];
+            ExecStartPre = [
+              "${lib.getExe' pkgs.coreutils "cp"} --remove-destination ${pasteConfig} /var/lib/mediagoblin/paste.ini"
+              "${lib.getExe' finalPackage "gmg"} dbupdate"
+            ];
             ExecStart = "${lib.getExe' finalPackage "paster"} serve /var/lib/mediagoblin/paste.ini";
           };
           unitConfig.Description = "Mediagoblin";

From 32d1b3178dcf4194c3546b48137c60ee000583b0 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:29:45 +0900
Subject: [PATCH 3201/6226] nixos/misskey: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/web-apps/misskey.nix | 24 ++++++++++-----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/web-apps/misskey.nix b/nixos/modules/services/web-apps/misskey.nix
index c601943479cf..d1f147fdfa11 100644
--- a/nixos/modules/services/web-apps/misskey.nix
+++ b/nixos/modules/services/web-apps/misskey.nix
@@ -326,19 +326,19 @@ in
       environment = {
         MISSKEY_CONFIG_YML = "/run/misskey/default.yml";
       };
-      preStart = ''
-        install -m 700 ${settingsFormat.generate "misskey-config.yml" cfg.settings} /run/misskey/default.yml
-      ''
-      + (lib.optionalString (cfg.database.passwordFile != null) ''
-        ${pkgs.replace-secret}/bin/replace-secret '@DATABASE_PASSWORD@' "${cfg.database.passwordFile}" /run/misskey/default.yml
-      '')
-      + (lib.optionalString (cfg.redis.passwordFile != null) ''
-        ${pkgs.replace-secret}/bin/replace-secret '@REDIS_PASSWORD@' "${cfg.redis.passwordFile}" /run/misskey/default.yml
-      '')
-      + (lib.optionalString (cfg.meilisearch.keyFile != null) ''
-        ${pkgs.replace-secret}/bin/replace-secret '@MEILISEARCH_KEY@' "${cfg.meilisearch.keyFile}" /run/misskey/default.yml
-      '');
       serviceConfig = {
+        ExecStartPre = [
+          "${lib.getExe' pkgs.coreutils "install"} -m 700 ${settingsFormat.generate "misskey-config.yml" cfg.settings} /run/misskey/default.yml"
+        ]
+        ++ (lib.optionals (cfg.database.passwordFile != null) [
+          "${lib.getExe pkgs.replace-secret} '@DATABASE_PASSWORD@' '${cfg.database.passwordFile}' /run/misskey/default.yml"
+        ])
+        ++ (lib.optionals (cfg.redis.passwordFile != null) [
+          "${lib.getExe pkgs.replace-secret} '@REDIS_PASSWORD@' '${cfg.redis.passwordFile}' /run/misskey/default.yml"
+        ])
+        ++ (lib.optionals (cfg.meilisearch.keyFile != null) [
+          "${lib.getExe pkgs.replace-secret} '@MEILISEARCH_KEY@' '${cfg.meilisearch.keyFile}' /run/misskey/default.yml"
+        ]);
         ExecStart = "${cfg.package}/bin/misskey migrateandstart";
         RuntimeDirectory = "misskey";
         RuntimeDirectoryMode = "700";

From f167ee75973cfb7627059ea33602017cd1add74b Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:47:56 +0900
Subject: [PATCH 3202/6226] nixos/heartbeat: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/logging/heartbeat.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/logging/heartbeat.nix b/nixos/modules/services/logging/heartbeat.nix
index 2280c4349144..8cc99e84c9bf 100644
--- a/nixos/modules/services/logging/heartbeat.nix
+++ b/nixos/modules/services/logging/heartbeat.nix
@@ -67,12 +67,10 @@ in
     systemd.services.heartbeat = {
       description = "heartbeat log shipper";
       wantedBy = [ "multi-user.target" ];
-      preStart = ''
-        mkdir -p "${cfg.stateDir}"/{data,logs}
-      '';
       serviceConfig = {
         User = "nobody";
         AmbientCapabilities = "cap_net_raw";
+        ExecStartPre = "${lib.getExe' pkgs.coreutils "mkdir"} -p '${cfg.stateDir}'/data '${cfg.stateDir}'/logs";
         ExecStart = "${cfg.package}/bin/heartbeat -c \"${heartbeatYml}\" -path.data \"${cfg.stateDir}/data\" -path.logs \"${cfg.stateDir}/logs\"";
       };
     };

From 872a7e98760818462ee8bd5271acd8f7c4b2a749 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:48:02 +0900
Subject: [PATCH 3203/6226] nixos/promtail: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/logging/promtail.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/services/logging/promtail.nix b/nixos/modules/services/logging/promtail.nix
index f346070441b3..4bf59a783df1 100644
--- a/nixos/modules/services/logging/promtail.nix
+++ b/nixos/modules/services/logging/promtail.nix
@@ -66,14 +66,11 @@ in
       wantedBy = [ "multi-user.target" ];
       stopIfChanged = false;
 
-      preStart = ''
-        ${lib.getExe pkgs.promtail} -config.file=${configFile} -check-syntax
-      '';
-
       serviceConfig = {
         Restart = "on-failure";
         TimeoutStopSec = 10;
 
+        ExecStartPre = "${lib.getExe pkgs.promtail} -config.file=${configFile} -check-syntax";
         ExecStart = "${pkgs.promtail}/bin/promtail -config.file=${configFile} ${escapeShellArgs cfg.extraFlags}";
 
         ProtectSystem = "strict";

From 74605cd61186bc4556b0b3ad9fc6f988f782402a Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:48:10 +0900
Subject: [PATCH 3204/6226] nixos/syslog-ng: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/logging/syslog-ng.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix
index 4c04d1f1f5dd..6b3e7c3e599d 100644
--- a/nixos/modules/services/logging/syslog-ng.nix
+++ b/nixos/modules/services/logging/syslog-ng.nix
@@ -79,7 +79,6 @@ in
   config = lib.mkIf cfg.enable {
     systemd.services.syslog-ng = {
       description = "syslog-ng daemon";
-      preStart = "mkdir -p /{var,run}/syslog-ng";
       wantedBy = [ "multi-user.target" ];
       after = [ "multi-user.target" ]; # makes sure hostname etc is set
       serviceConfig = {
@@ -87,6 +86,7 @@ in
         PIDFile = pidFile;
         StandardOutput = "null";
         Restart = "on-failure";
+        ExecStartPre = "${lib.getExe' pkgs.coreutils "mkdir"} -p /var/syslog-ng /run/syslog-ng";
         ExecStart = "${cfg.package}/sbin/syslog-ng ${lib.concatStringsSep " " syslogngOptions}";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
       };

From dc86b64fa256553f1f21105a6183ab21130ac5dd Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:48:20 +0900
Subject: [PATCH 3205/6226] nixos/cyrus-imap: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/mail/cyrus-imap.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/nixos/modules/services/mail/cyrus-imap.nix b/nixos/modules/services/mail/cyrus-imap.nix
index 3ffd74451b6c..05a78bb15805 100644
--- a/nixos/modules/services/mail/cyrus-imap.nix
+++ b/nixos/modules/services/mail/cyrus-imap.nix
@@ -341,6 +341,7 @@ in
         User = if (cfg.user == null) then "cyrus" else cfg.user;
         Group = if (cfg.group == null) then "cyrus" else cfg.group;
         Type = "simple";
+        ExecStartPre = "${lib.getExe' pkgs.coreutils "mkdir"} -p '${cfg.imapdSettings.configdirectory}/socket' '${cfg.tmpDBDir}' /run/cyrus/proc /run/cyrus/lock";
         ExecStart = "${cyrus-imapdPkg}/libexec/master -l $LISTENQUEUE -C /etc/imapd.conf -M /etc/cyrus.conf -p /run/cyrus/master.pid -D";
         Restart = "on-failure";
         RestartSec = "1s";
@@ -366,9 +367,6 @@ in
         RestrictNamespaces = true;
         RestrictRealtime = true;
       };
-      preStart = ''
-        mkdir -p '${cfg.imapdSettings.configdirectory}/socket' '${cfg.tmpDBDir}' /run/cyrus/proc /run/cyrus/lock
-      '';
     };
     environment.systemPackages = [ cyrus-imapdPkg ];
   };

From 0f72120c360dff21db9a2a2a326f8cb059eabf69 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:48:28 +0900
Subject: [PATCH 3206/6226] nixos/postgrey: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/mail/postgrey.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index 463757fa8440..67a97f6a244f 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -210,13 +210,13 @@ in
         description = "Postfix Greylisting Service";
         wantedBy = [ "multi-user.target" ];
         before = [ "postfix.service" ];
-        preStart = ''
-          mkdir -p /var/postgrey
-          chown postgrey:postgrey /var/postgrey
-          chmod 0770 /var/postgrey
-        '';
         serviceConfig = {
           Type = "simple";
+          ExecStartPre = [
+            "${lib.getExe' pkgs.coreutils "mkdir"} -p /var/postgrey"
+            "${lib.getExe' pkgs.coreutils "chown"} postgrey:postgrey /var/postgrey"
+            "${lib.getExe' pkgs.coreutils "chmod"} 0770 /var/postgrey"
+          ];
           ExecStart = ''
             ${pkgs.postgrey}/bin/postgrey \
                       ${bind-flag} \

From 48fd53fac79d5b7ee01573fbd769259e69d6b518 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:48:36 +0900
Subject: [PATCH 3207/6226] nixos/stalwart-mail: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/mail/stalwart-mail.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/mail/stalwart-mail.nix b/nixos/modules/services/mail/stalwart-mail.nix
index 34004da62ef7..3c1fc27e45f8 100644
--- a/nixos/modules/services/mail/stalwart-mail.nix
+++ b/nixos/modules/services/mail/stalwart-mail.nix
@@ -162,17 +162,16 @@ in
           "network.target"
         ];
 
-        preStart =
-          if useLegacyStorage then
-            ''
-              mkdir -p ${cfg.dataDir}/data/blobs
-            ''
-          else
-            ''
-              mkdir -p ${cfg.dataDir}/db
-            '';
-
         serviceConfig = {
+          ExecStartPre =
+            if useLegacyStorage then
+              ''
+                ${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.dataDir}/data/blobs
+              ''
+            else
+              ''
+                ${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.dataDir}/db
+              '';
           ExecStart = [
             ""
             "${lib.getExe cfg.package} --config=${configFile}"

From 589c370878baa1ce1ac3459b99b4edf06327a320 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:48:43 +0900
Subject: [PATCH 3208/6226] nixos/errbot: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/misc/errbot.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/misc/errbot.nix b/nixos/modules/services/misc/errbot.nix
index d9f52af7fe72..aa94368d61d2 100644
--- a/nixos/modules/services/misc/errbot.nix
+++ b/nixos/modules/services/misc/errbot.nix
@@ -100,13 +100,13 @@ in
         {
           after = [ "network-online.target" ];
           wantedBy = [ "multi-user.target" ];
-          preStart = ''
-            mkdir -p ${dataDir}
-            chown -R errbot:errbot ${dataDir}
-          '';
           serviceConfig = {
             User = "errbot";
             Restart = "on-failure";
+            ExecStartPre = [
+              "${lib.getExe' pkgs.coreutils "mkdir"} -p ${dataDir}"
+              "${lib.getExe' pkgs.coreutils "chown"} -R errbot:errbot ${dataDir}"
+            ];
             ExecStart = "${pkgs.errbot}/bin/errbot -c ${mkConfigDir instanceCfg dataDir}/config.py";
             PermissionsStartOnly = true;
           };

From 257008a566432bbac86987620fd8ab7c4a164ed8 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:48:56 +0900
Subject: [PATCH 3209/6226] nixos/supybot: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/networking/supybot.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix
index f05e1fe30112..6a9d64a97cc2 100644
--- a/nixos/modules/services/networking/supybot.nix
+++ b/nixos/modules/services/networking/supybot.nix
@@ -104,14 +104,12 @@ in
       documentation = [ "https://limnoria.readthedocs.io/" ];
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      preStart = ''
-        # This needs to be created afresh every time
-        rm -f '${cfg.stateDir}/supybot.cfg.bak'
-      '';
 
       startLimitIntervalSec = 5 * 60; # 5 min
       startLimitBurst = 1;
       serviceConfig = {
+        # This needs to be created afresh every time
+        ExecStartPre = "${lib.getExe' pkgs.coreutils "rm"} -f '${cfg.stateDir}/supybot.cfg.bak'";
         ExecStart = "${pyEnv}/bin/supybot ${cfg.stateDir}/supybot.cfg";
         PIDFile = "/run/supybot.pid";
         User = "supybot";

From 84f908ad2eed413c5efea18891ce948ca27d25fd Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:49:03 +0900
Subject: [PATCH 3210/6226] nixos/thelounge: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/networking/thelounge.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/networking/thelounge.nix b/nixos/modules/services/networking/thelounge.nix
index a8104c2e1b88..4a3ef4d1c426 100644
--- a/nixos/modules/services/networking/thelounge.nix
+++ b/nixos/modules/services/networking/thelounge.nix
@@ -112,11 +112,11 @@ in
     systemd.services.thelounge = {
       description = "The Lounge web IRC client";
       wantedBy = [ "multi-user.target" ];
-      preStart = "ln -sf ${pkgs.writeText "config.js" configJsData} ${dataDir}/config.js";
       environment.THELOUNGE_PACKAGES = mkIf (cfg.plugins != [ ]) "${plugins}";
       serviceConfig = {
         User = "thelounge";
         StateDirectory = baseNameOf dataDir;
+        ExecStartPre = "${lib.getExe' pkgs.coreutils "ln"} -sf ${pkgs.writeText "config.js" configJsData} ${dataDir}/config.js";
         ExecStart = "${getExe cfg.package} start";
       };
     };

From 8f5f339b14d369b8b80e47938084c549779985d0 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:49:10 +0900
Subject: [PATCH 3211/6226] nixos/authelia: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/security/authelia.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/security/authelia.nix b/nixos/modules/services/security/authelia.nix
index 5dc438473a1d..0773642da6a4 100644
--- a/nixos/modules/services/security/authelia.nix
+++ b/nixos/modules/services/security/authelia.nix
@@ -375,10 +375,10 @@ in
             })
             // instance.environmentVariables;
 
-          preStart = "${execCommand} ${configArg} validate-config";
           serviceConfig = {
             User = instance.user;
             Group = instance.group;
+            ExecStartPre = "${execCommand} ${configArg} validate-config";
             ExecStart = "${execCommand} ${configArg}";
             Restart = "always";
             RestartSec = "5s";

From 783087ba35ead2012dd46390fd2855dea71ee96d Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Wed, 15 Oct 2025 22:49:17 +0900
Subject: [PATCH 3212/6226] nixos/h2o: replace `preStart` with `ExecStartPre`

---
 nixos/modules/services/web-servers/h2o/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/web-servers/h2o/default.nix b/nixos/modules/services/web-servers/h2o/default.nix
index 331c31fefc9b..719f6401103e 100644
--- a/nixos/modules/services/web-servers/h2o/default.nix
+++ b/nixos/modules/services/web-servers/h2o/default.nix
@@ -443,6 +443,7 @@ in
       ++ builtins.map (certName: "acme-${certName}.service") acmeCertNames.all;
 
       serviceConfig = {
+        ExecStartPre = "${h2oExe} --mode 'test'";
         ExecStart = "${h2oExe} --mode 'master'";
         ExecReload = [
           "${h2oExe} --mode 'test'"
@@ -483,8 +484,6 @@ in
         AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
         CapabilitiesBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
       };
-
-      preStart = "${h2oExe} --mode 'test'";
     };
 
     # This service waits for all certificates to be available before reloading

From 067bcde95e0c51fe4cb89594c3814fffec1dc622 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 17 Oct 2025 00:15:13 +0900
Subject: [PATCH 3213/6226] nixos/ncps: replace `preStart` with `ExecStartPre`

---
 nixos/modules/services/networking/ncps.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/ncps.nix b/nixos/modules/services/networking/ncps.nix
index ebc3af2cec0f..4a938f50652e 100644
--- a/nixos/modules/services/networking/ncps.nix
+++ b/nixos/modules/services/networking/ncps.nix
@@ -275,12 +275,9 @@ in
       wants = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
 
-      preStart = ''
-        ${lib.getExe cfg.dbmatePackage} --migrations-dir=${cfg.package}/share/ncps/db/migrations --url=${cfg.cache.databaseURL} up
-      '';
-
       serviceConfig = lib.mkMerge [
         {
+          ExecStartPre = "${lib.getExe cfg.dbmatePackage} --migrations-dir=${cfg.package}/share/ncps/db/migrations --url=${cfg.cache.databaseURL} up";
           ExecStart = "${lib.getExe cfg.package} ${globalFlags} serve ${serveFlags}";
           User = "ncps";
           Group = "ncps";

From de4b07cb06b20dd897df536ff1fa1ae9e3ca7027 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 17 Oct 2025 00:15:22 +0900
Subject: [PATCH 3214/6226] nixos/opengfw: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/networking/opengfw.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/networking/opengfw.nix b/nixos/modules/services/networking/opengfw.nix
index 911e0ea1cfe2..38678156fd03 100644
--- a/nixos/modules/services/networking/opengfw.nix
+++ b/nixos/modules/services/networking/opengfw.nix
@@ -374,12 +374,12 @@ in
         after = [ "network.target" ];
         path = with pkgs; [ iptables ];
 
-        preStart = ''
-          ${optionalString (rules != null) "ln -sf ${rules} rules.yaml"}
-          ${optionalString (settings != null) "ln -sf ${settings} config.yaml"}
-        '';
-
         serviceConfig = rec {
+          ExecStartPre =
+            lib.optionals (rules != null) [ "${lib.getExe' pkgs.coreutils "ln"} -sf ${rules} rules.yaml" ]
+            ++ lib.optionals (settings != null) [
+              "${lib.getExe' pkgs.coreutils "ln"} -sf ${settings} config.yaml"
+            ];
           ExecStart =
             let
               args = lib.cli.toCommandLineShellGNU { } {

From 3a055b5230417bc6a804dfb7e4d8d485f0676979 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 17 Oct 2025 00:15:30 +0900
Subject: [PATCH 3215/6226] nixos/certmgr: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/security/certmgr.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/security/certmgr.nix b/nixos/modules/services/security/certmgr.nix
index 6a744e572101..a2e00ca35a82 100644
--- a/nixos/modules/services/security/certmgr.nix
+++ b/nixos/modules/services/security/certmgr.nix
@@ -34,11 +34,6 @@ let
         [ spec ]
     ) (lib.attrValues cfg.specs)
   );
-
-  preStart = ''
-    ${lib.concatStringsSep " \\\n" ([ "mkdir -p" ] ++ map lib.escapeShellArg specPaths)}
-    ${cfg.package}/bin/certmgr -f ${certmgrYaml} check
-  '';
 in
 {
   options.services.certmgr = {
@@ -215,11 +210,14 @@ in
       wants = [ "network-online.target" ];
       after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
-      inherit preStart;
 
       serviceConfig = {
         Restart = "always";
         RestartSec = "10s";
+        ExecStartPre = [
+          "${lib.getExe' pkgs.coreutils "mkdir"} -p ${lib.escapeShellArgs specPaths}"
+          "${lib.getExe cfg.package} -f ${certmgrYaml} check"
+        ];
         ExecStart = "${cfg.package}/bin/certmgr -f ${certmgrYaml}";
       };
     };

From 4077942ac600b90d4cedc3027002ef5bb979cbc5 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 17 Oct 2025 00:15:37 +0900
Subject: [PATCH 3216/6226] nixos/galene: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/web-apps/galene.nix | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/services/web-apps/galene.nix b/nixos/modules/services/web-apps/galene.nix
index 969615e6490a..6733a95d706c 100644
--- a/nixos/modules/services/web-apps/galene.nix
+++ b/nixos/modules/services/web-apps/galene.nix
@@ -133,19 +133,16 @@ in
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
-      preStart = ''
-        ${optionalString (cfg.insecure != true && cfg.certFile != null && cfg.keyFile != null) ''
-          install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.certFile} ${cfg.dataDir}/cert.pem
-          install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.keyFile} ${cfg.dataDir}/key.pem
-        ''}
-      '';
-
       serviceConfig = mkMerge [
         {
           Type = "simple";
           User = cfg.user;
           Group = cfg.group;
           WorkingDirectory = cfg.stateDir;
+          ExecStartPre = lib.mkIf (cfg.insecure != true && cfg.certFile != null && cfg.keyFile != null) [
+            "${lib.getExe' pkgs.coreutils "install"} -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.certFile} ${cfg.dataDir}/cert.pem"
+            "${lib.getExe' pkgs.coreutils "install"} -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.keyFile} ${cfg.dataDir}/key.pem"
+          ];
           ExecStart = ''
             ${cfg.package}/bin/galene \
             ${optionalString (cfg.insecure) "-insecure"} \

From b6e8ec65a448386e8c05e229866ce650d71cc666 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 17 Oct 2025 00:15:47 +0900
Subject: [PATCH 3217/6226] nixos/healthchecks: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/web-apps/healthchecks.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/services/web-apps/healthchecks.nix b/nixos/modules/services/web-apps/healthchecks.nix
index eec40a8a07f9..ea97222f25e0 100644
--- a/nixos/modules/services/web-apps/healthchecks.nix
+++ b/nixos/modules/services/web-apps/healthchecks.nix
@@ -237,14 +237,13 @@ in
           wantedBy = [ "healthchecks.target" ];
           after = [ "healthchecks-migration.service" ];
 
-          preStart = ''
-            ${pkg}/opt/healthchecks/manage.py collectstatic --no-input
-            ${pkg}/opt/healthchecks/manage.py remove_stale_contenttypes --no-input
-          ''
-          + lib.optionalString (cfg.settings.DEBUG != "True") "${pkg}/opt/healthchecks/manage.py compress";
-
           serviceConfig = commonConfig // {
             Restart = "always";
+            ExecStartPre = [
+              "${pkg}/opt/healthchecks/manage.py collectstatic --no-input"
+              "${pkg}/opt/healthchecks/manage.py remove_stale_contenttypes --no-input"
+            ]
+            ++ lib.optionals (cfg.settings.DEBUG != "True") [ "${pkg}/opt/healthchecks/manage.py compress" ];
             ExecStart = ''
               ${pkgs.python3Packages.gunicorn}/bin/gunicorn hc.wsgi \
                 --bind ${cfg.listenAddress}:${toString cfg.port} \

From 6302adedb336306bbc69b4da9f62e022f156212d Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 17 Oct 2025 00:15:55 +0900
Subject: [PATCH 3218/6226] nixos/miniflux: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/web-apps/miniflux.nix | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix
index dac5f508aa70..3a94f943b426 100644
--- a/nixos/modules/services/web-apps/miniflux.nix
+++ b/nixos/modules/services/web-apps/miniflux.nix
@@ -18,14 +18,6 @@ let
   cfg = config.services.miniflux;
 
   boolToInt = b: if b then 1 else 0;
-
-  pgbin = "${config.services.postgresql.package}/bin";
-  # The hstore extension is no longer needed as of v2.2.14
-  # and would prevent Miniflux from starting.
-  preStart = pkgs.writeScript "miniflux-pre-start" ''
-    #!${pkgs.runtimeShell}
-    ${pgbin}/psql "miniflux" -c "DROP EXTENSION IF EXISTS hstore"
-  '';
 in
 
 {
@@ -141,7 +133,9 @@ in
       serviceConfig = {
         Type = "oneshot";
         User = config.services.postgresql.superUser;
-        ExecStart = preStart;
+        # The hstore extension is no longer needed as of v2.2.14
+        # and would prevent Miniflux from starting.
+        ExecStart = ''${config.services.postgresql.package}/bin/psql "miniflux" -c "DROP EXTENSION IF EXISTS hstore"'';
       };
     };
 

From 999be140d6cad0c4fde1a9c912903875d43e248a Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 17 Oct 2025 00:16:02 +0900
Subject: [PATCH 3219/6226] nixos/peering-manager: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/web-apps/peering-manager.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/nixos/modules/services/web-apps/peering-manager.nix b/nixos/modules/services/web-apps/peering-manager.nix
index 40533ae760e1..046122e3b704 100644
--- a/nixos/modules/services/web-apps/peering-manager.nix
+++ b/nixos/modules/services/web-apps/peering-manager.nix
@@ -307,11 +307,8 @@ in
           ]
           ++ lib.optionals (cfg.environmentFile != null) [ "peering-manager-config.service" ];
 
-          preStart = ''
-            ${pkg}/bin/peering-manager remove_stale_contenttypes --no-input
-          '';
-
           serviceConfig = {
+            ExecStartPre = "${pkg}/bin/peering-manager remove_stale_contenttypes --no-input";
             ExecStart = ''
               ${pkg.python.pkgs.gunicorn}/bin/gunicorn peering_manager.wsgi \
                 --bind ${cfg.listenAddress}:${toString cfg.port} \

From 409462625346210981f8c5aec95e1ae078500ba1 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 17 Oct 2025 00:42:27 +0900
Subject: [PATCH 3220/6226] nixos/nullmailer: replace `preStart` with
 `ExecStartPre`

---
 nixos/modules/services/mail/nullmailer.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix
index 6dc278f89f29..a8b1cf76f351 100644
--- a/nixos/modules/services/mail/nullmailer.nix
+++ b/nixos/modules/services/mail/nullmailer.nix
@@ -245,13 +245,13 @@
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
 
-        preStart = ''
-          rm -f /var/spool/nullmailer/trigger && mkfifo -m 660 /var/spool/nullmailer/trigger
-        '';
-
         serviceConfig = {
           User = cfg.user;
           Group = cfg.group;
+          ExecStartPre = [
+            "${lib.getExe' pkgs.coreutils "rm"} -f /var/spool/nullmailer/trigger"
+            "${lib.getExe' pkgs.coreutils "mkfifo"} -m 660 /var/spool/nullmailer/trigger"
+          ];
           ExecStart = "${pkgs.nullmailer}/bin/nullmailer-send";
           Restart = "always";
         };

From 9eac75a8ba9fe36050f7efa89efb90c7dc9ea3fb Mon Sep 17 00:00:00 2001
From: Jonas Heinrich <onny@project-insanity.org>
Date: Mon, 27 Oct 2025 10:55:19 +0100
Subject: [PATCH 3221/6226] stalwart-mail.webadmin: Fix RiscV cross-compilation

---
 pkgs/by-name/st/stalwart-mail/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix
index e5b3bf0d62a6..4f6830378082 100644
--- a/pkgs/by-name/st/stalwart-mail/package.nix
+++ b/pkgs/by-name/st/stalwart-mail/package.nix
@@ -16,6 +16,7 @@
   callPackage,
   withFoundationdb ? false,
   stalwartEnterprise ? false,
+  buildPackages,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -173,7 +174,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   passthru = {
     inherit rocksdb; # make used rocksdb version available (e.g., for backup scripts)
-    webadmin = callPackage ./webadmin.nix { };
+    webadmin = buildPackages.callPackage ./webadmin.nix { };
     spam-filter = callPackage ./spam-filter.nix { };
     updateScript = nix-update-script { };
     tests.stalwart-mail = nixosTests.stalwart-mail;

From ec566f25f5867dbdd76013c1ce7adeb9075b94b8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 27 Sep 2025 11:49:07 +0200
Subject: [PATCH 3222/6226] python313Packages.dask-awkward: mark as broken for
 dask > 2025.4.0

---
 pkgs/development/python-modules/dask-awkward/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix
index 929ce2972247..50c5b7a12fe6 100644
--- a/pkgs/development/python-modules/dask-awkward/default.nix
+++ b/pkgs/development/python-modules/dask-awkward/default.nix
@@ -88,5 +88,8 @@ buildPythonPackage rec {
     changelog = "https://github.com/dask-contrib/dask-awkward/releases/tag/${src.tag}";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ veprbl ];
+    # dask-awkward is incompatible with recent dask versions.
+    # See https://github.com/dask-contrib/dask-awkward/pull/582 for context.
+    broken = lib.versionAtLeast dask.version "2025.4.0";
   };
 }

From d857cda9ec0786765a63ae9a67b034439f13542b Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 09:58:24 +0200
Subject: [PATCH 3223/6226] quartus-prime-lite: lib.filterAttrs ->
 lib.removeAttrs

---
 pkgs/by-name/qu/quartus-prime-lite/quartus.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/qu/quartus-prime-lite/quartus.nix b/pkgs/by-name/qu/quartus-prime-lite/quartus.nix
index 2349d765b3cd..68121d1a14ce 100644
--- a/pkgs/by-name/qu/quartus-prime-lite/quartus.nix
+++ b/pkgs/by-name/qu/quartus-prime-lite/quartus.nix
@@ -35,9 +35,7 @@ let
       }) supportedDevices
     );
 
-  unsupportedDeviceIds = lib.filterAttrs (
-    name: value: !(lib.hasAttr name supportedDeviceIds)
-  ) deviceIds;
+  unsupportedDeviceIds = lib.removeAttrs deviceIds (lib.attrNames supportedDeviceIds);
 
   componentHashes = {
     "arria_lite" = "sha256-ASvi9YX15b4XXabGjkuR5wl9wDwCijl8s750XTR/4XU=";

From 82f8caefa346c463f3196fb0cfc6744b4bba0a49 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 10:03:01 +0200
Subject: [PATCH 3224/6226] haskell-language-server: lib.filterAttrs ->
 lib.removeAttrs

---
 .../tools/haskell/haskell-language-server/withWrapper.nix       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
index 2beaa3ed8e45..600a1acd6de6 100644
--- a/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
+++ b/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix
@@ -99,7 +99,7 @@ let
     let
       # only formatters that were not requested
       unwanted = lib.pipe knownFormatters [
-        (lib.filterAttrs (fmt: _: !(lib.elem fmt supportedFormatters)))
+        (fmts: lib.removeAttrs fmts supportedFormatters)
         lib.attrsToList
       ];
       # all flags to disable

From 467464e0cd66e2ef4b37ede14cec56bd360712c7 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 10:19:21 +0200
Subject: [PATCH 3225/6226] linux: lib.filterAttrs -> lib.removeAttrs

---
 pkgs/os-specific/linux/kernel/patches.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix
index ddda525e70b0..6719de2e3468 100644
--- a/pkgs/os-specific/linux/kernel/patches.nix
+++ b/pkgs/os-specific/linux/kernel/patches.nix
@@ -57,7 +57,7 @@
         in
         {
           name = lib.removeSuffix ".patch" src.name;
-          patch = fetchurl (lib.filterAttrs (k: v: k != "extra") src);
+          patch = fetchurl (lib.removeAttrs src [ "extra" ]);
           extra = src.extra;
           inherit version sha256;
         };

From b6625b9f0107efbb2a7f5b030556c5e1c4594ceb Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 7 Apr 2025 12:10:54 +0200
Subject: [PATCH 3226/6226] stdenv/darwin: lib.filterAttrs -> lib.removeAttrs

---
 pkgs/stdenv/darwin/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix
index 4fa9b5454aed..d7eb0c453ec4 100644
--- a/pkgs/stdenv/darwin/default.nix
+++ b/pkgs/stdenv/darwin/default.nix
@@ -737,7 +737,10 @@ assert bootstrapTools.passthru.isFromBootstrapFiles or false; # sanity check
           (disallowedPackages prevStage)
           # Only cctools and ld64 are rebuilt from `bintoolsPackages` to avoid rebuilding their dependencies
           # again in this stage after building them in stage 1.
-          (lib.filterAttrs (name: _: name != "ld64" && name != "cctools") (bintoolsPackages prevStage))
+          (lib.removeAttrs (bintoolsPackages prevStage) [
+            "ld64"
+            "cctools"
+          ])
           (llvmToolsDeps prevStage)
           (sdkPackages prevStage)
           (sdkPackagesNoCC prevStage)

From e029ab783d8151b12b2b7ec58c0001966b276774 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Mon, 8 Sep 2025 21:37:00 +0200
Subject: [PATCH 3227/6226] python3Packages.pulsar-client: lib.filterAttrs ->
 lib.removeAttrs

---
 pkgs/development/python-modules/pulsar-client/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pulsar-client/default.nix b/pkgs/development/python-modules/pulsar-client/default.nix
index 3c9b5303ad7d..2919a84f8e79 100644
--- a/pkgs/development/python-modules/pulsar-client/default.nix
+++ b/pkgs/development/python-modules/pulsar-client/default.nix
@@ -67,7 +67,7 @@ buildPythonPackage rec {
       ratelimit
     ];
     avro = [ fastavro ];
-    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ]));
   };
 
   nativeCheckInputs = [

From d79a2afea101d3a943662814d7e2cd798955cc2d Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 26 Oct 2025 14:53:38 +0900
Subject: [PATCH 3228/6226] python3Packages.dramatiq-abort: lib.filterAttrs ->
 lib.removeAttrs

---
 pkgs/development/python-modules/dramatiq-abort/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/dramatiq-abort/default.nix b/pkgs/development/python-modules/dramatiq-abort/default.nix
index b4130f701bfe..655d2da4ec0f 100644
--- a/pkgs/development/python-modules/dramatiq-abort/default.nix
+++ b/pkgs/development/python-modules/dramatiq-abort/default.nix
@@ -29,7 +29,7 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ]));
     gevent = [ gevent ];
     redis = [ redis ];
   };

From 38190d2687fd7c80c9d5351cdcb89c27ab10d00b Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 26 Oct 2025 14:53:48 +0900
Subject: [PATCH 3229/6226] python3Packages.markdown2: lib.filterAttrs ->
 lib.removeAttrs

---
 pkgs/development/python-modules/markdown2/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/markdown2/default.nix b/pkgs/development/python-modules/markdown2/default.nix
index d417fb25ca10..e4a6cfd497a0 100644
--- a/pkgs/development/python-modules/markdown2/default.nix
+++ b/pkgs/development/python-modules/markdown2/default.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
     code_syntax_highlighting = [ pygments ];
     wavedrom = [ wavedrom ];
     latex = [ latex2mathml ];
-    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ]));
   };
 
   meta = {

From 4376ce331c691780bb1ad30b6b3a3fc6838eaa68 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 26 Oct 2025 14:53:59 +0900
Subject: [PATCH 3230/6226] python3Packages.odc-loader: lib.filterAttrs ->
 lib.removeAttrs

---
 pkgs/development/python-modules/odc-loader/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/odc-loader/default.nix b/pkgs/development/python-modules/odc-loader/default.nix
index e97bb7e87dc6..6fb6f3422ca8 100644
--- a/pkgs/development/python-modules/odc-loader/default.nix
+++ b/pkgs/development/python-modules/odc-loader/default.nix
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   optional-dependencies = {
     botocore = [ botocore ];
     zarr = [ zarr ];
-    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ]));
   };
 
   nativeCheckInputs = [

From da7a71e82428f037d52f6e9504e42989698294be Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 26 Oct 2025 14:54:07 +0900
Subject: [PATCH 3231/6226] python3Packages.pettingzoo: lib.filterAttrs ->
 lib.removeAttrs

---
 pkgs/development/python-modules/pettingzoo/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pettingzoo/default.nix b/pkgs/development/python-modules/pettingzoo/default.nix
index 1409b29e3633..e8fa3a1ed962 100644
--- a/pkgs/development/python-modules/pettingzoo/default.nix
+++ b/pkgs/development/python-modules/pettingzoo/default.nix
@@ -53,7 +53,7 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ]));
     atari = [
       # multi-agent-ale-py
       pygame

From 1d546cf368572db8c87cc8f0f57ac87162e151ed Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 26 Oct 2025 14:54:18 +0900
Subject: [PATCH 3232/6226] python3Packages.planetary-computer: lib.filterAttrs
 -> lib.removeAttrs

---
 pkgs/development/python-modules/planetary-computer/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/planetary-computer/default.nix b/pkgs/development/python-modules/planetary-computer/default.nix
index 7014512b6e4c..7bc6d0d61641 100644
--- a/pkgs/development/python-modules/planetary-computer/default.nix
+++ b/pkgs/development/python-modules/planetary-computer/default.nix
@@ -55,7 +55,7 @@ buildPythonPackage rec {
   optional-dependencies = {
     adlfs = [ adlfs ];
     azure = [ azure-storage-blob ];
-    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ]));
   };
 
   pythonImportsCheck = [

From e953f0d20fe1a5ceb9d7e307f85f3b6d65ff0c67 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 26 Oct 2025 14:54:28 +0900
Subject: [PATCH 3233/6226] python3Packages.pyproject-parser: lib.filterAttrs
 -> lib.removeAttrs

---
 pkgs/development/python-modules/pyproject-parser/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyproject-parser/default.nix b/pkgs/development/python-modules/pyproject-parser/default.nix
index f3108c431c3f..95a7a7e4c2c6 100644
--- a/pkgs/development/python-modules/pyproject-parser/default.nix
+++ b/pkgs/development/python-modules/pyproject-parser/default.nix
@@ -46,7 +46,7 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ]));
     cli = [
       click
       consolekit

From d56b377b93807f915c6f6745c179726fe9d53219 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 26 Oct 2025 14:54:38 +0900
Subject: [PATCH 3234/6226] python3Packages.tianshou: lib.filterAttrs ->
 lib.removeAttrs

---
 pkgs/development/python-modules/tianshou/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/tianshou/default.nix b/pkgs/development/python-modules/tianshou/default.nix
index 7cb9052c2d02..2012e3f360a9 100644
--- a/pkgs/development/python-modules/tianshou/default.nix
+++ b/pkgs/development/python-modules/tianshou/default.nix
@@ -92,7 +92,7 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
-    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ]));
 
     argparse = [
       docstring-parser

From 6952069832f45e58a2a14959af7163a30f3997ee Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Sun, 26 Oct 2025 14:54:45 +0900
Subject: [PATCH 3235/6226] python3Packages.whey: lib.filterAttrs ->
 lib.removeAttrs

---
 pkgs/development/python-modules/whey/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/whey/default.nix b/pkgs/development/python-modules/whey/default.nix
index ace0f3fbad75..e07c68a3a423 100644
--- a/pkgs/development/python-modules/whey/default.nix
+++ b/pkgs/development/python-modules/whey/default.nix
@@ -55,7 +55,7 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "whey" ];
 
   optional-dependencies = {
-    all = lib.flatten (lib.attrValues (lib.filterAttrs (n: v: n != "all") optional-dependencies));
+    all = lib.flatten (lib.attrValues (lib.removeAttrs optional-dependencies [ "all" ]));
     editable = [
       editables
     ];

From ea826761bb5c39f9ab5e140c256cdc5d095c821c Mon Sep 17 00:00:00 2001
From: Bruno Bzeznik <Bruno.Bzeznik@univ-grenoble-alpes.fr>
Date: Mon, 27 Oct 2025 11:09:07 +0100
Subject: [PATCH 3236/6226] irods: 5.0.1 -> 5.0.2

---
 pkgs/by-name/ir/irods-icommands/package.nix |  2 +-
 pkgs/by-name/ir/irods/package.nix           | 14 +++++---------
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ir/irods-icommands/package.nix b/pkgs/by-name/ir/irods-icommands/package.nix
index fd92911ec6a0..624986e5d3e4 100644
--- a/pkgs/by-name/ir/irods-icommands/package.nix
+++ b/pkgs/by-name/ir/irods-icommands/package.nix
@@ -16,7 +16,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     owner = "irods";
     repo = "irods_client_icommands";
     tag = finalAttrs.version;
-    hash = "sha256-lo1eCI/CSzl7BJWdPo7KKVHfznkPN6GwsiQThUGuQdw=";
+    hash = "sha256-jR7AhWeXYuJKzZRmYQUjiKSwK6PaB4dLQO8GVZwJQXk=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ir/irods/package.nix b/pkgs/by-name/ir/irods/package.nix
index 98b823f54f77..8c2055ec406e 100644
--- a/pkgs/by-name/ir/irods/package.nix
+++ b/pkgs/by-name/ir/irods/package.nix
@@ -16,19 +16,19 @@
   boost183,
   nlohmann_json,
   nanodbc,
-  fmt_9,
+  fmt,
   spdlog,
 }:
 
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "irods";
-  version = "5.0.1";
+  version = "5.0.2";
 
   src = fetchFromGitHub {
     owner = "irods";
     repo = "irods";
     tag = finalAttrs.version;
-    hash = "sha256-/mcuqukgDoMc89FL/TfOhHWglsfdLmQbAnQYT8vTFsY=";
+    hash = "sha256-gYwuXWRf5MZv3CTUq/RDlU9Ekbw4jZJmSgWRBKqdKJo=";
   };
 
   nativeBuildInputs = [
@@ -54,12 +54,8 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     boost183
     nlohmann_json
     nanodbc
-    # Tracking issue for `fmt_11`:
-    # <https://github.com/irods/irods/issues/8454>
-    fmt_9
-    (spdlog.override {
-      fmt = fmt_9;
-    })
+    fmt
+    spdlog
   ];
 
   cmakeFlags = finalAttrs.passthru.commonCmakeFlags ++ [

From 0589debedf9c0e4a0554a477c9697ac4c1c5c5c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 10:12:07 +0000
Subject: [PATCH 3237/6226] kurve: 2.1.0 -> 2.2.0

---
 pkgs/by-name/ku/kurve/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ku/kurve/package.nix b/pkgs/by-name/ku/kurve/package.nix
index 3f451c74928d..48e0f9028383 100644
--- a/pkgs/by-name/ku/kurve/package.nix
+++ b/pkgs/by-name/ku/kurve/package.nix
@@ -13,14 +13,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "kurve";
-  version = "2.1.0";
+  version = "2.2.0";
   dontWrapQtApps = true;
 
   src = fetchFromGitHub {
     owner = "luisbocanegra";
     repo = "kurve";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Fm2HoD3W/MymUr3JiVxssHvxwIGQ7jri0iz+asSS1eY=";
+    hash = "sha256-TWNgQUgjrlzQs+cjzfoD13dHG3M93Akxyg5VNB9Rp9E=";
   };
 
   installPhase = ''

From fb51f0976fcbe407853626aad6bd498a2c7c2901 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 10:27:55 +0000
Subject: [PATCH 3238/6226] discord-sh: 2.0.0 -> 2.0.1

---
 pkgs/by-name/di/discord-sh/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/discord-sh/package.nix b/pkgs/by-name/di/discord-sh/package.nix
index d82db4afa9d3..cff70077b52f 100644
--- a/pkgs/by-name/di/discord-sh/package.nix
+++ b/pkgs/by-name/di/discord-sh/package.nix
@@ -11,13 +11,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "discord-sh";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "ChaoticWeg";
     repo = "discord.sh";
     rev = "v${version}";
-    sha256 = "sha256-ZOGhwR9xFzkm+q0Gm8mSXZ9toXG4xGPNwBQMCVanCbY=";
+    sha256 = "sha256-z57uMbH6PI68aTMAjA8UIPEefV8sQRR4cS0eK6Ypxuk=";
   };
 
   # ignore Makefile by disabling buildPhase. Upstream Makefile tries to download

From b279abc75cc3ecacebd2bca5ebe9399981fae2f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 10:57:28 +0000
Subject: [PATCH 3239/6226] fn-cli: 0.6.43 -> 0.6.44

---
 pkgs/by-name/fn/fn-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fn/fn-cli/package.nix b/pkgs/by-name/fn/fn-cli/package.nix
index 249954db1d93..114470ea490b 100644
--- a/pkgs/by-name/fn/fn-cli/package.nix
+++ b/pkgs/by-name/fn/fn-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "fn";
-  version = "0.6.43";
+  version = "0.6.44";
 
   src = fetchFromGitHub {
     owner = "fnproject";
     repo = "cli";
     rev = version;
-    hash = "sha256-8JvrCY56i6Nksg+LgfIIpUZozUF0IBfdG8rKMuYUrzI=";
+    hash = "sha256-UfvBkUZ09mKM+84e89VFE+KZr0ora8eUWiJlYO11USQ=";
   };
 
   vendorHash = null;

From bc46fa17aea0a1c65a187e50662ee6574e541e6f Mon Sep 17 00:00:00 2001
From: Andrea Ciceri <andrea.ciceri@autistici.org>
Date: Mon, 27 Oct 2025 10:05:23 +0100
Subject: [PATCH 3240/6226] python3Packages.stringzilla: 4.2.1 -> 4.2.2

---
 .../python-modules/stringzilla/default.nix        | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix
index 35876032eea4..131ce9ae00c6 100644
--- a/pkgs/development/python-modules/stringzilla/default.nix
+++ b/pkgs/development/python-modules/stringzilla/default.nix
@@ -6,31 +6,20 @@
   pytest-repeat,
   pytestCheckHook,
   setuptools,
-  stdenv,
 }:
 
 buildPythonPackage rec {
   pname = "stringzilla";
-  version = "4.2.1";
+  version = "4.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ashvardanian";
     repo = "stringzilla";
     tag = "v${version}";
-    hash = "sha256-0CIekVxChvH912vFnBF2FR1YyIpxi3SD7KhBlh7yFGA=";
+    hash = "sha256-J1k8gYPStnnXHFvbHG6nHuQMQy1+XSiS5ERk/reL/Z4=";
   };
 
-  # Define _POSIX_C_SOURCE to enable POSIX signal handling for ARM capability detection
-  # See: https://github.com/ashvardanian/StringZilla/pull/263
-  env.NIX_CFLAGS_COMPILE = "-D_POSIX_C_SOURCE=200809L";
-
-  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    # error: unsupported option '-mfloat-abi=' for target 'aarch64-apple-darwin'
-    substituteInPlace setup.py \
-      --replace-fail '"-mfloat-abi=hard",' ""
-  '';
-
   build-system = [
     setuptools
   ];

From b6a8fccd082852c8078ee89531e6bdb5c44fe29d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 11:07:33 +0000
Subject: [PATCH 3241/6226] google-java-format: 1.30.0 -> 1.31.0

---
 pkgs/by-name/go/google-java-format/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/google-java-format/package.nix b/pkgs/by-name/go/google-java-format/package.nix
index 084d1674e3f1..481ac508b5e4 100644
--- a/pkgs/by-name/go/google-java-format/package.nix
+++ b/pkgs/by-name/go/google-java-format/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "google-java-format";
-  version = "1.30.0";
+  version = "1.31.0";
 
   src = fetchurl {
     url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar";
-    sha256 = "sha256-8iOaiiNKJApU/f94CdSz5mcCwh9ZDHegts97IMgp6Vo=";
+    sha256 = "sha256-jUv6Lck4iCASp4nMaEl2ivpK+06wEwjGtx+R8I4sVQg=";
   };
 
   dontUnpack = true;

From ae3704fb9e972551c0c1182033bd5c27a37dc78e Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Mon, 27 Oct 2025 13:08:55 +0200
Subject: [PATCH 3242/6226] aliases: drop nerdfonts alias

---
 pkgs/top-level/aliases.nix | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 068fa356eae7..113cd112e631 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1795,29 +1795,6 @@ mapAliases {
   neochat = makePlasma5Throw "neochat"; # added 2022-05-10
   neocities-cli = neocities; # Added 2024-07-31
   neocomp = throw "neocomp has been remove because it fails to build and was unmaintained upstream"; # Added 2025-04-28
-  nerdfonts =
-    throw
-      "
-    nerdfonts has been separated into individual font packages under the namespace nerd-fonts.
-    For example change:
-      fonts.packages = [
-        ...
-        (pkgs.nerdfonts.override { fonts = [ "
-      0
-      xproto
-      " "
-      DroidSansMono
-      " ]; })
-      ]
-    to
-      fonts.packages = [
-        ...
-        pkgs.nerd-fonts._0xproto
-        pkgs.nerd-fonts.droid-sans-mono
-      ]
-    or for all fonts
-      fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts)
-  "; # Added 2024-11-09
   netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02
   netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22
   netbox_3_7 = throw "netbox 3.7 series has been removed as it was EOL"; # Added 2025-04-23

From 7f07c8b68cc2f3eb792d58e98cdf6020cfaa6be5 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sun, 26 Oct 2025 20:25:36 +0800
Subject: [PATCH 3243/6226] python313Packages.submitit: fix build

---
 pkgs/development/python-modules/submitit/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/submitit/default.nix b/pkgs/development/python-modules/submitit/default.nix
index baa8e0c68ee3..7ace9bfdd730 100644
--- a/pkgs/development/python-modules/submitit/default.nix
+++ b/pkgs/development/python-modules/submitit/default.nix
@@ -7,7 +7,7 @@
   flit-core,
   typing-extensions,
   pytestCheckHook,
-  pytest-asyncio,
+  pytest-asyncio_0,
 }:
 
 buildPythonPackage rec {
@@ -34,7 +34,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     pytestCheckHook
-    pytest-asyncio
+    # event_loop was removed in pytest-asyncio 1.x
+    pytest-asyncio_0
   ];
 
   pythonImportsCheck = [

From cb83650fd1874a370f1170b584553f2fb4212e9e Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sun, 26 Oct 2025 12:28:45 +0000
Subject: [PATCH 3244/6226] python313Packages.submitit: 1.5.2 -> 1.5.3

---
 pkgs/development/python-modules/submitit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/submitit/default.nix b/pkgs/development/python-modules/submitit/default.nix
index 7ace9bfdd730..a131e66fd255 100644
--- a/pkgs/development/python-modules/submitit/default.nix
+++ b/pkgs/development/python-modules/submitit/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "submitit";
-  version = "1.5.2";
+  version = "1.5.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "submitit";
     tag = version;
-    hash = "sha256-PDQLzqQjoBAZM9FKsoRby26Pbh4nik3SltIHUw/xWcY=";
+    hash = "sha256-uBlKbg1oKeUPcWzM9WxisGtpBu69eZyTetaANYpTG5E=";
   };
 
   build-system = [

From 2ba5fb1059386a08bd0df348518f92ee6ba5ebe9 Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Mon, 27 Oct 2025 12:13:10 +0100
Subject: [PATCH 3245/6226] zoom-us: add missing library `libGLU`

...reported missing in `libdvf.so` by `autoPatchelfHook`.
---
 pkgs/by-name/zo/zoom-us/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index a2c41fd90d4a..b61742fa0849 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -175,6 +175,7 @@ let
       pkgs.glib.dev
       pkgs.gtk3
       pkgs.libGL
+      pkgs.libGLU
       pkgs.libdrm
       pkgs.libgbm
       pkgs.libkrb5

From d48bf98bcf416f5384a9491a66e2d264d028fe11 Mon Sep 17 00:00:00 2001
From: Yarny0 <41838844+Yarny0@users.noreply.github.com>
Date: Sun, 26 Oct 2025 18:16:56 +0100
Subject: [PATCH 3246/6226] nixos-rebuild-ng: tolerate nixpkgs being read-only

Classic nixos-rebuild ignores errors
when writing `.version-suffix` since
commit 365307ada1b6f3fc85b131cdcaaa9fcf19864a31 .
Without this it is not possible to do
`nixos-rebuild -I nixpkgs=/path/to/read-only/nixpkgs ...`.
The commit at hand reconstructs the
classic behaviour for `nixos-rebuild-ng`.
---
 .../ni/nixos-rebuild-ng/src/nixos_rebuild/services.py     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
index b145f735c283..72168c0499ae 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
@@ -372,4 +372,10 @@ def write_version_suffix(build_flags: Args) -> None:
     nixpkgs_path = nix.find_file("nixpkgs", build_flags)
     rev = nix.get_nixpkgs_rev(nixpkgs_path)
     if nixpkgs_path and rev:
-        (nixpkgs_path / ".version-suffix").write_text(rev)
+        try:
+            (nixpkgs_path / ".version-suffix").write_text(rev)
+        except OSError as error:
+            logger.debug(
+                "ignoring error while writing '.version-suffix' to nixpkgs: %s",
+                error,
+            )

From c3dc0c97a4c715b8dff6af301e7734924bb310cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 11:17:27 +0000
Subject: [PATCH 3247/6226] grafanaPlugins.grafana-lokiexplore-app: 1.0.29 ->
 1.0.30

---
 .../grafana/plugins/grafana-lokiexplore-app/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
index 95c4b0b184e6..d7edfda21e87 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-lokiexplore-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-lokiexplore-app";
-  version = "1.0.29";
-  zipHash = "sha256-YgEMK79KRW3r8rVel+JVf5nWsT1XzYm0L+t5NA2rrdA=";
+  version = "1.0.30";
+  zipHash = "sha256-K22UgO5wdZk6G4zgJk84+sanj2GVoroJdooLNLu40ts=";
   meta = with lib; {
     description = "Browse Loki logs without the need for writing complex queries";
     license = licenses.agpl3Only;

From f85df393f03089504f618093c16f024d177cfd24 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 11:18:40 +0000
Subject: [PATCH 3248/6226] models-dev: 0-unstable-2025-10-24 ->
 0-unstable-2025-10-25

---
 pkgs/by-name/mo/models-dev/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index 3ddd98aeb6e7..6ada8f55c1ee 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -8,12 +8,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "models-dev";
-  version = "0-unstable-2025-10-24";
+  version = "0-unstable-2025-10-25";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "1548a725f07c2c6113379a8c5566c2e4c4dfc91f";
-    hash = "sha256-SgZFdjoSlmRS+eMbAIVPsDnwDEmzA/YFhgdHij3Qq38=";
+    rev = "6aaec4681f415cd7c87519b4acd61720525cdda1";
+    hash = "sha256-77PoCq072udYDsplW1ENQbw/8lQqXrEiPFh2e/oAqVw=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From 857ee7c9b83a260bdacfb531bcf6cec510231537 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 11:30:36 +0000
Subject: [PATCH 3249/6226] grafanaPlugins.grafana-pyroscope-app: 1.10.1 ->
 1.11.0

---
 .../grafana/plugins/grafana-pyroscope-app/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix
index 93d24f61d4e5..30f779b77fd9 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-pyroscope-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-pyroscope-app";
-  version = "1.10.1";
-  zipHash = "sha256-Q9dzJGXLKGVVDwDF/D4FkrZb4ri6RmUW7usB7eYXcBo=";
+  version = "1.11.0";
+  zipHash = "sha256-FaojRLlE+fv5hPE45wW9Id/21icrus3bDSCLs3xsmm4=";
   meta = with lib; {
     description = "Integrate seamlessly with Pyroscope, the open-source continuous profiling platform, providing a smooth, query-less experience for browsing and analyzing profiling data";
     license = licenses.agpl3Only;

From f0e20347873dd741a6749dff6cdff81d9a925fd9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 11:31:29 +0000
Subject: [PATCH 3250/6226] trzsz-ssh: 0.1.22 -> 0.1.23

---
 pkgs/by-name/tr/trzsz-ssh/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/trzsz-ssh/package.nix b/pkgs/by-name/tr/trzsz-ssh/package.nix
index 2a4ba92e82cd..8194ae38e2f1 100644
--- a/pkgs/by-name/tr/trzsz-ssh/package.nix
+++ b/pkgs/by-name/tr/trzsz-ssh/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "trzsz-ssh";
-  version = "0.1.22";
+  version = "0.1.23";
 
   src = fetchFromGitHub {
     owner = "trzsz";
     repo = "trzsz-ssh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VvPdWRP+lrhho+Bk5rT9pktEvKe01512WoDfAu5d868=";
+    hash = "sha256-Cp5XI7ggpt48llojcmarYPi9mTM+YBqwjG/eNAnKTxc=";
   };
 
-  vendorHash = "sha256-EllXxDyWI4Dy5E6KnzYFxuYDQcdk9+01v5svpARZU44=";
+  vendorHash = "sha256-pI9BlttS9a1XrgBBmUd+h529fLbsbwSMwjKn4P50liE=";
 
   ldflags = [
     "-s"

From e8fc19dec70eb288a6843c79c569aa350b10c5aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 11:35:38 +0000
Subject: [PATCH 3251/6226] grafanaPlugins.grafana-metricsdrilldown-app: 1.0.15
 -> 1.0.19

---
 .../grafana/plugins/grafana-metricsdrilldown-app/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
index 82cef311a141..f421be271d8a 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-metricsdrilldown-app";
-  version = "1.0.15";
-  zipHash = "sha256-E6D/FIegif6nkuKh8IL5ZADZB+KXHTSDLO4jmPejpmc=";
+  version = "1.0.19";
+  zipHash = "sha256-rnBT10qZCeWdCMNHCFN2yLfIJUCkneIo0IIhj6xxKew=";
   meta = with lib; {
     description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries";
     license = licenses.agpl3Only;

From f86a8345138e17ba0db22710dff8900627c824a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 11:39:47 +0000
Subject: [PATCH 3252/6226] nmap-formatter: 3.0.5 -> 3.1.0

---
 pkgs/by-name/nm/nmap-formatter/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nm/nmap-formatter/package.nix b/pkgs/by-name/nm/nmap-formatter/package.nix
index 7a5cc79679f9..bbd6254f474d 100644
--- a/pkgs/by-name/nm/nmap-formatter/package.nix
+++ b/pkgs/by-name/nm/nmap-formatter/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "nmap-formatter";
-  version = "3.0.5";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "vdjagilev";
     repo = "nmap-formatter";
     rev = "v${version}";
-    hash = "sha256-jpgAcnDDVVboZEMkLIE9ei0oT91Y9yp8KUJkH6LQSY4=";
+    hash = "sha256-qai8HbVJJLFH5cNiG24fBjq5++6mvlhpT+4hlvx+gGI=";
   };
 
-  vendorHash = "sha256-xOS59co6FE2lJae2VtsBKcGjvmMRiGlmZKbqH++mEYk=";
+  vendorHash = "sha256-q94ET4oMYvF3eCJ358EznwL++vwdCeEAu5UquGChCc0=";
 
   meta = {
     description = "Tool that allows you to convert nmap output";

From 63e4b98e091e74c2ea0d2c773442b5e9238e68c1 Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Mon, 27 Oct 2025 12:54:51 +0100
Subject: [PATCH 3253/6226] badvpn: fix build (w.r.t. CMake version)

---
 pkgs/by-name/ba/badvpn/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ba/badvpn/package.nix b/pkgs/by-name/ba/badvpn/package.nix
index 9f3372510b09..887eb08e4be6 100644
--- a/pkgs/by-name/ba/badvpn/package.nix
+++ b/pkgs/by-name/ba/badvpn/package.nix
@@ -38,6 +38,9 @@ stdenv.mkDerivation rec {
     cmakeFlagsArray=("-DCMAKE_BUILD_TYPE=" "-DCMAKE_C_FLAGS=-O3 ${
       lib.optionalString (!debug) "-DNDEBUG"
     }");
+    sed -e \
+      's/cmake_minimum_required(VERSION 2[.]8)/cmake_minimum_required(VERSION 3.5)/' \
+      -i CMakeLists.txt
   '';
 
   meta = with lib; {

From 62f5b273a0b7fcfd1fdd726f671ae3d63aed8136 Mon Sep 17 00:00:00 2001
From: yuannan <brandon@emergence.ltd>
Date: Mon, 27 Oct 2025 11:56:36 +0000
Subject: [PATCH 3254/6226] svp: 4.6.263 -> 4.7.305

---
 pkgs/by-name/sv/svp/package.nix | 66 ++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 34 deletions(-)

diff --git a/pkgs/by-name/sv/svp/package.nix b/pkgs/by-name/sv/svp/package.nix
index ccfa44fb24ce..da8f22499b6c 100644
--- a/pkgs/by-name/sv/svp/package.nix
+++ b/pkgs/by-name/sv/svp/package.nix
@@ -1,26 +1,23 @@
 {
   stdenv,
+  lib,
   buildFHSEnv,
   writeShellScriptBin,
   fetchurl,
   callPackage,
   makeDesktopItem,
   copyDesktopItems,
-  ffmpeg,
-  glibc,
-  jq,
-  lib,
-  libmediainfo,
-  libsForQt5,
-  libusb1,
-  ocl-icd,
-  p7zip,
-  patchelf,
   socat,
+  jq,
+  kdePackages,
+  ffmpeg,
+  libmediainfo,
+  libusb1,
   vapoursynth,
-  xdg-utils,
   xorg,
-  zenity,
+  systemdLibs,
+  openssl,
+  p7zip,
 }:
 let
   mpvForSVP = callPackage ./mpv.nix { };
@@ -39,49 +36,50 @@ let
     done
   '';
 
+  # SVP expects findmnt to return path to storage device for software protection.
+  # Workaround for tmp-as-root and encrypted root use cases, by returning first storage device on system.
+  fakeFindmnt = writeShellScriptBin "findmnt" ''
+    find /dev/ -name 'nvme*n*p*' -or -name 'sd*' -or -name 'vd*' 2>/dev/null | sort | head -n1
+  '';
+
   libraries = [
-    fakeLsof
-    ffmpeg.bin
-    glibc
-    zenity
-    libmediainfo
-    libsForQt5.qtbase
-    libsForQt5.qtwayland
-    libsForQt5.qtdeclarative
-    libsForQt5.qtscript
-    libsForQt5.qtsvg
-    libusb1
     mpvForSVP
-    ocl-icd
+    fakeLsof
+    fakeFindmnt
     (lib.getLib stdenv.cc.cc)
+    kdePackages.qtbase
+    kdePackages.qtdeclarative
+    ffmpeg.bin
+    libmediainfo
+    libusb1
     vapoursynth
-    xdg-utils
     xorg.libX11
+    systemdLibs
+    openssl
   ];
 
-  svp-dist = stdenv.mkDerivation rec {
+  svp-dist = stdenv.mkDerivation (finalAttrs: {
     pname = "svp-dist";
-    version = "4.6.263";
+    version = "4.7.305";
     src = fetchurl {
-      url = "https://www.svp-team.com/files/svp4-linux.${version}.tar.bz2";
-      sha256 = "sha256-HyRDVFHVmTan/Si3QjGQpC3za30way10d0Hk79oXG98=";
+      url = "https://www.svp-team.com/files/svp4-linux.${finalAttrs.version}.tar.bz2";
+      hash = "sha256-PWAcm/hIA4JH2QtJPP+gSJdJLRdfdbZXIVdWELazbxQ=";
     };
 
     nativeBuildInputs = [
       p7zip
-      patchelf
     ];
     dontFixup = true;
 
     unpackPhase = ''
-      tar xf ${src}
+      tar xf ${finalAttrs.src}
     '';
 
     buildPhase = ''
       mkdir installer
-      LANG=C grep --only-matching --byte-offset --binary --text  $'7z\xBC\xAF\x27\x1C' "svp4-linux-64.run" |
+      LANG=C grep --only-matching --byte-offset --binary --text  $'7z\xBC\xAF\x27\x1C' "svp4-linux.run" |
         cut -f1 -d: |
-        while read ofs; do dd if="svp4-linux-64.run" bs=1M iflag=skip_bytes status=none skip=$ofs of="installer/bin-$ofs.7z"; done
+        while read ofs; do dd if="svp4-linux.run" bs=1M iflag=skip_bytes status=none skip=$ofs of="installer/bin-$ofs.7z"; done
     '';
 
     installPhase = ''
@@ -96,7 +94,7 @@ let
       done
       rm -f $out/opt/{add,remove}-menuitem.sh
     '';
-  };
+  });
 
   fhs = buildFHSEnv {
     pname = "SVPManager";

From 19d3996ff7c92c2f3df7b0a0f07d125b3b24441e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Oct 2025 12:00:55 +0000
Subject: [PATCH 3255/6226] build(deps): bump actions/upload-artifact from
 4.6.2 to 5.0.0

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 4.6.2 to 5.0.0.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/ea165f8d65b6e75b540449e92b4886f43607fa02...330a01c490aca151604b8cf639adc76d48f6c5d4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml | 2 +-
 .github/workflows/eval.yml  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 26d71b846369..2062ccd7c14a 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -98,7 +98,7 @@ jobs:
         if: |
           contains(matrix.builds, 'manual-nixos') && !cancelled() &&
           contains(fromJSON(inputs.baseBranch).type, 'primary')
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: nixos-manual-${{ matrix.name }}
           path: nixos-manual
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 97d5c114acb0..0278213fd555 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -143,7 +143,7 @@ jobs:
 
       - name: Upload outpaths diff and stats
         if: inputs.targetSha
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: ${{ matrix.version && format('{0}-', matrix.version) || '' }}diff-${{ matrix.system }}
           path: diff/*
@@ -200,7 +200,7 @@ jobs:
           cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY"
 
       - name: Upload the comparison results
-        uses: actions/upload-artifact@ea165f8d65b6e75b540449e92b4886f43607fa02 # v4.6.2
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: comparison
           path: comparison/*

From 65f42173f17014e6255fd8806e52595de61a1bb0 Mon Sep 17 00:00:00 2001
From: Andy3153 <andy3153@protonmail.com>
Date: Thu, 4 Sep 2025 00:57:50 +0300
Subject: [PATCH 3256/6226] beammp-launcher: init at 2.7.0

beammp-launcher: hardcode derivation attributes

beammp-launcher: use finalAttrs instead of rec

beammp-launcher: used `strictDeps` to better determine dependencies

beammp-launcher: 2.5.1 -> 2.6.3

beammp-launcher: 2.6.3 -> 2.6.4

beammp-launcher: 2.6.4 -> 2.7.0
---
 pkgs/by-name/be/beammp-launcher/package.nix | 69 +++++++++++++++++++++
 1 file changed, 69 insertions(+)
 create mode 100644 pkgs/by-name/be/beammp-launcher/package.nix

diff --git a/pkgs/by-name/be/beammp-launcher/package.nix b/pkgs/by-name/be/beammp-launcher/package.nix
new file mode 100644
index 000000000000..6ef83abe354b
--- /dev/null
+++ b/pkgs/by-name/be/beammp-launcher/package.nix
@@ -0,0 +1,69 @@
+{
+  stdenv,
+  fetchFromGitHub,
+  lib,
+  copyDesktopItems,
+  installShellFiles,
+  makeDesktopItem,
+
+  cmake,
+  curl,
+  httplib,
+  nlohmann_json,
+  openssl,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "beammp-launcher";
+  version = "2.7.0";
+
+  src = fetchFromGitHub {
+    owner = "BeamMP";
+    repo = "BeamMP-Launcher";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-+qdDGOLds2j00BRijFAZ8DMrnjvigs+z+w9+wbitJno=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    copyDesktopItems
+    installShellFiles
+
+    cmake
+  ];
+
+  buildInputs = [
+    curl
+    httplib
+    nlohmann_json
+    openssl
+  ];
+
+  desktopItems = [
+    (makeDesktopItem {
+      categories = [ "Game" ];
+      comment = "Launcher for the BeamMP mod for BeamNG.drive";
+      desktopName = "BeamMP-Launcher";
+      exec = "BeamMP-Launcher";
+      name = "BeamMP-Launcher";
+      terminal = true;
+    })
+  ];
+
+  installPhase = ''
+    runHook preInstall
+    installBin "BeamMP-Launcher"
+    copyDesktopItems
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Launcher for the BeamMP mod for BeamNG.drive";
+    homepage = "https://github.com/BeamMP/BeamMP-Launcher";
+    license = lib.licenses.agpl3Only;
+    mainProgram = "BeamMP-Launcher";
+    maintainers = [ lib.maintainers.Andy3153 ];
+    platforms = lib.platforms.linux;
+  };
+})

From cc8b97e2a2ff6b3dca6a86ecfb8eaa8297ecdf2e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Oct 2025 12:10:22 +0000
Subject: [PATCH 3257/6226] build(deps): bump actions/download-artifact from
 5.0.0 to 6.0.0

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 5.0.0 to 6.0.0.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/634f93cb2916e3fdff6788551b99b062d0335ce0...018cc2cf5baa6db3ef3c5f8a56943fffe632ef53)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/eval.yml      | 4 ++--
 .github/workflows/reviewers.yml | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 97d5c114acb0..d405bcbceed2 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -167,7 +167,7 @@ jobs:
           target-as-trusted-at: ${{ inputs.targetSha }}
 
       - name: Download output paths and eval stats for all systems
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           pattern: diff-*
           path: diff
@@ -242,7 +242,7 @@ jobs:
     needs: [versions, eval]
     steps:
       - name: Download output paths and eval stats for all versions
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           pattern: "*-diff-*"
           path: versions
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 22ac1bb5bcd4..6d23e1dde9b7 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -124,7 +124,7 @@ jobs:
         run: gh api /rate_limit | jq
 
       - name: Download the comparison results
-        uses: actions/download-artifact@634f93cb2916e3fdff6788551b99b062d0335ce0 # v5.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           run-id: ${{ steps.eval.outputs.run-id }}
           github-token: ${{ github.token }}

From 5c44839fe9e88b5d470b5ce669d6aa53f0431b6f Mon Sep 17 00:00:00 2001
From: NilaTheDragon <nilathedragon@pm.me>
Date: Mon, 27 Oct 2025 13:18:08 +0100
Subject: [PATCH 3258/6226] proxyman: 3.2.0 -> 3.4.0

---
 pkgs/by-name/pr/proxyman/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/proxyman/package.nix b/pkgs/by-name/pr/proxyman/package.nix
index 55299e114217..4a8143dd7f98 100644
--- a/pkgs/by-name/pr/proxyman/package.nix
+++ b/pkgs/by-name/pr/proxyman/package.nix
@@ -6,11 +6,11 @@
 }:
 let
   pname = "proxyman";
-  version = "3.2.0";
+  version = "3.4.0";
 
   src = fetchurl {
     url = "https://github.com/ProxymanApp/proxyman-windows-linux/releases/download/${version}/Proxyman-${version}.AppImage";
-    hash = "sha256-u6Lu5blU1z7UJyiBZFj/dqKeoCfMniXz6ul2TQwaOqI=";
+    hash = "sha256-fwkFQOeHb049qFChLfyU20L6mJCDnrcK2HM9PljUdUg=";
   };
 
   appimageContents = appimageTools.extract {

From 213e187dae7cb87e905bbdbc43e4bc2b9faa4459 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 12:26:11 +0000
Subject: [PATCH 3259/6226] fennel-ls: 0.2.1 -> 0.2.2

---
 pkgs/by-name/fe/fennel-ls/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fe/fennel-ls/package.nix b/pkgs/by-name/fe/fennel-ls/package.nix
index c2aae5dc7604..f9dfa9e18a17 100644
--- a/pkgs/by-name/fe/fennel-ls/package.nix
+++ b/pkgs/by-name/fe/fennel-ls/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "fennel-ls";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchFromSourcehut {
     owner = "~xerool";
     repo = "fennel-ls";
     rev = finalAttrs.version;
-    hash = "sha256-6ZbGRTBBRktudGVBZ+UMn8l0+wKa8f5dg7UOwLhOT7E=";
+    hash = "sha256-N1530u8Kq7ljdEdTFk0CJJyMLMVX5huQWXjyoMBJN5E=";
   };
   buildInputs = [
     lua

From 47840aa42aaf72eb0b247724f17c2d860cba70ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 12:28:42 +0000
Subject: [PATCH 3260/6226] tellico: 4.1.3 -> 4.1.4

---
 pkgs/applications/misc/tellico/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/tellico/default.nix b/pkgs/applications/misc/tellico/default.nix
index c0c61e87264e..5c79c5ffe5e7 100644
--- a/pkgs/applications/misc/tellico/default.nix
+++ b/pkgs/applications/misc/tellico/default.nix
@@ -25,14 +25,14 @@
 
 stdenv.mkDerivation rec {
   pname = "tellico";
-  version = "4.1.3";
+  version = "4.1.4";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     owner = "office";
     repo = "tellico";
     rev = "v${version}";
-    hash = "sha256-+ky47wbyGAsBLx9q4ya/Vm9jiqEAbFfhloOytAyUYCQ=";
+    hash = "sha256-eScAOd1da05fqXtbcz8oEJiObB7CUxiYReSrr3R7ybM=";
   };
 
   nativeBuildInputs = [

From 58daf511687f191829238fc7f571e08dc9dedf56 Mon Sep 17 00:00:00 2001
From: Ivet Galabova <galabovaa@gmail.com>
Date: Mon, 27 Oct 2025 12:32:38 +0000
Subject: [PATCH 3261/6226] highs: 1.10.0 -> 1.12.0

---
 pkgs/by-name/hi/highs/package.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/hi/highs/package.nix b/pkgs/by-name/hi/highs/package.nix
index 60bdf77d2e81..9fa7ecbaeb9a 100644
--- a/pkgs/by-name/hi/highs/package.nix
+++ b/pkgs/by-name/hi/highs/package.nix
@@ -8,23 +8,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "highs";
-  version = "1.10.0";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "ERGO-Code";
     repo = "HiGHS";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-CzHE2d0CtScexdIw95zHKY1Ao8xFodtfSNNkM6dNCac=";
+    hash = "sha256-FRiYtbl1kWEkHHEIIOpefC9UdusmJKl6UmP3dKRkAXA=";
   };
 
-  # CMake Error in CMakeLists.txt:
-  #   Imported target "highs::highs" includes non-existent path
-  #     "/include"
-  #   in its INTERFACE_INCLUDE_DIRECTORIES.
-  postPatch = ''
-    sed -i "/CMAKE_CUDA_PATH/d" src/CMakeLists.txt
-  '';
-
   strictDeps = true;
 
   outputs = [ "out" ];

From 509ec166735ee016f51f74bea290556a66d58054 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 27 Oct 2025 13:32:43 +0100
Subject: [PATCH 3262/6226] python3Packages.pysnmp: 7.1.21 -> 7.1.22

https://github.com/lextudio/pysnmp/blob/refs/tags/v7.1.22/CHANGES.rst
---
 pkgs/development/python-modules/pysnmp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysnmp/default.nix b/pkgs/development/python-modules/pysnmp/default.nix
index e979bc82acf0..46b25ee5c45c 100644
--- a/pkgs/development/python-modules/pysnmp/default.nix
+++ b/pkgs/development/python-modules/pysnmp/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "pysnmp";
-  version = "7.1.21";
+  version = "7.1.22";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lextudio";
     repo = "pysnmp";
     tag = "v${version}";
-    hash = "sha256-IbVs/fjNRDhp4a78ZbgqUOxyrlZjEwsKSlQV3+mmCjo=";
+    hash = "sha256-uEOhOVXaz4g1Ciun8x2AT8pRBkKR6uEfu4KJ1XSwouY=";
   };
 
   build-system = [ flit-core ];

From 985ca1f0b16090d5aa983ff7b43f8939ec8eb154 Mon Sep 17 00:00:00 2001
From: Ivet Galabova <galabovaa@gmail.com>
Date: Mon, 27 Oct 2025 12:33:31 +0000
Subject: [PATCH 3263/6226] maintainers: add galabovaa

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 22b41192bc54..3b9a47c508b6 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -9092,6 +9092,12 @@
     githubId = 7047019;
     name = "Florent Becker";
   };
+  galabovaa = {
+    name = "Ivet Galabova";
+    email = "galabovaa@gmail.com";
+    github = "galabovaa";
+    githubId = 4016566;
+  };
   galagora = {
     email = "lightningstrikeiv@gmail.com";
     github = "Galagora";

From a2d026d6e5393b9fefac492c37ec449794d50c1b Mon Sep 17 00:00:00 2001
From: Ivet Galabova <galabovaa@gmail.com>
Date: Mon, 27 Oct 2025 12:37:18 +0000
Subject: [PATCH 3264/6226] highs: add maintainer galabovaa

---
 pkgs/by-name/hi/highs/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/hi/highs/package.nix b/pkgs/by-name/hi/highs/package.nix
index 9fa7ecbaeb9a..de05d314776b 100644
--- a/pkgs/by-name/hi/highs/package.nix
+++ b/pkgs/by-name/hi/highs/package.nix
@@ -40,6 +40,9 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.mit;
     platforms = platforms.all;
     mainProgram = "highs";
-    maintainers = with maintainers; [ silky ];
+    maintainers = with maintainers; [
+      galabovaa
+      silky
+    ];
   };
 })

From ff3be00525c22a131d06f406c3f5e99dbe803773 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 12:39:13 +0000
Subject: [PATCH 3265/6226] fcitx5-bamboo: 1.0.8 -> 1.0.9

---
 pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix
index f85e9a498004..a15ebdff93d2 100644
--- a/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix
+++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-bamboo.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fcitx5-bamboo";
-  version = "1.0.8";
+  version = "1.0.9";
 
   src = fetchFromGitHub {
     owner = "fcitx";
     repo = "fcitx5-bamboo";
     rev = finalAttrs.version;
-    hash = "sha256-cnrW25M9nluBLa+9Mynzkn/6AiGccSbtjS8p+L4ZDKM=";
+    hash = "sha256-xZzIpJQMyifu4GqAwiXgwGP4wO2j4Au5qEr49Ko2FjA=";
     fetchSubmodules = true;
   };
 

From 45ad764d26ad7e87cac5250880f6a27ba0c81d56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 12:42:00 +0000
Subject: [PATCH 3266/6226] vscode-extensions.vscjava.vscode-java-dependency:
 0.26.1 -> 0.26.2

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 54f9f27ef5f1..6e8f005facfe 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5050,8 +5050,8 @@ let
         mktplcRef = {
           publisher = "vscjava";
           name = "vscode-java-dependency";
-          version = "0.26.1";
-          hash = "sha256-7CjI+l1M/yW7BgzP1YirNI72ub+JZ6HI/xagYzdfx0E=";
+          version = "0.26.2";
+          hash = "sha256-msRaLNS1a5BXY3GN1MmOi9jBbNj6aqJDbZkFc1pLG3I=";
         };
         meta = {
           license = lib.licenses.mit;

From 62f9b2055c5f86af2b950b0fa6e93d59342daef1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 12:43:17 +0000
Subject: [PATCH 3267/6226] mitra: 4.11.0 -> 4.12.0

---
 pkgs/by-name/mi/mitra/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix
index fcede9565f78..1844ae159c18 100644
--- a/pkgs/by-name/mi/mitra/package.nix
+++ b/pkgs/by-name/mi/mitra/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "mitra";
-  version = "4.11.0";
+  version = "4.12.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "silverpill";
     repo = "mitra";
     rev = "v${version}";
-    hash = "sha256-2MBcTuz46DDIHzH6Geuw+jdARHm/mxDFTPcqVEeSwWA=";
+    hash = "sha256-cVGOgMK8lQOMB9a7zwl2043uJzw3a+QBDMlnFduSR1U=";
   };
 
-  cargoHash = "sha256-ujZsrqfZ8wpWlBCJK3+vWKe1J3QnvlyBjtU78bIqcKo=";
+  cargoHash = "sha256-IdC5T73t3FHCXP6AWeQDcDnmZzhRvN2eyuYrko5F4+8=";
 
   # require running database
   doCheck = false;

From 66b13829ca7093ad817cc5ed4a0bf095a7176e1b Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas.gerbet@enalean.com>
Date: Mon, 27 Oct 2025 13:51:37 +0100
Subject: [PATCH 3268/6226] cdxgen: 11.0.3 -> 11.10.0

Changes:
https://github.com/CycloneDX/cdxgen/releases/tag/v11.10.0
https://github.com/CycloneDX/cdxgen/releases/tag/v11.9.0
https://github.com/CycloneDX/cdxgen/releases/tag/v11.8.0
https://github.com/CycloneDX/cdxgen/releases/tag/v11.7.0
https://github.com/CycloneDX/cdxgen/releases/tag/v11.6.0
https://github.com/CycloneDX/cdxgen/releases/tag/v11.5.0
https://github.com/CycloneDX/cdxgen/releases/tag/v11.4.4
https://github.com/CycloneDX/cdxgen/releases/tag/v11.4.3
https://github.com/CycloneDX/cdxgen/releases/tag/v11.4.2
https://github.com/CycloneDX/cdxgen/releases/tag/v11.4.1
https://github.com/CycloneDX/cdxgen/releases/tag/v11.4.0
https://github.com/CycloneDX/cdxgen/releases/tag/v11.3.0
https://github.com/CycloneDX/cdxgen/releases/tag/v11.2.0
https://github.com/CycloneDX/cdxgen/releases/tag/v11.1.0
---
 pkgs/by-name/cd/cdxgen/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/cd/cdxgen/package.nix b/pkgs/by-name/cd/cdxgen/package.nix
index d695a0b1d238..ff0f443c234a 100644
--- a/pkgs/by-name/cd/cdxgen/package.nix
+++ b/pkgs/by-name/cd/cdxgen/package.nix
@@ -5,7 +5,7 @@
   makeWrapper,
   node-gyp,
   nodejs,
-  pnpm_9,
+  pnpm_10,
   python3,
   stdenv,
   xcbuild,
@@ -13,20 +13,20 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cdxgen";
-  version = "11.0.3";
+  version = "11.10.0";
 
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cdxgen";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-H83HEiBdXBIhSR18EtYcQey6aXy8URSjpeNVEs3UBm8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-RmgR6OfNrZUYFyn36zTHERIHlzszaFqTX8b4Rf2TF/U=";
   };
 
   nativeBuildInputs = [
     makeWrapper
     nodejs
     node-gyp # required for sqlite3 bindings
-    pnpm_9.configHook
+    pnpm_10.configHook
     python3 # required for sqlite3 bindings
   ]
   ++ lib.optional stdenv.hostPlatform.isDarwin [
@@ -34,10 +34,10 @@ stdenv.mkDerivation (finalAttrs: {
     cctools.libtool
   ];
 
-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
-    fetcherVersion = 1;
-    hash = "sha256-7NrDYd4H0cPQs8w4lWlB0BhqcYZVo6/9zf0ujPjBzsE=";
+    fetcherVersion = 2;
+    hash = "sha256-o5pNgn+ZqaEfsWO97jXkRyPH+0pffR6TBZcF6nApWVg=";
   };
 
   buildPhase = ''

From feb659a68f9ffd0e1adcfa29bd1e02c3c21fd85a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 12:51:44 +0000
Subject: [PATCH 3269/6226] python3Packages.libipld: 3.1.1 -> 3.2.0

---
 pkgs/development/python-modules/libipld/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/libipld/default.nix b/pkgs/development/python-modules/libipld/default.nix
index 72c18fcb691b..b73571391af7 100644
--- a/pkgs/development/python-modules/libipld/default.nix
+++ b/pkgs/development/python-modules/libipld/default.nix
@@ -18,19 +18,19 @@
 
 buildPythonPackage rec {
   pname = "libipld";
-  version = "3.1.1";
+  version = "3.2.0";
   format = "pyproject";
   disabled = pythonOlder "3.8";
 
   # use pypi, GitHub does not include Cargo.lock
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-S5qdoOpdhI6foSxwACdhmh437MHaOdvRQkwOkGLynkQ=";
+    hash = "sha256-ZUIw/9k4Kl7sKKrU4Nzdk/Ed2H2mVpOdvxODB/KGcSA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
-    hash = "sha256-LMd1M2gCK0i3TJPnUIY/2pskt9Rm/yki4uDX5uQGi8Q=";
+    hash = "sha256-jVZ3Oml/W6Kb9hYEXazF3/ogFHtl43d1YLd8vZFJDa8=";
   };
 
   build-system = [

From 9e6e3550e3cbdf10d1e72c6708c0f2ea7fe35fed Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Mon, 27 Oct 2025 13:56:57 +0100
Subject: [PATCH 3270/6226] tinymist: 0.13.28 -> 0.13.30

Changelog:
https://github.com/Myriad-Dreamin/tinymist/releases/tag/v0.13.30
Diff:
https://github.com/Myriad-Dreamin/tinymist/compare/v0.13.28...v0.13.30
---
 .../vscode/extensions/myriad-dreamin.tinymist/default.nix   | 2 +-
 pkgs/by-name/ti/tinymist/package.nix                        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
index 33c278c911ac..1be8ef9daca7 100644
--- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     name = "tinymist";
     publisher = "myriad-dreamin";
     inherit (tinymist) version;
-    hash = "sha256-LUJ0e/ndyeeRsC2h7JJL6zymmPDWxW0cPGBceuC7+X0=";
+    hash = "sha256-Sm2Ij1yHMQzPM9lKtiejHRrdCot/DRzgnxznwlZyyro=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix
index fecd0217f94b..58f497322ad3 100644
--- a/pkgs/by-name/ti/tinymist/package.nix
+++ b/pkgs/by-name/ti/tinymist/package.nix
@@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tinymist";
   # Please update the corresponding vscode extension when updating
   # this derivation.
-  version = "0.13.28";
+  version = "0.13.30";
 
   src = fetchFromGitHub {
     owner = "Myriad-Dreamin";
     repo = "tinymist";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Z2FAlFjFHCzFhlLILcXseynoSdMhRQ30fWC7rW946N4=";
+    hash = "sha256-7SUr23m+zUHsSmSZGlmKnwI5VUPh53Rxiw2Wx8yy+5k=";
   };
 
-  cargoHash = "sha256-7p+TNZO+uFqXhhMzmHj0r1X2WgDdg8aonMc0jgsrEnk=";
+  cargoHash = "sha256-Qvj4xdbKI8PEbJ+N8Ba+sE5hDDHMegzU18gFtx/q/W8=";
 
   nativeBuildInputs = [
     installShellFiles

From de480cade1b26781385e7aef660fd1bc24eb3a93 Mon Sep 17 00:00:00 2001
From: Mauricio Collares <mauricio@collares.org>
Date: Mon, 27 Oct 2025 09:53:27 -0300
Subject: [PATCH 3271/6226] ratpoints: fix aarch64 build

---
 pkgs/by-name/ra/ratpoints/package.nix | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ra/ratpoints/package.nix b/pkgs/by-name/ra/ratpoints/package.nix
index 0481b3935aef..6f3da65ea1f2 100644
--- a/pkgs/by-name/ra/ratpoints/package.nix
+++ b/pkgs/by-name/ra/ratpoints/package.nix
@@ -34,9 +34,17 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [ gmp ];
 
   makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" ];
-  buildFlags = lib.optionals stdenv.hostPlatform.isDarwin [
-    "CCFLAGS2=-lgmp -lc -lm"
-    "CCFLAGS=-UUSE_SSE"
+  buildFlags = [
+    "CCFLAGS1=${
+      if stdenv.hostPlatform.avx512Support then
+        "-DUSE_AVX512 -mavx512f"
+      else if stdenv.hostPlatform.avx2Support then
+        "-DUSE_AVX -mavx2"
+      else if stdenv.hostPlatform.avxSupport then
+        "-DUSE_AVX -mavx"
+      else
+        "-DUSE_SSE"
+    }"
   ];
   installFlags = [ "INSTALL_DIR=$(out)" ];
 

From 2b1add06a4abb8d294e896da83d43c8dc984d3c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 13:31:29 +0000
Subject: [PATCH 3272/6226] python3Packages.pglast: 7.8 -> 7.10

---
 pkgs/development/python-modules/pglast/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pglast/default.nix b/pkgs/development/python-modules/pglast/default.nix
index b455e4859292..86e0f9d81c94 100644
--- a/pkgs/development/python-modules/pglast/default.nix
+++ b/pkgs/development/python-modules/pglast/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "pglast";
-  version = "7.8";
+  version = "7.10";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-2tSZKS3dXK6236Q1sox4wpCAgkQ91eqr0RZWMmY/Fz8=";
+    hash = "sha256-AHJauP7dc0MEfhK8ZimUHKE5V/TC8t88XSri2gUnlsk=";
   };
 
   build-system = [ setuptools ];

From 8a2726246f67aad70bd0f74f0b1e62ba3c80b2b7 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 16 Oct 2025 11:59:18 +0300
Subject: [PATCH 3273/6226] beets-minimal: fix build by setting _utils
 testPaths

---
 pkgs/tools/audio/beets/builtin-plugins.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix
index 21b949affbb4..c3fdf753c72c 100644
--- a/pkgs/tools/audio/beets/builtin-plugins.nix
+++ b/pkgs/tools/audio/beets/builtin-plugins.nix
@@ -180,5 +180,7 @@
   _typing = {
     testPaths = [ ];
   };
-  _utils = { };
+  _utils = {
+    testPaths = [ ];
+  };
 }

From 7c88e84a93938ba77c27a6708452a8df7385ee2a Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 16 Oct 2025 13:02:06 +0300
Subject: [PATCH 3274/6226] beetsPackages.alternatives: fix test failures with
 beets>=2.5

---
 pkgs/tools/audio/beets/plugins/alternatives.nix | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/pkgs/tools/audio/beets/plugins/alternatives.nix b/pkgs/tools/audio/beets/plugins/alternatives.nix
index 9e5a8182e47b..6bc2a62d8857 100644
--- a/pkgs/tools/audio/beets/plugins/alternatives.nix
+++ b/pkgs/tools/audio/beets/plugins/alternatives.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  fetchpatch,
   beets,
   python3Packages,
   writableTmpDirAsHomeHook,
@@ -18,6 +19,17 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-jGHRoBBXqJq0r/Gbp7gkuaEFPVMGE6cqQRi84AHTXxQ=";
   };
 
+  patches = [
+    # Fixes build failure by ignoring DeprecationWarning during tests.
+    (fetchpatch {
+      url = "https://github.com/geigerzaehler/beets-alternatives/commit/3c15515edfe62d5d6c8f3fb729bf3dcef41c1ffa.patch";
+      hash = "sha256-gZXftDI5PXJ0c65Z1HLABJ2SlDnXU78xxIEt7IGp8RQ=";
+      excludes = [
+        "poetry.lock"
+      ];
+    })
+  ];
+
   nativeBuildInputs = [
     beets
   ];

From 1f6d9c8190cf465e99fd4306460e191c9c8cf23d Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 16 Oct 2025 11:56:04 +0300
Subject: [PATCH 3275/6226] beetsPackages.alternatives: use correct category
 for poetry-core

---
 pkgs/tools/audio/beets/plugins/alternatives.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/audio/beets/plugins/alternatives.nix b/pkgs/tools/audio/beets/plugins/alternatives.nix
index 6bc2a62d8857..6085a82064f8 100644
--- a/pkgs/tools/audio/beets/plugins/alternatives.nix
+++ b/pkgs/tools/audio/beets/plugins/alternatives.nix
@@ -30,12 +30,12 @@ python3Packages.buildPythonApplication rec {
     })
   ];
 
-  nativeBuildInputs = [
-    beets
+  build-system = [
+    python3Packages.poetry-core
   ];
 
-  dependencies = [
-    python3Packages.poetry-core
+  nativeBuildInputs = [
+    beets
   ];
 
   nativeCheckInputs =

From 7d0a5ef29c1a7f2c12bad3d3710cdf80c7a734cc Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 16 Oct 2025 12:06:09 +0300
Subject: [PATCH 3276/6226] beetsPackages.filetote: no with lib; in meta

---
 pkgs/tools/audio/beets/plugins/filetote.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/audio/beets/plugins/filetote.nix b/pkgs/tools/audio/beets/plugins/filetote.nix
index d397658bd8da..62af7d48b2a4 100644
--- a/pkgs/tools/audio/beets/plugins/filetote.nix
+++ b/pkgs/tools/audio/beets/plugins/filetote.nix
@@ -77,12 +77,12 @@ python3Packages.buildPythonApplication rec {
   ]
   ++ optional-dependencies.test;
 
-  meta = with lib; {
+  meta = {
     description = "Beets plugin to move non-music files during the import process";
     homepage = "https://github.com/gtronset/beets-filetote";
     changelog = "https://github.com/gtronset/beets-filetote/blob/${src.tag}/CHANGELOG.md";
-    maintainers = with maintainers; [ dansbandit ];
-    license = licenses.mit;
+    maintainers = with lib.maintainers; [ dansbandit ];
+    license = lib.licenses.mit;
     inherit (beets.meta) platforms;
     # https://github.com/gtronset/beets-filetote/issues/211
     broken = true;

From b81743dbce76bfaf01903cbac5ed5dad29977a15 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 16 Oct 2025 12:24:57 +0300
Subject: [PATCH 3277/6226] beets: small passthru reformatting

---
 pkgs/tools/audio/beets/common.nix | 28 +++++++++++++++-------------
 1 file changed, 15 insertions(+), 13 deletions(-)

diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix
index 132a8f5aebbe..decd9c2b1313 100644
--- a/pkgs/tools/audio/beets/common.nix
+++ b/pkgs/tools/audio/beets/common.nix
@@ -232,25 +232,27 @@ python3Packages.buildPythonApplication {
     env EDITOR=true "$out/bin/beet" config -e
   '';
 
-  passthru.plugins = allPlugins;
-
-  passthru.tests.gstreamer =
-    runCommand "beets-gstreamer-test"
-      {
-        meta.timeout = 60;
-      }
-      ''
+  passthru = {
+    plugins = allPlugins;
+    tests = {
+      gstreamer =
+        runCommand "beets-gstreamer-test"
+          {
+            meta.timeout = 60;
+          }
+          ''
             set -euo pipefail
             export HOME=$(mktemp -d)
             mkdir $out
 
             cat << EOF > $out/config.yaml
-        replaygain:
-          backend: gstreamer
-        EOF
-
+            replaygain:
+              backend: gstreamer
+            EOF
             ${beets}/bin/beet -c $out/config.yaml > /dev/null
-      '';
+          '';
+    };
+  };
 
   meta = {
     description = "Music tagger and library organizer";

From 1af12add21c4a56d5b1aa7e769dd08ac36bf225c Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 16 Oct 2025 12:28:30 +0300
Subject: [PATCH 3278/6226] beets: small buildInputs formatting

---
 pkgs/tools/audio/beets/common.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix
index decd9c2b1313..b2b0887530de 100644
--- a/pkgs/tools/audio/beets/common.nix
+++ b/pkgs/tools/audio/beets/common.nix
@@ -121,13 +121,11 @@ python3Packages.buildPythonApplication {
   ]
   ++ extraNativeBuildInputs;
 
-  buildInputs = [
-  ]
-  ++ (with gst_all_1; [
+  buildInputs = with gst_all_1; [
     gst-plugins-base
     gst-plugins-good
     gst-plugins-ugly
-  ]);
+  ];
 
   outputs = [
     "out"

From bc20c9aa9364268277052dc1f03dcf9931c091d6 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 16 Oct 2025 12:02:39 +0300
Subject: [PATCH 3279/6226] beetsPackages.audible: small formatting changes

Mainly, put build-system right after src, as it is strongly coupled to
it.
---
 pkgs/tools/audio/beets/plugins/audible.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/audio/beets/plugins/audible.nix b/pkgs/tools/audio/beets/plugins/audible.nix
index 9bc10074d2f2..50176db667cd 100644
--- a/pkgs/tools/audio/beets/plugins/audible.nix
+++ b/pkgs/tools/audio/beets/plugins/audible.nix
@@ -5,6 +5,7 @@
   nix-update-script,
   python3Packages,
 }:
+
 python3Packages.buildPythonApplication rec {
   pname = "beets-audible";
   version = "1.0.2";
@@ -17,16 +18,16 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-6rf8U63SW+gwfT7ZdN/ymYKHRs0HSMDTP2ZBfULLsJs=";
   };
 
+  build-system = with python3Packages; [
+    hatchling
+  ];
+
   nativeBuildInputs = [
     beets
   ];
 
   pythonRelaxDeps = true;
 
-  build-system = with python3Packages; [
-    hatchling
-  ];
-
   dependencies = with python3Packages; [
     markdownify
     natsort

From 5b12b31e548167e88319e33c64c42171490770ae Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 16 Oct 2025 12:04:14 +0300
Subject: [PATCH 3280/6226] beetsPackages.copyartifacts: reorder arguments a
 bit

---
 pkgs/tools/audio/beets/plugins/copyartifacts.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/pkgs/tools/audio/beets/plugins/copyartifacts.nix
index 49bc0dadf797..7b873cbc2d42 100644
--- a/pkgs/tools/audio/beets/plugins/copyartifacts.nix
+++ b/pkgs/tools/audio/beets/plugins/copyartifacts.nix
@@ -27,14 +27,14 @@ python3Packages.buildPythonApplication rec {
     sed -i -e 's/util\.py3_path/os.fsdecode/g' tests/_common.py
   '';
 
-  nativeBuildInputs = [
-    beets
-  ];
-
   build-system = with python3Packages; [
     setuptools
   ];
 
+  nativeBuildInputs = [
+    beets
+  ];
+
   dependencies = with python3Packages; [
     six
   ];

From a1fc43f7efb744f48006eb829e7e74abee5df8cd Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 16 Oct 2025 12:07:32 +0300
Subject: [PATCH 3281/6226] beetsPackages.filetote: put build-system nearer src

---
 pkgs/tools/audio/beets/plugins/filetote.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/audio/beets/plugins/filetote.nix b/pkgs/tools/audio/beets/plugins/filetote.nix
index 62af7d48b2a4..9f2c49375639 100644
--- a/pkgs/tools/audio/beets/plugins/filetote.nix
+++ b/pkgs/tools/audio/beets/plugins/filetote.nix
@@ -23,12 +23,14 @@ python3Packages.buildPythonApplication rec {
     substituteInPlace pyproject.toml --replace-fail "poetry-core<2.0.0" "poetry-core"
   '';
 
+  build-system = [
+    python3Packages.poetry-core
+  ];
+
   nativeBuildInputs = [
     beets
   ];
 
-  build-system = [ python3Packages.poetry-core ];
-
   dependencies = with python3Packages; [
     mediafile
     reflink

From 49b946ccb8eee977e086f51a73346c493243737f Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 16 Oct 2025 12:08:07 +0300
Subject: [PATCH 3282/6226] beetsPackages.filetote: put nativeCheckInputs
 before pytest settings

---
 pkgs/tools/audio/beets/plugins/filetote.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/audio/beets/plugins/filetote.nix b/pkgs/tools/audio/beets/plugins/filetote.nix
index 9f2c49375639..d2874e930cbc 100644
--- a/pkgs/tools/audio/beets/plugins/filetote.nix
+++ b/pkgs/tools/audio/beets/plugins/filetote.nix
@@ -61,6 +61,12 @@ python3Packages.buildPythonApplication rec {
     dev = optional-dependencies.lint ++ optional-dependencies.test ++ [ python3Packages.tox ];
   };
 
+  nativeCheckInputs = [
+    python3Packages.pytestCheckHook
+    writableTmpDirAsHomeHook
+  ]
+  ++ optional-dependencies.test;
+
   pytestFlags = [
     # This is the same as:
     #   -r fEs
@@ -73,12 +79,6 @@ python3Packages.buildPythonApplication rec {
     "tests/test_version.py"
   ];
 
-  nativeCheckInputs = [
-    python3Packages.pytestCheckHook
-    writableTmpDirAsHomeHook
-  ]
-  ++ optional-dependencies.test;
-
   meta = {
     description = "Beets plugin to move non-music files during the import process";
     homepage = "https://github.com/gtronset/beets-filetote";

From a0b1e33b63ea7f7c607cd684a528d34403a9007a Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 16 Oct 2025 12:08:56 +0300
Subject: [PATCH 3283/6226] beetsPackages.filetote: remove
 optional-dependencies attrset

This package is broken for a while and this information has no value
whatsoever.
---
 pkgs/tools/audio/beets/plugins/filetote.nix | 29 +++++----------------
 1 file changed, 7 insertions(+), 22 deletions(-)

diff --git a/pkgs/tools/audio/beets/plugins/filetote.nix b/pkgs/tools/audio/beets/plugins/filetote.nix
index d2874e930cbc..2d52e70430af 100644
--- a/pkgs/tools/audio/beets/plugins/filetote.nix
+++ b/pkgs/tools/audio/beets/plugins/filetote.nix
@@ -38,34 +38,19 @@ python3Packages.buildPythonApplication rec {
     typeguard
   ];
 
-  optional-dependencies = {
-    lint = with python3Packages; [
-      black
-      check-manifest
-      flake8
-      flake8-bugbear
-      flake8-bugbear-pyi
-      isort
-      mypy
-      pylint
-      typing_extensions
-    ];
-    test = with python3Packages; [
+  nativeCheckInputs =
+    with python3Packages;
+    [
+      pytestCheckHook
       beetsPackages.audible
       mediafile
-      pytest
       reflink
       toml
       typeguard
+    ]
+    ++ [
+      writableTmpDirAsHomeHook
     ];
-    dev = optional-dependencies.lint ++ optional-dependencies.test ++ [ python3Packages.tox ];
-  };
-
-  nativeCheckInputs = [
-    python3Packages.pytestCheckHook
-    writableTmpDirAsHomeHook
-  ]
-  ++ optional-dependencies.test;
 
   pytestFlags = [
     # This is the same as:

From 2ebcf2ff9c696d7e78a976eb230bc0fb0d192d15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 13:51:51 +0000
Subject: [PATCH 3284/6226] github-copilot-cli: 0.0.328 -> 0.0.351

---
 pkgs/by-name/gi/github-copilot-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/github-copilot-cli/package.nix b/pkgs/by-name/gi/github-copilot-cli/package.nix
index 89d99bd3cd4e..0cea28613e50 100644
--- a/pkgs/by-name/gi/github-copilot-cli/package.nix
+++ b/pkgs/by-name/gi/github-copilot-cli/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "github-copilot-cli";
-  version = "0.0.328";
+  version = "0.0.351";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@github/copilot/-/copilot-${finalAttrs.version}.tgz";
-    hash = "sha256-9oTaVjvwyS8KY8N5kUEiAs+l6vEd/BZ0AGJI0p9Jie0=";
+    hash = "sha256-pv2/VTrAOtb2wlOCVbs6qmlb0jbCVl4KpwhlEnVxvP8=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];

From d871c165c52d7881b94bb78e772172e047547371 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Thu, 16 Oct 2025 12:35:58 +0300
Subject: [PATCH 3285/6226] beets{,Packages}: rewrite / reform

- Promote all beets packages to 1st class Python packages, defined in
  pkgs/development/python-modules/beets* directories.
- Define top-level beets and beets-minimal using `toPythonApplication`
  instead of using `toPythonModule` for python3Packages.beets attribute.
- Add appropriate top-level aliases, and python-aliases
- Make sure nix-update finds the version and hash strings in the correct
  file (main motivation of this commit).
- Remove the mkPlugin function and simply put its contents inline.
---
 pkgs/by-name/be/beets-minimal/package.nix     |   5 +
 pkgs/by-name/be/beets/package.nix             |   5 +
 .../beets-alternatives/default.nix}           |  45 +-
 .../python-modules/beets-audible/default.nix} |  24 +-
 .../beets-copyartifacts/default.nix}          |  27 +-
 .../beets-filetote/default.nix}               |  51 +-
 .../beets}/bash-completion-always-print.patch |   0
 .../python-modules/beets/default.nix          | 498 ++++++++++++++++++
 pkgs/tools/audio/beets/builtin-plugins.nix    | 186 -------
 pkgs/tools/audio/beets/common.nix             | 269 ----------
 pkgs/tools/audio/beets/default.nix            |  55 --
 pkgs/top-level/aliases.nix                    |   3 +-
 pkgs/top-level/all-packages.nix               |   3 -
 pkgs/top-level/python-aliases.nix             |   3 +
 pkgs/top-level/python-packages.nix            |  16 +-
 15 files changed, 622 insertions(+), 568 deletions(-)
 create mode 100644 pkgs/by-name/be/beets-minimal/package.nix
 create mode 100644 pkgs/by-name/be/beets/package.nix
 rename pkgs/{tools/audio/beets/plugins/alternatives.nix => development/python-modules/beets-alternatives/default.nix} (74%)
 rename pkgs/{tools/audio/beets/plugins/audible.nix => development/python-modules/beets-audible/default.nix} (80%)
 rename pkgs/{tools/audio/beets/plugins/copyartifacts.nix => development/python-modules/beets-copyartifacts/default.nix} (80%)
 rename pkgs/{tools/audio/beets/plugins/filetote.nix => development/python-modules/beets-filetote/default.nix} (71%)
 rename pkgs/{tools/audio/beets/patches => development/python-modules/beets}/bash-completion-always-print.patch (100%)
 create mode 100644 pkgs/development/python-modules/beets/default.nix
 delete mode 100644 pkgs/tools/audio/beets/builtin-plugins.nix
 delete mode 100644 pkgs/tools/audio/beets/common.nix
 delete mode 100644 pkgs/tools/audio/beets/default.nix

diff --git a/pkgs/by-name/be/beets-minimal/package.nix b/pkgs/by-name/be/beets-minimal/package.nix
new file mode 100644
index 000000000000..de0125445743
--- /dev/null
+++ b/pkgs/by-name/be/beets-minimal/package.nix
@@ -0,0 +1,5 @@
+{
+  python3,
+}:
+
+python3.pkgs.toPythonApplication python3.pkgs.beets-minimal
diff --git a/pkgs/by-name/be/beets/package.nix b/pkgs/by-name/be/beets/package.nix
new file mode 100644
index 000000000000..0d8837e0c0d8
--- /dev/null
+++ b/pkgs/by-name/be/beets/package.nix
@@ -0,0 +1,5 @@
+{
+  python3,
+}:
+
+python3.pkgs.toPythonApplication python3.pkgs.beets
diff --git a/pkgs/tools/audio/beets/plugins/alternatives.nix b/pkgs/development/python-modules/beets-alternatives/default.nix
similarity index 74%
rename from pkgs/tools/audio/beets/plugins/alternatives.nix
rename to pkgs/development/python-modules/beets-alternatives/default.nix
index 6085a82064f8..29051861646a 100644
--- a/pkgs/tools/audio/beets/plugins/alternatives.nix
+++ b/pkgs/development/python-modules/beets-alternatives/default.nix
@@ -2,12 +2,25 @@
   lib,
   fetchFromGitHub,
   fetchpatch,
-  beets,
-  python3Packages,
+  buildPythonPackage,
+
+  # build-system
+  poetry-core,
+
+  # nativeBuildInputs
+  beets-minimal,
+
+  # tests
+  pytestCheckHook,
+  pytest-cov-stub,
+  mock,
+  pillow,
+  tomli,
+  typeguard,
   writableTmpDirAsHomeHook,
 }:
 
-python3Packages.buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "beets-alternatives";
   version = "0.13.4";
   pyproject = true;
@@ -31,26 +44,22 @@ python3Packages.buildPythonApplication rec {
   ];
 
   build-system = [
-    python3Packages.poetry-core
+    poetry-core
   ];
 
   nativeBuildInputs = [
-    beets
+    beets-minimal
   ];
 
-  nativeCheckInputs =
-    with python3Packages;
-    [
-      pytestCheckHook
-      pytest-cov-stub
-      mock
-      pillow
-      tomli
-      typeguard
-    ]
-    ++ [
-      writableTmpDirAsHomeHook
-    ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov-stub
+    mock
+    pillow
+    tomli
+    typeguard
+    writableTmpDirAsHomeHook
+  ];
 
   meta = {
     description = "Beets plugin to manage external files";
diff --git a/pkgs/tools/audio/beets/plugins/audible.nix b/pkgs/development/python-modules/beets-audible/default.nix
similarity index 80%
rename from pkgs/tools/audio/beets/plugins/audible.nix
rename to pkgs/development/python-modules/beets-audible/default.nix
index 50176db667cd..39b265ac7235 100644
--- a/pkgs/tools/audio/beets/plugins/audible.nix
+++ b/pkgs/development/python-modules/beets-audible/default.nix
@@ -1,12 +1,24 @@
 {
-  beets,
-  fetchFromGitHub,
   lib,
+  fetchFromGitHub,
+  buildPythonPackage,
+
+  # build-system
+  hatchling,
+
+  # native
+  beets,
+
+  # dependencies
+  markdownify,
+  natsort,
+  tldextract,
+
+  # passthru
   nix-update-script,
-  python3Packages,
 }:
 
-python3Packages.buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "beets-audible";
   version = "1.0.2";
   pyproject = true;
@@ -18,7 +30,7 @@ python3Packages.buildPythonApplication rec {
     hash = "sha256-6rf8U63SW+gwfT7ZdN/ymYKHRs0HSMDTP2ZBfULLsJs=";
   };
 
-  build-system = with python3Packages; [
+  build-system = [
     hatchling
   ];
 
@@ -28,7 +40,7 @@ python3Packages.buildPythonApplication rec {
 
   pythonRelaxDeps = true;
 
-  dependencies = with python3Packages; [
+  dependencies = [
     markdownify
     natsort
     tldextract
diff --git a/pkgs/tools/audio/beets/plugins/copyartifacts.nix b/pkgs/development/python-modules/beets-copyartifacts/default.nix
similarity index 80%
rename from pkgs/tools/audio/beets/plugins/copyartifacts.nix
rename to pkgs/development/python-modules/beets-copyartifacts/default.nix
index 7b873cbc2d42..ed7ab0ba8cfe 100644
--- a/pkgs/tools/audio/beets/plugins/copyartifacts.nix
+++ b/pkgs/development/python-modules/beets-copyartifacts/default.nix
@@ -1,12 +1,23 @@
 {
   lib,
-  beets,
   fetchFromGitHub,
-  python3Packages,
+  buildPythonPackage,
+
+  # build-system
+  setuptools,
+
+  # nativeBuildInputs
+  beets-minimal,
+
+  # dependencies
+  six,
+
+  # tests
+  pytestCheckHook,
   writableTmpDirAsHomeHook,
 }:
 
-python3Packages.buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "beets-copyartifacts";
   version = "0.1.5";
   pyproject = true;
@@ -27,20 +38,20 @@ python3Packages.buildPythonApplication rec {
     sed -i -e 's/util\.py3_path/os.fsdecode/g' tests/_common.py
   '';
 
-  build-system = with python3Packages; [
+  build-system = [
     setuptools
   ];
 
   nativeBuildInputs = [
-    beets
+    beets-minimal
   ];
 
-  dependencies = with python3Packages; [
+  dependencies = [
     six
   ];
 
   nativeCheckInputs = [
-    python3Packages.pytestCheckHook
+    pytestCheckHook
     writableTmpDirAsHomeHook
   ];
 
@@ -55,7 +66,7 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/adammillerio/beets-copyartifacts";
     changelog = "https://github.com/adammillerio/beets-copyartifacts/releases/tag/${src.tag}";
     license = lib.licenses.mit;
-    inherit (beets.meta) platforms;
+    inherit (beets-minimal.meta) platforms;
     # Isn't compatible with beets >= 2.3
     broken = true;
   };
diff --git a/pkgs/tools/audio/beets/plugins/filetote.nix b/pkgs/development/python-modules/beets-filetote/default.nix
similarity index 71%
rename from pkgs/tools/audio/beets/plugins/filetote.nix
rename to pkgs/development/python-modules/beets-filetote/default.nix
index 2d52e70430af..9b12b86118de 100644
--- a/pkgs/tools/audio/beets/plugins/filetote.nix
+++ b/pkgs/development/python-modules/beets-filetote/default.nix
@@ -1,13 +1,26 @@
 {
   lib,
   fetchFromGitHub,
-  python3Packages,
-  beets,
-  beetsPackages,
+  buildPythonPackage,
+
+  # build-system
+  poetry-core,
+
+  # nativeBuildInputs
+  beets-minimal,
+
+  # tests
+  pytestCheckHook,
+  beets-audible,
+  mediafile,
+  pytest,
+  reflink,
+  toml,
+  typeguard,
   writableTmpDirAsHomeHook,
 }:
 
-python3Packages.buildPythonApplication rec {
+buildPythonPackage rec {
   pname = "beets-filetote";
   version = "1.1.0";
   pyproject = true;
@@ -24,33 +37,29 @@ python3Packages.buildPythonApplication rec {
   '';
 
   build-system = [
-    python3Packages.poetry-core
+    poetry-core
   ];
 
   nativeBuildInputs = [
-    beets
+    beets-minimal
   ];
 
-  dependencies = with python3Packages; [
+  dependencies = [
     mediafile
     reflink
     toml
     typeguard
   ];
 
-  nativeCheckInputs =
-    with python3Packages;
-    [
-      pytestCheckHook
-      beetsPackages.audible
-      mediafile
-      reflink
-      toml
-      typeguard
-    ]
-    ++ [
-      writableTmpDirAsHomeHook
-    ];
+  nativeCheckInputs = [
+    pytestCheckHook
+    beets-audible
+    mediafile
+    reflink
+    toml
+    typeguard
+    writableTmpDirAsHomeHook
+  ];
 
   pytestFlags = [
     # This is the same as:
@@ -70,7 +79,7 @@ python3Packages.buildPythonApplication rec {
     changelog = "https://github.com/gtronset/beets-filetote/blob/${src.tag}/CHANGELOG.md";
     maintainers = with lib.maintainers; [ dansbandit ];
     license = lib.licenses.mit;
-    inherit (beets.meta) platforms;
+    inherit (beets-minimal.meta) platforms;
     # https://github.com/gtronset/beets-filetote/issues/211
     broken = true;
   };
diff --git a/pkgs/tools/audio/beets/patches/bash-completion-always-print.patch b/pkgs/development/python-modules/beets/bash-completion-always-print.patch
similarity index 100%
rename from pkgs/tools/audio/beets/patches/bash-completion-always-print.patch
rename to pkgs/development/python-modules/beets/bash-completion-always-print.patch
diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix
new file mode 100644
index 000000000000..7ed470f74bd3
--- /dev/null
+++ b/pkgs/development/python-modules/beets/default.nix
@@ -0,0 +1,498 @@
+/*
+  ** To customize the enabled beets plugins, use the pluginOverrides input to the
+  ** derivation.
+  ** Examples:
+  **
+  ** Disabling a builtin plugin:
+  ** python3.pkgs.beets.override {
+  **   pluginOverrides = {
+  **     beatport.enable = false;
+  **   };
+  ** }
+  **
+  ** Enabling an external plugin:
+  ** python3.pkgs.beets.override {
+  **   pluginOverrides = {
+  **     alternatives = {
+  **       enable = true;
+  **       propagatedBuildInputs = [ beets-alternatives ];
+  **     };
+  **   };
+  ** }
+*/
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+  beets,
+
+  # build-system
+  poetry-core,
+  poetry-dynamic-versioning,
+
+  # dependencies
+  confuse,
+  gst-python,
+  jellyfish,
+  mediafile,
+  munkres,
+  musicbrainzngs,
+  platformdirs,
+  pyyaml,
+  unidecode,
+  reflink,
+  typing-extensions,
+  lap,
+
+  # native
+  gobject-introspection,
+  sphinxHook,
+  sphinx-design,
+  sphinx-copybutton,
+  pydata-sphinx-theme,
+
+  # buildInputs
+  gst_all_1,
+
+  # plugin deps
+  aacgain,
+  beautifulsoup4,
+  chromaprint,
+  discogs-client,
+  ffmpeg,
+  flac,
+  flask,
+  flask-cors,
+  imagemagick,
+  keyfinder-cli,
+  langdetect,
+  librosa,
+  mp3gain,
+  mp3val,
+  mpd2,
+  pyacoustid,
+  pylast,
+  pyxdg,
+  requests,
+  requests-oauthlib,
+  resampy,
+  soco,
+
+  # configurations
+  extraPatches ? [ ],
+  pluginOverrides ? { },
+  disableAllPlugins ? false,
+  extraDisabledTests ? [ ],
+  extraNativeBuildInputs ? [ ],
+
+  # tests
+  pytestCheckHook,
+  pytest-cov-stub,
+  mock,
+  rarfile,
+  responses,
+  requests-mock,
+  pillow,
+  writableTmpDirAsHomeHook,
+
+  # preCheck
+  bashInteractive,
+  diffPlugins,
+  runtimeShell,
+  writeScript,
+
+  # passthru.tests
+  runCommand,
+}:
+
+buildPythonPackage rec {
+  pname = "beets";
+  version = "2.5.1";
+  src = fetchFromGitHub {
+    owner = "beetbox";
+    repo = "beets";
+    tag = "v${version}";
+    hash = "sha256-H3jcEHyK13+RHVlV4zp+8M3LZ0Jc2FdmAbLpekGozLA=";
+  };
+  pyproject = true;
+
+  patches = [
+    # Bash completion fix for Nix
+    ./bash-completion-always-print.patch
+  ]
+  ++ extraPatches;
+
+  build-system = [
+    poetry-core
+    poetry-dynamic-versioning
+  ];
+
+  dependencies = [
+    confuse
+    gst-python
+    jellyfish
+    mediafile
+    munkres
+    musicbrainzngs
+    platformdirs
+    pyyaml
+    unidecode
+    # Can be built without it, but is useful on btrfs systems, and doesn't
+    # add too much to the closure. See:
+    # https://github.com/NixOS/nixpkgs/issues/437308
+    reflink
+    typing-extensions
+    lap
+  ]
+  ++ (lib.concatMap (p: p.propagatedBuildInputs) (lib.attrValues passthru.plugins.enabled));
+
+  nativeBuildInputs = [
+    gobject-introspection
+    sphinxHook
+    sphinx-design
+    sphinx-copybutton
+    pydata-sphinx-theme
+  ]
+  ++ extraNativeBuildInputs;
+
+  buildInputs = with gst_all_1; [
+    gst-plugins-base
+    gst-plugins-good
+    gst-plugins-ugly
+  ];
+
+  outputs = [
+    "out"
+    "doc"
+    "man"
+  ];
+  sphinxBuilders = [
+    "html"
+    "man"
+  ];
+  # Causes an installManPage error. Not clear why this directory gets generated
+  # with the manpages. The same directory is observed correctly in
+  # $doc/share/doc/beets-${version}/html
+  preInstallSphinx = ''
+    rm -r .sphinx/man/man/_sphinx_design_static
+  '';
+
+  postInstall = ''
+    mkdir -p $out/share/zsh/site-functions
+    cp extra/_beet $out/share/zsh/site-functions/
+  '';
+
+  makeWrapperArgs = [
+    "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\""
+    "--set GST_PLUGIN_SYSTEM_PATH_1_0 \"$GST_PLUGIN_SYSTEM_PATH_1_0\""
+    "--prefix PATH : ${lib.makeBinPath passthru.plugins.wrapperBins}"
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pytest-cov-stub
+    mock
+    rarfile
+    responses
+    requests-mock
+    pillow
+    writableTmpDirAsHomeHook
+  ]
+  ++ passthru.plugins.wrapperBins;
+
+  __darwinAllowLocalNetworking = true;
+
+  disabledTestPaths =
+    passthru.plugins.disabledTestPaths
+    ++ [
+      # touches network
+      "test/plugins/test_aura.py"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # Flaky: several tests fail randomly with:
+      # if not self._poll(timeout):
+      #   raise Empty
+      #   _queue.Empty
+      "test/plugins/test_bpd.py"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      # fail on Hydra with `RuntimeError: image cannot be obtained without artresizer backend`
+      "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_enforce_ratio"
+      "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_enforce_ratio_with_percent_margin"
+      "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_enforce_ratio_with_px_margin"
+      "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_minwidth"
+      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_deinterlaced"
+      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_deinterlaced_and_resized"
+      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_not_resized"
+      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_resized"
+      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_resized_and_scaled"
+      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_resized_but_not_scaled"
+      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_resize"
+    ];
+  disabledTests = extraDisabledTests ++ [
+    # https://github.com/beetbox/beets/issues/5880
+    "test_reject_different_art"
+    # touches network
+    "test_merge_duplicate_album"
+    # The existence of the dependency reflink (see comment above), causes this
+    # test to be run, and it fails in the sandbox.
+    "test_successful_reflink"
+  ];
+
+  # Perform extra "sanity checks", before running pytest tests.
+  preCheck = ''
+    # Check for undefined plugins
+    find beetsplug -mindepth 1 \
+      \! -path 'beetsplug/__init__.py' -a \
+      \( -name '*.py' -o -path 'beetsplug/*/__init__.py' \) -print \
+      | sed -n -re 's|^beetsplug/([^/.]+).*|\1|p' \
+      | sort -u > plugins_available
+    ${diffPlugins (lib.attrNames passthru.plugins.builtins) "plugins_available"}
+
+    export BEETS_TEST_SHELL="${lib.getExe bashInteractive} --norc"
+
+    env EDITOR="${writeScript "beetconfig.sh" ''
+      #!${runtimeShell}
+      cat > "$1" <<CFG
+      plugins: ${lib.concatStringsSep " " (lib.attrNames passthru.plugins.enabled)}
+      CFG
+    ''}" "$out/bin/beet" config -e
+    env EDITOR=true "$out/bin/beet" config -e
+  '';
+
+  passthru = {
+    plugins = {
+      builtins = {
+        absubmit = {
+          deprecated = true;
+          testPaths = [ ];
+        };
+        advancedrewrite = {
+          testPaths = [ ];
+        };
+        acousticbrainz = {
+          deprecated = true;
+          propagatedBuildInputs = [ requests ];
+        };
+        albumtypes = { };
+        aura = {
+          propagatedBuildInputs = [
+            flask
+            flask-cors
+            pillow
+          ];
+        };
+        autobpm = {
+          propagatedBuildInputs = [
+            librosa
+            # An optional dependency of librosa, needed for beets' autobpm
+            resampy
+          ];
+        };
+        badfiles = {
+          testPaths = [ ];
+          wrapperBins = [
+            mp3val
+            flac
+          ];
+        };
+        bareasc = { };
+        beatport.propagatedBuildInputs = [ requests-oauthlib ];
+        bench.testPaths = [ ];
+        bpd.testPaths = [ ];
+        bpm.testPaths = [ ];
+        bpsync.testPaths = [ ];
+        bucket = { };
+        chroma = {
+          propagatedBuildInputs = [ pyacoustid ];
+          testPaths = [ ];
+          wrapperBins = [
+            chromaprint
+          ];
+        };
+        convert.wrapperBins = [ ffmpeg ];
+        deezer = {
+          propagatedBuildInputs = [ requests ];
+          testPaths = [ ];
+        };
+        discogs.propagatedBuildInputs = [
+          discogs-client
+          requests
+        ];
+        duplicates.testPaths = [ ];
+        edit = { };
+        embedart = {
+          propagatedBuildInputs = [ pillow ];
+          wrapperBins = [ imagemagick ];
+        };
+        embyupdate.propagatedBuildInputs = [ requests ];
+        export = { };
+        fetchart = {
+          propagatedBuildInputs = [
+            beautifulsoup4
+            langdetect
+            pillow
+            requests
+          ];
+          wrapperBins = [ imagemagick ];
+        };
+        filefilter = { };
+        fish.testPaths = [ ];
+        freedesktop.testPaths = [ ];
+        fromfilename.testPaths = [ ];
+        ftintitle = { };
+        fuzzy.testPaths = [ ];
+        gmusic.testPaths = [ ];
+        hook = { };
+        ihate = { };
+        importadded = { };
+        importfeeds = { };
+        info = { };
+        inline.testPaths = [ ];
+        ipfs = { };
+        keyfinder.wrapperBins = [ keyfinder-cli ];
+        kodiupdate = {
+          propagatedBuildInputs = [ requests ];
+          testPaths = [ ];
+        };
+        lastgenre.propagatedBuildInputs = [ pylast ];
+        lastimport = {
+          propagatedBuildInputs = [ pylast ];
+          testPaths = [ ];
+        };
+        limit = { };
+        listenbrainz = {
+          testPaths = [ ];
+        };
+        loadext = {
+          propagatedBuildInputs = [ requests ];
+          testPaths = [ ];
+        };
+        lyrics.propagatedBuildInputs = [
+          beautifulsoup4
+          langdetect
+          requests
+        ];
+        mbcollection.testPaths = [ ];
+        mbsubmit = { };
+        mbsync = { };
+        metasync.testPaths = [ ];
+        missing.testPaths = [ ];
+        mpdstats.propagatedBuildInputs = [ mpd2 ];
+        mpdupdate = {
+          propagatedBuildInputs = [ mpd2 ];
+          testPaths = [ ];
+        };
+        musicbrainz = { };
+        parentwork = { };
+        permissions = { };
+        play = { };
+        playlist.propagatedBuildInputs = [ requests ];
+        plexupdate = { };
+        random = { };
+        replace = { };
+        replaygain.wrapperBins = [
+          aacgain
+          ffmpeg
+          mp3gain
+        ];
+        rewrite.testPaths = [ ];
+        scrub.testPaths = [ ];
+        smartplaylist = { };
+        sonosupdate = {
+          propagatedBuildInputs = [ soco ];
+          testPaths = [ ];
+        };
+        spotify = { };
+        subsonicplaylist = {
+          propagatedBuildInputs = [ requests ];
+          testPaths = [ ];
+        };
+        subsonicupdate.propagatedBuildInputs = [ requests ];
+        substitute = {
+          testPaths = [ ];
+        };
+        the = { };
+        thumbnails = {
+          propagatedBuildInputs = [
+            pillow
+            pyxdg
+          ];
+          wrapperBins = [ imagemagick ];
+        };
+        types.testPaths = [ "test/plugins/test_types_plugin.py" ];
+        unimported.testPaths = [ ];
+        web.propagatedBuildInputs = [
+          flask
+          flask-cors
+        ];
+        zero = { };
+        _typing = {
+          testPaths = [ ];
+        };
+        _utils = {
+          testPaths = [ ];
+        };
+      };
+      base = lib.mapAttrs (_: a: { builtin = true; } // a) passthru.plugins.builtins;
+      overrides = lib.mapAttrs (
+        plugName:
+        lib.throwIf (passthru.plugins.builtins.${plugName}.deprecated or false)
+          "beets evaluation error: Plugin ${plugName} was enabled in pluginOverrides, but it has been removed. Remove the override to fix evaluation."
+      ) pluginOverrides;
+      all = lib.mapAttrs (
+        n: a:
+        {
+          name = n;
+          enable = !disableAllPlugins;
+          builtin = false;
+          propagatedBuildInputs = [ ];
+          testPaths = [ "test/plugins/test_${n}.py" ];
+          wrapperBins = [ ];
+        }
+        // a
+      ) (lib.recursiveUpdate passthru.plugins.base passthru.plugins.overrides);
+      enabled = lib.filterAttrs (_: p: p.enable) passthru.plugins.all;
+      disabled = lib.filterAttrs (_: p: !p.enable) passthru.plugins.all;
+      disabledTestPaths = lib.flatten (
+        lib.attrValues (lib.mapAttrs (_: v: v.testPaths) passthru.plugins.disabled)
+      );
+      wrapperBins = lib.concatMap (p: p.wrapperBins) (lib.attrValues passthru.plugins.enabled);
+    };
+    tests = {
+      gstreamer =
+        runCommand "beets-gstreamer-test"
+          {
+            meta.timeout = 60;
+          }
+          ''
+            set -euo pipefail
+            export HOME=$(mktemp -d)
+            mkdir $out
+
+            cat << EOF > $out/config.yaml
+            replaygain:
+              backend: gstreamer
+            EOF
+
+            ${beets}/bin/beet -c $out/config.yaml > /dev/null
+          '';
+    };
+  };
+
+  meta = {
+    description = "Music tagger and library organizer";
+    homepage = "https://beets.io";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      aszlig
+      doronbehar
+      lovesegfault
+      montchr
+      pjones
+    ];
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    mainProgram = "beet";
+  };
+}
diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix
deleted file mode 100644
index c3fdf753c72c..000000000000
--- a/pkgs/tools/audio/beets/builtin-plugins.nix
+++ /dev/null
@@ -1,186 +0,0 @@
-{
-  aacgain,
-  chromaprint,
-  ffmpeg,
-  flac,
-  imagemagick,
-  keyfinder-cli,
-  mp3gain,
-  mp3val,
-  python3Packages,
-  version,
-  lib,
-  ...
-}:
-{
-  absubmit = {
-    deprecated = true;
-    testPaths = [ ];
-  };
-  advancedrewrite = {
-    testPaths = [ ];
-  };
-  acousticbrainz = {
-    deprecated = true;
-    propagatedBuildInputs = [ python3Packages.requests ];
-  };
-  albumtypes = { };
-  aura = {
-    propagatedBuildInputs = with python3Packages; [
-      flask
-      flask-cors
-      pillow
-    ];
-  };
-  autobpm = {
-    propagatedBuildInputs = with python3Packages; [
-      librosa
-      # An optional dependency of librosa, needed for beets' autobpm
-      resampy
-    ];
-  };
-  badfiles = {
-    testPaths = [ ];
-    wrapperBins = [
-      mp3val
-      flac
-    ];
-  };
-  bareasc = { };
-  beatport.propagatedBuildInputs = [ python3Packages.requests-oauthlib ];
-  bench.testPaths = [ ];
-  bpd.testPaths = [ ];
-  bpm.testPaths = [ ];
-  bpsync.testPaths = [ ];
-  bucket = { };
-  chroma = {
-    propagatedBuildInputs = [ python3Packages.pyacoustid ];
-    testPaths = [ ];
-    wrapperBins = [
-      chromaprint
-    ];
-  };
-  convert.wrapperBins = [ ffmpeg ];
-  deezer = {
-    propagatedBuildInputs = [ python3Packages.requests ];
-    testPaths = [ ];
-  };
-  discogs.propagatedBuildInputs = with python3Packages; [
-    discogs-client
-    requests
-  ];
-  duplicates.testPaths = [ ];
-  edit = { };
-  embedart = {
-    propagatedBuildInputs = with python3Packages; [ pillow ];
-    wrapperBins = [ imagemagick ];
-  };
-  embyupdate.propagatedBuildInputs = [ python3Packages.requests ];
-  export = { };
-  fetchart = {
-    propagatedBuildInputs = with python3Packages; [
-      beautifulsoup4
-      langdetect
-      pillow
-      requests
-    ];
-    wrapperBins = [ imagemagick ];
-  };
-  filefilter = { };
-  fish.testPaths = [ ];
-  freedesktop.testPaths = [ ];
-  fromfilename.testPaths = [ ];
-  ftintitle = { };
-  fuzzy.testPaths = [ ];
-  gmusic.testPaths = [ ];
-  hook = { };
-  ihate = { };
-  importadded = { };
-  importfeeds = { };
-  info = { };
-  inline.testPaths = [ ];
-  ipfs = { };
-  keyfinder.wrapperBins = [ keyfinder-cli ];
-  kodiupdate = {
-    propagatedBuildInputs = [ python3Packages.requests ];
-    testPaths = [ ];
-  };
-  lastgenre.propagatedBuildInputs = [ python3Packages.pylast ];
-  lastimport = {
-    propagatedBuildInputs = [ python3Packages.pylast ];
-    testPaths = [ ];
-  };
-  limit = { };
-  listenbrainz = {
-    testPaths = [ ];
-  };
-  loadext = {
-    propagatedBuildInputs = [ python3Packages.requests ];
-    testPaths = [ ];
-  };
-  lyrics.propagatedBuildInputs = with python3Packages; [
-    beautifulsoup4
-    langdetect
-    requests
-  ];
-  mbcollection.testPaths = [ ];
-  mbsubmit = { };
-  mbsync = { };
-  metasync.testPaths = [ ];
-  missing.testPaths = [ ];
-  mpdstats.propagatedBuildInputs = [ python3Packages.mpd2 ];
-  mpdupdate = {
-    propagatedBuildInputs = [ python3Packages.mpd2 ];
-    testPaths = [ ];
-  };
-  musicbrainz = { };
-  parentwork = { };
-  permissions = { };
-  play = { };
-  playlist.propagatedBuildInputs = [ python3Packages.requests ];
-  plexupdate = { };
-  random = { };
-  replace = { };
-  replaygain.wrapperBins = [
-    aacgain
-    ffmpeg
-    mp3gain
-  ];
-  rewrite.testPaths = [ ];
-  scrub.testPaths = [ ];
-  smartplaylist = { };
-  sonosupdate = {
-    propagatedBuildInputs = [ python3Packages.soco ];
-    testPaths = [ ];
-  };
-  spotify = { };
-  subsonicplaylist = {
-    propagatedBuildInputs = [ python3Packages.requests ];
-    testPaths = [ ];
-  };
-  subsonicupdate.propagatedBuildInputs = [ python3Packages.requests ];
-  substitute = {
-    testPaths = [ ];
-  };
-  the = { };
-  thumbnails = {
-    propagatedBuildInputs = with python3Packages; [
-      pillow
-      pyxdg
-    ];
-    wrapperBins = [ imagemagick ];
-  };
-  types.testPaths = [ "test/plugins/test_types_plugin.py" ];
-  unimported.testPaths = [ ];
-  web.propagatedBuildInputs = with python3Packages; [
-    flask
-    flask-cors
-  ];
-  zero = { };
-  _typing = {
-    testPaths = [ ];
-  };
-  _utils = {
-    testPaths = [ ];
-  };
-}
diff --git a/pkgs/tools/audio/beets/common.nix b/pkgs/tools/audio/beets/common.nix
deleted file mode 100644
index b2b0887530de..000000000000
--- a/pkgs/tools/audio/beets/common.nix
+++ /dev/null
@@ -1,269 +0,0 @@
-{
-  lib,
-  stdenv,
-  src,
-  version,
-  fetchpatch,
-  bashInteractive,
-  diffPlugins,
-  gobject-introspection,
-  gst_all_1,
-  python3Packages,
-  sphinxHook,
-  writableTmpDirAsHomeHook,
-  runtimeShell,
-  writeScript,
-
-  # plugin deps, used indirectly by the @inputs when we `import ./builtin-plugins.nix`
-  aacgain,
-  chromaprint,
-  essentia-extractor,
-  ffmpeg,
-  flac,
-  imagemagick,
-  keyfinder-cli,
-  mp3gain,
-  mp3val,
-
-  extraPatches ? [ ],
-  pluginOverrides ? { },
-  disableAllPlugins ? false,
-  disabledTests ? [ ],
-  extraNativeBuildInputs ? [ ],
-
-  # tests
-  runCommand,
-  beets,
-}@inputs:
-let
-  inherit (lib) attrNames attrValues concatMap;
-
-  mkPlugin =
-    {
-      name,
-      enable ? !disableAllPlugins,
-      builtin ? false,
-      propagatedBuildInputs ? [ ],
-      testPaths ? [
-        "test/plugins/test_${name}.py"
-      ],
-      wrapperBins ? [ ],
-    }:
-    {
-      inherit
-        name
-        enable
-        builtin
-        propagatedBuildInputs
-        testPaths
-        wrapperBins
-        ;
-    };
-
-  basePlugins = lib.mapAttrs (_: a: { builtin = true; } // a) (import ./builtin-plugins.nix inputs);
-  pluginOverrides' = lib.mapAttrs (
-    plugName:
-    lib.throwIf (basePlugins.${plugName}.deprecated or false)
-      "beets evaluation error: Plugin ${plugName} was enabled in pluginOverrides, but it has been removed. Remove the override to fix evaluation."
-  ) pluginOverrides;
-
-  allPlugins = lib.mapAttrs (n: a: mkPlugin { name = n; } // a) (
-    lib.recursiveUpdate basePlugins pluginOverrides'
-  );
-  builtinPlugins = lib.filterAttrs (_: p: p.builtin) allPlugins;
-  enabledPlugins = lib.filterAttrs (_: p: p.enable) allPlugins;
-  disabledPlugins = lib.filterAttrs (_: p: !p.enable) allPlugins;
-  disabledTestPaths = lib.flatten (attrValues (lib.mapAttrs (_: v: v.testPaths) disabledPlugins));
-
-  pluginWrapperBins = concatMap (p: p.wrapperBins) (attrValues enabledPlugins);
-in
-python3Packages.buildPythonApplication {
-  pname = "beets";
-  inherit src version;
-  pyproject = true;
-
-  patches = [
-  ]
-  ++ extraPatches;
-
-  build-system = [
-    python3Packages.poetry-core
-    python3Packages.poetry-dynamic-versioning
-  ];
-
-  dependencies =
-    with python3Packages;
-    [
-      confuse
-      gst-python
-      jellyfish
-      mediafile
-      munkres
-      musicbrainzngs
-      platformdirs
-      pyyaml
-      unidecode
-      # Can be built without it, but is useful on btrfs systems, and doesn't
-      # add too much to the closure. See:
-      # https://github.com/NixOS/nixpkgs/issues/437308
-      reflink
-      typing-extensions
-      lap
-    ]
-    ++ (concatMap (p: p.propagatedBuildInputs) (attrValues enabledPlugins));
-
-  nativeBuildInputs = [
-    gobject-introspection
-    sphinxHook
-    python3Packages.pydata-sphinx-theme
-    python3Packages.sphinx-design
-    python3Packages.sphinx-copybutton
-  ]
-  ++ extraNativeBuildInputs;
-
-  buildInputs = with gst_all_1; [
-    gst-plugins-base
-    gst-plugins-good
-    gst-plugins-ugly
-  ];
-
-  outputs = [
-    "out"
-    "doc"
-    "man"
-  ];
-  sphinxBuilders = [
-    "html"
-    "man"
-  ];
-  # Causes an installManPage error. Not clear why this directory gets generated
-  # with the manpages. The same directory is observed correctly in
-  # $doc/share/doc/beets-${version}/html
-  preInstallSphinx = ''
-    rm -r .sphinx/man/man/_sphinx_design_static
-  '';
-
-  postInstall = ''
-    mkdir -p $out/share/zsh/site-functions
-    cp extra/_beet $out/share/zsh/site-functions/
-  '';
-
-  makeWrapperArgs = [
-    "--set GI_TYPELIB_PATH \"$GI_TYPELIB_PATH\""
-    "--set GST_PLUGIN_SYSTEM_PATH_1_0 \"$GST_PLUGIN_SYSTEM_PATH_1_0\""
-    "--prefix PATH : ${lib.makeBinPath pluginWrapperBins}"
-  ];
-
-  nativeCheckInputs =
-    with python3Packages;
-    [
-      pytestCheckHook
-      pytest-cov-stub
-      mock
-      rarfile
-      responses
-      requests-mock
-      pillow
-    ]
-    ++ [
-      writableTmpDirAsHomeHook
-    ]
-    ++ pluginWrapperBins;
-
-  __darwinAllowLocalNetworking = true;
-
-  disabledTestPaths =
-    disabledTestPaths
-    ++ [
-      # touches network
-      "test/plugins/test_aura.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      # Flaky: several tests fail randomly with:
-      # if not self._poll(timeout):
-      #   raise Empty
-      #   _queue.Empty
-      "test/plugins/test_bpd.py"
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isLinux [
-      # fail on Hydra with `RuntimeError: image cannot be obtained without artresizer backend`
-      "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_enforce_ratio"
-      "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_enforce_ratio_with_percent_margin"
-      "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_enforce_ratio_with_px_margin"
-      "test/plugins/test_art.py::AlbumArtOperationConfigurationTest::test_minwidth"
-      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_deinterlaced"
-      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_deinterlaced_and_resized"
-      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_not_resized"
-      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_resized"
-      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_resized_and_scaled"
-      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_file_resized_but_not_scaled"
-      "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_resize"
-    ];
-  disabledTests = disabledTests ++ [
-    # https://github.com/beetbox/beets/issues/5880
-    "test_reject_different_art"
-    # touches network
-    "test_merge_duplicate_album"
-    # The existence of the dependency reflink (see comment above), causes this
-    # test to be run, and it fails in the sandbox.
-    "test_successful_reflink"
-  ];
-
-  # Perform extra "sanity checks", before running pytest tests.
-  preCheck = ''
-    # Check for undefined plugins
-    find beetsplug -mindepth 1 \
-      \! -path 'beetsplug/__init__.py' -a \
-      \( -name '*.py' -o -path 'beetsplug/*/__init__.py' \) -print \
-      | sed -n -re 's|^beetsplug/([^/.]+).*|\1|p' \
-      | sort -u > plugins_available
-    ${diffPlugins (attrNames builtinPlugins) "plugins_available"}
-
-    export BEETS_TEST_SHELL="${lib.getExe bashInteractive} --norc"
-
-    env EDITOR="${writeScript "beetconfig.sh" ''
-      #!${runtimeShell}
-      cat > "$1" <<CFG
-      plugins: ${lib.concatStringsSep " " (attrNames enabledPlugins)}
-      CFG
-    ''}" "$out/bin/beet" config -e
-    env EDITOR=true "$out/bin/beet" config -e
-  '';
-
-  passthru = {
-    plugins = allPlugins;
-    tests = {
-      gstreamer =
-        runCommand "beets-gstreamer-test"
-          {
-            meta.timeout = 60;
-          }
-          ''
-            set -euo pipefail
-            export HOME=$(mktemp -d)
-            mkdir $out
-
-            cat << EOF > $out/config.yaml
-            replaygain:
-              backend: gstreamer
-            EOF
-            ${beets}/bin/beet -c $out/config.yaml > /dev/null
-          '';
-    };
-  };
-
-  meta = {
-    description = "Music tagger and library organizer";
-    homepage = "https://beets.io";
-    license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [
-      aszlig
-      doronbehar
-      lovesegfault
-      montchr
-      pjones
-    ];
-    platforms = lib.platforms.linux ++ lib.platforms.darwin;
-    mainProgram = "beet";
-  };
-}
diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix
deleted file mode 100644
index 39a057cd18c8..000000000000
--- a/pkgs/tools/audio/beets/default.nix
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  lib,
-  callPackage,
-  config,
-  fetchFromGitHub,
-  python3Packages,
-}:
-/*
-  ** To customize the enabled beets plugins, use the pluginOverrides input to the
-  ** derivation.
-  ** Examples:
-  **
-  ** Disabling a builtin plugin:
-  ** beets.override { pluginOverrides = { beatport.enable = false; }; }
-  **
-  ** Enabling an external plugin:
-  ** beets.override { pluginOverrides = {
-  **   alternatives = { enable = true; propagatedBuildInputs = [ beetsPackages.alternatives ]; };
-  ** }; }
-*/
-let
-  extraPatches = [
-    # Bash completion fix for Nix
-    ./patches/bash-completion-always-print.patch
-  ];
-in
-lib.makeExtensible (
-  self:
-  {
-    beets = self.beets-stable;
-
-    beets-stable = callPackage ./common.nix rec {
-      inherit python3Packages extraPatches;
-      version = "2.5.1";
-      src = fetchFromGitHub {
-        owner = "beetbox";
-        repo = "beets";
-        tag = "v${version}";
-        hash = "sha256-H3jcEHyK13+RHVlV4zp+8M3LZ0Jc2FdmAbLpekGozLA=";
-      };
-    };
-
-    beets-minimal = self.beets.override { disableAllPlugins = true; };
-
-    alternatives = callPackage ./plugins/alternatives.nix { beets = self.beets-minimal; };
-    audible = callPackage ./plugins/audible.nix { beets = self.beets-minimal; };
-    copyartifacts = callPackage ./plugins/copyartifacts.nix { beets = self.beets-minimal; };
-    filetote = callPackage ./plugins/filetote.nix { beets = self.beets-minimal; };
-  }
-  // lib.optionalAttrs config.allowAliases {
-    beets-unstable = lib.warn "beets-unstable was aliased to beets, since upstream releases are frequent nowadays" self.beets;
-
-    extrafiles = throw "extrafiles is unmaintained since 2020 and broken since beets 2.0.0";
-  }
-)
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d5e3665b289d..084292d5fc22 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -545,7 +545,8 @@ mapAliases {
   beam_nox = throw "beam_nox has been removed in favor of beam_minimal or beamMinimalPackages"; # Added 2025-04-01
   BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12
   beatsabermodmanager = throw "'beatsabermodmanager' has been removed due to lack of upstream maintainenance. Consider using 'bs-manager' instead"; # Added 2025-03-18
-  beets-unstable = beetsPackages.beets-unstable; # Added 2025-09-24
+  beets-unstable = throw "beets-unstable has been removed in favor of beets since upstream is releasing versions frequently nowadays"; # Added 2025-10-16
+  beetsPackages = throw "beetsPackages were replaced with python3.pkgs.beets- prefixed attributes, and top-level beets* attributes"; # Added 2025-10-16
   belcard = throw "'belcard' has been moved to 'linphonePackages.belcard'"; # Added 2025-09-20
   belle-sip = throw "'belle-sip' has been moved to 'linphonePackages.belle-sip'"; # Added 2025-09-20
   belr = throw "'belr' has been moved to 'linphonePackages.belr'"; # Added 2025-09-20
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5b0edba6ed60..704f9a11333f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2327,9 +2327,6 @@ with pkgs;
     usePoppler = true;
   };
 
-  beetsPackages = lib.recurseIntoAttrs (callPackage ../tools/audio/beets { });
-  inherit (beetsPackages) beets;
-
   binlore = callPackage ../development/tools/analysis/binlore { };
 
   birdfont = callPackage ../tools/misc/birdfont { };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 736591ee02b1..03f55add971b 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -110,6 +110,9 @@ mapAliases {
   backports_weakref = throw "backports_weakref has been removed, since we no longer need to backport to python3.3"; # added 2023-07-28
   bash_kernel = bash-kernel; # added 2023-11-10
   beancount_docverif = beancount-docverif; # added 2023-10-08
+  beets-unstable = lib.warn "beets-unstable was aliased to beets, since upstream releases are frequent nowadays" self.beets; # added 2025-10-16;
+  beets-stable = lib.warn "beets-stable was aliased to beets, since upstream releases are frequent nowadays" self.beets; # added 2025-10-16;
+  beets-extrafiles = throw "beets-extrafiles is unmaintained since 2020 and broken since beets 2.0.0";
   bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04
   bip_utils = bip-utils; # 2023-10-08
   bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a65855a2a2aa..2d33913879dd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1834,7 +1834,21 @@ self: super: with self; {
 
   beetcamp = callPackage ../development/python-modules/beetcamp { };
 
-  beets = toPythonModule (pkgs.beets.override { python3Packages = self; });
+  beets = callPackage ../development/python-modules/beets {
+    inherit (pkgs) chromaprint;
+  };
+
+  beets-alternatives = callPackage ../development/python-modules/beets-alternatives { };
+
+  beets-audible = callPackage ../development/python-modules/beets-audible { };
+
+  beets-copyartifacts = callPackage ../development/python-modules/beets-copyartifacts { };
+
+  beets-filetote = callPackage ../development/python-modules/beets-filetote { };
+
+  beets-minimal = beets.override {
+    disableAllPlugins = true;
+  };
 
   beewi-smartclim = callPackage ../development/python-modules/beewi-smartclim { };
 

From ef60cb7396088e2f3b6407d08c011e9ede6819c8 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Fri, 17 Oct 2025 09:33:25 +0300
Subject: [PATCH 3286/6226] beets: Remove aszlig from maintainers

https://github.com/NixOS/nixpkgs/pull/452540#discussion_r2437583212
---
 pkgs/development/python-modules/beets/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix
index 7ed470f74bd3..4d32f27040f7 100644
--- a/pkgs/development/python-modules/beets/default.nix
+++ b/pkgs/development/python-modules/beets/default.nix
@@ -486,7 +486,6 @@ buildPythonPackage rec {
     homepage = "https://beets.io";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      aszlig
       doronbehar
       lovesegfault
       montchr

From 652a9739c448857100fbf96ecb730f8a4ab68e28 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 20 Oct 2025 11:13:32 +0300
Subject: [PATCH 3287/6226] python3Packages.confuse: 1.7.0 -> 2.0.1

Diff: https://github.com/beetbox/confuse/compare/v1.7.0...v2.0.1
---
 pkgs/development/python-modules/confuse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix
index e713f0166406..65b8f05bf219 100644
--- a/pkgs/development/python-modules/confuse/default.nix
+++ b/pkgs/development/python-modules/confuse/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "confuse";
-  version = "1.7.0";
+  version = "2.0.1";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "beetbox";
     repo = "confuse";
     rev = "v${version}";
-    hash = "sha256-zdH5DNXnuAfYTuaG9EIKiXL2EbLSfzYjPSkC3G06bU8=";
+    hash = "sha256-TVx0cBXv/fIuli/xrFXBAmwJ1rQr5xJL1Q67FaDr4ow=";
   };
 
   nativeBuildInputs = [ flit-core ];

From a9a4d36c9038358111fd39ba7c78b72d09e915fb Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 20 Oct 2025 11:14:10 +0300
Subject: [PATCH 3288/6226] python3Packages.confuse: no with lib; in meta

---
 pkgs/development/python-modules/confuse/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix
index 65b8f05bf219..161825e25aea 100644
--- a/pkgs/development/python-modules/confuse/default.nix
+++ b/pkgs/development/python-modules/confuse/default.nix
@@ -30,10 +30,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "confuse" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python configuration library for Python that uses YAML";
     homepage = "https://github.com/beetbox/confuse";
-    license = licenses.mit;
-    maintainers = with maintainers; [ lovesegfault ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ lovesegfault ];
   };
 }

From 73a224a1f5802815b96b3c1a0b99928ff26de0ae Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 20 Oct 2025 11:16:18 +0300
Subject: [PATCH 3289/6226] python3Packages.confuse: modernize attributes

---
 .../python-modules/confuse/default.nix        | 24 ++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix
index 161825e25aea..a4f12d54943b 100644
--- a/pkgs/development/python-modules/confuse/default.nix
+++ b/pkgs/development/python-modules/confuse/default.nix
@@ -2,10 +2,16 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  flit-core,
-  pyyaml,
-  pytestCheckHook,
   pythonOlder,
+
+  # build-system
+  flit-core,
+
+  # dependencies
+  pyyaml,
+
+  # tests
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -22,11 +28,17 @@ buildPythonPackage rec {
     hash = "sha256-TVx0cBXv/fIuli/xrFXBAmwJ1rQr5xJL1Q67FaDr4ow=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  build-system = [
+    flit-core
+  ];
 
-  propagatedBuildInputs = [ pyyaml ];
+  dependencies = [
+    pyyaml
+  ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "confuse" ];
 

From 171a9e8536a8ac25a464c2cc0d32fa4ee896f644 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Mon, 20 Oct 2025 11:17:27 +0300
Subject: [PATCH 3290/6226] python3Packages.confuse: add doronbehar as
 co-maintainer

---
 pkgs/development/python-modules/confuse/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/confuse/default.nix b/pkgs/development/python-modules/confuse/default.nix
index a4f12d54943b..79736bac54f1 100644
--- a/pkgs/development/python-modules/confuse/default.nix
+++ b/pkgs/development/python-modules/confuse/default.nix
@@ -46,6 +46,9 @@ buildPythonPackage rec {
     description = "Python configuration library for Python that uses YAML";
     homepage = "https://github.com/beetbox/confuse";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ lovesegfault ];
+    maintainers = with lib.maintainers; [
+      lovesegfault
+      doronbehar
+    ];
   };
 }

From a1e0137d061d7ffb24d1bb4fd6f6b1e6bcd8f41c Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Sun, 26 Oct 2025 23:53:23 +0200
Subject: [PATCH 3291/6226] python312.pkg.beets: re-enable
 test_reject_different_art

After comments at: https://github.com/beetbox/beets/issues/5880
---
 pkgs/development/python-modules/beets/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/beets/default.nix b/pkgs/development/python-modules/beets/default.nix
index 4d32f27040f7..bb6a8822fa56 100644
--- a/pkgs/development/python-modules/beets/default.nix
+++ b/pkgs/development/python-modules/beets/default.nix
@@ -231,8 +231,6 @@ buildPythonPackage rec {
       "test/plugins/test_art.py::AlbumArtPerformOperationTest::test_resize"
     ];
   disabledTests = extraDisabledTests ++ [
-    # https://github.com/beetbox/beets/issues/5880
-    "test_reject_different_art"
     # touches network
     "test_merge_duplicate_album"
     # The existence of the dependency reflink (see comment above), causes this

From 29bd1619d8d62e43faf5da772bb66e9d2fe12a5c Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Mon, 27 Oct 2025 22:07:56 +0800
Subject: [PATCH 3292/6226] pocket-id: 1.14.0 -> 1.14.1

Diff: https://github.com/pocket-id/pocket-id/compare/v1.14.0...v1.14.1

Changelog: https://github.com/pocket-id/pocket-id/releases/tag/v1.14.1
---
 pkgs/by-name/po/pocket-id/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix
index 80a237992883..4507f4b20cf0 100644
--- a/pkgs/by-name/po/pocket-id/package.nix
+++ b/pkgs/by-name/po/pocket-id/package.nix
@@ -11,13 +11,13 @@
 
 buildGo125Module (finalAttrs: {
   pname = "pocket-id";
-  version = "1.14.0";
+  version = "1.14.1";
 
   src = fetchFromGitHub {
     owner = "pocket-id";
     repo = "pocket-id";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5F3XchB3kl54Sm45yD9giRd1K3xwPNhFAVYILyY3f2Q=";
+    hash = "sha256-PnZKlJ6smwpgijqQM5xTcopyGJfO2pebiEJhEIdAOFk=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/backend";

From e907ff51949d9c5f935bbf05c8e15873276e4092 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 26 Oct 2025 19:58:55 +0000
Subject: [PATCH 3293/6226] hyperscan: cleanup

---
 pkgs/by-name/hy/hyperscan/package.nix | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/hy/hyperscan/package.nix b/pkgs/by-name/hy/hyperscan/package.nix
index faf7de95740b..b0e738faac9c 100644
--- a/pkgs/by-name/hy/hyperscan/package.nix
+++ b/pkgs/by-name/hy/hyperscan/package.nix
@@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "intel";
     repo = "hyperscan";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-tzmVc6kJPzkFQLUM1MttQRLpgs0uckbV6rCxEZwk1yk=";
-    rev = "v${finalAttrs.version}";
   };
 
   outputs = [
@@ -38,16 +38,22 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    "-DBUILD_AVX512=ON"
+    (lib.cmakeBool "BUILD_AVX512" true)
   ]
-  ++ lib.optional (!stdenv.hostPlatform.isDarwin) "-DFAT_RUNTIME=ON"
-  ++ lib.optional withStatic "-DBUILD_STATIC_AND_SHARED=ON"
-  ++ lib.optional (!withStatic) "-DBUILD_SHARED_LIBS=ON";
+  ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [
+    (lib.cmakeBool "FAT_RUNTIME" true)
+  ]
+  ++ lib.optionals withStatic [
+    (lib.cmakeBool "BUILD_STATIC_AND_SHARED" true)
+  ]
+  ++ lib.optionals (!withStatic) [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" true)
+  ];
 
   # hyperscan CMake is completely broken for chimera builds when pcre is compiled
   # the only option to make it build - building from source
   # In case pcre is built from source, chimera build is turned on by default
-  preConfigure = lib.optional withStatic ''
+  preConfigure = lib.optionalString withStatic ''
     mkdir -p pcre
     tar xvf ${pcre.src} --strip-components 1 -C pcre
   '';
@@ -75,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postCheck
   '';
 
-  meta = with lib; {
+  meta = {
     description = "High-performance multiple regex matching library";
     longDescription = ''
       Hyperscan is a high-performance multiple regex matching library.
@@ -91,11 +97,11 @@ stdenv.mkDerivation (finalAttrs: {
     '';
 
     homepage = "https://www.hyperscan.io/";
-    maintainers = with maintainers; [ avnik ];
+    maintainers = with lib.maintainers; [ avnik ];
     platforms = [
       "x86_64-linux"
       "x86_64-darwin"
     ];
-    license = licenses.bsd3;
+    license = lib.licenses.bsd3;
   };
 })

From f1f83023b394c31f7d624c920409a7b6452eb6c8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 26 Oct 2025 19:59:13 +0000
Subject: [PATCH 3294/6226] hyperscan: fix CMake 4 compatibility

Tracking: https://github.com/NixOS/nixpkgs/issues/445447
---
 pkgs/by-name/hy/hyperscan/package.nix | 54 ++++++++++++++++++---------
 1 file changed, 37 insertions(+), 17 deletions(-)

diff --git a/pkgs/by-name/hy/hyperscan/package.nix b/pkgs/by-name/hy/hyperscan/package.nix
index b0e738faac9c..9ae6121fc8f7 100644
--- a/pkgs/by-name/hy/hyperscan/package.nix
+++ b/pkgs/by-name/hy/hyperscan/package.nix
@@ -28,6 +28,28 @@ stdenv.mkDerivation (finalAttrs: {
     "dev"
   ];
 
+  postPatch = ''
+    sed -i '/examples/d' CMakeLists.txt
+    substituteInPlace libhs.pc.in \
+      --replace-fail "libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" "libdir=@CMAKE_INSTALL_LIBDIR@" \
+      --replace-fail "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@"
+
+    substituteInPlace cmake/pcre.cmake --replace-fail 'CHECK_C_SOURCE_COMPILES("#include <pcre.h.generic>
+        #if PCRE_MAJOR != ''${PCRE_REQUIRED_MAJOR_VERSION} || PCRE_MINOR < ''${PCRE_REQUIRED_MINOR_VERSION}
+        #error Incorrect pcre version
+        #endif
+        main() {}" CORRECT_PCRE_VERSION)' 'set(CORRECT_PCRE_VERSION TRUE)'
+  ''
+  # CMake 4 dropped support of versions lower than 3.5,
+  # versions lower than 3.10 are deprecated.
+  # https://github.com/NixOS/nixpkgs/issues/445447
+  + ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail \
+        "cmake_minimum_required (VERSION 2.8.11)" \
+        "cmake_minimum_required (VERSION 3.10)" \
+  '';
+
   buildInputs = [ boost ];
   nativeBuildInputs = [
     cmake
@@ -53,23 +75,21 @@ stdenv.mkDerivation (finalAttrs: {
   # hyperscan CMake is completely broken for chimera builds when pcre is compiled
   # the only option to make it build - building from source
   # In case pcre is built from source, chimera build is turned on by default
-  preConfigure = lib.optionalString withStatic ''
-    mkdir -p pcre
-    tar xvf ${pcre.src} --strip-components 1 -C pcre
-  '';
-
-  postPatch = ''
-    sed -i '/examples/d' CMakeLists.txt
-    substituteInPlace libhs.pc.in \
-      --replace-fail "libdir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@" "libdir=@CMAKE_INSTALL_LIBDIR@" \
-      --replace-fail "includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@"
-
-    substituteInPlace cmake/pcre.cmake --replace-fail 'CHECK_C_SOURCE_COMPILES("#include <pcre.h.generic>
-        #if PCRE_MAJOR != ''${PCRE_REQUIRED_MAJOR_VERSION} || PCRE_MINOR < ''${PCRE_REQUIRED_MINOR_VERSION}
-        #error Incorrect pcre version
-        #endif
-        main() {}" CORRECT_PCRE_VERSION)' 'set(CORRECT_PCRE_VERSION TRUE)'
-  '';
+  preConfigure = lib.optionalString withStatic (
+    ''
+      mkdir -p pcre
+      tar xvf ${pcre.src} --strip-components 1 -C pcre
+    ''
+    # CMake 4 dropped support of versions lower than 3.5,
+    # versions lower than 3.10 are deprecated.
+    # https://github.com/NixOS/nixpkgs/issues/445447
+    + ''
+      substituteInPlace pcre/CMakeLists.txt \
+        --replace-fail \
+          "CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)" \
+          "CMAKE_MINIMUM_REQUIRED(VERSION 3.10)" \
+    ''
+  );
 
   doCheck = true;
   checkPhase = ''

From bc84b2e65e59d4981eb174852d440399f8f066f4 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 26 Oct 2025 21:54:31 +0000
Subject: [PATCH 3295/6226] python3Packages.hyperscan: cleanup

---
 pkgs/development/python-modules/hyperscan/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/hyperscan/default.nix b/pkgs/development/python-modules/hyperscan/default.nix
index 5a38fe5c58ca..3622fa465f1b 100644
--- a/pkgs/development/python-modules/hyperscan/default.nix
+++ b/pkgs/development/python-modules/hyperscan/default.nix
@@ -37,7 +37,7 @@ buildPythonPackage rec {
 
   dontUseCmakeConfigure = true;
 
-  nativeBuildInputs = [
+  build-system = [
     cmake
     pathspec
     ninja
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     pytest-mock
   ];
 
-  meta = with lib; {
+  meta = {
     description = "CPython extension for the Hyperscan regular expression matching library";
     homepage = "https://github.com/darvid/python-hyperscan";
     changelog = "https://github.com/darvid/python-hyperscan/blob/${src.tag}/CHANGELOG.md";
@@ -61,7 +61,7 @@ buildPythonPackage rec {
       "x86_64-linux"
       "x86_64-darwin"
     ];
-    license = licenses.mit;
-    maintainers = with maintainers; [ mbalatsko ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ mbalatsko ];
   };
 }

From 8d87bb479de558819a33bb47b89427feddf98794 Mon Sep 17 00:00:00 2001
From: Martin Woods <weti.sobe@pen-net.de>
Date: Sat, 11 Oct 2025 12:40:23 +0200
Subject: [PATCH 3296/6226] tuxedo-drivers: 4.15.4 -> 4.16.0

---
 pkgs/os-specific/linux/tuxedo-drivers/default.nix           | 6 +++---
 .../tuxedo-drivers/{no-cp-etc-usr.patch => no-cp-usr.patch} | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
 rename pkgs/os-specific/linux/tuxedo-drivers/{no-cp-etc-usr.patch => no-cp-usr.patch} (93%)

diff --git a/pkgs/os-specific/linux/tuxedo-drivers/default.nix b/pkgs/os-specific/linux/tuxedo-drivers/default.nix
index 2023553cd3db..ad86e6220e40 100644
--- a/pkgs/os-specific/linux/tuxedo-drivers/default.nix
+++ b/pkgs/os-specific/linux/tuxedo-drivers/default.nix
@@ -13,17 +13,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tuxedo-drivers-${kernel.version}";
-  version = "4.15.4";
+  version = "4.16.0";
 
   src = fetchFromGitLab {
     group = "tuxedocomputers";
     owner = "development/packages";
     repo = "tuxedo-drivers";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-WJeju+czbCw03ALW7yzGAFENCEAvDdKqHvedchd7NVY=";
+    hash = "sha256-NjKhr8wsnoKSFx5kEXVaQ2SQzAX8XG8ENpYKOSMB2yc=";
   };
 
-  patches = [ ./no-cp-etc-usr.patch ];
+  patches = [ ./no-cp-usr.patch ];
 
   postInstall = ''
     echo "Running postInstallhook"
diff --git a/pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch b/pkgs/os-specific/linux/tuxedo-drivers/no-cp-usr.patch
similarity index 93%
rename from pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch
rename to pkgs/os-specific/linux/tuxedo-drivers/no-cp-usr.patch
index 9e94a43d60c5..124b79c98a17 100644
--- a/pkgs/os-specific/linux/tuxedo-drivers/no-cp-etc-usr.patch
+++ b/pkgs/os-specific/linux/tuxedo-drivers/no-cp-usr.patch
@@ -6,7 +6,7 @@ index 75a6bc1..6021d42 100644
  
  install: all
  	make -C $(KDIR) M=$(PWD) $(MAKEFLAGS) modules_install
--	cp -r etc usr /
+-	cp -r usr /
  
  clean:
  	make -C $(KDIR) M=$(PWD) $(MAKEFLAGS) clean

From d41fe6300e934d98848f9ec655746baf78d8b0e8 Mon Sep 17 00:00:00 2001
From: Martin Woods <weti.sobe@pen-net.de>
Date: Sun, 12 Oct 2025 11:27:34 +0200
Subject: [PATCH 3297/6226] tuxedo-drivers: added wetisobe to the maintainers

---
 maintainers/maintainer-list.nix                   | 6 ++++++
 pkgs/os-specific/linux/tuxedo-drivers/default.nix | 1 +
 2 files changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a07d0e41b379..dd14e7916dab 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -27747,6 +27747,12 @@
     githubId = 43357387;
     keys = [ { fingerprint = "F844 80B2 0CA9 D6CC C7F5  2479 A776 D2AD 099E 8BC0"; } ];
   };
+  wetisobe = {
+    name = "Martin Woods";
+    github = "wetisobe";
+    email = "weti.sobe@pen-net.de";
+    githubId = 172606048;
+  };
   wetrustinprize = {
     email = "git@wetrustinprize.com";
     github = "wetrustinprize";
diff --git a/pkgs/os-specific/linux/tuxedo-drivers/default.nix b/pkgs/os-specific/linux/tuxedo-drivers/default.nix
index ad86e6220e40..db9efc0dc13a 100644
--- a/pkgs/os-specific/linux/tuxedo-drivers/default.nix
+++ b/pkgs/os-specific/linux/tuxedo-drivers/default.nix
@@ -71,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: {
       keksgesicht
       xaverdh
       XBagon
+      wetisobe
     ];
     platforms = lib.platforms.linux;
   };

From c4b3c6439e556847a764a23d08ed673b9efde18c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 27 Oct 2025 14:25:51 +0000
Subject: [PATCH 3298/6226] rerun: 0.26.1 -> 0.26.2

Diff: https://github.com/rerun-io/rerun/compare/0.26.1...0.26.2

Changelog: https://github.com/rerun-io/rerun/blob/0.26.2/CHANGELOG.md
---
 pkgs/by-name/re/rerun/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix
index 2ca6715de353..c87f367d0a3e 100644
--- a/pkgs/by-name/re/rerun/package.nix
+++ b/pkgs/by-name/re/rerun/package.nix
@@ -34,13 +34,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rerun";
-  version = "0.26.1";
+  version = "0.26.2";
 
   src = fetchFromGitHub {
     owner = "rerun-io";
     repo = "rerun";
     tag = finalAttrs.version;
-    hash = "sha256-T4Ko0CDaKSEadaKB3JtTK9b2dRT9eJ7ThXEVipCRdBU=";
+    hash = "sha256-o+aV7YcsunaG3n2m8oTXug/kR3IU+ty9NYCkG/vEzyM=";
   };
 
   # The path in `build.rs` is wrong for some reason, so we patch it to make the passthru tests work
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail '"rerun_sdk/rerun_cli/rerun"' '"rerun_sdk/rerun"'
   '';
 
-  cargoHash = "sha256-c234pbC5wNKsWwt049Zmk3gaAEb+obkkwAqefRmsu2A=";
+  cargoHash = "sha256-EH/R+OgLeLNrZnkIGqutTo4K9XzhW+CGwG/uQKwWGXA=";
 
   cargoBuildFlags = [ "--package rerun-cli" ];
   cargoTestFlags = [ "--package rerun-cli" ];

From 1ad9d3648dd78e138e396c6e3e3eac23622b1c29 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 14:33:35 +0000
Subject: [PATCH 3299/6226] crc: 2.54.0 -> 2.55.1

---
 pkgs/by-name/cr/crc/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/cr/crc/package.nix b/pkgs/by-name/cr/crc/package.nix
index a96c64cbe6a3..ce550d03c3f9 100644
--- a/pkgs/by-name/cr/crc/package.nix
+++ b/pkgs/by-name/cr/crc/package.nix
@@ -8,16 +8,16 @@
 }:
 
 let
-  openShiftVersion = "4.19.8";
+  openShiftVersion = "4.19.13";
   okdVersion = "4.19.0-okd-scos.15";
   microshiftVersion = "4.19.7";
   writeKey = "$(MODULEPATH)/pkg/crc/segment.WriteKey=cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp";
-  gitCommit = "5d2dd491c18f39e1edd91b9bc6d5f12a1f0d9ba5";
-  gitHash = "sha256-7kgZUU582Zu2kpYSRdbAEfFud0gxlj/DWfmtN4sps2w=";
+  gitCommit = "6252bcd46a133d830ea8e3d76ab0b5a3abfe104d";
+  gitHash = "sha256-bVQKKIO+aFNwcZ84Ui1SuexsilAa/Ee/zuoHqOsK6+Y=";
 in
 buildGoModule (finalAttrs: {
   pname = "crc";
-  version = "2.54.0";
+  version = "2.55.1";
 
   src = fetchFromGitHub {
     owner = "crc-org";

From f060465dba3dfe483ff7e55e79de4020858570ad Mon Sep 17 00:00:00 2001
From: Pim Snel <post@pimsnel.com>
Date: Thu, 23 Oct 2025 21:56:51 +0200
Subject: [PATCH 3300/6226] documenso: 0.9 -> 1.12.6

---
 .../do/documenso/package-lock.json.patch      | 789 ++++++++++++++++++
 pkgs/by-name/do/documenso/package.json.patch  |  40 +
 pkgs/by-name/do/documenso/package.nix         | 116 ++-
 pkgs/by-name/do/documenso/turbo.json.patch    | 104 +++
 .../do/documenso/update-from-upstream.sh      |  55 ++
 5 files changed, 1081 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/by-name/do/documenso/package-lock.json.patch
 create mode 100644 pkgs/by-name/do/documenso/package.json.patch
 create mode 100644 pkgs/by-name/do/documenso/turbo.json.patch
 create mode 100755 pkgs/by-name/do/documenso/update-from-upstream.sh

diff --git a/pkgs/by-name/do/documenso/package-lock.json.patch b/pkgs/by-name/do/documenso/package-lock.json.patch
new file mode 100644
index 000000000000..875cba7457ad
--- /dev/null
+++ b/pkgs/by-name/do/documenso/package-lock.json.patch
@@ -0,0 +1,789 @@
+diff --git a/package-lock.json b/package-lock.json
+index 1a647e8..d44033c 100644
+--- a/package-lock.json
++++ b/package-lock.json
+@@ -16,7 +16,6 @@
+         "@documenso/prisma": "^0.0.0",
+         "@lingui/conf": "^5.2.0",
+         "@lingui/core": "^5.2.0",
+-        "inngest-cli": "^0.29.1",
+         "luxon": "^3.5.0",
+         "mupdf": "^1.0.0",
+         "react": "^18",
+@@ -41,7 +40,7 @@
+         "prisma-extension-kysely": "^3.0.0",
+         "prisma-kysely": "^1.8.0",
+         "rimraf": "^5.0.1",
+-        "turbo": "^1.9.3",
++        "turbo": "^2.5.8",
+         "vite": "^6.3.5"
+       },
+       "engines": {
+@@ -13223,15 +13222,6 @@
+         "node": ">=0.4.0"
+       }
+     },
+-    "node_modules/adm-zip": {
+-      "version": "0.5.16",
+-      "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.16.tgz",
+-      "integrity": "sha512-TGw5yVi4saajsSEgz25grObGHEUaDrniwvA2qwSC060KfqGPdglhvPMA2lPIoxs3PQIItj2iag35fONcQqgUaQ==",
+-      "license": "MIT",
+-      "engines": {
+-        "node": ">=12.0"
+-      }
+-    },
+     "node_modules/agent-base": {
+       "version": "7.1.3",
+       "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz",
+@@ -14705,6 +14695,7 @@
+       "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz",
+       "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==",
+       "license": "ISC",
++      "optional": true,
+       "engines": {
+         "node": ">=10"
+       }
+@@ -19315,6 +19306,7 @@
+       "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+       "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+       "license": "ISC",
++      "optional": true,
+       "dependencies": {
+         "minipass": "^3.0.0"
+       },
+@@ -19327,6 +19319,7 @@
+       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+       "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+       "license": "ISC",
++      "optional": true,
+       "dependencies": {
+         "yallist": "^4.0.0"
+       },
+@@ -19338,7 +19331,8 @@
+       "version": "4.0.0",
+       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+-      "license": "ISC"
++      "license": "ISC",
++      "optional": true
+     },
+     "node_modules/fs.realpath": {
+       "version": "1.0.0",
+@@ -21227,23 +21221,6 @@
+         }
+       }
+     },
+-    "node_modules/inngest-cli": {
+-      "version": "0.29.9",
+-      "resolved": "https://registry.npmjs.org/inngest-cli/-/inngest-cli-0.29.9.tgz",
+-      "integrity": "sha512-H02T7DGG53WV38RswpWmz7JsZXajx+uXDi1Zgq/ON5a+fNQi4hVRkxfoiZLngNeROVVXlokMTBwOShdsrnr7WA==",
+-      "hasInstallScript": true,
+-      "license": "SEE LICENSE IN LICENSE.md",
+-      "dependencies": {
+-        "adm-zip": "^0.5.10",
+-        "debug": "^4.3.4",
+-        "node-fetch": "2.6.7",
+-        "tar": "6.2.1"
+-      },
+-      "bin": {
+-        "inngest": "bin/inngest",
+-        "inngest-cli": "bin/inngest"
+-      }
+-    },
+     "node_modules/inngest/node_modules/@opentelemetry/api": {
+       "version": "1.9.0",
+       "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz",
+@@ -25470,6 +25447,7 @@
+       "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+       "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+       "license": "MIT",
++      "optional": true,
+       "dependencies": {
+         "minipass": "^3.0.0",
+         "yallist": "^4.0.0"
+@@ -25483,6 +25461,7 @@
+       "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+       "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+       "license": "ISC",
++      "optional": true,
+       "dependencies": {
+         "yallist": "^4.0.0"
+       },
+@@ -25494,13 +25473,15 @@
+       "version": "4.0.0",
+       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+-      "license": "ISC"
++      "license": "ISC",
++      "optional": true
+     },
+     "node_modules/mkdirp": {
+       "version": "1.0.4",
+       "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+       "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+       "license": "MIT",
++      "optional": true,
+       "bin": {
+         "mkdirp": "bin/cmd.js"
+       },
+@@ -32780,6 +32761,7 @@
+       "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz",
+       "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==",
+       "license": "ISC",
++      "optional": true,
+       "dependencies": {
+         "chownr": "^2.0.0",
+         "fs-minipass": "^2.0.0",
+@@ -32838,6 +32820,7 @@
+       "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz",
+       "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==",
+       "license": "ISC",
++      "optional": true,
+       "engines": {
+         "node": ">=8"
+       }
+@@ -32846,7 +32829,8 @@
+       "version": "4.0.0",
+       "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+       "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+-      "license": "ISC"
++      "license": "ISC",
++      "optional": true
+     },
+     "node_modules/temp-dir": {
+       "version": "2.0.0",
+@@ -34050,102 +34034,102 @@
+       }
+     },
+     "node_modules/turbo": {
+-      "version": "1.13.4",
+-      "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.13.4.tgz",
+-      "integrity": "sha512-1q7+9UJABuBAHrcC4Sxp5lOqYS5mvxRrwa33wpIyM18hlOCpRD/fTJNxZ0vhbMcJmz15o9kkVm743mPn7p6jpQ==",
++      "version": "2.5.8",
++      "resolved": "https://registry.npmjs.org/turbo/-/turbo-2.5.8.tgz",
++      "integrity": "sha512-5c9Fdsr9qfpT3hA0EyYSFRZj1dVVsb6KIWubA9JBYZ/9ZEAijgUEae0BBR/Xl/wekt4w65/lYLTFaP3JmwSO8w==",
+       "dev": true,
+-      "license": "MPL-2.0",
++      "license": "MIT",
+       "bin": {
+         "turbo": "bin/turbo"
+       },
+       "optionalDependencies": {
+-        "turbo-darwin-64": "1.13.4",
+-        "turbo-darwin-arm64": "1.13.4",
+-        "turbo-linux-64": "1.13.4",
+-        "turbo-linux-arm64": "1.13.4",
+-        "turbo-windows-64": "1.13.4",
+-        "turbo-windows-arm64": "1.13.4"
++        "turbo-darwin-64": "2.5.8",
++        "turbo-darwin-arm64": "2.5.8",
++        "turbo-linux-64": "2.5.8",
++        "turbo-linux-arm64": "2.5.8",
++        "turbo-windows-64": "2.5.8",
++        "turbo-windows-arm64": "2.5.8"
+       }
+     },
+     "node_modules/turbo-darwin-64": {
+-      "version": "1.13.4",
+-      "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.13.4.tgz",
+-      "integrity": "sha512-A0eKd73R7CGnRinTiS7txkMElg+R5rKFp9HV7baDiEL4xTG1FIg/56Vm7A5RVgg8UNgG2qNnrfatJtb+dRmNdw==",
++      "version": "2.5.8",
++      "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-2.5.8.tgz",
++      "integrity": "sha512-Dh5bCACiHO8rUXZLpKw+m3FiHtAp2CkanSyJre+SInEvEr5kIxjGvCK/8MFX8SFRjQuhjtvpIvYYZJB4AGCxNQ==",
+       "cpu": [
+         "x64"
+       ],
+       "dev": true,
+-      "license": "MPL-2.0",
++      "license": "MIT",
+       "optional": true,
+       "os": [
+         "darwin"
+       ]
+     },
+     "node_modules/turbo-darwin-arm64": {
+-      "version": "1.13.4",
+-      "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.13.4.tgz",
+-      "integrity": "sha512-eG769Q0NF6/Vyjsr3mKCnkG/eW6dKMBZk6dxWOdrHfrg6QgfkBUk0WUUujzdtVPiUIvsh4l46vQrNVd9EOtbyA==",
++      "version": "2.5.8",
++      "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-2.5.8.tgz",
++      "integrity": "sha512-f1H/tQC9px7+hmXn6Kx/w8Jd/FneIUnvLlcI/7RGHunxfOkKJKvsoiNzySkoHQ8uq1pJnhJ0xNGTlYM48ZaJOQ==",
+       "cpu": [
+         "arm64"
+       ],
+       "dev": true,
+-      "license": "MPL-2.0",
++      "license": "MIT",
+       "optional": true,
+       "os": [
+         "darwin"
+       ]
+     },
+     "node_modules/turbo-linux-64": {
+-      "version": "1.13.4",
+-      "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.13.4.tgz",
+-      "integrity": "sha512-Bq0JphDeNw3XEi+Xb/e4xoKhs1DHN7OoLVUbTIQz+gazYjigVZvtwCvgrZI7eW9Xo1eOXM2zw2u1DGLLUfmGkQ==",
++      "version": "2.5.8",
++      "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-2.5.8.tgz",
++      "integrity": "sha512-hMyvc7w7yadBlZBGl/bnR6O+dJTx3XkTeyTTH4zEjERO6ChEs0SrN8jTFj1lueNXKIHh1SnALmy6VctKMGnWfw==",
+       "cpu": [
+         "x64"
+       ],
+       "dev": true,
+-      "license": "MPL-2.0",
++      "license": "MIT",
+       "optional": true,
+       "os": [
+         "linux"
+       ]
+     },
+     "node_modules/turbo-linux-arm64": {
+-      "version": "1.13.4",
+-      "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.13.4.tgz",
+-      "integrity": "sha512-BJcXw1DDiHO/okYbaNdcWN6szjXyHWx9d460v6fCHY65G8CyqGU3y2uUTPK89o8lq/b2C8NK0yZD+Vp0f9VoIg==",
++      "version": "2.5.8",
++      "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-2.5.8.tgz",
++      "integrity": "sha512-LQELGa7bAqV2f+3rTMRPnj5G/OHAe2U+0N9BwsZvfMvHSUbsQ3bBMWdSQaYNicok7wOZcHjz2TkESn1hYK6xIQ==",
+       "cpu": [
+         "arm64"
+       ],
+       "dev": true,
+-      "license": "MPL-2.0",
++      "license": "MIT",
+       "optional": true,
+       "os": [
+         "linux"
+       ]
+     },
+     "node_modules/turbo-windows-64": {
+-      "version": "1.13.4",
+-      "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.13.4.tgz",
+-      "integrity": "sha512-OFFhXHOFLN7A78vD/dlVuuSSVEB3s9ZBj18Tm1hk3aW1HTWTuAw0ReN6ZNlVObZUHvGy8d57OAGGxf2bT3etQw==",
++      "version": "2.5.8",
++      "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-2.5.8.tgz",
++      "integrity": "sha512-3YdcaW34TrN1AWwqgYL9gUqmZsMT4T7g8Y5Azz+uwwEJW+4sgcJkIi9pYFyU4ZBSjBvkfuPZkGgfStir5BBDJQ==",
+       "cpu": [
+         "x64"
+       ],
+       "dev": true,
+-      "license": "MPL-2.0",
++      "license": "MIT",
+       "optional": true,
+       "os": [
+         "win32"
+       ]
+     },
+     "node_modules/turbo-windows-arm64": {
+-      "version": "1.13.4",
+-      "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.13.4.tgz",
+-      "integrity": "sha512-u5A+VOKHswJJmJ8o8rcilBfU5U3Y1TTAfP9wX8bFh8teYF1ghP0EhtMRLjhtp6RPa+XCxHHVA2CiC3gbh5eg5g==",
++      "version": "2.5.8",
++      "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-2.5.8.tgz",
++      "integrity": "sha512-eFC5XzLmgXJfnAK3UMTmVECCwuBcORrWdewoiXBnUm934DY6QN8YowC/srhNnROMpaKaqNeRpoB5FxCww3eteQ==",
+       "cpu": [
+         "arm64"
+       ],
+       "dev": true,
+-      "license": "MPL-2.0",
++      "license": "MIT",
+       "optional": true,
+       "os": [
+         "win32"
+@@ -36114,7 +36098,9 @@
+       },
+       "engines": {
+         "node": ">=18"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.52.0.tgz",
++      "integrity": "sha512-uh6W7sb55hl7D6vsAeA+V2p5JnlAqzhqFyF0VcJkKZXkgnFcVG9PziERRHQfPLfNGx1C292a4JqbWzhR8L4R1g=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test": {
+       "version": "2.0.12",
+@@ -36136,25 +36122,33 @@
+       },
+       "engines": {
+         "node": ">=16"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-2.0.12.tgz",
++      "integrity": "sha512-U6QiS5qsz+DN5RfJJrkAXdooxMDnLZ+n5nR8kaX//ZH19SilF6b58Z3zM9zTfrNIkJepzauHo4RceSgvgUSX9w=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/bluebird": {
+       "version": "3.7.2",
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz",
++      "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/check-more-types": {
+       "version": "2.24.0",
+       "license": "MIT",
+       "engines": {
+         "node": ">= 0.8.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz",
++      "integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/lazy-ass": {
+       "version": "1.6.0",
+       "license": "MIT",
+       "engines": {
+         "node": "> 0.8"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz",
++      "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree": {
+       "version": "1.2.0",
+@@ -36167,7 +36161,9 @@
+       },
+       "engines": {
+         "node": ">= 0.10"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz",
++      "integrity": "sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream": {
+       "version": "3.3.4",
+@@ -36180,18 +36176,26 @@
+         "split": "0.3",
+         "stream-combiner": "~0.0.4",
+         "through": "~2.3.1"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz",
++      "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/duplexer": {
+       "version": "0.1.2",
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz",
++      "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/from": {
+       "version": "0.1.7",
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz",
++      "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/map-stream": {
+-      "version": "0.1.0"
++      "version": "0.1.0",
++      "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz",
++      "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/pause-stream": {
+       "version": "0.0.11",
+@@ -36201,7 +36205,9 @@
+       ],
+       "dependencies": {
+         "through": "~2.3"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz",
++      "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/split": {
+       "version": "0.3.3",
+@@ -36211,14 +36217,18 @@
+       },
+       "engines": {
+         "node": "*"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz",
++      "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/stream-combiner": {
+       "version": "0.0.4",
+       "license": "MIT",
+       "dependencies": {
+         "duplexer": "~0.1.1"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz",
++      "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on": {
+       "version": "8.0.3",
+@@ -36235,7 +36245,9 @@
+       },
+       "engines": {
+         "node": ">=12.0.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-8.0.3.tgz",
++      "integrity": "sha512-nQFqAFzZDeRxsu7S3C7LbuxslHhk+gnJZHyethuGKAn2IVleIbTB9I3vJSQiSR+DifUqmdzfPMoMPJfLqMF2vw=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi": {
+       "version": "17.13.3",
+@@ -36246,40 +36258,54 @@
+         "@sideway/address": "^4.1.5",
+         "@sideway/formula": "^3.0.1",
+         "@sideway/pinpoint": "^2.0.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/joi/-/joi-17.13.3.tgz",
++      "integrity": "sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi/node_modules/@hapi/hoek": {
+       "version": "9.3.0",
+-      "license": "BSD-3-Clause"
++      "license": "BSD-3-Clause",
++      "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz",
++      "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi/node_modules/@hapi/topo": {
+       "version": "5.1.0",
+       "license": "BSD-3-Clause",
+       "dependencies": {
+         "@hapi/hoek": "^9.0.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz",
++      "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi/node_modules/@sideway/address": {
+       "version": "4.1.5",
+       "license": "BSD-3-Clause",
+       "dependencies": {
+         "@hapi/hoek": "^9.0.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz",
++      "integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi/node_modules/@sideway/formula": {
+       "version": "3.0.1",
+-      "license": "BSD-3-Clause"
++      "license": "BSD-3-Clause",
++      "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz",
++      "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi/node_modules/@sideway/pinpoint": {
+       "version": "2.0.0",
+-      "license": "BSD-3-Clause"
++      "license": "BSD-3-Clause",
++      "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz",
++      "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ=="
+     },
+     "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/rxjs": {
+       "version": "7.8.2",
+       "license": "Apache-2.0",
+       "dependencies": {
+         "tslib": "^2.1.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz",
++      "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA=="
+     },
+     "packages/assets": {
+       "name": "@documenso/assets",
+@@ -36718,7 +36744,9 @@
+     },
+     "packages/signing/node_modules/ts-pattern": {
+       "version": "5.7.1",
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-5.7.1.tgz",
++      "integrity": "sha512-EGs8PguQqAAUIcQfK4E9xdXxB6s2GK4sJfT/vcc9V1ELIvC4LH/zXu2t/5fajtv6oiRCxdv7BgtVK3vWgROxag=="
+     },
+     "packages/signing/node_modules/vitest": {
+       "version": "3.1.4",
+@@ -36787,7 +36815,9 @@
+         "jsdom": {
+           "optional": true
+         }
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.1.4.tgz",
++      "integrity": "sha512-Ta56rT7uWxCSJXlBtKgIlApJnT6e6IGmTYxYcmxjJ4ujuZDI59GUQgVDObXXJujOmPDBYXHK1qmaGtneu6TNIQ=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/@vitest/expect": {
+       "version": "3.1.4",
+@@ -36801,7 +36831,9 @@
+       },
+       "funding": {
+         "url": "https://opencollective.com/vitest"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.1.4.tgz",
++      "integrity": "sha512-xkD/ljeliyaClDYqHPNCiJ0plY5YIcM0OlRiZizLhlPmpXWpxnGMyTZXOHFhFeG7w9P5PBeL4IdtJ/HeQwTbQA=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/@vitest/mocker": {
+       "version": "3.1.4",
+@@ -36826,7 +36858,9 @@
+         "vite": {
+           "optional": true
+         }
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.1.4.tgz",
++      "integrity": "sha512-8IJ3CvwtSw/EFXqWFL8aCMu+YyYXG2WUSrQbViOZkWTKTVicVwZ/YiEZDSqD00kX+v/+W+OnxhNWoeVKorHygA=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/@vitest/mocker/node_modules/estree-walker": {
+       "version": "3.0.3",
+@@ -36834,7 +36868,9 @@
+       "license": "MIT",
+       "dependencies": {
+         "@types/estree": "^1.0.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz",
++      "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/@vitest/pretty-format": {
+       "version": "3.1.4",
+@@ -36845,7 +36881,9 @@
+       },
+       "funding": {
+         "url": "https://opencollective.com/vitest"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.1.4.tgz",
++      "integrity": "sha512-cqv9H9GvAEoTaoq+cYqUTCGscUjKqlJZC7PRwY5FMySVj5J+xOm1KQcCiYHJOEzOKRUhLH4R2pTwvFlWCEScsg=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/@vitest/runner": {
+       "version": "3.1.4",
+@@ -36857,7 +36895,9 @@
+       },
+       "funding": {
+         "url": "https://opencollective.com/vitest"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.1.4.tgz",
++      "integrity": "sha512-djTeF1/vt985I/wpKVFBMWUlk/I7mb5hmD5oP8K9ACRmVXgKTae3TUOtXAEBfslNKPzUQvnKhNd34nnRSYgLNQ=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/@vitest/snapshot": {
+       "version": "3.1.4",
+@@ -36870,7 +36910,9 @@
+       },
+       "funding": {
+         "url": "https://opencollective.com/vitest"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.1.4.tgz",
++      "integrity": "sha512-JPHf68DvuO7vilmvwdPr9TS0SuuIzHvxeaCkxYcCD4jTk67XwL45ZhEHFKIuCm8CYstgI6LZ4XbwD6ANrwMpFg=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/@vitest/spy": {
+       "version": "3.1.4",
+@@ -36881,7 +36923,9 @@
+       },
+       "funding": {
+         "url": "https://opencollective.com/vitest"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.1.4.tgz",
++      "integrity": "sha512-Xg1bXhu+vtPXIodYN369M86K8shGLouNjoVI78g8iAq2rFoHFdajNvJJ5A/9bPMFcfQqdaCpOgWKEoMQg/s0Yg=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/@vitest/spy/node_modules/tinyspy": {
+       "version": "3.0.2",
+@@ -36889,7 +36933,9 @@
+       "license": "MIT",
+       "engines": {
+         "node": ">=14.0.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz",
++      "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/@vitest/utils": {
+       "version": "3.1.4",
+@@ -36902,12 +36948,16 @@
+       },
+       "funding": {
+         "url": "https://opencollective.com/vitest"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.1.4.tgz",
++      "integrity": "sha512-yriMuO1cfFhmiGc8ataN51+9ooHRuURdfAZfwFd3usWynjzpLslZdYnRegTv32qdgtJTsj15FoeZe2g15fY1gg=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/@vitest/utils/node_modules/loupe": {
+       "version": "3.1.3",
+       "dev": true,
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz",
++      "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/chai": {
+       "version": "5.2.0",
+@@ -36922,7 +36972,9 @@
+       },
+       "engines": {
+         "node": ">=12"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.0.tgz",
++      "integrity": "sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/chai/node_modules/assertion-error": {
+       "version": "2.0.1",
+@@ -36930,7 +36982,9 @@
+       "license": "MIT",
+       "engines": {
+         "node": ">=12"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz",
++      "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/chai/node_modules/check-error": {
+       "version": "2.1.1",
+@@ -36938,7 +36992,9 @@
+       "license": "MIT",
+       "engines": {
+         "node": ">= 16"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz",
++      "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/chai/node_modules/deep-eql": {
+       "version": "5.0.2",
+@@ -36946,12 +37002,16 @@
+       "license": "MIT",
+       "engines": {
+         "node": ">=6"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz",
++      "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/chai/node_modules/loupe": {
+       "version": "3.1.3",
+       "dev": true,
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz",
++      "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/chai/node_modules/pathval": {
+       "version": "2.0.0",
+@@ -36959,7 +37019,9 @@
+       "license": "MIT",
+       "engines": {
+         "node": ">= 14.16"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz",
++      "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/expect-type": {
+       "version": "1.2.1",
+@@ -36967,27 +37029,37 @@
+       "license": "Apache-2.0",
+       "engines": {
+         "node": ">=12.0.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.2.1.tgz",
++      "integrity": "sha512-/kP8CAwxzLVEeFrMm4kMmy4CCDlpipyA7MYLVrdJIkV0fYF0UaigQHRsxHiuY/GEea+bh4KSv3TIlgr+2UL6bw=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/pathe": {
+       "version": "2.0.3",
+       "dev": true,
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
++      "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/std-env": {
+       "version": "3.9.0",
+       "dev": true,
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.9.0.tgz",
++      "integrity": "sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/tinybench": {
+       "version": "2.9.0",
+       "dev": true,
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz",
++      "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/tinyexec": {
+       "version": "0.3.2",
+       "dev": true,
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz",
++      "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/tinypool": {
+       "version": "1.0.2",
+@@ -36995,7 +37067,9 @@
+       "license": "MIT",
+       "engines": {
+         "node": "^18.0.0 || >=20.0.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz",
++      "integrity": "sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/tinyrainbow": {
+       "version": "2.0.0",
+@@ -37003,7 +37077,9 @@
+       "license": "MIT",
+       "engines": {
+         "node": ">=14.0.0"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-2.0.0.tgz",
++      "integrity": "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/vite-node": {
+       "version": "3.1.4",
+@@ -37024,7 +37100,9 @@
+       },
+       "funding": {
+         "url": "https://opencollective.com/vitest"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.1.4.tgz",
++      "integrity": "sha512-6enNwYnpyDo4hEgytbmc6mYWHXDHYEn0D1/rw4Q+tnHUGtKTJsn8T1YkX6Q18wI5LCrS8CTYlBaiCqxOy2kvUA=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/why-is-node-running": {
+       "version": "2.3.0",
+@@ -37039,17 +37117,23 @@
+       },
+       "engines": {
+         "node": ">=8"
+-      }
++      },
++      "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz",
++      "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/why-is-node-running/node_modules/siginfo": {
+       "version": "2.0.0",
+       "dev": true,
+-      "license": "ISC"
++      "license": "ISC",
++      "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz",
++      "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g=="
+     },
+     "packages/signing/node_modules/vitest/node_modules/why-is-node-running/node_modules/stackback": {
+       "version": "0.0.2",
+       "dev": true,
+-      "license": "MIT"
++      "license": "MIT",
++      "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz",
++      "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw=="
+     },
+     "packages/tailwind-config": {
+       "name": "@documenso/tailwind-config",
+@@ -37171,4 +37255,4 @@
+       "license": "MIT"
+     }
+   }
+-}
++}
+\ No newline at end of file
diff --git a/pkgs/by-name/do/documenso/package.json.patch b/pkgs/by-name/do/documenso/package.json.patch
new file mode 100644
index 000000000000..a8a72575e1ad
--- /dev/null
+++ b/pkgs/by-name/do/documenso/package.json.patch
@@ -0,0 +1,40 @@
+diff --git a/package.json b/package.json
+index 1ff8701..e337979 100644
+--- a/package.json
++++ b/package.json
+@@ -44,22 +44,22 @@
+     "@commitlint/cli": "^17.7.1",
+     "@commitlint/config-conventional": "^17.7.0",
+     "@lingui/cli": "^5.2.0",
++    "@prisma/client": "^6.8.2",
+     "dotenv": "^16.5.0",
+     "dotenv-cli": "^8.0.0",
+     "eslint": "^8.40.0",
+     "eslint-config-custom": "*",
+     "husky": "^9.0.11",
+     "lint-staged": "^15.2.2",
++    "nodemailer": "^6.10.1",
+     "playwright": "1.52.0",
+     "prettier": "^3.3.3",
+-    "rimraf": "^5.0.1",
+-    "turbo": "^1.9.3",
+-    "vite": "^6.3.5",
+-    "@prisma/client": "^6.8.2",
+     "prisma": "^6.8.2",
+     "prisma-extension-kysely": "^3.0.0",
+     "prisma-kysely": "^1.8.0",
+-    "nodemailer": "^6.10.1"
++    "rimraf": "^5.0.1",
++    "turbo": "^2.5.8",
++    "vite": "^6.3.5"
+   },
+   "name": "@documenso/root",
+   "workspaces": [
+@@ -71,7 +71,6 @@
+     "@documenso/prisma": "^0.0.0",
+     "@lingui/conf": "^5.2.0",
+     "@lingui/core": "^5.2.0",
+-    "inngest-cli": "^0.29.1",
+     "luxon": "^3.5.0",
+     "mupdf": "^1.0.0",
+     "react": "^18",
diff --git a/pkgs/by-name/do/documenso/package.nix b/pkgs/by-name/do/documenso/package.nix
index 71b15e2b29b8..f00781bc2c94 100644
--- a/pkgs/by-name/do/documenso/package.nix
+++ b/pkgs/by-name/do/documenso/package.nix
@@ -1,50 +1,119 @@
 {
   lib,
+  nodejs,
+  node-gyp,
+  node-pre-gyp,
+  pixman,
   fetchFromGitHub,
   buildNpmPackage,
   prisma,
-  nix-update-script,
+  prisma-engines,
+  vips,
+  pkg-config,
+  cairo,
+  pango,
+  bash,
+  openssl,
 }:
 let
-  version = "0.9";
+  pname = "documenso";
+  version = "1.12.6";
 in
 buildNpmPackage {
-  pname = "documenso";
-  inherit version;
+
+  inherit version pname;
 
   src = fetchFromGitHub {
     owner = "documenso";
     repo = "documenso";
     rev = "v${version}";
-    hash = "sha256-uKOJVZ0GRHo/CYvd/Ix/tq1WDhutRji1tSGdcITsNlo=";
+    hash = "sha256-1TKjsOKJkv3COFgsE4tPAymI0MdeT+T8HiNgnoWHlAY=";
   };
 
-  nativeBuildInputs = [ prisma ];
+  npmDepsHash = "sha256-ZddRSBDasa3mMAS2dqXgXRMOc1nvspdXsuTZ7c+einw=";
 
-  preBuild = ''
-    # somehow for linux, npm is not finding the prisma package with the
-    # packages installed with the lockfile.
-    # This generates a prisma version incompatibility warning and is a kludge
-    # until the upstream package-lock is modified.
-    prisma generate
+  env.PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1";
+
+  env.PRISMA_QUERY_ENGINE_LIBRARY = "${prisma-engines}/lib/libquery_engine.node";
+  env.PRISMA_QUERY_ENGINE_BINARY = "${prisma-engines}/bin/query-engine";
+  env.PRISMA_SCHEMA_ENGINE_BINARY = "${prisma-engines}/bin/schema-engine";
+  env.TURBO_NO_UPDATE_NOTIFIER = "true";
+  env.TURBO_FORCE = "true";
+  env.TURBO_REMOTE_CACHE_ENABLED = "false";
+
+  nativeBuildInputs = [
+    pkg-config
+    vips
+    node-gyp
+  ];
+
+  buildInputs = [
+    node-pre-gyp
+    node-gyp
+    pixman
+    cairo
+    pango
+    vips
+  ];
+
+  patches = [
+    ./package-lock.json.patch
+    ./package.json.patch
+    ./turbo.json.patch
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    patchShebangs apps/remix/.bin/build.sh
+    npm exec turbo -- telemetry disable
+    npm exec turbo -- build --filter=@documenso/remix
+
+    runHook postBuild
   '';
 
-  npmDepsHash = "sha256-+JbvFMi8xoyxkuL9k96K1Vq0neciCGkkyZUPd15ES2E=";
-
   installPhase = ''
-    runHook preInstall
+          runHook preInstall
 
-    mkdir $out
-    cp -r node_modules $out/
-    cp package-lock.json $out
-    cp apps/web/package.json $out
-    cp -r apps/web/public $out/
-    cp -r apps/web/.next $out/
+          mkdir -p $out/bin
+          cp -r . $out/
 
-    runHook postInstall
+          cat > $out/bin/${pname} <<EOF
+    #!${bash}/bin/bash
+    export PKG_CONFIG_PATH=${openssl.dev}/lib/pkgconfig;
+    export PRISMA_QUERY_ENGINE_LIBRARY=${prisma-engines}/lib/libquery_engine.node
+    export PRISMA_QUERY_ENGINE_BINARY=${prisma-engines}/bin/query-engine
+    export PRISMA_SCHEMA_ENGINE_BINARY=${prisma-engines}
+    cd $out/apps/remix
+    ${prisma}/bin/prisma migrate deploy --schema ../../packages/prisma/schema.prisma
+    ${nodejs}/bin/node build/server/main.js
+    EOF
+          chmod +x $out/bin/${pname}
+
+          runHook postInstall
   '';
 
-  passthru.updateScript = nix-update-script { };
+  # cleanup dangling symlinks for workspaces
+  preFixup = ''
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/assets
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/lib
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/documentation
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/prettier-config
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/signing
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/ui
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/eslint-config
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/tailwind-config
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/email
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/prisma
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/remix
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/openpage-api
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/api
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/tsconfig
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/app-tests
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/trpc
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/ee
+    rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/auth
+  '';
 
   meta = with lib; {
     description = "Open Source DocuSign Alternative";
@@ -52,5 +121,6 @@ buildNpmPackage {
     license = licenses.agpl3Only;
     maintainers = with maintainers; [ happysalada ];
     platforms = platforms.unix;
+    mainProgram = pname;
   };
 }
diff --git a/pkgs/by-name/do/documenso/turbo.json.patch b/pkgs/by-name/do/documenso/turbo.json.patch
new file mode 100644
index 000000000000..ee30405f325d
--- /dev/null
+++ b/pkgs/by-name/do/documenso/turbo.json.patch
@@ -0,0 +1,104 @@
+diff --git a/turbo.json b/turbo.json
+index d767b46..b2d1ad3 100644
+--- a/turbo.json
++++ b/turbo.json
+@@ -1,41 +1,8 @@
+ {
+   "$schema": "https://turbo.build/schema.json",
+-  "pipeline": {
+-    "build": {
+-      "dependsOn": ["prebuild", "^build"],
+-      "outputs": [".next/**", "!.next/cache/**"]
+-    },
+-    "prebuild": {
+-      "cache": false,
+-      "dependsOn": ["^prebuild"]
+-    },
+-    "lint": {
+-      "cache": false
+-    },
+-    "lint:fix": {
+-      "cache": false
+-    },
+-    "clean": {
+-      "cache": false
+-    },
+-    "dev": {
+-      "cache": false,
+-      "persistent": true
+-    },
+-    "start": {
+-      "dependsOn": ["^build"],
+-      "cache": false,
+-      "persistent": true
+-    },
+-    "dev:test": {
+-      "cache": false
+-    },
+-    "test:e2e": {
+-      "dependsOn": ["^build"],
+-      "cache": false
+-    }
+-  },
+-  "globalDependencies": ["**/.env.*local"],
++  "globalDependencies": [
++    "**/.env.*local"
++  ],
+   "globalEnv": [
+     "APP_VERSION",
+     "NEXT_PRIVATE_ENCRYPTION_KEY",
+@@ -119,5 +86,53 @@
+     "E2E_TEST_AUTHENTICATE_USERNAME",
+     "E2E_TEST_AUTHENTICATE_USER_EMAIL",
+     "E2E_TEST_AUTHENTICATE_USER_PASSWORD"
+-  ]
++  ],
++  "tasks": {
++    "build": {
++      "dependsOn": [
++        "prebuild",
++        "^build"
++      ],
++      "outputs": [
++        ".next/**",
++        "!.next/cache/**"
++      ]
++    },
++    "prebuild": {
++      "cache": false,
++      "dependsOn": [
++        "^prebuild"
++      ]
++    },
++    "lint": {
++      "cache": false
++    },
++    "lint:fix": {
++      "cache": false
++    },
++    "clean": {
++      "cache": false
++    },
++    "dev": {
++      "cache": false,
++      "persistent": true
++    },
++    "start": {
++      "dependsOn": [
++        "^build"
++      ],
++      "cache": false,
++      "persistent": true
++    },
++    "dev:test": {
++      "cache": false
++    },
++    "test:e2e": {
++      "dependsOn": [
++        "^build"
++      ],
++      "cache": false
++    }
++  },
++  "envMode": "loose"
+ }
diff --git a/pkgs/by-name/do/documenso/update-from-upstream.sh b/pkgs/by-name/do/documenso/update-from-upstream.sh
new file mode 100755
index 000000000000..315d05507e12
--- /dev/null
+++ b/pkgs/by-name/do/documenso/update-from-upstream.sh
@@ -0,0 +1,55 @@
+#!/usr/bin/env bash
+CMDS=();DESC=();NARGS=$#;ARG1=$1;make_command(){ CMDS+=($1);DESC+=("$2");};usage(){ printf "\nUsage: %s [command]\n\nCommands:\n" $0;line="              ";for((i=0;i<=$(( ${#CMDS[*]} -1));i++));do printf "  %s %s ${DESC[$i]}\n" ${CMDS[$i]} "${line:${#CMDS[$i]}}";done;echo;};runme(){ if test $NARGS -eq 1;then eval "$ARG1"||usage;else usage;fi;}
+
+version="1.12.6";
+
+make_command "about" "About this update script."
+about(){
+  echo "Documenso upstream needs some fixing before it can be build in a pure sandbox"
+  echo "environment. This script does the following:"
+  echo "  - download documenso version ${version} from github in a temp dir"
+  echo "  - uninstall inngest-cli which runs a binary download script at build time."
+  echo "  - upgrade turborepo as the older upstream version 'phones home' at build time."
+  echo "  - update the turbo.json to make it work with preset environment vars"
+  echo "  - fix the lockfile by generating missing hash signatures"
+  echo "  - create patches from changed json files"
+}
+
+make_command "update" "Get upstream and prepatch."
+update(){
+
+  echo "updating documenso for nixpkgs packaging"
+  current_nixpkgs_dir=${PWD}
+  temptarfile=/tmp/documenso-v${version}.tar.gz
+  tempdir=/tmp/documenso-v${version}
+
+  if [ ! -f "$temptarfile" ]; then
+    echo "Tarball does not exist; downloading from github.";
+    wget https://github.com/documenso/documenso/archive/refs/tags/v${version}.tar.gz -O $temptarfile
+  fi
+
+  rm -Rf $tempdir
+  mkdir $tempdir
+  tar -xzvf /tmp/documenso-v${version}.tar.gz -C $tempdir --strip-components=1
+  cd $tempdir
+  git init
+  git add package-lock.json package.json turbo.json
+  git commit -m "commit4diff" package-lock.json package.json turbo.json
+
+  echo "rm inngest-cli from root"
+  npm uninstall inngest-cli
+
+  npx @turbo/codemod migrate . --force
+
+  jq '.envMode="loose"' turbo.json > turbo-patched.json
+  cp turbo-patched.json turbo.json
+
+  echo "fix package-lock.json hashes"
+  nix run nixpkgs#npm-lockfile-fix -- package-lock.json
+
+  git diff package-lock.json > $current_nixpkgs_dir/package-lock.json.patch
+  git diff package.json > $current_nixpkgs_dir/package.json.patch
+  git diff turbo.json > $current_nixpkgs_dir/turbo.json.patch
+}
+
+runme

From d81caeb6f4851abdff8f50cf065971ce41d5121a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 27 Oct 2025 15:48:03 +0100
Subject: [PATCH 3301/6226] headscale: 0.26.1 -> 0.27.0

Changelog: https://github.com/juanfont/headscale/releases/tag/v0.27.0
---
 pkgs/by-name/he/headscale/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/he/headscale/package.nix b/pkgs/by-name/he/headscale/package.nix
index a4da9dbc82ac..30ed1bda6506 100644
--- a/pkgs/by-name/he/headscale/package.nix
+++ b/pkgs/by-name/he/headscale/package.nix
@@ -11,16 +11,16 @@
 }:
 buildGoModule rec {
   pname = "headscale";
-  version = "0.26.1";
+  version = "0.27.0";
 
   src = fetchFromGitHub {
     owner = "juanfont";
     repo = "headscale";
     tag = "v${version}";
-    hash = "sha256-LnS6K3U4RgRRV4i92zcRZtLJF1QdbORQP9ZIis9u6rk=";
+    hash = "sha256-bWY12OW2gc5m6xdEJYh6xBixUMKYRuSBH4lCkcToL04=";
   };
 
-  vendorHash = "sha256-dR8xmUIDMIy08lhm7r95GNNMAbXv4qSH3v9HR40HlNk=";
+  vendorHash = "sha256-GUIzlPRsyEq1uSTzRNds9p1uVu4pTeH5PAxrJ5Njhis=";
 
   subPackages = [ "cmd/headscale" ];
 

From e328907e95daea18e4df10c7b6ded2b140eab335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 27 Oct 2025 15:53:57 +0100
Subject: [PATCH 3302/6226] gitea: 1.24.6 -> 1.24.7

Diff: https://github.com/go-gitea/gitea/compare/v1.24.6...v1.24.7
---
 pkgs/by-name/gi/gitea/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix
index 4d31249d7396..37ece7f0cf99 100644
--- a/pkgs/by-name/gi/gitea/package.nix
+++ b/pkgs/by-name/gi/gitea/package.nix
@@ -35,13 +35,13 @@ let
 in
 buildGoModule rec {
   pname = "gitea";
-  version = "1.24.6";
+  version = "1.24.7";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     tag = "v${gitea.version}";
-    hash = "sha256-djIL/sLmScBLLks76zKxxKgEFZ1nK2d1Fleupg7voSA=";
+    hash = "sha256-0UOzEVy7SqYVnH3dJCzS9/jvRg7F/uqjZgQvUhh7RoE=";
   };
 
   proxyVendor = true;

From 92cfc6cd59f901099521393818ba5d99f14e5096 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 15:00:45 +0000
Subject: [PATCH 3303/6226] python3Packages.piccolo: 1.29.0 -> 1.30.0

---
 pkgs/development/python-modules/piccolo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/piccolo/default.nix b/pkgs/development/python-modules/piccolo/default.nix
index 378fe162d64b..714116e2d0f0 100644
--- a/pkgs/development/python-modules/piccolo/default.nix
+++ b/pkgs/development/python-modules/piccolo/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "piccolo";
-  version = "1.29.0";
+  version = "1.30.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "piccolo-orm";
     repo = "piccolo";
     tag = version;
-    hash = "sha256-CVN3aT1Xa7qKztEh1+jP9mlIu7Nw4EbjRYxzthycd4k=";
+    hash = "sha256-CR6zdaWFwhCGQsSxxUU9f3+A3RcuksG0+EUN2IotovA=";
   };
 
   build-system = [ setuptools ];

From 40e97ec96d105913769e726dd1472efc70ad99c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 15:02:52 +0000
Subject: [PATCH 3304/6226] trilium-desktop: 0.99.1 -> 0.99.3

---
 pkgs/by-name/tr/trilium-desktop/package.nix | 10 +++++-----
 pkgs/by-name/tr/trilium-server/package.nix  |  6 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/tr/trilium-desktop/package.nix b/pkgs/by-name/tr/trilium-desktop/package.nix
index 151a132289ad..09fef4b4181d 100644
--- a/pkgs/by-name/tr/trilium-desktop/package.nix
+++ b/pkgs/by-name/tr/trilium-desktop/package.nix
@@ -15,7 +15,7 @@
 
 let
   pname = "trilium-desktop";
-  version = "0.99.1";
+  version = "0.99.3";
 
   triliumSource = os: arch: hash: {
     url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-v${version}-${os}-${arch}.zip";
@@ -26,10 +26,10 @@ let
   darwinSource = triliumSource "macos";
 
   # exposed like this for update.sh
-  x86_64-linux.hash = "sha256-cn1Y6wMYoVCuNNdAxesNKcZiRo2uKGV8nL6yK1KtNP8=";
-  aarch64-linux.hash = "sha256-KhSSrdITpbGiIAEkdNfRAoIlhC2uUV6+8ZUaEYW7dyA=";
-  x86_64-darwin.hash = "sha256-jKAZnCtNEEnvJ6p6lziOG7+uAyMuEel4dAKRXvMHo8c=";
-  aarch64-darwin.hash = "sha256-1p0rUoZPunP3fRgn/EO3obdGp6l5BbsfZyKMlsgrl80=";
+  x86_64-linux.hash = "sha256-xq0T2Qi6kabKD66eY7GERE4VB5cXy+1Oixh1Q7O4Eh4=";
+  aarch64-linux.hash = "sha256-QjhmvwoX7N8HjUEStUGuJUA2MndrS6RsA68JhZqZLBQ=";
+  x86_64-darwin.hash = "sha256-jXT8EuKn9vmXyFInwvWOjKz92+XdZplHw4zA09mamZk=";
+  aarch64-darwin.hash = "sha256-N0aKPfUd8oV5QQ1IrAdnxff1fB6QCT09QSAqAcCeyHU=";
 
   sources = {
     x86_64-linux = linuxSource "x64" x86_64-linux.hash;
diff --git a/pkgs/by-name/tr/trilium-server/package.nix b/pkgs/by-name/tr/trilium-server/package.nix
index 8aaf775d5145..cca71a873286 100644
--- a/pkgs/by-name/tr/trilium-server/package.nix
+++ b/pkgs/by-name/tr/trilium-server/package.nix
@@ -7,12 +7,12 @@
 }:
 
 let
-  version = "0.99.1";
+  version = "0.99.3";
 
   serverSource_x64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-x64.tar.xz";
-  serverSource_x64.hash = "sha256-4DiPgWKXzVMm6JTBnJGOZrQLOIjQQvxkNvcawkzsg4M=";
+  serverSource_x64.hash = "sha256-WcyLXpVfVzKFj0pvC4j+0Hx3eSUC0euwfkKIQ2qxCN8=";
   serverSource_arm64.url = "https://github.com/TriliumNext/Trilium/releases/download/v${version}/TriliumNotes-Server-v${version}-linux-arm64.tar.xz";
-  serverSource_arm64.hash = "sha256-dyf6t2y1RO6+NCPDAD19DocAYchkIgV+x4Shn3BNEK8=";
+  serverSource_arm64.hash = "sha256-SUcv9N4/mSqDAAWjlB1bG6y7/PQpqwOte7UniN8SwZI=";
 
   serverSource =
     if stdenv.hostPlatform.isx86_64 then

From d995a6dbf4d7982c88a9c5dfc5f256decd091c85 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 15:10:42 +0000
Subject: [PATCH 3305/6226] solanum: 0-unstable-2025-10-13 ->
 0-unstable-2025-10-23

---
 pkgs/by-name/so/solanum/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/so/solanum/package.nix b/pkgs/by-name/so/solanum/package.nix
index cb97b39c03d8..3a56b9282291 100644
--- a/pkgs/by-name/so/solanum/package.nix
+++ b/pkgs/by-name/so/solanum/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation {
   pname = "solanum";
-  version = "0-unstable-2025-10-13";
+  version = "0-unstable-2025-10-23";
 
   src = fetchFromGitHub {
     owner = "solanum-ircd";
     repo = "solanum";
-    rev = "2d483c6e3f0d33aef9447c17b3b55d3e86098831";
-    hash = "sha256-/84WXUqJTOMldIUJokPBNR4quU9YZM0PhWWWLAKoJsw=";
+    rev = "4544f823127c59951c7695f0f260128ee0691a67";
+    hash = "sha256-x+i4LUImepwIz5H13W5eNYl9GzgFvNGS1OSLVtl9qmE=";
   };
 
   patches = [

From 19a1d389b81ceaa644f30e2f3d355f405a28ec58 Mon Sep 17 00:00:00 2001
From: drafolin <derg@drafolin.ch>
Date: Mon, 27 Oct 2025 16:15:27 +0100
Subject: [PATCH 3306/6226] teamspeak6-client: added libvdpau to fix #455691

---
 pkgs/by-name/te/teamspeak6-client/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/te/teamspeak6-client/package.nix b/pkgs/by-name/te/teamspeak6-client/package.nix
index 3f3b138a948f..c37fc47d5166 100644
--- a/pkgs/by-name/te/teamspeak6-client/package.nix
+++ b/pkgs/by-name/te/teamspeak6-client/package.nix
@@ -21,6 +21,7 @@
   libpulseaudio,
   libxkbcommon,
   libgbm,
+  libvdpau,
   nss,
   pipewire,
   udev,
@@ -55,6 +56,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     libpulseaudio
     libxkbcommon
     libgbm
+    libvdpau
     nss
     pipewire
     xorg.libX11
@@ -104,6 +106,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
           udev
           libGL
           libpulseaudio
+          libvdpau
           pipewire
         ]
       }"

From 2f5b43c1c203d165c5b13a18cea20fb08d7eab5b Mon Sep 17 00:00:00 2001
From: NAHO <90870942+trueNAHO@users.noreply.github.com>
Date: Mon, 27 Oct 2025 16:12:54 +0100
Subject: [PATCH 3307/6226] kgraphviewer: fix build with CMake 4

Link: https://github.com/NixOS/nixpkgs/issues/445447
---
 .../kg/kgraphviewer/cmake-minimum-required.patch       | 10 ++++++++++
 pkgs/by-name/kg/kgraphviewer/package.nix               |  2 ++
 2 files changed, 12 insertions(+)
 create mode 100644 pkgs/by-name/kg/kgraphviewer/cmake-minimum-required.patch

diff --git a/pkgs/by-name/kg/kgraphviewer/cmake-minimum-required.patch b/pkgs/by-name/kg/kgraphviewer/cmake-minimum-required.patch
new file mode 100644
index 000000000000..19ca4a46ec88
--- /dev/null
+++ b/pkgs/by-name/kg/kgraphviewer/cmake-minimum-required.patch
@@ -0,0 +1,10 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 03dfe43..33553f8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.10)
+ cmake_policy(SET CMP0048 NEW)
+ project(kgraphviewer VERSION "2.4.3")
+ set(KGRAPHVIEWERLIB_SOVERION 3)
diff --git a/pkgs/by-name/kg/kgraphviewer/package.nix b/pkgs/by-name/kg/kgraphviewer/package.nix
index 27320c563890..797ed6c7fb30 100644
--- a/pkgs/by-name/kg/kgraphviewer/package.nix
+++ b/pkgs/by-name/kg/kgraphviewer/package.nix
@@ -20,6 +20,8 @@ stdenv.mkDerivation rec {
     sha256 = "1h6pgg89gvxl8gw7wmkabyqqrzad5pxyv5lsmn1fl4ir8lcc5q2l";
   };
 
+  patches = [ ./cmake-minimum-required.patch ];
+
   buildInputs = [
     libsForQt5.qtbase
     libsForQt5.qtsvg

From 7b00ad95b31e39ce73cf2f88656fcca00a25c29c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 15:25:10 +0000
Subject: [PATCH 3308/6226] syft: 1.34.2 -> 1.36.0

---
 pkgs/by-name/sy/syft/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sy/syft/package.nix b/pkgs/by-name/sy/syft/package.nix
index 5e584c0d4331..f06260678818 100644
--- a/pkgs/by-name/sy/syft/package.nix
+++ b/pkgs/by-name/sy/syft/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "syft";
-  version = "1.34.2";
+  version = "1.36.0";
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "syft";
     tag = "v${version}";
-    hash = "sha256-1RdJpjUVenmfx6dIme97f1N4zAWFt5Z25IfIjZLIAPI=";
+    hash = "sha256-JSoKidueNwCI4Fbqs5K4RxfObJlet5FV6JgEWuLqd08=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -29,7 +29,7 @@ buildGoModule rec {
   # hash mismatch with darwin
   proxyVendor = true;
 
-  vendorHash = "sha256-r1P3dWNiVLDFLJ5IM/VHdMTDS/Yh+pb8VODxEnmxmks=";
+  vendorHash = "sha256-dKT2bEeIG3tndj5UuJO2g8gnVGM9AfB5ebu3CfWDhRg=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From f71cd02b7585bee611b1b57d4cce32d4f6238c66 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 27 Oct 2025 15:26:00 +0000
Subject: [PATCH 3309/6226] cuda-modules: update TensorRT update helper

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/_cuda/manifests/tensorrt/README.md          | 4 ++--
 .../_cuda/manifests/tensorrt/{helper.sh => helper.bash}      | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)
 rename pkgs/development/cuda-modules/_cuda/manifests/tensorrt/{helper.sh => helper.bash} (98%)

diff --git a/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/README.md b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/README.md
index a87a58ef70a6..4710f1ff0a39 100644
--- a/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/README.md
+++ b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/README.md
@@ -8,12 +8,12 @@ Only available from 10.0.0 and onwards, which is when NVIDIA stopped putting the
 
 You can find them at: <https://github.com/NVIDIA/TensorRT?tab=readme-ov-file#optional---if-not-using-tensorrt-container-specify-the-tensorrt-ga-release-build-path>.
 
-Construct entries using the provider `helper.sh` script.
+Construct entries using the provider `helper.bash` script.
 
 As an example:
 
 ```console
-$ ./tensorrt/helper.sh 12.5 10.2.0.19 windows-x86_64
+$ ./tensorrt/helper.bash 12.5 10.2.0.19 windows-x86_64
 main: storePath: /nix/store/l2hq83ihj3bcm4z836cz2dw3ilkhwrpy-TensorRT-10.2.0.19.Windows.win10.cuda-12.5.zip
 {
   "windows-x86_64": {
diff --git a/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/helper.sh b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/helper.bash
similarity index 98%
rename from pkgs/development/cuda-modules/_cuda/manifests/tensorrt/helper.sh
rename to pkgs/development/cuda-modules/_cuda/manifests/tensorrt/helper.bash
index ab7431e7bfba..b6ee9355e976 100755
--- a/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/helper.sh
+++ b/pkgs/development/cuda-modules/_cuda/manifests/tensorrt/helper.bash
@@ -1,6 +1,7 @@
-#!/usr/bin/env bash
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash -p nix jq
 
-# Requires nix and jq
+# shellcheck shell=bash
 
 set -euo pipefail
 

From 7a1ace52251ed62c153d5998c050ea5afd4ff0f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 15:28:16 +0000
Subject: [PATCH 3310/6226] onionprobe: 1.4.0 -> 1.4.1

---
 pkgs/by-name/on/onionprobe/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/on/onionprobe/package.nix b/pkgs/by-name/on/onionprobe/package.nix
index 9481ac247586..11a71b62bd4f 100644
--- a/pkgs/by-name/on/onionprobe/package.nix
+++ b/pkgs/by-name/on/onionprobe/package.nix
@@ -6,12 +6,12 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "onionprobe";
-  version = "1.4.0";
+  version = "1.4.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-rjExMm1mkoeRiv+aNuC6Ieo0/X5sbsjuSiAHcnQxjFo=";
+    sha256 = "sha256-RcEsiYKeNEQil0qp1WzGU9HiCi8iXnPuGK65lcpHor4=";
   };
 
   build-system = with python3Packages; [

From 6bfce91f92ca5fcb915ae2e0cf1b0ccd16a53c77 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 15:45:40 +0000
Subject: [PATCH 3311/6226] chirpstack-concentratord: 4.5.2 -> 4.5.3

---
 pkgs/by-name/ch/chirpstack-concentratord/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chirpstack-concentratord/package.nix b/pkgs/by-name/ch/chirpstack-concentratord/package.nix
index 05b8e3e5b12c..79d6f3f60367 100644
--- a/pkgs/by-name/ch/chirpstack-concentratord/package.nix
+++ b/pkgs/by-name/ch/chirpstack-concentratord/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "chirpstack-concentratord";
-  version = "4.5.2";
+  version = "4.5.3";
 
   src = fetchFromGitHub {
     owner = "chirpstack";
     repo = "chirpstack-concentratord";
     rev = "v${version}";
-    hash = "sha256-g7GlpibXAS3Nup/mYB2DEP+6UWjYHbSnPHRdpl+3ukA=";
+    hash = "sha256-D/zp3stjV0EUnUZlEVQ7YwFlczTxG0f0ABPban0JhPM=";
   };
 
-  cargoHash = "sha256-2ukynvY3ybu5t22PA5sbx3ehlA5aHjbw9v+0y9Bf4TY=";
+  cargoHash = "sha256-7l/42l1rFX7HXdhgA34FXWpQjksGCnHeARC5YupA2nE=";
 
   buildInputs = [
     libloragw-2g4

From 740f200422e5fa997261c48b14e2b9180411e214 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 16:23:42 +0000
Subject: [PATCH 3312/6226] sdl_gamecontrollerdb: 0-unstable-2025-09-13 ->
 0-unstable-2025-10-26

---
 pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix
index a0510206f811..fcb51f9dcfcd 100644
--- a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix
+++ b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sdl_gamecontrollerdb";
-  version = "0-unstable-2025-09-13";
+  version = "0-unstable-2025-10-26";
 
   src = fetchFromGitHub {
     owner = "mdqinc";
     repo = "SDL_GameControllerDB";
-    rev = "38fc811c715365e963a6942092cae147eddddc90";
-    hash = "sha256-dyOzv9cloQuLOuq8CExXQxloNJ02VgoxWiBHeNrSZcA=";
+    rev = "e40b8910f859cd988124def50dcdb63b2f2ff48b";
+    hash = "sha256-mSTRTtoFaYXS2ywe7g68dKuJD6FG3436HDip4cm8MeM=";
   };
 
   dontBuild = true;

From 124fecf2823c5658d635dc178fe490cc21bfb43e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 16:25:42 +0000
Subject: [PATCH 3313/6226] python3Packages.llm-perplexity: 2025.6.0 ->
 2025.10.0

---
 pkgs/development/python-modules/llm-perplexity/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llm-perplexity/default.nix b/pkgs/development/python-modules/llm-perplexity/default.nix
index 6c9f24df3236..6e2cb794220b 100644
--- a/pkgs/development/python-modules/llm-perplexity/default.nix
+++ b/pkgs/development/python-modules/llm-perplexity/default.nix
@@ -19,14 +19,14 @@
 }:
 buildPythonPackage rec {
   pname = "llm-perplexity";
-  version = "2025.6.0";
+  version = "2025.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hex";
     repo = "llm-perplexity";
     tag = version;
-    hash = "sha256-LTf2TY5bjSb7ARXrhWj1ctGuMpnq2Kl/kv/hrgX/m/M=";
+    hash = "sha256-8vgHlua+fPwZf2Accf0/CMFBIFAEZujP4hB3yTbLGG8=";
   };
 
   build-system = [ setuptools ];

From 0d58a3a43ff160dd3c3fb8121bb402c830f1bf80 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 16:29:09 +0000
Subject: [PATCH 3314/6226] python3Packages.schedula: 1.5.64 -> 1.5.65

---
 pkgs/development/python-modules/schedula/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/schedula/default.nix b/pkgs/development/python-modules/schedula/default.nix
index 0f47dfd8d2fa..d247f11c611f 100644
--- a/pkgs/development/python-modules/schedula/default.nix
+++ b/pkgs/development/python-modules/schedula/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "schedula";
-  version = "1.5.64";
+  version = "1.5.65";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "vinci1it2000";
     repo = "schedula";
     tag = "v${version}";
-    hash = "sha256-huMhJTMiTVrKyZ5z0dFfw61GHyLbpHNtZGXP4gmUdTs=";
+    hash = "sha256-f67W6oyX7oEZSGXTth+FHOa8efj1tQ+B0taDDqjOSR8=";
   };
 
   build-system = [ setuptools ];

From 1250b8c5ace8282dbd5d53bc8ac85485283aad18 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 16:30:54 +0000
Subject: [PATCH 3315/6226] blint: 3.0.2 -> 3.0.4

---
 pkgs/by-name/bl/blint/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bl/blint/package.nix b/pkgs/by-name/bl/blint/package.nix
index a3b163760a5d..d8a975996666 100644
--- a/pkgs/by-name/bl/blint/package.nix
+++ b/pkgs/by-name/bl/blint/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "blint";
-  version = "3.0.2";
+  version = "3.0.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "owasp-dep-scan";
     repo = "blint";
     tag = "v${version}";
-    hash = "sha256-ell0/opQso7/qD6d6i18vU55TfTgdcZwVFXD+yZg9/g=";
+    hash = "sha256-6dBNzBjhcBMX+PQ4NbjM18APqFuURH9/MYxHFZ/x7J8=";
   };
 
   build-system = [

From dc6888a3394cdb34c82ed9486d35088e05b0ec14 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 16:41:46 +0000
Subject: [PATCH 3316/6226] oklch-color-picker: 2.2.1 -> 2.3.0

---
 pkgs/by-name/ok/oklch-color-picker/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ok/oklch-color-picker/package.nix b/pkgs/by-name/ok/oklch-color-picker/package.nix
index 03f574bf83c0..10d643676f05 100644
--- a/pkgs/by-name/ok/oklch-color-picker/package.nix
+++ b/pkgs/by-name/ok/oklch-color-picker/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "oklch-color-picker";
-  version = "2.2.1";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "eero-lehtinen";
     repo = "oklch-color-picker";
     tag = "${finalAttrs.version}";
-    hash = "sha256-tPYxcZghGR1YZl1bwoDDIBmbTVGuksCpfgLYwG+k4Ws=";
+    hash = "sha256-dbsE1mYt/GhpkWIBS6MejiKKKz1B+h/3wqGKHCp0p2Q=";
   };
 
-  cargoHash = "sha256-tdIkvBYKfcbCYXhDbIwXNNbNb4X32uBwDh3mAyqt/IM=";
+  cargoHash = "sha256-R1nQAm1rw2hkhxeyzgXCTLF+gXdH1tr6DCv/L8b9D+s=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ];
 

From 218a9c62dd3480a894ce5c4d259496c7a9fbec65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 27 Oct 2025 09:43:32 -0700
Subject: [PATCH 3317/6226] python3Packages.structlog: 25.4.0 -> 25.5.0

Diff: https://github.com/hynek/structlog/compare/25.4.0...25.5.0

Changelog: https://github.com/hynek/structlog/blob/25.5.0/CHANGELOG.md
---
 .../python-modules/structlog/default.nix      | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/structlog/default.nix b/pkgs/development/python-modules/structlog/default.nix
index d7df69bc30a1..10c60fc80aff 100644
--- a/pkgs/development/python-modules/structlog/default.nix
+++ b/pkgs/development/python-modules/structlog/default.nix
@@ -1,31 +1,25 @@
 {
   lib,
-  better-exceptions,
   buildPythonPackage,
   fetchFromGitHub,
-  freezegun,
-  greenlet,
   hatch-fancy-pypi-readme,
   hatch-vcs,
   hatchling,
-  pretend,
   pytest-asyncio,
   pytestCheckHook,
-  rich,
-  simplejson,
-  twisted,
+  time-machine,
 }:
 
 buildPythonPackage rec {
   pname = "structlog";
-  version = "25.4.0";
+  version = "25.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "hynek";
     repo = "structlog";
     tag = version;
-    hash = "sha256-iNnUogcICQJvHBZO2J8uk4NleQY/ra3ZzxQgnSRKr30=";
+    hash = "sha256-dY18eZ7IEzP/eKR7d2CjpTRr2KfXy+YmeZMueHkLSQY=";
   };
 
   build-system = [
@@ -35,15 +29,9 @@ buildPythonPackage rec {
   ];
 
   nativeCheckInputs = [
-    better-exceptions
-    freezegun
-    greenlet
-    pretend
     pytest-asyncio
     pytestCheckHook
-    rich
-    simplejson
-    twisted
+    time-machine
   ];
 
   pythonImportsCheck = [ "structlog" ];

From 5dac65b65a240442c80523cdcbce7525bc8b9754 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 16:47:06 +0000
Subject: [PATCH 3318/6226] unciv: 4.18.7 -> 4.18.10

---
 pkgs/by-name/un/unciv/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix
index d9f8949cb4db..da6aec474562 100644
--- a/pkgs/by-name/un/unciv/package.nix
+++ b/pkgs/by-name/un/unciv/package.nix
@@ -12,7 +12,7 @@
   nix-update-script,
 }:
 let
-  version = "4.18.7";
+  version = "4.18.10";
 
   desktopItem = makeDesktopItem {
     name = "unciv";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
-    hash = "sha256-bZzF8WUDw2rrF8Qi6PKBA9F5EUDZGwgXegcHDFgQxJY=";
+    hash = "sha256-8gp4h+fKK+gmwL8OnmfKb5pmO4mehClu8FeQe2KJiDk=";
   };
 
   dontUnpack = true;

From 2a577f86ccc22092f6dc33bcb2a626c0ae7d727a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 17:04:24 +0000
Subject: [PATCH 3319/6226] gitlab-ci-local: 4.62.0 -> 4.63.0

---
 pkgs/by-name/gi/gitlab-ci-local/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/gitlab-ci-local/package.nix b/pkgs/by-name/gi/gitlab-ci-local/package.nix
index ba682b859429..3c9aff0d47b6 100644
--- a/pkgs/by-name/gi/gitlab-ci-local/package.nix
+++ b/pkgs/by-name/gi/gitlab-ci-local/package.nix
@@ -12,16 +12,16 @@
 
 buildNpmPackage rec {
   pname = "gitlab-ci-local";
-  version = "4.62.0";
+  version = "4.63.0";
 
   src = fetchFromGitHub {
     owner = "firecow";
     repo = "gitlab-ci-local";
     rev = version;
-    hash = "sha256-JcCfrrb/xAvILfHgnKoRxjWG4fvi4kVg0W+s+y25A6Y=";
+    hash = "sha256-IqfCEU/ZX28CAAFW9Wx9QFQY4E5iYKC5Ac0m7AuubNk=";
   };
 
-  npmDepsHash = "sha256-J/my72RPPwg1r1t4vO3CgMnGDP7H/Cc3apToypaK1YI=";
+  npmDepsHash = "sha256-0XV9jT1Ps8TPhl4pKN92v6mbMT37EcXdcn+GUo2wprg=";
 
   nativeBuildInputs = [
     makeBinaryWrapper

From 5a4a7625a580d8821f0240f76cd577c653444465 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 27 Oct 2025 10:10:51 -0700
Subject: [PATCH 3320/6226] python3Packages.home-assistant-chip-wheels: don't
 depend on pylint

---
 .../python-modules/home-assistant-chip-wheels/default.nix       | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
index a856179eee7a..58168c0a329c 100644
--- a/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
+++ b/pkgs/development/python-modules/home-assistant-chip-wheels/default.nix
@@ -45,7 +45,6 @@
   pyfakefs,
   pygments,
   pykwalify,
-  pylint,
   pyperclip,
   pyserial,
   python,
@@ -245,7 +244,6 @@ stdenv.mkDerivation rec {
         pyelftools
         pygments
         pykwalify
-        pylint
         pyperclip
         pyserial
         python-daemon

From 249e1f973023eb9deb6e0be00e09ad74301d22c7 Mon Sep 17 00:00:00 2001
From: Alois Wohlschlager <alois1@gmx-topmail.de>
Date: Mon, 27 Oct 2025 18:29:21 +0100
Subject: [PATCH 3321/6226] openssh_10_2: init at 10.2p1

OpenSSH 10.1 contains a bug that makes it totally unusable with ControlPersist,
which is fixed in 10.2. Temporarily make the latter available as an option
while the rebuilds go through staging.
---
 pkgs/tools/networking/openssh/default.nix | 25 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |  4 ++++
 2 files changed, 29 insertions(+)

diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix
index ef9b03f25b5c..f70fd678f68f 100644
--- a/pkgs/tools/networking/openssh/default.nix
+++ b/pkgs/tools/networking/openssh/default.nix
@@ -48,6 +48,31 @@ in
     };
   };
 
+  openssh_10_2 = common rec {
+    pname = "openssh";
+    version = "10.2p1";
+
+    src = fetchurl {
+      url = urlFor version;
+      hash = "sha256-zMQsBBmTeVkmP6Hb0W2vwYxWuYTANWLSk3zlamD3mLI=";
+    };
+
+    extraPatches = [
+      # Use ssh-keysign from PATH
+      # ssh-keysign is used for host-based authentication, and is designed to be used
+      # as SUID-root program. OpenSSH defaults to referencing it from libexec, which
+      # cannot be made SUID in Nix.
+      ./ssh-keysign-8.5.patch
+    ];
+    extraMeta = {
+      maintainers = with lib.maintainers; [
+        philiptaron
+        numinit
+      ];
+      teams = [ lib.teams.helsinki-systems ];
+    };
+  };
+
   openssh_hpn = common rec {
     pname = "openssh-with-hpn";
     version = "10.2p1";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1d243c105b5e..a7560fc88d1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3612,6 +3612,10 @@ with pkgs;
     etcDir = "/etc/ssh";
   };
 
+  openssh_10_2 = opensshPackages.openssh_10_2.override {
+    etcDir = "/etc/ssh";
+  };
+
   opensshTest = openssh.tests.openssh;
 
   opensshWithKerberos = openssh.override {

From 3dca1c8bc342ce16d7a4de366c6f2ae12bcf8e79 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 17:33:56 +0000
Subject: [PATCH 3322/6226] amp-cli: 0.0.1760546826-g6984fa ->
 0.0.1761583653-gd8c2df

---
 pkgs/by-name/am/amp-cli/package-lock.json | 8 ++++----
 pkgs/by-name/am/amp-cli/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json
index 83d69c2a7c8e..a177c3c17851 100644
--- a/pkgs/by-name/am/amp-cli/package-lock.json
+++ b/pkgs/by-name/am/amp-cli/package-lock.json
@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "@sourcegraph/amp": "^0.0.1760546826-g6984fa"
+        "@sourcegraph/amp": "^0.0.1761583653-gd8c2df"
       }
     },
     "node_modules/@napi-rs/keyring": {
@@ -228,9 +228,9 @@
       }
     },
     "node_modules/@sourcegraph/amp": {
-      "version": "0.0.1760546826-g6984fa",
-      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1760546826-g6984fa.tgz",
-      "integrity": "sha512-QKtu4XFbdi+B9mmkbu64RGPO2gcCtvHFCr3pSojnBQWVMLUjVJpj51dTSNYhBs8pABmJoRA6n8TGNRyaosl7aQ==",
+      "version": "0.0.1761583653-gd8c2df",
+      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1761583653-gd8c2df.tgz",
+      "integrity": "sha512-/sAPMVQkj3sLtuYfv4GAXRBfqrWPHcMXbeWXXqW0+i8GKMsrMIenawwkEzQdCoTH94eZYeS8JlBPde3YFsdDOA==",
       "dependencies": {
         "@napi-rs/keyring": "1.1.9"
       },
diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix
index 425621864f1a..d981668628e3 100644
--- a/pkgs/by-name/am/amp-cli/package.nix
+++ b/pkgs/by-name/am/amp-cli/package.nix
@@ -9,11 +9,11 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "amp-cli";
-  version = "0.0.1760546826-g6984fa";
+  version = "0.0.1761583653-gd8c2df";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
-    hash = "sha256-aEUBTpQMQ2fgSfioRNXvdkKy4eLTw5XqkeSrt5T5498=";
+    hash = "sha256-Q6iBVtSIXoy6r+9/s3GefLq5c9SFRSQoBxUjBlg/wh8=";
   };
 
   postPatch = ''
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
     chmod +x bin/amp-wrapper.js
   '';
 
-  npmDepsHash = "sha256-/s1wZhdwvVGOJoasgBs5eCWcvSuIriWi+bfz/Np8h+Y=";
+  npmDepsHash = "sha256-n8dRIJPTFFhS3aQQKKRdqYcEeHxfpU9XGbeV+2XAVeY=";
 
   propagatedBuildInputs = [
     ripgrep

From 745fc66702bfe112e26e683603cef855dc010c3a Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Mon, 27 Oct 2025 05:49:58 +0800
Subject: [PATCH 3323/6226] fetchFromGitHub: prevent user overwriting url and
 private arguments

---
 pkgs/build-support/fetchgithub/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix
index dfe210f32c41..4a99305d0abb 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/pkgs/build-support/fetchgithub/default.nix
@@ -112,7 +112,8 @@ lib.makeOverridable (
     revWithTag = if tag != null then "refs/tags/${tag}" else rev;
 
     fetcherArgs =
-      (
+      passthruAttrs
+      // (
         if useFetchGit then
           {
             inherit
@@ -152,7 +153,6 @@ lib.makeOverridable (
           }
       )
       // privateAttrs
-      // passthruAttrs
       // {
         inherit name;
       };

From a7023948c060dc4dceba77c1e554ea998c0a53f2 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Mon, 27 Oct 2025 23:30:20 +0800
Subject: [PATCH 3324/6226] fetchgit: take passthru

---
 pkgs/build-support/fetchgit/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 45c7599b1c74..a620f6c09a00 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -60,6 +60,7 @@ lib.makeOverridable (
       # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes)
       # needed for netrcPhase
       netrcImpureEnvVars ? [ ],
+      passthru ? { },
       meta ? { },
       allowedRequisites ? null,
       # fetch all tags after tree (useful for git describe)
@@ -195,7 +196,8 @@ lib.makeOverridable (
         passthru = {
           gitRepoUrl = url;
           inherit tag;
-        };
+        }
+        // passthru;
       }
   )
 )

From 456dd7cece1e3977712d0c2af01a207514f8c05c Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Mon, 27 Oct 2025 23:23:42 +0800
Subject: [PATCH 3325/6226] fetchFromGitHub: take and unshadow passthru

---
 pkgs/build-support/fetchgithub/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix
index 4a99305d0abb..c25c86e6f772 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/pkgs/build-support/fetchgithub/default.nix
@@ -22,6 +22,7 @@ lib.makeOverridable (
     sparseCheckout ? lib.optional (rootDir != "") rootDir,
     githubBase ? "github.com",
     varPrefix ? null,
+    passthru ? { },
     meta ? { },
     ... # For hash agility
   }@args:
@@ -125,6 +126,7 @@ lib.makeOverridable (
               fetchLFS
               ;
             url = gitRepoUrl;
+            inherit passthru;
           }
           // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; }
         else
@@ -149,7 +151,8 @@ lib.makeOverridable (
 
             passthru = {
               inherit gitRepoUrl;
-            };
+            }
+            // passthru;
           }
       )
       // privateAttrs

From f04a4e0951bf65c267bb7acda28d238fa1ee70f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 27 Oct 2025 10:47:53 -0700
Subject: [PATCH 3326/6226] python3Packages.aiosomecomfort: 0.0.34 -> 0.0.35

Diff: https://github.com/mkmer/AIOSomecomfort/compare/0.0.34...0.0.35

Changelog: https://github.com/mkmer/AIOSomecomfort/releases/tag/0.0.35
---
 pkgs/development/python-modules/aiosomecomfort/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiosomecomfort/default.nix b/pkgs/development/python-modules/aiosomecomfort/default.nix
index 43256333cdcb..98ada059e360 100644
--- a/pkgs/development/python-modules/aiosomecomfort/default.nix
+++ b/pkgs/development/python-modules/aiosomecomfort/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "aiosomecomfort";
-  version = "0.0.34";
+  version = "0.0.35";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mkmer";
     repo = "AIOSomecomfort";
     tag = version;
-    hash = "sha256-aHqroDhMYlBF20JNSMZDkfYvio15XTrG+9NANSTC1Fw=";
+    hash = "sha256-zhCpV11nzRpWiCPNgeBfBzXgLM2NAw1p9R0ACD3u/mk=";
   };
 
   build-system = [

From db2758e6d7de1d5cde3f54bc6bc9558dc066a074 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 17:51:43 +0000
Subject: [PATCH 3327/6226] vue-language-server: 3.1.1 -> 3.1.2

---
 pkgs/by-name/vu/vue-language-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix
index a3118cef43b7..2765c73bdb0c 100644
--- a/pkgs/by-name/vu/vue-language-server/package.nix
+++ b/pkgs/by-name/vu/vue-language-server/package.nix
@@ -9,13 +9,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vue-language-server";
-  version = "3.1.1";
+  version = "3.1.2";
 
   src = fetchFromGitHub {
     owner = "vuejs";
     repo = "language-tools";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-/dTNfQdgDFJ8m7t8QnTghE5CGgVm0eGSriocFiEgoCw=";
+    hash = "sha256-IW7lNvUA2y85nl+xu7vZXtIYNrVdsz5/0o7r+S0kEig=";
   };
 
   pnpmDeps = pnpm.fetchDeps {

From 23e280a30db769db31a825155e430f75370f611a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 18:00:03 +0000
Subject: [PATCH 3328/6226] python3Packages.chromadb: 1.2.1 -> 1.2.2

---
 pkgs/development/python-modules/chromadb/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/chromadb/default.nix b/pkgs/development/python-modules/chromadb/default.nix
index 3156cb563e37..06c7acde4293 100644
--- a/pkgs/development/python-modules/chromadb/default.nix
+++ b/pkgs/development/python-modules/chromadb/default.nix
@@ -67,19 +67,19 @@
 
 buildPythonPackage rec {
   pname = "chromadb";
-  version = "1.2.1";
+  version = "1.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chroma-core";
     repo = "chroma";
     tag = version;
-    hash = "sha256-xEXW88iV9lqDOGrnoH0ZsoGMajATShA9HC+G79EdS9s=";
+    hash = "sha256-D8vLkV8T1igOoCgJDiccLytxlXdF0oLJZTQpBsLM7Z0=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-GlF8Fp42ra5d55PIGOS4zOHXPSaIZGI/l8sHz/wyDgo=";
+    hash = "sha256-f5lU1ClKEZjzOAkng1B37d4VmHYzLOP2uMvoN1RFFoo=";
   };
 
   # Can't use fetchFromGitHub as the build expects a zipfile

From 94efa73d58b9f116a7c12102e7c75e72d65c8a04 Mon Sep 17 00:00:00 2001
From: SkohTV <contact@skoh.dev>
Date: Mon, 27 Oct 2025 13:40:38 -0400
Subject: [PATCH 3329/6226] malt: 1.2.6 -> 1.4.1

---
 pkgs/by-name/ma/malt/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/malt/package.nix b/pkgs/by-name/ma/malt/package.nix
index f7919e15673a..c5046ead52c0 100644
--- a/pkgs/by-name/ma/malt/package.nix
+++ b/pkgs/by-name/ma/malt/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "malt";
-  version = "1.2.6";
+  version = "1.4.1";
 
   src = fetchFromGitHub {
     owner = "memtt";
     repo = "malt";
     rev = "v${version}";
-    sha256 = "sha256-Hq6XDxcjH5ronprnV1CwumGqBg9RXYpJ+WANqoBA2/c=";
+    sha256 = "sha256-4lCAEk/b8APuOo+x/kGSTg7vFSBZf/VBuSMDM7o5sts=";
   };
 
   postPatch = ''
@@ -26,6 +26,10 @@ stdenv.mkDerivation rec {
       src/integration/malt-{webview,passwd}.sh.in
   '';
 
+  cmakeFlags = [
+    (lib.cmakeBool "ENABLE_JEMALLOC" false)
+  ];
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     libelf
@@ -36,7 +40,7 @@ stdenv.mkDerivation rec {
     description = "Memory tool to find where you allocate your memory";
     homepage = "https://github.com/memtt/malt";
     license = licenses.cecill-c;
-    maintainers = [ ];
+    maintainers = with maintainers; [ skohtv ];
     platforms = platforms.linux;
   };
 }

From 61b15f899f18b4c9dd5bb7af1e6b02aeeb8221fd Mon Sep 17 00:00:00 2001
From: Farid Zakaria <farid.m.zakaria@gmail.com>
Date: Sun, 26 Oct 2025 15:53:48 -0700
Subject: [PATCH 3330/6226] double-conversion: add pkg-config and testing

* Add pkg-config generation
* Enable testing
---
 pkgs/by-name/do/double-conversion/package.nix | 40 +++++++++++++++----
 1 file changed, 33 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/do/double-conversion/package.nix b/pkgs/by-name/do/double-conversion/package.nix
index a377165483f0..30e445519ee1 100644
--- a/pkgs/by-name/do/double-conversion/package.nix
+++ b/pkgs/by-name/do/double-conversion/package.nix
@@ -4,17 +4,19 @@
   fetchFromGitHub,
   fetchpatch,
   cmake,
-  enableStatic ? stdenv.hostPlatform.isStatic,
+  ninja,
+  ctestCheckHook,
+  testers,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "double-conversion";
   version = "3.3.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "double-conversion";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-M80H+azCzQYa4/gBLWv5GNNhEuHsH7LbJ/ajwmACnrM=";
   };
 
@@ -30,22 +32,46 @@ stdenv.mkDerivation rec {
       url = "https://github.com/google/double-conversion/commit/0604b4c18815aadcf7f4b78dfa6bfcb91a634ed7.patch";
       hash = "sha256-cJBp1ou1O/bMQ/7kvcX52dWbUdhmPfQ9aWmEhQdyhis=";
     })
+    (fetchpatch {
+      name = "double-conversion-add-pkg-config.patch";
+      url = "https://github.com/google/double-conversion/commit/ddfd18c58ecc32fc74afc1083bb8774240b54efb.patch";
+      hash = "sha256-/pKCL19vS8fNwCm27yTNP+32ApHTH5dEGpnsMI11Lf4=";
+    })
   ];
 
-  nativeBuildInputs = [ cmake ];
+  outputs = [
+    "out"
+    "dev"
+  ];
 
-  cmakeFlags = lib.optional (!enableStatic) "-DBUILD_SHARED_LIBS=ON";
+  nativeBuildInputs = [
+    cmake
+    ninja
+    ctestCheckHook
+  ];
+
+  doCheck = true;
+
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_TESTING" true)
+    (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries)
+  ];
 
   # Case sensitivity issue
   preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
     rm BUILD
   '';
 
+  passthru = {
+    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
+  };
+
   meta = with lib; {
+    pkgConfigModules = [ "double-conversion" ];
     description = "Binary-decimal and decimal-binary routines for IEEE doubles";
     homepage = "https://github.com/google/double-conversion";
     license = licenses.bsd3;
     platforms = platforms.unix ++ platforms.windows;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ fzakaria ];
   };
-}
+})

From 61943779c4268749cdefe2e82fa06b35ea913b62 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Mon, 27 Oct 2025 11:13:45 -0700
Subject: [PATCH 3331/6226] python3Packages.kaleido: remove sbcl dependency
 (!!!) (minimal)

This package was introduced in #339136, which attracted quite a bit of
conversation. I don't have the energy to go through the conversations
but it looks like some low-hanging fruit got overlooked. This package
depends on `sbcl` (!!) in order to get `fontconfig` files for `dejavu`
(!!!), which is ... already in the default `pkgs.fontconfig` config
files.

This is a stripped-down version of #454818 to (hopefully) expedite its
merge.
---
 pkgs/development/python-modules/kaleido/default.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/kaleido/default.nix b/pkgs/development/python-modules/kaleido/default.nix
index a155dd55bf2b..fcaf7d5adaac 100644
--- a/pkgs/development/python-modules/kaleido/default.nix
+++ b/pkgs/development/python-modules/kaleido/default.nix
@@ -15,7 +15,6 @@
   makeWrapper,
   nspr,
   nss,
-  sbclPackages,
   sqlite,
 }:
 
@@ -59,7 +58,6 @@ buildPythonPackage rec {
     libGL
     nspr
     nss
-    sbclPackages.cl-dejavu
     sqlite
   ];
 
@@ -82,15 +80,7 @@ buildPythonPackage rec {
     rm -rf $out/${python.sitePackages}/kaleido/executable/etc/fonts
     mkdir -p $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d
     ln -s ${fontconfig.out}/etc/fonts/fonts.conf $out/${python.sitePackages}/kaleido/executable/etc/fonts/
-    ls -s ${fontconfig.out}/etc/fonts/conf.d/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/
-    ln -s ${sbclPackages.cl-dejavu}/dejavu-fonts-ttf-2.37/fontconfig/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/
-
-    # Replace bundled fonts with nixpkgs-packaged fonts
-    # Currently this causes an issue where the fonts aren't found. I'm not sure why, so I'm leaving this commented out for now.
-    #rm -rf $out/${python.sitePackages}/kaleido/executable/xdg/fonts
-    #mkdir -p $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato
-    #ln -s ${dejavu_fonts}/share/fonts/truetype/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/dejavu/
-    #ln -s ${lato}/share/fonts/lato/* $out/${python.sitePackages}/kaleido/executable/xdg/fonts/truetype/lato/
+    ln -s ${fontconfig.out}/etc/fonts/conf.d/* $out/${python.sitePackages}/kaleido/executable/etc/fonts/conf.d/
   ''
   + lib.optionalString (!stdenv.hostPlatform.isDarwin) ''
     # Replace bundled swiftshader with libGL

From 264ca123977512396408e9ccd69fc5326e7dac5b Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Mon, 20 Oct 2025 17:16:47 +0200
Subject: [PATCH 3332/6226] maintainers/scripts/feature-freeze-teams.pl: Use
 GitHub CLI

Makes it much easier and less involved to run
---
 maintainers/scripts/feature-freeze-teams.pl | 39 ++++++---------------
 1 file changed, 10 insertions(+), 29 deletions(-)

diff --git a/maintainers/scripts/feature-freeze-teams.pl b/maintainers/scripts/feature-freeze-teams.pl
index 7d7574837ed7..4fdd8aab8f2b 100755
--- a/maintainers/scripts/feature-freeze-teams.pl
+++ b/maintainers/scripts/feature-freeze-teams.pl
@@ -1,11 +1,11 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i perl -p perl -p perlPackages.JSON perlPackages.LWPUserAgent perlPackages.LWPProtocolHttps perlPackages.TermReadKey
+#!nix-shell -i perl -p perl -p perlPackages.JSON github-cli
 
 # This script generates a list of teams to ping for the Feature Freeze announcement on Discourse.
 # It's intended to be used by Release Managers before creating such posts.
 #
-# The script interactively reads a GitHub username and a corresponding GitHub Personal Access token.
-# This is required to access the GitHub Teams API so the token needs at least the read:org privilege.
+# The script uses the credentials from the GitHub CLI (gh)
+# This is required to access the GitHub Teams API so it needs at least the read:org privilege.
 
 ## no critic (InputOutput::RequireCheckedSyscalls, InputOutput::ProhibitBacktickOperators)
 use strict;
@@ -14,39 +14,21 @@ use Carp;
 use Cwd 'abs_path';
 use File::Basename;
 use JSON qw(decode_json);
-use LWP::UserAgent;
-use Term::ReadKey qw(ReadLine ReadMode);
 
 sub github_team_members {
-    my ($team_name, $username, $token) = @_;
+    my ($team_name) = @_;
     my @ret;
 
-    my $req = HTTP::Request->new('GET', "https://api.github.com/orgs/NixOS/teams/$team_name/members", [ 'Accept' => 'application/vnd.github.v3+json' ]);
-    $req->authorization_basic($username, $token);
-    my $response = LWP::UserAgent->new->request($req);
-
-    if ($response->is_success) {
-        my $content = decode_json($response->decoded_content);
-        foreach (@{$content}) {
-            push @ret, $_->{'login'};
-        }
-    } else {
-        print {*STDERR} "!! Requesting members of GitHub Team '$team_name' failed: " . $response->status_line;
+    my $content = decode_json(`gh api orgs/NixOS/teams/$team_name/members`);
+    foreach (@{$content}) {
+        push @ret, $_->{'login'};
     }
 
     return \@ret;
 }
 
-# Read GitHub credentials
-print {*STDERR} 'GitHub username: ';
-my $github_user = ReadLine(0);
-ReadMode('noecho');
-print {*STDERR} 'GitHub personal access token (no echo): ';
-my $github_token = ReadLine(0);
-ReadMode('restore');
-print {*STDERR} "\n";
-chomp $github_user;
-chomp $github_token;
+`gh auth status` or die "`gh` comes from `pkgs.github-cli`, or in one command:
+nix-shell -p github-cli --run 'gh auth login'\n";
 
 # Read nix output
 my $nix_version = `nix --version`;
@@ -60,7 +42,6 @@ if ($nix_version =~ m/2[.]3[.]/msx) {
 my $data = decode_json($out);
 
 # Process teams
-print {*STDERR} "\n";
 while (my ($team_nix_key, $team_config) = each %{$data}) {
     # Ignore teams that don't want to be or can't be pinged
     if (not defined $team_config->{enableFeatureFreezePing} or not $team_config->{enableFeatureFreezePing}) {
@@ -76,7 +57,7 @@ while (my ($team_nix_key, $team_config) = each %{$data}) {
     my @github_members;
     if (defined $team_config->{github}) {
         print {*STDERR} " \@NixOS/$team_config->{github}";
-        push @github_members, @{github_team_members($team_config->{github}, $github_user, $github_token)};
+        push @github_members, @{github_team_members($team_config->{github})};
     }
     my %github_members = map { $_ => 1 } @github_members;
     # Members

From e4a1af0847d36a9b8a3c3ead3950c634003d8074 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Mon, 20 Oct 2025 17:19:00 +0200
Subject: [PATCH 3333/6226] maintainers/scripts/feature-freeze-teams.pl: Output
 result to stdout

---
 maintainers/scripts/feature-freeze-teams.pl | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/maintainers/scripts/feature-freeze-teams.pl b/maintainers/scripts/feature-freeze-teams.pl
index 4fdd8aab8f2b..2854eca5655b 100755
--- a/maintainers/scripts/feature-freeze-teams.pl
+++ b/maintainers/scripts/feature-freeze-teams.pl
@@ -52,11 +52,11 @@ while (my ($team_nix_key, $team_config) = each %{$data}) {
         next;
     }
     #  Team name
-    print {*STDERR} "$team_config->{shortName}:";
+    print {*STDOUT} "$team_config->{shortName}:";
     # GitHub Teams
     my @github_members;
     if (defined $team_config->{github}) {
-        print {*STDERR} " \@NixOS/$team_config->{github}";
+        print {*STDOUT} " \@NixOS/$team_config->{github}";
         push @github_members, @{github_team_members($team_config->{github})};
     }
     my %github_members = map { $_ => 1 } @github_members;
@@ -69,9 +69,9 @@ while (my ($team_nix_key, $team_config) = each %{$data}) {
             if (defined $github_members{$github_handle}) {
                 next;
             }
-            print {*STDERR} " \@$github_handle";
+            print {*STDOUT} " \@$github_handle";
         }
     }
 
-    print {*STDERR} "\n";
+    print {*STDOUT} "\n";
 }

From f3f9a335b5496ff8268258ea92e2093f1d5e5807 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Mon, 20 Oct 2025 17:29:18 +0200
Subject: [PATCH 3334/6226] lib.teams: Remove unused teams

---
 maintainers/team-list.nix | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 89fcb5dc007e..05618888e41f 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -1134,13 +1134,6 @@ with lib.maintainers;
     shortName = "Red Code Labs";
   };
 
-  release = {
-    members = [ ];
-    github = "nixos-release-managers";
-    scope = "Manage the current nixpkgs/NixOS release.";
-    shortName = "Release";
-  };
-
   rocm = {
     members = [
       Flakebi
@@ -1153,13 +1146,6 @@ with lib.maintainers;
     shortName = "ROCm";
   };
 
-  ruby = {
-    members = [ ];
-    scope = "Maintain the Ruby interpreter and related packages.";
-    shortName = "Ruby";
-    enableFeatureFreezePing = true;
-  };
-
   rust = {
     members = [
       figsoda

From 7ff3f688eef44651c0dc3cd9a30e73b79699a641 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Mon, 20 Oct 2025 17:30:23 +0200
Subject: [PATCH 3335/6226] lib.teams: Remove dummy Nixpkgs committers team and
 hardcode into feature freeze script

There's no reason this needs to be exposed under `lib.teams`
---
 maintainers/scripts/feature-freeze-teams.pl | 2 ++
 maintainers/team-list.nix                   | 9 ---------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/maintainers/scripts/feature-freeze-teams.pl b/maintainers/scripts/feature-freeze-teams.pl
index 2854eca5655b..4b1dd409b794 100755
--- a/maintainers/scripts/feature-freeze-teams.pl
+++ b/maintainers/scripts/feature-freeze-teams.pl
@@ -75,3 +75,5 @@ while (my ($team_nix_key, $team_config) = each %{$data}) {
 
     print {*STDOUT} "\n";
 }
+
+print {*STDOUT} "Everyone else: \@NixOS/nixpkgs-committers\n";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 05618888e41f..e1399498a862 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -418,15 +418,6 @@ with lib.maintainers;
     enableFeatureFreezePing = true;
   };
 
-  # Dummy group for the "everyone else" section
-  feature-freeze-everyone-else = {
-    members = [ ];
-    github = "nixpkgs-committers";
-    scope = "Dummy team for the #everyone else' section during feture freezes, not to be used as package maintainers!";
-    shortName = "Everyone else";
-    enableFeatureFreezePing = true;
-  };
-
   flutter = {
     members = [
       mkg20001

From ff336e2ecdbc377b6fcaad25171d7d5fd6209839 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Sat, 11 Oct 2025 02:23:44 +0200
Subject: [PATCH 3336/6226] lib.teams: Some changes based on current GitHub
 state

Including:
- Removing a `.github` for a team that doesn't exist
- Adding people to `lib.teams` that are part of the GitHub team but were never
  part of the team in `lib.teams`
- Adjusting capitalisation of a linked GitHub team

While there's more differences, all others should be done on the GitHub
side, because it's things like adding/removing team members that have
added/removed themselves to/from `lib.teams` in the past.
---
 maintainers/team-list.nix | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index e1399498a862..ebfd4d5c43d3 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -237,7 +237,6 @@ with lib.maintainers;
     members = [ floriansanderscc ];
     scope = "Maintain Clever Cloud related packages.";
     shortName = "CleverCloud";
-    github = "CleverCloud";
   };
 
   cloudposse = {
@@ -367,7 +366,11 @@ with lib.maintainers;
   };
 
   docs = {
-    members = [ ];
+    members = [
+      alejandrosame
+      wamirez
+      hsjobeki
+    ];
     github = "documentation-team";
     scope = "Maintain nixpkgs/NixOS documentation and tools for building it.";
     shortName = "Docs";
@@ -634,6 +637,7 @@ with lib.maintainers;
       fliegendewurst
       infinidoge
       tomodachi94
+      msgilligan
     ];
     shortName = "Java";
     scope = "Maintainers of the Nixpkgs Java ecosystem (JDK, JVM, Java, Gradle, Maven, Ant, and adjacent projects)";
@@ -802,6 +806,13 @@ with lib.maintainers;
   };
 
   lua = {
+    members = [
+      raskin
+      khaneliman
+      teto
+      arobyn
+      scoder12
+    ];
     github = "lua";
     scope = "Maintain the lua ecosystem.";
     shortName = "lua";
@@ -987,6 +998,8 @@ with lib.maintainers;
     members = [
       alizter
       redianthus
+      romildo
+      ulrikstrid
     ];
     github = "ocaml";
     scope = "Maintain the OCaml compiler and package set.";
@@ -1096,6 +1109,11 @@ with lib.maintainers;
       nickcao
       SuperSandro2000
       ttuegel
+      fridh
+      shamilton
+      bkchr
+      peterhoeg
+      nyanloutre
     ];
     github = "qt-kde";
     scope = "Maintain the Qt framework, KDE application suite, Plasma desktop environment and related projects.";
@@ -1169,7 +1187,7 @@ with lib.maintainers;
       marcin-serwin
       pbsds
     ];
-    github = "SDL";
+    github = "sdl";
     scope = "Maintain core SDL libraries.";
     shortName = "SDL";
     enableFeatureFreezePing = true;

From c0c66842579a9606d5e2eced724bad794d7c2f1d Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Sat, 11 Oct 2025 02:24:46 +0200
Subject: [PATCH 3337/6226] workflows/team-sync: init

Creates a team sync workflow that pushes the current state of teams to a
JSON file, which can then be ingested by `lib.teams` to expose member
lists.

Co-Authored-By: Alexander Bantyev <alexander.bantyev@tweag.io>
---
 .github/workflows/team.yml    | 81 ++++++++++++++++++++++++++++++++++
 ci/github-script/get-teams.js | 82 +++++++++++++++++++++++++++++++++++
 ci/github-script/run          | 12 +++++
 3 files changed, 175 insertions(+)
 create mode 100644 .github/workflows/team.yml
 create mode 100755 ci/github-script/get-teams.js

diff --git a/.github/workflows/team.yml b/.github/workflows/team.yml
new file mode 100644
index 000000000000..099ea882aa7c
--- /dev/null
+++ b/.github/workflows/team.yml
@@ -0,0 +1,81 @@
+name: Teams
+
+on:
+  schedule:
+    # Every Tuesday at 19:42 (randomly chosen)
+    - cron: '42 19 * * 1'
+
+  # Allows manual trigger
+  workflow_dispatch:
+
+permissions: {}
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  sync:
+    runs-on: ubuntu-24.04-arm
+    steps:
+      - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        id: team-token
+        with:
+          app-id: ${{ vars.OWNER_APP_ID }}
+          private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
+          permission-administration: read
+          permission-members: read
+      - name: Fetch source
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+          sparse-checkout: |
+            ci/github-script
+            maintainers/github-teams.json
+      - name: Install dependencies
+        run: npm install bottleneck
+      - name: Synchronise teams
+        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        with:
+          github-token: ${{ steps.team-token.outputs.token }}
+          script: |
+            require('./ci/github-script/get-teams.js')({
+              github,
+              context,
+              core,
+              outFile: "maintainers/github-teams.json"
+            })
+
+      # Use a GitHub App to create the PR so that CI gets triggered
+      - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        id: sync-token
+        with:
+          app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
+          private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
+          permission-contents: write
+          permission-pull-requests: write
+      - name: Get GitHub App User Git String
+        id: user
+        env:
+          GH_TOKEN: ${{ steps.sync-token.outputs.token }}
+          APP_SLUG: ${{ steps.sync-token.outputs.app-slug }}
+        run: |
+          name="${APP_SLUG}[bot]"
+          userId=$(gh api "/users/$name" --jq .id)
+          email="$userId+$name@users.noreply.github.com"
+          echo "git-string=$name <$email>" >> "$GITHUB_OUTPUT"
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
+        with:
+          token: ${{ steps.sync-token.outputs.token }}
+          add-paths: maintainers/github-teams.json
+          author: ${{ steps.user.outputs.git-string }}
+          committer: ${{ steps.user.outputs.git-string }}
+          commit-message: "maintainers/github-teams.json: Automated sync"
+          branch: github-team-sync
+          title: "maintainers/github-teams.json: Automated sync"
+          body: |
+            This is an automated PR to sync the GitHub teams with access to this repository to the `lib.teams` list.
+
+            This PR can be merged without taking any further action.
+
diff --git a/ci/github-script/get-teams.js b/ci/github-script/get-teams.js
new file mode 100755
index 000000000000..9b6d3333f91f
--- /dev/null
+++ b/ci/github-script/get-teams.js
@@ -0,0 +1,82 @@
+const excludeTeams = [
+  /^voters.*$/,
+  /^nixpkgs-maintainers$/,
+  /^nixpkgs-committers$/,
+]
+
+module.exports = async ({ github, context, core, outFile }) => {
+  const withRateLimit = require('./withRateLimit.js')
+  const { writeFileSync } = require('node:fs')
+  const result = {}
+  await withRateLimit({ github, core }, async (_stats) => {
+    /// Turn an Array of users into an Object, mapping user.login -> user.id
+    function makeUserSet(users) {
+      // Sort in-place and build result by mutation
+      users.sort((a, b) => (a.login > b.login ? 1 : -1))
+
+      return users.reduce((acc, user) => {
+        acc[user.login] = user.id
+        return acc
+      }, {})
+    }
+
+    /// Process a list of teams and append to the result variable
+    async function processTeams(teams) {
+      for (const team of teams) {
+        core.notice(`Processing team ${team.slug}`)
+        if (!excludeTeams.some((regex) => team.slug.match(regex))) {
+          const members = makeUserSet(
+            await github.paginate(github.rest.teams.listMembersInOrg, {
+              org: context.repo.owner,
+              team_slug: team.slug,
+              role: 'member',
+            }),
+          )
+          const maintainers = makeUserSet(
+            await github.paginate(github.rest.teams.listMembersInOrg, {
+              org: context.repo.owner,
+              team_slug: team.slug,
+              role: 'maintainer',
+            }),
+          )
+          result[team.slug] = {
+            description: team.description,
+            id: team.id,
+            maintainers,
+            members,
+            name: team.name,
+          }
+        }
+        await processTeams(
+          await github.paginate(github.rest.teams.listChildInOrg, {
+            org: context.repo.owner,
+            team_slug: team.slug,
+          }),
+        )
+      }
+    }
+
+    const teams = await github.paginate(github.rest.repos.listTeams, {
+      owner: context.repo.owner,
+      repo: context.repo.repo,
+    })
+
+    await processTeams(teams)
+  })
+
+  // Sort the teams by team name
+  const sorted = Object.keys(result)
+    .sort()
+    .reduce((acc, key) => {
+      acc[key] = result[key]
+      return acc
+    }, {})
+
+  const json = `${JSON.stringify(sorted, null, 2)}\n`
+
+  if (outFile) {
+    writeFileSync(outFile, json)
+  } else {
+    console.log(json)
+  }
+}
diff --git a/ci/github-script/run b/ci/github-script/run
index 1d974cf5355f..2d5121b75b7e 100755
--- a/ci/github-script/run
+++ b/ci/github-script/run
@@ -83,4 +83,16 @@ program
     }
   })
 
+program
+  .command('get-teams')
+  .description('Fetch the list of teams with GitHub and output it to a file')
+  .argument('<owner>', 'Owner of the GitHub repository to label (Example: NixOS)')
+  .argument('<repo>', 'Name of the GitHub repository to label (Example: nixpkgs)')
+  .argument('[outFile]', 'Path to the output file (Example: github-teams.json). If not set, prints to stdout')
+  .action(async (owner, repo, outFile, options) => {
+    const getTeams = (await import('./get-teams.js')).default
+    // TODO: Refactor this file so we don't need to pass a PR
+    await run(getTeams, owner, repo, undefined, { ...options, outFile })
+  })
+
 await program.parse()

From 22406446cd35069f6d1fa3de854dc1fc90c936ee Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Sat, 11 Oct 2025 02:25:17 +0200
Subject: [PATCH 3338/6226] maintainers/github-teams.json: Automated sync

---
 ci/OWNERS                     |   1 +
 maintainers/github-teams.json | 980 ++++++++++++++++++++++++++++++++++
 2 files changed, 981 insertions(+)
 create mode 100644 maintainers/github-teams.json

diff --git a/ci/OWNERS b/ci/OWNERS
index c21cb14fe11e..d1d215935b1f 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -32,6 +32,7 @@
 /lib/asserts.nix            @infinisil @hsjobeki @Profpatsch
 /lib/path/*                 @infinisil @hsjobeki
 /lib/fileset                @infinisil @hsjobeki
+/maintainers/github-teams.json @infinisil
 ## Standard environment–related libraries
 /lib/customisation.nix      @alyssais @NixOS/stdenv
 /lib/derivations.nix        @alyssais @NixOS/stdenv
diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json
new file mode 100644
index 000000000000..1b6707fedff1
--- /dev/null
+++ b/maintainers/github-teams.json
@@ -0,0 +1,980 @@
+{
+  "acme": {
+    "description": "Maintain ACME-related packages and modules.",
+    "id": 3806126,
+    "maintainers": {},
+    "members": {
+      "arianvp": 628387,
+      "emilazy": 18535642,
+      "m1cr0man": 3044438
+    },
+    "name": "ACME"
+  },
+  "agda": {
+    "description": "Maintain Agda-related packages and modules",
+    "id": 14416551,
+    "maintainers": {
+      "alexarice": 17208985,
+      "ncfavier": 4323933,
+      "turion": 303489
+    },
+    "members": {
+      "phijor": 10487782
+    },
+    "name": "agda"
+  },
+  "android": {
+    "description": "Maintain Android-related tooling in nixpkgs",
+    "id": 11821955,
+    "maintainers": {
+      "RossComputerGuy": 19699320,
+      "numinit": 369111
+    },
+    "members": {
+      "JohnRTitor": 50095635,
+      "adrian-gierakowski": 330177,
+      "hadilq": 5190539
+    },
+    "name": "Android"
+  },
+  "bazel": {
+    "description": "Maintenance of https://bazel.build/ and related packages",
+    "id": 5468470,
+    "maintainers": {
+      "Profpatsch": 3153638
+    },
+    "members": {
+      "aherrmann": 732652,
+      "avdv": 3471749,
+      "ethercrow": 222467,
+      "groodt": 343415,
+      "kalbasit": 87115,
+      "mboes": 51356,
+      "uri-canva": 33242106
+    },
+    "name": "Bazel"
+  },
+  "beam": {
+    "description": "Maintain BEAM-related packages and modules.",
+    "id": 4502493,
+    "maintainers": {
+      "happysalada": 5317234
+    },
+    "members": {
+      "Br1ght0ne": 12615679,
+      "DianaOlympos": 15774340,
+      "adamcstephens": 2071575,
+      "ankhers": 750786,
+      "gleber": 33185,
+      "yurrriq": 1866448
+    },
+    "name": "Beam"
+  },
+  "bootstrapping": {
+    "description": "coordinates efforts towards bootstrappable builds (see https://bootstrappable.org/)",
+    "id": 9141350,
+    "maintainers": {
+      "zeuner": 2545850
+    },
+    "members": {
+      "philiptaron": 43863
+    },
+    "name": "bootstrapping"
+  },
+  "categorization": {
+    "description": "Maintain the categorization system in Nixpkgs, per RFC 0146. This team has authority over all categorization issues in Nixpkgs. Matrix: https://matrix.to/#/%23nixpkgs-categorization:matrix.org",
+    "id": 11723948,
+    "maintainers": {
+      "7c6f434c": 1891350,
+      "Aleksanaa": 42209822,
+      "GetPsyched": 43472218,
+      "Lyndeno": 13490857,
+      "SigmaSquadron": 174749595,
+      "fgaz": 8182846,
+      "natsukium": 25083790,
+      "philiptaron": 43863,
+      "pyrotelekinetic": 29682759,
+      "tomodachi94": 68489118
+    },
+    "members": {},
+    "name": "Categorization"
+  },
+  "channel-updaters": {
+    "description": "Users who can update the Nixpkgs/NixOS channels",
+    "id": 3475569,
+    "maintainers": {},
+    "members": {
+      "nixos-channel-bot": 56695723
+    },
+    "name": "channel-updaters"
+  },
+  "coq": {
+    "description": "Coq proof assistant and package maintainers",
+    "id": 7617261,
+    "maintainers": {
+      "Alizter": 8614547,
+      "Zimmi48": 1108325,
+      "vbgl": 2612464
+    },
+    "members": {},
+    "name": "Coq"
+  },
+  "cosmic": {
+    "description": "Maintain the COSMIC DE and related packages.",
+    "id": 12734494,
+    "maintainers": {
+      "alyssais": 2768870,
+      "nyabinary": 97130632
+    },
+    "members": {
+      "HeitorAugustoLN": 44377258,
+      "Pandapip1": 45835846,
+      "a-kenji": 65275785,
+      "ahoneybun": 4884946,
+      "drakon64": 6444703,
+      "griffi-gh": 45996170,
+      "michaelBelsanti": 62124625,
+      "thefossguy": 44400303
+    },
+    "name": "COSMIC"
+  },
+  "crystal-lang": {
+    "description": "The Crystal Lang eco-system",
+    "id": 3806663,
+    "maintainers": {
+      "peterhoeg": 722550
+    },
+    "members": {
+      "Br1ght0ne": 12615679,
+      "manveru": 3507
+    },
+    "name": "crystal-lang"
+  },
+  "cuda-maintainers": {
+    "description": "All things CUDA and deep learning!",
+    "id": 5704451,
+    "maintainers": {
+      "ConnorBaker": 3880346,
+      "SomeoneSerge": 9720532,
+      "samuela": 226872
+    },
+    "members": {
+      "GaetanLepage": 33058747
+    },
+    "name": "cuda-maintainers"
+  },
+  "darwin-core": {
+    "description": "Maintains core platform support and packages for macOS and other Apple platforms.",
+    "id": 11265438,
+    "maintainers": {
+      "emilazy": 18535642
+    },
+    "members": {
+      "reckenrode": 7413633,
+      "toonn": 1486805
+    },
+    "name": "darwin-core"
+  },
+  "darwin-maintainers": {
+    "description": "Improve Darwin-support across Nixpkgs and help maintainers without access to Darwin hardware. Apply to join through https://github.com/NixOS/nixpkgs/issues/323144 to keep the process transparent.",
+    "id": 2385202,
+    "maintainers": {
+      "toonn": 1486805
+    },
+    "members": {
+      "0xMRTT": 105598867,
+      "21CSM": 81891917,
+      "Aleksanaa": 42209822,
+      "CorbanR": 1918683,
+      "Emin017": 99674037,
+      "Et7f3": 29592775,
+      "FlameFlag": 57304299,
+      "Guanran928": 68757440,
+      "LnL7": 689294,
+      "Mastermindaxe": 33257997,
+      "Moraxyc": 69713071,
+      "Prince213": 25235514,
+      "Samasaur1": 30577766,
+      "Sciencentistguy": 4983935,
+      "Steven0351": 24440751,
+      "afh": 16507,
+      "azuwis": 9315,
+      "booxter": 90200,
+      "carlossless": 498906,
+      "cideM": 4246921,
+      "cidkidnix": 67574902,
+      "copumpkin": 2623,
+      "devusb": 4951663,
+      "domenkozar": 126339,
+      "donn": 12652988,
+      "dwt": 57199,
+      "eliandoran": 21236836,
+      "emilazy": 18535642,
+      "ethancedwards8": 60861925,
+      "fiddlerwoaroof": 808745,
+      "frogamic": 10263813,
+      "gador": 1883533,
+      "griff": 4368,
+      "groodt": 343415,
+      "gshpychka": 23005347,
+      "hexagonal-sun": 222664,
+      "heywoodlh": 18178614,
+      "iedame": 60272,
+      "isabelroses": 71222764,
+      "jonhermansen": 660911,
+      "juliusrickert": 5007494,
+      "jwiegley": 8460,
+      "kashw2": 15855440,
+      "kevingriffin": 209729,
+      "khaneliman": 1778670,
+      "kloenk": 12898828,
+      "konradmalik": 13033392,
+      "kubukoz": 894884,
+      "lutzmor": 9321736,
+      "magistau": 43097806,
+      "maljub01": 350635,
+      "martinjlowm": 110860,
+      "matteo-pacini": 3139724,
+      "matthewbauer": 19036,
+      "mexisme": 329349,
+      "mikroskeem": 3490861,
+      "mirkolenz": 5160954,
+      "mstone": 412508,
+      "n8henrie": 1234956,
+      "niklaskorz": 590517,
+      "ofalvai": 1694986,
+      "pasqui23": 6931743,
+      "prusnak": 42201,
+      "pupbrained": 33522919,
+      "reckenrode": 7413633,
+      "ryand56": 22267679,
+      "samrose": 115821,
+      "sarahec": 11277967,
+      "shaunsingh": 71196912,
+      "sikmir": 688044,
+      "siraben": 8219659,
+      "siriobalmelli": 23038812,
+      "starcraft66": 1858154,
+      "stepbrobd": 81826728,
+      "stephank": 89950,
+      "stephenstubbs": 18033664,
+      "t-monaghan": 62273348,
+      "thefloweringash": 42933,
+      "tricktron": 16036882,
+      "uncenter": 47499684,
+      "uri-canva": 33242106,
+      "usertam": 22500027,
+      "veprbl": 245573,
+      "viraptor": 188063,
+      "wegank": 9713184,
+      "willcohen": 5185341,
+      "willjr": 5904828,
+      "wldhx": 15619766,
+      "yeongsheng-tan": 809030,
+      "youhaveme9": 58213083,
+      "yzx9": 41458459,
+      "zachcoyle": 908716
+    },
+    "name": "darwin-maintainers"
+  },
+  "documentation-team": {
+    "description": "https://nixos.org/community/teams/documentation",
+    "id": 6590023,
+    "maintainers": {
+      "alejandrosame": 1078000,
+      "fricklerhandwerk": 6599296
+    },
+    "members": {
+      "hsjobeki": 50398876,
+      "wamirez": 24505474
+    },
+    "name": "Documentation Team"
+  },
+  "dotnet": {
+    "description": "Maintain the .NET ecosystem in nixpkgs",
+    "id": 8173604,
+    "maintainers": {
+      "corngood": 3077118,
+      "mdarocha": 11572618
+    },
+    "members": {
+      "GGG-KILLER": 5892127,
+      "IvarWithoutBones": 41924494,
+      "JamieMagee": 1358764,
+      "anpin": 6060545,
+      "meenzen": 22305878,
+      "raphaelr": 121178
+    },
+    "name": "Dotnet"
+  },
+  "emacs": {
+    "description": "",
+    "id": 2516946,
+    "maintainers": {
+      "jian-lin": 75130626,
+      "matthewbauer": 19036
+    },
+    "members": {
+      "AndersonTorres": 5954806,
+      "adisbladis": 63286,
+      "panchoh": 471059,
+      "ttuegel": 563054
+    },
+    "name": "emacs"
+  },
+  "enlightenment": {
+    "description": "Maintainers of the Enlightenment Desktop Environment",
+    "id": 5937665,
+    "maintainers": {
+      "romildo": 1217934
+    },
+    "members": {},
+    "name": "Enlightenment"
+  },
+  "exotic-platform-maintainers": {
+    "description": "",
+    "id": 3727378,
+    "maintainers": {
+      "Ericson2314": 1055245,
+      "matthewbauer": 19036
+    },
+    "members": {
+      "aaronjanse": 16829510,
+      "alyssais": 2768870,
+      "emilytrau": 13267947,
+      "minijackson": 1200507,
+      "r-burns": 52847440,
+      "siraben": 8219659,
+      "sternenseemann": 3154475
+    },
+    "name": "exotic-platform-maintainers"
+  },
+  "flutter": {
+    "description": "",
+    "id": 7718198,
+    "maintainers": {
+      "RossComputerGuy": 19699320
+    },
+    "members": {
+      "FlafyDev": 44374434,
+      "hacker1024": 20849728,
+      "mkg20001": 7735145
+    },
+    "name": "Flutter"
+  },
+  "freedesktop": {
+    "description": "Maintain Freedesktop.org packages for graphical desktop.",
+    "id": 3806136,
+    "maintainers": {},
+    "members": {
+      "jtojnar": 705123
+    },
+    "name": "Freedesktop"
+  },
+  "geospatial": {
+    "description": "Maintain geospatial packages",
+    "id": 7084621,
+    "maintainers": {
+      "imincik": 476346
+    },
+    "members": {
+      "das-g": 97746,
+      "nh2": 399535,
+      "nialov": 47318483,
+      "sikmir": 688044,
+      "willcohen": 5185341
+    },
+    "name": "Geospatial"
+  },
+  "gitlab": {
+    "description": "Maintain GitLab-related packages and modules",
+    "id": 8157777,
+    "maintainers": {
+      "leona-ya": 11006031,
+      "xanderio": 6298052,
+      "yayayayaka": 73759599
+    },
+    "members": {
+      "talyz": 63433
+    },
+    "name": "GitLab"
+  },
+  "gnome": {
+    "description": "Maintain GNOME desktop environment and platform.",
+    "id": 3806133,
+    "maintainers": {},
+    "members": {
+      "hedning": 71978,
+      "jtojnar": 705123
+    },
+    "name": "GNOME"
+  },
+  "golang": {
+    "description": "",
+    "id": 4020424,
+    "maintainers": {
+      "Mic92": 96200,
+      "kalbasit": 87115,
+      "zowoq": 59103226
+    },
+    "members": {
+      "katexochen": 49727155,
+      "mfrw": 4929861,
+      "qbit": 68368
+    },
+    "name": "golang"
+  },
+  "haskell": {
+    "description": "The nixpkgs Haskell team",
+    "id": 4769723,
+    "maintainers": {
+      "cdepillabout": 64804,
+      "maralorn": 1651325,
+      "peti": 28323,
+      "sternenseemann": 3154475
+    },
+    "members": {
+      "expipiplus1": 857308,
+      "wolfgangwalther": 9132420
+    },
+    "name": "Haskell"
+  },
+  "hyprland": {
+    "description": "Maintain Hyprland compositor and ecosystem.",
+    "id": 12048885,
+    "maintainers": {
+      "khaneliman": 1778670
+    },
+    "members": {
+      "JohnRTitor": 50095635,
+      "NotAShelf": 62766066,
+      "donovanglover": 2374245,
+      "fufexan": 36706276
+    },
+    "name": "hyprland"
+  },
+  "java": {
+    "description": "Maintainers of the Nixpkgs Java ecosystem (JDK, JVM, Java, Gradle, Maven, Ant, and adjacent projects); frequently lingering in #jvm:nixos.org on Matrix",
+    "id": 11412419,
+    "maintainers": {
+      "FliegendeWurst": 12560461,
+      "Infinidoge": 22727114,
+      "chayleaf": 9590981,
+      "tomodachi94": 68489118
+    },
+    "members": {
+      "msgilligan": 61612
+    },
+    "name": "Java"
+  },
+  "k3s": {
+    "description": "Lightweight Kubernetes maintainer team (k3s)",
+    "id": 7725877,
+    "maintainers": {
+      "Mic92": 96200,
+      "euank": 2147649,
+      "marcusramberg": 5526,
+      "wrmilling": 6162814,
+      "yajo": 973709
+    },
+    "members": {
+      "frederictobiasc": 26125115,
+      "superherointj": 5861043
+    },
+    "name": "k3s"
+  },
+  "kodi": {
+    "description": "Maintain Kodi related packages.",
+    "id": 4642467,
+    "maintainers": {
+      "aanderse": 7755101
+    },
+    "members": {
+      "cpages": 411324,
+      "edwtjo": 54799,
+      "minijackson": 1200507,
+      "peterhoeg": 722550,
+      "sephalon": 893474
+    },
+    "name": "kodi"
+  },
+  "kubernetes": {
+    "description": "",
+    "id": 5536808,
+    "maintainers": {
+      "johanot": 998763,
+      "offlinehacker": 585547,
+      "saschagrunert": 695473,
+      "srhb": 219362
+    },
+    "members": {},
+    "name": "kubernetes"
+  },
+  "linux-kernel": {
+    "description": "",
+    "id": 13371617,
+    "maintainers": {
+      "alyssais": 2768870
+    },
+    "members": {
+      "K900": 386765,
+      "Ma27": 6025220,
+      "NeQuissimus": 628342,
+      "TredwellGit": 61860346
+    },
+    "name": "Linux kernel"
+  },
+  "lisp": {
+    "description": "The nixpkgs Lisp team",
+    "id": 7678368,
+    "maintainers": {
+      "7c6f434c": 1891350,
+      "Uthar": 15697697,
+      "hraban": 137852,
+      "lukego": 13791,
+      "nagy": 692274
+    },
+    "members": {},
+    "name": "lisp"
+  },
+  "lix-maintainers": {
+    "description": "Lix maintainers in nixpkgs/NixOS",
+    "id": 13838744,
+    "maintainers": {
+      "lf-": 6652840
+    },
+    "members": {
+      "9999years": 15312184,
+      "Qyriad": 1542224,
+      "RaitoBezarius": 314564,
+      "alois31": 36605164
+    },
+    "name": "Lix maintainers"
+  },
+  "llvm": {
+    "description": "Maintain LLVM package sets and related packages",
+    "id": 9955829,
+    "maintainers": {
+      "RossComputerGuy": 19699320,
+      "alyssais": 2768870
+    },
+    "members": {
+      "Ericson2314": 1055245,
+      "dtzWill": 817330,
+      "emilazy": 18535642,
+      "lovek323": 265084,
+      "rrbutani": 7833358,
+      "sternenseemann": 3154475
+    },
+    "name": "LLVM"
+  },
+  "loongarch64": {
+    "description": "Maintain LoongArch64 related packages and code",
+    "id": 13371619,
+    "maintainers": {
+      "Aleksanaa": 42209822
+    },
+    "members": {
+      "Cryolitia": 23723294,
+      "darkyzhou": 7220778,
+      "dramforever": 2818072,
+      "wegank": 9713184
+    },
+    "name": "loongarch64"
+  },
+  "lua": {
+    "description": "Deals with lua ecosystem",
+    "id": 5255750,
+    "maintainers": {
+      "teto": 886074
+    },
+    "members": {
+      "7c6f434c": 1891350,
+      "Shados": 338268,
+      "khaneliman": 1778670,
+      "spencerpogo": 34356756
+    },
+    "name": "lua"
+  },
+  "lumina": {
+    "description": "Maintainers of the Lumina Desktop Environment",
+    "id": 5937661,
+    "maintainers": {
+      "romildo": 1217934
+    },
+    "members": {},
+    "name": "Lumina"
+  },
+  "lxc": {
+    "description": "LXC, LXD, Incus",
+    "id": 9223525,
+    "maintainers": {
+      "adamcstephens": 2071575
+    },
+    "members": {
+      "aanderse": 7755101,
+      "jnsgruk": 668505,
+      "megheaiulian": 1788114,
+      "mkg20001": 7735145
+    },
+    "name": "LXC"
+  },
+  "lxqt": {
+    "description": "Maintainers of the LXQt Desktop Environment",
+    "id": 5937679,
+    "maintainers": {
+      "romildo": 1217934
+    },
+    "members": {},
+    "name": "LXQt"
+  },
+  "mate": {
+    "description": "Maintainers of the MATE Desktop Environment",
+    "id": 5937667,
+    "maintainers": {
+      "romildo": 1217934
+    },
+    "members": {
+      "bobby285271": 20080233
+    },
+    "name": "MATE"
+  },
+  "neovim": {
+    "description": "Maintains neovim ecosystem",
+    "id": 6748534,
+    "maintainers": {
+      "GaetanLepage": 33058747
+    },
+    "members": {
+      "PerchunPak": 68118654,
+      "khaneliman": 1778670,
+      "mrcjkb": 12857160
+    },
+    "name": "neovim"
+  },
+  "nix-formatting": {
+    "description": "Team to maintain the official Nix formatter and apply it to Nixpkgs",
+    "id": 9676823,
+    "maintainers": {
+      "infinisil": 20525370,
+      "jfly": 277474
+    },
+    "members": {
+      "0x4A6F": 9675338,
+      "MattSturgeon": 5046562,
+      "Sereja313": 112060595,
+      "dasJ": 4971975,
+      "piegamesde": 14054505
+    },
+    "name": "nix-formatting"
+  },
+  "nix-team": {
+    "description": "",
+    "id": 174820,
+    "maintainers": {
+      "tomberek": 178444
+    },
+    "members": {
+      "Ericson2314": 1055245,
+      "Mic92": 96200,
+      "edolstra": 1148549,
+      "xokdvium": 145775305
+    },
+    "name": "Nix team"
+  },
+  "nixos-release-managers": {
+    "description": "Team of Release Managers.",
+    "id": 3620128,
+    "maintainers": {
+      "jopejoe1": 34899572,
+      "leona-ya": 11006031
+    },
+    "members": {},
+    "name": "nixos-release-managers"
+  },
+  "nixpkgs-ci": {
+    "description": "Maintaining Nixpkgs CI",
+    "id": 13362067,
+    "maintainers": {
+      "philiptaron": 43863,
+      "wolfgangwalther": 9132420
+    },
+    "members": {
+      "MattSturgeon": 5046562,
+      "Mic92": 96200,
+      "zowoq": 59103226
+    },
+    "name": "Nixpkgs CI"
+  },
+  "nixpkgs-core": {
+    "description": "Provides leadership for and has authority over Nixpkgs.",
+    "id": 14317027,
+    "maintainers": {
+      "K900": 386765,
+      "alyssais": 2768870,
+      "emilazy": 18535642,
+      "wolfgangwalther": 9132420
+    },
+    "members": {},
+    "name": "Nixpkgs core"
+  },
+  "nixpkgs-merge-bot": {
+    "description": "This team exists as a target for triggering the nixpkgs merge bot.",
+    "id": 13926892,
+    "maintainers": {},
+    "members": {},
+    "name": "nixpkgs-merge-bot"
+  },
+  "node": {
+    "description": "Maintains Node.js runtimes and build tooling.\r\n\r\n\"JS is hecked, thanks for coming to my TED Talk\" - @lilyinstarlight",
+    "id": 7309872,
+    "maintainers": {
+      "lilyinstarlight": 298109,
+      "winterqt": 78392041
+    },
+    "members": {},
+    "name": "Node"
+  },
+  "ocaml": {
+    "description": "Maintain the ecosystem around OCaml in Nixpkgs",
+    "id": 7553013,
+    "maintainers": {
+      "Alizter": 8614547,
+      "romildo": 1217934,
+      "superherointj": 5861043,
+      "ulrikstrid": 1607770
+    },
+    "members": {
+      "redianthus": 16472988
+    },
+    "name": "OCaml"
+  },
+  "pantheon": {
+    "description": "Maintainers of the Pantheon desktop",
+    "id": 4786995,
+    "maintainers": {
+      "davidak": 91113
+    },
+    "members": {
+      "bobby285271": 20080233
+    },
+    "name": "Pantheon"
+  },
+  "php": {
+    "description": "Maintain PHP related packages and extensions.",
+    "id": 3806182,
+    "maintainers": {},
+    "members": {
+      "Ma27": 6025220,
+      "aanderse": 7755101,
+      "drupol": 252042,
+      "globin": 1447245,
+      "talyz": 63433
+    },
+    "name": "php"
+  },
+  "podman": {
+    "description": "Maintain Podman and CRI-O related packages and modules.",
+    "id": 3806184,
+    "maintainers": {},
+    "members": {
+      "saschagrunert": 695473,
+      "vdemeester": 6508
+    },
+    "name": "podman"
+  },
+  "postgres": {
+    "description": "Maintain the PostgreSQL package and plugins along with the NixOS module.",
+    "id": 11455958,
+    "maintainers": {
+      "Ma27": 6025220,
+      "thoughtpolice": 3416,
+      "wolfgangwalther": 9132420
+    },
+    "members": {},
+    "name": "postgres"
+  },
+  "qt-kde": {
+    "description": "Maintain the Qt framework, KDE Frameworks and Applications, and Plasma desktop",
+    "id": 4341481,
+    "maintainers": {
+      "ttuegel": 563054
+    },
+    "members": {
+      "FRidh": 2129135,
+      "SCOTT-HAMILTON": 24496705,
+      "bkchr": 5718007,
+      "nyanloutre": 7677321,
+      "peterhoeg": 722550
+    },
+    "name": "Qt-KDE"
+  },
+  "reproducible": {
+    "description": "Team that is interested in reproducible builds",
+    "id": 7625643,
+    "maintainers": {
+      "raboof": 131856,
+      "zimbatm": 3248
+    },
+    "members": {
+      "Artturin": 56650223,
+      "Atemu": 18599032,
+      "RaitoBezarius": 314564,
+      "davidak": 91113,
+      "mschwaig": 3856390
+    },
+    "name": "reproducible"
+  },
+  "risc-v": {
+    "description": "RISC-V team",
+    "id": 13425811,
+    "maintainers": {
+      "0x4A6F": 9675338
+    },
+    "members": {
+      "DarkKirb": 23011243,
+      "dramforever": 2818072,
+      "fgaz": 8182846,
+      "jonhermansen": 660911
+    },
+    "name": "RISC-V"
+  },
+  "rocm": {
+    "description": "AMD ROCm stack and related",
+    "id": 6921873,
+    "maintainers": {
+      "mschwaig": 3856390
+    },
+    "members": {
+      "Flakebi": 6499211,
+      "GZGavinZhao": 74938940,
+      "LunNova": 782440
+    },
+    "name": "rocm"
+  },
+  "rust": {
+    "description": "",
+    "id": 7304571,
+    "maintainers": {
+      "Mic92": 96200,
+      "figsoda": 40620903,
+      "winterqt": 78392041,
+      "zowoq": 59103226
+    },
+    "members": {
+      "tjni": 3806110
+    },
+    "name": "rust"
+  },
+  "scala": {
+    "description": "Maintain Scala-related packages and modules.",
+    "id": 11193149,
+    "maintainers": {
+      "dottybot": 12519979,
+      "hamzaremmal": 56235032
+    },
+    "members": {
+      "natsukagami": 9061737
+    },
+    "name": "Scala"
+  },
+  "sdl": {
+    "description": "Maintain core SDL libraries",
+    "id": 13033942,
+    "maintainers": {
+      "pbsds": 140964
+    },
+    "members": {
+      "LordGrimmauld": 49513131,
+      "evysgarden": 92547295,
+      "jansol": 2588851,
+      "marcin-serwin": 12128106
+    },
+    "name": "SDL"
+  },
+  "security": {
+    "description": "Private reports: security@nixos.org",
+    "id": 2197543,
+    "maintainers": {
+      "LeSuisse": 737767,
+      "mweinelt": 131599,
+      "risicle": 807447
+    },
+    "members": {},
+    "name": "Security"
+  },
+  "static": {
+    "description": "People interested in static builds (creation of `.a` files, fully static executables, etc.) and keeping them working",
+    "id": 5906550,
+    "maintainers": {
+      "nh2": 399535
+    },
+    "members": {
+      "Ericson2314": 1055245,
+      "aherrmann": 732652,
+      "alyssais": 2768870,
+      "basvandijk": 576355,
+      "cdepillabout": 64804,
+      "dtzWill": 817330,
+      "lorenzleutgeb": 542154,
+      "matthewbauer": 19036,
+      "r-burns": 52847440,
+      "rnhmjoj": 2817565,
+      "sternenseemann": 3154475
+    },
+    "name": "static"
+  },
+  "stdenv": {
+    "description": "Maintain the standard environment and its surrounding logic.",
+    "id": 11265412,
+    "maintainers": {
+      "RossComputerGuy": 19699320
+    },
+    "members": {
+      "Artturin": 56650223,
+      "Ericson2314": 1055245,
+      "emilazy": 18535642,
+      "philiptaron": 43863,
+      "reckenrode": 7413633
+    },
+    "name": "stdenv"
+  },
+  "systemd": {
+    "description": "systemd on NixOS.",
+    "id": 3894007,
+    "maintainers": {
+      "flokli": 183879
+    },
+    "members": {
+      "ElvishJerricco": 1365692,
+      "LordGrimmauld": 49513131,
+      "aanderse": 7755101,
+      "arianvp": 628387
+    },
+    "name": "systemd"
+  },
+  "xen-project": {
+    "description": "Maintains the Xen Project ecosystem on Nixpkgs. Members listed as \"Maintainers\" are recipients of Xen Security Advisories sent to xsa@nixos.org.",
+    "id": 11127725,
+    "maintainers": {
+      "CertainLach": 6235312,
+      "SigmaSquadron": 174749595,
+      "hehongbo": 665472
+    },
+    "members": {
+      "digitalrane": 1829286
+    },
+    "name": "Xen Project"
+  },
+  "xfce": {
+    "description": "Maintainers of the Xfce Desktop Environment",
+    "id": 5421745,
+    "maintainers": {
+      "romildo": 1217934
+    },
+    "members": {
+      "bobby285271": 20080233
+    },
+    "name": "Xfce"
+  }
+}

From 6d89dcd57701a839654f78afc62466b94e55a3b2 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Sat, 11 Oct 2025 02:25:48 +0200
Subject: [PATCH 3339/6226] maintainers/github-teams.json: Manual adjustment of
 necessary changes

This makes `lib.teams` be in sync with the GitHub state.

Add the marketing-team so that all teams in `lib.teams` can be requested for reviews.

Add these members to the respective teams:
- beam: minijackson (53e70ab75490df87a165d704a9e98312b3f5137b)
- beam: savtrip (f9ff37cdc3ade4bc45f501af0e7f7520a9543f1c)
- cuda: prusnak (748896a2db6cafb61e6b29dfa71f904293443f6b)
- geospatial: autra (7de303b4518766db2ddca9dfcbdc823430fe3869)
- geospatial: l0b0 (510eb5118acff1546bb0037c6f3168496675e1e8)
- gnome: bobby285271 (066634e509988232b435cf2e64c778ec4508a4b4)
- gnome: dasj19 (c57c9362815e48681e9a52ec86cf81e38fe1ce6c)
- k3s: heywoodlh (2ca18a8b175c961eef8aa3637c490de833fcccef)
- k3s: rorosen (b9f397d445b52316eaf08b9d5072fe194ab482ec)
- php: piotrkwiecinski (148e322192b7a451344fe335cc38b95043ee37d4)
- qt-kde: mjm (f6bb8a922fef75dd6a81af0cfe25daca6e3b9c4b)
- qt-kde: NickCao (f6bb8a922fef75dd6a81af0cfe25daca6e3b9c4b)
- qt-kde: ilya-fedin (f6bb8a922fef75dd6a81af0cfe25daca6e3b9c4b)
- qt-kde: K900 (f6bb8a922fef75dd6a81af0cfe25daca6e3b9c4b)
- qt-kde: SuperSandro2000 (f6bb8a922fef75dd6a81af0cfe25daca6e3b9c4b)
- qt-kde: LunNova (f6bb8a922fef75dd6a81af0cfe25daca6e3b9c4b)

Remove these members from the respective teams:
- geospatial: das-g (b93d987a8441384a6bac336318b1582d52305412)
- haskell: expipiplus1 (e134422465913332a5c9cb3ec9161650f7d459c8)
- haskell: peti (https://github.com/NixOS/nixpkgs/pull/450864#issuecomment-3431029084)
- k3s: yajo (8b238112108d8c366856434a3e617f60cd250758)
- k3s: superherointj (7354bda2081a43cfe13f7df67b09af90b309615a)
- ocaml: superherointj (7354bda2081a43cfe13f7df67b09af90b309615a)
- php: drupol (cabc16dc599da7ca2b320fafe80e256d0dfa5b94)
- php: globin (e5d552f5b94c26e574a6333060d0864760034ee3)
- documentation-team: fricklerhandwerk (https://discourse.nixos.org/t/the-next-chapter-in-nix-documentation/68425)

Copy these team descriptions from `lib.teams.*.scope` to the GitHub team description:
- nixpkgs-ci: Maintain Nixpkgs' in-tree Continuous Integration, including GitHub Actions
- cuda: Maintain CUDA-enabled packages
- darwin: Maintain core platform support and packages for macOS and other Apple platforms
- documentation-team: Maintain nixpkgs/NixOS documentation and tools for building it. https://nixos.org/community/teams/documentation
- enlightenment: Maintain Enlightenment desktop environment and related packages
- flutter: Maintain Flutter and Dart-related packages and build tools
- geospatial: Maintain geospatial, remote sensing and OpenStreetMap software
- golang: Maintain Golang compilers
- haskell: Maintain Haskell packages and infrastructure
- k3s: Maintain K3s package, NixOS module, NixOS tests, update script
- lisp: Maintain the Lisp ecosystem
- lua: Maintain the lua ecosystem
- lumina: Maintain lumina desktop environment and related packages
- lxqt: Maintain LXQt desktop environment and related packages
- neovim: Maintain the vim and neovim text editors and related packages
- ocaml: Maintain the OCaml compiler and package set
- pantheon: Maintain Pantheon desktop environment and platform
- qt-kde: Maintain the Qt framework, KDE application suite, Plasma desktop environment and related projects
- nixos-release-managers: Manage the current nixpkgs/NixOS release
- rocm: Maintain ROCm and related packages
- rust: Maintain the Rust compiler toolchain and nixpkgs integration
- systemd: Maintain systemd for NixOS
- xen-project: Maintain the Xen Project Hypervisor and the related tooling ecosystem
---
 maintainers/github-teams.json | 90 +++++++++++++++++++++--------------
 1 file changed, 55 insertions(+), 35 deletions(-)

diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json
index 1b6707fedff1..b08521a210c7 100644
--- a/maintainers/github-teams.json
+++ b/maintainers/github-teams.json
@@ -66,6 +66,8 @@
       "adamcstephens": 2071575,
       "ankhers": 750786,
       "gleber": 33185,
+      "minijackson": 1200507,
+      "savtrip": 42227195,
       "yurrriq": 1866448
     },
     "name": "Beam"
@@ -151,7 +153,7 @@
     "name": "crystal-lang"
   },
   "cuda-maintainers": {
-    "description": "All things CUDA and deep learning!",
+    "description": "Maintain CUDA-enabled packages",
     "id": 5704451,
     "maintainers": {
       "ConnorBaker": 3880346,
@@ -159,12 +161,13 @@
       "samuela": 226872
     },
     "members": {
-      "GaetanLepage": 33058747
+      "GaetanLepage": 33058747,
+      "prusnak": 42201
     },
     "name": "cuda-maintainers"
   },
   "darwin-core": {
-    "description": "Maintains core platform support and packages for macOS and other Apple platforms.",
+    "description": "Maintain core platform support and packages for macOS and other Apple platforms",
     "id": 11265438,
     "maintainers": {
       "emilazy": 18535642
@@ -278,11 +281,10 @@
     "name": "darwin-maintainers"
   },
   "documentation-team": {
-    "description": "https://nixos.org/community/teams/documentation",
+    "description": "Maintain nixpkgs/NixOS documentation and tools for building it. https://nixos.org/community/teams/documentation",
     "id": 6590023,
     "maintainers": {
-      "alejandrosame": 1078000,
-      "fricklerhandwerk": 6599296
+      "alejandrosame": 1078000
     },
     "members": {
       "hsjobeki": 50398876,
@@ -323,7 +325,7 @@
     "name": "emacs"
   },
   "enlightenment": {
-    "description": "Maintainers of the Enlightenment Desktop Environment",
+    "description": "Maintain Enlightenment desktop environment and related packages",
     "id": 5937665,
     "maintainers": {
       "romildo": 1217934
@@ -350,7 +352,7 @@
     "name": "exotic-platform-maintainers"
   },
   "flutter": {
-    "description": "",
+    "description": "Maintain Flutter and Dart-related packages and build tools",
     "id": 7718198,
     "maintainers": {
       "RossComputerGuy": 19699320
@@ -372,13 +374,14 @@
     "name": "Freedesktop"
   },
   "geospatial": {
-    "description": "Maintain geospatial packages",
+    "description": "Maintain geospatial, remote sensing and OpenStreetMap software",
     "id": 7084621,
     "maintainers": {
       "imincik": 476346
     },
     "members": {
-      "das-g": 97746,
+      "autra": 1576598,
+      "l0b0": 168301,
       "nh2": 399535,
       "nialov": 47318483,
       "sikmir": 688044,
@@ -404,13 +407,15 @@
     "id": 3806133,
     "maintainers": {},
     "members": {
+      "bobby285271": 20080233,
+      "dasj19": 7589338,
       "hedning": 71978,
       "jtojnar": 705123
     },
     "name": "GNOME"
   },
   "golang": {
-    "description": "",
+    "description": "Maintain Golang compilers",
     "id": 4020424,
     "maintainers": {
       "Mic92": 96200,
@@ -425,16 +430,14 @@
     "name": "golang"
   },
   "haskell": {
-    "description": "The nixpkgs Haskell team",
+    "description": "Maintain Haskell packages and infrastructure",
     "id": 4769723,
     "maintainers": {
       "cdepillabout": 64804,
       "maralorn": 1651325,
-      "peti": 28323,
       "sternenseemann": 3154475
     },
     "members": {
-      "expipiplus1": 857308,
       "wolfgangwalther": 9132420
     },
     "name": "Haskell"
@@ -468,18 +471,18 @@
     "name": "Java"
   },
   "k3s": {
-    "description": "Lightweight Kubernetes maintainer team (k3s)",
+    "description": "Maintain K3s package, NixOS module, NixOS tests, update script",
     "id": 7725877,
     "maintainers": {
       "Mic92": 96200,
       "euank": 2147649,
       "marcusramberg": 5526,
-      "wrmilling": 6162814,
-      "yajo": 973709
+      "wrmilling": 6162814
     },
     "members": {
       "frederictobiasc": 26125115,
-      "superherointj": 5861043
+      "heywoodlh": 18178614,
+      "rorosen": 76747196
     },
     "name": "k3s"
   },
@@ -525,7 +528,7 @@
     "name": "Linux kernel"
   },
   "lisp": {
-    "description": "The nixpkgs Lisp team",
+    "description": "Maintain the Lisp ecosystem",
     "id": 7678368,
     "maintainers": {
       "7c6f434c": 1891350,
@@ -583,7 +586,7 @@
     "name": "loongarch64"
   },
   "lua": {
-    "description": "Deals with lua ecosystem",
+    "description": "Maintain the lua ecosystem",
     "id": 5255750,
     "maintainers": {
       "teto": 886074
@@ -597,7 +600,7 @@
     "name": "lua"
   },
   "lumina": {
-    "description": "Maintainers of the Lumina Desktop Environment",
+    "description": "Maintain lumina desktop environment and related packages",
     "id": 5937661,
     "maintainers": {
       "romildo": 1217934
@@ -620,7 +623,7 @@
     "name": "LXC"
   },
   "lxqt": {
-    "description": "Maintainers of the LXQt Desktop Environment",
+    "description": "Maintain LXQt desktop environment and related packages",
     "id": 5937679,
     "maintainers": {
       "romildo": 1217934
@@ -628,6 +631,19 @@
     "members": {},
     "name": "LXQt"
   },
+  "marketing-team": {
+    "description": "Marketing team [leader=@djacu]",
+    "id": 7709512,
+    "maintainers": {
+      "djacu": 7043297,
+      "tomberek": 178444
+    },
+    "members": {
+      "flyfloh": 74379,
+      "thilobillerbeck": 7442383
+    },
+    "name": "Marketing Team"
+  },
   "mate": {
     "description": "Maintainers of the MATE Desktop Environment",
     "id": 5937667,
@@ -640,7 +656,7 @@
     "name": "MATE"
   },
   "neovim": {
-    "description": "Maintains neovim ecosystem",
+    "description": "Maintain the vim and neovim text editors and related packages",
     "id": 6748534,
     "maintainers": {
       "GaetanLepage": 33058747
@@ -683,7 +699,7 @@
     "name": "Nix team"
   },
   "nixos-release-managers": {
-    "description": "Team of Release Managers.",
+    "description": "Manage the current nixpkgs/NixOS release",
     "id": 3620128,
     "maintainers": {
       "jopejoe1": 34899572,
@@ -693,7 +709,7 @@
     "name": "nixos-release-managers"
   },
   "nixpkgs-ci": {
-    "description": "Maintaining Nixpkgs CI",
+    "description": "Maintain Nixpkgs' in-tree Continuous Integration, including GitHub Actions",
     "id": 13362067,
     "maintainers": {
       "philiptaron": 43863,
@@ -736,12 +752,11 @@
     "name": "Node"
   },
   "ocaml": {
-    "description": "Maintain the ecosystem around OCaml in Nixpkgs",
+    "description": "Maintain the OCaml compiler and package set",
     "id": 7553013,
     "maintainers": {
       "Alizter": 8614547,
       "romildo": 1217934,
-      "superherointj": 5861043,
       "ulrikstrid": 1607770
     },
     "members": {
@@ -750,7 +765,7 @@
     "name": "OCaml"
   },
   "pantheon": {
-    "description": "Maintainers of the Pantheon desktop",
+    "description": "Maintain Pantheon desktop environment and platform",
     "id": 4786995,
     "maintainers": {
       "davidak": 91113
@@ -767,8 +782,7 @@
     "members": {
       "Ma27": 6025220,
       "aanderse": 7755101,
-      "drupol": 252042,
-      "globin": 1447245,
+      "piotrkwiecinski": 2151333,
       "talyz": 63433
     },
     "name": "php"
@@ -795,15 +809,21 @@
     "name": "postgres"
   },
   "qt-kde": {
-    "description": "Maintain the Qt framework, KDE Frameworks and Applications, and Plasma desktop",
+    "description": "Maintain the Qt framework, KDE application suite, Plasma desktop environment and related projects",
     "id": 4341481,
     "maintainers": {
       "ttuegel": 563054
     },
     "members": {
       "FRidh": 2129135,
+      "K900": 386765,
+      "LunNova": 782440,
+      "NickCao": 15247171,
       "SCOTT-HAMILTON": 24496705,
+      "SuperSandro2000": 7258858,
       "bkchr": 5718007,
+      "ilya-fedin": 17829319,
+      "mjm": 1181,
       "nyanloutre": 7677321,
       "peterhoeg": 722550
     },
@@ -840,7 +860,7 @@
     "name": "RISC-V"
   },
   "rocm": {
-    "description": "AMD ROCm stack and related",
+    "description": "Maintain ROCm and related packages",
     "id": 6921873,
     "maintainers": {
       "mschwaig": 3856390
@@ -853,7 +873,7 @@
     "name": "rocm"
   },
   "rust": {
-    "description": "",
+    "description": "Maintain the Rust compiler toolchain and nixpkgs integration",
     "id": 7304571,
     "maintainers": {
       "Mic92": 96200,
@@ -940,7 +960,7 @@
     "name": "stdenv"
   },
   "systemd": {
-    "description": "systemd on NixOS.",
+    "description": "Maintain systemd for NixOS",
     "id": 3894007,
     "maintainers": {
       "flokli": 183879
@@ -954,7 +974,7 @@
     "name": "systemd"
   },
   "xen-project": {
-    "description": "Maintains the Xen Project ecosystem on Nixpkgs. Members listed as \"Maintainers\" are recipients of Xen Security Advisories sent to xsa@nixos.org.",
+    "description": "Maintain the Xen Project Hypervisor and the related tooling ecosystem. Members listed as \"Maintainers\" are recipients of Xen Security Advisories sent to xsa@nixos.org.",
     "id": 11127725,
     "maintainers": {
       "CertainLach": 6235312,

From 428bd8f1a256bf7864a63134b96005517c1aa371 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Sat, 11 Oct 2025 02:26:51 +0200
Subject: [PATCH 3340/6226] lib.teams: Populate fields from synced GitHub state

The before and after of

    nix-instantiate --eval -A lib.teams --strict --json | jq 'walk(if type == "array" then sort else . end)'

has been ensured to be negligible, only consisting of minor team
shortName and scope differences
---
 ci/OWNERS                          |   1 +
 lib/default.nix                    |   2 +-
 maintainers/README.md              |   6 +-
 maintainers/computed-team-list.nix |  49 +++++
 maintainers/team-list.nix          | 321 +----------------------------
 5 files changed, 57 insertions(+), 322 deletions(-)
 create mode 100644 maintainers/computed-team-list.nix

diff --git a/ci/OWNERS b/ci/OWNERS
index d1d215935b1f..b459a496cdf3 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -33,6 +33,7 @@
 /lib/path/*                 @infinisil @hsjobeki
 /lib/fileset                @infinisil @hsjobeki
 /maintainers/github-teams.json @infinisil
+/maintainers/computed-team-list.nix @infinisil
 ## Standard environment–related libraries
 /lib/customisation.nix      @alyssais @NixOS/stdenv
 /lib/derivations.nix        @alyssais @NixOS/stdenv
diff --git a/lib/default.nix b/lib/default.nix
index afd9ecd2154c..157e4e2be278 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -63,7 +63,7 @@ let
       customisation = callLibs ./customisation.nix;
       derivations = callLibs ./derivations.nix;
       maintainers = import ../maintainers/maintainer-list.nix;
-      teams = callLibs ../maintainers/team-list.nix;
+      teams = callLibs ../maintainers/computed-team-list.nix;
       meta = callLibs ./meta.nix;
       versions = callLibs ./versions.nix;
 
diff --git a/maintainers/README.md b/maintainers/README.md
index 1bcaaea1a5c3..6b5c8fe1c2c4 100644
--- a/maintainers/README.md
+++ b/maintainers/README.md
@@ -158,13 +158,17 @@ If the team lists no specific membership policy, feel free to merge changes to t
 > [!IMPORTANT]
 > If a team says it is a closed group, do not merge additions to the team without an approval by at least one existing member.
 
-A corresponding GitHub team can be created by any org member.
+#### Synced GitHub teams
+
+As an alternative to tracking team members in `team-list.nix`, a corresponding GitHub team can be created by any org member and its members subsequently managed directly on GitHub.
 When creating the team it should be created with the `nixpkgs-maintainers` team as parent.
 Once approved, the team will have the right privileges to be pinged and requested for review in Nixpkgs.
 
 > [!TIP]
 > The team name should be as short as possible; because it is nested under the maintainers group, no -maintainers suffix is needed.
 
+After the first [weekly team sync](../.github/workflows/team-sync.yml) with the new team, it's then also possible to link it to the entry in `team-list.nix` by setting its `github` field to the GitHub team name.
+
 # Maintainer scripts
 
 Various utility scripts, which are mainly useful for nixpkgs maintainers, are available under `./scripts/`.
diff --git a/maintainers/computed-team-list.nix b/maintainers/computed-team-list.nix
new file mode 100644
index 000000000000..f9413d76e453
--- /dev/null
+++ b/maintainers/computed-team-list.nix
@@ -0,0 +1,49 @@
+# Extends ./team-list.nix with synced GitHub information from ./github-teams.json
+{ lib }:
+let
+  githubTeams = lib.importJSON ./github-teams.json;
+  teams = import ./team-list.nix { inherit lib; };
+
+  # A fast maintainer id lookup table
+  maintainersById = lib.pipe lib.maintainers [
+    lib.attrValues
+    (lib.groupBy (attrs: toString attrs.githubId))
+    (lib.mapAttrs (_: lib.head))
+  ];
+
+  maintainerSetToList =
+    githubTeam:
+    lib.mapAttrsToList (
+      login: id:
+      maintainersById.${toString id}
+      or (throw "lib.teams: No maintainer entry for GitHub user @${login} who's part of the @NixOS/${githubTeam} team")
+    );
+
+in
+lib.mapAttrs (
+  name: attrs:
+  if attrs ? github then
+    let
+      githubTeam =
+        githubTeams.${attrs.github}
+          or (throw "lib.teams.${name}: Corresponding GitHub team ${attrs.github} not known yet, make sure to create it and wait for the regular team sync");
+    in
+    assert lib.assertMsg (!attrs ? shortName)
+      "lib.teams.${name}: Both `shortName` and `github` is set, but the former is synced from the latter";
+    assert lib.assertMsg (
+      !attrs ? scope
+    ) "lib.teams.${name}: Both `scope` and `github` is set, but the former is synced from the latter";
+    assert lib.assertMsg (
+      !attrs ? members
+    ) "lib.teams.${name}: Both `members` and `github` is set, but the former is synced from the latter";
+    attrs
+    // {
+      shortName = githubTeam.name;
+      scope = githubTeam.description;
+      members =
+        maintainerSetToList attrs.github githubTeam.maintainers
+        ++ maintainerSetToList attrs.github githubTeam.members;
+    }
+  else
+    attrs
+) teams
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index ebfd4d5c43d3..8d3db897020b 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -1,11 +1,9 @@
 /*
   List of maintainer teams.
     name = {
-      # Required
       members = [ maintainer1 maintainer2 ];
       scope = "Maintain foo packages.";
       shortName = "foo";
-      # Optional
       enableFeatureFreezePing = true;
       github = "my-subsystem";
     };
@@ -18,7 +16,7 @@
   - `enableFeatureFreezePing` will ping this team during the Feature Freeze announcements on releases
     - There is limited mention capacity in a single post, so this should be reserved for critical components
       or larger ecosystems within nixpkgs.
-  - `github` will ping the specified GitHub team as well
+  - `github` will ping the specified GitHub team and sync the `members`, `scope` and `shortName` fields from it
 
   More fields may be added in the future.
 
@@ -56,16 +54,7 @@ with lib.maintainers;
   };
 
   android = {
-    members = [
-      adrian-gierakowski
-      hadilq
-      johnrtitor
-      numinit
-      RossComputerGuy
-    ];
-    scope = "Maintain Android-related tooling in nixpkgs.";
     github = "android";
-    shortName = "Android";
     enableFeatureFreezePing = true;
   };
 
@@ -106,20 +95,7 @@ with lib.maintainers;
   };
 
   beam = {
-    members = [
-      adamcstephens
-      ankhers
-      Br1ght0ne
-      DianaOlympos
-      gleber
-      happysalada
-      minijackson
-      yurrriq
-      savtrip
-    ];
     github = "beam";
-    scope = "Maintain BEAM-related packages and modules.";
-    shortName = "BEAM";
     enableFeatureFreezePing = true;
   };
 
@@ -193,34 +169,11 @@ with lib.maintainers;
   };
 
   categorization = {
-    members = [
-      aleksana
-      fgaz
-      getpsyched
-      lyndeno
-      natsukium
-      philiptaron
-      pyrotelekinetic
-      raskin
-      sigmasquadron
-      tomodachi94
-    ];
     github = "categorization";
-    scope = "Maintain the categorization system in Nixpkgs, per RFC 146. This team has authority over all categorization issues in Nixpkgs.";
-    shortName = "Categorization";
   };
 
   ci = {
-    members = [
-      MattSturgeon
-      mic92
-      philiptaron
-      wolfgangwalther
-      zowoq
-    ];
     github = "nixpkgs-ci";
-    scope = "Maintain Nixpkgs' in-tree Continuous Integration, including GitHub Actions.";
-    shortName = "CI";
   };
 
   cinnamon = {
@@ -262,21 +215,7 @@ with lib.maintainers;
   };
 
   cosmic = {
-    members = [
-      a-kenji
-      ahoneybun
-      drakon64
-      griffi-gh
-      HeitorAugustoLN
-      nyabinary
-      pandapip1
-      qyliss
-      thefossguy
-      michaelBelsanti
-    ];
     github = "cosmic";
-    shortName = "cosmic";
-    scope = "Maintain the COSMIC DE and related packages.";
     enableFeatureFreezePing = true;
   };
 
@@ -290,15 +229,6 @@ with lib.maintainers;
   };
 
   cuda = {
-    members = [
-      connorbaker
-      GaetanLepage
-      prusnak
-      samuela
-      SomeoneSerge
-    ];
-    scope = "Maintain CUDA-enabled packages";
-    shortName = "Cuda";
     github = "cuda-maintainers";
   };
 
@@ -315,14 +245,7 @@ with lib.maintainers;
   };
 
   darwin = {
-    members = [
-      emily
-      reckenrode
-      toonn
-    ];
     github = "darwin-core";
-    scope = "Maintain core platform support and packages for macOS and other Apple platforms.";
-    shortName = "Darwin";
     enableFeatureFreezePing = true;
   };
 
@@ -366,14 +289,7 @@ with lib.maintainers;
   };
 
   docs = {
-    members = [
-      alejandrosame
-      wamirez
-      hsjobeki
-    ];
     github = "documentation-team";
-    scope = "Maintain nixpkgs/NixOS documentation and tools for building it.";
-    shortName = "Docs";
     enableFeatureFreezePing = true;
   };
 
@@ -414,22 +330,11 @@ with lib.maintainers;
   };
 
   enlightenment = {
-    members = [ romildo ];
     github = "enlightenment";
-    scope = "Maintain Enlightenment desktop environment and related packages.";
-    shortName = "Enlightenment";
     enableFeatureFreezePing = true;
   };
 
   flutter = {
-    members = [
-      mkg20001
-      RossComputerGuy
-      FlafyDev
-      hacker1024
-    ];
-    scope = "Maintain Flutter and Dart-related packages and build tools";
-    shortName = "flutter";
     enableFeatureFreezePing = false;
     github = "flutter";
   };
@@ -490,18 +395,7 @@ with lib.maintainers;
   };
 
   geospatial = {
-    members = [
-      autra
-      imincik
-      l0b0
-      nh2
-      nialov
-      sikmir
-      willcohen
-    ];
     github = "geospatial";
-    scope = "Maintain geospatial, remote sensing and OpenStreetMap software.";
-    shortName = "Geospatial";
     enableFeatureFreezePing = true;
   };
 
@@ -518,15 +412,7 @@ with lib.maintainers;
   };
 
   gnome = {
-    members = [
-      bobby285271
-      hedning
-      jtojnar
-      dasj19
-    ];
     github = "gnome";
-    scope = "Maintain GNOME desktop environment and platform.";
-    shortName = "GNOME";
     enableFeatureFreezePing = true;
   };
 
@@ -541,17 +427,7 @@ with lib.maintainers;
   };
 
   golang = {
-    members = [
-      kalbasit
-      katexochen
-      mic92
-      zowoq
-      qbit
-      mfrw
-    ];
     github = "golang";
-    scope = "Maintain Golang compilers.";
-    shortName = "Go";
     enableFeatureFreezePing = true;
   };
 
@@ -567,15 +443,7 @@ with lib.maintainers;
   };
 
   haskell = {
-    members = [
-      cdepillabout
-      maralorn
-      sternenseemann
-      wolfgangwalther
-    ];
     github = "haskell";
-    scope = "Maintain Haskell packages and infrastructure.";
-    shortName = "Haskell";
     enableFeatureFreezePing = true;
   };
 
@@ -601,16 +469,7 @@ with lib.maintainers;
   };
 
   hyprland = {
-    members = [
-      donovanglover
-      fufexan
-      johnrtitor
-      khaneliman
-      NotAShelf
-    ];
     github = "hyprland";
-    scope = "Maintain Hyprland compositor and ecosystem";
-    shortName = "Hyprland";
     enableFeatureFreezePing = true;
   };
 
@@ -632,15 +491,6 @@ with lib.maintainers;
 
   java = {
     github = "java";
-    members = [
-      chayleaf
-      fliegendewurst
-      infinidoge
-      tomodachi94
-      msgilligan
-    ];
-    shortName = "Java";
-    scope = "Maintainers of the Nixpkgs Java ecosystem (JDK, JVM, Java, Gradle, Maven, Ant, and adjacent projects)";
     enableFeatureFreezePing = true;
   };
 
@@ -679,17 +529,6 @@ with lib.maintainers;
 
   k3s = {
     github = "k3s";
-    members = [
-      euank
-      frederictobiasc
-      heywoodlh
-      marcusramberg
-      mic92
-      rorosen
-      wrmilling
-    ];
-    scope = "Maintain K3s package, NixOS module, NixOS tests, update script";
-    shortName = "K3s";
   };
 
   kodi = {
@@ -741,16 +580,7 @@ with lib.maintainers;
   };
 
   lisp = {
-    members = [
-      raskin
-      lukego
-      nagy
-      uthar
-      hraban
-    ];
     github = "lisp";
-    scope = "Maintain the Lisp ecosystem.";
-    shortName = "lisp";
     enableFeatureFreezePing = true;
   };
 
@@ -768,19 +598,7 @@ with lib.maintainers;
   };
 
   llvm = {
-    members = [
-      dtzWill
-      emily
-      ericson2314
-      lovek323
-      qyliss
-      RossComputerGuy
-      rrbutani
-      sternenseemann
-    ];
     github = "llvm";
-    scope = "Maintain LLVM package sets and related packages";
-    shortName = "LLVM";
     enableFeatureFreezePing = true;
   };
 
@@ -792,30 +610,12 @@ with lib.maintainers;
   };
 
   loongarch64 = {
-    members = [
-      aleksana
-      Cryolitia
-      darkyzhou
-      dramforever
-      wegank
-    ];
     github = "loongarch64";
-    scope = "Maintain LoongArch64 related packages and code";
-    shortName = "LoongArch64";
     enableFeatureFreezePing = true;
   };
 
   lua = {
-    members = [
-      raskin
-      khaneliman
-      teto
-      arobyn
-      scoder12
-    ];
     github = "lua";
-    scope = "Maintain the lua ecosystem.";
-    shortName = "lua";
     enableFeatureFreezePing = true;
   };
 
@@ -830,10 +630,7 @@ with lib.maintainers;
   };
 
   lumina = {
-    members = [ romildo ];
     github = "lumina";
-    scope = "Maintain lumina desktop environment and related packages.";
-    shortName = "Lumina";
     enableFeatureFreezePing = true;
   };
 
@@ -849,23 +646,12 @@ with lib.maintainers;
   };
 
   lxqt = {
-    members = [ romildo ];
     github = "lxqt";
-    scope = "Maintain LXQt desktop environment and related packages.";
-    shortName = "LXQt";
     enableFeatureFreezePing = true;
   };
 
   marketing = {
-    members = [
-      djacu
-      flyfloh
-      thilobillerbeck
-      tomberek
-    ];
     github = "marketing-team";
-    scope = "Marketing of Nix/NixOS/nixpkgs.";
-    shortName = "Marketing";
     enableFeatureFreezePing = true;
   };
 
@@ -929,15 +715,7 @@ with lib.maintainers;
   };
 
   neovim = {
-    members = [
-      GaetanLepage
-      khaneliman
-      mrcjkb
-      perchun
-    ];
     github = "neovim";
-    scope = "Maintain the vim and neovim text editors and related packages.";
-    shortName = "Vim/Neovim";
   };
 
   nextcloud = {
@@ -995,15 +773,7 @@ with lib.maintainers;
   };
 
   ocaml = {
-    members = [
-      alizter
-      redianthus
-      romildo
-      ulrikstrid
-    ];
     github = "ocaml";
-    scope = "Maintain the OCaml compiler and package set.";
-    shortName = "OCaml";
     enableFeatureFreezePing = true;
   };
 
@@ -1035,13 +805,7 @@ with lib.maintainers;
   };
 
   pantheon = {
-    members = [
-      davidak
-      bobby285271
-    ];
     github = "pantheon";
-    scope = "Maintain Pantheon desktop environment and platform.";
-    shortName = "Pantheon";
     enableFeatureFreezePing = true;
   };
 
@@ -1057,26 +821,12 @@ with lib.maintainers;
   };
 
   php = {
-    members = [
-      aanderse
-      ma27
-      piotrkwiecinski
-      talyz
-    ];
     github = "php";
-    scope = "Maintain PHP related packages and extensions.";
-    shortName = "PHP";
     enableFeatureFreezePing = true;
   };
 
   podman = {
-    members = [
-      saschagrunert
-      vdemeester
-    ];
     github = "podman";
-    scope = "Maintain Podman and CRI-O related packages and modules.";
-    shortName = "Podman";
   };
 
   postgres = {
@@ -1101,23 +851,7 @@ with lib.maintainers;
   };
 
   qt-kde = {
-    members = [
-      ilya-fedin
-      k900
-      LunNova
-      mjm
-      nickcao
-      SuperSandro2000
-      ttuegel
-      fridh
-      shamilton
-      bkchr
-      peterhoeg
-      nyanloutre
-    ];
     github = "qt-kde";
-    scope = "Maintain the Qt framework, KDE application suite, Plasma desktop environment and related projects.";
-    shortName = "Qt / KDE";
     enableFeatureFreezePing = true;
   };
 
@@ -1144,28 +878,11 @@ with lib.maintainers;
   };
 
   rocm = {
-    members = [
-      Flakebi
-      GZGavinZhao
-      LunNova
-      mschwaig
-    ];
     github = "rocm";
-    scope = "Maintain ROCm and related packages.";
-    shortName = "ROCm";
   };
 
   rust = {
-    members = [
-      figsoda
-      mic92
-      tjni
-      winter
-      zowoq
-    ];
     github = "rust";
-    scope = "Maintain the Rust compiler toolchain and nixpkgs integration.";
-    shortName = "Rust";
     enableFeatureFreezePing = true;
   };
 
@@ -1180,16 +897,7 @@ with lib.maintainers;
   };
 
   sdl = {
-    members = [
-      evythedemon
-      grimmauld
-      jansol
-      marcin-serwin
-      pbsds
-    ];
     github = "sdl";
-    scope = "Maintain core SDL libraries.";
-    shortName = "SDL";
     enableFeatureFreezePing = true;
   };
 
@@ -1216,16 +924,6 @@ with lib.maintainers;
   };
 
   stdenv = {
-    members = [
-      artturin
-      emily
-      ericson2314
-      philiptaron
-      reckenrode
-      RossComputerGuy
-    ];
-    scope = "Maintain the standard environment and its surrounding logic.";
-    shortName = "stdenv";
     enableFeatureFreezePing = true;
     github = "stdenv";
   };
@@ -1262,16 +960,7 @@ with lib.maintainers;
   };
 
   systemd = {
-    members = [
-      flokli
-      arianvp
-      elvishjerricco
-      aanderse
-      grimmauld
-    ];
     github = "systemd";
-    scope = "Maintain systemd for NixOS.";
-    shortName = "systemd";
     enableFeatureFreezePing = true;
   };
 
@@ -1321,14 +1010,6 @@ with lib.maintainers;
   };
 
   xen = {
-    members = [
-      hehongbo
-      lach
-      sigmasquadron
-      rane
-    ];
-    scope = "Maintain the Xen Project Hypervisor and the related tooling ecosystem.";
-    shortName = "Xen Project Hypervisor";
     enableFeatureFreezePing = true;
     github = "xen-project";
   };

From ddf8b5da4a6d7fc8b30387e5a5626b0309967cca Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Sat, 11 Oct 2025 02:34:54 +0200
Subject: [PATCH 3341/6226] lib.teams: Add githubMaintainers field

This is so you can figure out who to ask to get added to the team

Also avoid an unecessary `{ inherit lib; }` argument
---
 lib/tests/teams.nix                | 6 +++++-
 maintainers/computed-team-list.nix | 1 +
 maintainers/team-list.nix          | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/lib/tests/teams.nix b/lib/tests/teams.nix
index ffe746a781ca..726e7f63a8e9 100644
--- a/lib/tests/teams.nix
+++ b/lib/tests/teams.nix
@@ -24,13 +24,17 @@ let
           default = false;
         };
         members = lib.mkOption {
-          type = types.listOf (types.submodule (import ./maintainer-module.nix { inherit lib; }));
+          type = types.listOf (types.submodule ./maintainer-module.nix);
           default = [ ];
         };
         github = lib.mkOption {
           type = types.str;
           default = "";
         };
+        githubMaintainers = lib.mkOption {
+          type = types.listOf (types.submodule ./maintainer-module.nix);
+          default = [ ];
+        };
       };
     };
 
diff --git a/maintainers/computed-team-list.nix b/maintainers/computed-team-list.nix
index f9413d76e453..bcb8a0f9c237 100644
--- a/maintainers/computed-team-list.nix
+++ b/maintainers/computed-team-list.nix
@@ -43,6 +43,7 @@ lib.mapAttrs (
       members =
         maintainerSetToList attrs.github githubTeam.maintainers
         ++ maintainerSetToList attrs.github githubTeam.members;
+      githubMaintainers = maintainerSetToList attrs.github githubTeam.maintainers;
     }
   else
     attrs
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 8d3db897020b..b9c155748e38 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -18,6 +18,10 @@
       or larger ecosystems within nixpkgs.
   - `github` will ping the specified GitHub team and sync the `members`, `scope` and `shortName` fields from it
 
+  If `github` is specified and you'd like to be added to the team, contact one of the `githubMaintainers` of the team:
+
+      nix eval -f lib teams.someTeam.githubMaintainers --json | jq
+
   More fields may be added in the future.
 
   When editing this file:

From 799aad5700e1d89f3dd1c81e9be0a0294e56304d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 18:42:31 +0000
Subject: [PATCH 3342/6226] unordered_dense: 4.7.0 -> 4.8.0

---
 pkgs/by-name/un/unordered_dense/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/un/unordered_dense/package.nix b/pkgs/by-name/un/unordered_dense/package.nix
index eb22d59b56e0..41d1f23ef0bf 100644
--- a/pkgs/by-name/un/unordered_dense/package.nix
+++ b/pkgs/by-name/un/unordered_dense/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "unordered-dense";
-  version = "4.7.0";
+  version = "4.8.0";
 
   src = fetchFromGitHub {
     owner = "martinus";
     repo = "unordered_dense";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-j+iBqmedykRYJm8Q6WudQrfPc1CHP9URHip+gkFhK0I=";
+    hash = "sha256-irjzMx0QVE6W/Tg4TV+RNw1kD16yIJPR3sBseauu6AQ=";
   };
 
   nativeBuildInputs = [

From c26ad54c54ea56c0fb5839e203764144b8b07de7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 18:44:57 +0000
Subject: [PATCH 3343/6226] python3Packages.oelint-data: 1.2.0 -> 1.2.1

---
 pkgs/development/python-modules/oelint-data/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix
index a891acd22764..6c5294c91cda 100644
--- a/pkgs/development/python-modules/oelint-data/default.nix
+++ b/pkgs/development/python-modules/oelint-data/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "oelint-data";
-  version = "1.2.0";
+  version = "1.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-data";
     tag = version;
-    hash = "sha256-pF7Wg9N/ScmboNcZ97rWFEsoHNlKOazey56jPw70u6Q=";
+    hash = "sha256-RjjuzjmUbTfmX1W7p+7+pO8O8dh+WInxPgMSJsLMLyU=";
   };
 
   build-system = [

From ab34079b8316f635fdafe64485ead873405e647a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 18:46:06 +0000
Subject: [PATCH 3344/6226] rkik: 1.1.1 -> 1.2.0

---
 pkgs/by-name/rk/rkik/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/rk/rkik/package.nix b/pkgs/by-name/rk/rkik/package.nix
index 7f09ebf22ed4..b75972ae0be1 100644
--- a/pkgs/by-name/rk/rkik/package.nix
+++ b/pkgs/by-name/rk/rkik/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rkik";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchFromGitHub {
     owner = "aguacero7";
     repo = "rkik";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zC06Wt8XNpSSru7GUC2VAiP6t6fuWdpinXoIuBSk7kw=";
+    hash = "sha256-bT1WTs/gei8CGundLynVgekNFlyY8p/mK73Utrw8N9I=";
   };
 
-  cargoHash = "sha256-XMO7imFg/f+1KzNTrGLzxZ3yRSvD2WxSKpHCIT99xEk=";
+  cargoHash = "sha256-iu9vADHhems0pzQ0Hs+Zp0dZ4K185M5L4fftBaAZdvE=";
 
   passthru.updateScript = nix-update-script { };
 

From e9c02b33d4779e377a004f253aeb5128a7cf3f98 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 18:46:37 +0000
Subject: [PATCH 3345/6226] smug: 0.3.8 -> 0.3.11

---
 pkgs/by-name/sm/smug/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sm/smug/package.nix b/pkgs/by-name/sm/smug/package.nix
index e86c4b96de3f..e6f1f6ea362f 100644
--- a/pkgs/by-name/sm/smug/package.nix
+++ b/pkgs/by-name/sm/smug/package.nix
@@ -7,7 +7,7 @@
 
 buildGoModule rec {
   pname = "smug";
-  version = "0.3.8";
+  version = "0.3.11";
 
   subPackages = [ "." ];
 
@@ -15,10 +15,10 @@ buildGoModule rec {
     owner = "ivaaaan";
     repo = "smug";
     rev = "v${version}";
-    sha256 = "sha256-m6yK7WPfrItIR3ULJgnw+oysX+zlotiIZMyr4SkPPdM=";
+    sha256 = "sha256-NUnabx71q/yrkGsdYa9qruyTLjk/sJBvV7bzoKn+eLo=";
   };
 
-  vendorHash = "sha256-vaDUzVRmpmNn8/vUPeR1U5N6T4llFRIk9A1lum8uauU=";
+  vendorHash = "sha256-N6btfKjhJ0MkXAL4enyNfnJk8vUeUDCRus5Fb7hNtug=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From d8a0ae9d79b2914faf8864c94e552211284094c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 19:01:05 +0000
Subject: [PATCH 3346/6226] strongswan: 6.0.2 -> 6.0.3

---
 pkgs/by-name/st/strongswan/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/strongswan/package.nix b/pkgs/by-name/st/strongswan/package.nix
index d8f46ac8f746..b8debe3c96a9 100644
--- a/pkgs/by-name/st/strongswan/package.nix
+++ b/pkgs/by-name/st/strongswan/package.nix
@@ -122,13 +122,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "strongswan";
-  version = "6.0.2"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading!
+  version = "6.0.3"; # Make sure to also update <nixpkgs/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix> when upgrading!
 
   src = fetchFromGitHub {
     owner = "strongswan";
     repo = "strongswan";
     tag = version;
-    hash = "sha256-wjz41gt+Xu4XJkEXRRVl3b3ryEoEtijeqmfVFoRjnA4=";
+    hash = "sha256-uH6RExDOmrm1LBi0zBrCn+qp2oL522mdshe62UDV8I0=";
   };
 
   patches = [

From 246fb2fb2dc856489475b5017f2c12ea814ee281 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 19:04:52 +0000
Subject: [PATCH 3347/6226] qalculate-gtk: 5.8.0 -> 5.8.1

---
 pkgs/by-name/qa/qalculate-gtk/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qa/qalculate-gtk/package.nix b/pkgs/by-name/qa/qalculate-gtk/package.nix
index ecc3701fc1cf..decf9ef9cde4 100644
--- a/pkgs/by-name/qa/qalculate-gtk/package.nix
+++ b/pkgs/by-name/qa/qalculate-gtk/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qalculate-gtk";
-  version = "5.8.0";
+  version = "5.8.1";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-gtk";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cK710enmkSgp3r4MEfyWac/V7mMs+CPxq0LrdX2jZTQ=";
+    hash = "sha256-+vyFdenXp/lLYoD0LwVUf9v8bVw2+NH6q2HiP349Ajw=";
   };
 
   hardeningDisable = [ "format" ];

From 844754e64327dd5f996c5e91f1bbd6e7a8f7baff Mon Sep 17 00:00:00 2001
From: Charlotte Van Petegem <charlotte@vanpetegem.be>
Date: Mon, 27 Oct 2025 20:12:51 +0100
Subject: [PATCH 3348/6226] eid-mw: 5.1.23 -> 5.1.25

---
 pkgs/by-name/ei/eid-mw/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ei/eid-mw/package.nix b/pkgs/by-name/ei/eid-mw/package.nix
index c632cacdd15c..0664e0a80fe9 100644
--- a/pkgs/by-name/ei/eid-mw/package.nix
+++ b/pkgs/by-name/ei/eid-mw/package.nix
@@ -23,13 +23,13 @@
 stdenv.mkDerivation rec {
   pname = "eid-mw";
   # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS.
-  version = "5.1.23";
+  version = "5.1.25";
 
   src = fetchFromGitHub {
     owner = "Fedict";
     repo = "eid-mw";
     rev = "v${version}";
-    hash = "sha256-nZn3LSXn8g0mtorJZjE9nc8vf99buwvW1fdxHOAsIwU=";
+    hash = "sha256-LdOfwgRGyNK+a4SByClPgH9SrDeCdnhI9sLO7agsNsA=";
   };
 
   postPatch = ''

From 87a554621aebca1e574bdb553fc8613c1bb6f558 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Mon, 27 Oct 2025 20:12:13 +0100
Subject: [PATCH 3349/6226] ocamlPackages.domain-name: 0.4.1 -> 0.5.0

---
 .../ocaml-modules/domain-name/default.nix      | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/ocaml-modules/domain-name/default.nix b/pkgs/development/ocaml-modules/domain-name/default.nix
index 2e1682076efe..279641b3d67f 100644
--- a/pkgs/development/ocaml-modules/domain-name/default.nix
+++ b/pkgs/development/ocaml-modules/domain-name/default.nix
@@ -1,31 +1,27 @@
 {
   lib,
   buildDunePackage,
-  ocaml,
   fetchurl,
   alcotest,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "domain-name";
-  version = "0.4.1";
+  version = "0.5.0";
 
   src = fetchurl {
-    url = "https://github.com/hannesm/domain-name/releases/download/v${version}/domain-name-${version}.tbz";
-    sha256 = "sha256-Hboy81p81cyBh9IeLMIaC2Z6ZFRHoO7+V6/jyiW8RWY=";
+    url = "https://github.com/hannesm/domain-name/releases/download/v${finalAttrs.version}/domain-name-${finalAttrs.version}.tbz";
+    hash = "sha256-nseuLCJ3LBULhM+j8h2b8l+uFKeW8x4g31LYb0ZJnYk=";
   };
 
-  minimalOCamlVersion = "4.04";
-  duneVersion = "3";
-
+  doCheck = true;
   checkInputs = [ alcotest ];
 
-  doCheck = lib.versionAtLeast ocaml.version "4.08";
-
   meta = {
     homepage = "https://github.com/hannesm/domain-name";
+    changelog = "https://github.com/hannesm/domain-name/blob/v${finalAttrs.version}/CHANGES.md";
     description = "RFC 1035 Internet domain names";
     license = lib.licenses.isc;
     maintainers = [ lib.maintainers.vbgl ];
   };
-}
+})

From 1360493b853d4df2cbddcc5834deebf3bed742be Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Fri, 24 Oct 2025 14:50:34 +0200
Subject: [PATCH 3350/6226] ocamlPackages.magic-trace: fix platforms

---
 .../ocaml-modules/magic-trace/default.nix         | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/ocaml-modules/magic-trace/default.nix b/pkgs/development/ocaml-modules/magic-trace/default.nix
index 8bf19a921081..4debd6a5994c 100644
--- a/pkgs/development/ocaml-modules/magic-trace/default.nix
+++ b/pkgs/development/ocaml-modules/magic-trace/default.nix
@@ -18,7 +18,7 @@
   zstandard ? null,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "magic-trace";
   version = "1.2.4";
 
@@ -27,13 +27,14 @@ buildDunePackage rec {
   src = fetchFromGitHub {
     owner = "janestreet";
     repo = "magic-trace";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-LkhnlOd5rI8cbOYbVqrkRJ2qTcRn3Zzl6GjQEdjBjVA=";
   };
 
   nativeBuildInputs = [
     ocaml-crunch
   ];
+
   buildInputs = [
     angstrom
     async
@@ -50,10 +51,12 @@ buildDunePackage rec {
     zstandard
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Collects and displays high-resolution traces of what a process is doing";
-    license = licenses.mit;
-    maintainers = [ maintainers.alizter ];
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.alizter ];
     homepage = "https://github.com/janestreet/magic-trace";
+    platforms = lib.platforms.linux;
+    mainProgram = "magic-trace";
   };
-}
+})

From a3330d2d6c56cc18f68f961ffd543c0d0a887afa Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Fri, 24 Oct 2025 14:53:00 +0200
Subject: [PATCH 3351/6226] ocamlPackages.tls-eio: fix test on darwin

---
 pkgs/development/ocaml-modules/tls/eio.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/ocaml-modules/tls/eio.nix b/pkgs/development/ocaml-modules/tls/eio.nix
index ef32131a26b1..f04129b6d26b 100644
--- a/pkgs/development/ocaml-modules/tls/eio.nix
+++ b/pkgs/development/ocaml-modules/tls/eio.nix
@@ -17,6 +17,8 @@ buildDunePackage {
 
   minimalOCamlVersion = "5.0";
 
+  __darwinAllowLocalNetworking = true;
+
   doCheck = true;
   nativeCheckInputs = [
     mdx.bin

From 1692ed589f13f01da84a148e25954a5febc336a0 Mon Sep 17 00:00:00 2001
From: Yifei Sun <ysun@hey.com>
Date: Fri, 24 Oct 2025 15:07:34 +0200
Subject: [PATCH 3352/6226] seppo: 0-unstable-2025-06-03 ->
 0-unstable-2025-08-07

---
 pkgs/by-name/se/seppo/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/seppo/package.nix b/pkgs/by-name/se/seppo/package.nix
index 3121d2274cc9..0c5488c639ff 100644
--- a/pkgs/by-name/se/seppo/package.nix
+++ b/pkgs/by-name/se/seppo/package.nix
@@ -12,14 +12,14 @@ in
 
 ocamlPackages.buildDunePackage {
   pname = "seppo";
-  version = "0-unstable-2025-06-03";
+  version = "0-unstable-2025-08-07";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "seppo";
     repo = "seppo";
-    rev = "33ae3e9f61d596fb91d3ab1a91fc26ae80981a93";
-    hash = "sha256-tOIIfYBLcZqQzoPxAVkE8RGX0sugUmDGpxIhIZ5Wy+w=";
+    rev = "d927311cae64883fe2b88f5a1c7e17c8cc525bad";
+    hash = "sha256-Lb2w0mRNNamCltAwdxOyAYh02wkN7yKJGBzqBIPKE8k=";
   };
 
   # Provide git sha to avoid git dependency

From 670998b12c7a9b409d6fe99b8635faf110f0662c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 19:37:41 +0000
Subject: [PATCH 3353/6226] signalbackup-tools: 20251021 -> 20251027-1

---
 pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index 2b8d0dcce12b..005d596f6649 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "signalbackup-tools";
-  version = "20251021";
+  version = "20251027-1";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     tag = version;
-    hash = "sha256-m9Mg55e9M/v+0ucW6RMNBnY4JLJGY43jwFWufpv2xSY=";
+    hash = "sha256-655wJttNBFV35Ji4W46CrjwcFRU76evsCUDJX7j5ZSg=";
   };
 
   nativeBuildInputs = [

From 7939cb647218b529eb32dce00d28159f98ed4ed1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 19:47:08 +0000
Subject: [PATCH 3354/6226] lazysql: 0.4.2 -> 0.4.3

---
 pkgs/by-name/la/lazysql/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix
index e70efd6f60d5..a494089d4e02 100644
--- a/pkgs/by-name/la/lazysql/package.nix
+++ b/pkgs/by-name/la/lazysql/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "lazysql";
-  version = "0.4.2";
+  version = "0.4.3";
 
   src = fetchFromGitHub {
     owner = "jorgerojas26";
     repo = "lazysql";
     rev = "v${version}";
-    hash = "sha256-6tPSr28Ja7LuwWrcqSYLxxQj8e9XCgTWxzudjXOriBg=";
+    hash = "sha256-mab6YZPOq6DerBrHK3UQrccrM8Jtp9nu2bzUus2zLYs=";
   };
 
   vendorHash = "sha256-NGwCTEh1/5dJWOCSe18FZYYu8v7Mj6MWVEWyNNA1T68=";

From 52261a93184a6960219aa00e8de934218457a276 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 19:49:15 +0000
Subject: [PATCH 3355/6226] libqalculate: 5.8.0 -> 5.8.1

---
 pkgs/by-name/li/libqalculate/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libqalculate/package.nix b/pkgs/by-name/li/libqalculate/package.nix
index 886ad3b2f7bb..0e134bdf8afc 100644
--- a/pkgs/by-name/li/libqalculate/package.nix
+++ b/pkgs/by-name/li/libqalculate/package.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libqalculate";
-  version = "5.8.0";
+  version = "5.8.1";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "libqalculate";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8rw+SPRGWTdlJkrqSk7FXKMgOWSfErlC8FXqQM49o8A=";
+    hash = "sha256-SxBO3isyxiJBwo12mVH6A/pmHxTgjfMhG6KVb7bk5B4=";
   };
 
   outputs = [

From eee7bdfde82443e9a24448ec9814d5d05c667871 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 19:55:36 +0000
Subject: [PATCH 3356/6226] infrastructure-agent: 1.70.0 -> 1.71.0

---
 pkgs/by-name/in/infrastructure-agent/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix
index fa772b3efc52..13783b7e214f 100644
--- a/pkgs/by-name/in/infrastructure-agent/package.nix
+++ b/pkgs/by-name/in/infrastructure-agent/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule rec {
   pname = "infrastructure-agent";
-  version = "1.70.0";
+  version = "1.71.0";
 
   src = fetchFromGitHub {
     owner = "newrelic";
     repo = "infrastructure-agent";
     rev = version;
-    hash = "sha256-VdBcVFDtPajmAAQe2aZONf0/pCMf98gtR9zoeqL1aKQ=";
+    hash = "sha256-MUutpXutrSKmKj2D1ENu00YbEkDkfrTbATQzXvaeiTo=";
   };
 
   vendorHash = "sha256-KBzckYxiQ4/nhm7ZfGQDGi5uN652oZgdc9i0UexMr24=";

From 8665289c040bfdcf17712b5b6d87740a45f7145c Mon Sep 17 00:00:00 2001
From: Tomas Drtina <tdrtina-ext@arista.com>
Date: Mon, 27 Oct 2025 12:45:14 -0700
Subject: [PATCH 3357/6226] python3Packages.numpy-typing-compat: init at
 20250818.2.3

---
 .../numpy-typing-compat/default.nix           | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/numpy-typing-compat/default.nix

diff --git a/pkgs/development/python-modules/numpy-typing-compat/default.nix b/pkgs/development/python-modules/numpy-typing-compat/default.nix
new file mode 100644
index 000000000000..65be52b9dc8f
--- /dev/null
+++ b/pkgs/development/python-modules/numpy-typing-compat/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+  uv-build,
+  numpy,
+}:
+
+buildPythonPackage rec {
+  pname = "numpy-typing-compat";
+  version = "20250818.2.3";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "numpy_typing_compat";
+    inherit version;
+    hash = "sha256-cug9U1tjXWaLpzFeQ66AvhRppvrqb8ltMSUW85s9j6U=";
+  };
+
+  build-system = [
+    uv-build
+  ];
+
+  dependencies = [
+    numpy
+  ];
+
+  pythonImportsCheck = [
+    "numpy_typing_compat"
+  ];
+
+  meta = {
+    description = "Static typing compatibility layer for older versions of NumPy";
+    homepage = "https://pypi.org/project/numpy-typing-compat/";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ tm-drtina ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7c30ff851608..85dd35dbdf20 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10746,6 +10746,8 @@ self: super: with self; {
 
   numpy-stl = callPackage ../development/python-modules/numpy-stl { };
 
+  numpy-typing-compat = callPackage ../development/python-modules/numpy-typing-compat { };
+
   numpy_1 = callPackage ../development/python-modules/numpy/1.nix { };
 
   numpy_2 = callPackage ../development/python-modules/numpy/2.nix { };

From 28150f6d2bfab4f830afa4a1a7cb914f5ae578e1 Mon Sep 17 00:00:00 2001
From: Tomas Drtina <tdrtina-ext@arista.com>
Date: Mon, 27 Oct 2025 12:48:02 -0700
Subject: [PATCH 3358/6226] python3Packages.optype: 0.13.1 -> 0.14.0, switch to
 uv_build

---
 pkgs/development/python-modules/optype/default.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/optype/default.nix b/pkgs/development/python-modules/optype/default.nix
index e810b2744f41..acf01ae469ba 100644
--- a/pkgs/development/python-modules/optype/default.nix
+++ b/pkgs/development/python-modules/optype/default.nix
@@ -2,9 +2,10 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  hatchling,
+  uv-build,
   typing-extensions,
   numpy,
+  numpy-typing-compat,
   beartype,
   pytestCheckHook,
   pythonOlder,
@@ -12,20 +13,20 @@
 
 buildPythonPackage rec {
   pname = "optype";
-  version = "0.13.1";
+  version = "0.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jorenham";
     repo = "optype";
     tag = "v${version}";
-    hash = "sha256-GhG2TR5FJgEXBXLyGTNQKFYtR2iZ0tLgZ9B0YL8SXu8=";
+    hash = "sha256-0CE6dU4Vt3UP8ZfNcmP2Th7ixceCa0ItYUmNcEU7mgw=";
   };
 
   disabled = pythonOlder "3.11";
 
   build-system = [
-    hatchling
+    uv-build
   ];
 
   dependencies = [
@@ -35,6 +36,7 @@ buildPythonPackage rec {
   optional-dependencies = {
     numpy = [
       numpy
+      numpy-typing-compat
     ];
   };
 
@@ -45,6 +47,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     numpy
+    numpy-typing-compat
     beartype
   ];
 

From 12b90019f2f93f618aa23310d6e83e7d1ed219c8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 20:42:32 +0000
Subject: [PATCH 3359/6226] giada: 1.3.0 -> 1.3.1

---
 pkgs/by-name/gi/giada/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/giada/package.nix b/pkgs/by-name/gi/giada/package.nix
index 8a7490e12738..e680366bd2fc 100644
--- a/pkgs/by-name/gi/giada/package.nix
+++ b/pkgs/by-name/gi/giada/package.nix
@@ -30,13 +30,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "giada";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "monocasual";
     repo = "giada";
     tag = finalAttrs.version;
-    hash = "sha256-f7Rtp/z7Z9P5TSI0UQbSuU4ukVrePKtSdihc1f3AAfo=";
+    hash = "sha256-MIGDaZLSwSIIZ2vXYuhGur0Ya1HX2yhrhafAawqU/+A=";
     fetchSubmodules = true;
   };
 

From d980389d2c550f8b8cb6c4666aecc645fcb3a8a1 Mon Sep 17 00:00:00 2001
From: Tomas Drtina <tdrtina-ext@arista.com>
Date: Mon, 27 Oct 2025 13:07:31 -0700
Subject: [PATCH 3360/6226] python3Packages.scipy-stubs: 1.16.1.0 -> 1.16.2.4,
 switch to uv_build

---
 .../python-modules/scipy-stubs/default.nix          | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/scipy-stubs/default.nix b/pkgs/development/python-modules/scipy-stubs/default.nix
index 984c29e674e4..20f5438df541 100644
--- a/pkgs/development/python-modules/scipy-stubs/default.nix
+++ b/pkgs/development/python-modules/scipy-stubs/default.nix
@@ -3,27 +3,32 @@
   buildPythonPackage,
   fetchFromGitHub,
   pythonOlder,
-  hatchling,
+  uv-build,
   optype,
   scipy,
 }:
 
 buildPythonPackage rec {
   pname = "scipy-stubs";
-  version = "1.16.1.0";
+  version = "1.16.2.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scipy";
     repo = "scipy-stubs";
     tag = "v${version}";
-    hash = "sha256-KRwFQG1Nb+Kh9OpQCGtvUzQA0MHNEZnRlzSkpZCNxuw=";
+    hash = "sha256-cmX9uS055kHvmCmsILEyTxW0p9C8xfD3N7HPBVCmIVI=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv_build>=0.9.0,<0.10.0" "uv_build"
+  '';
+
   disabled = pythonOlder "3.11";
 
   build-system = [
-    hatchling
+    uv-build
   ];
 
   dependencies = [

From 42d4f853a06af4b2e66ccc10c06eb0cbc424aae2 Mon Sep 17 00:00:00 2001
From: Mauricio Collares <mauricio@collares.org>
Date: Mon, 27 Oct 2025 17:50:34 -0300
Subject: [PATCH 3361/6226] libhomfly: 1.02r6 -> 1.03

---
 pkgs/by-name/li/libhomfly/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libhomfly/package.nix b/pkgs/by-name/li/libhomfly/package.nix
index d215d398b659..0a31d077ca76 100644
--- a/pkgs/by-name/li/libhomfly/package.nix
+++ b/pkgs/by-name/li/libhomfly/package.nix
@@ -3,18 +3,19 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
+  pkg-config,
   boehmgc,
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.02r6";
+  version = "1.03";
   pname = "libhomfly";
 
   src = fetchFromGitHub {
     owner = "miguelmarco";
     repo = "libhomfly";
     rev = version;
-    sha256 = "sha256-s1Hgy6S9+uREKsgjOVQdQfnds6oSLo5UWTrt5DJnY2s=";
+    hash = "sha256-lav/c5i4TXiQSp4r376sy7s+xLO85GutTb/UZJ70gh8=";
   };
 
   buildInputs = [
@@ -23,6 +24,7 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     autoreconfHook
+    pkg-config
   ];
 
   doCheck = true;

From 3bf3d440e9da46e8aafed12866da027ed20eac13 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 20:51:41 +0000
Subject: [PATCH 3362/6226] grype: 0.101.1 -> 0.102.0

---
 pkgs/by-name/gr/grype/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix
index 7511cfb7626f..552c4ecf8c24 100644
--- a/pkgs/by-name/gr/grype/package.nix
+++ b/pkgs/by-name/gr/grype/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "grype";
-  version = "0.101.1";
+  version = "0.102.0";
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "grype";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EbRkK8qTEP1UICqHs4V4xteh/bUh3WxlRihPtUcJw6M=";
+    hash = "sha256-aYY/AYHbPWs5Rtbfsvam0lE3WzcJHt6LHQ6us2dukFI=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -32,7 +32,7 @@ buildGoModule (finalAttrs: {
 
   proxyVendor = true;
 
-  vendorHash = "sha256-Zqtd10KrmAH5yOvKnCl8w8neLsQPylr4lFAU5OTm7Kk=";
+  vendorHash = "sha256-N/J+Y3PohhnChOIEn4ZITaKEK62gwuApNf1XEZVL23k=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 22037eb85dbd5daa92d66542f75ea7626c4655ad Mon Sep 17 00:00:00 2001
From: Mauricio Collares <mauricio@collares.org>
Date: Mon, 27 Oct 2025 17:53:09 -0300
Subject: [PATCH 3363/6226] cliquer: 1.22 -> 1.23

---
 pkgs/by-name/cl/cliquer/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/cliquer/package.nix b/pkgs/by-name/cl/cliquer/package.nix
index 9cdceddfe00a..8984752c560d 100644
--- a/pkgs/by-name/cl/cliquer/package.nix
+++ b/pkgs/by-name/cl/cliquer/package.nix
@@ -3,10 +3,11 @@
   stdenv,
   fetchFromGitHub,
   autoreconfHook,
+  pkg-config,
 }:
 
 stdenv.mkDerivation rec {
-  version = "1.22";
+  version = "1.23";
   pname = "cliquer";
 
   # autotoolized version of the original cliquer
@@ -14,13 +15,14 @@ stdenv.mkDerivation rec {
     owner = "dimpase";
     repo = "autocliquer";
     rev = "v${version}";
-    sha256 = "00gcmrhi2fjn8b246w5a3b0pl7p6haxy5wjvd9kcqib1xanz59z4";
+    hash = "sha256-SGpur3sF1dYQU97wprERUqlr6LIX+NyXZVl0eSEd3uM=";
   };
 
   doCheck = true;
 
   nativeBuildInputs = [
     autoreconfHook
+    pkg-config
   ];
 
   meta = with lib; {

From 940266bd12478dce8b3bd0d633308cce51fe40bc Mon Sep 17 00:00:00 2001
From: Stefan Junker <mail@stefanjunker.de>
Date: Mon, 27 Oct 2025 21:31:37 +0100
Subject: [PATCH 3364/6226] libsciter: add aarch64-linux support

---
 pkgs/by-name/li/libsciter/package.nix | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libsciter/package.nix b/pkgs/by-name/li/libsciter/package.nix
index c920db6c1a45..a5a31a65b4c8 100644
--- a/pkgs/by-name/li/libsciter/package.nix
+++ b/pkgs/by-name/li/libsciter/package.nix
@@ -10,13 +10,28 @@
   autoPatchelfHook,
 }:
 
+let
+  inherit (stdenv.targetPlatform) system;
+
+  src.x86_64-linux = {
+    urlPath = "x64";
+    sha256 = "a1682fbf55e004f1862d6ace31b5220121d20906bdbf308d0a9237b451e4db86";
+  };
+
+  src.aarch64-linux = {
+    urlPath = "arm64";
+    sha256 = "sha256-bqGPbvtOM8/A6acDbFJGGf4kzKo/4S/bWcH/XvxVySU=";
+  };
+
+in
+
 stdenv.mkDerivation {
   pname = "libsciter";
   version = "4.4.8.23-bis"; # Version specified in GitHub commit title
 
   src = fetchurl {
-    url = "https://github.com/c-smile/sciter-sdk/raw/9f1724a45f5a53c4d513b02ed01cdbdab08fa0e5/bin.lnx/x64/libsciter-gtk.so";
-    sha256 = "a1682fbf55e004f1862d6ace31b5220121d20906bdbf308d0a9237b451e4db86";
+    url = "https://github.com/c-smile/sciter-sdk/raw/524a90ef7eab16575df9496f7e4c374bbd5fb1fe/bin.lnx/${src.${system}.urlPath}/libsciter-gtk.so";
+    inherit (src.${system}) sha256;
   };
 
   nativeBuildInputs = [
@@ -44,7 +59,10 @@ stdenv.mkDerivation {
   meta = with lib; {
     homepage = "https://sciter.com";
     description = "Embeddable HTML/CSS/JavaScript engine for modern UI development";
-    platforms = [ "x86_64-linux" ];
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
     maintainers = with maintainers; [ leixb ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;

From 1b1060cf058871124a380b12c994a4145e8e27cf Mon Sep 17 00:00:00 2001
From: Alex Epelde <alex@epelde.net>
Date: Thu, 23 Oct 2025 12:09:21 -0400
Subject: [PATCH 3365/6226] luajit_openresty: 2.1-20220915 -> 2.1-20250826

---
 pkgs/development/interpreters/luajit/openresty.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/luajit/openresty.nix b/pkgs/development/interpreters/luajit/openresty.nix
index 5a1397ec3da1..c079cdbbd174 100644
--- a/pkgs/development/interpreters/luajit/openresty.nix
+++ b/pkgs/development/interpreters/luajit/openresty.nix
@@ -6,13 +6,13 @@
 }:
 
 callPackage ./default.nix rec {
-  version = "2.1-20220915";
+  version = "2.1-20250826";
 
   src = fetchFromGitHub {
     owner = "openresty";
     repo = "luajit2";
     rev = "v${version}";
-    hash = "sha256-kMHE4iQtm2CujK9TVut1jNhY2QxYP514jfBsxOCyd4s=";
+    hash = "sha256-fF3xgAy2IjFy4LdXPlk4RuX+IclOXaw3YR24wyMBNgM=";
   };
 
   inherit self passthruFun;

From 68d3e4fa94d70bf6a4768dccd4f6fdf68bd9d2cd Mon Sep 17 00:00:00 2001
From: Alex Epelde <alex@epelde.net>
Date: Sat, 20 Sep 2025 17:59:20 -0400
Subject: [PATCH 3366/6226] luaPackages.lua-resty-lrucache: 0.13 -> 0.15

---
 pkgs/top-level/lua-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index c9f0b72cd552..2d445f59a650 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -184,13 +184,13 @@ rec {
     { fetchFromGitHub }:
     buildLuaPackage rec {
       pname = "lua-resty-lrucache";
-      version = "0.13";
+      version = "0.15";
 
       src = fetchFromGitHub {
         owner = "openresty";
         repo = "lua-resty-lrucache";
         rev = "v${version}";
-        sha256 = "sha256-J8RNAMourxqUF8wPKd8XBhNwGC/x1KKvrVnZtYDEu4Q=";
+        sha256 = "sha256-G2l4Zo9Xm/m4zRfxrgzEvRE5LMO+UuX3kd7FwlCnxDA=";
       };
 
       meta = with lib; {

From 986d621826ca27e48c5e53709079e797cca708a1 Mon Sep 17 00:00:00 2001
From: Alex Epelde <alex@epelde.net>
Date: Sat, 20 Sep 2025 17:59:02 -0400
Subject: [PATCH 3367/6226] luaPackages.lua-resty-core: 0.1.28 -> 0.1.31

---
 pkgs/top-level/lua-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix
index 2d445f59a650..6ac705ba1ade 100644
--- a/pkgs/top-level/lua-packages.nix
+++ b/pkgs/top-level/lua-packages.nix
@@ -160,13 +160,13 @@ rec {
     { fetchFromGitHub }:
     buildLuaPackage rec {
       pname = "lua-resty-core";
-      version = "0.1.28";
+      version = "0.1.31";
 
       src = fetchFromGitHub {
         owner = "openresty";
         repo = "lua-resty-core";
         rev = "v${version}";
-        sha256 = "sha256-RJ2wcHTu447wM0h1fa2qCBl4/p9XL6ZqX9pktRW64RI=";
+        sha256 = "sha256-WUiBFJ8L8NzSGoEwTAw/iHAzPqJqaOUSFyqGeEf+f94==";
       };
 
       propagatedBuildInputs = [ lua-resty-lrucache ];

From 6a0f6a042fbdb24d8d1d95966e72074c40a00bde Mon Sep 17 00:00:00 2001
From: Alex Epelde <alex@epelde.net>
Date: Sat, 20 Sep 2025 17:11:01 -0400
Subject: [PATCH 3368/6226] nginxModules.lua: 0.10.26 -> 0.10.28

---
 pkgs/servers/http/nginx/modules.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix
index ded98d770493..b7b8c50e7a21 100644
--- a/pkgs/servers/http/nginx/modules.nix
+++ b/pkgs/servers/http/nginx/modules.nix
@@ -384,14 +384,14 @@ let
 
     lua = rec {
       name = "lua";
-      version = "0.10.26";
+      version = "0.10.28";
 
       src = fetchFromGitHub {
         name = "lua";
         owner = "openresty";
         repo = "lua-nginx-module";
         rev = "v${version}";
-        hash = "sha256-007up/XncaSBimBumHpbwgB1WnkXgBe8e/q/yT6vthI=";
+        hash = "sha256-GT1PpJWpEu5EciK4n9ZDz1gIU/ZdC/SAsIdu0niQy8o=";
       };
 
       inputs = [ luajit_openresty ];

From b6c855e7a3194460258608b167785dc25f006647 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 27 Oct 2025 14:32:32 -0700
Subject: [PATCH 3369/6226] python3Packages.construct-typing: 0.6.2 -> 0.7.0

Diff: https://github.com/timrid/construct-typing/compare/v0.6.2...v0.7.0

Changelog: https://github.com/timrid/construct-typing/releases/tag/v0.7.0
---
 .../python-modules/construct-typing/default.nix | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/construct-typing/default.nix b/pkgs/development/python-modules/construct-typing/default.nix
index d56525e538fa..071d73658370 100644
--- a/pkgs/development/python-modules/construct-typing/default.nix
+++ b/pkgs/development/python-modules/construct-typing/default.nix
@@ -8,6 +8,7 @@
   typing-extensions,
   arrow,
   cloudpickle,
+  cryptography,
   numpy,
   pytestCheckHook,
   ruamel-yaml,
@@ -15,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "construct-typing";
-  version = "0.6.2";
+  version = "0.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "timrid";
     repo = "construct-typing";
     tag = "v${version}";
-    hash = "sha256-zXpxu+VUcepEoAPLQnSlMCZkt8fDsMCLS0HBKhaYD20=";
+    hash = "sha256-iiMnt/f1ppciL6AVq3q0wOtoARcNYJycQA5Ev+dIow8=";
   };
 
   build-system = [ setuptools ];
@@ -42,22 +43,12 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     arrow
     cloudpickle
+    cryptography
     numpy
     pytestCheckHook
     ruamel-yaml
   ];
 
-  disabledTests = [
-    # tests fail with construct>=2.10.70
-    "test_bitsinteger"
-    "test_bytesinteger"
-  ]
-  ++ lib.optionals (pythonAtLeast "3.13") [
-    # https://github.com/timrid/construct-typing/issues/31
-    "test_tenum_docstring"
-    "test_tenum_flags_docstring"
-  ];
-
   meta = {
     changelog = "https://github.com/timrid/construct-typing/releases/tag/v${version}";
     description = "Extension for the python package 'construct' that adds typing features";

From 8d614300ab97ecdb0deef916ebd26cf1f9b70933 Mon Sep 17 00:00:00 2001
From: Michi <abramjannikmichael06@gmail.com>
Date: Mon, 27 Oct 2025 01:19:46 +0100
Subject: [PATCH 3370/6226] superTuxKart: update license from gpl2Plus to
 gpl3Plus

The source code is licensed under GPLv3 or later.
This was changed upstream at Nov 23, 2018 [here](https://github.com/supertuxkart/stk-code/commit/06952bfd524ce368e12e62aadcc8546b0786051c),
but wasn't updated here in nixpkgs, until now.

The game assets are released under a mixture of licenses and noted in their respective 'licenses.txt' files.
---
 pkgs/by-name/su/superTuxKart/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/su/superTuxKart/package.nix b/pkgs/by-name/su/superTuxKart/package.nix
index 5b4cf6f8f577..2cb36b616e19 100644
--- a/pkgs/by-name/su/superTuxKart/package.nix
+++ b/pkgs/by-name/su/superTuxKart/package.nix
@@ -170,7 +170,7 @@ stdenv.mkDerivation rec {
       Kart.
     '';
     homepage = "https://supertuxkart.net/";
-    license = lib.licenses.gpl2Plus;
+    license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       peterhoeg
     ];

From a79325ca71a2b22f4219a3a5e4ad97a4b9bec9d6 Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sun, 26 Oct 2025 15:07:55 +0100
Subject: [PATCH 3371/6226] superTuxKart: rename src.rev to src.tag

---
 pkgs/by-name/su/superTuxKart/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/su/superTuxKart/package.nix b/pkgs/by-name/su/superTuxKart/package.nix
index 2cb36b616e19..d684976f3afc 100644
--- a/pkgs/by-name/su/superTuxKart/package.nix
+++ b/pkgs/by-name/su/superTuxKart/package.nix
@@ -73,7 +73,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "supertuxkart";
     repo = "stk-code";
-    rev = version;
+    tag = version;
     hash = "sha256-gqdaVvgNfCN40ZO/9y8+vTeIJPSq6udKxYZ/MAi4ZMM=";
   };
 

From 777bba68472d030e134f940667edc64fef66e8b7 Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sun, 26 Oct 2025 14:25:09 +0100
Subject: [PATCH 3372/6226] superTuxKart: 1.4 -> 1.5

stk-assets: 18464 -> 18621
---
 pkgs/by-name/su/superTuxKart/package.nix | 23 ++++-------------------
 1 file changed, 4 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/su/superTuxKart/package.nix b/pkgs/by-name/su/superTuxKart/package.nix
index d684976f3afc..bbeb70dcd8df 100644
--- a/pkgs/by-name/su/superTuxKart/package.nix
+++ b/pkgs/by-name/su/superTuxKart/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   fetchFromGitHub,
   fetchsvn,
-  fetchpatch,
   cmake,
   pkg-config,
   makeWrapper,
@@ -29,8 +28,8 @@
 let
   assets = fetchsvn {
     url = "https://svn.code.sf.net/p/supertuxkart/code/stk-assets";
-    rev = "18464";
-    sha256 = "1a84j3psl4cxzkn5ynakpjill7i2f9ki2p729bpmbrvg8fki95aa";
+    rev = "18621";
+    sha256 = "sha256-iqQSezGu0tecA53qhrtYA77SLj28WUUCcL4ZCJbK5C8=";
     name = "stk-assets";
   };
 
@@ -68,29 +67,15 @@ in
 stdenv.mkDerivation rec {
 
   pname = "supertuxkart";
-  version = "1.4";
+  version = "1.5";
 
   src = fetchFromGitHub {
     owner = "supertuxkart";
     repo = "stk-code";
     tag = version;
-    hash = "sha256-gqdaVvgNfCN40ZO/9y8+vTeIJPSq6udKxYZ/MAi4ZMM=";
+    hash = "sha256-/fp5iqTHVrVcxRqbTy/3r+dp19oUj9MI2JauvtPWTWA=";
   };
 
-  patches = [
-    # upstreamed patches required to build against cmake 4.0; remove with next release update.
-    (fetchpatch {
-      name = "Require-Cmake-3.6-or-higher";
-      url = "https://github.com/supertuxkart/stk-code/commit/7d4e8433c124c08c62f5335e2a884aeea71cf184.patch?full_index=1";
-      hash = "sha256-5q/Gf1I/maFPQ83NDIa7Sn6gtLfErwxP16fup4SZ+gc=";
-    })
-    (fetchpatch {
-      name = "Fixed-cmake-4.0-warnings";
-      url = "https://github.com/supertuxkart/stk-code/commit/184c80138faf5232c33ff99ffe7706e821be70c2.patch?full_index=1";
-      hash = "sha256-5zoDmKBRBC2rAUjgpmyc0ZCObGofjuImqk07Tr5K7Og=";
-    })
-  ];
-
   postPatch = ''
     # Deletes all bundled libs in stk-code/lib except those
     # That couldn't be replaced with system packages

From e18f03258aa9754c9bc96665231530c3d5da2d72 Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sun, 26 Oct 2025 14:50:38 +0100
Subject: [PATCH 3373/6226] superTuxKart: update descriptions

The decription was copied from the official website's discover page ([here](https://supertuxkart.net/Discover)) and got modified.
It got added by @Benau [here](https://github.com/supertuxkart/stk-website/commit/2c46fee5aad8412a0187d4e2e0580a5403fbdbf6)
---
 pkgs/by-name/su/superTuxKart/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/su/superTuxKart/package.nix b/pkgs/by-name/su/superTuxKart/package.nix
index bbeb70dcd8df..1c6c0462fe59 100644
--- a/pkgs/by-name/su/superTuxKart/package.nix
+++ b/pkgs/by-name/su/superTuxKart/package.nix
@@ -147,12 +147,12 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = "Free 3D kart racing game";
+    description = "3D open-source arcade racer";
     mainProgram = "supertuxkart";
     longDescription = ''
-      SuperTuxKart is a Free 3D kart racing game, with many tracks,
-      characters and items for you to try, similar in spirit to Mario
-      Kart.
+      Karts. Nitro. Action! SuperTuxKart is a 3D open-source arcade racer
+      with a variety of characters, tracks, and modes to play.
+      It aims to be more fun than realistic, and provides an enjoyable experience for all ages.
     '';
     homepage = "https://supertuxkart.net/";
     license = lib.licenses.gpl3Plus;

From 4a9e4fafab9488da85992200a4d1d82768856871 Mon Sep 17 00:00:00 2001
From: SchweGELBin <abramjannikmichael06@gmail.com>
Date: Sun, 26 Oct 2025 14:51:04 +0100
Subject: [PATCH 3374/6226] superTuxKart: add SchweGELBin to maintainers

---
 pkgs/by-name/su/superTuxKart/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/su/superTuxKart/package.nix b/pkgs/by-name/su/superTuxKart/package.nix
index 1c6c0462fe59..35a74463adff 100644
--- a/pkgs/by-name/su/superTuxKart/package.nix
+++ b/pkgs/by-name/su/superTuxKart/package.nix
@@ -158,6 +158,7 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       peterhoeg
+      SchweGELBin
     ];
     platforms = with lib.platforms; unix;
     changelog = "https://github.com/supertuxkart/stk-code/blob/${version}/CHANGELOG.md";

From 3e1cc243dbd276d98625e9a4fdf4c4da5af07f5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 27 Oct 2025 14:19:31 -0700
Subject: [PATCH 3375/6226] python3Packages.ntfy-webpush: init at 0.1.3

---
 pkgs/by-name/nt/ntfy/package.nix                          | 2 --
 .../python-modules/ntfy-webpush/default.nix}              | 8 ++++----
 pkgs/top-level/python-packages.nix                        | 2 ++
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename pkgs/{by-name/nt/ntfy/webpush.nix => development/python-modules/ntfy-webpush/default.nix} (82%)

diff --git a/pkgs/by-name/nt/ntfy/package.nix b/pkgs/by-name/nt/ntfy/package.nix
index 5d2d50e9ae06..4e2d069ea8ff 100644
--- a/pkgs/by-name/nt/ntfy/package.nix
+++ b/pkgs/by-name/nt/ntfy/package.nix
@@ -16,8 +16,6 @@ let
   python = python3.override {
     self = python;
     packageOverrides = self: super: {
-      ntfy-webpush = self.callPackage ./webpush.nix { };
-
       # databases, on which slack-sdk depends, is incompatible with SQLAlchemy 2.0
       sqlalchemy = super.sqlalchemy_1_4;
     };
diff --git a/pkgs/by-name/nt/ntfy/webpush.nix b/pkgs/development/python-modules/ntfy-webpush/default.nix
similarity index 82%
rename from pkgs/by-name/nt/ntfy/webpush.nix
rename to pkgs/development/python-modules/ntfy-webpush/default.nix
index 9c7adcad3981..0aed4f2c10b8 100644
--- a/pkgs/by-name/nt/ntfy/webpush.nix
+++ b/pkgs/development/python-modules/ntfy-webpush/default.nix
@@ -15,8 +15,8 @@ buildPythonPackage rec {
   src = fetchFromGitHub {
     owner = "dschep";
     repo = "ntfy-webpush";
-    rev = "v${version}";
-    sha256 = "1dxlvq3glf8yjkn1hdk89rx1s4fi9ygg46yn866a9v7a5a83zx2n";
+    tag = "v${version}";
+    hash = "sha256-VvQ/kCrq7KSMQdYb8p5P0REdek5oNhjslB45+gbetLc=";
   };
 
   postPatch = ''
@@ -35,10 +35,10 @@ buildPythonPackage rec {
   # no tests, just a script
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Cloudbell webpush notification support for ntfy";
     homepage = "https://dschep.github.io/ntfy-webpush/";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a65855a2a2aa..afe90b42eb29 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10700,6 +10700,8 @@ self: super: with self; {
 
   ntc-templates = callPackage ../development/python-modules/ntc-templates { };
 
+  ntfy-webpush = callPackage ../development/python-modules/ntfy-webpush { };
+
   ntplib = callPackage ../development/python-modules/ntplib { };
 
   nuclear = callPackage ../development/python-modules/nuclear { };

From 17e2966646c53f91d74490328950cd70d723a5da Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 27 Oct 2025 14:22:11 -0700
Subject: [PATCH 3376/6226] ntfy: don't override python3

---
 pkgs/by-name/nt/ntfy/package.nix | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/nt/ntfy/package.nix b/pkgs/by-name/nt/ntfy/package.nix
index 4e2d069ea8ff..6cefdf6cc280 100644
--- a/pkgs/by-name/nt/ntfy/package.nix
+++ b/pkgs/by-name/nt/ntfy/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  python3,
+  python3Packages,
   fetchFromGitHub,
   fetchpatch,
   withXmpp ? false, # sleekxmpp doesn't support python 3.10, see https://github.com/dschep/ntfy/issues/266
@@ -12,16 +12,7 @@
   withDbus ? stdenv.hostPlatform.isLinux,
 }:
 
-let
-  python = python3.override {
-    self = python;
-    packageOverrides = self: super: {
-      # databases, on which slack-sdk depends, is incompatible with SQLAlchemy 2.0
-      sqlalchemy = super.sqlalchemy_1_4;
-    };
-  };
-in
-python.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "ntfy";
   version = "2.7.0";
 
@@ -74,10 +65,10 @@ python.pkgs.buildPythonApplication rec {
       --replace-fail "':sys_platform == \"darwin\"'" "'darwin'"
   '';
 
-  build-system = with python.pkgs; [ setuptools ];
+  build-system = with python3Packages; [ setuptools ];
 
   dependencies =
-    with python.pkgs;
+    with python3Packages;
     (
       [
         requests
@@ -106,7 +97,7 @@ python.pkgs.buildPythonApplication rec {
       ]
     );
 
-  nativeCheckInputs = with python.pkgs; [
+  nativeCheckInputs = with python3Packages; [
     mock
     pytestCheckHook
   ];

From 5e6d48156f1de18709d1903b33d9f4c74b9ddc66 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 27 Oct 2025 14:20:11 +0000
Subject: [PATCH 3377/6226] hyperscan: fix build with withStatic enabled

---
 pkgs/by-name/hy/hyperscan/package.nix | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hy/hyperscan/package.nix b/pkgs/by-name/hy/hyperscan/package.nix
index 9ae6121fc8f7..730cd4c4c459 100644
--- a/pkgs/by-name/hy/hyperscan/package.nix
+++ b/pkgs/by-name/hy/hyperscan/package.nix
@@ -80,14 +80,23 @@ stdenv.mkDerivation (finalAttrs: {
       mkdir -p pcre
       tar xvf ${pcre.src} --strip-components 1 -C pcre
     ''
-    # CMake 4 dropped support of versions lower than 3.5,
-    # versions lower than 3.10 are deprecated.
-    # https://github.com/NixOS/nixpkgs/issues/445447
+    # - CMake 4 dropped support of versions lower than 3.5, versions lower than 3.10 are deprecated.
+    #   https://github.com/NixOS/nixpkgs/issues/445447
+    # - CMake Error at pcre/CMakeLists.txt:843 (GET_TARGET_PROPERTY):
+    #   The LOCATION property may not be read from target "pcretest".  Use the
+    #   target name directly with add_custom_command, or use the generator
+    #   expression $<TARGET_FILE>, as appropriate.
     + ''
       substituteInPlace pcre/CMakeLists.txt \
         --replace-fail \
           "CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)" \
           "CMAKE_MINIMUM_REQUIRED(VERSION 3.10)" \
+        --replace-fail \
+          "CMAKE_POLICY(SET CMP0026 OLD)" \
+          "CMAKE_POLICY(SET CMP0026 NEW)" \
+        --replace-fail \
+          "GET_TARGET_PROPERTY(PCRETEST_EXE pcretest DEBUG_LOCATION)" \
+          "set(PCRETEST_EXE $<TARGET_FILE:pcretest>)"
     ''
   );
 

From 0cbfaa93ec95c52f3c1a9020c2278d53d33e668f Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Mon, 27 Oct 2025 21:45:46 +0000
Subject: [PATCH 3378/6226] nixos-rebuild-ng: do not set log level in services

This is already set in __init__.py, so this was overwriting the log
level.
---
 pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
index 72168c0499ae..2d46c417580d 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/services.py
@@ -16,7 +16,6 @@ NIXOS_REBUILD_ATTR: Final = "config.system.build.nixos-rebuild"
 NIXOS_REBUILD_REEXEC_ENV: Final = "_NIXOS_REBUILD_REEXEC"
 
 logger: Final = logging.getLogger(__name__)
-logger.setLevel(logging.INFO)
 
 
 def reexec(

From 0ac2bccd7072e61e8c73fb6ea7dc7b96235c25eb Mon Sep 17 00:00:00 2001
From: Thiago Kenji Okada <thiagokokada@gmail.com>
Date: Mon, 27 Oct 2025 21:51:08 +0000
Subject: [PATCH 3379/6226] nixos-rebuild-ng: fix linter errors

---
 pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py | 4 ++--
 pkgs/by-name/ni/nixos-rebuild-ng/src/tests/helpers.py       | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py
index 6cdfaba456c6..90c12261025d 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/utils.py
@@ -90,11 +90,11 @@ def tabulate(
     def format_row(row: Mapping[str, Any]) -> str:
         s = (2 * " ").join(
             f"{str(row[header]).ljust(width)}"
-            for header, width in zip(data_headers, column_widths)
+            for header, width in zip(data_headers, column_widths, strict=True)
         )
         return s.strip()
 
-    result = [format_row(dict(zip(data_headers, data_headers)))]
+    result = [format_row(dict(zip(data_headers, data_headers, strict=True)))]
     for row in data:
         result.append(format_row(row))
 
diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/helpers.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/helpers.py
index c7a2a29ee3dc..f27e491a632d 100644
--- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/helpers.py
+++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/helpers.py
@@ -1,5 +1,6 @@
+from collections.abc import Callable
 from types import ModuleType
-from typing import Any, Callable
+from typing import Any
 
 
 def get_qualified_name(

From d15ccc471edf043bb0af2dfef4e5c6d01c36dd40 Mon Sep 17 00:00:00 2001
From: Krishnan Shankar <krishnans2006@gmail.com>
Date: Mon, 20 Oct 2025 20:47:24 -0500
Subject: [PATCH 3380/6226] python3Packages.chipwhisperer: init at 5.7.0

---
 .../python-modules/chipwhisperer/default.nix  | 118 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 2 files changed, 120 insertions(+)
 create mode 100644 pkgs/development/python-modules/chipwhisperer/default.nix

diff --git a/pkgs/development/python-modules/chipwhisperer/default.nix b/pkgs/development/python-modules/chipwhisperer/default.nix
new file mode 100644
index 000000000000..1cc7fc8657bb
--- /dev/null
+++ b/pkgs/development/python-modules/chipwhisperer/default.nix
@@ -0,0 +1,118 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build
+  pythonAtLeast,
+  setuptools,
+  setuptools-scm,
+  cython,
+
+  # dependencies
+  colorama,
+  configobj,
+  ecpy,
+  fastdtw,
+  libusb1,
+  numpy,
+  pyserial,
+  tqdm,
+
+  # install
+  udevCheckHook,
+
+  # check
+  writableTmpDirAsHomeHook,
+  pytestCheckHook,
+}:
+
+# Usage:
+# In NixOS, add the package to services.udev.packages for non-root plugdev
+# users to get device access permission:
+#    services.udev.packages = [ pkgs.python3Packages.chipwhisperer ];
+
+buildPythonPackage rec {
+  pname = "chipwhisperer";
+  version = "5.7.0";
+
+  src = fetchFromGitHub {
+    owner = "newaetech";
+    repo = "chipwhisperer";
+    tag = version;
+    hash = "sha256-C7QP044QEP7vmz1lMseLtMTYoKn5SoFV/q9URY7yQ6I=";
+  };
+
+  # Build
+
+  pyproject = true;
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  nativeBuildInputs = [
+    cython
+  ];
+
+  pythonRelaxDeps = [
+    "numpy"
+  ];
+
+  dependencies = [
+    colorama
+    configobj
+    ecpy
+    fastdtw
+    libusb1
+    pyserial
+    tqdm
+  ];
+
+  # Install
+
+  nativeInstallCheckInputs = [
+    udevCheckHook
+  ];
+
+  postInstall = ''
+    # Install udev rules
+    # The 50-newae.rules file from the repo isn't directly installed, since it
+    # installs to the chipwhisperer group (and not to uaccess)
+
+    mkdir -p $out/etc/udev/rules.d
+
+    cat <<EOF > $out/etc/udev/rules.d/50-newae.rules
+    SUBSYSTEMS=="usb", ATTRS{idVendor}=="2b3e", ATTRS{idProduct}=="*", TAG+="uaccess"
+    SUBSYSTEM=="tty", ATTRS{idVendor}=="2b3e", ATTRS{idProduct}=="*", TAG+="uaccess", SYMLINK+="cw_serial%n"
+    SUBSYSTEM=="tty", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="6124", TAG+="uaccess", SYMLINK+="cw_bootloader%n"
+    EOF
+  '';
+
+  # Check
+
+  pythonImportsCheck = [ "chipwhisperer" ];
+
+  nativeCheckInputs = [
+    writableTmpDirAsHomeHook
+    pytestCheckHook
+  ];
+
+  enabledTestPaths = [
+    # All other tests require connected hardware
+    # Error: "Could not find ChipWhisperer. Is it connected?"
+    # See: https://chipwhisperer.readthedocs.io/en/latest/contributing.html#unit-tests
+    "tests/test_api.py"
+  ];
+
+  disabledTests = [ "TestCPA" ]; # Tries to open a tutorial project
+
+  meta = {
+    description = "Toolchain for side-channel power analysis and glitching attacks";
+    homepage = "https://github.com/newaetech/chipwhisperer";
+    changelog = "https://github.com/newaetech/chipwhisperer/releases/tag/${version}";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.krishnans2006 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 25030c7b96a6..606e89575e97 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2555,6 +2555,8 @@ self: super: with self; {
 
   chex = callPackage ../development/python-modules/chex { };
 
+  chipwhisperer = callPackage ../development/python-modules/chipwhisperer { };
+
   chirpstack-api = callPackage ../development/python-modules/chirpstack-api { };
 
   chispa = callPackage ../development/python-modules/chispa { };

From b85e84075341fbff7f043ca8f10bbe8d1b9573f3 Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Mon, 27 Oct 2025 15:04:38 -0700
Subject: [PATCH 3381/6226] nixVersions.nix_2_32: 2.32.1 -> 2.32.2

Diff: https://github.com/NixOS/nix/compare/2.32.1...2.32.2
---
 pkgs/tools/package-management/nix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index 201c83f142dd..edcc45090f72 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -180,14 +180,14 @@ lib.makeExtensible (
       nix_2_31 = addTests "nix_2_31" self.nixComponents_2_31.nix-everything;
 
       nixComponents_2_32 = nixDependencies.callPackage ./modular/packages.nix rec {
-        version = "2.32.1";
+        version = "2.32.2";
         inherit (self.nix_2_31.meta) maintainers teams;
         otherSplices = generateSplicesForNixComponents "nixComponents_2_32";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
           tag = version;
-          hash = "sha256-pApD0gpaklYkgZ9oZCtuAcAcYeUxR9FUOAlOtflZr+Q=";
+          hash = "sha256-zO5A57NT5WtSJ73O3uIQdkPoxW+qQfMPhMMPI1UHRjA=";
         };
       };
 

From 0adfb6bff3c2ab08aee8c1fe1a1202f69d5f97d7 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 27 Oct 2025 22:41:51 +0100
Subject: [PATCH 3382/6226] eid-mw: use `makeBinaryWrapper`

---
 pkgs/by-name/ei/eid-mw/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ei/eid-mw/package.nix b/pkgs/by-name/ei/eid-mw/package.nix
index 0664e0a80fe9..8e3c58dca6bf 100644
--- a/pkgs/by-name/ei/eid-mw/package.nix
+++ b/pkgs/by-name/ei/eid-mw/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   autoconf-archive,
   autoreconfHook,
-  makeWrapper,
+  makeBinaryWrapper,
   pkg-config,
   replaceVarsWith,
   curl,
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
     autoreconfHook
     autoconf-archive
     pkg-config
-    makeWrapper
+    makeBinaryWrapper
   ];
   buildInputs = [
     curl

From 863d537b04f480a8b85a4b3edece7651272f611f Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 27 Oct 2025 22:42:32 +0100
Subject: [PATCH 3383/6226] eid-mw: remove meta `with lib;`

---
 pkgs/by-name/ei/eid-mw/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ei/eid-mw/package.nix b/pkgs/by-name/ei/eid-mw/package.nix
index 8e3c58dca6bf..1cf570ca6437 100644
--- a/pkgs/by-name/ei/eid-mw/package.nix
+++ b/pkgs/by-name/ei/eid-mw/package.nix
@@ -91,10 +91,10 @@ stdenv.mkDerivation rec {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Belgian electronic identity card (eID) middleware";
     homepage = "https://eid.belgium.be/en";
-    license = licenses.lgpl3Only;
+    license = lib.licenses.lgpl3Only;
     longDescription = ''
       Allows user authentication and digital signatures with Belgian ID cards.
       Also requires a running pcscd service and compatible card reader.
@@ -117,8 +117,8 @@ stdenv.mkDerivation rec {
 
           firefox.override { pkcs11Modules = [ pkgs.eid-mw ]; }
     '';
-    platforms = platforms.linux;
-    maintainers = with maintainers; [
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [
       bfortz
       chvp
     ];

From 44ce0662132da5df38cce2c0d1959becd921ebf6 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 27 Oct 2025 22:43:56 +0100
Subject: [PATCH 3384/6226] eid-mw: replace `src.rev` with `src.tag`

---
 pkgs/by-name/ei/eid-mw/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ei/eid-mw/package.nix b/pkgs/by-name/ei/eid-mw/package.nix
index 1cf570ca6437..840d4c262466 100644
--- a/pkgs/by-name/ei/eid-mw/package.nix
+++ b/pkgs/by-name/ei/eid-mw/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Fedict";
     repo = "eid-mw";
-    rev = "v${version}";
+    tag = "v${version}";
     hash = "sha256-LdOfwgRGyNK+a4SByClPgH9SrDeCdnhI9sLO7agsNsA=";
   };
 

From 6942d8e4ef1ae6a3c23c3186bcf8ffe96fe46796 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 27 Oct 2025 15:12:20 -0700
Subject: [PATCH 3385/6226] ntfy: 2.7.0 -> 2.7.1

Diff: https://github.com/dschep/ntfy/compare/v2.7.0...v2.7.1

Changelog: https://github.com/dschep/ntfy/releases/tag/v2.7.1
---
 pkgs/by-name/nt/ntfy/package.nix | 60 ++++++++------------------------
 1 file changed, 14 insertions(+), 46 deletions(-)

diff --git a/pkgs/by-name/nt/ntfy/package.nix b/pkgs/by-name/nt/ntfy/package.nix
index 6cefdf6cc280..d21624f41393 100644
--- a/pkgs/by-name/nt/ntfy/package.nix
+++ b/pkgs/by-name/nt/ntfy/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   python3Packages,
   fetchFromGitHub,
-  fetchpatch,
+  writableTmpDirAsHomeHook,
   withXmpp ? false, # sleekxmpp doesn't support python 3.10, see https://github.com/dschep/ntfy/issues/266
   withMatrix ? true,
   withSlack ? true,
@@ -14,51 +14,17 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ntfy";
-  version = "2.7.0";
+  version = "2.7.1";
 
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dschep";
     repo = "ntfy";
-    rev = "v${version}";
-    sha256 = "09f02cn4i1l2aksb3azwfb70axqhn7d0d0vl2r6640hqr74nc1cv";
+    tag = "v${version}";
+    hash = "sha256-EIhoZ2tFJQOc5PyRCazwRhldFxQb65y6h+vYPwV7ReE=";
   };
 
-  patches = [
-    # Fix Slack integration no longer working.
-    # From https://github.com/dschep/ntfy/pull/229 - "Swap Slacker for Slack SDK"
-    (fetchpatch {
-      name = "ntfy-Swap-Slacker-for-Slack-SDK.patch";
-      url = "https://github.com/dschep/ntfy/commit/2346e7cfdca84c8f1afc7462a92145c1789deb3e.patch";
-      sha256 = "13k7jbsdx0jx7l5s8whirric76hml5bznkfcxab5xdp88q52kpk7";
-    })
-    # Add compatibility with emoji 2.0
-    # https://github.com/dschep/ntfy/pull/250
-    (fetchpatch {
-      name = "ntfy-Add-compatibility-with-emoji-2.0.patch";
-      url = "https://github.com/dschep/ntfy/commit/4128942bb7a706117e7154a50a73b88f531631fe.patch";
-      sha256 = "sha256-V8dIy/K957CPFQQS1trSI3gZOjOcVNQLgdWY7g17bRw=";
-    })
-    # Change getargspec to getfullargspec for python 3.11 compatibility
-    (fetchpatch {
-      url = "https://github.com/dschep/ntfy/commit/71be9766ea041d2df6ebbce2781f980eea002852.patch";
-      hash = "sha256-6OChaTj4g3gxVDScc/JksBISHuq+5fbNQregchSXYaQ=";
-    })
-    # Fix compatibility with Python 3.11
-    # https://github.com/dschep/ntfy/pull/271
-    (fetchpatch {
-      url = "https://github.com/dschep/ntfy/pull/271/commits/444b60bec7de474d029cac184e82885011dd1474.patch";
-      hash = "sha256-PKTu8cOpws1z6f1T4uIi2iCJAoAwu+X0Pe7XnHYtHuI=";
-    })
-    # Fix compatibility with Python 3.12
-    # https://github.com/dschep/ntfy/pull/271
-    (fetchpatch {
-      url = "https://github.com/dschep/ntfy/pull/271/commits/d49ab9f9dba4966a44b5f0c6911741edabd35f6b.patch";
-      hash = "sha256-qTUWMS8EXWYCK/ZL0Us7iJp62UIKwYT1BqDy59832ig=";
-    })
-  ];
-
   postPatch = ''
     # We disable the Darwin specific things because it relies on pyobjc, which we don't have.
     substituteInPlace setup.py \
@@ -100,27 +66,29 @@ python3Packages.buildPythonApplication rec {
   nativeCheckInputs = with python3Packages; [
     mock
     pytestCheckHook
+    writableTmpDirAsHomeHook
   ];
 
   disabledTests = [
+    # AssertionError: {'backends': ['default']} != {}
+    "test_default_config"
+  ]
+  ++ lib.optionals (!withXmpp) [
     "test_xmpp"
   ];
 
-  disabledTestPaths = [
+  disabledTestPaths = lib.optionals (!withXmpp) [
     "tests/test_xmpp.py"
   ];
 
-  preCheck = ''
-    export HOME=$(mktemp -d)
-  '';
-
   pythonImportsCheck = [ "ntfy" ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/dschep/ntfy/releases/tag/${src.tag}";
     description = "Utility for sending notifications, on demand and when commands finish";
     homepage = "https://ntfy.readthedocs.io/en/latest/";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ kamilchm ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ kamilchm ];
     mainProgram = "ntfy";
   };
 }

From 089fab12e3e6d83524f73709ef2be687bef54366 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 26 Oct 2025 21:25:59 +0800
Subject: [PATCH 3386/6226] fetchurl: move curlOpts warnings down to its value

---
 pkgs/build-support/fetchurl/default.nix | 31 +++++++++++++++----------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index d524c760c1a3..8e26d02fe8b0 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -212,17 +212,6 @@ let
       "${lib.head mirrorList}${lib.elemAt mirrorSplit 1}";
 in
 
-assert
-  (lib.isList curlOpts)
-  -> lib.warn ''
-    fetchurl for ${toString (builtins.head urls_)}: curlOpts is a list (${
-      lib.generators.toPretty { multiline = false; } curlOpts
-    }), which is not supported anymore.
-    - If you wish to get the same effect as before, for elements with spaces (even if escaped) to expand to multiple curl arguments, use a string argument instead:
-      curlOpts = ${lib.strings.escapeNixString (toString curlOpts)};
-    - If you wish for each list element to be passed as a separate curl argument, allowing arguments to contain spaces, use curlOptsList instead:
-      curlOptsList = [ ${lib.concatMapStringsSep " " lib.strings.escapeNixString curlOpts} ];'' true;
-
 stdenvNoCC.mkDerivation (
   (
     if (pname != "" && version != "") then
@@ -270,8 +259,26 @@ stdenvNoCC.mkDerivation (
 
     outputHashMode = if (recursiveHash || executable) then "recursive" else "flat";
 
-    inherit curlOpts;
+    curlOpts = lib.warnIf (lib.isList curlOpts) (
+      let
+        url = toString (builtins.head urls_);
+        curlOptsRepresentation = lib.generators.toPretty { multiline = false; } curlOpts;
+        curlOptsAsStringRepresentation = lib.strings.escapeNixString (toString curlOpts);
+        curlOptsListElementsRepresentation =
+          lib.concatMapStringsSep " " lib.strings.escapeNixString
+            curlOpts;
+      in
+      ''
+        fetchurl for ${url}: curlOpts is a list (${curlOptsRepresentation}), which is not supported anymore.
+        - If you wish to get the same effect as before, for elements with spaces (even if escaped) to expand to multiple curl arguments, use a string argument instead:
+          curlOpts = ${curlOptsAsStringRepresentation};
+        - If you wish for each list element to be passed as a separate curl argument, allowing arguments to contain spaces, use curlOptsList instead:
+          curlOptsList = [ ${curlOptsListElementsRepresentation} ];
+      ''
+    ) curlOpts;
+
     curlOptsList = lib.escapeShellArgs curlOptsList;
+
     inherit
       showURLs
       mirrorsFile

From bf3e7097f36b4c184622cfa2eda7b003333b35ab Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 26 Oct 2025 21:57:51 +0800
Subject: [PATCH 3387/6226] fetchurl: restructure with lib.extendMkDerivation
 (not formatted)

---
 pkgs/build-support/fetchurl/default.nix | 30 ++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 8e26d02fe8b0..189b22413d93 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -53,6 +53,28 @@ let
 
 in
 
+lib.extendMkDerivation {
+  constructDrv = stdenvNoCC.mkDerivation;
+
+  excludeDrvArgNames = [
+    # Passed via passthru
+    "url"
+
+    # Name-related attributes
+    # TODO(@ShamrockLee): Pass them.
+    "name"
+    "pname"
+    "version"
+
+    # Hash attributes will be map to the corresponding outputHash*
+    "hash"
+    "sha1"
+    "sha256"
+    "sha512"
+  ];
+
+  extendDrvArgs =
+    finalAttrs:
 {
   # URL to fetch.
   url ? "",
@@ -212,7 +234,6 @@ let
       "${lib.head mirrorList}${lib.elemAt mirrorSplit 1}";
 in
 
-stdenvNoCC.mkDerivation (
   (
     if (pname != "" && version != "") then
       { inherit pname version; }
@@ -307,5 +328,8 @@ stdenvNoCC.mkDerivation (
       inherit url resolvedUrl;
     }
     // passthru;
-  }
-)
+  };
+
+  # No ellipsis
+  inheritFunctionArgs = false;
+}

From 0a7fa9fe0a90d6709855ae61548a285f69779565 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 26 Oct 2025 23:59:33 +0800
Subject: [PATCH 3388/6226] fetchzip: move extraPostFetch warning down where it
 is referenced

---
 pkgs/build-support/fetchzip/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix
index 7e1452ae54a2..246ab3ea155b 100644
--- a/pkgs/build-support/fetchzip/default.nix
+++ b/pkgs/build-support/fetchzip/default.nix
@@ -33,10 +33,6 @@
   ...
 }@args:
 
-assert
-  (extraPostFetch != "")
-  -> lib.warn "use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub' or 'fetchFromGitLab'." true;
-
 let
   tmpFilename =
     if extension != null then
@@ -93,7 +89,10 @@ fetchurl (
     )
     + ''
       ${postFetch}
-      ${extraPostFetch}
+      ${lib.warnIf (extraPostFetch != "")
+        "use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub' or 'fetchFromGitLab'."
+        extraPostFetch
+      }
       chmod 755 "$out"
     '';
     # ^ Remove non-owner write permissions

From d4299caae9f5909e6dd338dc736f4d52a7a97589 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 26 Oct 2025 21:57:51 +0800
Subject: [PATCH 3389/6226] fetchzip: restructure with lib.extendMkDerivation
 (not formatted)

---
 pkgs/build-support/fetchzip/default.nix | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix
index 246ab3ea155b..a5da6f22fb65 100644
--- a/pkgs/build-support/fetchzip/default.nix
+++ b/pkgs/build-support/fetchzip/default.nix
@@ -14,6 +14,19 @@
   glibcLocalesUtf8,
 }:
 
+lib.extendMkDerivation {
+  constructDrv = fetchurl;
+
+  excludeDrvArgNames = [
+    "extraPostFetch"
+
+    # TODO(@ShamrockLee): Move these arguments to derivationArgs when available.
+    "extension"
+    "stripRoot"
+  ];
+
+  extendDrvArgs =
+    finalAttrs:
 {
   url ? "",
   urls ? [ ],
@@ -41,7 +54,6 @@ let
       baseNameOf (if url != "" then url else builtins.head urls);
 in
 
-fetchurl (
   {
     inherit name;
     recursiveHash = true;
@@ -97,12 +109,5 @@ fetchurl (
     '';
     # ^ Remove non-owner write permissions
     # Fixes https://github.com/NixOS/nixpkgs/issues/38649
-  }
-  // removeAttrs args [
-    "stripRoot"
-    "extraPostFetch"
-    "postFetch"
-    "extension"
-    "nativeBuildInputs"
-  ]
-)
+  };
+}

From ae5b3bdb05e9e9eec76603a19274bc4be59c57de Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 26 Oct 2025 21:57:51 +0800
Subject: [PATCH 3390/6226] fetchgit: restructure with lib.extendMkDerivation
 (not formatted)

---
 pkgs/build-support/fetchgit/default.nix | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index a620f6c09a00..0efeed065589 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -23,6 +23,21 @@ let
 in
 
 lib.makeOverridable (
+  lib.extendMkDerivation {
+    constructDrv = stdenvNoCC.mkDerivation;
+
+    excludeDrvArgNames = [
+      # Passed via `passthru`
+      "tag"
+
+      # Hashes, handled by `lib.fetchers.withNormalizedHash`
+      # whose outputs contain outputHash* attributes.
+      "hash"
+      "sha256"
+    ];
+
+    extendDrvArgs =
+      finalAttrs:
   lib.fetchers.withNormalizedHash { } (
     # NOTE Please document parameter additions or changes in
     #   ../../../doc/build-helpers/fetchers.chapter.md
@@ -120,7 +135,7 @@ lib.makeOverridable (
       throw
         "Please provide directories/patterns for sparse checkout as a list of strings. Passing a (multi-line) string is not supported any more."
     else
-      stdenvNoCC.mkDerivation {
+      {
         inherit name;
 
         builder = ./builder.sh;
@@ -199,5 +214,9 @@ lib.makeOverridable (
         }
         // passthru;
       }
-  )
+  );
+
+    # No ellipsis.
+    inheritFunctionArgs = false;
+  }
 )

From aeddd850c6d3485fc1af2edfb111e58141d18dc1 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Sun, 26 Oct 2025 21:58:45 +0800
Subject: [PATCH 3391/6226] fetchurl, fetchzip, fetchgit: format Nix expression
 after lib.extendMkDerivation

---
 pkgs/build-support/fetchgit/default.nix | 316 ++++++++---------
 pkgs/build-support/fetchurl/default.nix | 440 ++++++++++++------------
 pkgs/build-support/fetchzip/default.nix | 150 ++++----
 3 files changed, 453 insertions(+), 453 deletions(-)

diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 0efeed065589..4ffb998ee205 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -38,183 +38,183 @@ lib.makeOverridable (
 
     extendDrvArgs =
       finalAttrs:
-  lib.fetchers.withNormalizedHash { } (
-    # NOTE Please document parameter additions or changes in
-    #   ../../../doc/build-helpers/fetchers.chapter.md
-    {
-      url,
-      tag ? null,
-      rev ? null,
-      name ? urlToName {
-        inherit url;
-        rev = lib.revOrTag rev tag;
-        # when rootDir is specified, avoid invalidating the result when rev changes
-        append = if rootDir != "" then "-${lib.strings.sanitizeDerivationName rootDir}" else "";
-      },
-      leaveDotGit ? deepClone || fetchTags,
-      outputHash ? lib.fakeHash,
-      outputHashAlgo ? null,
-      fetchSubmodules ? true,
-      deepClone ? false,
-      branchName ? null,
-      sparseCheckout ? lib.optional (rootDir != "") rootDir,
-      nonConeMode ? rootDir != "",
-      nativeBuildInputs ? [ ],
-      # Shell code executed before the file has been fetched.  This, in
-      # particular, can do things like set NIX_PREFETCH_GIT_CHECKOUT_HOOK to
-      # run operations between the checkout completing and deleting the .git
-      # directory.
-      preFetch ? "",
-      # Shell code executed after the file has been fetched
-      # successfully. This can do things like check or transform the file.
-      postFetch ? "",
-      preferLocalBuild ? true,
-      fetchLFS ? false,
-      # Shell code to build a netrc file for BASIC auth
-      netrcPhase ? null,
-      # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes)
-      # needed for netrcPhase
-      netrcImpureEnvVars ? [ ],
-      passthru ? { },
-      meta ? { },
-      allowedRequisites ? null,
-      # fetch all tags after tree (useful for git describe)
-      fetchTags ? false,
-      # make this subdirectory the root of the result
-      rootDir ? "",
-      # GIT_CONFIG_GLOBAL (as a file)
-      gitConfigFile ? config.gitConfigFile,
-    }:
+      lib.fetchers.withNormalizedHash { } (
+        # NOTE Please document parameter additions or changes in
+        #   ../../../doc/build-helpers/fetchers.chapter.md
+        {
+          url,
+          tag ? null,
+          rev ? null,
+          name ? urlToName {
+            inherit url;
+            rev = lib.revOrTag rev tag;
+            # when rootDir is specified, avoid invalidating the result when rev changes
+            append = if rootDir != "" then "-${lib.strings.sanitizeDerivationName rootDir}" else "";
+          },
+          leaveDotGit ? deepClone || fetchTags,
+          outputHash ? lib.fakeHash,
+          outputHashAlgo ? null,
+          fetchSubmodules ? true,
+          deepClone ? false,
+          branchName ? null,
+          sparseCheckout ? lib.optional (rootDir != "") rootDir,
+          nonConeMode ? rootDir != "",
+          nativeBuildInputs ? [ ],
+          # Shell code executed before the file has been fetched.  This, in
+          # particular, can do things like set NIX_PREFETCH_GIT_CHECKOUT_HOOK to
+          # run operations between the checkout completing and deleting the .git
+          # directory.
+          preFetch ? "",
+          # Shell code executed after the file has been fetched
+          # successfully. This can do things like check or transform the file.
+          postFetch ? "",
+          preferLocalBuild ? true,
+          fetchLFS ? false,
+          # Shell code to build a netrc file for BASIC auth
+          netrcPhase ? null,
+          # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes)
+          # needed for netrcPhase
+          netrcImpureEnvVars ? [ ],
+          passthru ? { },
+          meta ? { },
+          allowedRequisites ? null,
+          # fetch all tags after tree (useful for git describe)
+          fetchTags ? false,
+          # make this subdirectory the root of the result
+          rootDir ? "",
+          # GIT_CONFIG_GLOBAL (as a file)
+          gitConfigFile ? config.gitConfigFile,
+        }:
 
-    /*
-      NOTE:
-      fetchgit has one problem: git fetch only works for refs.
-      This is because fetching arbitrary (maybe dangling) commits creates garbage collection risks
-      and checking whether a commit belongs to a ref is expensive. This may
-      change in the future when some caching is added to git (?)
-      Usually refs are either tags (refs/tags/*) or branches (refs/heads/*)
-      Cloning branches will make the hash check fail when there is an update.
-      But not all patches we want can be accessed by tags.
+        /*
+          NOTE:
+          fetchgit has one problem: git fetch only works for refs.
+          This is because fetching arbitrary (maybe dangling) commits creates garbage collection risks
+          and checking whether a commit belongs to a ref is expensive. This may
+          change in the future when some caching is added to git (?)
+          Usually refs are either tags (refs/tags/*) or branches (refs/heads/*)
+          Cloning branches will make the hash check fail when there is an update.
+          But not all patches we want can be accessed by tags.
 
-      The workaround is getting the last n commits so that it's likely that they
-      still contain the hash we want.
+          The workaround is getting the last n commits so that it's likely that they
+          still contain the hash we want.
 
-      for now : increase depth iteratively (TODO)
+          for now : increase depth iteratively (TODO)
 
-      real fix: ask git folks to add a
-      git fetch $HASH contained in $BRANCH
-      facility because checking that $HASH is contained in $BRANCH is less
-      expensive than fetching --depth $N.
-      Even if git folks implemented this feature soon it may take years until
-      server admins start using the new version?
-    */
+          real fix: ask git folks to add a
+          git fetch $HASH contained in $BRANCH
+          facility because checking that $HASH is contained in $BRANCH is less
+          expensive than fetching --depth $N.
+          Even if git folks implemented this feature soon it may take years until
+          server admins start using the new version?
+        */
 
-    assert nonConeMode -> (sparseCheckout != [ ]);
-    assert fetchTags -> leaveDotGit;
-    assert rootDir != "" -> !leaveDotGit;
+        assert nonConeMode -> (sparseCheckout != [ ]);
+        assert fetchTags -> leaveDotGit;
+        assert rootDir != "" -> !leaveDotGit;
 
-    let
-      revWithTag =
         let
-          warningMsg = "fetchgit requires one of either `rev` or `tag` to be provided (not both).";
-          otherIsNull = other: lib.assertMsg (other == null) warningMsg;
+          revWithTag =
+            let
+              warningMsg = "fetchgit requires one of either `rev` or `tag` to be provided (not both).";
+              otherIsNull = other: lib.assertMsg (other == null) warningMsg;
+            in
+            if tag != null then
+              assert (otherIsNull rev);
+              "refs/tags/${tag}"
+            else if rev != null then
+              assert (otherIsNull tag);
+              rev
+            else
+              # FIXME fetching HEAD if no rev or tag is provided is problematic at best
+              "HEAD";
         in
-        if tag != null then
-          assert (otherIsNull rev);
-          "refs/tags/${tag}"
-        else if rev != null then
-          assert (otherIsNull tag);
-          rev
+
+        if builtins.isString sparseCheckout then
+          # Changed to throw on 2023-06-04
+          throw
+            "Please provide directories/patterns for sparse checkout as a list of strings. Passing a (multi-line) string is not supported any more."
         else
-          # FIXME fetching HEAD if no rev or tag is provided is problematic at best
-          "HEAD";
-    in
+          {
+            inherit name;
 
-    if builtins.isString sparseCheckout then
-      # Changed to throw on 2023-06-04
-      throw
-        "Please provide directories/patterns for sparse checkout as a list of strings. Passing a (multi-line) string is not supported any more."
-    else
-      {
-        inherit name;
+            builder = ./builder.sh;
+            fetcher = ./nix-prefetch-git;
 
-        builder = ./builder.sh;
-        fetcher = ./nix-prefetch-git;
+            nativeBuildInputs = [
+              git
+              cacert
+            ]
+            ++ lib.optionals fetchLFS [ git-lfs ]
+            ++ nativeBuildInputs;
 
-        nativeBuildInputs = [
-          git
-          cacert
-        ]
-        ++ lib.optionals fetchLFS [ git-lfs ]
-        ++ nativeBuildInputs;
+            inherit outputHash outputHashAlgo;
+            outputHashMode = "recursive";
 
-        inherit outputHash outputHashAlgo;
-        outputHashMode = "recursive";
+            # git-sparse-checkout(1) says:
+            # > When the --stdin option is provided, the directories or patterns are read
+            # > from standard in as a newline-delimited list instead of from the arguments.
+            sparseCheckout = builtins.concatStringsSep "\n" sparseCheckout;
 
-        # git-sparse-checkout(1) says:
-        # > When the --stdin option is provided, the directories or patterns are read
-        # > from standard in as a newline-delimited list instead of from the arguments.
-        sparseCheckout = builtins.concatStringsSep "\n" sparseCheckout;
+            inherit
+              url
+              leaveDotGit
+              fetchLFS
+              fetchSubmodules
+              deepClone
+              branchName
+              nonConeMode
+              preFetch
+              postFetch
+              fetchTags
+              rootDir
+              gitConfigFile
+              ;
+            rev = revWithTag;
 
-        inherit
-          url
-          leaveDotGit
-          fetchLFS
-          fetchSubmodules
-          deepClone
-          branchName
-          nonConeMode
-          preFetch
-          postFetch
-          fetchTags
-          rootDir
-          gitConfigFile
-          ;
-        rev = revWithTag;
+            postHook =
+              if netrcPhase == null then
+                null
+              else
+                ''
+                  ${netrcPhase}
+                  # required that git uses the netrc file
+                  mv {,.}netrc
+                  export NETRC=$PWD/.netrc
+                  export HOME=$PWD
+                '';
 
-        postHook =
-          if netrcPhase == null then
-            null
-          else
-            ''
-              ${netrcPhase}
-              # required that git uses the netrc file
-              mv {,.}netrc
-              export NETRC=$PWD/.netrc
-              export HOME=$PWD
-            '';
+            impureEnvVars =
+              lib.fetchers.proxyImpureEnvVars
+              ++ netrcImpureEnvVars
+              ++ [
+                "GIT_PROXY_COMMAND"
+                "NIX_GIT_SSL_CAINFO"
+                "SOCKS_SERVER"
 
-        impureEnvVars =
-          lib.fetchers.proxyImpureEnvVars
-          ++ netrcImpureEnvVars
-          ++ [
-            "GIT_PROXY_COMMAND"
-            "NIX_GIT_SSL_CAINFO"
-            "SOCKS_SERVER"
+                # This is a parameter intended to be set by setup hooks or preFetch
+                # scripts that want per-URL control over HTTP proxies used by Git
+                # (if per-URL control isn't needed, `http_proxy` etc. will
+                # suffice). It must be a whitespace-separated (with backslash as an
+                # escape character) list of pairs like this:
+                #
+                #   http://domain1/path1 proxy1 https://domain2/path2 proxy2
+                #
+                # where the URLs are as documented in the `git-config` manual page
+                # under `http.<url>.*`, and the proxies are as documented on the
+                # same page under `http.proxy`.
+                "FETCHGIT_HTTP_PROXIES"
+              ];
 
-            # This is a parameter intended to be set by setup hooks or preFetch
-            # scripts that want per-URL control over HTTP proxies used by Git
-            # (if per-URL control isn't needed, `http_proxy` etc. will
-            # suffice). It must be a whitespace-separated (with backslash as an
-            # escape character) list of pairs like this:
-            #
-            #   http://domain1/path1 proxy1 https://domain2/path2 proxy2
-            #
-            # where the URLs are as documented in the `git-config` manual page
-            # under `http.<url>.*`, and the proxies are as documented on the
-            # same page under `http.proxy`.
-            "FETCHGIT_HTTP_PROXIES"
-          ];
+            inherit preferLocalBuild meta allowedRequisites;
 
-        inherit preferLocalBuild meta allowedRequisites;
-
-        passthru = {
-          gitRepoUrl = url;
-          inherit tag;
-        }
-        // passthru;
-      }
-  );
+            passthru = {
+              gitRepoUrl = url;
+              inherit tag;
+            }
+            // passthru;
+          }
+      );
 
     # No ellipsis.
     inheritFunctionArgs = false;
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 189b22413d93..e528b70eb7a7 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -75,260 +75,260 @@ lib.extendMkDerivation {
 
   extendDrvArgs =
     finalAttrs:
-{
-  # URL to fetch.
-  url ? "",
+    {
+      # URL to fetch.
+      url ? "",
 
-  # Alternatively, a list of URLs specifying alternative download
-  # locations.  They are tried in order.
-  urls ? [ ],
+      # Alternatively, a list of URLs specifying alternative download
+      # locations.  They are tried in order.
+      urls ? [ ],
 
-  # Additional curl options needed for the download to succeed.
-  # Warning: Each space (no matter the escaping) will start a new argument.
-  # If you wish to pass arguments with spaces, use `curlOptsList`
-  curlOpts ? "",
+      # Additional curl options needed for the download to succeed.
+      # Warning: Each space (no matter the escaping) will start a new argument.
+      # If you wish to pass arguments with spaces, use `curlOptsList`
+      curlOpts ? "",
 
-  # Additional curl options needed for the download to succeed.
-  curlOptsList ? [ ],
+      # Additional curl options needed for the download to succeed.
+      curlOptsList ? [ ],
 
-  # Name of the file.  If empty, use the basename of `url' (or of the
-  # first element of `urls').
-  name ? "",
+      # Name of the file.  If empty, use the basename of `url' (or of the
+      # first element of `urls').
+      name ? "",
 
-  # for versioned downloads optionally take pname + version.
-  pname ? "",
-  version ? "",
+      # for versioned downloads optionally take pname + version.
+      pname ? "",
+      version ? "",
 
-  # SRI hash.
-  hash ? "",
+      # SRI hash.
+      hash ? "",
 
-  # Legacy ways of specifying the hash.
-  outputHash ? "",
-  outputHashAlgo ? "",
-  sha1 ? "",
-  sha256 ? "",
-  sha512 ? "",
+      # Legacy ways of specifying the hash.
+      outputHash ? "",
+      outputHashAlgo ? "",
+      sha1 ? "",
+      sha256 ? "",
+      sha512 ? "",
 
-  recursiveHash ? false,
+      recursiveHash ? false,
 
-  # Shell code to build a netrc file for BASIC auth
-  netrcPhase ? null,
+      # Shell code to build a netrc file for BASIC auth
+      netrcPhase ? null,
 
-  # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes)
-  # needed for netrcPhase
-  netrcImpureEnvVars ? [ ],
+      # Impure env vars (https://nixos.org/nix/manual/#sec-advanced-attributes)
+      # needed for netrcPhase
+      netrcImpureEnvVars ? [ ],
 
-  # Shell code executed after the file has been fetched
-  # successfully. This can do things like check or transform the file.
-  postFetch ? "",
+      # Shell code executed after the file has been fetched
+      # successfully. This can do things like check or transform the file.
+      postFetch ? "",
 
-  # Whether to download to a temporary path rather than $out. Useful
-  # in conjunction with postFetch. The location of the temporary file
-  # is communicated to postFetch via $downloadedFile.
-  downloadToTemp ? false,
+      # Whether to download to a temporary path rather than $out. Useful
+      # in conjunction with postFetch. The location of the temporary file
+      # is communicated to postFetch via $downloadedFile.
+      downloadToTemp ? false,
 
-  # If true, set executable bit on downloaded file
-  executable ? false,
+      # If true, set executable bit on downloaded file
+      executable ? false,
 
-  # If set, don't download the file, but write a list of all possible
-  # URLs (resulting from resolving mirror:// URLs) to $out.
-  showURLs ? false,
+      # If set, don't download the file, but write a list of all possible
+      # URLs (resulting from resolving mirror:// URLs) to $out.
+      showURLs ? false,
 
-  # Meta information, if any.
-  meta ? { },
+      # Meta information, if any.
+      meta ? { },
 
-  # Passthru information, if any.
-  passthru ? { },
-  # Doing the download on a remote machine just duplicates network
-  # traffic, so don't do that by default
-  preferLocalBuild ? true,
+      # Passthru information, if any.
+      passthru ? { },
+      # Doing the download on a remote machine just duplicates network
+      # traffic, so don't do that by default
+      preferLocalBuild ? true,
 
-  # Additional packages needed as part of a fetch
-  nativeBuildInputs ? [ ],
-}@args:
+      # Additional packages needed as part of a fetch
+      nativeBuildInputs ? [ ],
+    }@args:
 
-let
-  preRewriteUrls =
-    if urls != [ ] && url == "" then
-      (
-        if lib.isList urls then urls else throw "`urls` is not a list: ${lib.generators.toPretty { } urls}"
-      )
-    else if urls == [ ] && url != "" then
-      (
-        if lib.isString url then
-          [ url ]
-        else
-          throw "`url` is not a string: ${lib.generators.toPretty { } urls}"
-      )
-    else
-      throw "fetchurl requires either `url` or `urls` to be set: ${lib.generators.toPretty { } args}";
-
-  urls_ =
     let
-      u = lib.lists.filter (url: lib.isString url) (map rewriteURL preRewriteUrls);
-    in
-    if u == [ ] then throw "urls is empty after rewriteURL (was ${toString preRewriteUrls})" else u;
-
-  hash_ =
-    if
-      with lib.lists;
-      length (
-        filter (s: s != "") [
-          hash
-          outputHash
-          sha1
-          sha256
-          sha512
-        ]
-      ) > 1
-    then
-      throw "multiple hashes passed to fetchurl: ${lib.generators.toPretty { } urls_}"
-    else
-
-    if hash != "" then
-      {
-        outputHashAlgo = null;
-        outputHash = hash;
-      }
-    else if outputHash != "" then
-      if outputHashAlgo != "" then
-        { inherit outputHashAlgo outputHash; }
-      else
-        throw "fetchurl was passed outputHash without outputHashAlgo: ${lib.generators.toPretty { } urls_}"
-    else if sha512 != "" then
-      {
-        outputHashAlgo = "sha512";
-        outputHash = sha512;
-      }
-    else if sha256 != "" then
-      {
-        outputHashAlgo = "sha256";
-        outputHash = sha256;
-      }
-    else if sha1 != "" then
-      {
-        outputHashAlgo = "sha1";
-        outputHash = sha1;
-      }
-    else if cacert != null then
-      {
-        outputHashAlgo = "sha256";
-        outputHash = "";
-      }
-    else
-      throw "fetchurl requires a hash for fixed-output derivation: ${lib.generators.toPretty { } urls_}";
-
-  resolvedUrl =
-    let
-      mirrorSplit = lib.match "mirror://([[:alpha:]]+)/(.+)" url;
-      mirrorName = lib.head mirrorSplit;
-      mirrorList =
-        if lib.hasAttr mirrorName mirrors then
-          mirrors."${mirrorName}"
+      preRewriteUrls =
+        if urls != [ ] && url == "" then
+          (
+            if lib.isList urls then urls else throw "`urls` is not a list: ${lib.generators.toPretty { } urls}"
+          )
+        else if urls == [ ] && url != "" then
+          (
+            if lib.isString url then
+              [ url ]
+            else
+              throw "`url` is not a string: ${lib.generators.toPretty { } urls}"
+          )
         else
-          throw "unknown mirror:// site ${mirrorName}";
-    in
-    if mirrorSplit == null || mirrorName == null then
-      url
-    else
-      "${lib.head mirrorList}${lib.elemAt mirrorSplit 1}";
-in
+          throw "fetchurl requires either `url` or `urls` to be set: ${lib.generators.toPretty { } args}";
 
-  (
-    if (pname != "" && version != "") then
-      { inherit pname version; }
-    else
-      {
-        name =
-          if showURLs then
-            "urls"
-          else if name != "" then
-            name
+      urls_ =
+        let
+          u = lib.lists.filter (url: lib.isString url) (map rewriteURL preRewriteUrls);
+        in
+        if u == [ ] then throw "urls is empty after rewriteURL (was ${toString preRewriteUrls})" else u;
+
+      hash_ =
+        if
+          with lib.lists;
+          length (
+            filter (s: s != "") [
+              hash
+              outputHash
+              sha1
+              sha256
+              sha512
+            ]
+          ) > 1
+        then
+          throw "multiple hashes passed to fetchurl: ${lib.generators.toPretty { } urls_}"
+        else
+
+        if hash != "" then
+          {
+            outputHashAlgo = null;
+            outputHash = hash;
+          }
+        else if outputHash != "" then
+          if outputHashAlgo != "" then
+            { inherit outputHashAlgo outputHash; }
           else
-            baseNameOf (toString (builtins.head urls_));
-      }
-  )
-  // {
-    builder = ./builder.sh;
+            throw "fetchurl was passed outputHash without outputHashAlgo: ${lib.generators.toPretty { } urls_}"
+        else if sha512 != "" then
+          {
+            outputHashAlgo = "sha512";
+            outputHash = sha512;
+          }
+        else if sha256 != "" then
+          {
+            outputHashAlgo = "sha256";
+            outputHash = sha256;
+          }
+        else if sha1 != "" then
+          {
+            outputHashAlgo = "sha1";
+            outputHash = sha1;
+          }
+        else if cacert != null then
+          {
+            outputHashAlgo = "sha256";
+            outputHash = "";
+          }
+        else
+          throw "fetchurl requires a hash for fixed-output derivation: ${lib.generators.toPretty { } urls_}";
 
-    nativeBuildInputs = [ curl ] ++ nativeBuildInputs;
+      resolvedUrl =
+        let
+          mirrorSplit = lib.match "mirror://([[:alpha:]]+)/(.+)" url;
+          mirrorName = lib.head mirrorSplit;
+          mirrorList =
+            if lib.hasAttr mirrorName mirrors then
+              mirrors."${mirrorName}"
+            else
+              throw "unknown mirror:// site ${mirrorName}";
+        in
+        if mirrorSplit == null || mirrorName == null then
+          url
+        else
+          "${lib.head mirrorList}${lib.elemAt mirrorSplit 1}";
+    in
 
-    urls = urls_;
-
-    # If set, prefer the content-addressable mirrors
-    # (http://tarballs.nixos.org) over the original URLs.
-    preferHashedMirrors = false;
-
-    # New-style output content requirements.
-    inherit (hash_) outputHashAlgo outputHash;
-
-    # Disable TLS verification only when we know the hash and no credentials are
-    # needed to access the resource
-    SSL_CERT_FILE =
-      if
-        (
-          hash_.outputHash == ""
-          || hash_.outputHash == lib.fakeSha256
-          || hash_.outputHash == lib.fakeSha512
-          || hash_.outputHash == lib.fakeHash
-          || netrcPhase != null
-        )
-      then
-        "${cacert}/etc/ssl/certs/ca-bundle.crt"
+    (
+      if (pname != "" && version != "") then
+        { inherit pname version; }
       else
-        "/no-cert-file.crt";
+        {
+          name =
+            if showURLs then
+              "urls"
+            else if name != "" then
+              name
+            else
+              baseNameOf (toString (builtins.head urls_));
+        }
+    )
+    // {
+      builder = ./builder.sh;
 
-    outputHashMode = if (recursiveHash || executable) then "recursive" else "flat";
+      nativeBuildInputs = [ curl ] ++ nativeBuildInputs;
 
-    curlOpts = lib.warnIf (lib.isList curlOpts) (
-      let
-        url = toString (builtins.head urls_);
-        curlOptsRepresentation = lib.generators.toPretty { multiline = false; } curlOpts;
-        curlOptsAsStringRepresentation = lib.strings.escapeNixString (toString curlOpts);
-        curlOptsListElementsRepresentation =
-          lib.concatMapStringsSep " " lib.strings.escapeNixString
-            curlOpts;
-      in
-      ''
-        fetchurl for ${url}: curlOpts is a list (${curlOptsRepresentation}), which is not supported anymore.
-        - If you wish to get the same effect as before, for elements with spaces (even if escaped) to expand to multiple curl arguments, use a string argument instead:
-          curlOpts = ${curlOptsAsStringRepresentation};
-        - If you wish for each list element to be passed as a separate curl argument, allowing arguments to contain spaces, use curlOptsList instead:
-          curlOptsList = [ ${curlOptsListElementsRepresentation} ];
-      ''
-    ) curlOpts;
+      urls = urls_;
 
-    curlOptsList = lib.escapeShellArgs curlOptsList;
+      # If set, prefer the content-addressable mirrors
+      # (http://tarballs.nixos.org) over the original URLs.
+      preferHashedMirrors = false;
 
-    inherit
-      showURLs
-      mirrorsFile
-      postFetch
-      downloadToTemp
-      executable
-      ;
+      # New-style output content requirements.
+      inherit (hash_) outputHashAlgo outputHash;
 
-    impureEnvVars = impureEnvVars ++ netrcImpureEnvVars;
+      # Disable TLS verification only when we know the hash and no credentials are
+      # needed to access the resource
+      SSL_CERT_FILE =
+        if
+          (
+            hash_.outputHash == ""
+            || hash_.outputHash == lib.fakeSha256
+            || hash_.outputHash == lib.fakeSha512
+            || hash_.outputHash == lib.fakeHash
+            || netrcPhase != null
+          )
+        then
+          "${cacert}/etc/ssl/certs/ca-bundle.crt"
+        else
+          "/no-cert-file.crt";
 
-    nixpkgsVersion = lib.trivial.release;
+      outputHashMode = if (recursiveHash || executable) then "recursive" else "flat";
 
-    inherit preferLocalBuild;
-
-    postHook =
-      if netrcPhase == null then
-        null
-      else
+      curlOpts = lib.warnIf (lib.isList curlOpts) (
+        let
+          url = toString (builtins.head urls_);
+          curlOptsRepresentation = lib.generators.toPretty { multiline = false; } curlOpts;
+          curlOptsAsStringRepresentation = lib.strings.escapeNixString (toString curlOpts);
+          curlOptsListElementsRepresentation =
+            lib.concatMapStringsSep " " lib.strings.escapeNixString
+              curlOpts;
+        in
         ''
-          ${netrcPhase}
-          curlOpts="$curlOpts --netrc-file $PWD/netrc"
-        '';
+          fetchurl for ${url}: curlOpts is a list (${curlOptsRepresentation}), which is not supported anymore.
+          - If you wish to get the same effect as before, for elements with spaces (even if escaped) to expand to multiple curl arguments, use a string argument instead:
+            curlOpts = ${curlOptsAsStringRepresentation};
+          - If you wish for each list element to be passed as a separate curl argument, allowing arguments to contain spaces, use curlOptsList instead:
+            curlOptsList = [ ${curlOptsListElementsRepresentation} ];
+        ''
+      ) curlOpts;
 
-    inherit meta;
-    passthru = {
-      inherit url resolvedUrl;
-    }
-    // passthru;
-  };
+      curlOptsList = lib.escapeShellArgs curlOptsList;
+
+      inherit
+        showURLs
+        mirrorsFile
+        postFetch
+        downloadToTemp
+        executable
+        ;
+
+      impureEnvVars = impureEnvVars ++ netrcImpureEnvVars;
+
+      nixpkgsVersion = lib.trivial.release;
+
+      inherit preferLocalBuild;
+
+      postHook =
+        if netrcPhase == null then
+          null
+        else
+          ''
+            ${netrcPhase}
+            curlOpts="$curlOpts --netrc-file $PWD/netrc"
+          '';
+
+      inherit meta;
+      passthru = {
+        inherit url resolvedUrl;
+      }
+      // passthru;
+    };
 
   # No ellipsis
   inheritFunctionArgs = false;
diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix
index a5da6f22fb65..830f68085f76 100644
--- a/pkgs/build-support/fetchzip/default.nix
+++ b/pkgs/build-support/fetchzip/default.nix
@@ -27,87 +27,87 @@ lib.extendMkDerivation {
 
   extendDrvArgs =
     finalAttrs:
-{
-  url ? "",
-  urls ? [ ],
-  name ? repoRevToNameMaybe (if url != "" then url else builtins.head urls) null "unpacked",
-  nativeBuildInputs ? [ ],
-  postFetch ? "",
-  extraPostFetch ? "",
+    {
+      url ? "",
+      urls ? [ ],
+      name ? repoRevToNameMaybe (if url != "" then url else builtins.head urls) null "unpacked",
+      nativeBuildInputs ? [ ],
+      postFetch ? "",
+      extraPostFetch ? "",
 
-  # Optionally move the contents of the unpacked tree up one level.
-  stripRoot ? true,
-  # Allows to set the extension for the intermediate downloaded
-  # file. This can be used as a hint for the unpackCmdHooks to select
-  # an appropriate unpacking tool.
-  extension ? null,
+      # Optionally move the contents of the unpacked tree up one level.
+      stripRoot ? true,
+      # Allows to set the extension for the intermediate downloaded
+      # file. This can be used as a hint for the unpackCmdHooks to select
+      # an appropriate unpacking tool.
+      extension ? null,
 
-  # the rest are given to fetchurl as is
-  ...
-}@args:
+      # the rest are given to fetchurl as is
+      ...
+    }@args:
 
-let
-  tmpFilename =
-    if extension != null then
-      "download.${extension}"
-    else
-      baseNameOf (if url != "" then url else builtins.head urls);
-in
+    let
+      tmpFilename =
+        if extension != null then
+          "download.${extension}"
+        else
+          baseNameOf (if url != "" then url else builtins.head urls);
+    in
 
-  {
-    inherit name;
-    recursiveHash = true;
+    {
+      inherit name;
+      recursiveHash = true;
 
-    downloadToTemp = true;
+      downloadToTemp = true;
 
-    # Have to pull in glibcLocalesUtf8 for unzip in setup-hook.sh to handle
-    # UTF-8 aware locale:
-    #   https://github.com/NixOS/nixpkgs/issues/176225#issuecomment-1146617263
-    nativeBuildInputs =
-      lib.optionals withUnzip [
-        unzip
-        glibcLocalesUtf8
-      ]
-      ++ nativeBuildInputs;
+      # Have to pull in glibcLocalesUtf8 for unzip in setup-hook.sh to handle
+      # UTF-8 aware locale:
+      #   https://github.com/NixOS/nixpkgs/issues/176225#issuecomment-1146617263
+      nativeBuildInputs =
+        lib.optionals withUnzip [
+          unzip
+          glibcLocalesUtf8
+        ]
+        ++ nativeBuildInputs;
 
-    postFetch = ''
-      unpackDir="$TMPDIR/unpack"
-      mkdir "$unpackDir"
-      cd "$unpackDir"
+      postFetch = ''
+        unpackDir="$TMPDIR/unpack"
+        mkdir "$unpackDir"
+        cd "$unpackDir"
 
-      renamed="$TMPDIR/${tmpFilename}"
-      mv "$downloadedFile" "$renamed"
-      unpackFile "$renamed"
-      chmod -R +w "$unpackDir"
-    ''
-    + (
-      if stripRoot then
-        ''
-          if [ $(ls -A "$unpackDir" | wc -l) != 1 ]; then
-            echo "error: zip file must contain a single file or directory."
-            echo "hint: Pass stripRoot=false; to fetchzip to assume flat list of files."
-            exit 1
-          fi
-          fn=$(cd "$unpackDir" && ls -A)
-          if [ -f "$unpackDir/$fn" ]; then
-            mkdir $out
-          fi
-          mv "$unpackDir/$fn" "$out"
-        ''
-      else
-        ''
-          mv "$unpackDir" "$out"
-        ''
-    )
-    + ''
-      ${postFetch}
-      ${lib.warnIf (extraPostFetch != "")
-        "use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub' or 'fetchFromGitLab'."
-        extraPostFetch
-      }
-      chmod 755 "$out"
-    '';
-    # ^ Remove non-owner write permissions
-    # Fixes https://github.com/NixOS/nixpkgs/issues/38649
-  };
+        renamed="$TMPDIR/${tmpFilename}"
+        mv "$downloadedFile" "$renamed"
+        unpackFile "$renamed"
+        chmod -R +w "$unpackDir"
+      ''
+      + (
+        if stripRoot then
+          ''
+            if [ $(ls -A "$unpackDir" | wc -l) != 1 ]; then
+              echo "error: zip file must contain a single file or directory."
+              echo "hint: Pass stripRoot=false; to fetchzip to assume flat list of files."
+              exit 1
+            fi
+            fn=$(cd "$unpackDir" && ls -A)
+            if [ -f "$unpackDir/$fn" ]; then
+              mkdir $out
+            fi
+            mv "$unpackDir/$fn" "$out"
+          ''
+        else
+          ''
+            mv "$unpackDir" "$out"
+          ''
+      )
+      + ''
+        ${postFetch}
+        ${lib.warnIf (extraPostFetch != "")
+          "use 'postFetch' instead of 'extraPostFetch' with 'fetchzip' and 'fetchFromGitHub' or 'fetchFromGitLab'."
+          extraPostFetch
+        }
+        chmod 755 "$out"
+      '';
+      # ^ Remove non-owner write permissions
+      # Fixes https://github.com/NixOS/nixpkgs/issues/38649
+    };
 }

From f6bf1c913a064ac85d8655e04cb14e6443d8cb5e Mon Sep 17 00:00:00 2001
From: Paul Joubert <paul@trespaul.com>
Date: Tue, 28 Oct 2025 00:37:01 +0200
Subject: [PATCH 3392/6226] brill: fix build

---
 pkgs/by-name/br/brill/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/br/brill/package.nix b/pkgs/by-name/br/brill/package.nix
index a077e5a1c169..ff7cc19b750f 100644
--- a/pkgs/by-name/br/brill/package.nix
+++ b/pkgs/by-name/br/brill/package.nix
@@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   version = "4.000.073";
 
   src = fetchzip {
-    url = "https://brill.com/fileasset/The_Brill_Typeface_Package_v_4_0.zip";
+    url = "https://web.archive.org/web/20250719162541/https://brill.com/fileasset/The_Brill_Typeface_Package_v_4_0.zip";
     hash = "sha256-ugmEIkeBzD/4C9wkVfbctEtnzI8Kw+YD6KGcbk4BAf4=";
     stripRoot = false;
   };

From f5b2fcd10062ee9bde2a0924d4c17c74c3a3cd6f Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Mon, 27 Oct 2025 04:07:47 +0800
Subject: [PATCH 3393/6226] .git-blame-ignore-revs: ignore fetchurl, fetchzip,
 fetchgit extendMkDerivation reformatting

---
 .git-blame-ignore-revs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index e4a336ee6d0f..9685de407b97 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -193,6 +193,10 @@ cffc27daf06c77c0d76bc35d24b929cb9d68c3c9
 # nixos/kanidm: inherit lib, nixfmt
 8f18393d380079904d072007fb19dc64baef0a3a
 
+# fetchgit, fetchurl, fetchzip:
+# format after refactoring with lib.extendMkDerivation (#455994)
+aeddd850c6d3485fc1af2edfb111e58141d18dc1
+
 # fetchhg: format after refactoring with lib.extendMkDerivation and make overridable (#423539)
 34a5b1eb23129f8fb62c677e3760903f6d43228f
 

From 1ec0227cc062251c36140ef1e7c37b1cd1b370f1 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Tue, 28 Oct 2025 00:48:30 +0800
Subject: [PATCH 3394/6226] fetchurl: don't treat empty-string name special

---
 pkgs/build-support/fetchurl/default.nix | 42 ++++++++++---------------
 1 file changed, 16 insertions(+), 26 deletions(-)

diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index e528b70eb7a7..88e7bfaa7809 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -60,12 +60,6 @@ lib.extendMkDerivation {
     # Passed via passthru
     "url"
 
-    # Name-related attributes
-    # TODO(@ShamrockLee): Pass them.
-    "name"
-    "pname"
-    "version"
-
     # Hash attributes will be map to the corresponding outputHash*
     "hash"
     "sha1"
@@ -91,13 +85,13 @@ lib.extendMkDerivation {
       # Additional curl options needed for the download to succeed.
       curlOptsList ? [ ],
 
-      # Name of the file.  If empty, use the basename of `url' (or of the
-      # first element of `urls').
-      name ? "",
+      # Name of the file when pname + version is unspecified.
+      # Default to the basename of `url' (or of the first element of `urls').
+      name ? null,
 
       # for versioned downloads optionally take pname + version.
-      pname ? "",
-      version ? "",
+      pname ? null,
+      version ? null,
 
       # SRI hash.
       hash ? "",
@@ -234,21 +228,17 @@ lib.extendMkDerivation {
           "${lib.head mirrorList}${lib.elemAt mirrorSplit 1}";
     in
 
-    (
-      if (pname != "" && version != "") then
-        { inherit pname version; }
-      else
-        {
-          name =
-            if showURLs then
-              "urls"
-            else if name != "" then
-              name
-            else
-              baseNameOf (toString (builtins.head urls_));
-        }
-    )
-    // {
+    {
+      name =
+        if pname != null && version != null then
+          "${finalAttrs.pname}-${finalAttrs.version}"
+        else if showURLs then
+          "urls"
+        else if name != null then
+          name
+        else
+          baseNameOf (toString (lib.head urls_));
+
       builder = ./builder.sh;
 
       nativeBuildInputs = [ curl ] ++ nativeBuildInputs;

From 981c7d9cb06c4e7f322c7c18834e30527b9b228e Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 27 Oct 2025 18:43:33 -0400
Subject: [PATCH 3395/6226] nixos/strongswan-swanctl: update options for
 strongswan 6.0.3

---
 .../services/networking/strongswan-swanctl/swanctl-params.nix    | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
index bcdcfec9fc06..aa99f47acacb 100644
--- a/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
+++ b/nixos/modules/services/networking/strongswan-swanctl/swanctl-params.nix
@@ -1353,6 +1353,7 @@ in
         netmask = mkCommaSepListParam [ ] "Address or CIDR subnets";
         server = mkCommaSepListParam [ ] "Address or CIDR subnets";
         subnet = mkCommaSepListParam [ ] "Address or CIDR subnets";
+        p_cscf = mkCommaSepListParam [ ] "Address or CIDR subnets";
         split_include = mkCommaSepListParam [ ] "Address or CIDR subnets";
         split_exclude = mkCommaSepListParam [ ] "Address or CIDR subnets";
       }

From 159e5acf079b6999ba31f922fb6541118129cb49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 22:52:22 +0000
Subject: [PATCH 3396/6226] slade-unstable: 3.2.8-unstable-2025-10-21 ->
 3.2.8-unstable-2025-10-25

---
 pkgs/by-name/sl/slade-unstable/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sl/slade-unstable/package.nix b/pkgs/by-name/sl/slade-unstable/package.nix
index 3d4027fd860b..ed86e1b0feeb 100644
--- a/pkgs/by-name/sl/slade-unstable/package.nix
+++ b/pkgs/by-name/sl/slade-unstable/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation {
   pname = "slade";
-  version = "3.2.8-unstable-2025-10-21";
+  version = "3.2.8-unstable-2025-10-25";
 
   src = fetchFromGitHub {
     owner = "sirjuddington";
     repo = "SLADE";
-    rev = "fb7cc161a6886c12c5120e30190a7813c6c16b62";
-    hash = "sha256-skJpcxLSInAzBHGtxdTWAqocXQKKQY7vJfUx8ZAlMqc=";
+    rev = "d473699512b6d41bc9e58c8e6df3b8f24156f3b4";
+    hash = "sha256-y5MB5BytWfcRe8orPwqZrObRKilCWz9eITxhQmgVmHc=";
   };
 
   nativeBuildInputs = [

From 9679d5c14347614319a0df444398ae4baa7afe17 Mon Sep 17 00:00:00 2001
From: Kira Bruneau <kira.bruneau@pm.me>
Date: Sat, 18 Oct 2025 10:49:13 -0400
Subject: [PATCH 3397/6226] python313Packages.pygls_2: init at 2.0.0

---
 .../pygls/{default.nix => 1.nix}              | 15 ++--
 pkgs/development/python-modules/pygls/2.nix   | 72 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            | 10 ++-
 3 files changed, 85 insertions(+), 12 deletions(-)
 rename pkgs/development/python-modules/pygls/{default.nix => 1.nix} (82%)
 create mode 100644 pkgs/development/python-modules/pygls/2.nix

diff --git a/pkgs/development/python-modules/pygls/default.nix b/pkgs/development/python-modules/pygls/1.nix
similarity index 82%
rename from pkgs/development/python-modules/pygls/default.nix
rename to pkgs/development/python-modules/pygls/1.nix
index 935a373cd9b5..830f177f81f1 100644
--- a/pkgs/development/python-modules/pygls/default.nix
+++ b/pkgs/development/python-modules/pygls/1.nix
@@ -10,7 +10,6 @@
   pythonOlder,
   typeguard,
   websockets,
-  nix-update-script,
 }:
 
 buildPythonPackage rec {
@@ -60,19 +59,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pygls" ];
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [
-      # Skips pre-releases
-      "--version-regex"
-      "^v([0-9.]+)$"
-    ];
-  };
+  passthru.skipBulkUpdate = true;
 
-  meta = with lib; {
+  meta = {
     description = "Pythonic generic implementation of the Language Server Protocol";
     homepage = "https://github.com/openlawlibrary/pygls";
     changelog = "https://github.com/openlawlibrary/pygls/blob/${version}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ kira-bruneau ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ kira-bruneau ];
   };
 }
diff --git a/pkgs/development/python-modules/pygls/2.nix b/pkgs/development/python-modules/pygls/2.nix
new file mode 100644
index 000000000000..7cde9005c746
--- /dev/null
+++ b/pkgs/development/python-modules/pygls/2.nix
@@ -0,0 +1,72 @@
+{
+  lib,
+  stdenv,
+  buildPythonPackage,
+  fetchFromGitHub,
+  poetry-core,
+  attrs,
+  cattrs,
+  lsprotocol,
+  websockets,
+  pytest-asyncio,
+  pytestCheckHook,
+  nix-update-script,
+}:
+
+buildPythonPackage rec {
+  pname = "pygls";
+  version = "2.0.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "openlawlibrary";
+    repo = "pygls";
+    tag = "v${version}";
+    hash = "sha256-dQLK18EACiN+DpWp81Vgaan0mwtifhrmH4xwkqttKvg=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    attrs
+    cattrs
+    lsprotocol
+  ];
+
+  optional-dependencies = {
+    ws = [ websockets ];
+  };
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  # Fixes hanging tests on Darwin
+  __darwinAllowLocalNetworking = true;
+
+  preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # Darwin issue: OSError: [Errno 24] Too many open files
+    ulimit -n 1024
+  '';
+
+  pythonImportsCheck = [ "pygls" ];
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      # Skips pre-releases
+      "--version-regex"
+      "^v([0-9.]+)$"
+    ];
+  };
+
+  meta = {
+    description = "Pythonic generic implementation of the Language Server Protocol";
+    homepage = "https://github.com/openlawlibrary/pygls";
+    changelog = "https://github.com/openlawlibrary/pygls/blob/${version}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ kira-bruneau ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 99a8ce5fcd78..d05e8fd820b7 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13130,7 +13130,15 @@ self: super: with self; {
 
   pyglossary = callPackage ../development/python-modules/pyglossary { };
 
-  pygls = callPackage ../development/python-modules/pygls { };
+  pygls = pygls_1;
+
+  pygls_1 = callPackage ../development/python-modules/pygls/1.nix {
+    lsprotocol = lsprotocol_2023;
+  };
+
+  pygls_2 = callPackage ../development/python-modules/pygls/2.nix {
+    lsprotocol = lsprotocol_2025;
+  };
 
   pygltflib = callPackage ../development/python-modules/pygltflib { };
 

From e630c9e239234c2c45b6b198e7d287f210fc30b2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 23:01:11 +0000
Subject: [PATCH 3398/6226] clever-tools: 4.2.0 -> 4.3.0

---
 pkgs/by-name/cl/clever-tools/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix
index c5b6683f55e3..6f15691e9a9a 100644
--- a/pkgs/by-name/cl/clever-tools/package.nix
+++ b/pkgs/by-name/cl/clever-tools/package.nix
@@ -11,7 +11,7 @@
 buildNpmPackage rec {
   pname = "clever-tools";
 
-  version = "4.2.0";
+  version = "4.3.0";
 
   nodejs = nodejs_22;
 
@@ -19,10 +19,10 @@ buildNpmPackage rec {
     owner = "CleverCloud";
     repo = "clever-tools";
     rev = version;
-    hash = "sha256-1llFIq5F4FTxJuIdFov8+XExAZmfIMy81fP7OT2JbbE=";
+    hash = "sha256-YC6wfa8bz21LhOH5YIRZ94rLxWl4f1m24jmAAsTvbS0=";
   };
 
-  npmDepsHash = "sha256-UzjGYHIG2fza4HJqiha0dyIqKY9v0O9YvbmcMUcMhAY=";
+  npmDepsHash = "sha256-KCaLAlJtLsTpjWR8PQtgFYJg0zX5vtu78DKowjE6ygI=";
 
   nativeBuildInputs = [
     installShellFiles

From 7636389851e31bf2f5d7712c009105e33a66a750 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Wed, 22 Oct 2025 17:07:07 +0200
Subject: [PATCH 3399/6226] lib.teams: Add githubId from associated github
 teams

This will allow the code for https://github.com/NixOS/nixpkgs/issues/447514
to make sure that the right team is requested for review,
even if it has been renamed in the meantime.

While the matching is currently based on the teams slug/name and not the
id, renames won't cause problems with `lib.teams`, because CI would
error if there's no match. Changing this can be future work.
---
 lib/tests/teams.nix                | 4 ++++
 maintainers/computed-team-list.nix | 9 +++++++++
 maintainers/team-list.nix          | 1 +
 3 files changed, 14 insertions(+)

diff --git a/lib/tests/teams.nix b/lib/tests/teams.nix
index 726e7f63a8e9..ed7db2b873f1 100644
--- a/lib/tests/teams.nix
+++ b/lib/tests/teams.nix
@@ -31,6 +31,10 @@ let
           type = types.str;
           default = "";
         };
+        githubId = lib.mkOption {
+          type = types.int;
+          default = 0;
+        };
         githubMaintainers = lib.mkOption {
           type = types.listOf (types.submodule ./maintainer-module.nix);
           default = [ ];
diff --git a/maintainers/computed-team-list.nix b/maintainers/computed-team-list.nix
index bcb8a0f9c237..7ee37f4283e3 100644
--- a/maintainers/computed-team-list.nix
+++ b/maintainers/computed-team-list.nix
@@ -20,6 +20,8 @@ let
     );
 
 in
+# TODO: Consider automatically exposing all GitHub teams under `lib.teams`,
+# so that no manual PRs are necessary to add such teams anymore
 lib.mapAttrs (
   name: attrs:
   if attrs ? github then
@@ -28,6 +30,12 @@ lib.mapAttrs (
         githubTeams.${attrs.github}
           or (throw "lib.teams.${name}: Corresponding GitHub team ${attrs.github} not known yet, make sure to create it and wait for the regular team sync");
     in
+    # TODO: Consider specifying `githubId` in team-list.nix and inferring `github` from it (or even dropping it)
+    # This would make renames easier because no additional place needs to keep track of them.
+    # Though in a future where all Nixpkgs GitHub teams are automatically exposed under `lib.teams`,
+    # this would also not be an issue anymore.
+    assert lib.assertMsg (!attrs ? githubId)
+      "lib.teams.${name}: Both `githubId` and `github` is set, but the former is synced from the latter";
     assert lib.assertMsg (!attrs ? shortName)
       "lib.teams.${name}: Both `shortName` and `github` is set, but the former is synced from the latter";
     assert lib.assertMsg (
@@ -38,6 +46,7 @@ lib.mapAttrs (
     ) "lib.teams.${name}: Both `members` and `github` is set, but the former is synced from the latter";
     attrs
     // {
+      githubId = githubTeam.id;
       shortName = githubTeam.name;
       scope = githubTeam.description;
       members =
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index b9c155748e38..9774b61d7e25 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -17,6 +17,7 @@
     - There is limited mention capacity in a single post, so this should be reserved for critical components
       or larger ecosystems within nixpkgs.
   - `github` will ping the specified GitHub team and sync the `members`, `scope` and `shortName` fields from it
+  - `githubId` will be set automatically based on `github`
 
   If `github` is specified and you'd like to be added to the team, contact one of the `githubMaintainers` of the team:
 

From 59e9fb0250fb15272e532017dcaf97f19600300e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 23:15:26 +0000
Subject: [PATCH 3400/6226] credhub-cli: 2.9.50 -> 2.9.51

---
 pkgs/by-name/cr/credhub-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cr/credhub-cli/package.nix b/pkgs/by-name/cr/credhub-cli/package.nix
index 9914f4b7669c..602b2deca179 100644
--- a/pkgs/by-name/cr/credhub-cli/package.nix
+++ b/pkgs/by-name/cr/credhub-cli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "credhub-cli";
-  version = "2.9.50";
+  version = "2.9.51";
 
   src = fetchFromGitHub {
     owner = "cloudfoundry-incubator";
     repo = "credhub-cli";
     rev = version;
-    sha256 = "sha256-+Y+PmnCQCCpGvThzbW6byquwFx3Pz96Je0+yWWMh3BQ=";
+    sha256 = "sha256-BFlPKkk8t6WWbDB4Z0Bsizumd0flO1GqedVSWHKlwgE=";
   };
 
   # these tests require network access that we're not going to give them

From 98ff369a99fd84ae255e9c3f480890f9f0ac3c50 Mon Sep 17 00:00:00 2001
From: Mauricio Collares <mauricio@collares.org>
Date: Mon, 27 Oct 2025 18:06:09 -0300
Subject: [PATCH 3401/6226] sage: import GAP update patch

---
 pkgs/by-name/sa/sage/sage-src.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/sa/sage/sage-src.nix b/pkgs/by-name/sa/sage/sage-src.nix
index 706e178e6300..89f8e4c25ab2 100644
--- a/pkgs/by-name/sa/sage/sage-src.nix
+++ b/pkgs/by-name/sa/sage/sage-src.nix
@@ -75,6 +75,13 @@ stdenv.mkDerivation rec {
   # should come from or be proposed to upstream. This list will probably never
   # be empty since dependencies update all the time.
   packageUpgradePatches = [
+    # https://github.com/sagemath/sage/pull/40919, landed in 10.8.beta8
+    (fetchpatch2 {
+      name = "gap-4.15.1-update.patch";
+      url = "https://github.com/sagemath/sage/commit/54d4ddb132cc71ef26b4db1f48afd6736d41cc63.patch?full_index=1";
+      hash = "sha256-PZyOXRsgcsPvgceGGZXet5URJgWiIlCfFx8tvwpLk5A=";
+      excludes = [ "src/doc/zh/constructions/rep_theory.rst" ];
+    })
   ];
 
   patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches;

From abe4b2cb6b81879bacb84c4ad9e9a2315ca65efa Mon Sep 17 00:00:00 2001
From: Michael Hoang <enzime@users.noreply.github.com>
Date: Tue, 28 Oct 2025 00:06:31 +0100
Subject: [PATCH 3402/6226] matrix-commander: 8.0.4 -> 8.0.5

---
 .../instant-messengers/matrix-commander/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
index 2ed07af8eeb3..2c215062250f 100644
--- a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
+++ b/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix
@@ -18,13 +18,13 @@
 
 buildPythonApplication rec {
   pname = "matrix-commander";
-  version = "8.0.4";
+  version = "8.0.5";
 
   src = fetchFromGitHub {
     owner = "8go";
     repo = "matrix-commander";
     rev = "v${version}";
-    hash = "sha256-JZcdAo6d7huwDQ9hJE8oT5FH0ZQjg0DhoglOkhOyk1o=";
+    hash = "sha256-eNgnjErPi5q9yA/2iEg3+CoN2xbopmFOpbgU/7GhoAQ=";
   };
 
   format = "pyproject";

From 736a28ea82bdda3e543238e4d9c31f65440b676a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 23:23:49 +0000
Subject: [PATCH 3403/6226] bngblaster: 0.9.25 -> 0.9.26

---
 pkgs/by-name/bn/bngblaster/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bn/bngblaster/package.nix b/pkgs/by-name/bn/bngblaster/package.nix
index 4f7db4c8d37d..32adfde8f911 100644
--- a/pkgs/by-name/bn/bngblaster/package.nix
+++ b/pkgs/by-name/bn/bngblaster/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bngblaster";
-  version = "0.9.25";
+  version = "0.9.26";
 
   src = fetchFromGitHub {
     owner = "rtbrick";
     repo = "bngblaster";
     rev = finalAttrs.version;
-    hash = "sha256-imbTZLq7yFxh/qaigySNaBBLqkJS1zY/gwjLslj3Jv4=";
+    hash = "sha256-EZc+cageuhPSIwyHAW6JTbSGQwlHCl9YpUHzHZ0ygx0=";
   };
 
   nativeBuildInputs = [ cmake ];

From 273bfd7726fcee2d1e61a3f7552be6937b936a8d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 15 Oct 2025 18:38:39 +0000
Subject: [PATCH 3404/6226] python3Packages.torch-bin: 2.8.0 -> 2.9.0

Diff: https://github.com/pytorch/pytorch/compare/v2.8.0...v2.9.0

Changelog: https://github.com/pytorch/pytorch/releases/tag/v2.9.0
---
 .../torch/bin/binary-hashes.nix               | 100 +++++++++---------
 .../python-modules/torch/bin/default.nix      |   5 +-
 .../python-modules/torch/bin/prefetch.sh      |   6 +-
 3 files changed, 56 insertions(+), 55 deletions(-)

diff --git a/pkgs/development/python-modules/torch/bin/binary-hashes.nix b/pkgs/development/python-modules/torch/bin/binary-hashes.nix
index 8001f6822c03..7004610a6ce2 100644
--- a/pkgs/development/python-modules/torch/bin/binary-hashes.nix
+++ b/pkgs/development/python-modules/torch/bin/binary-hashes.nix
@@ -7,81 +7,81 @@
 
 version:
 builtins.getAttr version {
-  "2.8.0" = {
-    x86_64-linux-39 = {
-      name = "torch-2.8.0-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl";
-      hash = "sha256-uTV6h1laPXsqVlumArlzkqN8VvC4VpjwzPCixY++9ew=";
-    };
+  "2.9.0" = {
     x86_64-linux-310 = {
-      name = "torch-2.8.0-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
-      hash = "sha256-DJaZnRXPHxPdfJE+CyGpo1VTjmz8EIYaFxWDICkvWVQ=";
+      name = "torch-2.9.0-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.9.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
+      hash = "sha256-gWVAKG/OJFqK85BKGUqDr5ySkq10Uut5Fgt6Oxzvt+M=";
     };
     x86_64-linux-311 = {
-      name = "torch-2.8.0-cp311-cp311-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
-      hash = "sha256-A5udzda9uqEKilzWviLEyz41iaNB5fkEy7Vxyij1W+0=";
+      name = "torch-2.9.0-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.9.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
+      hash = "sha256-6XwmRHjJ/Ej5GDJ0nZYPHjSa6yFCJOvmX7CUNd1kxZo=";
     };
     x86_64-linux-312 = {
-      name = "torch-2.8.0-cp312-cp312-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
-      hash = "sha256-Q1T8Bbt5sgjWmVoEyhzu9qlUexxDNENVdDU9OBxVCHw=";
+      name = "torch-2.9.0-cp312-cp312-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.9.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
+      hash = "sha256-h8YtO5XxoicL0Rbb1H3FFcCyA1B2+7SgO0Nl6iieicQ=";
     };
     x86_64-linux-313 = {
-      name = "torch-2.8.0-cp313-cp313-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torch-2.8.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
-      hash = "sha256-OoUjaaON7DQ9RezQvDZg95uIoj4Mh40YcH98E79JU48=";
+      name = "torch-2.9.0-cp313-cp313-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.9.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
+      hash = "sha256-l97wCH+O8XG5AC6lALr/3UQMe91VnCPDi7+HgbZ+k2Q=";
     };
-    aarch64-darwin-39 = {
-      name = "torch-2.8.0-cp39-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp39-none-macosx_11_0_arm64.whl";
-      hash = "sha256-a+wfJAlodJ4ju7fqj2YXoI/D2xtMdmtczq34ootBl9k=";
+    x86_64-linux-314 = {
+      name = "torch-2.9.0-cp314-cp314-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torch-2.9.0%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl";
+      hash = "sha256-VaIYTtifISC8HiyIfumOUoDe5IvDMOnf4paqE1o3D30=";
     };
     aarch64-darwin-310 = {
-      name = "torch-2.8.0-cp310-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp310-none-macosx_11_0_arm64.whl";
-      hash = "sha256-pGe0n+iTpqbM6J467lVu39xkpyLXGV/f3XXOyd6hN3k=";
+      name = "torch-2.9.0-cp310-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.9.0-cp310-none-macosx_11_0_arm64.whl";
+      hash = "sha256-WUhBk7ASmb9mlSBQWnKynVmgAorkxtlfSSk48YZZIgg=";
     };
     aarch64-darwin-311 = {
-      name = "torch-2.8.0-cp311-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp311-none-macosx_11_0_arm64.whl";
-      hash = "sha256-PQUBfRm8mXQSiORYiIKDpEsO6IHVPwX3L4sc/qiZgSI=";
+      name = "torch-2.9.0-cp311-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.9.0-cp311-none-macosx_11_0_arm64.whl";
+      hash = "sha256-qkSDYCWGzJo10c8zdxqZd/BfZCuRYVGKKJ42VIoLd8I=";
     };
     aarch64-darwin-312 = {
-      name = "torch-2.8.0-cp312-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp312-none-macosx_11_0_arm64.whl";
-      hash = "sha256-pHt5hr7j9hrSF9ioziRgWAmrQluvNJ+X3nWIFe3S71Q=";
+      name = "torch-2.9.0-cp312-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.9.0-cp312-none-macosx_11_0_arm64.whl";
+      hash = "sha256-TeDtjLxFelBtvKQDduIGop7+4QdWoA8fNAS/Z61zfQQ=";
     };
     aarch64-darwin-313 = {
-      name = "torch-2.8.0-cp313-none-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0-cp313-none-macosx_11_0_arm64.whl";
-      hash = "sha256-BX79MKZ3jS7l4jdM1jpj9jMRqm8zMh5ifGVd9gq905A=";
+      name = "torch-2.9.0-cp313-none-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.9.0-cp313-none-macosx_11_0_arm64.whl";
+      hash = "sha256-4kg22Wi1TvTfsFWUABphlYcRrJIkAmKR5OP5L4Om/X8=";
     };
-    aarch64-linux-39 = {
-      name = "torch-2.8.0-cp39-cp39-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp39-cp39-manylinux_2_28_aarch64.whl";
-      hash = "sha256-6si371x8oQba7F6CnfqMpWykdgHbE7QC0mCIYa06uSY=";
+    aarch64-darwin-314 = {
+      name = "torch-2.9.0-cp314-cp314-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.9.0-cp314-cp314-macosx_11_0_arm64.whl";
+      hash = "sha256-2OKrf4YBAzC9zDnIsseVWQzHXjffSCPNruLJjW4/9KM=";
     };
     aarch64-linux-310 = {
-      name = "torch-2.8.0-cp310-cp310-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl";
-      hash = "sha256-shSYWLg0Cu6x8wVuC/9bgrluQ7WW/kmp26MYRSImEhM=";
+      name = "torch-2.9.0-cp310-cp310-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.9.0%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl";
+      hash = "sha256-siR5LqVntSx/HOHXiVZ/aSDgb9OzOfoeGwWUiEX3g60=";
     };
     aarch64-linux-311 = {
-      name = "torch-2.8.0-cp311-cp311-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl";
-      hash = "sha256-aAEp797uw9tdo/iO5dKMGx4QO3dK70D51jjizOj42Ng=";
+      name = "torch-2.9.0-cp311-cp311-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.9.0%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl";
+      hash = "sha256-2nc0HMq6MXYtkjiwlCwWXEWComgY8wRbBSs5zr3XrZ0=";
     };
     aarch64-linux-312 = {
-      name = "torch-2.8.0-cp312-cp312-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl";
-      hash = "sha256-YQ9gDBAjhuWBMn1e/BjA1u3suYILQUDSYWM1SpnNgA0=";
+      name = "torch-2.9.0-cp312-cp312-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.9.0%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl";
+      hash = "sha256-OmUUNK4SSLBWjBK1+eOsyJQusoN42dBKeTApOLaMbyQ=";
     };
     aarch64-linux-313 = {
-      name = "torch-2.8.0-cp313-cp313-manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torch-2.8.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl";
-      hash = "sha256-pQZLXiN3LI0WQGjMfBLgGnX697lI7NlaDUAH10h+XyU=";
+      name = "torch-2.9.0-cp313-cp313-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.9.0%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl";
+      hash = "sha256-vkQ42NrX8NWl5U8P7viok0RolOyH8QK7HYLcxFGFQuQ=";
+    };
+    aarch64-linux-314 = {
+      name = "torch-2.9.0-cp314-cp314-manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torch-2.9.0%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl";
+      hash = "sha256-RKrbc1d01KmVJdLsKRJrIwFsRKB7As5sI336YaIj3VI=";
     };
   };
 }
diff --git a/pkgs/development/python-modules/torch/bin/default.nix b/pkgs/development/python-modules/torch/bin/default.nix
index a24774985149..ace16c5c8c5d 100644
--- a/pkgs/development/python-modules/torch/bin/default.nix
+++ b/pkgs/development/python-modules/torch/bin/default.nix
@@ -34,7 +34,7 @@ let
   pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
   srcs = import ./binary-hashes.nix version;
   unsupported = throw "Unsupported system";
-  version = "2.8.0";
+  version = "2.9.0";
 in
 buildPythonPackage {
   inherit version;
@@ -44,7 +44,7 @@ buildPythonPackage {
 
   format = "wheel";
 
-  disabled = (pythonOlder "3.9") || (pythonAtLeast "3.14");
+  disabled = (pythonOlder "3.10") || (pythonAtLeast "3.15");
 
   src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
 
@@ -72,6 +72,7 @@ buildPythonPackage {
       libcusolver
       libcusparse
       libcusparse_lt
+      libnvshmem
       nccl
     ]
   );
diff --git a/pkgs/development/python-modules/torch/bin/prefetch.sh b/pkgs/development/python-modules/torch/bin/prefetch.sh
index bfb942c2cad2..354d28362a90 100755
--- a/pkgs/development/python-modules/torch/bin/prefetch.sh
+++ b/pkgs/development/python-modules/torch/bin/prefetch.sh
@@ -11,21 +11,21 @@ linux_cpu_bucket="https://download.pytorch.org/whl/cpu"
 darwin_bucket="https://download.pytorch.org/whl/cpu"
 
 url_and_key_list=(
-    "x86_64-linux-39 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp39-cp39-manylinux_2_28_x86_64.whl torch-${version}-cp39-cp39-linux_x86_64.whl"
     "x86_64-linux-310 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp310-cp310-manylinux_2_28_x86_64.whl torch-${version}-cp310-cp310-linux_x86_64.whl"
     "x86_64-linux-311 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp311-cp311-manylinux_2_28_x86_64.whl torch-${version}-cp311-cp311-linux_x86_64.whl"
     "x86_64-linux-312 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torch-${version}-cp312-cp312-linux_x86_64.whl"
     "x86_64-linux-313 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torch-${version}-cp313-cp313-linux_x86_64.whl"
-    "aarch64-darwin-39 $darwin_bucket/torch-${version}-cp39-none-macosx_11_0_arm64.whl torch-${version}-cp39-none-macosx_11_0_arm64.whl"
+    "x86_64-linux-314 $linux_cuda_bucket/torch-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torch-${version}-cp314-cp314-linux_x86_64.whl"
     "aarch64-darwin-310 $darwin_bucket/torch-${version}-cp310-none-macosx_11_0_arm64.whl torch-${version}-cp310-none-macosx_11_0_arm64.whl"
     "aarch64-darwin-311 $darwin_bucket/torch-${version}-cp311-none-macosx_11_0_arm64.whl torch-${version}-cp311-none-macosx_11_0_arm64.whl"
     "aarch64-darwin-312 $darwin_bucket/torch-${version}-cp312-none-macosx_11_0_arm64.whl torch-${version}-cp312-none-macosx_11_0_arm64.whl"
     "aarch64-darwin-313 $darwin_bucket/torch-${version}-cp313-none-macosx_11_0_arm64.whl torch-${version}-cp313-none-macosx_11_0_arm64.whl"
-    "aarch64-linux-39 $linux_cpu_bucket/torch-${version}%2Bcpu-cp39-cp39-manylinux_2_28_aarch64.whl torch-${version}-cp39-cp39-manylinux_2_28_aarch64.whl"
+    "aarch64-darwin-314 $darwin_bucket/torch-${version}-cp314-cp314-macosx_11_0_arm64.whl torch-${version}-cp314-cp314-macosx_11_0_arm64.whl"
     "aarch64-linux-310 $linux_cpu_bucket/torch-${version}%2Bcpu-cp310-cp310-manylinux_2_28_aarch64.whl torch-${version}-cp310-cp310-manylinux_2_28_aarch64.whl"
     "aarch64-linux-311 $linux_cpu_bucket/torch-${version}%2Bcpu-cp311-cp311-manylinux_2_28_aarch64.whl torch-${version}-cp311-cp311-manylinux_2_28_aarch64.whl"
     "aarch64-linux-312 $linux_cpu_bucket/torch-${version}%2Bcpu-cp312-cp312-manylinux_2_28_aarch64.whl torch-${version}-cp312-cp312-manylinux_2_28_aarch64.whl"
     "aarch64-linux-313 $linux_cpu_bucket/torch-${version}%2Bcpu-cp313-cp313-manylinux_2_28_aarch64.whl torch-${version}-cp313-cp313-manylinux_2_28_aarch64.whl"
+    "aarch64-linux-314 $linux_cpu_bucket/torch-${version}%2Bcpu-cp314-cp314-manylinux_2_28_aarch64.whl torch-${version}-cp314-cp314-manylinux_2_28_aarch64.whl"
 )
 
 hashfile="binary-hashes-$version.nix"

From 60a4eeb5fd9793737d41b1e19cfad5b1bd6b42b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 23:30:17 +0000
Subject: [PATCH 3405/6226] cargo-outdated: 0.17.0 -> 0.18.0

---
 pkgs/by-name/ca/cargo-outdated/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-outdated/package.nix b/pkgs/by-name/ca/cargo-outdated/package.nix
index 09d717388e31..ed4dedbb900e 100644
--- a/pkgs/by-name/ca/cargo-outdated/package.nix
+++ b/pkgs/by-name/ca/cargo-outdated/package.nix
@@ -7,16 +7,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "cargo-outdated";
-  version = "0.17.0";
+  version = "0.18.0";
 
   src = fetchFromGitHub {
     owner = "kbknapp";
     repo = "cargo-outdated";
     rev = "v${version}";
-    hash = "sha256-ey11ANSflWGnCsn6M9GupgC4DE5mWww6vw5pK0CFdLo=";
+    hash = "sha256-r7FtuXx9+OmVAdL6+9s2bYHjsURmX60+2c7+2FjkSRs=";
   };
 
-  cargoHash = "sha256-PYlVXGfitsjEGiw07L5b+L8pfxvtkHshIjTXeuPUTdk=";
+  cargoHash = "sha256-l4UfmntTRlqRq1040FTzAn/QU33+owv569tcWNXSGN0=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 31a5d5ccb90dbd8d013c903b0a49e65f03ca7143 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 27 Oct 2025 20:57:55 +0000
Subject: [PATCH 3406/6226] python3Packages.keras: 3.11.3 -> 3.12.0

Diff: https://github.com/keras-team/keras/compare/v3.11.3...v3.12.0

Changelog: https://github.com/keras-team/keras/releases/tag/v3.12.0
---
 .../python-modules/keras/default.nix          | 36 +++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/keras/default.nix b/pkgs/development/python-modules/keras/default.nix
index 93f8a3a14784..e7543e101649 100644
--- a/pkgs/development/python-modules/keras/default.nix
+++ b/pkgs/development/python-modules/keras/default.nix
@@ -36,16 +36,26 @@
 
 buildPythonPackage rec {
   pname = "keras";
-  version = "3.11.3";
+  version = "3.12.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "keras-team";
     repo = "keras";
     tag = "v${version}";
-    hash = "sha256-J/NPLR9ShKhvHDU0/NpUNp95RViS2KygqvnuDHdwiP0=";
+    hash = "sha256-xuCxeQD8NAn7zlqCG+GyFjL6NlnIkGie+4GxzLGsyUg=";
   };
 
+  # Use a raw string to prevent LaTeX codes from being interpreted as escape sequences.
+  # SyntaxError: invalid escape sequence '\h
+  # Fix submitted upstream: https://github.com/keras-team/keras/pull/21790
+  postPatch = ''
+    substituteInPlace keras/src/quantizers/gptq_test.py \
+      --replace-fail \
+        'CALIBRATION_TEXT = """' \
+        'CALIBRATION_TEXT = r"""'
+  '';
+
   build-system = [
     setuptools
   ];
@@ -87,6 +97,25 @@ buildPythonPackage rec {
     "test_fit_with_data_adapter_grain_dataloader"
     "test_fit_with_data_adapter_grain_datast"
     "test_fit_with_data_adapter_grain_datast_with_len"
+    "test_image_dataset_from_directory_binary_grain"
+    "test_image_dataset_from_directory_color_modes_grain"
+    "test_image_dataset_from_directory_crop_to_aspect_ratio_grain"
+    "test_image_dataset_from_directory_follow_links_grain"
+    "test_image_dataset_from_directory_manual_labels_grain"
+    "test_image_dataset_from_directory_multiclass_grain"
+    "test_image_dataset_from_directory_no_labels_grain"
+    "test_image_dataset_from_directory_not_batched_grain"
+    "test_image_dataset_from_directory_pad_to_aspect_ratio_grain"
+    "test_image_dataset_from_directory_shuffle_grain"
+    "test_image_dataset_from_directory_validation_split_grain"
+    "test_sample_count_grain"
+    "test_text_dataset_from_directory_binary_grain"
+    "test_text_dataset_from_directory_follow_links_grain"
+    "test_text_dataset_from_directory_manual_labels_grain"
+    "test_text_dataset_from_directory_multiclass_grain"
+    "test_text_dataset_from_directory_not_batched_grain"
+    "test_text_dataset_from_directory_standalone_grain"
+    "test_text_dataset_from_directory_validation_split_grain"
 
     # Tries to install the package in the sandbox
     "test_keras_imports"
@@ -179,6 +208,9 @@ buildPythonPackage rec {
 
   disabledTestPaths = [
     # Require unpackaged `grain`
+    "keras/src/layers/preprocessing/data_layer_test.py"
+    "keras/src/layers/preprocessing/image_preprocessing/resizing_test.py"
+    "keras/src/layers/preprocessing/rescaling_test.py"
     "keras/src/trainers/data_adapters/grain_dataset_adapter_test.py"
 
     # These tests succeed when run individually, but crash within the full test suite:

From cbb87e4f6e4794cc46adf5c090ba57c4ae0e894d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 23:33:24 +0000
Subject: [PATCH 3407/6226] alfis-nogui: 0.8.5 -> 0.8.7

---
 pkgs/by-name/al/alfis/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/al/alfis/package.nix b/pkgs/by-name/al/alfis/package.nix
index 714642fb83e7..0fedc77cc4f7 100644
--- a/pkgs/by-name/al/alfis/package.nix
+++ b/pkgs/by-name/al/alfis/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "alfis";
-  version = "0.8.5";
+  version = "0.8.7";
 
   src = fetchFromGitHub {
     owner = "Revertron";
     repo = "Alfis";
     tag = "v${version}";
-    hash = "sha256-ettStNktSDZnYNN/IWqTB1Ou1g1QEGFabS4EatnDLaE=";
+    hash = "sha256-u5luVJRNIuGqqNyh+C7nMSkZgoq/S7gpmsEiz8ntmC4=";
   };
 
-  cargoHash = "sha256-xe0YQCKnDV6M6IKWgljsuJ5ZevkdpxZDnNHAHKJyUec=";
+  cargoHash = "sha256-ittJ/iKcmvd5r8oaBoGhi/E2osq245OWxSC+VH+bme4=";
 
   nativeBuildInputs = [
     pkg-config

From 5aaf0c87f1e5579a6f12fb3d90821badc40a2bba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 23:56:20 +0000
Subject: [PATCH 3408/6226] ni: 27.0.0 -> 27.0.1

---
 pkgs/by-name/ni/ni/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix
index 5d350458f138..106d7f35d54c 100644
--- a/pkgs/by-name/ni/ni/package.nix
+++ b/pkgs/by-name/ni/ni/package.nix
@@ -13,19 +13,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ni";
-  version = "27.0.0";
+  version = "27.0.1";
 
   src = fetchFromGitHub {
     owner = "antfu-collective";
     repo = "ni";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Yh159OpM4LPWJMO2Jv8xkzqRFurgK8EAQDyUIhWfHZ4=";
+    hash = "sha256-rl0pzzhQCuX3Vvq7Iu88L4ph3nA8HRD8HU11YGXT1wQ=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-pg2zFm84sqTRM/KaNxnvtZMZHhgdrThPoMV58KKbvHA=";
+    hash = "sha256-M0SbUWoIHWftfpHPYmX/sUmvR8pGmONv4HUVos6x72I=";
   };
 
   nativeBuildInputs = [

From 38115fa2c52801b0b30d24482da3296335029e29 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 27 Oct 2025 19:12:40 -0300
Subject: [PATCH 3409/6226] stepmania: upgrade to gtk3

---
 pkgs/by-name/st/stepmania/ffmpeg-7.patch | 11 ++++++++
 pkgs/by-name/st/stepmania/package.nix    | 32 ++++++++++++++----------
 2 files changed, 30 insertions(+), 13 deletions(-)
 create mode 100644 pkgs/by-name/st/stepmania/ffmpeg-7.patch

diff --git a/pkgs/by-name/st/stepmania/ffmpeg-7.patch b/pkgs/by-name/st/stepmania/ffmpeg-7.patch
new file mode 100644
index 000000000000..80b4b8b6a2b7
--- /dev/null
+++ b/pkgs/by-name/st/stepmania/ffmpeg-7.patch
@@ -0,0 +1,11 @@
+--- a/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
++++ b/src/arch/MovieTexture/MovieTexture_FFMpeg.cpp
+@@ -273,7 +273,7 @@
+ 		bool bSkipThisFrame =
+ 			fTargetTime != -1 &&
+ 			GetTimestamp() + GetFrameDuration() < fTargetTime &&
+-			(m_pStreamCodec->frame_number % 2) == 0;
++			(m_pStreamCodec->frame_num % 2) == 0;
+ 
+ 		int iGotFrame;
+ 		int len;
diff --git a/pkgs/by-name/st/stepmania/package.nix b/pkgs/by-name/st/stepmania/package.nix
index 66cfca7cd573..a447ebb62b07 100644
--- a/pkgs/by-name/st/stepmania/package.nix
+++ b/pkgs/by-name/st/stepmania/package.nix
@@ -6,10 +6,10 @@
   cmake,
   nasm,
   alsa-lib,
-  ffmpeg_6,
+  ffmpeg_7,
   glew,
   glib,
-  gtk2,
+  gtk3,
   libmad,
   libogg,
   libpng,
@@ -32,12 +32,20 @@ stdenv.mkDerivation {
   };
 
   patches = [
-    # https://github.com/stepmania/stepmania/pull/2247
     (fetchpatch {
-      name = "fix-building-with-ffmpeg6.patch";
-      url = "https://github.com/stepmania/stepmania/commit/3fef5ef60b7674d6431f4e1e4ba8c69b0c21c023.patch";
+      # Fix building with newer FFmpeg
+      name = "fix-building-with-newer-ffmpeg.patch";
+      url = "https://github.com/stepmania/stepmania/commit/3fef5ef60b7674d6431f4e1e4ba8c69b0c21c023.patch?full_index=1";
       hash = "sha256-m+5sP+mIpcSjioRBdzChqja5zwNcwdSNAfvSJ2Lww+g=";
     })
+    (fetchpatch {
+      # Fix crash on loading animated previews while using newer FFmpeg
+      name = "fix-crash-newer-ffmpeg.patch";
+      url = "https://github.com/stepmania/stepmania/commit/e0d2a5182dcd855e181fffa086273460c553c7ff.patch?full_index=1";
+      hash = "sha256-XacaMn29FwG3WgFBfB890I8mzVrvuOL4wPWcHHNYfXM=";
+    })
+    # FFmpeg 7 frame_number compatibility fix
+    ./ffmpeg-7.patch
   ];
 
   postPatch = ''
@@ -54,10 +62,10 @@ stdenv.mkDerivation {
 
   buildInputs = [
     alsa-lib
-    ffmpeg_6
+    ffmpeg_7
     glew
     glib
-    gtk2
+    gtk3
     libmad
     libogg
     libpng
@@ -72,8 +80,6 @@ stdenv.mkDerivation {
     "-DWITH_SYSTEM_FFMPEG=1"
     "-DWITH_SYSTEM_PNG=on"
     "-DWITH_SYSTEM_ZLIB=on"
-    "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2.out}/lib/gtk-2.0/include"
-    "-DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib.out}/lib/glib-2.0/include"
   ];
 
   postInstall = ''
@@ -86,12 +92,12 @@ stdenv.mkDerivation {
     install -Dm444 $src/stepmania.desktop -t $out/share/applications
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://www.stepmania.com/";
     description = "Free dance and rhythm game for Windows, Mac, and Linux";
-    platforms = platforms.linux;
-    license = licenses.mit; # expat version
-    maintainers = with maintainers; [ h7x4 ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.mit; # expat version
+    maintainers = with lib.maintainers; [ h7x4 ];
     mainProgram = "stepmania";
   };
 }

From 6f78d61aec358ff530c0c86507fd540069d46410 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 27 Oct 2025 23:59:35 +0000
Subject: [PATCH 3410/6226] mtail: 3.2.21 -> 3.2.22

---
 pkgs/by-name/mt/mtail/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mt/mtail/package.nix b/pkgs/by-name/mt/mtail/package.nix
index 985979582720..0da601f9c892 100644
--- a/pkgs/by-name/mt/mtail/package.nix
+++ b/pkgs/by-name/mt/mtail/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "mtail";
-  version = "3.2.21";
+  version = "3.2.22";
 
   src = fetchFromGitHub {
     owner = "jaqx0r";
     repo = "mtail";
     rev = "v${version}";
-    hash = "sha256-i5c9e7b7PmvFdNddngsCIx4GKYqPPwTZSUoNAIL8RZ4=";
+    hash = "sha256-Cy5eXv1ccLdCZJUR0Qk0O+YMW5K+yYOeJ0B0dgvTCWo=";
   };
 
-  vendorHash = "sha256-hVguLf/EkTz7Z8lTT9tCQ8iGO5asSkrsW+u8D1ND+dw=";
+  vendorHash = "sha256-CABKXYhW6wxac/VNqmm+3tHR0MtjpN7ZGNTiZhlgrHM=";
 
   nativeBuildInputs = [
     gotools # goyacc

From b41e96598e59282fed0ec93e4fcd9a9b2aafe767 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 00:06:33 +0000
Subject: [PATCH 3411/6226] python3Packages.pyportainer: 1.0.4 -> 1.0.10

---
 pkgs/development/python-modules/pyportainer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyportainer/default.nix b/pkgs/development/python-modules/pyportainer/default.nix
index 13c7411a45d1..1b44bf2482eb 100644
--- a/pkgs/development/python-modules/pyportainer/default.nix
+++ b/pkgs/development/python-modules/pyportainer/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pyportainer";
-  version = "1.0.4";
+  version = "1.0.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "erwindouna";
     repo = "pyportainer";
     tag = "v${version}";
-    hash = "sha256-jEUVAbNwBil5k6eNtuzspMvXDhFXktopwl/YCvnK2ko=";
+    hash = "sha256-8wMh41fmeRhZ5kTrBqeZWy8VxJhnKxAlAp3wk732+M4=";
   };
 
   build-system = [ poetry-core ];

From 21c901ab05a8c0df8a0f755dd1713339c11503fa Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Sun, 5 Oct 2025 14:46:04 +0900
Subject: [PATCH 3412/6226] ccache: 4.11.3 -> 4.12.1

https://ccache.dev/releasenotes.html#_ccache_4_12_1
Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/cc/ccache/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cc/ccache/package.nix b/pkgs/by-name/cc/ccache/package.nix
index d38e8e92463b..854022c69459 100644
--- a/pkgs/by-name/cc/ccache/package.nix
+++ b/pkgs/by-name/cc/ccache/package.nix
@@ -22,7 +22,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ccache";
-  version = "4.11.3";
+  version = "4.12.1";
 
   src = fetchFromGitHub {
     owner = "ccache";
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
         exit 1
       fi
     '';
-    hash = "sha256-w41e73Zh5HhYhgLPtaaSiJ48BklBNtnK9S859tol5wc=";
+    hash = "sha256-EfX5cLb23VpRbImXTfOTS+dHq6UTd6ecuPWdmz4nLDs=";
   };
 
   outputs = [
@@ -61,6 +61,10 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
+  postPatch = ''
+    patchShebangs --build test/fake-compilers
+  '';
+
   strictDeps = true;
 
   nativeBuildInputs = [

From 64f4ae35982bb74cbe0ac7b006daae39fc7dde22 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:11:10 +0100
Subject: [PATCH 3413/6226] checkov: 3.2.487 -> 3.2.488

Diff: https://github.com/bridgecrewio/checkov/compare/3.2.487...3.2.488

Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.488
---
 pkgs/by-name/ch/checkov/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix
index bde4d86e74f0..65d1bf40b199 100644
--- a/pkgs/by-name/ch/checkov/package.nix
+++ b/pkgs/by-name/ch/checkov/package.nix
@@ -37,14 +37,14 @@ with py.pkgs;
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.487";
+  version = "3.2.488";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     tag = version;
-    hash = "sha256-g+1/3NbLVCOTWMuo8Jn7JlSgOFvum1tvnjBm3paj7is=";
+    hash = "sha256-j1NcGruoYrZfaeKZZ6iNPg8k2v5L7srrSgaHXmX8eec=";
   };
 
   pythonRelaxDeps = [

From c949fa8b95164cc8ed3209bf3aadd00d3653badd Mon Sep 17 00:00:00 2001
From: Alexis Williams <alexis@typedr.at>
Date: Sun, 26 Oct 2025 19:52:57 -0700
Subject: [PATCH 3414/6226] home-assistant-custom-components.elegoo_printer:
 init at 2.3.5

---
 .../elegoo_printer/package.nix                | 52 +++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix

diff --git a/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix b/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix
new file mode 100644
index 000000000000..61489addccf4
--- /dev/null
+++ b/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildHomeAssistantComponent,
+
+  # dependencies
+  colorlog,
+  loguru,
+  websocket-client,
+  websockets,
+
+  # tests
+  pytestCheckHook,
+  aiohttp,
+  home-assistant,
+}:
+
+buildHomeAssistantComponent rec {
+  owner = "danielcherubini";
+  domain = "elegoo_printer";
+  version = "2.3.5";
+
+  src = fetchFromGitHub {
+    owner = "danielcherubini";
+    repo = "elegoo-homeassistant";
+    tag = "v${version}";
+    hash = "sha256-Ekt19lfn0DdedMFhJDDUkqsv7vjS96+lAhWveag6EeE=";
+  };
+
+  dependencies = [
+    colorlog
+    loguru
+    websocket-client
+    websockets
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    aiohttp
+    home-assistant
+  ];
+
+  meta = with lib; {
+    changelog = "https://github.com/danielcherubini/elegoo-homeassistant/releases/tag/v${version}";
+    description = "Home Assistant integration for Elegoo 3D printers using the SDCP protocol";
+    homepage = "https://github.com/danielcherubini/elegoo-homeassistant";
+    license = licenses.mit;
+    maintainers = with maintainers; [
+      typedrat
+    ];
+  };
+}

From 31b883fbe922fb2c495d90b083e6f1e17193cb6a Mon Sep 17 00:00:00 2001
From: n0099 <n@n0099.net>
Date: Tue, 28 Oct 2025 00:16:06 +0000
Subject: [PATCH 3415/6226] nixos/tor: replace `ints.between 0 65535` with
 `lib.types.port`

---
 nixos/modules/services/security/tor.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index 92410e28a1ed..4b9b82a57e8a 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -795,7 +795,7 @@ in
                     };
                     options.HiddenServiceMaxStreams = lib.mkOption {
                       description = (descriptionGeneric "HiddenServiceMaxStreams");
-                      type = with lib.types; nullOr (ints.between 0 65535);
+                      type = with lib.types; nullOr port;
                       default = null;
                     };
                     options.HiddenServiceMaxStreamsCloseCircuit = optionBool "HiddenServiceMaxStreamsCloseCircuit";

From ac51d05cc78bd92c32622490576f494e216e3962 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 00:25:42 +0000
Subject: [PATCH 3416/6226] python3Packages.ansible-builder: 3.1.0 -> 3.1.1

---
 pkgs/development/python-modules/ansible-builder/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ansible-builder/default.nix b/pkgs/development/python-modules/ansible-builder/default.nix
index ff20c5aef2c7..670c182f8efa 100644
--- a/pkgs/development/python-modules/ansible-builder/default.nix
+++ b/pkgs/development/python-modules/ansible-builder/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "ansible-builder";
-  version = "3.1.0";
+  version = "3.1.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "ansible_builder";
     inherit version;
-    hash = "sha256-0txXPianvVCV6YrrN+6bALyfUAWr6nFH10IpwPNCb8s=";
+    hash = "sha256-nYi8FazH0xBW0MUZFKYQLayOWtc/ny01upg3jIlxTtI=";
   };
 
   patchPhase = ''

From 2f3133f311c7324641caac6d1731f900b5618c91 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 00:29:18 +0000
Subject: [PATCH 3417/6226] multipath-tools: 0.12.0 -> 0.13.0

---
 pkgs/by-name/mu/multipath-tools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mu/multipath-tools/package.nix b/pkgs/by-name/mu/multipath-tools/package.nix
index 39d5fc289a3d..ae52507b8464 100644
--- a/pkgs/by-name/mu/multipath-tools/package.nix
+++ b/pkgs/by-name/mu/multipath-tools/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "multipath-tools";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "opensvc";
     repo = "multipath-tools";
     tag = finalAttrs.version;
-    hash = "sha256-Jeiy1bM7vuy2+r/0W1nAhgsncyV6QHdlV55aepAxHAg=";
+    hash = "sha256-FlmcZNi19ajAVTwHSNgS5jEsHUk8vHyzuFfxgN+WSxQ=";
   };
 
   nativeBuildInputs = [

From dabc1fab6e55e67f3afd564eadff5a9b11aa83a3 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Wed, 22 Oct 2025 17:45:03 +0200
Subject: [PATCH 3418/6226] ci/request-reviews/request-reviewers.sh:
 First-class team support

Co-Authored-By: Alexander Bantyev <alexander.bantyev@tweag.io>
---
 ci/request-reviews/request-reviewers.sh | 144 +++++++++++++++++++-----
 1 file changed, 113 insertions(+), 31 deletions(-)

diff --git a/ci/request-reviews/request-reviewers.sh b/ci/request-reviews/request-reviewers.sh
index 1c105e385d28..23ad13819f11 100755
--- a/ci/request-reviews/request-reviewers.sh
+++ b/ci/request-reviews/request-reviewers.sh
@@ -1,8 +1,16 @@
 #!/usr/bin/env bash
 
-# Request reviewers for a PR, reading line-separated usernames on stdin,
+# Request reviewers for a PR, reading line-separated usernames/teams on stdin,
 # filtering for valid reviewers before using the API endpoint to request reviews:
 # https://docs.github.com/en/rest/pulls/review-requests?apiVersion=2022-11-28#request-reviewers-for-a-pull-request
+#
+# Example:
+#   $ request-reviewers.sh NixOS/nixpkgs 123456 someUser <<-EOF
+#   someUser
+#   anotherUser
+#   NixOS/someTeam
+#   NixOS/anotherTeam
+#   EOF
 
 set -euo pipefail
 
@@ -30,59 +38,133 @@ baseRepo=$1
 prNumber=$2
 prAuthor=$3
 
+org="${baseRepo%/*}"
+repo="${baseRepo#*/}"
+
 tmp=$(mktemp -d)
 trap 'rm -rf "$tmp"' exit
 
-declare -A users=()
+declare -A users=() teams=()
+
 while read -r handle && [[ -n "$handle" ]]; do
-    users[${handle,,}]=
+    if [[ "$handle" =~ (.*)/(.*) ]]; then
+        if [[ "${BASH_REMATCH[1]}" != "$org" ]]; then
+            log "Team $handle is not part of the $org org, ignoring"
+        else
+            teams[${BASH_REMATCH[2],,}]=
+        fi
+    else
+        users[${handle,,}]=
+    fi
 done
 
+log "Checking users: ${!users[*]}"
+log "Checking teams: ${!teams[*]}"
+
 # Cannot request a review from the author
 if [[ -v users[${prAuthor,,}] ]]; then
-    log "One or more files are owned by the PR author, ignoring"
+    log "Avoiding review request for PR author $prAuthor"
     unset 'users[${prAuthor,,}]'
 fi
 
-gh api \
+# And we don't want to rerequest reviews from people or teams who already reviewed
+log -e "Checking if users/teams have already reviewed the PR"
+
+# shellcheck disable=SC2016
+# A graphql query to get all reviewers of a PR, including both users and teams
+# on behalf of which a review was done.
+# The REST API doesn't have an end-point for figuring out the on-behalfness of reviews
+all_reviewers_query='
+query($owner: String!, $repo: String!, $pr: Int!, $endCursor: String) {
+  repository(owner: $owner, name: $repo) {
+    pullRequest(number: $pr) {
+      reviews(first: 100, after: $endCursor) {
+        nodes {
+          author {
+            login
+          }
+          onBehalfOf(first: 100) {
+            nodes {
+              slug
+            }
+          }
+        }
+        pageInfo {
+          hasNextPage
+          endCursor
+        }
+      }
+    }
+  }
+}
+'
+
+gh api graphql \
     -H "Accept: application/vnd.github+json" \
-    -H "X-GitHub-Api-Version: 2022-11-28" \
-    "/repos/$baseRepo/pulls/$prNumber/reviews" \
-    --jq '.[].user.login' > "$tmp/already-reviewed-by"
+    --paginate \
+    -f query="$all_reviewers_query" \
+    -F owner="$org" \
+    -F repo="$repo" \
+    -F pr="$prNumber" \
+    > "$tmp/already-reviewed-by-response"
 
-# And we don't want to rerequest reviews from people who already reviewed
-while read -r user; do
+readarray -t userReviewers < <(jq -r '.data.repository.pullRequest.reviews.nodes[].author.login' "$tmp/already-reviewed-by-response")
+log "PR is already reviewed by these users: ${userReviewers[*]}"
+for user in "${userReviewers[@]}"; do
     if [[ -v users[${user,,}] ]]; then
-        log "User $user is a potential reviewer, but has already left a review, ignoring"
+        log "Avoiding review request for user $user, who has already left a review"
         unset 'users[${user,,}]'
     fi
-done < "$tmp/already-reviewed-by"
-
-for user in "${!users[@]}"; do
-    if ! gh api \
-        -H "Accept: application/vnd.github+json" \
-        -H "X-GitHub-Api-Version: 2022-11-28" \
-        "/repos/$baseRepo/collaborators/$user" >&2; then
-        log "User $user is not a repository collaborator, probably missed the automated invite to the maintainers team (see <https://github.com/NixOS/nixpkgs/issues/234293>), ignoring"
-        unset 'users[$user]'
-    fi
 done
 
-if [[ "${#users[@]}" -gt 10 ]]; then
-    log "Too many reviewers (${!users[*]}), skipping review requests"
+readarray -t teamReviewers < <(jq -r '.data.repository.pullRequest.reviews.nodes[].onBehalfOf.nodes[].slug' "$tmp/already-reviewed-by-response")
+log "PR is already reviewed by these teams: ${teamReviewers[*]}"
+for team in "${teamReviewers[@]}"; do
+    if [[ -v teams[${team,,}] ]]; then
+        log "Avoiding review request for team $team, who has already left a review"
+        unset 'teams[${team,,}]'
+    fi
+done
+
+log -e "Checking that all users/teams can be requested for review"
+
+for user in "${!users[@]}"; do
+    if ! gh api "/repos/$baseRepo/collaborators/$user" >&2; then
+        log "User $user cannot be requested for review because they don't exist or are not a repository collaborator, ignoring. Probably missed the automated invite to the maintainers team (see <https://github.com/NixOS/nixpkgs/issues/234293>)"
+        unset 'users[$user]'
+    fi
+done
+for team in "${!teams[@]}"; do
+    if ! gh api "/orgs/$org/teams/$team/repos/$baseRepo" >&2; then
+        log "Team $team cannot be requested for review because it doesn't exist or has no repository permissions, ignoring. Probably wasn't added to the nixpkgs-maintainers team (see https://github.com/NixOS/nixpkgs/tree/master/maintainers#maintainer-teams)"
+        unset 'teams[$team]'
+    fi
+done
+
+log "Would request reviews from users: ${!users[*]}"
+log "Would request reviews from teams: ${!teams[*]}"
+
+if (( ${#users[@]} + ${#teams[@]} > 10 )); then
+    log "Too many reviewers (users: ${!users[*]}, teams: ${!teams[*]}), skipping review requests"
     exit 0
 fi
 
 for user in "${!users[@]}"; do
-    log "Requesting review from: $user"
-
-    if ! response=$(jq -n --arg user "$user" '{ reviewers: [ $user ] }' | \
-        effect gh api \
+    log "Requesting review from user $user"
+    if ! response=$(effect gh api \
             --method POST \
-            -H "Accept: application/vnd.github+json" \
-            -H "X-GitHub-Api-Version: 2022-11-28" \
             "/repos/$baseRepo/pulls/$prNumber/requested_reviewers" \
-            --input -); then
-        log "Failed to request review from $user: $response"
+            -f "reviewers[]=$user"); then
+        log "Failed to request review from user $user: $response"
+    fi
+done
+
+for team in "${!teams[@]}"; do
+    log "Requesting review from team $team"
+    if ! response=$(effect gh api \
+            --method POST \
+            "/repos/$baseRepo/pulls/$prNumber/requested_reviewers" \
+            -f "team_reviewers[]=$team"); then
+        log "Failed to request review from team $team: $response"
     fi
 done

From e6c822f51f5f24479de38d1c0cd6a00516b401e9 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Wed, 22 Oct 2025 17:50:49 +0200
Subject: [PATCH 3419/6226] workflows/reviewers: First-class team package
 maintainer review requests

---
 .github/workflows/reviewers.yml               | 11 ++--
 ci/eval/compare/default.nix                   |  9 +++-
 ci/eval/compare/maintainers.nix               | 52 ++++++++++++++-----
 ci/request-reviews/default.nix                |  2 +
 .../request-maintainers-reviews.sh            | 39 ++++++++++++++
 pkgs/stdenv/generic/check-meta.nix            |  5 ++
 6 files changed, 94 insertions(+), 24 deletions(-)
 create mode 100755 ci/request-reviews/request-maintainers-reviews.sh

diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 6d23e1dde9b7..57f91c0f2f10 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -146,19 +146,14 @@ jobs:
       - name: Requesting maintainer reviews
         if: ${{ steps.app-token.outputs.token }}
         env:
-          GH_TOKEN: ${{ github.token }}
-          APP_GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
           REPOSITORY: ${{ github.repository }}
+          ORG_ID: ${{ github.repository_owner_id }}
           NUMBER: ${{ github.event.number }}
           AUTHOR: ${{ github.event.pull_request.user.login }}
           # Don't request reviewers on draft PRs
           DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}
-        run: |
-          # maintainers.json contains GitHub IDs. Look up handles to request reviews from.
-          # There appears to be no API to request reviews based on GitHub IDs
-          jq -r 'keys[]' comparison/maintainers.json \
-            | while read -r id; do gh api /user/"$id" --jq .login; done \
-            | GH_TOKEN="$APP_GH_TOKEN" result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR"
+        run: result/bin/request-maintainers-reviews.sh "$ORG_ID" "$REPOSITORY" "$NUMBER" "$AUTHOR" comparison
 
       - name: Log current API rate limits (app-token)
         if: ${{ steps.app-token.outputs.token }}
diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index d0820618a0a0..19e8ce72c5d8 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -179,8 +179,12 @@ runCommand "compare"
       jq
       cmp-stats
     ];
-    maintainers = builtins.toJSON maintainers;
-    passAsFile = [ "maintainers" ];
+    maintainers = builtins.toJSON maintainers.users;
+    teams = builtins.toJSON maintainers.teams;
+    passAsFile = [
+      "maintainers"
+      "teams"
+    ];
   }
   ''
     mkdir $out
@@ -223,4 +227,5 @@ runCommand "compare"
     fi
 
     cp "$maintainersPath" "$out/maintainers.json"
+    cp "$teamsPath" "$out/teams.json"
   ''
diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
index 9f19a4c382eb..bacf112ffe90 100644
--- a/ci/eval/compare/maintainers.nix
+++ b/ci/eval/compare/maintainers.nix
@@ -51,15 +51,16 @@ let
         # updates to .json files.
         # TODO: Support by-name package sets.
         filenames = lib.optional (lib.length path == 1) "pkgs/by-name/${sharded (lib.head path)}/";
-        # TODO: Refactor this so we can ping entire teams instead of the individual members.
-        # Note that this will require keeping track of GH team IDs in "maintainers/teams.nix".
-        maintainers = package.meta.maintainers or [ ];
+        # meta.maintainers also contains all individual team members.
+        # We only want to ping individuals if they're added individually as maintainers, not via teams.
+        maintainers = package.meta.nonTeamMaintainers or [ ];
+        teams = package.meta.teams or [ ];
       }
     ))
     # No need to match up packages without maintainers with their files.
     # This also filters out attributes where `packge = null`, which is the
     # case for libintl, for example.
-    (lib.filter (pkg: pkg.maintainers != [ ]))
+    (lib.filter (pkg: pkg.maintainers != [ ] || pkg.teams != [ ]))
   ];
 
   relevantFilenames =
@@ -94,20 +95,43 @@ let
 
   attrsWithModifiedFiles = lib.filter (pkg: anyMatchingFiles pkg.filenames) attrsWithFilenames;
 
-  listToPing = lib.concatMap (
+  userPings =
     pkg:
     map (maintainer: {
-      id = maintainer.githubId;
-      inherit (maintainer) github;
+      type = "user";
+      user = toString maintainer.githubId;
       packageName = pkg.name;
-      dueToFiles = pkg.filenames;
-    }) pkg.maintainers
+    });
+
+  teamPings =
+    pkg: team:
+    if team ? github then
+      [
+        {
+          type = "team";
+          team = toString team.githubId;
+          packageName = pkg.name;
+        }
+      ]
+    else
+      userPings pkg team.members;
+
+  maintainersToPing = lib.concatMap (
+    pkg: userPings pkg pkg.maintainers ++ lib.concatMap (teamPings pkg) pkg.teams
   ) attrsWithModifiedFiles;
 
-  byMaintainer = lib.groupBy (ping: toString ping.id) listToPing;
+  byType = lib.groupBy (ping: ping.type) maintainersToPing;
 
-  packagesPerMaintainer = lib.mapAttrs (
-    maintainer: packages: map (pkg: pkg.packageName) packages
-  ) byMaintainer;
+  byUser = lib.pipe (byType.user or [ ]) [
+    (lib.groupBy (ping: ping.user))
+    (lib.mapAttrs (_user: lib.map (pkg: pkg.packageName)))
+  ];
+  byTeam = lib.pipe (byType.team or [ ]) [
+    (lib.groupBy (ping: ping.team))
+    (lib.mapAttrs (_team: lib.map (pkg: pkg.packageName)))
+  ];
 in
-packagesPerMaintainer
+{
+  users = byUser;
+  teams = byTeam;
+}
diff --git a/ci/request-reviews/default.nix b/ci/request-reviews/default.nix
index 075ff52fd564..2ebc34738a5d 100644
--- a/ci/request-reviews/default.nix
+++ b/ci/request-reviews/default.nix
@@ -17,6 +17,7 @@ stdenvNoCC.mkDerivation {
       ./get-code-owners.sh
       ./request-reviewers.sh
       ./request-code-owner-reviews.sh
+      ./request-maintainers-reviews.sh
     ];
   };
   nativeBuildInputs = [ makeWrapper ];
@@ -26,6 +27,7 @@ stdenvNoCC.mkDerivation {
     for bin in *.sh; do
       mv "$bin" "$out/bin"
       wrapProgram "$out/bin/$bin" \
+        --set PAGER cat \
         --set PATH ${
           lib.makeBinPath [
             coreutils
diff --git a/ci/request-reviews/request-maintainers-reviews.sh b/ci/request-reviews/request-maintainers-reviews.sh
new file mode 100755
index 000000000000..b49f4e29fcc6
--- /dev/null
+++ b/ci/request-reviews/request-maintainers-reviews.sh
@@ -0,0 +1,39 @@
+#!/usr/bin/env bash
+
+# Requests maintainer reviews for a PR
+
+set -euo pipefail
+SCRIPT_DIR=$(dirname "$0")
+
+if (( $# < 5 )); then
+    echo >&2 "Usage: $0 ORG_ID GITHUB_REPO PR_NUMBER AUTHOR COMPARISON_PATH"
+    exit 1
+fi
+orgId=$1
+baseRepo=$2
+prNumber=$3
+prAuthor=$4
+comparisonPath=$5
+
+org="${baseRepo%/*}"
+
+# maintainers.json/teams.json contains GitHub IDs. Look up handles to request reviews from.
+# There appears to be no API to request reviews based on IDs
+{
+  jq -r 'keys[]' "$comparisonPath"/maintainers.json \
+    | while read -r id; do
+      if login=$(gh api /user/"$id" --jq .login); then
+        echo "$login"
+      else
+        echo >&2 "Skipping user with id $id: $login"
+      fi
+    done
+  jq -r 'keys[]' "$comparisonPath"/teams.json \
+    | while read -r id; do
+      if slug=$(gh api /organizations/"$orgId"/team/"$id" --jq .slug); then
+        echo "$org/$slug"
+      else
+        echo >&2 "Skipping team with id $id: $slug"
+      fi
+    done
+} | "$SCRIPT_DIR"/request-reviewers.sh "$baseRepo" "$prNumber" "$prAuthor"
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index c59e92e114ea..47174c6f21ec 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -397,6 +397,7 @@ let
         ];
       sourceProvenance = listOf attrs;
       maintainers = listOf (attrsOf any); # TODO use the maintainer type from lib/tests/maintainer-module.nix
+      nonTeamMaintainers = listOf (attrsOf any); # TODO use the maintainer type from lib/tests/maintainer-module.nix
       teams = listOf (attrsOf any); # TODO similar to maintainers, use a teams type
       priority = int;
       pkgConfigModules = listOf str;
@@ -670,6 +671,10 @@ let
       maintainers =
         attrs.meta.maintainers or [ ] ++ concatMap (team: team.members or [ ]) attrs.meta.teams or [ ];
 
+      # Needed for CI to be able to avoid requesting reviews from individual
+      # team members
+      nonTeamMaintainers = attrs.meta.maintainers or [ ];
+
       identifiers =
         let
           # nix-env writes a warning for each derivation that has null in its meta values, so

From 60773fe3c402137cda6c4bf5f93d670f6bc5ad84 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Wed, 22 Oct 2025 17:52:16 +0200
Subject: [PATCH 3420/6226] ci/request-reviews/get-code-owners.sh: First-class
 code owner team review requests

---
 ci/request-reviews/get-code-owners.sh | 40 ++++-----------------------
 1 file changed, 5 insertions(+), 35 deletions(-)

diff --git a/ci/request-reviews/get-code-owners.sh b/ci/request-reviews/get-code-owners.sh
index 13a377429b92..e49bb5409828 100755
--- a/ci/request-reviews/get-code-owners.sh
+++ b/ci/request-reviews/get-code-owners.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Get the code owners of the files changed by a PR, returning one username per line
+# Get the code owners of the files changed by a PR, returning one GitHub user/team handle per line
 
 set -euo pipefail
 
@@ -29,9 +29,9 @@ log "This PR touches ${#touchedFiles[@]} files"
 # remove code owners to avoid pinging them
 git -C "$gitRepo" show "$baseRef":"$ownersFile" > "$tmp"/codeowners
 
-# Associative array with the user as the key for easy de-duplication
+# Associative array with the user/team as the key for easy de-duplication
 # Make sure to always lowercase keys to avoid duplicates with different casings
-declare -A users=()
+declare -A finalOwners=()
 
 for file in "${touchedFiles[@]}"; do
     result=$(codeowners --file "$tmp"/codeowners "$file")
@@ -59,39 +59,9 @@ for file in "${touchedFiles[@]}"; do
         # The first regex match is everything after the @
         entry=${BASH_REMATCH[1]}
 
-        if [[ "$entry" =~ (.*)/(.*) ]]; then
-            # Teams look like $org/$team
-            org=${BASH_REMATCH[1]}
-            team=${BASH_REMATCH[2]}
-
-            # Instead of requesting a review from the team itself,
-            # we request reviews from the individual users.
-            # This is because once somebody from a team reviewed the PR,
-            # the API doesn't expose that the team was already requested for a review,
-            # so we wouldn't be able to avoid rerequesting reviews
-            # without saving some some extra state somewhere
-
-            # We could also consider implementing a more advanced heuristic
-            # in the future that e.g. only pings one team member,
-            # but escalates to somebody else if that member doesn't respond in time.
-            gh api \
-                --cache=1h \
-                -H "Accept: application/vnd.github+json" \
-                -H "X-GitHub-Api-Version: 2022-11-28" \
-                "/orgs/$org/teams/$team/members" \
-                --jq '.[].login' > "$tmp/team-members"
-            readarray -t members < "$tmp/team-members"
-            log "Team $entry has these members: ${members[*]}"
-
-            for user in "${members[@]}"; do
-                users[${user,,}]=
-            done
-        else
-            # Everything else is a user
-            users[${entry,,}]=
-        fi
+        finalOwners[${entry,,}]=
     done
 
 done
 
-printf "%s\n" "${!users[@]}"
+printf "%s\n" "${!finalOwners[@]}"

From fe6459cb3f5a601d03589491ef65b846262c10f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 00:47:58 +0000
Subject: [PATCH 3421/6226] kdePackages.kirigami-addons: 1.9.0 -> 1.10.0

---
 pkgs/kde/misc/kirigami-addons/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/kde/misc/kirigami-addons/default.nix b/pkgs/kde/misc/kirigami-addons/default.nix
index 88babf67ee16..8e4cf7571853 100644
--- a/pkgs/kde/misc/kirigami-addons/default.nix
+++ b/pkgs/kde/misc/kirigami-addons/default.nix
@@ -8,11 +8,11 @@
 }:
 mkKdeDerivation rec {
   pname = "kirigami-addons";
-  version = "1.9.0";
+  version = "1.10.0";
 
   src = fetchurl {
     url = "mirror://kde/stable/kirigami-addons/kirigami-addons-${version}.tar.xz";
-    hash = "sha256-ITFKkfJrHJYt7z/X/y52LTNYsHX2P01+AUT7LGO368c=";
+    hash = "sha256-yY+Sv3xFLhL23EA0BCFUE9s5Wf6QStgw6tDba7CbPRE=";
   };
 
   extraNativeBuildInputs = [ qttools ];

From 4970cb007e98671fbcb420aee4a559c9a68273ab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 00:54:05 +0000
Subject: [PATCH 3422/6226] xemu: 0.8.108 -> 0.8.109

---
 pkgs/by-name/xe/xemu/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix
index f2b10ad27c91..58f9a22aa712 100644
--- a/pkgs/by-name/xe/xemu/package.nix
+++ b/pkgs/by-name/xe/xemu/package.nix
@@ -35,13 +35,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xemu";
-  version = "0.8.108";
+  version = "0.8.109";
 
   src = fetchFromGitHub {
     owner = "xemu-project";
     repo = "xemu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+bQNy3UvRT9GKwsRNFezbyeXKzCnHw9S8GdT+UQc+Kw=";
+    hash = "sha256-1SJGcwnDvqEnm2Z9O4TNo+417CJrwHRgzuRzewzIbXY=";
 
     nativeBuildInputs = [
       git

From 8107431e9b0c7ffeee2f96cc4316318a1a434629 Mon Sep 17 00:00:00 2001
From: Pui Yong Qing <puiyongqing@gmail.com>
Date: Tue, 28 Oct 2025 08:36:48 +0800
Subject: [PATCH 3423/6226] vesktop: 1.5.8 -> 1.6.0

---
 .../by-name/ve/vesktop/disable_update_checking.patch | 12 ------------
 pkgs/by-name/ve/vesktop/package.nix                  |  7 +++----
 2 files changed, 3 insertions(+), 16 deletions(-)
 delete mode 100644 pkgs/by-name/ve/vesktop/disable_update_checking.patch

diff --git a/pkgs/by-name/ve/vesktop/disable_update_checking.patch b/pkgs/by-name/ve/vesktop/disable_update_checking.patch
deleted file mode 100644
index 2fcc1fc24be7..000000000000
--- a/pkgs/by-name/ve/vesktop/disable_update_checking.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/src/main/index.ts b/src/main/index.ts
-index 37fd471..d0a9e56 100644
---- a/src/main/index.ts
-+++ b/src/main/index.ts
-@@ -18,7 +18,6 @@ import { Settings, State } from "./settings";
- import { isDeckGameMode } from "./utils/steamOS";
-
- if (!IS_DEV) {
--    autoUpdater.checkForUpdatesAndNotify();
- }
-
- console.log("Vesktop v" + app.getVersion());
diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix
index 2555add4a42f..d230d55e1cb2 100644
--- a/pkgs/by-name/ve/vesktop/package.nix
+++ b/pkgs/by-name/ve/vesktop/package.nix
@@ -24,13 +24,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vesktop";
-  version = "1.5.8";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "Vencord";
     repo = "Vesktop";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-9wYIg1TGcntUMMp6SqYrgDRl3P41eeOqt76OMjSAi5M=";
+    hash = "sha256-kzJsSjaTH6HtBfhEtX4NLJS96zgYr0/Us6H0tDJvb9A=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
       patches
       ;
     fetcherVersion = 2;
-    hash = "sha256-rJzXbIQUxCImTqeH8EsGiyGNGoHYUqoekoa+VXpob5Y=";
+    hash = "sha256-Vn+Imarp1OTPfe/PoMgFHU5eWnye5Oa+qoGZaTxOUmU=";
   };
 
   nativeBuildInputs = [
@@ -69,7 +69,6 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   patches = [
-    ./disable_update_checking.patch
     ./fix_read_only_settings.patch
   ]
   ++ lib.optional withSystemVencord (

From 8f87d1d5160c7a28197f78064cc9a5b3a05e908c Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Tue, 28 Oct 2025 02:21:09 +0100
Subject: [PATCH 3424/6226] lib.teams: Sync matching teams from GitHub

These are all the teams who also have a GitHub team with the same
members that hasn't been linked yet
---
 maintainers/team-list.nix | 50 +++++----------------------------------
 1 file changed, 6 insertions(+), 44 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 9774b61d7e25..4d3f5e6cb9a2 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -48,14 +48,7 @@ with lib.maintainers;
   };
 
   agda = {
-    members = [
-      alexarice
-      ncfavier
-      phijor
-      turion
-    ];
-    scope = "Maintain Agda-related packages and modules.";
-    shortName = "Agda";
+    github = "agda";
   };
 
   android = {
@@ -373,9 +366,7 @@ with lib.maintainers;
   };
 
   freedesktop = {
-    members = [ jtojnar ];
-    scope = "Maintain Freedesktop.org packages for graphical desktop.";
-    shortName = "freedesktop.org packaging";
+    github = "freedesktop";
   };
 
   fslabs = {
@@ -551,14 +542,7 @@ with lib.maintainers;
   };
 
   kubernetes = {
-    members = [
-      johanot
-      offline
-      saschagrunert
-      srhb
-    ];
-    scope = "Maintain the Kubernetes package and module";
-    shortName = "Kubernetes";
+    github = "kubernetes";
   };
 
   libretro = {
@@ -573,15 +557,7 @@ with lib.maintainers;
   };
 
   linux-kernel = {
-    members = [
-      TredwellGit
-      k900
-      ma27
-      nequissimus
-      qyliss
-    ];
-    scope = "Maintain the Linux kernel.";
-    shortName = "Linux Kernel";
+    github = "linux-kernel";
   };
 
   lisp = {
@@ -590,15 +566,7 @@ with lib.maintainers;
   };
 
   lix = {
-    members = [
-      raitobezarius
-      qyriad
-      _9999years
-      lf-
-      alois31
-    ];
-    scope = "Maintain the Lix package manager inside of Nixpkgs.";
-    shortName = "Lix ecosystem";
+    github = "lix-maintainers";
     enableFeatureFreezePing = true;
   };
 
@@ -835,13 +803,7 @@ with lib.maintainers;
   };
 
   postgres = {
-    members = [
-      thoughtpolice
-      ma27
-      wolfgangwalther
-    ];
-    scope = "Maintain the PostgreSQL package and plugins along with the NixOS module.";
-    shortName = "PostgreSQL";
+    github = "postgres";
     enableFeatureFreezePing = true;
   };
 

From aa01ba79840c814fe3dd70a05939230cb74c4687 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 01:27:34 +0000
Subject: [PATCH 3425/6226] python3Packages.plyfile: 1.1.2 -> 1.1.3

---
 pkgs/development/python-modules/plyfile/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/plyfile/default.nix b/pkgs/development/python-modules/plyfile/default.nix
index 5c1241343d5e..6711140e148a 100644
--- a/pkgs/development/python-modules/plyfile/default.nix
+++ b/pkgs/development/python-modules/plyfile/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "plyfile";
-  version = "1.1.2";
+  version = "1.1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dranjan";
     repo = "python-plyfile";
     tag = "v${version}";
-    hash = "sha256-J72aoXEMcuHtYaLtzWJ5UGN9HdJTnQ1/8KgdMLtwyr0=";
+    hash = "sha256-bSevEk8ZtJybv6FYsUYKdDJJWyPK7Kstc4NNISdHV2o=";
   };
 
   build-system = [ pdm-backend ];

From b9725f4a01c49649efeec2f1e511b19e0c2b3c4f Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@determinate.systems>
Date: Mon, 27 Oct 2025 18:33:33 -0700
Subject: [PATCH 3426/6226] llvmPackages_git: 22.0.0-unstable-2025-10-19 ->
 22.0.0-unstable-2025-10-27

---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index a36ab46664fd..a5ad13cf0f39 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -28,9 +28,9 @@ let
     "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";
     "21.1.2".officialRelease.sha256 = "sha256-SgZdBL0ivfv6/4EqmPQ+I57qT2t6i/rqnm20+T1BsFY=";
     "22.0.0-git".gitRelease = {
-      rev = "6afccac4148253d4f9a90ad0a51cba0995f92fad";
-      rev-version = "22.0.0-unstable-2025-10-19";
-      sha256 = "sha256-mQBSRibRygpWIMjICzhza2U8xb/y9EM3SmtnNFfCWpY=";
+      rev = "aed12c33ade9ea48f1a596cd98fde958803a17a7";
+      rev-version = "22.0.0-unstable-2025-10-27";
+      sha256 = "sha256-RnY+2/t4cGdjzh5sSsUPxOZ7xo4oUu4MkGSyOFBsk1s=";
     };
   }
   // llvmVersions;

From c744a05c0e75caa4df8fb2e16b4ea5a72829da97 Mon Sep 17 00:00:00 2001
From: Ryan Horiguchi <ryan.horiguchi@gmail.com>
Date: Tue, 28 Oct 2025 02:42:00 +0100
Subject: [PATCH 3427/6226] prowlarr: 2.0.5.5160 -> 2.1.5.5216 Changelog
 https://github.com/Prowlarr/Prowlarr/releases/tag/v2.1.5.5216

---
 pkgs/by-name/pr/prowlarr/deps.json   | 438 ++++++++-------------------
 pkgs/by-name/pr/prowlarr/package.nix |   4 +-
 2 files changed, 127 insertions(+), 315 deletions(-)

diff --git a/pkgs/by-name/pr/prowlarr/deps.json b/pkgs/by-name/pr/prowlarr/deps.json
index c8ca52167952..e22a3f1edb2e 100644
--- a/pkgs/by-name/pr/prowlarr/deps.json
+++ b/pkgs/by-name/pr/prowlarr/deps.json
@@ -11,18 +11,18 @@
   },
   {
     "pname": "Azure.Core",
-    "version": "1.38.0",
-    "hash": "sha256-gzWMtIZJgwtE51dTMzLCbN4KxmE4/bzdjb/NU86N1uY="
+    "version": "1.47.1",
+    "hash": "sha256-YJR1bDI9H9lr6p/9QcOWEhnpMD8ePyxxO39S32VAOak="
   },
   {
     "pname": "Azure.Identity",
-    "version": "1.11.4",
-    "hash": "sha256-J3nI80CQwS7fwRLnqBxqZNemxqP05rcn3x44YpIf2no="
+    "version": "1.14.2",
+    "hash": "sha256-PpGcGQrzcEzDtTm65gLmjWrt8yavst4VOKDlr+NuLQo="
   },
   {
     "pname": "BouncyCastle.Cryptography",
-    "version": "2.5.1",
-    "hash": "sha256-ISDd8fS6/cIJIXBFDd7F3FQ0wzWkAo4r8dvycb8iT6c="
+    "version": "2.6.1",
+    "hash": "sha256-0NNwK/UZlnIK4Nb7bs4ya0XfoVluKQPUVQvaR88UHKo="
   },
   {
     "pname": "Castle.Core",
@@ -31,15 +31,8 @@
   },
   {
     "pname": "coverlet.collector",
-    "version": "3.0.4-preview.27.ge7cb7c3b40",
-    "hash": "sha256-UiiFa/GfLf3gcKb1atAz5gwR0sIA7sA1GFKSbk6sIgM=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7f7f0cec-b6d1-4285-a8c2-5c0b3ce99d29/_packaging/88cb5621-d569-46bd-ab53-84dba1855910/nuget/v3/flat2/coverlet.collector/3.0.4-preview.27.ge7cb7c3b40/coverlet.collector.3.0.4-preview.27.ge7cb7c3b40.nupkg"
-  },
-  {
-    "pname": "coverlet.core",
-    "version": "3.0.4-preview.27.ge7cb7c3b40",
-    "hash": "sha256-nIVBoe0qz5e5eDmrhlMslznVzXne6eXbd8T4m2c+Qb8=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7f7f0cec-b6d1-4285-a8c2-5c0b3ce99d29/_packaging/88cb5621-d569-46bd-ab53-84dba1855910/nuget/v3/flat2/coverlet.core/3.0.4-preview.27.ge7cb7c3b40/coverlet.core.3.0.4-preview.27.ge7cb7c3b40.nupkg"
+    "version": "6.0.4",
+    "hash": "sha256-ieiUl7G5pVKQ4V6rxhEe0ehep0/u1RBD3EAI63AQTI0="
   },
   {
     "pname": "Dapper",
@@ -88,8 +81,13 @@
   },
   {
     "pname": "MailKit",
-    "version": "4.12.1",
-    "hash": "sha256-fwI0YTbwfzrvdkbATWGbv4D8ugOXgaPO/WFvGxQ9WS8="
+    "version": "4.14.0",
+    "hash": "sha256-vAFqKaKvLUUiFbpu1mJdL/W5CIlb6rh3U6ef883g+Bs="
+  },
+  {
+    "pname": "Microsoft.ApplicationInsights",
+    "version": "2.23.0",
+    "hash": "sha256-5sf3bg7CZZjHseK+F3foOchEhmVeioePxMZVvS6Rjb0="
   },
   {
     "pname": "Microsoft.AspNetCore.Cryptography.Internal",
@@ -108,8 +106,8 @@
   },
   {
     "pname": "Microsoft.Bcl.AsyncInterfaces",
-    "version": "1.1.1",
-    "hash": "sha256-fAcX4sxE0veWM1CZBtXR/Unky+6sE33yrV7ohrWGKig="
+    "version": "8.0.0",
+    "hash": "sha256-9aWmiwMJKrKr9ohD1KSuol37y+jdDxPGJct3m2/Bknw="
   },
   {
     "pname": "Microsoft.Bcl.Cryptography",
@@ -121,11 +119,6 @@
     "version": "17.10.0",
     "hash": "sha256-yQFwqVChRtIRpbtkJr92JH2i+O7xn91NGbYgnKs8G2g="
   },
-  {
-    "pname": "Microsoft.CSharp",
-    "version": "4.0.1",
-    "hash": "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8="
-  },
   {
     "pname": "Microsoft.CSharp",
     "version": "4.7.0",
@@ -133,19 +126,14 @@
   },
   {
     "pname": "Microsoft.Data.SqlClient",
-    "version": "6.0.2",
-    "hash": "sha256-QkvGoucU8jo4PXCCgZ10v5I5hG0gyaVA36rOcu3IBLA="
+    "version": "6.1.1",
+    "hash": "sha256-IBVkAipJyF7KO9uid+5QyfVzWEeY/BbQUofKc6zQoW0="
   },
   {
     "pname": "Microsoft.Data.SqlClient.SNI.runtime",
     "version": "6.0.2",
     "hash": "sha256-CQuJfjZYoRxfc07cSzUNCOOdzmUJu0p10J+WpcG2BJ0="
   },
-  {
-    "pname": "Microsoft.DotNet.PlatformAbstractions",
-    "version": "2.1.0",
-    "hash": "sha256-vrZhYp94SjycUMGaVYCFWJ4p7KBKfqVyLWtIG73fzeM="
-  },
   {
     "pname": "Microsoft.Extensions.Caching.Abstractions",
     "version": "8.0.0",
@@ -206,11 +194,6 @@
     "version": "2.0.0",
     "hash": "sha256-+KqiuV8ncy9b1xhtDExh4s4U57tKxqx4pAyr6d//EQU="
   },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection",
-    "version": "2.2.0",
-    "hash": "sha256-k/3UKceE1hbgv1sfV9H85hzWvMwooE8PcasHvHMhe1M="
-  },
   {
     "pname": "Microsoft.Extensions.DependencyInjection",
     "version": "8.0.0",
@@ -226,11 +209,6 @@
     "version": "2.0.0",
     "hash": "sha256-H1rEnq/veRWvmp8qmUsrQkQIcVlKilUNzmmKsxJ0md8="
   },
-  {
-    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
-    "version": "2.2.0",
-    "hash": "sha256-pf+UQToJnhAe8VuGjxyCTvua1nIX8n5NHzAUk3Jz38s="
-  },
   {
     "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
     "version": "7.0.0",
@@ -246,11 +224,6 @@
     "version": "8.0.2",
     "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
   },
-  {
-    "pname": "Microsoft.Extensions.DependencyModel",
-    "version": "2.1.0",
-    "hash": "sha256-7dFo5itkB2OgSgS7dN87h0Xf2p5/f6fl2Ka6+CTEhDY="
-  },
   {
     "pname": "Microsoft.Extensions.Diagnostics",
     "version": "8.0.1",
@@ -271,11 +244,6 @@
     "version": "8.0.0",
     "hash": "sha256-29y5ZRQ1ZgzVOxHktYxyiH40kVgm5un2yTGdvuSWnRc="
   },
-  {
-    "pname": "Microsoft.Extensions.FileSystemGlobbing",
-    "version": "2.0.1",
-    "hash": "sha256-QBdcLyJAHf10+RUlquXWTs155FZmHDRKbL0uzXZZPVw="
-  },
   {
     "pname": "Microsoft.Extensions.FileSystemGlobbing",
     "version": "8.0.0",
@@ -326,6 +294,11 @@
     "version": "8.0.2",
     "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
   },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "8.0.3",
+    "hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q="
+  },
   {
     "pname": "Microsoft.Extensions.Logging.Configuration",
     "version": "8.0.1",
@@ -383,13 +356,13 @@
   },
   {
     "pname": "Microsoft.Identity.Client",
-    "version": "4.61.3",
-    "hash": "sha256-1cccC8EWlIQlJ3SSOB7CNImOYSaxsJpRHvlCgv2yOtA="
+    "version": "4.73.1",
+    "hash": "sha256-cd5ArtDvQK4gdX8M0GHQEsCFWlqpdm6lxvaM2yMHkhc="
   },
   {
     "pname": "Microsoft.Identity.Client.Extensions.Msal",
-    "version": "4.61.3",
-    "hash": "sha256-nFQ2C7S4BQ4nvQmGAc5Ar7/ynKyztvK7fPKrpJXaQFE="
+    "version": "4.73.1",
+    "hash": "sha256-wc4oHBGKCJhAqNIyD4LlugCFvmyiW5iVzGYP88bnWqs="
   },
   {
     "pname": "Microsoft.IdentityModel.Abstractions",
@@ -398,33 +371,33 @@
   },
   {
     "pname": "Microsoft.IdentityModel.Abstractions",
-    "version": "7.5.0",
-    "hash": "sha256-C849ySgag1us+IfgbSsloz6HTKeuEkN14HGFv4OML1o="
+    "version": "7.7.1",
+    "hash": "sha256-v83O6Gb8s4wGhbRPvOA95t0LSX+MAhF6WpA6qZeK2XM="
   },
   {
     "pname": "Microsoft.IdentityModel.JsonWebTokens",
-    "version": "7.5.0",
-    "hash": "sha256-TbU0dSLxUaTBxd9aLAlG4EeR2lrBE+6RJUlgefbqsQg="
+    "version": "7.7.1",
+    "hash": "sha256-vGUx0HYrhDGQiHuIZoe4YOXx3UV9hT+a0krlPGJPQzw="
   },
   {
     "pname": "Microsoft.IdentityModel.Logging",
-    "version": "7.5.0",
-    "hash": "sha256-RdUbGTvnbB11pmWxEKRaP6uPI2ITEcB/PxqgxHl33uM="
+    "version": "7.7.1",
+    "hash": "sha256-JtQclRXgzsFBFnD+kgD59OILf7XkMD2czLupLZkc100="
   },
   {
     "pname": "Microsoft.IdentityModel.Protocols",
-    "version": "7.5.0",
-    "hash": "sha256-SX8JpQ4HzFzngmh9QHGVz2GH7TrUdX8WXBSkykQFFaU="
+    "version": "7.7.1",
+    "hash": "sha256-PVS46Ut/2814hy0tdNLahG266hBmepw/fzZ9pku1PNg="
   },
   {
     "pname": "Microsoft.IdentityModel.Protocols.OpenIdConnect",
-    "version": "7.5.0",
-    "hash": "sha256-m4FYxiqNyU9FnqFJKcQnE7npc5HTulHdbk3bcooqWp8="
+    "version": "7.7.1",
+    "hash": "sha256-zXRZLfgOG/0l8aF6mZuAVGWB3wYz5uTkTJwlucYPafw="
   },
   {
     "pname": "Microsoft.IdentityModel.Tokens",
-    "version": "7.5.0",
-    "hash": "sha256-AI74ljCROXqXcktxc9T80NpBvwDZeVnRlJz+ofk1RVs="
+    "version": "7.7.1",
+    "hash": "sha256-WgbdkeG0R/f+4GJeXlj1WMpFyGv7+iW1JM9Pgt95UFk="
   },
   {
     "pname": "Microsoft.Net.Http.Headers",
@@ -438,13 +411,13 @@
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
-    "version": "1.0.1",
-    "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU="
+    "version": "1.1.0",
+    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
-    "version": "1.1.0",
-    "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM="
+    "version": "1.1.1",
+    "hash": "sha256-8hLiUKvy/YirCWlFwzdejD2Db3DaXhHxT7GSZx/znJg="
   },
   {
     "pname": "Microsoft.NETCore.Platforms",
@@ -458,13 +431,13 @@
   },
   {
     "pname": "Microsoft.NETCore.Targets",
-    "version": "1.0.1",
-    "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4="
+    "version": "1.1.0",
+    "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
   },
   {
     "pname": "Microsoft.NETCore.Targets",
-    "version": "1.1.0",
-    "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ="
+    "version": "1.1.3",
+    "hash": "sha256-WLsf1NuUfRWyr7C7Rl9jiua9jximnVvzy6nk2D2bVRc="
   },
   {
     "pname": "Microsoft.OpenApi",
@@ -477,15 +450,45 @@
     "hash": "sha256-mx/iqHmBMwA8Ulot0n6YFVIKsU1Tx7q4Tru7MSjbEgQ="
   },
   {
-    "pname": "Microsoft.TestPlatform.ObjectModel",
-    "version": "16.9.1",
-    "hash": "sha256-LZJLTWU2DOnuBiN/g+S+rwG2/BJtKrjydKnj3ujp98U="
+    "pname": "Microsoft.Testing.Extensions.Telemetry",
+    "version": "1.7.3",
+    "hash": "sha256-Z6WsY2FCUbNnT5HJd7IOrfOvqknVXp6PWzTVeb0idVg="
+  },
+  {
+    "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions",
+    "version": "1.7.3",
+    "hash": "sha256-PTee04FHyTHx/gF5NLckXuVje807G51MzkPrZ1gkgCw="
+  },
+  {
+    "pname": "Microsoft.Testing.Extensions.VSTestBridge",
+    "version": "1.7.3",
+    "hash": "sha256-8d+wZmucfSO7PsviHjVxYB4q6NcjgxvnCUpLePq35sM="
+  },
+  {
+    "pname": "Microsoft.Testing.Platform",
+    "version": "1.7.3",
+    "hash": "sha256-cavX11P5o9rooqC3ZHw5h002OKRg2ZNR/VaRwpNTQYA="
+  },
+  {
+    "pname": "Microsoft.Testing.Platform.MSBuild",
+    "version": "1.7.3",
+    "hash": "sha256-cREl529UQ/c5atT8KimMgrgNdy6MrAd0sBGT8sXRRPM="
+  },
+  {
+    "pname": "Microsoft.TestPlatform.AdapterUtilities",
+    "version": "17.13.0",
+    "hash": "sha256-Vr+3Tad/h/nk7f/5HMExn3HvCGFCarehFAzJSfCBaOc="
   },
   {
     "pname": "Microsoft.TestPlatform.ObjectModel",
     "version": "17.10.0",
     "hash": "sha256-3YjVGK2zEObksBGYg8b/CqoJgLQ1jUv4GCWNjDhLRh4="
   },
+  {
+    "pname": "Microsoft.TestPlatform.ObjectModel",
+    "version": "17.13.0",
+    "hash": "sha256-6S0fjfj8vA+h6dJVNwLi6oZhYDO/I/6hBZaq2VTW+Uk="
+  },
   {
     "pname": "Microsoft.TestPlatform.TestHost",
     "version": "17.10.0",
@@ -498,18 +501,13 @@
   },
   {
     "pname": "Microsoft.Win32.SystemEvents",
-    "version": "4.7.0",
-    "hash": "sha256-GHxnD1Plb32GJWVWSv0Y51Kgtlb+cdKgOYVBYZSgVF4="
+    "version": "8.0.0",
+    "hash": "sha256-UcxurEamYD+Bua0PbPNMYAZaRulMrov8CfbJGIgTaRQ="
   },
   {
     "pname": "MimeKit",
-    "version": "4.12.0",
-    "hash": "sha256-4i/RvXyXQsb6LlEs7tZWz5d5ab8mw3R8Wwp7FXSbMaA="
-  },
-  {
-    "pname": "Mono.Cecil",
-    "version": "0.11.1",
-    "hash": "sha256-J8+oOA/aJIit4nmhZ3NugJKRupHp9SgivRZUvMHP+jA="
+    "version": "4.14.0",
+    "hash": "sha256-06dqA6w2V2D+miq387smCuJ/8fk1FVc0rvRjmglAWyM="
   },
   {
     "pname": "Mono.Nat",
@@ -554,13 +552,8 @@
   },
   {
     "pname": "Newtonsoft.Json",
-    "version": "13.0.3",
-    "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc="
-  },
-  {
-    "pname": "Newtonsoft.Json",
-    "version": "9.0.1",
-    "hash": "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU="
+    "version": "13.0.4",
+    "hash": "sha256-8JCB1FdAW681qXP6DFDWvycu1oPyVoxaYgpJ2pUvZSk="
   },
   {
     "pname": "NLog",
@@ -587,11 +580,6 @@
     "version": "9.0.3",
     "hash": "sha256-X3F05GNj3vNVl++VOV5TMYE5dvEe6cx0k+5yWo2Q/+o="
   },
-  {
-    "pname": "NuGet.Frameworks",
-    "version": "5.0.0",
-    "hash": "sha256-WWLh+v9Y9as+WURW8tUPowQB8HWIiVJzbpKzEWTdMqI="
-  },
   {
     "pname": "NUnit",
     "version": "3.14.0",
@@ -599,18 +587,18 @@
   },
   {
     "pname": "NUnit3TestAdapter",
-    "version": "4.2.1",
-    "hash": "sha256-g73i3yqr0KnC0etKcAw9CmB6ZFAFvpxZn88s1glsND4="
+    "version": "5.1.0",
+    "hash": "sha256-5z470sFjV67wGHaw8KfmSloIAYe81Dokp0f8I6zXsDc="
   },
   {
     "pname": "NunitXml.TestLogger",
-    "version": "3.0.131",
-    "hash": "sha256-5IqI/e+nm90CAaZHrcbYfCY+zu5FVcpAbV0CmsdOKyg="
+    "version": "3.1.20",
+    "hash": "sha256-T6/n9S5vnmznf2P7x5Vejciq8P2P+1OCrdKE2UmWQOw="
   },
   {
     "pname": "Polly",
-    "version": "8.6.0",
-    "hash": "sha256-wlvYcfcOExa3LopwRFO4axW682jkUZvioHe+kznspHk="
+    "version": "8.6.4",
+    "hash": "sha256-Z+ZbhnHWMu55qgQkxvw3yMiMd+zIMzzQiFhvn/PeQ3I="
   },
   {
     "pname": "Polly.Contrib.WaitAndRetry",
@@ -619,8 +607,8 @@
   },
   {
     "pname": "Polly.Core",
-    "version": "8.6.0",
-    "hash": "sha256-NEGMMQ+3+i4ytsGekKfP1trUe0mRZP7MV0eBiSFXHW8="
+    "version": "8.6.4",
+    "hash": "sha256-4Xrg/H481Y/WOHk1sGvFNEOfgaGrdKi+4U54PTXhh9I="
   },
   {
     "pname": "RestSharp",
@@ -737,11 +725,6 @@
     "version": "4.3.0",
     "hash": "sha256-SrHqT9wrCBsxILWtaJgGKd6Odmxm8/Mh7Kh0CUkZVzA="
   },
-  {
-    "pname": "runtime.native.System",
-    "version": "4.0.0",
-    "hash": "sha256-bmaM0ovT4X4aqDJOR255Yda/u3fmHZskU++lMnsy894="
-  },
   {
     "pname": "runtime.native.System",
     "version": "4.3.0",
@@ -814,8 +797,8 @@
   },
   {
     "pname": "runtime.unix.System.Console",
-    "version": "4.3.0",
-    "hash": "sha256-AHkdKShTRHttqfMjmi+lPpTuCrM5vd/WRy6Kbtie190="
+    "version": "4.3.1",
+    "hash": "sha256-dxyn/1Px4FKLZ2QMUrkFpW619Y1lhPeTiGLWYM6IbpY="
   },
   {
     "pname": "runtime.unix.System.Diagnostics.Debug",
@@ -971,6 +954,11 @@
     "version": "1.4.2",
     "hash": "sha256-/giVqikworG2XKqfN9uLyjUSXr35zBuZ2FX2r8X/WUY="
   },
+  {
+    "pname": "SourceGear.sqlite3",
+    "version": "3.50.4.2",
+    "hash": "sha256-NsahZ3lW1JYXMq4NOH5nM/EhdjV05sbrhjsGNIinb+M="
+  },
   {
     "pname": "Swashbuckle.AspNetCore.Swagger",
     "version": "8.1.4",
@@ -981,11 +969,6 @@
     "version": "8.1.4",
     "hash": "sha256-m0ixgc45HCX2xrvrnhy3WYU/r/basjat535n4rN+vOY="
   },
-  {
-    "pname": "System.AppContext",
-    "version": "4.1.0",
-    "hash": "sha256-v6YfyfrKmhww+EYHUq6cwYUMj00MQ6SOfJtcGVRlYzs="
-  },
   {
     "pname": "System.AppContext",
     "version": "4.3.0",
@@ -998,13 +981,8 @@
   },
   {
     "pname": "System.ClientModel",
-    "version": "1.0.0",
-    "hash": "sha256-yHb72M/Z8LeSZea9TKw2eD0SdYEoCNwVw6Z3695SC2Y="
-  },
-  {
-    "pname": "System.Collections",
-    "version": "4.0.11",
-    "hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0="
+    "version": "1.5.1",
+    "hash": "sha256-n4PHKtjmFXo37s5yhfUQ9UbfnWplqHpC+wsvlHxctow="
   },
   {
     "pname": "System.Collections",
@@ -1062,15 +1040,9 @@
     "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo="
   },
   {
-    "pname": "System.Data.SQLite.Core.Servarr",
-    "version": "1.0.115.5-18",
-    "hash": "sha256-H6QvKNKkW6PwHwDWAUVeXlqz9fJTEwIAS3YtcbOwpTc=",
-    "url": "https://pkgs.dev.azure.com/Servarr/7ab38f4e-5a57-4d70-84f4-94dd9bc5d6df/_packaging/f762697f-09fa-4960-89a1-64e48069bf6a/nuget/v3/flat2/system.data.sqlite.core.servarr/1.0.115.5-18/system.data.sqlite.core.servarr.1.0.115.5-18.nupkg"
-  },
-  {
-    "pname": "System.Diagnostics.Debug",
-    "version": "4.0.11",
-    "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4="
+    "pname": "System.Data.SQLite",
+    "version": "2.0.2",
+    "hash": "sha256-s++mcixhc+QaQKzdXZ6quK8kH5WWWmU0mESZNNuP/ck="
   },
   {
     "pname": "System.Diagnostics.Debug",
@@ -1082,6 +1054,11 @@
     "version": "4.3.0",
     "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw="
   },
+  {
+    "pname": "System.Diagnostics.DiagnosticSource",
+    "version": "5.0.0",
+    "hash": "sha256-6mW3N6FvcdNH/pB58pl+pFSCGWgyaP4hfVtC/SMWDV4="
+  },
   {
     "pname": "System.Diagnostics.DiagnosticSource",
     "version": "6.0.1",
@@ -1092,11 +1069,6 @@
     "version": "8.0.1",
     "hash": "sha256-zvqd72pwgcGoa1nH3ZT1C0mP9k53vFLJ69r5MCQ1saA="
   },
-  {
-    "pname": "System.Diagnostics.Tools",
-    "version": "4.0.1",
-    "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U="
-  },
   {
     "pname": "System.Diagnostics.Tools",
     "version": "4.3.0",
@@ -1114,13 +1086,8 @@
   },
   {
     "pname": "System.Drawing.Common",
-    "version": "4.7.0",
-    "hash": "sha256-D3qG+xAe78lZHvlco9gHK2TEAM370k09c6+SQi873Hk="
-  },
-  {
-    "pname": "System.Dynamic.Runtime",
-    "version": "4.0.11",
-    "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4="
+    "version": "8.0.19",
+    "hash": "sha256-KDCdLN8aKxQmQCe8D5iCyZKo2+mhx00tg7CqTILE/v0="
   },
   {
     "pname": "System.Dynamic.Runtime",
@@ -1132,11 +1099,6 @@
     "version": "8.0.1",
     "hash": "sha256-may/Wg+esmm1N14kQTG4ESMBi+GQKPp0ZrrBo/o6OXM="
   },
-  {
-    "pname": "System.Globalization",
-    "version": "4.0.11",
-    "hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw="
-  },
   {
     "pname": "System.Globalization",
     "version": "4.3.0",
@@ -1154,13 +1116,8 @@
   },
   {
     "pname": "System.IdentityModel.Tokens.Jwt",
-    "version": "7.5.0",
-    "hash": "sha256-K3OUOGrTYKJdnRTHERdSZWTxb5QNL4wBKCahcswdKrc="
-  },
-  {
-    "pname": "System.IO",
-    "version": "4.1.0",
-    "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw="
+    "version": "7.7.1",
+    "hash": "sha256-6JfmtdChyt7zd/HKI+/T1HcyesEPx0NNMO/zFJ7lU2c="
   },
   {
     "pname": "System.IO",
@@ -1177,11 +1134,6 @@
     "version": "4.3.0",
     "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs="
   },
-  {
-    "pname": "System.IO.FileSystem",
-    "version": "4.0.1",
-    "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0="
-  },
   {
     "pname": "System.IO.FileSystem",
     "version": "4.3.0",
@@ -1192,11 +1144,6 @@
     "version": "5.0.0",
     "hash": "sha256-c9MlDKJfj63YRvl7brRBNs59olrmbL+G1A6oTS8ytEc="
   },
-  {
-    "pname": "System.IO.FileSystem.Primitives",
-    "version": "4.0.1",
-    "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg="
-  },
   {
     "pname": "System.IO.FileSystem.Primitives",
     "version": "4.3.0",
@@ -1207,21 +1154,11 @@
     "version": "8.0.0",
     "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
   },
-  {
-    "pname": "System.Linq",
-    "version": "4.1.0",
-    "hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794="
-  },
   {
     "pname": "System.Linq",
     "version": "4.3.0",
     "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A="
   },
-  {
-    "pname": "System.Linq.Expressions",
-    "version": "4.1.0",
-    "hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4="
-  },
   {
     "pname": "System.Linq.Expressions",
     "version": "4.3.0",
@@ -1234,8 +1171,8 @@
   },
   {
     "pname": "System.Memory.Data",
-    "version": "1.0.2",
-    "hash": "sha256-XiVrVQZQIz4NgjiK/wtH8iZhhOZ9MJ+X2hL2/8BrGN0="
+    "version": "8.0.1",
+    "hash": "sha256-cxYZL0Trr6RBplKmECv94ORuyjrOM6JB0D/EwmBSisg="
   },
   {
     "pname": "System.Net.Http",
@@ -1257,16 +1194,6 @@
     "version": "4.3.0",
     "hash": "sha256-il7dr5VT/QWDg/0cuh+4Es2u8LY//+qqiY9BZmYxSus="
   },
-  {
-    "pname": "System.Numerics.Vectors",
-    "version": "4.5.0",
-    "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8="
-  },
-  {
-    "pname": "System.ObjectModel",
-    "version": "4.0.12",
-    "hash": "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s="
-  },
   {
     "pname": "System.ObjectModel",
     "version": "4.3.0",
@@ -1278,20 +1205,15 @@
     "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM="
   },
   {
-    "pname": "System.Reflection",
-    "version": "4.1.0",
-    "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs="
+    "pname": "System.Private.Uri",
+    "version": "4.3.2",
+    "hash": "sha256-jB2+W3tTQ6D9XHy5sEFMAazIe1fu2jrENUO0cb48OgU="
   },
   {
     "pname": "System.Reflection",
     "version": "4.3.0",
     "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY="
   },
-  {
-    "pname": "System.Reflection.Emit",
-    "version": "4.0.1",
-    "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk="
-  },
   {
     "pname": "System.Reflection.Emit",
     "version": "4.3.0",
@@ -1302,81 +1224,41 @@
     "version": "4.7.0",
     "hash": "sha256-Fw/CSRD+wajH1MqfKS3Q/sIrUH7GN4K+F+Dx68UPNIg="
   },
-  {
-    "pname": "System.Reflection.Emit.ILGeneration",
-    "version": "4.0.1",
-    "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0="
-  },
   {
     "pname": "System.Reflection.Emit.ILGeneration",
     "version": "4.3.0",
     "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA="
   },
-  {
-    "pname": "System.Reflection.Emit.Lightweight",
-    "version": "4.0.1",
-    "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g="
-  },
   {
     "pname": "System.Reflection.Emit.Lightweight",
     "version": "4.3.0",
     "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I="
   },
-  {
-    "pname": "System.Reflection.Extensions",
-    "version": "4.0.1",
-    "hash": "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ="
-  },
   {
     "pname": "System.Reflection.Extensions",
     "version": "4.3.0",
     "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk="
   },
-  {
-    "pname": "System.Reflection.Metadata",
-    "version": "1.5.0",
-    "hash": "sha256-wM75ACJUeypeOdaBUj4oTYiSWmg7A1usMpwRQXjSGK8="
-  },
   {
     "pname": "System.Reflection.Metadata",
     "version": "1.6.0",
     "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
   },
-  {
-    "pname": "System.Reflection.Primitives",
-    "version": "4.0.1",
-    "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0="
-  },
   {
     "pname": "System.Reflection.Primitives",
     "version": "4.3.0",
     "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM="
   },
-  {
-    "pname": "System.Reflection.TypeExtensions",
-    "version": "4.1.0",
-    "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4="
-  },
   {
     "pname": "System.Reflection.TypeExtensions",
     "version": "4.3.0",
     "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng="
   },
-  {
-    "pname": "System.Resources.ResourceManager",
-    "version": "4.0.1",
-    "hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw="
-  },
   {
     "pname": "System.Resources.ResourceManager",
     "version": "4.3.0",
     "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo="
   },
-  {
-    "pname": "System.Runtime",
-    "version": "4.1.0",
-    "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo="
-  },
   {
     "pname": "System.Runtime",
     "version": "4.3.0",
@@ -1392,41 +1274,21 @@
     "version": "6.0.0",
     "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I="
   },
-  {
-    "pname": "System.Runtime.Extensions",
-    "version": "4.1.0",
-    "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc="
-  },
   {
     "pname": "System.Runtime.Extensions",
     "version": "4.3.0",
     "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o="
   },
-  {
-    "pname": "System.Runtime.Handles",
-    "version": "4.0.1",
-    "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w="
-  },
   {
     "pname": "System.Runtime.Handles",
     "version": "4.3.0",
     "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms="
   },
-  {
-    "pname": "System.Runtime.InteropServices",
-    "version": "4.1.0",
-    "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY="
-  },
   {
     "pname": "System.Runtime.InteropServices",
     "version": "4.3.0",
     "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI="
   },
-  {
-    "pname": "System.Runtime.InteropServices.RuntimeInformation",
-    "version": "4.0.0",
-    "hash": "sha256-5j53amb76A3SPiE3B0llT2XPx058+CgE7OXL4bLalT4="
-  },
   {
     "pname": "System.Runtime.InteropServices.RuntimeInformation",
     "version": "4.3.0",
@@ -1442,11 +1304,6 @@
     "version": "4.3.0",
     "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc="
   },
-  {
-    "pname": "System.Runtime.Serialization.Primitives",
-    "version": "4.1.1",
-    "hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA="
-  },
   {
     "pname": "System.Security.AccessControl",
     "version": "4.7.0",
@@ -1504,8 +1361,8 @@
   },
   {
     "pname": "System.Security.Cryptography.ProtectedData",
-    "version": "4.7.0",
-    "hash": "sha256-dZfs5q3Ij1W1eJCfYjxI2o+41aSiFpaAugpoECaCOug="
+    "version": "4.5.0",
+    "hash": "sha256-Z+X1Z2lErLL7Ynt2jFszku6/IgrngO3V1bSfZTBiFIc="
   },
   {
     "pname": "System.Security.Cryptography.ProtectedData",
@@ -1552,11 +1409,6 @@
     "version": "8.0.1",
     "hash": "sha256-2cXTzNOyXqJinFPzdVJ9Gu6qrFtycfivu7RHDzBJic8="
   },
-  {
-    "pname": "System.Text.Encoding",
-    "version": "4.0.11",
-    "hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc="
-  },
   {
     "pname": "System.Text.Encoding",
     "version": "4.3.0",
@@ -1567,21 +1419,11 @@
     "version": "8.0.0",
     "hash": "sha256-fjCLQc1PRW0Ix5IZldg0XKv+J1DqPSfu9pjMyNBp7dE="
   },
-  {
-    "pname": "System.Text.Encoding.Extensions",
-    "version": "4.0.11",
-    "hash": "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI="
-  },
   {
     "pname": "System.Text.Encoding.Extensions",
     "version": "4.3.0",
     "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc="
   },
-  {
-    "pname": "System.Text.Encodings.Web",
-    "version": "4.7.2",
-    "hash": "sha256-CUZOulSeRy1CGBm7mrNrTumA9od9peKiIDR/Nb1B4io="
-  },
   {
     "pname": "System.Text.Json",
     "version": "5.0.2",
@@ -1589,44 +1431,24 @@
   },
   {
     "pname": "System.Text.Json",
-    "version": "8.0.5",
-    "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68="
-  },
-  {
-    "pname": "System.Text.RegularExpressions",
-    "version": "4.1.0",
-    "hash": "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c="
+    "version": "8.0.6",
+    "hash": "sha256-qD3WF3jQO9+TLuBWwJhz3iKDArJqcRiy7EdrCQhrtes="
   },
   {
     "pname": "System.Text.RegularExpressions",
     "version": "4.3.0",
     "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0="
   },
-  {
-    "pname": "System.Threading",
-    "version": "4.0.11",
-    "hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac="
-  },
   {
     "pname": "System.Threading",
     "version": "4.3.0",
     "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc="
   },
-  {
-    "pname": "System.Threading.Tasks",
-    "version": "4.0.11",
-    "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs="
-  },
   {
     "pname": "System.Threading.Tasks",
     "version": "4.3.0",
     "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w="
   },
-  {
-    "pname": "System.Threading.Tasks.Extensions",
-    "version": "4.0.0",
-    "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE="
-  },
   {
     "pname": "System.Threading.Tasks.Extensions",
     "version": "4.3.0",
@@ -1662,21 +1484,11 @@
     "version": "4.7.0",
     "hash": "sha256-yW+GvQranReaqPw5ZFv+mSjByQ5y1pRLl05JIEf3tYU="
   },
-  {
-    "pname": "System.Xml.ReaderWriter",
-    "version": "4.0.11",
-    "hash": "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA="
-  },
   {
     "pname": "System.Xml.ReaderWriter",
     "version": "4.3.0",
     "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA="
   },
-  {
-    "pname": "System.Xml.XDocument",
-    "version": "4.0.11",
-    "hash": "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg="
-  },
   {
     "pname": "System.Xml.XDocument",
     "version": "4.3.0",
diff --git a/pkgs/by-name/pr/prowlarr/package.nix b/pkgs/by-name/pr/prowlarr/package.nix
index 69d6877a43e1..dc0dfdfb4343 100644
--- a/pkgs/by-name/pr/prowlarr/package.nix
+++ b/pkgs/by-name/pr/prowlarr/package.nix
@@ -19,7 +19,7 @@
   applyPatches,
 }:
 let
-  version = "2.0.5.5160";
+  version = "2.1.5.5216";
   # The dotnet8 compatibility patches also change `yarn.lock`, so we must pass
   # the already patched lockfile to `fetchYarnDeps`.
   src = applyPatches {
@@ -27,7 +27,7 @@ let
       owner = "Prowlarr";
       repo = "Prowlarr";
       tag = "v${version}";
-      hash = "sha256-xSAEDcBaItA+retaSKtEI6wlwj5Knfi4RwUN6GGYms0=";
+      hash = "sha256-/7U1V1/fF8fobVwQa/IzCGWIUIKMrSxTyj9KZhmfJ/E=";
     };
     postPatch = ''
       mv src/NuGet.config NuGet.Config

From 819f7f25ab8a4ccecaaa54e35c5667331d242d03 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 01:45:31 +0000
Subject: [PATCH 3428/6226] vscode-extensions.prisma.prisma: 6.17.1 -> 6.18.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 3d7e4a833c02..37a50b2f89ba 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3768,8 +3768,8 @@ let
         mktplcRef = {
           name = "prisma";
           publisher = "Prisma";
-          version = "6.17.1";
-          hash = "sha256-P+D6fQg30C2nJFv8z/+51cSk5etCvugAbRj7h7nyGd0=";
+          version = "6.18.0";
+          hash = "sha256-wStFklnjX+UDykxLjl+vDYnvAgjrqFG4ahDuCX2glwI=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog";

From 506e8c55cd913f9955d0cbb2d944cd827f9f64a5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 02:36:07 +0000
Subject: [PATCH 3429/6226] ueberzugpp: 2.9.7 -> 2.9.8

---
 pkgs/by-name/ue/ueberzugpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ue/ueberzugpp/package.nix b/pkgs/by-name/ue/ueberzugpp/package.nix
index 20e6377951ab..3e25c1ad7b1c 100644
--- a/pkgs/by-name/ue/ueberzugpp/package.nix
+++ b/pkgs/by-name/ue/ueberzugpp/package.nix
@@ -32,13 +32,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ueberzugpp";
-  version = "2.9.7";
+  version = "2.9.8";
 
   src = fetchFromGitHub {
     owner = "jstkdng";
     repo = "ueberzugpp";
     rev = "v${version}";
-    hash = "sha256-FR05vBKIMbGiOnugkBi8IkLfHU7LzNF2ihxD7FWWYGU=";
+    hash = "sha256-BTOuOS0zCdYTTc47UHaGI6wqFEv6e71cD2XBZtnKGLU=";
   };
 
   strictDeps = true;

From a34c42b91be2ef4c3da75f4b6d4108b6bc285326 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 02:37:46 +0000
Subject: [PATCH 3430/6226] sqlpage: 0.38.0 -> 0.39.0

---
 pkgs/by-name/sq/sqlpage/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sq/sqlpage/package.nix b/pkgs/by-name/sq/sqlpage/package.nix
index cb20579d8b93..bef63a5b00e4 100644
--- a/pkgs/by-name/sq/sqlpage/package.nix
+++ b/pkgs/by-name/sq/sqlpage/package.nix
@@ -42,13 +42,13 @@ in
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sqlpage";
-  version = "0.38.0";
+  version = "0.39.0";
 
   src = fetchFromGitHub {
     owner = "lovasoa";
     repo = "SQLpage";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sIbEyW1/EuZuspU9pBOe6y9Ktwvz9ZNEsQ4CU/yU278=";
+    hash = "sha256-M9WtpDc067G/EfRTJBoDxBrdXRMqOwVTdGgyXSdHlhE=";
   };
 
   postPatch = ''
@@ -73,7 +73,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       "$(cat ${tomselect})"
   '';
 
-  cargoHash = "sha256-uWdEzuEKxN50OM40i/BedgfoWf3oijks8tM5bs7qUao=";
+  cargoHash = "sha256-lUQ1j2f/LXpqpb6VK4Bq2NI0L9KoyEdlPkENMOKkt0w=";
 
   nativeBuildInputs = [ pkg-config ];
 

From b623af1b2f95b06d1082a055a189ab896bf89c11 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 02:43:05 +0000
Subject: [PATCH 3431/6226] zoekt: 3.7.2-2-unstable-2025-10-16 ->
 3.7.2-2-unstable-2025-10-24

---
 pkgs/by-name/zo/zoekt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zo/zoekt/package.nix b/pkgs/by-name/zo/zoekt/package.nix
index e5412d1ce914..cc06292c12f4 100644
--- a/pkgs/by-name/zo/zoekt/package.nix
+++ b/pkgs/by-name/zo/zoekt/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule {
   pname = "zoekt";
-  version = "3.7.2-2-unstable-2025-10-16";
+  version = "3.7.2-2-unstable-2025-10-24";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "zoekt";
-    rev = "90faf6de70e39db5fb48839eabfba6c8add008f0";
-    hash = "sha256-nULqnTms5Jw8gE8VcUzRGJaJqyavXyABU8SyTg8fCtE=";
+    rev = "eab7bf421ca319e3096b3b5192c7b0c32647c335";
+    hash = "sha256-vG/btpXRI/8G98iakevtHOG4yEOx7EsrWHCLApAIQMQ=";
   };
 
   vendorHash = "sha256-urXYBv8+C2jwnr5PjXz7nUyX/Gz4wmtS76UTXFqfQFk=";

From 40eea21c1e7baf2ec02fbc5cf0a58805371c3ef4 Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihar.hrachyshka@gmail.com>
Date: Mon, 27 Oct 2025 21:57:14 -0400
Subject: [PATCH 3432/6226] buildMozillaMach: use llvmPackages_20 on
 aarch64-darwin

There's a bug in llvm 21 that makes Firefox crash on loading a PNG
favicon that is being investigated in Mozilla bug tracker:

https://bugzilla.mozilla.org/show_bug.cgi?id=1995582

While this is being fixed, switch to llvmPackages_20 for aarch64-darwin.
(x86_64-darwin is not affected.)

Note: this change will also affect Thunderbird. Though strictly speaking
not a required change because we are not aware of a specific issue with
Thunderbird (yet), I feel we may want to stick to the same LLVM for both
types of Mozilla apps while this is being investigated. It also
simplifies the code somewhat.

Fixes #453372
---
 .../build-mozilla-mach/default.nix            | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index e484f6b0bde2..c192b9eb97f3 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -58,9 +58,7 @@ in
   pkgsCross, # wasm32 rlbox
   python3,
   runCommand,
-  rustc,
   rust-cbindgen,
-  rustPlatform,
   unzip,
   which,
   wrapGAppsHook3,
@@ -201,9 +199,25 @@ assert elfhackSupport -> isElfhackPlatform stdenv;
 let
   inherit (lib) enableFeature;
 
+  rustPackages =
+    pkgs:
+    (pkgs.rust.override (
+      # aarch64-darwin firefox crashes on loading favicons due to a llvm 21 bug:
+      # https://github.com/NixOS/nixpkgs/issues/453372
+      # https://bugzilla.mozilla.org/show_bug.cgi?id=1995582#c16
+      lib.optionalAttrs (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) {
+        llvmPackages = pkgs.llvmPackages_20;
+      }
+    )).packages.stable;
+
+  toRustC = pkgs: (rustPackages pkgs).rustc;
+
+  rustc = toRustC pkgs;
+  inherit (rustPackages pkgs) rustPlatform;
+
   # Target the LLVM version that rustc is built with for LTO.
   llvmPackages0 = rustc.llvmPackages;
-  llvmPackagesBuildBuild0 = pkgsBuildBuild.rustc.llvmPackages;
+  llvmPackagesBuildBuild0 = (toRustC pkgsBuildBuild).llvmPackages;
 
   # Force the use of lld and other llvm tools for LTO
   llvmPackages = llvmPackages0.override {
@@ -218,7 +232,7 @@ let
   # LTO requires LLVM bintools including ld.lld and llvm-ar.
   buildStdenv = overrideCC llvmPackages.stdenv (
     llvmPackages.stdenv.cc.override {
-      bintools = if ltoSupport then buildPackages.rustc.llvmPackages.bintools else stdenv.cc.bintools;
+      bintools = if ltoSupport then (toRustC buildPackages).llvmPackages.bintools else stdenv.cc.bintools;
     }
   );
 

From 25d75455b87bc01edd0825a93e8b859d1e049f6e Mon Sep 17 00:00:00 2001
From: Liam Murphy <liampm32@gmail.com>
Date: Tue, 28 Oct 2025 13:46:29 +1100
Subject: [PATCH 3433/6226] sagelib: remove unused deps

ratpoints 2.2.2 fails to build with Clang; it would be relatively easy
to fix (by either updating
https://github.com/sagemath/sage/blob/1615f58890e8f9881c4228c78a6b39b9aab1303a/build/pkgs/ratpoints/patches/sturm_and_rp_private.patch
or using gccStdenv), but Sage dropped the dependency 3 years ago, so
drop the dependency here too.

While I was at it, I also dropped all the other dependencies which seem
to be unused (by looking at
https://github.com/sagemath/sage/commits/10.7/build/pkgs/sagelib/dependencies).
---
 pkgs/by-name/sa/sage/sagelib.nix | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/pkgs/by-name/sa/sage/sagelib.nix b/pkgs/by-name/sa/sage/sagelib.nix
index 7964c4b8fa25..f9a30e5c3159 100644
--- a/pkgs/by-name/sa/sage/sagelib.nix
+++ b/pkgs/by-name/sa/sage/sagelib.nix
@@ -13,7 +13,6 @@
   gd,
   iml,
   libpng,
-  readline,
   blas,
   boost,
   brial,
@@ -23,7 +22,6 @@
   fflas-ffpack,
   flint,
   gap,
-  giac,
   givaro,
   glpk,
   gsl,
@@ -44,7 +42,6 @@
   planarity,
   ppl,
   rankwidth,
-  ratpoints,
   singular,
   sqlite,
   symmetrica,
@@ -60,7 +57,6 @@
   ipykernel,
   ipython,
   ipywidgets,
-  jinja2,
   jupyter-client,
   jupyter-core,
   lrcalc-python,
@@ -117,7 +113,6 @@ buildPythonPackage rec {
     gd
     iml
     libpng
-    readline
   ];
 
   env = lib.optionalAttrs stdenv.cc.isClang {
@@ -138,7 +133,6 @@ buildPythonPackage rec {
     fflas-ffpack
     flint
     gap
-    giac
     givaro
     glpk
     gsl
@@ -159,7 +153,6 @@ buildPythonPackage rec {
     planarity
     ppl
     rankwidth
-    ratpoints
     singular
     sqlite
     symmetrica
@@ -177,7 +170,6 @@ buildPythonPackage rec {
     ipykernel
     ipython
     ipywidgets
-    jinja2
     jupyter-client
     jupyter-core
     lrcalc-python

From b223003b904e09d24059282cfacfe1009f567038 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 02:56:01 +0000
Subject: [PATCH 3434/6226] trufflehog: 3.90.11 -> 3.90.12

---
 pkgs/by-name/tr/trufflehog/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/trufflehog/package.nix b/pkgs/by-name/tr/trufflehog/package.nix
index fd83c2e7ef11..08fa92c2bb99 100644
--- a/pkgs/by-name/tr/trufflehog/package.nix
+++ b/pkgs/by-name/tr/trufflehog/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "trufflehog";
-  version = "3.90.11";
+  version = "3.90.12";
 
   src = fetchFromGitHub {
     owner = "trufflesecurity";
     repo = "trufflehog";
     tag = "v${version}";
-    hash = "sha256-X2mqmUjdKHIp/w393hLvD6k7LTBIY9FEb1fI+SckIe4=";
+    hash = "sha256-r+j9YnRKQ5m7XLavM5rARRZwDiNTcGmxpL6Sv8eTZLE=";
   };
 
-  vendorHash = "sha256-XTjKaRNqSnyLVag5/nBMmKZ6XeTDmd03ujeeMCJCB9Y=";
+  vendorHash = "sha256-zQ67yLN/HCshOndP/FAUOOyiQpOjyOJChkZZmFb06WM=";
 
   nativeBuildInputs = [ makeWrapper ];
 

From 1c75ce9f99b4392e32484c614cbd22d0366eb674 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 03:01:38 +0000
Subject: [PATCH 3435/6226] worker-build: 0.6.6 -> 0.6.7

---
 pkgs/by-name/wo/worker-build/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wo/worker-build/package.nix b/pkgs/by-name/wo/worker-build/package.nix
index 34bcbff3076d..ab688f5000d5 100644
--- a/pkgs/by-name/wo/worker-build/package.nix
+++ b/pkgs/by-name/wo/worker-build/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "worker-build";
-  version = "0.6.6";
+  version = "0.6.7";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "workers-rs";
     tag = "v${version}";
-    hash = "sha256-Ia921UNb++9Y1NoEd7nNdJaEEqRxQLAzZ8yYaxPrWYc=";
+    hash = "sha256-c0PXLuWEY+keYRAjQkgd84Hn7IDh17SePKDF9J4ZQ5M=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-sIxsGeORhWpL3lWzXas7fK4QVuB03UT7rAN8uEzOdr0=";
+  cargoHash = "sha256-axK9/EVNKBb4xoYMOJ+0Y5nQvtkYyFDE6RsiL2MqxTM=";
 
   buildAndTestSubdir = "worker-build";
 

From ac4467452261439919a0a9fb111fb06d4732e553 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Fri, 24 Oct 2025 00:07:27 -0700
Subject: [PATCH 3436/6226] mattermost: only run mmctl tests

The full Mattermost test suite is a bit of a treadmill to keep on top
of, and I've definitely seen some recent ones that were generated with
Claude. Hydra is not the Claude Code regression test runner.

We can mostly get away with running the mmctl test suite instead.
---
 pkgs/by-name/ma/mattermost/tests.nix | 115 ++-------------------------
 1 file changed, 6 insertions(+), 109 deletions(-)

diff --git a/pkgs/by-name/ma/mattermost/tests.nix b/pkgs/by-name/ma/mattermost/tests.nix
index 85d3003fa8c8..53ccc82ab558 100644
--- a/pkgs/by-name/ma/mattermost/tests.nix
+++ b/pkgs/by-name/ma/mattermost/tests.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  stdenv,
   mattermost,
   gotestsum,
   which,
@@ -12,16 +11,10 @@
   runtimeShell,
 }:
 
-let
-  inherit (lib.lists) optionals;
-  inherit (lib.strings) versionAtLeast;
-  is10 = version: versionAtLeast version "10.0";
-in
 mattermost.overrideAttrs (
   final: prev: {
     doCheck = true;
     checkTargets = [
-      "test-server"
       "test-mmctl"
     ];
     nativeCheckInputs = [
@@ -52,113 +45,17 @@ mattermost.overrideAttrs (
     # X  TestFoo
     # X  TestFoo/TestBar
     # -> TestFoo/TestBar/baz_test
-    disabledTests = [
+    disabledTests = lib.lists.uniqueStrings [
       # All these plugin tests for mmctl reach out to the marketplace, which is impossible in the sandbox
       "TestMmctlE2ESuite/TestPluginDeleteCmd/Delete_Plugin/SystemAdminClient"
       "TestMmctlE2ESuite/TestPluginDeleteCmd/Delete_Plugin/LocalClient"
       "TestMmctlE2ESuite/TestPluginDeleteCmd/Delete_a_Plugin_without_permissions"
       "TestMmctlE2ESuite/TestPluginDeleteCmd/Delete_Unknown_Plugin/SystemAdminClient"
       "TestMmctlE2ESuite/TestPluginDeleteCmd/Delete_Unknown_Plugin/LocalClient"
-      "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_new_plugins/SystemAdminClient"
-      "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_new_plugins/LocalClient"
-      "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_an_already_installed_plugin_without_force/SystemAdminClient"
-      "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_an_already_installed_plugin_without_force/LocalClient"
-      "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_an_already_installed_plugin_with_force/SystemAdminClient"
-      "TestMmctlE2ESuite/TestPluginInstallURLCmd/install_an_already_installed_plugin_with_force/LocalClient"
-      "TestMmctlE2ESuite/TestPluginMarketplaceInstallCmd/install_a_plugin/SystemAdminClient"
-      "TestMmctlE2ESuite/TestPluginMarketplaceInstallCmd/install_a_plugin/LocalClient"
-      "TestMmctlE2ESuite/TestPluginMarketplaceListCmd/List_Marketplace_Plugins_for_Admin_User/SystemAdminClient"
-      "TestMmctlE2ESuite/TestPluginMarketplaceListCmd/List_Marketplace_Plugins_for_Admin_User/LocalClient"
-
-      # Seems to just be broken.
-      "TestMmctlE2ESuite/TestPreferenceUpdateCmd"
-
-      # Has a hardcoded "google.com" test which also verifies that the address isn't loopback,
-      # so we also can't just substituteInPlace to one that will resolve
-      "TestDialContextFilter"
-
-      # No interfaces but loopback in the sandbox, so returns empty
-      "TestGetServerIPAddress"
-
-      # S3 bucket tests (needs Minio)
-      "TestInsecureMakeBucket"
-      "TestMakeBucket"
-      "TestListDirectory"
-      "TestTimeout"
-      "TestStartServerNoS3Bucket"
-      "TestS3TestConnection"
-      "TestS3FileBackendTestSuite"
-      "TestS3FileBackendTestSuiteWithEncryption"
-      "TestWriteFileVideoMimeTypes"
-
-      # Mail tests (needs a SMTP server)
-      "TestSendMailUsingConfig"
-      "TestSendMailUsingConfigAdvanced"
-      "TestSendMailWithEmbeddedFilesUsingConfig"
-      "TestSendCloudWelcomeEmail"
-      "TestMailConnectionAdvanced"
-      "TestMailConnectionFromConfig"
-      "TestEmailTest"
-      "TestBasicAPIPlugins/test_send_mail_plugin"
-
-      # Seems to be unreliable
-      "TestPluginAPIUpdateUserPreferences"
-      "TestPluginAPIGetUserPreferences"
-
-      # These invite tests try to send a welcome email and we don't have a SMTP server up.
-      "TestInviteUsersToTeam"
-      "TestInviteGuestsToTeam"
-      "TestSendInviteEmails"
-      "TestDeliver"
-
-      # https://github.com/mattermost/mattermost/issues/29184
-      "TestUpAndDownMigrations/Should_be_reversible_for_mysql"
-    ]
-    ++ optionals (is10 final.version) [
-      ## mattermostLatest test ignores
-
-      # These bot related tests appear to be broken.
-      "TestCreateBot"
-      "TestPatchBot"
-      "TestGetBot"
-      "TestEnableBot"
-      "TestDisableBot"
-      "TestAssignBot"
-      "TestConvertBotToUser"
-
-      # Need Elasticsearch or Opensearch
-      "TestBlevePurgeIndexes"
-      "TestOpensearchAggregation"
-      "TestOpensearchInterfaceTestSuite"
-      "TestOpenSearchIndexerJobIsEnabled"
-      "TestOpenSearchIndexerPending"
-      "TestBulkProcessor"
-      "TestElasticsearchAggregation"
-      "TestElasticsearchInterfaceTestSuite"
-      "TestElasticSearchIndexerJobIsEnabled"
-      "TestElasticSearchIndexerPending"
-
-      # Broken in the sandbox.
-      "TestVersion"
-      "TestRunServerNoSystemd"
-
-      # Appear to be broken.
-      "TestSessionStore/MySQL"
-      "TestAccessControlPolicyStore/MySQL"
-      "TestAttributesStore/MySQL"
-      "TestBasicAPIPlugins"
-
-      "TestRunExportJobE2EByType"
-      "TestUpdateTeam"
-      "TestSyncSyncableRoles"
-    ]
-    ++ optionals (!stdenv.hostPlatform.isx86_64) [
-      # aarch64: invalid operating system or processor architecture
-      "TestCanIUpgradeToE0"
-
-      # aarch64: thumbnail previews are nondeterministic
-      "TestUploadFiles/multipart_Happy_image_thumbnail"
-      "TestUploadFiles/simple_Happy_image_thumbnail"
+      "TestMmctlE2ESuite/TestPluginInstallURLCmd"
+      "TestMmctlE2ESuite/TestPluginMarketplaceInstallCmd"
+      "TestMmctlE2ESuite/TestPluginMarketplaceInstallCmd"
+      "TestMmctlE2ESuite/TestPluginMarketplaceListCmd"
     ];
 
     preCheck = ''
@@ -378,7 +275,7 @@ mattermost.overrideAttrs (
 
       # Ensure we parallelize the tests, and skip the correct ones.
       # Spaces are important here due to how the Makefile works.
-      export GOFLAGS=" -parallel=$NIX_BUILD_CORES -skip='$(echo "$disabledTests" | tr ' ' '|')' "
+      export GOFLAGS=" -p=$NIX_BUILD_CORES -parallel=$NIX_BUILD_CORES -skip='$(echo "$disabledTests" | tr ' ' '|')' "
 
       # ce n'est pas un conteneur
       MMCTL_TESTFLAGS="$GOFLAGS" MM_NO_DOCKER=true make $checkTargets

From ed404818611e1e280b78c162be14ad9c5b40f344 Mon Sep 17 00:00:00 2001
From: n0099 <n@n0099.net>
Date: Tue, 28 Oct 2025 03:21:43 +0000
Subject: [PATCH 3437/6226] nixos/tor: replace `ints.between 0 65535` with
 `lib.types.ints.u16`

---
 nixos/modules/services/security/tor.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix
index 4b9b82a57e8a..f1e27cbaa256 100644
--- a/nixos/modules/services/security/tor.nix
+++ b/nixos/modules/services/security/tor.nix
@@ -795,7 +795,7 @@ in
                     };
                     options.HiddenServiceMaxStreams = lib.mkOption {
                       description = (descriptionGeneric "HiddenServiceMaxStreams");
-                      type = with lib.types; nullOr port;
+                      type = with lib.types; nullOr ints.u16;
                       default = null;
                     };
                     options.HiddenServiceMaxStreamsCloseCircuit = optionBool "HiddenServiceMaxStreamsCloseCircuit";

From 42f8f463bf9e7c36df6a9f9697101043b66a7af0 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sat, 25 Oct 2025 23:21:32 -0700
Subject: [PATCH 3438/6226] nixos/mattermost: require Postgres for version 11+

---
 nixos/modules/services/web-apps/mattermost.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/nixos/modules/services/web-apps/mattermost.nix b/nixos/modules/services/web-apps/mattermost.nix
index 39d380b4ed79..412a36c29c90 100644
--- a/nixos/modules/services/web-apps/mattermost.nix
+++ b/nixos/modules/services/web-apps/mattermost.nix
@@ -966,6 +966,13 @@ in
             or hostname, and services.mattermost.port to specify the port separately.
           '';
         }
+        {
+          # Can't use MySQL on version 11.
+          assertion = versionAtLeast cfg.package.version "11" -> cfg.database.driver == "postgres";
+          message = ''
+            Only Postgres is supported as the database driver in Mattermost 11 and later.
+          '';
+        }
       ];
     })
     (mkIf cfg.matterircd.enable {

From 788b09afc00d499af784c9f0f2ff9bcd10f678cc Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 28 Oct 2025 03:31:32 +0000
Subject: [PATCH 3439/6226] models-dev: 0-unstable-2025-10-25 ->
 0-unstable-2025-10-28

---
 pkgs/by-name/mo/models-dev/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index 6ada8f55c1ee..bb1aca4119e2 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -8,12 +8,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "models-dev";
-  version = "0-unstable-2025-10-25";
+  version = "0-unstable-2025-10-28";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "6aaec4681f415cd7c87519b4acd61720525cdda1";
-    hash = "sha256-77PoCq072udYDsplW1ENQbw/8lQqXrEiPFh2e/oAqVw=";
+    rev = "86138343a8c048caa813c17ac56fda39e92458bf";
+    hash = "sha256-VYR9Sp7AKQ6abJg1Dyhr/GyYwGgE9XcuKHLW3an5/wY=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From 301c477b66da4a9c7f18f8be1cd92e44e43d3884 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sat, 25 Oct 2025 23:21:57 -0700
Subject: [PATCH 3440/6226] tests/mattermost: don't test MySQL

MySQL was dropped from Mattermost in version 11.
---
 nixos/tests/mattermost/default.nix | 53 +-----------------------------
 1 file changed, 1 insertion(+), 52 deletions(-)

diff --git a/nixos/tests/mattermost/default.nix b/nixos/tests/mattermost/default.nix
index 2783390b9082..bc795c2f5940 100644
--- a/nixos/tests/mattermost/default.nix
+++ b/nixos/tests/mattermost/default.nix
@@ -69,27 +69,11 @@ import ../make-test-python.nix (
         )
         extraConfig
       ];
-
-    makeMysql =
-      mattermostConfig: extraConfig:
-      lib.mkMerge [
-        mattermostConfig
-        (
-          { pkgs, config, ... }:
-          {
-            services.mattermost.database = {
-              driver = lib.mkForce "mysql";
-              peerAuth = lib.mkForce true;
-            };
-          }
-        )
-        extraConfig
-      ];
   in
   {
     name = "mattermost";
 
-    nodes = rec {
+    nodes = {
       postgresMutable = makeMattermost {
         mutableConfig = true;
         preferNixConfig = false;
@@ -174,25 +158,6 @@ import ../make-test-python.nix (
           MM_SUPPORTSETTINGS_ABOUTLINK=https://nixos.org
         '';
       } { };
-
-      mysqlMutable = makeMysql postgresMutable { };
-      mysqlMostlyMutable = makeMysql postgresMostlyMutable { };
-      mysqlImmutable = makeMysql postgresImmutable {
-        # Let's try to use this on MySQL.
-        services.mattermost.database = {
-          peerAuth = lib.mkForce true;
-          user = lib.mkForce "mmuser";
-          name = lib.mkForce "mmuser";
-        };
-      };
-      mysqlEnvironmentFile = makeMysql postgresEnvironmentFile {
-        services.mattermost.environmentFile = lib.mkForce (
-          pkgs.writeText "mattermost-env" ''
-            MM_SQLSETTINGS_DATASOURCE=mattermost@unix(/run/mysqld/mysqld.sock)/mattermost?charset=utf8mb4,utf8&writeTimeout=30s
-            MM_SUPPORTSETTINGS_ABOUTLINK=https://nixos.org
-          ''
-        );
-      };
     };
 
     testScript =
@@ -567,22 +532,6 @@ import ../make-test-python.nix (
             shutdown_queue.task_done()
         threading.Thread(target=shutdown_worker, daemon=True).start()
 
-        ${pkgs.lib.optionalString pkgs.stdenv.hostPlatform.isx86_64 ''
-          # Only run the MySQL tests on x86_64 so we don't have to debug MySQL ARM issues.
-          run_mattermost_tests(
-            shutdown_queue,
-            "${nodes.mysqlMutable.system.build.toplevel}",
-            mysqlMutable,
-            "${nodes.mysqlMostlyMutable.system.build.toplevel}",
-            "${nodes.mysqlMostlyMutable.services.mattermost.pluginsBundle}",
-            mysqlMostlyMutable,
-            "${nodes.mysqlImmutable.system.build.toplevel}",
-            mysqlImmutable,
-            "${nodes.mysqlEnvironmentFile.system.build.toplevel}",
-            mysqlEnvironmentFile
-          )
-        ''}
-
         run_mattermost_tests(
           shutdown_queue,
           "${nodes.postgresMutable.system.build.toplevel}",

From f18ca51953a9de63e17f5afebae7eed84060a499 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Fri, 24 Oct 2025 00:07:37 -0700
Subject: [PATCH 3441/6226] release-notes: add mattermost details

---
 nixos/doc/manual/release-notes/rl-2511.section.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 4c32943f3e3f..0fb408ebe28c 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -375,6 +375,8 @@ and [release notes for v18](https://goteleport.com/docs/changelog/#1800-070325).
 
 - `services.gitea` supports sending notifications with sendmail again. To do this, activate the parameter `services.gitea.mailerUseSendmail` and configure SMTP server.
 
+- `services.mattermost` has been updated to use the 10.11 ESR instead of 10.5. While this shouldn't break anyone, we also now package Mattermost 11 as mattermostLatest. Note that Mattermost 11 drops support for MySQL. The Mattermost module will assertion fail if you try to use MySQL with Mattermost 11; support for using MySQL with Mattermost will fully be removed in NixOS 26.
+
 - `simplesamlphp` has been removed since the package was severely outdated, unmaintained in nixpkgs and having known vulnerabilities.
 
 - `networking.wireless.networks.<name>` now has an option to specify SSID, hence allowing duplicated SSID setup. The BSSID option is added along side with this.

From 81e21c8705544d0a3c7c93eebbfebb6b547a8dfe Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Fri, 19 Sep 2025 21:15:11 +0800
Subject: [PATCH 3442/6226] yap: fix updateScript

---
 pkgs/by-name/ya/yap/package.nix | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ya/yap/package.nix b/pkgs/by-name/ya/yap/package.nix
index eed356f397ab..5a26f327bcb4 100644
--- a/pkgs/by-name/ya/yap/package.nix
+++ b/pkgs/by-name/ya/yap/package.nix
@@ -9,7 +9,9 @@
   gmp,
   zlib,
   librdf_raptor2,
-  nix-update-script,
+  writeShellScript,
+  nix-update,
+  common-updater-scripts,
 }:
 
 stdenv.mkDerivation {
@@ -50,7 +52,13 @@ stdenv.mkDerivation {
   #     libYap.a(pl-buffer.o):/build/yap-6.3.3/H/pl-yap.h:230: first defined here
   env.NIX_CFLAGS_COMPILE = "-fpermissive -fcommon";
 
-  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+  passthru.updateScript = writeShellScript "update-yap" ''
+    ${lib.getExe nix-update} yap --version=branch
+    version=$(nix eval --raw --file . yap.version)
+    src=$(nix eval --raw --file . yap.src)
+    latestVersion=$(grep -E '^[[:space:]]*set\(YAP_(MAJOR|MINOR|PATCH)_VERSION' "$src"/CMakeLists.txt | sed -E 's/.* ([0-9]+).*/\1/' | paste -sd.)
+    ${lib.getExe' common-updater-scripts "update-source-version"} yap ''${latestVersion}-''${version#*-} --ignore-same-hash
+  '';
 
   meta = {
     # linux 32 bit build fails.

From 8ec68fd78a40d98a57bd20957169e6f9108d624f Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Fri, 19 Sep 2025 21:16:08 +0800
Subject: [PATCH 3443/6226] yap: 7.6.0-unstable-2025-05-23 ->
 8.0.1-unstable-2025-10-27

---
 pkgs/by-name/ya/yap/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yap/package.nix b/pkgs/by-name/ya/yap/package.nix
index 5a26f327bcb4..e8f14777bd45 100644
--- a/pkgs/by-name/ya/yap/package.nix
+++ b/pkgs/by-name/ya/yap/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation {
   pname = "yap";
-  version = "7.6.0-unstable-2025-05-23";
+  version = "8.0.1-unstable-2025-10-27";
 
   src = fetchFromGitHub {
     owner = "vscosta";
     repo = "yap";
-    rev = "010bb5e48d2f4fbdc0c47ae9faa830a179b3c31b";
-    hash = "sha256-ojhporq7vCEtdwCIRHwzjpc6dbFFXAgF+p6M7eL3JIE=";
+    rev = "d5ef32dec671e8d1bc7465e3d2ecdf468c568f16";
+    hash = "sha256-aNA7OV+UjdcCL5Ia2tzPgDLcn6/bzvKfdk2aWk300zk=";
   };
 
   nativeBuildInputs = [

From 338fbbb6d6c21d0e33473a98c6dc7ce1f8759e5b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 04:12:22 +0000
Subject: [PATCH 3444/6226] api-linter: 1.72.0 -> 2.0.0

---
 pkgs/by-name/ap/api-linter/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ap/api-linter/package.nix b/pkgs/by-name/ap/api-linter/package.nix
index 43d272e8c323..99fc95a94be3 100644
--- a/pkgs/by-name/ap/api-linter/package.nix
+++ b/pkgs/by-name/ap/api-linter/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "api-linter";
-  version = "1.72.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "api-linter";
     tag = "v${version}";
-    hash = "sha256-RI2JBeDeB37AhCMYpZzUKl10hcLNL5uOkMwRSBCtJG0=";
+    hash = "sha256-psyv/J1/7H8s34qqZD4s7Ls1mn2lht5VbNxZrXPC0iw=";
   };
 
-  vendorHash = "sha256-lILGYebnm3OkqsrXdElV1vDzyhVAk4iJGZrffKX9RTA=";
+  vendorHash = "sha256-IpL9RIhO9ivXKHczca4m6R6jmcNEn5KXqNxWmtU30qE=";
 
   subPackages = [ "cmd/api-linter" ];
 

From e03796297fceb265da6a8534a505654b645540fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 04:13:07 +0000
Subject: [PATCH 3445/6226] python3Packages.aiohomeconnect: 0.22.0 -> 0.23.0

---
 pkgs/development/python-modules/aiohomeconnect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohomeconnect/default.nix b/pkgs/development/python-modules/aiohomeconnect/default.nix
index d0c2d1d6243d..30704da5e25b 100644
--- a/pkgs/development/python-modules/aiohomeconnect/default.nix
+++ b/pkgs/development/python-modules/aiohomeconnect/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "aiohomeconnect";
-  version = "0.22.0";
+  version = "0.23.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "MartinHjelmare";
     repo = "aiohomeconnect";
     tag = "v${version}";
-    hash = "sha256-gLyEb4bFSmnl6PVQ+MYhVcSQ77p5w1yi2MaH1u4uoqI=";
+    hash = "sha256-W3m5LMrCLIawleAVQ32SspzkhSdArYvnSyWC1EfEnYI=";
   };
 
   build-system = [ setuptools ];

From 3df3b74864c2393d1bce319898cf200068e7c84b Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Wed, 15 Oct 2025 22:27:47 -0700
Subject: [PATCH 3446/6226] androidenv: fingerprint latest versions

The update script needs the old version present in the version file, so
give it something to use.
---
 pkgs/development/mobile/androidenv/test-suite.nix |  2 +-
 pkgs/development/mobile/androidenv/update.rb      | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/test-suite.nix b/pkgs/development/mobile/androidenv/test-suite.nix
index ad77963605f3..fe4f3b11451a 100644
--- a/pkgs/development/mobile/androidenv/test-suite.nix
+++ b/pkgs/development/mobile/androidenv/test-suite.nix
@@ -18,7 +18,7 @@ let
 in
 stdenv.mkDerivation {
   name = "androidenv-test-suite";
-  version = lib.substring 0 8 (builtins.hashFile "sha256" ./repo.json);
+  version = (lib.importJSON ./repo.json).latest.fingerprint or "0000000000000000";
   buildInputs = lib.attrValues all-tests;
 
   buildCommand = ''
diff --git a/pkgs/development/mobile/androidenv/update.rb b/pkgs/development/mobile/androidenv/update.rb
index 0b5f3be92fbc..e2d33b2e47ae 100755
--- a/pkgs/development/mobile/androidenv/update.rb
+++ b/pkgs/development/mobile/androidenv/update.rb
@@ -2,6 +2,7 @@
 #!nix-shell -i ruby -p "ruby.withPackages (ps: with ps; [ slop curb nokogiri ])"
 
 require 'json'
+require 'digest'
 require 'rubygems'
 require 'shellwords'
 require 'erb'
@@ -560,11 +561,15 @@ fixup_result = fixup(result)
 # Regular installation of Android SDK would keep the previously installed packages even if they are not
 # in the uptodate XML files, so here we try to support this logic by keeping un-available packages,
 # therefore the old packages will work as long as the links are working on the Google servers.
-output = merge input, fixup_result
+output = sort_recursively(merge(input, fixup_result))
+
+# Fingerprint the latest versions.
+fingerprint = Digest::SHA256.hexdigest(output['latest'].tap {_1.delete 'fingerprint'}.to_json)[0...16]
+output['latest']['fingerprint'] = fingerprint
 
 # Write the repository. Append a \n to keep nixpkgs Github Actions happy.
 STDERR.puts "Writing #{opts[:output]}"
-File.write opts[:output], (JSON.pretty_generate(sort_recursively(output)) + "\n")
+File.write opts[:output], (JSON.pretty_generate(output) + "\n")
 
 # Output metadata for the nixpkgs update script.
 if ENV['UPDATE_NIX_ATTR_PATH']
@@ -578,7 +583,7 @@ if ENV['UPDATE_NIX_ATTR_PATH']
 
   cur_latest.each do |k, v|
     prev = prev_latest[k]
-    if prev && prev != v
+    if k != 'fingerprint' && prev && prev != v
       old_versions << "#{k}:#{prev}"
       new_versions << "#{k}:#{v}"
       changes << "#{k}: #{prev} -> #{v}"

From e23e405abda33541c44045cf979ad150304a4c64 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Thu, 16 Oct 2025 05:37:53 +0000
Subject: [PATCH 3447/6226] androidenv: cmake: 4.1.1 -> 4.1.2; emulator:
 36.2.10 -> 36.2.12

Performed the following automatic androidenv updates:

- cmake: 4.1.1 -> 4.1.2
- emulator: 36.2.10 -> 36.2.12

Tests exited with status: 0

Last 100 lines of output:
```
/nix/store/0vb4227cmf3f6zq1skch0j9l221pzams-androidenv-test-suite
```
---
 pkgs/development/mobile/androidenv/repo.json | 1289 ++++++++++--------
 1 file changed, 734 insertions(+), 555 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/repo.json b/pkgs/development/mobile/androidenv/repo.json
index c3615b87584c..fa77a59ac54a 100644
--- a/pkgs/development/mobile/androidenv/repo.json
+++ b/pkgs/development/mobile/androidenv/repo.json
@@ -12,7 +12,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-10",
@@ -91,7 +91,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-11",
@@ -156,7 +156,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-12",
@@ -233,7 +233,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-12",
@@ -280,7 +280,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-13",
@@ -357,7 +357,7 @@
           }
         ],
         "displayName": "Google TV Addon",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-googletv-license",
         "name": "google_tv_addon",
         "path": "add-ons/addon-google_tv_addon-google-13",
@@ -404,7 +404,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-14",
@@ -483,7 +483,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-15",
@@ -576,7 +576,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-16",
@@ -669,7 +669,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-17",
@@ -762,7 +762,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-18",
@@ -855,7 +855,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-19",
@@ -948,7 +948,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-21",
@@ -1041,7 +1041,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-22",
@@ -1134,7 +1134,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-23",
@@ -1227,7 +1227,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-24",
@@ -1320,7 +1320,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-25",
@@ -1413,7 +1413,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-3",
@@ -1478,7 +1478,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-4",
@@ -1543,7 +1543,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-5",
@@ -1608,7 +1608,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-6",
@@ -1673,7 +1673,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-7",
@@ -1738,7 +1738,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-8",
@@ -1803,7 +1803,7 @@
           }
         ],
         "displayName": "Google APIs",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "google_apis",
         "path": "add-ons/addon-google_apis-google-9",
@@ -1869,7 +1869,7 @@
         }
       ],
       "displayName": "Android Support Repository",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-android-m2repository",
       "path": "extras/android/m2repository",
@@ -1900,7 +1900,7 @@
         }
       ],
       "displayName": "Android Emulator hypervisor driver (installer)",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-Android_Emulator_Hypervisor_Driver",
       "path": "extras/google/Android_Emulator_Hypervisor_Driver",
@@ -1931,7 +1931,7 @@
         }
       ],
       "displayName": "Google AdMob Ads SDK",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-admob_ads_sdk",
       "path": "extras/google/admob_ads_sdk",
@@ -1960,7 +1960,7 @@
         }
       ],
       "displayName": "Google Analytics App Tracking SDK",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-analytics_sdk_v2",
       "path": "extras/google/analytics_sdk_v2",
@@ -2010,7 +2010,7 @@
         }
       ],
       "displayName": "Android Auto Desktop Head Unit Emulator",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-auto",
       "path": "extras/google/auto",
@@ -2036,7 +2036,7 @@
         }
       ],
       "displayName": "Google Cloud Messaging for Android Library",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-gcm",
       "path": "extras/google/gcm",
@@ -2072,7 +2072,7 @@
         }
       },
       "displayName": "Google Play services",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services",
       "path": "extras/google/google_play_services",
@@ -2101,7 +2101,7 @@
         }
       ],
       "displayName": "Google Play services for Froyo",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-google_play_services_froyo",
       "path": "extras/google/google_play_services_froyo",
@@ -2130,7 +2130,7 @@
         }
       ],
       "displayName": "Google Play Instant Development SDK (Deprecated)",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-instantapps",
       "path": "extras/google/instantapps",
@@ -2168,7 +2168,7 @@
         }
       },
       "displayName": "Google Repository",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-m2repository",
       "path": "extras/google/m2repository",
@@ -2197,7 +2197,7 @@
         }
       ],
       "displayName": "Google Play APK Expansion library",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-market_apk_expansion",
       "path": "extras/google/market_apk_expansion",
@@ -2226,7 +2226,7 @@
         }
       ],
       "displayName": "Google Play Licensing Library",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-market_licensing",
       "path": "extras/google/market_licensing",
@@ -2256,7 +2256,7 @@
         }
       ],
       "displayName": "Android Auto API Simulators",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-simulators",
       "path": "extras/google/simulators",
@@ -2285,7 +2285,7 @@
         }
       ],
       "displayName": "Google USB Driver",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-usb_driver",
       "path": "extras/google/usb_driver",
@@ -2314,7 +2314,7 @@
         }
       ],
       "displayName": "Google Web Driver",
-      "last-available-day": 20369,
+      "last-available-day": 20377,
       "license": "android-sdk-license",
       "name": "extras-google-webdriver",
       "path": "extras/google/webdriver",
@@ -2984,7 +2984,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-10-default-armeabi-v7a",
           "path": "system-images/android-10/default/armeabi-v7a",
@@ -3030,7 +3030,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-10-default-x86",
           "path": "system-images/android-10/default/x86",
@@ -3078,7 +3078,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-armeabi-v7a",
           "path": "system-images/android-10/google_apis/armeabi-v7a",
@@ -3130,7 +3130,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-10-google_apis-x86",
           "path": "system-images/android-10/google_apis/x86",
@@ -3179,7 +3179,7 @@
             }
           ],
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-14-default-armeabi-v7a",
           "path": "system-images/android-14/default/armeabi-v7a",
@@ -3229,7 +3229,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-15-default-armeabi-v7a",
           "path": "system-images/android-15/default/armeabi-v7a",
@@ -3275,7 +3275,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-15-default-x86",
           "path": "system-images/android-15/default/x86",
@@ -3323,7 +3323,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-armeabi-v7a",
           "path": "system-images/android-15/google_apis/armeabi-v7a",
@@ -3375,7 +3375,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-15-google_apis-x86",
           "path": "system-images/android-15/google_apis/x86",
@@ -3431,7 +3431,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-16-default-armeabi-v7a",
           "path": "system-images/android-16/default/armeabi-v7a",
@@ -3470,7 +3470,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "mips-android-sysimage-license",
           "name": "system-image-16-default-mips",
           "path": "system-images/android-16/default/mips",
@@ -3516,7 +3516,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-16-default-x86",
           "path": "system-images/android-16/default/x86",
@@ -3564,7 +3564,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-armeabi-v7a",
           "path": "system-images/android-16/google_apis/armeabi-v7a",
@@ -3616,7 +3616,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-16-google_apis-x86",
           "path": "system-images/android-16/google_apis/x86",
@@ -3672,7 +3672,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-17-default-armeabi-v7a",
           "path": "system-images/android-17/default/armeabi-v7a",
@@ -3711,7 +3711,7 @@
             }
           ],
           "displayName": "MIPS System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "mips-android-sysimage-license",
           "name": "system-image-17-default-mips",
           "path": "system-images/android-17/default/mips",
@@ -3757,7 +3757,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-17-default-x86",
           "path": "system-images/android-17/default/x86",
@@ -3811,7 +3811,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-armeabi-v7a",
           "path": "system-images/android-17/google_apis/armeabi-v7a",
@@ -3863,7 +3863,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-17-google_apis-x86",
           "path": "system-images/android-17/google_apis/x86",
@@ -3919,7 +3919,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-18-default-armeabi-v7a",
           "path": "system-images/android-18/default/armeabi-v7a",
@@ -3965,7 +3965,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-18-default-x86",
           "path": "system-images/android-18/default/x86",
@@ -4013,7 +4013,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-armeabi-v7a",
           "path": "system-images/android-18/google_apis/armeabi-v7a",
@@ -4065,7 +4065,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-18-google_apis-x86",
           "path": "system-images/android-18/google_apis/x86",
@@ -4121,7 +4121,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-19-default-armeabi-v7a",
           "path": "system-images/android-19/default/armeabi-v7a",
@@ -4167,7 +4167,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-19-default-x86",
           "path": "system-images/android-19/default/x86",
@@ -4215,7 +4215,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-armeabi-v7a",
           "path": "system-images/android-19/google_apis/armeabi-v7a",
@@ -4267,7 +4267,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-19-google_apis-x86",
           "path": "system-images/android-19/google_apis/x86",
@@ -4316,7 +4316,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-armeabi-v7a",
           "path": "system-images/android-21/android-tv/armeabi-v7a",
@@ -4353,7 +4353,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-21-android-tv-x86",
           "path": "system-images/android-21/android-tv/x86",
@@ -4392,7 +4392,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-21-default-arm64-v8a",
           "path": "system-images/android-21/default/arm64-v8a",
@@ -4438,7 +4438,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-21-default-armeabi-v7a",
           "path": "system-images/android-21/default/armeabi-v7a",
@@ -4484,7 +4484,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86",
           "path": "system-images/android-21/default/x86",
@@ -4530,7 +4530,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-21-default-x86_64",
           "path": "system-images/android-21/default/x86_64",
@@ -4571,7 +4571,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-arm64-v8a",
           "path": "system-images/android-21/google_apis/arm64-v8a",
@@ -4623,7 +4623,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-armeabi-v7a",
           "path": "system-images/android-21/google_apis/armeabi-v7a",
@@ -4675,7 +4675,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86",
           "path": "system-images/android-21/google_apis/x86",
@@ -4727,7 +4727,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-21-google_apis-x86_64",
           "path": "system-images/android-21/google_apis/x86_64",
@@ -4776,7 +4776,7 @@
             }
           ],
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-22-android-tv-x86",
           "path": "system-images/android-22/android-tv/x86",
@@ -4815,7 +4815,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-22-default-arm64-v8a",
           "path": "system-images/android-22/default/arm64-v8a",
@@ -4861,7 +4861,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-22-default-armeabi-v7a",
           "path": "system-images/android-22/default/armeabi-v7a",
@@ -4907,7 +4907,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86",
           "path": "system-images/android-22/default/x86",
@@ -4953,7 +4953,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-22-default-x86_64",
           "path": "system-images/android-22/default/x86_64",
@@ -4994,7 +4994,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-arm64-v8a",
           "path": "system-images/android-22/google_apis/arm64-v8a",
@@ -5046,7 +5046,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-armeabi-v7a",
           "path": "system-images/android-22/google_apis/armeabi-v7a",
@@ -5098,7 +5098,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86",
           "path": "system-images/android-22/google_apis/x86",
@@ -5150,7 +5150,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-22-google_apis-x86_64",
           "path": "system-images/android-22/google_apis/x86_64",
@@ -5199,7 +5199,7 @@
             }
           ],
           "displayName": "Android TV ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-armeabi-v7a",
           "path": "system-images/android-23/android-tv/armeabi-v7a",
@@ -5243,7 +5243,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-23-android-tv-x86",
           "path": "system-images/android-23/android-tv/x86",
@@ -5282,7 +5282,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-23-default-arm64-v8a",
           "path": "system-images/android-23/default/arm64-v8a",
@@ -5328,7 +5328,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-23-default-armeabi-v7a",
           "path": "system-images/android-23/default/armeabi-v7a",
@@ -5374,7 +5374,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86",
           "path": "system-images/android-23/default/x86",
@@ -5420,7 +5420,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-23-default-x86_64",
           "path": "system-images/android-23/default/x86_64",
@@ -5461,7 +5461,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-arm64-v8a",
           "path": "system-images/android-23/google_apis/arm64-v8a",
@@ -5513,7 +5513,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-armeabi-v7a",
           "path": "system-images/android-23/google_apis/armeabi-v7a",
@@ -5565,7 +5565,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86",
           "path": "system-images/android-23/google_apis/x86",
@@ -5617,7 +5617,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-23-google_apis-x86_64",
           "path": "system-images/android-23/google_apis/x86_64",
@@ -5673,7 +5673,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-24-android-tv-x86",
           "path": "system-images/android-24/android-tv/x86",
@@ -5712,7 +5712,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-24-default-arm64-v8a",
           "path": "system-images/android-24/default/arm64-v8a",
@@ -5758,7 +5758,7 @@
             }
           },
           "displayName": "ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-24-default-armeabi-v7a",
           "path": "system-images/android-24/default/armeabi-v7a",
@@ -5804,7 +5804,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86",
           "path": "system-images/android-24/default/x86",
@@ -5850,7 +5850,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-24-default-x86_64",
           "path": "system-images/android-24/default/x86_64",
@@ -5898,7 +5898,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-arm64-v8a",
           "path": "system-images/android-24/google_apis/arm64-v8a",
@@ -5950,7 +5950,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86",
           "path": "system-images/android-24/google_apis/x86",
@@ -6002,7 +6002,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis-x86_64",
           "path": "system-images/android-24/google_apis/x86_64",
@@ -6056,7 +6056,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-24-google_apis_playstore-x86",
           "path": "system-images/android-24/google_apis_playstore/x86",
@@ -6112,7 +6112,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-android-tv-x86",
           "path": "system-images/android-25/android-tv/x86",
@@ -6158,7 +6158,7 @@
             }
           },
           "displayName": "Android Wear ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-armeabi-v7a",
           "path": "system-images/android-25/android-wear/armeabi-v7a",
@@ -6202,7 +6202,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-android-wear-x86",
           "path": "system-images/android-25/android-wear/x86",
@@ -6241,7 +6241,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-default-arm64-v8a",
           "path": "system-images/android-25/default/arm64-v8a",
@@ -6287,7 +6287,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86",
           "path": "system-images/android-25/default/x86",
@@ -6333,7 +6333,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-default-x86_64",
           "path": "system-images/android-25/default/x86_64",
@@ -6374,7 +6374,7 @@
             }
           ],
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-arm64-v8a",
           "path": "system-images/android-25/google_apis/arm64-v8a",
@@ -6426,7 +6426,7 @@
             }
           },
           "displayName": "Google APIs ARM EABI v7a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-armeabi-v7a",
           "path": "system-images/android-25/google_apis/armeabi-v7a",
@@ -6478,7 +6478,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86",
           "path": "system-images/android-25/google_apis/x86",
@@ -6530,7 +6530,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis-x86_64",
           "path": "system-images/android-25/google_apis/x86_64",
@@ -6584,7 +6584,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-25-google_apis_playstore-x86",
           "path": "system-images/android-25/google_apis_playstore/x86",
@@ -6655,7 +6655,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-android-tv-x86",
           "path": "system-images/android-26/android-tv/x86",
@@ -6701,7 +6701,7 @@
             }
           },
           "displayName": "Android Wear Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-26-android-wear-x86",
           "path": "system-images/android-26/android-wear/x86",
@@ -6752,7 +6752,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-26-default-arm64-v8a",
           "path": "system-images/android-26/default/arm64-v8a",
@@ -6796,7 +6796,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86",
           "path": "system-images/android-26/default/x86",
@@ -6840,7 +6840,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-26-default-x86_64",
           "path": "system-images/android-26/default/x86_64",
@@ -6891,7 +6891,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-arm64-v8a",
           "path": "system-images/android-26/google_apis/arm64-v8a",
@@ -6958,7 +6958,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86",
           "path": "system-images/android-26/google_apis/x86",
@@ -7025,7 +7025,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-26-google_apis-x86_64",
           "path": "system-images/android-26/google_apis/x86_64",
@@ -7094,7 +7094,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-26-google_apis_playstore-x86",
           "path": "system-images/android-26/google_apis_playstore/x86",
@@ -7150,7 +7150,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-27-android-tv-x86",
           "path": "system-images/android-27/android-tv/x86",
@@ -7201,7 +7201,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-27-default-arm64-v8a",
           "path": "system-images/android-27/default/arm64-v8a",
@@ -7245,7 +7245,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86",
           "path": "system-images/android-27/default/x86",
@@ -7289,7 +7289,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-27-default-x86_64",
           "path": "system-images/android-27/default/x86_64",
@@ -7340,7 +7340,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-arm64-v8a",
           "path": "system-images/android-27/google_apis/arm64-v8a",
@@ -7407,7 +7407,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis-x86",
           "path": "system-images/android-27/google_apis/x86",
@@ -7476,7 +7476,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-27-google_apis_playstore-x86",
           "path": "system-images/android-27/google_apis_playstore/x86",
@@ -7537,7 +7537,7 @@
             }
           },
           "displayName": "Automotive Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-28-android-automotive-playstore-x86",
           "path": "system-images/android-28/android-automotive-playstore/x86",
@@ -7582,7 +7582,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-android-tv-x86",
           "path": "system-images/android-28/android-tv/x86",
@@ -7628,7 +7628,7 @@
             }
           },
           "displayName": "Wear OS Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-28-android-wear-x86",
           "path": "system-images/android-28/android-wear/x86",
@@ -7679,7 +7679,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-28-default-arm64-v8a",
           "path": "system-images/android-28/default/arm64-v8a",
@@ -7716,7 +7716,7 @@
             }
           ],
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86",
           "path": "system-images/android-28/default/x86",
@@ -7753,7 +7753,7 @@
             }
           ],
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-28-default-x86_64",
           "path": "system-images/android-28/default/x86_64",
@@ -7804,7 +7804,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-arm64-v8a",
           "path": "system-images/android-28/google_apis/arm64-v8a",
@@ -7871,7 +7871,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis-x86",
           "path": "system-images/android-28/google_apis/x86",
@@ -7938,7 +7938,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis-x86_64",
           "path": "system-images/android-28/google_apis/x86_64",
@@ -7997,7 +7997,7 @@
             }
           },
           "displayName": "Google ARM64-V8a Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-28-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-28/google_apis_playstore/arm64-v8a",
@@ -8064,7 +8064,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86",
           "path": "system-images/android-28/google_apis_playstore/x86",
@@ -8131,7 +8131,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-28-google_apis_playstore-x86_64",
           "path": "system-images/android-28/google_apis_playstore/x86_64",
@@ -8192,7 +8192,7 @@
             }
           },
           "displayName": "Automotive with Play Store Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-29-android-automotive-playstore-x86",
           "path": "system-images/android-29/android-automotive-playstore/x86",
@@ -8252,7 +8252,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-29-android-tv-x86",
           "path": "system-images/android-29/android-tv/x86",
@@ -8291,7 +8291,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-29-default-arm64-v8a",
           "path": "system-images/android-29/default/arm64-v8a",
@@ -8354,7 +8354,7 @@
             }
           },
           "displayName": "Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86",
           "path": "system-images/android-29/default/x86",
@@ -8417,7 +8417,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-29-default-x86_64",
           "path": "system-images/android-29/default/x86_64",
@@ -8468,7 +8468,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-29-google_apis-arm64-v8a",
           "path": "system-images/android-29/google_apis/arm64-v8a",
@@ -8525,7 +8525,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86",
           "path": "system-images/android-29/google_apis/x86",
@@ -8582,7 +8582,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis-x86_64",
           "path": "system-images/android-29/google_apis/x86_64",
@@ -8641,7 +8641,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-29-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-29/google_apis_playstore/arm64-v8a",
@@ -8722,7 +8722,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86",
           "path": "system-images/android-29/google_apis_playstore/x86",
@@ -8803,7 +8803,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-29-google_apis_playstore-x86_64",
           "path": "system-images/android-29/google_apis_playstore/x86_64",
@@ -8864,7 +8864,7 @@
             }
           },
           "displayName": "Automotive with Play Store Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-30-android-automotive-playstore-x86_64",
           "path": "system-images/android-30/android-automotive-playstore/x86_64",
@@ -8924,7 +8924,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-30-android-tv-x86",
           "path": "system-images/android-30/android-tv/x86",
@@ -8970,7 +8970,7 @@
             }
           },
           "displayName": "China version of Wear OS 3 ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-arm64-v8a",
           "path": "system-images/android-30/android-wear-cn/arm64-v8a",
@@ -9014,7 +9014,7 @@
             }
           },
           "displayName": "China version of Wear OS 3 Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-30-android-wear-x86",
           "path": "system-images/android-30/android-wear-cn/x86",
@@ -9053,7 +9053,7 @@
             }
           ],
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-30-default-arm64-v8a",
           "path": "system-images/android-30/default/arm64-v8a",
@@ -9102,7 +9102,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-30-default-x86_64",
           "path": "system-images/android-30/default/x86_64",
@@ -9153,7 +9153,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis-arm64-v8a",
           "path": "system-images/android-30/google_apis/arm64-v8a",
@@ -9220,7 +9220,7 @@
             }
           },
           "displayName": "Google APIs Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86",
           "path": "system-images/android-30/google_apis/x86",
@@ -9287,7 +9287,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis-x86_64",
           "path": "system-images/android-30/google_apis/x86_64",
@@ -9353,7 +9353,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-30/google_apis_playstore/arm64-v8a",
@@ -9434,7 +9434,7 @@
             }
           },
           "displayName": "Google Play Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-30-google_apis_playstore-x86",
           "path": "system-images/android-30/google_apis_playstore/x86",
@@ -9515,7 +9515,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-30-google_apis_playstore-x86_64",
           "path": "system-images/android-30/google_apis_playstore/x86_64",
@@ -9586,7 +9586,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-arm64-v8a",
           "path": "system-images/android-31/android-tv/arm64-v8a",
@@ -9645,7 +9645,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-31-android-tv-x86",
           "path": "system-images/android-31/android-tv/x86",
@@ -9696,7 +9696,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-31-default-arm64-v8a",
           "path": "system-images/android-31/default/arm64-v8a",
@@ -9745,7 +9745,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-31-default-x86_64",
           "path": "system-images/android-31/default/x86_64",
@@ -9806,7 +9806,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis-arm64-v8a",
           "path": "system-images/android-31/google_apis/arm64-v8a",
@@ -9873,7 +9873,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-31-google_apis-x86_64",
           "path": "system-images/android-31/google_apis/x86_64",
@@ -9949,7 +9949,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-31/google_apis_playstore/arm64-v8a",
@@ -10016,7 +10016,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-31-google_apis_playstore-x86_64",
           "path": "system-images/android-31/google_apis_playstore/x86_64",
@@ -10077,7 +10077,7 @@
             }
           },
           "displayName": "Android Automotive with Google Play arm64-v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-android-automotive-playstore-arm64-v8a",
           "path": "system-images/android-32/android-automotive-playstore/arm64-v8a",
@@ -10130,7 +10130,7 @@
             }
           },
           "displayName": "Android Automotive with Google Play x86_64 System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-android-automotive-playstore-x86_64",
           "path": "system-images/android-32/android-automotive-playstore/x86_64",
@@ -10185,7 +10185,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-32-default-arm64-v8a",
           "path": "system-images/android-32/default/arm64-v8a",
@@ -10234,7 +10234,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-32-default-x86_64",
           "path": "system-images/android-32/default/x86_64",
@@ -10295,7 +10295,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-32-google_apis-arm64-v8a",
           "path": "system-images/android-32/google_apis/arm64-v8a",
@@ -10362,7 +10362,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis-x86_64",
           "path": "system-images/android-32/google_apis/x86_64",
@@ -10438,7 +10438,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-32-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-32/google_apis_playstore/arm64-v8a",
@@ -10519,7 +10519,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-32-google_apis_playstore-x86_64",
           "path": "system-images/android-32/google_apis_playstore/x86_64",
@@ -10580,7 +10580,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-33-android-automotive-arm64-v8a",
           "path": "system-images/android-33/android-automotive/arm64-v8a",
@@ -10633,7 +10633,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-33-android-automotive-x86_64",
           "path": "system-images/android-33/android-automotive/x86_64",
@@ -10698,7 +10698,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-arm64-v8a",
           "path": "system-images/android-33/android-tv/arm64-v8a",
@@ -10757,7 +10757,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-33-android-tv-x86",
           "path": "system-images/android-33/android-tv/x86",
@@ -10803,7 +10803,7 @@
             }
           },
           "displayName": "Wear OS 4 ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-33-android-wear-arm64-v8a",
           "path": "system-images/android-33/android-wear/arm64-v8a",
@@ -10847,7 +10847,7 @@
             }
           },
           "displayName": "Wear OS 4 Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-33-android-wear-x86_64",
           "path": "system-images/android-33/android-wear/x86_64",
@@ -10898,7 +10898,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-33-default-arm64-v8a",
           "path": "system-images/android-33/default/arm64-v8a",
@@ -10947,7 +10947,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-33-default-x86_64",
           "path": "system-images/android-33/default/x86_64",
@@ -11008,7 +11008,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33-google_apis-arm64-v8a",
           "path": "system-images/android-33/google_apis/arm64-v8a",
@@ -11075,7 +11075,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis-x86_64",
           "path": "system-images/android-33/google_apis/x86_64",
@@ -11144,7 +11144,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-33/google_apis_playstore/arm64-v8a",
@@ -11211,7 +11211,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-33-google_apis_playstore-x86_64",
           "path": "system-images/android-33/google_apis_playstore/x86_64",
@@ -11286,7 +11286,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-33x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-33-ext4/google_apis_playstore/arm64-v8a",
@@ -11335,7 +11335,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-33x-google_apis_playstore-x86_64",
           "path": "system-images/android-33-ext4/google_apis_playstore/x86_64",
@@ -11398,7 +11398,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-arm64-v8a",
           "path": "system-images/android-34/android-tv/arm64-v8a",
@@ -11458,7 +11458,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34-android-tv-x86",
           "path": "system-images/android-34/android-tv/x86",
@@ -11498,7 +11498,7 @@
             }
           ],
           "displayName": "Wear OS 5 ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-arm64-v8a",
           "path": "system-images/android-34/android-wear/arm64-v8a",
@@ -11535,7 +11535,7 @@
             }
           ],
           "displayName": "Wear OS 5 Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34-android-wear-x86_64",
           "path": "system-images/android-34/android-wear/x86_64",
@@ -11586,7 +11586,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34-default-arm64-v8a",
           "path": "system-images/android-34/default/arm64-v8a",
@@ -11635,7 +11635,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34-default-x86_64",
           "path": "system-images/android-34/default/x86_64",
@@ -11696,7 +11696,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis-arm64-v8a",
           "path": "system-images/android-34/google_apis/arm64-v8a",
@@ -11764,7 +11764,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis-x86_64",
           "path": "system-images/android-34/google_apis/x86_64",
@@ -11834,7 +11834,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-34/google_apis_playstore/arm64-v8a",
@@ -11903,7 +11903,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34-google_apis_playstore-x86_64",
           "path": "system-images/android-34/google_apis_playstore/x86_64",
@@ -11966,7 +11966,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs arm64-v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34x-android-automotive-arm64-v8a",
           "path": "system-images/android-34-ext9/android-automotive/arm64-v8a",
@@ -12019,7 +12019,7 @@
             }
           },
           "displayName": "Android Automotive with Google APIs x86_64 System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34x-android-automotive-x86_64",
           "path": "system-images/android-34-ext9/android-automotive/x86_64",
@@ -12088,7 +12088,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-34x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-34-ext12/google_apis_playstore/arm64-v8a",
@@ -12137,7 +12137,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-34x-google_apis_playstore-x86_64",
           "path": "system-images/android-34-ext12/google_apis_playstore/x86_64",
@@ -12178,7 +12178,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 - Preview ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-35-android-wear-arm64-v8a",
           "path": "system-images/android-35/android-wear/arm64-v8a",
@@ -12210,7 +12210,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 - Preview Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-35-android-wear-x86_64",
           "path": "system-images/android-35/android-wear/x86_64",
@@ -12256,7 +12256,7 @@
             }
           },
           "displayName": "ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-35-default-arm64-v8a",
           "path": "system-images/android-35/default/arm64-v8a",
@@ -12301,7 +12301,7 @@
             }
           },
           "displayName": "Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-35-default-x86_64",
           "path": "system-images/android-35/default/x86_64",
@@ -12348,7 +12348,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis-arm64-v8a",
           "path": "system-images/android-35/google_apis/arm64-v8a",
@@ -12406,7 +12406,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis-x86_64",
           "path": "system-images/android-35/google_apis/x86_64",
@@ -12466,7 +12466,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-35/google_apis_playstore/arm64-v8a",
@@ -12524,7 +12524,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-35-google_apis_playstore-x86_64",
           "path": "system-images/android-35/google_apis_playstore/x86_64",
@@ -12584,7 +12584,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35-page_size_16kb-arm64-v8a",
           "path": "system-images/android-35/google_apis_playstore_ps16k/arm64-v8a",
@@ -12646,7 +12646,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-35-page_size_16kb-x86_64",
           "path": "system-images/android-35/google_apis_playstore_ps16k/x86_64",
@@ -12700,7 +12700,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-wear-arm64-v8a",
           "path": "system-images/android-35-ext15/android-wear/arm64-v8a",
@@ -12733,7 +12733,7 @@
             }
           ],
           "displayName": "Wear OS 5.1 Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-35x-android-wear-x86_64",
           "path": "system-images/android-35-ext15/android-wear/x86_64",
@@ -12780,7 +12780,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35x-google_apis-arm64-v8a",
           "path": "system-images/android-35-ext15/google_apis/arm64-v8a",
@@ -12829,7 +12829,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-35x-google_apis-x86_64",
           "path": "system-images/android-35-ext15/google_apis/x86_64",
@@ -12880,7 +12880,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-35x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-35-ext15/google_apis_playstore/arm64-v8a",
@@ -12929,7 +12929,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-35x-google_apis_playstore-x86_64",
           "path": "system-images/android-35-ext15/google_apis_playstore/x86_64",
@@ -12982,7 +12982,7 @@
             }
           },
           "displayName": "Android TV ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36-android-tv-arm64-v8a",
           "path": "system-images/android-36/android-tv/arm64-v8a",
@@ -13027,7 +13027,7 @@
             }
           },
           "displayName": "Android TV Intel x86 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36-android-tv-x86",
           "path": "system-images/android-36/android-tv/x86",
@@ -13062,7 +13062,7 @@
             }
           ],
           "displayName": "Wear OS 6.0 ARM 64 v8a System Image (signed)",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36-android-wear-arm64-v8a",
           "path": "system-images/android-36/android-wear-signed/arm64-v8a",
@@ -13095,7 +13095,7 @@
             }
           ],
           "displayName": "Wear OS 6.0 Intel x86_64 Atom System Image (signed)",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36-android-wear-x86_64",
           "path": "system-images/android-36/android-wear-signed/x86_64",
@@ -13142,7 +13142,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-google_apis-arm64-v8a",
           "path": "system-images/android-36/google_apis/arm64-v8a",
@@ -13191,7 +13191,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36-google_apis-x86_64",
           "path": "system-images/android-36/google_apis/x86_64",
@@ -13242,7 +13242,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36/google_apis_playstore/arm64-v8a",
@@ -13291,7 +13291,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36-google_apis_playstore-x86_64",
           "path": "system-images/android-36/google_apis_playstore/x86_64",
@@ -13342,7 +13342,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36-page_size_16kb-arm64-v8a",
           "path": "system-images/android-36/google_apis_playstore_ps16k/arm64-v8a",
@@ -13395,7 +13395,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36-page_size_16kb-x86_64",
           "path": "system-images/android-36/google_apis_playstore_ps16k/x86_64",
@@ -13434,9 +13434,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "818b27a07b6e851ddd305139f967fa11111502a3",
-              "size": 1933295305,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-36.1_r02.zip"
+              "sha1": "4b3c296dfa125a03944317da5c3b9c852e384a95",
+              "size": 1931618675,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-36.1_r03.zip"
             }
           ],
           "dependencies": {
@@ -13452,13 +13452,13 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36.1-google_apis-arm64-v8a",
           "path": "system-images/android-36.1/google_apis/arm64-v8a",
           "revision": "36.1-google_apis-arm64-v8a",
           "revision-details": {
-            "major:0": "2"
+            "major:0": "3"
           },
           "type-details": {
             "abi:5": "arm64-v8a",
@@ -13483,9 +13483,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "269ca25dc3511e2a6bdcaf457734b585807af485",
-              "size": 1965091162,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-36.1_r02.zip"
+              "sha1": "e7c2ee3e0efcdc79e13b8c40d93629c83741c143",
+              "size": 1958060347,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis/x86_64-36.1_r03.zip"
             }
           ],
           "dependencies": {
@@ -13501,13 +13501,13 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36.1-google_apis-x86_64",
           "path": "system-images/android-36.1/google_apis/x86_64",
           "revision": "36.1-google_apis-x86_64",
           "revision-details": {
-            "major:0": "2"
+            "major:0": "3"
           },
           "type-details": {
             "abi:5": "x86_64",
@@ -13534,9 +13534,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "e829404c284fa09105b89e66e3aceeb1fac9a60c",
-              "size": 1960800700,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-36.1_r02.zip"
+              "sha1": "240c7164dd250be3c096dd62801e96f7b144bc2f",
+              "size": 1955944487,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-36.1_r03.zip"
             }
           ],
           "dependencies": {
@@ -13552,13 +13552,13 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36.1-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36.1/google_apis_playstore/arm64-v8a",
           "revision": "36.1-google_apis_playstore-arm64-v8a",
           "revision-details": {
-            "major:0": "2"
+            "major:0": "3"
           },
           "type-details": {
             "abi:5": "arm64-v8a",
@@ -13583,9 +13583,9 @@
             {
               "arch": "all",
               "os": "all",
-              "sha1": "6c0cacff6e3e3021dedd8f80cd302d09dba354e3",
-              "size": 2008752086,
-              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-36.1_r02.zip"
+              "sha1": "4931dd84c74db66b29c934b313d407faf3298921",
+              "size": 1998865059,
+              "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-36.1_r03.zip"
             }
           ],
           "dependencies": {
@@ -13601,13 +13601,13 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36.1-google_apis_playstore-x86_64",
           "path": "system-images/android-36.1/google_apis_playstore/x86_64",
           "revision": "36.1-google_apis_playstore-x86_64",
           "revision-details": {
-            "major:0": "2"
+            "major:0": "3"
           },
           "type-details": {
             "abi:5": "x86_64",
@@ -13652,7 +13652,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36.1-page_size_16kb-arm64-v8a",
           "path": "system-images/android-36.1/google_apis_playstore_ps16k/arm64-v8a",
@@ -13705,7 +13705,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36.1-page_size_16kb-x86_64",
           "path": "system-images/android-36.1/google_apis_playstore_ps16k/x86_64",
@@ -13762,7 +13762,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36x-google_apis-arm64-v8a",
           "path": "system-images/android-36-ext19/google_apis/arm64-v8a",
@@ -13811,7 +13811,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36x-google_apis-x86_64",
           "path": "system-images/android-36-ext19/google_apis/x86_64",
@@ -13862,7 +13862,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-36x-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36-ext19/google_apis_playstore/arm64-v8a",
@@ -13911,7 +13911,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-36x-google_apis_playstore-x86_64",
           "path": "system-images/android-36-ext19/google_apis_playstore/x86_64",
@@ -13964,7 +13964,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-google_apis-arm64-v8a",
           "path": "system-images/android-36.0-Baklava/google_apis/arm64-v8a",
@@ -14014,7 +14014,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-google_apis-x86_64",
           "path": "system-images/android-36.0-Baklava/google_apis/x86_64",
@@ -14066,7 +14066,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore/arm64-v8a",
@@ -14116,7 +14116,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-google_apis_playstore-x86_64",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore/x86_64",
@@ -14168,7 +14168,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-Baklava-page_size_16kb-arm64-v8a",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore_ps16k/arm64-v8a",
@@ -14222,7 +14222,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-license",
           "name": "system-image-Baklava-page_size_16kb-x86_64",
           "path": "system-images/android-36.0-Baklava/google_apis_playstore_ps16k/x86_64",
@@ -14280,7 +14280,7 @@
             }
           },
           "displayName": "Google APIs ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CANARY-google_apis-arm64-v8a",
           "path": "system-images/android-CANARY/google_apis/arm64-v8a",
@@ -14330,7 +14330,7 @@
             }
           },
           "displayName": "Google APIs Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-CANARY-google_apis-x86_64",
           "path": "system-images/android-CANARY/google_apis/x86_64",
@@ -14382,7 +14382,7 @@
             }
           },
           "displayName": "Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CANARY-google_apis_playstore-arm64-v8a",
           "path": "system-images/android-CANARY/google_apis_playstore/arm64-v8a",
@@ -14432,7 +14432,7 @@
             }
           },
           "displayName": "Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-CANARY-google_apis_playstore-x86_64",
           "path": "system-images/android-CANARY/google_apis_playstore/x86_64",
@@ -14484,7 +14484,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play ARM 64 v8a System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-arm-dbt-license",
           "name": "system-image-CANARY-page_size_16kb-arm64-v8a",
           "path": "system-images/android-CANARY/google_apis_playstore_ps16k/arm64-v8a",
@@ -14538,7 +14538,7 @@
             }
           },
           "displayName": "Pre-Release 16 KB Page Size Google Play Intel x86_64 Atom System Image",
-          "last-available-day": 20369,
+          "last-available-day": 20377,
           "license": "android-sdk-preview-license",
           "name": "system-image-CANARY-page_size_16kb-x86_64",
           "path": "system-images/android-CANARY/google_apis_playstore_ps16k/x86_64",
@@ -15146,16 +15146,17 @@
   },
   "latest": {
     "build-tools": "36.1.0",
-    "cmake": "4.1.1",
+    "cmake": "4.1.2",
     "cmdline-tools": "19.0",
-    "emulator": "36.2.10",
+    "emulator": "36.2.12",
     "ndk": "29.0.14206865",
     "ndk-bundle": "22.1.7171670",
     "platform-tools": "36.0.0",
     "platforms": "36.1",
     "skiaparser": "8",
     "sources": "36.1",
-    "tools": "26.1.1"
+    "tools": "26.1.1",
+    "fingerprint": "8eb220e182767bf0"
   },
   "licenses": {
     "android-googletv-license": [
@@ -15220,7 +15221,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 17",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15269,7 +15270,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15318,7 +15319,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15367,7 +15368,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 18.1.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15416,7 +15417,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15465,7 +15466,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15514,7 +15515,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15563,7 +15564,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15612,7 +15613,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 19.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/19.1.0",
@@ -15660,7 +15661,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 20",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/20.0.0",
@@ -15708,7 +15709,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15757,7 +15758,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15806,7 +15807,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15855,7 +15856,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15904,7 +15905,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -15953,7 +15954,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 21.1.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/21.1.2",
@@ -16001,7 +16002,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16050,7 +16051,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 22.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/22.0.1",
@@ -16098,7 +16099,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -16147,7 +16148,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.1",
@@ -16195,7 +16196,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.2",
@@ -16243,7 +16244,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 23.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/23.0.3",
@@ -16291,7 +16292,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.0",
@@ -16339,7 +16340,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.1",
@@ -16387,7 +16388,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.2",
@@ -16435,7 +16436,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 24.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/24.0.3",
@@ -16483,7 +16484,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.0",
@@ -16531,7 +16532,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.1",
@@ -16579,7 +16580,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.2",
@@ -16627,7 +16628,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 25.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/25.0.3",
@@ -16675,7 +16676,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.0",
@@ -16723,7 +16724,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.1",
@@ -16771,7 +16772,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.2",
@@ -16819,7 +16820,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 26.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/26.0.3",
@@ -16867,7 +16868,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.0",
@@ -16915,7 +16916,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.1",
@@ -16963,7 +16964,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.2",
@@ -17011,7 +17012,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 27.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/27.0.3",
@@ -17059,7 +17060,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.0",
@@ -17107,7 +17108,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17157,7 +17158,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28-rc2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17207,7 +17208,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.1",
@@ -17255,7 +17256,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.2",
@@ -17303,7 +17304,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 28.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/28.0.3",
@@ -17351,7 +17352,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.0",
@@ -17399,7 +17400,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17449,7 +17450,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17499,7 +17500,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29-rc3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "obsolete": "true",
@@ -17549,7 +17550,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.1",
@@ -17597,7 +17598,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.2",
@@ -17645,7 +17646,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 29.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/29.0.3",
@@ -17693,7 +17694,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.0",
@@ -17741,7 +17742,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.1",
@@ -17789,7 +17790,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.2",
@@ -17837,7 +17838,7 @@
           }
         },
         "displayName": "Android SDK Build-Tools 30.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/30.0.3",
@@ -17878,7 +17879,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 31",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/31.0.0",
@@ -17919,7 +17920,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/32.0.0",
@@ -17960,7 +17961,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 32.1-rc1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/32.1.0-rc1",
@@ -18002,7 +18003,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.0",
@@ -18043,7 +18044,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.1",
@@ -18084,7 +18085,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.2",
@@ -18125,7 +18126,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 33.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/33.0.3",
@@ -18166,7 +18167,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0",
@@ -18207,7 +18208,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc1",
@@ -18249,7 +18250,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc2",
@@ -18291,7 +18292,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 34-rc3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/34.0.0-rc3",
@@ -18333,7 +18334,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0",
@@ -18374,7 +18375,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc1",
@@ -18416,7 +18417,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc2",
@@ -18458,7 +18459,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc3",
@@ -18500,7 +18501,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35-rc4",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/35.0.0-rc4",
@@ -18542,7 +18543,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 35.0.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/35.0.1",
@@ -18583,7 +18584,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0",
@@ -18624,7 +18625,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc1",
@@ -18666,7 +18667,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc3",
@@ -18708,7 +18709,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc4",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc4",
@@ -18750,7 +18751,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36-rc5",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.0.0-rc5",
@@ -18792,7 +18793,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "build-tools",
         "path": "build-tools/36.1.0",
@@ -18833,7 +18834,7 @@
           }
         ],
         "displayName": "Android SDK Build-Tools 36.1-rc1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "build-tools",
         "path": "build-tools/36.1.0-rc1",
@@ -18884,7 +18885,7 @@
           }
         ],
         "displayName": "CMake 3.10.2.4988404",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.10.2.4988404",
@@ -18925,7 +18926,7 @@
           }
         ],
         "displayName": "CMake 3.18.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.18.1",
@@ -18966,7 +18967,7 @@
           }
         ],
         "displayName": "CMake 3.22.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.22.1",
@@ -19007,7 +19008,7 @@
           }
         ],
         "displayName": "CMake 3.30.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.3",
@@ -19048,7 +19049,7 @@
           }
         ],
         "displayName": "CMake 3.30.4",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.4",
@@ -19089,7 +19090,7 @@
           }
         ],
         "displayName": "CMake 3.30.5",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.30.5",
@@ -19130,7 +19131,7 @@
           }
         ],
         "displayName": "CMake 3.31.0",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.0",
@@ -19171,7 +19172,7 @@
           }
         ],
         "displayName": "CMake 3.31.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.1",
@@ -19212,7 +19213,7 @@
           }
         ],
         "displayName": "CMake 3.31.4",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.4",
@@ -19253,7 +19254,7 @@
           }
         ],
         "displayName": "CMake 3.31.5",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.5",
@@ -19294,7 +19295,7 @@
           }
         ],
         "displayName": "CMake 3.31.6",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.31.6",
@@ -19342,7 +19343,7 @@
           }
         ],
         "displayName": "CMake 3.6.4111459",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/3.6.4111459",
@@ -19383,7 +19384,7 @@
           }
         ],
         "displayName": "CMake 4.0.2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.0.2",
@@ -19424,7 +19425,7 @@
           }
         ],
         "displayName": "CMake 4.0.3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.0.3",
@@ -19465,7 +19466,7 @@
           }
         ],
         "displayName": "CMake 4.1.0",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.1.0",
@@ -19506,7 +19507,7 @@
           }
         ],
         "displayName": "CMake 4.1.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmake",
         "path": "cmake/4.1.1",
@@ -19521,6 +19522,47 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "4.1.2": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "linux",
+            "sha1": "c8c4f1c19b75c56f28b9dcf1af928d25cf1a1471",
+            "size": 31275750,
+            "url": "https://dl.google.com/android/repository/cmake-4.1.2-linux.zip"
+          },
+          {
+            "arch": "all",
+            "os": "macosx",
+            "sha1": "a0578a0543942c7eb35822c88a516b87e5b9867a",
+            "size": 43690978,
+            "url": "https://dl.google.com/android/repository/cmake-4.1.2-darwin.zip"
+          },
+          {
+            "arch": "all",
+            "os": "windows",
+            "sha1": "06bc3fe29aa49297dcc11a2ffe3a999445df05ae",
+            "size": 21045753,
+            "url": "https://dl.google.com/android/repository/cmake-4.1.2-windows.zip"
+          }
+        ],
+        "displayName": "CMake 4.1.2",
+        "last-available-day": 20377,
+        "license": "android-sdk-license",
+        "name": "cmake",
+        "path": "cmake/4.1.2",
+        "revision": "4.1.2",
+        "revision-details": {
+          "major:0": "4",
+          "micro:2": "2",
+          "minor:1": "1"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "cmdline-tools": {
@@ -19549,7 +19591,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/1.0",
@@ -19589,7 +19631,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/10.0",
@@ -19629,7 +19671,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/11.0",
@@ -19707,7 +19749,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/12.0",
@@ -19785,7 +19827,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0",
@@ -19825,7 +19867,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/13.0-rc01",
@@ -19866,7 +19908,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/14.0-alpha01",
@@ -19907,7 +19949,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0",
@@ -19947,7 +19989,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/16.0-alpha01",
@@ -19988,7 +20030,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/17.0",
@@ -20028,7 +20070,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/19.0",
@@ -20068,7 +20110,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/19.0-alpha01",
@@ -20109,7 +20151,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "obsolete": "true",
@@ -20150,7 +20192,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/2.1",
@@ -20190,7 +20232,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/3.0",
@@ -20230,7 +20272,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/4.0",
@@ -20270,7 +20312,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/5.0",
@@ -20310,7 +20352,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/6.0",
@@ -20350,7 +20392,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/7.0",
@@ -20390,7 +20432,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/8.0",
@@ -20430,7 +20472,7 @@
           }
         ],
         "displayName": "Android SDK Command-line Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "cmdline-tools",
         "path": "cmdline-tools/9.0",
@@ -21521,7 +21563,7 @@
           }
         ],
         "displayName": "Android Emulator",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "emulator",
         "path": "emulator",
@@ -21537,6 +21579,54 @@
           }
         }
       },
+      "36.2.12": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "b87561b33f5f1df3647519628c3597353dbf534d",
+            "size": 320123396,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-14214601.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "5c1b8bcd88285a343b4436d1082e8a544408e592",
+            "size": 395794431,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-14214601.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "e53928cb3b24acb942ff8003cd9a9a91eddece04",
+            "size": 313352024,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-14214601.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "1140a142d87fa2f6be84f5ebe7ef781a9eba429c",
+            "size": 443355796,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-14214601.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20377,
+        "license": "android-sdk-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "36.2.12",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "12",
+          "minor:1": "2"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
+      },
       "36.2.4": {
         "archives": [
           {
@@ -21632,6 +21722,54 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "36.3.4": {
+        "archives": [
+          {
+            "arch": "x64",
+            "os": "linux",
+            "sha1": "bc4a8c9f80ad58842fe2286bf03e78e4e1292e19",
+            "size": 325925467,
+            "url": "https://dl.google.com/android/repository/emulator-linux_x64-14257411.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "macosx",
+            "sha1": "b40ab44776ebb18d064554bdc623a1549fc802a3",
+            "size": 468816526,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_x64-14257411.zip"
+          },
+          {
+            "arch": "aarch64",
+            "os": "macosx",
+            "sha1": "205aa614c02fc8f59be6bc1dcf7f3ec4f209f27e",
+            "size": 380621007,
+            "url": "https://dl.google.com/android/repository/emulator-darwin_aarch64-14257411.zip"
+          },
+          {
+            "arch": "x64",
+            "os": "windows",
+            "sha1": "edd34ac4150107b5f9a5840c1810747745d6611e",
+            "size": 449704089,
+            "url": "https://dl.google.com/android/repository/emulator-windows_x64-14257411.zip"
+          }
+        ],
+        "displayName": "Android Emulator",
+        "last-available-day": 20377,
+        "license": "android-sdk-preview-license",
+        "name": "emulator",
+        "path": "emulator",
+        "revision": "36.3.4",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "4",
+          "minor:1": "3"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "extras": {
@@ -21757,7 +21895,7 @@
           }
         },
         "displayName": "NDK (Side by side) 16.1.4479499",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/16.1.4479499",
@@ -21819,7 +21957,7 @@
           }
         },
         "displayName": "NDK (Side by side) 17.2.4988734",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/17.2.4988734",
@@ -21881,7 +22019,7 @@
           }
         },
         "displayName": "NDK (Side by side) 18.1.5063045",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/18.1.5063045",
@@ -21943,7 +22081,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.0.5232133",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "obsolete": "true",
@@ -22006,7 +22144,7 @@
           }
         },
         "displayName": "NDK (Side by side) 19.2.5345600",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/19.2.5345600",
@@ -22068,7 +22206,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5392854",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -22132,7 +22270,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5471264",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "obsolete": "true",
@@ -22196,7 +22334,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.0.5594570",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.0.5594570",
@@ -22258,7 +22396,7 @@
           }
         },
         "displayName": "NDK (Side by side) 20.1.5948944",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/20.1.5948944",
@@ -22306,7 +22444,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6011959",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.0.6011959",
@@ -22355,7 +22493,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.0.6113669",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.0.6113669",
@@ -22403,7 +22541,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6210238",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6210238",
@@ -22459,7 +22597,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6273396",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6273396",
@@ -22515,7 +22653,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6352462",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.1.6352462",
@@ -22570,7 +22708,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.1.6363665",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/21.1.6363665",
@@ -22626,7 +22764,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.2.6472646",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.2.6472646",
@@ -22681,7 +22819,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.3.6528147",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.3.6528147",
@@ -22736,7 +22874,7 @@
           }
         },
         "displayName": "NDK (Side by side) 21.4.7075529",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/21.4.7075529",
@@ -22791,7 +22929,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.6917172",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/22.0.6917172",
@@ -22847,7 +22985,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.0.7026061",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.0.7026061",
@@ -22902,7 +23040,7 @@
           }
         },
         "displayName": "NDK (Side by side) 22.1.7171670",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/22.1.7171670",
@@ -22957,7 +23095,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7123448",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7123448",
@@ -23013,7 +23151,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7196353",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7196353",
@@ -23069,7 +23207,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7272597",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7272597",
@@ -23125,7 +23263,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7344513",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7344513",
@@ -23174,7 +23312,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7421159",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7421159",
@@ -23223,7 +23361,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7530507",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/23.0.7530507",
@@ -23272,7 +23410,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.0.7599858",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.0.7599858",
@@ -23320,7 +23458,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.1.7779620",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.1.7779620",
@@ -23368,7 +23506,7 @@
           }
         },
         "displayName": "NDK (Side by side) 23.2.8568313",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/23.2.8568313",
@@ -23416,7 +23554,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7856742",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7856742",
@@ -23465,7 +23603,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.7956693",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.7956693",
@@ -23514,7 +23652,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8079956",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/24.0.8079956",
@@ -23563,7 +23701,7 @@
           }
         },
         "displayName": "NDK (Side by side) 24.0.8215888",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/24.0.8215888",
@@ -23611,7 +23749,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8151533",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8151533",
@@ -23660,7 +23798,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8221429",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8221429",
@@ -23709,7 +23847,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8355429",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8355429",
@@ -23758,7 +23896,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8528842",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/25.0.8528842",
@@ -23807,7 +23945,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.0.8775105",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.0.8775105",
@@ -23855,7 +23993,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.1.8937393",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.1.8937393",
@@ -23903,7 +24041,7 @@
           }
         },
         "displayName": "NDK (Side by side) 25.2.9519653",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/25.2.9519653",
@@ -23951,7 +24089,7 @@
           }
         },
         "displayName": "NDK (Side by side) 26.0.10404224",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10404224",
@@ -23993,7 +24131,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10636728",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/26.0.10636728",
@@ -24035,7 +24173,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.0.10792818",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.0.10792818",
@@ -24076,7 +24214,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.1.10909125",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.1.10909125",
@@ -24117,7 +24255,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.2.11394342",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.2.11394342",
@@ -24158,7 +24296,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 26.3.11579264",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/26.3.11579264",
@@ -24199,7 +24337,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11718014",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11718014",
@@ -24241,7 +24379,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.11902837",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/27.0.11902837",
@@ -24283,7 +24421,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.0.12077973",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.0.12077973",
@@ -24324,7 +24462,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.1.12297006",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.1.12297006",
@@ -24365,7 +24503,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.2.12479018",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.2.12479018",
@@ -24406,7 +24544,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 27.3.13750724",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/27.3.13750724",
@@ -24447,7 +24585,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12433566",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12433566",
@@ -24489,7 +24627,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12674087",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12674087",
@@ -24531,7 +24669,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.12916984",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/28.0.12916984",
@@ -24573,7 +24711,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.0.13004108",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.0.13004108",
@@ -24614,7 +24752,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.1.13356709",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.1.13356709",
@@ -24655,7 +24793,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 28.2.13676358",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/28.2.13676358",
@@ -24696,7 +24834,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13113456",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13113456",
@@ -24738,7 +24876,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13599879",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13599879",
@@ -24780,7 +24918,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.13846066",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.13846066",
@@ -24822,7 +24960,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.14033849",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk",
         "path": "ndk/29.0.14033849",
@@ -24864,7 +25002,7 @@
           }
         ],
         "displayName": "NDK (Side by side) 29.0.14206865",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk",
         "path": "ndk/29.0.14206865",
@@ -24928,7 +25066,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -24990,7 +25128,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25052,7 +25190,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25114,7 +25252,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -25177,7 +25315,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25239,7 +25377,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -25303,7 +25441,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "obsolete": "true",
@@ -25367,7 +25505,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25429,7 +25567,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25477,7 +25615,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25526,7 +25664,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25574,7 +25712,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25630,7 +25768,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25686,7 +25824,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25741,7 +25879,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25797,7 +25935,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25852,7 +25990,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25907,7 +26045,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -25962,7 +26100,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26018,7 +26156,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26073,7 +26211,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26128,7 +26266,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26184,7 +26322,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26240,7 +26378,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26296,7 +26434,7 @@
           }
         },
         "displayName": "NDK",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "ndk-bundle",
         "path": "ndk-bundle",
@@ -26459,7 +26597,7 @@
           }
         ],
         "displayName": "Android SDK Platform-Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platform-tools",
         "path": "platform-tools",
@@ -26515,6 +26653,47 @@
             "xsi:type": "ns5:genericDetailsType"
           }
         }
+      },
+      "36.0.2": {
+        "archives": [
+          {
+            "arch": "all",
+            "os": "linux",
+            "sha1": "3c5c54a14f51a2da59d7c4874372619a42deb94d",
+            "size": 8785200,
+            "url": "https://dl.google.com/android/repository/platform-tools_r36.0.2-linux.zip"
+          },
+          {
+            "arch": "all",
+            "os": "macosx",
+            "sha1": "5998b371cd55fbd3807632ac36f1b3a62558d46d",
+            "size": 15711207,
+            "url": "https://dl.google.com/android/repository/platform-tools_r36.0.2-darwin.zip"
+          },
+          {
+            "arch": "all",
+            "os": "windows",
+            "sha1": "970632ccb7a364767d64d9eec3d143f5d2adcc3c",
+            "size": 7708640,
+            "url": "https://dl.google.com/android/repository/platform-tools_r36.0.2-win.zip"
+          }
+        ],
+        "displayName": "Android SDK Platform-Tools",
+        "last-available-day": 20377,
+        "license": "android-sdk-preview-license",
+        "name": "platform-tools",
+        "path": "platform-tools",
+        "revision": "36.0.2",
+        "revision-details": {
+          "major:0": "36",
+          "micro:2": "2",
+          "minor:1": "0"
+        },
+        "type-details": {
+          "element-attributes": {
+            "xsi:type": "ns5:genericDetailsType"
+          }
+        }
       }
     },
     "platforms": {
@@ -26529,7 +26708,7 @@
           }
         ],
         "displayName": "Android SDK Platform 10",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-10",
@@ -26568,7 +26747,7 @@
           }
         ],
         "displayName": "Android SDK Platform 11",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-11",
@@ -26607,7 +26786,7 @@
           }
         ],
         "displayName": "Android SDK Platform 12",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-12",
@@ -26646,7 +26825,7 @@
           }
         ],
         "displayName": "Android SDK Platform 13",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-13",
@@ -26685,7 +26864,7 @@
           }
         ],
         "displayName": "Android SDK Platform 14",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-14",
@@ -26724,7 +26903,7 @@
           }
         ],
         "displayName": "Android SDK Platform 15",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-15",
@@ -26763,7 +26942,7 @@
           }
         ],
         "displayName": "Android SDK Platform 16",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-16",
@@ -26802,7 +26981,7 @@
           }
         ],
         "displayName": "Android SDK Platform 17",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-17",
@@ -26841,7 +27020,7 @@
           }
         ],
         "displayName": "Android SDK Platform 18",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-18",
@@ -26880,7 +27059,7 @@
           }
         ],
         "displayName": "Android SDK Platform 19",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-19",
@@ -26933,7 +27112,7 @@
           }
         ],
         "displayName": "Android SDK Platform 2",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -26973,7 +27152,7 @@
           }
         ],
         "displayName": "Android SDK Platform 20",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-20",
@@ -27012,7 +27191,7 @@
           }
         ],
         "displayName": "Android SDK Platform 21",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-21",
@@ -27051,7 +27230,7 @@
           }
         ],
         "displayName": "Android SDK Platform 22",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-22",
@@ -27090,7 +27269,7 @@
           }
         ],
         "displayName": "Android SDK Platform 23",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-23",
@@ -27129,7 +27308,7 @@
           }
         ],
         "displayName": "Android SDK Platform 24",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-24",
@@ -27168,7 +27347,7 @@
           }
         ],
         "displayName": "Android SDK Platform 25",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-25",
@@ -27207,7 +27386,7 @@
           }
         ],
         "displayName": "Android SDK Platform 26",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-26",
@@ -27246,7 +27425,7 @@
           }
         ],
         "displayName": "Android SDK Platform 27",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-27",
@@ -27285,7 +27464,7 @@
           }
         ],
         "displayName": "Android SDK Platform 28",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-28",
@@ -27324,7 +27503,7 @@
           }
         ],
         "displayName": "Android SDK Platform 29",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-29",
@@ -27377,7 +27556,7 @@
           }
         ],
         "displayName": "Android SDK Platform 3",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -27417,7 +27596,7 @@
           }
         ],
         "displayName": "Android SDK Platform 30",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-30",
@@ -27456,7 +27635,7 @@
           }
         ],
         "displayName": "Android SDK Platform 31",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-31",
@@ -27495,7 +27674,7 @@
           }
         ],
         "displayName": "Android SDK Platform 32",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-32",
@@ -27534,7 +27713,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33",
@@ -27574,7 +27753,7 @@
           }
         ],
         "displayName": "Android SDK Platform 33-ext5",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-33-ext5",
@@ -27609,7 +27788,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -27655,7 +27834,7 @@
           }
         ],
         "displayName": "Android SDK Platform 34-ext12",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-34-ext12",
@@ -27688,7 +27867,7 @@
           }
         ],
         "displayName": "Android SDK Platform 35",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-35",
@@ -27726,7 +27905,7 @@
           }
         ],
         "displayName": "Android SDK Platform 35-ext15",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-35-ext15",
@@ -27759,7 +27938,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36",
@@ -27792,7 +27971,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36.1",
@@ -27825,7 +28004,7 @@
           }
         ],
         "displayName": "Android SDK Platform 36-ext19",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-36-ext19",
@@ -27872,7 +28051,7 @@
           }
         ],
         "displayName": "Android SDK Platform 4",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -27926,7 +28105,7 @@
           }
         ],
         "displayName": "Android SDK Platform 5",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -27980,7 +28159,7 @@
           }
         ],
         "displayName": "Android SDK Platform 6",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28020,7 +28199,7 @@
           }
         ],
         "displayName": "Android SDK Platform 7",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-7",
@@ -28059,7 +28238,7 @@
           }
         ],
         "displayName": "Android SDK Platform 8",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-8",
@@ -28098,7 +28277,7 @@
           }
         ],
         "displayName": "Android SDK Platform 9",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-9",
@@ -28137,7 +28316,7 @@
           }
         ],
         "displayName": "Android SDK Platform Baklava-ext19",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "path": "platforms/android-Baklava-ext19",
@@ -28171,7 +28350,7 @@
           }
         ],
         "displayName": "Android SDK Platform CANARY",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-preview-license",
         "name": "platforms",
         "path": "platforms/android-CANARY",
@@ -28236,7 +28415,7 @@
           }
         ],
         "displayName": "Android SDK Platform UpsideDownCake",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "platforms",
         "obsolete": "true",
@@ -28354,7 +28533,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API S",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/2",
@@ -28475,7 +28654,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 29-30",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/1",
@@ -28567,7 +28746,7 @@
           }
         ],
         "displayName": "Layout Inspector image server for API 31-36",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "skiaparser",
         "path": "skiaparser/3",
@@ -28594,7 +28773,7 @@
           }
         ],
         "displayName": "Sources for Android 14",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "obsolete": "true",
@@ -28624,7 +28803,7 @@
           }
         ],
         "displayName": "Sources for Android 15",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-15",
@@ -28653,7 +28832,7 @@
           }
         ],
         "displayName": "Sources for Android 16",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-16",
@@ -28682,7 +28861,7 @@
           }
         ],
         "displayName": "Sources for Android 17",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-17",
@@ -28711,7 +28890,7 @@
           }
         ],
         "displayName": "Sources for Android 18",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-18",
@@ -28740,7 +28919,7 @@
           }
         ],
         "displayName": "Sources for Android 19",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-19",
@@ -28769,7 +28948,7 @@
           }
         ],
         "displayName": "Sources for Android 20",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-20",
@@ -28798,7 +28977,7 @@
           }
         ],
         "displayName": "Sources for Android 21",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-21",
@@ -28827,7 +29006,7 @@
           }
         ],
         "displayName": "Sources for Android 22",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-22",
@@ -28856,7 +29035,7 @@
           }
         ],
         "displayName": "Sources for Android 23",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-23",
@@ -28885,7 +29064,7 @@
           }
         ],
         "displayName": "Sources for Android 24",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-24",
@@ -28914,7 +29093,7 @@
           }
         ],
         "displayName": "Sources for Android 25",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-25",
@@ -28943,7 +29122,7 @@
           }
         ],
         "displayName": "Sources for Android 26",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-26",
@@ -28972,7 +29151,7 @@
           }
         ],
         "displayName": "Sources for Android 27",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-27",
@@ -29001,7 +29180,7 @@
           }
         ],
         "displayName": "Sources for Android 28",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-28",
@@ -29030,7 +29209,7 @@
           }
         ],
         "displayName": "Sources for Android 29",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-29",
@@ -29059,7 +29238,7 @@
           }
         ],
         "displayName": "Sources for Android 30",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-30",
@@ -29088,7 +29267,7 @@
           }
         ],
         "displayName": "Sources for Android 31",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-31",
@@ -29117,7 +29296,7 @@
           }
         ],
         "displayName": "Sources for Android 32",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-32",
@@ -29146,7 +29325,7 @@
           }
         ],
         "displayName": "Sources for Android 33",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-33",
@@ -29176,7 +29355,7 @@
           }
         ],
         "displayName": "Sources for Android 34",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-34",
@@ -29206,7 +29385,7 @@
           }
         ],
         "displayName": "Sources for Android 35",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-35",
@@ -29236,7 +29415,7 @@
           }
         ],
         "displayName": "Sources for Android 36",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-36",
@@ -29264,7 +29443,7 @@
           }
         ],
         "displayName": "Sources for Android 36.1",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "sources",
         "path": "sources/android-36.1",
@@ -29331,7 +29510,7 @@
           }
         },
         "displayName": "Android SDK Tools",
-        "last-available-day": 20369,
+        "last-available-day": 20377,
         "license": "android-sdk-license",
         "name": "tools",
         "obsolete": "true",

From e27d0b3aa64b4412e7ff65a3f600b2f114180607 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 04:26:53 +0000
Subject: [PATCH 3448/6226] libretro-shaders-slang: 0-unstable-2025-10-20 ->
 0-unstable-2025-10-27

---
 pkgs/by-name/li/libretro-shaders-slang/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix
index 7eab65738a01..656354f80d7e 100644
--- a/pkgs/by-name/li/libretro-shaders-slang/package.nix
+++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "libretro-shaders-slang";
-  version = "0-unstable-2025-10-20";
+  version = "0-unstable-2025-10-27";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "slang-shaders";
-    rev = "422e59878b7e0b4d5d677e6163cc560767398d20";
-    hash = "sha256-PdurVN86deGS1pNvFY1IZblBklc/CEFrB7jKbB8JrG4=";
+    rev = "1e632419233373cc72c104467ca6f7b8229c7594";
+    hash = "sha256-PrSZUi2II6ppks5U4c9VTG8C72fp5ZGuI0/dqAKd9IY=";
   };
 
   dontConfigure = true;

From 325b39b5c4f471289411147405a8fcf3300d9344 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Tue, 21 Oct 2025 06:51:37 +0800
Subject: [PATCH 3449/6226] karing: init at 1.2.5.880

---
 pkgs/by-name/ka/karing/package.nix | 83 ++++++++++++++++++++++++++++++
 1 file changed, 83 insertions(+)
 create mode 100644 pkgs/by-name/ka/karing/package.nix

diff --git a/pkgs/by-name/ka/karing/package.nix b/pkgs/by-name/ka/karing/package.nix
new file mode 100644
index 000000000000..1033c35d0d62
--- /dev/null
+++ b/pkgs/by-name/ka/karing/package.nix
@@ -0,0 +1,83 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  autoPatchelfHook,
+  dpkg,
+  atk,
+  cairo,
+  curlMinimal,
+  fontconfig,
+  gdk-pixbuf,
+  glib,
+  gobject-introspection,
+  gtk3,
+  harfbuzz,
+  keybinder3,
+  libayatana-appindicator,
+  libepoxy,
+  libsecret,
+  pango,
+  zlib,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "karing";
+  version = "1.2.5.880";
+
+  src = fetchurl {
+    url = "https://github.com/KaringX/karing/releases/download/v${finalAttrs.version}/karing_${finalAttrs.version}_linux_amd64.deb";
+    hash = "sha256-hnKnp2VIC9GxyoLxPC0xxbnhvhS68OUgKAGr3z0UbFU=";
+  };
+
+  nativeBuildInputs = [
+    autoPatchelfHook
+    dpkg
+  ];
+
+  buildInputs = [
+    atk
+    cairo
+    curlMinimal
+    fontconfig
+    gdk-pixbuf
+    glib
+    gobject-introspection
+    gtk3
+    harfbuzz
+    keybinder3
+    (lib.getLib stdenv.cc.cc)
+    libayatana-appindicator
+    libepoxy
+    libsecret
+    pango
+    zlib
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    cp --recursive usr $out
+    mkdir $out/bin
+    ln --symbolic $out/share/karing/karing $out/bin/karing
+    ln --symbolic $out/share/karing/karingService $out/bin/karingService
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/KaringX/karing/releases/tag/v${finalAttrs.version}";
+    description = "Simple & Powerful proxy utility, Support routing rules for clash/sing-box";
+    homepage = "https://github.com/KaringX/karing";
+    license = with lib.licenses; [
+      gpl3Plus
+      unfree
+    ];
+    mainProgram = "karing";
+    maintainers = with lib.maintainers; [ qzylinra ];
+    platforms = [ "x86_64-linux" ];
+  };
+})

From 26a33c284c33afb1c4151e78259972e37dcecc73 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Wed, 22 Oct 2025 23:46:11 -0700
Subject: [PATCH 3450/6226] ovftool: 4.6.3 -> 5.0.0

---
 pkgs/by-name/ov/ovftool/package.nix | 30 ++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ov/ovftool/package.nix b/pkgs/by-name/ov/ovftool/package.nix
index 23c18565c499..0ea75d4342f9 100644
--- a/pkgs/by-name/ov/ovftool/package.nix
+++ b/pkgs/by-name/ov/ovftool/package.nix
@@ -33,13 +33,13 @@ let
       fileName,
       version,
       toolId ? ovftoolId,
-      artifactId ? 21342,
+      artifactId ? 29161,
       fileType ? "Download",
       source ? "",
       hash ? "",
     }:
     let
-      requestJson = builtins.toJSON {
+      requestJson = lib.strings.toJSON {
         inherit
           fileName
           artifactId
@@ -73,14 +73,14 @@ let
 
   ovftoolSystems = {
     "x86_64-linux" = rec {
-      version = "4.6.3-24031167";
+      version = "5.0.0-24781994";
       fileName = "VMware-ovftool-${version}-lin.x86_64.zip";
-      hash = "sha256-NEwwgmEh/mrZkMMhI+Kq+SYdd3MJ0+IBLdUhd1+kPow=";
+      hash = "sha256-I389VdRZQH9BJT/qxSyUPlRZC7MHv++TDc8rJ1jY788=";
     };
     "x86_64-darwin" = rec {
-      version = "4.6.3-24031167";
+      version = "5.0.0-24781994";
       fileName = "VMware-ovftool-${version}-mac.x64.zip";
-      hash = "sha256-vhACcc4tjaQhvKwZyWkgpaKaoC+coWGl1zfSIC6WebM=";
+      hash = "sha256-vfhagEOnTGxOsY8kFY555c8EhI12GwQ2JwgTjEz7UT0=";
     };
   };
 
@@ -326,24 +326,24 @@ stdenv.mkDerivation (final: {
       set +x
     '';
 
-  meta = with lib; {
+  meta = {
     description = "VMware tools for working with OVF, OVA, and VMX images";
     homepage = "https://developer.vmware.com/web/tool/ovf-tool/";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.unfree;
-    maintainers = with maintainers; [
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = lib.licenses.unfree;
+    maintainers = with lib.maintainers; [
       numinit
       thanegill
     ];
-    platforms = builtins.attrNames ovftoolSystems;
+    platforms = lib.attrNames ovftoolSystems;
     mainProgram = "ovftool";
-    knownVulnerabilities = lib.optionals (stdenv.hostPlatform.isDarwin) [
-      "The bundled version of openssl 1.0.2zj in ovftool for Darwin has open vulnerabilities."
+    knownVulnerabilities = lib.optionals stdenv.hostPlatform.isDarwin [
+      "The bundled version of openssl 1.0.2zk in ovftool for Darwin has open vulnerabilities (maximum severity: Moderate)"
       "https://openssl-library.org/news/vulnerabilities-1.0.2/"
-      "CVE-2024-0727"
-      "CVE-2024-5535"
+      "Please nag Broadcom to update to OpenSSL 3 for Darwin."
       "CVE-2024-9143"
       "CVE-2024-13176"
+      "CVE-2025-9230"
     ];
   };
 })

From 14a9fb26c8c28b446c08e934d218717b010be126 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 04:32:55 +0000
Subject: [PATCH 3451/6226] goreleaser: 2.12.6 -> 2.12.7

---
 pkgs/by-name/go/goreleaser/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix
index 2b67e9bfff7e..4ff91d2b9224 100644
--- a/pkgs/by-name/go/goreleaser/package.nix
+++ b/pkgs/by-name/go/goreleaser/package.nix
@@ -10,16 +10,16 @@
 }:
 buildGo125Module rec {
   pname = "goreleaser";
-  version = "2.12.6";
+  version = "2.12.7";
 
   src = fetchFromGitHub {
     owner = "goreleaser";
     repo = "goreleaser";
     rev = "v${version}";
-    hash = "sha256-ZYlT/CkYMPZgVNR0uaDPbLT7WH5EDcUeTwUPFM6fZOg=";
+    hash = "sha256-McLE7o5eUTluIOlsArIo5Dh7fizxxCMVAdXXnSBKhQU=";
   };
 
-  vendorHash = "sha256-Zv13xWe/wwmq+2lqvsX6oWIyEYlCojgIgH/cvr5rSOI=";
+  vendorHash = "sha256-M8+KJV7LemD6AHjJS8nZ70AZ30kZIgyYQv/yWB3lmsw=";
 
   ldflags = [
     "-s"

From 632bca87344e58a5c010663614f72b1a6ceeb1d5 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 13 Oct 2025 11:54:59 +0800
Subject: [PATCH 3452/6226] conda: 25.3.1-1 -> 25.9.1-1

---
 pkgs/by-name/co/conda/package.nix | 73 +++++++++++++++----------------
 1 file changed, 35 insertions(+), 38 deletions(-)

diff --git a/pkgs/by-name/co/conda/package.nix b/pkgs/by-name/co/conda/package.nix
index 8ebd8825a82a..dd36990c60b0 100644
--- a/pkgs/by-name/co/conda/package.nix
+++ b/pkgs/by-name/co/conda/package.nix
@@ -27,6 +27,7 @@
   ],
   # Any extra nixpkgs you'd like available in the FHS env for Conda to use
   extraPkgs ? [ ],
+  runScript ? "bash -l",
 }:
 
 # How to use this package?
@@ -43,7 +44,7 @@
 # $ conda-shell
 # $ conda install spyder
 let
-  version = "25.3.1-1";
+  version = "25.9.1-1";
 
   src =
     let
@@ -59,21 +60,15 @@ let
     fetchurl {
       url = "https://repo.anaconda.com/miniconda/Miniconda3-py313_${version}-Linux-${arch}.sh";
       hash = selectSystem {
-        x86_64-linux = "sha256-U6hhCUY8/XC6esqzltQW5iMBKRTu4ARynh7Nb+lOjGk=";
-        aarch64-linux = "sha256-TKoMJmq3JrRAzK1Ap0d0FnSU4AHaXeKBt08tVnPkrOk=";
+        x86_64-linux = "sha256-YCJxTaIphgl7vvoT2rPZVyV/7wThw30evTZFtbmbydQ=";
+        aarch64-linux = "sha256-oN5FYsNoqLXKQ4WEP0BWhMeb6nqjt111E/+ZwMZDXVE=";
       };
     };
 
-  conda = (
-    let
-      libPath = lib.makeLibraryPath [
-        zlib # libz.so.1
-      ];
-    in
+  conda =
     runCommand "install-conda"
       {
         nativeBuildInputs = [ makeWrapper ];
-        buildInputs = [ zlib ];
       }
       # on line 10, we have 'unset LD_LIBRARY_PATH'
       # we have to comment it out however in a way that the number of bytes in the
@@ -82,24 +77,25 @@ let
       # of bytes from the top of the installer script
       # and unsetting the library path prevents the zlib library from being discovered
       ''
-        mkdir -p $out/bin
+        mkdir --parents $out/bin
 
         sed 's/unset LD_LIBRARY_PATH/#nset LD_LIBRARY_PATH/' ${src} > $out/bin/miniconda-installer.sh
         chmod +x $out/bin/miniconda-installer.sh
 
-        makeWrapper                            \
-          $out/bin/miniconda-installer.sh      \
-          $out/bin/install-conda               \
+        makeWrapper $out/bin/miniconda-installer.sh $out/bin/install-conda \
           --add-flags "-p ${installationPath}" \
-          --add-flags "-b"                     \
-          --prefix "LD_LIBRARY_PATH" : "${libPath}"
-      ''
-  );
+          --add-flags "-b" \
+          --prefix "LD_LIBRARY_PATH" : "${
+            lib.makeLibraryPath [
+              zlib # libz.so.1
+            ]
+          }"
+      '';
 in
 
 buildFHSEnv {
   pname = "conda-shell";
-  inherit version;
+  inherit version runScript;
 
   targetPkgs =
     pkgs:
@@ -109,25 +105,26 @@ buildFHSEnv {
       extraPkgs
     ]);
 
-  profile = ''
-    # Add conda to PATH
-    export PATH=${installationPath}/bin:$PATH
-    # Paths for gcc if compiling some C sources with pip
-    export NIX_CFLAGS_COMPILE="-I${installationPath}/include"
-    export NIX_CFLAGS_LINK="-L${installationPath}lib"
-    # Some other required environment variables
-    export FONTCONFIG_FILE=/etc/fonts/fonts.conf
-    export QTCOMPOSE=${xorg.libX11}/share/X11/locale
-    export LIBARCHIVE=${lib.getLib libarchive}/lib/libarchive.so
-    # Allows `conda activate` to work properly
-    condaSh=${installationPath}/etc/profile.d/conda.sh
-    if [ ! -f $condaSh ]; then
-      install-conda
-    fi
-    source $condaSh
-  '';
-
-  runScript = "bash -l";
+  profile =
+    let
+      condaSh = "${installationPath}/etc/profile.d/conda.sh";
+    in
+    ''
+      # Add conda to PATH
+      export PATH=${installationPath}/bin:$PATH
+      # Paths for gcc if compiling some C sources with pip
+      export NIX_CFLAGS_COMPILE="-I${installationPath}/include"
+      export NIX_CFLAGS_LINK="-L${installationPath}/lib"
+      # Some other required environment variables
+      export FONTCONFIG_FILE=/etc/fonts/fonts.conf
+      export QTCOMPOSE=${xorg.libX11}/share/X11/locale
+      export LIBARCHIVE=${lib.getLib libarchive}/lib/libarchive.so
+      # Allows `conda activate` to work properly
+      if [ ! -f ${condaSh} ]; then
+        install-conda
+      fi
+      source ${condaSh}
+    '';
 
   meta = {
     description = "Package manager for Python";

From b787616962db2d5077ea66f4b4dd42c9e2587735 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 04:54:57 +0000
Subject: [PATCH 3453/6226] python3Packages.pyoxigraph: 0.5.1 -> 0.5.2

---
 pkgs/development/python-modules/pyoxigraph/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyoxigraph/default.nix b/pkgs/development/python-modules/pyoxigraph/default.nix
index c6ae933e46e1..84b42ace2a53 100644
--- a/pkgs/development/python-modules/pyoxigraph/default.nix
+++ b/pkgs/development/python-modules/pyoxigraph/default.nix
@@ -12,19 +12,19 @@
 buildPythonPackage rec {
   pname = "pyoxigraph";
   pyproject = true;
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "oxigraph";
     repo = "oxigraph";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-58PGRQlDziVENgm7OKPAzXXi4BkOJqytGCxxIXB2smc=";
+    hash = "sha256-ptTrJbLGS7GkLGO40mbpdPkrcspaUE33kRZ8g9Qtb0o=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-GQ+7dyQ1LyYK8RYImsqVMEQvIC5pRQUVYYgO4FOShaE=";
+    hash = "sha256-AuUGra9ejPRKWWpXWLmcwGuZRKIuCYTdifpnwuuHnnQ=";
   };
 
   buildAndTestSubdir = "python";

From e27184decf71425a0fd8ce52fb89204b355a30d2 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 22 Oct 2025 10:53:06 -0700
Subject: [PATCH 3454/6226] animdl: remove `with lib;`

---
 pkgs/by-name/an/animdl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/animdl/package.nix b/pkgs/by-name/an/animdl/package.nix
index 28a2ecab20fd..4e3caa64413c 100644
--- a/pkgs/by-name/an/animdl/package.nix
+++ b/pkgs/by-name/an/animdl/package.nix
@@ -55,12 +55,12 @@ python3Packages.buildPythonApplication {
 
   doCheck = true;
 
-  meta = with lib; {
+  meta = {
     description = "Highly efficient, powerful and fast anime scraper";
     homepage = "https://github.com/justfoolingaround/animdl";
-    license = licenses.gpl3Only;
+    license = lib.licenses.gpl3Only;
     mainProgram = "animdl";
-    maintainers = with maintainers; [ passivelemon ];
+    maintainers = with lib.maintainers; [ passivelemon ];
     platforms = [ "x86_64-linux" ];
   };
 }

From c88ff31d9fc469e224625b80de0e1b8c412813fb Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 22 Oct 2025 10:49:36 -0700
Subject: [PATCH 3455/6226] animdl: allow click 8.2.x

---
 pkgs/by-name/an/animdl/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/an/animdl/package.nix b/pkgs/by-name/an/animdl/package.nix
index 4e3caa64413c..751c4b394dea 100644
--- a/pkgs/by-name/an/animdl/package.nix
+++ b/pkgs/by-name/an/animdl/package.nix
@@ -21,6 +21,7 @@ python3Packages.buildPythonApplication {
   ];
 
   pythonRelaxDeps = [
+    "click"
     "cssselect"
     "httpx"
     "lxml"

From 4bd0ad2bec23c7c83477e41d612135798871ad4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 05:25:31 +0000
Subject: [PATCH 3456/6226] rustical: 0.9.12 -> 0.9.13

---
 pkgs/by-name/ru/rustical/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/rustical/package.nix b/pkgs/by-name/ru/rustical/package.nix
index 48261b300c02..b341e5222a81 100644
--- a/pkgs/by-name/ru/rustical/package.nix
+++ b/pkgs/by-name/ru/rustical/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rustical";
-  version = "0.9.12";
+  version = "0.9.13";
 
   src = fetchFromGitHub {
     owner = "lennart-k";
     repo = "rustical";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pmIWLhrf7AsFr+xvYeibAutIigLeQNQepssLpHxjZyQ=";
+    hash = "sha256-cRBButySRX5j8W2ZAJVVCM1Z7SPBlTIdyfyqL57JR9o=";
   };
 
-  cargoHash = "sha256-vU/iXRas6PYUASPTVDkzmZCyOHnH07S4YpvIyg1zybk=";
+  cargoHash = "sha256-SbTJ/F9kH7JYz4DfI6fcycoPLCN/JWEL8UhcOJ//lJQ=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];

From 0a82932ad84b4446ccd60abb11d3526d7d6fd105 Mon Sep 17 00:00:00 2001
From: Ivy Pierlot <ivyp@outlook.com.au>
Date: Tue, 28 Oct 2025 16:28:04 +1100
Subject: [PATCH 3457/6226] karabiner-dk: 6.4.0 -> 6.5.0

---
 pkgs/by-name/ka/karabiner-dk/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ka/karabiner-dk/package.nix b/pkgs/by-name/ka/karabiner-dk/package.nix
index 1b8d61238d32..731d7677a9a6 100644
--- a/pkgs/by-name/ka/karabiner-dk/package.nix
+++ b/pkgs/by-name/ka/karabiner-dk/package.nix
@@ -12,14 +12,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "karabiner-dk";
-  sourceVersion = "6.4.0";
+  sourceVersion = "6.5.0";
   version = lib.defaultTo finalAttrs.sourceVersion driver-version;
 
   src = fetchFromGitHub {
     owner = "pqrs-org";
     repo = "Karabiner-DriverKit-VirtualHIDDevice";
     tag = "v${finalAttrs.sourceVersion}";
-    hash = "sha256-NlzIb9srGVdYUOAOL8W9UJZVrf5IQOm6TVjm73epemM=";
+    hash = "sha256-/77FaQUiJXqS7szOb92n/czuBup+f29GwLjQ9OXPvC4=";
   };
 
   nativeBuildInputs = [

From 2990f18ee0407646f5e16c3504f1d94522529d70 Mon Sep 17 00:00:00 2001
From: chillcicada <2210227279@qq.com>
Date: Tue, 28 Oct 2025 13:42:06 +0800
Subject: [PATCH 3458/6226] wpsoffice-cn: fix md5hash and dbus

---
 pkgs/by-name/wp/wpsoffice-cn/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/wp/wpsoffice-cn/package.nix b/pkgs/by-name/wp/wpsoffice-cn/package.nix
index e12be7e8ca3e..64a8f6cb7483 100644
--- a/pkgs/by-name/wp/wpsoffice-cn/package.nix
+++ b/pkgs/by-name/wp/wpsoffice-cn/package.nix
@@ -23,6 +23,7 @@
   xorg,
   # wpsoffice runtime dependencies
   cups,
+  dbus,
   pango,
 }:
 
@@ -51,10 +52,9 @@ let
       }
       ''
         readonly SECURITY_KEY="7f8faaaa468174dc1c9cd62e5f218a5b"
-        prefix="https://wps-linux-personal.wpscdn.cn"
 
         timestamp10=$(date '+%s')
-        md5hash=($(printf '%s' "$SECURITY_KEY''${${url}#$prefix}$timestamp10" | md5sum))
+        md5hash=($(printf '%s' "$SECURITY_KEY${lib.removePrefix "https://wps-linux-personal.wpscdn.cn" url}$timestamp10" | md5sum))
 
         curl --retry 3 --retry-delay 3 "${url}?t=$timestamp10&k=$md5hash" > $out
       '';
@@ -96,6 +96,7 @@ stdenv.mkDerivation {
 
   runtimeDependencies = map lib.getLib [
     cups
+    dbus
     pango
   ];
 

From 6130e552da6b13688fef3db38bba6f2623531fbb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 05:46:57 +0000
Subject: [PATCH 3459/6226] tmuxai: 2.0.0 -> 2.0.1

---
 pkgs/by-name/tm/tmuxai/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tm/tmuxai/package.nix b/pkgs/by-name/tm/tmuxai/package.nix
index 490e3df32d8a..9cce54583c2d 100644
--- a/pkgs/by-name/tm/tmuxai/package.nix
+++ b/pkgs/by-name/tm/tmuxai/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "tmuxai";
-  version = "2.0.0";
+  version = "2.0.1";
 
   src = fetchFromGitHub {
     owner = "alvinunreal";
     repo = "tmuxai";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5XcqovO1HKNAlZ7H26jWHSLt3bbxzhLJIL9sLDMdHR4=";
+    hash = "sha256-t9VGJnIXgRxUF1vtPtR4orbr/elc+xwjdLmvWqEn9cE=";
   };
 
-  vendorHash = "sha256-cw/tW7i+CDN7AYLcU7bC1VNeD1aFRvngvtwmgBqKvoc=";
+  vendorHash = "sha256-exp9qJwiis2sagw1D3toyQoYFwn+AigG+CspABMXh98=";
 
   ldflags = [
     "-s"

From 5a99ec562d33934a45ef2d7d5a654798b2a20ffc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 05:56:19 +0000
Subject: [PATCH 3460/6226] python3Packages.langsmith: 0.4.37 -> 0.4.38

---
 pkgs/development/python-modules/langsmith/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix
index 5ff75390c857..81eda030ba69 100644
--- a/pkgs/development/python-modules/langsmith/default.nix
+++ b/pkgs/development/python-modules/langsmith/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "langsmith";
-  version = "0.4.37";
+  version = "0.4.38";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langsmith-sdk";
     tag = "v${version}";
-    hash = "sha256-NIEzzcWKNHNx0AJyEoC+laWFXhf1Ejp9zQvYMiYqCXI=";
+    hash = "sha256-uBCR3rKcsbgPW/x1V7BVii+NhFigmMxaWesB+vzHAuo=";
   };
 
   sourceRoot = "${src.name}/python";

From 1d6800c72148976bbd60b36d5dfe3cd92bbc1585 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Mon, 27 Oct 2025 21:37:08 +0100
Subject: [PATCH 3461/6226] stalwart-mail: fix build

---
 pkgs/by-name/st/stalwart-mail/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix
index e5b3bf0d62a6..87b4e6924351 100644
--- a/pkgs/by-name/st/stalwart-mail/package.nix
+++ b/pkgs/by-name/st/stalwart-mail/package.nix
@@ -49,6 +49,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux && withFoundationdb) [ foundationdb ];
 
+  nativeCheckInputs = [
+    openssl
+  ];
+
   # Issue: https://github.com/stalwartlabs/stalwart/issues/1104
   buildNoDefaultFeatures = true;
   buildFeatures = [

From 21ff5b82231f4d80b5e757f3dfb0f155a700dde0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 06:35:42 +0000
Subject: [PATCH 3462/6226] olympus-unwrapped: 25.10.15.03 -> 25.10.25.02

---
 pkgs/by-name/ol/olympus-unwrapped/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ol/olympus-unwrapped/package.nix b/pkgs/by-name/ol/olympus-unwrapped/package.nix
index b1d0936451a7..4845f0abbc9e 100644
--- a/pkgs/by-name/ol/olympus-unwrapped/package.nix
+++ b/pkgs/by-name/ol/olympus-unwrapped/package.nix
@@ -31,9 +31,9 @@ let
 
   phome = "$out/lib/olympus";
   # The following variables are to be updated by the update script.
-  version = "25.10.15.03";
-  buildId = "5232"; # IMPORTANT: This line is matched with regex in update.sh.
-  rev = "8810c6bd26354658d72eae4571184c00e91617a8";
+  version = "25.10.25.02";
+  buildId = "5257"; # IMPORTANT: This line is matched with regex in update.sh.
+  rev = "026231884815cdda170157b8006852a10c2bd361";
 in
 buildDotnetModule {
   pname = "olympus-unwrapped";
@@ -44,7 +44,7 @@ buildDotnetModule {
     owner = "EverestAPI";
     repo = "Olympus";
     fetchSubmodules = true; # Required. See upstream's README.
-    hash = "sha256-UG1W1jyjmaJ1xoaXP3WZT/G2Or9/3KAvWXBLiGFeEpo=";
+    hash = "sha256-YfFRi8vWGLJcXrVvYRfokgdFXSys3lRZDK6ggAxxllA=";
   };
 
   nativeBuildInputs = [

From 066e81467dac0df9ab2b731360650470f21fb780 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 28 Oct 2025 06:40:27 +0000
Subject: [PATCH 3463/6226] rust-analyzer-unwrapped: 2025-08-25 -> 2025-10-27

Changes: https://github.com/rust-lang/rust-analyzer/releases/tag/2025-10-27
---
 pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
index f1772bc8062c..a158be7bf751 100644
--- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
+++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
@@ -12,15 +12,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-analyzer-unwrapped";
-  version = "2025-08-25";
+  version = "2025-10-27";
 
-  cargoHash = "sha256-G1R3IiKbQg1Dl6OFJSto0w4c18OUIrAPRiM/YStfkl0=";
+  cargoHash = "sha256-iw+Pgtv5VkCRSa07ap5fjhVZQgo+sfNjp5A4yaHdX1M=";
 
   src = fetchFromGitHub {
     owner = "rust-lang";
     repo = "rust-analyzer";
     rev = version;
-    hash = "sha256-apbJj2tsJkL2l+7Or9tJm1Mt5QPB6w/zIyDkCx8pfvk=";
+    hash = "sha256-syeBTCCU96qPJHcVpwHeCwmPCiLTDHHgYQYhpZ0iwLo=";
   };
 
   cargoBuildFlags = [

From 7583f8b836f4e5d6738033cda1c542587da3bc3a Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 28 Oct 2025 06:48:13 +0000
Subject: [PATCH 3464/6226] botan3: fix `pkgsStatic` eval
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without the change the eval fails as:

    $ nix build --no-link -f. pkgsStatic.botan3
    error:
       … while calling a functor (an attribute set with a '__functor' attribute)
         at lib/customisation.nix:317:7:
          316|     if missingArgs == { } then
          317|       makeOverridable f allArgs
             |       ^
          318|     # This needs to be an abort so it can't be caught with `builtins.tryEval`,

       … while evaluating a branch condition
         at lib/customisation.nix:182:7:
          181|       in
          182|       if isAttrs result then
             |       ^
          183|         result

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: attribute 'libxccStdenv' missing
       at pkgs/by-name/bo/botan3/package.nix:37:28:
           36| let
           37|   stdenv' = if static then buildPackages.libxccStdenv else stdenv;
             |                            ^
           38| in
---
 pkgs/by-name/bo/botan3/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/bo/botan3/package.nix b/pkgs/by-name/bo/botan3/package.nix
index 7a52f1d1b89b..084eb1face8b 100644
--- a/pkgs/by-name/bo/botan3/package.nix
+++ b/pkgs/by-name/bo/botan3/package.nix
@@ -34,7 +34,7 @@ assert lib.assertOneOf "policy" policy [
 ];
 
 let
-  stdenv' = if static then buildPackages.libxccStdenv else stdenv;
+  stdenv' = if static then buildPackages.libcxxStdenv else stdenv;
 in
 stdenv'.mkDerivation (finalAttrs: {
   version = "3.9.0";

From 67b6ebed84927be23ebb42912668fa63b6044e25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 07:04:10 +0000
Subject: [PATCH 3465/6226] bento: 1.12.0 -> 1.12.1

---
 pkgs/by-name/be/bento/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix
index 789bcc922e6e..6be77b9f5eef 100644
--- a/pkgs/by-name/be/bento/package.nix
+++ b/pkgs/by-name/be/bento/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "bento";
-  version = "1.12.0";
+  version = "1.12.1";
 
   src = fetchFromGitHub {
     owner = "warpstreamlabs";
     repo = "bento";
     tag = "v${version}";
-    hash = "sha256-BrGYMOXSRYoCE29KQU07LaK8HQ1+QrMusYejL5SrpXk=";
+    hash = "sha256-KW/qq2hntXcG26atA1yRJUzSMns0e1n2U5nascU1Ci8=";
   };
 
   proxyVendor = true;

From 0f3686ea4a33671d37c51e72860a03950596cc2e Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Fri, 19 Sep 2025 21:20:27 +0200
Subject: [PATCH 3466/6226] pgsql-tools: init at 2.1.0

---
 pkgs/by-name/pg/pgsql-tools/package.nix | 89 +++++++++++++++++++++++++
 pkgs/by-name/pg/pgsql-tools/update.sh   | 33 +++++++++
 2 files changed, 122 insertions(+)
 create mode 100644 pkgs/by-name/pg/pgsql-tools/package.nix
 create mode 100644 pkgs/by-name/pg/pgsql-tools/update.sh

diff --git a/pkgs/by-name/pg/pgsql-tools/package.nix b/pkgs/by-name/pg/pgsql-tools/package.nix
new file mode 100644
index 000000000000..ab9d06f47d11
--- /dev/null
+++ b/pkgs/by-name/pg/pgsql-tools/package.nix
@@ -0,0 +1,89 @@
+{
+  stdenv,
+  lib,
+  fetchurl,
+  autoPatchelfHook,
+  libxcrypt-legacy,
+  makeBinaryWrapper,
+  pgsql-tools,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "pgsql-tools";
+  version = "2.1.0";
+
+  src = fetchurl (
+    let
+      sources = {
+        x86_64-linux = {
+          url = "https://github.com/microsoft/pgsql-tools/releases/download/v${finalAttrs.version}/pgsqltoolsservice-linux-x64.tar.gz";
+          hash = "sha256-dN7+LJCUwb39ypuJV4p3jUHNGAPaObN4aZvsOHIpmkQ=";
+        };
+        aarch64-linux = {
+          url = "https://github.com/microsoft/pgsql-tools/releases/download/v${finalAttrs.version}/pgsqltoolsservice-linux-arm64.tar.gz";
+          hash = "sha256-rD8jymGdM1RDGDbrKu6E7xoWtSMRNuc2ngCmR+sHgQI=";
+        };
+        x86_64-darwin = {
+          url = "https://github.com/microsoft/pgsql-tools/releases/download/v${finalAttrs.version}/pgsqltoolsservice-osx-x86.tar.gz";
+          hash = "sha256-KLl7HPChurzB6QYV6AqAP3g1J3VKl61+we3opzJQwG0=";
+        };
+        aarch64-darwin = {
+          url = "https://github.com/microsoft/pgsql-tools/releases/download/v${finalAttrs.version}/pgsqltoolsservice-osx-arm64.tar.gz";
+          hash = "sha256-tpabEKB1kqse7D58FsP/9jywk+vgAAvptL9MadwxWg8=";
+        };
+      };
+    in
+    sources.${stdenv.hostPlatform.system}
+  );
+
+  nativeBuildInputs = [
+    makeBinaryWrapper
+  ]
+  ++ lib.optionals stdenv.isLinux [
+    autoPatchelfHook
+  ];
+
+  buildInputs = lib.optionals stdenv.isLinux [
+    libxcrypt-legacy
+    (lib.getLib stdenv.cc.cc)
+  ];
+
+  dontBuild = true;
+  dontStrip = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin $out/lib/pgsql-tools
+    install -Dm755 ossdbtoolsservice_main $out/lib/pgsql-tools/ossdbtoolsservice_main
+    cp -r _internal $out/lib/pgsql-tools/
+
+    makeBinaryWrapper $out/lib/pgsql-tools/ossdbtoolsservice_main $out/bin/ossdbtoolsservice_main \
+      ${lib.optionalString stdenv.isLinux ''--prefix LD_LIBRARY_PATH : "${
+        lib.makeLibraryPath [
+          libxcrypt-legacy
+          (lib.getLib stdenv.cc.cc)
+        ]
+      }"''} \
+      --chdir $out/lib/pgsql-tools
+
+    runHook postInstall
+  '';
+
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = ./update.sh;
+  };
+
+  meta = {
+    homepage = "https://github.com/microsoft/pgsql-tools";
+    description = "Backend service for PostgreSQL server tools, offering features such as connection management, query execution with result set handling, and language service support via the VS Code protocol";
+    changelog = "https://github.com/microsoft/pgsql-tools/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [ liberodark ];
+    mainProgram = "ossdbtoolsservice_main";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+  };
+})
diff --git a/pkgs/by-name/pg/pgsql-tools/update.sh b/pkgs/by-name/pg/pgsql-tools/update.sh
new file mode 100644
index 000000000000..ddd35c318e8a
--- /dev/null
+++ b/pkgs/by-name/pg/pgsql-tools/update.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash curl jq nix nix-prefetch common-updater-scripts
+
+set -euo pipefail
+
+latestVersion=$(curl --fail --silent https://api.github.com/repos/microsoft/pgsql-tools/releases/latest | jq --raw-output '.tag_name | ltrimstr("v")')
+currentVersion=$(nix eval --raw -f . pgsql-tools.version 2>/dev/null || echo "unknown")
+
+echo "latest  version: $latestVersion"
+echo "current version: $currentVersion"
+
+if [[ "$latestVersion" == "$currentVersion" ]]; then
+  echo "package is up-to-date"
+  exit 0
+fi
+
+update-source-version pgsql-tools "$latestVersion" --file=pkgs/by-name/pg/pgsql-tools/package.nix
+
+declare -A platforms=(
+  ["x86_64-linux"]="pgsqltoolsservice-linux-x64.tar.gz"
+  ["aarch64-linux"]="pgsqltoolsservice-linux-arm64.tar.gz"
+  ["x86_64-darwin"]="pgsqltoolsservice-osx-x86.tar.gz"
+  ["aarch64-darwin"]="pgsqltoolsservice-osx-arm64.tar.gz"
+)
+
+for system in "${!platforms[@]}"; do
+  filename="${platforms[$system]}"
+  url="https://github.com/microsoft/pgsql-tools/releases/download/v${latestVersion}/${filename}"
+
+  echo "Updating hash for $system..."
+  hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url "$url"))
+  update-source-version pgsql-tools "$latestVersion" "$hash" --system="$system" --ignore-same-version --ignore-same-hash
+done

From 94492af804ce6122b986c86956c48d756e893451 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 07:27:48 +0000
Subject: [PATCH 3467/6226] kube-router: 2.6.1 -> 2.6.2

---
 pkgs/by-name/ku/kube-router/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ku/kube-router/package.nix b/pkgs/by-name/ku/kube-router/package.nix
index 607b6154d6b2..ac9cdc86b609 100644
--- a/pkgs/by-name/ku/kube-router/package.nix
+++ b/pkgs/by-name/ku/kube-router/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "kube-router";
-  version = "2.6.1";
+  version = "2.6.2";
 
   src = fetchFromGitHub {
     owner = "cloudnativelabs";
     repo = "kube-router";
     rev = "v${version}";
-    hash = "sha256-lNCp/84T9al7gfZb1PkqZxtsu3XY16b7f6IUVrFSrNQ=";
+    hash = "sha256-VGbjXjBhfsgIW0uIP8I8KRb4J/+4SRJBpN5ebRP40EY=";
   };
 
   vendorHash = "sha256-fXZ6jRlFdjYPV5wqSdWAMlHj1dkkEpbCtcKMuuoje1U=";

From b5af85e10edeff23719eb3b05e259be7cfb97cb6 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 28 Oct 2025 07:38:20 +0000
Subject: [PATCH 3468/6226] Revert "First-class GitHub team reviews"

---
 .github/workflows/reviewers.yml               |  11 +-
 ci/eval/compare/default.nix                   |   9 +-
 ci/eval/compare/maintainers.nix               |  52 ++-----
 ci/request-reviews/default.nix                |   2 -
 ci/request-reviews/get-code-owners.sh         |  40 +++++-
 .../request-maintainers-reviews.sh            |  39 -----
 ci/request-reviews/request-reviewers.sh       | 134 ++++--------------
 pkgs/stdenv/generic/check-meta.nix            |   5 -
 8 files changed, 85 insertions(+), 207 deletions(-)
 delete mode 100755 ci/request-reviews/request-maintainers-reviews.sh

diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 57f91c0f2f10..6d23e1dde9b7 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -146,14 +146,19 @@ jobs:
       - name: Requesting maintainer reviews
         if: ${{ steps.app-token.outputs.token }}
         env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          GH_TOKEN: ${{ github.token }}
+          APP_GH_TOKEN: ${{ steps.app-token.outputs.token }}
           REPOSITORY: ${{ github.repository }}
-          ORG_ID: ${{ github.repository_owner_id }}
           NUMBER: ${{ github.event.number }}
           AUTHOR: ${{ github.event.pull_request.user.login }}
           # Don't request reviewers on draft PRs
           DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}
-        run: result/bin/request-maintainers-reviews.sh "$ORG_ID" "$REPOSITORY" "$NUMBER" "$AUTHOR" comparison
+        run: |
+          # maintainers.json contains GitHub IDs. Look up handles to request reviews from.
+          # There appears to be no API to request reviews based on GitHub IDs
+          jq -r 'keys[]' comparison/maintainers.json \
+            | while read -r id; do gh api /user/"$id" --jq .login; done \
+            | GH_TOKEN="$APP_GH_TOKEN" result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR"
 
       - name: Log current API rate limits (app-token)
         if: ${{ steps.app-token.outputs.token }}
diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index 19e8ce72c5d8..d0820618a0a0 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -179,12 +179,8 @@ runCommand "compare"
       jq
       cmp-stats
     ];
-    maintainers = builtins.toJSON maintainers.users;
-    teams = builtins.toJSON maintainers.teams;
-    passAsFile = [
-      "maintainers"
-      "teams"
-    ];
+    maintainers = builtins.toJSON maintainers;
+    passAsFile = [ "maintainers" ];
   }
   ''
     mkdir $out
@@ -227,5 +223,4 @@ runCommand "compare"
     fi
 
     cp "$maintainersPath" "$out/maintainers.json"
-    cp "$teamsPath" "$out/teams.json"
   ''
diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
index bacf112ffe90..9f19a4c382eb 100644
--- a/ci/eval/compare/maintainers.nix
+++ b/ci/eval/compare/maintainers.nix
@@ -51,16 +51,15 @@ let
         # updates to .json files.
         # TODO: Support by-name package sets.
         filenames = lib.optional (lib.length path == 1) "pkgs/by-name/${sharded (lib.head path)}/";
-        # meta.maintainers also contains all individual team members.
-        # We only want to ping individuals if they're added individually as maintainers, not via teams.
-        maintainers = package.meta.nonTeamMaintainers or [ ];
-        teams = package.meta.teams or [ ];
+        # TODO: Refactor this so we can ping entire teams instead of the individual members.
+        # Note that this will require keeping track of GH team IDs in "maintainers/teams.nix".
+        maintainers = package.meta.maintainers or [ ];
       }
     ))
     # No need to match up packages without maintainers with their files.
     # This also filters out attributes where `packge = null`, which is the
     # case for libintl, for example.
-    (lib.filter (pkg: pkg.maintainers != [ ] || pkg.teams != [ ]))
+    (lib.filter (pkg: pkg.maintainers != [ ]))
   ];
 
   relevantFilenames =
@@ -95,43 +94,20 @@ let
 
   attrsWithModifiedFiles = lib.filter (pkg: anyMatchingFiles pkg.filenames) attrsWithFilenames;
 
-  userPings =
+  listToPing = lib.concatMap (
     pkg:
     map (maintainer: {
-      type = "user";
-      user = toString maintainer.githubId;
+      id = maintainer.githubId;
+      inherit (maintainer) github;
       packageName = pkg.name;
-    });
-
-  teamPings =
-    pkg: team:
-    if team ? github then
-      [
-        {
-          type = "team";
-          team = toString team.githubId;
-          packageName = pkg.name;
-        }
-      ]
-    else
-      userPings pkg team.members;
-
-  maintainersToPing = lib.concatMap (
-    pkg: userPings pkg pkg.maintainers ++ lib.concatMap (teamPings pkg) pkg.teams
+      dueToFiles = pkg.filenames;
+    }) pkg.maintainers
   ) attrsWithModifiedFiles;
 
-  byType = lib.groupBy (ping: ping.type) maintainersToPing;
+  byMaintainer = lib.groupBy (ping: toString ping.id) listToPing;
 
-  byUser = lib.pipe (byType.user or [ ]) [
-    (lib.groupBy (ping: ping.user))
-    (lib.mapAttrs (_user: lib.map (pkg: pkg.packageName)))
-  ];
-  byTeam = lib.pipe (byType.team or [ ]) [
-    (lib.groupBy (ping: ping.team))
-    (lib.mapAttrs (_team: lib.map (pkg: pkg.packageName)))
-  ];
+  packagesPerMaintainer = lib.mapAttrs (
+    maintainer: packages: map (pkg: pkg.packageName) packages
+  ) byMaintainer;
 in
-{
-  users = byUser;
-  teams = byTeam;
-}
+packagesPerMaintainer
diff --git a/ci/request-reviews/default.nix b/ci/request-reviews/default.nix
index 2ebc34738a5d..075ff52fd564 100644
--- a/ci/request-reviews/default.nix
+++ b/ci/request-reviews/default.nix
@@ -17,7 +17,6 @@ stdenvNoCC.mkDerivation {
       ./get-code-owners.sh
       ./request-reviewers.sh
       ./request-code-owner-reviews.sh
-      ./request-maintainers-reviews.sh
     ];
   };
   nativeBuildInputs = [ makeWrapper ];
@@ -27,7 +26,6 @@ stdenvNoCC.mkDerivation {
     for bin in *.sh; do
       mv "$bin" "$out/bin"
       wrapProgram "$out/bin/$bin" \
-        --set PAGER cat \
         --set PATH ${
           lib.makeBinPath [
             coreutils
diff --git a/ci/request-reviews/get-code-owners.sh b/ci/request-reviews/get-code-owners.sh
index e49bb5409828..13a377429b92 100755
--- a/ci/request-reviews/get-code-owners.sh
+++ b/ci/request-reviews/get-code-owners.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Get the code owners of the files changed by a PR, returning one GitHub user/team handle per line
+# Get the code owners of the files changed by a PR, returning one username per line
 
 set -euo pipefail
 
@@ -29,9 +29,9 @@ log "This PR touches ${#touchedFiles[@]} files"
 # remove code owners to avoid pinging them
 git -C "$gitRepo" show "$baseRef":"$ownersFile" > "$tmp"/codeowners
 
-# Associative array with the user/team as the key for easy de-duplication
+# Associative array with the user as the key for easy de-duplication
 # Make sure to always lowercase keys to avoid duplicates with different casings
-declare -A finalOwners=()
+declare -A users=()
 
 for file in "${touchedFiles[@]}"; do
     result=$(codeowners --file "$tmp"/codeowners "$file")
@@ -59,9 +59,39 @@ for file in "${touchedFiles[@]}"; do
         # The first regex match is everything after the @
         entry=${BASH_REMATCH[1]}
 
-        finalOwners[${entry,,}]=
+        if [[ "$entry" =~ (.*)/(.*) ]]; then
+            # Teams look like $org/$team
+            org=${BASH_REMATCH[1]}
+            team=${BASH_REMATCH[2]}
+
+            # Instead of requesting a review from the team itself,
+            # we request reviews from the individual users.
+            # This is because once somebody from a team reviewed the PR,
+            # the API doesn't expose that the team was already requested for a review,
+            # so we wouldn't be able to avoid rerequesting reviews
+            # without saving some some extra state somewhere
+
+            # We could also consider implementing a more advanced heuristic
+            # in the future that e.g. only pings one team member,
+            # but escalates to somebody else if that member doesn't respond in time.
+            gh api \
+                --cache=1h \
+                -H "Accept: application/vnd.github+json" \
+                -H "X-GitHub-Api-Version: 2022-11-28" \
+                "/orgs/$org/teams/$team/members" \
+                --jq '.[].login' > "$tmp/team-members"
+            readarray -t members < "$tmp/team-members"
+            log "Team $entry has these members: ${members[*]}"
+
+            for user in "${members[@]}"; do
+                users[${user,,}]=
+            done
+        else
+            # Everything else is a user
+            users[${entry,,}]=
+        fi
     done
 
 done
 
-printf "%s\n" "${!finalOwners[@]}"
+printf "%s\n" "${!users[@]}"
diff --git a/ci/request-reviews/request-maintainers-reviews.sh b/ci/request-reviews/request-maintainers-reviews.sh
deleted file mode 100755
index b49f4e29fcc6..000000000000
--- a/ci/request-reviews/request-maintainers-reviews.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bash
-
-# Requests maintainer reviews for a PR
-
-set -euo pipefail
-SCRIPT_DIR=$(dirname "$0")
-
-if (( $# < 5 )); then
-    echo >&2 "Usage: $0 ORG_ID GITHUB_REPO PR_NUMBER AUTHOR COMPARISON_PATH"
-    exit 1
-fi
-orgId=$1
-baseRepo=$2
-prNumber=$3
-prAuthor=$4
-comparisonPath=$5
-
-org="${baseRepo%/*}"
-
-# maintainers.json/teams.json contains GitHub IDs. Look up handles to request reviews from.
-# There appears to be no API to request reviews based on IDs
-{
-  jq -r 'keys[]' "$comparisonPath"/maintainers.json \
-    | while read -r id; do
-      if login=$(gh api /user/"$id" --jq .login); then
-        echo "$login"
-      else
-        echo >&2 "Skipping user with id $id: $login"
-      fi
-    done
-  jq -r 'keys[]' "$comparisonPath"/teams.json \
-    | while read -r id; do
-      if slug=$(gh api /organizations/"$orgId"/team/"$id" --jq .slug); then
-        echo "$org/$slug"
-      else
-        echo >&2 "Skipping team with id $id: $slug"
-      fi
-    done
-} | "$SCRIPT_DIR"/request-reviewers.sh "$baseRepo" "$prNumber" "$prAuthor"
diff --git a/ci/request-reviews/request-reviewers.sh b/ci/request-reviews/request-reviewers.sh
index 23ad13819f11..1c105e385d28 100755
--- a/ci/request-reviews/request-reviewers.sh
+++ b/ci/request-reviews/request-reviewers.sh
@@ -1,16 +1,8 @@
 #!/usr/bin/env bash
 
-# Request reviewers for a PR, reading line-separated usernames/teams on stdin,
+# Request reviewers for a PR, reading line-separated usernames on stdin,
 # filtering for valid reviewers before using the API endpoint to request reviews:
 # https://docs.github.com/en/rest/pulls/review-requests?apiVersion=2022-11-28#request-reviewers-for-a-pull-request
-#
-# Example:
-#   $ request-reviewers.sh NixOS/nixpkgs 123456 someUser <<-EOF
-#   someUser
-#   anotherUser
-#   NixOS/someTeam
-#   NixOS/anotherTeam
-#   EOF
 
 set -euo pipefail
 
@@ -38,133 +30,59 @@ baseRepo=$1
 prNumber=$2
 prAuthor=$3
 
-org="${baseRepo%/*}"
-repo="${baseRepo#*/}"
-
 tmp=$(mktemp -d)
 trap 'rm -rf "$tmp"' exit
 
-declare -A users=() teams=()
-
+declare -A users=()
 while read -r handle && [[ -n "$handle" ]]; do
-    if [[ "$handle" =~ (.*)/(.*) ]]; then
-        if [[ "${BASH_REMATCH[1]}" != "$org" ]]; then
-            log "Team $handle is not part of the $org org, ignoring"
-        else
-            teams[${BASH_REMATCH[2],,}]=
-        fi
-    else
-        users[${handle,,}]=
-    fi
+    users[${handle,,}]=
 done
 
-log "Checking users: ${!users[*]}"
-log "Checking teams: ${!teams[*]}"
-
 # Cannot request a review from the author
 if [[ -v users[${prAuthor,,}] ]]; then
-    log "Avoiding review request for PR author $prAuthor"
+    log "One or more files are owned by the PR author, ignoring"
     unset 'users[${prAuthor,,}]'
 fi
 
-# And we don't want to rerequest reviews from people or teams who already reviewed
-log -e "Checking if users/teams have already reviewed the PR"
-
-# shellcheck disable=SC2016
-# A graphql query to get all reviewers of a PR, including both users and teams
-# on behalf of which a review was done.
-# The REST API doesn't have an end-point for figuring out the on-behalfness of reviews
-all_reviewers_query='
-query($owner: String!, $repo: String!, $pr: Int!, $endCursor: String) {
-  repository(owner: $owner, name: $repo) {
-    pullRequest(number: $pr) {
-      reviews(first: 100, after: $endCursor) {
-        nodes {
-          author {
-            login
-          }
-          onBehalfOf(first: 100) {
-            nodes {
-              slug
-            }
-          }
-        }
-        pageInfo {
-          hasNextPage
-          endCursor
-        }
-      }
-    }
-  }
-}
-'
-
-gh api graphql \
+gh api \
     -H "Accept: application/vnd.github+json" \
-    --paginate \
-    -f query="$all_reviewers_query" \
-    -F owner="$org" \
-    -F repo="$repo" \
-    -F pr="$prNumber" \
-    > "$tmp/already-reviewed-by-response"
+    -H "X-GitHub-Api-Version: 2022-11-28" \
+    "/repos/$baseRepo/pulls/$prNumber/reviews" \
+    --jq '.[].user.login' > "$tmp/already-reviewed-by"
 
-readarray -t userReviewers < <(jq -r '.data.repository.pullRequest.reviews.nodes[].author.login' "$tmp/already-reviewed-by-response")
-log "PR is already reviewed by these users: ${userReviewers[*]}"
-for user in "${userReviewers[@]}"; do
+# And we don't want to rerequest reviews from people who already reviewed
+while read -r user; do
     if [[ -v users[${user,,}] ]]; then
-        log "Avoiding review request for user $user, who has already left a review"
+        log "User $user is a potential reviewer, but has already left a review, ignoring"
         unset 'users[${user,,}]'
     fi
-done
-
-readarray -t teamReviewers < <(jq -r '.data.repository.pullRequest.reviews.nodes[].onBehalfOf.nodes[].slug' "$tmp/already-reviewed-by-response")
-log "PR is already reviewed by these teams: ${teamReviewers[*]}"
-for team in "${teamReviewers[@]}"; do
-    if [[ -v teams[${team,,}] ]]; then
-        log "Avoiding review request for team $team, who has already left a review"
-        unset 'teams[${team,,}]'
-    fi
-done
-
-log -e "Checking that all users/teams can be requested for review"
+done < "$tmp/already-reviewed-by"
 
 for user in "${!users[@]}"; do
-    if ! gh api "/repos/$baseRepo/collaborators/$user" >&2; then
-        log "User $user cannot be requested for review because they don't exist or are not a repository collaborator, ignoring. Probably missed the automated invite to the maintainers team (see <https://github.com/NixOS/nixpkgs/issues/234293>)"
+    if ! gh api \
+        -H "Accept: application/vnd.github+json" \
+        -H "X-GitHub-Api-Version: 2022-11-28" \
+        "/repos/$baseRepo/collaborators/$user" >&2; then
+        log "User $user is not a repository collaborator, probably missed the automated invite to the maintainers team (see <https://github.com/NixOS/nixpkgs/issues/234293>), ignoring"
         unset 'users[$user]'
     fi
 done
-for team in "${!teams[@]}"; do
-    if ! gh api "/orgs/$org/teams/$team/repos/$baseRepo" >&2; then
-        log "Team $team cannot be requested for review because it doesn't exist or has no repository permissions, ignoring. Probably wasn't added to the nixpkgs-maintainers team (see https://github.com/NixOS/nixpkgs/tree/master/maintainers#maintainer-teams)"
-        unset 'teams[$team]'
-    fi
-done
 
-log "Would request reviews from users: ${!users[*]}"
-log "Would request reviews from teams: ${!teams[*]}"
-
-if (( ${#users[@]} + ${#teams[@]} > 10 )); then
-    log "Too many reviewers (users: ${!users[*]}, teams: ${!teams[*]}), skipping review requests"
+if [[ "${#users[@]}" -gt 10 ]]; then
+    log "Too many reviewers (${!users[*]}), skipping review requests"
     exit 0
 fi
 
 for user in "${!users[@]}"; do
-    log "Requesting review from user $user"
-    if ! response=$(effect gh api \
-            --method POST \
-            "/repos/$baseRepo/pulls/$prNumber/requested_reviewers" \
-            -f "reviewers[]=$user"); then
-        log "Failed to request review from user $user: $response"
-    fi
-done
+    log "Requesting review from: $user"
 
-for team in "${!teams[@]}"; do
-    log "Requesting review from team $team"
-    if ! response=$(effect gh api \
+    if ! response=$(jq -n --arg user "$user" '{ reviewers: [ $user ] }' | \
+        effect gh api \
             --method POST \
+            -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
             "/repos/$baseRepo/pulls/$prNumber/requested_reviewers" \
-            -f "team_reviewers[]=$team"); then
-        log "Failed to request review from team $team: $response"
+            --input -); then
+        log "Failed to request review from $user: $response"
     fi
 done
diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 47174c6f21ec..c59e92e114ea 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -397,7 +397,6 @@ let
         ];
       sourceProvenance = listOf attrs;
       maintainers = listOf (attrsOf any); # TODO use the maintainer type from lib/tests/maintainer-module.nix
-      nonTeamMaintainers = listOf (attrsOf any); # TODO use the maintainer type from lib/tests/maintainer-module.nix
       teams = listOf (attrsOf any); # TODO similar to maintainers, use a teams type
       priority = int;
       pkgConfigModules = listOf str;
@@ -671,10 +670,6 @@ let
       maintainers =
         attrs.meta.maintainers or [ ] ++ concatMap (team: team.members or [ ]) attrs.meta.teams or [ ];
 
-      # Needed for CI to be able to avoid requesting reviews from individual
-      # team members
-      nonTeamMaintainers = attrs.meta.maintainers or [ ];
-
       identifiers =
         let
           # nix-env writes a warning for each derivation that has null in its meta values, so

From b35853dcb2b7ebf96e13684b5cab0ed548b9e8ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 07:40:36 +0000
Subject: [PATCH 3469/6226] python3Packages.jsonconversion: 1.1.2 -> 1.2.0

---
 pkgs/development/python-modules/jsonconversion/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/jsonconversion/default.nix b/pkgs/development/python-modules/jsonconversion/default.nix
index 8c6b96ac0753..f0bfd22a03f7 100644
--- a/pkgs/development/python-modules/jsonconversion/default.nix
+++ b/pkgs/development/python-modules/jsonconversion/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "jsonconversion";
-  version = "1.1.2";
+  version = "1.2.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "DLR-RM";
     repo = "python-jsonconversion";
     tag = version;
-    hash = "sha256-tWR4JElZVnNQml/av+r9olBusRqyzMrL4/o7Fei7dlY=";
+    hash = "sha256-OOp5oHAb00AN+5tlLeUzily1MKHDIbn0qg3jzkZ0vAo=";
   };
 
   build-system = [ pdm-backend ];

From 56dd41a1773c00819e499ec082b48cee91ef06fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 07:49:26 +0000
Subject: [PATCH 3470/6226] python3Packages.trimesh: 4.8.3 -> 4.9.0

---
 pkgs/development/python-modules/trimesh/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix
index d28bb529c52c..3e2f8906e855 100644
--- a/pkgs/development/python-modules/trimesh/default.nix
+++ b/pkgs/development/python-modules/trimesh/default.nix
@@ -28,7 +28,7 @@
 
 buildPythonPackage rec {
   pname = "trimesh";
-  version = "4.8.3";
+  version = "4.9.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "mikedh";
     repo = "trimesh";
     tag = version;
-    hash = "sha256-ywLbXOE3qO3+hrqy/+cVGZA4V202eHaMUnn3Wz1iNLI=";
+    hash = "sha256-HOSmV55RRZkIk1YppWfYvSm0hURSKUsDeeWtVBrH7Rs=";
   };
 
   build-system = [ setuptools ];

From 94b6251112021f87d2394dcee488eae5a6fa7f4e Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 28 Oct 2025 08:54:39 +0100
Subject: [PATCH 3471/6226] claude-code: 2.0.27 -> 2.0.28

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
---
 .../vscode/extensions/anthropic.claude-code/default.nix     | 4 ++--
 pkgs/by-name/cl/claude-code/package-lock.json               | 4 ++--
 pkgs/by-name/cl/claude-code/package.nix                     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 65cb6118b3b2..9c28968154eb 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "2.0.27";
-    hash = "sha256-4zifN9Wf7Tp+qrIvjf3iBPqu8wtedCAu1v93lDBAGbo=";
+    version = "2.0.28";
+    hash = "sha256-RfZDKiGPnmfNuq4D8dSO+Rk97g+Amo4G1apqgqVZttg=";
   };
 
   meta = {
diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 5686f33d15e2..c2cba3254f18 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.0.27",
+  "version": "2.0.28",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.0.27",
+      "version": "2.0.28",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 3a6e2899a2f8..44895e0db84e 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,14 +7,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.0.27";
+  version = "2.0.28";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-ZxwEnUWCtgrGhgtUjcWcMgLqzaajwE3pG7iSIfaS3ic=";
+    hash = "sha256-S8Qp6xzbEnU0GOx8BfblHMsjmOZkPuTvSeCAHEZN8+E=";
   };
 
-  npmDepsHash = "sha256-cBhHQYHmLtGhLfaK//L48qGZCF+u6N/OsLTTpNA2t+E==";
+  npmDepsHash = "sha256-EjvkOHRwhiBBMV9xZuYqObuz93CxbqUwNgc2enBA5go=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From a7c6413e584264861e8ddaf9117093193abdb752 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 27 Oct 2025 22:44:34 +0100
Subject: [PATCH 3472/6226] eid-mw: use `--replace-fail`

---
 pkgs/by-name/ei/eid-mw/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ei/eid-mw/package.nix b/pkgs/by-name/ei/eid-mw/package.nix
index 840d4c262466..390827b40f40 100644
--- a/pkgs/by-name/ei/eid-mw/package.nix
+++ b/pkgs/by-name/ei/eid-mw/package.nix
@@ -34,7 +34,8 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac
-    substituteInPlace configure.ac --replace 'p11kitcfdir=""' 'p11kitcfdir="'$out/share/p11-kit/modules'"'
+    substituteInPlace configure.ac \
+      --replace-fail 'p11kitcfdir=""' 'p11kitcfdir="'$out/share/p11-kit/modules'"'
   '';
 
   nativeBuildInputs = [
@@ -44,6 +45,7 @@ stdenv.mkDerivation rec {
     pkg-config
     makeBinaryWrapper
   ];
+
   buildInputs = [
     curl
     gtk3
@@ -62,9 +64,8 @@ stdenv.mkDerivation rec {
     ln -s ${openssl.bin}/bin openssl
     ln -s ${openssl.dev}/include openssl
     export SSL_PREFIX=$(realpath openssl)
-    substituteInPlace plugins_tools/eid-viewer/Makefile.in \
-      --replace "c_rehash" "openssl rehash"
   '';
+
   # pinentry uses hardcoded `/usr/bin/pinentry`, so use the built-in (uglier) dialogs for pinentry.
   configureFlags = [ "--disable-pinentry" ];
 
@@ -81,10 +82,11 @@ stdenv.mkDerivation rec {
     ''
       install -D ${eid-nssdb-in} $out/bin/eid-nssdb
       substituteInPlace $out/bin/eid-nssdb \
-        --replace "modutil" "${nssTools}/bin/modutil"
+        --replace-fail "modutil" "${lib.getExe' nssTools "modutil"}"
 
       rm $out/bin/about-eid-mw
-      wrapProgram $out/bin/eid-viewer --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name"
+      wrapProgram $out/bin/eid-viewer \
+        --prefix XDG_DATA_DIRS : "$out/share/gsettings-schemas/$name"
     '';
 
   enableParallelBuilding = true;

From 6faf5ffc36c2e1dc3f0c0ea821e827002d52d368 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 27 Oct 2025 22:48:03 +0100
Subject: [PATCH 3473/6226] eid-mw: enable `strictDeps`

---
 pkgs/by-name/ei/eid-mw/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ei/eid-mw/package.nix b/pkgs/by-name/ei/eid-mw/package.nix
index 390827b40f40..dc50a7de3d05 100644
--- a/pkgs/by-name/ei/eid-mw/package.nix
+++ b/pkgs/by-name/ei/eid-mw/package.nix
@@ -38,22 +38,24 @@ stdenv.mkDerivation rec {
       --replace-fail 'p11kitcfdir=""' 'p11kitcfdir="'$out/share/p11-kit/modules'"'
   '';
 
+  strictDeps = true;
+
   nativeBuildInputs = [
-    wrapGAppsHook3
-    autoreconfHook
     autoconf-archive
-    pkg-config
+    autoreconfHook
+    libassuan
     makeBinaryWrapper
+    openssl
+    pkg-config
+    wrapGAppsHook3
   ];
 
   buildInputs = [
     curl
     gtk3
-    libassuan
     libbsd
     libproxy
     libxml2
-    openssl
     p11-kit
     pcsclite
   ];

From 7358ea8e2549257e08c3b55b3dcdc4d163233c01 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Mon, 27 Oct 2025 23:02:29 +0100
Subject: [PATCH 3474/6226] eid-mw: use `finalAttrs` pattern

---
 pkgs/by-name/ei/eid-mw/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ei/eid-mw/package.nix b/pkgs/by-name/ei/eid-mw/package.nix
index dc50a7de3d05..0dd756c2ece0 100644
--- a/pkgs/by-name/ei/eid-mw/package.nix
+++ b/pkgs/by-name/ei/eid-mw/package.nix
@@ -20,7 +20,7 @@
   wrapGAppsHook3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "eid-mw";
   # NOTE: Don't just blindly update to the latest version/tag. Releases are always for a specific OS.
   version = "5.1.25";
@@ -28,12 +28,12 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Fedict";
     repo = "eid-mw";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-LdOfwgRGyNK+a4SByClPgH9SrDeCdnhI9sLO7agsNsA=";
   };
 
   postPatch = ''
-    sed 's@m4_esyscmd_s(.*,@[${version}],@' -i configure.ac
+    sed 's@m4_esyscmd_s(.*,@[${finalAttrs.version}],@' -i configure.ac
     substituteInPlace configure.ac \
       --replace-fail 'p11kitcfdir=""' 'p11kitcfdir="'$out/share/p11-kit/modules'"'
   '';
@@ -127,4 +127,4 @@ stdenv.mkDerivation rec {
       chvp
     ];
   };
-}
+})

From 08a5969b1ef10523e0755dfa154473147c9ac95f Mon Sep 17 00:00:00 2001
From: John Titor <50095635+JohnRTitor@users.noreply.github.com>
Date: Tue, 28 Oct 2025 13:26:28 +0530
Subject: [PATCH 3475/6226] openbangla-keyboard: unstable-2023-07-21 >
 2.0.0-unstable-2025-08-19

add johnrtitor as maintainer
---
 .../misc/openbangla-keyboard/Cargo.lock       | 247 ++++++++++--------
 .../misc/openbangla-keyboard/default.nix      |  33 +--
 2 files changed, 155 insertions(+), 125 deletions(-)

diff --git a/pkgs/applications/misc/openbangla-keyboard/Cargo.lock b/pkgs/applications/misc/openbangla-keyboard/Cargo.lock
index d0bfd1e1783e..1bde0909ddfd 100644
--- a/pkgs/applications/misc/openbangla-keyboard/Cargo.lock
+++ b/pkgs/applications/misc/openbangla-keyboard/Cargo.lock
@@ -4,105 +4,108 @@ version = 3
 
 [[package]]
 name = "ahash"
-version = "0.7.6"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
 dependencies = [
+ "cfg-if",
  "getrandom",
  "once_cell",
+ "serde",
  "version_check",
+ "zerocopy",
 ]
 
 [[package]]
 name = "aho-corasick"
-version = "1.1.1"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea5d730647d4fadd988536d06fecce94b7b4f2a7efdae548f1cf4b63205518ab"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
 
 [[package]]
 name = "edit-distance"
-version = "2.1.0"
+version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbbaaaf38131deb9ca518a274a45bfdb8771f139517b073b16c2d3d32ae5037b"
+checksum = "e3f497e87b038c09a155dfd169faa5ec940d0644635555ef6bd464ac20e97397"
 
 [[package]]
 name = "emojicon"
-version = "0.3.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "349cbfb1ca5301d8492ff741487f98fed75957c5e8fee41485e3413359099ef9"
+checksum = "328e1bb7f1b2b87859d560af9ca245e7a0ca664adad1879cb6bd2d49b7501fd4"
+
+[[package]]
+name = "fst"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ab85b9b05e3978cc9a9cf8fea7f01b494e1a09ed3037e16ba39edc7a29eb61a"
 
 [[package]]
 name = "getrandom"
-version = "0.2.10"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
+checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
 dependencies = [
  "cfg-if",
  "libc",
+ "r-efi",
  "wasi",
 ]
 
 [[package]]
 name = "itoa"
-version = "1.0.9"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "libc"
-version = "0.2.148"
+version = "0.2.176"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cdc71e17332e86d2e1d38c1f99edcb6288ee11b815fb1a4b049eaa2114d369b"
-
-[[package]]
-name = "matches"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
+checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174"
 
 [[package]]
 name = "memchr"
-version = "2.6.3"
+version = "2.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c"
+checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
 
 [[package]]
 name = "okkhor"
-version = "0.5.2"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6ef452078c9fb34be8842a52484bf9271e01ac2795e3d15ee90357fb45c102f"
+checksum = "0bc911c392067af1e3c7cde21774ea70dd285b4125b5e3d5febc283b76b9d6a4"
 
 [[package]]
 name = "once_cell"
-version = "1.18.0"
+version = "1.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
+checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e"
 
 [[package]]
 name = "phf"
-version = "0.10.1"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259"
+checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
 dependencies = [
  "phf_macros",
  "phf_shared",
- "proc-macro-hack",
 ]
 
 [[package]]
 name = "phf_generator"
-version = "0.10.0"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d5285893bb5eb82e6aaf5d59ee909a06a16737a8970984dd7746ba9283498d6"
+checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
 dependencies = [
  "phf_shared",
  "rand",
@@ -110,85 +113,65 @@ dependencies = [
 
 [[package]]
 name = "phf_macros"
-version = "0.10.0"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0"
+checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
 dependencies = [
  "phf_generator",
  "phf_shared",
- "proc-macro-hack",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn",
 ]
 
 [[package]]
 name = "phf_shared"
-version = "0.10.0"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6796ad771acdc0123d2a88dc428b5e38ef24456743ddb1744ed628f9815c096"
+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
 dependencies = [
  "siphasher",
 ]
 
 [[package]]
 name = "poriborton"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c081c9ef49e856f39ccd59e4943582b1e47225eb01b0debc1d388c4daa55b0dd"
+checksum = "964aa77aab32f321000ec0b121ab2a27565e051fb7ff979c22d6e21a90376f14"
 dependencies = [
- "matches",
  "phf",
 ]
 
-[[package]]
-name = "ppv-lite86"
-version = "0.2.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
-
-[[package]]
-name = "proc-macro-hack"
-version = "0.5.20+deprecated"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc375e1527247fe1a97d8b7156678dfe7c1af2fc075c9a4db3690ecd2a148068"
-
 [[package]]
 name = "proc-macro2"
-version = "1.0.67"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
 
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
 [[package]]
 name = "rand"
 version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
 dependencies = [
- "libc",
- "rand_chacha",
- "rand_core",
-]
-
-[[package]]
-name = "rand_chacha"
-version = "0.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
-dependencies = [
- "ppv-lite86",
  "rand_core",
 ]
 
@@ -197,9 +180,6 @@ name = "rand_core"
 version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-dependencies = [
- "getrandom",
-]
 
 [[package]]
 name = "regex"
@@ -240,52 +220,72 @@ dependencies = [
  "okkhor",
  "poriborton",
  "regex",
+ "rustversion",
  "serde_json",
  "stringplus",
+ "upodesh",
 ]
 
 [[package]]
-name = "ryu"
-version = "1.0.15"
+name = "rustversion"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
 
 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.226"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "0dca6411025b24b60bfa7ec1fe1f8e710ac09782dca409ee8237ba74b51295fd"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.226"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba2ba63999edb9dac981fb34b3e5c0d111a69b0924e253ed29d83f7c99e966a4"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.226"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "8db53ae22f34573731bafa1db20f04027b2d25e02d8205921b569171699cdb33"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.37",
+ "syn",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.107"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
  "itoa",
+ "memchr",
  "ryu",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "siphasher"
-version = "0.3.11"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "stringplus"
@@ -295,20 +295,9 @@ checksum = "9057d3b491a3eee749e52560657c4d93b0badc04fb3fa8dae3c942c5c066f222"
 
 [[package]]
 name = "syn"
-version = "1.0.109"
+version = "2.0.106"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.37"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -317,18 +306,68 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
+
+[[package]]
+name = "upodesh"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af0dcd57dc7aa39411df5c9c8046ee7439a619e7881a43aba328bd533ae54a91"
+dependencies = [
+ "fst",
+ "once_cell",
+ "serde",
+ "serde_json",
+]
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
+version = "0.14.7+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+checksum = "883478de20367e224c0090af9cf5f9fa85bed63a95c1abf3afc5c083ebc06e8c"
+dependencies = [
+ "wasip2",
+]
+
+[[package]]
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+
+[[package]]
+name = "zerocopy"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
diff --git a/pkgs/applications/misc/openbangla-keyboard/default.nix b/pkgs/applications/misc/openbangla-keyboard/default.nix
index b2239c5d38a8..510402f40417 100644
--- a/pkgs/applications/misc/openbangla-keyboard/default.nix
+++ b/pkgs/applications/misc/openbangla-keyboard/default.nix
@@ -12,34 +12,22 @@
   ibus,
   qtbase,
   zstd,
-  fetchpatch,
   withFcitx5Support ? false,
   withIbusSupport ? false,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "openbangla-keyboard";
-  version = "unstable-2023-07-21";
+  version = "2.0.0-unstable-2025-08-19";
 
   src = fetchFromGitHub {
     owner = "openbangla";
     repo = "openbangla-keyboard";
-    # no upstream release in 3 years
-    # fcitx5 support was added over a year after the last release
-    rev = "780bd40eed16116222faff044bfeb61a07af158f";
-    hash = "sha256-4CR4lgHB51UvS/RLc0AEfIKJ7dyTCOfDrQdGLf9de8E=";
+    rev = "723e348ad2cb0607684d907ce8a9457e12993f4f";
+    hash = "sha256-XAcL4gBcu84DMR6o9JSJ/PmI1PsDdTETknD6C48E8ek=";
     fetchSubmodules = true;
   };
 
-  patches = [
-    # prevents runtime crash when fcitx5-based IM attempts to look in /usr
-    (fetchpatch {
-      name = "use-CMAKE_INSTALL_PREFIX-for-loading-data.patch";
-      url = "https://github.com/OpenBangla/OpenBangla-Keyboard/commit/f402472780c29eaa6b4cc841a70289adf171462b.diff";
-      hash = "sha256-YahvtyOxe8F40Wfe+31C6fdmm197QN26/Q67oinOplk=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -62,8 +50,8 @@ stdenv.mkDerivation rec {
     ];
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit src cargoRoot postPatch;
-    hash = "sha256-qZMTZi7eqEp5kSmVx7qdS7eDKOzSv9fMjWT0h/MGyeY=";
+    inherit (finalAttrs) src cargoRoot postPatch;
+    hash = "sha256-UrS12fcXIIT3xhl/nyegwROBMCIepi6n07CS5CEA2BY=";
   };
 
   cmakeFlags =
@@ -76,7 +64,7 @@ stdenv.mkDerivation rec {
 
   cargoRoot = "src/engine/riti";
   postPatch = ''
-    cp ${./Cargo.lock} ${cargoRoot}/Cargo.lock
+    cp ${./Cargo.lock} ${finalAttrs.cargoRoot}/Cargo.lock
   '';
 
   meta = {
@@ -85,9 +73,12 @@ stdenv.mkDerivation rec {
     mainProgram = "openbangla-gui";
     homepage = "https://openbangla.github.io/";
     license = lib.licenses.gpl3Plus;
-    maintainers = with lib.maintainers; [ hqurve ];
+    maintainers = with lib.maintainers; [
+      hqurve
+      johnrtitor
+    ];
     platforms = lib.platforms.linux;
     # never built on aarch64-linux since first introduction in nixpkgs
     broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64;
   };
-}
+})

From 1f167aa460ef03acfe552fcad0410a512ec5fb79 Mon Sep 17 00:00:00 2001
From: Slava Gorbunov <slava@fizlesh.org.ru>
Date: Mon, 27 Oct 2025 20:40:58 +0300
Subject: [PATCH 3476/6226] ghc: provide JavaScript CPP command for ghcjs build

---
 pkgs/development/compilers/ghc/common-hadrian.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index 9de5636d43a3..1097692029db 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -859,6 +859,12 @@ stdenv.mkDerivation (
       ghc-settings-edit "$settingsFile" \
       "windres command" "${toolPath "windres" installCC}"
     ''
+    + lib.optionalString stdenv.targetPlatform.isGhcjs ''
+      ghc-settings-edit "$settingsFile" \
+        "JavaScript CPP command" "${toolPath "cc" installCC}"
+      ghc-settings-edit "$settingsFile" \
+        "JavaScript CPP flags" "-E"
+    ''
     + ''
 
       # Install the bash completion file.

From 8006401609390cc5d453a275e305eeee24bab96f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 08:10:29 +0000
Subject: [PATCH 3477/6226] polarity: latest-unstable-2025-10-14 ->
 latest-unstable-2025-10-27

---
 pkgs/by-name/po/polarity/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix
index 5124b0f8856f..b43ed6676176 100644
--- a/pkgs/by-name/po/polarity/package.nix
+++ b/pkgs/by-name/po/polarity/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "polarity";
-  version = "latest-unstable-2025-10-14";
+  version = "latest-unstable-2025-10-27";
 
   src = fetchFromGitHub {
     owner = "polarity-lang";
     repo = "polarity";
-    rev = "cd882ce79d4ebd4527f87386dba32574cefc9535";
-    hash = "sha256-aRFAWIp8luAofr/5rSNYZQgjsZFeU8xvTE7RrnHRKKI=";
+    rev = "bac4a2ba743551fe5986d8b4e840ee53ae8e065d";
+    hash = "sha256-7sp/7U1AoudUEEM9Pa4BcXNRiym70MnOx3NiSUOQb9o=";
   };
 
-  cargoHash = "sha256-yU+P8CqefuyDDYiaoslQ58HsXDT6iKzmNYekZwaaL3A=";
+  cargoHash = "sha256-DyqK5cxdsZWMr79clw8oRHTAAlzGzP8i4Vu/UXH/ptE=";
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 

From f69ea78c9e09ec4de3de3037604eedab54fffbe6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 08:15:26 +0000
Subject: [PATCH 3478/6226] simdjson: 4.0.7 -> 4.1.0

---
 pkgs/by-name/si/simdjson/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/simdjson/package.nix b/pkgs/by-name/si/simdjson/package.nix
index d4ee91794e25..de01315c7b0b 100644
--- a/pkgs/by-name/si/simdjson/package.nix
+++ b/pkgs/by-name/si/simdjson/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "simdjson";
-  version = "4.0.7";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "simdjson";
     repo = "simdjson";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8pmFtMpML7tTXbH1E3aIpSTQkNF8TFcIPOm2nwnKxkA=";
+    hash = "sha256-N3NPE9R8VipspCwH2dY339WUGt51aqkYpLTr/PPVRQ4=";
   };
 
   nativeBuildInputs = [ cmake ];

From ce515224a41375fb6e3d8955a1585f0c1b53e4ed Mon Sep 17 00:00:00 2001
From: misuzu <bakalolka@gmail.com>
Date: Tue, 28 Oct 2025 10:29:08 +0200
Subject: [PATCH 3479/6226] alfis: gui variant is fixed now

---
 pkgs/by-name/al/alfis/package.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/by-name/al/alfis/package.nix b/pkgs/by-name/al/alfis/package.nix
index 0fedc77cc4f7..67ff87511302 100644
--- a/pkgs/by-name/al/alfis/package.nix
+++ b/pkgs/by-name/al/alfis/package.nix
@@ -52,8 +52,5 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ misuzu ];
     platforms = lib.platforms.unix;
     mainProgram = "alfis";
-    # needs libsoup-2.4, which is soon going to be removed
-    # https://github.com/NixOS/nixpkgs/pull/450065
-    broken = withGui;
   };
 }

From 4b6c79a69c967a03b29e0e50e6dbde803774b46f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 08:36:15 +0000
Subject: [PATCH 3480/6226] opengamepadui: 0.42.0 -> 0.42.1

---
 pkgs/by-name/op/opengamepadui/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/opengamepadui/package.nix b/pkgs/by-name/op/opengamepadui/package.nix
index a1e1c0759566..125fb493ba54 100644
--- a/pkgs/by-name/op/opengamepadui/package.nix
+++ b/pkgs/by-name/op/opengamepadui/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "opengamepadui";
-  version = "0.42.0";
+  version = "0.42.1";
 
   buildType = if withDebug then "debug" else "release";
 
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "ShadowBlip";
     repo = "OpenGamepadUI";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8+ZPvu4Gen7P8uKLrPXNaSqkdrUxz9K/naZxy/WoCik=";
+    hash = "sha256-v+nLluz3Zxvcvx491NxMx+obwfdRJycGLyBAhviRktU=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From 0eac4ec1f23a876c80e4828507316318897802ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 08:41:48 +0000
Subject: [PATCH 3481/6226] crosvm: 0-unstable-2025-10-21 ->
 0-unstable-2025-10-27

---
 pkgs/by-name/cr/crosvm/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix
index 0b3d9291048f..0d01d8291ccb 100644
--- a/pkgs/by-name/cr/crosvm/package.nix
+++ b/pkgs/by-name/cr/crosvm/package.nix
@@ -21,18 +21,18 @@
 
 rustPlatform.buildRustPackage {
   pname = "crosvm";
-  version = "0-unstable-2025-10-21";
+  version = "0-unstable-2025-10-27";
 
   src = fetchgit {
     url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
-    rev = "f6de423867b914a59d86c54d102831bccc7ed2c8";
-    hash = "sha256-xTuu1tMoFuMcj2RqtGjyDbcFPh3bTCtWpr0fuND4aos=";
+    rev = "4630761f03d5a389d36c22bf685df107b43083a7";
+    hash = "sha256-hp90A/uSXS/RNn1HCCWF4Sv3X8AOtcCOk9DRv95epVc=";
     fetchSubmodules = true;
   };
 
   separateDebugInfo = true;
 
-  cargoHash = "sha256-ROj0qOnePzkuzck6jXgjvOM9ksL/ubZOxOtku1B7dZA=";
+  cargoHash = "sha256-P6vFWs9lVn4EkXUVOi+3s/tptAV/J7tH5GBCQv/dwUA=";
 
   nativeBuildInputs = [
     pkg-config

From 0a43db73ee73a06e9f0727e5e7d1f0c6e5fdc6b2 Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Tue, 28 Oct 2025 10:37:27 +0200
Subject: [PATCH 3482/6226] qalculate-qt: 5.8.0 -> 5.8.1

Diff: https://github.com/qalculate/qalculate-qt/compare/v5.8.0...v5.8.1
---
 pkgs/by-name/qa/qalculate-qt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qa/qalculate-qt/package.nix b/pkgs/by-name/qa/qalculate-qt/package.nix
index 05eaf177e2d7..96bedc89e8e4 100644
--- a/pkgs/by-name/qa/qalculate-qt/package.nix
+++ b/pkgs/by-name/qa/qalculate-qt/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qalculate-qt";
-  version = "5.8.0";
+  version = "5.8.1";
 
   src = fetchFromGitHub {
     owner = "qalculate";
     repo = "qalculate-qt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tVIKvpH43fmKZ7ezTwgeQ1T9yEx2sOne49oNo6Ti2lw=";
+    hash = "sha256-xrhN/xacQJ2WdrM330YadZjvnmB2T7uZvFSAWA5GO2w=";
   };
 
   nativeBuildInputs = with qt6; [

From 5020cbe8c14b6e660862de2c43cea36d38445d90 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 28 Oct 2025 08:34:56 +0000
Subject: [PATCH 3483/6226] python3Packages.imagecodecs: cleanup, fix

---
 .../python-modules/imagecodecs/default.nix    | 23 +++++++++++++------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/imagecodecs/default.nix b/pkgs/development/python-modules/imagecodecs/default.nix
index 6d0411ce16d9..b3e05d9826f0 100644
--- a/pkgs/development/python-modules/imagecodecs/default.nix
+++ b/pkgs/development/python-modules/imagecodecs/default.nix
@@ -2,22 +2,30 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
   cython,
   numpy,
   setuptools,
+
+  # nativeBuildInputs
   pkgs,
-  jxrlib,
   lcms2,
+  openjpeg,
+
+  # buildInputs
+  jxrlib,
   lerc,
   libdeflate,
+  libjpeg,
   libpng,
   libtiff,
   libwebp,
-  openjpeg,
   xz,
   zlib,
-  zstd,
-  pytest,
+
+  # tests
+  pytestCheckHook,
 }:
 
 let
@@ -48,18 +56,19 @@ buildPythonPackage rec {
   ];
 
   buildInputs = [
-    pkgs.lz4
     jxrlib
     lcms2
     lerc
     libdeflate
+    libjpeg
     libpng
     libtiff
     libwebp
+    pkgs.lz4
     openjpeg
     xz # liblzma
     zlib
-    zstd
+    pkgs.zstd
   ];
 
   dependencies = [
@@ -73,7 +82,7 @@ buildPythonPackage rec {
   '';
 
   nativeCheckInputs = [
-    pytest
+    pytestCheckHook
   ];
 
   pythonImportsCheck = [

From fc5a52365a05f0b36f70981c49b25dbcc9da9cc8 Mon Sep 17 00:00:00 2001
From: Adriano Di Luzio <aldur@users.noreply.github.com>
Date: Tue, 28 Oct 2025 10:02:00 +0100
Subject: [PATCH 3484/6226] python3Packages.json-schema-for-humans: skip tests
 broken by click 8.2.1 update

---
 .../python-modules/json-schema-for-humans/default.nix         | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/json-schema-for-humans/default.nix b/pkgs/development/python-modules/json-schema-for-humans/default.nix
index 4f9f2087118d..559443bba339 100644
--- a/pkgs/development/python-modules/json-schema-for-humans/default.nix
+++ b/pkgs/development/python-modules/json-schema-for-humans/default.nix
@@ -62,6 +62,10 @@ buildPythonPackage rec {
     "test_references_url"
     # Tests are failing
     "TestMdGenerate"
+    # Broken since click was updated to 8.2.1 in https://github.com/NixOS/nixpkgs/pull/448189
+    # Click 8.2 separates stdout and stderr, but upstream is on click 8.1 (https://github.com/pallets/click/pull/2523)
+    "test_nonexistent_output_path"
+    "test_config_parameters_with_nonexistent_output_path"
   ];
 
   pythonImportsCheck = [ "json_schema_for_humans" ];

From eb630855e3cf7dfb5e3015835211ac3b4bc661ac Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 26 Oct 2025 19:50:01 +0000
Subject: [PATCH 3485/6226] aliases: make `gitAndTools` throw
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This previously merged in `self`, so the flattened attribute set was
not quite correct, but it’s ancient anyway.
---
 pkgs/top-level/aliases.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d1246b076e33..307f5bf723c0 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1061,13 +1061,7 @@ mapAliases {
   git-codeowners = throw "'git-codeowners' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   git-credential-1password = throw "'git-credential-1password' has been removed, as the upstream project is deleted."; # Added 2024-05-20
   git-stree = throw "'git-stree' has been deprecated by upstream. Upstream recommends using 'git-subrepo' as a replacement."; # Added 2025-05-05
-  gitAndTools.darcsToGit = darcs-to-git; # Added 2021-01-14
-  gitAndTools.gitAnnex = git-annex; # Added 2021-01-14
-  gitAndTools.gitBrunch = git-brunch; # Added 2021-01-14
-  gitAndTools.gitFastExport = git-fast-export; # Added 2021-01-14
-  gitAndTools.gitRemoteGcrypt = git-remote-gcrypt; # Added 2021-01-14
-  gitAndTools.svn_all_fast_export = svn-all-fast-export; # Added 2021-01-14
-  gitAndTools.topGit = top-git; # Added 2021-01-14
+  gitAndTools = throw "gitAndTools has been removed, as the packages are now available at the top level"; # Converted to throw 2025-10-26
   gitversion = throw "'gitversion' has been removed because it produced a broken build and was unmaintained"; # Added 2025-08-30
   givaro_3 = throw "'givaro_3' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07
   givaro_3_7 = throw "'givaro_3_7' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07

From 21f0acff674869462f62bc835f0e603a123cbcd2 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 26 Oct 2025 19:50:01 +0000
Subject: [PATCH 3486/6226] aliases: flatten attribute sets
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The script can’t handle these.
---
 pkgs/top-level/aliases.nix | 138 ++++++++++++++++---------------------
 1 file changed, 58 insertions(+), 80 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 307f5bf723c0..07adcd2dae88 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -435,13 +435,9 @@ mapAliases {
   afpfs-ng = throw "'afpfs-ng' has been removed as it was broken and unmaintained for 10 years"; # Added 2025-05-17
   agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10
   ajour = throw "ajour has been removed, the project was archived upstream on 2024-09-17."; # Added 2025-03-12
-  akkoma-emoji = recurseIntoAttrs {
-    blobs_gg = lib.warnOnInstantiate "'akkoma-emoji.blobs_gg' has been renamed to 'blobs_gg'" blobs_gg; # Added 2025-03-14
-  };
-  akkoma-frontends = recurseIntoAttrs {
-    admin-fe = lib.warnOnInstantiate "'akkoma-frontends.admin-fe' has been renamed to 'akkoma-admin-fe'" akkoma-admin-fe; # Added 2025-03-14
-    akkoma-fe = lib.warnOnInstantiate "'akkoma-frontends.akkoma-fe' has been renamed to 'akkoma-fe'" akkoma-fe; # Added 2025-03-14
-  };
+  akkoma-emoji = lib.warnOnInstantiate "'akkoma-emoji.blobs_gg' has been renamed to 'blobs_gg'" blobs_gg; # Added 2025-03-14
+  akkoma-frontends.admin-fe = lib.warnOnInstantiate "'akkoma-frontends.admin-fe' has been renamed to 'akkoma-admin-fe'" akkoma-admin-fe; # Added 2025-03-14
+  akkoma-frontends.akkoma-fe = lib.warnOnInstantiate "'akkoma-frontends.akkoma-fe' has been renamed to 'akkoma-fe'" akkoma-fe; # Added 2025-03-14
   alass = throw "'alass' has been removed due to being unmaintained upstream"; # Added 2025-01-25
   alsaLib = throw "'alsaLib' has been renamed to/replaced by 'alsa-lib'"; # Converted to throw 2024-10-17
   alsaOss = throw "'alsaOss' has been renamed to/replaced by 'alsa-oss'"; # Converted to throw 2024-10-17
@@ -1324,18 +1320,16 @@ mapAliases {
   kubei = kubeclarity; # Added 2023-05-20
   kubo-migrator-all-fs-repo-migrations = kubo-fs-repo-migrations; # Added 2024-09-24
   l3afpad = throw "'l3afpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-09-14
-  languageMachines = {
-    ticcutils = ticcutils;
-    libfolia = libfolia;
-    ucto = ucto;
-    uctodata = uctodata;
-    timbl = timbl;
-    timblserver = timblserver;
-    mbt = mbt;
-    frog = frog;
-    frogdata = frogdata;
-    test = frog.tests.simple;
-  }; # Added 2025-10-07
+  languageMachines.frog = frog; # Added 2025-10-7
+  languageMachines.frogdata = frogdata; # Added 2025-10-7
+  languageMachines.libfolia = libfolia; # Added 2025-10-7
+  languageMachines.mbt = mbt; # Added 2025-10-7
+  languageMachines.test = frog.tests.simple; # Added 2025-10-7
+  languageMachines.ticcutils = ticcutils; # Added 2025-10-7
+  languageMachines.timbl = timbl; # Added 2025-10-7
+  languageMachines.timblserver = timblserver; # Added 2025-10-7
+  languageMachines.ucto = ucto; # Added 2025-10-7
+  languageMachines.uctodata = uctodata; # Added 2025-10-7
   lanzaboote-tool = throw "lanzaboote-tool has been removed due to lack of integration maintenance with nixpkgs. Consider using the Nix expressions provided by https://github.com/nix-community/lanzaboote"; # Added 2025-07-23
   larynx = piper-tts; # Added 2023-05-09
   LASzip2 = laszip_2; # Added 2024-06-12
@@ -1619,16 +1613,14 @@ mapAliases {
     Consider migrating or switching to Incus, or remove from your configuration.
     https://linuxcontainers.org/incus/docs/main/howto/server_migrate_lxd/
   "; # Added 2025-09-05
-  lxde = {
-    gtk2-x11 = throw "'lxde.gtk2-x11' has been removed. Use 'gtk2-x11' directly."; # added 2025-08-31
-    lxappearance = throw "'lxappearance' has been moved to top-level. Use 'lxappearance' directly"; # added 2025-08-31
-    lxappearance-gtk2 = throw "'lxappearance-gtk2' has been moved to top-level. Use 'lxappearance-gtk2' directly"; # added 2025-08-31
-    lxmenu-data = throw "'lxmenu-data' has been moved to top-level. Use 'lxmenu-data' directly"; # added 2025-08-31
-    lxpanel = throw "'lxpanel' has been moved to top-level. Use 'lxpanel' directly"; # added 2025-08-31
-    lxrandr = throw "'lxrandr' has been moved to top-level. Use 'lxrandr' directly"; # added 2025-08-31
-    lxsession = throw "'lxsession' has been moved to top-level. Use 'lxsession' directly"; # added 2025-08-31
-    lxtask = throw "'lxtask' has been moved to top-level. Use 'lxtask' directly"; # added 2025-08-31
-  };
+  lxde.gtk2-x11 = throw "'lxde.gtk2-x11' has been removed. Use 'gtk2-x11' directly."; # added 2025-08-31
+  lxde.lxappearance = throw "'lxappearance' has been moved to top-level. Use 'lxappearance' directly"; # added 2025-08-31
+  lxde.lxappearance-gtk2 = throw "'lxappearance-gtk2' has been moved to top-level. Use 'lxappearance-gtk2' directly"; # added 2025-08-31
+  lxde.lxmenu-data = throw "'lxmenu-data' has been moved to top-level. Use 'lxmenu-data' directly"; # added 2025-08-31
+  lxde.lxpanel = throw "'lxpanel' has been moved to top-level. Use 'lxpanel' directly"; # added 2025-08-31
+  lxde.lxrandr = throw "'lxrandr' has been moved to top-level. Use 'lxrandr' directly"; # added 2025-08-31
+  lxde.lxsession = throw "'lxsession' has been moved to top-level. Use 'lxsession' directly"; # added 2025-08-31
+  lxde.lxtask = throw "'lxtask' has been moved to top-level. Use 'lxtask' directly"; # added 2025-08-31
   lxdvdrip = throw "'lxdvdrip' has been removed due to lack of upstream maintenance."; # Added 2025-06-09
   lzma = throw "'lzma' has been renamed to/replaced by 'xz'"; # Converted to throw 2024-10-17
   lzwolf = throw "'lzwolf' has been removed because it's no longer maintained upstream. Consider using 'ecwolf'"; # Added 2025-03-02
@@ -1691,10 +1683,8 @@ mapAliases {
   matomo_5 = matomo; # Added 2024-12-12
   matrique = throw "'matrique' has been renamed to/replaced by 'spectral'"; # Converted to throw 2024-10-17
   matrix-sliding-sync = throw "matrix-sliding-sync has been removed as matrix-synapse 114.0 and later covers its functionality"; # Added 2024-10-20
-  matrix-synapse-tools = recurseIntoAttrs {
-    rust-synapse-compress-state = lib.warnOnInstantiate "`matrix-synapse-tools.rust-synapse-compress-state` has been renamed to `rust-synapse-compress-state`" rust-synapse-compress-state; # Added 2025-03-04
-    synadm = lib.warnOnInstantiate "`matrix-synapse-tools.synadm` has been renamed to `synadm`" synadm; # Added 2025-02-20
-  }; # Added 2025-02-20
+  matrix-synapse-tools.rust-synapse-compress-state = lib.warnOnInstantiate "`matrix-synapse-tools.rust-synapse-compress-state` has been renamed to `rust-synapse-compress-state`" rust-synapse-compress-state; # Added 2025-03-04
+  matrix-synapse-tools.synadm = lib.warnOnInstantiate "`matrix-synapse-tools.synadm` has been renamed to `synadm`" synadm; # Added 2025-02-20
   mcomix3 = mcomix; # Added 2022-06-05
   mdt = md-tui; # Added 2024-09-03
   mediastreamer = throw "'mediastreamer' has been moved to 'linphonePackages.mediastreamer2'"; # Added 2025-09-20
@@ -1797,24 +1787,22 @@ mapAliases {
   netbox_3_7 = throw "netbox 3.7 series has been removed as it was EOL"; # Added 2025-04-23
   netbox_4_1 = throw "netbox 4.1 series has been removed as it was EOL"; # Added 2025-10-14
   netbsdCross = netbsd; # Added 2024-09-06
-  netsurf = recurseIntoAttrs {
-    browser = lib.warnOnInstantiate "'netsurf.browser' has been renamed to 'netsurf-browser'" netsurf-browser; # Added 2025-03-26
-    buildsystem = lib.warnOnInstantiate "'netsurf.buildsystem' has been renamed to 'netsurf-buildsystem'" netsurf-buildsystem; # Added 2025-03-26
-    libcss = lib.warnOnInstantiate "'netsurf.libcss' has been renamed to 'libcss'" libcss; # Added 2025-03-26
-    libdom = lib.warnOnInstantiate "'netsurf.libdom' has been renamed to 'libdom'" libdom; # Added 2025-03-26
-    libhubbub = lib.warnOnInstantiate "'netsurf.libhubbub' has been renamed to 'libhubbub'" libhubbub; # Added 2025-03-26
-    libnsbmp = lib.warnOnInstantiate "'netsurf.libnsbmp' has been renamed to 'libnsbmp'" libnsbmp; # Added 2025-03-26
-    libnsfb = lib.warnOnInstantiate "'netsurf.libnsfb' has been renamed to 'libnsfb'" libnsfb; # Added 2025-03-26
-    libnsgif = lib.warnOnInstantiate "'netsurf.libnsgif' has been renamed to 'libnsgif'" libnsgif; # Added 2025-03-26
-    libnslog = lib.warnOnInstantiate "'netsurf.libnslog' has been renamed to 'libnslog'" libnslog; # Added 2025-03-26
-    libnspsl = lib.warnOnInstantiate "'netsurf.libnspsl' has been renamed to 'libnspsl'" libnspsl; # Added 2025-03-26
-    libnsutils = lib.warnOnInstantiate "'netsurf.libnsutils' has been renamed to 'libnsutils'" libnsutils; # Added 2025-03-26
-    libparserutils = lib.warnOnInstantiate "'netsurf.libparserutils' has been renamed to 'libparserutils'" libparserutils; # Added 2025-03-26
-    libsvgtiny = lib.warnOnInstantiate "'netsurf.libsvgtiny' has been renamed to 'libsvgtiny'" libsvgtiny; # Added 2025-03-26
-    libutf8proc = lib.warnOnInstantiate "'netsurf.libutf8proc' has been renamed to 'libutf8proc'" libutf8proc; # Added 2025-03-26
-    libwapcaplet = lib.warnOnInstantiate "'netsurf.libwapcaplet' has been renamed to 'libwapcaplet'" libwapcaplet; # Added 2025-03-26
-    nsgenbind = lib.warnOnInstantiate "'netsurf.nsgenbind' has been renamed to 'nsgenbind'" nsgenbind; # Added 2025-03-26
-  };
+  netsurf.browser = lib.warnOnInstantiate "'netsurf.browser' has been renamed to 'netsurf-browser'" netsurf-browser; # Added 2025-03-26
+  netsurf.buildsystem = lib.warnOnInstantiate "'netsurf.buildsystem' has been renamed to 'netsurf-buildsystem'" netsurf-buildsystem; # Added 2025-03-26
+  netsurf.libcss = lib.warnOnInstantiate "'netsurf.libcss' has been renamed to 'libcss'" libcss; # Added 2025-03-26
+  netsurf.libdom = lib.warnOnInstantiate "'netsurf.libdom' has been renamed to 'libdom'" libdom; # Added 2025-03-26
+  netsurf.libhubbub = lib.warnOnInstantiate "'netsurf.libhubbub' has been renamed to 'libhubbub'" libhubbub; # Added 2025-03-26
+  netsurf.libnsbmp = lib.warnOnInstantiate "'netsurf.libnsbmp' has been renamed to 'libnsbmp'" libnsbmp; # Added 2025-03-26
+  netsurf.libnsfb = lib.warnOnInstantiate "'netsurf.libnsfb' has been renamed to 'libnsfb'" libnsfb; # Added 2025-03-26
+  netsurf.libnsgif = lib.warnOnInstantiate "'netsurf.libnsgif' has been renamed to 'libnsgif'" libnsgif; # Added 2025-03-26
+  netsurf.libnslog = lib.warnOnInstantiate "'netsurf.libnslog' has been renamed to 'libnslog'" libnslog; # Added 2025-03-26
+  netsurf.libnspsl = lib.warnOnInstantiate "'netsurf.libnspsl' has been renamed to 'libnspsl'" libnspsl; # Added 2025-03-26
+  netsurf.libnsutils = lib.warnOnInstantiate "'netsurf.libnsutils' has been renamed to 'libnsutils'" libnsutils; # Added 2025-03-26
+  netsurf.libparserutils = lib.warnOnInstantiate "'netsurf.libparserutils' has been renamed to 'libparserutils'" libparserutils; # Added 2025-03-26
+  netsurf.libsvgtiny = lib.warnOnInstantiate "'netsurf.libsvgtiny' has been renamed to 'libsvgtiny'" libsvgtiny; # Added 2025-03-26
+  netsurf.libutf8proc = lib.warnOnInstantiate "'netsurf.libutf8proc' has been renamed to 'libutf8proc'" libutf8proc; # Added 2025-03-26
+  netsurf.libwapcaplet = lib.warnOnInstantiate "'netsurf.libwapcaplet' has been renamed to 'libwapcaplet'" libwapcaplet; # Added 2025-03-26
+  netsurf.nsgenbind = lib.warnOnInstantiate "'netsurf.nsgenbind' has been renamed to 'nsgenbind'" nsgenbind; # Added 2025-03-26
   nettools = net-tools; # Added 2025-06-11
   networkmanager_strongswan = networkmanager-strongswan; # added 2025-06-29
   newlib-nanoCross = newlib-nano; # Added 2024-09-06
@@ -2373,18 +2361,14 @@ mapAliases {
   source-han-serif-korean = source-han-serif; # Added 2020-02-10
   source-han-serif-simplified-chinese = source-han-serif; # Added 2020-02-10
   source-han-serif-traditional-chinese = source-han-serif; # Added 2020-02-10
-  sourceHanSansPackages = {
-    japanese = source-han-sans; # Added 2020-02-10
-    korean = source-han-sans; # Added 2020-02-10
-    simplified-chinese = source-han-sans; # Added 2020-02-10
-    traditional-chinese = source-han-sans; # Added 2020-02-10
-  };
-  sourceHanSerifPackages = {
-    japanese = source-han-serif; # Added 2020-02-10
-    korean = source-han-serif; # Added 2020-02-10
-    simplified-chinese = source-han-serif; # Added 2020-02-10
-    traditional-chinese = source-han-serif; # Added 2020-02-10
-  };
+  sourceHanSansPackages.japanese = source-han-sans; # Added 2020-02-10
+  sourceHanSansPackages.korean = source-han-sans; # Added 2020-02-10
+  sourceHanSansPackages.simplified-chinese = source-han-sans; # Added 2020-02-10
+  sourceHanSansPackages.traditional-chinese = source-han-sans; # Added 2020-02-10
+  sourceHanSerifPackages.japanese = source-han-serif; # Added 2020-02-10
+  sourceHanSerifPackages.korean = source-han-serif; # Added 2020-02-10
+  sourceHanSerifPackages.simplified-chinese = source-han-serif; # Added 2020-02-10
+  sourceHanSerifPackages.traditional-chinese = source-han-serif; # Added 2020-02-10
   sourcehut = throw "'sourcehut.*' has been removed due to being broken and unmaintained"; # Added 2025-06-15
   SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12
   space-orbit = throw "'space-orbit' has been removed because it is unmaintained; Debian upstream stopped tracking it in 2011."; # Added 2025-06-08
@@ -2413,15 +2397,13 @@ mapAliases {
   steam-run-native = steam-run; # added 2022-02-21
   steam-small = steam; # Added 2024-09-12
   steamcontroller = throw "'steamcontroller' has been removed due to lack of upstream maintenance. Consider using 'sc-controller' instead."; # Added 2025-09-20
-  steamPackages = {
-    steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable"; # Added 2024-10-16
-    steam = lib.warnOnInstantiate "`steamPackages.steam` has been moved to top level as `steam-unwrapped`" steam-unwrapped; # Added 2024-10-16
-    steam-fhsenv = lib.warnOnInstantiate "`steamPackages.steam-fhsenv` has been moved to top level as `steam`" steam; # Added 2024-10-16
-    steam-fhsenv-small = lib.warnOnInstantiate "`steamPackages.steam-fhsenv-small` has been moved to top level as `steam`; there is no longer a -small variant" steam; # Added 2024-10-16
-    steam-runtime = throw "`steamPackages.steam-runtime` has been removed, as it's no longer supported or necessary"; # Added 2024-10-16
-    steam-runtime-wrapped = throw "`steamPackages.steam-runtime-wrapped` has been removed, as it's no longer supported or necessary"; # Added 2024-10-16
-    steamcmd = lib.warnOnInstantiate "`steamPackages.steamcmd` has been moved to top level as `steamcmd`" steamcmd; # Added 2024-10-16
-  };
+  steamPackages.steam = lib.warnOnInstantiate "`steamPackages.steam` has been moved to top level as `steam-unwrapped`" steam-unwrapped; # Added 2024-10-16
+  steamPackages.steam-fhsenv = lib.warnOnInstantiate "`steamPackages.steam-fhsenv` has been moved to top level as `steam`" steam; # Added 2024-10-16
+  steamPackages.steam-fhsenv-small = lib.warnOnInstantiate "`steamPackages.steam-fhsenv-small` has been moved to top level as `steam`; there is no longer a -small variant" steam; # Added 2024-10-16
+  steamPackages.steam-runtime = throw "`steamPackages.steam-runtime` has been removed, as it's no longer supported or necessary"; # Added 2024-10-16
+  steamPackages.steam-runtime-wrapped = throw "`steamPackages.steam-runtime-wrapped` has been removed, as it's no longer supported or necessary"; # Added 2024-10-16
+  steamPackages.steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable"; # Added 2024-10-16
+  steamPackages.steamcmd = lib.warnOnInstantiate "`steamPackages.steamcmd` has been moved to top level as `steamcmd`" steamcmd; # Added 2024-10-16
   StormLib = stormlib; # Added 2024-01-21
   strawberry-qt5 = throw "strawberry-qt5 has been replaced by strawberry"; # Added 2024-11-22 and updated 2025-07-19
   strawberry-qt6 = throw "strawberry-qt6 has been replaced by strawberry"; # Added 2025-07-19
@@ -2620,9 +2602,7 @@ mapAliases {
   vaapiVdpau = libva-vdpau-driver; # Added 2024-06-05
   validphys2 = throw "validphys2 has been removed, since it has a broken dependency that was removed"; # Added 2024-08-21
   valum = throw "'valum' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
-  vamp = {
-    vampSDK = vamp-plugin-sdk; # Added 2020-03-26
-  };
+  vamp.vampSDK = vamp-plugin-sdk; # Added 2020-03-26
   varnish74 = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31
   varnish74Packages = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31
   varnish75 = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 2025-03-29
@@ -2786,11 +2766,9 @@ mapAliases {
   zbackup = throw "'zbackup' has been removed due to being unmaintained upstream"; # Added 2025-08-22
   zeal-qt5 = lib.warnOnInstantiate "'zeal-qt5' has been removed from nixpkgs. Please use 'zeal' instead" zeal; # Added 2025-08-31
   zeal-qt6 = lib.warnOnInstantiate "'zeal-qt6' has been renamed to 'zeal'" zeal; # Added 2025-08-31
-  zeroadPackages = recurseIntoAttrs {
-    zeroad = lib.warnOnInstantiate "'zeroadPackages.zeroad' has been renamed to 'zeroad'" zeroad; # Added 2025-03-22
-    zeroad-data = lib.warnOnInstantiate "'zeroadPackages.zeroad-data' has been renamed to 'zeroad-data'" zeroad-data; # Added 2025-03-22
-    zeroad-unwrapped = lib.warnOnInstantiate "'zeroadPackages.zeroad-unwrapped' has been renamed to 'zeroad-unwrapped'" zeroad-unwrapped; # Added 2025-03-22
-  };
+  zeroadPackages.zeroad = lib.warnOnInstantiate "'zeroadPackages.zeroad' has been renamed to 'zeroad'" zeroad; # Added 2025-03-22
+  zeroadPackages.zeroad-data = lib.warnOnInstantiate "'zeroadPackages.zeroad-data' has been renamed to 'zeroad-data'" zeroad-data; # Added 2025-03-22
+  zeroadPackages.zeroad-unwrapped = lib.warnOnInstantiate "'zeroadPackages.zeroad-unwrapped' has been renamed to 'zeroad-unwrapped'" zeroad-unwrapped; # Added 2025-03-22
   zeromq4 = zeromq; # Added 2024-11-03
   zfs_2_1 = throw "zfs 2.1 has been removed as it is EOL. Please upgrade to a newer version"; # Added 2024-12-25
   zfsStable = zfs; # Added 2024-02-26

From 0c6b911a8e94dd1e011d343baaf986bf505549c3 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 26 Oct 2025 19:50:01 +0000
Subject: [PATCH 3487/6226] aliases: flatten aliases to throws
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The script can’t handle these.
---
 pkgs/top-level/aliases.nix | 132 ++++++++++++++++++-------------------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 07adcd2dae88..5ba686854211 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -539,7 +539,7 @@ mapAliases {
   bctoolbox = throw "'bctoolbox' has been moved to 'linphonePackages.bctoolbox'"; # Added 2025-09-20
   bcunit = throw "'bcunit' has been moved to 'linphonePackages.bcunit'"; # Added 2025-09-20
   beam_nox = throw "beam_nox has been removed in favor of beam_minimal or beamMinimalPackages"; # Added 2025-04-01
-  BeatSaberModManager = beatsabermodmanager; # Added 2024-06-12
+  BeatSaberModManager = throw "'beatsabermodmanager' has been removed due to lack of upstream maintainenance. Consider using 'bs-manager' instead"; # Added 2025-03-18
   beatsabermodmanager = throw "'beatsabermodmanager' has been removed due to lack of upstream maintainenance. Consider using 'bs-manager' instead"; # Added 2025-03-18
   beets-unstable = throw "beets-unstable has been removed in favor of beets since upstream is releasing versions frequently nowadays"; # Added 2025-10-16
   beetsPackages = throw "beetsPackages were replaced with python3.pkgs.beets- prefixed attributes, and top-level beets* attributes"; # Added 2025-10-16
@@ -671,7 +671,7 @@ mapAliases {
   clang16Stdenv = throw "clang16Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   clang17Stdenv = throw "clang17Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   clang-sierraHack = throw "clang-sierraHack has been removed because it solves a problem that no longer seems to exist. Hey, what were you even doing with that thing anyway?"; # Added 2024-10-05
-  clang-sierraHack-stdenv = clang-sierraHack; # Added 2024-10-05
+  clang-sierraHack-stdenv = throw "clang-sierraHack has been removed because it solves a problem that no longer seems to exist. Hey, what were you even doing with that thing anyway?"; # Added 2024-10-05
   clang-tools_9 = throw "clang-tools_9 has been removed from nixpkgs"; # Added 2024-04-08
   clang-tools_12 = throw "clang-tools_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   clang-tools_13 = throw "clang-tools_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
@@ -720,7 +720,7 @@ mapAliases {
   copilot-language-server-fhs = lib.warnOnInstantiate "The package set `copilot-language-server-fhs` has been renamed to `copilot-language-server`." copilot-language-server; # Added 2025-09-07
   copper = throw "'copper' has been removed, as it was broken since 22.11"; # Added 2025-08-22
   cordless = throw "'cordless' has been removed due to being archived upstream. Consider using 'discordo' instead."; # Added 2025-06-07
-  corepack_18 = nodejs_18; # Added 2025-04-23
+  corepack_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23
   coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
   corretto19 = throw "Corretto 19 was removed as it has reached its end of life"; # Added 2024-08-01
   cosmic-tasks = tasks; # Added 2024-07-04
@@ -773,7 +773,7 @@ mapAliases {
   darling = throw "'darling' has been removed due to vendoring Python2"; # Added 2025-05-10
   dart-sass-embedded = throw "dart-sass-embedded has been removed from nixpkgs, as it is now included in Dart Sass itself."; # Added 2023-10-25
   dart_stable = throw "'dart_stable' has been renamed to/replaced by 'dart'"; # Converted to throw 2024-10-17
-  dat = nodePackages.dat; # Added 2020-02-04
+  dat = throw "dat was removed because it was broken"; # Added 2023-08-21
   dave = throw "'dave' has been removed as it has been archived upstream. Consider using 'webdav' instead"; # Added 2025-02-03
   daytona-bin = throw "'daytona-bin' has been removed, as it was unmaintained in nixpkgs"; # Added 2025-07-21
   dbeaver = throw "'dbeaver' has been renamed to/replaced by 'dbeaver-bin'"; # Added 2024-05-16
@@ -791,7 +791,7 @@ mapAliases {
   degit-rs = throw "'degit-rs' has been removed because it is unmaintained upstream and has vulnerable dependencies."; # Added 2025-07-11
   deltachat-cursed = arcanechat-tui; # added 2025-02-25
   deltachat-electron = throw "'deltachat-electron' has been renamed to/replaced by 'deltachat-desktop'"; # Converted to throw 2024-10-17
-  demjson = with python3Packages; toPythonApplication demjson; # Added 2022-01-18
+  demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
   devdash = throw "'devdash' has been removed as the upstream project was archived"; # Added 2025-03-27
   devdocs-desktop = throw "'devdocs-desktop' has been removed as it is unmaintained upstream and vendors insecure dependencies"; # Added 2025-06-11
   dfilemanager = throw "'dfilemanager' has been dropped as it was unmaintained"; # Added 2025-06-03
@@ -865,7 +865,7 @@ mapAliases {
   emacs28-gtk3 = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
   emacs28-macport = throw "Emacs 28 Macport is removed due to CVEs which are fixed in Emacs 30 and backported to Emacs 29 Macport"; # Added 2025-04-06
   emacs28-nox = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
-  emacs28NativeComp = emacs28; # Added 2022-06-08
+  emacs28NativeComp = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
   emacs28Packages = throw "'emacs28Packages' has been renamed to/replaced by 'emacs28.pkgs'"; # Converted to throw 2024-10-17
   emacs28WithPackages = throw "'emacs28WithPackages' has been renamed to/replaced by 'emacs28.pkgs.withPackages'"; # Converted to throw 2024-10-17
   emacs29 = throw "Emacs 29 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
@@ -1028,7 +1028,7 @@ mapAliases {
   gcc-arm-embedded-12 = throw "gcc-arm-embedded-12 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
   gccgo12 = throw "gccgo12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
-  gcj = gcj6; # Added 2024-09-13
+  gcj = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
   gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15
   gdc11 = throw "gdc11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gdc = throw "gdc has been removed from Nixpkgs, as recent versions require complex bootstrapping"; # Added 2025-08-08
@@ -1299,7 +1299,7 @@ mapAliases {
   kgx = gnome-console; # Added 2022-02-19
   khoj = throw "khoj has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
   kibana7 = throw "Kibana 7.x has been removed from nixpkgs as it depends on an end of life Node.js version and received no maintenance in time."; # Added 2023-10-30
-  kibana = kibana7; # Added 2023-10-30
+  kibana = throw "Kibana 7.x has been removed from nixpkgs as it depends on an end of life Node.js version and received no maintenance in time."; # Added 2023-10-30
   kio-admin = makePlasma5Throw "kio-admin"; # Added 2023-03-18
   kiwitalk = throw "KiwiTalk has been removed because the upstream has been deprecated at the request of Kakao and it's now obsolete."; # Added 2024-10-10
   kmplayer = throw "'kmplayer' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
@@ -1346,10 +1346,10 @@ mapAliases {
   libAfterImage = throw "'libAfterImage' has been removed from nixpkgs, as it's no longer in development for a long time"; # Added 2024-06-01
   libast = throw "'libast' has been removed due to lack of maintenance upstream."; # Added 2025-06-09
   libav = throw "libav has been removed as it was insecure and abandoned upstream for over half a decade; please use FFmpeg"; # Added 2024-08-25
-  libav_0_8 = libav; # Added 2024-08-25
-  libav_11 = libav; # Added 2024-08-25
-  libav_12 = libav; # Added 2024-08-25
-  libav_all = libav; # Added 2024-08-25
+  libav_0_8 = throw "libav has been removed as it was insecure and abandoned upstream for over half a decade; please use FFmpeg"; # Added 2024-08-25
+  libav_11 = throw "libav has been removed as it was insecure and abandoned upstream for over half a decade; please use FFmpeg"; # Added 2024-08-25
+  libav_12 = throw "libav has been removed as it was insecure and abandoned upstream for over half a decade; please use FFmpeg"; # Added 2024-08-25
+  libav_all = throw "libav has been removed as it was insecure and abandoned upstream for over half a decade; please use FFmpeg"; # Added 2024-08-25
   libayatana-appindicator-gtk3 = libayatana-appindicator; # Added 2022-10-18
   libayatana-indicator-gtk3 = libayatana-indicator; # Added 2022-10-18
   libbencodetools = bencodetools; # Added 2022-07-30
@@ -1444,37 +1444,37 @@ mapAliases {
   lincity_ng = lib.warnOnInstantiate "lincity_ng has been renamed to lincity-ng" lincity-ng; # Added 2025-10-09
   linenoise-ng = throw "'linenoise-ng' has been removed as the upstream project was archived. Consider using 'linenoise' instead."; # Added 2025-05-05
   linphone = linphonePackages.linphone-desktop; # Added 2025-09-20
-  linux-libre = linuxPackages-libre.kernel;
-  linux-rt_5_4 = linuxKernel.kernels.linux_rt_5_4;
+  linux-libre = throw "linux_libre has been removed due to lack of maintenance"; # Added 2025-10-01
+  linux-rt_5_4 = throw "linux_rt 5.4 has been removed because it will reach its end of life within 25.11"; # Added 2025-10-22
   linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;
   linux-rt_5_15 = linuxKernel.kernels.linux_rt_5_15;
   linux-rt_6_1 = linuxKernel.kernels.linux_rt_6_1;
-  linux_4_19 = linuxKernel.kernels.linux_4_19;
-  linux_5_4 = linuxKernel.kernels.linux_5_4;
-  linux_5_4_hardened = linuxKernel.kernels.linux_5_4_hardened; # Added 2025-08-10
+  linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-22
+  linux_5_4 = throw "linux 5.4 was removed because it will reach its end of life within 25.11"; # Added 2025-10-26
+  linux_5_4_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
   linux_5_10 = linuxKernel.kernels.linux_5_10;
-  linux_5_10_hardened = linuxKernel.kernels.linux_5_10_hardened; # Added 2025-08-10
+  linux_5_10_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
   linux_5_15 = linuxKernel.kernels.linux_5_15;
-  linux_5_15_hardened = linuxKernel.kernels.linux_5_15_hardened; # Added 2025-08-10
+  linux_5_15_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
   linux_6_1 = linuxKernel.kernels.linux_6_1;
-  linux_6_1_hardened = linuxKernel.kernels.linux_6_1_hardened; # Added 2025-08-10
+  linux_6_1_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
   linux_6_6 = linuxKernel.kernels.linux_6_6;
-  linux_6_6_hardened = linuxKernel.kernels.linux_6_6_hardened; # Added 2025-08-10
-  linux_6_9 = linuxKernel.kernels.linux_6_9;
-  linux_6_10 = linuxKernel.kernels.linux_6_10;
-  linux_6_11 = linuxKernel.kernels.linux_6_11;
+  linux_6_6_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
+  linux_6_9 = throw "linux 6.9 was removed because it has reached its end of life upstream"; # Added 2024-08-03
+  linux_6_10 = throw "linux 6.10 was removed because it has reached its end of life upstream"; # Added 2024-10-23
+  linux_6_11 = throw "linux 6.11 was removed because it has reached its end of life upstream"; # Added 2025-03-24
   linux_6_12 = linuxKernel.kernels.linux_6_12;
-  linux_6_12_hardened = linuxKernel.kernels.linux_6_12_hardened; # Added 2025-08-10
-  linux_6_13 = linuxKernel.kernels.linux_6_13;
-  linux_6_13_hardened = linuxKernel.kernels.linux_6_13_hardened; # Added 2021-08-16
-  linux_6_14 = linuxKernel.kernels.linux_6_14;
-  linux_6_14_hardened = linuxKernel.kernels.linux_6_14_hardened; # Added 2021-08-16
-  linux_6_15 = linuxKernel.kernels.linux_6_15;
-  linux_6_16 = linuxKernel.kernels.linux_6_16;
+  linux_6_12_hardened = linuxKernel.kernels.linux_6_12_hardened;
+  linux_6_13 = throw "linux 6.13 was removed because it has reached its end of life upstream"; # Added 2025-06-29
+  linux_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream"; # Added 2025-06-29
+  linux_6_14 = throw "linux 6.14 was removed because it has reached its end of life upstream"; # Added 2025-06-29
+  linux_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream"; # Added 2025-06-29
+  linux_6_15 = throw "linux 6.15 was removed because it has reached its end of life upstream"; # Added 2025-08-30
+  linux_6_16 = throw "linux 6.16 was removed because it has reached its end of life upstream"; # Added 2025-10-22
   linux_6_17 = linuxKernel.kernels.linux_6_17;
-  linux_ham = linuxKernel.kernels.linux_ham;
+  linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24
   linux_hardened = linuxPackages_hardened.kernel; # Added 2025-08-10
-  linux_latest-libre = linuxPackages_latest-libre.kernel;
+  linux_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01
   linux_latest_hardened = linuxPackages_latest_hardened; # Added 2021-08-16
   linux_rpi0 = linuxKernel.kernels.linux_rpi1;
   linux_rpi1 = linuxKernel.kernels.linux_rpi1;
@@ -1483,33 +1483,33 @@ mapAliases {
   linux_rpi3 = linuxKernel.kernels.linux_rpi3;
   linux_rpi4 = linuxKernel.kernels.linux_rpi4;
   linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; # Converted to throw 2024-01-09
-  linuxPackages-libre = linuxKernel.packages.linux_libre;
-  linuxPackages_4_19 = linuxKernel.packages.linux_4_19;
-  linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
-  linuxPackages_5_4_hardened = linuxKernel.packages.linux_5_4_hardened; # Added 2025-08-10
+  linuxPackages-libre = throw "linux_libre has been removed due to lack of maintenance"; # Added 2025-10-01
+  linuxPackages_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-22
+  linuxPackages_5_4 = throw "linux 5.4 was removed because it will reach its end of life within 25.11"; # Added 2025-10-26
+  linuxPackages_5_4_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
   linuxPackages_5_10 = linuxKernel.packages.linux_5_10;
-  linuxPackages_5_10_hardened = linuxKernel.packages.linux_5_10_hardened; # Added 2025-08-10
+  linuxPackages_5_10_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
   linuxPackages_5_15 = linuxKernel.packages.linux_5_15;
-  linuxPackages_5_15_hardened = linuxKernel.packages.linux_5_15_hardened; # Added 2025-08-10
+  linuxPackages_5_15_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
   linuxPackages_6_1 = linuxKernel.packages.linux_6_1;
-  linuxPackages_6_1_hardened = linuxKernel.packages.linux_6_1_hardened; # Added 2025-08-10
+  linuxPackages_6_1_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
   linuxPackages_6_6 = linuxKernel.packages.linux_6_6;
-  linuxPackages_6_6_hardened = linuxKernel.packages.linux_6_6_hardened; # Added 2025-08-10
-  linuxPackages_6_9 = linuxKernel.packages.linux_6_9;
-  linuxPackages_6_10 = linuxKernel.packages.linux_6_10;
-  linuxPackages_6_11 = linuxKernel.packages.linux_6_11;
+  linuxPackages_6_6_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
+  linuxPackages_6_9 = throw "linux 6.9 was removed because it has reached its end of life upstream"; # Added 2024-08-03
+  linuxPackages_6_10 = throw "linux 6.10 was removed because it has reached its end of life upstream"; # Added 2024-10-23
+  linuxPackages_6_11 = throw "linux 6.11 was removed because it has reached its end of life upstream"; # Added 2025-03-24
   linuxPackages_6_12 = linuxKernel.packages.linux_6_12;
   linuxPackages_6_12_hardened = linuxKernel.packages.linux_6_12_hardened; # Added 2025-08-10
-  linuxPackages_6_13 = linuxKernel.packages.linux_6_13;
-  linuxPackages_6_13_hardened = linuxKernel.packages.linux_6_13_hardened; # Added 2021-08-16
-  linuxPackages_6_14 = linuxKernel.packages.linux_6_14;
-  linuxPackages_6_14_hardened = linuxKernel.packages.linux_6_14_hardened; # Added 2021-08-16
-  linuxPackages_6_15 = linuxKernel.packages.linux_6_15;
-  linuxPackages_6_16 = linuxKernel.packages.linux_6_16;
+  linuxPackages_6_13 = throw "linux 6.13 was removed because it has reached its end of life upstream"; # Added 2025-06-29
+  linuxPackages_6_13_hardened = throw "linux 6.13 was removed because it has reached its end of life upstream"; # Added 2025-06-29
+  linuxPackages_6_14 = throw "linux 6.14 was removed because it has reached its end of life upstream"; # Added 2025-06-29
+  linuxPackages_6_14_hardened = throw "linux 6.14 was removed because it has reached its end of life upstream"; # Added 2025-06-29
+  linuxPackages_6_15 = throw "linux 6.15 was removed because it has reached its end of life upstream"; # Added 2025-08-30
+  linuxPackages_6_16 = throw "linux 6.16 was removed because it has reached its end of life upstream"; # Added 2025-10-22
   linuxPackages_6_17 = linuxKernel.packages.linux_6_17;
-  linuxPackages_ham = linuxKernel.packages.linux_ham;
+  linuxPackages_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24
   linuxPackages_hardened = linuxKernel.packages.linux_hardened; # Added 2025-08-10
-  linuxPackages_latest-libre = linuxKernel.packages.linux_latest_libre;
+  linuxPackages_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01
   linuxPackages_latest_hardened = throw "
     The attribute `linuxPackages_hardened_latest' was dropped because the hardened patches
     frequently lag behind the upstream kernel. In some cases this meant that this attribute
@@ -1529,7 +1529,7 @@ mapAliases {
   linuxPackages_rpi02w = linuxKernel.packages.linux_rpi3;
   linuxPackages_rpi3 = linuxKernel.packages.linux_rpi3;
   linuxPackages_rpi4 = linuxKernel.packages.linux_rpi4;
-  linuxPackages_rt_5_4 = linuxKernel.packages.linux_rt_5_4;
+  linuxPackages_rt_5_4 = throw "linux_rt 5.4 has been removed because it will reach its end of life within 25.11"; # Added 2025-10-22
   linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10;
   linuxPackages_rt_5_15 = linuxKernel.packages.linux_rt_5_15;
   linuxPackages_rt_6_1 = linuxKernel.packages.linux_rt_6_1;
@@ -1705,7 +1705,7 @@ mapAliases {
   microsoft_gsl = microsoft-gsl; # Added 2023-05-26
   MIDIVisualizer = midivisualizer; # Added 2024-06-12
   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 = midori; # 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
   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
   mikutter = throw "'mikutter' has been removed because the package was broken and had no maintainers"; # Added 2024-10-01
@@ -1855,10 +1855,10 @@ mapAliases {
   nm-tray = throw "'nm-tray' has been removed, as it only works with Plasma 5"; # Added 2025-08-30
   nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17
   noah = throw "'noah' has been removed because it was broken and its upstream archived"; # Added 2025-05-10
-  nodejs-18_x = nodejs_18; # Added 2022-11-06
-  nodejs-slim-18_x = nodejs-slim_18; # Added 2022-11-06
-  nodejs-slim_18 = nodejs_18; # Added 2025-04-23
+  nodejs-slim_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23
+  nodejs-slim_18_x = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23
   nodejs_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23
+  nodejs_18_x = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23
   nomacs-qt6 = nomacs; # Added 2025-08-30
   nomad_1_4 = throw "nomad_1_4 is no longer supported upstream. You can switch to using a newer version of the nomad package. If you cannot upgrade, you can revert to older nixpkgs."; # Added 2025-02-02
   nomad_1_5 = throw "nomad_1_5 is no longer supported upstream. You can switch to using a newer version of the nomad package. If you cannot upgrade, you can revert to older nixpkgs."; # Added 2025-02-02
@@ -2124,8 +2124,8 @@ mapAliases {
   prometheus-openldap-exporter = throw "'prometheus-openldap-exporter' has been removed from nixpkgs, as it was unmaintained"; # Added 2024-09-01
   prometheus-tor-exporter = throw "'prometheus-tor-exporter' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-10-30
   protobuf3_21 = protobuf_21; # Added 2023-10-05
-  protobuf3_23 = protobuf_23; # Added 2023-10-05
-  protobuf3_24 = protobuf_24; # Added 2023-10-05
+  protobuf3_23 = throw "'protobuf_23' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-04-20
+  protobuf3_24 = throw "'protobuf_24' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-07-14
   protobuf_23 = throw "'protobuf_23' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-04-20
   protobuf_24 = throw "'protobuf_24' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-07-14
   protobuf_26 = throw "'protobuf_26' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-06-29
@@ -2296,7 +2296,7 @@ mapAliases {
   SDL2_classic_mixer_2_0 = throw "'SDL2_classic_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27
   SDL2_classic_ttf = throw "'SDL2_classic_ttf' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_ttf' built with 'sdl2-compat'."; # Added 2025-05-20
   SDL2_mixer_2_0 = throw "'SDL2_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27
-  SDL_classic = SDL1; # Added 2024-09-03
+  SDL_classic = throw "'SDL1' has been removed as development ended long ago with SDL 2.0 replacing it, use SDL_compat instead"; # Added 2025-03-27
   SDL_gpu = throw "'SDL_gpu' has been removed due to lack of upstream maintenance and known users"; # Added 2025-03-15
   SDL_image_2_0 = throw "'SDL_image_2_0' has been removed in favor of the latest version"; # Added 2025-04-20
   seafile-server = throw "'seafile-server' has been removed as it is unmaintained"; # Added 2025-08-21
@@ -2316,7 +2316,7 @@ mapAliases {
   sheesy-cli = throw "'sheesy-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
   shell-hist = throw "'shell-hist' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   shipyard = jumppad; # Added 2023-06-06
-  shout = nodePackages.shout; # Added unknown; moved 2024-10-19
+  shout = throw "shout was removed because it was deprecated upstream in favor of thelounge."; # Added 2024-10-19
   siduck76-st = st-snazzy; # Added 2024-12-24
   sierra-breeze-enhanced = throw "'sierra-breeze-enhanced' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   signal-desktop-beta = throw "signal-desktop-beta has been removed to make the signal-desktop package easier to maintain"; # Added 2024-11-20
@@ -2330,7 +2330,7 @@ mapAliases {
   sipwitch = throw "'sipwitch' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   sisco.lv2 = throw "'sisco.lv2' has been removed as it was unmaintained and broken"; # Added 2025-08-26
   sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21
-  SkypeExport = skypeexport; # Added 2024-06-12
+  SkypeExport = throw "'skypeexport' was removed since Skype has been shut down in May 2025"; # Added 2025-09-15
   skypeexport = throw "'skypeexport' was removed since Skype has been shut down in May 2025"; # Added 2025-09-15
   skypeforlinux = throw "Skype has been shut down in May 2025"; # Added 2025-05-05
   slack-dark = throw "'slack-dark' has been renamed to/replaced by 'slack'"; # Converted to throw 2024-10-17
@@ -2496,7 +2496,7 @@ mapAliases {
   texinfo4 = throw "'texinfo4' has been removed in favor of the latest version"; # Added 2025-06-08
   texinfo5 = throw "'texinfo5' has been removed from nixpkgs"; # Added 2024-09-10
   textual-paint = throw "'textual-paint' has been removed as it is broken"; # Added 2025-09-10
-  tezos-rust-libs = ligo; # Added 2025-06-03
+  tezos-rust-libs = throw "ligo has been removed from nixpkgs for lack of maintainance"; # Added 2025-06-03
   tfplugindocs = terraform-plugin-docs; # Added 2023-11-01
   thefuck = throw "'thefuck' has been removed due to lack of maintenance upstream and incompatible with python 3.12+. Consider using 'pay-respects' instead"; # Added 2025-05-30
   theLoungePlugins = throw "'theLoungePlugins' has been removed due to only containing throws"; # Added 2025-09-25
@@ -2593,7 +2593,7 @@ mapAliases {
   urxvt_tabbedex = throw "'urxvt_tabbedex' has been renamed to/replaced by 'rxvt-unicode-plugins.tabbedex'"; # Converted to throw 2024-10-17
   urxvt_theme_switch = throw "'urxvt_theme_switch' has been renamed to/replaced by 'rxvt-unicode-plugins.theme-switch'"; # Converted to throw 2024-10-17
   urxvt_vtwheel = throw "'urxvt_vtwheel' has been renamed to/replaced by 'rxvt-unicode-plugins.vtwheel'"; # Converted to throw 2024-10-17
-  ut2004demo = ut2004Packages; # Added 2024-11-24
+  ut2004demo = throw "UT2004 requires libstdc++5 which is not supported by nixpkgs anymore"; # Added 2024-11-24
   ut2004Packages = throw "UT2004 requires libstdc++5 which is not supported by nixpkgs anymore"; # Added 2024-11-24
   util-linuxCurses = util-linux; # Added 2022-04-12
   utillinux = util-linux; # Added 2020-11-24, keep until node2nix is phased out, see https://github.com/NixOS/nixpkgs/issues/229475
@@ -2683,7 +2683,7 @@ mapAliases {
   woof = throw "'woof' has been removed as it is broken and unmaintained upstream"; # Added 2025-09-04
   wordpress6_3 = throw "'wordpress6_3' has been removed in favor of the latest version"; # Added 2024-08-03
   wordpress6_4 = throw "'wordpress6_4' has been removed in favor of the latest version"; # Added 2024-08-03
-  wordpress6_5 = wordpress_6_5; # Added 2024-08-03
+  wordpress6_5 = throw "'wordpress_6_5' has been removed in favor of the latest version"; # Added 2024-11-11
   wordpress_6_5 = throw "'wordpress_6_5' has been removed in favor of the latest version"; # Added 2024-11-11
   wordpress_6_6 = throw "'wordpress_6_6' has been removed in favor of the latest version"; # Added 2024-11-17
   worldengine-cli = throw "'worldengine-cli' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
@@ -2734,7 +2734,7 @@ mapAliases {
   xwaylandvideobridge = makePlasma5Throw "xwaylandvideobridge"; # Added 2024-09-27
   xxv = throw "'xxv' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   yabar = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10
-  yabar-unstable = yabar; # Added 2025-06-10
+  yabar-unstable = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10
   yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2024-10-17
   yafaray-core = libyafaray; # Added 2022-09-23
   yaml-cpp_0_3 = throw "yaml-cpp_0_3 has been removed, as it was unused"; # Added 2025-09-16

From ee63e6b69b45b416440bb5e61a52fae60d4b8075 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 26 Oct 2025 19:50:01 +0000
Subject: [PATCH 3488/6226] =?UTF-8?q?aliases:=20remove=20old=20non?=
 =?UTF-8?q?=E2=80=90standard=20throws?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The script can’t handle these for one reason or another.
---
 pkgs/top-level/aliases.nix | 213 -------------------------------------
 1 file changed, 213 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5ba686854211..afcca7fbf726 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -43,7 +43,6 @@ let
 
   deprecatedPlasma5Packages = {
     inherit (plasma5Packages)
-      akonadi
       akonadi-calendar
       akonadi-calendar-tools
       akonadi-contacts
@@ -52,75 +51,40 @@ let
       akonadi-notes
       akonadi-search
       akonadiconsole
-      akregator
       alligator
       analitza
       angelfish
       applet-window-appmenu
       applet-window-buttons
-      arianna
-      ark
       audiotube
       aura-browser
       baloo-widgets
       bismuth
-      bluedevil
-      bomber
       booth
-      bovo
-      breeze-grub
-      breeze-gtk
-      breeze-plymouth
-      breeze-qt5
       buho
       calendarsupport
       calindori
       cantor
       clip
-      colord-kde
       communicator
-      dolphin
       dolphin-plugins
-      dragon
-      elisa
       eventviews
-      falkon
-      ffmpegthumbs
-      filelight
       flatpak-kcm
       ghostwriter
-      granatier
       grantleetheme
-      gwenview
       incidenceeditor
       index
       juk
       kaccounts-integration
       kaccounts-providers
-      kactivitymanagerd
-      kaddressbook
       kalarm
       kalgebra
       kalk
-      kalzium
       kamoso
-      kapman
-      kapptemplate
       kasts
-      kate
-      katomic
-      kblackbox
-      kblocks
-      kbounce
       kbreakout
-      kcachegrind
-      kcalc
       kcalutils
-      kcharselect
       kclock
-      kcolorchooser
-      kde-cli-tools
-      kde-gtk-config
       kde-inotify-survey
       kde2-decoration
       kdebugsettings
@@ -129,107 +93,50 @@ let
       kdegraphics-mobipocket
       kdegraphics-thumbnailers
       kdenetwork-filesharing
-      kdenlive
       kdepim-runtime
-      kdeplasma-addons
-      kdev-php
-      kdev-python
-      kdevelop
-      kdevelop-pg-qt
-      kdevelop-unwrapped
-      kdf
-      kdialog
-      kdiamond
-      keditbookmarks
       keysmith
-      kfind
-      kgamma5
       kgeography
-      kget
-      kgpg
-      khelpcenter
       khotkeys
       kidentitymanagement
-      kig
-      kigo
-      killbots
       kimap
-      kinfocenter
       kio-admin
       kio-extras
       kio-gdrive
       kipi-plugins
       kirigami-gallery
       kldap
-      kleopatra
-      klettres
-      klines
-      kmag
       kmahjongg
       kmail-account-wizard
       kmailtransport
       kmbox
-      kmenuedit
       kmime
-      kmines
-      kmix
       kmousetool
-      kmplot
-      knavalbattle
-      knetwalk
-      knights
       knotes
       koko
       kolf
-      kollision
-      kolourpaint
-      kompare
       kongress
       konqueror
       konquest
-      konsole
       kontactinterface
-      konversation
       kopeninghours
-      korganizer
       kosmindoormap
       kpat
       kpimtextedit
       kpipewire
-      kpkpass
       kpmcore
       kpublictransport
       kqtquickcharts
-      krdc
       krecorder
       kreport
-      kreversi
-      krfb
       kruler
       ksanecore
-      kscreen
-      kscreenlocker
-      kshisen
       ksmtp
       kspaceduel
-      ksquares
-      ksshaskpass
       ksudoku
-      ksystemlog
       ksystemstats
-      kteatime
-      ktimer
       ktnef
-      ktorrent
       ktrip
-      kturtle
-      kwallet-pam
-      kwalletmanager
-      kwave
-      kwayland-integration
       kweather
-      kwin
-      kwrited
       kzones
       layer-shell-qt
       libgravatar
@@ -251,7 +158,6 @@ let
       lightly
       mailcommon
       mailimporter
-      marble
       mauikit
       mauikit-accounts
       mauikit-calendar
@@ -262,80 +168,41 @@ let
       mauikit-texteditor
       mauiman
       mbox-importer
-      merkuro
       messagelib
-      milou
-      minuet
-      okular
-      oxygen
       oxygen-sounds
       palapeli
       parachute
       partitionmanager
-      picmi
       pim-data-exporter
       pim-sieve-editor
       pimcommon
       plank-player
       plasma-bigscreen
-      plasma-browser-integration
-      plasma-desktop
       plasma-dialer
       plasma-disks
       plasma-firewall
-      plasma-integration
-      plasma-mobile
-      plasma-nano
-      plasma-nm
-      plasma-pa
       plasma-phonebook
       plasma-remotecontrollers
       plasma-sdk
       plasma-settings
-      plasma-systemmonitor
-      plasma-thunderbolt
-      plasma-vault
       plasma-welcome
-      plasma-workspace
-      plasma-workspace-wallpapers
       plasmatube
       polkit-kde-agent
-      powerdevil
       print-manager
       qmlkonsole
-      qqc2-breeze-style
       rocs
-      sddm-kcm
       shelf
       sierra-breeze-enhanced
-      skanlite
-      skanpage
       soundkonverter
-      spectacle
       station
-      systemsettings
       telly-skout
       tokodon
       umbrello
       vvave
-      xdg-desktop-portal-kde
       xwaylandvideobridge
-      yakuake
-      zanshin
-      ;
-
-    inherit (plasma5Packages.thirdParty)
-      krohnkite
-      krunner-ssh
-      krunner-symbols
-      kwin-dynamic-workspaces
-      kwin-tiling
-      plasma-applet-caffeine-plus
-      plasma-applet-virtual-desktop-bar
       ;
 
     inherit (libsForQt5)
-      sddm
       neochat # added 2025-07-04
       itinerary # added 2025-07-04
       libquotient # added 2025-07-04
@@ -390,8 +257,6 @@ mapAliases {
 
   # keep-sorted start case=no numeric=yes block=yes
 
-  "7z2hashcat" =
-    throw "'7z2hashcat' has been renamed to '_7z2hashcat' as the former isn't a valid variable name."; # Added 2024-11-27
   _0verkill = throw "'_0verkill' has been removed due to lack of maintenance"; # Added 2025-08-27
   _1password = lib.warnOnInstantiate "_1password has been renamed to _1password-cli to better follow upstream name usage" _1password-cli; # Added 2024-10-24
   _5etools = throw "'_5etools' has been removed, as upstream is in a questionable legal position and the build was broken."; # Added 2025-05-05
@@ -1048,7 +913,6 @@ mapAliases {
   gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11
   gg = go-graft; # Added 2025-03-07
   ggobi = throw "'ggobi' has been removed from Nixpkgs, as it is unmaintained and broken"; # Added 2025-05-18
-  ghostwriter = makePlasma5Throw "ghostwriter"; # Added 2023-03-18
   gimp3 = gimp; # added 2025-10-03
   gimp3-with-plugins = gimp-with-plugins; # added 2025-10-03
   gimp3Plugins = gimpPlugins; # added 2025-10-03
@@ -1132,12 +996,6 @@ mapAliases {
   godot_4-export-templates = lib.warnOnInstantiate "godot_4-export-templates has been renamed to godot_4-export-templates-bin" godot_4-export-templates-bin; # Added 2025-03-27
   godot_4_3-export-templates = lib.warnOnInstantiate "godot_4_3-export-templates has been renamed to godot_4_3-export-templates-bin" godot_4_3-export-templates-bin; # Added 2025-03-27
   godot_4_4-export-templates = lib.warnOnInstantiate "godot_4_4-export-templates has been renamed to godot_4_4-export-templates-bin" godot_4_4-export-templates-bin; # Added 2025-03-27
-  gogs = throw "
-    Gogs development has stalled. Also, it has several unpatched, critical vulnerabilities that
-    weren't addressed within a year: https://github.com/gogs/gogs/issues/7777
-
-    Consider migrating to forgejo or gitea.
-  "; # Added 2024-10-12
   goldwarden = throw "'goldwarden' has been removed, as it no longer works with new Bitwarden versions and is abandoned upstream"; # Added 2025-09-16
   googler = throw "'googler' has been removed, as it no longer works and is abandoned upstream"; # Added 2025-04-01
   gpicview = throw "'gpicview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'loupe', 'gthumb' or 'image-roll' instead"; # Added 2024-09-15
@@ -1300,7 +1158,6 @@ mapAliases {
   khoj = throw "khoj has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
   kibana7 = throw "Kibana 7.x has been removed from nixpkgs as it depends on an end of life Node.js version and received no maintenance in time."; # Added 2023-10-30
   kibana = throw "Kibana 7.x has been removed from nixpkgs as it depends on an end of life Node.js version and received no maintenance in time."; # Added 2023-10-30
-  kio-admin = makePlasma5Throw "kio-admin"; # Added 2023-03-18
   kiwitalk = throw "KiwiTalk has been removed because the upstream has been deprecated at the request of Kakao and it's now obsolete."; # Added 2024-10-10
   kmplayer = throw "'kmplayer' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
   kodiGBM = kodi-gbm; # Added 2021-03-09
@@ -1475,7 +1332,6 @@ mapAliases {
   linux_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24
   linux_hardened = linuxPackages_hardened.kernel; # Added 2025-08-10
   linux_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01
-  linux_latest_hardened = linuxPackages_latest_hardened; # Added 2021-08-16
   linux_rpi0 = linuxKernel.kernels.linux_rpi1;
   linux_rpi1 = linuxKernel.kernels.linux_rpi1;
   linux_rpi2 = linuxKernel.kernels.linux_rpi2;
@@ -1510,19 +1366,7 @@ mapAliases {
   linuxPackages_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24
   linuxPackages_hardened = linuxKernel.packages.linux_hardened; # Added 2025-08-10
   linuxPackages_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01
-  linuxPackages_latest_hardened = throw "
-    The attribute `linuxPackages_hardened_latest' was dropped because the hardened patches
-    frequently lag behind the upstream kernel. In some cases this meant that this attribute
-    had to refer to an older kernel[1] because the latest hardened kernel was EOL and
-    the latest supported kernel didn't have patches.
-
-    If you want to use a hardened kernel, please check which kernel minors are supported
-    and use a versioned attribute, e.g. `linuxPackages_5_10_hardened'.
-
-    [1] for more context: https://github.com/NixOS/nixpkgs/pull/133587
-  "; # Added 2021-08-16
   linuxPackages_latest_xen_dom0 = linuxPackages_latest; # Added 2021-04-04
-  linuxPackages_latest_xen_dom0_hardened = linuxPackages_latest_hardened; # Added 2021-04-04
   linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
   linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;
   linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2;
@@ -1639,31 +1483,6 @@ mapAliases {
   manicode = throw "manicode has been renamed to codebuff"; # Added 2024-12-10
   manta = throw "manta does not support python3, and development has been abandoned upstream"; # Added 2025-03-17
   manticore = throw "manticore is no longer maintained since 2020, and doesn't build since smlnj-110.99.7.1"; # Added 2025-05-17
-  maple-mono-autohint = throw "
-    maple-mono-autohint had been moved to maple-mono.truetype-autohint.
-    for installing all maple-mono:
-      fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono)
-  "; # Added 2025-03-16
-  maple-mono-NF = throw "
-    maple-mono-NF had been moved to maple-mono.NF.
-    for installing all maple-mono:
-      fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono)
-  "; # Added 2025-03-16
-  maple-mono-otf = throw "
-    maple-mono-otf had been moved to maple-mono.opentype.
-    for installing all maple-mono:
-      fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono)
-  "; # Added 2025-03-16
-  maple-mono-SC-NF = throw "
-    mono-SC-NF had been superseded by maple-mono.NF-CN.
-    for installing all maple-mono:
-      fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono)
-  "; # Added 2025-03-16
-  maple-mono-woff2 = throw "
-    maple-mono-woff2 had been moved to maple-mono.woff2.
-    for installing all maple-mono:
-      fonts.packages = [ ... ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.maple-mono)
-  "; # Added 2025-03-16
   mapmap = throw "'mapmap' has been removed as it has been unmaintained since 2021"; # Added 2025-05-17
   mariadb-client = hiPrio mariadb.client; # added 2019.07.28
   mariadb_105 = throw "'mariadb_105' has been removed because it reached its End of Life. Consider upgrading to 'mariadb_106'."; # Added 2025-04-26
@@ -1779,7 +1598,6 @@ mapAliases {
   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 = ncdu; # Added 2022-07-22
   neardal = throw "neardal has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29
-  neochat = makePlasma5Throw "neochat"; # added 2022-05-10
   neocities-cli = neocities; # Added 2024-07-31
   neocomp = throw "neocomp has been remove because it fails to build and was unmaintained upstream"; # Added 2025-04-28
   netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02
@@ -1959,14 +1777,6 @@ mapAliases {
   overrideLibcxx = throw "overrideLibcxx has been removed, as it was no longer used and Darwin now uses libc++ from the latest SDK; see the Nixpkgs 25.11 release notes for details"; # Added 2025-09-15
   overrideSDK = throw "overrideSDK has been removed as it was a legacy compatibility stub. See <https://nixos.org/manual/nixpkgs/stable/#sec-darwin-legacy-frameworks-overrides> for migration instructions"; # Added 2025-08-04
   ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24
-  oxygen-icons5 = throw "
-    The top-level oxygen-icons5 alias has been removed.
-
-    Please explicitly use kdePackages.oxygen-icons for the latest Qt 6-based version,
-    or libsForQt5.oxygen-icons5 for the deprecated Qt 5 version.
-
-    Note that Qt 5 versions of most KDE software will be removed in NixOS 25.11.
-  "; # Added 2025-03-15;
   oysttyer = throw "oysttyer has been removed; it is no longer maintained because of Twitter disabling free API access"; # Added 2024-09-23
   p2pvc = throw "p2pvc has been removed as it is unmaintained upstream and depends on OpenCV 2"; # Added 2024-08-20
   packet-cli = throw "'packet-cli' has been renamed to/replaced by 'metal-cli'"; # Converted to throw 2024-10-17
@@ -1978,7 +1788,6 @@ mapAliases {
   paperless = throw "'paperless' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2024-10-17
   paperless-ng = paperless-ngx; # Added 2022-04-11
   paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14
-  partition-manager = makePlasma5Throw "partitionmanager"; # Added 2024-01-08
   passky-desktop = throw "passky-desktop has been removed, as it was unmaintained and blocking the Electron 29 removal."; # Added 2025-02-24
   patchelfStable = patchelf; # Added 2024-01-25
   pathsFromGraph = throw "pathsFromGraph has been removed, use closureInfo instead"; # Added 2025-01-23
@@ -2077,14 +1886,6 @@ mapAliases {
   pocket-updater-utility = pupdate; # Added 2024-01-25
   podofo010 = podofo_0_10; # Added 2025-06-01
   polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18
-  polkit-kde-agent = throw "
-    The top-level polkit-kde-agent alias has been removed.
-
-    Please explicitly use kdePackages.polkit-kde-agent-1 for the latest Qt 6-based version,
-    or libsForQt5.polkit-kde-agent for the deprecated Qt 5 version.
-
-    Note that Qt 5 versions of most KDE software will be removed in NixOS 25.11.
-  "; # Added 2025-03-07
   polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25
   poppler_utils = poppler-utils; # Added 2025-02-27
   poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03
@@ -2279,13 +2080,6 @@ mapAliases {
   sandboxfs = throw "'sandboxfs' has been removed due to being unmaintained, consider using linux namespaces for sandboxing instead"; # Added 2024-06-06
   sane-backends-git = throw "'sane-backends-git' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2024-10-17
   scantailor = scantailor-advanced; # Added 2022-05-26
-  schildichat-desktop = schildichat-web; # Added 2023-12-07
-  schildichat-desktop-wayland = schildichat-web; # Added 2023-12-07
-  schildichat-web = throw "
-    schildichat has been removed as it is severely lacking behind the Element upstream and does not receive regular security fixes.
-    Please participate in upstream discussion on getting out new releases:
-    https://github.com/SchildiChat/schildichat-desktop/issues/212
-    https://github.com/SchildiChat/schildichat-desktop/issues/215"; # Added 2023-12-05
   scitoken-cpp = scitokens-cpp; # Added 2024-02-12
   scry = throw "'scry' has been removed as it was archived upstream. Use 'crystalline' instead"; # Added 2025-02-12
   scudcloud = throw "'scudcloud' has been removed as it was archived by upstream"; # Added 2025-07-24
@@ -2656,12 +2450,6 @@ mapAliases {
   watershot = throw "'watershot' has been removed as it is unmaintained upstream and no longer works"; # Added 2025-06-01
   wavebox = throw "'wavebox' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-24
   wavm = throw "wavm has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
-  wayfireApplications-unwrapped = throw "
-    'wayfireApplications-unwrapped.wayfire' has been renamed to/replaced by 'wayfire'
-    'wayfireApplications-unwrapped.wayfirePlugins' has been renamed to/replaced by 'wayfirePlugins'
-    'wayfireApplications-unwrapped.wcm' has been renamed to/replaced by 'wayfirePlugins.wcm'
-    'wayfireApplications-unwrapped.wlroots' has been removed
-  "; # Add 2023-07-29
   waypoint = throw "waypoint has been removed from nixpkgs as the upstream project was archived"; # Added 2024-04-24
   wcurl = throw "'wcurl' has been removed due to being bundled with 'curl'"; # Added 2025-07-04
   wdomirror = throw "'wdomirror' has been removed as it is unmaintained upstream, Consider using 'wl-mirror' instead"; # Added 2025-09-04
@@ -2731,7 +2519,6 @@ mapAliases {
   xtrlock-pam = throw "xtrlock-pam has been removed because it is unmaintained for 10 years and doesn't support Python 3.10 or newer"; # Added 2025-01-25
   xulrunner = firefox-unwrapped; # Added 2023-11-03
   xvfb_run = throw "'xvfb_run' has been renamed to/replaced by 'xvfb-run'"; # Converted to throw 2024-10-17
-  xwaylandvideobridge = makePlasma5Throw "xwaylandvideobridge"; # Added 2024-09-27
   xxv = throw "'xxv' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   yabar = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10
   yabar-unstable = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10

From 4e3f44ef98963037d6c4265ee4166c0ed2558c33 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 26 Oct 2025 19:50:01 +0000
Subject: [PATCH 3489/6226] aliases: convert old non-standard aliases to throws
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The script can’t handle these.
---
 pkgs/top-level/aliases.nix | 40 ++++++--------------------------------
 1 file changed, 6 insertions(+), 34 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index afcca7fbf726..3d626bba9299 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -431,12 +431,7 @@ mapAliases {
   bitwarden_rs-sqlite = vaultwarden-sqlite; # Added 2021-07-01
   bitwarden_rs-vault = vaultwarden-vault; # Added 2021-07-01
   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-with-packages =
-    args:
-    lib.warnOnInstantiate
-      "blender-with-packages is deprecated in favor of blender.withPackages, e.g. `blender.withPackages(ps: [ ps.foobar ])`"
-      (blender.withPackages (_: args.packages)).overrideAttrs
-      (lib.optionalAttrs (args ? name) { pname = "blender-" + args.name; }); # Added 2023-10-30
+  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
   bless = throw "'bless' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'imhex' or 'ghex' instead"; # Added 2024-09-15
   blockbench-electron = blockbench; # Added 2024-03-16
   bloom = throw "'bloom' has been removed because it was unmaintained upstream."; # Added 2024-11-02
@@ -1484,7 +1479,7 @@ mapAliases {
   manta = throw "manta does not support python3, and development has been abandoned upstream"; # Added 2025-03-17
   manticore = throw "manticore is no longer maintained since 2020, and doesn't build since smlnj-110.99.7.1"; # Added 2025-05-17
   mapmap = throw "'mapmap' has been removed as it has been unmaintained since 2021"; # Added 2025-05-17
-  mariadb-client = hiPrio mariadb.client; # added 2019.07.28
+  mariadb-client = throw "mariadb-client has been renamed to mariadb.client"; # Converted to throw 2025-10-26
   mariadb_105 = throw "'mariadb_105' has been removed because it reached its End of Life. Consider upgrading to 'mariadb_106'."; # Added 2025-04-26
   mariadb_110 = throw "mariadb_110 has been removed from nixpkgs, please switch to another version like mariadb_114"; # Added 2024-08-15
   markets = throw "'markets' has been removed as it was archived upstream in 2023"; # Added 2025-04-17
@@ -1589,7 +1584,7 @@ mapAliases {
   mutter43 = throw "'mutter43' has been removed since it is no longer used by Pantheon."; # Added 2024-09-22
   mx-puppet-discord = throw "mx-puppet-discord was removed since the packaging was unmaintained and was the sole user of sha1 hashes in nixpkgs"; # Added 2025-07-24
   mysql = throw "'mysql' has been renamed to/replaced by 'mariadb'"; # Converted to throw 2024-10-17
-  mysql-client = hiPrio mariadb.client;
+  mysql-client = throw "mysql-client has been replaced by mariadb.client"; # Converted to throw 2025-10-26
   n98-magerun = throw "n98-magerun doesn't support new PHP newer than 8.1"; # Added 2025-10-03
   nagiosPluginsOfficial = monitoring-plugins; # Added 2017-08-07
   namazu = throw "namazu has been removed, as it was broken"; # Added 2025-08-25
@@ -1844,24 +1839,7 @@ mapAliases {
   pidgin-window-merge = pidginPackages.pidgin-window-merge; # Added 2023-07-17
   pidgin-xmpp-receipts = pidginPackages.pidgin-xmpp-receipts; # Added 2023-07-17
   pilipalax = throw "'pilipalax' has been removed from nixpkgs due to it not being maintained"; # Added 2025-07-25
-  # pinentry was using multiple outputs, this emulates the old interface for i.e. home-manager
-  # soon: throw "'pinentry' has been removed. Pick an appropriate variant like 'pinentry-curses' or 'pinentry-gnome3'";
-  pinentry = pinentry-all // {
-    curses = pinentry-curses;
-    emacs = pinentry-emacs;
-    gnome3 = pinentry-gnome3;
-    gtk2 = pinentry-gtk2;
-    qt = pinentry-qt;
-    tty = pinentry-tty;
-    flavors = [
-      "curses"
-      "emacs"
-      "gnome3"
-      "gtk2"
-      "qt"
-      "tty"
-    ];
-  }; # added 2024-01-15
+  pinentry = throw "'pinentry' has been removed. Pick an appropriate variant like 'pinentry-curses' or 'pinentry-gnome3'"; # Converted to throw 2025-10-26
   pinentry_qt5 = throw "'pinentry_qt5' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2024-10-17
   pio = throw "pio has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   piper-train = throw "piper-train is now part of the piper package using the `withTrain` override"; # Added 2025-09-03
@@ -1933,9 +1911,7 @@ mapAliases {
   protobuf_28 = throw "'protobuf_28' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-06-14
   protoc-gen-connect-es = throw "'protoc-gen-connect-es' has been removed because it is deprecated upstream. Functionality has been integrated into 'protoc-gen-es' v2."; # Added 2025-02-18
   proton-caller = throw "'proton-caller' has been removed from nixpkgs due to being unmaintained and lack of upstream maintenance."; # Added 2025-09-25
-  proton-vpn-local-agent = lib.warnOnInstantiate "'proton-vpn-local-agent' has been renamed to 'python3Packages.proton-vpn-local-agent'" (
-    python3Packages.toPythonApplication python3Packages.proton-vpn-local-agent
-  ); # Added 2025-04-23
+  proton-vpn-local-agent = throw "'proton-vpn-local-agent' has been renamed to 'python3Packages.proton-vpn-local-agent'"; # Converted to throw 2025-10-26
   protonup = protonup-ng; # Added 2022-11-06
   protonvpn-cli = throw "protonvpn-cli source code was removed from upstream. Use protonvpn-gui instead."; # Added 2025-10-16
   protonvpn-cli_2 = throw "protonvpn-cli_2 has been removed due to being deprecated. Use protonvpn-gui instead."; # Added 2025-10-16
@@ -2574,11 +2550,7 @@ mapAliases {
   zombietrackergps = throw "'zombietrackergps' has been dropped, as it depends on KDE Gear 5 and is unmaintained"; # Added 2025-08-20
   zotify = throw "zotify has been removed due to lack of upstream maintenance"; # Added 2025-09-26
   zplugin = throw "'zplugin' has been renamed to/replaced by 'zinit'"; # Converted to throw 2024-10-17
-  zq = zed.overrideAttrs (old: {
-    meta = old.meta // {
-      mainProgram = "zq";
-    };
-  }); # Added 2023-02-06
+  zq = throw "zq has been replaced by zed"; # Converted to throw 2025-10-26
   zsh-git-prompt = throw "zsh-git-prompt was removed as it is unmaintained upstream"; # Added 2025-08-28
   zsh-history = throw "'zsh-history' has been removed as it was unmaintained"; # Added 2025-04-17
   zyn-fusion = zynaddsubfx; # Added 2022-08-05

From 81b2d28c670ede1f0747ac21b9aec97e5451bffe Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 26 Oct 2025 19:50:01 +0000
Subject: [PATCH 3490/6226] aliases: move `makePlasma5Throw` users to
 `deprecatedPlasma5Packages`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The script can’t handle these.
---
 pkgs/top-level/aliases.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3d626bba9299..a141802e5de1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -207,6 +207,9 @@ let
       itinerary # added 2025-07-04
       libquotient # added 2025-07-04
       ;
+
+    kalendar = throw ""; # Added 2023-08-24
+    kexi = throw ""; # Added 2025-08-21
   };
 
   makePlasma5Throw =
@@ -1132,7 +1135,6 @@ mapAliases {
   k3s_1_30 = throw "'k3s_1_30' has been removed from nixpkgs as it has reached end of life"; # Added 2025-09-01
   kafkacat = throw "'kafkacat' has been renamed to/replaced by 'kcat'"; # Converted to throw 2024-10-17
   kak-lsp = kakoune-lsp; # Added 2024-04-01
-  kalendar = merkuro; # Added 2023-08-24
   kanidm = lib.warnOnInstantiate "'kanidm' will be removed before 26.05. You must use a versioned package, e.g. 'kanidm_1_x'." kanidm_1_7; # Added 2025-09-01
   kanidm_1_3 = throw "'kanidm_1_3' has been removed as it has reached end of life"; # Added 2025-03-10
   kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18
@@ -1145,7 +1147,6 @@ mapAliases {
   keepkey_agent = keepkey-agent; # added 2024-01-06
   kerberos = throw "'kerberos' has been renamed to/replaced by 'krb5'"; # Converted to throw 2024-10-17
   kexectools = throw "'kexectools' has been renamed to/replaced by 'kexec-tools'"; # Converted to throw 2024-10-17
-  kexi = makePlasma5Throw "kexi";
   keyfinger = throw "keyfinder has been removed as it was abandoned upstream and did not build; consider using mixxx or keyfinder-cli"; # Addd 2024-08-25
   keysmith = throw "'keysmith' has been renamed to/replaced by 'libsForQt5.kdeGear.keysmith'"; # Converted to throw 2024-10-17
   kfloppy = throw "kfloppy has been removed upstream in KDE Gear 23.08"; # Added 2023-08-24

From cede056a56d5c0a9c0bb691c397a80f9a9768773 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 26 Oct 2025 19:50:01 +0000
Subject: [PATCH 3491/6226] =?UTF-8?q?aliases:=20don=E2=80=99t=20keep=20`ut?=
 =?UTF-8?q?illinux`?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This was fixed upstream in `node2nix` in 2020.
---
 pkgs/top-level/aliases.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a141802e5de1..990cb89e70f8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -2367,7 +2367,7 @@ mapAliases {
   ut2004demo = throw "UT2004 requires libstdc++5 which is not supported by nixpkgs anymore"; # Added 2024-11-24
   ut2004Packages = throw "UT2004 requires libstdc++5 which is not supported by nixpkgs anymore"; # Added 2024-11-24
   util-linuxCurses = util-linux; # Added 2022-04-12
-  utillinux = util-linux; # Added 2020-11-24, keep until node2nix is phased out, see https://github.com/NixOS/nixpkgs/issues/229475
+  utillinux = util-linux; # Added 2020-11-24
   v8 = throw "`v8` has been removed as it's unmaintained for several years and has vulnerabilites. Please migrate to `nodejs.libv8`"; # Added 2024-12-21
   vaapiIntel = intel-vaapi-driver; # Added 2023-05-31
   vaapiVdpau = libva-vdpau-driver; # Added 2024-06-05

From a6a76fcc0e7d942dd117a8bf1ae4db44b5a8a950 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 26 Oct 2025 19:50:01 +0000
Subject: [PATCH 3492/6226] aliases: fix date formats

Some missing, some not processable by the script.
---
 pkgs/top-level/aliases.nix | 44 +++++++++++++++++++-------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 990cb89e70f8..ebfd0ef1c4d1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -361,7 +361,7 @@ mapAliases {
   arrayfire = throw "arrayfire was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   artim-dark = aritim-dark; # Added 2025-07-27
   aseprite-unfree = aseprite; # Added 2023-08-26
-  asitop = macpm; # 'macpm' is a better-maintained downstream; keep 'asitop' for backwards-compatibility
+  asitop = macpm; # Added 2025-04-14
   asterisk_18 = throw "asterisk_18: Asterisk 18 is end of life and has been removed"; # Added 2025-10-19
   async = throw "'async' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
   atlassian-bamboo = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02
@@ -389,7 +389,7 @@ mapAliases {
   aws-google-auth = throw "aws-google-auth has been removed as the upstream project was unmaintained"; # Added 2024-07-31
   axmldec = throw "'axmldec' has been removed as it was broken and unmaintained for 8 years"; # Added 2025-05-17
   backlight-auto = throw "'backlight-auto' has been removed as it relies on Zig 0.12 which has been dropped."; # Added 2025-08-22
-  badtouch = authoscope; # Project was renamed, added 20210626
+  badtouch = authoscope; # Added 2021-06-26
   badwolf = throw "'badwolf' has been removed due to being unmaintained"; # Added 2025-04-15
   baget = throw "'baget' has been removed due to being unmaintained"; # Added 2023-03-19
   bandwidth = throw "'bandwidth' has been removed due to lack of maintenance"; # Added 2025-09-01
@@ -471,7 +471,7 @@ mapAliases {
   calcium = throw "'calcium' has been removed as it has been merged into 'flint3'"; # Added 2025-03-28
   calculix = calculix-ccx; # Added 2024-12-18
   calligra = kdePackages.calligra; # Added 2024-09-27
-  callPackage_i686 = pkgsi686Linux.callPackage;
+  callPackage_i686 = pkgsi686Linux.callPackage; # Added 2018-07-26
   canonicalize-jars-hook = stripJavaArchivesHook; # Added 2024-03-17
   cardboard = throw "cardboard has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
   cargo-asm = throw "'cargo-asm' has been removed due to lack of upstream maintenance. Consider 'cargo-show-asm' as an alternative."; # Added 2025-01-29
@@ -647,7 +647,7 @@ mapAliases {
   dbus-sharp-glib-1_0 = throw "'dbus-sharp-glib-1_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
   dbus-sharp-glib-2_0 = throw "'dbus-sharp-glib-2_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
   dclib = throw "'dclib' has been removed as it is unmaintained for 16 years and broken"; # Added 2025-05-25
-  deadpixi-sam = deadpixi-sam-unstable;
+  deadpixi-sam = deadpixi-sam-unstable; # Added 2018-05-01
   debugedit-unstable = throw "'debugedit-unstable' has been renamed to/replaced by 'debugedit'"; # Converted to throw 2024-10-17
   deepin = throw "the Deepin desktop environment and associated tools have been removed from nixpkgs due to lack of maintenance"; # Added 2025-08-21
   deepsea = throw "deepsea has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
@@ -997,7 +997,7 @@ mapAliases {
   goldwarden = throw "'goldwarden' has been removed, as it no longer works with new Bitwarden versions and is abandoned upstream"; # Added 2025-09-16
   googler = throw "'googler' has been removed, as it no longer works and is abandoned upstream"; # Added 2025-04-01
   gpicview = throw "'gpicview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'loupe', 'gthumb' or 'image-roll' instead"; # Added 2024-09-15
-  gprbuild-boot = gnatPackages.gprbuild-boot; # Added 2024-02-25;
+  gprbuild-boot = gnatPackages.gprbuild-boot; # Added 2024-02-25
   gpxsee-qt5 = throw "gpxsee-qt5 was removed, use gpxsee instead"; # added 2025-09-09
   gpxsee-qt6 = gpxsee; # added 2025-09-09
   gqview = throw "'gqview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gthumb' instead"; # Added 2024-09-14
@@ -1167,7 +1167,7 @@ mapAliases {
   krun = throw "'krun' has been renamed to/replaced by 'muvm'"; # Added 2025-05-01
   krunner-pass = throw "'krunner-pass' has been removed, as it only works on Plasma 5"; # Added 2025-08-30
   krunner-translator = throw "'krunner-translator' has been removed, as it only works on Plasma 5"; # Added 2025-08-30
-  # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016" Added 2022-01-04
+  # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016"
   # now kube3d/k3d will take its place
   kube3d = k3d; # Added 2022-07-05
   kubei = kubeclarity; # Added 2023-05-20
@@ -1822,9 +1822,9 @@ mapAliases {
   pgtap = throw "'pgtap' has been removed. Use 'postgresqlPackages.pgtap' instead."; # Added 2025-07-19
   pharo-spur64 = pharo; # Added 2022-08-03
   phlare = throw "'phlare' has been removed as the upstream project was archived."; # Added 2025-03-27
-  php81 = throw "php81 is EOL";
-  php81Extensions = php81;
-  php81Packages = php81;
+  php81 = throw "php81 is EOL"; # Added 2025-10-04
+  php81Extensions = throw "php81 is EOL"; # Added 2025-10-04
+  php81Packages = throw "php81 is EOL"; # Added 2025-10-04
   picom-next = picom; # Added 2024-02-13
   pict-rs_0_3 = throw "pict-rs_0_3 has been removed, as it was an outdated version and no longer compiled"; # Added 2024-08-20
   pidgin-carbons = pidginPackages.pidgin-carbons; # Added 2023-07-17
@@ -1942,12 +1942,12 @@ mapAliases {
   pypolicyd-spf = spf-engine; # Added 2022-10-09
   pypy39 = throw "pypy 3.9 has been removed, use pypy 3.10 instead"; # Added 2025-01-03
   pypy39Packages = throw "pypy 3.9 has been removed, use pypy 3.10 instead"; # Added 2025-01-07
-  python3Full = throw "python3Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
-  python310Full = throw "python310Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
-  python311Full = throw "python311Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
-  python312Full = throw "python312Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
-  python313Full = throw "python313Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
-  python314Full = throw "python314Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set.";
+  python3Full = throw "python3Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
+  python310Full = throw "python310Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
+  python311Full = throw "python311Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
+  python312Full = throw "python312Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
+  python313Full = throw "python313Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
+  python314Full = throw "python314Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
   python = python2; # Added 2022-01-11
   python-swiftclient = throw "'python-swiftclient' has been renamed to/replaced by 'swiftclient'"; # Converted to throw 2024-10-17
   pythonFull = python2Full; # Added 2022-01-11
@@ -2110,9 +2110,9 @@ mapAliases {
   slimerjs = throw "slimerjs does not work with any version of Firefox newer than 59; upstream ended the project in 2021. <https://slimerjs.org/faq.html#end-of-development>"; # added 2025-01-06
   sloccount = throw "'sloccount' has been removed because it is unmaintained. Consider migrating to 'loccount'"; # added 2025-05-17
   slrn = throw "'slrn' has been removed because it is unmaintained upstream and broken."; # Added 2025-06-11
-  slurm-llnl = slurm; # renamed July 2017
+  slurm-llnl = slurm; # Added 2017-07-31
   sm64ex-coop = throw "'sm64ex-coop' was removed as it was archived upstream. Consider migrating to 'sm64coopdx'"; # added 2024-11-23
-  smartgithg = smartgit; # renamed March 2025
+  smartgithg = smartgit; # Added 2025-03-31
   snapcraft = throw "snapcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # added 2025-09-18
   snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # Added 2024-03-04
   snort2 = throw "snort2 has been removed as it is deprecated and unmaintained by upstream. Consider using snort (snort3) package instead."; # 2025-05-21
@@ -2273,8 +2273,8 @@ mapAliases {
   theLoungePlugins = throw "'theLoungePlugins' has been removed due to only containing throws"; # Added 2025-09-25
   thiefmd = throw "'thiefmd' has been removed due to lack of maintenance upstream and incompatible with newer Pandoc. Please use 'apostrophe' or 'folio' instead"; # Added 2025-02-20
   thrust = throw "'thrust' has been removed due to lack of maintenance"; # Added 2025-08-21
-  thunderbird-128 = throw "Thunderbird 128 support ended in August 2025";
-  thunderbird-128-unwrapped = throw "Thunderbird 128 support ended in August 2025";
+  thunderbird-128 = throw "Thunderbird 128 support ended in August 2025"; # Added 2025-09-30
+  thunderbird-128-unwrapped = throw "Thunderbird 128 support ended in August 2025"; # Added 2025-09-30
   ticpp = throw "'ticpp' has been removed due to being unmaintained"; # Added 2025-09-10
   tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22
   tijolo = throw "'tijolo' has been removed due to being unmaintained"; # Added 2024-12-27
@@ -2383,7 +2383,7 @@ mapAliases {
   vaultwarden-vault = vaultwarden.webvault; # Added 2022-12-13
   vbetool = throw "'vbetool' has been removed as it is broken and not maintained upstream."; # Added 2025-06-11
   vc_0_7 = throw "'vc_0_7' has been removed as it was broken, unused in nixpkgs and unmaintained"; # Added 2025-10-20
-  vdirsyncerStable = vdirsyncer; # Added 2020-11-08, see https://github.com/NixOS/nixpkgs/issues/103026#issuecomment-723428168
+  vdirsyncerStable = vdirsyncer; # Added 2020-11-08
   ventoy-bin = ventoy; # Added 2023-04-12
   ventoy-bin-full = ventoy-full; # Added 2023-04-12
   verilog = iverilog; # Added 2024-07-12
@@ -2439,7 +2439,7 @@ mapAliases {
   wifi-password = throw "'wifi-password' has been removed as it was unmaintained upstream"; # Added 2025-08-29
   win-pvdrivers = throw "'win-pvdrivers' has been removed as it was subject to the Xen build machine compromise (XSN-01) and has open security vulnerabilities (XSA-468)"; # Added 2025-08-29
   win-virtio = virtio-win; # Added 2023-10-17
-  wineWayland = wine-wayland;
+  wineWayland = wine-wayland; # Added 2022-01-03
   winhelpcgi = throw "'winhelpcgi' has been removed as it was unmaintained upstream and broken with GCC 14"; # Added 2025-06-14
   wireguard-vanity-address = throw "'wireguard-vanity-address' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
   wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17
@@ -2452,7 +2452,7 @@ mapAliases {
   wordpress_6_5 = throw "'wordpress_6_5' has been removed in favor of the latest version"; # Added 2024-11-11
   wordpress_6_6 = throw "'wordpress_6_6' has been removed in favor of the latest version"; # Added 2024-11-17
   worldengine-cli = throw "'worldengine-cli' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
-  wpa_supplicant_ro_ssids = lib.warnOnInstantiate "Deprecated package: Please use wpa_supplicant instead. Read-only SSID patches are now upstream!" wpa_supplicant;
+  wpa_supplicant_ro_ssids = lib.warnOnInstantiate "Deprecated package: Please use wpa_supplicant instead. Read-only SSID patches are now upstream!" wpa_supplicant; # Added 2024-07-28
   wrapGAppsHook = wrapGAppsHook3; # Added 2024-03-26
   wrapLisp_old = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
   write_stylus = styluslabs-write-bin; # Added 2024-10-09

From e8e7fc880db2e971dbaf5a39a3075a5e284c7238 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 26 Oct 2025 20:14:51 +0000
Subject: [PATCH 3493/6226] aliases: drop throws older than June 2025

Some of these need to be reverted in the next commit.
---
 pkgs/top-level/aliases.nix | 992 -------------------------------------
 1 file changed, 992 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ebfd0ef1c4d1..23524c6da2a8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -208,7 +208,6 @@ let
       libquotient # added 2025-07-04
       ;
 
-    kalendar = throw ""; # Added 2023-08-24
     kexi = throw ""; # Added 2025-08-21
   };
 
@@ -262,7 +261,6 @@ mapAliases {
 
   _0verkill = throw "'_0verkill' has been removed due to lack of maintenance"; # Added 2025-08-27
   _1password = lib.warnOnInstantiate "_1password has been renamed to _1password-cli to better follow upstream name usage" _1password-cli; # Added 2024-10-24
-  _5etools = throw "'_5etools' has been removed, as upstream is in a questionable legal position and the build was broken."; # Added 2025-05-05
   _2048-cli = throw "'_2048-cli' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07
   _2048-cli-curses = throw "'_2048-cli-curses' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07
   _2048-cli-terminal = throw "'_2048-cli-curses' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07
@@ -270,52 +268,13 @@ mapAliases {
   abseil-cpp_202301 = throw "abseil-cpp_202301 has been removed as it was unused in tree"; # Added 2025-08-09
   abseil-cpp_202501 = throw "abseil-cpp_202501 has been removed as it was unused in tree"; # Added 2025-09-15
   abseil-cpp_202505 = throw "abseil-cpp_202505 has been removed as it was unused in tree"; # Added 2025-09-15
-  acorn = throw "acorn has been removed as the upstream project was archived"; # Added 2024-04-27
-  acousticbrainz-client = throw "acousticbrainz-client has been removed since the AcousticBrainz project has been shut down"; # Added 2024-06-04
-  addOpenGLRunpath = throw "addOpenGLRunpath has been removed. Use addDriverRunpath instead."; # Converted to throw 2024-11-17
   adminer-pematon = adminneo; # Added 2025-02-20
   adminerneo = adminneo; # Added 2025-02-27
-  adobe-reader = throw "'adobe-reader' has been removed, as it was broken, outdated and insecure"; # added 2025-05-31
-  adom = throw "'adom' has been removed, as it was broken and unmaintained"; # added 2024-05-09
-  adoptopenjdk-bin = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin`"; # Added 2024-05-09
-  adoptopenjdk-bin-17-packages-darwin = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-bin-17-packages-linux = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-hotspot-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-8`."; # Added 2024-05-09
-  adoptopenjdk-hotspot-bin-11 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-bin-11`."; # Added 2024-05-09
-  adoptopenjdk-hotspot-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `temurin-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-hotspot-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `temurin-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-jre-bin = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-jre-bin`."; # Added 2024-05-09
-  adoptopenjdk-jre-hotspot-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-jre-bin-8`."; # Added 2024-05-09
-  adoptopenjdk-jre-hotspot-bin-11 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `temurin-jre-bin-11`."; # Added 2024-05-09
-  adoptopenjdk-jre-hotspot-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `temurin-jre-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-jre-hotspot-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `temurin-jre-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-jre-openj9-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-jre-bin-8`."; # Added 2024-05-09
-  adoptopenjdk-jre-openj9-bin-11 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-jre-bin-11`."; # Added 2024-05-09
-  adoptopenjdk-jre-openj9-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `semeru-jre-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-jre-openj9-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `semeru-jre-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-openj9-bin-8 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-bin-8`."; # Added 2024-05-09
-  adoptopenjdk-openj9-bin-11 = throw "adoptopenjdk has been removed as the upstream project is deprecated. Consider using `semeru-bin-11`."; # Added 2024-05-09
-  adoptopenjdk-openj9-bin-15 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 15 is also EOL. Consider using `semeru-bin-17`."; # Added 2024-05-09
-  adoptopenjdk-openj9-bin-16 = throw "adoptopenjdk has been removed as the upstream project is deprecated. JDK 16 is also EOL. Consider using `semeru-bin-17`."; # Added 2024-05-09
-  adtool = throw "'adtool' has been removed, as it was broken and unmaintained"; # Added 2024-02-14
-  aeon = throw "aeon has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-07-15
-  afl = throw "afl has been removed as the upstream project was archived. Consider using 'aflplusplus'"; # Added 2024-04-21
-  afpfs-ng = throw "'afpfs-ng' has been removed as it was broken and unmaintained for 10 years"; # Added 2025-05-17
-  agda-pkg = throw "agda-pkg has been removed due to being unmaintained"; # Added 2024-09-10
-  ajour = throw "ajour has been removed, the project was archived upstream on 2024-09-17."; # Added 2025-03-12
   akkoma-emoji = lib.warnOnInstantiate "'akkoma-emoji.blobs_gg' has been renamed to 'blobs_gg'" blobs_gg; # Added 2025-03-14
   akkoma-frontends.admin-fe = lib.warnOnInstantiate "'akkoma-frontends.admin-fe' has been renamed to 'akkoma-admin-fe'" akkoma-admin-fe; # Added 2025-03-14
   akkoma-frontends.akkoma-fe = lib.warnOnInstantiate "'akkoma-frontends.akkoma-fe' has been renamed to 'akkoma-fe'" akkoma-fe; # Added 2025-03-14
-  alass = throw "'alass' has been removed due to being unmaintained upstream"; # Added 2025-01-25
-  alsaLib = throw "'alsaLib' has been renamed to/replaced by 'alsa-lib'"; # Converted to throw 2024-10-17
-  alsaOss = throw "'alsaOss' has been renamed to/replaced by 'alsa-oss'"; # Converted to throw 2024-10-17
-  alsaPlugins = throw "'alsaPlugins' has been renamed to/replaced by 'alsa-plugins'"; # Converted to throw 2024-10-17
-  alsaPluginWrapper = throw "'alsaPluginWrapper' has been renamed to/replaced by 'alsa-plugins-wrapper'"; # Converted to throw 2024-10-17
-  alsaTools = throw "'alsaTools' has been renamed to/replaced by 'alsa-tools'"; # Converted to throw 2024-10-17
-  alsaUtils = throw "'alsaUtils' has been renamed to/replaced by 'alsa-utils'"; # Converted to throw 2024-10-17
   amazon-qldb-shell = throw "'amazon-qldb-shell' has been removed due to being unmaintained upstream"; # Added 2025-07-30
   amdvlk = throw "'amdvlk' has been removed since it was deprecated by AMD. Its replacement, RADV, is enabled by default."; # Added 2025-09-20
-  anbox = throw "'anbox' has been removed as the upstream project is unmaintained, see https://github.com/anbox/.github/blob/main/profile/README.md"; # Added 2025-01-04
   android-udev-rules = throw "'android-udev-rules' has been removed due to being superseded by built-in systemd uaccess rules."; # Added 2025-10-21
   androidndkPkgs_21 = throw "androidndkPkgs_21 has been removed, as it is EOL"; # Added 2025-08-09
   androidndkPkgs_23 = throw "androidndkPkgs_23 has been removed, as it is EOL"; # Added 2025-08-09
@@ -323,109 +282,58 @@ mapAliases {
   androidndkPkgs_24 = throw "androidndkPkgs_24 has been removed, as it is EOL"; # Added 2025-08-09
   androidndkPkgs_25 = throw "androidndkPkgs_25 has been removed, as it is EOL"; # Added 2025-08-09
   androidndkPkgs_26 = throw "androidndkPkgs_26 has been removed, as it is EOL"; # Added 2025-08-09
-  anevicon = throw "'anevicon' has been removed because the upstream repository no longer exists"; # Added 2025-01-26
-  angelfish = throw "'angelfish' has been renamed to/replaced by 'libsForQt5.kdeGear.angelfish'"; # Converted to throw 2024-10-17
   animeko = throw "'animeko' has been removed since it is unmaintained"; # Added 2025-08-20
-  ankisyncd = throw "ankisyncd is dead, use anki-sync-server instead"; # Added 2024-08-10
   ansible-language-server = throw "ansible-language-server was removed, because it was unmaintained in nixpkgs."; # Added 2025-09-24
   ansible-later = throw "ansible-later has been discontinued. The author recommends switching to ansible-lint"; # Added 2025-08-24
-  ansible_2_14 = throw "Ansible 2.14 goes end of life in 2024/05 and can't be supported throughout the 24.05 release cycle"; # Added 2024-04-11
-  ansible_2_15 = throw "Ansible 2.15 goes end of life in 2024/11 and can't be supported throughout the 24.11 release cycle"; # Added 2024-11-08
-  antennas = throw "antennas has been removed as it only works with tvheadend, which nobody was willing to maintain and was stuck on an unmaintained version that required FFmpeg 4. If you are interested in maintaining a newer version, please see https://github.com/NixOS/nixpkgs/pull/332259"; # Added 2024-08-21
-  antic = throw "'antic' has been removed as it has been merged into 'flint3'"; # Added 2025-03-28
-  antimicroX = throw "'antimicroX' has been renamed to/replaced by 'antimicrox'"; # Converted to throw 2024-10-17
   antlr4_8 = throw "antlr4_8 has been removed. Consider using a more recent version of antlr4"; # Added 2025-10-20
   ao = libfive; # Added 2024-10-11
   apacheAnt = ant; # Added 2024-11-28
-  apacheKafka_3_5 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2024-06-13
-  apacheKafka_3_6 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2024-11-27
   apacheKafka_3_7 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2025-09-27
   apacheKafka_3_8 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2025-09-27
-  apparmor-kernel-patches = throw "'apparmor-kernel-patches' has been removed as they were unmaintained, irrelevant and effectively broken"; # Added 2025-04-20
-  appimagekit = throw "'appimagekit' has been removed as it was broken in nixpkgs and archived upstream"; # Added 2025-04-19
-  apple-sdk_10_12 = throw "apple-sdk_10_12 was removed as Nixpkgs no longer supports macOS 10.12; see the 25.05 release notes"; # Added 2024-10-27
-  apple-sdk_10_13 = throw "apple-sdk_10_13 was removed as Nixpkgs no longer supports macOS 10.13; see the 25.05 release notes"; # Added 2024-10-27
-  apple-sdk_10_14 = throw "apple-sdk_10_14 was removed as Nixpkgs no longer supprots macOS 10.14; see the 25.05 release notes"; # Added 2024-10-27
-  apple-sdk_10_15 = throw "apple-sdk_10_15 was removed as Nixpkgs no longer supports macOS 10.15; see the 25.05 release notes"; # Added 2024-10-27
   appthreat-depscan = dep-scan; # Added 2024-04-10
   arangodb = throw "arangodb has been removed, as it was unmaintained and the packaged version does not build with supported GCC versions"; # Added 2025-08-12
-  arb = throw "'arb' has been removed as it has been merged into 'flint3'"; # Added 2025-03-28
   arc-browser = throw "arc-browser was removed due to being unmaintained"; # Added 2025-09-03
-  arcanist = throw "arcanist was removed as phabricator is not supported and does not accept fixes"; # Added 2024-06-07
   archipelago-minecraft = throw "archipelago-minecraft has been removed, as upstream no longer ships minecraft as a default APWorld."; # Added 2025-07-15
   archivebox = throw "archivebox has been removed, since the packaged version was stuck on django 3."; # Added 2025-08-01
   ardour_7 = throw "ardour_7 has been removed because it relies on gtk2, please use ardour instead."; # Aded 2025-10-04
   argo = argo-workflows; # Added 2025-02-01
   aria = aria2; # Added 2024-03-26
-  armcord = throw "ArmCord was renamed to legcord by the upstream developers. Action is required to migrate configurations between the two applications. Please see this PR for more details: https://github.com/NixOS/nixpkgs/pull/347971"; # Added 2024-10-11
   arrayfire = throw "arrayfire was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   artim-dark = aritim-dark; # Added 2025-07-27
   aseprite-unfree = aseprite; # Added 2023-08-26
   asitop = macpm; # Added 2025-04-14
   asterisk_18 = throw "asterisk_18: Asterisk 18 is end of life and has been removed"; # Added 2025-10-19
-  async = throw "'async' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
-  atlassian-bamboo = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02
-  atlassian-confluence = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02
-  atlassian-crowd = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02
-  atlassian-jira = throw "Atlassian software has been removed, as support for the Atlassian Server products ended in February 2024 and there was insufficient interest in maintaining the Atlassian Data Center replacements"; # Added 2024-11-02
-  ats = throw "'ats' has been removed as it is unmaintained for 10 years and broken"; # Added 2025-05-17
-  audaciousQt5 = throw "'audaciousQt5' has been removed, since audacious is built with Qt 6 now"; # Added 2024-07-06
-  auditBlasHook = throw "'auditBlasHook' has been removed since it never worked"; # Added 2024-04-02
-  aumix = throw "'aumix' has been removed due to lack of maintenance upstream. Consider using 'pamixer' for CLI or 'pavucontrol' for GUI"; # Added 2024-09-14
   AusweisApp2 = ausweisapp; # Added 2023-11-08
-  authy = throw "'authy' has been removed since it reached end of life"; # Added 2024-04-19
-  autoadb = throw "'autoadb' has been removed due to lack of maintenance upstream"; # Added 2025-01-25
   autoconf213 = throw "'autoconf213' has been removed in favor of 'autoconf'"; # Added 2025-07-21
   autoconf264 = throw "'autoconf264' has been removed in favor of 'autoconf'"; # Added 2025-07-21
   automake111x = throw "'automake111x' has been removed in favor of 'automake'"; # Added 2025-07-21
   autopanosiftc = throw "'autopanosiftc' has been removed, as it is unmaintained upstream"; # Added 2025-10-07
   autoreconfHook264 = throw "'autoreconfHook264' has been removed in favor of 'autoreconfHook'"; # Added 2025-07-21
   av-98 = throw "'av-98' has been removed because it has been broken since at least November 2024."; # Added 2025-10-03
-  avldrums-lv2 = throw "'avldrums-lv2' has been renamed to/replaced by 'x42-avldrums'"; # Converted to throw 2024-10-17
-  avr-sim = throw "'avr-sim' has been removed as it was broken and unmaintained. Possible alternatives are 'simavr', SimulAVR and AVRStudio."; # Added 2025-05-31
   awesome-4-0 = awesome; # Added 2022-05-05
   awf = throw "'awf' has been removed as the upstream project was archived in 2021"; # Added 2025-10-03
-  aws-env = throw "aws-env has been removed as the upstream project was unmaintained"; # Added 2024-06-11
-  aws-google-auth = throw "aws-google-auth has been removed as the upstream project was unmaintained"; # Added 2024-07-31
-  axmldec = throw "'axmldec' has been removed as it was broken and unmaintained for 8 years"; # Added 2025-05-17
   backlight-auto = throw "'backlight-auto' has been removed as it relies on Zig 0.12 which has been dropped."; # Added 2025-08-22
   badtouch = authoscope; # Added 2021-06-26
-  badwolf = throw "'badwolf' has been removed due to being unmaintained"; # Added 2025-04-15
-  baget = throw "'baget' has been removed due to being unmaintained"; # Added 2023-03-19
   bandwidth = throw "'bandwidth' has been removed due to lack of maintenance"; # Added 2025-09-01
   banking = saldo; # added 2025-08-29
-  bareboxTools = throw "bareboxTools has been removed due to lack of interest in maintaining it in nixpkgs"; # Added 2025-04-19
   barrier = throw "'barrier' has been removed as it is unmaintained. Consider 'deskflow' or 'input-leap' instead."; # Added 2025-09-29
   base16-builder = throw "'base16-builder' has been removed due to being unmaintained"; # Added 2025-06-03
   baserow = throw "baserow has been removed, due to lack of maintenance"; # Added 2025-08-02
-  bash_5 = throw "'bash_5' has been renamed to/replaced by 'bash'"; # Converted to throw 2024-10-17
-  bashInteractive_5 = throw "'bashInteractive_5' has been renamed to/replaced by 'bashInteractive'"; # Converted to throw 2024-10-17
   bazel_5 = throw "bazel_5 has been removed as it is EOL"; # Added 2025-08-09
   bazel_6 = throw "bazel_6 has been removed as it will be EOL by the release of Nixpkgs 25.11"; # Added 2025-08-19
   bc-decaf = throw "'bc-decaf' has been moved to 'linphonePackages.bc-decaf'"; # Added 2025-09-20
   bc-soci = throw "'bc-soci' has been moved to 'linphonePackages.bc-soci'"; # Added 2025-09-20
   bctoolbox = throw "'bctoolbox' has been moved to 'linphonePackages.bctoolbox'"; # Added 2025-09-20
   bcunit = throw "'bcunit' has been moved to 'linphonePackages.bcunit'"; # Added 2025-09-20
-  beam_nox = throw "beam_nox has been removed in favor of beam_minimal or beamMinimalPackages"; # Added 2025-04-01
-  BeatSaberModManager = throw "'beatsabermodmanager' has been removed due to lack of upstream maintainenance. Consider using 'bs-manager' instead"; # Added 2025-03-18
-  beatsabermodmanager = throw "'beatsabermodmanager' has been removed due to lack of upstream maintainenance. Consider using 'bs-manager' instead"; # Added 2025-03-18
   beets-unstable = throw "beets-unstable has been removed in favor of beets since upstream is releasing versions frequently nowadays"; # Added 2025-10-16
   beetsPackages = throw "beetsPackages were replaced with python3.pkgs.beets- prefixed attributes, and top-level beets* attributes"; # Added 2025-10-16
   belcard = throw "'belcard' has been moved to 'linphonePackages.belcard'"; # Added 2025-09-20
   belle-sip = throw "'belle-sip' has been moved to 'linphonePackages.belle-sip'"; # Added 2025-09-20
   belr = throw "'belr' has been moved to 'linphonePackages.belr'"; # Added 2025-09-20
-  betterbird = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25
-  betterbird-unwrapped = throw "betterbird has been removed as there were insufficient maintainer resources to keep up with security updates"; # Added 2024-10-25
   bfc = throw "bfc has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
-  bibata-extra-cursors = throw "bibata-cursors has been removed as it was broken"; # Added 2024-07-15
   bindle = throw "bindle has been removed since it is vulnerable to CVE-2025-62518 and upstream has been archived"; # Added 2025-10-24
-  bird = throw "The bird alias was ambiguous and has been removed for the time being. Please explicitly choose bird2 or bird3."; # Added 2025-01-11
-  bisq-desktop = throw "bisq-desktop has been removed because OpenJFX 11 was removed"; # Added 2024-11-17
-  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
-  bitcoin-unlimited = throw "bitcoin-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15
   bitcoind-abc = throw "bitcoind-abc has been removed due to a lack of maintanance"; # Added 2025-06-17
-  bitcoind-unlimited = throw "bitcoind-unlimited has been removed as it was broken and unmaintained"; # Added 2024-07-15
   bitmeter = throw "bitmeter has been removed, use `x42-meter 18` from the x42-plugins pkg instead."; # Added 2025-10-03
   bitwarden = bitwarden-desktop; # Added 2024-02-25
   bitwarden_rs = vaultwarden; # Added 2021-07-01
@@ -435,68 +343,33 @@ mapAliases {
   bitwarden_rs-vault = vaultwarden-vault; # Added 2021-07-01
   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-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
-  bless = throw "'bless' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'imhex' or 'ghex' instead"; # Added 2024-09-15
   blockbench-electron = blockbench; # Added 2024-03-16
-  bloom = throw "'bloom' has been removed because it was unmaintained upstream."; # Added 2024-11-02
   bloomeetunes = throw "bloomeetunes is unmaintained and has been removed"; # Added 2025-08-26
   bmap-tools = bmaptool; # Added 2024-08-05
-  boost175 = throw "Boost 1.75 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24
-  boost184 = throw "Boost 1.84 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24
-  boost185 = throw "Boost 1.85 has been removed as it is obsolete and no longer used by anything in Nixpkgs"; # Added 2024-11-24
-  boost_process = throw "boost_process has been removed as it is included in regular boost"; # Added 2024-05-01
   botan2 = throw "botan2 has been removed as it is EOL"; # Added 2025-10-20
   bower2nix = throw "bower2nix has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
-  bpb = throw "bpb has been removed as it is unmaintained and not compatible with recent Rust versions"; # Added 2024-04-30
-  bpftool = throw "'bpftool' has been renamed to/replaced by 'bpftools'"; # Converted to throw 2024-10-17
   brasero-original = lib.warnOnInstantiate "Use 'brasero-unwrapped' instead of 'brasero-original'" brasero-unwrapped; # Added 2024-09-29
   breath-theme = throw "'breath-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  bridgand = throw "'brigand' has been removed due to being unmaintained"; # Added 2025-04-30
   brogue = lib.warnOnInstantiate "Use 'brogue-ce' instead of 'brogue' for updated releases" brogue-ce; # Added 2025-10-04
-  bs-platform = throw "'bs-platform' was removed as it was broken, development ended and 'melange' has superseded it"; # Added 2024-07-29
-  budgie = throw "The `budgie` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14
-  budgiePlugins = throw "The `budgiePlugins` scope has been removed and all packages moved to the top-level"; # Added 2024-07-14
-  buf-language-server = throw "'buf-language-server' was removed as its development has moved to the 'buf' package"; # Added 2024-11-15
-  buildBarebox = throw "buildBarebox has been removed due to lack of interest in maintaining it in nixpkgs"; # Added 2025-04-19
   buildBowerComponents = throw "buildBowerComponents has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
-  buildFHSUserEnv = throw "'buildFHSUserEnv' has been renamed to 'buildFHSEnv' and was removed in 25.11"; # Converted to throw 2025-06-01
-  buildFHSUserEnvBubblewrap = throw "'buildFHSUserEnvBubblewrap' has been renamed to 'buildFHSEnvBubblewrap' and was removed in 25.11"; # Converted to throw 2025-06-01
-  buildFHSUserEnvChroot = throw "'buildFHSUserEnvChroot' has been renamed to 'buildFHSEnvChroot' and was removed in 25.11"; # Converted to throw 2025-06-01
-  buildGo122Module = throw "Go 1.22 is end-of-life, and 'buildGo122Module' has been removed. Please use a newer builder version."; # Added 2025-03-28
   buildGo123Module = throw "Go 1.23 is end-of-life, and 'buildGo123Module' has been removed. Please use a newer builder version."; # Added 2025-08-13
-  buildGoPackage = throw "`buildGoPackage` has been deprecated and removed, see the Go section in the nixpkgs manual for details"; # Added 2024-11-18
-  buildXenPackage = throw "'buildXenPackage' has been removed as a custom Xen build can now be achieved by simply overriding 'xen'."; # Added 2025-05-12
   bwidget = tclPackages.bwidget; # Added 2024-10-02
   bzrtp = throw "'bzrtp' has been moved to 'linphonePackages.bzrtp'"; # Added 2025-09-20
-  caffeWithCuda = throw "caffeWithCuda has been removed, as it was broken and required CUDA 10"; # Added 2024-11-20
-  calcium = throw "'calcium' has been removed as it has been merged into 'flint3'"; # Added 2025-03-28
   calculix = calculix-ccx; # Added 2024-12-18
   calligra = kdePackages.calligra; # Added 2024-09-27
   callPackage_i686 = pkgsi686Linux.callPackage; # Added 2018-07-26
   canonicalize-jars-hook = stripJavaArchivesHook; # Added 2024-03-17
   cardboard = throw "cardboard has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
-  cargo-asm = throw "'cargo-asm' has been removed due to lack of upstream maintenance. Consider 'cargo-show-asm' as an alternative."; # Added 2025-01-29
-  cargo-deps = throw "cargo-deps has been removed as the repository is deleted"; # Added 2024-04-09
   cargo-espflash = espflash; # Added 2024-02-09
-  cargo-information = throw "'cargo-information' has been removed due to being merged upstream into 'cargo'"; # Added 2025-03-09
-  cargo-inspect = throw "'cargo-inspect' has been removed due to lack of upstream maintenance. Upstream recommends cargo-expand."; # Added 2025-01-26
-  cargo-kcov = throw "'cargo-kcov' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  cargo-web = throw "'cargo-web' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
   cargonode = throw "'cargonode' has been removed due to lack of upstream maintenance"; # Added 2025-06-18
   cask = emacs.pkgs.cask; # Added 2022-11-12
-  cassandra_3_0 = throw "'cassandra_3_0' has been removed has it reached end-of-life"; # Added 2025-03-23
-  cassandra_3_11 = throw "'cassandra_3_11' has been removed has it reached end-of-life"; # Added 2025-03-23
   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
   catch = throw "catch has been removed. Please upgrade to catch2 or catch2_3"; # Added 2025-08-21
-  catcli = throw "catcli has been superseded by gocatcli"; # Added 2025-04-19
-  cawbird = throw "cawbird has been abandoned upstream and is broken anyways due to Twitter closing its API"; # Added 2023-09-05
-  cde = throw "'cde' has been removed as it is unmaintained and broken"; # Added 2025-05-17
-  centerim = throw "centerim has been removed due to upstream disappearing"; # Added 2025-04-18
   cereal_1_3_0 = throw "cereal_1_3_0 has been removed as it was unused; use cereal intsead"; # Added 2025-09-12
   cereal_1_3_2 = throw "cereal_1_3_2 is now the only version and has been renamed to cereal"; # Added 2025-09-12
   certmgr-selfsigned = certmgr; # Added 2023-11-30
-  cgal_4 = throw "cgal_4 has been removed as it is obsolete use cgal instead"; # Added 2024-12-30
   challenger = taler-challenger; # Added 2024-09-04
   charmcraft = throw "charmcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # added 2025-09-18
   chatgpt-retrieval-plugin = throw "chatgpt-retrieval-plugin has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
@@ -518,24 +391,15 @@ mapAliases {
   ChowKick = chow-kick; # Added 2024-06-12
   ChowPhaser = chow-phaser; # Added 2024-06-12
   CHOWTapeModel = chow-tape-model; # Added 2024-06-12
-  chromatic = throw "chromatic has been removed due to being unmaintained and failing to build"; # Added 2025-04-18
   chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27
   ci-edit = throw "'ci-edit' has been removed due to lack of maintenance upstream"; # Added 2025-08-26
   cinnamon-common = cinnamon; # Added 2025-08-06
-  citra = throw "citra has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
-  citra-canary = throw "citra-canary has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
-  citra-nightly = throw "citra-nightly has been removed from nixpkgs, as it has been taken down upstream"; # added 2024-03-04
-  clamsmtp = throw "'clamsmtp' has been removed as it is unmaintained and broken"; # Added 2025-05-17
-  clang9Stdenv = throw "clang9Stdenv has been removed from nixpkgs"; # Added 2024-04-08
   clang12Stdenv = throw "clang12Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   clang13Stdenv = throw "clang13Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   clang14Stdenv = throw "clang14Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   clang15Stdenv = throw "clang15Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
   clang16Stdenv = throw "clang16Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   clang17Stdenv = throw "clang17Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  clang-sierraHack = throw "clang-sierraHack has been removed because it solves a problem that no longer seems to exist. Hey, what were you even doing with that thing anyway?"; # Added 2024-10-05
-  clang-sierraHack-stdenv = throw "clang-sierraHack has been removed because it solves a problem that no longer seems to exist. Hey, what were you even doing with that thing anyway?"; # Added 2024-10-05
-  clang-tools_9 = throw "clang-tools_9 has been removed from nixpkgs"; # Added 2024-04-08
   clang-tools_12 = throw "clang-tools_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   clang-tools_13 = throw "clang-tools_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   clang-tools_14 = throw "clang-tools_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
@@ -544,71 +408,38 @@ mapAliases {
   clang-tools_17 = throw "clang-tools_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   clang-tools_18 = llvmPackages_18.clang-tools; # Added 2024-04-22
   clang-tools_19 = llvmPackages_19.clang-tools; # Added 2024-08-21
-  clang_9 = throw "clang_9 has been removed from nixpkgs"; # Added 2024-04-08
   clang_12 = throw "clang_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   clang_13 = throw "clang_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   clang_14 = throw "clang_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   clang_15 = throw "clang_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
   clang_16 = throw "clang_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   clang_17 = throw "clang_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  clash-geoip = throw "'clash-geoip' has been removed. Consider using 'dbip-country-lite' instead."; # added 2024-10-19
-  clash-verge = throw "'clash-verge' has been removed, as it was broken and unmaintained. Consider using 'clash-verge-rev' or 'clash-nyanpasu' instead"; # Added 2024-09-17
   clasp = clingo; # added 2022-12-22
-  claws-mail-gtk3 = throw "'claws-mail-gtk3' has been renamed to/replaced by 'claws-mail'"; # Converted to throw 2024-10-17
   cli-visualizer = throw "'cli-visualizer' has been removed as the upstream repository is gone"; # Added 2025-06-05
-  cligh = throw "'cligh' has been removed since it was unmaintained and its upstream deleted"; # Added 2025-05-05
   clipbuzz = throw "clipbuzz has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09
-  cloog = throw "cloog has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
-  cloog_0_18_0 = throw "cloog_0_18_0 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
-  cloogppl = throw "cloogppl has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
-  cloudlogoffline = throw "cloudlogoffline has been removed"; # added 2025-05-18
-  clubhouse-cli = throw "'clubhouse-cli' has been removed due to lack of interest to maintain it in Nixpkgs and failing to build."; # added 2025-04-21
-  clwrapperFunction = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
   cockroachdb-bin = cockroachdb; # 2024-03-15
   code-browser-gtk2 = throw "'code-browser-gtk2' has been removed, as it was broken since 22.11"; # Added 2025-08-22
   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
-  codimd = throw "'codimd' has been renamed to/replaced by 'hedgedoc'"; # Converted to throw 2024-10-17
   cog = throw "'cog' has been removed as it depends on unmaintained libraries"; # Added 2025-10-08
   CoinMP = coinmp; # Added 2024-06-12
   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
   colloid-kde = throw "'colloid-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  colorpicker = throw "'colorpicker' has been removed due to lack of maintenance upstream. Consider using 'xcolor', 'gcolor3', 'eyedropper' or 'gpick' instead"; # Added 2024-10-19
   colorstorm = throw "'colorstorm' has been removed because it was unmaintained in nixpkgs and upstream was rewritten."; # Added 2025-06-15
-  concurrencykit = throw "'concurrencykit' has been renamed to/replaced by 'libck'"; # Converted to throw 2024-10-17
   conduwuit = throw "'conduwuit' has been removed as the upstream repository has been deleted. Consider migrating to 'matrix-conduit', 'matrix-continuwuity' or 'matrix-tuwunel' instead."; # Added 2025-08-08
   cone = throw "cone has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
-  connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27
-  containerpilot = throw "'containerpilot' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-09
   copilot-language-server-fhs = lib.warnOnInstantiate "The package set `copilot-language-server-fhs` has been renamed to `copilot-language-server`." copilot-language-server; # Added 2025-09-07
   copper = throw "'copper' has been removed, as it was broken since 22.11"; # Added 2025-08-22
   cordless = throw "'cordless' has been removed due to being archived upstream. Consider using 'discordo' instead."; # Added 2025-06-07
-  corepack_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23
-  coriander = throw "'coriander' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
-  corretto19 = throw "Corretto 19 was removed as it has reached its end of life"; # Added 2024-08-01
   cosmic-tasks = tasks; # Added 2024-07-04
   cotton = throw "'cotton' has been removed since it is vulnerable to CVE-2025-62518 and upstream is unmaintained"; # Added 2025-10-26
   cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15
-  cq-editor = throw "cq-editor has been removed, as it use a dependency that was disabled since python 3.8 and was last updated in 2021"; # Added 2024-05-13
-  crack_attack = throw "'crack_attack' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
-  crackmapexec = throw "'crackmapexec' has been removed as it was unmaintained. Use 'netexec' instead"; # 2024-08-11
-  create-react-app = throw "'create-react-app' has been removed as it was deprecated. Upstream suggests using a framework for React."; # Added 2025-05-17
   crispyDoom = crispy-doom; # Added 2023-05-01
   critcl = tclPackages.critcl; # Added 2024-10-02
   cromite = throw "'cromite' has been removed from nixpkgs due to it not being maintained"; # Added 2025-06-12
   crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06
-  crunchy-cli = throw "'crunchy-cli' was sunset, see <https://github.com/crunchy-labs/crunchy-cli/issues/362>"; # Added 2025-03-26
-  crystal_1_2 = throw "'crystal_1_2' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13
-  crystal_1_7 = throw "'crystal_1_7' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13
-  crystal_1_8 = throw "'crystal_1_8' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13
-  crystal_1_9 = throw "'crystal_1_9' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-13
   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
-  crystal_1_12 = throw "'crystal_1_12' has been removed as it is obsolete and no longer used in the tree. Consider using 'crystal' instead"; # Added 2025-02-19
   cstore_fdw = throw "'cstore_fdw' has been removed. Use 'postgresqlPackages.cstore_fdw' instead."; # Added 2025-07-19
-  cudaPackages_10 = throw "CUDA 10 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
-  cudaPackages_10_0 = throw "CUDA 10.0 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
-  cudaPackages_10_1 = throw "CUDA 10.1 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
-  cudaPackages_10_2 = throw "CUDA 10.2 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2024-11-20
   cudaPackages_11 = throw "CUDA 11 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_11_0 = throw "CUDA 11.0 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_11_1 = throw "CUDA 11.1 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
@@ -627,157 +458,64 @@ mapAliases {
   cudaPackages_12_5 = throw "CUDA 12.5 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12
   curlHTTP3 = lib.warnOnInstantiate "'curlHTTP3' has been removed, as 'curl' now has HTTP/3 support enabled by default" curl; # Added 2025-08-22
-  cutemarked-ng = throw "'cutemarked-ng' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.ghostwriter' instead"; # Added 2024-12-27
-  cvs_fast_export = throw "'cvs_fast_export' has been renamed to/replaced by 'cvs-fast-export'"; # Converted to throw 2024-10-17
   cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09
   dale = throw "dale has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
-  dap = throw "'dap' has been removed because it doesn't compile and has been unmaintained since 2014"; # Added 2025-05-10
-  daq = throw "'daq' has been removed as it is unmaintained and broken. Snort2 has also been removed, which depended on this"; # Added 2025-05-21
-  darling = throw "'darling' has been removed due to vendoring Python2"; # Added 2025-05-10
-  dart-sass-embedded = throw "dart-sass-embedded has been removed from nixpkgs, as it is now included in Dart Sass itself."; # Added 2023-10-25
-  dart_stable = throw "'dart_stable' has been renamed to/replaced by 'dart'"; # Converted to throw 2024-10-17
-  dat = throw "dat was removed because it was broken"; # Added 2023-08-21
-  dave = throw "'dave' has been removed as it has been archived upstream. Consider using 'webdav' instead"; # Added 2025-02-03
   daytona-bin = throw "'daytona-bin' has been removed, as it was unmaintained in nixpkgs"; # Added 2025-07-21
-  dbeaver = throw "'dbeaver' has been renamed to/replaced by 'dbeaver-bin'"; # Added 2024-05-16
-  dbench = throw "'dbench' has been removed as it is unmaintained for 14 years and broken"; # Added 2025-05-17
-  dbus-map = throw "'dbus-map' has been dropped as it is unmaintained"; # Added 2024-11-01
   dbus-sharp-1_0 = throw "'dbus-sharp-1_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
   dbus-sharp-2_0 = throw "'dbus-sharp-2_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
   dbus-sharp-glib-1_0 = throw "'dbus-sharp-glib-1_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
   dbus-sharp-glib-2_0 = throw "'dbus-sharp-glib-2_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
-  dclib = throw "'dclib' has been removed as it is unmaintained for 16 years and broken"; # Added 2025-05-25
   deadpixi-sam = deadpixi-sam-unstable; # Added 2018-05-01
-  debugedit-unstable = throw "'debugedit-unstable' has been renamed to/replaced by 'debugedit'"; # Converted to throw 2024-10-17
   deepin = throw "the Deepin desktop environment and associated tools have been removed from nixpkgs due to lack of maintenance"; # Added 2025-08-21
   deepsea = throw "deepsea has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
   degit-rs = throw "'degit-rs' has been removed because it is unmaintained upstream and has vulnerable dependencies."; # Added 2025-07-11
   deltachat-cursed = arcanechat-tui; # added 2025-02-25
-  deltachat-electron = throw "'deltachat-electron' has been renamed to/replaced by 'deltachat-desktop'"; # Converted to throw 2024-10-17
-  demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
-  devdash = throw "'devdash' has been removed as the upstream project was archived"; # Added 2025-03-27
   devdocs-desktop = throw "'devdocs-desktop' has been removed as it is unmaintained upstream and vendors insecure dependencies"; # Added 2025-06-11
   dfilemanager = throw "'dfilemanager' has been dropped as it was unmaintained"; # Added 2025-06-03
-  dgsh = throw "'dgsh' has been removed, as it was broken and unmaintained"; # added 2024-05-09
-  dibbler = throw "dibbler was removed because it is not maintained anymore"; # Added 2024-05-14
-  dillong = throw "'dillong' has been removed, as upstream is abandoned since 2021-12-13. Use either 'dillo' or 'dillo-plus'. The latter integrates features from dillong."; # Added 2024-10-07
-  dina-font-pcf = throw "'dina-font-pcf' has been renamed to/replaced by 'dina-font'"; # Converted to throw 2024-10-17
-  directvnc = throw "'directvnc' has been removed as it was unmaintained upstream since 2015 and failed to build with gcc 14"; # Added 2025-05-17
-  diskonaut = throw "'diskonaut' was removed due to lack of upstream maintenance"; # Added 2025-01-25
-  dispad = throw "dispad has been remove because it doesn't compile and has been unmaintained since 2014"; # Added 2025-04-25
   dleyna-connector-dbus = dleyna; # Added 2025-04-19
   dleyna-core = dleyna; # Added 2025-04-19
   dleyna-renderer = dleyna; # Added 2025-04-19
   dleyna-server = dleyna; # Added 2025-04-19
-  dnnl = throw "'dnnl' has been renamed to/replaced by 'oneDNN'"; # Converted to throw 2024-10-17
   dnscrypt-proxy2 = dnscrypt-proxy; # Added 2023-02-02
-  dnscrypt-wrapper = throw "dnscrypt-wrapper was removed because it has been effectively unmaintained since 2018. Use DNSCcrypt support in dnsdist instead"; # Added 2024-09-14
-  docear = throw "Docear was removed because it was unmaintained upstream. JabRef, Zotero, or Mendeley are potential replacements."; # Added 2024-11-02
-  docker-compose_1 = throw "'docker-compose_1' has been removed because it has been unmaintained since May 2021. Use docker-compose instead."; # Added 2024-07-29
   docker-distribution = distribution; # Added 2023-12-26
   docker-sync = throw "'docker-sync' has been removed because it was broken and unmaintained"; # Added 2025-08-26
-  docker_24 = throw "'docker_24' has been removed because it has been unmaintained since June 2024. Use docker_25 or newer instead."; # Added 2024-12-21
   docker_26 = throw "'docker_26' has been removed because it has been unmaintained since February 2025. Use docker_28 or newer instead."; # Added 2025-06-21
   docker_27 = throw "'docker_27' has been removed because it has been unmaintained since May 2025. Use docker_28 or newer instead."; # Added 2025-06-15
   dockerfile-language-server-nodejs = lib.warnOnInstantiate "'dockerfile-language-server-nodejs' has been renamed to 'dockerfile-language-server'" dockerfile-language-server; # Added 2025-09-12
   dolphin-emu-beta = dolphin-emu; # Added 2023-02-11
-  dolphinEmu = throw "'dolphinEmu' has been renamed to/replaced by 'dolphin-emu'"; # Converted to throw 2024-10-17
-  dolphinEmuMaster = throw "'dolphinEmuMaster' has been renamed to/replaced by 'dolphin-emu-beta'"; # Converted to throw 2024-10-17
-  dotnet-netcore = throw "'dotnet-netcore' has been renamed to/replaced by 'dotnet-runtime'"; # Converted to throw 2024-10-17
-  dotnet-sdk_2 = throw "'dotnet-sdk_2' has been renamed to/replaced by 'dotnetCorePackages.sdk_2_1'"; # Converted to throw 2024-10-17
-  dotnet-sdk_3 = throw "'dotnet-sdk_3' has been renamed to/replaced by 'dotnetCorePackages.sdk_3_1'"; # Converted to throw 2024-10-17
-  dotnet-sdk_5 = throw "'dotnet-sdk_5' has been renamed to/replaced by 'dotnetCorePackages.sdk_5_0'"; # Converted to throw 2024-10-17
   dotnetenv = throw "'dotnetenv' has been removed because it was unmaintained in Nixpkgs"; # Added 2025-07-11
   dotty = scala_3; # Added 2023-08-20
   dovecot_fts_xapian = throw "'dovecot_fts_xapian' has been removed because it was unmaintained in Nixpkgs. Consider using dovecot-fts-flatcurve instead"; # Added 2025-08-16
-  downonspot = throw "'downonspot' was removed because upstream has been taken down by a cease and desist"; # Added 2025-01-25
-  dozenal = throw "dozenal has been removed because it does not compile and only minimal functionality"; # Added 2025-03-30
-  drush = throw "drush as a standalone package has been removed because it's no longer supported as a standalone tool"; # Added 2024-02-20
   dsd = throw "dsd has been removed, as it was broken and lack of upstream maintenance"; # Added 2025-08-25
-  dstat = throw "'dstat' has been removed because it has been unmaintained since 2020. Use 'dool' instead."; # Added 2025-01-21
   dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03
   dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03
   du-dust = dust; # Added 2024-01-19
   duckstation-bin = duckstation; # Added 2025-09-20
   dumb = throw "'dumb' has been archived by upstream. Upstream recommends libopenmpt as a replacement."; # Added 2025-09-14
   dump1090 = dump1090-fa; # Added 2024-02-12
-  dwfv = throw "'dwfv' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  dylibbundler = throw "'dylibbundler' has been renamed to/replaced by 'macdylibbundler'"; # Converted to throw 2024-10-17
   eask = eask-cli; # Added 2024-09-05
   easyloggingpp = throw "easyloggingpp has been removed, as it is deprecated upstream and does not build with CMake 4"; # Added 2025-09-17
-  eboard = throw "'eboard' has been removed due to lack of maintenance upstream. Consider using 'kdePackages.knights' instead"; # Added 2024-10-19
   EBTKS = ebtks; # Added 2024-01-21
   ec2-utils = amazon-ec2-utils; # Added 2022-02-01
-  ec2_ami_tools = throw "'ec2_ami_tools' has been renamed to/replaced by 'ec2-ami-tools'"; # Converted to throw 2024-10-17
-  ec2_api_tools = throw "'ec2_api_tools' has been renamed to/replaced by 'ec2-api-tools'"; # Converted to throw 2024-10-17
-  ecryptfs-helper = throw "'ecryptfs-helper' has been removed, for filesystem-level encryption, use fscrypt"; # Added 2025-04-08
-  edbrowse = throw "'edbrowse' has been removed as it was unmaintained in Nixpkgs"; # Added 2025-05-18
-  edge-runtime = throw "'edge-runtime' was removed as it was unused, unmaintained, likely insecure and failed to build"; # Added 2025-05-18
-  edgedb = throw "edgedb replaced to gel because of change of upstream"; # Added 2025-02-24
   edid-decode = v4l-utils; # Added 2025-06-20
-  edUnstable = throw "edUnstable was removed; use ed instead"; # Added 2024-07-01
-  eidolon = throw "eidolon was removed as it is unmaintained upstream."; # Added 2025-05-28
   eintopf = lauti; # Project was renamed, added 2025-05-01
-  electronplayer = throw "'electronplayer' has been removed as it had been discontinued upstream since October 2024"; # Added 2024-12-17
-  element-desktop-wayland = throw "element-desktop-wayland has been removed. Consider setting NIXOS_OZONE_WL=1 via 'environment.sessionVariables' instead"; # Added 2024-12-17
   elementsd-simplicity = throw "'elementsd-simplicity' has been removed due to lack of maintenance, consider using 'elementsd' instead"; # Added 2025-06-04
   elixir_ls = elixir-ls; # Added 2023-03-20
   elm-github-install = throw "'elm-github-install' has been removed as it is abandoned upstream and only supports Elm 0.18.0"; # Added 2025-08-25
-  emacs28 = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
-  emacs28-gtk2 = throw "emacs28-gtk2 was removed because GTK2 is EOL; migrate to emacs28{,-gtk3,-nox} or to more recent versions of Emacs."; # Added 2024-09-20
-  emacs28-gtk3 = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
-  emacs28-macport = throw "Emacs 28 Macport is removed due to CVEs which are fixed in Emacs 30 and backported to Emacs 29 Macport"; # Added 2025-04-06
-  emacs28-nox = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
-  emacs28NativeComp = throw "Emacs 28 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
-  emacs28Packages = throw "'emacs28Packages' has been renamed to/replaced by 'emacs28.pkgs'"; # Converted to throw 2024-10-17
-  emacs28WithPackages = throw "'emacs28WithPackages' has been renamed to/replaced by 'emacs28.pkgs.withPackages'"; # Converted to throw 2024-10-17
-  emacs29 = throw "Emacs 29 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
-  emacs29-gtk3 = throw "Emacs 29 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
-  emacs29-nox = throw "Emacs 29 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
-  emacs29-pgtk = throw "Emacs 29 is removed due to CVEs which are fixed in Emacs 30"; # Added 2025-03-03
   emacsMacport = emacs-macport; # Added 2023-08-10
   emacsNativeComp = emacs; # Added 2022-06-08
   emacsPackages = emacs.pkgs; # Added 2025-03-02
-  emacsWithPackages = throw "'emacsWithPackages' has been renamed to/replaced by 'emacs.pkgs.withPackages'"; # Converted to throw 2024-10-17
   embree2 = throw "embree2 has been removed, as it is unmaintained upstream and depended on tbb_2020"; # Added 2025-09-14
   EmptyEpsilon = empty-epsilon; # Added 2024-07-14
   emulationstation = throw "emulationstation was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   emulationstation-de = throw "emulationstation-de was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   enyo-doom = enyo-launcher; # Added 2022-09-09
-  eolie = throw "'eolie' has been removed due to being unmaintained"; # Added 2025-04-15
   epapirus-icon-theme = throw "'epapirus-icon-theme' has been removed because 'papirus-icon-theme' no longer supports building with elementaryOS icon support"; # Added 2025-06-15
-  epdfview = throw "'epdfview' has been removed due to lack of maintenance upstream. Consider using 'qpdfview' instead"; # Added 2024-10-19
-  ephemeral = throw "'ephemeral' has been archived upstream since 2022-04-02"; # added 2025-04-12
-  epoxy = throw "'epoxy' has been renamed to/replaced by 'libepoxy'"; # Converted to throw 2024-10-17
   eris-go = throw "'eris-go' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   eriscmd = throw "'eriscmd' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   erlang-ls = throw "'erlang-ls' has been removed as it has been archived upstream. Consider using 'erlang-language-platform' instead"; # Added 2025-10-02
-  erlang_24 = throw "erlang_24 has been removed as it is unmaintained upstream"; # Added 2024-12-26
-  erlang_25 = throw "erlang_25 has been removed as it is unmaintained upstream"; # added 2025-03-31
-  erlang_27-rc3 = throw "erlang_27-rc3 has been removed in favor of erlang_27"; # added 2024-05-20
-  erlang_language_platform = throw "erlang_language_platform has been renamed erlang-language-platform"; # added 2025-04-04
-  erlang_nox = throw "erlang_nox has been removed in favor of beam_minimal.packages.erlang or beamMinimalPackages.erlang"; # added 2025-04-01
-  erlangR24 = throw "erlangR24 has been removed in favor of erlang_24"; # added 2024-05-24
-  erlangR24_javac = throw "erlangR24_javac has been removed in favor of erlang_24_javac"; # added 2024-05-24
-  erlangR24_odbc = throw "erlangR24_odbc has been removed in favor of erlang_24_odbc"; # added 2024-05-24
-  erlangR24_odbc_javac = throw "erlangR24_odbc_javac has been removed in favor of erlang_24_odbc_javac"; # added 2024-05-24
-  erlangR25 = throw "erlangR25 has been removed as it is unmaintained upstream"; # added 2024-05-24
-  erlangR25_javac = throw "erlangR25_javac has been removed as it is unmaintained upstream"; # added 2024-05-24
-  erlangR25_odbc = throw "erlangR25_odbc has been removed as it is unmaintained upstream"; # added 2024-05-24
-  erlangR25_odbc_javac = throw "erlangR25_odbc_javac has been removed as it is unmaintained upstream"; # added 2024-05-24
-  erlangR26 = throw "erlangR26 has been removed in favor of erlang_26"; # added 2024-05-24
-  erlangR26_javac = throw "erlangR26_javac has been removed in favor of erlang_26_javac"; # added 2024-05-24
-  erlangR26_odbc = throw "erlangR26_odbc has been removed in favor of erlang_26_odbc"; # added 2024-05-24
-  erlangR26_odbc_javac = throw "erlangR26_odbc_javac has been removed in favor of erlang_26_odbc_javac"; # added 2024-05-24
-  est-sfs = throw "'est-sfs' has been removed as it was unmaintained in Nixpkgs"; # Added 2025-05-18
-  ethabi = throw "ethabi has been removed due to lack of maintainence upstream and no updates in Nixpkgs"; # Added 2024-07-16
   eww-wayland = lib.warnOnInstantiate "eww now can build for X11 and wayland simultaneously, so `eww-wayland` is deprecated, use the normal `eww` package instead." eww; # Added 2024-02-17
   f3d_egl = lib.warnOnInstantiate "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # added 2025-07-18
-  factor-lang-scope = throw "'factor-lang-scope' has been renamed to 'factorPackages'"; # added 2024-11-28
-  fahcontrol = throw "fahcontrol has been removed because the download is no longer available"; # added 2024-09-24
-  fahviewer = throw "fahviewer has been removed because the download is no longer available"; # added 2024-09-24
-  fam = throw "'fam' (aliased to 'gamin') has been removed as it is unmaintained upstream"; # Added 2024-04-19
-  fastnlo = throw "'fastnlo' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2024-10-17
   fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03
   faustStk = faustPhysicalModeling; # Added 2023-05-16
   fbjni = throw "fbjni has been removed, as it was broken"; # Added 2025-08-25
@@ -787,25 +525,16 @@ mapAliases {
   fcitx5-skk-qt = qt6Packages.fcitx5-skk-qt; # Added 2024-03-01
   fcitx5-unikey = qt6Packages.fcitx5-unikey; # Added 2024-03-01
   fcitx5-with-addons = qt6Packages.fcitx5-with-addons; # Added 2024-03-01
-  fdr = throw "fdr has been removed, as it cannot be built from source and depends on Python 2.x"; # Added 2025-03-19
   fennel = luaPackages.fennel; # Added 2022-09-24
-  ferdi = throw "'ferdi' has been removed, upstream does not exist anymore and the package is insecure"; # Added 2024-08-22
   fetchbower = throw "fetchbower has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
-  ffmpeg_5 = throw "ffmpeg_5 has been removed, please use another version"; # Added 2024-07-12
-  ffmpeg_5-full = throw "ffmpeg_5-full has been removed, please use another version"; # Added 2024-07-12
-  ffmpeg_5-headless = throw "ffmpeg_5-headless has been removed, please use another version"; # Added 2024-07-12
   FIL-plugins = fil-plugins; # Added 2024-06-12
-  fileschanged = throw "'fileschanged' has been removed as it is unmaintained upstream"; # Added 2024-04-19
   filesender = throw "'filesender' has been removed because of its simplesamlphp dependency"; # Added 2025-10-17
-  filet = throw "'filet' has been removed as the upstream repo has been deleted"; # Added 2025-02-07
   finger_bsd = bsd-finger; # Added 2022-03-14
   fingerd_bsd = bsd-fingerd; # Added 2022-03-14
   fira-code-nerdfont = lib.warnOnInstantiate "fira-code-nerdfont is redundant. Use nerd-fonts.fira-code instead." nerd-fonts.fira-code; # Added 2024-11-10
   firebird_2_5 = throw "'firebird_2_5' has been removed as it has reached end-of-life and does not build."; # Added 2025-06-10
   firefox-beta-bin = lib.warnOnInstantiate "`firefox-beta-bin` is removed.  Please use `firefox-beta` or `firefox-bin` instead." firefox-beta; # Added 2025-06-06
   firefox-devedition-bin = lib.warnOnInstantiate "`firefox-devedition-bin` is removed.  Please use `firefox-devedition` or `firefox-bin` instead." firefox-devedition; # Added 2025-06-06
-  firefox-esr-115 = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-128` instead."; # Added 2024-10-13
-  firefox-esr-115-unwrapped = throw "The Firefox 115 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-128-unwrapped` instead."; # Added 2024-10-13
   firefox-esr-128 = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-140` instead."; # Added 2025-08-21
   firefox-esr-128-unwrapped = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-140-unwrapped` instead."; # Added 2025-08-21
   firefox-wayland = firefox; # Added 2022-11-15
@@ -814,29 +543,16 @@ mapAliases {
   fit-trackee = fittrackee; # added 2024-09-03
   flashrom-stable = flashprog; # Added 2024-03-01
   flatbuffers_2_0 = flatbuffers; # Added 2022-05-12
-  flatcam = throw "flatcam has been removed because it is unmaintained since 2022 and doesn't support Python > 3.10"; # Added 2025-01-25
   flint3 = flint; # Added 2025-09-21
   floorp = throw "floorp has been replaced with floorp-bin, as building from upstream sources has become unfeasible starting with version 12.x"; # Added 2025-09-06
   floorp-unwrapped = throw "floorp-unwrapped has been replaced with floorp-bin-unwrapped, as building from upstream sources has become unfeasible starting with version 12.x"; # Added 2025-09-06
   flow-editor = flow-control; # Added 2025-03-05
   flut-renamer = throw "flut-renamer is unmaintained and has been removed"; # Added 2025-08-26
-  flutter313 = throw "flutter313 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05
-  flutter316 = throw "flutter316 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05
-  flutter319 = throw "flutter319 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-12-03
-  flutter322 = throw "flutter322 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05
-  flutter323 = throw "flutter323 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2024-10-05
   flutter326 = throw "flutter326 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-06-08
-  fluxctl = throw "fluxctl is unmaintained and has been removed. Migration to flux2 is recommended"; # Added 2025-05-11
-  fluxus = throw "fluxus has been removed because it hasn't been updated in 9 years and depended on insecure Racket 7.9"; # Added 2024-12-06
   fmsynth = throw "'fmsynth' has been removed as it was broken and unmaintained both upstream and in nixpkgs."; # Added 2025-09-01
-  fmt_8 = throw "fmt_8 has been removed as it is obsolete and was no longer used in the tree"; # Added 2024-11-12
-  fntsample = throw "fntsample has been removed as it is unmaintained upstream"; # Added 2025-04-21
-  foldingathome = throw "'foldingathome' has been renamed to/replaced by 'fahclient'"; # Converted to throw 2024-10-17
   follow = lib.warnOnInstantiate "follow has been renamed to folo" folo; # Added 2025-05-18
   forge = throw "forge was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   forgejo-actions-runner = forgejo-runner; # Added 2024-04-04
-  fornalder = throw "'fornalder' has been removed as it is unmaintained upstream"; # Added 2025-01-25
-  foundationdb71 = throw "foundationdb71 has been removed; please upgrade to foundationdb73"; # Added 2024-12-28
   fractal-next = fractal; # added 2023-11-25
   framework-system-tools = framework-tool; # added 2023-12-09
   francis = kdePackages.francis; # added 2024-07-13
@@ -846,16 +562,11 @@ mapAliases {
   freeimage = throw "freeimage was removed due to numerous vulnerabilities"; # Added 2025-10-23
   freerdp3 = freerdp; # added 2025-03-25
   freerdpUnstable = freerdp; # added 2025-03-25
-  frostwire = throw "frostwire was removed, as it was broken due to reproducibility issues, use `frostwire-bin` package instead."; # added 2024-05-17
-  ftjam = throw "ftjam was removed, as it hasn't been updated since 2007 and fails to build"; # added 2025-01-02
-  fuse-common = throw "fuse-common was removed, because the udev rule was early included by systemd-udevd and the config is done by NixOS module `programs.fuse`"; # added 2024-09-29
   fusee-launcher = throw "'fusee-launcher' was removed as upstream removed the original source repository fearing legal repercussions"; # added 2025-07-05
   futuresql = libsForQt5.futuresql; # added 2023-11-11
   fx_cast_bridge = fx-cast-bridge; # added 2023-07-26
   g4music = gapless; # Added 2024-07-26
-  g4py = throw "'g4py' has been renamed to/replaced by 'python3Packages.geant4'"; # Converted to throw 2024-10-17
   gamecube-tools = throw "gamecube-tools was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
-  gamin = throw "'gamin' has been removed as it is unmaintained upstream"; # Added 2024-04-19
   garage_0_8 = throw "'garage_0_8' has been removed as it is unmaintained upstream"; # Added 2025-06-23
   garage_0_8_7 = throw "'garage_0_8_7' has been removed as it is unmaintained upstream"; # Added 2025-06-23
   garage_0_9 = throw "'garage_0_9' has been removed as it is unmaintained upstream"; # Added 2025-09-16
@@ -863,13 +574,6 @@ mapAliases {
   garage_1_2_0 = throw "'garage_1_2_0' has been removed. Use 'garage_1' instead."; # Added 2025-09-16
   garage_1_x = lib.warnOnInstantiate "'garage_1_x' has been renamed to 'garage_1'" garage_1; # Added 2025-06-23
   garage_2_0_0 = throw "'garage_2_0_0' has been removed. Use 'garage_2' instead."; # Added 2025-09-16
-  gbl = throw "'gbl' has been removed because the upstream repository no longer exists"; # Added 2025-01-26
-  gcc6 = throw "gcc6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
-  gcc6Stdenv = throw "gcc6Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
-  gcc7 = throw "gcc7 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
-  gcc7Stdenv = throw "gcc7Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
-  gcc8 = throw "gcc8 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
-  gcc8Stdenv = throw "gcc8Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
   gcc9 = throw "gcc9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc9Stdenv = throw "gcc9Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc10 = throw "gcc10 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
@@ -879,68 +583,28 @@ mapAliases {
   gcc11Stdenv = throw "gcc11Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc12 = throw "gcc12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc12Stdenv = throw "gcc12Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
-  gcc48 = throw "gcc48 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-10
-  gcc49 = throw "gcc49 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11
-  gcc49Stdenv = throw "gcc49Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-11
-  gcc-arm-embedded-6 = throw "gcc-arm-embedded-6 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
-  gcc-arm-embedded-7 = throw "gcc-arm-embedded-7 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
-  gcc-arm-embedded-8 = throw "gcc-arm-embedded-8 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
-  gcc-arm-embedded-9 = throw "gcc-arm-embedded-9 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
-  gcc-arm-embedded-10 = throw "gcc-arm-embedded-10 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
-  gcc-arm-embedded-11 = throw "gcc-arm-embedded-11 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
-  gcc-arm-embedded-12 = throw "gcc-arm-embedded-12 has been removed from Nixpkgs as it is unmaintained and obsolete"; # Added 2025-04-12
   gccgo12 = throw "gccgo12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
-  gcj6 = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
-  gcj = throw "gcj6 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
-  gcolor2 = throw "'gcolor2' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gcolor3' or 'eyedropper' instead"; # Added 2024-09-15
   gdc11 = throw "gdc11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gdc = throw "gdc has been removed from Nixpkgs, as recent versions require complex bootstrapping"; # Added 2025-08-08
   gdmd = throw "gdmd has been removed from Nixpkgs, as it depends on GDC which was removed"; # Added 2025-08-08
-  gdome2 = throw "'gdome2' has been removed from nixpkgs, as it is umaintained and obsolete"; # Added 2024-12-29
-  geocode-glib = throw "'geocode-glib' has been removed, as it was unused and used outdated libraries"; # Added 2025-04-16
   geos_3_9 = throw "geos_3_9 has been removed from nixpkgs. Please use a more recent 'geos' instead."; # Added 2025-09-21
-  geos_3_11 = throw "geos_3_11 has been removed from nixpkgs. Please use a more recent 'geos' instead."; # Added 2024-11-29
-  gfbgraph = throw "'gfbgraph' has been removed as it was archived upstream and unused in nixpkgs"; # Added 2025-04-20
-  gfortran7 = throw "gfortran7 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
-  gfortran8 = throw "gfortran8 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
   gfortran9 = throw "gfortran9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gfortran10 = throw "gfortran10 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gfortran11 = throw "gfortran11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gfortran12 = throw "gfortran12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
-  gfortran48 = throw "'gfortran48' has been removed from nixpkgs"; # Added 2024-09-10
-  gfortran49 = throw "'gfortran49' has been removed from nixpkgs"; # Added 2024-09-11
   gg = go-graft; # Added 2025-03-07
-  ggobi = throw "'ggobi' has been removed from Nixpkgs, as it is unmaintained and broken"; # Added 2025-05-18
   gimp3 = gimp; # added 2025-10-03
   gimp3-with-plugins = gimp-with-plugins; # added 2025-10-03
   gimp3Plugins = gimpPlugins; # added 2025-10-03
-  git-annex-utils = throw "'git-annex-utils' has been removed as it is unmaintained"; # Added 2025-05-18
-  git-backup = throw "git-backup has been removed, as it has been abandoned upstream. Consider using git-backup-go instead."; # Added 2024-07-16
-  git-codeowners = throw "'git-codeowners' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  git-credential-1password = throw "'git-credential-1password' has been removed, as the upstream project is deleted."; # Added 2024-05-20
-  git-stree = throw "'git-stree' has been deprecated by upstream. Upstream recommends using 'git-subrepo' as a replacement."; # Added 2025-05-05
   gitAndTools = throw "gitAndTools has been removed, as the packages are now available at the top level"; # Converted to throw 2025-10-26
   gitversion = throw "'gitversion' has been removed because it produced a broken build and was unmaintained"; # Added 2025-08-30
-  givaro_3 = throw "'givaro_3' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07
-  givaro_3_7 = throw "'givaro_3_7' has been removed as it is end-of-life. Consider using the up-to-date 'givaro' instead"; # Added 2025-05-07
-  gjay = throw "'gjay' has been removed as it is unmaintained upstream"; # Added 2025-05-25
-  gkraken = throw "'gkraken' has been deprecated by upstream. Consider using the replacement 'coolercontrol' instead."; # Added 2024-11-22
   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
   glew-egl = lib.warnOnInstantiate "'glew-egl' is now provided by 'glew' directly" glew; # Added 2024-08-11
   glfw-wayland = glfw; # Added 2024-04-19
   glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08
   glxinfo = mesa-demos; # Added 2024-07-04
-  gmailieer = throw "'gmailieer' has been renamed to/replaced by 'lieer'"; # Converted to throw 2024-10-17
-  gmni = throw "gmni has been removed as it is no longer maintained upstream"; # Added 2025-05-02
   gmnisrv = throw "'gmnisrv' has been removed due to lack of maintenance upstream"; # Added 2025-06-07
-  gmock = throw "'gmock' has been renamed to/replaced by 'gtest'"; # Converted to throw 2024-10-17
-  gmp4 = throw "'gmp4' is end-of-life, consider using 'gmp' instead"; # Added 2024-12-24
-  gmp5 = throw "'gmp5' has been removed as it is unmaintained. Consider using 'gmp' instead"; # Added 2024-10-28
-  gmpc = throw "'gmpc' has been removed due to lack of maintenance upstream. Consider using 'plattenalbum' instead"; # Added 2024-09-14
-  gmtk = throw "'gmtk' has been removed due to lack of maintenance upstream"; # Added 2024-09-14
-  gmtp = throw "'gmtp' has been removed due to lack of maintenance upstream. Consider using 'gnome-music' instead"; # Added 2024-09-14
-  gn1924 = throw "gn1924 has been removed because it was broken and no longer used by envoy."; # Added 2024-11-03
   gnat11 = throw "gnat11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gnat12 = throw "gnat12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gnat12Packages = throw "gnat12Packages has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
@@ -964,124 +628,56 @@ mapAliases {
   gnatcoll-xref = gnatPackages.gnatcoll-xref; # Added 2024-02-25
   gnatcoll-zlib = gnatPackages.gnatcoll-zlib; # Added 2024-02-25
   gnatinspect = gnatPackages.gnatinspect; # Added 2024-02-25
-  gnome3 = throw "'gnome3' has been renamed to/replaced by 'gnome'"; # Converted to throw 2024-10-17
-  gnome-dictionary = throw "'gnome-dictionary' has been removed as it has been archived upstream. Consider using 'wordbook' instead"; # Added 2024-09-14
   gnome-firmware-updater = gnome-firmware; # added 2022-04-14
-  gnome-hexgl = throw "'gnome-hexgl' has been removed due to lack of maintenance upstream"; # Added 2024-09-14
-  gnome-latex = throw "'gnome-latex' has been superseded by 'enter-tex'"; # Added 2024-09-18
   gnome-passwordsafe = gnome-secrets; # added 2022-01-30
   gnome-resources = resources; # added 2023-12-10
-  gnome-settings-daemon43 = throw "'gnome-settings-daemon43' has been removed since it is no longer used by Pantheon."; # Added 2024-09-22
-  gnome_mplayer = throw "'gnome_mplayer' has been removed due to lack of maintenance upstream. Consider using 'celluloid' instead"; # Added 2024-09-14
   gnu-cobol = gnucobol; # Added 2024-09-17
   gnubik = throw "'gnubik' has been removed due to lack of maintainance upstream and its dependency on GTK 2"; # Added 2025-09-16
-  gnufdisk = throw "'gnufdisk' has been removed due to lack of maintenance upstream"; # Added 2024-12-31
-  gnupg1orig = throw "'gnupg1orig' has been removed due to lack of active upstream maintainance. Consider using 'gnupg' instead"; # Added 2025-01-11
-  gnupg22 = throw "'gnupg22' is end-of-life. Consider using 'gnupg24' instead"; # Added 2025-01-05
-  gnuradio3_8 = throw "gnuradio3_8 has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18
-  gnuradio3_8Minimal = throw "gnuradio3_8Minimal has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18
-  gnuradio3_8Packages = throw "gnuradio3_8Minimal has been removed because it was too old and incompatible with a not EOL swig"; # Added 2024-11-18
-  gnuradio3_9 = throw "gnuradio3_9 has been removed because it is not compatible with the latest volk and it had no dependent packages which justified its distribution"; # Added 2024-07-28
-  gnuradio3_9Minimal = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified its distribution"; # Added 2024-07-28
-  gnuradio3_9Packages = throw "gnuradio3_9Minimal has been removed because it is not compatible with the latest volk and it had no dependent packages which justified its distribution"; # Added 2024-07-28
-  gnustep = throw "The gnustep scope has been replaced with top-level packages: gnustep-back, -base, -gui, -libobjc, -make, -systempreferences; gorm, gworkspace, projectcenter."; # Added 2025-01-25
   go-thumbnailer = thud; # Added 2023-09-21
   go-upower-notify = upower-notify; # Added 2024-07-21
-  go_1_22 = throw "Go 1.22 is end-of-life and 'go_1_22' has been removed. Please use a newer Go toolchain."; # Added 2024-03-28
   go_1_23 = throw "Go 1.23 is end-of-life and 'go_1_23' has been removed. Please use a newer Go toolchain."; # Added 2025-08-13
-  gobby5 = throw "'gobby5' has been renamed to/replaced by 'gobby'"; # Converted to throw 2024-10-17
   godot-export-templates = lib.warnOnInstantiate "godot-export-templates has been renamed to godot-export-templates-bin" godot-export-templates-bin; # Added 2025-03-27
   godot_4-export-templates = lib.warnOnInstantiate "godot_4-export-templates has been renamed to godot_4-export-templates-bin" godot_4-export-templates-bin; # Added 2025-03-27
   godot_4_3-export-templates = lib.warnOnInstantiate "godot_4_3-export-templates has been renamed to godot_4_3-export-templates-bin" godot_4_3-export-templates-bin; # Added 2025-03-27
   godot_4_4-export-templates = lib.warnOnInstantiate "godot_4_4-export-templates has been renamed to godot_4_4-export-templates-bin" godot_4_4-export-templates-bin; # Added 2025-03-27
   goldwarden = throw "'goldwarden' has been removed, as it no longer works with new Bitwarden versions and is abandoned upstream"; # Added 2025-09-16
-  googler = throw "'googler' has been removed, as it no longer works and is abandoned upstream"; # Added 2025-04-01
-  gpicview = throw "'gpicview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'loupe', 'gthumb' or 'image-roll' instead"; # Added 2024-09-15
   gprbuild-boot = gnatPackages.gprbuild-boot; # Added 2024-02-25
   gpxsee-qt5 = throw "gpxsee-qt5 was removed, use gpxsee instead"; # added 2025-09-09
   gpxsee-qt6 = gpxsee; # added 2025-09-09
-  gqview = throw "'gqview' has been removed due to lack of maintenance upstream and depending on gtk2. Consider using 'gthumb' instead"; # Added 2024-09-14
   gr-framework = throw "gr-framework has been removed, as it was broken"; # Added 2025-08-25
   graalvm-ce = graalvmPackages.graalvm-ce; # Added 2024-08-10
   graalvm-oracle = graalvmPackages.graalvm-oracle; # Added 2024-12-17
   graalvmCEPackages = graalvmPackages; # Added 2024-08-10
   gradience = throw "`gradience` has been removed because it was archived upstream."; # Added 2025-09-20
-  gradle_6 = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30
-  gradle_6-unwrapped = throw "Gradle 6 has been removed, as it is end-of-life (https://endoflife.date/gradle) and has many vulnerabilities that are not resolved until Gradle 7."; # Added 2024-10-30
-  grafana-agent = throw "'grafana-agent' has been removed, as it only works with an EOL compiler and will become EOL during the 25.05 release. Consider migrating to 'grafana-alloy' instead"; # Added 2025-04-02
   grafana_reporter = grafana-reporter; # Added 2024-06-09
-  grapefruit = throw "'grapefruit' was removed due to being blocked by Roblox, rendering the package useless"; # Added 2024-08-23
   graphite-kde-theme = throw "'graphite-kde-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  graylog-3_3 = throw "graylog 3.x is EOL. If you need an upgrade from 3.x to latest series, please consider downgrading nixpkgs."; # Added 2023-10-09
-  graylog-4_0 = throw "graylog 4.x is EOL. If you need an upgrade from 4.x to latest series, please consider downgrading nixpkgs."; # Added 2023-10-09
-  graylog-4_3 = throw "graylog 4.x is EOL. If you need an upgrade from 4.x to latest series, please consider downgrading nixpkgs."; # Added 2023-10-09
-  graylog-5_0 = throw "graylog 5.0.x is EOL. If you need an upgrade from 5.0.x to latest series, please consider downgrading nixpkgs."; # Added 2024-02-15
-  graylog-5_1 = throw "graylog 5.1.x is EOL. If you need an upgrade from 5.1.x to latest series, please consider downgrading nixpkgs."; # Added 2024-10-16
-  graylog-5_2 = throw "graylog 5.2.x is EOL. If you need an upgrade from 5.2.x to latest series, please consider downgrading nixpkgs."; # Added 2025-03-21
-  green-pdfviewer = throw "'green-pdfviewer' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   gringo = clingo; # added 2022-11-27
   grub2_full = grub2; # Added 2022-11-18
-  grun = throw "grun has been removed due to lack of maintenance upstream and depending on gtk2"; # Added 2025-03-29
-  gsignond = throw "'gsignond' and its plugins have been removed due to lack of maintenance upstream"; # added 2025-04-17
-  gsignondPlugins = throw "'gsignondPlugins' have been removed alongside 'gsignond' due to lack of maintenance upstream and depending on libsoup_2"; # added 2025-04-17
-  gtetrinet = throw "'gtetrinet' has been removed because it depends on GNOME 2 libraries"; # Added 2024-06-27
-  gtk2fontsel = throw "'gtk2fontsel' has been removed due to lack of maintenance upstream. GTK now has a built-in font chooser so it's no longer needed for newer apps"; # Added 2024-10-19
-  gtk-engine-bluecurve = throw "'gtk-engine-bluecurve' has been removed as it has been archived upstream."; # Added 2024-12-04
   gtkcord4 = dissent; # Added 2024-03-10
   gtkextra = throw "'gtkextra' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
-  gtkperf = throw "'gtkperf' has been removed due to lack of maintenance upstream"; # Added 2024-09-14
-  guardian-agent = throw "'guardian-agent' has been removed, as it hasn't been maintained upstream in years and accumulated many vulnerabilities"; # Added 2024-06-09
   guile-disarchive = disarchive; # Added 2023-10-27
   guile-sdl = throw "guile-sdl has been removed, as it was broken"; # Added 2025-08-25
   gutenprintBin = gutenprint-bin; # Added 2025-08-21
   gxneur = throw "'gxneur' has been removed due to lack of maintenance and reliance on gnome2 and 2to3."; # Added 2025-08-17
-  hacksaw = throw "'hacksaw' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   hacpack = throw "hacpack has been removed from nixpkgs, as it has been taken down upstream"; # added 2025-09-26
-  haka = throw "haka has been removed because it failed to build and was unmaintained for 9 years"; # Added 2025-03-11
-  hardinfo = throw "'hardinfo' has been removed as it was abandoned upstream. Consider using 'hardinfo2' instead."; # added 2025-04-17
   harmony-music = throw "harmony-music is unmaintained and has been removed"; # Added 2025-08-26
-  hasura-graphql-engine = throw "hasura-graphql-engine has been removed because was broken and its packaging severly out of date"; # Added 2025-02-14
-  haven-cli = throw "'haven-cli' has been removed due to the official announcement of the project closure. Read more at https://havenprotocol.org/2024/12/12/project-closure-announcement"; # Added 2025-02-25
-  hawknl = throw "'hawknl' has been removed as it was unmaintained and the upstream unavailable"; # Added 2025-05-07
   HentaiAtHome = hentai-at-home; # Added 2024-06-12
   hiawatha = throw "hiawatha has been removed, since it is no longer actively supported upstream, nor well maintained in nixpkgs"; # Added 2025-09-10
   hibernate = throw "hibernate has been removed due to lack of maintenance"; # Added 2025-09-10
   hiddify-app = throw "hiddify-app has been removed, since it is unmaintained"; # added 2025-08-20
   himitsu-firefox = throw "himitsu-firefox has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
-  hll2390dw-cups = throw "The hll2390dw-cups package was dropped since it was unmaintained."; # Added 2024-06-21
-  hmetis = throw "'hmetis' has been removed as it was unmaintained and the upstream was unavailable"; # Added 2025-05-05
-  hoarder = throw "'hoarder' has been renamed to 'karakeep'"; # Added 2025-04-21
   hobbes = throw "hobbes has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-20
-  hop-cli = throw "hop-cli has been removed as the service has been shut-down"; # Added 2024-08-13
   hpmyroom = throw "hpmyroom has been removed because it has been marked as broken since May 2024."; # Added 2025-10-11
   hpp-fcl = coal; # Added 2024-11-15
-  ht-rust = throw "'ht-rust' has been renamed to/replaced by 'xh'"; # Converted to throw 2024-10-17
   hydra_unstable = hydra; # Added 2024-08-22
-  hydron = throw "hydron has been removed as the project has been archived upstream since 2022 and is affected by a severe remote code execution vulnerability"; # Added 2024-08-03
-  hyenae = throw "hyenae has been removed because it fails to build and was unmaintained for 15 years"; # Added 2025-04-04
-  hyprgui = throw "hyprgui has been removed as the repository is deleted"; # Added 2024-12-27
-  hyprlauncher = throw "hyprlauncher has been removed as the repository is deleted"; # Added 2024-12-27
-  hyprswitch = throw "hyprswitch has been renamed to hyprshell"; # Added 2025-06-01
-  hyprwall = throw "hyprwall has been removed as the repository is deleted"; # Added 2024-12-27
   i3-gaps = i3; # Added 2023-01-03
-  i3nator = throw "'i3nator' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  ib-controller = throw "ib-controller has been removed from nixpkgs as it was broken"; # Added 2024-07-15
-  ib-tws = throw "ib-tws has been removed from nixpkgs as it was broken"; # Added 2024-07-15
   ibm-sw-tpm2 = throw "ibm-sw-tpm2 has been removed, as it was broken"; # Added 2025-08-25
-  ibniz = throw "ibniz has been removed because it fails to compile and the source url is dead"; # Added 2025-04-07
-  icuReal = throw "icuReal has been removed from nixpkgs as a mistake"; # Added 2025-02-18
   ikos = throw "ikos has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
-  imagemagick7 = throw "'imagemagick7' has been renamed to/replaced by 'imagemagick'"; # Converted to throw 2024-10-17
-  imagemagick7_light = throw "'imagemagick7_light' has been renamed to/replaced by 'imagemagick_light'"; # Converted to throw 2024-10-17
-  imagemagick7Big = throw "'imagemagick7Big' has been renamed to/replaced by 'imagemagickBig'"; # Converted to throw 2024-10-17
   imaginer = throw "'imaginer' has been removed due to lack of upstream maintenance"; # Added 2025-08-15
   immersed-vr = lib.warnOnInstantiate "'immersed-vr' has been renamed to 'immersed'" immersed; # Added 2024-08-11
   inconsolata-nerdfont = lib.warnOnInstantiate "inconsolata-nerdfont is redundant. Use nerd-fonts.inconsolata instead." nerd-fonts.inconsolata; # Added 2024-11-10
   incrtcl = tclPackages.incrtcl; # Added 2024-10-02
   inotifyTools = inotify-tools; # Added 2015-09-01
-  input-utils = throw "The input-utils package was dropped since it was unmaintained."; # Added 2024-06-21
-  insync-emblem-icons = throw "'insync-emblem-icons' has been removed, use 'insync-nautilus' instead"; # Added 2025-05-14
-  inter-ui = throw "'inter-ui' has been renamed to/replaced by 'inter'"; # Converted to throw 2024-10-17
   invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05
   invoiceplane = throw "'invoiceplane' doesn't support non-EOL PHP versions"; # Added 2025-10-03
   ioccheck = throw "ioccheck was dropped since it was unmaintained."; # Added 2025-07-06
@@ -1089,82 +685,38 @@ mapAliases {
   ipfs-migrator = kubo-migrator; # Added 2022-09-27
   ipfs-migrator-all-fs-repo-migrations = kubo-fs-repo-migrations; # Added 2022-09-27
   ipfs-migrator-unwrapped = kubo-migrator-unwrapped; # Added 2022-09-27
-  iproute = throw "'iproute' has been renamed to/replaced by 'iproute2'"; # Converted to throw 2024-10-17
   ir.lv2 = ir-lv2; # Added 2025-09-37
-  irrlichtmt = throw "irrlichtmt has been removed because it was moved into the Minetest repo"; # Added 2024-08-12
-  isl_0_11 = throw "isl_0_11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
-  isl_0_14 = throw "isl_0_14 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-09-13
-  isl_0_17 = throw "isl_0_17 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2024-11-20
   isl_0_24 = throw "isl_0_24 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-10-18
   iso-flags-png-320x420 = lib.warnOnInstantiate "iso-flags-png-320x420 has been renamed to iso-flags-png-320x240" iso-flags-png-320x240; # Added 2024-07-17
-  istatmenus = throw "istatmenus has beend renamed to istat-menus"; # Added 2025-05-05
   itktcl = tclPackages.itktcl; # Added 2024-10-02
   itpp = throw "itpp has been removed, as it was broken"; # Added 2025-08-25
-  iv = throw "iv has been removed as it was no longer required for neuron and broken"; # Added 2025-04-18
-  ix = throw "ix has been removed from Nixpkgs, as the ix.io pastebin has been offline since Dec. 2023"; # Added 2025-04-11
-  jack2Full = throw "'jack2Full' has been renamed to/replaced by 'jack2'"; # Converted to throw 2024-10-17
   jack_rack = throw "'jack_rack' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
   jami-client = jami; # Added 2023-02-10
   jami-client-qt = jami-client; # Added 2022-11-06
   jami-daemon = jami.daemon; # Added 2023-02-10
-  javacard-devkit = throw "javacard-devkit was dropped due to having a dependency on the Oracle JDK, as well as being several years out-of-date."; # Added 2024-11-01
-  jd-cli = throw "jd-cli has been removed due to upstream being unmaintained since 2019. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30
-  jd-gui = throw "jd-gui has been removed due to a dependency on the dead JCenter Bintray. Other Java decompilers in Nixpkgs include bytecode-viewer (GUI), cfr (CLI), and procyon (CLI)."; # Added 2024-10-30
-  jdk19 = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01
-  jdk19_headless = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01
-  jdk20 = throw "OpenJDK 20 was removed as it has reached its end of life"; # Added 2024-08-01
-  jdk20_headless = throw "OpenJDK 20 was removed as it has reached its end of life"; # Added 2024-08-01
-  jdk22 = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24
-  jdk22_headless = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24
   jdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
   jdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
-  jdkdistro = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
   jikespg = throw "'jikespg' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
   jing = jing-trang; # Added 2025-09-18
-  jre8Plugin = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  jrePlugin = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  jsawk = throw "'jsawk' has been removed because it is unmaintained upstream"; # Added 2024-08-07
   jscoverage = throw "jscoverage has been removed, as it was broken"; # Added 2025-08-25
-  julia_16-bin = throw "'julia_16-bin' has been removed from nixpkgs as it has reached end of life"; # Added 2024-10-08
-  jush = throw "jush has been removed from nixpkgs because it is unmaintained"; # Added 2024-05-28
   k2pdfopt = throw "'k2pdfopt' has been removed from nixpkgs as it was broken"; # Added 2025-09-27
-  k3s_1_26 = throw "'k3s_1_26' has been removed from nixpkgs as it has reached end of life"; # Added 2024-05-20
-  k3s_1_27 = throw "'k3s_1_27' has been removed from nixpkgs as it has reached end of life on 2024-06-28"; # Added 2024-06-01
-  k3s_1_28 = throw "'k3s_1_28' has been removed from nixpkgs as it has reached end of life"; # Added 2024-12-15
-  k3s_1_29 = throw "'k3s_1_29' has been removed from nixpkgs as it has reached end of life"; # Added 2025-05-05
   k3s_1_30 = throw "'k3s_1_30' has been removed from nixpkgs as it has reached end of life"; # Added 2025-09-01
-  kafkacat = throw "'kafkacat' has been renamed to/replaced by 'kcat'"; # Converted to throw 2024-10-17
   kak-lsp = kakoune-lsp; # Added 2024-04-01
   kanidm = lib.warnOnInstantiate "'kanidm' will be removed before 26.05. You must use a versioned package, e.g. 'kanidm_1_x'." kanidm_1_7; # Added 2025-09-01
-  kanidm_1_3 = throw "'kanidm_1_3' has been removed as it has reached end of life"; # Added 2025-03-10
   kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18
   kanidmWithSecretProvisioning = lib.warnOnInstantiate "'kanidmWithSecretProvisioning' will be removed before 26.05. You must use a versioned package, e.g. 'kanidmWithSecretProvisioning_1_x'." kanidmWithSecretProvisioning_1_7; # Added 2025-09-01
   kanidmWithSecretProvisioning_1_4 = throw "'kanidmWithSecretProvisioning_1_4' has been removed as it has reached end of life"; # Added 2025-06-18
   kbibtex = throw "'kbibtex' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
   kcli = throw "kcli has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
-  kdbplus = throw "'kdbplus' has been removed from nixpkgs"; # Added 2024-05-06
-  kdeconnect = throw "'kdeconnect' has been renamed to/replaced by 'plasma5Packages.kdeconnect-kde'"; # Converted to throw 2024-10-17
   keepkey_agent = keepkey-agent; # added 2024-01-06
-  kerberos = throw "'kerberos' has been renamed to/replaced by 'krb5'"; # Converted to throw 2024-10-17
-  kexectools = throw "'kexectools' has been renamed to/replaced by 'kexec-tools'"; # Converted to throw 2024-10-17
-  keyfinger = throw "keyfinder has been removed as it was abandoned upstream and did not build; consider using mixxx or keyfinder-cli"; # Addd 2024-08-25
-  keysmith = throw "'keysmith' has been renamed to/replaced by 'libsForQt5.kdeGear.keysmith'"; # Converted to throw 2024-10-17
-  kfloppy = throw "kfloppy has been removed upstream in KDE Gear 23.08"; # Added 2023-08-24
   kgx = gnome-console; # Added 2022-02-19
   khoj = throw "khoj has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
-  kibana7 = throw "Kibana 7.x has been removed from nixpkgs as it depends on an end of life Node.js version and received no maintenance in time."; # Added 2023-10-30
-  kibana = throw "Kibana 7.x has been removed from nixpkgs as it depends on an end of life Node.js version and received no maintenance in time."; # Added 2023-10-30
-  kiwitalk = throw "KiwiTalk has been removed because the upstream has been deprecated at the request of Kakao and it's now obsolete."; # Added 2024-10-10
   kmplayer = throw "'kmplayer' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
   kodiGBM = kodi-gbm; # Added 2021-03-09
   kodiPlain = kodi; # Added 2021-03-09
   kodiPlainWayland = kodi-wayland; # Added 2021-03-09
   kodiPlugins = kodiPackages; # Added 2021-03-09
-  kramdown-rfc2629 = throw "'kramdown-rfc2629' has been renamed to/replaced by 'rubyPackages.kramdown-rfc2629'"; # Converted to throw 2024-10-17
   krb5Full = krb5; # Added 2022-11-17
-  kreative-square-fonts = throw "'kreative-square-fonts' has been renamed to 'kreative-square'"; # Added 2025-04-16
-  krita-beta = throw "'krita-beta' has been renamed to/replaced by 'krita'"; # Converted to throw 2024-10-17
-  krun = throw "'krun' has been renamed to/replaced by 'muvm'"; # Added 2025-05-01
   krunner-pass = throw "'krunner-pass' has been removed, as it only works on Plasma 5"; # Added 2025-08-30
   krunner-translator = throw "'krunner-translator' has been removed, as it only works on Plasma 5"; # Added 2025-08-30
   # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016"
@@ -1172,7 +724,6 @@ mapAliases {
   kube3d = k3d; # Added 2022-07-05
   kubei = kubeclarity; # Added 2023-05-20
   kubo-migrator-all-fs-repo-migrations = kubo-fs-repo-migrations; # Added 2024-09-24
-  l3afpad = throw "'l3afpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-09-14
   languageMachines.frog = frog; # Added 2025-10-7
   languageMachines.frogdata = frogdata; # Added 2025-10-7
   languageMachines.libfolia = libfolia; # Added 2025-10-7
@@ -1187,72 +738,39 @@ mapAliases {
   larynx = piper-tts; # Added 2023-05-09
   LASzip2 = laszip_2; # Added 2024-06-12
   LASzip = laszip; # Added 2024-06-12
-  latencytop = throw "'latencytop' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   latinmodern-math = lmmath; # Added 2020-03-17
   latte-dock = throw "'latte-dock' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   layan-kde = throw "'layan-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   lazarus-qt = lazarus-qt5; # Added 2024-12-25
-  leafpad = throw "'leafpad' has been removed due to lack of maintenance upstream. Consider using 'xfce.mousepad' instead"; # Added 2024-10-19
   ledger_agent = ledger-agent; # Added 2024-01-07
-  lesstif = throw "'lesstif' has been removed due to its being broken and unmaintained upstream. Consider using 'motif' instead."; # Added 2024-06-09
   lfs = dysk; # Added 2023-07-03
-  libAfterImage = throw "'libAfterImage' has been removed from nixpkgs, as it's no longer in development for a long time"; # Added 2024-06-01
   libast = throw "'libast' has been removed due to lack of maintenance upstream."; # Added 2025-06-09
-  libav = throw "libav has been removed as it was insecure and abandoned upstream for over half a decade; please use FFmpeg"; # Added 2024-08-25
-  libav_0_8 = throw "libav has been removed as it was insecure and abandoned upstream for over half a decade; please use FFmpeg"; # Added 2024-08-25
-  libav_11 = throw "libav has been removed as it was insecure and abandoned upstream for over half a decade; please use FFmpeg"; # Added 2024-08-25
-  libav_12 = throw "libav has been removed as it was insecure and abandoned upstream for over half a decade; please use FFmpeg"; # Added 2024-08-25
-  libav_all = throw "libav has been removed as it was insecure and abandoned upstream for over half a decade; please use FFmpeg"; # Added 2024-08-25
   libayatana-appindicator-gtk3 = libayatana-appindicator; # Added 2022-10-18
   libayatana-indicator-gtk3 = libayatana-indicator; # Added 2022-10-18
   libbencodetools = bencodetools; # Added 2022-07-30
-  libbitcoin = throw "libbitcoin has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
-  libbitcoin-client = throw "libbitcoin-client has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
-  libbitcoin-explorer = throw "libbitcoin-explorer has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
-  libbitcoin-network = throw "libbitcoin-network has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
-  libbitcoin-protocol = throw "libbitcoin-protocol has been removed as it required an obsolete version of Boost and had no maintainer in Nixpkgs"; # Added 2024-11-24
   libbpf_1 = libbpf; # Added 2022-12-06
   libbson = mongoc; # Added 2024-03-11
-  libchop = throw "libchop has been removed due to failing to build and being unmaintained upstream"; # Added 2025-05-02
   libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
   libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
   libdwarf-lite = throw "`libdwarf-lite` has been replaced by `libdwarf` as it's mostly a mirror"; # Added 2025-06-16
-  libdwg = throw "libdwg has been removed as upstream is unmaintained, the code doesn't build without significant patches, and the package had no reverse dependencies"; # Added 2024-12-28
-  libfpx = throw "libfpx has been removed as it was unmaintained in Nixpkgs and had known vulnerabilities"; # Added 2025-05-20
-  libgadu = throw "'libgadu' has been removed as upstream is unmaintained and has no dependents or maintainers in Nixpkgs"; # Added 2025-05-17
-  libgcrypt_1_8 = throw "'libgcrypt_1_8' is end-of-life. Consider using 'libgcrypt' instead"; # Added 2025-01-05
   libgda = lib.warnOnInstantiate "'libgda' has been renamed to 'libgda5'" libgda5; # Added 2025-01-21
   libgme = game-music-emu; # Added 2022-07-20
   libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22
-  libgpgerror = throw "'libgpgerror' has been renamed to/replaced by 'libgpg-error'"; # Converted to throw 2024-10-17
-  libgrss = throw "'libgrss' has been removed as it was archived upstream and had no users in nixpkgs"; # Added 2025-04-17
   libheimdal = heimdal; # Added 2022-11-18
-  libhttpseverywhere = throw "'libhttpseverywhere' has been removed due to lack of upstream maintenance. It was no longer used in nixpkgs."; # Added 2025-04-17
   libiconv-darwin = darwin.libiconv; # Added 2024-09-22
   libixp_hg = libixp; # Added 2022-04-25
-  libjpeg_drop = throw "'libjpeg_drop' has been renamed to/replaced by 'libjpeg_original'"; # Converted to throw 2024-10-17
   libkkc = throw "'libkkc' has been removed due to lack of maintenance. Consider using anthy instead"; # added 2025-08-28
   libkkc-data = throw "'libkkc-data' has been removed as it depended on libkkc which was removed"; # Added 2025-08-28
-  liblastfm = throw "'liblastfm' has been renamed to/replaced by 'libsForQt5.liblastfm'"; # Converted to throw 2024-10-17
   liblinphone = throw "'liblinphone' has been moved to 'linphonePackages.liblinphone'"; # Added 2025-09-20
-  libmp3splt = throw "'libmp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17
   libmusicbrainz3 = throw "libmusicbrainz3 has been removed as it was obsolete and unused"; # Added 2025-09-16
   libmusicbrainz5 = libmusicbrainz; # Added 2025-09-16
-  libmx = throw "'libmx' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
-  liboop = throw "liboop has been removed as it is unmaintained upstream."; # Added 2024-08-14
   libosmo-sccp = libosmo-sigtran; # Added 2024-12-20
-  libpqxx_6 = throw "libpqxx_6 has been removed, please use libpqxx"; # Added 2024-10-02
   libpromhttp = throw "'libpromhttp' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-16
-  libpseudo = throw "'libpseudo' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
   libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20
   libqt5pas = libsForQt5.libqtpas; # Added 2024-12-25
   libquotient = throw "'libquotient' for qt5 was removed as upstream removed qt5 support. Consider explicitly upgrading to qt6 'libquotient'"; # Converted to throw 2025-07-04
-  librarian-puppet-go = throw "'librarian-puppet-go' has been removed, as its upstream is unmaintained"; # Added 2024-06-10
-  librdf = throw "'librdf' has been renamed to/replaced by 'lrdf'"; # Converted to throw 2024-10-17
-  librdf_raptor = throw "librdf_raptor has been remove due to failing to build and being unmaintained"; # Added 2025-04-14
   LibreArp = librearp; # Added 2024-06-12
   LibreArp-lv2 = librearp-lv2; # Added 2024-06-12
-  libreddit = throw "'libreddit' has been removed because it is unmaintained upstream. Consider using 'redlib', a maintained fork"; # Added 2024-07-17
   libreoffice-qt6 = libreoffice-qt; # Added 2025-08-30
   libreoffice-qt6-fresh = libreoffice-qt-fresh; # Added 2025-08-30
   libreoffice-qt6-fresh-unwrapped = libreoffice-qt-fresh.unwrapped; # Added 2025-08-30
@@ -1261,48 +779,29 @@ mapAliases {
   libreoffice-qt6-unwrapped = libreoffice-qt.unwrapped; # Added 2025-08-30
   librewolf-wayland = librewolf; # Added 2022-11-15
   librtlsdr = rtl-sdr; # Added 2023-02-18
-  libseat = throw "'libseat' has been renamed to/replaced by 'seatd'"; # Converted to throw 2024-10-17
   libsForQt515 = libsForQt5; # Added 2022-11-24
   libsmartcols = lib.warnOnInstantiate "'util-linux' should be used instead of 'libsmartcols'" util-linux; # Added 2025-09-03
   libsoup = lib.warnOnInstantiate "'libsoup' has been renamed to 'libsoup_2_4'" libsoup_2_4; # Added 2024-12-02
-  libstdcxx5 = throw "libstdcxx5 is severly outdated and has been removed"; # Added 2024-11-24
   libtap = throw "libtap has been removed, as it was unused and deprecated by its author in favour of cmocka"; # Added 2025-09-16
   libtcod = throw "'libtcod' has been removed due to being unused and having an incompatible build-system"; # Added 2025-10-04
   libtensorflow-bin = libtensorflow; # Added 2022-09-25
   libtorrent = throw "'libtorrent' has been renamed to 'libtorrent-rakshasa' for clearer distinction from 'libtorrent-rasterbar'"; # Added 2025-09-10
-  libtorrentRasterbar = throw "'libtorrentRasterbar' has been renamed to/replaced by 'libtorrent-rasterbar'"; # Converted to throw 2024-10-17
-  libtorrentRasterbar-1_2_x = throw "'libtorrentRasterbar-1_2_x' has been renamed to/replaced by 'libtorrent-rasterbar-1_2_x'"; # Converted to throw 2024-10-17
-  libtorrentRasterbar-2_0_x = throw "'libtorrentRasterbar-2_0_x' has been renamed to/replaced by 'libtorrent-rasterbar-2_0_x'"; # Converted to throw 2024-10-17
   libtransmission = lib.warnOnInstantiate (transmission3Warning {
     prefix = "lib";
   }) libtransmission_3; # Added 2024-06-10
-  libungif = throw "'libungif' has been renamed to/replaced by 'giflib'"; # Converted to throw 2024-10-17
-  libusb = throw "'libusb' has been renamed to/replaced by 'libusb1'"; # Converted to throw 2024-10-17
-  libviper = throw "'libviper' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
-  libviperfx = throw "'libviperfx' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
-  libvpx_1_8 = throw "libvpx_1_8 has been removed because it is impacted by security issues and not used in nixpkgs, move to 'libvpx'"; # Added 2024-07-26
   libwnck3 = libwnck; # Added 2021-06-23
-  libxplayer-plparser = throw "libxplayer-plparser has been removed as the upstream project was archived"; # Added 2024-12-27
-  libzapojit = throw "'libzapojit' has been removed due to lack of upstream maintenance and archival"; # Added 2025-04-16
-  licensor = throw "'licensor' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01
   lightly-boehs = throw "'lightly-boehs' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   lightly-qt = throw "'lightly-qt' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  lightstep-tracer-cpp = throw "lightstep-tracer-cpp is deprecated since 2022-08-29; the upstream recommends migration to opentelemetry projects."; # Added 2023-10-18
   ligo = throw "ligo has been removed from nixpkgs for lack of maintainance"; # Added 2025-06-03
   lima-bin = lib.warnOnInstantiate "lima-bin has been replaced by lima" lima; # Added 2025-05-13
-  lime3ds = throw "lime3ds is deprecated, use 'azahar' instead."; # Added 2025-03-22
-  lime = throw "'lime' has been removed due to being unmaintained"; # Added 2025-03-20
-  limesctl = throw "limesctl has been removed because it is insignificant."; # Added 2024-11-25
   lincity_ng = lib.warnOnInstantiate "lincity_ng has been renamed to lincity-ng" lincity-ng; # Added 2025-10-09
-  linenoise-ng = throw "'linenoise-ng' has been removed as the upstream project was archived. Consider using 'linenoise' instead."; # Added 2025-05-05
   linphone = linphonePackages.linphone-desktop; # Added 2025-09-20
   linux-libre = throw "linux_libre has been removed due to lack of maintenance"; # Added 2025-10-01
   linux-rt_5_4 = throw "linux_rt 5.4 has been removed because it will reach its end of life within 25.11"; # Added 2025-10-22
   linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;
   linux-rt_5_15 = linuxKernel.kernels.linux_rt_5_15;
   linux-rt_6_1 = linuxKernel.kernels.linux_rt_6_1;
-  linux_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-22
   linux_5_4 = throw "linux 5.4 was removed because it will reach its end of life within 25.11"; # Added 2025-10-26
   linux_5_4_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
   linux_5_10 = linuxKernel.kernels.linux_5_10;
@@ -1313,9 +812,6 @@ mapAliases {
   linux_6_1_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
   linux_6_6 = linuxKernel.kernels.linux_6_6;
   linux_6_6_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
-  linux_6_9 = throw "linux 6.9 was removed because it has reached its end of life upstream"; # Added 2024-08-03
-  linux_6_10 = throw "linux 6.10 was removed because it has reached its end of life upstream"; # Added 2024-10-23
-  linux_6_11 = throw "linux 6.11 was removed because it has reached its end of life upstream"; # Added 2025-03-24
   linux_6_12 = linuxKernel.kernels.linux_6_12;
   linux_6_12_hardened = linuxKernel.kernels.linux_6_12_hardened;
   linux_6_13 = throw "linux 6.13 was removed because it has reached its end of life upstream"; # Added 2025-06-29
@@ -1334,9 +830,7 @@ mapAliases {
   linux_rpi02w = linuxKernel.kernels.linux_rpi3;
   linux_rpi3 = linuxKernel.kernels.linux_rpi3;
   linux_rpi4 = linuxKernel.kernels.linux_rpi4;
-  linux_testing_bcachefs = throw "'linux_testing_bcachefs' has been removed, please use 'linux_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; # Converted to throw 2024-01-09
   linuxPackages-libre = throw "linux_libre has been removed due to lack of maintenance"; # Added 2025-10-01
-  linuxPackages_4_19 = throw "linux 4.19 was removed because it will reach its end of life within 24.11"; # Added 2024-09-22
   linuxPackages_5_4 = throw "linux 5.4 was removed because it will reach its end of life within 25.11"; # Added 2025-10-26
   linuxPackages_5_4_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
   linuxPackages_5_10 = linuxKernel.packages.linux_5_10;
@@ -1347,9 +841,6 @@ mapAliases {
   linuxPackages_6_1_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
   linuxPackages_6_6 = linuxKernel.packages.linux_6_6;
   linuxPackages_6_6_hardened = throw "linux_hardened on nixpkgs only contains latest stable and latest LTS"; # Added 2025-08-10
-  linuxPackages_6_9 = throw "linux 6.9 was removed because it has reached its end of life upstream"; # Added 2024-08-03
-  linuxPackages_6_10 = throw "linux 6.10 was removed because it has reached its end of life upstream"; # Added 2024-10-23
-  linuxPackages_6_11 = throw "linux 6.11 was removed because it has reached its end of life upstream"; # Added 2025-03-24
   linuxPackages_6_12 = linuxKernel.packages.linux_6_12;
   linuxPackages_6_12_hardened = linuxKernel.packages.linux_6_12_hardened; # Added 2025-08-10
   linuxPackages_6_13 = throw "linux 6.13 was removed because it has reached its end of life upstream"; # Added 2025-06-29
@@ -1373,61 +864,42 @@ mapAliases {
   linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10;
   linuxPackages_rt_5_15 = linuxKernel.packages.linux_rt_5_15;
   linuxPackages_rt_6_1 = linuxKernel.packages.linux_rt_6_1;
-  linuxPackages_testing_bcachefs = throw "'linuxPackages_testing_bcachefs' has been removed, please use 'linuxPackages_latest', any kernel version at least 6.7, or any other linux kernel with bcachefs support"; # Converted to throw 2024-01-09
   linuxPackages_xen_dom0 = linuxPackages; # Added 2021-04-04
   linuxPackages_xen_dom0_hardened = linuxPackages_hardened; # Added 2021-04-04
   linuxstopmotion = stopmotion; # Added 2024-11-01
-  lispPackages = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  lispPackages_new = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  lispPackagesFor = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  litecoin = throw "litecoin has been removed as nobody was maintaining it and the packaged version had known vulnerabilities"; # Added 2024-11-24
-  litecoind = throw "litecoind has been removed as nobody was maintaining it and the packaged version had known vulnerabilities"; # Added 2024-11-24
   Literate = literate; # Added 2024-06-12
   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
   lizardfs = throw "lizardfs has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
   llama = walk; # Added 2023-01-23
-  lld_9 = throw "lld_9 has been removed from nixpkgs"; # Added 2024-04-08
   lld_12 = throw "lld_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   lld_13 = throw "lld_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   lld_14 = throw "lld_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   lld_15 = throw "lld_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
   lld_16 = throw "lld_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   lld_17 = throw "lld_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  lldb_9 = throw "lldb_9 has been removed from nixpkgs"; # Added 2024-04-08
   lldb_12 = throw "lldb_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   lldb_13 = throw "lldb_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   lldb_14 = throw "lldb_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   lldb_15 = throw "lldb_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
   lldb_16 = throw "lldb_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   lldb_17 = throw "lldb_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  llvm_9 = throw "llvm_9 has been removed from nixpkgs"; # Added 2024-04-08
   llvm_12 = throw "llvm_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   llvm_13 = throw "llvm_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   llvm_14 = throw "llvm_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   llvm_15 = throw "llvm_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
   llvm_16 = throw "llvm_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   llvm_17 = throw "llvm_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  llvmPackages_9 = throw "llvmPackages_9 has been removed from nixpkgs"; # Added 2024-04-08
   llvmPackages_12 = throw "llvmPackages_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   llvmPackages_13 = throw "llvmPackages_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   llvmPackages_14 = throw "llvmPackages_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   llvmPackages_15 = throw "llvmPackages_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
   llvmPackages_16 = throw "llvmPackages_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   llvmPackages_17 = throw "llvmPackages_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  lobster-two = throw "'lobster-two' has been renamed to/replaced by 'google-fonts'"; # Converted to throw 2024-10-17
-  loc = throw "'loc' has been removed due to lack of upstream maintenance. Consider 'tokei' as an alternative."; # Added 2025-01-25
   loco-cli = loco; # Added 2025-02-24
-  loop = throw "'loop' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   LPCNet = lpcnet; # Added 2025-05-05
-  lpcnetfreedv = throw "lpcnetfreedv was removed in favor of LPCNet"; # Added 2025-05-05
-  ltwheelconf = throw "'ltwheelconf' has been removed because it is obsolete"; # Added 2025-05-07
-  lucene = throw "lucene has been removed since it was both wildly out of date and was not even built properly for 4 years"; # Added 2025-04-10
   luci-go = throw "luci-go has been removed since it was unused and failing to build for 5 months"; # Added 2025-08-27
-  lumail = throw "'lumail' has been removed since its upstream is unavailable"; # Added 2025-05-07
-  luna-icons = throw "luna-icons has been removed as it was removed upstream"; # Added 2024-10-29
-  lv_img_conv = throw "'lv_img_conv' has been removed from nixpkgs as it is broken"; # Added 2024-06-18
   lxd = throw "
     LXD has been removed from NixOS due to lack of Nixpkgs maintenance.
     Consider migrating or switching to Incus, or remove from your configuration.
@@ -1462,42 +934,22 @@ mapAliases {
   lxde.lxsession = throw "'lxsession' has been moved to top-level. Use 'lxsession' directly"; # added 2025-08-31
   lxde.lxtask = throw "'lxtask' has been moved to top-level. Use 'lxtask' directly"; # added 2025-08-31
   lxdvdrip = throw "'lxdvdrip' has been removed due to lack of upstream maintenance."; # Added 2025-06-09
-  lzma = throw "'lzma' has been renamed to/replaced by 'xz'"; # Converted to throw 2024-10-17
-  lzwolf = throw "'lzwolf' has been removed because it's no longer maintained upstream. Consider using 'ecwolf'"; # Added 2025-03-02
-  ma1sd = throw "ma1sd was dropped as it is unmaintained"; # Added 2024-07-10
   mac = monkeysAudio; # Added 2024-11-30
   MACS2 = macs2; # Added 2023-06-12
   magma_2_6_2 = throw "'magma_2_6_2' has been removed, use the latest 'magma' package instead."; # Added 2025-07-20
   magma_2_7_2 = throw "'magma_2_7_2' has been removed, use the latest 'magma' package instead."; # Added 2025-07-20
   mailcore2 = throw "'mailcore2' has been removed due to lack of upstream maintenance."; # Added 2025-06-09
-  mailctl = throw "mailctl has been renamed to oama"; # Added 2024-08-19
-  mailman-rss = throw "The mailman-rss package was dropped since it was unmaintained."; # Added 2024-06-21
   mailnag = throw "mailnag has been removed because it has been marked as broken since 2022."; # Added 2025-10-12
   mailnagWithPlugins = throw "mailnagWithPlugins has been removed because mailnag has been marked as broken since 2022."; # Added 2025-10-12
-  maligned = throw "maligned was deprecated upstream in favor of x/tools/go/analysis/passes/fieldalignment"; # Added 2024-08-24
   manaplus = throw "manaplus has been removed, as it was broken"; # Added 2025-08-25
-  manicode = throw "manicode has been renamed to codebuff"; # Added 2024-12-10
-  manta = throw "manta does not support python3, and development has been abandoned upstream"; # Added 2025-03-17
-  manticore = throw "manticore is no longer maintained since 2020, and doesn't build since smlnj-110.99.7.1"; # Added 2025-05-17
-  mapmap = throw "'mapmap' has been removed as it has been unmaintained since 2021"; # Added 2025-05-17
   mariadb-client = throw "mariadb-client has been renamed to mariadb.client"; # Converted to throw 2025-10-26
-  mariadb_105 = throw "'mariadb_105' has been removed because it reached its End of Life. Consider upgrading to 'mariadb_106'."; # Added 2025-04-26
-  mariadb_110 = throw "mariadb_110 has been removed from nixpkgs, please switch to another version like mariadb_114"; # Added 2024-08-15
-  markets = throw "'markets' has been removed as it was archived upstream in 2023"; # Added 2025-04-17
   marwaita-manjaro = lib.warnOnInstantiate "marwaita-manjaro has been renamed to marwaita-teal" marwaita-teal; # Added 2024-07-08
   marwaita-peppermint = lib.warnOnInstantiate "marwaita-peppermint has been renamed to marwaita-red" marwaita-red; # Added 2024-07-01
   marwaita-pop_os = lib.warnOnInstantiate "marwaita-pop_os has been renamed to marwaita-yellow" marwaita-yellow; # Added 2024-10-29
   marwaita-ubuntu = lib.warnOnInstantiate "marwaita-ubuntu has been renamed to marwaita-orange" marwaita-orange; # Added 2024-07-08
-  masari = throw "masari has been removed as it was abandoned upstream"; # Added 2024-07-11
   material-kwin-decoration = throw "'material-kwin-decoration' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  mathematica9 = throw "mathematica9 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20
-  mathematica10 = throw "mathematica10 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20
-  mathematica11 = throw "mathematica11 has been removed as it was obsolete, broken, and depended on OpenCV 2"; # Added 2024-08-20
   mathlibtools = throw "mathlibtools has been removed as it was archived upstream in 2023"; # Added 2025-07-09
-  matomo-beta = throw "matomo-beta has been removed as it mostly just pointed to the latest matomo release, use `matomo.overrideAttrs` to access a specific beta version instead"; # Added 2025-01-15
   matomo_5 = matomo; # Added 2024-12-12
-  matrique = throw "'matrique' has been renamed to/replaced by 'spectral'"; # Converted to throw 2024-10-17
-  matrix-sliding-sync = throw "matrix-sliding-sync has been removed as matrix-synapse 114.0 and later covers its functionality"; # Added 2024-10-20
   matrix-synapse-tools.rust-synapse-compress-state = lib.warnOnInstantiate "`matrix-synapse-tools.rust-synapse-compress-state` has been renamed to `rust-synapse-compress-state`" rust-synapse-compress-state; # Added 2025-03-04
   matrix-synapse-tools.synadm = lib.warnOnInstantiate "`matrix-synapse-tools.synadm` has been renamed to `synadm`" synadm; # Added 2025-02-20
   mcomix3 = mcomix; # Added 2022-06-05
@@ -1506,24 +958,13 @@ mapAliases {
   mediastreamer-openh264 = throw "'mediastreamer-openh264' has been moved to 'linphonePackages.msopenh264'"; # Added 2025-09-20
   meilisearch_1_11 = throw "'meilisearch_1_11' has been removed, as it is no longer supported"; # Added 2025-10-03
   melmatcheq.lv2 = melmatcheq-lv2; # Added 2025-09-27
-  meme = throw "'meme' has been renamed to/replaced by 'meme-image-generator'"; # Converted to throw 2024-10-17
-  memorymapping = throw "memorymapping has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05
-  memorymappingHook = throw "memorymapping has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05
-  memstream = throw "memstream has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05
-  memstreamHook = throw "memstream has been removed, as it was only useful on old macOS versions that are no longer supported"; # Added 2024-10-05
-  mesa_drivers = throw "'mesa_drivers' has been removed, use 'pkgs.mesa' instead."; # Converted to throw 2024-07-11
   meteo = throw "'meteo' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
-  mhwaveedit = throw "'mkwaveedit' has been removed due to lack of maintenance upstream. Consider using 'audacity' or 'tenacity' instead"; # Added 2024-09-15
   microcodeAmd = microcode-amd; # Added 2024-09-08
   microcodeIntel = microcode-intel; # Added 2024-09-08
-  micropad = throw "micropad has been removed, since it was unmaintained and blocked the Electron 27 removal."; # Added 2025-02-24
   microsoft_gsl = microsoft-gsl; # Added 2023-05-26
   MIDIVisualizer = midivisualizer; # Added 2024-06-12
-  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
   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
-  mikutter = throw "'mikutter' has been removed because the package was broken and had no maintainers"; # Added 2024-10-01
   mime-types = mailcap; # Added 2022-01-21
   minecraft = throw "'minecraft' has been removed because the package was broken. Consider using 'prismlauncher' instead"; # Added 2025-09-06
   minetest = luanti; # Added 2024-11-11
@@ -1537,21 +978,6 @@ mapAliases {
   mmsd = throw "'mmsd' has been removed due to being unmaintained upstream. Consider using 'mmsd-tng' instead"; # Added 2025-06-07
   mmutils = throw "'mmutils' has been removed due to being unmaintained upstream"; # Added 2025-08-29
   moar = lib.warnOnInstantiate "`moar` has been renamed to `moor` by upstream in v2.0.0. See https://github.com/walles/moor/pull/305 for more." pkgs.moor; # Added 2025-09-02
-  mod_ca = throw "'mod_ca' has been renamed to/replaced by 'apacheHttpdPackages.mod_ca'"; # Converted to throw 2024-10-17
-  mod_crl = throw "'mod_crl' has been renamed to/replaced by 'apacheHttpdPackages.mod_crl'"; # Converted to throw 2024-10-17
-  mod_csr = throw "'mod_csr' has been renamed to/replaced by 'apacheHttpdPackages.mod_csr'"; # Converted to throw 2024-10-17
-  mod_dnssd = throw "'mod_dnssd' has been renamed to/replaced by 'apacheHttpdPackages.mod_dnssd'"; # Converted to throw 2024-10-17
-  mod_fastcgi = throw "'mod_fastcgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_fastcgi'"; # Converted to throw 2024-10-17
-  mod_ocsp = throw "'mod_ocsp' has been renamed to/replaced by 'apacheHttpdPackages.mod_ocsp'"; # Converted to throw 2024-10-17
-  mod_pkcs12 = throw "'mod_pkcs12' has been renamed to/replaced by 'apacheHttpdPackages.mod_pkcs12'"; # Converted to throw 2024-10-17
-  mod_python = throw "'mod_python' has been renamed to/replaced by 'apacheHttpdPackages.mod_python'"; # Converted to throw 2024-10-17
-  mod_scep = throw "'mod_scep' has been renamed to/replaced by 'apacheHttpdPackages.mod_scep'"; # Converted to throw 2024-10-17
-  mod_spkac = throw "'mod_spkac' has been renamed to/replaced by 'apacheHttpdPackages.mod_spkac'"; # Converted to throw 2024-10-17
-  mod_timestamp = throw "'mod_timestamp' has been renamed to/replaced by 'apacheHttpdPackages.mod_timestamp'"; # Converted to throw 2024-10-17
-  mod_wsgi = throw "'mod_wsgi' has been renamed to/replaced by 'apacheHttpdPackages.mod_wsgi'"; # Converted to throw 2024-10-17
-  monero = throw "'monero' has been renamed to/replaced by 'monero-cli'"; # Converted to throw 2024-10-17
-  mongodb-4_4 = throw "mongodb-4_4 has been removed, it's end of life since April 2024"; # Added 2024-04-11
-  mongodb-5_0 = throw "mongodb-5_0 has been removed, it's end of life since October 2024"; # Added 2024-10-01
   mongodb-6_0 = throw "mongodb-6_0 has been removed, it's end of life since July 2025"; # Added 2025-07-23
   monitor = pantheon.elementary-monitor; # Added 2025-10-10
   mono4 = mono6; # Added 2025-08-25
@@ -1562,29 +988,19 @@ mapAliases {
   moralerspace-nf = throw "moralerspace-nf has been removed, use moralerspace instead."; # Added 2025-08-30
   morty = throw "morty has been removed, as searxng removed support for it and it was unmaintained."; # Added 2025-09-26
   moz-phab = mozphab; # Added 2022-08-09
-  mp3info = throw "'mp3info' has been removed due to lack of maintenance upstream. Consider using 'eartag' or 'tagger' instead"; # Added 2024-09-14
-  mp3splt = throw "'mp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17
   mpc-cli = mpc; # Added 2024-10-14
   mpc_cli = mpc; # Added 2024-10-14
-  mpd_clientlib = throw "'mpd_clientlib' has been renamed to/replaced by 'libmpdclient'"; # Converted to throw 2024-10-17
   mpdevil = plattenalbum; # Added 2024-05-22
   mpdWithFeatures = lib.warnOnInstantiate "mpdWithFeatures has been replaced by mpd.override" mpd.override; # Added 2025-08-08
-  mpg321 = throw "'mpg321' has been removed due to it being unmaintained by upstream. Consider using mpg123 instead."; # Added 2024-05-10
   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
-  mq-cli = throw "'mq-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  mrkd = throw "'mrkd' has been removed as it is unmaintained since 2021"; # Added 2024-12-21
   mrxvt = throw "'mrxvt' has been removed due to lack of maintainence upstream"; # Added 2025-09-25
   msgpack = throw "msgpack has been split into msgpack-c and msgpack-cxx"; # Added 2025-09-14
   msp430NewlibCross = msp430Newlib; # Added 2024-09-06
   mumps_par = lib.warnOnInstantiate "mumps_par has been renamed to mumps-mpi" mumps-mpi; # Added 2025-05-07
-  mupdf_1_17 = throw "'mupdf_1_17' has been removed due to being outdated and insecure. Consider using 'mupdf' instead."; # Added 2024-08-22
-  music-player = throw "'music-player' has been removed due to lack of maintenance upstream. Consider using 'fum' or 'termusic' instead."; # Added 2025-05-02
   mustache-tcl = tclPackages.mustache-tcl; # Added 2024-10-02
   mutt-with-sidebar = mutt; # Added 2022-09-17
-  mutter43 = throw "'mutter43' has been removed since it is no longer used by Pantheon."; # Added 2024-09-22
   mx-puppet-discord = throw "mx-puppet-discord was removed since the packaging was unmaintained and was the sole user of sha1 hashes in nixpkgs"; # Added 2025-07-24
-  mysql = throw "'mysql' has been renamed to/replaced by 'mariadb'"; # Converted to throw 2024-10-17
   mysql-client = throw "mysql-client has been replaced by mariadb.client"; # Converted to throw 2025-10-26
   n98-magerun = throw "n98-magerun doesn't support new PHP newer than 8.1"; # Added 2025-10-03
   nagiosPluginsOfficial = monitoring-plugins; # Added 2017-08-07
@@ -1595,10 +1011,6 @@ mapAliases {
   ncdu_2 = ncdu; # Added 2022-07-22
   neardal = throw "neardal has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29
   neocities-cli = neocities; # Added 2024-07-31
-  neocomp = throw "neocomp has been remove because it fails to build and was unmaintained upstream"; # Added 2025-04-28
-  netbox_3_3 = throw "netbox 3.3 series has been removed as it was EOL"; # Added 2023-09-02
-  netbox_3_5 = throw "netbox 3.5 series has been removed as it was EOL"; # Added 2024-01-22
-  netbox_3_7 = throw "netbox 3.7 series has been removed as it was EOL"; # Added 2025-04-23
   netbox_4_1 = throw "netbox 4.1 series has been removed as it was EOL"; # Added 2025-10-14
   netbsdCross = netbsd; # Added 2024-09-06
   netsurf.browser = lib.warnOnInstantiate "'netsurf.browser' has been renamed to 'netsurf-browser'" netsurf-browser; # Added 2025-03-26
@@ -1634,17 +1046,11 @@ mapAliases {
     first on 25.05 because Nextcloud doesn't support upgrades across multiple major versions!
   "; # Added 2025-09-25
   nextcloud30Packages = throw "Nextcloud 30 is EOL!"; # Added 2025-09-25
-  nextcloud-news-updater = throw "nextcloud-news-updater has been removed because the project is unmaintained"; # Added 2025-03-28
   nfstrace = throw "nfstrace has been removed, as it was broken"; # Added 2025-08-25
   nix-direnv-flakes = nix-direnv; # Added 2021-11-09
   nix-ld-rs = nix-ld; # Added 2024-08-17
   nix-linter = throw "nix-linter has been removed as it was broken for 3 years and unmaintained upstream"; # Added 2025-09-06
-  nix-plugin-pijul = throw "nix-plugin-pijul has been removed due to being discontinued"; # added 2025-05-18
-  nix-repl = throw "nix-repl has been removed because it's not maintained anymore, use `nix repl` instead. Also see https://github.com/NixOS/nixpkgs/pull/44903"; # Added 2018-08-26
-  nix-simple-deploy = throw "'nix-simple-deploy' has been removed as it is broken and unmaintained"; # Added 2024-08-17
-  nix-universal-prefetch = throw "The nix-universal-prefetch package was dropped since it was unmaintained."; # Added 2024-06-21
   nix_2_3 = throw "'nix_2_3' has been removed, because it was unmaintained and insecure."; # Converted to throw 2025-07-24
-  nixFlakes = throw "'nixFlakes' has been renamed to/replaced by 'nixVersions.stable'"; # Converted to throw 2024-10-17
   nixfmt-classic =
     (
       if lib.oldestSupportedReleaseIsAtLeast 2605 then
@@ -1665,51 +1071,27 @@ mapAliases {
   nixForLinking = throw "nixForLinking has been removed, use `nixVersions.nixComponents_<version>` instead"; # Added 2025-08-14
   nixosTest = testers.nixosTest; # Added 2022-05-05
   nixStable = nixVersions.stable; # Added 2022-01-24
-  nixUnstable = throw "nixUnstable has been removed. For bleeding edge (Nix master, roughly weekly updated) use nixVersions.git, otherwise use nixVersions.latest."; # Converted to throw 2024-04-22
   nm-tray = throw "'nm-tray' has been removed, as it only works with Plasma 5"; # Added 2025-08-30
-  nmap-unfree = throw "'nmap-unfree' has been renamed to/replaced by 'nmap'"; # Converted to throw 2024-10-17
-  noah = throw "'noah' has been removed because it was broken and its upstream archived"; # Added 2025-05-10
-  nodejs-slim_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23
-  nodejs-slim_18_x = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23
-  nodejs_18 = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23
-  nodejs_18_x = throw "Node.js 18.x has reached End-Of-Life and has been removed"; # Added 2025-04-23
   nomacs-qt6 = nomacs; # Added 2025-08-30
-  nomad_1_4 = throw "nomad_1_4 is no longer supported upstream. You can switch to using a newer version of the nomad package. If you cannot upgrade, you can revert to older nixpkgs."; # Added 2025-02-02
-  nomad_1_5 = throw "nomad_1_5 is no longer supported upstream. You can switch to using a newer version of the nomad package. If you cannot upgrade, you can revert to older nixpkgs."; # Added 2025-02-02
-  nomad_1_6 = throw "nomad_1_6 is no longer supported upstream. You can switch to using a newer version of the nomad package. If you cannot upgrade, you can revert to older nixpkgs."; # Added 2025-02-02
-  nomad_1_7 = throw "nomad_1_7 is no longer supported upstream. You can switch to using a newer version of the nomad package. If you cannot upgrade, you can revert to older nixpkgs."; # Added 2025-03-27
-  nomad_1_8 = throw "nomad_1_8 is no longer supported upstream. You can switch to using a newer version of the nomad package. If you cannot upgrade, you can revert to older nixpkgs."; # Added 2025-03-27
   norouter = throw "norouter has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29
   notes-up = throw "'notes-up' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
   notify-sharp = throw "'notify-sharp' has been removed as it was unmaintained and depends on deprecated dbus-sharp versions"; # Added 2025-08-25
-  noto-fonts-cjk = throw "'noto-fonts-cjk' has been renamed to/replaced by 'noto-fonts-cjk-sans'"; # Converted to throw 2024-10-17
   noto-fonts-emoji = noto-fonts-color-emoji; # Added 2023-09-09
   noto-fonts-extra = noto-fonts; # Added 2023-04-08
   NSPlist = nsplist; # Added 2024-01-05
   nuget-to-nix = throw "nuget-to-nix has been removed as it was deprecated in favor of nuget-to-json. Please use nuget-to-json instead"; # Added 2025-08-28
   nushellFull = lib.warnOnInstantiate "`nushellFull` has has been replaced by `nushell` as its features no longer exist" nushell; # Added 2024-05-30
-  nux = throw "nux has been removed because it has been abandoned for 4 years"; # Added 2025-03-22
-  nvidia-podman = throw "podman should use the Container Device Interface (CDI) instead. See https://web.archive.org/web/20240729183805/https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/install-guide.html#configuring-podman"; # Added 2024-08-02
-  nvidia-thrust = throw "nvidia-thrust has been removed because the project was deprecated. Use cudaPackages.cuda_cccl"; # Added 2023-12-04
   o = orbiton; # Added 2023-04-09
   oathToolkit = oath-toolkit; # Added 2022-04-04
-  oauth2_proxy = throw "'oauth2_proxy' has been renamed to/replaced by 'oauth2-proxy'"; # Converted to throw 2024-10-17
   obb = throw "obb has been removed because it has been marked as broken since 2023."; # Added 2025-10-11
   obliv-c = throw "obliv-c has been removed from Nixpkgs, as it has been unmaintained upstream for 4 years and does not build with supported GCC versions"; # Added 2025-08-18
-  ocis-bin = throw "ocis-bin has been renamed to ocis_5-bin'. Future major.minor versions will be made available as separate packages"; # Added 2025-03-30
   oclgrind = throw "oclgrind has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
-  odoo15 = throw "odoo15 has been removed from nixpkgs as it is unsupported; migrate to a newer version of odoo"; # Added 2025-05-06
-  offrss = throw "offrss has been removed due to lack of upstream maintenance; consider using another rss reader"; # Added 2025-06-01
   oil = lib.warnOnInstantiate "Oil has been replaced with the faster native C++ version and renamed to 'oils-for-unix'. See also https://github.com/oils-for-unix/oils/wiki/Oils-Deployments" oils-for-unix; # Added 2024-10-22
-  omping = throw "'omping' has been removed because its upstream has been archived"; # Added 2025-05-10
   onevpl-intel-gpu = lib.warnOnInstantiate "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04
   onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20
-  onlyoffice-bin_7_2 = throw "onlyoffice-bin_7_2 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03
-  onlyoffice-bin_7_5 = throw "onlyoffice-bin_7_5 has been removed. Please use the latest version available under onlyoffice-bin"; # Added 2024-07-03
   onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03
   onscripter-en = throw "onscripter-en has been removed due to lack of maintenance in both upstream and Nixpkgs; onscripter is available instead"; # Added 2025-10-17
   onthespot = throw "onethespot has been removed due to lack of upstream maintenance"; # Added 2025-09-26
-  oobicpl = throw "oobicpl was removed as it is unmaintained upstream"; # Added 2025-04-26
   opae = throw "opae has been removed because it has been marked as broken since June 2023."; # Added 2025-10-11
   open-timeline-io = lib.warnOnInstantiate "'open-timeline-io' has been renamed to 'opentimelineio'" opentimelineio; # Added 2025-08-10
   openafs_1_8 = openafs; # Added 2022-08-22
@@ -1719,80 +1101,32 @@ mapAliases {
   openbabel3 = openbabel; # Added 2025-09-17
   openbsdCross = openbsd; # Added 2024-09-06
   opencl-clang = throw "opencl-clang has been integrated into intel-graphics-compiler"; # Added 2025-09-10
-  opencl-info = throw "opencl-info has been removed, as the upstream is unmaintained; consider using 'clinfo' instead"; # Added 2024-06-12
-  opencomposite-helper = throw "opencomposite-helper has been removed from nixpkgs as it causes issues with some applications. See https://wiki.nixos.org/wiki/VR#OpenComposite for the recommended setup"; # Added 2024-09-07
   openconnect_gnutls = openconnect; # Added 2022-03-29
-  opencv2 = throw "opencv2 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20
-  opencv3 = throw "opencv3 has been removed as it is obsolete and was not used by any other package; please migrate to OpenCV 4"; # Added 2024-08-20
-  opendylan = throw "opendylan has been removed from nixpkgs as it was broken"; # Added 2024-07-15
-  opendylan_bin = throw "opendylan_bin has been removed from nixpkgs as it was broken"; # Added 2024-07-15
-  openelec-dvb-firmware = throw "'openelec-dvb-firmware' has been renamed to/replaced by 'libreelec-dvb-firmware'"; # Converted to throw 2024-10-17
-  openethereum = throw "openethereum development has ceased by upstream. Use alternate clients such as go-ethereum, erigon, or nethermind"; # Added 2024-05-13
   openexr_3 = openexr; # Added 2025-03-12
   openimageio2 = openimageio; # Added 2023-01-05
-  openisns = throw "'openisns' has been renamed to/replaced by 'open-isns'"; # Converted to throw 2024-10-17
-  openjdk19 = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01
-  openjdk19_headless = throw "OpenJDK 19 was removed as it has reached its end of life"; # Added 2024-08-01
-  openjdk20 = throw "OpenJDK 20 was removed as it has reached its end of life"; # Added 2024-08-01
-  openjdk20_headless = throw "OpenJDK 20 was removed as it has reached its end of life"; # Added 2024-08-01
-  openjdk22 = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24
-  openjdk22_headless = throw "OpenJDK 22 was removed as it has reached its end of life"; # Added 2024-09-24
   openjdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
   openjdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
-  openjfx11 = throw "OpenJFX 11 was removed as it has reached its end of life"; # Added 2024-10-07
-  openjfx19 = throw "OpenJFX 19 was removed as it has reached its end of life"; # Added 2024-08-01
-  openjfx20 = throw "OpenJFX 20 was removed as it has reached its end of life"; # Added 2024-08-01
-  openjfx22 = throw "OpenJFX 22 was removed as it has reached its end of life"; # Added 2024-09-24
   openjfx24 = throw "OpenJFX 24 was removed as it has reached its end of life"; # Added 2025-10-04
-  openjpeg_2 = throw "'openjpeg_2' has been renamed to/replaced by 'openjpeg'"; # Converted to throw 2024-10-17
-  openlens = throw "Lens Closed its source code, package obsolete/stale - consider lens as replacement"; # Added 2024-09-04
-  openlp = throw "openlp has been removed for now because the outdated version depended on insecure and removed packages and it needs help to upgrade and maintain it; see https://github.com/NixOS/nixpkgs/pull/314882"; # Added 2024-07-29
-  openmpt123 = throw "'openmpt123' has been renamed to/replaced by 'libopenmpt'"; # Converted to throw 2024-10-17
   openmw-tes3mp = throw "'openmw-tes3mp' has been removed due to lack of maintenance upstream"; # Added 2025-08-30
-  opensmtpd-extras = throw "opensmtpd-extras has been removed in favor of separate opensmtpd-table-* packages"; # Added 2025-01-26
   openssl_3_0 = openssl_3; # Added 2022-06-27
   opensycl = lib.warnOnInstantiate "'opensycl' has been renamed to 'adaptivecpp'" adaptivecpp; # Added 2024-12-04
   opensyclWithRocm = lib.warnOnInstantiate "'opensyclWithRocm' has been renamed to 'adaptivecppWithRocm'" adaptivecppWithRocm; # Added 2024-12-04
   opentofu-ls = lib.warnOnInstantiate "'opentofu-ls' has been renamed to 'tofu-ls'" tofu-ls; # Added 2025-06-10
   opentracing-cpp = throw "'opentracingc-cpp' has been removed as it was archived upstream in 2024"; # Added 2025-10-19
-  openvdb_11 = throw "'openvdb_11' has been removed in favor of the latest version'"; # Added 2025-05-03
-  openvswitch-lts = throw "openvswitch-lts has been removed. Please use the latest version available under openvswitch"; # Added 2024-08-24
-  opera = throw "'opera' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-05-19
-  oraclejdk8 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  oraclejdk8distro = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  oraclejdk11 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  oraclejdk = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  oraclejre8 = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  oraclejre = throw "All Oracle JDKs and JREs were dropped due to being unmaintained and heavily insecure. OpenJDK provides compatible replacements for JDKs and JREs."; # Added 2024-11-01
-  orchis = throw "'orchis' has been renamed to/replaced by 'orchis-theme'"; # Converted to throw 2024-10-17
   orogene = throw "'orogene' uses a wasm-specific fork of async-tar that is vulnerable to CVE-2025-62518, which is not supported by its upstream"; # Added 2025-10-24
   ortp = throw "'ortp' has been moved to 'linphonePackages.ortp'"; # Added 2025-09-20
   OSCAR = oscar; # Added 2024-06-12
   osm2xmap = throw "osm2xmap has been removed, as it is unmaintained upstream and depended on old dependencies with broken builds"; # Added 2025-09-16
-  osxfuse = throw "'osxfuse' has been renamed to/replaced by 'macfuse-stubs'"; # Converted to throw 2024-10-17
   overrideLibcxx = throw "overrideLibcxx has been removed, as it was no longer used and Darwin now uses libc++ from the latest SDK; see the Nixpkgs 25.11 release notes for details"; # Added 2025-09-15
   overrideSDK = throw "overrideSDK has been removed as it was a legacy compatibility stub. See <https://nixos.org/manual/nixpkgs/stable/#sec-darwin-legacy-frameworks-overrides> for migration instructions"; # Added 2025-08-04
-  ovn-lts = throw "ovn-lts has been removed. Please use the latest version available under ovn"; # Added 2024-08-24
-  oysttyer = throw "oysttyer has been removed; it is no longer maintained because of Twitter disabling free API access"; # Added 2024-09-23
-  p2pvc = throw "p2pvc has been removed as it is unmaintained upstream and depends on OpenCV 2"; # Added 2024-08-20
-  packet-cli = throw "'packet-cli' has been renamed to/replaced by 'metal-cli'"; # Converted to throw 2024-10-17
-  paco = throw "'paco' has been removed as it has been abandoned"; # Added 2025-04-30
   pacup = perlPackages.pacup; # Added 2025-01-21
   PageEdit = pageedit; # Added 2024-01-21
   pal = throw "pal has been removed, as it was broken"; # Added 2025-08-25
-  panopticon = throw "'panopticon' has been removed because it is unmaintained upstream"; # Added 2025-01-25
-  paperless = throw "'paperless' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2024-10-17
   paperless-ng = paperless-ngx; # Added 2022-04-11
-  paperoni = throw "paperoni has been removed, because it is unmaintained"; # Added 2024-07-14
-  passky-desktop = throw "passky-desktop has been removed, as it was unmaintained and blocking the Electron 29 removal."; # Added 2025-02-24
   patchelfStable = patchelf; # Added 2024-01-25
-  pathsFromGraph = throw "pathsFromGraph has been removed, use closureInfo instead"; # Added 2025-01-23
   paup = paup-cli; # Added 2024-09-11
-  pax-rs = throw "'pax-rs' has been removed because upstream has disappeared"; # Added 2025-01-25
   pcp = throw "'pcp' has been removed because the upstream repo was archived and it hasn't been updated since 2021"; # Added 2025-09-23
-  pcre16 = throw "'pcre16' has been removed because it is obsolete. Consider migrating to 'pcre2' instead."; # Added 2025-05-29
   pcsctools = pcsc-tools; # Added 2023-12-07
-  pcsxr = throw "pcsxr was removed as it has been abandoned for over a decade; please use DuckStation, Mednafen, or the RetroArch PCSX ReARMed core"; # Added 2024-08-20
   pdf4tcl = tclPackages.pdf4tcl; # Added 2024-10-02
   pds = lib.warnOnInstantiate "'pds' has been renamed to 'bluesky-pds'" bluesky-pds; # Added 2025-08-20
   pdsadmin = lib.warnOnInstantiate "'pdsadmin' has been renamed to 'bluesky-pdsadmin'" bluesky-pdsadmin; # Added 2025-08-20
@@ -1803,30 +1137,22 @@ mapAliases {
   percona-server_lts = percona-server; # Added 2024-10-13
   percona-xtrabackup_innovation = lib.warnOnInstantiate "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-xtrabackup; # Added 2024-10-13
   percona-xtrabackup_lts = percona-xtrabackup; # Added 2024-10-13
-  perldevel = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead"; # Added 2023-09-09
-  perldevelPackages = throw "'perldevel' has been dropped due to lack of updates in nixpkgs and lack of consistent support for devel versions by 'perl-cross' releases, use 'perl' instead"; # Added 2023-09-09
-  peroxide = throw "'peroxide' has been dropped due to lack of upstream maintenance."; # Added 2025-03-31
   peruse = throw "'peruse' has been removed as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
-  petrinizer = throw "'petrinizer' has been removed, as it was broken and unmaintained"; # added 2024-05-09
-  pg-gvm = throw "pg-gvm has been moved to postgresql.pkgs.pg-gvm to make it work with all versions of PostgreSQL"; # added 2024-11-30
   pg_cron = throw "'pg_cron' has been removed. Use 'postgresqlPackages.pg_cron' instead."; # Added 2025-07-19
   pg_hll = throw "'pg_hll' has been removed. Use 'postgresqlPackages.pg_hll' instead."; # Added 2025-07-19
   pg_repack = throw "'pg_repack' has been removed. Use 'postgresqlPackages.pg_repack' instead."; # Added 2025-07-19
   pg_similarity = throw "'pg_similarity' has been removed. Use 'postgresqlPackages.pg_similarity' instead."; # Added 2025-07-19
   pg_topn = throw "'pg_topn' has been removed. Use 'postgresqlPackages.pg_topn' instead."; # Added 2025-07-19
   pgadmin = pgadmin4; # Added 2022-01-14
-  pgf1 = throw "'pgf1' has been removed since it is unmaintained. Consider using 'pgf' instead"; # Added 2025-05-10
   pgf_graphics = throw "pgf_graphics was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   pgjwt = throw "'pgjwt' has been removed. Use 'postgresqlPackages.pgjwt' instead."; # Added 2025-07-19
   pgroonga = throw "'pgroonga' has been removed. Use 'postgresqlPackages.pgroonga' instead."; # Added 2025-07-19
   pgtap = throw "'pgtap' has been removed. Use 'postgresqlPackages.pgtap' instead."; # Added 2025-07-19
   pharo-spur64 = pharo; # Added 2022-08-03
-  phlare = throw "'phlare' has been removed as the upstream project was archived."; # Added 2025-03-27
   php81 = throw "php81 is EOL"; # Added 2025-10-04
   php81Extensions = throw "php81 is EOL"; # Added 2025-10-04
   php81Packages = throw "php81 is EOL"; # Added 2025-10-04
   picom-next = picom; # Added 2024-02-13
-  pict-rs_0_3 = throw "pict-rs_0_3 has been removed, as it was an outdated version and no longer compiled"; # Added 2024-08-20
   pidgin-carbons = pidginPackages.pidgin-carbons; # Added 2023-07-17
   pidgin-indicator = pidginPackages.pidgin-indicator; # Added 2023-07-17
   pidgin-latex = pidginPackages.pidgin-latex; # Added 2023-07-17
@@ -1841,86 +1167,51 @@ mapAliases {
   pidgin-xmpp-receipts = pidginPackages.pidgin-xmpp-receipts; # Added 2023-07-17
   pilipalax = throw "'pilipalax' has been removed from nixpkgs due to it not being maintained"; # Added 2025-07-25
   pinentry = throw "'pinentry' has been removed. Pick an appropriate variant like 'pinentry-curses' or 'pinentry-gnome3'"; # Converted to throw 2025-10-26
-  pinentry_qt5 = throw "'pinentry_qt5' has been renamed to/replaced by 'pinentry-qt'"; # Converted to throw 2024-10-17
-  pio = throw "pio has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   piper-train = throw "piper-train is now part of the piper package using the `withTrain` override"; # Added 2025-09-03
-  pipewire-media-session = throw "pipewire-media-session is no longer maintained and has been removed. Please use Wireplumber instead."; # Added 2023-03-09
-  pipewire_0_2 = throw "pipewire_0_2 has been removed as it is outdated and no longer used"; # Added 2024-07-28
-  pivx = throw "pivx has been removed as it was marked as broken"; # Added 2024-07-15
-  pivxd = throw "pivxd has been removed as it was marked as broken"; # Added 2024-07-15
   plasma-applet-volumewin7mixer = throw "'plasma-applet-volumewin7mixer' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   plasma-pass = throw "'plasma-pass' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   plasma-theme-switcher = throw "'plasma-theme-switcher' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   platformioPackages.platformio-chrootenv = platformio-chrootenv; # Added 2025-09-04
   platformioPackages.platformio-core = platformio-core; # Added 2025-09-04
-  platypus = throw "platypus is unmaintained and has not merged Python3 support"; # Added 2025-03-20
-  pleroma-otp = throw "'pleroma-otp' has been renamed to/replaced by 'pleroma'"; # Converted to throw 2024-10-17
-  plex-media-player = throw "'plex-media-player' has been discontinued, the new official client is available as 'plex-desktop'"; # Added 2025-05-28
   PlistCpp = plistcpp; # Added 2024-01-05
-  plots = throw "'plots' has been replaced by 'gnome-graphs'"; # Added 2025-02-05
   pltScheme = racket; # Added 2013-02-24
   plv8 = throw "'plv8' has been removed. Use 'postgresqlPackages.plv8' instead."; # Added 2025-07-19
   pn = throw "'pn' has been removed as upstream was archived in 2020"; # Added 2025-10-17
   poac = cabinpkg; # Added 2025-01-22
   pocket-updater-utility = pupdate; # Added 2024-01-25
   podofo010 = podofo_0_10; # Added 2025-06-01
-  polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18
   polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25
   poppler_utils = poppler-utils; # Added 2025-02-27
-  poretools = throw "poretools has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-06-03
-  posix_man_pages = throw "'posix_man_pages' has been renamed to/replaced by 'man-pages-posix'"; # Converted to throw 2024-10-17
-  postcss-cli = throw "postcss-cli has been removed because it was broken"; # added 2025-03-24
   posterazor = throw "posterazor was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   postfixadmin = throw "'postfixadmin' has been removed due to lack of maintenance and missing support for PHP >8.1"; # Added 2025-10-03
   postgis = throw "'postgis' has been removed. Use 'postgresqlPackages.postgis' instead."; # Added 2025-07-19
-  postgresql12JitPackages = throw "postgresql_12 has been removed since it reached its EOL upstream"; # Added 2024-11-14
-  postgresql12Packages = throw "postgresql_12 has been removed since it reached its EOL upstream"; # Added 2024-11-14
   postgresql13JitPackages = postgresql13Packages; # Added 2025-04-12
   postgresql14JitPackages = postgresql14Packages; # Added 2025-04-12
   postgresql15JitPackages = postgresql15Packages; # Added 2025-04-12
   postgresql16JitPackages = postgresql16Packages; # Added 2025-04-12
   postgresql17JitPackages = postgresql17Packages; # Added 2025-04-12
-  postgresql_12 = throw "postgresql_12 has been removed since it reached its EOL upstream"; # Added 2024-11-14
-  postgresql_12_jit = throw "postgresql_12 has been removed since it reached its EOL upstream"; # Added 2024-11-14
   # Ever since building with JIT by default, those are the same.
   postgresqlJitPackages = postgresqlPackages; # Added 2025-04-12
   pot = throw "'pot' has been removed as it requires libsoup 2.4 which is EOL"; # Added 2025-10-09
   powerdns = pdns; # Added 2022-03-28
-  powerline-rs = throw "'powerline-rs' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
   prboom-plus = throw "'prboom-plus' has been removed since it is unmaintained upstream."; # Added 2025-09-14
-  premake3 = throw "'premake3' has been removed since it is unmaintained. Consider using 'premake' instead"; # Added 2025-05-10
-  presage = throw "presage has been removed, as it has been unmaintained since 2018"; # Added 2024-03-24
   preserves-nim = throw "'preserves-nim' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
-  prismlauncher-qt5 = throw "'prismlauncher-qt5' has been removed from nixpkgs. Please use 'prismlauncher'"; # Added 2024-04-20
-  prismlauncher-qt5-unwrapped = throw "'prismlauncher-qt5-unwrapped' has been removed from nixpkgs. Please use 'prismlauncher-unwrapped'"; # Added 2024-04-20
   private-gpt = throw "'private-gpt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2025-07-28
   probe-rs = probe-rs-tools; # Added 2024-05-23
-  probe-run = throw "probe-run is deprecated upstream.  Use probe-rs instead."; # Added 2024-05-23
   proj_7 = throw "proj_7 has been removed, as it was broken and unused"; # Added 2025-09-16
-  projectm = throw "Since version 4, 'projectm' has been split into 'libprojectm' (the library) and 'projectm-sdl-cpp' (the SDL2 frontend). ProjectM 3 has been moved to 'projectm_3'"; # Added 2024-11-10
   prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31
   prometheus-dovecot-exporter = dovecot_exporter; # Added 2024-06-10
-  prometheus-minio-exporter = throw "'prometheus-minio-exporter' has been removed from nixpkgs, use Minio's built-in Prometheus integration instead"; # Added 2024-06-10
-  prometheus-openldap-exporter = throw "'prometheus-openldap-exporter' has been removed from nixpkgs, as it was unmaintained"; # Added 2024-09-01
-  prometheus-tor-exporter = throw "'prometheus-tor-exporter' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2024-10-30
   protobuf3_21 = protobuf_21; # Added 2023-10-05
-  protobuf3_23 = throw "'protobuf_23' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-04-20
   protobuf3_24 = throw "'protobuf_24' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-07-14
-  protobuf_23 = throw "'protobuf_23' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-04-20
   protobuf_24 = throw "'protobuf_24' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-07-14
   protobuf_26 = throw "'protobuf_26' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-06-29
   protobuf_28 = throw "'protobuf_28' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-06-14
-  protoc-gen-connect-es = throw "'protoc-gen-connect-es' has been removed because it is deprecated upstream. Functionality has been integrated into 'protoc-gen-es' v2."; # Added 2025-02-18
   proton-caller = throw "'proton-caller' has been removed from nixpkgs due to being unmaintained and lack of upstream maintenance."; # Added 2025-09-25
   proton-vpn-local-agent = throw "'proton-vpn-local-agent' has been renamed to 'python3Packages.proton-vpn-local-agent'"; # Converted to throw 2025-10-26
   protonup = protonup-ng; # Added 2022-11-06
   protonvpn-cli = throw "protonvpn-cli source code was removed from upstream. Use protonvpn-gui instead."; # Added 2025-10-16
   protonvpn-cli_2 = throw "protonvpn-cli_2 has been removed due to being deprecated. Use protonvpn-gui instead."; # Added 2025-10-16
-  protonvpn-gui_legacy = throw "protonvpn-gui_legacy source code was removed from upstream. Use protonvpn-gui instead."; # Added 2024-10-12
   proxmark3-rrg = proxmark3; # Added 2023-07-25
-  psensor = throw "'psensor' has been removed due to lack of maintenance upstream. Consider using 'mission-center', 'resources' or 'monitorets' instead"; # Added 2024-09-14
-  psstop = throw "'psstop' has been removed because the upstream repo has been archived"; # Added 2025-05-10
-  ptask = throw "'ptask' has been removed because its upstream is unavailable"; # Added 2025-05-10
   purple-discord = pidginPackages.purple-discord; # Added 2023-07-17
   purple-facebook = throw "'purple-facebook' has been removed as it is unmaintained and doesn't support e2ee enforced by facebook."; # Added 2025-09-17
   purple-googlechat = pidginPackages.purple-googlechat; # Added 2023-07-17
@@ -1929,19 +1220,11 @@ mapAliases {
   purple-matrix = throw "'purple-matrix' has been unmaintained since April 2022, so it was removed."; # Added 2025-09-01
   purple-mm-sms = pidginPackages.purple-mm-sms; # Added 2023-07-17
   purple-plugin-pack = pidginPackages.purple-plugin-pack; # Added 2023-07-17
-  purple-signald = throw "'purple-signald' has been removed due to lack of upstream maintenance"; # Added 2025-05-17
   purple-slack = pidginPackages.purple-slack; # Added 2023-07-17
   purple-vk-plugin = throw "'purple-vk-plugin' has been removed as upstream repository was deleted and no active forks are found."; # Added 2025-09-17
   purple-xmpp-http-upload = pidginPackages.purple-xmpp-http-upload; # Added 2023-07-17
-  pwndbg = throw "'pwndbg' has been removed due to dependency version incompatibilities that are infeasible to maintain in nixpkgs. Use the downstream flake that pwndbg provides instead: https://github.com/pwndbg/pwndbg"; # Added 2025-02-09
-  pxlib = throw "pxlib has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28
-  pxview = throw "pxview has been removed due to failing to build and lack of upstream maintenance"; # Added 2025-04-28
-  pynac = throw "'pynac' has been removed as it was broken and unmaintained"; # Added 2025-03-18
   pyo3-pack = maturin; # Added 2019-08-30
-  pypi2nix = throw "pypi2nix has been removed due to being unmaintained"; # Added 2023-06-02
   pypolicyd-spf = spf-engine; # Added 2022-10-09
-  pypy39 = throw "pypy 3.9 has been removed, use pypy 3.10 instead"; # Added 2025-01-03
-  pypy39Packages = throw "pypy 3.9 has been removed, use pypy 3.10 instead"; # Added 2025-01-07
   python3Full = throw "python3Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
   python310Full = throw "python310Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
   python311Full = throw "python311Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
@@ -1949,91 +1232,53 @@ mapAliases {
   python313Full = throw "python313Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
   python314Full = throw "python314Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
   python = python2; # Added 2022-01-11
-  python-swiftclient = throw "'python-swiftclient' has been renamed to/replaced by 'swiftclient'"; # Converted to throw 2024-10-17
   pythonFull = python2Full; # Added 2022-01-11
   pythonPackages = python.pkgs; # Added 2022-01-11
-  qbittorrent-qt5 = throw "'qbittorrent-qt5' has been removed as qBittorrent 5 dropped support for Qt 5. Please use 'qbittorrent'"; # Added 2024-09-30
   qcachegrind = throw "'qcachegrind' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
   qflipper = qFlipper; # Added 2022-02-11
   qnial = throw "'qnial' has been removed due to failing to build and being unmaintained"; # Added 2025-06-26
   qrscan = throw "qrscan has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-19
   qscintilla = libsForQt5.qscintilla; # Added 2023-09-20
   qscintilla-qt6 = qt6Packages.qscintilla; # Added 2023-09-20
-  qt5ct = throw "'qt5ct' has been renamed to/replaced by 'libsForQt5.qt5ct'"; # Converted to throw 2024-10-17
   qt5Full = throw "qt5Full has been removed. Please use individual packages instead."; # Added 2025-10-18
   qt6ct = qt6Packages.qt6ct; # Added 2023-03-07
   qt515 = qt5; # Added 2022-11-24
   qt-video-wlr = throw "'qt-video-wlr' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
   qtchan = throw "'qtchan' has been removed due to lack of maintenance upstream"; # Added 2025-07-01
-  qtcurve = throw "'qtcurve' has been renamed to/replaced by 'libsForQt5.qtcurve'"; # Converted to throw 2024-10-17
   qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12
   quantum-espresso-mpi = quantum-espresso; # Added 2023-11-23
-  quaternion-qt5 = throw "'quaternion-qt5' has been removed as quaternion dropped Qt5 support with v0.0.97.1"; # Added 2025-05-24
   qubes-core-vchan-xen = throw "'qubes-core-vchan-xen' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
-  quickbms = throw "'quickbms' has been removed due to being unmaintained for many years."; # Added 2025-05-17
-  quicklispPackages = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  quicklispPackagesABCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  quicklispPackagesCCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  quicklispPackagesClisp = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  quicklispPackagesECL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  quicklispPackagesFor = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  quicklispPackagesGCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  quicklispPackagesSBCL = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
-  quickserve = throw "'quickserve' has been removed because its upstream is unavailable"; # Added 2025-05-10
   quicksynergy = throw "'quicksynergy' has been removed due to lack of maintenance upstream. Consider using 'deskflow' instead."; # Added 2025-06-18
   qv2ray = throw "'qv2ray' has been removed as it was unmaintained"; # Added 2025-06-03
-  qxw = throw "'qxw' has been removed due to lack of maintenance upstream. Consider using 'crosswords' instead"; # Added 2024-10-19
-  rabbitmq-java-client = throw "rabbitmq-java-client has been removed due to its dependency on Python2 and a lack of maintenance within the nixpkgs tree"; # Added 2025-03-29
-  rabbitvcs = throw "rabbitvcs has been removed from nixpkgs, because it was broken"; # Added 2024-07-15
-  racket_7_9 = throw "Racket 7.9 has been removed because it is insecure. Consider using 'racket' instead."; # Added 2024-12-06
-  radare2-cutter = throw "'radare2-cutter' has been renamed to/replaced by 'cutter'"; # Converted to throw 2024-10-17
-  radicale2 = throw "'radicale2' was removed because it was broken. Use 'radicale' (version 3) instead"; # Added 2024-11-29
   radicale3 = radicale; # Added 2024-11-29
   railway-travel = diebahn; # Added 2024-04-01
   rambox-pro = rambox; # Added 2022-12-12
   rapidjson-unstable = lib.warnOnInstantiate "'rapidjson-unstable' has been renamed to 'rapidjson'" rapidjson; # Added 2024-07-28
-  rargs = throw "'rargs' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  rebazel = throw "'rebazel' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
   redict = throw "'redict' has been removed due to lack of nixpkgs maintenance and a slow upstream development pace. Consider using 'valkey'."; # Added 2025-10-16
   redoc-cli = throw "'redoc-cli' been removed because it has been marked as broken since at least November 2024. Consider using 'redocly' instead."; # Added 2025-10-01
   redocly-cli = redocly; # Added 2024-04-14
   redpanda = redpanda-client; # Added 2023-10-14
-  redpanda-server = throw "'redpanda-server' has been removed because it was broken for a long time"; # Added 2024-06-10
-  relibc = throw "relibc has been removed due to lack of maintenance"; # Added 2024-09-02
   remotebox = throw "remotebox has been removed because it was unmaintained and broken for a long time"; # Added 2025-09-11
-  replay-sorcery = throw "replay-sorcery has been removed as it is unmaintained upstream. Consider using gpu-screen-recorder or obs-studio instead."; # Added 2024-07-13
   responsively-app = throw "'responsively-app' has been removed due to lack of maintainance upstream."; # Added 2025-06-25
-  restinio_0_6 = throw "restinio_0_6 has been removed from nixpkgs as it's not needed by downstream packages"; # Added 2024-07-04
   retroarchBare = retroarch-bare; # Added 2024-11-23
   retroarchFull = retroarch-full; # Added 2024-11-23
   retroshare06 = retroshare; # Added 2020-11-07
   rewind-ai = throw "'rewind-ai' has been removed due to lack of of maintenance upstream"; # Added 2025-08-03
-  rftg = throw "'rftg' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   rigsofrods = rigsofrods-bin; # Added 2023-03-22
-  riko4 = throw "'riko4' has been removed as it was unmaintained, failed to build and dependend on outdated libraries"; # Added 2025-05-18
-  ring-daemon = throw "'ring-daemon' has been renamed to/replaced by 'jami-daemon'"; # Converted to throw 2024-10-17
-  rippled = throw "rippled has been removed as it was broken and had not been updated since 2022"; # Added 2024-11-25
-  rippled-validator-keys-tool = throw "rippled-validator-keys-tool has been removed as it was broken and had not been updated since 2022"; # Added 2024-11-25
   river = throw "'river' has been renamed to/replaced by 'river-classic'"; # Added 2025-08-30
-  rke2_1_29 = throw "'rke2_1_29' has been removed from nixpkgs as it has reached end of life"; # Added 2025-05-05
   rke2_testing = throw "'rke2_testing' has been removed from nixpkgs as the RKE2 testing channel no longer serves releases"; # Added 2025-06-02
   rl_json = tclPackages.rl_json; # Added 2025-05-03
-  rnix-hashes = throw "'rnix-hashes' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   rockbox_utility = rockbox-utility; # Added 2022-03-17
   rockcraft = throw "rockcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # added 2025-09-18
-  rocmPackages_5 = throw "ROCm 5 has been removed in favor of newer versions"; # Added 2025-02-18
   rofi-emoji-wayland = throw "'rofi-emoji-wayland' has been merged into `rofi-emoji as 'rofi-wayland' has been merged into 'rofi'"; # Added 2025-09-06
   rofi-wayland = throw "'rofi-wayland' has been merged into 'rofi'"; # Added 2025-09-06
   rofi-wayland-unwrapped = throw "'rofi-wayland-unwrapped' has been merged into 'rofi-unwrapped'"; # Added 2025-09-06
   root5 = throw "root5 has been removed from nixpkgs because it's a legacy version"; # Added 2025-07-17
   rote = throw "rote has been removed due to lack of upstream maintenance"; # Added 2025-09-10
-  rpiboot-unstable = throw "'rpiboot-unstable' has been renamed to/replaced by 'rpiboot'"; # Converted to throw 2024-10-17
   rquickshare-legacy = throw "The legacy version depends on insecure package libsoup2, please use the main version"; # Added 2025-10-09
   rr-unstable = rr; # Added 2022-09-17
   # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix,
   # due to it being inside the linuxPackagesFor function.
-  rtlwifi_new-firmware = throw "'rtlwifi_new-firmware' has been renamed to/replaced by 'rtw88-firmware'"; # Converted to throw 2024-10-17
-  rtw88-firmware = throw "rtw88-firmware has been removed because linux-firmware now contains it."; # Added 2024-06-28
   rtx = mise; # Added 2024-01-05
   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_3_1 = throw "ruby_3_1 has been removed, as it is has reached end‐of‐life upstream"; # Added 2025-10-12
@@ -2041,83 +1286,38 @@ mapAliases {
   rubyPackages_3_1 = throw "rubyPackages_3_1 has been removed, as it is has reached end‐of‐life upstream"; # Added 2025-10-12
   rubyPackages_3_2 = throw "rubyPackages_3_2 has been removed, as it will reach end‐of‐life upstream during Nixpkgs 25.11’s support cycle"; # Added 2025-10-12
   rucksack = throw "rucksack was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
-  run-scaled = throw "run-scaled has been removed due to being deprecated. Consider using run_scaled from 'xpra' instead"; # Added 2025-03-17
   runCommandNoCC = runCommand; # Added 2021-08-15
   runCommandNoCCLocal = runCommandLocal; # Added 2021-08-15
   rust-synapse-state-compress = rust-synapse-compress-state; # Added 2025-03-08
   rustc-wasm32 = rustc; # Added 2023-12-01
-  rustfilt = throw "'rustfilt' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
   rustic-rs = rustic; # Added 2024-08-02
-  rxvt_unicode = throw "'rxvt_unicode' has been renamed to/replaced by 'rxvt-unicode-unwrapped'"; # Converted to throw 2024-10-17
-  rxvt_unicode-with-plugins = throw "'rxvt_unicode-with-plugins' has been renamed to/replaced by 'rxvt-unicode'"; # Converted to throw 2024-10-17
   ryujinx = throw "'ryujinx' has been replaced by 'ryubing' as the new upstream"; # Added 2025-07-30
   ryujinx-greemdev = ryubing; # Added 2025-01-20
-  s2n = throw "'s2n' has been renamed to/replaced by 's2n-tls'"; # Converted to throw 2024-10-17
-  samtools_0_1_19 = throw "'samtools_0_1_19' has been removed because it is unmaintained. Consider using 'samtools' instead"; # Added 2025-05-10
-  sandboxfs = throw "'sandboxfs' has been removed due to being unmaintained, consider using linux namespaces for sandboxing instead"; # Added 2024-06-06
-  sane-backends-git = throw "'sane-backends-git' has been renamed to/replaced by 'sane-backends'"; # Converted to throw 2024-10-17
   scantailor = scantailor-advanced; # Added 2022-05-26
   scitoken-cpp = scitokens-cpp; # Added 2024-02-12
-  scry = throw "'scry' has been removed as it was archived upstream. Use 'crystalline' instead"; # Added 2025-02-12
   scudcloud = throw "'scudcloud' has been removed as it was archived by upstream"; # Added 2025-07-24
-  SDL1 = throw "'SDL1' has been removed as development ended long ago with SDL 2.0 replacing it, use SDL_compat instead"; # Added 2025-03-27
-  SDL2_classic = throw "'SDL2_classic' has been removed. Consider upgrading to 'sdl2-compat', also available as 'SDL2'."; # Added 2025-05-20
-  SDL2_classic_image = throw "'SDL2_classic_image' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_image' built with 'sdl2-compat'."; # Added 2025-05-20
-  SDL2_classic_mixer = throw "'SDL2_classic_mixer' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_mixer' built with 'sdl2-compat'."; # Added 2025-05-20
-  SDL2_classic_mixer_2_0 = throw "'SDL2_classic_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27
-  SDL2_classic_ttf = throw "'SDL2_classic_ttf' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_ttf' built with 'sdl2-compat'."; # Added 2025-05-20
-  SDL2_mixer_2_0 = throw "'SDL2_mixer_2_0' has been removed in favor of the latest version"; # Added 2025-04-27
-  SDL_classic = throw "'SDL1' has been removed as development ended long ago with SDL 2.0 replacing it, use SDL_compat instead"; # Added 2025-03-27
-  SDL_gpu = throw "'SDL_gpu' has been removed due to lack of upstream maintenance and known users"; # Added 2025-03-15
-  SDL_image_2_0 = throw "'SDL_image_2_0' has been removed in favor of the latest version"; # Added 2025-04-20
   seafile-server = throw "'seafile-server' has been removed as it is unmaintained"; # Added 2025-08-21
   seahub = throw "'seahub' has been removed as it is unmaintained"; # Added 2025-08-21
-  semeru-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01
-  semeru-jre-bin-16 = throw "Semeru 16 has been removed as it has reached its end of life"; # Added 2024-08-01
-  sensu = throw "sensu has been removed as the upstream project is deprecated. Consider using `sensu-go`"; # Added 2024-10-28
   sequoia = sequoia-sq; # Added 2023-06-26
-  serial-unit-testing = throw "'serial-unit-testing' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  serious-sans = throw "'serious-sans' has been renamed to 'serious-shanns', which is not currently packaged"; # Added 2025-01-26
   session-desktop-appimage = session-desktop; # Added 2022-08-31
-  setserial = throw "'setserial' has been removed as it had been abandoned upstream"; # Added 2025-05-18
   sexp = sexpp; # Added 2023-07-03
-  sgrep = throw "'sgrep' has been removed as it was unmaintained upstream since 1998 and broken with gcc 14"; # Added 2025-05-17
   shadered = throw "shadered has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
-  shallot = throw "'shallot' has been removed as it is broken and the upstream repository was removed. Consider using 'mkp224o'"; # Added 2025-03-16
-  sheesy-cli = throw "'sheesy-cli' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
-  shell-hist = throw "'shell-hist' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   shipyard = jumppad; # Added 2023-06-06
-  shout = throw "shout was removed because it was deprecated upstream in favor of thelounge."; # Added 2024-10-19
   siduck76-st = st-snazzy; # Added 2024-12-24
   sierra-breeze-enhanced = throw "'sierra-breeze-enhanced' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  signal-desktop-beta = throw "signal-desktop-beta has been removed to make the signal-desktop package easier to maintain"; # Added 2024-11-20
   signal-desktop-source = lib.warnOnInstantiate "'signal-desktop-source' is now exposed at 'signal-desktop'." signal-desktop; # Added 2025-04-16
-  signald = throw "'signald' has been removed due to lack of upstream maintenance"; # Added 2025-05-17
-  signaldctl = throw "'signaldctl' has been removed due to lack of upstream maintenance"; # Added 2025-05-17
-  silc_client = throw "'silc_client' has been removed because it is unmaintained"; # Added 2025-05-12
-  silc_server = throw "'silc_server' has been removed because it is unmaintained"; # Added 2025-05-12
   simplesamlphp = throw "'simplesamlphp' was removed because it was unmaintained in nixpkgs"; # Added 2025-10-17
-  siproxd = throw "'siproxd' has been removed as it was unmaintained and incompatible with newer libosip versions"; # Added 2025-05-18
   sipwitch = throw "'sipwitch' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   sisco.lv2 = throw "'sisco.lv2' has been removed as it was unmaintained and broken"; # Added 2025-08-26
-  sky = throw "'sky' has been removed because its upstream website disappeared"; # Added 2024-07-21
   SkypeExport = throw "'skypeexport' was removed since Skype has been shut down in May 2025"; # Added 2025-09-15
   skypeexport = throw "'skypeexport' was removed since Skype has been shut down in May 2025"; # Added 2025-09-15
-  skypeforlinux = throw "Skype has been shut down in May 2025"; # Added 2025-05-05
-  slack-dark = throw "'slack-dark' has been renamed to/replaced by 'slack'"; # Converted to throw 2024-10-17
   sladeUnstable = slade-unstable; # Added 2025-08-26
   slic3r = throw "'slic3r' has been removed because it is unmaintained"; # Added 2025-08-26
-  slimerjs = throw "slimerjs does not work with any version of Firefox newer than 59; upstream ended the project in 2021. <https://slimerjs.org/faq.html#end-of-development>"; # added 2025-01-06
-  sloccount = throw "'sloccount' has been removed because it is unmaintained. Consider migrating to 'loccount'"; # added 2025-05-17
   slrn = throw "'slrn' has been removed because it is unmaintained upstream and broken."; # Added 2025-06-11
   slurm-llnl = slurm; # Added 2017-07-31
-  sm64ex-coop = throw "'sm64ex-coop' was removed as it was archived upstream. Consider migrating to 'sm64coopdx'"; # added 2024-11-23
   smartgithg = smartgit; # Added 2025-03-31
   snapcraft = throw "snapcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # added 2025-09-18
-  snapTools = throw "snapTools was removed because makeSnap produced broken snaps and it was the only function in snapTools. See https://github.com/NixOS/nixpkgs/issues/100618 for more details."; # Added 2024-03-04
-  snort2 = throw "snort2 has been removed as it is deprecated and unmaintained by upstream. Consider using snort (snort3) package instead."; # 2025-05-21
   snowman = throw "snowman has been removed as it is unmaintained by upstream"; # 2025-10-12
-  solana-validator = throw "'solana-validator' is obsoleted by solana-cli, which also includes the validator binary"; # Added 2024-12-20
   soldat-unstable = opensoldat; # Added 2022-07-02
   somatic-sniper = throw "somatic-sniper has been removed as it was archived in 2020 and fails to build."; # Added 2025-10-14
   sonusmix = throw "'sonusmix' has been removed due to lack of maintenance"; # Added 2025-08-27
@@ -2146,24 +1346,14 @@ mapAliases {
   SPAdes = spades; # Added 2024-06-12
   spago = spago-legacy; # Added 2025-09-23, pkgs.spago should become spago@next which hasn't been packaged yet
   spark2014 = gnatprove; # Added 2024-02-25
-  spatialite_gui = throw "spatialite_gui has been renamed to spatialite-gui"; # Added 2025-01-12
-  spatialite_tools = throw "spatialite_tools has been renamed to spatialite-tools"; # Added 2025-02-06
-  spectral = throw "'spectral' has been renamed to/replaced by 'neochat'"; # Converted to throw 2024-10-17
   # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell
-  spidermonkey = throw "'spidermonkey' has been renamed to/replaced by 'spidermonkey_91'"; # Converted to throw 2024-10-17
-  spidermonkey_78 = throw "'spidermonkey_78' has been removed because it was unused."; # Added 2025-02-02
   spidermonkey_91 = throw "'spidermonkey_91 is EOL since 2022/09"; # Added 2025-08-26
-  spidermonkey_102 = throw "'spidermonkey_102' is EOL since 2023/03"; # Added 2024-08-07
   spotify-unwrapped = spotify; # added 2022-11-06
   spring = throw "spring has been removed, as it had been broken since 2023 (it was a game; maybe you’re thinking of spring-boot-cli?)"; # Added 2025-09-16
-  spring-boot = throw "'spring-boot' has been renamed to/replaced by 'spring-boot-cli'"; # Converted to throw 2024-10-17
   springLobby = throw "springLobby has been removed, as it had been broken since 2023"; # Added 2025-09-16
   sqlbag = throw "sqlbag has been removed because it has been marked as broken since May 2024."; # Added 2025-10-11
-  sqldeveloper = throw "sqldeveloper was dropped due to being severely out-of-date and having a dependency on JavaFX for Java 8, which we do not support"; # Added 2024-11-02
-  srvc = throw "'srvc' has been removed, as it was broken and unmaintained"; # Added 2024-09-09
   ssm-agent = amazon-ssm-agent; # Added 2023-10-17
   starpls-bin = starpls; # Added 2024-10-30
-  starspace = throw "starspace has been removed from nixpkgs, as it was broken"; # Added 2024-07-15
   station = throw "station has been removed from nixpkgs, as there were no committers among its maintainers to unblock security issues"; # added 2025-06-16
   steam-run-native = steam-run; # added 2022-02-21
   steam-small = steam; # Added 2024-09-12
@@ -2171,51 +1361,27 @@ mapAliases {
   steamPackages.steam = lib.warnOnInstantiate "`steamPackages.steam` has been moved to top level as `steam-unwrapped`" steam-unwrapped; # Added 2024-10-16
   steamPackages.steam-fhsenv = lib.warnOnInstantiate "`steamPackages.steam-fhsenv` has been moved to top level as `steam`" steam; # Added 2024-10-16
   steamPackages.steam-fhsenv-small = lib.warnOnInstantiate "`steamPackages.steam-fhsenv-small` has been moved to top level as `steam`; there is no longer a -small variant" steam; # Added 2024-10-16
-  steamPackages.steam-runtime = throw "`steamPackages.steam-runtime` has been removed, as it's no longer supported or necessary"; # Added 2024-10-16
-  steamPackages.steam-runtime-wrapped = throw "`steamPackages.steam-runtime-wrapped` has been removed, as it's no longer supported or necessary"; # Added 2024-10-16
-  steamPackages.steamArch = throw "`steamPackages.steamArch` has been removed as it's no longer applicable"; # Added 2024-10-16
   steamPackages.steamcmd = lib.warnOnInstantiate "`steamPackages.steamcmd` has been moved to top level as `steamcmd`" steamcmd; # Added 2024-10-16
   StormLib = stormlib; # Added 2024-01-21
   strawberry-qt5 = throw "strawberry-qt5 has been replaced by strawberry"; # Added 2024-11-22 and updated 2025-07-19
   strawberry-qt6 = throw "strawberry-qt6 has been replaced by strawberry"; # Added 2025-07-19
-  strelka = throw "strelka depends on Python 2.6+, and does not support Python 3."; # Added 2025-03-17
-  subberthehut = throw "'subberthehut' has been removed as it was unmaintained upstream"; # Added 2025-05-17
   sublime-music = throw "`sublime-music` has been removed because upstream has announced it is no longer maintained. Upstream suggests using `supersonic` instead."; # Added 2025-09-20
-  substituteAll = throw "`substituteAll` has been removed. Use `replaceVars` instead."; # Added 2025-05-23
-  substituteAllFiles = throw "`substituteAllFiles` has been removed. Use `replaceVars` for each file instead."; # Added 2025-05-23
-  suidChroot = throw "'suidChroot' has been dropped as it was unmaintained, failed to build and had questionable security considerations"; # Added 2025-05-17
-  suitesparse_4_2 = throw "'suitesparse_4_2' has been removed as it was unmaintained upstream"; # Added 2025-05-17
-  suitesparse_4_4 = throw "'suitesparse_4_4' has been removed as it was unmaintained upstream"; # Added 2025-05-17
   sumaclust = throw "'sumaclust' has been removed as it was archived upstream and broken with GCC 14"; # Added 2025-06-14
   sumalibs = throw "'sumalibs' has been removed as it was archived upstream and broken with GCC 14"; # Added 2025-06-14
   sumatra = throw "'sumatra' has been removed as it was archived upstream and broken with GCC 14"; # Added 2025-06-14
   sumneko-lua-language-server = lua-language-server; # Added 2023-02-07
-  sumokoin = throw "sumokoin has been removed as it was abandoned upstream"; # Added 2024-11-23
-  supertag = throw "supertag has been removed as it was abandoned upstream and fails to build"; # Added 2025-04-20
-  suyu = throw "suyu has been removed from nixpkgs, as it is subject to a DMCA takedown"; # Added 2025-05-12
-  swig1 = throw "swig1 has been removed as it is obsolete"; # Added 2024-08-23
-  swig2 = throw "swig2 has been removed as it is obsolete"; # Added 2024-08-23
-  swig3 = throw "swig3 has been removed as it is obsolete"; # Added 2024-11-18
   swig4 = swig; # Added 2024-09-12
-  swigWithJava = throw "swigWithJava has been removed as the main swig package has supported Java since 2009"; # Added 2024-09-12
   swiProlog = lib.warnOnInstantiate "swiProlog has been renamed to swi-prolog" swi-prolog; # Added 2024-09-07
   swiPrologWithGui = lib.warnOnInstantiate "swiPrologWithGui has been renamed to swi-prolog-gui" swi-prolog-gui; # Added 2024-09-07
-  swt_jdk8 = throw "'swt_jdk8' has been removed due to being unused and broken for a long time"; # Added 2025-01-07
-  swtpm-tpm2 = throw "'swtpm-tpm2' has been renamed to/replaced by 'swtpm'"; # Converted to throw 2024-10-17
   Sylk = sylk; # Added 2024-06-12
   symbiyosys = sby; # Added 2024-08-18
   syn2mas = throw "'syn2mas' has been removed. It has been integrated into the main matrix-authentication-service CLI as a subcommand: 'mas-cli syn2mas'."; # Added 2025-07-07
   sync = taler-sync; # Added 2024-09-04
   syncall = throw "'syncall' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
-  syncthing-cli = throw "'syncthing-cli' has been renamed to/replaced by 'syncthing'"; # Converted to throw 2024-10-17
-  syncthing-tray = throw "syncthing-tray has been removed because it is broken and unmaintained"; # Added 2025-05-18
   syncthingtray-qt6 = syncthingtray; # Added 2024-03-06
   syndicate_utils = throw "'syndicate_utils' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   t1lib = throw "'t1lib' has been removed as it was broken and unmaintained upstream."; # Added 2025-06-11
-  tabula = throw "tabula has been removed from nixpkgs, as it was broken"; # Added 2024-07-15
-  tailor = throw "'tailor' has been removed from nixpkgs, as it was unmaintained upstream."; # Added 2024-11-02
   tamgamp.lv2 = tamgamp-lv2; # Added 2025-09-27
-  tangogps = throw "'tangogps' has been renamed to/replaced by 'foxtrotgps'"; # Converted to throw 2024-10-17
   taplo-cli = taplo; # Added 2022-07-30
   taplo-lsp = taplo; # Added 2022-07-30
   targetcli = targetcli-fb; # Added 2025-03-14
@@ -2233,73 +1399,40 @@ mapAliases {
   tcludp = tclPackages.tcludp; # Added 2024-10-02
   tclvfs = tclPackages.tclvfs; # Added 2024-10-02
   tclx = tclPackages.tclx; # Added 2024-10-02
-  tcp-cutter = throw "tcp-cutter has been removed because it fails to compile and the source url is dead"; # Added 2025-05-25
   tdesktop = telegram-desktop; # Added 2023-04-07
   tdlib-purple = pidginPackages.tdlib-purple; # Added 2023-07-17
   tdom = tclPackages.tdom; # Added 2024-10-02
   teamspeak5_client = teamspeak6-client; # Added 2025-01-29
   teamspeak_client = teamspeak3; # Added 2024-11-07
-  teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # Added 2024-08-23
   tegaki-zinnia-japanese = throw "'tegaki-zinnia-japanese' has been removed due to lack of maintenance"; # Added 2025-09-10
-  telepathy-gabble = throw "'telepathy-gabble' has been removed as it was unmaintained, unused, broken and used outdated libraries"; # Added 2025-04-20
-  telepathy-logger = throw "'telepathy-logger' has been removed as it was unmaintained, unused and broken"; # Added 2025-04-20
-  teleport_13 = throw "teleport 13 has been removed as it is EOL. Please upgrade to Teleport 14 or later"; # Added 2024-05-26
-  teleport_14 = throw "teleport 14 has been removed as it is EOL. Please upgrade to Teleport 15 or later"; # Added 2024-10-18
-  teleport_15 = throw "teleport 15 has been removed as it is EOL. Please upgrade to Teleport 16 or later"; # Added 2025-03-28
   temporalite = throw "'temporalite' has been removed as it is obsolete and unmaintained, please use 'temporal-cli' instead (with `temporal server start-dev`)"; # Added 2025-06-26
-  temurin-bin-16 = throw "Temurin 16 has been removed as it has reached its end of life"; # Added 2024-08-01
-  temurin-bin-18 = throw "Temurin 18 has been removed as it has reached its end of life"; # Added 2024-08-01
-  temurin-bin-19 = throw "Temurin 19 has been removed as it has reached its end of life"; # Added 2024-08-01
-  temurin-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01
-  temurin-bin-22 = throw "Temurin 22 has been removed as it has reached its end of life"; # Added 2024-09-24
   temurin-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04
-  temurin-jre-bin-18 = throw "Temurin 18 has been removed as it has reached its end of life"; # Added 2024-08-01
-  temurin-jre-bin-19 = throw "Temurin 19 has been removed as it has reached its end of life"; # Added 2024-08-01
-  temurin-jre-bin-20 = throw "Temurin 20 has been removed as it has reached its end of life"; # Added 2024-08-01
-  temurin-jre-bin-22 = throw "Temurin 22 has been removed as it has reached its end of life"; # Added 2024-09-24
   temurin-jre-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04
   tepl = libgedit-tepl; # Added 2024-04-29
   terminus-nerdfont = lib.warnOnInstantiate "terminus-nerdfont is redundant. Use nerd-fonts.terminess-ttf instead." nerd-fonts.terminess-ttf; # Added 2024-11-10
-  termplay = throw "'termplay' has been removed due to lack of maintenance upstream"; # Added 2025-01-25
   testVersion = testers.testVersion; # Added 2022-04-20
   tet = throw "'tet' has been removed for lack of maintenance"; # Added 2025-10-12
-  tex-match = throw "'tex-match' has been removed due to lack of maintenance upstream. Consider using 'hieroglyphic' instead"; # Added 2024-09-24
   texinfo4 = throw "'texinfo4' has been removed in favor of the latest version"; # Added 2025-06-08
-  texinfo5 = throw "'texinfo5' has been removed from nixpkgs"; # Added 2024-09-10
   textual-paint = throw "'textual-paint' has been removed as it is broken"; # Added 2025-09-10
   tezos-rust-libs = throw "ligo has been removed from nixpkgs for lack of maintainance"; # Added 2025-06-03
   tfplugindocs = terraform-plugin-docs; # Added 2023-11-01
-  thefuck = throw "'thefuck' has been removed due to lack of maintenance upstream and incompatible with python 3.12+. Consider using 'pay-respects' instead"; # Added 2025-05-30
   theLoungePlugins = throw "'theLoungePlugins' has been removed due to only containing throws"; # Added 2025-09-25
-  thiefmd = throw "'thiefmd' has been removed due to lack of maintenance upstream and incompatible with newer Pandoc. Please use 'apostrophe' or 'folio' instead"; # Added 2025-02-20
   thrust = throw "'thrust' has been removed due to lack of maintenance"; # Added 2025-08-21
   thunderbird-128 = throw "Thunderbird 128 support ended in August 2025"; # Added 2025-09-30
   thunderbird-128-unwrapped = throw "Thunderbird 128 support ended in August 2025"; # Added 2025-09-30
   ticpp = throw "'ticpp' has been removed due to being unmaintained"; # Added 2025-09-10
-  tightvnc = throw "'tightvnc' has been removed as the version 1.3 is not maintained upstream anymore and is insecure"; # Added 2024-08-22
-  tijolo = throw "'tijolo' has been removed due to being unmaintained"; # Added 2024-12-27
-  timelens = throw "'timelens' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  timescale-prometheus = throw "'timescale-prometheus' has been renamed to/replaced by 'promscale'"; # Converted to throw 2024-10-17
   timescaledb = throw "'timescaledb' has been removed. Use 'postgresqlPackages.timescaledb' instead."; # Added 2025-07-19
   tinyxml2 = throw "The 'tinyxml2' alias has been removed, use 'tinyxml' for https://sourceforge.net/projects/tinyxml/ or 'tinyxml-2' for https://github.com/leethomason/tinyxml2"; # Added 2025-10-11
   tix = tclPackages.tix; # Added 2024-10-02
   tkcvs = tkrev; # Added 2022-03-07
-  tkgate = throw "'tkgate' has been removed as it is unmaintained"; # Added 2025-05-17
   tkimg = tclPackages.tkimg; # Added 2024-10-02
   tlaplusToolbox = tlaplus-toolbox; # Added 2025-08-21
-  todiff = throw "'todiff' was removed due to lack of known users"; # Added 2025-01-25
-  toil = throw "toil was removed as it was broken and requires obsolete versions of libraries"; # Added 2024-09-22
   tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28
   tomcat_connectors = apacheHttpdPackages.mod_jk; # Added 2024-06-07
-  ton = throw "'ton' has been removed as there were insufficient maintainer resources to keep up with updates"; # Added 2025-04-27
   tooling-language-server = deputy; # Added 2025-06-22
   tor-browser-bundle-bin = tor-browser; # Added 2023-09-23
-  torq = throw "torq has been removed because the project went closed source"; # Added 2024-11-24
-  torrenttools = throw "torrenttools has been removed due to lack of maintanance upstream"; # Added 2025-04-06
-  torzu = throw "torzu has been removed from nixpkgs, as it is subject to a DMCA takedown"; # Added 2025-05-12
   tracker = lib.warnOnInstantiate "tracker has been renamed to tinysparql" tinysparql; # Added 2024-09-30
   tracker-miners = lib.warnOnInstantiate "tracker-miners has been renamed to localsearch" localsearch; # Added 2024-09-30
-  transcode = throw "transcode has been removed as it is unmaintained"; # Added 2024-12-11
   transfig = fig2dev; # Added 2022-02-15
   transifex-client = transifex-cli; # Added 2023-12-29
   transmission = lib.warnOnInstantiate (transmission3Warning { }) transmission_3; # Added 2024-06-10
@@ -2309,16 +1442,13 @@ mapAliases {
   transmission-qt = lib.warnOnInstantiate (transmission3Warning {
     suffix = "-qt";
   }) transmission_3-qt; # Added 2024-06-10
-  treefmt1 = throw "treefmt1 has been removed as it is not maintained anymore. Consider using `treefmt` instead."; # 2025-03-06
   treefmt2 = lib.warnOnInstantiate "treefmt2 has been renamed to treefmt" treefmt; # 2025-03-06
   trenchbroom = throw "trenchbroom was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   trezor_agent = trezor-agent; # Added 2024-01-07
-  trfl = throw "trfl has been removed, because it has not received an update for 3 years and was broken"; # Added 2024-07-25
   trilium-next-desktop = trilium-desktop; # Added 2025-08-30
   trilium-next-server = trilium-server; # Added 2025-08-30
   trojita = throw "'trojita' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20
   trust-dns = hickory-dns; # Added 2024-08-07
-  tsearch_extras = throw "'tsearch_extras' has been removed from nixpkgs"; # Added 2024-12-15
   tt-rss = throw "'tt-rss' has been removed, as it was discontinued on 2025-11-01"; # Added 2025-10-03
   tt-rss-plugin-auth-ldap = throw "'tt-rss-plugin-auth-ldap' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
   tt-rss-plugin-data-migration = throw "'tt-rss-plugin-data-migration' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
@@ -2326,60 +1456,19 @@ mapAliases {
   tt-rss-plugin-feedly = throw "'tt-rss-plugin-feedly' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
   tt-rss-plugin-ff-instagram = throw "'tt-rss-plugin-ff-instagram' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
   tt-rss-plugin-freshapi = throw "'tt-rss-plugin-freshapi' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
-  ttyrec = throw "'ttyrec' has been renamed to/replaced by 'ovh-ttyrec'"; # Converted to throw 2024-10-17
-  tuic = throw "`tuic` has been removed due to lack of upstream maintenance, consider using other tuic implementations"; # Added 2025-02-08
-  tumpa = throw "tumpa has been removed, as it is broken"; # Added 2024-07-15
-  turbogit = throw "turbogit has been removed as it is unmaintained upstream and depends on an insecure version of libgit2"; # Added 2024-08-25
   tvbrowser-bin = tvbrowser; # Added 2023-03-02
-  tvheadend = throw "tvheadend has been removed as it nobody was willing to maintain it and it was stuck on an unmaintained version that required FFmpeg 4. If you are interested in maintaining a newer version, please see https://github.com/NixOS/nixpkgs/pull/332259."; # Added 2024-08-21
   typst-fmt = typstfmt; # Added 2023-07-15
-  typst-lsp = throw "'typst-lsp' has been removed due to lack of upstream maintenance, consider using 'tinymist' instead"; # Added 2025-01-25
-  typst-preview = throw "The features of 'typst-preview' have been consolidated to 'tinymist', an all-in-one language server for typst"; # Added 2024-07-07
   uade123 = uade; # Added 2022-07-30
   uae = throw "'uae' has been removed due to lack of upstream maintenance. Consider using 'fsuae' instead."; # Added 2025-06-11
-  uberwriter = throw "'uberwriter' has been renamed to/replaced by 'apostrophe'"; # Converted to throw 2024-10-17
-  ubootBeagleboneBlack = throw "'ubootBeagleboneBlack' has been renamed to/replaced by 'ubootAmx335xEVM'"; # Converted to throw 2024-10-17
   ubuntu_font_family = ubuntu-classic; # Added 2024-02-19
   uclibc = uclibc-ng; # Added 2022-06-16
-  unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17
-  unicorn-emu = throw "'unicorn-emu' has been renamed to/replaced by 'unicorn'"; # Converted to throw 2024-10-17
-  uniffi-bindgen = throw "uniffi-bindgen has been removed since upstream no longer provides a standalone package for the CLI"; # Added 2023-05-27
-  unifi5 = throw "'unifi5' has been removed since its required MongoDB version is EOL."; # Added 2024-04-11
-  unifi6 = throw "'unifi6' has been removed since its required MongoDB version is EOL."; # Added 2024-04-11
-  unifi7 = throw "'unifi7' has been removed since it is vulnerable to CVE-2024-42025 and its required MongoDB version is EOL."; # Added 2024-10-01
-  unifi8 = throw "'unifi8' has been removed. Use `pkgs.unifi` instead."; # Converted to throw 2025-05-10
   unifi-poller = unpoller; # Added 2022-11-24
-  unifi-video = throw "unifi-video has been removed as it has been unsupported upstream since 2021"; # Added 2024-10-01
-  unifiLTS = throw "'unifiLTS' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Added 2024-04-11
-  unifiStable = throw "'unifiStable' has been removed since UniFi no longer has LTS and stable releases. Use `pkgs.unifi` instead."; # Converted to throw 2024-04-11
-  unl0kr = throw "'unl0kr' is now included with buffybox. Use `pkgs.buffybox` instead."; # Removed 2024-12-20
-  untrunc = throw "'untrunc' has been renamed to/replaced by 'untrunc-anthwlock'"; # Converted to throw 2024-10-17
-  unzoo = throw "'unzoo' has been removed since it is unmaintained upstream and doesn't compile with newer versions of GCC anymore"; # Removed 2025-05-24
-  uq = throw "'uq' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  urxvt_autocomplete_all_the_things = throw "'urxvt_autocomplete_all_the_things' has been renamed to/replaced by 'rxvt-unicode-plugins.autocomplete-all-the-things'"; # Converted to throw 2024-10-17
-  urxvt_bidi = throw "'urxvt_bidi' has been renamed to/replaced by 'rxvt-unicode-plugins.bidi'"; # Converted to throw 2024-10-17
-  urxvt_font_size = throw "'urxvt_font_size' has been renamed to/replaced by 'rxvt-unicode-plugins.font-size'"; # Converted to throw 2024-10-17
-  urxvt_perl = throw "'urxvt_perl' has been renamed to/replaced by 'rxvt-unicode-plugins.perl'"; # Converted to throw 2024-10-17
-  urxvt_perls = throw "'urxvt_perls' has been renamed to/replaced by 'rxvt-unicode-plugins.perls'"; # Converted to throw 2024-10-17
-  urxvt_tabbedex = throw "'urxvt_tabbedex' has been renamed to/replaced by 'rxvt-unicode-plugins.tabbedex'"; # Converted to throw 2024-10-17
-  urxvt_theme_switch = throw "'urxvt_theme_switch' has been renamed to/replaced by 'rxvt-unicode-plugins.theme-switch'"; # Converted to throw 2024-10-17
-  urxvt_vtwheel = throw "'urxvt_vtwheel' has been renamed to/replaced by 'rxvt-unicode-plugins.vtwheel'"; # Converted to throw 2024-10-17
-  ut2004demo = throw "UT2004 requires libstdc++5 which is not supported by nixpkgs anymore"; # Added 2024-11-24
-  ut2004Packages = throw "UT2004 requires libstdc++5 which is not supported by nixpkgs anymore"; # Added 2024-11-24
   util-linuxCurses = util-linux; # Added 2022-04-12
   utillinux = util-linux; # Added 2020-11-24
-  v8 = throw "`v8` has been removed as it's unmaintained for several years and has vulnerabilites. Please migrate to `nodejs.libv8`"; # Added 2024-12-21
   vaapiIntel = intel-vaapi-driver; # Added 2023-05-31
   vaapiVdpau = libva-vdpau-driver; # Added 2024-06-05
-  validphys2 = throw "validphys2 has been removed, since it has a broken dependency that was removed"; # Added 2024-08-21
   valum = throw "'valum' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   vamp.vampSDK = vamp-plugin-sdk; # Added 2020-03-26
-  varnish74 = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31
-  varnish74Packages = throw "varnish 7.4 is EOL. Either use the LTS or upgrade."; # Added 2024-10-31
-  varnish75 = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 2025-03-29
-  varnish75Packages = throw "varnish 7.5 is EOL. Either use the LTS or upgrade."; # Added 2025-03-29
-  varnish76 = throw "varnish 7.6 is EOL. Either use the LTS or upgrade."; # Added 2025-05-15
-  varnish76Packages = throw "varnish 7.6 is EOL. Either use the LTS or upgrade."; # Added 2025-05-15
   vaultwarden-vault = vaultwarden.webvault; # Added 2022-12-13
   vbetool = throw "'vbetool' has been removed as it is broken and not maintained upstream."; # Added 2025-06-11
   vc_0_7 = throw "'vc_0_7' has been removed as it was broken, unused in nixpkgs and unmaintained"; # Added 2025-10-20
@@ -2392,139 +1481,68 @@ mapAliases {
   ViennaRNA = viennarna; # Added 2023-08-23
   vim_configurable = vim-full; # Added 2022-12-04
   vimHugeX = vim-full; # Added 2022-12-04
-  vimix-cursor-theme = throw "'vimix-cursor-theme' has been superseded by 'vimix-cursors'"; # Added 2025-03-04
-  vinagre = throw "'vinagre' has been removed as it has been archived upstream. Consider using 'gnome-connections' or 'remmina' instead"; # Added 2024-09-14
-  viper4linux = throw "'viper4linux' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
-  viper4linux-gui = throw "'viper4linux-gui' was removed as it is broken and not maintained upstream"; # Added 2024-12-16
   virt-manager-qt = throw "'virt-manager-qt' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20
   virtkey = throw "'virtkey' has been removed, as it was unmaintained, abandoned upstream, and relied on gtk2."; # Added 2025-10-12
-  virtscreen = throw "'virtscreen' has been removed, as it was broken and unmaintained"; # Added 2024-10-17
   vistafonts = vista-fonts; # Added 2025-02-03
   vistafonts-chs = vista-fonts-chs; # Added 2025-02-03
   vistafonts-cht = vista-fonts-cht; # Added 2025-02-03
   vkBasalt = vkbasalt; # Added 2022-11-22
   vkdt-wayland = vkdt; # Added 2024-04-19
-  vmware-horizon-client = throw "'vmware-horizon-client' has been renamed to 'omnissa-horizon-client'"; # Added 2025-04-24
-  vocal = throw "'vocal' has been archived upstream. Consider using 'gnome-podcasts' or 'kasts' instead."; # Added 2025-04-12
-  void = throw "'void' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   volk_2 = throw "'volk_2' has been removed after not being used by any package for a long time"; # Added 2025-10-25
-  volnoti = throw "'volnoti' has been removed due to lack of maintenance upstream."; # Added 2024-12-04
   voxelands = throw "'voxelands' has been removed due to lack of upstream maintenance"; # Added 2025-08-30
   vtk_9 = lib.warnOnInstantiate "'vtk_9' has been renamed to 'vtk_9_5'" vtk_9_5; # Added 2025-07-18
   vtk_9_egl = lib.warnOnInstantiate "'vtk_9_5' now build with egl support by default, so `vtk_9_egl` is deprecated, consider using 'vtk_9_5' instead." vtk_9_5; # Added 2025-07-18
   vtk_9_withQt5 = throw "'vtk_9_withQt5' has been removed, Consider using 'vtkWithQt6' instead."; # Added 2025-07-18
   vtkWithQt5 = throw "'vtkWithQt5' has been removed. Consider using 'vtkWithQt6' instead."; # Added 2025-09-06
-  vuze = throw "'vuze' was removed because it is unmaintained upstream and insecure (CVE-2018-13417). BiglyBT is a maintained fork."; # Added 2024-11-22
-  vwm = throw "'vwm' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
   w_scan = throw "'w_scan' has been removed due to lack of upstream maintenance"; # Added 2025-08-29
   waitron = throw "'waitron' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   wakatime = wakatime-cli; # 2024-05-30
-  wal_e = throw "wal_e was removed as it is unmaintained upstream and depends on the removed boto package; upstream recommends using wal-g or pgbackrest"; # Added 2024-09-22
   wapp = tclPackages.wapp; # Added 2024-10-02
   warsow = throw "'warsow' has been removed as it is unmaintained and is broken"; # Added 2025-10-09
   warsow-engine = throw "'warsow-engine' has been removed as it is unmaintained and is broken"; # Added 2025-10-09
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_104;
-  watershot = throw "'watershot' has been removed as it is unmaintained upstream and no longer works"; # Added 2025-06-01
   wavebox = throw "'wavebox' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-24
   wavm = throw "wavm has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
-  waypoint = throw "waypoint has been removed from nixpkgs as the upstream project was archived"; # Added 2024-04-24
   wcurl = throw "'wcurl' has been removed due to being bundled with 'curl'"; # Added 2025-07-04
   wdomirror = throw "'wdomirror' has been removed as it is unmaintained upstream, Consider using 'wl-mirror' instead"; # Added 2025-09-04
   webfontkitgenerator = webfont-bundler; # Added 2025-07-27
   webkitgtk = throw "'webkitgtk' attribute has been removed from nixpkgs, use attribute with ABI version set explicitly"; # Added 2025-06-11
   webkitgtk_4_0 = throw "'webkitgtk_4_0' has been removed, port to `libsoup_3` and switch to `webkitgtk_4_1`"; # Added 2025-10-08
-  webmetro = throw "'webmetro' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
-  wg-bond = throw "'wg-bond' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   whatsapp-for-linux = wasistlos; # Added 2025-01-30
   wifi-password = throw "'wifi-password' has been removed as it was unmaintained upstream"; # Added 2025-08-29
   win-pvdrivers = throw "'win-pvdrivers' has been removed as it was subject to the Xen build machine compromise (XSN-01) and has open security vulnerabilities (XSA-468)"; # Added 2025-08-29
   win-virtio = virtio-win; # Added 2023-10-17
   wineWayland = wine-wayland; # Added 2022-01-03
   winhelpcgi = throw "'winhelpcgi' has been removed as it was unmaintained upstream and broken with GCC 14"; # Added 2025-06-14
-  wireguard-vanity-address = throw "'wireguard-vanity-address' has been removed due to lack of upstream maintenance"; # Added 2025-01-26
   wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17
-  wlroots_0_16 = throw "'wlroots_0_16' has been removed in favor of newer versions"; # Added 2024-07-14
   wmii_hg = wmii; # Added 2022-04-26
   woof = throw "'woof' has been removed as it is broken and unmaintained upstream"; # Added 2025-09-04
-  wordpress6_3 = throw "'wordpress6_3' has been removed in favor of the latest version"; # Added 2024-08-03
-  wordpress6_4 = throw "'wordpress6_4' has been removed in favor of the latest version"; # Added 2024-08-03
-  wordpress6_5 = throw "'wordpress_6_5' has been removed in favor of the latest version"; # Added 2024-11-11
-  wordpress_6_5 = throw "'wordpress_6_5' has been removed in favor of the latest version"; # Added 2024-11-11
-  wordpress_6_6 = throw "'wordpress_6_6' has been removed in favor of the latest version"; # Added 2024-11-17
   worldengine-cli = throw "'worldengine-cli' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
   wpa_supplicant_ro_ssids = lib.warnOnInstantiate "Deprecated package: Please use wpa_supplicant instead. Read-only SSID patches are now upstream!" wpa_supplicant; # Added 2024-07-28
   wrapGAppsHook = wrapGAppsHook3; # Added 2024-03-26
-  wrapLisp_old = throw "Lisp packages have been redesigned. See 'lisp-modules' in the nixpkgs manual."; # Added 2024-05-07
   write_stylus = styluslabs-write-bin; # Added 2024-10-09
   wxGTK33 = wxwidgets_3_3; # Added 2025-07-20
-  x11idle = throw "'x11idle' has been removed as the upstream is no longer available. Please see 'xprintidle' as an alternative"; # Added 2025-03-10
-  x509-limbo = throw "'x509-limbo' has been removed from nixpkgs"; # Added 2024-10-22
-  xarchive = throw "'xarchive' has been removed due to lack of maintenance upstream. Consider using 'file-roller' instead"; # Added 2024-10-19
-  xbmc-retroarch-advanced-launchers = throw "'xbmc-retroarch-advanced-launchers' has been renamed to/replaced by 'kodi-retroarch-advanced-launchers'"; # Converted to throw 2024-10-17
-  xboxdrv = throw "'xboxdrv' has been dropped as it has been superseded by an in-tree kernel driver"; # Added 2024-12-25
   xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28
   xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12
-  xdg_utils = throw "'xdg_utils' has been renamed to/replaced by 'xdg-utils'"; # Converted to throw 2024-10-17
   xdragon = dragon-drop; # Added 2025-03-22
-  xen-light = throw "'xen-light' has been renamed to/replaced by 'xen-slim'"; # Added 2024-06-30
-  xen-slim = throw "'xen-slim' has been renamed to 'xen'. The old Xen package with built-in components no longer exists"; # Added 2024-10-05
-  xen_4_16 = throw "While Xen 4.16 was still security-supported when it was removed from Nixpkgs, it would have reached its End of Life a couple of days after NixOS 24.11 released. To avoid shipping an insecure version of Xen, the Xen Project Hypervisor Maintenance Team decided to delete the derivation entirely"; # Added 2024-10-05
-  xen_4_17 = throw "Due to technical challenges involving building older versions of Xen with newer dependencies, the Xen Project Hypervisor Maintenance Team decided to switch to a latest-only support cycle. As Xen 4.17 would have been the 'n-2' version, it was removed"; # Added 2024-10-05
-  xen_4_18 = throw "Due to technical challenges involving building older versions of Xen with newer dependencies, the Xen Project Hypervisor Maintenance Team decided to switch to a latest-only support cycle. As Xen 4.18 would have been the 'n-1' version, it was removed"; # Added 2024-10-05
-  xen_4_19 = throw "Use 'xen' instead"; # Added 2024-10-05
-  xenPackages = throw "The attributes in the xenPackages set have been promoted to the top-level. (xenPackages.xen_4_19 -> xen)"; # Added 2024-10-05
   xflux = throw "'xflux' has been removed as it was unmaintained"; # Added 2025-08-22
   xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22
-  xineLib = throw "'xineLib' has been renamed to/replaced by 'xine-lib'"; # Converted to throw 2024-10-17
-  xineUI = throw "'xineUI' has been renamed to/replaced by 'xine-ui'"; # Converted to throw 2024-10-17
   xinput_calibrator = xinput-calibrator; # Added 2025-08-28
   xjump = throw "'xjump' has been removed as it is unmaintained"; # Added 2025-08-22
-  xlsxgrep = throw "'xlsxgrep' has been dropped due to lack of maintenance."; # Added 2024-11-01
-  xmake-core-sv = throw "'xmake-core-sv' has been removed, use 'libsv' instead"; # Added 2024-10-10
   xmlada = gnatPackages.xmlada; # Added 2024-02-25
-  xmlroff = throw "'xmlroff' has been removed as it is unmaintained and broken"; # Added 2025-05-18
-  xmr-stak = throw "xmr-stak has been removed from nixpkgs because it was broken"; # Added 2024-07-15
   xo = throw "Use 'dbtpl' instead of 'xo'"; # Added 2025-09-28
   xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18
   xorg-autoconf = util-macros; # Added 2025-08-18
-  xournal = throw "'xournal' has been removed due to lack of activity upstream and depending on gnome2. Consider using 'xournalpp' instead."; # Added 2024-12-06
-  xplayer = throw "xplayer has been removed as the upstream project was archived"; # Added 2024-12-27
-  xprite-editor = throw "'xprite-editor' has been removed due to lack of maintenance upstream. Consider using 'pablodraw' or 'aseprite' instead"; # Added 2024-09-14
-  xsd = throw "'xsd' has been removed."; # Added 2025-04-02
-  xsv = throw "'xsv' has been removed due to lack of upstream maintenance. Please see 'xan' for a maintained alternative"; # Added 2025-01-30
   xsw = throw "'xsw' has been removed due to lack of upstream maintenance"; # Added 2025-08-22
-  xtrlock-pam = throw "xtrlock-pam has been removed because it is unmaintained for 10 years and doesn't support Python 3.10 or newer"; # Added 2025-01-25
   xulrunner = firefox-unwrapped; # Added 2023-11-03
-  xvfb_run = throw "'xvfb_run' has been renamed to/replaced by 'xvfb-run'"; # Converted to throw 2024-10-17
-  xxv = throw "'xxv' has been removed due to lack of upstream maintenance"; # Added 2025-01-25
   yabar = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10
   yabar-unstable = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10
-  yacc = throw "'yacc' has been renamed to/replaced by 'bison'"; # Converted to throw 2024-10-17
   yafaray-core = libyafaray; # Added 2022-09-23
   yaml-cpp_0_3 = throw "yaml-cpp_0_3 has been removed, as it was unused"; # Added 2025-09-16
   yamlpath = throw "'yamlpath' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
-  yandex-browser = throw "'yandex-browser' has been removed, as it was broken and unmaintained"; # Added 2025-04-17
-  yandex-browser-beta = throw "'yandex-browser-beta' has been removed, as it was broken and unmaintained"; # Added 2025-04-17
-  yandex-browser-corporate = throw "'yandex-browser-corporate' has been removed, as it was broken and unmaintained"; # Added 2025-04-17
   yeahwm = throw "'yeahwm' has been removed, as it was broken and unmaintained upstream."; # Added 2025-06-12
-  yesplaymusic = throw "YesPlayMusic has been removed as it was broken, unmaintained, and used deprecated Node and Electron versions"; # Added 2024-12-13
-  youtrack_2022_3 = throw "'youtrack_2022_3' has been removed as it was deprecated. Please update to the 'youtrack' package."; # Added 2024-10-17
-  yrd = throw "'yrd' has been removed, as it was broken and unmaintained"; # added 2024-05-27
   yubikey-manager-qt = throw "'yubikey-manager-qt' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07
   yubikey-personalization-gui = throw "'yubikey-personalization-gui' has been removed due to being archived upstream. Consider using 'yubioath-flutter' instead."; # Added 2025-06-07
-  yuzu = throw "yuzu has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
-  yuzu-ea = throw "yuzu-ea has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
-  yuzu-early-access = throw "yuzu-early-access has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
-  yuzu-mainline = throw "yuzu-mainline has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
-  yuzuPackages = throw "yuzuPackages has been removed from nixpkgs, as it has been taken down upstream"; # Added 2024-03-04
-  z3_4_8 = throw "'z3_4_8' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
-  z3_4_8_5 = throw "'z3_4_8_5' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
-  z3_4_11 = throw "'z3_4_11' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
-  z3_4_12 = throw "'z3_4_12' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
-  z3_4_13 = throw "'z3_4_13' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
-  z3_4_14 = throw "'z3_4_14' has been removed in favour of the latest version. Use 'z3'."; # Added 2025-05-18
-  zabbix50 = throw "'zabbix50' has been removed, it would have reached its End of Life a few days after the release of NixOS 25.05. Consider upgrading to 'zabbix60' or 'zabbix70'."; # Added 2025-04-22
-  zabbix64 = throw "'zabbix64' has been removed because it reached its End of Life. Consider upgrading to 'zabbix70'."; # Added 2025-04-22
   zandronum-alpha = throw "'zandronum-alpha' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19
   zandronum-alpha-server = throw "'zandronum-alpha-server' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19
   zbackup = throw "'zbackup' has been removed due to being unmaintained upstream"; # Added 2025-08-22
@@ -2534,28 +1552,18 @@ mapAliases {
   zeroadPackages.zeroad-data = lib.warnOnInstantiate "'zeroadPackages.zeroad-data' has been renamed to 'zeroad-data'" zeroad-data; # Added 2025-03-22
   zeroadPackages.zeroad-unwrapped = lib.warnOnInstantiate "'zeroadPackages.zeroad-unwrapped' has been renamed to 'zeroad-unwrapped'" zeroad-unwrapped; # Added 2025-03-22
   zeromq4 = zeromq; # Added 2024-11-03
-  zfs_2_1 = throw "zfs 2.1 has been removed as it is EOL. Please upgrade to a newer version"; # Added 2024-12-25
   zfsStable = zfs; # Added 2024-02-26
   zfsUnstable = zfs_unstable; # Added 2024-02-26
-  zig_0_9 = throw "zig 0.9 has been removed, upgrade to a newer version instead"; # Added 2025-01-24
-  zig_0_10 = throw "zig 0.10 has been removed, upgrade to a newer version instead"; # Added 2025-01-24
-  zig_0_11 = throw "zig 0.11 has been removed, upgrade to a newer version instead"; # Added 2025-04-09
   zig_0_12 = throw "zig 0.12 has been removed, upgrade to a newer version instead"; # Added 2025-08-18
   zigbee2mqtt_1 = throw "Zigbee2MQTT 1.x has been removed, upgrade to the unversioned attribute."; # Added 2025-08-11
   zigbee2mqtt_2 = zigbee2mqtt; # Added 2025-08-11
-  zimlib = throw "'zimlib' has been removed because it was an outdated and unused version of 'libzim'"; # Added 2025-03-07
   zinc = zincsearch; # Added 2023-05-28
   zint = zint-qt; # Added 2025-05-15
-  zk-shell = throw "zk-shell has been removed as it was broken and unmaintained"; # Added 2024-08-10
-  zkg = throw "'zkg' has been replaced by 'zeek'"; # Added 2023-10-20
   zombietrackergps = throw "'zombietrackergps' has been dropped, as it depends on KDE Gear 5 and is unmaintained"; # Added 2025-08-20
   zotify = throw "zotify has been removed due to lack of upstream maintenance"; # Added 2025-09-26
-  zplugin = throw "'zplugin' has been renamed to/replaced by 'zinit'"; # Converted to throw 2024-10-17
   zq = throw "zq has been replaced by zed"; # Converted to throw 2025-10-26
   zsh-git-prompt = throw "zsh-git-prompt was removed as it is unmaintained upstream"; # Added 2025-08-28
-  zsh-history = throw "'zsh-history' has been removed as it was unmaintained"; # Added 2025-04-17
   zyn-fusion = zynaddsubfx; # Added 2022-08-05
-  zz = throw "'zz' has been removed because it was archived in 2022 and had no maintainer"; # added 2024-05-10
   # keep-sorted end
 }
 // plasma5Throws

From b79ba4866d521fe17e13dbb883df1e10c2f58f31 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 27 Oct 2025 18:46:34 +0000
Subject: [PATCH 3494/6226] aliases: drop `rke2_testing`

This was already a `throw` in the 25.05 release tag.
---
 pkgs/top-level/aliases.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 23524c6da2a8..8977ae66ea29 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1266,7 +1266,6 @@ mapAliases {
   rewind-ai = throw "'rewind-ai' has been removed due to lack of of maintenance upstream"; # Added 2025-08-03
   rigsofrods = rigsofrods-bin; # Added 2023-03-22
   river = throw "'river' has been renamed to/replaced by 'river-classic'"; # Added 2025-08-30
-  rke2_testing = throw "'rke2_testing' has been removed from nixpkgs as the RKE2 testing channel no longer serves releases"; # Added 2025-06-02
   rl_json = tclPackages.rl_json; # Added 2025-05-03
   rockbox_utility = rockbox-utility; # Added 2022-03-17
   rockcraft = throw "rockcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # added 2025-09-18

From 8189d2ce242e7356dea16c9d7bffa50dcfea1224 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 26 Oct 2025 20:55:25 +0000
Subject: [PATCH 3495/6226] aliases: restore prematurely-dropped throws

These were added after the 25.05 tag.
---
 pkgs/top-level/aliases.nix | 55 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 55 insertions(+)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8977ae66ea29..dc8d0da2219e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -270,6 +270,8 @@ mapAliases {
   abseil-cpp_202505 = throw "abseil-cpp_202505 has been removed as it was unused in tree"; # Added 2025-09-15
   adminer-pematon = adminneo; # Added 2025-02-20
   adminerneo = adminneo; # Added 2025-02-27
+  adobe-reader = throw "'adobe-reader' has been removed, as it was broken, outdated and insecure"; # added 2025-05-31
+  afpfs-ng = throw "'afpfs-ng' has been removed as it was broken and unmaintained for 10 years"; # Added 2025-05-17
   akkoma-emoji = lib.warnOnInstantiate "'akkoma-emoji.blobs_gg' has been renamed to 'blobs_gg'" blobs_gg; # Added 2025-03-14
   akkoma-frontends.admin-fe = lib.warnOnInstantiate "'akkoma-frontends.admin-fe' has been renamed to 'akkoma-admin-fe'" akkoma-admin-fe; # Added 2025-03-14
   akkoma-frontends.akkoma-fe = lib.warnOnInstantiate "'akkoma-frontends.akkoma-fe' has been renamed to 'akkoma-fe'" akkoma-fe; # Added 2025-03-14
@@ -303,6 +305,7 @@ mapAliases {
   aseprite-unfree = aseprite; # Added 2023-08-26
   asitop = macpm; # Added 2025-04-14
   asterisk_18 = throw "asterisk_18: Asterisk 18 is end of life and has been removed"; # Added 2025-10-19
+  ats = throw "'ats' has been removed as it is unmaintained for 10 years and broken"; # Added 2025-05-17
   AusweisApp2 = ausweisapp; # Added 2023-11-08
   autoconf213 = throw "'autoconf213' has been removed in favor of 'autoconf'"; # Added 2025-07-21
   autoconf264 = throw "'autoconf264' has been removed in favor of 'autoconf'"; # Added 2025-07-21
@@ -310,8 +313,10 @@ mapAliases {
   autopanosiftc = throw "'autopanosiftc' has been removed, as it is unmaintained upstream"; # Added 2025-10-07
   autoreconfHook264 = throw "'autoreconfHook264' has been removed in favor of 'autoreconfHook'"; # Added 2025-07-21
   av-98 = throw "'av-98' has been removed because it has been broken since at least November 2024."; # Added 2025-10-03
+  avr-sim = throw "'avr-sim' has been removed as it was broken and unmaintained. Possible alternatives are 'simavr', SimulAVR and AVRStudio."; # Added 2025-05-31
   awesome-4-0 = awesome; # Added 2022-05-05
   awf = throw "'awf' has been removed as the upstream project was archived in 2021"; # Added 2025-10-03
+  axmldec = throw "'axmldec' has been removed as it was broken and unmaintained for 8 years"; # Added 2025-05-17
   backlight-auto = throw "'backlight-auto' has been removed as it relies on Zig 0.12 which has been dropped."; # Added 2025-08-22
   badtouch = authoscope; # Added 2021-06-26
   bandwidth = throw "'bandwidth' has been removed due to lack of maintenance"; # Added 2025-09-01
@@ -332,6 +337,7 @@ mapAliases {
   belr = throw "'belr' has been moved to 'linphonePackages.belr'"; # Added 2025-09-20
   bfc = throw "bfc has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
   bindle = throw "bindle has been removed since it is vulnerable to CVE-2025-62518 and upstream has been archived"; # Added 2025-10-24
+  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
   bitmeter = throw "bitmeter has been removed, use `x42-meter 18` from the x42-plugins pkg instead."; # Added 2025-10-03
@@ -353,6 +359,7 @@ mapAliases {
   brogue = lib.warnOnInstantiate "Use 'brogue-ce' instead of 'brogue' for updated releases" brogue-ce; # Added 2025-10-04
   buildBowerComponents = throw "buildBowerComponents has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
   buildGo123Module = throw "Go 1.23 is end-of-life, and 'buildGo123Module' has been removed. Please use a newer builder version."; # Added 2025-08-13
+  buildXenPackage = throw "'buildXenPackage' has been removed as a custom Xen build can now be achieved by simply overriding 'xen'."; # Added 2025-05-12
   bwidget = tclPackages.bwidget; # Added 2024-10-02
   bzrtp = throw "'bzrtp' has been moved to 'linphonePackages.bzrtp'"; # Added 2025-09-20
   calculix = calculix-ccx; # Added 2024-12-18
@@ -394,6 +401,7 @@ mapAliases {
   chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27
   ci-edit = throw "'ci-edit' has been removed due to lack of maintenance upstream"; # Added 2025-08-26
   cinnamon-common = cinnamon; # Added 2025-08-06
+  clamsmtp = throw "'clamsmtp' has been removed as it is unmaintained and broken"; # Added 2025-05-17
   clang12Stdenv = throw "clang12Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   clang13Stdenv = throw "clang13Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   clang14Stdenv = throw "clang14Stdenv has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
@@ -417,6 +425,7 @@ mapAliases {
   clasp = clingo; # added 2022-12-22
   cli-visualizer = throw "'cli-visualizer' has been removed as the upstream repository is gone"; # Added 2025-06-05
   clipbuzz = throw "clipbuzz has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09
+  cloudlogoffline = throw "cloudlogoffline has been removed"; # added 2025-05-18
   cockroachdb-bin = cockroachdb; # 2024-03-15
   code-browser-gtk2 = throw "'code-browser-gtk2' has been removed, as it was broken since 22.11"; # Added 2025-08-22
   code-browser-gtk = throw "'code-browser-gtk' has been removed, as it was broken since 22.11"; # Added 2025-08-22
@@ -428,6 +437,7 @@ mapAliases {
   colorstorm = throw "'colorstorm' has been removed because it was unmaintained in nixpkgs and upstream was rewritten."; # Added 2025-06-15
   conduwuit = throw "'conduwuit' has been removed as the upstream repository has been deleted. Consider migrating to 'matrix-conduit', 'matrix-continuwuity' or 'matrix-tuwunel' instead."; # Added 2025-08-08
   cone = throw "cone has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
+  connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27
   copilot-language-server-fhs = lib.warnOnInstantiate "The package set `copilot-language-server-fhs` has been renamed to `copilot-language-server`." copilot-language-server; # Added 2025-09-07
   copper = throw "'copper' has been removed, as it was broken since 22.11"; # Added 2025-08-22
   cordless = throw "'cordless' has been removed due to being archived upstream. Consider using 'discordo' instead."; # Added 2025-06-07
@@ -460,11 +470,14 @@ mapAliases {
   curlHTTP3 = lib.warnOnInstantiate "'curlHTTP3' has been removed, as 'curl' now has HTTP/3 support enabled by default" curl; # Added 2025-08-22
   cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09
   dale = throw "dale has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
+  daq = throw "'daq' has been removed as it is unmaintained and broken. Snort2 has also been removed, which depended on this"; # Added 2025-05-21
   daytona-bin = throw "'daytona-bin' has been removed, as it was unmaintained in nixpkgs"; # Added 2025-07-21
+  dbench = throw "'dbench' has been removed as it is unmaintained for 14 years and broken"; # Added 2025-05-17
   dbus-sharp-1_0 = throw "'dbus-sharp-1_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
   dbus-sharp-2_0 = throw "'dbus-sharp-2_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
   dbus-sharp-glib-1_0 = throw "'dbus-sharp-glib-1_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
   dbus-sharp-glib-2_0 = throw "'dbus-sharp-glib-2_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
+  dclib = throw "'dclib' has been removed as it is unmaintained for 16 years and broken"; # Added 2025-05-25
   deadpixi-sam = deadpixi-sam-unstable; # Added 2018-05-01
   deepin = throw "the Deepin desktop environment and associated tools have been removed from nixpkgs due to lack of maintenance"; # Added 2025-08-21
   deepsea = throw "deepsea has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
@@ -498,6 +511,7 @@ mapAliases {
   EBTKS = ebtks; # Added 2024-01-21
   ec2-utils = amazon-ec2-utils; # Added 2022-02-01
   edid-decode = v4l-utils; # Added 2025-06-20
+  eidolon = throw "eidolon was removed as it is unmaintained upstream."; # Added 2025-05-28
   eintopf = lauti; # Project was renamed, added 2025-05-01
   elementsd-simplicity = throw "'elementsd-simplicity' has been removed due to lack of maintenance, consider using 'elementsd' instead"; # Added 2025-06-04
   elixir_ls = elixir-ls; # Added 2023-03-20
@@ -593,11 +607,13 @@ mapAliases {
   gfortran11 = throw "gfortran11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gfortran12 = throw "gfortran12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gg = go-graft; # Added 2025-03-07
+  ggobi = throw "'ggobi' has been removed from Nixpkgs, as it is unmaintained and broken"; # Added 2025-05-18
   gimp3 = gimp; # added 2025-10-03
   gimp3-with-plugins = gimp-with-plugins; # added 2025-10-03
   gimp3Plugins = gimpPlugins; # added 2025-10-03
   gitAndTools = throw "gitAndTools has been removed, as the packages are now available at the top level"; # Converted to throw 2025-10-26
   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
   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
   glew-egl = lib.warnOnInstantiate "'glew-egl' is now provided by 'glew' directly" glew; # Added 2024-08-11
@@ -678,6 +694,7 @@ mapAliases {
   inconsolata-nerdfont = lib.warnOnInstantiate "inconsolata-nerdfont is redundant. Use nerd-fonts.inconsolata instead." nerd-fonts.inconsolata; # Added 2024-11-10
   incrtcl = tclPackages.incrtcl; # Added 2024-10-02
   inotifyTools = inotify-tools; # Added 2015-09-01
+  insync-emblem-icons = throw "'insync-emblem-icons' has been removed, use 'insync-nautilus' instead"; # Added 2025-05-14
   invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05
   invoiceplane = throw "'invoiceplane' doesn't support non-EOL PHP versions"; # Added 2025-10-03
   ioccheck = throw "ioccheck was dropped since it was unmaintained."; # Added 2025-07-06
@@ -743,6 +760,7 @@ mapAliases {
   layan-kde = throw "'layan-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   lazarus-qt = lazarus-qt5; # Added 2024-12-25
   ledger_agent = ledger-agent; # Added 2024-01-07
+  lesstif = throw "'lesstif' has been removed due to its being broken and unmaintained upstream. Consider using 'motif' instead."; # Added 2024-06-09
   lfs = dysk; # Added 2023-07-03
   libast = throw "'libast' has been removed due to lack of maintenance upstream."; # Added 2025-06-09
   libayatana-appindicator-gtk3 = libayatana-appindicator; # Added 2022-10-18
@@ -753,6 +771,8 @@ mapAliases {
   libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
   libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
   libdwarf-lite = throw "`libdwarf-lite` has been replaced by `libdwarf` as it's mostly a mirror"; # Added 2025-06-16
+  libfpx = throw "libfpx has been removed as it was unmaintained in Nixpkgs and had known vulnerabilities"; # Added 2025-05-20
+  libgadu = throw "'libgadu' has been removed as upstream is unmaintained and has no dependents or maintainers in Nixpkgs"; # Added 2025-05-17
   libgda = lib.warnOnInstantiate "'libgda' has been renamed to 'libgda5'" libgda5; # Added 2025-01-21
   libgme = game-music-emu; # Added 2022-07-20
   libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22
@@ -762,10 +782,12 @@ mapAliases {
   libkkc = throw "'libkkc' has been removed due to lack of maintenance. Consider using anthy instead"; # added 2025-08-28
   libkkc-data = throw "'libkkc-data' has been removed as it depended on libkkc which was removed"; # Added 2025-08-28
   liblinphone = throw "'liblinphone' has been moved to 'linphonePackages.liblinphone'"; # Added 2025-09-20
+  libmp3splt = throw "'libmp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17
   libmusicbrainz3 = throw "libmusicbrainz3 has been removed as it was obsolete and unused"; # Added 2025-09-16
   libmusicbrainz5 = libmusicbrainz; # Added 2025-09-16
   libosmo-sccp = libosmo-sigtran; # Added 2024-12-20
   libpromhttp = throw "'libpromhttp' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-16
+  libpseudo = throw "'libpseudo' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
   libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20
   libqt5pas = libsForQt5.libqtpas; # Added 2024-12-25
   libquotient = throw "'libquotient' for qt5 was removed as upstream removed qt5 support. Consider explicitly upgrading to qt6 'libquotient'"; # Converted to throw 2025-07-04
@@ -789,6 +811,7 @@ mapAliases {
   libtransmission = lib.warnOnInstantiate (transmission3Warning {
     prefix = "lib";
   }) libtransmission_3; # Added 2024-06-10
+  libviper = throw "'libviper' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
   libwnck3 = libwnck; # Added 2021-06-23
   lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01
   lightly-boehs = throw "'lightly-boehs' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
@@ -963,6 +986,8 @@ mapAliases {
   microcodeIntel = microcode-intel; # Added 2024-09-08
   microsoft_gsl = microsoft-gsl; # Added 2023-05-26
   MIDIVisualizer = midivisualizer; # Added 2024-06-12
+  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
   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 = mailcap; # Added 2022-01-21
@@ -988,6 +1013,7 @@ mapAliases {
   moralerspace-nf = throw "moralerspace-nf has been removed, use moralerspace instead."; # Added 2025-08-30
   morty = throw "morty has been removed, as searxng removed support for it and it was unmaintained."; # Added 2025-09-26
   moz-phab = mozphab; # Added 2022-08-09
+  mp3splt = throw "'mp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17
   mpc-cli = mpc; # Added 2024-10-14
   mpc_cli = mpc; # Added 2024-10-14
   mpdevil = plattenalbum; # Added 2024-05-22
@@ -1050,6 +1076,7 @@ mapAliases {
   nix-direnv-flakes = nix-direnv; # Added 2021-11-09
   nix-ld-rs = nix-ld; # Added 2024-08-17
   nix-linter = throw "nix-linter has been removed as it was broken for 3 years and unmaintained upstream"; # Added 2025-09-06
+  nix-plugin-pijul = throw "nix-plugin-pijul has been removed due to being discontinued"; # added 2025-05-18
   nix_2_3 = throw "'nix_2_3' has been removed, because it was unmaintained and insecure."; # Converted to throw 2025-07-24
   nixfmt-classic =
     (
@@ -1113,6 +1140,7 @@ mapAliases {
   opensyclWithRocm = lib.warnOnInstantiate "'opensyclWithRocm' has been renamed to 'adaptivecppWithRocm'" adaptivecppWithRocm; # Added 2024-12-04
   opentofu-ls = lib.warnOnInstantiate "'opentofu-ls' has been renamed to 'tofu-ls'" tofu-ls; # Added 2025-06-10
   opentracing-cpp = throw "'opentracingc-cpp' has been removed as it was archived upstream in 2024"; # Added 2025-10-19
+  opera = throw "'opera' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-05-19
   orogene = throw "'orogene' uses a wasm-specific fork of async-tar that is vulnerable to CVE-2025-62518, which is not supported by its upstream"; # Added 2025-10-24
   ortp = throw "'ortp' has been moved to 'linphonePackages.ortp'"; # Added 2025-09-20
   OSCAR = oscar; # Added 2024-06-12
@@ -1126,6 +1154,7 @@ mapAliases {
   patchelfStable = patchelf; # Added 2024-01-25
   paup = paup-cli; # Added 2024-09-11
   pcp = throw "'pcp' has been removed because the upstream repo was archived and it hasn't been updated since 2021"; # Added 2025-09-23
+  pcre16 = throw "'pcre16' has been removed because it is obsolete. Consider migrating to 'pcre2' instead."; # Added 2025-05-29
   pcsctools = pcsc-tools; # Added 2023-12-07
   pdf4tcl = tclPackages.pdf4tcl; # Added 2024-10-02
   pds = lib.warnOnInstantiate "'pds' has been renamed to 'bluesky-pds'" bluesky-pds; # Added 2025-08-20
@@ -1173,6 +1202,7 @@ mapAliases {
   plasma-theme-switcher = throw "'plasma-theme-switcher' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   platformioPackages.platformio-chrootenv = platformio-chrootenv; # Added 2025-09-04
   platformioPackages.platformio-core = platformio-core; # Added 2025-09-04
+  plex-media-player = throw "'plex-media-player' has been discontinued, the new official client is available as 'plex-desktop'"; # Added 2025-05-28
   PlistCpp = plistcpp; # Added 2024-01-05
   pltScheme = racket; # Added 2013-02-24
   plv8 = throw "'plv8' has been removed. Use 'postgresqlPackages.plv8' instead."; # Added 2025-07-19
@@ -1180,6 +1210,7 @@ mapAliases {
   poac = cabinpkg; # Added 2025-01-22
   pocket-updater-utility = pupdate; # Added 2024-01-25
   podofo010 = podofo_0_10; # Added 2025-06-01
+  polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18
   polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25
   poppler_utils = poppler-utils; # Added 2025-02-27
   posterazor = throw "posterazor was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
@@ -1195,6 +1226,7 @@ mapAliases {
   pot = throw "'pot' has been removed as it requires libsoup 2.4 which is EOL"; # Added 2025-10-09
   powerdns = pdns; # Added 2022-03-28
   prboom-plus = throw "'prboom-plus' has been removed since it is unmaintained upstream."; # Added 2025-09-14
+  presage = throw "presage has been removed, as it has been unmaintained since 2018"; # Added 2024-03-24
   preserves-nim = throw "'preserves-nim' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   private-gpt = throw "'private-gpt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2025-07-28
   probe-rs = probe-rs-tools; # Added 2024-05-23
@@ -1247,6 +1279,7 @@ mapAliases {
   qtchan = throw "'qtchan' has been removed due to lack of maintenance upstream"; # Added 2025-07-01
   qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12
   quantum-espresso-mpi = quantum-espresso; # Added 2023-11-23
+  quaternion-qt5 = throw "'quaternion-qt5' has been removed as quaternion dropped Qt5 support with v0.0.97.1"; # Added 2025-05-24
   qubes-core-vchan-xen = throw "'qubes-core-vchan-xen' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
   quicksynergy = throw "'quicksynergy' has been removed due to lack of maintenance upstream. Consider using 'deskflow' instead."; # Added 2025-06-18
   qv2ray = throw "'qv2ray' has been removed as it was unmaintained"; # Added 2025-06-03
@@ -1266,6 +1299,7 @@ mapAliases {
   rewind-ai = throw "'rewind-ai' has been removed due to lack of of maintenance upstream"; # Added 2025-08-03
   rigsofrods = rigsofrods-bin; # Added 2023-03-22
   river = throw "'river' has been renamed to/replaced by 'river-classic'"; # Added 2025-08-30
+  rke2_1_29 = throw "'rke2_1_29' has been removed from nixpkgs as it has reached end of life"; # Added 2025-05-05
   rl_json = tclPackages.rl_json; # Added 2025-05-03
   rockbox_utility = rockbox-utility; # Added 2022-03-17
   rockcraft = throw "rockcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # added 2025-09-18
@@ -1295,10 +1329,15 @@ mapAliases {
   scantailor = scantailor-advanced; # Added 2022-05-26
   scitoken-cpp = scitokens-cpp; # Added 2024-02-12
   scudcloud = throw "'scudcloud' has been removed as it was archived by upstream"; # Added 2025-07-24
+  SDL2_classic = throw "'SDL2_classic' has been removed. Consider upgrading to 'sdl2-compat', also available as 'SDL2'."; # Added 2025-05-20
+  SDL2_classic_image = throw "'SDL2_classic_image' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_image' built with 'sdl2-compat'."; # Added 2025-05-20
+  SDL2_classic_mixer = throw "'SDL2_classic_mixer' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_mixer' built with 'sdl2-compat'."; # Added 2025-05-20
+  SDL2_classic_ttf = throw "'SDL2_classic_ttf' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_ttf' built with 'sdl2-compat'."; # Added 2025-05-20
   seafile-server = throw "'seafile-server' has been removed as it is unmaintained"; # Added 2025-08-21
   seahub = throw "'seahub' has been removed as it is unmaintained"; # Added 2025-08-21
   sequoia = sequoia-sq; # Added 2023-06-26
   session-desktop-appimage = session-desktop; # Added 2022-08-31
+  setserial = throw "'setserial' has been removed as it had been abandoned upstream"; # Added 2025-05-18
   sexp = sexpp; # Added 2023-07-03
   shadered = throw "shadered has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   shipyard = jumppad; # Added 2023-06-06
@@ -1306,16 +1345,19 @@ mapAliases {
   sierra-breeze-enhanced = throw "'sierra-breeze-enhanced' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   signal-desktop-source = lib.warnOnInstantiate "'signal-desktop-source' is now exposed at 'signal-desktop'." signal-desktop; # Added 2025-04-16
   simplesamlphp = throw "'simplesamlphp' was removed because it was unmaintained in nixpkgs"; # Added 2025-10-17
+  siproxd = throw "'siproxd' has been removed as it was unmaintained and incompatible with newer libosip versions"; # Added 2025-05-18
   sipwitch = throw "'sipwitch' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   sisco.lv2 = throw "'sisco.lv2' has been removed as it was unmaintained and broken"; # Added 2025-08-26
   SkypeExport = throw "'skypeexport' was removed since Skype has been shut down in May 2025"; # Added 2025-09-15
   skypeexport = throw "'skypeexport' was removed since Skype has been shut down in May 2025"; # Added 2025-09-15
   sladeUnstable = slade-unstable; # Added 2025-08-26
   slic3r = throw "'slic3r' has been removed because it is unmaintained"; # Added 2025-08-26
+  sloccount = throw "'sloccount' has been removed because it is unmaintained. Consider migrating to 'loccount'"; # added 2025-05-17
   slrn = throw "'slrn' has been removed because it is unmaintained upstream and broken."; # Added 2025-06-11
   slurm-llnl = slurm; # Added 2017-07-31
   smartgithg = smartgit; # Added 2025-03-31
   snapcraft = throw "snapcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # added 2025-09-18
+  snort2 = throw "snort2 has been removed as it is deprecated and unmaintained by upstream. Consider using snort (snort3) package instead."; # 2025-05-21
   snowman = throw "snowman has been removed as it is unmaintained by upstream"; # 2025-10-12
   soldat-unstable = opensoldat; # Added 2022-07-02
   somatic-sniper = throw "somatic-sniper has been removed as it was archived in 2020 and fails to build."; # Added 2025-10-14
@@ -1364,7 +1406,12 @@ mapAliases {
   StormLib = stormlib; # Added 2024-01-21
   strawberry-qt5 = throw "strawberry-qt5 has been replaced by strawberry"; # Added 2024-11-22 and updated 2025-07-19
   strawberry-qt6 = throw "strawberry-qt6 has been replaced by strawberry"; # Added 2025-07-19
+  subberthehut = throw "'subberthehut' has been removed as it was unmaintained upstream"; # Added 2025-05-17
   sublime-music = throw "`sublime-music` has been removed because upstream has announced it is no longer maintained. Upstream suggests using `supersonic` instead."; # Added 2025-09-20
+  substituteAll = throw "`substituteAll` has been removed. Use `replaceVars` instead."; # Added 2025-05-23
+  substituteAllFiles = throw "`substituteAllFiles` has been removed. Use `replaceVars` for each file instead."; # Added 2025-05-23
+  suitesparse_4_2 = throw "'suitesparse_4_2' has been removed as it was unmaintained upstream"; # Added 2025-05-17
+  suitesparse_4_4 = throw "'suitesparse_4_4' has been removed as it was unmaintained upstream"; # Added 2025-05-17
   sumaclust = throw "'sumaclust' has been removed as it was archived upstream and broken with GCC 14"; # Added 2025-06-14
   sumalibs = throw "'sumalibs' has been removed as it was archived upstream and broken with GCC 14"; # Added 2025-06-14
   sumatra = throw "'sumatra' has been removed as it was archived upstream and broken with GCC 14"; # Added 2025-06-14
@@ -1377,6 +1424,7 @@ mapAliases {
   syn2mas = throw "'syn2mas' has been removed. It has been integrated into the main matrix-authentication-service CLI as a subcommand: 'mas-cli syn2mas'."; # Added 2025-07-07
   sync = taler-sync; # Added 2024-09-04
   syncall = throw "'syncall' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
+  syncthing-tray = throw "syncthing-tray has been removed because it is broken and unmaintained"; # Added 2025-05-18
   syncthingtray-qt6 = syncthingtray; # Added 2024-03-06
   syndicate_utils = throw "'syndicate_utils' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   t1lib = throw "'t1lib' has been removed as it was broken and unmaintained upstream."; # Added 2025-06-11
@@ -1398,6 +1446,7 @@ mapAliases {
   tcludp = tclPackages.tcludp; # Added 2024-10-02
   tclvfs = tclPackages.tclvfs; # Added 2024-10-02
   tclx = tclPackages.tclx; # Added 2024-10-02
+  tcp-cutter = throw "tcp-cutter has been removed because it fails to compile and the source url is dead"; # Added 2025-05-25
   tdesktop = telegram-desktop; # Added 2023-04-07
   tdlib-purple = pidginPackages.tdlib-purple; # Added 2023-07-17
   tdom = tclPackages.tdom; # Added 2024-10-02
@@ -1415,6 +1464,7 @@ mapAliases {
   textual-paint = throw "'textual-paint' has been removed as it is broken"; # Added 2025-09-10
   tezos-rust-libs = throw "ligo has been removed from nixpkgs for lack of maintainance"; # Added 2025-06-03
   tfplugindocs = terraform-plugin-docs; # Added 2023-11-01
+  thefuck = throw "'thefuck' has been removed due to lack of maintenance upstream and incompatible with python 3.12+. Consider using 'pay-respects' instead"; # Added 2025-05-30
   theLoungePlugins = throw "'theLoungePlugins' has been removed due to only containing throws"; # Added 2025-09-25
   thrust = throw "'thrust' has been removed due to lack of maintenance"; # Added 2025-08-21
   thunderbird-128 = throw "Thunderbird 128 support ended in August 2025"; # Added 2025-09-30
@@ -1424,6 +1474,7 @@ mapAliases {
   tinyxml2 = throw "The 'tinyxml2' alias has been removed, use 'tinyxml' for https://sourceforge.net/projects/tinyxml/ or 'tinyxml-2' for https://github.com/leethomason/tinyxml2"; # Added 2025-10-11
   tix = tclPackages.tix; # Added 2024-10-02
   tkcvs = tkrev; # Added 2022-03-07
+  tkgate = throw "'tkgate' has been removed as it is unmaintained"; # Added 2025-05-17
   tkimg = tclPackages.tkimg; # Added 2024-10-02
   tlaplusToolbox = tlaplus-toolbox; # Added 2025-08-21
   tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28
@@ -1461,7 +1512,9 @@ mapAliases {
   uae = throw "'uae' has been removed due to lack of upstream maintenance. Consider using 'fsuae' instead."; # Added 2025-06-11
   ubuntu_font_family = ubuntu-classic; # Added 2024-02-19
   uclibc = uclibc-ng; # Added 2022-06-16
+  unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17
   unifi-poller = unpoller; # Added 2022-11-24
+  unzoo = throw "'unzoo' has been removed since it is unmaintained upstream and doesn't compile with newer versions of GCC anymore"; # Removed 2025-05-24
   util-linuxCurses = util-linux; # Added 2022-04-12
   utillinux = util-linux; # Added 2020-11-24
   vaapiIntel = intel-vaapi-driver; # Added 2023-05-31
@@ -1493,6 +1546,7 @@ mapAliases {
   vtk_9_egl = lib.warnOnInstantiate "'vtk_9_5' now build with egl support by default, so `vtk_9_egl` is deprecated, consider using 'vtk_9_5' instead." vtk_9_5; # Added 2025-07-18
   vtk_9_withQt5 = throw "'vtk_9_withQt5' has been removed, Consider using 'vtkWithQt6' instead."; # Added 2025-07-18
   vtkWithQt5 = throw "'vtkWithQt5' has been removed. Consider using 'vtkWithQt6' instead."; # Added 2025-09-06
+  vwm = throw "'vwm' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
   w_scan = throw "'w_scan' has been removed due to lack of upstream maintenance"; # Added 2025-08-29
   waitron = throw "'waitron' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   wakatime = wakatime-cli; # 2024-05-30
@@ -1529,6 +1583,7 @@ mapAliases {
   xinput_calibrator = xinput-calibrator; # Added 2025-08-28
   xjump = throw "'xjump' has been removed as it is unmaintained"; # Added 2025-08-22
   xmlada = gnatPackages.xmlada; # Added 2024-02-25
+  xmlroff = throw "'xmlroff' has been removed as it is unmaintained and broken"; # Added 2025-05-18
   xo = throw "Use 'dbtpl' instead of 'xo'"; # Added 2025-09-28
   xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18
   xorg-autoconf = util-macros; # Added 2025-08-18

From 853d9f31ea6206e86b72db1ba221a12cb503510f Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 26 Oct 2025 19:31:42 +0000
Subject: [PATCH 3496/6226] aliases: convert aliases older than June 2025 to
 throws

Some of these need to be reverted in the next commit.
---
 pkgs/top-level/aliases.nix | 1044 ++++++++++++++++++------------------
 1 file changed, 522 insertions(+), 522 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dc8d0da2219e..e37cc2f91d75 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -237,10 +237,10 @@ mapAliases {
   forceSystem = system: _: (import self.path { localSystem = { inherit system; }; }); # Added 2018-07-16 preserve, reason: forceSystem should not be used directly in Nixpkgs.
 
   # TODO: Remove from Nixpkgs and eventually turn into throws.
-  system = stdenv.hostPlatform.system; # Added 2021-10-22
-  buildPlatform = stdenv.buildPlatform; # Added 2023-01-09
-  hostPlatform = stdenv.hostPlatform; # Added 2023-01-09
-  targetPlatform = stdenv.targetPlatform; # Added 2023-01-09
+  system = throw "'system' has been renamed to/replaced by 'stdenv.hostPlatform.system'"; # Converted to throw 2025-10-27
+  buildPlatform = throw "'buildPlatform' has been renamed to/replaced by 'stdenv.buildPlatform'"; # Converted to throw 2025-10-27
+  hostPlatform = throw "'hostPlatform' has been renamed to/replaced by 'stdenv.hostPlatform'"; # Converted to throw 2025-10-27
+  targetPlatform = throw "'targetPlatform' has been renamed to/replaced by 'stdenv.targetPlatform'"; # Converted to throw 2025-10-27
 
   # LLVM packages for (integration) testing that should not be used inside Nixpkgs:
   llvmPackages_latest = llvmPackages_21;
@@ -260,21 +260,21 @@ mapAliases {
   # keep-sorted start case=no numeric=yes block=yes
 
   _0verkill = throw "'_0verkill' has been removed due to lack of maintenance"; # Added 2025-08-27
-  _1password = lib.warnOnInstantiate "_1password has been renamed to _1password-cli to better follow upstream name usage" _1password-cli; # Added 2024-10-24
+  _1password = throw "'_1password' has been renamed to/replaced by '_1password-cli'"; # Converted to throw 2025-10-27
   _2048-cli = throw "'_2048-cli' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07
   _2048-cli-curses = throw "'_2048-cli-curses' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07
   _2048-cli-terminal = throw "'_2048-cli-curses' has been removed due to archived upstream. Consider using '_2048-in-terminal' instead."; # Added 2025-06-07
-  a4term = a4; # Added 2023-10-06
+  a4term = throw "'a4term' has been renamed to/replaced by 'a4'"; # Converted to throw 2025-10-27
   abseil-cpp_202301 = throw "abseil-cpp_202301 has been removed as it was unused in tree"; # Added 2025-08-09
   abseil-cpp_202501 = throw "abseil-cpp_202501 has been removed as it was unused in tree"; # Added 2025-09-15
   abseil-cpp_202505 = throw "abseil-cpp_202505 has been removed as it was unused in tree"; # Added 2025-09-15
-  adminer-pematon = adminneo; # Added 2025-02-20
-  adminerneo = adminneo; # Added 2025-02-27
+  adminer-pematon = throw "'adminer-pematon' has been renamed to/replaced by 'adminneo'"; # Converted to throw 2025-10-27
+  adminerneo = throw "'adminerneo' has been renamed to/replaced by 'adminneo'"; # Converted to throw 2025-10-27
   adobe-reader = throw "'adobe-reader' has been removed, as it was broken, outdated and insecure"; # added 2025-05-31
   afpfs-ng = throw "'afpfs-ng' has been removed as it was broken and unmaintained for 10 years"; # Added 2025-05-17
-  akkoma-emoji = lib.warnOnInstantiate "'akkoma-emoji.blobs_gg' has been renamed to 'blobs_gg'" blobs_gg; # Added 2025-03-14
-  akkoma-frontends.admin-fe = lib.warnOnInstantiate "'akkoma-frontends.admin-fe' has been renamed to 'akkoma-admin-fe'" akkoma-admin-fe; # Added 2025-03-14
-  akkoma-frontends.akkoma-fe = lib.warnOnInstantiate "'akkoma-frontends.akkoma-fe' has been renamed to 'akkoma-fe'" akkoma-fe; # Added 2025-03-14
+  akkoma-emoji = throw "'akkoma-emoji' has been renamed to/replaced by 'blobs_gg'"; # Converted to throw 2025-10-27
+  akkoma-frontends.admin-fe = throw "'akkoma-frontends.admin-fe' has been renamed to/replaced by 'akkoma-admin-fe'"; # Converted to throw 2025-10-27
+  akkoma-frontends.akkoma-fe = throw "'akkoma-frontends.akkoma-fe' has been renamed to/replaced by 'akkoma-fe'"; # Converted to throw 2025-10-27
   amazon-qldb-shell = throw "'amazon-qldb-shell' has been removed due to being unmaintained upstream"; # Added 2025-07-30
   amdvlk = throw "'amdvlk' has been removed since it was deprecated by AMD. Its replacement, RADV, is enabled by default."; # Added 2025-09-20
   android-udev-rules = throw "'android-udev-rules' has been removed due to being superseded by built-in systemd uaccess rules."; # Added 2025-10-21
@@ -288,25 +288,25 @@ mapAliases {
   ansible-language-server = throw "ansible-language-server was removed, because it was unmaintained in nixpkgs."; # Added 2025-09-24
   ansible-later = throw "ansible-later has been discontinued. The author recommends switching to ansible-lint"; # Added 2025-08-24
   antlr4_8 = throw "antlr4_8 has been removed. Consider using a more recent version of antlr4"; # Added 2025-10-20
-  ao = libfive; # Added 2024-10-11
-  apacheAnt = ant; # Added 2024-11-28
+  ao = throw "'ao' has been renamed to/replaced by 'libfive'"; # Converted to throw 2025-10-27
+  apacheAnt = throw "'apacheAnt' has been renamed to/replaced by 'ant'"; # Converted to throw 2025-10-27
   apacheKafka_3_7 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2025-09-27
   apacheKafka_3_8 = throw "apacheKafka_2_8 through _3_8 have been removed from nixpkgs as outdated"; # Added 2025-09-27
-  appthreat-depscan = dep-scan; # Added 2024-04-10
+  appthreat-depscan = throw "'appthreat-depscan' has been renamed to/replaced by 'dep-scan'"; # Converted to throw 2025-10-27
   arangodb = throw "arangodb has been removed, as it was unmaintained and the packaged version does not build with supported GCC versions"; # Added 2025-08-12
   arc-browser = throw "arc-browser was removed due to being unmaintained"; # Added 2025-09-03
   archipelago-minecraft = throw "archipelago-minecraft has been removed, as upstream no longer ships minecraft as a default APWorld."; # Added 2025-07-15
   archivebox = throw "archivebox has been removed, since the packaged version was stuck on django 3."; # Added 2025-08-01
   ardour_7 = throw "ardour_7 has been removed because it relies on gtk2, please use ardour instead."; # Aded 2025-10-04
-  argo = argo-workflows; # Added 2025-02-01
-  aria = aria2; # Added 2024-03-26
+  argo = throw "'argo' has been renamed to/replaced by 'argo-workflows'"; # Converted to throw 2025-10-27
+  aria = throw "'aria' has been renamed to/replaced by 'aria2'"; # Converted to throw 2025-10-27
   arrayfire = throw "arrayfire was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   artim-dark = aritim-dark; # Added 2025-07-27
-  aseprite-unfree = aseprite; # Added 2023-08-26
-  asitop = macpm; # Added 2025-04-14
+  aseprite-unfree = throw "'aseprite-unfree' has been renamed to/replaced by 'aseprite'"; # Converted to throw 2025-10-27
+  asitop = throw "'asitop' has been renamed to/replaced by 'macpm'"; # Converted to throw 2025-10-27
   asterisk_18 = throw "asterisk_18: Asterisk 18 is end of life and has been removed"; # Added 2025-10-19
   ats = throw "'ats' has been removed as it is unmaintained for 10 years and broken"; # Added 2025-05-17
-  AusweisApp2 = ausweisapp; # Added 2023-11-08
+  AusweisApp2 = throw "'AusweisApp2' has been renamed to/replaced by 'ausweisapp'"; # Converted to throw 2025-10-27
   autoconf213 = throw "'autoconf213' has been removed in favor of 'autoconf'"; # Added 2025-07-21
   autoconf264 = throw "'autoconf264' has been removed in favor of 'autoconf'"; # Added 2025-07-21
   automake111x = throw "'automake111x' has been removed in favor of 'automake'"; # Added 2025-07-21
@@ -314,11 +314,11 @@ mapAliases {
   autoreconfHook264 = throw "'autoreconfHook264' has been removed in favor of 'autoreconfHook'"; # Added 2025-07-21
   av-98 = throw "'av-98' has been removed because it has been broken since at least November 2024."; # Added 2025-10-03
   avr-sim = throw "'avr-sim' has been removed as it was broken and unmaintained. Possible alternatives are 'simavr', SimulAVR and AVRStudio."; # Added 2025-05-31
-  awesome-4-0 = awesome; # Added 2022-05-05
+  awesome-4-0 = throw "'awesome-4-0' has been renamed to/replaced by 'awesome'"; # Converted to throw 2025-10-27
   awf = throw "'awf' has been removed as the upstream project was archived in 2021"; # Added 2025-10-03
   axmldec = throw "'axmldec' has been removed as it was broken and unmaintained for 8 years"; # Added 2025-05-17
   backlight-auto = throw "'backlight-auto' has been removed as it relies on Zig 0.12 which has been dropped."; # Added 2025-08-22
-  badtouch = authoscope; # Added 2021-06-26
+  badtouch = throw "'badtouch' has been renamed to/replaced by 'authoscope'"; # Converted to throw 2025-10-27
   bandwidth = throw "'bandwidth' has been removed due to lack of maintenance"; # Added 2025-09-01
   banking = saldo; # added 2025-08-29
   barrier = throw "'barrier' has been removed as it is unmaintained. Consider 'deskflow' or 'input-leap' instead."; # Added 2025-09-29
@@ -341,64 +341,64 @@ mapAliases {
   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
   bitmeter = throw "bitmeter has been removed, use `x42-meter 18` from the x42-plugins pkg instead."; # Added 2025-10-03
-  bitwarden = bitwarden-desktop; # Added 2024-02-25
-  bitwarden_rs = vaultwarden; # Added 2021-07-01
-  bitwarden_rs-mysql = vaultwarden-mysql; # Added 2021-07-01
-  bitwarden_rs-postgresql = vaultwarden-postgresql; # Added 2021-07-01
-  bitwarden_rs-sqlite = vaultwarden-sqlite; # Added 2021-07-01
-  bitwarden_rs-vault = vaultwarden-vault; # Added 2021-07-01
+  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
+  bitwarden_rs-mysql = throw "'bitwarden_rs-mysql' has been renamed to/replaced by 'vaultwarden-mysql'"; # Converted to throw 2025-10-27
+  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
   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-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
-  blockbench-electron = blockbench; # Added 2024-03-16
+  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
-  bmap-tools = bmaptool; # Added 2024-08-05
+  bmap-tools = throw "'bmap-tools' has been renamed to/replaced by 'bmaptool'"; # Converted to throw 2025-10-27
   botan2 = throw "botan2 has been removed as it is EOL"; # Added 2025-10-20
   bower2nix = throw "bower2nix has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
-  brasero-original = lib.warnOnInstantiate "Use 'brasero-unwrapped' instead of 'brasero-original'" brasero-unwrapped; # Added 2024-09-29
+  brasero-original = throw "'brasero-original' has been renamed to/replaced by 'brasero-unwrapped'"; # Converted to throw 2025-10-27
   breath-theme = throw "'breath-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   brogue = lib.warnOnInstantiate "Use 'brogue-ce' instead of 'brogue' for updated releases" brogue-ce; # Added 2025-10-04
   buildBowerComponents = throw "buildBowerComponents has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
   buildGo123Module = throw "Go 1.23 is end-of-life, and 'buildGo123Module' has been removed. Please use a newer builder version."; # Added 2025-08-13
   buildXenPackage = throw "'buildXenPackage' has been removed as a custom Xen build can now be achieved by simply overriding 'xen'."; # Added 2025-05-12
-  bwidget = tclPackages.bwidget; # Added 2024-10-02
+  bwidget = throw "'bwidget' has been renamed to/replaced by 'tclPackages.bwidget'"; # Converted to throw 2025-10-27
   bzrtp = throw "'bzrtp' has been moved to 'linphonePackages.bzrtp'"; # Added 2025-09-20
-  calculix = calculix-ccx; # Added 2024-12-18
-  calligra = kdePackages.calligra; # Added 2024-09-27
-  callPackage_i686 = pkgsi686Linux.callPackage; # Added 2018-07-26
-  canonicalize-jars-hook = stripJavaArchivesHook; # Added 2024-03-17
+  calculix = throw "'calculix' has been renamed to/replaced by 'calculix-ccx'"; # Converted to throw 2025-10-27
+  calligra = throw "'calligra' has been renamed to/replaced by 'kdePackages.calligra'"; # Converted to throw 2025-10-27
+  callPackage_i686 = throw "'callPackage_i686' has been renamed to/replaced by 'pkgsi686Linux.callPackage'"; # Converted to throw 2025-10-27
+  canonicalize-jars-hook = throw "'canonicalize-jars-hook' has been renamed to/replaced by 'stripJavaArchivesHook'"; # Converted to throw 2025-10-27
   cardboard = throw "cardboard has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
-  cargo-espflash = espflash; # Added 2024-02-09
+  cargo-espflash = throw "'cargo-espflash' has been renamed to/replaced by 'espflash'"; # Converted to throw 2025-10-27
   cargonode = throw "'cargonode' has been removed due to lack of upstream maintenance"; # Added 2025-06-18
-  cask = emacs.pkgs.cask; # Added 2022-11-12
+  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
   catch = throw "catch has been removed. Please upgrade to catch2 or catch2_3"; # Added 2025-08-21
   cereal_1_3_0 = throw "cereal_1_3_0 has been removed as it was unused; use cereal intsead"; # Added 2025-09-12
   cereal_1_3_2 = throw "cereal_1_3_2 is now the only version and has been renamed to cereal"; # Added 2025-09-12
-  certmgr-selfsigned = certmgr; # Added 2023-11-30
-  challenger = taler-challenger; # Added 2024-09-04
+  certmgr-selfsigned = throw "'certmgr-selfsigned' has been renamed to/replaced by 'certmgr'"; # Converted to throw 2025-10-27
+  challenger = throw "'challenger' has been renamed to/replaced by 'taler-challenger'"; # Converted to throw 2025-10-27
   charmcraft = throw "charmcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # added 2025-09-18
   chatgpt-retrieval-plugin = throw "chatgpt-retrieval-plugin has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
-  check-esxi-hardware = nagiosPlugins.check_esxi_hardware; # Added 2024-05-03
-  check-mssql-health = nagiosPlugins.check_mssql_health; # Added 2024-05-03
-  check-nwc-health = nagiosPlugins.check_nwc_health; # Added 2024-05-03
-  check-openvpn = nagiosPlugins.check_openvpn; # Added 2024-05-03
-  check-ups-health = nagiosPlugins.check_ups_health; # Added 2024-05-03
-  check-uptime = nagiosPlugins.check_uptime; # Added 2024-05-03
-  check-wmiplus = nagiosPlugins.check_wmi_plus; # Added 2024-05-03
-  check_smartmon = nagiosPlugins.check_smartmon; # Added 2024-05-03
-  check_systemd = nagiosPlugins.check_systemd; # Added 2024-05-03
-  check_zfs = nagiosPlugins.check_zfs; # Added 2024-05-03
-  checkSSLCert = nagiosPlugins.check_ssl_cert; # Added 2024-05-03
-  chiaki4deck = chiaki-ng; # Added 2024-08-04
+  check-esxi-hardware = throw "'check-esxi-hardware' has been renamed to/replaced by 'nagiosPlugins.check_esxi_hardware'"; # Converted to throw 2025-10-27
+  check-mssql-health = throw "'check-mssql-health' has been renamed to/replaced by 'nagiosPlugins.check_mssql_health'"; # Converted to throw 2025-10-27
+  check-nwc-health = throw "'check-nwc-health' has been renamed to/replaced by 'nagiosPlugins.check_nwc_health'"; # Converted to throw 2025-10-27
+  check-openvpn = throw "'check-openvpn' has been renamed to/replaced by 'nagiosPlugins.check_openvpn'"; # Converted to throw 2025-10-27
+  check-ups-health = throw "'check-ups-health' has been renamed to/replaced by 'nagiosPlugins.check_ups_health'"; # Converted to throw 2025-10-27
+  check-uptime = throw "'check-uptime' has been renamed to/replaced by 'nagiosPlugins.check_uptime'"; # Converted to throw 2025-10-27
+  check-wmiplus = throw "'check-wmiplus' has been renamed to/replaced by 'nagiosPlugins.check_wmi_plus'"; # Converted to throw 2025-10-27
+  check_smartmon = throw "'check_smartmon' has been renamed to/replaced by 'nagiosPlugins.check_smartmon'"; # Converted to throw 2025-10-27
+  check_systemd = throw "'check_systemd' has been renamed to/replaced by 'nagiosPlugins.check_systemd'"; # Converted to throw 2025-10-27
+  check_zfs = throw "'check_zfs' has been renamed to/replaced by 'nagiosPlugins.check_zfs'"; # Converted to throw 2025-10-27
+  checkSSLCert = throw "'checkSSLCert' has been renamed to/replaced by 'nagiosPlugins.check_ssl_cert'"; # Converted to throw 2025-10-27
+  chiaki4deck = throw "'chiaki4deck' has been renamed to/replaced by 'chiaki-ng'"; # Converted to throw 2025-10-27
   chkrootkit = throw "chkrootkit has been removed as it is unmaintained and archived upstream and didn't even work on NixOS"; # Added 2025-09-12
-  chocolateDoom = chocolate-doom; # Added 2023-05-01
-  ChowCentaur = chow-centaur; # Added 2024-06-12
-  ChowKick = chow-kick; # Added 2024-06-12
-  ChowPhaser = chow-phaser; # Added 2024-06-12
-  CHOWTapeModel = chow-tape-model; # Added 2024-06-12
-  chrome-gnome-shell = gnome-browser-connector; # Added 2022-07-27
+  chocolateDoom = throw "'chocolateDoom' has been renamed to/replaced by 'chocolate-doom'"; # Converted to throw 2025-10-27
+  ChowCentaur = throw "'ChowCentaur' has been renamed to/replaced by 'chow-centaur'"; # Converted to throw 2025-10-27
+  ChowKick = throw "'ChowKick' has been renamed to/replaced by 'chow-kick'"; # Converted to throw 2025-10-27
+  ChowPhaser = throw "'ChowPhaser' has been renamed to/replaced by 'chow-phaser'"; # Converted to throw 2025-10-27
+  CHOWTapeModel = throw "'CHOWTapeModel' has been renamed to/replaced by 'chow-tape-model'"; # Converted to throw 2025-10-27
+  chrome-gnome-shell = throw "'chrome-gnome-shell' has been renamed to/replaced by 'gnome-browser-connector'"; # Converted to throw 2025-10-27
   ci-edit = throw "'ci-edit' has been removed due to lack of maintenance upstream"; # Added 2025-08-26
   cinnamon-common = cinnamon; # Added 2025-08-06
   clamsmtp = throw "'clamsmtp' has been removed as it is unmaintained and broken"; # Added 2025-05-17
@@ -414,24 +414,24 @@ mapAliases {
   clang-tools_15 = throw "clang-tools_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
   clang-tools_16 = throw "clang-tools_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   clang-tools_17 = throw "clang-tools_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  clang-tools_18 = llvmPackages_18.clang-tools; # Added 2024-04-22
-  clang-tools_19 = llvmPackages_19.clang-tools; # Added 2024-08-21
+  clang-tools_18 = throw "'clang-tools_18' has been renamed to/replaced by 'llvmPackages_18.clang-tools'"; # Converted to throw 2025-10-27
+  clang-tools_19 = throw "'clang-tools_19' has been renamed to/replaced by 'llvmPackages_19.clang-tools'"; # Converted to throw 2025-10-27
   clang_12 = throw "clang_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   clang_13 = throw "clang_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   clang_14 = throw "clang_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   clang_15 = throw "clang_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
   clang_16 = throw "clang_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   clang_17 = throw "clang_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  clasp = clingo; # added 2022-12-22
+  clasp = throw "'clasp' has been renamed to/replaced by 'clingo'"; # Converted to throw 2025-10-27
   cli-visualizer = throw "'cli-visualizer' has been removed as the upstream repository is gone"; # Added 2025-06-05
   clipbuzz = throw "clipbuzz has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09
   cloudlogoffline = throw "cloudlogoffline has been removed"; # added 2025-05-18
-  cockroachdb-bin = cockroachdb; # 2024-03-15
+  cockroachdb-bin = throw "'cockroachdb-bin' has been renamed to/replaced by 'cockroachdb'"; # Converted to throw 2025-10-27
   code-browser-gtk2 = throw "'code-browser-gtk2' has been removed, as it was broken since 22.11"; # Added 2025-08-22
   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
   cog = throw "'cog' has been removed as it depends on unmaintained libraries"; # Added 2025-10-08
-  CoinMP = coinmp; # Added 2024-06-12
+  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
   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
@@ -441,13 +441,13 @@ mapAliases {
   copilot-language-server-fhs = lib.warnOnInstantiate "The package set `copilot-language-server-fhs` has been renamed to `copilot-language-server`." copilot-language-server; # Added 2025-09-07
   copper = throw "'copper' has been removed, as it was broken since 22.11"; # Added 2025-08-22
   cordless = throw "'cordless' has been removed due to being archived upstream. Consider using 'discordo' instead."; # Added 2025-06-07
-  cosmic-tasks = tasks; # Added 2024-07-04
+  cosmic-tasks = throw "'cosmic-tasks' has been renamed to/replaced by 'tasks'"; # Converted to throw 2025-10-27
   cotton = throw "'cotton' has been removed since it is vulnerable to CVE-2025-62518 and upstream is unmaintained"; # Added 2025-10-26
-  cpp-ipfs-api = cpp-ipfs-http-client; # Project has been renamed. Added 2022-05-15
-  crispyDoom = crispy-doom; # Added 2023-05-01
-  critcl = tclPackages.critcl; # Added 2024-10-02
+  cpp-ipfs-api = throw "'cpp-ipfs-api' has been renamed to/replaced by 'cpp-ipfs-http-client'"; # Converted to throw 2025-10-27
+  crispyDoom = throw "'crispyDoom' has been renamed to/replaced by 'crispy-doom'"; # Converted to throw 2025-10-27
+  critcl = throw "'critcl' has been renamed to/replaced by 'tclPackages.critcl'"; # Converted to throw 2025-10-27
   cromite = throw "'cromite' has been removed from nixpkgs due to it not being maintained"; # Added 2025-06-12
-  crossLibcStdenv = stdenvNoLibc; # Added 2024-09-06
+  crossLibcStdenv = throw "'crossLibcStdenv' has been renamed to/replaced by 'stdenvNoLibc'"; # Converted to throw 2025-10-27
   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
   cstore_fdw = throw "'cstore_fdw' has been removed. Use 'postgresqlPackages.cstore_fdw' instead."; # Added 2025-07-19
   cudaPackages_11 = throw "CUDA 11 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
@@ -466,7 +466,7 @@ mapAliases {
   cudaPackages_12_3 = throw "CUDA 12.3 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_12_4 = throw "CUDA 12.4 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_12_5 = throw "CUDA 12.5 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
-  cups-kyodialog3 = cups-kyodialog; # Added 2022-11-12
+  cups-kyodialog3 = throw "'cups-kyodialog3' has been renamed to/replaced by 'cups-kyodialog'"; # Converted to throw 2025-10-27
   curlHTTP3 = lib.warnOnInstantiate "'curlHTTP3' has been removed, as 'curl' now has HTTP/3 support enabled by default" curl; # Added 2025-08-22
   cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09
   dale = throw "dale has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
@@ -478,108 +478,108 @@ mapAliases {
   dbus-sharp-glib-1_0 = throw "'dbus-sharp-glib-1_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
   dbus-sharp-glib-2_0 = throw "'dbus-sharp-glib-2_0' has been removed as it was unmaintained and had no dependents"; # Added 2025-08-25
   dclib = throw "'dclib' has been removed as it is unmaintained for 16 years and broken"; # Added 2025-05-25
-  deadpixi-sam = deadpixi-sam-unstable; # Added 2018-05-01
+  deadpixi-sam = throw "'deadpixi-sam' has been renamed to/replaced by 'deadpixi-sam-unstable'"; # Converted to throw 2025-10-27
   deepin = throw "the Deepin desktop environment and associated tools have been removed from nixpkgs due to lack of maintenance"; # Added 2025-08-21
   deepsea = throw "deepsea has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
   degit-rs = throw "'degit-rs' has been removed because it is unmaintained upstream and has vulnerable dependencies."; # Added 2025-07-11
-  deltachat-cursed = arcanechat-tui; # added 2025-02-25
+  deltachat-cursed = throw "'deltachat-cursed' has been renamed to/replaced by 'arcanechat-tui'"; # Converted to throw 2025-10-27
   devdocs-desktop = throw "'devdocs-desktop' has been removed as it is unmaintained upstream and vendors insecure dependencies"; # Added 2025-06-11
   dfilemanager = throw "'dfilemanager' has been dropped as it was unmaintained"; # Added 2025-06-03
-  dleyna-connector-dbus = dleyna; # Added 2025-04-19
-  dleyna-core = dleyna; # Added 2025-04-19
-  dleyna-renderer = dleyna; # Added 2025-04-19
-  dleyna-server = dleyna; # Added 2025-04-19
-  dnscrypt-proxy2 = dnscrypt-proxy; # Added 2023-02-02
-  docker-distribution = distribution; # Added 2023-12-26
+  dleyna-connector-dbus = throw "'dleyna-connector-dbus' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27
+  dleyna-core = throw "'dleyna-core' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27
+  dleyna-renderer = throw "'dleyna-renderer' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27
+  dleyna-server = throw "'dleyna-server' has been renamed to/replaced by 'dleyna'"; # Converted to throw 2025-10-27
+  dnscrypt-proxy2 = throw "'dnscrypt-proxy2' has been renamed to/replaced by 'dnscrypt-proxy'"; # Converted to throw 2025-10-27
+  docker-distribution = throw "'docker-distribution' has been renamed to/replaced by 'distribution'"; # Converted to throw 2025-10-27
   docker-sync = throw "'docker-sync' has been removed because it was broken and unmaintained"; # Added 2025-08-26
   docker_26 = throw "'docker_26' has been removed because it has been unmaintained since February 2025. Use docker_28 or newer instead."; # Added 2025-06-21
   docker_27 = throw "'docker_27' has been removed because it has been unmaintained since May 2025. Use docker_28 or newer instead."; # Added 2025-06-15
   dockerfile-language-server-nodejs = lib.warnOnInstantiate "'dockerfile-language-server-nodejs' has been renamed to 'dockerfile-language-server'" dockerfile-language-server; # Added 2025-09-12
-  dolphin-emu-beta = dolphin-emu; # Added 2023-02-11
+  dolphin-emu-beta = throw "'dolphin-emu-beta' has been renamed to/replaced by 'dolphin-emu'"; # Converted to throw 2025-10-27
   dotnetenv = throw "'dotnetenv' has been removed because it was unmaintained in Nixpkgs"; # Added 2025-07-11
-  dotty = scala_3; # Added 2023-08-20
+  dotty = throw "'dotty' has been renamed to/replaced by 'scala_3'"; # Converted to throw 2025-10-27
   dovecot_fts_xapian = throw "'dovecot_fts_xapian' has been removed because it was unmaintained in Nixpkgs. Consider using dovecot-fts-flatcurve instead"; # Added 2025-08-16
   dsd = throw "dsd has been removed, as it was broken and lack of upstream maintenance"; # Added 2025-08-25
-  dtv-scan-tables_linuxtv = dtv-scan-tables; # Added 2023-03-03
-  dtv-scan-tables_tvheadend = dtv-scan-tables; # Added 2023-03-03
-  du-dust = dust; # Added 2024-01-19
+  dtv-scan-tables_linuxtv = throw "'dtv-scan-tables_linuxtv' has been renamed to/replaced by 'dtv-scan-tables'"; # Converted to throw 2025-10-27
+  dtv-scan-tables_tvheadend = throw "'dtv-scan-tables_tvheadend' has been renamed to/replaced by 'dtv-scan-tables'"; # Converted to throw 2025-10-27
+  du-dust = throw "'du-dust' has been renamed to/replaced by 'dust'"; # Converted to throw 2025-10-27
   duckstation-bin = duckstation; # Added 2025-09-20
   dumb = throw "'dumb' has been archived by upstream. Upstream recommends libopenmpt as a replacement."; # Added 2025-09-14
-  dump1090 = dump1090-fa; # Added 2024-02-12
-  eask = eask-cli; # Added 2024-09-05
+  dump1090 = throw "'dump1090' has been renamed to/replaced by 'dump1090-fa'"; # Converted to throw 2025-10-27
+  eask = throw "'eask' has been renamed to/replaced by 'eask-cli'"; # Converted to throw 2025-10-27
   easyloggingpp = throw "easyloggingpp has been removed, as it is deprecated upstream and does not build with CMake 4"; # Added 2025-09-17
-  EBTKS = ebtks; # Added 2024-01-21
-  ec2-utils = amazon-ec2-utils; # Added 2022-02-01
+  EBTKS = throw "'EBTKS' has been renamed to/replaced by 'ebtks'"; # Converted to throw 2025-10-27
+  ec2-utils = throw "'ec2-utils' has been renamed to/replaced by 'amazon-ec2-utils'"; # Converted to throw 2025-10-27
   edid-decode = v4l-utils; # Added 2025-06-20
   eidolon = throw "eidolon was removed as it is unmaintained upstream."; # Added 2025-05-28
-  eintopf = lauti; # Project was renamed, added 2025-05-01
+  eintopf = throw "'eintopf' has been renamed to/replaced by 'lauti'"; # Converted to throw 2025-10-27
   elementsd-simplicity = throw "'elementsd-simplicity' has been removed due to lack of maintenance, consider using 'elementsd' instead"; # Added 2025-06-04
-  elixir_ls = elixir-ls; # Added 2023-03-20
+  elixir_ls = throw "'elixir_ls' has been renamed to/replaced by 'elixir-ls'"; # Converted to throw 2025-10-27
   elm-github-install = throw "'elm-github-install' has been removed as it is abandoned upstream and only supports Elm 0.18.0"; # Added 2025-08-25
-  emacsMacport = emacs-macport; # Added 2023-08-10
-  emacsNativeComp = emacs; # Added 2022-06-08
-  emacsPackages = emacs.pkgs; # Added 2025-03-02
+  emacsMacport = throw "'emacsMacport' has been renamed to/replaced by 'emacs-macport'"; # Converted to throw 2025-10-27
+  emacsNativeComp = throw "'emacsNativeComp' has been renamed to/replaced by 'emacs'"; # Converted to throw 2025-10-27
+  emacsPackages = throw "'emacsPackages' has been renamed to/replaced by 'emacs.pkgs'"; # Converted to throw 2025-10-27
   embree2 = throw "embree2 has been removed, as it is unmaintained upstream and depended on tbb_2020"; # Added 2025-09-14
-  EmptyEpsilon = empty-epsilon; # Added 2024-07-14
+  EmptyEpsilon = throw "'EmptyEpsilon' has been renamed to/replaced by 'empty-epsilon'"; # Converted to throw 2025-10-27
   emulationstation = throw "emulationstation was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   emulationstation-de = throw "emulationstation-de was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
-  enyo-doom = enyo-launcher; # Added 2022-09-09
+  enyo-doom = throw "'enyo-doom' has been renamed to/replaced by 'enyo-launcher'"; # Converted to throw 2025-10-27
   epapirus-icon-theme = throw "'epapirus-icon-theme' has been removed because 'papirus-icon-theme' no longer supports building with elementaryOS icon support"; # Added 2025-06-15
   eris-go = throw "'eris-go' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   eriscmd = throw "'eriscmd' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   erlang-ls = throw "'erlang-ls' has been removed as it has been archived upstream. Consider using 'erlang-language-platform' instead"; # Added 2025-10-02
-  eww-wayland = lib.warnOnInstantiate "eww now can build for X11 and wayland simultaneously, so `eww-wayland` is deprecated, use the normal `eww` package instead." eww; # Added 2024-02-17
+  eww-wayland = throw "'eww-wayland' has been renamed to/replaced by 'eww'"; # Converted to throw 2025-10-27
   f3d_egl = lib.warnOnInstantiate "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # added 2025-07-18
-  fastnlo_toolkit = fastnlo-toolkit; # Added 2024-01-03
-  faustStk = faustPhysicalModeling; # Added 2023-05-16
+  fastnlo_toolkit = throw "'fastnlo_toolkit' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2025-10-27
+  faustStk = throw "'faustStk' has been renamed to/replaced by 'faustPhysicalModeling'"; # Converted to throw 2025-10-27
   fbjni = throw "fbjni has been removed, as it was broken"; # Added 2025-08-25
-  fcitx5-catppuccin = catppuccin-fcitx5; # Added 2024-06-19
-  fcitx5-chinese-addons = qt6Packages.fcitx5-chinese-addons; # Added 2024-03-01
-  fcitx5-configtool = qt6Packages.fcitx5-configtool; # Added 2024-03-01
-  fcitx5-skk-qt = qt6Packages.fcitx5-skk-qt; # Added 2024-03-01
-  fcitx5-unikey = qt6Packages.fcitx5-unikey; # Added 2024-03-01
-  fcitx5-with-addons = qt6Packages.fcitx5-with-addons; # Added 2024-03-01
-  fennel = luaPackages.fennel; # Added 2022-09-24
+  fcitx5-catppuccin = throw "'fcitx5-catppuccin' has been renamed to/replaced by 'catppuccin-fcitx5'"; # Converted to throw 2025-10-27
+  fcitx5-chinese-addons = throw "'fcitx5-chinese-addons' has been renamed to/replaced by 'qt6Packages.fcitx5-chinese-addons'"; # Converted to throw 2025-10-27
+  fcitx5-configtool = throw "'fcitx5-configtool' has been renamed to/replaced by 'qt6Packages.fcitx5-configtool'"; # Converted to throw 2025-10-27
+  fcitx5-skk-qt = throw "'fcitx5-skk-qt' has been renamed to/replaced by 'qt6Packages.fcitx5-skk-qt'"; # Converted to throw 2025-10-27
+  fcitx5-unikey = throw "'fcitx5-unikey' has been renamed to/replaced by 'qt6Packages.fcitx5-unikey'"; # Converted to throw 2025-10-27
+  fcitx5-with-addons = throw "'fcitx5-with-addons' has been renamed to/replaced by 'qt6Packages.fcitx5-with-addons'"; # Converted to throw 2025-10-27
+  fennel = throw "'fennel' has been renamed to/replaced by 'luaPackages.fennel'"; # Converted to throw 2025-10-27
   fetchbower = throw "fetchbower has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
-  FIL-plugins = fil-plugins; # Added 2024-06-12
+  FIL-plugins = throw "'FIL-plugins' has been renamed to/replaced by 'fil-plugins'"; # Converted to throw 2025-10-27
   filesender = throw "'filesender' has been removed because of its simplesamlphp dependency"; # Added 2025-10-17
-  finger_bsd = bsd-finger; # Added 2022-03-14
-  fingerd_bsd = bsd-fingerd; # Added 2022-03-14
-  fira-code-nerdfont = lib.warnOnInstantiate "fira-code-nerdfont is redundant. Use nerd-fonts.fira-code instead." nerd-fonts.fira-code; # Added 2024-11-10
+  finger_bsd = throw "'finger_bsd' has been renamed to/replaced by 'bsd-finger'"; # Converted to throw 2025-10-27
+  fingerd_bsd = throw "'fingerd_bsd' has been renamed to/replaced by 'bsd-fingerd'"; # Converted to throw 2025-10-27
+  fira-code-nerdfont = throw "'fira-code-nerdfont' has been renamed to/replaced by 'nerd-fonts.fira-code'"; # Converted to throw 2025-10-27
   firebird_2_5 = throw "'firebird_2_5' has been removed as it has reached end-of-life and does not build."; # Added 2025-06-10
   firefox-beta-bin = lib.warnOnInstantiate "`firefox-beta-bin` is removed.  Please use `firefox-beta` or `firefox-bin` instead." firefox-beta; # Added 2025-06-06
   firefox-devedition-bin = lib.warnOnInstantiate "`firefox-devedition-bin` is removed.  Please use `firefox-devedition` or `firefox-bin` instead." firefox-devedition; # Added 2025-06-06
   firefox-esr-128 = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-140` instead."; # Added 2025-08-21
   firefox-esr-128-unwrapped = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-140-unwrapped` instead."; # Added 2025-08-21
-  firefox-wayland = firefox; # Added 2022-11-15
-  firmwareLinuxNonfree = linux-firmware; # Added 2022-01-09
-  fishfight = jumpy; # Added 2022-08-03
-  fit-trackee = fittrackee; # added 2024-09-03
-  flashrom-stable = flashprog; # Added 2024-03-01
-  flatbuffers_2_0 = flatbuffers; # Added 2022-05-12
+  firefox-wayland = throw "'firefox-wayland' has been renamed to/replaced by 'firefox'"; # Converted to throw 2025-10-27
+  firmwareLinuxNonfree = throw "'firmwareLinuxNonfree' has been renamed to/replaced by 'linux-firmware'"; # Converted to throw 2025-10-27
+  fishfight = throw "'fishfight' has been renamed to/replaced by 'jumpy'"; # Converted to throw 2025-10-27
+  fit-trackee = throw "'fit-trackee' has been renamed to/replaced by 'fittrackee'"; # Converted to throw 2025-10-27
+  flashrom-stable = throw "'flashrom-stable' has been renamed to/replaced by 'flashprog'"; # Converted to throw 2025-10-27
+  flatbuffers_2_0 = throw "'flatbuffers_2_0' has been renamed to/replaced by 'flatbuffers'"; # Converted to throw 2025-10-27
   flint3 = flint; # Added 2025-09-21
   floorp = throw "floorp has been replaced with floorp-bin, as building from upstream sources has become unfeasible starting with version 12.x"; # Added 2025-09-06
   floorp-unwrapped = throw "floorp-unwrapped has been replaced with floorp-bin-unwrapped, as building from upstream sources has become unfeasible starting with version 12.x"; # Added 2025-09-06
-  flow-editor = flow-control; # Added 2025-03-05
+  flow-editor = throw "'flow-editor' has been renamed to/replaced by 'flow-control'"; # Converted to throw 2025-10-27
   flut-renamer = throw "flut-renamer is unmaintained and has been removed"; # Added 2025-08-26
   flutter326 = throw "flutter326 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-06-08
   fmsynth = throw "'fmsynth' has been removed as it was broken and unmaintained both upstream and in nixpkgs."; # Added 2025-09-01
-  follow = lib.warnOnInstantiate "follow has been renamed to folo" folo; # Added 2025-05-18
+  follow = throw "'follow' has been renamed to/replaced by 'folo'"; # Converted to throw 2025-10-27
   forge = throw "forge was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
-  forgejo-actions-runner = forgejo-runner; # Added 2024-04-04
-  fractal-next = fractal; # added 2023-11-25
-  framework-system-tools = framework-tool; # added 2023-12-09
-  francis = kdePackages.francis; # added 2024-07-13
-  freebsdCross = freebsd; # Added 2024-09-06
+  forgejo-actions-runner = throw "'forgejo-actions-runner' has been renamed to/replaced by 'forgejo-runner'"; # Converted to throw 2025-10-27
+  fractal-next = throw "'fractal-next' has been renamed to/replaced by 'fractal'"; # Converted to throw 2025-10-27
+  framework-system-tools = throw "'framework-system-tools' has been renamed to/replaced by 'framework-tool'"; # Converted to throw 2025-10-27
+  francis = throw "'francis' has been renamed to/replaced by 'kdePackages.francis'"; # Converted to throw 2025-10-27
+  freebsdCross = throw "'freebsdCross' has been renamed to/replaced by 'freebsd'"; # Converted to throw 2025-10-27
   freecad-qt6 = freecad; # added 2025-06-14
   freecad-wayland = freecad; # added 2025-06-14
   freeimage = throw "freeimage was removed due to numerous vulnerabilities"; # Added 2025-10-23
-  freerdp3 = freerdp; # added 2025-03-25
-  freerdpUnstable = freerdp; # added 2025-03-25
+  freerdp3 = throw "'freerdp3' has been renamed to/replaced by 'freerdp'"; # Converted to throw 2025-10-27
+  freerdpUnstable = throw "'freerdpUnstable' has been renamed to/replaced by 'freerdp'"; # Converted to throw 2025-10-27
   fusee-launcher = throw "'fusee-launcher' was removed as upstream removed the original source repository fearing legal repercussions"; # added 2025-07-05
-  futuresql = libsForQt5.futuresql; # added 2023-11-11
-  fx_cast_bridge = fx-cast-bridge; # added 2023-07-26
-  g4music = gapless; # Added 2024-07-26
+  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
+  g4music = throw "'g4music' has been renamed to/replaced by 'gapless'"; # Converted to throw 2025-10-27
   gamecube-tools = throw "gamecube-tools was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   garage_0_8 = throw "'garage_0_8' has been removed as it is unmaintained upstream"; # Added 2025-06-23
   garage_0_8_7 = throw "'garage_0_8_7' has been removed as it is unmaintained upstream"; # Added 2025-06-23
@@ -606,7 +606,7 @@ mapAliases {
   gfortran10 = throw "gfortran10 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gfortran11 = throw "gfortran11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gfortran12 = throw "gfortran12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
-  gg = go-graft; # Added 2025-03-07
+  gg = throw "'gg' has been renamed to/replaced by 'go-graft'"; # Converted to throw 2025-10-27
   ggobi = throw "'ggobi' has been removed from Nixpkgs, as it is unmaintained and broken"; # Added 2025-05-18
   gimp3 = gimp; # added 2025-10-03
   gimp3-with-plugins = gimp-with-plugins; # added 2025-10-03
@@ -616,10 +616,10 @@ mapAliases {
   gjay = throw "'gjay' has been removed as it is unmaintained upstream"; # Added 2025-05-25
   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
-  glew-egl = lib.warnOnInstantiate "'glew-egl' is now provided by 'glew' directly" glew; # Added 2024-08-11
-  glfw-wayland = glfw; # Added 2024-04-19
-  glfw-wayland-minecraft = glfw3-minecraft; # Added 2024-05-08
-  glxinfo = mesa-demos; # Added 2024-07-04
+  glew-egl = throw "'glew-egl' has been renamed to/replaced by 'glew'"; # Converted to throw 2025-10-27
+  glfw-wayland = throw "'glfw-wayland' has been renamed to/replaced by 'glfw'"; # Converted to throw 2025-10-27
+  glfw-wayland-minecraft = throw "'glfw-wayland-minecraft' has been renamed to/replaced by 'glfw3-minecraft'"; # Converted to throw 2025-10-27
+  glxinfo = throw "'glxinfo' has been renamed to/replaced by 'mesa-demos'"; # Converted to throw 2025-10-27
   gmnisrv = throw "'gmnisrv' has been removed due to lack of maintenance upstream"; # Added 2025-06-07
   gnat11 = throw "gnat11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gnat12 = throw "gnat12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
@@ -628,89 +628,89 @@ mapAliases {
   gnat-bootstrap12 = throw "gnat-bootstrap12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gnatboot11 = throw "gnatboot11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gnatboot12 = throw "gnatboot12 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
-  gnatboot = gnat-bootstrap; # Added 2023-04-07
-  gnatcoll-core = gnatPackages.gnatcoll-core; # Added 2024-02-25
-  gnatcoll-db2ada = gnatPackages.gnatcoll-db2ada; # Added 2024-02-25
-  gnatcoll-gmp = gnatPackages.gnatcoll-gmp; # Added 2024-02-25
-  gnatcoll-iconv = gnatPackages.gnatcoll-iconv; # Added 2024-02-25
-  gnatcoll-lzma = gnatPackages.gnatcoll-lzma; # Added 2024-02-25
-  gnatcoll-omp = gnatPackages.gnatcoll-omp; # Added 2024-02-25
-  gnatcoll-postgres = gnatPackages.gnatcoll-postgres; # Added 2024-02-25
-  gnatcoll-python3 = gnatPackages.gnatcoll-python3; # Added 2024-02-25
-  gnatcoll-readline = gnatPackages.gnatcoll-readline; # Added 2024-02-25
-  gnatcoll-sql = gnatPackages.gnatcoll-sql; # Added 2024-02-25
-  gnatcoll-sqlite = gnatPackages.gnatcoll-sqlite; # Added 2024-02-25
-  gnatcoll-syslog = gnatPackages.gnatcoll-syslog; # Added 2024-02-25
-  gnatcoll-xref = gnatPackages.gnatcoll-xref; # Added 2024-02-25
-  gnatcoll-zlib = gnatPackages.gnatcoll-zlib; # Added 2024-02-25
-  gnatinspect = gnatPackages.gnatinspect; # Added 2024-02-25
-  gnome-firmware-updater = gnome-firmware; # added 2022-04-14
-  gnome-passwordsafe = gnome-secrets; # added 2022-01-30
-  gnome-resources = resources; # added 2023-12-10
-  gnu-cobol = gnucobol; # Added 2024-09-17
+  gnatboot = throw "'gnatboot' has been renamed to/replaced by 'gnat-bootstrap'"; # Converted to throw 2025-10-27
+  gnatcoll-core = throw "'gnatcoll-core' has been renamed to/replaced by 'gnatPackages.gnatcoll-core'"; # Converted to throw 2025-10-27
+  gnatcoll-db2ada = throw "'gnatcoll-db2ada' has been renamed to/replaced by 'gnatPackages.gnatcoll-db2ada'"; # Converted to throw 2025-10-27
+  gnatcoll-gmp = throw "'gnatcoll-gmp' has been renamed to/replaced by 'gnatPackages.gnatcoll-gmp'"; # Converted to throw 2025-10-27
+  gnatcoll-iconv = throw "'gnatcoll-iconv' has been renamed to/replaced by 'gnatPackages.gnatcoll-iconv'"; # Converted to throw 2025-10-27
+  gnatcoll-lzma = throw "'gnatcoll-lzma' has been renamed to/replaced by 'gnatPackages.gnatcoll-lzma'"; # Converted to throw 2025-10-27
+  gnatcoll-omp = throw "'gnatcoll-omp' has been renamed to/replaced by 'gnatPackages.gnatcoll-omp'"; # Converted to throw 2025-10-27
+  gnatcoll-postgres = throw "'gnatcoll-postgres' has been renamed to/replaced by 'gnatPackages.gnatcoll-postgres'"; # Converted to throw 2025-10-27
+  gnatcoll-python3 = throw "'gnatcoll-python3' has been renamed to/replaced by 'gnatPackages.gnatcoll-python3'"; # Converted to throw 2025-10-27
+  gnatcoll-readline = throw "'gnatcoll-readline' has been renamed to/replaced by 'gnatPackages.gnatcoll-readline'"; # Converted to throw 2025-10-27
+  gnatcoll-sql = throw "'gnatcoll-sql' has been renamed to/replaced by 'gnatPackages.gnatcoll-sql'"; # Converted to throw 2025-10-27
+  gnatcoll-sqlite = throw "'gnatcoll-sqlite' has been renamed to/replaced by 'gnatPackages.gnatcoll-sqlite'"; # Converted to throw 2025-10-27
+  gnatcoll-syslog = throw "'gnatcoll-syslog' has been renamed to/replaced by 'gnatPackages.gnatcoll-syslog'"; # Converted to throw 2025-10-27
+  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
+  gnome-firmware-updater = throw "'gnome-firmware-updater' has been renamed to/replaced by 'gnome-firmware'"; # Converted to throw 2025-10-27
+  gnome-passwordsafe = throw "'gnome-passwordsafe' has been renamed to/replaced by 'gnome-secrets'"; # Converted to throw 2025-10-27
+  gnome-resources = throw "'gnome-resources' has been renamed to/replaced by 'resources'"; # Converted to throw 2025-10-27
+  gnu-cobol = throw "'gnu-cobol' has been renamed to/replaced by 'gnucobol'"; # Converted to throw 2025-10-27
   gnubik = throw "'gnubik' has been removed due to lack of maintainance upstream and its dependency on GTK 2"; # Added 2025-09-16
-  go-thumbnailer = thud; # Added 2023-09-21
-  go-upower-notify = upower-notify; # Added 2024-07-21
+  go-thumbnailer = throw "'go-thumbnailer' has been renamed to/replaced by 'thud'"; # Converted to throw 2025-10-27
+  go-upower-notify = throw "'go-upower-notify' has been renamed to/replaced by 'upower-notify'"; # Converted to throw 2025-10-27
   go_1_23 = throw "Go 1.23 is end-of-life and 'go_1_23' has been removed. Please use a newer Go toolchain."; # Added 2025-08-13
-  godot-export-templates = lib.warnOnInstantiate "godot-export-templates has been renamed to godot-export-templates-bin" godot-export-templates-bin; # Added 2025-03-27
-  godot_4-export-templates = lib.warnOnInstantiate "godot_4-export-templates has been renamed to godot_4-export-templates-bin" godot_4-export-templates-bin; # Added 2025-03-27
-  godot_4_3-export-templates = lib.warnOnInstantiate "godot_4_3-export-templates has been renamed to godot_4_3-export-templates-bin" godot_4_3-export-templates-bin; # Added 2025-03-27
-  godot_4_4-export-templates = lib.warnOnInstantiate "godot_4_4-export-templates has been renamed to godot_4_4-export-templates-bin" godot_4_4-export-templates-bin; # Added 2025-03-27
+  godot-export-templates = throw "'godot-export-templates' has been renamed to/replaced by 'godot-export-templates-bin'"; # Converted to throw 2025-10-27
+  godot_4-export-templates = throw "'godot_4-export-templates' has been renamed to/replaced by 'godot_4-export-templates-bin'"; # Converted to throw 2025-10-27
+  godot_4_3-export-templates = throw "'godot_4_3-export-templates' has been renamed to/replaced by 'godot_4_3-export-templates-bin'"; # Converted to throw 2025-10-27
+  godot_4_4-export-templates = throw "'godot_4_4-export-templates' has been renamed to/replaced by 'godot_4_4-export-templates-bin'"; # Converted to throw 2025-10-27
   goldwarden = throw "'goldwarden' has been removed, as it no longer works with new Bitwarden versions and is abandoned upstream"; # Added 2025-09-16
-  gprbuild-boot = gnatPackages.gprbuild-boot; # Added 2024-02-25
+  gprbuild-boot = throw "'gprbuild-boot' has been renamed to/replaced by 'gnatPackages.gprbuild-boot'"; # Converted to throw 2025-10-27
   gpxsee-qt5 = throw "gpxsee-qt5 was removed, use gpxsee instead"; # added 2025-09-09
   gpxsee-qt6 = gpxsee; # added 2025-09-09
   gr-framework = throw "gr-framework has been removed, as it was broken"; # Added 2025-08-25
-  graalvm-ce = graalvmPackages.graalvm-ce; # Added 2024-08-10
-  graalvm-oracle = graalvmPackages.graalvm-oracle; # Added 2024-12-17
-  graalvmCEPackages = graalvmPackages; # Added 2024-08-10
+  graalvm-ce = throw "'graalvm-ce' has been renamed to/replaced by 'graalvmPackages.graalvm-ce'"; # Converted to throw 2025-10-27
+  graalvm-oracle = throw "'graalvm-oracle' has been renamed to/replaced by 'graalvmPackages.graalvm-oracle'"; # Converted to throw 2025-10-27
+  graalvmCEPackages = throw "'graalvmCEPackages' has been renamed to/replaced by 'graalvmPackages'"; # Converted to throw 2025-10-27
   gradience = throw "`gradience` has been removed because it was archived upstream."; # Added 2025-09-20
-  grafana_reporter = grafana-reporter; # Added 2024-06-09
+  grafana_reporter = throw "'grafana_reporter' has been renamed to/replaced by 'grafana-reporter'"; # Converted to throw 2025-10-27
   graphite-kde-theme = throw "'graphite-kde-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  gringo = clingo; # added 2022-11-27
-  grub2_full = grub2; # Added 2022-11-18
-  gtkcord4 = dissent; # Added 2024-03-10
+  gringo = throw "'gringo' has been renamed to/replaced by 'clingo'"; # Converted to throw 2025-10-27
+  grub2_full = throw "'grub2_full' has been renamed to/replaced by 'grub2'"; # Converted to throw 2025-10-27
+  gtkcord4 = throw "'gtkcord4' has been renamed to/replaced by 'dissent'"; # Converted to throw 2025-10-27
   gtkextra = throw "'gtkextra' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
-  guile-disarchive = disarchive; # Added 2023-10-27
+  guile-disarchive = throw "'guile-disarchive' has been renamed to/replaced by 'disarchive'"; # Converted to throw 2025-10-27
   guile-sdl = throw "guile-sdl has been removed, as it was broken"; # Added 2025-08-25
   gutenprintBin = gutenprint-bin; # Added 2025-08-21
   gxneur = throw "'gxneur' has been removed due to lack of maintenance and reliance on gnome2 and 2to3."; # Added 2025-08-17
   hacpack = throw "hacpack has been removed from nixpkgs, as it has been taken down upstream"; # added 2025-09-26
   harmony-music = throw "harmony-music is unmaintained and has been removed"; # Added 2025-08-26
-  HentaiAtHome = hentai-at-home; # Added 2024-06-12
+  HentaiAtHome = throw "'HentaiAtHome' has been renamed to/replaced by 'hentai-at-home'"; # Converted to throw 2025-10-27
   hiawatha = throw "hiawatha has been removed, since it is no longer actively supported upstream, nor well maintained in nixpkgs"; # Added 2025-09-10
   hibernate = throw "hibernate has been removed due to lack of maintenance"; # Added 2025-09-10
   hiddify-app = throw "hiddify-app has been removed, since it is unmaintained"; # added 2025-08-20
   himitsu-firefox = throw "himitsu-firefox has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
   hobbes = throw "hobbes has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-20
   hpmyroom = throw "hpmyroom has been removed because it has been marked as broken since May 2024."; # Added 2025-10-11
-  hpp-fcl = coal; # Added 2024-11-15
-  hydra_unstable = hydra; # Added 2024-08-22
-  i3-gaps = i3; # Added 2023-01-03
+  hpp-fcl = throw "'hpp-fcl' has been renamed to/replaced by 'coal'"; # Converted to throw 2025-10-27
+  hydra_unstable = throw "'hydra_unstable' has been renamed to/replaced by 'hydra'"; # Converted to throw 2025-10-27
+  i3-gaps = throw "'i3-gaps' has been renamed to/replaced by 'i3'"; # Converted to throw 2025-10-27
   ibm-sw-tpm2 = throw "ibm-sw-tpm2 has been removed, as it was broken"; # Added 2025-08-25
   ikos = throw "ikos has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
   imaginer = throw "'imaginer' has been removed due to lack of upstream maintenance"; # Added 2025-08-15
-  immersed-vr = lib.warnOnInstantiate "'immersed-vr' has been renamed to 'immersed'" immersed; # Added 2024-08-11
-  inconsolata-nerdfont = lib.warnOnInstantiate "inconsolata-nerdfont is redundant. Use nerd-fonts.inconsolata instead." nerd-fonts.inconsolata; # Added 2024-11-10
-  incrtcl = tclPackages.incrtcl; # Added 2024-10-02
-  inotifyTools = inotify-tools; # Added 2015-09-01
+  immersed-vr = throw "'immersed-vr' has been renamed to/replaced by 'immersed'"; # Converted to throw 2025-10-27
+  inconsolata-nerdfont = throw "'inconsolata-nerdfont' has been renamed to/replaced by 'nerd-fonts.inconsolata'"; # Converted to throw 2025-10-27
+  incrtcl = throw "'incrtcl' has been renamed to/replaced by 'tclPackages.incrtcl'"; # Converted to throw 2025-10-27
+  inotifyTools = throw "'inotifyTools' has been renamed to/replaced by 'inotify-tools'"; # Converted to throw 2025-10-27
   insync-emblem-icons = throw "'insync-emblem-icons' has been removed, use 'insync-nautilus' instead"; # Added 2025-05-14
-  invalidateFetcherByDrvHash = testers.invalidateFetcherByDrvHash; # Added 2022-05-05
+  invalidateFetcherByDrvHash = throw "'invalidateFetcherByDrvHash' has been renamed to/replaced by 'testers.invalidateFetcherByDrvHash'"; # Converted to throw 2025-10-27
   invoiceplane = throw "'invoiceplane' doesn't support non-EOL PHP versions"; # Added 2025-10-03
   ioccheck = throw "ioccheck was dropped since it was unmaintained."; # Added 2025-07-06
-  ipfs = kubo; # Added 2022-09-27
-  ipfs-migrator = kubo-migrator; # Added 2022-09-27
-  ipfs-migrator-all-fs-repo-migrations = kubo-fs-repo-migrations; # Added 2022-09-27
-  ipfs-migrator-unwrapped = kubo-migrator-unwrapped; # Added 2022-09-27
+  ipfs = throw "'ipfs' has been renamed to/replaced by 'kubo'"; # Converted to throw 2025-10-27
+  ipfs-migrator = throw "'ipfs-migrator' has been renamed to/replaced by 'kubo-migrator'"; # Converted to throw 2025-10-27
+  ipfs-migrator-all-fs-repo-migrations = throw "'ipfs-migrator-all-fs-repo-migrations' has been renamed to/replaced by 'kubo-fs-repo-migrations'"; # Converted to throw 2025-10-27
+  ipfs-migrator-unwrapped = throw "'ipfs-migrator-unwrapped' has been renamed to/replaced by 'kubo-migrator-unwrapped'"; # Converted to throw 2025-10-27
   ir.lv2 = ir-lv2; # Added 2025-09-37
   isl_0_24 = throw "isl_0_24 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-10-18
-  iso-flags-png-320x420 = lib.warnOnInstantiate "iso-flags-png-320x420 has been renamed to iso-flags-png-320x240" iso-flags-png-320x240; # Added 2024-07-17
-  itktcl = tclPackages.itktcl; # Added 2024-10-02
+  iso-flags-png-320x420 = throw "'iso-flags-png-320x420' has been renamed to/replaced by 'iso-flags-png-320x240'"; # Converted to throw 2025-10-27
+  itktcl = throw "'itktcl' has been renamed to/replaced by 'tclPackages.itktcl'"; # Converted to throw 2025-10-27
   itpp = throw "itpp has been removed, as it was broken"; # Added 2025-08-25
   jack_rack = throw "'jack_rack' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
-  jami-client = jami; # Added 2023-02-10
-  jami-client-qt = jami-client; # Added 2022-11-06
-  jami-daemon = jami.daemon; # Added 2023-02-10
+  jami-client = throw "'jami-client' has been renamed to/replaced by 'jami'"; # Converted to throw 2025-10-27
+  jami-client-qt = throw "'jami-client-qt' has been renamed to/replaced by 'jami-client'"; # Converted to throw 2025-10-27
+  jami-daemon = throw "'jami-daemon' has been renamed to/replaced by 'jami.daemon'"; # Converted to throw 2025-10-27
   jdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
   jdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
   jikespg = throw "'jikespg' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
@@ -718,29 +718,29 @@ mapAliases {
   jscoverage = throw "jscoverage has been removed, as it was broken"; # Added 2025-08-25
   k2pdfopt = throw "'k2pdfopt' has been removed from nixpkgs as it was broken"; # Added 2025-09-27
   k3s_1_30 = throw "'k3s_1_30' has been removed from nixpkgs as it has reached end of life"; # Added 2025-09-01
-  kak-lsp = kakoune-lsp; # Added 2024-04-01
+  kak-lsp = throw "'kak-lsp' has been renamed to/replaced by 'kakoune-lsp'"; # Converted to throw 2025-10-27
   kanidm = lib.warnOnInstantiate "'kanidm' will be removed before 26.05. You must use a versioned package, e.g. 'kanidm_1_x'." kanidm_1_7; # Added 2025-09-01
   kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18
   kanidmWithSecretProvisioning = lib.warnOnInstantiate "'kanidmWithSecretProvisioning' will be removed before 26.05. You must use a versioned package, e.g. 'kanidmWithSecretProvisioning_1_x'." kanidmWithSecretProvisioning_1_7; # Added 2025-09-01
   kanidmWithSecretProvisioning_1_4 = throw "'kanidmWithSecretProvisioning_1_4' has been removed as it has reached end of life"; # Added 2025-06-18
   kbibtex = throw "'kbibtex' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
   kcli = throw "kcli has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
-  keepkey_agent = keepkey-agent; # added 2024-01-06
-  kgx = gnome-console; # Added 2022-02-19
+  keepkey_agent = throw "'keepkey_agent' has been renamed to/replaced by 'keepkey-agent'"; # Converted to throw 2025-10-27
+  kgx = throw "'kgx' has been renamed to/replaced by 'gnome-console'"; # Converted to throw 2025-10-27
   khoj = throw "khoj has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
   kmplayer = throw "'kmplayer' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
-  kodiGBM = kodi-gbm; # Added 2021-03-09
-  kodiPlain = kodi; # Added 2021-03-09
-  kodiPlainWayland = kodi-wayland; # Added 2021-03-09
-  kodiPlugins = kodiPackages; # Added 2021-03-09
-  krb5Full = krb5; # Added 2022-11-17
+  kodiGBM = throw "'kodiGBM' has been renamed to/replaced by 'kodi-gbm'"; # Converted to throw 2025-10-27
+  kodiPlain = throw "'kodiPlain' has been renamed to/replaced by 'kodi'"; # Converted to throw 2025-10-27
+  kodiPlainWayland = throw "'kodiPlainWayland' has been renamed to/replaced by 'kodi-wayland'"; # Converted to throw 2025-10-27
+  kodiPlugins = throw "'kodiPlugins' has been renamed to/replaced by 'kodiPackages'"; # Converted to throw 2025-10-27
+  krb5Full = throw "'krb5Full' has been renamed to/replaced by 'krb5'"; # Converted to throw 2025-10-27
   krunner-pass = throw "'krunner-pass' has been removed, as it only works on Plasma 5"; # Added 2025-08-30
   krunner-translator = throw "'krunner-translator' has been removed, as it only works on Plasma 5"; # Added 2025-08-30
   # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016"
   # now kube3d/k3d will take its place
-  kube3d = k3d; # Added 2022-07-05
-  kubei = kubeclarity; # Added 2023-05-20
-  kubo-migrator-all-fs-repo-migrations = kubo-fs-repo-migrations; # Added 2024-09-24
+  kube3d = throw "'kube3d' has been renamed to/replaced by 'k3d'"; # Converted to throw 2025-10-27
+  kubei = throw "'kubei' has been renamed to/replaced by 'kubeclarity'"; # Converted to throw 2025-10-27
+  kubo-migrator-all-fs-repo-migrations = throw "'kubo-migrator-all-fs-repo-migrations' has been renamed to/replaced by 'kubo-fs-repo-migrations'"; # Converted to throw 2025-10-27
   languageMachines.frog = frog; # Added 2025-10-7
   languageMachines.frogdata = frogdata; # Added 2025-10-7
   languageMachines.libfolia = libfolia; # Added 2025-10-7
@@ -752,72 +752,72 @@ mapAliases {
   languageMachines.ucto = ucto; # Added 2025-10-7
   languageMachines.uctodata = uctodata; # Added 2025-10-7
   lanzaboote-tool = throw "lanzaboote-tool has been removed due to lack of integration maintenance with nixpkgs. Consider using the Nix expressions provided by https://github.com/nix-community/lanzaboote"; # Added 2025-07-23
-  larynx = piper-tts; # Added 2023-05-09
-  LASzip2 = laszip_2; # Added 2024-06-12
-  LASzip = laszip; # Added 2024-06-12
-  latinmodern-math = lmmath; # Added 2020-03-17
+  larynx = throw "'larynx' has been renamed to/replaced by 'piper-tts'"; # Converted to throw 2025-10-27
+  LASzip2 = throw "'LASzip2' has been renamed to/replaced by 'laszip_2'"; # Converted to throw 2025-10-27
+  LASzip = throw "'LASzip' has been renamed to/replaced by 'laszip'"; # Converted to throw 2025-10-27
+  latinmodern-math = throw "'latinmodern-math' has been renamed to/replaced by 'lmmath'"; # Converted to throw 2025-10-27
   latte-dock = throw "'latte-dock' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   layan-kde = throw "'layan-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  lazarus-qt = lazarus-qt5; # Added 2024-12-25
-  ledger_agent = ledger-agent; # Added 2024-01-07
+  lazarus-qt = throw "'lazarus-qt' has been renamed to/replaced by 'lazarus-qt5'"; # Converted to throw 2025-10-27
+  ledger_agent = throw "'ledger_agent' has been renamed to/replaced by 'ledger-agent'"; # Converted to throw 2025-10-27
   lesstif = throw "'lesstif' has been removed due to its being broken and unmaintained upstream. Consider using 'motif' instead."; # Added 2024-06-09
-  lfs = dysk; # Added 2023-07-03
+  lfs = throw "'lfs' has been renamed to/replaced by 'dysk'"; # Converted to throw 2025-10-27
   libast = throw "'libast' has been removed due to lack of maintenance upstream."; # Added 2025-06-09
-  libayatana-appindicator-gtk3 = libayatana-appindicator; # Added 2022-10-18
-  libayatana-indicator-gtk3 = libayatana-indicator; # Added 2022-10-18
-  libbencodetools = bencodetools; # Added 2022-07-30
-  libbpf_1 = libbpf; # Added 2022-12-06
-  libbson = mongoc; # Added 2024-03-11
+  libayatana-appindicator-gtk3 = throw "'libayatana-appindicator-gtk3' has been renamed to/replaced by 'libayatana-appindicator'"; # Converted to throw 2025-10-27
+  libayatana-indicator-gtk3 = throw "'libayatana-indicator-gtk3' has been renamed to/replaced by 'libayatana-indicator'"; # Converted to throw 2025-10-27
+  libbencodetools = throw "'libbencodetools' has been renamed to/replaced by 'bencodetools'"; # Converted to throw 2025-10-27
+  libbpf_1 = throw "'libbpf_1' has been renamed to/replaced by 'libbpf'"; # Converted to throw 2025-10-27
+  libbson = throw "'libbson' has been renamed to/replaced by 'mongoc'"; # Converted to throw 2025-10-27
   libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
   libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
   libdwarf-lite = throw "`libdwarf-lite` has been replaced by `libdwarf` as it's mostly a mirror"; # Added 2025-06-16
   libfpx = throw "libfpx has been removed as it was unmaintained in Nixpkgs and had known vulnerabilities"; # Added 2025-05-20
   libgadu = throw "'libgadu' has been removed as upstream is unmaintained and has no dependents or maintainers in Nixpkgs"; # Added 2025-05-17
-  libgda = lib.warnOnInstantiate "'libgda' has been renamed to 'libgda5'" libgda5; # Added 2025-01-21
-  libgme = game-music-emu; # Added 2022-07-20
-  libgnome-keyring3 = libgnome-keyring; # Added 2024-06-22
-  libheimdal = heimdal; # Added 2022-11-18
-  libiconv-darwin = darwin.libiconv; # Added 2024-09-22
-  libixp_hg = libixp; # Added 2022-04-25
+  libgda = throw "'libgda' has been renamed to/replaced by 'libgda5'"; # Converted to throw 2025-10-27
+  libgme = throw "'libgme' has been renamed to/replaced by 'game-music-emu'"; # Converted to throw 2025-10-27
+  libgnome-keyring3 = throw "'libgnome-keyring3' has been renamed to/replaced by 'libgnome-keyring'"; # Converted to throw 2025-10-27
+  libheimdal = throw "'libheimdal' has been renamed to/replaced by 'heimdal'"; # Converted to throw 2025-10-27
+  libiconv-darwin = throw "'libiconv-darwin' has been renamed to/replaced by 'darwin.libiconv'"; # Converted to throw 2025-10-27
+  libixp_hg = throw "'libixp_hg' has been renamed to/replaced by 'libixp'"; # Converted to throw 2025-10-27
   libkkc = throw "'libkkc' has been removed due to lack of maintenance. Consider using anthy instead"; # added 2025-08-28
   libkkc-data = throw "'libkkc-data' has been removed as it depended on libkkc which was removed"; # Added 2025-08-28
   liblinphone = throw "'liblinphone' has been moved to 'linphonePackages.liblinphone'"; # Added 2025-09-20
   libmp3splt = throw "'libmp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17
   libmusicbrainz3 = throw "libmusicbrainz3 has been removed as it was obsolete and unused"; # Added 2025-09-16
   libmusicbrainz5 = libmusicbrainz; # Added 2025-09-16
-  libosmo-sccp = libosmo-sigtran; # Added 2024-12-20
+  libosmo-sccp = throw "'libosmo-sccp' has been renamed to/replaced by 'libosmo-sigtran'"; # Converted to throw 2025-10-27
   libpromhttp = throw "'libpromhttp' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-16
   libpseudo = throw "'libpseudo' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
-  libpulseaudio-vanilla = libpulseaudio; # Added 2022-04-20
-  libqt5pas = libsForQt5.libqtpas; # Added 2024-12-25
+  libpulseaudio-vanilla = throw "'libpulseaudio-vanilla' has been renamed to/replaced by 'libpulseaudio'"; # Converted to throw 2025-10-27
+  libqt5pas = throw "'libqt5pas' has been renamed to/replaced by 'libsForQt5.libqtpas'"; # Converted to throw 2025-10-27
   libquotient = throw "'libquotient' for qt5 was removed as upstream removed qt5 support. Consider explicitly upgrading to qt6 'libquotient'"; # Converted to throw 2025-07-04
-  LibreArp = librearp; # Added 2024-06-12
-  LibreArp-lv2 = librearp-lv2; # Added 2024-06-12
+  LibreArp = throw "'LibreArp' has been renamed to/replaced by 'librearp'"; # Converted to throw 2025-10-27
+  LibreArp-lv2 = throw "'LibreArp-lv2' has been renamed to/replaced by 'librearp-lv2'"; # Converted to throw 2025-10-27
   libreoffice-qt6 = libreoffice-qt; # Added 2025-08-30
   libreoffice-qt6-fresh = libreoffice-qt-fresh; # Added 2025-08-30
   libreoffice-qt6-fresh-unwrapped = libreoffice-qt-fresh.unwrapped; # Added 2025-08-30
   libreoffice-qt6-still = libreoffice-qt-still; # Added 2025-08-30
   libreoffice-qt6-still-unwrapped = libreoffice-qt-still.unwrapped; # Added 2025-08-30
   libreoffice-qt6-unwrapped = libreoffice-qt.unwrapped; # Added 2025-08-30
-  librewolf-wayland = librewolf; # Added 2022-11-15
-  librtlsdr = rtl-sdr; # Added 2023-02-18
-  libsForQt515 = libsForQt5; # Added 2022-11-24
+  librewolf-wayland = throw "'librewolf-wayland' has been renamed to/replaced by 'librewolf'"; # Converted to throw 2025-10-27
+  librtlsdr = throw "'librtlsdr' has been renamed to/replaced by 'rtl-sdr'"; # Converted to throw 2025-10-27
+  libsForQt515 = throw "'libsForQt515' has been renamed to/replaced by 'libsForQt5'"; # Converted to throw 2025-10-27
   libsmartcols = lib.warnOnInstantiate "'util-linux' should be used instead of 'libsmartcols'" util-linux; # Added 2025-09-03
-  libsoup = lib.warnOnInstantiate "'libsoup' has been renamed to 'libsoup_2_4'" libsoup_2_4; # Added 2024-12-02
+  libsoup = throw "'libsoup' has been renamed to/replaced by 'libsoup_2_4'"; # Converted to throw 2025-10-27
   libtap = throw "libtap has been removed, as it was unused and deprecated by its author in favour of cmocka"; # Added 2025-09-16
   libtcod = throw "'libtcod' has been removed due to being unused and having an incompatible build-system"; # Added 2025-10-04
-  libtensorflow-bin = libtensorflow; # Added 2022-09-25
+  libtensorflow-bin = throw "'libtensorflow-bin' has been renamed to/replaced by 'libtensorflow'"; # Converted to throw 2025-10-27
   libtorrent = throw "'libtorrent' has been renamed to 'libtorrent-rakshasa' for clearer distinction from 'libtorrent-rasterbar'"; # Added 2025-09-10
   libtransmission = lib.warnOnInstantiate (transmission3Warning {
     prefix = "lib";
   }) libtransmission_3; # Added 2024-06-10
   libviper = throw "'libviper' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
-  libwnck3 = libwnck; # Added 2021-06-23
-  lightdm_gtk_greeter = lightdm-gtk-greeter; # Added 2022-08-01
+  libwnck3 = throw "'libwnck3' has been renamed to/replaced by 'libwnck'"; # Converted to throw 2025-10-27
+  lightdm_gtk_greeter = throw "'lightdm_gtk_greeter' has been renamed to/replaced by 'lightdm-gtk-greeter'"; # Converted to throw 2025-10-27
   lightly-boehs = throw "'lightly-boehs' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   lightly-qt = throw "'lightly-qt' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   ligo = throw "ligo has been removed from nixpkgs for lack of maintainance"; # Added 2025-06-03
-  lima-bin = lib.warnOnInstantiate "lima-bin has been replaced by lima" lima; # Added 2025-05-13
+  lima-bin = throw "'lima-bin' has been renamed to/replaced by 'lima'"; # Converted to throw 2025-10-27
   lincity_ng = lib.warnOnInstantiate "lincity_ng has been renamed to lincity-ng" lincity-ng; # Added 2025-10-09
   linphone = linphonePackages.linphone-desktop; # Added 2025-09-20
   linux-libre = throw "linux_libre has been removed due to lack of maintenance"; # Added 2025-10-01
@@ -876,7 +876,7 @@ mapAliases {
   linuxPackages_ham = throw "linux_ham has been removed in favour of the standard kernel packages"; # Added 2025-06-24
   linuxPackages_hardened = linuxKernel.packages.linux_hardened; # Added 2025-08-10
   linuxPackages_latest-libre = throw "linux_latest_libre has been removed due to lack of maintenance"; # Added 2025-10-01
-  linuxPackages_latest_xen_dom0 = linuxPackages_latest; # Added 2021-04-04
+  linuxPackages_latest_xen_dom0 = throw "'linuxPackages_latest_xen_dom0' has been renamed to/replaced by 'linuxPackages_latest'"; # Converted to throw 2025-10-27
   linuxPackages_rpi0 = linuxKernel.packages.linux_rpi1;
   linuxPackages_rpi1 = linuxKernel.packages.linux_rpi1;
   linuxPackages_rpi2 = linuxKernel.packages.linux_rpi2;
@@ -887,15 +887,15 @@ mapAliases {
   linuxPackages_rt_5_10 = linuxKernel.packages.linux_rt_5_10;
   linuxPackages_rt_5_15 = linuxKernel.packages.linux_rt_5_15;
   linuxPackages_rt_6_1 = linuxKernel.packages.linux_rt_6_1;
-  linuxPackages_xen_dom0 = linuxPackages; # Added 2021-04-04
-  linuxPackages_xen_dom0_hardened = linuxPackages_hardened; # Added 2021-04-04
-  linuxstopmotion = stopmotion; # Added 2024-11-01
-  Literate = literate; # Added 2024-06-12
+  linuxPackages_xen_dom0 = throw "'linuxPackages_xen_dom0' has been renamed to/replaced by 'linuxPackages'"; # Converted to throw 2025-10-27
+  linuxPackages_xen_dom0_hardened = throw "'linuxPackages_xen_dom0_hardened' has been renamed to/replaced by 'linuxPackages_hardened'"; # Converted to throw 2025-10-27
+  linuxstopmotion = throw "'linuxstopmotion' has been renamed to/replaced by 'stopmotion'"; # Converted to throw 2025-10-27
+  Literate = throw "'Literate' has been renamed to/replaced by 'literate'"; # Converted to throw 2025-10-27
   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
   lizardfs = throw "lizardfs has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
-  llama = walk; # Added 2023-01-23
+  llama = throw "'llama' has been renamed to/replaced by 'walk'"; # Converted to throw 2025-10-27
   lld_12 = throw "lld_12 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   lld_13 = throw "lld_13 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
   lld_14 = throw "lld_14 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-10
@@ -920,8 +920,8 @@ mapAliases {
   llvmPackages_15 = throw "llvmPackages_15 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-12
   llvmPackages_16 = throw "llvmPackages_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   llvmPackages_17 = throw "llvmPackages_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
-  loco-cli = loco; # Added 2025-02-24
-  LPCNet = lpcnet; # Added 2025-05-05
+  loco-cli = throw "'loco-cli' has been renamed to/replaced by 'loco'"; # Converted to throw 2025-10-27
+  LPCNet = throw "'LPCNet' has been renamed to/replaced by 'lpcnet'"; # Converted to throw 2025-10-27
   luci-go = throw "luci-go has been removed since it was unused and failing to build for 5 months"; # Added 2025-08-27
   lxd = throw "
     LXD has been removed from NixOS due to lack of Nixpkgs maintenance.
@@ -957,8 +957,8 @@ mapAliases {
   lxde.lxsession = throw "'lxsession' has been moved to top-level. Use 'lxsession' directly"; # added 2025-08-31
   lxde.lxtask = throw "'lxtask' has been moved to top-level. Use 'lxtask' directly"; # added 2025-08-31
   lxdvdrip = throw "'lxdvdrip' has been removed due to lack of upstream maintenance."; # Added 2025-06-09
-  mac = monkeysAudio; # Added 2024-11-30
-  MACS2 = macs2; # Added 2023-06-12
+  mac = throw "'mac' has been renamed to/replaced by 'monkeysAudio'"; # Converted to throw 2025-10-27
+  MACS2 = throw "'MACS2' has been renamed to/replaced by 'macs2'"; # Converted to throw 2025-10-27
   magma_2_6_2 = throw "'magma_2_6_2' has been removed, use the latest 'magma' package instead."; # Added 2025-07-20
   magma_2_7_2 = throw "'magma_2_7_2' has been removed, use the latest 'magma' package instead."; # Added 2025-07-20
   mailcore2 = throw "'mailcore2' has been removed due to lack of upstream maintenance."; # Added 2025-06-09
@@ -966,37 +966,37 @@ mapAliases {
   mailnagWithPlugins = throw "mailnagWithPlugins has been removed because mailnag has been marked as broken since 2022."; # Added 2025-10-12
   manaplus = throw "manaplus has been removed, as it was broken"; # Added 2025-08-25
   mariadb-client = throw "mariadb-client has been renamed to mariadb.client"; # Converted to throw 2025-10-26
-  marwaita-manjaro = lib.warnOnInstantiate "marwaita-manjaro has been renamed to marwaita-teal" marwaita-teal; # Added 2024-07-08
-  marwaita-peppermint = lib.warnOnInstantiate "marwaita-peppermint has been renamed to marwaita-red" marwaita-red; # Added 2024-07-01
-  marwaita-pop_os = lib.warnOnInstantiate "marwaita-pop_os has been renamed to marwaita-yellow" marwaita-yellow; # Added 2024-10-29
-  marwaita-ubuntu = lib.warnOnInstantiate "marwaita-ubuntu has been renamed to marwaita-orange" marwaita-orange; # Added 2024-07-08
+  marwaita-manjaro = throw "'marwaita-manjaro' has been renamed to/replaced by 'marwaita-teal'"; # Converted to throw 2025-10-27
+  marwaita-peppermint = throw "'marwaita-peppermint' has been renamed to/replaced by 'marwaita-red'"; # Converted to throw 2025-10-27
+  marwaita-pop_os = throw "'marwaita-pop_os' has been renamed to/replaced by 'marwaita-yellow'"; # Converted to throw 2025-10-27
+  marwaita-ubuntu = throw "'marwaita-ubuntu' has been renamed to/replaced by 'marwaita-orange'"; # Converted to throw 2025-10-27
   material-kwin-decoration = throw "'material-kwin-decoration' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   mathlibtools = throw "mathlibtools has been removed as it was archived upstream in 2023"; # Added 2025-07-09
-  matomo_5 = matomo; # Added 2024-12-12
-  matrix-synapse-tools.rust-synapse-compress-state = lib.warnOnInstantiate "`matrix-synapse-tools.rust-synapse-compress-state` has been renamed to `rust-synapse-compress-state`" rust-synapse-compress-state; # Added 2025-03-04
-  matrix-synapse-tools.synadm = lib.warnOnInstantiate "`matrix-synapse-tools.synadm` has been renamed to `synadm`" synadm; # Added 2025-02-20
-  mcomix3 = mcomix; # Added 2022-06-05
-  mdt = md-tui; # Added 2024-09-03
+  matomo_5 = throw "'matomo_5' has been renamed to/replaced by 'matomo'"; # Converted to throw 2025-10-27
+  matrix-synapse-tools.rust-synapse-compress-state = throw "'matrix-synapse-tools.rust-synapse-compress-state' has been renamed to/replaced by 'rust-synapse-compress-state'"; # Converted to throw 2025-10-27
+  matrix-synapse-tools.synadm = throw "'matrix-synapse-tools.synadm' has been renamed to/replaced by 'synadm'"; # Converted to throw 2025-10-27
+  mcomix3 = throw "'mcomix3' has been renamed to/replaced by 'mcomix'"; # Converted to throw 2025-10-27
+  mdt = throw "'mdt' has been renamed to/replaced by 'md-tui'"; # Converted to throw 2025-10-27
   mediastreamer = throw "'mediastreamer' has been moved to 'linphonePackages.mediastreamer2'"; # Added 2025-09-20
   mediastreamer-openh264 = throw "'mediastreamer-openh264' has been moved to 'linphonePackages.msopenh264'"; # Added 2025-09-20
   meilisearch_1_11 = throw "'meilisearch_1_11' has been removed, as it is no longer supported"; # Added 2025-10-03
   melmatcheq.lv2 = melmatcheq-lv2; # Added 2025-09-27
   meteo = throw "'meteo' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
-  microcodeAmd = microcode-amd; # Added 2024-09-08
-  microcodeIntel = microcode-intel; # Added 2024-09-08
-  microsoft_gsl = microsoft-gsl; # Added 2023-05-26
-  MIDIVisualizer = midivisualizer; # Added 2024-06-12
+  microcodeAmd = throw "'microcodeAmd' has been renamed to/replaced by 'microcode-amd'"; # Converted to throw 2025-10-27
+  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
   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 = mailcap; # Added 2022-01-21
+  mime-types = throw "'mime-types' has been renamed to/replaced by 'mailcap'"; # Converted to throw 2025-10-27
   minecraft = throw "'minecraft' has been removed because the package was broken. Consider using 'prismlauncher' instead"; # Added 2025-09-06
-  minetest = luanti; # Added 2024-11-11
-  minetest-touch = luanti-client; # Added 2024-08-12
-  minetestclient = luanti-client; # Added 2024-11-11
-  minetestserver = luanti-server; # Added 2024-11-11
-  minizip2 = pkgs.minizip-ng; # Added 2022-12-28
+  minetest = throw "'minetest' has been renamed to/replaced by 'luanti'"; # Converted to throw 2025-10-27
+  minetest-touch = throw "'minetest-touch' has been renamed to/replaced by 'luanti-client'"; # Converted to throw 2025-10-27
+  minetestclient = throw "'minetestclient' has been renamed to/replaced by 'luanti-client'"; # Converted to throw 2025-10-27
+  minetestserver = throw "'minetestserver' has been renamed to/replaced by 'luanti-server'"; # Converted to throw 2025-10-27
+  minizip2 = throw "'minizip2' has been renamed to/replaced by 'minizip-ng'"; # Converted to throw 2025-10-27
   miru = throw "'miru' has been removed due to lack maintenance"; # Added 2025-08-21
   mlir_16 = throw "mlir_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   mlir_17 = throw "mlir_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
@@ -1012,53 +1012,53 @@ mapAliases {
   moralerspace-hwnf = throw "moralerspace-hwnf has been removed, use moralerspace-hw instead."; # Added 2025-08-30
   moralerspace-nf = throw "moralerspace-nf has been removed, use moralerspace instead."; # Added 2025-08-30
   morty = throw "morty has been removed, as searxng removed support for it and it was unmaintained."; # Added 2025-09-26
-  moz-phab = mozphab; # Added 2022-08-09
+  moz-phab = throw "'moz-phab' has been renamed to/replaced by 'mozphab'"; # Converted to throw 2025-10-27
   mp3splt = throw "'mp3splt' has been removed due to lack of maintenance upstream."; # Added 2025-05-17
-  mpc-cli = mpc; # Added 2024-10-14
-  mpc_cli = mpc; # Added 2024-10-14
-  mpdevil = plattenalbum; # Added 2024-05-22
+  mpc-cli = throw "'mpc-cli' has been renamed to/replaced by 'mpc'"; # Converted to throw 2025-10-27
+  mpc_cli = throw "'mpc_cli' has been renamed to/replaced by 'mpc'"; # Converted to throw 2025-10-27
+  mpdevil = throw "'mpdevil' has been renamed to/replaced by 'plattenalbum'"; # Converted to throw 2025-10-27
   mpdWithFeatures = lib.warnOnInstantiate "mpdWithFeatures has been replaced by mpd.override" mpd.override; # Added 2025-08-08
   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
   mrxvt = throw "'mrxvt' has been removed due to lack of maintainence upstream"; # Added 2025-09-25
   msgpack = throw "msgpack has been split into msgpack-c and msgpack-cxx"; # Added 2025-09-14
-  msp430NewlibCross = msp430Newlib; # Added 2024-09-06
-  mumps_par = lib.warnOnInstantiate "mumps_par has been renamed to mumps-mpi" mumps-mpi; # Added 2025-05-07
-  mustache-tcl = tclPackages.mustache-tcl; # Added 2024-10-02
-  mutt-with-sidebar = mutt; # Added 2022-09-17
+  msp430NewlibCross = throw "'msp430NewlibCross' has been renamed to/replaced by 'msp430Newlib'"; # Converted to throw 2025-10-27
+  mumps_par = throw "'mumps_par' has been renamed to/replaced by 'mumps-mpi'"; # Converted to throw 2025-10-27
+  mustache-tcl = throw "'mustache-tcl' has been renamed to/replaced by 'tclPackages.mustache-tcl'"; # Converted to throw 2025-10-27
+  mutt-with-sidebar = throw "'mutt-with-sidebar' has been renamed to/replaced by 'mutt'"; # Converted to throw 2025-10-27
   mx-puppet-discord = throw "mx-puppet-discord was removed since the packaging was unmaintained and was the sole user of sha1 hashes in nixpkgs"; # Added 2025-07-24
   mysql-client = throw "mysql-client has been replaced by mariadb.client"; # Converted to throw 2025-10-26
   n98-magerun = throw "n98-magerun doesn't support new PHP newer than 8.1"; # Added 2025-10-03
-  nagiosPluginsOfficial = monitoring-plugins; # Added 2017-08-07
+  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
   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 = ncdu; # Added 2022-07-22
+  ncdu_2 = throw "'ncdu_2' has been renamed to/replaced by 'ncdu'"; # Converted to throw 2025-10-27
   neardal = throw "neardal has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29
-  neocities-cli = neocities; # Added 2024-07-31
+  neocities-cli = throw "'neocities-cli' has been renamed to/replaced by 'neocities'"; # Converted to throw 2025-10-27
   netbox_4_1 = throw "netbox 4.1 series has been removed as it was EOL"; # Added 2025-10-14
-  netbsdCross = netbsd; # Added 2024-09-06
-  netsurf.browser = lib.warnOnInstantiate "'netsurf.browser' has been renamed to 'netsurf-browser'" netsurf-browser; # Added 2025-03-26
-  netsurf.buildsystem = lib.warnOnInstantiate "'netsurf.buildsystem' has been renamed to 'netsurf-buildsystem'" netsurf-buildsystem; # Added 2025-03-26
-  netsurf.libcss = lib.warnOnInstantiate "'netsurf.libcss' has been renamed to 'libcss'" libcss; # Added 2025-03-26
-  netsurf.libdom = lib.warnOnInstantiate "'netsurf.libdom' has been renamed to 'libdom'" libdom; # Added 2025-03-26
-  netsurf.libhubbub = lib.warnOnInstantiate "'netsurf.libhubbub' has been renamed to 'libhubbub'" libhubbub; # Added 2025-03-26
-  netsurf.libnsbmp = lib.warnOnInstantiate "'netsurf.libnsbmp' has been renamed to 'libnsbmp'" libnsbmp; # Added 2025-03-26
-  netsurf.libnsfb = lib.warnOnInstantiate "'netsurf.libnsfb' has been renamed to 'libnsfb'" libnsfb; # Added 2025-03-26
-  netsurf.libnsgif = lib.warnOnInstantiate "'netsurf.libnsgif' has been renamed to 'libnsgif'" libnsgif; # Added 2025-03-26
-  netsurf.libnslog = lib.warnOnInstantiate "'netsurf.libnslog' has been renamed to 'libnslog'" libnslog; # Added 2025-03-26
-  netsurf.libnspsl = lib.warnOnInstantiate "'netsurf.libnspsl' has been renamed to 'libnspsl'" libnspsl; # Added 2025-03-26
-  netsurf.libnsutils = lib.warnOnInstantiate "'netsurf.libnsutils' has been renamed to 'libnsutils'" libnsutils; # Added 2025-03-26
-  netsurf.libparserutils = lib.warnOnInstantiate "'netsurf.libparserutils' has been renamed to 'libparserutils'" libparserutils; # Added 2025-03-26
-  netsurf.libsvgtiny = lib.warnOnInstantiate "'netsurf.libsvgtiny' has been renamed to 'libsvgtiny'" libsvgtiny; # Added 2025-03-26
-  netsurf.libutf8proc = lib.warnOnInstantiate "'netsurf.libutf8proc' has been renamed to 'libutf8proc'" libutf8proc; # Added 2025-03-26
-  netsurf.libwapcaplet = lib.warnOnInstantiate "'netsurf.libwapcaplet' has been renamed to 'libwapcaplet'" libwapcaplet; # Added 2025-03-26
-  netsurf.nsgenbind = lib.warnOnInstantiate "'netsurf.nsgenbind' has been renamed to 'nsgenbind'" nsgenbind; # Added 2025-03-26
+  netbsdCross = throw "'netbsdCross' has been renamed to/replaced by 'netbsd'"; # Converted to throw 2025-10-27
+  netsurf.browser = throw "'netsurf.browser' has been renamed to/replaced by 'netsurf-browser'"; # Converted to throw 2025-10-27
+  netsurf.buildsystem = throw "'netsurf.buildsystem' has been renamed to/replaced by 'netsurf-buildsystem'"; # Converted to throw 2025-10-27
+  netsurf.libcss = throw "'netsurf.libcss' has been renamed to/replaced by 'libcss'"; # Converted to throw 2025-10-27
+  netsurf.libdom = throw "'netsurf.libdom' has been renamed to/replaced by 'libdom'"; # Converted to throw 2025-10-27
+  netsurf.libhubbub = throw "'netsurf.libhubbub' has been renamed to/replaced by 'libhubbub'"; # Converted to throw 2025-10-27
+  netsurf.libnsbmp = throw "'netsurf.libnsbmp' has been renamed to/replaced by 'libnsbmp'"; # Converted to throw 2025-10-27
+  netsurf.libnsfb = throw "'netsurf.libnsfb' has been renamed to/replaced by 'libnsfb'"; # Converted to throw 2025-10-27
+  netsurf.libnsgif = throw "'netsurf.libnsgif' has been renamed to/replaced by 'libnsgif'"; # Converted to throw 2025-10-27
+  netsurf.libnslog = throw "'netsurf.libnslog' has been renamed to/replaced by 'libnslog'"; # Converted to throw 2025-10-27
+  netsurf.libnspsl = throw "'netsurf.libnspsl' has been renamed to/replaced by 'libnspsl'"; # Converted to throw 2025-10-27
+  netsurf.libnsutils = throw "'netsurf.libnsutils' has been renamed to/replaced by 'libnsutils'"; # Converted to throw 2025-10-27
+  netsurf.libparserutils = throw "'netsurf.libparserutils' has been renamed to/replaced by 'libparserutils'"; # Converted to throw 2025-10-27
+  netsurf.libsvgtiny = throw "'netsurf.libsvgtiny' has been renamed to/replaced by 'libsvgtiny'"; # Converted to throw 2025-10-27
+  netsurf.libutf8proc = throw "'netsurf.libutf8proc' has been renamed to/replaced by 'libutf8proc'"; # Converted to throw 2025-10-27
+  netsurf.libwapcaplet = throw "'netsurf.libwapcaplet' has been renamed to/replaced by 'libwapcaplet'"; # Converted to throw 2025-10-27
+  netsurf.nsgenbind = throw "'netsurf.nsgenbind' has been renamed to/replaced by 'nsgenbind'"; # Converted to throw 2025-10-27
   nettools = net-tools; # Added 2025-06-11
   networkmanager_strongswan = networkmanager-strongswan; # added 2025-06-29
-  newlib-nanoCross = newlib-nano; # Added 2024-09-06
-  newlibCross = newlib; # Added 2024-09-06
+  newlib-nanoCross = throw "'newlib-nanoCross' has been renamed to/replaced by 'newlib-nano'"; # Converted to throw 2025-10-27
+  newlibCross = throw "'newlibCross' has been renamed to/replaced by 'newlib'"; # Converted to throw 2025-10-27
   newt-go = fosrl-newt; # Added 2025-06-24
   nextcloud30 = throw "
     Nextcloud v30 has been removed from `nixpkgs` as the support for is dropped
@@ -1073,8 +1073,8 @@ mapAliases {
   "; # Added 2025-09-25
   nextcloud30Packages = throw "Nextcloud 30 is EOL!"; # Added 2025-09-25
   nfstrace = throw "nfstrace has been removed, as it was broken"; # Added 2025-08-25
-  nix-direnv-flakes = nix-direnv; # Added 2021-11-09
-  nix-ld-rs = nix-ld; # Added 2024-08-17
+  nix-direnv-flakes = throw "'nix-direnv-flakes' has been renamed to/replaced by 'nix-direnv'"; # Converted to throw 2025-10-27
+  nix-ld-rs = throw "'nix-ld-rs' has been renamed to/replaced by 'nix-ld'"; # Converted to throw 2025-10-27
   nix-linter = throw "nix-linter has been removed as it was broken for 3 years and unmaintained upstream"; # Added 2025-09-06
   nix-plugin-pijul = throw "nix-plugin-pijul has been removed due to being discontinued"; # added 2025-05-18
   nix_2_3 = throw "'nix_2_3' has been removed, because it was unmaintained and insecure."; # Converted to throw 2025-07-24
@@ -1096,104 +1096,104 @@ mapAliases {
     else
       nixfmt;
   nixForLinking = throw "nixForLinking has been removed, use `nixVersions.nixComponents_<version>` instead"; # Added 2025-08-14
-  nixosTest = testers.nixosTest; # Added 2022-05-05
-  nixStable = nixVersions.stable; # Added 2022-01-24
+  nixosTest = throw "'nixosTest' has been renamed to/replaced by 'testers.nixosTest'"; # Converted to throw 2025-10-27
+  nixStable = throw "'nixStable' has been renamed to/replaced by 'nixVersions.stable'"; # Converted to throw 2025-10-27
   nm-tray = throw "'nm-tray' has been removed, as it only works with Plasma 5"; # Added 2025-08-30
   nomacs-qt6 = nomacs; # Added 2025-08-30
   norouter = throw "norouter has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-29
   notes-up = throw "'notes-up' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
   notify-sharp = throw "'notify-sharp' has been removed as it was unmaintained and depends on deprecated dbus-sharp versions"; # Added 2025-08-25
-  noto-fonts-emoji = noto-fonts-color-emoji; # Added 2023-09-09
-  noto-fonts-extra = noto-fonts; # Added 2023-04-08
-  NSPlist = nsplist; # Added 2024-01-05
+  noto-fonts-emoji = throw "'noto-fonts-emoji' has been renamed to/replaced by 'noto-fonts-color-emoji'"; # Converted to throw 2025-10-27
+  noto-fonts-extra = throw "'noto-fonts-extra' has been renamed to/replaced by 'noto-fonts'"; # Converted to throw 2025-10-27
+  NSPlist = throw "'NSPlist' has been renamed to/replaced by 'nsplist'"; # Converted to throw 2025-10-27
   nuget-to-nix = throw "nuget-to-nix has been removed as it was deprecated in favor of nuget-to-json. Please use nuget-to-json instead"; # Added 2025-08-28
-  nushellFull = lib.warnOnInstantiate "`nushellFull` has has been replaced by `nushell` as its features no longer exist" nushell; # Added 2024-05-30
-  o = orbiton; # Added 2023-04-09
-  oathToolkit = oath-toolkit; # Added 2022-04-04
+  nushellFull = throw "'nushellFull' has been renamed to/replaced by 'nushell'"; # Converted to throw 2025-10-27
+  o = throw "'o' has been renamed to/replaced by 'orbiton'"; # Converted to throw 2025-10-27
+  oathToolkit = throw "'oathToolkit' has been renamed to/replaced by 'oath-toolkit'"; # Converted to throw 2025-10-27
   obb = throw "obb has been removed because it has been marked as broken since 2023."; # Added 2025-10-11
   obliv-c = throw "obliv-c has been removed from Nixpkgs, as it has been unmaintained upstream for 4 years and does not build with supported GCC versions"; # Added 2025-08-18
   oclgrind = throw "oclgrind has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
-  oil = lib.warnOnInstantiate "Oil has been replaced with the faster native C++ version and renamed to 'oils-for-unix'. See also https://github.com/oils-for-unix/oils/wiki/Oils-Deployments" oils-for-unix; # Added 2024-10-22
-  onevpl-intel-gpu = lib.warnOnInstantiate "onevpl-intel-gpu has been renamed to vpl-gpu-rt" vpl-gpu-rt; # Added 2024-06-04
-  onlyoffice-bin = onlyoffice-desktopeditors; # Added 2024-09-20
-  onlyoffice-bin_latest = onlyoffice-bin; # Added 2024-07-03
+  oil = throw "'oil' has been renamed to/replaced by 'oils-for-unix'"; # Converted to throw 2025-10-27
+  onevpl-intel-gpu = throw "'onevpl-intel-gpu' has been renamed to/replaced by 'vpl-gpu-rt'"; # Converted to throw 2025-10-27
+  onlyoffice-bin = throw "'onlyoffice-bin' has been renamed to/replaced by 'onlyoffice-desktopeditors'"; # Converted to throw 2025-10-27
+  onlyoffice-bin_latest = throw "'onlyoffice-bin_latest' has been renamed to/replaced by 'onlyoffice-bin'"; # Converted to throw 2025-10-27
   onscripter-en = throw "onscripter-en has been removed due to lack of maintenance in both upstream and Nixpkgs; onscripter is available instead"; # Added 2025-10-17
   onthespot = throw "onethespot has been removed due to lack of upstream maintenance"; # Added 2025-09-26
   opae = throw "opae has been removed because it has been marked as broken since June 2023."; # Added 2025-10-11
   open-timeline-io = lib.warnOnInstantiate "'open-timeline-io' has been renamed to 'opentimelineio'" opentimelineio; # Added 2025-08-10
-  openafs_1_8 = openafs; # Added 2022-08-22
-  openai-triton-llvm = triton-llvm; # added 2024-07-18
-  openai-whisper-cpp = whisper-cpp; # Added 2024-12-13
+  openafs_1_8 = throw "'openafs_1_8' has been renamed to/replaced by 'openafs'"; # Converted to throw 2025-10-27
+  openai-triton-llvm = throw "'openai-triton-llvm' has been renamed to/replaced by 'triton-llvm'"; # Converted to throw 2025-10-27
+  openai-whisper-cpp = throw "'openai-whisper-cpp' has been renamed to/replaced by 'whisper-cpp'"; # Converted to throw 2025-10-27
   openbabel2 = throw "openbabel2 has been removed, as it was unused and unmaintained upstream; please use openbabel"; # Added 2025-09-17
   openbabel3 = openbabel; # Added 2025-09-17
-  openbsdCross = openbsd; # Added 2024-09-06
+  openbsdCross = throw "'openbsdCross' has been renamed to/replaced by 'openbsd'"; # Converted to throw 2025-10-27
   opencl-clang = throw "opencl-clang has been integrated into intel-graphics-compiler"; # Added 2025-09-10
-  openconnect_gnutls = openconnect; # Added 2022-03-29
-  openexr_3 = openexr; # Added 2025-03-12
-  openimageio2 = openimageio; # Added 2023-01-05
+  openconnect_gnutls = throw "'openconnect_gnutls' has been renamed to/replaced by 'openconnect'"; # Converted to throw 2025-10-27
+  openexr_3 = throw "'openexr_3' has been renamed to/replaced by 'openexr'"; # Converted to throw 2025-10-27
+  openimageio2 = throw "'openimageio2' has been renamed to/replaced by 'openimageio'"; # Converted to throw 2025-10-27
   openjdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
   openjdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
   openjfx24 = throw "OpenJFX 24 was removed as it has reached its end of life"; # Added 2025-10-04
   openmw-tes3mp = throw "'openmw-tes3mp' has been removed due to lack of maintenance upstream"; # Added 2025-08-30
-  openssl_3_0 = openssl_3; # Added 2022-06-27
-  opensycl = lib.warnOnInstantiate "'opensycl' has been renamed to 'adaptivecpp'" adaptivecpp; # Added 2024-12-04
-  opensyclWithRocm = lib.warnOnInstantiate "'opensyclWithRocm' has been renamed to 'adaptivecppWithRocm'" adaptivecppWithRocm; # Added 2024-12-04
+  openssl_3_0 = throw "'openssl_3_0' has been renamed to/replaced by 'openssl_3'"; # Converted to throw 2025-10-27
+  opensycl = throw "'opensycl' has been renamed to/replaced by 'adaptivecpp'"; # Converted to throw 2025-10-27
+  opensyclWithRocm = throw "'opensyclWithRocm' has been renamed to/replaced by 'adaptivecppWithRocm'"; # Converted to throw 2025-10-27
   opentofu-ls = lib.warnOnInstantiate "'opentofu-ls' has been renamed to 'tofu-ls'" tofu-ls; # Added 2025-06-10
   opentracing-cpp = throw "'opentracingc-cpp' has been removed as it was archived upstream in 2024"; # Added 2025-10-19
   opera = throw "'opera' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-05-19
   orogene = throw "'orogene' uses a wasm-specific fork of async-tar that is vulnerable to CVE-2025-62518, which is not supported by its upstream"; # Added 2025-10-24
   ortp = throw "'ortp' has been moved to 'linphonePackages.ortp'"; # Added 2025-09-20
-  OSCAR = oscar; # Added 2024-06-12
+  OSCAR = throw "'OSCAR' has been renamed to/replaced by 'oscar'"; # Converted to throw 2025-10-27
   osm2xmap = throw "osm2xmap has been removed, as it is unmaintained upstream and depended on old dependencies with broken builds"; # Added 2025-09-16
   overrideLibcxx = throw "overrideLibcxx has been removed, as it was no longer used and Darwin now uses libc++ from the latest SDK; see the Nixpkgs 25.11 release notes for details"; # Added 2025-09-15
   overrideSDK = throw "overrideSDK has been removed as it was a legacy compatibility stub. See <https://nixos.org/manual/nixpkgs/stable/#sec-darwin-legacy-frameworks-overrides> for migration instructions"; # Added 2025-08-04
-  pacup = perlPackages.pacup; # Added 2025-01-21
-  PageEdit = pageedit; # Added 2024-01-21
+  pacup = throw "'pacup' has been renamed to/replaced by 'perlPackages.pacup'"; # Converted to throw 2025-10-27
+  PageEdit = throw "'PageEdit' has been renamed to/replaced by 'pageedit'"; # Converted to throw 2025-10-27
   pal = throw "pal has been removed, as it was broken"; # Added 2025-08-25
-  paperless-ng = paperless-ngx; # Added 2022-04-11
-  patchelfStable = patchelf; # Added 2024-01-25
-  paup = paup-cli; # Added 2024-09-11
+  paperless-ng = throw "'paperless-ng' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2025-10-27
+  patchelfStable = throw "'patchelfStable' has been renamed to/replaced by 'patchelf'"; # Converted to throw 2025-10-27
+  paup = throw "'paup' has been renamed to/replaced by 'paup-cli'"; # Converted to throw 2025-10-27
   pcp = throw "'pcp' has been removed because the upstream repo was archived and it hasn't been updated since 2021"; # Added 2025-09-23
   pcre16 = throw "'pcre16' has been removed because it is obsolete. Consider migrating to 'pcre2' instead."; # Added 2025-05-29
-  pcsctools = pcsc-tools; # Added 2023-12-07
-  pdf4tcl = tclPackages.pdf4tcl; # Added 2024-10-02
+  pcsctools = throw "'pcsctools' has been renamed to/replaced by 'pcsc-tools'"; # Converted to throw 2025-10-27
+  pdf4tcl = throw "'pdf4tcl' has been renamed to/replaced by 'tclPackages.pdf4tcl'"; # Converted to throw 2025-10-27
   pds = lib.warnOnInstantiate "'pds' has been renamed to 'bluesky-pds'" bluesky-pds; # Added 2025-08-20
   pdsadmin = lib.warnOnInstantiate "'pdsadmin' has been renamed to 'bluesky-pdsadmin'" bluesky-pdsadmin; # Added 2025-08-20
-  peach = asouldocs; # Added 2022-08-28
-  pentablet-driver = xp-pen-g430-driver; # Added 2022-06-23
+  peach = throw "'peach' has been renamed to/replaced by 'asouldocs'"; # Converted to throw 2025-10-27
+  pentablet-driver = throw "'pentablet-driver' has been renamed to/replaced by 'xp-pen-g430-driver'"; # Converted to throw 2025-10-27
   perceptual-diff = throw "perceptual-diff was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
-  percona-server_innovation = lib.warnOnInstantiate "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-server; # Added 2024-10-13
-  percona-server_lts = percona-server; # Added 2024-10-13
-  percona-xtrabackup_innovation = lib.warnOnInstantiate "Percona upstream has decided to skip all Innovation releases of MySQL and only release LTS versions." percona-xtrabackup; # Added 2024-10-13
-  percona-xtrabackup_lts = percona-xtrabackup; # Added 2024-10-13
+  percona-server_innovation = throw "'percona-server_innovation' has been renamed to/replaced by 'percona-server'"; # Converted to throw 2025-10-27
+  percona-server_lts = throw "'percona-server_lts' has been renamed to/replaced by 'percona-server'"; # Converted to throw 2025-10-27
+  percona-xtrabackup_innovation = throw "'percona-xtrabackup_innovation' has been renamed to/replaced by 'percona-xtrabackup'"; # Converted to throw 2025-10-27
+  percona-xtrabackup_lts = throw "'percona-xtrabackup_lts' has been renamed to/replaced by 'percona-xtrabackup'"; # Converted to throw 2025-10-27
   peruse = throw "'peruse' has been removed as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
   pg_cron = throw "'pg_cron' has been removed. Use 'postgresqlPackages.pg_cron' instead."; # Added 2025-07-19
   pg_hll = throw "'pg_hll' has been removed. Use 'postgresqlPackages.pg_hll' instead."; # Added 2025-07-19
   pg_repack = throw "'pg_repack' has been removed. Use 'postgresqlPackages.pg_repack' instead."; # Added 2025-07-19
   pg_similarity = throw "'pg_similarity' has been removed. Use 'postgresqlPackages.pg_similarity' instead."; # Added 2025-07-19
   pg_topn = throw "'pg_topn' has been removed. Use 'postgresqlPackages.pg_topn' instead."; # Added 2025-07-19
-  pgadmin = pgadmin4; # Added 2022-01-14
+  pgadmin = throw "'pgadmin' has been renamed to/replaced by 'pgadmin4'"; # Converted to throw 2025-10-27
   pgf_graphics = throw "pgf_graphics was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   pgjwt = throw "'pgjwt' has been removed. Use 'postgresqlPackages.pgjwt' instead."; # Added 2025-07-19
   pgroonga = throw "'pgroonga' has been removed. Use 'postgresqlPackages.pgroonga' instead."; # Added 2025-07-19
   pgtap = throw "'pgtap' has been removed. Use 'postgresqlPackages.pgtap' instead."; # Added 2025-07-19
-  pharo-spur64 = pharo; # Added 2022-08-03
+  pharo-spur64 = throw "'pharo-spur64' has been renamed to/replaced by 'pharo'"; # Converted to throw 2025-10-27
   php81 = throw "php81 is EOL"; # Added 2025-10-04
   php81Extensions = throw "php81 is EOL"; # Added 2025-10-04
   php81Packages = throw "php81 is EOL"; # Added 2025-10-04
-  picom-next = picom; # Added 2024-02-13
-  pidgin-carbons = pidginPackages.pidgin-carbons; # Added 2023-07-17
-  pidgin-indicator = pidginPackages.pidgin-indicator; # Added 2023-07-17
-  pidgin-latex = pidginPackages.pidgin-latex; # Added 2023-07-17
+  picom-next = throw "'picom-next' has been renamed to/replaced by 'picom'"; # Converted to throw 2025-10-27
+  pidgin-carbons = throw "'pidgin-carbons' has been renamed to/replaced by 'pidginPackages.pidgin-carbons'"; # Converted to throw 2025-10-27
+  pidgin-indicator = throw "'pidgin-indicator' has been renamed to/replaced by 'pidginPackages.pidgin-indicator'"; # Converted to throw 2025-10-27
+  pidgin-latex = throw "'pidgin-latex' has been renamed to/replaced by 'pidginPackages.pidgin-latex'"; # Converted to throw 2025-10-27
   pidgin-mra = throw "'pidgin-mra' has been removed since mail.ru agent service has stopped functioning in 2024."; # Added 2025-09-17
   pidgin-msn-pecan = throw "'pidgin-msn-pecan' has been removed as it's unmaintained upstream and doesn't work with escargot"; # Added 2025-09-17
   pidgin-opensteamworks = throw "'pidgin-opensteamworks' has been removed as it is unmaintained and no longer works with Steam."; # Added 2025-09-17
-  pidgin-osd = pidginPackages.pidgin-osd; # Added 2023-07-17
-  pidgin-otr = pidginPackages.pidgin-otr; # Added 2023-07-17
-  pidgin-sipe = pidginPackages.pidgin-sipe; # Added 2023-07-17
+  pidgin-osd = throw "'pidgin-osd' has been renamed to/replaced by 'pidginPackages.pidgin-osd'"; # Converted to throw 2025-10-27
+  pidgin-otr = throw "'pidgin-otr' has been renamed to/replaced by 'pidginPackages.pidgin-otr'"; # Converted to throw 2025-10-27
+  pidgin-sipe = throw "'pidgin-sipe' has been renamed to/replaced by 'pidginPackages.pidgin-sipe'"; # Converted to throw 2025-10-27
   pidgin-skypeweb = throw "'pidgin-skypeweb' has been removed since Skype was shut down in May 2025"; # Added 2025-09-15
-  pidgin-window-merge = pidginPackages.pidgin-window-merge; # Added 2023-07-17
-  pidgin-xmpp-receipts = pidginPackages.pidgin-xmpp-receipts; # Added 2023-07-17
+  pidgin-window-merge = throw "'pidgin-window-merge' has been renamed to/replaced by 'pidginPackages.pidgin-window-merge'"; # Converted to throw 2025-10-27
+  pidgin-xmpp-receipts = throw "'pidgin-xmpp-receipts' has been renamed to/replaced by 'pidginPackages.pidgin-xmpp-receipts'"; # Converted to throw 2025-10-27
   pilipalax = throw "'pilipalax' has been removed from nixpkgs due to it not being maintained"; # Added 2025-07-25
   pinentry = throw "'pinentry' has been removed. Pick an appropriate variant like 'pinentry-curses' or 'pinentry-gnome3'"; # Converted to throw 2025-10-26
   piper-train = throw "piper-train is now part of the piper package using the `withTrain` override"; # Added 2025-09-03
@@ -1203,105 +1203,105 @@ mapAliases {
   platformioPackages.platformio-chrootenv = platformio-chrootenv; # Added 2025-09-04
   platformioPackages.platformio-core = platformio-core; # Added 2025-09-04
   plex-media-player = throw "'plex-media-player' has been discontinued, the new official client is available as 'plex-desktop'"; # Added 2025-05-28
-  PlistCpp = plistcpp; # Added 2024-01-05
-  pltScheme = racket; # Added 2013-02-24
+  PlistCpp = throw "'PlistCpp' has been renamed to/replaced by 'plistcpp'"; # Converted to throw 2025-10-27
+  pltScheme = throw "'pltScheme' has been renamed to/replaced by 'racket'"; # Converted to throw 2025-10-27
   plv8 = throw "'plv8' has been removed. Use 'postgresqlPackages.plv8' instead."; # Added 2025-07-19
   pn = throw "'pn' has been removed as upstream was archived in 2020"; # Added 2025-10-17
-  poac = cabinpkg; # Added 2025-01-22
-  pocket-updater-utility = pupdate; # Added 2024-01-25
-  podofo010 = podofo_0_10; # Added 2025-06-01
+  poac = throw "'poac' has been renamed to/replaced by 'cabinpkg'"; # Converted to throw 2025-10-27
+  pocket-updater-utility = throw "'pocket-updater-utility' has been renamed to/replaced by 'pupdate'"; # Converted to throw 2025-10-27
+  podofo010 = throw "'podofo010' has been renamed to/replaced by 'podofo_0_10'"; # Converted to throw 2025-10-27
   polipo = throw "'polipo' has been removed as it is unmaintained upstream"; # Added 2025-05-18
   polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25
-  poppler_utils = poppler-utils; # Added 2025-02-27
+  poppler_utils = throw "'poppler_utils' has been renamed to/replaced by 'poppler-utils'"; # Converted to throw 2025-10-27
   posterazor = throw "posterazor was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   postfixadmin = throw "'postfixadmin' has been removed due to lack of maintenance and missing support for PHP >8.1"; # Added 2025-10-03
   postgis = throw "'postgis' has been removed. Use 'postgresqlPackages.postgis' instead."; # Added 2025-07-19
-  postgresql13JitPackages = postgresql13Packages; # Added 2025-04-12
-  postgresql14JitPackages = postgresql14Packages; # Added 2025-04-12
-  postgresql15JitPackages = postgresql15Packages; # Added 2025-04-12
-  postgresql16JitPackages = postgresql16Packages; # Added 2025-04-12
-  postgresql17JitPackages = postgresql17Packages; # Added 2025-04-12
+  postgresql13JitPackages = throw "'postgresql13JitPackages' has been renamed to/replaced by 'postgresql13Packages'"; # Converted to throw 2025-10-27
+  postgresql14JitPackages = throw "'postgresql14JitPackages' has been renamed to/replaced by 'postgresql14Packages'"; # Converted to throw 2025-10-27
+  postgresql15JitPackages = throw "'postgresql15JitPackages' has been renamed to/replaced by 'postgresql15Packages'"; # Converted to throw 2025-10-27
+  postgresql16JitPackages = throw "'postgresql16JitPackages' has been renamed to/replaced by 'postgresql16Packages'"; # Converted to throw 2025-10-27
+  postgresql17JitPackages = throw "'postgresql17JitPackages' has been renamed to/replaced by 'postgresql17Packages'"; # Converted to throw 2025-10-27
   # Ever since building with JIT by default, those are the same.
-  postgresqlJitPackages = postgresqlPackages; # Added 2025-04-12
+  postgresqlJitPackages = throw "'postgresqlJitPackages' has been renamed to/replaced by 'postgresqlPackages'"; # Converted to throw 2025-10-27
   pot = throw "'pot' has been removed as it requires libsoup 2.4 which is EOL"; # Added 2025-10-09
-  powerdns = pdns; # Added 2022-03-28
+  powerdns = throw "'powerdns' has been renamed to/replaced by 'pdns'"; # Converted to throw 2025-10-27
   prboom-plus = throw "'prboom-plus' has been removed since it is unmaintained upstream."; # Added 2025-09-14
   presage = throw "presage has been removed, as it has been unmaintained since 2018"; # Added 2024-03-24
   preserves-nim = throw "'preserves-nim' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   private-gpt = throw "'private-gpt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2025-07-28
-  probe-rs = probe-rs-tools; # Added 2024-05-23
+  probe-rs = throw "'probe-rs' has been renamed to/replaced by 'probe-rs-tools'"; # Converted to throw 2025-10-27
   proj_7 = throw "proj_7 has been removed, as it was broken and unused"; # Added 2025-09-16
-  prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31
-  prometheus-dovecot-exporter = dovecot_exporter; # Added 2024-06-10
-  protobuf3_21 = protobuf_21; # Added 2023-10-05
+  prometheus-dmarc-exporter = throw "'prometheus-dmarc-exporter' has been renamed to/replaced by 'dmarc-metrics-exporter'"; # Converted to throw 2025-10-27
+  prometheus-dovecot-exporter = throw "'prometheus-dovecot-exporter' has been renamed to/replaced by 'dovecot_exporter'"; # Converted to throw 2025-10-27
+  protobuf3_21 = throw "'protobuf3_21' has been renamed to/replaced by 'protobuf_21'"; # Converted to throw 2025-10-27
   protobuf3_24 = throw "'protobuf_24' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-07-14
   protobuf_24 = throw "'protobuf_24' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-07-14
   protobuf_26 = throw "'protobuf_26' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-06-29
   protobuf_28 = throw "'protobuf_28' has been removed from nixpkgs. Consider using a more recent version of the protobuf library"; # Added 2025-06-14
   proton-caller = throw "'proton-caller' has been removed from nixpkgs due to being unmaintained and lack of upstream maintenance."; # Added 2025-09-25
   proton-vpn-local-agent = throw "'proton-vpn-local-agent' has been renamed to 'python3Packages.proton-vpn-local-agent'"; # Converted to throw 2025-10-26
-  protonup = protonup-ng; # Added 2022-11-06
+  protonup = throw "'protonup' has been renamed to/replaced by 'protonup-ng'"; # Converted to throw 2025-10-27
   protonvpn-cli = throw "protonvpn-cli source code was removed from upstream. Use protonvpn-gui instead."; # Added 2025-10-16
   protonvpn-cli_2 = throw "protonvpn-cli_2 has been removed due to being deprecated. Use protonvpn-gui instead."; # Added 2025-10-16
-  proxmark3-rrg = proxmark3; # Added 2023-07-25
-  purple-discord = pidginPackages.purple-discord; # Added 2023-07-17
+  proxmark3-rrg = throw "'proxmark3-rrg' has been renamed to/replaced by 'proxmark3'"; # Converted to throw 2025-10-27
+  purple-discord = throw "'purple-discord' has been renamed to/replaced by 'pidginPackages.purple-discord'"; # Converted to throw 2025-10-27
   purple-facebook = throw "'purple-facebook' has been removed as it is unmaintained and doesn't support e2ee enforced by facebook."; # Added 2025-09-17
-  purple-googlechat = pidginPackages.purple-googlechat; # Added 2023-07-17
+  purple-googlechat = throw "'purple-googlechat' has been renamed to/replaced by 'pidginPackages.purple-googlechat'"; # Converted to throw 2025-10-27
   purple-hangouts = throw "'purple-hangouts' has been removed as Hangouts Classic is obsolete and migrated to Google Chat."; # Added 2025-09-17
-  purple-lurch = pidginPackages.purple-lurch; # Added 2023-07-17
+  purple-lurch = throw "'purple-lurch' has been renamed to/replaced by 'pidginPackages.purple-lurch'"; # Converted to throw 2025-10-27
   purple-matrix = throw "'purple-matrix' has been unmaintained since April 2022, so it was removed."; # Added 2025-09-01
-  purple-mm-sms = pidginPackages.purple-mm-sms; # Added 2023-07-17
-  purple-plugin-pack = pidginPackages.purple-plugin-pack; # Added 2023-07-17
-  purple-slack = pidginPackages.purple-slack; # Added 2023-07-17
+  purple-mm-sms = throw "'purple-mm-sms' has been renamed to/replaced by 'pidginPackages.purple-mm-sms'"; # Converted to throw 2025-10-27
+  purple-plugin-pack = throw "'purple-plugin-pack' has been renamed to/replaced by 'pidginPackages.purple-plugin-pack'"; # Converted to throw 2025-10-27
+  purple-slack = throw "'purple-slack' has been renamed to/replaced by 'pidginPackages.purple-slack'"; # Converted to throw 2025-10-27
   purple-vk-plugin = throw "'purple-vk-plugin' has been removed as upstream repository was deleted and no active forks are found."; # Added 2025-09-17
-  purple-xmpp-http-upload = pidginPackages.purple-xmpp-http-upload; # Added 2023-07-17
-  pyo3-pack = maturin; # Added 2019-08-30
-  pypolicyd-spf = spf-engine; # Added 2022-10-09
+  purple-xmpp-http-upload = throw "'purple-xmpp-http-upload' has been renamed to/replaced by 'pidginPackages.purple-xmpp-http-upload'"; # Converted to throw 2025-10-27
+  pyo3-pack = throw "'pyo3-pack' has been renamed to/replaced by 'maturin'"; # Converted to throw 2025-10-27
+  pypolicyd-spf = throw "'pypolicyd-spf' has been renamed to/replaced by 'spf-engine'"; # Converted to throw 2025-10-27
   python3Full = throw "python3Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
   python310Full = throw "python310Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
   python311Full = throw "python311Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
   python312Full = throw "python312Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
   python313Full = throw "python313Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
   python314Full = throw "python314Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
-  python = python2; # Added 2022-01-11
-  pythonFull = python2Full; # Added 2022-01-11
-  pythonPackages = python.pkgs; # Added 2022-01-11
+  python = throw "'python' has been renamed to/replaced by 'python2'"; # Converted to throw 2025-10-27
+  pythonFull = throw "'pythonFull' has been renamed to/replaced by 'python2Full'"; # Converted to throw 2025-10-27
+  pythonPackages = throw "'pythonPackages' has been renamed to/replaced by 'python.pkgs'"; # Converted to throw 2025-10-27
   qcachegrind = throw "'qcachegrind' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
-  qflipper = qFlipper; # Added 2022-02-11
+  qflipper = throw "'qflipper' has been renamed to/replaced by 'qFlipper'"; # Converted to throw 2025-10-27
   qnial = throw "'qnial' has been removed due to failing to build and being unmaintained"; # Added 2025-06-26
   qrscan = throw "qrscan has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-19
-  qscintilla = libsForQt5.qscintilla; # Added 2023-09-20
-  qscintilla-qt6 = qt6Packages.qscintilla; # Added 2023-09-20
+  qscintilla = throw "'qscintilla' has been renamed to/replaced by 'libsForQt5.qscintilla'"; # Converted to throw 2025-10-27
+  qscintilla-qt6 = throw "'qscintilla-qt6' has been renamed to/replaced by 'qt6Packages.qscintilla'"; # Converted to throw 2025-10-27
   qt5Full = throw "qt5Full has been removed. Please use individual packages instead."; # Added 2025-10-18
-  qt6ct = qt6Packages.qt6ct; # Added 2023-03-07
-  qt515 = qt5; # Added 2022-11-24
+  qt6ct = throw "'qt6ct' has been renamed to/replaced by 'qt6Packages.qt6ct'"; # Converted to throw 2025-10-27
+  qt515 = throw "'qt515' has been renamed to/replaced by 'qt5'"; # Converted to throw 2025-10-27
   qt-video-wlr = throw "'qt-video-wlr' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
   qtchan = throw "'qtchan' has been removed due to lack of maintenance upstream"; # Added 2025-07-01
-  qtile-unwrapped = python3.pkgs.qtile; # Added 2023-05-12
-  quantum-espresso-mpi = quantum-espresso; # Added 2023-11-23
+  qtile-unwrapped = throw "'qtile-unwrapped' has been renamed to/replaced by 'python3.pkgs.qtile'"; # Converted to throw 2025-10-27
+  quantum-espresso-mpi = throw "'quantum-espresso-mpi' has been renamed to/replaced by 'quantum-espresso'"; # Converted to throw 2025-10-27
   quaternion-qt5 = throw "'quaternion-qt5' has been removed as quaternion dropped Qt5 support with v0.0.97.1"; # Added 2025-05-24
   qubes-core-vchan-xen = throw "'qubes-core-vchan-xen' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
   quicksynergy = throw "'quicksynergy' has been removed due to lack of maintenance upstream. Consider using 'deskflow' instead."; # Added 2025-06-18
   qv2ray = throw "'qv2ray' has been removed as it was unmaintained"; # Added 2025-06-03
-  radicale3 = radicale; # Added 2024-11-29
-  railway-travel = diebahn; # Added 2024-04-01
-  rambox-pro = rambox; # Added 2022-12-12
-  rapidjson-unstable = lib.warnOnInstantiate "'rapidjson-unstable' has been renamed to 'rapidjson'" rapidjson; # Added 2024-07-28
+  radicale3 = throw "'radicale3' has been renamed to/replaced by 'radicale'"; # Converted to throw 2025-10-27
+  railway-travel = throw "'railway-travel' has been renamed to/replaced by 'diebahn'"; # Converted to throw 2025-10-27
+  rambox-pro = throw "'rambox-pro' has been renamed to/replaced by 'rambox'"; # Converted to throw 2025-10-27
+  rapidjson-unstable = throw "'rapidjson-unstable' has been renamed to/replaced by 'rapidjson'"; # Converted to throw 2025-10-27
   redict = throw "'redict' has been removed due to lack of nixpkgs maintenance and a slow upstream development pace. Consider using 'valkey'."; # Added 2025-10-16
   redoc-cli = throw "'redoc-cli' been removed because it has been marked as broken since at least November 2024. Consider using 'redocly' instead."; # Added 2025-10-01
-  redocly-cli = redocly; # Added 2024-04-14
-  redpanda = redpanda-client; # Added 2023-10-14
+  redocly-cli = throw "'redocly-cli' has been renamed to/replaced by 'redocly'"; # Converted to throw 2025-10-27
+  redpanda = throw "'redpanda' has been renamed to/replaced by 'redpanda-client'"; # Converted to throw 2025-10-27
   remotebox = throw "remotebox has been removed because it was unmaintained and broken for a long time"; # Added 2025-09-11
   responsively-app = throw "'responsively-app' has been removed due to lack of maintainance upstream."; # Added 2025-06-25
-  retroarchBare = retroarch-bare; # Added 2024-11-23
-  retroarchFull = retroarch-full; # Added 2024-11-23
-  retroshare06 = retroshare; # Added 2020-11-07
+  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
-  rigsofrods = rigsofrods-bin; # Added 2023-03-22
+  rigsofrods = throw "'rigsofrods' has been renamed to/replaced by 'rigsofrods-bin'"; # Converted to throw 2025-10-27
   river = throw "'river' has been renamed to/replaced by 'river-classic'"; # Added 2025-08-30
   rke2_1_29 = throw "'rke2_1_29' has been removed from nixpkgs as it has reached end of life"; # Added 2025-05-05
-  rl_json = tclPackages.rl_json; # Added 2025-05-03
-  rockbox_utility = rockbox-utility; # Added 2022-03-17
+  rl_json = throw "'rl_json' has been renamed to/replaced by 'tclPackages.rl_json'"; # Converted to throw 2025-10-27
+  rockbox_utility = throw "'rockbox_utility' has been renamed to/replaced by 'rockbox-utility'"; # Converted to throw 2025-10-27
   rockcraft = throw "rockcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # added 2025-09-18
   rofi-emoji-wayland = throw "'rofi-emoji-wayland' has been merged into `rofi-emoji as 'rofi-wayland' has been merged into 'rofi'"; # Added 2025-09-06
   rofi-wayland = throw "'rofi-wayland' has been merged into 'rofi'"; # Added 2025-09-06
@@ -1309,25 +1309,25 @@ mapAliases {
   root5 = throw "root5 has been removed from nixpkgs because it's a legacy version"; # Added 2025-07-17
   rote = throw "rote has been removed due to lack of upstream maintenance"; # Added 2025-09-10
   rquickshare-legacy = throw "The legacy version depends on insecure package libsoup2, please use the main version"; # Added 2025-10-09
-  rr-unstable = rr; # Added 2022-09-17
+  rr-unstable = throw "'rr-unstable' has been renamed to/replaced by 'rr'"; # Converted to throw 2025-10-27
   # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix,
   # due to it being inside the linuxPackagesFor function.
-  rtx = mise; # Added 2024-01-05
+  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_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
   rubyPackages_3_1 = throw "rubyPackages_3_1 has been removed, as it is has reached end‐of‐life upstream"; # Added 2025-10-12
   rubyPackages_3_2 = throw "rubyPackages_3_2 has been removed, as it will reach end‐of‐life upstream during Nixpkgs 25.11’s support cycle"; # Added 2025-10-12
   rucksack = throw "rucksack was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
-  runCommandNoCC = runCommand; # Added 2021-08-15
-  runCommandNoCCLocal = runCommandLocal; # Added 2021-08-15
-  rust-synapse-state-compress = rust-synapse-compress-state; # Added 2025-03-08
-  rustc-wasm32 = rustc; # Added 2023-12-01
-  rustic-rs = rustic; # Added 2024-08-02
+  runCommandNoCC = throw "'runCommandNoCC' has been renamed to/replaced by 'runCommand'"; # Converted to throw 2025-10-27
+  runCommandNoCCLocal = throw "'runCommandNoCCLocal' has been renamed to/replaced by 'runCommandLocal'"; # Converted to throw 2025-10-27
+  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
   ryujinx = throw "'ryujinx' has been replaced by 'ryubing' as the new upstream"; # Added 2025-07-30
-  ryujinx-greemdev = ryubing; # Added 2025-01-20
-  scantailor = scantailor-advanced; # Added 2022-05-26
-  scitoken-cpp = scitokens-cpp; # Added 2024-02-12
+  ryujinx-greemdev = throw "'ryujinx-greemdev' has been renamed to/replaced by 'ryubing'"; # Converted to throw 2025-10-27
+  scantailor = throw "'scantailor' has been renamed to/replaced by 'scantailor-advanced'"; # Converted to throw 2025-10-27
+  scitoken-cpp = throw "'scitoken-cpp' has been renamed to/replaced by 'scitokens-cpp'"; # Converted to throw 2025-10-27
   scudcloud = throw "'scudcloud' has been removed as it was archived by upstream"; # Added 2025-07-24
   SDL2_classic = throw "'SDL2_classic' has been removed. Consider upgrading to 'sdl2-compat', also available as 'SDL2'."; # Added 2025-05-20
   SDL2_classic_image = throw "'SDL2_classic_image' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_image' built with 'sdl2-compat'."; # Added 2025-05-20
@@ -1335,15 +1335,15 @@ mapAliases {
   SDL2_classic_ttf = throw "'SDL2_classic_ttf' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_ttf' built with 'sdl2-compat'."; # Added 2025-05-20
   seafile-server = throw "'seafile-server' has been removed as it is unmaintained"; # Added 2025-08-21
   seahub = throw "'seahub' has been removed as it is unmaintained"; # Added 2025-08-21
-  sequoia = sequoia-sq; # Added 2023-06-26
-  session-desktop-appimage = session-desktop; # Added 2022-08-31
+  sequoia = throw "'sequoia' has been renamed to/replaced by 'sequoia-sq'"; # Converted to throw 2025-10-27
+  session-desktop-appimage = throw "'session-desktop-appimage' has been renamed to/replaced by 'session-desktop'"; # Converted to throw 2025-10-27
   setserial = throw "'setserial' has been removed as it had been abandoned upstream"; # Added 2025-05-18
-  sexp = sexpp; # Added 2023-07-03
+  sexp = throw "'sexp' has been renamed to/replaced by 'sexpp'"; # Converted to throw 2025-10-27
   shadered = throw "shadered has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
-  shipyard = jumppad; # Added 2023-06-06
-  siduck76-st = st-snazzy; # Added 2024-12-24
+  shipyard = throw "'shipyard' has been renamed to/replaced by 'jumppad'"; # Converted to throw 2025-10-27
+  siduck76-st = throw "'siduck76-st' has been renamed to/replaced by 'st-snazzy'"; # Converted to throw 2025-10-27
   sierra-breeze-enhanced = throw "'sierra-breeze-enhanced' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  signal-desktop-source = lib.warnOnInstantiate "'signal-desktop-source' is now exposed at 'signal-desktop'." signal-desktop; # Added 2025-04-16
+  signal-desktop-source = throw "'signal-desktop-source' has been renamed to/replaced by 'signal-desktop'"; # Converted to throw 2025-10-27
   simplesamlphp = throw "'simplesamlphp' was removed because it was unmaintained in nixpkgs"; # Added 2025-10-17
   siproxd = throw "'siproxd' has been removed as it was unmaintained and incompatible with newer libosip versions"; # Added 2025-05-18
   sipwitch = throw "'sipwitch' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
@@ -1354,56 +1354,56 @@ mapAliases {
   slic3r = throw "'slic3r' has been removed because it is unmaintained"; # Added 2025-08-26
   sloccount = throw "'sloccount' has been removed because it is unmaintained. Consider migrating to 'loccount'"; # added 2025-05-17
   slrn = throw "'slrn' has been removed because it is unmaintained upstream and broken."; # Added 2025-06-11
-  slurm-llnl = slurm; # Added 2017-07-31
-  smartgithg = smartgit; # Added 2025-03-31
+  slurm-llnl = throw "'slurm-llnl' has been renamed to/replaced by 'slurm'"; # Converted to throw 2025-10-27
+  smartgithg = throw "'smartgithg' has been renamed to/replaced by 'smartgit'"; # Converted to throw 2025-10-27
   snapcraft = throw "snapcraft was removed in Sep 25 following removal of LXD from nixpkgs"; # added 2025-09-18
   snort2 = throw "snort2 has been removed as it is deprecated and unmaintained by upstream. Consider using snort (snort3) package instead."; # 2025-05-21
   snowman = throw "snowman has been removed as it is unmaintained by upstream"; # 2025-10-12
-  soldat-unstable = opensoldat; # Added 2022-07-02
+  soldat-unstable = throw "'soldat-unstable' has been renamed to/replaced by 'opensoldat'"; # Converted to throw 2025-10-27
   somatic-sniper = throw "somatic-sniper has been removed as it was archived in 2020 and fails to build."; # Added 2025-10-14
   sonusmix = throw "'sonusmix' has been removed due to lack of maintenance"; # Added 2025-08-27
   soulseekqt = throw "'soulseekqt' has been removed due to lack of maintenance in Nixpkgs in a long time. Consider using 'nicotine-plus' or 'slskd' instead."; # Added 2025-06-07
   soundkonverter = throw "'soundkonverter' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20
-  soundOfSorting = sound-of-sorting; # Added 2023-07-07
-  source-han-sans-japanese = source-han-sans; # Added 2020-02-10
-  source-han-sans-korean = source-han-sans; # Added 2020-02-10
-  source-han-sans-simplified-chinese = source-han-sans; # Added 2020-02-10
-  source-han-sans-traditional-chinese = source-han-sans; # Added 2020-02-10
-  source-han-serif-japanese = source-han-serif; # Added 2020-02-10
-  source-han-serif-korean = source-han-serif; # Added 2020-02-10
-  source-han-serif-simplified-chinese = source-han-serif; # Added 2020-02-10
-  source-han-serif-traditional-chinese = source-han-serif; # Added 2020-02-10
-  sourceHanSansPackages.japanese = source-han-sans; # Added 2020-02-10
-  sourceHanSansPackages.korean = source-han-sans; # Added 2020-02-10
-  sourceHanSansPackages.simplified-chinese = source-han-sans; # Added 2020-02-10
-  sourceHanSansPackages.traditional-chinese = source-han-sans; # Added 2020-02-10
-  sourceHanSerifPackages.japanese = source-han-serif; # Added 2020-02-10
-  sourceHanSerifPackages.korean = source-han-serif; # Added 2020-02-10
-  sourceHanSerifPackages.simplified-chinese = source-han-serif; # Added 2020-02-10
-  sourceHanSerifPackages.traditional-chinese = source-han-serif; # Added 2020-02-10
+  soundOfSorting = throw "'soundOfSorting' has been renamed to/replaced by 'sound-of-sorting'"; # Converted to throw 2025-10-27
+  source-han-sans-japanese = throw "'source-han-sans-japanese' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27
+  source-han-sans-korean = throw "'source-han-sans-korean' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27
+  source-han-sans-simplified-chinese = throw "'source-han-sans-simplified-chinese' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27
+  source-han-sans-traditional-chinese = throw "'source-han-sans-traditional-chinese' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27
+  source-han-serif-japanese = throw "'source-han-serif-japanese' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2025-10-27
+  source-han-serif-korean = throw "'source-han-serif-korean' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2025-10-27
+  source-han-serif-simplified-chinese = throw "'source-han-serif-simplified-chinese' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2025-10-27
+  source-han-serif-traditional-chinese = throw "'source-han-serif-traditional-chinese' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2025-10-27
+  sourceHanSansPackages.japanese = throw "'sourceHanSansPackages.japanese' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27
+  sourceHanSansPackages.korean = throw "'sourceHanSansPackages.korean' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27
+  sourceHanSansPackages.simplified-chinese = throw "'sourceHanSansPackages.simplified-chinese' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27
+  sourceHanSansPackages.traditional-chinese = throw "'sourceHanSansPackages.traditional-chinese' has been renamed to/replaced by 'source-han-sans'"; # Converted to throw 2025-10-27
+  sourceHanSerifPackages.japanese = throw "'sourceHanSerifPackages.japanese' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2025-10-27
+  sourceHanSerifPackages.korean = throw "'sourceHanSerifPackages.korean' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2025-10-27
+  sourceHanSerifPackages.simplified-chinese = throw "'sourceHanSerifPackages.simplified-chinese' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2025-10-27
+  sourceHanSerifPackages.traditional-chinese = throw "'sourceHanSerifPackages.traditional-chinese' has been renamed to/replaced by 'source-han-serif'"; # Converted to throw 2025-10-27
   sourcehut = throw "'sourcehut.*' has been removed due to being broken and unmaintained"; # Added 2025-06-15
-  SP800-90B_EntropyAssessment = sp800-90b-entropyassessment; # Added on 2024-06-12
+  SP800-90B_EntropyAssessment = throw "'SP800-90B_EntropyAssessment' has been renamed to/replaced by 'sp800-90b-entropyassessment'"; # Converted to throw 2025-10-27
   space-orbit = throw "'space-orbit' has been removed because it is unmaintained; Debian upstream stopped tracking it in 2011."; # Added 2025-06-08
-  SPAdes = spades; # Added 2024-06-12
+  SPAdes = throw "'SPAdes' has been renamed to/replaced by 'spades'"; # Converted to throw 2025-10-27
   spago = spago-legacy; # Added 2025-09-23, pkgs.spago should become spago@next which hasn't been packaged yet
-  spark2014 = gnatprove; # Added 2024-02-25
+  spark2014 = throw "'spark2014' has been renamed to/replaced by 'gnatprove'"; # Converted to throw 2025-10-27
   # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell
   spidermonkey_91 = throw "'spidermonkey_91 is EOL since 2022/09"; # Added 2025-08-26
-  spotify-unwrapped = spotify; # added 2022-11-06
+  spotify-unwrapped = throw "'spotify-unwrapped' has been renamed to/replaced by 'spotify'"; # Converted to throw 2025-10-27
   spring = throw "spring has been removed, as it had been broken since 2023 (it was a game; maybe you’re thinking of spring-boot-cli?)"; # Added 2025-09-16
   springLobby = throw "springLobby has been removed, as it had been broken since 2023"; # Added 2025-09-16
   sqlbag = throw "sqlbag has been removed because it has been marked as broken since May 2024."; # Added 2025-10-11
-  ssm-agent = amazon-ssm-agent; # Added 2023-10-17
-  starpls-bin = starpls; # Added 2024-10-30
+  ssm-agent = throw "'ssm-agent' has been renamed to/replaced by 'amazon-ssm-agent'"; # Converted to throw 2025-10-27
+  starpls-bin = throw "'starpls-bin' has been renamed to/replaced by 'starpls'"; # Converted to throw 2025-10-27
   station = throw "station has been removed from nixpkgs, as there were no committers among its maintainers to unblock security issues"; # added 2025-06-16
-  steam-run-native = steam-run; # added 2022-02-21
-  steam-small = steam; # Added 2024-09-12
+  steam-run-native = throw "'steam-run-native' has been renamed to/replaced by 'steam-run'"; # Converted to throw 2025-10-27
+  steam-small = throw "'steam-small' has been renamed to/replaced by 'steam'"; # Converted to throw 2025-10-27
   steamcontroller = throw "'steamcontroller' has been removed due to lack of upstream maintenance. Consider using 'sc-controller' instead."; # Added 2025-09-20
-  steamPackages.steam = lib.warnOnInstantiate "`steamPackages.steam` has been moved to top level as `steam-unwrapped`" steam-unwrapped; # Added 2024-10-16
-  steamPackages.steam-fhsenv = lib.warnOnInstantiate "`steamPackages.steam-fhsenv` has been moved to top level as `steam`" steam; # Added 2024-10-16
-  steamPackages.steam-fhsenv-small = lib.warnOnInstantiate "`steamPackages.steam-fhsenv-small` has been moved to top level as `steam`; there is no longer a -small variant" steam; # Added 2024-10-16
-  steamPackages.steamcmd = lib.warnOnInstantiate "`steamPackages.steamcmd` has been moved to top level as `steamcmd`" steamcmd; # Added 2024-10-16
-  StormLib = stormlib; # Added 2024-01-21
+  steamPackages.steam = throw "'steamPackages.steam' has been renamed to/replaced by 'steam-unwrapped'"; # Converted to throw 2025-10-27
+  steamPackages.steam-fhsenv = throw "'steamPackages.steam-fhsenv' has been renamed to/replaced by 'steam'"; # Converted to throw 2025-10-27
+  steamPackages.steam-fhsenv-small = throw "'steamPackages.steam-fhsenv-small' has been renamed to/replaced by 'steam'"; # Converted to throw 2025-10-27
+  steamPackages.steamcmd = throw "'steamPackages.steamcmd' has been renamed to/replaced by 'steamcmd'"; # Converted to throw 2025-10-27
+  StormLib = throw "'StormLib' has been renamed to/replaced by 'stormlib'"; # Converted to throw 2025-10-27
   strawberry-qt5 = throw "strawberry-qt5 has been replaced by strawberry"; # Added 2024-11-22 and updated 2025-07-19
   strawberry-qt6 = throw "strawberry-qt6 has been replaced by strawberry"; # Added 2025-07-19
   subberthehut = throw "'subberthehut' has been removed as it was unmaintained upstream"; # Added 2025-05-17
@@ -1415,55 +1415,55 @@ mapAliases {
   sumaclust = throw "'sumaclust' has been removed as it was archived upstream and broken with GCC 14"; # Added 2025-06-14
   sumalibs = throw "'sumalibs' has been removed as it was archived upstream and broken with GCC 14"; # Added 2025-06-14
   sumatra = throw "'sumatra' has been removed as it was archived upstream and broken with GCC 14"; # Added 2025-06-14
-  sumneko-lua-language-server = lua-language-server; # Added 2023-02-07
-  swig4 = swig; # Added 2024-09-12
-  swiProlog = lib.warnOnInstantiate "swiProlog has been renamed to swi-prolog" swi-prolog; # Added 2024-09-07
-  swiPrologWithGui = lib.warnOnInstantiate "swiPrologWithGui has been renamed to swi-prolog-gui" swi-prolog-gui; # Added 2024-09-07
-  Sylk = sylk; # Added 2024-06-12
-  symbiyosys = sby; # Added 2024-08-18
+  sumneko-lua-language-server = throw "'sumneko-lua-language-server' has been renamed to/replaced by 'lua-language-server'"; # Converted to throw 2025-10-27
+  swig4 = throw "'swig4' has been renamed to/replaced by 'swig'"; # Converted to throw 2025-10-27
+  swiProlog = throw "'swiProlog' has been renamed to/replaced by 'swi-prolog'"; # Converted to throw 2025-10-27
+  swiPrologWithGui = throw "'swiPrologWithGui' has been renamed to/replaced by 'swi-prolog-gui'"; # Converted to throw 2025-10-27
+  Sylk = throw "'Sylk' has been renamed to/replaced by 'sylk'"; # Converted to throw 2025-10-27
+  symbiyosys = throw "'symbiyosys' has been renamed to/replaced by 'sby'"; # Converted to throw 2025-10-27
   syn2mas = throw "'syn2mas' has been removed. It has been integrated into the main matrix-authentication-service CLI as a subcommand: 'mas-cli syn2mas'."; # Added 2025-07-07
-  sync = taler-sync; # Added 2024-09-04
+  sync = throw "'sync' has been renamed to/replaced by 'taler-sync'"; # Converted to throw 2025-10-27
   syncall = throw "'syncall' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   syncthing-tray = throw "syncthing-tray has been removed because it is broken and unmaintained"; # Added 2025-05-18
-  syncthingtray-qt6 = syncthingtray; # Added 2024-03-06
+  syncthingtray-qt6 = throw "'syncthingtray-qt6' has been renamed to/replaced by 'syncthingtray'"; # Converted to throw 2025-10-27
   syndicate_utils = throw "'syndicate_utils' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   t1lib = throw "'t1lib' has been removed as it was broken and unmaintained upstream."; # Added 2025-06-11
   tamgamp.lv2 = tamgamp-lv2; # Added 2025-09-27
-  taplo-cli = taplo; # Added 2022-07-30
-  taplo-lsp = taplo; # Added 2022-07-30
-  targetcli = targetcli-fb; # Added 2025-03-14
-  taro = taproot-assets; # Added 2023-07-04
-  taskwarrior = lib.warnOnInstantiate "taskwarrior was replaced by taskwarrior3, which requires manual transition from taskwarrior 2.6, read upstream's docs: https://taskwarrior.org/docs/upgrade-3/" taskwarrior2; # Added 2024-08-14
+  taplo-cli = throw "'taplo-cli' has been renamed to/replaced by 'taplo'"; # Converted to throw 2025-10-27
+  taplo-lsp = throw "'taplo-lsp' has been renamed to/replaced by 'taplo'"; # Converted to throw 2025-10-27
+  targetcli = throw "'targetcli' has been renamed to/replaced by 'targetcli-fb'"; # Converted to throw 2025-10-27
+  taro = throw "'taro' has been renamed to/replaced by 'taproot-assets'"; # Converted to throw 2025-10-27
+  taskwarrior = throw "'taskwarrior' has been renamed to/replaced by 'taskwarrior2'"; # Converted to throw 2025-10-27
   tbb = onetbb; # Added 2025-09-14
   tbb_2020 = throw "tbb_2020 has been removed because it is unmaintained upstream and had no remaining users; use onetbb"; # Added 2025-09-14
   tbb_2021 = throw "tbb_2021 has been removed because it is unmaintained upstream and had no remaining users; use onetbb"; # Added 2025-09-13
   tbb_2022 = onetbb; # Added 2025-09-14
-  tcl-fcgi = tclPackages.tcl-fcgi; # Added 2024-10-02
-  tclcurl = tclPackages.tclcurl; # Added 2024-10-02
-  tcllib = tclPackages.tcllib; # Added 2024-10-02
-  tclmagick = tclPackages.tclmagick; # Added 2024-10-02
-  tcltls = tclPackages.tcltls; # Added 2024-10-02
-  tcludp = tclPackages.tcludp; # Added 2024-10-02
-  tclvfs = tclPackages.tclvfs; # Added 2024-10-02
-  tclx = tclPackages.tclx; # Added 2024-10-02
+  tcl-fcgi = throw "'tcl-fcgi' has been renamed to/replaced by 'tclPackages.tcl-fcgi'"; # Converted to throw 2025-10-27
+  tclcurl = throw "'tclcurl' has been renamed to/replaced by 'tclPackages.tclcurl'"; # Converted to throw 2025-10-27
+  tcllib = throw "'tcllib' has been renamed to/replaced by 'tclPackages.tcllib'"; # Converted to throw 2025-10-27
+  tclmagick = throw "'tclmagick' has been renamed to/replaced by 'tclPackages.tclmagick'"; # Converted to throw 2025-10-27
+  tcltls = throw "'tcltls' has been renamed to/replaced by 'tclPackages.tcltls'"; # Converted to throw 2025-10-27
+  tcludp = throw "'tcludp' has been renamed to/replaced by 'tclPackages.tcludp'"; # Converted to throw 2025-10-27
+  tclvfs = throw "'tclvfs' has been renamed to/replaced by 'tclPackages.tclvfs'"; # Converted to throw 2025-10-27
+  tclx = throw "'tclx' has been renamed to/replaced by 'tclPackages.tclx'"; # Converted to throw 2025-10-27
   tcp-cutter = throw "tcp-cutter has been removed because it fails to compile and the source url is dead"; # Added 2025-05-25
-  tdesktop = telegram-desktop; # Added 2023-04-07
-  tdlib-purple = pidginPackages.tdlib-purple; # Added 2023-07-17
-  tdom = tclPackages.tdom; # Added 2024-10-02
-  teamspeak5_client = teamspeak6-client; # Added 2025-01-29
-  teamspeak_client = teamspeak3; # Added 2024-11-07
+  tdesktop = throw "'tdesktop' has been renamed to/replaced by 'telegram-desktop'"; # Converted to throw 2025-10-27
+  tdlib-purple = throw "'tdlib-purple' has been renamed to/replaced by 'pidginPackages.tdlib-purple'"; # Converted to throw 2025-10-27
+  tdom = throw "'tdom' has been renamed to/replaced by 'tclPackages.tdom'"; # Converted to throw 2025-10-27
+  teamspeak5_client = throw "'teamspeak5_client' has been renamed to/replaced by 'teamspeak6-client'"; # Converted to throw 2025-10-27
+  teamspeak_client = throw "'teamspeak_client' has been renamed to/replaced by 'teamspeak3'"; # Converted to throw 2025-10-27
   tegaki-zinnia-japanese = throw "'tegaki-zinnia-japanese' has been removed due to lack of maintenance"; # Added 2025-09-10
   temporalite = throw "'temporalite' has been removed as it is obsolete and unmaintained, please use 'temporal-cli' instead (with `temporal server start-dev`)"; # Added 2025-06-26
   temurin-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04
   temurin-jre-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04
-  tepl = libgedit-tepl; # Added 2024-04-29
-  terminus-nerdfont = lib.warnOnInstantiate "terminus-nerdfont is redundant. Use nerd-fonts.terminess-ttf instead." nerd-fonts.terminess-ttf; # Added 2024-11-10
-  testVersion = testers.testVersion; # Added 2022-04-20
+  tepl = throw "'tepl' has been renamed to/replaced by 'libgedit-tepl'"; # Converted to throw 2025-10-27
+  terminus-nerdfont = throw "'terminus-nerdfont' has been renamed to/replaced by 'nerd-fonts.terminess-ttf'"; # Converted to throw 2025-10-27
+  testVersion = throw "'testVersion' has been renamed to/replaced by 'testers.testVersion'"; # Converted to throw 2025-10-27
   tet = throw "'tet' has been removed for lack of maintenance"; # Added 2025-10-12
   texinfo4 = throw "'texinfo4' has been removed in favor of the latest version"; # Added 2025-06-08
   textual-paint = throw "'textual-paint' has been removed as it is broken"; # Added 2025-09-10
   tezos-rust-libs = throw "ligo has been removed from nixpkgs for lack of maintainance"; # Added 2025-06-03
-  tfplugindocs = terraform-plugin-docs; # Added 2023-11-01
+  tfplugindocs = throw "'tfplugindocs' has been renamed to/replaced by 'terraform-plugin-docs'"; # Converted to throw 2025-10-27
   thefuck = throw "'thefuck' has been removed due to lack of maintenance upstream and incompatible with python 3.12+. Consider using 'pay-respects' instead"; # Added 2025-05-30
   theLoungePlugins = throw "'theLoungePlugins' has been removed due to only containing throws"; # Added 2025-09-25
   thrust = throw "'thrust' has been removed due to lack of maintenance"; # Added 2025-08-21
@@ -1472,19 +1472,19 @@ mapAliases {
   ticpp = throw "'ticpp' has been removed due to being unmaintained"; # Added 2025-09-10
   timescaledb = throw "'timescaledb' has been removed. Use 'postgresqlPackages.timescaledb' instead."; # Added 2025-07-19
   tinyxml2 = throw "The 'tinyxml2' alias has been removed, use 'tinyxml' for https://sourceforge.net/projects/tinyxml/ or 'tinyxml-2' for https://github.com/leethomason/tinyxml2"; # Added 2025-10-11
-  tix = tclPackages.tix; # Added 2024-10-02
-  tkcvs = tkrev; # Added 2022-03-07
+  tix = throw "'tix' has been renamed to/replaced by 'tclPackages.tix'"; # Converted to throw 2025-10-27
+  tkcvs = throw "'tkcvs' has been renamed to/replaced by 'tkrev'"; # Converted to throw 2025-10-27
   tkgate = throw "'tkgate' has been removed as it is unmaintained"; # Added 2025-05-17
-  tkimg = tclPackages.tkimg; # Added 2024-10-02
+  tkimg = throw "'tkimg' has been renamed to/replaced by 'tclPackages.tkimg'"; # Converted to throw 2025-10-27
   tlaplusToolbox = tlaplus-toolbox; # Added 2025-08-21
-  tokyo-night-gtk = tokyonight-gtk-theme; # Added 2024-01-28
-  tomcat_connectors = apacheHttpdPackages.mod_jk; # Added 2024-06-07
+  tokyo-night-gtk = throw "'tokyo-night-gtk' has been renamed to/replaced by 'tokyonight-gtk-theme'"; # Converted to throw 2025-10-27
+  tomcat_connectors = throw "'tomcat_connectors' has been renamed to/replaced by 'apacheHttpdPackages.mod_jk'"; # Converted to throw 2025-10-27
   tooling-language-server = deputy; # Added 2025-06-22
-  tor-browser-bundle-bin = tor-browser; # Added 2023-09-23
-  tracker = lib.warnOnInstantiate "tracker has been renamed to tinysparql" tinysparql; # Added 2024-09-30
-  tracker-miners = lib.warnOnInstantiate "tracker-miners has been renamed to localsearch" localsearch; # Added 2024-09-30
-  transfig = fig2dev; # Added 2022-02-15
-  transifex-client = transifex-cli; # Added 2023-12-29
+  tor-browser-bundle-bin = throw "'tor-browser-bundle-bin' has been renamed to/replaced by 'tor-browser'"; # Converted to throw 2025-10-27
+  tracker = throw "'tracker' has been renamed to/replaced by 'tinysparql'"; # Converted to throw 2025-10-27
+  tracker-miners = throw "'tracker-miners' has been renamed to/replaced by 'localsearch'"; # Converted to throw 2025-10-27
+  transfig = throw "'transfig' has been renamed to/replaced by 'fig2dev'"; # Converted to throw 2025-10-27
+  transifex-client = throw "'transifex-client' has been renamed to/replaced by 'transifex-cli'"; # Converted to throw 2025-10-27
   transmission = lib.warnOnInstantiate (transmission3Warning { }) transmission_3; # Added 2024-06-10
   transmission-gtk = lib.warnOnInstantiate (transmission3Warning {
     suffix = "-gtk";
@@ -1492,13 +1492,13 @@ mapAliases {
   transmission-qt = lib.warnOnInstantiate (transmission3Warning {
     suffix = "-qt";
   }) transmission_3-qt; # Added 2024-06-10
-  treefmt2 = lib.warnOnInstantiate "treefmt2 has been renamed to treefmt" treefmt; # 2025-03-06
+  treefmt2 = throw "'treefmt2' has been renamed to/replaced by 'treefmt'"; # Converted to throw 2025-10-27
   trenchbroom = throw "trenchbroom was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
-  trezor_agent = trezor-agent; # Added 2024-01-07
+  trezor_agent = throw "'trezor_agent' has been renamed to/replaced by 'trezor-agent'"; # Converted to throw 2025-10-27
   trilium-next-desktop = trilium-desktop; # Added 2025-08-30
   trilium-next-server = trilium-server; # Added 2025-08-30
   trojita = throw "'trojita' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20
-  trust-dns = hickory-dns; # Added 2024-08-07
+  trust-dns = throw "'trust-dns' has been renamed to/replaced by 'hickory-dns'"; # Converted to throw 2025-10-27
   tt-rss = throw "'tt-rss' has been removed, as it was discontinued on 2025-11-01"; # Added 2025-10-03
   tt-rss-plugin-auth-ldap = throw "'tt-rss-plugin-auth-ldap' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
   tt-rss-plugin-data-migration = throw "'tt-rss-plugin-data-migration' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
@@ -1506,40 +1506,40 @@ mapAliases {
   tt-rss-plugin-feedly = throw "'tt-rss-plugin-feedly' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
   tt-rss-plugin-ff-instagram = throw "'tt-rss-plugin-ff-instagram' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
   tt-rss-plugin-freshapi = throw "'tt-rss-plugin-freshapi' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
-  tvbrowser-bin = tvbrowser; # Added 2023-03-02
-  typst-fmt = typstfmt; # Added 2023-07-15
-  uade123 = uade; # Added 2022-07-30
+  tvbrowser-bin = throw "'tvbrowser-bin' has been renamed to/replaced by 'tvbrowser'"; # Converted to throw 2025-10-27
+  typst-fmt = throw "'typst-fmt' has been renamed to/replaced by 'typstfmt'"; # Converted to throw 2025-10-27
+  uade123 = throw "'uade123' has been renamed to/replaced by 'uade'"; # Converted to throw 2025-10-27
   uae = throw "'uae' has been removed due to lack of upstream maintenance. Consider using 'fsuae' instead."; # Added 2025-06-11
-  ubuntu_font_family = ubuntu-classic; # Added 2024-02-19
-  uclibc = uclibc-ng; # Added 2022-06-16
+  ubuntu_font_family = throw "'ubuntu_font_family' has been renamed to/replaced by 'ubuntu-classic'"; # Converted to throw 2025-10-27
+  uclibc = throw "'uclibc' has been renamed to/replaced by 'uclibc-ng'"; # Converted to throw 2025-10-27
   unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17
-  unifi-poller = unpoller; # Added 2022-11-24
+  unifi-poller = throw "'unifi-poller' has been renamed to/replaced by 'unpoller'"; # Converted to throw 2025-10-27
   unzoo = throw "'unzoo' has been removed since it is unmaintained upstream and doesn't compile with newer versions of GCC anymore"; # Removed 2025-05-24
-  util-linuxCurses = util-linux; # Added 2022-04-12
-  utillinux = util-linux; # Added 2020-11-24
-  vaapiIntel = intel-vaapi-driver; # Added 2023-05-31
-  vaapiVdpau = libva-vdpau-driver; # Added 2024-06-05
+  util-linuxCurses = throw "'util-linuxCurses' has been renamed to/replaced by 'util-linux'"; # Converted to throw 2025-10-27
+  utillinux = throw "'utillinux' has been renamed to/replaced by 'util-linux'"; # Converted to throw 2025-10-27
+  vaapiIntel = throw "'vaapiIntel' has been renamed to/replaced by 'intel-vaapi-driver'"; # Converted to throw 2025-10-27
+  vaapiVdpau = throw "'vaapiVdpau' has been renamed to/replaced by 'libva-vdpau-driver'"; # Converted to throw 2025-10-27
   valum = throw "'valum' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
-  vamp.vampSDK = vamp-plugin-sdk; # Added 2020-03-26
-  vaultwarden-vault = vaultwarden.webvault; # Added 2022-12-13
+  vamp.vampSDK = throw "'vamp.vampSDK' has been renamed to/replaced by 'vamp-plugin-sdk'"; # Converted to throw 2025-10-27
+  vaultwarden-vault = throw "'vaultwarden-vault' has been renamed to/replaced by 'vaultwarden.webvault'"; # Converted to throw 2025-10-27
   vbetool = throw "'vbetool' has been removed as it is broken and not maintained upstream."; # Added 2025-06-11
   vc_0_7 = throw "'vc_0_7' has been removed as it was broken, unused in nixpkgs and unmaintained"; # Added 2025-10-20
-  vdirsyncerStable = vdirsyncer; # Added 2020-11-08
-  ventoy-bin = ventoy; # Added 2023-04-12
-  ventoy-bin-full = ventoy-full; # Added 2023-04-12
-  verilog = iverilog; # Added 2024-07-12
+  vdirsyncerStable = throw "'vdirsyncerStable' has been renamed to/replaced by 'vdirsyncer'"; # Converted to throw 2025-10-27
+  ventoy-bin = throw "'ventoy-bin' has been renamed to/replaced by 'ventoy'"; # Converted to throw 2025-10-27
+  ventoy-bin-full = throw "'ventoy-bin-full' has been renamed to/replaced by 'ventoy-full'"; # Converted to throw 2025-10-27
+  verilog = throw "'verilog' has been renamed to/replaced by 'iverilog'"; # Converted to throw 2025-10-27
   veriT = verit; # Added 2025-08-21
   vieb = throw "'vieb' has been removed as it doesn't satisfy our security criteria for browsers."; # Added 2025-06-25
-  ViennaRNA = viennarna; # Added 2023-08-23
-  vim_configurable = vim-full; # Added 2022-12-04
-  vimHugeX = vim-full; # Added 2022-12-04
+  ViennaRNA = throw "'ViennaRNA' has been renamed to/replaced by 'viennarna'"; # Converted to throw 2025-10-27
+  vim_configurable = throw "'vim_configurable' has been renamed to/replaced by 'vim-full'"; # Converted to throw 2025-10-27
+  vimHugeX = throw "'vimHugeX' has been renamed to/replaced by 'vim-full'"; # Converted to throw 2025-10-27
   virt-manager-qt = throw "'virt-manager-qt' has been dropped as it depends on KDE Gear 5, and is unmaintained"; # Added 2025-08-20
   virtkey = throw "'virtkey' has been removed, as it was unmaintained, abandoned upstream, and relied on gtk2."; # Added 2025-10-12
-  vistafonts = vista-fonts; # Added 2025-02-03
-  vistafonts-chs = vista-fonts-chs; # Added 2025-02-03
-  vistafonts-cht = vista-fonts-cht; # Added 2025-02-03
-  vkBasalt = vkbasalt; # Added 2022-11-22
-  vkdt-wayland = vkdt; # Added 2024-04-19
+  vistafonts = throw "'vistafonts' has been renamed to/replaced by 'vista-fonts'"; # Converted to throw 2025-10-27
+  vistafonts-chs = throw "'vistafonts-chs' has been renamed to/replaced by 'vista-fonts-chs'"; # Converted to throw 2025-10-27
+  vistafonts-cht = throw "'vistafonts-cht' has been renamed to/replaced by 'vista-fonts-cht'"; # Converted to throw 2025-10-27
+  vkBasalt = throw "'vkBasalt' has been renamed to/replaced by 'vkbasalt'"; # Converted to throw 2025-10-27
+  vkdt-wayland = throw "'vkdt-wayland' has been renamed to/replaced by 'vkdt'"; # Converted to throw 2025-10-27
   volk_2 = throw "'volk_2' has been removed after not being used by any package for a long time"; # Added 2025-10-25
   voxelands = throw "'voxelands' has been removed due to lack of upstream maintenance"; # Added 2025-08-30
   vtk_9 = lib.warnOnInstantiate "'vtk_9' has been renamed to 'vtk_9_5'" vtk_9_5; # Added 2025-07-18
@@ -1549,8 +1549,8 @@ mapAliases {
   vwm = throw "'vwm' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
   w_scan = throw "'w_scan' has been removed due to lack of upstream maintenance"; # Added 2025-08-29
   waitron = throw "'waitron' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
-  wakatime = wakatime-cli; # 2024-05-30
-  wapp = tclPackages.wapp; # Added 2024-10-02
+  wakatime = throw "'wakatime' has been renamed to/replaced by 'wakatime-cli'"; # Converted to throw 2025-10-27
+  wapp = throw "'wapp' has been renamed to/replaced by 'tclPackages.wapp'"; # Converted to throw 2025-10-27
   warsow = throw "'warsow' has been removed as it is unmaintained and is broken"; # Added 2025-10-09
   warsow-engine = throw "'warsow-engine' has been removed as it is unmaintained and is broken"; # Added 2025-10-09
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_104;
@@ -1561,37 +1561,37 @@ mapAliases {
   webfontkitgenerator = webfont-bundler; # Added 2025-07-27
   webkitgtk = throw "'webkitgtk' attribute has been removed from nixpkgs, use attribute with ABI version set explicitly"; # Added 2025-06-11
   webkitgtk_4_0 = throw "'webkitgtk_4_0' has been removed, port to `libsoup_3` and switch to `webkitgtk_4_1`"; # Added 2025-10-08
-  whatsapp-for-linux = wasistlos; # Added 2025-01-30
+  whatsapp-for-linux = throw "'whatsapp-for-linux' has been renamed to/replaced by 'wasistlos'"; # Converted to throw 2025-10-27
   wifi-password = throw "'wifi-password' has been removed as it was unmaintained upstream"; # Added 2025-08-29
   win-pvdrivers = throw "'win-pvdrivers' has been removed as it was subject to the Xen build machine compromise (XSN-01) and has open security vulnerabilities (XSA-468)"; # Added 2025-08-29
-  win-virtio = virtio-win; # Added 2023-10-17
-  wineWayland = wine-wayland; # Added 2022-01-03
+  win-virtio = throw "'win-virtio' has been renamed to/replaced by 'virtio-win'"; # Converted to throw 2025-10-27
+  wineWayland = throw "'wineWayland' has been renamed to/replaced by 'wine-wayland'"; # Converted to throw 2025-10-27
   winhelpcgi = throw "'winhelpcgi' has been removed as it was unmaintained upstream and broken with GCC 14"; # Added 2025-06-14
-  wkhtmltopdf-bin = wkhtmltopdf; # Added 2024-07-17
-  wmii_hg = wmii; # Added 2022-04-26
+  wkhtmltopdf-bin = throw "'wkhtmltopdf-bin' has been renamed to/replaced by 'wkhtmltopdf'"; # Converted to throw 2025-10-27
+  wmii_hg = throw "'wmii_hg' has been renamed to/replaced by 'wmii'"; # Converted to throw 2025-10-27
   woof = throw "'woof' has been removed as it is broken and unmaintained upstream"; # Added 2025-09-04
   worldengine-cli = throw "'worldengine-cli' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
-  wpa_supplicant_ro_ssids = lib.warnOnInstantiate "Deprecated package: Please use wpa_supplicant instead. Read-only SSID patches are now upstream!" wpa_supplicant; # Added 2024-07-28
-  wrapGAppsHook = wrapGAppsHook3; # Added 2024-03-26
-  write_stylus = styluslabs-write-bin; # Added 2024-10-09
+  wpa_supplicant_ro_ssids = throw "'wpa_supplicant_ro_ssids' has been renamed to/replaced by 'wpa_supplicant'"; # Converted to throw 2025-10-27
+  wrapGAppsHook = throw "'wrapGAppsHook' has been renamed to/replaced by 'wrapGAppsHook3'"; # Converted to throw 2025-10-27
+  write_stylus = throw "'write_stylus' has been renamed to/replaced by 'styluslabs-write-bin'"; # Converted to throw 2025-10-27
   wxGTK33 = wxwidgets_3_3; # Added 2025-07-20
   xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28
   xbursttools = throw "'xbursttools' has been removed as it is broken and unmaintained upstream."; # Added 2025-06-12
-  xdragon = dragon-drop; # Added 2025-03-22
+  xdragon = throw "'xdragon' has been renamed to/replaced by 'dragon-drop'"; # Converted to throw 2025-10-27
   xflux = throw "'xflux' has been removed as it was unmaintained"; # Added 2025-08-22
   xflux-gui = throw "'xflux-gui' has been removed as it was unmaintained"; # Added 2025-08-22
   xinput_calibrator = xinput-calibrator; # Added 2025-08-28
   xjump = throw "'xjump' has been removed as it is unmaintained"; # Added 2025-08-22
-  xmlada = gnatPackages.xmlada; # Added 2024-02-25
+  xmlada = throw "'xmlada' has been renamed to/replaced by 'gnatPackages.xmlada'"; # Converted to throw 2025-10-27
   xmlroff = throw "'xmlroff' has been removed as it is unmaintained and broken"; # Added 2025-05-18
   xo = throw "Use 'dbtpl' instead of 'xo'"; # Added 2025-09-28
-  xonsh-unwrapped = python3Packages.xonsh; # Added 2024-06-18
+  xonsh-unwrapped = throw "'xonsh-unwrapped' has been renamed to/replaced by 'python3Packages.xonsh'"; # Converted to throw 2025-10-27
   xorg-autoconf = util-macros; # Added 2025-08-18
   xsw = throw "'xsw' has been removed due to lack of upstream maintenance"; # Added 2025-08-22
-  xulrunner = firefox-unwrapped; # Added 2023-11-03
+  xulrunner = throw "'xulrunner' has been renamed to/replaced by 'firefox-unwrapped'"; # Converted to throw 2025-10-27
   yabar = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10
   yabar-unstable = throw "'yabar' has been removed as the upstream project was archived"; # Added 2025-06-10
-  yafaray-core = libyafaray; # Added 2022-09-23
+  yafaray-core = throw "'yafaray-core' has been renamed to/replaced by 'libyafaray'"; # Converted to throw 2025-10-27
   yaml-cpp_0_3 = throw "yaml-cpp_0_3 has been removed, as it was unused"; # Added 2025-09-16
   yamlpath = throw "'yamlpath' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   yeahwm = throw "'yeahwm' has been removed, as it was broken and unmaintained upstream."; # Added 2025-06-12
@@ -1602,22 +1602,22 @@ mapAliases {
   zbackup = throw "'zbackup' has been removed due to being unmaintained upstream"; # Added 2025-08-22
   zeal-qt5 = lib.warnOnInstantiate "'zeal-qt5' has been removed from nixpkgs. Please use 'zeal' instead" zeal; # Added 2025-08-31
   zeal-qt6 = lib.warnOnInstantiate "'zeal-qt6' has been renamed to 'zeal'" zeal; # Added 2025-08-31
-  zeroadPackages.zeroad = lib.warnOnInstantiate "'zeroadPackages.zeroad' has been renamed to 'zeroad'" zeroad; # Added 2025-03-22
-  zeroadPackages.zeroad-data = lib.warnOnInstantiate "'zeroadPackages.zeroad-data' has been renamed to 'zeroad-data'" zeroad-data; # Added 2025-03-22
-  zeroadPackages.zeroad-unwrapped = lib.warnOnInstantiate "'zeroadPackages.zeroad-unwrapped' has been renamed to 'zeroad-unwrapped'" zeroad-unwrapped; # Added 2025-03-22
-  zeromq4 = zeromq; # Added 2024-11-03
-  zfsStable = zfs; # Added 2024-02-26
-  zfsUnstable = zfs_unstable; # Added 2024-02-26
+  zeroadPackages.zeroad = throw "'zeroadPackages.zeroad' has been renamed to/replaced by 'zeroad'"; # Converted to throw 2025-10-27
+  zeroadPackages.zeroad-data = throw "'zeroadPackages.zeroad-data' has been renamed to/replaced by 'zeroad-data'"; # Converted to throw 2025-10-27
+  zeroadPackages.zeroad-unwrapped = throw "'zeroadPackages.zeroad-unwrapped' has been renamed to/replaced by 'zeroad-unwrapped'"; # Converted to throw 2025-10-27
+  zeromq4 = throw "'zeromq4' has been renamed to/replaced by 'zeromq'"; # Converted to throw 2025-10-27
+  zfsStable = throw "'zfsStable' has been renamed to/replaced by 'zfs'"; # Converted to throw 2025-10-27
+  zfsUnstable = throw "'zfsUnstable' has been renamed to/replaced by 'zfs_unstable'"; # Converted to throw 2025-10-27
   zig_0_12 = throw "zig 0.12 has been removed, upgrade to a newer version instead"; # Added 2025-08-18
   zigbee2mqtt_1 = throw "Zigbee2MQTT 1.x has been removed, upgrade to the unversioned attribute."; # Added 2025-08-11
   zigbee2mqtt_2 = zigbee2mqtt; # Added 2025-08-11
-  zinc = zincsearch; # Added 2023-05-28
-  zint = zint-qt; # Added 2025-05-15
+  zinc = throw "'zinc' has been renamed to/replaced by 'zincsearch'"; # Converted to throw 2025-10-27
+  zint = throw "'zint' has been renamed to/replaced by 'zint-qt'"; # Converted to throw 2025-10-27
   zombietrackergps = throw "'zombietrackergps' has been dropped, as it depends on KDE Gear 5 and is unmaintained"; # Added 2025-08-20
   zotify = throw "zotify has been removed due to lack of upstream maintenance"; # Added 2025-09-26
   zq = throw "zq has been replaced by zed"; # Converted to throw 2025-10-26
   zsh-git-prompt = throw "zsh-git-prompt was removed as it is unmaintained upstream"; # Added 2025-08-28
-  zyn-fusion = zynaddsubfx; # Added 2022-08-05
+  zyn-fusion = throw "'zyn-fusion' has been renamed to/replaced by 'zynaddsubfx'"; # Converted to throw 2025-10-27
   # keep-sorted end
 }
 // plasma5Throws

From f30b22c39e1c087e0508b987556e25e394cec936 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 26 Oct 2025 18:00:12 +0000
Subject: [PATCH 3497/6226] =?UTF-8?q?aliases:=20restore=20prematurely?=
 =?UTF-8?q?=E2=80=90converted=20aliases?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The platform ones feel too scary to foist on users at this stage of
the release cycle, and the others were added after the 25.05 tag.
---
 pkgs/top-level/aliases.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e37cc2f91d75..958fb8ed4d4c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -237,10 +237,10 @@ mapAliases {
   forceSystem = system: _: (import self.path { localSystem = { inherit system; }; }); # Added 2018-07-16 preserve, reason: forceSystem should not be used directly in Nixpkgs.
 
   # TODO: Remove from Nixpkgs and eventually turn into throws.
-  system = throw "'system' has been renamed to/replaced by 'stdenv.hostPlatform.system'"; # Converted to throw 2025-10-27
-  buildPlatform = throw "'buildPlatform' has been renamed to/replaced by 'stdenv.buildPlatform'"; # Converted to throw 2025-10-27
-  hostPlatform = throw "'hostPlatform' has been renamed to/replaced by 'stdenv.hostPlatform'"; # Converted to throw 2025-10-27
-  targetPlatform = throw "'targetPlatform' has been renamed to/replaced by 'stdenv.targetPlatform'"; # Converted to throw 2025-10-27
+  system = stdenv.hostPlatform.system; # Added 2021-10-22
+  buildPlatform = stdenv.buildPlatform; # Added 2023-01-09
+  hostPlatform = stdenv.hostPlatform; # Added 2023-01-09
+  targetPlatform = stdenv.targetPlatform; # Added 2023-01-09
 
   # LLVM packages for (integration) testing that should not be used inside Nixpkgs:
   llvmPackages_latest = llvmPackages_21;
@@ -564,7 +564,7 @@ mapAliases {
   flut-renamer = throw "flut-renamer is unmaintained and has been removed"; # Added 2025-08-26
   flutter326 = throw "flutter326 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-06-08
   fmsynth = throw "'fmsynth' has been removed as it was broken and unmaintained both upstream and in nixpkgs."; # Added 2025-09-01
-  follow = throw "'follow' has been renamed to/replaced by 'folo'"; # Converted to throw 2025-10-27
+  follow = lib.warnOnInstantiate "follow has been renamed to folo" folo; # Added 2025-05-18
   forge = throw "forge was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   forgejo-actions-runner = throw "'forgejo-actions-runner' has been renamed to/replaced by 'forgejo-runner'"; # Converted to throw 2025-10-27
   fractal-next = throw "'fractal-next' has been renamed to/replaced by 'fractal'"; # Converted to throw 2025-10-27
@@ -817,7 +817,7 @@ mapAliases {
   lightly-boehs = throw "'lightly-boehs' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   lightly-qt = throw "'lightly-qt' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   ligo = throw "ligo has been removed from nixpkgs for lack of maintainance"; # Added 2025-06-03
-  lima-bin = throw "'lima-bin' has been renamed to/replaced by 'lima'"; # Converted to throw 2025-10-27
+  lima-bin = lib.warnOnInstantiate "lima-bin has been replaced by lima" lima; # Added 2025-05-13
   lincity_ng = lib.warnOnInstantiate "lincity_ng has been renamed to lincity-ng" lincity-ng; # Added 2025-10-09
   linphone = linphonePackages.linphone-desktop; # Added 2025-09-20
   linux-libre = throw "linux_libre has been removed due to lack of maintenance"; # Added 2025-10-01

From e12abb1a3fddddad8c9157ca5d9881266a2c87c0 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 28 Oct 2025 09:19:46 +0100
Subject: [PATCH 3498/6226] aliases: remove left-over comments

These were left in place by automation removing their respective
aliases.
---
 pkgs/top-level/aliases.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 958fb8ed4d4c..cf9926824db6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -736,8 +736,6 @@ mapAliases {
   krb5Full = throw "'krb5Full' has been renamed to/replaced by 'krb5'"; # Converted to throw 2025-10-27
   krunner-pass = throw "'krunner-pass' has been removed, as it only works on Plasma 5"; # Added 2025-08-30
   krunner-translator = throw "'krunner-translator' has been removed, as it only works on Plasma 5"; # Added 2025-08-30
-  # k3d was a 3d editing software k-3d - "k3d has been removed because it was broken and has seen no release since 2016"
-  # now kube3d/k3d will take its place
   kube3d = throw "'kube3d' has been renamed to/replaced by 'k3d'"; # Converted to throw 2025-10-27
   kubei = throw "'kubei' has been renamed to/replaced by 'kubeclarity'"; # Converted to throw 2025-10-27
   kubo-migrator-all-fs-repo-migrations = throw "'kubo-migrator-all-fs-repo-migrations' has been renamed to/replaced by 'kubo-fs-repo-migrations'"; # Converted to throw 2025-10-27
@@ -1221,7 +1219,6 @@ mapAliases {
   postgresql15JitPackages = throw "'postgresql15JitPackages' has been renamed to/replaced by 'postgresql15Packages'"; # Converted to throw 2025-10-27
   postgresql16JitPackages = throw "'postgresql16JitPackages' has been renamed to/replaced by 'postgresql16Packages'"; # Converted to throw 2025-10-27
   postgresql17JitPackages = throw "'postgresql17JitPackages' has been renamed to/replaced by 'postgresql17Packages'"; # Converted to throw 2025-10-27
-  # Ever since building with JIT by default, those are the same.
   postgresqlJitPackages = throw "'postgresqlJitPackages' has been renamed to/replaced by 'postgresqlPackages'"; # Converted to throw 2025-10-27
   pot = throw "'pot' has been removed as it requires libsoup 2.4 which is EOL"; # Added 2025-10-09
   powerdns = throw "'powerdns' has been renamed to/replaced by 'pdns'"; # Converted to throw 2025-10-27
@@ -1310,8 +1307,6 @@ mapAliases {
   rote = throw "rote has been removed due to lack of upstream maintenance"; # Added 2025-09-10
   rquickshare-legacy = throw "The legacy version depends on insecure package libsoup2, please use the main version"; # Added 2025-10-09
   rr-unstable = throw "'rr-unstable' has been renamed to/replaced by 'rr'"; # Converted to throw 2025-10-27
-  # The alias for linuxPackages*.rtlwifi_new is defined in ./all-packages.nix,
-  # due to it being inside the linuxPackagesFor function.
   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_3_1 = throw "ruby_3_1 has been removed, as it is has reached end‐of‐life upstream"; # Added 2025-10-12
@@ -1387,7 +1382,6 @@ mapAliases {
   SPAdes = throw "'SPAdes' has been renamed to/replaced by 'spades'"; # Converted to throw 2025-10-27
   spago = spago-legacy; # Added 2025-09-23, pkgs.spago should become spago@next which hasn't been packaged yet
   spark2014 = throw "'spark2014' has been renamed to/replaced by 'gnatprove'"; # Converted to throw 2025-10-27
-  # spidermonkey is not ABI upwards-compatible, so only allow this for nix-shell
   spidermonkey_91 = throw "'spidermonkey_91 is EOL since 2022/09"; # Added 2025-08-26
   spotify-unwrapped = throw "'spotify-unwrapped' has been renamed to/replaced by 'spotify'"; # Converted to throw 2025-10-27
   spring = throw "spring has been removed, as it had been broken since 2023 (it was a game; maybe you’re thinking of spring-boot-cli?)"; # Added 2025-09-16

From fbf01f54b175df565b20401a6bac9175fa831aa1 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 28 Oct 2025 09:32:41 +0100
Subject: [PATCH 3499/6226] aliases: fix some dates

---
 pkgs/top-level/aliases.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index cf9926824db6..f40183e4d867 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -758,7 +758,7 @@ mapAliases {
   layan-kde = throw "'layan-kde' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   lazarus-qt = throw "'lazarus-qt' has been renamed to/replaced by 'lazarus-qt5'"; # Converted to throw 2025-10-27
   ledger_agent = throw "'ledger_agent' has been renamed to/replaced by 'ledger-agent'"; # Converted to throw 2025-10-27
-  lesstif = throw "'lesstif' has been removed due to its being broken and unmaintained upstream. Consider using 'motif' instead."; # Added 2024-06-09
+  lesstif = throw "'lesstif' has been removed due to its being broken and unmaintained upstream. Consider using 'motif' instead."; # Added 2025-06-09
   lfs = throw "'lfs' has been renamed to/replaced by 'dysk'"; # Converted to throw 2025-10-27
   libast = throw "'libast' has been removed due to lack of maintenance upstream."; # Added 2025-06-09
   libayatana-appindicator-gtk3 = throw "'libayatana-appindicator-gtk3' has been renamed to/replaced by 'libayatana-appindicator'"; # Converted to throw 2025-10-27
@@ -1223,7 +1223,7 @@ mapAliases {
   pot = throw "'pot' has been removed as it requires libsoup 2.4 which is EOL"; # Added 2025-10-09
   powerdns = throw "'powerdns' has been renamed to/replaced by 'pdns'"; # Converted to throw 2025-10-27
   prboom-plus = throw "'prboom-plus' has been removed since it is unmaintained upstream."; # Added 2025-09-14
-  presage = throw "presage has been removed, as it has been unmaintained since 2018"; # Added 2024-03-24
+  presage = throw "presage has been removed, as it has been unmaintained since 2018"; # Added 2025-06-19
   preserves-nim = throw "'preserves-nim' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   private-gpt = throw "'private-gpt' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2025-07-28
   probe-rs = throw "'probe-rs' has been renamed to/replaced by 'probe-rs-tools'"; # Converted to throw 2025-10-27
@@ -1398,7 +1398,7 @@ mapAliases {
   steamPackages.steam-fhsenv-small = throw "'steamPackages.steam-fhsenv-small' has been renamed to/replaced by 'steam'"; # Converted to throw 2025-10-27
   steamPackages.steamcmd = throw "'steamPackages.steamcmd' has been renamed to/replaced by 'steamcmd'"; # Converted to throw 2025-10-27
   StormLib = throw "'StormLib' has been renamed to/replaced by 'stormlib'"; # Converted to throw 2025-10-27
-  strawberry-qt5 = throw "strawberry-qt5 has been replaced by strawberry"; # Added 2024-11-22 and updated 2025-07-19
+  strawberry-qt5 = throw "strawberry-qt5 has been replaced by strawberry"; # Converted to throw 2025-07-19
   strawberry-qt6 = throw "strawberry-qt6 has been replaced by strawberry"; # Added 2025-07-19
   subberthehut = throw "'subberthehut' has been removed as it was unmaintained upstream"; # Added 2025-05-17
   sublime-music = throw "`sublime-music` has been removed because upstream has announced it is no longer maintained. Upstream suggests using `supersonic` instead."; # Added 2025-09-20

From 875ef2e2ff8c5d1df51556399776c3fffe78ece3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 09:05:33 +0000
Subject: [PATCH 3500/6226] python3Packages.elevenlabs: 2.20.0 -> 2.20.1

---
 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 9c4ef79a85dd..2734adc85037 100644
--- a/pkgs/development/python-modules/elevenlabs/default.nix
+++ b/pkgs/development/python-modules/elevenlabs/default.nix
@@ -13,7 +13,7 @@
 }:
 
 let
-  version = "2.20.0";
+  version = "2.20.1";
   tag = "v${version}";
 in
 buildPythonPackage {
@@ -25,7 +25,7 @@ buildPythonPackage {
     owner = "elevenlabs";
     repo = "elevenlabs-python";
     inherit tag;
-    hash = "sha256-oxhXvPUOplftB3b7oXmfLSRdPVVjzuOeVPp19OEHVCk=";
+    hash = "sha256-uJ6uy2/DUtwP5k694Ev672JfDnc5j6Qx0HuineAI7bI=";
   };
 
   build-system = [ poetry-core ];

From 4822c4aa4cf5404edb6c6464cae68360e463689b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 09:09:01 +0000
Subject: [PATCH 3501/6226] jetbrains-toolbox: 2.9.1.58121 -> 3.0.1.59888

---
 pkgs/by-name/je/jetbrains-toolbox/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix
index 73e75055e476..0f084db6560f 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 = "2.9.1.58121";
+  version = "3.0.1.59888";
 
   updateScript = ./update.sh;
 
@@ -55,10 +55,10 @@ let
         aarch64 = "-arm64";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-RrE5NACYPS+ekZYFl/6MOTHOmn0u4zn7pi1q/prmr+s=";
-        aarch64-linux = "sha256-z5Bm761XjmkX1vq0ygx3bQpsdK7HN5KcJl6mojt9hXg=";
-        x86_64-darwin = "sha256-GbdLpUSn0nlGIwsuKq5AIaizbd4fIpM8QKsQEbhFwXc=";
-        aarch64-darwin = "sha256-tSqUvIfNt8iyLof8UU0A40mI9EpFABxDE+1B1adSQ/o=";
+        x86_64-linux = "sha256-+rSjKr/MF6WbRkXeCvxzepThiDleYdtqQmX8rfJinNs=";
+        aarch64-linux = "sha256-Zt3OqnQhiK8nWrKYWFuQ10oc5SZJbhrLpGY5P0QcbBw=";
+        x86_64-darwin = "sha256-Lbq+buoulHmLBNOm23yDBoodPPOOOfF/FfkdGEOh/N4=";
+        aarch64-darwin = "sha256-jaLddShsw/lDIICAa8RZFhOoWJ7hx9gfRFwxy1t6sVc=";
       };
     in
     selectKernel {

From 94ab1ba39c156c78238cb2f515d57d22acc017bc Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Thu, 23 Oct 2025 19:10:45 +0200
Subject: [PATCH 3502/6226] postgresqlPackages.pointcloud: init at 1.2.5

---
 .../sql/postgresql/ext/pointcloud/package.nix | 124 ++++++++++++++++++
 .../sql/postgresql/ext/pointcloud/tests.sql   |  55 ++++++++
 2 files changed, 179 insertions(+)
 create mode 100644 pkgs/servers/sql/postgresql/ext/pointcloud/package.nix
 create mode 100644 pkgs/servers/sql/postgresql/ext/pointcloud/tests.sql

diff --git a/pkgs/servers/sql/postgresql/ext/pointcloud/package.nix b/pkgs/servers/sql/postgresql/ext/pointcloud/package.nix
new file mode 100644
index 000000000000..0a6849652b5e
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/ext/pointcloud/package.nix
@@ -0,0 +1,124 @@
+{
+  autoconf,
+  automake,
+  cunit,
+  fetchFromGitHub,
+  fetchpatch,
+  installShellFiles,
+  lib,
+  libtool,
+  libxml2,
+  perl,
+  postgresql,
+  postgresqlBuildExtension,
+  postgresqlTestExtension,
+  postgresqlTestHook,
+  sphinx,
+  which,
+  zlib,
+}:
+postgresqlBuildExtension (finalAttrs: {
+  pname = "pointcloud";
+  version = "1.2.5";
+
+  outputs = [
+    "out"
+    "man"
+  ];
+
+  src = fetchFromGitHub {
+    owner = "pgpointcloud";
+    repo = "pointcloud";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-uFbScxq21kt0jOjjyfMeO3i+bG2/kWS/Rrt3ZpOqEns=";
+  };
+
+  nativeBuildInputs = [
+    autoconf
+    automake
+    installShellFiles
+    libtool
+    perl
+    # for doc
+    sphinx
+    # needed by the configure phase
+    which
+  ];
+
+  buildInputs = [
+    zlib
+  ];
+
+  doCheck = !(postgresqlTestHook.meta.broken);
+
+  checkInputs = [
+    cunit
+  ];
+
+  nativeCheckInputs = [
+    postgresql
+    postgresqlTestHook
+  ];
+
+  preConfigure = ''
+    ./autogen.sh
+  '';
+
+  configureFlags = [
+    (lib.withFeatureAs true "xml2config" (lib.getExe' (lib.getDev libxml2) "xml2-config"))
+  ];
+
+  postInstall = ''
+    cd doc
+    make man
+    installManPage build/man/pgpointcloud.1
+  '';
+
+  passthru.tests = {
+    extension = postgresqlTestExtension {
+      inherit (finalAttrs) finalPackage;
+      # see https://pgpointcloud.github.io/pointcloud/concepts/schemas.html
+      withPackages = [ "postgis" ];
+      sql = builtins.readFile ./tests.sql;
+      asserts = [
+        {
+          query = "pc_version()";
+          expected = "'${lib.versions.major finalAttrs.version}.${lib.versions.minor finalAttrs.version}.${lib.versions.patch finalAttrs.version}'";
+          description = "pc_version() returns correct values.";
+        }
+        {
+          query = "pc_postgis_version()";
+          expected = "'${lib.versions.major finalAttrs.version}.${lib.versions.minor finalAttrs.version}.${lib.versions.patch finalAttrs.version}'";
+          description = "pc_postgis_version() returns correct values.";
+        }
+        # these tests are taken from the documentation of respective methods
+        {
+          query = "SELECT PC_AsText('010100000064CEFFFF94110000703000000400'::pcpoint)";
+          expected = "'{\"pcid\":1,\"pt\":[-127,45,124,4]}'";
+          description = "Creating a point and displaying as text returns correct string";
+        }
+        {
+          query = "SELECT ST_AsText(PC_MakePoint(1, ARRAY[-127, 45, 124.0, 4.0])::geometry)";
+          expected = "'POINT Z (-127 45 124)'";
+          description = "Casting a pcpoint to a postgis geometry works";
+        }
+      ];
+    };
+  };
+
+  meta = {
+    description = "PostgreSQL extension for storing point cloud (LIDAR) data";
+    longDescription = ''
+      # pgPointcloud - A PostgreSQL extension for storing point cloud (LIDAR) data.
+
+      LIDAR point cloud are becoming more and more available. Devices are easy to get, not too expensive, and provide very accurate 3D points. pgPointCLoud is an open source PostgreSQL extension for storing point cloud data and use it with PostGIS. It is very easy to use, robust and efficient.
+
+      By storing LIDAR points in a PostgreSQL database, pgPointcloud eases many problems and allows a good integration with other geo-spatial data (vector, raster) into one common framework : PostGIS.
+    '';
+    homepage = "https://pgpointcloud.github.io/pointcloud/";
+    changelog = "https://github.com/pgpointcloud/pointcloud/blob/v${finalAttrs.version}/NEWS";
+    license = lib.licenses.bsd3;
+    teams = [ lib.teams.geospatial ];
+    inherit (postgresql.meta) platforms;
+  };
+})
diff --git a/pkgs/servers/sql/postgresql/ext/pointcloud/tests.sql b/pkgs/servers/sql/postgresql/ext/pointcloud/tests.sql
new file mode 100644
index 000000000000..270172c42611
--- /dev/null
+++ b/pkgs/servers/sql/postgresql/ext/pointcloud/tests.sql
@@ -0,0 +1,55 @@
+CREATE EXTENSION pointcloud;
+CREATE EXTENSION pointcloud_postgis CASCADE;
+INSERT INTO pointcloud_formats
+(pcid, srid, schema) VALUES (
+    1,
+    4326,
+    '<?xml version="1.0" encoding="UTF-8"?>
+    <pc:PointCloudSchema xmlns:pc="http://pointcloud.org/schemas/PC/1.1"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+      <pc:dimension>
+        <pc:position>1</pc:position>
+        <pc:size>4</pc:size>
+        <pc:description>X coordinate as a long integer. You must use the
+                        scale and offset information of the header to
+                        determine the double value.</pc:description>
+        <pc:name>X</pc:name>
+        <pc:interpretation>int32_t</pc:interpretation>
+        <pc:scale>0.01</pc:scale>
+      </pc:dimension>
+      <pc:dimension>
+        <pc:position>2</pc:position>
+        <pc:size>4</pc:size>
+        <pc:description>Y coordinate as a long integer. You must use the
+                        scale and offset information of the header to
+                        determine the double value.</pc:description>
+        <pc:name>Y</pc:name>
+        <pc:interpretation>int32_t</pc:interpretation>
+        <pc:scale>0.01</pc:scale>
+      </pc:dimension>
+      <pc:dimension>
+        <pc:position>3</pc:position>
+        <pc:size>4</pc:size>
+        <pc:description>Z coordinate as a long integer. You must use the
+                        scale and offset information of the header to
+                        determine the double value.</pc:description>
+        <pc:name>Z</pc:name>
+        <pc:interpretation>int32_t</pc:interpretation>
+        <pc:scale>0.01</pc:scale>
+      </pc:dimension>
+      <pc:dimension>
+        <pc:position>4</pc:position>
+        <pc:size>2</pc:size>
+        <pc:description>The intensity value is the integer representation
+                        of the pulse return magnitude. This value is optional
+                        and system specific. However, it should always be
+                        included if available.</pc:description>
+        <pc:name>Intensity</pc:name>
+        <pc:interpretation>uint16_t</pc:interpretation>
+        <pc:scale>1</pc:scale>
+      </pc:dimension>
+      <pc:metadata>
+        <Metadata name="compression">dimensional</Metadata>
+      </pc:metadata>
+    </pc:PointCloudSchema>'
+);

From 3c2d600fa35fa942e9c38e4e0f7ca80e4321b017 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Tue, 28 Oct 2025 10:22:26 +0100
Subject: [PATCH 3503/6226] Revert "double-conversion: add pkg-config and
 testing"

---
 pkgs/by-name/do/double-conversion/package.nix | 40 ++++---------------
 1 file changed, 7 insertions(+), 33 deletions(-)

diff --git a/pkgs/by-name/do/double-conversion/package.nix b/pkgs/by-name/do/double-conversion/package.nix
index 30e445519ee1..a377165483f0 100644
--- a/pkgs/by-name/do/double-conversion/package.nix
+++ b/pkgs/by-name/do/double-conversion/package.nix
@@ -4,19 +4,17 @@
   fetchFromGitHub,
   fetchpatch,
   cmake,
-  ninja,
-  ctestCheckHook,
-  testers,
+  enableStatic ? stdenv.hostPlatform.isStatic,
 }:
 
-stdenv.mkDerivation (finalAttrs: {
+stdenv.mkDerivation rec {
   pname = "double-conversion";
   version = "3.3.1";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "double-conversion";
-    rev = "v${finalAttrs.version}";
+    rev = "v${version}";
     sha256 = "sha256-M80H+azCzQYa4/gBLWv5GNNhEuHsH7LbJ/ajwmACnrM=";
   };
 
@@ -32,46 +30,22 @@ stdenv.mkDerivation (finalAttrs: {
       url = "https://github.com/google/double-conversion/commit/0604b4c18815aadcf7f4b78dfa6bfcb91a634ed7.patch";
       hash = "sha256-cJBp1ou1O/bMQ/7kvcX52dWbUdhmPfQ9aWmEhQdyhis=";
     })
-    (fetchpatch {
-      name = "double-conversion-add-pkg-config.patch";
-      url = "https://github.com/google/double-conversion/commit/ddfd18c58ecc32fc74afc1083bb8774240b54efb.patch";
-      hash = "sha256-/pKCL19vS8fNwCm27yTNP+32ApHTH5dEGpnsMI11Lf4=";
-    })
   ];
 
-  outputs = [
-    "out"
-    "dev"
-  ];
+  nativeBuildInputs = [ cmake ];
 
-  nativeBuildInputs = [
-    cmake
-    ninja
-    ctestCheckHook
-  ];
-
-  doCheck = true;
-
-  cmakeFlags = [
-    (lib.cmakeBool "BUILD_TESTING" true)
-    (lib.cmakeBool "BUILD_SHARED_LIBS" stdenv.hostPlatform.hasSharedLibraries)
-  ];
+  cmakeFlags = lib.optional (!enableStatic) "-DBUILD_SHARED_LIBS=ON";
 
   # Case sensitivity issue
   preConfigure = lib.optionalString stdenv.hostPlatform.isDarwin ''
     rm BUILD
   '';
 
-  passthru = {
-    tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
-  };
-
   meta = with lib; {
-    pkgConfigModules = [ "double-conversion" ];
     description = "Binary-decimal and decimal-binary routines for IEEE doubles";
     homepage = "https://github.com/google/double-conversion";
     license = licenses.bsd3;
     platforms = platforms.unix ++ platforms.windows;
-    maintainers = with lib.maintainers; [ fzakaria ];
+    maintainers = [ ];
   };
-})
+}

From 48281a822db5638f00cda727128be91941704a64 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 09:35:34 +0000
Subject: [PATCH 3504/6226] python3Packages.opentsne: 1.0.3 -> 1.0.4

---
 pkgs/development/python-modules/opentsne/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/opentsne/default.nix b/pkgs/development/python-modules/opentsne/default.nix
index be51bcb4d607..4418599015e2 100644
--- a/pkgs/development/python-modules/opentsne/default.nix
+++ b/pkgs/development/python-modules/opentsne/default.nix
@@ -14,7 +14,7 @@
 let
   self = buildPythonPackage rec {
     pname = "opentsne";
-    version = "1.0.3";
+    version = "1.0.4";
     pyproject = true;
 
     disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ let
       owner = "pavlin-policar";
       repo = "openTSNE";
       tag = "v${version}";
-      hash = "sha256-dJM8hv85ST5qGo/oZVr/MgIHGPGpZ+ajaUL7pfSJLAg=";
+      hash = "sha256-cGnhdGpDiBlTeeveCtnveslDytpNO8vtYkxQQ7FhsuA=";
     };
 
     build-system = [

From fa393821bcd85b1a84e56d2a6dcfbf2cddcefea4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 10:05:48 +0000
Subject: [PATCH 3505/6226] tombi: 0.6.37 -> 0.6.40

---
 pkgs/by-name/to/tombi/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/to/tombi/package.nix b/pkgs/by-name/to/tombi/package.nix
index fb2da8295749..5de6b076c880 100644
--- a/pkgs/by-name/to/tombi/package.nix
+++ b/pkgs/by-name/to/tombi/package.nix
@@ -9,19 +9,19 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tombi";
-  version = "0.6.37";
+  version = "0.6.40";
 
   src = fetchFromGitHub {
     owner = "tombi-toml";
     repo = "tombi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oQx38k/ANf/+SA7FZqw8tQejt4WQd5yPPgcMEuFcUGU=";
+    hash = "sha256-gsy+Ua/e0oUwu5OCHC27aj4EHVOl3eEIi3HWiysMadM=";
   };
 
   # Tests relies on the presence of network
   doCheck = false;
   cargoBuildFlags = [ "--package tombi-cli" ];
-  cargoHash = "sha256-bj+d03asqABk4RphtCPQoM8E36Hb26yzAhSMIgrg7DI=";
+  cargoHash = "sha256-5X8YmfKh+X1ConSW0fvjwAMXiv/QLDZ8oX+6BPMgQQI=";
 
   postPatch = ''
     substituteInPlace Cargo.toml \

From 7015408b3cec6ca320f4c7c90262500e1a8ea03c Mon Sep 17 00:00:00 2001
From: zapashcanon <leo@ndrs.fr>
Date: Wed, 1 Oct 2025 15:39:56 +0200
Subject: [PATCH 3506/6226] ocamlPackages.ocp-browser: init at 1.4.0

---
 .../tools/ocaml/ocp-browser/default.nix       | 43 +++++++++++++++++++
 pkgs/top-level/ocaml-packages.nix             |  2 +
 2 files changed, 45 insertions(+)
 create mode 100644 pkgs/development/tools/ocaml/ocp-browser/default.nix

diff --git a/pkgs/development/tools/ocaml/ocp-browser/default.nix b/pkgs/development/tools/ocaml/ocp-browser/default.nix
new file mode 100644
index 000000000000..f9b737814193
--- /dev/null
+++ b/pkgs/development/tools/ocaml/ocp-browser/default.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  fetchFromGitHub,
+  buildDunePackage,
+  cppo,
+  ocp-index,
+  cmdliner,
+  re,
+  lambda-term,
+  zed,
+}:
+
+buildDunePackage (finalAttrs: {
+  pname = "ocp-browser";
+  version = "1.4.0";
+
+  minimalOCamlVersion = "4.08";
+
+  src = fetchFromGitHub {
+    owner = "OCamlPro";
+    repo = "ocp-index";
+    tag = finalAttrs.version;
+    hash = "sha256-pv6aBJjRkibISpZEnlfyn72smcYEbZoPQoQH2p/JwH0=";
+  };
+
+  nativeBuildInputs = [ cppo ];
+  propagatedBuildInputs = [
+    cmdliner
+    lambda-term
+    ocp-index
+    re
+    zed
+  ];
+
+  meta = {
+    homepage = "https://github.com/OCamlPro/ocp-index";
+    description = "Console browser for the documentation of installed OCaml libraries";
+    changelog = "https://github.com/OCamlPro/ocp-index/raw/${finalAttrs.version}/CHANGES.md";
+    license = lib.licenses.lgpl3;
+    maintainers = with lib.maintainers; [ redianthus ];
+    mainProgram = "ocp-browser";
+  };
+})
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index 7145b4c80832..1c57b701471c 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1499,6 +1499,8 @@ let
 
         ocolor = callPackage ../development/ocaml-modules/ocolor { };
 
+        ocp-browser = callPackage ../development/tools/ocaml/ocp-browser { };
+
         ocp-build = callPackage ../development/tools/ocaml/ocp-build { };
 
         ocp-indent = callPackage ../development/tools/ocaml/ocp-indent { };

From ba31c35ea822e581b1968d37cb58e988d50a3869 Mon Sep 17 00:00:00 2001
From: Mistyttm <contact@mistyttm.dev>
Date: Tue, 28 Oct 2025 20:10:40 +1000
Subject: [PATCH 3507/6226] wallpaper-engine-plugin: Fix Cmake4 and QT 6.10
 build issues

---
 .../wallpaper-engine-plugin/default.nix       |  6 ++-
 .../wallpaper-engine-plugin/qt-6.10-fix.patch | 42 +++++++++++++++++++
 2 files changed, 47 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/kde/third-party/wallpaper-engine-plugin/qt-6.10-fix.patch

diff --git a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix
index 2cc012ab5a2d..529e98c53668 100644
--- a/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix
+++ b/pkgs/kde/third-party/wallpaper-engine-plugin/default.nix
@@ -27,7 +27,10 @@ mkKdeDerivation {
     fetchSubmodules = true;
   };
 
-  patches = [ ./nix-plugin.patch ];
+  patches = [
+    ./nix-plugin.patch
+    ./qt-6.10-fix.patch
+  ];
 
   extraNativeBuildInputs = [
     kpackage
@@ -52,6 +55,7 @@ mkKdeDerivation {
       ]
     ))
     (lib.cmakeFeature "Qt6_DIR" "${qtbase}/lib/cmake/Qt6")
+    "-DCMAKE_CXX_FLAGS=-Wno-error=stringop-overflow"
   ];
 
   postInstall = ''
diff --git a/pkgs/kde/third-party/wallpaper-engine-plugin/qt-6.10-fix.patch b/pkgs/kde/third-party/wallpaper-engine-plugin/qt-6.10-fix.patch
new file mode 100644
index 000000000000..fb9d15f02baa
--- /dev/null
+++ b/pkgs/kde/third-party/wallpaper-engine-plugin/qt-6.10-fix.patch
@@ -0,0 +1,42 @@
+--- a/src/backend_mpv/MpvBackend.cpp
++++ b/src/backend_mpv/MpvBackend.cpp
+@@ -37,7 +37,9 @@
+ #    include <QX11Info> // IWYU pragma: keep
+ #endif
+ //#endif
++#if (QT_VERSION < QT_VERSION_CHECK(6, 10, 0))
+ #    include <qpa/qplatformnativeinterface.h> // IWYU pragma: keep
++#endif
+ #endif
+ 
+ Q_LOGGING_CATEGORY(wekdeMpv, "wekde.mpv")
+@@ -85,8 +87,13 @@ int CreateMpvContex(mpv_handle* mpv, mpv_render_context** mpv_gl) {
+     if (QGuiApplication::platformName().contains("xcb")) {
+         params[2].type = MPV_RENDER_PARAM_X11_DISPLAY;
+ #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0))
+-        // TODO: QGuiApplication::nativeInterface<QNativeInterface::QX11Application>()::display();
+-        // same for wayland
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++        if (auto x11App = qApp->nativeInterface<QNativeInterface::QX11Application>()) {
++            params[2].data = x11App->display();
++        }
++#else
++        // Fallback for Qt 6.0-6.9
+         auto* native   = QGuiApplication::platformNativeInterface();
+         params[2].data = native->nativeResourceForWindow("display", nullptr);
++#endif
+ #else
+@@ -95,6 +102,12 @@ int CreateMpvContex(mpv_handle* mpv, mpv_render_context** mpv_gl) {
+     }
+     if (QGuiApplication::platformName().contains("wayland")) {
+         params[2].type = MPV_RENDER_PARAM_WL_DISPLAY;
++#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0))
++        if (auto waylandApp = qApp->nativeInterface<QNativeInterface::QWaylandApplication>()) {
++            params[2].data = waylandApp->display();
++        }
++#else
+         auto* native   = QGuiApplication::platformNativeInterface();
+         params[2].data = native->nativeResourceForWindow("display", nullptr);
++#endif
+     }
+ #endif

From 1079c21566b1451ce99ab22e07e15569b1cb0c35 Mon Sep 17 00:00:00 2001
From: redianthus <leo@ndrs.fr>
Date: Tue, 28 Oct 2025 11:28:22 +0100
Subject: [PATCH 3508/6226] ocamlPackages.smtml: 0.12.0 -> 0.13.0

---
 pkgs/development/ocaml-modules/smtml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/smtml/default.nix b/pkgs/development/ocaml-modules/smtml/default.nix
index d8426a8fc52b..533eee64483a 100644
--- a/pkgs/development/ocaml-modules/smtml/default.nix
+++ b/pkgs/development/ocaml-modules/smtml/default.nix
@@ -27,13 +27,13 @@
 
 buildDunePackage (finalAttrs: {
   pname = "smtml";
-  version = "0.12.0";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "formalsec";
     repo = "smtml";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WETSvhy5OfztOTqJimym0OaZLo053nl8pcoQlyyP8I0=";
+    hash = "sha256-8AAS7C/X9YnkgZORRauKqPgXPyFXOhPvd7/VS693e8Q=";
   };
 
   nativeBuildInputs = [

From 42de52d21a8dd9a4097836aeb06cabf9d52d3de8 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 28 Oct 2025 11:39:37 +0100
Subject: [PATCH 3509/6226] workflows/teams: rename from team

Keeping the workflow filename in-sync with the visible name.
---
 .github/workflows/{team.yml => teams.yml} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename .github/workflows/{team.yml => teams.yml} (100%)

diff --git a/.github/workflows/team.yml b/.github/workflows/teams.yml
similarity index 100%
rename from .github/workflows/team.yml
rename to .github/workflows/teams.yml

From 81005856bb8a20a720950f450445e5888e28b1c0 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 28 Oct 2025 11:43:07 +0100
Subject: [PATCH 3510/6226] workflows/teams: consistent style with other
 workflows

These are style-only formatting changes, that are not enforced via
tooling - but used consistently in the other workflow files.
---
 .github/workflows/teams.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/teams.yml b/.github/workflows/teams.yml
index 099ea882aa7c..67ffdf053a80 100644
--- a/.github/workflows/teams.yml
+++ b/.github/workflows/teams.yml
@@ -4,8 +4,6 @@ on:
   schedule:
     # Every Tuesday at 19:42 (randomly chosen)
     - cron: '42 19 * * 1'
-
-  # Allows manual trigger
   workflow_dispatch:
 
 permissions: {}
@@ -25,6 +23,7 @@ jobs:
           private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
           permission-administration: read
           permission-members: read
+
       - name: Fetch source
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
@@ -32,8 +31,10 @@ jobs:
           sparse-checkout: |
             ci/github-script
             maintainers/github-teams.json
+
       - name: Install dependencies
         run: npm install bottleneck
+
       - name: Synchronise teams
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
@@ -54,6 +55,7 @@ jobs:
           private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
           permission-contents: write
           permission-pull-requests: write
+
       - name: Get GitHub App User Git String
         id: user
         env:
@@ -64,6 +66,7 @@ jobs:
           userId=$(gh api "/users/$name" --jq .id)
           email="$userId+$name@users.noreply.github.com"
           echo "git-string=$name <$email>" >> "$GITHUB_OUTPUT"
+
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
         with:

From 3df31aa2555f467b0dcd7d2c6d26a3a465c1e27e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 28 Oct 2025 11:53:23 +0100
Subject: [PATCH 3511/6226] ci/github-script/teams: use consistent style

These are style-only changes, that are not enforced via tooling - but
used mostly consistently in the other github-script files.
---
 ci/github-script/get-teams.js | 19 +++++++++++--------
 ci/github-script/run          |  1 -
 2 files changed, 11 insertions(+), 9 deletions(-)
 mode change 100755 => 100644 ci/github-script/get-teams.js

diff --git a/ci/github-script/get-teams.js b/ci/github-script/get-teams.js
old mode 100755
new mode 100644
index 9b6d3333f91f..0a097d23eb2f
--- a/ci/github-script/get-teams.js
+++ b/ci/github-script/get-teams.js
@@ -7,9 +7,13 @@ const excludeTeams = [
 module.exports = async ({ github, context, core, outFile }) => {
   const withRateLimit = require('./withRateLimit.js')
   const { writeFileSync } = require('node:fs')
+
+  const org = context.repo.owner
+
   const result = {}
-  await withRateLimit({ github, core }, async (_stats) => {
-    /// Turn an Array of users into an Object, mapping user.login -> user.id
+
+  await withRateLimit({ github, core }, async () => {
+    // Turn an Array of users into an Object, mapping user.login -> user.id
     function makeUserSet(users) {
       // Sort in-place and build result by mutation
       users.sort((a, b) => (a.login > b.login ? 1 : -1))
@@ -20,21 +24,21 @@ module.exports = async ({ github, context, core, outFile }) => {
       }, {})
     }
 
-    /// Process a list of teams and append to the result variable
+    // Process a list of teams and append to the result variable
     async function processTeams(teams) {
       for (const team of teams) {
         core.notice(`Processing team ${team.slug}`)
         if (!excludeTeams.some((regex) => team.slug.match(regex))) {
           const members = makeUserSet(
             await github.paginate(github.rest.teams.listMembersInOrg, {
-              org: context.repo.owner,
+              org,
               team_slug: team.slug,
               role: 'member',
             }),
           )
           const maintainers = makeUserSet(
             await github.paginate(github.rest.teams.listMembersInOrg, {
-              org: context.repo.owner,
+              org,
               team_slug: team.slug,
               role: 'maintainer',
             }),
@@ -49,7 +53,7 @@ module.exports = async ({ github, context, core, outFile }) => {
         }
         await processTeams(
           await github.paginate(github.rest.teams.listChildInOrg, {
-            org: context.repo.owner,
+            org,
             team_slug: team.slug,
           }),
         )
@@ -57,8 +61,7 @@ module.exports = async ({ github, context, core, outFile }) => {
     }
 
     const teams = await github.paginate(github.rest.repos.listTeams, {
-      owner: context.repo.owner,
-      repo: context.repo.repo,
+      ...context.repo,
     })
 
     await processTeams(teams)
diff --git a/ci/github-script/run b/ci/github-script/run
index 2d5121b75b7e..782e3fa7db1f 100755
--- a/ci/github-script/run
+++ b/ci/github-script/run
@@ -91,7 +91,6 @@ program
   .argument('[outFile]', 'Path to the output file (Example: github-teams.json). If not set, prints to stdout')
   .action(async (owner, repo, outFile, options) => {
     const getTeams = (await import('./get-teams.js')).default
-    // TODO: Refactor this file so we don't need to pass a PR
     await run(getTeams, owner, repo, undefined, { ...options, outFile })
   })
 

From 0ace36a3da1013402226f52d59cac23dff81c67a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 28 Oct 2025 12:13:54 +0100
Subject: [PATCH 3512/6226] .github/labeler-no-sync: backport changes to
 github-teams

Changes to this auto-generated file need to be backported automatically,
to keep maintainer pings for teams functional on stable branches.
---
 .github/labeler-no-sync.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/labeler-no-sync.yml b/.github/labeler-no-sync.yml
index 65d54e81a0b2..69249f6ac27d 100644
--- a/.github/labeler-no-sync.yml
+++ b/.github/labeler-no-sync.yml
@@ -29,5 +29,6 @@
               - .github/actions/*
               - .github/workflows/*
               - ci/**/*.*
+              - maintainers/github-teams.json
 
 # keep-sorted end

From da2c5db9f8e34370b31f871d7a8b076e457ac10d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 28 Oct 2025 11:18:49 +0000
Subject: [PATCH 3513/6226] python3Packages.pylance: 0.38.2 -> 0.38.3

Diff: https://github.com/lancedb/lance/compare/v0.38.2...v0.38.3

Changelog: https://github.com/lancedb/lance/releases/tag/v0.38.3
---
 pkgs/development/python-modules/pylance/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix
index 1d27aa6a034b..8cb5cbefaa39 100644
--- a/pkgs/development/python-modules/pylance/default.nix
+++ b/pkgs/development/python-modules/pylance/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "pylance";
-  version = "0.38.2";
+  version = "0.38.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lance";
     tag = "v${version}";
-    hash = "sha256-H4HQzLmQdDS8aS/OMsIHjWEogmctkF+5N5ClozeuITU=";
+    hash = "sha256-R/JO8Q/8g3jxnPgzq5KnvTNNzg46bODNHWmgonS7ChY=";
   };
 
   sourceRoot = "${src.name}/python";
@@ -51,7 +51,7 @@ buildPythonPackage rec {
       src
       sourceRoot
       ;
-    hash = "sha256-A4qZERrYm8FELuJNqy/fhbJxLxTp73oY7jc5bZavFFI=";
+    hash = "sha256-F2HwWVXwmydQtyr02l/ydv1zhkvjVM5zEUenWKkMfyw=";
   };
 
   nativeBuildInputs = [

From 8196656fba972625dd93ae7ef6948b17177c74af Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Tue, 28 Oct 2025 11:57:53 +0100
Subject: [PATCH 3514/6226] zotero: 7.0.20 -> 7.0.27

Changelog: https://www.zotero.org/support/changelog
---
 pkgs/by-name/zo/zotero/darwin.nix  | 2 +-
 pkgs/by-name/zo/zotero/linux.nix   | 2 +-
 pkgs/by-name/zo/zotero/package.nix | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zo/zotero/darwin.nix b/pkgs/by-name/zo/zotero/darwin.nix
index f7aaebb8993f..9a0cec7b3630 100644
--- a/pkgs/by-name/zo/zotero/darwin.nix
+++ b/pkgs/by-name/zo/zotero/darwin.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.zotero.org/client/release/${version}/Zotero-${version}.dmg";
-    hash = "sha256-DeiQbg8wMFHsJ/jlbGj3wdXrRsGLJ0tOyGRex2w43lU=";
+    hash = "sha256-YivHBEFPkm79y2R5QIV+trm8O3aFzvXTqVzFr1tcoIo=";
   };
   sourceRoot = ".";
 
diff --git a/pkgs/by-name/zo/zotero/linux.nix b/pkgs/by-name/zo/zotero/linux.nix
index f0626da413fa..2d84e0bbe7f2 100644
--- a/pkgs/by-name/zo/zotero/linux.nix
+++ b/pkgs/by-name/zo/zotero/linux.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2";
-    hash = "sha256-L2Mvi11X4YBU4ezHDJosl7qHClmzUwmghvXG8TChA8c=";
+    hash = "sha256-ce0Lvz0k3DH6rGzdGoqYIW1OBiaJwaxn8pDnMQbqtv4=";
   };
 
   dontPatchELF = true;
diff --git a/pkgs/by-name/zo/zotero/package.nix b/pkgs/by-name/zo/zotero/package.nix
index 7abf2bd8e4e8..1bfda3290939 100644
--- a/pkgs/by-name/zo/zotero/package.nix
+++ b/pkgs/by-name/zo/zotero/package.nix
@@ -6,7 +6,7 @@
 
 let
   pname = "zotero";
-  version = "7.0.20";
+  version = "7.0.27";
   meta = {
     homepage = "https://www.zotero.org";
     description = "Collect, organize, cite, and share your research sources";

From 00baa72534447c89e0224c83299c0f16ad62a683 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 28 Oct 2025 08:41:53 -0300
Subject: [PATCH 3515/6226] fancontrol-gui: fix build with cmake4

---
 pkgs/by-name/fa/fancontrol-gui/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/fa/fancontrol-gui/package.nix b/pkgs/by-name/fa/fancontrol-gui/package.nix
index 300a29826289..cdf776561946 100644
--- a/pkgs/by-name/fa/fancontrol-gui/package.nix
+++ b/pkgs/by-name/fa/fancontrol-gui/package.nix
@@ -42,6 +42,11 @@ stdenv.mkDerivation rec {
     ./version.patch
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   passthru = {
     tests.version = testers.testVersion {
       package = fancontrol-gui;

From d08e05cb74593a25355bea953dc0b13dd1080545 Mon Sep 17 00:00:00 2001
From: Hennie Marais <hennie@sulimo.co.za>
Date: Tue, 28 Oct 2025 14:14:21 +0200
Subject: [PATCH 3516/6226] vimPlugins.vim-buftabline: init at 2020-12-13

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 2 files changed, 14 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index e7e0f02c161d..512c8bd9a2c0 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -17004,6 +17004,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  vim-buftabline = buildVimPlugin {
+    pname = "vim-buftabline";
+    version = "2020-12-13";
+    src = fetchFromGitHub {
+      owner = "ap";
+      repo = "vim-buftabline";
+      rev = "73b9ef5dcb6cdf6488bc88adb382f20bc3e3262a";
+      sha256 = "1vs4km7fb3di02p0771x42y2bsn1hi4q6iwlbrj0imacd9affv5y";
+    };
+    meta.homepage = "https://github.com/ap/vim-buftabline/";
+    meta.hydraPlatforms = [ ];
+  };
+
   vim-caddyfile = buildVimPlugin {
     pname = "vim-caddyfile";
     version = "2025-07-22";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 573cf666c92a..65fbf1331f98 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -1305,6 +1305,7 @@ https://github.com/mtikekar/vim-bsv/,,
 https://github.com/jeetsukumaran/vim-buffergator/,,
 https://github.com/bling/vim-bufferline/,,
 https://github.com/qpkorr/vim-bufkill/,,
+https://github.com/ap/vim-buftabline/,HEAD,
 https://github.com/isobit/vim-caddyfile/,HEAD,
 https://github.com/tpope/vim-capslock/,,
 https://github.com/kristijanhusak/vim-carbon-now-sh/,,

From 507d3045c477e6ac48529d8e28196d104a7cd4cd Mon Sep 17 00:00:00 2001
From: Sergey Volkov <taranarmo@gmail.com>
Date: Tue, 28 Oct 2025 12:32:15 +0100
Subject: [PATCH 3517/6226] qwen-code: 0.0.14 -> 0.1.0

---
 ...dd-missing-resolved-integrity-fields.patch | 70 -------------------
 pkgs/by-name/qw/qwen-code/package.nix         | 51 ++++++++------
 2 files changed, 28 insertions(+), 93 deletions(-)
 delete mode 100644 pkgs/by-name/qw/qwen-code/add-missing-resolved-integrity-fields.patch

diff --git a/pkgs/by-name/qw/qwen-code/add-missing-resolved-integrity-fields.patch b/pkgs/by-name/qw/qwen-code/add-missing-resolved-integrity-fields.patch
deleted file mode 100644
index 9dade6622787..000000000000
--- a/pkgs/by-name/qw/qwen-code/add-missing-resolved-integrity-fields.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-From 0735b59eba183574e080d2912347d58e6e3d158e Mon Sep 17 00:00:00 2001
-From: Sergey Volkov <taranarmo@gmail.com>
-Date: Fri, 12 Sep 2025 20:06:24 +0200
-Subject: [PATCH] Add missing resolved and integrity fields to several packages
-
----
- package-lock.json | 12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
-diff --git a/package-lock.json b/package-lock.json
-index 146686dc..9ad9009f 100644
---- a/package-lock.json
-+++ b/package-lock.json
-@@ -12574,6 +12574,8 @@
-     },
-     "packages/cli/node_modules/@testing-library/dom": {
-       "version": "10.4.0",
-+      "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.0.tgz",
-+      "integrity": "sha512-pemlzrSESWbdAloYml3bAJMEfNh1Z7EduzqPKprCH5S341frlpYnUEW0H72dLxa6IsYr+mPno20GiSm+h9dEdQ==",
-       "dev": true,
-       "license": "MIT",
-       "peer": true,
-@@ -12609,6 +12611,8 @@
-     },
-     "packages/cli/node_modules/@testing-library/react": {
-       "version": "16.3.0",
-+      "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.0.tgz",
-+      "integrity": "sha512-kFSyxiEDwv1WLl2fgsq6pPBbw5aWKrsY2/noi1Id0TK0UParSF62oFQFGHXIyaG4pp2tEub/Zlel+fjjZILDsw==",
-       "dev": true,
-       "license": "MIT",
-       "dependencies": {
-@@ -12660,6 +12664,8 @@
-     },
-     "packages/cli/node_modules/aria-query": {
-       "version": "5.3.0",
-+      "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz",
-+      "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==",
-       "dev": true,
-       "license": "Apache-2.0",
-       "peer": true,
-@@ -12669,6 +12675,8 @@
-     },
-     "packages/cli/node_modules/emoji-regex": {
-       "version": "10.4.0",
-+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.4.0.tgz",
-+      "integrity": "sha512-EC+0oUMY1Rqm4O6LLrgjtYDvcVYTy7chDnM4Q7030tP4Kwj3u/pR6gP9ygnp2CJMK5Gq+9Q2oqmrFJAz01DXjw==",
-       "license": "MIT"
-     },
-     "packages/cli/node_modules/react-is": {
-@@ -12681,6 +12689,8 @@
-     },
-     "packages/cli/node_modules/string-width": {
-       "version": "7.2.0",
-+      "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz",
-+      "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==",
-       "license": "MIT",
-       "dependencies": {
-         "emoji-regex": "^10.3.0",
-@@ -12815,6 +12825,8 @@
-     },
-     "packages/core/node_modules/ignore": {
-       "version": "7.0.5",
-+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz",
-+      "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==",
-       "license": "MIT",
-       "engines": {
-         "node": ">= 4"
--- 
-2.51.0
-
diff --git a/pkgs/by-name/qw/qwen-code/package.nix b/pkgs/by-name/qw/qwen-code/package.nix
index 3c087d4a58a7..cf265c7999b5 100644
--- a/pkgs/by-name/qw/qwen-code/package.nix
+++ b/pkgs/by-name/qw/qwen-code/package.nix
@@ -6,46 +6,40 @@
   jq,
   git,
   ripgrep,
+  pkg-config,
+  glib,
+  libsecret,
 }:
 
 buildNpmPackage (finalAttrs: {
   pname = "qwen-code";
-  version = "0.0.14";
+  version = "0.1.0";
 
   src = fetchFromGitHub {
     owner = "QwenLM";
     repo = "qwen-code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Rld6k0MPfOOncK240zOJbcvheV4UKU2yF7luBrTrnFs=";
+    hash = "sha256-5XC4Pwf+vuK1T3/bPptUejg8v9wj3izF80Mt+iqVr9Y=";
   };
 
-  patches = [
-    # similar to upstream gemini-cli some node deps are missing resolved and integrity fields
-    # upstream the problem is solved in master and in v0.4+, eventually the fix should arrive to qwen
-    ./add-missing-resolved-integrity-fields.patch
-  ];
-
-  npmDepsHash = "sha256-43s13HncNKv4uOKVwNvqIF+Ih3rJBWrpVJnE3hCKD2w=";
+  npmDepsHash = "sha256-Psj/5SDWBnsRJVJnJwXGUgVbqUnjoH6HpAqqFruHkYw=";
 
   nativeBuildInputs = [
     jq
+    pkg-config
+    git
   ];
 
   buildInputs = [
-    git
     ripgrep
+    glib
+    libsecret
   ];
 
   postPatch = ''
-    # Remove @lvce-editor/ripgrep dependency (no network on buildPhase
-    substituteInPlace package.json --replace-fail '"@lvce-editor/ripgrep": "^1.6.0",' ""
-    substituteInPlace packages/core/package.json --replace-fail '"@lvce-editor/ripgrep": "^1.6.0",' ""
-    substituteInPlace packages/core/src/tools/ripGrep.ts \
-      --replace-fail "const { rgPath } = await import('@lvce-editor/ripgrep');" "const rgPath = 'rg';"
-
-    # patches below remove node-pty dependency which causes build fail on Darwin
+    # patches below remove node-pty and keytar dependencies which cause build fail on Darwin
     # should be conditional on platform but since package-lock.json is patched it changes its hash
-    # though seems like this dependency is not really required by the package
+    # though seems like these dependencies are not really required by the package
     ${jq}/bin/jq '
       del(.packages."node_modules/node-pty") |
       del(.packages."node_modules/@lydell/node-pty") |
@@ -55,11 +49,18 @@ buildNpmPackage (finalAttrs: {
       del(.packages."node_modules/@lydell/node-pty-linux-x64") |
       del(.packages."node_modules/@lydell/node-pty-win32-arm64") |
       del(.packages."node_modules/@lydell/node-pty-win32-x64") |
+      del(.packages."node_modules/keytar") |
       walk(
         if type == "object" and has("dependencies") then
-          .dependencies |= with_entries(select(.key | contains("node-pty") | not))
+          .dependencies |= with_entries(select(.key | (contains("node-pty") | not) and (contains("keytar") | not)))
         elif type == "object" and has("optionalDependencies") then
-          .optionalDependencies |= with_entries(select(.key | contains("node-pty") | not))
+          .optionalDependencies |= with_entries(select(.key | (contains("node-pty") | not) and (contains("keytar") | not)))
+        else .
+        end
+      ) |
+      walk(
+        if type == "object" and has("peerDependencies") then
+          .peerDependencies |= with_entries(select(.key | (contains("node-pty") | not) and (contains("keytar") | not)))
         else .
         end
       )
@@ -79,10 +80,14 @@ buildNpmPackage (finalAttrs: {
     runHook preInstall
 
     mkdir -p $out/bin $out/share/qwen-code
-    cp -r bundle/* $out/share/qwen-code/
-    cp node_modules/tiktoken/tiktoken_bg.wasm $out/share/qwen-code/
+    cp -r dist/* $out/share/qwen-code/
+    # Install production dependencies only
+    npm prune --production
+    cp -r node_modules $out/share/qwen-code/
+    # Remove broken symlinks that cause issues in Nix environment
+    find $out/share/qwen-code/node_modules -type l -delete || true
     patchShebangs $out/share/qwen-code
-    ln -s $out/share/qwen-code/gemini.js $out/bin/qwen
+    ln -s $out/share/qwen-code/cli.js $out/bin/qwen
 
     runHook postInstall
   '';

From 3dc74258d34a31f29ec1468bbafcdc08e16dbe42 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 28 Oct 2025 15:07:30 +0300
Subject: [PATCH 3518/6226] kdePackages.plasma-mobile: fix build

---
 pkgs/kde/plasma/plasma-mobile/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/kde/plasma/plasma-mobile/default.nix b/pkgs/kde/plasma/plasma-mobile/default.nix
index 18de7ba8e59a..f0af2072c00a 100644
--- a/pkgs/kde/plasma/plasma-mobile/default.nix
+++ b/pkgs/kde/plasma/plasma-mobile/default.nix
@@ -13,6 +13,10 @@ mkKdeDerivation {
     qtsensors
     qtwayland
   ];
+
+  # FIXME: work around Qt 6.10 cmake API changes
+  cmakeFlags = [ "-DQT_FIND_PRIVATE_MODULES=1" ];
+
   postFixup = ''
     substituteInPlace "$out/share/wayland-sessions/plasma-mobile.desktop" \
       --replace-fail \

From f43181efdfac24825e9504cce105a751c5c63a62 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 28 Oct 2025 15:07:37 +0300
Subject: [PATCH 3519/6226] kdePackages: Plasma 6.5.0 -> 6.5.1

---
 pkgs/kde/generated/sources/plasma.json | 420 ++++++++++++-------------
 1 file changed, 210 insertions(+), 210 deletions(-)

diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json
index c070b4587fa8..789639040d18 100644
--- a/pkgs/kde/generated/sources/plasma.json
+++ b/pkgs/kde/generated/sources/plasma.json
@@ -1,352 +1,352 @@
 {
   "aurorae": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/aurorae-6.5.0.tar.xz",
-    "hash": "sha256-jlHm8t9NPAclO06UtVo+FY3B72OARKaNrKaB7oKw+1s="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/aurorae-6.5.1.tar.xz",
+    "hash": "sha256-nDDvI4iVQ19V93RNHlQYwQqO7xt52XNBQmJ+VZeKG+w="
   },
   "bluedevil": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/bluedevil-6.5.0.tar.xz",
-    "hash": "sha256-N2W9EvEPVChFR750P8mcECLLvzjg7lbYYxY7iWm7jZg="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/bluedevil-6.5.1.tar.xz",
+    "hash": "sha256-MJXnrL4UCeni/hgN1ZFWiPwqJGqvIf/WiL55E+rPug8="
   },
   "breeze": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/breeze-6.5.0.tar.xz",
-    "hash": "sha256-Sa9bwnEicCjfcLIhSf5vz7FbbUuObz6zKd7N465N82k="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/breeze-6.5.1.tar.xz",
+    "hash": "sha256-ibmXbCrjdnezbJyIaG7pXsUOpPbtm1d8R7WnEixqUvM="
   },
   "breeze-grub": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/breeze-grub-6.5.0.tar.xz",
-    "hash": "sha256-UumPPwodqDVRAfGeTzxz7tzst0imxyKVkk5sp2+cAJg="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/breeze-grub-6.5.1.tar.xz",
+    "hash": "sha256-3u4ntMB5fL5i2lgcg0yc/Ec7mTuv2bUeLLJNhEVKAvI="
   },
   "breeze-gtk": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/breeze-gtk-6.5.0.tar.xz",
-    "hash": "sha256-ul8FewjjgtngeQq1HXqhzFAXyVLrxGdlQAgVUn3IFHA="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/breeze-gtk-6.5.1.tar.xz",
+    "hash": "sha256-Gx3ok+uS4cnA/x3WFp1Vw8BipJvSy6spNsFv6PoGAJY="
   },
   "breeze-plymouth": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/breeze-plymouth-6.5.0.tar.xz",
-    "hash": "sha256-nK75hcMHirIp3u7DBFmw+Ms2mY8c63OuKpeMPipGGd8="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/breeze-plymouth-6.5.1.tar.xz",
+    "hash": "sha256-WSKhstRDkYOMlI84ckkUUI5nUHTksY0BozemblJYHbk="
   },
   "discover": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/discover-6.5.0.tar.xz",
-    "hash": "sha256-k+Q7823cRxPLTsxtDwCkT9rmQmp9pScPcmRX5joPKD0="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/discover-6.5.1.tar.xz",
+    "hash": "sha256-euUVqa013W21aOwj3F7GwkwcVV3fQS8EHt5L6dzz88w="
   },
   "drkonqi": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/drkonqi-6.5.0.tar.xz",
-    "hash": "sha256-MQaismj2cY82kH02+sol8RlFg5oW/2uLdKE81wjvjLE="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/drkonqi-6.5.1.tar.xz",
+    "hash": "sha256-pSYFVQEOV2KB0wQXZCctUSX110+N8/cX/CzRmaH2nH0="
   },
   "flatpak-kcm": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/flatpak-kcm-6.5.0.tar.xz",
-    "hash": "sha256-0zqrUc9bpv37EvY4vH6LhSW55nMNFO7hRISN4XalGEU="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/flatpak-kcm-6.5.1.tar.xz",
+    "hash": "sha256-o6y3kVVzyUJb+qdcENrroNxMgU2ecY7XVq1D12ZtlbY="
   },
   "kactivitymanagerd": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/kactivitymanagerd-6.5.0.tar.xz",
-    "hash": "sha256-owsjDL3o7SGwtJQjVRXrv+7JFvf+TxW7uSdUaEZ4Ppg="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/kactivitymanagerd-6.5.1.tar.xz",
+    "hash": "sha256-Skge3EiRK1XeNk8WirpbXNICJjpMn9aOYz5QADaleCk="
   },
   "kde-cli-tools": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/kde-cli-tools-6.5.0.tar.xz",
-    "hash": "sha256-3qIPn6Ni5ZBog7X4yZnuplGQYPEka9LyFJLYX17+QS0="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/kde-cli-tools-6.5.1.tar.xz",
+    "hash": "sha256-dGYdjccaNFuQZRd1mAsK06+yiBlK8GqjOrxpjgGD4sM="
   },
   "kde-gtk-config": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/kde-gtk-config-6.5.0.tar.xz",
-    "hash": "sha256-7fdYusB3N9/l394LeXuGRqhmnINp8PnUoroaAv5GLg4="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/kde-gtk-config-6.5.1.tar.xz",
+    "hash": "sha256-dqJ+aMXb0z8XavtJ21DwnBElIf0lqAUx9EdZUz4I2U0="
   },
   "kdecoration": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/kdecoration-6.5.0.tar.xz",
-    "hash": "sha256-+a4ZT+UfpkbSyGU++tU2KgrZJT48KLcOjkKpwDKLnBs="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/kdecoration-6.5.1.tar.xz",
+    "hash": "sha256-tZQC0jv8mWpXWvU/aTl3hGyX9sGpyTSvqVrCzv01jCQ="
   },
   "kdeplasma-addons": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/kdeplasma-addons-6.5.0.tar.xz",
-    "hash": "sha256-zApdSDB9URDAE8CLLsOCqrqfZsNwyOSrRuxxq2aTuQs="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/kdeplasma-addons-6.5.1.tar.xz",
+    "hash": "sha256-pLGc1rKKulcxWOh4yUm6qSfrp3/raZH0N9R9Q5KQ/58="
   },
   "kgamma": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/kgamma-6.5.0.tar.xz",
-    "hash": "sha256-woA1Ln611Ot95e3uNtv6I1plpbtetNk9rxblD1TaC/M="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/kgamma-6.5.1.tar.xz",
+    "hash": "sha256-A90ydZsEziJamA8GB4+ze5WDivDLiDplFC+nUxpKcOw="
   },
   "kglobalacceld": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/kglobalacceld-6.5.0.tar.xz",
-    "hash": "sha256-XcstQngVKSCOy/TS6yMfmuwp79EsLSTsn4ppBKxvddU="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/kglobalacceld-6.5.1.tar.xz",
+    "hash": "sha256-X3pmjbrldu7w0WBYGDsAiadiO+wAg8XKWjcJrJe6yeM="
   },
   "kinfocenter": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/kinfocenter-6.5.0.tar.xz",
-    "hash": "sha256-3Dy9o60aZax+vbAvaTer1UZ9M9STjWDDO1tIeP442Ds="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/kinfocenter-6.5.1.tar.xz",
+    "hash": "sha256-GcL1WJrBF+B9Kdz6PaBlcXdKYHdEhy7WNcgius9Itiw="
   },
   "kmenuedit": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/kmenuedit-6.5.0.tar.xz",
-    "hash": "sha256-WmGVESlpgfw3f/ASnIZYtMS5BDc+/XpjUahqPUxgXjg="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/kmenuedit-6.5.1.tar.xz",
+    "hash": "sha256-buDijgNUeHpyAplToypkwLYDngDBArk4RxF4qNt8zKA="
   },
   "knighttime": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/knighttime-6.5.0.tar.xz",
-    "hash": "sha256-rHrxaKAcoZv8cchJ11hyPdgcHxz+THs8ijYCGtXRuq8="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/knighttime-6.5.1.tar.xz",
+    "hash": "sha256-Xlzj5SWZRSDm8Hni2m3wBNnk1yu1GcYAMTUF7+Q4Qgw="
   },
   "kpipewire": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/kpipewire-6.5.0.tar.xz",
-    "hash": "sha256-BlG46jhi/+PqTwiiRDGrRnJXQCIfBSxDKAMzYr4iC6c="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/kpipewire-6.5.1.tar.xz",
+    "hash": "sha256-Tm4RImeWUA6P2bc5J06WCQ6HT43rKUxXDPMJkQd42a0="
   },
   "krdp": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/krdp-6.5.0.tar.xz",
-    "hash": "sha256-cQZct0KurdNq4k4pxb8eiDzQhNMPsjlCFcWJJ0AStYs="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/krdp-6.5.1.tar.xz",
+    "hash": "sha256-mO/GHKT8GAevIsqcUlEEd0PCe+hHDEPJZROsXi8LtDw="
   },
   "kscreen": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/kscreen-6.5.0.tar.xz",
-    "hash": "sha256-kesy8PcBFlWqOXK2wjXQaOI6/GugivBKMerJkt5zHZ4="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/kscreen-6.5.1.tar.xz",
+    "hash": "sha256-2dMEroOMQEyHKkL7/ahyikXvQyPX4QcU0VcEZqk1OEs="
   },
   "kscreenlocker": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/kscreenlocker-6.5.0.tar.xz",
-    "hash": "sha256-DsR9SjPkfIbgnpsIrnaRXfZa+oDSjIm1Tiv7l60uwys="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/kscreenlocker-6.5.1.tar.xz",
+    "hash": "sha256-N9+IanbW/wlKQk5YJ1/okxQDjW7CHGilunPar1fM8sc="
   },
   "ksshaskpass": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/ksshaskpass-6.5.0.tar.xz",
-    "hash": "sha256-MWm4rL+HHSvGYWVAWNjjzhLRJRP9Id3Y8IrD9gT+2kk="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/ksshaskpass-6.5.1.tar.xz",
+    "hash": "sha256-aobW64ouchh1cAv+cmT936e973HRJavYoPzRYXQIdM4="
   },
   "ksystemstats": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/ksystemstats-6.5.0.tar.xz",
-    "hash": "sha256-wNbYkC8aRQfclV0owhvQhHJQwb+kofAwre5gskljYOo="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/ksystemstats-6.5.1.tar.xz",
+    "hash": "sha256-KJX6eX/mTBrlhvoe/R9uLuEQIG5Kc6bdreadHL0BMjQ="
   },
   "kwallet-pam": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/kwallet-pam-6.5.0.tar.xz",
-    "hash": "sha256-M2OXxp7XwhtK0plDQyTHGrBP+J5kagdeeTmal62/3sw="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/kwallet-pam-6.5.1.tar.xz",
+    "hash": "sha256-NGCI2FVg/rhxSmxmyOeuXjC1gJYMv8aIEvJ9gFKoj7w="
   },
   "kwayland": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/kwayland-6.5.0.tar.xz",
-    "hash": "sha256-YLfslWNtnsTRbYC8IWEcLD1SVRStCiPwM6IGpTxLJ8E="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/kwayland-6.5.1.tar.xz",
+    "hash": "sha256-ViLuJRfsgOncYCA+BLWtur0M6t380oLES4VCZEuAh2c="
   },
   "kwayland-integration": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/kwayland-integration-6.5.0.tar.xz",
-    "hash": "sha256-wq2mdIbNFNW2Mr8g/j9vC5q/aRk+bQIOlZXdtvQwNbo="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/kwayland-integration-6.5.1.tar.xz",
+    "hash": "sha256-XOSNwGHrx5r/P0WBZcat7NNFFxFnkWv9Nf4Rn5klYro="
   },
   "kwin": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/kwin-6.5.0.tar.xz",
-    "hash": "sha256-4OqmeYAmb+J/4y0VyfGPggZ3aRn4HU4aiJ00xfZc+YI="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/kwin-6.5.1.tar.xz",
+    "hash": "sha256-xDagByiELpL2W+tlWOBXdUhF9GNOW+wpFKLRsbOLyvs="
   },
   "kwin-x11": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/kwin-x11-6.5.0.tar.xz",
-    "hash": "sha256-p52Pe0YQtI8dj1EylCKyiC7U2q3zjlyQQtJbFZQXZRM="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/kwin-x11-6.5.1.tar.xz",
+    "hash": "sha256-8X78YWnPFB99DG+ocb1j+mn+PunXDxxRVFDwol3OShI="
   },
   "kwrited": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/kwrited-6.5.0.tar.xz",
-    "hash": "sha256-IPMgzjtDD2RSppFqQpKQs8xFHZoroGrgh8PP0ZPWMes="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/kwrited-6.5.1.tar.xz",
+    "hash": "sha256-CuPbsbWjuk4EkOrv1OJOZbcDvQv9cn5hNSgOXqTOSBY="
   },
   "layer-shell-qt": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/layer-shell-qt-6.5.0.tar.xz",
-    "hash": "sha256-cg8ZPxGaR+44mktSs23cr+yk6SV/O33LVq4GI52xovc="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/layer-shell-qt-6.5.1.tar.xz",
+    "hash": "sha256-9zZ9afjRMy3X3GMpUhQl/ru4E/qn8Jp6bhA9Qb+3CsI="
   },
   "libkscreen": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/libkscreen-6.5.0.tar.xz",
-    "hash": "sha256-nEJXf6qbuqSBl4KEcJr93DEPUqzJe2YTujxs7pFhzCw="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/libkscreen-6.5.1.tar.xz",
+    "hash": "sha256-k4wPRsM3OGc/drZKb3Unh3eGkfpOHRTHAh5uTO+Cbco="
   },
   "libksysguard": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/libksysguard-6.5.0.tar.xz",
-    "hash": "sha256-LxyTJGzbBXhlG3CNAP4rbAxkEfSh8shGTlrqyBaXHIU="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/libksysguard-6.5.1.tar.xz",
+    "hash": "sha256-xO4fo0qS1TIUAUE5hBbV9yUmfIrutg+7mWmJbMzIHC8="
   },
   "libplasma": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/libplasma-6.5.0.tar.xz",
-    "hash": "sha256-vJ+BSURzEpfhfZPQjxOQUGxdmtVfWoR+CuUHloN7bOg="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/libplasma-6.5.1.tar.xz",
+    "hash": "sha256-UvIXUqOUfPVCvsO30+WXnXzcFSt7R/5kk7itsFHVihg="
   },
   "milou": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/milou-6.5.0.tar.xz",
-    "hash": "sha256-zuWqoW96kV0YdrL5GvDNchGmGNJwjle2frTfrs6ngR8="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/milou-6.5.1.tar.xz",
+    "hash": "sha256-vtlXntxcvjcCqNZkGSD07ANgXx6NTyPHixg18HzncTQ="
   },
   "ocean-sound-theme": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/ocean-sound-theme-6.5.0.tar.xz",
-    "hash": "sha256-yRLlOTCCZELphComNnnxkguaPcO2PZsCIJ/Pt2nXWg4="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/ocean-sound-theme-6.5.1.tar.xz",
+    "hash": "sha256-vncLjtOad9ZES6XwpkA3IDOOiu5DjRGnDMfwh73Ixqg="
   },
   "oxygen": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/oxygen-6.5.0.tar.xz",
-    "hash": "sha256-rQGEkahM32n7uiCXUiYRBql+G6oCqp21HXaysSC2GKM="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/oxygen-6.5.1.tar.xz",
+    "hash": "sha256-vxV5odEM/ncTMS5f8hvK6fk5i5CFIolmrGqmlmq+rwo="
   },
   "oxygen-sounds": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/oxygen-sounds-6.5.0.tar.xz",
-    "hash": "sha256-XBJk1xNXsu0OJthXDnly9ZZcEjkROTqn5LTnDvgowm8="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/oxygen-sounds-6.5.1.tar.xz",
+    "hash": "sha256-pkqkMjSSrgn+le8TSjtKrXKg68RD7L5uI5W6q/awmK8="
   },
   "plasma-activities": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plasma-activities-6.5.0.tar.xz",
-    "hash": "sha256-DbhyvFaqhNIv5lsZxbNkzBT0SkBAHqqvv42iegS4iD8="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plasma-activities-6.5.1.tar.xz",
+    "hash": "sha256-Hz46eBr0UQAVTIT7jIuv8FVo5ApMFGvyDSwAoW/iQdE="
   },
   "plasma-activities-stats": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plasma-activities-stats-6.5.0.tar.xz",
-    "hash": "sha256-YdcjGKwdTN7WFS8Jfuj0SzsyYXkaaELcrYZo59Bj9RU="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plasma-activities-stats-6.5.1.tar.xz",
+    "hash": "sha256-H2vfj9mXTAq4aM42fk9rm/EO1IzWak5bgusJ2xKQcBc="
   },
   "plasma-browser-integration": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plasma-browser-integration-6.5.0.tar.xz",
-    "hash": "sha256-HwFDyglLrMMPtphYVOnI+9ktFJU7O7MSGTIrozFwnf8="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plasma-browser-integration-6.5.1.tar.xz",
+    "hash": "sha256-bjrq5mwWJ9SSHPBtpNs7/b6F+hq/wgx7xTg20M6uIi4="
   },
   "plasma-desktop": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plasma-desktop-6.5.0.tar.xz",
-    "hash": "sha256-wn3CwSeVSDp3ohvMcAKbmDRHTtQj3NuT3A6IV9Te3kI="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plasma-desktop-6.5.1.tar.xz",
+    "hash": "sha256-VU3r3ENWYUUNIrv+EqlBwL/4IjqmYpIL9fAb4MKvPx8="
   },
   "plasma-dialer": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plasma-dialer-6.5.0.tar.xz",
-    "hash": "sha256-dTUxwFguIe6cJURMOn1gahNZ7MKKn2Ds/jCPS26d6Mg="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plasma-dialer-6.5.1.tar.xz",
+    "hash": "sha256-ohwRgQIIxSw9iCW1cr1xPWaXsctP6xQG/LkNOBR/jhQ="
   },
   "plasma-disks": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plasma-disks-6.5.0.tar.xz",
-    "hash": "sha256-6KThaCHyXGzC74JYcVQHfdfZi3Upiqh/6KxpXmo8+Po="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plasma-disks-6.5.1.tar.xz",
+    "hash": "sha256-/g6LsGG+wiXYs0gNFsnYvunwYG8HT6UWV1f0jnIOQUM="
   },
   "plasma-firewall": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plasma-firewall-6.5.0.tar.xz",
-    "hash": "sha256-7fZeXA4jfFkyiZMxYx3XK6LZtp6cl/906P/AUEuQ9cs="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plasma-firewall-6.5.1.tar.xz",
+    "hash": "sha256-61e9xjoyYWfJohxfM8yyXrB+1Kd0ODU+7zpfCC+EKoY="
   },
   "plasma-integration": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plasma-integration-6.5.0.tar.xz",
-    "hash": "sha256-AqfgvOVrqpPG9xNrljC5ulEJ19Kcb2wRDMcWEL3SDg4="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plasma-integration-6.5.1.tar.xz",
+    "hash": "sha256-YnEY51CVNdtBYN1LCUcA+V3PI5ILGPDVFOW0YwMzVDM="
   },
   "plasma-mobile": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plasma-mobile-6.5.0.tar.xz",
-    "hash": "sha256-Ib9k7bv5RGJuBX3CLpIugWxbVVIuh57rnLYQ/UhYNQU="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plasma-mobile-6.5.1.tar.xz",
+    "hash": "sha256-BC7NnyvgMr1b+Ui4QYu0D0w9ysaN78Kvq+iHGnj7TI4="
   },
   "plasma-nano": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plasma-nano-6.5.0.tar.xz",
-    "hash": "sha256-GhFhF6XAaAwycZU6UMmKsN4y9qfwM9i1Zov+WtMr0RY="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plasma-nano-6.5.1.tar.xz",
+    "hash": "sha256-KCeNaa09wjkpZTbej+5CJTHvan8emzZwsAAqWAZEyYg="
   },
   "plasma-nm": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plasma-nm-6.5.0.tar.xz",
-    "hash": "sha256-ZIpHqoghXPIbtsbHnwwgvcqsn5/8VAKiPDQbpAApQZU="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plasma-nm-6.5.1.tar.xz",
+    "hash": "sha256-xPZUtUc62W8xGeylc6Gk7F7eCl9hKbLIt+sCMP3rPpw="
   },
   "plasma-pa": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plasma-pa-6.5.0.tar.xz",
-    "hash": "sha256-JNdY8tVUhoSluNT+igowS7z23gLkijfLGji6eaQoJYw="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plasma-pa-6.5.1.tar.xz",
+    "hash": "sha256-oNip/KNERP6jRqHcIWYjNf+CrLn9Ba9FfeBun6bUB80="
   },
   "plasma-sdk": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plasma-sdk-6.5.0.tar.xz",
-    "hash": "sha256-vCRMPWMXNepo7uQlrcfWCwnxcSi6ZT986jAxNGBr24E="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plasma-sdk-6.5.1.tar.xz",
+    "hash": "sha256-MImo+N0mvSI7zRxj9GNPLr9lVH1M7QIxYTeodUxWQ4c="
   },
   "plasma-systemmonitor": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plasma-systemmonitor-6.5.0.tar.xz",
-    "hash": "sha256-AFXX6Cs+4VcYf7DHl/KGfD2mLVZJDJ02/VdvAmuTRbQ="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plasma-systemmonitor-6.5.1.tar.xz",
+    "hash": "sha256-ZwiX9A8NxkcL6Hya3zbnFPpTavMy28Rmzax9+ce0Yp8="
   },
   "plasma-thunderbolt": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plasma-thunderbolt-6.5.0.tar.xz",
-    "hash": "sha256-1kXh2Tri9kHO1u5fds/6vgTHqj6i3xjbiFyoyTTHIyI="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plasma-thunderbolt-6.5.1.tar.xz",
+    "hash": "sha256-pdfEjdQ5b4rnp89BCLs7GB6RD60hHIQogjMzOBTJtlY="
   },
   "plasma-vault": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plasma-vault-6.5.0.tar.xz",
-    "hash": "sha256-umka8KaosOmZYH2UJOu6TVDKQwSgcTA3ypwhf9OrSJQ="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plasma-vault-6.5.1.tar.xz",
+    "hash": "sha256-k08VPD0hieSjU4YqWXF4Zszw/fOsvkdWyEruCGEuhUg="
   },
   "plasma-welcome": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plasma-welcome-6.5.0.tar.xz",
-    "hash": "sha256-TcElW4McRGt+izc1RR/M+j34DCsoJdhQa7NWkM/LhbY="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plasma-welcome-6.5.1.tar.xz",
+    "hash": "sha256-KgG52Y2NBPnFqOcDT+Tuq+FRuvrZP3Eym2psD4hwLnM="
   },
   "plasma-workspace": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plasma-workspace-6.5.0.tar.xz",
-    "hash": "sha256-ZJHq+/q8UzXFx6e21ohKEfkQdVh7SRJAHP/oMJZvLyA="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plasma-workspace-6.5.1.tar.xz",
+    "hash": "sha256-e+2icLSptdmoAWvw43MimvD+4CQkIxiuL5RcwyuAfKI="
   },
   "plasma-workspace-wallpapers": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plasma-workspace-wallpapers-6.5.0.tar.xz",
-    "hash": "sha256-MsHBoBVYlfTbU0M/pJKBH0VFth0jfHez0FzYP7b0yX0="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plasma-workspace-wallpapers-6.5.1.tar.xz",
+    "hash": "sha256-AlkQ+7dpRilxTxfgfc4niA2dozqPPQHAuq5mPpQVals="
   },
   "plasma5support": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plasma5support-6.5.0.tar.xz",
-    "hash": "sha256-lyp3VujiH0mkJHnU4PW+tkT4/64V2lI3dk0k28UJ49o="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plasma5support-6.5.1.tar.xz",
+    "hash": "sha256-cLn5YSLxnO+kyl77aZC5aJ4onphq9snj7KTnTPVZ0nk="
   },
   "plymouth-kcm": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/plymouth-kcm-6.5.0.tar.xz",
-    "hash": "sha256-Q2bI4WelqoBhc1wNK+VoNgLxJTMQEBvtc0bLPdMTyUk="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/plymouth-kcm-6.5.1.tar.xz",
+    "hash": "sha256-LN0hfUkMIzLHXdhS3+WnZ+JNXc4Ot55HsDsp+kjYpmM="
   },
   "polkit-kde-agent-1": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/polkit-kde-agent-1-6.5.0.tar.xz",
-    "hash": "sha256-pLJ7seqVF1jRG3jAhTyB73EigBqkGkSIQk2qWiCM5rE="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/polkit-kde-agent-1-6.5.1.tar.xz",
+    "hash": "sha256-D+hTTQ/yazWUlIM3Qi3yAavAhwSD3bEOifatuZJMbWI="
   },
   "powerdevil": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/powerdevil-6.5.0.tar.xz",
-    "hash": "sha256-9+fb6mSvwVxd4YEA4zkr3eXM3HNfb1FpcyCBWZMfwYc="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/powerdevil-6.5.1.tar.xz",
+    "hash": "sha256-UZnkM1StUkGaH1PmoVsWcjuPf3N2ouR2bjqSC337dD8="
   },
   "print-manager": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/print-manager-6.5.0.tar.xz",
-    "hash": "sha256-D3R2h6DRWewhVkXY96g0RlDxojwmbEuysN7zH9G8O88="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/print-manager-6.5.1.tar.xz",
+    "hash": "sha256-anMpNCJBDNqHE/sIQQJrJxjY0pWHAKW+WtK8zHaGQRI="
   },
   "qqc2-breeze-style": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/qqc2-breeze-style-6.5.0.tar.xz",
-    "hash": "sha256-Zx3ipLD8F8qCIvkRuK3mxM7X/nb9n2BcIUyx5X72Jtk="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/qqc2-breeze-style-6.5.1.tar.xz",
+    "hash": "sha256-jKOgmWpNzgbJphmYr+FAIB9gwBGaA3rrvAf8PXoo0KA="
   },
   "sddm-kcm": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/sddm-kcm-6.5.0.tar.xz",
-    "hash": "sha256-cfMwxsiQp7LAcYiqnHd8arZvTLHbq4lP0hKkiR6fRSg="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/sddm-kcm-6.5.1.tar.xz",
+    "hash": "sha256-HYgzqCLhg7vq2Z7HaECsLU7RMZ6CNeiocZ8xxwNEk9E="
   },
   "spacebar": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/spacebar-6.5.0.tar.xz",
-    "hash": "sha256-nUU0uHx+lrDB/VSmg21fnKsexoGbmwriysrutBQpdNg="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/spacebar-6.5.1.tar.xz",
+    "hash": "sha256-rBx6xeWY24v1IESCv7osWY+p4jxhSLJVjdqfHeZHCbw="
   },
   "spectacle": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/spectacle-6.5.0.tar.xz",
-    "hash": "sha256-4UZXxvHyU4o3lvkVv9K4IV9GfLNqQrwtrYhsqevw3PE="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/spectacle-6.5.1.tar.xz",
+    "hash": "sha256-pG0uZ/ujsSnCUScbxsJGMyOAHKVWajyFRVMH0fP78Lo="
   },
   "systemsettings": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/systemsettings-6.5.0.tar.xz",
-    "hash": "sha256-u2XQzDPoqguIupyTAKHnGwDi4LoCiMQcFAG0q+g9JZw="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/systemsettings-6.5.1.tar.xz",
+    "hash": "sha256-SPlwgXloDwJ08RlFedkUsWXcIcM7BY3h0hAkCgdhxjY="
   },
   "wacomtablet": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/wacomtablet-6.5.0.tar.xz",
-    "hash": "sha256-jqzMQN1kSaWJCOkJsq7cuJ1vuiVC7F+kbttrJpGYJBc="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/wacomtablet-6.5.1.tar.xz",
+    "hash": "sha256-lCG21PeqOcwosg0Rh+w9mN4ChfhYHo4VwQfHIjSCaIs="
   },
   "xdg-desktop-portal-kde": {
-    "version": "6.5.0",
-    "url": "mirror://kde/stable/plasma/6.5.0/xdg-desktop-portal-kde-6.5.0.tar.xz",
-    "hash": "sha256-9aRIU7Lm0IWKhigDiu6L/22EsewlsE7nqWHXPpYmGbc="
+    "version": "6.5.1",
+    "url": "mirror://kde/stable/plasma/6.5.1/xdg-desktop-portal-kde-6.5.1.tar.xz",
+    "hash": "sha256-+qFye0L1+XGNz+3C+5lgaG+NkznZlXXABnkymP2Zrlo="
   }
 }
\ No newline at end of file

From 34cb8d1d09482bb8a8ce1ff2dbe6078a8df02b11 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 27 Oct 2025 09:47:30 +0100
Subject: [PATCH 3520/6226] uhhyou-plugins: init at 0.67.0

---
 pkgs/by-name/uh/uhhyou-plugins/package.nix | 84 ++++++++++++++++++++++
 1 file changed, 84 insertions(+)
 create mode 100644 pkgs/by-name/uh/uhhyou-plugins/package.nix

diff --git a/pkgs/by-name/uh/uhhyou-plugins/package.nix b/pkgs/by-name/uh/uhhyou-plugins/package.nix
new file mode 100644
index 000000000000..b6f8ad14779d
--- /dev/null
+++ b/pkgs/by-name/uh/uhhyou-plugins/package.nix
@@ -0,0 +1,84 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  writableTmpDirAsHomeHook,
+  cairo,
+  fontconfig,
+  freetype,
+  libxcb,
+  xcbutil,
+  xorg,
+  xcbutilkeysyms,
+  libxkbcommon,
+  libX11,
+  libXrandr,
+  libXinerama,
+  libXcursor,
+  pango,
+  gtkmm3,
+  sqlite,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "uhhyou-plugins";
+  version = "0.67.0";
+  src = fetchFromGitHub {
+    owner = "ryukau";
+    repo = "VSTPlugins";
+    rev = "UhhyouPlugins${finalAttrs.version}";
+    hash = "sha256-8YGfcnWkOQwwq6m3510GPpZu6UbDmVi3K/dOGLrAnhM=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+    writableTmpDirAsHomeHook
+  ];
+
+  buildInputs = [
+    cairo
+    fontconfig
+    freetype
+    libxcb
+    xcbutil
+    xorg.xcbutilcursor
+    xcbutilkeysyms
+    libxkbcommon
+    libX11
+    libXrandr
+    libXinerama
+    libXcursor
+    pango
+    gtkmm3
+    sqlite
+  ];
+
+  postPatch = ''
+    # see: https://github.com/ryukau/VSTPlugins/blob/master/build_instruction.md#linux-ubuntu
+    patch -p1 -d lib/vst3sdk/vstgui4 < ci/linux_patch/cairographicscontext.patch
+    patchShebangs lib/vst3sdk/vstgui4/vstgui/uidescription/editing/createuidescdata.sh
+  '';
+
+  enableParallelBuilding = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/vst3
+    cp -r VST3/Release/*.vst3 $out/lib/vst3/
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Collection of VST3 audio synthesis and processing plugins.";
+    homepage = "https://ryukau.github.io/VSTPlugins/";
+    license = lib.licenses.gpl3Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ magnetophon ];
+  };
+})

From 87ab77ec959bb8cd6b11ab450c1bf688b0288c2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= <code@mguentner.de>
Date: Tue, 28 Oct 2025 13:53:55 +0100
Subject: [PATCH 3521/6226] python3Packages.mkdocs-redoc-tag: fix broken
 checkPhase

workaround for http://github.com/pallets/click/issues/824
---
 pkgs/development/python-modules/mkdocs-redoc-tag/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/mkdocs-redoc-tag/default.nix b/pkgs/development/python-modules/mkdocs-redoc-tag/default.nix
index 1b121ff00c78..0b0acf41e228 100644
--- a/pkgs/development/python-modules/mkdocs-redoc-tag/default.nix
+++ b/pkgs/development/python-modules/mkdocs-redoc-tag/default.nix
@@ -36,6 +36,8 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  pytestFlags = [ "-s" ];
+
   meta = with lib; {
     description = "MkDocs plugin supports for add Redoc UI in page";
     homepage = "https://github.com/blueswen/mkdocs-redoc-tag";

From 698dbd9a62894f882e993353305387b5622ecde3 Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Tue, 28 Oct 2025 13:59:28 +0100
Subject: [PATCH 3522/6226] squid: backport a fix for not prohibiting numeric
 domain names

---
 pkgs/by-name/sq/squid/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/sq/squid/package.nix b/pkgs/by-name/sq/squid/package.nix
index efd5c86fd16e..384dadf43743 100644
--- a/pkgs/by-name/sq/squid/package.nix
+++ b/pkgs/by-name/sq/squid/package.nix
@@ -16,6 +16,7 @@
   cppunit,
   ipv6 ? true,
   nixosTests,
+  fetchpatch,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "squid";
@@ -28,6 +29,13 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Xgd74dg6nmls6NDZ5yOxJzFSIHoJFAS+aKS5qeGMcAM=";
   };
 
+  patches = lib.optional (lib.versionOlder finalAttrs.version "7.2.0") (fetchpatch {
+    # Merged upstream PR; fixes the issue of rejecting domain names starting with digits
+    # To remove when 7.3 is released (or 7.2.1, but that doesn't seem likely)
+    url = "https://patch-diff.githubusercontent.com/raw/squid-cache/squid/pull/2283.patch";
+    hash = "sha256-HLGmzrAH5y1sFfFnVeeegRihyn+N7csGX9lVqmCDIHc=";
+  });
+
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     perl

From 8fe447f8cc38f1fd2b71182c12776391f2f7f69c Mon Sep 17 00:00:00 2001
From: Sirio Balmelli <sirio@b-ad.ch>
Date: Tue, 28 Oct 2025 14:03:04 +0100
Subject: [PATCH 3523/6226] zig: 0.15.2 build no longer broken on x86_64-darwin

Signed-off-by: Sirio Balmelli <sirio@b-ad.ch>
---
 pkgs/development/compilers/zig/generic.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/compilers/zig/generic.nix b/pkgs/development/compilers/zig/generic.nix
index b68750a56154..8d6af23eae29 100644
--- a/pkgs/development/compilers/zig/generic.nix
+++ b/pkgs/development/compilers/zig/generic.nix
@@ -145,9 +145,5 @@ stdenv.mkDerivation (finalAttrs: {
     teams = [ lib.teams.zig ];
     mainProgram = "zig";
     platforms = lib.platforms.unix;
-    # Zig 0.15.1 fails some tests on x86_64-darwin thus we mark it broken
-    # see https://github.com/ziglang/zig/issues/24974
-    broken =
-      stdenv.hostPlatform.system == "x86_64-darwin" && lib.versionAtLeast finalAttrs.version "0.15";
   };
 })

From c2fc311cf1dc2827697b62a158758122a767d1ac Mon Sep 17 00:00:00 2001
From: eyjhb <eyjhbb@gmail.com>
Date: Sat, 25 Oct 2025 13:12:45 +0200
Subject: [PATCH 3524/6226] compactor: adds patch for failing test

Adds the patch
https://github.com/dns-stats/compactor/commit/f7deaf89f55a12c586b6662a3a7d04b10a4c7bcb
, which fixes the test failure when updating to Wireshark 4.6.0.
---
 pkgs/applications/networking/compactor/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/applications/networking/compactor/default.nix b/pkgs/applications/networking/compactor/default.nix
index e783aef616c7..b2ab9dd0c9d8 100644
--- a/pkgs/applications/networking/compactor/default.nix
+++ b/pkgs/applications/networking/compactor/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   asciidoctor,
   autoreconfHook,
   pkg-config,
@@ -42,6 +43,12 @@ stdenv.mkDerivation rec {
 
     # https://github.com/dns-stats/compactor/pull/91
     ./patches/update-golden-cbor2diag-output.patch
+
+    # https://github.com/dns-stats/compactor/commit/f7deaf89f55a12c586b6662a3a7d04b10a4c7bcb
+    (fetchpatch {
+      url = "https://github.com/dns-stats/compactor/commit/f7deaf89f55a12c586b6662a3a7d04b10a4c7bcb.patch";
+      hash = "sha256-eEaVS5rfrLkRGc668PwVfb/xw3n1SoCm30xEf1NjbeY=";
+    })
   ];
 
   nativeBuildInputs = [

From d35b39cce18c82b48879f30a4e6201f2a1e4d0a8 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Tue, 28 Oct 2025 13:12:31 +0000
Subject: [PATCH 3525/6226] vscode-extensions.augment.vscode-augment: 0.603.0
 -> 0.613.0

---
 .../vscode/extensions/augment.vscode-augment/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix b/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix
index b3e5278e5f39..b29a3f0d039c 100644
--- a/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "vscode-augment";
     publisher = "augment";
-    version = "0.603.0";
-    hash = "sha256-1CBZnBTu03iubIcIrUvCKeN6RtjKO3NUEXggdXTAwM8=";
+    version = "0.613.0";
+    hash = "sha256-2HvDCfNX+snwnqd9XI6rHBkGBydxnf5OYYfBnAAxjZk=";
   };
 
   meta = {

From 092b55b2a0ff2ceecc14b6f4bc67cb5999b1f120 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 28 Oct 2025 09:11:09 -0400
Subject: [PATCH 3526/6226] erlang_27: 27.3.4.3 -> 27.3.4.4

https://github.com/erlang/otp/releases/tag/OTP-27.3.4.4
---
 pkgs/development/interpreters/erlang/27.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/erlang/27.nix b/pkgs/development/interpreters/erlang/27.nix
index d51bc6a76572..fd4acce3596b 100644
--- a/pkgs/development/interpreters/erlang/27.nix
+++ b/pkgs/development/interpreters/erlang/27.nix
@@ -1,6 +1,6 @@
 genericBuilder:
 
 genericBuilder {
-  version = "27.3.4.3";
-  hash = "sha256-p4M1PPrbpNq6la4kgTTCOa2f5/oYxNwMaSi59mhlM4o=";
+  version = "27.3.4.4";
+  hash = "sha256-iHpEYXzaso1ZK9XLrT04t+BoX2Y6nSbT9rNjY1JoHPM=";
 }

From 07d69e971f2b2704ce9f24b7611b070e24c280cc Mon Sep 17 00:00:00 2001
From: Ivy Pierlot <ivyp@outlook.com.au>
Date: Wed, 29 Oct 2025 00:19:13 +1100
Subject: [PATCH 3527/6226] karabiner-dk: add system to updateScript

---
 pkgs/by-name/ka/karabiner-dk/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ka/karabiner-dk/package.nix b/pkgs/by-name/ka/karabiner-dk/package.nix
index 731d7677a9a6..972cc1edf583 100644
--- a/pkgs/by-name/ka/karabiner-dk/package.nix
+++ b/pkgs/by-name/ka/karabiner-dk/package.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = writeShellScript "karabiner-dk" ''
     NEW_VERSION=$(${lib.getExe curl} --silent https://api.github.com/repos/pqrs-org/Karabiner-DriverKit-VirtualHIDDevice/releases/latest $${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} | ${lib.getExe jq} '.tag_name | ltrimstr("v")' --raw-output)
-    ${lib.getExe' common-updater-scripts "update-source-version"} "karabiner-dk" "$NEW_VERSION" --ignore-same-version --version-key="sourceVersion";
+    ${lib.getExe' common-updater-scripts "update-source-version"} "karabiner-dk" "$NEW_VERSION" --system=aarch64-darwin --ignore-same-version --version-key="sourceVersion";
   '';
 
   meta = {

From be5983ea1666a7286a1d15cbd80a590d3bea3f13 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 28 Oct 2025 10:29:03 -0300
Subject: [PATCH 3528/6226] stats: 2.11.57 -> 2.11.58

---
 pkgs/by-name/st/stats/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/stats/package.nix b/pkgs/by-name/st/stats/package.nix
index 7db16aec5336..ebaa395e8381 100644
--- a/pkgs/by-name/st/stats/package.nix
+++ b/pkgs/by-name/st/stats/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stats";
-  version = "2.11.57";
+  version = "2.11.58";
 
   src = fetchurl {
     url = "https://github.com/exelban/stats/releases/download/v${finalAttrs.version}/Stats.dmg";
-    hash = "sha256-hZGMFhac+JZTISzi9xlqHFJCNvGSXbb6styQ7vN51sw=";
+    hash = "sha256-2q9gPXrJ8elek+NuQq7RkdRnfnUc5Rw3Jopp6Q3R+UI=";
   };
 
   sourceRoot = ".";

From 1264ad752974ebd80a99eb8b367d0c6bdf219f21 Mon Sep 17 00:00:00 2001
From: Adam Dinwoodie <adam@dinwoodie.org>
Date: Tue, 28 Oct 2025 13:30:35 +0000
Subject: [PATCH 3529/6226] quodlibet: don't use Xine unnecessarily

In 50dc0203707d (quodlibet: makeover, 2022-08-05) / #185236, the
quodlibet library was refactored.  That commit appears to have
accidentally changed the default arguments for building quodlibet to
mean the Xine backend would always be included, rather than only as an
alternative to the Gstreamer backend.  This adds unnecessary
dependencies for the non-Xine quodlibet packages, so default to only
including Xine if Gstreamer is absent.
---
 pkgs/applications/audio/quodlibet/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index 8d6518a1e323..98047b81f28b 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -34,7 +34,7 @@
   withGstPlugins ? withGstreamerBackend,
   withGstreamerBackend ? true,
   gst_all_1,
-  withXineBackend ? true,
+  withXineBackend ? !withGstreamerBackend,
   xine-lib,
 
   # tests

From a66dbde881dc3b7f34a2ec92c1c5ff0e7d0553ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFs=20Postula?= <lois@postu.la>
Date: Tue, 28 Oct 2025 13:24:23 +0100
Subject: [PATCH 3530/6226] updatecli: add loispostula to maintainers

---
 pkgs/by-name/up/updatecli/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/up/updatecli/package.nix b/pkgs/by-name/up/updatecli/package.nix
index cfb0fa161a36..9770640704c8 100644
--- a/pkgs/by-name/up/updatecli/package.nix
+++ b/pkgs/by-name/up/updatecli/package.nix
@@ -65,6 +65,9 @@ buildGoModule rec {
     changelog = "https://github.com/updatecli/updatecli/releases/tag/${src.rev}";
     license = licenses.asl20;
     mainProgram = "updatecli";
-    maintainers = with maintainers; [ croissong ];
+    maintainers = with maintainers; [
+      croissong
+      lpostula
+    ];
   };
 }

From 82814dc93ba5bd81ff88fd2945a8501e2b82559a Mon Sep 17 00:00:00 2001
From: Phillip Seeber <phillip.seeber@googlemail.com>
Date: Tue, 28 Oct 2025 14:15:42 +0100
Subject: [PATCH 3531/6226] python3Packages.tblite: fix passing dftd4 dep

---
 pkgs/top-level/python-packages.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5f3af98436e1..2f896fe74379 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18106,7 +18106,12 @@ self: super: with self; {
   tblib = callPackage ../development/python-modules/tblib { };
 
   tblite = callPackage ../development/libraries/science/chemistry/tblite/python.nix {
-    inherit (pkgs) tblite meson simple-dftd3;
+    inherit (pkgs)
+      tblite
+      meson
+      simple-dftd3
+      dftd4
+      ;
   };
 
   tbm-utils = callPackage ../development/python-modules/tbm-utils { };

From d002d44179a2861fae0f30284c294ca0b6cdd055 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 28 Oct 2025 23:31:44 +1000
Subject: [PATCH 3532/6226] nodePackages: remove outdated aliases

these were removed in https://github.com/NixOS/nixpkgs/commit/dc8e93e7b8c2f8976f063ce7c012437406670a5e
---
 pkgs/development/node-packages/aliases.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index e6456bc89b8f..469d083f020a 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -53,7 +53,6 @@ mapAliases {
   "@vue/language-server" = pkgs.vue-language-server; # added 2024-06-15
   "@withgraphite/graphite-cli" = pkgs.graphite-cli; # added 2024-01-25
   "@zwave-js/server" = pkgs.zwave-js-server; # Added 2023-09-09
-  antennas = pkgs.antennas; # added 2023-07-30
   inherit (pkgs) autoprefixer; # added 2024-06-25
   inherit (pkgs) asar; # added 2023-08-26
   inherit (pkgs) auto-changelog; # added 2024-06-25
@@ -70,7 +69,6 @@ mapAliases {
   castnow = pkgs.castnow; # added 2023-07-30
   inherit (pkgs) cdktf-cli; # added 2025-10-02
   inherit (pkgs) clean-css-cli; # added 2023-08-18
-  inherit (pkgs) clubhouse-cli; # added 2023-08-18
   inherit (pkgs) coc-clangd; # added 2024-06-29
   inherit (pkgs) coc-css; # added 2024-06-29
   inherit (pkgs) coc-diagnostic; # added 2024-06-29
@@ -94,7 +92,6 @@ mapAliases {
   inherit (pkgs) configurable-http-proxy; # added 2023-08-19
   copy-webpack-plugin = throw "copy-webpack-plugin was removed because it is a JS library, so your project should lock it with a JS package manager instead."; # Added 2024-12-16
   inherit (pkgs) cordova; # added 2023-08-18
-  inherit (pkgs) create-react-app; # added 2023-09-25
   create-react-native-app = throw "create-react-native-app was removed because it was deprecated. Upstream suggests using a framework for React Native."; # added 2024-12-08
   inherit (pkgs) cspell;
   dat = throw "dat was removed because it was broken"; # added 2023-08-21

From f6e5f353191a1b874e0d855dedfe346a69a637db Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 26 Oct 2025 22:30:56 +0100
Subject: [PATCH 3533/6226] uhhyou-plugins-juce: init at 0.1.0

---
 .../uh/uhhyou-plugins-juce/package.nix        | 63 +++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 pkgs/by-name/uh/uhhyou-plugins-juce/package.nix

diff --git a/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix b/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix
new file mode 100644
index 000000000000..71cb46c212b2
--- /dev/null
+++ b/pkgs/by-name/uh/uhhyou-plugins-juce/package.nix
@@ -0,0 +1,63 @@
+{
+  alsa-lib,
+  cmake,
+  curl,
+  fetchFromGitHub,
+  freetype,
+  lib,
+  libGL,
+  libXcursor,
+  libXext,
+  libXinerama,
+  libXrandr,
+  libjack2,
+  pkg-config,
+  stdenv,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "uhhyou-plugins-juce";
+  version = "0.1.0";
+  src = fetchFromGitHub {
+    owner = "ryukau";
+    repo = "UhhyouPluginsJuce";
+    tag = "UhhyouPluginsJuce${finalAttrs.version}";
+    hash = "sha256-oHxyOTiqEwdNUKGQNjjfdRkzMa+4TYX6Vf6ZS9BTcC0=";
+    fetchSubmodules = true;
+  };
+  nativeBuildInputs = [
+    pkg-config
+    cmake
+  ];
+  buildInputs = [
+    alsa-lib
+    curl
+    freetype
+    libGL
+    libXcursor
+    libXext
+    libXinerama
+    libXrandr
+    libjack2
+  ];
+
+  # Disable LTO to avoid optimization mismatch issues
+  NIX_CFLAGS_COMPILE = [
+    "-fno-lto"
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/vst3
+    cp -r *_artefacts/Release/VST3/*.vst3 $out/lib/vst3/
+    runHook postInstall
+  '';
+
+  meta = {
+    homepage = "https://github.com/ryukau/UhhyouPluginsJuce";
+    description = "A collection of VST3 effect plugins";
+    license = [ lib.licenses.agpl3Only ];
+    maintainers = with lib.maintainers; [ magnetophon ];
+    platforms = lib.platforms.linux;
+  };
+})

From 6715f8f3f2323a70d5c79a014422f4965c29a4ef Mon Sep 17 00:00:00 2001
From: Yechiel Worenklein <41305372+yechielw@users.noreply.github.com>
Date: Mon, 27 Oct 2025 13:42:54 +0200
Subject: [PATCH 3534/6226] batticonplus: init at 2.0.1 this is a drop-in
 replacement for cbatticon with wayland support

Apply suggestions from code review

- Replace `rev` with `tag`
- Refactor meta

Co-authored-by: qzylinra <225773816+qzylinra@users.noreply.github.com>
---
 pkgs/by-name/ba/batticonplus/package.nix | 54 ++++++++++++++++++++++++
 1 file changed, 54 insertions(+)
 create mode 100644 pkgs/by-name/ba/batticonplus/package.nix

diff --git a/pkgs/by-name/ba/batticonplus/package.nix b/pkgs/by-name/ba/batticonplus/package.nix
new file mode 100644
index 000000000000..d83eacc1dacb
--- /dev/null
+++ b/pkgs/by-name/ba/batticonplus/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  pkg-config,
+  gettext,
+  glib,
+  gtk3,
+  libnotify,
+  wrapGAppsHook3,
+  libayatana-appindicator,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "batticonplus";
+  version = "2.0.1";
+
+  src = fetchFromGitHub {
+    owner = "artist4xlibre";
+    repo = "batticonplus";
+    tag = "v${version}";
+    hash = "sha256-H9ZoiQ5zWMIoWWol2a6f9Z8g4o9DIHYdF+/nEsBfuzc=";
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+    gettext
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    glib
+    gtk3
+    libnotify
+    libayatana-appindicator
+  ];
+
+  makeFlags = [
+    "PREFIX=${placeholder "out"}"
+    "WITH_APPINDICATOR=1"
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Lightweight battery status icon for the system tray and notifier (based on cbatticon)";
+    mainProgram = "batticonplus";
+    homepage = "https://github.com/artist4xlibre/batticonplus";
+    license = lib.licenses.gpl2;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ yechielw ];
+  };
+}

From 01e33f58eb2aa8598c9d60b9fbbd11cfc5a7e176 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 14:12:21 +0000
Subject: [PATCH 3535/6226] octoscan: 0.1.5 -> 0.1.6

---
 pkgs/by-name/oc/octoscan/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/oc/octoscan/package.nix b/pkgs/by-name/oc/octoscan/package.nix
index 3b2636a2bec1..7aaeaffffb2a 100644
--- a/pkgs/by-name/oc/octoscan/package.nix
+++ b/pkgs/by-name/oc/octoscan/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "octoscan";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "synacktiv";
     repo = "octoscan";
     tag = "v${version}";
-    hash = "sha256-SG6QHpDG9kPfb9jvHwz58U7+HZpFwYzwsDERNRW5R10=";
+    hash = "sha256-BFq4PXW5V8L4NP6wn2t2hG5xBKwxlgS+YC75VDTKKjs=";
   };
 
-  vendorHash = "sha256-Jx4OEVqCTiW/BSygeLtwwqijiACEuPk0BT26JQoL3Ds=";
+  vendorHash = "sha256-+TQDZXqWNBFAPES0qsrpBdl/jQZAfHXBcav2HcS0d7o=";
 
   ldflags = [
     "-s"

From 3ec52a24006de0cdbae8d42682c1cafbe680b2bd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 14:12:52 +0000
Subject: [PATCH 3536/6226] flaresolverr: 3.4.2 -> 3.4.3

---
 pkgs/by-name/fl/flaresolverr/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fl/flaresolverr/package.nix b/pkgs/by-name/fl/flaresolverr/package.nix
index 24e92261e0c9..3b580e41b82e 100644
--- a/pkgs/by-name/fl/flaresolverr/package.nix
+++ b/pkgs/by-name/fl/flaresolverr/package.nix
@@ -31,13 +31,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "flaresolverr";
-  version = "3.4.2";
+  version = "3.4.3";
 
   src = fetchFromGitHub {
     owner = "FlareSolverr";
     repo = "FlareSolverr";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-ZQMrt4KJpTRdug3dqtDsX5sQveAdiGSsq9V+71iUKR8=";
+    hash = "sha256-5insO3XfIN9vGuPIeVBcLhsYPCO29mR41MFtIy8jeXE=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 29a2273eee1fd21703aff60114f58688f28f1a73 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 14:12:59 +0000
Subject: [PATCH 3537/6226] distrobox: 1.8.1.2 -> 1.8.2.0

---
 pkgs/by-name/di/distrobox/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/distrobox/package.nix b/pkgs/by-name/di/distrobox/package.nix
index c7970e436c50..8946a7355b9c 100644
--- a/pkgs/by-name/di/distrobox/package.nix
+++ b/pkgs/by-name/di/distrobox/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "distrobox";
-  version = "1.8.1.2";
+  version = "1.8.2.0";
 
   src = fetchFromGitHub {
     owner = "89luca89";
     repo = "distrobox";
     rev = finalAttrs.version;
-    hash = "sha256-wTu+8SQZaf8TKkjyvKqTvIWnCZTiPnozybTu5uKXEJk=";
+    hash = "sha256-uwJD7HsWoQ/LxYL0mSSxMni676qqEnMHndpL01M5ySE=";
   };
 
   dontConfigure = true;

From 1a59222f0c71accb1b7124434c4b7b6faff41efe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 14:14:47 +0000
Subject: [PATCH 3538/6226] mapcidr: 1.1.96 -> 1.1.97

---
 pkgs/by-name/ma/mapcidr/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/mapcidr/package.nix b/pkgs/by-name/ma/mapcidr/package.nix
index a810abc5d60a..02a1ce4d90fa 100644
--- a/pkgs/by-name/ma/mapcidr/package.nix
+++ b/pkgs/by-name/ma/mapcidr/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "mapcidr";
-  version = "1.1.96";
+  version = "1.1.97";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "mapcidr";
     tag = "v${version}";
-    hash = "sha256-wEx1HDMl2y3di3k5Mb4lnX5adYYd7wPyaF2bw+5ivSY=";
+    hash = "sha256-a+yVSh+Cgq73mQHaumVgNqEg/gXa2r2qld4bTi3Du/Y=";
   };
 
-  vendorHash = "sha256-W647ne516UVhQ3ctrr+LsAEwzxeVHBjshW1pG1Wb/gU=";
+  vendorHash = "sha256-4gzxKmnl8MOPcdzkwhReZ/cfbjfICY9kxousveoHYR0=";
 
   modRoot = ".";
   subPackages = [

From 72d9fc32fe1b4b7613b5505d647b82a5b8ba6014 Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Tue, 28 Oct 2025 01:20:12 +0100
Subject: [PATCH 3539/6226] workflows/team: Prefix PR branch with
 create-pull-request

Allows better scoping of branch creation restrictions
---
 .github/workflows/teams.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/teams.yml b/.github/workflows/teams.yml
index 67ffdf053a80..1cd54cd527e0 100644
--- a/.github/workflows/teams.yml
+++ b/.github/workflows/teams.yml
@@ -75,7 +75,7 @@ jobs:
           author: ${{ steps.user.outputs.git-string }}
           committer: ${{ steps.user.outputs.git-string }}
           commit-message: "maintainers/github-teams.json: Automated sync"
-          branch: github-team-sync
+          branch: pr/github-team-sync
           title: "maintainers/github-teams.json: Automated sync"
           body: |
             This is an automated PR to sync the GitHub teams with access to this repository to the `lib.teams` list.

From ecaa134b310603a5ce1c98b2afa5650e62772600 Mon Sep 17 00:00:00 2001
From: myypo <nikirsmcgl@gmail.com>
Date: Sat, 25 Oct 2025 09:22:39 +0300
Subject: [PATCH 3540/6226] postgres-lsp: 0.15.0 -> 0.16.1

---
 pkgs/by-name/po/postgres-lsp/package.nix | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/po/postgres-lsp/package.nix b/pkgs/by-name/po/postgres-lsp/package.nix
index 93ea5e8604b5..c505ec0a5f6f 100644
--- a/pkgs/by-name/po/postgres-lsp/package.nix
+++ b/pkgs/by-name/po/postgres-lsp/package.nix
@@ -3,22 +3,29 @@
   rustPlatform,
   fetchgit,
   rust-jemalloc-sys,
+  tree-sitter,
+  nodejs,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "postgres-lsp";
-  version = "0.15.0";
+  version = "0.16.1";
 
   src = fetchgit {
     url = "https://github.com/supabase-community/postgres-language-server";
     tag = finalAttrs.version;
-    hash = "sha256-ZintjrSeNsYR6A8tlEfSetse7d79jgLdCpdu+sMe3Zk=";
+    hash = "sha256-zdFgfZ9GtZObn839kkAIT71bBt7YHs28qkAWlp3k7kw=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-x/Wbx3noH6YOQIis1sN8ylQApjhSy4/mrxX6jvZFs6A=";
+  cargoHash = "sha256-psgo5/tDHaQd0dkiD/3uhrKuxlOBLi/xG4x3gVPLZbw=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
+
+    # Required to build the custom tree-sitter grammar
+    # https://github.com/supabase-community/postgres-language-server/blob/main/crates/pgt_treesitter_grammar/grammar.js
+    tree-sitter
+    nodejs
   ];
 
   buildInputs = [
@@ -44,12 +51,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   meta = {
     description = "Tools and language server for Postgres";
-    homepage = "https://pgtools.dev";
+    homepage = "https://pg-language-server.com";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       figsoda
       myypo
     ];
-    mainProgram = "postgrestools";
+    mainProgram = "postgres-language-server";
   };
 })

From f7716b24d0fead530002e719bde68a87e057a665 Mon Sep 17 00:00:00 2001
From: myypo <nikirsmcgl@gmail.com>
Date: Tue, 28 Oct 2025 16:43:20 +0200
Subject: [PATCH 3541/6226] postgres-lsp: rename to postgres-language-server

---
 .../po/{postgres-lsp => postgres-language-server}/package.nix   | 2 +-
 pkgs/top-level/aliases.nix                                      | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename pkgs/by-name/po/{postgres-lsp => postgres-language-server}/package.nix (97%)

diff --git a/pkgs/by-name/po/postgres-lsp/package.nix b/pkgs/by-name/po/postgres-language-server/package.nix
similarity index 97%
rename from pkgs/by-name/po/postgres-lsp/package.nix
rename to pkgs/by-name/po/postgres-language-server/package.nix
index c505ec0a5f6f..290bc26f02f7 100644
--- a/pkgs/by-name/po/postgres-lsp/package.nix
+++ b/pkgs/by-name/po/postgres-language-server/package.nix
@@ -7,7 +7,7 @@
   nodejs,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "postgres-lsp";
+  pname = "postgres-language-server";
   version = "0.16.1";
 
   src = fetchgit {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f40183e4d867..a2fe24a88240 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1214,6 +1214,7 @@ mapAliases {
   posterazor = throw "posterazor was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   postfixadmin = throw "'postfixadmin' has been removed due to lack of maintenance and missing support for PHP >8.1"; # Added 2025-10-03
   postgis = throw "'postgis' has been removed. Use 'postgresqlPackages.postgis' instead."; # Added 2025-07-19
+  postgres-lsp = lib.warnOnInstantiate "'postgres-lsp' has been renamed to 'postgres-language-server'" postgres-language-server; # Added 2025-10-28
   postgresql13JitPackages = throw "'postgresql13JitPackages' has been renamed to/replaced by 'postgresql13Packages'"; # Converted to throw 2025-10-27
   postgresql14JitPackages = throw "'postgresql14JitPackages' has been renamed to/replaced by 'postgresql14Packages'"; # Converted to throw 2025-10-27
   postgresql15JitPackages = throw "'postgresql15JitPackages' has been renamed to/replaced by 'postgresql15Packages'"; # Converted to throw 2025-10-27

From e1690a4f37a785427e043f387eb31006443ad905 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 15:35:36 +0000
Subject: [PATCH 3542/6226] versatiles: 1.1.0 -> 2.0.1

---
 pkgs/by-name/ve/versatiles/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ve/versatiles/package.nix b/pkgs/by-name/ve/versatiles/package.nix
index ae1a9420df2c..6d2449b0c5e5 100644
--- a/pkgs/by-name/ve/versatiles/package.nix
+++ b/pkgs/by-name/ve/versatiles/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "versatiles";
-  version = "1.1.0"; # When updating: Replace with current version
+  version = "2.0.1"; # When updating: Replace with current version
 
   src = fetchFromGitHub {
     owner = "versatiles-org";
     repo = "versatiles-rs";
     tag = "v${version}"; # When updating: Replace with long commit hash of new version
-    hash = "sha256-yGvU/2DUL9PboDhcjxxxXHeBlrUe7vvcxKKWv03bqeA="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
+    hash = "sha256-qFVqikq1T6LQnOWgM66uKzFhWQbVjEuUK3N5vNvaDq4="; # When updating: Use `lib.fakeHash` for recomputing the hash once. Run: 'nix-build -A versatiles'. Swap with new hash and proceed.
   };
 
-  cargoHash = "sha256-QD76WR3xnZBcfnQA0G9AOQa9aIdzWazDr3Ya+kL8iCE="; # When updating: Same as above
+  cargoHash = "sha256-kkYdQEBydxPwxxSjTiwk4huCDK3xJ9FoyrcHL88ytfk="; # When updating: Same as above
 
   __darwinAllowLocalNetworking = true;
 

From 1bf1e79f7dca5d9877f28aaa282ae9d3e0915910 Mon Sep 17 00:00:00 2001
From: "nixpkgs-ci[bot]" <190413589+nixpkgs-ci[bot]@users.noreply.github.com>
Date: Tue, 28 Oct 2025 15:39:25 +0000
Subject: [PATCH 3543/6226] maintainers/github-teams.json: Automated sync

---
 maintainers/github-teams.json | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json
index b08521a210c7..e764f0cb80fe 100644
--- a/maintainers/github-teams.json
+++ b/maintainers/github-teams.json
@@ -211,7 +211,6 @@
       "domenkozar": 126339,
       "donn": 12652988,
       "dwt": 57199,
-      "eliandoran": 21236836,
       "emilazy": 18535642,
       "ethancedwards8": 60861925,
       "fiddlerwoaroof": 808745,
@@ -502,7 +501,7 @@
     "name": "kodi"
   },
   "kubernetes": {
-    "description": "",
+    "description": "Maintain the Kubernetes package and module",
     "id": 5536808,
     "maintainers": {
       "johanot": 998763,
@@ -514,7 +513,7 @@
     "name": "kubernetes"
   },
   "linux-kernel": {
-    "description": "",
+    "description": "Maintain the Linux kernel",
     "id": 13371617,
     "maintainers": {
       "alyssais": 2768870
@@ -912,17 +911,6 @@
     },
     "name": "SDL"
   },
-  "security": {
-    "description": "Private reports: security@nixos.org",
-    "id": 2197543,
-    "maintainers": {
-      "LeSuisse": 737767,
-      "mweinelt": 131599,
-      "risicle": 807447
-    },
-    "members": {},
-    "name": "Security"
-  },
   "static": {
     "description": "People interested in static builds (creation of `.a` files, fully static executables, etc.) and keeping them working",
     "id": 5906550,

From a6018d1f56f3423d526c8230eaa337ec33d36ebc Mon Sep 17 00:00:00 2001
From: adam <me@adamperkowski.dev>
Date: Tue, 28 Oct 2025 16:09:45 +0100
Subject: [PATCH 3544/6226] julec: 0.1.6 -> 0.1.7

---
 .editorconfig                                  |  3 +++
 pkgs/by-name/ju/julec/hook.nix                 |  1 -
 pkgs/by-name/ju/julec/hook.sh                  |  2 +-
 pkgs/by-name/ju/julec/package.nix              | 14 +++++++++-----
 pkgs/by-name/ju/julec/test/hello-jule/jule.mod |  1 +
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index 6972df7013d6..6844b559c7b5 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -93,6 +93,9 @@ insert_final_newline = unset
 [*.jule]
 indent_style = tab
 
+[jule.mod]
+insert_final_newline = unset
+
 # Keep this hint at the bottom:
 # Please don't add entries for subfolders here.
 # Create <subfolder>/.editorconfig instead.
diff --git a/pkgs/by-name/ju/julec/hook.nix b/pkgs/by-name/ju/julec/hook.nix
index d6cccb165979..427812bfb87f 100644
--- a/pkgs/by-name/ju/julec/hook.nix
+++ b/pkgs/by-name/ju/julec/hook.nix
@@ -1,6 +1,5 @@
 {
   julec,
-  clang,
   makeSetupHook,
 }:
 
diff --git a/pkgs/by-name/ju/julec/hook.sh b/pkgs/by-name/ju/julec/hook.sh
index 112dc48d0c81..35d314a54922 100644
--- a/pkgs/by-name/ju/julec/hook.sh
+++ b/pkgs/by-name/ju/julec/hook.sh
@@ -28,7 +28,7 @@ julecBuildHook() {
 
   julecSetEnv
   mkdir -p "$JULE_OUT_DIR"
-  julec --opt L2 -p -o "$JULE_OUT_DIR/$JULE_OUT_NAME" "$JULE_SRC_DIR"
+  julec build --opt L2 -p -o "$JULE_OUT_DIR/$JULE_OUT_NAME" "$JULE_SRC_DIR"
 
   runHook postBuild
 
diff --git a/pkgs/by-name/ju/julec/package.nix b/pkgs/by-name/ju/julec/package.nix
index e22298483855..c1f76526eed5 100644
--- a/pkgs/by-name/ju/julec/package.nix
+++ b/pkgs/by-name/ju/julec/package.nix
@@ -22,23 +22,23 @@ let
 in
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "julec";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "julelang";
     repo = "jule";
     tag = "jule${finalAttrs.version}";
     name = "jule-${finalAttrs.version}";
-    hash = "sha256-y4v8FdQkB5Si3SYkchFG9fAU4ZhabAMcPkDcLEWW+6k=";
+    hash = "sha256-7py8QrNMX8LwpI7LCp5XgRFUzgltFP1rTbuzqw/1D8o=";
   };
 
   irSrc = fetchFromGitHub {
     owner = "julelang";
     repo = "julec-ir";
     # revision determined by the upstream commit hash in julec-ir/README.md
-    rev = "aebbd12c0f89f6a04f856f3e23d5ea39741c3e0f";
+    rev = "81ddbed06a715428a90d3645f7242fa4e522ea16";
     name = "jule-ir-${finalAttrs.version}";
-    hash = "sha256-7eDOYMmCEfW+0zZpESY1+ql3hWZZ/Q75lKT0nBQPktE=";
+    hash = "sha256-Az9RDrwRY2kuMgL/Lf/x6YctfySr96/imWZeOa+J/rM=";
   };
 
   dontConfigure = true;
@@ -76,7 +76,11 @@ clangStdenv.mkDerivation (finalAttrs: {
       -o "bin/${finalAttrs.meta.mainProgram}-bootstrap"
 
     echo "Building ${finalAttrs.meta.mainProgram} v${finalAttrs.version} for ${clangStdenv.hostPlatform.system}..."
-    bin/${finalAttrs.meta.mainProgram}-bootstrap --opt L2 -p -o "bin/${finalAttrs.meta.mainProgram}" "src/${finalAttrs.meta.mainProgram}"
+    bin/${finalAttrs.meta.mainProgram}-bootstrap build \
+      -p \
+      --opt L2 \
+      -o "bin/${finalAttrs.meta.mainProgram}" \
+      "src/${finalAttrs.meta.mainProgram}"
 
     runHook postBuild
   '';
diff --git a/pkgs/by-name/ju/julec/test/hello-jule/jule.mod b/pkgs/by-name/ju/julec/test/hello-jule/jule.mod
index e69de29bb2d1..08babbd90c37 100644
--- a/pkgs/by-name/ju/julec/test/hello-jule/jule.mod
+++ b/pkgs/by-name/ju/julec/test/hello-jule/jule.mod
@@ -0,0 +1 @@
+module helloJule
\ No newline at end of file

From 7c10ed4cafdbea7ef393affbf6bb8696201f89b5 Mon Sep 17 00:00:00 2001
From: r4v3n6101 <raven6107@gmail.com>
Date: Tue, 28 Oct 2025 18:53:48 +0300
Subject: [PATCH 3545/6226] gst_all_1.gst-plugins-rs: 0.14.1 -> 0.14.2

---
 .../libraries/gstreamer/rs/default.nix        | 39 ++-----------------
 .../libraries/gstreamer/rs/ignore-tests.patch | 20 ----------
 2 files changed, 4 insertions(+), 55 deletions(-)
 delete mode 100644 pkgs/development/libraries/gstreamer/rs/ignore-tests.patch

diff --git a/pkgs/development/libraries/gstreamer/rs/default.nix b/pkgs/development/libraries/gstreamer/rs/default.nix
index 258644febdbe..46ecec7c2901 100644
--- a/pkgs/development/libraries/gstreamer/rs/default.nix
+++ b/pkgs/development/libraries/gstreamer/rs/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  fetchpatch,
   rustPlatform,
   meson,
   ninja,
@@ -33,7 +32,6 @@
   # Checks meson.is_cross_build(), so even canExecute isn't enough.
   enableDocumentation ? stdenv.hostPlatform == stdenv.buildPlatform && plugins == null,
   hotdoc,
-  mopidy,
   apple-sdk_gstreamer,
 }:
 
@@ -137,7 +135,7 @@ assert lib.assertMsg (invalidPlugins == [ ])
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gst-plugins-rs";
-  version = "0.14.1";
+  version = "0.14.2";
 
   outputs = [
     "out"
@@ -149,44 +147,15 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "gstreamer";
     repo = "gst-plugins-rs";
     rev = finalAttrs.version;
-    hash = "sha256-gCT/ZcXR9VePXYtEENXxgBNvA84KT1OYUR8kSyLBzrI=";
-    # TODO: temporary workaround for case-insensitivity problems with color-name crate - https://github.com/annymosse/color-name/pull/2
-    postFetch = ''
-      sedSearch="$(cat <<\EOF | sed -ze 's/\n/\\n/g'
-      \[\[package\]\]
-      name = "color-name"
-      version = "\([^"\n]*\)"
-      source = "registry+https://github.com/rust-lang/crates.io-index"
-      checksum = "[^"\n]*"
-      EOF
-      )"
-      sedReplace="$(cat <<\EOF | sed -ze 's/\n/\\n/g'
-      [[package]]
-      name = "color-name"
-      version = "\1"
-      source = "git+https://github.com/lilyinstarlight/color-name#cac0ed5b7d2e0682c08c9bfd13089d5494e81b9a"
-      EOF
-      )"
-      sed -i -ze "s|$sedSearch|$sedReplace|g" $out/Cargo.lock
-    '';
+    hash = "sha256-mIq8Fo6KoxAo1cL2NQHnSMPgzUWl1eNJUujdaerGjFA=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
-    inherit (finalAttrs) src patches;
+    inherit (finalAttrs) src;
     name = "gst-plugins-rs-${finalAttrs.version}";
-    hash = "sha256-sX3P5qrG0M/vJkvzvJGzv4fcMn6FvrLPOUh++vKJ/gY=";
+    hash = "sha256-Z1mqpVL2SES1v0flykOwoDX2/apZHxg7eI5If4BsP4o=";
   };
 
-  patches = [
-    # Related to https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/issues/723
-    ./ignore-tests.patch
-    (fetchpatch {
-      name = "x264enc-test-fix.patch";
-      url = "https://gitlab.freedesktop.org/gstreamer/gst-plugins-rs/-/commit/c0c9888d66e107f9e0b6d96cd3a85961c7e97d9a.diff";
-      hash = "sha256-/ILdPDjI20k5l9Qf/klglSuhawmFUs9mR+VhBnQqsWw=";
-    })
-  ];
-
   strictDeps = true;
 
   nativeBuildInputs = [
diff --git a/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch b/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch
deleted file mode 100644
index 52b231816ce8..000000000000
--- a/pkgs/development/libraries/gstreamer/rs/ignore-tests.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/utils/uriplaylistbin/tests/uriplaylistbin.rs b/utils/uriplaylistbin/tests/uriplaylistbin.rs
-index 3489eaa8..569635d6 100644
---- a/utils/uriplaylistbin/tests/uriplaylistbin.rs
-+++ b/utils/uriplaylistbin/tests/uriplaylistbin.rs
-@@ -388,6 +388,7 @@ fn multi_audio() {
-     assert_eq!(current_uri_index, 2);
- }
- 
-+#[ignore = "Unknown failure"]
- #[test]
- fn multi_audio_video() {
-     let (_events, current_iteration, current_uri_index, eos) = test(
-@@ -403,6 +404,7 @@ fn multi_audio_video() {
-     assert_eq!(current_uri_index, 1);
- }
- 
-+#[ignore = "Unknown failure"]
- #[test]
- fn iterations() {
-     let (_events, current_iteration, current_uri_index, eos) = test(

From 1f02ac682fc770c8dd97825e19d91353ef3b699e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 16:06:40 +0000
Subject: [PATCH 3546/6226] melonDS: 1.0-unstable-2025-10-13 ->
 1.0-unstable-2025-10-27

---
 pkgs/by-name/me/melonDS/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix
index bde7555c6e54..fcfe24412e90 100644
--- a/pkgs/by-name/me/melonDS/package.nix
+++ b/pkgs/by-name/me/melonDS/package.nix
@@ -29,13 +29,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "melonDS";
-  version = "1.0-unstable-2025-10-13";
+  version = "1.0-unstable-2025-10-27";
 
   src = fetchFromGitHub {
     owner = "melonDS-emu";
     repo = "melonDS";
-    rev = "91ab68090c0aa588aabaeaa5e2c62564fd661ccc";
-    hash = "sha256-04Wr7xUwz6Q9JDiEfTQh6Vx5q71dFVI9rScIpt6ywGY=";
+    rev = "1588f0b69b024523b48ad0276d4792b8eafbcc40";
+    hash = "sha256-ytrgqLUrOFfac44KUTnxputPU7OjcpCpHKLNqBnXlOY=";
   };
 
   patches = [ ./fix-build-qt-6.10.patch ];

From 7a1b8b4c3b19e33a33faa320e575c793097f81b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 16:10:39 +0000
Subject: [PATCH 3547/6226] ipxe: 1.21.1-unstable-2025-10-20 ->
 1.21.1-unstable-2025-10-28

---
 pkgs/by-name/ip/ipxe/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix
index 3919d76f122c..e067b5764229 100644
--- a/pkgs/by-name/ip/ipxe/package.nix
+++ b/pkgs/by-name/ip/ipxe/package.nix
@@ -48,7 +48,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ipxe";
-  version = "1.21.1-unstable-2025-10-20";
+  version = "1.21.1-unstable-2025-10-28";
 
   nativeBuildInputs = [
     mtools
@@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ipxe";
     repo = "ipxe";
-    rev = "c8f088d4e11a1dedda4829c4be1bb1b14e9da016";
-    hash = "sha256-rNs9KIxK8Q6imv1h7qVE516JccYHNzLUWJrv6sKGRWo=";
+    rev = "0336e2987c3e671298af8c2817ec17aa67e98065";
+    hash = "sha256-janNModKaSeKuGd+zeJrJlowNAR97/hrUbj5TGlpV7I=";
   };
 
   # Calling syslinux on a FAT image isn't going to work on Aarch64.

From 79a09ac85bbd0beca2250118c2b5b7deb8011634 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 16:13:00 +0000
Subject: [PATCH 3548/6226] python3Packages.bpython: 0.25 -> 0.26

---
 pkgs/development/python-modules/bpython/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bpython/default.nix b/pkgs/development/python-modules/bpython/default.nix
index fc685f744b68..68798c64e1ed 100644
--- a/pkgs/development/python-modules/bpython/default.nix
+++ b/pkgs/development/python-modules/bpython/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "bpython";
-  version = "0.25";
+  version = "0.26";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bpython";
     repo = "bpython";
     tag = "${version}-release";
-    hash = "sha256-p5+IQiHNRRazqr+WRdx3Yw+ImG25tdZGLXvMf7woD9w=";
+    hash = "sha256-NmWM0fdzS9n5FSnNJOCdS1JE5ZHrmJXqCuHa54rT8GU=";
   };
 
   postPatch = ''

From 1fe4cfa99c1c0773a0517f05d2aff2b834cb9bab Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 28 Oct 2025 14:26:55 +0100
Subject: [PATCH 3549/6226] firefox: 144.0 -> 144.0.2

https://www.firefox.com/en-US/firefox/144.0.2/releasenotes/
https://www.mozilla.org/security/advisories/mfsa2025-86

Fixes: CVE-2025-12380
---
 .../networking/browsers/firefox/packages/firefox.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
index 0aa499a963d8..d3e07cd16f76 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix
@@ -9,10 +9,10 @@
 
 buildMozillaMach rec {
   pname = "firefox";
-  version = "144.0";
+  version = "144.0.2";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "e1f924ed006a31f5333ea6af219c1fb90d4866e5889ac634c324a3e80b042a7e0b2b9aeb798672ea1a434fbf817fc0b82a12ec0fb405a48e3a2ca21cc394445e";
+    sha512 = "87eebabab2c85eb32b2d1161e520f56e271a4893c8cd4d8225fc7b498a9883496315854a758478fb4edd061674a9f7c0503e9b9f0eb4503b1f89203774d02f97";
   };
 
   meta = {

From c8fbdef0ded40c52d98771280b3f63d7b84f60c3 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 28 Oct 2025 14:52:11 +0100
Subject: [PATCH 3550/6226] firefox-bin-unwrapped: 144.0 -> 144.0.2

https://www.firefox.com/en-US/firefox/144.0.2/releasenotes/
https://www.mozilla.org/security/advisories/mfsa2025-86

Fixes: CVE-2025-12380
---
 .../browsers/firefox-bin/release_sources.nix  | 1650 ++++++++---------
 1 file changed, 825 insertions(+), 825 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
index 1ff0a0b50920..ce4c0c84701f 100644
--- a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
+++ b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
@@ -1,2477 +1,2477 @@
 {
-  version = "144.0";
+  version = "144.0.2";
   sources = [
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ach/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ach/firefox-144.0.2.tar.xz";
       locale = "ach";
       arch = "linux-x86_64";
-      sha256 = "be55ffa2ee01d8facb5c06298a8509b637558af419e62d3512ccafae2dfdacd5";
+      sha256 = "7e45794db35ddf1413c56e095d0d49a41c4edf458c3173f15525aa6d93ffa220";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/af/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/af/firefox-144.0.2.tar.xz";
       locale = "af";
       arch = "linux-x86_64";
-      sha256 = "9d0f64458d6620894a40a5129688fea3a7acd0f9ec609b7de03deea6f01ec507";
+      sha256 = "550f1996154e0f56c674f83c384b312f99aea4a517be1c0741a1afa6e4089b42";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/an/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/an/firefox-144.0.2.tar.xz";
       locale = "an";
       arch = "linux-x86_64";
-      sha256 = "e2c15a01d6a4a7f24d2c4c7ff084ab3063de9865fd23767c85fb23a0e5e84f7d";
+      sha256 = "ea0199428b3ee2ca105d58741746b434dfbc1930b58e52c4106d193677f2d536";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ar/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ar/firefox-144.0.2.tar.xz";
       locale = "ar";
       arch = "linux-x86_64";
-      sha256 = "4f9f8d1e1f44b6db46bb7b82cda80f236b60fae1c907b666fd43d4f526423ec5";
+      sha256 = "cd666dea75d9cfa9feb2d477e69435703347552ca943dd143d6e4957fb1becb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ast/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ast/firefox-144.0.2.tar.xz";
       locale = "ast";
       arch = "linux-x86_64";
-      sha256 = "3691a010fb0976f8cd033f4a928fc188cd0ff2b41645d687a6dee8c473042068";
+      sha256 = "dc055903b566aef91ddd6908b93d46231795f7604ae74bc89b17083ef91c72e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/az/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/az/firefox-144.0.2.tar.xz";
       locale = "az";
       arch = "linux-x86_64";
-      sha256 = "269a4a41b3fa28e371ec9954a2e6f2bd3e667d22fc921fcc9e238f0e7805dfe9";
+      sha256 = "4fa4ed8d2bb0734ab3d562d0784a4c8e1d049b381361598bbc8cb50bfb4c36bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/be/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/be/firefox-144.0.2.tar.xz";
       locale = "be";
       arch = "linux-x86_64";
-      sha256 = "7675eb7951d133b9c4a92670658999f18f7a0e66b8d7810f37eeeb8650511bed";
+      sha256 = "b56cb8e5d82ec4ded34448177044e3244ee8fa1c3b29f5671a263e56aae95223";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/bg/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/bg/firefox-144.0.2.tar.xz";
       locale = "bg";
       arch = "linux-x86_64";
-      sha256 = "9d7201beacc0d804d0fad6e6b4790b52e75f1ac2ea1d31a966e9c4d203323fb6";
+      sha256 = "8e94d5ebb9ad9e29abd2ee1ec263225fdc72b51beccc61686431ea7a570093c5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/bn/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/bn/firefox-144.0.2.tar.xz";
       locale = "bn";
       arch = "linux-x86_64";
-      sha256 = "39bf88cf6ec78bfb552259d2292ddf47c455ff3992e16beda0d4ebce976a587b";
+      sha256 = "94aad140d24f47b16272ddf780d68e214dd95ed865e4bdf16808e07773a4a728";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/br/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/br/firefox-144.0.2.tar.xz";
       locale = "br";
       arch = "linux-x86_64";
-      sha256 = "1962638b0523fa5250d1c1eeb381b142fadb5494e56cb69035342cc0cfdfe655";
+      sha256 = "1a95629d4603e2fe2486cce81d6be7df8de8e451cc95a3333e795d4ef4853378";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/bs/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/bs/firefox-144.0.2.tar.xz";
       locale = "bs";
       arch = "linux-x86_64";
-      sha256 = "0bdb284b63005e93b3a962d6bf92fdd56c7dc5dddb625d14dce9aae0428ac00f";
+      sha256 = "8c1882f2fddc4dd6cdd9ed51e0b594cd7fb6a87196e70b28c1be1e253e43a62a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ca-valencia/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ca-valencia/firefox-144.0.2.tar.xz";
       locale = "ca-valencia";
       arch = "linux-x86_64";
-      sha256 = "bbb6a772df7e18798741a8f23c0f9a73f4e40a6c791e30bd07632dd9c36219ee";
+      sha256 = "a26c623ce88560f6e5d2375fa06550369d8234c3f4d02bf9e266759d279068fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ca/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ca/firefox-144.0.2.tar.xz";
       locale = "ca";
       arch = "linux-x86_64";
-      sha256 = "6b61816b7737f6568ec067875c80a6c24292d7651e69b131b0645da099eb0bf6";
+      sha256 = "636edf0457323271f043ad473d05613f9ad5bb759ecf888ffff1cae5a0522fdc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/cak/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/cak/firefox-144.0.2.tar.xz";
       locale = "cak";
       arch = "linux-x86_64";
-      sha256 = "f8bde5a2c4cc3ca1c38352fcc138bc9bc4a537190cbb807a391cbb3d90b708c0";
+      sha256 = "59367101a287b02b802610b932456258cabe6553e61054d8549ea0265b4d029a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/cs/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/cs/firefox-144.0.2.tar.xz";
       locale = "cs";
       arch = "linux-x86_64";
-      sha256 = "14f0bf903d30587102898e5098ea7a8b3bfa1d94ac5f645862dc37258fd50041";
+      sha256 = "4ffa115b5fc7b6f15398d11377f92857023b0b8fa09c06ff3795cf164f3e8c34";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/cy/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/cy/firefox-144.0.2.tar.xz";
       locale = "cy";
       arch = "linux-x86_64";
-      sha256 = "22d5c7adfee4b01e1a460364b09dfcdaee2e2fb24a8d87c25774aa585e3ebd49";
+      sha256 = "27387bc01562958a6eb2e38ead13aa3a1d252b5e3c1c7c67a707170c26c09096";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/da/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/da/firefox-144.0.2.tar.xz";
       locale = "da";
       arch = "linux-x86_64";
-      sha256 = "382249f9252a9bed2ccab9a5e77da9353c827b3b2cd568838b1460ef1e743d3e";
+      sha256 = "6a1c63862d99822655804ee9a0879d0c8aabf735ed4a1ebe70662325c1cbec6b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/de/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/de/firefox-144.0.2.tar.xz";
       locale = "de";
       arch = "linux-x86_64";
-      sha256 = "77da66e91a5e7247dcbd35f4e45034aa5ea5b08ede1652edbc2e9fe99ee7ce6b";
+      sha256 = "ba9c3a60300e3f29f36338ceb786ebb7d2ee1770bc42c2a5232f7e4565c38f00";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/dsb/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/dsb/firefox-144.0.2.tar.xz";
       locale = "dsb";
       arch = "linux-x86_64";
-      sha256 = "b46f781e1912e0cc686abaa6765a73c406ef4a4092fae821266f26a7614f60b1";
+      sha256 = "e4e5bf0a216ec5ce0783314010497ecd7c9dd5aa633ae6dfdf4ebc6b33fee327";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/el/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/el/firefox-144.0.2.tar.xz";
       locale = "el";
       arch = "linux-x86_64";
-      sha256 = "d9d8a306dc1b2ab4f1345a4409f83ccf14fe57b7b115f7672833325aa09d1bff";
+      sha256 = "e7f876dda346ee86eecd119035d175f8c0f08c3218b0e74cd525e02efcb41d85";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/en-CA/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/en-CA/firefox-144.0.2.tar.xz";
       locale = "en-CA";
       arch = "linux-x86_64";
-      sha256 = "b9b5a7222913e72e754d6adf67f9dcdda7e54011c10c33c3909aae5d02269b5e";
+      sha256 = "1d342ffd6b2fa8ba7dcd5f44b530cc6bf8b844c56f1a40eae8f04dc15464b9c0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/en-GB/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/en-GB/firefox-144.0.2.tar.xz";
       locale = "en-GB";
       arch = "linux-x86_64";
-      sha256 = "078ab7c094bd6829949cfb4cc3a7b26744383daf41a0212df064bca28cb9ff42";
+      sha256 = "f9045b1748fec6f315a1fb915a6a396ad39720980beeed9f3042b9204a7393bc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/en-US/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/en-US/firefox-144.0.2.tar.xz";
       locale = "en-US";
       arch = "linux-x86_64";
-      sha256 = "c66a48222ff67d51560240d321895c6926c9b3af345cbf688ced8517781d88d1";
+      sha256 = "19cada8e7b6f4f00c450411578b4c241d2d50a0a566a1cbe8181fa950b6c0ad4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/eo/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/eo/firefox-144.0.2.tar.xz";
       locale = "eo";
       arch = "linux-x86_64";
-      sha256 = "28b6afa9848d4950f9652f07fec046e48c49e303be950926b5a9ebeef7a3f21c";
+      sha256 = "77e8fef411b7f6d62d17c6767ef2a24fb29bec7d7dea8cb6961441f96be9e7d1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/es-AR/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/es-AR/firefox-144.0.2.tar.xz";
       locale = "es-AR";
       arch = "linux-x86_64";
-      sha256 = "9080e57c1cdc44f390d332f5a96fc925d253cb12acce2f88ff8dcd565d2be705";
+      sha256 = "d34a7501644715db101c91da6a82ce2a44f33acf6b26cf425fc4939cd0471f9b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/es-CL/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/es-CL/firefox-144.0.2.tar.xz";
       locale = "es-CL";
       arch = "linux-x86_64";
-      sha256 = "cb385809d728a027ea040a336badd6be2e7dc5ebba81ea21f824cb51f33c853f";
+      sha256 = "e022d3542480bc182c610164974b1f5f7e0a2e65d49fc12e7fab2081ecf89c6e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/es-ES/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/es-ES/firefox-144.0.2.tar.xz";
       locale = "es-ES";
       arch = "linux-x86_64";
-      sha256 = "a8be90aab2980be453fff05a6a2f4ed96feb5e204f59435794c44bdec16856ee";
+      sha256 = "4dc4c0126139e6ea1a0b3106e8d48e588c6686af553939897eed7456ce02ff79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/es-MX/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/es-MX/firefox-144.0.2.tar.xz";
       locale = "es-MX";
       arch = "linux-x86_64";
-      sha256 = "f4d7e7cf40726fe8254e4ecd2115fafee017e0f12a68d43b1e221b7d52d50252";
+      sha256 = "5df3a223ccc615d199d675888df57062245c9da4838f17f0fa5c33a5068a7eb4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/et/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/et/firefox-144.0.2.tar.xz";
       locale = "et";
       arch = "linux-x86_64";
-      sha256 = "f667da54acaab66b245d24f294e0d71cf7655b11fe16f330dfece746d4ff2ed9";
+      sha256 = "6cfdb806d7b9f2340d70f03f9aeecd0ca0bf7d80ff0ab3cda49daf163d0f887e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/eu/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/eu/firefox-144.0.2.tar.xz";
       locale = "eu";
       arch = "linux-x86_64";
-      sha256 = "28fb4a5dd0079213fe821bf5dfea60dbcb4111a890c5243de987735aed10fc8c";
+      sha256 = "a40c96c721d6df8cc0eb64d0b416ef0f671ba764a3f3b722e19f943ebd4acf81";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/fa/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/fa/firefox-144.0.2.tar.xz";
       locale = "fa";
       arch = "linux-x86_64";
-      sha256 = "63110ed4374666edaf20034019c767fb6d5e0c1c1b363138e5aa9d5f4ae467d8";
+      sha256 = "131e402bacecc004a6a1315c7f04979b0dd1cc9e9f42f0daa0ef69d0341a3d56";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ff/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ff/firefox-144.0.2.tar.xz";
       locale = "ff";
       arch = "linux-x86_64";
-      sha256 = "dff605e5b4ba7a26930eb1ee2fc7c7cf60034589b08a0412bcafb7a9a541daaa";
+      sha256 = "73ba6eeea0b27cfe195bfa6dc1d8240385b71900c5615494ecb3f2ad975a5fd4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/fi/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/fi/firefox-144.0.2.tar.xz";
       locale = "fi";
       arch = "linux-x86_64";
-      sha256 = "46081d738543c68f4db60b9ad960f0989e24006b78caeeec1adaa49870d03027";
+      sha256 = "c04e53e58435bfd68aba287c554c552f75e43d7477c1715427161135e8177b33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/fr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/fr/firefox-144.0.2.tar.xz";
       locale = "fr";
       arch = "linux-x86_64";
-      sha256 = "68b095185faaabd71061b64fd65d09641fabe3df32da47ee25f6593792adde84";
+      sha256 = "db6a56735af0fe0a63b86fcbb83dd4e1b6db9381f74327105cd0f3c0e76eb2a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/fur/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/fur/firefox-144.0.2.tar.xz";
       locale = "fur";
       arch = "linux-x86_64";
-      sha256 = "efd71bc4d8c3840ac3721d0f2f76df1ea3bacfb823cf5d3a63fb6857b51a309b";
+      sha256 = "b432475a2672f18b0ba8f5c603118f0ed4f2c66c98f811219e6bf7f4fa7bf78d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/fy-NL/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/fy-NL/firefox-144.0.2.tar.xz";
       locale = "fy-NL";
       arch = "linux-x86_64";
-      sha256 = "705627dfe8a06e0ef42ab61d4b34e1747e924e7028aa4261ad90d3fafa6f1b48";
+      sha256 = "bfc2faf0abe3ed44defea419823b08d972363a46db2802a38f609a7e19427596";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ga-IE/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ga-IE/firefox-144.0.2.tar.xz";
       locale = "ga-IE";
       arch = "linux-x86_64";
-      sha256 = "9dd4de9d0a2cc21ea4af728583609fd11ac5d4e7ca6a9b9dcd82831fa51f56eb";
+      sha256 = "ec5d53eb8adbdc9956d5f70bb4e5592bfc89dece55f1f0a1ce88aaf0649a0fa7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/gd/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/gd/firefox-144.0.2.tar.xz";
       locale = "gd";
       arch = "linux-x86_64";
-      sha256 = "9ed22b88b9f1099805b2936cbef5f73961e117753844c8d91ed4fa11acba0f70";
+      sha256 = "7c300672d9adeacdc56c39c0a153fe4eaa181b41d32ef724affa021dd42b2a55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/gl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/gl/firefox-144.0.2.tar.xz";
       locale = "gl";
       arch = "linux-x86_64";
-      sha256 = "b7489a9fbe0b96dc8ffbe5368dadb0a68c14d2fad2f070c41fdcbdda61014ca8";
+      sha256 = "c67d19f9cabe8b99e45bf40c5def74b8a8ad7bd35ac37d4c3bd2c2bebc30b906";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/gn/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/gn/firefox-144.0.2.tar.xz";
       locale = "gn";
       arch = "linux-x86_64";
-      sha256 = "98d4d62ac3d879cc550baf7d2418953d43fa66dd5709c8e94cbf402e9e51076d";
+      sha256 = "3b4eb76cf6aae9457c9607965fbab83978e452e1423886e74f5ba37a23a8553b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/gu-IN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/gu-IN/firefox-144.0.2.tar.xz";
       locale = "gu-IN";
       arch = "linux-x86_64";
-      sha256 = "fe7ff566f458a2facd83e4cf89937ad8a07f1f05e3b24da2bedb7aa0fa20b1d2";
+      sha256 = "5aaf7873735a9680404246583ccaec89a6bb10203a6348b9a45d85addf7bb426";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/he/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/he/firefox-144.0.2.tar.xz";
       locale = "he";
       arch = "linux-x86_64";
-      sha256 = "9f214ce4854b4e2bfc3e3dc677a5ce260a3a28b6f35da0a84f6b3e1f97ffc86d";
+      sha256 = "0ea295cdab9db2c5cdd1b4130eeca030674702d7beb8337a77793e637e9e6730";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/hi-IN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/hi-IN/firefox-144.0.2.tar.xz";
       locale = "hi-IN";
       arch = "linux-x86_64";
-      sha256 = "f0e4f1e738df3945047a988f4e58fdd18e5bcc0a312d9aa39c2e0cc70a8f12f7";
+      sha256 = "de17f4171bb06a809c88e847180fec1f9623faeb08d3446726c535a10cbf21c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/hr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/hr/firefox-144.0.2.tar.xz";
       locale = "hr";
       arch = "linux-x86_64";
-      sha256 = "0a1eb62bc52711f13b86c09a6d03a9b27fab1a6230a921b141a64134d25c52c4";
+      sha256 = "dcb72bcceecd709e7d108ae7add24d7b6778d51d5b2c6fcb6626c9be1db71122";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/hsb/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/hsb/firefox-144.0.2.tar.xz";
       locale = "hsb";
       arch = "linux-x86_64";
-      sha256 = "499361c7665affecf9ab5f15708e6c7e14e7f8bec19d3f4b604e5953fca67ad7";
+      sha256 = "626720c530f780f76a4b85bfcda0efc95111ddddecfe9a6c9b51e9069f303f86";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/hu/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/hu/firefox-144.0.2.tar.xz";
       locale = "hu";
       arch = "linux-x86_64";
-      sha256 = "921000c92a187c897c433244b1c1f7896c529007374d26aaa18b8b653fcabc6c";
+      sha256 = "3421a30ffa161a1b53226c71b840261c929740faa9afefc10257615ddce82856";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/hy-AM/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/hy-AM/firefox-144.0.2.tar.xz";
       locale = "hy-AM";
       arch = "linux-x86_64";
-      sha256 = "1cbaae8f2e2838aa39dedd1fa4b9be1ebe571139c7870ebd131263b54f4935b7";
+      sha256 = "b91cf0cecde24b0df85e08fd4a16da8807a0b17b22617b58e694f44c5ceb5e99";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ia/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ia/firefox-144.0.2.tar.xz";
       locale = "ia";
       arch = "linux-x86_64";
-      sha256 = "67f88d2dbd6691e11bdabef43253386a0bc9d744146c9bc65f34c19fdfa32371";
+      sha256 = "be3692e5e768314323b5fb91d1580b4393518cca11fa0ab3ce955cae846bc216";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/id/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/id/firefox-144.0.2.tar.xz";
       locale = "id";
       arch = "linux-x86_64";
-      sha256 = "32728ddd685a352880518cbc3b34e3f693336a89e205882d971d6f210acd9fdf";
+      sha256 = "f3f0777d5dc18accbe01b0482655d99fbacdb06dfc950efc9e270b8aa965455a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/is/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/is/firefox-144.0.2.tar.xz";
       locale = "is";
       arch = "linux-x86_64";
-      sha256 = "8853c2a4bda3b86c9aa703c4db6a3986b028a87807b67b9eb8e49690df9b54dc";
+      sha256 = "a7ce692c905ae4f21851ee87cf47629d6f5dac9815570fb2ad66b663bde614fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/it/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/it/firefox-144.0.2.tar.xz";
       locale = "it";
       arch = "linux-x86_64";
-      sha256 = "ead0547000403fca1cd952c5e93d1270567149b1aa6ab09a37d0af8c57430609";
+      sha256 = "5af46b899c60155352918163234e2b9f7c350d33f0286e1f66d4875b8fc1034e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ja/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ja/firefox-144.0.2.tar.xz";
       locale = "ja";
       arch = "linux-x86_64";
-      sha256 = "e3cedd5d28e9e6492ad9787254e9f43d0609088d44fdd6f7a85d0c35f5629e30";
+      sha256 = "08a924da54992e394f2593cca82ae2fff78f0ee8bc7924331b4405534f155078";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ka/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ka/firefox-144.0.2.tar.xz";
       locale = "ka";
       arch = "linux-x86_64";
-      sha256 = "c6924bb295a86c42d0bd423018a80ab48c475bac112746b64de57214887fa05b";
+      sha256 = "319f77233c56ac7759c136b12b074e8203d4ce62a64348cb57b8655959b3f874";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/kab/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/kab/firefox-144.0.2.tar.xz";
       locale = "kab";
       arch = "linux-x86_64";
-      sha256 = "b2187c0915d0551ed4870a5d3696061a4f42e2051d4ae6ac97ce0dfe77b27702";
+      sha256 = "2fbab95d7d83b506ed62a157f8260db7177fb1e19906a6b44b36d4a35420fae0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/kk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/kk/firefox-144.0.2.tar.xz";
       locale = "kk";
       arch = "linux-x86_64";
-      sha256 = "155916174558b7e122ff6d0b0380000d7595a73f64c77bf8ed9ae4354573af64";
+      sha256 = "af9049f19742948d707f0f3b82587307bda66f051b03370d78afa3aceeda131b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/km/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/km/firefox-144.0.2.tar.xz";
       locale = "km";
       arch = "linux-x86_64";
-      sha256 = "edf1395cd31e8bfa3ffb96193f20f2691d3dc87cccb74bfb6d2f1e164234067e";
+      sha256 = "2e424fffca692783a50ba570edb30c9e26bd8917427145e741799d9eeedf0a42";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/kn/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/kn/firefox-144.0.2.tar.xz";
       locale = "kn";
       arch = "linux-x86_64";
-      sha256 = "925e184ae4c6406d4159afe3ec0e66b7ea79423162a83bd490c70d0be72a0ae8";
+      sha256 = "3636c150313f13a04a4fe5032385fa98afb6aa7704edabd8acc6882082bb0bdb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ko/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ko/firefox-144.0.2.tar.xz";
       locale = "ko";
       arch = "linux-x86_64";
-      sha256 = "f1c3d043c6ccabaa89329e3946430446166f1ebe6879cec4ce3e28e234aef1e0";
+      sha256 = "dcda0089ecc7f122f295b4935fff81529c80109610eac2badbbac11e4bbc5317";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/lij/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/lij/firefox-144.0.2.tar.xz";
       locale = "lij";
       arch = "linux-x86_64";
-      sha256 = "39314fa98ea8063c7cee7f93aa0534d0e1e6b9e6a67b5893c05d6f7f32d9230e";
+      sha256 = "6c4db883c3deaffa774c0993d6db3dded3366f01c9f0124ee0837b7104ae19ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/lt/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/lt/firefox-144.0.2.tar.xz";
       locale = "lt";
       arch = "linux-x86_64";
-      sha256 = "30b0a7b031d73546a2f735d6fc26abeaae89cd0d4f6de7f7b64cff4358454f9d";
+      sha256 = "9d2b558ab824ab2dea88b11acba5990f2e8a0fcae2daab27728d8f9555145404";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/lv/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/lv/firefox-144.0.2.tar.xz";
       locale = "lv";
       arch = "linux-x86_64";
-      sha256 = "d7e6fbea3f4b3a152aec7e0a8f3796a3f61afccb599d8bbb04c71b22a7d484ee";
+      sha256 = "1e77f42c42200645c2a4e4f4ac21945caaa922e8f52b51f598392dfdf45a02f4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/mk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/mk/firefox-144.0.2.tar.xz";
       locale = "mk";
       arch = "linux-x86_64";
-      sha256 = "5f4d7fc88ab4e2d5c55ae65231535c2cbf6bec831071278e97f29dbb7d57acf9";
+      sha256 = "3ec9a4456c39c0476a586c1f6c1ad9ec3a8a44f53e872f9497ab5908228eafed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/mr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/mr/firefox-144.0.2.tar.xz";
       locale = "mr";
       arch = "linux-x86_64";
-      sha256 = "003a9e0aeaf7de5a1d053c75e6d81bd4f082cb399037ec0a127a5333c1c70327";
+      sha256 = "a02e1653a141f5d47ba366d067cf982e6a6e775d3df426625fb79ef9f74cbf40";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ms/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ms/firefox-144.0.2.tar.xz";
       locale = "ms";
       arch = "linux-x86_64";
-      sha256 = "f9999a7503047a6b6de2f06fd6fd88d3f2c02fde643406018bdd80da5b1f8d5f";
+      sha256 = "7414325720e6bf0ea71ce8287f003d21ef8d727130fea95e33427e5248c9c113";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/my/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/my/firefox-144.0.2.tar.xz";
       locale = "my";
       arch = "linux-x86_64";
-      sha256 = "b3f8cce1ab39a2d38bd82c5b4969fb4324697057545acdacdfc15aa11b379051";
+      sha256 = "6567e01178377dcd4b99d8436ed91d3a3b981ec807f6e837eb8f3492f1bb2912";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/nb-NO/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/nb-NO/firefox-144.0.2.tar.xz";
       locale = "nb-NO";
       arch = "linux-x86_64";
-      sha256 = "29273a950b53df2f68f09ebb64c99f827e82de93b9f30fe9e9cffc0deb9e721c";
+      sha256 = "a808557c7c43dadbd8b47544d6d2fdc6cafe00f6cdceab81e1b3389d779ab07b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ne-NP/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ne-NP/firefox-144.0.2.tar.xz";
       locale = "ne-NP";
       arch = "linux-x86_64";
-      sha256 = "77bbbcaabd8173f656d00cecf52369dfd1c5a0c6e8531ef7966bf24bf1cc816a";
+      sha256 = "b462561412d9a976b5c97ec6f68cae7a2cd5a4489ed542288cb6525c109c1833";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/nl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/nl/firefox-144.0.2.tar.xz";
       locale = "nl";
       arch = "linux-x86_64";
-      sha256 = "7c2855d50e7851a9919b3ad4f2a18ace6a656083deb8fd190582fa8e294e73cd";
+      sha256 = "40e56ae3e7ab86b392c902cda465f8de50ae26f4060c2517faa6c715690037d2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/nn-NO/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/nn-NO/firefox-144.0.2.tar.xz";
       locale = "nn-NO";
       arch = "linux-x86_64";
-      sha256 = "60e73e8192cc0f615e8b701559d25bcfd3b359c276bbcc9f8827921155f916de";
+      sha256 = "2ce7c2375cfc076cf9434c671eb6d7e9231f6e2100c395ecc7ab0169e249cb84";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/oc/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/oc/firefox-144.0.2.tar.xz";
       locale = "oc";
       arch = "linux-x86_64";
-      sha256 = "7ceecbd1b31c204bf3d7be2d17f4ad7591b31aa792815c3d614417e7278fc491";
+      sha256 = "2031a489accc3b3e0fe173d55bbb0894b30e566143357d2fbf5a5796f8d62e55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/pa-IN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/pa-IN/firefox-144.0.2.tar.xz";
       locale = "pa-IN";
       arch = "linux-x86_64";
-      sha256 = "c9285d410de6da406f12c3ec4fc9a813fde6f148508c9e49d6c5b6082378c268";
+      sha256 = "893bc03dfc5c0373051b3730c986cf3a6445a5bdb63ea821e9c69120eaa336aa";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/pl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/pl/firefox-144.0.2.tar.xz";
       locale = "pl";
       arch = "linux-x86_64";
-      sha256 = "3ea776a9173e438aab5711290389f43412a754fddef9fd43941b3603664b8bbd";
+      sha256 = "6610c954f80923fc5880c6501ecb5753612d2cf65f7ddf6bbc99aa8fa4006a4b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/pt-BR/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/pt-BR/firefox-144.0.2.tar.xz";
       locale = "pt-BR";
       arch = "linux-x86_64";
-      sha256 = "876f23fa5d649e3a9ff55570cf77549c9031e49da42a26bfbd4267bac9ad99a5";
+      sha256 = "e8a65ec70a395527e47e4c758140bffac7ead085503c41685fd69f4c3e0e01b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/pt-PT/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/pt-PT/firefox-144.0.2.tar.xz";
       locale = "pt-PT";
       arch = "linux-x86_64";
-      sha256 = "eb4a39968d70d0a97732b1563854f97a8bc896f64dfab3999177d3498fed2cbd";
+      sha256 = "4752f5cd1b731b541f9756ee4b13f519aec6f7246212c4ad612563b3c6b6bf16";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/rm/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/rm/firefox-144.0.2.tar.xz";
       locale = "rm";
       arch = "linux-x86_64";
-      sha256 = "a7538f119ea6a7f11b8e3ba8ea9a4afa6016f0155858984e039af1625ff7e7dd";
+      sha256 = "84d896edd16b19802e1215cf1504d4d83734cd68f545a3bbd261d9b1d0705a41";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ro/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ro/firefox-144.0.2.tar.xz";
       locale = "ro";
       arch = "linux-x86_64";
-      sha256 = "c368b70a2ca5ca40bcb1cdb3cf53b4ec677a702d330ec12719db2d968d91f371";
+      sha256 = "80f072a8b791fc4a2341ebeb0c93235e384cbbf8dad17d0420297eaa1dc5bd45";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ru/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ru/firefox-144.0.2.tar.xz";
       locale = "ru";
       arch = "linux-x86_64";
-      sha256 = "8ca463714672186ee5de9723209a111c20a00fde428a686179c296986cdbfbf6";
+      sha256 = "cc51ac11860edda1ec99aace92df84b6e5560afeb0bf8048d2091f2c5635011d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/sat/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/sat/firefox-144.0.2.tar.xz";
       locale = "sat";
       arch = "linux-x86_64";
-      sha256 = "dd57205808104242491060041ddca045e0226e67cbb3f94a8fd34e108bb0177f";
+      sha256 = "c4d47f92537e48b03cdc530b20400d29c831f7f2da5720a5f7ef7126c1f83e7c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/sc/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/sc/firefox-144.0.2.tar.xz";
       locale = "sc";
       arch = "linux-x86_64";
-      sha256 = "65149571f5a37f4c99d61ff74a40c4c23b82ac7e0d9b41557ecaf6bd3aaddac8";
+      sha256 = "7a01d54992be2184b5d3fb94e70666d2482258eb38a600889a504a1ed90467ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/sco/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/sco/firefox-144.0.2.tar.xz";
       locale = "sco";
       arch = "linux-x86_64";
-      sha256 = "9a4b067092fd3373fbdb47bc787b613c4cec9a0198af32348b8e8be79d901043";
+      sha256 = "247d8489f7214326d20aa94aa9b762fea29022662d73f1f878d8f0a1ee828226";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/si/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/si/firefox-144.0.2.tar.xz";
       locale = "si";
       arch = "linux-x86_64";
-      sha256 = "a379ab8b6157ef55bdea77a6e20e09dd6ef3387898102b9a3dad0a0715cec286";
+      sha256 = "4d4e4ed53d9115db40359eca310835eaf52f1965f3c240f29fd6493f7a3f5854";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/sk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/sk/firefox-144.0.2.tar.xz";
       locale = "sk";
       arch = "linux-x86_64";
-      sha256 = "2aa0159f9479cdf873839672f79ca087f267b7cd26d37d055be0931a7223aea2";
+      sha256 = "c2d9371e56ccbbcc1e6bd5b19d2beaa1c2c29373a158accbbb273b713a09a985";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/skr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/skr/firefox-144.0.2.tar.xz";
       locale = "skr";
       arch = "linux-x86_64";
-      sha256 = "15a6ef4c520d39fe1ab1356525f677298825b80fe15e0b6e4a0b615ff4acd291";
+      sha256 = "95d178307507d0b64e7a6aa3a69a7237489abdc55da934453d7b1dad4102922d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/sl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/sl/firefox-144.0.2.tar.xz";
       locale = "sl";
       arch = "linux-x86_64";
-      sha256 = "3e5a7acdacd9198911f6335df3e54550db52130dcc85ab97ce6be1d76e18d0af";
+      sha256 = "2b8804ce516065930145bf3c90a6b6fe1e780bc5e89b386bc7ea044aeb6f1ef4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/son/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/son/firefox-144.0.2.tar.xz";
       locale = "son";
       arch = "linux-x86_64";
-      sha256 = "c7086156bb168f5e91cf499ab0525195d311b317a76266d6024be18f3c9ebbf5";
+      sha256 = "751edd86d6f5202947d89950322cd0cc19b256ed38847f0da6687cb3f4105a69";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/sq/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/sq/firefox-144.0.2.tar.xz";
       locale = "sq";
       arch = "linux-x86_64";
-      sha256 = "f72554ea9cb28b75f74a5b86e48f3d2f7307b1598e8e3e594a45638d95c66c45";
+      sha256 = "ea96f34dbc754b77fe49cd6672c129efac397979e8f010178bf7b146ba9ab9fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/sr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/sr/firefox-144.0.2.tar.xz";
       locale = "sr";
       arch = "linux-x86_64";
-      sha256 = "d28a8599d3a8c34b02a79a2dc70df49aebec0fd9a3fd0731fab05f0d7335edc8";
+      sha256 = "d3500b8094c20f3473f5f579a6a3816c6ef9e02a8b1b9e45071d3d883a1c9f86";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/sv-SE/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/sv-SE/firefox-144.0.2.tar.xz";
       locale = "sv-SE";
       arch = "linux-x86_64";
-      sha256 = "f42e5a86ddd9ae45537fcf025cad9c55fece462c976e2e9596ac2e21a66893ed";
+      sha256 = "29ef15a65eec545488c89c52e5bc0f049455fef00f2b5ad40021f63f5ce8f07f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/szl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/szl/firefox-144.0.2.tar.xz";
       locale = "szl";
       arch = "linux-x86_64";
-      sha256 = "25d4850f4716b19645bb1793c37ff8daf377a648acde9e1743738c75a12e2b15";
+      sha256 = "7b82227c5acf5ecc35140763a0ae7f1e46c35e489be9dd1ee758a59b2ffdcf8e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ta/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ta/firefox-144.0.2.tar.xz";
       locale = "ta";
       arch = "linux-x86_64";
-      sha256 = "560a720659530e14a0945f74aa70d25bd6a84d28661f821085d477687189c4ec";
+      sha256 = "0b792958ab94f2bf0f34ad210878c0ece850bbe1e5ec7e509bc038670fa0bcdb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/te/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/te/firefox-144.0.2.tar.xz";
       locale = "te";
       arch = "linux-x86_64";
-      sha256 = "42d53e201651a3e0ad7892eda166a220cafb582426ee5adad5f037c0a9553397";
+      sha256 = "bed6a5dbec4b1b1575521016e844a7184b27228a03344d3d478873e7429830ee";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/tg/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/tg/firefox-144.0.2.tar.xz";
       locale = "tg";
       arch = "linux-x86_64";
-      sha256 = "d6b3249784c1c5026d1031bfdeaab9380fbd96682b40dfab6299e9f6e79f78c4";
+      sha256 = "7299c4b3d3195849539b6bcbf75d72ac60020012d50c8cbd70f4d9145ecb3a76";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/th/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/th/firefox-144.0.2.tar.xz";
       locale = "th";
       arch = "linux-x86_64";
-      sha256 = "794fb0c1db204bbbdc6437a3334804be1c7e7fa09da06a0de29f987dcb5724ea";
+      sha256 = "307b8a89aab146adc47be50e0f6edbbe11c0810d086a71d4c595c008f6a59bd5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/tl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/tl/firefox-144.0.2.tar.xz";
       locale = "tl";
       arch = "linux-x86_64";
-      sha256 = "1851391956be259f3acd5a20cb32e6098a589391562389c7286c81c8600095d3";
+      sha256 = "7c1af9bda50ed54b78478907031daf86bb230fd859d57a315ddf3f6363661e4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/tr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/tr/firefox-144.0.2.tar.xz";
       locale = "tr";
       arch = "linux-x86_64";
-      sha256 = "9d9a247455b7b4206f73288d1cfd70f7139f24c10c8edbb53ef3ec86850c11f2";
+      sha256 = "2f917f19f2ad6700faad72db136016b924e7ada721fbd5bef874f7bb2cd6d67d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/trs/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/trs/firefox-144.0.2.tar.xz";
       locale = "trs";
       arch = "linux-x86_64";
-      sha256 = "7973f887e3c421e597072fec24c8cf15f5fb2be494e57cac2314bb3a57e05b17";
+      sha256 = "e98313cf291ab1faf0163999d5f9dbf3d100c98592b6e6a1f200c848ef0c3ac0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/uk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/uk/firefox-144.0.2.tar.xz";
       locale = "uk";
       arch = "linux-x86_64";
-      sha256 = "cde879b9c5fa0759940604503fe3f285e6dc2ba3c5f80f98405a4e5a01dc4609";
+      sha256 = "4e0924cead5c2945b06668137bc185f09f52ff53c6b91fc2c73b355dbd2b6ae6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/ur/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/ur/firefox-144.0.2.tar.xz";
       locale = "ur";
       arch = "linux-x86_64";
-      sha256 = "29e66f36b763d2aa5bb29e695419f498ddfc627c8be8e351a149d60725ee2e27";
+      sha256 = "c850b863e2a39d396f7ed9192f6638ada1f3156159bb3d3eb4360910b6480f66";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/uz/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/uz/firefox-144.0.2.tar.xz";
       locale = "uz";
       arch = "linux-x86_64";
-      sha256 = "0efddad50b0a075cee00faf6e68ca68dccec1d5fa4e2e0a8a383e600f294f877";
+      sha256 = "281d0f78c7c2d56d053038d8dccdabfb1735aa1192b97344f20449bc24324ebb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/vi/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/vi/firefox-144.0.2.tar.xz";
       locale = "vi";
       arch = "linux-x86_64";
-      sha256 = "375860037ce103a53f948b013855fa9c6f77877a7a95f8a5ba1d7941e4dd167e";
+      sha256 = "274b5e1c392a627f5af0dfefe08c201a5785612b4a95d63ecb15131166f28a05";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/xh/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/xh/firefox-144.0.2.tar.xz";
       locale = "xh";
       arch = "linux-x86_64";
-      sha256 = "dc91aaad44ecb49b84e6a03c47e1eedc8672f2a4423aee4d2aedf199194e614f";
+      sha256 = "b8604821fbcd4d4f2017a9d52beea18053273e3ce301a6d28499f6e92ba9cc97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/zh-CN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/zh-CN/firefox-144.0.2.tar.xz";
       locale = "zh-CN";
       arch = "linux-x86_64";
-      sha256 = "2ae803b84c714a9ee7bd000833653033d511cfd16c3baa86b786912d753bb81c";
+      sha256 = "181038eaf941ae282e3b62de2dd3da98612592993331ab9c84e2e0520da3108c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-x86_64/zh-TW/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-x86_64/zh-TW/firefox-144.0.2.tar.xz";
       locale = "zh-TW";
       arch = "linux-x86_64";
-      sha256 = "48ecde05a52f0750a7d72b86f3c653f28a189fa5ae682fab955c0b97b2d3dfa9";
+      sha256 = "20736e75d4099a2899660cb347381ba442088bf355aedbaccf4a74e1ee6631e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ach/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ach/firefox-144.0.2.tar.xz";
       locale = "ach";
       arch = "linux-i686";
-      sha256 = "9197a7176c36f47e51ec761292327489b1df0281a9ea1018ffb841e0166e81d7";
+      sha256 = "7b39806600029498d6f28c6ac5f371625838819e05e8bbfe3f3daa72eb186d82";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/af/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/af/firefox-144.0.2.tar.xz";
       locale = "af";
       arch = "linux-i686";
-      sha256 = "ff77d967df1a159c686442e98d34b9d3c8c2780843c7ea174dab6286d56ae0c3";
+      sha256 = "6829e00e5a55f1e5d8013f210a9932de2d4c75d600de816eb35379cd13f60dd8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/an/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/an/firefox-144.0.2.tar.xz";
       locale = "an";
       arch = "linux-i686";
-      sha256 = "4f078a802cfabc1583834e55b2f9f84ff318a112a2371f4aacdc2e7416eb43cf";
+      sha256 = "a611d5bfc8805ec751a8dc88dc2f107dc9716bcac9ccc6f3e2cf1b0a95151b71";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ar/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ar/firefox-144.0.2.tar.xz";
       locale = "ar";
       arch = "linux-i686";
-      sha256 = "1e603f99b854c646eb75fd9c0375f8746c4b216dd806d3a649dd3bce9e363afe";
+      sha256 = "605041c0962a533a7ed7ecd3712c93f4725f92eb469e45348a2e7bbe95c7206a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ast/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ast/firefox-144.0.2.tar.xz";
       locale = "ast";
       arch = "linux-i686";
-      sha256 = "881c65fefc0c275e4554bc1d33027559bf6746bff00c39a78a9f5c6a1050e8ae";
+      sha256 = "5f6192dcc095a99aa1f3314184b14e7ca20ebf40430d786948870c376fab0f57";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/az/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/az/firefox-144.0.2.tar.xz";
       locale = "az";
       arch = "linux-i686";
-      sha256 = "1a991d0150176decfded5dfb11a66742c74c62c4526d6941a77382c411ef9e9c";
+      sha256 = "48279f92ef20b353b66bbd19ab612cdd48736983949e2f5e913189443b7fcec5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/be/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/be/firefox-144.0.2.tar.xz";
       locale = "be";
       arch = "linux-i686";
-      sha256 = "ee9ed7f542f7b5db38c0e972c96e9ba7ffc9a818c0874c740da4856958becf21";
+      sha256 = "ac0d61c4c77dc9a874c2e2c252e20c2c8258b4cd66ac032a3c47f777745eac13";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/bg/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/bg/firefox-144.0.2.tar.xz";
       locale = "bg";
       arch = "linux-i686";
-      sha256 = "e2d5a878424b73330969ffe900ed20b6e5a1e1db549b2a00b8f3002ce712d702";
+      sha256 = "161a820d3e22e87c0ad4890a1ca81298af26fe66e72f1860de8428d3b8918a9d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/bn/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/bn/firefox-144.0.2.tar.xz";
       locale = "bn";
       arch = "linux-i686";
-      sha256 = "a498d514a42cc61b6f2aa8ccfd19fa7763e382390dfb65f3e5d4c5c6f51e8ee9";
+      sha256 = "7e9ab5597134ee92bb126363918a249d6bcd83b728571d97ee973a60c3e82d69";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/br/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/br/firefox-144.0.2.tar.xz";
       locale = "br";
       arch = "linux-i686";
-      sha256 = "a3a59ac4f2b704e155b32f33f3f4a7131902ed28b189e248750529a95ffa4121";
+      sha256 = "f57b8f13b6715b0ec2e9b36f5f96fc4e8ab098c8e206c8792d644644bc12353e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/bs/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/bs/firefox-144.0.2.tar.xz";
       locale = "bs";
       arch = "linux-i686";
-      sha256 = "bd62218ae38347200a903bd8cf67fd0b8616749b1f6b78e487c5cb005af97578";
+      sha256 = "102117546666381824c38718f625f8ff202f9c25bdb2ce3de52dc1bdcd78e159";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ca-valencia/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ca-valencia/firefox-144.0.2.tar.xz";
       locale = "ca-valencia";
       arch = "linux-i686";
-      sha256 = "f6671614653f15728b87caac4614b61f0548fca79698e9b6d34a018b9307db8a";
+      sha256 = "32dab2c72f8344db1d724e5c70b98cb00ed4d344605eb439db5a6df27cb44040";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ca/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ca/firefox-144.0.2.tar.xz";
       locale = "ca";
       arch = "linux-i686";
-      sha256 = "44253b8a49a5ab7899b0361a1b9448d780d2a3cd6d85de36e25ae620a36499df";
+      sha256 = "66d955990cc8f88b6d4c248854e2800a6d584f1a8c5e5625720a6dcd1f4c41e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/cak/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/cak/firefox-144.0.2.tar.xz";
       locale = "cak";
       arch = "linux-i686";
-      sha256 = "a57c69066d604ef27e75a3333cd4ddbc30748103bd4d14e74904cb91c0541fa7";
+      sha256 = "4c79ee03e898a4b23a168164003a0be88d023e63bea5d1f387b17dd5eaf86398";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/cs/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/cs/firefox-144.0.2.tar.xz";
       locale = "cs";
       arch = "linux-i686";
-      sha256 = "381f72b8062de44a11ffcf6a100b608c3bc948a29163a291ae9e36bee31d1e1b";
+      sha256 = "71510f758802d552d8cbd8df29464b0f3c54d409970b3788902f2dcd37ffbb01";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/cy/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/cy/firefox-144.0.2.tar.xz";
       locale = "cy";
       arch = "linux-i686";
-      sha256 = "cb453857270076f2addf46036b3fb742e9207694165e0c64fbf00009f381b1e7";
+      sha256 = "1ca7e8f48a1c62c2ab70b8b8b322d5bf99068bc7da5f4183ba4d8be51a21d977";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/da/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/da/firefox-144.0.2.tar.xz";
       locale = "da";
       arch = "linux-i686";
-      sha256 = "8614bba0a5dd151e10c237201599864eeb09a24e88acdd996602753c94465dae";
+      sha256 = "fbd24bac75bf1fe5ea8405b154a316d0517ccf7f9ebc2749bed81e67479ab6cb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/de/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/de/firefox-144.0.2.tar.xz";
       locale = "de";
       arch = "linux-i686";
-      sha256 = "ff4461332696ccf4c21f264ff3352da51dd5bfe77a00c30ace2773d13a87c837";
+      sha256 = "cb4e0b1808a53f05b5b25b03373e24c5bae2223c37064408defbb1961e2f6999";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/dsb/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/dsb/firefox-144.0.2.tar.xz";
       locale = "dsb";
       arch = "linux-i686";
-      sha256 = "1660b74dfc9535530f1b1a88543546188314e459486eeee586adf457e457d9fa";
+      sha256 = "cae50c1efc9fb41482cfb501b2983481127096d4a0b73bd3f9dbb3bd55d2dd35";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/el/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/el/firefox-144.0.2.tar.xz";
       locale = "el";
       arch = "linux-i686";
-      sha256 = "66009a2d56838b7aa6913bf9a99f6e80c9c39fa09623c9fcc0c0469c1d65b5d8";
+      sha256 = "eb26bbb640efcd9495baa3ebf49cd138e7ca454b9a11802546f7124fb594e8a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/en-CA/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/en-CA/firefox-144.0.2.tar.xz";
       locale = "en-CA";
       arch = "linux-i686";
-      sha256 = "dd8a70bbc27b2c5a3580b1e5dc52dd31e90b101e3729a2fdd10436955f87ff92";
+      sha256 = "e750294777493004f572d9071112fb16ab29ee053ee4240bd7daabc79ec307fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/en-GB/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/en-GB/firefox-144.0.2.tar.xz";
       locale = "en-GB";
       arch = "linux-i686";
-      sha256 = "18009a2a7b7b250955f02a4f605d1cc6deaeff0420dd3be368a48f87a1817da3";
+      sha256 = "16309d074480b266aa515e2d85c315cd75700a22b2baadf9d43b5f161ec6fced";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/en-US/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/en-US/firefox-144.0.2.tar.xz";
       locale = "en-US";
       arch = "linux-i686";
-      sha256 = "46ffbaf8ab3b68ae7ef3feaffe2339782ecbbd521d08adce61e712cf63589563";
+      sha256 = "ca5e152d9413163f1c4e1a2f674a72643a22c12b1e167e5a5c93166ed0612aec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/eo/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/eo/firefox-144.0.2.tar.xz";
       locale = "eo";
       arch = "linux-i686";
-      sha256 = "b9d679c4432dfb1fbceb993084126c17d283ebc3e4b87bacf9b18e6a26f4d4ce";
+      sha256 = "ffefbbc63df45c978e7e44f33b0bef7e2439171cd4ac8e6217588f673df8e354";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/es-AR/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/es-AR/firefox-144.0.2.tar.xz";
       locale = "es-AR";
       arch = "linux-i686";
-      sha256 = "92ab4b67073e61964fa5a8351b1bc4730f8104d21f4160baf65e01c81a10fb0f";
+      sha256 = "e8a5cd8e9377a1f70c6396ead4c7f2b3a45367259a2c7c21880534f27552474b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/es-CL/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/es-CL/firefox-144.0.2.tar.xz";
       locale = "es-CL";
       arch = "linux-i686";
-      sha256 = "ac1f8e08550d6d0c0195a2e7375797abddc62fa4cbf0ceb31601dcaf42c453af";
+      sha256 = "ac2f9b548be3756da028d0697ec2999e10fe02d49a57867d0b4e2934a36319a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/es-ES/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/es-ES/firefox-144.0.2.tar.xz";
       locale = "es-ES";
       arch = "linux-i686";
-      sha256 = "ccfd4ea5a33eeed4adbed3eba6b0375020b5cedd0a8d80cf3d9e6267da4c78be";
+      sha256 = "f0bcb6e96ae74eaf804fa0913798ce665fb5f6b8a4d6d172305c16af375e4ef8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/es-MX/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/es-MX/firefox-144.0.2.tar.xz";
       locale = "es-MX";
       arch = "linux-i686";
-      sha256 = "6ac94047e4b12f6baa91e6adab71abff4630a12e59f433d2e3b1acc62f9ee589";
+      sha256 = "a480b132546a912fb7821455b24151a51a9722a55905bffac397b3fabf5c177e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/et/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/et/firefox-144.0.2.tar.xz";
       locale = "et";
       arch = "linux-i686";
-      sha256 = "dbf04452d283423bf57fbb4009b4650ef058e14e403f3b49269ac385bea2719f";
+      sha256 = "063fbbaa120db7f99547f2be78ae55fc1ee3413c66069a627e60db3b68eb9e7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/eu/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/eu/firefox-144.0.2.tar.xz";
       locale = "eu";
       arch = "linux-i686";
-      sha256 = "b11ab98d0503136482e32d77dd98bfd496188c234576c32df399c8f715a39f61";
+      sha256 = "cee23b86c63280932182228774e0a3340580f6ac9a161ef31ff248401cafbd33";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/fa/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/fa/firefox-144.0.2.tar.xz";
       locale = "fa";
       arch = "linux-i686";
-      sha256 = "b1c6362ce81e8790cc3113a94c4ba8e3eb29c24e6abef807ed723c7d211f3fe9";
+      sha256 = "88fafbaa3d9c57399ad62b7e5e914ea468c7d952d10c7039fdcbc28e42380645";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ff/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ff/firefox-144.0.2.tar.xz";
       locale = "ff";
       arch = "linux-i686";
-      sha256 = "15b5f1771644b750063c020925f01230a57361a9d3825329eb4df2743394b6eb";
+      sha256 = "53e2869a5595bf5931161681078e46f277d354c6f99263c1073b223fa56df195";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/fi/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/fi/firefox-144.0.2.tar.xz";
       locale = "fi";
       arch = "linux-i686";
-      sha256 = "4050a4d898787fac35f78c3539253d036a62340b0ee0785befa3da256c826ba3";
+      sha256 = "020d9e13002b6f6294219320d3fa20f4b71bebc46e0aa70890da7f6fb77ab58e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/fr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/fr/firefox-144.0.2.tar.xz";
       locale = "fr";
       arch = "linux-i686";
-      sha256 = "a6f8b17a3ee1800eec433e645c055a08d9dd9dd5c646d21ce6ecc7d73efb7e5c";
+      sha256 = "8cc2b5cb74929faa90c3f311159622d0734d936c6b40e843cec292969975ef3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/fur/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/fur/firefox-144.0.2.tar.xz";
       locale = "fur";
       arch = "linux-i686";
-      sha256 = "ebe3b75a723dc8f387f9f47442cf976954a75806b6b301fd2a9812254d569aa0";
+      sha256 = "949b3d57eadea30b6ae2b33e2613c705954e239f3f18e2795391396c40ddeee5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/fy-NL/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/fy-NL/firefox-144.0.2.tar.xz";
       locale = "fy-NL";
       arch = "linux-i686";
-      sha256 = "81cd1ddbf4c737a57674c2b4a9870213992d42bcef6e65bb909dff5078cb1a46";
+      sha256 = "c88fc015306d758a39ed588f029b1e9e2315d247edc461fac2f197849a21aae6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ga-IE/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ga-IE/firefox-144.0.2.tar.xz";
       locale = "ga-IE";
       arch = "linux-i686";
-      sha256 = "2869ff9d9d3768036322e6d02eed7791a03acb0bb0ebaed2431042232adc78df";
+      sha256 = "e44c978632e912ba8b99b657dab61d5d702cc723cb26fda33ee608a128de2825";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/gd/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/gd/firefox-144.0.2.tar.xz";
       locale = "gd";
       arch = "linux-i686";
-      sha256 = "4b723dd2084b9a45987e318744a44fccd28ec6f38aaaa61c232e086e7ddc22ce";
+      sha256 = "1c98d1a876614a701047ad06b1b112b3f9a71671b74e031f6b7e6263ac96952d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/gl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/gl/firefox-144.0.2.tar.xz";
       locale = "gl";
       arch = "linux-i686";
-      sha256 = "9e38b6ef7ed6783855d63af6324db0a5c6a48021ec57f17ebfce17208081835a";
+      sha256 = "ad3b0afeb730fa902fcbd8e36b97be83fa4b5e7c12b8f892a60706914c8e7ac9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/gn/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/gn/firefox-144.0.2.tar.xz";
       locale = "gn";
       arch = "linux-i686";
-      sha256 = "63cad4b437385eaff4ed50f39bef8bc76b2658aaaf3c0ab60372fe7104bfb04c";
+      sha256 = "60017d4518161585ac9df2f7a3cce4281b8e9c0fad3f59597984a12bc2a49d82";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/gu-IN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/gu-IN/firefox-144.0.2.tar.xz";
       locale = "gu-IN";
       arch = "linux-i686";
-      sha256 = "0ffb4d87adcb1ac2bdbcf4b303c099e72e14a2691d135187bd66a433297e7c1a";
+      sha256 = "d6ee3f920e8fa6d50d92050e08a35d361d3898a00cd8005267847032f3a6114c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/he/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/he/firefox-144.0.2.tar.xz";
       locale = "he";
       arch = "linux-i686";
-      sha256 = "c7208127bf5c648e4775b7ac05eaba02f5790f5aba82a3456692ccfdb29f1af2";
+      sha256 = "64e6eabf5693bfad0afac3535f10f20a8fd8f2bae53f6e67c39825f51c40a69c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/hi-IN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/hi-IN/firefox-144.0.2.tar.xz";
       locale = "hi-IN";
       arch = "linux-i686";
-      sha256 = "dc8ef116c747bce1186af82d7870cde7c7f7bf662666cd90ffaac31d4300079c";
+      sha256 = "1d7b475b0456aad5b0e75db4284c5614f11491dcb2239192715dd4b0b192225c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/hr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/hr/firefox-144.0.2.tar.xz";
       locale = "hr";
       arch = "linux-i686";
-      sha256 = "cd201ee73e3d783817859cbe358cb15c6d582fb8ec4990ece87f75b511754dd0";
+      sha256 = "4adbde9ae8da1ff36c460bedcc1b822ed5c549940e5c06a638ee17b5d62d4243";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/hsb/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/hsb/firefox-144.0.2.tar.xz";
       locale = "hsb";
       arch = "linux-i686";
-      sha256 = "42724a186d370a1e3d16011a67348d475ff095c59d12bab1b66b5e583089e7c4";
+      sha256 = "5757b883bb505ab7ec45564412d268f4edc3f8c55d537dcec8621303dc911f5a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/hu/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/hu/firefox-144.0.2.tar.xz";
       locale = "hu";
       arch = "linux-i686";
-      sha256 = "b0622282a99c87b857cd23c6f8dbef08f997e8a0e46ff08f3b35a974d231d9db";
+      sha256 = "1e1835822f7537573db4444a6b2b1d7405098b9062fa850c7041eef64a5ea330";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/hy-AM/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/hy-AM/firefox-144.0.2.tar.xz";
       locale = "hy-AM";
       arch = "linux-i686";
-      sha256 = "86c4468f30842a56f3852ade44850ebae97f5168fe3de5663d09a9edfcb66a22";
+      sha256 = "3fc0e6b65ce4d3dba9d8e72f3f6a604daee66a84668ec9a4908e6841a7ab8855";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ia/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ia/firefox-144.0.2.tar.xz";
       locale = "ia";
       arch = "linux-i686";
-      sha256 = "bed81f31650c0e9b32176f339d5fe09fc5d72c987542d2a661fd150eb218f6e5";
+      sha256 = "400ff72b0708b197e946d7e8abd711b99c9c9911d13fe73f404ebf89fae2c031";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/id/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/id/firefox-144.0.2.tar.xz";
       locale = "id";
       arch = "linux-i686";
-      sha256 = "2ea6385784dd1df09081749e708ecb539062082bc19fc6a64a704a0738fa91f7";
+      sha256 = "4e5efbef2adc58be98c5e36733068027b358c98f6932a9e82b24a183a048ee72";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/is/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/is/firefox-144.0.2.tar.xz";
       locale = "is";
       arch = "linux-i686";
-      sha256 = "9c991c092c6490e816decb96763b26899835186ae33377d83d3dbfc9b8906cd5";
+      sha256 = "43bde968368a63c32275ab7019c02232d9200f3f21c042fcdf2ad91c94176620";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/it/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/it/firefox-144.0.2.tar.xz";
       locale = "it";
       arch = "linux-i686";
-      sha256 = "1b14405d7826889f0035ea9cf6cae90bf1004b63120ddc1296d4f5f038a87301";
+      sha256 = "3d558aa80380bee0ac81ae7f35cba77e09ca9e1e73fadcc245f595d12d97ed7e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ja/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ja/firefox-144.0.2.tar.xz";
       locale = "ja";
       arch = "linux-i686";
-      sha256 = "3e4bab59a4c76491c94ec14e8b9a8470c94362ed710049a7f415fed6270ff6bd";
+      sha256 = "49cc0d04c38a504dbe9214560493cae03b0d4e9825a5564a09f29af61d38e6a4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ka/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ka/firefox-144.0.2.tar.xz";
       locale = "ka";
       arch = "linux-i686";
-      sha256 = "2c615519e57387585e1414afe3ea2f28c8438537a872840aedc7e24ae91308a1";
+      sha256 = "e7681e399042d47ac3a15794093901d3f986c75309221938d475edfb8b417f09";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/kab/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/kab/firefox-144.0.2.tar.xz";
       locale = "kab";
       arch = "linux-i686";
-      sha256 = "df1a0a738df7e8ce99258a4bc3611e3dfb6e25192539eb02836e7fb6986ce9e2";
+      sha256 = "376e98a4699c0cdca2e554dc562aad6d3decbaf5e8f30717a1e66c24728e66c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/kk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/kk/firefox-144.0.2.tar.xz";
       locale = "kk";
       arch = "linux-i686";
-      sha256 = "3b986efb6ba7d2ad39075c23486a5cc307a0b60ad5c4caff168e8b413bbe4f36";
+      sha256 = "eb34c13e17c87808e7e5c25fdee5e339bd53176e0a245da012bf4d7a19a7e3b2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/km/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/km/firefox-144.0.2.tar.xz";
       locale = "km";
       arch = "linux-i686";
-      sha256 = "f4a26dff7f59e8af745bdef604330e08b3fe3e130aab47156ae91a65fe909c3e";
+      sha256 = "8a438855f9bf282cee760b4b9a9fb76e2f07a825e27c6192137d6346b44ac8e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/kn/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/kn/firefox-144.0.2.tar.xz";
       locale = "kn";
       arch = "linux-i686";
-      sha256 = "411a048b170b873a9236e98899c43301dfb3120515998c71a47de49b61889de2";
+      sha256 = "86bbc6bae4064464aa2634d3be45b9afd1d174dee5fb9f0a718dd014040818ce";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ko/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ko/firefox-144.0.2.tar.xz";
       locale = "ko";
       arch = "linux-i686";
-      sha256 = "7017df2d5032b02290cb473c8182bb15e1367d1b195c024aede29c33db814dd6";
+      sha256 = "b1407a96e6c7e5b52d51d8658e9b08d365807366a25d549d39ad0c1f30b8b6e1";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/lij/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/lij/firefox-144.0.2.tar.xz";
       locale = "lij";
       arch = "linux-i686";
-      sha256 = "af6cb9daaebe1df157db23e106794261823e14ef9555cc99d0d54313df9f1b47";
+      sha256 = "2a620434d1478642128f9822082c68ba1c1a1894749e3bdc191425c07d35ee59";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/lt/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/lt/firefox-144.0.2.tar.xz";
       locale = "lt";
       arch = "linux-i686";
-      sha256 = "7aca137af26a57b5bba9801357950de55af8e8a8188637cbbfe06135e6d58f83";
+      sha256 = "4da70978d044db5f8fcff53b92d65becf1dc332fcea97eda4ed5b34ef6b62075";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/lv/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/lv/firefox-144.0.2.tar.xz";
       locale = "lv";
       arch = "linux-i686";
-      sha256 = "c2397a9486927268241e1d2cc3d80258d014115a6df6bc0785e26551d3526a38";
+      sha256 = "c6c7d90cf8943c9e6be37f9a51ba91899e8a3b61169fc983d6cfed9dce45391b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/mk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/mk/firefox-144.0.2.tar.xz";
       locale = "mk";
       arch = "linux-i686";
-      sha256 = "042423d01745a124c7a76b649eebcb91b187c4153f2ce8aab43745c35c0c90e2";
+      sha256 = "9611d0500e8a59977c958b4e4da72b774ef3be89eb0aa29d0a65412da861b8b5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/mr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/mr/firefox-144.0.2.tar.xz";
       locale = "mr";
       arch = "linux-i686";
-      sha256 = "b20f8ab986003cffcb49ee57149586f3d0ebcf63b7476a33d030ef47828e66a8";
+      sha256 = "b83ea428ef39ae7c39a6252bccb786ddaf5a254bd0859b1676a5a5383355c4fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ms/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ms/firefox-144.0.2.tar.xz";
       locale = "ms";
       arch = "linux-i686";
-      sha256 = "617a8020fc8dcf4a7f102d25a2d805fee853bc64b575fdbf07f414a249633d3a";
+      sha256 = "7999d3685972d6d6ab3f6f8d1ba5423677c15990afa2efb6a8bf16948fbb2fb6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/my/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/my/firefox-144.0.2.tar.xz";
       locale = "my";
       arch = "linux-i686";
-      sha256 = "183a1077fca94ce124e1c40fa7fdb73459054b1a77cd3e9531123bb189a4ad02";
+      sha256 = "46228bed0be400a766ec01af64ec525cd46150e22f06f2da8f846256450cdddb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/nb-NO/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/nb-NO/firefox-144.0.2.tar.xz";
       locale = "nb-NO";
       arch = "linux-i686";
-      sha256 = "5e8432770b66a5dc89131cc4c15dbcaf7ab4c92b97c3c2c4286db675c12241b9";
+      sha256 = "53a1c7761fc37229eb168d71243249278e6bb5f6bbf6de11d3b71546a04a952a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ne-NP/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ne-NP/firefox-144.0.2.tar.xz";
       locale = "ne-NP";
       arch = "linux-i686";
-      sha256 = "56e43841651cd9f53224f1193f26d2750b2cfaa7779b9613f21b295ba57c6dd3";
+      sha256 = "6d49c881e82f563bdd89b991540b6db98101c5d84b164a029353fa2f4b215c3a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/nl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/nl/firefox-144.0.2.tar.xz";
       locale = "nl";
       arch = "linux-i686";
-      sha256 = "c7ee1b2f914960c3484a2df0e2841213cb49b7023e54440d8820ee8c7468f37b";
+      sha256 = "0584812b1bcf47e9ecdf640b76586547d7e1558302ada5dd0c4e1c12078bf70e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/nn-NO/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/nn-NO/firefox-144.0.2.tar.xz";
       locale = "nn-NO";
       arch = "linux-i686";
-      sha256 = "b723933e06e4125a560cdb2fe01d8b2f93fe311be7b2533b3e5e3528eb2e2ebf";
+      sha256 = "7398023d526ba8b4541e9116fc4682fdf46567e86328fc4007fe828e0ac75c7d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/oc/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/oc/firefox-144.0.2.tar.xz";
       locale = "oc";
       arch = "linux-i686";
-      sha256 = "9c96f77ad2075da7c31022bc0353ea3312a717ab119f8ba0c7813de28e6b03db";
+      sha256 = "6b6e59dfe45edd4eb594660a3ec2fcb15b98ca9abad5120fd2e13ef1a489cc82";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/pa-IN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/pa-IN/firefox-144.0.2.tar.xz";
       locale = "pa-IN";
       arch = "linux-i686";
-      sha256 = "baae1fb1244779f570043e1f1d415c030def26843860cc31ff6c16b2410f4620";
+      sha256 = "8dd14d1e7eb65e0734bf9fc9abbe8f61d688947e374f0afd60dc23c94b7f8b40";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/pl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/pl/firefox-144.0.2.tar.xz";
       locale = "pl";
       arch = "linux-i686";
-      sha256 = "e557c4b44c1ef6665035c3b4d70ce4b795c9497300ebe1f85cb39a0b06a9fb5b";
+      sha256 = "5401e903267427d89e0993b8065b7073a99da0096e2a4f1bd9ae6add2d411b1b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/pt-BR/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/pt-BR/firefox-144.0.2.tar.xz";
       locale = "pt-BR";
       arch = "linux-i686";
-      sha256 = "5cd2dfe143afcf4381d9eb395f12ddbd348a116f652ee0a197bee31bbd5fdd53";
+      sha256 = "92bfc4f59b5a8941e6b56c44451e309963efa9770b154aec1b0eb2e1905c4a53";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/pt-PT/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/pt-PT/firefox-144.0.2.tar.xz";
       locale = "pt-PT";
       arch = "linux-i686";
-      sha256 = "d5f2b4c619ba38835152b65808acfb193649d17b1d86c5b9b2d93c45b8c97f44";
+      sha256 = "51601c5f5a7ca0ef722c2b5ae58dfabec5be43d185f2cbe7bbbb4bf1cbdf8c49";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/rm/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/rm/firefox-144.0.2.tar.xz";
       locale = "rm";
       arch = "linux-i686";
-      sha256 = "e9c7962a4d6c4b513c2bdee8d72bc31af4ff5debcfe34fd9ad9c3aa1cfcb6276";
+      sha256 = "fb679d3e2344e8ebe6e4f847d80075b17f3eccdbc842fabe87f0d81f17de91f9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ro/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ro/firefox-144.0.2.tar.xz";
       locale = "ro";
       arch = "linux-i686";
-      sha256 = "ebb0555c385dbf52fd8de2fd54131f4fe8632e7ec40609d2c4c409cdd34a3e55";
+      sha256 = "d59c196e0d58ccdb6ca5860ef5ea4a47325fed37b0d15fb0445a1faa0ccf4e54";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ru/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ru/firefox-144.0.2.tar.xz";
       locale = "ru";
       arch = "linux-i686";
-      sha256 = "bf56783f4829d44d405b26443f06a3d43c7e390a5c391589d63af151d5a50f4b";
+      sha256 = "676c164ef9c057c3f3a036dfa7daa92072084650a329bea73299bb4b4df78730";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/sat/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/sat/firefox-144.0.2.tar.xz";
       locale = "sat";
       arch = "linux-i686";
-      sha256 = "8a98c043e78ddba6c17c1c657e89fa20771f3fd3a801856324c92729933a3e1f";
+      sha256 = "335c2a78fa39496183886ec76d972386b8978c02c2aaceade8e1e3ab2639a05c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/sc/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/sc/firefox-144.0.2.tar.xz";
       locale = "sc";
       arch = "linux-i686";
-      sha256 = "7859acb38a46a28d1a524b8623593739b839bf4144da1b02969cd3d8db2007f0";
+      sha256 = "5acab2be3edfb7527f817b68f7c4dd79c302ee4b9dd50610a8a436453bbb4485";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/sco/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/sco/firefox-144.0.2.tar.xz";
       locale = "sco";
       arch = "linux-i686";
-      sha256 = "e731574543c18710de36315f2ebadd7f559d1cd25ffdd5097b9ae2048b7699bc";
+      sha256 = "a05965f5a422e99c62aac63f31a16fe9b8ecf14b13712a9eb585e9d6336774e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/si/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/si/firefox-144.0.2.tar.xz";
       locale = "si";
       arch = "linux-i686";
-      sha256 = "c8db1ce5b9e07ed11f9dc4b9aef0339f70fbe0dca499429fc65cef9e990a8e2b";
+      sha256 = "ad085502904d55d84865d42db4ae503420a049ea131f3a8b4d8f43f8fdf2b767";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/sk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/sk/firefox-144.0.2.tar.xz";
       locale = "sk";
       arch = "linux-i686";
-      sha256 = "62364f44f922c72eb9a0e3a02e9c7b5d467342af9e7cb513fdaf661fb46a1860";
+      sha256 = "2d3cd5a3b33222770697e394ecd688720667a726bdba9aca7512c8873f379d9f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/skr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/skr/firefox-144.0.2.tar.xz";
       locale = "skr";
       arch = "linux-i686";
-      sha256 = "f67e0b7d517ad09092e03c2bd629df3a442d4aea2dc223b1968d131384068086";
+      sha256 = "7822098895520cb420f226ce2ec083b9eb30bd6c1b34c00d4da1d5bbe60407c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/sl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/sl/firefox-144.0.2.tar.xz";
       locale = "sl";
       arch = "linux-i686";
-      sha256 = "28be22798a0fcf65410de1a154b4aab545e99706b36a3996bafbf32479361aa8";
+      sha256 = "061d1f685cc629b60fe3893ce4d4400a32573b1e2a42e9d9ef51f3b1ddc0f1bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/son/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/son/firefox-144.0.2.tar.xz";
       locale = "son";
       arch = "linux-i686";
-      sha256 = "3cc1314862a52863d9278e3a3a4865a6d449ce79e151a05bc69a814a27ab0bec";
+      sha256 = "22152c6865574e00c274eec47e0dca5689c7ef3b53711a4c7ffdb5e6d26e890f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/sq/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/sq/firefox-144.0.2.tar.xz";
       locale = "sq";
       arch = "linux-i686";
-      sha256 = "20439a47650da9526b9568b3cdcc98264e9768056aa49f0108a069edb02b9b91";
+      sha256 = "e68e14298bd89f3432de3629baf3a646a796b741ff7fcbc430f3029f026730fc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/sr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/sr/firefox-144.0.2.tar.xz";
       locale = "sr";
       arch = "linux-i686";
-      sha256 = "59098ca2bcdd4194849cc276e93b9a1d0c673d555cb66d2ded4f10470622f1d9";
+      sha256 = "179991eccdfb8949f28462cc885daf29cff1ca708b462feaedf76222efb2ad96";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/sv-SE/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/sv-SE/firefox-144.0.2.tar.xz";
       locale = "sv-SE";
       arch = "linux-i686";
-      sha256 = "3ea87b1e77ffd080e70c5714fd5c94855b1919ef3b78b04f8003a4eb01179998";
+      sha256 = "84c5898d6724ce3fc7eaa4c12b3071f1739caced9b1d99b41d2596343806bf99";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/szl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/szl/firefox-144.0.2.tar.xz";
       locale = "szl";
       arch = "linux-i686";
-      sha256 = "2b5e98696226aedbbc11d56c5380f6adbeea8c6d82f4697b6a21b751ccc24014";
+      sha256 = "2a07f8031917f2c2e26d7f2c47600f560da4e8495194756163be4611b9c18b75";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ta/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ta/firefox-144.0.2.tar.xz";
       locale = "ta";
       arch = "linux-i686";
-      sha256 = "995cfa80377698fa061599ade0e8146ed27ef920290b10d8421764f806f8cc40";
+      sha256 = "b2665383ddadbd324cde72d08c483cabfbb581fd57d6d13bfacaaf7fd6007006";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/te/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/te/firefox-144.0.2.tar.xz";
       locale = "te";
       arch = "linux-i686";
-      sha256 = "8bd71af712895b00650dd2862c8e871192e6d4ab033cc72abea3586bd4b33261";
+      sha256 = "3dc65e4d8d866e8f055b34e7afd4bd9f3efc069c5c00d47422b265cf5f2092bf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/tg/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/tg/firefox-144.0.2.tar.xz";
       locale = "tg";
       arch = "linux-i686";
-      sha256 = "fbcee6d0c2f972dd6d4635231669163ff1d658b40de804449ae7ea265dfeb00a";
+      sha256 = "f94650f8a08103e393f458f7405022a0eb43843613ebb129e9dc8b2ed294664c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/th/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/th/firefox-144.0.2.tar.xz";
       locale = "th";
       arch = "linux-i686";
-      sha256 = "54eccbdf6f5f141c8734328144cdfb830ebcd98ef4da68e7f351350a7ce9ab6b";
+      sha256 = "3fb5450d8b5f9cfd03ce6bc7b09b4eee8ff0ef2e9ffcbd7538c1c26a8009d316";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/tl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/tl/firefox-144.0.2.tar.xz";
       locale = "tl";
       arch = "linux-i686";
-      sha256 = "1db8fc8099987139ce73d90565cf541b7cd27d473aead5167536fb32b5a13a9e";
+      sha256 = "7528eb73e2983efb90ded2f92583a9c0bdbcba62ea37fc6ecfcf9363ec5e73fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/tr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/tr/firefox-144.0.2.tar.xz";
       locale = "tr";
       arch = "linux-i686";
-      sha256 = "d0150ad7ce2e12b7d3ad0316f13bf09389930f575fce05c8b05821bad23bb69c";
+      sha256 = "ae9b472de5befda28c03656dd85196a63e0532db5c850b4eb6661bb5e57d8f90";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/trs/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/trs/firefox-144.0.2.tar.xz";
       locale = "trs";
       arch = "linux-i686";
-      sha256 = "b1ae51b5b599fa2159689329f4becdb7cdb880c6afefa6d35c6aec1f1e59f2ac";
+      sha256 = "379662316f3d4e9ecd0974e3dfbb0b2394fc8aca317f06688d87f921be7c7884";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/uk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/uk/firefox-144.0.2.tar.xz";
       locale = "uk";
       arch = "linux-i686";
-      sha256 = "b6f7374c42c970eda8508747d7d2a04881ca4fdf640dfe1da2e9ff6070554144";
+      sha256 = "b27207ed4b16fe5bd1a315ada9264b9763462d047277cb1e6bb71c7cceb54060";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/ur/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/ur/firefox-144.0.2.tar.xz";
       locale = "ur";
       arch = "linux-i686";
-      sha256 = "fa78ad0f604d2f9e4c65002fece257a1d99bd128c47b5ae553f744a236dc901d";
+      sha256 = "50180daedf6e2f1aa24a05094d5d6dcf0ca0f0f1f33f5a8a735b0a9ae4f0e2dc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/uz/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/uz/firefox-144.0.2.tar.xz";
       locale = "uz";
       arch = "linux-i686";
-      sha256 = "3ad4dc6f4d061f5f44ab31ca89bec1b7665c17f80bdab981583bfceac67fb8fd";
+      sha256 = "34942e61850abc56b367e38e4a46d61d8d7aff0876290ac7e3c890b3c41b987a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/vi/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/vi/firefox-144.0.2.tar.xz";
       locale = "vi";
       arch = "linux-i686";
-      sha256 = "044c2bb1e09aeea04b3d1c11f3f1236ac18eef9a9fa9bf00c4cc31c4ed4c44da";
+      sha256 = "b9e06af98a1e1092db57096b0615569ca8d1381a45482d9c0729c43400532576";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/xh/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/xh/firefox-144.0.2.tar.xz";
       locale = "xh";
       arch = "linux-i686";
-      sha256 = "e6313d5fe3143685c8da6c381523740fa8d92462a203ac922687909562ead1de";
+      sha256 = "2c40080a642634e96e59a17fa3667bce17b3e6299ac2866082b5d15d918d39b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/zh-CN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/zh-CN/firefox-144.0.2.tar.xz";
       locale = "zh-CN";
       arch = "linux-i686";
-      sha256 = "5197bf5491718a5eb7d9157ecc13e06ac3ae08384d84ba31c75b92bccc5db028";
+      sha256 = "8c3e12e6cce8bfdab7bd829448aef9f6965ce591495aac59a14eae5c4f1338f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-i686/zh-TW/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-i686/zh-TW/firefox-144.0.2.tar.xz";
       locale = "zh-TW";
       arch = "linux-i686";
-      sha256 = "88858a13eca01af516d113bd16692a5166ba9f406aa4db81899dd52f52b68c92";
+      sha256 = "d0eb482258ade0045d342d66152e005b4ad56621bc1270cc81e004796d3427c4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ach/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ach/firefox-144.0.2.tar.xz";
       locale = "ach";
       arch = "linux-aarch64";
-      sha256 = "977d28e0187b3a752ccfd9079456619ad4159ad8ff2aa97bf2ade77b1ec3d6c8";
+      sha256 = "7c2555837c2888059a63a5075fce76073927229472f55d2093069f3d58e42583";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/af/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/af/firefox-144.0.2.tar.xz";
       locale = "af";
       arch = "linux-aarch64";
-      sha256 = "a0fd46deb1e5d06ae1e9ba36281c677b190c63f64c9ccb301e50376e9508b0a3";
+      sha256 = "5a44f2452ea484ebc462bfb54883f496be58c9eda975b5388f9b56f309f90ab8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/an/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/an/firefox-144.0.2.tar.xz";
       locale = "an";
       arch = "linux-aarch64";
-      sha256 = "f1a7f4c06fdd334336deca8d74c15ebdb8de03628c1c303744a0e4f356422338";
+      sha256 = "808f20c408e35e36bb78c9054c90e9c4a20243890466cd4705558de072a1a0bb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ar/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ar/firefox-144.0.2.tar.xz";
       locale = "ar";
       arch = "linux-aarch64";
-      sha256 = "83ea0adf5a613fe39cc1ca9c13c42cad2ef921dab634e39c39cd2dfb0d26f8a3";
+      sha256 = "ff60d8471f4df7deb20de7eaf3284ec2b373b730095179349b7c771208ef0286";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ast/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ast/firefox-144.0.2.tar.xz";
       locale = "ast";
       arch = "linux-aarch64";
-      sha256 = "fd0a68fb69fc9dfdd4c9399a38b42b28cb56011de93f339cd9b89b65f86b9882";
+      sha256 = "337a7908aec3b42f7ad1c32c542ef3bf26f227a691f889f85c4e9a6cf045de0f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/az/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/az/firefox-144.0.2.tar.xz";
       locale = "az";
       arch = "linux-aarch64";
-      sha256 = "50b43273b131a33c1cc6ee050f5294ed3c4e914651f2760953f16b3e78a9350a";
+      sha256 = "640cfd65c84569022798e10cc0905fe76d5f8a0460274248176c0eeb1dfeaeca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/be/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/be/firefox-144.0.2.tar.xz";
       locale = "be";
       arch = "linux-aarch64";
-      sha256 = "2491d02b258dc8fba365559795b104a3073180263b16e49099173adaff2cda7d";
+      sha256 = "d3e87b7cdb7270df9b874d4ca1fe385c871522928163cfa3c66b2d174fc8bf20";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/bg/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/bg/firefox-144.0.2.tar.xz";
       locale = "bg";
       arch = "linux-aarch64";
-      sha256 = "dd734a7e075f5c9fdd6ea5d7e44a07de7c8155d77d4bfd1b274a16286b2a9e43";
+      sha256 = "43167969b585cf5bfbff7584ac547ac1af1d9220f2407b64dfdec0331fcb9ac3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/bn/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/bn/firefox-144.0.2.tar.xz";
       locale = "bn";
       arch = "linux-aarch64";
-      sha256 = "2ae3fd4686495479106bd271b4863d33eb83cbfaf412bfdb24762578ffe8c450";
+      sha256 = "dc2f24f0205798cd1774475449da40c74e0b37c99d9810fcbf29fc025582028f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/br/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/br/firefox-144.0.2.tar.xz";
       locale = "br";
       arch = "linux-aarch64";
-      sha256 = "331e6dbe744c92cc2c94f3e81daf9cc0c4609a7133543093edcc381a0207933d";
+      sha256 = "cd4c5110d7a0a1faee62516671ca47f9c3078e4bae4b3546886e1b4f522bf452";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/bs/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/bs/firefox-144.0.2.tar.xz";
       locale = "bs";
       arch = "linux-aarch64";
-      sha256 = "350c8a3f4b8ba257a769909ca2d69b9f72c95d182705299dce386e8115d85acf";
+      sha256 = "77b8bcca21d816840d5b951979911a22e923557958f5423cba113e149dc6a641";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ca-valencia/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ca-valencia/firefox-144.0.2.tar.xz";
       locale = "ca-valencia";
       arch = "linux-aarch64";
-      sha256 = "1161b93a7c47e2f57148ff13f4b3cecc55efe4c44002b8e13e139eea55e090e7";
+      sha256 = "26380615ef64560e13a3fd1e7eb6c11a2ce5a07fb7008abec90be09ecee32b97";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ca/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ca/firefox-144.0.2.tar.xz";
       locale = "ca";
       arch = "linux-aarch64";
-      sha256 = "ab58c68bdf394f05db6f5224ca0c08131a5ae40fe9236e4ce7dc2aa8e80b0997";
+      sha256 = "363fc40bafc6fe8b71358a49b35d2c86ef7b58a28cd12493fb14884da56cdfed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/cak/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/cak/firefox-144.0.2.tar.xz";
       locale = "cak";
       arch = "linux-aarch64";
-      sha256 = "b23fe334ae1a4b24d684f8c6a062eaf50f6cbff39e2b4f167464cf411e4f2842";
+      sha256 = "08d42711c8cdf338db538b106631bf0c531c61854aaa04c9c4bd5d7fc3d312e5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/cs/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/cs/firefox-144.0.2.tar.xz";
       locale = "cs";
       arch = "linux-aarch64";
-      sha256 = "5bf6194661c1b08eb63e047d7e3703bc5883c2651a8553d617e803eb8a90378e";
+      sha256 = "a53e52a79785aca06054b06fb118bcbf972f71f3a8abdab5fcabfe34cf98a68a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/cy/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/cy/firefox-144.0.2.tar.xz";
       locale = "cy";
       arch = "linux-aarch64";
-      sha256 = "19bd22d7ee9f01b63c756a8ae4843b1c237fa621303f497293f411e916b60f0f";
+      sha256 = "a66c1dacdc0fa49353eb5a4a7e06ce974babd128769dfb7d3e7430f4f051475b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/da/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/da/firefox-144.0.2.tar.xz";
       locale = "da";
       arch = "linux-aarch64";
-      sha256 = "cef6a185c2e9ef7332ec24b862f113da11472bcd28606c733dc6ed6cbc7c9163";
+      sha256 = "8abe1a1e2d978d6bdaccf85be3bc9b1a526ad8853f104d6ac630df3e8f2e606a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/de/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/de/firefox-144.0.2.tar.xz";
       locale = "de";
       arch = "linux-aarch64";
-      sha256 = "1098b67b168abfa976ca1ffa6e0cf3a3d13b80bd0aedda4db2832a0dfceab56d";
+      sha256 = "f0aab54f9d57812fdfbab4288240604efe938f397bc9680ade57ffdcba1f2763";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/dsb/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/dsb/firefox-144.0.2.tar.xz";
       locale = "dsb";
       arch = "linux-aarch64";
-      sha256 = "5493bbddc991d5ab5d06eedabaf5f02fd84025d6f1a82da8afed9f6328f707bc";
+      sha256 = "4fd77b40e1f13238e749b9a35b6589cc16b8e6ec8e7ea18ed8ca06124e0b9fed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/el/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/el/firefox-144.0.2.tar.xz";
       locale = "el";
       arch = "linux-aarch64";
-      sha256 = "6b568f4fad946f48037337e1304a9ed6c7a260555bee15df07891ea7f79622af";
+      sha256 = "1bd67f05938fffc3eb5b12bef39c5907a27a33a269f422f79cd4ae1d6b7e131a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/en-CA/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/en-CA/firefox-144.0.2.tar.xz";
       locale = "en-CA";
       arch = "linux-aarch64";
-      sha256 = "f306d9907759a68f18ed4376d6b095fc8058fcdd06240cb6c38d0b702b8906ad";
+      sha256 = "f1962db369ffbae87a6ce01e1067cd0984ae990bcedbb5d8c0fc48aa4bc818fd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/en-GB/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/en-GB/firefox-144.0.2.tar.xz";
       locale = "en-GB";
       arch = "linux-aarch64";
-      sha256 = "654f879bc895c0998a5b7db991a11985380e425ef4911420edd1c223d4f8b1de";
+      sha256 = "ad92239c1d5e9e24a4f7e3d96e226283699f7250f1b5429282d2d86a57f296a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/en-US/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/en-US/firefox-144.0.2.tar.xz";
       locale = "en-US";
       arch = "linux-aarch64";
-      sha256 = "4ef449ffc5af2972b1e91e2fc0753c3f5e103f067e42b7b2cc32f18ceb3a9591";
+      sha256 = "2206979f709bccc687193c5238cb299c7e0b16d0bc56cdd5326740adb8e324e3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/eo/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/eo/firefox-144.0.2.tar.xz";
       locale = "eo";
       arch = "linux-aarch64";
-      sha256 = "047ff72b370f4118e016761e844bb341730ec808991f4b3066bf7842875de640";
+      sha256 = "48f61836a0aaa25e263e395245de0cf556e368682c4cbe74716156478d10b4a9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/es-AR/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/es-AR/firefox-144.0.2.tar.xz";
       locale = "es-AR";
       arch = "linux-aarch64";
-      sha256 = "5771a469b1833014931b5fdfd2724a190a375b3ad79f1cb9cdf005ab33563685";
+      sha256 = "4038c0528d1d7852af8b402f54d9c817ff7859536f7753887c36f150cc8fb2fe";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/es-CL/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/es-CL/firefox-144.0.2.tar.xz";
       locale = "es-CL";
       arch = "linux-aarch64";
-      sha256 = "d4bbb66893b0bd9adecf1749f8b19bb5ced01b87e8c9120790291d6a33bf9b8d";
+      sha256 = "6fa9affd9c99aa98843882cdd63458f60bbbf965b8c8eb3c404f27469967993c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/es-ES/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/es-ES/firefox-144.0.2.tar.xz";
       locale = "es-ES";
       arch = "linux-aarch64";
-      sha256 = "ee01aff419aefbb0bf0f3e7ebe08f347bdb283cab5ada98274294e56610d4c8a";
+      sha256 = "ad850af7f9cff924ea48c8fecf5ff97b0cf4aed7f763a9802797610dd903c9b8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/es-MX/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/es-MX/firefox-144.0.2.tar.xz";
       locale = "es-MX";
       arch = "linux-aarch64";
-      sha256 = "ed784b215f1cfbf59ba1ac607212576e29118ec16599dba9c7256887eca65028";
+      sha256 = "365f61676faf611b15862febac8ff176ddff8fa79dd4e0f2bb04f3221e07b018";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/et/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/et/firefox-144.0.2.tar.xz";
       locale = "et";
       arch = "linux-aarch64";
-      sha256 = "e339ba56ea317d17157c91503b519495ac71fa3cfa09d2625df0c800e1b86dfc";
+      sha256 = "e72df1edfc99aa3e9e39dcff27db54ce55f39cb6cdd6ec9fd0e8e42d9405a1eb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/eu/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/eu/firefox-144.0.2.tar.xz";
       locale = "eu";
       arch = "linux-aarch64";
-      sha256 = "0fcf3b03d405a38c95b47b91b845cf27d3f700cd2058241b90b4b3c45f085194";
+      sha256 = "4450a44c0f4e229b739ff2e3c1085f254a2b7f826f16017f4ac654e1f668efcd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/fa/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/fa/firefox-144.0.2.tar.xz";
       locale = "fa";
       arch = "linux-aarch64";
-      sha256 = "74c76c31b4687e4fecff55b6e26bc9c3570ee99e6c3b0715eb362dc6bbb0ff97";
+      sha256 = "2f058dded29d181a1b5ac97de227369cc3ec74e84fab06614777065246193544";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ff/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ff/firefox-144.0.2.tar.xz";
       locale = "ff";
       arch = "linux-aarch64";
-      sha256 = "07a7ec35c7553d60229b9d8e7c9b54f2a555292386e6715da953a839d6c97fe8";
+      sha256 = "a15965d38a97347f00b7ab2c7e2cd7fffe12adbf91d4e6b2aa1e8e7583bfd24b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/fi/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/fi/firefox-144.0.2.tar.xz";
       locale = "fi";
       arch = "linux-aarch64";
-      sha256 = "7a9727431bd9396cd96ce6914ebf375caf0e64023a047497e5ef68c18da42ee2";
+      sha256 = "5c719d0e332cc47c4cb7c3cb84f07808c8382fb71d2cfea5b96583c8ab8f5b88";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/fr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/fr/firefox-144.0.2.tar.xz";
       locale = "fr";
       arch = "linux-aarch64";
-      sha256 = "6eafdeac0ea54c6179f36de52e1c0803671b95bf765934c3defe70276bb3e5c8";
+      sha256 = "d3340d892081d122179624384c3a97bea9c30af769bc12ad12fef8d08cf40d22";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/fur/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/fur/firefox-144.0.2.tar.xz";
       locale = "fur";
       arch = "linux-aarch64";
-      sha256 = "9d0156949f2a98102f496bca1c657e6dd064562a585c3bb174c89bf2081198b6";
+      sha256 = "3bd30e834673c7ac89435b59645a00944d6b4034b6639124bcd4d3ec34dd35b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/fy-NL/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/fy-NL/firefox-144.0.2.tar.xz";
       locale = "fy-NL";
       arch = "linux-aarch64";
-      sha256 = "09ae16dc09de7e8de85e4dcc9f3be262eb09e0f088be3ab90263d20b7b381eb4";
+      sha256 = "7f4ada0986dcb7c6d08be19c68cb8234332aa3c4efa2c8478ae14bbca3365b0e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ga-IE/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ga-IE/firefox-144.0.2.tar.xz";
       locale = "ga-IE";
       arch = "linux-aarch64";
-      sha256 = "96bd17c277097ec766b6b980c79654c506d783aa872ae60006da771ac20fe522";
+      sha256 = "1b2605055a52a23ef6e8971dd5ddd50433158f9cc37ebfdf6f14fb36adbbeaa6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/gd/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/gd/firefox-144.0.2.tar.xz";
       locale = "gd";
       arch = "linux-aarch64";
-      sha256 = "8fc9ba4ea83184be945363a329ea58c8104b9330b8de3315068a87189e380d72";
+      sha256 = "bf897afeaf9d1b5d8b770c639f53cc14b0f46a9080dcd222d8e674ca81b4770f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/gl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/gl/firefox-144.0.2.tar.xz";
       locale = "gl";
       arch = "linux-aarch64";
-      sha256 = "2c05e4b1b8d5fdb332d2ff6715a87c1e4917c238a92baf459a402ccf5d905147";
+      sha256 = "e02ec017aaaa135e38e4219941603589aacde9ac1e28861b7bef3b90f897ba42";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/gn/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/gn/firefox-144.0.2.tar.xz";
       locale = "gn";
       arch = "linux-aarch64";
-      sha256 = "c691a83597cadf1f552b496a5d0d0f325682b1ec8db3273f3dc4b7b97c2b0903";
+      sha256 = "ada1b5d56386eff6c8de047e153576acb31ed6f61f8faaffdbc7798100f421ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/gu-IN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/gu-IN/firefox-144.0.2.tar.xz";
       locale = "gu-IN";
       arch = "linux-aarch64";
-      sha256 = "a1dd3e60f7ccfaec8aaade12fd6daf3137b4efe077bc0eb2c8e3f23ede3dbccc";
+      sha256 = "48f4b1875e81598db4bb9a7429232f03d75298e36aaada8238c6f608ef26d581";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/he/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/he/firefox-144.0.2.tar.xz";
       locale = "he";
       arch = "linux-aarch64";
-      sha256 = "a1c61306257dab570c29c53fd4dca842a58657a816988d8154e1ce550ee2768a";
+      sha256 = "37ad4cba65ae77673fb8f825bdd8c81d0ad35450da2f026b11d355b4e996dd52";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/hi-IN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/hi-IN/firefox-144.0.2.tar.xz";
       locale = "hi-IN";
       arch = "linux-aarch64";
-      sha256 = "d9406932b45a393fed2e9709de9ed947cc7047bc945c287e801bfea30ffc1fac";
+      sha256 = "9314f27f0e2f7645f512101a57437f8dc1d3473114297bf1cfe658b95499223d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/hr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/hr/firefox-144.0.2.tar.xz";
       locale = "hr";
       arch = "linux-aarch64";
-      sha256 = "967434bc928f4ac864d8927ee343c004800a626eae99244da25dca5568063195";
+      sha256 = "c5fa96303a4705d405a589e4067ca92d946308afefa815a8902e32ba5b347b91";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/hsb/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/hsb/firefox-144.0.2.tar.xz";
       locale = "hsb";
       arch = "linux-aarch64";
-      sha256 = "b08dc9846037f228cf8a370109320f24036c9c2370781f9e66585cc0f484ce33";
+      sha256 = "dfdeb6d88379e22b9d17a7b7851fe35ceae2b343c160cc5d8eff0c34376ef77d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/hu/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/hu/firefox-144.0.2.tar.xz";
       locale = "hu";
       arch = "linux-aarch64";
-      sha256 = "3c6d102b6510dd20156f5491226c8daebe93d21f48cf20763093d6006c30b91c";
+      sha256 = "74d50886eb50d7d127ace85c8007e1e417a18e50053a804dab3a5abd9497df2a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/hy-AM/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/hy-AM/firefox-144.0.2.tar.xz";
       locale = "hy-AM";
       arch = "linux-aarch64";
-      sha256 = "44d305c5295833d3cacc99e5270c8788a894a210df4a469baf4e5bc1eecf9c28";
+      sha256 = "a55a0e50e12c7521c176fe70b13c4dbd9370b326b3519638afca181d5914978a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ia/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ia/firefox-144.0.2.tar.xz";
       locale = "ia";
       arch = "linux-aarch64";
-      sha256 = "69fa736947780cc6274bf7ab828102acc5df4ceac1114e61c8dd470205805caa";
+      sha256 = "749f237834b6780f9b6266d9cc64a84c0370839006f787ffd0fddddf4444131a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/id/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/id/firefox-144.0.2.tar.xz";
       locale = "id";
       arch = "linux-aarch64";
-      sha256 = "cac310d27ccb503aebd63f021458e75e1a560579984893516ec54328e36dbe1e";
+      sha256 = "622678dd1c86cd7d2f62555896256abc494f19f37ef9c71acefc5d13e64ad709";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/is/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/is/firefox-144.0.2.tar.xz";
       locale = "is";
       arch = "linux-aarch64";
-      sha256 = "cc351c14e000d4f09244e8c2bd4309c6dbb2954ef29f451454591f6ae7de1be1";
+      sha256 = "36c7b6e0ee07fd3d51d151f5ce2537f2f93cd2f2e172143cdde2cf9c48b96211";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/it/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/it/firefox-144.0.2.tar.xz";
       locale = "it";
       arch = "linux-aarch64";
-      sha256 = "ffe217b8c0c9be1837bf9baddee817c4a4b8bdb65fc54c76f4ee999cc0b1818e";
+      sha256 = "8d7928ecc4c353f6d89e0eee6badd26d4b1252e00e9dcafe2bc1dfc03a5b8ffd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ja/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ja/firefox-144.0.2.tar.xz";
       locale = "ja";
       arch = "linux-aarch64";
-      sha256 = "6ed97bcf1f73aea3b3ffe0c9cfccfef39c5c952aabfe32f43a8d2ffef9f5bdc2";
+      sha256 = "a1cd0d20229ceb468a3a902d08f44f47930e03ba4831033c3386296d2b60f13e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ka/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ka/firefox-144.0.2.tar.xz";
       locale = "ka";
       arch = "linux-aarch64";
-      sha256 = "aad03ca002d39d0fb6daa83e4981567a380b793e5ad1f145a42210b9e508eb4c";
+      sha256 = "20852aefa99c2f156238fc22bbd0bde27e5667fb21da4d20fe19d0565565ad79";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/kab/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/kab/firefox-144.0.2.tar.xz";
       locale = "kab";
       arch = "linux-aarch64";
-      sha256 = "b7070d75bd21ed5dd3d0c41210d60da6dcdae91813ea2d133bbdb787a01e8a42";
+      sha256 = "443a672ef160170593fac4834b390fe64bea9f66e440cad06b9772f532c3b69e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/kk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/kk/firefox-144.0.2.tar.xz";
       locale = "kk";
       arch = "linux-aarch64";
-      sha256 = "88861dd252e896921f408bc3fabd61a1389df73fa52bfc10925f6102829a349f";
+      sha256 = "64e0b26a4a306ffcac30f3481cf93f81ceadbb880b2df6f82714f07f226f1da9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/km/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/km/firefox-144.0.2.tar.xz";
       locale = "km";
       arch = "linux-aarch64";
-      sha256 = "4dc643aced535bd03c5ead74cbd88dffddd7b50f6e8b17ea3d4d200cc12c7e6e";
+      sha256 = "baff9398eae07c75b59073c13c8808142bf82946381ca599491b1ac7de6eb6e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/kn/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/kn/firefox-144.0.2.tar.xz";
       locale = "kn";
       arch = "linux-aarch64";
-      sha256 = "2084841b8e6817ed29b023c1c2ad2f36807f14522a9e7cf71b3ea8fdf77682d4";
+      sha256 = "3a90204a0cd82455854e531823438f9653d6164e11f19dd7dd3f6efdd2ee9456";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ko/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ko/firefox-144.0.2.tar.xz";
       locale = "ko";
       arch = "linux-aarch64";
-      sha256 = "17da54729e21788cc64df81db2afda2c7ec3be4674f74cd8ba357a76943f89bf";
+      sha256 = "7fc3de510e9d77df6890214c2423724f6430adfca4618dd41974e200444012f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/lij/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/lij/firefox-144.0.2.tar.xz";
       locale = "lij";
       arch = "linux-aarch64";
-      sha256 = "0a8c3b2249f27c1929edbf53bdb0654260ca13692a52d18dac053bc771655fb1";
+      sha256 = "fe72000de02e168e1842c8b358d0e79b83027c4ca0b483ed961c677c8799a568";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/lt/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/lt/firefox-144.0.2.tar.xz";
       locale = "lt";
       arch = "linux-aarch64";
-      sha256 = "58ab2d3bcd5d70c88221826fff86f74de06b71c226f4c4b3ee6d49d7a5178125";
+      sha256 = "8cd0a3904280044ac27be7f7a41f213d3615e9a944280fc99022fbcad2db9739";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/lv/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/lv/firefox-144.0.2.tar.xz";
       locale = "lv";
       arch = "linux-aarch64";
-      sha256 = "910494fde942523b4611dd7776e51f3443b89683a7750782c08e904c435c1380";
+      sha256 = "bac75641e144591aec642ed9d7f43baa225bed8e8dfe2f18b030b2297de6307d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/mk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/mk/firefox-144.0.2.tar.xz";
       locale = "mk";
       arch = "linux-aarch64";
-      sha256 = "73302c4e3967b18380f2bef3fb0b5f2e2fe9874231a541bf4880b37f0b1b7f5e";
+      sha256 = "5ff8ec59af2c4a4372f7d464f3349ae20eefaddc0fe240cc4dd6413de18d05ad";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/mr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/mr/firefox-144.0.2.tar.xz";
       locale = "mr";
       arch = "linux-aarch64";
-      sha256 = "35a622225a1f49415c65ab91b0c0b632c7ac9d51e05d7c5dd348237c44fd919d";
+      sha256 = "c2b35e8d3b65b8f135e32e99e9ec4dfc6e34f1e618eb0b8f9818d4446f34cfab";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ms/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ms/firefox-144.0.2.tar.xz";
       locale = "ms";
       arch = "linux-aarch64";
-      sha256 = "eb4beeabd1dfa0cec6095da3b89652488954ef9dd3b7d324457c0570bb1ba4d6";
+      sha256 = "6a2e16593d9878fed8cc9ad3586a4ae3621aa146b1bf06eb5309b5e62edfcbaf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/my/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/my/firefox-144.0.2.tar.xz";
       locale = "my";
       arch = "linux-aarch64";
-      sha256 = "deb2c6c5c54e9594ace400e05745d3dfae771393836433bfb8813a92f843b2c7";
+      sha256 = "740baaaf886fc64150880c403d88ef068bf3eb17dcc4a178c281db47fccbf261";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/nb-NO/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/nb-NO/firefox-144.0.2.tar.xz";
       locale = "nb-NO";
       arch = "linux-aarch64";
-      sha256 = "c83b00cec208387a2f2d066a88f28b7e1ce8c92cd7c3047c89e7c18b25ddcd80";
+      sha256 = "6d56cec362cb924ee7f76d4b8bec19a714e0ac79214e7ed2787da67881de71c9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ne-NP/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ne-NP/firefox-144.0.2.tar.xz";
       locale = "ne-NP";
       arch = "linux-aarch64";
-      sha256 = "f260a14d11ad67959b9553cbb605ccceb91f16558aa04a782070a5612cfc69be";
+      sha256 = "e270e47111cc4395ccc068a5f1594d784468b5bc3f0cce120ac88abd31dc3eac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/nl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/nl/firefox-144.0.2.tar.xz";
       locale = "nl";
       arch = "linux-aarch64";
-      sha256 = "4e50397759820ca0806e7a5767b5813cb7e3af58b5ecfcd0c4813c58b99ac392";
+      sha256 = "0b8be00e56be50fde136d96992e5e564be10233de6ad90b2ea3356af2d09e56f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/nn-NO/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/nn-NO/firefox-144.0.2.tar.xz";
       locale = "nn-NO";
       arch = "linux-aarch64";
-      sha256 = "fd498a5b0d348b0ca8c36b69cc81efd5e6ea79291b5ceacd6fbd56b603abff8e";
+      sha256 = "0a1dd7574e494243e1b401adeb786a92c5259fd5affbdc7ee4703d8fa3d0949e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/oc/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/oc/firefox-144.0.2.tar.xz";
       locale = "oc";
       arch = "linux-aarch64";
-      sha256 = "cddd6d64c16f924cf0f3682c04f883eae1b0a65b7d020d236628ea0218ac86fc";
+      sha256 = "0a4f22f941aa56fadcc5533b9312f1cfae340f9a62335cafa8e47783747a0fc0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/pa-IN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/pa-IN/firefox-144.0.2.tar.xz";
       locale = "pa-IN";
       arch = "linux-aarch64";
-      sha256 = "ba9537658679d6aca5f03bd22439dfedaf2949dac92870ee5bd2db10317ac3f6";
+      sha256 = "321f7bbb801d6d2aec74a9a3549671849c0eac473a526f9494f2c76950243bbb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/pl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/pl/firefox-144.0.2.tar.xz";
       locale = "pl";
       arch = "linux-aarch64";
-      sha256 = "79cce7cf2edee1cb1a22a00e598718103ccb84966a9dbc4a4d21c78f151fdd88";
+      sha256 = "75acf6189febeacbaa7ed3b03fe16db0ca1a9b6f10c88012cbacf24e3adf4bdb";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/pt-BR/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/pt-BR/firefox-144.0.2.tar.xz";
       locale = "pt-BR";
       arch = "linux-aarch64";
-      sha256 = "b021bf8f42b11c964cf660d7f3c2ae8e7f21c70623ed0da4831f5942953de4bf";
+      sha256 = "bb1a100bacfeaa1d906f552b799861b4bf752b64334813269afbb650df841fc2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/pt-PT/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/pt-PT/firefox-144.0.2.tar.xz";
       locale = "pt-PT";
       arch = "linux-aarch64";
-      sha256 = "1373e0fa839939e0c40d378e4c2ae3e0d324ea53c842b2483ff8c9c33999410d";
+      sha256 = "4cef73eb6bd8dac6660a15b413c8545168afcb700a441a5004ff47bf43744116";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/rm/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/rm/firefox-144.0.2.tar.xz";
       locale = "rm";
       arch = "linux-aarch64";
-      sha256 = "cabed3fb21c46d774c88d3841a7861559a8709ec7bd0df3de81d8b29a0b053fc";
+      sha256 = "3f34c4814b434a97c07be2efbfa48eeef78eacae80e67aad87f73c9b19956bff";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ro/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ro/firefox-144.0.2.tar.xz";
       locale = "ro";
       arch = "linux-aarch64";
-      sha256 = "eb5aa563f2b31d8f6c1ac1b5cd9f110667a376d21564d492d7595c3237af495e";
+      sha256 = "0f2d5b75c50a923427c88992d698a411d754c7e8f531da972ab42326aebaca98";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ru/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ru/firefox-144.0.2.tar.xz";
       locale = "ru";
       arch = "linux-aarch64";
-      sha256 = "b77c8bebc17033e2aab6d1e1f56336a4ba6e36dc303979fa55bd64701b1643c9";
+      sha256 = "5a51d3234a56c7a4bf56671f4d7828b9690ff14d3f6a025685a22d022ee805c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/sat/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/sat/firefox-144.0.2.tar.xz";
       locale = "sat";
       arch = "linux-aarch64";
-      sha256 = "7432b1298fa9d71e781b3751f54c2f28420a2f2eeaaf89ef6e4268fbbb0d4a47";
+      sha256 = "c8571a71dc975c60af0232c8542065f401deac714d6f7bb8fc9ce846ab34b229";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/sc/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/sc/firefox-144.0.2.tar.xz";
       locale = "sc";
       arch = "linux-aarch64";
-      sha256 = "408f80bed47bd8f73d5bc4b02d182c81c166ee56caadf03d908685fa2338e819";
+      sha256 = "5dbb848fae2294e1265f79f70aecc88b4940398e9935c1d8310892f233369288";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/sco/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/sco/firefox-144.0.2.tar.xz";
       locale = "sco";
       arch = "linux-aarch64";
-      sha256 = "96bd897c26ff462b13e3fb4752910ec4cd4c0b73cf60470aaae02a252b67c6bd";
+      sha256 = "ed05a7743123632c945153226a4976c49c7b891eb27b11695f67058e8c379c07";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/si/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/si/firefox-144.0.2.tar.xz";
       locale = "si";
       arch = "linux-aarch64";
-      sha256 = "a021fc38960791bfc5d4eb55cda526762f04e899a14c38da57bce64ed389ed6a";
+      sha256 = "97aa03f4dc9c0b761c68af64ca7aa3623afb7f38ed9994eeb573360e803dc510";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/sk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/sk/firefox-144.0.2.tar.xz";
       locale = "sk";
       arch = "linux-aarch64";
-      sha256 = "96aa9368a4cbed0e63222314c550ed3c63b47c175408a46cbd91099d529154ea";
+      sha256 = "0c6d4af97b31a355f8c9104bbb57df4e94f3640b4c329d560c28b96eebb76991";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/skr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/skr/firefox-144.0.2.tar.xz";
       locale = "skr";
       arch = "linux-aarch64";
-      sha256 = "968aac06dd991cf7dba4b691e759cf68ecfdb9756dfdccd02acc344d07cce86e";
+      sha256 = "4f73ead3ce7f65e282b03ef99f3acc4a812530640b4950bfd79b4daaff2c0c26";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/sl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/sl/firefox-144.0.2.tar.xz";
       locale = "sl";
       arch = "linux-aarch64";
-      sha256 = "40d305693c7c9f241533fccf6f2f8a537badffcc621377d7e8338c09dd7364c6";
+      sha256 = "af79294db660a209a97c9abb7cfdd2fa6638e9be92fc3b104c1495547c0a3d96";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/son/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/son/firefox-144.0.2.tar.xz";
       locale = "son";
       arch = "linux-aarch64";
-      sha256 = "dd28d86b98f4ce5e65fd905b2f1563ceb6dfceab88702cdb842c91586afee0cf";
+      sha256 = "55388851e113f1b2bb4572faf4bed5f4e940a33a4c6e9ca021900ab198aca5af";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/sq/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/sq/firefox-144.0.2.tar.xz";
       locale = "sq";
       arch = "linux-aarch64";
-      sha256 = "e1560d11ef6e460109a009d12bc759e3fbfa164916164c577d146b5af6189db1";
+      sha256 = "359bacaaf2d2b22d3775fea9c5c370c700a0e75ba6f982c4df00381adf8f9138";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/sr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/sr/firefox-144.0.2.tar.xz";
       locale = "sr";
       arch = "linux-aarch64";
-      sha256 = "ac99527789e4e43f7bc177b6f97402c906dc25bdb4ab2579e97f911b0dfd9d81";
+      sha256 = "82da85b20b9d073101182c77474d4b72fb0a714f93c96e2b5faa1debd32c2160";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/sv-SE/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/sv-SE/firefox-144.0.2.tar.xz";
       locale = "sv-SE";
       arch = "linux-aarch64";
-      sha256 = "f9a9bc817cbb035f83ef8beead78f7cedfb59f329fff6c5a33bbd97b73b79552";
+      sha256 = "49c8135c26b17439669211570342034d0d2014c9ef51ad0928d47ed13a7c1e62";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/szl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/szl/firefox-144.0.2.tar.xz";
       locale = "szl";
       arch = "linux-aarch64";
-      sha256 = "5675dd4ec15275841d777e277d7522c36ebc82fa80c41da9aa4741f7e81d9679";
+      sha256 = "45ac47e291ef9ab2a62a7d6e98f88bf322fc87025d1b218cc1c71fa73db6cf35";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ta/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ta/firefox-144.0.2.tar.xz";
       locale = "ta";
       arch = "linux-aarch64";
-      sha256 = "73a7fac61dc3b896d8b125dc849a9ecb3aee1b600222938938f1d007b3470655";
+      sha256 = "0ff47ccd6e495865cfb22eef3df1114cd8c73102aaf1ddfb437fb994c40c3794";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/te/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/te/firefox-144.0.2.tar.xz";
       locale = "te";
       arch = "linux-aarch64";
-      sha256 = "c90da176f9861e91570497b3c34b863167439cd2264a64930c8728672b4f79e3";
+      sha256 = "fe876921a313a6bf3b1204bcbb3765ba5491467862ed2963823935f4bbea248b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/tg/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/tg/firefox-144.0.2.tar.xz";
       locale = "tg";
       arch = "linux-aarch64";
-      sha256 = "f229c636cf344ad9b0b5a80e66b436a879b1066e89bf66630f7a8b3ecdc5787b";
+      sha256 = "c6dc6eaa11851f1b0987840faa140e552844abf936eb22f8b7c3726843c25390";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/th/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/th/firefox-144.0.2.tar.xz";
       locale = "th";
       arch = "linux-aarch64";
-      sha256 = "8941dc84be5d30cf7af79a498ac722cecfa22fa86efa42d003781b81d31b5b3f";
+      sha256 = "9c146b5997fe2ff2d3645cc2196480e63d7021a89f75e114d4f477d469ab6a9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/tl/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/tl/firefox-144.0.2.tar.xz";
       locale = "tl";
       arch = "linux-aarch64";
-      sha256 = "e68485dd4c47c886a0b75d1aefc99e47219c4de7b3da9d7471e97f491a5a0009";
+      sha256 = "b930af8df1eb8f7f3725b92e926fd841ffc13f24af5a17aa6e88082bfacaf081";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/tr/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/tr/firefox-144.0.2.tar.xz";
       locale = "tr";
       arch = "linux-aarch64";
-      sha256 = "48076d8ad971333a824afd6d5e5021a196a6c8b916c130c1709b148f26e3124d";
+      sha256 = "2dac88705bd1c8e68998dedc426883b3625816f23bd5c544e5ec5c362fa4eaec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/trs/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/trs/firefox-144.0.2.tar.xz";
       locale = "trs";
       arch = "linux-aarch64";
-      sha256 = "3c8deda2c9a4a398c3d51210e36c2d4759e988ee3580e1f561ad1f881d8d485e";
+      sha256 = "f74ee12d8d2e177cc1163f7d6ccab6c9fa07d0ff588ac4fac7b7434d4eaf5d06";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/uk/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/uk/firefox-144.0.2.tar.xz";
       locale = "uk";
       arch = "linux-aarch64";
-      sha256 = "0a2c77653fe2775cd8c782f4650e4777fc5f1d5824f02d5bf7fae5fbd2486c31";
+      sha256 = "fd985ad21dca19a790434240af067e822aa089a1bfc148c26e06aa44a84a5a9e";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/ur/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/ur/firefox-144.0.2.tar.xz";
       locale = "ur";
       arch = "linux-aarch64";
-      sha256 = "3af39f96710ea7f5390192f833a3d5e20158dfb3cb8f5096ad7ccc8db4b8988c";
+      sha256 = "487c28f6cc97e275f8aef94138c8561787ed49904f88e16c4b4df59c22908fcd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/uz/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/uz/firefox-144.0.2.tar.xz";
       locale = "uz";
       arch = "linux-aarch64";
-      sha256 = "390936902fbcf7145863b249fd58ac3ae76c0bd46f518b73a211354d022f23b2";
+      sha256 = "72ce0909f74e9ef9a48dda4c86d8e5693771c818765dd86ae52bbca8252f5f67";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/vi/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/vi/firefox-144.0.2.tar.xz";
       locale = "vi";
       arch = "linux-aarch64";
-      sha256 = "0c4f5df8a4708990b6b6f4806fed323f031e14faa51a8120e42471b2003b5d8d";
+      sha256 = "b303b06fa58de68d591f5e9de9796425de9fd7836916087591499be5110d5869";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/xh/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/xh/firefox-144.0.2.tar.xz";
       locale = "xh";
       arch = "linux-aarch64";
-      sha256 = "e2c4814ccd47e915200d59076c5bd1dde4c1ed1ccd2e239897e1bcce02791ffd";
+      sha256 = "a8b5968c3fd7df7c999f900d2fecdf57c3c2e5791730c8d112ce7b60dfc79e3c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/zh-CN/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/zh-CN/firefox-144.0.2.tar.xz";
       locale = "zh-CN";
       arch = "linux-aarch64";
-      sha256 = "8a5bfc84936fd37a02d420aef0de6f51912e3b7f53562f63dd969ec0aebcc17a";
+      sha256 = "651b38321cfcf9c1e787d6b500f9c5bc1386cbbdfc1799ba69ab82fe53ff58c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/linux-aarch64/zh-TW/firefox-144.0.tar.xz";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/linux-aarch64/zh-TW/firefox-144.0.2.tar.xz";
       locale = "zh-TW";
       arch = "linux-aarch64";
-      sha256 = "b9b7f5cb3a60b5cc44bbaa92b8a5bb570ecb54c506494815e8a5bcb617a43c6c";
+      sha256 = "f4b7d0de26eda1c1cb6079d84cc5416d2406928cd0cdd87aa2e4f76f8b85f001";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ach/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ach/Firefox%20144.0.2.dmg";
       locale = "ach";
       arch = "mac";
-      sha256 = "4276b946e9fdb3d002055282ed0aa7f8a1e2543b940dfa3f0bc1bdc2bd9085cf";
+      sha256 = "7a9ce1bb8395f49647e691632e3d32d779f99eb1623b561812ed43d26d8be3a5";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/af/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/af/Firefox%20144.0.2.dmg";
       locale = "af";
       arch = "mac";
-      sha256 = "2f8ab55d6fb725508cc11111511e86a4884ab7b49c4f97f10fd90693079bcf67";
+      sha256 = "c7dfcfc6e62f11abf00fab9f2093ec0601a5a8066911bd33c24c5a936d538e8f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/an/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/an/Firefox%20144.0.2.dmg";
       locale = "an";
       arch = "mac";
-      sha256 = "1d588447cfd14c3d6a265731bf98878a2cfc2ec64696042fc6997a8436b77414";
+      sha256 = "693cdac108fe7680a676d4fdf36f63a8cbcbf4dfde51c2bc3e27157ec815f90d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ar/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ar/Firefox%20144.0.2.dmg";
       locale = "ar";
       arch = "mac";
-      sha256 = "b1bcff90539f56d2fc2711ffd0f45b9c5f9f0794ed48719a10a1756f987777ed";
+      sha256 = "959b68b21517d9d1e8192be25611de1424b725f99f995c709763a36db3755854";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ast/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ast/Firefox%20144.0.2.dmg";
       locale = "ast";
       arch = "mac";
-      sha256 = "87382b1b361221171e7ede3605938c16547ae4ec953bf23b3fc22b8f4a82e81d";
+      sha256 = "4ebf24cff0c330f01edec369663fd5baab7eb0c5bf3dc7e1fbe43a2adcdd039c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/az/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/az/Firefox%20144.0.2.dmg";
       locale = "az";
       arch = "mac";
-      sha256 = "319e3dd31b582bed12ff29437d9a3f41f4f67566ec8b5a30490035d1cfd3f53a";
+      sha256 = "a65dfe53524352938256f8b805b8aafa5e7197a3cf5a3400ec8bbd8e435dbfaf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/be/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/be/Firefox%20144.0.2.dmg";
       locale = "be";
       arch = "mac";
-      sha256 = "78596d7c4bb996d7251c58f13ea064ec1351337daa6e36ebf31cd59f4f05ddb3";
+      sha256 = "058a574583b7bbec515695e3f898bae96319ec9940ee871a033b2abb4d84c587";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/bg/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/bg/Firefox%20144.0.2.dmg";
       locale = "bg";
       arch = "mac";
-      sha256 = "fd8a6094da140a56d4dab7b8a21cee40604d0034bb9b042d0df9b3d1c83b4e0c";
+      sha256 = "d0c5f95fa371bd163cd02207744c26d39b1b3339360156396dfb5532d498eb8c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/bn/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/bn/Firefox%20144.0.2.dmg";
       locale = "bn";
       arch = "mac";
-      sha256 = "69488f334bb8b2656348dc7f22dac1d12c32981c20592c1ce76208175d543a05";
+      sha256 = "c3f90353e9ac074160432072fec14aea4b4d09efcd1ac9fd459c3065c204d67a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/br/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/br/Firefox%20144.0.2.dmg";
       locale = "br";
       arch = "mac";
-      sha256 = "a7fbcbc187aa3216e90556802f7154912c9b4cfce5a829f6b20c578d9beb5181";
+      sha256 = "dd5a4a324b2f314fd1d5644c395e37873e898b7621b29bdae5992bf3f1df17b6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/bs/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/bs/Firefox%20144.0.2.dmg";
       locale = "bs";
       arch = "mac";
-      sha256 = "6cc071934a0d80f144883477294c45d71f43bd30e065c483dd6f7c0cac0554b5";
+      sha256 = "948226df4c000ff7c4604d67e5b097a7415c977413f16314acdae621ca51bb46";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ca-valencia/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ca-valencia/Firefox%20144.0.2.dmg";
       locale = "ca-valencia";
       arch = "mac";
-      sha256 = "76aa9af0cfeb14264edf64162b7d0e9419ea5267c3217cbd4da31d2ed7391468";
+      sha256 = "38bc2b0650e150c0681e32e799406dc4541edc79e3f1f1b0157bd3db07e26767";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ca/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ca/Firefox%20144.0.2.dmg";
       locale = "ca";
       arch = "mac";
-      sha256 = "5b9317700e19061b0dcc582218ee2a49b910a6df4150821dd7a92e752b661217";
+      sha256 = "e6b1c9c5f108769820f8cc42421b79c786716e4ddef85c71455f4c09aa976a7b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/cak/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/cak/Firefox%20144.0.2.dmg";
       locale = "cak";
       arch = "mac";
-      sha256 = "afe6b73514ae263bbbbac0fc512c9eb68a2fdfda5707ecb8a91fb6e759a750b2";
+      sha256 = "eec02351b2b1f78954fb1c9334cac67d13d45889e9522d4bc565bfe45334a7bd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/cs/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/cs/Firefox%20144.0.2.dmg";
       locale = "cs";
       arch = "mac";
-      sha256 = "a6c5c8d8dacd797287e61c4e4df0ca6e80be7f80f9c17b09929f486c02922a80";
+      sha256 = "62e1c999f3f9d94f7a91f49db871fb06c6bc9d2685e243765eb7dc2c81902ed0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/cy/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/cy/Firefox%20144.0.2.dmg";
       locale = "cy";
       arch = "mac";
-      sha256 = "065d475b851901fff7de64baa4cfb0be6179ffe0526dbb23e994b4f7e3bc1476";
+      sha256 = "1e3ee62c6ed2c9f0fcf6bf87520451d60ece74b050fd5f9d118873ee3a4517cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/da/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/da/Firefox%20144.0.2.dmg";
       locale = "da";
       arch = "mac";
-      sha256 = "98bfa21c2fc04073a9c667c7f41fbf69b983421197f9b60b52ca02012d98e818";
+      sha256 = "61b653dac4e3bdc41475a37b2bf013dd6b1a7229c16a4037c97098172da69ab8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/de/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/de/Firefox%20144.0.2.dmg";
       locale = "de";
       arch = "mac";
-      sha256 = "8a899c5771a0093b1a69acbc67d3a3a0371ed0a8f2b5ebad649c82cfd3fa3a78";
+      sha256 = "3804296264d2b3eebd8b882d8065da45060edd738b9fbef39295e852463230e2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/dsb/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/dsb/Firefox%20144.0.2.dmg";
       locale = "dsb";
       arch = "mac";
-      sha256 = "673bf924d975d448b96ecadd6dc08a32d199a6f70f35a559fbbe63d630d2d930";
+      sha256 = "45374fcacf60d97ece40360e3c9301737fa5e30de089446b1e0b78164d2c7069";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/el/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/el/Firefox%20144.0.2.dmg";
       locale = "el";
       arch = "mac";
-      sha256 = "5ba4f0c5fd7d62dd215cf24f7672706ffa15af601c4fa0909f6406018b7c2d47";
+      sha256 = "1d946b84b13915b56e1ca58d2a91e2e31a560ff3d987e2d71094101e66faba55";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/en-CA/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/en-CA/Firefox%20144.0.2.dmg";
       locale = "en-CA";
       arch = "mac";
-      sha256 = "2b7079d5096dacb58ee126b3471f0c3f18fc6aef98c3347148940b8329069e04";
+      sha256 = "7611eede075757116e5e10e1986e4d26bbcddc2d5c710261f65be1b99050fa47";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/en-GB/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/en-GB/Firefox%20144.0.2.dmg";
       locale = "en-GB";
       arch = "mac";
-      sha256 = "2a56a7d5364a352c21974fb8ad4ee2537a77382827f3e8c0611c297061523a1c";
+      sha256 = "b3fa73254a255372da7ee7803f7680715b9d0edc8916268779d92495aeefc81c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/en-US/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/en-US/Firefox%20144.0.2.dmg";
       locale = "en-US";
       arch = "mac";
-      sha256 = "1e444b80921bc999d56c05a7decc1eaf88c0297cac5b90416299af2c77f5ecc9";
+      sha256 = "c67e649a9ef2d23c929ca1b9a87b10591e06303cdf0d9e2395e64bcf7bc0f673";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/eo/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/eo/Firefox%20144.0.2.dmg";
       locale = "eo";
       arch = "mac";
-      sha256 = "5ffd379725835541e75757476fab0391b8bbed08a56cf0a8103656dbbd4d200e";
+      sha256 = "cd52fdaa3ff67a7e2b32e028cdf8ebe3c5257d28a7d6f10d31532fa0f0c1469b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/es-AR/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/es-AR/Firefox%20144.0.2.dmg";
       locale = "es-AR";
       arch = "mac";
-      sha256 = "42bddd11b033a4e46644826a96eb36d4b1427b59472e108fe97afefcf99c9ac8";
+      sha256 = "6f21eb46f02ab9e531c2296c81e9498e9e361360d6ed1415d81b634ce87e8081";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/es-CL/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/es-CL/Firefox%20144.0.2.dmg";
       locale = "es-CL";
       arch = "mac";
-      sha256 = "fb51f95601673c5fc3aad32b503c1421b4fd476fb18606e1e251341098c7e120";
+      sha256 = "8581f22c0c8800a16568b1468311438c9756511cf5f4e8c0980434734bda1d46";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/es-ES/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/es-ES/Firefox%20144.0.2.dmg";
       locale = "es-ES";
       arch = "mac";
-      sha256 = "8bfbc38a15c62a47513dc591dbc5eda1c0ae6104ce542ad2221e81942d1a6f4f";
+      sha256 = "4aeb90c31abf0641205730e43171e76b53bc01f13addfc6f463e6c48a4ce949a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/es-MX/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/es-MX/Firefox%20144.0.2.dmg";
       locale = "es-MX";
       arch = "mac";
-      sha256 = "4ebbea288a29e4fe600bbc30b5d88cfecfe6f862a9e71146b930e5213bc05769";
+      sha256 = "9a1be5e56bed32527a9fb1d7f507346c75e32826625f4fc11d771064a87dba45";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/et/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/et/Firefox%20144.0.2.dmg";
       locale = "et";
       arch = "mac";
-      sha256 = "1035ff3369fdfd4de1f47788d57a76d68e2c97deda16ca20c32ad289bee9e743";
+      sha256 = "d2ea753f8fb71ffe24d4d53f92daffcf82c6a4b50843db629ee1af7b815942ef";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/eu/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/eu/Firefox%20144.0.2.dmg";
       locale = "eu";
       arch = "mac";
-      sha256 = "46a874673321699a38e2a7f8fc7f4516ddc3b328061338ed54abe2b5ea4709f9";
+      sha256 = "d1fc326e7434b5436eee91f9f570f4c22529bf7cd846599181452ba171407944";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/fa/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/fa/Firefox%20144.0.2.dmg";
       locale = "fa";
       arch = "mac";
-      sha256 = "fac34940780efac83ff08168cd9ba153c997a2e551419504bbe4df86b54d5fd1";
+      sha256 = "56377e11aca9742783afa0c726ba341bb5e9cd643e3c40b4a05ebe7a830292cc";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ff/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ff/Firefox%20144.0.2.dmg";
       locale = "ff";
       arch = "mac";
-      sha256 = "40550b728d1116b197ce151c8f0ab81cf2e05dcb7771aacf42ab3adfe9e8dcbe";
+      sha256 = "cc0e79905312f4ddb7b1099db346302f4fd389cb891d48db6cff9385250983ec";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/fi/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/fi/Firefox%20144.0.2.dmg";
       locale = "fi";
       arch = "mac";
-      sha256 = "11a664fc41e46e0661b12046ba0ecbba66475ae1e755f89e9a34889afea3b12d";
+      sha256 = "99b86c8a4d6dd173886c9261e450133b0f6844143c1fb96f4732b20de627af70";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/fr/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/fr/Firefox%20144.0.2.dmg";
       locale = "fr";
       arch = "mac";
-      sha256 = "b82dd2d38d31191b37307e0044ec44632fb7edee2e8365ba2de7ab5b13189eb0";
+      sha256 = "a83d4387f5899b428bab86c21402f44ed19476ed58f4e1f97d875dabdfb8f0e6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/fur/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/fur/Firefox%20144.0.2.dmg";
       locale = "fur";
       arch = "mac";
-      sha256 = "5d3e157feed0ba1d27f263c6964e28be17c71ba0784b17f20493335e8cde6067";
+      sha256 = "a32e215c3ebef1592a940fdb7e525c547dfa0bbd589c49fd0b1d2deef4047e4a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/fy-NL/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/fy-NL/Firefox%20144.0.2.dmg";
       locale = "fy-NL";
       arch = "mac";
-      sha256 = "a511b5a5d0b716e66a4c29a2459243547dbfc0965801a4758c8e2028fa7dab8a";
+      sha256 = "0637899c4fdde5992a9aae2e0e18bcd6386032af80441701d2d46ec081255d1f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ga-IE/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ga-IE/Firefox%20144.0.2.dmg";
       locale = "ga-IE";
       arch = "mac";
-      sha256 = "1b59c37b8bae3181664e27fc85604de24916f84713025cfed0e98a1e0e9b383a";
+      sha256 = "b0b79d284fbe4ad1566e1217ade5c0b1a48b6812d323a328d2bb4b3c5d25fe63";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/gd/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/gd/Firefox%20144.0.2.dmg";
       locale = "gd";
       arch = "mac";
-      sha256 = "06773bb70fcbf04549c510e514c218cef3baf085161b444bc5e379df578e01d7";
+      sha256 = "120f76abcfdb684f0ce0aab8265ca8858343d4f3842740a3742745905cedf192";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/gl/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/gl/Firefox%20144.0.2.dmg";
       locale = "gl";
       arch = "mac";
-      sha256 = "73167d60d07a1746fbb4fbcd1bde0ab6ad5075e7a79bbc9f2cfb63d4b19e2ce1";
+      sha256 = "ff15e91f72512d9c4230f0e16bb811547d92716f7bc2662cfb6d06cda3d17969";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/gn/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/gn/Firefox%20144.0.2.dmg";
       locale = "gn";
       arch = "mac";
-      sha256 = "a4d649fbb82b591b711278d15f69dd0eae4f3543558f6f2e48e6011dee9e2773";
+      sha256 = "8f0bc7a86d28f5cf692005af7fc77f9fa64ade5ff454d482ec1093a9f96b4fcf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/gu-IN/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/gu-IN/Firefox%20144.0.2.dmg";
       locale = "gu-IN";
       arch = "mac";
-      sha256 = "ea77edfa32600b15d2571cb5e2c6730d45c1c84bfd6af235ff92430767d84f46";
+      sha256 = "232d555624bb3e817c2b6bc192929e82c7dd560fc5a0cffc332f5cd910df8d5b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/he/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/he/Firefox%20144.0.2.dmg";
       locale = "he";
       arch = "mac";
-      sha256 = "13251f1038a448d942f51311d33acc04db4332b7b7173f29d066cab2148969d3";
+      sha256 = "a0beaecfe477ed4775d802091c56f6e4c43b6afff0bb992ef00aaf107ae33f5f";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/hi-IN/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/hi-IN/Firefox%20144.0.2.dmg";
       locale = "hi-IN";
       arch = "mac";
-      sha256 = "cdea9dcf544c1ed44f0876f0a15c30620dcfb036dda05206bad27d3bb07bcad6";
+      sha256 = "5d8ed923974930d2e1e0940ae5569cb4e4d4b37f2158ebc2c9feafbdc5e65869";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/hr/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/hr/Firefox%20144.0.2.dmg";
       locale = "hr";
       arch = "mac";
-      sha256 = "2ba6b74c9313419a5ceab2f6a80bc9601de99d10cc13c253d4670ac7817d41b8";
+      sha256 = "78f50233724f210915d44ec5fbc2161a6bdf1080c8c73efdf44e813ab2414650";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/hsb/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/hsb/Firefox%20144.0.2.dmg";
       locale = "hsb";
       arch = "mac";
-      sha256 = "5926795f229e7d72bde486a1451742074a210d23b71637c3a1b5109271c9affd";
+      sha256 = "8b3fb11a118f22d8b866bf31a501f5f22165f6b1eebb818867858469350f64ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/hu/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/hu/Firefox%20144.0.2.dmg";
       locale = "hu";
       arch = "mac";
-      sha256 = "96160986546f66f3aac74e0f350ddf623f93d87246f282a4dc1c5c5eee46a423";
+      sha256 = "26855be8cec28cf4432ab24e10d39d461dee658f1e50b9f5cc86d9acd6c06806";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/hy-AM/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/hy-AM/Firefox%20144.0.2.dmg";
       locale = "hy-AM";
       arch = "mac";
-      sha256 = "e9418b6815cbd29124357ecfb32d9ed5d28149860349066d5b34c48e3969857a";
+      sha256 = "009c380ccc9de0d5e939d02d220122a77bba6bb448006bf0f572886e807eaa3b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ia/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ia/Firefox%20144.0.2.dmg";
       locale = "ia";
       arch = "mac";
-      sha256 = "e8d7acc6cc15db58b6026aa1605541d2fccd77da083dd35995fdad058258cbea";
+      sha256 = "e078f44af56f2e070293600940e199e8e569fa665f55fdd06673d18e1b5682a8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/id/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/id/Firefox%20144.0.2.dmg";
       locale = "id";
       arch = "mac";
-      sha256 = "039f9c0f1a5fcda8b47ac7032a108daff85deb89c18a2309df80d6cf54991468";
+      sha256 = "97d8417d2a84ff3cbd9552baed29f729b51c9534f1912ca4134b24feb758b6a7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/is/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/is/Firefox%20144.0.2.dmg";
       locale = "is";
       arch = "mac";
-      sha256 = "83fbe22d2f4e156d5c110d3ac0d08c7b461f2cdaac6cc852d1711dfd367a9460";
+      sha256 = "7204c7a2773d68f3270625c5f668c601c85a9a5b31128b3bd5f36d34c48d2681";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/it/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/it/Firefox%20144.0.2.dmg";
       locale = "it";
       arch = "mac";
-      sha256 = "4ec979be830e23c1737e60bf1cc82ab5ad64a579f00c338708e6ae06f358fb39";
+      sha256 = "e633ccda088721a891a56100a7962f299a8982535705f7259c41ac3f843e92b9";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ja-JP-mac/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ja-JP-mac/Firefox%20144.0.2.dmg";
       locale = "ja-JP-mac";
       arch = "mac";
-      sha256 = "94e20e600ff8910ed3f54c45b372f1100ed384fa6e5881e2cf582d64d7723b38";
+      sha256 = "63aa3419071b7d7fa7ec722f5f7c615148b98a6f5c78f7e2f21eaf82a6262eed";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ka/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ka/Firefox%20144.0.2.dmg";
       locale = "ka";
       arch = "mac";
-      sha256 = "ccba239d6993bd3af0e94c7d858384ee2445f2e0846e1a2d8be940fc0becad4d";
+      sha256 = "a94e53608f565512b3549a1204710f920683a3d80b6fcae833ff5b421349cfc2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/kab/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/kab/Firefox%20144.0.2.dmg";
       locale = "kab";
       arch = "mac";
-      sha256 = "db8babfd04de5c3e40f14e41238e4b5fd55775662755ea9966be284c4ee42d1a";
+      sha256 = "b1f4555a2997e8ace91dd2e092adeab920338e2d0f506801e7cae0fbdf0054ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/kk/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/kk/Firefox%20144.0.2.dmg";
       locale = "kk";
       arch = "mac";
-      sha256 = "3c5696a4c2fbc8fe6ec40225b2605a42bb8d989f4b78f02e384fbdb6534c280b";
+      sha256 = "5280acd5bdd00f985a578e9b0573f83c460f2a91a64bfab70dfd7f04143a7dca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/km/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/km/Firefox%20144.0.2.dmg";
       locale = "km";
       arch = "mac";
-      sha256 = "5cae18e877dbfc8340c401d1477fe65cef9768486e609f1f41a286800de73ef2";
+      sha256 = "e72cd6553f4c995be36f7d3cfdfc219c74934604e4ae9520b0ae55a037810002";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/kn/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/kn/Firefox%20144.0.2.dmg";
       locale = "kn";
       arch = "mac";
-      sha256 = "16cdc4eacab04cf0254c8af6c70d0f652d38400167c82c8966e70c83d7471eeb";
+      sha256 = "aed6abdf8ac8a933f4c07a6cdc82a5e5e71bdb0aead65831a687307b0d006911";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ko/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ko/Firefox%20144.0.2.dmg";
       locale = "ko";
       arch = "mac";
-      sha256 = "c2e91c02dd631405baf187de66a7f603fc74677427ad6bef623c48a25270fb35";
+      sha256 = "440d17a6653a7c715bfaaa6fbb1e8f588d17c808c3b2e51ddd8548946c0b90c2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/lij/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/lij/Firefox%20144.0.2.dmg";
       locale = "lij";
       arch = "mac";
-      sha256 = "80fb2c726c34a12b6d08321e812cbda27d339e4512e043ab669a36597b483a50";
+      sha256 = "85cd057cadbc76c195aabbf7dae470723cbc07672f523d338864b1d269b38fb7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/lt/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/lt/Firefox%20144.0.2.dmg";
       locale = "lt";
       arch = "mac";
-      sha256 = "b4d56d4b208409a631b3d4d7b132cd807189e8b482a9a7e2a5e99d1dfc7bdd5c";
+      sha256 = "9f4b0cb079f3cebf8794afe23164e684ab75fd4ee90d019fdd588a2f646c183a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/lv/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/lv/Firefox%20144.0.2.dmg";
       locale = "lv";
       arch = "mac";
-      sha256 = "16bc890c2c5bc1f25717a381a8dd1de05408bb1ac2d57f25a29e885fb06bbb2b";
+      sha256 = "d7c427bac9d58c388469d7ccd0da86f6b8318ae90fedf773cc8462a7227a51f2";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/mk/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/mk/Firefox%20144.0.2.dmg";
       locale = "mk";
       arch = "mac";
-      sha256 = "7440e342bacb25d2c9869599434386fb92c947d5f0980be0fb2c382efaeb07a0";
+      sha256 = "6fb61929c542d4cf85ab746f3cc4a94f9a119c5e90ca1a4694aa037f109466ca";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/mr/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/mr/Firefox%20144.0.2.dmg";
       locale = "mr";
       arch = "mac";
-      sha256 = "80bd295a4e031a5da31b8f9cf12bc806f95bc106811ab79f7603bc0e9b71b059";
+      sha256 = "ed72fba45951d2b52ff3c4cd2c9b7c6a8d2b3dc829fb28b908262222672021e0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ms/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ms/Firefox%20144.0.2.dmg";
       locale = "ms";
       arch = "mac";
-      sha256 = "b59abd9035792d95c8ae5b57c4757843c1a5947ad97b3a9b1274c10ca433554f";
+      sha256 = "ce642d00e1e7e92646d4fe6e61b88056b23f7583b066c4594270c983eea3f2c6";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/my/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/my/Firefox%20144.0.2.dmg";
       locale = "my";
       arch = "mac";
-      sha256 = "d03dddb65f99c87576808b6454cce59b13c22399a3868b60160cfb7136b47420";
+      sha256 = "a1564ab56a04d335bf0678bba8853b759eea2a1e29452d818c6f03c1983f304b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/nb-NO/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/nb-NO/Firefox%20144.0.2.dmg";
       locale = "nb-NO";
       arch = "mac";
-      sha256 = "ec6d9879a6d7ad3eb3815269f8417409cf0b68ffa7d81f975956ed9da3725b72";
+      sha256 = "c0d4d5bdaa7929c8142cbb7afec863e623d926897a90d16898a721fb477880b0";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ne-NP/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ne-NP/Firefox%20144.0.2.dmg";
       locale = "ne-NP";
       arch = "mac";
-      sha256 = "9f47f263204ce4ce85b0055c01e787e6b57eb3c774eedc788ed9157edbcd74e7";
+      sha256 = "097fade524b0e3d91fde5f3784051d72378073d99551ff5b1b8354715efa75ba";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/nl/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/nl/Firefox%20144.0.2.dmg";
       locale = "nl";
       arch = "mac";
-      sha256 = "7f4e390eb8c282ebfd3fc350414eccb75c40fd73d739cc6cd531fd9e27c2420b";
+      sha256 = "d60d706c96649ae46843580c03c1958c01ce2f224f3560bfc3174a84ededd988";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/nn-NO/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/nn-NO/Firefox%20144.0.2.dmg";
       locale = "nn-NO";
       arch = "mac";
-      sha256 = "b24eb701b7872b8f73a75d971d4441dad0d670b2ebddb164589054c11345f2bb";
+      sha256 = "d2ef83f90c3eb26bf631548f4a6ab0ce0cc0e8fbd83c095e24e524c8300be6ac";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/oc/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/oc/Firefox%20144.0.2.dmg";
       locale = "oc";
       arch = "mac";
-      sha256 = "69c1e0ef56821a5d8dd439e4e14d1a27e01581f89b384a3a25ab14c7c5e7eaa9";
+      sha256 = "ee56c979f776ec5c16e791b10ec3890e0038f63a3e92729653181856decfe932";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/pa-IN/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/pa-IN/Firefox%20144.0.2.dmg";
       locale = "pa-IN";
       arch = "mac";
-      sha256 = "dde4f090f0966e3f476c52c12e23360dbf11fd0a5fd0b84318551539b35659e8";
+      sha256 = "50c6c2e27645c912e53929aeebf204e65253b5d8acdb445cf646a67fbea6bb95";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/pl/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/pl/Firefox%20144.0.2.dmg";
       locale = "pl";
       arch = "mac";
-      sha256 = "7ff025e78563d008873b52b8ae3dc0136c16ca08ba225755f5a2963b7d63d8de";
+      sha256 = "e91e76f76e64b3e78f7a58fa7a34b8b4abf6be441e1d56f47a9f911c2f792b69";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/pt-BR/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/pt-BR/Firefox%20144.0.2.dmg";
       locale = "pt-BR";
       arch = "mac";
-      sha256 = "6f712f5b83ee6403093b659f566348e284844564400ba14180b03f6e2ac8328c";
+      sha256 = "0913be45b7148d972e8646071876b2187861ce9ed1cccf67a7856255ae12dbd7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/pt-PT/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/pt-PT/Firefox%20144.0.2.dmg";
       locale = "pt-PT";
       arch = "mac";
-      sha256 = "04a681a4f2fa1875e7b0cd0304ea2263a9a7c2303a110dbf3c7447cf5f77158f";
+      sha256 = "a1e08dba05a83790f5ad63a52a8913c8b5036739debc0925b81b99badccd4256";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/rm/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/rm/Firefox%20144.0.2.dmg";
       locale = "rm";
       arch = "mac";
-      sha256 = "818b3c96cafc11a2d1ffd67aaf7569341a5f9b718c9102db9a94f2d4e4b72016";
+      sha256 = "12b3d413e7227248fe502c1eca88df32c09cbf84c732ac65cbaa0239cd9d6d64";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ro/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ro/Firefox%20144.0.2.dmg";
       locale = "ro";
       arch = "mac";
-      sha256 = "4d0c078f6a4f8d26946b00a71031645fd01e7c1978fc0b736297218172bb5312";
+      sha256 = "8701dd604404640abd26bafd43782705d8a9a2cd8263e1ed580de53ed30572a3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ru/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ru/Firefox%20144.0.2.dmg";
       locale = "ru";
       arch = "mac";
-      sha256 = "e6fef5b53ca85472df3f70d45db7a4f1f8e58adba7bc4f06770e259a68f1a568";
+      sha256 = "4f9279a41916bae0f22d8c4c2161b5ca08dc073f0585d964c33d696c7d34fbb3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/sat/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/sat/Firefox%20144.0.2.dmg";
       locale = "sat";
       arch = "mac";
-      sha256 = "893ce0e0b6da456d1a8f4161f9371eae51b2c3c41458f7cbf7578b8abb2d0e96";
+      sha256 = "240993509d9a95fc9da0f02cb412ce0031dc0c8d9ec1ba92d29d673af19cbe02";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/sc/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/sc/Firefox%20144.0.2.dmg";
       locale = "sc";
       arch = "mac";
-      sha256 = "a4426974e29f754738cd1c1faca7fbdfb3fd626082ea0d40c08338319038c81f";
+      sha256 = "5f0fc83e96029766f706775a54a6025240278ffcae2d5489e84c1822d1b8b53d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/sco/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/sco/Firefox%20144.0.2.dmg";
       locale = "sco";
       arch = "mac";
-      sha256 = "ca0fb81dcbbaf4e77ec9fa286ef0b619e0ad4c25e3d2bb1e9c5bc76810bc6820";
+      sha256 = "e4318148ab4d190de351a639cfd50696adf3bd95eca666163f3226ce57470167";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/si/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/si/Firefox%20144.0.2.dmg";
       locale = "si";
       arch = "mac";
-      sha256 = "b07692d747214eda21cb981612493fac20bc9f918e4108b301d1a176a1e81815";
+      sha256 = "fbc3ef939bfb5aea12122ff275b9427ecf03ce18d21dc31e631a1c3d51b71e11";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/sk/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/sk/Firefox%20144.0.2.dmg";
       locale = "sk";
       arch = "mac";
-      sha256 = "df95fdba11ebc15bc728a143af8acca91cc0a9274f7ee869afcfaae7c0e669b4";
+      sha256 = "e4c5886d978d5efcbe34aeeb9688ff6d9d3cc98730b153cb5d9ba98e02cb5352";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/skr/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/skr/Firefox%20144.0.2.dmg";
       locale = "skr";
       arch = "mac";
-      sha256 = "72cdddfcdc7798db253959b39b6ae03522763b25fa4532b8352144d38c2f2b5d";
+      sha256 = "395772a5e7bd42d46283a9b443bcf959ee57bb90a49ada511c1805b32c18908a";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/sl/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/sl/Firefox%20144.0.2.dmg";
       locale = "sl";
       arch = "mac";
-      sha256 = "b8a298eb59fd39d577cbc92cf708cfa46c4bca8563c84f85dc07a680c9c75d07";
+      sha256 = "9bf967196cb7152b014a55bfec6f2fbdcd5eba9445f858cd0340974ce069eb95";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/son/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/son/Firefox%20144.0.2.dmg";
       locale = "son";
       arch = "mac";
-      sha256 = "58b3c9fdfc36461c9791dae9b8466751a5038043e01202db35229220eb6850c8";
+      sha256 = "2dd1e18f1d757eaecf6c930bf88bedcbc6b3bf733f5e101237e78c5df7b36ab3";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/sq/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/sq/Firefox%20144.0.2.dmg";
       locale = "sq";
       arch = "mac";
-      sha256 = "fa798195257309e071be28126751ab5fa1388aa0e1e24bf23790dded0f100b2f";
+      sha256 = "6adf1095aaef4dff690875ec7da5ca1b8b9cc67d504b8fbe74a98dbf9e97b3cd";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/sr/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/sr/Firefox%20144.0.2.dmg";
       locale = "sr";
       arch = "mac";
-      sha256 = "89ea3b70af3c5c99a0020d2113a6905a6680a5966f6b51b9c2ee389c0aad9193";
+      sha256 = "0caefa89b22fdcb323f0c24c519d139127ea5cc79ef2a68ebe5c0eadde3df621";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/sv-SE/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/sv-SE/Firefox%20144.0.2.dmg";
       locale = "sv-SE";
       arch = "mac";
-      sha256 = "d21256313648c267a92a97a795a3c7d62e7b8d7270d8865b49e725a3a9e50885";
+      sha256 = "fe652cc5adeb6902f6efe78fce0eebce6fb9c5f487e8444fc8b3e3e13b8d007b";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/szl/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/szl/Firefox%20144.0.2.dmg";
       locale = "szl";
       arch = "mac";
-      sha256 = "b1d6b79b3acddcd48da313098debc82b25eb839ea569334b609bb3d793ee5ac4";
+      sha256 = "fb3a8d69b00b869eae9f69645163ef2733d28144d670b6f371bc00b6e321dccf";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ta/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ta/Firefox%20144.0.2.dmg";
       locale = "ta";
       arch = "mac";
-      sha256 = "9abff19859cf0c3df2cbeeba0e5e79ed5fcfe93b659a25056dbe997ec1ddc69a";
+      sha256 = "36caf69dd0a35c5e5bcf09ba44a9abbe4191cc46862322a6e56da5b46dc7018c";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/te/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/te/Firefox%20144.0.2.dmg";
       locale = "te";
       arch = "mac";
-      sha256 = "a52d31546f1083520ca13692aaec2db9aeac3db9b11c4a09c82041e95a19ea92";
+      sha256 = "c2038ee75753d0323fc64f929a70cc13998c702429fa8efd988e1283868ffd22";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/tg/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/tg/Firefox%20144.0.2.dmg";
       locale = "tg";
       arch = "mac";
-      sha256 = "f151f83a9b727f918c5ab44f6991b20102cb2c3197a729af7d77ec3a09be1e69";
+      sha256 = "36f97c166e88eb9ca7c4521cb22e5f6b0b69aa98a93568a023e114cc61e813b7";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/th/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/th/Firefox%20144.0.2.dmg";
       locale = "th";
       arch = "mac";
-      sha256 = "09e95a74b23a93f282e64bed309e078a5dfb9a7d9231dbadef439326a2e3fa18";
+      sha256 = "9182a0d15c9482243f03766fa0bde4f6a1b7ce994b0a39bbd6d4c6f3376c5a70";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/tl/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/tl/Firefox%20144.0.2.dmg";
       locale = "tl";
       arch = "mac";
-      sha256 = "380578292291aaf57c2343927941fcaadb124214b463b30ccd9c84485d0026b3";
+      sha256 = "1a70e01dca9e0c9cf9729ab55f3c81abdcee8339b97e8ed21adb085763c273ae";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/tr/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/tr/Firefox%20144.0.2.dmg";
       locale = "tr";
       arch = "mac";
-      sha256 = "614e5426ea0c5a9bf9d9c2c903ecc9fbebcc36a821a550f2b2680457ef0f63d3";
+      sha256 = "8a9f393371faa0cad41aa412faa2019b3e03777bee7c66e89ccfe5c5f2735b32";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/trs/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/trs/Firefox%20144.0.2.dmg";
       locale = "trs";
       arch = "mac";
-      sha256 = "32d7669f8f87afcd03b131000f17f00e5b55a1479133155723476475d3b921e6";
+      sha256 = "972668d4c01fbbea3150436cffd932874943b6e565c89d841eca12ded3a46715";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/uk/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/uk/Firefox%20144.0.2.dmg";
       locale = "uk";
       arch = "mac";
-      sha256 = "31a74a758cef43e1d7d4c71e31d742bd79a0c5b9e5946135b8298d06cdedf5b5";
+      sha256 = "ea53b9ee7ba12338375b5e5b9bf5d1d0f3ffffece0ab0c79b435778fc793e6e4";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/ur/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/ur/Firefox%20144.0.2.dmg";
       locale = "ur";
       arch = "mac";
-      sha256 = "b9e17a696d53dafac98d1c2164ea3b1b619e8bf8b344be30d182f99fd892b5cc";
+      sha256 = "3b5f0e2fa45f4f1184ccc67ef499afba51e7fa55977eba7e83dee3f4bdcc9441";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/uz/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/uz/Firefox%20144.0.2.dmg";
       locale = "uz";
       arch = "mac";
-      sha256 = "e9ea930995fdafb634f9a896f3cadc79a920354fc16df64603167680a62098cd";
+      sha256 = "3f76b49db69eeafb97d4f038a1e52fdfdd450df1e98fda48a22f48c5e2a82a95";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/vi/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/vi/Firefox%20144.0.2.dmg";
       locale = "vi";
       arch = "mac";
-      sha256 = "232925d4435628448f27146075519a11763b828b07ee69002fd8ab8718ef7129";
+      sha256 = "6f1b2e8e87439b8330cec73a9ea76259c3a1adca3a7d2081acea66766c4d689d";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/xh/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/xh/Firefox%20144.0.2.dmg";
       locale = "xh";
       arch = "mac";
-      sha256 = "c1e4f9ad80580a99498d04656f64b6d8f4293114b51e928b6264845997cd61ca";
+      sha256 = "14fdb87d01dcaa0938c3c22901b6387b1d334eac07fad2b70d6e1409f09497e8";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/zh-CN/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/zh-CN/Firefox%20144.0.2.dmg";
       locale = "zh-CN";
       arch = "mac";
-      sha256 = "44ee593ece0711a3eb67fdc8803c88bced8fa887578202dc4d356139cf4acf52";
+      sha256 = "adb2af0387752f7af7f86e6556e78dd9c91ea8fa710304a3e2e3e50ae2dce929";
     }
     {
-      url = "https://archive.mozilla.org/pub/firefox/releases/144.0/mac/zh-TW/Firefox%20144.0.dmg";
+      url = "https://archive.mozilla.org/pub/firefox/releases/144.0.2/mac/zh-TW/Firefox%20144.0.2.dmg";
       locale = "zh-TW";
       arch = "mac";
-      sha256 = "14f924e6184cf01091ea3dffb18f1f684325dccada852b8db39df0beaf532b44";
+      sha256 = "1eef9697bd2e14233ee5ea6324522585967a7f8a5770f11bc72f98ebe4aa71d5";
     }
   ];
 }

From 2508f47a5b7d9c2f90222572e0ad2a3dfbc2ab1f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 15 Oct 2025 19:19:05 +0000
Subject: [PATCH 3551/6226] python3Packages.torchaudio-bin: 2.8.0 -> 2.9.0

Diff: https://github.com/pytorch/audio/releases/tag/v2.9.0

Changelog: https://github.com/pytorch/audio/compare/v2.8.0...v2.9.0
---
 .../python-modules/torchaudio/bin.nix         |  10 +-
 .../torchaudio/binary-hashes.nix              | 100 +++++++++---------
 .../python-modules/torchaudio/prefetch.sh     |   8 +-
 3 files changed, 56 insertions(+), 62 deletions(-)

diff --git a/pkgs/development/python-modules/torchaudio/bin.nix b/pkgs/development/python-modules/torchaudio/bin.nix
index 5334f94ffd81..015521331382 100644
--- a/pkgs/development/python-modules/torchaudio/bin.nix
+++ b/pkgs/development/python-modules/torchaudio/bin.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "torchaudio";
-  version = "2.8.0";
+  version = "2.9.0";
   format = "wheel";
 
   src =
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     in
     fetchurl srcs;
 
-  disabled = (pythonOlder "3.9") || (pythonAtLeast "3.14");
+  disabled = (pythonOlder "3.10") || (pythonAtLeast "3.15");
 
   buildInputs = [
     # We need to patch lib/torio/_torio_ffmpeg6
@@ -64,12 +64,6 @@ buildPythonPackage rec {
     addAutoPatchelfSearchPath "${torch-bin}/${python.sitePackages}/torch"
   '';
 
-  preFixup = ''
-    # TorchAudio loads the newest FFmpeg that works, so get rid of the
-    # old ones.
-    rm $out/${python.sitePackages}/torio/lib/{lib,_}torio_ffmpeg{4,5}.*
-  '';
-
   # The wheel-binary is not stripped to avoid the error of `ImportError: libtorch_cuda_cpp.so: ELF load command address/offset not properly aligned.`.
   dontStrip = true;
 
diff --git a/pkgs/development/python-modules/torchaudio/binary-hashes.nix b/pkgs/development/python-modules/torchaudio/binary-hashes.nix
index f0bb5feaa82b..c17b723dbd6d 100644
--- a/pkgs/development/python-modules/torchaudio/binary-hashes.nix
+++ b/pkgs/development/python-modules/torchaudio/binary-hashes.nix
@@ -7,81 +7,81 @@
 
 version:
 builtins.getAttr version {
-  "2.8.0" = {
-    x86_64-linux-39 = {
-      name = "torchaudio-2.8.0-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl";
-      hash = "sha256-2QZsae7B8pPC/wqAW/UEc3OQzL9rd8jmfa+DTbhv2kU=";
-    };
+  "2.9.0" = {
     x86_64-linux-310 = {
-      name = "torchaudio-2.8.0-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
-      hash = "sha256-oBYelShaC3Ft4hD+4DkhUdYB59o8yGWVAI2Car/0iow=";
+      name = "torchaudio-2.9.0-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.9.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
+      hash = "sha256-LZJPa5GaJYQe7bo6eSGzjjuri4ayzyOEHjMGM9wuxN8=";
     };
     x86_64-linux-311 = {
-      name = "torchaudio-2.8.0-cp311-cp311-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
-      hash = "sha256-9ECd9WfQcjp6OonTLHVSoX4P9vE36iag0mjGZSWbKZU=";
+      name = "torchaudio-2.9.0-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.9.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
+      hash = "sha256-sPBN7JEXd5pjd8VQHIb8BppCevACyF8IRpQ9aEu6LyM=";
     };
     x86_64-linux-312 = {
-      name = "torchaudio-2.8.0-cp312-cp312-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
-      hash = "sha256-FFuKDCHPyqFwXGcXPF1DkIfg4SDV2pvDRHRvk3kB0kM=";
+      name = "torchaudio-2.9.0-cp312-cp312-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.9.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
+      hash = "sha256-/4OLMXG+bvTkVk4oFFM4FiQqbb6khRezcieFaHFpN2s=";
     };
     x86_64-linux-313 = {
-      name = "torchaudio-2.8.0-cp313-cp313-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.8.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
-      hash = "sha256-QQu46kYiXv5ljl0no4AsGBoiVZEwA2IaXSWlGsqAGNk=";
+      name = "torchaudio-2.9.0-cp313-cp313-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.9.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
+      hash = "sha256-6nanCKWpSlxsu/MinlhIMCaLR2X7Aa6CMPG2dEJTog8=";
     };
-    aarch64-darwin-39 = {
-      name = "torchaudio-2.8.0-cp39-cp39-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp39-cp39-macosx_11_0_arm64.whl";
-      hash = "sha256-UiKJ4s1X55QB/VzK6bG8D/LkfzUpCSrfWs9XQn6gxqk=";
+    x86_64-linux-314 = {
+      name = "torchaudio-2.9.0-cp314-cp314-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchaudio-2.9.0%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl";
+      hash = "sha256-NnfCCwl7w1/DLspPPwon5rTT7nyKYuuiaj51SaOofWw=";
     };
     aarch64-darwin-310 = {
-      name = "torchaudio-2.8.0-cp310-cp310-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp310-cp310-macosx_11_0_arm64.whl";
-      hash = "sha256-wvRM8nn2c8/N2PV2w0nu6L7fjKqzUaXdeLMpcMw0ohI=";
+      name = "torchaudio-2.9.0-cp310-cp310-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.0-cp310-cp310-macosx_11_0_arm64.whl";
+      hash = "sha256-IU0ui+wrIErD9VLz3OrlFVDgapHFhj1dw0HYFpHvZV4=";
     };
     aarch64-darwin-311 = {
-      name = "torchaudio-2.8.0-cp311-cp311-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp311-cp311-macosx_11_0_arm64.whl";
-      hash = "sha256-ySdoV9JBxt4levdlwPUfwBGvOMtyVAFJUSGygJEwB88=";
+      name = "torchaudio-2.9.0-cp311-cp311-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.0-cp311-cp311-macosx_11_0_arm64.whl";
+      hash = "sha256-Zi60mrJeGitzZ7sHKorQXIpLZQ675wkKWvGh6x1Adnw=";
     };
     aarch64-darwin-312 = {
-      name = "torchaudio-2.8.0-cp312-cp312-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp312-cp312-macosx_11_0_arm64.whl";
-      hash = "sha256-3e+UvxgeZEfLsF84vqyo9sW7jSud3O0ao0UgJbn8cNM=";
+      name = "torchaudio-2.9.0-cp312-cp312-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.0-cp312-cp312-macosx_11_0_arm64.whl";
+      hash = "sha256-q0y8zP2HOw+0H8s5yYaeWe+Eu5Wwk/b1ji0FFyp1ANI=";
     };
     aarch64-darwin-313 = {
-      name = "torchaudio-2.8.0-cp313-cp313-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp313-cp313-macosx_11_0_arm64.whl";
-      hash = "sha256-+FHTLpTKBeRw8MYOJXJuweDrccsspaAga3/QMnLMw8g=";
+      name = "torchaudio-2.9.0-cp313-cp313-macosx_12_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.0-cp313-cp313-macosx_12_0_arm64.whl";
+      hash = "sha256-VUnCXbTC2jBuF56aqZmA5/WxgmqNLX3ggSXzlDpWILI=";
     };
-    aarch64-linux-39 = {
-      name = "torchaudio-2.8.0-cp39-cp39-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp39-cp39-manylinux_2_28_aarch64.whl";
-      hash = "sha256-739/+oKLjYul06VpuCX8BGlojh6JYr9ld9U4vYrxOH0=";
+    aarch64-darwin-314 = {
+      name = "torchaudio-2.9.0-cp314-cp314-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.0-cp314-cp314-macosx_11_0_arm64.whl";
+      hash = "sha256-P6QUR6IRA/zekwtK0r0mNFZaC+z/GlQlU1tPARbA1d8=";
     };
     aarch64-linux-310 = {
-      name = "torchaudio-2.8.0-cp310-cp310-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp310-cp310-manylinux_2_28_aarch64.whl";
-      hash = "sha256-08G4WyagmDLROfbW2mtmyutR0uFuCPhYdmXESp4aqPk=";
+      name = "torchaudio-2.9.0-cp310-cp310-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.0-cp310-cp310-manylinux_2_28_aarch64.whl";
+      hash = "sha256-HoTkX3S/WyCLXOWbNvJuweX2NZZULD6+5u3q34XnNWM=";
     };
     aarch64-linux-311 = {
-      name = "torchaudio-2.8.0-cp311-cp311-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp311-cp311-manylinux_2_28_aarch64.whl";
-      hash = "sha256-RXPGBClQwgJ442CKmjgFC6C8cuAEnhu/0knK+FmoAps=";
+      name = "torchaudio-2.9.0-cp311-cp311-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.0-cp311-cp311-manylinux_2_28_aarch64.whl";
+      hash = "sha256-kU8UCBQr3tocqfg03QSWdiX8zHWJO9FQSgGKE6BPG2Y=";
     };
     aarch64-linux-312 = {
-      name = "torchaudio-2.8.0-cp312-cp312-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp312-cp312-manylinux_2_28_aarch64.whl";
-      hash = "sha256-hi4uQL8J2GXl3wgKhMGjm7zvQOQxQPSxc36zo4nTs48=";
+      name = "torchaudio-2.9.0-cp312-cp312-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.0-cp312-cp312-manylinux_2_28_aarch64.whl";
+      hash = "sha256-f5M4i25TbBTWAVtvdSd6i0XvxTL2GzWtwe0GyYqGAD4=";
     };
     aarch64-linux-313 = {
-      name = "torchaudio-2.8.0-cp313-cp313-manylinux2014_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.8.0-cp313-cp313-manylinux_2_28_aarch64.whl";
-      hash = "sha256-CVNam3J8B5PNB8Gs6Z8/NTYmKBvMPjDC8jFOPrydP5Y=";
+      name = "torchaudio-2.9.0-cp313-cp313-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.0-cp313-cp313-manylinux_2_28_aarch64.whl";
+      hash = "sha256-HrDR2sjO+8SlSvshqscqHCWpH3Ppw72F9mhJMKShvl0=";
+    };
+    aarch64-linux-314 = {
+      name = "torchaudio-2.9.0-cp314-cp314-manylinux2014_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchaudio-2.9.0-cp314-cp314-manylinux_2_28_aarch64.whl";
+      hash = "sha256-afRvIb1n6QreM6fQ8M+YJwzWG5j1+CSdOJO+Chaz4x8=";
     };
   };
 }
diff --git a/pkgs/development/python-modules/torchaudio/prefetch.sh b/pkgs/development/python-modules/torchaudio/prefetch.sh
index b3c22e498664..4b289f99bb31 100755
--- a/pkgs/development/python-modules/torchaudio/prefetch.sh
+++ b/pkgs/development/python-modules/torchaudio/prefetch.sh
@@ -11,21 +11,21 @@ linux_cpu_bucket="https://download.pytorch.org/whl/cpu"
 darwin_bucket="https://download.pytorch.org/whl/cpu"
 
 url_and_key_list=(
-    "x86_64-linux-39 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp39-cp39-manylinux_2_28_x86_64.whl torchaudio-${version}-cp39-cp39-linux_x86_64.whl"
     "x86_64-linux-310 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp310-cp310-manylinux_2_28_x86_64.whl torchaudio-${version}-cp310-cp310-linux_x86_64.whl"
     "x86_64-linux-311 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp311-cp311-manylinux_2_28_x86_64.whl torchaudio-${version}-cp311-cp311-linux_x86_64.whl"
     "x86_64-linux-312 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torchaudio-${version}-cp312-cp312-linux_x86_64.whl"
     "x86_64-linux-313 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torchaudio-${version}-cp313-cp313-linux_x86_64.whl"
-    "aarch64-darwin-39 $darwin_bucket/torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl torchaudio-${version}-cp39-cp39-macosx_11_0_arm64.whl"
+    "x86_64-linux-314 $linux_cuda_bucket/torchaudio-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torchaudio-${version}-cp314-cp314-linux_x86_64.whl"
     "aarch64-darwin-310 $darwin_bucket/torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl torchaudio-${version}-cp310-cp310-macosx_11_0_arm64.whl"
     "aarch64-darwin-311 $darwin_bucket/torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl torchaudio-${version}-cp311-cp311-macosx_11_0_arm64.whl"
     "aarch64-darwin-312 $darwin_bucket/torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl torchaudio-${version}-cp312-cp312-macosx_11_0_arm64.whl"
-    "aarch64-darwin-313 $darwin_bucket/torchaudio-${version}-cp313-cp313-macosx_11_0_arm64.whl torchaudio-${version}-cp313-cp313-macosx_11_0_arm64.whl"
-    "aarch64-linux-39 $linux_cpu_bucket/torchaudio-${version}-cp39-cp39-manylinux_2_28_aarch64.whl torchaudio-${version}-cp39-cp39-manylinux2014_aarch64.whl"
+    "aarch64-darwin-313 $darwin_bucket/torchaudio-${version}-cp313-cp313-macosx_12_0_arm64.whl torchaudio-${version}-cp313-cp313-macosx_12_0_arm64.whl"
+    "aarch64-darwin-314 $darwin_bucket/torchaudio-${version}-cp314-cp314-macosx_11_0_arm64.whl torchaudio-${version}-cp314-cp314-macosx_11_0_arm64.whl"
     "aarch64-linux-310 $linux_cpu_bucket/torchaudio-${version}-cp310-cp310-manylinux_2_28_aarch64.whl torchaudio-${version}-cp310-cp310-manylinux2014_aarch64.whl"
     "aarch64-linux-311 $linux_cpu_bucket/torchaudio-${version}-cp311-cp311-manylinux_2_28_aarch64.whl torchaudio-${version}-cp311-cp311-manylinux2014_aarch64.whl"
     "aarch64-linux-312 $linux_cpu_bucket/torchaudio-${version}-cp312-cp312-manylinux_2_28_aarch64.whl torchaudio-${version}-cp312-cp312-manylinux2014_aarch64.whl"
     "aarch64-linux-313 $linux_cpu_bucket/torchaudio-${version}-cp313-cp313-manylinux_2_28_aarch64.whl torchaudio-${version}-cp313-cp313-manylinux2014_aarch64.whl"
+    "aarch64-linux-314 $linux_cpu_bucket/torchaudio-${version}-cp314-cp314-manylinux_2_28_aarch64.whl torchaudio-${version}-cp314-cp314-manylinux2014_aarch64.whl"
 )
 
 hashfile=binary-hashes-"$version".nix

From 68bbfa549b91b573c489ad4ec9cb8ce614a8737b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 15 Oct 2025 19:25:50 +0000
Subject: [PATCH 3552/6226] python3Packages.torchvision-bin: 0.23.0 -> 0.24.0

Diff: https://github.com/pytorch/vision/compare/v0.23.0...v0.24.0

Changelog: https://github.com/pytorch/vision/releases/tag/v0.24.0
---
 .../python-modules/torchvision/bin.nix        |   4 +-
 .../torchvision/binary-hashes.nix             | 100 +++++++++---------
 .../python-modules/torchvision/prefetch.sh    |   8 +-
 3 files changed, 56 insertions(+), 56 deletions(-)

diff --git a/pkgs/development/python-modules/torchvision/bin.nix b/pkgs/development/python-modules/torchvision/bin.nix
index 8626ead3ac02..f4318c9d92b5 100644
--- a/pkgs/development/python-modules/torchvision/bin.nix
+++ b/pkgs/development/python-modules/torchvision/bin.nix
@@ -23,7 +23,7 @@ let
   pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
   srcs = import ./binary-hashes.nix version;
   unsupported = throw "Unsupported system";
-  version = "0.23.0";
+  version = "0.24.0";
 in
 buildPythonPackage {
   inherit version;
@@ -34,7 +34,7 @@ buildPythonPackage {
 
   src = fetchurl srcs."${stdenv.system}-${pyVerNoDot}" or unsupported;
 
-  disabled = (pythonOlder "3.9") || (pythonAtLeast "3.14");
+  disabled = (pythonOlder "3.10") || (pythonAtLeast "3.15");
 
   # Note that we don't rely on config.cudaSupport here, because the Linux wheels all come built with CUDA support.
   buildInputs =
diff --git a/pkgs/development/python-modules/torchvision/binary-hashes.nix b/pkgs/development/python-modules/torchvision/binary-hashes.nix
index 545ff5bac535..df73d27331d1 100644
--- a/pkgs/development/python-modules/torchvision/binary-hashes.nix
+++ b/pkgs/development/python-modules/torchvision/binary-hashes.nix
@@ -7,81 +7,81 @@
 
 version:
 builtins.getAttr version {
-  "0.23.0" = {
-    x86_64-linux-39 = {
-      name = "torchvision-0.23.0-cp39-cp39-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp39-cp39-manylinux_2_28_x86_64.whl";
-      hash = "sha256-eE/JDLlw5aKbJLZEHkYfW/YWhGMFuXk/o4cKnyltTA4=";
-    };
+  "0.24.0" = {
     x86_64-linux-310 = {
-      name = "torchvision-0.23.0-cp310-cp310-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
-      hash = "sha256-RgvI1w9jvbQzpzUd7MLBrhkD9/N45KdhT8joyXpcNqo=";
+      name = "torchvision-0.24.0-cp310-cp310-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.24.0%2Bcu128-cp310-cp310-manylinux_2_28_x86_64.whl";
+      hash = "sha256-DZ17Fyc69ZN0A/pTqlmIbNHa9b1q6kLkw8u6RU+i6+0=";
     };
     x86_64-linux-311 = {
-      name = "torchvision-0.23.0-cp311-cp311-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
-      hash = "sha256-k/G19WsgzWhpvKQJQ95P08qczFbhtX9HxnHeHNqznNs=";
+      name = "torchvision-0.24.0-cp311-cp311-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.24.0%2Bcu128-cp311-cp311-manylinux_2_28_x86_64.whl";
+      hash = "sha256-ivmUrFaGj5OfsTFOuZ9SgpUcmhKq40ud3gCnjkLlnSE=";
     };
     x86_64-linux-312 = {
-      name = "torchvision-0.23.0-cp312-cp312-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
-      hash = "sha256-nLPBOZevy0QFfKENlDxsTLowaK/eDzcJZavOnIn8/6k=";
+      name = "torchvision-0.24.0-cp312-cp312-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.24.0%2Bcu128-cp312-cp312-manylinux_2_28_x86_64.whl";
+      hash = "sha256-5QW9g+4Q7blFI9C4BaCPULiGK1jSzG8C0UzU5++TArw=";
     };
     x86_64-linux-313 = {
-      name = "torchvision-0.23.0-cp313-cp313-linux_x86_64.whl";
-      url = "https://download.pytorch.org/whl/cu128/torchvision-0.23.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
-      hash = "sha256-xjmC8Zc7pnezfmZj3w4Hy1OBRZtvBXLCypXuvY3+t0I=";
+      name = "torchvision-0.24.0-cp313-cp313-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.24.0%2Bcu128-cp313-cp313-manylinux_2_28_x86_64.whl";
+      hash = "sha256-1ZT2EmnKsFJKHm9fnn5csm5OC+2LoFn2T9Ss33zXbVM=";
     };
-    aarch64-darwin-39 = {
-      name = "torchvision-0.23.0-cp39-cp39-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp39-cp39-macosx_11_0_arm64.whl";
-      hash = "sha256-sZDbIF+QIGwjD8L5HL39VzMzS6vA4NGb3bkKQLjPJsI=";
+    x86_64-linux-314 = {
+      name = "torchvision-0.24.0-cp314-cp314-linux_x86_64.whl";
+      url = "https://download.pytorch.org/whl/cu128/torchvision-0.24.0%2Bcu128-cp314-cp314-manylinux_2_28_x86_64.whl";
+      hash = "sha256-DkhdmHoWBslCo+SoZ83T93mR3bW1Ybrgj3AxS3CTozE=";
     };
     aarch64-darwin-310 = {
-      name = "torchvision-0.23.0-cp310-cp310-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp310-cp310-macosx_11_0_arm64.whl";
-      hash = "sha256-cmaHHaygCtRtHAc+VdlyF50SpY+lya3smj25u+1xKEo=";
+      name = "torchvision-0.24.0-cp310-cp310-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.0-cp310-cp310-macosx_11_0_arm64.whl";
+      hash = "sha256-Xo1eZn3v+HvWbSbfbSJfRiJLsHgtTz+PXS8waLX9RJI=";
     };
     aarch64-darwin-311 = {
-      name = "torchvision-0.23.0-cp311-cp311-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp311-cp311-macosx_11_0_arm64.whl";
-      hash = "sha256-Saog4h8MK9RYxx17RJd2y9XxZpPdWAcZWoIGEriiKbc=";
+      name = "torchvision-0.24.0-cp311-cp311-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.0-cp311-cp311-macosx_11_0_arm64.whl";
+      hash = "sha256-93HPkYNRrVCaKEiL5HXz6cxxp1DWsUZ4Qr+2SGOl6YY=";
     };
     aarch64-darwin-312 = {
-      name = "torchvision-0.23.0-cp312-cp312-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp312-cp312-macosx_11_0_arm64.whl";
-      hash = "sha256-4OLASpFAPo3Tr5dWxqAkodnA7ZwNWSqDFN7Y9P4w1EA=";
+      name = "torchvision-0.24.0-cp312-cp312-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.0-cp312-cp312-macosx_11_0_arm64.whl";
+      hash = "sha256-xh1AvNLiRR6TKQKnAq1JW6HsbyeekLHhXO8rtV3JEeI=";
     };
     aarch64-darwin-313 = {
-      name = "torchvision-0.23.0-cp313-cp313-macosx_11_0_arm64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp313-cp313-macosx_11_0_arm64.whl";
-      hash = "sha256-HDfjJeCaGEtzDD71FCTzg+xXRTeNwOyiRFIKyilyJgA=";
+      name = "torchvision-0.24.0-cp313-cp313-macosx_12_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.0-cp313-cp313-macosx_12_0_arm64.whl";
+      hash = "sha256-hNec/GRXMQEHzk1xLeej04iyRIS8mu3tSnbY+OOigT0=";
     };
-    aarch64-linux-39 = {
-      name = "torchvision-0.23.0-cp39-cp39-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp39-cp39-manylinux_2_28_aarch64.whl";
-      hash = "sha256-bHTLwcvuJt1PNfmJzYDczEBBHyWN7kdrKYcd7ktIOvA=";
+    aarch64-darwin-314 = {
+      name = "torchvision-0.24.0-cp314-cp314-macosx_11_0_arm64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.0-cp314-cp314-macosx_11_0_arm64.whl";
+      hash = "sha256-S9/IWl7XBkIVVfMs3F49221Av2XvA6J0zjwXY5PikEs=";
     };
     aarch64-linux-310 = {
-      name = "torchvision-0.23.0-cp310-cp310-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp310-cp310-manylinux_2_28_aarch64.whl";
-      hash = "sha256-McWDuidCajoE7KjAVFBSQQXBVk20G+ZjL3U270BabeI=";
+      name = "torchvision-0.24.0-cp310-cp310-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.0-cp310-cp310-manylinux_2_28_aarch64.whl";
+      hash = "sha256-oRClHHXomAeoOCsNgDT14YD7kxlXC+M4n/09SsT9V6k=";
     };
     aarch64-linux-311 = {
-      name = "torchvision-0.23.0-cp311-cp311-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp311-cp311-manylinux_2_28_aarch64.whl";
-      hash = "sha256-Adwz7iTHkUiu582880roo8naFnSlkeeBV3txbSM7H6Y=";
+      name = "torchvision-0.24.0-cp311-cp311-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.0-cp311-cp311-manylinux_2_28_aarch64.whl";
+      hash = "sha256-u9Y79Ov/hMSMUBI+upBSbMn3lP5FvJ9d0HzsGejGK84=";
     };
     aarch64-linux-312 = {
-      name = "torchvision-0.23.0-cp312-cp312-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp312-cp312-manylinux_2_28_aarch64.whl";
-      hash = "sha256-bdfE0ymg4DFXgDAxvIViIMYVXvCMJtT1u6yTis7PCUg=";
+      name = "torchvision-0.24.0-cp312-cp312-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.0-cp312-cp312-manylinux_2_28_aarch64.whl";
+      hash = "sha256-sFMdFIP8Mi19oNg75S8N+GCnURSrh9vuud52X+rtqEM=";
     };
     aarch64-linux-313 = {
-      name = "torchvision-0.23.0-cp313-cp313-linux_aarch64.whl";
-      url = "https://download.pytorch.org/whl/cpu/torchvision-0.23.0-cp313-cp313-manylinux_2_28_aarch64.whl";
-      hash = "sha256-L3/WwV82l+gGJ7d5NPd3BfO8Dpgni5ibJlXeAfaQPh0=";
+      name = "torchvision-0.24.0-cp313-cp313-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.0-cp313-cp313-manylinux_2_28_aarch64.whl";
+      hash = "sha256-/sEqJpz4D2sLcUccjUmM073Z2OiSxCW/Of7LYEhSw7A=";
+    };
+    aarch64-linux-314 = {
+      name = "torchvision-0.24.0-cp314-cp314-linux_aarch64.whl";
+      url = "https://download.pytorch.org/whl/cpu/torchvision-0.24.0-cp314-cp314-manylinux_2_28_aarch64.whl";
+      hash = "sha256-c1dqnEpZMiP7roWmTou9dwSavREBiT7PPF6YEoT9WLQ=";
     };
   };
 }
diff --git a/pkgs/development/python-modules/torchvision/prefetch.sh b/pkgs/development/python-modules/torchvision/prefetch.sh
index d4d631cc96b5..d3e2b8f0362f 100755
--- a/pkgs/development/python-modules/torchvision/prefetch.sh
+++ b/pkgs/development/python-modules/torchvision/prefetch.sh
@@ -10,21 +10,21 @@ linux_bucket="https://download.pytorch.org/whl/${linux_cuda_version}"
 darwin_bucket="https://download.pytorch.org/whl/cpu"
 
 url_and_key_list=(
-    "x86_64-linux-39 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp39-cp39-manylinux_2_28_x86_64.whl torchvision-${version}-cp39-cp39-linux_x86_64.whl"
     "x86_64-linux-310 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp310-cp310-manylinux_2_28_x86_64.whl torchvision-${version}-cp310-cp310-linux_x86_64.whl"
     "x86_64-linux-311 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp311-cp311-manylinux_2_28_x86_64.whl torchvision-${version}-cp311-cp311-linux_x86_64.whl"
     "x86_64-linux-312 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp312-cp312-manylinux_2_28_x86_64.whl torchvision-${version}-cp312-cp312-linux_x86_64.whl"
     "x86_64-linux-313 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp313-cp313-manylinux_2_28_x86_64.whl torchvision-${version}-cp313-cp313-linux_x86_64.whl"
-    "aarch64-darwin-39 $darwin_bucket/torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl torchvision-${version}-cp39-cp39-macosx_11_0_arm64.whl"
+    "x86_64-linux-314 $linux_bucket/torchvision-${version}%2B${linux_cuda_version}-cp314-cp314-manylinux_2_28_x86_64.whl torchvision-${version}-cp314-cp314-linux_x86_64.whl"
     "aarch64-darwin-310 $darwin_bucket/torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl torchvision-${version}-cp310-cp310-macosx_11_0_arm64.whl"
     "aarch64-darwin-311 $darwin_bucket/torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl torchvision-${version}-cp311-cp311-macosx_11_0_arm64.whl"
     "aarch64-darwin-312 $darwin_bucket/torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl torchvision-${version}-cp312-cp312-macosx_11_0_arm64.whl"
-    "aarch64-darwin-313 $darwin_bucket/torchvision-${version}-cp313-cp313-macosx_11_0_arm64.whl torchvision-${version}-cp313-cp313-macosx_11_0_arm64.whl"
-    "aarch64-linux-39 $darwin_bucket/torchvision-${version}-cp39-cp39-manylinux_2_28_aarch64.whl torchvision-${version}-cp39-cp39-linux_aarch64.whl"
+    "aarch64-darwin-313 $darwin_bucket/torchvision-${version}-cp313-cp313-macosx_12_0_arm64.whl torchvision-${version}-cp313-cp313-macosx_12_0_arm64.whl"
+    "aarch64-darwin-314 $darwin_bucket/torchvision-${version}-cp314-cp314-macosx_11_0_arm64.whl torchvision-${version}-cp314-cp314-macosx_11_0_arm64.whl"
     "aarch64-linux-310 $darwin_bucket/torchvision-${version}-cp310-cp310-manylinux_2_28_aarch64.whl torchvision-${version}-cp310-cp310-linux_aarch64.whl"
     "aarch64-linux-311 $darwin_bucket/torchvision-${version}-cp311-cp311-manylinux_2_28_aarch64.whl torchvision-${version}-cp311-cp311-linux_aarch64.whl"
     "aarch64-linux-312 $darwin_bucket/torchvision-${version}-cp312-cp312-manylinux_2_28_aarch64.whl torchvision-${version}-cp312-cp312-linux_aarch64.whl"
     "aarch64-linux-313 $darwin_bucket/torchvision-${version}-cp313-cp313-manylinux_2_28_aarch64.whl torchvision-${version}-cp313-cp313-linux_aarch64.whl"
+    "aarch64-linux-314 $darwin_bucket/torchvision-${version}-cp314-cp314-manylinux_2_28_aarch64.whl torchvision-${version}-cp314-cp314-linux_aarch64.whl"
 )
 
 hashfile="binary-hashes-$version.nix"

From 4a91d3af495cec57bdb027f4aed6fb23823d0936 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 16:36:17 +0000
Subject: [PATCH 3553/6226] python3Packages.plugwise: 1.8.2 -> 1.8.3

---
 pkgs/development/python-modules/plugwise/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix
index 8b63f53d48a6..f12df2f1e998 100644
--- a/pkgs/development/python-modules/plugwise/default.nix
+++ b/pkgs/development/python-modules/plugwise/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "plugwise";
-  version = "1.8.2";
+  version = "1.8.3";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "plugwise";
     repo = "python-plugwise";
     tag = "v${version}";
-    hash = "sha256-9mJznR6iUyKBojMaSxlsaP4XjaHtYMPkq/wGr5F90ik=";
+    hash = "sha256-E5SJhhvT6KdkMvGo1mxrsSVRixdMjCl0ED/A6ozqn9o=";
   };
 
   postPatch = ''

From 25a7f5b821f0bd287b9e5f9551ed118f2c461304 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 28 Oct 2025 19:41:24 +0300
Subject: [PATCH 3554/6226] xwayland: 24.1.8 -> 24.1.9

---
 pkgs/servers/x11/xorg/xwayland.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix
index 5b24b53185fa..78c624811784 100644
--- a/pkgs/servers/x11/xorg/xwayland.nix
+++ b/pkgs/servers/x11/xorg/xwayland.nix
@@ -54,11 +54,11 @@
 
 stdenv.mkDerivation rec {
   pname = "xwayland";
-  version = "24.1.8";
+  version = "24.1.9";
 
   src = fetchurl {
     url = "mirror://xorg/individual/xserver/${pname}-${version}.tar.xz";
-    hash = "sha256-yJCNV8jtnOuCk8Frp61a9SLvrxun5R+eTPPAd00ZmQc=";
+    hash = "sha256-8pevJ6hFCNubgNHLvMacOAHaOOtkxy87W1D1gkWa/dA=";
   };
 
   postPatch = ''

From 6aad83f11e8b8088d35d3ddca19ba62635a01c0a Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Tue, 28 Oct 2025 17:41:59 +0100
Subject: [PATCH 3555/6226] grub2: fix some patch hashes

It seems savannah has slightly changed the number of 'context' lines it
includes for some patches, invalidating our hashes.
---
 pkgs/tools/misc/grub/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/grub/default.nix b/pkgs/tools/misc/grub/default.nix
index 66f7c981fff4..4980c1db61a9 100644
--- a/pkgs/tools/misc/grub/default.nix
+++ b/pkgs/tools/misc/grub/default.nix
@@ -219,7 +219,7 @@ stdenv.mkDerivation rec {
     (fetchpatch {
       name = "23_prerequisite_1_key_protector_add_key_protectors_framework.patch";
       url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=5d260302da672258444b01239803c8f4d753e3f3";
-      hash = "sha256-9WnFN6xMiv+1XMhNHgVEegkhwzp9KpRZI6MIZY/Ih3Q=";
+      hash = "sha256-5aFHzc5qXBNLEc6yzI17AH6J7EYogcXdLxk//1QgumY=";
     })
     (fetchpatch {
       name = "23_prerequisite_2_disk_cryptodisk_allow_user_to_retry_failed_passphrase.patch";
@@ -249,7 +249,7 @@ stdenv.mkDerivation rec {
     (fetchpatch {
       name = "23_CVE-2024-49504.patch";
       url = "https://git.savannah.gnu.org/cgit/grub.git/patch/?id=13febd78db3cd85dcba67d8ad03ad4d42815f11e";
-      hash = "sha256-U7lNUb4iVAyQ1yEg5ECHCQGE51tKvY13T9Ji09Q1W9Y=";
+      hash = "sha256-GejDL9IKbmbSUmp8F1NuvBcFAp2/W04jxmOatI5dKn8=";
     })
     (fetchpatch {
       name = "24_disk_loopback_reference_tracking_for_the_loopback.patch";

From c663e7f914cf9d2259cf2aa0df25520dac23947a Mon Sep 17 00:00:00 2001
From: Sergey Gulin <sergeygulin96@gmail.com>
Date: Tue, 28 Oct 2025 19:47:19 +0300
Subject: [PATCH 3556/6226] teams/nix-formatting: add Sereja313

Adding myself to the maintainers list and the nix-formatting team.
---
 maintainers/maintainer-list.nix | 8 ++++++++
 maintainers/team-list.nix       | 3 +--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ee193d84d31f..4100b6d95be0 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -23530,6 +23530,14 @@
     githubId = 5791019;
     name = "Jiuyang Liu";
   };
+  Sereja313 = {
+    name = "Sergey Gulin";
+    github = "Sereja313";
+    githubId = 112060595;
+    email = "sergeygulin96@gmail.com";
+    matrix = "@sereja:sereja.xyz";
+    keys = [ { fingerprint = "AEF0 79C6 7618 8929 4124  22DB 3AB4 2DF3 F50E 3420"; } ];
+  };
   serge = {
     email = "sb@canva.com";
     github = "serge-belov";
diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index 1ad64b5bc2df..de7d9e27a22b 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -358,8 +358,7 @@ with lib.maintainers;
       _0x4A6F
       MattSturgeon
       jfly
-      # Not in the maintainer list
-      # Sereja313
+      Sereja313
     ];
     scope = "Nix formatting team: https://nixos.org/community/teams/formatting/";
     shortName = "Nix formatting team";

From 28b9aed42743a6fb617ca2c20f647bf1fa71c24f Mon Sep 17 00:00:00 2001
From: George Miao <gm@miao.dev>
Date: Tue, 28 Oct 2025 12:54:54 -0400
Subject: [PATCH 3557/6226] coqPackages.QuickChick: 2.0.4 -> 2.1.1

---
 pkgs/development/coq-modules/QuickChick/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/coq-modules/QuickChick/default.nix b/pkgs/development/coq-modules/QuickChick/default.nix
index 370d9ee0f836..dbbbc1d7c438 100644
--- a/pkgs/development/coq-modules/QuickChick/default.nix
+++ b/pkgs/development/coq-modules/QuickChick/default.nix
@@ -28,7 +28,7 @@ in
     lib.switch
       [ coq.coq-version mathcomp-boot.version ]
       [
-        (case (lib.versions.range "8.15" "9.0") lib.pred.true "2.0.4")
+        (case (lib.versions.range "8.15" "9.1") lib.pred.true "2.1.1")
         (case (lib.versions.range "8.13" "8.17") lib.pred.true "1.6.5")
         (case "8.13" lib.pred.true "1.5.0")
         (case "8.12" lib.pred.true "1.4.0")
@@ -41,6 +41,7 @@ in
         (case "8.5" lib.pred.true "20170512")
       ]
       null;
+  release."2.1.1".sha256 = "sha256-tcZFpf8joEdVCgy1oKWdaM/9q3EMsF/jT+zz+kIsix8=";
   release."2.0.4".sha256 = "sha256-WD8B+n8gyGctHMO+M8201Ca3Uw8zCWYsOatSNGCf0/s=";
   release."2.0.2".sha256 = "sha256-xxKkwDRjB8nUiXNhein1Ppn0DP5FZ13J90xUPAnQBbs=";
   release."2.0.1".sha256 = "sha256-gJc+9Or6tbqE00920Il4pnEvokRoiADX6CxP/Q0QZaY=";

From 1acb4f040fec779ae8a9a5cb30ad97d7b11946f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 16:59:58 +0000
Subject: [PATCH 3558/6226] python3Packages.elasticsearch8: 8.19.1 -> 8.19.2

---
 pkgs/development/python-modules/elasticsearch8/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix
index 2eabcd7bd1a6..d3564f9665b2 100644
--- a/pkgs/development/python-modules/elasticsearch8/default.nix
+++ b/pkgs/development/python-modules/elasticsearch8/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "elasticsearch8";
-  version = "8.19.1";
+  version = "8.19.2";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-/JkH60q7zk792R3IRo/DylOd8xVSqEgH1/KmXFPdy2U=";
+    hash = "sha256-lDfI5RI8JgtZdmGDv9kVIGdyVChJtpf3inlEbsiQqA4=";
   };
 
   build-system = [ hatchling ];

From 6691c568b0624e2fdd4c3c5320960d96900d544b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 28 Oct 2025 18:06:37 +0100
Subject: [PATCH 3559/6226] nixosTests.gitlab: fix eval

This was recently turned into a throw.
---
 nixos/modules/services/misc/docker-registry.nix | 2 +-
 nixos/modules/services/misc/gitlab.nix          | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix
index 2c2a59052d1b..f4abe2c8bf86 100644
--- a/nixos/modules/services/misc/docker-registry.nix
+++ b/nixos/modules/services/misc/docker-registry.nix
@@ -48,7 +48,7 @@ in
   options.services.dockerRegistry = {
     enable = lib.mkEnableOption "Docker Registry";
 
-    package = lib.mkPackageOption pkgs "docker-distribution" {
+    package = lib.mkPackageOption pkgs "distribution" {
       example = "gitlab-container-registry";
     };
 
diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix
index 127a7e73e83e..f0c21379ee3c 100644
--- a/nixos/modules/services/misc/gitlab.nix
+++ b/nixos/modules/services/misc/gitlab.nix
@@ -588,12 +588,12 @@ in
             if versionAtLeast config.system.stateVersion "23.11" then
               pkgs.gitlab-container-registry
             else
-              pkgs.docker-distribution;
-          defaultText = literalExpression "pkgs.docker-distribution";
+              pkgs.distribution;
+          defaultText = literalExpression "pkgs.distribution";
           description = ''
             Container registry package to use.
 
-            External container registries such as `pkgs.docker-distribution` are not supported
+            External container registries such as `pkgs.distribution` are not supported
             anymore since GitLab 16.0.0.
           '';
         };
@@ -1179,7 +1179,7 @@ in
         (
           cfg.registry.enable
           && versionAtLeast (getVersion cfg.packages.gitlab) "16.0.0"
-          && cfg.registry.package == pkgs.docker-distribution
+          && cfg.registry.package == pkgs.distribution
         )
         ''
           Support for container registries other than gitlab-container-registry has ended since GitLab 16.0.0 and is scheduled for removal in a future release.

From bc4c68594c1a552ae00299ba8408bb15eed35361 Mon Sep 17 00:00:00 2001
From: teohz <gitstuff@teohz.com>
Date: Tue, 28 Oct 2025 17:01:03 +0000
Subject: [PATCH 3560/6226] i3a: 2.1.1 -> 2.4.0

---
 pkgs/by-name/i3/i3a/package.nix | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/i3/i3a/package.nix b/pkgs/by-name/i3/i3a/package.nix
index 525b990f0e8f..77383d86e3d9 100644
--- a/pkgs/by-name/i3/i3a/package.nix
+++ b/pkgs/by-name/i3/i3a/package.nix
@@ -6,17 +6,18 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "i3a";
-  version = "2.1.1";
+  version = "2.4.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-b1bB7Gto4aL1rbQXIelBVhutjIvZY+K+Y66BGN7OcCs=";
+    hash = "sha256-BcGAFFq3UEj4o7nNQ9aStueKmeDNIqSIqkYWhs2Tnqg=";
   };
 
   build-system = [
     python3Packages.setuptools
     python3Packages.setuptools-scm
+    python3Packages.hatchling
   ];
 
   dependencies = [ python3Packages.i3ipc ];
@@ -25,11 +26,15 @@ python3Packages.buildPythonApplication rec {
 
   pythonImportsCheck = [ "i3a" ];
 
-  meta = with lib; {
+  meta = {
     changelog = "https://git.goral.net.pl/i3a.git/log/";
     description = "Set of scripts used for automation of i3 and sway window manager layouts";
     homepage = "https://git.goral.net.pl/i3a.git/about";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ moni ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [
+      moni
+      teohz
+    ];
+    broken = python3Packages.python.version < "3.11";
   };
 }

From f929fa921dd252cb1e23d128378f57c8203dcb62 Mon Sep 17 00:00:00 2001
From: Jonas Franke <jofr1@uni-bremen.de>
Date: Thu, 23 Oct 2025 10:43:50 +0200
Subject: [PATCH 3561/6226] bluej: fix desktop executable name

---
 pkgs/by-name/bl/bluej/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/bl/bluej/package.nix b/pkgs/by-name/bl/bluej/package.nix
index b5fa9f683711..925c1508555e 100644
--- a/pkgs/by-name/bl/bluej/package.nix
+++ b/pkgs/by-name/bl/bluej/package.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: {
     (makeDesktopItem {
       name = "BlueJ";
       desktopName = "BlueJ";
-      exec = "BlueJ";
+      exec = "bluej";
       icon = "bluej";
       comment = "A simple powerful Java IDE";
       categories = [

From 49af74ba0db83933428f467ebb2ecd30537cce8c Mon Sep 17 00:00:00 2001
From: loner <2788892716@qq.com>
Date: Tue, 21 Oct 2025 02:02:34 +0800
Subject: [PATCH 3562/6226] kapitano: remove kapitano

---
 pkgs/by-name/ka/kapitano/package.nix | 75 ----------------------------
 pkgs/top-level/aliases.nix           |  1 +
 2 files changed, 1 insertion(+), 75 deletions(-)
 delete mode 100644 pkgs/by-name/ka/kapitano/package.nix

diff --git a/pkgs/by-name/ka/kapitano/package.nix b/pkgs/by-name/ka/kapitano/package.nix
deleted file mode 100644
index 6dbcfe1e8643..000000000000
--- a/pkgs/by-name/ka/kapitano/package.nix
+++ /dev/null
@@ -1,75 +0,0 @@
-{
-  lib,
-  fetchFromGitea,
-  meson,
-  ninja,
-  pkg-config,
-  glib,
-  gtk4,
-  libadwaita,
-  python3Packages,
-  clamav,
-  appstream-glib,
-  desktop-file-utils,
-  libxml2,
-  gobject-introspection,
-  wrapGAppsHook4,
-  librsvg,
-}:
-python3Packages.buildPythonApplication rec {
-  pname = "kapitano";
-  version = "1.1.5";
-  pyproject = false;
-
-  src = fetchFromGitea {
-    domain = "codeberg.org";
-    owner = "zynequ";
-    repo = "Kapitano";
-    tag = version;
-    hash = "sha256-eX35ZR2O56NwoFnqGNZi2lNUpoBvaYZqFh69dQ+Eng0=";
-    fetchLFS = true;
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    desktop-file-utils
-    libxml2
-    pkg-config
-    appstream-glib
-    wrapGAppsHook4
-    gobject-introspection
-  ];
-
-  buildInputs = [
-    glib
-    gtk4
-    libadwaita
-    librsvg
-  ];
-
-  dependencies = with python3Packages; [ pygobject3 ];
-
-  postPatch = ''
-    substituteInPlace src/config/paths_config.py \
-      --replace-fail 'USER_DATA_DIR = GLib.get_user_data_dir()' 'USER_DATA_DIR = os.path.join(GLib.get_user_data_dir(), "kapitano"); os.makedirs(USER_DATA_DIR, exist_ok=True)'
-  '';
-
-  dontWrapGApps = true;
-
-  preFixup = ''
-    makeWrapperArgs+=(
-      ''${gappsWrapperArgs[@]}
-      --prefix PATH : "${lib.makeBinPath [ clamav ]}"
-    )
-  '';
-
-  meta = {
-    description = "Modern ClamAV front-end that uses gtk4/libadwaita";
-    homepage = "https://codeberg.org/zynequ/Kapitano";
-    mainProgram = "kapitano";
-    license = lib.licenses.gpl3Plus;
-    platforms = lib.platforms.linux;
-    maintainers = with lib.maintainers; [ lonerOrz ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index e4ef545384ed..b058c7c21370 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1288,6 +1288,7 @@ mapAliases {
   kanidm_1_3 = throw "'kanidm_1_3' has been removed as it has reached end of life"; # Added 2025-03-10
   kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18
   kanidmWithSecretProvisioning_1_4 = throw "'kanidmWithSecretProvisioning_1_4' has been removed as it has reached end of life"; # Added 2025-06-18
+  kapitano = throw "'kapitano' has been removed, as it is unmaintained upstream"; # Added 2025-10-29
   kbibtex = throw "'kbibtex' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
   kcli = throw "kcli has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
   kdbplus = throw "'kdbplus' has been removed from nixpkgs"; # Added 2024-05-06

From c319ac6571de2eac9f0a8527a9776eec9b308948 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 28 Oct 2025 18:10:55 +0100
Subject: [PATCH 3563/6226] various: fix eval

runCommandNoCC has been renamed to runCommand and the former has
recently been turned into a throw.
---
 doc/languages-frameworks/texlive.section.md                | 2 +-
 nixos/tests/acme/http01-builtin.nix                        | 2 +-
 nixos/tests/kanidm-provisioning.nix                        | 2 +-
 nixos/tests/kanidm.nix                                     | 2 +-
 .../tests/nix-required-mounts/ensure-path-not-present.nix  | 2 +-
 nixos/tests/nix-required-mounts/test-require-feature.nix   | 2 +-
 .../nix-required-mounts/test-structured-attrs-empty.nix    | 7 +++----
 nixos/tests/nix-required-mounts/test-structured-attrs.nix  | 2 +-
 .../do/doctoc/test-generates-valid-markdown/default.nix    | 4 ++--
 pkgs/by-name/ha/hare/cross-compilation-tests.nix           | 4 ++--
 pkgs/by-name/ha/hare/mime-module-test.nix                  | 4 ++--
 11 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md
index b4fb5d067f0d..b3305e259044 100644
--- a/doc/languages-frameworks/texlive.section.md
+++ b/doc/languages-frameworks/texlive.section.md
@@ -235,7 +235,7 @@ runCommand "test.pdf" { nativeBuildInputs = [ latex_with_foiltex ]; } ''
 The font cache for LuaLaTeX is written to `$HOME`.
 Therefore, it is necessary to set `$HOME` to a writable path, e.g. [before using LuaLaTeX in nix derivations](https://github.com/NixOS/nixpkgs/issues/180639):
 ```nix
-runCommandNoCC "lualatex-hello-world" { buildInputs = [ texliveFull ]; } ''
+runCommand "lualatex-hello-world" { buildInputs = [ texliveFull ]; } ''
   mkdir $out
   echo '\documentclass{article} \begin{document} Hello world \end{document}' > main.tex
   env HOME=$(mktemp -d) lualatex  -interaction=nonstopmode -output-format=pdf -output-directory=$out ./main.tex
diff --git a/nixos/tests/acme/http01-builtin.nix b/nixos/tests/acme/http01-builtin.nix
index d92737ed6fb1..a82ef6f5652a 100644
--- a/nixos/tests/acme/http01-builtin.nix
+++ b/nixos/tests/acme/http01-builtin.nix
@@ -126,7 +126,7 @@ in
                 DNS.1 = ${config.networking.fqdn}
               '';
               csrData =
-                pkgs.runCommandNoCC "csr-and-key"
+                pkgs.runCommand "csr-and-key"
                   {
                     buildInputs = [ pkgs.openssl ];
                   }
diff --git a/nixos/tests/kanidm-provisioning.nix b/nixos/tests/kanidm-provisioning.nix
index 547de0d1ac8f..1e6b39be7eba 100644
--- a/nixos/tests/kanidm-provisioning.nix
+++ b/nixos/tests/kanidm-provisioning.nix
@@ -4,7 +4,7 @@ let
   serverDomain = certs.domain;
 
   # copy certs to store to work around mount namespacing
-  certsPath = pkgs.runCommandNoCC "snakeoil-certs" { } ''
+  certsPath = pkgs.runCommand "snakeoil-certs" { } ''
     mkdir $out
     cp ${certs."${serverDomain}".cert} $out/snakeoil.crt
     cp ${certs."${serverDomain}".key} $out/snakeoil.key
diff --git a/nixos/tests/kanidm.nix b/nixos/tests/kanidm.nix
index 9d918f156b2c..78f71fce90c6 100644
--- a/nixos/tests/kanidm.nix
+++ b/nixos/tests/kanidm.nix
@@ -8,7 +8,7 @@ let
   };
 
   # copy certs to store to work around mount namespacing
-  certsPath = pkgs.runCommandNoCC "snakeoil-certs" { } ''
+  certsPath = pkgs.runCommand "snakeoil-certs" { } ''
     mkdir $out
     cp ${certs."${serverDomain}".cert} $out/snakeoil.crt
     cp ${certs."${serverDomain}".key} $out/snakeoil.key
diff --git a/nixos/tests/nix-required-mounts/ensure-path-not-present.nix b/nixos/tests/nix-required-mounts/ensure-path-not-present.nix
index 270c268fcbd9..eddc68aa0a54 100644
--- a/nixos/tests/nix-required-mounts/ensure-path-not-present.nix
+++ b/nixos/tests/nix-required-mounts/ensure-path-not-present.nix
@@ -3,7 +3,7 @@
   feature,
 }:
 
-pkgs.runCommandNoCC "${feature}-not-present" { } ''
+pkgs.runCommand "${feature}-not-present" { } ''
   if [[ -e /${feature}-files ]]; then
     echo "No ${feature} in requiredSystemFeatures, but /${feature}-files was mounted anyway"
     exit 1
diff --git a/nixos/tests/nix-required-mounts/test-require-feature.nix b/nixos/tests/nix-required-mounts/test-require-feature.nix
index 447fd49a300a..c5a13f2a749f 100644
--- a/nixos/tests/nix-required-mounts/test-require-feature.nix
+++ b/nixos/tests/nix-required-mounts/test-require-feature.nix
@@ -3,7 +3,7 @@
   feature,
 }:
 
-pkgs.runCommandNoCC "${feature}-present" { requiredSystemFeatures = [ feature ]; } ''
+pkgs.runCommand "${feature}-present" { requiredSystemFeatures = [ feature ]; } ''
   if [[ ! -e /${feature}-files ]]; then
     echo "The host declares ${feature} support, but doesn't expose /${feature}-files" >&2
     exit 1
diff --git a/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix b/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix
index 86f275330936..9bf29de7fd24 100644
--- a/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix
+++ b/nixos/tests/nix-required-mounts/test-structured-attrs-empty.nix
@@ -2,7 +2,6 @@
   pkgs ? import <nixpkgs> { },
 }:
 
-pkgs.runCommandNoCC "nix-required-mounts-structured-attrs-no-features" { __structuredAttrs = true; }
-  ''
-    touch $out
-  ''
+pkgs.runCommand "nix-required-mounts-structured-attrs-no-features" { __structuredAttrs = true; } ''
+  touch $out
+''
diff --git a/nixos/tests/nix-required-mounts/test-structured-attrs.nix b/nixos/tests/nix-required-mounts/test-structured-attrs.nix
index 874910eee7bb..c0477258d230 100644
--- a/nixos/tests/nix-required-mounts/test-structured-attrs.nix
+++ b/nixos/tests/nix-required-mounts/test-structured-attrs.nix
@@ -3,7 +3,7 @@
   feature,
 }:
 
-pkgs.runCommandNoCC "${feature}-present-structured"
+pkgs.runCommand "${feature}-present-structured"
   {
     __structuredAttrs = true;
     requiredSystemFeatures = [ feature ];
diff --git a/pkgs/by-name/do/doctoc/test-generates-valid-markdown/default.nix b/pkgs/by-name/do/doctoc/test-generates-valid-markdown/default.nix
index d986566bde4f..00dcc3c02424 100644
--- a/pkgs/by-name/do/doctoc/test-generates-valid-markdown/default.nix
+++ b/pkgs/by-name/do/doctoc/test-generates-valid-markdown/default.nix
@@ -1,5 +1,5 @@
-{ runCommandNoCC, doctoc }:
-runCommandNoCC "doctoc-test-generates-valid-markdown.md" { nativeBuildInputs = [ doctoc ]; } ''
+{ runCommand, doctoc }:
+runCommand "doctoc-test-generates-valid-markdown.md" { nativeBuildInputs = [ doctoc ]; } ''
   cp ${./input.md} ./target.md && chmod +w ./target.md
   doctoc ./target.md
 
diff --git a/pkgs/by-name/ha/hare/cross-compilation-tests.nix b/pkgs/by-name/ha/hare/cross-compilation-tests.nix
index 45245d730e5b..3e313da6a219 100644
--- a/pkgs/by-name/ha/hare/cross-compilation-tests.nix
+++ b/pkgs/by-name/ha/hare/cross-compilation-tests.nix
@@ -2,7 +2,7 @@
   lib,
   file,
   hare,
-  runCommandNoCC,
+  runCommand,
   writeText,
 }:
 let
@@ -13,7 +13,7 @@ let
     export fn main() void = void;
   '';
 in
-runCommandNoCC "${hare.pname}-cross-compilation-test"
+runCommand "${hare.pname}-cross-compilation-test"
   {
     nativeBuildInputs = [
       hare
diff --git a/pkgs/by-name/ha/hare/mime-module-test.nix b/pkgs/by-name/ha/hare/mime-module-test.nix
index 073ae09e3557..ef53bee8c3bc 100644
--- a/pkgs/by-name/ha/hare/mime-module-test.nix
+++ b/pkgs/by-name/ha/hare/mime-module-test.nix
@@ -1,6 +1,6 @@
 {
   hare,
-  runCommandNoCC,
+  runCommand,
   writeText,
 }:
 let
@@ -18,7 +18,7 @@ let
       };
   '';
 in
-runCommandNoCC "mime-module-test" { nativeBuildInputs = [ hare ]; } ''
+runCommand "mime-module-test" { nativeBuildInputs = [ hare ]; } ''
   HARECACHE="$(mktemp -d)"
   export HARECACHE
   readonly binout="test-bin"

From 0483e40becb6048629b6407d626f3a2b299b2a6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Tom=C3=A9=20Corti=C3=B1as?=
 <carlos.tome.cortinas@gmail.com>
Date: Fri, 17 Oct 2025 17:12:38 +0200
Subject: [PATCH 3564/6226] Replace hardcoded agda binary by name from package

---
 pkgs/build-support/agda/default.nix | 6 +++---
 pkgs/top-level/agda-packages.nix    | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index b8645053b6e9..1ae5ed706d48 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -45,7 +45,7 @@ let
     }:
     let
       libraryFile = mkLibraryFile pkgs;
-      pname = "agdaWithPackages";
+      pname = "${Agda.meta.mainProgram}" + "WithPackages";
       version = Agda.version;
     in
     runCommand "${pname}-${version}"
@@ -68,7 +68,7 @@ let
       }
       ''
         mkdir -p $out/bin
-        makeWrapper ${lib.getExe Agda} $out/bin/agda \
+        makeWrapper ${lib.getExe Agda} $out/bin/${Agda.meta.mainProgram} \
           ${lib.optionalString (ghc != null) ''--add-flags "--with-compiler=${ghc}/bin/ghc"''} \
           --add-flags "--library-file=${libraryFile}"
         ln -s ${lib.getExe' Agda "agda-mode"} $out/bin/agda-mode
@@ -116,7 +116,7 @@ let
         else
           ''
             runHook preBuild
-            agda --build-library
+            ${lib.getExe agdaWithPkgs} --build-library
             runHook postBuild
           '';
 
diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix
index b9fab48170a6..4a000b4866d6 100644
--- a/pkgs/top-level/agda-packages.nix
+++ b/pkgs/top-level/agda-packages.nix
@@ -27,7 +27,7 @@ let
 
       lib = lib.extend (final: prev: import ../build-support/agda/lib.nix { lib = prev; });
 
-      agda = withPackages [ ];
+      "${Agda.meta.mainProgram}" = withPackages [ ];
 
       standard-library = callPackage ../development/libraries/agda/standard-library { };
 

From a8967950c8d9cd63fea779afea73a9015988cca4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Tom=C3=A9=20Corti=C3=B1as?=
 <carlos.tome.cortinas@gmail.com>
Date: Fri, 17 Oct 2025 17:13:12 +0200
Subject: [PATCH 3565/6226] Remove agda-mode from executables

---
 pkgs/build-support/agda/default.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index 1ae5ed706d48..e82f2a2d475c 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -71,7 +71,6 @@ let
         makeWrapper ${lib.getExe Agda} $out/bin/${Agda.meta.mainProgram} \
           ${lib.optionalString (ghc != null) ''--add-flags "--with-compiler=${ghc}/bin/ghc"''} \
           --add-flags "--library-file=${libraryFile}"
-        ln -s ${lib.getExe' Agda "agda-mode"} $out/bin/agda-mode
       '';
 
   withPackages = arg: if isAttrs arg then withPackages' arg else withPackages' { pkgs = arg; };

From cd8deb7309458c6d537ff200dd3d4d21f532a06d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Tom=C3=A9=20Corti=C3=B1as?=
 <carlos.tome.cortinas@gmail.com>
Date: Sat, 18 Oct 2025 09:30:50 +0200
Subject: [PATCH 3566/6226] Revert change

---
 pkgs/top-level/agda-packages.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/agda-packages.nix b/pkgs/top-level/agda-packages.nix
index 4a000b4866d6..b9fab48170a6 100644
--- a/pkgs/top-level/agda-packages.nix
+++ b/pkgs/top-level/agda-packages.nix
@@ -27,7 +27,7 @@ let
 
       lib = lib.extend (final: prev: import ../build-support/agda/lib.nix { lib = prev; });
 
-      "${Agda.meta.mainProgram}" = withPackages [ ];
+      agda = withPackages [ ];
 
       standard-library = callPackage ../development/libraries/agda/standard-library { };
 

From ab75be0a25c1f5aad18fd75188113f163b084f9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Tom=C3=A9=20Corti=C3=B1as?=
 <carlos.tome.cortinas@gmail.com>
Date: Mon, 20 Oct 2025 10:20:52 +0200
Subject: [PATCH 3567/6226] Refactor tests/agda.nix to support more tests

---
 ci/OWNERS                               | 2 +-
 nixos/tests/{agda.nix => agda/base.nix} | 0
 nixos/tests/agda/default.nix            | 3 +++
 nixos/tests/all-tests.nix               | 4 +++-
 4 files changed, 7 insertions(+), 2 deletions(-)
 rename nixos/tests/{agda.nix => agda/base.nix} (100%)
 create mode 100644 nixos/tests/agda/default.nix

diff --git a/ci/OWNERS b/ci/OWNERS
index b459a496cdf3..e03682addd23 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -343,7 +343,7 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt
 /pkgs/top-level/agda-packages.nix         @NixOS/agda
 /pkgs/development/libraries/agda          @NixOS/agda
 /doc/languages-frameworks/agda.section.md @NixOS/agda
-/nixos/tests/agda.nix                     @NixOS/agda
+/nixos/tests/agda                         @NixOS/agda
 
 # Idris
 /pkgs/development/idris-modules @Infinisil
diff --git a/nixos/tests/agda.nix b/nixos/tests/agda/base.nix
similarity index 100%
rename from nixos/tests/agda.nix
rename to nixos/tests/agda/base.nix
diff --git a/nixos/tests/agda/default.nix b/nixos/tests/agda/default.nix
new file mode 100644
index 000000000000..ab473aa9e495
--- /dev/null
+++ b/nixos/tests/agda/default.nix
@@ -0,0 +1,3 @@
+{ runTest }: {
+  base = runTest ./base.nix;
+}
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index d1eb5b439da0..490ffa11ed24 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -203,7 +203,9 @@ in
   adguardhome = runTest ./adguardhome.nix;
   aesmd = runTestOn [ "x86_64-linux" ] ./aesmd.nix;
   agate = runTest ./web-servers/agate.nix;
-  agda = runTest ./agda.nix;
+  agda = import ./agda {
+    inherit runTest;
+  };
   age-plugin-tpm-decrypt = runTest ./age-plugin-tpm-decrypt.nix;
   agnos = discoverTests (import ./agnos.nix);
   agorakit = runTest ./web-apps/agorakit.nix;

From f933041b6c9edc13d66876beeed1ce4ae01e176f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Tom=C3=A9=20Corti=C3=B1as?=
 <carlos.tome.cortinas@gmail.com>
Date: Mon, 20 Oct 2025 10:46:08 +0200
Subject: [PATCH 3568/6226] Add test to override Agda package with custom
 backend

---
 nixos/tests/agda/default.nix               |  4 +-
 nixos/tests/agda/override-with-backend.nix | 71 ++++++++++++++++++++++
 2 files changed, 74 insertions(+), 1 deletion(-)
 create mode 100644 nixos/tests/agda/override-with-backend.nix

diff --git a/nixos/tests/agda/default.nix b/nixos/tests/agda/default.nix
index ab473aa9e495..ad0527beac30 100644
--- a/nixos/tests/agda/default.nix
+++ b/nixos/tests/agda/default.nix
@@ -1,3 +1,5 @@
-{ runTest }: {
+{ runTest }:
+{
   base = runTest ./base.nix;
+  override-with-backend = runTest ./override-with-backend.nix;
 }
diff --git a/nixos/tests/agda/override-with-backend.nix b/nixos/tests/agda/override-with-backend.nix
new file mode 100644
index 000000000000..42845dd02b00
--- /dev/null
+++ b/nixos/tests/agda/override-with-backend.nix
@@ -0,0 +1,71 @@
+{ pkgs, ... }:
+let
+  mainProgram = "agda-trivial-backend";
+
+  hello-world = pkgs.writeText "hello-world" ''
+    {-# OPTIONS --guardedness #-}
+    open import IO
+    open import Level
+
+    main = run {0ℓ} (putStrLn "Hello World!")
+  '';
+  agda-trivial-backend =
+    pkgs.runCommand "trivial-backend"
+      {
+        version = "${pkgs.haskellPackages.Agda.version}";
+        meta.mainProgram = "${mainProgram}";
+        buildInputs = [ (pkgs.haskellPackages.ghcWithPackages (pkgs: [ pkgs.Agda ])) ];
+      }
+      ''
+        cat << EOF > Main.hs
+        module Main where
+
+        import Agda.Main ( runAgda )
+
+        main :: IO ()
+        main = runAgda []
+        EOF
+
+        ghc Main.hs -o ${mainProgram}
+        mkdir -p $out/bin
+        cp ${mainProgram} $out/bin
+      '';
+in
+{
+  name = "agda-trivial-backend";
+  meta = {
+    maintainers = [
+      # FIXME
+    ];
+  };
+
+  nodes.machine =
+    { pkgs, ... }:
+    let
+      agdaPackages = pkgs.agdaPackages.override (oldAttrs: {
+        Agda = agda-trivial-backend;
+      });
+    in
+    {
+      environment.systemPackages = [
+        (agdaPackages.agda.withPackages {
+          pkgs = p: [ p.standard-library ];
+        })
+      ];
+      virtualisation.memorySize = 2000; # Agda uses a lot of memory
+    };
+
+  testScript = ''
+    # agda executable is not present
+    machine.fail("agda --version")
+    # Hello world
+    machine.succeed(
+        "cp ${hello-world} HelloWorld.agda"
+    )
+    machine.succeed("${mainProgram} -l standard-library -i . -c HelloWorld.agda")
+    # Check execution
+    assert "Hello World!" in machine.succeed(
+        "./HelloWorld"
+    ), "HelloWorld does not run properly"
+  '';
+}

From 4c64e800a39f1aef6128b6b3d255a2d5fdc80735 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Tom=C3=A9=20Corti=C3=B1as?=
 <carlos.tome.cortinas@gmail.com>
Date: Thu, 23 Oct 2025 09:43:22 +0200
Subject: [PATCH 3569/6226] Update pkgs/build-support/agda/default.nix

Co-authored-by: Philip Taron <philip.taron@gmail.com>
---
 pkgs/build-support/agda/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index e82f2a2d475c..b1036c968daf 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -45,7 +45,7 @@ let
     }:
     let
       libraryFile = mkLibraryFile pkgs;
-      pname = "${Agda.meta.mainProgram}" + "WithPackages";
+      pname = "${Agda.meta.mainProgram}WithPackages";
       version = Agda.version;
     in
     runCommand "${pname}-${version}"

From 5882fce4978881a8cd15aa378b907d9e7e661139 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Tom=C3=A9=20Corti=C3=B1as?=
 <carlos.tome.cortinas@gmail.com>
Date: Thu, 23 Oct 2025 10:48:35 +0200
Subject: [PATCH 3570/6226] Incorporate suggestions

- land `HelloWorld.agda` and `TrivialBackend.hs` in files
- replace `runCommand` by `stdenvNoCC.mkDerivation`
- refactor asserts
---
 nixos/tests/agda/files/HelloWorld.agda     |  5 ++
 nixos/tests/agda/files/TrivialBackend.hs   |  6 +++
 nixos/tests/agda/override-with-backend.nix | 53 ++++++++++------------
 3 files changed, 34 insertions(+), 30 deletions(-)
 create mode 100644 nixos/tests/agda/files/HelloWorld.agda
 create mode 100644 nixos/tests/agda/files/TrivialBackend.hs

diff --git a/nixos/tests/agda/files/HelloWorld.agda b/nixos/tests/agda/files/HelloWorld.agda
new file mode 100644
index 000000000000..5cef59109c4b
--- /dev/null
+++ b/nixos/tests/agda/files/HelloWorld.agda
@@ -0,0 +1,5 @@
+{-# OPTIONS --guardedness #-}
+open import IO
+open import Level
+
+main = run {0ℓ} (putStrLn "Hello World!")
diff --git a/nixos/tests/agda/files/TrivialBackend.hs b/nixos/tests/agda/files/TrivialBackend.hs
new file mode 100644
index 000000000000..0a37115eb80f
--- /dev/null
+++ b/nixos/tests/agda/files/TrivialBackend.hs
@@ -0,0 +1,6 @@
+module Main where
+
+import Agda.Main ( runAgda )
+
+main :: IO ()
+main = runAgda []
diff --git a/nixos/tests/agda/override-with-backend.nix b/nixos/tests/agda/override-with-backend.nix
index 42845dd02b00..2bf9031a59ec 100644
--- a/nixos/tests/agda/override-with-backend.nix
+++ b/nixos/tests/agda/override-with-backend.nix
@@ -2,34 +2,25 @@
 let
   mainProgram = "agda-trivial-backend";
 
-  hello-world = pkgs.writeText "hello-world" ''
-    {-# OPTIONS --guardedness #-}
-    open import IO
-    open import Level
+  hello-world = ./files/HelloWorld.agda;
 
-    main = run {0ℓ} (putStrLn "Hello World!")
-  '';
-  agda-trivial-backend =
-    pkgs.runCommand "trivial-backend"
-      {
-        version = "${pkgs.haskellPackages.Agda.version}";
-        meta.mainProgram = "${mainProgram}";
-        buildInputs = [ (pkgs.haskellPackages.ghcWithPackages (pkgs: [ pkgs.Agda ])) ];
-      }
-      ''
-        cat << EOF > Main.hs
-        module Main where
-
-        import Agda.Main ( runAgda )
-
-        main :: IO ()
-        main = runAgda []
-        EOF
-
-        ghc Main.hs -o ${mainProgram}
-        mkdir -p $out/bin
-        cp ${mainProgram} $out/bin
-      '';
+  agda-trivial-backend = pkgs.stdenvNoCC.mkDerivation {
+    name = "trivial-backend";
+    meta = { inherit mainProgram; };
+    version = "${pkgs.haskellPackages.Agda.version}";
+    src = ./files/TrivialBackend.hs;
+    buildInputs = [
+      (pkgs.haskellPackages.ghcWithPackages (pkgs: [ pkgs.Agda ]))
+    ];
+    dontUnpack = true;
+    buildPhase = ''
+      ghc $src -o ${mainProgram}
+    '';
+    installPhase = ''
+      mkdir -p $out/bin
+      cp ${mainProgram} $out/bin
+    '';
+  };
 in
 {
   name = "agda-trivial-backend";
@@ -58,14 +49,16 @@ in
   testScript = ''
     # agda executable is not present
     machine.fail("agda --version")
+    # backend is present
+    text = machine.succeed("${mainProgram} --help")
+    assert "${mainProgram}" in text
     # Hello world
     machine.succeed(
         "cp ${hello-world} HelloWorld.agda"
     )
     machine.succeed("${mainProgram} -l standard-library -i . -c HelloWorld.agda")
     # Check execution
-    assert "Hello World!" in machine.succeed(
-        "./HelloWorld"
-    ), "HelloWorld does not run properly"
+    text = machine.succeed("./HelloWorld")
+    assert "Hello World!" in text, f"HelloWorld does not run properly: output was {text}"
   '';
 }

From fdf4727164f53e639de590b2d469a35afa2ff03f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Tom=C3=A9=20Corti=C3=B1as?=
 <carlos.tome.cortinas@gmail.com>
Date: Thu, 23 Oct 2025 10:56:34 +0200
Subject: [PATCH 3571/6226] =?UTF-8?q?maintainers:=20add=20Carlos=20Tom?=
 =?UTF-8?q?=C3=A9=20Corti=C3=B1as?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index ee193d84d31f..2eb719a887a5 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4254,6 +4254,11 @@
     githubId = 498906;
     name = "Karolis Stasaitis";
   };
+  carlostome = {
+    name = "Carlos Tomé Cortiñas";
+    github = "carlostome";
+    githubId = 2206578;
+  };
   carlsverre = {
     email = "accounts@carlsverre.com";
     github = "carlsverre";

From fc65416f415828eeca02c1a272725937cf97677d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Tom=C3=A9=20Corti=C3=B1as?=
 <carlos.tome.cortinas@gmail.com>
Date: Thu, 23 Oct 2025 10:58:16 +0200
Subject: [PATCH 3572/6226] Add myself as a maintainer

---
 nixos/tests/agda/override-with-backend.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/agda/override-with-backend.nix b/nixos/tests/agda/override-with-backend.nix
index 2bf9031a59ec..429aafd21ed3 100644
--- a/nixos/tests/agda/override-with-backend.nix
+++ b/nixos/tests/agda/override-with-backend.nix
@@ -24,9 +24,9 @@ let
 in
 {
   name = "agda-trivial-backend";
-  meta = {
+  meta = with pkgs.lib.maintainers; {
     maintainers = [
-      # FIXME
+      carlostome
     ];
   };
 

From 3c390383bcd3802a527a1945908d52f8e0d17dcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Tom=C3=A9=20Corti=C3=B1as?=
 <carlos.tome.cortinas@gmail.com>
Date: Thu, 23 Oct 2025 11:00:34 +0200
Subject: [PATCH 3573/6226] Refactor agda/base.nix to use HelloWorld.agda file

---
 nixos/tests/agda/base.nix | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/nixos/tests/agda/base.nix b/nixos/tests/agda/base.nix
index dfc733f4f576..c730a05e3c45 100644
--- a/nixos/tests/agda/base.nix
+++ b/nixos/tests/agda/base.nix
@@ -1,13 +1,7 @@
 { pkgs, ... }:
 
 let
-  hello-world = pkgs.writeText "hello-world" ''
-    {-# OPTIONS --guardedness #-}
-    open import IO
-    open import Level
-
-    main = run {0ℓ} (putStrLn "Hello World!")
-  '';
+  hello-world = ./files/HelloWorld.agda;
 in
 {
   name = "agda";

From 55ac814fa917268b18cb19581d4c75dc4d023a52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Tom=C3=A9=20Corti=C3=B1as?=
 <carlos.tome.cortinas@gmail.com>
Date: Tue, 28 Oct 2025 18:13:45 +0100
Subject: [PATCH 3574/6226] Conditionally create symlink to agda-mode if
 present

---
 nixos/tests/agda/base.nix                  | 4 ++++
 nixos/tests/agda/override-with-backend.nix | 3 ++-
 pkgs/build-support/agda/default.nix        | 3 +++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/agda/base.nix b/nixos/tests/agda/base.nix
index c730a05e3c45..f804abda6f62 100644
--- a/nixos/tests/agda/base.nix
+++ b/nixos/tests/agda/base.nix
@@ -24,6 +24,10 @@ in
     };
 
   testScript = ''
+    # agda and agda-mode are in path
+    machine.succeed("agda --version")
+    machine.succeed("agda-mode")
+
     # Minimal script that typechecks
     machine.succeed("touch TestEmpty.agda")
     machine.succeed("agda TestEmpty.agda")
diff --git a/nixos/tests/agda/override-with-backend.nix b/nixos/tests/agda/override-with-backend.nix
index 429aafd21ed3..bb64a473ee5d 100644
--- a/nixos/tests/agda/override-with-backend.nix
+++ b/nixos/tests/agda/override-with-backend.nix
@@ -47,8 +47,9 @@ in
     };
 
   testScript = ''
-    # agda executable is not present
+    # agda and agda-mode are not in path
     machine.fail("agda --version")
+    machine.fail("agda-mode")
     # backend is present
     text = machine.succeed("${mainProgram} --help")
     assert "${mainProgram}" in text
diff --git a/pkgs/build-support/agda/default.nix b/pkgs/build-support/agda/default.nix
index b1036c968daf..72e1d8dbd124 100644
--- a/pkgs/build-support/agda/default.nix
+++ b/pkgs/build-support/agda/default.nix
@@ -71,6 +71,9 @@ let
         makeWrapper ${lib.getExe Agda} $out/bin/${Agda.meta.mainProgram} \
           ${lib.optionalString (ghc != null) ''--add-flags "--with-compiler=${ghc}/bin/ghc"''} \
           --add-flags "--library-file=${libraryFile}"
+        if [ -e ${lib.getExe' Agda "agda-mode"} ]; then
+          ln -s ${lib.getExe' Agda "agda-mode"} $out/bin/agda-mode
+        fi
       '';
 
   withPackages = arg: if isAttrs arg then withPackages' arg else withPackages' { pkgs = arg; };

From 553d8e9ee95aa3a774778362b2c15f872dfd1987 Mon Sep 17 00:00:00 2001
From: Robert Hensing <robert@roberthensing.nl>
Date: Tue, 28 Oct 2025 18:47:45 +0100
Subject: [PATCH 3575/6226] doc/option-types: Improve union type docs

---
 nixos/doc/manual/development/option-types.section.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/nixos/doc/manual/development/option-types.section.md b/nixos/doc/manual/development/option-types.section.md
index b7b9f04acd95..d2e0c7299415 100644
--- a/nixos/doc/manual/development/option-types.section.md
+++ b/nixos/doc/manual/development/option-types.section.md
@@ -316,22 +316,34 @@ A union of types is a type such that a value is valid when it is valid for at le
 
 If some values are instances of more than one of the types, it is not possible to distinguish which type they are meant to be instances of. If that's needed, consider using a [sum type](#sec-option-types-sums).
 
+<!-- SYNC WITH oneOf BELOW -->
 `types.either` *`t1 t2`*
 
 :   Type *`t1`* or type *`t2`*, e.g. `with types; either int str`.
     Multiple definitions cannot be merged.
 
+    ::: {.warning}
+    `either` and `oneOf` eagerly decide the active type based on the passed types' shallow check method. For composite types like `attrsOf` and `submodule`, which both match all attribute set definitions, the first type argument will be chosen for the returned option value, and this therefore also decides how nested values are checked and merged. For example, `either (attrsOf int) (submodule {...})` will always use `attrsOf int` for any attribute set value, even if it was intended as a submodule. This behavior is a trade-off that keeps the implementation simple and the evaluation order predictable, avoiding unexpected strictness problems such as infinite recursions. When proper type discrimination is needed, consider using a [sum type](#sec-option-types-sums) like `attrTag` instead.
+    :::
+
+<!-- SYNC WITH either ABOVE -->
 `types.oneOf` \[ *`t1 t2`* ... \]
 
 :   Type *`t1`* or type *`t2`* and so forth, e.g.
     `with types; oneOf [ int str bool ]`. Multiple definitions cannot be
     merged.
 
+    ::: {.warning}
+    `either` and `oneOf` eagerly decide the active type based on the passed types' shallow check method. For composite types like `attrsOf` and `submodule`, which both match all attribute set definitions, the first matching type in the list will be chosen for the returned option value, and this therefore also decides how nested values are checked and merged. For example, `oneOf [ (attrsOf int) (submodule {...}) ]` will always use `attrsOf int` for any attribute set value, even if it was intended as a submodule. This behavior is a trade-off that keeps the implementation simple and the evaluation order predictable, avoiding unexpected strictness problems such as infinite recursions. When proper type discrimination is needed, consider using a [sum type](#sec-option-types-sums) like `attrTag` instead.
+    :::
+
 `types.nullOr` *`t`*
 
 :   `null` or type *`t`*. Multiple definitions are merged according to
     type *`t`*.
 
+    This is mostly equivalent to `either (enum [ null ]) t`, but `nullOr` provides a `null` fallback for attribute values with `mkIf false` definitions in `lazyAttrsOf (nullOr t)`, whereas `either` would throw an error when the attribute is accessed.
+
 
 ## Sum types {#sec-option-types-sums}
 

From eae90407307dfc18d4eec6eab3d1ae890cbc77dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 18:04:18 +0000
Subject: [PATCH 3576/6226] dependabot-cli: 1.76.1 -> 1.77.0

---
 pkgs/by-name/de/dependabot-cli/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix
index e2fe18a1e96f..8ad2bfa76477 100644
--- a/pkgs/by-name/de/dependabot-cli/package.nix
+++ b/pkgs/by-name/de/dependabot-cli/package.nix
@@ -12,20 +12,20 @@
 }:
 let
   pname = "dependabot-cli";
-  version = "1.76.1";
+  version = "1.77.0";
 
   # `tag` is what `dependabot` uses to find the relevant docker images.
   tag = "nixpkgs-dependabot-cli-${version}";
 
   # Get these hashes from
   # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
-  updateJobProxy.imageDigest = "sha256:d40c689e947e78ecdaccb3da1d070a458b7f1d1cfb3052cf5751e43583d89560";
-  updateJobProxy.hash = "sha256-6VhY+7pg6+LXQ1F58ghKdabqpgPcbxWI91KNz6FntJA=";
+  updateJobProxy.imageDigest = "sha256:53f33581efa03f1ed691b44896b231923888ba24b0e12cdc440aac2333d532c5";
+  updateJobProxy.hash = "sha256-GcCci6YcbZb4DgP91KpdBzwmnk5ffUJSHLtDCPyysZ4=";
 
   # Get these hashes from
   # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
-  updaterGitHubActions.imageDigest = "sha256:e2cfbdde4014cd17cd85b9b411cb87a41d985bc27569e5fe1457ec68d16400b1";
-  updaterGitHubActions.hash = "sha256-VC+F0139+7n6rBLAw6MCgMf6yHCci7blaeLkHJ22fVc=";
+  updaterGitHubActions.imageDigest = "sha256:c58d4bebdfcaf0664ad1025e509d4b77c35ba4999b4bfad2519b2d6e0d84603d";
+  updaterGitHubActions.hash = "sha256-P2kcpbYKj29iW3ma808LyVwhEYlcr+4JJuvOD6fGNoc=";
 in
 buildGoModule {
   inherit pname version;
@@ -34,7 +34,7 @@ buildGoModule {
     owner = "dependabot";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-i/Kr+69ws3HDWS+cQSn3cZzvW6GzKT+Avd3fZfvSA/c=";
+    hash = "sha256-Uo5QuYOEd74EiEIkf17WsjlR81x9VbOGtZcoeqegIsc=";
   };
 
   vendorHash = "sha256-dD48OKpuGAJAro7qV4tqpf/uENV2X1VQ2kUvAuJLXc0=";

From e9cd95786544873c69db3b31f40e29b628ebe7ea Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 28 Oct 2025 11:30:04 +0100
Subject: [PATCH 3577/6226] gcompris: fix private Qt6 targets search for Qt
 6.10

fix https://hydra.nixos.org/build/311320100/log/tail
```
CMake Error at src/core/CMakeLists.txt:112 (target_link_libraries):
  Target "gcompris-qt" links to:

    Qt6::CorePrivate

  but the target was not found.  Possible reasons include:

    * There is a typo in the target name.
    * A find_package call is missing for an IMPORTED target.
    * An ALIAS target is missing.
```
---
 pkgs/by-name/gc/gcompris/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gc/gcompris/package.nix b/pkgs/by-name/gc/gcompris/package.nix
index df8f4c6e90f1..438f28ca1425 100644
--- a/pkgs/by-name/gc/gcompris/package.nix
+++ b/pkgs/by-name/gc/gcompris/package.nix
@@ -18,11 +18,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-Y23pFov1/WKPrwYYRfGI8sOF0tp/ksSwRJE5zmxtoSo=";
   };
 
-  # fix concatenation of absolute paths like
-  # /nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1.1/bin/..//nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1.1/share/gcompris-qt/rcc/core.rcc
   postPatch = ''
+    # fix concatenation of absolute paths like
+    # /nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1.1/bin/..//nix/store/77zcv3vmndif01d4wh1rh0d1dyvyqzpy-gcompris-25.1.1/share/gcompris-qt/rcc/core.rcc
     substituteInPlace src/core/config.h.in  --replace-fail \
       "../@_data_dest_dir@" "../share/gcompris-qt"
+
+    # Fix private Qt6 targets search for Qt 6.10
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "set(QT_COMPONENTS Qml Quick Gui Multimedia Core Svg Network LinguistTools Sensors QuickControls2 QuickTemplates2 Charts Widgets QmlWorkerScript)" \
+      "set(QT_COMPONENTS Qml Quick Gui Multimedia Core Svg Network LinguistTools Sensors QuickControls2 QuickTemplates2 Charts Widgets QmlWorkerScript CorePrivate QuickControls2BasicPrivate WaylandClientPrivate)"
   '';
 
   cmakeFlags = [

From 99d63d01cb03b10806c095b20b9b5f84c6eb21c8 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Tue, 28 Oct 2025 20:09:45 +0200
Subject: [PATCH 3578/6226] tests.top-level.platformEquality: Fix use of alias

---
 pkgs/test/top-level/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/test/top-level/default.nix b/pkgs/test/top-level/default.nix
index a5b44afb8522..e713b617f8dd 100644
--- a/pkgs/test/top-level/default.nix
+++ b/pkgs/test/top-level/default.nix
@@ -61,7 +61,7 @@ lib.recurseIntoAttrs {
       pkgsLocal = map nixpkgsFun configsLocal;
       pkgsCross = map nixpkgsFun configsCross;
     in
-    assert lib.all (p: p.buildPlatform == p.hostPlatform) pkgsLocal;
-    assert lib.all (p: p.buildPlatform != p.hostPlatform) pkgsCross;
+    assert lib.all (p: p.stdenv.buildPlatform == p.stdenv.hostPlatform) pkgsLocal;
+    assert lib.all (p: p.stdenv.buildPlatform != p.stdenv.hostPlatform) pkgsCross;
     pkgs.emptyFile;
 }

From 8ab83c5e9dd6469c5f837d0ecb4e38acecad1683 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 18:11:23 +0000
Subject: [PATCH 3579/6226] sqldef: 3.2.2 -> 3.3.0

---
 pkgs/by-name/sq/sqldef/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sq/sqldef/package.nix b/pkgs/by-name/sq/sqldef/package.nix
index 7e8ecf60b523..6ef35827f569 100644
--- a/pkgs/by-name/sq/sqldef/package.nix
+++ b/pkgs/by-name/sq/sqldef/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "sqldef";
-  version = "3.2.2";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "sqldef";
     repo = "sqldef";
     rev = "v${version}";
-    hash = "sha256-8xwkXjF/+/pxumhQwBidv2xkmTy7NLCYG0nzlEq9lyI=";
+    hash = "sha256-nzWOVB66gASKh3AWoyifjGJ2H17G4RRv51Lqo01p1pw=";
   };
 
   proxyVendor = true;

From 5c30dd39c434bdd2eda69464493c33c289b9565e Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 26 Oct 2025 20:08:02 +0000
Subject: [PATCH 3580/6226] nixosTests.bittorrent: use `hostPkgs`

---
 nixos/tests/bittorrent.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index 812238b222b4..cf7b977223d4 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -6,12 +6,12 @@
 # which only works if the first client successfully uses the UPnP-IGD
 # protocol to poke a hole in the NAT.
 
-{ pkgs, ... }:
+{ lib, hostPkgs, ... }:
 
 let
 
   # Some random file to serve.
-  file = pkgs.hello.src;
+  file = hostPkgs.hello.src;
 
   internalRouterAddress = "192.168.3.1";
   internalClient1Address = "192.168.3.2";
@@ -37,7 +37,7 @@ in
 
 {
   name = "bittorrent";
-  meta = with pkgs.lib.maintainers; {
+  meta = with lib.maintainers; {
     maintainers = [
       rob
       bobvanderlinden

From 548659bd060582b4c8365477ae124468329e3643 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 26 Oct 2025 20:08:02 +0000
Subject: [PATCH 3581/6226] nixosTests.bittorrent: drop redundant
 `environment.systemPackages`

The Transmission module adds the package automatically.
---
 nixos/tests/bittorrent.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix
index cf7b977223d4..11758605a4eb 100644
--- a/nixos/tests/bittorrent.nix
+++ b/nixos/tests/bittorrent.nix
@@ -23,7 +23,6 @@ let
   transmissionConfig =
     { pkgs, ... }:
     {
-      environment.systemPackages = [ pkgs.transmission_3 ];
       services.transmission = {
         enable = true;
         settings = {

From f8b2fc54c895eb878816e7cb27bdbf3512fd3a87 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 26 Oct 2025 20:08:02 +0000
Subject: [PATCH 3582/6226] fetchtorrent: use Transmission 4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

I don’t know why setting `--config-dir` breaks the finish script
with Transmission 4, but I don’t really feel like spending more
time investigating than I already did. It does still respect the
passed settings, since we were passing the default location anyway.
---
 pkgs/build-support/fetchtorrent/default.nix | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/fetchtorrent/default.nix b/pkgs/build-support/fetchtorrent/default.nix
index 5848c3e25f00..d3828602594e 100644
--- a/pkgs/build-support/fetchtorrent/default.nix
+++ b/pkgs/build-support/fetchtorrent/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   runCommand,
-  transmission_3_noSystemd,
+  transmission_4,
   rqbit,
   writeShellScript,
   formats,
@@ -97,7 +97,7 @@ runCommand name
     ]
     ++ (
       if (backend == "transmission") then
-        [ transmission_3_noSystemd ]
+        [ transmission_4 ]
       else if (backend == "rqbit") then
         [ rqbit ]
       else
@@ -132,7 +132,6 @@ runCommand name
             --portmap \
             --finish ${transmissionFinishScript} \
             --download-dir "$downloadedDirectory" \
-            --config-dir "$HOME"/.config/transmission \
             "$url"
       ''
     else

From 24fa70ea8942c55c78dffd8484eca0d76ced2f92 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 26 Oct 2025 20:08:02 +0000
Subject: [PATCH 3583/6226] =?UTF-8?q?release:=20don=E2=80=99t=20block=20Da?=
 =?UTF-8?q?rwin=20on=20Transmission=203?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We probably shouldn’t block Darwin on the GTK version of Transmission
4 either, but hey…
---
 pkgs/top-level/release.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix
index c7d5252f4966..8c40fb1c0070 100644
--- a/pkgs/top-level/release.nix
+++ b/pkgs/top-level/release.nix
@@ -154,7 +154,6 @@ let
             jobs.gimp2.x86_64-darwin # FIXME replace with gimp once https://github.com/NixOS/nixpkgs/issues/411189 is resoved
             jobs.emacs.x86_64-darwin
             jobs.wireshark.x86_64-darwin
-            jobs.transmission_3-gtk.x86_64-darwin
             jobs.transmission_4-gtk.x86_64-darwin
 
             # Tests
@@ -198,7 +197,6 @@ let
             jobs.gimp2.aarch64-darwin # FIXME replace with gimp once https://github.com/NixOS/nixpkgs/issues/411189 is resoved
             jobs.emacs.aarch64-darwin
             jobs.wireshark.aarch64-darwin
-            jobs.transmission_3-gtk.aarch64-darwin
             jobs.transmission_4-gtk.aarch64-darwin
 
             # Tests

From 8b66d344c918c7610204651ce285908509112a83 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 27 Oct 2025 18:04:46 +0000
Subject: [PATCH 3584/6226] nixos/apparmor: use `valueMeta` to check submodule
 option definedness

---
 nixos/modules/security/apparmor.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix
index 5875d13bf786..d7e9ab7ab162 100644
--- a/nixos/modules/security/apparmor.nix
+++ b/nixos/modules/security/apparmor.nix
@@ -1,4 +1,5 @@
 {
+  options,
   config,
   lib,
   pkgs,
@@ -10,11 +11,6 @@ let
   cfg = config.security.apparmor;
   enabledPolicies = lib.filterAttrs (n: p: p.state != "disable") cfg.policies;
   buildPolicyPath = n: p: lib.defaultTo (pkgs.writeText n p.profile) p.path;
-
-  # Accessing submodule options when not defined results in an error thunk rather than a regular option object
-  # We can emulate the behavior of `<option>.isDefined` by attempting to evaluate it instead
-  # This is required because getting isDefined on a submodule is not possible in global module asserts.
-  submoduleOptionIsDefined = value: (builtins.tryEval value).success;
 in
 
 {
@@ -130,7 +126,9 @@ in
           # which does not recurse into sub-directories.
         }
         {
-          assertion = lib.xor (policyCfg.path != null) (submoduleOptionIsDefined policyCfg.profile);
+          assertion =
+            lib.xor (policyCfg.path != null)
+              options.security.apparmor.policies.valueMeta.attrs.${policyName}.configuration.options.profile.isDefined;
           message = "`security.apparmor.policies.\"${policyName}\"` must define exactly one of either path or profile.";
         }
       ]) cfg.policies

From 0c3f4b7d67c64563e759d689bf4026a0dcd6ecbb Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Sun, 26 Oct 2025 20:08:02 +0000
Subject: [PATCH 3585/6226] 
 {libtransmission_3,transmission_3{,-gtk,-qt,_noSystemd},torrential}: drop
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Unmaintained upstream and it’s been a year since we started migrating
to Transmission 4. Let’s not carry networked software from half a
decade ago into 25.11.
---
 .../modules/services/torrent/transmission.nix |  39 +++-
 nixos/tests/all-tests.nix                     |   3 +-
 nixos/tests/transmission.nix                  |   3 +-
 pkgs/by-name/to/torrential/package.nix        |  86 --------
 pkgs/by-name/tr/transmission_3/package.nix    | 183 ------------------
 .../transmission-3.00-miniupnpc-2.2.8.patch   |  18 --
 .../transmission-3.00-openssl-3.patch         |  37 ----
 pkgs/top-level/aliases.nix                    |  31 +--
 pkgs/top-level/all-packages.nix               |   9 -
 9 files changed, 40 insertions(+), 369 deletions(-)
 delete mode 100644 pkgs/by-name/to/torrential/package.nix
 delete mode 100644 pkgs/by-name/tr/transmission_3/package.nix
 delete mode 100644 pkgs/by-name/tr/transmission_3/transmission-3.00-miniupnpc-2.2.8.patch
 delete mode 100644 pkgs/by-name/tr/transmission_3/transmission-3.00-openssl-3.patch

diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix
index e261abe44450..3f6ed9eff4d1 100644
--- a/nixos/modules/services/torrent/transmission.nix
+++ b/nixos/modules/services/torrent/transmission.nix
@@ -19,6 +19,8 @@ let
     optionalString
     optional
     mkDefault
+    mkOptionDefault
+    versionOlder
     escapeShellArgs
     optionalAttrs
     mkMerge
@@ -176,17 +178,12 @@ in
             };
             umask = mkOption {
               type = types.either types.int types.str;
-              default = if cfg.package == pkgs.transmission_3 then 18 else "022";
-              defaultText = literalExpression "if cfg.package == pkgs.transmission_3 then 18 else \"022\"";
+              default = "022";
               description = ''
                 Sets transmission's file mode creation mask.
                 See the {manpage}`umask(2)` manpage for more information.
                 Users who want their saved torrents to be world-writable
                 may want to set this value to 0/`"000"`.
-
-                Keep in mind, that if you are using Transmission 3, this has to
-                be passed as a base 10 integer, whereas Transmission 4 takes
-                an octal number in a string instead.
               '';
             };
             utp-enabled = mkOption {
@@ -222,10 +219,19 @@ in
         };
       };
 
-      package = mkPackageOption pkgs "transmission" {
-        default = "transmission_3";
-        example = "pkgs.transmission_4";
-      };
+      package =
+        mkPackageOption pkgs "transmission" {
+          default = "transmission_4";
+          example = "pkgs.transmission_4";
+        }
+        // {
+          defaultText = ''
+            if lib.versionAtLeast config.system.stateVersion "25.11" then
+              pkgs.transmission_4
+            else
+              «error message»
+          '';
+        };
 
       downloadDirPermissions = mkOption {
         type = with types; nullOr str;
@@ -331,6 +337,19 @@ in
   };
 
   config = mkIf cfg.enable {
+    services.transmission.package = mkIf (versionOlder config.system.stateVersion "25.11") (
+      mkOptionDefault (throw ''
+        `services.transmission.package` previously defaulted to
+        `pkgs.transmission_3`, which has been removed in favour
+        of `pkgs.transmission_4`.
+
+        Please set `services.transmission.package` to
+        `pkgs.transmission_4` explicitly. Note that upgrade
+        caused data loss for some users so backup is recommended
+        (see NixOS 24.11 release notes for details)
+      '')
+    );
+
     # Note that using systemd.tmpfiles would not work here
     # because it would fail when creating a directory
     # with a different owner than its parent directory, by saying:
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index d1eb5b439da0..3dd46f640f41 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1537,8 +1537,7 @@ in
   traefik = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./traefik.nix;
   trafficserver = runTest ./trafficserver.nix;
   transfer-sh = runTest ./transfer-sh.nix;
-  transmission_3 = handleTest ./transmission.nix { transmission = pkgs.transmission_3; };
-  transmission_4 = handleTest ./transmission.nix { transmission = pkgs.transmission_4; };
+  transmission_4 = handleTest ./transmission.nix { };
   trezord = runTest ./trezord.nix;
   trickster = runTest ./trickster.nix;
   trilium-server = runTestOn [ "x86_64-linux" ] ./trilium-server.nix;
diff --git a/nixos/tests/transmission.nix b/nixos/tests/transmission.nix
index 0ddce92e8345..5186098b40cc 100644
--- a/nixos/tests/transmission.nix
+++ b/nixos/tests/transmission.nix
@@ -1,5 +1,5 @@
 import ./make-test-python.nix (
-  { pkgs, transmission, ... }:
+  { pkgs, ... }:
   {
     name = "transmission";
     meta = with pkgs.lib.maintainers; {
@@ -16,7 +16,6 @@ import ./make-test-python.nix (
         security.apparmor.enable = true;
 
         services.transmission.enable = true;
-        services.transmission.package = transmission;
       };
 
     testScript = ''
diff --git a/pkgs/by-name/to/torrential/package.nix b/pkgs/by-name/to/torrential/package.nix
deleted file mode 100644
index f10ee282beae..000000000000
--- a/pkgs/by-name/to/torrential/package.nix
+++ /dev/null
@@ -1,86 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  nix-update-script,
-  desktop-file-utils,
-  meson,
-  ninja,
-  pkg-config,
-  python3,
-  vala,
-  wrapGAppsHook4,
-  curl,
-  dht,
-  glib,
-  gtk4,
-  libb64,
-  libevent,
-  libgee,
-  libnatpmp,
-  libtransmission_3,
-  libutp,
-  miniupnpc,
-  openssl,
-  pantheon,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "torrential";
-  version = "3.0.0";
-
-  src = fetchFromGitHub {
-    owner = "davidmhewitt";
-    repo = "torrential";
-    rev = version;
-    sha256 = "sha256-uHc/VNtbhetmGyuhynZH1TvxJscVX17eWO6dzX6Ft3A=";
-  };
-
-  nativeBuildInputs = [
-    desktop-file-utils
-    meson
-    ninja
-    pkg-config
-    python3
-    vala
-    wrapGAppsHook4
-  ];
-
-  buildInputs = [
-    curl
-    dht
-    glib
-    gtk4
-    libb64
-    libevent
-    libgee
-    libnatpmp
-    libtransmission_3
-    libutp
-    miniupnpc
-    openssl
-    pantheon.granite7
-  ];
-
-  postPatch = ''
-    chmod +x meson/post_install.py
-    patchShebangs meson/post_install.py
-
-    substituteInPlace meson/post_install.py \
-      --replace "gtk-update-icon-cache" "gtk4-update-icon-cache"
-  '';
-
-  passthru = {
-    updateScript = nix-update-script { };
-  };
-
-  meta = with lib; {
-    description = "Download torrents in style with this speedy, minimalist torrent client for elementary OS";
-    homepage = "https://github.com/davidmhewitt/torrential";
-    maintainers = with maintainers; [ xiorcale ];
-    teams = [ teams.pantheon ];
-    platforms = platforms.linux;
-    license = licenses.gpl2Plus;
-    mainProgram = "com.github.davidmhewitt.torrential";
-  };
-}
diff --git a/pkgs/by-name/tr/transmission_3/package.nix b/pkgs/by-name/tr/transmission_3/package.nix
deleted file mode 100644
index 3c7947d9c24b..000000000000
--- a/pkgs/by-name/tr/transmission_3/package.nix
+++ /dev/null
@@ -1,183 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-  openssl,
-  curl,
-  libevent,
-  inotify-tools,
-  systemd,
-  zlib,
-  pcre,
-  libb64,
-  libutp,
-  miniupnpc,
-  dht,
-  libnatpmp,
-  libiconv,
-  # Build options
-  enableGTK3 ? false,
-  gtk3,
-  xorg,
-  wrapGAppsHook3,
-  enableQt ? false,
-  qt5,
-  nixosTests,
-  enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
-  enableDaemon ? true,
-  enableCli ? true,
-  installLib ? false,
-  apparmorRulesFromClosure,
-}:
-
-stdenv.mkDerivation (finalAttrs: {
-  pname = "transmission";
-  version = "3.00";
-
-  src = fetchFromGitHub {
-    owner = "transmission";
-    repo = "transmission";
-    tag = finalAttrs.version;
-    hash = "sha256-n4iEDt9AstDZPZXN47p13brNLbNWS3BTB+A4UuoEjzE=";
-    fetchSubmodules = true;
-  };
-
-  patches = [
-    # fix build with openssl 3.0
-    ./transmission-3.00-openssl-3.patch
-    # fix build with miniupnpc 2.2.8
-    ./transmission-3.00-miniupnpc-2.2.8.patch
-  ];
-
-  # Compatibility with CMake < 3.5 has been removed from CMake.
-  postPatch = ''
-    substituteInPlace \
-      CMakeLists.txt \
-      --replace-fail \
-        "cmake_minimum_required(VERSION 2.8.12 FATAL_ERROR)" \
-        "cmake_minimum_required(VERSION 3.5)"
-  '';
-
-  outputs = [
-    "out"
-    "apparmor"
-  ];
-
-  cmakeFlags =
-    let
-      mkFlag = opt: if opt then "ON" else "OFF";
-    in
-    [
-      "-DENABLE_MAC=OFF" # requires xcodebuild
-      "-DENABLE_GTK=${mkFlag enableGTK3}"
-      "-DENABLE_QT=${mkFlag enableQt}"
-      "-DENABLE_DAEMON=${mkFlag enableDaemon}"
-      "-DENABLE_CLI=${mkFlag enableCli}"
-      "-DINSTALL_LIB=${mkFlag installLib}"
-    ];
-
-  nativeBuildInputs = [
-    pkg-config
-    cmake
-  ]
-  ++ lib.optionals enableGTK3 [ wrapGAppsHook3 ]
-  ++ lib.optionals enableQt [ qt5.wrapQtAppsHook ];
-
-  buildInputs = [
-    openssl
-    curl
-    libevent
-    zlib
-    pcre
-    libb64
-    libutp
-    miniupnpc
-    dht
-    libnatpmp
-  ]
-  ++ lib.optionals enableQt [
-    qt5.qttools
-    qt5.qtbase
-  ]
-  ++ lib.optionals enableGTK3 [
-    gtk3
-    xorg.libpthreadstubs
-  ]
-  ++ lib.optionals enableSystemd [ systemd ]
-  ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ];
-
-  postInstall = ''
-    mkdir $apparmor
-    cat >$apparmor/bin.transmission-daemon <<EOF
-    include <tunables/global>
-    $out/bin/transmission-daemon {
-      include <abstractions/base>
-      include <abstractions/nameservice>
-      include <abstractions/ssl_certs>
-      include "${
-        apparmorRulesFromClosure { name = "transmission-daemon"; } (
-          [
-            curl
-            libevent
-            openssl
-            pcre
-            zlib
-            libnatpmp
-            miniupnpc
-          ]
-          ++ lib.optionals enableSystemd [ systemd ]
-          ++ lib.optionals stdenv.hostPlatform.isLinux [ inotify-tools ]
-        )
-      }"
-      r @{PROC}/sys/kernel/random/uuid,
-      r @{PROC}/sys/vm/overcommit_memory,
-      r @{PROC}/@{pid}/environ,
-      r @{PROC}/@{pid}/mounts,
-      rwk /tmp/tr_session_id_*,
-
-      r $out/share/transmission/web/**,
-
-      include <local/bin.transmission-daemon>
-    }
-    EOF
-  '';
-
-  env = {
-    # Fix GCC 14 build
-    NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
-  };
-
-  passthru.tests = {
-    apparmor = nixosTests.transmission_3; # starts the service with apparmor enabled
-    smoke-test = nixosTests.bittorrent;
-  };
-
-  meta = {
-    description = "Fast, easy and free BitTorrent client (deprecated version 3)";
-    mainProgram =
-      if enableQt then
-        "transmission-qt"
-      else if enableGTK3 then
-        "transmission-gtk"
-      else
-        "transmission-cli";
-    longDescription = ''
-      Transmission is a BitTorrent client which features a simple interface
-      on top of a cross-platform back-end.
-      Feature spotlight:
-        * Uses fewer resources than other clients
-        * Native Mac, GTK and Qt GUI clients
-        * Daemon ideal for servers, embedded systems, and headless use
-        * All these can be remote controlled by Web and Terminal clients
-        * Bluetack (PeerGuardian) blocklists with automatic updates
-        * Full encryption, DHT, and PEX support
-    '';
-    homepage = "http://www.transmissionbt.com/";
-    license = lib.licenses.gpl2Plus; # parts are under MIT
-    platforms = lib.platforms.unix;
-  };
-
-})
diff --git a/pkgs/by-name/tr/transmission_3/transmission-3.00-miniupnpc-2.2.8.patch b/pkgs/by-name/tr/transmission_3/transmission-3.00-miniupnpc-2.2.8.patch
deleted file mode 100644
index 66de8f9bf510..000000000000
--- a/pkgs/by-name/tr/transmission_3/transmission-3.00-miniupnpc-2.2.8.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff --git a/libtransmission/upnp.c b/libtransmission/upnp.c
-index c9e248a379...c7b2580bcb 100644
---- a/libtransmission/upnp.c
-+++ b/libtransmission/upnp.c
-@@ -194,8 +194,13 @@
- 
-         errno = 0;
- 
-+#if (MINIUPNPC_API_VERSION >= 18)
-         if (UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, handle->lanaddr,
-+            sizeof(handle->lanaddr), NULL, 0) == UPNP_IGD_VALID_CONNECTED)
-+#else
-+        if (UPNP_GetValidIGD(devlist, &handle->urls, &handle->data, handle->lanaddr,
-             sizeof(handle->lanaddr)) == UPNP_IGD_VALID_CONNECTED)
-+#endif
-         {
-             tr_logAddNamedInfo(getKey(), _("Found Internet Gateway Device \"%s\""), handle->urls.controlURL);
-             tr_logAddNamedInfo(getKey(), _("Local Address is \"%s\""), handle->lanaddr);
diff --git a/pkgs/by-name/tr/transmission_3/transmission-3.00-openssl-3.patch b/pkgs/by-name/tr/transmission_3/transmission-3.00-openssl-3.patch
deleted file mode 100644
index f288298cbf3d..000000000000
--- a/pkgs/by-name/tr/transmission_3/transmission-3.00-openssl-3.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6ee128b95bacaff20746538dc97c2b8e2b9fcc29 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Sun, 15 May 2022 10:54:38 -0400
-Subject: [PATCH] openssl: load "legacy" provider for RC4
-
----
- libtransmission/crypto-utils-openssl.c | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/libtransmission/crypto-utils-openssl.c b/libtransmission/crypto-utils-openssl.c
-index 45fd71913..14d680654 100644
---- a/libtransmission/crypto-utils-openssl.c
-+++ b/libtransmission/crypto-utils-openssl.c
-@@ -20,6 +20,9 @@
- #include <openssl/rand.h>
- #include <openssl/ssl.h>
- #include <openssl/x509.h>
-+#if OPENSSL_VERSION_MAJOR >= 3
-+#include <openssl/provider.h>
-+#endif
- 
- #include "transmission.h"
- #include "crypto-utils.h"
-@@ -184,6 +187,10 @@ static void openssl_evp_cipher_context_free(EVP_CIPHER_CTX* handle)
- 
- tr_rc4_ctx_t tr_rc4_new(void)
- {
-+#if OPENSSL_VERSION_MAJOR >= 3
-+    OSSL_PROVIDER_load(NULL, "default");
-+    OSSL_PROVIDER_load(NULL, "legacy");
-+#endif
-     EVP_CIPHER_CTX* handle = EVP_CIPHER_CTX_new();
- 
-     if (check_result(EVP_CipherInit_ex(handle, EVP_rc4(), NULL, NULL, NULL, -1)))
--- 
-2.35.1
-
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a2fe24a88240..d71a5d836ea3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -29,18 +29,6 @@ let
     else
       alias;
 
-  transmission3Warning =
-    {
-      prefix ? "",
-      suffix ? "",
-    }:
-    let
-      p = "${prefix}transmission${suffix}";
-      p3 = "${prefix}transmission_3${suffix}";
-      p4 = "${prefix}transmission_4${suffix}";
-    in
-    "${p} has been renamed to ${p3} since ${p4} is also available. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)";
-
   deprecatedPlasma5Packages = {
     inherit (plasma5Packages)
       akonadi-calendar
@@ -806,9 +794,8 @@ mapAliases {
   libtcod = throw "'libtcod' has been removed due to being unused and having an incompatible build-system"; # Added 2025-10-04
   libtensorflow-bin = throw "'libtensorflow-bin' has been renamed to/replaced by 'libtensorflow'"; # Converted to throw 2025-10-27
   libtorrent = throw "'libtorrent' has been renamed to 'libtorrent-rakshasa' for clearer distinction from 'libtorrent-rasterbar'"; # Added 2025-09-10
-  libtransmission = lib.warnOnInstantiate (transmission3Warning {
-    prefix = "lib";
-  }) libtransmission_3; # Added 2024-06-10
+  libtransmission = throw "libtransmission_3 has been removed in favour of libtransmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26
+  libtransmission_3 = throw "libtransmission_3 has been removed in favour of libtransmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26
   libviper = throw "'libviper' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
   libwnck3 = throw "'libwnck3' has been renamed to/replaced by 'libwnck'"; # Converted to throw 2025-10-27
   lightdm_gtk_greeter = throw "'lightdm_gtk_greeter' has been renamed to/replaced by 'lightdm-gtk-greeter'"; # Converted to throw 2025-10-27
@@ -1480,13 +1467,13 @@ mapAliases {
   tracker-miners = throw "'tracker-miners' has been renamed to/replaced by 'localsearch'"; # Converted to throw 2025-10-27
   transfig = throw "'transfig' has been renamed to/replaced by 'fig2dev'"; # Converted to throw 2025-10-27
   transifex-client = throw "'transifex-client' has been renamed to/replaced by 'transifex-cli'"; # Converted to throw 2025-10-27
-  transmission = lib.warnOnInstantiate (transmission3Warning { }) transmission_3; # Added 2024-06-10
-  transmission-gtk = lib.warnOnInstantiate (transmission3Warning {
-    suffix = "-gtk";
-  }) transmission_3-gtk; # Added 2024-06-10
-  transmission-qt = lib.warnOnInstantiate (transmission3Warning {
-    suffix = "-qt";
-  }) transmission_3-qt; # Added 2024-06-10
+  transmission = throw "transmission_3 has been removed in favour of transmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26
+  transmission-gtk = throw "transmission_3-gtk has been removed in favour of transmission_4-gtk. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26
+  transmission-qt = throw "transmission_3-qt has been removed in favour of transmission_4-qt. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26
+  transmission_3 = throw "transmission_3 has been removed in favour of transmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Added 2025-10-26
+  transmission_3-gtk = throw "transmission_3-gtk has been removed in favour of transmission_4-gtk. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Added 2025-10-26
+  transmission_3-qt = throw "transmission_3-qt has been removed in favour of transmission_4-qt. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Added 2025-10-26
+  transmission_3_noSystemd = throw "transmission_3_noSystemd has been removed in favour of transmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Added 2025-10-26
   treefmt2 = throw "'treefmt2' has been renamed to/replaced by 'treefmt'"; # Converted to throw 2025-10-27
   trenchbroom = throw "trenchbroom was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   trezor_agent = throw "'trezor_agent' has been renamed to/replaced by 'trezor-agent'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bd88d03adfb..75024814e250 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12509,15 +12509,6 @@ with pkgs;
 
   trustedqsl = tqsl; # Alias added 2019-02-10
 
-  libtransmission_3 = transmission_3.override {
-    installLib = true;
-    enableDaemon = false;
-    enableCli = false;
-  };
-  transmission_3-gtk = transmission_3.override { enableGTK3 = true; };
-  transmission_3-qt = transmission_3.override { enableQt = true; };
-  transmission_3_noSystemd = transmission_3.override { enableSystemd = false; };
-
   transmission_4 = callPackage ../applications/networking/p2p/transmission/4.nix {
     fmt = fmt_9;
     libutp = libutp_3_4;

From 6898ae84d6844a8e6befbbb0a9ab50fec1d4f13e Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 28 Oct 2025 11:14:30 -0700
Subject: [PATCH 3586/6226] cudaPackages.nsight_systems: patchShebangs on all
 files (fixes #445783)

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/development/cuda-modules/packages/nsight_systems.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/cuda-modules/packages/nsight_systems.nix b/pkgs/development/cuda-modules/packages/nsight_systems.nix
index 3f575214a2ef..f043d5887e51 100644
--- a/pkgs/development/cuda-modules/packages/nsight_systems.nix
+++ b/pkgs/development/cuda-modules/packages/nsight_systems.nix
@@ -90,7 +90,7 @@ buildRedist (
       for path in $rmPatterns; do
         rm -r "$path"
       done
-      patchShebangs nsight-systems
+      patchShebangs .
     '';
 
     nativeBuildInputs = [ wrapQtAppsHook ];

From e348f2f5f33356ce9e25751300ec14a4ac336088 Mon Sep 17 00:00:00 2001
From: Malo Bourgon <mbourgon@gmail.com>
Date: Tue, 28 Oct 2025 11:16:05 -0700
Subject: [PATCH 3587/6226] signalbackup-tools: 20251027-1 -> 20251028

Diff: https://github.com/bepaald/signalbackup-tools/compare/20251027-1...20251028
---
 pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index 005d596f6649..fcefdda07a17 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "signalbackup-tools";
-  version = "20251027-1";
+  version = "20251028";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     tag = version;
-    hash = "sha256-655wJttNBFV35Ji4W46CrjwcFRU76evsCUDJX7j5ZSg=";
+    hash = "sha256-tTg2I6h5WjcUXPQB7yBTBc3e2osEYRQ2e5ptsya4MTk=";
   };
 
   nativeBuildInputs = [

From f07ba72fdfa750beec802f7831c6cdf9cd90c641 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 18:20:05 +0000
Subject: [PATCH 3588/6226] cura-appimage: 5.10.2 -> 5.11.0

---
 pkgs/by-name/cu/cura-appimage/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cu/cura-appimage/package.nix b/pkgs/by-name/cu/cura-appimage/package.nix
index 8034c1065e79..4ac69a88a9b3 100644
--- a/pkgs/by-name/cu/cura-appimage/package.nix
+++ b/pkgs/by-name/cu/cura-appimage/package.nix
@@ -13,7 +13,7 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "cura-appimage";
-  version = "5.10.2";
+  version = "5.11.0";
 
   # Give some good names so the intermediate packages are easy
   # to recognise by name in the Nix store.
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/Ultimaker/Cura/releases/download/${version}/Ultimaker-Cura-${version}-linux-X64.AppImage";
-    hash = "sha256-930jrjNdUE0vxuMslQNbkdm2eLAFBSsVFxlTi56a8Xg=";
+    hash = "sha256-us375gxVrGqGem2Et2VNRm6T389JxzPm1TScerlia9k=";
   };
 
   appimageContents = appimageTools.extract {

From c12a25638779e2e8b4954fc6c9d0717db3406512 Mon Sep 17 00:00:00 2001
From: Hleb Shauchenka <me@marleb.org>
Date: Tue, 28 Oct 2025 19:20:30 +0100
Subject: [PATCH 3589/6226] proton-ge-bin: GE-Proton10-21 -> GE-Proton10-23

Diff: https://github.com/GloriousEggroll/proton-ge-custom/compare/GE-Proton10-21...GE-Proton10-23
---
 pkgs/by-name/pr/proton-ge-bin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix
index 976f85ba7c0f..c213b3af1a42 100644
--- a/pkgs/by-name/pr/proton-ge-bin/package.nix
+++ b/pkgs/by-name/pr/proton-ge-bin/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-ge-bin";
-  version = "GE-Proton10-21";
+  version = "GE-Proton10-23";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-Oa9+DjEeZZiJEr9H7wnUtGb6v/JXHk0qt0GAGcp3JFQ=";
+    hash = "sha256-cOjrP9Nh4cPcX3uwYF25z2QHnNDNb83FPa4O0zdENeg=";
   };
 
   dontUnpack = true;

From 0ffc7c907561b5a1003c67cfc9e86f9346846f97 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 18:33:55 +0000
Subject: [PATCH 3590/6226] pkgsite: 0-unstable-2025-10-09 ->
 0-unstable-2025-10-24

---
 pkgs/by-name/pk/pkgsite/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix
index 2693cd48e234..22657c8fc112 100644
--- a/pkgs/by-name/pk/pkgsite/package.nix
+++ b/pkgs/by-name/pk/pkgsite/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule {
   pname = "pkgsite";
-  version = "0-unstable-2025-10-09";
+  version = "0-unstable-2025-10-24";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "pkgsite";
-    rev = "31e4cbb15040258abb9a4e5eb0d5fcef6f8e0562";
-    hash = "sha256-JCcutMJNeeqN7ruTwrvAIe44Xpi7Ne9UXVPnQW5ujEk=";
+    rev = "4bd6c634f204f1469ab5130fc5b65eb843e98aac";
+    hash = "sha256-zKgx7nQgmQyyHEobTlu92FMGPn3DABAA9KwkBaIjRsQ=";
   };
 
   vendorHash = "sha256-EbZ+38LLnp5aefiuBAOFHA3uPPUmPGLsDIEMln5Vh7c=";

From c5b82e49b33e95a17a675ad4c60da30c168ff020 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 27 Oct 2025 19:05:09 +0000
Subject: [PATCH 3591/6226] aliases: add `warnAlias`

---
 maintainers/scripts/remove-old-aliases.py |  8 ++++----
 pkgs/top-level/aliases.nix                | 25 +++++++++++++++++++++++
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/maintainers/scripts/remove-old-aliases.py b/maintainers/scripts/remove-old-aliases.py
index c7d1292b3e1e..bceee1074844 100755
--- a/maintainers/scripts/remove-old-aliases.py
+++ b/maintainers/scripts/remove-old-aliases.py
@@ -98,8 +98,8 @@ def get_date_lists(
             date_too_complex_list.append(f"{lineno:>5} {line}")
         elif "= with " in line:
             date_too_complex_list.append(f"{lineno:>5} {line}")
-        elif "lib.warnOnInstantiate" in line or "warning" in line:
-            if 'lib.warnOnInstantiate "' in line:
+        elif "warnAlias" in line or "warning" in line:
+            if 'warnAlias "' in line:
                 date_older_warning_list.append(line)
             else:
                 date_too_complex_list.append(f"{lineno:>5} {line}")
@@ -140,7 +140,7 @@ def convert(lines: list[str], convert_to: str) -> list[tuple[str, str]]:
                 before_equal, after_equal = (
                     x.strip() for x in line.split("=", maxsplit=2)
                 )
-                if after_equal.startswith("lib.warnOnInstantiate"):
+                if after_equal.startswith("warnAlias"):
                     after_equal = after_equal.split("\"", maxsplit=3)[2].strip()
             except ValueError as err:
                 print(err, line, "\n")
@@ -162,7 +162,7 @@ def convert(lines: list[str], convert_to: str) -> list[tuple[str, str]]:
             converted_lines[line] = converted
         elif convert_to == "warnings":
             converted = (
-                f"{indent}{alias} = lib.warnOnInstantiate \"'{alias_unquoted}' has been"
+                f"{indent}{alias} = warnAlias \"'{alias_unquoted}' has been"
                 f" renamed to/replaced by '{replacement}'\" {replacement};"
                 f" # Converted to warning {datetime.today().strftime('%Y-%m-%d')}"
             )
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a2fe24a88240..764164c20131 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -231,6 +231,31 @@ let
     aliases: lib.mapAttrs (n: alias: removeRecurseForDerivations (checkInPkgs n alias)) aliases;
 
   plasma5Throws = mapAliases (lib.mapAttrs (k: _: makePlasma5Throw k) deprecatedPlasma5Packages);
+
+  warnAlias =
+    msg: v:
+    if lib.isDerivation v then
+      lib.warnOnInstantiate msg v
+    else if lib.isAttrs v then
+      lib.mapAttrs (lib.warn msg) v
+    else if lib.isFunction v then
+      arg: lib.warn msg (v arg)
+    else if lib.isList v then
+      map (lib.warn msg) v
+    else if lib.isString v then
+      # Unlike the other cases, this changes the type of the value and
+      # is therefore a breaking change for some code, but it’s the best
+      # we can do.
+      { __toString = lib.warn msg (lib.const v); }
+    else
+      # Can’t do better than this, and a `throw` would be more
+      # disruptive for users…
+      #
+      # `nix search` flags up warnings already, so hopefully this won’t
+      # make things much worse until we have proper CI for aliases,
+      # especially since aliases of paths and numbers are presumably
+      # not common.
+      lib.warn msg v;
 in
 
 mapAliases {

From 6d9b8d6cfb4596ffb627df9da72d26b35aa87468 Mon Sep 17 00:00:00 2001
From: Antoine du Hamel <duhamelantoine1995@gmail.com>
Date: Tue, 28 Oct 2025 19:43:06 +0100
Subject: [PATCH 3592/6226] nodejs_24: 24.10.0 -> 24.11.0

---
 pkgs/development/web/nodejs/v24.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/web/nodejs/v24.nix b/pkgs/development/web/nodejs/v24.nix
index a4a22e4a2188..add4d163d32f 100644
--- a/pkgs/development/web/nodejs/v24.nix
+++ b/pkgs/development/web/nodejs/v24.nix
@@ -25,8 +25,8 @@ let
 in
 buildNodejs {
   inherit enableNpm;
-  version = "24.10.0";
-  sha256 = "f17e36cb2cc8c34a9215ba57b55ce791b102e293432ed47ad63cbaf15f78678f";
+  version = "24.11.0";
+  sha256 = "cf9c906d46446471f955b1f2c6ace8a461501d82d27e1ae8595dcb3b0e2c312a";
   patches =
     (
       if (stdenv.hostPlatform.emulatorAvailable buildPackages) then

From 580d05f24ca3e198a1be5fecc4f7b044104cb55b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 28 Oct 2025 19:46:43 +0100
Subject: [PATCH 3593/6226] mmseqs2: avoid pkgsStatic

Pulling in a zstd built with possibly a different libc, from an entirely
different package set and putting it in nativeBuildInputs is.. brave!
---
 pkgs/by-name/mm/mmseqs2/package.nix | 31 +++++++++++++++--------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/mm/mmseqs2/package.nix b/pkgs/by-name/mm/mmseqs2/package.nix
index 474afc3b4798..51680a5818d5 100644
--- a/pkgs/by-name/mm/mmseqs2/package.nix
+++ b/pkgs/by-name/mm/mmseqs2/package.nix
@@ -16,12 +16,12 @@
   llvmPackages,
   zlib,
   bzip2,
-  pkgsStatic,
+  zstd,
   runCommand,
-}:
+}@args:
 let
   # require static library, libzstd.a
-  inherit (pkgsStatic) zstd;
+  zstd = args.zstd.override { enableStatic = true; };
 in
 
 stdenv.mkDerivation (finalAttrs: {
@@ -40,7 +40,6 @@ stdenv.mkDerivation (finalAttrs: {
     xxd
     perl
     installShellFiles
-    zstd
   ]
   ++ lib.optionals cudaSupport [
     cudaPackages.cuda_nvcc
@@ -58,17 +57,19 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaPackages.flags.cmakeCudaArchitecturesString)
   ];
 
-  buildInputs =
-    lib.optionals stdenv.cc.isClang [
-      llvmPackages.openmp
-      zlib
-      bzip2
-    ]
-    ++ lib.optional enableMpi mpi
-    ++ lib.optionals cudaSupport [
-      cudaPackages.cuda_cudart
-      cudaPackages.cuda_cccl
-    ];
+  buildInputs = [
+    zstd
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.openmp
+    zlib
+    bzip2
+  ]
+  ++ lib.optional enableMpi mpi
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_cudart
+    cudaPackages.cuda_cccl
+  ];
 
   postInstall = ''
     installShellCompletion --bash --cmd mmseqs $out/util/bash-completion.sh

From 5b2c0ced6a974fc0fd47039cb67fc02cbcf081ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 18:47:48 +0000
Subject: [PATCH 3594/6226] viceroy: 0.14.4 -> 0.15.0

---
 pkgs/by-name/vi/viceroy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vi/viceroy/package.nix b/pkgs/by-name/vi/viceroy/package.nix
index 54e7203b8fcb..b5ed99eab189 100644
--- a/pkgs/by-name/vi/viceroy/package.nix
+++ b/pkgs/by-name/vi/viceroy/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "viceroy";
-  version = "0.14.4";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "fastly";
     repo = "viceroy";
     rev = "v${version}";
-    hash = "sha256-rK+Us4QvvWpHtMvq5s3koPyy7xKhVQsxUMQnpyfMtDU=";
+    hash = "sha256-CG+D4jh5p6bcc0E6qTvecwkoxCRoHJAGiAOtR8A+Otc=";
   };
 
-  cargoHash = "sha256-SacepQEMpDxqd7vl/sjkxyTb3R7z+Q1IQOrfZyV8nRU=";
+  cargoHash = "sha256-K4nh/ODbk++UxxIoeLpq4boWGbID2DJW845rx605Z7Y=";
 
   cargoTestFlags = [
     "--package viceroy-lib"

From d9957c75774acfbb044a22390e26c22c4c150eec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Tue, 28 Oct 2025 18:49:03 +0000
Subject: [PATCH 3595/6226] uwsm: 0.24.1 -> 0.24.2

---
 pkgs/by-name/uw/uwsm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/uw/uwsm/package.nix b/pkgs/by-name/uw/uwsm/package.nix
index 6b3b676410b6..99be1f986702 100644
--- a/pkgs/by-name/uw/uwsm/package.nix
+++ b/pkgs/by-name/uw/uwsm/package.nix
@@ -29,13 +29,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "uwsm";
-  version = "0.24.1";
+  version = "0.24.2";
 
   src = fetchFromGitHub {
     owner = "Vladimir-csp";
     repo = "uwsm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-x8Nx0Y4pIOjcN0aYSfTi3WyjzF/wzzgLpNrjpI2s/O0=";
+    hash = "sha256-gX+6fNnndmnEpuKymqVt/5U8RmUq2j9X99L34BJy6LI=";
   };
 
   nativeBuildInputs = [

From 202b8bf836f62275c3d7b76e9fa76097b3954535 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Mon, 27 Oct 2025 19:05:09 +0000
Subject: [PATCH 3596/6226] aliases: use `warnAlias`

---
 pkgs/top-level/aliases.nix | 56 ++++++++++++++++++--------------------
 1 file changed, 27 insertions(+), 29 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 764164c20131..857a9e39bfc1 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -381,7 +381,7 @@ mapAliases {
   bower2nix = throw "bower2nix has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
   brasero-original = throw "'brasero-original' has been renamed to/replaced by 'brasero-unwrapped'"; # Converted to throw 2025-10-27
   breath-theme = throw "'breath-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
-  brogue = lib.warnOnInstantiate "Use 'brogue-ce' instead of 'brogue' for updated releases" brogue-ce; # Added 2025-10-04
+  brogue = warnAlias "Use 'brogue-ce' instead of 'brogue' for updated releases" brogue-ce; # Added 2025-10-04
   buildBowerComponents = throw "buildBowerComponents has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
   buildGo123Module = throw "Go 1.23 is end-of-life, and 'buildGo123Module' has been removed. Please use a newer builder version."; # Added 2025-08-13
   buildXenPackage = throw "'buildXenPackage' has been removed as a custom Xen build can now be achieved by simply overriding 'xen'."; # Added 2025-05-12
@@ -463,7 +463,7 @@ mapAliases {
   conduwuit = throw "'conduwuit' has been removed as the upstream repository has been deleted. Consider migrating to 'matrix-conduit', 'matrix-continuwuity' or 'matrix-tuwunel' instead."; # Added 2025-08-08
   cone = throw "cone has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
   connman-ncurses = throw "'connman-ncurses' has been removed due to lack of maintenance upstream."; # Added 2025-05-27
-  copilot-language-server-fhs = lib.warnOnInstantiate "The package set `copilot-language-server-fhs` has been renamed to `copilot-language-server`." copilot-language-server; # Added 2025-09-07
+  copilot-language-server-fhs = warnAlias "The package set `copilot-language-server-fhs` has been renamed to `copilot-language-server`." copilot-language-server; # Added 2025-09-07
   copper = throw "'copper' has been removed, as it was broken since 22.11"; # Added 2025-08-22
   cordless = throw "'cordless' has been removed due to being archived upstream. Consider using 'discordo' instead."; # Added 2025-06-07
   cosmic-tasks = throw "'cosmic-tasks' has been renamed to/replaced by 'tasks'"; # Converted to throw 2025-10-27
@@ -492,7 +492,7 @@ mapAliases {
   cudaPackages_12_4 = throw "CUDA 12.4 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_12_5 = throw "CUDA 12.5 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cups-kyodialog3 = throw "'cups-kyodialog3' has been renamed to/replaced by 'cups-kyodialog'"; # Converted to throw 2025-10-27
-  curlHTTP3 = lib.warnOnInstantiate "'curlHTTP3' has been removed, as 'curl' now has HTTP/3 support enabled by default" curl; # Added 2025-08-22
+  curlHTTP3 = warnAlias "'curlHTTP3' has been removed, as 'curl' now has HTTP/3 support enabled by default" curl; # Added 2025-08-22
   cyber = throw "cyber has been removed, as it does not build with supported Zig versions"; # Added 2025-08-09
   dale = throw "dale has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-10
   daq = throw "'daq' has been removed as it is unmaintained and broken. Snort2 has also been removed, which depended on this"; # Added 2025-05-21
@@ -519,7 +519,7 @@ mapAliases {
   docker-sync = throw "'docker-sync' has been removed because it was broken and unmaintained"; # Added 2025-08-26
   docker_26 = throw "'docker_26' has been removed because it has been unmaintained since February 2025. Use docker_28 or newer instead."; # Added 2025-06-21
   docker_27 = throw "'docker_27' has been removed because it has been unmaintained since May 2025. Use docker_28 or newer instead."; # Added 2025-06-15
-  dockerfile-language-server-nodejs = lib.warnOnInstantiate "'dockerfile-language-server-nodejs' has been renamed to 'dockerfile-language-server'" dockerfile-language-server; # Added 2025-09-12
+  dockerfile-language-server-nodejs = warnAlias "'dockerfile-language-server-nodejs' has been renamed to 'dockerfile-language-server'" dockerfile-language-server; # Added 2025-09-12
   dolphin-emu-beta = throw "'dolphin-emu-beta' has been renamed to/replaced by 'dolphin-emu'"; # Converted to throw 2025-10-27
   dotnetenv = throw "'dotnetenv' has been removed because it was unmaintained in Nixpkgs"; # Added 2025-07-11
   dotty = throw "'dotty' has been renamed to/replaced by 'scala_3'"; # Converted to throw 2025-10-27
@@ -554,7 +554,7 @@ mapAliases {
   eriscmd = throw "'eriscmd' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   erlang-ls = throw "'erlang-ls' has been removed as it has been archived upstream. Consider using 'erlang-language-platform' instead"; # Added 2025-10-02
   eww-wayland = throw "'eww-wayland' has been renamed to/replaced by 'eww'"; # Converted to throw 2025-10-27
-  f3d_egl = lib.warnOnInstantiate "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # added 2025-07-18
+  f3d_egl = warnAlias "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # added 2025-07-18
   fastnlo_toolkit = throw "'fastnlo_toolkit' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2025-10-27
   faustStk = throw "'faustStk' has been renamed to/replaced by 'faustPhysicalModeling'"; # Converted to throw 2025-10-27
   fbjni = throw "fbjni has been removed, as it was broken"; # Added 2025-08-25
@@ -572,8 +572,8 @@ mapAliases {
   fingerd_bsd = throw "'fingerd_bsd' has been renamed to/replaced by 'bsd-fingerd'"; # Converted to throw 2025-10-27
   fira-code-nerdfont = throw "'fira-code-nerdfont' has been renamed to/replaced by 'nerd-fonts.fira-code'"; # Converted to throw 2025-10-27
   firebird_2_5 = throw "'firebird_2_5' has been removed as it has reached end-of-life and does not build."; # Added 2025-06-10
-  firefox-beta-bin = lib.warnOnInstantiate "`firefox-beta-bin` is removed.  Please use `firefox-beta` or `firefox-bin` instead." firefox-beta; # Added 2025-06-06
-  firefox-devedition-bin = lib.warnOnInstantiate "`firefox-devedition-bin` is removed.  Please use `firefox-devedition` or `firefox-bin` instead." firefox-devedition; # Added 2025-06-06
+  firefox-beta-bin = warnAlias "`firefox-beta-bin` is removed.  Please use `firefox-beta` or `firefox-bin` instead." firefox-beta; # Added 2025-06-06
+  firefox-devedition-bin = warnAlias "`firefox-devedition-bin` is removed.  Please use `firefox-devedition` or `firefox-bin` instead." firefox-devedition; # Added 2025-06-06
   firefox-esr-128 = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr` or `firefox-esr-140` instead."; # Added 2025-08-21
   firefox-esr-128-unwrapped = throw "The Firefox 128 ESR series has reached its end of life. Upgrade to `firefox-esr-unwrapped` or `firefox-esr-140-unwrapped` instead."; # Added 2025-08-21
   firefox-wayland = throw "'firefox-wayland' has been renamed to/replaced by 'firefox'"; # Converted to throw 2025-10-27
@@ -589,7 +589,7 @@ mapAliases {
   flut-renamer = throw "flut-renamer is unmaintained and has been removed"; # Added 2025-08-26
   flutter326 = throw "flutter326 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-06-08
   fmsynth = throw "'fmsynth' has been removed as it was broken and unmaintained both upstream and in nixpkgs."; # Added 2025-09-01
-  follow = lib.warnOnInstantiate "follow has been renamed to folo" folo; # Added 2025-05-18
+  follow = warnAlias "follow has been renamed to folo" folo; # Added 2025-05-18
   forge = throw "forge was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   forgejo-actions-runner = throw "'forgejo-actions-runner' has been renamed to/replaced by 'forgejo-runner'"; # Converted to throw 2025-10-27
   fractal-next = throw "'fractal-next' has been renamed to/replaced by 'fractal'"; # Converted to throw 2025-10-27
@@ -611,7 +611,7 @@ mapAliases {
   garage_0_9 = throw "'garage_0_9' has been removed as it is unmaintained upstream"; # Added 2025-09-16
   garage_0_9_4 = throw "'garage_0_9_4' has been removed as it is unmaintained upstream"; # Added 2025-09-16
   garage_1_2_0 = throw "'garage_1_2_0' has been removed. Use 'garage_1' instead."; # Added 2025-09-16
-  garage_1_x = lib.warnOnInstantiate "'garage_1_x' has been renamed to 'garage_1'" garage_1; # Added 2025-06-23
+  garage_1_x = warnAlias "'garage_1_x' has been renamed to 'garage_1'" garage_1; # Added 2025-06-23
   garage_2_0_0 = throw "'garage_2_0_0' has been removed. Use 'garage_2' instead."; # Added 2025-09-16
   gcc9 = throw "gcc9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gcc9Stdenv = throw "gcc9Stdenv has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
@@ -744,9 +744,9 @@ mapAliases {
   k2pdfopt = throw "'k2pdfopt' has been removed from nixpkgs as it was broken"; # Added 2025-09-27
   k3s_1_30 = throw "'k3s_1_30' has been removed from nixpkgs as it has reached end of life"; # Added 2025-09-01
   kak-lsp = throw "'kak-lsp' has been renamed to/replaced by 'kakoune-lsp'"; # Converted to throw 2025-10-27
-  kanidm = lib.warnOnInstantiate "'kanidm' will be removed before 26.05. You must use a versioned package, e.g. 'kanidm_1_x'." kanidm_1_7; # Added 2025-09-01
+  kanidm = warnAlias "'kanidm' will be removed before 26.05. You must use a versioned package, e.g. 'kanidm_1_x'." kanidm_1_7; # Added 2025-09-01
   kanidm_1_4 = throw "'kanidm_1_4' has been removed as it has reached end of life"; # Added 2025-06-18
-  kanidmWithSecretProvisioning = lib.warnOnInstantiate "'kanidmWithSecretProvisioning' will be removed before 26.05. You must use a versioned package, e.g. 'kanidmWithSecretProvisioning_1_x'." kanidmWithSecretProvisioning_1_7; # Added 2025-09-01
+  kanidmWithSecretProvisioning = warnAlias "'kanidmWithSecretProvisioning' will be removed before 26.05. You must use a versioned package, e.g. 'kanidmWithSecretProvisioning_1_x'." kanidmWithSecretProvisioning_1_7; # Added 2025-09-01
   kanidmWithSecretProvisioning_1_4 = throw "'kanidmWithSecretProvisioning_1_4' has been removed as it has reached end of life"; # Added 2025-06-18
   kbibtex = throw "'kbibtex' has been removed, as it is unmaintained upstream"; # Added 2025-08-30
   kcli = throw "kcli has been removed because it has been marked as broken since at least November 2024."; # Added 2025-09-28
@@ -825,7 +825,7 @@ mapAliases {
   librewolf-wayland = throw "'librewolf-wayland' has been renamed to/replaced by 'librewolf'"; # Converted to throw 2025-10-27
   librtlsdr = throw "'librtlsdr' has been renamed to/replaced by 'rtl-sdr'"; # Converted to throw 2025-10-27
   libsForQt515 = throw "'libsForQt515' has been renamed to/replaced by 'libsForQt5'"; # Converted to throw 2025-10-27
-  libsmartcols = lib.warnOnInstantiate "'util-linux' should be used instead of 'libsmartcols'" util-linux; # Added 2025-09-03
+  libsmartcols = warnAlias "'util-linux' should be used instead of 'libsmartcols'" util-linux; # Added 2025-09-03
   libsoup = throw "'libsoup' has been renamed to/replaced by 'libsoup_2_4'"; # Converted to throw 2025-10-27
   libtap = throw "libtap has been removed, as it was unused and deprecated by its author in favour of cmocka"; # Added 2025-09-16
   libtcod = throw "'libtcod' has been removed due to being unused and having an incompatible build-system"; # Added 2025-10-04
@@ -840,8 +840,8 @@ mapAliases {
   lightly-boehs = throw "'lightly-boehs' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   lightly-qt = throw "'lightly-qt' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   ligo = throw "ligo has been removed from nixpkgs for lack of maintainance"; # Added 2025-06-03
-  lima-bin = lib.warnOnInstantiate "lima-bin has been replaced by lima" lima; # Added 2025-05-13
-  lincity_ng = lib.warnOnInstantiate "lincity_ng has been renamed to lincity-ng" lincity-ng; # Added 2025-10-09
+  lima-bin = warnAlias "lima-bin has been replaced by lima" lima; # Added 2025-05-13
+  lincity_ng = warnAlias "lincity_ng has been renamed to lincity-ng" lincity-ng; # Added 2025-10-09
   linphone = linphonePackages.linphone-desktop; # Added 2025-09-20
   linux-libre = throw "linux_libre has been removed due to lack of maintenance"; # Added 2025-10-01
   linux-rt_5_4 = throw "linux_rt 5.4 has been removed because it will reach its end of life within 25.11"; # Added 2025-10-22
@@ -1025,7 +1025,7 @@ mapAliases {
   mlir_17 = throw "mlir_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   mmsd = throw "'mmsd' has been removed due to being unmaintained upstream. Consider using 'mmsd-tng' instead"; # Added 2025-06-07
   mmutils = throw "'mmutils' has been removed due to being unmaintained upstream"; # Added 2025-08-29
-  moar = lib.warnOnInstantiate "`moar` has been renamed to `moor` by upstream in v2.0.0. See https://github.com/walles/moor/pull/305 for more." pkgs.moor; # Added 2025-09-02
+  moar = warnAlias "`moar` has been renamed to `moor` by upstream in v2.0.0. See https://github.com/walles/moor/pull/305 for more." pkgs.moor; # Added 2025-09-02
   mongodb-6_0 = throw "mongodb-6_0 has been removed, it's end of life since July 2025"; # Added 2025-07-23
   monitor = pantheon.elementary-monitor; # Added 2025-10-10
   mono4 = mono6; # Added 2025-08-25
@@ -1040,7 +1040,7 @@ mapAliases {
   mpc-cli = throw "'mpc-cli' has been renamed to/replaced by 'mpc'"; # Converted to throw 2025-10-27
   mpc_cli = throw "'mpc_cli' has been renamed to/replaced by 'mpc'"; # Converted to throw 2025-10-27
   mpdevil = throw "'mpdevil' has been renamed to/replaced by 'plattenalbum'"; # Converted to throw 2025-10-27
-  mpdWithFeatures = lib.warnOnInstantiate "mpdWithFeatures has been replaced by mpd.override" mpd.override; # Added 2025-08-08
+  mpdWithFeatures = warnAlias "mpdWithFeatures has been replaced by mpd.override" mpd.override; # Added 2025-08-08
   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
   mrxvt = throw "'mrxvt' has been removed due to lack of maintainence upstream"; # Added 2025-09-25
@@ -1106,16 +1106,14 @@ mapAliases {
       if lib.oldestSupportedReleaseIsAtLeast 2605 then
         throw "nixfmt-classic has been removed as it is deprecated and unmaintained."
       else if lib.oldestSupportedReleaseIsAtLeast 2511 then
-        lib.warnOnInstantiate "nixfmt-classic is deprecated and unmaintained. We recommend switching to nixfmt."
+        warnAlias "nixfmt-classic is deprecated and unmaintained. We recommend switching to nixfmt."
       else
         lib.id
     )
       haskellPackages.nixfmt.bin;
   nixfmt-rfc-style =
     if lib.oldestSupportedReleaseIsAtLeast 2511 then
-      lib.warnOnInstantiate
-        "nixfmt-rfc-style is now the same as pkgs.nixfmt which should be used instead."
-        nixfmt # Added 2025-07-14
+      warnAlias "nixfmt-rfc-style is now the same as pkgs.nixfmt which should be used instead." nixfmt # Added 2025-07-14
     else
       nixfmt;
   nixForLinking = throw "nixForLinking has been removed, use `nixVersions.nixComponents_<version>` instead"; # Added 2025-08-14
@@ -1143,7 +1141,7 @@ mapAliases {
   onscripter-en = throw "onscripter-en has been removed due to lack of maintenance in both upstream and Nixpkgs; onscripter is available instead"; # Added 2025-10-17
   onthespot = throw "onethespot has been removed due to lack of upstream maintenance"; # Added 2025-09-26
   opae = throw "opae has been removed because it has been marked as broken since June 2023."; # Added 2025-10-11
-  open-timeline-io = lib.warnOnInstantiate "'open-timeline-io' has been renamed to 'opentimelineio'" opentimelineio; # Added 2025-08-10
+  open-timeline-io = warnAlias "'open-timeline-io' has been renamed to 'opentimelineio'" opentimelineio; # Added 2025-08-10
   openafs_1_8 = throw "'openafs_1_8' has been renamed to/replaced by 'openafs'"; # Converted to throw 2025-10-27
   openai-triton-llvm = throw "'openai-triton-llvm' has been renamed to/replaced by 'triton-llvm'"; # Converted to throw 2025-10-27
   openai-whisper-cpp = throw "'openai-whisper-cpp' has been renamed to/replaced by 'whisper-cpp'"; # Converted to throw 2025-10-27
@@ -1161,7 +1159,7 @@ mapAliases {
   openssl_3_0 = throw "'openssl_3_0' has been renamed to/replaced by 'openssl_3'"; # Converted to throw 2025-10-27
   opensycl = throw "'opensycl' has been renamed to/replaced by 'adaptivecpp'"; # Converted to throw 2025-10-27
   opensyclWithRocm = throw "'opensyclWithRocm' has been renamed to/replaced by 'adaptivecppWithRocm'"; # Converted to throw 2025-10-27
-  opentofu-ls = lib.warnOnInstantiate "'opentofu-ls' has been renamed to 'tofu-ls'" tofu-ls; # Added 2025-06-10
+  opentofu-ls = warnAlias "'opentofu-ls' has been renamed to 'tofu-ls'" tofu-ls; # Added 2025-06-10
   opentracing-cpp = throw "'opentracingc-cpp' has been removed as it was archived upstream in 2024"; # Added 2025-10-19
   opera = throw "'opera' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-05-19
   orogene = throw "'orogene' uses a wasm-specific fork of async-tar that is vulnerable to CVE-2025-62518, which is not supported by its upstream"; # Added 2025-10-24
@@ -1180,8 +1178,8 @@ mapAliases {
   pcre16 = throw "'pcre16' has been removed because it is obsolete. Consider migrating to 'pcre2' instead."; # Added 2025-05-29
   pcsctools = throw "'pcsctools' has been renamed to/replaced by 'pcsc-tools'"; # Converted to throw 2025-10-27
   pdf4tcl = throw "'pdf4tcl' has been renamed to/replaced by 'tclPackages.pdf4tcl'"; # Converted to throw 2025-10-27
-  pds = lib.warnOnInstantiate "'pds' has been renamed to 'bluesky-pds'" bluesky-pds; # Added 2025-08-20
-  pdsadmin = lib.warnOnInstantiate "'pdsadmin' has been renamed to 'bluesky-pdsadmin'" bluesky-pdsadmin; # Added 2025-08-20
+  pds = warnAlias "'pds' has been renamed to 'bluesky-pds'" bluesky-pds; # Added 2025-08-20
+  pdsadmin = warnAlias "'pdsadmin' has been renamed to 'bluesky-pdsadmin'" bluesky-pdsadmin; # Added 2025-08-20
   peach = throw "'peach' has been renamed to/replaced by 'asouldocs'"; # Converted to throw 2025-10-27
   pentablet-driver = throw "'pentablet-driver' has been renamed to/replaced by 'xp-pen-g430-driver'"; # Converted to throw 2025-10-27
   perceptual-diff = throw "perceptual-diff was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
@@ -1239,7 +1237,7 @@ mapAliases {
   posterazor = throw "posterazor was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   postfixadmin = throw "'postfixadmin' has been removed due to lack of maintenance and missing support for PHP >8.1"; # Added 2025-10-03
   postgis = throw "'postgis' has been removed. Use 'postgresqlPackages.postgis' instead."; # Added 2025-07-19
-  postgres-lsp = lib.warnOnInstantiate "'postgres-lsp' has been renamed to 'postgres-language-server'" postgres-language-server; # Added 2025-10-28
+  postgres-lsp = warnAlias "'postgres-lsp' has been renamed to 'postgres-language-server'" postgres-language-server; # Added 2025-10-28
   postgresql13JitPackages = throw "'postgresql13JitPackages' has been renamed to/replaced by 'postgresql13Packages'"; # Converted to throw 2025-10-27
   postgresql14JitPackages = throw "'postgresql14JitPackages' has been renamed to/replaced by 'postgresql14Packages'"; # Converted to throw 2025-10-27
   postgresql15JitPackages = throw "'postgresql15JitPackages' has been renamed to/replaced by 'postgresql15Packages'"; # Converted to throw 2025-10-27
@@ -1562,8 +1560,8 @@ mapAliases {
   vkdt-wayland = throw "'vkdt-wayland' has been renamed to/replaced by 'vkdt'"; # Converted to throw 2025-10-27
   volk_2 = throw "'volk_2' has been removed after not being used by any package for a long time"; # Added 2025-10-25
   voxelands = throw "'voxelands' has been removed due to lack of upstream maintenance"; # Added 2025-08-30
-  vtk_9 = lib.warnOnInstantiate "'vtk_9' has been renamed to 'vtk_9_5'" vtk_9_5; # Added 2025-07-18
-  vtk_9_egl = lib.warnOnInstantiate "'vtk_9_5' now build with egl support by default, so `vtk_9_egl` is deprecated, consider using 'vtk_9_5' instead." vtk_9_5; # Added 2025-07-18
+  vtk_9 = warnAlias "'vtk_9' has been renamed to 'vtk_9_5'" vtk_9_5; # Added 2025-07-18
+  vtk_9_egl = warnAlias "'vtk_9_5' now build with egl support by default, so `vtk_9_egl` is deprecated, consider using 'vtk_9_5' instead." vtk_9_5; # Added 2025-07-18
   vtk_9_withQt5 = throw "'vtk_9_withQt5' has been removed, Consider using 'vtkWithQt6' instead."; # Added 2025-07-18
   vtkWithQt5 = throw "'vtkWithQt5' has been removed. Consider using 'vtkWithQt6' instead."; # Added 2025-09-06
   vwm = throw "'vwm' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
@@ -1620,8 +1618,8 @@ mapAliases {
   zandronum-alpha = throw "'zandronum-alpha' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19
   zandronum-alpha-server = throw "'zandronum-alpha-server' has been removed as it was broken and the stable version has caught up"; # Added 2025-10-19
   zbackup = throw "'zbackup' has been removed due to being unmaintained upstream"; # Added 2025-08-22
-  zeal-qt5 = lib.warnOnInstantiate "'zeal-qt5' has been removed from nixpkgs. Please use 'zeal' instead" zeal; # Added 2025-08-31
-  zeal-qt6 = lib.warnOnInstantiate "'zeal-qt6' has been renamed to 'zeal'" zeal; # Added 2025-08-31
+  zeal-qt5 = warnAlias "'zeal-qt5' has been removed from nixpkgs. Please use 'zeal' instead" zeal; # Added 2025-08-31
+  zeal-qt6 = warnAlias "'zeal-qt6' has been renamed to 'zeal'" zeal; # Added 2025-08-31
   zeroadPackages.zeroad = throw "'zeroadPackages.zeroad' has been renamed to/replaced by 'zeroad'"; # Converted to throw 2025-10-27
   zeroadPackages.zeroad-data = throw "'zeroadPackages.zeroad-data' has been renamed to/replaced by 'zeroad-data'"; # Converted to throw 2025-10-27
   zeroadPackages.zeroad-unwrapped = throw "'zeroadPackages.zeroad-unwrapped' has been renamed to/replaced by 'zeroad-unwrapped'"; # Converted to throw 2025-10-27

From 7430d7f3efeb965ff19021eb5b5a4bbc6ffe47c4 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 28 Oct 2025 18:18:43 +0000
Subject: [PATCH 3597/6226] aliases: turn some throws back into warnings
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

These are more potentially load‐bearing than the rest.
---
 pkgs/top-level/aliases.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 857a9e39bfc1..150a95c88d3e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1338,8 +1338,8 @@ mapAliases {
   rubyPackages_3_1 = throw "rubyPackages_3_1 has been removed, as it is has reached end‐of‐life upstream"; # Added 2025-10-12
   rubyPackages_3_2 = throw "rubyPackages_3_2 has been removed, as it will reach end‐of‐life upstream during Nixpkgs 25.11’s support cycle"; # Added 2025-10-12
   rucksack = throw "rucksack was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
-  runCommandNoCC = throw "'runCommandNoCC' has been renamed to/replaced by 'runCommand'"; # Converted to throw 2025-10-27
-  runCommandNoCCLocal = throw "'runCommandNoCCLocal' has been renamed to/replaced by 'runCommandLocal'"; # Converted to throw 2025-10-27
+  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
   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
@@ -1534,7 +1534,7 @@ mapAliases {
   unifi-poller = throw "'unifi-poller' has been renamed to/replaced by 'unpoller'"; # Converted to throw 2025-10-27
   unzoo = throw "'unzoo' has been removed since it is unmaintained upstream and doesn't compile with newer versions of GCC anymore"; # Removed 2025-05-24
   util-linuxCurses = throw "'util-linuxCurses' has been renamed to/replaced by 'util-linux'"; # Converted to throw 2025-10-27
-  utillinux = throw "'utillinux' has been renamed to/replaced by 'util-linux'"; # Converted to throw 2025-10-27
+  utillinux = warnAlias "'utillinux' has been renamed to/replaced by 'util-linux'" util-linux; # Converted to warning 2025-10-28
   vaapiIntel = throw "'vaapiIntel' has been renamed to/replaced by 'intel-vaapi-driver'"; # Converted to throw 2025-10-27
   vaapiVdpau = throw "'vaapiVdpau' has been renamed to/replaced by 'libva-vdpau-driver'"; # Converted to throw 2025-10-27
   valum = throw "'valum' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01

From 90cb7876446bf1684ffe40ab7832de0ec1b92991 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 28 Oct 2025 18:18:43 +0000
Subject: [PATCH 3598/6226] aliases: add warnings to deprecated system
 definitions

---
 pkgs/top-level/aliases.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 150a95c88d3e..016c09fbcd3e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -259,14 +259,6 @@ let
 in
 
 mapAliases {
-  forceSystem = system: _: (import self.path { localSystem = { inherit system; }; }); # Added 2018-07-16 preserve, reason: forceSystem should not be used directly in Nixpkgs.
-
-  # TODO: Remove from Nixpkgs and eventually turn into throws.
-  system = stdenv.hostPlatform.system; # Added 2021-10-22
-  buildPlatform = stdenv.buildPlatform; # Added 2023-01-09
-  hostPlatform = stdenv.hostPlatform; # Added 2023-01-09
-  targetPlatform = stdenv.targetPlatform; # Added 2023-01-09
-
   # LLVM packages for (integration) testing that should not be used inside Nixpkgs:
   llvmPackages_latest = llvmPackages_21;
   llvmPackages_git = (callPackages ../development/compilers/llvm { }).git;
@@ -384,6 +376,7 @@ mapAliases {
   brogue = warnAlias "Use 'brogue-ce' instead of 'brogue' for updated releases" brogue-ce; # Added 2025-10-04
   buildBowerComponents = throw "buildBowerComponents has been removed as bower was removed. It is recommended to migrate to yarn."; # Added 2025-09-17
   buildGo123Module = throw "Go 1.23 is end-of-life, and 'buildGo123Module' has been removed. Please use a newer builder version."; # Added 2025-08-13
+  buildPlatform = warnAlias "'buildPlatform' has been renamed to/replaced by 'stdenv.buildPlatform'" stdenv.buildPlatform; # Converted to warning 2025-10-28
   buildXenPackage = throw "'buildXenPackage' has been removed as a custom Xen build can now be achieved by simply overriding 'xen'."; # Added 2025-05-12
   bwidget = throw "'bwidget' has been renamed to/replaced by 'tclPackages.bwidget'"; # Converted to throw 2025-10-27
   bzrtp = throw "'bzrtp' has been moved to 'linphonePackages.bzrtp'"; # Added 2025-09-20
@@ -590,6 +583,9 @@ mapAliases {
   flutter326 = throw "flutter326 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-06-08
   fmsynth = throw "'fmsynth' has been removed as it was broken and unmaintained both upstream and in nixpkgs."; # Added 2025-09-01
   follow = warnAlias "follow has been renamed to folo" folo; # Added 2025-05-18
+  forceSystem = warnAlias "forceSystem is deprecated in favour of explicitly importing Nixpkgs" (
+    system: _: (import self.path { localSystem = { inherit system; }; })
+  ); # Converted to warning 2025-10-28
   forge = throw "forge was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   forgejo-actions-runner = throw "'forgejo-actions-runner' has been renamed to/replaced by 'forgejo-runner'"; # Converted to throw 2025-10-27
   fractal-next = throw "'fractal-next' has been renamed to/replaced by 'fractal'"; # Converted to throw 2025-10-27
@@ -708,6 +704,7 @@ mapAliases {
   hiddify-app = throw "hiddify-app has been removed, since it is unmaintained"; # added 2025-08-20
   himitsu-firefox = throw "himitsu-firefox has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
   hobbes = throw "hobbes has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-20
+  hostPlatform = warnAlias "'hostPlatform' has been renamed to/replaced by 'stdenv.hostPlatform'" stdenv.hostPlatform; # Converted to warning 2025-10-28
   hpmyroom = throw "hpmyroom has been removed because it has been marked as broken since May 2024."; # Added 2025-10-11
   hpp-fcl = throw "'hpp-fcl' has been renamed to/replaced by 'coal'"; # Converted to throw 2025-10-27
   hydra_unstable = throw "'hydra_unstable' has been renamed to/replaced by 'hydra'"; # Converted to throw 2025-10-27
@@ -1445,11 +1442,13 @@ mapAliases {
   syncthing-tray = throw "syncthing-tray has been removed because it is broken and unmaintained"; # Added 2025-05-18
   syncthingtray-qt6 = throw "'syncthingtray-qt6' has been renamed to/replaced by 'syncthingtray'"; # Converted to throw 2025-10-27
   syndicate_utils = throw "'syndicate_utils' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
+  system = warnAlias "'system' has been renamed to/replaced by 'stdenv.hostPlatform.system'" stdenv.hostPlatform.system; # Converted to warning 2025-10-28
   t1lib = throw "'t1lib' has been removed as it was broken and unmaintained upstream."; # Added 2025-06-11
   tamgamp.lv2 = tamgamp-lv2; # Added 2025-09-27
   taplo-cli = throw "'taplo-cli' has been renamed to/replaced by 'taplo'"; # Converted to throw 2025-10-27
   taplo-lsp = throw "'taplo-lsp' has been renamed to/replaced by 'taplo'"; # Converted to throw 2025-10-27
   targetcli = throw "'targetcli' has been renamed to/replaced by 'targetcli-fb'"; # Converted to throw 2025-10-27
+  targetPlatform = warnAlias "'targetPlatform' has been renamed to/replaced by 'stdenv.targetPlatform'" stdenv.targetPlatform; # Converted to warning 2025-10-28
   taro = throw "'taro' has been renamed to/replaced by 'taproot-assets'"; # Converted to throw 2025-10-27
   taskwarrior = throw "'taskwarrior' has been renamed to/replaced by 'taskwarrior2'"; # Converted to throw 2025-10-27
   tbb = onetbb; # Added 2025-09-14

From b6d112f72f14ca395739a3ea8a10dd4537e81996 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Tue, 28 Oct 2025 18:33:30 +0000
Subject: [PATCH 3599/6226] aliases: clarify Python 2 throw messages

---
 pkgs/top-level/aliases.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 016c09fbcd3e..0f06392aa7fb 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1281,9 +1281,9 @@ mapAliases {
   python312Full = throw "python312Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
   python313Full = throw "python313Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
   python314Full = throw "python314Full has been removed. Bluetooth support is now enabled by default. The tkinter package is available within the package set."; # Added 2025-08-30
-  python = throw "'python' has been renamed to/replaced by 'python2'"; # Converted to throw 2025-10-27
-  pythonFull = throw "'pythonFull' has been renamed to/replaced by 'python2Full'"; # Converted to throw 2025-10-27
-  pythonPackages = throw "'pythonPackages' has been renamed to/replaced by 'python.pkgs'"; # Converted to throw 2025-10-27
+  python = throw "`python` previously pointed to Python 2; use `python3` or `python2` if necessary"; # Converted to throw 2025-10-27
+  pythonFull = throw "'pythonFull' previously pointed to Python 2; use `python3` or `python2Full` if necessary"; # Converted to throw 2025-10-27
+  pythonPackages = throw "`pythonPackages` previously pointed to Python 2; use `python3Packages` or `python2.pkgs` if necessary"; # Converted to throw 2025-10-27
   qcachegrind = throw "'qcachegrind' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
   qflipper = throw "'qflipper' has been renamed to/replaced by 'qFlipper'"; # Converted to throw 2025-10-27
   qnial = throw "'qnial' has been removed due to failing to build and being unmaintained"; # Added 2025-06-26

From fbb71621896a08bcf45bca8dc84642e450398f22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 18:52:46 +0000
Subject: [PATCH 3600/6226] lla: 0.4.2 -> 0.5.0

---
 pkgs/by-name/ll/lla/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix
index 5176cb4f8354..52eebe83fa9f 100644
--- a/pkgs/by-name/ll/lla/package.nix
+++ b/pkgs/by-name/ll/lla/package.nix
@@ -8,7 +8,7 @@
   nix-update-script,
 }:
 let
-  version = "0.4.2";
+  version = "0.5.0";
 in
 rustPlatform.buildRustPackage {
   pname = "lla";
@@ -18,7 +18,7 @@ rustPlatform.buildRustPackage {
     owner = "chaqchase";
     repo = "lla";
     tag = "v${version}";
-    hash = "sha256-7/VfEcqvYGC1Pw9wJh5FF3c7BXgcg9LVDvcr4zCrros=";
+    hash = "sha256-xbXTiOr3c9PX0SRfjO+3Kib5S0fruFhjHO2Mf00BVBg=";
   };
 
   nativeBuildInputs = [
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage {
     installShellFiles
   ];
 
-  cargoHash = "sha256-LYRNXNhPgpNZWP5XKqfgM6t9Ts2k/e09iXWMcuEp9LA=";
+  cargoHash = "sha256-qKeNSaZMpyQpI7oGqn416pfBINMsIE+0sjzg38roxc8=";
 
   cargoBuildFlags = [ "--workspace" ];
 

From 825f0a3e7b9ac9492a36b3e5b5d21f8be38af7d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 18:53:33 +0000
Subject: [PATCH 3601/6226] python3Packages.semchunk: 3.2.2 -> 3.2.5

---
 pkgs/development/python-modules/semchunk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/semchunk/default.nix b/pkgs/development/python-modules/semchunk/default.nix
index 21fff736d36e..988fd74b2d26 100644
--- a/pkgs/development/python-modules/semchunk/default.nix
+++ b/pkgs/development/python-modules/semchunk/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "semchunk";
-  version = "3.2.2";
+  version = "3.2.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "isaacus-dev";
     repo = "semchunk";
     tag = "v${version}";
-    hash = "sha256-bZe5QOFYY0LUUhv2T8B5xuzpCQ0XHtgS3ef12ZhxKvw=";
+    hash = "sha256-LUMpERJ8bZkpRn0Tay0BoDXmRgPaV7z0LulpTILHgjk=";
   };
 
   build-system = [

From 06083cc5ed5631036ea7a23b202e0a8e267e41c9 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 17 Sep 2025 09:59:02 +0200
Subject: [PATCH 3602/6226] levmar: adopt

---
 pkgs/by-name/le/levmar/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/le/levmar/package.nix b/pkgs/by-name/le/levmar/package.nix
index ac7879f74087..d6e974f7064e 100644
--- a/pkgs/by-name/le/levmar/package.nix
+++ b/pkgs/by-name/le/levmar/package.nix
@@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "ANSI C implementations of Levenberg-Marquardt, usable also from C++";
     homepage = "https://www.ics.forth.gr/~lourakis/levmar/";
     license = lib.licenses.gpl2Plus;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.nim65s ];
     platforms = lib.platforms.all;
   };
 })

From cdcdbe2731ee0e0cd9f499055f7cd003a4ba670d Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 16 Sep 2025 12:38:15 +0200
Subject: [PATCH 3603/6226] levmar: install new header

lm.h only contains a deprecation warning now
---
 pkgs/by-name/le/levmar/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/le/levmar/package.nix b/pkgs/by-name/le/levmar/package.nix
index d6e974f7064e..a52760b37368 100644
--- a/pkgs/by-name/le/levmar/package.nix
+++ b/pkgs/by-name/le/levmar/package.nix
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   installPhase = ''
     mkdir -p $out/include $out/lib
-    cp lm.h $out/include
+    cp levmar.h lm.h $out/include
     cp liblevmar.a $out/lib
   '';
 

From 411147488f1649326636edf4f1cbfaf42ad2bbe9 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 17 Sep 2025 09:22:08 +0200
Subject: [PATCH 3604/6226] lib3mf: adopt

---
 pkgs/by-name/li/lib3mf/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/lib3mf/package.nix b/pkgs/by-name/li/lib3mf/package.nix
index 813138971444..0434368b5698 100644
--- a/pkgs/by-name/li/lib3mf/package.nix
+++ b/pkgs/by-name/li/lib3mf/package.nix
@@ -109,7 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Reference implementation of the 3D Manufacturing Format file standard";
     homepage = "https://3mf.io/";
     license = licenses.bsd2;
-    maintainers = [ ];
+    maintainers = with maintainers; [ nim65s ];
     platforms = platforms.all;
   };
 })

From 213cd5f26c958c9909a6351d3558c3af6a6b9b51 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 17 Sep 2025 09:42:31 +0200
Subject: [PATCH 3605/6226] lib3mf: fix CMake export

---
 pkgs/by-name/li/lib3mf/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/li/lib3mf/package.nix b/pkgs/by-name/li/lib3mf/package.nix
index 0434368b5698..2b29e533a5b5 100644
--- a/pkgs/by-name/li/lib3mf/package.nix
+++ b/pkgs/by-name/li/lib3mf/package.nix
@@ -98,6 +98,11 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-warn "RAND_cleanup();" "" \
       --replace-warn "EVP_cleanup();" "" \
       --replace-warn "CRYPTO_cleanup_all_ex_data();" ""
+
+    # Fix CMake export
+    substituteInPlace cmake/lib3mfConfig.cmake \
+      --replace-fail "$""{LIB3MF_ROOT_DIR}/include" "$""{LIB3MF_ROOT_DIR}/include/lib3mf" \
+      --replace-fail "$""{LIB3MF_ROOT_DIR}/lib" "$out/lib"
   '';
 
   doCheck = true;

From a405bcdd1a827d1a598c54c7fc9654ccf323696a Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Sun, 5 Oct 2025 22:39:40 +0200
Subject: [PATCH 3606/6226] lib3mf: replace-warn -> replace-fail

Co-authored-by: Sandro <7258858+SuperSandro2000@users.noreply.github.com>
---
 pkgs/by-name/li/lib3mf/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/lib3mf/package.nix b/pkgs/by-name/li/lib3mf/package.nix
index 2b29e533a5b5..78bd87350071 100644
--- a/pkgs/by-name/li/lib3mf/package.nix
+++ b/pkgs/by-name/li/lib3mf/package.nix
@@ -95,9 +95,9 @@ stdenv.mkDerivation (finalAttrs: {
 
     # functions are no longer in openssl, remove them from test cleanup function
     substituteInPlace Tests/CPP_Bindings/Source/UnitTest_EncryptionUtils.cpp \
-      --replace-warn "RAND_cleanup();" "" \
-      --replace-warn "EVP_cleanup();" "" \
-      --replace-warn "CRYPTO_cleanup_all_ex_data();" ""
+      --replace-fail "RAND_cleanup();" "" \
+      --replace-fail "EVP_cleanup();" "" \
+      --replace-fail "CRYPTO_cleanup_all_ex_data();" ""
 
     # Fix CMake export
     substituteInPlace cmake/lib3mfConfig.cmake \

From dfe018a51c1e3a081ae5d43a032e8fe8fec6b272 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 19 Sep 2025 12:16:00 +0200
Subject: [PATCH 3607/6226] tinygltf: init at 2.9.6

---
 pkgs/by-name/ti/tinygltf/package.nix | 30 ++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 pkgs/by-name/ti/tinygltf/package.nix

diff --git a/pkgs/by-name/ti/tinygltf/package.nix b/pkgs/by-name/ti/tinygltf/package.nix
new file mode 100644
index 000000000000..564114244456
--- /dev/null
+++ b/pkgs/by-name/ti/tinygltf/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "tinygltf";
+  version = "2.9.6";
+
+  src = fetchFromGitHub {
+    owner = "syoyo";
+    repo = "tinygltf";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-3dBxfdXeTbzeQAXaBXFaflLgXYeuOfESdq6V3+0iCXY=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  meta = {
+    description = "Header only C++11 tiny glTF 2.0 library";
+    homepage = "https://github.com/syoyo/tinygltf";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nim65s ];
+    platforms = lib.platforms.unix;
+  };
+})

From 2f5527cbd59d85c68319af9d6e0879b669fa33fc Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Sun, 21 Sep 2025 22:52:56 +0200
Subject: [PATCH 3608/6226] libigl: dont install opengl headers

fix meshlab on darwin:
```
[ 47%] Building CXX object src/meshlabplugins/filter_cubization/CMakeFiles/filter_cubization.dir/filter_cubization_autogen/mocs_compilation.cpp.o
In file included from /tmp/nix-build-meshlab-2025.07.drv-0/source/build/src/meshlabplugins/filter_cubization/filter_cubization_autogen/mocs_compilation.cpp:2:
In file included from /tmp/nix-build-meshlab-2025.07.drv-0/source/build/src/meshlabplugins/filter_cubization/filter_cubization_autogen/EWIEGA46WW/moc_filter_cubization.cpp:10:
In file included from /tmp/nix-build-meshlab-2025.07.drv-0/source/build/src/meshlabplugins/filter_cubization/filter_cubization_autogen/EWIEGA46WW/../../../../../../src/meshlabplugins/filter_cubization/filter_cubization.h:28:
In file included from /tmp/nix-build-meshlab-2025.07.drv-0/source/src/common/../common/plugins/interfaces/filter_plugin.h:29:
In file included from /tmp/nix-build-meshlab-2025.07.drv-0/source/src/common/../common/plugins/interfaces/../../ml_document/mesh_document.h:27:
In file included from /tmp/nix-build-meshlab-2025.07.drv-0/source/src/common/../common/plugins/interfaces/../../ml_document/mesh_model.h:26:
In file included from /nix/store/18nlfi993h20y6dd1kfg8zm9gaglwygn-glew-2.2.0-dev/include/GL/glew.h:1217:
In file included from /nix/store/rhlyld20zdzdi5wghb4b12gw52s9whr9-apple-sdk-11.3/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/System/Library/Frameworks/OpenGL.framework/Headers/glu.h:9:
/nix/store/zchkzj4md6q4lq09iidcm4c8n7r22k46-libigl-2.6.0/include/igl/OpenGL/gl.h:23:10: fatal error: 'glad/glad.h' file not found
   23 | #include <glad/glad.h>
      |          ^~~~~~~~~~~~~
```
---
 pkgs/by-name/li/libigl/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/li/libigl/package.nix b/pkgs/by-name/li/libigl/package.nix
index 1fc21b8f63d4..1ef1a6d73324 100644
--- a/pkgs/by-name/li/libigl/package.nix
+++ b/pkgs/by-name/li/libigl/package.nix
@@ -20,6 +20,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   installPhase = ''
     mkdir -p $out/include
     cp -r include/igl $out/include
+    rm -rf $out/include/igl/opengl
   '';
 
   meta = with lib; {

From c38f7f8446aebe35880d3218db6a722f3ad3036b Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 17 Sep 2025 11:02:03 +0200
Subject: [PATCH 3609/6226] vcg: adopt

---
 pkgs/by-name/vc/vcg/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/vc/vcg/package.nix b/pkgs/by-name/vc/vcg/package.nix
index 487b4510263e..2a2e43e061ed 100644
--- a/pkgs/by-name/vc/vcg/package.nix
+++ b/pkgs/by-name/vc/vcg/package.nix
@@ -29,6 +29,6 @@ stdenv.mkDerivation rec {
     description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes";
     license = licenses.gpl3;
     platforms = platforms.all;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.nim65s ];
   };
 }

From edbfc2a1bd8e2c31bcee4a6ecc78f67e8d63fe7b Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 17 Sep 2025 11:03:24 +0200
Subject: [PATCH 3610/6226] vcg: clean

---
 pkgs/by-name/vc/vcg/package.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/vc/vcg/package.nix b/pkgs/by-name/vc/vcg/package.nix
index 2a2e43e061ed..bf3f4a7ff8e5 100644
--- a/pkgs/by-name/vc/vcg/package.nix
+++ b/pkgs/by-name/vc/vcg/package.nix
@@ -1,19 +1,22 @@
 {
   lib,
+
   stdenv,
   fetchFromGitHub,
+
+  # propagatedBuildInputs
   eigen,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "vcg";
   version = "2025.07";
 
   src = fetchFromGitHub {
     owner = "cnr-isti-vclab";
     repo = "vcglib";
-    rev = version;
-    sha256 = "sha256-OZnqFnHGXC9fS7JCLTiHNCeA//JBAZGLB5SP/rGzaA8=";
+    tag = finalAttrs.version;
+    hash = "sha256-OZnqFnHGXC9fS7JCLTiHNCeA//JBAZGLB5SP/rGzaA8=";
   };
 
   propagatedBuildInputs = [ eigen ];
@@ -24,11 +27,11 @@ stdenv.mkDerivation rec {
     find $out -name \*.h -exec sed -i 's,<eigenlib/,<eigen3/,g' {} \;
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://vcg.isti.cnr.it/vcglib/install.html";
     description = "C++ library for manipulation, processing and displaying with OpenGL of triangle and tetrahedral meshes";
-    license = licenses.gpl3;
-    platforms = platforms.all;
+    license = lib.licenses.gpl3;
+    platforms = lib.platforms.all;
     maintainers = [ lib.maintainers.nim65s ];
   };
-}
+})

From 5332e5d3b52e5bd70b14fc5b491ea89dce32c88c Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 17 Sep 2025 12:32:22 +0200
Subject: [PATCH 3611/6226] vcg: switch to CMake

---
 pkgs/by-name/vc/vcg/package.nix | 32 ++++++++++++++++++++++++++------
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/vc/vcg/package.nix b/pkgs/by-name/vc/vcg/package.nix
index bf3f4a7ff8e5..8db97500a18f 100644
--- a/pkgs/by-name/vc/vcg/package.nix
+++ b/pkgs/by-name/vc/vcg/package.nix
@@ -3,6 +3,10 @@
 
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
+
+  # nativeBuildInputs
+  cmake,
 
   # propagatedBuildInputs
   eigen,
@@ -19,13 +23,29 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-OZnqFnHGXC9fS7JCLTiHNCeA//JBAZGLB5SP/rGzaA8=";
   };
 
-  propagatedBuildInputs = [ eigen ];
+  patches = [
+    # CMake: install lib and exports
+    # ref. https://github.com/cnr-isti-vclab/vcglib/pull/248
+    # merged upstream
+    (fetchpatch {
+      name = "cmake-install-lib-and-exports.patch";
+      url = "https://github.com/cnr-isti-vclab/vcglib/commit/4a8dd8d6e54890aee76917d27aabfa7031cbc68d.patch";
+      hash = "sha256-b3qsmLu+4VSs943VS3C4gdG/PDR2mhr9/dDTmkep8zo=";
+    })
+  ];
 
-  installPhase = ''
-    mkdir -p $out/include
-    cp -r vcg wrap $out/include
-    find $out -name \*.h -exec sed -i 's,<eigenlib/,<eigen3/,g' {} \;
-  '';
+  nativeBuildInputs = [
+    cmake
+  ];
+
+  propagatedBuildInputs = [
+    eigen
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "VCG_ALLOW_BUNDLED_EIGEN" false)
+    (lib.cmakeBool "VCG_BUILD_EXAMPLES" false)
+  ];
 
   meta = {
     homepage = "https://vcg.isti.cnr.it/vcglib/install.html";

From 0cc4e7d66814902c2f531909ce62685bd6e1218b Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 16 Sep 2025 15:59:03 +0200
Subject: [PATCH 3612/6226] corto: 0-unstable-2024-04-05 -> v2025.07

---
 pkgs/by-name/co/corto/package.nix | 32 +++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/co/corto/package.nix b/pkgs/by-name/co/corto/package.nix
index acf0517e0c10..5efe16c864c4 100644
--- a/pkgs/by-name/co/corto/package.nix
+++ b/pkgs/by-name/co/corto/package.nix
@@ -2,26 +2,42 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
+  nix-update-script,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "corto";
-  version = "0-unstable-2024-04-05";
+  version = "2025.07";
 
   src = fetchFromGitHub {
     owner = "cnr-isti-vclab";
     repo = "corto";
-    rev = "d880519c490c88a39d12c31a914b6a687a7019c3";
-    hash = "sha256-0OUijrf+0ZNv3oYko2r8Kp9zgtg8b9RPL7DXHf15Ryc=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-wfIZQdypBTfUZJgPE4DetSt1SUNSyZihmL1Uzapqh1o=";
   };
 
+  patches = [
+    # CMake: exports
+    # ref. https://github.com/cnr-isti-vclab/corto/pull/47
+    # merged upstream
+    (fetchpatch {
+      name = "cmake-exports.patch";
+      url = "https://github.com/cnr-isti-vclab/corto/commit/169356e97b29587b278822118aef34ed742b6b37.patch";
+      hash = "sha256-imJfQ8JEhCcSkkO35N7Z3NtGElCyVxENPMDMWfNqdW0=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
-  meta = with lib; {
+  updateScript = nix-update-script { };
+
+  meta = {
     description = "Mesh compression library, designed for rendering and speed";
     homepage = "https://github.com/cnr-isti-vclab/corto";
-    license = licenses.mit;
-    maintainers = with maintainers; [ nim65s ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ nim65s ];
+    mainProgram = "corto";
   };
-}
+})

From 33f715cfc8a638d72de08c1a628ca1ca4578d47e Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Wed, 17 Sep 2025 11:00:26 +0200
Subject: [PATCH 3613/6226] vclab-nexus: init at 2025.05

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
---
 pkgs/by-name/li/lib3mf/package.nix      |  1 +
 pkgs/by-name/vc/vclab-nexus/package.nix | 72 +++++++++++++++++++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 pkgs/by-name/vc/vclab-nexus/package.nix

diff --git a/pkgs/by-name/li/lib3mf/package.nix b/pkgs/by-name/li/lib3mf/package.nix
index 78bd87350071..289fcaf48d75 100644
--- a/pkgs/by-name/li/lib3mf/package.nix
+++ b/pkgs/by-name/li/lib3mf/package.nix
@@ -100,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "CRYPTO_cleanup_all_ex_data();" ""
 
     # Fix CMake export
+    # ref https://github.com/3MFConsortium/lib3mf/pull/434
     substituteInPlace cmake/lib3mfConfig.cmake \
       --replace-fail "$""{LIB3MF_ROOT_DIR}/include" "$""{LIB3MF_ROOT_DIR}/include/lib3mf" \
       --replace-fail "$""{LIB3MF_ROOT_DIR}/lib" "$out/lib"
diff --git a/pkgs/by-name/vc/vclab-nexus/package.nix b/pkgs/by-name/vc/vclab-nexus/package.nix
new file mode 100644
index 000000000000..2bdfe17547b6
--- /dev/null
+++ b/pkgs/by-name/vc/vclab-nexus/package.nix
@@ -0,0 +1,72 @@
+{
+  lib,
+
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+
+  # nativeBuildInputs
+  cmake,
+  libsForQt5,
+
+  # buildInputs
+  corto,
+  glew,
+  llvmPackages,
+  vcg,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "nexus";
+  version = "2025.05";
+
+  src = fetchFromGitHub {
+    owner = "cnr-isti-vclab";
+    repo = "nexus";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-lC3nKQJwkixwGzPP/oS0J+WIFgYqky6NaXu9bX28+3I=";
+  };
+
+  outputs = [
+    "out"
+    "bin"
+  ];
+
+  patches = [
+    # CMake: install lib & exports
+    # ref. https://github.com/cnr-isti-vclab/nexus/pull/173
+    # merged upstream
+    (fetchpatch {
+      url = "https://github.com/cnr-isti-vclab/nexus/commit/141ba17059f3680a74ce1178ed4245412f76061f.patch";
+      hash = "sha256-iY84QIpliC1BIImI/6S6E6fQwMKPmmTiwouCXW6wLuM=";
+    })
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    libsForQt5.wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    corto
+    glew
+    libsForQt5.qtbase
+    vcg
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.openmp
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_NXS_VIEW" (!stdenv.hostPlatform.isDarwin))
+  ];
+
+  meta = {
+    description = "Library for creation and visualization of a batched multiresolution mesh";
+    homepage = "https://github.com/cnr-isti-vclab/nexus";
+    license = lib.licenses.gpl2;
+    maintainers = with lib.maintainers; [ nim65s ];
+    mainProgram = "nxsview";
+    platforms = lib.platforms.unix ++ lib.platforms.windows;
+  };
+})

From 4949e861d5b54fff49e37770a2a50499094a46ea Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 16 Sep 2025 12:03:57 +0200
Subject: [PATCH 3614/6226] meshlab: adopt

---
 pkgs/by-name/me/meshlab/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/me/meshlab/package.nix b/pkgs/by-name/me/meshlab/package.nix
index dedae59c8c34..d86aea7157db 100644
--- a/pkgs/by-name/me/meshlab/package.nix
+++ b/pkgs/by-name/me/meshlab/package.nix
@@ -163,7 +163,10 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "meshlab";
     homepage = "https://www.meshlab.net/";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ yzx9 ];
+    maintainers = with lib.maintainers; [
+      nim65s
+      yzx9
+    ];
     platforms = with lib.platforms; linux ++ darwin;
   };
 })

From 8f27f46238c8e68058132f6ef6ed1be0ad9e61d2 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 16 Sep 2025 12:10:18 +0200
Subject: [PATCH 3615/6226] meshlab: 2023.12 -> 2025.07 + use system
 dependencies

---
 ...-system-dependencies-install-exports.patch | 279 ++++++++++++++++++
 pkgs/by-name/me/meshlab/package.nix           |  71 ++---
 2 files changed, 309 insertions(+), 41 deletions(-)
 create mode 100644 pkgs/by-name/me/meshlab/1617_cmake-use-system-dependencies-install-exports.patch

diff --git a/pkgs/by-name/me/meshlab/1617_cmake-use-system-dependencies-install-exports.patch b/pkgs/by-name/me/meshlab/1617_cmake-use-system-dependencies-install-exports.patch
new file mode 100644
index 000000000000..83e6a21ea509
--- /dev/null
+++ b/pkgs/by-name/me/meshlab/1617_cmake-use-system-dependencies-install-exports.patch
@@ -0,0 +1,279 @@
+From 1a617220a286c23ecac1ad7bd6aca0d2c68bd1f3 Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <guilhem.saurel@laas.fr>
+Date: Fri, 19 Sep 2025 08:43:18 +0200
+Subject: [PATCH 1/6] CMake: allow system vcglib
+
+---
+ src/CMakeLists.txt | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 0398e8566..839a515be 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -75,7 +75,12 @@ endif()
+ ### Enter subdirectories
+ 
+ # VCGLib -- required
+-if (VCGDIR) # VCGDIR exists - using custom user vcglib path
++find_package(vcglib CONFIG)
++if(TARGET vcglib::vcglib)
++	message(STATUS "- VCGLib - using system provided library")
++	add_library(vcglib ALIAS vcglib::vcglib)
++	get_target_property(VCGDIR vcglib::vcglib INTERFACE_INCLUDE_DIRECTORIES)
++elseif (VCGDIR) # VCGDIR exists - using custom user vcglib path
+ 	if(EXISTS ${VCGDIR})
+ 		add_subdirectory(${VCGDIR} {CMAKE_CURRENT_BINARY_DIR}/vcglib)
+ 		message(STATUS "- VCGLib - using custom VCGDIR path library")
+
+From 73debae9b9ca14554c25fa58480969bc7c3f61d1 Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <guilhem.saurel@laas.fr>
+Date: Tue, 16 Sep 2025 12:44:12 +0200
+Subject: [PATCH 2/6] CMake: MESHLAB_ALLOW_SYSTEM_LEVMAR
+
+---
+ src/external/levmar.cmake | 19 ++++++++++++++++++-
+ 1 file changed, 18 insertions(+), 1 deletion(-)
+
+diff --git a/src/external/levmar.cmake b/src/external/levmar.cmake
+index cc639f09e..882b631db 100644
+--- a/src/external/levmar.cmake
++++ b/src/external/levmar.cmake
+@@ -3,8 +3,25 @@
+ # SPDX-License-Identifier: BSL-1.0
+ 
+ option(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LEVMAR "Allow download and use of levmar source" ON)
++option(MESHLAB_ALLOW_SYSTEM_LEVMAR "Allow use of system-provided levmar" ON)
+ 
+-if(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LEVMAR)
++find_path(levmar_INCLUDE_DIR NAMES levmar.h PATHS ${levmar_PREFIX})
++find_library(levmar_LIBRARY NAMES levmar PATHS ${levmar_PREFIX})
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(
++	levmar
++	DEFAULT_MSG
++	levmar_LIBRARY
++	levmar_INCLUDE_DIR
++)
++mark_as_advanced(levmar_INCLUDE_DIR levmar_LIBRARY)
++
++if(MESHLAB_ALLOW_SYSTEM_LEVMAR AND levmar_FOUND)
++	message(STATUS "- levmar - using system-provided library")
++	add_library(external-levmar INTERFACE)
++	target_link_libraries(external-levmar INTERFACE ${levmar_LIBRARY})
++	target_include_directories(external-levmar INTERFACE ${levmar_INCLUDE_DIR})
++elseif(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LEVMAR)
+ 	set(LEVMAR_VERSION "2.6.1")
+ 
+ 	set(LEVMAR_DIR "${MESHLAB_EXTERNAL_DOWNLOAD_DIR}/levmar-${LEVMAR_VERSION}")
+
+From 161d5dabad4cfdc3ec08d9e5dd2ee6c94b057c5c Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <guilhem.saurel@laas.fr>
+Date: Tue, 16 Sep 2025 15:15:11 +0200
+Subject: [PATCH 3/6] CMake: MESHLAB_ALLOW_SYSTEM_LIB3MF
+
+---
+ src/external/lib3mf.cmake | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/external/lib3mf.cmake b/src/external/lib3mf.cmake
+index 1cd1b5dfa..f64a63aa5 100644
+--- a/src/external/lib3mf.cmake
++++ b/src/external/lib3mf.cmake
+@@ -22,8 +22,15 @@
+ #############################################################################
+ 
+ option(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LIB3MF "Allow download and use of lib3MF source" ON)
++option(MESHLAB_ALLOW_SYSTEM_LIB3MF "Allow use of system-provided lib3MF" ON)
+ 
+-if(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LIB3MF)
++find_package(lib3mf)
++
++if(MESHLAB_ALLOW_SYSTEM_LIB3MF AND TARGET lib3mf::lib3mf)
++  message(STATUS "- Lib3MF - using system-provided library")
++  add_library(external-lib3mf INTERFACE)
++  target_link_libraries(external-lib3mf INTERFACE lib3mf::lib3mf)
++elseif(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LIB3MF)
+   set(LIB3MF_VERSION "2.4.1")
+ 
+   set(LIB3MF_DIR ${MESHLAB_EXTERNAL_DOWNLOAD_DIR}/lib3mf-${LIB3MF_VERSION})
+
+From c6662d486c1f8e5c9c89389abd630d8218b0fcb9 Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <guilhem.saurel@laas.fr>
+Date: Tue, 16 Sep 2025 15:42:59 +0200
+Subject: [PATCH 4/6] CMake: MESHLAB_ALLOW_SYSTEM_LIBIGL
+
+---
+ src/external/libigl.cmake | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/external/libigl.cmake b/src/external/libigl.cmake
+index 3666f375d..8f84fea4f 100644
+--- a/src/external/libigl.cmake
++++ b/src/external/libigl.cmake
+@@ -3,10 +3,17 @@
+ # SPDX-License-Identifier: BSL-1.0
+ 
+ option(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LIBIGL "Allow download and use of LibIGL source" ON)
++option(MESHLAB_ALLOW_SYSTEM_LIBIGL "Allow use of system-provided LibIGL" ON)
+ 
+ set(LIBIGL_VER 2.4.0)
+ 
+-if(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LIBIGL)
++find_path(libigl_INCLUDE_DIR NAMES igl_inline.h PATH_SUFFIXES igl PATHS ${libigl_PREFIX})
++
++if(MESHLAB_ALLOW_SYSTEM_LIBIGL AND libigl_INCLUDE_DIR)
++	message(STATUS "- LibIGL - using system-provided library")
++	add_library(external-libigl INTERFACE)
++	target_include_directories(external-libigl INTERFACE ${libigl_INCLUDE_DIR})
++elseif(MESHLAB_ALLOW_DOWNLOAD_SOURCE_LIBIGL)
+ 	set(LIBIGL_DIR "${MESHLAB_EXTERNAL_DOWNLOAD_DIR}/libigl-${LIBIGL_VER}")
+ 	set(LIBIGL_CHECK "${LIBIGL_DIR}/include/igl/igl_inline.h")
+ 
+
+From a26427e32af672d2554d662376f3f258c64941ca Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <guilhem.saurel@laas.fr>
+Date: Fri, 19 Sep 2025 08:58:16 +0200
+Subject: [PATCH 5/6] CMake: MESHLAB_ALLOW_SYSTEM_NEXUS
+
+---
+ src/external/nexus.cmake | 9 ++++++++-
+ 1 file changed, 8 insertions(+), 1 deletion(-)
+
+diff --git a/src/external/nexus.cmake b/src/external/nexus.cmake
+index 9fc92f714..1139d11e7 100644
+--- a/src/external/nexus.cmake
++++ b/src/external/nexus.cmake
+@@ -3,11 +3,18 @@
+ # SPDX-License-Identifier: BSL-1.0
+ 
+ option(MESHLAB_ALLOW_DOWNLOAD_SOURCE_NEXUS "Allow download and use of nexus source" ON)
++option(MESHLAB_ALLOW_SYSTEM_NEXUS "Allow use of system-provided nexus and corto" ON)
+ 
+ set(CORTO_VER 2025.07)
+ set(NEXUS_VER 2025.05)
+ 
+-if(MESHLAB_ALLOW_DOWNLOAD_SOURCE_NEXUS)
++find_package(nexus CONFIG)
++
++if(MESHLAB_ALLOW_SYSTEM_NEXUS AND TARGET nexus::nexus)
++	message(STATUS "- nexus - using system-provided library")
++	add_library(external-nexus INTERFACE)
++	target_link_libraries(external-nexus INTERFACE nexus::nexus)
++elseif(MESHLAB_ALLOW_DOWNLOAD_SOURCE_NEXUS)
+ 	set(NEXUS_DIR "${MESHLAB_EXTERNAL_DOWNLOAD_DIR}/nexus-${NEXUS_VER}")
+ 	set(NEXUS_CHECK "${NEXUS_DIR}/CMakeLists.txt")
+ 	set(CORTO_DIR "${NEXUS_DIR}/src/corto")
+
+From 32be737316181bd84d8beac7cb6b74379965d2fe Mon Sep 17 00:00:00 2001
+From: Guilhem Saurel <guilhem.saurel@laas.fr>
+Date: Fri, 19 Sep 2025 11:26:36 +0200
+Subject: [PATCH 6/6] CMake: install exports
+
+---
+ src/CMakeLists.txt                        | 21 +++++++++++++++++++++
+ src/Config.cmake.in                       |  9 +++++++++
+ src/common/CMakeLists.txt                 | 18 ++++++++++++++----
+ src/meshlabplugins/io_base/CMakeLists.txt |  2 +-
+ 4 files changed, 45 insertions(+), 5 deletions(-)
+ create mode 100644 src/Config.cmake.in
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 839a515be..c490ea960 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -229,6 +229,27 @@ endforeach()
+ set(COPIED_FILES)
+ 
+ if (NOT MESHLAB_BUILD_ONLY_LIBRARIES)
++	# headers
++	install(DIRECTORY common DESTINATION include FILES_MATCHING PATTERN "*.h")
++	# CMake exports
++	install(EXPORT meshlabTargets
++		DESTINATION lib/cmake/meshlab
++		NAMESPACE meshlab::
++		FILE meshlabTargets.cmake
++	)
++	include(CMakePackageConfigHelpers)
++	# generate the config file that includes the exports
++	configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/Config.cmake.in
++		"${CMAKE_CURRENT_BINARY_DIR}/meshlabConfig.cmake"
++		INSTALL_DESTINATION lib/cmake/vcglib
++		NO_SET_AND_CHECK_MACRO
++		NO_CHECK_REQUIRED_COMPONENTS_MACRO
++	)
++	install(FILES
++		"${CMAKE_CURRENT_BINARY_DIR}/meshlabConfig.cmake"
++		DESTINATION lib/cmake/meshlab
++	)
++
+ 	# shaders
+ 	set(SHADER_BASE_DIR "${MESHLAB_RESOURCES_DIR}/shaders")
+ 	file(
+diff --git a/src/Config.cmake.in b/src/Config.cmake.in
+new file mode 100644
+index 000000000..63ba0ce97
+--- /dev/null
++++ b/src/Config.cmake.in
+@@ -0,0 +1,9 @@
++@PACKAGE_INIT@
++
++include(CMakeFindDependencyMacro)
++find_dependency(GLEW)
++find_dependency(OpenGL)
++find_dependency(Qt5 COMPONENTS OpenGL Xml Network)
++find_dependency(vcglib)
++
++include ( "${CMAKE_CURRENT_LIST_DIR}/meshlabTargets.cmake" )
+diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt
+index 0e640fdd4..c74bd579b 100644
+--- a/src/common/CMakeLists.txt
++++ b/src/common/CMakeLists.txt
+@@ -198,7 +198,8 @@ endif()
+ 
+ target_include_directories(meshlab-common
+ 	PUBLIC
+-		${CMAKE_CURRENT_SOURCE_DIR}/..)
++		$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/..>
++		$<INSTALL_INTERFACE:include>)
+ 
+ target_link_libraries(
+ 	meshlab-common
+@@ -208,10 +209,19 @@ target_link_libraries(
+ 		Qt5::Widgets
+ 		Qt5::Xml
+ 		Qt5::Network
+-		vcglib
+-		external-glew
++	PRIVATE
+ 		external-easyexif
+ )
++if(TARGET vcglib::vcglib)
++	target_link_libraries(meshlab-common PUBLIC vcglib::vcglib)
++else()
++	target_link_libraries(meshlab-common PUBLIC vcglib)
++endif()
++if(TARGET GLEW::GLEW)
++	target_link_libraries(meshlab-common PUBLIC GLEW::GLEW)
++else()
++	target_link_libraries(meshlab-common PUBLIC external-glew)
++endif()
+ 
+ set_property(TARGET meshlab-common PROPERTY FOLDER Core)
+ 
+@@ -234,4 +244,4 @@ endif()
+ set_target_properties(meshlab-common PROPERTIES
+ 	INSTALL_RPATH "$ORIGIN")
+ 
+-install(TARGETS meshlab-common DESTINATION ${MESHLAB_LIB_INSTALL_DIR})
++install(TARGETS meshlab-common EXPORT meshlabTargets DESTINATION ${MESHLAB_LIB_INSTALL_DIR})
+diff --git a/src/meshlabplugins/io_base/CMakeLists.txt b/src/meshlabplugins/io_base/CMakeLists.txt
+index 7a3137e63..64504d56d 100644
+--- a/src/meshlabplugins/io_base/CMakeLists.txt
++++ b/src/meshlabplugins/io_base/CMakeLists.txt
+@@ -27,4 +27,4 @@ set(SOURCES
+ 
+ add_meshlab_plugin(io_base ${SOURCES} ${HEADERS})
+ 
+-target_link_libraries(io_base PRIVATE OpenGL::GLU)
++target_link_libraries(io_base PRIVATE OpenGL::GLU external-easyexif)
diff --git a/pkgs/by-name/me/meshlab/package.nix b/pkgs/by-name/me/meshlab/package.nix
index d86aea7157db..5cc3917cd741 100644
--- a/pkgs/by-name/me/meshlab/package.nix
+++ b/pkgs/by-name/me/meshlab/package.nix
@@ -6,6 +6,7 @@
   libsForQt5,
   libGLU,
   lib3ds,
+  lib3mf,
   bzip2,
   muparser,
   eigen,
@@ -25,16 +26,10 @@
   corto,
   openctm,
   structuresynth,
+  vclab-nexus,
 }:
 
 let
-  tinygltf-src = fetchFromGitHub {
-    owner = "syoyo";
-    repo = "tinygltf";
-    tag = "v2.6.3";
-    hash = "sha256-IyezvHzgLRyc3z8HdNsQMqDEhP+Ytw0stFNak3C8lTo=";
-  };
-
   downloads = [
     "DLL_EMBREE"
     "SOURCE_BOOST"
@@ -57,19 +52,18 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "meshlab";
-  version = "2023.12";
+  version = "2025.07";
 
   src = fetchFromGitHub {
     owner = "cnr-isti-vclab";
     repo = "meshlab";
     tag = "MeshLab-${finalAttrs.version}";
-    hash = "sha256-AdUAWS741RQclYaSE3Tz1/I0YSinNAnfSaqef+Tib8Y=";
+    hash = "sha256-6BozYzPCbBZ+btL4FCdzKlwKqTsvFWDfOXizzJSYo9s=";
   };
 
   nativeBuildInputs = [
     cmake
     libsForQt5.wrapQtAppsHook
-    vcg # templated library
   ];
 
   buildInputs = [
@@ -78,6 +72,7 @@ stdenv.mkDerivation (finalAttrs: {
     libsForQt5.qtscript
     libsForQt5.qtxmlpatterns
     lib3ds
+    lib3mf
     bzip2
     muparser
     eigen
@@ -91,46 +86,37 @@ stdenv.mkDerivation (finalAttrs: {
     xercesc
     onetbb
     embree
+    vcg
     libigl
     corto
     openctm
     structuresynth
+    vclab-nexus
   ]
   ++ lib.optionals stdenv.cc.isClang [
     llvmPackages.openmp
   ];
 
-  postPatch = ''
-    substituteInPlace src/external/tinygltf.cmake \
-      --replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/tinygltf-2.6.3 ${tinygltf-src}
-    substituteInPlace src/external/libigl.cmake \
-      --replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/libigl-2.4.0 ${libigl}
-    substituteInPlace src/external/nexus.cmake \
-      --replace-fail '$'{NEXUS_DIR}/src/corto ${corto.src}
-    substituteInPlace src/external/levmar.cmake \
-      --replace-fail '$'{LEVMAR_LINK} ${levmar.src} \
-      --replace-warn "MD5 ''${LEVMAR_MD5}" ""
-    substituteInPlace src/external/ssynth.cmake \
-      --replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \
-      --replace-warn "MD5 ''${SSYNTH_MD5}" ""
-    substituteInPlace src/common_gui/CMakeLists.txt \
-      --replace-warn "MESHLAB_LIB_INSTALL_DIR" "CMAKE_INSTALL_LIBDIR"
-  ''
-  + lib.optionalString stdenv.hostPlatform.isLinux ''
-    substituteAll ${./meshlab.desktop} resources/linux/meshlab.desktop
-  ''
-  + lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace src/meshlab/CMakeLists.txt \
-      --replace-fail "set_additional_settings_info_plist(" "# set_additional_settings_info_plist(" \
-      --replace-fail "	TARGET meshlab" "#	TARGET meshlab" \
-      --replace-fail "	FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)" \
-                     "#	FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)"
-  '';
+  patches = [
+    # CMake: use system dependencies, install exports
+    # ref. https://github.com/cnr-isti-vclab/meshlab/pull/1617
+    # merged upstream
+    ./1617_cmake-use-system-dependencies-install-exports.patch
+  ];
 
-  cmakeFlags = [
-    "-DVCGDIR=${vcg.src}"
-  ]
-  ++ cmakeFlagsDisallowDownload;
+  postPatch =
+    lib.optionalString stdenv.hostPlatform.isLinux ''
+      substituteAll ${./meshlab.desktop} resources/linux/meshlab.desktop
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      substituteInPlace src/meshlab/CMakeLists.txt \
+        --replace-fail "set_additional_settings_info_plist(" "# set_additional_settings_info_plist(" \
+        --replace-fail "	TARGET meshlab" "#	TARGET meshlab" \
+        --replace-fail "	FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)" \
+                       "#	FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)"
+    '';
+
+  cmakeFlags = cmakeFlagsDisallowDownload;
 
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/{Applications,bin,lib}
@@ -150,7 +136,10 @@ stdenv.mkDerivation (finalAttrs: {
 
   postFixup =
     lib.optionalString stdenv.hostPlatform.isLinux ''
-      patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped
+      patchelf \
+        --add-needed $out/lib/meshlab/libmeshlab-common.so \
+        --add-needed $out/lib/meshlab/libmeshlab-common-gui.so \
+        $out/bin/.meshlab-wrapped
     ''
     + lib.optionalString stdenv.hostPlatform.isDarwin ''
       wrapQtApp "$out/Applications/meshlab.app/Contents/MacOS/meshlab"

From cb2baca778ca1531da3bdf0cb93b001c5c4dec67 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Sun, 21 Sep 2025 23:35:44 +0200
Subject: [PATCH 3616/6226] meshlab: darwin updates

- fix CMake exports
- add missing library
- update to llvm 19

Co-authored-by: Zexin Yuan <gh@yzx9.xyz>
---
 pkgs/by-name/me/meshlab/package.nix | 5 ++++-
 pkgs/top-level/all-packages.nix     | 1 -
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/me/meshlab/package.nix b/pkgs/by-name/me/meshlab/package.nix
index 5cc3917cd741..0be074cf79e1 100644
--- a/pkgs/by-name/me/meshlab/package.nix
+++ b/pkgs/by-name/me/meshlab/package.nix
@@ -121,8 +121,11 @@ stdenv.mkDerivation (finalAttrs: {
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir -p $out/{Applications,bin,lib}
     mv $out/meshlab.app $out/Applications/
-    ln $out/Applications/meshlab.app/Contents/Frameworks/libmeshlab-common.dylib $out/lib/
+    ln $out/Applications/meshlab.app/Contents/Frameworks/libmeshlab-common{,-gui}.dylib $out/lib/
     makeWrapper $out/{Applications/meshlab.app/Contents/MacOS,bin}/meshlab
+    substituteInPlace $out/lib/cmake/meshlab/meshlabTargets-release.cmake --replace-fail \
+      "{_IMPORT_PREFIX}/meshlab.app" \
+      "{_IMPORT_PREFIX}/Applications/meshlab.app"
   '';
 
   # The hook will wrap all the plugin binaries, make they are not a
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bd88d03adfb..dba71cd83e1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11741,7 +11741,6 @@ with pkgs;
 
   meshlab = callPackage ../by-name/me/meshlab/package.nix {
     stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv;
-    llvmPackages = llvmPackages_18;
   };
 
   meshlab-unstable = callPackage ../by-name/me/meshlab-unstable/package.nix {

From 9802d5895f2a478ed910338ae961b2fa9ee797f3 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Sun, 21 Sep 2025 17:10:16 +0200
Subject: [PATCH 3617/6226] meshlab-unstable: drop

---
 .../me/meshlab-unstable/meshlab.desktop       |  14 --
 pkgs/by-name/me/meshlab-unstable/package.nix  | 159 ------------------
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   5 -
 4 files changed, 1 insertion(+), 178 deletions(-)
 delete mode 100644 pkgs/by-name/me/meshlab-unstable/meshlab.desktop
 delete mode 100644 pkgs/by-name/me/meshlab-unstable/package.nix

diff --git a/pkgs/by-name/me/meshlab-unstable/meshlab.desktop b/pkgs/by-name/me/meshlab-unstable/meshlab.desktop
deleted file mode 100644
index aa8de186440d..000000000000
--- a/pkgs/by-name/me/meshlab-unstable/meshlab.desktop
+++ /dev/null
@@ -1,14 +0,0 @@
-[Desktop Entry]
-Name=MeshLab
-Version=@version@
-Name[en_GB]=MeshLab
-GenericName=Mesh processing
-GenericName[en_GB]=Mesh processing
-Comment=View and process meshes
-Type=Application
-Exec=@out@/bin/meshlab %U
-TryExec=@out@/bin/meshlab
-Icon=@out@/share/icons/hicolor/meshlab.png
-Terminal=false
-MimeType=model/mesh;application/x-3ds;image/x-3ds;model/x-ply;application/sla;model/x-quad-object;model/x-geomview-off;application/x-cyclone-ptx;application/x-vmi;application/x-bre;model/vnd.collada+xml;model/openctm;application/x-expe-binary;application/x-expe-ascii;application/x-xyz;application/x-gts;chemical/x-pdb;application/x-tri;application/x-asc;model/x3d+xml;model/x3d+vrml;model/vrml;model/u3d;model/idtf;
-Categories=Graphics;3DGraphics;Viewer;Qt;
diff --git a/pkgs/by-name/me/meshlab-unstable/package.nix b/pkgs/by-name/me/meshlab-unstable/package.nix
deleted file mode 100644
index 00468e6a0801..000000000000
--- a/pkgs/by-name/me/meshlab-unstable/package.nix
+++ /dev/null
@@ -1,159 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  llvmPackages,
-  libsForQt5,
-  libGLU,
-  lib3ds,
-  bzip2,
-  muparser,
-  eigen,
-  glew,
-  gmp,
-  levmar,
-  qhull,
-  cmake,
-  cgal,
-  boost,
-  mpfr,
-  xercesc,
-  onetbb,
-  embree,
-  libigl,
-  corto,
-  openctm,
-  structuresynth,
-}:
-
-let
-  tinygltf-src = fetchFromGitHub {
-    owner = "syoyo";
-    repo = "tinygltf";
-    tag = "v2.6.3";
-    hash = "sha256-IyezvHzgLRyc3z8HdNsQMqDEhP+Ytw0stFNak3C8lTo=";
-  };
-
-  # requires submodules to build
-  lib3mf-src = fetchFromGitHub {
-    owner = "3MFConsortium";
-    repo = "lib3mf";
-    tag = "v2.3.2";
-    fetchSubmodules = true;
-    hash = "sha256-pKjnN9H6/A2zPvzpFed65J+mnNwG/dkSE2/pW7IlN58=";
-  };
-in
-stdenv.mkDerivation {
-  pname = "meshlab-unstable";
-  version = "2023.12-unstable-2025-02-21";
-
-  src = fetchFromGitHub {
-    owner = "cnr-isti-vclab";
-    repo = "meshlab";
-    # note that this is in branch devel
-    rev = "72142583980b6dbfc5b85c6cca226a72f48497a9";
-    hash = "sha256-ev6b8sgJsjvD8KMBbC6kbrVvTxTxpqsXu/sK1Ih6+OA=";
-    # needed for an updated version of vcg in their submodule
-    fetchSubmodules = true;
-  };
-
-  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    substituteInPlace src/meshlab/CMakeLists.txt \
-      --replace-fail "set_additional_settings_info_plist(" "# set_additional_settings_info_plist(" \
-      --replace-fail "	TARGET meshlab" "#	TARGET meshlab" \
-      --replace-fail "	FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)" \
-                     "#	FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)"
-  '';
-
-  buildInputs = [
-    libGLU
-    libsForQt5.qtbase
-    libsForQt5.qtscript
-    libsForQt5.qtxmlpatterns
-    lib3ds
-    bzip2
-    muparser
-    eigen
-    glew
-    gmp
-    levmar
-    qhull
-    cgal
-    boost
-    mpfr
-    xercesc
-    onetbb
-    embree
-    libigl
-    corto
-    openctm
-    structuresynth
-  ]
-  ++ lib.optionals stdenv.cc.isClang [
-    llvmPackages.openmp
-  ];
-
-  nativeBuildInputs = [
-    cmake
-    libsForQt5.wrapQtAppsHook
-  ];
-
-  preConfigure = ''
-    mkdir src/external/downloads
-    cp -r --no-preserve=mode,ownership ${lib3mf-src} src/external/downloads/lib3mf-2.3.2
-
-    substituteAll ${./meshlab.desktop} resources/linux/meshlab.desktop
-    substituteInPlace src/external/tinygltf.cmake \
-      --replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/tinygltf-2.6.3 ${tinygltf-src}
-    substituteInPlace src/external/libigl.cmake \
-      --replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/libigl-'$'{LIBIGL_VER} ${libigl}
-    substituteInPlace src/external/nexus.cmake \
-      --replace-fail '$'{NEXUS_DIR}/src/corto ${corto.src}
-    substituteInPlace src/external/levmar.cmake \
-      --replace-fail '$'{LEVMAR_LINK} ${levmar.src} \
-      --replace-warn "MD5 ''${LEVMAR_MD5}" ""
-    substituteInPlace src/external/ssynth.cmake \
-      --replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \
-      --replace-warn "MD5 ''${SSYNTH_MD5}" ""
-    substituteInPlace src/common_gui/CMakeLists.txt \
-      --replace-warn "MESHLAB_LIB_INSTALL_DIR" "CMAKE_INSTALL_LIBDIR"
-  '';
-
-  postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    mkdir -p $out/{Applications,bin,lib}
-    mv $out/meshlab.app $out/Applications/
-    ln $out/Applications/meshlab.app/Contents/Frameworks/* $out/lib/
-    makeWrapper $out/{Applications/meshlab.app/Contents/MacOS,bin}/meshlab
-  '';
-
-  postFixup =
-    lib.optionalString stdenv.hostPlatform.isLinux ''
-      patchelf --add-needed $out/lib/meshlab/libmeshlab-common.so $out/bin/.meshlab-wrapped
-      patchelf --add-needed $out/lib/meshlab/lib3mf.so $out/lib/meshlab/plugins/libio_3mf.so
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      wrapQtApp "$out/Applications/meshlab.app/Contents/MacOS/meshlab"
-      install_name_tool -change libopenctm.dylib "${lib.getOutput "out" openctm}/lib/libopenctm.dylib" \
-        "$out/Applications/meshlab.app/Contents/PlugIns/libio_ctm.so"
-    '';
-
-  # The hook will wrap all the plugin binaries, make they are not a
-  # valid plugin. So we have to wrap the main app manually.
-  # See: https://github.com/NixOS/nixpkgs/pull/396295#issuecomment-3137779781
-  dontWrapQtApps = stdenv.hostPlatform.isDarwin;
-
-  # display a black screen on wayland, so force XWayland for now.
-  # Might be fixed when upstream will be ready for Qt6.
-  qtWrapperArgs = lib.optionals stdenv.hostPlatform.isLinux [
-    "--set QT_QPA_PLATFORM xcb"
-  ];
-
-  meta = {
-    description = "System for processing and editing 3D triangular meshes (unstable)";
-    mainProgram = "meshlab";
-    homepage = "https://www.meshlab.net/";
-    license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ pca006132 ];
-    platforms = with lib.platforms; linux ++ darwin;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a2fe24a88240..df6f2d939979 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -979,6 +979,7 @@ mapAliases {
   mediastreamer-openh264 = throw "'mediastreamer-openh264' has been moved to 'linphonePackages.msopenh264'"; # Added 2025-09-20
   meilisearch_1_11 = throw "'meilisearch_1_11' has been removed, as it is no longer supported"; # Added 2025-10-03
   melmatcheq.lv2 = melmatcheq-lv2; # Added 2025-09-27
+  meshlab-unstable = throw "meshlab-unstable has been removed, as it was behind meshlab"; # Added 2025-09-21
   meteo = throw "'meteo' has been removed as it was unmaintained and depends on deprecated webkitgtk_4_0"; # Added 2025-10-09
   microcodeAmd = throw "'microcodeAmd' has been renamed to/replaced by 'microcode-amd'"; # Converted to throw 2025-10-27
   microcodeIntel = throw "'microcodeIntel' has been renamed to/replaced by 'microcode-intel'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dba71cd83e1c..f8714c6ef2d2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11743,11 +11743,6 @@ with pkgs;
     stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv;
   };
 
-  meshlab-unstable = callPackage ../by-name/me/meshlab-unstable/package.nix {
-    stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv;
-    llvmPackages = llvmPackages_18;
-  };
-
   meshcentral = callPackage ../tools/admin/meshcentral { };
 
   michabo = libsForQt5.callPackage ../applications/misc/michabo { };

From ae49f7f97644086813753e46a4a8ee51cc1d8425 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Thu, 25 Sep 2025 08:52:10 +0200
Subject: [PATCH 3618/6226] meshlab: remove from all-packages, use by-name

---
 pkgs/top-level/all-packages.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8714c6ef2d2..e163d061a653 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11739,10 +11739,6 @@ with pkgs;
 
   mercurialFull = mercurial.override { fullBuild = true; };
 
-  meshlab = callPackage ../by-name/me/meshlab/package.nix {
-    stdenv = if stdenv.hostPlatform.isDarwin then llvmPackages_18.stdenv else stdenv;
-  };
-
   meshcentral = callPackage ../tools/admin/meshcentral { };
 
   michabo = libsForQt5.callPackage ../applications/misc/michabo { };

From 1376ce754f6f2bafa9f2e7d177c6972ebbc31bcc Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Sun, 5 Oct 2025 23:09:22 +0200
Subject: [PATCH 3619/6226] meshlab: darwin plist: substitute -> patch

Co-authored-by: Sandro <7258858+SuperSandro2000@users.noreply.github.com>
---
 pkgs/by-name/me/meshlab/no-plist.patch | 12 ++++++++++++
 pkgs/by-name/me/meshlab/package.nix    | 17 ++++++-----------
 2 files changed, 18 insertions(+), 11 deletions(-)
 create mode 100644 pkgs/by-name/me/meshlab/no-plist.patch

diff --git a/pkgs/by-name/me/meshlab/no-plist.patch b/pkgs/by-name/me/meshlab/no-plist.patch
new file mode 100644
index 000000000000..7c8d753190a8
--- /dev/null
+++ b/pkgs/by-name/me/meshlab/no-plist.patch
@@ -0,0 +1,12 @@
+--- src/meshlab/CMakeLists.txt.orig	2025-10-05 23:04:12.786192073 +0200
++++ src/meshlab/CMakeLists.txt	2025-10-05 23:04:16.379256637 +0200
+@@ -92,9 +92,6 @@
+ 		MACOSX_BUNDLE_COPYRIGHT "Copyright VCG-ISTI-CNR © 2005-2021. All rights reserved."
+ 		)
+ 	
+-	set_additional_settings_info_plist(
+-		TARGET meshlab
+-		FILE ${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)
+ endif()
+ 
+ install(
diff --git a/pkgs/by-name/me/meshlab/package.nix b/pkgs/by-name/me/meshlab/package.nix
index 0be074cf79e1..9e431b24d75d 100644
--- a/pkgs/by-name/me/meshlab/package.nix
+++ b/pkgs/by-name/me/meshlab/package.nix
@@ -102,19 +102,14 @@ stdenv.mkDerivation (finalAttrs: {
     # ref. https://github.com/cnr-isti-vclab/meshlab/pull/1617
     # merged upstream
     ./1617_cmake-use-system-dependencies-install-exports.patch
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    ./no-plist.patch
   ];
 
-  postPatch =
-    lib.optionalString stdenv.hostPlatform.isLinux ''
-      substituteAll ${./meshlab.desktop} resources/linux/meshlab.desktop
-    ''
-    + lib.optionalString stdenv.hostPlatform.isDarwin ''
-      substituteInPlace src/meshlab/CMakeLists.txt \
-        --replace-fail "set_additional_settings_info_plist(" "# set_additional_settings_info_plist(" \
-        --replace-fail "	TARGET meshlab" "#	TARGET meshlab" \
-        --replace-fail "	FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)" \
-                       "#	FILE \''${MESHLAB_BUILD_DISTRIB_DIR}/meshlab.app/Contents/Info.plist)"
-    '';
+  postPatch = lib.optionalString stdenv.hostPlatform.isLinux ''
+    substituteAll ${./meshlab.desktop} resources/linux/meshlab.desktop
+  '';
 
   cmakeFlags = cmakeFlagsDisallowDownload;
 

From 3994ebf8cc61f32ae9236d75829875e19bfab5c9 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 19 Sep 2025 12:14:46 +0200
Subject: [PATCH 3620/6226] python3Packages.pymeshlab: 2023.12 -> 2025.7 + use
 system dependencies

---
 .../graphics/pymeshlab/default.nix            | 117 ++++++++----------
 1 file changed, 49 insertions(+), 68 deletions(-)

diff --git a/pkgs/applications/graphics/pymeshlab/default.nix b/pkgs/applications/graphics/pymeshlab/default.nix
index b6d37dfc5649..60c7132365ee 100644
--- a/pkgs/applications/graphics/pymeshlab/default.nix
+++ b/pkgs/applications/graphics/pymeshlab/default.nix
@@ -1,106 +1,87 @@
 {
-  stdenv,
   lib,
+
+  stdenv,
   fetchFromGitHub,
-  libGLU,
-  qtbase,
-  qtscript,
-  qtxmlpatterns,
-  lib3ds,
-  bzip2,
-  muparser,
-  eigen,
-  glew,
-  gmp,
-  levmar,
-  qhull,
+  fetchpatch,
+
+  # nativeBuildInputs
   cmake,
-  cgal,
-  boost,
-  mpfr,
-  xercesc,
-  onetbb,
-  embree,
-  vcg,
-  libigl,
-  corto,
-  openctm,
-  structuresynth,
-  wrapQtAppsHook,
   python3Packages,
+
+  # propagatedBuildInputs
+  meshlab,
+
+  # buildInputs
+  libsForQt5,
+  glew,
+  vcg,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pymeshlab";
-  version = "2023.12";
+  version = "2025.7";
 
   src = fetchFromGitHub {
     owner = "cnr-isti-vclab";
     repo = "pymeshlab";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-IOlRdXoUPOJt67g3HqsLchV5aL+JUEks2y1Sy+wpwsg=";
-    fetchSubmodules = true;
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-LCR2/AyX9uVX4xhZareUL6YlpUsCFiGDMBB5nFp+H6k=";
   };
 
-  buildInputs = [
-    libGLU
-    qtbase
-    qtscript
-    qtxmlpatterns
-    lib3ds
-    bzip2
-    muparser
-    eigen
-    glew
-    gmp
-    levmar
-    qhull
-    cgal
-    boost
-    mpfr
-    xercesc
-    onetbb
-    embree
-    vcg
-    libigl
-    corto
-    structuresynth
-    openctm
+  patches = [
+    # CMake: allow use of system-provided meshlab & pybind11
+    # ref. https://github.com/cnr-isti-vclab/PyMeshLab/pull/445
+    # merged upstream
+    (fetchpatch {
+      url = "https://github.com/cnr-isti-vclab/PyMeshLab/commit/b363caae4362746b3f9e9326fe7b72a2ec7824d9.patch";
+      hash = "sha256-euKfOx/T0qdeMx79dpEalzmdWsr4nbDFJfKdksvULBw=";
+    })
   ];
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
     python3Packages.pybind11
   ];
 
   propagatedBuildInputs = [
+    meshlab
     python3Packages.numpy
+    python3Packages.pythonImportsCheckHook
   ];
 
-  preConfigure = ''
-    substituteInPlace src/meshlab/src/external/libigl.cmake \
-      --replace-fail '$'{MESHLAB_EXTERNAL_DOWNLOAD_DIR}/libigl-2.4.0 ${libigl}
-    substituteInPlace src/meshlab/src/external/nexus.cmake \
-      --replace-fail '$'{NEXUS_DIR}/src/corto ${corto.src}
-    substituteInPlace src/meshlab/src/external/levmar.cmake \
-      --replace-fail '$'{LEVMAR_LINK} ${levmar.src} \
-      --replace-warn "MD5 ''${LEVMAR_MD5}" ""
-    substituteInPlace src/meshlab/src/external/ssynth.cmake \
-      --replace-fail '$'{SSYNTH_LINK} ${structuresynth.src} \
-      --replace-warn "MD5 ''${SSYNTH_MD5}" ""
-  '';
+  buildInputs = [
+    glew
+    libsForQt5.qtbase
+    vcg
+  ];
+
+  dontWrapQtApps = true;
 
   cmakeFlags = [
     "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/${python3Packages.python.sitePackages}/pymeshlab"
-    "-DVCGDIR=${vcg.src}"
   ];
 
+  # Get io & filter plugins from meshlab, to avoild render, decorate & edit ones
+  postInstall = ''
+    install -D -t $out/${python3Packages.python.sitePackages}/pymeshlab/lib/plugins \
+      ${meshlab}/lib/meshlab/plugins/libio_* \
+      ${meshlab}/lib/meshlab/plugins/libfilter_*
+  '';
+
+  postFixup = ''
+    patchelf \
+      --add-needed ${meshlab}/lib/meshlab/libmeshlab-common.so \
+      $out/${python3Packages.python.sitePackages}/pymeshlab/pmeshlab.*.so
+  '';
+
+  pythonImportsCheck = [ "pymeshlab" ];
+
   meta = {
     description = "Open source mesh processing python library";
     homepage = "https://github.com/cnr-isti-vclab/PyMeshLab";
     license = lib.licenses.gpl3Only;
     maintainers = with lib.maintainers; [ nim65s ];
-    platforms = with lib.platforms; linux;
+    platforms = with lib.platforms; linux ++ darwin;
   };
 })

From 034b8dd615162d9e5e46b7a470e62f35535f6a85 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Sun, 21 Sep 2025 23:27:12 +0200
Subject: [PATCH 3621/6226] python3Packages.pymeshlab: fix on darwin

---
 .../graphics/pymeshlab/default.nix            | 25 ++++++++++++++-----
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/graphics/pymeshlab/default.nix b/pkgs/applications/graphics/pymeshlab/default.nix
index 60c7132365ee..b6e0619e1c23 100644
--- a/pkgs/applications/graphics/pymeshlab/default.nix
+++ b/pkgs/applications/graphics/pymeshlab/default.nix
@@ -14,6 +14,7 @@
 
   # buildInputs
   libsForQt5,
+  llvmPackages,
   glew,
   vcg,
 }:
@@ -54,6 +55,9 @@ stdenv.mkDerivation (finalAttrs: {
     glew
     libsForQt5.qtbase
     vcg
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.openmp
   ];
 
   dontWrapQtApps = true;
@@ -63,13 +67,22 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   # Get io & filter plugins from meshlab, to avoild render, decorate & edit ones
-  postInstall = ''
-    install -D -t $out/${python3Packages.python.sitePackages}/pymeshlab/lib/plugins \
-      ${meshlab}/lib/meshlab/plugins/libio_* \
-      ${meshlab}/lib/meshlab/plugins/libfilter_*
-  '';
+  postInstall =
+    let
+      plugins =
+        if stdenv.hostPlatform.isDarwin then
+          "Applications/meshlab.app/Contents/PlugIns"
+        else
+          "lib/meshlab/plugins";
+      pyPlugins = if stdenv.hostPlatform.isDarwin then "PlugIns" else "lib/plugins";
+    in
+    ''
+      install -D -t $out/${python3Packages.python.sitePackages}/pymeshlab/${pyPlugins} \
+        ${meshlab}/${plugins}/libio_* \
+        ${meshlab}/${plugins}/libfilter_*
+    '';
 
-  postFixup = ''
+  postFixup = lib.optionalString stdenv.hostPlatform.isLinux ''
     patchelf \
       --add-needed ${meshlab}/lib/meshlab/libmeshlab-common.so \
       $out/${python3Packages.python.sitePackages}/pymeshlab/pmeshlab.*.so

From 163222ab2bf72c334128f29cfd7b2096799ffc8c Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Sun, 5 Oct 2025 23:10:44 +0200
Subject: [PATCH 3622/6226] python3Packages.pymeshlab: dont propagate hook

Co-authored-by: Sandro <7258858+SuperSandro2000@users.noreply.github.com>
---
 pkgs/applications/graphics/pymeshlab/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/pymeshlab/default.nix b/pkgs/applications/graphics/pymeshlab/default.nix
index b6e0619e1c23..ec6edb230aff 100644
--- a/pkgs/applications/graphics/pymeshlab/default.nix
+++ b/pkgs/applications/graphics/pymeshlab/default.nix
@@ -45,10 +45,13 @@ stdenv.mkDerivation (finalAttrs: {
     python3Packages.pybind11
   ];
 
+  nativeCheckInputs = [
+    python3Packages.pythonImportsCheckHook
+  ];
+
   propagatedBuildInputs = [
     meshlab
     python3Packages.numpy
-    python3Packages.pythonImportsCheckHook
   ];
 
   buildInputs = [

From e8ea109858ee69b84e994624db7796b72d028ad4 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 6 Oct 2025 01:34:14 +0200
Subject: [PATCH 3623/6226] openscad: fix on darwin

---
 pkgs/by-name/op/openscad/package.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/by-name/op/openscad/package.nix b/pkgs/by-name/op/openscad/package.nix
index a4256d035061..e914d3043f83 100644
--- a/pkgs/by-name/op/openscad/package.nix
+++ b/pkgs/by-name/op/openscad/package.nix
@@ -84,6 +84,15 @@ stdenv.mkDerivation rec {
         sed -i 's/& / \&/g;s/\*\*/\0 /g;s/^\(.\)  /\1\t/' "$out"
       '';
     })
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # ref. https://github.com/openscad/openscad/pull/4013 merged upstream
+    (fetchpatch {
+      name = "mem_fun-to-mem_fn.patch";
+      url = "https://github.com/openscad/openscad/commit/c9a1abbedfbf6dda9a23d3ad5844d11e5278a928.patch";
+      hash = "sha256-Man9ledRREb7U+2UOQ0VkpiwbYQjyVOY21YaRFObZc8=";
+    })
+
   ];
 
   postPatch = ''
@@ -92,6 +101,11 @@ stdenv.mkDerivation rec {
 
     substituteInPlace src/openscad.cc \
       --replace-fail 'boost::join' 'boost::algorithm::join'
+  ''
+  # ref. https://github.com/openscad/openscad/pull/4253 merged upstream but does not apply
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace src/FreetypeRenderer.h \
+      --replace-fail ": public std::unary_function<const GlyphData *, void>" ""
   '';
 
   nativeBuildInputs = [

From 974b7b39d7c2160c5ec33df951d9e6be4ad2fcd7 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Tue, 14 Oct 2025 11:39:26 +0200
Subject: [PATCH 3624/6226] tinygltf: unvendor json & stb

Co-authored-by: jopejoe1 <34899572+jopejoe1@users.noreply.github.com>
---
 pkgs/by-name/ti/tinygltf/package.nix | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pkgs/by-name/ti/tinygltf/package.nix b/pkgs/by-name/ti/tinygltf/package.nix
index 564114244456..c9bf9ad7ec82 100644
--- a/pkgs/by-name/ti/tinygltf/package.nix
+++ b/pkgs/by-name/ti/tinygltf/package.nix
@@ -1,8 +1,16 @@
 {
   lib,
+
   stdenv,
   fetchFromGitHub,
+  nix-update-script,
+
+  # nativeBuildInputs
   cmake,
+
+  # propagatedBuildInputs
+  nlohmann_json,
+  stb,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -20,6 +28,17 @@ stdenv.mkDerivation (finalAttrs: {
     cmake
   ];
 
+  propagatedBuildInputs = [
+    nlohmann_json
+    stb
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "TINYGLTF_INSTALL_VENDOR" false)
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Header only C++11 tiny glTF 2.0 library";
     homepage = "https://github.com/syoyo/tinygltf";

From 044abb14a1ed1294026481cc5d032956f7c41854 Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 24 Oct 2025 00:06:00 +0200
Subject: [PATCH 3625/6226] lib3mf: fix header install
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Somehow this was working before, but around 2025-10-23, something
changed on master, and nixpkgs-review would stop working on
https://github.com/NixOS/nixpkgs/pull/445078:

```
$ nix build -L github:NixOS/nixpkgs/pull/445078/head#lib3mf.dev
$ eza result-dev/include/
 lib3mf/
$ nix build -L github:NixOS/nixpkgs/pull/445078/merge#lib3mf.dev
$ eza result-dev/include/
"result-dev/include/": No such file or directory (os error 2)
```

The headers are now installed in the build tree:
```
-- Installing: /nix/store/i7qd0hcky65i557fqjl5qq3xrp30hwhz-lib3mf-2.4.1/lib/lib3mf.so.2
-- Installing: /nix/store/i7qd0hcky65i557fqjl5qq3xrp30hwhz-lib3mf-2.4.1/lib/lib3mf.so
-- Installing: /build/source/build/include/lib3mf/Bindings
-- Installing: /build/source/build/include/lib3mf/Bindings/NodeJS
-- Installing: /build/source/build/include/lib3mf/Bindings/NodeJS/lib3mf_nodeaddon.cc
-- Installing: /build/source/build/include/lib3mf/Bindings/NodeJS/lib3mf_nodewrapper.cc
```

Maybe CMake 4.1.1 -> 4.1.2 changed something.
---
 pkgs/by-name/li/lib3mf/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/lib3mf/package.nix b/pkgs/by-name/li/lib3mf/package.nix
index 289fcaf48d75..6424ac5b2c9c 100644
--- a/pkgs/by-name/li/lib3mf/package.nix
+++ b/pkgs/by-name/li/lib3mf/package.nix
@@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   cmakeFlags = [
-    "-DCMAKE_INSTALL_INCLUDEDIR=include/lib3mf"
+    "-DCMAKE_INSTALL_INCLUDEDIR=${placeholder "dev"}/include/lib3mf"
     "-DUSE_INCLUDED_ZLIB=OFF"
     "-DUSE_INCLUDED_LIBZIP=OFF"
     "-DUSE_INCLUDED_GTEST=OFF"

From c2172a75745b4a082bc4c600251f858671cfb41f Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Fri, 24 Oct 2025 19:43:32 +0200
Subject: [PATCH 3626/6226] openscad-unstable: fix use of our lib3mf cmake
 export

---
 pkgs/by-name/op/openscad-unstable/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix
index b5d73abc4b0e..7f64438b8078 100644
--- a/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/pkgs/by-name/op/openscad-unstable/package.nix
@@ -57,6 +57,13 @@ clangStdenv.mkDerivation rec {
 
   patches = [ ./test.diff ];
 
+  # fix use of our lib3mf cmake export instead of finder
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "Lib3MF" \
+      "lib3mf"
+  '';
+
   nativeBuildInputs = [
     (python3.withPackages (
       ps: with ps; [

From 9c0cec049bc6fcae1ea7a2dc5b1868549b44233d Mon Sep 17 00:00:00 2001
From: Guilhem Saurel <guilhem.saurel@laas.fr>
Date: Mon, 27 Oct 2025 10:59:41 +0100
Subject: [PATCH 3627/6226] lib3mf: fix lib3mf.pc

---
 pkgs/by-name/li/lib3mf/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/li/lib3mf/package.nix b/pkgs/by-name/li/lib3mf/package.nix
index 6424ac5b2c9c..8038e0f5b0db 100644
--- a/pkgs/by-name/li/lib3mf/package.nix
+++ b/pkgs/by-name/li/lib3mf/package.nix
@@ -104,6 +104,10 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace cmake/lib3mfConfig.cmake \
       --replace-fail "$""{LIB3MF_ROOT_DIR}/include" "$""{LIB3MF_ROOT_DIR}/include/lib3mf" \
       --replace-fail "$""{LIB3MF_ROOT_DIR}/lib" "$out/lib"
+
+    # Use absolute CMAKE_INSTALL_INCLUDEDIR
+    substituteInPlace lib3mf.pc.in \
+      --replace-fail "includedir=$""{prefix}/@CMAKE_INSTALL_INCLUDEDIR@" "includedir=@CMAKE_INSTALL_INCLUDEDIR@"
   '';
 
   doCheck = true;

From 160dcc1224cf031313d90f62abee3059a192e187 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 28 Oct 2025 13:55:57 -0500
Subject: [PATCH 3628/6226] various: migrate rev to tag

---
 pkgs/applications/display-managers/lightdm/default.nix          | 2 +-
 pkgs/applications/editors/cudatext/default.nix                  | 2 +-
 .../elisp-packages/manual-packages/idris2-mode/package.nix      | 2 +-
 .../emacs/elisp-packages/manual-packages/rect-mark/package.nix  | 2 +-
 .../emacs/elisp-packages/manual-packages/tsc/package.nix        | 2 +-
 .../applications/editors/jupyter-kernels/clojupyter/default.nix | 2 +-
 pkgs/applications/misc/ape/clex.nix                             | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/display-managers/lightdm/default.nix b/pkgs/applications/display-managers/lightdm/default.nix
index ce7730c941c7..afd0337f0d75 100644
--- a/pkgs/applications/display-managers/lightdm/default.nix
+++ b/pkgs/applications/display-managers/lightdm/default.nix
@@ -45,7 +45,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "canonical";
     repo = "lightdm";
-    rev = version;
+    tag = version;
     sha256 = "sha256-ttNlhWD0Ran4d3QvZ+PxbFbSUGMkfrRm+hJdQxIDJvM=";
   };
 
diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/applications/editors/cudatext/default.nix
index 4172265c7d13..d49e05bb7069 100644
--- a/pkgs/applications/editors/cudatext/default.nix
+++ b/pkgs/applications/editors/cudatext/default.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Alexey-T";
     repo = "CudaText";
-    rev = version;
+    tag = version;
     hash = "sha256-ZFMO986D4RtrTnLFdcL0a2BNjcsB+9pIolylblku7j4=";
   };
 
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
index 3901b4afcc17..86d1642db5a3 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/idris2-mode/package.nix
@@ -16,7 +16,7 @@ melpaBuild {
   src = fetchFromGitHub {
     owner = "idris-community";
     repo = "idris2-mode";
-    rev = version;
+    tag = version;
     hash = "sha256-rTeVjkAw44Q35vjaERs4uoZRJ6XR3FKplEUCVPHhY7Q=";
   };
 
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix
index 638f5cd49b66..d2710cb6d462 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/package.nix
@@ -14,7 +14,7 @@ melpaBuild {
   src = fetchFromGitHub {
     owner = "emacsmirror";
     repo = "rect-mark";
-    rev = version;
+    tag = version;
     hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM=";
   };
 
diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix
index e8bed9c51e4f..3f7608dc5ced 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix
@@ -17,7 +17,7 @@ let
     src = fetchFromGitHub {
       owner = "emacs-tree-sitter";
       repo = "emacs-tree-sitter";
-      rev = version;
+      tag = version;
       hash = "sha256-LrakDpP3ZhRQqz47dPcyoQnu5lROdaNlxGaQfQT6u+k=";
     };
 
diff --git a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
index 0a1de3a871a2..40dfdc959d50 100644
--- a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
+++ b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix
@@ -43,7 +43,7 @@ let
       src = fetchFromGitHub {
         owner = "clojupyter";
         repo = "clojupyter";
-        rev = version;
+        tag = version;
         sha256 = "sha256-BCzcPnLSonm+ELFU4JIIzLPlVnP0VzlrRSGxOd/LFow=";
       };
 
diff --git a/pkgs/applications/misc/ape/clex.nix b/pkgs/applications/misc/ape/clex.nix
index 5403e4d5e95b..25914f8fdb97 100644
--- a/pkgs/applications/misc/ape/clex.nix
+++ b/pkgs/applications/misc/ape/clex.nix
@@ -11,7 +11,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "Attempto";
     repo = "Clex";
-    rev = version;
+    tag = version;
     sha256 = "0p9s64g1jic213bwm6347jqckszgnni9szrrz31qjgaf32kf7nkp";
   };
 

From cca4a0765aa3b46e2333b78589b020a16bf297bb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 19:11:10 +0000
Subject: [PATCH 3629/6226] ytdl-sub: 2025.10.16 -> 2025.10.23

---
 pkgs/by-name/yt/ytdl-sub/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index d068b9010c28..2bb128d8c9b2 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ytdl-sub";
-  version = "2025.10.16";
+  version = "2025.10.23";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jmbannon";
     repo = "ytdl-sub";
     tag = version;
-    hash = "sha256-6DxIeNoOqz9hH1EnjfwU6adOVcSRlTrtVEq9znCGoyY=";
+    hash = "sha256-8BU0kTKPwCx/SFSONxGC3vXoBbcdX4ac+dlzoVpnkt0=";
   };
 
   postPatch = ''

From bf960d67f6459441b86fecd2793e0e3a0a6f9c1f Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 28 Oct 2025 20:07:11 +0100
Subject: [PATCH 3630/6226] termonad: inherit form `haskellPackages.termond`
 and not an env

makes it so version and name can still eval if package is marked broken
---
 pkgs/by-name/te/termonad/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/te/termonad/package.nix b/pkgs/by-name/te/termonad/package.nix
index 482ab2d3c4f2..54059a34a4f0 100644
--- a/pkgs/by-name/te/termonad/package.nix
+++ b/pkgs/by-name/te/termonad/package.nix
@@ -11,7 +11,7 @@ let
 in
 stdenv.mkDerivation {
   pname = "termonad-with-packages";
-  inherit (termonadEnv) version;
+  inherit (haskellPackages.termonad) version;
 
   nativeBuildInputs = [ makeWrapper ];
 

From 8ddf4afb61066245d8f48715a38d61ee67396e2a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 19:21:30 +0000
Subject: [PATCH 3631/6226] overskride: 0.6.2 -> 0.6.3

---
 pkgs/by-name/ov/overskride/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ov/overskride/package.nix b/pkgs/by-name/ov/overskride/package.nix
index c569726798c4..34b55bae114d 100644
--- a/pkgs/by-name/ov/overskride/package.nix
+++ b/pkgs/by-name/ov/overskride/package.nix
@@ -19,16 +19,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "overskride";
-  version = "0.6.2";
+  version = "0.6.3";
 
   src = fetchFromGitHub {
     owner = "kaii-lb";
     repo = "overskride";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-eMT0wNTpW75V08rmwFtU6NkmZ4auiujzYgbcktewNcI=";
+    hash = "sha256-snyVSQG4eXAW8gIw9ryowTlLbrGo+2y+b4mEQ9ZEBzE=";
   };
 
-  cargoHash = "sha256-Axeywo7Ryig84rS/6MXl2v9Pe3yzdivq7/l/mfi5mOA=";
+  cargoHash = "sha256-AVdo6HPdCvitynqtWZEJMHF5UZpy9ZX6z4SqoqgyOTA=";
 
   nativeBuildInputs = [
     pkg-config

From 27b24b710cef878aec776e355aee5f359ed274d6 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Tue, 28 Oct 2025 19:22:18 +0000
Subject: [PATCH 3632/6226] jetbrains: 2025.2.3 -> 2025.2.4

jetbrains.clion: 2025.2.3 -> 2025.2.4
jetbrains.rider: 2025.2.3 -> 2025.2.4
jetbrains.rust-rover: 2025.2.3 -> 2025.2.4
---
 .../editors/jetbrains/bin/versions.json       | 96 +++++++++----------
 1 file changed, 48 insertions(+), 48 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/bin/versions.json b/pkgs/applications/editors/jetbrains/bin/versions.json
index fc2b6a0b256e..1d22271001e3 100644
--- a/pkgs/applications/editors/jetbrains/bin/versions.json
+++ b/pkgs/applications/editors/jetbrains/bin/versions.json
@@ -11,10 +11,10 @@
     "clion": {
       "update-channel": "CLion RELEASE",
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "364502648a5f1480bd06a00ee410968d224f96b263c78f5148614063f7bc3961",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.3.tar.gz",
-      "build_number": "252.26830.83"
+      "version": "2025.2.4",
+      "sha256": "72c89e91f6636aa53930288fe02466e5e09a50a3c8b6ed5ad2f69b35ec9bacc5",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.4.tar.gz",
+      "build_number": "252.27397.114"
     },
     "datagrip": {
       "update-channel": "DataGrip RELEASE",
@@ -100,10 +100,10 @@
     "rider": {
       "update-channel": "Rider RELEASE",
       "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "1cfc4e756007c5a8b749c0848e4c050303aeeaabc0917f19732d908201b69446",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.3.tar.gz",
-      "build_number": "252.26830.109"
+      "version": "2025.2.4",
+      "sha256": "cd428f7d6db5055cd2594c3d1ef91241843d263cb6301369d3121a847ffb6589",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.4.tar.gz",
+      "build_number": "252.27397.121"
     },
     "ruby-mine": {
       "update-channel": "RubyMine RELEASE",
@@ -116,10 +116,10 @@
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "b96846e7257d14ef38154017cdbe9c63c66d19b59e94ad096db2c9ae2380103b",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.3.tar.gz",
-      "build_number": "252.26830.136"
+      "version": "2025.2.4",
+      "sha256": "3da078b5e68bac2283c0dd60fe3ff17d6025d92d6237bc6fab74f1f35ff6fbe5",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.4.tar.gz",
+      "build_number": "252.27397.120"
     },
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
@@ -150,10 +150,10 @@
     "clion": {
       "update-channel": "CLion RELEASE",
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "e4cc668cb1e0cf5b976ab8eb3997388f1e7cc673e51af3f3c6afa3666a9c47b6",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.3-aarch64.tar.gz",
-      "build_number": "252.26830.83"
+      "version": "2025.2.4",
+      "sha256": "b89010db5272eb6490a0084bd3247c9de657ffd0d12a827147f2c77a406f85b5",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.114"
     },
     "datagrip": {
       "update-channel": "DataGrip RELEASE",
@@ -239,10 +239,10 @@
     "rider": {
       "update-channel": "Rider RELEASE",
       "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "bd03e42b3a04cc1e1b234333285873746bd4d04bf3746fb62b171334a168e976",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.3-aarch64.tar.gz",
-      "build_number": "252.26830.109"
+      "version": "2025.2.4",
+      "sha256": "75c38a2bd94e31200fc4e3a6cfad83b35c65d36c9d61b9a7b208e3ec82f8c81a",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.121"
     },
     "ruby-mine": {
       "update-channel": "RubyMine RELEASE",
@@ -255,10 +255,10 @@
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz",
-      "version": "2025.2.3",
-      "sha256": "5ffdff2a6617fcc75b68a145bc9dce14a71d0d9dc31a1adde5c8630d954a370d",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.3-aarch64.tar.gz",
-      "build_number": "252.26830.136"
+      "version": "2025.2.4",
+      "sha256": "03052ead61bd13eaa616d1126add5b6b6fa9dbc6ef591109b358005d5b630606",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.4-aarch64.tar.gz",
+      "build_number": "252.27397.120"
     },
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
@@ -289,10 +289,10 @@
     "clion": {
       "update-channel": "CLion RELEASE",
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}.dmg",
-      "version": "2025.2.3",
-      "sha256": "4763233873139a0adf8c5cb285ace830eb0be363bb132de2f7ac4b4c1a58b2f2",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.3.dmg",
-      "build_number": "252.26830.83"
+      "version": "2025.2.4",
+      "sha256": "04383caba9ba670841dd336e546f2027b28286d23ea30298e66f422fbc081272",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.4.dmg",
+      "build_number": "252.27397.114"
     },
     "datagrip": {
       "update-channel": "DataGrip RELEASE",
@@ -378,10 +378,10 @@
     "rider": {
       "update-channel": "Rider RELEASE",
       "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg",
-      "version": "2025.2.3",
-      "sha256": "09717e33d640052143492fe7e4485c93218c04c9efc1615e8f0d5dbdb4fe5526",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.3.dmg",
-      "build_number": "252.26830.109"
+      "version": "2025.2.4",
+      "sha256": "f8cabc370393b6be2bd244413fd5692714c02e11cf24eb9c32438367d2895750",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.4.dmg",
+      "build_number": "252.27397.121"
     },
     "ruby-mine": {
       "update-channel": "RubyMine RELEASE",
@@ -394,10 +394,10 @@
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg",
-      "version": "2025.2.3",
-      "sha256": "7c9e08ded178f233cabc8b0bebdda8504ef10a6afaf1856b33da582d69ca378d",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.3.dmg",
-      "build_number": "252.26830.136"
+      "version": "2025.2.4",
+      "sha256": "71f0735c546b659d4d1ed9ce58411848146ac0216b4b971583ce682311e9e075",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.4.dmg",
+      "build_number": "252.27397.120"
     },
     "webstorm": {
       "update-channel": "WebStorm RELEASE",
@@ -428,10 +428,10 @@
     "clion": {
       "update-channel": "CLion RELEASE",
       "url-template": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg",
-      "version": "2025.2.3",
-      "sha256": "87d1b9d0188ee540ce26572d648a4a7ef1b2b2d90c18227932a28d9d263b58df",
-      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.3-aarch64.dmg",
-      "build_number": "252.26830.83"
+      "version": "2025.2.4",
+      "sha256": "7bdef6d73e0edfbc5ef02b7e74e5508e5b18a9c21afb5ba82488527d837e2a94",
+      "url": "https://download.jetbrains.com/cpp/CLion-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.114"
     },
     "datagrip": {
       "update-channel": "DataGrip RELEASE",
@@ -517,10 +517,10 @@
     "rider": {
       "update-channel": "Rider RELEASE",
       "url-template": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg",
-      "version": "2025.2.3",
-      "sha256": "67c9c8f73844d9705c8e64f03afc659ef3146caccc079f183a758b0d7666a468",
-      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.3-aarch64.dmg",
-      "build_number": "252.26830.109"
+      "version": "2025.2.4",
+      "sha256": "e6bd0a07f5922c05c73d9170bbaa2219534fa8e5350b99f37c6a4bc9eb7c0870",
+      "url": "https://download.jetbrains.com/rider/JetBrains.Rider-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.121"
     },
     "ruby-mine": {
       "update-channel": "RubyMine RELEASE",
@@ -533,10 +533,10 @@
     "rust-rover": {
       "update-channel": "RustRover RELEASE",
       "url-template": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg",
-      "version": "2025.2.3",
-      "sha256": "3ebf05feabd5858df21b0215dec39142427b4df50d929c0d94751425478d295d",
-      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.3-aarch64.dmg",
-      "build_number": "252.26830.136"
+      "version": "2025.2.4",
+      "sha256": "8bad55d714d388c115c0d35c297eb5bdb140bc024b2bf602efc8d07a3327cad9",
+      "url": "https://download.jetbrains.com/rustrover/RustRover-2025.2.4-aarch64.dmg",
+      "build_number": "252.27397.120"
     },
     "webstorm": {
       "update-channel": "WebStorm RELEASE",

From aead170c1a49253ebfa5027010dfd89a77b73ca4 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Tue, 28 Oct 2025 19:22:52 +0000
Subject: [PATCH 3633/6226] jetbrains.plugins: update

---
 .../editors/jetbrains/plugins/plugins.json    | 378 +++++++++---------
 1 file changed, 189 insertions(+), 189 deletions(-)

diff --git a/pkgs/applications/editors/jetbrains/plugins/plugins.json b/pkgs/applications/editors/jetbrains/plugins/plugins.json
index 16be4989c04a..d48a9cdcf5f8 100644
--- a/pkgs/applications/editors/jetbrains/plugins/plugins.json
+++ b/pkgs/applications/editors/jetbrains/plugins/plugins.json
@@ -18,15 +18,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/164/835262/IdeaVIM-2.27.2.zip"
       },
       "name": "ideavim"
@@ -69,15 +69,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/2162/820000/StringManipulation-9.16.0.zip"
       },
       "name": "stringmanipulation"
@@ -100,15 +100,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/6884/711128/handlebars-251.23774.318.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/6884/796395/handlebars-252.23892.201.zip"
       },
       "name": "handlebars-mustache"
@@ -131,15 +131,15 @@
       "builds": {
         "251.25410.129": null,
         "252.26199.587": "https://plugins.jetbrains.com/files/6954/861041/Kotlin-252.26199.169-IJ.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/6954/870901/Kotlin-252.26830.84-IJ.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/6954/870901/Kotlin-252.26830.84-IJ.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/6954/870901/Kotlin-252.26830.84-IJ.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/6954/870901/Kotlin-252.26830.84-IJ.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/6954/882364/Kotlin-252.27397.103-IJ.zip"
       },
       "name": "kotlin"
@@ -162,15 +162,15 @@
       "builds": {
         "251.25410.129": null,
         "252.26199.587": null,
-        "252.26830.109": "https://plugins.jetbrains.com/files/6981/871946/ini-252.26830.99.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/6981/871946/ini-252.26830.99.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/6981/871946/ini-252.26830.99.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/6981/871946/ini-252.26830.99.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/6981/882710/ini-252.27397.112.zip"
       },
       "name": "ini"
@@ -193,15 +193,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/7086/738977/AceJump.zip"
       },
       "name": "acejump"
@@ -224,15 +224,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/7125/819837/GrepConsole-13.3.0-IJ2023.3.zip"
       },
       "name": "grep-console"
@@ -255,15 +255,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/7177/711086/fileWatcher-251.23774.318.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/7177/796349/fileWatcher-252.23892.201.zip"
       },
       "name": "file-watchers"
@@ -297,15 +297,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/7212/711023/cucumber-java-251.23774.318.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/7212/809131/cucumber-java-252.23892.360.zip"
       },
       "name": "cucumber-for-java"
@@ -346,13 +346,13 @@
       ],
       "builds": {
         "251.25410.129": null,
-        "252.26830.109": "https://plugins.jetbrains.com/files/7322/866568/python-ce-252.26830.24.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/7322/866568/python-ce-252.26830.24.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/7322/866568/python-ce-252.26830.24.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/7322/866568/python-ce-252.26830.24.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/7322/882365/python-ce-252.27397.103.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/7322/882365/python-ce-252.27397.103.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/7322/882365/python-ce-252.27397.103.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/7322/882365/python-ce-252.27397.103.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/7322/882365/python-ce-252.27397.103.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/7322/882365/python-ce-252.27397.103.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/7322/882365/python-ce-252.27397.103.zip"
       },
       "name": "python-community-edition"
@@ -375,15 +375,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/7391/880448/asciidoctor-intellij-plugin-0.44.10.zip"
       },
       "name": "asciidoc"
@@ -406,15 +406,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
         "252.26199.587": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.26830.109": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.26830.136": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
         "252.26830.46": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
-        "252.26830.83": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
         "252.27397.100": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
         "252.27397.103": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
         "252.27397.106": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
         "252.27397.109": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
         "252.27397.112": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "252.27397.114": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "252.27397.120": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
+        "252.27397.121": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar",
         "252.27397.92": "https://plugins.jetbrains.com/files/7425/760442/WakaTime.jar"
       },
       "name": "wakatime"
@@ -437,15 +437,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/7499/875436/gittoolbox-600.1.12_243-signed.zip"
       },
       "name": "gittoolbox"
@@ -468,15 +468,15 @@
       "builds": {
         "251.25410.129": null,
         "252.26199.587": null,
-        "252.26830.109": "https://plugins.jetbrains.com/files/7724/871939/clouds-docker-impl-252.26830.99.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/7724/871939/clouds-docker-impl-252.26830.99.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/7724/871939/clouds-docker-impl-252.26830.99.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/7724/871939/clouds-docker-impl-252.26830.99.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/7724/882712/clouds-docker-impl-252.27397.112.zip"
       },
       "name": "docker"
@@ -499,15 +499,15 @@
       "builds": {
         "251.25410.129": null,
         "252.26199.587": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/8097/827445/graphql-252.25557.23.zip"
       },
       "name": "graphql"
@@ -529,14 +529,14 @@
       "builds": {
         "251.25410.129": null,
         "252.26199.587": null,
-        "252.26830.109": null,
         "252.26830.46": null,
-        "252.26830.83": null,
         "252.27397.100": null,
         "252.27397.103": null,
         "252.27397.106": null,
         "252.27397.109": null,
         "252.27397.112": null,
+        "252.27397.114": null,
+        "252.27397.121": null,
         "252.27397.92": null
       },
       "name": "-deprecated-rust"
@@ -558,14 +558,14 @@
       "builds": {
         "251.25410.129": null,
         "252.26199.587": null,
-        "252.26830.109": null,
         "252.26830.46": null,
-        "252.26830.83": null,
         "252.27397.100": null,
         "252.27397.103": null,
         "252.27397.106": null,
         "252.27397.109": null,
         "252.27397.112": null,
+        "252.27397.114": null,
+        "252.27397.121": null,
         "252.27397.92": null
       },
       "name": "-deprecated-rust-beta"
@@ -588,15 +588,15 @@
       "builds": {
         "251.25410.129": null,
         "252.26199.587": null,
-        "252.26830.109": "https://plugins.jetbrains.com/files/8195/871151/toml-252.26830.93.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/8195/871151/toml-252.26830.93.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/8195/871151/toml-252.26830.93.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/8195/871151/toml-252.26830.93.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/8195/882551/toml-252.27397.109.zip"
       },
       "name": "toml"
@@ -630,15 +630,15 @@
       "builds": {
         "251.25410.129": null,
         "252.26199.587": "https://plugins.jetbrains.com/files/8554/854483/featuresTrainer-252.26199.84.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/8554/871926/featuresTrainer-252.26830.95.zip"
       },
       "name": "ide-features-trainer"
@@ -661,15 +661,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/8607/786671/NixIDEA-0.4.0.18.zip"
       },
       "name": "nixidea"
@@ -692,15 +692,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/9164/710996/gherkin-251.23774.318.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/9164/827451/gherkin-252.25557.23.zip"
       },
       "name": "gherkin"
@@ -723,15 +723,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/9525/711041/dotenv-251.23774.318.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/9525/796325/dotenv-252.23892.201.zip"
       },
       "name": "-env-files"
@@ -765,15 +765,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/9707/702581/ANSI_Highlighter_Premium-25.1.5.jar",
         "252.26199.587": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
-        "252.26830.109": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
-        "252.26830.136": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
         "252.26830.46": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
-        "252.26830.83": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
         "252.27397.100": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
         "252.27397.103": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
         "252.27397.106": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
         "252.27397.109": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
         "252.27397.112": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
+        "252.27397.114": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
+        "252.27397.120": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
+        "252.27397.121": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar",
         "252.27397.92": "https://plugins.jetbrains.com/files/9707/767822/ANSI_Highlighter_Premium-25.2.1.jar"
       },
       "name": "ansi-highlighter-premium"
@@ -796,15 +796,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/9792/633158/Key_Promoter_X-2024.2.2.zip"
       },
       "name": "key-promoter-x"
@@ -827,15 +827,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/9836/840770/intellij-randomness-3.4.2.zip"
       },
       "name": "randomness"
@@ -858,15 +858,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/10037/851933/intellij-csv-validator-4.1.0.zip"
       },
       "name": "csv-editor"
@@ -889,15 +889,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/10080/867937/intellij-rainbow-brackets-2025.3.5.zip"
       },
       "name": "rainbow-brackets"
@@ -920,15 +920,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/10312/581013/dotplugin-1.5.4.zip"
       },
       "name": "dot-language"
@@ -951,15 +951,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/10481/671222/intellij-hocon-2025.1.0.zip"
       },
       "name": "hocon"
@@ -981,14 +981,14 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/10581/711019/go-template-251.23774.318.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/10581/796391/go-template-252.23892.201.zip"
       },
       "name": "go-template"
@@ -1011,15 +1011,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/11058/878842/Extra_Icons-2025.1.16.zip"
       },
       "name": "extra-icons"
@@ -1042,15 +1042,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/11349/879073/aws-toolkit-jetbrains-standalone-3.97.251.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/11349/879071/aws-toolkit-jetbrains-standalone-3.97.252.zip"
       },
       "name": "aws-toolkit"
@@ -1060,7 +1060,7 @@
         "rider"
       ],
       "builds": {
-        "252.26830.109": "https://plugins.jetbrains.com/files/12024/834783/ReSharperPlugin.CognitiveComplexity-2025.2.0.zip"
+        "252.27397.121": "https://plugins.jetbrains.com/files/12024/834783/ReSharperPlugin.CognitiveComplexity-2025.2.0.zip"
       },
       "name": "cognitivecomplexity"
     },
@@ -1082,15 +1082,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/12062/711097/keymap-vscode-251.23774.318.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/12062/796429/keymap-vscode-252.23892.201.zip"
       },
       "name": "vscode-keymap"
@@ -1113,15 +1113,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/12559/711714/keymap-eclipse-251.23774.329.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/12559/796343/keymap-eclipse-252.23892.201.zip"
       },
       "name": "eclipse-keymap"
@@ -1144,15 +1144,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/12896/173977/RainbowCSV.zip"
       },
       "name": "rainbow-csv"
@@ -1175,15 +1175,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/13017/711726/keymap-visualStudio-251.23774.329.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/13017/796396/keymap-visualStudio-252.23892.201.zip"
       },
       "name": "visual-studio-keymap"
@@ -1206,15 +1206,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/13308/370912/Indent_Rainbow-2.2.0-signed.zip"
       },
       "name": "indent-rainbow"
@@ -1237,15 +1237,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/14004/711000/protoeditor-251.23774.318.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/14004/796340/protoeditor-252.23892.201.zip"
       },
       "name": "protocol-buffers"
@@ -1268,15 +1268,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "252.26199.587": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.26830.109": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.26830.136": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "252.26830.46": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
-        "252.26830.83": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "252.27397.100": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "252.27397.103": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "252.27397.106": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "252.27397.109": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "252.27397.112": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "252.27397.114": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "252.27397.120": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
+        "252.27397.121": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar",
         "252.27397.92": "https://plugins.jetbrains.com/files/14059/82616/darcula-pitch-black.jar"
       },
       "name": "darcula-pitch-black"
@@ -1299,15 +1299,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
         "252.26199.587": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.26830.109": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.26830.136": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
         "252.26830.46": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
-        "252.26830.83": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
         "252.27397.100": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
         "252.27397.103": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
         "252.27397.106": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
         "252.27397.109": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
         "252.27397.112": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "252.27397.114": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "252.27397.120": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
+        "252.27397.121": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar",
         "252.27397.92": "https://plugins.jetbrains.com/files/14708/475401/MarioProgressBar-1.9.jar"
       },
       "name": "mario-progress-bar"
@@ -1330,15 +1330,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
         "252.26199.587": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.26830.109": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.26830.136": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
         "252.26830.46": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
-        "252.26830.83": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
         "252.27397.100": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
         "252.27397.103": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
         "252.27397.106": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
         "252.27397.109": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
         "252.27397.112": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
+        "252.27397.114": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
+        "252.27397.120": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
+        "252.27397.121": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar",
         "252.27397.92": "https://plugins.jetbrains.com/files/15976/851109/IDEA_Which-Key-0.11.2.jar"
       },
       "name": "which-key"
@@ -1361,15 +1361,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/16604/878839/Extra_ToolWindow_Colorful_Icons_Subscription-2025.1.15.zip"
       },
       "name": "extra-toolwindow-colorful-icons"
@@ -1392,15 +1392,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/17718/882517/github-copilot-intellij-1.5.59-243.zip"
       },
       "name": "github-copilot"
@@ -1423,15 +1423,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/18444/165585/NetBeans6.5Keymap.zip"
       },
       "name": "netbeans-6-5-keymap"
@@ -1454,15 +1454,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/18682/864736/Catppuccin_Theme-3.5.2.zip"
       },
       "name": "catppuccin-theme"
@@ -1485,15 +1485,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/18824/865849/CodeGlancePro-2.0.0-signed.zip"
       },
       "name": "codeglance-pro"
@@ -1516,15 +1516,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
         "252.26199.587": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
-        "252.26830.109": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
-        "252.26830.136": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
         "252.26830.46": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
-        "252.26830.83": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
         "252.27397.100": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
         "252.27397.103": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
         "252.27397.106": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
         "252.27397.109": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
         "252.27397.112": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.27397.114": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.27397.120": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
+        "252.27397.121": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar",
         "252.27397.92": "https://plugins.jetbrains.com/files/18922/881168/GerryThemes.jar"
       },
       "name": "gerry-themes"
@@ -1547,15 +1547,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/19275/355572/better_direnv-1.2.2-signed.zip"
       },
       "name": "better-direnv"
@@ -1578,15 +1578,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/20146/811306/Mermaid-0.0.26_IJ.252.zip"
       },
       "name": "mermaid"
@@ -1609,15 +1609,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/21551/323564/ferris-2021.1.zip"
       },
       "name": "ferris"
@@ -1640,15 +1640,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip"
       },
       "name": "code-complexity"
@@ -1671,15 +1671,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip"
       },
       "name": "developer-tools"
@@ -1696,13 +1696,13 @@
         "webstorm"
       ],
       "builds": {
-        "252.26830.109": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip"
       },
       "name": "dev-containers"
@@ -1714,9 +1714,9 @@
         "rust-rover"
       ],
       "builds": {
-        "252.26830.136": "https://plugins.jetbrains.com/files/22407/875264/intellij-rust-252.26830.136.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/22407/875264/intellij-rust-252.26830.136.zip",
-        "252.27397.103": "https://plugins.jetbrains.com/files/22407/875264/intellij-rust-252.26830.136.zip"
+        "252.27397.103": "https://plugins.jetbrains.com/files/22407/883703/intellij-rust-252.27397.120.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/22407/883703/intellij-rust-252.27397.120.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/22407/883703/intellij-rust-252.27397.120.zip"
       },
       "name": "rust"
     },
@@ -1738,15 +1738,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip"
       },
       "name": "continue"
@@ -1769,15 +1769,15 @@
       "builds": {
         "251.25410.129": null,
         "252.26199.587": "https://plugins.jetbrains.com/files/22857/856960/vcs-gitlab-IU-252.26199.97-IU.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip"
       },
       "name": "gitlab"
@@ -1800,15 +1800,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/23029/876768/Catppuccin_Icons-1.13.0.zip"
       },
       "name": "catppuccin-icons"
@@ -1831,15 +1831,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/23043/635877/MermaidChart-1.1.8.zip"
       },
       "name": "mermaid-chart"
@@ -1862,15 +1862,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/23806/867921/Oxocarbon-1.4.7.zip"
       },
       "name": "oxocarbon"
@@ -1893,15 +1893,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/23927/878837/Extra_IDE_Tweaks_Subscription-2025.1.14.zip"
       },
       "name": "extra-ide-tweaks"
@@ -1924,15 +1924,15 @@
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
         "252.26199.587": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
-        "252.26830.109": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
-        "252.26830.136": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
         "252.26830.46": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
-        "252.26830.83": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
         "252.27397.100": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
         "252.27397.103": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
         "252.27397.106": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
         "252.27397.109": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
         "252.27397.112": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.27397.114": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.27397.120": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
+        "252.27397.121": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip",
         "252.27397.92": "https://plugins.jetbrains.com/files/24559/878844/Extra_Tools_Pack-2025.1.18.zip"
       },
       "name": "extra-tools-pack"
@@ -1950,14 +1950,14 @@
         "webstorm"
       ],
       "builds": {
-        "252.26830.109": null,
-        "252.26830.136": null,
         "252.26830.46": null,
-        "252.26830.83": null,
         "252.27397.100": null,
         "252.27397.103": null,
         "252.27397.109": null,
         "252.27397.112": null,
+        "252.27397.114": null,
+        "252.27397.120": null,
+        "252.27397.121": null,
         "252.27397.92": null
       },
       "name": "nix-lsp"
@@ -1978,15 +1978,15 @@
       ],
       "builds": {
         "251.25410.129": "https://plugins.jetbrains.com/files/26084/804883/markdtask-2025.2.zip",
-        "252.26830.109": null,
-        "252.26830.136": null,
         "252.26830.46": null,
-        "252.26830.83": null,
         "252.27397.100": null,
         "252.27397.103": null,
         "252.27397.106": null,
         "252.27397.109": null,
         "252.27397.112": null,
+        "252.27397.114": null,
+        "252.27397.120": null,
+        "252.27397.121": null,
         "252.27397.92": null
       },
       "name": "markdtask"
@@ -2032,7 +2032,7 @@
     "https://plugins.jetbrains.com/files/21667/818221/code-complexity-plugin-1.6.3.zip": "sha256-8agNBVenqaV9DlvRmFP7ul3IZfj9Dij8v/h8QMUb72E=",
     "https://plugins.jetbrains.com/files/21904/744652/intellij-developer-tools-plugin-7.1.0-signed.zip": "sha256-lOPUSxlbgagD0SuXTw+fEdwTxxfUHP1Kl6L+u/oa4fs=",
     "https://plugins.jetbrains.com/files/21962/828479/clouds-docker-gateway-252.25557.34.zip": "sha256-uwonawWIgXi9OXZlQaZl/GDt/iHqsyAKV7ifCgcMqWU=",
-    "https://plugins.jetbrains.com/files/22407/875264/intellij-rust-252.26830.136.zip": "sha256-6UI1p3SzOgdQg7NjWQJv7r6qAVcTOktwTkuvO7/b5ls=",
+    "https://plugins.jetbrains.com/files/22407/883703/intellij-rust-252.27397.120.zip": "sha256-gpfWoNR/RiWe36Og5eL9MROtrqKVlZRHxVqeFCaS7lo=",
     "https://plugins.jetbrains.com/files/22707/878331/continue-intellij-extension-1.0.48.zip": "sha256-7553kxXry5sEJJn+Za4RsfUJGn/roAap8qDkaHjhfXQ=",
     "https://plugins.jetbrains.com/files/22857/856960/vcs-gitlab-IU-252.26199.97-IU.zip": "sha256-dJM8j5aLWD6elv46HtXUhPvYWTdAE77m/jwRqztIwDk=",
     "https://plugins.jetbrains.com/files/22857/871944/vcs-gitlab-IU-252.26830.99-IU.zip": "sha256-bTqJlTkoOyBm370Ks6kFpvxzRJJ7CSucT298YBQtl/M=",

From 16b9f670358f52edb9f1d610496688f435ad4de6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 19:27:54 +0000
Subject: [PATCH 3634/6226] notcurses: 3.0.16 -> 3.0.17

---
 pkgs/by-name/no/notcurses/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/no/notcurses/package.nix b/pkgs/by-name/no/notcurses/package.nix
index e9a430aa226b..f7ab7e942dd7 100644
--- a/pkgs/by-name/no/notcurses/package.nix
+++ b/pkgs/by-name/no/notcurses/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "notcurses";
-  version = "3.0.16";
+  version = "3.0.17";
 
   src = fetchFromGitHub {
     owner = "dankamongmen";
     repo = "notcurses";
     rev = "v${version}";
-    sha256 = "sha256-qAc9jKFpYgI0SdzKHhzmrPkWg4uSXDetD/oNEmHob2o=";
+    sha256 = "sha256-HbyQmuxwfEWlSe/y6w0ZRui0NCFYb0SJh7YA6PC3jdY=";
   };
 
   outputs = [

From be092d0c7b2c334835ae8eb02f5008260efea68f Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Tue, 28 Oct 2025 13:41:13 -0400
Subject: [PATCH 3635/6226] sbcl: fix build on Darwin
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Coreutils v9.8 has a regression on Darwin that causes
`__CF_USER_TEXT_ENCODING` env var to get added to `env`’s output. This
causes a test failure. So get the variant of `env` from
darwin.shell_cmds instead (and `uname`, to avoid having both pkgs in the
closure).

I submitted a bug report to Coreutils, but it is not yet in the tracker
or list archives for me to link from here.
---
 pkgs/development/compilers/sbcl/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index bc4d345f0e3f..637e474a500d 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   callPackage,
+  darwin,
   ecl,
   coreutils,
   fetchurl,
@@ -69,6 +70,7 @@ let
       "${sbclBootstrap}/bin/sbcl --disable-debugger --no-userinit --no-sysinit"
     else
       "${lib.getExe ecl} --norc";
+  posixUtils = if stdenv.hostPlatform.isDarwin then darwin.shell_cmds else coreutils;
 
 in
 
@@ -188,8 +190,8 @@ stdenv.mkDerivation (self: {
         # definitely NOT be patched this way, hence just a single * (and no
         # globstar).
         substituteInPlace ${if self.purgeNixReferences then "tests" else "{tests,src/code}"}/*.{lisp,sh} \
-          --replace-quiet /usr/bin/env "${coreutils}/bin/env" \
-          --replace-quiet /bin/uname "${coreutils}/bin/uname" \
+          --replace-quiet /usr/bin/env "${posixUtils}/bin/env" \
+          --replace-quiet /bin/uname "${posixUtils}/bin/uname" \
           --replace-quiet /bin/sh "${stdenv.shell}"
       )
       # Official source release tarballs will have a version.lispexpr, but if you

From a7aa19e78e4bd6ec21ba738eb5821fee8b17b86e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 19:31:04 +0000
Subject: [PATCH 3636/6226] ladybird: 0-unstable-2025-10-16 ->
 0-unstable-2025-10-28

---
 pkgs/by-name/la/ladybird/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix
index 10acd1191cfc..65f7df642424 100644
--- a/pkgs/by-name/la/ladybird/package.nix
+++ b/pkgs/by-name/la/ladybird/package.nix
@@ -34,13 +34,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ladybird";
-  version = "0-unstable-2025-10-16";
+  version = "0-unstable-2025-10-28";
 
   src = fetchFromGitHub {
     owner = "LadybirdBrowser";
     repo = "ladybird";
-    rev = "62c00712faa2cd923f18feb3c72a1348aef51145";
-    hash = "sha256-0sJeSCW5OkhjnQL/vKwi63xOfg63cPFN/jAVrH0Bk/A=";
+    rev = "d2b2d573879a50d8f3d568f9c35b8c660bc43013";
+    hash = "sha256-OOqAYUXjyoZHdXOaPqddeUfYD/SNCNZh6a9ysnEseLA=";
   };
 
   postPatch = ''

From 5c92e83cc509d034b328787746d9c67c830dacad Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Tue, 28 Oct 2025 13:44:33 -0400
Subject: [PATCH 3637/6226] sbcl: fix test failures in Darwin sandbox

---
 pkgs/development/compilers/sbcl/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix
index 637e474a500d..389b50c4bca3 100644
--- a/pkgs/development/compilers/sbcl/default.nix
+++ b/pkgs/development/compilers/sbcl/default.nix
@@ -154,6 +154,10 @@ stdenv.mkDerivation (self: {
       # Fail intermittently
       "gc.impure.lisp"
       "threads.pure.lisp"
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      # Fails in sandbox
+      "sb-posix.impure.lisp"
     ];
 
   patches =
@@ -288,6 +292,8 @@ stdenv.mkDerivation (self: {
     ''
   );
 
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
     description = "Common Lisp compiler";
     homepage = "https://sbcl.org";

From 3fbbba471cd137edad7ab2984b7217b77f0c177f Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Tue, 28 Oct 2025 15:32:58 -0400
Subject: [PATCH 3638/6226] ejabberd: 25.08 -> 25.10

Changelog: https://github.com/processone/ejabberd/releases/tag/25.10
---
 pkgs/by-name/ej/ejabberd/package.nix    |  6 +++---
 pkgs/by-name/ej/ejabberd/rebar-deps.nix | 24 ++++++++++++------------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ej/ejabberd/package.nix b/pkgs/by-name/ej/ejabberd/package.nix
index d6c6534257cb..bd2108bac3cb 100644
--- a/pkgs/by-name/ej/ejabberd/package.nix
+++ b/pkgs/by-name/ej/ejabberd/package.nix
@@ -19,7 +19,6 @@
   gawk,
   fetchFromGitHub,
   fetchgit,
-  fetchpatch2,
   beamPackages,
   nixosTests,
   withMysql ? false,
@@ -141,7 +140,7 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "ejabberd";
-  version = "25.08";
+  version = "25.10";
 
   nativeBuildInputs = [
     makeWrapper
@@ -171,7 +170,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "processone";
     repo = "ejabberd";
     tag = finalAttrs.version;
-    hash = "sha256-nipFr4ezo2prlpLfAW8iu8HAG8nhkIXXiAbsoM7QKTM=";
+    hash = "sha256-dTu3feSOakSHdk+hMDvYQwog64O3e/z5NOsGM3Rq7WY=";
   };
 
   passthru.tests = {
@@ -217,6 +216,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = {
     description = "Open-source XMPP application server written in Erlang";
     mainProgram = "ejabberdctl";
+    changelog = "https://github.com/processone/ejabberd/releases/tag/${finalAttrs.version}";
     license = lib.licenses.gpl2Plus;
     homepage = "https://www.ejabberd.im";
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/ej/ejabberd/rebar-deps.nix b/pkgs/by-name/ej/ejabberd/rebar-deps.nix
index 5f102ca8151a..cc082f0cc89d 100644
--- a/pkgs/by-name/ej/ejabberd/rebar-deps.nix
+++ b/pkgs/by-name/ej/ejabberd/rebar-deps.nix
@@ -44,21 +44,21 @@ let
     };
     yconf = builder {
       name = "yconf";
-      version = "1.0.21";
+      version = "1.0.22";
       src = fetchHex {
         pkg = "yconf";
-        version = "1.0.21";
-        sha256 = "sha256-xSSl8f2Gh12FtGnMLjaMIE+XzKHDkYc24h9QAcAdCWw=";
+        version = "1.0.22";
+        sha256 = "sha256-rKg0V86r5wdWSEtch7p7GVX1EdSZFoaH6uqnwwDoV/E=";
       };
       beamDeps = [ fast_yaml ];
     };
     xmpp = builder {
       name = "xmpp";
-      version = "1.11.1";
+      version = "1.11.2";
       src = fetchHex {
         pkg = "xmpp";
-        version = "1.11.1";
-        sha256 = "sha256-pckz35BKs87BVCXaM05BDOhOw657ge/gaeXbNop7NxY=";
+        version = "1.11.2";
+        sha256 = "sha256-u2gWROFePvwACKs6cXlE1nz2EaS340Q4KqY2dEe9UtI=";
       };
       beamDeps = [
         ezlib
@@ -124,11 +124,11 @@ let
     };
     p1_pgsql = builder {
       name = "p1_pgsql";
-      version = "1.1.35";
+      version = "1.1.36";
       src = fetchHex {
         pkg = "p1_pgsql";
-        version = "1.1.35";
-        sha256 = "sha256-6ZWURGxBHGYGlnlbBiM29cS9gARR2PYgu01M4wTiVcI=";
+        version = "1.1.36";
+        sha256 = "sha256-gryouJXIT0YA641gmjLLX91yp/W9k437KReeCMZD/Qk=";
       };
       beamDeps = [ xmpp ];
     };
@@ -154,11 +154,11 @@ let
     };
     p1_acme = builder {
       name = "p1_acme";
-      version = "1.0.28";
+      version = "1.0.29";
       src = fetchHex {
         pkg = "p1_acme";
-        version = "1.0.28";
-        sha256 = "sha256-zmhpht4/nV/Sha/odSPLRTKaNJxsa+eswe2RZyXUZCM=";
+        version = "1.0.29";
+        sha256 = "sha256-CP049/vi3CiiN6obOLMGtzRVaVzIiBo93WoRt8Ufe8c=";
       };
       beamDeps = [
         base64url

From 0db16760a4ab32ce1bfaf0af514901736fa77b5b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 19:36:12 +0000
Subject: [PATCH 3639/6226] lxgw-neoxihei: 1.225 -> 1.226

---
 pkgs/by-name/lx/lxgw-neoxihei/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix
index 106ddb457599..65a60ef0dc19 100644
--- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix
+++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix
@@ -6,11 +6,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "lxgw-neoxihei";
-  version = "1.225";
+  version = "1.226";
 
   src = fetchurl {
     url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
-    hash = "sha256-Mvlt9P0/tIuizXLBdzmBJpxd8UsfOwP6saYG17KVeXQ=";
+    hash = "sha256-rKhEnNbqQRlTepZTPM9Naau74YWRU4K22jrHYTOXKOE=";
   };
 
   dontUnpack = true;

From db963111bab2d911961cc9185d348806cf796869 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Tue, 28 Oct 2025 21:46:58 +0200
Subject: [PATCH 3640/6226] aerc: remove explicit `patchShebangs` call from
 `postFixup`

Shebangs were already patched in `fixupPhase`, so this step is redundant
and doing nothing
---
 pkgs/by-name/ae/aerc/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix
index 878962a650ec..00158486e02e 100644
--- a/pkgs/by-name/ae/aerc/package.nix
+++ b/pkgs/by-name/ae/aerc/package.nix
@@ -80,7 +80,6 @@ buildGoModule (finalAttrs: {
           dante
         ]
       }
-    patchShebangs $out/libexec/aerc/filters
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];

From 1fb9b8efb2b35aa83d84046394465081310a4c62 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 19:48:19 +0000
Subject: [PATCH 3641/6226] kubefirst: 2.10.2 -> 2.10.3

---
 pkgs/by-name/ku/kubefirst/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ku/kubefirst/package.nix b/pkgs/by-name/ku/kubefirst/package.nix
index 5eacae3c838c..06a0ffa2cbbf 100644
--- a/pkgs/by-name/ku/kubefirst/package.nix
+++ b/pkgs/by-name/ku/kubefirst/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "kubefirst";
-  version = "2.10.2";
+  version = "2.10.3";
 
   src = fetchFromGitHub {
     owner = "konstructio";
     repo = "kubefirst";
     tag = "v${version}";
-    hash = "sha256-AjVShJEsZczDc0iD4RWF0Q+xlhN/bkl4ESh+ESoxejM=";
+    hash = "sha256-fYoW32WukwyMtXC6LZ9nyBAvvPbk3z5TkdYXhb+Mz9k=";
   };
 
   vendorHash = "sha256-1u34cuPUY/5fYd073UhRUu/5/1nhPadTI06+3o+uE7w=";

From da233ea5104284033dd9805688dbd6f5165b92cd Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Tue, 28 Oct 2025 21:51:38 +0200
Subject: [PATCH 3642/6226] aerc: make `patchShebangs` detect Bash

Shell-based `html` filter's shebang wasn't patched
---
 pkgs/by-name/ae/aerc/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix
index 00158486e02e..eece15445074 100644
--- a/pkgs/by-name/ae/aerc/package.nix
+++ b/pkgs/by-name/ae/aerc/package.nix
@@ -11,6 +11,7 @@
   dante,
   gawk,
   versionCheckHook,
+  bashNonInteractive,
   nix-update-script,
 }:
 
@@ -52,6 +53,7 @@ buildGoModule (finalAttrs: {
   buildInputs = [
     python3Packages.python
     gawk
+    bashNonInteractive
   ]
   ++ lib.optional withNotmuch notmuch;
 

From c57db596866a079730504e2115abd93e59518608 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 19:54:51 +0000
Subject: [PATCH 3643/6226] ginkgo: 2.27.1 -> 2.27.2

---
 pkgs/by-name/gi/ginkgo/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/ginkgo/package.nix b/pkgs/by-name/gi/ginkgo/package.nix
index aeb981992263..0d0506ac77dc 100644
--- a/pkgs/by-name/gi/ginkgo/package.nix
+++ b/pkgs/by-name/gi/ginkgo/package.nix
@@ -8,15 +8,15 @@
 
 buildGoModule rec {
   pname = "ginkgo";
-  version = "2.27.1";
+  version = "2.27.2";
 
   src = fetchFromGitHub {
     owner = "onsi";
     repo = "ginkgo";
     rev = "v${version}";
-    sha256 = "sha256-XdJYg0ahUkYdaEc4G5lqxc7gr5fF3BjhVPcaynd7u2Q=";
+    sha256 = "sha256-+B/yl6Jl7BwtyGUWuyBPPK2bT+vulHtUbn8GygPlbh0=";
   };
-  vendorHash = "sha256-VKflMZ+qZGLlXdWpdnRV2dSqta4C3SfLKgJcqHHtDNk=";
+  vendorHash = "sha256-Vmcva/iMaOszQi87avO7utD0ahlB2gFBmVEI86hvnyQ=";
 
   # integration tests expect more file changes
   # types tests are missing CodeLocation

From 98d31b4eb62a927004208b2cf59ba5dcea067129 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 19:58:30 +0000
Subject: [PATCH 3644/6226] harbor-cli: 0.0.13 -> 0.0.14

---
 pkgs/by-name/ha/harbor-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix
index 8b46de187513..f9a8e1403259 100644
--- a/pkgs/by-name/ha/harbor-cli/package.nix
+++ b/pkgs/by-name/ha/harbor-cli/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "harbor-cli";
-  version = "0.0.13";
+  version = "0.0.14";
 
   src = fetchFromGitHub {
     owner = "goharbor";
     repo = "harbor-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TVuWSbBPRXq9icfMXEg0wONaqD5S2ge5DQiDHSlrADk=";
+    hash = "sha256-86qRXxCLcmVpO/fdmVGxiqVFrAQYIFlNHLxnoBgY9+k=";
   };
 
   vendorHash = "sha256-Pj573V6S2LaytQMK0jGVyLMX/GBZ1GOmYV/LPO1ScS4=";

From 0ae9b406b15b5de68045245ab81f30773eec23c4 Mon Sep 17 00:00:00 2001
From: Daryl Ronningen <relms@relms.dev>
Date: Tue, 28 Oct 2025 13:00:16 -0700
Subject: [PATCH 3645/6226] halloy: 2025.9 -> 2025.10

Changelog: https://github.com/squidowl/halloy/blob/2025.10/CHANGELOG.md
---
 pkgs/by-name/ha/halloy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix
index 984c448e203f..ad247e61ec57 100644
--- a/pkgs/by-name/ha/halloy/package.nix
+++ b/pkgs/by-name/ha/halloy/package.nix
@@ -18,16 +18,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "halloy";
-  version = "2025.9";
+  version = "2025.10";
 
   src = fetchFromGitHub {
     owner = "squidowl";
     repo = "halloy";
     tag = version;
-    hash = "sha256-yjia9tNNaXCTQFe8xfUeBYVHhW214AaOeCLFjAG703E=";
+    hash = "sha256-kWIzog56lx28v7CoyEwqwthzBnl7kbnr8QwyHQTbyCY=";
   };
 
-  cargoHash = "sha256-GmcRm6/dvY3stjV2ON8NVlVWZ5m0LXa9Kv0gqycbRoY=";
+  cargoHash = "sha256-gGVclMEcvgdl3ZTiEdhW48xhC9/eONeHp0KX1lHKKxU=";
 
   nativeBuildInputs = [
     copyDesktopItems

From 3018c0f8e0178c923f0470417cc2685913298150 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Tue, 28 Oct 2025 22:00:34 +0200
Subject: [PATCH 3646/6226] aerc: don't wrap `html-unsafe`

About 10 months ago[^1], this filter was replaced by a symlink to
`html`, which, in its turn, now acts differently based on its argv0

[^1]: https://git.sr.ht/~rjarry/aerc/commit/0d37fd74ce04aac966824a07a807dd64958935ac
---
 pkgs/by-name/ae/aerc/package.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix
index eece15445074..2c0e7597bbd1 100644
--- a/pkgs/by-name/ae/aerc/package.nix
+++ b/pkgs/by-name/ae/aerc/package.nix
@@ -75,13 +75,6 @@ buildGoModule (finalAttrs: {
           dante
         ]
       }
-    wrapProgram $out/libexec/aerc/filters/html-unsafe \
-      --prefix PATH : ${
-        lib.makeBinPath [
-          w3m
-          dante
-        ]
-      }
   '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];

From 3c8853ae064e166c59becd6c6c71c59725d7d121 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 20:02:57 +0000
Subject: [PATCH 3647/6226] fflogs: 8.17.83 -> 8.17.85

---
 pkgs/by-name/ff/fflogs/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix
index 0bd801ac94b0..8217a17819ff 100644
--- a/pkgs/by-name/ff/fflogs/package.nix
+++ b/pkgs/by-name/ff/fflogs/package.nix
@@ -6,10 +6,10 @@
 
 let
   pname = "fflogs";
-  version = "8.17.83";
+  version = "8.17.85";
   src = fetchurl {
     url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage";
-    hash = "sha256-orVUCf7+OzJQ561maIYEBKgSgLuKfuSXFGMLZV/HMjM=";
+    hash = "sha256-vI2WI9CeupQf96GxW89D8Z8R/h1hB5Rfib2A+4Yd6zc=";
   };
   extracted = appimageTools.extractType2 { inherit pname version src; };
 in

From 1cc76d17e7e59c21ba3a5461b056e48916b11a6f Mon Sep 17 00:00:00 2001
From: Silvan Mosberger <silvan.mosberger@moduscreate.com>
Date: Tue, 28 Oct 2025 21:06:40 +0100
Subject: [PATCH 3648/6226] lib.teams.formatter: Link with GitHub team

---
 maintainers/team-list.nix | 12 +-----------
 1 file changed, 1 insertion(+), 11 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index de7d9e27a22b..d6843424df61 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -351,17 +351,7 @@ with lib.maintainers;
   };
 
   formatter = {
-    members = [
-      piegames
-      infinisil
-      das_j
-      _0x4A6F
-      MattSturgeon
-      jfly
-      Sereja313
-    ];
-    scope = "Nix formatting team: https://nixos.org/community/teams/formatting/";
-    shortName = "Nix formatting team";
+    github = "nix-formatting";
   };
 
   freedesktop = {

From 1e00a1869af88546f9610eac3b0fa9d828050f4b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 20:06:53 +0000
Subject: [PATCH 3649/6226] gitfetch: 1.2.1 -> 1.3.2

---
 pkgs/by-name/gi/gitfetch/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/gitfetch/package.nix b/pkgs/by-name/gi/gitfetch/package.nix
index 7f0f5636a118..7f0be92e1c63 100644
--- a/pkgs/by-name/gi/gitfetch/package.nix
+++ b/pkgs/by-name/gi/gitfetch/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gitfetch";
-  version = "1.2.1";
+  version = "1.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Matars";
     repo = "gitfetch";
     tag = "v${version}";
-    hash = "sha256-2cOfVv/snhluazyjwDuHEbbMq3cK+bsKYnnRmby0JDo=";
+    hash = "sha256-HAZUdGCITr4in0K/LOSZaMHZpPjrHxcg7kAF1J0vl1I=";
   };
 
   build-system = with python3Packages; [ setuptools ];

From 340e3777090bbbb419b3999cfda9d14c1fcb415b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Justin=20Lex-Hammarskj=C3=B6ld?= <noreply@jlh.name>
Date: Tue, 28 Oct 2025 21:11:28 +0100
Subject: [PATCH 3650/6226] k3s: use correct package for user namespace support

---
 pkgs/applications/networking/cluster/k3s/builder.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/k3s/builder.nix b/pkgs/applications/networking/cluster/k3s/builder.nix
index aa4814fc3d3c..2e002dd47777 100644
--- a/pkgs/applications/networking/cluster/k3s/builder.nix
+++ b/pkgs/applications/networking/cluster/k3s/builder.nix
@@ -68,7 +68,7 @@ lib:
   socat,
   sqlite,
   stdenv,
-  su,
+  shadow,
   systemdMinimal,
   util-linuxMinimal,
   yq-go,
@@ -373,7 +373,7 @@ buildGoModule (finalAttrs: {
     conntrack-tools
     runc
     bash
-    su
+    shadow # kubelet wants 'getsubids' when using user namespaces
   ];
 
   k3sKillallDeps = [

From 43f77ae5c3e5c3f63c0bb9c75be97e7eb762b14d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 28 Oct 2025 21:14:49 +0100
Subject: [PATCH 3651/6226] pnpm_10: 10.19.0 -> 10.20.0

Changelog: https://github.com/pnpm/pnpm/releases/tag/v10.20.0
---
 pkgs/development/tools/pnpm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/pnpm/default.nix b/pkgs/development/tools/pnpm/default.nix
index 681aaaf9e971..50d3e1634f9e 100644
--- a/pkgs/development/tools/pnpm/default.nix
+++ b/pkgs/development/tools/pnpm/default.nix
@@ -15,8 +15,8 @@ let
       hash = "sha256-z4anrXZEBjldQoam0J1zBxFyCsxtk+nc6ax6xNxKKKc=";
     };
     "10" = {
-      version = "10.19.0";
-      hash = "sha256-HF9e5ZJn5OLhv9M19DKhjcSPmplECU1dJkl1fnJa03Y=";
+      version = "10.20.0";
+      hash = "sha256-R6M1KAhQG40e8gESJztqXc+lPSilW8zjbSaOh4vWv+k=";
     };
   };
 

From 0b9949e9298d705b88d830e8a5eab1c9d0ff26b6 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 28 Oct 2025 20:13:47 +0000
Subject: [PATCH 3652/6226] radicle-job: 0.3.0 -> 0.4.0

Changelog: https://app.radicle.xyz/nodes/iris.radicle.xyz/rad:z2UcCU1LgMshWvXj6hXSDDrwB8q8M/tree/CHANGELOG.md
---
 pkgs/by-name/ra/radicle-job/package.nix | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/ra/radicle-job/package.nix b/pkgs/by-name/ra/radicle-job/package.nix
index 7e0200a3bd87..681a4295ec4e 100644
--- a/pkgs/by-name/ra/radicle-job/package.nix
+++ b/pkgs/by-name/ra/radicle-job/package.nix
@@ -2,7 +2,6 @@
   lib,
   rustPlatform,
   fetchFromRadicle,
-  fetchRadiclePatch,
   radicle-node,
   gitMinimal,
   versionCheckHook,
@@ -10,25 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "radicle-job";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromRadicle {
     seed = "iris.radicle.xyz";
     repo = "z2UcCU1LgMshWvXj6hXSDDrwB8q8M";
     tag = "releases/v${finalAttrs.version}";
-    hash = "sha256-6UrkKyIdSM5lSYNF/A3xIf3FGiM2pB/5s7F49jtn0KE=";
+    hash = "sha256-EGNs0IOJSp5SMJ3tdGCxIAN6hvVFwWWUmXoB914jw3k=";
   };
 
-  patches = [
-    # https://app.radicle.xyz/nodes/rosa.radicle.xyz/rad:z2UcCU1LgMshWvXj6hXSDDrwB8q8M/patches/dac4fef89d07fe609dd5d3d75ea57f76f1cca3dc
-    (fetchRadiclePatch {
-      inherit (finalAttrs.src) seed repo;
-      revision = "dac4fef89d07fe609dd5d3d75ea57f76f1cca3dc";
-      hash = "sha256-oFUkiBIqAa/DWqlTZw0LzHbgK/uhWik8qbRcGcGpkDY=";
-    })
-  ];
-
-  cargoHash = "sha256-5GjLqs4ol7lUE96KwtE7W3lxL9H/A/0yDpiMDiLQDeY=";
+  cargoHash = "sha256-+DD2cGfxN0rmFhCazEuRiv3JfLXIC4FjaYHmugCmk+g=";
 
   nativeCheckInputs = [
     radicle-node

From 74cac9ba1a971452b2e1dc11627eb4201bb9b06a Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 23 Aug 2025 09:11:39 +0100
Subject: [PATCH 3653/6226] diffoscope: 304 -> 306

Changes:
- https://diffoscope.org/news/diffoscope-304-released/
- https://diffoscope.org/news/diffoscope-305-released/
---
 pkgs/by-name/di/diffoscope/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix
index 0410978a4393..dee2dc5008af 100644
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -106,12 +106,12 @@ in
 # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python.pkgs.buildPythonApplication rec {
   pname = "diffoscope";
-  version = "304";
+  version = "306";
   pyproject = true;
 
   src = fetchurl {
     url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    hash = "sha256-lJdZRIyoVq1PsmiicsSxJ0Mgsy5IcAUar6l8QvJoxOw=";
+    hash = "sha256-Yr4xynjR5N7aImb8VVLsiUE+OoKOoneDUbw9O7b77b8=";
   };
 
   outputs = [

From 5b1ac55400faac55e8720906bfc06799a2b94b7b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 20:22:11 +0000
Subject: [PATCH 3654/6226] cnspec: 12.6.0 -> 12.7.0

---
 pkgs/by-name/cn/cnspec/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix
index a1e68c3d6965..29903eecd4c8 100644
--- a/pkgs/by-name/cn/cnspec/package.nix
+++ b/pkgs/by-name/cn/cnspec/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnspec";
-  version = "12.6.0";
+  version = "12.7.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${version}";
-    hash = "sha256-wV3LzrATUlNdPuqh/uB+EPeAPqbfWXEEhtctOIxJrWs=";
+    hash = "sha256-IQ+DwgWEVrMnkgAgHjFg/NDn2mkHggnlT3xgbSvN/pU=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-NDwPDij1dFpBjgePyQ7y2f4BIMl92ugDAYNOZJk+6bs=";
+  vendorHash = "sha256-0VoGgBBgloUG6NppX1muNqAyZdzyrc9Tcs3wNaLRdVY=";
 
   subPackages = [ "apps/cnspec" ];
 

From f48a37bf2ae9d13a0652a4f101e2c93f245459a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 20:22:20 +0000
Subject: [PATCH 3655/6226] cnquery: 12.6.0 -> 12.7.0

---
 pkgs/by-name/cn/cnquery/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix
index ad34ce6ecf15..090061be06b7 100644
--- a/pkgs/by-name/cn/cnquery/package.nix
+++ b/pkgs/by-name/cn/cnquery/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnquery";
-  version = "12.6.0";
+  version = "12.7.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnquery";
     tag = "v${version}";
-    hash = "sha256-f+2E3pG5c/3yrsvBPJp9QUHcDRY4vmmxeosw/jfQ+mY=";
+    hash = "sha256-l4pMVg9ScLXccw4i7DJPWkdRhzU6REqxP/6U9/F3vTE=";
   };
 
   subPackages = [ "apps/cnquery" ];
 
-  vendorHash = "sha256-NI6x1MIdIHK4OfoqRvnyGxJZaCxLclaU4/rNvDx/Fhc=";
+  vendorHash = "sha256-ZpyLln4YLPfZy/EXWMDAKy/jr7/wZqkvVclD8F4tEw4=";
 
   ldflags = [
     "-w"

From 31ccfff9593d149d941e875973ab012468df69db Mon Sep 17 00:00:00 2001
From: adam <me@adamperkowski.dev>
Date: Tue, 28 Oct 2025 20:26:26 +0100
Subject: [PATCH 3656/6226] julefmt: init at unstable-2025-09-08

---
 pkgs/by-name/ju/julefmt/package.nix | 30 +++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 pkgs/by-name/ju/julefmt/package.nix

diff --git a/pkgs/by-name/ju/julefmt/package.nix b/pkgs/by-name/ju/julefmt/package.nix
new file mode 100644
index 000000000000..c8902c3e3f73
--- /dev/null
+++ b/pkgs/by-name/ju/julefmt/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  julec,
+  clangStdenv,
+  fetchFromGitHub,
+}:
+
+clangStdenv.mkDerivation (finalAttrs: {
+  pname = "julefmt";
+  version = "0.0.0-unstable-2025-09-08";
+
+  src = fetchFromGitHub {
+    owner = "julelang";
+    repo = "julefmt";
+    rev = "cc30781206d3d7b88599cc51b3f9d7d7936de527";
+    hash = "sha256-g3vN2Hz4BA5c0KqIbNKHg0W77xKGZQFHUIKWjg5/UTM=";
+  };
+
+  nativeBuildInputs = [ julec.hook ];
+
+  JULE_OUT_NAME = "julefmt";
+
+  meta = {
+    description = "Official formatter tool for the Jule programming language";
+    homepage = "https://manual.jule.dev/tools/julefmt";
+    license = lib.licenses.bsd3;
+    mainProgram = "julefmt";
+    inherit (julec.meta) platforms maintainers;
+  };
+})

From 17fd2ebb807281e5d431e1cc0905df165bc36bbc Mon Sep 17 00:00:00 2001
From: adam <me@adamperkowski.dev>
Date: Tue, 28 Oct 2025 20:31:44 +0100
Subject: [PATCH 3657/6226] juledoc: init at unstable-2025-09-09

---
 pkgs/by-name/ju/juledoc/package.nix | 30 +++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 pkgs/by-name/ju/juledoc/package.nix

diff --git a/pkgs/by-name/ju/juledoc/package.nix b/pkgs/by-name/ju/juledoc/package.nix
new file mode 100644
index 000000000000..7b31a47ab73e
--- /dev/null
+++ b/pkgs/by-name/ju/juledoc/package.nix
@@ -0,0 +1,30 @@
+{
+  lib,
+  julec,
+  clangStdenv,
+  fetchFromGitHub,
+}:
+
+clangStdenv.mkDerivation (finalAttrs: {
+  pname = "juledoc";
+  version = "0.0.0-unstable-2025-09-09";
+
+  src = fetchFromGitHub {
+    owner = "julelang";
+    repo = "juledoc";
+    rev = "3461147f4630104999bb895bdd8e60f40ca23aaf";
+    hash = "sha256-0HuMWdoDoq2SgQhOnn6UnWXe2Js7/466cP2XpjvO5dw=";
+  };
+
+  nativeBuildInputs = [ julec.hook ];
+
+  JULE_OUT_NAME = "juledoc";
+
+  meta = {
+    description = "Official documentation generator for the Jule programming language";
+    homepage = "https://manual.jule.dev/tools/juledoc";
+    license = lib.licenses.bsd3;
+    mainProgram = "juledoc";
+    inherit (julec.meta) platforms maintainers;
+  };
+})

From c46eda40eacd1d03e3cb67365207f733189fb68e Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 28 Oct 2025 20:14:16 +0000
Subject: [PATCH 3658/6226] olivetin: 2025.10.24 -> 2025.10.27

Changelog: https://github.com/OliveTin/OliveTin/releases/tag/2025.10.27
Diff: https://github.com/OliveTin/OliveTin/compare/2025.10.24...2025.10.27
---
 pkgs/by-name/ol/olivetin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ol/olivetin/package.nix b/pkgs/by-name/ol/olivetin/package.nix
index 5b07c1029b34..511a3438fba2 100644
--- a/pkgs/by-name/ol/olivetin/package.nix
+++ b/pkgs/by-name/ol/olivetin/package.nix
@@ -86,13 +86,13 @@ buildGoModule (
 
   {
     pname = "olivetin";
-    version = "2025.10.24";
+    version = "2025.10.27";
 
     src = fetchFromGitHub {
       owner = "OliveTin";
       repo = "OliveTin";
       tag = finalAttrs.version;
-      hash = "sha256-JarySndKRjyY2zu8QAntx9xr4vnK7/fp/zz5ibOB+ok=";
+      hash = "sha256-iMfdOB2g1bNhkTaxuV9wUbslVmlKs+Ha5LL67IRgZm8=";
     };
 
     modRoot = "service";

From 8a8e9a8312c65a0bc28ec6b0c7fc19a0ce394a31 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Tue, 28 Oct 2025 21:26:44 +0100
Subject: [PATCH 3659/6226] libwebsockets: apply patches for CVE-2025-11677 and
 CVE-2025-11678

https://libwebsockets.org/git/libwebsockets/commit?id=2f082ec31261f556969160143ba94875d783971a
https://libwebsockets.org/git/libwebsockets/commit?id=2bb9598562b37c942ba5b04bcde3f7fdf66a9d3a
---
 pkgs/by-name/li/libwebsockets/package.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/by-name/li/libwebsockets/package.nix b/pkgs/by-name/li/libwebsockets/package.nix
index 5e5b1d3dda89..3c6a144f0b40 100644
--- a/pkgs/by-name/li/libwebsockets/package.nix
+++ b/pkgs/by-name/li/libwebsockets/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   openssl,
   zlib,
@@ -21,6 +22,19 @@ stdenv.mkDerivation rec {
     hash = "sha256-KOAhIVn4G5u0A1TE75Xv7iYO3/i8foqWYecH0kJHdBM=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "CVE-2025-11677.patch";
+      url = "https://libwebsockets.org/git/libwebsockets/patch?id=2f082ec31261f556969160143ba94875d783971a";
+      hash = "sha256-FeiZAbr1kpt+YNjhi2gfG2A6nXKiSssMFRmlALaneu4=";
+    })
+    (fetchpatch {
+      name = "CVE-2025-11678.patch";
+      url = "https://libwebsockets.org/git/libwebsockets/patch?id=2bb9598562b37c942ba5b04bcde3f7fdf66a9d3a";
+      hash = "sha256-1uQUkoMbK+3E/QYMIBLlBZypwHBIrWBtm+KIW07WRj8=";
+    })
+  ];
+
   # Updating to 4.4.1 would bring some errors, and the patch doesn't apply cleanly
   # https://github.com/warmcat/libwebsockets/commit/47efb8c1c2371fa309f85a32984e99b2cc1d614a
   postPatch = ''

From 4f0273e6ac823937ca6e735044a6a011be9279a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 20:28:07 +0000
Subject: [PATCH 3660/6226] baidupcs-go: 3.9.9 -> 4.0.0

---
 pkgs/by-name/ba/baidupcs-go/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ba/baidupcs-go/package.nix b/pkgs/by-name/ba/baidupcs-go/package.nix
index 6738a39984ba..57a3993d5dee 100644
--- a/pkgs/by-name/ba/baidupcs-go/package.nix
+++ b/pkgs/by-name/ba/baidupcs-go/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "baidupcs-go";
-  version = "3.9.9";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "qjfoidnh";
     repo = "BaiduPCS-Go";
     rev = "v${version}";
-    hash = "sha256-x0oEuj8LoR0yUkKOzI27u3AIFVDDV7vMHCqvjENHwv8=";
+    hash = "sha256-synfJtYZmIiK2SoTG0rt+qZ0ixXIXDXnrNL2s5eDtQY=";
   };
 
-  vendorHash = "sha256-hW+IrzS5+DublQUIIcecL08xoauTjba9qnAtpzNeDXw=";
+  vendorHash = "sha256-oOZeBCHpAasi9K77xA+8HxZErGWKwb4OaWzWhHagtQE=";
 
   doCheck = false;
 

From f5a9262cfdde377014915514bdd3e77b0d1925f8 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 28 Oct 2025 20:13:11 +0000
Subject: [PATCH 3661/6226] privatebin: 2.0.1 -> 2.0.2

Changelog: https://github.com/PrivateBin/PrivateBin/releases/tag/2.0.2
Diff: https://github.com/PrivateBin/PrivateBin/compare/2.0.1...2.0.2
---
 pkgs/by-name/pr/privatebin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/privatebin/package.nix b/pkgs/by-name/pr/privatebin/package.nix
index 50f973613382..984d544045ca 100644
--- a/pkgs/by-name/pr/privatebin/package.nix
+++ b/pkgs/by-name/pr/privatebin/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "privatebin";
-  version = "2.0.1";
+  version = "2.0.2";
 
   src = fetchFromGitHub {
     owner = "PrivateBin";
     repo = "PrivateBin";
     tag = finalAttrs.version;
-    hash = "sha256-FspB10F/gz4d5T4TEYyifosgFLvnSMpVsr2t4NvFTqU=";
+    hash = "sha256-ErTB+qUz0CQf+YZZoFH2/ceAHFfgIbKXst6dTTM1pKQ=";
   };
 
   installPhase = ''

From 4100a7d7170c33741390a45ad6e07aa09a980cbb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 27 Oct 2025 12:26:06 +0100
Subject: [PATCH 3662/6226] python313Packages.iamdata: 0.1.202510251 ->
 0.1.202510271

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202510251...v0.1.202510271

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202510271
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index f6d8a1f5da7d..3bd67378a463 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202510251";
+  version = "0.1.202510271";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-n+P6I36zHR19ruqsycMpeGlSjwK3mmkPiaifEB1vW+s=";
+    hash = "sha256-faE++9B8HRZ6pDDELj5fniy0x0NAumRYyEC+TEQs5i0=";
   };
 
   build-system = [ hatchling ];

From 33ff017dd292495252cf9893a28694777c7e0d4c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 21:44:42 +0100
Subject: [PATCH 3663/6226] python313Packages.iamdata: 0.1.202510271 ->
 0.1.202510281

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202510271...v0.1.202510281

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202510281
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 3bd67378a463..a9e70347f212 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202510271";
+  version = "0.1.202510281";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-faE++9B8HRZ6pDDELj5fniy0x0NAumRYyEC+TEQs5i0=";
+    hash = "sha256-bsDHP92oyp4vNfnocvOm8aD4xcX7ldDCKJ7kLW4B6r0=";
   };
 
   build-system = [ hatchling ];

From 548d30974a54d53a1eeb518803a8ed253866e3df Mon Sep 17 00:00:00 2001
From: Kiskae <Kiskae@users.noreply.github.com>
Date: Tue, 28 Oct 2025 21:51:37 +0100
Subject: [PATCH 3664/6226] linuxPackages.nvidiaPackages.vulkan_beta: 580.94.03
 -> 580.94.06

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 7c58fb9fee8a..8a78d509db6a 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -101,11 +101,11 @@ rec {
   # Vulkan developer beta driver
   # See here for more information: https://developer.nvidia.com/vulkan-driver
   vulkan_beta = generic rec {
-    version = "580.94.03";
+    version = "580.94.06";
     persistencedVersion = "580.95.05";
     settingsVersion = "580.95.05";
-    sha256_64bit = "sha256-RYU50xfIyrvk57o7/SIsVr34nkLaMm5WZPXQfWTreIE=";
-    openSha256 = "sha256-PEHr6heOBP+0JjcmUpDv6JlT0aAvzoWijsEsm/DD3rs=";
+    sha256_64bit = "sha256-UtOthZ5h/UN5dMSrO2MFwWktLRiW6LE5VR1yg04D/bE=";
+    openSha256 = "sha256-mti+bJ1EyZnjAxdJtJQuyLWNKs7R+NJiBy1y+c2cqBQ=";
     settingsSha256 = "sha256-F2wmUEaRrpR1Vz0TQSwVK4Fv13f3J9NJLtBe4UP2f14=";
     persistencedSha256 = "sha256-QCwxXQfG/Pa7jSTBB0xD3lsIofcerAWWAHKvWjWGQtg=";
     url = "https://developer.nvidia.com/downloads/vulkan-beta-${lib.concatStrings (lib.splitVersion version)}-linux";

From ad03d21cc9bfc60741ff1c95615dd348267a2e89 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 17:53:04 -0300
Subject: [PATCH 3665/6226] cosmic-applets: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-applets/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-applets/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix
index 0a781a1d627e..a772dbdb9f47 100644
--- a/pkgs/by-name/co/cosmic-applets/package.nix
+++ b/pkgs/by-name/co/cosmic-applets/package.nix
@@ -20,17 +20,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-applets";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-applets";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-KNlWOQjISvuZdaf6pXUVh6pyUm1sjmI77iAizEXdE8s=";
+    hash = "sha256-hBqsFiH2zKwGN9tWEf4iDoVcwssj7YN+7+2ooVNKszs=";
   };
 
-  cargoHash = "sha256-Apae3sJ27yVRl7Lf+SGsxM0zMlSFkdp6Q3BQoY5u3r4=";
+  cargoHash = "sha256-HLbcTDwS5IvolEMb0bZr4CPjtEjZI8G+AggXifIDiKM=";
 
   nativeBuildInputs = [
     just

From 568495bec2cbcb57bb2805983aa941997a31736d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 25 Oct 2025 11:59:38 +0200
Subject: [PATCH 3666/6226] all-packages.nix: remove unused headers

---
 pkgs/top-level/all-packages.nix | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bd88d03adfb..bf6fce27ce61 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -8865,8 +8865,6 @@ with pkgs;
   );
   agda = agdaPackages.agda;
 
-  ### DEVELOPMENT / LIBRARIES / BASH
-
   ### DEVELOPMENT / LIBRARIES / JAVA
 
   saxonb = saxonb_8_8;
@@ -9867,8 +9865,6 @@ with pkgs;
 
   zabbix = zabbix60;
 
-  ### SERVERS / GEOSPATIAL
-
   ### OS-SPECIFIC
 
   alfred = callPackage ../os-specific/linux/batman-adv/alfred.nix { };
@@ -13614,10 +13610,6 @@ with pkgs;
     libxc = pkgs.libxc_7;
   };
 
-  ### SCIENCE/GEOMETRY
-
-  ### SCIENCE/BENCHMARK
-
   ### SCIENCE/BIOLOGY
 
   cd-hit = callPackage ../applications/science/biology/cd-hit {
@@ -13764,8 +13756,6 @@ with pkgs;
     }
   );
 
-  ### SCIENCE/MEDICINE
-
   ### SCIENCE/PHYSICS
 
   mcfm = callPackage ../applications/science/physics/MCFM {
@@ -13778,8 +13768,6 @@ with pkgs;
 
   xflr5 = libsForQt5.callPackage ../applications/science/physics/xflr5 { };
 
-  ### SCIENCE/PROGRAMMING
-
   ### SCIENCE/LOGIC
 
   abella = callPackage ../applications/science/logic/abella {
@@ -13918,8 +13906,6 @@ with pkgs;
     inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml;
   };
 
-  ### SCIENCE / ENGINEERING
-
   ### SCIENCE / ELECTRONICS
 
   simulide_0_4_15 = callPackage ../by-name/si/simulide/package.nix { versionNum = "0.4.15"; };

From 4949737a386f5d88d3525807384f87a5e3a26772 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 28 Oct 2025 15:21:49 +0100
Subject: [PATCH 3667/6226] systems/examples: remove x86_64-unknown-redox

relibc itself has been removed in 2024 already.
---
 lib/systems/examples.nix | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix
index 47c3cf0c9558..d05c05910523 100644
--- a/lib/systems/examples.nix
+++ b/lib/systems/examples.nix
@@ -302,15 +302,6 @@ rec {
     libc = "newlib";
   };
 
-  #
-  # Redox
-  #
-
-  x86_64-unknown-redox = {
-    config = "x86_64-unknown-redox";
-    libc = "relibc";
-  };
-
   #
   # Darwin
   #

From 1d4ca026bcc5f191527c21ff90e3fcf913fe70b4 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 28 Oct 2025 15:22:36 +0100
Subject: [PATCH 3668/6226] uclibc: bring back alias

This was removed recently when cleaning up aliases, but it breaks
`pkgsCross.ben_nanonote`.
---
 pkgs/top-level/aliases.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b4128ecc1422..22a2b2447996 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -254,6 +254,7 @@ mapAliases {
   elasticsearch7Plugins = elasticsearchPlugins; # preserve, reason: until v8
   fetchFromGithub = throw "You meant fetchFromGitHub, with a capital H"; # preserve, reason: common typo
   fuse2fs = if stdenv.hostPlatform.isLinux then e2fsprogs.fuse2fs else null; # Added 2022-03-27 preserve, reason: convenience, arch has a package named fuse2fs too.
+  uclibc = uclibc-ng; # preserve, because uclibc-ng can't be used in config string
   wlroots = wlroots_0_19; # preserve, reason: wlroots is unstable, we must keep depending on 'wlroots_0_*', convert to package after a stable(1.x) release
   wormhole-rs = magic-wormhole-rs; # Added 2022-05-30. preserve, reason: Arch package name, main binary name
 
@@ -1507,7 +1508,6 @@ mapAliases {
   uade123 = throw "'uade123' has been renamed to/replaced by 'uade'"; # Converted to throw 2025-10-27
   uae = throw "'uae' has been removed due to lack of upstream maintenance. Consider using 'fsuae' instead."; # Added 2025-06-11
   ubuntu_font_family = throw "'ubuntu_font_family' has been renamed to/replaced by 'ubuntu-classic'"; # Converted to throw 2025-10-27
-  uclibc = throw "'uclibc' has been renamed to/replaced by 'uclibc-ng'"; # Converted to throw 2025-10-27
   unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17
   unifi-poller = throw "'unifi-poller' has been renamed to/replaced by 'unpoller'"; # Converted to throw 2025-10-27
   unzoo = throw "'unzoo' has been removed since it is unmaintained upstream and doesn't compile with newer versions of GCC anymore"; # Removed 2025-05-24

From 2494e3664feeb1ff80dcc50e2ebb5a31e5a95609 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Thu, 17 Oct 2024 19:08:19 +0300
Subject: [PATCH 3669/6226] splice.nix: make `pkgs` `splicedPackages` when
 required
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This will make `pkgs` used in `callPackage`, and `pkgsCross.X.pkgs` have
packages with `__spliced`.

https://www.github.com/NixOS/nixpkgs/blob/3029741718f4c765fbc5ebf76bea3d6c8ff15fe5/pkgs/development/interpreters/python/passthrufun.nix#L37

https://www.github.com/NixOS/nixpkgs/blob/d2bd9a39dec88eddd5c192abee69939e67f43d12/pkgs/top-level/python-packages.nix#L10720

```
nix-repl>
pkgsCross.aarch64-multiplatform.python3Packages.protobuf4.protobuf.__spliced
error:
       … while evaluating the attribute
'aarch64-multiplatform.python3Packages.protobuf4.protobuf.__spliced'
         at
/home/artturin/nixgits/my-nixpkgs/.worktree/1/pkgs/development/python-modules/protobuf/4.nix:119:13:
          118|   passthru = {
          119|     inherit protobuf;
             |             ^
          120|   };

       error: attribute '__spliced' missing
       at «string»:1:1:
            1|
pkgsCross.aarch64-multiplatform.python3Packages.protobuf4.protobuf.__spliced
             | ^
```

to

```
nix-repl>
pkgsCross.aarch64-multiplatform.python3Packages.protobuf4.protobuf.__spliced
{
  buildBuild = «derivation
/nix/store/s7da5mfvx4h1n86j78knaj9cprglxqz6-protobuf-25.4.drv»;
  buildHost = «derivation
/nix/store/s7da5mfvx4h1n86j78knaj9cprglxqz6-protobuf-25.4.drv»;
  buildTarget = «repeated»;
  hostHost = «derivation
/nix/store/mszvybzs4zxh43awyrjnybsfcb265n9r-protobuf-aarch64-unknown-linux-gnu-25.4.drv»;
  hostTarget = «repeated»;
}
```

Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
---
 pkgs/development/compilers/gcc/all.nix | 4 +++-
 pkgs/os-specific/windows/default.nix   | 4 ++--
 pkgs/top-level/all-packages.nix        | 2 +-
 pkgs/top-level/splice.nix              | 2 ++
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/gcc/all.nix b/pkgs/development/compilers/gcc/all.nix
index 1aba286411bd..8deba6c6f07c 100644
--- a/pkgs/development/compilers/gcc/all.nix
+++ b/pkgs/development/compilers/gcc/all.nix
@@ -2,6 +2,8 @@
   lib,
   stdenv,
   pkgs,
+  overrideCC,
+  buildPackages,
   targetPackages,
   callPackage,
   isl_0_20,
@@ -62,7 +64,7 @@ let
                 )
                 && stdenv.cc.isGNU
               then
-                pkgs."gcc${majorVersion}Stdenv"
+                overrideCC stdenv buildPackages."gcc${majorVersion}"
               else
                 stdenv;
           }
diff --git a/pkgs/os-specific/windows/default.nix b/pkgs/os-specific/windows/default.nix
index 137a948960b7..e0f7e5b5f79e 100644
--- a/pkgs/os-specific/windows/default.nix
+++ b/pkgs/os-specific/windows/default.nix
@@ -27,11 +27,11 @@ lib.makeScope newScope (
       else
         buildPackages.gccWithoutTargetLibc.override (old: {
           bintools = old.bintools.override {
-            libc = pkgs.libc;
+            libc = pkgs.pkgsHostTarget.libc;
             noLibc = pkgs.libc == null;
             nativeLibc = false;
           };
-          libc = pkgs.libc;
+          libc = pkgs.pkgsHostTarget.libc;
           noLibc = pkgs.libc == null;
           nativeLibc = false;
         })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bf6fce27ce61..7cfde09d7f0e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6320,7 +6320,7 @@ with pkgs;
       null;
   bintoolsNoLibc = wrapBintoolsWith {
     bintools = bintools-unwrapped;
-    libc = targetPackages.preLibcHeaders;
+    libc = targetPackages.preLibcHeaders or preLibcHeaders;
   };
   bintools = wrapBintoolsWith {
     bintools = bintools-unwrapped;
diff --git a/pkgs/top-level/splice.nix b/pkgs/top-level/splice.nix
index fe4566bb175e..afbf3b12991a 100644
--- a/pkgs/top-level/splice.nix
+++ b/pkgs/top-level/splice.nix
@@ -173,6 +173,8 @@ in
 
   newScope = extra: lib.callPackageWith (pkgsForCall // extra);
 
+  pkgs = if actuallySplice then splicedPackages // { recurseForDerivations = false; } else pkgs;
+
   # prefill 2 fields of the function for convenience
   makeScopeWithSplicing = lib.makeScopeWithSplicing splicePackages pkgs.newScope;
   makeScopeWithSplicing' = lib.makeScopeWithSplicing' {

From 1f74d7a2bd47813ccae4ebc1f36176986d9a86d4 Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Fri, 1 Nov 2024 20:21:38 +0200
Subject: [PATCH 3670/6226] treewide: remove `= __splicedPackages`

Now that `pkgs` is `__splicedPackages` on cross we can remove these
variables I set.

Assignments like `patchutils = pkgs.patchutils_0_3_3;` in
`all-packages.nix` cannot be removed because the `pkgs`
in `patchutils = pkgs.patchutils_0_3_3;` in `all-packages.nix` is coming from
this `pkgs:` https://www.github.com/NixOS/nixpkgs/blob/b6e486730fc875ec79a3dea0f1f46eaf9f6ffa9d/pkgs/top-level/all-packages.nix#L9
instead of the `pkgs` in `with pkgs;`
---
 pkgs/development/beam-modules/default.nix      |  3 +--
 pkgs/development/interpreters/perl/default.nix |  6 +-----
 pkgs/top-level/all-packages.nix                | 11 ++---------
 3 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/beam-modules/default.nix b/pkgs/development/beam-modules/default.nix
index 15ddc31e9347..b2c6e263134a 100644
--- a/pkgs/development/beam-modules/default.nix
+++ b/pkgs/development/beam-modules/default.nix
@@ -1,11 +1,10 @@
 {
   lib,
-  __splicedPackages,
+  pkgs,
   erlang,
 }:
 
 let
-  pkgs = __splicedPackages;
   inherit (lib) makeExtensible;
 
   # FIXME: add support for overrideScope
diff --git a/pkgs/development/interpreters/perl/default.nix b/pkgs/development/interpreters/perl/default.nix
index b0f3480c01ac..69d02530a90f 100644
--- a/pkgs/development/interpreters/perl/default.nix
+++ b/pkgs/development/interpreters/perl/default.nix
@@ -30,11 +30,7 @@ let
             }:
             let
               perlPackagesFun = callPackage ../../../top-level/perl-packages.nix {
-                # allow 'perlPackages.override { pkgs = pkgs // { imagemagick = imagemagickBig; }; }' like in python3Packages
-                # most perl packages aren't called with callPackage so it's not possible to override their arguments individually
-                # the conditional is because the // above won't be applied to __splicedPackages and hopefully no one is doing that when cross-compiling
-                pkgs = if stdenv.buildPlatform != stdenv.hostPlatform then pkgs.__splicedPackages else pkgs;
-                inherit stdenv;
+                inherit stdenv pkgs;
                 perl = self;
               };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7cfde09d7f0e..0625c500cb1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4089,11 +4089,7 @@ with pkgs;
 
   tldr-hs = haskellPackages.tldr;
 
-  tmuxPlugins = recurseIntoAttrs (
-    callPackage ../misc/tmux-plugins {
-      pkgs = pkgs.__splicedPackages;
-    }
-  );
+  tmuxPlugins = recurseIntoAttrs (callPackage ../misc/tmux-plugins { });
 
   tpm2-totp-with-plymouth = tpm2-totp.override {
     withPlymouth = true;
@@ -4311,9 +4307,7 @@ with pkgs;
   yarn-berry_4 = yarn-berry.override { berryVersion = 4; };
   yarn-berry_3 = yarn-berry.override { berryVersion = 3; };
 
-  yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea {
-    pkgs = pkgs.__splicedPackages;
-  };
+  yarn2nix-moretea = callPackage ../development/tools/yarn2nix-moretea { };
 
   inherit (yarn2nix-moretea)
     yarn2nix
@@ -5015,7 +5009,6 @@ with pkgs;
   idrisPackages = recurseIntoAttrs (
     callPackage ../development/idris-modules {
       idris-no-deps = haskellPackages.idris;
-      pkgs = pkgs.__splicedPackages;
     }
   );
 

From 586ab09c1268c78ae940530b20068d80e150f764 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 21:54:44 +0100
Subject: [PATCH 3671/6226] python313Packages.elasticsearch8: remove disabled

Removed dependency on pythonOlder for version 3.7.
---
 pkgs/development/python-modules/elasticsearch8/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/elasticsearch8/default.nix b/pkgs/development/python-modules/elasticsearch8/default.nix
index d3564f9665b2..0c2f7dc3a65a 100644
--- a/pkgs/development/python-modules/elasticsearch8/default.nix
+++ b/pkgs/development/python-modules/elasticsearch8/default.nix
@@ -7,7 +7,6 @@
   hatchling,
   orjson,
   python-dateutil,
-  pythonOlder,
   requests,
   typing-extensions,
 }:
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "8.19.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-lDfI5RI8JgtZdmGDv9kVIGdyVChJtpf3inlEbsiQqA4=";

From 721e552b37bb5eabb1a9257c48c5713f441259e6 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 17:55:21 -0300
Subject: [PATCH 3672/6226] cosmic-applibrary: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-applibrary/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-applibrary/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix
index bedc140cee5f..db0b6eb60f54 100644
--- a/pkgs/by-name/co/cosmic-applibrary/package.nix
+++ b/pkgs/by-name/co/cosmic-applibrary/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-applibrary";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-applibrary";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-YfcLcM67RICTSFhMCyAcx1RPwnpN107Kov6BM0jxGPM=";
+    hash = "sha256-KmLRXQMpJ7kO5gTguLgtX5rztDyEqyRhaqlWzlfDth4=";
   };
 
-  cargoHash = "sha256-s2YiB4U/pVAul2YC5/6bCVwKd18odoTAua4YhUJDN3U=";
+  cargoHash = "sha256-CX1/6fXL63P1J6yjvFKd91WqSf4+mf+GOtX1O9fHfgg=";
 
   nativeBuildInputs = [
     just

From c2f96ae4556faf338455ea11a8c3759dc36927e6 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 17:56:28 -0300
Subject: [PATCH 3673/6226] cosmic-bg: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-bg/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-bg/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix
index 4e2eb37ab414..142c5f88f86f 100644
--- a/pkgs/by-name/co/cosmic-bg/package.nix
+++ b/pkgs/by-name/co/cosmic-bg/package.nix
@@ -13,7 +13,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-bg";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From e9308ebee56e5e302007ac85116cde353f6cd622 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 17:58:07 -0300
Subject: [PATCH 3674/6226] cosmic-comp: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-comp/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-comp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix
index c79d3c036dce..e16419039aaa 100644
--- a/pkgs/by-name/co/cosmic-comp/package.nix
+++ b/pkgs/by-name/co/cosmic-comp/package.nix
@@ -20,17 +20,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-comp";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-comp";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-wmXkbyczPFBw6264Om7/k8jnhPpa43Y18TL0qMn18mI=";
+    hash = "sha256-vdpKxXkC6Z8ySa21jZ5zF2aqwLY7dt2FpQbfbZkgu+c=";
   };
 
-  cargoHash = "sha256-hqw5nGKP0nw00qQoHyrcryVg2Kkdnx6yyJIERbh3DFE=";
+  cargoHash = "sha256-Gk2vXmVMcDWg3VnI0176eKF65tAfPwVZ74oQtD0UBO8=";
 
   separateDebugInfo = true;
 

From 84586361f851810da4203e511d561482fd485c1c Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 17:59:47 -0300
Subject: [PATCH 3675/6226] cosmic-edit: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-edit/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-edit/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix
index f35827174cc0..4a9a8d9c86f3 100644
--- a/pkgs/by-name/co/cosmic-edit/package.nix
+++ b/pkgs/by-name/co/cosmic-edit/package.nix
@@ -16,17 +16,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-edit";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-edit";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-hmPYdKU+QgksqD2CCutDfm6lVKoplTOhle2s9RVM5Gs=";
+    hash = "sha256-xlw4lLfg5d9lyl3+efv6GBLtBvuFex4Zbnos2HbKp20=";
   };
 
-  cargoHash = "sha256-s7vJqRzx2hg6SZ+uVOSoy+xHg6nEls6GbVfi8zT2QAw=";
+  cargoHash = "sha256-Ot69WdCvdT8xg3/LPMb8C5Rdq04Mvmr5VLS+adnvuvY=";
 
   postPatch = ''
     substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"

From 0ebd6d4f901dca013a600965476077bc96630a58 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 15 Oct 2025 18:15:35 +0000
Subject: [PATCH 3676/6226] python312Packages.plotly: 6.3.0 -> 6.3.1

---
 pkgs/development/python-modules/plotly/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index ed023d9f8389..cd89a0df1ae9 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -38,14 +38,14 @@
 
 buildPythonPackage rec {
   pname = "plotly";
-  version = "6.3.0";
+  version = "6.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "plotly";
     repo = "plotly.py";
     tag = "v${version}";
-    hash = "sha256-s+kWJy/dOqlNqRD/Ytxy/SSRsFJvp13jSvPMd0LQliQ=";
+    hash = "sha256-zwJTesrtLreu7To795wJmowgZ3c4d0mHUaLt3C9Fqd8=";
   };
 
   postPatch = ''
@@ -102,6 +102,8 @@ buildPythonPackage rec {
     "test_lazy_imports"
     # [0.0, 'rgb(252, 255, 164)'] != [0.0, '#fcffa4']
     "test_acceptance_named"
+    # AssertionError: assert '' == 'browser'
+    "test_default_renderer"
   ];
 
   __darwinAllowLocalNetworking = true;

From 983efd8ab24319795ae718d25915a3d24ee44323 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:01:15 -0300
Subject: [PATCH 3677/6226] cosmic-files: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-files/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-files/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix
index da6830fa032f..13252ffdf9de 100644
--- a/pkgs/by-name/co/cosmic-files/package.nix
+++ b/pkgs/by-name/co/cosmic-files/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-files";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-files";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-F0h/OYRuKJw9/kQ1WWnD6AoiGLF+09IxARe45AAKV7c=";
+    hash = "sha256-DbxA2lAPVNdel02NeuACucCyGcsNjT0MxJMzeGF3JzY=";
   };
 
-  cargoHash = "sha256-GnYEZgatMlTu0tK7zsiCNSAwSwnTmZhyqotYBIVCHuc=";
+  cargoHash = "sha256-TovOJVe16VJZ9Ul2JQc/No8f0WzaYfWI1LmzhHxdKsM=";
 
   nativeBuildInputs = [
     just

From 1762eb1490c303f728c634c89ab139039fcda5af Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:02:57 -0300
Subject: [PATCH 3678/6226] cosmic-greeter: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-greeter/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-greeter/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix
index 23d6a5d140f5..749bfe2a1164 100644
--- a/pkgs/by-name/co/cosmic-greeter/package.nix
+++ b/pkgs/by-name/co/cosmic-greeter/package.nix
@@ -19,14 +19,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-greeter";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-greeter";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-MI0iqDnBtN3gkRo8u9eA3z89aU8XF1szxTG07zOtaFI=";
+    hash = "sha256-kp5DSr/RxWhv35VKAc8xSAprM1Hbo84/oB8h0XBSmTE=";
   };
 
   cargoHash = "sha256-4yRBgFrH4RBpuvChTED+ynx+PyFumoT2Z+R1gXxF4Xc=";

From 6bc36657f98734fac95c85fff2672fae44c00ff7 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:03:23 -0300
Subject: [PATCH 3679/6226] cosmic-icons: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-icons/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-icons/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix
index 68ca78cc3099..a2cb92b79d64 100644
--- a/pkgs/by-name/co/cosmic-icons/package.nix
+++ b/pkgs/by-name/co/cosmic-icons/package.nix
@@ -9,7 +9,7 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cosmic-icons";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From f1e16cd8c00d22ee579be5514ce96cd9fedfbce9 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:04:04 -0300
Subject: [PATCH 3680/6226] cosmic-idle: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-idle/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-idle/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix
index 90d718213f79..b8b755639230 100644
--- a/pkgs/by-name/co/cosmic-idle/package.nix
+++ b/pkgs/by-name/co/cosmic-idle/package.nix
@@ -16,7 +16,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-idle";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From f0184ea75b6bc820f3bb40074aaaaa0270b322a2 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:06:18 -0300
Subject: [PATCH 3681/6226] cosmic-initial-setup: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-initial-setup/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-initial-setup/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-initial-setup/package.nix b/pkgs/by-name/co/cosmic-initial-setup/package.nix
index 50d475808d86..a08c70737f5a 100644
--- a/pkgs/by-name/co/cosmic-initial-setup/package.nix
+++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix
@@ -14,7 +14,7 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-initial-setup";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From d2b4a4d4f5c75200419222fd4a87a71b1384c1fe Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:07:41 -0300
Subject: [PATCH 3682/6226] cosmic-launcher: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-launcher/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-launcher/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix
index 9742a153e18a..3da71420e66c 100644
--- a/pkgs/by-name/co/cosmic-launcher/package.nix
+++ b/pkgs/by-name/co/cosmic-launcher/package.nix
@@ -11,17 +11,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-launcher";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-launcher";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-QqJ59e0UxnNjbsIjsoeZaUhc1WfVpQtorzDVewJNpIo=";
+    hash = "sha256-xhK80oKZFFvz+dPKBm1hcVXk9G7GofqEmwAdyzhOJqI=";
   };
 
-  cargoHash = "sha256-bW6XtdK+AZiuwfzBUWmUi00RJXeuzgzGKoL35lyDBfM=";
+  cargoHash = "sha256-2kkKPU4iEsInLwJyEyJ15/T1pVfDsKD69DISGilNWws=";
 
   nativeBuildInputs = [
     just

From 58dfcab9139428bfb8fef01df9831af91bdef264 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:09:07 -0300
Subject: [PATCH 3683/6226] cosmic-notifications: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-notifications/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-notifications/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix
index 140ce59e4f5c..8f6e2bf57bc9 100644
--- a/pkgs/by-name/co/cosmic-notifications/package.nix
+++ b/pkgs/by-name/co/cosmic-notifications/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-notifications";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From f63ef230e59b6c8fd0a1b56c530d9e88495047d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 28 Oct 2025 22:09:36 +0100
Subject: [PATCH 3684/6226] nextcloud-client: 4.0.0 -> 4.0.1

Diff: https://github.com/nextcloud-releases/desktop/compare/v4.0.0...v4.0.1

Changelog: https://github.com/nextcloud/desktop/releases/tag/v4.0.1
---
 pkgs/by-name/ne/nextcloud-client/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix
index f55675dff4ed..bae7b6f8ec51 100644
--- a/pkgs/by-name/ne/nextcloud-client/package.nix
+++ b/pkgs/by-name/ne/nextcloud-client/package.nix
@@ -23,7 +23,7 @@
 
 stdenv.mkDerivation rec {
   pname = "nextcloud-client";
-  version = "4.0.0";
+  version = "4.0.1";
 
   outputs = [
     "out"
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     owner = "nextcloud-releases";
     repo = "desktop";
     tag = "v${version}";
-    hash = "sha256-IXX1PdMR3ptgH7AufnGKBeKftZgai7KGvYW+OCkM8jo=";
+    hash = "sha256-5E4VB+wZQfB8zkFtNrzpCv47iCpk6XS4rCkDKoU0JhM=";
   };
 
   patches = [

From 2df20ed58a3430b0329bb8bf6c3b1382153a6393 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:10:36 -0300
Subject: [PATCH 3685/6226] cosmic-osd: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-osd/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-osd/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix
index 12e1bc5eef1f..cea55d37be18 100644
--- a/pkgs/by-name/co/cosmic-osd/package.nix
+++ b/pkgs/by-name/co/cosmic-osd/package.nix
@@ -13,7 +13,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-osd";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 7c4198ad3fcbc52b6fa2c6b0da837c10832f4a60 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 21:11:48 +0000
Subject: [PATCH 3686/6226] summon: 0.10.6 -> 0.10.7

---
 pkgs/by-name/su/summon/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/su/summon/package.nix b/pkgs/by-name/su/summon/package.nix
index 401ed6a52aeb..53bcf829711e 100644
--- a/pkgs/by-name/su/summon/package.nix
+++ b/pkgs/by-name/su/summon/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "summon";
-  version = "0.10.6";
+  version = "0.10.7";
 
   src = fetchFromGitHub {
     owner = "cyberark";
     repo = "summon";
     rev = "v${version}";
-    hash = "sha256-Z98NgC9abNOHscwtV14gbI8SL8ODMbthMZMjhKz7KEk=";
+    hash = "sha256-BUT8pCLfhss3OgB3JN2lEZTXzyT607ABn6/2g01jxbM=";
   };
 
-  vendorHash = "sha256-QOCPATTs2vvww+ekt6HFg2IUA/NFmE8+2WkMby2f/OE=";
+  vendorHash = "sha256-ZT3lVL8qoonmeWsmCzjMbOsAf2NvpheC6ThDzn4izkU=";
 
   subPackages = [ "cmd" ];
 

From df81876944b88bdb8a700ff853e5c93bc6343b01 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:12:17 -0300
Subject: [PATCH 3687/6226] cosmic-panel: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-panel/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-panel/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix
index b7945a2053bf..55b27b92e7d1 100644
--- a/pkgs/by-name/co/cosmic-panel/package.nix
+++ b/pkgs/by-name/co/cosmic-panel/package.nix
@@ -11,7 +11,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-panel";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 3face2b83627df45918f64d441fcb1c089b5461f Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:13:52 -0300
Subject: [PATCH 3688/6226] cosmic-player: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-player/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-player/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix
index 7992e56ecb98..0171b31bb22c 100644
--- a/pkgs/by-name/co/cosmic-player/package.nix
+++ b/pkgs/by-name/co/cosmic-player/package.nix
@@ -18,14 +18,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-player";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-player";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-e2BBXfPUl9L/cyPAEwkoS0Z3JrW5/K7cpreP5jcW/c4=";
+    hash = "sha256-+LMXtiUxal4xSmtG9vHDSZxwzyjOhmS6ZZ7HppB7p7w=";
   };
 
   cargoHash = "sha256-fnX5BkzRAetKxHZ9XyWdmG6TSxFqGJsmg16zlpYG9Ag=";

From a422a1a814938d6698872c5586d6032f6c198398 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:14:42 -0300
Subject: [PATCH 3689/6226] cosmic-randr: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-randr/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-randr/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix
index 1ba28e028605..518e295d8b9e 100644
--- a/pkgs/by-name/co/cosmic-randr/package.nix
+++ b/pkgs/by-name/co/cosmic-randr/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-randr";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From ecf0b21aafb2c625ed45a1da19795ba35c557b0c Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:16:03 -0300
Subject: [PATCH 3690/6226] cosmic-screenshot: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-screenshot/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-screenshot/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix
index 236afa6d1016..baa1579bfaf3 100644
--- a/pkgs/by-name/co/cosmic-screenshot/package.nix
+++ b/pkgs/by-name/co/cosmic-screenshot/package.nix
@@ -10,7 +10,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-screenshot";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 758c80d0490934b6406a7f5b771835d4c28c507c Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:17:08 -0300
Subject: [PATCH 3691/6226] cosmic-session: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-session/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-session/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix
index 19d2aaaf1b65..aad3864e1687 100644
--- a/pkgs/by-name/co/cosmic-session/package.nix
+++ b/pkgs/by-name/co/cosmic-session/package.nix
@@ -11,7 +11,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-session";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 844d4213791f32d921e03dd6fd36566afd2e15c4 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:19:03 -0300
Subject: [PATCH 3692/6226] cosmic-settings: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-settings/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-settings/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix
index f256e7066a89..4a23b3c29c3e 100644
--- a/pkgs/by-name/co/cosmic-settings/package.nix
+++ b/pkgs/by-name/co/cosmic-settings/package.nix
@@ -27,14 +27,14 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-vCNiMNHRzdntys8XHwOS8g72EXncGJVH6U7b6AW4BUQ=";
+    hash = "sha256-n7+8XKDCTyjpJff/0o5VY5NbcQe9i+pn3Mgf8IV12m0=";
   };
 
   cargoHash = "sha256-mMfKY+ouszbN2rEf6zvv1Sc1FEZ/ZVuQ6RXGMBFDwIE=";

From f229977b4cee01c8fa5a2375804e750da919329e Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:21:30 -0300
Subject: [PATCH 3693/6226] cosmic-settings-daemon: 1.0.0-beta.3 ->
 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-settings-daemon/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-settings-daemon/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
index b5f86d8f21e9..2f2d5b28bcdd 100644
--- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix
+++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
@@ -15,14 +15,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings-daemon";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings-daemon";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-CtHy8qy7CatbErNZKu1pLFC9aUWLj0r87+lvRB16oSE=";
+    hash = "sha256-WLZJx8FwseCD7hHU60+HekNBxUE6B/6HRhP8oqokTNI=";
   };
 
   postPatch = ''

From 6798bcc5967689884ef5194c76e63c0faf244938 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:23:15 -0300
Subject: [PATCH 3694/6226] cosmic-store: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-store/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-store/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix
index d13d0abd7ef3..b77e55c71c65 100644
--- a/pkgs/by-name/co/cosmic-store/package.nix
+++ b/pkgs/by-name/co/cosmic-store/package.nix
@@ -15,14 +15,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-store";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-store";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-G335fS65CApkuUsqRcDgT2ZEBWfiPQ1R84tLZ62Cyig=";
+    hash = "sha256-D/P6abNqH++GWBfqZYqGjH3YV+jyyBo/8R3veLm1NRo=";
   };
 
   cargoHash = "sha256-nJLowAuWvj5JfmPyExQyfCJ9pqNJ0OdzPPku9z7RDWc=";

From b03d42e494c09be78f5c25e9fc4f58def46b929e Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:25:44 -0300
Subject: [PATCH 3695/6226] cosmic-term: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-term/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-term/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix
index 024f933d9671..fa0a00a1f319 100644
--- a/pkgs/by-name/co/cosmic-term/package.nix
+++ b/pkgs/by-name/co/cosmic-term/package.nix
@@ -15,17 +15,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-term";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-term";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-BdWyKRoBZybRrtyBfJlRJxVPIIJWY3F8Ei8UgMfVPJo=";
+    hash = "sha256-U1/6IgnqNN9ccnh0IFuDkkurFN0JxmXJltns6Vv6/9A=";
   };
 
-  cargoHash = "sha256-qXAgmVsjhr3aqEQRGjsK2JM8YwpkRK5Y+XYJRSZ8Swc=";
+  cargoHash = "sha256-oiZjX53CQA53mMNfmmnyzWGAiZRA+4BxOxEvbEFd8q8=";
 
   nativeBuildInputs = [
     just

From 4d9617261629c742697d79fae42871a514c799cb Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 28 Oct 2025 21:24:22 +0000
Subject: [PATCH 3696/6226] cairo: fix the eval on `mingwW64`
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

In https://github.com/NixOS/nixpkgs/issues/456516
user reported eval fails as:

    $ nix build --no-link -f. pkgsCross.mingwW64.cairo
    error:
       … while calling the 'derivationStrict' builtin
         at «nix-internal»/derivation-internal.nix:37:12:
           36|
           37|   strict = derivationStrict drvAttrs;
             |            ^
           38|

       … while evaluating derivation 'cairo-x86_64-w64-mingw32-1.18.4'
         whose name attribute is located at pkgs/stdenv/generic/make-derivation.nix:544:13

       … while evaluating attribute 'mesonFlags' of derivation 'cairo-x86_64-w64-mingw32-1.18.4'
         at pkgs/stdenv/generic/make-derivation.nix:824:11:
          823|           cmakeFlags = makeCMakeFlags attrs;
          824|           mesonFlags = makeMesonFlags attrs;
             |           ^
          825|         }

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: Unknown value for ipc_rmid_deferred_release

The change will not fix `caori` build on `windows`
but at least will report unsupported dependencies.
---
 pkgs/by-name/ca/cairo/package.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/cairo/package.nix b/pkgs/by-name/ca/cairo/package.nix
index 727afc713046..fe6a3cb29f06 100644
--- a/pkgs/by-name/ca/cairo/package.nix
+++ b/pkgs/by-name/ca/cairo/package.nix
@@ -100,8 +100,10 @@ stdenv.mkDerivation (
             linux = "true";
             freebsd = "true";
             netbsd = "false";
+            windows = "false";
           }
-          .${stdenv.hostPlatform.parsed.kernel.name} or (throw "Unknown value for ipc_rmid_deferred_release")
+          .${stdenv.hostPlatform.parsed.kernel.name}
+            or (throw "Unknown value for ipc_rmid_deferred_release on ${stdenv.hostPlatform.parsed.kernel.name}")
         }
       ''}"
     ];

From a051aecbbbc184073fce57e67ff37758116c21c7 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:27:16 -0300
Subject: [PATCH 3697/6226] cosmic-wallpapers: 1.0.0-beta.3 -> 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-wallpapers/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-wallpapers/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix
index 93523afc93ef..8e360bc330f9 100644
--- a/pkgs/by-name/co/cosmic-wallpapers/package.nix
+++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix
@@ -7,7 +7,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cosmic-wallpapers";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 178c5e6fc15649befdb63fbd0a055b84bfbc6faa Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 28 Oct 2025 21:28:55 +0000
Subject: [PATCH 3698/6226] python3Packages.pyopencl: 2025.2.6 -> 2025.2.7

Diff: https://github.com/inducer/pyopencl/compare/v2025.2.6...v2025.2.7

Changelog: https://github.com/inducer/pyopencl/releases/tag/v2025.2.7
---
 pkgs/development/python-modules/pyopencl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyopencl/default.nix b/pkgs/development/python-modules/pyopencl/default.nix
index a2d58cb0b51e..6ce8be2b6c75 100644
--- a/pkgs/development/python-modules/pyopencl/default.nix
+++ b/pkgs/development/python-modules/pyopencl/default.nix
@@ -30,7 +30,7 @@
 
 buildPythonPackage rec {
   pname = "pyopencl";
-  version = "2025.2.6";
+  version = "2025.2.7";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -38,7 +38,7 @@ buildPythonPackage rec {
     repo = "pyopencl";
     tag = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-ofAyBaD/iMm2+2PFGVTEzg/kaPmcwlvLPAihRE+JlJg=";
+    hash = "sha256-LrV4NHn4I2kaZvXuWs706fvHUOR4sc+Pv8wVHPVKpPo=";
   };
 
   build-system = [

From a9a04422ceda2ae3fdf8fde4c10e55c1a90c280d Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:28:56 -0300
Subject: [PATCH 3699/6226] cosmic-workspaces-epoch: 1.0.0-beta.3 ->
 1.0.0-beta.4

Diff: https://github.com/pop-os/cosmic-workspaces-epoch/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/co/cosmic-workspaces-epoch/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
index 056beebea342..94ed619652a0 100644
--- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
+++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
@@ -14,7 +14,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-workspaces-epoch";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 4713ac13179d8f60bdd2bc8126265bdd6eddc9ce Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Tue, 28 Oct 2025 18:30:28 -0300
Subject: [PATCH 3700/6226] xdg-desktop-portal-cosmic: 1.0.0-beta.3 ->
 1.0.0-beta.4

Diff: https://github.com/pop-os/xdg-desktop-portal-cosmic/compare/epoch-1.0.0-beta.3...epoch-1.0.0-beta.4
---
 pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
index 52642f0392d4..579587a347fc 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
@@ -16,17 +16,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xdg-desktop-portal-cosmic";
-  version = "1.0.0-beta.3";
+  version = "1.0.0-beta.4";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "xdg-desktop-portal-cosmic";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-JNLcrOj04HHFg8p76IdziMKbc2cjWIT+zhihzXis19M=";
+    hash = "sha256-Ea6V4lob7vKo+cf1GcNlzKqqSjO1bEqzvbRnYKLyshA=";
   };
 
-  cargoHash = "sha256-gaDVt/0QPFZHnt9veUo5bvZECxKZcIrja/QdLBn/Xi4=";
+  cargoHash = "sha256-V1tFOZa2f+Z0MMuIoHlbB7BrXfsUhmuhoqOu9fjteEA=";
 
   separateDebugInfo = true;
 

From a37e1d827b1be4b47a0a1a7b3bbc69d2981b864e Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Tue, 28 Oct 2025 21:59:01 +0100
Subject: [PATCH 3701/6226] ledfx: 2.0.111 -> 2.1.0

---
 pkgs/by-name/le/ledfx/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/le/ledfx/package.nix b/pkgs/by-name/le/ledfx/package.nix
index 68840bed9e5f..d03729741691 100644
--- a/pkgs/by-name/le/ledfx/package.nix
+++ b/pkgs/by-name/le/ledfx/package.nix
@@ -1,17 +1,19 @@
 {
   lib,
-  fetchPypi,
+  fetchFromGitHub,
   python3,
 }:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "ledfx";
-  version = "2.0.111";
+  version = "2.1.0";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-b6WHulQa1er0DpMfeJLqqb4z8glUt1dHvvNigXgrf7Y=";
+  src = fetchFromGitHub {
+    owner = "LedFx";
+    repo = "LedFx";
+    tag = "v${version}";
+    hash = "sha256-N9EHK0GVohFCjEKsm3g4h+4XWfzZO1tzdd2z5IN1YjI=";
   };
 
   pythonRelaxDeps = true;

From e1426a5d767d8dcea3a258c9c0c8521a60d036d8 Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Tue, 28 Oct 2025 21:59:57 +0100
Subject: [PATCH 3702/6226] ledfx: move python-mbedtls to
 optional-dependencies, run tests, reorder deps

---
 pkgs/by-name/le/ledfx/package.nix | 49 +++++++++++++++++++------------
 1 file changed, 31 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/le/ledfx/package.nix b/pkgs/by-name/le/ledfx/package.nix
index d03729741691..4d4ac302d230 100644
--- a/pkgs/by-name/le/ledfx/package.nix
+++ b/pkgs/by-name/le/ledfx/package.nix
@@ -16,6 +16,13 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-N9EHK0GVohFCjEKsm3g4h+4XWfzZO1tzdd2z5IN1YjI=";
   };
 
+  postPatch = ''
+    substituteInPlace tests/conftest.py \
+      --replace-fail '"uv",' "" \
+      --replace-fail '"run",' "" \
+      --replace-fail '"ledfx",' "\"$out/bin/ledfx\","
+  '';
+
   pythonRelaxDeps = true;
 
   pythonRemoveDeps = [
@@ -29,43 +36,49 @@ python3.pkgs.buildPythonApplication rec {
   ];
 
   dependencies = with python3.pkgs; [
+    # sorted like in pyproject.toml in upstream
+    numpy
+    cffi
     aiohttp
     aiohttp-cors
     aubio
     certifi
-    flux-led
-    python-dotenv
-    icmplib
-    mss
     multidict
-    netifaces2
-    numpy
     openrgb-python
     paho-mqtt
-    pillow
     psutil
-    pybase64
     pyserial
     pystray
-    python-mbedtls
-    python-osc
     python-rtmidi
-    # rpi-ws281x # not packaged
     requests
     sacn
-    samplerate
     sentry-sdk
-    setuptools
     sounddevice
-    stupidartnet
-    uvloop
-    vnoise
+    samplerate
+    icmplib
     voluptuous
     zeroconf
+    pillow
+    flux-led
+    python-osc
+    pybase64
+    mss
+    uvloop
+    stupidartnet
+    python-dotenv
+    vnoise
+    netifaces2
+    packaging
   ];
 
-  # Project has no tests
-  doCheck = false;
+  optional-dependencies = {
+    hue = with pyproject.pkgs; [ python-mbedtls ];
+  };
+
+  nativeCheckInputs = with python3.pkgs; [
+    pytestCheckHook
+    pytest-asyncio
+  ];
 
   meta = {
     description = "Network based LED effect controller with support for advanced real-time audio effects";

From 69cdfaf6a649c55e3379a906b6aae751803ea3c0 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 28 Oct 2025 11:22:02 -0700
Subject: [PATCH 3703/6226] cudaPackages.nccl: 2.27.6-1 -> 2.28.7-1; support
 earlier CUDA releases

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/packages/nccl.nix            | 56 ++++++++++++++-----
 1 file changed, 43 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/nccl.nix b/pkgs/development/cuda-modules/packages/nccl.nix
index 07f0ba06a067..ea3d1f3d2cb0 100644
--- a/pkgs/development/cuda-modules/packages/nccl.nix
+++ b/pkgs/development/cuda-modules/packages/nccl.nix
@@ -1,12 +1,10 @@
-# NOTE: Though NCCL is called within the cudaPackages package set, we avoid passing in
-# the names of dependencies from that package set directly to avoid evaluation errors
-# in the case redistributable packages are not available.
 {
   _cuda,
   backendStdenv,
   cuda_cccl,
   cuda_cudart,
   cuda_nvcc,
+  cudaAtLeast,
   cudaNamePrefix,
   fetchFromGitHub,
   flags,
@@ -19,11 +17,19 @@
 let
   inherit (_cuda.lib) _mkMetaBadPlatforms;
   inherit (backendStdenv) hasJetsonCudaCapability requestedJetsonCudaCapabilities;
-  inherit (lib) licenses maintainers teams;
-  inherit (lib.attrsets)
+  inherit (lib)
+    all
+    flip
+    getAttr
     getBin
+    getInclude
     getLib
-    getOutput
+    licenses
+    maintainers
+    optionalString
+    teams
+    versionAtLeast
+    versionOlder
     ;
 in
 backendStdenv.mkDerivation (finalAttrs: {
@@ -33,13 +39,28 @@ backendStdenv.mkDerivation (finalAttrs: {
   # NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
   name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
   pname = "nccl";
-  version = "2.27.6-1";
+
+  # NOTE:
+  #   Compilation errors resulting from newer versions of NCCL on older releases of CUDA seem to be caused (mostly)
+  #   by differences in assumed version of CCCL: using a newer CCCL with an older release of CUDA can (sometimes) allow
+  #   newer versions of NCCL than what we provide here.
+  version =
+    if cudaAtLeast "11.7" then
+      "2.28.7-1"
+    else if cudaAtLeast "11.6" then
+      "2.26.6-1"
+    else
+      "2.25.1-1";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "nccl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/BiLSZaBbVIqOfd8nQlgUJub0YR3SR4B93x2vZpkeiU=";
+    hash = getAttr finalAttrs.version {
+      "2.28.7-1" = "sha256-NM19OiBBGmv3cGoVoRLKSh9Y59hiDoei9NIrRnTqWeA=";
+      "2.26.6-1" = "sha256-vkWMGXCy+dIpYCecdafmOAGlnfRxIQ5Y2ZQuMjinraI=";
+      "2.25.1-1" = "sha256-3snh0xdL9I5BYqdbqdl+noizJoI38mZRVOJChgEE1I8=";
+    };
   };
 
   outputs = [
@@ -55,7 +76,7 @@ backendStdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    (getOutput "include" cuda_nvcc)
+    (getInclude cuda_nvcc)
     cuda_cccl
     cuda_cudart
   ];
@@ -71,12 +92,21 @@ backendStdenv.mkDerivation (finalAttrs: {
       --replace-fail \
         '-ccbin $(CXX)' \
         ""
+  ''
+  # 2.27.3-1 was the first to introuce CXXSTD
+  + optionalString (versionOlder finalAttrs.version "2.27.3-1") ''
+    nixLog "patching $PWD/makefiles/common.mk to remove NVIDIA's std hardcoding"
+    substituteInPlace ./makefiles/common.mk \
+      --replace-fail \
+        '-std=c++11' \
+        '$(CXXSTD)'
   '';
 
   # TODO: This would likely break under cross; need to delineate between build and host packages.
   makeFlags = [
+    "CXXSTD=-std=c++17"
     "CUDA_HOME=${getBin cuda_nvcc}"
-    "CUDA_INC=${getOutput "include" cuda_cudart}/include"
+    "CUDA_INC=${getInclude cuda_cudart}/include"
     "CUDA_LIB=${getLib cuda_cudart}/lib"
     "NVCC_GENCODE=${flags.gencodeString}"
     "PREFIX=$(out)"
@@ -85,7 +115,8 @@ backendStdenv.mkDerivation (finalAttrs: {
   enableParallelBuilding = true;
 
   postFixup = ''
-    moveToOutput lib/libnccl_static.a "$static"
+    _overrideFirst outputStatic "static" "lib" "out"
+    moveToOutput lib/libnccl_static.a "''${!outputStatic:?}"
   '';
 
   passthru = {
@@ -93,8 +124,7 @@ backendStdenv.mkDerivation (finalAttrs: {
       {
         message = "Pre-Thor Jetson devices (CUDA capabilities < 10.1) are not supported by NCCL";
         assertion =
-          !hasJetsonCudaCapability
-          || lib.all (lib.flip lib.versionAtLeast "10.1") requestedJetsonCudaCapabilities;
+          !hasJetsonCudaCapability || all (flip versionAtLeast "10.1") requestedJetsonCudaCapabilities;
       }
     ];
 

From 67400e37eaa8e88bb3931d8aecfbd647e17fc508 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 28 Oct 2025 22:51:58 +0100
Subject: [PATCH 3704/6226] dua: use finalAttrs pattern

---
 pkgs/by-name/du/dua/package.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix
index 4043d4267153..f85381031b43 100644
--- a/pkgs/by-name/du/dua/package.nix
+++ b/pkgs/by-name/du/dua/package.nix
@@ -6,14 +6,14 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dua";
   version = "2.32.0";
 
   src = fetchFromGitHub {
     owner = "Byron";
     repo = "dua-cli";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-u8g7X/70ZsZF6vUiVnisItwSMiNXgiAdOXqGUT34EaY=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
@@ -32,9 +32,7 @@ rustPlatform.buildRustPackage rec {
     "--skip=interactive::app::tests::unit::it_can_handle_ending_traversal_without_reaching_the_top"
   ];
 
-  nativeInstallCheckInputs = [
-    versionCheckHook
-  ];
+  nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
@@ -43,7 +41,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Tool to conveniently learn about the disk usage of directories";
     homepage = "https://github.com/Byron/dua-cli";
-    changelog = "https://github.com/Byron/dua-cli/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/Byron/dua-cli/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [
       figsoda
@@ -51,4 +49,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "dua";
   };
-}
+})

From 2dc518f4798d894c5aa52fbec34f14d4c6b6793b Mon Sep 17 00:00:00 2001
From: Daste <stefankar1000@gmail.com>
Date: Sun, 12 Oct 2025 15:56:49 +0200
Subject: [PATCH 3705/6226] prisma-engines: 6.7.0 -> 6.18.0

---
 pkgs/by-name/pr/prisma-engines/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/prisma-engines/package.nix b/pkgs/by-name/pr/prisma-engines/package.nix
index a379de4f31b0..94be72fc5897 100644
--- a/pkgs/by-name/pr/prisma-engines/package.nix
+++ b/pkgs/by-name/pr/prisma-engines/package.nix
@@ -13,16 +13,16 @@
 # function correctly.
 rustPlatform.buildRustPackage rec {
   pname = "prisma-engines";
-  version = "6.7.0";
+  version = "6.18.0";
 
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "prisma-engines";
     rev = version;
-    hash = "sha256-Ty8BqWjZluU6a5xhSAVb2VoTVY91UUj6zoVXMKeLO4o=";
+    hash = "sha256-p198o8ON5mGPCxK+gE0mW+JVyQlNsCsqwa8D4MNBkpA=";
   };
 
-  cargoHash = "sha256-HjDoWa/JE6izUd+hmWVI1Yy3cTBlMcvD9ANsvqAoHBI=";
+  cargoHash = "sha256-bNl04GoxLX+B8dPgqWL/VarreBVebjwNDwQjtQcJnsg=";
 
   # Use system openssl.
   OPENSSL_NO_VENDOR = 1;

From 5b23bb562aab583d951c8436601d04ac2106d6a8 Mon Sep 17 00:00:00 2001
From: Daste <stefankar1000@gmail.com>
Date: Sun, 12 Oct 2025 16:37:37 +0200
Subject: [PATCH 3706/6226] prisma: 6.7.0 -> 6.18.0

---
 pkgs/by-name/pr/prisma/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/pr/prisma/package.nix b/pkgs/by-name/pr/prisma/package.nix
index abdf921664eb..f30a54c35336 100644
--- a/pkgs/by-name/pr/prisma/package.nix
+++ b/pkgs/by-name/pr/prisma/package.nix
@@ -3,7 +3,7 @@
   fetchFromGitHub,
   stdenv,
   nodejs,
-  pnpm_9,
+  pnpm_10,
   prisma-engines,
   jq,
   makeWrapper,
@@ -13,27 +13,27 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "prisma";
-  version = "6.7.0";
+  version = "6.18.0";
 
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "prisma";
     rev = finalAttrs.version;
-    hash = "sha256-ts7HvQbbBFzLRr7uamo95rDnJuDHsAu2CE/pKkJwcX4=";
+    hash = "sha256-+WRWa59HlHN2CsYZfr/ptdW3iOuOPfDil8sLR5dWRA4=";
   };
 
   nativeBuildInputs = [
     nodejs
-    pnpm_9.configHook
+    pnpm_10.configHook
     jq
     makeWrapper
     moreutils
   ];
 
-  pnpmDeps = pnpm_9.fetchDeps {
+  pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-dhEpn0oaqZqeiRMfcSiaqhud/RsKd6Wm5RR5iyQp1I8=";
+    hash = "sha256-Et1UiZO2zyw9FHW0OuYK7AMfhIy5j7Q7GDQjaL6gjyg=";
   };
 
   patchPhase = ''

From fb190ad3f3b890990799ad9987a18f58989290e1 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 22 May 2025 22:34:37 +0200
Subject: [PATCH 3707/6226] dua: add defelo as maintainer

---
 pkgs/by-name/du/dua/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix
index f85381031b43..02a7c9e65dd5 100644
--- a/pkgs/by-name/du/dua/package.nix
+++ b/pkgs/by-name/du/dua/package.nix
@@ -46,6 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     maintainers = with lib.maintainers; [
       figsoda
       killercup
+      defelo
     ];
     mainProgram = "dua";
   };

From 67d6a2f6a02e5db78e8092cd424719ca671431f9 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 28 Oct 2025 20:12:29 +0000
Subject: [PATCH 3708/6226] dua: 2.32.0 -> 2.32.2

Changelog: https://github.com/Byron/dua-cli/blob/v2.32.2/CHANGELOG.md
Diff: https://github.com/Byron/dua-cli/compare/v2.32.0...v2.32.2
---
 pkgs/by-name/du/dua/package.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix
index 02a7c9e65dd5..6ec17352a3b2 100644
--- a/pkgs/by-name/du/dua/package.nix
+++ b/pkgs/by-name/du/dua/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "dua";
-  version = "2.32.0";
+  version = "2.32.2";
 
   src = fetchFromGitHub {
     owner = "Byron";
     repo = "dua-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-u8g7X/70ZsZF6vUiVnisItwSMiNXgiAdOXqGUT34EaY=";
+    hash = "sha256-MB5uePy32jTvOtkQKcP9peFPqwR68E+NZ7UGMuLx8Eo=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     postFetch = ''
@@ -22,10 +22,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
     '';
   };
 
-  cargoHash = "sha256-6WjaKGCnEoHCIDqMHtp/dpdHbrUe2XOxCtstQCuXPyc=";
+  cargoHash = "sha256-6H0x6I3nkCezu4/Hguv0XTdl+3QiyPL8Ue1rqTQU7VA=";
 
   checkFlags = [
     # Skip interactive tests
+    "--skip=interactive::app::tests::journeys_readonly::quit_instantly_when_nothing_marked"
+    "--skip=interactive::app::tests::journeys_readonly::quit_requires_two_presses_when_items_marked"
     "--skip=interactive::app::tests::journeys_readonly::simple_user_journey_read_only"
     "--skip=interactive::app::tests::journeys_with_writes::basic_user_journey_with_deletion"
     "--skip=interactive::app::tests::unit::it_can_handle_ending_traversal_reaching_top_but_skipping_levels"

From f39a477c9d18ec60dfd4bd992155222132c417dc Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Tue, 28 Oct 2025 03:19:56 +0100
Subject: [PATCH 3709/6226] openscad-unstable: 2025-06-04 ->
 2021.01-unstable-2025-11-27, fix build

---
 pkgs/by-name/op/openscad-unstable/package.nix | 52 +++++++++++--------
 pkgs/by-name/op/openscad-unstable/test.diff   | 42 ---------------
 2 files changed, 29 insertions(+), 65 deletions(-)
 delete mode 100644 pkgs/by-name/op/openscad-unstable/test.diff

diff --git a/pkgs/by-name/op/openscad-unstable/package.nix b/pkgs/by-name/op/openscad-unstable/package.nix
index 7f64438b8078..0184ab5753c6 100644
--- a/pkgs/by-name/op/openscad-unstable/package.nix
+++ b/pkgs/by-name/op/openscad-unstable/package.nix
@@ -44,33 +44,29 @@
   ctestCheckHook,
 }:
 # clang consume much less RAM than GCC
-clangStdenv.mkDerivation rec {
-  pname = "openscad-unstable";
-  version = "2025-06-04";
-  src = fetchFromGitHub {
-    owner = "openscad";
-    repo = "openscad";
-    rev = "65856c9330f8cc4ffcaccf03d91b4217f2eae28d";
-    hash = "sha256-jozcLFGVSfw8G12oSxHjqUyFtAfENgIByID+omk08mU=";
-    fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD and manifold
-  };
-
-  patches = [ ./test.diff ];
-
-  # fix use of our lib3mf cmake export instead of finder
-  postPatch = ''
-    substituteInPlace CMakeLists.txt --replace-fail \
-      "Lib3MF" \
-      "lib3mf"
-  '';
-
-  nativeBuildInputs = [
-    (python3.withPackages (
+let
+  python3withPackages = (
+    python3.withPackages (
       ps: with ps; [
         numpy
         pillow
       ]
-    ))
+    )
+  );
+in
+clangStdenv.mkDerivation rec {
+  pname = "openscad-unstable";
+  version = "2021.01-unstable-2025-10-27";
+  src = fetchFromGitHub {
+    owner = "openscad";
+    repo = "openscad";
+    rev = "aa785fe4ab3d52450a5e51eb73585ac9bbcc8798";
+    hash = "sha256-TngfItArYtm8243DdYkQlkfc/MBTZGYrf08hfloWRWk=";
+    fetchSubmodules = true; # Only really need sanitizers-cmake and MCAD and manifold
+  };
+
+  nativeBuildInputs = [
+    python3withPackages
     bison
     cmake
     flex
@@ -134,6 +130,10 @@ clangStdenv.mkDerivation rec {
     # The sources enable this for only apple. We turn it off globally anyway to stay
     # consistent.
     "-DUSE_QT6=OFF"
+
+    # For tests
+    "-DVENV_DIR=${python3withPackages}"
+    "-DVENV_BIN_PATH=${python3withPackages}/bin"
   ];
 
   # tests rely on sysprof which is not available on darwin
@@ -147,6 +147,12 @@ clangStdenv.mkDerivation rec {
       done )
   '';
 
+  postPatch = ''
+    # Take Python3 executable as passed
+    sed -e '/set(VENV_DIR /d' -i tests/cmake/ImageCompare.cmake
+    sed -e '/find_path(VENV_BIN_PATH /d' -i tests/cmake/ImageCompare.cmake
+  '';
+
   postInstall = lib.optionalString stdenv.hostPlatform.isDarwin ''
     mkdir $out/Applications
     mv $out/bin/*.app $out/Applications
diff --git a/pkgs/by-name/op/openscad-unstable/test.diff b/pkgs/by-name/op/openscad-unstable/test.diff
deleted file mode 100644
index 23b3983daddd..000000000000
--- a/pkgs/by-name/op/openscad-unstable/test.diff
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
-index 5c1b40af4..917451dee 100644
---- a/tests/CMakeLists.txt
-+++ b/tests/CMakeLists.txt
-@@ -59,13 +59,14 @@ if(USE_IMAGE_COMPARE_PY)
- 
-   # Since msys2 on Windows prefers bin/ over Scripts, we need to look for the actual folder to determine
-   # how to utilize the venv
--  find_path(VENV_BIN_PATH activate PATHS "${VENV_DIR}/bin" "${VENV_DIR}/Scripts" NO_DEFAULT_PATH NO_CACHE)
--  if(WIN32)
--    set(IMAGE_COMPARE_EXE "${VENV_BIN_PATH}/python.exe")
--  else()
--    set(IMAGE_COMPARE_EXE "${VENV_BIN_PATH}/python")
--  endif()
--  if(EXISTS "${IMAGE_COMPARE_EXE}")
-+  # find_path(VENV_BIN_PATH activate PATHS "${VENV_DIR}/bin" "${VENV_DIR}/Scripts" NO_DEFAULT_PATH NO_CACHE)
-+  # if(WIN32)
-+  #   set(IMAGE_COMPARE_EXE "${VENV_BIN_PATH}/python.exe")
-+  # else()
-+  #   set(IMAGE_COMPARE_EXE "${VENV_BIN_PATH}/python")
-+  # endif()
-+  set(IMAGE_COMPARE_EXE "python3")
-+  # if(EXISTS "${IMAGE_COMPARE_EXE}")
-     message(STATUS "venv found, testing libraries")
-     execute_process(
-       COMMAND "${IMAGE_COMPARE_EXE}" "${CCSD}/image_compare.py" "--status"
-@@ -77,10 +78,10 @@ if(USE_IMAGE_COMPARE_PY)
-       message(STATUS "venv libraries complete")
-       set(BUILD_VENV FALSE)
-     endif()
--  else()
--    message(STATUS "venv not found")
--    set(BUILD_VENV TRUE)
--  endif()
-+  # else()
-+  #   message(STATUS "venv not found")
-+  #   set(BUILD_VENV TRUE)
-+  # endif()
-   if(BUILD_VENV)
-     message(STATUS "Setting up testing venv for image comparison")
-     execute_process(
-

From cf7d05a40237c6e56efa613697e642c65b013f03 Mon Sep 17 00:00:00 2001
From: Tiago Castro <tiagolobocastro@gmail.com>
Date: Tue, 28 Oct 2025 22:15:44 +0000
Subject: [PATCH 3710/6226] p3x-onenote: fix aarch64 and armv7l platform hash

The automated update PR doesn't update these platforms.

Signed-off-by: Tiago Castro <tiagolobocastro@gmail.com>
---
 pkgs/by-name/p3/p3x-onenote/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/p3/p3x-onenote/package.nix b/pkgs/by-name/p3/p3x-onenote/package.nix
index 61277ca37b5b..a04a4b49a45c 100644
--- a/pkgs/by-name/p3/p3x-onenote/package.nix
+++ b/pkgs/by-name/p3/p3x-onenote/package.nix
@@ -20,8 +20,8 @@ let
 
   hash =
     {
-      aarch64-linux = "sha256-FB6+0Ze3d/6QETgtMtc6GztnPdSy5s7k67qsAtFdsyM=";
-      armv7l-linux = "sha256-Q45tfcGrNjd9wXt+VhXhaHrC4w68lRUIuB4cJSW5NDE=";
+      aarch64-linux = "sha256-6R+QzCeochojB1zo8SWiIVszrjbII+H2R/TReCsPip4=";
+      armv7l-linux = "sha256-jhrPixz/ZHJRIe+xtmBRtDJFL7LqZqcoK7rdGrsoySo=";
       x86_64-linux = "sha256-sDzwEhoPEfa21zBwD0IYoRdz4VHeTSUL0biHbbWE+Dc=";
     }
     .${stdenv.hostPlatform.system};

From 4876c5ce6572f8be19e119512528c909a49b95b8 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Tue, 28 Oct 2025 15:29:08 -0700
Subject: [PATCH 3711/6226] python3Packages.holistic-trace-analysis: disable
 tests that can fail/hang on Darwin

---
 .../python-modules/holistic-trace-analysis/default.nix     | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/holistic-trace-analysis/default.nix b/pkgs/development/python-modules/holistic-trace-analysis/default.nix
index 147bccbb1bc3..6389d96bec6e 100644
--- a/pkgs/development/python-modules/holistic-trace-analysis/default.nix
+++ b/pkgs/development/python-modules/holistic-trace-analysis/default.nix
@@ -54,6 +54,13 @@ buildPythonPackage rec {
     # Fails under Python 3.12 on Darwin with I/O errors
     # Permission denied: '/tmp/path_does_not_exist/...'
     "test_critical_path_overlaid_trace"
+    # Permission error: [Errno 1] Operation not permitted
+    "test_get_mtia_aten_op_kernels_and_delay_inference_single_rank"
+    # No cuda on Darwin, can cause hangs in nixpkgs-review
+    "test_frequent_cuda_kernel_sequences"
+    "test_get_cuda_kernel_launch_stats_for_h100"
+    "test_get_cuda_kernel_launch_stats_inference_single_rank"
+    "test_get_cuda_kernel_launch_stats_training_multiple_ranks"
   ];
 
   disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [

From a3657f183e38973a3d2a1fe96c5af0bc8a8fb6ba Mon Sep 17 00:00:00 2001
From: Cobalt <cobalt@cobalt.rocks>
Date: Tue, 28 Oct 2025 23:46:46 +0100
Subject: [PATCH 3712/6226] squid: 7.2 -> 7.3

Refer to upstream changelog for specific details:
https://github.com/squid-cache/squid/releases/tag/SQUID_7_3

For nixpkgs this notably includes a regression fix that was previously
fixed with a patch.
---
 pkgs/by-name/sq/squid/package.nix | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/sq/squid/package.nix b/pkgs/by-name/sq/squid/package.nix
index 384dadf43743..ed953ff47fbf 100644
--- a/pkgs/by-name/sq/squid/package.nix
+++ b/pkgs/by-name/sq/squid/package.nix
@@ -16,26 +16,18 @@
   cppunit,
   ipv6 ? true,
   nixosTests,
-  fetchpatch,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "squid";
-  version = "7.2";
+  version = "7.3";
 
   src = fetchurl {
     url = "https://github.com/squid-cache/squid/releases/download/SQUID_${
       builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version
     }/squid-${finalAttrs.version}.tar.xz";
-    hash = "sha256-Xgd74dg6nmls6NDZ5yOxJzFSIHoJFAS+aKS5qeGMcAM=";
+    hash = "sha256-2twqmjkmzhs7q+qnp9eyHLsIkCWHbao/XBnn62OR3c0=";
   };
 
-  patches = lib.optional (lib.versionOlder finalAttrs.version "7.2.0") (fetchpatch {
-    # Merged upstream PR; fixes the issue of rejecting domain names starting with digits
-    # To remove when 7.3 is released (or 7.2.1, but that doesn't seem likely)
-    url = "https://patch-diff.githubusercontent.com/raw/squid-cache/squid/pull/2283.patch";
-    hash = "sha256-HLGmzrAH5y1sFfFnVeeegRihyn+N7csGX9lVqmCDIHc=";
-  });
-
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [
     perl

From ab6168a80628cdc97fbaabc824e381533845d286 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 28 Oct 2025 22:58:13 +0000
Subject: [PATCH 3713/6226] python3Packages.triton-bin: 3.4.0 -> 3.5.0

Diff: https://github.com/triton-lang/triton/compare/v3.4.0...v3.5.0
---
 .../development/python-modules/triton/bin.nix |  2 +-
 .../python-modules/triton/binary-hashes.nix   | 60 +++++++++++--------
 2 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/python-modules/triton/bin.nix b/pkgs/development/python-modules/triton/bin.nix
index 7edc81d576a6..9d7d93e6c828 100644
--- a/pkgs/development/python-modules/triton/bin.nix
+++ b/pkgs/development/python-modules/triton/bin.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "triton";
-  version = "3.4.0";
+  version = "3.5.0";
   format = "wheel";
 
   src =
diff --git a/pkgs/development/python-modules/triton/binary-hashes.nix b/pkgs/development/python-modules/triton/binary-hashes.nix
index 54eda3494663..39976f373656 100644
--- a/pkgs/development/python-modules/triton/binary-hashes.nix
+++ b/pkgs/development/python-modules/triton/binary-hashes.nix
@@ -7,46 +7,56 @@
 
 version:
 builtins.getAttr version {
-  "3.4.0" = {
+  "3.5.0" = {
     aarch64-linux-310 = {
-      name = "triton-3.4.0-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/triton-3.4.0-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
-      hash = "sha256-husMt2NDKM1Xf6UbWTOPGvQZnPmrYjhaxCqCeD2RFqQ=";
+      name = "triton-3.5.0-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/triton-3.5.0-cp310-cp310-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
+      hash = "sha256-JTyIky/VWN9S+GxmNynofNOKGacVFYG+W9X0v9WPhpo=";
     };
     x86_64-linux-310 = {
-      name = "triton-3.4.0-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
-      url = "https://download.pytorch.org/whl/triton-3.4.0-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
-      hash = "sha256-axdYjFnL4dmHEz6nzRzC5SKeBUSgapkIv69oxh9WSVo=";
+      name = "triton-3.5.0-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
+      url = "https://download.pytorch.org/whl/triton-3.5.0-cp310-cp310-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
+      hash = "sha256-u6PqGcwYGVNIOVmYj0/Xk6dZg+v+z2VH1YOogGq43Pw=";
     };
     aarch64-linux-311 = {
-      name = "triton-3.4.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/triton-3.4.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
-      hash = "sha256-3Y0y0zf1gST+JUBD0oKkvBM8Ksp5ibxjWLLFRtISFRM=";
+      name = "triton-3.5.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/triton-3.5.0-cp311-cp311-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
+      hash = "sha256-SYEl6jXOSJaaRvp5OdfmgCVAoTlXomIw1mo4t6zn32g=";
     };
     x86_64-linux-311 = {
-      name = "triton-3.4.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
-      url = "https://download.pytorch.org/whl/triton-3.4.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
-      hash = "sha256-4rCv5CDSAtlvULhH10Skh7eAVnl1RV5W9ksGEVLulVQ=";
+      name = "triton-3.5.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
+      url = "https://download.pytorch.org/whl/triton-3.5.0-cp311-cp311-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
+      hash = "sha256-JjiByshHffhNOWS+dlt/rBfdP/oK1vywMLhBvXT5QIs=";
     };
     aarch64-linux-312 = {
-      name = "triton-3.4.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/triton-3.4.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
-      hash = "sha256-AOpKHBXwebv0n/AsMSIQ/bj/BbFQPqMIEmEOKjsXHzs=";
+      name = "triton-3.5.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/triton-3.5.0-cp312-cp312-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
+      hash = "sha256-m4K0bfNa6eC4WjgtmaB25uvqI6Ol26yn3CSnVx5r660=";
     };
     x86_64-linux-312 = {
-      name = "triton-3.4.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
-      url = "https://download.pytorch.org/whl/triton-3.4.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
-      hash = "sha256-hVBnKxGE8FGH9BQNsy4z5htZIEb9Ph65B+O321Mht1A=";
+      name = "triton-3.5.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
+      url = "https://download.pytorch.org/whl/triton-3.5.0-cp312-cp312-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
+      hash = "sha256-dvhlGl44wqfab6Ky5By8AKWjLLUr8/UgET/pC3I6MQ0=";
     };
     aarch64-linux-313 = {
-      name = "triton-3.4.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
-      url = "https://download.pytorch.org/whl/triton-3.4.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
-      hash = "sha256-WstSjwHcFDYsSoj6Tc+iJ9Ey9uYfJypodOhNZIUDfKQ=";
+      name = "triton-3.5.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/triton-3.5.0-cp313-cp313-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
+      hash = "sha256-BeFFtRpTVzv/JgQx/0D63OCDitmSjF7hiDtT1ZiE4Zg=";
     };
     x86_64-linux-313 = {
-      name = "triton-3.4.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
-      url = "https://download.pytorch.org/whl/triton-3.4.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
-      hash = "sha256-Dlgr/YFHr9Dhf0ELOe4WHfkzoqyp9lPhF42q6Y+H9gE=";
+      name = "triton-3.5.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
+      url = "https://download.pytorch.org/whl/triton-3.5.0-cp313-cp313-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
+      hash = "sha256-tvbbiVAabcSkkv8oFGDBsVVjQgvJCTR3CqanuA/VHJU=";
+    };
+    aarch64-linux-314 = {
+      name = "triton-3.5.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
+      url = "https://download.pytorch.org/whl/triton-3.5.0-cp314-cp314-manylinux_2_27_aarch64.manylinux_2_28_aarch64.whl";
+      hash = "sha256-ThqFbR1zFzTuntYt3lSPNC00yYi41+I1vyA35CjeIlg=";
+    };
+    x86_64-linux-314 = {
+      name = "triton-3.5.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
+      url = "https://download.pytorch.org/whl/triton-3.5.0-cp314-cp314-manylinux_2_27_x86_64.manylinux_2_28_x86_64.whl";
+      hash = "sha256-jZi3ioPpECVuxwNIa4wnXsU5deWsSoy3zgfGluCPa1o=";
     };
   };
 }

From 761da95834c15b4cfe3351a50abafa32f7f87fbd Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 28 Oct 2025 15:58:28 -0700
Subject: [PATCH 3714/6226] cudaPackages.libnvshmem: support older CUDA
 releases

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/packages/libnvshmem.nix            | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/cuda-modules/packages/libnvshmem.nix b/pkgs/development/cuda-modules/packages/libnvshmem.nix
index 37a4a79d14a4..0f92bcee6432 100644
--- a/pkgs/development/cuda-modules/packages/libnvshmem.nix
+++ b/pkgs/development/cuda-modules/packages/libnvshmem.nix
@@ -1,4 +1,5 @@
 {
+  _cuda,
   backendStdenv,
   buildPackages,
   cmake,
@@ -8,6 +9,7 @@
   cuda_nvml_dev,
   cuda_nvtx,
   cudaAtLeast,
+  cudaMajorMinorVersion,
   cudaNamePrefix,
   fetchFromGitHub,
   flags,
@@ -70,7 +72,7 @@ backendStdenv.mkDerivation (finalAttrs: {
   ];
 
   # NOTE: Hardcoded standard versions mean CMake doesn't respect values we provide, so we need to patch the files.
-  postPatch = lib.optionalString (cudaAtLeast "12.8") ''
+  postPatch = ''
     for standardName in {CXX,CUDA}_STANDARD
     do
       while IFS= read -r cmakeFileToPatch
@@ -164,11 +166,20 @@ backendStdenv.mkDerivation (finalAttrs: {
       inherit (finalAttrs) pname version;
       rev-prefix = "v";
     };
+
+    brokenAssertions = [
+      # CUDA pre-11.7 yeilds macro/type errors in src/include/internal/host_transport/cudawrap.h.
+      {
+        message = "NVSHMEM does not support CUDA releases earlier than 11.7 (found ${cudaMajorMinorVersion})";
+        assertion = cudaAtLeast "11.7";
+      }
+    ];
   };
 
   meta = {
     description = "Parallel programming interface for NVIDIA GPUs based on OpenSHMEM";
     homepage = "https://github.com/NVIDIA/nvshmem";
+    broken = _cuda.lib._mkMetaBroken finalAttrs;
     # NOTE: There are many licenses:
     # https://github.com/NVIDIA/nvshmem/blob/7dd48c9fd7aa2134264400802881269b7822bd2f/License.txt
     license = licenses.nvidiaCudaRedist;

From 93b3fe8fe093e612fda04fd86cd6b3ca855200c7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 28 Oct 2025 22:58:53 +0000
Subject: [PATCH 3715/6226] python3Packages.triton-bin: add GaetanLepage to
 maintainers

---
 pkgs/development/python-modules/triton/bin.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/triton/bin.nix b/pkgs/development/python-modules/triton/bin.nix
index 9d7d93e6c828..74755a13b2fe 100644
--- a/pkgs/development/python-modules/triton/bin.nix
+++ b/pkgs/development/python-modules/triton/bin.nix
@@ -63,6 +63,9 @@ buildPythonPackage rec {
       mit
     ];
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-    maintainers = with lib.maintainers; [ junjihashimoto ];
+    maintainers = with lib.maintainers; [
+      GaetanLepage
+      junjihashimoto
+    ];
   };
 }

From 6c2997a6ee63ab00d1192ee8de59e71fb2d52f2b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 23:05:37 +0000
Subject: [PATCH 3716/6226] python3Packages.garth: 0.5.17 -> 0.5.18

---
 pkgs/development/python-modules/garth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix
index 676557ce318a..edc6000464f8 100644
--- a/pkgs/development/python-modules/garth/default.nix
+++ b/pkgs/development/python-modules/garth/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "garth";
-  version = "0.5.17";
+  version = "0.5.18";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-SO3pOMOLL9cHd+VccCVTh3XZPBBH9DzHxEgfKgSxCcs=";
+    hash = "sha256-+Df40ZYj5+Vo9IFFF+9wfGiKvhCWWy7hqhoBVZKsdx0=";
   };
 
   pythonRelaxDeps = [ "requests-oauthlib" ];

From 31aea8e5e02750901de1e8bc0a30325d79ed10d7 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Wed, 29 Oct 2025 00:06:25 +0100
Subject: [PATCH 3717/6226] flameshot: 13.2.0 -> 13.3.0

Changelog:
https://github.com/flameshot-org/flameshot/releases/tag/v13.3.0
Diff:
https://github.com/flameshot-org/flameshot/compare/v13.2.0...v13.3.0
---
 pkgs/by-name/fl/flameshot/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix
index 7eeda3cd9147..fddb51d8133e 100644
--- a/pkgs/by-name/fl/flameshot/package.nix
+++ b/pkgs/by-name/fl/flameshot/package.nix
@@ -18,13 +18,13 @@ assert stdenv.hostPlatform.isDarwin -> (!enableWlrSupport);
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "flameshot";
-  version = "13.2.0";
+  version = "13.3.0";
 
   src = fetchFromGitHub {
     owner = "flameshot-org";
     repo = "flameshot";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oQMM2BUY6gpBjSRboR1YMZLIi6p0EmrHps7Y6YI7ytU=";
+    hash = "sha256-RyoLniRmJRinLUwgmaA4RprYAVHnoPxCP9LyhHfUPe0=";
   };
 
   cmakeFlags = [

From bc8be4c96ad0e127ab94fe8b9b8dd70ea9ab6d1b Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 28 Oct 2025 16:09:12 -0700
Subject: [PATCH 3718/6226] cudaPackages.cudnn: support more CUDA and cuDNN
 releases

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/packages/cudnn.nix           | 174 +++++++++++-------
 1 file changed, 107 insertions(+), 67 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/cudnn.nix b/pkgs/development/cuda-modules/packages/cudnn.nix
index 9dec6fbf5fbb..dfe581b72dab 100644
--- a/pkgs/development/cuda-modules/packages/cudnn.nix
+++ b/pkgs/development/cuda-modules/packages/cudnn.nix
@@ -1,77 +1,117 @@
 {
   _cuda,
+  backendStdenv,
   buildRedist,
   lib,
   libcublas,
   patchelf,
   zlib,
 }:
-buildRedist (finalAttrs: {
-  redistName = "cudnn";
-  pname = "cudnn";
+buildRedist (
+  finalAttrs:
+  let
+    inherit (backendStdenv) cudaCapabilities;
+    cudnnAtLeast = lib.versionAtLeast finalAttrs.version;
+    cudnnOlder = lib.versionOlder finalAttrs.version;
+  in
+  {
+    redistName = "cudnn";
+    pname = "cudnn";
 
-  outputs = [
-    "out"
-    "dev"
-    "include"
-    "lib"
-    "static"
-  ];
-
-  buildInputs = [
-    # NOTE: Verions of CUDNN after 9.0 no longer depend on libcublas:
-    # https://docs.nvidia.com/deeplearning/cudnn/latest/release-notes.html?highlight=cublas#cudnn-9-0-0
-    # However, NVIDIA only provides libcublasLT via the libcublas package.
-    (lib.getLib libcublas)
-    zlib
-  ];
-
-  # Tell autoPatchelf about runtime dependencies. *_infer* libraries only
-  # exist in CuDNN 8.
-  # NOTE: Versions from CUDNN releases have four components.
-  postFixup =
-    lib.optionalString
-      (lib.versionAtLeast finalAttrs.version "8.0.5.0" && lib.versionOlder finalAttrs.version "9.0.0.0")
-      ''
-        ${lib.getExe patchelf} $lib/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so
-        ${lib.getExe patchelf} $lib/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so
-      '';
-
-  # TODO(@connorbaker): Broken conditions for cuDNN used out of scope.
-  # platformAssertions =
-  #   let
-  #     cudaTooOld = cudaOlder finalAttrs.passthru.featureRelease.minCudaVersion;
-  #     cudaTooNew =
-  #       (finalAttrs.passthru.featureRelease.maxCudaVersion != null)
-  #       && lib.versionOlder finalAttrs.passthru.featureRelease.maxCudaVersion cudaMajorMinorVersion;
-  #   in
-  #   prevAttrs.passthru.platformAssertions or [ ]
-  #   ++ [
-  #     {
-  #       message = "CUDA version is too old";
-  #       assertion = cudaTooOld;
-  #     }
-  #     {
-  #       message = "CUDA version is too new";
-  #       assertion = cudaTooNew;
-  #     }
-  #   ];
-
-  meta = {
-    description = "GPU-accelerated library of primitives for deep neural networks";
-    longDescription = ''
-      The NVIDIA CUDA Deep Neural Network library (cuDNN) is a GPU-accelerated library of primitives for deep neural
-      networks.
-    '';
-    homepage = "https://developer.nvidia.com/cudnn";
-    changelog = "https://docs.nvidia.com/deeplearning/cudnn/backend/latest/release-notes.html";
-
-    license = _cuda.lib.licenses.cudnn;
-
-    maintainers = with lib.maintainers; [
-      mdaiter
-      samuela
-      connorbaker
+    outputs = [
+      "out"
+      "dev"
+      "include"
+      "lib"
+      "static"
     ];
-  };
-})
+
+    buildInputs = [
+      # NOTE: Verions of CUDNN after 9.0 no longer depend on libcublas:
+      # https://docs.nvidia.com/deeplearning/cudnn/latest/release-notes.html?highlight=cublas#cudnn-9-0-0
+      # However, NVIDIA only provides libcublasLT via the libcublas package.
+      (lib.getLib libcublas)
+      zlib
+    ];
+
+    # Tell autoPatchelf about runtime dependencies. *_infer* libraries only
+    # exist in CuDNN 8.
+    # NOTE: Versions from CUDNN releases have four components.
+    postFixup = lib.optionalString (cudnnAtLeast "8" && cudnnOlder "9") ''
+      ${lib.getExe patchelf} ''${!outputLib:?}/lib/libcudnn.so --add-needed libcudnn_cnn_infer.so
+      ${lib.getExe patchelf} ''${!outputLib:?}/lib/libcudnn_ops_infer.so --add-needed libcublas.so --add-needed libcublasLt.so
+    '';
+
+    # NOTE:
+    #   With cuDNN forward compatiblity, all non-natively supported compute capabilities JIT compile PTX kernels.
+    #
+    #   While this is sub-optimal and we should warn the user and encourage them to use a newer version of cuDNN, we
+    #   have no clean mechanism by which we can warn the user, or allow silencing such a warning if the use of an
+    #   older cuDNN is intentional.
+    #
+    #   As such, we only warn about capabilities which are no longer supported by cuDNN.
+    #
+    # NOTE:
+    #
+    #   NVIDIA promises forward compatibility of cuDNN for major versions of CUDA. As an example, the cuDNN build for
+    #   CUDA 12 is compatible with all, and will remain compatible with, all CUDA 12 releases. However, this does not
+    #   extend to static linking with CUDA 11!
+    #
+    #   We don't need to check the CUDA version to see if it falls within some supported range -- if a user decides
+    #   to do static linking against some odd combination of CUDA 11 and cuDNN, that's on them.
+    #
+    platformAssertions =
+      let
+        # Create variables and use logical OR to allow short-circuiting.
+
+        cudnnAtLeast912 = cudnnAtLeast "9.12";
+        cudnnAtLeast88 = cudnnAtLeast912 || cudnnAtLeast "8.8";
+        cudnnAtLeast85 = cudnnAtLeast88 || cudnnAtLeast "8.5";
+
+        allCCNewerThan75 = lib.all (lib.flip lib.versionAtLeast "7.5") cudaCapabilities;
+        allCCNewerThan50 = allCCNewerThan75 || lib.all (lib.flip lib.versionAtLeast "5.0") cudaCapabilities;
+        allCCNewerThan35 = allCCNewerThan50 || lib.all (lib.flip lib.versionAtLeast "3.5") cudaCapabilities;
+      in
+      [
+        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-850/support-matrix/index.html#cudnn-cuda-hardware-versions
+        {
+          message =
+            "cuDNN releases since 8.5 (found ${finalAttrs.version})"
+            + " support CUDA compute capabilities 3.5 and newer (found ${builtins.toJSON cudaCapabilities})";
+          assertion = cudnnAtLeast85 -> allCCNewerThan35;
+        }
+        # https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-880/support-matrix/index.html#cudnn-cuda-hardware-versions
+        {
+          message =
+            "cuDNN releases since 8.8 (found ${finalAttrs.version})"
+            + " support CUDA compute capabilities 5.0 and newer (found ${builtins.toJSON cudaCapabilities})";
+          assertion = cudnnAtLeast88 -> allCCNewerThan50;
+        }
+        # https://docs.nvidia.com/deeplearning/cudnn/backend/v9.12.0/reference/support-matrix.html#gpu-cuda-toolkit-and-cuda-driver-requirements
+        {
+          message =
+            "cuDNN releases since 9.12 (found ${finalAttrs.version})"
+            + " support CUDA compute capabilities 7.5 and newer (found ${builtins.toJSON cudaCapabilities})";
+          assertion = cudnnAtLeast912 -> allCCNewerThan75;
+        }
+      ];
+
+    meta = {
+      description = "GPU-accelerated library of primitives for deep neural networks";
+      longDescription = ''
+        The NVIDIA CUDA Deep Neural Network library (cuDNN) is a GPU-accelerated library of primitives for deep neural
+        networks.
+      '';
+      homepage = "https://developer.nvidia.com/cudnn";
+      changelog = "https://docs.nvidia.com/deeplearning/cudnn/backend/latest/release-notes.html";
+
+      license = _cuda.lib.licenses.cudnn;
+
+      maintainers = with lib.maintainers; [
+        mdaiter
+        samuela
+        connorbaker
+      ];
+    };
+  }
+)

From a9caf74e0fbcf2fc69e796be0394d36fa839c06b Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 21 Oct 2025 09:23:48 -0300
Subject: [PATCH 3719/6226] gargoyle: fix build with cmake4

---
 pkgs/by-name/ga/gargoyle/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/ga/gargoyle/package.nix b/pkgs/by-name/ga/gargoyle/package.nix
index 3722c7a16240..63e8fdba53ea 100644
--- a/pkgs/by-name/ga/gargoyle/package.nix
+++ b/pkgs/by-name/ga/gargoyle/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   fetchDebianPatch,
+  fetchpatch,
   cmake,
   pkg-config,
   fluidsynth,
@@ -36,6 +37,11 @@ stdenv.mkDerivation rec {
       patch = "ftbfs_gcc14.patch";
       hash = "sha256-eMx/RlUpq5Ez+1L8VZo40Y3h2ZKkqiQEmKTlkZRMXnI=";
     })
+    (fetchpatch {
+      name = "cmake4-fix";
+      url = "https://github.com/garglk/garglk/commit/8d976852e2db0215e9cf4f926e626f1aa766f751.patch?full_index=1";
+      hash = "sha256-lJAuiOErSp3oDmeoqrfCdnHH816VLYiVthIG4U8BJ5E=";
+    })
   ];
 
   postPatch = ''

From 1851598a8186a7fe6e18d137a6a28edfea2aa8e0 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 22 Apr 2025 23:47:04 +0200
Subject: [PATCH 3720/6226] python312Packages.dask: 2025.7.0 -> 2025.10.0

Diff:
https://github.com/dask/dask/compare/refs/tags/2025.7.0...refs/tags/2025.10.0

Changelog: https://docs.dask.org/en/latest/changelog.html
---
 pkgs/development/python-modules/dask/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index fd60adb945d1..9dee7a37aa21 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -38,14 +38,14 @@
 
 buildPythonPackage rec {
   pname = "dask";
-  version = "2025.7.0";
+  version = "2025.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dask";
     repo = "dask";
     tag = version;
-    hash = "sha256-bwM4Q95YTEp9pDz6LmBLOeYjmi8nH8Cc/srZlXfEIlg=";
+    hash = "sha256-xPgMhydsFmwg0kyl3Lst1N+CsbbnsWdPOtkZ8BMPDR8=";
   };
 
   postPatch = ''
@@ -121,11 +121,6 @@ buildPythonPackage rec {
     "network"
   ];
 
-  disabledTests = [
-    # UserWarning: Insufficient elements for `head`. 10 elements requested, only 5 elements available. Try passing larger `npartitions` to `head`.
-    "test_set_index_head_nlargest_string"
-  ];
-
   __darwinAllowLocalNetworking = true;
 
   pythonImportsCheck = [

From 0c391927669336b22032523e2fea5ecced7400a1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 31 Jul 2025 13:00:16 +0200
Subject: [PATCH 3721/6226] python3Packages.awkward-cpp: 47 -> 50

---
 pkgs/development/python-modules/awkward-cpp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/awkward-cpp/default.nix b/pkgs/development/python-modules/awkward-cpp/default.nix
index 38478f56864b..fd56d8742eff 100644
--- a/pkgs/development/python-modules/awkward-cpp/default.nix
+++ b/pkgs/development/python-modules/awkward-cpp/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "awkward-cpp";
-  version = "47";
+  version = "50";
   pyproject = true;
 
   src = fetchPypi {
     pname = "awkward_cpp";
     inherit version;
-    hash = "sha256-Z2z0l2gQ7asyGH7fWopxavlQR7kDjJbSfTvkTxMxlQ8=";
+    hash = "sha256-JktvtOgqzBBXtbL/DTP6vDYQMlKOIzgVzSIkxtvJbY4=";
   };
 
   build-system = [

From 71cbb752aa36854eb4a7deb3685b9789256d643c Mon Sep 17 00:00:00 2001
From: Jasi <normalc@posteo.net>
Date: Sun, 26 Oct 2025 15:31:20 -0400
Subject: [PATCH 3722/6226] duckstation: 0.1-9669 ->
 0.1-9787-unstable-2025-10-13

Replaces the install plan removed by upstream as it was primarily used
for flatpak. It seems for now that Linux will still be a target as
this the dust has settled on appimage being the binary package format.
---
 pkgs/by-name/du/duckstation/package.nix  | 60 +++++++++++++-----------
 pkgs/by-name/du/duckstation/sources.json |  6 +--
 2 files changed, 36 insertions(+), 30 deletions(-)

diff --git a/pkgs/by-name/du/duckstation/package.nix b/pkgs/by-name/du/duckstation/package.nix
index 05232359446d..e84c5306363f 100644
--- a/pkgs/by-name/du/duckstation/package.nix
+++ b/pkgs/by-name/du/duckstation/package.nix
@@ -8,7 +8,6 @@
   ninja,
   extra-cmake-modules,
   wayland-scanner,
-  makeBinaryWrapper,
   qt6,
   sdl3,
   zstd,
@@ -29,7 +28,7 @@
   spirv-cross,
   udev,
   libbacktrace,
-  ffmpeg-headless,
+  ffmpeg_8-headless,
   alsa-lib,
   libjack2,
   libpulseaudio,
@@ -47,17 +46,11 @@ let
   meta = {
     description = "Fast PlayStation 1 emulator for x86-64/AArch32/AArch64/RV64";
     longDescription = ''
-      # DISCLAIMER
-      This is an **unofficial** package, do not report any issues to
-      duckstation developers. Instead, please report them to
+      DISCLAIMER: This is an **unofficial** package, do not report any
+      issues to duckstation developers. Instead, please report them to
       <https://github.com/NixOS/nixpkgs> or use the officially
       supported platform build at <https://duckstation.org> or other
-      upstream-approved distribution mechanism not listed here. We
-      (nixpkgs) do not endorse or condone any action taken on your own
-      accord in regards to this package.
-
-      The SDL audio backend must be used as cubeb support is currently
-      non-functional without patches.
+      upstream-approved distribution mechanism not listed here.
     '';
     homepage = "https://duckstation.org";
     license = lib.licenses.cc-by-nc-nd-40;
@@ -71,15 +64,22 @@ let
 
   linuxDrv = llvmPackages.stdenv.mkDerivation (finalAttrs: {
     pname = "duckstation";
-    version = pkgSources.duckstation.version;
+    version = "0.1-9787-unstable-2025-10-13";
 
     src = fetchFromGitHub {
       owner = "stenzek";
       repo = "duckstation";
-      tag = "v${finalAttrs.version}";
-      hash = pkgSources.duckstation.hash_linux;
+      rev = "8f0c9dd171210dfd7f06223a393e2565abbaabf3";
+      hash = "sha256-CzHWdY0RaGBB6CY3PzHHHbq3/Mbf6WtUm6Dizr0IW6I=";
     };
 
+    # TODO: Remove once this is fixed upstream.
+    postPatch = ''
+      substituteInPlace src/util/animated_image.cpp \
+        --replace-fail "png_write_frame_head(png_ptr, info_ptr," \
+                       "png_write_frame_head(png_ptr, info_ptr, 0,"
+    '';
+
     vendorDiscordRPC = llvmPackages.stdenv.mkDerivation {
       pname = "discord-rpc-duckstation";
       inherit (finalAttrs) version;
@@ -190,7 +190,8 @@ let
           - Improving performance.
           - Fixing game-breaking bugs.
           - Unlocking the frame rate (e.g. "60 FPS patches").
-          - Widescreen rendering where the built-in widescreen rendering rendering is insufficient.
+          - Widescreen rendering where the built-in widescreen
+            rendering rendering is insufficient.
         '';
         license = lib.licenses.mit;
         inherit (meta) maintainers;
@@ -209,7 +210,6 @@ let
       ninja
       extra-cmake-modules
       wayland-scanner
-      makeBinaryWrapper
       qt6.wrapQtAppsHook
       qt6.qttools
     ];
@@ -232,7 +232,7 @@ let
       qt6.qtbase
       udev
       libbacktrace
-      ffmpeg-headless
+      ffmpeg_8-headless
       alsa-lib
       libjack2
       pipewire
@@ -244,19 +244,14 @@ let
       finalAttrs.soundtouch
     ];
 
-    cmakeFlags = [
-      (lib.cmakeBool "ALLOW_INSTALL" true)
-      (lib.cmakeFeature "CMAKE_INSTALL_PREFIX" "${placeholder "out"}/lib/duckstation")
-    ];
+    installPhase = ''
+      runHook preInstall
 
-    postInstall = ''
-      makeWrapper $out/lib/duckstation/duckstation-qt $out/bin/duckstation-qt
-
-      mkdir -p $out/share/applications
+      mkdir -p $out/{lib,bin,share/{applications,icons/hicolor/512x512/apps}}
+      cp -r bin $out/lib/duckstation
+      ln -s $out/lib/duckstation/duckstation-qt $out/bin/duckstation-qt
       ln -s $out/lib/duckstation/resources/org.duckstation.DuckStation.desktop \
             $out/share/applications
-
-      mkdir -p $out/share/icons/hicolor/512x512/apps
       ln -s $out/lib/duckstation/resources/org.duckstation.DuckStation.png \
             $out/share/icons/hicolor/512x512/apps
 
@@ -265,8 +260,19 @@ let
       install -Dm644 README.* -t $out/share/doc/duckstation
       install -Dm644 CONTRIBUTORS.md -t $out/share/doc/duckstation
       popd
+
+      runHook postInstall
     '';
 
+    qtWrapperArgs = [
+      "--prefix LD_LIBRARY_PATH : ${
+        (lib.makeLibraryPath [
+          ffmpeg_8-headless
+          finalAttrs.vendorShaderc
+        ])
+      }"
+    ];
+
     inherit passthru;
 
     meta = meta // {
diff --git a/pkgs/by-name/du/duckstation/sources.json b/pkgs/by-name/du/duckstation/sources.json
index dfca7c572752..a4db277a14d0 100644
--- a/pkgs/by-name/du/duckstation/sources.json
+++ b/pkgs/by-name/du/duckstation/sources.json
@@ -13,8 +13,8 @@
     "hash": "sha256-/o3LPYvMTlKhuvLQITnADmz8BTGXVaVR0aciOWVyFS8="
   },
   "chtdb": {
-    "date": "2025-10-05",
-    "rev": "eab12dde0ddfd03e1260d7111f2a0709144e047e",
-    "hash": "sha256-wRk9BijV52BCcvpeq4CzhLsaWYYrt+vFvdMwlAixBvU="
+    "date": "2025-10-16",
+    "rev": "aff6149c29beae9c52aa35ea5cb53986c8916546",
+    "hash": "sha256-gpJ6Wlo7PGMPraK8Bppb+3qDWZ6Oxd4kvLJEFtGF50U="
   }
 }

From 9029dde28129467c35411fbf938ae6c2b74e4c0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 28 Oct 2025 16:24:49 -0700
Subject: [PATCH 3723/6226] python3Packages.ha-silabs-firmware-client: 0.2.0 ->
 0.3.0

Diff: https://github.com/home-assistant-libs/ha-silabs-firmware-client/compare/v0.2.0...v0.3.0

Changelog: https://github.com/home-assistant-libs/ha-silabs-firmware-client/releases/tag/v0.3.0
---
 .../python-modules/ha-silabs-firmware-client/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ha-silabs-firmware-client/default.nix b/pkgs/development/python-modules/ha-silabs-firmware-client/default.nix
index dd983d98cdd4..dbe4b27569dd 100644
--- a/pkgs/development/python-modules/ha-silabs-firmware-client/default.nix
+++ b/pkgs/development/python-modules/ha-silabs-firmware-client/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "ha-silabs-firmware-client";
-  version = "0.2.0";
+  version = "0.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "home-assistant-libs";
     repo = "ha-silabs-firmware-client";
     tag = "v${version}";
-    hash = "sha256-Kip9JL9tuF7OI22elN0w2Z7Xjdaayboo8LThp4FAets=";
+    hash = "sha256-OCDMJtcgBfVKATJQgqH/YuEU8112tSBjqT81jDUu4b8=";
   };
 
   postPatch = ''

From 85b035d9a741799aa9c2deb095ee072477d1e2d6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 31 Jul 2025 12:59:43 +0200
Subject: [PATCH 3724/6226] python3Packages.awkward: 2.8.5 -> 2.8.10

Diff:
https://github.com/scikit-hep/awkward/compare/refs/tags/v2.8.5...refs/tags/v2.8.10

Changelog: https://github.com/scikit-hep/awkward/releases/tag/v2.8.10
---
 pkgs/development/python-modules/awkward/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/awkward/default.nix b/pkgs/development/python-modules/awkward/default.nix
index 60fffc48ea07..a7b5764ec5db 100644
--- a/pkgs/development/python-modules/awkward/default.nix
+++ b/pkgs/development/python-modules/awkward/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "awkward";
-  version = "2.8.5";
+  version = "2.8.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "awkward";
     tag = "v${version}";
-    hash = "sha256-vcVJ9dLiZ3wfZU989slefSJoD2hKlRCwxRALvRGLZPA=";
+    hash = "sha256-zECnqZapgvB9ngkoAwEDFMyebFbE0iJ7Yo/5iLcmRXs=";
   };
 
   build-system = [
@@ -62,7 +62,7 @@ buildPythonPackage rec {
 
   disabledTestPaths = [
     # Need to be run on a GPU platform.
-    "tests-cuda"
+    "tests-cuda/*"
   ];
 
   meta = {

From 34686821378bc216c1f58c247d8e353a139fe244 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 10 Sep 2025 12:15:45 +0200
Subject: [PATCH 3725/6226] python3Packages.distributed: 2025.7.0 -> 2025.10.0

Diff: https://github.com/dask/distributed/compare/2025.7.0...2025.10.0

Changelog: https://github.com/dask/distributed/releases/tag/2025.10.0
---
 pkgs/development/python-modules/distributed/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index db117b6a05af..8beeb848a05c 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "distributed";
-  version = "2025.7.0";
+  version = "2025.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dask";
     repo = "distributed";
     tag = version;
-    hash = "sha256-np4hCamNTbnmLdfjFeHsxEEm9XI1O0kOczDe1YjSziw=";
+    hash = "sha256-qO03jwZeOjDP/BQxK8OFma5BxGF9nBoXVFWFGa+EQ00=";
   };
 
   postPatch = ''

From 7aaaeb68893b5abcb40174d9c1b95f801bdd977c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 20 Sep 2025 13:01:26 +0000
Subject: [PATCH 3726/6226] python3Packages.dask-awkward: 2025.5.0 -> 2025.9.0

Diff: https://github.com/dask-contrib/dask-awkward/compare/2025.5.0...2025.9.0

Changelog: https://github.com/dask-contrib/dask-awkward/releases/tag/2025.9.0
---
 pkgs/development/python-modules/dask-awkward/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dask-awkward/default.nix b/pkgs/development/python-modules/dask-awkward/default.nix
index 50c5b7a12fe6..28c9fd9be2de 100644
--- a/pkgs/development/python-modules/dask-awkward/default.nix
+++ b/pkgs/development/python-modules/dask-awkward/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "dask-awkward";
-  version = "2025.5.0";
+  version = "2025.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dask-contrib";
     repo = "dask-awkward";
     tag = version;
-    hash = "sha256-TLMT7YxedBUfz05F8wTsS5LQ9LyBbcUhQENM8C7Xric=";
+    hash = "sha256-7z9SkkE4WqULW0m7lk+oohq1uwSO7XLcrnh6U7wqTgo=";
   };
 
   build-system = [

From 8b63a3a4014992829732605daff734ecc0f99b2e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 21 Sep 2025 09:17:57 +0000
Subject: [PATCH 3727/6226] python3Packages.coffea: 2025.7.3 -> 2025.10.2

Diff:
https://github.com/CoffeaTeam/coffea/compare/v2025.7.3...v2025.10.2

Changelog: https://github.com/CoffeaTeam/coffea/releases/tag/v2025.10.2
---
 pkgs/development/python-modules/coffea/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/coffea/default.nix b/pkgs/development/python-modules/coffea/default.nix
index eddb30de6b93..32524ca40c76 100644
--- a/pkgs/development/python-modules/coffea/default.nix
+++ b/pkgs/development/python-modules/coffea/default.nix
@@ -16,6 +16,7 @@
   dask,
   dask-awkward,
   dask-histogram,
+  fsspec,
   hist,
   lz4,
   matplotlib,
@@ -41,14 +42,14 @@
 
 buildPythonPackage rec {
   pname = "coffea";
-  version = "2025.7.3";
+  version = "2025.10.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CoffeaTeam";
     repo = "coffea";
     tag = "v${version}";
-    hash = "sha256-lCrmWcVzu8Ls0a+r2D1DMZ/Ysq3H9bPj13XOmAS1M5I=";
+    hash = "sha256-vTTjdffQHzKnU41rW5XYTD7C4pH2fxhSy8mfKGMZbLc=";
   };
 
   build-system = [
@@ -69,6 +70,7 @@ buildPythonPackage rec {
     dask
     dask-awkward
     dask-histogram
+    fsspec
     hist
     lz4
     matplotlib

From f215065fb3929882a05db6138b5d65d1de196d25 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 28 Oct 2025 21:49:09 +0000
Subject: [PATCH 3728/6226] python3Packages.uproot: 5.6.6 -> 5.6.7

Diff: https://github.com/scikit-hep/uproot5/compare/v5.6.6...v5.6.7

Changelog: https://github.com/scikit-hep/uproot5/releases/tag/v5.6.7
---
 pkgs/development/python-modules/uproot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
index 190b3ed4bd9a..5e82a42a06c1 100644
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "uproot";
-  version = "5.6.6";
+  version = "5.6.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "uproot5";
     tag = "v${version}";
-    hash = "sha256-1zZr+SrGRNBz/Wd1cT2aYOH/MzSZTCuqxYIlA+NXqLk=";
+    hash = "sha256-4ClZ5XK5W9fseskYlfBmxO65OdfhJsV6Iaime7tGnOk=";
   };
 
   build-system = [

From e75075cc6e3634ebfe6a5250c28c9d12f9f935e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 23:27:43 +0000
Subject: [PATCH 3729/6226] hydrus: 643 -> 644

---
 pkgs/by-name/hy/hydrus/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hy/hydrus/package.nix b/pkgs/by-name/hy/hydrus/package.nix
index 6415b3051d75..3d166acf5ba5 100644
--- a/pkgs/by-name/hy/hydrus/package.nix
+++ b/pkgs/by-name/hy/hydrus/package.nix
@@ -16,14 +16,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "hydrus";
-  version = "643";
+  version = "644";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "hydrusnetwork";
     repo = "hydrus";
     tag = "v${version}";
-    hash = "sha256-8pxokenzKYXdvyNnNBQTphBi8FBAv85rnHSnEQrseLY=";
+    hash = "sha256-dEYKei7wu0lOhA/10c1sTOo0HH0HturrW8dje89skis=";
   };
 
   nativeBuildInputs = [

From 06b1088af642293e7a09f44ad1e302927333e59d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 13 Oct 2025 15:52:39 +0200
Subject: [PATCH 3730/6226] python313Packages.govee-ble: modernize

- fix license
---
 pkgs/development/python-modules/govee-ble/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/govee-ble/default.nix b/pkgs/development/python-modules/govee-ble/default.nix
index 493a791ef42e..a2ecfd8064c5 100644
--- a/pkgs/development/python-modules/govee-ble/default.nix
+++ b/pkgs/development/python-modules/govee-ble/default.nix
@@ -8,7 +8,6 @@
   poetry-core,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   sensor-state-data,
 }:
 
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "1.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "govee-ble";
@@ -42,11 +39,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "govee_ble" ];
 
-  meta = with lib; {
+  meta = {
     description = "Library for Govee BLE devices";
     homepage = "https://github.com/Bluetooth-Devices/govee-ble";
     changelog = "https://github.com/bluetooth-devices/govee-ble/blob/${src.tag}/CHANGELOG.md";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

From 2edf83dc9761dfe6f209fb2e374b16cde67bf695 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 23:36:49 +0000
Subject: [PATCH 3731/6226] azurehound: 2.8.0 -> 2.8.1

---
 pkgs/by-name/az/azurehound/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix
index aee89fec8197..65598aeaebdc 100644
--- a/pkgs/by-name/az/azurehound/package.nix
+++ b/pkgs/by-name/az/azurehound/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "azurehound";
-  version = "2.8.0";
+  version = "2.8.1";
 
   src = fetchFromGitHub {
     owner = "SpecterOps";
     repo = "AzureHound";
     tag = "v${version}";
-    hash = "sha256-nek4WXjXk36IcdnIFv0q1vTKmLnxgCu2xX/AzwQb8kc=";
+    hash = "sha256-xJcztNSYVTDyoRahROxBwIqq28GLhwqmIxHwDPX7Xho=";
   };
 
   vendorHash = "sha256-+iNFWKFNON4HX2mf4O29zAdElEkIGIx55Wi9MRtg1dg=";

From 1284766108576d91efd0b527ac928f5233cebd4b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 23:37:44 +0000
Subject: [PATCH 3732/6226] llama-cpp: 6821 -> 6869

---
 pkgs/by-name/ll/llama-cpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index e45a22e0aefb..7de7a14e7b25 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -75,13 +75,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "6821";
+  version = "6869";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-HqrX7xOYsF0UUF12c8KgIM2HMeTm1XxiFPuz/PaToI0=";
+    hash = "sha256-LZSeejn1IPybmfoRsOhg1YpTCFl0LrRJZyKT8ECbVjo=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT

From 59014ff98396faf380d994117f2ad934598bb006 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 00:44:56 +0100
Subject: [PATCH 3733/6226] python313Packages.garth: remove disabled

---
 pkgs/development/python-modules/garth/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix
index edc6000464f8..f2714d2d0c8e 100644
--- a/pkgs/development/python-modules/garth/default.nix
+++ b/pkgs/development/python-modules/garth/default.nix
@@ -6,7 +6,6 @@
   pydantic,
   pytest-vcr,
   pytestCheckHook,
-  pythonOlder,
   requests,
   requests-oauthlib,
 }:
@@ -16,8 +15,6 @@ buildPythonPackage rec {
   version = "0.5.18";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-+Df40ZYj5+Vo9IFFF+9wfGiKvhCWWy7hqhoBVZKsdx0=";

From e9ce23a47b48c7bc69ca1ad55ebda209a6f5d372 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 00:16:08 +0000
Subject: [PATCH 3734/6226] python3Packages.braintree: 4.39.0 -> 4.40.0

---
 pkgs/development/python-modules/braintree/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix
index 4944113c0406..cc646db07a17 100644
--- a/pkgs/development/python-modules/braintree/default.nix
+++ b/pkgs/development/python-modules/braintree/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "braintree";
-  version = "4.39.0";
+  version = "4.40.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "braintree";
     repo = "braintree_python";
     rev = version;
-    hash = "sha256-zBKp6nnVCv1eN5aKSbxM0qRBkokpu5mwoY5esK1C7LQ=";
+    hash = "sha256-50UKCtZBnuSMhRoh7HAw6WxiN9iSKY2L+61pA0hmCGY=";
   };
 
   build-system = [ setuptools ];

From 81429ef4e187dbee2daed68d1ee7a073e0ee1627 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Fri, 3 Oct 2025 21:58:09 +0200
Subject: [PATCH 3735/6226] parcellite: drop

---
 pkgs/by-name/pa/parcellite/package.nix | 52 --------------------------
 pkgs/top-level/aliases.nix             |  1 +
 2 files changed, 1 insertion(+), 52 deletions(-)
 delete mode 100644 pkgs/by-name/pa/parcellite/package.nix

diff --git a/pkgs/by-name/pa/parcellite/package.nix b/pkgs/by-name/pa/parcellite/package.nix
deleted file mode 100644
index a39b4d9f8ac8..000000000000
--- a/pkgs/by-name/pa/parcellite/package.nix
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoreconfHook,
-  gtk2,
-  hicolor-icon-theme,
-  intltool,
-  pkg-config,
-  which,
-  wrapGAppsHook3,
-  xdotool,
-  libappindicator-gtk2,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "parcellite";
-  version = "1.2.1";
-
-  src = fetchFromGitHub {
-    owner = "rickyrockrat";
-    repo = "parcellite";
-    rev = version;
-    sha256 = "19q4x6x984s6gxk1wpzaxawgvly5vnihivrhmja2kcxhzqrnfhiy";
-  };
-
-  nativeBuildInputs = [
-    autoreconfHook
-    intltool
-    pkg-config
-    wrapGAppsHook3
-  ];
-  buildInputs = [
-    gtk2
-    hicolor-icon-theme
-    libappindicator-gtk2
-  ];
-  NIX_LDFLAGS = "-lgio-2.0";
-
-  preFixup = ''
-    # Need which and xdotool on path to fix auto-pasting.
-    gappsWrapperArgs+=(--prefix PATH : "${which}/bin:${xdotool}/bin")
-  '';
-
-  meta = with lib; {
-    description = "Lightweight GTK clipboard manager";
-    homepage = "https://github.com/rickyrockrat/parcellite";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    mainProgram = "parcellite";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 09c9e0d8900a..fc47f1566450 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1151,6 +1151,7 @@ mapAliases {
   PageEdit = throw "'PageEdit' has been renamed to/replaced by 'pageedit'"; # Converted to throw 2025-10-27
   pal = throw "pal has been removed, as it was broken"; # Added 2025-08-25
   paperless-ng = throw "'paperless-ng' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2025-10-27
+  parcellite = throw "'parcellite' was remove due to lack of maintenance and relying on gtk2"; # Added 2025-10-03
   patchelfStable = throw "'patchelfStable' has been renamed to/replaced by 'patchelf'"; # Converted to throw 2025-10-27
   paup = throw "'paup' has been renamed to/replaced by 'paup-cli'"; # Converted to throw 2025-10-27
   pcp = throw "'pcp' has been removed because the upstream repo was archived and it hasn't been updated since 2021"; # Added 2025-09-23

From 9946ff0ee93c875a9b8cf433d121b369bbe1f905 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 00:18:56 +0000
Subject: [PATCH 3736/6226] vivictpp: 1.3.0 -> 1.3.1

---
 pkgs/by-name/vi/vivictpp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vi/vivictpp/package.nix b/pkgs/by-name/vi/vivictpp/package.nix
index 2e5709600e93..c363abe2a31d 100644
--- a/pkgs/by-name/vi/vivictpp/package.nix
+++ b/pkgs/by-name/vi/vivictpp/package.nix
@@ -21,7 +21,7 @@
 }:
 
 let
-  version = "1.3.0";
+  version = "1.3.1";
   withSubprojects = stdenv.mkDerivation {
     pname = "sources-with-subprojects";
     inherit version;
@@ -31,7 +31,7 @@ let
       repo = "vivictpp";
       tag = "v${version}";
       fetchSubmodules = true;
-      hash = "sha256-yzUgLZbqEzyJINWQUTC/j33XbjSXP1vpDlgiKv6Jx9Q=";
+      hash = "sha256-g/M3blW48uwL6v60IU4sRObYvR7Gjjn/X0lYSS86x+0=";
     };
 
     nativeBuildInputs = [
@@ -49,7 +49,7 @@ let
     '';
 
     outputHashMode = "recursive";
-    outputHash = "sha256-PtOb47QOffGje1U8Tle9AQon7ZCgMp/lITPAfM9/wr4=";
+    outputHash = "sha256-UbULDurC6qbcjP+fZJgd0nSVsimAyw3sYC08xeXcI14=";
   };
 in
 stdenv.mkDerivation {

From d0ee1fb2af61a4bdf3baadabd649b338efdf7904 Mon Sep 17 00:00:00 2001
From: Raphael Borun Das Gupta <git@raphael.dasgupta.ch>
Date: Wed, 29 Oct 2025 01:21:59 +0100
Subject: [PATCH 3737/6226] kmymoney: fix build for Qt 6.10

by adding patch
from https://src.fedoraproject.org/rpms/kmymoney/blob/rawhide/f/kmymoney-fix-build-against-qt-6-10.patch

Resolves #455948
---
 .../kmymoney-fix-build-against-qt-6-10.patch  | 30 +++++++++++++++++++
 pkgs/by-name/km/kmymoney/package.nix          |  5 ++++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/km/kmymoney/kmymoney-fix-build-against-qt-6-10.patch

diff --git a/pkgs/by-name/km/kmymoney/kmymoney-fix-build-against-qt-6-10.patch b/pkgs/by-name/km/kmymoney/kmymoney-fix-build-against-qt-6-10.patch
new file mode 100644
index 000000000000..0f61cf406897
--- /dev/null
+++ b/pkgs/by-name/km/kmymoney/kmymoney-fix-build-against-qt-6-10.patch
@@ -0,0 +1,30 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 32e2840..f21e7ed 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -183,7 +183,7 @@ if (PkgConfig_FOUND)
+ endif()
+ 
+ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} REQUIRED COMPONENTS Core DBus Widgets Svg Xml Test PrintSupport)
+-find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Sql Concurrent QuickWidgets)
++find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} OPTIONAL_COMPONENTS Sql SqlPrivate Concurrent QuickWidgets)
+ 
+ find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS Archive CoreAddons Config ConfigWidgets Crash I18n Completion KCMUtils ItemModels ItemViews Service XmlGui TextWidgets Notifications KIO)
+ 
+diff --git a/kmymoney/plugins/sqlcipher/CMakeLists.txt b/kmymoney/plugins/sqlcipher/CMakeLists.txt
+index ee6f2e7..aa3fc19 100644
+--- a/kmymoney/plugins/sqlcipher/CMakeLists.txt
++++ b/kmymoney/plugins/sqlcipher/CMakeLists.txt
+@@ -32,10 +32,8 @@ target_link_libraries(qsqlcipher
+   PRIVATE
+     PkgConfig::SQLCIPHER
+ )
+-if (TARGET Qt::SqlPrivate)
+-  target_link_libraries(qsqlcipher PRIVATE Qt::SqlPrivate)
+-endif()
+-target_link_libraries(qsqlcipher PRIVATE Qt::Sql)
++
++target_link_libraries(qsqlcipher PRIVATE Qt::Sql Qt::SqlPrivate)
+ 
+ if(BUILD_TESTING)
+  add_subdirectory(tests)
diff --git a/pkgs/by-name/km/kmymoney/package.nix b/pkgs/by-name/km/kmymoney/package.nix
index d0d9b8a752f5..a50826562ac2 100644
--- a/pkgs/by-name/km/kmymoney/package.nix
+++ b/pkgs/by-name/km/kmymoney/package.nix
@@ -77,6 +77,11 @@ stdenv.mkDerivation (finalAttrs: {
     python3.pkgs.woob
   ];
 
+  patches = [
+    # from https://src.fedoraproject.org/rpms/kmymoney/c/8f7f40d7fec6db96610e60a6a99717479594c8bd
+    ./kmymoney-fix-build-against-qt-6-10.patch
+  ];
+
   postPatch = ''
     buildPythonPath "${python3.pkgs.woob}"
     patchPythonScript "kmymoney/plugins/woob/interface/kmymoneywoob.py"

From b0a7ebed7b3774c0e789dd6c2e6b4cd6e57db165 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 00:26:53 +0000
Subject: [PATCH 3738/6226] azure-storage-azcopy: 10.30.1 -> 10.31.0

---
 pkgs/by-name/az/azure-storage-azcopy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/az/azure-storage-azcopy/package.nix b/pkgs/by-name/az/azure-storage-azcopy/package.nix
index 2e46e4172aee..2efd6aa75085 100644
--- a/pkgs/by-name/az/azure-storage-azcopy/package.nix
+++ b/pkgs/by-name/az/azure-storage-azcopy/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "azure-storage-azcopy";
-  version = "10.30.1";
+  version = "10.31.0";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-storage-azcopy";
     tag = "v${version}";
-    hash = "sha256-lHgOQ9Ff3RSi49peDETx98QMnLrANfBvkAx8c+ubiG0=";
+    hash = "sha256-5ZnQhaQScTK+jeoshwhheVF6//Jiosu7vMfi8s7bQJw=";
   };
 
   subPackages = [ "." ];
 
-  vendorHash = "sha256-WTsngwFA4J1CuAePKwPew/FZNrHJ9IoDCQFv63WAlzo=";
+  vendorHash = "sha256-KhlFWo0MuukOtn95T/2ppw21fiGHrcV7CA7RYqK7frs=";
 
   doCheck = false;
 

From de9edf592bde93fa101200c7e8f77daf21845261 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 00:33:15 +0000
Subject: [PATCH 3739/6226] python3Packages.beets-audible: 1.0.2 -> 1.1.0

---
 pkgs/development/python-modules/beets-audible/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/beets-audible/default.nix b/pkgs/development/python-modules/beets-audible/default.nix
index 39b265ac7235..92bebc0c3142 100644
--- a/pkgs/development/python-modules/beets-audible/default.nix
+++ b/pkgs/development/python-modules/beets-audible/default.nix
@@ -20,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "beets-audible";
-  version = "1.0.2";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Neurrone";
     repo = "beets-audible";
     rev = "v${version}";
-    hash = "sha256-6rf8U63SW+gwfT7ZdN/ymYKHRs0HSMDTP2ZBfULLsJs=";
+    hash = "sha256-Hi/hI+zfAHwRLt8JhzL5RXEIHnSBX8oO/zuuq1HxT2s=";
   };
 
   build-system = [

From 4b20a03d0bd71ed6f7fcf2d239bbc961a04b2339 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 00:37:12 +0000
Subject: [PATCH 3740/6226] exim: 4.98.2 -> 4.99

---
 pkgs/by-name/ex/exim/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ex/exim/package.nix b/pkgs/by-name/ex/exim/package.nix
index beb459c582b5..2ee910bcb939 100644
--- a/pkgs/by-name/ex/exim/package.nix
+++ b/pkgs/by-name/ex/exim/package.nix
@@ -39,11 +39,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "exim";
-  version = "4.98.2";
+  version = "4.99";
 
   src = fetchurl {
     url = "https://ftp.exim.org/pub/exim/exim4/${pname}-${version}.tar.xz";
-    hash = "sha256-iLjopnwdtswLHRSBYao25mL0yi/vJdW282lNSQ5C3K4=";
+    hash = "sha256-XfOLBC/6mpyNMbILyEgVWAcONhsG9ldghiKmKjJ63Lo=";
   };
 
   enableParallelBuilding = true;

From 980872c9091cdf77b6769d9b577b4e845a354acf Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Tue, 26 Aug 2025 20:31:56 -0700
Subject: [PATCH 3741/6226] apkeditor: 1.4.1 -> 1.4.5; add update script

---
 pkgs/by-name/ap/apkeditor/arsclib/default.nix |  8 +--
 .../by-name/ap/apkeditor/jcommand/default.nix |  6 +-
 pkgs/by-name/ap/apkeditor/package.nix         | 14 ++++-
 pkgs/by-name/ap/apkeditor/smali/default.nix   |  6 +-
 pkgs/by-name/ap/apkeditor/update.sh           | 58 +++++++++++++++++++
 5 files changed, 79 insertions(+), 13 deletions(-)
 create mode 100755 pkgs/by-name/ap/apkeditor/update.sh

diff --git a/pkgs/by-name/ap/apkeditor/arsclib/default.nix b/pkgs/by-name/ap/apkeditor/arsclib/default.nix
index 37e9d0d9ec59..56625eb1af31 100644
--- a/pkgs/by-name/ap/apkeditor/arsclib/default.nix
+++ b/pkgs/by-name/ap/apkeditor/arsclib/default.nix
@@ -8,8 +8,8 @@
 let
   self = REAndroidLibrary {
     pname = "arsclib";
-    # 1.3.5 is not new enough for APKEditor because of API changes
-    version = "1.3.5-unstable-2024-10-21";
+    # 1.3.8 is not new enough for APKEditor because of API changes
+    version = "1.3.8-unstable-2025-09-23";
     projectName = "ARSCLib";
 
     src = fetchFromGitHub {
@@ -18,8 +18,8 @@ let
       # This is the latest commit at the time of packaging.
       # It can be changed to a stable release ("V${version}")
       # if it is compatible with APKEditor.
-      rev = "ed6ccf00e56d7cce13e8648ad46a2678a6093248";
-      hash = "sha256-jzd7xkc4O+P9hlGsFGGl2P3pqVvV5+mDyKTRUuGfFSA=";
+      rev = "7238433395dea6f7d0fce3139f1659063ac31f42";
+      hash = "sha256-93eskC/qdkkNAZFYqSzoFxhmWgzTvDyZmZxOvwELGCs=";
     };
 
     mitmCache = gradle.fetchDeps {
diff --git a/pkgs/by-name/ap/apkeditor/jcommand/default.nix b/pkgs/by-name/ap/apkeditor/jcommand/default.nix
index 43b6ce8cae4c..b2e5a0c021ba 100644
--- a/pkgs/by-name/ap/apkeditor/jcommand/default.nix
+++ b/pkgs/by-name/ap/apkeditor/jcommand/default.nix
@@ -8,7 +8,7 @@
 let
   self = REAndroidLibrary {
     pname = "jcommand";
-    version = "0-unstable-2024-09-20";
+    version = "0-unstable-2025-01-21";
     projectName = "JCommand";
 
     src = fetchFromGitHub {
@@ -18,8 +18,8 @@ let
       # it is hard to determine the actual commit that APKEditor is intended to use,
       # so I think we should use the latest commit that doesn't break compilation or basic functionality.
       # Currently this is the latest commit at the time of packaging.
-      rev = "714b6263c28dabb34adc858951cf4bc60d6c3fed";
-      hash = "sha256-6Em+1ddUkZBCYWs88qtfeGnxISZchFrHgDL8fsgZoQg=";
+      rev = "27d5fd21dc7da268182ea81e59007af890adb06e";
+      hash = "sha256-sbblGrp16rMGGGt7xAFd9F3ACeadYYEymBEL+s5BZ1E=";
     };
 
     mitmCache = gradle.fetchDeps {
diff --git a/pkgs/by-name/ap/apkeditor/package.nix b/pkgs/by-name/ap/apkeditor/package.nix
index 04f1d608a952..8647e87359d1 100644
--- a/pkgs/by-name/ap/apkeditor/package.nix
+++ b/pkgs/by-name/ap/apkeditor/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitHub,
   callPackage,
+  versionCheckHook,
 
   jre,
   gradle,
@@ -54,7 +55,7 @@ let
   apkeditor =
     let
       pname = "apkeditor";
-      version = "1.4.1";
+      version = "1.4.5";
       projectName = "APKEditor";
     in
     REAndroidLibrary {
@@ -69,8 +70,8 @@ let
       src = fetchFromGitHub {
         owner = "REAndroid";
         repo = "APKEditor";
-        tag = "v${version}";
-        hash = "sha256-a72j9qGjJXnTFeqLez2rhBSArFVYCX+Xs7NQd8CY5Yk=";
+        tag = "V${version}";
+        hash = "sha256-yuNMyEnxTjHPSBPWVD8b+f612hWGGayZHKHxtWtxXDg=";
       };
 
       patches = [
@@ -99,8 +100,15 @@ let
           --add-flags "-jar $out/${apkeditor.outJar}"
       '';
 
+      doInstallCheck = true;
+      nativeInstallCheckInputs = [ versionCheckHook ];
+
+      passthru.updateScript = ./update.sh;
+
       meta = {
         description = "Powerful android apk resources editor";
+        homepage = "https://github.com/REAndroid/APKEditor";
+        changelog = "https://github.com/REAndroid/APKEditor/releases/tag/V${version}";
         maintainers = with lib.maintainers; [ ulysseszhan ];
         license = lib.licenses.asl20;
         platforms = lib.platforms.all;
diff --git a/pkgs/by-name/ap/apkeditor/smali/default.nix b/pkgs/by-name/ap/apkeditor/smali/default.nix
index de6b87c8e82e..ee0032ad27d0 100644
--- a/pkgs/by-name/ap/apkeditor/smali/default.nix
+++ b/pkgs/by-name/ap/apkeditor/smali/default.nix
@@ -8,7 +8,7 @@
 let
   self = REAndroidLibrary {
     pname = "smali";
-    version = "0-unstable-2024-10-15";
+    version = "0-unstable-2024-11-24";
     projectName = "smali";
 
     src = fetchFromGitHub {
@@ -18,8 +18,8 @@ let
       # it is hard to determine the actual commit that APKEditor is intended to use,
       # so I think we should use the latest commit that doesn't break compilation or basic functionality.
       # Currently this is the latest commit at the time of packaging.
-      rev = "c781eafb31f526abce9fdf406ce2c925fec20d28";
-      hash = "sha256-6tkvikgWMUcKwzsgbfpxlB6NZBAlZtTE34M3qPQw7Y4=";
+      rev = "76b35b4e0c9e8c874ca3e374bb943bba8d280770";
+      hash = "sha256-PhRBjiIKA4EIiafPplZNBErXG8V84Xn0cZLWVPmJelQ=";
     };
 
     patches = [
diff --git a/pkgs/by-name/ap/apkeditor/update.sh b/pkgs/by-name/ap/apkeditor/update.sh
new file mode 100755
index 000000000000..45b43b916690
--- /dev/null
+++ b/pkgs/by-name/ap/apkeditor/update.sh
@@ -0,0 +1,58 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl jq common-updater-scripts
+
+set -euo pipefail
+
+GITHUB_TOKEN="${GITHUB_TOKEN:-}"
+
+nixpkgs_attr() {
+  nix-instantiate --eval --raw --attr "$1"
+}
+
+github_api() {
+  local token_opt=()
+  if [[ -n "$GITHUB_TOKEN" ]]; then
+    token_opt=(-H "Authorization: Bearer $GITHUB_TOKEN")
+  fi
+  curl -fsS "${token_opt[@]}" "https://api.github.com$1"
+}
+
+update_mitm_cache() {
+  if [[ -z "$(nixpkgs_attr "$1.mitmCache.name")" ]]; then
+    return
+  fi
+  "$(nix-build -A "$1.mitmCache.updateScript")"
+}
+
+update() {
+  echo "Updating $1..." >&2
+
+  local owner="$(nixpkgs_attr "$1.src.owner")"
+  local repo="$(nixpkgs_attr "$1.src.repo")"
+
+  local old_version="$(nixpkgs_attr "$1.version")"
+  local use_last_commit=0
+  if [[ "$old_version" == *unstable* ]]; then
+    use_last_commit=1
+  fi
+
+  if (( use_last_commit )); then
+    local repo_info="$(github_api "/repos/$owner/$repo/commits?per_page=1" | jq ".[0]")"
+    local new_rev="$(echo "$repo_info" | jq -r .sha)"
+    local date="$(echo "$repo_info" | jq -r .commit.author.date)"
+    date="$(date -u -d "$date" +%Y-%m-%d)"
+    local new_version="${old_version%%-unstable*}-unstable-$(date -u -d "$date" +%Y-%m-%d)"
+    update-source-version "$1" "$new_version" --rev="$new_rev" --ignore-same-version --ignore-same-hash
+  else
+    local tag="$(github_api "/repos/$owner/$repo/releases/latest" | jq -r .tag_name)"
+    local new_version="${tag#V}"
+    update-source-version "$1" "$new_version" --ignore-same-version --ignore-same-hash
+  fi
+
+  update_mitm_cache "$1"
+}
+
+update apkeditor.passthru.deps.arsclib
+update apkeditor.passthru.deps.smali
+update apkeditor.passthru.deps.jcommand
+update apkeditor

From 780198f91a3db1843ad3f40bfc2b7a8aa428aa5c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 00:49:38 +0000
Subject: [PATCH 3742/6226] ocamlPackages.gapi-ocaml: 0.4.6 -> 0.4.7

---
 pkgs/development/ocaml-modules/gapi-ocaml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
index 040314db9b48..84ffc37a30cd 100644
--- a/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
+++ b/pkgs/development/ocaml-modules/gapi-ocaml/default.nix
@@ -12,7 +12,7 @@
 
 buildDunePackage rec {
   pname = "gapi-ocaml";
-  version = "0.4.6";
+  version = "0.4.7";
 
   minimalOCamlVersion = "4.08";
 
@@ -20,7 +20,7 @@ buildDunePackage rec {
     owner = "astrada";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-pMieplqWGjgA6NVK0hEEVTRjggZtiPP/OepRi9SxMok=";
+    hash = "sha256-uQJfrgF0oafURlamHslt9hX9MP4vFeVqDhuX7T/kjiY=";
   };
 
   nativeBuildInputs = [ cppo ];

From 78548a10075ab5d267d3d55b52af5a01873c7c73 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 00:52:33 +0000
Subject: [PATCH 3743/6226] rivet: 4.1.1 -> 4.1.2

---
 pkgs/by-name/ri/rivet/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ri/rivet/package.nix b/pkgs/by-name/ri/rivet/package.nix
index 8cd54f03583d..30228474e46b 100644
--- a/pkgs/by-name/ri/rivet/package.nix
+++ b/pkgs/by-name/ri/rivet/package.nix
@@ -21,11 +21,11 @@
 
 stdenv.mkDerivation rec {
   pname = "rivet";
-  version = "4.1.1";
+  version = "4.1.2";
 
   src = fetchurl {
     url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2";
-    hash = "sha256-vR1RM1XD9y8PiKly853Z8RRM6uLLRyVC5dMGD+q08cw=";
+    hash = "sha256-YSR/vD1qSKNcoBovKvn2JsTOKhQBpQ30a2B4yyDs3kY=";
   };
 
   latex = texliveBasic.withPackages (

From 1db6d1e7888f1833b87d1c0150607609c4b613ff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 00:54:10 +0000
Subject: [PATCH 3744/6226] yaydl: 0.17.3 -> 0.18.1

---
 pkgs/by-name/ya/yaydl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yaydl/package.nix b/pkgs/by-name/ya/yaydl/package.nix
index dbc9e670e139..ef637879a17b 100644
--- a/pkgs/by-name/ya/yaydl/package.nix
+++ b/pkgs/by-name/ya/yaydl/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "yaydl";
-  version = "0.17.3";
+  version = "0.18.1";
 
   src = fetchFromGitHub {
     owner = "dertuxmalwieder";
     repo = "yaydl";
     rev = "release-${version}";
-    sha256 = "sha256-bDsI61iWKgXDJ6wnK8a+1HCMlgRM0ol0bWb6a8IiY08=";
+    sha256 = "sha256-PSrLjqZ38gBlTiV6qMB3LzrcaqtM6hnZMI1uto24H94=";
   };
 
-  cargoHash = "sha256-WLWz+xzkxIqlYkNgefyc7c13YjPWpYz9VUlUfWwDN+g=";
+  cargoHash = "sha256-+BBB9YbYjNG7S+Lex/pwp7z06JbG+qMRI+TwSvMcYgg=";
 
   nativeBuildInputs = [
     pkg-config

From 476eda159f0ff96517a8d4606314a7b3b00ddf54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 00:56:21 +0000
Subject: [PATCH 3745/6226] go-judge: 1.9.8 -> 1.9.9

---
 pkgs/by-name/go/go-judge/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/go-judge/package.nix b/pkgs/by-name/go/go-judge/package.nix
index 24877f211833..c106594e9c76 100644
--- a/pkgs/by-name/go/go-judge/package.nix
+++ b/pkgs/by-name/go/go-judge/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "go-judge";
-  version = "1.9.8";
+  version = "1.9.9";
 
   src = fetchFromGitHub {
     owner = "criyle";
     repo = "go-judge";
     rev = "v${version}";
-    hash = "sha256-hBOH5FDqzUGiCXucbTPBPXdEnHPq7fL0SYlY5b3OMHY=";
+    hash = "sha256-orYfnqtNvTIJLAfjrrRU6WT3wKzQCzYmCNEHC8OBlQo=";
   };
 
-  vendorHash = "sha256-dUJpNGJvvmIJuA6GSWhL4weQEwn5iM9k+y8clHdxhvY=";
+  vendorHash = "sha256-2mCd8ymY9l4A2wAe7+MVCsCqT92qIVHHHfkNJvEMg5k=";
 
   tags = [
     "nomsgpack"

From 6a59147bfd5e5f51f06d9b4269ea4e0f5413a133 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 01:08:20 +0000
Subject: [PATCH 3746/6226] igv: 2.19.6 -> 2.19.7

---
 pkgs/by-name/ig/igv/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ig/igv/package.nix b/pkgs/by-name/ig/igv/package.nix
index f15fb382ce18..6806f71193ef 100644
--- a/pkgs/by-name/ig/igv/package.nix
+++ b/pkgs/by-name/ig/igv/package.nix
@@ -10,10 +10,10 @@
 
 stdenv.mkDerivation rec {
   pname = "igv";
-  version = "2.19.6";
+  version = "2.19.7";
   src = fetchzip {
     url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip";
-    sha256 = "sha256-hemTOCNBfigpvlFStBbxGGLpORYPfh6vn1pyE8hKWHw=";
+    sha256 = "sha256-IkzaQAM+s1boEKo/3ShtbUhihrhxLQCTz8/0lzAyYJA=";
   };
 
   installPhase = ''

From 8435c2e684435148db19937640f66e36174f5f94 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 14:50:58 -0700
Subject: [PATCH 3747/6226] linthesia: modernize, move to by-name/

---
 .../li/linthesia/package.nix}                      | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    |  2 --
 2 files changed, 7 insertions(+), 9 deletions(-)
 rename pkgs/{games/linthesia/default.nix => by-name/li/linthesia/package.nix} (78%)

diff --git a/pkgs/games/linthesia/default.nix b/pkgs/by-name/li/linthesia/package.nix
similarity index 78%
rename from pkgs/games/linthesia/default.nix
rename to pkgs/by-name/li/linthesia/package.nix
index a214c80b7792..013366e8ff40 100644
--- a/pkgs/games/linthesia/default.nix
+++ b/pkgs/by-name/li/linthesia/package.nix
@@ -18,7 +18,7 @@
   wrapGAppsHook3,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "linthesia";
   version = "unstable-2023-05-23";
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
     owner = "linthesia";
     repo = "linthesia";
     rev = "1f2701241f8865c2f5c14a97b81ae64884cf0396";
-    sha256 = "sha256-3uPcpDUGtAGW9q/u8Cn+0bNqikII1Y/a0PKARW/5nao=";
+    hash = "sha256-3uPcpDUGtAGW9q/u8Cn+0bNqikII1Y/a0PKARW/5nao=";
   };
 
   postPatch = ''
@@ -52,12 +52,12 @@ stdenv.mkDerivation rec {
     gtk3.out # icon cache
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Game of playing music using a MIDI keyboard following a MIDI file";
     mainProgram = "linthesia";
-    inherit (src.meta) homepage;
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    inherit (finalAttrs.src.meta) homepage;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e163d061a653..f085454caa53 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10012,8 +10012,6 @@ with pkgs;
   libkrun-sev = libkrun.override { variant = "sev"; };
   libkrun-tdx = libkrun.override { variant = "tdx"; };
 
-  linthesia = callPackage ../games/linthesia/default.nix { };
-
   projecteur = libsForQt5.callPackage ../os-specific/linux/projecteur { };
 
   lklWithFirewall = lkl.override { firewallSupport = true; };

From 40fe2a0d664704d0887333f7f37169d15a97ef6c Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 14:53:12 -0700
Subject: [PATCH 3748/6226] iortcw: move to by-name/

---
 .../iortcw/default.nix => by-name/io/iortcw/package.nix}       | 0
 pkgs/{games => by-name/io}/iortcw/sp.nix                       | 0
 pkgs/top-level/all-packages.nix                                | 3 +--
 3 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/{games/iortcw/default.nix => by-name/io/iortcw/package.nix} (100%)
 rename pkgs/{games => by-name/io}/iortcw/sp.nix (100%)

diff --git a/pkgs/games/iortcw/default.nix b/pkgs/by-name/io/iortcw/package.nix
similarity index 100%
rename from pkgs/games/iortcw/default.nix
rename to pkgs/by-name/io/iortcw/package.nix
diff --git a/pkgs/games/iortcw/sp.nix b/pkgs/by-name/io/iortcw/sp.nix
similarity index 100%
rename from pkgs/games/iortcw/sp.nix
rename to pkgs/by-name/io/iortcw/sp.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f085454caa53..c47c76a19619 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13203,9 +13203,8 @@ with pkgs;
 
   ibmcloud-cli = callPackage ../tools/admin/ibmcloud-cli { stdenv = stdenvNoCC; };
 
-  iortcw = callPackage ../games/iortcw { };
   # used as base package for iortcw forks
-  iortcw_sp = callPackage ../games/iortcw/sp.nix { };
+  iortcw_sp = callPackage ../by-name/io/iortcw/sp.nix { };
 
   katagoWithCuda = katago.override {
     backend = "cuda";

From 247bdeb02ff375f9ba4cc4b37f873446ad9e0d94 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 14:55:43 -0700
Subject: [PATCH 3749/6226] quakespasm: modernize, move to by-name/

---
 .../qu/quakespasm/package.nix}                   | 16 ++++++++--------
 ...quakespasm-darwin-makefile-improvements.patch |  0
 pkgs/{games => by-name/qu}/quakespasm/vulkan.nix |  0
 pkgs/top-level/all-packages.nix                  |  3 +--
 4 files changed, 9 insertions(+), 10 deletions(-)
 rename pkgs/{games/quakespasm/default.nix => by-name/qu/quakespasm/package.nix} (90%)
 rename pkgs/{games => by-name/qu}/quakespasm/quakespasm-darwin-makefile-improvements.patch (100%)
 rename pkgs/{games => by-name/qu}/quakespasm/vulkan.nix (100%)

diff --git a/pkgs/games/quakespasm/default.nix b/pkgs/by-name/qu/quakespasm/package.nix
similarity index 90%
rename from pkgs/games/quakespasm/default.nix
rename to pkgs/by-name/qu/quakespasm/package.nix
index 8b669b489773..d76476cce0e1 100644
--- a/pkgs/games/quakespasm/default.nix
+++ b/pkgs/by-name/qu/quakespasm/package.nix
@@ -20,16 +20,16 @@
   useSDL2 ? stdenv.hostPlatform.isDarwin, # TODO: CoreAudio fails to initialize with SDL 1.x for some reason.
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "quakespasm";
   version = "0.96.3";
 
   src = fetchurl {
-    url = "mirror://sourceforge/quakespasm/quakespasm-${version}.tar.gz";
-    sha256 = "sha256-tXjWzkpPf04mokRY8YxLzI04VK5iUuuZgu6B2V5QGA4=";
+    url = "mirror://sourceforge/quakespasm/quakespasm-${finalAttrs.version}.tar.gz";
+    hash = "sha256-tXjWzkpPf04mokRY8YxLzI04VK5iUuuZgu6B2V5QGA4=";
   };
 
-  sourceRoot = "${pname}-${version}/Quake";
+  sourceRoot = "quakespasm-${finalAttrs.version}/Quake";
 
   patches = lib.optionals stdenv.hostPlatform.isDarwin [
     # Makes Darwin Makefile use system libraries instead of ones from app bundle
@@ -113,7 +113,7 @@ stdenv.mkDerivation rec {
     })
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Engine for iD software's Quake";
     homepage = "https://quakespasm.sourceforge.net/";
     longDescription = ''
@@ -125,8 +125,8 @@ stdenv.mkDerivation rec {
       and smoother mouse input - though no CD support.
     '';
 
-    platforms = platforms.unix;
-    maintainers = with maintainers; [ mikroskeem ];
+    platforms = lib.platforms.unix;
+    maintainers = with lib.maintainers; [ mikroskeem ];
     mainProgram = "quake";
   };
-}
+})
diff --git a/pkgs/games/quakespasm/quakespasm-darwin-makefile-improvements.patch b/pkgs/by-name/qu/quakespasm/quakespasm-darwin-makefile-improvements.patch
similarity index 100%
rename from pkgs/games/quakespasm/quakespasm-darwin-makefile-improvements.patch
rename to pkgs/by-name/qu/quakespasm/quakespasm-darwin-makefile-improvements.patch
diff --git a/pkgs/games/quakespasm/vulkan.nix b/pkgs/by-name/qu/quakespasm/vulkan.nix
similarity index 100%
rename from pkgs/games/quakespasm/vulkan.nix
rename to pkgs/by-name/qu/quakespasm/vulkan.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c47c76a19619..ac4c21b29bea 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13333,8 +13333,7 @@ with pkgs;
     quake3hires
     ;
 
-  quakespasm = callPackage ../games/quakespasm { };
-  vkquake = callPackage ../games/quakespasm/vulkan.nix { };
+  vkquake = callPackage ../by-name/qu/quakespasm/vulkan.nix { };
 
   rogue = callPackage ../games/rogue {
     ncurses = ncurses5;

From 018e0aec1a7fb8df2811c2aacd1f69057ac3cd13 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 14:57:42 -0700
Subject: [PATCH 3750/6226] scummvm: modernize, move to by-name/

---
 pkgs/{games => by-name/sc}/scummvm/games.nix       |  0
 .../default.nix => by-name/sc/scummvm/package.nix} | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    |  4 +---
 3 files changed, 8 insertions(+), 10 deletions(-)
 rename pkgs/{games => by-name/sc}/scummvm/games.nix (100%)
 rename pkgs/{games/scummvm/default.nix => by-name/sc/scummvm/package.nix} (88%)

diff --git a/pkgs/games/scummvm/games.nix b/pkgs/by-name/sc/scummvm/games.nix
similarity index 100%
rename from pkgs/games/scummvm/games.nix
rename to pkgs/by-name/sc/scummvm/games.nix
diff --git a/pkgs/games/scummvm/default.nix b/pkgs/by-name/sc/scummvm/package.nix
similarity index 88%
rename from pkgs/games/scummvm/default.nix
rename to pkgs/by-name/sc/scummvm/package.nix
index 54e4c74bd414..15831abecef0 100644
--- a/pkgs/games/scummvm/default.nix
+++ b/pkgs/by-name/sc/scummvm/package.nix
@@ -23,14 +23,14 @@
   nix-update-script,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "scummvm";
   version = "2.9.1";
 
   src = fetchFromGitHub {
     owner = "scummvm";
     repo = "scummvm";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-+MM47piuXuIBmAQd0g/cAg5t02qSQ0sw/DwFrMUSIAA=";
   };
 
@@ -82,12 +82,12 @@ stdenv.mkDerivation rec {
     updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Program to run certain classic graphical point-and-click adventure games (such as Monkey Island)";
     mainProgram = "scummvm";
     homepage = "https://www.scummvm.org/";
-    license = licenses.gpl2Plus;
-    maintainers = [ maintainers.peterhoeg ];
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ peterhoeg ];
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ac4c21b29bea..044183deddec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13343,9 +13343,7 @@ with pkgs;
     buildShareware = true;
   };
 
-  scummvm = callPackage ../games/scummvm { };
-
-  inherit (callPackage ../games/scummvm/games.nix { })
+  inherit (callPackage ../by-name/sc/scummvm/games.nix { })
     beneath-a-steel-sky
     broken-sword-25
     drascula-the-vampire-strikes-back

From b427fd4b306494d05f90583a675ad9b186231e05 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 15:02:51 -0700
Subject: [PATCH 3751/6226] npush: modernize, move to by-name/

---
 .../default.nix => by-name/np/npush/package.nix}     | 12 ++++++------
 pkgs/{games => by-name/np}/npush/run.nix             |  0
 pkgs/top-level/all-packages.nix                      |  3 +--
 3 files changed, 7 insertions(+), 8 deletions(-)
 rename pkgs/{games/npush/default.nix => by-name/np/npush/package.nix} (79%)
 rename pkgs/{games => by-name/np}/npush/run.nix (100%)

diff --git a/pkgs/games/npush/default.nix b/pkgs/by-name/np/npush/package.nix
similarity index 79%
rename from pkgs/games/npush/default.nix
rename to pkgs/by-name/np/npush/package.nix
index 137f8d041165..b8ef0bbe4ad9 100644
--- a/pkgs/games/npush/default.nix
+++ b/pkgs/by-name/np/npush/package.nix
@@ -5,12 +5,12 @@
   ncurses,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "npush";
   version = "0.7";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/npush/${pname}/${version}/${pname}-${version}.tgz";
+    url = "mirror://sourceforge/project/npush/npush/${finalAttrs.version}/npush-${finalAttrs.version}.tgz";
     hash = "sha256-8hbSsyeehzd4T3fUhDyebyI/oTHOHr3a8ArYAquivNk=";
   };
 
@@ -42,13 +42,13 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     broken = stdenv.hostPlatform.isDarwin;
     homepage = "https://npush.sourceforge.net/";
     description = "Sokoban-like game";
     mainProgram = "npush";
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     maintainers = [ ];
-    platforms = with platforms; unix;
+    platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/games/npush/run.nix b/pkgs/by-name/np/npush/run.nix
similarity index 100%
rename from pkgs/games/npush/run.nix
rename to pkgs/by-name/np/npush/run.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 044183deddec..f170b716b22e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13267,8 +13267,7 @@ with pkgs;
 
   blightmud-tts = callPackage ../games/blightmud { withTTS = true; };
 
-  npush = callPackage ../games/npush { };
-  run-npush = callPackage ../games/npush/run.nix { };
+  run-npush = callPackage ../by-name/np/npush/run.nix { };
 
   openloco = pkgsi686Linux.callPackage ../games/openloco { };
 

From 36c03b6a2db76eed82a774e06727fc37660e8dfd Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 15:11:16 -0700
Subject: [PATCH 3752/6226] blightmud: modernize, move to by-name/

---
 .../bl/blightmud/package.nix}                      | 14 +++++++-------
 pkgs/top-level/all-packages.nix                    |  4 +---
 2 files changed, 8 insertions(+), 10 deletions(-)
 rename pkgs/{games/blightmud/default.nix => by-name/bl/blightmud/package.nix} (89%)

diff --git a/pkgs/games/blightmud/default.nix b/pkgs/by-name/bl/blightmud/package.nix
similarity index 89%
rename from pkgs/games/blightmud/default.nix
rename to pkgs/by-name/bl/blightmud/package.nix
index 23595aa070c2..aa9341e472c3 100644
--- a/pkgs/games/blightmud/default.nix
+++ b/pkgs/by-name/bl/blightmud/package.nix
@@ -9,14 +9,14 @@
   withTTS ? false,
   speechd-minimal,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "blightmud";
   version = "5.3.1";
 
   src = fetchFromGitHub {
     owner = "blightmud";
     repo = "blightmud";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-9GUul5EoejcnCQqq1oX+seBtxttYIUhgcexaZk+7chk=";
   };
 
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage rec {
     in
     builtins.concatStringsSep " " (map skipFlag skipList);
 
-  meta = with lib; {
+  meta = {
     description = "Terminal MUD client written in Rust";
     mainProgram = "blightmud";
     longDescription = ''
@@ -72,8 +72,8 @@ rustPlatform.buildRustPackage rec {
       friendly mode.
     '';
     homepage = "https://github.com/Blightmud/Blightmud";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ cpu ];
-    platforms = platforms.linux ++ platforms.darwin;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ cpu ];
+    platforms = with lib.platforms; linux ++ darwin;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f170b716b22e..9e2ff27b154b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13263,9 +13263,7 @@ with pkgs;
     lua = lua5_1;
   };
 
-  blightmud = callPackage ../games/blightmud { };
-
-  blightmud-tts = callPackage ../games/blightmud { withTTS = true; };
+  blightmud-tts = callPackage ../by-name/bl/blightmud/package.nix { withTTS = true; };
 
   run-npush = callPackage ../by-name/np/npush/run.nix { };
 

From 745401b28a852b2c9e34dfc0112d6b97e688267d Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 15:16:13 -0700
Subject: [PATCH 3753/6226] dxx-rebirth: move to by-name/

---
 pkgs/{games => by-name/dx}/dxx-rebirth/assets.nix         | 0
 pkgs/{games => by-name/dx}/dxx-rebirth/full.nix           | 0
 .../default.nix => by-name/dx/dxx-rebirth/package.nix}    | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 5 ++---
 4 files changed, 6 insertions(+), 7 deletions(-)
 rename pkgs/{games => by-name/dx}/dxx-rebirth/assets.nix (100%)
 rename pkgs/{games => by-name/dx}/dxx-rebirth/full.nix (100%)
 rename pkgs/{games/dxx-rebirth/default.nix => by-name/dx/dxx-rebirth/package.nix} (90%)

diff --git a/pkgs/games/dxx-rebirth/assets.nix b/pkgs/by-name/dx/dxx-rebirth/assets.nix
similarity index 100%
rename from pkgs/games/dxx-rebirth/assets.nix
rename to pkgs/by-name/dx/dxx-rebirth/assets.nix
diff --git a/pkgs/games/dxx-rebirth/full.nix b/pkgs/by-name/dx/dxx-rebirth/full.nix
similarity index 100%
rename from pkgs/games/dxx-rebirth/full.nix
rename to pkgs/by-name/dx/dxx-rebirth/full.nix
diff --git a/pkgs/games/dxx-rebirth/default.nix b/pkgs/by-name/dx/dxx-rebirth/package.nix
similarity index 90%
rename from pkgs/games/dxx-rebirth/default.nix
rename to pkgs/by-name/dx/dxx-rebirth/package.nix
index a0186148e404..8d52835a5457 100644
--- a/pkgs/games/dxx-rebirth/default.nix
+++ b/pkgs/by-name/dx/dxx-rebirth/package.nix
@@ -64,11 +64,11 @@ stdenv.mkDerivation {
 
   passthru.updateScript = unstableGitUpdater { };
 
-  meta = with lib; {
+  meta = {
     description = "Source Port of the Descent 1 and 2 engines";
     homepage = "https://www.dxx-rebirth.com/";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ peterhoeg ];
-    platforms = with platforms; linux;
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ peterhoeg ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e2ff27b154b..e5ba669cde58 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13127,14 +13127,13 @@ with pkgs;
 
   dfhack = dwarf-fortress-packages.dwarf-fortress-full;
 
-  dxx-rebirth = callPackage ../games/dxx-rebirth { };
 
-  inherit (callPackages ../games/dxx-rebirth/assets.nix { })
+  inherit (callPackages ../by-name/dx/dxx-rebirth/assets.nix { })
     descent1-assets
     descent2-assets
     ;
 
-  inherit (callPackages ../games/dxx-rebirth/full.nix { })
+  inherit (callPackages ../by-name/dx/dxx-rebirth/full.nix { })
     d1x-rebirth-full
     d2x-rebirth-full
     ;

From cc333161fb1d8a3428ab0440fb71317cde2606db Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 15:30:26 -0700
Subject: [PATCH 3754/6226] instawow: move to by-name/

---
 .../default.nix => by-name/in/instawow/package.nix}       | 8 ++++----
 pkgs/top-level/all-packages.nix                           | 2 --
 2 files changed, 4 insertions(+), 6 deletions(-)
 rename pkgs/{games/instawow/default.nix => by-name/in/instawow/package.nix} (84%)

diff --git a/pkgs/games/instawow/default.nix b/pkgs/by-name/in/instawow/package.nix
similarity index 84%
rename from pkgs/games/instawow/default.nix
rename to pkgs/by-name/in/instawow/package.nix
index 36d8e6b3cdc4..8a947eff0e16 100644
--- a/pkgs/games/instawow/default.nix
+++ b/pkgs/by-name/in/instawow/package.nix
@@ -14,7 +14,7 @@ python3.pkgs.buildPythonApplication rec {
     owner = "layday";
     repo = "instawow";
     tag = "v${version}";
-    sha256 = "sha256-NFs8+BUXJEn64TDojG/xkH1O+zZurv0PWY+YDhu2mQY=";
+    hash = "sha256-NFs8+BUXJEn64TDojG/xkH1O+zZurv0PWY+YDhu2mQY=";
   };
 
   extras = [ ]; # Disable GUI, most dependencies are not packaged.
@@ -44,11 +44,11 @@ python3.pkgs.buildPythonApplication rec {
     ]
     ++ plugins;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/layday/instawow";
     description = "World of Warcraft add-on manager CLI and GUI";
     mainProgram = "instawow";
-    license = licenses.gpl3;
-    maintainers = with maintainers; [ seirl ];
+    license = lib.licenses.gpl3;
+    maintainers = with lib.maintainers; [ seirl ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e5ba669cde58..229a9935b59c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5028,8 +5028,6 @@ with pkgs;
     indradb-client
     ;
 
-  instawow = callPackage ../games/instawow/default.nix { };
-
   irony-server = callPackage ../development/tools/irony-server {
     # The repository of irony to use -- must match the version of the employed emacs
     # package.  Wishing we could merge it into one irony package, to avoid this issue,

From cd8c6695597caef06e32f156802b8e7c85c28383 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 15:36:23 -0700
Subject: [PATCH 3755/6226] koboredux: move to by-name/

---
 .../default.nix => by-name/ko/koboredux/package.nix}         | 5 ++---
 pkgs/top-level/all-packages.nix                              | 5 +----
 2 files changed, 3 insertions(+), 7 deletions(-)
 rename pkgs/{games/koboredux/default.nix => by-name/ko/koboredux/package.nix} (98%)

diff --git a/pkgs/games/koboredux/default.nix b/pkgs/by-name/ko/koboredux/package.nix
similarity index 98%
rename from pkgs/games/koboredux/default.nix
rename to pkgs/by-name/ko/koboredux/package.nix
index d694266934cf..e51cf8a042e9 100644
--- a/pkgs/games/koboredux/default.nix
+++ b/pkgs/by-name/ko/koboredux/package.nix
@@ -14,7 +14,6 @@
 
 let
   inherit (lib)
-    and
     licenses
     maintainers
     optional
@@ -27,8 +26,8 @@ let
 
   main_src = fetchFromGitHub {
     owner = "olofson";
-    repo = pname;
-    rev = "v${version}";
+    repo = "koboredux";
+    tag = "v${version}";
     sha256 = "09h9r65z8bar2z89s09j6px0gdq355kjf38rmd85xb2aqwnm6xig";
   };
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 229a9935b59c..4bd59a5e2e39 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13125,7 +13125,6 @@ with pkgs;
 
   dfhack = dwarf-fortress-packages.dwarf-fortress-full;
 
-
   inherit (callPackages ../by-name/dx/dxx-rebirth/assets.nix { })
     descent1-assets
     descent2-assets
@@ -13215,9 +13214,7 @@ with pkgs;
     backend = "tensorrt";
   };
 
-  koboredux = callPackage ../games/koboredux { };
-
-  koboredux-free = callPackage ../games/koboredux {
+  koboredux-free = callPackage ../by-name/ko/koboredux/package.nix {
     useProprietaryAssets = false;
   };
 

From 9fb463902636e7e986d55d226903ee768b47dd1f Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 15:40:47 -0700
Subject: [PATCH 3756/6226] shattered-pixel-dungeon: modernize, move to
 by-name/

---
 .../sh}/shattered-pixel-dungeon/deps.json         |  0
 .../shattered-pixel-dungeon/disable-beryx.patch   |  0
 .../experienced-pixel-dungeon/default.nix         |  0
 .../experienced-pixel-dungeon/deps.json           |  0
 .../sh}/shattered-pixel-dungeon/generic.nix       |  0
 .../sh/shattered-pixel-dungeon/package.nix}       |  0
 .../rat-king-adventure/default.nix                |  0
 .../rat-king-adventure/deps.json                  |  0
 .../sh}/shattered-pixel-dungeon/rkpd2/default.nix |  0
 .../sh}/shattered-pixel-dungeon/rkpd2/deps.json   |  0
 .../shorter-pixel-dungeon/default.nix             |  0
 .../shorter-pixel-dungeon/deps.json               |  0
 .../summoning-pixel-dungeon/default.nix           |  0
 .../summoning-pixel-dungeon/deps.json             |  0
 .../disable-git-version.patch                     |  0
 .../tower-pixel-dungeon/default.nix               |  0
 .../tower-pixel-dungeon/deps.json                 |  0
 pkgs/top-level/all-packages.nix                   | 15 ++++++++-------
 18 files changed, 8 insertions(+), 7 deletions(-)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/deps.json (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/disable-beryx.patch (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/generic.nix (100%)
 rename pkgs/{games/shattered-pixel-dungeon/default.nix => by-name/sh/shattered-pixel-dungeon/package.nix} (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/rat-king-adventure/default.nix (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/rat-king-adventure/deps.json (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/rkpd2/default.nix (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/rkpd2/deps.json (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/summoning-pixel-dungeon/disable-git-version.patch (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix (100%)
 rename pkgs/{games => by-name/sh}/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json (100%)

diff --git a/pkgs/games/shattered-pixel-dungeon/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/deps.json
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/deps.json
diff --git a/pkgs/games/shattered-pixel-dungeon/disable-beryx.patch b/pkgs/by-name/sh/shattered-pixel-dungeon/disable-beryx.patch
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/disable-beryx.patch
rename to pkgs/by-name/sh/shattered-pixel-dungeon/disable-beryx.patch
diff --git a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/experienced-pixel-dungeon/default.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/experienced-pixel-dungeon/deps.json
diff --git a/pkgs/games/shattered-pixel-dungeon/generic.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/generic.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/generic.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/generic.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/package.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/package.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/rat-king-adventure/default.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/rat-king-adventure/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/rat-king-adventure/default.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/rat-king-adventure/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/rat-king-adventure/deps.json
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/rat-king-adventure/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/rat-king-adventure/deps.json
diff --git a/pkgs/games/shattered-pixel-dungeon/rkpd2/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/rkpd2/default.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/rkpd2/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/rkpd2/default.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/rkpd2/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/rkpd2/deps.json
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/rkpd2/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/rkpd2/deps.json
diff --git a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/shorter-pixel-dungeon/default.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/shorter-pixel-dungeon/deps.json
diff --git a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon/default.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon/deps.json
diff --git a/pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/disable-git-version.patch b/pkgs/by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon/disable-git-version.patch
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/summoning-pixel-dungeon/disable-git-version.patch
rename to pkgs/by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon/disable-git-version.patch
diff --git a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix b/pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix
rename to pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/default.nix
diff --git a/pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json b/pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json
similarity index 100%
rename from pkgs/games/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json
rename to pkgs/by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon/deps.json
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4bd59a5e2e39..47616aeed9d8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13347,15 +13347,16 @@ with pkgs;
     isMobile = true;
   };
 
-  shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { };
-  rkpd2 = callPackage ../games/shattered-pixel-dungeon/rkpd2 { };
-  rat-king-adventure = callPackage ../games/shattered-pixel-dungeon/rat-king-adventure { };
+  rkpd2 = callPackage ../by-name/sh/shattered-pixel-dungeon/rkpd2 { };
+  rat-king-adventure = callPackage ../by-name/sh/shattered-pixel-dungeon/rat-king-adventure { };
   experienced-pixel-dungeon =
-    callPackage ../games/shattered-pixel-dungeon/experienced-pixel-dungeon
+    callPackage ../by-name/sh/shattered-pixel-dungeon/experienced-pixel-dungeon
       { };
-  summoning-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/summoning-pixel-dungeon { };
-  shorter-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/shorter-pixel-dungeon { };
-  tower-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon/tower-pixel-dungeon { };
+  summoning-pixel-dungeon =
+    callPackage ../by-name/sh/shattered-pixel-dungeon/summoning-pixel-dungeon
+      { };
+  shorter-pixel-dungeon = callPackage ../by-name/sh/shattered-pixel-dungeon/shorter-pixel-dungeon { };
+  tower-pixel-dungeon = callPackage ../by-name/sh/shattered-pixel-dungeon/tower-pixel-dungeon { };
 
   # get binaries without data built by Hydra
   simutrans_binaries = lowPrio simutrans.binaries;

From 0ae8bcacabf373dfede573376f7b8478abaf55af Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 15:46:02 -0700
Subject: [PATCH 3757/6226] doomseeker: modernize, move to by-name/

---
 .../do}/doomseeker/add_gitinfo.patch          |  0
 .../do}/doomseeker/dont_update_gitinfo.patch  |  0
 .../do}/doomseeker/fix_paths.patch            |  0
 .../do/doomseeker/package.nix}                | 19 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 5 files changed, 8 insertions(+), 13 deletions(-)
 rename pkgs/{games/doom-ports => by-name/do}/doomseeker/add_gitinfo.patch (100%)
 rename pkgs/{games/doom-ports => by-name/do}/doomseeker/dont_update_gitinfo.patch (100%)
 rename pkgs/{games/doom-ports => by-name/do}/doomseeker/fix_paths.patch (100%)
 rename pkgs/{games/doom-ports/doomseeker/default.nix => by-name/do/doomseeker/package.nix} (83%)

diff --git a/pkgs/games/doom-ports/doomseeker/add_gitinfo.patch b/pkgs/by-name/do/doomseeker/add_gitinfo.patch
similarity index 100%
rename from pkgs/games/doom-ports/doomseeker/add_gitinfo.patch
rename to pkgs/by-name/do/doomseeker/add_gitinfo.patch
diff --git a/pkgs/games/doom-ports/doomseeker/dont_update_gitinfo.patch b/pkgs/by-name/do/doomseeker/dont_update_gitinfo.patch
similarity index 100%
rename from pkgs/games/doom-ports/doomseeker/dont_update_gitinfo.patch
rename to pkgs/by-name/do/doomseeker/dont_update_gitinfo.patch
diff --git a/pkgs/games/doom-ports/doomseeker/fix_paths.patch b/pkgs/by-name/do/doomseeker/fix_paths.patch
similarity index 100%
rename from pkgs/games/doom-ports/doomseeker/fix_paths.patch
rename to pkgs/by-name/do/doomseeker/fix_paths.patch
diff --git a/pkgs/games/doom-ports/doomseeker/default.nix b/pkgs/by-name/do/doomseeker/package.nix
similarity index 83%
rename from pkgs/games/doom-ports/doomseeker/default.nix
rename to pkgs/by-name/do/doomseeker/package.nix
index eb1b4dedce92..476c522b4a87 100644
--- a/pkgs/games/doom-ports/doomseeker/default.nix
+++ b/pkgs/by-name/do/doomseeker/package.nix
@@ -3,14 +3,11 @@
   stdenv,
   cmake,
   fetchFromBitbucket,
-  wrapQtAppsHook,
   pkg-config,
-  qtbase,
-  qttools,
-  qtmultimedia,
   zlib,
   bzip2,
   xxd,
+  qt5,
 }:
 
 stdenv.mkDerivation {
@@ -31,15 +28,15 @@ stdenv.mkDerivation {
   ];
 
   nativeBuildInputs = [
-    wrapQtAppsHook
+    qt5.wrapQtAppsHook
     cmake
-    qttools
+    qt5.qttools
     pkg-config
     xxd
   ];
   buildInputs = [
-    qtbase
-    qtmultimedia
+    qt5.qtbase
+    qt5.qtmultimedia
     zlib
     bzip2
   ];
@@ -52,12 +49,12 @@ stdenv.mkDerivation {
     ln -s $out/lib/doomseeker/doomseeker $out/bin/
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "http://doomseeker.drdteam.org/";
     description = "Multiplayer server browser for many Doom source ports";
     mainProgram = "doomseeker";
-    license = licenses.gpl2Plus;
-    platforms = platforms.unix;
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.unix;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 47616aeed9d8..8f7f0da94d49 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13044,8 +13044,6 @@ with pkgs;
 
   ### GAMES/DOOM-PORTS
 
-  doomseeker = qt5.callPackage ../games/doom-ports/doomseeker { };
-
   enyo-launcher = libsForQt5.callPackage ../games/doom-ports/enyo-launcher { };
 
   zandronum = callPackage ../games/doom-ports/zandronum { };

From 7c0514d13583bbdb7cfa80c8d672cc7d640a5c5c Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 17:01:18 -0700
Subject: [PATCH 3758/6226] crawl: move to by-name/

---
 .../{games/crawl/default.nix => by-name/cr/crawl/package.nix} | 0
 pkgs/top-level/all-packages.nix                               | 4 +---
 2 files changed, 1 insertion(+), 3 deletions(-)
 rename pkgs/{games/crawl/default.nix => by-name/cr/crawl/package.nix} (100%)

diff --git a/pkgs/games/crawl/default.nix b/pkgs/by-name/cr/crawl/package.nix
similarity index 100%
rename from pkgs/games/crawl/default.nix
rename to pkgs/by-name/cr/crawl/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8f7f0da94d49..89d54e0b19b0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13104,12 +13104,10 @@ with pkgs;
     inherit libGL libGLU libglut;
   };
 
-  crawlTiles = callPackage ../games/crawl {
+  crawlTiles = callPackage ../by-name/cr/crawl/package.nix {
     tileMode = true;
   };
 
-  crawl = callPackage ../games/crawl { };
-
   curseofwar = callPackage ../games/curseofwar { SDL = null; };
   curseofwar-sdl = callPackage ../games/curseofwar { ncurses = null; };
 

From ca5d528578f5d437e942a0cfb2076ecae0079704 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 17:38:55 -0700
Subject: [PATCH 3759/6226] qtads: modernize, move to by-name/

---
 .../qt/qtads/package.nix}                     | 26 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 13 insertions(+), 15 deletions(-)
 rename pkgs/{games/qtads/default.nix => by-name/qt/qtads/package.nix} (58%)

diff --git a/pkgs/games/qtads/default.nix b/pkgs/by-name/qt/qtads/package.nix
similarity index 58%
rename from pkgs/games/qtads/default.nix
rename to pkgs/by-name/qt/qtads/package.nix
index 90f6652ac658..ae92c2f70003 100644
--- a/pkgs/games/qtads/default.nix
+++ b/pkgs/by-name/qt/qtads/package.nix
@@ -1,31 +1,31 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   pkg-config,
-  qmake,
   SDL2,
   fluidsynth,
   libsndfile,
   libvorbis,
   mpg123,
-  qtbase,
+  qt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "qtads";
   version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "realnc";
     repo = "qtads";
-    rev = "v${version}";
-    sha256 = "sha256-KIqufpvl7zeUtDBXUOAZxBIbfv+s51DoSaZr3jol+bw=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-KIqufpvl7zeUtDBXUOAZxBIbfv+s51DoSaZr3jol+bw=";
   };
 
   nativeBuildInputs = [
     pkg-config
-    qmake
+    qt5.qmake
+    qt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -34,15 +34,15 @@ mkDerivation rec {
     libsndfile
     libvorbis
     mpg123
-    qtbase
+    qt5.qtbase
   ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://realnc.github.io/qtads/";
     description = "Multimedia interpreter for TADS games";
     mainProgram = "qtads";
-    license = licenses.gpl3Plus;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ orivej ];
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ orivej ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 89d54e0b19b0..bb91e16c9856 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13191,8 +13191,6 @@ with pkgs;
 
   gscrabble = python3Packages.callPackage ../games/gscrabble { };
 
-  qtads = qt5.callPackage ../games/qtads { };
-
   ibmcloud-cli = callPackage ../tools/admin/ibmcloud-cli { stdenv = stdenvNoCC; };
 
   # used as base package for iortcw forks

From 9cc67cbcdc08538e2f6e87167ef505deda68cf88 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Wed, 22 Oct 2025 17:50:13 -0700
Subject: [PATCH 3760/6226] pegasus-frontend: modernize, move to by-name/

---
 .../pe/pegasus-frontend/package.nix}          | 41 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 19 insertions(+), 24 deletions(-)
 rename pkgs/{games/pegasus-frontend/default.nix => by-name/pe/pegasus-frontend/package.nix} (62%)

diff --git a/pkgs/games/pegasus-frontend/default.nix b/pkgs/by-name/pe/pegasus-frontend/package.nix
similarity index 62%
rename from pkgs/games/pegasus-frontend/default.nix
rename to pkgs/by-name/pe/pegasus-frontend/package.nix
index 3f5244273c8b..942dc0b24d22 100644
--- a/pkgs/games/pegasus-frontend/default.nix
+++ b/pkgs/by-name/pe/pegasus-frontend/package.nix
@@ -3,15 +3,9 @@
   fetchFromGitHub,
   stdenv,
   cmake,
-  qtbase,
-  qtgraphicaleffects,
-  qtmultimedia,
-  qtsvg,
-  qttools,
-  qtx11extras,
   SDL2,
   sqlite,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -28,26 +22,29 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     cmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs = [
-    qtbase
-    qtmultimedia
-    qtsvg
-    qtgraphicaleffects
-    qtx11extras
-    sqlite
-    SDL2
-  ];
+  buildInputs =
+    (with libsForQt5; [
+      qtbase
+      qtmultimedia
+      qtsvg
+      qtgraphicaleffects
+      qtx11extras
+    ])
+    ++ [
+      sqlite
+      SDL2
+    ];
 
-  meta = with lib; {
+  meta = {
     description = "Cross platform, customizable graphical frontend for launching emulators and managing your game collection";
     mainProgram = "pegasus-fe";
     homepage = "https://pegasus-frontend.org/";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ tengkuizdihar ];
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ tengkuizdihar ];
+    platforms = lib.platforms.linux;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb91e16c9856..a7704edd6662 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3568,8 +3568,6 @@ with pkgs;
   pandoc-secnos = python3Packages.callPackage ../tools/misc/pandoc-secnos { };
   pandoc-tablenos = python3Packages.callPackage ../tools/misc/pandoc-tablenos { };
 
-  pegasus-frontend = libsForQt5.callPackage ../games/pegasus-frontend { };
-
   pgbadger = perlPackages.callPackage ../tools/misc/pgbadger { };
 
   nifskope = libsForQt5.callPackage ../tools/graphics/nifskope { };

From 87624b203e41248c2ad04352153e1ff73d1740fb Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 24 Oct 2025 14:33:20 -0700
Subject: [PATCH 3761/6226] qgo: modernize, move to by-name/

---
 .../{games => by-name/qg}/qgo/fix-paths.patch |  0
 .../qg/qgo/package.nix}                       | 24 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 3 files changed, 11 insertions(+), 15 deletions(-)
 rename pkgs/{games => by-name/qg}/qgo/fix-paths.patch (100%)
 rename pkgs/{games/qgo/default.nix => by-name/qg/qgo/package.nix} (82%)

diff --git a/pkgs/games/qgo/fix-paths.patch b/pkgs/by-name/qg/qgo/fix-paths.patch
similarity index 100%
rename from pkgs/games/qgo/fix-paths.patch
rename to pkgs/by-name/qg/qgo/fix-paths.patch
diff --git a/pkgs/games/qgo/default.nix b/pkgs/by-name/qg/qgo/package.nix
similarity index 82%
rename from pkgs/games/qgo/default.nix
rename to pkgs/by-name/qg/qgo/package.nix
index 68b4a9325b38..6f3b6384f660 100644
--- a/pkgs/games/qgo/default.nix
+++ b/pkgs/by-name/qg/qgo/package.nix
@@ -1,18 +1,15 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
+  libsForQt5,
   fetchFromGitHub,
-  qmake,
-  qtbase,
-  qtmultimedia,
-  qttools,
 }:
 
-mkDerivation {
+stdenv.mkDerivation {
   pname = "qgo";
   version = "unstable-2017-12-18";
 
-  meta = with lib; {
+  meta = {
     description = "Go client based on Qt5";
     mainProgram = "qgo";
     longDescription = ''
@@ -28,8 +25,8 @@ mkDerivation {
       Chinese, "囲碁(Yi Go)" in Japanese, "바둑(Baduk)" in Korean.
     '';
     homepage = "https://github.com/pzorin/qgo";
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [ zalakain ];
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [ zalakain ];
   };
 
   src = fetchFromGitHub {
@@ -44,11 +41,12 @@ mkDerivation {
     sed -i 's|@out@|'"''${out}"'|g' src/src.pro src/defines.h
   '';
   nativeBuildInputs = [
-    qmake
-    qttools
+    libsForQt5.qmake
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
   buildInputs = [
-    qtbase
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
   ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a7704edd6662..9068bf30a766 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13052,8 +13052,6 @@ with pkgs;
 
   fmodex = callPackage ../games/doom-ports/zandronum/fmod.nix { };
 
-  qgo = libsForQt5.callPackage ../games/qgo { };
-
   anki-utils = callPackage ../by-name/an/anki/addons/anki-utils.nix { };
   ankiAddons = recurseIntoAttrs (callPackage ../by-name/an/anki/addons { });
 

From a3d628aa8b67bd3d3e6bf0fbc200dec51259228e Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 24 Oct 2025 14:37:08 -0700
Subject: [PATCH 3762/6226] vcmi: modernize, move to by-name/

---
 .../vc/vcmi/package.nix}                      | 26 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 12 insertions(+), 16 deletions(-)
 rename pkgs/{games/vcmi/default.nix => by-name/vc/vcmi/package.nix} (82%)

diff --git a/pkgs/games/vcmi/default.nix b/pkgs/by-name/vc/vcmi/package.nix
similarity index 82%
rename from pkgs/games/vcmi/default.nix
rename to pkgs/by-name/vc/vcmi/package.nix
index 88b26e0a1175..b7aa3e7dbdd9 100644
--- a/pkgs/games/vcmi/default.nix
+++ b/pkgs/by-name/vc/vcmi/package.nix
@@ -16,25 +16,23 @@
   ninja,
   pkg-config,
   python3,
-  qtbase,
-  qttools,
   onetbb,
   unshield,
-  wrapQtAppsHook,
   xz,
   zlib,
   testers,
   vcmi,
+  libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "vcmi";
   version = "1.6.8";
 
   src = fetchFromGitHub {
     owner = "vcmi";
     repo = "vcmi";
-    rev = version;
+    tag = finalAttrs.version;
     fetchSubmodules = true;
     hash = "sha256-k6tkylNXEzU+zzYoFWtx+AkoHQzAwbBxPB2DVevsryw=";
   };
@@ -44,7 +42,7 @@ stdenv.mkDerivation rec {
     ninja
     pkg-config
     python3
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -57,8 +55,8 @@ stdenv.mkDerivation rec {
     fuzzylite
     luajit
     minizip
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
     onetbb
     xz
     zlib
@@ -97,16 +95,16 @@ stdenv.mkDerivation rec {
     '';
   };
 
-  meta = with lib; {
+  meta = {
     description = "Open-source engine for Heroes of Might and Magic III";
     homepage = "https://vcmi.eu";
-    changelog = "https://github.com/vcmi/vcmi/blob/${src.rev}/ChangeLog.md";
-    license = with licenses; [
+    changelog = "https://github.com/vcmi/vcmi/blob/${finalAttrs.src.rev}/ChangeLog.md";
+    license = with lib.licenses; [
       gpl2Plus
       cc-by-sa-40
     ];
-    maintainers = with maintainers; [ azahi ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ azahi ];
+    platforms = lib.platforms.linux;
     mainProgram = "vcmilauncher";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9068bf30a766..834c9c214811 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4146,8 +4146,6 @@ with pkgs;
 
   vacuum = libsForQt5.callPackage ../applications/networking/instant-messengers/vacuum { };
 
-  vcmi = libsForQt5.callPackage ../games/vcmi { };
-
   video2midi = callPackage ../tools/audio/video2midi {
     pythonPackages = python3Packages;
   };

From d833a664845968330607bd6f2d4b90562d5e33dd Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 24 Oct 2025 15:24:55 -0700
Subject: [PATCH 3763/6226] chiaki: modernize, move to by-name/

---
 .../ch/chiaki/package.nix}                    | 27 +++++++++----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 12 insertions(+), 17 deletions(-)
 rename pkgs/{games/chiaki/default.nix => by-name/ch/chiaki/package.nix} (76%)

diff --git a/pkgs/games/chiaki/default.nix b/pkgs/by-name/ch/chiaki/package.nix
similarity index 76%
rename from pkgs/games/chiaki/default.nix
rename to pkgs/by-name/ch/chiaki/package.nix
index 03e5c528ac2f..76bba18cd7c4 100644
--- a/pkgs/games/chiaki/default.nix
+++ b/pkgs/by-name/ch/chiaki/package.nix
@@ -6,24 +6,20 @@
   pkg-config,
   ffmpeg,
   libopus,
-  mkDerivation,
-  qtbase,
-  qtmultimedia,
-  qtsvg,
   SDL2,
   libevdev,
   udev,
-  qtmacextras,
   nanopb,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "chiaki";
   version = "2.2.0";
 
   src = fetchgit {
     url = "https://git.sr.ht/~thestr4ng3r/chiaki";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-mLx2ygMlIuDJt9iT4nIj/dcLGjMvvmneKd49L7C3BQk=";
   };
@@ -31,6 +27,7 @@ mkDerivation rec {
   nativeBuildInputs = [
     cmake
     pkg-config
+    libsForQt5.wrapQtAppsHook
   ];
 
   postPatch = ''
@@ -42,9 +39,9 @@ mkDerivation rec {
   buildInputs = [
     ffmpeg
     libopus
-    qtbase
-    qtmultimedia
-    qtsvg
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
+    libsForQt5.qtsvg
     SDL2
     nanopb
   ]
@@ -53,19 +50,19 @@ mkDerivation rec {
     udev
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    qtmacextras
+    libsForQt5.qtmacextras
   ];
 
   doCheck = true;
 
   installCheckPhase = "$out/bin/chiaki --help";
 
-  meta = with lib; {
+  meta = {
     homepage = "https://git.sr.ht/~thestr4ng3r/chiaki";
     description = "Free and Open Source PlayStation Remote Play Client";
-    license = licenses.agpl3Only;
+    license = lib.licenses.agpl3Only;
     maintainers = [ ];
-    platforms = platforms.all;
+    platforms = lib.platforms.all;
     mainProgram = "chiaki";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 834c9c214811..413f0c04ceec 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13078,8 +13078,6 @@ with pkgs;
 
   cataclysm-dda-git = cataclysmDDA.git.tiles;
 
-  chiaki = libsForQt5.callPackage ../games/chiaki { };
-
   chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { };
 
   cockatrice = libsForQt5.callPackage ../games/cockatrice {

From aa2106ad9b3f6f4f1225afa251389913934f9df4 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 24 Oct 2025 15:26:51 -0700
Subject: [PATCH 3764/6226] chiaki-ng: modernize, move to by-name/

---
 .../ch/chiaki-ng/package.nix}                 | 32 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 13 insertions(+), 21 deletions(-)
 rename pkgs/{games/chiaki-ng/default.nix => by-name/ch/chiaki-ng/package.nix} (82%)

diff --git a/pkgs/games/chiaki-ng/default.nix b/pkgs/by-name/ch/chiaki-ng/package.nix
similarity index 82%
rename from pkgs/games/chiaki-ng/default.nix
rename to pkgs/by-name/ch/chiaki-ng/package.nix
index 3ec054b901ed..1545b1a40148 100644
--- a/pkgs/games/chiaki-ng/default.nix
+++ b/pkgs/by-name/ch/chiaki-ng/package.nix
@@ -8,13 +8,6 @@
   python3,
   ffmpeg,
   libopus,
-  wrapQtAppsHook,
-  qtbase,
-  qtmultimedia,
-  qtsvg,
-  qtwayland,
-  qtdeclarative,
-  qtwebengine,
   SDL2,
   libevdev,
   udev,
@@ -33,6 +26,7 @@
   lcms2,
   libdovi,
   xxHash,
+  kdePackages,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -42,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "streetpea";
     repo = "chiaki-ng";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-7pDQnlElnBkW+Nr6R+NaylZbsGH8dB31nd7jxYD66yQ=";
     fetchSubmodules = true;
   };
@@ -50,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     pkg-config
-    wrapQtAppsHook
+    kdePackages.wrapQtAppsHook
     protobuf
     python3
     python3.pkgs.wrapPython
@@ -61,12 +55,12 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     ffmpeg
     libopus
-    qtbase
-    qtmultimedia
-    qtsvg
-    qtdeclarative
-    qtwayland
-    qtwebengine
+    kdePackages.qtbase
+    kdePackages.qtmultimedia
+    kdePackages.qtsvg
+    kdePackages.qtdeclarative
+    kdePackages.qtwayland
+    kdePackages.qtwebengine
     protobuf
     SDL2
     curlFull
@@ -108,16 +102,16 @@ stdenv.mkDerivation (finalAttrs: {
     wrapPythonPrograms
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://streetpea.github.io/chiaki-ng/";
     description = "Next-Generation of Chiaki (the open-source remote play client for PlayStation)";
     # Includes OpenSSL linking exception that we currently have no way
     # to represent.
     #
     # See also: <https://github.com/spdx/license-list-XML/issues/939>
-    license = licenses.agpl3Only;
-    maintainers = with maintainers; [ devusb ];
-    platforms = platforms.linux;
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ devusb ];
+    platforms = lib.platforms.linux;
     mainProgram = "chiaki";
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 413f0c04ceec..30891541bbd1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13078,8 +13078,6 @@ with pkgs;
 
   cataclysm-dda-git = cataclysmDDA.git.tiles;
 
-  chiaki-ng = kdePackages.callPackage ../games/chiaki-ng { };
-
   cockatrice = libsForQt5.callPackage ../games/cockatrice {
     protobuf = protobuf_21;
   };

From c37ed775a74ef97b80ff14b1ec7fc184779d33a2 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 24 Oct 2025 15:33:33 -0700
Subject: [PATCH 3765/6226] rogue: modernize, move to by-name/

---
 .../ro/rogue/package.nix}                     | 20 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 ----
 2 files changed, 10 insertions(+), 14 deletions(-)
 rename pkgs/{games/rogue/default.nix => by-name/ro/rogue/package.nix} (54%)

diff --git a/pkgs/games/rogue/default.nix b/pkgs/by-name/ro/rogue/package.nix
similarity index 54%
rename from pkgs/games/rogue/default.nix
rename to pkgs/by-name/ro/rogue/package.nix
index dcb16306767a..67209409c59b 100644
--- a/pkgs/games/rogue/default.nix
+++ b/pkgs/by-name/ro/rogue/package.nix
@@ -2,30 +2,30 @@
   lib,
   stdenv,
   fetchurl,
-  ncurses,
+  ncurses5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "rogue";
   version = "5.4.4";
 
   src = fetchurl {
     urls = [
-      "https://src.fedoraproject.org/repo/pkgs/rogue/rogue${version}-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue${version}-src.tar.gz"
-      "http://ftp.vim.org/ftp/pub/ftp/os/Linux/distr/slitaz/sources/packages-cooking/r/rogue${version}-src.tar.gz"
-      "http://rogue.rogueforge.net/files/rogue${lib.versions.majorMinor version}/rogue${version}-src.tar.gz"
+      "https://src.fedoraproject.org/repo/pkgs/rogue/rogue${finalAttrs.version}-src.tar.gz/033288f46444b06814c81ea69d96e075/rogue${finalAttrs.version}-src.tar.gz"
+      "http://ftp.vim.org/ftp/pub/ftp/os/Linux/distr/slitaz/sources/packages-cooking/r/rogue${finalAttrs.version}-src.tar.gz"
+      "http://rogue.rogueforge.net/files/rogue${lib.versions.majorMinor finalAttrs.version}/rogue${finalAttrs.version}-src.tar.gz"
     ];
     sha256 = "18g81274d0f7sr04p7h7irz0d53j6kd9j1y3zbka1gcqq0gscdvx";
   };
 
-  buildInputs = [ ncurses ];
+  buildInputs = [ ncurses5 ];
 
-  meta = with lib; {
+  meta = {
     homepage = "http://rogue.rogueforge.net/rogue-5-4/";
     description = "Final version of the original Rogue game developed for the UNIX operating system";
     mainProgram = "rogue";
-    platforms = platforms.all;
-    license = licenses.bsd3;
+    platforms = lib.platforms.all;
+    license = lib.licenses.bsd3;
     maintainers = [ ];
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 30891541bbd1..c6395d07aee7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13310,10 +13310,6 @@ with pkgs;
 
   vkquake = callPackage ../by-name/qu/quakespasm/vulkan.nix { };
 
-  rogue = callPackage ../games/rogue {
-    ncurses = ncurses5;
-  };
-
   rott-shareware = callPackage ../by-name/ro/rott/package.nix {
     buildShareware = true;
   };

From 4dc22b276cceb42866327d92909e06635587241a Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 24 Oct 2025 15:36:39 -0700
Subject: [PATCH 3766/6226] soi: modernize, move to by-name/

---
 .../so}/soi/cmake-4-build.patch               |  0
 .../so/soi/package.nix}                       | 20 +++++++++----------
 pkgs/top-level/all-packages.nix               |  4 ----
 3 files changed, 10 insertions(+), 14 deletions(-)
 rename pkgs/{games => by-name/so}/soi/cmake-4-build.patch (100%)
 rename pkgs/{games/soi/default.nix => by-name/so/soi/package.nix} (74%)

diff --git a/pkgs/games/soi/cmake-4-build.patch b/pkgs/by-name/so/soi/cmake-4-build.patch
similarity index 100%
rename from pkgs/games/soi/cmake-4-build.patch
rename to pkgs/by-name/so/soi/cmake-4-build.patch
diff --git a/pkgs/games/soi/default.nix b/pkgs/by-name/so/soi/package.nix
similarity index 74%
rename from pkgs/games/soi/default.nix
rename to pkgs/by-name/so/soi/package.nix
index d46f093092e1..fdf1a2995284 100644
--- a/pkgs/games/soi/default.nix
+++ b/pkgs/by-name/so/soi/package.nix
@@ -5,27 +5,27 @@
   cmake,
   boost,
   eigen2,
-  lua,
+  lua5_1,
   luabind,
   libGLU,
   libGL,
   SDL,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "soi";
   version = "0.1.2";
 
   src = fetchurl {
-    url = "mirror://sourceforge/project/soi/Spheres%20of%20Influence-${version}-Source.tar.bz2";
-    name = "${pname}-${version}.tar.bz2";
+    url = "mirror://sourceforge/project/soi/Spheres%20of%20Influence-${finalAttrs.version}-Source.tar.bz2";
+    name = "soi-${finalAttrs.version}.tar.bz2";
     sha256 = "03c3wnvhd42qh8mi68lybf8nv6wzlm1nx16d6pdcn2jzgx1j2lzd";
   };
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     boost
-    lua
+    lua5_1
     luabind
     libGLU
     libGL
@@ -41,12 +41,12 @@ stdenv.mkDerivation rec {
   # https://github.com/NixOS/nixpkgs/issues/445447
   patches = [ ./cmake-4-build.patch ];
 
-  meta = with lib; {
+  meta = {
     description = "Physics-based puzzle game";
     mainProgram = "soi";
-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
-    license = licenses.free;
+    maintainers = with lib.maintainers; [ raskin ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.free;
     downloadPage = "https://sourceforge.net/projects/soi/files/";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c6395d07aee7..9aa120f61dbf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13341,10 +13341,6 @@ with pkgs;
   # get binaries without data built by Hydra
   simutrans_binaries = lowPrio simutrans.binaries;
 
-  soi = callPackage ../games/soi {
-    lua = lua5_1;
-  };
-
   steam-run = steam.run;
   steam-run-free = steam.run-free;
 

From f25d07b9605d0f9ce684d47120b2a9b613507963 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 24 Oct 2025 15:55:14 -0700
Subject: [PATCH 3767/6226] mudlet: modernize, move to by-name/

---
 .../mu/mudlet/package.nix}                    | 34 ++++++++-----------
 pkgs/top-level/all-packages.nix               |  4 ---
 2 files changed, 15 insertions(+), 23 deletions(-)
 rename pkgs/{games/mudlet/default.nix => by-name/mu/mudlet/package.nix} (87%)

diff --git a/pkgs/games/mudlet/default.nix b/pkgs/by-name/mu/mudlet/package.nix
similarity index 87%
rename from pkgs/games/mudlet/default.nix
rename to pkgs/by-name/mu/mudlet/package.nix
index f8638aaff306..90cc8791a155 100644
--- a/pkgs/games/mudlet/default.nix
+++ b/pkgs/by-name/mu/mudlet/package.nix
@@ -6,20 +6,16 @@
   cmake,
   git,
   pkg-config,
-  qttools,
   which,
-  wrapQtAppsHook,
   boost,
   hunspell,
   libGLU,
   libsForQt5,
   libsecret,
   libzip,
-  lua,
+  lua5_1,
   pcre,
   pugixml,
-  qtbase,
-  qtmultimedia,
   discord-rpc,
   yajl,
   withDiscordRpc ? false,
@@ -43,7 +39,7 @@ let
         });
       };
     in
-    lua.override { inherit packageOverrides; };
+    lua5_1.override { inherit packageOverrides; };
 
   luaEnv = overrideLua.withPackages (
     ps: with ps; [
@@ -56,14 +52,14 @@ let
     ]
   );
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "mudlet";
   version = "4.19.1";
 
   src = fetchFromGitHub {
     owner = "Mudlet";
     repo = "Mudlet";
-    rev = "Mudlet-${version}";
+    rev = "Mudlet-${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-I4RRIfHw9kZwxMlc9pvdtwPpq9EvNJU69WpGgZ+0uiw=";
   };
@@ -81,9 +77,9 @@ stdenv.mkDerivation rec {
     git
     luaEnv
     pkg-config
-    qttools
+    libsForQt5.qttools
     which
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -96,8 +92,8 @@ stdenv.mkDerivation rec {
     luaEnv
     pcre
     pugixml
-    qtbase
-    qtmultimedia
+    libsForQt5.qtbase
+    libsForQt5.qtmultimedia
     yajl
   ]
   ++ lib.optional withDiscordRpc discord-rpc;
@@ -129,7 +125,7 @@ stdenv.mkDerivation rec {
     cp -r src/mudlet.app/ $out/Applications/mudlet.app
     mv $out/Applications/mudlet.app/Contents/MacOS/mudlet $out/Applications/mudlet.app/Contents/MacOS/mudlet-unwrapped
     makeQtWrapper $out/Applications/Mudlet.app/Contents/MacOS/mudlet-unwrapped $out/Applications/Mudlet.app/Contents/MacOS/mudlet \
-      --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \
+      --set LUA_CPATH "${luaEnv}/lib/lua/${lua5_1.luaversion}/?.so" \
       --prefix LUA_PATH : "$NIX_LUA_PATH" \
       --prefix DYLD_LIBRARY_PATH : "${
         lib.makeLibraryPath (
@@ -146,7 +142,7 @@ stdenv.mkDerivation rec {
     mkdir -pv $out/bin
     cp src/mudlet $out/bin/mudlet-unwrapped
     makeQtWrapper $out/bin/mudlet-unwrapped $out/bin/mudlet \
-      --set LUA_CPATH "${luaEnv}/lib/lua/${lua.luaversion}/?.so" \
+      --set LUA_CPATH "${luaEnv}/lib/lua/${lua5_1.luaversion}/?.so" \
       --prefix LUA_PATH : "$NIX_LUA_PATH" \
       --prefix LD_LIBRARY_PATH : "${
         lib.makeLibraryPath (
@@ -166,18 +162,18 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Crossplatform mud client";
     homepage = "https://www.mudlet.org/";
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       wyvie
       pstn
       cpu
       felixalbrigtsen
     ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = with lib.platforms; linux ++ darwin;
     broken = stdenv.hostPlatform.isDarwin;
-    license = licenses.gpl2Plus;
+    license = lib.licenses.gpl2Plus;
     mainProgram = "mudlet";
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9aa120f61dbf..4009daf8a6dc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13237,10 +13237,6 @@ with pkgs;
   luanti-client = luanti.override { buildServer = false; };
   luanti-server = luanti.override { buildClient = false; };
 
-  mudlet = libsForQt5.callPackage ../games/mudlet {
-    lua = lua5_1;
-  };
-
   blightmud-tts = callPackage ../by-name/bl/blightmud/package.nix { withTTS = true; };
 
   run-npush = callPackage ../by-name/np/npush/run.nix { };

From cdfda72c650a072ee51083f78166f89801687580 Mon Sep 17 00:00:00 2001
From: pancaek <20342389+pancaek@users.noreply.github.com>
Date: Fri, 24 Oct 2025 16:01:21 -0700
Subject: [PATCH 3768/6226] openxcom: move to by-name/

---
 .../openxcom/default.nix => by-name/op/openxcom/package.nix}  | 4 ++--
 pkgs/top-level/all-packages.nix                               | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)
 rename pkgs/{games/openxcom/default.nix => by-name/op/openxcom/package.nix} (96%)

diff --git a/pkgs/games/openxcom/default.nix b/pkgs/by-name/op/openxcom/package.nix
similarity index 96%
rename from pkgs/games/openxcom/default.nix
rename to pkgs/by-name/op/openxcom/package.nix
index e17ea01a0e8d..275c1191ef8c 100644
--- a/pkgs/games/openxcom/default.nix
+++ b/pkgs/by-name/op/openxcom/package.nix
@@ -7,7 +7,7 @@
   libGL,
   openssl,
   pkg-config,
-  SDL,
+  SDL_compat,
   SDL_image,
   SDL_mixer,
   SDL_gfx,
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
     boost
     libGL
     libGLU
-    SDL
+    SDL_compat
     SDL_gfx
     SDL_image
     SDL_mixer
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4009daf8a6dc..4cf105e26898 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13267,8 +13267,6 @@ with pkgs;
   openttd-grfcodec = callPackage ../games/openttd/grfcodec.nix { };
   openttd-nml = callPackage ../games/openttd/nml.nix { };
 
-  openxcom = callPackage ../games/openxcom { SDL = SDL_compat; };
-
   openxray = callPackage ../games/openxray {
     # Builds with Clang, but hits an assertion failure unless GCC is used
     # https://github.com/OpenXRay/xray-16/issues/1224

From e0c08f7f3d15df7d7140df2bf88e44fbb77cf6d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 01:15:49 +0000
Subject: [PATCH 3769/6226] inputplumber: 0.66.0 -> 0.67.0

---
 pkgs/by-name/in/inputplumber/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix
index 2047a8e88332..9e9d10f008f4 100644
--- a/pkgs/by-name/in/inputplumber/package.nix
+++ b/pkgs/by-name/in/inputplumber/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "inputplumber";
-  version = "0.66.0";
+  version = "0.67.0";
 
   src = fetchFromGitHub {
     owner = "ShadowBlip";
     repo = "InputPlumber";
     tag = "v${version}";
-    hash = "sha256-9aCCRjXJZcjfRrZJldaVKbk6FYTYv73XEvUeCeCPmfk=";
+    hash = "sha256-eLnloQfitA1d6HbpSk3BUl4X2E1m1qochLakndUKdIs=";
   };
 
-  cargoHash = "sha256-JBfAsLN9GhvzVi/lQumqdWwujLI4rXLowiUOoApnWUg=";
+  cargoHash = "sha256-Jwx0VzrYdfYGwnKDABYwMIV6qZ7T+an5MYwrQRcRVio=";
 
   nativeBuildInputs = [
     pkg-config

From 7dd2bdaae44b5ddcf4dcc093b5f03cd94759f676 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 01:16:13 +0000
Subject: [PATCH 3770/6226] lzbench: 2.1 -> 2.2

---
 pkgs/by-name/lz/lzbench/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lz/lzbench/package.nix b/pkgs/by-name/lz/lzbench/package.nix
index a9af016a7097..70403dc903d2 100644
--- a/pkgs/by-name/lz/lzbench/package.nix
+++ b/pkgs/by-name/lz/lzbench/package.nix
@@ -6,13 +6,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lzbench";
-  version = "2.1";
+  version = "2.2";
 
   src = fetchFromGitHub {
     owner = "inikep";
     repo = "lzbench";
     rev = "v${version}";
-    sha256 = "sha256-JyK5Hah3X4zwmli44HEO62BYfNg7BBd0+DLlljeHmRc=";
+    sha256 = "sha256-CmT+mjFKf8/HE00re1QzU2pwdUYR8Js1kN4y6c2ZiNY=";
   };
 
   enableParallelBuilding = true;

From 532616753d738881a76cb00e02bae0b2c7ba18c6 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Sat, 4 Oct 2025 05:33:18 +0200
Subject: [PATCH 3771/6226] cwltool: 3.1.20250110105449 -> 3.1.20250925164626

---
 pkgs/by-name/cw/cwltool/package.nix | 41 +++++++----------------------
 1 file changed, 10 insertions(+), 31 deletions(-)

diff --git a/pkgs/by-name/cw/cwltool/package.nix b/pkgs/by-name/cw/cwltool/package.nix
index df62af94dcd7..847d3484f7cf 100644
--- a/pkgs/by-name/cw/cwltool/package.nix
+++ b/pkgs/by-name/cw/cwltool/package.nix
@@ -1,62 +1,39 @@
 {
   lib,
   fetchFromGitHub,
-  git,
   nodejs,
-  python3,
+  python3Packages,
 }:
 
-let
-  py = python3.override {
-    packageOverrides = final: prev: {
-      # Requires "pydot >= 1.4.1, <3",
-      pydot = prev.pydot.overridePythonAttrs (old: rec {
-        version = "2.0.0";
-        src = old.src.override {
-          inherit version;
-          hash = "sha256-YCRq8hUSP6Bi8hzXkb5n3aI6bygN8J9okZ5jeh5PMjU=";
-        };
-        doCheck = false;
-      });
-    };
-  };
-in
-with py.pkgs;
-
-py.pkgs.buildPythonApplication rec {
+python3Packages.buildPythonApplication rec {
   pname = "cwltool";
-  version = "3.1.20250110105449";
+  version = "3.1.20250925164626";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "common-workflow-language";
     repo = "cwltool";
     tag = version;
-    hash = "sha256-V0CQiNkIw81s6e9224qcfbsOqBvMo34q+lRURpRetKs=";
+    hash = "sha256-esY/p7wm0HvLiX+jZENBye4NblYveYAXevYRQxk+u44=";
   };
 
   postPatch = ''
     substituteInPlace setup.py \
-      --replace-fail "prov == 1.5.1" "prov" \
-      --replace-fail '"schema-salad >= 8.7, < 9",' '"schema-salad",' \
       --replace-fail "PYTEST_RUNNER + " ""
     substituteInPlace pyproject.toml \
-      --replace-fail "mypy==1.14.1" "mypy"
+      --replace-fail "mypy==1.18.2" "mypy"
   '';
 
-  build-system = with py.pkgs; [
+  build-system = with python3Packages; [
     setuptools
     setuptools-scm
   ];
 
-  nativeBuildInputs = [ git ];
-
-  dependencies = with py.pkgs; [
+  dependencies = with python3Packages; [
     argcomplete
     bagit
     coloredlogs
     cwl-utils
-    mypy
     mypy-extensions
     prov
     psutil
@@ -74,7 +51,7 @@ py.pkgs.buildPythonApplication rec {
     typing-extensions
   ];
 
-  nativeCheckInputs = with py.pkgs; [
+  nativeCheckInputs = with python3Packages; [
     mock
     nodejs
     pytest-mock
@@ -83,6 +60,8 @@ py.pkgs.buildPythonApplication rec {
     pytestCheckHook
   ];
 
+  pythonRelaxDeps = [ "prov" ];
+
   disabledTests = [
     "test_content_types"
     "test_env_filtering"

From ee73e9e425a1b8d8c98fc9e0216c30fe935cfbd2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 01:35:37 +0000
Subject: [PATCH 3772/6226] snac2: 2.83 -> 2.84

---
 pkgs/by-name/sn/snac2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sn/snac2/package.nix b/pkgs/by-name/sn/snac2/package.nix
index 071223850fa7..1ebf78b15a10 100644
--- a/pkgs/by-name/sn/snac2/package.nix
+++ b/pkgs/by-name/sn/snac2/package.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "snac2";
-  version = "2.83";
+  version = "2.84";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "grunfink";
     repo = "snac2";
     tag = finalAttrs.version;
-    hash = "sha256-5BpJKDXA3PO/ZCfFYMngWaAGns2+ANWCpLgiEi4CAXY=";
+    hash = "sha256-sKxuFG3lqpjGkC0WVPr+4v09LR7BR2FYBOsToNI6M78=";
   };
 
   buildInputs = [

From 22bb68ae02fb5f9d15e185a888621876cba1889f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 01:40:31 +0000
Subject: [PATCH 3773/6226] pinniped: 0.41.0 -> 0.42.0

---
 pkgs/by-name/pi/pinniped/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/pinniped/package.nix b/pkgs/by-name/pi/pinniped/package.nix
index 94d73eefe70a..32e058ffc74e 100644
--- a/pkgs/by-name/pi/pinniped/package.nix
+++ b/pkgs/by-name/pi/pinniped/package.nix
@@ -8,18 +8,18 @@
 
 buildGoModule rec {
   pname = "pinniped";
-  version = "0.41.0";
+  version = "0.42.0";
 
   src = fetchFromGitHub {
     owner = "vmware-tanzu";
     repo = "pinniped";
     rev = "v${version}";
-    sha256 = "sha256-PCSRT3oYqfIsB5vWDIBV1tzRovDfrZOjLrINzos1RL0=";
+    sha256 = "sha256-1r5EjF4Npt1iwlILTCHKlViO5MPcv8undKYJWN8cmVA=";
   };
 
   subPackages = "cmd/pinniped";
 
-  vendorHash = "sha256-UYDmTwbT5odLMthGRqWuSr4G4oAU8zuWWRrMclIaY8g=";
+  vendorHash = "sha256-aDP5yf0uGYSzvYqqRUS4P2ozLCRcS0eDJseicXv/99o=";
 
   ldflags = [
     "-s"

From 6cb23ce3fc955910cba9d0f257c7389ae6c316be Mon Sep 17 00:00:00 2001
From: botnk <github-botnk@korz.dev>
Date: Wed, 29 Oct 2025 01:48:46 +0000
Subject: [PATCH 3774/6226] shader-slang: 2025.19.1 -> 2025.20

Changelog: https://github.com/shader-slang/slang/releases/tag/v2025.20
---
 pkgs/by-name/sh/shader-slang/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix
index 1331cccf20f1..1e09232e8475 100644
--- a/pkgs/by-name/sh/shader-slang/package.nix
+++ b/pkgs/by-name/sh/shader-slang/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shader-slang";
-  version = "2025.19.1";
+  version = "2025.20";
 
   src = fetchFromGitHub {
     owner = "shader-slang";
     repo = "slang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-mbtyvPM3dtIZRU9dWMCZ/XCf2mDAPuJMhagMLgFsdWI=";
+    hash = "sha256-p2Wk1JgXoQPq8TrOaLv6igWPZtkXgKXEdKTiiQUklLU=";
     fetchSubmodules = true;
   };
 

From a94f3b261a9fb75af23c77f4c39492085bc8795e Mon Sep 17 00:00:00 2001
From: botnk <github-botnk@korz.dev>
Date: Wed, 29 Oct 2025 01:49:07 +0000
Subject: [PATCH 3775/6226] zed-editor: 0.209.6 -> 0.209.7

Changelog: https://github.com/zed-industries/zed/releases/tag/v0.209.7
---
 pkgs/by-name/ze/zed-editor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index 8bca83223718..ed74dd70f5d8 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -101,7 +101,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.209.6";
+  version = "0.209.7";
 
   outputs = [
     "out"
@@ -114,7 +114,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KHOex6Noths886oE62BN4NE/DCMmU5VjiP+xN2YnVmc=";
+    hash = "sha256-vmHBPpRFSaqj62NZCAKtc3ZiMe8P++Ji57aJ5cuWjWQ=";
   };
 
   postPatch = ''
@@ -134,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm -r $out/git/*/candle-book/
   '';
 
-  cargoHash = "sha256-u/dD7qHvc+ipKd6Jy9/HtPiLMa537zKUSAbjUFMQorA=";
+  cargoHash = "sha256-UM01zsi/brSyxzAaEUQ+ZUB8j5c6LMHv0eAhyuQ1huA=";
 
   nativeBuildInputs = [
     cmake

From 242f7edbf379616a9a84577f0f8ed4c404a170e5 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 23 Oct 2025 20:02:45 -0700
Subject: [PATCH 3776/6226] ytcc: disable additional tests that shell out to
 commands

---
 pkgs/by-name/yt/ytcc/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/yt/ytcc/package.nix b/pkgs/by-name/yt/ytcc/package.nix
index 34adb6af4991..9e2288d7c48a 100644
--- a/pkgs/by-name/yt/ytcc/package.nix
+++ b/pkgs/by-name/yt/ytcc/package.nix
@@ -60,6 +60,8 @@ python3Packages.buildPythonApplication {
     "test_update"
     "test_download"
     "test_comma_list_error"
+    "test_cleanup"
+    "test_pipe_mark"
   ];
 
   postInstall = ''

From fbb3500ebbfb2f4e4bac19796f37469a73a77b7f Mon Sep 17 00:00:00 2001
From: kyehn <228304369+kyehn@users.noreply.github.com>
Date: Wed, 29 Oct 2025 09:11:45 +0800
Subject: [PATCH 3777/6226] splayer: 3.0.0-beta.2 -> 3.0.0-beta.3

---
 pkgs/by-name/sp/splayer/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/sp/splayer/package.nix b/pkgs/by-name/sp/splayer/package.nix
index 7ddd877842d3..d83526beb9bc 100644
--- a/pkgs/by-name/sp/splayer/package.nix
+++ b/pkgs/by-name/sp/splayer/package.nix
@@ -12,14 +12,14 @@
 }:
 stdenv.mkDerivation (final: {
   pname = "splayer";
-  version = "3.0.0-beta.2";
+  version = "3.0.0-beta.3";
 
   src = fetchFromGitHub {
     owner = "imsyy";
     repo = "SPlayer";
     tag = "v${final.version}";
     fetchSubmodules = false;
-    hash = "sha256-q4jMwIILuz9Uci/1m429Y5tHE2rkfxctu9QCA8jrJkk=";
+    hash = "sha256-bfxIIp8Ma52SEhlQirxnqKwG2ivpEOlCZGoQ2rQldYQ=";
   };
 
   pnpm = pnpm_10;
@@ -27,7 +27,7 @@ stdenv.mkDerivation (final: {
   pnpmDeps = final.pnpm.fetchDeps {
     inherit (final) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-lA08+i+SpMB95MAi/N5mxbcBed0FRchroT5e2nwnXuA=";
+    hash = "sha256-tHz4RtXnoFbSXqV84e6FxHLRHeDyR5sCmVPL0vRNIY8=";
   };
 
   nativeBuildInputs = [
@@ -50,7 +50,7 @@ stdenv.mkDerivation (final: {
 
     npm exec electron-builder -- \
         --dir \
-        --config electron-builder.yml \
+        --config electron-builder.config.ts \
         -c.electronDist=${electron.dist} \
         -c.electronVersion=${electron.version}
 

From 3e5c72a676d3131b5f9b43409012222170d00af6 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:29:25 +0000
Subject: [PATCH 3778/6226] aitrack: migrate to pkgs/by-name

---
 .../default.nix => by-name/ai/aitrack/package.nix}     | 10 ++++------
 pkgs/top-level/all-packages.nix                        |  2 --
 2 files changed, 4 insertions(+), 8 deletions(-)
 rename pkgs/{applications/misc/aitrack/default.nix => by-name/ai/aitrack/package.nix} (90%)

diff --git a/pkgs/applications/misc/aitrack/default.nix b/pkgs/by-name/ai/aitrack/package.nix
similarity index 90%
rename from pkgs/applications/misc/aitrack/default.nix
rename to pkgs/by-name/ai/aitrack/package.nix
index 7fa8e8e9d610..75543c9ffa9f 100644
--- a/pkgs/applications/misc/aitrack/default.nix
+++ b/pkgs/by-name/ai/aitrack/package.nix
@@ -3,12 +3,10 @@
   lib,
   fetchFromGitHub,
   pkg-config,
-  qmake,
-  wrapQtAppsHook,
   opencv,
   spdlog,
   onnxruntime,
-  qtx11extras,
+  libsForQt5,
 }:
 stdenv.mkDerivation {
   pname = "aitrack";
@@ -23,14 +21,14 @@ stdenv.mkDerivation {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     opencv
     spdlog
-    qtx11extras
+    libsForQt5.qtx11extras
     onnxruntime
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e163d061a653..636f1331465a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14631,8 +14631,6 @@ with pkgs;
 
   swift-corelibs-libdispatch = swiftPackages.Dispatch;
 
-  aitrack = libsForQt5.callPackage ../applications/misc/aitrack { };
-
   tidal-dl = python3Packages.callPackage ../tools/audio/tidal-dl { };
 
   duden = python3Packages.toPythonApplication python3Packages.duden;

From 6ccdbd9acc0dd312b552e997c0579d37bc7655b7 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:29:24 +0000
Subject: [PATCH 3779/6226] qtrvsim: migrate to pkgs/by-name

---
 .../qtrvsim/default.nix => by-name/qt/qtrvsim/package.nix} | 7 +++----
 pkgs/top-level/all-packages.nix                            | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)
 rename pkgs/{applications/science/computer-architecture/qtrvsim/default.nix => by-name/qt/qtrvsim/package.nix} (90%)

diff --git a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix b/pkgs/by-name/qt/qtrvsim/package.nix
similarity index 90%
rename from pkgs/applications/science/computer-architecture/qtrvsim/default.nix
rename to pkgs/by-name/qt/qtrvsim/package.nix
index 19e76f532765..52f3379e2057 100644
--- a/pkgs/applications/science/computer-architecture/qtrvsim/default.nix
+++ b/pkgs/by-name/qt/qtrvsim/package.nix
@@ -3,8 +3,7 @@
   stdenv,
   fetchFromGitHub,
   cmake,
-  wrapQtAppsHook,
-  qtbase,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,10 +19,10 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     cmake
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
   meta = with lib; {
     description = "RISC-V CPU simulator for education purposes";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 636f1331465a..e8213ae1a10f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14374,8 +14374,6 @@ with pkgs;
 
   qmake2cmake = python3Packages.callPackage ../tools/misc/qmake2cmake { };
 
-  qtrvsim = libsForQt5.callPackage ../applications/science/computer-architecture/qtrvsim { };
-
   sail-riscv = callPackage ../applications/virtualization/sail-riscv {
     inherit (ocamlPackages) sail;
   };

From abf75c9161fb8c5d843423afd7c5b37e09bc5a76 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:29:22 +0000
Subject: [PATCH 3780/6226] flashprint: migrate to pkgs/by-name

---
 .../default.nix => by-name/fl/flashprint/package.nix}      | 7 +++----
 pkgs/top-level/all-packages.nix                            | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)
 rename pkgs/{applications/misc/flashprint/default.nix => by-name/fl/flashprint/package.nix} (94%)

diff --git a/pkgs/applications/misc/flashprint/default.nix b/pkgs/by-name/fl/flashprint/package.nix
similarity index 94%
rename from pkgs/applications/misc/flashprint/default.nix
rename to pkgs/by-name/fl/flashprint/package.nix
index d5ff2caf27ef..36b52fc81653 100644
--- a/pkgs/applications/misc/flashprint/default.nix
+++ b/pkgs/by-name/fl/flashprint/package.nix
@@ -2,11 +2,10 @@
   lib,
   stdenv,
   libGLU,
-  qtbase,
   fetchurl,
   dpkg,
   autoPatchelfHook,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -21,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     dpkg
     autoPatchelfHook
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     libGLU
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e8213ae1a10f..5ff2d7f44708 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14091,8 +14091,6 @@ with pkgs;
 
   faust = faust2;
 
-  flashprint = libsForQt5.callPackage ../applications/misc/flashprint { };
-
   gajim = callPackage ../applications/networking/instant-messengers/gajim {
     inherit (gst_all_1) gstreamer gst-plugins-base gst-libav;
     gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; };

From dc02c820cf4e705176d5d1aefa75bd6dc6438a34 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:29:18 +0000
Subject: [PATCH 3781/6226] yacas: migrate to pkgs/by-name

---
 .../ya}/yacas/jsoncpp-fix-include.patch                |  0
 .../yacas/default.nix => by-name/ya/yacas/package.nix} | 10 ++++------
 pkgs/top-level/all-packages.nix                        |  2 --
 3 files changed, 4 insertions(+), 8 deletions(-)
 rename pkgs/{applications/science/math => by-name/ya}/yacas/jsoncpp-fix-include.patch (100%)
 rename pkgs/{applications/science/math/yacas/default.nix => by-name/ya/yacas/package.nix} (95%)

diff --git a/pkgs/applications/science/math/yacas/jsoncpp-fix-include.patch b/pkgs/by-name/ya/yacas/jsoncpp-fix-include.patch
similarity index 100%
rename from pkgs/applications/science/math/yacas/jsoncpp-fix-include.patch
rename to pkgs/by-name/ya/yacas/jsoncpp-fix-include.patch
diff --git a/pkgs/applications/science/math/yacas/default.nix b/pkgs/by-name/ya/yacas/package.nix
similarity index 95%
rename from pkgs/applications/science/math/yacas/default.nix
rename to pkgs/by-name/ya/yacas/package.nix
index d028f3fc93df..40a0784299a7 100644
--- a/pkgs/applications/science/math/yacas/default.nix
+++ b/pkgs/by-name/ya/yacas/package.nix
@@ -6,9 +6,6 @@
   cmake,
   perl,
   enableGui ? false,
-  qtbase,
-  wrapQtAppsHook,
-  qtwebengine,
   enableJupyter ? true,
   boost,
   jsoncpp,
@@ -17,6 +14,7 @@
   enableJava ? false,
   openjdk,
   gtest,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -69,9 +67,9 @@ stdenv.mkDerivation rec {
   buildInputs = [
   ]
   ++ lib.optionals enableGui [
-    qtbase
-    wrapQtAppsHook
-    qtwebengine
+    libsForQt5.qtbase
+    libsForQt5.wrapQtAppsHook
+    libsForQt5.qtwebengine
   ]
   ++ lib.optionals enableJupyter [
     boost
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5ff2d7f44708..7c8399ed26be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14001,8 +14001,6 @@ with pkgs;
     };
   };
 
-  yacas = libsForQt5.callPackage ../applications/science/math/yacas { };
-
   yacas-gui = yacas.override {
     enableGui = true;
     enableJupyter = false;

From 39fbd3a8602857e0ef7ab26f3197b3f49869ee27 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:29:07 +0000
Subject: [PATCH 3782/6226] fulcrum: migrate to pkgs/by-name

---
 .../fulcrum/default.nix => by-name/fu/fulcrum/package.nix} | 7 +++----
 pkgs/top-level/all-packages.nix                            | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)
 rename pkgs/{applications/blockchains/fulcrum/default.nix => by-name/fu/fulcrum/package.nix} (93%)

diff --git a/pkgs/applications/blockchains/fulcrum/default.nix b/pkgs/by-name/fu/fulcrum/package.nix
similarity index 93%
rename from pkgs/applications/blockchains/fulcrum/default.nix
rename to pkgs/by-name/fu/fulcrum/package.nix
index 5118f7880721..1bfafa575639 100644
--- a/pkgs/applications/blockchains/fulcrum/default.nix
+++ b/pkgs/by-name/fu/fulcrum/package.nix
@@ -3,12 +3,11 @@
   stdenv,
   fetchFromGitHub,
   pkg-config,
-  qmake,
   python3,
-  qtbase,
   rocksdb_7_10,
   zeromq,
   nix-update-script,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -24,12 +23,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
+    libsForQt5.qmake
   ];
 
   buildInputs = [
     python3
-    qtbase
+    libsForQt5.qtbase
     rocksdb_7_10
     zeromq
   ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7c8399ed26be..19909903643e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12968,8 +12968,6 @@ with pkgs;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
 
-  fulcrum = libsForQt5.callPackage ../applications/blockchains/fulcrum { };
-
   gridcoin-research = libsForQt5.callPackage ../applications/blockchains/gridcoin-research {
     boost = boost179;
   };

From ea3677e44dae8e0909829edef2d447eb4e8635c5 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:28:56 +0000
Subject: [PATCH 3783/6226] synergy: migrate to pkgs/by-name

---
 .../sy}/synergy/darwin-non-static-openssl.patch           | 0
 .../default.nix => by-name/sy/synergy/package.nix}        | 8 +++-----
 pkgs/top-level/all-packages.nix                           | 2 --
 3 files changed, 3 insertions(+), 7 deletions(-)
 rename pkgs/{applications/misc => by-name/sy}/synergy/darwin-non-static-openssl.patch (100%)
 rename pkgs/{applications/misc/synergy/default.nix => by-name/sy/synergy/package.nix} (96%)

diff --git a/pkgs/applications/misc/synergy/darwin-non-static-openssl.patch b/pkgs/by-name/sy/synergy/darwin-non-static-openssl.patch
similarity index 100%
rename from pkgs/applications/misc/synergy/darwin-non-static-openssl.patch
rename to pkgs/by-name/sy/synergy/darwin-non-static-openssl.patch
diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/by-name/sy/synergy/package.nix
similarity index 96%
rename from pkgs/applications/misc/synergy/default.nix
rename to pkgs/by-name/sy/synergy/package.nix
index 7fc41a067fcd..ca46b4721acc 100644
--- a/pkgs/applications/misc/synergy/default.nix
+++ b/pkgs/by-name/sy/synergy/package.nix
@@ -3,7 +3,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  wrapQtAppsHook,
 
   cmake,
   openssl,
@@ -14,7 +13,6 @@
   pkg-config,
   gdk-pixbuf,
   libnotify,
-  qttools,
   libICE,
   libSM,
   libX11,
@@ -26,7 +24,7 @@
   xkeyboardconfig,
   xinput,
   avahi-compat,
-
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -62,10 +60,10 @@ stdenv.mkDerivation rec {
     cmake
     pkg-config
   ]
-  ++ lib.optional withGUI wrapQtAppsHook;
+  ++ lib.optional withGUI libsForQt5.wrapQtAppsHook;
 
   buildInputs = [
-    qttools # Used for translations even when not building the GUI
+    libsForQt5.qttools # Used for translations even when not building the GUI
     openssl
     pcre
   ]
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 19909903643e..6c4b22d8addc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12404,8 +12404,6 @@ with pkgs;
     systemdSupport = true;
   };
 
-  synergy = libsForQt5.callPackage ../applications/misc/synergy { };
-
   synergyWithoutGUI = synergy.override { withGUI = false; };
 
   tabbed = callPackage ../applications/window-managers/tabbed {

From 4f99d10510bf1244ceec2cbd1b98b9d53b96ce97 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:28:44 +0000
Subject: [PATCH 3784/6226] qnotero: migrate to pkgs/by-name

---
 .../qnotero/default.nix => by-name/qn/qnotero/package.nix}    | 4 ++--
 pkgs/top-level/all-packages.nix                               | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)
 rename pkgs/{applications/office/qnotero/default.nix => by-name/qn/qnotero/package.nix} (97%)

diff --git a/pkgs/applications/office/qnotero/default.nix b/pkgs/by-name/qn/qnotero/package.nix
similarity index 97%
rename from pkgs/applications/office/qnotero/default.nix
rename to pkgs/by-name/qn/qnotero/package.nix
index 2db93f97da52..65a00daf6cba 100644
--- a/pkgs/applications/office/qnotero/default.nix
+++ b/pkgs/by-name/qn/qnotero/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchFromGitHub,
   python3Packages,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 python3Packages.buildPythonPackage rec {
@@ -21,7 +21,7 @@ python3Packages.buildPythonPackage rec {
 
   propagatedBuildInputs = [
     python3Packages.pyqt5
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   patchPhase = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6c4b22d8addc..5f4ea5b8818b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12116,8 +12116,6 @@ with pkgs;
   qmplay2-qt5 = qmplay2.override { qtVersion = "5"; };
   qmplay2-qt6 = qmplay2.override { qtVersion = "6"; };
 
-  qnotero = libsForQt5.callPackage ../applications/office/qnotero { };
-
   qsstv = qt5.callPackage ../applications/radio/qsstv { };
 
   qsyncthingtray = libsForQt5.callPackage ../applications/misc/qsyncthingtray { };

From bced968114ca1ab7aa5dff697bb662ea44153ea0 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:28:15 +0000
Subject: [PATCH 3785/6226] kapow: migrate to pkgs/by-name

---
 .../default.nix => by-name/ka/kapow/package.nix}    | 13 +++++--------
 pkgs/top-level/all-packages.nix                     |  2 --
 2 files changed, 5 insertions(+), 10 deletions(-)
 rename pkgs/{applications/misc/kapow/default.nix => by-name/ka/kapow/package.nix} (82%)

diff --git a/pkgs/applications/misc/kapow/default.nix b/pkgs/by-name/ka/kapow/package.nix
similarity index 82%
rename from pkgs/applications/misc/kapow/default.nix
rename to pkgs/by-name/ka/kapow/package.nix
index 3943eb96f721..789c9ef19cd9 100644
--- a/pkgs/applications/misc/kapow/default.nix
+++ b/pkgs/by-name/ka/kapow/package.nix
@@ -1,11 +1,8 @@
 {
   lib,
   stdenv,
-  qmake,
   fetchFromGitHub,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,12 +17,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ];
 
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
   meta = with lib; {
     description = "Punch clock to track time spent on projects";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5f4ea5b8818b..29121569c230 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11552,8 +11552,6 @@ with pkgs;
     ;
   k3s = k3s_1_34;
 
-  kapow = libsForQt5.callPackage ../applications/misc/kapow { };
-
   okteta = libsForQt5.callPackage ../applications/editors/okteta { };
 
   k4dirstat = libsForQt5.callPackage ../applications/misc/k4dirstat { };

From e550553dca66eb4a0be9c196bfea6efe139356a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 02:50:49 +0000
Subject: [PATCH 3786/6226] traefik: 3.5.3 -> 3.5.4

---
 pkgs/by-name/tr/traefik/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tr/traefik/package.nix b/pkgs/by-name/tr/traefik/package.nix
index 5b0ecef2daac..475faea34b89 100644
--- a/pkgs/by-name/tr/traefik/package.nix
+++ b/pkgs/by-name/tr/traefik/package.nix
@@ -8,16 +8,16 @@
 
 buildGo124Module (finalAttrs: {
   pname = "traefik";
-  version = "3.5.3";
+  version = "3.5.4";
 
   # Archive with static assets for webui
   src = fetchzip {
     url = "https://github.com/traefik/traefik/releases/download/v${finalAttrs.version}/traefik-v${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-vKpOlB29OJHppQOspIICYgeAtemBGb419TIXIW9zrhU=";
+    hash = "sha256-gA1H2oJXm6l3JQdn1+SMPf3ZzG0pvXRDiVgZu2MAT3E=";
     stripRoot = false;
   };
 
-  vendorHash = "sha256-Juf5LYB/o1hyTIZB5NQrJBOLdkEjL1mOsBgndF3vpd8=";
+  vendorHash = "sha256-UziRO6cNgbVRyLWm8i/oOXVktOAt8exCNz2bdpX8yk8=";
 
   subPackages = [ "cmd/traefik" ];
 

From a0bd0331ab437ab0bee1cbad6646e3374bdc9fb5 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:28:11 +0000
Subject: [PATCH 3787/6226] gpsbabel: migrate to pkgs/by-name

---
 .../gp}/gpsbabel/debian-patches.nix              |  0
 .../gp}/gpsbabel/debian-patches.txt              |  0
 .../gp/gpsbabel/package.nix}                     | 16 ++++++----------
 pkgs/top-level/all-packages.nix                  |  2 --
 4 files changed, 6 insertions(+), 12 deletions(-)
 rename pkgs/{applications/misc => by-name/gp}/gpsbabel/debian-patches.nix (100%)
 rename pkgs/{applications/misc => by-name/gp}/gpsbabel/debian-patches.txt (100%)
 rename pkgs/{applications/misc/gpsbabel/default.nix => by-name/gp/gpsbabel/package.nix} (95%)

diff --git a/pkgs/applications/misc/gpsbabel/debian-patches.nix b/pkgs/by-name/gp/gpsbabel/debian-patches.nix
similarity index 100%
rename from pkgs/applications/misc/gpsbabel/debian-patches.nix
rename to pkgs/by-name/gp/gpsbabel/debian-patches.nix
diff --git a/pkgs/applications/misc/gpsbabel/debian-patches.txt b/pkgs/by-name/gp/gpsbabel/debian-patches.txt
similarity index 100%
rename from pkgs/applications/misc/gpsbabel/debian-patches.txt
rename to pkgs/by-name/gp/gpsbabel/debian-patches.txt
diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/by-name/gp/gpsbabel/package.nix
similarity index 95%
rename from pkgs/applications/misc/gpsbabel/default.nix
rename to pkgs/by-name/gp/gpsbabel/package.nix
index b295a61ac05e..9943ed44cafc 100644
--- a/pkgs/applications/misc/gpsbabel/default.nix
+++ b/pkgs/by-name/gp/gpsbabel/package.nix
@@ -5,16 +5,11 @@
   fetchurl,
   pkg-config,
   which,
-  qmake,
-  qttools,
-  wrapQtAppsHook,
   libusb1,
   shapelib,
   zlib,
   withGUI ? false,
-  qtserialport,
   withMapPreview ? (!stdenv.hostPlatform.isDarwin),
-  qtwebengine,
   withDoc ? false,
   docbook_xml_dtd_45,
   docbook_xsl,
@@ -23,6 +18,7 @@
   libxml2,
   libxslt,
   perl,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -56,11 +52,11 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [
     pkg-config
-    qmake
+    libsForQt5.qmake
   ]
   ++ lib.optionals withGUI [
-    qttools
-    wrapQtAppsHook
+    libsForQt5.qttools
+    libsForQt5.wrapQtAppsHook
   ]
   ++ lib.optionals withDoc [
     docbook_xml_dtd_45
@@ -77,8 +73,8 @@ stdenv.mkDerivation rec {
     shapelib
     zlib
   ]
-  ++ lib.optional withGUI qtserialport
-  ++ lib.optional (withGUI && withMapPreview) qtwebengine;
+  ++ lib.optional withGUI libsForQt5.qtserialport
+  ++ lib.optional (withGUI && withMapPreview) libsForQt5.qtwebengine;
 
   nativeCheckInputs = [
     libxml2
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 29121569c230..d03821feac35 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11279,8 +11279,6 @@ with pkgs;
 
   googleearth-pro = libsForQt5.callPackage ../applications/misc/googleearth-pro { };
 
-  gpsbabel = libsForQt5.callPackage ../applications/misc/gpsbabel { };
-
   gpsbabel-gui = gpsbabel.override {
     withGUI = true;
     withDoc = true;

From af86a398976544fb9a939cdab9bf053cbdf2fd2f Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:27:40 +0000
Subject: [PATCH 3788/6226] tpmmanager: migrate to pkgs/by-name

---
 .../default.nix => by-name/tp/tpmmanager/package.nix}  | 10 ++++------
 pkgs/top-level/all-packages.nix                        |  2 --
 2 files changed, 4 insertions(+), 8 deletions(-)
 rename pkgs/{applications/misc/tpmmanager/default.nix => by-name/tp/tpmmanager/package.nix} (92%)

diff --git a/pkgs/applications/misc/tpmmanager/default.nix b/pkgs/by-name/tp/tpmmanager/package.nix
similarity index 92%
rename from pkgs/applications/misc/tpmmanager/default.nix
rename to pkgs/by-name/tp/tpmmanager/package.nix
index 2164b56642b8..b9a6ac8a1f5c 100644
--- a/pkgs/applications/misc/tpmmanager/default.nix
+++ b/pkgs/by-name/tp/tpmmanager/package.nix
@@ -2,10 +2,8 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qtbase,
-  qmake,
-  wrapQtAppsHook,
   trousers,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -20,12 +18,12 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
-    qtbase
+    libsForQt5.qtbase
     trousers
   ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d03821feac35..db18aee81b21 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4105,8 +4105,6 @@ with pkgs;
 
   trackma-qt = trackma.override { withQT = true; };
 
-  tpmmanager = libsForQt5.callPackage ../applications/misc/tpmmanager { };
-
   trezorctl = with python3Packages; toPythonApplication trezor;
 
   trezor-agent = with python3Packages; toPythonApplication trezor-agent;

From c2fe9c63a8a783c1da7becf8165e9cf31c919c88 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:27:34 +0000
Subject: [PATCH 3789/6226] selectdefaultapplication: migrate to pkgs/by-name

---
 .../se/selectdefaultapplication/package.nix}           | 10 ++++------
 pkgs/top-level/all-packages.nix                        |  2 --
 2 files changed, 4 insertions(+), 8 deletions(-)
 rename pkgs/{applications/misc/selectdefaultapplication/default.nix => by-name/se/selectdefaultapplication/package.nix} (91%)

diff --git a/pkgs/applications/misc/selectdefaultapplication/default.nix b/pkgs/by-name/se/selectdefaultapplication/package.nix
similarity index 91%
rename from pkgs/applications/misc/selectdefaultapplication/default.nix
rename to pkgs/by-name/se/selectdefaultapplication/package.nix
index 46868edc6fe6..8670d4949d2c 100644
--- a/pkgs/applications/misc/selectdefaultapplication/default.nix
+++ b/pkgs/by-name/se/selectdefaultapplication/package.nix
@@ -2,9 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  qmake,
-  qtbase,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation {
@@ -19,10 +17,10 @@ stdenv.mkDerivation {
   };
 
   nativeBuildInputs = [
-    qmake
-    wrapQtAppsHook
+    libsForQt5.qmake
+    libsForQt5.wrapQtAppsHook
   ];
-  buildInputs = [ qtbase ];
+  buildInputs = [ libsForQt5.qtbase ];
 
   installPhase = ''
     runHook preInstall
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index db18aee81b21..fcdf19681d64 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3954,8 +3954,6 @@ with pkgs;
 
   segger-jlink-headless = callPackage ../by-name/se/segger-jlink/package.nix { headless = true; };
 
-  selectdefaultapplication = libsForQt5.callPackage ../applications/misc/selectdefaultapplication { };
-
   semgrep = python3.pkgs.toPythonApplication python3.pkgs.semgrep;
   inherit (semgrep.passthru) semgrep-core;
 

From 4950b3c98d53db5d3f30ac3dfae55f399186342a Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:27:28 +0000
Subject: [PATCH 3790/6226] qjournalctl: migrate to pkgs/by-name

---
 .../default.nix => by-name/qj/qjournalctl/package.nix} | 10 ++++------
 pkgs/top-level/all-packages.nix                        |  2 --
 2 files changed, 4 insertions(+), 8 deletions(-)
 rename pkgs/{applications/system/qjournalctl/default.nix => by-name/qj/qjournalctl/package.nix} (90%)

diff --git a/pkgs/applications/system/qjournalctl/default.nix b/pkgs/by-name/qj/qjournalctl/package.nix
similarity index 90%
rename from pkgs/applications/system/qjournalctl/default.nix
rename to pkgs/by-name/qj/qjournalctl/package.nix
index 4e4bbafa37ad..85fd6af3fe6d 100644
--- a/pkgs/applications/system/qjournalctl/default.nix
+++ b/pkgs/by-name/qj/qjournalctl/package.nix
@@ -2,11 +2,9 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  qtbase,
-  qmake,
   pkg-config,
   libssh,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -25,14 +23,14 @@ stdenv.mkDerivation rec {
   '';
 
   nativeBuildInputs = [
-    qmake
+    libsForQt5.qmake
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     libssh
-    qtbase
+    libsForQt5.qtbase
   ];
 
   meta = with lib; {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fcdf19681d64..7e2cf4d6e68c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3857,8 +3857,6 @@ with pkgs;
 
   qlcplus = libsForQt5.callPackage ../applications/misc/qlcplus { };
 
-  qjournalctl = libsForQt5.callPackage ../applications/system/qjournalctl { };
-
   qjoypad = libsForQt5.callPackage ../tools/misc/qjoypad { };
 
   qmarkdowntextedit = libsForQt5.callPackage ../development/libraries/qmarkdowntextedit { };

From 760a9aee5737fb480d3406786fb9ea0004540983 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:27:24 +0000
Subject: [PATCH 3791/6226] pagefind: migrate to pkgs/by-name

---
 .../{applications/misc => by-name/pa}/pagefind/cargo-lock.patch | 0
 .../pa}/pagefind/lindera-dictionary-support-file-paths.patch    | 0
 .../pagefind/default.nix => by-name/pa/pagefind/package.nix}    | 0
 .../misc => by-name/pa}/pagefind/web-cargo-lock.patch           | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 5 files changed, 2 deletions(-)
 rename pkgs/{applications/misc => by-name/pa}/pagefind/cargo-lock.patch (100%)
 rename pkgs/{applications/misc => by-name/pa}/pagefind/lindera-dictionary-support-file-paths.patch (100%)
 rename pkgs/{applications/misc/pagefind/default.nix => by-name/pa/pagefind/package.nix} (100%)
 rename pkgs/{applications/misc => by-name/pa}/pagefind/web-cargo-lock.patch (100%)

diff --git a/pkgs/applications/misc/pagefind/cargo-lock.patch b/pkgs/by-name/pa/pagefind/cargo-lock.patch
similarity index 100%
rename from pkgs/applications/misc/pagefind/cargo-lock.patch
rename to pkgs/by-name/pa/pagefind/cargo-lock.patch
diff --git a/pkgs/applications/misc/pagefind/lindera-dictionary-support-file-paths.patch b/pkgs/by-name/pa/pagefind/lindera-dictionary-support-file-paths.patch
similarity index 100%
rename from pkgs/applications/misc/pagefind/lindera-dictionary-support-file-paths.patch
rename to pkgs/by-name/pa/pagefind/lindera-dictionary-support-file-paths.patch
diff --git a/pkgs/applications/misc/pagefind/default.nix b/pkgs/by-name/pa/pagefind/package.nix
similarity index 100%
rename from pkgs/applications/misc/pagefind/default.nix
rename to pkgs/by-name/pa/pagefind/package.nix
diff --git a/pkgs/applications/misc/pagefind/web-cargo-lock.patch b/pkgs/by-name/pa/pagefind/web-cargo-lock.patch
similarity index 100%
rename from pkgs/applications/misc/pagefind/web-cargo-lock.patch
rename to pkgs/by-name/pa/pagefind/web-cargo-lock.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7e2cf4d6e68c..1bbb6f4084cc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3705,8 +3705,6 @@ with pkgs;
 
   packagekit = callPackage ../tools/package-management/packagekit { };
 
-  pagefind = libsForQt5.callPackage ../applications/misc/pagefind { };
-
   pakcs = callPackage ../development/compilers/pakcs { };
 
   paperwork = callPackage ../applications/office/paperwork/paperwork-gtk.nix { };

From 50cfb4d974080456584c9e10ded90c5ceee4da4e Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:27:08 +0000
Subject: [PATCH 3792/6226] rmview: migrate to pkgs/by-name

---
 .../rmview/default.nix => by-name/rm/rmview/package.nix}      | 4 ++--
 pkgs/top-level/all-packages.nix                               | 2 --
 2 files changed, 2 insertions(+), 4 deletions(-)
 rename pkgs/{applications/misc/remarkable/rmview/default.nix => by-name/rm/rmview/package.nix} (95%)

diff --git a/pkgs/applications/misc/remarkable/rmview/default.nix b/pkgs/by-name/rm/rmview/package.nix
similarity index 95%
rename from pkgs/applications/misc/remarkable/rmview/default.nix
rename to pkgs/by-name/rm/rmview/package.nix
index 4cac6042d1c0..028ecc47bcee 100644
--- a/pkgs/applications/misc/remarkable/rmview/default.nix
+++ b/pkgs/by-name/rm/rmview/package.nix
@@ -2,7 +2,7 @@
   lib,
   fetchFromGitHub,
   python3Packages,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 python3Packages.buildPythonApplication rec {
@@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec {
   nativeBuildInputs = with python3Packages; [
     pyqt5
     setuptools
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
   propagatedBuildInputs = with python3Packages; [
     pyqt5
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1bbb6f4084cc..f5e33ebd6fc3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2225,8 +2225,6 @@ with pkgs;
 
   renpy = callPackage ../by-name/re/renpy/package.nix { python3 = python312; };
 
-  rmview = libsForQt5.callPackage ../applications/misc/remarkable/rmview { };
-
   remarkable-mouse = python3Packages.callPackage ../applications/misc/remarkable/remarkable-mouse { };
 
   ropgadget = with python3Packages; toPythonApplication ropgadget;

From b697a53555deae5c00ffa87d7f07feed7f145883 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:27:00 +0000
Subject: [PATCH 3793/6226] apitrace: migrate to pkgs/by-name

---
 .../default.nix => by-name/ap/apitrace/package.nix}        | 7 +++----
 pkgs/top-level/all-packages.nix                            | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)
 rename pkgs/{applications/graphics/apitrace/default.nix => by-name/ap/apitrace/package.nix} (97%)

diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/by-name/ap/apitrace/package.nix
similarity index 97%
rename from pkgs/applications/graphics/apitrace/default.nix
rename to pkgs/by-name/ap/apitrace/package.nix
index e33100980a8b..b85d3de67aea 100644
--- a/pkgs/applications/graphics/apitrace/default.nix
+++ b/pkgs/by-name/ap/apitrace/package.nix
@@ -8,12 +8,11 @@
   procps,
   python3,
   libdwarf,
-  qtbase,
-  wrapQtAppsHook,
   libglvnd,
   gtest,
   brotli,
   enableGui ? true,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -38,7 +37,7 @@ stdenv.mkDerivation rec {
     brotli
   ]
   ++ lib.optionals enableGui [
-    qtbase
+    libsForQt5.qtbase
   ];
 
   nativeBuildInputs = [
@@ -47,7 +46,7 @@ stdenv.mkDerivation rec {
     python3
   ]
   ++ lib.optionals enableGui [
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   cmakeFlags = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f5e33ebd6fc3..f035f5a359f2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1536,8 +1536,6 @@ with pkgs;
   arduino-core = callPackage ../development/embedded/arduino/arduino-core/chrootenv.nix { };
   arduino-core-unwrapped = callPackage ../development/embedded/arduino/arduino-core { };
 
-  apitrace = libsForQt5.callPackage ../applications/graphics/apitrace { };
-
   arpack-mpi = arpack.override { useMpi = true; };
 
   asymptote = libsForQt5.callPackage ../tools/graphics/asymptote { };

From 64fe5d3cd03d0fe66a2eac54cdc371acd0bcacc2 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:26:56 +0000
Subject: [PATCH 3794/6226] gittyup: migrate to pkgs/by-name

---
 ...Fix-incorrect-order-of-argument-to-calloc-345.patch |  0
 .../default.nix => by-name/gi/gittyup/package.nix}     | 10 ++++------
 pkgs/top-level/all-packages.nix                        |  2 --
 3 files changed, 4 insertions(+), 8 deletions(-)
 rename pkgs/{applications/version-management => by-name/gi}/gittyup/0001-Fix-incorrect-order-of-argument-to-calloc-345.patch (100%)
 rename pkgs/{applications/version-management/gittyup/default.nix => by-name/gi/gittyup/package.nix} (95%)

diff --git a/pkgs/applications/version-management/gittyup/0001-Fix-incorrect-order-of-argument-to-calloc-345.patch b/pkgs/by-name/gi/gittyup/0001-Fix-incorrect-order-of-argument-to-calloc-345.patch
similarity index 100%
rename from pkgs/applications/version-management/gittyup/0001-Fix-incorrect-order-of-argument-to-calloc-345.patch
rename to pkgs/by-name/gi/gittyup/0001-Fix-incorrect-order-of-argument-to-calloc-345.patch
diff --git a/pkgs/applications/version-management/gittyup/default.nix b/pkgs/by-name/gi/gittyup/package.nix
similarity index 95%
rename from pkgs/applications/version-management/gittyup/default.nix
rename to pkgs/by-name/gi/gittyup/package.nix
index 25e65657ce8d..0f125293276b 100644
--- a/pkgs/applications/version-management/gittyup/default.nix
+++ b/pkgs/by-name/gi/gittyup/package.nix
@@ -11,9 +11,7 @@
   ninja,
   openssl,
   pkg-config,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation rec {
@@ -56,7 +54,7 @@ stdenv.mkDerivation rec {
     cmark
     ninja
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
@@ -66,8 +64,8 @@ stdenv.mkDerivation rec {
     libssh2
     lua5_4
     openssl
-    qtbase
-    qttools
+    libsForQt5.qtbase
+    libsForQt5.qttools
   ];
 
   postInstall = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f035f5a359f2..0ee5969112b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1246,8 +1246,6 @@ with pkgs;
 
   gitRepo = git-repo;
 
-  gittyup = libsForQt5.callPackage ../applications/version-management/gittyup { };
-
   merge-fmt = callPackage ../applications/version-management/merge-fmt {
     inherit (ocamlPackages)
       buildDunePackage

From 59a5ee813d83076f8e4a4b8b8f227f821f67ed03 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:26:54 +0000
Subject: [PATCH 3795/6226] mpsolve: migrate to pkgs/by-name

---
 .../mpsolve/default.nix => by-name/mp/mpsolve/package.nix} | 7 +++----
 pkgs/top-level/all-packages.nix                            | 2 --
 2 files changed, 3 insertions(+), 6 deletions(-)
 rename pkgs/{applications/science/math/mpsolve/default.nix => by-name/mp/mpsolve/package.nix} (92%)

diff --git a/pkgs/applications/science/math/mpsolve/default.nix b/pkgs/by-name/mp/mpsolve/package.nix
similarity index 92%
rename from pkgs/applications/science/math/mpsolve/default.nix
rename to pkgs/by-name/mp/mpsolve/package.nix
index 7d314c6842a9..26df426393cc 100644
--- a/pkgs/applications/science/math/mpsolve/default.nix
+++ b/pkgs/by-name/mp/mpsolve/package.nix
@@ -9,8 +9,7 @@
   gmp,
   gtk3,
   pkg-config,
-  qtbase,
-  wrapQtAppsHook,
+  libsForQt5,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -29,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: {
     bison
     flex
     pkg-config
-    wrapQtAppsHook
+    libsForQt5.wrapQtAppsHook
   ];
 
   buildInputs = [
     gmp
     gtk3
-    qtbase
+    libsForQt5.qtbase
   ];
 
   passthru.updateScript = gitUpdater { };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0ee5969112b4..37fd34b037d9 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -769,8 +769,6 @@ with pkgs;
   mkShell = callPackage ../build-support/mkshell { };
   mkShellNoCC = mkShell.override { stdenv = stdenvNoCC; };
 
-  mpsolve = libsForQt5.callPackage ../applications/science/math/mpsolve { };
-
   nixBufferBuilders = import ../applications/editors/emacs/build-support/buffer.nix {
     inherit lib writeText;
     inherit (emacs.pkgs) inherit-local;

From 3c138e076486122420c37775045b421a9a69c309 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 02:57:54 +0000
Subject: [PATCH 3796/6226] typescript-go: 0-unstable-2025-10-22 ->
 0-unstable-2025-10-29

---
 pkgs/by-name/ty/typescript-go/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix
index 92b1ad63fdf7..9835f8f89062 100644
--- a/pkgs/by-name/ty/typescript-go/package.nix
+++ b/pkgs/by-name/ty/typescript-go/package.nix
@@ -10,13 +10,13 @@ let
 in
 buildGoModule {
   pname = "typescript-go";
-  version = "0-unstable-2025-10-22";
+  version = "0-unstable-2025-10-29";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "typescript-go";
-    rev = "42241ec50d438ce9ef1f2b90a7b2cdd1bfa5f51d";
-    hash = "sha256-5vm9ht3nZ3ELODN+J5PfAOWrxIUCyvsIxbf29geSYrA=";
+    rev = "6642b0a33b7fbea3594e8c243d9323a1ad945202";
+    hash = "sha256-kvG21V9prb+Brg2wPaXwzd4eEfNE6VfYn8st3hsCsco=";
     fetchSubmodules = false;
   };
 

From 68c01a5d5a80d79b97545403e161bade37288bce Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 26 Oct 2025 13:26:59 -0700
Subject: [PATCH 3797/6226] animdl: open up platforms

---
 pkgs/by-name/an/animdl/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/an/animdl/package.nix b/pkgs/by-name/an/animdl/package.nix
index 751c4b394dea..99dc42e8e962 100644
--- a/pkgs/by-name/an/animdl/package.nix
+++ b/pkgs/by-name/an/animdl/package.nix
@@ -62,6 +62,5 @@ python3Packages.buildPythonApplication {
     license = lib.licenses.gpl3Only;
     mainProgram = "animdl";
     maintainers = with lib.maintainers; [ passivelemon ];
-    platforms = [ "x86_64-linux" ];
   };
 }

From b9520fcfe368495af410fa2d07cece3a4ccfe1f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 03:04:30 +0000
Subject: [PATCH 3798/6226] xemu: 0.8.109 -> 0.8.110

---
 pkgs/by-name/xe/xemu/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix
index 58f9a22aa712..714b539f42cb 100644
--- a/pkgs/by-name/xe/xemu/package.nix
+++ b/pkgs/by-name/xe/xemu/package.nix
@@ -35,13 +35,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xemu";
-  version = "0.8.109";
+  version = "0.8.110";
 
   src = fetchFromGitHub {
     owner = "xemu-project";
     repo = "xemu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-1SJGcwnDvqEnm2Z9O4TNo+417CJrwHRgzuRzewzIbXY=";
+    hash = "sha256-kb8sAaqPHbVXeddMD/BoUnxph4lLTmRctY+yjhgu4gw=";
 
     nativeBuildInputs = [
       git

From 4d87af6c208dc6006f7b50af1b383981c4a39598 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 28 Oct 2025 22:09:38 -0400
Subject: [PATCH 3799/6226] pkgsCross.mingwW64.libxcb: fix build

---
 pkgs/by-name/li/libxcb/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/li/libxcb/package.nix b/pkgs/by-name/li/libxcb/package.nix
index 349ddf5b786e..b56bec0672e1 100644
--- a/pkgs/by-name/li/libxcb/package.nix
+++ b/pkgs/by-name/li/libxcb/package.nix
@@ -57,6 +57,10 @@ stdenv.mkDerivation (finalAttrs: {
     tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
   };
 
+  env = lib.optionalAttrs stdenv.hostPlatform.isMinGW {
+    NIX_CFLAGS_COMPILE = toString [ "-Wno-incompatible-pointer-types" ];
+  };
+
   meta = {
     description = "C interface to the X Window System protocol";
     homepage = "https://gitlab.freedesktop.org/xorg/lib/libxcb";

From 5b44c7426236725ebc75ecad30e3c17ceefd39d4 Mon Sep 17 00:00:00 2001
From: mochie~! <187453775+mochienya@users.noreply.github.com>
Date: Sun, 12 Oct 2025 16:56:31 +0200
Subject: [PATCH 3800/6226] maintainers: add mochienya

---
 maintainers/maintainer-list.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c2361206e455..fa03fbb515a4 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -17322,6 +17322,17 @@
     githubId = 7831184;
     name = "John Mercier";
   };
+  mochienya = {
+    name = "mochienya";
+    github = "mochienya";
+    githubId = 187453775;
+    matrix = "@mochienya:matrix.org";
+    keys = [
+      {
+        fingerprint = "7A49 5110 84F4 EAF1 BE30  5CF0 CC3B E964 564F 9554";
+      }
+    ];
+  };
   mockersf = {
     email = "francois.mockers@vleue.com";
     github = "mockersf";

From a62cd3db1d1cc8cad450ad4d0a46402d0bbf067a Mon Sep 17 00:00:00 2001
From: mochie~! <187453775+mochienya@users.noreply.github.com>
Date: Wed, 29 Oct 2025 02:32:59 +0100
Subject: [PATCH 3801/6226] beammp-launcher: add mochienya as maintainer

---
 pkgs/by-name/be/beammp-launcher/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/be/beammp-launcher/package.nix b/pkgs/by-name/be/beammp-launcher/package.nix
index 6ef83abe354b..a6dec6c17019 100644
--- a/pkgs/by-name/be/beammp-launcher/package.nix
+++ b/pkgs/by-name/be/beammp-launcher/package.nix
@@ -63,7 +63,10 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/BeamMP/BeamMP-Launcher";
     license = lib.licenses.agpl3Only;
     mainProgram = "BeamMP-Launcher";
-    maintainers = [ lib.maintainers.Andy3153 ];
+    maintainers = with lib.maintainers; [
+      Andy3153
+      mochienya
+    ];
     platforms = lib.platforms.linux;
   };
 })

From 91e27638ccb67ccfc98eae675b1d19d7f39317f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 04:09:05 +0000
Subject: [PATCH 3802/6226] netbird-management: 0.59.7 -> 0.59.10

---
 pkgs/by-name/ne/netbird/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix
index a2a71085d428..cc9f217885c5 100644
--- a/pkgs/by-name/ne/netbird/package.nix
+++ b/pkgs/by-name/ne/netbird/package.nix
@@ -68,16 +68,16 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "netbird-${componentName}";
-  version = "0.59.7";
+  version = "0.59.10";
 
   src = fetchFromGitHub {
     owner = "netbirdio";
     repo = "netbird";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qOb4viLMZme6sJzWxJuYkubQ3D67j5gkkLTRkcL2QKI=";
+    hash = "sha256-TsDeDHLbgnKKCROn+nih9Ne0/cRQ2noLCXiyysC9uG4=";
   };
 
-  vendorHash = "sha256-JMynPCH5Zvzz8nYI7DPu9TzU+rWJemPwyDdlPkFiqds=";
+  vendorHash = "sha256-t4uXuT6soKXxpv3Li9YhXHFMHPzbl1vPx5jcc7TR2pY=";
 
   nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config;
 

From 0a85f72c7a7573e749a0905b92bc1a14d75f119c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 04:20:44 +0000
Subject: [PATCH 3803/6226] terraform-providers.integrations_github: 6.7.0 ->
 6.7.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 8463aec0adc5..7cd2e9204937 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -741,11 +741,11 @@
     "vendorHash": null
   },
   "integrations_github": {
-    "hash": "sha256-OexDIuEHRSOeHq0lRZcaaezdQpm5tgINGcka6jk+bK0=",
+    "hash": "sha256-FVDx8KH7foy1rZigDVEWMEalQ9nJnLkRjkJsFi0aEuM=",
     "homepage": "https://registry.terraform.io/providers/integrations/github",
     "owner": "integrations",
     "repo": "terraform-provider-github",
-    "rev": "v6.7.0",
+    "rev": "v6.7.1",
     "spdx": "MIT",
     "vendorHash": null
   },

From a3877608f56d7d8b8d8b3649f78ec2e5669d4020 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 04:24:06 +0000
Subject: [PATCH 3804/6226] c-blosc2: 2.21.3 -> 2.22.0

---
 pkgs/development/libraries/c-blosc/2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/c-blosc/2.nix b/pkgs/development/libraries/c-blosc/2.nix
index 93ebcc7d95de..02cf43f7f5d6 100644
--- a/pkgs/development/libraries/c-blosc/2.nix
+++ b/pkgs/development/libraries/c-blosc/2.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "c-blosc2";
-  version = "2.21.3";
+  version = "2.22.0";
 
   src = fetchFromGitHub {
     owner = "Blosc";
     repo = "c-blosc2";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-jHp3l9sV5SiIOUjY2NUd5G+rH/8wr3TLZ+q/F8TAVhU=";
+    sha256 = "sha256-0eB+8zSlKCuHK1J2HlBUmWEJumAXSV2xnYMvnFud75A=";
   };
 
   # https://github.com/NixOS/nixpkgs/issues/144170

From f05240770cb89268131766357c315be40b82e719 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 04:30:43 +0000
Subject: [PATCH 3805/6226] terraform-providers.hashicorp_aws: 6.17.0 -> 6.18.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 8463aec0adc5..304464db54e0 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -489,13 +489,13 @@
     "vendorHash": "sha256-MYVkNvJ+rbwGw0htClIbmxk3YX2OK/ZO/QOTyMRFiug="
   },
   "hashicorp_aws": {
-    "hash": "sha256-paVJc2HHtdAoc1KoYj0P5/t990/9nZedqBnjJNvmoOM=",
+    "hash": "sha256-5W5v4j4oBXIfqW75ClXkBtAahgEW6oMiTmILL6++fEc=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/aws",
     "owner": "hashicorp",
     "repo": "terraform-provider-aws",
-    "rev": "v6.17.0",
+    "rev": "v6.18.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-93DyqAPi6hirke0KyR6gggC7cgAZOOByUIIA6C+6LZU="
+    "vendorHash": "sha256-Nxw5C4li2kH6MAlyaqHAUL+XYyuVPZYSkQ6PnmL3sV8="
   },
   "hashicorp_awscc": {
     "hash": "sha256-SrJQG1F9V/HThL6TDduT/qEA2x3tzII56+JMVDFpqEk=",

From e67fb9bf1e51f020c647f83ec7e81faa487e1fae Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Tue, 28 Oct 2025 21:38:04 -0700
Subject: [PATCH 3806/6226] ovftool: comment nits

---
 pkgs/by-name/ov/ovftool/package.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ov/ovftool/package.nix b/pkgs/by-name/ov/ovftool/package.nix
index 0ea75d4342f9..fe4888375a97 100644
--- a/pkgs/by-name/ov/ovftool/package.nix
+++ b/pkgs/by-name/ov/ovftool/package.nix
@@ -158,9 +158,7 @@ stdenv.mkDerivation (final: {
     # libgoogleurl and libcurl.
     #
     # FIXME: Replace libgoogleurl? Possibly from Chromium?
-    # FIXME: Tell VMware to use a modern version of OpenSSL on macOS. As of ovftool
-    # v4.6.3 ovftool uses openssl-1.0.2zj which in seems to be the extended
-    # support LTS release: https://www.openssl.org/support/contracts.html
+    # FIXME: Tell VMware to use a modern version of OpenSSL on macOS.
 
     # Install all libs that are not patched in preFixup.
     # Darwin dylibs are under `lib` in the zip.
@@ -174,7 +172,7 @@ stdenv.mkDerivation (final: {
     libvmacore.so \
     libvmomi.so
   ''
-  # macOS still relies on OpenSSL 1.0.2 as of v4.6.3, but Linux is in the clear
+  # macOS still relies on OpenSSL 1.0.2 as of v4.6.3 and later, but Linux is in the clear
   + lib.optionalString stdenv.hostPlatform.isDarwin ''
     lib/libcrypto.1.0.2.dylib \
     lib/libgoogleurl.59.0.30.45.2.dylib \

From f38bee461c0579b769898c0e5beb66950e9d748e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 04:49:05 +0000
Subject: [PATCH 3807/6226] alfis-nogui: 0.8.7 -> 0.8.8

---
 pkgs/by-name/al/alfis/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/al/alfis/package.nix b/pkgs/by-name/al/alfis/package.nix
index 67ff87511302..75de069fe85e 100644
--- a/pkgs/by-name/al/alfis/package.nix
+++ b/pkgs/by-name/al/alfis/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "alfis";
-  version = "0.8.7";
+  version = "0.8.8";
 
   src = fetchFromGitHub {
     owner = "Revertron";
     repo = "Alfis";
     tag = "v${version}";
-    hash = "sha256-u5luVJRNIuGqqNyh+C7nMSkZgoq/S7gpmsEiz8ntmC4=";
+    hash = "sha256-gRk4kvIV+5cCUFaJvGbTAR44678Twa28iMGZ75lJz2c=";
   };
 
-  cargoHash = "sha256-ittJ/iKcmvd5r8oaBoGhi/E2osq245OWxSC+VH+bme4=";
+  cargoHash = "sha256-Ge0+7ClXlJFT6CyluHF7k4stsX+KuYp/riro1pvrcKM=";
 
   nativeBuildInputs = [
     pkg-config

From 8c828102f9f4e90a87af6d079f7831a73f6d642f Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Tue, 28 Oct 2025 22:07:25 -0700
Subject: [PATCH 3808/6226] tpm2-pkcs11: 1.9.1 -> 1.9.2

---
 .../disable-java-integration.patch            | 20 ++++++++++---------
 pkgs/by-name/tp/tpm2-pkcs11/package.nix       |  6 ++++--
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/tp/tpm2-pkcs11/disable-java-integration.patch b/pkgs/by-name/tp/tpm2-pkcs11/disable-java-integration.patch
index bd4760ba3b53..a036a2faaebd 100644
--- a/pkgs/by-name/tp/tpm2-pkcs11/disable-java-integration.patch
+++ b/pkgs/by-name/tp/tpm2-pkcs11/disable-java-integration.patch
@@ -1,5 +1,5 @@
 diff --git a/Makefile-integration.am b/Makefile-integration.am
-index e2255de..3cea1d8 100644
+index 01c3408..b515784 100644
 --- a/Makefile-integration.am
 +++ b/Makefile-integration.am
 @@ -7,7 +7,6 @@ integration_scripts = \
@@ -9,8 +9,8 @@ index e2255de..3cea1d8 100644
 -    test/integration/pkcs11-javarunner.sh.java \
      test/integration/nss-tests.sh \
      test/integration/ptool-link.sh.nosetup \
-     test/integration/python-pkcs11.sh
-@@ -110,13 +109,5 @@ test_integration_pkcs_lockout_int_CFLAGS  = $(AM_CFLAGS) $(TESTS_CFLAGS)
+     test/integration/ptool-link-persistent.sh.nosetup \
+@@ -111,13 +110,5 @@ test_integration_pkcs_lockout_int_CFLAGS  = $(AM_CFLAGS) $(TESTS_CFLAGS)
  test_integration_pkcs_lockout_int_LDADD   = $(TESTS_LDADD)  $(SQLITE3_LIBS)
  test_integration_pkcs_lockout_int_SOURCES = test/integration/pkcs-lockout.int.c test/integration/test.c
  
@@ -25,16 +25,18 @@ index e2255de..3cea1d8 100644
  endif
  # END INTEGRATION
 diff --git a/configure.ac b/configure.ac
-index 1ec6eb4..7a0a8ee 100644
+index 104cf12..ccade64 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -258,13 +258,6 @@ AC_ARG_ENABLE(
+@@ -259,15 +259,6 @@ AC_ARG_ENABLE(
      [build and execute integration tests])],,
    [enable_integration=no])
  
 -# Test for Java compiler and interpreter without throwing fatal errors (since
 -# these macros are defined using AC_DEFUN they cannot be called conditionally)
--m4_pushdef([AC_MSG_ERROR], [have_javac=no])
+-# Test for javac by checking JAVAC variable since have_javac is not quite stable
+-# across versions of ax_prog_javac.m4 that provides AX_PROG_JAVAC
+-m4_pushdef([AC_MSG_ERROR], [true])
 -AX_PROG_JAVAC()
 -AX_PROG_JAVA()
 -m4_popdef([AC_MSG_ERROR])
@@ -42,11 +44,11 @@ index 1ec6eb4..7a0a8ee 100644
  AC_DEFUN([integration_test_checks], [
  
    AC_CHECK_PROG([tpm2_createprimary], [tpm2_createprimary], [yes], [no])
-@@ -382,13 +375,6 @@ AC_DEFUN([integration_test_checks], [
+@@ -385,13 +376,6 @@ AC_DEFUN([integration_test_checks], [
          [AC_MSG_ERROR([Integration tests enabled but tss2_provision executable not found.])])
    ])
  
--  AS_IF([test "x$have_javac" = "xno"],
+-  AS_IF([test -z "$JAVAC"],
 -    [AC_MSG_ERROR([Integration tests enabled but no Java compiler was found])])
 -  AX_CHECK_CLASS([org.junit.Assert], ,
 -    [AC_MSG_ERROR([Integration tests enabled but JUnit not found, try setting CLASSPATH])])
@@ -55,4 +57,4 @@ index 1ec6eb4..7a0a8ee 100644
 -
    AC_SUBST([ENABLE_INTEGRATION], [$enable_integration])
  ]) # end function integration_test_checks
-  
+ 
diff --git a/pkgs/by-name/tp/tpm2-pkcs11/package.nix b/pkgs/by-name/tp/tpm2-pkcs11/package.nix
index aa5c17d283aa..1bbe78d978b5 100644
--- a/pkgs/by-name/tp/tpm2-pkcs11/package.nix
+++ b/pkgs/by-name/tp/tpm2-pkcs11/package.nix
@@ -16,6 +16,7 @@
   opensc,
   openssh,
   openssl,
+  nix-update-script,
   nss,
   p11-kit,
   patchelf,
@@ -45,13 +46,13 @@ let
 in
 chosenStdenv.mkDerivation (finalAttrs: {
   pname = "tpm2-pkcs11";
-  version = "1.9.1";
+  version = "1.9.2";
 
   src = fetchFromGitHub {
     owner = "tpm2-software";
     repo = "tpm2-pkcs11";
     tag = finalAttrs.version;
-    hash = "sha256-W74ckrpK7ypny1L3Gn7nNbOVh8zbHavIk/TX3b8XbI8=";
+    hash = "sha256-o0a5MiFqLH7SuHG/BEtPVGOaDoV+kCu2l1MCHt5rWFc=";
   };
 
   # Disable Java‐based tests because of missing dependencies
@@ -242,6 +243,7 @@ chosenStdenv.mkDerivation (finalAttrs: {
         fapi-abrmd
         ;
     };
+    updateScript = nix-update-script { };
   };
 
   meta = {

From 9c3cd825812b89a740ea0144c64e2e780e5a508c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 05:11:36 +0000
Subject: [PATCH 3809/6226] python3Packages.google-cloud-videointelligence:
 2.16.2 -> 2.17.0

---
 .../python-modules/google-cloud-videointelligence/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
index f7f2a5bd3221..8ec1197ec2e6 100644
--- a/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
+++ b/pkgs/development/python-modules/google-cloud-videointelligence/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-videointelligence";
-  version = "2.16.2";
+  version = "2.17.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_videointelligence";
     inherit version;
-    hash = "sha256-SFv8MKhswRsxtYqpp6hA46WsW8eLFuhlOYnaV6TWmPk=";
+    hash = "sha256-AAi05hjj6oNYg+Ay2GYMhsa5M8mP4L+t2gNghv8DcoQ=";
   };
 
   build-system = [ setuptools ];

From 43ade2f51fab344cfd27ee8ca4a20ea4ed8d6499 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Tue, 28 Oct 2025 22:16:42 -0700
Subject: [PATCH 3810/6226] tpm2-pkcs11-abrmd: init at 1.9.2

---
 pkgs/by-name/tp/tpm2-pkcs11-abrmd/package.nix | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 pkgs/by-name/tp/tpm2-pkcs11-abrmd/package.nix

diff --git a/pkgs/by-name/tp/tpm2-pkcs11-abrmd/package.nix b/pkgs/by-name/tp/tpm2-pkcs11-abrmd/package.nix
new file mode 100644
index 000000000000..ea2188da5a0b
--- /dev/null
+++ b/pkgs/by-name/tp/tpm2-pkcs11-abrmd/package.nix
@@ -0,0 +1,5 @@
+{
+  tpm2-pkcs11,
+  ...
+}@args:
+tpm2-pkcs11.abrmd.override args

From 8d628172f83a3984feeb8653c7b49cb1c8d76258 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Mon, 18 Nov 2024 11:39:16 -0800
Subject: [PATCH 3811/6226] python3Packages.opencv4Full: init at 4.12.0

---
 pkgs/top-level/python-packages.nix | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 7c30ff851608..937e62e96e73 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10999,6 +10999,31 @@ self: super: with self; {
     }
   );
 
+  opencv4Full = toPythonModule (
+    pkgs.opencv4.override rec {
+      enablePython = true;
+      pythonPackages = self;
+      enableCuda = pkgs.config.cudaSupport;
+      enableCublas = enableCuda;
+      enableCudnn = enableCuda;
+      enableCufft = enableCuda;
+      enableLto = !stdenv.hostPlatform.isLinux; # https://github.com/NixOS/nixpkgs/issues/343123
+      enableUnfree = false; # prevents cache
+      enableIpp = true;
+      enableGtk2 = true;
+      enableGtk3 = true;
+      enableVtk = true;
+      enableFfmpeg = true;
+      enableGStreamer = true;
+      enableTesseract = true;
+      enableTbb = true;
+      enableOvis = true;
+      enableGPhoto2 = true;
+      enableDC1394 = true;
+      enableDocs = true;
+    }
+  );
+
   openerz-api = callPackage ../development/python-modules/openerz-api { };
 
   openevsewifi = callPackage ../development/python-modules/openevsewifi { };

From 40d1b2a1f346d16ffbbd78f0f220b817b74a1806 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 07:38:07 +0000
Subject: [PATCH 3812/6226] python3Packages.google-cloud-pubsub: 2.31.1 ->
 2.32.0

---
 .../python-modules/google-cloud-pubsub/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index 4afe356dd625..65b55da32464 100644
--- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-pubsub";
-  version = "2.31.1";
+  version = "2.32.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_pubsub";
     inherit version;
-    hash = "sha256-9CFPaS2kNa/N+0HnfPqWIjjbluSkumRjeqpxBELZxTI=";
+    hash = "sha256-PG24WT6ncsoGX7Iu5Pre5DhlLrW0z0x4s/28Ah9FKDY=";
   };
 
   build-system = [ setuptools ];

From 655726c2c5cb5a15ade45bf1858ff648847c9296 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 08:06:30 +0000
Subject: [PATCH 3813/6226] python3Packages.bidsschematools: 1.1.0 -> 1.1.1

---
 pkgs/development/python-modules/bidsschematools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bidsschematools/default.nix b/pkgs/development/python-modules/bidsschematools/default.nix
index e4b7642bb168..cd6747b1a71c 100644
--- a/pkgs/development/python-modules/bidsschematools/default.nix
+++ b/pkgs/development/python-modules/bidsschematools/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "bidsschematools";
-  version = "1.1.0";
+  version = "1.1.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "bidsschematools";
     inherit version;
-    hash = "sha256-cVVfI2Sie6ase/+Gm1GB/2SqGAxeVnJRgLQwEmJ8DgY=";
+    hash = "sha256-cuc73ly01vHdBI3G+pTU13jMDiluj0wULT74WjwW5us=";
   };
 
   build-system = [

From 468dd6e27129f964466f1359dc16b6079daaf05a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 08:10:04 +0000
Subject: [PATCH 3814/6226] python3Packages.llama-index-instrumentation: 0.4.1
 -> 0.4.2

---
 .../python-modules/llama-index-instrumentation/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-index-instrumentation/default.nix b/pkgs/development/python-modules/llama-index-instrumentation/default.nix
index acc9cdebf04f..61add9889d78 100644
--- a/pkgs/development/python-modules/llama-index-instrumentation/default.nix
+++ b/pkgs/development/python-modules/llama-index-instrumentation/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "llama-index-instrumentation";
-  version = "0.4.1";
+  version = "0.4.2";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_index_instrumentation";
     inherit version;
-    hash = "sha256-p50N0rq6NPBf9DVNY6mbISMiY1uK+mzJbtAKfhHr/cM=";
+    hash = "sha256-3ElXtk2gkiBgaQ6Fpr6WmKwI404PaekLATZN3sTz3n8=";
   };
 
   pythonRelaxDeps = [ "pydantic" ];

From a4cdbb0da687bfa32059640b06071052a492d8f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 08:27:57 +0000
Subject: [PATCH 3815/6226] python3Packages.cyclopts: 4.0.0 -> 4.1.0

---
 pkgs/development/python-modules/cyclopts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix
index d2b79bff7003..e8b8121bafa2 100644
--- a/pkgs/development/python-modules/cyclopts/default.nix
+++ b/pkgs/development/python-modules/cyclopts/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "cyclopts";
-  version = "4.0.0";
+  version = "4.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "BrianPugh";
     repo = "cyclopts";
     tag = "v${version}";
-    hash = "sha256-efc3P5xOy6YTWoCNOjatjELOEUh6Obfkf8U94GO4+40=";
+    hash = "sha256-829a2THiOszIiwJDh6WiAU8jZG84so0Jy1xD42ZSZgc=";
   };
 
   build-system = [

From 5fe5457b4e4f3f7e64397a84f1d88faa9abd9c10 Mon Sep 17 00:00:00 2001
From: Rowan Goemans <goemansrowan@gmail.com>
Date: Wed, 29 Oct 2025 09:28:31 +0100
Subject: [PATCH 3816/6226] Revert "solvespace: use system mimalloc (#450858)"

This reverts commit 6e123b592e1beeba99dce1230158ef121c192f9b, reversing
changes made to dab90ffd8384d821ce638a6b46352b59bb600b8a.
---
 pkgs/by-name/so/solvespace/package.nix | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/pkgs/by-name/so/solvespace/package.nix b/pkgs/by-name/so/solvespace/package.nix
index 5ccf8a275d3e..92b397f8d071 100644
--- a/pkgs/by-name/so/solvespace/package.nix
+++ b/pkgs/by-name/so/solvespace/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   pkg-config,
   wrapGAppsHook3,
@@ -24,7 +23,6 @@
   libspnav,
   libthai,
   libxkbcommon,
-  mimalloc,
   pangomm,
   pcre,
   util-linuxMinimal, # provides libmount
@@ -44,13 +42,6 @@ stdenv.mkDerivation rec {
     fetchSubmodules = true;
   };
 
-  patches = [
-    (fetchpatch {
-      url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/media-gfx/solvespace/files/solvespace-3.1-use-system-mimalloc.patch";
-      hash = "sha256-XEeh6vb4fYsTmAro1ZR/8NyFl+Y+S+m/Lx+tA7o2omM=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -76,7 +67,6 @@ stdenv.mkDerivation rec {
     libspnav
     libthai
     libxkbcommon
-    mimalloc
     pangomm
     pcre
     util-linuxMinimal

From acbeb604ce82cee6aae8226730d32014f4167682 Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Sun, 5 Oct 2025 23:12:38 +0200
Subject: [PATCH 3817/6226] nixos/sssd: migrate to rfc42-style settings

---
 nixos/modules/security/ipa.nix          | 68 +++++++++++++------------
 nixos/modules/services/misc/sssd.nix    | 50 +++++++++++++++++-
 nixos/tests/all-tests.nix               |  2 +-
 nixos/tests/sssd-ldap.nix               | 34 +++++++------
 nixos/tests/sssd-legacy-config.nix      | 37 ++++++++++++++
 nixos/tests/sssd.nix                    | 22 --------
 pkgs/os-specific/linux/sssd/default.nix |  2 +-
 7 files changed, 140 insertions(+), 75 deletions(-)
 create mode 100644 nixos/tests/sssd-legacy-config.nix
 delete mode 100644 nixos/tests/sssd.nix

diff --git a/nixos/modules/security/ipa.nix b/nixos/modules/security/ipa.nix
index dd01aaf26b21..eded8dd6bcd2 100644
--- a/nixos/modules/security/ipa.nix
+++ b/nixos/modules/security/ipa.nix
@@ -7,7 +7,6 @@
 with lib;
 let
   cfg = config.security.ipa;
-  pyBool = x: if x then "True" else "False";
 
   ldapConf = pkgs.writeText "ldap.conf" ''
     # Turning this off breaks GSSAPI used with krb5 when rdns = false
@@ -236,50 +235,53 @@ in
 
     services.sssd = {
       enable = true;
-      config = ''
-        [domain/${cfg.domain}]
-        id_provider = ipa
-        auth_provider = ipa
-        access_provider = ipa
-        chpass_provider = ipa
+      settings = {
+        "domain/${cfg.domain}" = {
+          id_provider = "ipa";
+          auth_provider = "ipa";
+          access_provider = "ipa";
+          chpass_provider = "ipa";
 
-        ipa_domain = ${cfg.domain}
-        ipa_server = _srv_, ${cfg.server}
-        ipa_hostname = ${cfg.ipaHostname}
+          ipa_domain = cfg.domain;
+          ipa_server = "_srv_, ${cfg.server}";
+          ipa_hostname = cfg.ipaHostname;
 
-        cache_credentials = ${pyBool cfg.cacheCredentials}
-        krb5_store_password_if_offline = ${pyBool cfg.offlinePasswords}
-        ${optionalString ((toLower cfg.domain) != (toLower cfg.realm)) "krb5_realm = ${cfg.realm}"}
+          cache_credentials = cfg.cacheCredentials;
+          krb5_store_password_if_offline = cfg.offlinePasswords;
+          krb5_realm = lib.mkIf ((toLower cfg.domain) != (toLower cfg.realm)) cfg.realm;
 
-        dyndns_update = ${pyBool cfg.dyndns.enable}
-        dyndns_iface = ${cfg.dyndns.interface}
+          dyndns_update = cfg.dyndns.enable;
+          dyndns_iface = cfg.dyndns.interface;
 
-        ldap_tls_cacert = /etc/ipa/ca.crt
-        ldap_user_extra_attrs = mail:mail, sn:sn, givenname:givenname, telephoneNumber:telephoneNumber, lock:nsaccountlock
+          ldap_tls_cacert = "/etc/ipa/ca.crt";
+          ldap_user_extra_attrs = "mail:mail, sn:sn, givenname:givenname, telephoneNumber:telephoneNumber, lock:nsaccountlock";
+        };
 
-        [sssd]
-        services = nss, sudo, pam, ssh, ifp
-        domains = ${cfg.domain}
+        sssd = {
+          services = "nss, sudo, pam, ssh, ifp";
+          domains = cfg.domain;
+        };
 
-        [nss]
-        homedir_substring = /home
+        nss.homedir_substring = "/home";
 
-        [pam]
-        pam_pwd_expiration_warning = 3
-        pam_verbosity = 3
+        pam = {
+          pam_pwd_expiration_warning = 3;
+          pam_verbosity = 3;
+        };
 
-        [sudo]
+        sudo = { };
 
-        [autofs]
+        autofs = { };
 
-        [ssh]
+        ssh = { };
 
-        [pac]
+        pac = { };
 
-        [ifp]
-        user_attributes = +mail, +telephoneNumber, +givenname, +sn, +lock
-        allowed_uids = ${concatStringsSep ", " cfg.ifpAllowedUids}
-      '';
+        ifp = {
+          user_attributes = "+mail, +telephoneNumber, +givenname, +sn, +lock";
+          allowed_uids = concatStringsSep ", " cfg.ifpAllowedUids;
+        };
+      };
     };
 
     networking.timeServers = singleton cfg.server;
diff --git a/nixos/modules/services/misc/sssd.nix b/nixos/modules/services/misc/sssd.nix
index 11374f9c014d..05351a040916 100644
--- a/nixos/modules/services/misc/sssd.nix
+++ b/nixos/modules/services/misc/sssd.nix
@@ -6,20 +6,59 @@
 }:
 let
   cfg = config.services.sssd;
+  settingsFormat = pkgs.formats.ini { };
 
   dataDir = "/var/lib/sssd";
   settingsFile = "${dataDir}/sssd.conf";
-  settingsFileUnsubstituted = pkgs.writeText "${dataDir}/sssd-unsubstituted.conf" cfg.config;
+  mkSettingsFileUnsubstituted =
+    settings:
+    let
+      pyBool = x: if x then "True" else "False";
+      finalSettings = lib.mapAttrs (
+        _: lib.mapAttrs (_: v: if lib.isBool v then pyBool v else v)
+      ) settings;
+    in
+    settingsFormat.generate "sssd-unsubstituted.conf" finalSettings;
+  settingsFileUnsubstituted =
+    if cfg.settings == { } then
+      pkgs.writeText "sssd-unsubstituted.conf" cfg.config
+    else
+      mkSettingsFileUnsubstituted cfg.settings;
 in
 {
   options = {
     services.sssd = {
       enable = lib.mkEnableOption "the System Security Services Daemon";
 
+      settings = lib.mkOption {
+        inherit (settingsFormat) type;
+        description = "Contents of {file}`sssd.conf`.";
+        default = { };
+        example = {
+          sssd = {
+            services = "nss, pam";
+            domains = "shadowutils";
+          };
+
+          nss = { };
+
+          pam = { };
+
+          "domain/shadowutils" = {
+            id_provider = "proxy";
+            proxy_lib_name = "files";
+            auth_provider = "proxy";
+            proxy_pam_target = "sssd-shadowutils";
+            proxy_fast_alias = true;
+          };
+        };
+      };
+
       config = lib.mkOption {
         type = lib.types.lines;
         description = "Contents of {file}`sssd.conf`.";
-        default = ''
+        default = "";
+        example = ''
           [sssd]
           services = nss, pam
           domains = shadowutils
@@ -80,6 +119,13 @@ in
   };
   config = lib.mkMerge [
     (lib.mkIf cfg.enable {
+      assertions = [
+        {
+          assertion = lib.xor (cfg.settings != { }) (cfg.config != "");
+          message = "services.sssd.settings and services.sssd.config are mutually exclusive";
+        }
+      ];
+
       # For `sssctl` to work.
       environment.etc."sssd/sssd.conf".source = settingsFile;
       environment.etc."sssd/conf.d".source = "${dataDir}/conf.d";
diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 0d35e82c5fa1..47d731555364 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -1372,8 +1372,8 @@ in
   ssh-audit = runTest ./ssh-audit.nix;
   sshwifty = runTest ./web-apps/sshwifty/default.nix;
   sslh = handleTest ./sslh.nix { };
-  sssd = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd.nix { };
   sssd-ldap = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd-ldap.nix { };
+  sssd-legacy-config = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd-legacy-config.nix { };
   stalwart-mail = runTest ./stalwart/stalwart-mail.nix;
   stargazer = runTest ./web-servers/stargazer.nix;
   starship = runTest ./starship.nix;
diff --git a/nixos/tests/sssd-ldap.nix b/nixos/tests/sssd-ldap.nix
index 9d18ef64f39d..f60232945adc 100644
--- a/nixos/tests/sssd-ldap.nix
+++ b/nixos/tests/sssd-ldap.nix
@@ -112,23 +112,25 @@ import ./make-test-python.nix (
           enable = true;
           # just for testing purposes, don't put this into the Nix store in production!
           environmentFile = "${pkgs.writeText "ldap-root" "LDAP_BIND_PW=${ldapRootPassword}"}";
-          config = ''
-            [sssd]
-            config_file_version = 2
-            services = nss, pam, sudo
-            domains = ${dbDomain}
+          settings = {
+            sssd = {
+              config_file_version = 2;
+              services = "nss, pam, sudo";
+              domains = dbDomain;
+            };
 
-            [domain/${dbDomain}]
-            auth_provider = ldap
-            id_provider = ldap
-            ldap_uri = ldaps://127.0.0.1:636
-            ldap_tls_reqcert = allow
-            ldap_tls_cacert = /etc/cert.pem
-            ldap_search_base = ${dbSuffix}
-            ldap_default_bind_dn = cn=${ldapRootUser},${dbSuffix}
-            ldap_default_authtok_type = password
-            ldap_default_authtok = $LDAP_BIND_PW
-          '';
+            "domain/${dbDomain}" = {
+              auth_provider = "ldap";
+              id_provider = "ldap";
+              ldap_uri = "ldaps://127.0.0.1:636";
+              ldap_tls_reqcert = "allow";
+              ldap_tls_cacert = "/etc/cert.pem";
+              ldap_search_base = dbSuffix;
+              ldap_default_bind_dn = "cn=${ldapRootUser},${dbSuffix}";
+              ldap_default_authtok_type = "password";
+              ldap_default_authtok = "$LDAP_BIND_PW";
+            };
+          };
         };
       };
 
diff --git a/nixos/tests/sssd-legacy-config.nix b/nixos/tests/sssd-legacy-config.nix
new file mode 100644
index 000000000000..f394c16fdea1
--- /dev/null
+++ b/nixos/tests/sssd-legacy-config.nix
@@ -0,0 +1,37 @@
+import ./make-test-python.nix (
+  { pkgs, ... }:
+
+  {
+    name = "sssd-legacy-config";
+    meta = with pkgs.lib.maintainers; {
+      maintainers = [ bbigras ];
+    };
+    nodes.machine.services.sssd = {
+      enable = true;
+      config = # ini
+        ''
+          [sssd]
+          services = nss, pam
+          domains = shadowutils
+
+          [nss]
+
+          [pam]
+
+          [domain/shadowutils]
+          id_provider = proxy
+          proxy_lib_name = files
+          auth_provider = proxy
+          proxy_pam_target = sssd-shadowutils
+          proxy_fast_alias = True
+        '';
+    };
+
+    testScript = ''
+      start_all()
+      machine.wait_for_unit("multi-user.target")
+      machine.wait_for_unit("sssd.service")
+      machine.succeed("sssctl config-check")
+    '';
+  }
+)
diff --git a/nixos/tests/sssd.nix b/nixos/tests/sssd.nix
deleted file mode 100644
index 5622eadf4e16..000000000000
--- a/nixos/tests/sssd.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-import ./make-test-python.nix (
-  { pkgs, ... }:
-
-  {
-    name = "sssd";
-    meta = with pkgs.lib.maintainers; {
-      maintainers = [ bbigras ];
-    };
-    nodes.machine =
-      { pkgs, ... }:
-      {
-        services.sssd.enable = true;
-      };
-
-    testScript = ''
-      start_all()
-      machine.wait_for_unit("multi-user.target")
-      machine.wait_for_unit("sssd.service")
-      machine.succeed("sssctl config-check")
-    '';
-  }
-)
diff --git a/pkgs/os-specific/linux/sssd/default.nix b/pkgs/os-specific/linux/sssd/default.nix
index 1072c9aa148f..af643a8b6a67 100644
--- a/pkgs/os-specific/linux/sssd/default.nix
+++ b/pkgs/os-specific/linux/sssd/default.nix
@@ -221,7 +221,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     tests = {
-      inherit (nixosTests) sssd sssd-ldap;
+      inherit (nixosTests) sssd-ldap sssd-legacy-config;
       pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;
     };
     updateScript = nix-update-script { };

From 7e18baa2d0fba32036b971e6e22671d4ca3dc645 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Wed, 29 Oct 2025 16:08:56 +0800
Subject: [PATCH 3818/6226] python3Packages.warp-lang: fix build in llvm 21

---
 pkgs/development/python-modules/warp-lang/default.nix | 2 +-
 pkgs/top-level/python-packages.nix                    | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/warp-lang/default.nix b/pkgs/development/python-modules/warp-lang/default.nix
index 9de805812305..af4a10f5bcb8 100644
--- a/pkgs/development/python-modules/warp-lang/default.nix
+++ b/pkgs/development/python-modules/warp-lang/default.nix
@@ -8,7 +8,7 @@
   fetchurl,
   jax,
   lib,
-  llvmPackages,
+  llvmPackages, # TODO: use llvm 21 in 1.10, see python-packages.nix
   numpy,
   pkgsBuildHost,
   python,
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f76176309239..e92ad9ab79df 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20007,7 +20007,10 @@ self: super: with self; {
 
   warlock = callPackage ../development/python-modules/warlock { };
 
-  warp-lang = callPackage ../development/python-modules/warp-lang { };
+  warp-lang = callPackage ../development/python-modules/warp-lang {
+    stdenv = if stdenv.hostPlatform.isDarwin then pkgs.llvmPackages_19.stdenv else pkgs.stdenv;
+    llvmPackages = pkgs.llvmPackages_19;
+  };
 
   warrant = callPackage ../development/python-modules/warrant { };
 

From 2043929ed74922f8b2f56720527a5de37123c5df Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Wed, 29 Oct 2025 16:09:20 +0800
Subject: [PATCH 3819/6226] python3Packages.warp-lang: 1.9.0 -> 1.9.1

---
 pkgs/development/python-modules/warp-lang/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/warp-lang/default.nix b/pkgs/development/python-modules/warp-lang/default.nix
index af4a10f5bcb8..e09e7560bb55 100644
--- a/pkgs/development/python-modules/warp-lang/default.nix
+++ b/pkgs/development/python-modules/warp-lang/default.nix
@@ -38,7 +38,7 @@ let
   effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else args.stdenv;
   stdenv = throw "Use effectiveStdenv instead of stdenv directly, as it may be replaced by cudaPackages.backendStdenv";
 
-  version = "1.9.0";
+  version = "1.9.1";
 
   libmathdx = effectiveStdenv.mkDerivation (finalAttrs: {
     # NOTE: The version used should match the version Warp requires:
@@ -144,7 +144,7 @@ buildPythonPackage {
     owner = "NVIDIA";
     repo = "warp";
     tag = "v${version}";
-    hash = "sha256-OEg2mUsEdRKhgx0fIraqme4moKNh1RSdN7/yCT1V5+g=";
+    hash = "sha256-Atp3WyxQ7GYwWLmQIUgoPULyVlNjduh4/9CBixNWFwc=";
   };
 
   patches =

From 86a2ea4ea3e36b6d83d62dbbdbcee8da251fbc88 Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Wed, 29 Oct 2025 10:16:30 +0100
Subject: [PATCH 3820/6226] floorp-bin: 12.3.3 -> 12.4.0

Release notes: https://blog.floorp.app/en/release/12.4.0.html

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 .../fl/floorp-bin-unwrapped/sources.json       | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json
index d58ae3701fb3..e8fad96e96e2 100644
--- a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json
+++ b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json
@@ -1,21 +1,21 @@
 {
-  "version": "12.3.3",
+  "version": "12.4.0",
   "sources": {
     "aarch64-linux": {
-      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.3.3/floorp-linux-aarch64.tar.xz",
-      "sha256": "ad2a957493f2ad9aea294ca0322c6b744f6c1188fbefbd772c0a5c0e65832456"
+      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.4.0/floorp-linux-aarch64.tar.xz",
+      "sha256": "a9ac6e381a828715f9595430c1eaab40d1e6b73c11a6ab2f3a6e75829e2ac7c6"
     },
     "x86_64-linux": {
-      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.3.3/floorp-linux-x86_64.tar.xz",
-      "sha256": "9bcbfadbae583cdd8a45ab3735fa08e0f613151645fc8ae5ee716cbb6140b76c"
+      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.4.0/floorp-linux-x86_64.tar.xz",
+      "sha256": "454098dbda9a4b22dd77f189f6b6f7833bdc6247363a8b487e5f0f3c9741dbc0"
     },
     "aarch64-darwin": {
-      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.3.3/floorp-macOS-universal.dmg",
-      "sha256": "0f9c3d2efe228f63c8f7c95aae19eee137f2a4ddfa980cdedf0d1da4fc4a975c"
+      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.4.0/floorp-macOS-universal.dmg",
+      "sha256": "80fc3499394aea7a44175f2359866e5471213ca03d21e69cde81ebf4ff0d5ae7"
     },
     "x86_64-darwin": {
-      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.3.3/floorp-macOS-universal.dmg",
-      "sha256": "0f9c3d2efe228f63c8f7c95aae19eee137f2a4ddfa980cdedf0d1da4fc4a975c"
+      "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.4.0/floorp-macOS-universal.dmg",
+      "sha256": "80fc3499394aea7a44175f2359866e5471213ca03d21e69cde81ebf4ff0d5ae7"
     }
   }
 }

From c39da4851e5d23717cf9971563015379da70870d Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Wed, 29 Oct 2025 18:44:41 +0900
Subject: [PATCH 3821/6226] clive: adapt version format to fix update notifier

The previous format caused false-positive alerts in the update notifier.
The leading "v" is required by golang.org/x/mod/semver.

- https://cs.opensource.google/go/x/mod/+/master:semver/semver.go;l=6-7;drc=5517a715a62aaf2d2ab02e64ce67586c60767e8f
- https://github.com/koki-develop/clive/blob/114553637cf71500c673267ceab7194e06ee2951/.goreleaser.yaml#L10
- https://github.com/koki-develop/clive/blob/114553637cf71500c673267ceab7194e06ee2951/cmd/notify.go#L45-L46
- https://github.com/koki-develop/clive/blob/114553637cf71500c673267ceab7194e06ee2951/internal/util/version.go#L3
---
 pkgs/by-name/cl/clive/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/cl/clive/package.nix b/pkgs/by-name/cl/clive/package.nix
index b91308d2e0f0..37f904d2f3f8 100644
--- a/pkgs/by-name/cl/clive/package.nix
+++ b/pkgs/by-name/cl/clive/package.nix
@@ -29,7 +29,7 @@ buildGoModule rec {
   ];
 
   ldflags = [
-    "-X github.com/koki-develop/clive/cmd.version=${version}"
+    "-X github.com/koki-develop/clive/cmd.version=v${version}"
   ];
 
   postInstall = ''

From 66360a4c7ef0c132e787cd0e19da918436dbca89 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Wed, 29 Oct 2025 11:10:33 +0100
Subject: [PATCH 3822/6226] libreoffice: use system frozen

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/applications/office/libreoffice/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 11d1711c0ed7..0a5913bf3b98 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -156,6 +156,7 @@
   lp_solve,
   xmlsec,
   libcmis,
+  frozen-containers,
 }:
 
 assert builtins.elem variant [
@@ -471,6 +472,7 @@ stdenv.mkDerivation (finalAttrs: {
       which
       xmlsec
       zlib
+      frozen-containers
     ]
     ++ optionals kdeIntegration [
       qt6.qtbase
@@ -563,10 +565,10 @@ stdenv.mkDerivation (finalAttrs: {
     "--with-system-orcus"
     "--with-system-postgresql"
     "--with-system-xmlsec"
+    "--with-system-frozen"
 
     # TODO: package these as system libraries
     "--without-system-altlinuxhyph"
-    "--without-system-frozen"
     "--without-system-libeot"
     "--without-system-libfreehand"
     "--without-system-libmspub"

From 440aca879a17489bb83832498f8d77e527fe6d1d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 10:18:31 +0000
Subject: [PATCH 3823/6226] nagios: 4.5.9 -> 4.5.10

---
 pkgs/by-name/na/nagios/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/na/nagios/package.nix b/pkgs/by-name/na/nagios/package.nix
index 6f7a1aed64ad..1321c2f02bbb 100644
--- a/pkgs/by-name/na/nagios/package.nix
+++ b/pkgs/by-name/na/nagios/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nagios";
-  version = "4.5.9";
+  version = "4.5.10";
 
   src = fetchFromGitHub {
     owner = "NagiosEnterprises";
     repo = "nagioscore";
     tag = "nagios-${finalAttrs.version}";
-    hash = "sha256-aOHdMZJCrGeJ3XA3+ed3JUb7X1FdfdGiT2ytzBDAT4c=";
+    hash = "sha256-NnGnatzu/iFKFaofg0O2gqDqkQwg/jrBLgSmrWqef5Q=";
   };
 
   patches = [ ./nagios.patch ];

From ad352bf180084853a170b3f5c9b392e6c830b407 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jan=20van=20Br=C3=BCgge?= <supermanitu@gmail.com>
Date: Wed, 29 Oct 2025 10:22:04 +0000
Subject: [PATCH 3824/6226] jellyflix: fix build

---
 pkgs/by-name/je/jellyflix/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/je/jellyflix/package.nix b/pkgs/by-name/je/jellyflix/package.nix
index 15a20de0fa00..d68c7cb0503c 100644
--- a/pkgs/by-name/je/jellyflix/package.nix
+++ b/pkgs/by-name/je/jellyflix/package.nix
@@ -25,6 +25,9 @@ flutter332.buildFlutterApplication rec {
       --replace-fail "} on DioException catch (_) {
           return _.response!.statusCode ?? 400;" "} on DioException catch (e) {
           return e.response!.statusCode ?? 400;"
+
+    substituteInPlace linux/CMakeLists.txt \
+      --replace-fail "-Werror" ""
   '';
 
   postInstall = ''

From 10aad8e4bd966fa57f27ed1736a74f64b7742bb4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 10:30:01 +0000
Subject: [PATCH 3825/6226] terraform-providers.cloudamqp_cloudamqp: 1.37.0 ->
 1.38.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 cca0d968e74b..e34656872a4a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -181,13 +181,13 @@
     "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk="
   },
   "cloudamqp_cloudamqp": {
-    "hash": "sha256-WjmZTm04m0iTrXg2/B4I64ccXnfT+qYHZzaYgnJRy3c=",
+    "hash": "sha256-h/QAHh5hpTtpyKcq6LqqJunN9+U2GIEpm8+yEeevHjM=",
     "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp",
     "owner": "cloudamqp",
     "repo": "terraform-provider-cloudamqp",
-    "rev": "v1.37.0",
+    "rev": "v1.38.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-p/vZYmNBkUGHjZHYzmixOzOWi55YUrbbEdVbOeX1JIs="
+    "vendorHash": "sha256-q942GCRd5czCdlpLYsXzj8Kt91GjCpyzhOkgWfkyHo8="
   },
   "cloudflare_cloudflare": {
     "hash": "sha256-Lc9bC1dM4wNe+ZN2EYFRYfoZosocBEOI9SHvxJIOQCY=",

From ef2235e7a92817ad02baefe16b3bbe45e5b9de69 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Tue, 28 Oct 2025 13:57:24 +0200
Subject: [PATCH 3826/6226] python-aliases: remove inherit

---
 pkgs/top-level/python-aliases.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 03f55add971b..3a7bb0f79313 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -94,7 +94,7 @@ mapAliases {
   asyncio-mqtt = throw "asyncio-mqtt has been replaced by aiomqtt, which is not API compatible."; # added 2024-07-07
   asyncio-nats-client = nats-py; # added 2022-02-08
   atsim_potentials = atsim-potentials; # added 2023-10-08
-  inherit (super.pkgs) autotrash; # added 2024-09-23
+  autotrash = super.pkgs.autotrash; # added 2024-09-23
   awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13
   azure-functions-devops-build = throw "azure-functions-devops-build has been removed, because it is abandoned"; # added 2024-10-04
   Babel = babel; # added 2022-05-06
@@ -271,7 +271,7 @@ mapAliases {
   fastnlo_toolkit = fastnlo-toolkit; # added 2024-01-03
   fastpair = throw "fastpair is unmaintained upstream and has therefore been removed"; # added 2024-05-01
   faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12
-  inherit (super.pkgs) fetchPypi; # added 2023-05-25
+  fetchPypi = super.pkgs.fetchPypi; # added 2023-05-25
   fenics = throw "fenics has been removed, use fenics-dolfinx instead"; # added 2025-08-07
   filebrowser_safe = filebrowser-safe; # added 2024-01-03
   filemagic = throw "inactive since 2014, so use python-magic instead"; # added 2022-11-19
@@ -337,7 +337,7 @@ mapAliases {
   grappelli_safe = grappelli-safe; # added 2023-10-08
   groestlcoin_hash = groestlcoin-hash; # added 2024-01-06
   grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21
-  inherit (pkgs) gtimelog;
+  gtimelog = pkgs.gtimelog; # added 2023-10-06
   guzzle_sphinx_theme = guzzle-sphinx-theme; # added 2023-10-16
   ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06
   HAP-python = hap-python; # added 2021-06-01

From 4919bb7b9aca0b5f628dbf9e6e070c9452ba9826 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 29 Oct 2025 09:41:26 +0000
Subject: [PATCH 3827/6226] python3Packages.ray: 2.50.1 -> 2.51.0

Changelog: https://github.com/ray-project/ray/releases/tag/ray-2.51.0
---
 .../python-modules/ray/default.nix            | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix
index 63ec490c9cf8..e5885874505f 100644
--- a/pkgs/development/python-modules/ray/default.nix
+++ b/pkgs/development/python-modules/ray/default.nix
@@ -64,7 +64,7 @@
 
 let
   pname = "ray";
-  version = "2.50.1";
+  version = "2.51.0";
 in
 buildPythonPackage rec {
   inherit pname version;
@@ -84,22 +84,22 @@ buildPythonPackage rec {
       # Results are in ./ray-hashes.nix
       hashes = {
         x86_64-linux = {
-          cp310 = "sha256-3qnMYOkt0IlokVZ1bm2ZyZ/j5JE0GA9xVDay41K134Y=";
-          cp311 = "sha256-hfR2u05mfarWUxjymjWxPW+qjgUwB5xmfVSMAMLZJeg=";
-          cp312 = "sha256-dciE4x1NwMOE1KS2jpYRF1tqy6hiI1K8q7cxkMufjD8=";
-          cp313 = "sha256-elJVS9VfKmGIr1b/5ce9l35A65e3tigtgnqNOnPweJo=";
+          cp310 = "sha256-Ag3Ynx7RHTOM75BhdGsatc8mNpDBkiQi4zPsdC8Cvpc=";
+          cp311 = "sha256-EYXBn2iHyik5DC+EQTD3LDOX1XNZRxX5paZN7PuyGUI=";
+          cp312 = "sha256-cLfLCsRVoZbIIRMkQAzy93c60NXwWF0htiVZ6aADOAk=";
+          cp313 = "sha256-yCsJhLPRDYhNI69cpK3oqjdoyVfMtDJwSvjpIOXN4y0=";
         };
         aarch64-linux = {
-          cp310 = "sha256-sGGBb4rtS8oLgRdNv/5xfGn7e8og79j3VWDTpvjMsoA=";
-          cp311 = "sha256-duHqpifhm3Bvoh5InLppLHFD19NYQzc7pxlB3vB6tYs=";
-          cp312 = "sha256-qEJP06Sh7zFKhfgMNh8i6b2UnHpj4jjPQXLcGVWxLHw=";
-          cp313 = "sha256-QMtWy4Kid51bJna3vNkR0PCnjSI0oVq7T5gkFbZRz8o=";
+          cp310 = "sha256-48d59JxV5tth4iylLuET+Apo5APafNbaDoSAyuZi9QM=";
+          cp311 = "sha256-2Z31lVJ3rK4YasnGzux39Lp2Lw8hNaP3AVd3cYeu7T0=";
+          cp312 = "sha256-BHFnYv5SJOp9Dp25w5ZhBLGyrsyr/MhQhRAtdPAzShE=";
+          cp313 = "sha256-PfIB7kmN8ZCAN6N5VK33C77Id6gdPWD/Lcj0LIlh530=";
         };
         aarch64-darwin = {
-          cp310 = "sha256-DuYbabBqy3dU9s0IcWCEzklfu9ljrrcs+00UUl0OCWk=";
-          cp311 = "sha256-uzP9gWhP6tSqtwa9iLCqJ7lGhJBr+1EeWcxXVohaP28=";
-          cp312 = "sha256-cj5WyBk/it3j7BiBerQ3rRzJ1Oct8SY+hWl74oLPxSY=";
-          cp313 = "sha256-JUolfcK6Q0mkeErx8gTE2BaZCOp3mi5dTehzEatfUl8=";
+          cp310 = "sha256-olwAGedusCeQeyi4y77LYteoYX55/0dcHWURYq/a/O0=";
+          cp311 = "sha256-eTY8nQJzJVEw81ncGJuhpye7mCiudzUxQ35WryCsaxw=";
+          cp312 = "sha256-BfktgeYrADF5pXwrMo3alloboyXdtSJWZVmapLUew6U=";
+          cp313 = "sha256-cRGOKyOm0t8hQoauqDEXU80+y6CNPApjGl8gsc8lJg0=";
         };
       };
     in
@@ -207,6 +207,10 @@ buildPythonPackage rec {
       pyarrow
       requests
       tensorboardx
+
+      # `import ray.tune` fails without pydantic
+      # Reported upstream: https://github.com/ray-project/ray/issues/58280
+      pydantic
     ];
   });
 

From f8e0f03bddf93e3d299456529ae3fd71a03fecd9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 11:32:51 +0000
Subject: [PATCH 3828/6226] mattermost: 10.11.4 -> 10.11.5

---
 pkgs/by-name/ma/mattermost/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index e2dc15a2ead6..d8b8b35c498c 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -19,9 +19,9 @@
     #
     # Ensure you also check ../mattermostLatest/package.nix.
     regex = "^v(10\\.11\\.[0-9]+)$";
-    version = "10.11.4";
-    srcHash = "sha256-gSVoO0paAwvxEeZkcCP81oxMcSu/H8n3Tr+2OEXuFyM=";
-    vendorHash = "sha256-DS4OC3eQffD/8yLE01gnTJXwV77G7rWk4kqA/rTCtJw=";
+    version = "10.11.5";
+    srcHash = "sha256-X0YjyRrFSYI7A+VINLV3NwAmsxgTkdUdHChyl1L+iWY=";
+    vendorHash = "sha256-Lsw/cvl98JdVmzWr85lAv/JMcTmZZZ4ALLunFLNcrro=";
     npmDepsHash = "sha256-p9dq31qw0EZDQIl2ysKE38JgDyLA6XvSv+VtHuRh+8A=";
     lockfileOverlay = ''
       unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")

From 7ee19bd54a8426e510b833fa96d75a349616acc3 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Tue, 28 Oct 2025 14:20:49 +0200
Subject: [PATCH 3829/6226] python-aliases: cleanup and add missing comments

Co-authored-by: Wolfgang Walther <walther@technowledgy.de>
---
 pkgs/top-level/python-aliases.nix | 54 +++++++++++++++----------------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 3a7bb0f79313..a0e7edd44e95 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -54,6 +54,7 @@ mapAliases {
   pypy3 = throw "do not use pypy3 when building Python packages, use the generic python parameter instead"; # do not remove
   pypy310 = throw "do not use pypy310 when building Python packages, use the generic python parameter instead"; # do not remove
   pypy311 = throw "do not use pypy311 when building Python packages, use the generic python parameter instead"; # do not remove
+  fetchPypi = super.pkgs.fetchPypi; # added 2023-05-25, too many usages
 
   aadict = throw "aadict was removed, it was introduced as a dependency for a package that never manifested and has been an unused leaf package ever since"; # added 2024-07-08
   abodepy = jaraco-abode; # added 2023-02-01
@@ -110,9 +111,9 @@ mapAliases {
   backports_weakref = throw "backports_weakref has been removed, since we no longer need to backport to python3.3"; # added 2023-07-28
   bash_kernel = bash-kernel; # added 2023-11-10
   beancount_docverif = beancount-docverif; # added 2023-10-08
-  beets-unstable = lib.warn "beets-unstable was aliased to beets, since upstream releases are frequent nowadays" self.beets; # added 2025-10-16;
-  beets-stable = lib.warn "beets-stable was aliased to beets, since upstream releases are frequent nowadays" self.beets; # added 2025-10-16;
-  beets-extrafiles = throw "beets-extrafiles is unmaintained since 2020 and broken since beets 2.0.0";
+  beets-unstable = lib.warn "beets-unstable was aliased to beets, since upstream releases are frequent nowadays" self.beets; # added 2025-10-16
+  beets-stable = lib.warn "beets-stable was aliased to beets, since upstream releases are frequent nowadays" self.beets; # added 2025-10-16
+  beets-extrafiles = throw "beets-extrafiles is unmaintained since 2020 and broken since beets 2.0.0"; # added 2024-12-07
   bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04
   bip_utils = bip-utils; # 2023-10-08
   bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15
@@ -177,7 +178,7 @@ mapAliases {
   cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14
   criticality-score = throw "use pkgs.criticality-score instead"; # added 2024-12-31
   cryptacular = throw "cryptacular was removed, because it was disabled on all python version since 3.6 and last updated in 2021"; # Added 2024-05-13
-  cryptography_vectors = "cryptography_vectors is no longer exposed in python*Packages because it is used for testing cryptography only."; # Added 2022-03-23
+  cryptography_vectors = throw "'cryptography_vectors' has been renamed to/replaced by 'cryptography-vectors'"; # Added 2022-03-23
   cufflinks = throw "cufflinks has removed, since it is abandoned and broken"; # added 2025-02-16
   curve25519-donna = throw "curve25519-donna was removed, since it is abandoned and unmaintained since 2015"; # added 2025-05-21
   cx_Freeze = cx-freeze; # added 2023-08-02
@@ -258,7 +259,7 @@ mapAliases {
   et_xmlfile = et-xmlfile; # added 2023-10-16
   etebase-server = throw "pkgs.python3.etebase-server has been removed, use pkgs.etebase-server"; # added 2024-07-16
   ev3dev2 = python-ev3dev2; # added 2023-06-19
-  evernote = throw "evernote is intended for use with Python 2.X";
+  evernote = throw "evernote is intended for use with Python 2.X"; # added 2025-04-22
   eyeD3 = eyed3; # added 2024-01-03
   f3d_egl = lib.warnOnInstantiate "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # added 2025-07-18
   Fabric = fabric; # addedd 2023-02-19
@@ -271,7 +272,6 @@ mapAliases {
   fastnlo_toolkit = fastnlo-toolkit; # added 2024-01-03
   fastpair = throw "fastpair is unmaintained upstream and has therefore been removed"; # added 2024-05-01
   faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12
-  fetchPypi = super.pkgs.fetchPypi; # added 2023-05-25
   fenics = throw "fenics has been removed, use fenics-dolfinx instead"; # added 2025-08-07
   filebrowser_safe = filebrowser-safe; # added 2024-01-03
   filemagic = throw "inactive since 2014, so use python-magic instead"; # added 2022-11-19
@@ -291,17 +291,17 @@ mapAliases {
   flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20
   flask_testing = flask-testing; # added 2022-04-25
   flask_wtf = flask-wtf; # added 2022-05-24
-  flask-autoindex = throw "flask-autoindex was removed, as it is not compatible with flask 3.0 and unmaintained since 2020.";
+  flask-autoindex = throw "flask-autoindex was removed, as it is not compatible with flask 3.0 and unmaintained since 2020."; # added 2024-01-26
   flask-common = throw "flask-common was removed, as it is not compatible with flask 3.0 and unmaintained since 2018."; # added 2025-01-11
-  flask-basicauth = throw "flask-basicauth was removed, as it is not compatible with flask 3.0 and unmaintained since 2016.";
-  flask-sessionstore = throw "flask-sessionstore was removed, as it is not compatible with flask 3.0 and unmaintained since 2017.";
+  flask-basicauth = throw "flask-basicauth was removed, as it is not compatible with flask 3.0 and unmaintained since 2016."; # added 2024-01-26
+  flask-sessionstore = throw "flask-sessionstore was removed, as it is not compatible with flask 3.0 and unmaintained since 2017."; # added 2024-01-26
   flask-silk = throw "flask-silk was removed, as it is unmaintained since 2018."; # added 2025-05-25
   flask-sockets = throw "flask-sockets has been removed as the upstream repository was archived in 2022"; # Added 2025-01-01
   flowlogs_reader = flowlogs-reader; # added 2024-01-03
   flufl_bounce = flufl-bounce; # added 2023-11-03
   flufl_i18n = flufl-i18n; # added 2023-11-03
   flufl_lock = flufl-lock; # added 2023-11-03
-  fn = throw "fn was removed as it is no longer used by any package in nixpkgs, it is not compatible with python 3.11 or newer and it was last updated in 2014."; # added 2025-02-08 # added 2024-07-08
+  fn = throw "fn was removed as it is no longer used by any package in nixpkgs, it is not compatible with python 3.11 or newer and it was last updated in 2014."; # added 2025-02-08
   FormEncode = formencode; # added 2023-02-19
   foundationdb51 = throw "foundationdb51 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
   foundationdb52 = throw "foundationdb52 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
@@ -322,7 +322,7 @@ mapAliases {
   gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
   github3_py = github3-py; # added 2024-01-04
   GitPython = gitpython; # added 2022-10-28
-  glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28
+  glances = throw "glances has moved to pkgs.glances"; # added 2020-12-28
   glasgow = throw "glasgow has been promoted to a top-level attribute name: `pkgs.glasgow`"; # added 2023-02-05
   globre = throw "globre was removed, because it was disabled on all python version since 3.7 and last updated in 2020."; # added 2024-05-13
   goobook = throw "goobook has been promoted to a top-level attribute name: `pkgs.goobook`"; # Added 2025-03-25
@@ -404,7 +404,7 @@ mapAliases {
   keras-preprocessing = throw "keras-preprocessing has been removed because it's abandoned since 2024"; # added 2025-01-12
   keyring_24 = throw "keyring_24 has been removed, use keyring instead"; # added 2025-01-01
   keyrings-passwordstore = throw "keyrings-passwordstore has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
-  kivy-garden-modernmenu = throw "kivy-garden-modernmenu has been removed as it's abandoned since 2019"; # added 2505-05-25
+  kivy-garden-modernmenu = throw "kivy-garden-modernmenu has been removed as it's abandoned since 2019"; # added 2025-05-25
   ldap = python-ldap; # added 2022-09-16
   lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
   langchain-standard-tests = langchain-tests; # added 2025-01-22
@@ -496,11 +496,11 @@ mapAliases {
   nose_progressive = throw "nose_progressive has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-02-21
   nose-timer = throw "nose-timer has been removed as it depends on the abandoned nose test framework"; # added 2024-07-27
   nose-warnings-filters = throw "nose-warnings-filters has been removed as it has been unmaintained since 2016"; # added 2024-07-27
-  nose_warnings_filters = nose-warnings-filters; # added 2024-01-07
+  nose_warnings_filters = throw "nose_warning_filters has been removed as it has been unmaintained since 2016"; # added 2024-01-07
   nose-xunitmp = throw "nose-xunitmp has been removed as it depends on the abandoned nose test framework"; # added 2024-07-29
   notifymuch = throw "notifymuch has been promoted to a top-level attribute name: `pkgs.notifymuch`"; # added 2022-10-02
   Nuitka = nuitka; # added 2023-02-19
-  ntlm-auth = throw "ntlm-auth has been removed, because it relies on the md4 implementation provided by openssl. Use pyspnego instead.";
+  ntlm-auth = throw "ntlm-auth has been removed, because it relies on the md4 implementation provided by openssl. Use pyspnego instead."; # added 2023-03-14
   oauth = throw "oauth has been removed as it is unmaintained"; # added 2025-05-16
   oauth2 = throw "oauth2 has been removed as it is unmaintained"; # added 2025-05-16
   objax = throw "objax has been removed because the upstream project was archived."; # Added 2025-10-04
@@ -522,7 +522,7 @@ mapAliases {
   pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19
   paho-mqtt_1 = throw "paho-mqtt_1 was removed because no package depends on it anymore"; # added 2025-03-05
   paho-mqtt_2 = paho-mqtt; # added 2025-03-05
-  pam = python-pam; # added 2020-09-07.
+  pam = python-pam; # added 2020-09-07
   PasteDeploy = pastedeploy; # added 2021-10-07
   pathlib = throw "pathlib was removed as it has been integrated in python standard library in version 3.4"; # added 2024-05-13
   pathpy = path; # added 2022-04-12
@@ -535,18 +535,18 @@ mapAliases {
   percol = throw "percol has been removed because it hasn't been updated since 2019"; # added 2025-05-25
   pillow-simd = throw "pillow-simd has been removed for lagging behind pillow upstream, which exposes it to various security issues."; # Added 2024-10-24
   pipenv-poetry-migrate = throw "pipenv-poetry-migrate was promoted to a top-level attribute"; # added 2025-01-14
-  pixelmatch = "pixelmatch has been removed as it was unmaintained"; # Added 2024-08-18
+  pixelmatch = throw "pixelmatch has been removed as it was unmaintained"; # Added 2024-08-18
   pkutils = throw "pkutils was removed as it was unused and is not applicable to modern Python build tools"; # added 2024-07-28
   poetry = throw "poetry was promoted to a top-level attribute, use poetry-core to build Python packages"; # added 2023-01-09
   poetry2conda = throw "poetry2conda was promoted to a top-level attribute"; # Added 2022-10-02
   Polygon3 = polygon3; # Added 2023-08-08
   posix_ipc = posix-ipc; # added 2024-01-07
   poster3 = throw "poster3 is unmaintained and source is no longer available"; # added 2023-05-29
-  postgrest-py = postgrest; # added 2024-08-29
+  postgrest-py = postgrest; # added 2025-08-29
   postorius = throw "Please use pkgs.mailmanPackages.postorius"; # added 2022-04-29
   powerlineMemSegment = powerline-mem-segment; # added 2021-10-08
   prayer-times-calculator = prayer-times-calculator-offline; # added 2024-08-11
-  premailer = throw "premailer was removed, as it is not compatible with lxml>4.9.4.";
+  premailer = throw "premailer was removed, as it is not compatible with lxml>4.9.4."; # added 2024-09-14
   primp = throw "primp was removed as it required a very outdated version of boringssl"; # added 2025-10-20
   privacyidea-ldap-proxy = throw "privacyidea-ldap-proxy has been removed from nixpkgs"; # added 2023-10-31
   proboscis = throw "proboscis has been removed since it has not been maintained for 11 years"; # added 2024-05-20
@@ -616,12 +616,12 @@ mapAliases {
   pymaging_png = throw "pymaging_png has been removed because it has not been maintained for 10 years and has been archived."; # added 2023-11-04
   pymatgen-lammps = throw "pymatgen-lammps has been removed because it is unmaintained and broken"; # added 2023-06-20
   pymazda = throw "pymazda has been removed, because the upstream repo has been affected by a DCMA claim."; # added 2023-10-16
-  pymc3 = pymc; # added 2022-06-05, module was rename starting with 4.0.0
+  pymc3 = pymc; # added 2022-06-05
   pymelcloud = python-melcloud; # added 2025-05-08
   pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
   PyMVGLive = pymvglive; # added 2023-02-19
   pymyq = python-myq; # added 2023-10-20
-  pynose = throw "pynose was removed, because it violates the license of nose, by redistributing modified LGPL code under MIT.";
+  pynose = throw "pynose was removed, because it violates the license of nose, by redistributing modified LGPL code under MIT."; # added 2024-08-07
   python-bring-api = throw "python-bring-api was removed because Home Assistant switched to bring-api"; # added 2025-10-03
   python-ethtool = ethtool; # added 2024-07-23
   python-myq = throw "python-myq has been removed, as the service provider has decided to block its API requests"; # added 2023-12-07
@@ -696,11 +696,11 @@ mapAliases {
   python_magic = python-magic; # added 2022-05-07
   python_mimeparse = python-mimeparse; # added 2021-10-31
   python-language-server = throw "python-language-server is no longer maintained, use the python-lsp-server community fork instead."; # Added 2022-08-03
-  python-Levenshtein = levenshtein;
+  python-Levenshtein = levenshtein; # added 2022-12-31
   python-pushover = throw "python-pushover has been removed, since it is unmaintained and is broken"; # added 2023-07-03
   python-simple-hipchat = throw "'python-simple-hipchat' has been removed because it was broken and unmaintained"; # added 2025-08-26
   python-subunit = subunit; # added 2021-09-10
-  python-wifi = throw "python-wifi does not support Python3";
+  python-wifi = throw "python-wifi does not support Python3"; # added 2025-04-23
   pytest_xdist = pytest-xdist; # added 2021-01-04
   python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
   pytoml = throw "pytoml has been removed because it is unmaintained and is superseded by toml"; # Added 2023-04-11
@@ -728,7 +728,7 @@ mapAliases {
   quamash = throw "'quamash' has been removed, since it is unmaintained and broken"; # added 2024-10-17
   querystring_parser = querystring-parser; # added 2024-01-07
   qcodes-loop = throw "qcodes-loop has been removed due to deprecation"; # added 2023-11-30
-  qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages";
+  qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; # added 2022-02-11
   rabbitpy = throw "rabbitpy has been removed, since it is unmaintained and broken"; # added 2023-07-01
   radian = throw "radian has been promoted to a top-level attribute name: `pkgs.radian`"; # added 2025-05-02
   radicale_infcloud = radicale-infcloud; # added 2024-01-07
@@ -757,7 +757,7 @@ mapAliases {
   rig = throw "rig has been removed because it was pinned to python 2.7 and 3.5, failed to build and is otherwise unmaintained"; # added 2022-11-28
   rising = throw "rising has been removed because it was abandoned and archived by upstream"; # added 2024-11-15
   rki-covid-parser = throw "rki-covid-parser has been removed because it is unmaintained and broken"; # added 2025-09-20
-  rl-coach = "rl-coach was removed because the project is discontinued and was archived by upstream"; # added 2023-05-03
+  rl-coach = throw "rl-coach was removed because the project is discontinued and was archived by upstream"; # added 2023-05-03
   roboschool = throw "roboschool is deprecated in favor of PyBullet and has been removed"; # added 2022-01-15
   ronin = throw "ronin has been removed because it was unmaintained since 2018"; # added 2024-08-21
   ROPGadget = ropgadget; # added 2021-07-06
@@ -802,7 +802,7 @@ mapAliases {
   solaredge = throw "solaredge was removed because Home Assistant switched to aiosolaredge"; # added 2024-07-15
   sorl_thumbnail = sorl-thumbnail; # added 2023-11-12
   spacy_models = spacy-models; # added 2024-04-21
-  SPARQLWrapper = sparqlwrapper;
+  SPARQLWrapper = sparqlwrapper; # added 2022-10-14
   spark_parser = spark-parser; # added 2024-01-07
   sparsezoo = throw "sparsezoo has been removed since it is abandonned"; # added 2025-09-01
   sphinx-jquery = sphinxcontrib-jquery; # added 2023-02-24
@@ -907,12 +907,12 @@ mapAliases {
   xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31
   XlsxWriter = xlsxwriter; # added 2023-02-19
   yahooweather = throw "yahooweather has been removed because it is no longer maintained"; # added 2025-01-13
-  xsser = "xsser has been removed because it was unmaintained and relies on a archived project"; # added 2024-07-27
+  xsser = throw "xsser has been removed because it was unmaintained and relies on a archived project"; # added 2024-07-27
   Yapsy = yapsy; # added 2023-02-19
   yanc = throw "yanc has been removed because it relies on nose"; # added 2024-07-27
   z3 = z3-solver; # added 2023-12-03
   zake = throw "zake has been removed because it is abandoned"; # added 2023-06-20
-  zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules";
+  zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; # added 2022-10-14
   zc-buildout221 = zc-buildout; # added 2021-07-21
   zc_lockfile = zc-lockfile; # added 2024-01-06
   zcs = throw "zcs was removed as it is no longer used by any packages in nixpkgs."; # added 2025-02-08

From c8e774e51f77ff642124ac4af60915a07166062f Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Wed, 29 Oct 2025 12:32:33 +0200
Subject: [PATCH 3830/6226] python-aliases: drop throws older than june 2025

---
 pkgs/top-level/python-aliases.nix | 465 ------------------------------
 1 file changed, 465 deletions(-)

diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index a0e7edd44e95..dd1bacd7f92f 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -56,145 +56,51 @@ mapAliases {
   pypy311 = throw "do not use pypy311 when building Python packages, use the generic python parameter instead"; # do not remove
   fetchPypi = super.pkgs.fetchPypi; # added 2023-05-25, too many usages
 
-  aadict = throw "aadict was removed, it was introduced as a dependency for a package that never manifested and has been an unused leaf package ever since"; # added 2024-07-08
   abodepy = jaraco-abode; # added 2023-02-01
-  acebinf = throw "acebinf has been removed because it is abandoned and broken."; # Added 2023-05-19
-  acoustics = throw "acoustics has been removed because the upstream repository was archived in 2024"; # Added 2024-10-04
-  adafruit-nrfutil = throw "adafruit-nrfutil has been promoted to a top-level attribute name: `pkgs.adafruit-nrfutil`."; # Added 2023-11-19
-  aeppl = throw "aeppl was removed as it depends on aesara, which is unmaintained"; # added 2025-01-12
-  aesara = throw "aesara was removed as the upstream repository is unmaintained"; # added 2025-01-12
-  aioaladdinconnect = throw "aioaladdinconnect has been removed, as the API is supported was obsoleted on 2024-01-24."; # Added 2024-06-07
-  aiohttp-isal = throw "aiohttp-isal has been removed, as it has been archived and replace by aiohttp-fast-zlib"; # Added 2024-08-11
-  aiohttp-zlib-ng = throw "aiohttp-zlib-ng has been removed, as it has been archived and replaced by aiohttp-fast-zlib"; # Added 2024-11-14
-  aiomysensors = throw "aiomysensors has been removed, as it was packaged for Home Assistant, which migrated to pymysensors."; # Added 2024-07-07
-  aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30
-  aiolip = throw "aiolip has been removed because the upstream repository was archived in 2021"; # Added 2024-10-04
-  aiolivisi = throw "aiolivisi was removed because Home Assistant switched to livisi"; # added 2025-01-09
-  aionotify = throw "aionotify has been removed because is unmaintained and incompatible with python3.11."; # Added 2023-10-27
-  aiosenseme = throw "aiosenseme has been removed, because it does no longer work with the latest firmware and has become unmaintained"; # Added 2023-07-05
-  aioquic-mitmproxy = throw "aioquic-mitmproxy has been removed because mitmproxy no longer uses it"; # Added 2024-01-16
   ansiwrap = throw "ansiwrap has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
   amazon_kclpy = amazon-kclpy; # added 2023-08-08
   amazon-kclpy = throw "amazon-kclpy has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
-  ambiclimate = throw "ambiclimate has been removed, because the service has been terminated after 2024-03-31."; # Added 2024-06-07
-  ambee = throw "ambee has been removed because the upstream repository was archived in 2022"; # Added 2024-10-04
-  amiibo-py = throw "amiibo-py has been removed because the upstream repository was removed"; # Added 2025-01-13
-  ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30
-  ansible-doctor = throw "ansible-doctor has been promoted to a top-level attribute name: `pkgs.ansible-doctor`"; # Added 2023-05-16
-  ansible-lint = throw "ansible-lint has been promoted to a top-level attribute name: `pkgs.ansible-lint`"; # Added 2023-05-16
-  ansible-navigator = throw "ansible-navigator has been promoted to a top-level attribute name: pkgs.ansible-navigator"; # Added 2024-08-07
-  anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
-  apache-airflow = throw "apache-airflow has been moved out of pythonPackages and is available as a standalone package"; # added 2023-06-05
   apkit = throw "apkit was removed because it is unmaintained upstream and different from apkit on PyPI"; # added 2025-09-13
   argon2_cffi = argon2-cffi; # added 2022-05-09
-  arnparse = throw "arnparse has been removed because the upstream repository was archived in 2023"; # Added 2024-10-04
   APScheduler = apscheduler; # added 2023-02-19
   astropy-extension-helpers = extension-helpers; # Added 2025-10-15
   async_generator = async-generator; # added 2023-08-08
   async_stagger = async-stagger; # added 2023-08-08
-  asyncio-mqtt = throw "asyncio-mqtt has been replaced by aiomqtt, which is not API compatible."; # added 2024-07-07
   asyncio-nats-client = nats-py; # added 2022-02-08
   atsim_potentials = atsim-potentials; # added 2023-10-08
   autotrash = super.pkgs.autotrash; # added 2024-09-23
-  awkward0 = throw "awkward0 has been removed, use awkward instead"; # added 2022-12-13
-  azure-functions-devops-build = throw "azure-functions-devops-build has been removed, because it is abandoned"; # added 2024-10-04
   Babel = babel; # added 2022-05-06
-  backports-cached-property = throw "backports-cached-property has been removed, since we no longer need to backport to python3.7"; # added 2024-11-12
-  backports-shutil-get-terminal-size = throw "backports-shutil-get-terminal-size has been removed, since we no longer need to backport to python3.2"; # added 2024-11-12
-  backports-shutil-which = throw "backports-shutil-which has been removed, since we no longer need to backport to python3.2"; # added 2024-11-12
-  backports-zoneinfo = throw "backports-zoneinfo has been removed, since we no longer need to backport to python3.8"; # added 2024-11-12
-  backports_csv = throw "backports_csv has been removed, since we no longer need to backport to python2"; # added 2023-07-28
-  backports_functools_lru_cache = throw "backports_functools_lru_cache has been removed, since we no longer need to backport to python3.2"; # added 2023-07-28
   backports_shutil_get_terminal_size = backports-shutil-get-terminal-size; # added 2024-04-21
-  backports_tempfile = throw "backports_tempfile has been removed, since we no longer need to backport to python3.3"; # added 2023-07-28
-  backports_unittest-mock = throw "backports_unittest-mock has been removed, since we no longer need to backport to python3.2"; # added 2023-07-28
-  backports_weakref = throw "backports_weakref has been removed, since we no longer need to backport to python3.3"; # added 2023-07-28
   bash_kernel = bash-kernel; # added 2023-11-10
   beancount_docverif = beancount-docverif; # added 2023-10-08
   beets-unstable = lib.warn "beets-unstable was aliased to beets, since upstream releases are frequent nowadays" self.beets; # added 2025-10-16
   beets-stable = lib.warn "beets-stable was aliased to beets, since upstream releases are frequent nowadays" self.beets; # added 2025-10-16
-  beets-extrafiles = throw "beets-extrafiles is unmaintained since 2020 and broken since beets 2.0.0"; # added 2024-12-07
-  bedup = throw "bedup was removed because it was broken and abandoned upstream"; # added 2023-02-04
   bip_utils = bip-utils; # 2023-10-08
-  bitcoin-price-api = throw "bitcoin-price-api has been removed, it was using setuptools 2to3 translation feautre, which has been removed in setuptools 58"; # added 2022-02-15
   bjoern = throw "'bjoern' has been removed, as the upstream repository was unmaintained and it was using libraries with severe security issues."; # Added 2025-09-01
   bkcharts = throw "'bkcharts' has been removed as the upstream repository was archived in 2018"; # added 2025-08-26
-  blessings = throw "blessings has been removed in favor of blessed, as it was unmaintained"; # added 2024-08-20
   BlinkStick = blinkstick; # added 2023-02-19
-  blockdiagcontrib-cisco = throw "blockdiagcontrib-cisco is not compatible with blockdiag 2.0.0 and has been removed."; # added 2020-11-29
-  boto = throw "boto was removed as it is deprecated upstream, had not been updated since 2018, and failed to build; please use boto3 and botocore"; # Added 2024-09-22
-  boxx = throw "boxx was removed as it is no longer used by any packages in nixpkgs."; # added 2025-02-08
-  bpycv = throw "bpycv was removed as it is incompatible with blender version 4 or later."; # added 2025-02-08
   bsblan = python-bsblan; # added 2022-11-04
   btchip = btchip-python; # added 2023-03-03
-  bugz = throw "use pkgs.pybugz instead"; # added 2024-12-31
   bugzilla = python-bugzilla; # added 2024-10-17
-  buildbot = throw "use pkgs.buildbot instead"; # added 2022-04-07
-  buildbot-ui = throw "use pkgs.buildbot-ui instead"; # added 2022-04-07
-  buildbot-full = throw "use pkgs.buildbot-full instead"; # added 2022-04-07
-  buildbot-plugins = throw "use pkgs.buildbot-plugins instead"; # added 2022-04-07
-  buildbot-worker = throw "use pkgs.buildbot-worker instead"; # added 2022-04-07
-  buildbot-pkg = throw "buildbot-pkg has been removed, it's only internally used in buildbot"; # added 2022-04-07
-  bunch = throw "bunch has been removed as it is unmaintained since inception"; # added 2025-05-31
   btsmarthub_devicelist = btsmarthub-devicelist; # added 2024-01-03
   bt_proximity = bt-proximity; # added 2021-07-02
   bz2file = throw "'bz2file' has beem removed, as it was not longed maintained upstream since 2020"; # added 2025-08-26
   BTrees = btrees; # added 2023-02-19
-  cacheyou = throw "cacheyou has been removed, as it was no longer used for the only consumer pdm"; # added 2023-12-21
-  cadquery = throw "cadquery was removed, because it was disabled on all python version since 3.8 and marked as broken"; # added 2024-05-13
-  caffeWithCuda = throw "caffeWithCuda has been removed, as it was broken and required CUDA 10"; # Added 2024-11-20
   can = python-can; # added 2024-08-12
-  carrot = throw "carrot has been removed, as its development was discontinued in 2012"; # added 2022-01-18
   casbin = pycasbin; # added 2025-06-12
-  case = throw "case has been removed, since it is an unused leaf package with a dependency on the nose test framework"; # added 2024-07-08
   cchardet = faust-cchardet; # added 2023-03-02
-  cepa = throw "cepa has been removed, as onionshare switched back to stem"; # added 2024-05-07
-  chainer = throw "chainer has been removed, as it is abandoned and broken"; # added 2024-12-31
-  chiabip158 = throw "chiabip158 has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
-  chiapos = throw "chiapos has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
-  chiavdf = throw "chiavdf has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
-  chia-rs = throw "chia-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
   class-registry = phx-class-registry; # added 2021-10-05
-  cirq-ft = throw "cirq-ft is not longer provieded by cirq upstream"; # added 2024-08-31
   cirq-rigetti = throw "cirq-rigetti was removed because it is no longer provided by upstream"; # added 2025-09-13
-  ciscoconfparse = throw "ciscoconfparse was archived by upstream, use ciscoconfparse2"; # added 2025-03-08
-  cld2-cffi = throw "cld2-cffi has been removed, as the last release was in 2016"; # added 2024-05-20
-  clvm = throw "clvm has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
-  clvm-rs = throw "clvm-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
-  clvm-tools = throw "clvm-tools has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
-  clvm-tools-rs = throw "clvm-tools-rs has been removed. see https://github.com/NixOS/nixpkgs/pull/270254"; # added 2023-11-26
-  cntk = throw "cntk has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09
-  codecov = throw "python-codecov has been removed, as it was broken and archived by upstream."; # Added 2024-10-24
-  codespell = throw "codespell has been promoted to a top-level attribute name: `pkgs.codespell`"; # Added 2022-10-02
   ColanderAlchemy = colanderalchemy; # added 2023-02-19
   command_runner = command-runner; # added 2024-03-06
   commitizen = throw "commitizen has been promoted to a top-level attribute name: `pkgs.commitizen`"; # added 2025-09-14
   CommonMark = commonmark; # added 2023-02-1
   ConfigArgParse = configargparse; # added 2021-03-18
   configshell = configshell-fb; # added 2025-03-14
-  coronavirus = throw "coronavirus was removed, because the source is not providing the data anymore."; # added 2023-05-04
-  covCore = throw "covCore was renamed to cov-core and subsequently removed since it has ben unmaintained since 2014"; # added 2024-05-20
-  cov-core = throw "cov-core has been removed, it was archived and unmaintained since 2014"; # added 2024-05-21
-  cozy = throw "cozy was removed because it was not actually https://pypi.org/project/Cozy/."; # added 2022-01-14
-  criticality-score = throw "use pkgs.criticality-score instead"; # added 2024-12-31
-  cryptacular = throw "cryptacular was removed, because it was disabled on all python version since 3.6 and last updated in 2021"; # Added 2024-05-13
-  cryptography_vectors = throw "'cryptography_vectors' has been renamed to/replaced by 'cryptography-vectors'"; # Added 2022-03-23
-  cufflinks = throw "cufflinks has removed, since it is abandoned and broken"; # added 2025-02-16
-  curve25519-donna = throw "curve25519-donna was removed, since it is abandoned and unmaintained since 2015"; # added 2025-05-21
   cx_Freeze = cx-freeze; # added 2023-08-02
   cx_oracle = cx-oracle; # added 2024-01-03
-  d2to1 = throw "d2to1 is archived and no longer works with setuptools v68"; # added 2023-07-30
-  dask-expr = throw "dask-expr was removed because its features are available in dask"; # added 2025-02-07
-  dask-xgboost = throw "dask-xgboost was removed because its features are available in xgboost"; # added 2022-05-24
-  dash-renderer = throw "dash-renderer has been removed since it is abandoned"; # added 2025-01-01
   dateutil = python-dateutil; # added 2021-07-03
   debian = python-debian; # added 2024-12-10
-  deep_merge = throw "deep_merge has been removed, since it is no longer maintained and may be broken."; # added 2023-10-09
-  demjson = throw "demjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
-  deprecat = throw "deprecat has been removed, it unmaintained and archived by upstream"; # added 2025-03-08
-  descartes = throw "descartes has been removed, since it is abandoned and broken"; # added 2023-06-21
-  detox = throw "detox is no longer maintained, and was broken since may 2019"; # added 2020-07-04
-  dftfit = throw "dftfit dependency lammps-cython no longer builds"; # added 2021-07-04
   dictpath = pathable; # added 2023-01-28
   diff_cover = diff-cover; # added 2021-07-02
   discogs_client = discogs-client; # added 2021-07-02
@@ -203,81 +109,52 @@ mapAliases {
   dj-stripe = throw "dj-stripe has been removed because it is unused and broken"; # added 2025-07-21
   djangorestframework-guardian2 = throw "djangorestframework-guardian2 has been removed because djangorestframework-guardian is active again and the upstream project was archived"; # added 2025-08-22
   djangorestframework-jwt = drf-jwt; # added 2021-07-20
-  django-allauth-2fa = throw "django-allauth-2fa was removed because it was unused and django-allauth now contains 2fa logic itself."; # added 2025-02-15
-  django-sampledatahelper = throw "django-sampledatahelper was removed because it is no longer compatible to latest Django version"; # added 2022-07-18
-  django_2 = throw "Django 2 has reached it's projected EOL in 2022/04 and has therefore been removed."; # added 2022-03-05
-  django_3 = throw "Django 3 has reached it#s EOL in 2024-04 and has therefore been removed."; # added 2025-01-25
   django_appconf = django-appconf; # added 2022-03-03
   django_classytags = django-classy-tags; # added 2023-07-25
   django_colorful = django-colorful; # added 2023-07-25
   django_compat = django-compat; # added 2023-07-25
-  django-compat = throw "django-compat has been removed. It provided forward/backport compat for django 1.x, which is long end of life."; # added 2023-07-26
   django_contrib_comments = django-contrib-comments; # added 2023-07-25
   django-crispy-bootstrap3 = crispy-bootstrap3; # added 2025-06-11
   django-crispy-bootstrap4 = crispy-bootstrap4; # added 2025-06-11
   django-crispy-bootstrap5 = crispy-bootstrap5; # added 2025-06-11
-  django-crontab = throw "django-crontabe has been removed beacause it is unmaintained since 2018"; # added 2024-08-21
-  django-discover-runner = throw "django-discover-runner was removed because it is no longer maintained."; # added 2022-11-21
   django_environ = django-environ; # added 2021-12-25
   django_extensions = django-extensions; # added 2022-01-09
   django_guardian = django-guardian; # added 2022-05-19
   django_hijack = django-hijack; # added 2023-05-16
   django_hijack_admin = django-hijack-admin; # added 2023-05-16
-  django-hijack-admin = throw "django-hijack-admin has been removed, since it is no longer compatible to django-hijack"; # added 2023-06-21
   django_modelcluster = django-modelcluster; # added 2022-04-02
-  django-mysql = throw "django-mysql has been removed, since it was an unused leaf package"; # added 2024-07-02
   django_nose = django-nose; # added 2023-07-25
-  django-nose = throw "django-nose has been removed since it has not been maintained and there are no dependent packages"; # added 2024-05-21
-  django-q = throw "django-q has been removed because it is unmaintained and was unused"; # added 2024-12-13
   django_reversion = django-reversion; # added 2022-06-18
   django_polymorphic = django-polymorphic; # added 2022-05-24
   django_redis = django-redis; # added 2021-10-11
   django_silk = django-silk; # added 2023-07-25
-  django-sr = throw "django-sr has been removed since it has been unmaintained for 10 years"; # added 2024-05-26
   django_tagging = django-tagging; # added 2023-07-25
   django_taggit = django-taggit; # added 2021-10-11
   django_treebeard = django-treebeard; # added 2023-07-25
   dns = dnspython; # added 2017-12-10
   docker_pycreds = docker-pycreds; # added 2024-01-03
-  docker-py = throw "docker-py was renamed to docker in version 2.0.0 back in 2016"; # added 2024-05-29
-  doctest-ignore-unicode = throw "doctest-ignore-unicode has been removed since it has been unmaintained for 11 years"; # added 2024-05-20
   dogpile_cache = dogpile-cache; # added 2021-10-28
-  dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20
   duckduckgo-search = throw "duckduckgo-search was renamed to ddgs, use ddgs instead"; # added 2025-10-20
-  dugong = throw "dugong is unmaintained since 2022 and has therefore been removed"; # added 2024-12-12
   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
   easyeda2ato = throw "easyeda2ato as been removed in favor of atopile-easyda2kicad"; # added 2025-06-08
-  eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03
   EasyProcess = easyprocess; # added 2023-02-19
   email_validator = email-validator; # added 2022-06-22
   embreex = throw "embreex has been removed, as it required embree2"; # added 2025-09-14
-  enhancements = throw "enhancements is unmaintained upstream and has therefore been removed"; # added 2023-10-27
-  enum-compat = throw "enum-compat is a virtual package providing enum34, which does not do anything since Python 3.4"; # added 2025-02-15
-  enum34 = throw "enum34 is no longer needed since Python 3.4"; # added 2025-03-06
   elegy = throw "elegy has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11
   eris = throw "eris has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   et_xmlfile = et-xmlfile; # added 2023-10-16
-  etebase-server = throw "pkgs.python3.etebase-server has been removed, use pkgs.etebase-server"; # added 2024-07-16
   ev3dev2 = python-ev3dev2; # added 2023-06-19
-  evernote = throw "evernote is intended for use with Python 2.X"; # added 2025-04-22
   eyeD3 = eyed3; # added 2024-01-03
   f3d_egl = lib.warnOnInstantiate "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # added 2025-07-18
   Fabric = fabric; # addedd 2023-02-19
   face_recognition = face-recognition; # added 2022-10-15
   face_recognition_models = face-recognition-models; # added 2022-10-15
   factory_boy = factory-boy; # added 2023-10-08
-  fake_factory = throw "fake_factory has been removed because it is unused and deprecated by upstream since 2016."; # added 2022-05-30
-  farm-haystack = throw "farm-haystack was removed in favor of haystack-ai"; # added 2024-07-03
-  faster-fifo = throw "faster-fifo has been removed since it was an unused leaf package"; # added 2024-07-02
   fastnlo_toolkit = fastnlo-toolkit; # added 2024-01-03
-  fastpair = throw "fastpair is unmaintained upstream and has therefore been removed"; # added 2024-05-01
-  faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12
   fenics = throw "fenics has been removed, use fenics-dolfinx instead"; # added 2025-08-07
   filebrowser_safe = filebrowser-safe; # added 2024-01-03
-  filemagic = throw "inactive since 2014, so use python-magic instead"; # added 2022-11-19
   filesplit = throw "filesplit has been removed, since it is unmaintained"; # added 2025-08-20
   flaskbabel = flask-babel; # added 2023-01-19
-  flask-babelex = throw "flask-babelex package has been removed, use flask-babel instead"; # added 2024-10-07
   flask_assets = flask-assets; # added 2023-08-23
   flask_elastic = flask-elastic; # added 2023-08-23
   flask_login = flask-login; # added 2022-10-17
@@ -285,95 +162,42 @@ mapAliases {
   flask_marshmallow = flask-marshmallow; # added 2023-08-16
   flask_migrate = flask-migrate; # added 2023-08-23
   flask_principal = flask-principal; # added 2023-08-23
-  flask-restplus = throw "flask-restplus is no longer maintained, use flask-restx instead"; # added 2023-02-21
   flask_script = flask-script; # added 2023-08-23
   flask-security-too = flask-security; # added 2024-08-26
   flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20
   flask_testing = flask-testing; # added 2022-04-25
   flask_wtf = flask-wtf; # added 2022-05-24
-  flask-autoindex = throw "flask-autoindex was removed, as it is not compatible with flask 3.0 and unmaintained since 2020."; # added 2024-01-26
-  flask-common = throw "flask-common was removed, as it is not compatible with flask 3.0 and unmaintained since 2018."; # added 2025-01-11
-  flask-basicauth = throw "flask-basicauth was removed, as it is not compatible with flask 3.0 and unmaintained since 2016."; # added 2024-01-26
-  flask-sessionstore = throw "flask-sessionstore was removed, as it is not compatible with flask 3.0 and unmaintained since 2017."; # added 2024-01-26
-  flask-silk = throw "flask-silk was removed, as it is unmaintained since 2018."; # added 2025-05-25
-  flask-sockets = throw "flask-sockets has been removed as the upstream repository was archived in 2022"; # Added 2025-01-01
   flowlogs_reader = flowlogs-reader; # added 2024-01-03
   flufl_bounce = flufl-bounce; # added 2023-11-03
   flufl_i18n = flufl-i18n; # added 2023-11-03
   flufl_lock = flufl-lock; # added 2023-11-03
-  fn = throw "fn was removed as it is no longer used by any package in nixpkgs, it is not compatible with python 3.11 or newer and it was last updated in 2014."; # added 2025-02-08
   FormEncode = formencode; # added 2023-02-19
-  foundationdb51 = throw "foundationdb51 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
-  foundationdb52 = throw "foundationdb52 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
-  foundationdb60 = throw "foundationdb60 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
-  foundationdb61 = throw "foundationdb61 is no longer maintained, use foundationdb71 instead"; # added 2023-06-06
-  foundationdb71 = throw "foundationdb71 has been removed, use foundationdb73 instead"; # added 2024-12-28
-  functorch = throw "functorch is now part of the torch package and has therefore been removed. See https://github.com/pytorch/functorch/releases/tag/v1.13.0 for more info."; # added 2022-12-01
-  functools32 = throw "functool32 was removed from nixpkgs, because python 2.7 has reach end of life in early 2020"; # added 2024-05-16
-  fritzprofiles = throw "fritzprofiles was removed from nixpkgs, because it was removed as dependency of home-assistant for which it was pacakged."; # added 2024-01-05
-  garages-amsterdam = throw "garages-amsterdam has been renamed odp-amsterdam."; # added 2023-01-04
   garminconnect-ha = garminconnect; # added 2022-02-05
-  gbulb = throw "gbulb has been removed as it is unmaintained and no longer compatible with PyGObject 3.50."; # added 2024-10-14
-  gcs-oauth2-boto-plugin = throw "gcs-oauth2-boto-plugin was removed as it depends on the removed boto package"; # Added 2024-09-22
-  gdtoolkit = throw "gdtoolkit has been promoted to a top-level attribute name: `pkgs.gdtoolkit`"; # added 2023-02-15
-  geeknote = throw "geeknote depends on the Python2-only library evernote"; # Added 2025-03-22
   GeoIP = geoip; # added 2023-02-19
-  gigalixir = throw "gigalixir has been promoted to a top-level attribute name: `pkgs.gigalixir`"; # Added 2022-10-02
-  gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14
   github3_py = github3-py; # added 2024-01-04
   GitPython = gitpython; # added 2022-10-28
-  glances = throw "glances has moved to pkgs.glances"; # added 2020-12-28
-  glasgow = throw "glasgow has been promoted to a top-level attribute name: `pkgs.glasgow`"; # added 2023-02-05
-  globre = throw "globre was removed, because it was disabled on all python version since 3.7 and last updated in 2020."; # added 2024-05-13
-  goobook = throw "goobook has been promoted to a top-level attribute name: `pkgs.goobook`"; # Added 2025-03-25
-  google-reauth = throw "google-reauth has been removed because the upstream repository was archived in 2023"; # Added 2024-10-04
   google_api_python_client = google-api-python-client; # added 2021-03-19
   googleapis_common_protos = googleapis-common-protos; # added 2021-03-19
-  google-apitools = throw "google-apitools was removed because it is deprecated and unsupported by upstream"; # added 2023-02-25
-  gpyopt = throw "gpyopt was remove because it's been archived upstream"; # added 2023-06-07
   gradient_statsd = gradient-statsd; # added 2024-01-06
-  graphite_api = throw "graphite_api was removed, because it is no longer maintained"; # added 2022-07-10
-  graphite_beacon = throw "graphite_beacon was removed, because it is no longer maintained"; # added 2022-07-09
   grappelli_safe = grappelli-safe; # added 2023-10-08
   groestlcoin_hash = groestlcoin-hash; # added 2024-01-06
   grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21
   gtimelog = pkgs.gtimelog; # added 2023-10-06
   guzzle_sphinx_theme = guzzle-sphinx-theme; # added 2023-10-16
-  ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06
   HAP-python = hap-python; # added 2021-06-01
   hahomematic = throw "hahomematic has been superseded by aiohomematic"; # added 2025-08-16
-  hangups = throw "hangups was removed because Google Hangouts has been shut down"; # added 2023-02-13
-  hbmqtt = throw "hbmqtt was removed because it is no longer maintained"; # added 2021-11-07
   hcs_utils = hcs-utils; # added 2024-01-06
-  hdlparse = throw "hdlparse has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
   heif-image-plugin = throw "heif-image-plugin has been removed due to lack of upstream maintenance and breakage. Use `pillow-heif` instead."; # added 2025-09-17
   hglib = python-hglib; # added 2023-10-13
   hijri-converter = hijridate; # added 2025-08-07
-  hkdf = throw "hkdf has been removed, as it is no longer maintained upstream."; # added 2024-10-04
   homeassistant-bring-api = bring-api; # added 2024-04-11
-  homeassistant-pyozw = throw "homeassistant-pyozw has been removed, as it was packaged for home-assistant which has removed it as a dependency."; # added 2024-01-05
-  htmllaundry = throw "htmllaundry has been removed because it is abandoned"; # added 2024-06-04
   HTSeq = htseq; # added 2023-02-19
-  hug = throw "hug was marked broken since 2021 and has not established compatibility with newer dependency versions. It has therefore been removed."; # added 2024-11-15
-  huisbaasje-client = throw "huisbaasje-client has been removed because it was replaced with energyflip-client"; # added 2025-05-12
-  hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29
-  hydra-check = throw "The Python package hydra-check was removed in favor of the top-level rust based pkgs.hydra-check"; # added 2022-04-29
-  ihatemoney = throw "ihatemoney was removed because it is no longer maintained downstream"; # added 2023-04-08
   IMAPClient = imapclient; # added 2021-10-28
-  imdbpy = throw "imdbpy has been renamed to cinemagoer"; # added 2022-08-08
-  image-match = throw "image-match has been removed because it is no longer maintained"; # added 2023-06-10
-  imgaug = throw "imgaug has been removed as it is no longer maintained"; # added 2023-07-10
-  imgtool = throw "imgtool has been promoted to a top-level attribute name: `mcuboot-imgtool`"; # added 2024-10-09
-  intreehook = throw "intreehooks has been removed because it is obsolete as a backend-path key was added to PEP 517"; # added 2023-04-11
   ionhash = throw "ionhash has been removed due to being unmaintained upstream"; # added 2025-07-30
   iotawattpy = ha-iotawattpy; # added 2025-07-06
-  ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30
-  ipdbplugin = throw "ipdbplugin has been removed because it has no longer maintained for 6 years"; # added 2024-05-21
   ipython_genutils = ipython-genutils; # added 2023-10-12
-  influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10
   inlinestyler = throw "inlinestyler has been removed because it is no longer maintained"; # added 2025-08-09
   itanium_demangler = itanium-demangler; # added 2022-10-17
-  jaeger-client = throw "jaeger-client was removed because it is deprecated upstream. OpenTelemetry is recommended instead."; # Added 2024-12-09
   jaraco_classes = jaraco-classes; # added 2023-07-14
   jaraco_collections = jaraco-collections; # added 2023-07-14
   jaraco_functools = jaraco-functools; # added 2023-07-14
@@ -385,365 +209,167 @@ mapAliases {
   jinja2_pluralize = jinja2-pluralize; # added 2023-11-01
   jinja2_time = jinja2-time; # added 2022-11-07
   JPype1 = jpype1; # added 2023-02-19
-  js2py = throw "js2py has been removed, as it is unmaintained and insecure"; # added 2024-10-17
   jsonpath_rw = jsonpath-rw; # added 2024-01-06
-  jsonschema_3 = throw "jsonschema 3 is neither the latest version nor needed inside nixpkgs anymore"; # added 2023-06-28
   jupyter_client = jupyter-client; # added 2021-10-15
   jupyter_console = jupyter-console; # added  2023-07-31
-  jupyter-contrib-nbextensions = throw "jupyter-contrib-nbextensions has been removed, as it does not work with Jupyter Notebook 7"; # added 2024-09-22
   jupyter_core = jupyter-core; # added 2023-01-05
   jupyter_server = jupyter-server; # added 2023-01-05
   jupyter-server-ydoc = jupyter-collaboration; # added 2023-07-18
-  jupyterlab_launcher = throw "jupyterlab_launcher has been removed as it's abandoned for over 5 years and broken"; # added 2023-11-11
   jupyterlab_server = jupyterlab-server; # added 2023-11-12
   kafka-python = kafka-python-ng; # added 2024-07-19
   Kajiki = kajiki; # added 2023-02-19
   keepkey_agent = keepkey-agent; # added 2024-01-06
   Keras = keras; # added 2021-11-25
-  keras-applications = throw "keras-applications has been removed because it's abandoned since 2022"; # added 2025-01-12
-  keras-preprocessing = throw "keras-preprocessing has been removed because it's abandoned since 2024"; # added 2025-01-12
-  keyring_24 = throw "keyring_24 has been removed, use keyring instead"; # added 2025-01-01
   keyrings-passwordstore = throw "keyrings-passwordstore has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
-  kivy-garden-modernmenu = throw "kivy-garden-modernmenu has been removed as it's abandoned since 2019"; # added 2025-05-25
   ldap = python-ldap; # added 2022-09-16
-  lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04
   langchain-standard-tests = langchain-tests; # added 2025-01-22
   langchainplus-sdk = langsmith; # added 2023-08-01
-  langgraph-checkpoint-duckdb = throw "langgraph-checkpoint-duckdb has been removed as of langgraph 0.2.63"; # added 2025-04-04
   lazr_config = lazr-config; # added 2023-11-03
   lazr_delegates = lazr-delegates; # added 2023-11-03
   lazy_import = lazy-import; # added 2024-01-07
-  lazy-import = throw "lazy-import has been removed because it was unused."; # added 2024-05-20
   lazy_imports = lazy-imports; # added 2023-10-13
   ledger_agent = ledger-agent; # Added 2024-01-07
-  lektor = throw "lektor has been promoted to a top-level attribute name: `pkgs.lektor`"; # added 2023-08-01
-  libgpuarray = throw "libgpuarray has been removed, as it was unmaintained."; # added 2024-08-03
   libpyfoscam = throw "libpyfoscam was removed because Home Assistant switched to libpyfoscamcgi"; # added 2025-07-03
   line_profiler = line-profiler; # added 2023-11-04
   linear_operator = linear-operator; # added 2024-01-07
-  livestreamer = throw "'livestreamer' has been removed, as it unmaintained. A currently maintained fork is 'streamlink'."; # added 2023-11-14
-  livestreamer-curses = throw "'livestreamer-curses' has been removed as it, and livestreamer itself are unmaintained."; # added 2023-11-14
   lmcloud = pylamarzocco; # added 2024-11-26
-  localstack = throw "localstack was promoted to a top-level attribute"; # added 2025-02-21
-  logi-circle = throw "logi-circle has been removed because the logi_circle integration was removed from Home Assistant"; # added 2025-05-13
-  logilab_astng = throw "logilab-astng has not been released since 2013 and is unmaintained"; # added 2022-11-29
   logilab_common = logilab-common; # added 2022-11-21
   loo-py = loopy; # added 2022-05-03
-  ludios_wpull = throw "ludios_wpull has been removed because it's unmaintained and broken"; # added 2023-11-12
-  luxor = throw "luxor has been removed because it is unmaintained and broken"; # added 2025-01-25
   lcov_cobertura = lcov-cobertura; # added 2024-01-07
   Mako = mako; # added 2023-02-19
   Markups = markups; # added 2022-02-14
-  markdownsuperscript = throw "markdownsuperscript is unmaintained, use pymdown-extensions"; # added 2023-06-10
-  mask-rcnn = throw "mask-rcnn has been removed as it is unmaintained and its dependency imgaug no longer builds"; # added 2023-07-10
   mac_alias = mac-alias; # added 2024-01-07
   macropy = throw "macropy has been removed as it was broken since 2020"; # added 2025-10-04
   MDP = mdp; # added 2023-02-19
-  mdp = throw "mdp has been removed as it is unmaintained and broken"; # added 2024-11-23
   MechanicalSoup = mechanicalsoup; # added 2021-06-01
   memcached = python-memcached; # added 2022-05-06
-  mailman = throw "Please use pkgs.mailman"; # added 2022-04-29
-  mailman-hyperkitty = throw "Please use pkgs.mailmanPackages.mailman-hyperkitty"; # added 2022-04-29
-  mailman-web = throw "Please use pkgs.mailman-web"; # added 2022-04-29
-  manticore = throw "manticore has been removed because its dependency wasm no longer builds and is unmaintained"; # added 2023-05-20
-  mapbox = throw "mapbox has been removed because the upstream repository was archived in 2022"; # Added 2024-10-04
-  marshmallow-enum = throw "marshmallow-enum has been removed because it was archived in 2022 and had no maintainer"; # added 2024-05-10
-  markerlib = throw "markerlib has been removed because it's abandoned since 2013"; # added 2023-05-19
   mathlibtools = throw "mathlibtools has been removed because the upstream repository was archived in 2023"; # added 2025-07-09
-  matrix-api-async = throw "matrix-api-async has been removed as it is an old wrapper and no longer in use"; # added 2025-01-01
   memory_profiler = memory-profiler; # added 2023-10-09
   mesa = throw "python3Packages.mesa has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
   mir_eval = mir-eval; # added 2024-01-07
-  mistune_0_8 = throw "mistune_0_8 was removed because it was outdated and insecure"; # added 2022-08-12
   mistune_2_0 = mistune; # added 2022-08-12
-  mitmproxy-wireguard = throw "mitmproxy-wireguard has been removed because it was replaced by upstream with mitmproxy-rs"; # added 2023-11-06
   mkdocs-awesome-pages-plugin = mkdocs-awesome-nav; # added 2025-03-10
   mkdocs-macros = mkdocs-macros-plugin; # added 2025-09-02
   mkdocs-minify = mkdocs-minify-plugin; # added 2023-11-28
   mne-python = mne; # added 2025-05-02
-  modestmaps = throw "modestmaps is unmaintained and was never enabled for anything except Python27"; # Added 2025-03-23
-  mox = throw "mox was removed because it is unmaintained"; # added 2023-02-21
-  mox3 = throw "mox3 was removed because it is unmaintained"; # added 2024-08-30
-  mrkd = throw "mrkd has been promoted to a top-level attribute name: `pkgs.mrkd`"; # added 2023-08-01
   multi_key_dict = multi-key-dict; # added 2023-11-05
-  mutag = throw "mutag has been removed because it is unmaintained since 2018"; # added 2025-05-25
-  mutmut = throw "mutmut has been promoted to a top-level attribute name: `pkgs.mutmut`"; # added 2022-10-02
-  n3fit = throw "n3fit has been removed since it relies on a dependency that was removed"; # added 2024-08-24
-  nbmerge = throw "nbmerge has moved to pkgs.nbmerge"; # added 2024-07-05
-  mypy-boto3-alexaforbusiness = throw "mypy-boto3-alexaforbusiness was removed because it is unmaintained"; # added 2024-09-04
-  mypy-boto3-backupstorage = throw "mypy-boto3-backupstorage was removed because it is unmaintained"; # added 2024-09-04
-  mypy-boto3-gamesparks = throw "mypy-boto3-gamesparks was removed because it is unmaintained"; # added 2024-09-04
-  mypy-boto3-honeycode = throw "mypy-boto3-honeycode was removed because it is unmaintained"; # added 2024-09-04
-  mypy-boto3-iot-roborunner = throw "mypy-boto3-iot-roborunner was removed because it is unmaintained"; # added 2024-09-04
-  mypy-boto3-macie = throw "mypy-boto3-macie was removed because it is unmaintained"; # added 2024-09-04
-  mypy-boto3-mobile = throw "mypy-boto3-mobile was removed because it is unmaintained"; # added 2024-09-04
   net2grid = gridnet; # add 2022-04-22
-  nghttp2 = throw "in 1.52.0 removed deprecated python bindings."; # added 2023-06-08
   nitpick = throw "'nitpick' has been removed because it was unmaintained upstream since 2017 and using python2"; # added 2025-08-25
-  niko-home-control = throw "niko-home-control was removed because Home Assistant switched to nhc"; # added 2025-01-09
   ninja-python = ninja; # add 2022-08-03
   nixpkgs = throw "nixpkgs has been removed as its dependency pythonix was removed"; # added 2025-07-24
-  nose = throw "nose has been removed since it has been deprecated and unmaintained for almost a decade and does not work on Python 3.12; please switch to pytest or another test runner/framework"; # added 2024-07-28
-  nose3 = throw "nose3 has been removed since it is unmaintained and does not work with Python 3.12"; # added 2024-07-28
-  nosejs = throw "nosejs has been removed since it has not been maintained for 15 years and there are no dependent packages"; # added 2024-05-21
-  nose-cov = throw "nose-cov has been removed, it was archived and unmaintained since 2012"; # added 2024-05-21
-  nosexcover = throw "nosexcover has been removed since it has not been maintained and there are no dependent packages"; # added 2024-05-21
-  nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16
-  nose-cprof = throw "nose-cprof has been removed since it has not been maintained for 7 years and there are no dependent packages"; # added 2024-05-21
-  nose-exclude = throw "nose-exclude has been removed since it has not been maintained since 2016"; # added 2024-05-21
-  nose-randomly = throw "nose-randomly has been removed, it was archived and unmaintained since 2019"; # added 2024-05-22
-  nose-pattern-exclude = throw "nose-pattern-exclude has been removed as it has been unmaintained since 2014"; # added 2024-07-27
-  nose_progressive = throw "nose_progressive has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-02-21
-  nose-timer = throw "nose-timer has been removed as it depends on the abandoned nose test framework"; # added 2024-07-27
-  nose-warnings-filters = throw "nose-warnings-filters has been removed as it has been unmaintained since 2016"; # added 2024-07-27
-  nose_warnings_filters = throw "nose_warning_filters has been removed as it has been unmaintained since 2016"; # added 2024-01-07
-  nose-xunitmp = throw "nose-xunitmp has been removed as it depends on the abandoned nose test framework"; # added 2024-07-29
-  notifymuch = throw "notifymuch has been promoted to a top-level attribute name: `pkgs.notifymuch`"; # added 2022-10-02
   Nuitka = nuitka; # added 2023-02-19
-  ntlm-auth = throw "ntlm-auth has been removed, because it relies on the md4 implementation provided by openssl. Use pyspnego instead."; # added 2023-03-14
-  oauth = throw "oauth has been removed as it is unmaintained"; # added 2025-05-16
-  oauth2 = throw "oauth2 has been removed as it is unmaintained"; # added 2025-05-16
   objax = throw "objax has been removed because the upstream project was archived."; # Added 2025-10-04
   openai-triton = triton; # added 2024-07-18
   openai-triton-bin = triton-bin; # added 2024-07-18
   openai-triton-cuda = triton-cuda; # added 2024-07-18
   openai-triton-no-cuda = triton-no-cuda; # added 2024-07-18
-  openapi-schema-pydantic = throw "openapi-schema-pydantic has been removed, since it is no longer maintained"; # added 2023-10-30
   openbabel-bindings = openbabel; # added 2025-09-17
-  opencv3 = throw "opencv3 has been removed as it is obsolete"; # added 2023-10-12
-  openllm = throw "openllm has moved to pkgs.openllm"; # added 2021-12-31
-  openllm-client = throw "openllm-client has been removed, since it is abandoned due to a change in philosophy"; # added 2024-08-24
-  openllm-core = throw "openllm-core has been removed, since it is abandoned due to a change in philosophy"; # added 2024-08-24
   opsdroid_get_image_size = opsdroid-get-image-size; # added 2023-10-16
-  opentracing = throw "The opentracing Python module was removed due to being unmaintained upstream. Use OpenTelemetry instead."; # Added 2024-12-09
-  ordereddict = throw "ordereddict has been removed because it is only useful on unsupported python versions."; # added 2022-05-28
   orderedset = throw "orderedset has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
   orm = throw "orm has been removed as it is unmaintained"; # added 2025-08-27
-  pafy = throw "pafy has been removed because it is unmaintained and only a dependency of mps-youtube, itself superseded by yewtube"; # Added 2023-01-19
-  paho-mqtt_1 = throw "paho-mqtt_1 was removed because no package depends on it anymore"; # added 2025-03-05
   paho-mqtt_2 = paho-mqtt; # added 2025-03-05
   pam = python-pam; # added 2020-09-07
   PasteDeploy = pastedeploy; # added 2021-10-07
-  pathlib = throw "pathlib was removed as it has been integrated in python standard library in version 3.4"; # added 2024-05-13
   pathpy = path; # added 2022-04-12
   pcbnew-transition = pcbnewtransition; # added 2024-03-21
-  pc-ble-driver-py = throw "pc-ble-driver-py has been removed because the upstream repository was archived in 2024"; # Added 2024-10-04
-  pdfposter = throw "pdfposter was promoted to a top-level attribute"; # Added 2023-06-29
   pdfminer = pdfminer-six; # added 2022-05-25
-  pdfx = throw "pdfx has been removed because the upstream repository was archived in 2023"; # Added 2024-10-04
   pep257 = pydocstyle; # added 2022-04-12
-  percol = throw "percol has been removed because it hasn't been updated since 2019"; # added 2025-05-25
-  pillow-simd = throw "pillow-simd has been removed for lagging behind pillow upstream, which exposes it to various security issues."; # Added 2024-10-24
-  pipenv-poetry-migrate = throw "pipenv-poetry-migrate was promoted to a top-level attribute"; # added 2025-01-14
-  pixelmatch = throw "pixelmatch has been removed as it was unmaintained"; # Added 2024-08-18
-  pkutils = throw "pkutils was removed as it was unused and is not applicable to modern Python build tools"; # added 2024-07-28
-  poetry = throw "poetry was promoted to a top-level attribute, use poetry-core to build Python packages"; # added 2023-01-09
-  poetry2conda = throw "poetry2conda was promoted to a top-level attribute"; # Added 2022-10-02
   Polygon3 = polygon3; # Added 2023-08-08
   posix_ipc = posix-ipc; # added 2024-01-07
-  poster3 = throw "poster3 is unmaintained and source is no longer available"; # added 2023-05-29
   postgrest-py = postgrest; # added 2025-08-29
-  postorius = throw "Please use pkgs.mailmanPackages.postorius"; # added 2022-04-29
   powerlineMemSegment = powerline-mem-segment; # added 2021-10-08
   prayer-times-calculator = prayer-times-calculator-offline; # added 2024-08-11
-  premailer = throw "premailer was removed, as it is not compatible with lxml>4.9.4."; # added 2024-09-14
   primp = throw "primp was removed as it required a very outdated version of boringssl"; # added 2025-10-20
-  privacyidea-ldap-proxy = throw "privacyidea-ldap-proxy has been removed from nixpkgs"; # added 2023-10-31
-  proboscis = throw "proboscis has been removed since it has not been maintained for 11 years"; # added 2024-05-20
   prometheus_client = prometheus-client; # added 2021-06-10
   prompt_toolkit = prompt-toolkit; # added 2021-07-22
   protonup = protonup-ng; # Added 2022-11-06
   protonvpn-nm-lib = throw "protonvpn-nm-lib source code was removed from upstream"; # Added 2025-10-16
-  proton-keyring-linux-secretservice = throw "proton-keyring-linux-secretservice functionality was integrated in the proton-keyring-linux module"; # added 2024-10-16
-  proton-vpn-connection = throw "proton-vpn-connection functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16
-  proton-vpn-killswitch = throw "proton-vpn-killswitch functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16
-  proton-vpn-killswitch-network-manager = throw "proton-vpn-killswitch-network-manager functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16
-  proton-vpn-killswitch-network-manager-wireguard = throw "proton-vpn-killswitch-network-manager-wireguard functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16
-  proton-vpn-logger = throw "proton-vpn-logger functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16
-  proton-vpn-network-manager-openvpn = throw "proton-vpn-network-manager-openvpn functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16
-  proton-vpn-network-manager-wireguard = throw "proton-vpn-network-manager-wireguard functionality was integrated in the proton-vpn-network-manager module"; # added 2024-10-16
-  proton-vpn-session = throw "proton-vpn-session functionality was integrated in the proton-vpn-api-core module"; # added 2024-10-16
   proxy_tools = proxy-tools; # added 2023-11-05
-  ptable = throw "ptable has been removed, as it is unmaintained and broken"; # added 2025-05-25
-  pur = throw "pur has been renamed to pkgs.pur"; # added 2021-11-08
   pushbullet = pushbullet-py; # Added 2022-10-15
-  push-receiver = throw "push-receiver has been removed since it is unmaintained for 3 years"; # added 2025-05-17
   Pweave = pweave; # added 2023-02-19
-  pwndbg = throw "'pwndbg' has been removed due to dependency version incompatibilities that are infeasible to maintain in nixpkgs. Use the downstream flake that pwndbg provides instead: https://github.com/pwndbg/pwndbg"; # Added 2025-02-09
-  pxml = throw "pxml was removed, because it was disabled on all python version since 3.8 and last updated in 2020."; # added 2024-05-13
-  py3to2 = throw "py3to2 is unmaintained and source is no longer available"; # added 2024-10-23
   py-eth-sig-utils = throw "py-eth-sig-utils has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
   pypcap = throw "pypcap has been removed because it is broken and unmaintained upstream."; # added 2025-06-18
   pytedee-async = aiotedee; # added 2025-07-06
-  pytricia = throw "pytricia has been removed, since it is unmaintained"; # added 2025-05-25
-  py-radix = throw "py-radix has been removed, since it abandoned"; # added 2023-07-07
   py_stringmatching = py-stringmatching; # added 2023-11-12
-  py17track = throw "py17track was removed because Home Assistant switched to pyseventeentrack"; # added 2024-08-08
-  pyalmond = throw "pyalmond has been removed, since its API endpoints have been shutdown"; # added 2023-02-02
-  pyblake2 = throw "pyblake2 is deprecated in favor of hashlib"; # added 2023-04-23
-  pyblock = throw "pyblock has been removed, since it is abandoned and broken"; # added 2023-06-20
-  pychart = throw "pychart does not support Python3"; # added 2025-03-23
-  pycontracts = throw "pycontracts has been removed, since upstream is no longer active and it is broken on modern Python versions."; # added 2024-08-09
   pydns = py3dns; # added 2024-10-25
-  pydrive = throw "pydrive is broken and deprecated and has been replaced with pydrive2."; # added 2022-06-01
   pyechonest = throw "pyechonest was removed because it was broken and unmaintained"; # added 2025-08-26
-  pyephember = throw "pyephember was removed because Home Assistant switched to pyephember2"; # added 2025-05-07
   pyezviz = throw "pyeziz has been removed in favor of pyevizapi, where development continues"; # added 2025-06-11
-  pyjet = throw "pyjet is deprecated, use fastjet instead"; # added 2023-05-10
   pygame_sdl2 = pygame-sdl2; # added 2024-01-07
-  pygogo = throw "pygogo has been removed, since it is abandoned and had no maintainer"; # added 2024-07-27
-  pygbm = throw "pygbm has been removed, since it is abandoned and broken"; # added 2023-06-20
   PyGithub = pygithub; # added 2023-02-19
-  pyGtkGlade = throw "Glade support for pygtk has been removed"; # added 2022-01-15
   pyheif = throw "pyheif has been removed due to lack of upstream maintenance and breakage. Use `pillow-heif` instead."; # added 2025-09-17
-  pycallgraph = throw "pycallgraph has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18
-  pychef = throw "pychef has been removed because it's been archived upstream and abandoned since 2017."; # added 2022-11-14
   PyChromecast = pychromecast; # added 2023-02-19
-  pycryptodome-test-vectors = throw "pycryptodome-test-vectors has been removed because it is an internal package to pycryptodome"; # added 2022-05-28
-  pyfantom = throw "pyfantom has been removed because it does not work with python3 and has not been updated for 12 years"; # added 2025-03-25
-  pyfftw = throw "pyfftw has been removed because it is unmaintained and broken."; # Added 2024-06-17
   pyflunearyou = pyoutbreaksnearme; # added 2023-02-11
   pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07
-  pyialarmxr-homeassistant = throw "The package was removed together with the component support in home-assistant 2022.7.0"; # added 2022-07-07
   PyICU = pyicu; # Added 2022-12-22
   pyhiveapi = pyhive-integration; # Added 2025-02-22
-  pyhs100 = throw "pyhs100 has been removed in favor of python-kasa."; # added 2024-01-05
-  pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20
   pyliblo = throw "pyliblo is unmaintained upstream and was removed from nixpkgs. Please use pyliblo3 instead"; # added 2025-06-23
   PyLD = pyld; # added 2022-06-22
-  pylti = throw "pylti has been removed because it is unmaintained since 2019"; # added 2024-05-21
-  pymaging = throw "pymaging has been removed because it has not been maintained for 10 years and has been archived."; # added 2023-11-04
-  pymaging_png = throw "pymaging_png has been removed because it has not been maintained for 10 years and has been archived."; # added 2023-11-04
-  pymatgen-lammps = throw "pymatgen-lammps has been removed because it is unmaintained and broken"; # added 2023-06-20
-  pymazda = throw "pymazda has been removed, because the upstream repo has been affected by a DCMA claim."; # added 2023-10-16
   pymc3 = pymc; # added 2022-06-05
   pymelcloud = python-melcloud; # added 2025-05-08
-  pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04
   PyMVGLive = pymvglive; # added 2023-02-19
   pymyq = python-myq; # added 2023-10-20
-  pynose = throw "pynose was removed, because it violates the license of nose, by redistributing modified LGPL code under MIT."; # added 2024-08-07
   python-bring-api = throw "python-bring-api was removed because Home Assistant switched to bring-api"; # added 2025-10-03
   python-ethtool = ethtool; # added 2024-07-23
-  python-myq = throw "python-myq has been removed, as the service provider has decided to block its API requests"; # added 2023-12-07
-  python-picnic-api = throw "python-picnic-api was removed because Home Assistant switched to python-picnic-api2"; # added 2025-03-05
-  python-unshare = throw "python-unshare was removed as unmaintained since 2016"; # added 2025-05-25
   pythonix = throw "pythonix was removed as it was unmaintained since 2022"; # added 2025-07-24
-  pytrends = throw "pytrends has been removed, as it no longer works and is abandoned upstream"; # added 2025-02-02
   pyqldb = throw "pyqldb has been removed, because the underlying service is reaching end of support"; # added 2025-07-30
-  pyqt4 = throw "pyqt4 has been removed, because it depended on the long EOL qt4"; # added 2022-06-09
   pyqt5_sip = pyqt5-sip; # added 2024-01-07
   pyqt5_with_qtmultimedia = pyqt5-multimedia; # added 2024-01-07
   pyqt5_with_qtwebkit = pyqt5-webkit; # added 2024-01-07
   pyramid_beaker = pyramid-beaker; # added 2023-08-23
   pyramid_chameleon = pyramid-chameleon; # added 2023-08-23
   pyramid_exclog = pyramid-exclog; # added 2023-08-24
-  pyramid_hawkauth = throw "pyramid_hawkauth has been removed because it is no longer maintained"; # added 2023-02-2
   pyramid_jinja2 = pyramid-jinja2; # added 2023-06-06
   pyramid_mako = pyramid-mako; # added 2023-08-24
   pyramid_multiauth = pyramid-multiauth; # added 2023-08-24
   pyreadability = readability-lxml; # added 2022-05-24
-  pyres = throw "pyres has been removed, since it is abandoned and broken"; # added 2023-06-20
-  pygeoip = throw "pygeoip has been removed, since it wash archived in April 2018"; # added 2024-07-27
-  pygeos = throw "pygeos has been removed, since it was merged with shapely 2.0"; # added 2024-05-26
-  pyreqwest-impersonate = throw "pyreqwest has been renamed to primp"; # added 2024-10-22
   pyRFC3339 = pyrfc3339; # added 2024-01-07
-  pyroute2-core = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16
-  pyroute2-ethtool = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16
-  pyroute2-ipdb = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16
-  pyroute2-ipset = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16
-  pyroute2-ndb = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16
-  pyroute2-nftables = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16
-  pyroute2-nslink = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16
-  pyroute2-protocols = throw "pyroute2 migrated back to a single package scheme in version 0.7.1"; # added 2022-07-16
   Pyro4 = pyro4; # added 2023-02-19
   Pyro5 = pyro5; # added 2023-02-19
   PyRSS2Gen = pyrss2gen; # added 2023-02-19
-  pyruckus = throw "pyruckus has been removed, it was deprecrated in favor of aioruckus."; # added 2023-09-07
   py-scrypt = scrypt; # added 2025-08-07
-  pysha3 = throw "pysha3 has been removed, use safe-pysha3 instead"; # added 2023-05-20
-  pysimplegui = throw "pysimplegui update to v5 broke the package, it now needs a license key to decrypt the source code"; # added 2024-09-16
   pyside6-fluent-widgets = throw "pyside6-fluent-widgets has been removed, since it is unmaintained"; # added 2025-08-20
   pysidesix-frameless-window = throw "pysidesix-frameless-window has been removed, since it is unmaintained"; # added 2025-08-20
   pysmart-smartx = pysmart; # added 2021-10-22
   pySmartDL = pysmartdl; # added 2023-10-11
   pysmi-lextudio = pysmi; # added 2024-07-18
   pysnmp-lextudio = pysnmp; # added 2024-07-18
-  pysparse = throw "pysparse has been abandoned upstream."; # added 2023-02-28
-  pyspotify = throw "pyspotify has been removed because Spotify stopped supporting libspotify"; # added 2022-05-29
   PyStemmer = pystemmer; # added 2023-02-19
   pysuez = pysuezv2; # added 2025-03-14
   pytado = python-tado; # added 2024-12-02
   pytest_6 = pytest; # added 2022-02-10
   pytestcov = pytest-cov; # added 2021-01-04
-  pytest-ordering = throw "pytest-ordering has been removed, since it is no longer maintained and broken"; # added 2023-06-22
-  pytest-openfiles = throw "pytest-openfiles has been removed, since it is unmaintained and archived"; # added 2024-06-19
   pytest-pep8 = pytestpep8; # added 2021-01-04
-  pytest-pep257 = throw "pytest-pep257 was removed, as the pep257 package was migrated into pycodestyle"; # added 2022-04-12
-  pytest-pythonpath = throw "pytest-pythonpath is obsolete as of pytest 7.0.0 and has been removed"; # added 2022-03-09
-  pytest-runner = throw "pytest-runner has been removed as it uses deprecated features of setuptools and is deprecated by upstream"; # added 2024-09-15
-  pytest-sanic = throw "pytest-sanic has been removed because it is unmaintained and broken"; # added 2023-06-22
-  pytestpep8 = throw "pytestpep8 was removed because it is abandoned and no longer compatible with pytest v6.0"; # added 2020-12-10
   pytestquickcheck = pytest-quickcheck; # added 2021-07-20
   pytestrunner = pytest-runner; # added 2021-01-04
-  python-forecastio = throw "python-forecastio has been removed, as the Dark Sky service was shut down."; # added 2023-04-05
   python-igraph = igraph; # added 2021-11-11
   python_openzwave = python-openzwave; # added 2024-01-07
-  python-openzwave-mqtt = throw "python-openzwave was removed, as it was packaged as a dependency of home-assistant, which it is no longer."; # added 2024-01-05
   python_docs_theme = python-docs-theme; # added 2023-11-04
   python_fedora = python-fedora; # added 2023-11-15
-  python_keyczar = throw "python_keyczar has been removed because it's been archived upstream and deprecated"; # added 2023-05-16
   python-lz4 = lz4; # added 2018-06-01
   python_magic = python-magic; # added 2022-05-07
   python_mimeparse = python-mimeparse; # added 2021-10-31
-  python-language-server = throw "python-language-server is no longer maintained, use the python-lsp-server community fork instead."; # Added 2022-08-03
   python-Levenshtein = levenshtein; # added 2022-12-31
-  python-pushover = throw "python-pushover has been removed, since it is unmaintained and is broken"; # added 2023-07-03
   python-simple-hipchat = throw "'python-simple-hipchat' has been removed because it was broken and unmaintained"; # added 2025-08-26
   python-subunit = subunit; # added 2021-09-10
-  python-wifi = throw "python-wifi does not support Python3"; # added 2025-04-23
   pytest_xdist = pytest-xdist; # added 2021-01-04
   python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
-  pytoml = throw "pytoml has been removed because it is unmaintained and is superseded by toml"; # Added 2023-04-11
   pytorch = torch; # added 2022-09-30
   pytorch-bin = torch-bin; # added 2022-09-30
   pytorchWithCuda = torchWithCuda; # added 2022-09-30
   pytorchWithoutCuda = torchWithoutCuda; # added 2022-09-30
   pytwitchapi = twitchapi; # added 2022-03-07
-  pytzdata = throw "pytzdata has been removed, because iit is unmaintained upstream. Use pytz or tzdata instead."; # added 2025-03-03
-  pyuavcan = throw "pyuavcan has been renamed to pycyphal and the old package deprecated, use pycyphal instead"; # added 2024-02-09
-  pyunifiprotect = throw "pyunifiprotect has disappeared from GitHub and PyPI, use uiprotect instead"; # added 2024-09-17
-  pyutilib = throw "pyutilib has been removed, since it is no longer maintained"; # added 2024-07-28
   pyvicare-neo = pyvicare; # Added 2024-11-06
-  pyvcf = throw "pyvcf has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-05-19
   PyVirtualDisplay = pyvirtualdisplay; # added 2023-02-19
   pyvoro = throw "pyvoro has been removed because it is unmaintained upstream and has been marked as broken since 2023."; # Added 2025-10-11
-  pywick = throw "pywick has been removed, since it is no longer maintained"; # added 2023-07-01
-  pyxb = throw "pyxb has been removed, its last release was in 2017 and it has finally been archived in April 2023."; # added 2024-01-05
-  pyzufall = throw "pyzufall was removed, because it is no longer maintained"; # added 2024-05-14
-  qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09
-  qds-sdk = throw "qds-sdk was removed as it is unmaintained upstream and depends on the removed boto package"; # Added 2024-09-22
   qds_sdk = qds-sdk; # added 2023-10-21
-  qmk-dotty-dict = throw "qmk-dotty-dict has been removed. It is no longer needed since the fixes have been merged into dotty-dict."; # added 2025-01-01
   Quandl = quandl; # added 2023-02-19
-  quamash = throw "'quamash' has been removed, since it is unmaintained and broken"; # added 2024-10-17
   querystring_parser = querystring-parser; # added 2024-01-07
-  qcodes-loop = throw "qcodes-loop has been removed due to deprecation"; # added 2023-11-30
-  qiskit-aqua = throw "qiskit-aqua has been removed due to deprecation, with its functionality moved to different qiskit packages"; # added 2022-02-11
-  rabbitpy = throw "rabbitpy has been removed, since it is unmaintained and broken"; # added 2023-07-01
-  radian = throw "radian has been promoted to a top-level attribute name: `pkgs.radian`"; # added 2025-05-02
   radicale_infcloud = radicale-infcloud; # added 2024-01-07
   radio_beam = radio-beam; # added 2023-11-04
   random-user-agent = throw "random-user-agent has been removed as it was abandoned upstream in 2018; use fake-useragent instead"; # Added 2025-10-17
-  ratelimiter = throw "ratelimiter has been removed, since it is unmaintained and broken"; # added 2023-10-21
-  rauth = throw "rauth has beed removed, since it is unmaintained upstream"; # added 2024-07-27
-  rdflib-jsonld = throw "rdflib-jsonld is not compatible with rdflib 6"; # added 2021-11-05
   readme_renderer = readme-renderer; # added 2024-01-07
-  recaptcha_client = throw "recaptcha_client has been removed since it is no longer maintained"; # added 2023-10-20
   recursivePthLoader = recursive-pth-loader; # added 2024-01-07
-  rednose = throw "rednose is no longer maintained (since February 2018)"; # added 2023-08-06
   repeated_test = repeated-test; # added 2022-11-15
-  repocheck = throw "repocheck has been promoted to a top-level attribute name: `pkgs.repocheck`"; # Added 2024-11-03
-  reportengine = throw "reportengine has been removed, since it is unmaintained and broken"; # added 2024-08-21
   repoze_lru = repoze-lru; # added 2023-11-11
   repoze_sphinx_autointerface = repoze-sphinx-autointerface; # added 2023-11-11
   repoze_who = repoze-who; # added 2023-11-11
@@ -754,171 +380,80 @@ mapAliases {
   restructuredtext_lint = restructuredtext-lint; # added 2023-11-04
   retry_decorator = retry-decorator; # added 2024-01-07
   retworkx = rustworkx; # added 2023-05-14
-  rig = throw "rig has been removed because it was pinned to python 2.7 and 3.5, failed to build and is otherwise unmaintained"; # added 2022-11-28
-  rising = throw "rising has been removed because it was abandoned and archived by upstream"; # added 2024-11-15
   rki-covid-parser = throw "rki-covid-parser has been removed because it is unmaintained and broken"; # added 2025-09-20
-  rl-coach = throw "rl-coach was removed because the project is discontinued and was archived by upstream"; # added 2023-05-03
-  roboschool = throw "roboschool is deprecated in favor of PyBullet and has been removed"; # added 2022-01-15
-  ronin = throw "ronin has been removed because it was unmaintained since 2018"; # added 2024-08-21
   ROPGadget = ropgadget; # added 2021-07-06
-  rotate-backups = throw "rotate-backups was removed in favor of the top-level rotate-backups"; # added 2021-07-01
   rtslib = rtslib-fb; # added 2025-03-14
   rtsp-to-webrtc = throw "rtsp-to-webrtc has been removed because it is unmaintained"; # added 2025-09-20
   ruamel_base = ruamel-base; # added 2021-11-01
   ruamel_yaml = ruamel-yaml; # added 2021-11-01
   ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01
-  ruff-lsp = throw "ruff-lsp has been deprecated, use `ruff server` instead"; # added 2025-04-21
-  runway-python = throw "SDK has been deprecated and was archived by upstream"; # added 2023-05-03
-  safe = throw "safe has been removed, it was unmaintained sinced October 2019"; # added 2024-07-28
-  sabyenc = throw "sabyenc has been removed, due to no updates since June 2019 and being superseded by sabyenc3"; # added 2025-05-03
-  sampledata = throw "sampledata has been removed, it was unmaintained since 2017"; # added 2024-07-27
   sapi-python-client = kbcstorage; # added 2022-04-20
   schemainspect = throw "schemainspect has been removed because it has transitively been marked broken since May 2024, and is unmaintained upstream."; # Added 2025-10-11
   scikitimage = scikit-image; # added 2023-05-14
   scikitlearn = scikit-learn; # added 2021-07-21
-  scikit-optimize = throw "scikit-optimize has been removed because it is abandoned"; # added 2024-09-30
-  scikits-samplerate = throw "scikits-samplerate has been removed, it was unsed and unmaintained since 2015"; # added 2024-05-23
   seaserv = throw "seaserv has been removed as it is unmaintained"; # Added 2025-08-21
-  selectors2 = throw "selectors2 has been removed: archived by upstream."; # added 2024-07-27
-  selectors34 = throw "selectors34 has been removed: functionality provided by Python itself; archived by upstream."; # added 2021-06-10
   sentry-sdk_2 = sentry-sdk; # added 2025-04-20
-  sequoia = throw "python3Packages.sequoia was replaced by pysequoia - built from a dedicated repository, with a new API."; # added 2023-06-24
   setuptools_dso = setuptools-dso; # added 2024-03-03
   setuptools_scm = setuptools-scm; # added 2021-06-03
-  setuptoolsCheckHook = throw "The setuptoolsCheckHook has been removed, since the test command has been removed in setuptools 72.0."; # added 2024-08-06
   setuptoolsTrial = setuptools-trial; # added 2023-11-11
   sharkiqpy = sharkiq; # added 2022-05-21
   shippai = throw "shippai has been removed because the upstream repository was archived in 2023"; # added 2025-07-09
-  shouldbe = throw "shouldbe was removed, because it was disabled on all python version since 3.8 and last updated in 2019."; # added 2024-05-12
   sip_4 = sip4; # added 2024-01-07
   slackclient = slack-sdk; # added 2024-06-27
-  slimit = throw "slimit was removed, because it was an unused and broken leaf package last updated in 2018."; # added 2025-05-17
-  ssh-mitm = throw "ssh-mitm was removed in favor of the top-level ssh-mitm"; # added 2023-05-09
   smart_open = smart-open; # added 2021-03-14
-  smmap2 = throw "smmap2 has been deprecated, use smmap instead."; # added 2020-03-14
   smpp_pdu = smpp-pdu; # added 2024-03-05
-  somecomfort = throw "somecomfort was removed because Home Assistant switched to aiosomecomfort"; # added 2023-02-01
-  sonarr = throw "sonarr has been deprecated and removed"; # added 2025-01-13
-  solaredge = throw "solaredge was removed because Home Assistant switched to aiosolaredge"; # added 2024-07-15
   sorl_thumbnail = sorl-thumbnail; # added 2023-11-12
   spacy_models = spacy-models; # added 2024-04-21
   SPARQLWrapper = sparqlwrapper; # added 2022-10-14
   spark_parser = spark-parser; # added 2024-01-07
   sparsezoo = throw "sparsezoo has been removed since it is abandonned"; # added 2025-09-01
   sphinx-jquery = sphinxcontrib-jquery; # added 2023-02-24
-  sphinx_pypi_upload = throw "sphinx_pypi_upload has been removed since it is abandoned."; # added 2023-10-11
   sphinx_rtd_theme = sphinx-rtd-theme; # added 2022-08-03
   sphinxcontrib-autoapi = sphinx-autoapi; # added 2023-02-28
   sphinxcontrib_httpdomain = sphinxcontrib-httpdomain; # added 2023-07-20
   sphinxcontrib_newsfeed = sphinxcontrib-newsfeed; # added 2023-07-20
   sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02
-  sphinx-navtree = throw "sphinx-navtree has been removed since it is not compatible with sphinx 3.3 and unmaintained"; # added 2023-07-03
-  sqlalchemy-migrate = throw "sqlalchemy-migrate has been removed because it is abandoned upstream and incompatible with SQLAlchemy 2"; # added 2024-07-29
   sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28
-  SQLAlchemy-ImageAttach = throw "sqlalchemy-imageattach has been removed as it is incompatible with sqlalchemy 1.4 and unmaintained"; # added 2022-04-23
-  sqlsoup = throw "sqlsoup has been removed as it is incompatible with modern SQLAlchemy and unmaintained"; # added 2024-05-13
-  subdownloader = throw "subdownloader has been removed, because it depended on pyqt4"; # added 2022-06-09
   subunit2sql = throw "subunit2sql has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
-  suds-jurko = throw "suds-jurko has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2023-02-27
   supervise_api = supervise-api; # added 2023-10-11
-  suseapi = throw "suseapi has been removed because it is no longer maintained"; # added 2023-02-27
   synologydsm-api = py-synologydsm-api; # added 2024-07-29
   sysv_ipc = sysv-ipc; # added 2024-01-07
-  telegram = throw "telegram has been removed since it is abandoned"; # added 2024-11-06
-  tempita = throw "tempita has been removed because it is unmaintained and the upstream repository is gone"; # added 2024-07-29
   tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25
   tensorflow-build_2 = tensorflow-build; # added 2021-11-25
   tensorflow-estimator = tensorflow-estimator-bin; # added 2023-01-17
   tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25
   tensorflow-tensorboard = tensorboard; # added 2022-03-06
   tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25
-  testing-postgresql = throw "testing-postgresql has been removed, since it is unmaintained since 2017"; # added 2025-05-25
-  tilestache = throw "tilestache is unmaintained and Python3 compatibility is unknown"; # Added 2025-03-23
   Theano = theano; # added 2023-02-19
   TheanoWithCuda = theanoWithCuda; # added 2023-02-19
   TheanoWithoutCuda = theanoWithoutCuda; # added 2023-02-19
-  theano = throw "theano has been removed because it is no longer maintained"; # added 2024-05-20
-  theanoWithCuda = throw "theano has been removed because it is no longer maintained"; # added 2024-05-20
-  theanoWithoutCuda = throw "theano has been removed because it is no longer maintained"; # added 2024-05-20
-  theano-pymc = throw "theano-pymc has been removed because it is no longer maintained"; # added 2024-05-20
-  thumborPexif = throw "thumborPexif has been removed, because it was unused."; # added 2024-01-07
-  tissue = throw "tissue has been removed, because it is archived since October 2022"; # added 2024-07-27
-  torchgpipe = throw "torchgpipe has been removed, because it appears unmaintained and Pytorch now includes pipeline parallelism support"; # added 2024-05-18
-  tornado_4 = throw "tornado_4 has been removed, use tornado instead"; # added 2025-01-13
-  tornado_5 = throw "tornado_5 has been removed, use tornado instead"; # added 2025-01-13
   torrent_parser = torrent-parser; # added 2023-11-04
-  transip = throw "transip has been removed because it is no longer maintained. TransIP SOAP V5 API was marked as deprecated"; # added 2023-02-27
-  py-tree-sitter = throw "Was merged with tree-sitter."; # added 2024-03-20
-  transmissionrpc = throw "transmissionrpc has been removed because it no longer builds and is unmaintained"; # added 2024-10-12
   treeo = throw "treeo has been removed because it has been marked as broken since 2023."; # Added 2025-10-11
   treex = throw "treex has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11
   trezor_agent = trezor-agent; # Added 2024-01-07
-  tumpa = throw "tumpa was promoted to a top-level attribute"; # added 2022-11-19
   tvdb_api = tvdb-api; # added 2023-10-20
-  tvnamer = throw "tvnamer was moved to pkgs.tvnamer"; # added 2021-07-05
-  twitter-common-collections = throw "twitter-common-collections has been removed because it is abandoned and unmaintained"; # added 2024-07-14
-  twitter-common-confluence = throw "twitter-common-confluence has been removed because it is abandoned and unmaintained"; # added 2024-07-14
-  twitter-common-dirutil = throw "twitter-common-dirutil has been removed because it is abandoned and unmaintained"; # added 2024-07-14
-  twitter-common-lang = throw "twitter-common-lang has been removed because it is abandoned and unmaintained"; # added 2024-07-14
-  twitter-common-log = throw "twitter-common-log has been removed because it is abandoned and unmaintained"; # added 2024-07-14
-  twitter-common-options = throw "twitter-common-options has been removed because it is abandoned and unmaintained"; # added 2024-07-14
-  typed-ast = throw "typed-ast was removed because it went end of life in July 2023"; # added 2025-05-24
-  types-cryptography = throw "types-cryptography has been removed because it is obsolete since cryptography version 3.4.4."; # added 2022-05-30
-  types-enum34 = throw "types-enum34 is obselete since Python 3.4"; # added 2025-02-15
-  types-paramiko = throw "types-paramiko has been removed because it was unused."; # added 2022-05-30
-  types-typed-ast = throw "types-typed-ast was removed because so was typed-ast"; # added 2025-05-24
   uamqp = throw "'uamqp' has been removed because it is broken and unmaintained."; # added 2025-06-11
   ufoLib2 = ufolib2; # added 2024-01-07
-  ukrainealarm = throw "ukrainealarm has been removed, as it has been replaced as a home-assistant dependency by uasiren."; # added 2024-01-05
-  unblob-native = throw "unblob-native has been removed because its functionality is merged into unblob 25.4.14."; # Added 2025-05-02
   unicode-slugify = throw "'unicode-slugify' has been removed becaues 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
-  unittest2 = throw "unittest2 has been removed as it's a backport of unittest that's unmaintained and not needed beyond Python 3.4."; # added 2022-12-01
   update_checker = update-checker; # added 2024-01-07
-  uproot3 = throw "uproot3 has been removed, use uproot instead"; # added 2022-12-13
-  uproot3-methods = throw "uproot3-methods has been removed"; # added 2022-12-13
-  urwid-mitmproxy-mitmproxy = throw "urwid-mitmproxy has been removed because mitmproxy no longer uses it"; # Added 2024-07-26
-  uuid = throw "uuid is a Python standard module"; # added 2024-04-18
-  validictory = throw "validictory has been removed, since it abandoned"; # added 2023-07-07
-  validphys2 = throw "validphys2 has been removed, since it had a broken dependency that was removed"; # added 2023-07-07
   vcver = throw "vcver has been removed, since it was an unused leaf package"; # added 2025-08-25
   vega_datasets = vega-datasets; # added 2023-11-04
   ViennaRNA = viennarna; # added 2023-08-23
-  virtual-display = throw "virtual-display has been renamed to PyVirtualDisplay"; # added 2023-01-07
   vulcan-api = throw "vulcan-api has been removed. Their API has changed and they don't allow access from unofficial software anymore."; # added 2025-09-05
   Wand = wand; # added 2022-11-13
-  wasm = throw "wasm has been removed because it no longer builds and is unmaintained"; # added 2023-05-20
   WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29
-  weakrefmethod = throw "weakrefmethod was removed since it's not needed in Python >= 3.4"; # added 2022-12-01
-  webapp2 = throw "webapp2 is unmaintained since 2012"; # added 2022-05-29
-  weboob = throw "weboob has been removed, please use woob instead"; # added 2024-07-27
-  webhelpers = throw "webhelpers has been removed because it is unmaintained and upstream is gone"; # added 2024-07-27
   websocket_client = websocket-client; # added 2021-06-15
-  word2vec = throw "word2vec has been removed because it is abandoned"; # added 2023-05-22
   worldengine = throw "worldengine has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
-  wsnsimpy = throw "wsnsimpy has been removed, it was unmaintained and no more compatible with Python 3.12"; # added 2025-04-01
-  wxPython_4_0 = throw "wxPython_4_0 has been removed, use wxpython instead"; # added 2023-03-19
-  wxPython_4_1 = throw "wxPython_4_1 has been removed, use wxpython instead"; # added 2023-03-19
   wxPython_4_2 = wxpython; # added 2024-01-07
   WSME = wsme; # added 2023-02-19
   x11_hash = x11-hash; # added 2023-11-05
   xapp = python-xapp; # added 2024-07-19
-  xarray-datatree = throw "Datatree has been merged upstream into pydata/xarray, and released as of xarray version 2024.10.0."; # added 2024-11-02
-  xenomapper = throw "xenomapper was moved to pkgs.xenomapper"; # added 2021-12-31
   XlsxWriter = xlsxwriter; # added 2023-02-19
-  yahooweather = throw "yahooweather has been removed because it is no longer maintained"; # added 2025-01-13
-  xsser = throw "xsser has been removed because it was unmaintained and relies on a archived project"; # added 2024-07-27
   Yapsy = yapsy; # added 2023-02-19
-  yanc = throw "yanc has been removed because it relies on nose"; # added 2024-07-27
   z3 = z3-solver; # added 2023-12-03
-  zake = throw "zake has been removed because it is abandoned"; # added 2023-06-20
-  zc_buildout_nix = throw "zc_buildout_nix was pinned to a version no longer compatible with other modules"; # added 2022-10-14
   zc-buildout221 = zc-buildout; # added 2021-07-21
   zc_lockfile = zc-lockfile; # added 2024-01-06
-  zcs = throw "zcs was removed as it is no longer used by any packages in nixpkgs."; # added 2025-02-08
-  zipstream = throw "zipstream has been removed, because it has been unmaintained for 6 years and there are no dependent packages"; # added 2024-05-26
-  zipstream-new = throw "zipstream-new has been removed, because it  was packaged as a dependency for octoprint, which has switched to zipstream-ng since."; # added 2024-01-05
-  zope_broken = throw "zope_broken has been removed because it is obsolete and not needed in zodb>=3.10"; # added 2023-07-26
   zope_component = zope-component; # added 2023-07-28
   zope_configuration = zope-configuration; # added 2023-11-12
   zope_contenttype = zope-contenttype; # added 2023-10-11

From f5533f9003ffb41e46d7acc443fdf6ad950f3f05 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 29 Oct 2025 12:30:52 +0100
Subject: [PATCH 3831/6226] python-aliases: revert some throws not present in
 25.05

These were dated to before the release, but were actually merged later,
so are not present in 25.05.
---
 pkgs/top-level/python-aliases.nix | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index dd1bacd7f92f..a4d895bba4ac 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -82,6 +82,7 @@ mapAliases {
   bsblan = python-bsblan; # added 2022-11-04
   btchip = btchip-python; # added 2023-03-03
   bugzilla = python-bugzilla; # added 2024-10-17
+  bunch = throw "bunch has been removed as it is unmaintained since inception"; # added 2025-05-31
   btsmarthub_devicelist = btsmarthub-devicelist; # added 2024-01-03
   bt_proximity = bt-proximity; # added 2021-07-02
   bz2file = throw "'bz2file' has beem removed, as it was not longed maintained upstream since 2020"; # added 2025-08-26
@@ -109,6 +110,7 @@ mapAliases {
   dj-stripe = throw "dj-stripe has been removed because it is unused and broken"; # added 2025-07-21
   djangorestframework-guardian2 = throw "djangorestframework-guardian2 has been removed because djangorestframework-guardian is active again and the upstream project was archived"; # added 2025-08-22
   djangorestframework-jwt = drf-jwt; # added 2021-07-20
+  django_3 = throw "Django 3 has reached it#s EOL in 2024-04 and has therefore been removed."; # added 2025-01-25
   django_appconf = django-appconf; # added 2022-03-03
   django_classytags = django-classy-tags; # added 2023-07-25
   django_colorful = django-colorful; # added 2023-07-25
@@ -167,6 +169,7 @@ mapAliases {
   flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20
   flask_testing = flask-testing; # added 2022-04-25
   flask_wtf = flask-wtf; # added 2022-05-24
+  flask-silk = throw "flask-silk was removed, as it is unmaintained since 2018."; # added 2025-05-25
   flowlogs_reader = flowlogs-reader; # added 2024-01-03
   flufl_bounce = flufl-bounce; # added 2023-11-03
   flufl_i18n = flufl-i18n; # added 2023-11-03
@@ -221,6 +224,7 @@ mapAliases {
   keepkey_agent = keepkey-agent; # added 2024-01-06
   Keras = keras; # added 2021-11-25
   keyrings-passwordstore = throw "keyrings-passwordstore has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
+  kivy-garden-modernmenu = throw "kivy-garden-modernmenu has been removed as it's abandoned since 2019"; # added 2025-05-25
   ldap = python-ldap; # added 2022-09-16
   langchain-standard-tests = langchain-tests; # added 2025-01-22
   langchainplus-sdk = langsmith; # added 2023-08-01
@@ -253,11 +257,14 @@ mapAliases {
   mkdocs-minify = mkdocs-minify-plugin; # added 2023-11-28
   mne-python = mne; # added 2025-05-02
   multi_key_dict = multi-key-dict; # added 2023-11-05
+  mutag = throw "mutag has been removed because it is unmaintained since 2018"; # added 2025-05-25
   net2grid = gridnet; # add 2022-04-22
   nitpick = throw "'nitpick' has been removed because it was unmaintained upstream since 2017 and using python2"; # added 2025-08-25
   ninja-python = ninja; # add 2022-08-03
   nixpkgs = throw "nixpkgs has been removed as its dependency pythonix was removed"; # added 2025-07-24
   Nuitka = nuitka; # added 2023-02-19
+  oauth = throw "oauth has been removed as it is unmaintained"; # added 2025-05-16
+  oauth2 = throw "oauth2 has been removed as it is unmaintained"; # added 2025-05-16
   objax = throw "objax has been removed because the upstream project was archived."; # Added 2025-10-04
   openai-triton = triton; # added 2024-07-18
   openai-triton-bin = triton-bin; # added 2024-07-18
@@ -274,6 +281,7 @@ mapAliases {
   pcbnew-transition = pcbnewtransition; # added 2024-03-21
   pdfminer = pdfminer-six; # added 2022-05-25
   pep257 = pydocstyle; # added 2022-04-12
+  percol = throw "percol has been removed because it hasn't been updated since 2019"; # added 2025-05-25
   Polygon3 = polygon3; # Added 2023-08-08
   posix_ipc = posix-ipc; # added 2024-01-07
   postgrest-py = postgrest; # added 2025-08-29
@@ -285,11 +293,14 @@ mapAliases {
   protonup = protonup-ng; # Added 2022-11-06
   protonvpn-nm-lib = throw "protonvpn-nm-lib source code was removed from upstream"; # Added 2025-10-16
   proxy_tools = proxy-tools; # added 2023-11-05
+  ptable = throw "ptable has been removed, as it is unmaintained and broken"; # added 2025-05-25
   pushbullet = pushbullet-py; # Added 2022-10-15
+  push-receiver = throw "push-receiver has been removed since it is unmaintained for 3 years"; # added 2025-05-17
   Pweave = pweave; # added 2023-02-19
   py-eth-sig-utils = throw "py-eth-sig-utils has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
   pypcap = throw "pypcap has been removed because it is broken and unmaintained upstream."; # added 2025-06-18
   pytedee-async = aiotedee; # added 2025-07-06
+  pytricia = throw "pytricia has been removed, since it is unmaintained"; # added 2025-05-25
   py_stringmatching = py-stringmatching; # added 2023-11-12
   pydns = py3dns; # added 2024-10-25
   pyechonest = throw "pyechonest was removed because it was broken and unmaintained"; # added 2025-08-26
@@ -298,6 +309,7 @@ mapAliases {
   PyGithub = pygithub; # added 2023-02-19
   pyheif = throw "pyheif has been removed due to lack of upstream maintenance and breakage. Use `pillow-heif` instead."; # added 2025-09-17
   PyChromecast = pychromecast; # added 2023-02-19
+  pyfantom = throw "pyfantom has been removed because it does not work with python3 and has not been updated for 12 years"; # added 2025-03-25
   pyflunearyou = pyoutbreaksnearme; # added 2023-02-11
   pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07
   PyICU = pyicu; # Added 2022-12-22
@@ -310,6 +322,7 @@ mapAliases {
   pymyq = python-myq; # added 2023-10-20
   python-bring-api = throw "python-bring-api was removed because Home Assistant switched to bring-api"; # added 2025-10-03
   python-ethtool = ethtool; # added 2024-07-23
+  python-unshare = throw "python-unshare was removed as unmaintained since 2016"; # added 2025-05-25
   pythonix = throw "pythonix was removed as it was unmaintained since 2022"; # added 2025-07-24
   pyqldb = throw "pyqldb has been removed, because the underlying service is reaching end of support"; # added 2025-07-30
   pyqt5_sip = pyqt5-sip; # added 2024-01-07
@@ -364,6 +377,7 @@ mapAliases {
   qds_sdk = qds-sdk; # added 2023-10-21
   Quandl = quandl; # added 2023-02-19
   querystring_parser = querystring-parser; # added 2024-01-07
+  radian = throw "radian has been promoted to a top-level attribute name: `pkgs.radian`"; # added 2025-05-02
   radicale_infcloud = radicale-infcloud; # added 2024-01-07
   radio_beam = radio-beam; # added 2023-11-04
   random-user-agent = throw "random-user-agent has been removed as it was abandoned upstream in 2018; use fake-useragent instead"; # Added 2025-10-17
@@ -424,6 +438,7 @@ mapAliases {
   tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25
   tensorflow-tensorboard = tensorboard; # added 2022-03-06
   tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25
+  testing-postgresql = throw "testing-postgresql has been removed, since it is unmaintained since 2017"; # added 2025-05-25
   Theano = theano; # added 2023-02-19
   TheanoWithCuda = theanoWithCuda; # added 2023-02-19
   TheanoWithoutCuda = theanoWithoutCuda; # added 2023-02-19
@@ -432,6 +447,8 @@ mapAliases {
   treex = throw "treex has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11
   trezor_agent = trezor-agent; # Added 2024-01-07
   tvdb_api = tvdb-api; # added 2023-10-20
+  typed-ast = throw "typed-ast was removed because it went end of life in July 2023"; # added 2025-05-24
+  types-typed-ast = throw "types-typed-ast was removed because so was typed-ast"; # added 2025-05-24
   uamqp = throw "'uamqp' has been removed because it is broken and unmaintained."; # added 2025-06-11
   ufoLib2 = ufolib2; # added 2024-01-07
   unicode-slugify = throw "'unicode-slugify' has been removed becaues it was broken and unmaintained. Consider using 'python-slugify' instead."; # added 2025-10-05

From ba3ac903b760db9ba6ec289aff61d9d29ff0c8a2 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Wed, 29 Oct 2025 12:38:47 +0200
Subject: [PATCH 3832/6226] python-aliases: convert to throw aliases before
 june 2025

---
 pkgs/top-level/python-aliases.nix | 678 +++++++++++++++---------------
 1 file changed, 339 insertions(+), 339 deletions(-)

diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index a4d895bba4ac..f00166b0616f 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -56,438 +56,438 @@ mapAliases {
   pypy311 = throw "do not use pypy311 when building Python packages, use the generic python parameter instead"; # do not remove
   fetchPypi = super.pkgs.fetchPypi; # added 2023-05-25, too many usages
 
-  abodepy = jaraco-abode; # added 2023-02-01
+  abodepy = throw "'abodepy' has been renamed to/replaced by 'jaraco-abode'"; # Converted to throw 2025-10-29
   ansiwrap = throw "ansiwrap has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
-  amazon_kclpy = amazon-kclpy; # added 2023-08-08
+  amazon_kclpy = throw "'amazon_kclpy' has been renamed to/replaced by 'amazon-kclpy'"; # Converted to throw 2025-10-29
   amazon-kclpy = throw "amazon-kclpy has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
   apkit = throw "apkit was removed because it is unmaintained upstream and different from apkit on PyPI"; # added 2025-09-13
-  argon2_cffi = argon2-cffi; # added 2022-05-09
-  APScheduler = apscheduler; # added 2023-02-19
+  argon2_cffi = throw "'argon2_cffi' has been renamed to/replaced by 'argon2-cffi'"; # Converted to throw 2025-10-29
+  APScheduler = throw "'APScheduler' has been renamed to/replaced by 'apscheduler'"; # Converted to throw 2025-10-29
   astropy-extension-helpers = extension-helpers; # Added 2025-10-15
-  async_generator = async-generator; # added 2023-08-08
-  async_stagger = async-stagger; # added 2023-08-08
-  asyncio-nats-client = nats-py; # added 2022-02-08
-  atsim_potentials = atsim-potentials; # added 2023-10-08
-  autotrash = super.pkgs.autotrash; # added 2024-09-23
-  Babel = babel; # added 2022-05-06
-  backports_shutil_get_terminal_size = backports-shutil-get-terminal-size; # added 2024-04-21
-  bash_kernel = bash-kernel; # added 2023-11-10
-  beancount_docverif = beancount-docverif; # added 2023-10-08
+  async_generator = throw "'async_generator' has been renamed to/replaced by 'async-generator'"; # Converted to throw 2025-10-29
+  async_stagger = throw "'async_stagger' has been renamed to/replaced by 'async-stagger'"; # Converted to throw 2025-10-29
+  asyncio-nats-client = throw "'asyncio-nats-client' has been renamed to/replaced by 'nats-py'"; # Converted to throw 2025-10-29
+  atsim_potentials = throw "'atsim_potentials' has been renamed to/replaced by 'atsim-potentials'"; # Converted to throw 2025-10-29
+  autotrash = throw "'autotrash' has been renamed to/replaced by 'super.pkgs.autotrash'"; # Converted to throw 2025-10-29
+  Babel = throw "'Babel' has been renamed to/replaced by 'babel'"; # Converted to throw 2025-10-29
+  backports_shutil_get_terminal_size = throw "'backports_shutil_get_terminal_size' has been renamed to/replaced by 'backports-shutil-get-terminal-size'"; # Converted to throw 2025-10-29
+  bash_kernel = throw "'bash_kernel' has been renamed to/replaced by 'bash-kernel'"; # Converted to throw 2025-10-29
+  beancount_docverif = throw "'beancount_docverif' has been renamed to/replaced by 'beancount-docverif'"; # Converted to throw 2025-10-29
   beets-unstable = lib.warn "beets-unstable was aliased to beets, since upstream releases are frequent nowadays" self.beets; # added 2025-10-16
   beets-stable = lib.warn "beets-stable was aliased to beets, since upstream releases are frequent nowadays" self.beets; # added 2025-10-16
-  bip_utils = bip-utils; # 2023-10-08
+  bip_utils = throw "'bip_utils' has been renamed to/replaced by 'bip-utils'"; # Converted to throw 2025-10-29
   bjoern = throw "'bjoern' has been removed, as the upstream repository was unmaintained and it was using libraries with severe security issues."; # Added 2025-09-01
   bkcharts = throw "'bkcharts' has been removed as the upstream repository was archived in 2018"; # added 2025-08-26
-  BlinkStick = blinkstick; # added 2023-02-19
-  bsblan = python-bsblan; # added 2022-11-04
-  btchip = btchip-python; # added 2023-03-03
-  bugzilla = python-bugzilla; # added 2024-10-17
+  BlinkStick = throw "'BlinkStick' has been renamed to/replaced by 'blinkstick'"; # Converted to throw 2025-10-29
+  bsblan = throw "'bsblan' has been renamed to/replaced by 'python-bsblan'"; # Converted to throw 2025-10-29
+  btchip = throw "'btchip' has been renamed to/replaced by 'btchip-python'"; # Converted to throw 2025-10-29
+  bugzilla = throw "'bugzilla' has been renamed to/replaced by 'python-bugzilla'"; # Converted to throw 2025-10-29
   bunch = throw "bunch has been removed as it is unmaintained since inception"; # added 2025-05-31
-  btsmarthub_devicelist = btsmarthub-devicelist; # added 2024-01-03
-  bt_proximity = bt-proximity; # added 2021-07-02
+  btsmarthub_devicelist = throw "'btsmarthub_devicelist' has been renamed to/replaced by 'btsmarthub-devicelist'"; # Converted to throw 2025-10-29
+  bt_proximity = throw "'bt_proximity' has been renamed to/replaced by 'bt-proximity'"; # Converted to throw 2025-10-29
   bz2file = throw "'bz2file' has beem removed, as it was not longed maintained upstream since 2020"; # added 2025-08-26
-  BTrees = btrees; # added 2023-02-19
-  can = python-can; # added 2024-08-12
+  BTrees = throw "'BTrees' has been renamed to/replaced by 'btrees'"; # Converted to throw 2025-10-29
+  can = throw "'can' has been renamed to/replaced by 'python-can'"; # Converted to throw 2025-10-29
   casbin = pycasbin; # added 2025-06-12
-  cchardet = faust-cchardet; # added 2023-03-02
-  class-registry = phx-class-registry; # added 2021-10-05
+  cchardet = throw "'cchardet' has been renamed to/replaced by 'faust-cchardet'"; # Converted to throw 2025-10-29
+  class-registry = throw "'class-registry' has been renamed to/replaced by 'phx-class-registry'"; # Converted to throw 2025-10-29
   cirq-rigetti = throw "cirq-rigetti was removed because it is no longer provided by upstream"; # added 2025-09-13
-  ColanderAlchemy = colanderalchemy; # added 2023-02-19
-  command_runner = command-runner; # added 2024-03-06
+  ColanderAlchemy = throw "'ColanderAlchemy' has been renamed to/replaced by 'colanderalchemy'"; # Converted to throw 2025-10-29
+  command_runner = throw "'command_runner' has been renamed to/replaced by 'command-runner'"; # Converted to throw 2025-10-29
   commitizen = throw "commitizen has been promoted to a top-level attribute name: `pkgs.commitizen`"; # added 2025-09-14
-  CommonMark = commonmark; # added 2023-02-1
-  ConfigArgParse = configargparse; # added 2021-03-18
-  configshell = configshell-fb; # added 2025-03-14
-  cx_Freeze = cx-freeze; # added 2023-08-02
-  cx_oracle = cx-oracle; # added 2024-01-03
-  dateutil = python-dateutil; # added 2021-07-03
-  debian = python-debian; # added 2024-12-10
-  dictpath = pathable; # added 2023-01-28
-  diff_cover = diff-cover; # added 2021-07-02
-  discogs_client = discogs-client; # added 2021-07-02
-  distutils_extra = distutils-extra; # added 2023-10-12
-  digital-ocean = python-digitalocean; # addad 2024-04-12
+  CommonMark = throw "'CommonMark' has been renamed to/replaced by 'commonmark'"; # Converted to throw 2025-10-29
+  ConfigArgParse = throw "'ConfigArgParse' has been renamed to/replaced by 'configargparse'"; # Converted to throw 2025-10-29
+  configshell = throw "'configshell' has been renamed to/replaced by 'configshell-fb'"; # Converted to throw 2025-10-29
+  cx_Freeze = throw "'cx_Freeze' has been renamed to/replaced by 'cx-freeze'"; # Converted to throw 2025-10-29
+  cx_oracle = throw "'cx_oracle' has been renamed to/replaced by 'cx-oracle'"; # Converted to throw 2025-10-29
+  dateutil = throw "'dateutil' has been renamed to/replaced by 'python-dateutil'"; # Converted to throw 2025-10-29
+  debian = throw "'debian' has been renamed to/replaced by 'python-debian'"; # Converted to throw 2025-10-29
+  dictpath = throw "'dictpath' has been renamed to/replaced by 'pathable'"; # Converted to throw 2025-10-29
+  diff_cover = throw "'diff_cover' has been renamed to/replaced by 'diff-cover'"; # Converted to throw 2025-10-29
+  discogs_client = throw "'discogs_client' has been renamed to/replaced by 'discogs-client'"; # Converted to throw 2025-10-29
+  distutils_extra = throw "'distutils_extra' has been renamed to/replaced by 'distutils-extra'"; # Converted to throw 2025-10-29
+  digital-ocean = throw "'digital-ocean' has been renamed to/replaced by 'python-digitalocean'"; # Converted to throw 2025-10-29
   dj-stripe = throw "dj-stripe has been removed because it is unused and broken"; # added 2025-07-21
   djangorestframework-guardian2 = throw "djangorestframework-guardian2 has been removed because djangorestframework-guardian is active again and the upstream project was archived"; # added 2025-08-22
-  djangorestframework-jwt = drf-jwt; # added 2021-07-20
+  djangorestframework-jwt = throw "'djangorestframework-jwt' has been renamed to/replaced by 'drf-jwt'"; # Converted to throw 2025-10-29
   django_3 = throw "Django 3 has reached it#s EOL in 2024-04 and has therefore been removed."; # added 2025-01-25
-  django_appconf = django-appconf; # added 2022-03-03
-  django_classytags = django-classy-tags; # added 2023-07-25
-  django_colorful = django-colorful; # added 2023-07-25
-  django_compat = django-compat; # added 2023-07-25
-  django_contrib_comments = django-contrib-comments; # added 2023-07-25
+  django_appconf = throw "'django_appconf' has been renamed to/replaced by 'django-appconf'"; # Converted to throw 2025-10-29
+  django_classytags = throw "'django_classytags' has been renamed to/replaced by 'django-classy-tags'"; # Converted to throw 2025-10-29
+  django_colorful = throw "'django_colorful' has been renamed to/replaced by 'django-colorful'"; # Converted to throw 2025-10-29
+  django_compat = throw "'django_compat' has been renamed to/replaced by 'django-compat'"; # Converted to throw 2025-10-29
+  django_contrib_comments = throw "'django_contrib_comments' has been renamed to/replaced by 'django-contrib-comments'"; # Converted to throw 2025-10-29
   django-crispy-bootstrap3 = crispy-bootstrap3; # added 2025-06-11
   django-crispy-bootstrap4 = crispy-bootstrap4; # added 2025-06-11
   django-crispy-bootstrap5 = crispy-bootstrap5; # added 2025-06-11
-  django_environ = django-environ; # added 2021-12-25
-  django_extensions = django-extensions; # added 2022-01-09
-  django_guardian = django-guardian; # added 2022-05-19
-  django_hijack = django-hijack; # added 2023-05-16
-  django_hijack_admin = django-hijack-admin; # added 2023-05-16
-  django_modelcluster = django-modelcluster; # added 2022-04-02
-  django_nose = django-nose; # added 2023-07-25
-  django_reversion = django-reversion; # added 2022-06-18
-  django_polymorphic = django-polymorphic; # added 2022-05-24
-  django_redis = django-redis; # added 2021-10-11
-  django_silk = django-silk; # added 2023-07-25
-  django_tagging = django-tagging; # added 2023-07-25
-  django_taggit = django-taggit; # added 2021-10-11
-  django_treebeard = django-treebeard; # added 2023-07-25
-  dns = dnspython; # added 2017-12-10
-  docker_pycreds = docker-pycreds; # added 2024-01-03
-  dogpile_cache = dogpile-cache; # added 2021-10-28
+  django_environ = throw "'django_environ' has been renamed to/replaced by 'django-environ'"; # Converted to throw 2025-10-29
+  django_extensions = throw "'django_extensions' has been renamed to/replaced by 'django-extensions'"; # Converted to throw 2025-10-29
+  django_guardian = throw "'django_guardian' has been renamed to/replaced by 'django-guardian'"; # Converted to throw 2025-10-29
+  django_hijack = throw "'django_hijack' has been renamed to/replaced by 'django-hijack'"; # Converted to throw 2025-10-29
+  django_hijack_admin = throw "'django_hijack_admin' has been renamed to/replaced by 'django-hijack-admin'"; # Converted to throw 2025-10-29
+  django_modelcluster = throw "'django_modelcluster' has been renamed to/replaced by 'django-modelcluster'"; # Converted to throw 2025-10-29
+  django_nose = throw "'django_nose' has been renamed to/replaced by 'django-nose'"; # Converted to throw 2025-10-29
+  django_reversion = throw "'django_reversion' has been renamed to/replaced by 'django-reversion'"; # Converted to throw 2025-10-29
+  django_polymorphic = throw "'django_polymorphic' has been renamed to/replaced by 'django-polymorphic'"; # Converted to throw 2025-10-29
+  django_redis = throw "'django_redis' has been renamed to/replaced by 'django-redis'"; # Converted to throw 2025-10-29
+  django_silk = throw "'django_silk' has been renamed to/replaced by 'django-silk'"; # Converted to throw 2025-10-29
+  django_tagging = throw "'django_tagging' has been renamed to/replaced by 'django-tagging'"; # Converted to throw 2025-10-29
+  django_taggit = throw "'django_taggit' has been renamed to/replaced by 'django-taggit'"; # Converted to throw 2025-10-29
+  django_treebeard = throw "'django_treebeard' has been renamed to/replaced by 'django-treebeard'"; # Converted to throw 2025-10-29
+  dns = throw "'dns' has been renamed to/replaced by 'dnspython'"; # Converted to throw 2025-10-29
+  docker_pycreds = throw "'docker_pycreds' has been renamed to/replaced by 'docker-pycreds'"; # Converted to throw 2025-10-29
+  dogpile_cache = throw "'dogpile_cache' has been renamed to/replaced by 'dogpile-cache'"; # Converted to throw 2025-10-29
   duckduckgo-search = throw "duckduckgo-search was renamed to ddgs, use ddgs instead"; # added 2025-10-20
   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
   easyeda2ato = throw "easyeda2ato as been removed in favor of atopile-easyda2kicad"; # added 2025-06-08
-  EasyProcess = easyprocess; # added 2023-02-19
-  email_validator = email-validator; # added 2022-06-22
+  EasyProcess = throw "'EasyProcess' has been renamed to/replaced by 'easyprocess'"; # Converted to throw 2025-10-29
+  email_validator = throw "'email_validator' has been renamed to/replaced by 'email-validator'"; # Converted to throw 2025-10-29
   embreex = throw "embreex has been removed, as it required embree2"; # added 2025-09-14
   elegy = throw "elegy has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11
   eris = throw "eris has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
-  et_xmlfile = et-xmlfile; # added 2023-10-16
-  ev3dev2 = python-ev3dev2; # added 2023-06-19
-  eyeD3 = eyed3; # added 2024-01-03
+  et_xmlfile = throw "'et_xmlfile' has been renamed to/replaced by 'et-xmlfile'"; # Converted to throw 2025-10-29
+  ev3dev2 = throw "'ev3dev2' has been renamed to/replaced by 'python-ev3dev2'"; # Converted to throw 2025-10-29
+  eyeD3 = throw "'eyeD3' has been renamed to/replaced by 'eyed3'"; # Converted to throw 2025-10-29
   f3d_egl = lib.warnOnInstantiate "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # added 2025-07-18
-  Fabric = fabric; # addedd 2023-02-19
-  face_recognition = face-recognition; # added 2022-10-15
-  face_recognition_models = face-recognition-models; # added 2022-10-15
-  factory_boy = factory-boy; # added 2023-10-08
-  fastnlo_toolkit = fastnlo-toolkit; # added 2024-01-03
+  Fabric = throw "'Fabric' has been renamed to/replaced by 'fabric'"; # Converted to throw 2025-10-29
+  face_recognition = throw "'face_recognition' has been renamed to/replaced by 'face-recognition'"; # Converted to throw 2025-10-29
+  face_recognition_models = throw "'face_recognition_models' has been renamed to/replaced by 'face-recognition-models'"; # Converted to throw 2025-10-29
+  factory_boy = throw "'factory_boy' has been renamed to/replaced by 'factory-boy'"; # Converted to throw 2025-10-29
+  fastnlo_toolkit = throw "'fastnlo_toolkit' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2025-10-29
   fenics = throw "fenics has been removed, use fenics-dolfinx instead"; # added 2025-08-07
-  filebrowser_safe = filebrowser-safe; # added 2024-01-03
+  filebrowser_safe = throw "'filebrowser_safe' has been renamed to/replaced by 'filebrowser-safe'"; # Converted to throw 2025-10-29
   filesplit = throw "filesplit has been removed, since it is unmaintained"; # added 2025-08-20
-  flaskbabel = flask-babel; # added 2023-01-19
-  flask_assets = flask-assets; # added 2023-08-23
-  flask_elastic = flask-elastic; # added 2023-08-23
-  flask_login = flask-login; # added 2022-10-17
-  flask_mail = flask-mail; # added 2023-08-23
-  flask_marshmallow = flask-marshmallow; # added 2023-08-16
-  flask_migrate = flask-migrate; # added 2023-08-23
-  flask_principal = flask-principal; # added 2023-08-23
-  flask_script = flask-script; # added 2023-08-23
-  flask-security-too = flask-security; # added 2024-08-26
-  flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20
-  flask_testing = flask-testing; # added 2022-04-25
-  flask_wtf = flask-wtf; # added 2022-05-24
+  flaskbabel = throw "'flaskbabel' has been renamed to/replaced by 'flask-babel'"; # Converted to throw 2025-10-29
+  flask_assets = throw "'flask_assets' has been renamed to/replaced by 'flask-assets'"; # Converted to throw 2025-10-29
+  flask_elastic = throw "'flask_elastic' has been renamed to/replaced by 'flask-elastic'"; # Converted to throw 2025-10-29
+  flask_login = throw "'flask_login' has been renamed to/replaced by 'flask-login'"; # Converted to throw 2025-10-29
+  flask_mail = throw "'flask_mail' has been renamed to/replaced by 'flask-mail'"; # Converted to throw 2025-10-29
+  flask_marshmallow = throw "'flask_marshmallow' has been renamed to/replaced by 'flask-marshmallow'"; # Converted to throw 2025-10-29
+  flask_migrate = throw "'flask_migrate' has been renamed to/replaced by 'flask-migrate'"; # Converted to throw 2025-10-29
+  flask_principal = throw "'flask_principal' has been renamed to/replaced by 'flask-principal'"; # Converted to throw 2025-10-29
+  flask_script = throw "'flask_script' has been renamed to/replaced by 'flask-script'"; # Converted to throw 2025-10-29
+  flask-security-too = throw "'flask-security-too' has been renamed to/replaced by 'flask-security'"; # Converted to throw 2025-10-29
+  flask_sqlalchemy = throw "'flask_sqlalchemy' has been renamed to/replaced by 'flask-sqlalchemy'"; # Converted to throw 2025-10-29
+  flask_testing = throw "'flask_testing' has been renamed to/replaced by 'flask-testing'"; # Converted to throw 2025-10-29
+  flask_wtf = throw "'flask_wtf' has been renamed to/replaced by 'flask-wtf'"; # Converted to throw 2025-10-29
   flask-silk = throw "flask-silk was removed, as it is unmaintained since 2018."; # added 2025-05-25
-  flowlogs_reader = flowlogs-reader; # added 2024-01-03
-  flufl_bounce = flufl-bounce; # added 2023-11-03
-  flufl_i18n = flufl-i18n; # added 2023-11-03
-  flufl_lock = flufl-lock; # added 2023-11-03
-  FormEncode = formencode; # added 2023-02-19
-  garminconnect-ha = garminconnect; # added 2022-02-05
-  GeoIP = geoip; # added 2023-02-19
-  github3_py = github3-py; # added 2024-01-04
-  GitPython = gitpython; # added 2022-10-28
-  google_api_python_client = google-api-python-client; # added 2021-03-19
-  googleapis_common_protos = googleapis-common-protos; # added 2021-03-19
-  gradient_statsd = gradient-statsd; # added 2024-01-06
-  grappelli_safe = grappelli-safe; # added 2023-10-08
-  groestlcoin_hash = groestlcoin-hash; # added 2024-01-06
-  grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21
-  gtimelog = pkgs.gtimelog; # added 2023-10-06
-  guzzle_sphinx_theme = guzzle-sphinx-theme; # added 2023-10-16
-  HAP-python = hap-python; # added 2021-06-01
+  flowlogs_reader = throw "'flowlogs_reader' has been renamed to/replaced by 'flowlogs-reader'"; # Converted to throw 2025-10-29
+  flufl_bounce = throw "'flufl_bounce' has been renamed to/replaced by 'flufl-bounce'"; # Converted to throw 2025-10-29
+  flufl_i18n = throw "'flufl_i18n' has been renamed to/replaced by 'flufl-i18n'"; # Converted to throw 2025-10-29
+  flufl_lock = throw "'flufl_lock' has been renamed to/replaced by 'flufl-lock'"; # Converted to throw 2025-10-29
+  FormEncode = throw "'FormEncode' has been renamed to/replaced by 'formencode'"; # Converted to throw 2025-10-29
+  garminconnect-ha = throw "'garminconnect-ha' has been renamed to/replaced by 'garminconnect'"; # Converted to throw 2025-10-29
+  GeoIP = throw "'GeoIP' has been renamed to/replaced by 'geoip'"; # Converted to throw 2025-10-29
+  github3_py = throw "'github3_py' has been renamed to/replaced by 'github3-py'"; # Converted to throw 2025-10-29
+  GitPython = throw "'GitPython' has been renamed to/replaced by 'gitpython'"; # Converted to throw 2025-10-29
+  google_api_python_client = throw "'google_api_python_client' has been renamed to/replaced by 'google-api-python-client'"; # Converted to throw 2025-10-29
+  googleapis_common_protos = throw "'googleapis_common_protos' has been renamed to/replaced by 'googleapis-common-protos'"; # Converted to throw 2025-10-29
+  gradient_statsd = throw "'gradient_statsd' has been renamed to/replaced by 'gradient-statsd'"; # Converted to throw 2025-10-29
+  grappelli_safe = throw "'grappelli_safe' has been renamed to/replaced by 'grappelli-safe'"; # Converted to throw 2025-10-29
+  groestlcoin_hash = throw "'groestlcoin_hash' has been renamed to/replaced by 'groestlcoin-hash'"; # Converted to throw 2025-10-29
+  grpc_google_iam_v1 = throw "'grpc_google_iam_v1' has been renamed to/replaced by 'grpc-google-iam-v1'"; # Converted to throw 2025-10-29
+  gtimelog = throw "'gtimelog' has been renamed to/replaced by 'gtimelog'"; # Converted to throw 2025-10-29
+  guzzle_sphinx_theme = throw "'guzzle_sphinx_theme' has been renamed to/replaced by 'guzzle-sphinx-theme'"; # Converted to throw 2025-10-29
+  HAP-python = throw "'HAP-python' has been renamed to/replaced by 'hap-python'"; # Converted to throw 2025-10-29
   hahomematic = throw "hahomematic has been superseded by aiohomematic"; # added 2025-08-16
-  hcs_utils = hcs-utils; # added 2024-01-06
+  hcs_utils = throw "'hcs_utils' has been renamed to/replaced by 'hcs-utils'"; # Converted to throw 2025-10-29
   heif-image-plugin = throw "heif-image-plugin has been removed due to lack of upstream maintenance and breakage. Use `pillow-heif` instead."; # added 2025-09-17
-  hglib = python-hglib; # added 2023-10-13
+  hglib = throw "'hglib' has been renamed to/replaced by 'python-hglib'"; # Converted to throw 2025-10-29
   hijri-converter = hijridate; # added 2025-08-07
-  homeassistant-bring-api = bring-api; # added 2024-04-11
-  HTSeq = htseq; # added 2023-02-19
-  IMAPClient = imapclient; # added 2021-10-28
+  homeassistant-bring-api = throw "'homeassistant-bring-api' has been renamed to/replaced by 'bring-api'"; # Converted to throw 2025-10-29
+  HTSeq = throw "'HTSeq' has been renamed to/replaced by 'htseq'"; # Converted to throw 2025-10-29
+  IMAPClient = throw "'IMAPClient' has been renamed to/replaced by 'imapclient'"; # Converted to throw 2025-10-29
   ionhash = throw "ionhash has been removed due to being unmaintained upstream"; # added 2025-07-30
   iotawattpy = ha-iotawattpy; # added 2025-07-06
-  ipython_genutils = ipython-genutils; # added 2023-10-12
+  ipython_genutils = throw "'ipython_genutils' has been renamed to/replaced by 'ipython-genutils'"; # Converted to throw 2025-10-29
   inlinestyler = throw "inlinestyler has been removed because it is no longer maintained"; # added 2025-08-09
-  itanium_demangler = itanium-demangler; # added 2022-10-17
-  jaraco_classes = jaraco-classes; # added 2023-07-14
-  jaraco_collections = jaraco-collections; # added 2023-07-14
-  jaraco_functools = jaraco-functools; # added 2023-07-14
-  jaraco_itertools = jaraco-itertools; # added 2023-07-14
-  jaraco_logging = jaraco-logging; # added 2023-07-14
-  jaraco_text = jaraco-text; # added 2023-07-14
-  jaraco_stream = jaraco-stream; # added 2023-07-14
-  JayDeBeApi = jaydebeapi; # added 2023-02-19
-  jinja2_pluralize = jinja2-pluralize; # added 2023-11-01
-  jinja2_time = jinja2-time; # added 2022-11-07
-  JPype1 = jpype1; # added 2023-02-19
-  jsonpath_rw = jsonpath-rw; # added 2024-01-06
-  jupyter_client = jupyter-client; # added 2021-10-15
-  jupyter_console = jupyter-console; # added  2023-07-31
-  jupyter_core = jupyter-core; # added 2023-01-05
-  jupyter_server = jupyter-server; # added 2023-01-05
-  jupyter-server-ydoc = jupyter-collaboration; # added 2023-07-18
-  jupyterlab_server = jupyterlab-server; # added 2023-11-12
-  kafka-python = kafka-python-ng; # added 2024-07-19
-  Kajiki = kajiki; # added 2023-02-19
-  keepkey_agent = keepkey-agent; # added 2024-01-06
-  Keras = keras; # added 2021-11-25
+  itanium_demangler = throw "'itanium_demangler' has been renamed to/replaced by 'itanium-demangler'"; # Converted to throw 2025-10-29
+  jaraco_classes = throw "'jaraco_classes' has been renamed to/replaced by 'jaraco-classes'"; # Converted to throw 2025-10-29
+  jaraco_collections = throw "'jaraco_collections' has been renamed to/replaced by 'jaraco-collections'"; # Converted to throw 2025-10-29
+  jaraco_functools = throw "'jaraco_functools' has been renamed to/replaced by 'jaraco-functools'"; # Converted to throw 2025-10-29
+  jaraco_itertools = throw "'jaraco_itertools' has been renamed to/replaced by 'jaraco-itertools'"; # Converted to throw 2025-10-29
+  jaraco_logging = throw "'jaraco_logging' has been renamed to/replaced by 'jaraco-logging'"; # Converted to throw 2025-10-29
+  jaraco_text = throw "'jaraco_text' has been renamed to/replaced by 'jaraco-text'"; # Converted to throw 2025-10-29
+  jaraco_stream = throw "'jaraco_stream' has been renamed to/replaced by 'jaraco-stream'"; # Converted to throw 2025-10-29
+  JayDeBeApi = throw "'JayDeBeApi' has been renamed to/replaced by 'jaydebeapi'"; # Converted to throw 2025-10-29
+  jinja2_pluralize = throw "'jinja2_pluralize' has been renamed to/replaced by 'jinja2-pluralize'"; # Converted to throw 2025-10-29
+  jinja2_time = throw "'jinja2_time' has been renamed to/replaced by 'jinja2-time'"; # Converted to throw 2025-10-29
+  JPype1 = throw "'JPype1' has been renamed to/replaced by 'jpype1'"; # Converted to throw 2025-10-29
+  jsonpath_rw = throw "'jsonpath_rw' has been renamed to/replaced by 'jsonpath-rw'"; # Converted to throw 2025-10-29
+  jupyter_client = throw "'jupyter_client' has been renamed to/replaced by 'jupyter-client'"; # Converted to throw 2025-10-29
+  jupyter_console = throw "'jupyter_console' has been renamed to/replaced by 'jupyter-console'"; # Converted to throw 2025-10-29
+  jupyter_core = throw "'jupyter_core' has been renamed to/replaced by 'jupyter-core'"; # Converted to throw 2025-10-29
+  jupyter_server = throw "'jupyter_server' has been renamed to/replaced by 'jupyter-server'"; # Converted to throw 2025-10-29
+  jupyter-server-ydoc = throw "'jupyter-server-ydoc' has been renamed to/replaced by 'jupyter-collaboration'"; # Converted to throw 2025-10-29
+  jupyterlab_server = throw "'jupyterlab_server' has been renamed to/replaced by 'jupyterlab-server'"; # Converted to throw 2025-10-29
+  kafka-python = throw "'kafka-python' has been renamed to/replaced by 'kafka-python-ng'"; # Converted to throw 2025-10-29
+  Kajiki = throw "'Kajiki' has been renamed to/replaced by 'kajiki'"; # Converted to throw 2025-10-29
+  keepkey_agent = throw "'keepkey_agent' has been renamed to/replaced by 'keepkey-agent'"; # Converted to throw 2025-10-29
+  Keras = throw "'Keras' has been renamed to/replaced by 'keras'"; # Converted to throw 2025-10-29
   keyrings-passwordstore = throw "keyrings-passwordstore has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
   kivy-garden-modernmenu = throw "kivy-garden-modernmenu has been removed as it's abandoned since 2019"; # added 2025-05-25
-  ldap = python-ldap; # added 2022-09-16
-  langchain-standard-tests = langchain-tests; # added 2025-01-22
-  langchainplus-sdk = langsmith; # added 2023-08-01
-  lazr_config = lazr-config; # added 2023-11-03
-  lazr_delegates = lazr-delegates; # added 2023-11-03
-  lazy_import = lazy-import; # added 2024-01-07
-  lazy_imports = lazy-imports; # added 2023-10-13
-  ledger_agent = ledger-agent; # Added 2024-01-07
+  ldap = throw "'ldap' has been renamed to/replaced by 'python-ldap'"; # Converted to throw 2025-10-29
+  langchain-standard-tests = throw "'langchain-standard-tests' has been renamed to/replaced by 'langchain-tests'"; # Converted to throw 2025-10-29
+  langchainplus-sdk = throw "'langchainplus-sdk' has been renamed to/replaced by 'langsmith'"; # Converted to throw 2025-10-29
+  lazr_config = throw "'lazr_config' has been renamed to/replaced by 'lazr-config'"; # Converted to throw 2025-10-29
+  lazr_delegates = throw "'lazr_delegates' has been renamed to/replaced by 'lazr-delegates'"; # Converted to throw 2025-10-29
+  lazy_import = throw "'lazy_import' has been renamed to/replaced by 'lazy-import'"; # Converted to throw 2025-10-29
+  lazy_imports = throw "'lazy_imports' has been renamed to/replaced by 'lazy-imports'"; # Converted to throw 2025-10-29
+  ledger_agent = throw "'ledger_agent' has been renamed to/replaced by 'ledger-agent'"; # Converted to throw 2025-10-29
   libpyfoscam = throw "libpyfoscam was removed because Home Assistant switched to libpyfoscamcgi"; # added 2025-07-03
-  line_profiler = line-profiler; # added 2023-11-04
-  linear_operator = linear-operator; # added 2024-01-07
-  lmcloud = pylamarzocco; # added 2024-11-26
-  logilab_common = logilab-common; # added 2022-11-21
-  loo-py = loopy; # added 2022-05-03
-  lcov_cobertura = lcov-cobertura; # added 2024-01-07
-  Mako = mako; # added 2023-02-19
-  Markups = markups; # added 2022-02-14
-  mac_alias = mac-alias; # added 2024-01-07
+  line_profiler = throw "'line_profiler' has been renamed to/replaced by 'line-profiler'"; # Converted to throw 2025-10-29
+  linear_operator = throw "'linear_operator' has been renamed to/replaced by 'linear-operator'"; # Converted to throw 2025-10-29
+  lmcloud = throw "'lmcloud' has been renamed to/replaced by 'pylamarzocco'"; # Converted to throw 2025-10-29
+  logilab_common = throw "'logilab_common' has been renamed to/replaced by 'logilab-common'"; # Converted to throw 2025-10-29
+  loo-py = throw "'loo-py' has been renamed to/replaced by 'loopy'"; # Converted to throw 2025-10-29
+  lcov_cobertura = throw "'lcov_cobertura' has been renamed to/replaced by 'lcov-cobertura'"; # Converted to throw 2025-10-29
+  Mako = throw "'Mako' has been renamed to/replaced by 'mako'"; # Converted to throw 2025-10-29
+  Markups = throw "'Markups' has been renamed to/replaced by 'markups'"; # Converted to throw 2025-10-29
+  mac_alias = throw "'mac_alias' has been renamed to/replaced by 'mac-alias'"; # Converted to throw 2025-10-29
   macropy = throw "macropy has been removed as it was broken since 2020"; # added 2025-10-04
-  MDP = mdp; # added 2023-02-19
-  MechanicalSoup = mechanicalsoup; # added 2021-06-01
-  memcached = python-memcached; # added 2022-05-06
+  MDP = throw "'MDP' has been renamed to/replaced by 'mdp'"; # Converted to throw 2025-10-29
+  MechanicalSoup = throw "'MechanicalSoup' has been renamed to/replaced by 'mechanicalsoup'"; # Converted to throw 2025-10-29
+  memcached = throw "'memcached' has been renamed to/replaced by 'python-memcached'"; # Converted to throw 2025-10-29
   mathlibtools = throw "mathlibtools has been removed because the upstream repository was archived in 2023"; # added 2025-07-09
-  memory_profiler = memory-profiler; # added 2023-10-09
+  memory_profiler = throw "'memory_profiler' has been renamed to/replaced by 'memory-profiler'"; # Converted to throw 2025-10-29
   mesa = throw "python3Packages.mesa has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
-  mir_eval = mir-eval; # added 2024-01-07
-  mistune_2_0 = mistune; # added 2022-08-12
-  mkdocs-awesome-pages-plugin = mkdocs-awesome-nav; # added 2025-03-10
+  mir_eval = throw "'mir_eval' has been renamed to/replaced by 'mir-eval'"; # Converted to throw 2025-10-29
+  mistune_2_0 = throw "'mistune_2_0' has been renamed to/replaced by 'mistune'"; # Converted to throw 2025-10-29
+  mkdocs-awesome-pages-plugin = throw "'mkdocs-awesome-pages-plugin' has been renamed to/replaced by 'mkdocs-awesome-nav'"; # Converted to throw 2025-10-29
   mkdocs-macros = mkdocs-macros-plugin; # added 2025-09-02
-  mkdocs-minify = mkdocs-minify-plugin; # added 2023-11-28
-  mne-python = mne; # added 2025-05-02
-  multi_key_dict = multi-key-dict; # added 2023-11-05
+  mkdocs-minify = throw "'mkdocs-minify' has been renamed to/replaced by 'mkdocs-minify-plugin'"; # Converted to throw 2025-10-29
+  mne-python = throw "'mne-python' has been renamed to/replaced by 'mne'"; # Converted to throw 2025-10-29
+  multi_key_dict = throw "'multi_key_dict' has been renamed to/replaced by 'multi-key-dict'"; # Converted to throw 2025-10-29
   mutag = throw "mutag has been removed because it is unmaintained since 2018"; # added 2025-05-25
-  net2grid = gridnet; # add 2022-04-22
+  net2grid = throw "'net2grid' has been renamed to/replaced by 'gridnet'"; # Converted to throw 2025-10-29
   nitpick = throw "'nitpick' has been removed because it was unmaintained upstream since 2017 and using python2"; # added 2025-08-25
-  ninja-python = ninja; # add 2022-08-03
+  ninja-python = throw "'ninja-python' has been renamed to/replaced by 'ninja'"; # Converted to throw 2025-10-29
   nixpkgs = throw "nixpkgs has been removed as its dependency pythonix was removed"; # added 2025-07-24
-  Nuitka = nuitka; # added 2023-02-19
+  Nuitka = throw "'Nuitka' has been renamed to/replaced by 'nuitka'"; # Converted to throw 2025-10-29
   oauth = throw "oauth has been removed as it is unmaintained"; # added 2025-05-16
   oauth2 = throw "oauth2 has been removed as it is unmaintained"; # added 2025-05-16
   objax = throw "objax has been removed because the upstream project was archived."; # Added 2025-10-04
-  openai-triton = triton; # added 2024-07-18
-  openai-triton-bin = triton-bin; # added 2024-07-18
-  openai-triton-cuda = triton-cuda; # added 2024-07-18
-  openai-triton-no-cuda = triton-no-cuda; # added 2024-07-18
+  openai-triton = throw "'openai-triton' has been renamed to/replaced by 'triton'"; # Converted to throw 2025-10-29
+  openai-triton-bin = throw "'openai-triton-bin' has been renamed to/replaced by 'triton-bin'"; # Converted to throw 2025-10-29
+  openai-triton-cuda = throw "'openai-triton-cuda' has been renamed to/replaced by 'triton-cuda'"; # Converted to throw 2025-10-29
+  openai-triton-no-cuda = throw "'openai-triton-no-cuda' has been renamed to/replaced by 'triton-no-cuda'"; # Converted to throw 2025-10-29
   openbabel-bindings = openbabel; # added 2025-09-17
-  opsdroid_get_image_size = opsdroid-get-image-size; # added 2023-10-16
+  opsdroid_get_image_size = throw "'opsdroid_get_image_size' has been renamed to/replaced by 'opsdroid-get-image-size'"; # Converted to throw 2025-10-29
   orderedset = throw "orderedset has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
   orm = throw "orm has been removed as it is unmaintained"; # added 2025-08-27
-  paho-mqtt_2 = paho-mqtt; # added 2025-03-05
-  pam = python-pam; # added 2020-09-07
-  PasteDeploy = pastedeploy; # added 2021-10-07
-  pathpy = path; # added 2022-04-12
-  pcbnew-transition = pcbnewtransition; # added 2024-03-21
-  pdfminer = pdfminer-six; # added 2022-05-25
-  pep257 = pydocstyle; # added 2022-04-12
+  paho-mqtt_2 = throw "'paho-mqtt_2' has been renamed to/replaced by 'paho-mqtt'"; # Converted to throw 2025-10-29
+  pam = throw "'pam' has been renamed to/replaced by 'python-pam'"; # Converted to throw 2025-10-29
+  PasteDeploy = throw "'PasteDeploy' has been renamed to/replaced by 'pastedeploy'"; # Converted to throw 2025-10-29
+  pathpy = throw "'pathpy' has been renamed to/replaced by 'path'"; # Converted to throw 2025-10-29
+  pcbnew-transition = throw "'pcbnew-transition' has been renamed to/replaced by 'pcbnewtransition'"; # Converted to throw 2025-10-29
+  pdfminer = throw "'pdfminer' has been renamed to/replaced by 'pdfminer-six'"; # Converted to throw 2025-10-29
+  pep257 = throw "'pep257' has been renamed to/replaced by 'pydocstyle'"; # Converted to throw 2025-10-29
   percol = throw "percol has been removed because it hasn't been updated since 2019"; # added 2025-05-25
-  Polygon3 = polygon3; # Added 2023-08-08
-  posix_ipc = posix-ipc; # added 2024-01-07
+  Polygon3 = throw "'Polygon3' has been renamed to/replaced by 'polygon3'"; # Converted to throw 2025-10-29
+  posix_ipc = throw "'posix_ipc' has been renamed to/replaced by 'posix-ipc'"; # Converted to throw 2025-10-29
   postgrest-py = postgrest; # added 2025-08-29
-  powerlineMemSegment = powerline-mem-segment; # added 2021-10-08
-  prayer-times-calculator = prayer-times-calculator-offline; # added 2024-08-11
+  powerlineMemSegment = throw "'powerlineMemSegment' has been renamed to/replaced by 'powerline-mem-segment'"; # Converted to throw 2025-10-29
+  prayer-times-calculator = throw "'prayer-times-calculator' has been renamed to/replaced by 'prayer-times-calculator-offline'"; # Converted to throw 2025-10-29
   primp = throw "primp was removed as it required a very outdated version of boringssl"; # added 2025-10-20
-  prometheus_client = prometheus-client; # added 2021-06-10
-  prompt_toolkit = prompt-toolkit; # added 2021-07-22
-  protonup = protonup-ng; # Added 2022-11-06
+  prometheus_client = throw "'prometheus_client' has been renamed to/replaced by 'prometheus-client'"; # Converted to throw 2025-10-29
+  prompt_toolkit = throw "'prompt_toolkit' has been renamed to/replaced by 'prompt-toolkit'"; # Converted to throw 2025-10-29
+  protonup = throw "'protonup' has been renamed to/replaced by 'protonup-ng'"; # Converted to throw 2025-10-29
   protonvpn-nm-lib = throw "protonvpn-nm-lib source code was removed from upstream"; # Added 2025-10-16
-  proxy_tools = proxy-tools; # added 2023-11-05
+  proxy_tools = throw "'proxy_tools' has been renamed to/replaced by 'proxy-tools'"; # Converted to throw 2025-10-29
   ptable = throw "ptable has been removed, as it is unmaintained and broken"; # added 2025-05-25
-  pushbullet = pushbullet-py; # Added 2022-10-15
+  pushbullet = throw "'pushbullet' has been renamed to/replaced by 'pushbullet-py'"; # Converted to throw 2025-10-29
   push-receiver = throw "push-receiver has been removed since it is unmaintained for 3 years"; # added 2025-05-17
-  Pweave = pweave; # added 2023-02-19
+  Pweave = throw "'Pweave' has been renamed to/replaced by 'pweave'"; # Converted to throw 2025-10-29
   py-eth-sig-utils = throw "py-eth-sig-utils has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
   pypcap = throw "pypcap has been removed because it is broken and unmaintained upstream."; # added 2025-06-18
   pytedee-async = aiotedee; # added 2025-07-06
   pytricia = throw "pytricia has been removed, since it is unmaintained"; # added 2025-05-25
-  py_stringmatching = py-stringmatching; # added 2023-11-12
-  pydns = py3dns; # added 2024-10-25
+  py_stringmatching = throw "'py_stringmatching' has been renamed to/replaced by 'py-stringmatching'"; # Converted to throw 2025-10-29
+  pydns = throw "'pydns' has been renamed to/replaced by 'py3dns'"; # Converted to throw 2025-10-29
   pyechonest = throw "pyechonest was removed because it was broken and unmaintained"; # added 2025-08-26
   pyezviz = throw "pyeziz has been removed in favor of pyevizapi, where development continues"; # added 2025-06-11
-  pygame_sdl2 = pygame-sdl2; # added 2024-01-07
-  PyGithub = pygithub; # added 2023-02-19
+  pygame_sdl2 = throw "'pygame_sdl2' has been renamed to/replaced by 'pygame-sdl2'"; # Converted to throw 2025-10-29
+  PyGithub = throw "'PyGithub' has been renamed to/replaced by 'pygithub'"; # Converted to throw 2025-10-29
   pyheif = throw "pyheif has been removed due to lack of upstream maintenance and breakage. Use `pillow-heif` instead."; # added 2025-09-17
-  PyChromecast = pychromecast; # added 2023-02-19
+  PyChromecast = throw "'PyChromecast' has been renamed to/replaced by 'pychromecast'"; # Converted to throw 2025-10-29
   pyfantom = throw "pyfantom has been removed because it does not work with python3 and has not been updated for 12 years"; # added 2025-03-25
-  pyflunearyou = pyoutbreaksnearme; # added 2023-02-11
-  pyialarmxr = pyialarmxr-homeassistant; # added 2022-06-07
-  PyICU = pyicu; # Added 2022-12-22
-  pyhiveapi = pyhive-integration; # Added 2025-02-22
+  pyflunearyou = throw "'pyflunearyou' has been renamed to/replaced by 'pyoutbreaksnearme'"; # Converted to throw 2025-10-29
+  pyialarmxr = throw "'pyialarmxr' has been renamed to/replaced by 'pyialarmxr-homeassistant'"; # Converted to throw 2025-10-29
+  PyICU = throw "'PyICU' has been renamed to/replaced by 'pyicu'"; # Converted to throw 2025-10-29
+  pyhiveapi = throw "'pyhiveapi' has been renamed to/replaced by 'pyhive-integration'"; # Converted to throw 2025-10-29
   pyliblo = throw "pyliblo is unmaintained upstream and was removed from nixpkgs. Please use pyliblo3 instead"; # added 2025-06-23
-  PyLD = pyld; # added 2022-06-22
-  pymc3 = pymc; # added 2022-06-05
-  pymelcloud = python-melcloud; # added 2025-05-08
-  PyMVGLive = pymvglive; # added 2023-02-19
-  pymyq = python-myq; # added 2023-10-20
+  PyLD = throw "'PyLD' has been renamed to/replaced by 'pyld'"; # Converted to throw 2025-10-29
+  pymc3 = throw "'pymc3' has been renamed to/replaced by 'pymc'"; # Converted to throw 2025-10-29
+  pymelcloud = throw "'pymelcloud' has been renamed to/replaced by 'python-melcloud'"; # Converted to throw 2025-10-29
+  PyMVGLive = throw "'PyMVGLive' has been renamed to/replaced by 'pymvglive'"; # Converted to throw 2025-10-29
+  pymyq = throw "'pymyq' has been renamed to/replaced by 'python-myq'"; # 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-ethtool = ethtool; # added 2024-07-23
+  python-ethtool = throw "'python-ethtool' has been renamed to/replaced by 'ethtool'"; # Converted to throw 2025-10-29
   python-unshare = throw "python-unshare was removed as unmaintained since 2016"; # added 2025-05-25
   pythonix = throw "pythonix was removed as it was unmaintained since 2022"; # added 2025-07-24
   pyqldb = throw "pyqldb has been removed, because the underlying service is reaching end of support"; # added 2025-07-30
-  pyqt5_sip = pyqt5-sip; # added 2024-01-07
-  pyqt5_with_qtmultimedia = pyqt5-multimedia; # added 2024-01-07
-  pyqt5_with_qtwebkit = pyqt5-webkit; # added 2024-01-07
-  pyramid_beaker = pyramid-beaker; # added 2023-08-23
-  pyramid_chameleon = pyramid-chameleon; # added 2023-08-23
-  pyramid_exclog = pyramid-exclog; # added 2023-08-24
-  pyramid_jinja2 = pyramid-jinja2; # added 2023-06-06
-  pyramid_mako = pyramid-mako; # added 2023-08-24
-  pyramid_multiauth = pyramid-multiauth; # added 2023-08-24
-  pyreadability = readability-lxml; # added 2022-05-24
-  pyRFC3339 = pyrfc3339; # added 2024-01-07
-  Pyro4 = pyro4; # added 2023-02-19
-  Pyro5 = pyro5; # added 2023-02-19
-  PyRSS2Gen = pyrss2gen; # added 2023-02-19
+  pyqt5_sip = throw "'pyqt5_sip' has been renamed to/replaced by 'pyqt5-sip'"; # Converted to throw 2025-10-29
+  pyqt5_with_qtmultimedia = throw "'pyqt5_with_qtmultimedia' has been renamed to/replaced by 'pyqt5-multimedia'"; # Converted to throw 2025-10-29
+  pyqt5_with_qtwebkit = throw "'pyqt5_with_qtwebkit' has been renamed to/replaced by 'pyqt5-webkit'"; # Converted to throw 2025-10-29
+  pyramid_beaker = throw "'pyramid_beaker' has been renamed to/replaced by 'pyramid-beaker'"; # Converted to throw 2025-10-29
+  pyramid_chameleon = throw "'pyramid_chameleon' has been renamed to/replaced by 'pyramid-chameleon'"; # Converted to throw 2025-10-29
+  pyramid_exclog = throw "'pyramid_exclog' has been renamed to/replaced by 'pyramid-exclog'"; # Converted to throw 2025-10-29
+  pyramid_jinja2 = throw "'pyramid_jinja2' has been renamed to/replaced by 'pyramid-jinja2'"; # Converted to throw 2025-10-29
+  pyramid_mako = throw "'pyramid_mako' has been renamed to/replaced by 'pyramid-mako'"; # Converted to throw 2025-10-29
+  pyramid_multiauth = throw "'pyramid_multiauth' has been renamed to/replaced by 'pyramid-multiauth'"; # Converted to throw 2025-10-29
+  pyreadability = throw "'pyreadability' has been renamed to/replaced by 'readability-lxml'"; # Converted to throw 2025-10-29
+  pyRFC3339 = throw "'pyRFC3339' has been renamed to/replaced by 'pyrfc3339'"; # Converted to throw 2025-10-29
+  Pyro4 = throw "'Pyro4' has been renamed to/replaced by 'pyro4'"; # Converted to throw 2025-10-29
+  Pyro5 = throw "'Pyro5' has been renamed to/replaced by 'pyro5'"; # Converted to throw 2025-10-29
+  PyRSS2Gen = throw "'PyRSS2Gen' has been renamed to/replaced by 'pyrss2gen'"; # Converted to throw 2025-10-29
   py-scrypt = scrypt; # added 2025-08-07
   pyside6-fluent-widgets = throw "pyside6-fluent-widgets has been removed, since it is unmaintained"; # added 2025-08-20
   pysidesix-frameless-window = throw "pysidesix-frameless-window has been removed, since it is unmaintained"; # added 2025-08-20
-  pysmart-smartx = pysmart; # added 2021-10-22
-  pySmartDL = pysmartdl; # added 2023-10-11
-  pysmi-lextudio = pysmi; # added 2024-07-18
-  pysnmp-lextudio = pysnmp; # added 2024-07-18
-  PyStemmer = pystemmer; # added 2023-02-19
-  pysuez = pysuezv2; # added 2025-03-14
-  pytado = python-tado; # added 2024-12-02
-  pytest_6 = pytest; # added 2022-02-10
-  pytestcov = pytest-cov; # added 2021-01-04
-  pytest-pep8 = pytestpep8; # added 2021-01-04
-  pytestquickcheck = pytest-quickcheck; # added 2021-07-20
-  pytestrunner = pytest-runner; # added 2021-01-04
-  python-igraph = igraph; # added 2021-11-11
-  python_openzwave = python-openzwave; # added 2024-01-07
-  python_docs_theme = python-docs-theme; # added 2023-11-04
-  python_fedora = python-fedora; # added 2023-11-15
-  python-lz4 = lz4; # added 2018-06-01
-  python_magic = python-magic; # added 2022-05-07
-  python_mimeparse = python-mimeparse; # added 2021-10-31
-  python-Levenshtein = levenshtein; # added 2022-12-31
+  pysmart-smartx = throw "'pysmart-smartx' has been renamed to/replaced by 'pysmart'"; # Converted to throw 2025-10-29
+  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
+  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
+  pytest_6 = throw "'pytest_6' has been renamed to/replaced by 'pytest'"; # Converted to throw 2025-10-29
+  pytestcov = throw "'pytestcov' has been renamed to/replaced by 'pytest-cov'"; # Converted to throw 2025-10-29
+  pytest-pep8 = throw "'pytest-pep8' has been renamed to/replaced by 'pytestpep8'"; # Converted to throw 2025-10-29
+  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-igraph = throw "'python-igraph' has been renamed to/replaced by 'igraph'"; # Converted to throw 2025-10-29
+  python_openzwave = throw "'python_openzwave' has been renamed to/replaced by 'python-openzwave'"; # Converted to throw 2025-10-29
+  python_docs_theme = throw "'python_docs_theme' has been renamed to/replaced by 'python-docs-theme'"; # Converted to throw 2025-10-29
+  python_fedora = throw "'python_fedora' has been renamed to/replaced by 'python-fedora'"; # Converted to throw 2025-10-29
+  python-lz4 = throw "'python-lz4' has been renamed to/replaced by 'lz4'"; # Converted to throw 2025-10-29
+  python_magic = throw "'python_magic' has been renamed to/replaced by 'python-magic'"; # Converted to throw 2025-10-29
+  python_mimeparse = throw "'python_mimeparse' has been renamed to/replaced by 'python-mimeparse'"; # Converted to throw 2025-10-29
+  python-Levenshtein = throw "'python-Levenshtein' has been renamed to/replaced by 'levenshtein'"; # Converted to throw 2025-10-29
   python-simple-hipchat = throw "'python-simple-hipchat' has been removed because it was broken and unmaintained"; # added 2025-08-26
-  python-subunit = subunit; # added 2021-09-10
-  pytest_xdist = pytest-xdist; # added 2021-01-04
-  python_simple_hipchat = python-simple-hipchat; # added 2021-07-21
-  pytorch = torch; # added 2022-09-30
-  pytorch-bin = torch-bin; # added 2022-09-30
-  pytorchWithCuda = torchWithCuda; # added 2022-09-30
-  pytorchWithoutCuda = torchWithoutCuda; # added 2022-09-30
-  pytwitchapi = twitchapi; # added 2022-03-07
-  pyvicare-neo = pyvicare; # Added 2024-11-06
-  PyVirtualDisplay = pyvirtualdisplay; # added 2023-02-19
+  python-subunit = throw "'python-subunit' has been renamed to/replaced by 'subunit'"; # Converted to throw 2025-10-29
+  pytest_xdist = throw "'pytest_xdist' has been renamed to/replaced by 'pytest-xdist'"; # Converted to throw 2025-10-29
+  python_simple_hipchat = throw "'python_simple_hipchat' has been renamed to/replaced by 'python-simple-hipchat'"; # Converted to throw 2025-10-29
+  pytorch = throw "'pytorch' has been renamed to/replaced by 'torch'"; # Converted to throw 2025-10-29
+  pytorch-bin = throw "'pytorch-bin' has been renamed to/replaced by 'torch-bin'"; # Converted to throw 2025-10-29
+  pytorchWithCuda = throw "'pytorchWithCuda' has been renamed to/replaced by 'torchWithCuda'"; # Converted to throw 2025-10-29
+  pytorchWithoutCuda = throw "'pytorchWithoutCuda' has been renamed to/replaced by 'torchWithoutCuda'"; # Converted to throw 2025-10-29
+  pytwitchapi = throw "'pytwitchapi' has been renamed to/replaced by 'twitchapi'"; # Converted to throw 2025-10-29
+  pyvicare-neo = throw "'pyvicare-neo' has been renamed to/replaced by 'pyvicare'"; # Converted to throw 2025-10-29
+  PyVirtualDisplay = throw "'PyVirtualDisplay' has been renamed to/replaced by 'pyvirtualdisplay'"; # Converted to throw 2025-10-29
   pyvoro = throw "pyvoro has been removed because it is unmaintained upstream and has been marked as broken since 2023."; # Added 2025-10-11
-  qds_sdk = qds-sdk; # added 2023-10-21
-  Quandl = quandl; # added 2023-02-19
-  querystring_parser = querystring-parser; # added 2024-01-07
+  qds_sdk = throw "'qds_sdk' has been renamed to/replaced by 'qds-sdk'"; # Converted to throw 2025-10-29
+  Quandl = throw "'Quandl' has been renamed to/replaced by 'quandl'"; # Converted to throw 2025-10-29
+  querystring_parser = throw "'querystring_parser' has been renamed to/replaced by 'querystring-parser'"; # Converted to throw 2025-10-29
   radian = throw "radian has been promoted to a top-level attribute name: `pkgs.radian`"; # added 2025-05-02
-  radicale_infcloud = radicale-infcloud; # added 2024-01-07
-  radio_beam = radio-beam; # added 2023-11-04
+  radicale_infcloud = throw "'radicale_infcloud' has been renamed to/replaced by 'radicale-infcloud'"; # Converted to throw 2025-10-29
+  radio_beam = throw "'radio_beam' has been renamed to/replaced by 'radio-beam'"; # Converted to throw 2025-10-29
   random-user-agent = throw "random-user-agent has been removed as it was abandoned upstream in 2018; use fake-useragent instead"; # Added 2025-10-17
-  readme_renderer = readme-renderer; # added 2024-01-07
-  recursivePthLoader = recursive-pth-loader; # added 2024-01-07
-  repeated_test = repeated-test; # added 2022-11-15
-  repoze_lru = repoze-lru; # added 2023-11-11
-  repoze_sphinx_autointerface = repoze-sphinx-autointerface; # added 2023-11-11
-  repoze_who = repoze-who; # added 2023-11-11
-  requests_download = requests-download; # added 2024-01-07
-  requests_ntlm = requests-ntlm; # added 2024-01-07
-  requests_oauthlib = requests-oauthlib; # added 2022-02-12
-  requests_toolbelt = requests-toolbelt; # added 2017-09-26
-  restructuredtext_lint = restructuredtext-lint; # added 2023-11-04
-  retry_decorator = retry-decorator; # added 2024-01-07
-  retworkx = rustworkx; # added 2023-05-14
+  readme_renderer = throw "'readme_renderer' has been renamed to/replaced by 'readme-renderer'"; # Converted to throw 2025-10-29
+  recursivePthLoader = throw "'recursivePthLoader' has been renamed to/replaced by 'recursive-pth-loader'"; # Converted to throw 2025-10-29
+  repeated_test = throw "'repeated_test' has been renamed to/replaced by 'repeated-test'"; # Converted to throw 2025-10-29
+  repoze_lru = throw "'repoze_lru' has been renamed to/replaced by 'repoze-lru'"; # Converted to throw 2025-10-29
+  repoze_sphinx_autointerface = throw "'repoze_sphinx_autointerface' has been renamed to/replaced by 'repoze-sphinx-autointerface'"; # Converted to throw 2025-10-29
+  repoze_who = throw "'repoze_who' has been renamed to/replaced by 'repoze-who'"; # Converted to throw 2025-10-29
+  requests_download = throw "'requests_download' has been renamed to/replaced by 'requests-download'"; # Converted to throw 2025-10-29
+  requests_ntlm = throw "'requests_ntlm' has been renamed to/replaced by 'requests-ntlm'"; # Converted to throw 2025-10-29
+  requests_oauthlib = throw "'requests_oauthlib' has been renamed to/replaced by 'requests-oauthlib'"; # Converted to throw 2025-10-29
+  requests_toolbelt = throw "'requests_toolbelt' has been renamed to/replaced by 'requests-toolbelt'"; # Converted to throw 2025-10-29
+  restructuredtext_lint = throw "'restructuredtext_lint' has been renamed to/replaced by 'restructuredtext-lint'"; # Converted to throw 2025-10-29
+  retry_decorator = throw "'retry_decorator' has been renamed to/replaced by 'retry-decorator'"; # Converted to throw 2025-10-29
+  retworkx = throw "'retworkx' has been renamed to/replaced by 'rustworkx'"; # Converted to throw 2025-10-29
   rki-covid-parser = throw "rki-covid-parser has been removed because it is unmaintained and broken"; # added 2025-09-20
-  ROPGadget = ropgadget; # added 2021-07-06
-  rtslib = rtslib-fb; # added 2025-03-14
+  ROPGadget = throw "'ROPGadget' has been renamed to/replaced by 'ropgadget'"; # Converted to throw 2025-10-29
+  rtslib = throw "'rtslib' has been renamed to/replaced by 'rtslib-fb'"; # Converted to throw 2025-10-29
   rtsp-to-webrtc = throw "rtsp-to-webrtc has been removed because it is unmaintained"; # added 2025-09-20
-  ruamel_base = ruamel-base; # added 2021-11-01
-  ruamel_yaml = ruamel-yaml; # added 2021-11-01
-  ruamel_yaml_clib = ruamel-yaml-clib; # added 2021-11-01
-  sapi-python-client = kbcstorage; # added 2022-04-20
+  ruamel_base = throw "'ruamel_base' has been renamed to/replaced by 'ruamel-base'"; # Converted to throw 2025-10-29
+  ruamel_yaml = throw "'ruamel_yaml' has been renamed to/replaced by 'ruamel-yaml'"; # Converted to throw 2025-10-29
+  ruamel_yaml_clib = throw "'ruamel_yaml_clib' has been renamed to/replaced by 'ruamel-yaml-clib'"; # Converted to throw 2025-10-29
+  sapi-python-client = throw "'sapi-python-client' has been renamed to/replaced by 'kbcstorage'"; # Converted to throw 2025-10-29
   schemainspect = throw "schemainspect has been removed because it has transitively been marked broken since May 2024, and is unmaintained upstream."; # Added 2025-10-11
-  scikitimage = scikit-image; # added 2023-05-14
-  scikitlearn = scikit-learn; # added 2021-07-21
+  scikitimage = throw "'scikitimage' has been renamed to/replaced by 'scikit-image'"; # Converted to throw 2025-10-29
+  scikitlearn = throw "'scikitlearn' has been renamed to/replaced by 'scikit-learn'"; # Converted to throw 2025-10-29
   seaserv = throw "seaserv has been removed as it is unmaintained"; # Added 2025-08-21
-  sentry-sdk_2 = sentry-sdk; # added 2025-04-20
-  setuptools_dso = setuptools-dso; # added 2024-03-03
-  setuptools_scm = setuptools-scm; # added 2021-06-03
-  setuptoolsTrial = setuptools-trial; # added 2023-11-11
-  sharkiqpy = sharkiq; # added 2022-05-21
+  sentry-sdk_2 = throw "'sentry-sdk_2' has been renamed to/replaced by 'sentry-sdk'"; # Converted to throw 2025-10-29
+  setuptools_dso = throw "'setuptools_dso' has been renamed to/replaced by 'setuptools-dso'"; # Converted to throw 2025-10-29
+  setuptools_scm = throw "'setuptools_scm' has been renamed to/replaced by 'setuptools-scm'"; # Converted to throw 2025-10-29
+  setuptoolsTrial = throw "'setuptoolsTrial' has been renamed to/replaced by 'setuptools-trial'"; # Converted to throw 2025-10-29
+  sharkiqpy = throw "'sharkiqpy' has been renamed to/replaced by 'sharkiq'"; # Converted to throw 2025-10-29
   shippai = throw "shippai has been removed because the upstream repository was archived in 2023"; # added 2025-07-09
-  sip_4 = sip4; # added 2024-01-07
-  slackclient = slack-sdk; # added 2024-06-27
-  smart_open = smart-open; # added 2021-03-14
-  smpp_pdu = smpp-pdu; # added 2024-03-05
-  sorl_thumbnail = sorl-thumbnail; # added 2023-11-12
-  spacy_models = spacy-models; # added 2024-04-21
-  SPARQLWrapper = sparqlwrapper; # added 2022-10-14
-  spark_parser = spark-parser; # added 2024-01-07
+  sip_4 = throw "'sip_4' has been renamed to/replaced by 'sip4'"; # Converted to throw 2025-10-29
+  slackclient = throw "'slackclient' has been renamed to/replaced by 'slack-sdk'"; # Converted to throw 2025-10-29
+  smart_open = throw "'smart_open' has been renamed to/replaced by 'smart-open'"; # Converted to throw 2025-10-29
+  smpp_pdu = throw "'smpp_pdu' has been renamed to/replaced by 'smpp-pdu'"; # Converted to throw 2025-10-29
+  sorl_thumbnail = throw "'sorl_thumbnail' has been renamed to/replaced by 'sorl-thumbnail'"; # Converted to throw 2025-10-29
+  spacy_models = throw "'spacy_models' has been renamed to/replaced by 'spacy-models'"; # Converted to throw 2025-10-29
+  SPARQLWrapper = throw "'SPARQLWrapper' has been renamed to/replaced by 'sparqlwrapper'"; # 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
   sparsezoo = throw "sparsezoo has been removed since it is abandonned"; # added 2025-09-01
-  sphinx-jquery = sphinxcontrib-jquery; # added 2023-02-24
-  sphinx_rtd_theme = sphinx-rtd-theme; # added 2022-08-03
-  sphinxcontrib-autoapi = sphinx-autoapi; # added 2023-02-28
-  sphinxcontrib_httpdomain = sphinxcontrib-httpdomain; # added 2023-07-20
-  sphinxcontrib_newsfeed = sphinxcontrib-newsfeed; # added 2023-07-20
-  sphinxcontrib_plantuml = sphinxcontrib-plantuml; # added 2021-08-02
-  sqlalchemy_migrate = sqlalchemy-migrate; # added 2021-10-28
+  sphinx-jquery = throw "'sphinx-jquery' has been renamed to/replaced by 'sphinxcontrib-jquery'"; # Converted to throw 2025-10-29
+  sphinx_rtd_theme = throw "'sphinx_rtd_theme' has been renamed to/replaced by 'sphinx-rtd-theme'"; # Converted to throw 2025-10-29
+  sphinxcontrib-autoapi = throw "'sphinxcontrib-autoapi' has been renamed to/replaced by 'sphinx-autoapi'"; # Converted to throw 2025-10-29
+  sphinxcontrib_httpdomain = throw "'sphinxcontrib_httpdomain' has been renamed to/replaced by 'sphinxcontrib-httpdomain'"; # Converted to throw 2025-10-29
+  sphinxcontrib_newsfeed = throw "'sphinxcontrib_newsfeed' has been renamed to/replaced by 'sphinxcontrib-newsfeed'"; # Converted to throw 2025-10-29
+  sphinxcontrib_plantuml = throw "'sphinxcontrib_plantuml' has been renamed to/replaced by 'sphinxcontrib-plantuml'"; # Converted to throw 2025-10-29
+  sqlalchemy_migrate = throw "'sqlalchemy_migrate' has been renamed to/replaced by 'sqlalchemy-migrate'"; # Converted to throw 2025-10-29
   subunit2sql = throw "subunit2sql has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
-  supervise_api = supervise-api; # added 2023-10-11
-  synologydsm-api = py-synologydsm-api; # added 2024-07-29
-  sysv_ipc = sysv-ipc; # added 2024-01-07
-  tensorflow-bin_2 = tensorflow-bin; # added 2021-11-25
-  tensorflow-build_2 = tensorflow-build; # added 2021-11-25
-  tensorflow-estimator = tensorflow-estimator-bin; # added 2023-01-17
-  tensorflow-estimator_2 = tensorflow-estimator; # added 2021-11-25
-  tensorflow-tensorboard = tensorboard; # added 2022-03-06
-  tensorflow-tensorboard_2 = tensorflow-tensorboard; # added 2021-11-25
+  supervise_api = throw "'supervise_api' has been renamed to/replaced by 'supervise-api'"; # Converted to throw 2025-10-29
+  synologydsm-api = throw "'synologydsm-api' has been renamed to/replaced by 'py-synologydsm-api'"; # Converted to throw 2025-10-29
+  sysv_ipc = throw "'sysv_ipc' has been renamed to/replaced by 'sysv-ipc'"; # Converted to throw 2025-10-29
+  tensorflow-bin_2 = throw "'tensorflow-bin_2' has been renamed to/replaced by 'tensorflow-bin'"; # Converted to throw 2025-10-29
+  tensorflow-build_2 = throw "'tensorflow-build_2' has been renamed to/replaced by 'tensorflow-build'"; # Converted to throw 2025-10-29
+  tensorflow-estimator = throw "'tensorflow-estimator' has been renamed to/replaced by 'tensorflow-estimator-bin'"; # Converted to throw 2025-10-29
+  tensorflow-estimator_2 = throw "'tensorflow-estimator_2' has been renamed to/replaced by 'tensorflow-estimator'"; # Converted to throw 2025-10-29
+  tensorflow-tensorboard = throw "'tensorflow-tensorboard' has been renamed to/replaced by 'tensorboard'"; # Converted to throw 2025-10-29
+  tensorflow-tensorboard_2 = throw "'tensorflow-tensorboard_2' has been renamed to/replaced by 'tensorflow-tensorboard'"; # Converted to throw 2025-10-29
   testing-postgresql = throw "testing-postgresql has been removed, since it is unmaintained since 2017"; # added 2025-05-25
-  Theano = theano; # added 2023-02-19
-  TheanoWithCuda = theanoWithCuda; # added 2023-02-19
-  TheanoWithoutCuda = theanoWithoutCuda; # added 2023-02-19
-  torrent_parser = torrent-parser; # added 2023-11-04
+  Theano = throw "'Theano' has been renamed to/replaced by 'theano'"; # Converted to throw 2025-10-29
+  TheanoWithCuda = throw "'TheanoWithCuda' has been renamed to/replaced by 'theanoWithCuda'"; # Converted to throw 2025-10-29
+  TheanoWithoutCuda = throw "'TheanoWithoutCuda' has been renamed to/replaced by 'theanoWithoutCuda'"; # Converted to throw 2025-10-29
+  torrent_parser = throw "'torrent_parser' has been renamed to/replaced by 'torrent-parser'"; # Converted to throw 2025-10-29
   treeo = throw "treeo has been removed because it has been marked as broken since 2023."; # Added 2025-10-11
   treex = throw "treex has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11
-  trezor_agent = trezor-agent; # Added 2024-01-07
-  tvdb_api = tvdb-api; # added 2023-10-20
+  trezor_agent = throw "'trezor_agent' has been renamed to/replaced by 'trezor-agent'"; # Converted to throw 2025-10-29
+  tvdb_api = throw "'tvdb_api' has been renamed to/replaced by 'tvdb-api'"; # Converted to throw 2025-10-29
   typed-ast = throw "typed-ast was removed because it went end of life in July 2023"; # added 2025-05-24
   types-typed-ast = throw "types-typed-ast was removed because so was typed-ast"; # added 2025-05-24
   uamqp = throw "'uamqp' has been removed because it is broken and unmaintained."; # added 2025-06-11
-  ufoLib2 = ufolib2; # added 2024-01-07
+  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
   unifi = throw "'unifi' has been removed as upstream was archived in 2017"; # Added 2025-08-25
-  update_checker = update-checker; # added 2024-01-07
+  update_checker = throw "'update_checker' has been renamed to/replaced by 'update-checker'"; # Converted to throw 2025-10-29
   vcver = throw "vcver has been removed, since it was an unused leaf package"; # added 2025-08-25
-  vega_datasets = vega-datasets; # added 2023-11-04
-  ViennaRNA = viennarna; # added 2023-08-23
+  vega_datasets = throw "'vega_datasets' has been renamed to/replaced by 'vega-datasets'"; # Converted to throw 2025-10-29
+  ViennaRNA = throw "'ViennaRNA' has been renamed to/replaced by 'viennarna'"; # Converted to throw 2025-10-29
   vulcan-api = throw "vulcan-api has been removed. Their API has changed and they don't allow access from unofficial software anymore."; # added 2025-09-05
-  Wand = wand; # added 2022-11-13
-  WazeRouteCalculator = wazeroutecalculator; # added 2021-09-29
-  websocket_client = websocket-client; # added 2021-06-15
+  Wand = throw "'Wand' has been renamed to/replaced by 'wand'"; # Converted to throw 2025-10-29
+  WazeRouteCalculator = throw "'WazeRouteCalculator' has been renamed to/replaced by 'wazeroutecalculator'"; # Converted to throw 2025-10-29
+  websocket_client = throw "'websocket_client' has been renamed to/replaced by 'websocket-client'"; # Converted to throw 2025-10-29
   worldengine = throw "worldengine has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
-  wxPython_4_2 = wxpython; # added 2024-01-07
-  WSME = wsme; # added 2023-02-19
-  x11_hash = x11-hash; # added 2023-11-05
-  xapp = python-xapp; # added 2024-07-19
-  XlsxWriter = xlsxwriter; # added 2023-02-19
-  Yapsy = yapsy; # added 2023-02-19
-  z3 = z3-solver; # added 2023-12-03
-  zc-buildout221 = zc-buildout; # added 2021-07-21
-  zc_lockfile = zc-lockfile; # added 2024-01-06
-  zope_component = zope-component; # added 2023-07-28
-  zope_configuration = zope-configuration; # added 2023-11-12
-  zope_contenttype = zope-contenttype; # added 2023-10-11
-  zope_copy = zope-copy; # added 2024-01-06
-  zope_deprecation = zope-deprecation; # added 2023-10-07
-  zope_dottedname = zope-dottedname; # added 2023-11-12
-  zope_event = zope-event; # added 2024-01-06
-  zope_exceptions = zope-exceptions; # added 2023-10-11
-  zope_filerepresentation = zope-filerepresentation; # added 2024-01-06
-  zope_i18nmessageid = zope-i18nmessageid; # added 2023-07-29
-  zope_interface = zope-interface; # added 2024-01-06
-  zope_lifecycleevent = zope-lifecycleevent; # added 2023-10-11
-  zope_location = zope-location; # added 2024-01-06
-  zope_proxy = zope-proxy; # added 2023-10-07
-  zope_schema = zope-schema; # added 2024-01-06
-  zope_size = zope-size; # added 2024-01-06
-  zope_testing = zope-testing; # added 2023-11-12
-  zope_testrunner = zope-testrunner; # added 2024-01-06
-  zxing_cpp = zxing-cpp; # added 2023-11-05
+  wxPython_4_2 = throw "'wxPython_4_2' has been renamed to/replaced by 'wxpython'"; # Converted to throw 2025-10-29
+  WSME = throw "'WSME' has been renamed to/replaced by 'wsme'"; # Converted to throw 2025-10-29
+  x11_hash = throw "'x11_hash' has been renamed to/replaced by 'x11-hash'"; # Converted to throw 2025-10-29
+  xapp = throw "'xapp' has been renamed to/replaced by 'python-xapp'"; # Converted to throw 2025-10-29
+  XlsxWriter = throw "'XlsxWriter' has been renamed to/replaced by 'xlsxwriter'"; # Converted to throw 2025-10-29
+  Yapsy = throw "'Yapsy' has been renamed to/replaced by 'yapsy'"; # Converted to throw 2025-10-29
+  z3 = throw "'z3' has been renamed to/replaced by 'z3-solver'"; # Converted to throw 2025-10-29
+  zc-buildout221 = throw "'zc-buildout221' has been renamed to/replaced by 'zc-buildout'"; # Converted to throw 2025-10-29
+  zc_lockfile = throw "'zc_lockfile' has been renamed to/replaced by 'zc-lockfile'"; # Converted to throw 2025-10-29
+  zope_component = throw "'zope_component' has been renamed to/replaced by 'zope-component'"; # Converted to throw 2025-10-29
+  zope_configuration = throw "'zope_configuration' has been renamed to/replaced by 'zope-configuration'"; # Converted to throw 2025-10-29
+  zope_contenttype = throw "'zope_contenttype' has been renamed to/replaced by 'zope-contenttype'"; # Converted to throw 2025-10-29
+  zope_copy = throw "'zope_copy' has been renamed to/replaced by 'zope-copy'"; # Converted to throw 2025-10-29
+  zope_deprecation = throw "'zope_deprecation' has been renamed to/replaced by 'zope-deprecation'"; # Converted to throw 2025-10-29
+  zope_dottedname = throw "'zope_dottedname' has been renamed to/replaced by 'zope-dottedname'"; # Converted to throw 2025-10-29
+  zope_event = throw "'zope_event' has been renamed to/replaced by 'zope-event'"; # Converted to throw 2025-10-29
+  zope_exceptions = throw "'zope_exceptions' has been renamed to/replaced by 'zope-exceptions'"; # Converted to throw 2025-10-29
+  zope_filerepresentation = throw "'zope_filerepresentation' has been renamed to/replaced by 'zope-filerepresentation'"; # Converted to throw 2025-10-29
+  zope_i18nmessageid = throw "'zope_i18nmessageid' has been renamed to/replaced by 'zope-i18nmessageid'"; # Converted to throw 2025-10-29
+  zope_interface = throw "'zope_interface' has been renamed to/replaced by 'zope-interface'"; # Converted to throw 2025-10-29
+  zope_lifecycleevent = throw "'zope_lifecycleevent' has been renamed to/replaced by 'zope-lifecycleevent'"; # Converted to throw 2025-10-29
+  zope_location = throw "'zope_location' has been renamed to/replaced by 'zope-location'"; # Converted to throw 2025-10-29
+  zope_proxy = throw "'zope_proxy' has been renamed to/replaced by 'zope-proxy'"; # Converted to throw 2025-10-29
+  zope_schema = throw "'zope_schema' has been renamed to/replaced by 'zope-schema'"; # Converted to throw 2025-10-29
+  zope_size = throw "'zope_size' has been renamed to/replaced by 'zope-size'"; # Converted to throw 2025-10-29
+  zope_testing = throw "'zope_testing' has been renamed to/replaced by 'zope-testing'"; # Converted to throw 2025-10-29
+  zope_testrunner = throw "'zope_testrunner' has been renamed to/replaced by 'zope-testrunner'"; # Converted to throw 2025-10-29
+  zxing_cpp = throw "'zxing_cpp' has been renamed to/replaced by 'zxing-cpp'"; # Converted to throw 2025-10-29
 }

From 76a7fa0351995f9173f3cba9ddaac4e51b1f46f0 Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Wed, 29 Oct 2025 12:40:22 +0200
Subject: [PATCH 3833/6226] python-aliases: keep sorted

---
 pkgs/top-level/python-aliases.nix | 114 +++++++++++++++---------------
 1 file changed, 58 insertions(+), 56 deletions(-)

diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index f00166b0616f..912f98d9518d 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -56,13 +56,14 @@ mapAliases {
   pypy311 = throw "do not use pypy311 when building Python packages, use the generic python parameter instead"; # do not remove
   fetchPypi = super.pkgs.fetchPypi; # added 2023-05-25, too many usages
 
+  # keep-sorted start case=no numeric=yes
   abodepy = throw "'abodepy' has been renamed to/replaced by 'jaraco-abode'"; # Converted to throw 2025-10-29
-  ansiwrap = throw "ansiwrap has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
-  amazon_kclpy = throw "'amazon_kclpy' has been renamed to/replaced by 'amazon-kclpy'"; # Converted to throw 2025-10-29
   amazon-kclpy = throw "amazon-kclpy has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
+  amazon_kclpy = throw "'amazon_kclpy' has been renamed to/replaced by 'amazon-kclpy'"; # Converted to throw 2025-10-29
+  ansiwrap = throw "ansiwrap has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
   apkit = throw "apkit was removed because it is unmaintained upstream and different from apkit on PyPI"; # added 2025-09-13
-  argon2_cffi = throw "'argon2_cffi' has been renamed to/replaced by 'argon2-cffi'"; # Converted to throw 2025-10-29
   APScheduler = throw "'APScheduler' has been renamed to/replaced by 'apscheduler'"; # Converted to throw 2025-10-29
+  argon2_cffi = throw "'argon2_cffi' has been renamed to/replaced by 'argon2-cffi'"; # Converted to throw 2025-10-29
   astropy-extension-helpers = extension-helpers; # Added 2025-10-15
   async_generator = throw "'async_generator' has been renamed to/replaced by 'async-generator'"; # Converted to throw 2025-10-29
   async_stagger = throw "'async_stagger' has been renamed to/replaced by 'async-stagger'"; # Converted to throw 2025-10-29
@@ -73,25 +74,25 @@ mapAliases {
   backports_shutil_get_terminal_size = throw "'backports_shutil_get_terminal_size' has been renamed to/replaced by 'backports-shutil-get-terminal-size'"; # Converted to throw 2025-10-29
   bash_kernel = throw "'bash_kernel' has been renamed to/replaced by 'bash-kernel'"; # Converted to throw 2025-10-29
   beancount_docverif = throw "'beancount_docverif' has been renamed to/replaced by 'beancount-docverif'"; # Converted to throw 2025-10-29
-  beets-unstable = lib.warn "beets-unstable was aliased to beets, since upstream releases are frequent nowadays" self.beets; # added 2025-10-16
   beets-stable = lib.warn "beets-stable was aliased to beets, since upstream releases are frequent nowadays" self.beets; # added 2025-10-16
+  beets-unstable = lib.warn "beets-unstable was aliased to beets, since upstream releases are frequent nowadays" self.beets; # added 2025-10-16
   bip_utils = throw "'bip_utils' has been renamed to/replaced by 'bip-utils'"; # Converted to throw 2025-10-29
   bjoern = throw "'bjoern' has been removed, as the upstream repository was unmaintained and it was using libraries with severe security issues."; # Added 2025-09-01
   bkcharts = throw "'bkcharts' has been removed as the upstream repository was archived in 2018"; # added 2025-08-26
   BlinkStick = throw "'BlinkStick' has been renamed to/replaced by 'blinkstick'"; # Converted to throw 2025-10-29
   bsblan = throw "'bsblan' has been renamed to/replaced by 'python-bsblan'"; # Converted to throw 2025-10-29
+  bt_proximity = throw "'bt_proximity' has been renamed to/replaced by 'bt-proximity'"; # Converted to throw 2025-10-29
   btchip = throw "'btchip' has been renamed to/replaced by 'btchip-python'"; # Converted to throw 2025-10-29
+  BTrees = throw "'BTrees' has been renamed to/replaced by 'btrees'"; # Converted to throw 2025-10-29
+  btsmarthub_devicelist = throw "'btsmarthub_devicelist' has been renamed to/replaced by 'btsmarthub-devicelist'"; # Converted to throw 2025-10-29
   bugzilla = throw "'bugzilla' has been renamed to/replaced by 'python-bugzilla'"; # Converted to throw 2025-10-29
   bunch = throw "bunch has been removed as it is unmaintained since inception"; # added 2025-05-31
-  btsmarthub_devicelist = throw "'btsmarthub_devicelist' has been renamed to/replaced by 'btsmarthub-devicelist'"; # Converted to throw 2025-10-29
-  bt_proximity = throw "'bt_proximity' has been renamed to/replaced by 'bt-proximity'"; # Converted to throw 2025-10-29
   bz2file = throw "'bz2file' has beem removed, as it was not longed maintained upstream since 2020"; # added 2025-08-26
-  BTrees = throw "'BTrees' has been renamed to/replaced by 'btrees'"; # Converted to throw 2025-10-29
   can = throw "'can' has been renamed to/replaced by 'python-can'"; # Converted to throw 2025-10-29
   casbin = pycasbin; # added 2025-06-12
   cchardet = throw "'cchardet' has been renamed to/replaced by 'faust-cchardet'"; # Converted to throw 2025-10-29
-  class-registry = throw "'class-registry' has been renamed to/replaced by 'phx-class-registry'"; # Converted to throw 2025-10-29
   cirq-rigetti = throw "cirq-rigetti was removed because it is no longer provided by upstream"; # added 2025-09-13
+  class-registry = throw "'class-registry' has been renamed to/replaced by 'phx-class-registry'"; # Converted to throw 2025-10-29
   ColanderAlchemy = throw "'ColanderAlchemy' has been renamed to/replaced by 'colanderalchemy'"; # Converted to throw 2025-10-29
   command_runner = throw "'command_runner' has been renamed to/replaced by 'command-runner'"; # Converted to throw 2025-10-29
   commitizen = throw "commitizen has been promoted to a top-level attribute name: `pkgs.commitizen`"; # added 2025-09-14
@@ -104,21 +105,19 @@ mapAliases {
   debian = throw "'debian' has been renamed to/replaced by 'python-debian'"; # Converted to throw 2025-10-29
   dictpath = throw "'dictpath' has been renamed to/replaced by 'pathable'"; # Converted to throw 2025-10-29
   diff_cover = throw "'diff_cover' has been renamed to/replaced by 'diff-cover'"; # Converted to throw 2025-10-29
+  digital-ocean = throw "'digital-ocean' has been renamed to/replaced by 'python-digitalocean'"; # Converted to throw 2025-10-29
   discogs_client = throw "'discogs_client' has been renamed to/replaced by 'discogs-client'"; # Converted to throw 2025-10-29
   distutils_extra = throw "'distutils_extra' has been renamed to/replaced by 'distutils-extra'"; # Converted to throw 2025-10-29
-  digital-ocean = throw "'digital-ocean' has been renamed to/replaced by 'python-digitalocean'"; # Converted to throw 2025-10-29
   dj-stripe = throw "dj-stripe has been removed because it is unused and broken"; # added 2025-07-21
-  djangorestframework-guardian2 = throw "djangorestframework-guardian2 has been removed because djangorestframework-guardian is active again and the upstream project was archived"; # added 2025-08-22
-  djangorestframework-jwt = throw "'djangorestframework-jwt' has been renamed to/replaced by 'drf-jwt'"; # Converted to throw 2025-10-29
+  django-crispy-bootstrap3 = crispy-bootstrap3; # added 2025-06-11
+  django-crispy-bootstrap4 = crispy-bootstrap4; # added 2025-06-11
+  django-crispy-bootstrap5 = crispy-bootstrap5; # added 2025-06-11
   django_3 = throw "Django 3 has reached it#s EOL in 2024-04 and has therefore been removed."; # added 2025-01-25
   django_appconf = throw "'django_appconf' has been renamed to/replaced by 'django-appconf'"; # Converted to throw 2025-10-29
   django_classytags = throw "'django_classytags' has been renamed to/replaced by 'django-classy-tags'"; # Converted to throw 2025-10-29
   django_colorful = throw "'django_colorful' has been renamed to/replaced by 'django-colorful'"; # Converted to throw 2025-10-29
   django_compat = throw "'django_compat' has been renamed to/replaced by 'django-compat'"; # Converted to throw 2025-10-29
   django_contrib_comments = throw "'django_contrib_comments' has been renamed to/replaced by 'django-contrib-comments'"; # Converted to throw 2025-10-29
-  django-crispy-bootstrap3 = crispy-bootstrap3; # added 2025-06-11
-  django-crispy-bootstrap4 = crispy-bootstrap4; # added 2025-06-11
-  django-crispy-bootstrap5 = crispy-bootstrap5; # added 2025-06-11
   django_environ = throw "'django_environ' has been renamed to/replaced by 'django-environ'"; # Converted to throw 2025-10-29
   django_extensions = throw "'django_extensions' has been renamed to/replaced by 'django-extensions'"; # Converted to throw 2025-10-29
   django_guardian = throw "'django_guardian' has been renamed to/replaced by 'django-guardian'"; # Converted to throw 2025-10-29
@@ -126,23 +125,25 @@ mapAliases {
   django_hijack_admin = throw "'django_hijack_admin' has been renamed to/replaced by 'django-hijack-admin'"; # Converted to throw 2025-10-29
   django_modelcluster = throw "'django_modelcluster' has been renamed to/replaced by 'django-modelcluster'"; # Converted to throw 2025-10-29
   django_nose = throw "'django_nose' has been renamed to/replaced by 'django-nose'"; # Converted to throw 2025-10-29
-  django_reversion = throw "'django_reversion' has been renamed to/replaced by 'django-reversion'"; # Converted to throw 2025-10-29
   django_polymorphic = throw "'django_polymorphic' has been renamed to/replaced by 'django-polymorphic'"; # Converted to throw 2025-10-29
   django_redis = throw "'django_redis' has been renamed to/replaced by 'django-redis'"; # Converted to throw 2025-10-29
+  django_reversion = throw "'django_reversion' has been renamed to/replaced by 'django-reversion'"; # Converted to throw 2025-10-29
   django_silk = throw "'django_silk' has been renamed to/replaced by 'django-silk'"; # Converted to throw 2025-10-29
   django_tagging = throw "'django_tagging' has been renamed to/replaced by 'django-tagging'"; # Converted to throw 2025-10-29
   django_taggit = throw "'django_taggit' has been renamed to/replaced by 'django-taggit'"; # Converted to throw 2025-10-29
   django_treebeard = throw "'django_treebeard' has been renamed to/replaced by 'django-treebeard'"; # Converted to throw 2025-10-29
+  djangorestframework-guardian2 = throw "djangorestframework-guardian2 has been removed because djangorestframework-guardian is active again and the upstream project was archived"; # added 2025-08-22
+  djangorestframework-jwt = throw "'djangorestframework-jwt' has been renamed to/replaced by 'drf-jwt'"; # Converted to throw 2025-10-29
   dns = throw "'dns' has been renamed to/replaced by 'dnspython'"; # Converted to throw 2025-10-29
   docker_pycreds = throw "'docker_pycreds' has been renamed to/replaced by 'docker-pycreds'"; # Converted to throw 2025-10-29
   dogpile_cache = throw "'dogpile_cache' has been renamed to/replaced by 'dogpile-cache'"; # Converted to throw 2025-10-29
   duckduckgo-search = throw "duckduckgo-search was renamed to ddgs, use ddgs instead"; # added 2025-10-20
-  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
   easyeda2ato = throw "easyeda2ato as been removed in favor of atopile-easyda2kicad"; # added 2025-06-08
   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
   email_validator = throw "'email_validator' has been renamed to/replaced by 'email-validator'"; # Converted to throw 2025-10-29
   embreex = throw "embreex has been removed, as it required embree2"; # added 2025-09-14
-  elegy = throw "elegy has been removed because it has transitively been marked as broken since 2023."; # Added 2025-10-11
   eris = throw "eris has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   et_xmlfile = throw "'et_xmlfile' has been renamed to/replaced by 'et-xmlfile'"; # Converted to throw 2025-10-29
   ev3dev2 = throw "'ev3dev2' has been renamed to/replaced by 'python-ev3dev2'"; # Converted to throw 2025-10-29
@@ -156,7 +157,8 @@ mapAliases {
   fenics = throw "fenics has been removed, use fenics-dolfinx instead"; # added 2025-08-07
   filebrowser_safe = throw "'filebrowser_safe' has been renamed to/replaced by 'filebrowser-safe'"; # Converted to throw 2025-10-29
   filesplit = throw "filesplit has been removed, since it is unmaintained"; # added 2025-08-20
-  flaskbabel = throw "'flaskbabel' has been renamed to/replaced by 'flask-babel'"; # Converted to throw 2025-10-29
+  flask-security-too = throw "'flask-security-too' has been renamed to/replaced by 'flask-security'"; # Converted to throw 2025-10-29
+  flask-silk = throw "flask-silk was removed, as it is unmaintained since 2018."; # added 2025-05-25
   flask_assets = throw "'flask_assets' has been renamed to/replaced by 'flask-assets'"; # Converted to throw 2025-10-29
   flask_elastic = throw "'flask_elastic' has been renamed to/replaced by 'flask-elastic'"; # Converted to throw 2025-10-29
   flask_login = throw "'flask_login' has been renamed to/replaced by 'flask-login'"; # Converted to throw 2025-10-29
@@ -165,11 +167,10 @@ mapAliases {
   flask_migrate = throw "'flask_migrate' has been renamed to/replaced by 'flask-migrate'"; # Converted to throw 2025-10-29
   flask_principal = throw "'flask_principal' has been renamed to/replaced by 'flask-principal'"; # Converted to throw 2025-10-29
   flask_script = throw "'flask_script' has been renamed to/replaced by 'flask-script'"; # Converted to throw 2025-10-29
-  flask-security-too = throw "'flask-security-too' has been renamed to/replaced by 'flask-security'"; # Converted to throw 2025-10-29
   flask_sqlalchemy = throw "'flask_sqlalchemy' has been renamed to/replaced by 'flask-sqlalchemy'"; # Converted to throw 2025-10-29
   flask_testing = throw "'flask_testing' has been renamed to/replaced by 'flask-testing'"; # Converted to throw 2025-10-29
   flask_wtf = throw "'flask_wtf' has been renamed to/replaced by 'flask-wtf'"; # Converted to throw 2025-10-29
-  flask-silk = throw "flask-silk was removed, as it is unmaintained since 2018."; # added 2025-05-25
+  flaskbabel = throw "'flaskbabel' has been renamed to/replaced by 'flask-babel'"; # Converted to throw 2025-10-29
   flowlogs_reader = throw "'flowlogs_reader' has been renamed to/replaced by 'flowlogs-reader'"; # Converted to throw 2025-10-29
   flufl_bounce = throw "'flufl_bounce' has been renamed to/replaced by 'flufl-bounce'"; # Converted to throw 2025-10-29
   flufl_i18n = throw "'flufl_i18n' has been renamed to/replaced by 'flufl-i18n'"; # Converted to throw 2025-10-29
@@ -187,8 +188,8 @@ mapAliases {
   grpc_google_iam_v1 = throw "'grpc_google_iam_v1' has been renamed to/replaced by 'grpc-google-iam-v1'"; # Converted to throw 2025-10-29
   gtimelog = throw "'gtimelog' has been renamed to/replaced by 'gtimelog'"; # Converted to throw 2025-10-29
   guzzle_sphinx_theme = throw "'guzzle_sphinx_theme' has been renamed to/replaced by 'guzzle-sphinx-theme'"; # Converted to throw 2025-10-29
-  HAP-python = throw "'HAP-python' has been renamed to/replaced by 'hap-python'"; # Converted to throw 2025-10-29
   hahomematic = throw "hahomematic has been superseded by aiohomematic"; # added 2025-08-16
+  HAP-python = throw "'HAP-python' has been renamed to/replaced by 'hap-python'"; # Converted to throw 2025-10-29
   hcs_utils = throw "'hcs_utils' has been renamed to/replaced by 'hcs-utils'"; # Converted to throw 2025-10-29
   heif-image-plugin = throw "heif-image-plugin has been removed due to lack of upstream maintenance and breakage. Use `pillow-heif` instead."; # added 2025-09-17
   hglib = throw "'hglib' has been renamed to/replaced by 'python-hglib'"; # Converted to throw 2025-10-29
@@ -196,28 +197,28 @@ mapAliases {
   homeassistant-bring-api = throw "'homeassistant-bring-api' has been renamed to/replaced by 'bring-api'"; # Converted to throw 2025-10-29
   HTSeq = throw "'HTSeq' has been renamed to/replaced by 'htseq'"; # Converted to throw 2025-10-29
   IMAPClient = throw "'IMAPClient' has been renamed to/replaced by 'imapclient'"; # Converted to throw 2025-10-29
+  inlinestyler = throw "inlinestyler has been removed because it is no longer maintained"; # added 2025-08-09
   ionhash = throw "ionhash has been removed due to being unmaintained upstream"; # added 2025-07-30
   iotawattpy = ha-iotawattpy; # added 2025-07-06
   ipython_genutils = throw "'ipython_genutils' has been renamed to/replaced by 'ipython-genutils'"; # Converted to throw 2025-10-29
-  inlinestyler = throw "inlinestyler has been removed because it is no longer maintained"; # added 2025-08-09
   itanium_demangler = throw "'itanium_demangler' has been renamed to/replaced by 'itanium-demangler'"; # Converted to throw 2025-10-29
   jaraco_classes = throw "'jaraco_classes' has been renamed to/replaced by 'jaraco-classes'"; # Converted to throw 2025-10-29
   jaraco_collections = throw "'jaraco_collections' has been renamed to/replaced by 'jaraco-collections'"; # Converted to throw 2025-10-29
   jaraco_functools = throw "'jaraco_functools' has been renamed to/replaced by 'jaraco-functools'"; # Converted to throw 2025-10-29
   jaraco_itertools = throw "'jaraco_itertools' has been renamed to/replaced by 'jaraco-itertools'"; # Converted to throw 2025-10-29
   jaraco_logging = throw "'jaraco_logging' has been renamed to/replaced by 'jaraco-logging'"; # Converted to throw 2025-10-29
-  jaraco_text = throw "'jaraco_text' has been renamed to/replaced by 'jaraco-text'"; # Converted to throw 2025-10-29
   jaraco_stream = throw "'jaraco_stream' has been renamed to/replaced by 'jaraco-stream'"; # Converted to throw 2025-10-29
+  jaraco_text = throw "'jaraco_text' has been renamed to/replaced by 'jaraco-text'"; # Converted to throw 2025-10-29
   JayDeBeApi = throw "'JayDeBeApi' has been renamed to/replaced by 'jaydebeapi'"; # Converted to throw 2025-10-29
   jinja2_pluralize = throw "'jinja2_pluralize' has been renamed to/replaced by 'jinja2-pluralize'"; # Converted to throw 2025-10-29
   jinja2_time = throw "'jinja2_time' has been renamed to/replaced by 'jinja2-time'"; # Converted to throw 2025-10-29
   JPype1 = throw "'JPype1' has been renamed to/replaced by 'jpype1'"; # Converted to throw 2025-10-29
   jsonpath_rw = throw "'jsonpath_rw' has been renamed to/replaced by 'jsonpath-rw'"; # Converted to throw 2025-10-29
+  jupyter-server-ydoc = throw "'jupyter-server-ydoc' has been renamed to/replaced by 'jupyter-collaboration'"; # Converted to throw 2025-10-29
   jupyter_client = throw "'jupyter_client' has been renamed to/replaced by 'jupyter-client'"; # Converted to throw 2025-10-29
   jupyter_console = throw "'jupyter_console' has been renamed to/replaced by 'jupyter-console'"; # Converted to throw 2025-10-29
   jupyter_core = throw "'jupyter_core' has been renamed to/replaced by 'jupyter-core'"; # Converted to throw 2025-10-29
   jupyter_server = throw "'jupyter_server' has been renamed to/replaced by 'jupyter-server'"; # Converted to throw 2025-10-29
-  jupyter-server-ydoc = throw "'jupyter-server-ydoc' has been renamed to/replaced by 'jupyter-collaboration'"; # Converted to throw 2025-10-29
   jupyterlab_server = throw "'jupyterlab_server' has been renamed to/replaced by 'jupyterlab-server'"; # Converted to throw 2025-10-29
   kafka-python = throw "'kafka-python' has been renamed to/replaced by 'kafka-python-ng'"; # Converted to throw 2025-10-29
   Kajiki = throw "'Kajiki' has been renamed to/replaced by 'kajiki'"; # Converted to throw 2025-10-29
@@ -225,13 +226,14 @@ mapAliases {
   Keras = throw "'Keras' has been renamed to/replaced by 'keras'"; # Converted to throw 2025-10-29
   keyrings-passwordstore = throw "keyrings-passwordstore has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
   kivy-garden-modernmenu = throw "kivy-garden-modernmenu has been removed as it's abandoned since 2019"; # added 2025-05-25
-  ldap = throw "'ldap' has been renamed to/replaced by 'python-ldap'"; # Converted to throw 2025-10-29
   langchain-standard-tests = throw "'langchain-standard-tests' has been renamed to/replaced by 'langchain-tests'"; # Converted to throw 2025-10-29
   langchainplus-sdk = throw "'langchainplus-sdk' has been renamed to/replaced by 'langsmith'"; # Converted to throw 2025-10-29
   lazr_config = throw "'lazr_config' has been renamed to/replaced by 'lazr-config'"; # Converted to throw 2025-10-29
   lazr_delegates = throw "'lazr_delegates' has been renamed to/replaced by 'lazr-delegates'"; # Converted to throw 2025-10-29
   lazy_import = throw "'lazy_import' has been renamed to/replaced by 'lazy-import'"; # Converted to throw 2025-10-29
   lazy_imports = throw "'lazy_imports' has been renamed to/replaced by 'lazy-imports'"; # Converted to throw 2025-10-29
+  lcov_cobertura = throw "'lcov_cobertura' has been renamed to/replaced by 'lcov-cobertura'"; # Converted to throw 2025-10-29
+  ldap = throw "'ldap' has been renamed to/replaced by 'python-ldap'"; # Converted to throw 2025-10-29
   ledger_agent = throw "'ledger_agent' has been renamed to/replaced by 'ledger-agent'"; # Converted to throw 2025-10-29
   libpyfoscam = throw "libpyfoscam was removed because Home Assistant switched to libpyfoscamcgi"; # added 2025-07-03
   line_profiler = throw "'line_profiler' has been renamed to/replaced by 'line-profiler'"; # Converted to throw 2025-10-29
@@ -239,15 +241,14 @@ mapAliases {
   lmcloud = throw "'lmcloud' has been renamed to/replaced by 'pylamarzocco'"; # Converted to throw 2025-10-29
   logilab_common = throw "'logilab_common' has been renamed to/replaced by 'logilab-common'"; # Converted to throw 2025-10-29
   loo-py = throw "'loo-py' has been renamed to/replaced by 'loopy'"; # Converted to throw 2025-10-29
-  lcov_cobertura = throw "'lcov_cobertura' has been renamed to/replaced by 'lcov-cobertura'"; # Converted to throw 2025-10-29
-  Mako = throw "'Mako' has been renamed to/replaced by 'mako'"; # Converted to throw 2025-10-29
-  Markups = throw "'Markups' has been renamed to/replaced by 'markups'"; # Converted to throw 2025-10-29
   mac_alias = throw "'mac_alias' has been renamed to/replaced by 'mac-alias'"; # Converted to throw 2025-10-29
   macropy = throw "macropy has been removed as it was broken since 2020"; # added 2025-10-04
+  Mako = throw "'Mako' has been renamed to/replaced by 'mako'"; # Converted to throw 2025-10-29
+  Markups = throw "'Markups' has been renamed to/replaced by 'markups'"; # Converted to throw 2025-10-29
+  mathlibtools = throw "mathlibtools has been removed because the upstream repository was archived in 2023"; # added 2025-07-09
   MDP = throw "'MDP' has been renamed to/replaced by 'mdp'"; # Converted to throw 2025-10-29
   MechanicalSoup = throw "'MechanicalSoup' has been renamed to/replaced by 'mechanicalsoup'"; # Converted to throw 2025-10-29
   memcached = throw "'memcached' has been renamed to/replaced by 'python-memcached'"; # Converted to throw 2025-10-29
-  mathlibtools = throw "mathlibtools has been removed because the upstream repository was archived in 2023"; # added 2025-07-09
   memory_profiler = throw "'memory_profiler' has been renamed to/replaced by 'memory-profiler'"; # Converted to throw 2025-10-29
   mesa = throw "python3Packages.mesa has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
   mir_eval = throw "'mir_eval' has been renamed to/replaced by 'mir-eval'"; # Converted to throw 2025-10-29
@@ -259,12 +260,12 @@ mapAliases {
   multi_key_dict = throw "'multi_key_dict' has been renamed to/replaced by 'multi-key-dict'"; # Converted to throw 2025-10-29
   mutag = throw "mutag has been removed because it is unmaintained since 2018"; # added 2025-05-25
   net2grid = throw "'net2grid' has been renamed to/replaced by 'gridnet'"; # Converted to throw 2025-10-29
-  nitpick = throw "'nitpick' has been removed because it was unmaintained upstream since 2017 and using python2"; # added 2025-08-25
   ninja-python = throw "'ninja-python' has been renamed to/replaced by 'ninja'"; # Converted to throw 2025-10-29
+  nitpick = throw "'nitpick' has been removed because it was unmaintained upstream since 2017 and using python2"; # added 2025-08-25
   nixpkgs = throw "nixpkgs has been removed as its dependency pythonix was removed"; # added 2025-07-24
   Nuitka = throw "'Nuitka' has been renamed to/replaced by 'nuitka'"; # Converted to throw 2025-10-29
-  oauth = throw "oauth has been removed as it is unmaintained"; # added 2025-05-16
   oauth2 = throw "oauth2 has been removed as it is unmaintained"; # added 2025-05-16
+  oauth = throw "oauth has been removed as it is unmaintained"; # added 2025-05-16
   objax = throw "objax has been removed because the upstream project was archived."; # Added 2025-10-04
   openai-triton = throw "'openai-triton' has been renamed to/replaced by 'triton'"; # Converted to throw 2025-10-29
   openai-triton-bin = throw "'openai-triton-bin' has been renamed to/replaced by 'triton-bin'"; # Converted to throw 2025-10-29
@@ -294,36 +295,31 @@ mapAliases {
   protonvpn-nm-lib = throw "protonvpn-nm-lib source code was removed from upstream"; # Added 2025-10-16
   proxy_tools = throw "'proxy_tools' has been renamed to/replaced by 'proxy-tools'"; # Converted to throw 2025-10-29
   ptable = throw "ptable has been removed, as it is unmaintained and broken"; # added 2025-05-25
-  pushbullet = throw "'pushbullet' has been renamed to/replaced by 'pushbullet-py'"; # Converted to throw 2025-10-29
   push-receiver = throw "push-receiver has been removed since it is unmaintained for 3 years"; # added 2025-05-17
+  pushbullet = throw "'pushbullet' has been renamed to/replaced by 'pushbullet-py'"; # Converted to throw 2025-10-29
   Pweave = throw "'Pweave' has been renamed to/replaced by 'pweave'"; # Converted to throw 2025-10-29
   py-eth-sig-utils = throw "py-eth-sig-utils has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
-  pypcap = throw "pypcap has been removed because it is broken and unmaintained upstream."; # added 2025-06-18
-  pytedee-async = aiotedee; # added 2025-07-06
-  pytricia = throw "pytricia has been removed, since it is unmaintained"; # added 2025-05-25
+  py-scrypt = scrypt; # added 2025-08-07
   py_stringmatching = throw "'py_stringmatching' has been renamed to/replaced by 'py-stringmatching'"; # Converted to throw 2025-10-29
+  PyChromecast = throw "'PyChromecast' has been renamed to/replaced by 'pychromecast'"; # Converted to throw 2025-10-29
   pydns = throw "'pydns' has been renamed to/replaced by 'py3dns'"; # Converted to throw 2025-10-29
   pyechonest = throw "pyechonest was removed because it was broken and unmaintained"; # added 2025-08-26
   pyezviz = throw "pyeziz has been removed in favor of pyevizapi, where development continues"; # added 2025-06-11
+  pyfantom = throw "pyfantom has been removed because it does not work with python3 and has not been updated for 12 years"; # added 2025-03-25
+  pyflunearyou = throw "'pyflunearyou' has been renamed to/replaced by 'pyoutbreaksnearme'"; # Converted to throw 2025-10-29
   pygame_sdl2 = throw "'pygame_sdl2' has been renamed to/replaced by 'pygame-sdl2'"; # Converted to throw 2025-10-29
   PyGithub = throw "'PyGithub' has been renamed to/replaced by 'pygithub'"; # Converted to throw 2025-10-29
   pyheif = throw "pyheif has been removed due to lack of upstream maintenance and breakage. Use `pillow-heif` instead."; # added 2025-09-17
-  PyChromecast = throw "'PyChromecast' has been renamed to/replaced by 'pychromecast'"; # Converted to throw 2025-10-29
-  pyfantom = throw "pyfantom has been removed because it does not work with python3 and has not been updated for 12 years"; # added 2025-03-25
-  pyflunearyou = throw "'pyflunearyou' has been renamed to/replaced by 'pyoutbreaksnearme'"; # Converted to throw 2025-10-29
+  pyhiveapi = throw "'pyhiveapi' has been renamed to/replaced by 'pyhive-integration'"; # Converted to throw 2025-10-29
   pyialarmxr = throw "'pyialarmxr' has been renamed to/replaced by 'pyialarmxr-homeassistant'"; # Converted to throw 2025-10-29
   PyICU = throw "'PyICU' has been renamed to/replaced by 'pyicu'"; # Converted to throw 2025-10-29
-  pyhiveapi = throw "'pyhiveapi' has been renamed to/replaced by 'pyhive-integration'"; # Converted to throw 2025-10-29
-  pyliblo = throw "pyliblo is unmaintained upstream and was removed from nixpkgs. Please use pyliblo3 instead"; # added 2025-06-23
   PyLD = throw "'PyLD' has been renamed to/replaced by 'pyld'"; # Converted to throw 2025-10-29
+  pyliblo = throw "pyliblo is unmaintained upstream and was removed from nixpkgs. Please use pyliblo3 instead"; # added 2025-06-23
   pymc3 = throw "'pymc3' has been renamed to/replaced by 'pymc'"; # Converted to throw 2025-10-29
   pymelcloud = throw "'pymelcloud' has been renamed to/replaced by 'python-melcloud'"; # Converted to throw 2025-10-29
   PyMVGLive = throw "'PyMVGLive' has been renamed to/replaced by 'pymvglive'"; # Converted to throw 2025-10-29
   pymyq = throw "'pymyq' has been renamed to/replaced by 'python-myq'"; # 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-ethtool = throw "'python-ethtool' has been renamed to/replaced by 'ethtool'"; # Converted to throw 2025-10-29
-  python-unshare = throw "python-unshare was removed as unmaintained since 2016"; # added 2025-05-25
-  pythonix = throw "pythonix was removed as it was unmaintained since 2022"; # added 2025-07-24
+  pypcap = throw "pypcap has been removed because it is broken and unmaintained upstream."; # added 2025-06-18
   pyqldb = throw "pyqldb has been removed, because the underlying service is reaching end of support"; # added 2025-07-30
   pyqt5_sip = throw "'pyqt5_sip' has been renamed to/replaced by 'pyqt5-sip'"; # Converted to throw 2025-10-29
   pyqt5_with_qtmultimedia = throw "'pyqt5_with_qtmultimedia' has been renamed to/replaced by 'pyqt5-multimedia'"; # Converted to throw 2025-10-29
@@ -339,7 +335,6 @@ mapAliases {
   Pyro4 = throw "'Pyro4' has been renamed to/replaced by 'pyro4'"; # Converted to throw 2025-10-29
   Pyro5 = throw "'Pyro5' has been renamed to/replaced by 'pyro5'"; # Converted to throw 2025-10-29
   PyRSS2Gen = throw "'PyRSS2Gen' has been renamed to/replaced by 'pyrss2gen'"; # Converted to throw 2025-10-29
-  py-scrypt = scrypt; # added 2025-08-07
   pyside6-fluent-widgets = throw "pyside6-fluent-widgets has been removed, since it is unmaintained"; # added 2025-08-20
   pysidesix-frameless-window = throw "pysidesix-frameless-window has been removed, since it is unmaintained"; # added 2025-08-20
   pysmart-smartx = throw "'pysmart-smartx' has been renamed to/replaced by 'pysmart'"; # Converted to throw 2025-10-29
@@ -349,27 +344,33 @@ mapAliases {
   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
-  pytest_6 = throw "'pytest_6' has been renamed to/replaced by 'pytest'"; # Converted to throw 2025-10-29
-  pytestcov = throw "'pytestcov' has been renamed to/replaced by 'pytest-cov'"; # Converted to throw 2025-10-29
+  pytedee-async = aiotedee; # added 2025-07-06
   pytest-pep8 = throw "'pytest-pep8' has been renamed to/replaced by 'pytestpep8'"; # Converted to throw 2025-10-29
+  pytest_6 = throw "'pytest_6' has been renamed to/replaced by 'pytest'"; # Converted to throw 2025-10-29
+  pytest_xdist = throw "'pytest_xdist' has been renamed to/replaced by 'pytest-xdist'"; # Converted to throw 2025-10-29
+  pytestcov = throw "'pytestcov' has been renamed to/replaced by 'pytest-cov'"; # Converted to throw 2025-10-29
   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-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_openzwave = throw "'python_openzwave' has been renamed to/replaced by 'python-openzwave'"; # Converted to throw 2025-10-29
-  python_docs_theme = throw "'python_docs_theme' has been renamed to/replaced by 'python-docs-theme'"; # Converted to throw 2025-10-29
-  python_fedora = throw "'python_fedora' has been renamed to/replaced by 'python-fedora'"; # Converted to throw 2025-10-29
-  python-lz4 = throw "'python-lz4' has been renamed to/replaced by 'lz4'"; # Converted to throw 2025-10-29
-  python_magic = throw "'python_magic' has been renamed to/replaced by 'python-magic'"; # Converted to throw 2025-10-29
-  python_mimeparse = throw "'python_mimeparse' has been renamed to/replaced by 'python-mimeparse'"; # Converted to throw 2025-10-29
   python-Levenshtein = throw "'python-Levenshtein' has been renamed to/replaced by 'levenshtein'"; # Converted to throw 2025-10-29
+  python-lz4 = throw "'python-lz4' has been renamed to/replaced by 'lz4'"; # Converted to throw 2025-10-29
   python-simple-hipchat = throw "'python-simple-hipchat' has been removed because it was broken and unmaintained"; # added 2025-08-26
   python-subunit = throw "'python-subunit' has been renamed to/replaced by 'subunit'"; # Converted to throw 2025-10-29
-  pytest_xdist = throw "'pytest_xdist' has been renamed to/replaced by 'pytest-xdist'"; # Converted to throw 2025-10-29
+  python-unshare = throw "python-unshare was removed as unmaintained since 2016"; # added 2025-05-25
+  python_docs_theme = throw "'python_docs_theme' has been renamed to/replaced by 'python-docs-theme'"; # Converted to throw 2025-10-29
+  python_fedora = throw "'python_fedora' has been renamed to/replaced by 'python-fedora'"; # Converted to throw 2025-10-29
+  python_magic = throw "'python_magic' has been renamed to/replaced by 'python-magic'"; # Converted to throw 2025-10-29
+  python_mimeparse = throw "'python_mimeparse' has been renamed to/replaced by 'python-mimeparse'"; # Converted to throw 2025-10-29
+  python_openzwave = throw "'python_openzwave' has been renamed to/replaced by 'python-openzwave'"; # Converted to throw 2025-10-29
   python_simple_hipchat = throw "'python_simple_hipchat' has been renamed to/replaced by 'python-simple-hipchat'"; # Converted to throw 2025-10-29
+  pythonix = throw "pythonix was removed as it was unmaintained since 2022"; # added 2025-07-24
   pytorch = throw "'pytorch' has been renamed to/replaced by 'torch'"; # Converted to throw 2025-10-29
   pytorch-bin = throw "'pytorch-bin' has been renamed to/replaced by 'torch-bin'"; # Converted to throw 2025-10-29
   pytorchWithCuda = throw "'pytorchWithCuda' has been renamed to/replaced by 'torchWithCuda'"; # Converted to throw 2025-10-29
   pytorchWithoutCuda = throw "'pytorchWithoutCuda' has been renamed to/replaced by 'torchWithoutCuda'"; # Converted to throw 2025-10-29
+  pytricia = throw "pytricia has been removed, since it is unmaintained"; # added 2025-05-25
   pytwitchapi = throw "'pytwitchapi' has been renamed to/replaced by 'twitchapi'"; # Converted to throw 2025-10-29
   pyvicare-neo = throw "'pyvicare-neo' has been renamed to/replaced by 'pyvicare'"; # Converted to throw 2025-10-29
   PyVirtualDisplay = throw "'PyVirtualDisplay' has been renamed to/replaced by 'pyvirtualdisplay'"; # Converted to throw 2025-10-29
@@ -418,8 +419,8 @@ mapAliases {
   smpp_pdu = throw "'smpp_pdu' has been renamed to/replaced by 'smpp-pdu'"; # Converted to throw 2025-10-29
   sorl_thumbnail = throw "'sorl_thumbnail' has been renamed to/replaced by 'sorl-thumbnail'"; # Converted to throw 2025-10-29
   spacy_models = throw "'spacy_models' has been renamed to/replaced by 'spacy-models'"; # Converted to throw 2025-10-29
-  SPARQLWrapper = throw "'SPARQLWrapper' has been renamed to/replaced by 'sparqlwrapper'"; # 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
   sphinx-jquery = throw "'sphinx-jquery' has been renamed to/replaced by 'sphinxcontrib-jquery'"; # Converted to throw 2025-10-29
   sphinx_rtd_theme = throw "'sphinx_rtd_theme' has been renamed to/replaced by 'sphinx-rtd-theme'"; # Converted to throw 2025-10-29
@@ -462,8 +463,8 @@ mapAliases {
   WazeRouteCalculator = throw "'WazeRouteCalculator' has been renamed to/replaced by 'wazeroutecalculator'"; # Converted to throw 2025-10-29
   websocket_client = throw "'websocket_client' has been renamed to/replaced by 'websocket-client'"; # Converted to throw 2025-10-29
   worldengine = throw "worldengine has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
-  wxPython_4_2 = throw "'wxPython_4_2' has been renamed to/replaced by 'wxpython'"; # Converted to throw 2025-10-29
   WSME = throw "'WSME' has been renamed to/replaced by 'wsme'"; # Converted to throw 2025-10-29
+  wxPython_4_2 = throw "'wxPython_4_2' has been renamed to/replaced by 'wxpython'"; # Converted to throw 2025-10-29
   x11_hash = throw "'x11_hash' has been renamed to/replaced by 'x11-hash'"; # Converted to throw 2025-10-29
   xapp = throw "'xapp' has been renamed to/replaced by 'python-xapp'"; # Converted to throw 2025-10-29
   XlsxWriter = throw "'XlsxWriter' has been renamed to/replaced by 'xlsxwriter'"; # Converted to throw 2025-10-29
@@ -490,4 +491,5 @@ mapAliases {
   zope_testing = throw "'zope_testing' has been renamed to/replaced by 'zope-testing'"; # Converted to throw 2025-10-29
   zope_testrunner = throw "'zope_testrunner' has been renamed to/replaced by 'zope-testrunner'"; # Converted to throw 2025-10-29
   zxing_cpp = throw "'zxing_cpp' has been renamed to/replaced by 'zxing-cpp'"; # Converted to throw 2025-10-29
+  # keep-sorted end
 }

From d30882ec23002488d302b36eb14595d5d7d68208 Mon Sep 17 00:00:00 2001
From: Pui Yong Qing <puiyongqing@gmail.com>
Date: Wed, 29 Oct 2025 19:51:48 +0800
Subject: [PATCH 3834/6226] mill: 1.0.4 -> 1.0.6

---
 pkgs/by-name/mi/mill/package.nix  | 10 +++++-----
 pkgs/by-name/mi/mill/sources.json |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/mi/mill/package.nix b/pkgs/by-name/mi/mill/package.nix
index d6e4bb1fc27a..1dc0dc2e4ef3 100644
--- a/pkgs/by-name/mi/mill/package.nix
+++ b/pkgs/by-name/mi/mill/package.nix
@@ -11,7 +11,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "mill";
-  version = "1.0.4";
+  version = "1.0.6";
 
   src =
     let
@@ -47,9 +47,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  meta = {
     homepage = "https://com-lihaoyi.github.io/mill/";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     description = "Build tool for Scala, Java and more";
     mainProgram = "mill";
     longDescription = ''
@@ -59,7 +59,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       SBT, but can also be extended to support any other language or platform via
       modules (written in Java or Scala) or through an external subprocesses.
     '';
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       scalavision
       zenithal
     ];
@@ -69,6 +69,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       "aarch64-darwin"
       "x86_64-darwin"
     ];
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
   };
 })
diff --git a/pkgs/by-name/mi/mill/sources.json b/pkgs/by-name/mi/mill/sources.json
index d90987bf3973..36d38ea9f45f 100644
--- a/pkgs/by-name/mi/mill/sources.json
+++ b/pkgs/by-name/mi/mill/sources.json
@@ -1,18 +1,18 @@
 {
   "aarch64-darwin": {
     "artifact-suffix": "native-mac-aarch64",
-    "hash": "sha256-A9dShPyfkfTuRJ1/DkLwb/5NTRTxc7OY7Rd1h0Tzjos="
+    "hash": "sha256-KMlBQfSytFddA1eNJAx0yiuusgkVe1xkRoHw+03Q9rg="
   },
   "x86_64-darwin": {
     "artifact-suffix": "native-mac-amd64",
-    "hash": "sha256-zctTOVxFghF9z9PUQt3OO20Ul/qY8H/j6MPpFNpw+Ow="
+    "hash": "sha256-8CkXOfhJv/71vTgJqoEQ0TMW+r8kvdH1ff7l/Pbz0ZU="
   },
   "aarch64-linux": {
     "artifact-suffix": "native-linux-aarch64",
-    "hash": "sha256-E+IMTkRP1a1TigpRyVHPu0assgHEbzbF8lv7Rsm2FOM="
+    "hash": "sha256-d/dSBStPdz4D/Jwe8UuqQRt6FZILwHrKXsSVyO6Ky4c="
   },
   "x86_64-linux": {
     "artifact-suffix": "native-linux-amd64",
-    "hash": "sha256-rgAqlTCZc8nedUU2D+Klo3KY0z9sI0KJczdaugM3//8="
+    "hash": "sha256-iP7KHx+RA+2EQC5tRoBybe7MHXkEbxg00mDqE7IiCoY="
   }
 }

From 4ba4852f230fe52fe8df0085100bb8d1f1af3b42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Sun, 25 May 2025 12:09:27 +0200
Subject: [PATCH 3835/6226] nixos/glance: start after nss to fix invalid user
 'glance' error

---
 nixos/modules/services/web-apps/glance.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/services/web-apps/glance.nix b/nixos/modules/services/web-apps/glance.nix
index 5541158d3310..6cccc83ebaa0 100644
--- a/nixos/modules/services/web-apps/glance.nix
+++ b/nixos/modules/services/web-apps/glance.nix
@@ -172,7 +172,14 @@ in
     systemd.services.glance = {
       description = "Glance feed dashboard server";
       wantedBy = [ "multi-user.target" ];
-      after = [ "network.target" ];
+      # adding nss-user-lookup.target is a fix for https://github.com/NixOS/nixpkgs/issues/409348
+      after = [
+        "network.target"
+        "nss-user-lookup.target"
+      ];
+      requires = [
+        "nss-user-lookup.target"
+      ];
       path = [ pkgs.replace-secret ];
 
       serviceConfig = {

From 2496dd621bfc5306d8e4a42bf4d96662560b01b5 Mon Sep 17 00:00:00 2001
From: Phillip Seeber <phillip.seeber@googlemail.com>
Date: Tue, 28 Oct 2025 15:41:50 +0100
Subject: [PATCH 3836/6226] jkqtplotter: init at 5.0.0-unstable-2025-10-13

---
 .../libraries/jkqtplotter/default.nix         | 37 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/libraries/jkqtplotter/default.nix

diff --git a/pkgs/development/libraries/jkqtplotter/default.nix b/pkgs/development/libraries/jkqtplotter/default.nix
new file mode 100644
index 000000000000..8699da76be4b
--- /dev/null
+++ b/pkgs/development/libraries/jkqtplotter/default.nix
@@ -0,0 +1,37 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchpatch,
+  cmake,
+  qttools,
+  wrapQtAppsHook,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "jkqtplotter";
+  version = "5.0.0-unstable-2025-10-13";
+
+  src = fetchFromGitHub {
+    owner = "jkriege2";
+    repo = "JKQtPlotter";
+    rev = "d243218119b1632987df26baea0d4bc6ccdee533";
+    hash = "sha256-fLkZGl4LYr9zdGjxxhcU6IZkpXV/Sex4TC9DFPyw43M=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    wrapQtAppsHook
+  ];
+
+  buildInputs = [
+    qttools
+  ];
+
+  meta = {
+    description = "Qt plotting framework";
+    maintainers = [ lib.maintainers.sheepforce ];
+    homepage = "https://github.com/jkriege2/JKQtPlotter";
+    license = lib.licenses.lgpl21Plus;
+  };
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4cf105e26898..d2e9df9395b4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3131,6 +3131,8 @@ with pkgs;
 
   jl = haskellPackages.jl;
 
+  jkqtplotter = libsForQt5.callPackage ../development/libraries/jkqtplotter { };
+
   joplin = nodePackages.joplin;
 
   jpylyzer = with python3Packages; toPythonApplication jpylyzer;

From e95ff6dd75c1222246628b61e75a3846073ff73b Mon Sep 17 00:00:00 2001
From: Phillip Seeber <phillip.seeber@googlemail.com>
Date: Tue, 28 Oct 2025 15:50:57 +0100
Subject: [PATCH 3837/6226] avogadrolibs: 1.101.0 -> 1.102.1

---
 .../science/chemistry/avogadrolibs/default.nix | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
index aa8849e5faaa..89dbbc7dd837 100644
--- a/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
+++ b/pkgs/development/libraries/science/chemistry/avogadrolibs/default.nix
@@ -12,6 +12,7 @@
   python3,
   libarchive,
   libmsym,
+  jkqtplotter,
   qttools,
   wrapQtAppsHook,
 }:
@@ -28,32 +29,32 @@ let
   moleculesRepo = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "molecules";
-    tag = "1.101.0";
+    tag = "1.102.1";
     hash = "sha256-hMLf0gYYnQpjSGKcPy4tihNbmpRR7UxnXF/hyhforgI=";
   };
   crystalsRepo = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "crystals";
-    tag = "1.101.0";
+    tag = "1.102.1";
     hash = "sha256-WhzFldaOt/wJy1kk+ypOkw1OYFT3hqD7j5qGdq9g+IY=";
   };
   fragmentsRepo = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "fragments";
-    tag = "1.101.0";
+    tag = "1.102.1";
     hash = "sha256-x10jGl3lAEfm8OxUZJnjXRJCQg8RLQZTstjwnt5B2bw=";
   };
 
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "avogadrolibs";
-  version = "1.101.0";
+  version = "1.102.1";
 
   src = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "avogadrolibs";
-    tag = version;
-    hash = "sha256-0DJU40Etse90rdX8xByjQeUiBsJtEQozZQQsWsc4vxk=";
+    tag = finalAttrs.version;
+    hash = "sha256-RmGRdCy1ubwAkEJlfldscR84NLOMBx33OdHdcq1R1gg=";
   };
 
   postUnpack = ''
@@ -77,6 +78,7 @@ stdenv.mkDerivation rec {
     glew
     libarchive
     libmsym
+    jkqtplotter
     qttools
   ];
 
@@ -96,4 +98,4 @@ stdenv.mkDerivation rec {
     platforms = platforms.linux;
     license = licenses.gpl2Only;
   };
-}
+})

From 419f850ac03ce5b9c00ee8914df5563937cce6dc Mon Sep 17 00:00:00 2001
From: Phillip Seeber <phillip.seeber@googlemail.com>
Date: Tue, 28 Oct 2025 15:53:13 +0100
Subject: [PATCH 3838/6226] avogadro2: 1.101.0 -> 1.102.1

---
 .../science/chemistry/avogadro2/default.nix      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/science/chemistry/avogadro2/default.nix b/pkgs/applications/science/chemistry/avogadro2/default.nix
index 24f967cb7d0f..4a18b8857166 100644
--- a/pkgs/applications/science/chemistry/avogadro2/default.nix
+++ b/pkgs/applications/science/chemistry/avogadro2/default.nix
@@ -7,6 +7,7 @@
   avogadrolibs,
   molequeue,
   hdf5,
+  jkqtplotter,
   openbabel,
   qttools,
   wrapQtAppsHook,
@@ -17,20 +18,20 @@ let
   avogadroI18N = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "avogadro-i18n";
-    tag = "1.101.0";
-    hash = "sha256-3qFx/rc5xqfrLq3Kr5b/Rid2LR/gfP6uqhhATyQL6Y8=";
+    tag = "1.102.1";
+    hash = "sha256-doY+AWJ0GiE6VsTolgmFIRcRVl52lTgwNJLpXgVQ57c=";
   };
 
 in
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "avogadro2";
-  version = "1.101.0";
+  version = "1.102.1";
 
   src = fetchFromGitHub {
     owner = "OpenChemistry";
     repo = "avogadroapp";
-    rev = version;
-    hash = "sha256-F8to1DyeyyhsivkXDB/KH10/7teVnsoSU/ZHIsNISqc=";
+    rev = finalAttrs.version;
+    hash = "sha256-nBkOiw6JO/cG1Ob9gw7Tt/076OoRaRRmDc/a9YAfZCA=";
   };
 
   postUnpack = ''
@@ -47,6 +48,7 @@ stdenv.mkDerivation rec {
     molequeue
     eigen
     hdf5
+    jkqtplotter
     qttools
   ];
 
@@ -62,4 +64,4 @@ stdenv.mkDerivation rec {
     inherit (mesa.meta) platforms;
     license = licenses.bsd3;
   };
-}
+})

From c0cb2bce32cf5332dd36692c28d238c1578d80b0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 12:51:25 +0000
Subject: [PATCH 3839/6226] burpsuite: 2025.10 -> 2025.10.1

---
 pkgs/by-name/bu/burpsuite/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix
index feb34972b294..8d250a144294 100644
--- a/pkgs/by-name/bu/burpsuite/package.nix
+++ b/pkgs/by-name/bu/burpsuite/package.nix
@@ -9,20 +9,20 @@
 }:
 
 let
-  version = "2025.10";
+  version = "2025.10.1";
 
   product =
     if proEdition then
       {
         productName = "pro";
         productDesktop = "Burp Suite Professional Edition";
-        hash = "sha256-7gLlkAh39H96Sw2JoGbEpAZ+aLJb6vwoaE01MZnRtH4=";
+        hash = "sha256-aLP8jVHuKmp4yzcd1KsgidAhWUxoJo0beGwq/6I4n4A=";
       }
     else
       {
         productName = "community";
         productDesktop = "Burp Suite Community Edition";
-        hash = "sha256-bglejKDXvmLQd+cLyeqlTq/NrGkCxnUwc386Fw+JtI0=";
+        hash = "sha256-HiYdJrnTg0HkCt+lXKkhfGawp/NZQmhH4sGytlpiLU8=";
       };
 
   src = fetchurl {

From 11c249d3051978c625f4d688d3438a45b6d34746 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 12:56:13 +0000
Subject: [PATCH 3840/6226] proton-ge-bin: GE-Proton10-23 -> GE-Proton10-24

---
 pkgs/by-name/pr/proton-ge-bin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix
index c213b3af1a42..82da233a89bd 100644
--- a/pkgs/by-name/pr/proton-ge-bin/package.nix
+++ b/pkgs/by-name/pr/proton-ge-bin/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-ge-bin";
-  version = "GE-Proton10-23";
+  version = "GE-Proton10-24";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-cOjrP9Nh4cPcX3uwYF25z2QHnNDNb83FPa4O0zdENeg=";
+    hash = "sha256-QZBu2C4JrsETY+EV0zs4e921qOxYT9lk0EYXXpOCKLs=";
   };
 
   dontUnpack = true;

From bc4e63facd4062f580dbad068f88bda4cf6ad838 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 13:15:39 +0000
Subject: [PATCH 3841/6226] maestro: 2.0.6 -> 2.0.8

---
 pkgs/by-name/ma/maestro/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/maestro/package.nix b/pkgs/by-name/ma/maestro/package.nix
index 2a3c004b978f..3eb5260d0b42 100644
--- a/pkgs/by-name/ma/maestro/package.nix
+++ b/pkgs/by-name/ma/maestro/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "maestro";
-  version = "2.0.6";
+  version = "2.0.8";
 
   src = fetchurl {
     url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${finalAttrs.version}/maestro.zip";
-    hash = "sha256-v7AzQzYmhvqBdAK5wXd0tIe18y/BVeJP3Jp1eqfBmcE=";
+    hash = "sha256-VBXpbEdGWY5v9E0GT+2Q9hko8lZoVmE1T7FzrQL/cs4=";
   };
 
   dontUnpack = true;

From 5b15be4194b4f980fe3b1f97310565207fb9ed3f Mon Sep 17 00:00:00 2001
From: mmfallacy <31348500+mmfallacy@users.noreply.github.com>
Date: Wed, 29 Oct 2025 21:11:52 +0800
Subject: [PATCH 3842/6226] vimPlugins.maple-nvim: init at 2025-08-02

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 pkgs/applications/editors/vim/plugins/overrides.nix |  4 ++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 3 files changed, 18 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 512c8bd9a2c0..f046d7edbe55 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -8055,6 +8055,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  maple-nvim = buildVimPlugin {
+    pname = "maple.nvim";
+    version = "2025-08-02";
+    src = fetchFromGitHub {
+      owner = "forest-nvim";
+      repo = "maple.nvim";
+      rev = "c9525e84852197784de0d0203e73b8cb433297ff";
+      sha256 = "1idid6gv116yd8lrjzkyvhgw4lhd23gpaj326436mqndz7nwbaf9";
+    };
+    meta.homepage = "https://github.com/forest-nvim/maple.nvim/";
+    meta.hydraPlatforms = [ ];
+  };
+
   mark-radar-nvim = buildVimPlugin {
     pname = "mark-radar.nvim";
     version = "2024-06-04";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 191c99694774..da7e0ec094e0 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -1862,6 +1862,10 @@ assertNoAdditions {
       ];
   };
 
+  maple-nvim = super.maple-nvim.overrideAttrs {
+    dependencies = [ self.plenary-nvim ];
+  };
+
   markdown-preview-nvim =
     let
       # We only need its dependencies `node-modules`.
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 65fbf1331f98..2ff811b56876 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -618,6 +618,7 @@ https://github.com/lopi-py/luau-lsp.nvim/,HEAD,
 https://github.com/mkasa/lushtags/,,
 https://github.com/Bilal2453/luvit-meta/,HEAD,
 https://github.com/dccsillag/magma-nvim/,HEAD,
+https://github.com/forest-nvim/maple.nvim/,HEAD,
 https://github.com/winston0410/mark-radar.nvim/,HEAD,
 https://github.com/iamcco/markdown-preview.nvim/,,
 https://github.com/tadmccorkle/markdown.nvim/,HEAD,

From d71249a41fac882ad4f1f54d86f2f9820b2cee3c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 13:43:23 +0000
Subject: [PATCH 3843/6226] jwtinfo: 0.6.0 -> 0.6.1

---
 pkgs/by-name/jw/jwtinfo/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/jw/jwtinfo/package.nix b/pkgs/by-name/jw/jwtinfo/package.nix
index abcf18969c39..6935da97ddc5 100644
--- a/pkgs/by-name/jw/jwtinfo/package.nix
+++ b/pkgs/by-name/jw/jwtinfo/package.nix
@@ -5,7 +5,7 @@
 }:
 let
   pname = "jwtinfo";
-  version = "0.6.0";
+  version = "0.6.1";
 in
 rustPlatform.buildRustPackage {
   inherit pname version;
@@ -14,10 +14,10 @@ rustPlatform.buildRustPackage {
     owner = "lmammino";
     repo = "jwtinfo";
     rev = "v${version}";
-    hash = "sha256-d88RL3Ii2/akIyxmKMEBqILRuaSP2v/RZ5zuWrwyYkc=";
+    hash = "sha256-o2SbPTnYSqsjpTl1Z8uSZZLeHx4lxunwDdig4UuVFKg=";
   };
 
-  cargoHash = "sha256-5lSGVr5iMk4Zai2HNTSXOeJXyXPRAWNEyJeZxMrAMUg=";
+  cargoHash = "sha256-v5kJ+XznzewkmC3qo1e2xMLc1fS8gYYNd/9+IDFkbvw=";
 
   meta = {
     description = "Command-line tool to get information about JWTs";

From 9ccec77537e72c1f7e792e838e99c1f0d7692850 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 29 Oct 2025 14:51:48 +0100
Subject: [PATCH 3844/6226] nixos/postfix-tlspol: make tlsrpt depend on tlsrpt
 service

Without the tlsrpt service we can just fall back to QUERY and not push
around TLSRPT results.

https://github.com/Zuplu/postfix-tlspol/blob/v1.8.20/internal/server.go#L323-L329
---
 nixos/modules/services/mail/postfix-tlspol.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/modules/services/mail/postfix-tlspol.nix b/nixos/modules/services/mail/postfix-tlspol.nix
index e9b8a733ab53..a42c43fc4a48 100644
--- a/nixos/modules/services/mail/postfix-tlspol.nix
+++ b/nixos/modules/services/mail/postfix-tlspol.nix
@@ -8,7 +8,6 @@
 let
   inherit (lib)
     hasPrefix
-    literalExpression
     mkEnableOption
     mkIf
     mkMerge
@@ -143,7 +142,7 @@ in
               else
                 "inet:${cfg.settings.server.address}";
           in
-          [ "socketmap:${address}:QUERYwithTLSRPT" ];
+          [ "socketmap:${address}:${if config.services.tlsrpt.enable then "QUERYwithTLSRPT" else "QUERY"}" ];
       };
 
       systemd.services.postfix = {

From 394c3b39ef2dd9a8afe1f90bef32a0456255fa01 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 29 Oct 2025 17:02:04 +0300
Subject: [PATCH 3845/6226] linux_testing: 6.18-rc2 -> 6.18-rc3

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index eddd064fa50b..ce9a414214a5 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -1,7 +1,7 @@
 {
     "testing": {
-        "version": "6.18-rc2",
-        "hash": "sha256:1qnn47hz4q8z1613p4d641qmj71g631zwv7x7nglp9ixg2r4lxzv",
+        "version": "6.18-rc3",
+        "hash": "sha256:01cjjg23av5p8hxbqwfz4jbl0rzm3d1ldibapqcbkkxfcjri612n",
         "lts": false
     },
     "6.1": {

From bcd3078c44279eed221895014c89d1a26f716f24 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 29 Oct 2025 17:02:08 +0300
Subject: [PATCH 3846/6226] linux_6_17: 6.17.5 -> 6.17.6

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index ce9a414214a5..967378a47ca1 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -30,8 +30,8 @@
         "lts": true
     },
     "6.17": {
-        "version": "6.17.5",
-        "hash": "sha256:1kibm4b3dvncw8dzxllxiza0923q6f2xlsng4gkln5n2x4vaypy0",
+        "version": "6.17.6",
+        "hash": "sha256:17662dpl1rd24n20ihb1fsf66c8n3r6x1a24c6sanj1ld5mvrkwf",
         "lts": false
     }
 }

From 26c69eb2df4a0aaf2c5d8db9d7c93b27cec5042b Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 29 Oct 2025 17:02:39 +0300
Subject: [PATCH 3847/6226] linux_6_12: 6.12.55 -> 6.12.56

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 967378a47ca1..35c1532850f0 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -25,8 +25,8 @@
         "lts": true
     },
     "6.12": {
-        "version": "6.12.55",
-        "hash": "sha256:17zv8ail05wnbfl9yhgs4llapyk3f6qjjbfqbwx0clx61138z3rj",
+        "version": "6.12.56",
+        "hash": "sha256:15pclwn3nbwccdfwcqd3lkmdxwpjkmadhj63acqbzxsjycm2nhsm",
         "lts": true
     },
     "6.17": {

From a2fe3038d961667c410b0ebf67e5f74910692bce Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 29 Oct 2025 17:03:08 +0300
Subject: [PATCH 3848/6226] linux_6_6: 6.6.114 -> 6.6.115

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 35c1532850f0..2d4e8e5d3ca7 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "lts": true
     },
     "6.6": {
-        "version": "6.6.114",
-        "hash": "sha256:0z5r1kmzf3ib0r5rbcmp3cgjyagf6wgdjynpjbhkm5727jh7ahfa",
+        "version": "6.6.115",
+        "hash": "sha256:0iwhzlrqcw9hzr21gn0pmsjix0d022a7g38vszx4jsqgimgc160a",
         "lts": true
     },
     "6.12": {

From 437248925a562f56d3695fcb01bee45792a195de Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 29 Oct 2025 17:03:36 +0300
Subject: [PATCH 3849/6226] linux_6_1: 6.1.157 -> 6.1.158

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 2d4e8e5d3ca7..810919fa130c 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -5,8 +5,8 @@
         "lts": false
     },
     "6.1": {
-        "version": "6.1.157",
-        "hash": "sha256:0vpnjrk5kjc03sk5m66i9bv677xfy9mfrjvzx3jcrbr10bhq98d0",
+        "version": "6.1.158",
+        "hash": "sha256:1nmz4rknw82k9ylyrbm4g2m0hh4lmgkwi1g3gm7hzv04nvyqn1md",
         "lts": true
     },
     "5.15": {

From 1c348866ef7564a5d4cbe8952a974ec0d8f4cdfe Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 29 Oct 2025 17:04:03 +0300
Subject: [PATCH 3850/6226] linux_5_15: 5.15.195 -> 5.15.196

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 810919fa130c..642c142548b5 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -10,8 +10,8 @@
         "lts": true
     },
     "5.15": {
-        "version": "5.15.195",
-        "hash": "sha256:0hd4p76qv29zlr0iik4j9y9qynyqisk6bgfiqcwkk7gr6bf81l13",
+        "version": "5.15.196",
+        "hash": "sha256:018ffzi91xh46l7r3fgc4mpri3pxzl6wc1n946vny0lbb59pj5c3",
         "lts": true
     },
     "5.10": {

From fce477159863fbb12c0a201f024785599b027094 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 29 Oct 2025 17:04:29 +0300
Subject: [PATCH 3851/6226] linux_5_10: 5.10.245 -> 5.10.246

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 642c142548b5..5dc249ac5b4c 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -15,8 +15,8 @@
         "lts": true
     },
     "5.10": {
-        "version": "5.10.245",
-        "hash": "sha256:17wxs8i8vd5ivv99ra0sri3wmkw5c22wsaw8nf1xcvys2kmpa7hk",
+        "version": "5.10.246",
+        "hash": "sha256:0xd8r8qqgxh3zhqkl4a5plmgsycxrffhpc9q2rwhkp6jd717cszb",
         "lts": true
     },
     "6.6": {

From d4154446708b7f630e2a2426d76ecb31eb985a41 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 29 Oct 2025 15:09:42 +0100
Subject: [PATCH 3852/6226] evcc: 0.209.3 -> 0.209.4

https://github.com/evcc-io/evcc/releases/tag/0.209.4
---
 pkgs/by-name/ev/evcc/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix
index 06032b701f10..a282bc4f5ec8 100644
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@@ -17,16 +17,16 @@
 }:
 
 let
-  version = "0.209.3";
+  version = "0.209.4";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     tag = version;
-    hash = "sha256-L3Rxp6p0iuEh06YHPKxK4//w2FPtLj6iy3qHk3hl9L8=";
+    hash = "sha256-MfTVLhU4AHvaQcJgdB7fQpY4C+wA0/VpeQ19gKnFTpI=";
   };
 
-  vendorHash = "sha256-T+5kbeKV0KWrKcTZzf7bcnoQUH5pRevj1JGZq3Z6/NM=";
+  vendorHash = "sha256-SVdoeioBtUa+V2n717ckYCQBFmYSXdi7ryRVfb9xKnY=";
 
   commonMeta = with lib; {
     license = licenses.mit;
@@ -52,7 +52,7 @@ buildGo125Module rec {
 
   npmDeps = fetchNpmDeps {
     inherit src;
-    hash = "sha256-WATWlCqTBY6vVMWpdyZ7Y/s0uI304TEC4gaKM2s5P/U=";
+    hash = "sha256-MiIRAceqdBAtrpityS9oPTbztffDpGcO0QclpFNYJLs=";
   };
 
   nativeBuildInputs = [

From 1c274bf581e6dc5b28a0ec33b4e7113e8ddb635c Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas.gerbet@enalean.com>
Date: Fri, 24 Oct 2025 17:44:29 +0200
Subject: [PATCH 3853/6226] zizmor: 1.15.2 -> 1.16.1

https://github.com/zizmorcore/zizmor/releases/tag/v1.16.0
https://github.com/zizmorcore/zizmor/releases/tag/v1.16.1
---
 pkgs/by-name/zi/zizmor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix
index 5fc7dbadb45d..9230b8efb36c 100644
--- a/pkgs/by-name/zi/zizmor/package.nix
+++ b/pkgs/by-name/zi/zizmor/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zizmor";
-  version = "1.15.2";
+  version = "1.16.1";
 
   src = fetchFromGitHub {
     owner = "zizmorcore";
     repo = "zizmor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-fl3Z4jgeqNxNjcdYQRt02oR7nDrYPN2dhzKeBium7Ug=";
+    hash = "sha256-B1FdgH8IKvcrynFENgpmwAZC/vbKfHVGvyV8bJMFh7k=";
   };
 
-  cargoHash = "sha256-4+1EURDrDYG4luaNV9KdRVojXY++H9LNNl2oINfWeLc=";
+  cargoHash = "sha256-1Mf1/ReLrwD/0TE/PhTicMW80oCehAuTy7taztwg6aE=";
 
   nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
     installShellFiles

From 55b5264f5e6e726b476c43939a42fd5878a04793 Mon Sep 17 00:00:00 2001
From: Zerodya <npagliuca2001@protonmail.com>
Date: Wed, 29 Oct 2025 15:28:44 +0100
Subject: [PATCH 3854/6226] maintainers: add zerodya

---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 52b6e7231b96..33faaa3cb7aa 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -28935,6 +28935,13 @@
     github = "zeri42";
     githubId = 68825133;
   };
+  zerodya = {
+    name = "Nicola";
+    email = "nicola.pagliuca@pm.me";
+    matrix = "@zerodya:beeper.com";
+    github = "Zerodya";
+    githubId = 73220426;
+  };
   zestsystem = {
     email = "mk337337@gmail.com";
     github = "zestsystem";

From 86a92e49c4aa81f737d18bae97953d9744af910e Mon Sep 17 00:00:00 2001
From: Zerodya <npagliuca2001@protonmail.com>
Date: Wed, 29 Oct 2025 15:29:15 +0100
Subject: [PATCH 3855/6226] hyprfreeze: init at 1.2.0

---
 pkgs/by-name/hy/hyprfreeze/package.nix | 58 ++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 pkgs/by-name/hy/hyprfreeze/package.nix

diff --git a/pkgs/by-name/hy/hyprfreeze/package.nix b/pkgs/by-name/hy/hyprfreeze/package.nix
new file mode 100644
index 000000000000..4a5b6638098a
--- /dev/null
+++ b/pkgs/by-name/hy/hyprfreeze/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  makeWrapper,
+  jq,
+  procps,
+  psmisc,
+  libnotify,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "hyprfreeze";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "Zerodya";
+    repo = "hyprfreeze";
+    tag = "v${version}";
+    hash = "sha256-omwAWBEnb14ZBux7bvXSJyi7FI1LZ5GaZFn46/bWJA4=";
+  };
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  installPhase = ''
+    runHook preInstall
+
+    install -Dm755 hyprfreeze $out/bin/hyprfreeze
+
+    # Install shell completions
+    install -Dm444 completions/bash/hyprfreeze $out/share/bash-completion/completions/hyprfreeze
+    install -Dm444 completions/zsh/_hyprfreeze $out/share/zsh/site-functions/_hyprfreeze
+    install -Dm444 completions/fish/hyprfreeze.fish $out/share/fish/completions/hyprfreeze.fish
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    wrapProgram $out/bin/hyprfreeze \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          jq
+          procps
+          psmisc
+          libnotify
+        ]
+      }
+  '';
+
+  meta = {
+    description = "Utility to suspend a game process (and other programs) in Hyprland";
+    homepage = "https://github.com/Zerodya/hyprfreeze";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ zerodya ];
+    platforms = lib.platforms.linux;
+    mainProgram = "hyprfreeze";
+  };
+}

From 1131be4703e0e063d1b23fceed65ed3ec1fd8d9a Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Tue, 28 Oct 2025 12:45:22 +0000
Subject: [PATCH 3856/6226] =?UTF-8?q?thanos:=200.39.2=20=E2=86=92=200.40.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/th/thanos/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/th/thanos/package.nix b/pkgs/by-name/th/thanos/package.nix
index 0e1205299f84..46c795f15f53 100644
--- a/pkgs/by-name/th/thanos/package.nix
+++ b/pkgs/by-name/th/thanos/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "thanos";
-  version = "0.39.2";
+  version = "0.40.1";
 
   src = fetchFromGitHub {
     owner = "thanos-io";
     repo = "thanos";
     tag = "v${version}";
-    hash = "sha256-yKw+HGlqEgQmydZ+PIk5y/z5H57nZ0dtw/kEh8079Ws=";
+    hash = "sha256-g0xvtBwPoX906xHdyOEUfudio/9MZhkzdBp5FcATRsM=";
   };
 
-  vendorHash = "sha256-6qTxCAD1hbS77erG1Z52JU2iOXAU+qtY3yivX+4bjlw=";
+  vendorHash = "sha256-ukKoiA7UhqDdMvAWYL5BGf6+FSPSkcRR/Scj5o/MMKc=";
 
   subPackages = "cmd/thanos";
 

From 21f06a08abcc4e00c6c9498dda2de474426cfce9 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Wed, 29 Oct 2025 15:39:38 +0100
Subject: [PATCH 3857/6226] typstyle: 0.13.18 -> 0.13.19

Changelog: https://github.com/typstyle-rs/typstyle/releases/tag/v0.13.19
Diff:
https://github.com/typstyle-rs/typstyle/compare/v0.13.18...v0.13.19
---
 pkgs/by-name/ty/typstyle/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix
index 2115346fa317..9ada6d87e258 100644
--- a/pkgs/by-name/ty/typstyle/package.nix
+++ b/pkgs/by-name/ty/typstyle/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "typstyle";
-  version = "0.13.18";
+  version = "0.13.19";
 
   src = fetchFromGitHub {
     owner = "typstyle-rs";
     repo = "typstyle";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sQZbk4XlhpFR4FUgD7Z0EoZVUMQaJQ2baTWbOp4I3QA=";
+    hash = "sha256-8gM20/dGe6VH36C2y0rcMV1aKT7aAxHhy4TigTKbCxM=";
   };
 
-  cargoHash = "sha256-anA7jJEK/Wr6trpc/6x2kExt8j9J3fxxgpWusQbbPaM=";
+  cargoHash = "sha256-CIU616FI26WtRceI/vZbaJgOm7532i0uzCzfhMz6plc=";
 
   # Disabling tests requiring network access
   checkFlags = [

From ee5376fb58a5eec26f9810a5702907af1db47b58 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Tue, 28 Oct 2025 12:46:58 +0000
Subject: [PATCH 3858/6226] thanos: Synchronize go build tags with upstream

https://github.com/thanos-io/thanos/issues/8543
---
 pkgs/by-name/th/thanos/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/th/thanos/package.nix b/pkgs/by-name/th/thanos/package.nix
index 46c795f15f53..48e32cec0779 100644
--- a/pkgs/by-name/th/thanos/package.nix
+++ b/pkgs/by-name/th/thanos/package.nix
@@ -24,6 +24,12 @@ buildGoModule rec {
 
   subPackages = "cmd/thanos";
 
+  # Verify in sync with https://github.com/thanos-io/thanos/blob/main/.promu.yml
+  tags = [
+    "netgo"
+    "slicelabels"
+  ];
+
   ldflags =
     let
       t = "github.com/prometheus/common/version";

From 0b27d9b07aaa39e66d4416975c25e96e374d72df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 29 Oct 2025 15:20:21 +0100
Subject: [PATCH 3859/6226] nixos/openvpn: fix eval

One usage of pkgs.openvpn was forgotten in the last PR and package
should be one more up. Upsi...
---
 nixos/modules/services/networking/openvpn.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/services/networking/openvpn.nix b/nixos/modules/services/networking/openvpn.nix
index c9dd6230c2e2..cea5b180a353 100644
--- a/nixos/modules/services/networking/openvpn.nix
+++ b/nixos/modules/services/networking/openvpn.nix
@@ -75,7 +75,7 @@ let
         pkgs.net-tools
       ];
 
-      serviceConfig.ExecStart = "@${cfg.package}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}";
+      serviceConfig.ExecStart = "@${config.services.openvpn.package}/sbin/openvpn openvpn --suppress-timestamps --config ${configFile}";
       serviceConfig.Restart = "always";
       serviceConfig.Type = "notify";
     };
@@ -102,6 +102,7 @@ in
   ###### interface
 
   options = {
+    services.openvpn.package = lib.mkPackageOption pkgs "openvpn" { };
 
     services.openvpn.servers = mkOption {
       default = { };
@@ -164,8 +165,6 @@ in
               '';
             };
 
-            package = lib.mkPackageOption pkgs "openvpn" { };
-
             up = mkOption {
               default = "";
               type = types.lines;
@@ -254,7 +253,7 @@ in
       ))
       // restartService;
 
-    environment.systemPackages = [ openvpn ];
+    environment.systemPackages = [ cfg.package ];
 
     boot.kernelModules = [ "tun" ];
 

From f7ddd33f3142b731dda207c4a5b05ef26ed81faa Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 29 Oct 2025 14:37:46 +0000
Subject: [PATCH 3860/6226] chhoto-url: 6.4.1 -> 6.5.0

Changelog: https://github.com/SinTan1729/chhoto-url/releases/tag/6.5.0
Diff: https://github.com/SinTan1729/chhoto-url/compare/6.4.1...6.5.0
---
 pkgs/by-name/ch/chhoto-url/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix
index d8f2319f06f8..a50ad7940424 100644
--- a/pkgs/by-name/ch/chhoto-url/package.nix
+++ b/pkgs/by-name/ch/chhoto-url/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "chhoto-url";
-  version = "6.4.1";
+  version = "6.5.0";
 
   src = fetchFromGitHub {
     owner = "SinTan1729";
     repo = "chhoto-url";
     tag = finalAttrs.version;
-    hash = "sha256-1XMZSQpZxkeIW7SLNl/crOYDz1QyWC/SUkFk+tgCQgg=";
+    hash = "sha256-/aOy2kurZRHbNlanQVobLpu/R9k/2iuNDqzD0TXLx8M=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/actix";
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
   '';
 
-  cargoHash = "sha256-kwZRGXaStcDiZOMMZrOWp6vD4JiwRa6r2e5b2cH1Fk4=";
+  cargoHash = "sha256-IxWA/mID3P6e16IoBb8qiFxOXQRdeAhlCcSEOIPz7UU=";
 
   postInstall = ''
     mkdir -p $out/share/chhoto-url

From 8b3b49716d90d53e5db851f7f0fff8d36ce95af3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 14:50:46 +0000
Subject: [PATCH 3861/6226] servo: 0.0.1-unstable-2025-10-26 ->
 0.0.1-unstable-2025-10-29

---
 pkgs/by-name/se/servo/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/se/servo/package.nix b/pkgs/by-name/se/servo/package.nix
index a6f2107f14ea..1a17596d64f5 100644
--- a/pkgs/by-name/se/servo/package.nix
+++ b/pkgs/by-name/se/servo/package.nix
@@ -66,13 +66,13 @@ in
 
 rustPlatform.buildRustPackage {
   pname = "servo";
-  version = "0.0.1-unstable-2025-10-26";
+  version = "0.0.1-unstable-2025-10-29";
 
   src = fetchFromGitHub {
     owner = "servo";
     repo = "servo";
-    rev = "504a8d819f207833240b90fe5d61e81ff9f5d82b";
-    hash = "sha256-mToBb9bcdUx7ZWQkax88SLqTS85lUNMGK1sYASWGt4o=";
+    rev = "32c0c41d118e55fda1ab9aa778c2a59fa27710e9";
+    hash = "sha256-kQbwqKTsW5gkEeHE7Yp/fbGObjUJnvOG/0U6RSZc7oU=";
     # Breaks reproducibility depending on whether the picked commit
     # has other ref-names or not, which may change over time, i.e. with
     # "ref-names: HEAD -> main" as long this commit is the branch HEAD
@@ -82,7 +82,7 @@ rustPlatform.buildRustPackage {
     '';
   };
 
-  cargoHash = "sha256-vyfiMsJlxt7dG9FeZ1XL6Qb7oma4pB+Aq7heaWKiyvY=";
+  cargoHash = "sha256-wwS4fhYG8pvmNLCgSO26yf65No7wL1Xrqm+38sP2pxM=";
 
   # set `HOME` to a temp dir for write access
   # Fix invalid option errors during linking (https://github.com/mozilla/nixpkgs-mozilla/commit/c72ff151a3e25f14182569679ed4cd22ef352328)

From a199e685955e72f4526556e4cf1cbc6dc0ed15e8 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 22 Oct 2025 10:23:39 -0700
Subject: [PATCH 3862/6226] python3Packages.curl-cffi: 0.12.0 -> 0.13.0

https://github.com/lexiforest/curl_cffi/compare/v0.12.0...v0.13.0
---
 .../python-modules/curl-cffi/default.nix       | 18 +++++++++---------
 .../curl-cffi/use-system-libs.patch            |  6 ++----
 2 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/curl-cffi/default.nix b/pkgs/development/python-modules/curl-cffi/default.nix
index 79db35a65e95..ac1eb455aa11 100644
--- a/pkgs/development/python-modules/curl-cffi/default.nix
+++ b/pkgs/development/python-modules/curl-cffi/default.nix
@@ -4,6 +4,7 @@
   buildPythonPackage,
   fetchFromGitHub,
   setuptools,
+  addBinToPathHook,
   curl-impersonate-chrome,
   cffi,
   certifi,
@@ -24,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "curl-cffi";
-  version = "0.12.0";
+  version = "0.14.0b2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lexiforest";
     repo = "curl_cffi";
     tag = "v${version}";
-    hash = "sha256-VE/b1Cs/wpZlu7lOURT/QfP7DuNudD441zG603LT4LM=";
+    hash = "sha256-JXfqZTf26kl2P0OMAw/aTdjQaGtdyTpNnhRPlwMiZNw=";
   };
 
   patches = [ ./use-system-libs.patch ];
@@ -47,13 +48,10 @@ buildPythonPackage rec {
     certifi
   ];
 
-  env = lib.optionalAttrs stdenv.cc.isGNU {
-    NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
-  };
-
   pythonImportsCheck = [ "curl_cffi" ];
 
   nativeCheckInputs = [
+    addBinToPathHook
     charset-normalizer
     cryptography
     fastapi
@@ -81,6 +79,8 @@ buildPythonPackage rec {
   disabledTestPaths = [
     # test accesses network
     "tests/unittest/test_smoke.py::test_async"
+    # Runs out of memory while testing
+    "tests/unittest/test_websockets.py"
   ];
 
   disabledTests = [
@@ -97,11 +97,11 @@ buildPythonPackage rec {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     changelog = "https://github.com/lexiforest/curl_cffi/releases/tag/${src.tag}";
     description = "Python binding for curl-impersonate via cffi";
     homepage = "https://curl-cffi.readthedocs.io";
-    license = licenses.mit;
-    maintainers = with maintainers; [ chuangzhu ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ chuangzhu ];
   };
 }
diff --git a/pkgs/development/python-modules/curl-cffi/use-system-libs.patch b/pkgs/development/python-modules/curl-cffi/use-system-libs.patch
index 3dcec2e14c7c..6d30a47f0382 100644
--- a/pkgs/development/python-modules/curl-cffi/use-system-libs.patch
+++ b/pkgs/development/python-modules/curl-cffi/use-system-libs.patch
@@ -1,8 +1,6 @@
-diff --git a/scripts/build.py b/scripts/build.py
-index b705a0d..9bfcaab 100644
 --- a/scripts/build.py
 +++ b/scripts/build.py
-@@ -105,7 +105,6 @@ def get_curl_libraries():
+@@ -141,7 +141,6 @@ def get_curl_libraries():
  ffibuilder = FFI()
  system = platform.system()
  root_dir = Path(__file__).parent.parent
@@ -10,7 +8,7 @@ index b705a0d..9bfcaab 100644
  
  
  ffibuilder.set_source(
-@@ -114,9 +113,7 @@ ffibuilder.set_source(
+@@ -150,9 +149,7 @@ ffibuilder.set_source(
          #include "shim.h"
      """,
      # FIXME from `curl-impersonate`

From d84e517ee753041c4109ddc4b5c84da9f5d86d45 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 15:02:52 +0000
Subject: [PATCH 3863/6226] python3Packages.ttn-client: 1.2.2 -> 1.2.3

---
 pkgs/development/python-modules/ttn-client/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ttn-client/default.nix b/pkgs/development/python-modules/ttn-client/default.nix
index c2628967ccc5..a23d6b02e47c 100644
--- a/pkgs/development/python-modules/ttn-client/default.nix
+++ b/pkgs/development/python-modules/ttn-client/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "ttn-client";
-  version = "1.2.2";
+  version = "1.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "angelnu";
     repo = "thethingsnetwork_python_client";
     tag = "v${version}";
-    hash = "sha256-B3AN0VqMhQoqqPjUf/JTWYdyVQVXt+QsBbqsooDsuDE=";
+    hash = "sha256-PEkxEKet0nrowWJ4J3AqqqdecO4zSbTampz/Dx0QD2s=";
   };
 
   build-system = [ hatchling ];

From eb4cb69e641e1528dcd1cba2056c2b56c7d48a2e Mon Sep 17 00:00:00 2001
From: meck <Johan@meck.se>
Date: Wed, 29 Oct 2025 16:18:10 +0100
Subject: [PATCH 3864/6226] USWM: Add option to pass args to the compositor

As this is not possible with the binPath
https://github.com/Vladimir-csp/uwsm?tab=readme-ov-file#syntax-and-behavior
---
 nixos/modules/programs/wayland/uwsm.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/programs/wayland/uwsm.nix b/nixos/modules/programs/wayland/uwsm.nix
index cbabccb5d9c9..ee61c2ebad3e 100644
--- a/nixos/modules/programs/wayland/uwsm.nix
+++ b/nixos/modules/programs/wayland/uwsm.nix
@@ -16,7 +16,7 @@ let
         [Desktop Entry]
         Name=${opts.prettyName} (UWSM)
         Comment=${opts.comment}
-        Exec=${lib.getExe cfg.package} start -F ${opts.binPath}
+        Exec=${lib.getExe cfg.package} start -F -- ${opts.binPath} ${lib.strings.escapeShellArgs opts.extraArgs}
         Type=Application
       '';
       destination = "/share/wayland-sessions/${opts.name}-uwsm.desktop";
@@ -84,6 +84,13 @@ in
                 '';
                 example = "/run/current-system/sw/bin/ExampleCompositor";
               };
+              extraArgs = lib.mkOption {
+                type = with lib.types; listOf str;
+                default = [ ];
+                description = ''
+                  Extra command-line arguments pass to to the compsitor.
+                '';
+              };
             };
           }
         )
@@ -117,7 +124,12 @@ in
         name: value:
         mk_uwsm_desktop_entry {
           inherit name;
-          inherit (value) prettyName comment binPath;
+          inherit (value)
+            prettyName
+            comment
+            binPath
+            extraArgs
+            ;
         }
       ) cfg.waylandCompositors;
     };

From 635d86e872b68d826953ba19d2e5b4c235d390b9 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 29 Oct 2025 12:10:42 -0300
Subject: [PATCH 3865/6226] gensgs: drop

---
 .../emulators/gens-gs/default.nix             | 46 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 1 insertion(+), 48 deletions(-)
 delete mode 100644 pkgs/applications/emulators/gens-gs/default.nix

diff --git a/pkgs/applications/emulators/gens-gs/default.nix b/pkgs/applications/emulators/gens-gs/default.nix
deleted file mode 100644
index c2b4751b5adb..000000000000
--- a/pkgs/applications/emulators/gens-gs/default.nix
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pkg-config,
-  gtk2,
-  SDL,
-  nasm,
-  zlib,
-  libpng,
-  libGLU,
-  libGL,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "gens-gs";
-  version = "7";
-
-  src = fetchurl {
-    url = "http://retrocdn.net/images/6/6d/Gens-gs-r${version}.tar.gz";
-    sha256 = "1ha5s6d3y7s9aq9f4zmn9p88109c3mrj36z2w68jhiw5xrxws833";
-  };
-
-  nativeBuildInputs = [ pkg-config ];
-  buildInputs = [
-    gtk2
-    SDL
-    nasm
-    zlib
-    libpng
-    libGLU
-    libGL
-  ];
-
-  # Work around build failures on recent GTK.
-  # See http://ubuntuforums.org/showthread.php?p=10535837
-  env.NIX_CFLAGS_COMPILE = "-UGTK_DISABLE_DEPRECATED -UGSEAL_ENABLE";
-
-  meta = with lib; {
-    homepage = "https://segaretro.org/Gens/GS";
-    description = "Genesis/Mega Drive emulator";
-    platforms = [ "i686-linux" ];
-    license = licenses.gpl2Plus;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index fc47f1566450..b01b5778cd1f 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -601,6 +601,7 @@ mapAliases {
   gdc11 = throw "gdc11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gdc = throw "gdc has been removed from Nixpkgs, as recent versions require complex bootstrapping"; # Added 2025-08-08
   gdmd = throw "gdmd has been removed from Nixpkgs, as it depends on GDC which was removed"; # Added 2025-08-08
+  gensgs = throw "gensgs has been removed as it was unmaintained, abandoned upstream since 2009 and relied on gtk2"; # Added 2025-10-29
   geos_3_9 = throw "geos_3_9 has been removed from nixpkgs. Please use a more recent 'geos' instead."; # Added 2025-09-21
   gfortran9 = throw "gfortran9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gfortran10 = throw "gfortran10 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f38323f85cb8..4830380ac5be 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1326,8 +1326,6 @@ with pkgs;
 
   gcdemu = callPackage ../applications/emulators/cdemu/gui.nix { };
 
-  gensgs = pkgsi686Linux.callPackage ../applications/emulators/gens-gs { };
-
   goldberg-emu = callPackage ../applications/emulators/goldberg-emu {
     protobuf = protobuf_21;
   };

From 7234d45eb6c6666e4a3ddb4ef161771b8adc2804 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Wed, 29 Oct 2025 16:23:34 +0100
Subject: [PATCH 3866/6226] fastd-exporter: init at 0-unstable-2024-04-09

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/fa/fastd-exporter/package.nix | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/fa/fastd-exporter/package.nix

diff --git a/pkgs/by-name/fa/fastd-exporter/package.nix b/pkgs/by-name/fa/fastd-exporter/package.nix
new file mode 100644
index 000000000000..229bb7ee2caf
--- /dev/null
+++ b/pkgs/by-name/fa/fastd-exporter/package.nix
@@ -0,0 +1,35 @@
+{
+  buildGoModule,
+  fetchFromGitHub,
+  lib,
+}:
+
+buildGoModule {
+  pname = "fastd-exporter";
+  version = "0-unstable-2024-04-09";
+
+  src = fetchFromGitHub {
+    owner = "freifunk-darmstadt";
+    repo = "fastd-exporter";
+    rev = "374e4334af6661f4c91a3e83bf7ce071a2a72eca";
+    sha256 = "sha256-0oU4+9G19XP5qtGdcfMz08T04hjcoXX/O+FkaUPxzXE=";
+  };
+
+  vendorHash = "sha256-r0W64dct6XWa9sIrzy0UdyoMw+kAq73Qc/QchmsYZkY=";
+
+  ldflags = [
+    "-s"
+    "-w"
+  ];
+
+  meta = {
+    description = "Prometheus exporter for fastd";
+    homepage = "https://github.com/freifunk-darmstadt/fastd-exporter";
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    mainProgram = "fastd-exporter";
+    maintainers = with lib.maintainers; [
+      felixsinger
+    ];
+  };
+}

From e14ef4809f9e88d688b509445c10a1f2709aaf6a Mon Sep 17 00:00:00 2001
From: Daniel Fahey <daniel.fahey@pm.me>
Date: Wed, 29 Oct 2025 15:41:47 +0000
Subject: [PATCH 3867/6226] protonmail-bridge-gui: add Qt 6.10 compatibility
 patches

Fixes https://github.com/NixOS/nixpkgs/issues/456408
---
 .../pr/protonmail-bridge-gui/package.nix       | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/pr/protonmail-bridge-gui/package.nix b/pkgs/by-name/pr/protonmail-bridge-gui/package.nix
index d8d87b4909b2..483c09a3210e 100644
--- a/pkgs/by-name/pr/protonmail-bridge-gui/package.nix
+++ b/pkgs/by-name/pr/protonmail-bridge-gui/package.nix
@@ -12,8 +12,12 @@
   gtest,
   sentry-native,
   protonmail-bridge,
+  fetchpatch2,
 }:
 
+let
+  guiSourcePath = "internal/frontend/bridge-gui";
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "protonmail-bridge-gui";
 
@@ -22,6 +26,18 @@ stdenv.mkDerivation (finalAttrs: {
   patches = [
     # Use `gtest` from Nixpkgs to allow an offline build
     ./use-nix-googletest.patch
+    # fix: qt6_generate_deploy_app_script deprecated keyword
+    (fetchpatch2 {
+      url = "https://github.com/daniel-fahey/proton-bridge/commit/9b282369523ce2aabcf95369a2ed3867efb5a4ac.patch?full_index=1";
+      relative = guiSourcePath;
+      hash = "sha256-CGBelsplAqLI+6GtDR+VELfVsLoHPN0324gfZ3obKpI=";
+    })
+    # fix: make libQt6WaylandEglClientHwIntegration conditional for Qt 6.10
+    (fetchpatch2 {
+      url = "https://github.com/daniel-fahey/proton-bridge/commit/7823fe4904186253798fc633724988d43dd642e0.patch?full_index=1";
+      relative = guiSourcePath;
+      hash = "sha256-2heMfZdXLL8/uyM0jZ860Jw76c+gHtc0G6pWmIRCONY=";
+    })
   ];
 
   nativeBuildInputs = [
@@ -44,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
     sentry-native
   ];
 
-  sourceRoot = "${finalAttrs.src.name}/internal/frontend/bridge-gui";
+  sourceRoot = "${finalAttrs.src.name}/${guiSourcePath}";
 
   postPatch = ''
     # Bypass `vcpkg` by deleting lines that `include` BridgeSetup.cmake

From a2b8a0eea00691627247c47c37913a3ad58f5047 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Wed, 29 Oct 2025 16:46:25 +0100
Subject: [PATCH 3868/6226] typstyle: 0.13.19 -> 0.14.0

Changelog: https://github.com/typstyle-rs/typstyle/releases/tag/v0.14.0
Diff: https://github.com/typstyle-rs/typstyle/compare/v0.13.19...v0.14.0
---
 pkgs/by-name/ty/typstyle/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/typstyle/package.nix b/pkgs/by-name/ty/typstyle/package.nix
index 9ada6d87e258..4c132b3d4e6e 100644
--- a/pkgs/by-name/ty/typstyle/package.nix
+++ b/pkgs/by-name/ty/typstyle/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "typstyle";
-  version = "0.13.19";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "typstyle-rs";
     repo = "typstyle";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8gM20/dGe6VH36C2y0rcMV1aKT7aAxHhy4TigTKbCxM=";
+    hash = "sha256-L6MmXipkpTfSvSzuUmE6/hUqDoLbe3+2/bHgFbTfLpo=";
   };
 
-  cargoHash = "sha256-CIU616FI26WtRceI/vZbaJgOm7532i0uzCzfhMz6plc=";
+  cargoHash = "sha256-xGGuZw87CjS/tA74SiIyMqM6PS0OJt00axiI3jyAAr0=";
 
   # Disabling tests requiring network access
   checkFlags = [

From d7fcbadf7eb88edd01eeed1e33aa3bffefb9e0cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 15:52:44 +0000
Subject: [PATCH 3869/6226] auto-editor: 29.2.0 -> 29.3.0

---
 pkgs/by-name/au/auto-editor/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/au/auto-editor/package.nix b/pkgs/by-name/au/auto-editor/package.nix
index 546eb42a631d..ab70b3430e0e 100644
--- a/pkgs/by-name/au/auto-editor/package.nix
+++ b/pkgs/by-name/au/auto-editor/package.nix
@@ -25,13 +25,13 @@
 
 buildNimPackage rec {
   pname = "auto-editor";
-  version = "29.2.0";
+  version = "29.3.0";
 
   src = fetchFromGitHub {
     owner = "WyattBlue";
     repo = "auto-editor";
     tag = version;
-    hash = "sha256-2EpdrFGkeISiCnwtBMFikfWOzEdHO/ut2NbVbIAutdk=";
+    hash = "sha256-xftXeUu1Weia4WHUVy7Q20w9TRvXSjEHVw4rZ7C2M0U=";
   };
 
   lockFile = ./lock.json;

From df9fce6aea2403b7dadab6462efe4671790fb52d Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Sun, 24 Nov 2024 02:30:31 +0800
Subject: [PATCH 3870/6226] fcitx5-inflex-themes: init at 0-unstable-2024-11-11

---
 .../fc/fcitx5-inflex-themes/package.nix       | 38 +++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 pkgs/by-name/fc/fcitx5-inflex-themes/package.nix

diff --git a/pkgs/by-name/fc/fcitx5-inflex-themes/package.nix b/pkgs/by-name/fc/fcitx5-inflex-themes/package.nix
new file mode 100644
index 000000000000..160fd36f2294
--- /dev/null
+++ b/pkgs/by-name/fc/fcitx5-inflex-themes/package.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  jdupes,
+}:
+
+stdenvNoCC.mkDerivation {
+  pname = "fcitx5-inflex-themes";
+  version = "0-unstable-2024-11-11";
+
+  src = fetchFromGitHub {
+    owner = "sanweiya";
+    repo = "fcitx5-inflex-themes";
+    rev = "86d0a36eae2145de38d9c8bcfcb59f3b5ab6cb37";
+    hash = "sha256-YyToQdVieRepGeW1CRBFH9VO7CtO8r7xCO9/79V+vlA=";
+  };
+
+  nativeBuildInputs = [ jdupes ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/fcitx5/themes
+    cp -r *inflex* $out/share/fcitx5/themes
+    jdupes --quiet --link-soft --recurse $out/share
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Aesthetic, modern fcitx5 theme featuring sharp-edged rectangle design";
+    homepage = "https://github.com/sanweiya/fcitx5-inflex-themes";
+    license = lib.licenses.bsd2;
+    platforms = lib.platforms.all;
+    maintainers = with lib.maintainers; [ Guanran928 ];
+  };
+}

From 94c9beebbfa424a327c2ffdc0205c8d7914dcf32 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Wed, 29 Oct 2025 06:23:02 +0100
Subject: [PATCH 3871/6226] chromium,chromedriver: 141.0.7390.122 ->
 142.0.7444.59

https://developer.chrome.com/blog/new-in-chrome-142

https://developer.chrome.com/release-notes/142

https://chromereleases.googleblog.com/2025/10/stable-channel-update-for-desktop_28.html

This update includes 20 security fixes.

CVEs:
CVE-2025-12428 CVE-2025-12429 CVE-2025-12430 CVE-2025-12431
CVE-2025-12432 CVE-2025-12433 CVE-2025-12036 CVE-2025-12434
CVE-2025-12435 CVE-2025-12436 CVE-2025-12437 CVE-2025-12438
CVE-2025-12439 CVE-2025-12440 CVE-2025-12441 CVE-2025-12443
CVE-2025-12444 CVE-2025-12445 CVE-2025-12446 CVE-2025-12447
---
 .../networking/browsers/chromium/common.nix   |  61 +++-
 .../networking/browsers/chromium/info.json    | 275 +++++++++---------
 ...mium-142-crabbyavif-rust-no_sanitize.patch |  48 +++
 3 files changed, 247 insertions(+), 137 deletions(-)
 create mode 100644 pkgs/applications/networking/browsers/chromium/patches/chromium-142-crabbyavif-rust-no_sanitize.patch

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index e9ffcd726d0e..af42d74b4214 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -467,10 +467,13 @@ let
       # Chromium reads initial_preferences from its own executable directory
       # This patch modifies it to read /etc/chromium/initial_preferences
       ./patches/chromium-initial-prefs.patch
+    ]
+    ++ lib.optionals (!chromiumVersionAtLeast "142") [
       # https://github.com/chromium/chromium/commit/02b6456643700771597c00741937e22068b0f956
       # https://github.com/chromium/chromium/commit/69736ffe943ff996d4a88d15eb30103a8c854e29
       # Rebased variant of patch to build M126+ with LLVM 17.
       # staging-next will bump LLVM to 18, so we will be able to drop this soon.
+      # Started failing to apply with M142, but this is no longer needed anyway.
       ./patches/chromium-126-llvm-17.patch
     ]
     ++ lib.optionals (!chromiumVersionAtLeast "140") [
@@ -529,7 +532,7 @@ let
       # electron 35 (M134) and 36 (M136)
       ./patches/chromium-134-rust-1.86-mismatched_lifetime_syntaxes.patch
     ]
-    ++ lib.optionals (chromiumVersionAtLeast "141") [
+    ++ lib.optionals (versionRange "141" "142") [
       (fetchpatch {
         # Fix "invalid application of 'sizeof' to an incomplete type 'blink::CSSStyleSheet'"
         # by reverting https://chromium-review.googlesource.com/c/chromium/src/+/6892157
@@ -539,6 +542,49 @@ let
         revert = true;
         hash = "sha256-pnEus2NHpNWZ6ZSXLgdTn+it7oy1MPZPbD8SOAKLWbw=";
       })
+    ]
+    ++ lib.optionals (chromiumVersionAtLeast "142" && lib.versionOlder rustcVersion "1.90") [
+      (fetchpatch {
+        # Fix "ld.lld: error: undefined symbol: __rustc::__rust_alloc_error_handler_should_panic'"
+        # with Rust < 1.90 by reverting https://chromium-review.googlesource.com/c/chromium/src/+/6935385
+        name = "chromium-142-Revert-rust-Remove-the-old-__rust_alloc_error_handler_should_panic-symbol.patch";
+        url = "https://chromium.googlesource.com/chromium/src/+/e33287758f2234d6aabfc5d4e011c4e81e3a47cf^!?format=TEXT";
+        decode = "base64 -d";
+        revert = true;
+        hash = "sha256-0vRDz7wwGCsqm38fVvkLLzOOtEtd8CnqyjDLgGofh/o=";
+      })
+    ]
+    ++ lib.optionals (versionRange "142" "143") [
+      (fetchpatch {
+        # Fix https://issues.chromium.org/issues/450752866 by backporting
+        # https://chromium-review.googlesource.com/c/chromium/src/+/7030724 from M143
+        name = "chromium-142-Backport-Add-missing-include-for-FormFieldData-type-completeness.patch";
+        url = "https://chromium.googlesource.com/chromium/src/+/069d424e41f42c6f4a4551334eafc7cfaed6e880^!?format=TEXT";
+        decode = "base64 -d";
+        hash = "sha256-0ueOCHYheSFHRFzEat3TDhnU3Avf0TcNBBBpTkz+saw=";
+      })
+    ]
+    ++ lib.optionals (chromiumVersionAtLeast "142" && lib.versionOlder rustcVersion "1.91") [
+      # Fix the following error when compiling CrabbyAvif with Rust < 1.91 due to
+      # https://github.com/rust-lang/rust/pull/142681 by reverting
+      # https://github.com/webmproject/CrabbyAvif/pull/663 and
+      # https://github.com/webmproject/CrabbyAvif/pull/654 and
+      # https://chromium-review.googlesource.com/c/chromium/src/+/6960510
+      #
+      #  error: cannot find attribute `sanitize` in this scope
+      #    --> ../../third_party/crabbyavif/src/src/capi/io.rs:210:41
+      #      |
+      #  210 |     #[cfg_attr(feature = "disable_cfi", sanitize(cfi = "off"))]
+      #      |                                         ^^^^^^^^
+      #
+      ./patches/chromium-142-crabbyavif-rust-no_sanitize.patch
+      (fetchpatch {
+        name = "chromium-142-crabbyavif-Revert-Enable-disable_cfi-feature.patch";
+        url = "https://chromium.googlesource.com/chromium/src/+/9415f40bc6f853547f791e633be638c71368ce56^!?format=TEXT";
+        decode = "base64 -d";
+        revert = true;
+        hash = "sha256-bYcJqPMbE7hMvhZVnzqHok1crUAdqrzqxr+4IHNzAtg=";
+      })
     ];
 
     postPatch =
@@ -568,7 +614,9 @@ let
         /* Generated by lastchange.py, do not edit.*/
         #ifndef SKIA_EXT_SKIA_COMMIT_HASH_H_
         #define SKIA_EXT_SKIA_COMMIT_HASH_H_
-        #define SKIA_COMMIT_HASH "${upstream-info.DEPS."src/third_party/skia".rev}-"
+        #define SKIA_COMMIT_HASH "${upstream-info.DEPS."src/third_party/skia".rev}${
+          lib.optionalString (!chromiumVersionAtLeast "142") "-"
+        }"
         #endif  // SKIA_EXT_SKIA_COMMIT_HASH_H_
         EOF
 
@@ -576,6 +624,15 @@ let
 
         mkdir -p third_party/jdk/current/bin
       ''
+      + lib.optionalString (chromiumVersionAtLeast "142") ''
+        cat << EOF > gpu/webgpu/dawn_commit_hash.h
+        /* Generated by lastchange.py, do not edit.*/
+        #ifndef GPU_WEBGPU_DAWN_COMMIT_HASH_H_
+        #define GPU_WEBGPU_DAWN_COMMIT_HASH_H_
+        #define DAWN_COMMIT_HASH "${upstream-info.DEPS."src/third_party/dawn".rev}"
+        #endif  // GPU_WEBGPU_DAWN_COMMIT_HASH_H_
+        EOF
+      ''
       + ''
         # Workaround/fix for https://bugs.chromium.org/p/chromium/issues/detail?id=1313361:
         substituteInPlace BUILD.gn \
diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 3ce8d2d65f6e..dae78c01133a 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,28 +1,28 @@
 {
   "chromium": {
-    "version": "141.0.7390.122",
+    "version": "142.0.7444.59",
     "chromedriver": {
-      "version": "141.0.7390.123",
-      "hash_darwin": "sha256-grFBdZXToIZiHOrKs3EkVcl3+Bpj4tbui63oUstkpT4=",
-      "hash_darwin_aarch64": "sha256-Da3LogG0JRRI9iuTw4vWUh9CGCnicMzIDea641teQII="
+      "version": "142.0.7444.60",
+      "hash_darwin": "sha256-5Atr7h0jIneU4VbSF20j+3tcYVneYvqOsJ0GG8sD7r4=",
+      "hash_darwin_aarch64": "sha256-sh2BTEKJaAYbiuNYiSW6iChiCroo95EHoGqxVgX6Jw0="
     },
     "deps": {
       "depot_tools": {
-        "rev": "3f41e54ae17d53d4a39feecad64c3d3e6871b219",
-        "hash": "sha256-ow0L+KQuUTsz29yfO1qvqPu4XVgdoUe+yexMPi7POoA="
+        "rev": "675a3a9ccd7cf9367bb4caa58c30f08b56d45ef5",
+        "hash": "sha256-oL/WjK90HWqtyE0sJhDUp3UxlC8jr4dZfp+Q80xu3sM="
       },
       "gn": {
-        "version": "0-unstable-2025-08-29",
-        "rev": "5d0a4153b0bcc86c5a23310d5b648a587be3c56d",
-        "hash": "sha256-WERLGrReUATmn3RhxtmyZcJBxdIY/WZqBDranCLDYEg="
+        "version": "0-unstable-2025-09-18",
+        "rev": "81b24e01531ecf0eff12ec9359a555ec3944ec4e",
+        "hash": "sha256-sm5GWbkm3ua7EkCWTuY4TG6EXKe3asXTrH1APnNARJQ="
       },
       "npmHash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "b477534e7e10d193e916cd4e2967c589383625b2",
-        "hash": "sha256-3sVHRzERwlLzXl2qSn2Lil4U4d6N63MUOomSUrjy2YY=",
+        "rev": "4b8153ab58d3c3f4c9f7e4baad9616ecf80db5fa",
+        "hash": "sha256-RZQD9aL/YglC8chM7tqtB1Y2u6DF+6kkgwklUohaBXc=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -32,28 +32,28 @@
       },
       "src/third_party/compiler-rt/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
-        "rev": "d1877a8622be9c5a692dc5ed9ea5a54a78c9360e",
-        "hash": "sha256-Vtz6Xj4ktP/8q2QDVt2bQnwkz7eDKuPx9KswagxgqmY="
+        "rev": "05f2a5dd0d1386777ae9d7fac9da776f82e7e0f2",
+        "hash": "sha256-XTPhIXHzTW4EjyER/49mKJVDQQVNGuyLu2OBAxSt+CQ="
       },
       "src/third_party/libc++/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "9ce37ed6b68eda96a67199e6564ceb958ad4b37e",
-        "hash": "sha256-2URJyICEyBwIXJRDkJt1B27DXq6nLZTCbW7dD8MBQk0="
+        "rev": "b77132b512d5411f8393fd3decb3abaeaf1d3ec8",
+        "hash": "sha256-IemCFOw1X+Kcna6cuj9e29FUhitqvVGn1DeMCShkbOs="
       },
       "src/third_party/libc++abi/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "f7f5a32b3e9582092d8a4511acec036a09ae8524",
-        "hash": "sha256-8hqb7ZtY3PAC8R9S0KTay79xlD8QBKjy0ZR5oUVr4p0="
+        "rev": "864f61dc9253d56586ada34c388278565ef513f6",
+        "hash": "sha256-7TUY05CW5OCyd1C1oq69rptr1RkvOMS+1CAJc7yKRFQ="
       },
       "src/third_party/libunwind/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "92fb77dfd4d86aa120730359f5e4d6bb47f1c129",
-        "hash": "sha256-n7U+CKQ839Oa35JpygygPUhk9JqWIyafJRj0jYSMlwg="
+        "rev": "322be580a5a193a921c349a15747eeeb9a716ad1",
+        "hash": "sha256-veSxr/ICnBsdP+3vWjCbPxduHiEzbT0DUdwfo0xcM30="
       },
       "src/third_party/llvm-libc/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "46f8689c0b3999bd4b3a60adef01ceb3d8c0071f",
-        "hash": "sha256-qItKSIS5p4iIN+iSXgXYbFXq1CFFgwQV5NCQxunl0Zg="
+        "rev": "0c61a55402c6a0d9d6ca2aeb3c6a2613a8bc8c55",
+        "hash": "sha256-U/ToyQwIzZlaPic6LAnR17ySrZ6eGhReJ6iKVFrIHPg="
       },
       "src/chrome/test/data/perf/canvas_bench": {
         "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -72,8 +72,8 @@
       },
       "src/docs/website": {
         "url": "https://chromium.googlesource.com/website.git",
-        "rev": "c6edf98e7fab2385c90caac6211f00b62e9b773d",
-        "hash": "sha256-i08iEbbV+RAvSQKxWutCSjpZkfcbTQdRUZkgtPZfLck="
+        "rev": "3913dbd6fdde06b914d0e1119fcc884f8115e4f8",
+        "hash": "sha256-+2OBUpLLVPB/fDlF/9mEwTsvH2Una3ZYKUJY06nZauo="
       },
       "src/media/cdm/api": {
         "url": "https://chromium.googlesource.com/chromium/cdm.git",
@@ -82,8 +82,8 @@
       },
       "src/net/third_party/quiche/src": {
         "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "62826931e84c49c94192065c896931576d8273c8",
-        "hash": "sha256-YZFFKQKFyJUvrfG1bm84Hl3AGOkSgpqefwY5mHh1O0A="
+        "rev": "c0df0d316bd7e4ddf44e5ba094b5c5b061d94b0c",
+        "hash": "sha256-ACXkivQ4tqePgNIg2hpl4DQFa8n0CUkCOqPlgh56oLs="
       },
       "src/testing/libfuzzer/fuzzers/wasm_corpus": {
         "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -92,8 +92,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "bb55ea10fcef3759e4db7ef8a473a9ceac2c6aa6",
-        "hash": "sha256-NIy3fOwfheHeGo0MX8tmZbaGMBwqM5+k7cCypeoS6GI="
+        "rev": "e5b338502c7c65bd38d4695bc557938ca4cc3aa7",
+        "hash": "sha256-FWPyOxpsXvFtOD6OJ950NQUBcpVIeYvjuAKaqnER6A0="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -107,13 +107,13 @@
       },
       "src/third_party/angle/third_party/VK-GL-CTS/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "15469c3d00394c8c365d1b1951fcf6255c589afb",
-        "hash": "sha256-Bd/Q181NBMJkLwkEmttNvjNBQqtRRT7p+nbevqvt2HI="
+        "rev": "c67cffddd65aba724950e062343fa1cc89560b33",
+        "hash": "sha256-VYROUPvcpkV+skw3RKXoCpB+4xVA2Qem+15YKjV7pMg="
       },
       "src/third_party/anonymous_tokens/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
-        "rev": "50b2ee441f1c3bad73ab7430c41fd1ea5a7a06a6",
-        "hash": "sha256-NiqQy4CEK8qWb2khi4zTSb3fAf3n9LvBsmceSeyQ+Q0="
+        "rev": "50e04fb27eacd49a5e2bfde5977ac689e13ebeeb",
+        "hash": "sha256-jwfszvnWRtTmzPm5x/lyceX1Y0G0hyIATcKlYkKj/SY="
       },
       "src/third_party/readability/src": {
         "url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git",
@@ -132,8 +132,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "9caf49389e5e0564d18e0504c6cfa45c88b4e4fd",
-        "hash": "sha256-d6WHeELxGtZ7nZzHIm18QaHY+2sc8KSRJgdH+vTuWN8="
+        "rev": "cee9cb0d67e749bf42f5e90cb3b8a6f525dbb920",
+        "hash": "sha256-loKRLJfTxBxlTbPVWZqGdx0DyPvEopbs2zIf4gaxoLo="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -142,8 +142,8 @@
       },
       "src/third_party/dawn/third_party/dxc": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "4e0f5364a3692f4122de0874ebb0f5550a27c867",
-        "hash": "sha256-ocnWUgw3rBYTsKS7j+Zq6hTGhhB4VRgifASMqBO66Os="
+        "rev": "2b58d6d865832f7146d6e22e2106e562458bbd0a",
+        "hash": "sha256-kcmuSCdAAzyQrg33b3dlkUErd0x5TDZkE8iXMEYW8wo="
       },
       "src/third_party/dawn/third_party/dxheaders": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -162,33 +162,38 @@
       },
       "src/third_party/dawn/third_party/webgpu-cts": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "0558b1933531e6379ac5875129b92aac9d1ce035",
-        "hash": "sha256-247bXbblup/bg+iWeIwlUxLinvvQK5hX+Jm0jKiaEbM="
+        "rev": "18f1cc77dea7254258eeee21839d1c249b506576",
+        "hash": "sha256-lZgUbs1+6+tLeHmJTIWMbpT6oSVzC3A9/J3vKONgxSs="
       },
       "src/third_party/dawn/third_party/webgpu-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
-        "rev": "c8b371dd2ff8a2b028fdc0206af5958521181ba8",
-        "hash": "sha256-rHDN4ln5kTMzabW427Xktl93E+8EVhWa2i8n4Mh2BgQ="
+        "rev": "53a87a3d8cb4c32ec026978ce003020741df6f53",
+        "hash": "sha256-V/JhZyjLNSElllXbLduqyNjJqjrxB4SwwPpRHIcfIis="
       },
       "src/third_party/highway/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
-        "rev": "00fe003dac355b979f36157f9407c7c46448958e",
-        "hash": "sha256-IS7m1wBwpPBUNhx2GttY1fzvmLIeAp3o2gXfrFpRdvY="
+        "rev": "84379d1c73de9681b54fbe1c035a23c7bd5d272d",
+        "hash": "sha256-HNrlqtAs1vKCoSJ5TASs34XhzjEbLW+ISco1NQON+BI="
       },
       "src/third_party/google_benchmark/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git",
         "rev": "761305ec3b33abf30e08d50eb829e19a802581cc",
         "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w="
       },
+      "src/third_party/libpfm4/src": {
+        "url": "https://chromium.googlesource.com/external/git.code.sf.net/p/perfmon2/libpfm4.git",
+        "rev": "964baf9d35d5f88d8422f96d8a82c672042e7064",
+        "hash": "sha256-awpZ22rovLZWQkX/qog93vL4u2gJ+F3w5IGFNlZ0heQ="
+      },
       "src/third_party/boringssl/src": {
         "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "40e035a9e5d721b3b7c15c46259d782ffe7d9e96",
-        "hash": "sha256-m2WNsjSwlg57ACftIDCcIWJ/jwbD7FU43lhGcpGDhCw="
+        "rev": "91f3df0a20f6d3dd3e2f749b4a2730b68c3d585e",
+        "hash": "sha256-rhUF9fuWbiAkaGbHnhANZxCYEhkkoMQoiYzn1EfR270="
       },
       "src/third_party/breakpad/breakpad": {
         "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "44ba5b579bf2f5c8548ad5016664fef8458c43b4",
-        "hash": "sha256-b8+7NGE9SelVFFuDOVr/k/nrk3jr/r8zwuW7vpm4c74="
+        "rev": "a1220f673dc44632e821bd1a217089e5a159a203",
+        "hash": "sha256-jGdQyM3+p3qt+Hjt44Wpg7XKiUt7kz9Lv1xRG7vp+dM="
       },
       "src/third_party/cast_core/public/src": {
         "url": "https://chromium.googlesource.com/cast_core/public",
@@ -197,8 +202,8 @@
       },
       "src/third_party/catapult": {
         "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "3c5077921dbacc75db5768cf4fc0b1d9ca05d2e0",
-        "hash": "sha256-w/tFeyek51/izvLSMkGP3RCW2j6KJdIa3l1PzxKjnaM="
+        "rev": "04c85a1d0e324464c6be4b3d193b47cb6177d03a",
+        "hash": "sha256-Is8yDmTyNyseTBPIDwIlhRthqfkFPgQIvu3b6u5c0m0="
       },
       "src/third_party/ced/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -222,8 +227,8 @@
       },
       "src/third_party/cpuinfo/src": {
         "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
-        "rev": "e414c0446436ed34151de3158d18f8ae32e55d03",
-        "hash": "sha256-748MwxVi7oONccrirjUWgtDNBWWijrXSXlZdHoowYz0="
+        "rev": "877328f188a3c7d1fa855871a278eb48d530c4c0",
+        "hash": "sha256-JW83AgI1cWv4TSpXNe9sv/hNYAA7MOdUeTHY8+0lHgc="
       },
       "src/third_party/crc32c/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -232,13 +237,13 @@
       },
       "src/third_party/cros_system_api": {
         "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "ed91ea4a3cd063cbace42360d769983fb08163b4",
-        "hash": "sha256-vauYEQW9iTs8VZwyKAYeahLl9LTzkOR0krzcBR4VYus="
+        "rev": "c33ff08e2b27ddaed22c8799fefd3a4b7d3c49a9",
+        "hash": "sha256-N8/0tVMBi6yFe9HkR5wxDJ1+QAP1IV1Bz99Il3RZNFU="
       },
       "src/third_party/crossbench": {
         "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "b560604e8f2261a2c685c28359b69af74b92a196",
-        "hash": "sha256-vgWATYq/7UXnFhfdJZ0JXvGpr4eI08sSU115MWpD1js="
+        "rev": "f6e9d3627685e3bcb82d5a24c1f075b8dd0d881c",
+        "hash": "sha256-JbgzTTFEFuA8ZyRLih3T/Fa3RhcOK4fi+9RuzZioiPI="
       },
       "src/third_party/crossbench-web-tests": {
         "url": "https://chromium.googlesource.com/chromium/web-tests.git",
@@ -247,13 +252,13 @@
       },
       "src/third_party/depot_tools": {
         "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "3f41e54ae17d53d4a39feecad64c3d3e6871b219",
-        "hash": "sha256-ow0L+KQuUTsz29yfO1qvqPu4XVgdoUe+yexMPi7POoA="
+        "rev": "675a3a9ccd7cf9367bb4caa58c30f08b56d45ef5",
+        "hash": "sha256-oL/WjK90HWqtyE0sJhDUp3UxlC8jr4dZfp+Q80xu3sM="
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "9c2c4cc7cf6c82ad460e1f3b49f34bb702d5fe11",
-        "hash": "sha256-qj1vR0FW2jiR2v18Nv8RqYgy/UEw2rgGUsQ68EhdHos="
+        "rev": "38cfe98a56a034da33ee62a5f1ea235fe47f58a7",
+        "hash": "sha256-bUJuFEDqgUFdMfmMyroX4s2ky/2n37PsTWaV+iQHCJg="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -267,8 +272,8 @@
       },
       "src/third_party/eigen3/src": {
         "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
-        "rev": "81044ec13df7608d0d9d86aff2ef9805fc69bed1",
-        "hash": "sha256-W0uonGzjDaN2RbY2U+Kl1a5/nrEZ9T9W426f+a7NUzY="
+        "rev": "430e35fbd15d3c946d2d2ba19ec41c16ba217cb3",
+        "hash": "sha256-ZXDzAuvTu46YhieLIQ7MSQ0os+v2RF+KBtFuKU9fCWE="
       },
       "src/third_party/farmhash/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -282,8 +287,8 @@
       },
       "src/third_party/federated_compute/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google-parfait/federated-compute.git",
-        "rev": "cf49f95f941eb872f596522890055878240c3a22",
-        "hash": "sha256-R8KE0Whpb4qsZ6HxWG4/uFSsrT2nnpwNV2nQcNYHEXg="
+        "rev": "e51058dfe7888094ecc09cda38bfceffd4d4664b",
+        "hash": "sha256-5kuTp0TXOUCQQ7XcnwBRsQRxugl869hZhx8MbxDLwYk="
       },
       "src/third_party/ffmpeg": {
         "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
@@ -297,28 +302,28 @@
       },
       "src/third_party/flatbuffers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git",
-        "rev": "8db59321d9f02cdffa30126654059c7d02f70c32",
-        "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM="
+        "rev": "1c514626e83c20fffa8557e75641848e1e15cd5e",
+        "hash": "sha256-u5AVjbep3iWwGNXLrkPJUnF8SbmIXlHOYoy3NIlUl/E="
       },
       "src/third_party/fontconfig/src": {
         "url": "https://chromium.googlesource.com/external/fontconfig.git",
-        "rev": "86b48ec01ece451d5270d0c5181a43151e45a042",
-        "hash": "sha256-6HLV0U/MA1XprKJ70TKvwUBdkGQPwgqP4Oj5dINsKp0="
+        "rev": "f0ed9c3f43161d3555f6f7a5234b22fe7ca60727",
+        "hash": "sha256-2h0dWn7MxAX+4o2tMZLyjRFAES+FTMaGaf8M7ySkSV8="
       },
       "src/third_party/fp16/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git",
-        "rev": "b3720617faf1a4581ed7e6787cc51722ec7751f0",
-        "hash": "sha256-nDJH3Jmztrglr9hnwegfS7NNLAXklnwdeH9iWWwwZt4="
+        "rev": "3d2de1816307bac63c16a297e8c4dc501b4076df",
+        "hash": "sha256-CR7h1d9RFE86l6btk4N8vbQxy0KQDxSMvckbiO87JEg="
       },
       "src/third_party/gemmlowp/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git",
-        "rev": "13d57703abca3005d97b19df1f2db731607a7dc2",
-        "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA="
+        "rev": "16e8662c34917be0065110bfcd9cc27d30f52fdf",
+        "hash": "sha256-e6AeRhZioIiTG5R+IA9g2GBqI4o74wijJYmqINLOtQs="
       },
       "src/third_party/freetype/src": {
         "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "61a423426089e65c27699d824303f209026b2f05",
-        "hash": "sha256-XaSl1YJk5TUR72PDbKwnn5IGT46VR7ip1wVxUMEkvu8="
+        "rev": "d3668e00da732654b50e4e81f982544ed6e26390",
+        "hash": "sha256-b74O5i4xhHq8y0qepP8Wup2nuj9LFzBX7ahMCCVhc98="
       },
       "src/third_party/fxdiv/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
@@ -352,8 +357,8 @@
       },
       "src/third_party/oak/src": {
         "url": "https://chromium.googlesource.com/external/github.com/project-oak/oak.git",
-        "rev": "bd9e19ed20525444be0882bd5848ec475ac8c040",
-        "hash": "sha256-F/qSxLpbPPOBjY4/Gowq6HUINb1hH+ll9T+mDMGeJ7c="
+        "rev": "96c00a6c99ac382f3f3a8f376bc7a70890d1adaa",
+        "hash": "sha256-+ouwII+i5CbWoJ3NAxQPmczofzkPwtZTtjIPaXyyXt8="
       },
       "src/third_party/ots/src": {
         "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git",
@@ -397,8 +402,8 @@
       },
       "src/third_party/fuzztest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "169baf17795850fd4b2c29e4d52136aa8d955b61",
-        "hash": "sha256-jcpUwHKWV4aWJSOZ4AlFk5YXZoTuXrrSE4jmwrrvoKI="
+        "rev": "e101ca021a40733d0fa76a3bd9b49b5f76da4f8a",
+        "hash": "sha256-gMIDf/Alh9BCk0Gm0m+mmhHoKreHCiN7/WOomcMbS/k="
       },
       "src/third_party/domato/src": {
         "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -412,18 +417,18 @@
       },
       "src/third_party/libaom/source/libaom": {
         "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "4703185b29b381e5651eb1caed66630f623bf752",
-        "hash": "sha256-f3IPUpLB0jYrBwwJCBzatJgzayGtUxV6NsCLU2TiIqs="
+        "rev": "2a70ad7bee390757eaa83aff12f310ba53915e9f",
+        "hash": "sha256-RWm/xaX3WGgCy6o4lM5g6j0vS6mc6ZbDAhRw6OQgJlU="
       },
       "src/third_party/crabbyavif/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
-        "rev": "4c70b98d1ebc8a210f2919be7ccabbcf23061cb5",
-        "hash": "sha256-PHtOD9HWxgwlfmcoDDHYyjhHpV/LclCVIk+ci9eUaIc="
+        "rev": "3ba05863e84fd3acb4f4af2b4545221b317a2e55",
+        "hash": "sha256-HUGkuQWfUGsE6crsluI7l5H2DYalruoDKqBjbVfE7BM="
       },
       "src/third_party/nearby/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
-        "rev": "5f27145da57a32eb8db215c40fe867a20beea987",
-        "hash": "sha256-ZbrbLnL/5LYu8cW06KnjNaUjMSlJCrzl0ywthOjNeX0="
+        "rev": "0bad8b0c9877f92eeeb550654f1ea51a71a085e4",
+        "hash": "sha256-Mwuo2RlKweqZPkDw4OcJDD+QNRiXVysSyzLdjHsG1mA="
       },
       "src/third_party/securemessage/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git",
@@ -432,8 +437,8 @@
       },
       "src/third_party/jetstream/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
-        "rev": "f8e3d7e50ed5c7ac071a9d90d3ee36cb68a8678c",
-        "hash": "sha256-7JF4A2ayMOAFOP3DH2Z2iBx9MHvMN9hogCY5unJZDbQ="
+        "rev": "b400dd340af3457890ec7b4a903fefb02fcf2dc6",
+        "hash": "sha256-jn6Twi+fc/qKjsqLqkrWxhQ677wY3rSCx3JfWCGhxr0="
       },
       "src/third_party/jetstream/v2.2": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
@@ -527,8 +532,8 @@
       },
       "src/third_party/libvpx/source/libvpx": {
         "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "b122dc0932009e78f928386c5081bb69d3c2de5c",
-        "hash": "sha256-y5yD3YwsQjWZn60VPUH4H2D1AwkBoGGmTNpyxGneciY="
+        "rev": "8d00aca60b951444582b1373e4e47f0ca6e0871c",
+        "hash": "sha256-44k28SJ7AbcABv1YV1tICtJ1II4AXTuvcAELSTUht6c="
       },
       "src/third_party/libwebm/source": {
         "url": "https://chromium.googlesource.com/webm/libwebm.git",
@@ -542,8 +547,8 @@
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "36edc5fa8b2da5aa00b8c2c68b25ffd64219d0ba",
-        "hash": "sha256-RTgcspt8hOHN79ZD5jjwuX7XFrFkuAJemIXmjoBKVMk="
+        "rev": "94417b9d213364905ce849c25719b819b8dbbaaa",
+        "hash": "sha256-8sxr0TMQaCzBqQ39FADqWTATcmQlL6TOV3nFM/YySyY="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -577,8 +582,8 @@
       },
       "src/third_party/openscreen/src": {
         "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "9756d3a568a78213678eeb52e044b9658e195e15",
-        "hash": "sha256-LK1b2O4pgLyGBViXLid2w6+DxtstK44msyOJUNFn1ek="
+        "rev": "4654d7968ac1a1e825a84bd4d85acadd7993c49a",
+        "hash": "sha256-gg9PtdIuCN3eQJhutbBz411zIsyCpagb5BARGdCWLMA="
       },
       "src/third_party/openscreen/src/buildtools": {
         "url": "https://chromium.googlesource.com/chromium/src/buildtools",
@@ -592,13 +597,13 @@
       },
       "src/third_party/pdfium": {
         "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "0a74b90b9a53b2033de1a53ed8401730f906a453",
-        "hash": "sha256-eTq4d9nE9J6ZbX2b7QK5gVacApSv6EQXUmvy1P641Eo="
+        "rev": "e95c6ead2f97716c98526ec42d5fd9ebb50e6e23",
+        "hash": "sha256-tZXu+3w+CplXbP8TgRetyl1Q2gacAqWtP9uJ6XZchHk="
       },
       "src/third_party/perfetto": {
         "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
-        "rev": "43afaf571d990c0f3275c6800cf3ed42138bdc26",
-        "hash": "sha256-I5MrV4zYZjH0iSnc1aZ95xAg6e3OxQXX/rQoD8/OQIk="
+        "rev": "d5bbee7afdf259af4212929ccbff467dd5349953",
+        "hash": "sha256-FfOCX3Z7aKGkMAf8hK5itt7+8N5kBRd9NJGjOLiUjQs="
       },
       "src/third_party/protobuf-javascript/src": {
         "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -607,8 +612,8 @@
       },
       "src/third_party/pthreadpool/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
-        "rev": "149f0a86f5ad215e9f0441684385ce09f345dbe4",
-        "hash": "sha256-3/FnJ2FL6fQSlymqJS/UoXTB4ZiW9d7xpvK3Ur8Ynp4="
+        "rev": "f5a07eddbf4be8f23e29e60a2ccf66b78b71f119",
+        "hash": "sha256-M9uMq/ZkvrWNep+CIFzx6xLfepLkfY8tjgL7ed2vjU0="
       },
       "src/third_party/pyelftools": {
         "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
@@ -627,8 +632,8 @@
       },
       "src/third_party/re2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/re2.git",
-        "rev": "6569a9a3df256f4c0c3813cb8ee2f8eef6e2c1fb",
-        "hash": "sha256-e18aSNVEE42LNzCDMay/Fa3BNg36pBPeEtfNvWqlnWE="
+        "rev": "cd7b2823a8375371f7efe6dae17837c9ab407693",
+        "hash": "sha256-YXYRgSWUrX+tkaMiRpaCFrrP3vyhzGIP9ApsxWX08VQ="
       },
       "src/third_party/ruy/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git",
@@ -637,13 +642,13 @@
       },
       "src/third_party/search_engines_data/resources": {
         "url": "https://chromium.googlesource.com/external/search_engines_data.git",
-        "rev": "629f034fd4473fca4ee8886ed886943672fc72fa",
-        "hash": "sha256-iWtSJ8AL2rbjltg+FHO/w4mL1XHsemCc39lEFWKAVGA="
+        "rev": "94eb2a9a225078cb5f40e82fd890bce387c8121a",
+        "hash": "sha256-WWkOOnOI3ohPuO+M9/x53hyDO11P6E6Z6ZZvKmQEyjI="
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "5eefbe51d17d2e379fa2d7353827e0ccb1e1f601",
-        "hash": "sha256-hjihCH6CykIfNcQ8TWCD8+buN0ZBYDwQr4I2Z2hUmxM="
+        "rev": "f4ed99d2443962782cf5f8b4dd27179f131e7cbe",
+        "hash": "sha256-7dpaRB/du2Y13BV3K7/Zx6lQwMtgtF17oKPoBtyEc64="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -662,8 +667,8 @@
       },
       "src/third_party/swiftshader": {
         "url": "https://swiftshader.googlesource.com/SwiftShader.git",
-        "rev": "7cd1022cdc50fa3ac4f0ca5d0cdd64ce20af3c4f",
-        "hash": "sha256-YNQYUe3xgnPny6tYmlYOjC6/jszy896y+/u5aXjthvU="
+        "rev": "5f1c459a11bb4899301e89609cbf7547f9f31e20",
+        "hash": "sha256-raNaqoF6CYdBowrQOGRZk6vDdpr/2xAXR2+RaDF0ypk="
       },
       "src/third_party/text-fragments-polyfill/src": {
         "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -672,18 +677,18 @@
       },
       "src/third_party/tflite/src": {
         "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
-        "rev": "fe38b1b8c23d86ed93c13ef367b19496e398462d",
-        "hash": "sha256-51tpID94hoxm0I2Mf3WFQBf5MsuzIzlkS9lOto/8tC4="
+        "rev": "313f58ae85278ced9ccc7f90ee630bdf8735c52f",
+        "hash": "sha256-9RWrxIDA2vvobr9Cg13SkwfScw+Lk/NCeaPVIXTCKmY="
       },
       "src/third_party/vulkan-deps": {
         "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "a493d027dfa1ebf220dea834757f5114494f0f92",
-        "hash": "sha256-n52ZDzn4/SxcdUzCENBpUfjJk3+0IQSe+qj9FVgFn2w="
+        "rev": "02470a3c2773a9fa236c7e8dacd72deb4b5131e3",
+        "hash": "sha256-zziYZlVaxG5UQPm/SlodT85f+pAoGwuAO9FKnkSN53E="
       },
       "src/third_party/glslang/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "3289b1d61b69a6c66c4b7cd2c6d3ab2a6df031e5",
-        "hash": "sha256-9xGshr6ts0TdER7Sy86XpKrUItukeM59ozCIwkFy26A="
+        "rev": "a57276bf558f5cf94d3a9854ebdf5a2236849a5a",
+        "hash": "sha256-/DwdyuSGCx22zsXZrcZGTECfsIqvzPQzTZ2mU8EkjxY="
       },
       "src/third_party/spirv-cross/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -692,38 +697,38 @@
       },
       "src/third_party/spirv-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "3397e1e4fe0a9964e1837c2934b81835093494b8",
-        "hash": "sha256-Yp+HE/XIPJD/Baj9Nvs3H7J5Bx816qkYFpL6zARyY/8="
+        "rev": "01e0577914a75a2569c846778c2f93aa8e6feddd",
+        "hash": "sha256-gewCQvcVRw+qdWPWRlYUMTt/aXrZ7Lea058WyqL5c08="
       },
       "src/third_party/spirv-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "392b4893c4955125c1873c33a97f2a8ee8363bd3",
-        "hash": "sha256-HMzQps2F9TAnHHPvBeqowADHPlTvfRWUekE37AKMcaw="
+        "rev": "d5d5b61e2d5ae9b98ef403b3f3f922711812888a",
+        "hash": "sha256-wP/ZjSXXB1NrRVmtaqxoJ+jdHlRNsXg7dRxYp9zfKKc="
       },
       "src/third_party/vulkan-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "d1cd37e925510a167d4abef39340dbdea47d8989",
-        "hash": "sha256-WUj4nmr4SJFTDoaOuZBVfqOrJykzW9Kg2sqaplm8E1A="
+        "rev": "a4f8ada9f4f97c45b8c89c57997be9cebaae65d2",
+        "hash": "sha256-Sg/zp6UhRC5wqBS3vdfs0sQL8cBgLiwvfG0oY0v9MWU="
       },
       "src/third_party/vulkan-loader/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "fe92c7d7e54664b1d3f3a0d734fd6f2ffd92e485",
-        "hash": "sha256-9Oe3JIuOT/yc+pUgKptnex9gKQFsHo1uBb3zeTegL6Q="
+        "rev": "f703f919c30c5b67958d35d40a4297cb3823ed78",
+        "hash": "sha256-3BBltVh3M9OnBk1uf+xpaaJaaF9QP9DHeX7tu6ET05Y="
       },
       "src/third_party/vulkan-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "8ce6f121d1fcbdf60f0f4264e23fbcd247b9101d",
-        "hash": "sha256-3OcmtPp8mhrVYrPoCe9qnisXllMhYLdZ4dEulDhlq8k="
+        "rev": "d643b80d6ba8c191bc289fdda52867c3bb3c190b",
+        "hash": "sha256-E8VEn0s/ZuIIx4sH9ItLx+3+FOPi8gbQ0Ht7iIyYBUU="
       },
       "src/third_party/vulkan-utility-libraries/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "a528f95dc2f92bdd83c0c32efe2d13c806428c9d",
-        "hash": "sha256-7VEYvq1x+BYPuMGi47a7/R9ZrIR9CoIaV15wLpk97bg="
+        "rev": "4322db5906e67b57ec9c327e6afe3d98ed893df7",
+        "hash": "sha256-qcCATZWM0YJ02Dl5VxjvbFYoE2b0r7Ku+ELr2is2VIg="
       },
       "src/third_party/vulkan-validation-layers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "88a897d5921f737c9826fdd4db1ae2010d23dbb3",
-        "hash": "sha256-X5JFPq+4rqpfKLO7ImHOcR1nvO3+PCCglP0+hhUeiJ0="
+        "rev": "83d96b88de7b85c3f29545170857e54e348421b2",
+        "hash": "sha256-ugV2Gwgrerbqbtc5SgKN5wm4eT4JbXRCiryu1bLGR+M="
       },
       "src/third_party/vulkan_memory_allocator": {
         "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
@@ -762,18 +767,18 @@
       },
       "src/third_party/webgpu-cts/src": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "b500efdd5fdd62404322ab9ecd70b938ac59a47f",
-        "hash": "sha256-gGyXYaHH0nk3rbJTtazNyj9vO4PqDPJ0OG1/CisrIq0="
+        "rev": "b62c3fc76c9c644a8597399b0d23f7032cabb366",
+        "hash": "sha256-L3DuBVH7x1vxpDp/wrykcyPCjVLJr4ox4gEl76f320A="
       },
       "src/third_party/webpagereplay": {
         "url": "https://chromium.googlesource.com/webpagereplay.git",
-        "rev": "eebd5c62cb5c6a5afbb36eccdcc3b3e01f28adc9",
-        "hash": "sha256-WXiWUVTX4JBuavc3qxPpWeM2qZsyMr64iqF/fu9fzRI="
+        "rev": "9057e5d942f2bfcee71cc20415a7f86c966241f8",
+        "hash": "sha256-W/f+vYNC9xiCPVvHezlVPFAze77OTCMMj7PgNN5ixaw="
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "d2eaa5570fc9959f8dbde32912a16366b8ee75f4",
-        "hash": "sha256-vWz+CAlgvavAmoCgy+D5FDGSyYoe15vfKI2fw33K8cc="
+        "rev": "29d6eabaf0b5c1a62af6e7fd03adebf5e1a446e8",
+        "hash": "sha256-kVzks2ncpgd+aQ7JT2pAV/WJXxFIE7Es5Yzd/XGgm4w="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -792,18 +797,18 @@
       },
       "src/third_party/xnnpack/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "63e7e89ddc0cf5671d2659cd34a3eb64a008dd63",
-        "hash": "sha256-cqzSTeRziIZFdArk6Ty/1JyeSM8w/aH2buoNy5GOIdg="
+        "rev": "4d098efeac50c44a7c03e6feb1794908db4c3158",
+        "hash": "sha256-oxpMzIFwJ3L5cYLkwcSL7a8XS1AGHXKQjwtHoe/2mZw="
       },
       "src/third_party/zstd/src": {
         "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
-        "rev": "e128976193546dceb24249206a02ff8f444f7120",
-        "hash": "sha256-09KBWIUdz53TOSGhi32BJ2/FIA/BXxRNvgZMZJYiWgw="
+        "rev": "89d685e42dbcf815a16ed0fcd7d050ef74ccad96",
+        "hash": "sha256-xFObjxA4LKOnCugxaYek3cU4ld3JwLj5jFoRJ20hje4="
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "ad8af0fc661d278e87627fcaa3a7cf795ee80dd8",
-        "hash": "sha256-NOhavmx5NYJx6MSDwRS6RXHcn3DB7kNlTjIFZr6rMMY="
+        "rev": "bb294624702efbb17691b642333f06bf5108e600",
+        "hash": "sha256-ovlKdiBYD9RAjA1XI0PLp/pt25LAvm3fn5AqWlJQfgs="
       }
     }
   },
diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-142-crabbyavif-rust-no_sanitize.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-142-crabbyavif-rust-no_sanitize.patch
new file mode 100644
index 000000000000..0dd08dbb41b9
--- /dev/null
+++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-142-crabbyavif-rust-no_sanitize.patch
@@ -0,0 +1,48 @@
+diff --git a/third_party/crabbyavif/src/src/capi/io.rs b/third_party/crabbyavif/src/src/capi/io.rs
+index e7994ce3129c4d7f46553f527bf8f10376ff9ed8..60a3c13b788a560e9669db013e3b8e88e5f9947b 100644
+--- a/third_party/crabbyavif/src/src/capi/io.rs
++++ b/third_party/crabbyavif/src/src/capi/io.rs
+@@ -207,7 +207,7 @@ impl Drop for avifIOWrapper {
+ }
+ 
+ impl crate::decoder::IO for avifIOWrapper {
+-    #[cfg_attr(feature = "disable_cfi", sanitize(cfi = "off"))]
++    #[cfg_attr(feature = "disable_cfi", no_sanitize(cfi))]
+     fn read(&mut self, offset: u64, size: usize) -> AvifResult<&[u8]> {
+         // SAFETY: Calling into a C function.
+         let res = unsafe {
+diff --git a/third_party/crabbyavif/src/src/lib.rs b/third_party/crabbyavif/src/src/lib.rs
+index 90fa41188905a8aaf7b74594937b3a335ceed18d..a05f0a5e8b6cbffbf6e1a0f5fefc8a1e1480273f 100644
+--- a/third_party/crabbyavif/src/src/lib.rs
++++ b/third_party/crabbyavif/src/src/lib.rs
+@@ -13,7 +13,7 @@
+ // limitations under the License.
+ 
+ #![deny(unsafe_op_in_unsafe_fn)]
+-#![cfg_attr(feature = "disable_cfi", feature(sanitize))]
++#![cfg_attr(feature = "disable_cfi", feature(no_sanitize))]
+ 
+ #[macro_use]
+ mod internal_utils;
+diff --git a/third_party/crabbyavif/src/src/reformat/libyuv.rs b/third_party/crabbyavif/src/src/reformat/libyuv.rs
+index 9df874ccf7b6a943c6dcebe495ce15b7a7e9cd66..3f68c16f2b2e8e22b3edfd0dcedbb95fe34887f9 100644
+--- a/third_party/crabbyavif/src/src/reformat/libyuv.rs
++++ b/third_party/crabbyavif/src/src/reformat/libyuv.rs
+@@ -372,7 +372,7 @@ fn find_conversion_function(
+ // Returns Ok(Some(false)) if only YUV was converted and alpha
+ // needs to be imported separately.
+ // Returns Ok(None) if the conversion is not implemented.
+-#[cfg_attr(feature = "disable_cfi", sanitize(cfi = "off"))]
++#[cfg_attr(feature = "disable_cfi", no_sanitize(cfi))]
+ pub(crate) fn yuv_to_rgb(image: &image::Image, rgb: &mut rgb::Image) -> AvifResult<Option<bool>> {
+     if (rgb.depth != 8 && rgb.depth != 10) || !image.depth_valid() {
+         return Ok(None); // Not implemented.
+@@ -833,7 +833,7 @@ fn rgb_to_yuv_conversion_function(
+     }
+ }
+ 
+-#[cfg_attr(feature = "disable_cfi", sanitize(cfi = "off"))]
++#[cfg_attr(feature = "disable_cfi", no_sanitize(cfi))]
+ pub(crate) fn rgb_to_yuv(rgb: &rgb::Image, image: &mut image::Image) -> AvifResult<Option<()>> {
+     let conversion_function = match rgb_to_yuv_conversion_function(rgb, image) {
+         Some(conversion_function) => conversion_function,

From 7cd480deb60e524e57ce85f2a1e95d1b88d92b0c Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 29 Oct 2025 12:02:38 -0400
Subject: [PATCH 3872/6226] gitbeaker-cli: migrate from nodePackages

---
 .../gi/gitbeaker-cli/missing-hashes.json      |  99 +++++++++++++++
 pkgs/by-name/gi/gitbeaker-cli/package.nix     |  77 ++++++++++++
 pkgs/by-name/gi/gitbeaker-cli/update.sh       |  27 ++++
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/main-programs.nix           |   1 -
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 115 ------------------
 7 files changed, 204 insertions(+), 117 deletions(-)
 create mode 100644 pkgs/by-name/gi/gitbeaker-cli/missing-hashes.json
 create mode 100644 pkgs/by-name/gi/gitbeaker-cli/package.nix
 create mode 100755 pkgs/by-name/gi/gitbeaker-cli/update.sh

diff --git a/pkgs/by-name/gi/gitbeaker-cli/missing-hashes.json b/pkgs/by-name/gi/gitbeaker-cli/missing-hashes.json
new file mode 100644
index 000000000000..e7350c0cdf5a
--- /dev/null
+++ b/pkgs/by-name/gi/gitbeaker-cli/missing-hashes.json
@@ -0,0 +1,99 @@
+{
+  "@esbuild/aix-ppc64@npm:0.25.10": "e1a113d75c27f15756d18dc2a9257f07068c7b37a00ed3848c0d903f3e66f2df23156993fca7523422cf5be10417747a1e4faa2e93196f011faab606938174e5",
+  "@esbuild/android-arm64@npm:0.25.10": "a2dd6b7ba7d3ab2b669bdc45dc7e306671ecbd89b251d3ad73191fc18fe07080525beadf0a9ead65f96d623d4e37172b2516dc1ce7ddc3c3224299926615b2a1",
+  "@esbuild/android-arm@npm:0.25.10": "0d7b4d970f4793252396ca9b737a2c5b485a5f051827ba1cbcce23a76e9bb7bc6f73be3b5ebed73a15aca915534917d13aeef0ce14d214026a36f0f334eadb14",
+  "@esbuild/android-x64@npm:0.25.10": "a2e49c045ea189ca6020a8c1baced2db4cf105848c1cc922931c8e3a11b26f1143078d3ee5c088bfbccab8e564039a5b6962513e45b41572614607dced92b03f",
+  "@esbuild/darwin-arm64@npm:0.25.10": "a96d0821aa97cd0ce2fa35b525896fc9d878b492832be8a0cd22bdbb081d11209574e48ef8ce29f51a88a9cea33c5f6a8b4409bd0801eddeac5ef4ad4db2d88a",
+  "@esbuild/darwin-x64@npm:0.25.10": "0f358404778b8f36a2676181f8840139d7e5723a76e54683f0ada3d72572d8c864bc76084e1d23dd5605896329857ad15b598dedd141d160b64669253bfaee82",
+  "@esbuild/freebsd-arm64@npm:0.25.10": "f82928e4a4beb95da3379b98c5088d017113c02e3f2ab54867e4f6974b21b25c68ed793cbb3e9a99a510fd58ad3c5dbc1f7ca5bd4ce6adc99627a25fc722178b",
+  "@esbuild/freebsd-x64@npm:0.25.10": "08c9d830e43a3be5fdb4525d940b0cd069bd7e7e1f4d53a5475411351c07891343b3c009f37d47e10ae3bafcb9ed52b4b5bd5e7dbd0505723add21a09c08dae6",
+  "@esbuild/linux-arm64@npm:0.25.10": "1b6f5a1ef9aef52210832f5dd4d55ddd0a880dfc0f832106374b56c5cd8fbb865d7d711bdd6ff7c94a0cc42a7c3e6cf91118bf5c4187cfbbe1eb4d1807afca37",
+  "@esbuild/linux-arm@npm:0.25.10": "023383ebb145fa2f93de674713c7e4725df2b3c910f43bc1b5488a3b1169005d46fcbcf84234aace04c799ee569ea7671f92205e42dda52bc9954e48b47d7a1d",
+  "@esbuild/linux-ia32@npm:0.25.10": "130136f141d0388ec249fa314848906fb8b45e554324b8a07c13b5bc2e7da94c6fc7ebd037af6b69655a542ec52515ea8f8bc3bfe6dfc0dab8bdf9954debfb0d",
+  "@esbuild/linux-loong64@npm:0.25.10": "0e076ba5ea9b2e6ad00c27b8ee530621ef4c356aba6d8c873f9f7c50fa2f54bd75f4bef57d209fc0af011c9748c64e9d5e281f13456fa9c8b71f79467bfc71ad",
+  "@esbuild/linux-mips64el@npm:0.25.10": "dc3ef7a524ef0d78030f088263735026c97e7be45f56a610c8849fca8c36b10969558bffb6c21b6d8a5819a33450e529e44c1a71a6fccb0ce69f23b01273bbc3",
+  "@esbuild/linux-ppc64@npm:0.25.10": "60088ee09f940e169e2073ee77972f22af78c9c1df9a8e7db45e3c3f9176d5ffd8006a4102f34783c7f3629e9c153797d9f493063e9bdedf6f676018cbe6445e",
+  "@esbuild/linux-riscv64@npm:0.25.10": "3f194dfe0f2725d9a41b0ab127238ef271d0689f31a05ecae25d6df3aa8275261d6ba073373236fac3c6c8af2a4556736a8025e80d8a719a049d22b23c99464c",
+  "@esbuild/linux-s390x@npm:0.25.10": "926a04be26ebf794dae6a6185e04f39d246b04f1b5cb40b41f5228228a87e3a785cfb6493f405a0dc7d9b6a96d9417453fdc291b7fb4bc4aaf785eaa44cf1806",
+  "@esbuild/linux-x64@npm:0.25.10": "ebe641e7b96af7dcefe629b4f34a4da9cd0b282e42e8efd0311c2ed631a40a143bb96eda5592b209c4eab295f45b2e3395c69412edb40d5689ffaa01aa276409",
+  "@esbuild/netbsd-arm64@npm:0.25.10": "11f85ed4ade5c38fe8f2f3e78ee5c302a4f90d48a6bf93cf8917b13d52b03671c7742294785165cc70611eb0b085a4e9aa5a0f487f8e15f80200ff450549e19e",
+  "@esbuild/netbsd-x64@npm:0.25.10": "322482debb21160769f7ee293c3e84e44293bb7c734082fac2857277038ab1087763a553697b8f20dc3a03b7a397936396cde8150c1cc6a0ad62941e7ee86845",
+  "@esbuild/openbsd-arm64@npm:0.25.10": "4c68206360952d04fbafe32d3f4cf420f15c0a150f914d398746f1cf8241073fe9422cc0cc0de8b0b98b8158879dc5fd322eb8454d936457eab3dc9ba131584d",
+  "@esbuild/openbsd-x64@npm:0.25.10": "70328d84e7954932d0fcd282bc2a16fdd31a899ef23f5214221e64bfebd80222b03a7629d9af55fea220df6a41cd51d0c068618f443dc37ad717dc6601a9445b",
+  "@esbuild/openharmony-arm64@npm:0.25.10": "ca11e8c30cddd7603235cf05185678f6aad7c40eccd8ef57a207325b8553e5481503cda7ae35d777eb5020b9426f2d13332aba147732a9abe0f5b3964a6c0d17",
+  "@esbuild/sunos-x64@npm:0.25.10": "46c205aa7a15d7b5d13553300f3d36593e7119a320672ac3c092f5a67db6cb91f9c59a235dfbe2947bd99f7653bb3be325a33c3474a00b90d39856ef9b05af48",
+  "@esbuild/win32-arm64@npm:0.25.10": "ca2d057a874607013788fd3a161e8e25fcfb777a7aa6edd68662cff3869d1566541d61caab9b11e16515e2192673bf70c00f5efc38f67d1305f76b55bbe8febd",
+  "@esbuild/win32-ia32@npm:0.25.10": "fa5efade9e9a1a01e65223f22304dd71a3d005a2b394309a652bb231bdbc14fe937ec7bf0ce1e117fed182731430e055828616d1c10abee2dfc80aee50fee13e",
+  "@esbuild/win32-x64@npm:0.25.10": "0f2cb29b001bf4a71035b37d42bcaeb48baef5a6b07be2c024593a18dcec87cd5829a0cc17acc7128cd251bd6232bdbd04d967d9c2bd7db9c1978effffe31671",
+  "@nx/nx-darwin-arm64@npm:20.8.2": "d0c0e1d7e23af4ada6726df21dfe42313afb9f27a986840792de5da5a78eb34905792788f2d4a06b3641c0666dc6d7e25c32a41d8339dd90cb21ed591c6ccbde",
+  "@nx/nx-darwin-arm64@npm:21.6.3": "fb6539317604a494c98690a6c35ccbb341c2b2def6263a5ba646c27fdb66f9da81e56fd1004e6297814c009145ba434eb4ce91db94ceb47ba7b9fa52aa5630fc",
+  "@nx/nx-darwin-x64@npm:20.8.2": "bec11ddfb64d4a00e723b04073b675f1e5626ec307d4c7c186209968795373e7ee62dfb559ab049fccd7952299147b9f3751f4ebdafb8a56b45e5669e8bfd205",
+  "@nx/nx-darwin-x64@npm:21.6.3": "1c3e62300a5e14dfb62f6b3a9d61ae143e78164f35abb8a68671312b1e5daa8c60e981a1bcad8a78b8636c848ff04a839ca431285d6ab2012d9226b655e90b29",
+  "@nx/nx-freebsd-x64@npm:20.8.2": "3c94cb3a20683acb899f931780ddb6688c5323f6d9762fe1755887ad02f86fde18c35990d49e5c8a3536f10575b2b4b9554f393e2b3714706348e5fad0cbbe66",
+  "@nx/nx-freebsd-x64@npm:21.6.3": "63b4fecbb853f21e9b07b64428209b31d12daed947f9206e4300d6c8ba5f854d49e7a386c4caa8286ef75631e4975e5eefe2787bb2b7d066b34e2a615851c30b",
+  "@nx/nx-linux-arm-gnueabihf@npm:20.8.2": "546d0924aed742de4e14df5c9b6f2b8f295e3578e48d92959190a0f16bec73afcdf5aa11f0042170cfc7e44fb1730a0f1e940a3ca047c9f04980d60d90a49062",
+  "@nx/nx-linux-arm-gnueabihf@npm:21.6.3": "c268372cda5f9fa58d8a83301f280abc06cdf62c3bccb7034bdddd0b8dadc095df53641acc0e92e212ba3b7534842439635a75f06316e9e0b793893120e04313",
+  "@nx/nx-linux-arm64-gnu@npm:20.8.2": "c8f3970c037c36b7db2a01e162b5004f9ae2dec1b13864e8318189d13a3843c89bc4ed0dce898b29b327d90b6ac098b5f19e40a72ec8ced5c7f7069d5df106ec",
+  "@nx/nx-linux-arm64-gnu@npm:21.6.3": "fcd2b8331ceadca45d95327e3ceb4eade73092c5f9a2465ada91aa7dcaf18c30d0ac84bfe5e830b15427763a3c9bca0461033b184b6dd7fffa941c055162508c",
+  "@nx/nx-linux-arm64-musl@npm:20.8.2": "ddfe4c1dfd6e1f7600e5347bd2252d7a1536aad7bb17be0cf635b7af8987bda638b35d585d526e40b43eaef388d1872064e3aec8d3ef80659542de79ac77365a",
+  "@nx/nx-linux-arm64-musl@npm:21.6.3": "83e8c70030599591484ef5ed0e63ec8b9cb8e0ddbbf1e6036334b02bc080a031b208a45f092c0a9e9a42acc6db562edd83d4628b020093a0ce5b6ddfc32dabfa",
+  "@nx/nx-linux-x64-gnu@npm:20.8.2": "9f8c55128e0797db659cb19b0279c7263bfbab4c365793897de854c25cdf9c4dc2b43c901e79ec0b00f1cf11c406ed16e3e1ae06909a23f0136537d13651f078",
+  "@nx/nx-linux-x64-gnu@npm:21.6.3": "0806dfec93a62e4e8f8b572f5d84503756ae43708067e054566563272404aa42498b72eb2857016079e5a62758ab316905598d2e3f9bae1261640e09a9fbc87d",
+  "@nx/nx-linux-x64-musl@npm:20.8.2": "bab0afad1a215e73f03c35dfc44ef972b0118fbf0d19acc5ed3193a6a56d1b740ab70f15bb508e98966bb3c5d7591013059bc23a874c2812e7dc18b9063d5c6f",
+  "@nx/nx-linux-x64-musl@npm:21.6.3": "09e7d967425779f2c0a1842b9510e63fbe17a7a0853e5514274df8c4e6159fd247283fd150997c15166300b1ff2b0bdbda5d40bb94bf96155441a4be912a5bc3",
+  "@nx/nx-win32-arm64-msvc@npm:20.8.2": "e364ff9645f37882243ba480ba6b1723283d33adf7a793fca952527cf45b85c4b6b92f4ea9ddeaf227e92eb87c0c93582633f59e8180e94a6795e9da19eb4509",
+  "@nx/nx-win32-arm64-msvc@npm:21.6.3": "2c9bd8f66526761119aa173fc3e29b03816967a25bfbad036b63518b9aa147c0e001d9703ae210e62af5d8749feaccbc38eb16a72b326188bca566e5e77d2637",
+  "@nx/nx-win32-x64-msvc@npm:20.8.2": "0bfdbb92c932a33784c06d4a9c2ca131390a294755b3b2a0efe08816f9d2a836680b425d68263bdfcf46f661dd1daa33634b8f0fb1cf6b7608e0a23353a82632",
+  "@nx/nx-win32-x64-msvc@npm:21.6.3": "392f47777f86b9ae1ce2ebf4f4fe9ab10466248b991e01b1b0fdefa76b0c2d811c0ff9196788f233104b273589ff03772b5c0b3aa016677cf1a2269c25fffce3",
+  "@rollup/rollup-android-arm-eabi@npm:4.52.4": "f05e8f49b55b9ef8ffbb825ec7521aedc307f30efe46c16479aa1afd572f238d4fa9d8546b80223cd87195df04c409ab947e2740528b4e7622a75834f038508c",
+  "@rollup/rollup-android-arm64@npm:4.52.4": "b71706dfe398a58aa2b0d0051c713f1c52e1b368a3e17efa2356cf0b32573aec9a846303803a9de45ff07e3d6e0473f8a3050f3aee820d58b8c34abee393c4e7",
+  "@rollup/rollup-darwin-arm64@npm:4.52.4": "5dbd1250d61fceabf48ea2ab10976a6f4c3268c5d479af38bf0544d1d9e8638bf60dfd82254b67005ee7a1912d6f589491d34ed6a7e676f2bd2cb1a946560c6a",
+  "@rollup/rollup-darwin-x64@npm:4.52.4": "8f380b5379bee854c9b00906ac6a65cc7623b52063ae221d23e767117ec46c505f11a7089c09946fa7d0773d9728c754c82aec74f75770591745d8eac0bf0167",
+  "@rollup/rollup-freebsd-arm64@npm:4.52.4": "e187e6e1e1db3367c72772224ed5f5de48bfc6e106140b4b20ee737928b97494dfa4a254deb12fc61982bc29b40a27cb813289fa2a4197a0fcfada0d763a72de",
+  "@rollup/rollup-freebsd-x64@npm:4.52.4": "6436f07da6faba1d70d82b7d9abc2c92a10a4db465d153da092bcf1440fe7fd07d8575db555d51a8cbc4d36b21cb48f9a321b5aa56febbdbf70137dbbe883e75",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.52.4": "432fa13b7925ca3327ed5ed6622f1025aa2515fea6f8b3ed60ad4fe4926ea65b9edac57fc602d96561e50a141a55fef1f21f7be1f8be31f0fd6ace3a81e861b3",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.52.4": "05dd27127ad1cfecb99a7dcbe75285ba0839d59499cc383fa1f83e2f7141f470c04997c9493dfe5233fde6a77dfb64d35ec142068958992db400fefc3f5b11db",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.52.4": "dfbb12c24e47f16a0fee518f83b3bdf076c939094b9fbc0cc53003c8e4f13427404e0c5d400929d689e50396c55cc138259ac245f22fefcf6a59511c3d82398f",
+  "@rollup/rollup-linux-arm64-musl@npm:4.52.4": "567e31b91ba937e1f4edbaacd4fcd3a6b3eaa04eac9a9c0a1b523b6b62854f6fb664cc03b858c96d3454445dd3b0d9f7fc812c92b6f2ff5af957d3dec102f6dd",
+  "@rollup/rollup-linux-loong64-gnu@npm:4.52.4": "4a136776a875255cee922299a2b12f4695e3ae20ec06fd3b787f61f846a1b8726588ab5f378e1605b37b5f7d48c2ca062a23348194e3588ed961b10a170e0b0c",
+  "@rollup/rollup-linux-ppc64-gnu@npm:4.52.4": "e933600fb4cf9964cb18741aac508761d8c23209b4236cceb4d944c2dcf8df8f3d7b9041eb6a2c7c96112b601aeb41d51cc84ff96e79035b6a9361954cb0cc65",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.52.4": "282d676206f8d64728b170d55959a9c67ec43161d7545802052a40b01b1a75a13547307f4940e9b0ea31d2c4ce7893427d1157a7b970a599b56e59d2d2d58dc0",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.52.4": "ec926b01e338d632be3be5636c873f799491f428ee5bb890bec539ac1f25dcc82b3772882b9f4df4c7fe01112e840adbf2ac7bceb8f202828de9141d9f81697d",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.52.4": "4f7ab450a19d40f9830312324b5a154252dccdd23b84b36bdd6aad2f85c3080694eb6d1220e345dc95f8e598f0808c56ad90b71be593fe801b23b75c4317f86a",
+  "@rollup/rollup-linux-x64-gnu@npm:4.52.4": "4fe512b8683e6f24951121a5402beddf7918a6598e710a258775da78cc203e80c0dc266833c41fdb56654e5c8b9837a3ab5ed0851f090049c253c4c4c3a9a8e3",
+  "@rollup/rollup-linux-x64-musl@npm:4.52.4": "8725b1059c94451da32b40c226e1dcd344b2b05870fe6ff9cd248783f2aa47544312fe763a8469d1068c88146b483a36c7d8fa52482d060c4719ee8abae2396b",
+  "@rollup/rollup-openharmony-arm64@npm:4.52.4": "d1bdc31c89f66a5200623752c520fc2f1288580130a314d3b5e7f612ad339b510fa51bdd9e3915649681cc49f1904b792dd24fe3c719332741e7f74d559e6db3",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.52.4": "5e3c4087ef03f4d21beea081b422f939ef5aef91e9fd7312f76ca2a6a3867fb7499e3b648b20fd1a3e84afbe501a27adfa6cc6bce6795274b8d361833be87958",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.52.4": "5e049bc12b1ad44643f273069fb13e1f56fce6ce88b1185a26a96c7b6e6e298f45045e99fd1e8057b0542d940f36c9b176b6ab30a370a04df308e227611233db",
+  "@rollup/rollup-win32-x64-gnu@npm:4.52.4": "795de059e4cdcc94bfae05803df783035faae42c9350c9f040a53306615fbec41a5fb5e9db3572fad67c80c9f805059be6cee53e9f904f4ef24f241be0dace7a",
+  "@rollup/rollup-win32-x64-msvc@npm:4.52.4": "8bdaab594db83cd530c73c57e922e13ab6dad661c9f36e821d5b30f2c1ed5bbb394ee931400b969da3af20d1e99b45bc1a5c30953235ed93df37cf3a48dad47c",
+  "@swc/core-darwin-arm64@npm:1.13.20": "38629bad577a88e4516b675e4ff3b0e7724bcc0bbd3bec5a1f7e8e9f5982f9dc60354bc890a3caf0c35fb1249f448f1a9835d1e0411993738a741c4e0ad134d7",
+  "@swc/core-darwin-x64@npm:1.13.20": "ed4a07b3f86756d12bc575b25c67dc62a4a5ed669ab08de2d1c35f67550553809f9ed5185160c18e76d649c6fa8987701c853cc022a0e449ffd16af59702181e",
+  "@swc/core-linux-arm-gnueabihf@npm:1.13.20": "7be0c60fc922b55dde184858111e5c393bf29523ee5184c8d682cc889b64c55f9c48a3ed4dd5ffe54d445e06aa9d45052cb6c74f4091bac2f2d6021e1e6105f9",
+  "@swc/core-linux-arm64-gnu@npm:1.13.20": "8d630f8e77b9b5022a4597957dcb389cc6443b1b007fe61490881efe0e315c529aaa3bf679c61d759167b7f35733c7e8d3826191135dc2d7aafd0550ba27c098",
+  "@swc/core-linux-arm64-musl@npm:1.13.20": "42e1f77747e846bb8427a930b8a0e98a19e4a3dde848a235e2cf0158274ee05b4ad43ca37e1032784da0b89ceedfd797ca32d923e599f0674c5c376a663a7b1b",
+  "@swc/core-linux-x64-gnu@npm:1.13.20": "c327fcebec31e0a9b20689afb39e736d0b2a72954b262c1eb3475afa2c76a69821c688f6bb666781fbab4fd121354d296036bec593d2ae46e2afd4cc388a905b",
+  "@swc/core-linux-x64-musl@npm:1.13.20": "0967dfb0aaba0f7c680ed73c767649e6cfbec92558a9d9471bbf4f0145f49d23742769f3777d812b58b157b6b497b3bc8b5e35d84c568a0b7e6c7f63059b032a",
+  "@swc/core-win32-arm64-msvc@npm:1.13.20": "bbcea0a68547989857d39dd613c3d32e4938556e68f0adbb401a1d3cc9f9a92c8c14884664151220c092febe91778c61c6b796e11d6f1420811f740cb014f990",
+  "@swc/core-win32-ia32-msvc@npm:1.13.20": "7edd7772a9722e918a0454cbbd2167e3e784857addaed643452913473533c1f43010f3d2e72fedea38ba69be2faf9e24afd676f4eada0738dd80569788c7a7d3",
+  "@swc/core-win32-x64-msvc@npm:1.13.20": "619a64898fd2931b37720a1e59a90b883444dad9c684957246528f185f3efd3878bb21faaa648de0f08377c11826260ebd3bb773f8bae93ab0cdcf48c046ea96",
+  "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "04dd38b694c1680bfec192b499e188700398a414886a08a8a7c72815db56ac147df03d88c73ff6fff7ac3e0a01dc41978054b3622b49463e0d684c5168557fcc",
+  "@unrs/resolver-binding-android-arm64@npm:1.11.1": "763626adc34dd2b4af677b5ced6493e7b2b1935351a5c9137f1c9561d11faf97b94015e6876e57e85c33ff563564314c92c0882a4780a57f2225cbbd779a695d",
+  "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "03b477fdfec55dbabe488fe0962417bddaa38b028d2670053469f1d24163907b097aac15b565f6974449bee398a38d5e3e1525f2b515ce57e243149021b7aa2f",
+  "@unrs/resolver-binding-darwin-x64@npm:1.11.1": "3aeff9aaf4ef6d786c517d9017b5c41b0af180cdbaf705d08e6e5b5ba9d5410d28ef6754c5f8a865f0bb5efd460dc1c4156b5e2201032c0a604a6c734ddbc848",
+  "@unrs/resolver-binding-freebsd-x64@npm:1.11.1": "b9f7a3e03db9edfc3480db056dd25229f901f21840ee768b69f349b66676a995a404e60617b3bcbd984f57f2199eb352dd6fad0f4420c3084ceef5e3293cdad5",
+  "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.1": "4d03b8bcef5a90586a846d6d332f39cee211f3d330b6e10036969894b6ecfb70b047265e985d572def93b84f38621dec30e4b4bb42699dd784adbae3ca5e7bea",
+  "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.1": "9f3a3c2e5e6418a5a78294fa042824f5c270e993c1a99e82dd6b0ee0d2869929bb62dd154a0acc1e4ef16273e8073e0e257901208c062e6bdd49d586d07bb419",
+  "@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.1": "05228d6fd669f404f0e3164ccf2430a52cc7b3bbd211367527b5d726b1220a1816bab70159bed55694d9b7543553f6002379e7e186c605d7055c5156977da022",
+  "@unrs/resolver-binding-linux-arm64-musl@npm:1.11.1": "8115802143396d4992bb2f6f0acb6e8bc141a57864c5fd84cbc70577c25784cb08dd163b753b1fc0decc02582cf4cb1e30d04faaf763048babbbe706bdfa26ea",
+  "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.1": "50f9f54b2eafb1ea023671cc3070692b2b15f6e49105b08b3f588033e65e8de4183f76e080b798de710f9c41df1bf5515c01868866a21cbd35db179b4ac9f23b",
+  "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.1": "8f8222f938cc2025ed3971e0e303f4ff5aa5df74474b835442830ebe942d050ba3f8bbb67095da64099e6fc69bb5bb73ca63db54e059c95e51aa8909880fb207",
+  "@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.1": "5c8987f7dcaf38ef27ec67dcf118141502d5ac75d28429da6d1b7037f3e5a5351f32f55094472fde11784e65d01f1da4dafd7c0fdca28423fbc8de2c2c51d16c",
+  "@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.1": "17aed6472880a82e5a05147a55efb6f0d968f5dcb584845addf89acec3824534ee741d4b162686124d17daf9131373c469c57843996a5ee2db4f1b1b55e1d11e",
+  "@unrs/resolver-binding-linux-x64-gnu@npm:1.11.1": "9495c08fc42f2d4a33e33c64adbcbf51588cd7ea07478eacb2e9143d955a760122440f4a3ac48b086cc2563ca2b2464d72ed0336fcc20c0a89ddc356f956eda8",
+  "@unrs/resolver-binding-linux-x64-musl@npm:1.11.1": "c84fadfee66eeebd16eb7cce7c4b5a1ec90260c724d0064111e9f43a1341ebfede61627cb68fd3a9735e4c10b25606fb472a4d13143cc569867b80d85c4a9824",
+  "@unrs/resolver-binding-wasm32-wasi@npm:1.11.1": "655a3990ed9b238e8f0c4858f87ca84bd3d81db300f7730c885162333055170e11207af7789ff38f619e261178718f6977729e42ce7978cc9e6ac7b6d93822d5",
+  "@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1": "983f800ff8b5181247a7d460ab5c9704cd425d0182e93290f69fb969d93efe17be6a27c22b97546d36e9a9d9aeda96d5f753bc938b3d9a00f32c10fc228ce5a9",
+  "@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1": "383d639e3b08fc9e4ba18127ef55610172d2d1d6adb83e1466fff2b223552384cdc6217051f749829e0c90a757ea5631e8c4ad2cfeb59bdee2bb033fbd526854",
+  "@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "c862561f6495c0dbffb94d421e5727b25c1b61d98e22383bff23e6719a6c0125bb0b7df3be7220f5480bf54f5a605ea572f10fff1cce14fda24d42e396559940"
+}
diff --git a/pkgs/by-name/gi/gitbeaker-cli/package.nix b/pkgs/by-name/gi/gitbeaker-cli/package.nix
new file mode 100644
index 000000000000..b57b3d596576
--- /dev/null
+++ b/pkgs/by-name/gi/gitbeaker-cli/package.nix
@@ -0,0 +1,77 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  nodejs,
+  gnutar,
+  makeBinaryWrapper,
+  yarn-berry_4,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gitbeaker-cli";
+  version = "43.7.0";
+
+  src = fetchFromGitHub {
+    owner = "jdalrymple";
+    repo = "gitbeaker";
+    tag = finalAttrs.version;
+    hash = "sha256-3g8VNOCyXxDg2xpLA66L57ASMhf0kWUp0a7a7FZouF8=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    yarn-berry_4.yarnBerryConfigHook
+    yarn-berry_4
+    makeBinaryWrapper
+    gnutar
+  ];
+
+  missingHashes = ./missing-hashes.json;
+
+  offlineCache = yarn-berry_4.fetchYarnBerryDeps {
+    inherit (finalAttrs) src missingHashes;
+    hash = "sha256-RwQ/Xi/BKZv6+tpIIZU9U9PZJXq3baZVEv3UNKyQ18o=";
+  };
+
+  buildPhase = ''
+    runHook preBuild
+
+    yarn workspaces foreach -Rpt --from '@gitbeaker/*' run build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/bin
+    mkdir -p $out/lib
+    cp -r packages $out/lib/packages
+    cp -r node_modules/ $out/lib/node_modules
+    # Remove dev dependencies
+    rm -rf $out/lib/node_modules/{.bin,tsup,typescript,@auto-it,@codecov,@swc,#types,@typescript-eslint,jest*,nx,prettier*,eslint*}
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    chmod +x $out/lib/node_modules/@gitbeaker/cli/dist/index.mjs
+    patchShebangs $out/lib/node_modules/@gitbeaker/cli/dist/index.mjs
+
+    makeWrapper $out/lib/node_modules/@gitbeaker/cli/dist/index.mjs $out/bin/gb \
+      --prefix PATH : ${lib.makeBinPath [ nodejs ]}
+
+    ln -s $out/bin/gb $out/bin/gitbeaker
+  '';
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    changelog = "https://github.com/jdalrymple/gitbeaker/releases/tag/${finalAttrs.version}";
+    description = "CLI Wrapper for the @gitbeaker/rest SDK";
+    homepage = "https://github.com/jdalrymple/gitbeaker";
+    maintainers = with lib.maintainers; [ pyrox0 ];
+    mainProgram = "gitbeaker";
+  };
+})
diff --git a/pkgs/by-name/gi/gitbeaker-cli/update.sh b/pkgs/by-name/gi/gitbeaker-cli/update.sh
new file mode 100755
index 000000000000..e48b1549ce03
--- /dev/null
+++ b/pkgs/by-name/gi/gitbeaker-cli/update.sh
@@ -0,0 +1,27 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p curl gnused jq nix bash coreutils nix-update yarn-berry_4.yarn-berry-fetcher
+
+set -eou pipefail
+
+PACKAGE_DIR=$(realpath "$(dirname "$0")")
+
+latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/jdalrymple/gitbeaker/releases/latest | jq --raw-output .tag_name)
+
+if [[ "$UPDATE_NIX_OLD_VERSION" == "$latestTag" ]]; then
+  echo "package is up-to-date: $UPDATE_NIX_OLD_VERSION"
+  exit 0
+fi
+
+nix-update "$UPDATE_NIX_PNAME" --version "$latestTag" || true
+
+HOME=$(mktemp -d)
+export HOME
+
+src=$(nix-build --no-link "$PWD" -A "$UPDATE_NIX_PNAME.src")
+WORKDIR=$(mktemp -d)
+cp --recursive --no-preserve=mode "$src/*" "$WORKDIR"
+pushd "$WORKDIR"
+yarn-berry-fetcher missing-hashes yarn.lock >"$PACKAGE_DIR/missing-hashes.json"
+popd
+
+nix-update "$UPDATE_NIX_PNAME" --version skip || true
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 469d083f020a..26007a2ff79c 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -40,6 +40,7 @@ mapAliases {
     throw "@commitlint/config-conventional has been dropped, as it is a library and your JS project should lock it instead."; # added 2024-12-16
   "@emacs-eask/cli" = pkgs.eask; # added 2023-08-17
   "@forge/cli" = throw "@forge/cli was removed because it was broken"; # added 2023-09-20
+  "@gitbeaker/cli" = pkgs.gitbeaker-cli; # Added 2025-10-29
   "@google/clasp" = pkgs.google-clasp; # Added 2023-05-07
   "@maizzle/cli" = pkgs.maizzle; # added 2023-08-17
   "@medable/mdctl-cli" = throw "@medable/mdctl-cli was removed because it was broken"; # added 2023-08-21
diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix
index bfdee89b5730..15b30b90747d 100644
--- a/pkgs/development/node-packages/main-programs.nix
+++ b/pkgs/development/node-packages/main-programs.nix
@@ -10,7 +10,6 @@
   "@angular/cli" = "ng";
   "@babel/cli" = "babel";
   "@commitlint/cli" = "commitlint";
-  "@gitbeaker/cli" = "gitbeaker";
   "@uppy/companion" = "companion";
   "@webassemblyjs/repl-1.11.1" = "wasm";
   "@webassemblyjs/wasm-strip" = "wasm-strip";
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index c6743bde031b..d52b3f54164c 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -76,7 +76,6 @@
 , "forever"
 , "fx"
 , "gatsby-cli"
-, "@gitbeaker/cli"
 , "grunt-cli"
 , "makam"
 , "gulp"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 886f6c396768..68a3997d4b52 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -2543,33 +2543,6 @@ let
         sha512 = "GeWyHz8ao2gBiUW4OJnQDxXQnFgZQwwQk05t/CVVgNBN7/rK8XZ7xY6YhLVv9tH3VppWWmr9DCl3MwemB/i+Og==";
       };
     };
-    "@gitbeaker/core-42.1.0" = {
-      name = "_at_gitbeaker_slash_core";
-      packageName = "@gitbeaker/core";
-      version = "42.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@gitbeaker/core/-/core-42.1.0.tgz";
-        sha512 = "xoP3mUjiGyUdN+utmQ+wDh9r7b4bcf3wa8jxkDTZTiuyd7Tg+354nJhwBNBsq2vFfyQvONOyOT1hsFjTGbTpBA==";
-      };
-    };
-    "@gitbeaker/requester-utils-42.1.0" = {
-      name = "_at_gitbeaker_slash_requester-utils";
-      packageName = "@gitbeaker/requester-utils";
-      version = "42.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@gitbeaker/requester-utils/-/requester-utils-42.1.0.tgz";
-        sha512 = "q5NXy563UUM2AisM/V6Z3A92hIVQNMyx/VBj5Mg7gJkEtIYL+pEyibjIQxcq6nQ3bnj6bkM8NYguCs5tg7GR0Q==";
-      };
-    };
-    "@gitbeaker/rest-42.1.0" = {
-      name = "_at_gitbeaker_slash_rest";
-      packageName = "@gitbeaker/rest";
-      version = "42.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@gitbeaker/rest/-/rest-42.1.0.tgz";
-        sha512 = "7eSXktkUEF2O2A3F1cO/ZJ/3Mco4v59rptghzhrvjZryPcAxlYWxNJbuFtjc5bc0OnJW7i5AYfJSYvZQSh3gYg==";
-      };
-    };
     "@grpc/grpc-js-1.13.0" = {
       name = "_at_grpc_slash_grpc-js";
       packageName = "@grpc/grpc-js";
@@ -28790,15 +28763,6 @@ let
         sha512 = "M7BAV6Rlcy5u+m6oPhAPFgJTzAioX/6B0DxyvDlo9l8+T3nLKbrczg2WLUyzd45L8RqfUMyGPzekbMvX2Ldkwg==";
       };
     };
-    "picomatch-browser-2.2.6" = {
-      name = "picomatch-browser";
-      packageName = "picomatch-browser";
-      version = "2.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/picomatch-browser/-/picomatch-browser-2.2.6.tgz";
-        sha512 = "0ypsOQt9D4e3hziV8O4elD9uN0z/jtUEfxVRtNaAAtXIyUx9m/SzlO020i8YNL2aL/E6blOvvHQcin6HZlFy/w==";
-      };
-    };
     "pid-port-1.0.2" = {
       name = "pid-port";
       packageName = "pid-port";
@@ -30032,15 +29996,6 @@ let
         sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==";
       };
     };
-    "rate-limiter-flexible-4.0.1" = {
-      name = "rate-limiter-flexible";
-      packageName = "rate-limiter-flexible";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rate-limiter-flexible/-/rate-limiter-flexible-4.0.1.tgz";
-        sha512 = "2/dGHpDFpeA0+755oUkW+EKyklqLS9lu0go9pDsbhqQjZcxfRyJ6LA4JI0+HAdZ2bemD/oOjUeZQB2lCZqXQfQ==";
-      };
-    };
     "raw-body-2.4.1" = {
       name = "raw-body";
       packageName = "raw-body";
@@ -34811,15 +34766,6 @@ let
         sha512 = "ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA==";
       };
     };
-    "sywac-1.3.0" = {
-      name = "sywac";
-      packageName = "sywac";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sywac/-/sywac-1.3.0.tgz";
-        sha512 = "LDt2stNTp4bVPMgd70Jj9PWrSa4batl+bv+Ea5NLNGT7ufc4oQPtRfQ73wbddNV6RilaPqnEt6y1Wkm5FVTNEg==";
-      };
-    };
     "table-3.8.3" = {
       name = "table";
       packageName = "table";
@@ -38861,15 +38807,6 @@ let
         sha512 = "RKW2aJZMXeMxVpnZ6bck+RswznaxmzdULiBr6KY7XkTnW8uvt0iT9H5DkHUChXrc+uurzwa0rVI16n/Xzjdz1w==";
       };
     };
-    "xcase-2.0.1" = {
-      name = "xcase";
-      packageName = "xcase";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xcase/-/xcase-2.0.1.tgz";
-        sha512 = "UmFXIPU+9Eg3E9m/728Bii0lAIuoc+6nbrNUKaRPJOFp91ih44qqGlWtxMB6kXFrRD6po+86ksHM5XHCfk6iPw==";
-      };
-    };
     "xdg-app-paths-5.1.0" = {
       name = "xdg-app-paths";
       packageName = "xdg-app-paths";
@@ -48852,58 +48789,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  "@gitbeaker/cli" = nodeEnv.buildNodePackage {
-    name = "_at_gitbeaker_slash_cli";
-    packageName = "@gitbeaker/cli";
-    version = "42.1.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/@gitbeaker/cli/-/cli-42.1.0.tgz";
-      sha512 = "+xKJs03M3Oh6k6mjTXvmyrNumMrOa8OIeJNxHOh8kJpVvmyFSFHVd6fldQhr3/mXDsKYxhPSh3qEhK8iJYej/w==";
-    };
-    dependencies = [
-      sources."@gitbeaker/core-42.1.0"
-      sources."@gitbeaker/requester-utils-42.1.0"
-      sources."@gitbeaker/rest-42.1.0"
-      sources."ansi-styles-4.3.0"
-      sources."call-bind-apply-helpers-1.0.2"
-      sources."call-bound-1.0.4"
-      sources."chalk-4.1.2"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."dunder-proto-1.0.1"
-      sources."es-define-property-1.0.1"
-      sources."es-errors-1.3.0"
-      sources."es-object-atoms-1.1.1"
-      sources."function-bind-1.1.2"
-      sources."get-intrinsic-1.3.0"
-      sources."get-proto-1.0.1"
-      sources."gopd-1.2.0"
-      sources."has-flag-4.0.0"
-      sources."has-symbols-1.1.0"
-      sources."hasown-2.0.2"
-      sources."math-intrinsics-1.1.0"
-      sources."object-inspect-1.13.4"
-      sources."picomatch-browser-2.2.6"
-      sources."qs-6.14.0"
-      sources."rate-limiter-flexible-4.0.1"
-      sources."side-channel-1.1.0"
-      sources."side-channel-list-1.0.0"
-      sources."side-channel-map-1.0.1"
-      sources."side-channel-weakmap-1.0.2"
-      sources."supports-color-7.2.0"
-      sources."sywac-1.3.0"
-      sources."xcase-2.0.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "CLI implementation of the GitLab API";
-      homepage = "https://github.com/jdalrymple/gitbeaker#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   grunt-cli = nodeEnv.buildNodePackage {
     name = "grunt-cli";
     packageName = "grunt-cli";

From fa58ece43ab3f6ba5d4ea0c47c6559f47ed5bb18 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 16:28:31 +0000
Subject: [PATCH 3873/6226] oh-my-zsh: 2025-10-23 -> 2025-10-27

---
 pkgs/by-name/oh/oh-my-zsh/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/oh/oh-my-zsh/package.nix b/pkgs/by-name/oh/oh-my-zsh/package.nix
index a26fdebf39b5..1aa961d3e26c 100644
--- a/pkgs/by-name/oh/oh-my-zsh/package.nix
+++ b/pkgs/by-name/oh/oh-my-zsh/package.nix
@@ -19,14 +19,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2025-10-23";
+  version = "2025-10-27";
   pname = "oh-my-zsh";
 
   src = fetchFromGitHub {
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    rev = "99017b8eac3d7d0e5ba01c7bf0cf9c6d38985536";
-    sha256 = "sha256-/q9BRzRAzD5iepT2i0y72K4kPAZiJCPbX45boD2V7aU=";
+    rev = "136298e11073c7b34e5a977595c7ba5345ca910e";
+    sha256 = "sha256-4yF9gqC1TJdLAOASp8nP1GTnA2OQVNXrjBlHyyYXDW0=";
   };
 
   strictDeps = true;

From 6061c5123ac1703a455ab7631b17da9f28fc7b6e Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 29 Oct 2025 18:33:29 +0200
Subject: [PATCH 3874/6226] asciidoctor: move to by-name

---
 pkgs/{tools/typesetting => by-name/as}/asciidoctor/Gemfile      | 0
 pkgs/{tools/typesetting => by-name/as}/asciidoctor/Gemfile.lock | 0
 pkgs/{tools/typesetting => by-name/as}/asciidoctor/gemset.nix   | 0
 .../default.nix => by-name/as/asciidoctor/package.nix}          | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 5 files changed, 2 deletions(-)
 rename pkgs/{tools/typesetting => by-name/as}/asciidoctor/Gemfile (100%)
 rename pkgs/{tools/typesetting => by-name/as}/asciidoctor/Gemfile.lock (100%)
 rename pkgs/{tools/typesetting => by-name/as}/asciidoctor/gemset.nix (100%)
 rename pkgs/{tools/typesetting/asciidoctor/default.nix => by-name/as/asciidoctor/package.nix} (100%)

diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile b/pkgs/by-name/as/asciidoctor/Gemfile
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor/Gemfile
rename to pkgs/by-name/as/asciidoctor/Gemfile
diff --git a/pkgs/tools/typesetting/asciidoctor/Gemfile.lock b/pkgs/by-name/as/asciidoctor/Gemfile.lock
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor/Gemfile.lock
rename to pkgs/by-name/as/asciidoctor/Gemfile.lock
diff --git a/pkgs/tools/typesetting/asciidoctor/gemset.nix b/pkgs/by-name/as/asciidoctor/gemset.nix
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor/gemset.nix
rename to pkgs/by-name/as/asciidoctor/gemset.nix
diff --git a/pkgs/tools/typesetting/asciidoctor/default.nix b/pkgs/by-name/as/asciidoctor/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor/default.nix
rename to pkgs/by-name/as/asciidoctor/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f38323f85cb8..8bd0575e7cc6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2299,8 +2299,6 @@ with pkgs;
     enableExtraPlugins = true;
   };
 
-  asciidoctor = callPackage ../tools/typesetting/asciidoctor { };
-
   asciidoctor-with-extensions = callPackage ../tools/typesetting/asciidoctor-with-extensions { };
 
   b2sum = callPackage ../tools/security/b2sum {

From 001cb3b681f82b74ebb98abacfbba2f9f1a881dd Mon Sep 17 00:00:00 2001
From: Doron Behar <doron.behar@gmail.com>
Date: Wed, 29 Oct 2025 18:34:10 +0200
Subject: [PATCH 3875/6226] asciidoctor-with-extensions: move to by-name

---
 .../as}/asciidoctor-with-extensions/Gemfile                     | 0
 .../as}/asciidoctor-with-extensions/Gemfile.lock                | 0
 .../as}/asciidoctor-with-extensions/gemset.nix                  | 0
 .../as/asciidoctor-with-extensions/package.nix}                 | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 5 files changed, 2 deletions(-)
 rename pkgs/{tools/typesetting => by-name/as}/asciidoctor-with-extensions/Gemfile (100%)
 rename pkgs/{tools/typesetting => by-name/as}/asciidoctor-with-extensions/Gemfile.lock (100%)
 rename pkgs/{tools/typesetting => by-name/as}/asciidoctor-with-extensions/gemset.nix (100%)
 rename pkgs/{tools/typesetting/asciidoctor-with-extensions/default.nix => by-name/as/asciidoctor-with-extensions/package.nix} (100%)

diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile b/pkgs/by-name/as/asciidoctor-with-extensions/Gemfile
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile
rename to pkgs/by-name/as/asciidoctor-with-extensions/Gemfile
diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock b/pkgs/by-name/as/asciidoctor-with-extensions/Gemfile.lock
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor-with-extensions/Gemfile.lock
rename to pkgs/by-name/as/asciidoctor-with-extensions/Gemfile.lock
diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix b/pkgs/by-name/as/asciidoctor-with-extensions/gemset.nix
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor-with-extensions/gemset.nix
rename to pkgs/by-name/as/asciidoctor-with-extensions/gemset.nix
diff --git a/pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix b/pkgs/by-name/as/asciidoctor-with-extensions/package.nix
similarity index 100%
rename from pkgs/tools/typesetting/asciidoctor-with-extensions/default.nix
rename to pkgs/by-name/as/asciidoctor-with-extensions/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8bd0575e7cc6..3de7756e4209 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2299,8 +2299,6 @@ with pkgs;
     enableExtraPlugins = true;
   };
 
-  asciidoctor-with-extensions = callPackage ../tools/typesetting/asciidoctor-with-extensions { };
-
   b2sum = callPackage ../tools/security/b2sum {
     inherit (llvmPackages) openmp;
   };

From 7122d0a7e35010d955be699db209063b14db462e Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Wed, 29 Oct 2025 16:45:42 +0000
Subject: [PATCH 3876/6226] lychee: avoid unstable usage of
 fetchgit.leaveDotGit

---
 pkgs/by-name/ly/lychee/package.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ly/lychee/package.nix b/pkgs/by-name/ly/lychee/package.nix
index 44daa281a8ef..64f22e642e7e 100644
--- a/pkgs/by-name/ly/lychee/package.nix
+++ b/pkgs/by-name/ly/lychee/package.nix
@@ -7,7 +7,6 @@
   rustPlatform,
   installShellFiles,
   pkg-config,
-  git,
   openssl,
   testers,
 }:
@@ -23,16 +22,23 @@ rustPlatform.buildRustPackage rec {
   src = fetchFromGitHub {
     owner = "lycheeverse";
     repo = "lychee";
-    rev = "lychee-v${version}";
-    hash = "sha256-zV3EVFFYU9fR5gXPTyYudE8rgAW3eDjOF3sTJMuXzh4=";
-    leaveDotGit = true; # used by lychee to determine latest commit date at build time
+    tag = "lychee-v${version}";
+    leaveDotGit = true;
+    postFetch = ''
+      GIT_DATE=$(git -C $out/.git show -s --format=%cs)
+      substituteInPlace $out/lychee-bin/build.rs \
+        --replace-fail \
+          '("cargo:rustc-env=GIT_DATE={}", git_date())' \
+          '("cargo:rustc-env=GIT_DATE={}", "'$GIT_DATE'")'
+      rm -rf $out/.git
+    '';
+    hash = "sha256-Nt7LsnQkWQS0f2/lS8WNYkI+XbKUSHQ6bNf9FNjfk7A=";
   };
 
   cargoHash = "sha256-1sqFjNil6KktpqrsXXgt3xtOz7eFQc2skkFHqmTMDg4=";
 
   nativeBuildInputs = [
     pkg-config
-    git
     installShellFiles
   ];
 

From 1726819480f72f22ab14c9603079b0b55e150552 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 17:07:24 +0000
Subject: [PATCH 3877/6226] pocket-id: 1.14.1 -> 1.14.2

---
 pkgs/by-name/po/pocket-id/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix
index 4507f4b20cf0..6d4a3087ce73 100644
--- a/pkgs/by-name/po/pocket-id/package.nix
+++ b/pkgs/by-name/po/pocket-id/package.nix
@@ -11,13 +11,13 @@
 
 buildGo125Module (finalAttrs: {
   pname = "pocket-id";
-  version = "1.14.1";
+  version = "1.14.2";
 
   src = fetchFromGitHub {
     owner = "pocket-id";
     repo = "pocket-id";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PnZKlJ6smwpgijqQM5xTcopyGJfO2pebiEJhEIdAOFk=";
+    hash = "sha256-0x80oykzMTEsuGUBtXXdKgWJld8mrDPUssYpAznqKnc=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/backend";

From 231c71af356208c1b4b22fa8d750e5c15c9d4077 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 17:27:05 +0000
Subject: [PATCH 3878/6226] gpxsee: 14.1 -> 15.0

---
 pkgs/by-name/gp/gpxsee/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gp/gpxsee/package.nix b/pkgs/by-name/gp/gpxsee/package.nix
index 0de781b67b92..a6369b371030 100644
--- a/pkgs/by-name/gp/gpxsee/package.nix
+++ b/pkgs/by-name/gp/gpxsee/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpxsee";
-  version = "14.1";
+  version = "15.0";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     tag = finalAttrs.version;
-    hash = "sha256-wXlmly2KtjyY5hdBAroP3H93+1tg5rtFPpDKFn3jnhA=";
+    hash = "sha256-eGLCjOFtEydnEu2QfabGiSlOrXJH2kF9cl8Jyz5a7J4=";
   };
 
   buildInputs = [

From d80eea2ae9743a28af3e8fe0cf0bc24a29d53878 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 28 Oct 2025 23:50:22 +0100
Subject: [PATCH 3879/6226] maintainers: retire coroa

Inactive since 2013.
---
 maintainers/maintainer-list.nix               | 6 ------
 pkgs/applications/audio/quodlibet/default.nix | 1 -
 pkgs/by-name/au/autorandr/package.nix         | 2 +-
 pkgs/by-name/ga/gammu/package.nix             | 2 +-
 pkgs/by-name/li/libunibreak/package.nix       | 2 +-
 5 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 8d672effcb02..29e7b4e3f241 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5239,12 +5239,6 @@
     githubId = 3077118;
     name = "David McFarland";
   };
-  coroa = {
-    email = "jonas@chaoflow.net";
-    github = "coroa";
-    githubId = 2552981;
-    name = "Jonas Hörsch";
-  };
   costrouc = {
     email = "chris.ostrouchov@gmail.com";
     github = "costrouc";
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index 8d6518a1e323..18419b3de771 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -192,7 +192,6 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://quodlibet.readthedocs.io/en/latest";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
-      coroa
       pbogdan
     ];
   };
diff --git a/pkgs/by-name/au/autorandr/package.nix b/pkgs/by-name/au/autorandr/package.nix
index 02da6e73800e..7cd2591fae8b 100644
--- a/pkgs/by-name/au/autorandr/package.nix
+++ b/pkgs/by-name/au/autorandr/package.nix
@@ -82,7 +82,7 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/phillipberndt/autorandr/";
     description = "Automatically select a display configuration based on connected devices";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ coroa ];
+    maintainers = [ ];
     platforms = platforms.unix;
     mainProgram = "autorandr";
   };
diff --git a/pkgs/by-name/ga/gammu/package.nix b/pkgs/by-name/ga/gammu/package.nix
index 314a94685be0..5f820b0c2469 100644
--- a/pkgs/by-name/ga/gammu/package.nix
+++ b/pkgs/by-name/ga/gammu/package.nix
@@ -72,6 +72,6 @@ stdenv.mkDerivation rec {
     description = "Command line utility and library to control mobile phones";
     license = licenses.gpl2Only;
     platforms = platforms.linux;
-    maintainers = [ maintainers.coroa ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/li/libunibreak/package.nix b/pkgs/by-name/li/libunibreak/package.nix
index 978406d4bffa..a3814f545203 100644
--- a/pkgs/by-name/li/libunibreak/package.nix
+++ b/pkgs/by-name/li/libunibreak/package.nix
@@ -27,6 +27,6 @@ stdenv.mkDerivation rec {
     description = "Implementation of line breaking and word breaking algorithms as in the Unicode standard";
     license = licenses.zlib;
     platforms = platforms.unix;
-    maintainers = [ maintainers.coroa ];
+    maintainers = [ ];
   };
 }

From e32b9df95b90e3b471193b4f2410737e8d1e8a7a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 29 Oct 2025 18:41:03 +0100
Subject: [PATCH 3880/6226] default.nix: fix typo

---
 default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.nix b/default.nix
index 5f759c13014d..747bdf57e74f 100644
--- a/default.nix
+++ b/default.nix
@@ -9,7 +9,7 @@ if missingFeatures != [ ] then
     This version of Nixpkgs requires an implementation of Nix with the following features:
     - ${builtins.concatStringsSep "\n- " missingFeatures}
 
-    Your are evaluating with Nix ${builtins.nixVersion or "(too old to know)"}, please upgrade:
+    You are evaluating with Nix ${builtins.nixVersion or "(too old to know)"}, please upgrade:
 
     - If you are running NixOS, `nixos-rebuild' can be used to upgrade your system.
 

From 543b0ae79eff55a8b7a1c2e113aa70f89be54e21 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 17:48:01 +0000
Subject: [PATCH 3881/6226] home-assistant-custom-components.octopus_energy:
 17.0.3 -> 17.1.0

---
 .../custom-components/octopus_energy/package.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix
index 2ea548044e08..b4c68e0d81bb 100644
--- a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
   owner = "BottlecapDave";
   domain = "octopus_energy";
-  version = "17.0.3";
+  version = "17.1.0";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "HomeAssistant-OctopusEnergy";
     tag = "v${version}";
-    hash = "sha256-mogPWl+3BqGSURH7jnbJYB/68ijc1lkfSAc6HfwZWFw=";
+    hash = "sha256-2xfchJUFi8c+DK84p8bdersb/BSTclSz0JU7P9uYatM=";
   };
 
   dependencies = [ pydantic ];

From 822c35fadb7cc373aa70592b9efbe42ee4864efb Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Mon, 27 Oct 2025 19:24:22 +0800
Subject: [PATCH 3882/6226] python313Packages.submitit: move setuptools to
 dependencies

According to https://github.com/facebookincubator/submitit/blob/1.5.3/submitit/core/plugins.py#L24,
setuptools is a python dependency for submitit.
---
 pkgs/development/python-modules/submitit/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/submitit/default.nix b/pkgs/development/python-modules/submitit/default.nix
index a131e66fd255..caaac271ac45 100644
--- a/pkgs/development/python-modules/submitit/default.nix
+++ b/pkgs/development/python-modules/submitit/default.nix
@@ -22,13 +22,11 @@ buildPythonPackage rec {
     hash = "sha256-uBlKbg1oKeUPcWzM9WxisGtpBu69eZyTetaANYpTG5E=";
   };
 
-  build-system = [
-    setuptools
-  ];
+  build-system = [ flit-core ];
 
   dependencies = [
     cloudpickle
-    flit-core
+    setuptools
     typing-extensions
   ];
 

From ae824da885807bb69ec2c9c7f079ae20c51150ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 18:19:01 +0000
Subject: [PATCH 3883/6226] necesse-server: 1.0.1-20510020 -> 1.0.2-20563267

---
 pkgs/by-name/ne/necesse-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/necesse-server/package.nix b/pkgs/by-name/ne/necesse-server/package.nix
index 9875535313ed..53eb6208fbec 100644
--- a/pkgs/by-name/ne/necesse-server/package.nix
+++ b/pkgs/by-name/ne/necesse-server/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "1.0.1-20510020";
+  version = "1.0.2-20563267";
   urlVersion = lib.replaceStrings [ "." ] [ "-" ] version;
 
 in
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {
 
   src = fetchzip {
     url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip";
-    hash = "sha256-e2pnyexvl0mbhlX2Y+4NKJz1VqR1LoV9VlSfqOgXy7E=";
+    hash = "sha256-oDd9ZRCEKHQDaCqrRFiNj8AhNZ+2ZRVdzlooE99Y+VA=";
   };
 
   # removing packaged jre since we use our own

From 244357398c80c4bd8d80dacce8bdb6ff53d9bfdb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 18:21:48 +0000
Subject: [PATCH 3884/6226] flying-carpet: 9.0.0 -> 9.0.6

---
 pkgs/by-name/fl/flying-carpet/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fl/flying-carpet/package.nix b/pkgs/by-name/fl/flying-carpet/package.nix
index d2c15aabcac2..836746465348 100644
--- a/pkgs/by-name/fl/flying-carpet/package.nix
+++ b/pkgs/by-name/fl/flying-carpet/package.nix
@@ -19,13 +19,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "flying-carpet";
-  version = "9.0.0";
+  version = "9.0.6";
 
   src = fetchFromGitHub {
     owner = "spieglt";
     repo = "FlyingCarpet";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xjTypnI6NXG4D3iaSEHcea2as3MSmKVo9x/4JTx9znc=";
+    hash = "sha256-yqY1D7SwTtARqsK/opC0SieCtwosr8zDFlEgmoaTiME=";
   };
 
   cargoHash = "sha256-zoZS7rV5Pou9OmodLF8CqcEsAWFjSdtk/S5OXsnKKyg=";

From 0975473bc7d71af570748d9a12b4aee35a425169 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 18:31:58 +0000
Subject: [PATCH 3885/6226] outline: 0.87.4 -> 1.0.1

---
 pkgs/servers/web-apps/outline/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/web-apps/outline/default.nix b/pkgs/servers/web-apps/outline/default.nix
index a2f9025ba9d3..5beaebc8e937 100644
--- a/pkgs/servers/web-apps/outline/default.nix
+++ b/pkgs/servers/web-apps/outline/default.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "outline";
-  version = "0.87.4";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "outline";
     repo = "outline";
     rev = "v${version}";
-    hash = "sha256-gsQPDbKTzsXV8y8/xMxmhJM6pI+zDkx/r1Zk83ixb7k=";
+    hash = "sha256-2EKI1Zp4bx3SFTxyBm/RtqIbFk1Lv4bkM0on+7xCuso=";
   };
 
   nativeBuildInputs = [
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-/bWDFIGElBc1lMODKTxmSkal9c4L1iTPd521/DVYyxo=";
+    hash = "sha256-QhwNC+a33WKxSUbv8o/9yMIeGMgjVE+6hKOj4VCoiWo=";
   };
 
   configurePhase = ''

From f8cff71e534ac9c0428ce018872f3551649e09c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 18:33:55 +0000
Subject: [PATCH 3886/6226] python3Packages.sagemaker-core: 1.0.59 -> 1.0.61

---
 pkgs/development/python-modules/sagemaker-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix
index 9ca4fbc2431a..b7c084fcd143 100644
--- a/pkgs/development/python-modules/sagemaker-core/default.nix
+++ b/pkgs/development/python-modules/sagemaker-core/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "sagemaker-core";
-  version = "1.0.59";
+  version = "1.0.61";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-core";
     tag = "v${version}";
-    hash = "sha256-h+59FAadpOX9BFl3bnGTDmNOn3oQuPvKyxgfTQ+62g4=";
+    hash = "sha256-RTobN/YZm9YC/wFw1990ZHm8XUqO54LYFG4H++qqSxI=";
   };
 
   build-system = [

From e50e12466679f9619b2839b27bdf9c119edaf4f5 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Wed, 29 Oct 2025 19:47:10 +0100
Subject: [PATCH 3887/6226] codeberg-pages: 6.3 -> 6.4

Diff: https://codeberg.org/Codeberg/pages-server/compare/v6.3...v6.4

Changelog: https://codeberg.org/Codeberg/pages-server/releases/tag/v6.4
---
 pkgs/by-name/co/codeberg-pages/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/codeberg-pages/package.nix b/pkgs/by-name/co/codeberg-pages/package.nix
index 75379f724145..0c64b41bb0fa 100644
--- a/pkgs/by-name/co/codeberg-pages/package.nix
+++ b/pkgs/by-name/co/codeberg-pages/package.nix
@@ -7,17 +7,17 @@
 
 buildGoModule rec {
   pname = "codeberg-pages";
-  version = "6.3";
+  version = "6.4";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "Codeberg";
     repo = "pages-server";
     rev = "v${version}";
-    hash = "sha256-5+4yKcXyKSg7Q2h7W3G6AYkIOmYA4D4DDjdLK57lwdw=";
+    hash = "sha256-xNsob0fW6SaqVKBIgRFj0YZUymHKWWfWZ5UqGkHWOmA=";
   };
 
-  vendorHash = "sha256-EefUX5MEQrJGtUbX/bINcMSJQjnnLzKQt04hENY8G2E=";
+  vendorHash = "sha256-nSFUBIO3ssnwVHcjHRgUWjIK+swZP9PEJOTwM7esIgo=";
 
   postPatch = ''
     # disable httptest

From 2c4a1012c8da55fd9f5102f1fb81bc00f1fec916 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 18:56:56 +0000
Subject: [PATCH 3888/6226] immich-public-proxy: 1.13.7 -> 1.14.1

---
 pkgs/by-name/im/immich-public-proxy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix
index 66bdb472f9e3..96e86ec076dc 100644
--- a/pkgs/by-name/im/immich-public-proxy/package.nix
+++ b/pkgs/by-name/im/immich-public-proxy/package.nix
@@ -8,17 +8,17 @@
 }:
 buildNpmPackage rec {
   pname = "immich-public-proxy";
-  version = "1.13.7";
+  version = "1.14.1";
   src = fetchFromGitHub {
     owner = "alangrainger";
     repo = "immich-public-proxy";
     tag = "v${version}";
-    hash = "sha256-XENy/zmH4UzUaqE4doiSNmTrbrsTMrd/hlhbanEhg6k=";
+    hash = "sha256-M1BFFiToG29TQGOx61J7QOYrv1N2oUAPtN2bYJk1Bmk=";
   };
 
   sourceRoot = "${src.name}/app";
 
-  npmDepsHash = "sha256-T3YPIvK5h3XmCTLybzY1fhjlB2u2fLdeOHiGbT3Xgd4=";
+  npmDepsHash = "sha256-RAerbmCN3znIDqcFrGmfcSFzpj3gb5PbNLTKXLZvH0Y=";
 
   # patch in absolute nix store paths so the process doesn't need to cwd in $out
   postPatch = ''

From e71a19cedc7685b8b1bb18d113e0a0911b01e4fb Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Tue, 21 Oct 2025 15:58:42 -0500
Subject: [PATCH 3889/6226] teams-for-linux: 2.5.10 -> 2.6.6

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/te/teams-for-linux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index 064f9c3b10c5..028f5ace77dd 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "2.5.10";
+  version = "2.6.6";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-AUvsH1ul+pkWQq2GKJTjsds7IPLQoDhWBcu4LN0HRg0=";
+    hash = "sha256-Vf3Fz96kZIASjWeSUGVPKVrn7RBG0PPhFqIz8GOI8K4=";
   };
 
-  npmDepsHash = "sha256-zicJ9orYgnusTHrMX5rSrnsXA1ENjZZJKXvkqn8XLC4=";
+  npmDepsHash = "sha256-HfBSlfa5FzoBlRTIR7ayUs4FwFJisbfLVKbFhf+K218=";
 
   nativeBuildInputs = [
     makeWrapper

From d4f7c29543fecd7ba37dd31f0b6552b5c7b9c322 Mon Sep 17 00:00:00 2001
From: Anthony ROUSSEL <anthony@roussel.dev>
Date: Wed, 29 Oct 2025 20:03:31 +0100
Subject: [PATCH 3890/6226] zabbix-cli: 3.5.2 -> 3.5.3

https://github.com/unioslo/zabbix-cli/compare/3.5.2...3.5.3
---
 pkgs/by-name/za/zabbix-cli/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/za/zabbix-cli/package.nix b/pkgs/by-name/za/zabbix-cli/package.nix
index a5faee7d7820..f21176fb6f8a 100644
--- a/pkgs/by-name/za/zabbix-cli/package.nix
+++ b/pkgs/by-name/za/zabbix-cli/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "zabbix-cli";
-  version = "3.5.2";
+  version = "3.5.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "unioslo";
     repo = "zabbix-cli";
     tag = version;
-    hash = "sha256-Sgt3kVbyzNJCSVUYErHNOrgc7Jd3tIwYhwOESRPeAyw=";
+    hash = "sha256-Fk3o0+cNCX/ixqNd9oldY6JJ+wQWlMjBAEwuAWCLURQ=";
   };
 
   build-system = with python3Packages; [
@@ -56,6 +56,11 @@ python3Packages.buildPythonApplication rec {
     export HOME=$(mktemp -d)
   '';
 
+  disabledTests = [
+    # Disable failing test with Click >= v8.2.0
+    "test_patch_get_click_type"
+  ];
+
   pythonImportsCheck = [ "zabbix_cli" ];
 
   passthru.tests.version = testers.testVersion {

From dd40042302878d15e44a0ef275612a95c72bf507 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 19:16:55 +0000
Subject: [PATCH 3891/6226] cargo-show-asm: 0.2.52 -> 0.2.53

---
 pkgs/by-name/ca/cargo-show-asm/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-show-asm/package.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix
index a9b2a53bb0be..b3da7522a4a7 100644
--- a/pkgs/by-name/ca/cargo-show-asm/package.nix
+++ b/pkgs/by-name/ca/cargo-show-asm/package.nix
@@ -10,14 +10,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-show-asm";
-  version = "0.2.52";
+  version = "0.2.53";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-tQX2A09tnQwq3rr/eQUfTHma4JMpGC89Loy2lH4bAEk=";
+    hash = "sha256-t6HvflVpYa23xRn0Z9bD3RjrFDiBnkhx+0FUtBjTTtg=";
   };
 
-  cargoHash = "sha256-DsK2eKr2eimkwLURij2n7hdOPej6NSi5hNOaLhKRPbA=";
+  cargoHash = "sha256-Y3BIQmQ2eH/QnEdv+skl9ppwEmuJ8JMg8mLgUDGRP+8=";
 
   nativeBuildInputs = [
     installShellFiles

From aeeb97eb190a98aa340a806404dc48cade666df7 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Sat, 13 Sep 2025 10:47:57 +0200
Subject: [PATCH 3892/6226] discourse: 3.4.7 -> 3.5.1

https://meta.discourse.org/t/3-5-0-major-release/379212?tl=en
https://meta.discourse.org/t/3-5-1-security-and-maintenance-release/383511

This release introduces a few rust-based ruby dependencies.

Two plugins were removed
- discourse-migratepassword as it's deprecated
- discourse-topic-voting as it's integrated into discourse core

pgvector extension handling:
Co-Authored-By: talyz <kim.lindberger@gmail.com>
---
 nixos/modules/services/web-apps/discourse.nix |   15 +-
 nixos/tests/discourse.nix                     |    2 +-
 pkgs/servers/web-apps/discourse/default.nix   |  182 ++-
 .../discourse/plugins/all-plugins.nix         |    2 -
 .../plugins/discourse-assign/default.nix      |    4 +-
 .../discourse-bbcode-color/default.nix        |    4 +-
 .../plugins/discourse-calendar/default.nix    |    4 +-
 .../discourse-chat-integration/default.nix    |    4 +-
 .../discourse-data-explorer/default.nix       |    4 +-
 .../plugins/discourse-docs/default.nix        |    4 +-
 .../plugins/discourse-github/Gemfile.lock     |    8 +-
 .../plugins/discourse-github/default.nix      |    4 +-
 .../plugins/discourse-github/gemset.nix       |   16 +-
 .../plugins/discourse-math/default.nix        |    4 +-
 .../plugins/discourse-migratepassword/Gemfile |    9 -
 .../discourse-migratepassword/Gemfile.lock    |   25 -
 .../discourse-migratepassword/default.nix     |   22 -
 .../discourse-migratepassword/gemset.nix      |   70 --
 .../discourse-openid-connect/default.nix      |    4 +-
 .../plugins/discourse-prometheus/default.nix  |    4 +-
 .../plugins/discourse-reactions/default.nix   |    4 +-
 .../discourse-saved-searches/default.nix      |    4 +-
 .../plugins/discourse-solved/default.nix      |    4 +-
 .../plugins/discourse-voting/default.nix      |   21 -
 .../discourse-yearly-review/default.nix       |    4 +-
 .../resolve_generated_assets_symlink.patch    |   13 +
 .../web-apps/discourse/rubyEnv/Gemfile        |   80 +-
 .../web-apps/discourse/rubyEnv/Gemfile.lock   | 1000 +++++++++++----
 .../web-apps/discourse/rubyEnv/gemset.nix     | 1067 +++++++++++------
 pkgs/servers/web-apps/discourse/update.py     |    2 -
 30 files changed, 1688 insertions(+), 902 deletions(-)
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix
 create mode 100644 pkgs/servers/web-apps/discourse/resolve_generated_assets_symlink.patch

diff --git a/nixos/modules/services/web-apps/discourse.nix b/nixos/modules/services/web-apps/discourse.nix
index a5b74025318c..0d08ed6f168c 100644
--- a/nixos/modules/services/web-apps/discourse.nix
+++ b/nixos/modules/services/web-apps/discourse.nix
@@ -17,7 +17,10 @@ let
   upstreamPostgresqlVersion = lib.getVersion pkgs.postgresql_15;
 
   postgresqlPackage =
-    if config.services.postgresql.enable then config.services.postgresql.package else pkgs.postgresql;
+    if config.services.postgresql.enable then
+      config.services.postgresql.finalPackage
+    else
+      pkgs.postgresql;
 
   postgresqlVersion = lib.getVersion postgresqlPackage;
 
@@ -540,7 +543,7 @@ in
     assertions = [
       {
         assertion = (cfg.database.host != null) -> (cfg.database.passwordFile != null);
-        message = "When services.gitlab.database.host is customized, services.discourse.database.passwordFile must be set!";
+        message = "When services.discourse.database.host is customized, services.discourse.database.passwordFile must be set!";
       }
       {
         assertion = cfg.hostname != "";
@@ -694,6 +697,9 @@ in
 
     services.postgresql = lib.mkIf databaseActuallyCreateLocally {
       enable = true;
+      extensions = ps: [
+        ps.pgvector
+      ];
       ensureUsers = [ { name = "discourse"; } ];
     };
 
@@ -719,6 +725,7 @@ in
           psql -tAc "SELECT 1 FROM pg_database WHERE datname = 'discourse'" | grep -q 1 || psql -tAc 'CREATE DATABASE "discourse" OWNER "discourse"'
           psql '${cfg.database.name}' -tAc "CREATE EXTENSION IF NOT EXISTS pg_trgm"
           psql '${cfg.database.name}' -tAc "CREATE EXTENSION IF NOT EXISTS hstore"
+          psql '${cfg.database.name}' -tAc "CREATE EXTENSION IF NOT EXISTS vector"
         '';
 
         serviceConfig = {
@@ -805,8 +812,11 @@ in
 
           cp -r ${cfg.package}/share/discourse/config.dist/* /run/discourse/config/
           cp -r ${cfg.package}/share/discourse/public.dist/* /run/discourse/public/
+          cp -r ${cfg.package.assets.generated}/* /run/discourse/assets-generated/
           ln -sf /var/lib/discourse/uploads /run/discourse/public/uploads
           ln -sf /var/lib/discourse/backups /run/discourse/public/backups
+          # discourse creates images in this folder, and by default it only has u=rx
+          chmod 750 /run/discourse/public/images
 
           (
               umask u=rwx,g=,o=
@@ -839,6 +849,7 @@ in
           "assets/javascripts/plugins"
           "public"
           "sockets"
+          "assets-generated"
         ];
         RuntimeDirectoryMode = "0750";
         StateDirectory = map (p: "discourse/" + p) [
diff --git a/nixos/tests/discourse.nix b/nixos/tests/discourse.nix
index e4b15cd10076..fdf427291497 100644
--- a/nixos/tests/discourse.nix
+++ b/nixos/tests/discourse.nix
@@ -29,7 +29,7 @@ in
   nodes.discourse =
     { nodes, ... }:
     {
-      virtualisation.memorySize = 2048;
+      virtualisation.memorySize = 4096;
       virtualisation.cores = 4;
       virtualisation.useNixStoreImage = true;
       virtualisation.writableStore = false;
diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index a16f259a5c37..ce34806e2a80 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -10,6 +10,7 @@
   callPackage,
   nixosTests,
 
+  defaultGemConfig,
   ruby_3_3,
   gzip,
   gnutar,
@@ -34,6 +35,10 @@
   procps,
   rsync,
   icu,
+  rustPlatform,
+  buildRubyGem,
+  rustc,
+  cargo,
   pnpm_9,
   svgo,
   nodejs,
@@ -46,13 +51,13 @@
 }:
 
 let
-  version = "3.4.7";
+  version = "3.5.1";
 
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse";
     rev = "v${version}";
-    sha256 = "sha256-vidv5aa2r1YOcnvkqrk7ttuIk1bN5Ct7kMANl8kpEm0=";
+    sha256 = "sha256-hMC2YZUxe/zoL2oSMVlWqqiP+UDcJMPVsGzHdh8nwjc=";
   };
 
   ruby = ruby_3_3;
@@ -168,54 +173,116 @@ let
     name = "discourse-ruby-env-${version}";
     inherit version ruby;
     gemdir = ./rubyEnv;
-    gemset =
-      let
-        gems = import ./rubyEnv/gemset.nix;
-      in
-      gems
-      // {
-        mini_racer = gems.mini_racer // {
-          buildInputs = [ icu ];
+    gemset = import ./rubyEnv/gemset.nix;
+    gemConfig = defaultGemConfig // {
+      mini_racer = attrs: {
+        buildInputs = [ icu ];
+        dontBuild = false;
+        NIX_LDFLAGS = "-licui18n";
+      };
+      libv8-node =
+        attrs:
+        let
+          noopScript = writeShellScript "noop" "exit 0";
+          linkFiles = writeShellScript "link-files" ''
+            cd ../..
+
+            mkdir -p vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/
+            ln -s "${nodejs.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a
+
+            ln -s ${nodejs.libv8}/include vendor/v8/include
+
+            mkdir -p ext/libv8-node
+            echo '--- !ruby/object:Libv8::Node::Location::Vendor {}' >ext/libv8-node/.location.yml
+          '';
+        in
+        {
           dontBuild = false;
-          NIX_LDFLAGS = "-licui18n";
-        };
-        libv8-node =
-          let
-            noopScript = writeShellScript "noop" "exit 0";
-            linkFiles = writeShellScript "link-files" ''
-              cd ../..
-
-              mkdir -p vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/
-              ln -s "${nodejs.libv8}/lib/libv8.a" vendor/v8/${stdenv.hostPlatform.system}/libv8/obj/libv8_monolith.a
-
-              ln -s ${nodejs.libv8}/include vendor/v8/include
-
-              mkdir -p ext/libv8-node
-              echo '--- !ruby/object:Libv8::Node::Location::Vendor {}' >ext/libv8-node/.location.yml
-            '';
-          in
-          gems.libv8-node
-          // {
-            dontBuild = false;
-            postPatch = ''
-              cp ${noopScript} libexec/build-libv8
-              cp ${noopScript} libexec/build-monolith
-              cp ${noopScript} libexec/download-node
-              cp ${noopScript} libexec/extract-node
-              cp ${linkFiles} libexec/inject-libv8
-            '';
-          };
-        mini_suffix = gems.mini_suffix // {
-          propagatedBuildInputs = [ libpsl ];
-          dontBuild = false;
-          # Use our libpsl instead of the vendored one, which isn't
-          # available for aarch64. It has to be called
-          # libpsl.x86_64.so or it isn't found.
           postPatch = ''
-            cp $(readlink -f ${lib.getLib libpsl}/lib/libpsl.so) vendor/libpsl.x86_64.so
+            cp ${noopScript} libexec/build-libv8
+            cp ${noopScript} libexec/build-monolith
+            cp ${noopScript} libexec/download-node
+            cp ${noopScript} libexec/extract-node
+            cp ${linkFiles} libexec/inject-libv8
           '';
         };
+      mini_suffix = attrs: {
+        propagatedBuildInputs = [ libpsl ];
+        dontBuild = false;
+        # Use our libpsl instead of the vendored one, which isn't
+        # available for aarch64. It has to be called
+        # libpsl.x86_64.so or it isn't found.
+        postPatch = ''
+          cp $(readlink -f ${lib.getLib libpsl}/lib/libpsl.so) vendor/libpsl.x86_64.so
+        '';
       };
+      tokenizers = attrs: {
+        cargoDeps = rustPlatform.fetchCargoVendor {
+          inherit (buildRubyGem { inherit (attrs) gemName version source; })
+            name
+            src
+            unpackPhase
+            nativeBuildInputs
+            ;
+          hash = "sha256-ydSXo3wp13/mPgJv1HbavNurkd2KxuKzuJNHliPpn2I=";
+        };
+
+        dontBuild = false;
+
+        nativeBuildInputs = [
+          cargo
+          rustc
+          rustPlatform.cargoSetupHook
+          rustPlatform.bindgenHook
+        ];
+
+        disallowedReferences = [
+          rustc.unwrapped
+        ];
+
+        preInstall = ''
+          export CARGO_HOME="$PWD/../.cargo/"
+        '';
+
+        postInstall = ''
+          find $out -type f -name .rustc_info.json -delete
+        '';
+      };
+      tiktoken_ruby = attrs: {
+        cargoDeps = rustPlatform.fetchCargoVendor {
+          inherit (buildRubyGem { inherit (attrs) gemName version source; })
+            name
+            src
+            unpackPhase
+            nativeBuildInputs
+            ;
+          hash = "sha256-IABOxUymtFkF9sl1kRWAS5hM6GNJI6Y4VFICXdX7zF0=";
+        };
+
+        dontBuild = false;
+
+        nativeBuildInputs = [
+          cargo
+          rustc
+          rustPlatform.cargoSetupHook
+          rustPlatform.bindgenHook
+        ];
+
+        disallowedReferences = [
+          rustc.unwrapped
+        ];
+
+        preInstall = ''
+          export CARGO_HOME="$PWD/../.cargo/"
+        '';
+
+        postInstall = ''
+          #ls $GEM_HOME/gems/${attrs.gemName}-${attrs.version}/lib
+          #mv -v $GEM_HOME/gems/${attrs.gemName}-${attrs.version}/lib/{glfm_markdown/glfm_markdown.so,}
+          find $out -type f -name .rustc_info.json -delete
+        '';
+      };
+    };
 
     groups = [
       "default"
@@ -233,11 +300,13 @@ let
       pname = "discourse-assets";
       inherit version src;
       fetcherVersion = 1;
-      hash = "sha256-WyRBnuKCl5NJLtqy3HK/sJcrpMkh0PjbasGPNDV6+7Y=";
+      hash = "sha256-npRKX5Lr2QrPD8OFBysDl30exP+FTnjMxFeR/Gv0Z0I=";
     };
 
     nativeBuildInputs = runtimeDeps ++ [
-      postgresql
+      (postgresql.withPackages (ps: [
+        ps.pgvector
+      ]))
       redis
       uglify-js
       terser
@@ -251,6 +320,7 @@ let
       "out"
       "javascripts"
       "node_modules"
+      "generated"
     ];
 
     patches = [
@@ -274,6 +344,14 @@ let
     ];
 
     env.RAILS_ENV = "production";
+    env.DISCOURSE_DOWNLOAD_PRE_BUILT_ASSETS = "0";
+    # Allow to use different bundler version than the lockfile has
+    env.BUNDLER_VERSION = pkgs.bundler.version;
+
+    # requires full git and repository, even a src `leaveDotGit` is not enough. So patch this function to return the version
+    postPatch = ''
+      substituteInPlace script/assemble_ember_build.rb --replace-fail "def core_tree_hash" "def core_tree_hash; return \"v${version}\""
+    '';
 
     # We have to set up an environment that is close enough to
     # production ready or the assets:precompile task refuses to
@@ -300,6 +378,7 @@ let
       psql -d postgres -tAc 'CREATE DATABASE "discourse" OWNER "discourse"'
       psql 'discourse' -tAc "CREATE EXTENSION IF NOT EXISTS pg_trgm"
       psql 'discourse' -tAc "CREATE EXTENSION IF NOT EXISTS hstore"
+      psql 'discourse' -tAc "CREATE EXTENSION IF NOT EXISTS vector"
 
       ${lib.concatMapStringsSep "\n" (p: "ln -sf ${p} plugins/${p.pluginName or ""}") plugins}
 
@@ -310,6 +389,7 @@ let
     buildPhase = ''
       runHook preBuild
 
+      patchShebangs script/
       bundle exec rake assets:precompile
 
       runHook postBuild
@@ -322,9 +402,10 @@ let
 
       mv node_modules $node_modules
 
-      rm -r app/assets/javascripts/plugins
+      rm -rf app/assets/javascripts/plugins
       mv app/assets/javascripts $javascripts
       ln -sf /run/discourse/assets/javascripts/plugins $javascripts/plugins
+      mv app/assets/generated $generated
 
       runHook postInstall
     '';
@@ -374,6 +455,10 @@ let
       # theme-transpiler over and over again. Which at the same time allows the removal
       # of javascript devDependencies from the runtime environment.
       ./prebuild-theme-transpiler.patch
+
+      # Our app/assets/generated folder is a symlink, but the ruby File.mkdir_p doesn't allow
+      # a symlink in the way to the last directory. This patch explicitly resolves the symlink.
+      ./resolve_generated_assets_symlink.patch
     ];
 
     postPatch = ''
@@ -406,6 +491,7 @@ let
       ln -sf /var/lib/discourse/tmp $out/share/discourse/tmp
       ln -sf /run/discourse/config $out/share/discourse/config
       ln -sf /run/discourse/public $out/share/discourse/public
+      ln -sf /run/discourse/assets-generated $out/share/discourse/app/assets/generated
       ln -sf ${assets.node_modules} $out/share/discourse/node_modules
       ln -sf ${assets} $out/share/discourse/public.dist/assets
       rm -r $out/share/discourse/app/assets/javascripts
diff --git a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix
index 864bdb978d4f..0941b05f404c 100644
--- a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix
@@ -14,7 +14,6 @@ in
   discourse-github = callPackage ./discourse-github { };
   discourse-ldap-auth = callPackage ./discourse-ldap-auth { };
   discourse-math = callPackage ./discourse-math { };
-  discourse-migratepassword = callPackage ./discourse-migratepassword { };
   discourse-oauth2-basic = callPackage ./discourse-oauth2-basic { };
   discourse-openid-connect = callPackage ./discourse-openid-connect { };
   discourse-prometheus = callPackage ./discourse-prometheus { };
@@ -22,6 +21,5 @@ in
   discourse-saved-searches = callPackage ./discourse-saved-searches { };
   discourse-solved = callPackage ./discourse-solved { };
   discourse-spoiler-alert = callPackage ./discourse-spoiler-alert { };
-  discourse-voting = callPackage ./discourse-voting { };
   discourse-yearly-review = callPackage ./discourse-yearly-review { };
 }
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix
index 610d60a3b915..613de051ec14 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix
@@ -9,8 +9,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-assign";
-    rev = "261a47d119d200a8d922d008ad3d1667df869435";
-    sha256 = "sha256-0OClWO70btM7EN7Vir1LIhCTeO5+2jtkP4RozoKzp+0=";
+    rev = "6050446a9920f6ccf0694b38cec611452654b7bc";
+    sha256 = "sha256-MxPCzqRbb9bgmR9OO4gfJUzFvmyBOcU1E1y1FUdUp9M=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-docs";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix
index d1a09684cea5..0acecf9b617b 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-bbcode-color/default.nix
@@ -9,8 +9,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-bbcode-color";
-    rev = "ecd4befeb4eae48aa0a37a88e5aca60e59730411";
-    sha256 = "sha256-enpeXc6pE9+5EdbMIFsnWd++ixlHBKFRxbXmvJYJftg=";
+    rev = "14b8370160cda35568470a36a25e508eb8364609";
+    sha256 = "sha256-3yIV5LKsYSDrhBwsalKZo9jY6j8kNzz99x/AJ95kPuk=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-bbcode-color";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix
index ddde5a700a26..238bc3902ef9 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix
@@ -10,8 +10,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-calendar";
-    rev = "8d09cf8503b78f4c72b47a7319c0f4b9ad0247e7";
-    sha256 = "sha256-ES0/f/sv4Doao/MOdHYMwadRIVXb1I7FgSsl7790tio=";
+    rev = "43e97c16e595f3f80d53a787614eb7c0f9d6a1c1";
+    sha256 = "sha256-zks4zqzc4ZnUxMHSiUkcwaZEzmUXXgFMdiEp6CRPEIU=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-calendar";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix
index d64aea099066..c23408a1c3bc 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix
@@ -9,8 +9,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-chat-integration";
-    rev = "29ad813cd04812786780e1706cbc043810dea7d8";
-    sha256 = "sha256-5mGnHLlw3qIGi8et3WV1RXnrPB+bySi3wQryKTa5wNg=";
+    rev = "428df114ff7f8416314dc585e59bc898ee59c674";
+    sha256 = "sha256-pP9MzQz9nghGIPMnGFOEXxW/OH/8BzHltcxAQboLYec=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-chat-integration";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix
index d5b4a95b5c66..de23b46bf2ac 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix
@@ -9,8 +9,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-data-explorer";
-    rev = "2ba204a1de2638a7959e588b88f3b6c7fcf7a70f";
-    sha256 = "sha256-u8yGKANEyqm63/ZnJLe3u1nkNGZyX0wFUBIKU5GgjzY=";
+    rev = "b61e81fb616ce5880af96584ab9175f07f6362d4";
+    sha256 = "sha256-4E2PR7RwoM/e6cJFuaorK6EYe1nSDKkorJWrlWPzg3g=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-data-explorer";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix
index 573bffa7808a..617da737f0af 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-docs/default.nix
@@ -9,8 +9,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-docs";
-    rev = "4e42539cda9a54d7827bcdf51b6dfbcf56d24cc9";
-    sha256 = "sha256-sv9Q0qEQVncQw3QLiro5YfVcHJAG8sJ0GTjduCZ0iP4=";
+    rev = "ff5d738a9f9d85847e6fc226f8324ad9cf466007";
+    sha256 = "sha256-p5QYM6jbsqe9a3UouHdVimSxZeBvsoM/hb0UQ7iV1IM=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-docs";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock
index f2931a5d4ad1..6414282db56f 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock
@@ -3,20 +3,20 @@ GEM
   specs:
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    faraday (2.12.3)
+    faraday (2.13.4)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.0)
+    faraday-net_http (3.4.1)
       net-http (>= 0.5.0)
-    json (2.10.2)
+    json (2.13.2)
     logger (1.7.0)
     net-http (0.6.0)
       uri
     octokit (5.6.1)
       faraday (>= 1, < 3)
       sawyer (~> 0.9)
-    public_suffix (6.0.1)
+    public_suffix (6.0.2)
     sawyer (0.9.2)
       addressable (>= 2.3.5)
       faraday (>= 0.17.3, < 3)
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix
index 972a06f778c0..e27d192d721f 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix
@@ -10,8 +10,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-github";
-    rev = "59e5fc5692959c6c564ab0e09de364ccfedd6702";
-    sha256 = "sha256-b+8eSw8Kbz2CZN16Rd7c8uyH5P1iYhOJmdXu1C5UclU=";
+    rev = "d0cd63043de2ddac624db61ba282e0474fd447e2";
+    sha256 = "sha256-NDC8KdfbgwM60i9g4PpziWD6uU9Mp67SOG7oYhS4j5I=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-github";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix
index 36d463ebb5c5..7c3adab7270c 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix
@@ -20,10 +20,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0dxalpc0ldvjjmd7z95na9lm99d2baz48sf9axk3a6x3pn50ibdi";
+      sha256 = "09mcghancmn0s5cwk2xz581j3xm3xqxfv0yxg75axnyhrx9gy6f7";
       type = "gem";
     };
-    version = "2.12.3";
+    version = "2.13.4";
   };
   faraday-net_http = {
     dependencies = [ "net-http" ];
@@ -31,20 +31,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1";
+      sha256 = "0fxbckg468dabkkznv48ss8zv14d9cd8mh1rr3m98aw7wzx5fmq9";
       type = "gem";
     };
-    version = "3.4.0";
+    version = "3.4.1";
   };
   json = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "01lbdaizhkxmrw4y8j3wpvsryvnvzmg0pfs56c52laq2jgdfmq1l";
+      sha256 = "0s5vklcy2fgdxa9c6da34jbfrqq7xs6mryjglqqb5iilshcg3q82";
       type = "gem";
     };
-    version = "2.10.2";
+    version = "2.13.2";
   };
   logger = {
     groups = [ "default" ];
@@ -86,10 +86,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
+      sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz";
       type = "gem";
     };
-    version = "6.0.1";
+    version = "6.0.2";
   };
   sawyer = {
     dependencies = [
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix
index db65b1d07a59..6d2115f724bf 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix
@@ -9,8 +9,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-math";
-    rev = "90a56a5b463546cba5017cf25168bae759bcbf77";
-    sha256 = "sha256-q8cNRIHYEkaE6QkdsHu4tPwSw3LnCNgKjbyESBXheE0=";
+    rev = "8db3f371e543bdf21fba35b1a539036386517272";
+    sha256 = "sha256-ARyPDpDUlPlhhw4KL+eo5AUzp1F2moenXEemV72kfsI=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-math";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile
deleted file mode 100644
index ba35ee28efa9..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile
+++ /dev/null
@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-# gem "rails"
-gem 'bcrypt', '3.1.13'
-gem 'unix-crypt', '1.3.0'
-gem 'ffi-compiler', '1.0.1', require: false
-gem 'argon2', '2.2.0'
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock
deleted file mode 100644
index e806952546ee..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/Gemfile.lock
+++ /dev/null
@@ -1,25 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    argon2 (2.2.0)
-      ffi (~> 1.15)
-      ffi-compiler (~> 1.0)
-    bcrypt (3.1.13)
-    ffi (1.17.0)
-    ffi-compiler (1.0.1)
-      ffi (>= 1.0.0)
-      rake
-    rake (13.2.1)
-    unix-crypt (1.3.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  argon2 (= 2.2.0)
-  bcrypt (= 3.1.13)
-  ffi-compiler (= 1.0.1)
-  unix-crypt (= 1.3.0)
-
-BUNDLED WITH
-   2.5.11
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix
deleted file mode 100644
index 862e53fa4433..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-migratepassword";
-  bundlerEnvArgs.gemdir = ./.;
-  src = fetchFromGitHub {
-    owner = "communiteq";
-    repo = "discourse-migratepassword";
-    rev = "a732ae244cd4125561fd225a67bae95ef5f738d0";
-    sha256 = "sha256-EO+QnFTy3PgxZ92DZBm9sP8sFAny3ZpFw+faTX32j7Q=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/communiteq/discourse-migratepassword";
-    maintainers = with maintainers; [ ryantm ];
-    license = licenses.gpl2Only;
-    description = "Support migrated password hashes";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix
deleted file mode 100644
index d1c88454e8bc..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-migratepassword/gemset.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  argon2 = {
-    dependencies = [
-      "ffi"
-      "ffi-compiler"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1wdllcqlr81nzyf485ldv1p660xsi476p79ghbj7zsf3n9n86gwd";
-      type = "gem";
-    };
-    version = "2.2.0";
-  };
-  bcrypt = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0ai0m15jg3n0b22mimk09ppnga316dc7dyvz06w8rrqh5gy1lslp";
-      type = "gem";
-    };
-    version = "3.1.13";
-  };
-  ffi = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "07139870npj59jnl8vmk39ja3gdk3fb5z9vc0lf32y2h891hwqsi";
-      type = "gem";
-    };
-    version = "1.17.0";
-  };
-  ffi-compiler = {
-    dependencies = [
-      "ffi"
-      "rake"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0c2caqm9wqnbidcb8dj4wd3s902z15qmgxplwyfyqbwa0ydki7q1";
-      type = "gem";
-    };
-    version = "1.0.1";
-  };
-  rake = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
-      type = "gem";
-    };
-    version = "13.2.1";
-  };
-  unix-crypt = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1wflipsmmicmgvqilp9pml4x19b337kh6p6jgrzqrzpkq2z52gdq";
-      type = "gem";
-    };
-    version = "1.3.0";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix
index df9095c817d6..9abdf8634081 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix
@@ -10,8 +10,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-openid-connect";
-    rev = "e08efecc012a5ab8fa95084be93d4fd07ccebab9";
-    sha256 = "sha256-v4UWFDdOFON+nHkH490kBQ4sXX7Mrp7KVhN1x9HML7w=";
+    rev = "8b879884b677b60ee726282457427864f2767926";
+    sha256 = "sha256-+j3YRbZYCDnoweyfiCFP3U6AX860B1RQT14IBhnSi4M=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-openid-connect";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix
index 349057769dd8..db3f2d84b027 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-prometheus/default.nix
@@ -10,8 +10,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-prometheus";
-    rev = "f46906e1d555f6838d74ea38d5037264cc1020b0";
-    sha256 = "sha256-czrxhH0L+vCZA8DKN6acW///iWJs9GIppEeaP2MOJBQ=";
+    rev = "a1e0ba671e13ceb9541a4d62d3ff7d206393d438";
+    sha256 = "sha256-tZdRbLxUs4qPbN39g/y1dVCa0b+6Pk8uvCvsKVbUkMk=";
   };
 
   patches = [
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix
index 6733d343c1d0..beace0fe7059 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix
@@ -9,8 +9,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-reactions";
-    rev = "f87583d9054421869ba0de16c24ad15e32bbebe7";
-    sha256 = "sha256-v2AkpSTF3VNgBUfvRMQ3BCw0nClWjcVTdKNn9yiByBM=";
+    rev = "ed83e21e6e722cef3e38d6da083d483bfa14503b";
+    sha256 = "sha256-XA9ADzBzp1TVV4belv4b4GR7xWY/05WFAWRlUBr2M+o=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-reactions";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix
index 3c69b86189e0..0fe4190d41d6 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-saved-searches/default.nix
@@ -9,8 +9,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-saved-searches";
-    rev = "b78aae086e95255b1a1e91a01e2d56b45b7aead2";
-    sha256 = "sha256-Wai+oZR+Pzjre6Th0kQDgvFOwfPRHlZkpKYYOUKNlx4=";
+    rev = "e9afd599d95fa79ba8a37316290c1a059e995e04";
+    sha256 = "sha256-UtXDY3IxxM+JFOGZlN9mgiwrDImOAzJJuHNlhIdnotM=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-saved-searches";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix
index 9c919190dad6..2cb7a168c5a7 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix
@@ -9,8 +9,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-solved";
-    rev = "e82c6ae1ca38ccebb34669148f8de93a3028906e";
-    sha256 = "sha256-KwpBCk4fjkZlSzgtc0OXvQupPd+aPb9nONyyALpEZhg=";
+    rev = "8e777aa05dd3a303ccd772226e24b2e5f4d6be31";
+    sha256 = "sha256-z/fB+QQW6iMBBDHUWvr5UmWyLyo18qnXddEOiPM7aRQ=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-solved";
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix
deleted file mode 100644
index ba4344edae74..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-voting/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-voting";
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-topic-voting";
-    rev = "d779202749e56aaee2d548b538796fb5db1b9b7c";
-    sha256 = "sha256-8YF7W5SXhI7TGJNZkx5or7bxI0MKiDtx10TE2ekBMuM=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-voting";
-    maintainers = with maintainers; [ dpausp ];
-    license = licenses.gpl2Only;
-    description = "Adds the ability for voting on a topic within a specified category in Discourse";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix
index 2d9c8240f0bd..8043d24ad70f 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-yearly-review/default.nix
@@ -9,8 +9,8 @@ mkDiscoursePlugin {
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse-yearly-review";
-    rev = "439e0d78f1d8a0f387c0ec26f233a090ce82ef72";
-    sha256 = "sha256-DXA5P7XnItBjP4H1J/G1cGbFddSDZh0wjMZiJ5JA9s8=";
+    rev = "a6baf4a5998a616091d94c31c23b9930409cd3e2";
+    sha256 = "sha256-KP/lQqS47oGTz4Rw/+0p2LZVQEWdUtx0sRPxh3/Ua8A=";
   };
   meta = with lib; {
     homepage = "https://github.com/discourse/discourse-yearly-review";
diff --git a/pkgs/servers/web-apps/discourse/resolve_generated_assets_symlink.patch b/pkgs/servers/web-apps/discourse/resolve_generated_assets_symlink.patch
new file mode 100644
index 000000000000..895696d3c6e5
--- /dev/null
+++ b/pkgs/servers/web-apps/discourse/resolve_generated_assets_symlink.patch
@@ -0,0 +1,13 @@
+diff --git a/lib/plugin/instance.rb b/lib/plugin/instance.rb
+index a5a5b8f943..30faee615d 100644
+--- a/lib/plugin/instance.rb
++++ b/lib/plugin/instance.rb
+@@ -1383,7 +1383,7 @@ class Plugin::Instance
+     contents = javascript_includes.map { |js| File.read(js) }
+ 
+     if contents.present?
+-      ensure_directory(extra_js_file_path)
++      ensure_directory(File.realpath(extra_js_file_path))
+       Discourse::Utils.atomic_write_file(extra_js_file_path, contents.join("\n;\n"))
+     else
+       begin
diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile
index 869b2d548b3d..1f4e17fe1622 100644
--- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile
+++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile
@@ -1,26 +1,24 @@
 # frozen_string_literal: true
 
+ruby "~> 3.3"
+
 source "https://rubygems.org"
 # if there is a super emergency and rubygems is playing up, try
 #source 'http://production.cf.rubygems.org'
 
 gem "bootsnap", require: false, platform: :mri
 
-gem "actionmailer", "~> 7.2.0"
-gem "actionpack", "~> 7.2.0"
-gem "actionview", "~> 7.2.0"
-gem "activemodel", "~> 7.2.0"
-gem "activerecord", "~> 7.2.0"
-gem "activesupport", "~> 7.2.0"
-gem "railties", "~> 7.2.0"
-gem "sprockets-rails"
+gem "actionmailer", "~> 8.0.0"
+gem "actionpack", "~> 8.0.0"
+gem "actionview", "~> 8.0.0"
+gem "activemodel", "~> 8.0.0"
+gem "activerecord", "~> 8.0.0"
+gem "activesupport", "~> 8.0.0"
+gem "railties", "~> 8.0.0"
 
+gem "propshaft"
 gem "json"
 
-# TODO: At the moment Discourse does not work with Sprockets 4, we would need to correct internals
-# We intend to drop sprockets rather than upgrade to 4.x
-gem "sprockets", "~> 3.7.3"
-
 # this will eventually be added to rails,
 # allows us to precompile all our templates in the unicorn master
 gem "actionview_precompiler", require: false
@@ -31,9 +29,11 @@ gem "mail"
 gem "mini_mime"
 gem "mini_suffix"
 
-# config/initializers/006-mini_profiler.rb depends upon the RedisClient#call.
-# Rework this when upgrading to redis client 5.0 and above.
-gem "redis", "< 5.0"
+# NOTE: hiredis-client is recommended for high performance use of Redis
+# however a recent attempt at an upgrade lead to https://meta.discourse.org/t/rebuild-error/375387
+# for now we are sticking with the socked based implementation that is not sensitive to this issue
+# gem "hiredis-client"
+gem "redis"
 
 # This is explicitly used by Sidekiq and is an optional dependency.
 # We tell Sidekiq to use the namespace "sidekiq" which triggers this
@@ -52,6 +52,7 @@ gem "active_model_serializers", "~> 0.8.3"
 gem "http_accept_language", require: false
 
 gem "discourse-fonts", require: "discourse_fonts"
+gem "discourse-emojis", require: "discourse_emojis"
 
 gem "message_bus"
 
@@ -61,6 +62,7 @@ gem "fastimage"
 
 gem "aws-sdk-s3", require: false
 gem "aws-sdk-sns", require: false
+gem "aws-sdk-mediaconvert", require: false
 gem "excon", require: false
 gem "unf", require: false
 
@@ -98,12 +100,12 @@ gem "rinku"
 gem "sidekiq"
 gem "mini_scheduler"
 
-gem "execjs", require: false
-gem "mini_racer", "0.17.pre13"
+gem "mini_racer"
 
 gem "highline", require: false
 
-gem "rack"
+# When unicorn is not used anymore, we can use Rack 3
+gem "rack", "< 3"
 
 gem "rack-protection" # security
 gem "cbor", require: false
@@ -116,22 +118,16 @@ gem "net-imap", require: false
 gem "net-pop", require: false
 gem "digest", require: false
 
-# Gems used only for assets and not required in production environments by default.
-# Allow everywhere for now cause we are allowing asset debugging in production
-group :assets do
-  gem "uglifier"
-end
+gem "goldiloader", require: false
 
 group :test do
   gem "capybara", require: false
   gem "webmock", require: false
-  gem "fakeweb", require: false
   gem "simplecov", require: false
-  gem "selenium-webdriver", "~> 4.14", require: false
-  gem "selenium-devtools", require: false
   gem "test-prof"
   gem "rails-dom-testing", require: false
   gem "minio_runner", require: false
+  gem "capybara-playwright-driver"
 end
 
 group :test, :development do
@@ -154,10 +150,9 @@ group :test, :development do
 
   gem "rswag-specs"
 
-  gem "annotate"
+  gem "annotaterb"
 
   gem "syntax_tree"
-  gem "syntax_tree-disable_ternary"
 
   gem "rspec-multi-mock"
 end
@@ -173,11 +168,11 @@ end
 
 if ENV["ALLOW_DEV_POPULATE"] == "1"
   gem "discourse_dev_assets"
-  gem "faker", "~> 2.16"
+  gem "faker"
 else
   group :development, :test do
     gem "discourse_dev_assets"
-    gem "faker", "~> 2.16"
+    gem "faker"
   end
 end
 
@@ -292,3 +287,28 @@ end
 gem "dry-initializer", "~> 3.1"
 
 gem "parallel"
+
+# for discourse-zendesk-plugin
+gem "inflection", require: false
+gem "multipart-post", require: false
+gem "faraday-multipart", require: false
+gem "zendesk_api", require: false
+
+# for discourse-subscriptions
+gem "stripe", require: false
+
+# for discourse-github
+gem "sawyer", require: false
+gem "octokit", require: false
+
+# for discourse-ai
+gem "tokenizers", require: false
+gem "tiktoken_ruby", require: false
+gem "discourse_ai-tokenizers", require: false
+gem "ed25519" # TODO: remove this as existing ssl gem should handle this
+gem "Ascii85", require: false
+gem "ruby-rc4", require: false
+gem "hashery", require: false
+gem "ttfunk", require: false
+gem "afm", require: false
+gem "pdf-reader", require: false
diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
index c05f581c03f3..5958232a8a70 100644
--- a/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
+++ b/pkgs/servers/web-apps/discourse/rubyEnv/Gemfile.lock
@@ -1,26 +1,26 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      actionview (= 7.2.2.1)
-      activejob (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    Ascii85 (2.0.1)
+    actionmailer (8.0.2.1)
+      actionpack (= 8.0.2.1)
+      actionview (= 8.0.2.1)
+      activejob (= 8.0.2.1)
+      activesupport (= 8.0.2.1)
       mail (>= 2.8.0)
       rails-dom-testing (~> 2.2)
-    actionpack (7.2.2.1)
-      actionview (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionpack (8.0.2.1)
+      actionview (= 8.0.2.1)
+      activesupport (= 8.0.2.1)
       nokogiri (>= 1.8.5)
-      racc
-      rack (>= 2.2.4, < 3.2)
+      rack (>= 2.2.4)
       rack-session (>= 1.0.1)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.2)
       rails-html-sanitizer (~> 1.6)
       useragent (~> 0.16)
-    actionview (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    actionview (8.0.2.1)
+      activesupport (= 8.0.2.1)
       builder (~> 3.1)
       erubi (~> 1.11)
       rails-dom-testing (~> 2.2)
@@ -29,16 +29,16 @@ GEM
       actionview (>= 6.0.a)
     active_model_serializers (0.8.4)
       activemodel (>= 3.0)
-    activejob (7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activejob (8.0.2.1)
+      activesupport (= 8.0.2.1)
       globalid (>= 0.3.6)
-    activemodel (7.2.2.1)
-      activesupport (= 7.2.2.1)
-    activerecord (7.2.2.1)
-      activemodel (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+    activemodel (8.0.2.1)
+      activesupport (= 8.0.2.1)
+    activerecord (8.0.2.1)
+      activemodel (= 8.0.2.1)
+      activesupport (= 8.0.2.1)
       timeout (>= 0.4.0)
-    activesupport (7.2.2.1)
+    activesupport (8.0.2.1)
       base64
       benchmark (>= 0.3)
       bigdecimal
@@ -50,47 +50,54 @@ GEM
       minitest (>= 5.1)
       securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
     addressable (2.8.7)
       public_suffix (>= 2.0.2, < 7.0)
-    annotate (3.2.0)
-      activerecord (>= 3.2, < 8.0)
-      rake (>= 10.4, < 14.0)
-    ast (2.4.2)
-    aws-eventstream (1.3.0)
-    aws-partitions (1.894.0)
-    aws-sdk-core (3.191.3)
+    afm (1.0.0)
+    annotaterb (4.18.0)
+      activerecord (>= 6.0.0)
+      activesupport (>= 6.0.0)
+    ast (2.4.3)
+    aws-eventstream (1.4.0)
+    aws-partitions (1.1134.0)
+    aws-sdk-core (3.227.0)
       aws-eventstream (~> 1, >= 1.3.0)
-      aws-partitions (~> 1, >= 1.651.0)
-      aws-sigv4 (~> 1.8)
+      aws-partitions (~> 1, >= 1.992.0)
+      aws-sigv4 (~> 1.9)
+      base64
       jmespath (~> 1, >= 1.6.1)
-    aws-sdk-kms (1.77.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
-      aws-sigv4 (~> 1.1)
-    aws-sdk-s3 (1.143.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
+      logger
+    aws-sdk-kms (1.99.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-mediaconvert (1.165.0)
+      aws-sdk-core (~> 3, >= 3.227.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-s3 (1.182.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
       aws-sdk-kms (~> 1)
-      aws-sigv4 (~> 1.8)
-    aws-sdk-sns (1.72.0)
-      aws-sdk-core (~> 3, >= 3.191.0)
-      aws-sigv4 (~> 1.1)
-    aws-sigv4 (1.8.0)
+      aws-sigv4 (~> 1.5)
+    aws-sdk-sns (1.96.0)
+      aws-sdk-core (~> 3, >= 3.216.0)
+      aws-sigv4 (~> 1.5)
+    aws-sigv4 (1.12.1)
       aws-eventstream (~> 1, >= 1.0.2)
-    base64 (0.2.0)
-    benchmark (0.4.0)
+    base64 (0.3.0)
+    benchmark (0.4.1)
     better_errors (2.10.1)
       erubi (>= 1.0.0)
       rack (>= 0.9.0)
       rouge (>= 1.0.0)
-    bigdecimal (3.1.9)
+    bigdecimal (3.2.2)
     binding_of_caller (1.0.1)
       debug_inspector (>= 1.2.0)
-    bootsnap (1.18.4)
+    bootsnap (1.18.6)
       msgpack (~> 1.2)
     builder (3.3.0)
-    bullet (8.0.0)
+    bullet (8.0.8)
       activesupport (>= 3.0.0)
       uniform_notifier (~> 1.11)
-    byebug (11.1.3)
+    byebug (12.0.0)
     capybara (3.40.0)
       addressable
       matrix
@@ -100,14 +107,18 @@ GEM
       rack-test (>= 0.6.3)
       regexp_parser (>= 1.5, < 3.0)
       xpath (~> 3.2)
-    cbor (0.5.9.8)
+    capybara-playwright-driver (0.5.7)
+      addressable
+      capybara
+      playwright-ruby-client (>= 1.16.0)
+    cbor (0.5.10.1)
     certified (1.0.0)
-    cgi (0.4.1)
+    cgi (0.5.0)
     chunky_png (1.4.0)
     coderay (1.1.3)
     colored2 (4.0.3)
     concurrent-ruby (1.3.5)
-    connection_pool (2.5.0)
+    connection_pool (2.5.3)
     cose (1.3.1)
       cbor (~> 0.5.9)
       openssl-signature_algorithm (~> 1.0)
@@ -116,63 +127,93 @@ GEM
       bigdecimal
       rexml
     crass (1.0.6)
-    css_parser (1.21.0)
+    css_parser (1.21.1)
       addressable
-    csv (3.3.2)
+    csv (3.3.5)
     date (3.4.1)
     debug_inspector (1.2.0)
-    diff-lcs (1.5.1)
-    diffy (3.4.3)
+    diff-lcs (1.6.2)
+    diffy (3.4.4)
     digest (3.2.0)
     digest-xxhash (0.2.9)
-    discourse-fonts (0.0.18)
+    discourse-emojis (1.0.41)
+    discourse-fonts (0.0.19)
     discourse-seed-fu (2.3.12)
       activerecord (>= 3.1)
       activesupport (>= 3.1)
-    discourse_dev_assets (0.0.4)
-      faker (~> 2.16)
+    discourse_ai-tokenizers (0.3.1)
+      activesupport (>= 6.0)
+      tiktoken_ruby (~> 0.0.11.1)
+      tokenizers (~> 0.5.4)
+    discourse_dev_assets (0.0.5)
+      faker (~> 3.5.1)
       literate_randomizer
     docile (1.4.1)
-    drb (2.2.1)
+    drb (2.2.3)
     dry-initializer (3.2.0)
+    ed25519 (1.4.0)
     email_reply_trimmer (0.2.0)
+    erb (5.0.2)
     erubi (1.13.1)
-    excon (1.2.3)
-    execjs (2.10.0)
+    excon (1.2.5)
+      logger
     exifr (1.4.1)
-    extralite-bundle (2.8.2)
-    fabrication (2.31.0)
-    faker (2.23.0)
+    extralite-bundle (2.13)
+    fabrication (3.0.0)
+    faker (3.5.2)
       i18n (>= 1.8.11, < 2)
-    fakeweb (1.3.0)
-    faraday (2.12.2)
+    faraday (2.13.4)
       faraday-net_http (>= 2.0, < 3.5)
       json
       logger
-    faraday-net_http (3.4.0)
+    faraday-multipart (1.1.1)
+      multipart-post (~> 2.0)
+    faraday-net_http (3.4.1)
       net-http (>= 0.5.0)
-    faraday-retry (2.2.1)
+    faraday-retry (2.3.2)
       faraday (~> 2.0)
     fast_blank (1.0.1)
     fastimage (2.3.1)
-    ffi (1.17.1)
-    ffi (1.17.1-arm64-darwin)
-    ffi (1.17.1-x86_64-darwin)
+    ffi (1.17.2)
+    ffi (1.17.2-aarch64-linux-gnu)
+    ffi (1.17.2-aarch64-linux-musl)
+    ffi (1.17.2-arm-linux-gnu)
+    ffi (1.17.2-arm-linux-musl)
+    ffi (1.17.2-arm64-darwin)
+    ffi (1.17.2-x86_64-darwin)
+    ffi (1.17.2-x86_64-linux-gnu)
+    ffi (1.17.2-x86_64-linux-musl)
     fspath (3.1.2)
     globalid (1.2.1)
       activesupport (>= 6.1)
-    google-protobuf (4.29.3)
+    goldiloader (5.4.0)
+      activerecord (>= 6.1, < 8.1)
+      activesupport (>= 6.1, < 8.1)
+    google-protobuf (4.32.0)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.29.3-arm64-darwin)
+    google-protobuf (4.32.0-aarch64-linux-gnu)
       bigdecimal
       rake (>= 13)
-    google-protobuf (4.29.3-x86_64-darwin)
+    google-protobuf (4.32.0-aarch64-linux-musl)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.32.0-arm64-darwin)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.32.0-x86_64-darwin)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.32.0-x86_64-linux-gnu)
+      bigdecimal
+      rake (>= 13)
+    google-protobuf (4.32.0-x86_64-linux-musl)
       bigdecimal
       rake (>= 13)
     guess_html_encoding (0.0.11)
     hana (1.3.7)
-    hashdiff (1.1.2)
+    hashdiff (1.2.0)
+    hashery (2.1.2)
     hashie (5.0.0)
     highline (3.1.2)
       reline
@@ -188,15 +229,16 @@ GEM
       progress (~> 3.0, >= 3.0.1)
     image_size (3.4.0)
     in_threads (1.6.0)
-    io-console (0.8.0)
-    irb (1.15.1)
+    inflection (1.0.0)
+    io-console (0.8.1)
+    irb (1.15.2)
       pp (>= 0.6.0)
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     iso8601 (0.13.0)
     jmespath (1.6.2)
-    json (2.9.1)
-    json-schema (5.1.1)
+    json (2.13.2)
+    json-schema (5.2.2)
       addressable (~> 2.8)
       bigdecimal (~> 3.1)
     json_schemer (2.4.0)
@@ -207,10 +249,14 @@ GEM
     jwt (2.10.1)
       base64
     kgio (2.11.4)
-    language_server-protocol (3.17.0.4)
-    libv8-node (22.7.0.4)
-    libv8-node (22.7.0.4-arm64-darwin)
-    libv8-node (22.7.0.4-x86_64-darwin)
+    language_server-protocol (3.17.0.5)
+    libv8-node (24.1.0.0)
+    libv8-node (24.1.0.0-aarch64-linux)
+    libv8-node (24.1.0.0-arm64-darwin)
+    libv8-node (24.1.0.0-x86_64-darwin)
+    libv8-node (24.1.0.0-x86_64-linux)
+    libv8-node (24.1.0.0-x86_64-linux-musl)
+    lint_roller (1.1.0)
     listen (3.9.0)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
@@ -222,8 +268,8 @@ GEM
       railties (>= 4)
       request_store (~> 1.0)
     logstash-event (1.2.02)
-    logster (2.20.0)
-    loofah (2.24.0)
+    logster (2.20.1)
+    loofah (2.24.1)
       crass (~> 1.0.2)
       nokogiri (>= 1.12.0)
     lru_redux (1.1.0)
@@ -233,50 +279,67 @@ GEM
       net-imap
       net-pop
       net-smtp
-    matrix (0.4.2)
+    matrix (0.4.3)
     maxminddb (0.1.22)
     memory_profiler (1.1.0)
-    message_bus (4.3.8)
+    message_bus (4.4.1)
       rack (>= 1.1.3)
     messageformat-wrapper (1.1.0)
       mini_racer (>= 0.6.3)
     method_source (1.1.0)
+    mime-types (3.7.0)
+      logger
+      mime-types-data (~> 3.2025, >= 3.2025.0507)
+    mime-types-data (3.2025.0812)
     mini_mime (1.1.5)
     mini_portile2 (2.8.9)
-    mini_racer (0.17.0.pre13)
-      libv8-node (~> 22.7.0.4)
+    mini_racer (0.19.0)
+      libv8-node (~> 24.1.0.0)
     mini_scheduler (0.18.0)
       sidekiq (>= 6.5, < 8.0)
     mini_sql (1.6.0)
     mini_suffix (0.3.3)
       ffi (~> 1.9)
-    minio_runner (0.1.2)
-    minitest (5.25.4)
+    minio_runner (1.0.0)
+    minitest (5.25.5)
     mocha (2.7.1)
       ruby2_keywords (>= 0.0.5)
-    msgpack (1.7.5)
-    multi_json (1.15.0)
-    multi_xml (0.7.1)
+    msgpack (1.8.0)
+    multi_json (1.17.0)
+    multi_xml (0.7.2)
       bigdecimal (~> 3.1)
+    multipart-post (2.4.1)
     mustache (1.1.1)
     net-http (0.6.0)
       uri
-    net-imap (0.5.5)
+    net-imap (0.5.9)
       date
       net-protocol
     net-pop (0.1.2)
       net-protocol
     net-protocol (0.2.2)
       timeout
-    net-smtp (0.5.0)
+    net-smtp (0.5.1)
       net-protocol
     nio4r (2.7.4)
-    nokogiri (1.18.2)
+    nokogiri (1.18.9)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    nokogiri (1.18.2-arm64-darwin)
+    nokogiri (1.18.9-aarch64-linux-gnu)
       racc (~> 1.4)
-    nokogiri (1.18.2-x86_64-darwin)
+    nokogiri (1.18.9-aarch64-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.9-arm-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.9-arm-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.18.9-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.9-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.9-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.9-x86_64-linux-musl)
       racc (~> 1.4)
     oauth (1.1.0)
       oauth-tty (~> 1.0, >= 1.0.1)
@@ -290,22 +353,26 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 4)
-    oj (3.16.9)
+    octokit (5.6.1)
+      faraday (>= 1, < 3)
+      sawyer (~> 0.9)
+    oj (3.16.11)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
-    omniauth (1.9.2)
+    omniauth (2.1.2)
       hashie (>= 3.4.6)
-      rack (>= 1.6.2, < 3)
+      rack (>= 2.2.3)
+      rack-protection
     omniauth-facebook (9.0.0)
       omniauth-oauth2 (~> 1.2)
-    omniauth-github (1.4.0)
-      omniauth (~> 1.5)
-      omniauth-oauth2 (>= 1.4.0, < 2.0)
-    omniauth-google-oauth2 (0.8.2)
+    omniauth-github (2.0.0)
+      omniauth (~> 2.0)
+      omniauth-oauth2 (~> 1.7.1)
+    omniauth-google-oauth2 (1.0.1)
       jwt (>= 2.0)
       oauth2 (~> 1.1)
-      omniauth (~> 1.1)
-      omniauth-oauth2 (>= 1.6)
+      omniauth (~> 2.0)
+      omniauth-oauth2 (~> 1.7.1)
     omniauth-oauth (1.2.1)
       oauth
       omniauth (>= 1.0, < 3)
@@ -319,40 +386,60 @@ GEM
     openssl (3.3.0)
     openssl-signature_algorithm (1.3.0)
       openssl (> 2.0)
-    optimist (3.2.0)
-    ostruct (0.6.1)
-    parallel (1.26.3)
-    parallel_tests (4.9.0)
+    optimist (3.2.1)
+    ostruct (0.6.3)
+    parallel (1.27.0)
+    parallel_tests (5.4.0)
       parallel
-    parser (3.3.7.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
-    pg (1.5.9)
+    pdf-reader (2.15.0)
+      Ascii85 (>= 1.0, < 3.0, != 2.0.0)
+      afm (>= 0.2.1, < 2)
+      hashery (~> 2.0)
+      ruby-rc4
+      ttfunk
+    pg (1.6.1)
+    pg (1.6.1-aarch64-linux)
+    pg (1.6.1-aarch64-linux-musl)
+    pg (1.6.1-arm64-darwin)
+    pg (1.6.1-x86_64-darwin)
+    pg (1.6.1-x86_64-linux)
+    pg (1.6.1-x86_64-linux-musl)
+    playwright-ruby-client (1.54.1)
+      concurrent-ruby (>= 1.1.6)
+      mime-types (>= 3.0)
     pp (0.6.2)
       prettyprint
     prettier_print (1.2.1)
     prettyprint (0.2.0)
+    prism (1.4.0)
     progress (3.6.0)
-    pry (0.14.2)
+    propshaft (1.2.1)
+      actionpack (>= 7.0.0)
+      activesupport (>= 7.0.0)
+      rack
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
-    pry-byebug (3.10.1)
-      byebug (~> 11.0)
-      pry (>= 0.13, < 0.15)
+    pry-byebug (3.11.0)
+      byebug (~> 12.0)
+      pry (>= 0.13, < 0.16)
     pry-rails (0.3.11)
       pry (>= 0.13.0)
     pry-stack_explorer (0.6.1)
       binding_of_caller (~> 1.0)
       pry (~> 0.13)
-    psych (5.2.3)
+    psych (5.2.6)
       date
       stringio
-    public_suffix (6.0.1)
+    public_suffix (6.0.2)
     puma (6.6.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (2.2.10)
-    rack-mini-profiler (3.3.1)
+    rack (2.2.17)
+    rack-mini-profiler (4.0.1)
       rack (>= 1.2.0)
     rack-protection (3.2.0)
       base64 (>= 0.1.0)
@@ -364,23 +451,23 @@ GEM
     rackup (1.0.1)
       rack (< 3)
       webrick
-    rails-dom-testing (2.2.0)
+    rails-dom-testing (2.3.0)
       activesupport (>= 5.0.0)
       minitest
       nokogiri (>= 1.6)
     rails-html-sanitizer (1.6.2)
       loofah (~> 2.21)
       nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
-    rails_failover (2.2.0)
-      activerecord (>= 6.1, < 8.0)
+    rails_failover (2.3.0)
+      activerecord (>= 6.1, < 9.0)
       concurrent-ruby
-      railties (>= 6.1, < 8.0)
-    rails_multisite (6.1.0)
-      activerecord (>= 6.0)
-      railties (>= 6.0)
-    railties (7.2.2.1)
-      actionpack (= 7.2.2.1)
-      activesupport (= 7.2.2.1)
+      railties (>= 6.1, < 9.0)
+    rails_multisite (7.0.0)
+      activerecord (>= 7.1)
+      railties (>= 7.1)
+    railties (8.0.2.1)
+      actionpack (= 8.0.2.1)
+      activesupport (= 8.0.2.1)
       irb (~> 1.13)
       rackup (>= 1.0.0)
       rake (>= 12.2)
@@ -388,62 +475,67 @@ GEM
       zeitwerk (~> 2.6)
     rainbow (3.1.1)
     raindrops (0.20.1)
-    rake (13.2.1)
+    rake (13.3.0)
     rb-fsevent (0.11.2)
     rb-inotify (0.11.1)
       ffi (~> 1.0)
-    rbtrace (0.5.1)
+    rb_sys (0.9.106)
+    rbtrace (0.5.2)
       ffi (>= 1.0.6)
       msgpack (>= 0.4.3)
       optimist (>= 3.0.0)
     rchardet (1.9.0)
-    rdoc (6.11.0)
+    rdoc (6.14.2)
+      erb
       psych (>= 4.0.0)
-    redcarpet (3.6.0)
-    redis (4.8.1)
+    redcarpet (3.6.1)
+    redis (5.4.0)
+      redis-client (>= 0.22.0)
+    redis-client (0.25.2)
+      connection_pool
     redis-namespace (1.11.0)
       redis (>= 4)
-    regexp_parser (2.10.0)
-    reline (0.6.0)
+    regexp_parser (2.11.2)
+    reline (0.6.2)
       io-console (~> 0.5)
     request_store (1.7.0)
       rack (>= 1.4)
     rexml (3.4.1)
     rinku (2.0.6)
     rotp (6.3.0)
-    rouge (4.5.1)
-    rqrcode (2.2.0)
+    rouge (4.6.0)
+    rqrcode (3.1.0)
       chunky_png (~> 1.0)
-      rqrcode_core (~> 1.0)
-    rqrcode_core (1.2.0)
+      rqrcode_core (~> 2.0)
+    rqrcode_core (2.0.0)
     rrule (0.6.0)
       activesupport (>= 2.3)
-    rspec (3.13.0)
+    rspec (3.13.1)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)
       rspec-mocks (~> 3.13.0)
-    rspec-core (3.13.2)
+    rspec-core (3.13.5)
       rspec-support (~> 3.13.0)
-    rspec-expectations (3.13.3)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-html-matchers (0.10.0)
       nokogiri (~> 1)
       rspec (>= 3.0.0.a)
-    rspec-mocks (3.13.2)
+    rspec-mocks (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.13.0)
     rspec-multi-mock (0.3.1)
       rspec (>= 3.7.0)
-    rspec-rails (7.1.0)
-      actionpack (>= 7.0)
-      activesupport (>= 7.0)
-      railties (>= 7.0)
+    rspec-rails (8.0.2)
+      actionpack (>= 7.2)
+      activesupport (>= 7.2)
+      railties (>= 7.2)
       rspec-core (~> 3.13)
       rspec-expectations (~> 3.13)
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
-    rspec-support (3.13.2)
+    rspec-support (3.13.4)
     rss (0.3.1)
       rexml
     rswag-specs (2.16.0)
@@ -453,42 +545,52 @@ GEM
       rspec-core (>= 2.14)
     rtlcss (0.2.1)
       mini_racer (>= 0.6.3)
-    rubocop (1.71.1)
+    rubocop (1.79.2)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.46.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.0)
-      parser (>= 3.3.1.0)
-    rubocop-capybara (2.21.0)
-      rubocop (~> 1.41)
-    rubocop-discourse (3.9.3)
+    rubocop-ast (1.46.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-capybara (2.22.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-discourse (3.12.1)
       activesupport (>= 6.1)
-      rubocop (>= 1.59.0)
-      rubocop-capybara (>= 2.0.0)
-      rubocop-factory_bot (>= 2.0.0)
-      rubocop-rails (>= 2.25.0)
+      lint_roller (>= 1.1.0)
+      rubocop (>= 1.73.2)
+      rubocop-capybara (>= 2.22.0)
+      rubocop-factory_bot (>= 2.27.0)
+      rubocop-rails (>= 2.30.3)
       rubocop-rspec (>= 3.0.1)
-      rubocop-rspec_rails (>= 2.30.0)
-    rubocop-factory_bot (2.26.1)
-      rubocop (~> 1.61)
-    rubocop-rails (2.29.1)
+      rubocop-rspec_rails (>= 2.31.0)
+    rubocop-factory_bot (2.27.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rails (2.33.3)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.52.0, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rspec (3.4.0)
-      rubocop (~> 1.61)
-    rubocop-rspec_rails (2.30.0)
-      rubocop (~> 1.61)
-      rubocop-rspec (~> 3, >= 3.0.1)
-    ruby-prof (1.7.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    rubocop-rspec (3.6.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rspec_rails (2.31.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+      rubocop-rspec (~> 3.5)
+    ruby-prof (1.7.2)
+      base64
     ruby-progressbar (1.13.0)
+    ruby-rc4 (0.1.5)
     ruby-readability (0.7.2)
       guess_html_encoding (>= 0.0.4)
       nokogiri (>= 1.6.0)
@@ -497,115 +599,151 @@ GEM
     sanitize (7.0.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.16.8)
-    sass-embedded (1.77.5)
-      google-protobuf (>= 3.25, < 5.0)
+    sass-embedded (1.90.0)
+      google-protobuf (~> 4.31)
       rake (>= 13)
-    sass-embedded (1.77.5-arm64-darwin)
-      google-protobuf (>= 3.25, < 5.0)
-    sass-embedded (1.77.5-x86_64-darwin)
-      google-protobuf (>= 3.25, < 5.0)
-    sassc-embedded (1.77.7)
-      sass-embedded (~> 1.77)
+    sass-embedded (1.90.0-aarch64-linux-gnu)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.90.0-aarch64-linux-musl)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.90.0-arm-linux-gnueabihf)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.90.0-arm-linux-musleabihf)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.90.0-arm64-darwin)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.90.0-x86_64-darwin)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.90.0-x86_64-linux-gnu)
+      google-protobuf (~> 4.31)
+    sass-embedded (1.90.0-x86_64-linux-musl)
+      google-protobuf (~> 4.31)
+    sassc-embedded (1.80.5)
+      sass-embedded (~> 1.80)
+    sawyer (0.9.2)
+      addressable (>= 2.3.5)
+      faraday (>= 0.17.3, < 3)
     securerandom (0.4.1)
-    selenium-devtools (0.135.0)
-      selenium-webdriver (~> 4.2)
-    selenium-webdriver (4.31.0)
-      base64 (~> 0.2)
-      logger (~> 1.4)
-      rexml (~> 3.2, >= 3.2.5)
-      rubyzip (>= 1.2.2, < 3.0)
-      websocket (~> 1.0)
-    shoulda-matchers (6.4.0)
+    shoulda-matchers (6.5.0)
       activesupport (>= 5.2.0)
-    sidekiq (6.5.12)
-      connection_pool (>= 2.2.5, < 3)
-      rack (~> 2.0)
-      redis (>= 4.5.0, < 5)
+    sidekiq (7.3.9)
+      base64
+      connection_pool (>= 2.3.0)
+      logger
+      rack (>= 2.2.4)
+      redis-client (>= 0.22.2)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.13.1)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
     simpleidn (0.2.3)
-    snaky_hash (2.0.1)
-      hashie
-      version_gem (~> 1.1, >= 1.1.1)
-    sprockets (3.7.5)
-      base64
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.5.2)
-      actionpack (>= 6.1)
-      activesupport (>= 6.1)
-      sprockets (>= 3.0.0)
-    sqlite3 (2.5.0)
+    snaky_hash (2.0.3)
+      hashie (>= 0.1.0, < 6)
+      version_gem (>= 1.1.8, < 3)
+    sqlite3 (2.7.3)
       mini_portile2 (~> 2.8.0)
-    sqlite3 (2.5.0-arm64-darwin)
-    sqlite3 (2.5.0-x86_64-darwin)
+    sqlite3 (2.7.3-aarch64-linux-gnu)
+    sqlite3 (2.7.3-aarch64-linux-musl)
+    sqlite3 (2.7.3-arm-linux-gnu)
+    sqlite3 (2.7.3-arm-linux-musl)
+    sqlite3 (2.7.3-arm64-darwin)
+    sqlite3 (2.7.3-x86_64-darwin)
+    sqlite3 (2.7.3-x86_64-linux-gnu)
+    sqlite3 (2.7.3-x86_64-linux-musl)
     sshkey (3.0.0)
     stackprof (0.2.27)
-    stringio (3.1.2)
-    syntax_tree (6.2.0)
+    stringio (3.1.7)
+    stripe (11.1.0)
+    syntax_tree (6.3.0)
       prettier_print (>= 1.2.0)
-    syntax_tree-disable_ternary (1.0.0)
     test-prof (1.4.4)
-    thor (1.3.2)
+    thor (1.4.0)
+    tiktoken_ruby (0.0.11.1)
+      rb_sys (= 0.9.106)
+    tiktoken_ruby (0.0.11.1-aarch64-linux)
+    tiktoken_ruby (0.0.11.1-arm-linux)
+    tiktoken_ruby (0.0.11.1-arm64-darwin)
+    tiktoken_ruby (0.0.11.1-x86_64-darwin)
+    tiktoken_ruby (0.0.11.1-x86_64-linux)
+    tiktoken_ruby (0.0.11.1-x86_64-linux-musl)
     timeout (0.4.3)
+    tokenizers (0.5.5)
+      rb_sys
+    tokenizers (0.5.5-aarch64-linux)
+    tokenizers (0.5.5-aarch64-linux-musl)
+    tokenizers (0.5.5-arm64-darwin)
+    tokenizers (0.5.5-x86_64-darwin)
+    tokenizers (0.5.5-x86_64-linux)
+    tokenizers (0.5.5-x86_64-linux-musl)
     trilogy (2.9.0)
+    ttfunk (1.8.0)
+      bigdecimal (~> 3.1)
     tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    tzinfo-data (1.2025.1)
+    tzinfo-data (1.2025.2)
       tzinfo (>= 1.0.0)
-    uglifier (4.2.1)
-      execjs (>= 0.3.0, < 3)
     unf (0.2.0)
-    unicode-display_width (3.1.4)
+    unicode-display_width (3.1.5)
       unicode-emoji (~> 4.0, >= 4.0.4)
     unicode-emoji (4.0.4)
     unicorn (6.1.0)
       kgio (~> 2.6)
       raindrops (~> 0.7)
-    uniform_notifier (1.16.0)
-    uri (1.0.2)
+    uniform_notifier (1.17.0)
+    uri (1.0.3)
     useragent (0.16.11)
-    version_gem (1.1.4)
+    version_gem (1.1.8)
     web-push (3.0.1)
       jwt (~> 2.0)
       openssl (~> 3.0)
-    webmock (3.24.0)
+    webmock (3.25.1)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
     webrick (1.9.1)
-    websocket (1.2.11)
     xpath (3.2.0)
       nokogiri (~> 1.8)
     yaml-lint (0.1.2)
     yard (0.9.37)
-    zeitwerk (2.7.1)
+    zeitwerk (2.7.3)
+    zendesk_api (1.38.0.rc1)
+      faraday (> 2.0.0)
+      faraday-multipart
+      hashie (>= 3.5.2, < 6.0.0)
+      inflection
+      mini_mime
+      multipart-post (~> 2.0)
 
 PLATFORMS
-  arm64-darwin-21
-  arm64-darwin-22
-  arm64-darwin-23
-  arm64-darwin-24
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux
+  arm-linux-gnu
+  arm-linux-gnueabihf
+  arm-linux-musl
+  arm-linux-musleabihf
+  arm64-darwin
   ruby
-  x86_64-darwin-22
-  x86_64-darwin-23
-  x86_64-darwin-24
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
-  actionmailer (~> 7.2.0)
-  actionpack (~> 7.2.0)
-  actionview (~> 7.2.0)
+  Ascii85
+  actionmailer (~> 8.0.0)
+  actionpack (~> 8.0.0)
+  actionview (~> 8.0.0)
   actionview_precompiler
   active_model_serializers (~> 0.8.3)
-  activemodel (~> 7.2.0)
-  activerecord (~> 7.2.0)
-  activesupport (~> 7.2.0)
+  activemodel (~> 8.0.0)
+  activerecord (~> 8.0.0)
+  activesupport (~> 8.0.0)
   addressable
-  annotate
+  afm
+  annotaterb
+  aws-sdk-mediaconvert
   aws-sdk-s3
   aws-sdk-sns
   better_errors
@@ -614,6 +752,7 @@ DEPENDENCIES
   bullet
   byebug
   capybara
+  capybara-playwright-driver
   cbor
   certified
   cgi (>= 0.3.6)
@@ -625,25 +764,30 @@ DEPENDENCIES
   diffy
   digest
   digest-xxhash
+  discourse-emojis
   discourse-fonts
   discourse-seed-fu
+  discourse_ai-tokenizers
   discourse_dev_assets
   dry-initializer (~> 3.1)
+  ed25519
   email_reply_trimmer
   excon
-  execjs
   extralite-bundle
   fabrication
-  faker (~> 2.16)
-  fakeweb
+  faker
   faraday
+  faraday-multipart
   faraday-retry
   fast_blank
   fastimage
+  goldiloader
+  hashery
   highline
   htmlentities
   http_accept_language
   image_optim
+  inflection
   iso8601
   json
   json_schemer
@@ -660,19 +804,21 @@ DEPENDENCIES
   message_bus
   messageformat-wrapper
   mini_mime
-  mini_racer (= 0.17.pre13)
+  mini_racer
   mini_scheduler
   mini_sql
   mini_suffix
   minio_runner
   mocha
   multi_json
+  multipart-post
   mustache
   net-http
   net-imap
   net-pop
   net-smtp
   nokogiri
+  octokit
   oj
   omniauth
   omniauth-facebook
@@ -682,24 +828,26 @@ DEPENDENCIES
   omniauth-twitter
   parallel
   parallel_tests
+  pdf-reader
   pg
+  propshaft
   pry-byebug
   pry-rails
   pry-stack_explorer
   puma
-  rack
+  rack (< 3)
   rack-mini-profiler
   rack-protection
   rails-dom-testing
   rails_failover
   rails_multisite
-  railties (~> 7.2.0)
+  railties (~> 8.0.0)
   rake
   rb-fsevent
   rbtrace
   rchardet
   redcarpet
-  redis (< 5.0)
+  redis
   redis-namespace
   rinku
   rotp
@@ -715,27 +863,27 @@ DEPENDENCIES
   rubocop-discourse
   ruby-prof
   ruby-progressbar
+  ruby-rc4
   ruby-readability
   rubyzip
   sanitize
   sassc-embedded
-  selenium-devtools
-  selenium-webdriver (~> 4.14)
+  sawyer
   shoulda-matchers
   sidekiq
   simplecov
-  sprockets (~> 3.7.3)
-  sprockets-rails
   sqlite3
   sshkey
   stackprof
+  stripe
   syntax_tree
-  syntax_tree-disable_ternary
   test-prof
   thor
+  tiktoken_ruby
+  tokenizers
   trilogy
+  ttfunk
   tzinfo-data
-  uglifier
   unf
   unicorn
   web-push
@@ -743,6 +891,356 @@ DEPENDENCIES
   yaml-lint
   yard
   zeitwerk
+  zendesk_api
+
+CHECKSUMS
+  Ascii85 (2.0.1) sha256=15cb5d941808543cbb9e7e6aea3c8ec3877f154c3461e8b3673e97f7ecedbe5a
+  actionmailer (8.0.2.1) sha256=0de14d8d04541eab130858cb2f0697266be42de1afe1104bc43d7998137ddb9c
+  actionpack (8.0.2.1) sha256=61e7e11a31dbe5152ca57221788bdca42ef302c4cc53b4c8993d68dce8982b0a
+  actionview (8.0.2.1) sha256=2ea6d20ccb0b7b84a221a940ac06853ce99235e4ecb4947815839c7c5ecbf347
+  actionview_precompiler (0.4.0) sha256=33b6bd6ec4c1b856e02fdf5f6512c9eb4a92ac1c0545e941b3e354b7d540ed1c
+  active_model_serializers (0.8.4) sha256=7350e3d3b6a5946bbec033241d908013cc85ff4d584230e6aa074225547c754c
+  activejob (8.0.2.1) sha256=d6e5f2da07ec8efac13a38af1752416770dc74e95783f7b252506d707aa32b89
+  activemodel (8.0.2.1) sha256=17bab6cdb86531844113df22f864480a89a276bf0318246e628f99e0ac077ec4
+  activerecord (8.0.2.1) sha256=a6556e7bdd53f3889d18d2aa3a7ff115fd6c5e1463dd06f97fb88d06b58c6df1
+  activesupport (8.0.2.1) sha256=0405a76fd1ca989975d9ae00d46a4d3979bdf3817482d846b63affa84bd561c6
+  addressable (2.8.7) sha256=462986537cf3735ab5f3c0f557f14155d778f4b43ea4f485a9deb9c8f7c58232
+  afm (1.0.0) sha256=5bd4d6f6241e7014ef090985ec6f4c3e9745f6de0828ddd58bc1efdd138f4545
+  annotaterb (4.18.0) sha256=a07ec5d3e8f063308dbbf17970a74155434504a3c3887511cd94fbc83c4f4294
+  ast (2.4.3) sha256=954615157c1d6a382bc27d690d973195e79db7f55e9765ac7c481c60bdb4d383
+  aws-eventstream (1.4.0) sha256=116bf85c436200d1060811e6f5d2d40c88f65448f2125bc77ffce5121e6e183b
+  aws-partitions (1.1134.0) sha256=28f5f6156777ac346904a79ce6cb3b14a521e3866fee12a0da86d7b500266d3e
+  aws-sdk-core (3.227.0) sha256=99071fc5e3ca9347873fd114574319740c3041745df3c74e27875bd912dfc79e
+  aws-sdk-kms (1.99.0) sha256=ba292fc3ffd672532aae2601fe55ff424eee78da8e23c23ba6ce4037138275a8
+  aws-sdk-mediaconvert (1.165.0) sha256=d955a571cd8b0407c0778e1d0f2333a70bf9ab48e36c81da8c5b317db24001e4
+  aws-sdk-s3 (1.182.0) sha256=d0fc3579395cb6cb69bf6e975240ce031fc673190e74c8dddbdd6c18572b450d
+  aws-sdk-sns (1.96.0) sha256=f92b3c7203c53181b1cafb3dbbea85f330002ad696175bda829cfef359fa6dd4
+  aws-sigv4 (1.12.1) sha256=6973ff95cb0fd0dc58ba26e90e9510a2219525d07620c8babeb70ef831826c00
+  base64 (0.3.0) sha256=27337aeabad6ffae05c265c450490628ef3ebd4b67be58257393227588f5a97b
+  benchmark (0.4.1) sha256=d4ef40037bba27f03b28013e219b950b82bace296549ec15a78016552f8d2cce
+  better_errors (2.10.1) sha256=f798f1bac93f3e775925b7fcb24cffbcf0bb62ee2210f5350f161a6b75fc0a73
+  bigdecimal (3.2.2) sha256=39085f76b495eb39a79ce07af716f3a6829bc35eb44f2195e2753749f2fa5adc
+  binding_of_caller (1.0.1) sha256=2b2902abff4246ddcfbc4da9b69bc4a019e22aeb300c2ff6289a173d4b90b29a
+  bootsnap (1.18.6) sha256=0ae2393c1e911e38be0f24e9173e7be570c3650128251bf06240046f84a07d00
+  builder (3.3.0) sha256=497918d2f9dca528fdca4b88d84e4ef4387256d984b8154e9d5d3fe5a9c8835f
+  bullet (8.0.8) sha256=b4b9905eb6b803d9a0ba620944ed79c8bb27ff3ca90ef8f8e39ff21db5b7c542
+  byebug (12.0.0) sha256=d4a150d291cca40b66ec9ca31f754e93fed8aa266a17335f71bb0afa7fca1a1e
+  capybara (3.40.0) sha256=42dba720578ea1ca65fd7a41d163dd368502c191804558f6e0f71b391054aeef
+  capybara-playwright-driver (0.5.7) sha256=875a1928077d56be8b484f84674901a2374752d7842d93de2045bbede1aad242
+  cbor (0.5.10.1) sha256=79cdf79f18dcd9ee97e0b849c6d573e5a2e3ddc1954d180f384d6ed2612b6df0
+  certified (1.0.0) sha256=aa4cdf0e90e7ee96f6e0ce3daae39eaa8f0486124e0d92daf64d2105aeb9069c
+  cgi (0.5.0) sha256=fe99f65bb2c146e294372ebb27602adbc3b4c008e9ea7038c6bd48c1ec9759da
+  chunky_png (1.4.0) sha256=89d5b31b55c0cf4da3cf89a2b4ebc3178d8abe8cbaf116a1dba95668502fdcfe
+  coderay (1.1.3) sha256=dc530018a4684512f8f38143cd2a096c9f02a1fc2459edcfe534787a7fc77d4b
+  colored2 (4.0.3) sha256=63e1038183976287efc43034f5cca17fb180b4deef207da8ba78d051cbce2b37
+  concurrent-ruby (1.3.5) sha256=813b3e37aca6df2a21a3b9f1d497f8cbab24a2b94cab325bffe65ee0f6cbebc6
+  connection_pool (2.5.3) sha256=cfd74a82b9b094d1ce30c4f1a346da23ee19dc8a062a16a85f58eab1ced4305b
+  cose (1.3.1) sha256=d5d4dbcd6b035d513edc4e1ab9bc10e9ce13b4011c96e3d1b8fe5e6413fd6de5
+  cppjieba_rb (0.4.4) sha256=319a7ab57b6ec28a8d1b223487ecd114432f1930d7740db2f99c1991e6c8faaf
+  crack (1.0.0) sha256=c83aefdb428cdc7b66c7f287e488c796f055c0839e6e545fec2c7047743c4a49
+  crass (1.0.6) sha256=dc516022a56e7b3b156099abc81b6d2b08ea1ed12676ac7a5657617f012bd45d
+  css_parser (1.21.1) sha256=6cfd3ffc0a97333b39d2b1b49c95397b05e0e3b684d68f77ec471ba4ec2ef7c7
+  csv (3.3.5) sha256=6e5134ac3383ef728b7f02725d9872934f523cb40b961479f69cf3afa6c8e73f
+  date (3.4.1) sha256=bf268e14ef7158009bfeaec40b5fa3c7271906e88b196d958a89d4b408abe64f
+  debug_inspector (1.2.0) sha256=9bdfa02eebc3da163833e6a89b154084232f5766087e59573b70521c77ea68a2
+  diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
+  diffy (3.4.4) sha256=79384ab5ca82d0e115b2771f0961e27c164c456074bd2ec46b637ebf7b6e47e3
+  digest (3.2.0) sha256=fa2e7092ec683f65d82fadde5ff4ca3b32e23ee0b19f1fc1a5e09993ad2d3991
+  digest-xxhash (0.2.9) sha256=a989d8309c03c4136a4bea9981ec0a146a2750de7f3dfb7b5624a3038aa598d7
+  discourse-emojis (1.0.41) sha256=b322e1de3849ae437152e267ab35101b57f27303ac7136af482962e48c63cc2a
+  discourse-fonts (0.0.19) sha256=78d4ddd671615908303a675427039d8d787c935e6deae184c6e143c18c6e0033
+  discourse-seed-fu (2.3.12) sha256=4f61d95c11ed54609046cd04eb3a51b531c5fa863fa86d1bea7d74264e5c75e4
+  discourse_ai-tokenizers (0.3.1) sha256=a7752f2f7b4b29fea148e2c893b287a1478c4dc8828f684c09e51d5a33bbc373
+  discourse_dev_assets (0.0.5) sha256=a09a801a210aa3f7247dd382dfd73b389d4bd02be86be675eca2d451f9898285
+  docile (1.4.1) sha256=96159be799bfa73cdb721b840e9802126e4e03dfc26863db73647204c727f21e
+  drb (2.2.3) sha256=0b00d6fdb50995fe4a45dea13663493c841112e4068656854646f418fda13373
+  dry-initializer (3.2.0) sha256=37d59798f912dc0a1efe14a4db4a9306989007b302dcd5f25d0a2a20c166c4e3
+  ed25519 (1.4.0) sha256=16e97f5198689a154247169f3453ef4cfd3f7a47481fde0ae33206cdfdcac506
+  email_reply_trimmer (0.2.0) sha256=05843fa5ee1a2037235f1f3c876e922f613e2b4406fea5bb14212d1708d6c525
+  erb (5.0.2) sha256=d30f258143d4300fb4ecf430042ac12970c9bb4b33c974a545b8f58c1ec26c0f
+  erubi (1.13.1) sha256=a082103b0885dbc5ecf1172fede897f9ebdb745a4b97a5e8dc63953db1ee4ad9
+  excon (1.2.5) sha256=ca040bb61bc0059968f34a17115a00d2db8562e3c0c5c5c7432072b551c85a9d
+  exifr (1.4.1) sha256=768374cc6b6ff3743acba57c1c35229bdd8c6b9fbc1285952047fc1215c4b894
+  extralite-bundle (2.13) sha256=0d00338dd3b348f44a02bb9e93db3714231e7240a48320f1ee3a1db5197db3cc
+  fabrication (3.0.0) sha256=a6a0bfad9071348ad3cb1701df788524b888c0cdd044b988893e7509f7463be3
+  faker (3.5.2) sha256=f9a80291b2e3f259801d1dd552f0732fe04dce5d1f74e798365bc0413789c473
+  faraday (2.13.4) sha256=c719ff52cfd0dbaeca79dd83ed3aeea3f621032abf8bc959d1c05666157cac26
+  faraday-multipart (1.1.1) sha256=77a18ff40149030fd1aef55bb4fc7a67ce46419a8a3fcd010e28c2526e8d8903
+  faraday-net_http (3.4.1) sha256=095757fae7872b94eac839c08a1a4b8d84fd91d6886cfbe75caa2143de64ab3b
+  faraday-retry (2.3.2) sha256=2402d2029032ebd238a2046221e67f6ef0da78c5a8ce8cd4f8b9c62e4d6451d1
+  fast_blank (1.0.1) sha256=269fc30414fed4e6403bc4a49081e1ea539f8b9226e59276ed1efaefabaa17ea
+  fastimage (2.3.1) sha256=23c629f1f3e7d61bcfcc06c25b3d2418bc6bf41d2e615dbf5132c0e3b63ecce9
+  ffi (1.17.2) sha256=297235842e5947cc3036ebe64077584bff583cd7a4e94e9a02fdec399ef46da6
+  ffi (1.17.2-aarch64-linux-gnu) sha256=c910bd3cae70b76690418cce4572b7f6c208d271f323d692a067d59116211a1a
+  ffi (1.17.2-aarch64-linux-musl) sha256=69e6556b091d45df83e6c3b19d3c54177c206910965155a6ec98de5e893c7b7c
+  ffi (1.17.2-arm-linux-gnu) sha256=d4a438f2b40224ae42ec72f293b3ebe0ba2159f7d1bd47f8417e6af2f68dbaa5
+  ffi (1.17.2-arm-linux-musl) sha256=977dfb7f3a6381206dbda9bc441d9e1f9366bf189a634559c3b7c182c497aaa3
+  ffi (1.17.2-arm64-darwin) sha256=54dd9789be1d30157782b8de42d8f887a3c3c345293b57ffb6b45b4d1165f813
+  ffi (1.17.2-x86_64-darwin) sha256=981f2d4e32ea03712beb26e55e972797c2c5a7b0257955d8667ba58f2da6440e
+  ffi (1.17.2-x86_64-linux-gnu) sha256=05d2026fc9dbb7cfd21a5934559f16293815b7ce0314846fee2ac8efbdb823ea
+  ffi (1.17.2-x86_64-linux-musl) sha256=97c0eb3981414309285a64dc4d466bd149e981c279a56371ef811395d68cb95c
+  fspath (3.1.2) sha256=b5ac9bafb97e2c8f8f9e303cd98ebd484be76fe9aa588bc4d01c6d99e78c9d75
+  globalid (1.2.1) sha256=70bf76711871f843dbba72beb8613229a49429d1866828476f9c9d6ccc327ce9
+  goldiloader (5.4.0) sha256=277a86ff424b963bc9d98d8f4d10bb7eea0eb010d3209893dea7092302350b73
+  google-protobuf (4.32.0) sha256=e64bdc0280e9bb9233fa3f62b72a5c4d1522679c5cb4485b0fec726d0b6b96ab
+  google-protobuf (4.32.0-aarch64-linux-gnu) sha256=764c3e3e4e4952f798746e5933375f50609572aa964b767d7ab0f96a57fca788
+  google-protobuf (4.32.0-aarch64-linux-musl) sha256=17d1442d5e266b96362c35fde23722797344083eddef459fe58731babcc7f52e
+  google-protobuf (4.32.0-arm64-darwin) sha256=c2a3508af783e0b72171a400c54040be7f65523126cb83f1686d521ef20f5b9b
+  google-protobuf (4.32.0-x86_64-darwin) sha256=60098f391bbb47c31df8f8fb7f86f307606bf560877f6253f9f142f024d86895
+  google-protobuf (4.32.0-x86_64-linux-gnu) sha256=0813ffbb2cade07e757be35a32036455d52cb18856e34666b508c492925d747b
+  google-protobuf (4.32.0-x86_64-linux-musl) sha256=d26307111f43a27065f38128d744b6e3fcebfb6c6c1595d3755787cda6eebced
+  guess_html_encoding (0.0.11) sha256=cab6468b945f38673fc41ad147fbbc89693b3c6c34b03b071e2ed669a603e098
+  hana (1.3.7) sha256=5425db42d651fea08859811c29d20446f16af196308162894db208cac5ce9b0d
+  hashdiff (1.2.0) sha256=c984f13e115bfc9953332e8e83bd9d769cfde9944e2d54e07eb9df7b76e140b5
+  hashery (2.1.2) sha256=d239cc2310401903f6b79d458c2bbef5bf74c46f3f974ae9c1061fb74a404862
+  hashie (5.0.0) sha256=9d6c4e51f2a36d4616cbc8a322d619a162d8f42815a792596039fc95595603da
+  highline (3.1.2) sha256=67cbd34d19f6ef11a7ee1d82ffab5d36dfd5b3be861f450fc1716c7125f4bb4a
+  htmlentities (4.3.4) sha256=125a73c6c9f2d1b62100b7c3c401e3624441b663762afa7fe428476435a673da
+  http_accept_language (2.1.1) sha256=0043f0d55a148cf45b604dbdd197cb36437133e990016c68c892d49dbea31634
+  i18n (1.14.7) sha256=ceba573f8138ff2c0915427f1fc5bdf4aa3ab8ae88c8ce255eb3ecf0a11a5d0f
+  image_optim (0.31.4) sha256=5bffd0891268e8d189d46ee4b8599918581bba1032d244e6ace4779a434776c0
+  image_size (3.4.0) sha256=c6a580513fe74947e25e5d3f0aea1e33add6c20f7d0007efa65504317b7f029a
+  in_threads (1.6.0) sha256=91a7e6138d279dc632f59b8a9a409e47148948e297c0f69c92f9a2479a182149
+  inflection (1.0.0) sha256=ceba9b26fc28b9af82e33e822d28f78a4312af75687efec81d5ef1062498d355
+  io-console (0.8.1) sha256=1e15440a6b2f67b6ea496df7c474ed62c860ad11237f29b3bd187f054b925fcb
+  irb (1.15.2) sha256=222f32952e278da34b58ffe45e8634bf4afc2dc7aa9da23fed67e581aa50fdba
+  iso8601 (0.13.0) sha256=298c2b15b7be5fa95a1372813d36a2257656cd8e906dfbc1f5cb409851425aa2
+  jmespath (1.6.2) sha256=238d774a58723d6c090494c8879b5e9918c19485f7e840f2c1c7532cf84ebcb1
+  json (2.13.2) sha256=02e1f118d434c6b230a64ffa5c8dee07e3ec96244335c392eaed39e1199dbb68
+  json-schema (5.2.2) sha256=60beae0ed79ca9c552854c9ebfd44f50f77bd0c3144526d46afec384509940d5
+  json_schemer (2.4.0) sha256=56cb6117bb5748d925b33ad3f415b513d41d25d0bbf57fe63c0a78ff05597c24
+  jwt (2.10.1) sha256=e6424ae1d813f63e761a04d6284e10e7ec531d6f701917fadcd0d9b2deaf1cc5
+  kgio (2.11.4) sha256=bda7a2146115998a5b07154e708e0ac02c38dcee7e793c33e2e14f600fdfffc6
+  language_server-protocol (3.17.0.5) sha256=fd1e39a51a28bf3eec959379985a72e296e9f9acfce46f6a79d31ca8760803cc
+  libv8-node (24.1.0.0) sha256=2f0e9ac629c4c5753eaf7001952bb6dce4eb596f3dc0df3049ee7d9cfb9471cd
+  libv8-node (24.1.0.0-aarch64-linux) sha256=fe7787bdb082d1101f65d8f42572ec6c634776a334d82b9fedded152e1d4f358
+  libv8-node (24.1.0.0-arm64-darwin) sha256=f34bdd85787a32a16db137ffbe83feb1cd09f4d69ff3c43cd2f0a675656ee16b
+  libv8-node (24.1.0.0-x86_64-darwin) sha256=243cfae376d7d54b02fb9e8cfd2a2a08e791d066fb78252925a825f05805083b
+  libv8-node (24.1.0.0-x86_64-linux) sha256=0857486e64f7bd4133d4aa607c42d0abade1ab53dffcbfd30f12e0b7dba8f157
+  libv8-node (24.1.0.0-x86_64-linux-musl) sha256=080a243ac014054780cc0d0be2c18b93642a139d09622c0cfd1ebc8614d24437
+  lint_roller (1.1.0) sha256=2c0c845b632a7d172cb849cc90c1bce937a28c5c8ccccb50dfd46a485003cc87
+  listen (3.9.0) sha256=db9e4424e0e5834480385197c139cb6b0ae0ef28cc13310cfd1ca78377d59c67
+  literate_randomizer (0.4.0) sha256=05073c9b383983b1ed7e26c40b963468e91bc86e663b3eeff3a4af91b84217b1
+  logger (1.7.0) sha256=196edec7cc44b66cfb40f9755ce11b392f21f7967696af15d274dde7edff0203
+  lograge (0.14.0) sha256=42371a75823775f166f727639f5ddce73dd149452a55fc94b90c303213dc9ae1
+  logstash-event (1.2.02) sha256=89a7dc60fac67070a5f60ba07409e541b09cb58906c391e90cb74b9f217467ae
+  logster (2.20.1) sha256=a84bbe58e7f99c4eb0246ea3a952ed87950f63aeea3cdbe7147018d10cc9a2a8
+  loofah (2.24.1) sha256=655a30842b70ec476410b347ab1cd2a5b92da46a19044357bbd9f401b009a337
+  lru_redux (1.1.0) sha256=ee71d0ccab164c51de146c27b480a68b3631d5b4297b8ffe8eda1c72de87affb
+  lz4-ruby (0.3.3) sha256=011be5ee230cfddc8308d4e2e0b05300c7bc755a887de799377ca6c5b6aede89
+  mail (2.8.1) sha256=ec3b9fadcf2b3755c78785cb17bc9a0ca9ee9857108a64b6f5cfc9c0b5bfc9ad
+  matrix (0.4.3) sha256=a0d5ab7ddcc1973ff690ab361b67f359acbb16958d1dc072b8b956a286564c5b
+  maxminddb (0.1.22) sha256=50933be438fbed9dceabef4163eab41884bd8830d171fdb8f739bee769c4907e
+  memory_profiler (1.1.0) sha256=79a17df7980a140c83c469785905409d3027ca614c42c086089d128b805aa8f8
+  message_bus (4.4.1) sha256=719ec5c3167e6571030dee0f43eafa99dbf68ae67fca6fd63c265ff55c0c2adb
+  messageformat-wrapper (1.1.0) sha256=ecea879626e412d1bc841c457dacfcbb1a62cf88ca83573e4ea34bb371f160bc
+  method_source (1.1.0) sha256=181301c9c45b731b4769bc81e8860e72f9161ad7d66dd99103c9ab84f560f5c5
+  mime-types (3.7.0) sha256=dcebf61c246f08e15a4de34e386ebe8233791e868564a470c3fe77c00eed5e56
+  mime-types-data (3.2025.0812) sha256=3b94426896fa1390304fb8c6fe23b69c2c6f471aa2bb0b59bd2ddc532bea0538
+  mini_mime (1.1.5) sha256=8681b7e2e4215f2a159f9400b5816d85e9d8c6c6b491e96a12797e798f8bccef
+  mini_portile2 (2.8.9) sha256=0cd7c7f824e010c072e33f68bc02d85a00aeb6fce05bb4819c03dfd3c140c289
+  mini_racer (0.19.0) sha256=9152694738db8b145ced843126e2a391f908732c069cb97bbc909c2bac16bbc1
+  mini_scheduler (0.18.0) sha256=d2f084f38da8d76c5844a92f0d6bd01fc9982a8b5e6c7679b6cf44c82da33503
+  mini_sql (1.6.0) sha256=5296637f6a4af5bb43e06788037e9a2968ff9c8eb65928befcba8cb41f42d6ee
+  mini_suffix (0.3.3) sha256=8d1d33f92f69a2247c9b7d27173235da90479d955cdb863b63a7f53843b722e7
+  minio_runner (1.0.0) sha256=ca0fc56a90c63b65a26cda632938c9075046835d41f4b9d1e165b0550eae0538
+  minitest (5.25.5) sha256=391b6c6cb43a4802bfb7c93af1ebe2ac66a210293f4a3fb7db36f2fc7dc2c756
+  mocha (2.7.1) sha256=8f7d538d5d3ebc75fc788b3d92fbab913a93a78462d2a3ce99d1bdde7af7f851
+  msgpack (1.8.0) sha256=e64ce0212000d016809f5048b48eb3a65ffb169db22238fb4b72472fecb2d732
+  multi_json (1.17.0) sha256=76581f6c96aebf2e85f8a8b9854829e0988f335e8671cd1a56a1036eb75e4a1b
+  multi_xml (0.7.2) sha256=307a96dc48613badb7b2fc174fd4e62d7c7b619bc36ea33bfd0c49f64f5787ce
+  multipart-post (2.4.1) sha256=9872d03a8e552020ca096adadbf5e3cb1cd1cdd6acd3c161136b8a5737cdb4a8
+  mustache (1.1.1) sha256=90891fdd50b53919ca334c8c1031eada1215e78d226d5795e523d6123a2717d0
+  net-http (0.6.0) sha256=9621b20c137898af9d890556848c93603716cab516dc2c89b01a38b894e259fb
+  net-imap (0.5.9) sha256=d95905321e1bd9f294ffc7ff8697be218eee1ec96c8504c0960964d0a0be33fc
+  net-pop (0.1.2) sha256=848b4e982013c15b2f0382792268763b748cce91c9e91e36b0f27ed26420dff3
+  net-protocol (0.2.2) sha256=aa73e0cba6a125369de9837b8d8ef82a61849360eba0521900e2c3713aa162a8
+  net-smtp (0.5.1) sha256=ed96a0af63c524fceb4b29b0d352195c30d82dd916a42f03c62a3a70e5b70736
+  nio4r (2.7.4) sha256=d95dee68e0bb251b8ff90ac3423a511e3b784124e5db7ff5f4813a220ae73ca9
+  nokogiri (1.18.9) sha256=ac5a7d93fd0e3cef388800b037407890882413feccca79eb0272a2715a82fa33
+  nokogiri (1.18.9-aarch64-linux-gnu) sha256=5bcfdf7aa8d1056a7ad5e52e1adffc64ef53d12d0724fbc6f458a3af1a4b9e32
+  nokogiri (1.18.9-aarch64-linux-musl) sha256=55e9e6ca46c4ad1715e313f407d8481d15be1e3b65d9f8e52ba1c124d01676a7
+  nokogiri (1.18.9-arm-linux-gnu) sha256=fe611ae65880e445a9c0f650d52327db239f3488626df4173c05beafd161d46e
+  nokogiri (1.18.9-arm-linux-musl) sha256=935605e14c0ba17da18d203922440bf6c0676c602659278d855d4622d756a324
+  nokogiri (1.18.9-arm64-darwin) sha256=eea3f1f06463ff6309d3ff5b88033c4948d0da1ab3cc0a3a24f63c4d4a763979
+  nokogiri (1.18.9-x86_64-darwin) sha256=e0d2deb03d3d7af8016e8c9df5ff4a7d692159cefb135cbb6a4109f265652348
+  nokogiri (1.18.9-x86_64-linux-gnu) sha256=b52f5defedc53d14f71eeaaf990da66b077e1918a2e13088b6a96d0230f44360
+  nokogiri (1.18.9-x86_64-linux-musl) sha256=e69359d6240c17e64cc9f43970d54f13bfc7b8cc516b819228f687e953425e69
+  oauth (1.1.0) sha256=38902b7f0f5ed91e858d6353f5e1e06b2c16a8aa0fd91984671eab1a1d1cddeb
+  oauth-tty (1.0.5) sha256=34e25c307da4509d4deec266ff3690bbf42e391355f496201c029268862d8b17
+  oauth2 (1.4.11) sha256=6739fcc8872bc94f476b0cae3e8bd78a56d8364b1b79b0757794c25e152d5c10
+  octokit (5.6.1) sha256=48efb2c2aa83c2c394358f073d35ad71d4ac0f14870cd00ceebd3ef3949fe495
+  oj (3.16.11) sha256=2aab609d2bc896529bd3c70d737f591c13932a640ba6164a0f7e414efdb052b1
+  omniauth (2.1.2) sha256=def03277298b8f8a5d3ff16cdb2eb5edb9bffed60ee7dda24cc0c89b3ae6a0ce
+  omniauth-facebook (9.0.0) sha256=440ad8dd9edc9ebec1fd6607b787667c8ce70d2969c2030d7e9ca42a271af854
+  omniauth-github (2.0.0) sha256=1ca26576125a97e27d3f8dc39cd98853d7382dd0fc04a40d3b9ec345ee378649
+  omniauth-google-oauth2 (1.0.1) sha256=2ed7a4ac8d98ab824c95e0d6760784abf1248262b3ba2ab56ec7ebd7074d12a6
+  omniauth-oauth (1.2.1) sha256=25bf22c90234280fa825200490f03ff1ce7d76f1a4fbd6c882c6c5b169c58da8
+  omniauth-oauth2 (1.7.3) sha256=3f5a8f99fa72e0f91d2abd7475ceb972a4ae67ed59e049f314c0c1bad81f4745
+  omniauth-twitter (1.4.0) sha256=c5cc6c77cd767745ffa9ebbd5fbd694a3fa99d1d2d82a4d7def0bf3b6131b264
+  openssl (3.3.0) sha256=ff3a573fc97ab30f69483fddc80029f91669bf36532859bd182d1836f45aee79
+  openssl-signature_algorithm (1.3.0) sha256=a3b40b5e8276162d4a6e50c7c97cdaf1446f9b2c3946a6fa2c14628e0c957e80
+  optimist (3.2.1) sha256=8cf8a0fd69f3aa24ab48885d3a666717c27bc3d9edd6e976e18b9d771e72e34e
+  ostruct (0.6.3) sha256=95a2ed4a4bd1d190784e666b47b2d3f078e4a9efda2fccf18f84ddc6538ed912
+  parallel (1.27.0) sha256=4ac151e1806b755fb4e2dc2332cbf0e54f2e24ba821ff2d3dcf86bf6dc4ae130
+  parallel_tests (5.4.0) sha256=89413fc46e8f6d8e309b0cb1162287ead1c7e9d41a1fee344a73fab4dc14a248
+  parser (3.3.9.0) sha256=94d6929354b1a6e3e1f89d79d4d302cc8f5aa814431a6c9c7e0623335d7687f2
+  pdf-reader (2.15.0) sha256=c5025750bec8de7b11cfd1d1ccc2b944d2782c3638cd15b5ee1531d1206c0886
+  pg (1.6.1) sha256=e210a75e5f702954537e73bb82f90dfbe0c6d9273c018cd0e93e779181028e6b
+  pg (1.6.1-aarch64-linux) sha256=2dc057589c4df67240bd52c68303a00a91299329bc7573b7447faee42331e214
+  pg (1.6.1-aarch64-linux-musl) sha256=24e0c42594601c5021d3243e0e5e6e74d70de83b152d5bcb616ae49d6cac84c0
+  pg (1.6.1-arm64-darwin) sha256=3b502915de30cf5983d62aabae927cb7c3628b0ca46cdf3a6b888af4ff7f42b3
+  pg (1.6.1-x86_64-darwin) sha256=c8930170622c39ee24b318a2265655b5f8f34628444ee00e4ae44068865309f7
+  pg (1.6.1-x86_64-linux) sha256=6ac0d5c8efafc3f22a7eca2a264300037598fabe27a88e5029bc0e6d90caeb1f
+  pg (1.6.1-x86_64-linux-musl) sha256=419a8e971ef122fb758a296424cb245a369c05a797b6c4787902d7d30eefa494
+  playwright-ruby-client (1.54.1) sha256=c097731a9c027ed5a54adaac61ad9e62a318c2ace86fce7c3f85bbd7767682e2
+  pp (0.6.2) sha256=947ec3120c6f92195f8ee8aa25a7b2c5297bb106d83b41baa02983686577b6ff
+  prettier_print (1.2.1) sha256=a72838b5f23facff21f90a5423cdcdda19e4271092b41f4ea7f50b83929e6ff9
+  prettyprint (0.2.0) sha256=2bc9e15581a94742064a3cc8b0fb9d45aae3d03a1baa6ef80922627a0766f193
+  prism (1.4.0) sha256=dc0e3e00e93160213dc2a65519d9002a4a1e7b962db57d444cf1a71565bb703e
+  progress (3.6.0) sha256=360ed306dfa43d6174e847d563c70736dca249e2333cfec4b0387306c86cd573
+  propshaft (1.2.1) sha256=e9b91daf52f21152f851a59f8621af53ffb4dc4401f9b5f8fe16065190b98654
+  pry (0.15.2) sha256=12d54b8640d3fa29c9211dd4ffb08f3fd8bf7a4fd9b5a73ce5b59c8709385b6b
+  pry-byebug (3.11.0) sha256=0b0abb7d309bc7f00044d512a3c8567274f7012b944b38becc8440439a1cea72
+  pry-rails (0.3.11) sha256=a69e28e24a34d75d1f60bcf241192a54253f8f7ef8a62cba1e75750a9653593d
+  pry-stack_explorer (0.6.1) sha256=a2dbea9b47c4ad00cf5c1ce21499f8128b915089e90015f7bafb6e9453baf340
+  psych (5.2.6) sha256=814328aa5dcb6d604d32126a20bc1cbcf05521a5b49dbb1a8b30a07e580f316e
+  public_suffix (6.0.2) sha256=bfa7cd5108066f8c9602e0d6d4114999a5df5839a63149d3e8b0f9c1d3558394
+  puma (6.6.0) sha256=f25c06873eb3d5de5f0a4ebc783acc81a4ccfe580c760cfe323497798018ad87
+  racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
+  rack (2.2.17) sha256=5fe02a1ca80d6fb2271dba00985ee2962d6f5620b6f46dfed89f5301ac4699dd
+  rack-mini-profiler (4.0.1) sha256=485810c23211f908196c896ea10cad72ed68780ee2998bec1f1dfd7558263d78
+  rack-protection (3.2.0) sha256=3c74ba7fc59066453d61af9bcba5b6fe7a9b3dab6f445418d3b391d5ea8efbff
+  rack-session (1.0.2) sha256=a02115e5420b4de036839b9811e3f7967d73446a554b42aa45106af335851d76
+  rack-test (2.2.0) sha256=005a36692c306ac0b4a9350355ee080fd09ddef1148a5f8b2ac636c720f5c463
+  rackup (1.0.1) sha256=ba86604a28989fe1043bff20d819b360944ca08156406812dca6742b24b3c249
+  rails-dom-testing (2.3.0) sha256=8acc7953a7b911ca44588bf08737bc16719f431a1cc3091a292bca7317925c1d
+  rails-html-sanitizer (1.6.2) sha256=35fce2ca8242da8775c83b6ba9c1bcaad6751d9eb73c1abaa8403475ab89a560
+  rails_failover (2.3.0) sha256=eed6ea0674fd6f9f6b070ad297ad2ead121ecf9202920f6068b6a4f29d9491c9
+  rails_multisite (7.0.0) sha256=7aacf364ed86d2bee73fb679cbfe6c343ce89067b9746b3d5857fffc57f036f2
+  railties (8.0.2.1) sha256=54e40e1771fc2878f572d5a4e076cddb057ba8d4d471f8b7d9bfc61bc1301d4c
+  rainbow (3.1.1) sha256=039491aa3a89f42efa1d6dec2fc4e62ede96eb6acd95e52f1ad581182b79bc6a
+  raindrops (0.20.1) sha256=aa0eb9ff6834f2d9e232ba688bd49cb30be893bc5a3452e74722c94c1fab4730
+  rake (13.3.0) sha256=96f5092d786ff412c62fde76f793cc0541bd84d2eb579caa529aa8a059934493
+  rb-fsevent (0.11.2) sha256=43900b972e7301d6570f64b850a5aa67833ee7d87b458ee92805d56b7318aefe
+  rb-inotify (0.11.1) sha256=a0a700441239b0ff18eb65e3866236cd78613d6b9f78fea1f9ac47a85e47be6e
+  rb_sys (0.9.106) sha256=b64d5e4bb33aefa0acec5d829162f211a8f9e5bfe08780ed298c637c7229527c
+  rbtrace (0.5.2) sha256=a2d7d222ab81363aaa0e91337ddbf70df834885d401a80ea0339d86c71f31895
+  rchardet (1.9.0) sha256=26889486cdd83b378652baf7603f71d93e431bb11bc237b4cd8c65151af4a590
+  rdoc (6.14.2) sha256=9fdd44df130f856ae70cc9a264dfd659b9b40de369b16581f4ab746e42439226
+  redcarpet (3.6.1) sha256=d444910e6aa55480c6bcdc0cdb057626e8a32c054c29e793fa642ba2f155f445
+  redis (5.4.0) sha256=798900d869418a9fc3977f916578375b45c38247a556b61d58cba6bb02f7d06b
+  redis-client (0.25.2) sha256=aa37e34c29da39fdb0b8663e7a649adb0923959cd4a9351befe2cd19e6f8d6f0
+  redis-namespace (1.11.0) sha256=e91a1aa2b2d888b6dea1d4ab8d39e1ae6fac3426161feb9d91dd5cca598a2239
+  regexp_parser (2.11.2) sha256=5e5e9c1485ffd8de53ab1d2807affd81f617f72967dfc64fc75a69e2cbf0ff98
+  reline (0.6.2) sha256=1dad26a6008872d59c8e05244b119347c9f2ddaf4a53dce97856cd5f30a02846
+  request_store (1.7.0) sha256=e1b75d5346a315f452242a68c937ef8e48b215b9453a77a6c0acdca2934c88cb
+  rexml (3.4.1) sha256=c74527a9a0a04b4ec31dbe0dc4ed6004b960af943d8db42e539edde3a871abca
+  rinku (2.0.6) sha256=8b60670e3143f3db2b37efa262971ce3619ec23092045498ef9f077d82828d7d
+  rotp (6.3.0) sha256=75d40087e65ed0d8022c33055a6306c1c400d1c12261932533b5d6cbcd868854
+  rouge (4.6.0) sha256=10198622df0ef919796da5686a9cc116a49280805e1ed4b851c97ef677eddd7a
+  rqrcode (3.1.0) sha256=e2d5996375f6e9a013823c289ed575dbea678b8e0388574302c1fac563f098af
+  rqrcode_core (2.0.0) sha256=1e40b823ab57a96482a417fff5dd5c33645a00cea6ef5d9e342fecc5ef91d9ab
+  rrule (0.6.0) sha256=bd123b4df7eb086a6388d9c47e8ecaad3708433d11c57a195a50d4d0dd4e9616
+  rspec (3.13.1) sha256=b9f9a58fa915b8d94a1d6b3195fe6dd28c4c34836a6097015142c4a9ace72140
+  rspec-core (3.13.5) sha256=ab3f682897c6131c67f9a17cfee5022a597f283aebe654d329a565f9937a4fa3
+  rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
+  rspec-html-matchers (0.10.0) sha256=d424bfeb0104884478be299b6695b56c2d0432bb77dc9cedecb5138e91c0e9ae
+  rspec-mocks (3.13.5) sha256=e4338a6f285ada9fe56f5893f5457783af8194f5d08884d17a87321d5195ea81
+  rspec-multi-mock (0.3.1) sha256=289470f28d1d9dcdecabf70e9a14f97b0dc7e3dba090dfbe4c98c64ebd53794c
+  rspec-rails (8.0.2) sha256=113139a53f5d068d4f48d1c29ad5f982013ed9b0daa69d7f7b266eda5d433ace
+  rspec-support (3.13.4) sha256=184b1814f6a968102b57df631892c7f1990a91c9a3b9e80ef892a0fc2a71a3f7
+  rss (0.3.1) sha256=b46234c04551b925180f8bedfc6f6045bf2d9998417feda72f300e7980226737
+  rswag-specs (2.16.0) sha256=8ba26085c408b0bd2ed21dc8015c80f417c7d34c63720ab7133c2549b5bd2a91
+  rtlcss (0.2.1) sha256=213d5a00bf61267f93a7a516d699d77e1cc5f396743abb33c01e3f3243a7bf60
+  rubocop (1.79.2) sha256=d3f42a7d197952c2a163719c5462fea827710a435b18bfb7070c6eedd2e90391
+  rubocop-ast (1.46.0) sha256=0da7f6ad5b98614f89b74f11873c191059c823eae07d6ffd40a42a3338f2232b
+  rubocop-capybara (2.22.1) sha256=ced88caef23efea53f46e098ff352f8fc1068c649606ca75cb74650970f51c0c
+  rubocop-discourse (3.12.1) sha256=ebf7e2224f053047372071419052828c3e3a01bccb14ea1f282ac143547df9bc
+  rubocop-factory_bot (2.27.1) sha256=9d744b5916778c1848e5fe6777cc69855bd96548853554ec239ba9961b8573fe
+  rubocop-rails (2.33.3) sha256=848c011b58c1292f3066246c9eb18abf6ffcfbce28bc57c4ab888bbec79af74b
+  rubocop-rspec (3.6.0) sha256=c0e4205871776727e54dee9cc91af5fd74578001551ba40e1fe1a1ab4b404479
+  rubocop-rspec_rails (2.31.0) sha256=775375e18a26a1184a812ef3054b79d218e85601b9ae897f38f8be24dddf1f45
+  ruby-prof (1.7.2) sha256=270424fcac37e611f2d15a55226c4628e234f8434e1d7c25ca8a2155b9fc4340
+  ruby-progressbar (1.13.0) sha256=80fc9c47a9b640d6834e0dc7b3c94c9df37f08cb072b7761e4a71e22cff29b33
+  ruby-rc4 (0.1.5) sha256=00cc40a39d20b53f5459e7ea006a92cf584e9bc275e2a6f7aa1515510e896c03
+  ruby-readability (0.7.2) sha256=7351ddc89ac62ecdd35336acb1313ac29dc1dad9745d59f25109ec2215c6580c
+  ruby2_keywords (0.0.5) sha256=ffd13740c573b7301cf7a2e61fc857b2a8e3d3aff32545d6f8300d8bae10e3ef
+  rubyzip (2.4.1) sha256=8577c88edc1fde8935eb91064c5cb1aef9ad5494b940cf19c775ee833e075615
+  sanitize (7.0.0) sha256=269d1b9d7326e69307723af5643ec032ff86ad616e72a3b36d301ac75a273984
+  sass-embedded (1.90.0) sha256=e1ebd6dcc2c94f30bab081e9b35a7a0579abdff51fee7032bef68298ae6c44d5
+  sass-embedded (1.90.0-aarch64-linux-gnu) sha256=e8ce5d2b026a63564a07691b50f1481849ed46afa3e92c3b760150efb6aebab8
+  sass-embedded (1.90.0-aarch64-linux-musl) sha256=8df2c75b68ca0c55e3d0ad910c647d34ac8b0fd2869128864c370cde0170efe8
+  sass-embedded (1.90.0-arm-linux-gnueabihf) sha256=a150421af6900fce707edcde12b4d5f6c9b85f11256ec26383363ce6611244a2
+  sass-embedded (1.90.0-arm-linux-musleabihf) sha256=4e125094f86cc3d7577f7fef67ece0e874d4ea790467e698e7ce169d1a518dd9
+  sass-embedded (1.90.0-arm64-darwin) sha256=c3ff4f4b3cb692a16b31b1a678deb6ffb2704f6aee6a8552fa63153f2f9c9c8d
+  sass-embedded (1.90.0-x86_64-darwin) sha256=cc7770bfbc34bc0c4ad7740523c5ed63500fda44b1c088ec9bc1a53206bdb52c
+  sass-embedded (1.90.0-x86_64-linux-gnu) sha256=cfcead0b72810818186459b14e587a94aa8bb15a167185898154f7b9d5a63036
+  sass-embedded (1.90.0-x86_64-linux-musl) sha256=fffd0ee0dff16fa2ce572228fa7d4f5ed1f9aff6b2b6a79af92cb2000a7b5a71
+  sassc-embedded (1.80.5) sha256=b2720c938de54e9798bea17bc044ea0df05f552acec30b8e9a79060cceb9cb3e
+  sawyer (0.9.2) sha256=fa3a72d62a4525517b18857ddb78926aab3424de0129be6772a8e2ba240e7aca
+  securerandom (0.4.1) sha256=cc5193d414a4341b6e225f0cb4446aceca8e50d5e1888743fac16987638ea0b1
+  shoulda-matchers (6.5.0) sha256=ef6b572b2bed1ac4aba6ab2c5ff345a24b6d055a93a3d1c3bfc86d9d499e3f44
+  sidekiq (7.3.9) sha256=1108712e1def89002b28e3545d5ae15d4a57ffd4d2c25d97bb1360988826b5a7
+  simplecov (0.22.0) sha256=fe2622c7834ff23b98066bb0a854284b2729a569ac659f82621fc22ef36213a5
+  simplecov-html (0.13.2) sha256=bd0b8e54e7c2d7685927e8d6286466359b6f16b18cb0df47b508e8d73c777246
+  simplecov_json_formatter (0.1.4) sha256=529418fbe8de1713ac2b2d612aa3daa56d316975d307244399fa4838c601b428
+  simpleidn (0.2.3) sha256=08ce96f03fa1605286be22651ba0fc9c0b2d6272c9b27a260bc88be05b0d2c29
+  snaky_hash (2.0.3) sha256=25a3d299566e8153fb02fa23fd9a9358845950f7a523ddbbe1fa1e0d79a6d456
+  sqlite3 (2.7.3) sha256=d2b2fecd9341132f2cea3fde9061ee0fab9c9d532a8ecccfab4fe63d9621bf57
+  sqlite3 (2.7.3-aarch64-linux-gnu) sha256=00bab7e2ceb7e911b0a2c516bcb9ec0aa7ee57b9b231419e1788515319ac4317
+  sqlite3 (2.7.3-aarch64-linux-musl) sha256=035dca6c5bc0f45bb059f33cf774e96462563e460a2d5bd48972562bf3a78c8b
+  sqlite3 (2.7.3-arm-linux-gnu) sha256=c22a2593a8274cba5fc55be415cfddab3ff5d3275b5a78878daf214bf2a60db1
+  sqlite3 (2.7.3-arm-linux-musl) sha256=e735bea1c81eceff2e1b3388e6bccbcbf5c81405f7dbd69b5c80b3b4c4a92c89
+  sqlite3 (2.7.3-arm64-darwin) sha256=133772f4312a9d0fa0c16aab7c2abdda2ee93f47dded0f353a2981f7b9d2b9b4
+  sqlite3 (2.7.3-x86_64-darwin) sha256=a857e364e858d79e634c66c02c130f79c633f0035d422b3381be9958859771f4
+  sqlite3 (2.7.3-x86_64-linux-gnu) sha256=11b2612fddf56602d238be7a984fa0633e591edd034f7520747bc0927b7fa865
+  sqlite3 (2.7.3-x86_64-linux-musl) sha256=4307278661bbe0a619da7a5da25f4417f6826246ee7b4a56a5c10c3731d5256a
+  sshkey (3.0.0) sha256=655ba351d6e01a48dfe59d65530af8975c777b8cc57a061770de3228ff2d11cd
+  stackprof (0.2.27) sha256=aff6d28656c852e74cf632cc2046f849033dc1dedffe7cb8c030d61b5745e80c
+  stringio (3.1.7) sha256=5b78b7cb242a315fb4fca61a8255d62ec438f58da2b90be66048546ade4507fa
+  stripe (11.1.0) sha256=a76e82cc7e4d2433803ca5fbe9453d019df376236f0b9fbcb7f36e6dd327f98d
+  syntax_tree (6.3.0) sha256=56e25a9692c798ec94c5442fe94c5e94af76bef91edc8bb02052cbdecf35f13d
+  test-prof (1.4.4) sha256=1a59513ed9d33a1f5ca17c0b89da4e70f60a91c83ec62e9a873dbb99141353ef
+  thor (1.4.0) sha256=8763e822ccb0f1d7bee88cde131b19a65606657b847cc7b7b4b82e772bcd8a3d
+  tiktoken_ruby (0.0.11.1) sha256=adffa735711bf1b19554423c82ba2e2be4a77d7776186cbaf19f837680f8cb8b
+  tiktoken_ruby (0.0.11.1-aarch64-linux) sha256=1ffcfcf1a7ac561e2e08996a60b3ee4213923b02184d29da2eb76c3be0c54001
+  tiktoken_ruby (0.0.11.1-arm-linux) sha256=2f1b79eadf62c2ea2691821f1d1c008b402e0e48d9baef2fc52d648b0744b7a5
+  tiktoken_ruby (0.0.11.1-arm64-darwin) sha256=9b0f2a863bf6dbad2c78f95d8566e39fbb2293be552a7cc16a93e638a0b823e1
+  tiktoken_ruby (0.0.11.1-x86_64-darwin) sha256=554c84d14e66a7cef277b00ec26ce6c201d6b94d223f8d71397b1287cda11d78
+  tiktoken_ruby (0.0.11.1-x86_64-linux) sha256=ab56c936876c2ccba41fd8dc6588097e6555345ad0bdf5f4204be771a3637618
+  tiktoken_ruby (0.0.11.1-x86_64-linux-musl) sha256=fd52104cbeb14471136f8519a07eef457ca84d01693bfb9b92b150a1fb3f42f6
+  timeout (0.4.3) sha256=9509f079b2b55fe4236d79633bd75e34c1c1e7e3fb4b56cb5fda61f80a0fe30e
+  tokenizers (0.5.5) sha256=7bf1600567a3f253ec3f24da51af338437ecd1c638874122a9c57ea1724f4d92
+  tokenizers (0.5.5-aarch64-linux) sha256=55ac300cdcefcb4dccbe5b1577920d3ab47dab404c4e70a442aa5c97f084790d
+  tokenizers (0.5.5-aarch64-linux-musl) sha256=ddd23414ef60e15860a1ec804496ff053aa817956036594923a086c2897c492a
+  tokenizers (0.5.5-arm64-darwin) sha256=3a1606ce6aa918d89eea816b2de4cba9a7b5ad76ba1b42ad3ff44f6ff6208a85
+  tokenizers (0.5.5-x86_64-darwin) sha256=892594b0406c9890d45b4a2fbf16d75e7075472029a48fd84b776d5ee9863e17
+  tokenizers (0.5.5-x86_64-linux) sha256=e9681afe50dc74beed880bed08d385ebb1d22d51831d9169e285f3836306730c
+  tokenizers (0.5.5-x86_64-linux-musl) sha256=f5ccc321a58b58b45ee85042ea384fb0f99600361ecd1260f77bfd020b8bdb0a
+  trilogy (2.9.0) sha256=a2d63b663ba68a4758e15d1f9afb228f5d16efc7fe7cea68699e1c106ef6067f
+  ttfunk (1.8.0) sha256=a7cbc7e489cc46e979dde04d34b5b9e4f5c8f1ee5fc6b1a7be39b829919d20ca
+  tzinfo (2.0.6) sha256=8daf828cc77bcf7d63b0e3bdb6caa47e2272dcfaf4fbfe46f8c3a9df087a829b
+  tzinfo-data (1.2025.2) sha256=a92375a1fbb47d38fe88fd514c40a38cc8f97d168da2a6479f15185e86470939
+  unf (0.2.0) sha256=e6bcc2e101d80e3f9459753db747d5926aada1aaaf61e629e93359da9a5b04ab
+  unicode-display_width (3.1.5) sha256=bf566817855ee7ee3adcf7bace0d5906cb14401417db59193f8a5fcedf02dd4e
+  unicode-emoji (4.0.4) sha256=2c2c4ef7f353e5809497126285a50b23056cc6e61b64433764a35eff6c36532a
+  unicorn (6.1.0) sha256=45dd987add4c2b084c1880a68373af42797a704ad7441faff9b14b4982aa0fc0
+  uniform_notifier (1.17.0) sha256=db4787ed2ad168ccb0ad4027a45811e1c9e2f8275682fee72697e6ce1c6d6ca7
+  uri (1.0.3) sha256=e9f2244608eea2f7bc357d954c65c910ce0399ca5e18a7a29207ac22d8767011
+  useragent (0.16.11) sha256=700e6413ad4bb954bb63547fa098dddf7b0ebe75b40cc6f93b8d54255b173844
+  version_gem (1.1.8) sha256=a964767ecbe36551b9ff2e59099548c27569f2f7f94bdb09f609d76393a8e008
+  web-push (3.0.1) sha256=5b4dd2f2bba3bd8951da6416492fe920a6f203d14d3080f943c5d01c0cc4b18d
+  webmock (3.25.1) sha256=ab9d5d9353bcbe6322c83e1c60a7103988efc7b67cd72ffb9012629c3d396323
+  webrick (1.9.1) sha256=b42d3c94f166f3fb73d87e9b359def9b5836c426fc8beacf38f2184a21b2a989
+  xpath (3.2.0) sha256=6dfda79d91bb3b949b947ecc5919f042ef2f399b904013eb3ef6d20dd3a4082e
+  yaml-lint (0.1.2) sha256=e3960b171766ae187338a169815e99fe10fcb0d9c22b1c539e8d57e114324c8a
+  yard (0.9.37) sha256=a6e910399e78e613f80ba9add9ba7c394b1a935f083cccbef82903a3d2a26992
+  zeitwerk (2.7.3) sha256=b2e86b4a9b57d26ba68a15230dcc7fe6f040f06831ce64417b0621ad96ba3e85
+  zendesk_api (1.38.0.rc1) sha256=9ebe2575d223ed1c0651b2d10df6c010141cda49d524c38532b472f7e8bb3f7a
+
+RUBY VERSION
+   ruby 3.3.1p55
 
 BUNDLED WITH
-   2.6.9
+   2.5.22
diff --git a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix
index 81bfd5bf56dd..248c7b7f5dcc 100644
--- a/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix
+++ b/pkgs/servers/web-apps/discourse/rubyEnv/gemset.nix
@@ -12,17 +12,16 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07xjqxmwif57wxz28ch10c3c2261ydv1x56vsiidg2icqciyaamh";
+      sha256 = "176vgl9rhy9xqi5i1qdgw4ny8sr6jw32zjsq109sn7jl0j6lvq8d";
       type = "gem";
     };
-    version = "7.2.2.1";
+    version = "8.0.2.1";
   };
   actionpack = {
     dependencies = [
       "actionview"
       "activesupport"
       "nokogiri"
-      "racc"
       "rack"
       "rack-session"
       "rack-test"
@@ -38,10 +37,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0d7pq6fsf041fvskzmqm12xcgk5m9d5fa6kbs1lsbmfbgc51dchp";
+      sha256 = "02ibk3ldqs1xk74b8lycqh1g6bm4vj5ph8bjlln1brfv64df3rv1";
       type = "gem";
     };
-    version = "7.2.2.1";
+    version = "8.0.2.1";
   };
   actionview = {
     dependencies = [
@@ -59,10 +58,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19arngl1nshasvbh90gzc23z1vpid2xzg3043grbmcfqyc68iz39";
+      sha256 = "0izkrdg7r7432mw99d7cwhsr5s9whl3aqh5946i88yqbrc6d59if";
       type = "gem";
     };
-    version = "7.2.2.1";
+    version = "8.0.2.1";
   };
   actionview_precompiler = {
     dependencies = [ "actionview" ];
@@ -95,10 +94,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0nryqb19i3frxhanykf6lmrw0rb09863z114gi7sm55kff2mmygj";
+      sha256 = "129bldx70vahaargg0spx5sdqw378591gbrq7b0zm3pc0zdg5rfn";
       type = "gem";
     };
-    version = "7.2.2.1";
+    version = "8.0.2.1";
   };
   activemodel = {
     dependencies = [ "activesupport" ];
@@ -110,10 +109,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bzxvccj8349slymls7navb5y14anglkkasphcd6gi72kqgqd643";
+      sha256 = "1i3y0ynf16cgc9p28603pxva528a91jgh8nz2d0q8cb5p36vdfhp";
       type = "gem";
     };
-    version = "7.2.2.1";
+    version = "8.0.2.1";
   };
   activerecord = {
     dependencies = [
@@ -129,10 +128,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1fgscw775wj4l7f5pj274a984paz23zy0111giqkhl9dqdqiz8vr";
+      sha256 = "1wbdijshd3dqgzwhdpb32ig6rz8my5zkmanj32fqiwskvmxnwmd6";
       type = "gem";
     };
-    version = "7.2.2.1";
+    version = "8.0.2.1";
   };
   activesupport = {
     dependencies = [
@@ -147,6 +146,7 @@
       "minitest"
       "securerandom"
       "tzinfo"
+      "uri"
     ];
     groups = [
       "default"
@@ -156,10 +156,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1xa7hr4gp2p86ly6n1j2skyx8pfg6yi621kmnh7zhxr9m7wcnaw4";
+      sha256 = "1ik1sm5sizrsnr3di0klh7rvsy9r9mmd805fv5srk66as5psf184";
       type = "gem";
     };
-    version = "7.2.2.1";
+    version = "8.0.2.1";
   };
   addressable = {
     dependencies = [ "public_suffix" ];
@@ -176,10 +176,20 @@
     };
     version = "2.8.7";
   };
-  annotate = {
+  afm = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0ia5iw9xvvy1igaxsa08vvv4b5ry9ipyr18917pi8w0y4kvddm2v";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
+  annotaterb = {
     dependencies = [
       "activerecord"
-      "rake"
+      "activesupport"
     ];
     groups = [
       "development"
@@ -188,10 +198,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1lw0fxb5mirsdp3bp20gjyvs7clvi19jbxnrm2ihm20kzfhvlqcs";
+      sha256 = "15229wyciywlrl8pb263lc24ahsm86kp0ygipf6k0qzhx39wazm0";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "4.18.0";
+  };
+  Ascii85 = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0nmyxpngg5rycyryhq9l9hapz1y3iqyflskyksxkqm0832a5vjqm";
+      type = "gem";
+    };
+    version = "2.0.1";
   };
   ast = {
     groups = [
@@ -202,46 +222,48 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
+      sha256 = "10yknjyn0728gjn6b5syynvrvrwm66bhssbxq8mkhshxghaiailm";
       type = "gem";
     };
-    version = "2.4.2";
+    version = "2.4.3";
   };
   aws-eventstream = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gvdg4yx4p9av2glmp7vsxhs0n8fj1ga9kq2xdb8f95j7b04qhzi";
+      sha256 = "0fqqdqg15rgwgz3mn4pj91agd20csk9gbrhi103d20328dfghsqi";
       type = "gem";
     };
-    version = "1.3.0";
+    version = "1.4.0";
   };
   aws-partitions = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fhym2gsm9kzl74nvzk3hhw288n1l77kxinhik43p37ayranzcv5";
+      sha256 = "0gkd4q0bbmw6vah15vkghvij398l7g5yd7570ilk9b3pcwazdx98";
       type = "gem";
     };
-    version = "1.894.0";
+    version = "1.1134.0";
   };
   aws-sdk-core = {
     dependencies = [
       "aws-eventstream"
       "aws-partitions"
       "aws-sigv4"
+      "base64"
       "jmespath"
+      "logger"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "088nq8yz9n4p7pnhjwp9nbxlkj7jwchpkzvnl4nybfb1dkvk4dns";
+      sha256 = "17n7vw9djnw74x7cgwsxfi0k033l351mf56i7y3lg4yawg2iy1wr";
       type = "gem";
     };
-    version = "3.191.3";
+    version = "3.227.0";
   };
   aws-sdk-kms = {
     dependencies = [
@@ -252,10 +274,24 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gbxms3daszl4mk89swjrpq3fqgm9lg0wl65yjfp0nfz8jm4jyqf";
+      sha256 = "1a3mh89kfh6flqxw48wfv9wfwkj2zxazw096mqm56wnnzz1jyads";
       type = "gem";
     };
-    version = "1.77.0";
+    version = "1.99.0";
+  };
+  aws-sdk-mediaconvert = {
+    dependencies = [
+      "aws-sdk-core"
+      "aws-sigv4"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1r0182r7scavikd82v7392mzj2x76cihy7cffz00f14brmqsamfr";
+      type = "gem";
+    };
+    version = "1.165.0";
   };
   aws-sdk-s3 = {
     dependencies = [
@@ -267,10 +303,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1safbxycz517m2v981z8kbmdiqx9jypl093ia0mcrskkgh4fyb3s";
+      sha256 = "03a55dbihv6xvgfwhx0f35rwc7q3rr0555vfpxlwpdjw75wkbz6h";
       type = "gem";
     };
-    version = "1.143.0";
+    version = "1.182.0";
   };
   aws-sdk-sns = {
     dependencies = [
@@ -281,10 +317,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ql1y276lfk27dyisk8ak1wdnysklw2dcir3kgy05glzzc9j4z1w";
+      sha256 = "1m3dz9cz7zlwhbd5n5wnsqm00c7khpmbnggvraqq2cf50dr3qazr";
       type = "gem";
     };
-    version = "1.72.0";
+    version = "1.96.0";
   };
   aws-sigv4 = {
     dependencies = [ "aws-eventstream" ];
@@ -292,23 +328,31 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1g3w27wzjy4si6kp49w10as6ml6g6zl3xrfqs5ikpfciidv9kpc4";
+      sha256 = "003ch8qzh3mppsxch83ns0jra8d222ahxs96p9cdrl0grfazywv9";
       type = "gem";
     };
-    version = "1.8.0";
+    version = "1.12.1";
   };
   base64 = {
     groups = [
       "default"
+      "development"
       "test"
     ];
-    platforms = [ ];
+    platforms = [
+      {
+        engine = "maglev";
+      }
+      {
+        engine = "ruby";
+      }
+    ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
+      sha256 = "0yx9yn47a8lkfcjmigk79fykxvr80r4m1i35q82sxzynpbm7lcr7";
       type = "gem";
     };
-    version = "0.2.0";
+    version = "0.3.0";
   };
   benchmark = {
     groups = [
@@ -319,10 +363,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jl71qcgamm96dzyqk695j24qszhcc7liw74qc83fpjljp2gh4hg";
+      sha256 = "1kicilpma5l0lwayqjb5577bm0hbjndj2gh150xz09xsgc1l1vyl";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "0.4.1";
   };
   better_errors = {
     dependencies = [
@@ -355,10 +399,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1k6qzammv9r6b2cw3siasaik18i6wjc5m0gw5nfdc6jj64h79z1g";
+      sha256 = "1p2szbr4jdvmwaaj2kxlbv1rp0m6ycbgfyp0kjkkkswmniv5y21r";
       type = "gem";
     };
-    version = "3.1.9";
+    version = "3.2.2";
   };
   binding_of_caller = {
     dependencies = [ "debug_inspector" ];
@@ -387,10 +431,10 @@
     ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mdgj9yw1hmx3xh2qxyjc31y8igmxzd9h0c245ay2zkz76pl4k5c";
+      sha256 = "003xl226y120cbq1n99805jw6w75gcz1gs941yz3h7li3qy3kqha";
       type = "gem";
     };
-    version = "1.18.4";
+    version = "1.18.6";
   };
   builder = {
     groups = [
@@ -415,10 +459,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0kfyg2j6a4sg94sajnmy0scv9dxjh7jka9dlil1fzpx137g2zw3p";
+      sha256 = "0hn5nysivwlzwgwgh3m97kzjgfy8g7nl82b2pahdj0xqnrg91fdl";
       type = "gem";
     };
-    version = "8.0.0";
+    version = "8.0.8";
   };
   byebug = {
     groups = [
@@ -435,10 +479,10 @@
     ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0nx3yjf4xzdgb8jkmk2344081gqr22pgjqnmjg2q64mj5d6r9194";
+      sha256 = "07hsr9zzl2mvf5gk65va4smdizlk9rsiz8wwxik0p96cj79518fl";
       type = "gem";
     };
-    version = "11.1.3";
+    version = "12.0.0";
   };
   capybara = {
     dependencies = [
@@ -460,15 +504,30 @@
     };
     version = "3.40.0";
   };
+  capybara-playwright-driver = {
+    dependencies = [
+      "addressable"
+      "capybara"
+      "playwright-ruby-client"
+    ];
+    groups = [ "test" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0hnjmbhyvfs543g96bc4sx94fdx2054ng12g925vwmkx0wl1jnl7";
+      type = "gem";
+    };
+    version = "0.5.7";
+  };
   cbor = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1dsf9gjc2cj79vrnz2vgq573biqjw7ad4b0idm05xg6rb3y9gq4y";
+      sha256 = "1w3d5dhx4vjd707ihkcmq7fy78p5fgawcjdqw2byxnfw32gzgkbr";
       type = "gem";
     };
-    version = "0.5.9.8";
+    version = "0.5.10.1";
   };
   certified = {
     groups = [
@@ -488,10 +547,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0c5494n3n6l51n1w1vc118zckbqdzk7r6b656hswg72w0bif2ja3";
+      sha256 = "1njrjznc2j5xqqw71sp9130b9hyv59h2gfrf6yaf4in1n9dzd6gy";
       type = "gem";
     };
-    version = "0.4.1";
+    version = "0.5.0";
   };
   chunky_png = {
     groups = [ "default" ];
@@ -556,10 +615,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1z7bag6zb2vwi7wp2bkdkmk7swkj6zfnbsnc949qq0wfsgw94fr3";
+      sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg";
       type = "gem";
     };
-    version = "2.5.0";
+    version = "2.5.3";
   };
   cose = {
     dependencies = [
@@ -622,20 +681,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0625073hwx41c246v9dvkp0rk0xgh9d0sc0gm73dbmlxnjwgalv7";
+      sha256 = "1izp5vna86s7xivqzml4nviy01bv76arrd5is8wkncwp1by3zzbc";
       type = "gem";
     };
-    version = "1.21.0";
+    version = "1.21.1";
   };
   csv = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0kmx36jjh2sahd989vcvw74lrlv07dqc3rnxchc5sj2ywqsw3w3g";
+      sha256 = "0gz7r2kazwwwyrwi95hbnhy54kwkfac5swh2gy5p5vw36fn38lbf";
       type = "gem";
     };
-    version = "3.3.2";
+    version = "3.3.5";
   };
   date = {
     groups = [
@@ -673,20 +732,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1znxccz83m4xgpd239nyqxlifdb7m8rlfayk6s259186nkgj6ci7";
+      sha256 = "0qlrj2qyysc9avzlr4zs1py3x684hqm61n4czrsk1pyllz5x5q4s";
       type = "gem";
     };
-    version = "1.5.1";
+    version = "1.6.2";
   };
   diffy = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19xaz5qmw0kg1rdsjh13vk7674bpcmjy6cnddx1cvl80vgkvjr22";
+      sha256 = "1qs7drxvyzk3dg22xgblc12lq5kww9hhj7vpn8ay3l42rasllf3r";
       type = "gem";
     };
-    version = "3.4.3";
+    version = "3.4.4";
   };
   digest = {
     groups = [ "default" ];
@@ -708,15 +767,25 @@
     };
     version = "0.2.9";
   };
+  discourse-emojis = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0anccf6f8qi992pkcwdc0drz4mqv20ssnrz2a9ql7bj973gf28mk";
+      type = "gem";
+    };
+    version = "1.0.41";
+  };
   discourse-fonts = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18bj5d0hf7bwy0pppah55aawg7yn61sjgjhh03j5lcnkxl9mrlm7";
+      sha256 = "0cq0ds6c2hz1qs2f3skdbs9pqy4dkl1jfm3778q0hnb1f7bdvm3q";
       type = "gem";
     };
-    version = "0.0.18";
+    version = "0.0.19";
   };
   discourse-seed-fu = {
     dependencies = [
@@ -732,6 +801,21 @@
     };
     version = "2.3.12";
   };
+  discourse_ai-tokenizers = {
+    dependencies = [
+      "activesupport"
+      "tiktoken_ruby"
+      "tokenizers"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0wy3pcrml7g51566i3w2r16qqix1hyr97j7292hzwaabgcpjyxd7";
+      type = "gem";
+    };
+    version = "0.3.1";
+  };
   discourse_dev_assets = {
     dependencies = [
       "faker"
@@ -744,10 +828,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ncd6n34vm7qd5mpza8wrqfkgfc6xbd5rxjcbdnvsv94zxr75rm1";
+      sha256 = "11c2i7wm3m52xisycsz85g84p79q7gbxz0nkgljgg8qa44d816m0";
       type = "gem";
     };
-    version = "0.0.4";
+    version = "0.0.5";
   };
   docile = {
     groups = [
@@ -763,14 +847,18 @@
     version = "1.4.1";
   };
   drb = {
-    groups = [ "default" ];
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
+      sha256 = "0wrkl7yiix268s2md1h6wh91311w95ikd8fy8m5gx589npyxc00b";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.2.3";
   };
   dry-initializer = {
     groups = [ "default" ];
@@ -782,6 +870,16 @@
     };
     version = "3.2.0";
   };
+  ed25519 = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "01n5rbyws1ijwc5dw7s88xx3zzacxx9k97qn8x11b6k8k18pzs8n";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
   email_reply_trimmer = {
     groups = [ "default" ];
     platforms = [ ];
@@ -792,6 +890,20 @@
     };
     version = "0.2.0";
   };
+  erb = {
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "03vcq8g8rxdq8njp9j9k9fxwjw19q4m08c7lxjs0yc6l8f0ja3yk";
+      type = "gem";
+    };
+    version = "5.0.2";
+  };
   erubi = {
     groups = [
       "default"
@@ -814,27 +926,15 @@
     version = "1.13.1";
   };
   excon = {
+    dependencies = [ "logger" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1am69fn9nzj2pa05fd02q4zbzn1g7c9w5g52yjzdsbhm1x9n9g95";
+      sha256 = "17asr18vawi08g3wbif0wdi8bnyj01d125saydl9j1f03fv0n16a";
       type = "gem";
     };
-    version = "1.2.3";
-  };
-  execjs = {
-    groups = [
-      "assets"
-      "default"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "03a590q16nhqvfms0lh42mp6a1i41w41qpdnf39zjbq5y3l8pjvb";
-      type = "gem";
-    };
-    version = "2.10.0";
+    version = "1.2.5";
   };
   exifr = {
     groups = [ "default" ];
@@ -851,10 +951,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1x73a43hjw7f9vwlhfax4rmp7hpwaadvcamnbw31hh94bx3i71lv";
+      sha256 = "1k5kglcva79sxvqj10x481r1w8ql6zdr77mv095g8j5ksf6k600d";
       type = "gem";
     };
-    version = "2.8.2";
+    version = "2.13";
   };
   fabrication = {
     groups = [
@@ -864,10 +964,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1al5iv3as21l5clci0b5cg27z136pan7gkj7plp4l0w83c6z2y9c";
+      sha256 = "1qrv8vvhjx9yi64bji6hrp08if14hmwdy08prg9qld3ij2nvz856";
       type = "gem";
     };
-    version = "2.31.0";
+    version = "3.0.0";
   };
   faker = {
     dependencies = [ "i18n" ];
@@ -878,20 +978,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1wslw5gh335zcahxmdd497xaa7h0d8l60c0jfv942mn47fxy8m47";
+      sha256 = "0wy4i4vl3h2v6scffx0zbp74vq1gfgq55m8x3n05kwp3na8h5a7r";
       type = "gem";
     };
-    version = "2.23.0";
-  };
-  fakeweb = {
-    groups = [ "test" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1a09z9nb369bvwpghncgd5y4f95lh28w0q258srh02h22fz9dj8y";
-      type = "gem";
-    };
-    version = "1.3.0";
+    version = "3.5.2";
   };
   faraday = {
     dependencies = [
@@ -903,10 +993,21 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1mls9g490k63rdmjc9shqshqzznfn1y21wawkxrwp2vvbk13jwqm";
+      sha256 = "09mcghancmn0s5cwk2xz581j3xm3xqxfv0yxg75axnyhrx9gy6f7";
       type = "gem";
     };
-    version = "2.12.2";
+    version = "2.13.4";
+  };
+  faraday-multipart = {
+    dependencies = [ "multipart-post" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "00w9imp55hi81q0wsgwak90ldkk7gbyb8nzmmv8hy0s907s8z8bp";
+      type = "gem";
+    };
+    version = "1.1.1";
   };
   faraday-net_http = {
     dependencies = [ "net-http" ];
@@ -914,10 +1015,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1";
+      sha256 = "0fxbckg468dabkkznv48ss8zv14d9cd8mh1rr3m98aw7wzx5fmq9";
       type = "gem";
     };
-    version = "3.4.0";
+    version = "3.4.1";
   };
   faraday-retry = {
     dependencies = [ "faraday" ];
@@ -925,10 +1026,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "023ncwlagnf2irx2ckyj1pg1f1x436jgr4a5y45mih298p8zwij1";
+      sha256 = "1laici6jximrz3a8rkm8qmwdmw3fgzk22qh4l8wd5srjj01d40i4";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.3.2";
   };
   fast_blank = {
     groups = [ "default" ];
@@ -976,10 +1077,10 @@
     ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fgwn1grxf4zxmyqmb9i4z2hr111585n9jnk17y6y7hhs7dv1xi6";
+      sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9";
       type = "gem";
     };
-    version = "1.17.1";
+    version = "1.17.2";
   };
   fspath = {
     groups = [ "default" ];
@@ -1002,6 +1103,20 @@
     };
     version = "1.2.1";
   };
+  goldiloader = {
+    dependencies = [
+      "activerecord"
+      "activesupport"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0wqb6l1262d7vs9rh86k22q0xskypc84v3wdv74kp5jb8bzqcyi7";
+      type = "gem";
+    };
+    version = "5.4.0";
+  };
   google-protobuf = {
     dependencies = [
       "bigdecimal"
@@ -1011,10 +1126,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0rmmp533ypc5c2r3ks8zqxchqkf1g8laig87f7hdfmwz0p07cmcs";
+      sha256 = "1awndc5nswpc1xdlid2wkikj45adbhmbfqizz8rr5fz9h01dqjz6";
       type = "gem";
     };
-    version = "4.29.3";
+    version = "4.32.0";
   };
   guess_html_encoding = {
     groups = [ "default" ];
@@ -1044,10 +1159,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0xqsnx25lm1wwgchvrl5xla5zzk3d6gbkdfj062cwggdsvgfwc1c";
+      sha256 = "1da0w5v7ppxrgvh58bafjklzv73nknyq73if6d9rkz2v24zg3169";
       type = "gem";
     };
-    version = "1.1.2";
+    version = "1.2.0";
+  };
+  hashery = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0qj8815bf7q6q7llm5rzdz279gzmpqmqqicxnzv066a020iwqffj";
+      type = "gem";
+    };
+    version = "2.1.2";
   };
   hashie = {
     groups = [ "default" ];
@@ -1142,6 +1267,16 @@
     };
     version = "1.6.0";
   };
+  inflection = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0mfkk0j0dway3p4gwzk8fnpi4hwaywl2v0iywf1azf98zhk9pfnf";
+      type = "gem";
+    };
+    version = "1.0.0";
+  };
   io-console = {
     groups = [
       "default"
@@ -1151,10 +1286,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18pgvl7lfjpichdfh1g50rpz0zpaqrpr52ybn9liv1v9pjn9ysnd";
+      sha256 = "1jszj95hazqqpnrjjzr326nn1j32xmsc9xvd97mbcrrgdc54858y";
       type = "gem";
     };
-    version = "0.8.0";
+    version = "0.8.1";
   };
   irb = {
     dependencies = [
@@ -1170,10 +1305,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1478m97wiy6nwg6lnl0szy39p46acsvrhax552vsh1s2mi2sgg6r";
+      sha256 = "1fpxa2m83rb7xlzs57daqwnzqjmz6j35xr7zb15s73975sak4br2";
       type = "gem";
     };
-    version = "1.15.1";
+    version = "1.15.2";
   };
   iso8601 = {
     groups = [ "default" ];
@@ -1204,10 +1339,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "048danb0x10mpch6mf88mky35zjn6wk4hpbqq68ssbq58i3fzgfj";
+      sha256 = "0s5vklcy2fgdxa9c6da34jbfrqq7xs6mryjglqqb5iilshcg3q82";
       type = "gem";
     };
-    version = "2.9.1";
+    version = "2.13.2";
   };
   json-schema = {
     dependencies = [
@@ -1222,10 +1357,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gzrf6q4d9kbixj6bpi2bp8dizmqxcmlq30ni86h3ifzpkcrm0mk";
+      sha256 = "1ma0k5889hzydba2ci8lqg87pxsh9zabz7jchm9cbacwsw7axgk0";
       type = "gem";
     };
-    version = "5.1.1";
+    version = "5.2.2";
   };
   json_schemer = {
     dependencies = [
@@ -1283,20 +1418,34 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0scnz2fvdczdgadvjn0j9d49118aqm3hj66qh8sd2kv6g1j65164";
+      sha256 = "1k0311vah76kg5m6zr7wmkwyk5p2f9d9hyckjpn3xgr83ajkj7px";
       type = "gem";
     };
-    version = "3.17.0.4";
+    version = "3.17.0.5";
   };
   libv8-node = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ki1vjkq8nhmlz7rqi1ic0mjmbjsa7d1bgcvkzdl4q9vhaa5dzvn";
+      sha256 = "1kbijkxrqzgf94qdzh1xdxcypr6wnqmra0bhmwz7bif45739l3ig";
       type = "gem";
     };
-    version = "22.7.0.4";
+    version = "24.1.0.0";
+  };
+  lint_roller = {
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "11yc0d84hsnlvx8cpk4cbj6a4dz9pk0r1k29p0n1fz9acddq831c";
+      type = "gem";
+    };
+    version = "1.1.0";
   };
   listen = {
     dependencies = [
@@ -1373,10 +1522,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bmvpa5mk779rgl4s4qy8nyhjh1lpf5gn4pmv40xyalnv2whryf3";
+      sha256 = "1a52r46d263h2kkxng7amrihz5c7xm9ak8vf4jq4x77rwxcbwjx8";
       type = "gem";
     };
-    version = "2.20.0";
+    version = "2.20.1";
   };
   loofah = {
     dependencies = [
@@ -1391,10 +1540,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07pfa5kgl7k2hxlzzn89qna6bmiyrxlchgbzi0885frsi08agrk1";
+      sha256 = "0dx316q03x6rpdbl610rdaj2vfd5s8fanixk21j4gv3h5f230nk5";
       type = "gem";
     };
-    version = "2.24.0";
+    version = "2.24.1";
   };
   lru_redux = {
     groups = [ "default" ];
@@ -1450,10 +1599,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i";
+      sha256 = "0nscas3a4mmrp1rc07cdjlbbpb2rydkindmbj3v3z5y1viyspmd0";
       type = "gem";
     };
-    version = "0.4.2";
+    version = "0.4.3";
   };
   maxminddb = {
     groups = [ "default" ];
@@ -1488,10 +1637,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "15xqp7pnicjh2868fsc6fmxw8cw32bpiaqpc5bz8cwdib09ns3qk";
+      sha256 = "1nra1ifgapr67kb6zjkzws5gdnwrzbm463zf1l1p2rby2v1wb7ki";
       type = "gem";
     };
-    version = "4.3.8";
+    version = "4.4.1";
   };
   messageformat-wrapper = {
     dependencies = [ "mini_racer" ];
@@ -1518,6 +1667,36 @@
     };
     version = "1.1.0";
   };
+  mime-types = {
+    dependencies = [
+      "logger"
+      "mime-types-data"
+    ];
+    groups = [
+      "default"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0mjyxl7c0xzyqdqa8r45hqg7jcw2prp3hkp39mdf223g4hfgdsyw";
+      type = "gem";
+    };
+    version = "3.7.0";
+  };
+  mime-types-data = {
+    groups = [
+      "default"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0f05x8mm7p1dpmchpfx2393nyb4wnqizximq9wq904zsjrl4551v";
+      type = "gem";
+    };
+    version = "3.2025.0812";
+  };
   mini_mime = {
     groups = [
       "default"
@@ -1552,10 +1731,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "168a3crdgakm9mk5yrqlqsrx587rm7sk1f2l7sfs9cg87f7xb7ji";
+      sha256 = "1hdv2sn2p74hpixvk7065irhiycilgi2ccc4xmf192yv713njlli";
       type = "gem";
     };
-    version = "0.17.0.pre13";
+    version = "0.19.0";
   };
   mini_scheduler = {
     dependencies = [ "sidekiq" ];
@@ -1594,10 +1773,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1c0bld2bpnfrld7g0pli3pp3b1z3a21cgahhw70i5cjr33sx88pi";
+      sha256 = "0f05mq75bc35w78vkx21bn1lcl07r4w2jqysdji6afy6j1mca3ya";
       type = "gem";
     };
-    version = "0.1.2";
+    version = "1.0.0";
   };
   minitest = {
     groups = [
@@ -1608,10 +1787,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0izrg03wn2yj3gd76ck7ifbm9h2kgy8kpg4fk06ckpy4bbicmwlw";
+      sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr";
       type = "gem";
     };
-    version = "5.25.4";
+    version = "5.25.5";
   };
   mocha = {
     dependencies = [ "ruby2_keywords" ];
@@ -1639,20 +1818,20 @@
     ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1a5fsgchkpcca4wf3pipbb2jbj523l7fbaq37j10cr0yymwlkc7z";
+      sha256 = "0cnpnbn2yivj9gxkh8mjklbgnpx6nf7b8j2hky01dl0040hy0k76";
       type = "gem";
     };
-    version = "1.7.5";
+    version = "1.8.0";
   };
   multi_json = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
+      sha256 = "06sabsvnw0x1aqdcswc6bqrqz6705548bfd8z22jxgxfjrn1yn3n";
       type = "gem";
     };
-    version = "1.15.0";
+    version = "1.17.0";
   };
   multi_xml = {
     dependencies = [ "bigdecimal" ];
@@ -1660,10 +1839,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "06x61ca5j84nyhr1mwh9r436yiphnc5hmacb3gwqyn5gd0611kjg";
+      sha256 = "1kl7ax7zcj8czlxs6vn3kdhpnz1dwva4y5zwnavssfv193f9cyih";
       type = "gem";
     };
-    version = "0.7.1";
+    version = "0.7.2";
+  };
+  multipart-post = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1a5lrlvmg2kb2dhw3lxcsv6x276bwgsxpnka1752082miqxd0wlq";
+      type = "gem";
+    };
+    version = "2.4.1";
   };
   mustache = {
     groups = [ "default" ];
@@ -1695,10 +1884,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ak8w6ypw4lba1y1mdmqwvkrh84ps6h9kd7hn029h9k85j9sirmb";
+      sha256 = "1z1kpshd0r09jv0091bcr4gfx3i1psbqdzy7zyag5n8v3qr0anfr";
       type = "gem";
     };
-    version = "0.5.5";
+    version = "0.5.9";
   };
   net-pop = {
     dependencies = [ "net-protocol" ];
@@ -1728,10 +1917,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0amlhz8fhnjfmsiqcjajip57ici2xhw089x7zqyhpk51drg43h2z";
+      sha256 = "0dh7nzjp0fiaqq1jz90nv4nxhc2w359d7c199gmzq965cfps15pd";
       type = "gem";
     };
-    version = "0.5.0";
+    version = "0.5.1";
   };
   nio4r = {
     groups = [ "default" ];
@@ -1756,10 +1945,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gzqcs1kkykj8lrnbxc1iwr1wqmmaml8l6wyxdvy0vqq6gxiqyck";
+      sha256 = "0czsh9d738kj0bmpkjnczq9j924hg103gc00i0wfyg0fzn9psnmc";
       type = "gem";
     };
-    version = "1.18.2";
+    version = "1.18.9";
   };
   oauth = {
     dependencies = [
@@ -1804,6 +1993,20 @@
     };
     version = "1.4.11";
   };
+  octokit = {
+    dependencies = [
+      "faraday"
+      "sawyer"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "15g4kyag6gmxxq6d03472h7srm3imlsks1wg6nac7hl3mb1b5vs8";
+      type = "gem";
+    };
+    version = "5.6.1";
+  };
   oj = {
     dependencies = [
       "bigdecimal"
@@ -1813,24 +2016,25 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "091kbavd1rfiwr6kn1laladspyk67y6hdlsdilz752nqxm9w3ibg";
+      sha256 = "1cajn3ylwhby1x51d9hbchm964qwb5zp63f7sfdm55n85ffn1ara";
       type = "gem";
     };
-    version = "3.16.9";
+    version = "3.16.11";
   };
   omniauth = {
     dependencies = [
       "hashie"
       "rack"
+      "rack-protection"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1jn9j54l5h7xcba2vjq74l1dk0xrwvsjxam4qhylpi52nw0h5502";
+      sha256 = "1km0wqx9pj609jidvrqfsvzbzfgdnlpdnv7i7xfqm3wb55vk5w6y";
       type = "gem";
     };
-    version = "1.9.2";
+    version = "2.1.2";
   };
   omniauth-facebook = {
     dependencies = [ "omniauth-oauth2" ];
@@ -1852,10 +2056,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0xbk0dbxqfpyfb33ghz6vrlz3m6442rp18ryf13gwzlnifcawhlb";
+      sha256 = "0jc66zp4bhwy7c6s817ws0nkimski3crrhwd7xyy55ss29v6b8hw";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "2.0.0";
   };
   omniauth-google-oauth2 = {
     dependencies = [
@@ -1868,10 +2072,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "10pnxvb6wpnf58dja3yz4ja527443x3q13hzhcbays4amnnp8i4a";
+      sha256 = "19hj9l3xgsy7dssjmfmkca129wdbhh3pdmp0jm685awqinna9mrf";
       type = "gem";
     };
-    version = "0.8.2";
+    version = "1.0.1";
   };
   omniauth-oauth = {
     dependencies = [
@@ -1949,20 +2153,20 @@
     ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "073pk2rhyjq2vhdiz3xh2s884r15cvprw1yfjs7h9bmwdf1f9j81";
+      sha256 = "0kp3f8g7g7cbw5vfkmpdv71pphhpcxk3lpc892mj9apkd7ys1y4c";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "3.2.1";
   };
   ostruct = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9";
+      sha256 = "04nrir9wdpc4izqwqbysxyly8y7hsfr4fsv69rw91lfi9d5fv8lm";
       type = "gem";
     };
-    version = "0.6.1";
+    version = "0.6.3";
   };
   parallel = {
     groups = [
@@ -1973,10 +2177,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq";
+      sha256 = "0c719bfgcszqvk9z47w2p8j2wkz5y35k48ywwas5yxbbh3hm3haa";
       type = "gem";
     };
-    version = "1.26.3";
+    version = "1.27.0";
   };
   parallel_tests = {
     dependencies = [ "parallel" ];
@@ -1987,10 +2191,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0nikqa0h9znbg31p3hl4y3280sqggjd7m47gmjydxw6iasm66l09";
+      sha256 = "0j522kfb9ykk98sfw7qssklwglgahwi1dc8ckcq8wvcgdv23yhc9";
       type = "gem";
     };
-    version = "4.9.0";
+    version = "5.4.0";
   };
   parser = {
     dependencies = [
@@ -2005,20 +2209,54 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "16qi2qhpszm842awxghmsp64yvvawafq96w5jw98irz3f4bh2jbl";
+      sha256 = "1wl7frfk68q6gsf6q6j32jl5m3yc0b9x8ycxz3hy79miaj9r5mll";
       type = "gem";
     };
-    version = "3.3.7.0";
+    version = "3.3.9.0";
+  };
+  pdf-reader = {
+    dependencies = [
+      "Ascii85"
+      "afm"
+      "hashery"
+      "ruby-rc4"
+      "ttfunk"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "11h8dhhd2c8mxssibk9q6qn7ilj4p71crlfirw8pppn8pr85f0n5";
+      type = "gem";
+    };
+    version = "2.15.0";
   };
   pg = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1p2gqqrm895fzr9vi8d118zhql67bm8ydjvgqbq1crdnfggzn7kn";
+      sha256 = "0swf0a0r2xryx788q09w4zcwdq7v1pwq5fvkgr9m8abhbxgaf472";
       type = "gem";
     };
-    version = "1.5.9";
+    version = "1.6.1";
+  };
+  playwright-ruby-client = {
+    dependencies = [
+      "concurrent-ruby"
+      "mime-types"
+    ];
+    groups = [
+      "default"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1ql2frvdgfw57xycwvz8mk11i8v2ksnn3b6s9ajxazh2khd775y0";
+      type = "gem";
+    };
+    version = "1.54.1";
   };
   pp = {
     dependencies = [ "prettyprint" ];
@@ -2063,6 +2301,20 @@
     };
     version = "0.2.0";
   };
+  prism = {
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0gkhpdjib9zi9i27vd9djrxiwjia03cijmd6q8yj2q1ix403w3nw";
+      type = "gem";
+    };
+    version = "1.4.0";
+  };
   progress = {
     groups = [ "default" ];
     platforms = [ ];
@@ -2073,19 +2325,38 @@
     };
     version = "3.6.0";
   };
-  pry = {
+  propshaft = {
     dependencies = [
-      "coderay"
-      "method_source"
+      "actionpack"
+      "activesupport"
+      "rack"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0k9kqkd9nps1w1r1rb7wjr31hqzkka2bhi8b518x78dcxppm9zn4";
+      sha256 = "0m46p68521hnzvwbby818kfb9zskmwhqd7x5a7w544gjaapivfg9";
       type = "gem";
     };
-    version = "0.14.2";
+    version = "1.2.1";
+  };
+  pry = {
+    dependencies = [
+      "coderay"
+      "method_source"
+    ];
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0ssv704qg75mwlyagdfr9xxbzn1ziyqgzm0x474jkynk8234pm8j";
+      type = "gem";
+    };
+    version = "0.15.2";
   };
   pry-byebug = {
     dependencies = [
@@ -2096,10 +2367,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1y41al94ks07166qbp2200yzyr5y60hm7xaiw4lxpgsm4b1pbyf8";
+      sha256 = "0wpa3jd46h44rjz3hjwl5c0zfx3jav4a64nm8h0g1iwv61yvn2hb";
       type = "gem";
     };
-    version = "3.10.1";
+    version = "3.11.0";
   };
   pry-rails = {
     dependencies = [ "pry" ];
@@ -2142,10 +2413,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1vjrx3yd596zzi42dcaq5xw7hil1921r769dlbz08iniaawlp9c4";
+      sha256 = "0vii1xc7x81hicdbp7dlllhmbw5w3jy20shj696n0vfbbnm2hhw1";
       type = "gem";
     };
-    version = "5.2.3";
+    version = "5.2.6";
   };
   public_suffix = {
     groups = [
@@ -2156,10 +2427,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31";
+      sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz";
       type = "gem";
     };
-    version = "6.0.1";
+    version = "6.0.2";
   };
   puma = {
     dependencies = [ "nio4r" ];
@@ -2202,10 +2473,10 @@
     ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ax778fsfvlhj7c11n0d1wdcb8bxvkb190a9lha5d91biwzyx9g4";
+      sha256 = "1pcr8sn02lwzv3z6vx5n41b6ybcnw9g9h05s3lkv4vqdm0f2mq2z";
       type = "gem";
     };
-    version = "2.2.10";
+    version = "2.2.17";
   };
   rack-mini-profiler = {
     dependencies = [ "rack" ];
@@ -2213,10 +2484,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "00d80wjavaakhs177b7g542qs3n55kj4icjkwj0lbxcmaxyxxw1b";
+      sha256 = "0y1x4rc7bz8x3zn8p6g21rw6ivbjml6a2vl9dhchiy8i6b110n28";
       type = "gem";
     };
-    version = "3.3.1";
+    version = "4.0.1";
   };
   rack-protection = {
     dependencies = [
@@ -2294,10 +2565,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fx9dx1ag0s1lr6lfr34lbx5i1bvn3bhyf3w3mx6h7yz90p725g5";
+      sha256 = "07awj8bp7jib54d0khqw391ryw8nphvqgw4bb12cl4drlx9pkk4a";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.3.0";
   };
   rails-html-sanitizer = {
     dependencies = [
@@ -2327,10 +2598,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pvwgm413fza8q1zc3mmzx504wiljm9d7b9qrkzfzsb2yzpidxs2";
+      sha256 = "1jcijjfz595nd1h0z4h2jb7iw4md5snrglha0xmryvzxfh3fmmpf";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.3.0";
   };
   rails_multisite = {
     dependencies = [
@@ -2341,10 +2612,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1al624kvcxa5ijprali9gxp0bqv1w1573iswb5fkg4p2i4xvimvv";
+      sha256 = "1winy1bzrzspb0ynnx5rcy8fhg1ldkzcnydn7zkvxll6xmjg7b3s";
       type = "gem";
     };
-    version = "6.1.0";
+    version = "7.0.0";
   };
   railties = {
     dependencies = [
@@ -2364,10 +2635,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07zy8b88qxx493pc5sfkzvxqj3zcf363r1128n3hsvfx2vqipwg3";
+      sha256 = "0k0x630ipimzv6vzhwflsjl7n1fvrmvf196mfbspha7wf4bhxr2l";
       type = "gem";
     };
-    version = "7.2.2.1";
+    version = "8.0.2.1";
   };
   rainbow = {
     groups = [
@@ -2412,10 +2683,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6";
+      sha256 = "14s4jdcs1a4saam9qmzbsa2bsh85rj9zfxny5z315x3gg0nhkxcn";
       type = "gem";
     };
-    version = "13.2.1";
+    version = "13.3.0";
   };
   rb-fsevent = {
     groups = [
@@ -2445,6 +2716,16 @@
     };
     version = "0.11.1";
   };
+  rb_sys = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0z2j55r7qqwc57nq11z0pzjzka0iy9i930jxxjna1vrsnd5mwkdn";
+      type = "gem";
+    };
+    version = "0.9.106";
+  };
   rbtrace = {
     dependencies = [
       "ffi"
@@ -2462,10 +2743,10 @@
     ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1p65p6f917al0f07sn5ca9yj92f7mk52xgnp0ahqpyrb8r6sdjz8";
+      sha256 = "158qydqnrn1r0gm806j0bn439y0dyzdpscwi1sm3ldl1mcid5mx2";
       type = "gem";
     };
-    version = "0.5.1";
+    version = "0.5.2";
   };
   rchardet = {
     groups = [ "default" ];
@@ -2478,7 +2759,10 @@
     version = "1.9.0";
   };
   rdoc = {
-    dependencies = [ "psych" ];
+    dependencies = [
+      "erb"
+      "psych"
+    ];
     groups = [
       "default"
       "development"
@@ -2487,30 +2771,42 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0h00mb8wcj937srrafpjzq0klfi8rfpd4b3xpbvn9ghrn2wnzimy";
+      sha256 = "09lj8d16wx5byj0nbcb9wc6v9farsvgn98n91kknm18g2ggl9pcz";
       type = "gem";
     };
-    version = "6.11.0";
+    version = "6.14.2";
   };
   redcarpet = {
     groups = [ "generic_import" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1sg9sbf9pm91l7lac7fs4silabyn0vflxwaa2x3lrzsm0ff8ilca";
+      sha256 = "0iglapqs4av4za9yfaac0lna7s16fq2xn36wpk380m55d8792i6l";
       type = "gem";
     };
-    version = "3.6.0";
+    version = "3.6.1";
   };
   redis = {
+    dependencies = [ "redis-client" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fikjg6j12ka6hh36dxzhfkpqqmilzjfzcdf59iwkzsgd63f0ziq";
+      sha256 = "0syhyw1bp9nbb0fvcmm58y1c6iav6xw6b4bzjz1rz2j1d7c012br";
       type = "gem";
     };
-    version = "4.8.1";
+    version = "5.4.0";
+  };
+  redis-client = {
+    dependencies = [ "connection_pool" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1w6nz3k1kkg2xwdkbaflkjaj62fvk9j7lgk6p2qgsffs556f6dxa";
+      type = "gem";
+    };
+    version = "0.25.2";
   };
   redis-namespace = {
     dependencies = [ "redis" ];
@@ -2532,10 +2828,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0qccah61pjvzyyg6mrp27w27dlv6vxlbznzipxjcswl7x3fhsvyb";
+      sha256 = "167zy35y4sasqx7wdpv757vigxl1znphfa0xmd9xxn7zhla9qpjy";
       type = "gem";
     };
-    version = "2.10.0";
+    version = "2.11.2";
   };
   reline = {
     dependencies = [ "io-console" ];
@@ -2547,10 +2843,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1lirwlw59apc8m1wjk85y2xidiv0fkxjn6f7p84yqmmyvish6qjp";
+      sha256 = "0ii8l0q5zkang3lxqlsamzfz5ja7jc8ln905isfdawl802k2db8x";
       type = "gem";
     };
-    version = "0.6.0";
+    version = "0.6.2";
   };
   request_store = {
     dependencies = [ "rack" ];
@@ -2611,10 +2907,10 @@
     ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1pchwrkr0994v7mh054lcp0na3bk3mj2sk0dc33bn6bhxrnirj1a";
+      sha256 = "0ynxxmvzczn9a6wd87jyh209590nq6f6ls55dmwiky8fvwi8c68h";
       type = "gem";
     };
-    version = "4.5.1";
+    version = "4.6.0";
   };
   rqrcode = {
     dependencies = [
@@ -2625,20 +2921,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1hggzz8i1l62pkkiybhiqv6ypxw7q844sddrrbbfczjcnj5sivi3";
+      sha256 = "1bwqy1iwbyn1091mg203is5ngsnvfparwa1wh89s1sgnfmirkmg2";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "3.1.0";
   };
   rqrcode_core = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "06ld6386hbdhy5h0k09axmgn424kavpc8f27k1vjhknjhbf8jjfg";
+      sha256 = "1ayrj7pwbv1g6jg5vvx6rq05lr1kbkfzbzqplj169aapmcivhh0y";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "2.0.0";
   };
   rrule = {
     dependencies = [ "activesupport" ];
@@ -2664,10 +2960,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l";
+      sha256 = "0h11wynaki22a40rfq3ahcs4r36jdpz9acbb3m5dkf0mm67sbydr";
       type = "gem";
     };
-    version = "3.13.0";
+    version = "3.13.1";
   };
   rspec-core = {
     dependencies = [ "rspec-support" ];
@@ -2679,10 +2975,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "001kazj244cb6fbkmh7ap74csbr78717qaskqzqpir1q8xpdmywl";
+      sha256 = "18sgga9zjrd5579m9rpb78l7yn9a0bjzwz51z5kiq4y6jwl6hgxb";
       type = "gem";
     };
-    version = "3.13.2";
+    version = "3.13.5";
   };
   rspec-expectations = {
     dependencies = [
@@ -2697,10 +2993,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0n3cyrhsa75x5wwvskrrqk56jbjgdi2q1zx0irllf0chkgsmlsqf";
+      sha256 = "0dl8npj0jfpy31bxi6syc7jymyd861q277sfr6jawq2hv6hx791k";
       type = "gem";
     };
-    version = "3.13.3";
+    version = "3.13.5";
   };
   rspec-html-matchers = {
     dependencies = [
@@ -2732,10 +3028,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1vxxkb2sf2b36d8ca2nq84kjf85fz4x7wqcvb8r6a5hfxxfk69r3";
+      sha256 = "10gajm8iscl7gb8q926hyna83bw3fx2zb4sqdzjrznjs51pqlcz4";
       type = "gem";
     };
-    version = "3.13.2";
+    version = "3.13.5";
   };
   rspec-multi-mock = {
     dependencies = [ "rspec" ];
@@ -2768,10 +3064,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0izfwfb9bfb5q3wjgjc85b9nlkribqn8vk75zadafv08qilmnn4l";
+      sha256 = "1kis8dfxlvi6gdzrv9nsn3ckw0c2z7armhni917qs1jx7yjkjc8i";
       type = "gem";
     };
-    version = "7.1.0";
+    version = "8.0.2";
   };
   rspec-support = {
     groups = [
@@ -2782,10 +3078,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1v6v6xvxcpkrrsrv7v1xgf7sl0d71vcfz1cnrjflpf6r7x3a58yf";
+      sha256 = "1xx3f4mgr84jz07fifd3r68hm6giqy91hqyzawmi0s59yqa1hjqq";
       type = "gem";
     };
-    version = "3.13.2";
+    version = "3.13.4";
   };
   rss = {
     dependencies = [ "rexml" ];
@@ -2832,6 +3128,7 @@
     dependencies = [
       "json"
       "language_server-protocol"
+      "lint_roller"
       "parallel"
       "parser"
       "rainbow"
@@ -2848,13 +3145,16 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ypwxjy2cp44278m9ljg3s937n2cd6x4yskcyzf1k9m3hkjd3pyk";
+      sha256 = "1483x79fsvhc0yvvy62v8c5729x8zri5973icfhw4lkr35yjmx6k";
       type = "gem";
     };
-    version = "1.71.1";
+    version = "1.79.2";
   };
   rubocop-ast = {
-    dependencies = [ "parser" ];
+    dependencies = [
+      "parser"
+      "prism"
+    ];
     groups = [
       "default"
       "development"
@@ -2863,13 +3163,16 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bi6pgnii77763dzwhafcp8lrmnh4n1bqbdimhc9lfj4zs96gpsg";
+      sha256 = "0ar3y8w36am483ynyzg0x8iwhn8h34y8f4agny4lyqcqbfnzd9qd";
       type = "gem";
     };
-    version = "1.38.0";
+    version = "1.46.0";
   };
   rubocop-capybara = {
-    dependencies = [ "rubocop" ];
+    dependencies = [
+      "lint_roller"
+      "rubocop"
+    ];
     groups = [
       "default"
       "development"
@@ -2878,14 +3181,15 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1aw0n8jwhsr39r9q2k90xjmcz8ai2k7xx2a87ld0iixnv3ylw9jx";
+      sha256 = "030wymq0jrblrdswl1lncj60dhcg5wszz6708qzsbziyyap8rn6f";
       type = "gem";
     };
-    version = "2.21.0";
+    version = "2.22.1";
   };
   rubocop-discourse = {
     dependencies = [
       "activesupport"
+      "lint_roller"
       "rubocop"
       "rubocop-capybara"
       "rubocop-factory_bot"
@@ -2900,13 +3204,16 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "13n46107615lc8lkx4dh38hpzv4qxx4a0m6dvf0r21zxnvz7ysyl";
+      sha256 = "1g7rgma47h9a50gyl56bph0klglch9990hbi40vlfc059wif5xzb";
       type = "gem";
     };
-    version = "3.9.3";
+    version = "3.12.1";
   };
   rubocop-factory_bot = {
-    dependencies = [ "rubocop" ];
+    dependencies = [
+      "lint_roller"
+      "rubocop"
+    ];
     groups = [
       "default"
       "development"
@@ -2915,14 +3222,15 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1aljadsjx7affcarzbhz7pydpy6fgqb8hl951y0cmrffxpa3rqcd";
+      sha256 = "1zkkhldrdacv4gn58dc591jxjnw5d767frzywm41i33p2rclnx4x";
       type = "gem";
     };
-    version = "2.26.1";
+    version = "2.27.1";
   };
   rubocop-rails = {
     dependencies = [
       "activesupport"
+      "lint_roller"
       "rack"
       "rubocop"
       "rubocop-ast"
@@ -2935,13 +3243,16 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ahpgc22shmkk1n96rz3islcpx5sgg4z3mblynjz8qjxipsgrhj1";
+      sha256 = "0jzpkb3vx2w8mg25gg18rvxzqvxziaqrwv14cqq2yaf1b0dh3344";
       type = "gem";
     };
-    version = "2.29.1";
+    version = "2.33.3";
   };
   rubocop-rspec = {
-    dependencies = [ "rubocop" ];
+    dependencies = [
+      "lint_roller"
+      "rubocop"
+    ];
     groups = [
       "default"
       "development"
@@ -2950,13 +3261,14 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11a89mzbby49hbd8nhkjrxpr8bq24fafl728mjkk15ccd8xw28c7";
+      sha256 = "0ya4815sp8g13w7a86sm0605fx7xyldck77f9pjjfrvpf5c21r60";
       type = "gem";
     };
-    version = "3.4.0";
+    version = "3.6.0";
   };
   rubocop-rspec_rails = {
     dependencies = [
+      "lint_roller"
       "rubocop"
       "rubocop-rspec"
     ];
@@ -2968,12 +3280,13 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ijc1kw81884k0wjq1sgwaxa854n1fdddscp4fnzfzlx7zl150c8";
+      sha256 = "0i8zvzfj9gpq71zqkbmr05bfh66jg55hbwrfh551i896ibhpalvp";
       type = "gem";
     };
-    version = "2.30.0";
+    version = "2.31.0";
   };
   ruby-prof = {
+    dependencies = [ "base64" ];
     groups = [ "development" ];
     platforms = [
       {
@@ -2985,10 +3298,10 @@
     ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "097ac9ns2j29zj5fw08libz8izibrlfgg6vkj55d4bzrii296qq2";
+      sha256 = "0h23zjwma8car8jpq7af8gw39qi88rn24mass7r13ripmky28117";
       type = "gem";
     };
-    version = "1.7.1";
+    version = "1.7.2";
   };
   ruby-progressbar = {
     groups = [
@@ -3004,6 +3317,16 @@
     };
     version = "1.13.0";
   };
+  ruby-rc4 = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "00vci475258mmbvsdqkmqadlwn6gj9m01sp7b5a3zd90knil1k00";
+      type = "gem";
+    };
+    version = "0.1.5";
+  };
   ruby-readability = {
     dependencies = [
       "guess_html_encoding"
@@ -3068,10 +3391,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nmy052pm46781s7ca6x3l4yb5p3glh8sf201xwcwpk9rv2av9m2";
+      sha256 = "1ma4djp9i0pnpqr71vhzypgsny85g9db7sc1n2x30ky9qbfddsz1";
       type = "gem";
     };
-    version = "1.77.5";
+    version = "1.90.0";
   };
   sassc-embedded = {
     dependencies = [ "sass-embedded" ];
@@ -3079,10 +3402,24 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07pddxi18asxzkn652kvgh43dl1b0nf5p8ha62yhg2r0vzapzzvv";
+      sha256 = "0gnbp770q1krka70phyf59amzw0dx92c0yx1psc9fkp5in9hqwmj";
       type = "gem";
     };
-    version = "1.77.7";
+    version = "1.80.5";
+  };
+  sawyer = {
+    dependencies = [
+      "addressable"
+      "faraday"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps";
+      type = "gem";
+    };
+    version = "0.9.2";
   };
   securerandom = {
     groups = [
@@ -3098,34 +3435,6 @@
     };
     version = "0.4.1";
   };
-  selenium-devtools = {
-    dependencies = [ "selenium-webdriver" ];
-    groups = [ "test" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1v2i8bmf92fb6c3cs7wnkxw48mgk3b8r2dib947h62ll7qgyqqiq";
-      type = "gem";
-    };
-    version = "0.135.0";
-  };
-  selenium-webdriver = {
-    dependencies = [
-      "base64"
-      "logger"
-      "rexml"
-      "rubyzip"
-      "websocket"
-    ];
-    groups = [ "test" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1s80s7mgpwpfj4df2f43f5im37ks884xkbcxd9fxpk93xs7dicnx";
-      type = "gem";
-    };
-    version = "4.31.0";
-  };
   shoulda-matchers = {
     dependencies = [ "activesupport" ];
     groups = [
@@ -3135,25 +3444,27 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1c082vpfdf3865xq6xayxw2hwqswhnc9g030p1gi4hmk9dzvnmch";
+      sha256 = "0i1zkr4rsvf8pz1x38wkb82nsjx28prmyb5blsmw86pd5cmmfszg";
       type = "gem";
     };
-    version = "6.4.0";
+    version = "6.5.0";
   };
   sidekiq = {
     dependencies = [
+      "base64"
       "connection_pool"
+      "logger"
       "rack"
-      "redis"
+      "redis-client"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0zqr9is8y7mg5dfs1q8w5jl9spwvqkhbi9r6np8208n40hi3pydl";
+      sha256 = "19xm4s49hq0kpfbmvhnjskzmfjjxw5d5sm7350mh12gg3lp7220i";
       type = "gem";
     };
-    version = "6.5.12";
+    version = "7.3.9";
   };
   simplecov = {
     dependencies = [
@@ -3178,10 +3489,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "02zi3rwihp7rlnp9x18c9idnkx7x68w6jmxdhyc0xrhjwrz0pasx";
+      sha256 = "0ikjfwydgs08nm3xzc4cn4b6z6rmcrj2imp84xcnimy2wxa8w2xx";
       type = "gem";
     };
-    version = "0.13.1";
+    version = "0.13.2";
   };
   simplecov_json_formatter = {
     groups = [
@@ -3215,40 +3526,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0cfwvdcr46pk0c7m5aw2w3izbrp1iba0q7l21r37mzpwaz0pxj0s";
+      sha256 = "0mnllrwhs7psw6xxs8x5yx85k12qjfdgs8zs0bxm70bfascx58r5";
       type = "gem";
     };
-    version = "2.0.1";
-  };
-  sprockets = {
-    dependencies = [
-      "base64"
-      "concurrent-ruby"
-      "rack"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "10ykzsa76cf8kvbfkszlvbyn4ckcx1mxjhfvwxzs7y28cljhzhkj";
-      type = "gem";
-    };
-    version = "3.7.5";
-  };
-  sprockets-rails = {
-    dependencies = [
-      "actionpack"
-      "activesupport"
-      "sprockets"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "17hiqkdpcjyyhlm997mgdcr45v35j5802m5a979i5jgqx5n8xs59";
-      type = "gem";
-    };
-    version = "3.5.2";
+    version = "2.0.3";
   };
   sqlite3 = {
     dependencies = [ "mini_portile2" ];
@@ -3256,10 +3537,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0sqshkafxa1r34yj4yxisd4kddmjq9jrhx6azqy3z71nwqv01yl7";
+      sha256 = "0mxz46b3vrjgmg7wr3iaaffrraqgxrhr1pizx8n2y4s1jg6zxcnj";
       type = "gem";
     };
-    version = "2.5.0";
+    version = "2.7.3";
   };
   sshkey = {
     groups = [ "default" ];
@@ -3297,10 +3578,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0cd1kdrf62p2ya3ia4rz49d5012bqinvqjmcgkakknswz0l1hkr0";
+      sha256 = "1yh78pg6lm28c3k0pfd2ipskii1fsraq46m6zjs5yc9a4k5vfy2v";
       type = "gem";
     };
-    version = "3.1.2";
+    version = "3.1.7";
+  };
+  stripe = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "13gr4z9nsvpknyy9y2vg4dvg77817m2ykyx57j03692dgv684vm7";
+      type = "gem";
+    };
+    version = "11.1.0";
   };
   syntax_tree = {
     dependencies = [ "prettier_print" ];
@@ -3311,23 +3602,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0g9l9acknjr2yz8ynfxbcrwx2ws3wh96pfzdb31g66k08v1022m5";
+      sha256 = "0ggi6p7xxjsj42q8pp0yz6z7dbwlbr6fjbs4qnafr667jab5mqjn";
       type = "gem";
     };
-    version = "6.2.0";
-  };
-  syntax_tree-disable_ternary = {
-    groups = [
-      "development"
-      "test"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0gdi6zx4hqpxd81zas3dlw1jrdp98fvsqj4p7f42x5lhpfzz04zc";
-      type = "gem";
-    };
-    version = "1.0.0";
+    version = "6.3.0";
   };
   test-prof = {
     groups = [ "test" ];
@@ -3348,10 +3626,21 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nmymd86a0vb39pzj2cwv57avdrl6pl3lf5bsz58q594kqxjkw7f";
+      sha256 = "0gcarlmpfbmqnjvwfz44gdjhcmm634di7plcx2zdgwdhrhifhqw7";
       type = "gem";
     };
-    version = "1.3.2";
+    version = "1.4.0";
+  };
+  tiktoken_ruby = {
+    dependencies = [ "rb_sys" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "12ybz207d0wzy6x6q63nfxysgr1b5sx84g22ajav3w8vf4ssgzxd";
+      type = "gem";
+    };
+    version = "0.0.11.1";
   };
   timeout = {
     groups = [
@@ -3367,6 +3656,17 @@
     };
     version = "0.4.3";
   };
+  tokenizers = {
+    dependencies = [ "rb_sys" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "14jd9xra2zn5m4i431rqqv8yqdw46fpm3ni47zn57wm3cw2n1wbv";
+      type = "gem";
+    };
+    version = "0.5.5";
+  };
   trilogy = {
     groups = [ "migrations" ];
     platforms = [ ];
@@ -3377,6 +3677,17 @@
     };
     version = "2.9.0";
   };
+  ttfunk = {
+    dependencies = [ "bigdecimal" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1ji0kn8jkf1rpskv3ijzxvqwixg4p6sk8kg0vmwyjinci7jcgjx7";
+      type = "gem";
+    };
+    version = "1.8.0";
+  };
   tzinfo = {
     dependencies = [ "concurrent-ruby" ];
     groups = [
@@ -3398,21 +3709,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "02yz3x0qxnnwbf7k18yck5pggbnyy43rq0d5w2r6rwlk3981m31d";
+      sha256 = "0f898y35w60mkx3sd8ld2ryzkj4cld04qlgxi3z3hzdlzfhpa8x9";
       type = "gem";
     };
-    version = "1.2025.1";
-  };
-  uglifier = {
-    dependencies = [ "execjs" ];
-    groups = [ "assets" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1apmqsad2y1avffh79f4lfysfppz94fvpyi7lkkj3z8bn60jpm3m";
-      type = "gem";
-    };
-    version = "4.2.1";
+    version = "1.2025.2";
   };
   unf = {
     groups = [ "default" ];
@@ -3434,10 +3734,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1has87asspm6m9wgqas8ghhhwyf2i1yqrqgrkv47xw7jq3qjmbwc";
+      sha256 = "0knx0bgwwpwa7wcmknqp2i019jq6b46wxfppvhxfxrsyhlbnhmmz";
       type = "gem";
     };
-    version = "3.1.4";
+    version = "3.1.5";
   };
   unicode-emoji = {
     groups = [
@@ -3485,20 +3785,24 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1dfvqixshwvm82b9qwdidvnkavdj7s0fbdbmyd4knkl6l3j9xcwr";
+      sha256 = "19vcdlfcxrlp4vkzx0jn4zwf5jg125ca89s0mnqcqs6i5bnqfiyv";
       type = "gem";
     };
-    version = "1.16.0";
+    version = "1.17.0";
   };
   uri = {
-    groups = [ "default" ];
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "09qyg6a29cfgd46qid8qvx4sjbv596v19ym73xvhanbyxd6500xk";
+      sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
       type = "gem";
     };
-    version = "1.0.2";
+    version = "1.0.3";
   };
   useragent = {
     groups = [
@@ -3519,10 +3823,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "08a6agx7xk1f6cr9a95dq42vl45si2ln21h33b96li59sv3555y6";
+      sha256 = "0270m29n7mq9yq4xnjzryzr6jxf292ahjn9fzywm2rg3rdz7cr59";
       type = "gem";
     };
-    version = "1.1.4";
+    version = "1.1.8";
   };
   web-push = {
     dependencies = [
@@ -3548,10 +3852,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "08kixkdp41dw39kqfxf2wp5m4z9b6fxg6yfa6xin0wy7dxzka0dy";
+      sha256 = "08v374yrqqhjj3xjzmvwnv3yz21r22kn071yr0i67gmwaf9mv7db";
       type = "gem";
     };
-    version = "3.24.0";
+    version = "3.25.1";
   };
   webrick = {
     groups = [
@@ -3567,19 +3871,6 @@
     };
     version = "1.9.1";
   };
-  websocket = {
-    groups = [
-      "default"
-      "test"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0dr78vh3ag0d1q5gfd8960g1ca9g6arjd2w54mffid8h4i7agrxp";
-      type = "gem";
-    };
-    version = "1.2.11";
-  };
   xpath = {
     dependencies = [ "nokogiri" ];
     groups = [
@@ -3624,9 +3915,27 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mi7b90hvc6nqv37q27df4i2m27yy56yfy2ki5073474a1h9hi89";
+      sha256 = "119ypabas886gd0n9kiid3q41w76gz60s8qmiak6pljpkd56ps5j";
       type = "gem";
     };
-    version = "2.7.1";
+    version = "2.7.3";
+  };
+  zendesk_api = {
+    dependencies = [
+      "faraday"
+      "faraday-multipart"
+      "hashie"
+      "inflection"
+      "mini_mime"
+      "multipart-post"
+    ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0yizpglgfwml6a2w696m97d1q50hq3v0vldja431rv93s9sjbgly";
+      type = "gem";
+    };
+    version = "1.38.0.rc1";
   };
 }
diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py
index 13dbf283c881..23d7d081d750 100755
--- a/pkgs/servers/web-apps/discourse/update.py
+++ b/pkgs/servers/web-apps/discourse/update.py
@@ -291,14 +291,12 @@ def update_plugins():
         {'name': 'discourse-github'},
         {'name': 'discourse-ldap-auth', 'owner': 'jonmbake'},
         {'name': 'discourse-math'},
-        {'name': 'discourse-migratepassword', 'owner': 'discoursehosting'},
         {'name': 'discourse-openid-connect'},
         {'name': 'discourse-prometheus'},
         {'name': 'discourse-reactions'},
         {'name': 'discourse-saved-searches'},
         {'name': 'discourse-solved'},
         {'name': 'discourse-spoiler-alert'},
-        {'name': 'discourse-voting', 'repo_name': "discourse-topic-voting"},
         {'name': 'discourse-yearly-review'},
     ]
 

From f9bf90c4b5f049cd492be5059e9b65dedc3023e4 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Fri, 17 Oct 2025 10:11:26 +0200
Subject: [PATCH 3893/6226] discourse: remove deprecated and moved to core
 plugins

moved to discourse core in this discourse 3.5.0:
  - discourse-assign
  - discourse-calender
  - discourse-chat-integration
  - discourse-data-explorer
  - discourse-github
  - discourse-math
  - discourse-oauth2-basic
  - discourse-openid-connect
  - discourse-reactions
  - discourse-solved

moved to discourse core in earlier releases:
  - discourse-spoiler-alert

deprecated plugins:
  - discourse-canned-replies (since Aug. 2023)
---
 .../discourse/plugins/all-plugins.nix         |  13 --
 .../plugins/discourse-assign/default.nix      |  21 ---
 .../plugins/discourse-calendar/Gemfile        |   6 -
 .../plugins/discourse-calendar/Gemfile.lock   |  35 ----
 .../plugins/discourse-calendar/default.nix    |  22 ---
 .../plugins/discourse-calendar/gemset.nix     | 126 -------------
 .../discourse-canned-replies/default.nix      |  21 ---
 .../discourse-chat-integration/default.nix    |  21 ---
 .../plugins/discourse-checklist/default.nix   |  21 ---
 .../discourse-data-explorer/default.nix       |  21 ---
 .../plugins/discourse-github/Gemfile          |   7 -
 .../plugins/discourse-github/Gemfile.lock     |  33 ----
 .../plugins/discourse-github/default.nix      |  23 ---
 .../plugins/discourse-github/gemset.nix       | 118 ------------
 .../plugins/discourse-math/default.nix        |  21 ---
 .../plugins/discourse-oauth2-basic/Gemfile    |   7 -
 .../discourse-oauth2-basic/Gemfile.lock       |  37 ----
 .../discourse-oauth2-basic/default.nix        |  21 ---
 .../plugins/discourse-oauth2-basic/gemset.nix | 172 ------------------
 .../plugins/discourse-openid-connect/Gemfile  |   7 -
 .../discourse-openid-connect/Gemfile.lock     |  37 ----
 .../discourse-openid-connect/default.nix      |  22 ---
 .../discourse-openid-connect/gemset.nix       | 172 ------------------
 .../plugins/discourse-reactions/default.nix   |  21 ---
 .../plugins/discourse-solved/default.nix      |  21 ---
 .../discourse-spoiler-alert/default.nix       |  21 ---
 pkgs/servers/web-apps/discourse/update.py     |  12 --
 27 files changed, 1059 deletions(-)
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile.lock
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/default.nix
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/gemset.nix
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile.lock
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/gemset.nix
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix
 delete mode 100644 pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix

diff --git a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix
index 0941b05f404c..df908dcb6b6d 100644
--- a/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/all-plugins.nix
@@ -3,23 +3,10 @@ let
   callPackage = newScope args;
 in
 {
-  discourse-assign = callPackage ./discourse-assign { };
   discourse-bbcode-color = callPackage ./discourse-bbcode-color { };
-  discourse-calendar = callPackage ./discourse-calendar { };
-  discourse-canned-replies = callPackage ./discourse-canned-replies { };
-  discourse-chat-integration = callPackage ./discourse-chat-integration { };
-  discourse-checklist = callPackage ./discourse-checklist { };
-  discourse-data-explorer = callPackage ./discourse-data-explorer { };
   discourse-docs = callPackage ./discourse-docs { };
-  discourse-github = callPackage ./discourse-github { };
   discourse-ldap-auth = callPackage ./discourse-ldap-auth { };
-  discourse-math = callPackage ./discourse-math { };
-  discourse-oauth2-basic = callPackage ./discourse-oauth2-basic { };
-  discourse-openid-connect = callPackage ./discourse-openid-connect { };
   discourse-prometheus = callPackage ./discourse-prometheus { };
-  discourse-reactions = callPackage ./discourse-reactions { };
   discourse-saved-searches = callPackage ./discourse-saved-searches { };
-  discourse-solved = callPackage ./discourse-solved { };
-  discourse-spoiler-alert = callPackage ./discourse-spoiler-alert { };
   discourse-yearly-review = callPackage ./discourse-yearly-review { };
 }
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix
deleted file mode 100644
index 613de051ec14..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-assign/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-assign";
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-assign";
-    rev = "6050446a9920f6ccf0694b38cec611452654b7bc";
-    sha256 = "sha256-MxPCzqRbb9bgmR9OO4gfJUzFvmyBOcU1E1y1FUdUp9M=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-docs";
-    maintainers = with maintainers; [ dpausp ];
-    license = licenses.mit;
-    description = "Discourse Plugin for assigning users to a topic";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile
deleted file mode 100644
index 76faf85df5e2..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile
+++ /dev/null
@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-# gem "rails"
-gem "rrule", "0.4.4", require: false
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock
deleted file mode 100644
index 15aafaf94c9c..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/Gemfile.lock
+++ /dev/null
@@ -1,35 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activesupport (7.1.3.3)
-      base64
-      bigdecimal
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      connection_pool (>= 2.2.5)
-      drb
-      i18n (>= 1.6, < 2)
-      minitest (>= 5.1)
-      mutex_m
-      tzinfo (~> 2.0)
-    base64 (0.2.0)
-    bigdecimal (3.1.8)
-    concurrent-ruby (1.2.3)
-    connection_pool (2.4.1)
-    drb (2.2.1)
-    i18n (1.14.5)
-      concurrent-ruby (~> 1.0)
-    minitest (5.23.1)
-    mutex_m (0.2.0)
-    rrule (0.4.4)
-      activesupport (>= 2.3)
-    tzinfo (2.0.6)
-      concurrent-ruby (~> 1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rrule (= 0.4.4)
-
-BUNDLED WITH
-   2.5.9
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix
deleted file mode 100644
index 238bc3902ef9..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-calendar";
-  bundlerEnvArgs.gemdir = ./.;
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-calendar";
-    rev = "43e97c16e595f3f80d53a787614eb7c0f9d6a1c1";
-    sha256 = "sha256-zks4zqzc4ZnUxMHSiUkcwaZEzmUXXgFMdiEp6CRPEIU=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-calendar";
-    maintainers = with maintainers; [ ryantm ];
-    license = licenses.mit;
-    description = "Adds the ability to create a dynamic calendar in the first post of a topic";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix
deleted file mode 100644
index 8fdcbcd0fa35..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-calendar/gemset.nix
+++ /dev/null
@@ -1,126 +0,0 @@
-{
-  activesupport = {
-    dependencies = [
-      "base64"
-      "bigdecimal"
-      "concurrent-ruby"
-      "connection_pool"
-      "drb"
-      "i18n"
-      "minitest"
-      "mutex_m"
-      "tzinfo"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0z8kygxmz99krz9pwp947znkzf0jr64sml28df0vf1gzxlg7y57i";
-      type = "gem";
-    };
-    version = "7.1.3.3";
-  };
-  base64 = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g";
-      type = "gem";
-    };
-    version = "0.2.0";
-  };
-  bigdecimal = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1gi7zqgmqwi5lizggs1jhc3zlwaqayy9rx2ah80sxy24bbnng558";
-      type = "gem";
-    };
-    version = "3.1.8";
-  };
-  concurrent-ruby = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1qh1b14jwbbj242klkyz5fc7npd4j0mvndz62gajhvl1l3wd7zc2";
-      type = "gem";
-    };
-    version = "1.2.3";
-  };
-  connection_pool = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1x32mcpm2cl5492kd6lbjbaf17qsssmpx9kdyr7z1wcif2cwyh0g";
-      type = "gem";
-    };
-    version = "2.4.1";
-  };
-  drb = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79";
-      type = "gem";
-    };
-    version = "2.2.1";
-  };
-  i18n = {
-    dependencies = [ "concurrent-ruby" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1ffix518y7976qih9k1lgnc17i3v6yrlh0a3mckpxdb4wc2vrp16";
-      type = "gem";
-    };
-    version = "1.14.5";
-  };
-  minitest = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1gkslxvkhh44s21rbjvka3zsvfxxrf5pcl6f75rv2vyrzzbgis7i";
-      type = "gem";
-    };
-    version = "5.23.1";
-  };
-  mutex_m = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1ma093ayps1m92q845hmpk0dmadicvifkbf05rpq9pifhin0rvxn";
-      type = "gem";
-    };
-    version = "0.2.0";
-  };
-  rrule = {
-    dependencies = [ "activesupport" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "04h3q0ws0wswqj3mwjyv44yx59d9ima9a820ay9w5bwnlb73syj2";
-      type = "gem";
-    };
-    version = "0.4.4";
-  };
-  tzinfo = {
-    dependencies = [ "concurrent-ruby" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "16w2g84dzaf3z13gxyzlzbf748kylk5bdgg3n1ipvkvvqy685bwd";
-      type = "gem";
-    };
-    version = "2.0.6";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix
deleted file mode 100644
index b6f6c113ea24..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-canned-replies/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-canned-replies";
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-canned-replies";
-    rev = "732598b6cdc86c74622bb15bfeaebb05611bbc25";
-    sha256 = "sha256-t0emNsPT8o0ralUedt33ufH0VLl4/12lVBBCnzfdRxE=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-canned-replies";
-    maintainers = with maintainers; [ talyz ];
-    license = licenses.gpl2Only;
-    description = "Adds support for inserting a canned reply into the composer window via a UI";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix
deleted file mode 100644
index c23408a1c3bc..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-chat-integration/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-chat-integration";
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-chat-integration";
-    rev = "428df114ff7f8416314dc585e59bc898ee59c674";
-    sha256 = "sha256-pP9MzQz9nghGIPMnGFOEXxW/OH/8BzHltcxAQboLYec=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-chat-integration";
-    maintainers = with maintainers; [ dpausp ];
-    license = licenses.mit;
-    description = "This plugin integrates Discourse with a number of external chatroom systems";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix
deleted file mode 100644
index d9934bc3d872..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-checklist/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-checklist";
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-checklist";
-    rev = "6fcf9fed5c3ae3baf9ddd1cca9cef4dc089996c1";
-    sha256 = "sha256-RIuoqZo7dW1DXbfbWhyyhCOGe4R5sLerzFW2TT0zO6U=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-checklist";
-    maintainers = with maintainers; [ ryantm ];
-    license = licenses.gpl2Only;
-    description = "Simple checklist rendering plugin for discourse";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix
deleted file mode 100644
index de23b46bf2ac..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-data-explorer/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-data-explorer";
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-data-explorer";
-    rev = "b61e81fb616ce5880af96584ab9175f07f6362d4";
-    sha256 = "sha256-4E2PR7RwoM/e6cJFuaorK6EYe1nSDKkorJWrlWPzg3g=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-data-explorer";
-    maintainers = with maintainers; [ ryantm ];
-    license = licenses.mit;
-    description = "SQL Queries for admins in Discourse";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile
deleted file mode 100644
index c24a3e860d7c..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-source "https://rubygems.org"
-
-# gem "rails"
-gem "sawyer", "0.9.2"
-gem "octokit", "5.6.1"
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock
deleted file mode 100644
index 6414282db56f..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/Gemfile.lock
+++ /dev/null
@@ -1,33 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    addressable (2.8.7)
-      public_suffix (>= 2.0.2, < 7.0)
-    faraday (2.13.4)
-      faraday-net_http (>= 2.0, < 3.5)
-      json
-      logger
-    faraday-net_http (3.4.1)
-      net-http (>= 0.5.0)
-    json (2.13.2)
-    logger (1.7.0)
-    net-http (0.6.0)
-      uri
-    octokit (5.6.1)
-      faraday (>= 1, < 3)
-      sawyer (~> 0.9)
-    public_suffix (6.0.2)
-    sawyer (0.9.2)
-      addressable (>= 2.3.5)
-      faraday (>= 0.17.3, < 3)
-    uri (1.0.3)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  octokit (= 5.6.1)
-  sawyer (= 0.9.2)
-
-BUNDLED WITH
-   2.5.22
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix
deleted file mode 100644
index e27d192d721f..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-github";
-  bundlerEnvArgs.gemdir = ./.;
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-github";
-    rev = "d0cd63043de2ddac624db61ba282e0474fd447e2";
-    sha256 = "sha256-NDC8KdfbgwM60i9g4PpziWD6uU9Mp67SOG7oYhS4j5I=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-github";
-    maintainers = with maintainers; [ talyz ];
-    license = licenses.mit;
-    description = "Adds GitHub badges and linkback functionality";
-  };
-
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix
deleted file mode 100644
index 7c3adab7270c..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-github/gemset.nix
+++ /dev/null
@@ -1,118 +0,0 @@
-{
-  addressable = {
-    dependencies = [ "public_suffix" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6";
-      type = "gem";
-    };
-    version = "2.8.7";
-  };
-  faraday = {
-    dependencies = [
-      "faraday-net_http"
-      "json"
-      "logger"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "09mcghancmn0s5cwk2xz581j3xm3xqxfv0yxg75axnyhrx9gy6f7";
-      type = "gem";
-    };
-    version = "2.13.4";
-  };
-  faraday-net_http = {
-    dependencies = [ "net-http" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0fxbckg468dabkkznv48ss8zv14d9cd8mh1rr3m98aw7wzx5fmq9";
-      type = "gem";
-    };
-    version = "3.4.1";
-  };
-  json = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0s5vklcy2fgdxa9c6da34jbfrqq7xs6mryjglqqb5iilshcg3q82";
-      type = "gem";
-    };
-    version = "2.13.2";
-  };
-  logger = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr";
-      type = "gem";
-    };
-    version = "1.7.0";
-  };
-  net-http = {
-    dependencies = [ "uri" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn";
-      type = "gem";
-    };
-    version = "0.6.0";
-  };
-  octokit = {
-    dependencies = [
-      "faraday"
-      "sawyer"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "15g4kyag6gmxxq6d03472h7srm3imlsks1wg6nac7hl3mb1b5vs8";
-      type = "gem";
-    };
-    version = "5.6.1";
-  };
-  public_suffix = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz";
-      type = "gem";
-    };
-    version = "6.0.2";
-  };
-  sawyer = {
-    dependencies = [
-      "addressable"
-      "faraday"
-    ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1jks1qjbmqm8f9kvwa81vqj39avaj9wdnzc531xm29a55bb74fps";
-      type = "gem";
-    };
-    version = "0.9.2";
-  };
-  uri = {
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9";
-      type = "gem";
-    };
-    version = "1.0.3";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix
deleted file mode 100644
index 6d2115f724bf..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-math/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-math";
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-math";
-    rev = "8db3f371e543bdf21fba35b1a539036386517272";
-    sha256 = "sha256-ARyPDpDUlPlhhw4KL+eo5AUzp1F2moenXEemV72kfsI=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-math";
-    maintainers = with maintainers; [ talyz ];
-    license = licenses.mit;
-    description = "Official MathJax support for Discourse";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile
deleted file mode 100644
index 7da32ec03949..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-group :development do
-  gem 'rubocop-discourse'
-end
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile.lock
deleted file mode 100644
index 6a91a08c0e86..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/Gemfile.lock
+++ /dev/null
@@ -1,37 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.2)
-    parallel (1.22.1)
-    parser (3.1.1.0)
-      ast (~> 2.4.1)
-    rainbow (3.1.1)
-    regexp_parser (2.2.1)
-    rexml (3.2.5)
-    rubocop (1.26.1)
-      parallel (~> 1.10)
-      parser (>= 3.1.0.0)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.16.0, < 2.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.16.0)
-      parser (>= 3.1.1.0)
-    rubocop-discourse (2.5.0)
-      rubocop (>= 1.1.0)
-      rubocop-rspec (>= 2.0.0)
-    rubocop-rspec (2.9.0)
-      rubocop (~> 1.19)
-    ruby-progressbar (1.11.0)
-    unicode-display_width (2.1.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rubocop-discourse
-
-BUNDLED WITH
-   2.1.4
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/default.nix
deleted file mode 100644
index 9cad18c9eb5b..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin rec {
-  name = "discourse-oauth2-basic";
-  bundlerEnvArgs.gemdir = ./.;
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = name;
-    rev = "06ba5daa9aabd0487f2f30b944b6500f1f481308";
-    sha256 = "sha256-T08Q36k2hb9wVimKIa4O5mWcrr6VBTfHvhRJiLBiRPY=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/${name}";
-    license = licenses.mit;
-    description = "Basic OAuth2 plugin for use with Discourse";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/gemset.nix
deleted file mode 100644
index 8bbea6576bf1..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-oauth2-basic/gemset.nix
+++ /dev/null
@@ -1,172 +0,0 @@
-{
-  ast = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
-      type = "gem";
-    };
-    version = "2.4.2";
-  };
-  parallel = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "07vnk6bb54k4yc06xnwck7php50l09vvlw1ga8wdz0pia461zpzb";
-      type = "gem";
-    };
-    version = "1.22.1";
-  };
-  parser = {
-    dependencies = [ "ast" ];
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0zaghgvva2q4jqbachg8jvpwgbg3w1jqr0d00m8rqciqznjgsw3c";
-      type = "gem";
-    };
-    version = "3.1.1.0";
-  };
-  rainbow = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0smwg4mii0fm38pyb5fddbmrdpifwv22zv3d3px2xx497am93503";
-      type = "gem";
-    };
-    version = "3.1.1";
-  };
-  regexp_parser = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "155f6cr4rrfw5bs5xd3m5kfw32qhc5fsi4nk82rhif56rc6cs0wm";
-      type = "gem";
-    };
-    version = "2.2.1";
-  };
-  rexml = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
-      type = "gem";
-    };
-    version = "3.2.5";
-  };
-  rubocop = {
-    dependencies = [
-      "parallel"
-      "parser"
-      "rainbow"
-      "regexp_parser"
-      "rexml"
-      "rubocop-ast"
-      "ruby-progressbar"
-      "unicode-display_width"
-    ];
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "06105yrqajpm5l07fng1nbk55y9490hny542zclnan8hg841pjgl";
-      type = "gem";
-    };
-    version = "1.26.1";
-  };
-  rubocop-ast = {
-    dependencies = [ "parser" ];
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1bd2z82ly7fix8415gvfiwzb6bjialz5rs3sr72kv1lk68rd23wv";
-      type = "gem";
-    };
-    version = "1.16.0";
-  };
-  rubocop-discourse = {
-    dependencies = [
-      "rubocop"
-      "rubocop-rspec"
-    ];
-    groups = [ "development" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "01f4y7am9cq276zl8vsgv64w8wfmhpbzg7vzsifhgnnh92g6s04g";
-      type = "gem";
-    };
-    version = "2.5.0";
-  };
-  rubocop-rspec = {
-    dependencies = [ "rubocop" ];
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "051gq9pz49iv4gq34d3n089iaa6cb418n2fhin6gd6fpysbi3nf6";
-      type = "gem";
-    };
-    version = "2.9.0";
-  };
-  ruby-progressbar = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "02nmaw7yx9kl7rbaan5pl8x5nn0y4j5954mzrkzi9i3dhsrps4nc";
-      type = "gem";
-    };
-    version = "1.11.0";
-  };
-  unicode-display_width = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0csjm9shhfik0ci9mgimb7hf3xgh7nx45rkd9rzgdz6vkwr8rzxn";
-      type = "gem";
-    };
-    version = "2.1.0";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile
deleted file mode 100644
index 7da32ec03949..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-source 'https://rubygems.org'
-
-group :development do
-  gem 'rubocop-discourse'
-end
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile.lock b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile.lock
deleted file mode 100644
index 0987b206fa66..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/Gemfile.lock
+++ /dev/null
@@ -1,37 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    ast (2.4.1)
-    parallel (1.19.2)
-    parser (2.7.2.0)
-      ast (~> 2.4.1)
-    rainbow (3.0.0)
-    regexp_parser (1.8.1)
-    rexml (3.2.5)
-    rubocop (0.93.0)
-      parallel (~> 1.10)
-      parser (>= 2.7.1.5)
-      rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8)
-      rexml
-      rubocop-ast (>= 0.6.0)
-      ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
-    rubocop-ast (0.7.1)
-      parser (>= 2.7.1.5)
-    rubocop-discourse (2.3.2)
-      rubocop (>= 0.69.0)
-      rubocop-rspec (>= 1.39.0)
-    rubocop-rspec (1.43.2)
-      rubocop (~> 0.87)
-    ruby-progressbar (1.10.1)
-    unicode-display_width (1.7.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rubocop-discourse
-
-BUNDLED WITH
-   2.1.4
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix
deleted file mode 100644
index 9abdf8634081..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/default.nix
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-openid-connect";
-  bundlerEnvArgs.gemdir = ./.;
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-openid-connect";
-    rev = "8b879884b677b60ee726282457427864f2767926";
-    sha256 = "sha256-+j3YRbZYCDnoweyfiCFP3U6AX860B1RQT14IBhnSi4M=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-openid-connect";
-    maintainers = with maintainers; [ mkg20001 ];
-    license = licenses.mit;
-    description = "Discourse plugin to integrate Discourse with an openid-connect login provider";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/gemset.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/gemset.nix
deleted file mode 100644
index 37d643eb7d03..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-openid-connect/gemset.nix
+++ /dev/null
@@ -1,172 +0,0 @@
-{
-  ast = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1l3468czzjmxl93ap40hp7z94yxp4nbag0bxqs789bm30md90m2a";
-      type = "gem";
-    };
-    version = "2.4.1";
-  };
-  parallel = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "17b127xxmm2yqdz146qwbs57046kn0js1h8synv01dwqz2z1kp2l";
-      type = "gem";
-    };
-    version = "1.19.2";
-  };
-  parser = {
-    dependencies = [ "ast" ];
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1f7gmm60yla325wlnd3qkxs59qm2y0aan8ljpg6k18rwzrrfil6z";
-      type = "gem";
-    };
-    version = "2.7.2.0";
-  };
-  rainbow = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0bb2fpjspydr6x0s8pn1pqkzmxszvkfapv0p4627mywl7ky4zkhk";
-      type = "gem";
-    };
-    version = "3.0.0";
-  };
-  regexp_parser = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0n9d14ppshnx71i3mi1pnm3hwhcbb6m6vsc0b0dqgsab8r2rs96n";
-      type = "gem";
-    };
-    version = "1.8.1";
-  };
-  rexml = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53";
-      type = "gem";
-    };
-    version = "3.2.5";
-  };
-  rubocop = {
-    dependencies = [
-      "parallel"
-      "parser"
-      "rainbow"
-      "regexp_parser"
-      "rexml"
-      "rubocop-ast"
-      "ruby-progressbar"
-      "unicode-display_width"
-    ];
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1nrv7i81549addig09grw17qkab3l4319dcsf9y7psl7aa76ng3a";
-      type = "gem";
-    };
-    version = "0.93.0";
-  };
-  rubocop-ast = {
-    dependencies = [ "parser" ];
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "129hgz4swc8n0g01715v7y00k0h4mlzkxh63q7z27q7mjp54rl74";
-      type = "gem";
-    };
-    version = "0.7.1";
-  };
-  rubocop-discourse = {
-    dependencies = [
-      "rubocop"
-      "rubocop-rspec"
-    ];
-    groups = [ "development" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "10l2wwnvd4xccgqsyhxrhc5bw10b7an4awl0v90fw5xf2qdjiflw";
-      type = "gem";
-    };
-    version = "2.3.2";
-  };
-  rubocop-rspec = {
-    dependencies = [ "rubocop" ];
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1sc0bwdxzfr8byxzwvfyf22lwzqcaa6ca7wzxx31mk7vvy7r7dhl";
-      type = "gem";
-    };
-    version = "1.43.2";
-  };
-  ruby-progressbar = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "1k77i0d4wsn23ggdd2msrcwfy0i376cglfqypkk2q77r2l3408zf";
-      type = "gem";
-    };
-    version = "1.10.1";
-  };
-  unicode-display_width = {
-    groups = [
-      "default"
-      "development"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "06i3id27s60141x6fdnjn5rar1cywdwy64ilc59cz937303q3mna";
-      type = "gem";
-    };
-    version = "1.7.0";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix
deleted file mode 100644
index beace0fe7059..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-reactions/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-reactions";
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-reactions";
-    rev = "ed83e21e6e722cef3e38d6da083d483bfa14503b";
-    sha256 = "sha256-XA9ADzBzp1TVV4belv4b4GR7xWY/05WFAWRlUBr2M+o=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-reactions";
-    maintainers = with maintainers; [ bbenno ];
-    license = licenses.mit;
-    description = "Allows users to react to a post from a choice of emojis, rather than only the like heart";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix
deleted file mode 100644
index 2cb7a168c5a7..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-solved/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-solved";
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-solved";
-    rev = "8e777aa05dd3a303ccd772226e24b2e5f4d6be31";
-    sha256 = "sha256-z/fB+QQW6iMBBDHUWvr5UmWyLyo18qnXddEOiPM7aRQ=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-solved";
-    maintainers = with maintainers; [ talyz ];
-    license = licenses.mit;
-    description = "Allow accepted answers on topics";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix
deleted file mode 100644
index 75f78b9d6b70..000000000000
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-spoiler-alert/default.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  lib,
-  mkDiscoursePlugin,
-  fetchFromGitHub,
-}:
-
-mkDiscoursePlugin {
-  name = "discourse-spoiler-alert";
-  src = fetchFromGitHub {
-    owner = "discourse";
-    repo = "discourse-spoiler-alert";
-    rev = "42b77ec048b9b386a8b25a22bfec6472817da465";
-    sha256 = "sha256-BQeID+y9RvmcnuNsodOMXseVvre5QYxv+E/ul8bucUI=";
-  };
-  meta = with lib; {
-    homepage = "https://github.com/discourse/discourse-spoiler-alert";
-    maintainers = with maintainers; [ talyz ];
-    license = licenses.mit;
-    description = "Hide spoilers behind the spoiler-alert jQuery plugin";
-  };
-}
diff --git a/pkgs/servers/web-apps/discourse/update.py b/pkgs/servers/web-apps/discourse/update.py
index 23d7d081d750..c859394bf11f 100755
--- a/pkgs/servers/web-apps/discourse/update.py
+++ b/pkgs/servers/web-apps/discourse/update.py
@@ -280,23 +280,11 @@ def update_mail_receiver(rev):
 def update_plugins():
     """Update plugins to their latest revision."""
     plugins = [
-        {'name': 'discourse-assign'},
         {'name': 'discourse-bbcode-color'},
-        {'name': 'discourse-calendar'},
-        {'name': 'discourse-canned-replies'},
-        {'name': 'discourse-chat-integration'},
-        {'name': 'discourse-checklist'},
-        {'name': 'discourse-data-explorer'},
         {'name': 'discourse-docs'},
-        {'name': 'discourse-github'},
         {'name': 'discourse-ldap-auth', 'owner': 'jonmbake'},
-        {'name': 'discourse-math'},
-        {'name': 'discourse-openid-connect'},
         {'name': 'discourse-prometheus'},
-        {'name': 'discourse-reactions'},
         {'name': 'discourse-saved-searches'},
-        {'name': 'discourse-solved'},
-        {'name': 'discourse-spoiler-alert'},
         {'name': 'discourse-yearly-review'},
     ]
 

From 28b018d923632b4eb9be1850e19f66ada476aa03 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 29 Oct 2025 19:58:35 +0100
Subject: [PATCH 3894/6226] discourse.mkDiscoursePlugin: allow overriding
 pluginName
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

discourse.plugins.discourse-ldap-auth has the interesting situation that
it – as only package – only has `ldap` as name and not prefixed with
`discourse-`. I feel like having a `ldap` derivation without further
context is bad, so I went this way.
---
 pkgs/servers/web-apps/discourse/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index ce34806e2a80..85d0212e8118 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -122,9 +122,12 @@ let
       );
     in
     stdenv.mkDerivation (
-      removeAttrs args [ "bundlerEnvArgs" ]
-      // {
+      # Allow overriding the plugin name
+      {
         pluginName = if name != null then name else "${pname}-${version}";
+      }
+      // removeAttrs args [ "bundlerEnvArgs" ]
+      // {
         dontConfigure = true;
         dontBuild = true;
         installPhase = ''

From 392c7197695885408659a4a46c40e2c43a6e4a20 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 29 Oct 2025 19:58:35 +0100
Subject: [PATCH 3895/6226] discourse.plugins.discourse-ldap-auth: fix plugin
 name

---
 .../web-apps/discourse/plugins/discourse-ldap-auth/default.nix   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix
index 898806d4b8f0..c93a3e115878 100644
--- a/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix
+++ b/pkgs/servers/web-apps/discourse/plugins/discourse-ldap-auth/default.nix
@@ -7,6 +7,7 @@
 mkDiscoursePlugin {
   name = "discourse-ldap-auth";
   bundlerEnvArgs.gemdir = ./.;
+  pluginName = "ldap";
   src = fetchFromGitHub {
     owner = "jonmbake";
     repo = "discourse-ldap-auth";

From b5d03c91faa799edb3f3741173a22ca10077bbac Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Wed, 29 Oct 2025 20:15:26 +0100
Subject: [PATCH 3896/6226] discourse: 3.5.1 -> 3.5.2

https://meta.discourse.org/t/3-5-2-security-and-maintenance-release/386388
---
 pkgs/servers/web-apps/discourse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/web-apps/discourse/default.nix b/pkgs/servers/web-apps/discourse/default.nix
index 85d0212e8118..1d44b19da0df 100644
--- a/pkgs/servers/web-apps/discourse/default.nix
+++ b/pkgs/servers/web-apps/discourse/default.nix
@@ -51,13 +51,13 @@
 }:
 
 let
-  version = "3.5.1";
+  version = "3.5.2";
 
   src = fetchFromGitHub {
     owner = "discourse";
     repo = "discourse";
     rev = "v${version}";
-    sha256 = "sha256-hMC2YZUxe/zoL2oSMVlWqqiP+UDcJMPVsGzHdh8nwjc=";
+    sha256 = "sha256-8Uzb0cjC3PUrh6Nlu6OJ09GKD+8KZq/IUba2NXLm1JI=";
   };
 
   ruby = ruby_3_3;

From c397e01cf4b04fe4430e0c9b81386985121c54c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 19:39:45 +0000
Subject: [PATCH 3897/6226] python3Packages.swcgeom: 0.19.4 -> 0.20.0

---
 pkgs/development/python-modules/swcgeom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/swcgeom/default.nix b/pkgs/development/python-modules/swcgeom/default.nix
index a2654535d466..a3f309080f49 100644
--- a/pkgs/development/python-modules/swcgeom/default.nix
+++ b/pkgs/development/python-modules/swcgeom/default.nix
@@ -26,7 +26,7 @@
 }:
 
 let
-  version = "0.19.4";
+  version = "0.20.0";
 in
 buildPythonPackage rec {
   pname = "swcgeom";
@@ -37,7 +37,7 @@ buildPythonPackage rec {
     owner = "yzx9";
     repo = "swcgeom";
     tag = "v${version}";
-    hash = "sha256-emffSI4LO+5UU267d+qj/NCVvHmRpzikJ7jdCOtPFNo=";
+    hash = "sha256-XMpDzjKwj9DQTT/LC0tcBcqO5yetP5JNQbTOGkHv9TM=";
   };
 
   build-system = [

From 6e978ef038fd84b97a83bed721ccdc7f8c1a1d5e Mon Sep 17 00:00:00 2001
From: Patrizio Bekerle <patrizio@bekerle.com>
Date: Thu, 23 Oct 2025 09:50:55 +0200
Subject: [PATCH 3898/6226] nixbit: init at 0.1.5

Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>
---
 pkgs/by-name/ni/nixbit/package.nix | 63 ++++++++++++++++++++++++++++++
 1 file changed, 63 insertions(+)
 create mode 100644 pkgs/by-name/ni/nixbit/package.nix

diff --git a/pkgs/by-name/ni/nixbit/package.nix b/pkgs/by-name/ni/nixbit/package.nix
new file mode 100644
index 000000000000..5c507514b6d7
--- /dev/null
+++ b/pkgs/by-name/ni/nixbit/package.nix
@@ -0,0 +1,63 @@
+{
+  cmake,
+  fetchFromGitHub,
+  installShellFiles,
+  kdePackages,
+  lib,
+  libgit2,
+  ninja,
+  pkg-config,
+  qt6,
+  stdenv,
+  xvfb-run,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "nixbit";
+  version = "0.1.5";
+
+  src = fetchFromGitHub {
+    owner = "pbek";
+    repo = "nixbit";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-DpjLPvmn61rEn6ui8cFfqeZEPYGyCUVVP/V7mQw1l5Y=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    installShellFiles
+    kdePackages.extra-cmake-modules
+    ninja
+    pkg-config
+    qt6.wrapQtAppsHook
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ xvfb-run ];
+
+  buildInputs = [
+    kdePackages.kconfig
+    kdePackages.kcoreaddons
+    kdePackages.ki18n
+    kdePackages.kirigami
+    libgit2
+    qt6.qtbase
+    qt6.qtdeclarative
+    qt6.qtwayland
+  ];
+
+  # Install shell completion on Linux (with xvfb-run)
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd nixbit \
+      --bash <(xvfb-run $out/bin/nixbit --completion-bash) \
+      --fish <(xvfb-run $out/bin/nixbit --completion-fish)
+  '';
+
+  meta = with lib; {
+    description = "KDE Plasma application to update your NixOS system from a git repository";
+    homepage = "https://github.com/pbek/nixbit";
+    changelog = "https://github.com/pbek/nixbit/releases/tag/v${finalAttrs.version}";
+    license = licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ pbek ];
+    platforms = platforms.linux;
+    mainProgram = "nixbit";
+  };
+})

From 61d3a758fc7c9c322db240c2670138d88c60d6a5 Mon Sep 17 00:00:00 2001
From: Patrizio Bekerle <patrizio@bekerle.com>
Date: Thu, 23 Oct 2025 09:51:11 +0200
Subject: [PATCH 3899/6226] nixos/nixbit: init module

Signed-off-by: Patrizio Bekerle <patrizio@bekerle.com>
---
 .../manual/release-notes/rl-2511.section.md   |  2 +
 nixos/modules/module-list.nix                 |  1 +
 nixos/modules/programs/nixbit.nix             | 49 +++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 nixos/modules/programs/nixbit.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 381d12c93600..8e40272ed48a 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -168,6 +168,8 @@
 
 - [Tenstorrent](https://tenstorrent.com) hardware module has been added.
 
+- [nixbit](https://github.com/pbek/nixbit), a GUI application for updating your NixOS system from a Nix Flakes Git repository. Available as [programs.nixbit](#opt-programs.nixbit.enable).
+
 ## Backward Incompatibilities {#sec-release-25.11-incompatibilities}
 
 <!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index 2b98c1cc23e1..f79f9594d080 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -277,6 +277,7 @@
   ./programs/nix-index.nix
   ./programs/nix-ld.nix
   ./programs/nix-required-mounts.nix
+  ./programs/nixbit.nix
   ./programs/nm-applet.nix
   ./programs/nncp.nix
   ./programs/noisetorch.nix
diff --git a/nixos/modules/programs/nixbit.nix b/nixos/modules/programs/nixbit.nix
new file mode 100644
index 000000000000..23bc5273409a
--- /dev/null
+++ b/nixos/modules/programs/nixbit.nix
@@ -0,0 +1,49 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  inherit (lib)
+    mkEnableOption
+    mkIf
+    mkOption
+    mkPackageOption
+    types
+    ;
+  cfg = config.programs.nixbit;
+in
+{
+  options.programs.nixbit = {
+    enable = mkEnableOption "Nixbit configuration";
+
+    package = mkPackageOption pkgs "nixbit" { };
+
+    repository = mkOption {
+      type = types.str;
+      description = "Git repository URL for Nixbit";
+    };
+
+    forceAutostart = mkEnableOption "" // {
+      description = "Force creation of autostart desktop entry when application starts";
+    };
+  };
+
+  config = mkIf cfg.enable {
+    environment = {
+      systemPackages = [ cfg.package ];
+
+      etc."nixbit.conf".text =
+        lib.optionalString (cfg.repository != "") ''
+          [Repository]
+          Url = ${cfg.repository}
+        ''
+        + ''
+          [Autostart]
+          Force = ${if cfg.forceAutostart then "true" else "false"}
+        '';
+    };
+  };
+}

From 5a730f1dd1bfc9df9af5dde516e2124483b225a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 19:53:58 +0000
Subject: [PATCH 3900/6226] warp-plus: 1.2.6-unstable-2025-09-13 ->
 1.2.6-unstable-2025-10-28

---
 pkgs/by-name/wa/warp-plus/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/warp-plus/package.nix b/pkgs/by-name/wa/warp-plus/package.nix
index d8a12f381140..5257c82f64d1 100644
--- a/pkgs/by-name/wa/warp-plus/package.nix
+++ b/pkgs/by-name/wa/warp-plus/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "warp-plus";
-  version = "1.2.6-unstable-2025-09-13";
+  version = "1.2.6-unstable-2025-10-28";
 
   src = fetchFromGitHub {
     owner = "bepass-org";
     repo = "warp-plus";
-    rev = "4af9b2abfc4e79dceea41ac577f1683f62f57b8c";
-    hash = "sha256-7i/06Qn+BRH/bWel9OvgVUAZZSwL2Euv179JDJNn2EE=";
+    rev = "3653f7519d2a08a36222accff6899522bb8b03d0";
+    hash = "sha256-T0YTxQ7iciv5i7lw+bU00B6iYquzBwzYkAlOGZiKeWc=";
   };
 
   vendorHash = "sha256-GmxiQk50iQoH2J/qUVvl9RBz6aIQp8RURqTzrl6NdCY=";

From 523907c76ee66f52c23558110b9a06d897c64b21 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 29 Oct 2025 19:54:19 +0000
Subject: [PATCH 3901/6226] harlequin: 2.3.0 -> 2.4.0

Diff: https://github.com/tconbeer/harlequin/compare/v2.3.0...v2.4.0

Changelog: https://github.com/tconbeer/harlequin/releases/tag/v2.4.0
---
 pkgs/by-name/ha/harlequin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix
index 4562f8e5fd88..8ce6cfd95c93 100644
--- a/pkgs/by-name/ha/harlequin/package.nix
+++ b/pkgs/by-name/ha/harlequin/package.nix
@@ -12,14 +12,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "harlequin";
-  version = "2.3.0";
+  version = "2.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tconbeer";
     repo = "harlequin";
     tag = "v${version}";
-    hash = "sha256-CbbqbnspQ4XZmNpE1CmD+zg2okFRTx95gQUVUqoOq9U=";
+    hash = "sha256-jg29EEwPVTy1n6PYAxNqbyCsmmAxzRWD3vLCvvMd+6E=";
   };
 
   pythonRelaxDeps = [

From a9f6992e6cd3e33cd088a13eaa07e2418654a54e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 29 Oct 2025 20:04:03 +0000
Subject: [PATCH 3902/6226] apptainer: 1.4.3 -> 1.4.4

Diff: https://github.com/apptainer/apptainer/compare/v1.4.3...v1.4.4

Changelog: https://github.com/apptainer/apptainer/releases/tag/v1.4.4
---
 pkgs/applications/virtualization/singularity/packages.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/virtualization/singularity/packages.nix b/pkgs/applications/virtualization/singularity/packages.nix
index 4b2bc23b0200..f46042addf88 100644
--- a/pkgs/applications/virtualization/singularity/packages.nix
+++ b/pkgs/applications/virtualization/singularity/packages.nix
@@ -9,19 +9,19 @@ let
     callPackage
       (import ./generic.nix rec {
         pname = "apptainer";
-        version = "1.4.3";
+        version = "1.4.4";
         projectName = "apptainer";
 
         src = fetchFromGitHub {
           owner = "apptainer";
           repo = "apptainer";
           tag = "v${version}";
-          hash = "sha256-VUtTv6kH08CCOLlRq4lPyOOlduf/oSiGcQ3cHl7ks8I=";
+          hash = "sha256-d3XcN+Jc9KHzVCHOatgpId/DeY/HhVkI9eF+48rzxO4=";
         };
 
         # Override vendorHash with overrideAttrs.
         # See https://nixos.org/manual/nixpkgs/unstable/#buildGoModule-vendorHash
-        vendorHash = "sha256-Q56kFnWw5TqeNGyv2n9QempfIdfPXX1qzdf/G68Pfp8=";
+        vendorHash = "sha256-l8c85M9IdLNhZ40FkC+zH+0wHKcYHcXFbhMklCLULzs=";
 
         extraDescription = " (previously known as Singularity)";
         extraMeta.homepage = "https://apptainer.org";

From 8fb4302f85ad41137ba22f1e59dc7d6a80c16ff9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 20:42:54 +0000
Subject: [PATCH 3903/6226] python3Packages.stdlibs: 2025.5.10 -> 2025.10.28

---
 pkgs/development/python-modules/stdlibs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/stdlibs/default.nix b/pkgs/development/python-modules/stdlibs/default.nix
index 7a6b4a145468..e2ce08b3fe7b 100644
--- a/pkgs/development/python-modules/stdlibs/default.nix
+++ b/pkgs/development/python-modules/stdlibs/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "stdlibs";
-  version = "2025.5.10";
+  version = "2025.10.28";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "omnilib";
     repo = "stdlibs";
     tag = "v${version}";
-    hash = "sha256-pvQZ+sRmad5m274wbIulHh5Tifim35uH7mz69jopVRw=";
+    hash = "sha256-1xdwYwkQqkPsa5yjrTUM0HxRVLJ+ZQvYwFpjIlW7jaY=";
   };
 
   build-system = [ flit-core ];

From baae02acc62b9bf190076de9a807a936f7189a58 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 20:50:55 +0000
Subject: [PATCH 3904/6226] home-assistant-custom-components.systemair: 1.0.13
 -> 1.0.14

---
 .../home-assistant/custom-components/systemair/package.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/systemair/package.nix b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
index 492ca06408b6..f03e5f99e903 100644
--- a/pkgs/servers/home-assistant/custom-components/systemair/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
@@ -10,13 +10,13 @@
 buildHomeAssistantComponent rec {
   owner = "AN3Orik";
   domain = "systemair";
-  version = "1.0.13";
+  version = "1.0.14";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "systemair";
     tag = "v${version}";
-    hash = "sha256-qQC9QzNgCa1NEjCA4wh4Au9VL2tOLh94l/O/ZjrCAuY=";
+    hash = "sha256-csciuUBetlUSh9KousKN1O08J/c/gviWSzB2c+morU8=";
   };
 
   postPatch = ''

From 1f3f3bc4db27c0bbeca06e46f45acf101c8a3eac Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 29 Oct 2025 20:48:06 +0000
Subject: [PATCH 3905/6226] man-pages: 6.15 -> 6.16

Changes: https://lore.kernel.org/linux-man/5cy4sb3beseqeehhva5r5f5ji3ofvotzobqcp3634k3lqeeoqi@nxf5gxvdifcn/
---
 pkgs/by-name/ma/man-pages/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/man-pages/package.nix b/pkgs/by-name/ma/man-pages/package.nix
index 6670f8ee7897..df1bca2e0fdc 100644
--- a/pkgs/by-name/ma/man-pages/package.nix
+++ b/pkgs/by-name/ma/man-pages/package.nix
@@ -3,19 +3,25 @@
   stdenv,
   fetchurl,
   directoryListingUpdater,
+  gawk,
   man,
+  pcre2,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "man-pages";
-  version = "6.15";
+  version = "6.16";
 
   src = fetchurl {
     url = "mirror://kernel/linux/docs/man-pages/man-pages-${finalAttrs.version}.tar.xz";
-    hash = "sha256-A9jr9hi9XfV8tL81Xvo/TNOgC3ce/WI9T9BCtdzrRGU=";
+    hash = "sha256-jiR6vXXNgICc/ghpbIG4xwaQWDsEV0lISyQvtDYx16M=";
   };
 
-  nativeInstallCheckInputs = [ man ];
+  nativeInstallCheckInputs = [
+    gawk
+    man
+    pcre2
+  ];
 
   dontBuild = true;
   enableParallelInstalling = true;

From 6f0eab3f4e8a900e9feb20c5d36c38261c7157e2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 21:03:40 +0000
Subject: [PATCH 3906/6226] pdm: 2.26.0 -> 2.26.1

---
 pkgs/by-name/pd/pdm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pd/pdm/package.nix b/pkgs/by-name/pd/pdm/package.nix
index 2cbbbca78b31..c5270506f9e4 100644
--- a/pkgs/by-name/pd/pdm/package.nix
+++ b/pkgs/by-name/pd/pdm/package.nix
@@ -30,7 +30,7 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "pdm";
-  version = "2.26.0";
+  version = "2.26.1";
   pyproject = true;
 
   disabled = python.pkgs.pythonOlder "3.8";
@@ -39,7 +39,7 @@ python.pkgs.buildPythonApplication rec {
     owner = "pdm-project";
     repo = "pdm";
     tag = version;
-    hash = "sha256-Ici9XFUgtlk5yBYckZGE64KFUvA0UdX+9wo7CfaRrLI=";
+    hash = "sha256-ObBZoX5RwO7cf0zzOQ0aTWklq/Zzgh0DFLM9qxZHk8I=";
   };
 
   pythonRelaxDeps = [ "hishel" ];

From d7973fbf3de36ac5ec0e1ad85e0ea39b0a8c5859 Mon Sep 17 00:00:00 2001
From: kpbaks <kristoffer.pbs@tuta.io>
Date: Wed, 29 Oct 2025 22:15:49 +0100
Subject: [PATCH 3907/6226] weaver: install shell completions

---
 pkgs/by-name/we/weaver/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix
index aa8a0bd7f52b..aab77df3a68c 100644
--- a/pkgs/by-name/we/weaver/package.nix
+++ b/pkgs/by-name/we/weaver/package.nix
@@ -1,8 +1,10 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
   testers,
+  installShellFiles,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -23,6 +25,15 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=test_cli_interface"
   ];
 
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd ${finalAttrs.meta.mainProgram} \
+      --bash <($out/bin/${finalAttrs.meta.mainProgram} completion bash) \
+      --zsh <($out/bin/${finalAttrs.meta.mainProgram} completion zsh) \
+      --fish <($out/bin/${finalAttrs.meta.mainProgram} completion fish)
+  '';
+
   passthru.tests.version = testers.testVersion {
     package = finalAttrs.finalPackage;
   };

From 932a10be80014fce33695e0279887ed39be4b5cc Mon Sep 17 00:00:00 2001
From: kpbaks <kristoffer.pbs@tuta.io>
Date: Wed, 29 Oct 2025 22:16:01 +0100
Subject: [PATCH 3908/6226] weaver: add meta.changelog

---
 pkgs/by-name/we/weaver/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix
index aab77df3a68c..3984453b1ea9 100644
--- a/pkgs/by-name/we/weaver/package.nix
+++ b/pkgs/by-name/we/weaver/package.nix
@@ -41,6 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "OpenTelemetry tool for dealing with semantic conventions and application telemetry schemas";
     homepage = "https://github.com/open-telemetry/weaver";
+    changelog = "https://github.com/open-telemetry/weaver/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ aaronjheng ];
     mainProgram = "weaver";

From 8e9c2081e3e22e1518904b162f6412976e8692f9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:16:57 +0100
Subject: [PATCH 3909/6226] python313Packages.stdlibs: modernize

---
 pkgs/development/python-modules/stdlibs/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/stdlibs/default.nix b/pkgs/development/python-modules/stdlibs/default.nix
index e2ce08b3fe7b..6cd8f8bdfd60 100644
--- a/pkgs/development/python-modules/stdlibs/default.nix
+++ b/pkgs/development/python-modules/stdlibs/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   flit-core,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -11,8 +10,6 @@ buildPythonPackage rec {
   version = "2025.10.28";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "omnilib";
     repo = "stdlibs";
@@ -30,7 +27,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Overview of the Python stdlib";
     homepage = "https://github.com/omnilib/stdlibs";
-    changelog = "https://github.com/omnilib/stdlibs/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/omnilib/stdlibs/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };

From a5f79dcdaea9daf31d3211948230d4f0ca54896b Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 29 Oct 2025 21:17:25 +0000
Subject: [PATCH 3910/6226] python3Packages.uproot: 5.6.7 -> 5.6.8

Diff: https://github.com/scikit-hep/uproot5/compare/v5.6.7...v5.6.8

Changelog: https://github.com/scikit-hep/uproot5/releases/tag/v5.6.8
---
 pkgs/development/python-modules/uproot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/uproot/default.nix b/pkgs/development/python-modules/uproot/default.nix
index 5e82a42a06c1..a00d974ce26a 100644
--- a/pkgs/development/python-modules/uproot/default.nix
+++ b/pkgs/development/python-modules/uproot/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "uproot";
-  version = "5.6.7";
+  version = "5.6.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scikit-hep";
     repo = "uproot5";
     tag = "v${version}";
-    hash = "sha256-4ClZ5XK5W9fseskYlfBmxO65OdfhJsV6Iaime7tGnOk=";
+    hash = "sha256-Kk8Paa6vx364BBfzfxh8f3muevwNg0I7n5CszjiWUo0=";
   };
 
   build-system = [

From 4073fb87d926f1d5c541e9b1070daf33c301b104 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:04:34 +0100
Subject: [PATCH 3911/6226] python312Packages.mypy-boto3-accessanalyzer: 1.40.0
 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 757afb5a46bf..e4e5359ca37f 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -46,8 +46,8 @@ let
 in
 {
   mypy-boto3-accessanalyzer =
-    buildMypyBoto3Package "accessanalyzer" "1.40.0"
-      "sha256-hY5aShO9E5zMwPSUUucjgG2Bod0lAm51BZyLP/1JLgY=";
+    buildMypyBoto3Package "accessanalyzer" "1.40.60"
+      "sha256-8BzWjJfv/6kEgJYsLmhIs9jgXx32yVW+L+DsTV/FfVA=";
 
   mypy-boto3-account =
     buildMypyBoto3Package "account" "1.40.58"

From 92dfb52e38a080e232f0705794976b8a2c06f05b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:04:35 +0100
Subject: [PATCH 3912/6226] python312Packages.mypy-boto3-acm: 1.40.0 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e4e5359ca37f..397d5885f14c 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -54,8 +54,8 @@ in
       "sha256-ZZe7b7krR5JrDWUS+YZcZGbFrRemvX7Ohz8xWPtVGDQ=";
 
   mypy-boto3-acm =
-    buildMypyBoto3Package "acm" "1.40.0"
-      "sha256-E2wUtUSMX4Lyj+HioQD6km3sGGETjgzujJbEewOHc5M=";
+    buildMypyBoto3Package "acm" "1.40.59"
+      "sha256-n8PwLnwMQXKZc5+euUBj6CBPO8H5iajC8Y0nQUO100I=";
 
   mypy-boto3-acm-pca =
     buildMypyBoto3Package "acm-pca" "1.40.54"

From 5b6d964b4d57e638e2230bda0c991fc7a95adbdd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:04:37 +0100
Subject: [PATCH 3913/6226] python312Packages.mypy-boto3-amplifyuibuilder:
 1.40.0 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 397d5885f14c..aaf405d22a80 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -74,8 +74,8 @@ in
       "sha256-m4XafAYt1vUe1nesd5lX2Lrt/6aeXWHTR3DUX0YkvdM=";
 
   mypy-boto3-amplifyuibuilder =
-    buildMypyBoto3Package "amplifyuibuilder" "1.40.0"
-      "sha256-wBdq3kI0El1XZRuGMG2lN0Zjc1GIBOItMBvctF/10Wg=";
+    buildMypyBoto3Package "amplifyuibuilder" "1.40.59"
+      "sha256-ZqZTg/CLPUBTcZ5mbZJsA9f2sdIkgwQDn83xVWLrWpY=";
 
   mypy-boto3-apigateway =
     buildMypyBoto3Package "apigateway" "1.40.0"

From 3a9b40f5af1d6293fe129ae070f8f837620025e1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:04:42 +0100
Subject: [PATCH 3914/6226] python312Packages.mypy-boto3-athena: 1.40.0 ->
 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index aaf405d22a80..5a5f45e34a2d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -142,8 +142,8 @@ in
       "sha256-as/i/8ByPLcr91nEwv+Qaq/Y8Rpi1qaVyMyDU7SMbc4=";
 
   mypy-boto3-athena =
-    buildMypyBoto3Package "athena" "1.40.0"
-      "sha256-2oQp9Va82Feyyf7ZEz7wv+y4mOK3TpZ586qvzCZwK/E=";
+    buildMypyBoto3Package "athena" "1.40.60"
+      "sha256-hBkW8prNkpdP+7ZEY5YIs540fPDZX1sqbHzEHDWcZgw=";
 
   mypy-boto3-auditmanager =
     buildMypyBoto3Package "auditmanager" "1.40.1"

From ee90923002d3c1e47ec887ea844fe94951c120cb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:04:44 +0100
Subject: [PATCH 3915/6226] python312Packages.mypy-boto3-backup-gateway:
 1.40.15 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5a5f45e34a2d..3133fa801332 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -162,8 +162,8 @@ in
       "sha256-bo+tgMbUCf1uL8fNB/5UBgUtIiYMMQpd/uaj/LUuZ6U=";
 
   mypy-boto3-backup-gateway =
-    buildMypyBoto3Package "backup-gateway" "1.40.15"
-      "sha256-BZXrWhqf5gFrTW0fAsiyiydzc0cTv2lPj5DTRLrv+pI=";
+    buildMypyBoto3Package "backup-gateway" "1.40.60"
+      "sha256-VhY/EqSIDSN6u2D87oA8HtTEZqkUzcJPlE+hHIg68Sw=";
 
   mypy-boto3-batch =
     buildMypyBoto3Package "batch" "1.40.54"

From c87370cb3eb45c354127cb0aa4c9db76431ced35 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:04:46 +0100
Subject: [PATCH 3916/6226] python312Packages.mypy-boto3-braket: 1.40.9 ->
 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 3133fa801332..5a64e68c82e8 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -174,8 +174,8 @@ in
       "sha256-gikBABSlCcQfBSh8jyIYdN7iyTncBRZoVPQ1UnVbwRU=";
 
   mypy-boto3-braket =
-    buildMypyBoto3Package "braket" "1.40.9"
-      "sha256-IUf8vnKJRqa5BeEIKEfAc09ixEIvVRfKBi6nEP1KjZU=";
+    buildMypyBoto3Package "braket" "1.40.60"
+      "sha256-7jhrDR3DTXGFZhfzmBgpL66+qk/3XtYM7Kdp5KgYzrc=";
 
   mypy-boto3-budgets =
     buildMypyBoto3Package "budgets" "1.40.34"

From 8f310fd942dd2bb961d9da6fc1086e48084b56c7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:04:47 +0100
Subject: [PATCH 3917/6226] python312Packages.mypy-boto3-budgets: 1.40.34 ->
 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5a64e68c82e8..fdbef22a9c9d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -178,8 +178,8 @@ in
       "sha256-7jhrDR3DTXGFZhfzmBgpL66+qk/3XtYM7Kdp5KgYzrc=";
 
   mypy-boto3-budgets =
-    buildMypyBoto3Package "budgets" "1.40.34"
-      "sha256-UzM2sg9jxU/kU6kmMizVJwYLqq+nrZi+D6GLHYPdmJQ=";
+    buildMypyBoto3Package "budgets" "1.40.59"
+      "sha256-Kw46Ncpneh+vyM+bFux/04DBDpXQrm0/HDkGjHcAeGU=";
 
   mypy-boto3-ce =
     buildMypyBoto3Package "ce" "1.40.57"

From 63b34a222e83a233eb670f39a5b9ebffdbd511fc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:04:48 +0100
Subject: [PATCH 3918/6226] python312Packages.mypy-boto3-ce: 1.40.57 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index fdbef22a9c9d..4a2c3b8eb0bf 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -182,8 +182,8 @@ in
       "sha256-Kw46Ncpneh+vyM+bFux/04DBDpXQrm0/HDkGjHcAeGU=";
 
   mypy-boto3-ce =
-    buildMypyBoto3Package "ce" "1.40.57"
-      "sha256-CkrC654ywHbtXrfbACWlJlQzIi7DeftaKmk/uLyIML4=";
+    buildMypyBoto3Package "ce" "1.40.60"
+      "sha256-vV/nuOJeFelanrZSHeP7m92h1yf4Eg9hlURXzGqZNGA=";
 
   mypy-boto3-chime =
     buildMypyBoto3Package "chime" "1.40.19"

From 9c24aeaee547144dd58b7d6b53ac8d3a0768c42c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:04:49 +0100
Subject: [PATCH 3919/6226] python312Packages.mypy-boto3-chime-sdk-identity:
 1.40.19 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 4a2c3b8eb0bf..5c1161267700 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -190,8 +190,8 @@ in
       "sha256-j90U6EWrV/zhn0KTitm4/WMV8xh+wm4yjKWFaQ0C4UA=";
 
   mypy-boto3-chime-sdk-identity =
-    buildMypyBoto3Package "chime-sdk-identity" "1.40.19"
-      "sha256-coS/9S9Sa2rAZAQPEMDTrZNNyj66jok08bNHpypO2G0=";
+    buildMypyBoto3Package "chime-sdk-identity" "1.40.60"
+      "sha256-HuG739RucVSvMev7k2WnqoxDHWnK9cT4bMVijcYRRIA=";
 
   mypy-boto3-chime-sdk-media-pipelines =
     buildMypyBoto3Package "chime-sdk-media-pipelines" "1.40.17"

From e8d8a23d88599b0e3325bce11d9e683954bad0a8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:04:50 +0100
Subject: [PATCH 3920/6226] 
 python312Packages.mypy-boto3-chime-sdk-media-pipelines: 1.40.17 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5c1161267700..2f405da77534 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -194,8 +194,8 @@ in
       "sha256-HuG739RucVSvMev7k2WnqoxDHWnK9cT4bMVijcYRRIA=";
 
   mypy-boto3-chime-sdk-media-pipelines =
-    buildMypyBoto3Package "chime-sdk-media-pipelines" "1.40.17"
-      "sha256-5qaK+piVZhvHqBJgGteNsvmMZG5y6fvLD4W8qASfcL0=";
+    buildMypyBoto3Package "chime-sdk-media-pipelines" "1.40.60"
+      "sha256-6n8aB49OhrvimPJLxgXuNyn7vCcbm3KgyNg60EUESVI=";
 
   mypy-boto3-chime-sdk-meetings =
     buildMypyBoto3Package "chime-sdk-meetings" "1.40.55"

From b3030e7995945d9ab323dfef4fc04c0aaf03806e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:04:52 +0100
Subject: [PATCH 3921/6226] python312Packages.mypy-boto3-chime-sdk-messaging:
 1.40.34 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 2f405da77534..bc2fc4389a74 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -202,8 +202,8 @@ in
       "sha256-KMEuqXWo3YwQ3z0zQFZ7ySk3shgXaPE0q2nx9lSP12c=";
 
   mypy-boto3-chime-sdk-messaging =
-    buildMypyBoto3Package "chime-sdk-messaging" "1.40.34"
-      "sha256-knAtab953lppnI8SioY6V3nMN6pt/l5p4XEsE3CpDGc=";
+    buildMypyBoto3Package "chime-sdk-messaging" "1.40.59"
+      "sha256-gsvetyYmOYS5KzGzMN0elAXNDLrwYABwLwLMqS7AHoA=";
 
   mypy-boto3-chime-sdk-voice =
     buildMypyBoto3Package "chime-sdk-voice" "1.40.58"

From cbde59450f144aab04e23660549d4a8de7631355 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:04:56 +0100
Subject: [PATCH 3922/6226] python312Packages.mypy-boto3-cloudtrail: 1.40.0 ->
 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index bc2fc4389a74..ebdd2d5f5479 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -250,8 +250,8 @@ in
       "sha256-a+XyFwXb5YGI9/Z5+Qh5TOfJssHJR6j8oJNwl47sObA=";
 
   mypy-boto3-cloudtrail =
-    buildMypyBoto3Package "cloudtrail" "1.40.0"
-      "sha256-aV+fpcURVMZv7jOsZ/LF6edo4doNZPtCwdG4YEGKMYc=";
+    buildMypyBoto3Package "cloudtrail" "1.40.59"
+      "sha256-e8ET+aC49Vl4JOIPFlaglzM3e34HmrbvJPyOj4yLQeo=";
 
   mypy-boto3-cloudtrail-data =
     buildMypyBoto3Package "cloudtrail-data" "1.40.58"

From 718bc224cd9a250a6d3954bd221a5db774eaf4bc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:04:57 +0100
Subject: [PATCH 3923/6226] python312Packages.mypy-boto3-codeartifact: 1.40.17
 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ebdd2d5f5479..209b9e5e3ca9 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -262,8 +262,8 @@ in
       "sha256-JCKTfyeEvYsw8b2EOGJVh+Y6lgpzMFecj2y35o3K9Mo=";
 
   mypy-boto3-codeartifact =
-    buildMypyBoto3Package "codeartifact" "1.40.17"
-      "sha256-XqaCY0uawL5BKmcTl1D3uz1EgsKn3wtph036TX07/Fg=";
+    buildMypyBoto3Package "codeartifact" "1.40.60"
+      "sha256-mVqTF57DFNmD5JVbc0WUeJMV+rHfQG8uVorQ/vd/RkU=";
 
   mypy-boto3-codebuild =
     buildMypyBoto3Package "codebuild" "1.40.58"

From 1726ad64c1981dc269c9e17332e7ca42f0f3ea10 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:00 +0100
Subject: [PATCH 3924/6226] python312Packages.mypy-boto3-codeguruprofiler:
 1.40.19 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 209b9e5e3ca9..308e1bc9287a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -290,8 +290,8 @@ in
       "sha256-LT2Fi8LHrgRgYz6HnKyRB14Vl+PjCjTx/EF8s5D2hhw=";
 
   mypy-boto3-codeguruprofiler =
-    buildMypyBoto3Package "codeguruprofiler" "1.40.19"
-      "sha256-hQ2gveiEQoG4pVqOGDs7eOFCuVaPbyACErsmQxfWo3I=";
+    buildMypyBoto3Package "codeguruprofiler" "1.40.60"
+      "sha256-5KmJ2LCWn0Fc7AGfKe4bB60r5Yvlu+aEYLk37kh4xyc=";
 
   mypy-boto3-codepipeline =
     buildMypyBoto3Package "codepipeline" "1.40.0"

From 132863dce42d68320047485fbcf5f936c0368746 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:01 +0100
Subject: [PATCH 3925/6226] python312Packages.mypy-boto3-codepipeline: 1.40.0
 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 308e1bc9287a..dae3d86d5375 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -294,8 +294,8 @@ in
       "sha256-5KmJ2LCWn0Fc7AGfKe4bB60r5Yvlu+aEYLk37kh4xyc=";
 
   mypy-boto3-codepipeline =
-    buildMypyBoto3Package "codepipeline" "1.40.0"
-      "sha256-wWJVXhlaRSBmDs0rA+Uqa36yBShPzUqFYB7qkkTCteg=";
+    buildMypyBoto3Package "codepipeline" "1.40.59"
+      "sha256-2DJafQV9fGFILCPSFZD/oEx3joh1tDOqJLl7KbU4djk=";
 
   mypy-boto3-codestar =
     buildMypyBoto3Package "codestar" "1.35.0"

From ba8c667f79942c9c447bb874df8ac52b339ef894 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:04 +0100
Subject: [PATCH 3926/6226] python312Packages.mypy-boto3-cognito-idp: 1.40.14
 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index dae3d86d5375..65958ddb6746 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -314,8 +314,8 @@ in
       "sha256-IvcJJ7cUxoykNC7fryAtZ3w1WMypqj0jgBUoo/rGA7Q=";
 
   mypy-boto3-cognito-idp =
-    buildMypyBoto3Package "cognito-idp" "1.40.14"
-      "sha256-g79jptfBbK/WuUeQDMnEogENZ0ysf1UKfMFa1fzlWkU=";
+    buildMypyBoto3Package "cognito-idp" "1.40.60"
+      "sha256-TgZlbzlU4ZPk3/aQQrwhTbXvV167tgahtfy23D1v0y4=";
 
   mypy-boto3-cognito-sync =
     buildMypyBoto3Package "cognito-sync" "1.40.16"

From 946caf1f505b149231775f9018d15036428a6c8a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:05 +0100
Subject: [PATCH 3927/6226] python312Packages.mypy-boto3-comprehend: 1.40.15 ->
 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 65958ddb6746..9e0647d181a3 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -322,8 +322,8 @@ in
       "sha256-NFaYYsnZD0MlDKl7t9FCMLV2eo/WH34ach4o6N/xrm0=";
 
   mypy-boto3-comprehend =
-    buildMypyBoto3Package "comprehend" "1.40.15"
-      "sha256-8lrg38NrNjdyZ/8qKsD1glKqnzrwPvkQ1RAk3qiCi3Q=";
+    buildMypyBoto3Package "comprehend" "1.40.60"
+      "sha256-gQmIff1GMX6A9QYm+CHC6wYIOt8XEGx72xmHmEg4ggA=";
 
   mypy-boto3-comprehendmedical =
     buildMypyBoto3Package "comprehendmedical" "1.40.57"

From ab72fe95786ffa04db183163e7c131d79ba73b57 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:08 +0100
Subject: [PATCH 3928/6226] python312Packages.mypy-boto3-connectcampaigns:
 1.40.0 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 9e0647d181a3..4ffec64a9f72 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -346,8 +346,8 @@ in
       "sha256-yP3OeePZc8Fb257lzsB8rQsahaz5/zqiH+XAQUUf9Ls=";
 
   mypy-boto3-connectcampaigns =
-    buildMypyBoto3Package "connectcampaigns" "1.40.0"
-      "sha256-nAOKVy+aH2gw8NZ8cNSYqQ0kFWV4Gb4oU6y1vHz3fpI=";
+    buildMypyBoto3Package "connectcampaigns" "1.40.60"
+      "sha256-q5aHrusyuFPI1ItuoaFskLoRQmDkBLwjV/Sch+G2l+U=";
 
   mypy-boto3-connectcases =
     buildMypyBoto3Package "connectcases" "1.40.44"

From c91c2777562e5ed6d7d405c02ddc47a16268c3ba Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:09 +0100
Subject: [PATCH 3929/6226] python312Packages.mypy-boto3-controltower: 1.40.0
 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 4ffec64a9f72..53227931cbe2 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -358,8 +358,8 @@ in
       "sha256-BiKly8tW0MFacKF8mG80xsITdxegCcG3sKal7axoGf0=";
 
   mypy-boto3-controltower =
-    buildMypyBoto3Package "controltower" "1.40.0"
-      "sha256-boRrDWiYtyKWUimJ7yb3uYPGSB/tmI2sEXNFacAPDic=";
+    buildMypyBoto3Package "controltower" "1.40.60"
+      "sha256-1xHVUCYTzIWYU7RLk8MzqF3/5qfItTeIXC7um4ZgIwI=";
 
   mypy-boto3-cur =
     buildMypyBoto3Package "cur" "1.40.58"

From 1d594fde73aba7b47202e9778b89c093b9fbc583 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:11 +0100
Subject: [PATCH 3930/6226] python312Packages.mypy-boto3-datapipeline: 1.40.19
 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 53227931cbe2..8e574f9b15c1 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -378,8 +378,8 @@ in
       "sha256-iyXEvp4dra76CPor7FK8xsZ4zVojFv1+IcmAKlXcB7k=";
 
   mypy-boto3-datapipeline =
-    buildMypyBoto3Package "datapipeline" "1.40.19"
-      "sha256-VBJsQqd5m5RfO+tJklYHd+pk2zqpqyDXO4BmRGdFxS4=";
+    buildMypyBoto3Package "datapipeline" "1.40.59"
+      "sha256-X2gx7/NU3S51nHh2nRHeXQzOmnK+kk8DCPhbkFDtVMM=";
 
   mypy-boto3-datasync =
     buildMypyBoto3Package "datasync" "1.40.55"

From 07bee7c691986ca044a2ff53b1375755b811854f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:13 +0100
Subject: [PATCH 3931/6226] python312Packages.mypy-boto3-dax: 1.40.38 ->
 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 8e574f9b15c1..c57d487fcbaa 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -386,8 +386,8 @@ in
       "sha256-0PHiMXZVyihKJTXEXP8U1fPt7LLGx+4EsJhXbk6VzTY=";
 
   mypy-boto3-dax =
-    buildMypyBoto3Package "dax" "1.40.38"
-      "sha256-jzNdzI1E16m8/5XdD4nKVfyYFbisU5Kc59+0Ei+cnDo=";
+    buildMypyBoto3Package "dax" "1.40.60"
+      "sha256-7D+DnOkoDtXXrLx9orqg9WXtlnpSyQFAqgBlV3hJu1Q=";
 
   mypy-boto3-detective =
     buildMypyBoto3Package "detective" "1.40.14"

From 65f6908bb208f723be98f1b6c0859470105b88d0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:17 +0100
Subject: [PATCH 3932/6226] python312Packages.mypy-boto3-docdb: 1.40.53 ->
 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index c57d487fcbaa..43755bd751f9 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -418,8 +418,8 @@ in
       "sha256-wGVRK+B6DoxsK++kNZEWQdWozrpPHr7jGOzq3D52xE4=";
 
   mypy-boto3-docdb =
-    buildMypyBoto3Package "docdb" "1.40.53"
-      "sha256-yHfHczjN4v+5IoQy9WuSEGWnhKiF70xJxsxiYHj/s+Y=";
+    buildMypyBoto3Package "docdb" "1.40.59"
+      "sha256-/GawEPC2vYYqQ0ISSjTebM7a/NsCUyDMDa4xTZHOFjg=";
 
   mypy-boto3-docdb-elastic =
     buildMypyBoto3Package "docdb-elastic" "1.40.58"

From 2a07b904fe08d5acfa163d5020aaa03a059a595f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:19 +0100
Subject: [PATCH 3933/6226] python312Packages.mypy-boto3-dynamodbstreams:
 1.40.40 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 43755bd751f9..495c319637e6 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -438,8 +438,8 @@ in
       "sha256-V23RL+ESV1QGbn+kgPksEjIglwqdafdmOlbXAfKXisU=";
 
   mypy-boto3-dynamodbstreams =
-    buildMypyBoto3Package "dynamodbstreams" "1.40.40"
-      "sha256-TgENR4bY5AHy0hqJkTq63jApASafB6agMPFPYDlzJ7A=";
+    buildMypyBoto3Package "dynamodbstreams" "1.40.59"
+      "sha256-EjeOxjAJluU8bI7i6TbDpO2Jp5e3xhVS9VKho5SkK6c=";
 
   mypy-boto3-ebs =
     buildMypyBoto3Package "ebs" "1.40.58"

From 7a6517877b73bc79f927d9a45cf6729adcec99dd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:22 +0100
Subject: [PATCH 3934/6226] python312Packages.mypy-boto3-eks: 1.40.36 ->
 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 495c319637e6..ec98696b36dc 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -470,8 +470,8 @@ in
       "sha256-DQZUI72cnRt4YwHMQivMdL4y9B9EN2H7dIMmybcX/Uk=";
 
   mypy-boto3-eks =
-    buildMypyBoto3Package "eks" "1.40.36"
-      "sha256-xlT0PW+10gO1jpddeCR82y+4+A9e1SNK756ph8/1Iik=";
+    buildMypyBoto3Package "eks" "1.40.59"
+      "sha256-Nk8AtGt8XKyBvEvQzjvmG0M3lsdqJuwrNvZqqU/t4xM=";
 
   mypy-boto3-elastic-inference =
     buildMypyBoto3Package "elastic-inference" "1.36.0"

From 5698e57d724f34ba2e7326cd4338af30dbdc3371 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:24 +0100
Subject: [PATCH 3935/6226] python312Packages.mypy-boto3-elasticbeanstalk:
 1.40.15 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ec98696b36dc..0c2e558f7410 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -482,8 +482,8 @@ in
       "sha256-YaNGVCO/MGDn/9YQBquhqqg1YHmJK3grdk/wVdF4erQ=";
 
   mypy-boto3-elasticbeanstalk =
-    buildMypyBoto3Package "elasticbeanstalk" "1.40.15"
-      "sha256-TMfQt3rK4aT7DnlJCbJj7sFrDL9NqQc4kQS8sdTdDS0=";
+    buildMypyBoto3Package "elasticbeanstalk" "1.40.60"
+      "sha256-V5RG19bh6X/6Q72i5Zk0QO04uxbQdwo7PO6yNL1Stmk=";
 
   mypy-boto3-elastictranscoder =
     buildMypyBoto3Package "elastictranscoder" "1.40.18"

From 8e8fa284bd567723e4d338e0f29fc2ce3ff23d72 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:25 +0100
Subject: [PATCH 3936/6226] python312Packages.mypy-boto3-elb: 1.40.16 ->
 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 0c2e558f7410..fbbba02693d4 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -490,8 +490,8 @@ in
       "sha256-ObCzDvt0o59FXWw3bAh67Gh1QJNx7HjDEE0pMCcHkCs=";
 
   mypy-boto3-elb =
-    buildMypyBoto3Package "elb" "1.40.16"
-      "sha256-9LKKt1qGw/gWS+XtNzmnjk0WOFHAmTuzkj9D3tYuMtU=";
+    buildMypyBoto3Package "elb" "1.40.59"
+      "sha256-Qu/jsynDkXXBRBnJGNqKtmr4aSPwiFJvuFxEqZco428=";
 
   mypy-boto3-elbv2 =
     buildMypyBoto3Package "elbv2" "1.40.53"

From ca72bb7b7e9c6e6ff7490bb1023299f101ed1c5c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:27 +0100
Subject: [PATCH 3937/6226] python312Packages.mypy-boto3-entityresolution:
 1.40.37 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index fbbba02693d4..0073810d8d71 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -510,8 +510,8 @@ in
       "sha256-9Iz9FapUQCWa9bjmH0Ar9O1mtTv+ovWlxikddb5+Wlc=";
 
   mypy-boto3-entityresolution =
-    buildMypyBoto3Package "entityresolution" "1.40.37"
-      "sha256-n5aa7oK/37pT1f+xFXu8Sp3LfO1UAcUljCqdtSZ/fPQ=";
+    buildMypyBoto3Package "entityresolution" "1.40.60"
+      "sha256-/ZqIN1Rrjblo4mhDYVqEoGkQb5TC+A2aKP26ORnB8lw=";
 
   mypy-boto3-es =
     buildMypyBoto3Package "es" "1.40.55"

From 970fcc63bddd2a4ff5762fc952958df099150e06 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:30 +0100
Subject: [PATCH 3938/6226] python312Packages.mypy-boto3-fis: 1.40.20 ->
 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 0073810d8d71..432a5bb12e64 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -538,8 +538,8 @@ in
       "sha256-Zzp7VoPaVIHX3KccxlFILesGNJP7f1p63uXLwN3rLcs=";
 
   mypy-boto3-fis =
-    buildMypyBoto3Package "fis" "1.40.20"
-      "sha256-vQKaLV+lEh4zjYhAn1/8lT9cm2xokMrU2sdsoBmfcjc=";
+    buildMypyBoto3Package "fis" "1.40.59"
+      "sha256-FEBW/Vtx+MooC2lNBh9xFA8mWpbLK7qqBWWAnG80kvg=";
 
   mypy-boto3-fms =
     buildMypyBoto3Package "fms" "1.40.20"

From ee6c74e104d10355e4c99aca7f6ab15580ebcd51 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:32 +0100
Subject: [PATCH 3939/6226] python312Packages.mypy-boto3-forecast: 1.40.17 ->
 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 432a5bb12e64..07201ee265d0 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -546,8 +546,8 @@ in
       "sha256-yBhVmfeAexcJzkxC3AdtWOC4PjCoTDozxYT6qrgEHJ8=";
 
   mypy-boto3-forecast =
-    buildMypyBoto3Package "forecast" "1.40.17"
-      "sha256-PMEWvzCP8gTKwsV9oIjqIB7jIMDZDjLqdPO/G7nnfDc=";
+    buildMypyBoto3Package "forecast" "1.40.60"
+      "sha256-2Ss/RklPHOle20l+feRjCS+fwgK5G1v2xhQsL20lDkM=";
 
   mypy-boto3-forecastquery =
     buildMypyBoto3Package "forecastquery" "1.40.57"

From ebc35a6c7a76887514957d1b3b3a375a90d4b1f5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:35 +0100
Subject: [PATCH 3940/6226] python312Packages.mypy-boto3-greengrass: 1.40.18 ->
 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 07201ee265d0..18aea7a64475 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -581,8 +581,8 @@ in
       "sha256-GeYE+d3wv+KTcS0ve0ftTLXazGS5a5KMQmVMXMl9jtM=";
 
   mypy-boto3-greengrass =
-    buildMypyBoto3Package "greengrass" "1.40.18"
-      "sha256-2LlUVjYGni7omje8tlvAJNkKDVSbVIF4mnUNzb01lUQ=";
+    buildMypyBoto3Package "greengrass" "1.40.60"
+      "sha256-+H/q11j6CwdS40V1BO8890nBwOYKo2JCz/plaemZHJY=";
 
   mypy-boto3-greengrassv2 =
     buildMypyBoto3Package "greengrassv2" "1.40.15"

From c2b437b2ecc983166932823cb2d0ca43ac07eb28 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:38 +0100
Subject: [PATCH 3941/6226] python312Packages.mypy-boto3-iam: 1.40.57 ->
 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 18aea7a64475..e3a31c32de52 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -605,8 +605,8 @@ in
       "sha256-7ZJCrUmzKbFx9Aa4liqUCdNlZGS6fv0FHtifdm3vofw=";
 
   mypy-boto3-iam =
-    buildMypyBoto3Package "iam" "1.40.57"
-      "sha256-2ILXHYhDkrjE4wDTrYcvdPXiTXTAFKT+2R8dLB6KZMc=";
+    buildMypyBoto3Package "iam" "1.40.60"
+      "sha256-it5eBglvWR52rgxyYV5Y4Q1XeAdnsORpFheZ3ZLfoCo=";
 
   mypy-boto3-identitystore =
     buildMypyBoto3Package "identitystore" "1.40.54"

From 0ff28e640afefe6bc8ac99015d376c2b5c6f9627 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:39 +0100
Subject: [PATCH 3942/6226] python312Packages.mypy-boto3-inspector: 1.40.19 ->
 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e3a31c32de52..ccbe5b4547e0 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -621,8 +621,8 @@ in
       "sha256-ba01dCNMlcTw/+WrulQkCtDagcPO7FF94cgkY14Pgsg=";
 
   mypy-boto3-inspector =
-    buildMypyBoto3Package "inspector" "1.40.19"
-      "sha256-9+HawjY2kx6JE+UABDKApvTYLzQqx/eBQ3ORQ5M0fq0=";
+    buildMypyBoto3Package "inspector" "1.40.59"
+      "sha256-hICeUgAlM80gO3gA7UO9mk8GaqfS1fMp4Wb+OU67+qg=";
 
   mypy-boto3-inspector2 =
     buildMypyBoto3Package "inspector2" "1.40.57"

From 073f1fb0d1322a91ee5b7476b1375f756d5d366f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:46 +0100
Subject: [PATCH 3943/6226] python312Packages.mypy-boto3-iotwireless: 1.40.0 ->
 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ccbe5b4547e0..70611b09eef0 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -693,8 +693,8 @@ in
       "sha256-tJqYpF3z0HWRTHQmHjRyqnS3hCUxFUqsyScHnsiVnlA=";
 
   mypy-boto3-iotwireless =
-    buildMypyBoto3Package "iotwireless" "1.40.0"
-      "sha256-Kj/g5lCH7AgHRlSU6od3O4j1OilposHoDP1hYX4S+fs=";
+    buildMypyBoto3Package "iotwireless" "1.40.59"
+      "sha256-WRMIR9XalzsmchjDf2eH7tC9NA1Rr9rkAt07MPC+G44=";
 
   mypy-boto3-ivs =
     buildMypyBoto3Package "ivs" "1.40.54"

From 4e999047662dac7827c2ec56550e3882655b391c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:50 +0100
Subject: [PATCH 3944/6226] python312Packages.mypy-boto3-kinesis: 1.40.0 ->
 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 70611b09eef0..e821e8ce7456 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -729,8 +729,8 @@ in
       "sha256-NLkf8t9W/ZKA7S9qc/qJ1u4bzh87unvsQLUeh92sbvg=";
 
   mypy-boto3-kinesis =
-    buildMypyBoto3Package "kinesis" "1.40.0"
-      "sha256-T3T3FeI6jc4GK0D2pPL/ECPOxvQbRSHwvBVnmIOn5o4=";
+    buildMypyBoto3Package "kinesis" "1.40.60"
+      "sha256-mMh6y7S68A7epORt0CkJ5U9Y0w8UwJmVf6L8d/G0HUA=";
 
   mypy-boto3-kinesis-video-archived-media =
     buildMypyBoto3Package "kinesis-video-archived-media" "1.40.58"

From f69e8b93d0579a0d866a444ee1dec591cf6a0036 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:52 +0100
Subject: [PATCH 3945/6226] 
 python312Packages.mypy-boto3-kinesis-video-signaling: 1.40.15 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e821e8ce7456..50141e0e58c4 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -741,8 +741,8 @@ in
       "sha256-lMj1MhhWJeoSVaUPdELCDIOZCtL2rrgsNerHElczlEk=";
 
   mypy-boto3-kinesis-video-signaling =
-    buildMypyBoto3Package "kinesis-video-signaling" "1.40.15"
-      "sha256-3XwZsjSiQmed7Msz2HHP796iY9x2nSyd6aMglkv3Lfo=";
+    buildMypyBoto3Package "kinesis-video-signaling" "1.40.59"
+      "sha256-PjpVKl3NF44wBSNycabduyNuR1inVbmaj4dUsLnV8hQ=";
 
   mypy-boto3-kinesis-video-webrtc-storage =
     buildMypyBoto3Package "kinesis-video-webrtc-storage" "1.40.58"

From d6fd41c6b42f33be77a554b48c06b6ca53ecf3f8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:53 +0100
Subject: [PATCH 3946/6226] python312Packages.mypy-boto3-kinesisanalytics:
 1.40.17 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 50141e0e58c4..14e1d92ebcfc 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -749,8 +749,8 @@ in
       "sha256-+nZT13/2ejl3kUvOyVdX0CWwxKqkGvhvXBAhhezhmXI=";
 
   mypy-boto3-kinesisanalytics =
-    buildMypyBoto3Package "kinesisanalytics" "1.40.17"
-      "sha256-OU9dcphpwEqoTDleItqOluVxpu73KbWUU3bwflXKO9M=";
+    buildMypyBoto3Package "kinesisanalytics" "1.40.59"
+      "sha256-9S4Y4WY3E03ckKXxq+tOnhyJPa6Msr2oxQo5DqzK78M=";
 
   mypy-boto3-kinesisanalyticsv2 =
     buildMypyBoto3Package "kinesisanalyticsv2" "1.40.57"

From 2a89e82468546ffec8a2d3703348a8f09f55c493 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:56 +0100
Subject: [PATCH 3947/6226] python312Packages.mypy-boto3-lex-runtime: 1.40.17
 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 14e1d92ebcfc..86520130c28f 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -777,8 +777,8 @@ in
       "sha256-1154wsf4q7QHWQG3PGo+ukUJY2mk+xfh3/56YKRtXIE=";
 
   mypy-boto3-lex-runtime =
-    buildMypyBoto3Package "lex-runtime" "1.40.17"
-      "sha256-Bt0APaVZxgwASjYTMUctwbsb7u2ZFOf5a3UlComKWxs=";
+    buildMypyBoto3Package "lex-runtime" "1.40.60"
+      "sha256-kkkD8pNK/YYPELzfwvcQVAPb8GPusn7ggmkihp3+0PQ=";
 
   mypy-boto3-lexv2-models =
     buildMypyBoto3Package "lexv2-models" "1.40.57"

From d4076ea0cf47642bd8989cf3175d683429add58b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:05:58 +0100
Subject: [PATCH 3948/6226] python312Packages.mypy-boto3-location: 1.40.0 ->
 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 86520130c28f..a112710638bb 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -805,8 +805,8 @@ in
       "sha256-UzFFqox5VlOBemuJ7oPybKtNx+y9yNlC9wc3r1FidEw=";
 
   mypy-boto3-location =
-    buildMypyBoto3Package "location" "1.40.0"
-      "sha256-hAUULqVRGPw0Ir0XUyhREqT8C8A99lJEGYn4nAxnW7A=";
+    buildMypyBoto3Package "location" "1.40.59"
+      "sha256-mQBymsl2+/hka8QiR+AzxS7gtONHroTgY3qmgt+YKOw=";
 
   mypy-boto3-logs =
     buildMypyBoto3Package "logs" "1.40.32"

From e2cec6f0410a5e3696d637254fbebf5ed8284632 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:00 +0100
Subject: [PATCH 3949/6226] python312Packages.mypy-boto3-lookoutvision: 1.40.18
 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a112710638bb..7e670ee644eb 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -821,8 +821,8 @@ in
       "sha256-ZcL1sZGlckqZFhCqTZwMeghP8K9Hee1Zi3N6wZb9hts=";
 
   mypy-boto3-lookoutvision =
-    buildMypyBoto3Package "lookoutvision" "1.40.18"
-      "sha256-DKGXLR3lVek8IHAolI372LKc5YFy1o40DUVxp+xc1ww=";
+    buildMypyBoto3Package "lookoutvision" "1.40.59"
+      "sha256-MlMkIgzc2D3i5xAPdk+th0e9AYrvRxGwzl4zwEwy4xw=";
 
   mypy-boto3-m2 =
     buildMypyBoto3Package "m2" "1.40.54"

From 2eae5dc79d2eb884a323f1c696ba1714b9f42bf9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:02 +0100
Subject: [PATCH 3950/6226] python312Packages.mypy-boto3-managedblockchain:
 1.40.15 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 7e670ee644eb..15ded0242896 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -837,8 +837,8 @@ in
       "sha256-Fp2Uu6kufalQEePs8y5DhIaWhsU/GVa723G5TpFAWIY=";
 
   mypy-boto3-managedblockchain =
-    buildMypyBoto3Package "managedblockchain" "1.40.15"
-      "sha256-YBNBXwG0T7a805OPXYmCvqh8wHubtMG3QW38/eCCuB4=";
+    buildMypyBoto3Package "managedblockchain" "1.40.60"
+      "sha256-iqgdNV7dUDWlDoEZzZiwv+n5hbjscmBc2MrcaYQaCHE=";
 
   mypy-boto3-managedblockchain-query =
     buildMypyBoto3Package "managedblockchain-query" "1.40.58"

From 6688494e88054683474ee3ce2e8bfb155d09a617 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:05 +0100
Subject: [PATCH 3951/6226] python312Packages.mypy-boto3-mediapackage: 1.40.15
 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 15ded0242896..88e585cac95f 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -869,8 +869,8 @@ in
       "sha256-aKl6hRCX4XskRVgRlzPKmKKMWqXAwGmetvY7z34Iam4=";
 
   mypy-boto3-mediapackage =
-    buildMypyBoto3Package "mediapackage" "1.40.15"
-      "sha256-HMPme3zTPKCGRHUhRXgw83o0UV+Frz25+0eOEB9cDdA=";
+    buildMypyBoto3Package "mediapackage" "1.40.59"
+      "sha256-Bc9v9Tq2eiBAsQeWpK2viHhR/wfP0k48S2dLJqhPjnw=";
 
   mypy-boto3-mediapackage-vod =
     buildMypyBoto3Package "mediapackage-vod" "1.40.17"

From daeec643fcd061efe981dc1a91e52bb860a8506e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:07 +0100
Subject: [PATCH 3952/6226] python312Packages.mypy-boto3-mediastore: 1.40.17 ->
 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 88e585cac95f..500e48f3e121 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -881,8 +881,8 @@ in
       "sha256-JPlD+hxnut6l3LAp5jNfP0LCdPj/wVj7xs/wSP+sy0U=";
 
   mypy-boto3-mediastore =
-    buildMypyBoto3Package "mediastore" "1.40.17"
-      "sha256-YCFhcxgtQvf9MhwzCHqjGPX666dv35lkTLhxp4wGog0=";
+    buildMypyBoto3Package "mediastore" "1.40.59"
+      "sha256-68cwTIm0FqfkWocusBeXbYnLc7tOFwunRSA0SLxWZ+o=";
 
   mypy-boto3-mediastore-data =
     buildMypyBoto3Package "mediastore-data" "1.40.20"

From dc6938cd52158548f98eae784321b0000ad1fb6a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:09 +0100
Subject: [PATCH 3953/6226] python312Packages.mypy-boto3-mediastore-data:
 1.40.20 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 500e48f3e121..a2e4f99bf348 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -885,8 +885,8 @@ in
       "sha256-68cwTIm0FqfkWocusBeXbYnLc7tOFwunRSA0SLxWZ+o=";
 
   mypy-boto3-mediastore-data =
-    buildMypyBoto3Package "mediastore-data" "1.40.20"
-      "sha256-hkzc8MTCssJPCjME7CMCVewYgNf9Gz/c68hAC3fuKnE=";
+    buildMypyBoto3Package "mediastore-data" "1.40.59"
+      "sha256-/b7BGjo6OAzVGJa6oBoFfo1Z0KBtx06KssmMpfY8FbA=";
 
   mypy-boto3-mediatailor =
     buildMypyBoto3Package "mediatailor" "1.40.58"

From cec9ccc441bf39ed4472e0cee8e2d074393e9b5c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:12 +0100
Subject: [PATCH 3954/6226] python312Packages.mypy-boto3-migrationhubstrategy:
 1.40.0 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a2e4f99bf348..265f43a5781f 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -925,8 +925,8 @@ in
       "sha256-EtOj4OjZBn5M5Q9pU2MaSNwXAVXbtFEZICRn/r+e9OQ=";
 
   mypy-boto3-migrationhubstrategy =
-    buildMypyBoto3Package "migrationhubstrategy" "1.40.0"
-      "sha256-G+Kn0K9lI24r/A+KBOE2euh+raKIystZ7uB2k9AD/Zg=";
+    buildMypyBoto3Package "migrationhubstrategy" "1.40.59"
+      "sha256-h1lI/FmzItYTN9lnH/W41v/btpjDdwhEuCnwEHeoxHQ=";
 
   mypy-boto3-mq =
     buildMypyBoto3Package "mq" "1.40.23"

From 430d929699ffd46bd9a67bdbc41de427c4db7b2d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:13 +0100
Subject: [PATCH 3955/6226] python312Packages.mypy-boto3-mq: 1.40.23 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 265f43a5781f..5c5036ebde20 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -929,8 +929,8 @@ in
       "sha256-h1lI/FmzItYTN9lnH/W41v/btpjDdwhEuCnwEHeoxHQ=";
 
   mypy-boto3-mq =
-    buildMypyBoto3Package "mq" "1.40.23"
-      "sha256-1+/fGIJPzPvAThyGy6ZiZAyIfFGtBGiBZ1ORwfTZ2Ww=";
+    buildMypyBoto3Package "mq" "1.40.59"
+      "sha256-P/PcH7FW99E1W5EF6o3e2QamuwcZRcKI6adsbWAmkUk=";
 
   mypy-boto3-mturk =
     buildMypyBoto3Package "mturk" "1.40.20"

From 46ee0b7fd0de6ee38829f7984c9eaec4b7ecad5d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:14 +0100
Subject: [PATCH 3956/6226] python312Packages.mypy-boto3-mturk: 1.40.20 ->
 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 5c5036ebde20..3b76b36a3060 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -933,8 +933,8 @@ in
       "sha256-P/PcH7FW99E1W5EF6o3e2QamuwcZRcKI6adsbWAmkUk=";
 
   mypy-boto3-mturk =
-    buildMypyBoto3Package "mturk" "1.40.20"
-      "sha256-+VSk5ytyDwIkg8Ur15vjBmURPwXvZkRT5UEKPTWNgO8=";
+    buildMypyBoto3Package "mturk" "1.40.60"
+      "sha256-3usjCs7VRs6e9oRU7O9YAD8XAjeoL5fFeAPAqpRizIU=";
 
   mypy-boto3-mwaa =
     buildMypyBoto3Package "mwaa" "1.40.57"

From ff32048b83e65662c07e2943b351abda88ee62dc Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:18 +0100
Subject: [PATCH 3957/6226] python312Packages.mypy-boto3-outposts: 1.40.48 ->
 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 3b76b36a3060..a93d4baaa5a8 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -993,8 +993,8 @@ in
       "sha256-iuSKo8JCPNNc6FiyKbIpkbVd5rgqRGKOKASwqkCstdw=";
 
   mypy-boto3-outposts =
-    buildMypyBoto3Package "outposts" "1.40.48"
-      "sha256-9N7I4XQQP/vUvGvMYT8SnYRJFWEKm7YMjtTgkTMnY8I=";
+    buildMypyBoto3Package "outposts" "1.40.60"
+      "sha256-I/2vBxmVVqYbiFN/PXCwA/s66oyoG2Q8VS6YTHNrAJo=";
 
   mypy-boto3-panorama =
     buildMypyBoto3Package "panorama" "1.40.15"

From f542837e06cc67aca4cdf58ecd1c24aba9c5dd68 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:19 +0100
Subject: [PATCH 3958/6226] python312Packages.mypy-boto3-panorama: 1.40.15 ->
 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a93d4baaa5a8..ab71b8cfcdcc 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -997,8 +997,8 @@ in
       "sha256-I/2vBxmVVqYbiFN/PXCwA/s66oyoG2Q8VS6YTHNrAJo=";
 
   mypy-boto3-panorama =
-    buildMypyBoto3Package "panorama" "1.40.15"
-      "sha256-PgXa3veO1qGxxUBwZe2bxauFNT3nc0j8vEVk0Q4NtVU=";
+    buildMypyBoto3Package "panorama" "1.40.59"
+      "sha256-Rf6XuOTE/09pKpotR/AY6526gfPP+pP2Y9WAfhBSL6E=";
 
   mypy-boto3-payment-cryptography =
     buildMypyBoto3Package "payment-cryptography" "1.40.30"

From 423b78cc595a5f3609bbddd1187d0c57c50f0a2b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:21 +0100
Subject: [PATCH 3959/6226] python312Packages.mypy-boto3-payment-cryptography:
 1.40.30 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ab71b8cfcdcc..7ea723024b5b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1001,8 +1001,8 @@ in
       "sha256-Rf6XuOTE/09pKpotR/AY6526gfPP+pP2Y9WAfhBSL6E=";
 
   mypy-boto3-payment-cryptography =
-    buildMypyBoto3Package "payment-cryptography" "1.40.30"
-      "sha256-JSLXvrURvUhb83Oeb5b+hlDpOoiFMayDtDXGJsx8Hsw=";
+    buildMypyBoto3Package "payment-cryptography" "1.40.59"
+      "sha256-7B7yO41CKkQPBxY4hDwVt5LmkbweyLZtCkeO+B0OLmc=";
 
   mypy-boto3-payment-cryptography-data =
     buildMypyBoto3Package "payment-cryptography-data" "1.40.45"

From eb86d74a589f9b65dd7158c9271bc4dfc7056845 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:22 +0100
Subject: [PATCH 3960/6226] 
 python312Packages.mypy-boto3-payment-cryptography-data: 1.40.45 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 7ea723024b5b..6fd1f28eb9a2 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1005,8 +1005,8 @@ in
       "sha256-7B7yO41CKkQPBxY4hDwVt5LmkbweyLZtCkeO+B0OLmc=";
 
   mypy-boto3-payment-cryptography-data =
-    buildMypyBoto3Package "payment-cryptography-data" "1.40.45"
-      "sha256-/mlrjDkzD9szPLpV+69UBhYXpzt8vwPXIoAMGt+LZxc=";
+    buildMypyBoto3Package "payment-cryptography-data" "1.40.59"
+      "sha256-llgYHZUfQTOy5E4BmmA3gAvYi4Q3RjrCtfFm68ECEGY=";
 
   mypy-boto3-pca-connector-ad =
     buildMypyBoto3Package "pca-connector-ad" "1.40.0"

From 5a5d7db0261879ae8a9be6ec5742aa7e2128fbcb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:23 +0100
Subject: [PATCH 3961/6226] python312Packages.mypy-boto3-pca-connector-ad:
 1.40.0 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 6fd1f28eb9a2..a6f5979e85bc 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1009,8 +1009,8 @@ in
       "sha256-llgYHZUfQTOy5E4BmmA3gAvYi4Q3RjrCtfFm68ECEGY=";
 
   mypy-boto3-pca-connector-ad =
-    buildMypyBoto3Package "pca-connector-ad" "1.40.0"
-      "sha256-6kAZW0V/7XXEGCQl24brFhR3utzZ0Ftg8dTUgRN40iU=";
+    buildMypyBoto3Package "pca-connector-ad" "1.40.59"
+      "sha256-f3SQuBhNc2tL3vdqJmoYgnpUICkvJmENShpVbtE7cuM=";
 
   mypy-boto3-personalize =
     buildMypyBoto3Package "personalize" "1.40.54"

From 198eeb6600d21b2cd4f140d99b884654f5d31397 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:25 +0100
Subject: [PATCH 3962/6226] python312Packages.mypy-boto3-pinpoint: 1.40.18 ->
 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a6f5979e85bc..a1d171bf33fa 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1029,8 +1029,8 @@ in
       "sha256-PqK4IfA5JcI5Cg4ymR9uoTF3YLs6vu0l0Gl4e7af2Y8=";
 
   mypy-boto3-pinpoint =
-    buildMypyBoto3Package "pinpoint" "1.40.18"
-      "sha256-zhekW0Dk58LRUfyVd6slsy3tKu31j/cGEYfkvpLrmnA=";
+    buildMypyBoto3Package "pinpoint" "1.40.60"
+      "sha256-BizLajwUZznm+ay5QaW39lf61+SGGeR302r0OAWZD5s=";
 
   mypy-boto3-pinpoint-email =
     buildMypyBoto3Package "pinpoint-email" "1.40.58"

From 7c90c48cc1615c4bd9989b5b97815bdb41cd8467 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:30 +0100
Subject: [PATCH 3963/6226] python312Packages.mypy-boto3-rbin: 1.40.18 ->
 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a1d171bf33fa..19eb64f55c82 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1081,8 +1081,8 @@ in
       "sha256-eguBtTttYrCcdQ1HYyy7zNVXqVkBbG59aHwzgiV1PwY=";
 
   mypy-boto3-rbin =
-    buildMypyBoto3Package "rbin" "1.40.18"
-      "sha256-zye0xv5P6GemZiH+T/cIyzx9qaeOKitEWpW6LOkc8KM=";
+    buildMypyBoto3Package "rbin" "1.40.60"
+      "sha256-8vUsRFYRMImJyNarFTFLdz0fzsQZLnLt/KV4AGaoQg8=";
 
   mypy-boto3-rds =
     buildMypyBoto3Package "rds" "1.40.50"

From c7722178740f583f4958172f0800fd05fbc194ea Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:31 +0100
Subject: [PATCH 3964/6226] python312Packages.mypy-boto3-rds-data: 1.40.0 ->
 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 19eb64f55c82..7b233ddd9f4c 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1089,8 +1089,8 @@ in
       "sha256-fVUGv36rK1kmb5MmEEnCrCXEYPfgn1g6u4aYBpnDvtU=";
 
   mypy-boto3-rds-data =
-    buildMypyBoto3Package "rds-data" "1.40.0"
-      "sha256-EjuSI3v4i4PRTmcQtqRTRdgfBXBBzF9ChJV9x6VCdtY=";
+    buildMypyBoto3Package "rds-data" "1.40.60"
+      "sha256-tPhLjs0Gw9CunnNhnWc9UMyOwY7f1B9V/XzEHOOoLg4=";
 
   mypy-boto3-redshift =
     buildMypyBoto3Package "redshift" "1.40.40"

From 4696293604ae76ed66160e0e95ba90627839a088 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:32 +0100
Subject: [PATCH 3965/6226] python312Packages.mypy-boto3-redshift-serverless:
 1.40.0 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 7b233ddd9f4c..ae9a59ee5685 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1101,8 +1101,8 @@ in
       "sha256-G8yP5UD+srdmTHkuwC5A05L47Piun60kHoPzWG7MvGM=";
 
   mypy-boto3-redshift-serverless =
-    buildMypyBoto3Package "redshift-serverless" "1.40.0"
-      "sha256-iRj6arzq9rBsbuImlWdStHbs5o5D4f9MowdG5M7w6SA=";
+    buildMypyBoto3Package "redshift-serverless" "1.40.60"
+      "sha256-gvWo0ybabdCa9Y16q85MTR3TIF5VvVJQ0zrnCmkyheM=";
 
   mypy-boto3-rekognition =
     buildMypyBoto3Package "rekognition" "1.40.0"

From 043356164c164263879ce71d0094d03e28961f1b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:34 +0100
Subject: [PATCH 3966/6226] python312Packages.mypy-boto3-rekognition: 1.40.0 ->
 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ae9a59ee5685..c91124675b67 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1105,8 +1105,8 @@ in
       "sha256-gvWo0ybabdCa9Y16q85MTR3TIF5VvVJQ0zrnCmkyheM=";
 
   mypy-boto3-rekognition =
-    buildMypyBoto3Package "rekognition" "1.40.0"
-      "sha256-uVQIk3XxR7mwd/sY5TQk6jy6m5qzr0pMu/0Q4fItu3U=";
+    buildMypyBoto3Package "rekognition" "1.40.60"
+      "sha256-4kLiWKy5lNB4Ins3UdzdUOb3DWqonLF4HJWN9mNLmRo=";
 
   mypy-boto3-resiliencehub =
     buildMypyBoto3Package "resiliencehub" "1.40.58"

From da07d58c193651fa57360776272f9e53e1636347 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:36 +0100
Subject: [PATCH 3967/6226] python312Packages.mypy-boto3-robomaker: 1.40.19 ->
 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index c91124675b67..2c5d55ffcb17 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1125,8 +1125,8 @@ in
       "sha256-y80XkJoge5ED3oj4562wlG8GaXcCzTI8It58RW+skRQ=";
 
   mypy-boto3-robomaker =
-    buildMypyBoto3Package "robomaker" "1.40.19"
-      "sha256-qPJ/kxKiVat3aj6aVLDgIYpoGlpsrF7kjfxJ9UWbV0o=";
+    buildMypyBoto3Package "robomaker" "1.40.59"
+      "sha256-jYAsZ1lMU9cl4rIvRO1UZLn4nIsuauWrNRwyB0j4HK0=";
 
   mypy-boto3-rolesanywhere =
     buildMypyBoto3Package "rolesanywhere" "1.40.55"

From e5538a70e673fbabab0b633cc61d9fd0b326da23 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:39 +0100
Subject: [PATCH 3968/6226] python312Packages.mypy-boto3-route53domains:
 1.40.23 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 2c5d55ffcb17..308c6307e143 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1149,8 +1149,8 @@ in
       "sha256-lz/yPloTNQOFgT7+FvkxQFFW1bBG+Ew1VVrd718UPDA=";
 
   mypy-boto3-route53domains =
-    buildMypyBoto3Package "route53domains" "1.40.23"
-      "sha256-Gj2GSKiSAicbxMjN8Gks9joOi4WB37v1xlAnjLRobOY=";
+    buildMypyBoto3Package "route53domains" "1.40.59"
+      "sha256-7PNEZ4QfwF9yAl+Fl1ok3Md5FZa2DLO1RIVqIp5CiPA=";
 
   mypy-boto3-route53resolver =
     buildMypyBoto3Package "route53resolver" "1.40.0"

From c22f158b3cab462b911c253b9fed8c30b83ce152 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:40 +0100
Subject: [PATCH 3969/6226] python312Packages.mypy-boto3-route53resolver:
 1.40.0 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 308c6307e143..0c2375650920 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1153,8 +1153,8 @@ in
       "sha256-7PNEZ4QfwF9yAl+Fl1ok3Md5FZa2DLO1RIVqIp5CiPA=";
 
   mypy-boto3-route53resolver =
-    buildMypyBoto3Package "route53resolver" "1.40.0"
-      "sha256-wY1ypBS0J/0JvGJ7rc8HL52onwypC0FgkS4Zz6FKqpg=";
+    buildMypyBoto3Package "route53resolver" "1.40.60"
+      "sha256-BU+oYtrr5kh+36CIFBbbJMaLd2vDufCGdYywlIf4O8Q=";
 
   mypy-boto3-rum =
     buildMypyBoto3Package "rum" "1.40.58"

From 8c0cc16c8b9e9d3eb118f98287104e5aa210b558 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:42 +0100
Subject: [PATCH 3970/6226] python312Packages.mypy-boto3-sagemaker: 1.40.58 ->
 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 0c2375650920..ca078813101d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1173,8 +1173,8 @@ in
       "sha256-HPAyUwvfUNZl3Ts3H0evVO7UifAiiwrDPyYJ4titkqA=";
 
   mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.40.58"
-      "sha256-B+fvgMfQyME1sgZSifnqHY2W4vr05/IKl4F9duP4VLE=";
+    buildMypyBoto3Package "sagemaker" "1.40.59"
+      "sha256-DTxPr3U7e/KI/vtqZlzTMQv+Giot7c6jc7+FXn+D4tQ=";
 
   mypy-boto3-sagemaker-a2i-runtime =
     buildMypyBoto3Package "sagemaker-a2i-runtime" "1.40.57"

From 7f1b9eede770ff97213818645956414bdb653144 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:44 +0100
Subject: [PATCH 3971/6226] python312Packages.mypy-boto3-sagemaker-metrics:
 1.40.0 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ca078813101d..74351ffce5d8 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1193,8 +1193,8 @@ in
       "sha256-VtcgEoZH1zACZvNGEfy3gDsNVqa3A8JfwTfbd6agL3E=";
 
   mypy-boto3-sagemaker-metrics =
-    buildMypyBoto3Package "sagemaker-metrics" "1.40.0"
-      "sha256-ad7DooARgF8aOpOkvMnUig/zHHARPZe8Y6fkervBGUU=";
+    buildMypyBoto3Package "sagemaker-metrics" "1.40.59"
+      "sha256-7Z+kgd+6TYaE5cNmcJi2eWeAsCs0kSv+c+CLr3c9FnU=";
 
   mypy-boto3-sagemaker-runtime =
     buildMypyBoto3Package "sagemaker-runtime" "1.40.17"

From 38803786eb27f690d3c4951747a282aec993f29a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:46 +0100
Subject: [PATCH 3972/6226] python312Packages.mypy-boto3-scheduler: 1.40.20 ->
 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 74351ffce5d8..4afe1605d7ba 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1205,8 +1205,8 @@ in
       "sha256-hwVYt4TCYXK6G8N0x52swjdf/k1roNzwRhYl8JO4VM0=";
 
   mypy-boto3-scheduler =
-    buildMypyBoto3Package "scheduler" "1.40.20"
-      "sha256-kxBY1JSWS6R+YmXqAZGzqwOLQxBCyTYD3SSXavkmSsc=";
+    buildMypyBoto3Package "scheduler" "1.40.60"
+      "sha256-ckZ45QZgelh3hVVmMrxdFO0I9qRs8f4EmmRizHB8MVk=";
 
   mypy-boto3-schemas =
     buildMypyBoto3Package "schemas" "1.40.19"

From 7237a7178ee214e4831232580a36e97b82457a7d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:48 +0100
Subject: [PATCH 3973/6226] python312Packages.mypy-boto3-secretsmanager: 1.40.0
 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 4afe1605d7ba..1999d612317b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1217,8 +1217,8 @@ in
       "sha256-0Ih/hjzLE+pf9dXfTHLli5PYAyRGOTq5ghxNcpMN0RA=";
 
   mypy-boto3-secretsmanager =
-    buildMypyBoto3Package "secretsmanager" "1.40.0"
-      "sha256-9lCTZdXU/jJgcDutzvWhxFRV7UVOXwPzVzpQI8wXZkQ=";
+    buildMypyBoto3Package "secretsmanager" "1.40.60"
+      "sha256-KGx39Si4WoeFHsMTudr3Hmu/eafSsdDXYH2rdUdDbGE=";
 
   mypy-boto3-securityhub =
     buildMypyBoto3Package "securityhub" "1.40.26"

From 2fd6166712a7e2a4f71fe7f9304cffdf300d0f16 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:49 +0100
Subject: [PATCH 3974/6226] python312Packages.mypy-boto3-securityhub: 1.40.26
 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 1999d612317b..ac07175b04ed 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1221,8 +1221,8 @@ in
       "sha256-KGx39Si4WoeFHsMTudr3Hmu/eafSsdDXYH2rdUdDbGE=";
 
   mypy-boto3-securityhub =
-    buildMypyBoto3Package "securityhub" "1.40.26"
-      "sha256-0DkWoaAhZ0w3CXYtQgvABDZ+PeCIjB9asQkDGSl1/oU=";
+    buildMypyBoto3Package "securityhub" "1.40.59"
+      "sha256-X3jJvfIkBOC2H85etjD/noBJAuQKuXuH5YHwtQg+0as=";
 
   mypy-boto3-securitylake =
     buildMypyBoto3Package "securitylake" "1.40.58"

From dfb9e376fb8a15d17f51ac4566662d395488039e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:51 +0100
Subject: [PATCH 3975/6226] python312Packages.mypy-boto3-servicediscovery:
 1.40.10 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ac07175b04ed..a6c75e6e55f2 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1245,8 +1245,8 @@ in
       "sha256-0UIIVr2CmQYi6QefrbpCvPvBUaw/fIyzZY6RuWWIwn4=";
 
   mypy-boto3-servicediscovery =
-    buildMypyBoto3Package "servicediscovery" "1.40.10"
-      "sha256-/Gyq9dgCjeIrNTxUqE/mvfPr+4c+Ann5+ep3/NJhrW8=";
+    buildMypyBoto3Package "servicediscovery" "1.40.59"
+      "sha256-iJOjHP6nqOp7LtyEQe3ZPPQVX7hwplNk1BRG3RaFQNM=";
 
   mypy-boto3-ses =
     buildMypyBoto3Package "ses" "1.40.20"

From 25d92602032f979d89750ab3e56ab95cb2c80f61 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:53 +0100
Subject: [PATCH 3976/6226] python312Packages.mypy-boto3-ses: 1.40.20 ->
 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a6c75e6e55f2..60f2728e5079 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1249,8 +1249,8 @@ in
       "sha256-iJOjHP6nqOp7LtyEQe3ZPPQVX7hwplNk1BRG3RaFQNM=";
 
   mypy-boto3-ses =
-    buildMypyBoto3Package "ses" "1.40.20"
-      "sha256-cmGVTHQ2BGpeKYymXfxMrX+AfuHky6DTNwxL0pK4NEU=";
+    buildMypyBoto3Package "ses" "1.40.60"
+      "sha256-qzGok36eKfk+Wmo1m7NEYVJV9GayCjqBT3P++pMK+Xo=";
 
   mypy-boto3-sesv2 =
     buildMypyBoto3Package "sesv2" "1.40.58"

From 5af5decc489f022b3b6db99bb519b2f5a9370cea Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:54 +0100
Subject: [PATCH 3977/6226] python312Packages.mypy-boto3-shield: 1.40.17 ->
 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 60f2728e5079..2d4887159328 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1257,8 +1257,8 @@ in
       "sha256-e5n43zgh7Eo0CO6p3m3hC86lk5eAT9gBS8aluLFYORM=";
 
   mypy-boto3-shield =
-    buildMypyBoto3Package "shield" "1.40.17"
-      "sha256-nQ2tvjrYiAvx/NH7u0F+Ys15hYfQz4sVERpw9IH2RQQ=";
+    buildMypyBoto3Package "shield" "1.40.60"
+      "sha256-BHmfR+Kx9ZT/xbcXbBrYcraFKPbhZ+uc/1c+IQBiVLk=";
 
   mypy-boto3-signer =
     buildMypyBoto3Package "signer" "1.40.55"

From 404c0c7ccec0b42d7ccf73a7af1bdd8eb8004f2b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:55 +0100
Subject: [PATCH 3978/6226] python312Packages.mypy-boto3-simspaceweaver:
 1.40.16 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 2d4887159328..26928c71c963 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1265,8 +1265,8 @@ in
       "sha256-B60F/Q2FlLuNCGZuxSZ3A9QSAMFMgFOO0AFLzmTdyoU=";
 
   mypy-boto3-simspaceweaver =
-    buildMypyBoto3Package "simspaceweaver" "1.40.16"
-      "sha256-RfRroS8x3KiY5OvyRpOT8WCi37cI5YUbZj2BEOskgKk=";
+    buildMypyBoto3Package "simspaceweaver" "1.40.60"
+      "sha256-FMOmmPRoZJHz2/U6U5IkMRmDd7XztoqKQKTVm3CAfeE=";
 
   mypy-boto3-sms =
     buildMypyBoto3Package "sms" "1.40.0"

From cf011df972e777490e7efe12749168c9fd62fa73 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:06:57 +0100
Subject: [PATCH 3979/6226] 
 python312Packages.mypy-boto3-snow-device-management: 1.40.19 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 26928c71c963..b3b1a4f65696 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1277,8 +1277,8 @@ in
       "sha256-qWnTJxM1h3pmY2PnI8PjT7u4+xODrSQM41IK8QsJCfM=";
 
   mypy-boto3-snow-device-management =
-    buildMypyBoto3Package "snow-device-management" "1.40.19"
-      "sha256-zEYw2hrNiXj3tUFOzfLrtewLMCMFuIyXZzdzdcY7nfU=";
+    buildMypyBoto3Package "snow-device-management" "1.40.59"
+      "sha256-n9fTVYvwyPnGIkLjHpALZ1nqZC6XrClJltHicNbgd1k=";
 
   mypy-boto3-snowball =
     buildMypyBoto3Package "snowball" "1.40.17"

From 61f675d951cecad8cec204b81ef22be080b71bd3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:07:00 +0100
Subject: [PATCH 3980/6226] python312Packages.mypy-boto3-ssm-sap: 1.40.20 ->
 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b3b1a4f65696..1f1a70ab312b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1305,8 +1305,8 @@ in
       "sha256-qk/18pIl23+NoiPHM39hFIhJx0sTxhR/JJmRf9ePpx4=";
 
   mypy-boto3-ssm-sap =
-    buildMypyBoto3Package "ssm-sap" "1.40.20"
-      "sha256-IHBV71mK16u4EEiQddrEOEWIB4mIAjo6wyZronw8+2w=";
+    buildMypyBoto3Package "ssm-sap" "1.40.60"
+      "sha256-KPj/5+bRGnfGct08/e50UhrR14xm+HDYVxoM+U6ugec=";
 
   mypy-boto3-sso =
     buildMypyBoto3Package "sso" "1.40.20"

From e97f2d1d18dd51af357f495f7464bc21de0a8957 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:07:01 +0100
Subject: [PATCH 3981/6226] python312Packages.mypy-boto3-sso-admin: 1.40.37 ->
 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 1f1a70ab312b..7bc812ba3b49 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1313,8 +1313,8 @@ in
       "sha256-XlnYeHhZ5IttMBKIa2rsk22QDRp2M72x1nAeJ3CiKa0=";
 
   mypy-boto3-sso-admin =
-    buildMypyBoto3Package "sso-admin" "1.40.37"
-      "sha256-TiCqp80H4oP2DyyMoKUMqndaePtj5AhzhWck/Vm82AA=";
+    buildMypyBoto3Package "sso-admin" "1.40.60"
+      "sha256-TtEJjbTL9jtHQv1GFPCq2Rli0bhmDCR0OGFZyYZjU2U=";
 
   mypy-boto3-sso-oidc =
     buildMypyBoto3Package "sso-oidc" "1.40.37"

From 22a11432f22d7eb8c804144d4333235cb90451fd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:07:02 +0100
Subject: [PATCH 3982/6226] python312Packages.mypy-boto3-sso-oidc: 1.40.37 ->
 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 7bc812ba3b49..6bffad498f8d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1317,8 +1317,8 @@ in
       "sha256-TtEJjbTL9jtHQv1GFPCq2Rli0bhmDCR0OGFZyYZjU2U=";
 
   mypy-boto3-sso-oidc =
-    buildMypyBoto3Package "sso-oidc" "1.40.37"
-      "sha256-HWLKg9KykJJiv/eibjEymSRq4pThP30GKL0KwYJTRyc=";
+    buildMypyBoto3Package "sso-oidc" "1.40.59"
+      "sha256-s2zrJxGMHYvWUJCb+4Qn2Ot0qDLBI8wTPpGLy5iUzPw=";
 
   mypy-boto3-stepfunctions =
     buildMypyBoto3Package "stepfunctions" "1.40.0"

From e7949318e61108b3c7b98d868f2dc61b70a0b1a8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:07:03 +0100
Subject: [PATCH 3983/6226] python312Packages.mypy-boto3-stepfunctions: 1.40.0
 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 6bffad498f8d..4a2eb192e29c 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1321,8 +1321,8 @@ in
       "sha256-s2zrJxGMHYvWUJCb+4Qn2Ot0qDLBI8wTPpGLy5iUzPw=";
 
   mypy-boto3-stepfunctions =
-    buildMypyBoto3Package "stepfunctions" "1.40.0"
-      "sha256-t+4xYTbTLkXRoDyteBCVljSb3v2P/sBLLEUmpQm6U80=";
+    buildMypyBoto3Package "stepfunctions" "1.40.60"
+      "sha256-zDN+pmptUjq9Cnc6U7mmWqat6PiSWxJibgEuYq1P96Q=";
 
   mypy-boto3-storagegateway =
     buildMypyBoto3Package "storagegateway" "1.40.58"

From aef1bd8f612cd86f402f7dc7fecc5c9fa52fc5c8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:07:08 +0100
Subject: [PATCH 3984/6226] python312Packages.mypy-boto3-translate: 1.40.17 ->
 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 4a2eb192e29c..1ed722f0c0de 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1373,8 +1373,8 @@ in
       "sha256-Z00yi43t9SMR1hsAG5EkvjaRKLqUU4uYwdn3KVVo+6w=";
 
   mypy-boto3-translate =
-    buildMypyBoto3Package "translate" "1.40.17"
-      "sha256-sc7qt+4ztG8uxTo05AfI47zEbQsA2DjI6vUg4vPHsb8=";
+    buildMypyBoto3Package "translate" "1.40.59"
+      "sha256-JDhOF/W9hClZoQDlnYIfAKsU14jyCEillCfq2kqnhSM=";
 
   mypy-boto3-verifiedpermissions =
     buildMypyBoto3Package "verifiedpermissions" "1.40.24"

From b4025041bdcac0222187e3adbb9939d4ce9cc501 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:07:09 +0100
Subject: [PATCH 3985/6226] python312Packages.mypy-boto3-verifiedpermissions:
 1.40.24 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 1ed722f0c0de..9446bdf7978a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1377,8 +1377,8 @@ in
       "sha256-JDhOF/W9hClZoQDlnYIfAKsU14jyCEillCfq2kqnhSM=";
 
   mypy-boto3-verifiedpermissions =
-    buildMypyBoto3Package "verifiedpermissions" "1.40.24"
-      "sha256-AhS/FxuTPVNoi6cys6LS9wKqUKlkUZ9G3boVxJPTcNU=";
+    buildMypyBoto3Package "verifiedpermissions" "1.40.59"
+      "sha256-FLFeiaXU/dnFKdoHrgP/ST1zijX8k3Ws/pBU7DMU27M=";
 
   mypy-boto3-voice-id =
     buildMypyBoto3Package "voice-id" "1.40.54"

From 4020ec410862cbffb13e965623b5dcafb104117b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:07:11 +0100
Subject: [PATCH 3986/6226] python312Packages.mypy-boto3-vpc-lattice: 1.40.41
 -> 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 9446bdf7978a..08a278d0d3bc 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1385,8 +1385,8 @@ in
       "sha256-6usEXd0rpBSaLBKHawPIiPzqfHoNCGVO8c2p0eBqrvs=";
 
   mypy-boto3-vpc-lattice =
-    buildMypyBoto3Package "vpc-lattice" "1.40.41"
-      "sha256-ULIgKqAo6aDuFZpl/NFS77RrR8yCss7HbRV7E25OcqE=";
+    buildMypyBoto3Package "vpc-lattice" "1.40.59"
+      "sha256-39fPl4F2Xiz6+AN8HeGi33Yjj9mfxvU3ZmklLY0STMk=";
 
   mypy-boto3-waf =
     buildMypyBoto3Package "waf" "1.40.20"

From 9cfce1e38c7b227b32330ef182df58b35ad05c70 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:07:12 +0100
Subject: [PATCH 3987/6226] python312Packages.mypy-boto3-waf-regional: 1.40.18
 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 08a278d0d3bc..b88d622e851d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1393,8 +1393,8 @@ in
       "sha256-ypvb9EgrioTSxnTcoiEO7XV5xACxGhY9HUPbOeWVFBI=";
 
   mypy-boto3-waf-regional =
-    buildMypyBoto3Package "waf-regional" "1.40.18"
-      "sha256-r1Z15ZcuHUFEr7yUhnksIfPtxMlCrCiQw4TfRFfSW/U=";
+    buildMypyBoto3Package "waf-regional" "1.40.60"
+      "sha256-bbhNpZd4H36Ai5o0HhLJaVTmteMwswzLGpg4huYXQCQ=";
 
   mypy-boto3-wafv2 =
     buildMypyBoto3Package "wafv2" "1.40.49"

From 391aa2b264db63fce7d31ccda63f401ec6e9c6a1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:07:15 +0100
Subject: [PATCH 3988/6226] python312Packages.mypy-boto3-wisdom: 1.40.0 ->
 1.40.59

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b88d622e851d..cfd275c1d337 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1405,8 +1405,8 @@ in
       "sha256-oD/sVVMrRUBW5brBaCyNeNfHU4ZAWgfiqcgEwTxN00c=";
 
   mypy-boto3-wisdom =
-    buildMypyBoto3Package "wisdom" "1.40.0"
-      "sha256-B+hgPZPqVl2YpsBxmkVph+L9lMv7PzJAevqMEXHAXSQ=";
+    buildMypyBoto3Package "wisdom" "1.40.59"
+      "sha256-ZNjp4SzprutjypEz2lNfVl26eaQa42M7ihnyoxKjptE=";
 
   mypy-boto3-workdocs =
     buildMypyBoto3Package "workdocs" "1.40.57"

From 47b39cbca112277e61df0db8dedaf4b8cac66635 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:07:17 +0100
Subject: [PATCH 3989/6226] python312Packages.mypy-boto3-workmailmessageflow:
 1.40.20 -> 1.40.60

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index cfd275c1d337..d82843089cdf 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1421,8 +1421,8 @@ in
       "sha256-S5/42kRGzK1BTxE8Sp6XY93kljykbQK0YYCwQM+sJxY=";
 
   mypy-boto3-workmailmessageflow =
-    buildMypyBoto3Package "workmailmessageflow" "1.40.20"
-      "sha256-wOW0p/aZvOe3zQc9eIAirP4NmiVUUSxIeUwEIWbK4Eo=";
+    buildMypyBoto3Package "workmailmessageflow" "1.40.60"
+      "sha256-tdinxlqaJt7S2m87xb82AlSB+FgrKSuFZKcGIfbNnUs=";
 
   mypy-boto3-workspaces =
     buildMypyBoto3Package "workspaces" "1.40.57"

From 9b4c6cd369c0f5214973a9c196fa51ebdd25fa65 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:07:21 +0100
Subject: [PATCH 3990/6226] python313Packages.botocore-stubs: 1.40.58 ->
 1.40.60

---
 pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index 46371954ae06..00b84d3180eb 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.40.58";
+  version = "1.40.60";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-wnA+zO6JYraxCYF7Em4cSFM1pn7+V0uZ8uMMgsDyWJY=";
+    hash = "sha256-U5SvKPQ+r1xZintECw1O9QJv6QlvgctQkHXukt5bZFo=";
   };
 
   nativeBuildInputs = [ setuptools ];

From bbeb7e3dbc7c42ba631feeb5e2b634e26abbae3f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 01:07:24 +0100
Subject: [PATCH 3991/6226] python313Packages.boto3-stubs: 1.40.58 -> 1.40.60

---
 pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 1835b5af4d80..3b0e5f2711e9 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -358,13 +358,13 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.40.58";
+  version = "1.40.60";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-sFNouS4oNbynsBXznAD9YcNcsSerN+lTYdx6qZN7lo4=";
+    hash = "sha256-T6w8iChnumyBU7iFO0OQPhKfnlqJCxjkvqmogZLiP/0=";
   };
 
   build-system = [ setuptools ];

From 0e0db84577ca47cdbc6646e3c250b1e806a8559f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 29 Oct 2025 21:21:21 +0000
Subject: [PATCH 3992/6226] python3Packages.narwhals: 2.9.0 -> 2.10.0

Diff: https://github.com/narwhals-dev/narwhals/compare/v2.9.0...v2.10.0

Changelog: https://github.com/narwhals-dev/narwhals/releases/tag/v2.10.0
---
 pkgs/development/python-modules/narwhals/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/narwhals/default.nix b/pkgs/development/python-modules/narwhals/default.nix
index 9f000c226bf3..a33dad202948 100644
--- a/pkgs/development/python-modules/narwhals/default.nix
+++ b/pkgs/development/python-modules/narwhals/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "narwhals";
-  version = "2.9.0";
+  version = "2.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "narwhals-dev";
     repo = "narwhals";
     tag = "v${version}";
-    hash = "sha256-b+Y6MAt0E4XIAO7Ctr+2UDnVTkhPoN/C3WWolEPh/es=";
+    hash = "sha256-a/X6LVzFxtjyaFcgZapJZ5i9h5LSB39XjGu/HdhPf8k=";
   };
 
   build-system = [ hatchling ];

From f9532041a005f2c126752cb6d705ef355b0fa045 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:26:09 +0100
Subject: [PATCH 3993/6226] python313Packages.botocore-stubs: renove disabled

---
 pkgs/development/python-modules/botocore-stubs/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index 00b84d3180eb..3ca25783ed24 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -3,7 +3,6 @@
   buildPythonPackage,
   fetchPypi,
   setuptools,
-  pythonOlder,
   types-awscrt,
   typing-extensions,
 }:
@@ -13,8 +12,6 @@ buildPythonPackage rec {
   version = "1.40.60";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;

From 6677a6c3a0d7de713c06d74eb3be329135231712 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:27:39 +0100
Subject: [PATCH 3994/6226] python312Packages.mypy-boto3-apigatewayv2: 1.40.0
 -> 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d82843089cdf..fd50692b881d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -86,8 +86,8 @@ in
       "sha256-/818ZgAE2Pqwcr914QvY86R5joOZ8kjM6StO4EpobdM=";
 
   mypy-boto3-apigatewayv2 =
-    buildMypyBoto3Package "apigatewayv2" "1.40.0"
-      "sha256-gfnF5uJodhhdWWdmTcD3N4GEwUZh/LsOZ9C99MPCHWQ=";
+    buildMypyBoto3Package "apigatewayv2" "1.40.61"
+      "sha256-C0MDOmvUXvJN3FuDsDm8fZQZUFFzACdw+0EpWCIpjEc=";
 
   mypy-boto3-appconfig =
     buildMypyBoto3Package "appconfig" "1.40.0"

From 29772f0da565d396529c280914ebb9debdd864c0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:27:56 +0100
Subject: [PATCH 3995/6226] python312Packages.mypy-boto3-cloud9: 1.40.20 ->
 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index fd50692b881d..e605d26477cd 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -214,8 +214,8 @@ in
       "sha256-a4FbYJ7O9YpOfT90vAZdxmDDdDHsITCwLjNSAeYtrco=";
 
   mypy-boto3-cloud9 =
-    buildMypyBoto3Package "cloud9" "1.40.20"
-      "sha256-zmouqL+B2KyYC1dgmlJBODK3iOftfvFmKCSTUB+paWU=";
+    buildMypyBoto3Package "cloud9" "1.40.61"
+      "sha256-iS3jyYE2WKaSTegaRLK9jnWd2UxzqPR9F1dpuB2D1mo=";
 
   mypy-boto3-cloudcontrol =
     buildMypyBoto3Package "cloudcontrol" "1.40.0"

From 1985a774de7cf5efe35598c2d4edde62c8d7101d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:28:03 +0100
Subject: [PATCH 3996/6226] python312Packages.mypy-boto3-cloudsearchdomain:
 1.40.20 -> 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e605d26477cd..ade13bec7735 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -246,8 +246,8 @@ in
       "sha256-bnLdoUOM0daHl74qUUfv6RO6Mqkk8Su97RzCjKettQQ=";
 
   mypy-boto3-cloudsearchdomain =
-    buildMypyBoto3Package "cloudsearchdomain" "1.40.20"
-      "sha256-a+XyFwXb5YGI9/Z5+Qh5TOfJssHJR6j8oJNwl47sObA=";
+    buildMypyBoto3Package "cloudsearchdomain" "1.40.61"
+      "sha256-yFnrI6ZpnJG/zBbc+MrlNOXwYTGT3ANOUETi2aC38cM=";
 
   mypy-boto3-cloudtrail =
     buildMypyBoto3Package "cloudtrail" "1.40.59"

From 72fa2531667600e308cf37777ecc9c470e245ef7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:28:07 +0100
Subject: [PATCH 3997/6226] python312Packages.mypy-boto3-codeguru-security:
 1.40.17 -> 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ade13bec7735..62da05f25090 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -286,8 +286,8 @@ in
       "sha256-0gWiYnCPGcCc4CWDKOrlQxYjnGzB+rC8bWPBth4W5ZQ=";
 
   mypy-boto3-codeguru-security =
-    buildMypyBoto3Package "codeguru-security" "1.40.17"
-      "sha256-LT2Fi8LHrgRgYz6HnKyRB14Vl+PjCjTx/EF8s5D2hhw=";
+    buildMypyBoto3Package "codeguru-security" "1.40.61"
+      "sha256-NQ5S5zqviRDtAkdYT5yjNikvH1ki7Vqt2+AzAAcHr5A=";
 
   mypy-boto3-codeguruprofiler =
     buildMypyBoto3Package "codeguruprofiler" "1.40.60"

From 528dbe5fe0b17d1a3b4187958a13d0588ff2c9c1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:28:19 +0100
Subject: [PATCH 3998/6226] python312Packages.mypy-boto3-detective: 1.40.14 ->
 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 62da05f25090..ab87ff92b207 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -390,8 +390,8 @@ in
       "sha256-7D+DnOkoDtXXrLx9orqg9WXtlnpSyQFAqgBlV3hJu1Q=";
 
   mypy-boto3-detective =
-    buildMypyBoto3Package "detective" "1.40.14"
-      "sha256-QDNLIgNekgueP8XNyBbRpT1NbD+ZwxQ2OzWU4aF9/GM=";
+    buildMypyBoto3Package "detective" "1.40.61"
+      "sha256-jF4evznD25FHYGxNEyS7x4RAbElEWMyv8Fk2uEqRxwg=";
 
   mypy-boto3-devicefarm =
     buildMypyBoto3Package "devicefarm" "1.40.57"

From c6482fe18222088f071d0b32cff4408c23300d79 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:28:29 +0100
Subject: [PATCH 3999/6226] python312Packages.mypy-boto3-ec2: 1.40.57 ->
 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ab87ff92b207..deae876371c5 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -446,8 +446,8 @@ in
       "sha256-eKwS+FXicnxiHr2aTDG+ih6kDxQ24NLCkI9XPt2LjvQ=";
 
   mypy-boto3-ec2 =
-    buildMypyBoto3Package "ec2" "1.40.57"
-      "sha256-xwovEWhQ6Zo2cLB1OGIz3128wkjwz0LF6XgIaJiSx7o=";
+    buildMypyBoto3Package "ec2" "1.40.61"
+      "sha256-NfY+6/jTnWgQs8g+RSst9fqojvaXgC0Ulzd+VBlMq0E=";
 
   mypy-boto3-ec2-instance-connect =
     buildMypyBoto3Package "ec2-instance-connect" "1.40.57"

From 362968a77539b26281bdcd2bf62e842950d7ddb0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:28:32 +0100
Subject: [PATCH 4000/6226] python312Packages.mypy-boto3-ecs: 1.40.43 ->
 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index deae876371c5..edfd82f61dec 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -462,8 +462,8 @@ in
       "sha256-gyNKT8yjYFgDgEvBgUIvC0iVKIOLaCbLWcF9eYzQWUQ=";
 
   mypy-boto3-ecs =
-    buildMypyBoto3Package "ecs" "1.40.43"
-      "sha256-wVaLCKZXJJG32j2dUjzxj1Q2slgulxZ8xhqKXWenTUc=";
+    buildMypyBoto3Package "ecs" "1.40.61"
+      "sha256-bVLBi8CzUkmzE7oWyj4KLAcFs4P8lvwrUGMpl30AEXI=";
 
   mypy-boto3-efs =
     buildMypyBoto3Package "efs" "1.40.0"

From 4798fa35b3747708b7cd14d3cb3cc0fa17e3d414 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:28:34 +0100
Subject: [PATCH 4001/6226] python312Packages.mypy-boto3-efs: 1.40.0 -> 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index edfd82f61dec..cd19e76d7a3d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -466,8 +466,8 @@ in
       "sha256-bVLBi8CzUkmzE7oWyj4KLAcFs4P8lvwrUGMpl30AEXI=";
 
   mypy-boto3-efs =
-    buildMypyBoto3Package "efs" "1.40.0"
-      "sha256-DQZUI72cnRt4YwHMQivMdL4y9B9EN2H7dIMmybcX/Uk=";
+    buildMypyBoto3Package "efs" "1.40.61"
+      "sha256-yS4h39MrC5jCVbAK5YhX7OSzyiG0RTEUPR8e4olV7TE=";
 
   mypy-boto3-eks =
     buildMypyBoto3Package "eks" "1.40.59"

From 7ad02051eaf30cc56ccd6c5b5f280e59d12f79ed Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:28:39 +0100
Subject: [PATCH 4002/6226] python312Packages.mypy-boto3-elastictranscoder:
 1.40.18 -> 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index cd19e76d7a3d..29187cf6331b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -486,8 +486,8 @@ in
       "sha256-V5RG19bh6X/6Q72i5Zk0QO04uxbQdwo7PO6yNL1Stmk=";
 
   mypy-boto3-elastictranscoder =
-    buildMypyBoto3Package "elastictranscoder" "1.40.18"
-      "sha256-ObCzDvt0o59FXWw3bAh67Gh1QJNx7HjDEE0pMCcHkCs=";
+    buildMypyBoto3Package "elastictranscoder" "1.40.61"
+      "sha256-82MHEMIrohyKqBE7o822pDM3xjq3lJGwskyZyFxGNpA=";
 
   mypy-boto3-elb =
     buildMypyBoto3Package "elb" "1.40.59"

From 1b5022fce33226a00420c17ecacda74acb64bcb7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:28:47 +0100
Subject: [PATCH 4003/6226] python312Packages.mypy-boto3-emr-containers:
 1.40.29 -> 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 29187cf6331b..f7e08787444f 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -502,8 +502,8 @@ in
       "sha256-Khke6Z4btoZe5VlLDLJEmwxDD3o/uOYImj/bUy92Wdc=";
 
   mypy-boto3-emr-containers =
-    buildMypyBoto3Package "emr-containers" "1.40.29"
-      "sha256-1TDHCMuGVUm8WlKFmIT0fgSv/9Hdyy4qJLAaNcdrMQE=";
+    buildMypyBoto3Package "emr-containers" "1.40.61"
+      "sha256-uIOqO9W5VRFJtm1iZQsVdWIUomuHnbO6imSNBNBosMA=";
 
   mypy-boto3-emr-serverless =
     buildMypyBoto3Package "emr-serverless" "1.40.0"

From 0bd722db7e55ef6d8bba2c54ed57944e998e963c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:29:02 +0100
Subject: [PATCH 4004/6226] python312Packages.mypy-boto3-glacier: 1.40.18 ->
 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index f7e08787444f..7ba78fc1a1b6 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -566,8 +566,8 @@ in
       "sha256-p8iNFeQAwp5WdsqHNA8+mMBNvt6y1t6+erP2APopH0Y=";
 
   mypy-boto3-glacier =
-    buildMypyBoto3Package "glacier" "1.40.18"
-      "sha256-lEYmHnV9ADvj1BqZEeEBakiPLkfFNg4eUjx/ByEnrLQ=";
+    buildMypyBoto3Package "glacier" "1.40.61"
+      "sha256-5GWnSiMWIxQbof20i0u12lVpONLUo54NII96puTXdoE=";
 
   mypy-boto3-globalaccelerator =
     buildMypyBoto3Package "globalaccelerator" "1.40.54"

From 8f420c1373fee87b35678ac8fec86df168bb909c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:29:06 +0100
Subject: [PATCH 4005/6226] python312Packages.mypy-boto3-groundstation: 1.40.0
 -> 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 7ba78fc1a1b6..e9d3b2692941 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -589,8 +589,8 @@ in
       "sha256-/O+fM3MU2HtFIt1S8+yE3RG59dsHKwJbnINaVmYUnD0=";
 
   mypy-boto3-groundstation =
-    buildMypyBoto3Package "groundstation" "1.40.0"
-      "sha256-/LlMFYC7cJWb9C5JIt0dTEPtl2sPsalSq7mYaFSf3c4=";
+    buildMypyBoto3Package "groundstation" "1.40.61"
+      "sha256-5o+ypZ8WRwWjRIcwVGT3MEkKziqI7/OXKWCULlumfFY=";
 
   mypy-boto3-guardduty =
     buildMypyBoto3Package "guardduty" "1.40.53"

From a521df1dff548b39b49c516e53c2571f8b1c0130 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:29:23 +0100
Subject: [PATCH 4006/6226] python312Packages.mypy-boto3-kafkaconnect: 1.40.0
 -> 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e9d3b2692941..c13fee2e653a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -713,8 +713,8 @@ in
       "sha256-3hhwZY3Cxc18YpLmXfglgMV8OevwEFJymdVOIcAa/sI=";
 
   mypy-boto3-kafkaconnect =
-    buildMypyBoto3Package "kafkaconnect" "1.40.0"
-      "sha256-4wNbhuNsLwrYemkPuadR6oeaCuSajU5IwCb0En89M3U=";
+    buildMypyBoto3Package "kafkaconnect" "1.40.61"
+      "sha256-n7qtEjUsWbqSzXgwOpAaDM5MJUCsOvMOABnxeT3MZ/M=";
 
   mypy-boto3-kendra =
     buildMypyBoto3Package "kendra" "1.40.17"

From 92b5471b3f01c4660c7ee4da76eb9ee181bf9a01 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:29:24 +0100
Subject: [PATCH 4007/6226] python312Packages.mypy-boto3-kendra: 1.40.17 ->
 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index c13fee2e653a..3fa2b99efe98 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -717,8 +717,8 @@ in
       "sha256-n7qtEjUsWbqSzXgwOpAaDM5MJUCsOvMOABnxeT3MZ/M=";
 
   mypy-boto3-kendra =
-    buildMypyBoto3Package "kendra" "1.40.17"
-      "sha256-IOj6WGiMgCtbLlZ+AHvSAYZFYLxBiXWUA1VKDPBBe+Y=";
+    buildMypyBoto3Package "kendra" "1.40.61"
+      "sha256-l7t+FqNlMQA9ZCjf0pypNX7WU3z9khuQ+Q9oOLviyCs=";
 
   mypy-boto3-kendra-ranking =
     buildMypyBoto3Package "kendra-ranking" "1.40.55"

From dd1db7f742700180229471ff4f6fd287a45fe288 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:29:30 +0100
Subject: [PATCH 4008/6226] python312Packages.mypy-boto3-kinesisvideo: 1.40.19
 -> 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 3fa2b99efe98..0e1487618a85 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -757,8 +757,8 @@ in
       "sha256-82KGarHSOh1YMCqtWLoyi/89vYbRoTbcbhvpaSUg4pU=";
 
   mypy-boto3-kinesisvideo =
-    buildMypyBoto3Package "kinesisvideo" "1.40.19"
-      "sha256-ntnY800namdoyhCPe0Pg5573l2J75Wqd+yFat5KEaMc=";
+    buildMypyBoto3Package "kinesisvideo" "1.40.61"
+      "sha256-lViXLfbEMpMenVxZmcp2cfhd0SqH2IiMPOIaOdimU00=";
 
   mypy-boto3-kms =
     buildMypyBoto3Package "kms" "1.40.54"

From 4d650bf2c3c5036d4f7269164160543b8b58e31b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:29:33 +0100
Subject: [PATCH 4009/6226] python312Packages.mypy-boto3-lambda: 1.40.58 ->
 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 0e1487618a85..2f98263abdd0 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -769,8 +769,8 @@ in
       "sha256-IcUBufhnr3GfgJ0FG/JTwo0EgNZBtgKvTd6TtyttWRQ=";
 
   mypy-boto3-lambda =
-    buildMypyBoto3Package "lambda" "1.40.58"
-      "sha256-/hAC13DhFceFPsSXdosY2lKO/ThElyB/xegyV+T9hXM=";
+    buildMypyBoto3Package "lambda" "1.40.61"
+      "sha256-ffnXUIpAaIsKSLQ23Wh3fyL7CVgg/RIneMGFN9cAn7k=";
 
   mypy-boto3-lex-models =
     buildMypyBoto3Package "lex-models" "1.40.54"

From 0081e2645573e33f0d012e47526a93e64f255aa9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:29:47 +0100
Subject: [PATCH 4010/6226] python312Packages.mypy-boto3-mediapackage-vod:
 1.40.17 -> 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 2f98263abdd0..2d6b51026364 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -873,8 +873,8 @@ in
       "sha256-Bc9v9Tq2eiBAsQeWpK2viHhR/wfP0k48S2dLJqhPjnw=";
 
   mypy-boto3-mediapackage-vod =
-    buildMypyBoto3Package "mediapackage-vod" "1.40.17"
-      "sha256-T3Ba5a0ogaaNqOs93jww/OT2UgHZzy9k6YGpkN9DlYY=";
+    buildMypyBoto3Package "mediapackage-vod" "1.40.61"
+      "sha256-DAuBN6Sqbs27Gg5PW2V3iTMD3vux5soaFoRfqxgdG1A=";
 
   mypy-boto3-mediapackagev2 =
     buildMypyBoto3Package "mediapackagev2" "1.40.54"

From c3c89cbce8ef73c97db5b9752a92df804c2bfbcb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:29:53 +0100
Subject: [PATCH 4011/6226] 
 python312Packages.mypy-boto3-migrationhuborchestrator: 1.40.0 -> 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 2d6b51026364..7b8e3ae9925b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -921,8 +921,8 @@ in
       "sha256-djL6fA1ekMWn1Alc3mchrdydGCkVXsDtKNc/fG4xGL0=";
 
   mypy-boto3-migrationhuborchestrator =
-    buildMypyBoto3Package "migrationhuborchestrator" "1.40.0"
-      "sha256-EtOj4OjZBn5M5Q9pU2MaSNwXAVXbtFEZICRn/r+e9OQ=";
+    buildMypyBoto3Package "migrationhuborchestrator" "1.40.61"
+      "sha256-nEb6Mfn6FVfrnXjW8EAlpOBFtT3SugCkeH4/loTQBXs=";
 
   mypy-boto3-migrationhubstrategy =
     buildMypyBoto3Package "migrationhubstrategy" "1.40.59"

From a38b5b17eee67a89fb1901e5e3b92ff03c39be7e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:29:58 +0100
Subject: [PATCH 4012/6226] python312Packages.mypy-boto3-opensearch: 1.40.0 ->
 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 7b8e3ae9925b..9281219b36b7 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -969,8 +969,8 @@ in
       "sha256-weugGpAmdljYGGImQm7Ic46FH/H1RrQqe0Vkc0sWhTQ=";
 
   mypy-boto3-opensearch =
-    buildMypyBoto3Package "opensearch" "1.40.0"
-      "sha256-DduRVsWhYZPX+mQAj1j1kA00rilUHKA4SnmehgS4hYU=";
+    buildMypyBoto3Package "opensearch" "1.40.61"
+      "sha256-B5yKX/xElj3pjsLItXJNm5eV+KPmU/ivVz6MR6g88s0=";
 
   mypy-boto3-opensearchserverless =
     buildMypyBoto3Package "opensearchserverless" "1.40.58"

From 9cd0420e56af032c24fc660d88e168a182b6fc5b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:30:01 +0100
Subject: [PATCH 4013/6226] python312Packages.mypy-boto3-organizations: 1.40.55
 -> 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 9281219b36b7..9d90525a715e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -985,8 +985,8 @@ in
       "sha256-JEuEjo0htTuDCZx2nNJK2Zq59oSUqkMf4BrNamerfVk=";
 
   mypy-boto3-organizations =
-    buildMypyBoto3Package "organizations" "1.40.55"
-      "sha256-bBOPCYyZP96tBPWnMDRsOhRQO2K+Ros4dRkpVhiju2Y=";
+    buildMypyBoto3Package "organizations" "1.40.61"
+      "sha256-LM0Sm0mUlnh2R1/TMskPwgYc3OdgFpmmI4j3ltJIUlo=";
 
   mypy-boto3-osis =
     buildMypyBoto3Package "osis" "1.40.54"

From 0659659fabe245331514dec9ebec6655a7061c79 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:30:09 +0100
Subject: [PATCH 4014/6226] python312Packages.mypy-boto3-pipes: 1.40.0 ->
 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 9d90525a715e..41b1a1e72544 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1045,8 +1045,8 @@ in
       "sha256-n20s8GSpRLcaGXyPJs0KOUwGBOf6a2q22fe1kph/GUk=";
 
   mypy-boto3-pipes =
-    buildMypyBoto3Package "pipes" "1.40.0"
-      "sha256-AY8HH2OrOvscERskVLYOx8c8MQntEEseeVwpN6cJuaY=";
+    buildMypyBoto3Package "pipes" "1.40.61"
+      "sha256-o1FsYBeSdq8hcTyKZiCVOuS4XJYk8/8Jrxd+psm0UpU=";
 
   mypy-boto3-polly =
     buildMypyBoto3Package "polly" "1.40.54"

From c0971b6604b4fc92bb5cc88303f8718eac495376 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:30:15 +0100
Subject: [PATCH 4015/6226] python312Packages.mypy-boto3-ram: 1.40.18 ->
 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 41b1a1e72544..13daf7c6e165 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1077,8 +1077,8 @@ in
       "sha256-skz5HFlXRIhqefMOSN8lvhmAuu+COBC/hl8YGJawXSI=";
 
   mypy-boto3-ram =
-    buildMypyBoto3Package "ram" "1.40.18"
-      "sha256-eguBtTttYrCcdQ1HYyy7zNVXqVkBbG59aHwzgiV1PwY=";
+    buildMypyBoto3Package "ram" "1.40.61"
+      "sha256-AJOmbZZ199Qtgc7s/TN+Mit2/cPM2dDCmgD1Oz24N0A=";
 
   mypy-boto3-rbin =
     buildMypyBoto3Package "rbin" "1.40.60"

From 8a50adc069514156fd75edd6e505b2194bc1d256 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:30:20 +0100
Subject: [PATCH 4016/6226] python312Packages.mypy-boto3-resource-groups:
 1.40.15 -> 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 13daf7c6e165..a3eeba32ebbe 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1117,8 +1117,8 @@ in
       "sha256-x1BJr6TZpO5OlfAG5l9PuAmfTAMtjnRv3SWO6bh2zPc=";
 
   mypy-boto3-resource-groups =
-    buildMypyBoto3Package "resource-groups" "1.40.15"
-      "sha256-q6SqqJEsDrQfjYpiFp1S2+CnAjKUW+wBsLVSjYng9ZE=";
+    buildMypyBoto3Package "resource-groups" "1.40.61"
+      "sha256-ZKa2t6TPCQBID9YGi6vkYnw9icZQinedflGoqFyXqc0=";
 
   mypy-boto3-resourcegroupstaggingapi =
     buildMypyBoto3Package "resourcegroupstaggingapi" "1.40.17"

From 2236bbdb47e73faa1960bf641ab08302ececf376 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:30:25 +0100
Subject: [PATCH 4017/6226] python312Packages.mypy-boto3-s3: 1.40.26 -> 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a3eeba32ebbe..160849d903b3 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1161,8 +1161,8 @@ in
       "sha256-eZwpjtTCEt+DnFfHxJCVjBKDxA5qQkBS/1gk0zKb9ug=";
 
   mypy-boto3-s3 =
-    buildMypyBoto3Package "s3" "1.40.26"
-      "sha256-jSv9EFKJTQ6EyfuTWNg4ug7tAmUHbH3X9FYix3AnXJk=";
+    buildMypyBoto3Package "s3" "1.40.61"
+      "sha256-JlXbFDyuN/vGi1Oq40+8XJBJJdBLDyY658OPtWC2qF8=";
 
   mypy-boto3-s3control =
     buildMypyBoto3Package "s3control" "1.40.31"

From 682ba4e4f6d3831e7be871df5d7a336af5c1c689 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:30:27 +0100
Subject: [PATCH 4018/6226] python312Packages.mypy-boto3-s3control: 1.40.31 ->
 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 160849d903b3..fe7af9e6e615 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1165,8 +1165,8 @@ in
       "sha256-JlXbFDyuN/vGi1Oq40+8XJBJJdBLDyY658OPtWC2qF8=";
 
   mypy-boto3-s3control =
-    buildMypyBoto3Package "s3control" "1.40.31"
-      "sha256-4D9yv4nmCrc75l/QEqeP5FFNU4JPq5tAPtZi9dikcUY=";
+    buildMypyBoto3Package "s3control" "1.40.61"
+      "sha256-yyzFGMna0sVQnoc/xQSXTMO/RR1RiyQuWHeiVHHk7ZI=";
 
   mypy-boto3-s3outposts =
     buildMypyBoto3Package "s3outposts" "1.40.15"

From f1ba51c851a00673653d91a066405aa024b1f7d8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:30:29 +0100
Subject: [PATCH 4019/6226] python312Packages.mypy-boto3-sagemaker: 1.40.59 ->
 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index fe7af9e6e615..9b6a612e956f 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1173,8 +1173,8 @@ in
       "sha256-HPAyUwvfUNZl3Ts3H0evVO7UifAiiwrDPyYJ4titkqA=";
 
   mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.40.59"
-      "sha256-DTxPr3U7e/KI/vtqZlzTMQv+Giot7c6jc7+FXn+D4tQ=";
+    buildMypyBoto3Package "sagemaker" "1.40.61"
+      "sha256-qHC0znSbcBD0eNkq5b9Hq2h8+iM7BiQIAdm+2JOEuZo=";
 
   mypy-boto3-sagemaker-a2i-runtime =
     buildMypyBoto3Package "sagemaker-a2i-runtime" "1.40.57"

From adae12d7b482aa2da52fcaeb2e298a3a2f6af59e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:30:31 +0100
Subject: [PATCH 4020/6226] 
 python312Packages.mypy-boto3-sagemaker-featurestore-runtime: 1.40.17 ->
 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 9b6a612e956f..d2a0193a34fa 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1185,8 +1185,8 @@ in
       "sha256-jmK+l8D36ydnlSEHYxDO/e9XuMp79P1QLdjjFRcFn6w=";
 
   mypy-boto3-sagemaker-featurestore-runtime =
-    buildMypyBoto3Package "sagemaker-featurestore-runtime" "1.40.17"
-      "sha256-p3zQ7rWP78gg2bBYdpGgVi2f771qZk+jwwxBcoQJwjk=";
+    buildMypyBoto3Package "sagemaker-featurestore-runtime" "1.40.61"
+      "sha256-zlgDGfhQJcdxNYH7FIUpQJMQ9ytqhn0fbxRm6Hq+La4=";
 
   mypy-boto3-sagemaker-geospatial =
     buildMypyBoto3Package "sagemaker-geospatial" "1.40.55"

From 15e27837801a160524b5bab665aa96895b81cd2e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:30:39 +0100
Subject: [PATCH 4021/6226] 
 python312Packages.mypy-boto3-servicecatalog-appregistry: 1.40.18 -> 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d2a0193a34fa..8324063d42a3 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1241,8 +1241,8 @@ in
       "sha256-NQpBAN1iSAgS0TcKWe8GURwxKVdjmslcfkpF8rEL3G4=";
 
   mypy-boto3-servicecatalog-appregistry =
-    buildMypyBoto3Package "servicecatalog-appregistry" "1.40.18"
-      "sha256-0UIIVr2CmQYi6QefrbpCvPvBUaw/fIyzZY6RuWWIwn4=";
+    buildMypyBoto3Package "servicecatalog-appregistry" "1.40.61"
+      "sha256-zATKH97rJDBSc14LaphATdXW0S/4peOEJjK3sSwDk5Q=";
 
   mypy-boto3-servicediscovery =
     buildMypyBoto3Package "servicediscovery" "1.40.59"

From cc42f7d5285d8c84f5b79b5762319b0314a54cc9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:30:46 +0100
Subject: [PATCH 4022/6226] python312Packages.mypy-boto3-sqs: 1.40.35 ->
 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 8324063d42a3..e3afbd58db7c 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1289,8 +1289,8 @@ in
       "sha256-O+SB0ntnaEzGUHq/GJAE8tCPLcIaTcuWIJ850rv0Vz8=";
 
   mypy-boto3-sqs =
-    buildMypyBoto3Package "sqs" "1.40.35"
-      "sha256-wR+V7nK924T3/s8wADcuAVR/NnNwZLeF8c80GRuH4D8=";
+    buildMypyBoto3Package "sqs" "1.40.61"
+      "sha256-FtNNtlPc8oYYtOQirjLrLTTz+Tfc7l7dTKTePducOFc=";
 
   mypy-boto3-ssm =
     buildMypyBoto3Package "ssm" "1.40.54"

From 23f3737a5fb8e19e778f22a9429e974288719f3b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:30:53 +0100
Subject: [PATCH 4023/6226] python312Packages.mypy-boto3-support-app: 1.40.17
 -> 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e3afbd58db7c..380e33759343 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1337,8 +1337,8 @@ in
       "sha256-Ngqg/OaZCigXIPORzWl8CMv64KPmu8axXSgnBzBWnII=";
 
   mypy-boto3-support-app =
-    buildMypyBoto3Package "support-app" "1.40.17"
-      "sha256-PKD1uLbQHrySwD8nMt/OHqkGbu1qWyEYM2KzMMM+VR4=";
+    buildMypyBoto3Package "support-app" "1.40.61"
+      "sha256-JRCWcVeatM6XvNH/Rdi4Ny2Clpt5L2aAQjVRRcyT69E=";
 
   mypy-boto3-swf =
     buildMypyBoto3Package "swf" "1.40.55"

From 5479c130fa0b084c45520f3ddce2e6f38a3cbd29 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:31:05 +0100
Subject: [PATCH 4024/6226] python312Packages.mypy-boto3-workspaces: 1.40.57 ->
 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 380e33759343..3cbcdb85823b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1425,8 +1425,8 @@ in
       "sha256-tdinxlqaJt7S2m87xb82AlSB+FgrKSuFZKcGIfbNnUs=";
 
   mypy-boto3-workspaces =
-    buildMypyBoto3Package "workspaces" "1.40.57"
-      "sha256-+oG3ZMlb+/IVTxwecuyGetXhW6ZcJDbAzJ1Vm8uWGvY=";
+    buildMypyBoto3Package "workspaces" "1.40.61"
+      "sha256-/N2wHasgisfb8fVCiKsNecyTZRGF7e111qr95hYEIac=";
 
   mypy-boto3-workspaces-web =
     buildMypyBoto3Package "workspaces-web" "1.40.54"

From 6d52b16c3818b561ad2b6e62d85b6fad024aab7f Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Sat, 13 Sep 2025 12:39:36 +0200
Subject: [PATCH 4025/6226] teleport_17: 17.7.3 -> 17.7.5

Changelogs: https://github.com/gravitational/teleport/releases/tag/v17.7.4 https://github.com/gravitational/teleport/releases/tag/v17.7.5
Diff: https://github.com/gravitational/teleport/compare/v17.7.3...v17.7.5
---
 pkgs/by-name/te/teleport_17/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix
index 7aa71820e439..e07c972201b1 100644
--- a/pkgs/by-name/te/teleport_17/package.nix
+++ b/pkgs/by-name/te/teleport_17/package.nix
@@ -7,11 +7,11 @@
 }:
 
 buildTeleport {
-  version = "17.7.3";
-  hash = "sha256-YSYkJRAeu7iPOs/gFnozZbks0Fx5srNH0VjrKvFmHZo=";
-  vendorHash = "sha256-7Rb94ERtp3H1Jwyh9d7AFT06d4xXdnfe5tpdvJQrbUQ=";
+  version = "17.7.5";
+  hash = "sha256-9Qtp/lTbG7xLk9mzHwwMAQkt08oPRM1FP+NLSXEr8Mo=";
+  vendorHash = "sha256-4n1N9yiC2ILd8X8ntSPd2JhqRHROKoYK/S0GphVo+bI=";
   cargoHash = "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=";
-  pnpmHash = "sha256-ZONs8z8mgBBQBmqaDGJKqhmtUKBrxE8BGYppbAqpQmg=";
+  pnpmHash = "sha256-ovtcJWeRFQUfzbanGXzOcZk/0KwKiZYrr3VmqMt+nfE=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
   inherit buildGoModule withRdpClient extPatches;

From 3688fcfcd519d70b4ce333f6c79e55baf6a49c9f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:31:07 +0100
Subject: [PATCH 4026/6226] python312Packages.mypy-boto3-xray: 1.40.21 ->
 1.40.61

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 3cbcdb85823b..bafcfdd03ef9 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1433,6 +1433,6 @@ in
       "sha256-WN0pAbfJbsq+1LB1BM/S3goNS2sQlJka0Kn6ZCps2us=";
 
   mypy-boto3-xray =
-    buildMypyBoto3Package "xray" "1.40.21"
-      "sha256-vYgKyQDj823W9FAZST7H3hxCAdqeUM2TRSaDTLMObqs=";
+    buildMypyBoto3Package "xray" "1.40.61"
+      "sha256-FEAlQu+9Ghddr4peEO6zbhHM9LN6/aJZ/+tdMKHH8bM=";
 }

From 1bb2434c7112a91ed0f0544ddc862254cdd0e9f4 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Sat, 13 Sep 2025 12:40:31 +0200
Subject: [PATCH 4027/6226] teleport_18: 18.2.0 -> 18.2.2

Changelogs: https://github.com/gravitational/teleport/releases/tag/v18.2.1 https://github.com/gravitational/teleport/releases/tag/v18.2.2
Diff: https://github.com/gravitational/teleport/compare/v18.2.0...v18.2.2
---
 pkgs/by-name/te/teleport_18/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/te/teleport_18/package.nix b/pkgs/by-name/te/teleport_18/package.nix
index 7585fde5f5b0..54c759872c26 100644
--- a/pkgs/by-name/te/teleport_18/package.nix
+++ b/pkgs/by-name/te/teleport_18/package.nix
@@ -7,10 +7,10 @@
 }:
 
 buildTeleport {
-  version = "18.2.0";
-  hash = "sha256-JWgGRv9pK76u7IxwqnBcuAI93XIKfIVvme7l+a/3J7c=";
-  vendorHash = "sha256-oPi/rIuwze2ZlyHfZ2MdDHHvdIaF2IZ2aklEVNRgoLo=";
-  pnpmHash = "sha256-wW4RT1uqOTpy8wKIsAOfIlxoOamTzPqEbFQRAub+sn4=";
+  version = "18.2.2";
+  hash = "sha256-q7HE3FXX3uxTP+sesMbPH6FbfhI7VsoXgrKKxPtfEtQ=";
+  vendorHash = "sha256-w8RhvTKNhHKkwvsi6S3m0S9ZSxEO9bw/qhTHlB80lHc=";
+  pnpmHash = "sha256-cpkV+B50JdhcXdI/K7cqJI6TsvGOCRxkFTJcA4wE5iQ=";
   cargoHash = "sha256-ia4We4IfIkqz82aFMVvXdzjDXw0w+OJSPVdutfau6PA=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_99;

From 9c08c01c320237f69cc8061e1964dd69003d09a5 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Sun, 21 Sep 2025 16:50:34 +0200
Subject: [PATCH 4028/6226] teleport_16: 16.5.15 -> 16.5.16

Changelog: https://github.com/gravitational/teleport/releases/tag/v16.5.16
Diff: https://github.com/gravitational/teleport/compare/v16.5.15...v16.5.16
---
 pkgs/by-name/te/teleport_16/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix
index cfd330a470b2..93acae7a492d 100644
--- a/pkgs/by-name/te/teleport_16/package.nix
+++ b/pkgs/by-name/te/teleport_16/package.nix
@@ -6,10 +6,10 @@
   extPatches ? [ ],
 }:
 buildTeleport {
-  version = "16.5.15";
-  hash = "sha256-DqNG6gl+KdjSbkE9Bwum8az8cLCSOmZwo9xpuWafHCA=";
-  vendorHash = "sha256-sZvRKLF2iZ3UpgGNUPuWMT7VTpnDa2uU0d1XjDKSmdo=";
-  pnpmHash = "sha256-8xnH9PkKz77whtq/LVYUjyG1Z1reRtW03Gv8sZ/1vww=";
+  version = "16.5.16";
+  hash = "sha256-b1jUr36KNgiZnA3QBo2blKxjK3Sy6S6Lrc/bzWsX20Q=";
+  vendorHash = "sha256-mcDybNt7Mr0HJW272Ulj1oWlfsH2kEp7rNyeonoIjf8=";
+  pnpmHash = "sha256-+vZXacdGkLvjYN1s0Z+/JiVjxiaOGJ3326PvWtFaFaI=";
   cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;

From a3f3511e85ec45fca6c57a23eac13be59c3f2a64 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:38:14 +0100
Subject: [PATCH 4029/6226] python313Packages.botocore-stubs: 1.40.60 ->
 1.40.61

---
 pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index 3ca25783ed24..74093bd904cb 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.40.60";
+  version = "1.40.61";
   pyproject = true;
 
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-U5SvKPQ+r1xZintECw1O9QJv6QlvgctQkHXukt5bZFo=";
+    hash = "sha256-wgjZBmYT1pkMyj623Tovy+8e8CNo5d9nAcXjVzVSf+Q=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 731342916e2dfc0dc4d5aa447eb370e73a1fc691 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:38:19 +0100
Subject: [PATCH 4030/6226] python313Packages.boto3-stubs: 1.40.60 -> 1.40.61

---
 pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 3b0e5f2711e9..3ce272f7f546 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -358,13 +358,13 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.40.60";
+  version = "1.40.61";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-T6w8iChnumyBU7iFO0OQPhKfnlqJCxjkvqmogZLiP/0=";
+    hash = "sha256-GDfhwp1516jQltYCNcuJz/n0FCRm2e4xDMH4Vi2jQO4=";
   };
 
   build-system = [ setuptools ];

From 4c1ef270e8c21bd5bedb1e008bfa20789fa40f52 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 22:39:52 +0100
Subject: [PATCH 4031/6226] python313Packages.aws-lambda-builders: 1.57.0 ->
 1.58.0

Diff: https://github.com/awslabs/aws-lambda-builders/compare/v1.57.0...v1.58.0

Changelog: https://github.com/aws/aws-lambda-builders/releases/tag/v1.58.0
---
 .../python-modules/aws-lambda-builders/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aws-lambda-builders/default.nix b/pkgs/development/python-modules/aws-lambda-builders/default.nix
index aa24f5a428ce..15c3effda6f2 100644
--- a/pkgs/development/python-modules/aws-lambda-builders/default.nix
+++ b/pkgs/development/python-modules/aws-lambda-builders/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "aws-lambda-builders";
-  version = "1.57.0";
+  version = "1.58.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "awslabs";
     repo = "aws-lambda-builders";
     tag = "v${version}";
-    hash = "sha256-09SWe+uHsSmnxxZMqAeeg7z4MHex7oTgIHWO0jf6FQs=";
+    hash = "sha256-rscE6eiJ2lbI/U20YRmcUj21PdB9nXpjfyBvu+msC/A=";
   };
 
   postPatch = ''

From f28bdf71bfa9a1e7e66453ca20e9545bd8644e64 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 29 Oct 2025 21:41:44 +0000
Subject: [PATCH 4032/6226] libjodycode: 4.1 -> 4.1.1

Changes: https://codeberg.org/jbruchon/libjodycode/src/tag/v4.1.1/CHANGES.txt
---
 pkgs/by-name/li/libjodycode/package.nix | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/li/libjodycode/package.nix b/pkgs/by-name/li/libjodycode/package.nix
index 072fd1519689..4d936184afb0 100644
--- a/pkgs/by-name/li/libjodycode/package.nix
+++ b/pkgs/by-name/li/libjodycode/package.nix
@@ -2,14 +2,13 @@
   lib,
   stdenv,
   fetchFromGitea,
-  fetchpatch,
   jdupes,
   fixDarwinDylibNames,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libjodycode";
-  version = "4.1";
+  version = "4.1.1";
 
   outputs = [
     "out"
@@ -22,22 +21,15 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "jbruchon";
     repo = "libjodycode";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-IBOCl5iFxKwanA28JG4wEzy9tNb6TznKK8RJET8CtSY=";
+    hash = "sha256-vuFANaQLJjyRTw+0ggye4TpFiqVa50GaRVKboagsJ7Q=";
   };
 
-  patches = [
-    # Fix linux build failure, drop after 4.1 release.
-    (fetchpatch {
-      name = "linux-build-fix.patch";
-      url = "https://codeberg.org/jbruchon/libjodycode/commit/07294bbfd6c3c4be42c40c9ed81eebb5cd3d83a0.patch";
-      hash = "sha256-qgP8MgGenGebM7n5zpPJ1WTsYUTCZwcWUloUKToc1eo=";
-    })
-  ];
-
   nativeBuildInputs = lib.optional stdenv.hostPlatform.isDarwin fixDarwinDylibNames;
 
   env.PREFIX = placeholder "out";
 
+  enableParallelBuilding = true;
+
   passthru.tests = {
     inherit jdupes;
   };

From 32e531b84c2428d66ab03d8afb9bc1bc303cb51d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Wed, 29 Oct 2025 13:42:52 +0100
Subject: [PATCH 4033/6226] osu-lazer: 2025.912.0 -> 2025.1029.1

---
 pkgs/by-name/os/osu-lazer/deps.json   | 28 +++++++++++++--------------
 pkgs/by-name/os/osu-lazer/package.nix |  4 ++--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer/deps.json b/pkgs/by-name/os/osu-lazer/deps.json
index dc23860559ae..712ff49146d1 100644
--- a/pkgs/by-name/os/osu-lazer/deps.json
+++ b/pkgs/by-name/os/osu-lazer/deps.json
@@ -571,23 +571,23 @@
   },
   {
     "pname": "OpenTabletDriver",
-    "version": "0.6.5.1",
-    "hash": "sha256-/awjEXQ2F8Zoj/2xZJnSg8pBP6hN0zet0lycALfjVoM="
+    "version": "0.6.6.2",
+    "hash": "sha256-y8qI1EPIxKky0M4wDwvo0EEnkXGKNa5bmclPlQGvCBY="
   },
   {
     "pname": "OpenTabletDriver.Configurations",
-    "version": "0.6.5.1",
-    "hash": "sha256-4NFcoDlDrNKnaV+Vz6nGKGhZzxPB6ykEAiauHrDRfGU="
+    "version": "0.6.6.2",
+    "hash": "sha256-tsVq8FRk472eqMhRjyxDZlu8R0M4x7IyLcBVFnDLpF8="
   },
   {
     "pname": "OpenTabletDriver.Native",
-    "version": "0.6.5.1",
-    "hash": "sha256-04Oh5wYEj1qRq6RIoSM9bDTzwFKJS3LKo9d25FAyseI="
+    "version": "0.6.6.2",
+    "hash": "sha256-okPhvAieIc+4ojQK9vd9kWQcAIXhcKZBl5D3eJ4gQxc="
   },
   {
     "pname": "OpenTabletDriver.Plugin",
-    "version": "0.6.5.1",
-    "hash": "sha256-9N8+hq2ZoAiZlU6pk214zu3e4l50s40bgYUK3Aw7w7k="
+    "version": "0.6.6.2",
+    "hash": "sha256-EcrM+3NeTrPnIhNGPqNm2LzUTxdDGRC1BwyaCYlrUYE="
   },
   {
     "pname": "PolySharp",
@@ -626,8 +626,8 @@
   },
   {
     "pname": "ppy.osu.Framework",
-    "version": "2025.908.0",
-    "hash": "sha256-ywGPEtZqgeqgG7LJ459FfRy+JtCw9zChuYUHHY4QIcU="
+    "version": "2025.1028.0",
+    "hash": "sha256-np5O4DOajO/UB2ihWUYYo81q+he4HWG1AAtn/P5rFgw="
   },
   {
     "pname": "ppy.osu.Framework.NativeLibs",
@@ -641,8 +641,8 @@
   },
   {
     "pname": "ppy.osu.Game.Resources",
-    "version": "2025.911.0",
-    "hash": "sha256-N7CPME+A+tPpojOe7HN7Vz49VwtcmRKCJK4IIdY0kFs="
+    "version": "2025.1006.0",
+    "hash": "sha256-ZHwi8l8JVu+wTEtAkgoLSFmt8z8vVJIIsTR29gRbrCA="
   },
   {
     "pname": "ppy.osuTK.NS20",
@@ -656,8 +656,8 @@
   },
   {
     "pname": "ppy.SDL3-CS",
-    "version": "2025.828.0",
-    "hash": "sha256-3+ShJIv4TJuzPAIF7uiwOXVyb+5EpCAuIz1Ff0dPdhA="
+    "version": "2025.920.0",
+    "hash": "sha256-gNy0f95tR3hXkagzLH/mngGSsDA7UqIMKYyTf00nsCI="
   },
   {
     "pname": "ppy.Veldrid",
diff --git a/pkgs/by-name/os/osu-lazer/package.nix b/pkgs/by-name/os/osu-lazer/package.nix
index 770591ef0b44..523924e1cd2a 100644
--- a/pkgs/by-name/os/osu-lazer/package.nix
+++ b/pkgs/by-name/os/osu-lazer/package.nix
@@ -22,13 +22,13 @@
 
 buildDotnetModule rec {
   pname = "osu-lazer";
-  version = "2025.912.0";
+  version = "2025.1029.1";
 
   src = fetchFromGitHub {
     owner = "ppy";
     repo = "osu";
     tag = "${version}-lazer";
-    hash = "sha256-OpFiqGldVK0GpIlNopRhbFzb6tOvKnLr/zQeQvWPgmA=";
+    hash = "sha256-zIeeZVyI//uTZDH3i7FyuKRDDRcVRaT/43/4F5/Lamw=";
   };
 
   projectFile = "osu.Desktop/osu.Desktop.csproj";

From f76faa678b9f2ca12489820e0ba410e4a3969788 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Wed, 29 Oct 2025 13:45:35 +0100
Subject: [PATCH 4034/6226] osu-lazer-bin: 2025.912.0 -> 2025.1029.1

---
 pkgs/by-name/os/osu-lazer-bin/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/os/osu-lazer-bin/package.nix b/pkgs/by-name/os/osu-lazer-bin/package.nix
index ce24dceb1e04..0f697eaf9f97 100644
--- a/pkgs/by-name/os/osu-lazer-bin/package.nix
+++ b/pkgs/by-name/os/osu-lazer-bin/package.nix
@@ -10,23 +10,23 @@
 
 let
   pname = "osu-lazer-bin";
-  version = "2025.912.0";
+  version = "2025.1029.1";
 
   src =
     {
       aarch64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Apple.Silicon.zip";
-        hash = "sha256-wGThpn4Yb3t02MYrn1Sg8S48ak6n09T1vPSpF5zEx7E=";
+        hash = "sha256-Asqz0jiiHTtLcBzvibNzlaRe0jAop5YU4gmooZf/8gw=";
         stripRoot = false;
       };
       x86_64-darwin = fetchzip {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.app.Intel.zip";
-        hash = "sha256-OWqCqAQx1e6TsVdvOezF3gvZ06tXFIEfNMb5LA4mf5s=";
+        hash = "sha256-2ZAZ3CnYz/6VJxqpDNvx6jGcNV/9oo8Eb5/GkSidiv0=";
         stripRoot = false;
       };
       x86_64-linux = fetchurl {
         url = "https://github.com/ppy/osu/releases/download/${version}-lazer/osu.AppImage";
-        hash = "sha256-73UY3RJp0pFfbxRWX8qSnLeoZB/BRGtucmQClJP7Qwg=";
+        hash = "sha256-lx+RN20sPiG++pLS0gW6ixIYw3+g1KGCMrAhgW+yZIw=";
       };
     }
     .${stdenvNoCC.system} or (throw "osu-lazer-bin: ${stdenvNoCC.system} is unsupported.");

From e0e9098d130e2de18c09cb60617fbe6fa54a7bfb Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Wed, 29 Oct 2025 22:42:02 +0100
Subject: [PATCH 4035/6226] openmw: 0.49.0 -> 0.50.0

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 ...tly-convert-QByteArray-to-const-char.patch | 122 ------------------
 pkgs/by-name/op/openmw/package.nix            |  10 +-
 2 files changed, 2 insertions(+), 130 deletions(-)
 delete mode 100644 pkgs/by-name/op/openmw/0001-Do-not-implicitly-convert-QByteArray-to-const-char.patch

diff --git a/pkgs/by-name/op/openmw/0001-Do-not-implicitly-convert-QByteArray-to-const-char.patch b/pkgs/by-name/op/openmw/0001-Do-not-implicitly-convert-QByteArray-to-const-char.patch
deleted file mode 100644
index f35c72c93b39..000000000000
--- a/pkgs/by-name/op/openmw/0001-Do-not-implicitly-convert-QByteArray-to-const-char.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-From 0de42e9a1640e74b2c94ce16ecaf7367ece5f4b0 Mon Sep 17 00:00:00 2001
-From: elsid <elsid.mail@gmail.com>
-Date: Sun, 5 Oct 2025 23:40:17 +0200
-Subject: [PATCH] Do not implicitly convert QByteArray to const char*
-
-Operators supporting this conversion can be disabled via
-QT_NO_CAST_FROM_BYTEARRAY breaking the build. For example:
-
-https://koschei.fedoraproject.org//package/openmw
-https://kojipkgs.fedoraproject.org/work/tasks/5096/137735096/build.log
-
-Backported to OpenMW 0.49.x
-
-Co-authored-by: Sirius902 <10891979+Sirius902@users.noreply.github.com>
----
- apps/opencs/model/world/nestedtableproxymodel.cpp |  4 +++-
- apps/opencs/view/world/util.cpp                   |  5 +++--
- components/files/qtconversion.cpp                 | 11 ++++++-----
- components/vfs/qtconversion.cpp                   | 11 ++++++-----
- 4 files changed, 18 insertions(+), 13 deletions(-)
-
-diff --git a/apps/opencs/model/world/nestedtableproxymodel.cpp b/apps/opencs/model/world/nestedtableproxymodel.cpp
-index f542ce4def..5278710e4a 100644
---- a/apps/opencs/model/world/nestedtableproxymodel.cpp
-+++ b/apps/opencs/model/world/nestedtableproxymodel.cpp
-@@ -13,7 +13,9 @@ CSMWorld::NestedTableProxyModel::NestedTableProxyModel(
- {
-     const int parentRow = parent.row();
- 
--    mId = std::string(parentModel->index(parentRow, 0).data().toString().toUtf8());
-+    const QByteArray utf8 = parentModel->index(parentRow, 0).data().toString().toUtf8();
-+
-+    mId = std::string(utf8.constData(), utf8.size());
- 
-     QAbstractProxyModel::setSourceModel(parentModel);
- 
-diff --git a/apps/opencs/view/world/util.cpp b/apps/opencs/view/world/util.cpp
-index dfb587cd96..5fd32d78b4 100644
---- a/apps/opencs/view/world/util.cpp
-+++ b/apps/opencs/view/world/util.cpp
-@@ -363,11 +363,12 @@ void CSVWorld::CommandDelegate::setEditorData(QWidget* editor, const QModelIndex
-     {
-         if (!variant.isValid())
- #if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
--            variant = QVariant(editor->property(n).metaType(), (const void*)nullptr);
-+            variant = QVariant(editor->property(n.constData()).metaType(), (const void*)nullptr);
-+            editor->setProperty(n.constData(), variant);
- #else
-             variant = QVariant(editor->property(n).userType(), (const void*)nullptr);
-+            editor->setProperty(n, variant);
- #endif
--        editor->setProperty(n, variant);
-     }
- }
- 
-diff --git a/components/files/qtconversion.cpp b/components/files/qtconversion.cpp
-index d56832cb78..ac7ca6ec8b 100644
---- a/components/files/qtconversion.cpp
-+++ b/components/files/qtconversion.cpp
-@@ -1,8 +1,9 @@
--
- #include "qtconversion.hpp"
- 
- #include <components/misc/strings/conversion.hpp>
- 
-+#include <string_view>
-+
- QString Files::pathToQString(const std::filesystem::path& path)
- {
-     const auto tmp = path.u8string();
-@@ -17,12 +18,12 @@ QString Files::pathToQString(std::filesystem::path&& path)
- 
- std::filesystem::path Files::pathFromQString(QStringView path)
- {
--    const auto tmp = path.toUtf8();
--    return std::filesystem::path{ Misc::StringUtils::stringToU8String(tmp) };
-+    const QByteArray tmp = path.toUtf8();
-+    return std::filesystem::path(Misc::StringUtils::stringToU8String(std::string_view(tmp.constData(), tmp.size())));
- }
- 
- std::filesystem::path Files::pathFromQString(QString&& path)
- {
--    const auto tmp = path.toUtf8();
--    return std::filesystem::path{ Misc::StringUtils::stringToU8String(tmp) };
-+    const QByteArray tmp = path.toUtf8();
-+    return std::filesystem::path(Misc::StringUtils::stringToU8String(std::string_view(tmp.constData(), tmp.size())));
- }
-diff --git a/components/vfs/qtconversion.cpp b/components/vfs/qtconversion.cpp
-index 472e3dd0b4..fc8a0fb78e 100644
---- a/components/vfs/qtconversion.cpp
-+++ b/components/vfs/qtconversion.cpp
-@@ -1,8 +1,9 @@
--
- #include "qtconversion.hpp"
- 
- #include <components/misc/strings/conversion.hpp>
- 
-+#include <string_view>
-+
- QString VFS::Path::normalizedToQString(NormalizedView path)
- {
-     return QString::fromUtf8(path.value().data(), path.value().size());
-@@ -15,12 +16,12 @@ QString VFS::Path::normalizedToQString(Normalized&& path)
- 
- VFS::Path::Normalized VFS::Path::normalizedFromQString(QStringView path)
- {
--    const auto tmp = path.toUtf8();
--    return Normalized{ tmp };
-+    const QByteArray tmp = path.toUtf8();
-+    return Normalized(std::string_view(tmp.constData(), tmp.size()));
- }
- 
- VFS::Path::Normalized VFS::Path::normalizedFromQString(QString&& path)
- {
--    const auto tmp = path.toUtf8();
--    return Normalized{ tmp };
-+    const QByteArray tmp = std::move(path).toUtf8();
-+    return Normalized(std::string_view(tmp.constData(), tmp.size()));
- }
--- 
-2.51.0
-
diff --git a/pkgs/by-name/op/openmw/package.nix b/pkgs/by-name/op/openmw/package.nix
index 35a9fa87bb99..f3f3a15aece9 100644
--- a/pkgs/by-name/op/openmw/package.nix
+++ b/pkgs/by-name/op/openmw/package.nix
@@ -35,7 +35,7 @@ assert lib.assertOneOf "GLPreference" GLPreference [
 ];
 stdenv.mkDerivation (finalAttrs: {
   pname = "openmw";
-  version = "0.49.0";
+  version = "0.50.0";
 
   __structuredAttrs = true;
   strictDeps = true;
@@ -82,15 +82,9 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "OpenMW";
     repo = "openmw";
     tag = "openmw-${finalAttrs.version}";
-    hash = "sha256-Eyjn3jPpo0d7XENg0Ea/3MN60lZBSUAMkz1UtTiIP80=";
+    hash = "sha256-mPwNyKKqPSZJtcIyx3IhLe3iHOpx6p4+l1wJZqyDMqg=";
   };
 
-  patches = [
-    # https://gitlab.com/OpenMW/openmw/-/merge_requests/4941
-    # FIXME: Remove after next release
-    ./0001-Do-not-implicitly-convert-QByteArray-to-const-char.patch
-  ];
-
   postPatch = ''
     sed '1i#include <memory>' -i components/myguiplatform/myguidatamanager.cpp # gcc12
   ''

From d44c3e010326cfffa0178f8a7ee2eba296282f01 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Fri, 24 Oct 2025 14:11:08 -0700
Subject: [PATCH 4036/6226] python3Packages.plotly: disable broken test on
 Darwin

---
 pkgs/development/python-modules/plotly/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/plotly/default.nix b/pkgs/development/python-modules/plotly/default.nix
index cd89a0df1ae9..72713af57622 100644
--- a/pkgs/development/python-modules/plotly/default.nix
+++ b/pkgs/development/python-modules/plotly/default.nix
@@ -117,6 +117,8 @@ buildPythonPackage rec {
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # fails to launch kaleido subprocess
     "tests/test_optional/test_kaleido"
+    # requiress access to osascript, which is not available while building
+    "tests/test_plot.py::test_plot[plotly-psnr-rgb]"
     # numpy2 related error, RecursionError
     # See: https://github.com/plotly/plotly.py/issues/4852
     "tests/test_plotly_utils/validators/test_angle_validator.py"

From 2a9a294a839ce6f1790fac037c564b303f255aed Mon Sep 17 00:00:00 2001
From: superherointj <sergiomarcelo@ya.ru>
Date: Wed, 29 Oct 2025 19:13:32 -0300
Subject: [PATCH 4037/6226] fluxcd: 2.7.2 -> 2.7.3

Release: https://github.com/fluxcd/flux2/releases/tag/v2.7.3
---
 pkgs/by-name/fl/fluxcd/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix
index c30591f70b7a..868e15d61d4c 100644
--- a/pkgs/by-name/fl/fluxcd/package.nix
+++ b/pkgs/by-name/fl/fluxcd/package.nix
@@ -8,10 +8,10 @@
 }:
 
 let
-  version = "2.7.2";
-  srcHash = "sha256-a6qWGkhtslwvb4fW+K5Q0GP58wecOs2RRrMuJUX8wLs=";
-  vendorHash = "sha256-GRn+2VX7UsqlVyIrTwRFeJiBFcZpxBNkw4FW2efsCK4=";
-  manifestsHash = "sha256-cNJrx+4/dR48uYmA7HpLZlnpzF1pgWRerg2dpiXJA+U=";
+  version = "2.7.3";
+  srcHash = "sha256-nyMKlcJcDa532NqiT16eQJH0Z4dAO1MHkIzsrWlJS7Q=";
+  vendorHash = "sha256-0aQYOmH9CFv0gQ3PIEWr3OhC1jyQOIkNMp9lb7GQ40I=";
+  manifestsHash = "sha256-SQkMqcJY3FHLx6aAwWL0Nuz3fzPTevod4paz2H2srcI=";
 
   manifests = fetchzip {
     url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz";

From a52c90da61a012e7be9a3ba98fa9d7ffacbfabce Mon Sep 17 00:00:00 2001
From: skwig <16136203+skwig@users.noreply.github.com>
Date: Sat, 9 Aug 2025 12:04:35 +0200
Subject: [PATCH 4038/6226] freelens-bin: init at 1.6.1

---
 pkgs/by-name/fr/freelens-bin/darwin.nix  | 32 ++++++++++
 pkgs/by-name/fr/freelens-bin/linux.nix   | 30 ++++++++++
 pkgs/by-name/fr/freelens-bin/package.nix | 74 ++++++++++++++++++++++++
 3 files changed, 136 insertions(+)
 create mode 100644 pkgs/by-name/fr/freelens-bin/darwin.nix
 create mode 100644 pkgs/by-name/fr/freelens-bin/linux.nix
 create mode 100644 pkgs/by-name/fr/freelens-bin/package.nix

diff --git a/pkgs/by-name/fr/freelens-bin/darwin.nix b/pkgs/by-name/fr/freelens-bin/darwin.nix
new file mode 100644
index 000000000000..4d1b95906af5
--- /dev/null
+++ b/pkgs/by-name/fr/freelens-bin/darwin.nix
@@ -0,0 +1,32 @@
+{
+  stdenvNoCC,
+  pname,
+  version,
+  src,
+  meta,
+  undmg,
+}:
+
+stdenvNoCC.mkDerivation {
+  inherit
+    pname
+    version
+    src
+    meta
+    ;
+
+  sourceRoot = ".";
+
+  nativeBuildInputs = [ undmg ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/Applications"
+    cp -R "Lens.app" "$out/Applications/Lens.app"
+
+    runHook postInstall
+  '';
+
+  dontFixup = true;
+}
diff --git a/pkgs/by-name/fr/freelens-bin/linux.nix b/pkgs/by-name/fr/freelens-bin/linux.nix
new file mode 100644
index 000000000000..bb3731be8fb3
--- /dev/null
+++ b/pkgs/by-name/fr/freelens-bin/linux.nix
@@ -0,0 +1,30 @@
+{
+  pname,
+  version,
+  src,
+  meta,
+  appimageTools,
+  makeWrapper,
+}:
+let
+  appimageContents = appimageTools.extractType2 { inherit pname version src; };
+
+in
+appimageTools.wrapType2 {
+  inherit
+    pname
+    version
+    src
+    meta
+    ;
+
+  nativeBuildInputs = [ makeWrapper ];
+
+  extraInstallCommands = ''
+    mv $out/bin/${pname} $out/bin/freelens
+    wrapProgram $out/bin/freelens --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
+    install -m 444 -D ${appimageContents}/freelens.desktop $out/share/applications/freelens.desktop
+    install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/freelens.png $out/share/icons/hicolor/512x512/apps/freelens.png
+    substituteInPlace $out/share/applications/freelens.desktop --replace-fail 'Exec=AppRun' 'Exec=freelens'
+  '';
+}
diff --git a/pkgs/by-name/fr/freelens-bin/package.nix b/pkgs/by-name/fr/freelens-bin/package.nix
new file mode 100644
index 000000000000..2b59383dd753
--- /dev/null
+++ b/pkgs/by-name/fr/freelens-bin/package.nix
@@ -0,0 +1,74 @@
+{
+  stdenv,
+  stdenvNoCC,
+  fetchurl,
+  lib,
+  appimageTools,
+  makeWrapper,
+  undmg,
+}:
+
+let
+
+  pname = "freelens-bin";
+  version = "1.6.1";
+
+  sources = {
+    x86_64-linux = {
+      url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-linux-amd64.AppImage";
+      hash = "sha256-RiA9OWcs6goRPN8dGsLV3ViBe/ZWB3M7yzTmDHgB3mo=";
+    };
+    aarch64-linux = {
+      url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-linux-arm64.AppImage";
+      hash = "sha256-hYkI9N8fnEIcj7bPp0lXcB89OZ0kzcd2RrJs3htg6Qo=";
+    };
+    x86_64-darwin = {
+      url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-macos-amd64.dmg";
+      hash = "sha256-JXqMaw5KlronrpNYNU0YcVwRddHRrK/Y5b5NE3y5BA8=";
+    };
+    aarch64-darwin = {
+      url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-macos-arm64.dmg";
+      hash = "sha256-0Eg3xBE+yjNvNjloUAJJMpY9h7ifgV+4G3a+EvbXL+Q=";
+    };
+  };
+
+  src = fetchurl {
+    inherit (sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}")) url hash;
+  };
+
+  meta = {
+    description = "Free IDE for Kubernetes";
+    longDescription = ''
+      Freelens is a free and open-source user interface designed for managing Kubernetes clusters. It provides a standalone application compatible with macOS, Windows, and Linux operating systems, making it accessible to a wide range of users. The application aims to simplify the complexities of Kubernetes management by offering an intuitive and user-friendly interface.
+    '';
+    homepage = "https://github.com/freelensapp/freelens/";
+    license = lib.licenses.mit;
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    maintainers = with lib.maintainers; [ skwig ];
+    platforms = builtins.attrNames sources;
+    mainProgram = "freelens";
+  };
+
+in
+if stdenv.hostPlatform.isDarwin then
+  import ./darwin.nix {
+    inherit
+      stdenvNoCC
+      pname
+      version
+      src
+      meta
+      undmg
+      ;
+  }
+else
+  import ./linux.nix {
+    inherit
+      pname
+      version
+      src
+      meta
+      appimageTools
+      makeWrapper
+      ;
+  }

From 97d133f004f520188087e163b14ff22890f1eb28 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 29 Oct 2025 23:29:07 +0100
Subject: [PATCH 4039/6226] python313Packages.iamdata: 0.1.202510281 ->
 0.1.202510291

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202510281...v0.1.202510291

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202510291
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index a9e70347f212..dace1878608f 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202510281";
+  version = "0.1.202510291";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-bsDHP92oyp4vNfnocvOm8aD4xcX7ldDCKJ7kLW4B6r0=";
+    hash = "sha256-MApdvk2tVwvlE8F7nmBxex/NbNBlHHh2lmbwLMn0N+4=";
   };
 
   build-system = [ hatchling ];

From 186afb137aac18c09e435893b30c02eccd0677bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 22:29:32 +0000
Subject: [PATCH 4040/6226] foxglove-studio: 2.38.0 -> 2.39.0

---
 pkgs/by-name/fo/foxglove-studio/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fo/foxglove-studio/package.nix b/pkgs/by-name/fo/foxglove-studio/package.nix
index cdcdc274793a..187e405004c0 100644
--- a/pkgs/by-name/fo/foxglove-studio/package.nix
+++ b/pkgs/by-name/fo/foxglove-studio/package.nix
@@ -20,11 +20,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "foxglove-studio";
-  version = "2.38.0";
+  version = "2.39.0";
 
   src = fetchurl {
     url = "https://get.foxglove.dev/desktop/v${finalAttrs.version}/foxglove-studio-${finalAttrs.version}-linux-amd64.deb";
-    hash = "sha256-GXWxiKPpOTgoMGcI8y9Hbesmv/jOOJxKnCl4RvkYNqQ=";
+    hash = "sha256-bEvlgFCDt1b/bZhqJeeMMIDq8qjga5pwRlo/fTa3QKs=";
   };
 
   nativeBuildInputs = [

From 635d36c507b7c25e2dc0067bedab209ee1a244e3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 28 Oct 2025 21:43:48 +0100
Subject: [PATCH 4041/6226] python313Packages.tencentcloud-sdk-python: 3.0.1479
 -> 3.0.1480

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.0.1479...3.0.1480

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1480/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index ef0672e82392..a32685a3aef7 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1479";
+  version = "3.0.1480";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-RvMQk/8btxQ2c9idSnLmZedM/oDID9OFKcEikHXRIxs=";
+    hash = "sha256-5ArEEnuokneSV5JtLZjRHcuOtes40wxuk3r6aW7db8s=";
   };
 
   build-system = [ setuptools ];

From 32569d349ae446595b66a62b8c275bdba9610533 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 29 Oct 2025 00:45:19 +0000
Subject: [PATCH 4042/6226] python3Packages.torch: 2.8.0 -> 2.9.0

Diff: https://github.com/pytorch/pytorch/compare/v2.8.0...v2.9.0

Changelog: https://github.com/pytorch/pytorch/releases/tag/v2.9.0
---
 .../python-modules/torch/source/default.nix   | 17 +---
 .../torch/source/gcc-14-arm-compat.path       | 49 ----------
 .../torch/source/nvtx3-hpp-path-fix.patch     | 29 +++---
 .../python-modules/torch/source/src.nix       | 96 +++++++++++--------
 4 files changed, 73 insertions(+), 118 deletions(-)
 delete mode 100644 pkgs/development/python-modules/torch/source/gcc-14-arm-compat.path

diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index 6e333a4f13c6..cae1d47971e9 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -282,7 +282,7 @@ in
 buildPythonPackage.override { inherit stdenv; } rec {
   pname = "torch";
   # Don't forget to update torch-bin to the same version.
-  version = "2.8.0";
+  version = "2.9.0";
   pyproject = true;
 
   outputs = [
@@ -304,19 +304,6 @@ buildPythonPackage.override { inherit stdenv; } rec {
 
   patches = [
     ./clang19-template-warning.patch
-
-    # Do not override PYTHONPATH, otherwise, the build fails with:
-    # ModuleNotFoundError: No module named 'typing_extensions'
-    (fetchpatch {
-      name = "cmake-build-preserve-PYTHONPATH";
-      url = "https://github.com/pytorch/pytorch/commit/231c72240d80091f099c95e326d3600cba866eee.patch";
-      hash = "sha256-BBCjxzz2TUkx4nXRyRILA82kMwyb/4+C3eOtYqf5dhk=";
-    })
-
-    # Fixes GCC-14 compatibility on ARM
-    # Adapted from https://github.com/pytorch/pytorch/pull/157867
-    # TODO: remove at the next release
-    ./gcc-14-arm-compat.path
   ]
   ++ lib.optionals cudaSupport [
     ./fix-cmake-cuda-toolkit.patch
@@ -336,7 +323,7 @@ buildPythonPackage.override { inherit stdenv; } rec {
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace-fail "setuptools>=62.3.0,<80.0" "setuptools"
+      --replace-fail "setuptools>=70.1.0,<80.0" "setuptools"
   ''
   # Provide path to openssl binary for inductor code cache hash
   # InductorError: FileNotFoundError: [Errno 2] No such file or directory: 'openssl'
diff --git a/pkgs/development/python-modules/torch/source/gcc-14-arm-compat.path b/pkgs/development/python-modules/torch/source/gcc-14-arm-compat.path
deleted file mode 100644
index 4b411e83a9d1..000000000000
--- a/pkgs/development/python-modules/torch/source/gcc-14-arm-compat.path
+++ /dev/null
@@ -1,49 +0,0 @@
-diff --git a/aten/src/ATen/cpu/vec/sve/vec_bfloat16.h b/aten/src/ATen/cpu/vec/sve/vec_bfloat16.h
-index 7f05c2ad166..1632b595c4c 100644
---- a/aten/src/ATen/cpu/vec/sve/vec_bfloat16.h
-+++ b/aten/src/ATen/cpu/vec/sve/vec_bfloat16.h
-@@ -220,8 +220,12 @@ class Vectorized<BFloat16> {
-   Vectorized<BFloat16> le(const Vectorized<BFloat16>& other) const;
- };
-
--inline std::tuple<Vectorized<float>, Vectorized<float>> convert_bfloat16_float(
--    const Vectorized<c10::BFloat16>& a) {
-+#if defined(__GNUC__) && __GNUC__ == 14
-+// Workaround for gcc-14.2.0 ICE during RTL pass: vregs when compiling for SVE
-+__attribute__((optimize("no-tree-vectorize")))
-+#endif
-+inline std::tuple<Vectorized<float>, Vectorized<float>>
-+convert_bfloat16_float(const Vectorized<c10::BFloat16>& a) {
-   static_assert(
-       Vectorized<c10::BFloat16>::size() == 2 * Vectorized<float>::size());
-   auto zero = svreinterpret_bf16_f32(svdup_n_f32(0.0f));
-diff --git a/aten/src/ATen/native/cpu/Activation.cpp b/aten/src/ATen/native/cpu/Activation.cpp
-index 52d5383e60f..00c9f4eb253 100644
---- a/aten/src/ATen/native/cpu/Activation.cpp
-+++ b/aten/src/ATen/native/cpu/Activation.cpp
-@@ -26,6 +26,10 @@ namespace at::native {
-
- namespace {
-
-+#if defined(__GNUC__) && __GNUC__ == 14 && defined(__aarch64__) && !defined(__ARM_FEATURE_SVE)
-+// Workaround for gcc-14.2.0 ICE during RTL pass: expand when compiling for NEON
-+__attribute__((optimize("no-tree-vectorize")))
-+#endif
- static void log_sigmoid_cpu_kernel(TensorBase &output, TensorBase &buffer, const TensorBase &input) {
-   if (at::isReducedFloatingType(input.scalar_type())) {
-     AT_DISPATCH_REDUCED_FLOATING_TYPES(input.scalar_type(), "log_sigmoid_cpu", [&]() {
-diff --git a/aten/src/ATen/native/cpu/Unfold2d.cpp b/aten/src/ATen/native/cpu/Unfold2d.cpp
-index 8ef0741e77a..8c94decfff0 100644
---- a/aten/src/ATen/native/cpu/Unfold2d.cpp
-+++ b/aten/src/ATen/native/cpu/Unfold2d.cpp
-@@ -169,6 +169,10 @@ static void unfolded2d_acc_channels_last(
-
- /* note: due to write issues, this one cannot be parallelized as well as
-  * unfolded2d_copy */
-+#if defined(__GNUC__) && __GNUC__ == 14 && defined(__ARM_FEATURE_SVE) && !defined(__ARM_FEATURE_BF16)
-+// Workaround for gcc-14.2.0 ICE during RTL pass: vregs when compiling for SVE without BF16
-+__attribute__((optimize("no-tree-vectorize")))
-+#endif
- void unfolded2d_acc_kernel(
-     ScalarType dtype,
-     void *finput_data,
diff --git a/pkgs/development/python-modules/torch/source/nvtx3-hpp-path-fix.patch b/pkgs/development/python-modules/torch/source/nvtx3-hpp-path-fix.patch
index cabbc484ac76..185f4c6b529f 100644
--- a/pkgs/development/python-modules/torch/source/nvtx3-hpp-path-fix.patch
+++ b/pkgs/development/python-modules/torch/source/nvtx3-hpp-path-fix.patch
@@ -1,26 +1,23 @@
 diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
-index a93386c27f8..7c6b98006bf 100644
+index ef5c2fd4e97..6591296b704 100644
 --- a/cmake/Dependencies.cmake
 +++ b/cmake/Dependencies.cmake
-@@ -967,7 +967,7 @@ endif()
-
+@@ -952,15 +952,16 @@ endif()
+ 
  # ---[ nvtx
  if(USE_SYSTEM_NVTX)
 -  find_path(nvtx3_dir NAMES nvtx3 PATHS ${CUDA_INCLUDE_DIRS})
 +  find_path(nvtx3_dir NAMES nvtx3/nvtx3.hpp PATHS ${CUDA_INCLUDE_DIRS})
-   find_package_handle_standard_args(nvtx3 DEFAULT_MSG nvtx3_dir)
-   if(NOT nvtx3_FOUND)
-     message(WARNING "Cannot find system NVTX3, find shipped NVTX3 instead")
-@@ -977,9 +977,10 @@ if(NOT TARGET CUDA::nvtx3)
-   add_library(CUDA::nvtx3 INTERFACE IMPORTED)
- endif()
- if(NOT nvtx3_dir)
+ else()
 -  find_path(nvtx3_dir NAMES nvtx3 PATHS "${PROJECT_SOURCE_DIR}/third_party/NVTX/c/include" NO_DEFAULT_PATH)
--  target_include_directories(CUDA::nvtx3 INTERFACE "${nvtx3_dir}")
 +  find_path(nvtx3_dir NAMES nvtx3/nvtx3.hpp PATHS "${PROJECT_SOURCE_DIR}/third_party/NVTX/c/include" NO_DEFAULT_PATH)
  endif()
-+target_include_directories(CUDA::nvtx3 INTERFACE "${nvtx3_dir}")
-+message(STATUS "Using NVTX3 include directory: ${nvtx3_dir}")
-
-
- # ---[ HIP
+ find_package_handle_standard_args(nvtx3 DEFAULT_MSG nvtx3_dir)
+ if(nvtx3_FOUND)
+   add_library(torch::nvtx3 INTERFACE IMPORTED)
+   target_include_directories(torch::nvtx3 INTERFACE "${nvtx3_dir}")
+   target_compile_definitions(torch::nvtx3 INTERFACE TORCH_CUDA_USE_NVTX3)
++  message(STATUS "Using NVTX3 include directory: ${nvtx3_dir}")
+ else()
+   message(WARNING "Cannot find NVTX3, find old NVTX instead")
+   add_library(torch::nvtoolsext INTERFACE IMPORTED)
diff --git a/pkgs/development/python-modules/torch/source/src.nix b/pkgs/development/python-modules/torch/source/src.nix
index 99d3d5561004..3bae6c20b22b 100644
--- a/pkgs/development/python-modules/torch/source/src.nix
+++ b/pkgs/development/python-modules/torch/source/src.nix
@@ -4,13 +4,19 @@
   fetchFromGitHub,
   runCommand,
 }:
-assert version == "2.8.0";
+assert version == "2.9.0";
 rec {
+  src_aiter = fetchFromGitHub {
+    owner = "ROCm";
+    repo = "aiter";
+    rev = "01aae101b9e5e94d6c16a9514c9fb8df99c93150";
+    hash = "sha256-rJwKTzUi066ZRroK7eFsOPmNRRRq7VMQz0Xw7qcgtNo=";
+  };
   src_asmjit = fetchFromGitHub {
     owner = "asmjit";
     repo = "asmjit";
-    rev = "e5d7c0bd5d9aec44d68830187138149e6a8c4e32";
-    hash = "sha256-sI0/9szBMvopQAmVcZSU4D/oaZYdb08AHDSZKy/Qz1g=";
+    rev = "a3199e8857792cd10b7589ff5d58343d2c9008ea";
+    hash = "sha256-qb0lM1N1FIvoADNsZZdlg8HAheePv/LvSDvRhOAqZc0=";
   };
   src_benchmark = fetchFromGitHub {
     owner = "google";
@@ -45,14 +51,20 @@ rec {
   src_composable_kernel = fetchFromGitHub {
     owner = "ROCm";
     repo = "composable_kernel";
-    rev = "8086bbe3a78d931eb96fe12fdc014082e18d18d3";
-    hash = "sha256-fyL1SzRs5CXW5CWy6kCN1y1xX6cG+ur7iQlbKX2zbCM=";
+    rev = "7fe50dc3da2069d6645d9deb8c017a876472a977";
+    hash = "sha256-OxA0ekcaRxAmBFlXkvS7XAX40kcWCwyytHWV6vROWjo=";
+  };
+  src_composable_kernel_aiter = fetchFromGitHub {
+    owner = "ROCm";
+    repo = "composable_kernel";
+    rev = "cffe8fa2a442ac8e80dd236a1a5d24fe3d7e0cbf";
+    hash = "sha256-KDmSs9NDFYbyE4wzBedVDBZGhI1BAoJHWOStFkuEk9U=";
   };
   src_composable_kernel_fbgemm = fetchFromGitHub {
     owner = "jwfromm";
     repo = "composable_kernel";
-    rev = "4a61bdd4bd4ed730e078aebc7c0fcf046ff29406";
-    hash = "sha256-CxcpvW4QxkUDB2zMz7NB6Rt9jXjJeGVExfrYbn9ef5I=";
+    rev = "b1281b8b08d973a7064f864f47eeb30f3e2596e9";
+    hash = "sha256-ZWfTZ9UxnIpkoRnTmB5e3H/LY5a2HixkCCIMcnpc+Gw=";
   };
   src_composable_kernel_flash-attention = fetchFromGitHub {
     owner = "ROCm";
@@ -63,8 +75,8 @@ rec {
   src_cpp-httplib = fetchFromGitHub {
     owner = "yhirose";
     repo = "cpp-httplib";
-    rev = "3af7f2c16147f3fbc6e4d717032daf505dc1652c";
-    hash = "sha256-t/ddZjKelnXQdXQvZgv9pQcJt3M2rwgbtTQNW/T6Gpk=";
+    rev = "89c932f313c6437c38f2982869beacc89c2f2246";
+    hash = "sha256-+VPebnFMGNyChM20q4Z+kVOyI/qDLQjRsaGS0vo8kDM=";
   };
   src_cpr = fetchFromGitHub {
     owner = "libcpr";
@@ -87,20 +99,20 @@ rec {
   src_cudnn-frontend = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "cudnn-frontend";
-    rev = "666996fe3960f27170d1527e5579ba24c8d3380a";
-    hash = "sha256-/ae5dNjqkn5dGciGSO+Pn9pzJg+hHWqqQCPcqggWezo=";
+    rev = "f937055efc6d414d11f4c6577e3977fe74f35fb6";
+    hash = "sha256-LiTajW2hrDth8wEC4Vp2lZO+CeMqK+tEKPLok7gXB/s=";
   };
   src_cutlass = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "cutlass";
-    rev = "ad7b2f5e84fcfa124cb02b91d5bd26d238c0459e";
-    hash = "sha256-teziPNA9csYvhkG5t2ht8W8x5+1YGGbHm8VKx4JoxgI=";
+    rev = "e51efbfe18fe4f4cbb66ab814c55bf4aa0185491";
+    hash = "sha256-ZY+6Tg/CC6fqvU764k6QNudYDpY+s8OQklG+1aXQuns=";
   };
   src_cutlass_fbgemm = fetchFromGitHub {
     owner = "jwfromm";
     repo = "cutlass";
-    rev = "3ed8d2ec4ba35ef5d9d8353826209b6f868f63d3";
-    hash = "sha256-NntohGvqs6fbWusi2Qv5uzCJhMAfBv8qYoFi38D+mzk=";
+    rev = "311f3c8e51dc0eb56310cfc6980bf63d0fbd7917";
+    hash = "sha256-JSr48FkrYE9mvm1+ikrqUxrYuV4Bok2EOdcyeTsMdiA=";
   };
   src_cutlass_flash-attention = fetchFromGitHub {
     owner = "NVIDIA";
@@ -123,8 +135,8 @@ rec {
   src_fbgemm = fetchFromGitHub {
     owner = "pytorch";
     repo = "fbgemm";
-    rev = "157e88b750c452bef2ab4653fe9d1eeb151ce4c3";
-    hash = "sha256-Ka8/4gBsbtKNhKM/cWg1NmlKjVeBZvS+yS9SQQxb34A=";
+    rev = "4b39c551efe15e6bbade20565b0ceb2d8ce3352d";
+    hash = "sha256-a7oNR2RMQWiaX9jLAy5Y4aniByqj7f9g65snOjPPwK0=";
   };
   src_fbjni = fetchFromGitHub {
     owner = "facebookincubator";
@@ -201,8 +213,8 @@ rec {
   src_gloo = fetchFromGitHub {
     owner = "pytorch";
     repo = "gloo";
-    rev = "c7b7b022c124d9643957d9bd55f57ac59fce8fa2";
-    hash = "sha256-pZ08gs6wQTZNVDX9uuaQZvw5JKCps8EALegNF0UVV3c=";
+    rev = "54cbae0d3a67fa890b4c3d9ee162b7860315e341";
+    hash = "sha256-4g/AffVyU7iEHJI0KRkvJqeHSBMRB89V4/cfVf3yPf4=";
   };
   src_googletest = fetchFromGitHub {
     owner = "google";
@@ -216,12 +228,6 @@ rec {
     rev = "58d77fa8070e8cec2dc1ed015d66b454c8d78850";
     hash = "sha256-W+OxRTVtemt2esw4P7IyGWXOonUN5ZuscjvzqkYvZbM=";
   };
-  src_googletest_fbgemm = fetchFromGitHub {
-    owner = "google";
-    repo = "googletest";
-    rev = "f8d7d77c06936315286eb55f8de22cd23c188571";
-    hash = "sha256-t0RchAHTJbuI5YW4uyBPykTvcjy90JW9AOPNjIhwh6U=";
-  };
   src_googletest_kineto = fetchFromGitHub {
     owner = "google";
     repo = "googletest";
@@ -261,8 +267,8 @@ rec {
   src_hipify_torch = fetchFromGitHub {
     owner = "ROCmSoftwarePlatform";
     repo = "hipify_torch";
-    rev = "a4337c69fe0e2552a7b7b0669178926beeed828c";
-    hash = "sha256-B0+tDjSlZ9C5IAAgteRIgwaJNnptpp1jOP3hTF5AdOw=";
+    rev = "63b6a7b541fa7f08f8475ca7d74054db36ff2691";
+    hash = "sha256-TH9fyprP21sRsxGs4VrahhFSIXDhnLvV09c+ZCE27u0=";
   };
   src_ideep = fetchFromGitHub {
     owner = "intel";
@@ -321,14 +327,14 @@ rec {
   src_libuv = fetchFromGitHub {
     owner = "libuv";
     repo = "libuv";
-    rev = "1dff88e5161cba5c59276d2070d2e304e4dcb242";
-    hash = "sha256-i6AYD1Ony0L2+3yWK6bxOfwoZEvd9qCg33QSqA7bRXI=";
+    rev = "5152db2cbfeb5582e9c27c5ea1dba2cd9e10759b";
+    hash = "sha256-ayTk3qkeeAjrGj5ab7wF7vpWI8XWS1EeKKUqzaD/LY0=";
   };
   src_mimalloc = fetchFromGitHub {
     owner = "microsoft";
     repo = "mimalloc";
-    rev = "94036de6fe20bfd8a73d4a6d142fcf532ea604d9";
-    hash = "sha256-B0gngv16WFLBtrtG5NqA2m5e95bYVcQraeITcOX9A74=";
+    rev = "fbd8b99c2b828428947d70fdc046bb55609be93e";
+    hash = "sha256-+8xZT+mVEqlqabQc+1buVH/X6FZxvCd0rWMyjPu9i4o=";
   };
   src_mkl-dnn = fetchFromGitHub {
     owner = "intel";
@@ -415,6 +421,12 @@ rec {
     hash = "sha256-R4YmNzWEELSkAws/ejmNVxqXDTJwcqjLU/o/HvgRn2E=";
   };
   src_pybind11 = fetchFromGitHub {
+    owner = "pybind";
+    repo = "pybind11";
+    rev = "f5fbe867d2d26e4a0a9177a51f6e568868ad3dc8";
+    hash = "sha256-ZiwNGsE1FOkhnWv/1ib1akhQ4FZvrXRCDnnBZoPp6r4=";
+  };
+  src_pybind11_onnx = fetchFromGitHub {
     owner = "pybind";
     repo = "pybind11";
     rev = "a2e59f0e7065404b44dfe92a28aca47ba1378dc4";
@@ -429,8 +441,8 @@ rec {
   src_pytorch = fetchFromGitHub {
     owner = "pytorch";
     repo = "pytorch";
-    rev = "v2.8.0";
-    hash = "sha256-tFEpcgj0HiJcyBiZMtIrBrnmiCJApfTC1BgOXEGvqCo=";
+    rev = "v2.9.0";
+    hash = "sha256-0NdREKn9h3FtHKVe1Z3QtSOVdEcfgLlWXG/OiI+QrwA=";
   };
   src_sleef = fetchFromGitHub {
     owner = "shibatch";
@@ -441,8 +453,8 @@ rec {
   src_tensorpipe = fetchFromGitHub {
     owner = "pytorch";
     repo = "tensorpipe";
-    rev = "52791a2fd214b2a9dc5759d36725909c1daa7f2e";
-    hash = "sha256-i+CtjNFPDUzFCPxP0//jMLJDrQoorg0On9NfoVaMUxI=";
+    rev = "af0118d13e52f5a08841464a768e01a0bf3e3075";
+    hash = "sha256-X2YfYfDKxG0i2K8Uf7gpSb+LU2y0d4VBZM3lTa/ff1w=";
   };
   src_vcpkg = fetchFromGitHub {
     owner = "Microsoft";
@@ -462,6 +474,11 @@ rec {
     rev = "51a0103656eff6fc9bfd39a4597923c4b542c883";
     hash = "sha256-nhowllqv/hBs7xHdTwbWtiKJ1mvAYsVIyIZ35ZGsmkg=";
   };
+  src_aiter_recursive = runCommand "aiter" { } ''
+    cp -r ${src_aiter} $out
+    chmod u+w $out/3rdparty/composable_kernel
+    cp -r ${src_composable_kernel_aiter_recursive}/* $out/3rdparty/composable_kernel
+  '';
   src_asmjit_recursive = src_asmjit;
   src_benchmark_recursive = src_benchmark;
   src_benchmark_opentelemetry-cpp_recursive = src_benchmark_opentelemetry-cpp;
@@ -469,6 +486,7 @@ rec {
   src_civetweb_recursive = src_civetweb;
   src_clang-cindex-python3_recursive = src_clang-cindex-python3;
   src_composable_kernel_recursive = src_composable_kernel;
+  src_composable_kernel_aiter_recursive = src_composable_kernel_aiter;
   src_composable_kernel_fbgemm_recursive = src_composable_kernel_fbgemm;
   src_composable_kernel_flash-attention_recursive = src_composable_kernel_flash-attention;
   src_cpp-httplib_recursive = src_cpp-httplib;
@@ -510,7 +528,7 @@ rec {
     chmod u+w $out/external/cutlass
     cp -r ${src_cutlass_fbgemm_recursive}/* $out/external/cutlass
     chmod u+w $out/external/googletest
-    cp -r ${src_googletest_fbgemm_recursive}/* $out/external/googletest
+    cp -r ${src_googletest_recursive}/* $out/external/googletest
     chmod u+w $out/external/hipify_torch
     cp -r ${src_hipify_torch_recursive}/* $out/external/hipify_torch
     chmod u+w $out/external/json
@@ -541,7 +559,6 @@ rec {
   src_gloo_recursive = src_gloo;
   src_googletest_recursive = src_googletest;
   src_googletest_dynolog_recursive = src_googletest_dynolog;
-  src_googletest_fbgemm_recursive = src_googletest_fbgemm;
   src_googletest_kineto_recursive = src_googletest_kineto;
   src_googletest_opentelemetry-cpp_recursive = src_googletest_opentelemetry-cpp;
   src_googletest_prometheus-cpp_recursive = src_googletest_prometheus-cpp;
@@ -578,7 +595,7 @@ rec {
   src_onnx_recursive = runCommand "onnx" { } ''
     cp -r ${src_onnx} $out
     chmod u+w $out/third_party/pybind11
-    cp -r ${src_pybind11_recursive}/* $out/third_party/pybind11
+    cp -r ${src_pybind11_onnx_recursive}/* $out/third_party/pybind11
   '';
   src_opentelemetry-cpp_recursive = runCommand "opentelemetry-cpp" { } ''
     cp -r ${src_opentelemetry-cpp} $out
@@ -621,6 +638,7 @@ rec {
   src_psimd_recursive = src_psimd;
   src_pthreadpool_recursive = src_pthreadpool;
   src_pybind11_recursive = src_pybind11;
+  src_pybind11_onnx_recursive = src_pybind11_onnx;
   src_pybind11_tensorpipe_recursive = runCommand "pybind11_tensorpipe" { } ''
     cp -r ${src_pybind11_tensorpipe} $out
     chmod u+w $out/tools/clang
@@ -630,6 +648,8 @@ rec {
     cp -r ${src_pytorch} $out
     chmod u+w $out/android/libs/fbjni
     cp -r ${src_fbjni_recursive}/* $out/android/libs/fbjni
+    chmod u+w $out/third_party/aiter
+    cp -r ${src_aiter_recursive}/* $out/third_party/aiter
     chmod u+w $out/third_party/benchmark
     cp -r ${src_benchmark_recursive}/* $out/third_party/benchmark
     chmod u+w $out/third_party/composable_kernel

From 9cef5c9a13be90ca35f29a85eeb569f80ae3e5e3 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 29 Oct 2025 11:10:11 +0000
Subject: [PATCH 4043/6226] python3Packages.torchaudio: 2.8.0 -> 2.9.0

Diff: https://github.com/pytorch/audio/compare/v2.8.0...v2.9.0

Changelog: https://github.com/pytorch/audio/releases/tag/v2.9.0
---
 pkgs/development/python-modules/torchaudio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/torchaudio/default.nix b/pkgs/development/python-modules/torchaudio/default.nix
index 77d8aeeb21c5..6240d8b948ab 100644
--- a/pkgs/development/python-modules/torchaudio/default.nix
+++ b/pkgs/development/python-modules/torchaudio/default.nix
@@ -77,7 +77,7 @@ let
 in
 buildPythonPackage rec {
   pname = "torchaudio";
-  version = "2.8.0";
+  version = "2.9.0";
   pyproject = true;
 
   stdenv = torch.stdenv;
@@ -86,7 +86,7 @@ buildPythonPackage rec {
     owner = "pytorch";
     repo = "audio";
     tag = "v${version}";
-    hash = "sha256-SPa6ZWA2AWawfL4Z4mb1nddGaAsGEl/0dwweBpex2Wo=";
+    hash = "sha256-oZTe0LWqOJ0NUxmmUKZN3GhMgloOMCYMicbYoaW2pTw=";
   };
 
   patches = [

From 19f266849d32de49614ce0ffc7bc81cd466a7d2f Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 29 Oct 2025 11:11:24 +0000
Subject: [PATCH 4044/6226] python3Packages.torchvision: 0.23.0 -> 0.24.0

Diff: https://github.com/pytorch/vision/compare/v0.23.0...v0.24.0

Changelog: https://github.com/pytorch/vision/releases/tag/v0.24.0
---
 pkgs/development/python-modules/torchvision/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/torchvision/default.nix b/pkgs/development/python-modules/torchvision/default.nix
index bec58361183e..034f5a1539a2 100644
--- a/pkgs/development/python-modules/torchvision/default.nix
+++ b/pkgs/development/python-modules/torchvision/default.nix
@@ -29,7 +29,7 @@ let
   inherit (torch) cudaCapabilities cudaPackages cudaSupport;
 
   pname = "torchvision";
-  version = "0.23.0";
+  version = "0.24.0";
 in
 buildPythonPackage {
   format = "setuptools";
@@ -41,7 +41,7 @@ buildPythonPackage {
     owner = "pytorch";
     repo = "vision";
     tag = "v${version}";
-    hash = "sha256-BfGTq9BsmO5TtQrDED35aaT9quleZ9rcr/81ShfvCbQ=";
+    hash = "sha256-EyA/d2fAdK2arMBqNtDwKtpaKb171zqEnYFrqAFQr+g=";
   };
 
   nativeBuildInputs = [

From 0c67ffef1ad7ff3e7ed9dcebf63724e5558111f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 22:41:59 +0000
Subject: [PATCH 4045/6226] python3Packages.aiomisc: 17.9.4 -> 17.9.6

---
 pkgs/development/python-modules/aiomisc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix
index b61f558e7146..b748b26d851c 100644
--- a/pkgs/development/python-modules/aiomisc/default.nix
+++ b/pkgs/development/python-modules/aiomisc/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "aiomisc";
-  version = "17.9.4";
+  version = "17.9.6";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-oSwMhomcPIN2JYterJuBUcmJtUx3rayADH1ugah+pI8=";
+    hash = "sha256-qZcoKRXbBbRY2cTY2bTFTk+IpqJ5Pe+szfA76G7kJ+Q=";
   };
 
   build-system = [ poetry-core ];

From 149d268fc40995d1339896cc204f36e983a3c481 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 27 Oct 2025 09:15:24 +0800
Subject: [PATCH 4046/6226] ente-auth: 4.4.4 -> 4.4.8-beta

---
 pkgs/by-name/en/ente-auth/git-hashes.json   |  11 +-
 pkgs/by-name/en/ente-auth/package.nix       |  14 +-
 pkgs/by-name/en/ente-auth/pubspec.lock.json | 872 ++++++++++++--------
 pkgs/by-name/en/ente-auth/update.sh         |   2 +-
 4 files changed, 526 insertions(+), 373 deletions(-)

diff --git a/pkgs/by-name/en/ente-auth/git-hashes.json b/pkgs/by-name/en/ente-auth/git-hashes.json
index 80a5e5b11c43..9b594708a9d6 100644
--- a/pkgs/by-name/en/ente-auth/git-hashes.json
+++ b/pkgs/by-name/en/ente-auth/git-hashes.json
@@ -1,12 +1,7 @@
 {
   "ente_crypto_dart": "sha256-xBBK9BdXh4+OTj+Jkf3zh5sMZjXtvhyuE1R5LFE8iTY=",
-  "flutter_inappwebview": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
-  "flutter_inappwebview_android": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
-  "flutter_inappwebview_ios": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
-  "flutter_inappwebview_macos": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
-  "flutter_inappwebview_platform_interface": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
-  "flutter_inappwebview_web": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
-  "flutter_inappwebview_windows": "sha256-kskXtWxgp7/g1xThm5Wk3Akeaw3DHGN99PARLJyGL3A=",
+  "fk_user_agent": "sha256-GmuQPohnTi4SVta1FyEErOb7n0Jp6UdLcX/Cf+koJNA=",
   "flutter_local_authentication": "sha256-r50jr+81ho+7q2PWHLf4VnvNJmhiARZ3s4HUpThCgc0=",
-  "sqflite": "sha256-+XTVtkFJ94VifwnutvUuAqqiyWwrcEiZ3Uz0H4D9zWA="
+  "move_to_background": "sha256-cLH3vUrPmEtYKlfn2hi6Wl4JQG4dt9aEyTmVCj7zBe0=",
+  "qr_code_scanner": "sha256-g8CUwQVOgEhJO5BZAdsM5bBS485nu7POO8eu8mknga8="
 }
diff --git a/pkgs/by-name/en/ente-auth/package.nix b/pkgs/by-name/en/ente-auth/package.nix
index 8612bc2b6d3b..952e0458bb9e 100644
--- a/pkgs/by-name/en/ente-auth/package.nix
+++ b/pkgs/by-name/en/ente-auth/package.nix
@@ -1,14 +1,14 @@
 {
   lib,
-  flutter324,
+  flutter332,
   fetchFromGitHub,
-  webkitgtk_4_1,
   sqlite,
   libayatana-appindicator,
   makeDesktopItem,
   copyDesktopItems,
   makeWrapper,
   jdk17_headless,
+  yq-go,
 }:
 let
   # fetch simple-icons directly to avoid cloning with submodules,
@@ -16,16 +16,16 @@ let
   simple-icons = fetchFromGitHub (lib.importJSON ./simple-icons.json);
   desktopId = "io.ente.auth";
 in
-flutter324.buildFlutterApplication rec {
+flutter332.buildFlutterApplication rec {
   pname = "ente-auth";
-  version = "4.4.4";
+  version = "4.4.8-beta";
 
   src = fetchFromGitHub {
     owner = "ente-io";
     repo = "ente";
-    sparseCheckout = [ "mobile/apps/auth" ];
+    sparseCheckout = [ "mobile" ];
     tag = "auth-v${version}";
-    hash = "sha256-VpxF6BMofCgMWcxsscbYC3uYse0QZyTBf84zN03leC4=";
+    hash = "sha256-3it1tf/Gj8RBF+Htei4LHrXTJACHR4O2kmPPg3SqNfo=";
   };
 
   sourceRoot = "${src.name}/mobile/apps/auth";
@@ -41,6 +41,7 @@ flutter324.buildFlutterApplication rec {
   postPatch = ''
     rmdir assets/simple-icons
     ln -s ${simple-icons} assets/simple-icons
+    ${lib.getExe yq-go} -i 'del(.dependencies.sqlite3_flutter_libs)' pubspec.yaml
   '';
 
   nativeBuildInputs = [
@@ -49,7 +50,6 @@ flutter324.buildFlutterApplication rec {
   ];
 
   buildInputs = [
-    webkitgtk_4_1
     sqlite
     libayatana-appindicator
     # The networking client used by ente-auth (native_dio_adapter)
diff --git a/pkgs/by-name/en/ente-auth/pubspec.lock.json b/pkgs/by-name/en/ente-auth/pubspec.lock.json
index 5007165e59e8..108dfd733cc8 100644
--- a/pkgs/by-name/en/ente-auth/pubspec.lock.json
+++ b/pkgs/by-name/en/ente-auth/pubspec.lock.json
@@ -4,37 +4,31 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834",
+        "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "72.0.0"
-    },
-    "_macros": {
-      "dependency": "transitive",
-      "description": "dart",
-      "source": "sdk",
-      "version": "0.3.2"
+      "version": "85.0.0"
     },
     "adaptive_theme": {
       "dependency": "direct main",
       "description": {
         "name": "adaptive_theme",
-        "sha256": "f4ee609b464e5efc68131d9d15ba9aa1de4e3b5ede64be17781c6e19a52d637d",
+        "sha256": "caa49b4c73b681bf12a641dff77aa1383262a00cf38b9d1a25b180e275ba5ab9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.6.0"
+      "version": "3.7.0"
     },
     "analyzer": {
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139",
+        "sha256": "de617bfdc64f3d8b00835ec2957441ceca0a29cdf7881f7ab231bc14f71159c0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.7.0"
+      "version": "7.5.6"
     },
     "ansicolor": {
       "dependency": "transitive",
@@ -50,11 +44,11 @@
       "dependency": "direct main",
       "description": {
         "name": "app_links",
-        "sha256": "433df2e61b10519407475d7f69e470789d23d593f28224c38ba1068597be7950",
+        "sha256": "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.3"
+      "version": "6.4.0"
     },
     "app_links_linux": {
       "dependency": "transitive",
@@ -90,31 +84,31 @@
       "dependency": "direct main",
       "description": {
         "name": "archive",
-        "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
+        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.6.1"
+      "version": "4.0.7"
     },
     "args": {
       "dependency": "transitive",
       "description": {
         "name": "args",
-        "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.0"
+      "version": "2.7.0"
     },
     "async": {
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.11.0"
+      "version": "2.13.0"
     },
     "auto_size_text": {
       "dependency": "direct main",
@@ -150,81 +144,81 @@
       "dependency": "direct main",
       "description": {
         "name": "bloc",
-        "sha256": "106842ad6569f0b60297619e9e0b1885c2fb9bf84812935490e6c5275777804e",
+        "sha256": "52c10575f4445c61dd9e0cafcc6356fdd827c4c64dd7945ef3c4105f6b6ac189",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.1.4"
+      "version": "9.0.0"
     },
     "boolean_selector": {
       "dependency": "transitive",
       "description": {
         "name": "boolean_selector",
-        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.1.2"
     },
     "build": {
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0",
+        "sha256": "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.5.4"
     },
     "build_config": {
       "dependency": "transitive",
       "description": {
         "name": "build_config",
-        "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1",
+        "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "build_daemon": {
       "dependency": "transitive",
       "description": {
         "name": "build_daemon",
-        "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9",
+        "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.2"
+      "version": "4.0.4"
     },
     "build_resolvers": {
       "dependency": "transitive",
       "description": {
         "name": "build_resolvers",
-        "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a",
+        "sha256": "ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.5.4"
     },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d",
+        "sha256": "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.13"
+      "version": "2.5.4"
     },
     "build_runner_core": {
       "dependency": "transitive",
       "description": {
         "name": "build_runner_core",
-        "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0",
+        "sha256": "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.3.2"
+      "version": "9.1.2"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -240,21 +234,21 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb",
+        "sha256": "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.9.2"
+      "version": "8.10.1"
     },
     "characters": {
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
+        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.0"
     },
     "checked_yaml": {
       "dependency": "transitive",
@@ -270,11 +264,11 @@
       "dependency": "transitive",
       "description": {
         "name": "cli_util",
-        "sha256": "c05b7406fdabc7a49a3929d4af76bcaccbbffcbcdcf185b082e1ae07da323d19",
+        "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.1"
+      "version": "0.4.2"
     },
     "clipboard": {
       "dependency": "direct main",
@@ -290,31 +284,31 @@
       "dependency": "transitive",
       "description": {
         "name": "clock",
-        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+        "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "code_builder": {
       "dependency": "transitive",
       "description": {
         "name": "code_builder",
-        "sha256": "f692079e25e7869c14132d39f223f8eec9830eb76131925143b2129c4bb01b37",
+        "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.10.0"
+      "version": "4.10.1"
     },
     "collection": {
       "dependency": "direct main",
       "description": {
         "name": "collection",
-        "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.18.0"
+      "version": "1.19.1"
     },
     "confetti": {
       "dependency": "direct main",
@@ -330,11 +324,11 @@
       "dependency": "direct main",
       "description": {
         "name": "connectivity_plus",
-        "sha256": "2056db5241f96cdc0126bd94459fc4cdc13876753768fc7a31c425e50a7177d0",
+        "sha256": "051849e2bd7c7b3bc5844ea0d096609ddc3a859890ec3a9ac4a65a2620cc1f99",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.5"
+      "version": "6.1.4"
     },
     "connectivity_plus_platform_interface": {
       "dependency": "transitive",
@@ -350,21 +344,21 @@
       "dependency": "direct main",
       "description": {
         "name": "convert",
-        "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
+        "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.1"
+      "version": "3.1.2"
     },
     "cronet_http": {
       "dependency": "transitive",
       "description": {
         "name": "cronet_http",
-        "sha256": "3af9c4d57bf07ef4b307e77b22be4ad61bea19ee6ff65e62184863f3a09f1415",
+        "sha256": "5ed075c59b2d4bd43af4e73d906b8082e98ecd2af9c625327370ef28361bf635",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.3.4"
     },
     "cross_file": {
       "dependency": "transitive",
@@ -380,51 +374,51 @@
       "dependency": "transitive",
       "description": {
         "name": "crypto",
-        "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27",
+        "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.5"
+      "version": "3.0.6"
     },
     "csslib": {
       "dependency": "transitive",
       "description": {
         "name": "csslib",
-        "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb",
+        "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.0.2"
     },
     "cupertino_http": {
       "dependency": "transitive",
       "description": {
         "name": "cupertino_http",
-        "sha256": "6fcf79586ad872ddcd6004d55c8c2aab3cdf0337436e8f99837b1b6c30665d0c",
+        "sha256": "8fb9e2c36d0732d9d96abd76683406b57e78a2514e27c962e0c603dbe6f2e3f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.2"
+      "version": "2.2.0"
     },
     "dart_style": {
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab",
+        "sha256": "5b236382b47ee411741447c1f1e111459c941ea1b3f2b540dde54c210a3662af",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.7"
+      "version": "3.1.0"
     },
     "dbus": {
       "dependency": "transitive",
       "description": {
         "name": "dbus",
-        "sha256": "365c771ac3b0e58845f39ec6deebc76e3276aa9922b0cc60840712094d9047ac",
+        "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.10"
+      "version": "0.7.11"
     },
     "device_info_plus": {
       "dependency": "direct main",
@@ -440,11 +434,11 @@
       "dependency": "transitive",
       "description": {
         "name": "device_info_plus_platform_interface",
-        "sha256": "282d3cf731045a2feb66abfe61bbc40870ae50a3ed10a4d3d217556c35c8c2ba",
+        "sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.1"
+      "version": "7.0.3"
     },
     "dio": {
       "dependency": "direct main",
@@ -460,21 +454,21 @@
       "dependency": "transitive",
       "description": {
         "name": "dio_web_adapter",
-        "sha256": "33259a9276d6cea88774a0000cfae0d861003497755969c92faa223108620dc8",
+        "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.0"
+      "version": "2.1.1"
     },
     "dotted_border": {
       "dependency": "direct main",
       "description": {
         "name": "dotted_border",
-        "sha256": "108837e11848ca776c53b30bc870086f84b62ed6e01c503ed976e8f8c7df9c04",
+        "sha256": "99b091ec6891ba0c5331fdc2b502993c7c108f898995739a73c6845d71dad70c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "3.1.0"
     },
     "dropdown_button2": {
       "dependency": "direct main",
@@ -496,6 +490,33 @@
       "source": "hosted",
       "version": "3.0.0"
     },
+    "ente_accounts": {
+      "dependency": "direct main",
+      "description": {
+        "path": "../../packages/accounts",
+        "relative": true
+      },
+      "source": "path",
+      "version": "1.0.0"
+    },
+    "ente_base": {
+      "dependency": "direct main",
+      "description": {
+        "path": "../../packages/base",
+        "relative": true
+      },
+      "source": "path",
+      "version": "1.0.0"
+    },
+    "ente_configuration": {
+      "dependency": "direct main",
+      "description": {
+        "path": "../../packages/configuration",
+        "relative": true
+      },
+      "source": "path",
+      "version": "1.0.0"
+    },
     "ente_crypto_dart": {
       "dependency": "direct main",
       "description": {
@@ -507,6 +528,78 @@
       "source": "git",
       "version": "1.0.0"
     },
+    "ente_events": {
+      "dependency": "direct main",
+      "description": {
+        "path": "../../packages/events",
+        "relative": true
+      },
+      "source": "path",
+      "version": "1.0.0"
+    },
+    "ente_lock_screen": {
+      "dependency": "direct main",
+      "description": {
+        "path": "../../packages/lock_screen",
+        "relative": true
+      },
+      "source": "path",
+      "version": "1.0.0"
+    },
+    "ente_logging": {
+      "dependency": "direct main",
+      "description": {
+        "path": "../../packages/logging",
+        "relative": true
+      },
+      "source": "path",
+      "version": "1.0.0"
+    },
+    "ente_network": {
+      "dependency": "direct main",
+      "description": {
+        "path": "../../packages/network",
+        "relative": true
+      },
+      "source": "path",
+      "version": "1.0.0"
+    },
+    "ente_qr": {
+      "dependency": "direct main",
+      "description": {
+        "path": "plugins/qr",
+        "relative": true
+      },
+      "source": "path",
+      "version": "0.0.1"
+    },
+    "ente_strings": {
+      "dependency": "direct main",
+      "description": {
+        "path": "../../packages/strings",
+        "relative": true
+      },
+      "source": "path",
+      "version": "1.0.0"
+    },
+    "ente_ui": {
+      "dependency": "direct main",
+      "description": {
+        "path": "../../packages/ui",
+        "relative": true
+      },
+      "source": "path",
+      "version": "1.0.0"
+    },
+    "ente_utils": {
+      "dependency": "direct overridden",
+      "description": {
+        "path": "../../packages/utils",
+        "relative": true
+      },
+      "source": "path",
+      "version": "1.0.0"
+    },
     "event_bus": {
       "dependency": "direct main",
       "description": {
@@ -541,80 +634,81 @@
       "dependency": "transitive",
       "description": {
         "name": "fake_async",
-        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
+        "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.1"
+      "version": "1.3.3"
     },
     "ffi": {
       "dependency": "direct main",
       "description": {
         "name": "ffi",
-        "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
+        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.1.4"
     },
     "figma_squircle": {
       "dependency": "direct main",
       "description": {
         "name": "figma_squircle",
-        "sha256": "790b91a9505e90d246f6efe2fa065ff7fffe658c7b44fe9b5b20c7b0ad3818c0",
+        "sha256": "7de45eb9ec66f1c3fea65587d94d66c31e97a9d9068b38bd23d3461aaab5119a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.3"
+      "version": "0.6.3"
     },
     "file": {
       "dependency": "transitive",
       "description": {
         "name": "file",
-        "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c",
+        "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.0"
+      "version": "7.0.1"
     },
     "file_picker": {
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "c904b4ab56d53385563c7c39d8e9fa9af086f91495dfc48717ad84a42c3cf204",
+        "sha256": "e7e16c9d15c36330b94ca0e2ad8cb61f93cd5282d0158c09805aed13b5452f22",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.1.7"
+      "version": "10.3.2"
     },
     "file_saver": {
       "dependency": "direct main",
       "description": {
         "name": "file_saver",
-        "sha256": "017a127de686af2d2fbbd64afea97052d95f2a0f87d19d25b87e097407bf9c1e",
+        "sha256": "9d93db09bd4da9e43238f9dd485360fc51a5c138eea5ef5f407ec56e58079ac0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.14"
+      "version": "0.3.1"
     },
     "fixnum": {
       "dependency": "direct main",
       "description": {
         "name": "fixnum",
-        "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1",
+        "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "fk_user_agent": {
       "dependency": "direct main",
       "description": {
-        "name": "fk_user_agent",
-        "sha256": "fd6c94e120786985a292d12f61422a581f4e851148d5940af38b819357b8ad0d",
-        "url": "https://pub.dev"
+        "path": ".",
+        "ref": "458046cd9a88924e5074d96ba45397219d53b230",
+        "resolved-ref": "458046cd9a88924e5074d96ba45397219d53b230",
+        "url": "https://github.com/flutter-fast-kit/fk_user_agent"
       },
-      "source": "hosted",
+      "source": "git",
       "version": "2.1.0"
     },
     "flutter": {
@@ -627,31 +721,31 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_animate",
-        "sha256": "7c8a6594a9252dad30cc2ef16e33270b6248c4dedc3b3d06c86c4f3f4dc05ae5",
+        "sha256": "7befe2d3252728afb77aecaaea1dec88a89d35b9b1d2eea6d04479e8af9117b5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.0"
+      "version": "4.5.2"
     },
     "flutter_bloc": {
       "dependency": "direct main",
       "description": {
         "name": "flutter_bloc",
-        "sha256": "b594505eac31a0518bdcb4b5b79573b8d9117b193cc80cc12e17d639b10aa27a",
+        "sha256": "cf51747952201a455a1c840f8171d273be009b932c75093020f9af64f2123e38",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.1.6"
+      "version": "9.1.1"
     },
     "flutter_context_menu": {
       "dependency": "direct main",
       "description": {
         "name": "flutter_context_menu",
-        "sha256": "4bc1dc30ae5aa705ed99ebbeb875898c6341a6d092397a566fecd5184b392380",
+        "sha256": "5e9c62a5937aba135e3787711b04c73b78729a9751c6c71c2bece4ed9a480d76",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.0"
+      "version": "0.2.4"
     },
     "flutter_displaymode": {
       "dependency": "direct main",
@@ -667,33 +761,31 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_email_sender",
-        "sha256": "fb515d4e073d238d0daf1d765e5318487b6396d46b96e0ae9745dbc9a133f97a",
+        "sha256": "d39eb5e91358fc19ec4050da69accec21f9d5b2b6bcf188aa246327b6ca2352c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.3"
+      "version": "7.0.0"
     },
     "flutter_inappwebview": {
       "dependency": "direct main",
       "description": {
-        "path": "flutter_inappwebview",
-        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
+        "name": "flutter_inappwebview",
+        "sha256": "80092d13d3e29b6227e25b67973c67c7210bd5e35c4b747ca908e31eb71a46d5",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "6.2.0-beta.3"
+      "source": "hosted",
+      "version": "6.1.5"
     },
     "flutter_inappwebview_android": {
       "dependency": "transitive",
       "description": {
-        "path": "flutter_inappwebview_android",
-        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
+        "name": "flutter_inappwebview_android",
+        "sha256": "62557c15a5c2db5d195cb3892aab74fcaec266d7b86d59a6f0027abd672cddba",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "1.2.0-beta.3"
+      "source": "hosted",
+      "version": "1.1.3"
     },
     "flutter_inappwebview_internal_annotations": {
       "dependency": "transitive",
@@ -708,67 +800,62 @@
     "flutter_inappwebview_ios": {
       "dependency": "transitive",
       "description": {
-        "path": "flutter_inappwebview_ios",
-        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
+        "name": "flutter_inappwebview_ios",
+        "sha256": "5818cf9b26cf0cbb0f62ff50772217d41ea8d3d9cc00279c45f8aabaa1b4025d",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "1.2.0-beta.3"
+      "source": "hosted",
+      "version": "1.1.2"
     },
     "flutter_inappwebview_macos": {
       "dependency": "transitive",
       "description": {
-        "path": "flutter_inappwebview_macos",
-        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
+        "name": "flutter_inappwebview_macos",
+        "sha256": "c1fbb86af1a3738e3541364d7d1866315ffb0468a1a77e34198c9be571287da1",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "1.2.0-beta.3"
+      "source": "hosted",
+      "version": "1.1.2"
     },
     "flutter_inappwebview_platform_interface": {
       "dependency": "transitive",
       "description": {
-        "path": "flutter_inappwebview_platform_interface",
-        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
+        "name": "flutter_inappwebview_platform_interface",
+        "sha256": "cf5323e194096b6ede7a1ca808c3e0a078e4b33cc3f6338977d75b4024ba2500",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "1.4.0-beta.3"
+      "source": "hosted",
+      "version": "1.3.0+1"
     },
     "flutter_inappwebview_web": {
       "dependency": "transitive",
       "description": {
-        "path": "flutter_inappwebview_web",
-        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
+        "name": "flutter_inappwebview_web",
+        "sha256": "55f89c83b0a0d3b7893306b3bb545ba4770a4df018204917148ebb42dc14a598",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "1.2.0-beta.3"
+      "source": "hosted",
+      "version": "1.1.2"
     },
     "flutter_inappwebview_windows": {
       "dependency": "transitive",
       "description": {
-        "path": "flutter_inappwebview_windows",
-        "ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "resolved-ref": "3e6c4c4a25340cd363af9d38891d88498b90be26",
-        "url": "https://github.com/pichillilorenzo/flutter_inappwebview.git"
+        "name": "flutter_inappwebview_windows",
+        "sha256": "8b4d3a46078a2cdc636c4a3d10d10f2a16882f6be607962dbfff8874d1642055",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "0.7.0-beta.3"
+      "source": "hosted",
+      "version": "0.6.0"
     },
     "flutter_launcher_icons": {
       "dependency": "direct main",
       "description": {
         "name": "flutter_launcher_icons",
-        "sha256": "619817c4b65b322b5104b6bb6dfe6cda62d9729bd7ad4303ecc8b4e690a67a77",
+        "sha256": "10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.14.1"
+      "version": "0.14.4"
     },
     "flutter_local_authentication": {
       "dependency": "direct main",
@@ -785,31 +872,31 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_local_notifications",
-        "sha256": "49eeef364fddb71515bc78d5a8c51435a68bccd6e4d68e25a942c5e47761ae71",
+        "sha256": "ef41ae901e7529e52934feba19ed82827b11baa67336829564aeab3129460610",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "17.2.3"
+      "version": "18.0.1"
     },
     "flutter_local_notifications_linux": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_local_notifications_linux",
-        "sha256": "c49bd06165cad9beeb79090b18cd1eb0296f4bf4b23b84426e37dd7c027fc3af",
+        "sha256": "8f685642876742c941b29c32030f6f4f6dacd0e4eaecb3efbb187d6a3812ca01",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.1"
+      "version": "5.0.0"
     },
     "flutter_local_notifications_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_local_notifications_platform_interface",
-        "sha256": "85f8d07fe708c1bdcf45037f2c0109753b26ae077e9d9e899d55971711a4ea66",
+        "sha256": "6c5b83c86bf819cdb177a9247a3722067dd8cc6313827ce7c77a4b238a26fd52",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.2.0"
+      "version": "8.0.0"
     },
     "flutter_localizations": {
       "dependency": "direct main",
@@ -821,31 +908,31 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_native_splash",
-        "sha256": "aa06fec78de2190f3db4319dd60fdc8d12b2626e93ef9828633928c2dcaea840",
+        "sha256": "8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.6"
     },
     "flutter_plugin_android_lifecycle": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "9ee02950848f61c4129af3d6ec84a1cfc0e47931abc746b03e7a3bc3e8ff6eda",
+        "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.22"
+      "version": "2.0.28"
     },
     "flutter_secure_storage": {
       "dependency": "direct main",
       "description": {
         "name": "flutter_secure_storage",
-        "sha256": "165164745e6afb5c0e3e3fcc72a012fb9e58496fb26ffb92cf22e16a821e85d0",
+        "sha256": "9cad52d75ebc511adfae3d447d5d13da15a55a92c9410e50f67335b6d21d16ea",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.2.2"
+      "version": "9.2.4"
     },
     "flutter_secure_storage_linux": {
       "dependency": "transitive",
@@ -861,11 +948,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_secure_storage_macos",
-        "sha256": "1693ab11121a5f925bbea0be725abfcfbbcf36c1e29e571f84a0c0f436147a81",
+        "sha256": "6c0a2795a2d1de26ae202a0d78527d163f4acbb11cde4c75c670f3a0fc064247",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.2"
+      "version": "3.1.3"
     },
     "flutter_secure_storage_platform_interface": {
       "dependency": "transitive",
@@ -931,11 +1018,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_svg",
-        "sha256": "54900a1a1243f3c4a5506d853a2b5c2dbc38d5f27e52a52618a8054401431123",
+        "sha256": "cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.16"
+      "version": "2.2.0"
     },
     "flutter_test": {
       "dependency": "direct dev",
@@ -953,11 +1040,11 @@
       "dependency": "direct main",
       "description": {
         "name": "fluttertoast",
-        "sha256": "95f349437aeebe524ef7d6c9bde3e6b4772717cf46a0eb6a3ceaddc740b297cc",
+        "sha256": "25e51620424d92d3db3832464774a6143b5053f15e382d8ffbfd40b6e795dcf1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.2.8"
+      "version": "8.2.12"
     },
     "freezed_annotation": {
       "dependency": "transitive",
@@ -983,21 +1070,21 @@
       "dependency": "transitive",
       "description": {
         "name": "glob",
-        "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
+        "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.3"
     },
     "google_nav_bar": {
       "dependency": "direct main",
       "description": {
         "name": "google_nav_bar",
-        "sha256": "1c8e3882fa66ee7b74c24320668276ca23affbd58f0b14a24c1e5590f4d07ab0",
+        "sha256": "bb12dd21514ee1b041ab3127673e2fd85e693337df308f7f2b75cd1e8e92eaf4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.6"
+      "version": "5.0.7"
     },
     "gradient_borders": {
       "dependency": "direct main",
@@ -1033,11 +1120,11 @@
       "dependency": "transitive",
       "description": {
         "name": "hashlib",
-        "sha256": "f572f2abce09fc7aee53f15927052b9732ea1053e540af8cae211111ee0b99b1",
+        "sha256": "a7b34c92005e9ccf462b71bcab40b5d5cff53669c7e87e6c7277f18bb075bf05",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.21.0"
+      "version": "1.21.3"
     },
     "hashlib_codecs": {
       "dependency": "transitive",
@@ -1063,41 +1150,41 @@
       "dependency": "transitive",
       "description": {
         "name": "html",
-        "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a",
+        "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.15.4"
+      "version": "0.15.6"
     },
     "http": {
       "dependency": "direct main",
       "description": {
         "name": "http",
-        "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
+        "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.2"
+      "version": "1.4.0"
     },
     "http_multi_server": {
       "dependency": "transitive",
       "description": {
         "name": "http_multi_server",
-        "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b",
+        "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.2.2"
     },
     "http_parser": {
       "dependency": "transitive",
       "description": {
         "name": "http_parser",
-        "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
+        "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.2"
+      "version": "4.1.2"
     },
     "http_profile": {
       "dependency": "transitive",
@@ -1110,44 +1197,44 @@
       "version": "0.1.0"
     },
     "image": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "image",
-        "sha256": "2237616a36c0d69aef7549ab439b833fb7f9fb9fc861af2cc9ac3eedddd69ca8",
+        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.0"
+      "version": "4.5.4"
     },
     "intl": {
       "dependency": "direct main",
       "description": {
         "name": "intl",
-        "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
+        "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.19.0"
+      "version": "0.20.2"
     },
     "io": {
       "dependency": "direct main",
       "description": {
         "name": "io",
-        "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
+        "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.4"
+      "version": "1.0.5"
     },
     "jni": {
       "dependency": "transitive",
       "description": {
         "name": "jni",
-        "sha256": "f377c585ea9c08d48b427dc2e03780af2889d1bb094440da853c6883c1acba4b",
+        "sha256": "459727a9daf91bdfb39b014cf3c186cf77f0136124a274ac83c186e12262ac4e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.10.1"
+      "version": "0.12.2"
     },
     "js": {
       "dependency": "transitive",
@@ -1173,31 +1260,31 @@
       "dependency": "direct dev",
       "description": {
         "name": "json_serializable",
-        "sha256": "ea1432d167339ea9b5bb153f0571d0039607a873d6e04e0117af043f14a1fd4b",
+        "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.8.0"
+      "version": "6.9.5"
     },
     "leak_tracker": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "3f87a60e8c63aecc975dda1ceedbc8f24de75f09e4856ea27daf8958f2f0ce05",
+        "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.5"
+      "version": "10.0.9"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "932549fb305594d82d7183ecd9fa93463e9914e1b67cacc34bc40906594a1806",
+        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.5"
+      "version": "3.0.9"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
@@ -1213,11 +1300,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "lints",
-        "sha256": "3315600f3fb3b135be672bf4a178c55f274bebe368325ae18462c89ac1e3b413",
+        "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.0"
+      "version": "5.1.1"
     },
     "local_auth": {
       "dependency": "direct main",
@@ -1233,21 +1320,21 @@
       "dependency": "direct main",
       "description": {
         "name": "local_auth_android",
-        "sha256": "5351c7eea8823de28e37d8b7b3e386d944b80f2a77edb91a5707fb97a41fc1b1",
+        "sha256": "63ad7ca6396290626dc0cb34725a939e4cfe965d80d36112f08d49cf13a8136e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.45"
+      "version": "1.0.49"
     },
     "local_auth_darwin": {
       "dependency": "direct main",
       "description": {
         "name": "local_auth_darwin",
-        "sha256": "6d2950da311d26d492a89aeb247c72b4653ddc93601ea36a84924a396806d49c",
+        "sha256": "25163ce60a5a6c468cf7a0e3dc8a165f824cabc2aa9e39a5e9fc5c2311b7686f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.1"
+      "version": "1.5.0"
     },
     "local_auth_platform_interface": {
       "dependency": "transitive",
@@ -1279,25 +1366,15 @@
       "source": "hosted",
       "version": "1.3.0"
     },
-    "macros": {
-      "dependency": "transitive",
-      "description": {
-        "name": "macros",
-        "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.2-main.4"
-    },
     "matcher": {
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
+        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.16+1"
+      "version": "0.12.17"
     },
     "material_color_utilities": {
       "dependency": "transitive",
@@ -1323,21 +1400,21 @@
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.15.0"
+      "version": "1.16.0"
     },
     "mime": {
       "dependency": "transitive",
       "description": {
         "name": "mime",
-        "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a",
+        "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.6"
+      "version": "2.0.0"
     },
     "mocktail": {
       "dependency": "direct dev",
@@ -1362,11 +1439,12 @@
     "move_to_background": {
       "dependency": "direct main",
       "description": {
-        "name": "move_to_background",
-        "sha256": "00caad17a6ce149910777131503f43f8ed80025681f94684e3a6a87d979b914c",
-        "url": "https://pub.dev"
+        "path": ".",
+        "ref": "v2-only",
+        "resolved-ref": "0cdfeed654d79636eff0c57110f3f6ad5801ba2f",
+        "url": "https://github.com/ente-io/move_to_background.git"
       },
-      "source": "hosted",
+      "source": "git",
       "version": "1.0.2"
     },
     "native_dio_adapter": {
@@ -1403,11 +1481,11 @@
       "dependency": "transitive",
       "description": {
         "name": "objective_c",
-        "sha256": "62e79ab8c3ed6f6a340ea50dd48d65898f5d70425d404f0d99411f6e56e04584",
+        "sha256": "9f034ba1eeca53ddb339bc8f4813cb07336a849cd735559b60cdc068ecce2dc7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.1.0"
+      "version": "7.1.0"
     },
     "otp": {
       "dependency": "direct main",
@@ -1423,31 +1501,31 @@
       "dependency": "transitive",
       "description": {
         "name": "package_config",
-        "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.2.0"
     },
     "package_info_plus": {
       "dependency": "direct main",
       "description": {
         "name": "package_info_plus",
-        "sha256": "a75164ade98cb7d24cfd0a13c6408927c6b217fa60dee5a7ff5c116a58f28918",
+        "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.0.2"
+      "version": "8.3.0"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "package_info_plus_platform_interface",
-        "sha256": "ac1f4a4847f1ade8e6a87d1f39f5d7c67490738642e2542f559ec38c37489a66",
+        "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.2.0"
     },
     "password_strength": {
       "dependency": "direct main",
@@ -1463,61 +1541,51 @@
       "dependency": "direct main",
       "description": {
         "name": "path",
-        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.9.0"
-    },
-    "path_drawing": {
-      "dependency": "transitive",
-      "description": {
-        "name": "path_drawing",
-        "sha256": "bbb1934c0cbb03091af082a6389ca2080345291ef07a5fa6d6e078ba8682f977",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.1"
+      "version": "1.9.1"
     },
     "path_parsing": {
       "dependency": "transitive",
       "description": {
         "name": "path_parsing",
-        "sha256": "e3e67b1629e6f7e8100b367d3db6ba6af4b1f0bb80f64db18ef1fbabd2fa9ccf",
+        "sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.1"
+      "version": "1.1.0"
     },
     "path_provider": {
       "dependency": "direct main",
       "description": {
         "name": "path_provider",
-        "sha256": "fec0d61223fba3154d87759e3cc27fe2c8dc498f6386c6d6fc80d1afdd1bf378",
+        "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.1.5"
     },
     "path_provider_android": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "6f01f8e37ec30b07bc424b4deabac37cacb1bc7e2e515ad74486039918a37eb7",
+        "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.10"
+      "version": "2.2.17"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_foundation",
-        "sha256": "f234384a3fdd67f989b4d54a5d73ca2a6c422fa55ae694381ae0f4375cd1ea16",
+        "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.1"
     },
     "path_provider_linux": {
       "dependency": "transitive",
@@ -1553,31 +1621,31 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.2"
+      "version": "6.1.0"
     },
     "pinput": {
       "dependency": "direct main",
       "description": {
         "name": "pinput",
-        "sha256": "7bf9aa7d0eeb3da9f7d49d2087c7bc7d36cd277d2e94cc31c6da52e1ebb048d0",
+        "sha256": "8a73be426a91fefec90a7f130763ca39772d547e92f19a827cf4aa02e323d35a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.0"
+      "version": "5.0.1"
     },
     "platform": {
       "dependency": "transitive",
       "description": {
         "name": "platform",
-        "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
+        "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.5"
+      "version": "3.1.6"
     },
     "plugin_platform_interface": {
       "dependency": "transitive",
@@ -1609,55 +1677,65 @@
       "source": "hosted",
       "version": "1.5.1"
     },
+    "posix": {
+      "dependency": "transitive",
+      "description": {
+        "name": "posix",
+        "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.3"
+    },
     "privacy_screen": {
       "dependency": "direct main",
       "description": {
         "name": "privacy_screen",
-        "sha256": "b80297d2726d96e8a8341149e81a415302755f02d3af7c05c820d9e191bbfbee",
+        "sha256": "2856e3a3ed082061a5cd2a1518f1ce6367c55916fb75e5db72e5983033a1ca54",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.0.6"
+      "version": "0.0.8"
     },
     "protobuf": {
       "dependency": "direct main",
       "description": {
         "name": "protobuf",
-        "sha256": "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d",
+        "sha256": "579fe5557eae58e3adca2e999e38f02441d8aa908703854a9e0a0f47fa857731",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.0"
+      "version": "4.1.0"
     },
     "provider": {
       "dependency": "transitive",
       "description": {
         "name": "provider",
-        "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c",
+        "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.2"
+      "version": "6.1.5"
     },
     "pub_semver": {
       "dependency": "transitive",
       "description": {
         "name": "pub_semver",
-        "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "pubspec_parse": {
       "dependency": "transitive",
       "description": {
         "name": "pubspec_parse",
-        "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
+        "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.5.0"
     },
     "qr": {
       "dependency": "transitive",
@@ -1672,12 +1750,13 @@
     "qr_code_scanner": {
       "dependency": "direct main",
       "description": {
-        "name": "qr_code_scanner",
-        "sha256": "f23b68d893505a424f0bd2e324ebea71ed88465d572d26bb8d2e78a4749591fd",
-        "url": "https://pub.dev"
+        "path": ".",
+        "ref": "a2d31633d4744f72ada87cfa85d221358ab082af",
+        "resolved-ref": "a2d31633d4744f72ada87cfa85d221358ab082af",
+        "url": "https://github.com/juliuscanute/qr_code_scanner"
       },
-      "source": "hosted",
-      "version": "1.0.1"
+      "source": "git",
+      "version": "1.0.0"
     },
     "qr_flutter": {
       "dependency": "direct main",
@@ -1693,11 +1772,51 @@
       "dependency": "transitive",
       "description": {
         "name": "screen_retriever",
-        "sha256": "6ee02c8a1158e6dae7ca430da79436e3b1c9563c8cf02f524af997c201ac2b90",
+        "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.9"
+      "version": "0.2.0"
+    },
+    "screen_retriever_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_linux",
+        "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_macos",
+        "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_platform_interface",
+        "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_windows",
+        "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
     },
     "sentry": {
       "dependency": "direct main",
@@ -1723,51 +1842,51 @@
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "468c43f285207c84bcabf5737f33b914ceb8eb38398b91e5e3ad1698d1b72a52",
+        "sha256": "b2961506569e28948d75ec346c28775bb111986bb69dc6a20754a457e3d97fa0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.2"
+      "version": "11.0.0"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "share_plus_platform_interface",
-        "sha256": "6ababf341050edff57da8b6990f11f4e99eaba837865e2e6defe16d039619db5",
+        "sha256": "1032d392bc5d2095a77447a805aa3f804d2ae6a4d5eef5e6ebb3bd94c1bc19ef",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.0"
+      "version": "6.0.0"
     },
     "shared_preferences": {
       "dependency": "direct main",
       "description": {
         "name": "shared_preferences",
-        "sha256": "746e5369a43170c25816cc472ee016d3a66bc13fcf430c0bc41ad7b4b2922051",
+        "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.2"
+      "version": "2.5.3"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "480ba4345773f56acda9abf5f50bd966f581dac5d514e5fc4a18c62976bbba7e",
+        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.2"
+      "version": "2.4.10"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_foundation",
-        "sha256": "07e050c7cd39bad516f8d64c455f04508d09df104be326d8c02551590a0d513d",
+        "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.3"
+      "version": "2.5.4"
     },
     "shared_preferences_linux": {
       "dependency": "transitive",
@@ -1793,11 +1912,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_web",
-        "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e",
+        "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.3"
     },
     "shared_preferences_windows": {
       "dependency": "transitive",
@@ -1813,21 +1932,21 @@
       "dependency": "transitive",
       "description": {
         "name": "shelf",
-        "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4",
+        "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.1"
+      "version": "1.4.2"
     },
     "shelf_web_socket": {
       "dependency": "transitive",
       "description": {
         "name": "shelf_web_socket",
-        "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611",
+        "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.0"
+      "version": "3.0.0"
     },
     "shortid": {
       "dependency": "transitive",
@@ -1843,7 +1962,7 @@
       "dependency": "transitive",
       "description": "flutter",
       "source": "sdk",
-      "version": "0.0.99"
+      "version": "0.0.0"
     },
     "sodium": {
       "dependency": "transitive",
@@ -1869,31 +1988,31 @@
       "dependency": "transitive",
       "description": {
         "name": "source_gen",
-        "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832",
+        "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.0"
+      "version": "2.0.0"
     },
     "source_helper": {
       "dependency": "transitive",
       "description": {
         "name": "source_helper",
-        "sha256": "6adebc0006c37dd63fe05bca0a929b99f06402fc95aa35bf36d67f5c06de01fd",
+        "sha256": "4f81479fe5194a622cdd1713fe1ecb683a6e6c85cd8cec8e2e35ee5ab3fdf2a1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.4"
+      "version": "1.3.6"
     },
     "source_span": {
       "dependency": "transitive",
       "description": {
         "name": "source_span",
-        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
+        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.10.0"
+      "version": "1.10.1"
     },
     "sprintf": {
       "dependency": "transitive",
@@ -1908,53 +2027,82 @@
     "sqflite": {
       "dependency": "direct main",
       "description": {
-        "path": "sqflite",
-        "ref": "HEAD",
-        "resolved-ref": "699aaafa282d823b89ca568aac7a68d2c29ddab6",
-        "url": "https://github.com/tekartik/sqflite"
+        "name": "sqflite",
+        "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03",
+        "url": "https://pub.dev"
       },
-      "source": "git",
-      "version": "2.3.3+2"
+      "source": "hosted",
+      "version": "2.4.2"
+    },
+    "sqflite_android": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sqflite_android",
+        "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.1"
     },
     "sqflite_common": {
       "dependency": "transitive",
       "description": {
         "name": "sqflite_common",
-        "sha256": "2d8e607db72e9cb7748c9c6e739e2c9618320a5517de693d5a24609c4671b1a4",
+        "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4+4"
+      "version": "2.5.5"
     },
     "sqflite_common_ffi": {
       "dependency": "direct main",
       "description": {
         "name": "sqflite_common_ffi",
-        "sha256": "a6057d4c87e9260ba1ec436ebac24760a110589b9c0a859e128842eb69a7ef04",
+        "sha256": "9faa2fedc5385ef238ce772589f7718c24cdddd27419b609bb9c6f703ea27988",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3+1"
+      "version": "2.3.6"
+    },
+    "sqflite_darwin": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sqflite_darwin",
+        "sha256": "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.2"
+    },
+    "sqflite_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "sqflite_platform_interface",
+        "sha256": "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "2.4.0"
     },
     "sqlite3": {
       "dependency": "direct main",
       "description": {
         "name": "sqlite3",
-        "sha256": "45f168ae2213201b54e09429ed0c593dc2c88c924a1488d6f9c523a255d567cb",
+        "sha256": "c0503c69b44d5714e6abbf4c1f51a3c3cc42b75ce785f44404765e4635481d38",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.6"
+      "version": "2.7.6"
     },
     "stack_trace": {
       "dependency": "transitive",
       "description": {
         "name": "stack_trace",
-        "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
+        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.11.1"
+      "version": "1.12.1"
     },
     "steam_totp": {
       "dependency": "direct main",
@@ -1980,31 +2128,31 @@
       "dependency": "transitive",
       "description": {
         "name": "stream_channel",
-        "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.4"
     },
     "stream_transform": {
       "dependency": "transitive",
       "description": {
         "name": "stream_transform",
-        "sha256": "14a00e794c7c11aa145a170587321aedce29769c08d7f58b1d141da75e3b1c6f",
+        "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.1.1"
     },
     "string_scanner": {
       "dependency": "transitive",
       "description": {
         "name": "string_scanner",
-        "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
+        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.4.1"
     },
     "styled_text": {
       "dependency": "direct main",
@@ -2020,31 +2168,31 @@
       "dependency": "transitive",
       "description": {
         "name": "synchronized",
-        "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225",
+        "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.3.0+3"
+      "version": "3.3.1"
     },
     "term_glyph": {
       "dependency": "transitive",
       "description": {
         "name": "term_glyph",
-        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.1"
+      "version": "1.2.2"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
+        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.2"
+      "version": "0.7.4"
     },
     "timezone": {
       "dependency": "transitive",
@@ -2060,21 +2208,21 @@
       "dependency": "transitive",
       "description": {
         "name": "timing",
-        "sha256": "70a3b636575d4163c477e6de42f247a23b315ae20e86442bebe32d3cabf61c32",
+        "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.1"
+      "version": "1.0.2"
     },
     "tray_manager": {
       "dependency": "direct main",
       "description": {
         "name": "tray_manager",
-        "sha256": "bdc3ac6c36f3d12d871459e4a9822705ce5a1165a17fa837103bc842719bf3f7",
+        "sha256": "ad18c4cd73003097d182884bacb0578ad2865f3ab842a0ad00f6d043ed49eaf0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.4"
+      "version": "0.5.0"
     },
     "tuple": {
       "dependency": "direct main",
@@ -2090,11 +2238,21 @@
       "dependency": "transitive",
       "description": {
         "name": "typed_data",
-        "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
+        "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.4.0"
+    },
+    "ua_client_hints": {
+      "dependency": "transitive",
+      "description": {
+        "name": "ua_client_hints",
+        "sha256": "1b8759a46bfeab355252881df27f2604c01bded86aa2b578869fb1b638b23118",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.4.1"
     },
     "universal_io": {
       "dependency": "transitive",
@@ -2120,51 +2278,51 @@
       "dependency": "direct main",
       "description": {
         "name": "url_launcher",
-        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
+        "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.1"
+      "version": "6.3.2"
     },
     "url_launcher_android": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "a4e5f34f2fadf1fa7b4e69db89189056e313c9c98e8ad420e6b53677b6abc334",
+        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.11"
+      "version": "6.3.16"
     },
     "url_launcher_ios": {
       "dependency": "direct main",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "e43b677296fadce447e987a2f519dcf5f6d1e527dc35d01ffab4fff5b8a7063e",
+        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.1"
+      "version": "6.3.3"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_linux",
-        "sha256": "e2b9622b4007f97f504cd64c0128309dfb978ae66adbe944125ed9e1750f06af",
+        "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.0"
+      "version": "3.2.1"
     },
     "url_launcher_macos": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_macos",
-        "sha256": "769549c999acdb42b8bcfa7c43d72bf79a382ca7441ab18a808e101149daf672",
+        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.1"
+      "version": "3.2.2"
     },
     "url_launcher_platform_interface": {
       "dependency": "transitive",
@@ -2180,21 +2338,21 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
+        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3"
+      "version": "2.4.1"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_windows",
-        "sha256": "49c10f879746271804767cb45551ec5592cdab00ee105c06dddde1a98f73b185",
+        "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.2"
+      "version": "3.1.4"
     },
     "uuid": {
       "dependency": "direct main",
@@ -2210,31 +2368,31 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics",
-        "sha256": "27d5fefe86fb9aace4a9f8375b56b3c292b64d8c04510df230f849850d912cb7",
+        "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.15"
+      "version": "1.1.19"
     },
     "vector_graphics_codec": {
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_codec",
-        "sha256": "c86987475f162fadff579e7320c7ddda04cd2fdeffbe1129227a85d9ac9e03da",
+        "sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.11+1"
+      "version": "1.1.13"
     },
     "vector_graphics_compiler": {
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad",
+        "sha256": "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.16"
+      "version": "1.1.17"
     },
     "vector_math": {
       "dependency": "transitive",
@@ -2250,61 +2408,61 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
+        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.2.5"
+      "version": "15.0.0"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
+        "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.2"
     },
     "web": {
       "dependency": "transitive",
       "description": {
         "name": "web",
-        "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "web_socket": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket",
-        "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
+        "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.6"
+      "version": "1.0.1"
     },
     "web_socket_channel": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket_channel",
-        "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f",
+        "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.3"
     },
     "win32": {
       "dependency": "direct main",
       "description": {
         "name": "win32",
-        "sha256": "4d45dc9069dba4619dc0ebd93c7cec5e66d8482cb625a370ac806dcc8165f2ec",
+        "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.5.5"
+      "version": "5.13.0"
     },
     "win32_registry": {
       "dependency": "transitive",
@@ -2320,11 +2478,11 @@
       "dependency": "direct main",
       "description": {
         "name": "window_manager",
-        "sha256": "ab8b2a7f97543d3db2b506c9d875e637149d48ee0c6a5cb5f5fd6e0dac463792",
+        "sha256": "51d50168ab267d344b975b15390426b1243600d436770d3f13de67e55b05ec16",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.2"
+      "version": "0.5.0"
     },
     "xdg_directories": {
       "dependency": "direct main",
@@ -2360,15 +2518,15 @@
       "dependency": "transitive",
       "description": {
         "name": "yaml",
-        "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
+        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.2"
+      "version": "3.1.3"
     }
   },
   "sdks": {
-    "dart": ">=3.5.0 <4.0.0",
-    "flutter": ">=3.24.0"
+    "dart": ">=3.7.2 <4.0.0",
+    "flutter": ">=3.29.0"
   }
 }
diff --git a/pkgs/by-name/en/ente-auth/update.sh b/pkgs/by-name/en/ente-auth/update.sh
index fe46cf3e4d72..caec2206d422 100755
--- a/pkgs/by-name/en/ente-auth/update.sh
+++ b/pkgs/by-name/en/ente-auth/update.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/env nix-shell
-#!nix-shell -i bash -p curl gojq nix-prefetch-github common-updater-scripts
+#!nix-shell -i bash -p curl gojq nix-prefetch-github nix-prefetch-git common-updater-scripts
 
 set -eou pipefail
 pkg_dir="$(dirname "$0")"

From 45f0397750e44b089f17769824fa1faf1c9ea3fc Mon Sep 17 00:00:00 2001
From: Leon Klingele <git@leonklingele.de>
Date: Wed, 29 Oct 2025 23:19:09 +0100
Subject: [PATCH 4047/6226] golangci-lint: 2.5.0 -> 2.6.0

---
 pkgs/by-name/go/golangci-lint/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix
index 6d7f1fb87be2..2c82d32881fc 100644
--- a/pkgs/by-name/go/golangci-lint/package.nix
+++ b/pkgs/by-name/go/golangci-lint/package.nix
@@ -14,16 +14,16 @@
 
 buildGo125Module (finalAttrs: {
   pname = "golangci-lint";
-  version = "2.5.0";
+  version = "2.6.0";
 
   src = fetchFromGitHub {
     owner = "golangci";
     repo = "golangci-lint";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7dHr7cd+yYofIb+yR2kKfj0k0onLH2W/YuxNor7zPeo=";
+    hash = "sha256-lSOtFG760zkN0YYaSms42sv7OYMGymNHDVfstVau8iY=";
   };
 
-  vendorHash = "sha256-QEYbFz7SJxLMblkNqaRLDn/PO+mtSPvNYiEUmZh0sLQ=";
+  vendorHash = "sha256-h0rAqxUJlPlCPGi0eNl8oMXicpauZZmCQzAsTDGwHc4=";
 
   subPackages = [ "cmd/golangci-lint" ];
 

From 2e6a075a72751446cb77a9c88fe1e9c2d600e04c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 22:55:16 +0000
Subject: [PATCH 4048/6226] vfox: 0.9.1 -> 0.9.2

---
 pkgs/by-name/vf/vfox/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vf/vfox/package.nix b/pkgs/by-name/vf/vfox/package.nix
index 752de83ed93e..5333cdc423a5 100644
--- a/pkgs/by-name/vf/vfox/package.nix
+++ b/pkgs/by-name/vf/vfox/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "vfox";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchFromGitHub {
     owner = "version-fox";
     repo = "vfox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lVhw2OB4TVkqYbI+kGvBX2RMisc+1aF3Sl6z/kshmZE=";
+    hash = "sha256-Dtu0A+BC/9sypnWvA8XOlmQFPsV5LUGCXpdarYeCdlU=";
   };
 
   vendorHash = "sha256-+5hJMip3wAR1k6n21I3QFYe++nw4J4Ip+43EujQl2ec=";

From 99ee03e99546a84c8a40150afbb7a4c60d0a7cad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 23:02:24 +0000
Subject: [PATCH 4049/6226] google-java-format: 1.31.0 -> 1.32.0

---
 pkgs/by-name/go/google-java-format/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/google-java-format/package.nix b/pkgs/by-name/go/google-java-format/package.nix
index 481ac508b5e4..2d56ace21659 100644
--- a/pkgs/by-name/go/google-java-format/package.nix
+++ b/pkgs/by-name/go/google-java-format/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "google-java-format";
-  version = "1.31.0";
+  version = "1.32.0";
 
   src = fetchurl {
     url = "https://github.com/google/google-java-format/releases/download/v${version}/google-java-format-${version}-all-deps.jar";
-    sha256 = "sha256-jUv6Lck4iCASp4nMaEl2ivpK+06wEwjGtx+R8I4sVQg=";
+    sha256 = "sha256-uO/EpRIkI5Kq7Y+21bqlNz5wUBkPY90FxnuOwlXAF/8=";
   };
 
   dontUnpack = true;

From 40856f9ca8682d20508c382d8e948aad557747da Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 28 Oct 2025 20:59:59 +0000
Subject: [PATCH 4050/6226] python3Packages.torchcodec: init at 0.8.1

---
 .../python-modules/torchcodec/default.nix     | 171 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 2 files changed, 173 insertions(+)
 create mode 100644 pkgs/development/python-modules/torchcodec/default.nix

diff --git a/pkgs/development/python-modules/torchcodec/default.nix b/pkgs/development/python-modules/torchcodec/default.nix
new file mode 100644
index 000000000000..fe26127cef26
--- /dev/null
+++ b/pkgs/development/python-modules/torchcodec/default.nix
@@ -0,0 +1,171 @@
+{
+  lib,
+  stdenv,
+  config,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # nativeBuildInputs
+  pkg-config,
+
+  # buildInputs
+  ffmpeg,
+  cudaPackages,
+
+  # build-system
+  cmake,
+  setuptools,
+  torch,
+
+  # tests
+  pytestCheckHook,
+  torchvision,
+
+  cudaSupport ? config.cudaSupport,
+}:
+
+buildPythonPackage rec {
+  pname = "torchcodec";
+  version = "0.8.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "meta-pytorch";
+    repo = "torchcodec";
+    tag = "v${version}";
+    hash = "sha256-trYS4sRPSNmQLHZZS174zxbu74LT+39N23zOJdWwN6Q=";
+  };
+
+  postPatch = ''
+    substituteInPlace \
+      test/utils.py \
+      test/test_encoders.py \
+      --replace-fail \
+        '"ffprobe"' \
+        '"${lib.getExe' ffmpeg "ffprobe"}"'
+
+    substituteInPlace \
+      test/test_ops.py \
+      test/test_encoders.py \
+      --replace-fail \
+        '"ffmpeg"' \
+        '"${lib.getExe ffmpeg}"'
+
+    substituteInPlace test/test_transform_ops.py \
+      --replace-fail \
+        'ffmpeg_cli = "ffmpeg"' \
+        'ffmpeg_cli = "${lib.getExe ffmpeg}"'
+  '';
+
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+  ];
+
+  buildInputs = [
+    ffmpeg
+  ]
+  ++ lib.optionals cudaSupport (
+    with cudaPackages;
+    [
+      cuda_cudart
+      cuda_nvrtc
+      libcublas # cublas_v2.h
+      libcusolver # cusolverDn.h
+      libcusparse # cusparse.h
+      libnpp # nppicc
+    ]
+  );
+
+  build-system = [
+    cmake
+    setuptools
+    torch
+  ];
+  dontUseCmakeConfigure = true;
+
+  dependencies = [
+    torch
+  ];
+
+  env = {
+    # Upstream (Meta) is cautious with linking against GPL ffmpeg
+    # We explicitly want to link against our packages ffmpeg
+    I_CONFIRM_THIS_IS_NOT_A_LICENSE_VIOLATION = true;
+
+    ENABLE_CUDA = cudaSupport;
+  };
+
+  pythonImportsCheck = [ "torchcodec" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    torchvision
+  ];
+
+  disabledTests =
+    lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
+      # AssertionError: index 0
+      "test_get_frames_played_at"
+
+      # AssertionError: Tensor-likes are not equal!
+      "test_against_cli"
+      "test_against_ref"
+      "test_color_conversion_library"
+      "test_color_conversion_library_with_dimension_order"
+      "test_compile"
+      "test_compile_seek_and_next"
+      "test_create_decoder"
+      "test_crop_transform"
+      "test_custom_frame_mappings_json_and_bytes"
+      "test_file_like_decoding"
+      "test_get_frame_at"
+      "test_get_frame_at_av1"
+      "test_get_frame_at_index"
+      "test_get_frame_at_pts"
+      "test_get_frame_played_at"
+      "test_get_frame_played_at_h265"
+      "test_get_frame_with_info_at_index"
+      "test_get_frames_at"
+      "test_get_frames_at_indices"
+      "test_get_frames_at_indices_negative_indices"
+      "test_get_frames_by_pts_in_range"
+      "test_get_frames_in_range"
+      "test_get_frames_in_range_slice_indices_syntax"
+      "test_get_frames_with_missing_num_frames_metadata"
+      "test_getitem_int"
+      "test_getitem_numpy_int"
+      "test_getitem_slice"
+      "test_iteration"
+      "test_seek_and_next"
+      "test_seek_mode_custom_frame_mappings"
+      "test_seek_to_negative_pts"
+      "test_throws_exception_at_eof"
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
+      # RuntimeError: Invalid AVIO context holder
+      "test_1d_samples"
+      "test_against_cli"
+      "test_against_to_file"
+      "test_against_to_file"
+      "test_contiguit"
+      "test_encode_to_tensor_long_outpu"
+      "test_round_trip"
+      "test_video_encoder_round_trip"
+
+      # RuntimeError: Requested next frame while there are no more frames left to decode
+      "test_next"
+      "test_throws_exception_at_eof"
+      "test_throws_exception_if_seek_too_far"
+    ];
+
+  meta = {
+    description = "PyTorch media decoding and encoding";
+    homepage = "https://github.com/meta-pytorch/torchcodec";
+    changelog = "https://github.com/meta-pytorch/torchcodec/releases/tag/${src.tag}";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 579114e4f01b..e4334ca2a112 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -18685,6 +18685,8 @@ self: super: with self; {
 
   torchbench = callPackage ../development/python-modules/torchbench { };
 
+  torchcodec = callPackage ../development/python-modules/torchcodec { };
+
   torchcrepe = callPackage ../development/python-modules/torchcrepe { };
 
   torchdiffeq = callPackage ../development/python-modules/torchdiffeq { };

From 3c128fa7c5f762fc41fcc3e7b01a4bac9261d065 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 30 Oct 2025 00:08:44 +0100
Subject: [PATCH 4051/6226] paperless-ngx: 2.19.2 -> 2.19.3

Diff: https://github.com/paperless-ngx/paperless-ngx/compare/v2.19.2...v2.19.3

Changelog: https://github.com/paperless-ngx/paperless-ngx/releases/tag/v2.19.3
---
 pkgs/by-name/pa/paperless-ngx/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/paperless-ngx/package.nix b/pkgs/by-name/pa/paperless-ngx/package.nix
index 780ad5ffd1af..30d6f1f9d595 100644
--- a/pkgs/by-name/pa/paperless-ngx/package.nix
+++ b/pkgs/by-name/pa/paperless-ngx/package.nix
@@ -28,13 +28,13 @@
   xorg,
 }:
 let
-  version = "2.19.2";
+  version = "2.19.3";
 
   src = fetchFromGitHub {
     owner = "paperless-ngx";
     repo = "paperless-ngx";
     tag = "v${version}";
-    hash = "sha256-+GIDtV6jsY7ZA8CV4ZmVoffFVvaJxhfnau9vu/mr+CY=";
+    hash = "sha256-VhBo61jW4lZeJYJcRRuVuYbR4enpM2JD47DDDlFJuao=";
   };
 
   python = python3.override {

From c13f744cdf287c4c2d85422668be22d0e266436d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 16 Oct 2025 12:26:02 +0200
Subject: [PATCH 4052/6226] nixos/actual: add environmentFile option

---
 nixos/modules/services/web-apps/actual.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/nixos/modules/services/web-apps/actual.nix b/nixos/modules/services/web-apps/actual.nix
index af15471521f1..1ece9f7f04f1 100644
--- a/nixos/modules/services/web-apps/actual.nix
+++ b/nixos/modules/services/web-apps/actual.nix
@@ -32,6 +32,16 @@ in
       description = "Whether to open the firewall for the specified port.";
     };
 
+    environmentFile = mkOption {
+      type = types.nullOr types.path;
+      default = null;
+      description = ''
+        Environment file for specifying additional settings such as secrets.
+
+        See <https://actualbudget.org/docs/config/oauth-auth#environment-variables>.
+      '';
+    };
+
     settings = mkOption {
       default = { };
       description = "Server settings, refer to [the documentation](https://actualbudget.org/docs/config/) for available options.";
@@ -76,6 +86,7 @@ in
         Group = "actual";
         StateDirectory = "actual";
         WorkingDirectory = dataDir;
+        EnvironmentFile = cfg.environmentFile;
         LimitNOFILE = "1048576";
         PrivateTmp = true;
         PrivateDevices = true;

From 69b3f65469642046d2f620cdec4b828d1af35188 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 28 Oct 2025 20:15:52 +0000
Subject: [PATCH 4053/6226] python3Packages.lerobot: 0.3.3 -> 0.4.0

Diff: https://github.com/huggingface/lerobot/compare/v0.3.3...v0.4.0

Changelog: https://github.com/huggingface/lerobot/releases/tag/v0.4.0
---
 .../python-modules/lerobot/default.nix        | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/lerobot/default.nix b/pkgs/development/python-modules/lerobot/default.nix
index c7622536b604..daec5bd39c0b 100644
--- a/pkgs/development/python-modules/lerobot/default.nix
+++ b/pkgs/development/python-modules/lerobot/default.nix
@@ -8,6 +8,7 @@
   setuptools,
 
   # dependencies
+  accelerate,
   av,
   datasets,
   deepdiff,
@@ -26,6 +27,7 @@
   rerun-sdk,
   termcolor,
   torch,
+  torchcodec,
   torchvision,
   wandb,
 
@@ -36,14 +38,14 @@
 
 buildPythonPackage rec {
   pname = "lerobot";
-  version = "0.3.3";
+  version = "0.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "lerobot";
     tag = "v${version}";
-    hash = "sha256-JaspLUuSupmk6QD+mUVLuCSczTNjy0w+nsLBcy7tXnE=";
+    hash = "sha256-RVe1X0qBPm+okO3Gi/UdkuvuX0m4RlbhIs+NJLlC9wU=";
   };
 
   # ValueError: mutable default <class 'lerobot.configs.types.PolicyFeature'> for field value is not allowed: use default_factory
@@ -73,7 +75,9 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
+    accelerate
     av
+    cmake
     datasets
     deepdiff
     diffusers
@@ -91,9 +95,13 @@ buildPythonPackage rec {
     rerun-sdk
     termcolor
     torch
+    torchcodec
     torchvision
     wandb
-  ];
+  ]
+  ++ imageio.optional-dependencies.ffmpeg
+  ++ huggingface-hub.optional-dependencies.hf_transfer
+  ++ huggingface-hub.optional-dependencies.cli;
 
   pythonImportsCheck = [ "lerobot" ];
 
@@ -105,6 +113,7 @@ buildPythonPackage rec {
   disabledTests = [
     # RuntimeError: OpenCVCamera(/build/source/tests/artifacts/cameras/image_480x270.png) read failed
     "test_async_read"
+    "test_fourcc_with_camer"
     "test_read"
     "test_rotation"
 
@@ -134,6 +143,11 @@ buildPythonPackage rec {
     "test_cosine_decay_with_warmup_scheduler"
     "test_diffuser_scheduler"
     "test_vqbet_scheduler"
+
+    # AssertionError: Regex pattern did not match.
+    #  Regex: "Can't instantiate abstract class NonCallableStep with abstract method __call_"
+    #  Input: "Can't instantiate abstract class NonCallableStep without an implementation for abstract method '__call__'"
+    "test_construction_rejects_step_without_call"
   ];
 
   meta = {

From ad36c9eeff049c14d1a635cb612472b040c34c9e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 23:26:15 +0000
Subject: [PATCH 4054/6226] darkly-qt5: 0.5.23 -> 0.5.24

---
 pkgs/by-name/da/darkly/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/da/darkly/package.nix b/pkgs/by-name/da/darkly/package.nix
index b82f8e266ab2..bf9e1f77ef5f 100644
--- a/pkgs/by-name/da/darkly/package.nix
+++ b/pkgs/by-name/da/darkly/package.nix
@@ -13,13 +13,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "darkly-qt${qtMajorVersion}";
-  version = "0.5.23";
+  version = "0.5.24";
 
   src = fetchFromGitHub {
     owner = "Bali10050";
     repo = "Darkly";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BENROvRjnKLjCc1qwGgScfk6WIdHGwz4vZhsmfa///Q=";
+    hash = "sha256-iyvYHJn9K+cnW2+icxGA3qm69W8RpCz1v8+rb2U/KzQ=";
   };
 
   nativeBuildInputs = [

From de7d5d6aa5ee2234cabf8a85b68430a788f34136 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Wed, 29 Oct 2025 19:26:20 -0400
Subject: [PATCH 4055/6226] python313Packages.monai-deploy: mark broken

Package was broken in a recent mass update as it depends on NVIDIA holoscan and holoscan-cli, which are not in Nixpkgs.
Reverting also seems suboptimal as the previously working version of MONAI Deploy is quite dated.
---
 .../python-modules/monai-deploy/default.nix           | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/monai-deploy/default.nix b/pkgs/development/python-modules/monai-deploy/default.nix
index 3ae67044ff93..f3b5d6657ae2 100644
--- a/pkgs/development/python-modules/monai-deploy/default.nix
+++ b/pkgs/development/python-modules/monai-deploy/default.nix
@@ -9,6 +9,7 @@
   pytestCheckHook,
   pythonOlder,
   setuptools,
+  tritonclient,
   typeguard,
   versioneer,
 }:
@@ -18,8 +19,6 @@ buildPythonPackage rec {
   version = "3.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "Project-MONAI";
     repo = "monai-deploy-app-sdk";
@@ -43,6 +42,7 @@ buildPythonPackage rec {
     numpy
     networkx
     colorama
+    tritonclient
     typeguard
   ];
 
@@ -64,12 +64,13 @@ buildPythonPackage rec {
     # like highdicom and pydicom
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Framework and tools to design, develop and verify AI applications in healthcare imaging";
     mainProgram = "monai-deploy";
     homepage = "https://monai.io/deploy.html";
     changelog = "https://github.com/Project-MONAI/monai-deploy-app-sdk/blob/main/docs/source/release_notes/${src.tag}.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ bcdarwin ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ bcdarwin ];
+    broken = true; # requires holoscan and holoscan-cli, not in Nixpkgs
   };
 }

From aa1250b5e9e426c2d640cbdedd1b3908ca60d717 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 27 Oct 2025 10:19:34 +0800
Subject: [PATCH 4056/6226] expidus: use flutterPackages.v3_35

---
 pkgs/desktops/expidus/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/expidus/default.nix b/pkgs/desktops/expidus/default.nix
index 2072455e2f6d..3506e1e51699 100644
--- a/pkgs/desktops/expidus/default.nix
+++ b/pkgs/desktops/expidus/default.nix
@@ -1,10 +1,10 @@
 { callPackage, flutterPackages }:
 {
   calculator = callPackage ./calculator {
-    flutter = flutterPackages.v3_24;
+    flutter = flutterPackages.v3_35;
   };
 
   file-manager = callPackage ./file-manager {
-    flutter = flutterPackages.v3_24;
+    flutter = flutterPackages.v3_35;
   };
 }

From c3cc535c62f8a4f1f5cf0598aa06cd068a13a1bd Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 27 Oct 2025 11:58:28 +0800
Subject: [PATCH 4057/6226] rustdesk-flutter: 1.4.1 -> 1.4.3

---
 .../ru/rustdesk-flutter/gitHashes.json        |  10 +
 pkgs/by-name/ru/rustdesk-flutter/package.nix  |  23 +-
 .../ru/rustdesk-flutter/pubspec.lock.json     | 304 +++++++++---------
 pkgs/top-level/all-packages.nix               |   4 -
 4 files changed, 166 insertions(+), 175 deletions(-)
 create mode 100644 pkgs/by-name/ru/rustdesk-flutter/gitHashes.json

diff --git a/pkgs/by-name/ru/rustdesk-flutter/gitHashes.json b/pkgs/by-name/ru/rustdesk-flutter/gitHashes.json
new file mode 100644
index 000000000000..4fcdba63036a
--- /dev/null
+++ b/pkgs/by-name/ru/rustdesk-flutter/gitHashes.json
@@ -0,0 +1,10 @@
+{
+  "dash_chat_2": "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow=",
+  "desktop_multi_window": "sha256-NOe0jMcH02c0TDTtv62OMTR/qDPnRQrRe73vXDuEq8Q=",
+  "dynamic_layouts": "sha256-eFp1YVI6vI2HRgtE5nTqGZIylB226H0O8kuxy9ypuf8=",
+  "flutter_gpu_texture_renderer": "sha256-EZa1FOMbcwdVs/m0vsUvlHv+MifPby4I97ZFe1bqmwQ=",
+  "texture_rgba_renderer": "sha256-V/bmT/5x+Bt7kdjLTkgkoXdBcFVXxPyp9kIUhf+Rnt4=",
+  "uni_links": "sha256-O2BgNwu5HFRQyaNkskWHORx8pZhdwEjtljvw1+zFzfo=",
+  "window_manager": "sha256-40mwj4D8W2xW8C7RshTjOhelOiLPM7uU9rsF4NvQn8c=",
+  "window_size": "sha256-XelNtp7tpZ91QCEcvewVphNUtgQX7xrp5QP0oFo6DgM="
+}
diff --git a/pkgs/by-name/ru/rustdesk-flutter/package.nix b/pkgs/by-name/ru/rustdesk-flutter/package.nix
index dc861b228d97..05459b33fc5c 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/package.nix
+++ b/pkgs/by-name/ru/rustdesk-flutter/package.nix
@@ -4,7 +4,7 @@
   cargo,
   copyDesktopItems,
   fetchFromGitHub,
-  flutter,
+  flutter329,
   ffmpeg,
   gst_all_1,
   fuse3,
@@ -56,22 +56,22 @@ let
   };
 
   ffigen = callPackage ./ffigen {
-    inherit flutter;
+    flutter = flutter329;
   };
 
   sharedLibraryExt = rustc.stdenv.hostPlatform.extensions.sharedLibrary;
 
 in
-flutter.buildFlutterApplication rec {
+flutter329.buildFlutterApplication rec {
   pname = "rustdesk";
-  version = "1.4.1";
+  version = "1.4.3";
 
   src = fetchFromGitHub {
     owner = "rustdesk";
     repo = "rustdesk";
     tag = version;
     fetchSubmodules = true;
-    hash = "sha256-nS8KjLzgdzgvn5mM1lJL2vFk0g/ZUZBvdkjyC+MdHDE=";
+    hash = "sha256-TCy1AyqBHqrIlip2ZqdzIaYHjIYddThI+YmbcQHaDqQ=";
   };
 
   strictDeps = true;
@@ -81,16 +81,7 @@ flutter.buildFlutterApplication rec {
   sourceRoot = "${src.name}/flutter";
   # curl https://raw.githubusercontent.com/rustdesk/rustdesk/1.4.1/flutter/pubspec.lock | yq > pubspec.lock.json
   pubspecLock = lib.importJSON ./pubspec.lock.json;
-  gitHashes = {
-    dash_chat_2 = "sha256-J5Bc6CeCoRGN870aNEVJ2dkQNb+LOIZetfG2Dsfz5Ow=";
-    desktop_multi_window = "sha256-NOe0jMcH02c0TDTtv62OMTR/qDPnRQrRe73vXDuEq8Q=";
-    dynamic_layouts = "sha256-eFp1YVI6vI2HRgtE5nTqGZIylB226H0O8kuxy9ypuf8=";
-    flutter_gpu_texture_renderer = "sha256-EZa1FOMbcwdVs/m0vsUvlHv+MifPby4I97ZFe1bqmwQ=";
-    window_manager = "sha256-40mwj4D8W2xW8C7RshTjOhelOiLPM7uU9rsF4NvQn8c=";
-    window_size = "sha256-XelNtp7tpZ91QCEcvewVphNUtgQX7xrp5QP0oFo6DgM=";
-    texture_rgba_renderer = "sha256-V/bmT/5x+Bt7kdjLTkgkoXdBcFVXxPyp9kIUhf+Rnt4=";
-    uni_links = "sha256-O2BgNwu5HFRQyaNkskWHORx8pZhdwEjtljvw1+zFzfo=";
-  };
+  gitHashes = lib.importJSON ./gitHashes.json;
 
   # Configure the Rust build
   cargoRoot = "..";
@@ -101,7 +92,7 @@ flutter.buildFlutterApplication rec {
       src
       patches
       ;
-    hash = "sha256-ecLR6cMVDrTKeoTE5Yxkw5dN4ceAm+RD7BVXwIQ1fnk=";
+    hash = "sha256-AOKsTPuq1VD6MR4z1K9l2Clbl8d/7IijTsnMRgBXvyw=";
   };
 
   dontCargoBuild = true;
diff --git a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json
index 98d5e9d4d772..848db8174d75 100644
--- a/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json
+++ b/pkgs/by-name/ru/rustdesk-flutter/pubspec.lock.json
@@ -4,17 +4,11 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834",
+        "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "72.0.0"
-    },
-    "_macros": {
-      "dependency": "transitive",
-      "description": "dart",
-      "source": "sdk",
-      "version": "0.3.2"
+      "version": "85.0.0"
     },
     "after_layout": {
       "dependency": "transitive",
@@ -30,31 +24,31 @@
       "dependency": "transitive",
       "description": {
         "name": "analyzer",
-        "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139",
+        "sha256": "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.7.0"
+      "version": "7.7.1"
     },
     "animations": {
       "dependency": "transitive",
       "description": {
         "name": "animations",
-        "sha256": "d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb",
+        "sha256": "a8031b276f0a7986ac907195f10ca7cd04ecf2a8a566bd6dbe03018a9b02b427",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.11"
+      "version": "2.1.0"
     },
     "archive": {
       "dependency": "transitive",
       "description": {
         "name": "archive",
-        "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
+        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.6.1"
+      "version": "4.0.7"
     },
     "args": {
       "dependency": "transitive",
@@ -130,11 +124,11 @@
       "dependency": "transitive",
       "description": {
         "name": "build",
-        "sha256": "80184af8b6cb3e5c1c4ec6d8544d27711700bc3e6d2efad04238c7b5290889f0",
+        "sha256": "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.5.4"
     },
     "build_cli_annotations": {
       "dependency": "transitive",
@@ -150,51 +144,51 @@
       "dependency": "transitive",
       "description": {
         "name": "build_config",
-        "sha256": "bf80fcfb46a29945b423bd9aad884590fb1dc69b330a4d4700cac476af1708d1",
+        "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "build_daemon": {
       "dependency": "transitive",
       "description": {
         "name": "build_daemon",
-        "sha256": "79b2aef6ac2ed00046867ed354c88778c9c0f029df8a20fe10b5436826721ef9",
+        "sha256": "409002f1adeea601018715d613115cfaf0e31f512cb80ae4534c79867ae2363d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.2"
+      "version": "4.1.0"
     },
     "build_resolvers": {
       "dependency": "transitive",
       "description": {
         "name": "build_resolvers",
-        "sha256": "339086358431fa15d7eca8b6a36e5d783728cf025e559b834f4609a1fcfb7b0a",
+        "sha256": "ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.5.4"
     },
     "build_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "build_runner",
-        "sha256": "028819cfb90051c6b5440c7e574d1896f8037e3c96cf17aaeb054c9311cfbf4d",
+        "sha256": "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.13"
+      "version": "2.5.4"
     },
     "build_runner_core": {
       "dependency": "transitive",
       "description": {
         "name": "build_runner_core",
-        "sha256": "f8126682b87a7282a339b871298cc12009cb67109cfa1614d6436fb0289193e0",
+        "sha256": "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.3.2"
+      "version": "9.1.2"
     },
     "built_collection": {
       "dependency": "transitive",
@@ -210,11 +204,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "082001b5c3dc495d4a42f1d5789990505df20d8547d42507c29050af6933ee27",
+        "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.10.1"
+      "version": "8.12.0"
     },
     "cached_network_image": {
       "dependency": "transitive",
@@ -250,11 +244,11 @@
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
+        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.0"
     },
     "charcode": {
       "dependency": "transitive",
@@ -290,31 +284,31 @@
       "dependency": "transitive",
       "description": {
         "name": "clock",
-        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+        "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "code_builder": {
       "dependency": "transitive",
       "description": {
         "name": "code_builder",
-        "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e",
+        "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.10.1"
+      "version": "4.11.0"
     },
     "collection": {
       "dependency": "transitive",
       "description": {
         "name": "collection",
-        "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.18.0"
+      "version": "1.19.1"
     },
     "contextmenu": {
       "dependency": "direct main",
@@ -370,11 +364,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "7856d364b589d1f08986e140938578ed36ed948581fbc3bc9aef1805039ac5ab",
+        "sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.7"
+      "version": "3.1.1"
     },
     "dash_chat_2": {
       "dependency": "direct main",
@@ -442,11 +436,11 @@
       "dependency": "transitive",
       "description": {
         "name": "device_info_plus_platform_interface",
-        "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2",
+        "sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.0.2"
+      "version": "7.0.3"
     },
     "draggable_float_widget": {
       "dependency": "direct main",
@@ -493,11 +487,11 @@
       "dependency": "direct main",
       "description": {
         "name": "extended_text",
-        "sha256": "38c1cac571d6eaf406f4b80040c1f88561e7617ad90795aac6a1be0a8d0bb676",
+        "sha256": "sha256-2PSm4mdlBbVNwNX16N6QIGZ7QC6cGzqLAwqD5WjJllQ=",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.0.0"
+      "version": "15.0.2"
     },
     "extended_text_library": {
       "dependency": "transitive",
@@ -523,11 +517,11 @@
       "dependency": "direct main",
       "description": {
         "name": "ffi",
-        "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
+        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.1.4"
     },
     "ffigen": {
       "dependency": "direct dev",
@@ -573,11 +567,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_macos",
-        "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc",
+        "sha256": "19124ff4a3d8864fdc62072b6a2ef6c222d55a3404fe14893a3c02744907b60c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.4+2"
+      "version": "0.9.4+4"
     },
     "file_selector_platform_interface": {
       "dependency": "transitive",
@@ -613,21 +607,21 @@
       "dependency": "direct main",
       "description": {
         "name": "flex_color_picker",
-        "sha256": "12dc855ae8ef5491f529b1fc52c655f06dcdf4114f1f7fdecafa41eec2ec8d79",
+        "sha256": "8f753a1a026a13ea5cc5eddbae3ceb886f2537569ab2e5208efb1e3bb5af72ff",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.6.0"
+      "version": "3.7.1"
     },
     "flex_seed_scheme": {
       "dependency": "transitive",
       "description": {
         "name": "flex_seed_scheme",
-        "sha256": "7639d2c86268eff84a909026eb169f008064af0fb3696a651b24b0fa24a40334",
+        "sha256": "b06d8b367b84cbf7ca5c5603c858fa5edae88486c4e4da79ac1044d73b6c62ec",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.4.1"
+      "version": "3.5.1"
     },
     "flutter": {
       "dependency": "direct main",
@@ -796,11 +790,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_svg",
-        "sha256": "d44bf546b13025ec7353091516f6881f1d4c633993cb109c3916c3a0159dadf1",
+        "sha256": "b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.2.1"
     },
     "flutter_web_plugins": {
       "dependency": "transitive",
@@ -812,11 +806,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "freezed",
-        "sha256": "44c19278dd9d89292cf46e97dc0c1e52ce03275f40a97c5a348e802a924bf40e",
+        "sha256": "59a584c24b3acdc5250bb856d0d3e9c0b798ed14a4af1ddb7dc1c7b41df91c9c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.7"
+      "version": "2.5.8"
     },
     "freezed_annotation": {
       "dependency": "direct main",
@@ -862,11 +856,11 @@
       "dependency": "direct main",
       "description": {
         "name": "google_fonts",
-        "sha256": "b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82",
+        "sha256": "517b20870220c48752eafa0ba1a797a092fb22df0d89535fd9991e86ee2cdd9c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.2.1"
+      "version": "6.3.2"
     },
     "graphs": {
       "dependency": "transitive",
@@ -892,11 +886,11 @@
       "dependency": "direct main",
       "description": {
         "name": "http",
-        "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
+        "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.5.0"
     },
     "http_multi_server": {
       "dependency": "transitive",
@@ -912,11 +906,11 @@
       "dependency": "transitive",
       "description": {
         "name": "http_parser",
-        "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
+        "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.2"
+      "version": "4.1.2"
     },
     "icons_launcher": {
       "dependency": "direct dev",
@@ -932,91 +926,91 @@
       "dependency": "direct main",
       "description": {
         "name": "image",
-        "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d",
+        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.3.0"
+      "version": "4.5.4"
     },
     "image_picker": {
       "dependency": "direct main",
       "description": {
         "name": "image_picker",
-        "sha256": "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a",
+        "sha256": "736eb56a911cf24d1859315ad09ddec0b66104bc41a7f8c5b96b4e2620cf5041",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.2.0"
     },
     "image_picker_android": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_android",
-        "sha256": "82652a75e3dd667a91187769a6a2cc81bd8c111bbead698d8e938d2b63e5e89a",
+        "sha256": "28f3987ca0ec702d346eae1d90eda59603a2101b52f1e234ded62cff1d5cfa6e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+21"
+      "version": "0.8.13+1"
     },
     "image_picker_for_web": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_for_web",
-        "sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83",
+        "sha256": "40c2a6a0da15556dc0f8e38a3246064a971a9f512386c3339b89f76db87269b6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.6"
+      "version": "3.1.0"
     },
     "image_picker_ios": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_ios",
-        "sha256": "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100",
+        "sha256": "eb06fe30bab4c4497bad449b66448f50edcc695f1c59408e78aa3a8059eb8f0e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+2"
+      "version": "0.8.13"
     },
     "image_picker_linux": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_linux",
-        "sha256": "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9",
+        "sha256": "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+2"
+      "version": "0.2.2"
     },
     "image_picker_macos": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_macos",
-        "sha256": "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1",
+        "sha256": "d58cd9d67793d52beefd6585b12050af0a7663c0c2a6ece0fb110a35d6955e04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+2"
+      "version": "0.2.2"
     },
     "image_picker_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_platform_interface",
-        "sha256": "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0",
+        "sha256": "567e056716333a1647c64bb6bd873cff7622233a5c3f694be28a583d4715690c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.10.1"
+      "version": "2.11.1"
     },
     "image_picker_windows": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_windows",
-        "sha256": "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb",
+        "sha256": "d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.2"
     },
     "intl": {
       "dependency": "direct overridden",
@@ -1078,16 +1072,6 @@
       "source": "hosted",
       "version": "1.3.0"
     },
-    "macros": {
-      "dependency": "transitive",
-      "description": {
-        "name": "macros",
-        "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.1.2-main.4"
-    },
     "matcher": {
       "dependency": "transitive",
       "description": {
@@ -1112,11 +1096,11 @@
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.15.0"
+      "version": "1.16.0"
     },
     "mime": {
       "dependency": "transitive",
@@ -1192,11 +1176,11 @@
       "dependency": "direct main",
       "description": {
         "name": "path",
-        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.9.0"
+      "version": "1.9.1"
     },
     "path_parsing": {
       "dependency": "transitive",
@@ -1222,21 +1206,21 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "4adf4fd5423ec60a29506c76581bc05854c55e3a0b72d35bb28d661c9686edf2",
+        "sha256": "3b4c1fc3aa55ddc9cd4aa6759984330d5c8e66aa7702a6223c61540dc6380c37",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.15"
+      "version": "2.2.19"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_foundation",
-        "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
+        "sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2"
     },
     "path_provider_linux": {
       "dependency": "transitive",
@@ -1292,11 +1276,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.2"
+      "version": "6.1.0"
     },
     "platform": {
       "dependency": "transitive",
@@ -1322,21 +1306,31 @@
       "dependency": "transitive",
       "description": {
         "name": "pool",
-        "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
+        "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.1"
+      "version": "1.5.2"
+    },
+    "posix": {
+      "dependency": "transitive",
+      "description": {
+        "name": "posix",
+        "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "6.0.3"
     },
     "provider": {
       "dependency": "direct main",
       "description": {
         "name": "provider",
-        "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84",
+        "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.5"
+      "version": "6.1.5+1"
     },
     "pub_semver": {
       "dependency": "transitive",
@@ -1352,11 +1346,11 @@
       "dependency": "transitive",
       "description": {
         "name": "pubspec_parse",
-        "sha256": "81876843eb50dc2e1e5b151792c9a985c5ed2536914115ed04e9c8528f6647b0",
+        "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.5.0"
     },
     "pull_down_button": {
       "dependency": "direct main",
@@ -1372,11 +1366,11 @@
       "dependency": "transitive",
       "description": {
         "name": "puppeteer",
-        "sha256": "7a990c68d33882b642214c351f66492d9a738afa4226a098ab70642357337fa2",
+        "sha256": "e072dc2e8de31934c24d3efa9d4ce3cbedf5d9a83a4e503c086ab3a6e2ed644f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.16.0"
+      "version": "3.19.0"
     },
     "qr": {
       "dependency": "transitive",
@@ -1462,11 +1456,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shelf",
-        "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4",
+        "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.1"
+      "version": "1.4.2"
     },
     "shelf_static": {
       "dependency": "transitive",
@@ -1502,17 +1496,17 @@
       "dependency": "transitive",
       "description": "flutter",
       "source": "sdk",
-      "version": "0.0.99"
+      "version": "0.0.0"
     },
     "source_gen": {
       "dependency": "transitive",
       "description": {
         "name": "source_gen",
-        "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832",
+        "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.0"
+      "version": "2.0.0"
     },
     "source_span": {
       "dependency": "transitive",
@@ -1538,11 +1532,11 @@
       "dependency": "transitive",
       "description": {
         "name": "sqflite_common",
-        "sha256": "761b9740ecbd4d3e66b8916d784e581861fd3c3553eda85e167bc49fdb68f709",
+        "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4+6"
+      "version": "2.5.5"
     },
     "stack_trace": {
       "dependency": "transitive",
@@ -1588,11 +1582,11 @@
       "dependency": "transitive",
       "description": {
         "name": "synchronized",
-        "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225",
+        "sha256": "0669c70faae6270521ee4f05bffd2919892d42d1276e6c495be80174b6bc0ef6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.3.0+3"
+      "version": "3.3.1"
     },
     "term_glyph": {
       "dependency": "transitive",
@@ -1608,11 +1602,11 @@
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
+        "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.6"
+      "version": "0.7.7"
     },
     "texture_rgba_renderer": {
       "dependency": "direct main",
@@ -1720,31 +1714,31 @@
       "dependency": "direct main",
       "description": {
         "name": "url_launcher",
-        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
+        "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.1"
+      "version": "6.3.2"
     },
     "url_launcher_android": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193",
+        "sha256": "81777b08c498a292d93ff2feead633174c386291e35612f8da438d6e92c4447e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.14"
+      "version": "6.3.20"
     },
     "url_launcher_ios": {
       "dependency": "direct main",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
+        "sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.3"
+      "version": "6.3.4"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
@@ -1760,11 +1754,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_macos",
-        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
+        "sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.2"
+      "version": "3.2.3"
     },
     "url_launcher_platform_interface": {
       "dependency": "transitive",
@@ -1780,11 +1774,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
+        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3"
+      "version": "2.4.1"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
@@ -1810,11 +1804,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics",
-        "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de",
+        "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.18"
+      "version": "1.1.19"
     },
     "vector_graphics_codec": {
       "dependency": "transitive",
@@ -1830,11 +1824,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad",
+        "sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.16"
+      "version": "1.1.19"
     },
     "vector_math": {
       "dependency": "transitive",
@@ -1850,51 +1844,51 @@
       "dependency": "transitive",
       "description": {
         "name": "video_player",
-        "sha256": "7d78f0cfaddc8c19d4cb2d3bebe1bfef11f2103b0a03e5398b303a1bf65eeb14",
+        "sha256": "0d55b1f1a31e5ad4c4967bfaa8ade0240b07d20ee4af1dfef5f531056512961a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.9.5"
+      "version": "2.10.0"
     },
     "video_player_android": {
       "dependency": "transitive",
       "description": {
         "name": "video_player_android",
-        "sha256": "391e092ba4abe2f93b3e625bd6b6a6ec7d7414279462c1c0ee42b5ab8d0a0898",
+        "sha256": "a8dc4324f67705de057678372bedb66cd08572fe7c495605ac68c5f503324a39",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.7.16"
+      "version": "2.8.15"
     },
     "video_player_avfoundation": {
       "dependency": "transitive",
       "description": {
         "name": "video_player_avfoundation",
-        "sha256": "9ee764e5cd2fc1e10911ae8ad588e1a19db3b6aa9a6eb53c127c42d3a3c3f22f",
+        "sha256": "f9a780aac57802b2892f93787e5ea53b5f43cc57dc107bee9436458365be71cd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.7.1"
+      "version": "2.8.4"
     },
     "video_player_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "video_player_platform_interface",
-        "sha256": "df534476c341ab2c6a835078066fc681b8265048addd853a1e3c78740316a844",
+        "sha256": "9e372520573311055cb353b9a0da1c9d72b094b7ba01b8ecc66f28473553793b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.0"
+      "version": "6.5.0"
     },
     "video_player_web": {
       "dependency": "transitive",
       "description": {
         "name": "video_player_web",
-        "sha256": "e8bba2e5d1e159d5048c9a491bb2a7b29c535c612bb7d10c1e21107f5bd365ba",
+        "sha256": "9f3c00be2ef9b76a95d94ac5119fb843dca6f2c69e6c9968f6f2b6c9e7afbdeb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.5"
+      "version": "2.4.0"
     },
     "visibility_detector": {
       "dependency": "direct main",
@@ -1910,61 +1904,61 @@
       "dependency": "direct main",
       "description": {
         "name": "wakelock_plus",
-        "sha256": "104d94837bb28c735894dcd592877e990149c380e6358b00c04398ca1426eed4",
+        "sha256": "f268ca2116db22e57577fb99d52515a24bdc1d570f12ac18bb762361d43b043d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.1"
+      "version": "1.1.4"
     },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "wakelock_plus_platform_interface",
-        "sha256": "e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207",
+        "sha256": "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.3"
+      "version": "1.3.0"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",
+        "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.1.4"
     },
     "web": {
       "dependency": "transitive",
       "description": {
         "name": "web",
-        "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.1"
+      "version": "1.1.1"
     },
     "web_socket_channel": {
       "dependency": "transitive",
       "description": {
         "name": "web_socket_channel",
-        "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42",
+        "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.5"
+      "version": "2.4.0"
     },
     "win32": {
       "dependency": "direct main",
       "description": {
         "name": "win32",
-        "sha256": "daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e",
+        "sha256": "329edf97fdd893e0f1e3b9e88d6a0e627128cc17cc316a8d67fda8f1451178ba",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.10.1"
+      "version": "5.13.0"
     },
     "win32_registry": {
       "dependency": "transitive",
@@ -2070,7 +2064,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.5.0 <4.0.0",
-    "flutter": ">=3.24.0"
+    "dart": ">=3.7.0 <4.0.0",
+    "flutter": ">=3.29.0"
   }
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e163d061a653..4c7a9f8a4a1c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14663,10 +14663,6 @@ with pkgs;
     libsoup = libsoup_3;
   };
 
-  rustdesk-flutter = callPackage ../by-name/ru/rustdesk-flutter/package.nix {
-    flutter = flutter324;
-  };
-
   davis = callPackage ../by-name/da/davis/package.nix {
     php = php83; # https://github.com/tchapi/davis/issues/195
   };

From 9106d8f922194acba5989054caa4f0a6dcfa6b5c Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 27 Oct 2025 09:16:40 +0800
Subject: [PATCH 4058/6226] flutter324: drop

---
 .../compilers/flutter/versions/3_24/data.json | 1036 -----------------
 ...deregister-pub-dependencies-artifact.patch |   19 -
 .../3_24/patches/disable-auto-update.patch    |   30 -
 .../fix-ios-build-xcode-backend-sh.patch      |   69 --
 .../gradle-flutter-tools-wrapper.patch        |   44 -
 pkgs/top-level/aliases.nix                    |    1 +
 pkgs/top-level/all-packages.nix               |    1 -
 7 files changed, 1 insertion(+), 1199 deletions(-)
 delete mode 100644 pkgs/development/compilers/flutter/versions/3_24/data.json
 delete mode 100644 pkgs/development/compilers/flutter/versions/3_24/patches/deregister-pub-dependencies-artifact.patch
 delete mode 100644 pkgs/development/compilers/flutter/versions/3_24/patches/disable-auto-update.patch
 delete mode 100644 pkgs/development/compilers/flutter/versions/3_24/patches/fix-ios-build-xcode-backend-sh.patch
 delete mode 100644 pkgs/development/compilers/flutter/versions/3_24/patches/gradle-flutter-tools-wrapper.patch

diff --git a/pkgs/development/compilers/flutter/versions/3_24/data.json b/pkgs/development/compilers/flutter/versions/3_24/data.json
deleted file mode 100644
index 5111395d5990..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_24/data.json
+++ /dev/null
@@ -1,1036 +0,0 @@
-{
-  "version": "3.24.5",
-  "engineVersion": "a18df97ca57a249df5d8d68cd0820600223ce262",
-  "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=",
-  "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f",
-  "channel": "stable",
-  "engineHashes": {
-    "aarch64-linux": {
-      "aarch64-linux": "sha256-tHdbyDs02+iJiWOynLEWXIiYVmdpkxRTbrfMljjKwG8=",
-      "x86_64-linux": "sha256-tHdbyDs02+iJiWOynLEWXIiYVmdpkxRTbrfMljjKwG8="
-    },
-    "x86_64-linux": {
-      "aarch64-linux": "sha256-R0BROAR1KIJvA4CZRBMbUU6zN3sL8I/F8LFZrdaTJ/Q=",
-      "x86_64-linux": "sha256-R0BROAR1KIJvA4CZRBMbUU6zN3sL8I/F8LFZrdaTJ/Q="
-    }
-  },
-  "dartVersion": "3.5.4",
-  "dartHash": {
-    "x86_64-linux": "sha256-jHyCMOkrd8DEq/IBqCMTqJg9uFkcoAwHiJBFNUHENZY=",
-    "aarch64-linux": "sha256-fFHpWvwKYBC4fbKTMwfhemu4RCdyAqj+cIJgcoE1P30=",
-    "x86_64-darwin": "sha256-9BJL3FjwmPbJw2pdiXH0EjPqjaYavzxt6ohyNKAeyOg=",
-    "aarch64-darwin": "sha256-tebVH1N2VtPnyecH6wYyptkE0xjINpPv/mvKgaucBHk="
-  },
-  "flutterHash": "sha256-9aA0HU/c32ixhnqAGwm1v87uDnYhNbe5laFbed1XPw8=",
-  "artifactHashes": {
-    "android": {
-      "aarch64-darwin": "sha256-4jeSa003DWoixXx+x1OgNKaIqfQV85en9rJmC1lZ/tQ=",
-      "aarch64-linux": "sha256-3FQ4Q0IKSMvsgmvuoJGHeZaveuTgyMrW65V23F3aZNk=",
-      "x86_64-darwin": "sha256-4jeSa003DWoixXx+x1OgNKaIqfQV85en9rJmC1lZ/tQ=",
-      "x86_64-linux": "sha256-3FQ4Q0IKSMvsgmvuoJGHeZaveuTgyMrW65V23F3aZNk="
-    },
-    "fuchsia": {
-      "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
-      "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
-      "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
-      "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk="
-    },
-    "ios": {
-      "aarch64-darwin": "sha256-5/2P3vvSTgQtt4FvbqL89KS6eldx+8Y2zlyRm0OfVvM=",
-      "aarch64-linux": "sha256-5/2P3vvSTgQtt4FvbqL89KS6eldx+8Y2zlyRm0OfVvM=",
-      "x86_64-darwin": "sha256-5/2P3vvSTgQtt4FvbqL89KS6eldx+8Y2zlyRm0OfVvM=",
-      "x86_64-linux": "sha256-5/2P3vvSTgQtt4FvbqL89KS6eldx+8Y2zlyRm0OfVvM="
-    },
-    "linux": {
-      "aarch64-darwin": "sha256-Wrb6UhaPBYxkoESi1TXu2KtzBo7VKnagfNbTMmcKNC0=",
-      "aarch64-linux": "sha256-Wrb6UhaPBYxkoESi1TXu2KtzBo7VKnagfNbTMmcKNC0=",
-      "x86_64-darwin": "sha256-mY+duJmrVIGjazfXs5hJIFswev4Yhw2FIzfwcGbFKig=",
-      "x86_64-linux": "sha256-mY+duJmrVIGjazfXs5hJIFswev4Yhw2FIzfwcGbFKig="
-    },
-    "macos": {
-      "aarch64-darwin": "sha256-2Yl9BtVdaVTyNLy/FrWyqUtBuECelhuYKSrgHxiZX8k=",
-      "aarch64-linux": "sha256-2Yl9BtVdaVTyNLy/FrWyqUtBuECelhuYKSrgHxiZX8k=",
-      "x86_64-darwin": "sha256-2Yl9BtVdaVTyNLy/FrWyqUtBuECelhuYKSrgHxiZX8k=",
-      "x86_64-linux": "sha256-2Yl9BtVdaVTyNLy/FrWyqUtBuECelhuYKSrgHxiZX8k="
-    },
-    "universal": {
-      "aarch64-darwin": "sha256-o2dT/b6mWm34I3uGrrONVljGr6ApH6oOJbhTuUHQ664=",
-      "aarch64-linux": "sha256-M78yC1x+LXBnvTNogC6xrQ1QM+wu5hxMna5Ii50HcMA=",
-      "x86_64-darwin": "sha256-4Gx4SPvm+kJnDUJSA5DmYuMluhNp3qulA+dkM+XkDVY=",
-      "x86_64-linux": "sha256-AM8fDpGb4BLl/xbvq5IjXZqrtrUTW340WqUGAPguep8="
-    },
-    "web": {
-      "aarch64-darwin": "sha256-1u0GUKSXOzMDT3g4VwynMT4UHW/5m8Y2/2Cqi2XsCO0=",
-      "aarch64-linux": "sha256-1u0GUKSXOzMDT3g4VwynMT4UHW/5m8Y2/2Cqi2XsCO0=",
-      "x86_64-darwin": "sha256-1u0GUKSXOzMDT3g4VwynMT4UHW/5m8Y2/2Cqi2XsCO0=",
-      "x86_64-linux": "sha256-1u0GUKSXOzMDT3g4VwynMT4UHW/5m8Y2/2Cqi2XsCO0="
-    },
-    "windows": {
-      "x86_64-darwin": "sha256-ReMOUrSsbXSpRb8tidGootba6p+q+JCvyG5yKU8e20I=",
-      "x86_64-linux": "sha256-ReMOUrSsbXSpRb8tidGootba6p+q+JCvyG5yKU8e20I="
-    }
-  },
-  "pubspecLock": {
-    "packages": {
-      "_fe_analyzer_shared": {
-        "dependency": "direct main",
-        "description": {
-          "name": "_fe_analyzer_shared",
-          "sha256": "f256b0c0ba6c7577c15e2e4e114755640a875e885099367bf6e012b19314c834",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "72.0.0"
-      },
-      "_macros": {
-        "dependency": "transitive",
-        "description": "dart",
-        "source": "sdk",
-        "version": "0.3.2"
-      },
-      "analyzer": {
-        "dependency": "direct main",
-        "description": {
-          "name": "analyzer",
-          "sha256": "b652861553cd3990d8ed361f7979dc6d7053a9ac8843fa73820ab68ce5410139",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "6.7.0"
-      },
-      "archive": {
-        "dependency": "direct main",
-        "description": {
-          "name": "archive",
-          "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.6.1"
-      },
-      "args": {
-        "dependency": "direct main",
-        "description": {
-          "name": "args",
-          "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.5.0"
-      },
-      "async": {
-        "dependency": "direct main",
-        "description": {
-          "name": "async",
-          "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.11.0"
-      },
-      "boolean_selector": {
-        "dependency": "direct main",
-        "description": {
-          "name": "boolean_selector",
-          "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.1"
-      },
-      "browser_launcher": {
-        "dependency": "direct main",
-        "description": {
-          "name": "browser_launcher",
-          "sha256": "6ee4c6b1f68a42e769ef6e663c4f56708522f7bce9d2ab6e308a37b612ffa4ec",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.1"
-      },
-      "built_collection": {
-        "dependency": "direct main",
-        "description": {
-          "name": "built_collection",
-          "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "5.1.1"
-      },
-      "built_value": {
-        "dependency": "direct main",
-        "description": {
-          "name": "built_value",
-          "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "8.9.2"
-      },
-      "checked_yaml": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "checked_yaml",
-          "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.0.3"
-      },
-      "cli_config": {
-        "dependency": "direct main",
-        "description": {
-          "name": "cli_config",
-          "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.2.0"
-      },
-      "clock": {
-        "dependency": "direct main",
-        "description": {
-          "name": "clock",
-          "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.1"
-      },
-      "collection": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "collection",
-          "sha256": "ee67cb0715911d28db6bf4af1026078bd6f0128b07a5f66fb2ed94ec6783c09a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.18.0"
-      },
-      "completion": {
-        "dependency": "direct main",
-        "description": {
-          "name": "completion",
-          "sha256": "f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.1"
-      },
-      "convert": {
-        "dependency": "direct main",
-        "description": {
-          "name": "convert",
-          "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.1.1"
-      },
-      "coverage": {
-        "dependency": "direct main",
-        "description": {
-          "name": "coverage",
-          "sha256": "3945034e86ea203af7a056d98e98e42a5518fff200d6e8e6647e1886b07e936e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.8.0"
-      },
-      "crypto": {
-        "dependency": "direct main",
-        "description": {
-          "name": "crypto",
-          "sha256": "ff625774173754681d66daaf4a448684fb04b78f902da9cb3d308c19cc5e8bab",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.3"
-      },
-      "csslib": {
-        "dependency": "direct main",
-        "description": {
-          "name": "csslib",
-          "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.0"
-      },
-      "dap": {
-        "dependency": "direct main",
-        "description": {
-          "name": "dap",
-          "sha256": "c0e53b52c9529d901329045afc4c5acb04304a28acde4b54ab0a08a93da546aa",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.3.0"
-      },
-      "dds": {
-        "dependency": "direct main",
-        "description": {
-          "name": "dds",
-          "sha256": "f3bca60b6b7d2b005268a1a579c82e38bec3d85cc85c332a872fe623c7ba94d7",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.2.4+2"
-      },
-      "dds_service_extensions": {
-        "dependency": "direct main",
-        "description": {
-          "name": "dds_service_extensions",
-          "sha256": "390ae1d0128bb43ffe11f8e3c6cd3a481c1920492d1026883d379cee50bdf1a2",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.0.0"
-      },
-      "devtools_shared": {
-        "dependency": "direct main",
-        "description": {
-          "name": "devtools_shared",
-          "sha256": "a6e66165629ec004cabd84e6971f502aeac07f1a5f6ffd9b3244cd05b1a06fb0",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "10.0.1"
-      },
-      "dtd": {
-        "dependency": "direct main",
-        "description": {
-          "name": "dtd",
-          "sha256": "58ac5c2d628e575dbcdfda44a698cd4c1212663e27fe5f8ced37aea85faa0d30",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.2.0"
-      },
-      "dwds": {
-        "dependency": "direct main",
-        "description": {
-          "name": "dwds",
-          "sha256": "61ebaabb04d779d040b47d3b4d0b3963449ced0920fb8efd81ca6d5e51ccfc1a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "24.0.0"
-      },
-      "extension_discovery": {
-        "dependency": "direct main",
-        "description": {
-          "name": "extension_discovery",
-          "sha256": "20735622d0763865f9d94c3ecdce4441174530870760253e9d364fb4f3da8688",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.0.0"
-      },
-      "fake_async": {
-        "dependency": "direct main",
-        "description": {
-          "name": "fake_async",
-          "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.3.1"
-      },
-      "ffi": {
-        "dependency": "direct main",
-        "description": {
-          "name": "ffi",
-          "sha256": "493f37e7df1804778ff3a53bd691d8692ddf69702cf4c1c1096a2e41b4779e21",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.2"
-      },
-      "file": {
-        "dependency": "direct main",
-        "description": {
-          "name": "file",
-          "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "7.0.0"
-      },
-      "file_testing": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "file_testing",
-          "sha256": "0aaadb4025bd350403f4308ad6c4cea953278d9407814b8342558e4946840fb5",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.0"
-      },
-      "fixnum": {
-        "dependency": "direct main",
-        "description": {
-          "name": "fixnum",
-          "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.0"
-      },
-      "flutter_template_images": {
-        "dependency": "direct main",
-        "description": {
-          "name": "flutter_template_images",
-          "sha256": "fd3e55af73c577b9e3f88d4080d3e366cb5c8ef3fbd50b94dfeca56bb0235df6",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.2.0"
-      },
-      "frontend_server_client": {
-        "dependency": "direct main",
-        "description": {
-          "name": "frontend_server_client",
-          "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.0.0"
-      },
-      "glob": {
-        "dependency": "direct main",
-        "description": {
-          "name": "glob",
-          "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.2"
-      },
-      "graphs": {
-        "dependency": "direct main",
-        "description": {
-          "name": "graphs",
-          "sha256": "aedc5a15e78fc65a6e23bcd927f24c64dd995062bcd1ca6eda65a3cff92a4d19",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.3.1"
-      },
-      "html": {
-        "dependency": "direct main",
-        "description": {
-          "name": "html",
-          "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.15.4"
-      },
-      "http": {
-        "dependency": "direct main",
-        "description": {
-          "name": "http",
-          "sha256": "5895291c13fa8a3bd82e76d5627f69e0d85ca6a30dcac95c4ea19a5d555879c2",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.13.6"
-      },
-      "http_multi_server": {
-        "dependency": "direct main",
-        "description": {
-          "name": "http_multi_server",
-          "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.2.1"
-      },
-      "http_parser": {
-        "dependency": "direct main",
-        "description": {
-          "name": "http_parser",
-          "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.0.2"
-      },
-      "intl": {
-        "dependency": "direct main",
-        "description": {
-          "name": "intl",
-          "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.19.0"
-      },
-      "io": {
-        "dependency": "direct main",
-        "description": {
-          "name": "io",
-          "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.4"
-      },
-      "js": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "js",
-          "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.7.1"
-      },
-      "json_annotation": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "json_annotation",
-          "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.9.0"
-      },
-      "json_rpc_2": {
-        "dependency": "direct main",
-        "description": {
-          "name": "json_rpc_2",
-          "sha256": "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.2"
-      },
-      "logging": {
-        "dependency": "direct main",
-        "description": {
-          "name": "logging",
-          "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.2.0"
-      },
-      "macros": {
-        "dependency": "transitive",
-        "description": {
-          "name": "macros",
-          "sha256": "0acaed5d6b7eab89f63350bccd82119e6c602df0f391260d0e32b5e23db79536",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.1.2-main.4"
-      },
-      "matcher": {
-        "dependency": "direct main",
-        "description": {
-          "name": "matcher",
-          "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.12.16+1"
-      },
-      "meta": {
-        "dependency": "direct main",
-        "description": {
-          "name": "meta",
-          "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.15.0"
-      },
-      "mime": {
-        "dependency": "direct main",
-        "description": {
-          "name": "mime",
-          "sha256": "2e123074287cc9fd6c09de8336dae606d1ddb88d9ac47358826db698c176a1f2",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.5"
-      },
-      "multicast_dns": {
-        "dependency": "direct main",
-        "description": {
-          "name": "multicast_dns",
-          "sha256": "982c4cc4cda5f98dd477bddfd623e8e4bd1014e7dbf9e7b05052e14a5b550b99",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.3.2+7"
-      },
-      "mustache_template": {
-        "dependency": "direct main",
-        "description": {
-          "name": "mustache_template",
-          "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.0.0"
-      },
-      "native_assets_builder": {
-        "dependency": "direct main",
-        "description": {
-          "name": "native_assets_builder",
-          "sha256": "e6612ad01cbc3c4d1b00a1a42aa25aa567950ab10ae1f95721574923540f3bd8",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.7.0"
-      },
-      "native_assets_cli": {
-        "dependency": "direct main",
-        "description": {
-          "name": "native_assets_cli",
-          "sha256": "f54ddc4a3f8cff1d8d63723b4938902da7586a5a47fe3c1bfa226eb80223f32e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.6.0"
-      },
-      "native_stack_traces": {
-        "dependency": "direct main",
-        "description": {
-          "name": "native_stack_traces",
-          "sha256": "64d2f4bcf3b69326fb9bc91b4dd3a06f94bb5bbc3a65e25ae6467ace0b34bfd3",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.5.7"
-      },
-      "node_preamble": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "node_preamble",
-          "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.0.2"
-      },
-      "package_config": {
-        "dependency": "direct main",
-        "description": {
-          "name": "package_config",
-          "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.0"
-      },
-      "path": {
-        "dependency": "direct main",
-        "description": {
-          "name": "path",
-          "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.9.0"
-      },
-      "petitparser": {
-        "dependency": "direct main",
-        "description": {
-          "name": "petitparser",
-          "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "6.0.2"
-      },
-      "platform": {
-        "dependency": "direct main",
-        "description": {
-          "name": "platform",
-          "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.1.5"
-      },
-      "pool": {
-        "dependency": "direct main",
-        "description": {
-          "name": "pool",
-          "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.5.1"
-      },
-      "process": {
-        "dependency": "direct main",
-        "description": {
-          "name": "process",
-          "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "5.0.2"
-      },
-      "pub_semver": {
-        "dependency": "direct main",
-        "description": {
-          "name": "pub_semver",
-          "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.4"
-      },
-      "pubspec_parse": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "pubspec_parse",
-          "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.3.0"
-      },
-      "shelf": {
-        "dependency": "direct main",
-        "description": {
-          "name": "shelf",
-          "sha256": "ad29c505aee705f41a4d8963641f91ac4cee3c8fad5947e033390a7bd8180fa4",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.4.1"
-      },
-      "shelf_packages_handler": {
-        "dependency": "direct main",
-        "description": {
-          "name": "shelf_packages_handler",
-          "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.2"
-      },
-      "shelf_proxy": {
-        "dependency": "direct main",
-        "description": {
-          "name": "shelf_proxy",
-          "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.4"
-      },
-      "shelf_static": {
-        "dependency": "direct main",
-        "description": {
-          "name": "shelf_static",
-          "sha256": "a41d3f53c4adf0f57480578c1d61d90342cd617de7fc8077b1304643c2d85c1e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.2"
-      },
-      "shelf_web_socket": {
-        "dependency": "direct main",
-        "description": {
-          "name": "shelf_web_socket",
-          "sha256": "9ca081be41c60190ebcb4766b2486a7d50261db7bd0f5d9615f2d653637a84c1",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.4"
-      },
-      "source_map_stack_trace": {
-        "dependency": "direct main",
-        "description": {
-          "name": "source_map_stack_trace",
-          "sha256": "84cf769ad83aa6bb61e0aa5a18e53aea683395f196a6f39c4c881fb90ed4f7ae",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.1"
-      },
-      "source_maps": {
-        "dependency": "direct main",
-        "description": {
-          "name": "source_maps",
-          "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.10.12"
-      },
-      "source_span": {
-        "dependency": "direct main",
-        "description": {
-          "name": "source_span",
-          "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.10.0"
-      },
-      "sse": {
-        "dependency": "direct main",
-        "description": {
-          "name": "sse",
-          "sha256": "fdce3a4ac3ae1c01083d05ded0bcdb7e02857ca2323823548e9e76d2f61638f0",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.1.5"
-      },
-      "stack_trace": {
-        "dependency": "direct main",
-        "description": {
-          "name": "stack_trace",
-          "sha256": "73713990125a6d93122541237550ee3352a2d84baad52d375a4cad2eb9b7ce0b",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.11.1"
-      },
-      "standard_message_codec": {
-        "dependency": "direct main",
-        "description": {
-          "name": "standard_message_codec",
-          "sha256": "fc7dd712d191b7e33196a0ecf354c4573492bb95995e7166cb6f73b047f9cae0",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.0.1+4"
-      },
-      "stream_channel": {
-        "dependency": "direct main",
-        "description": {
-          "name": "stream_channel",
-          "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.2"
-      },
-      "string_scanner": {
-        "dependency": "direct main",
-        "description": {
-          "name": "string_scanner",
-          "sha256": "556692adab6cfa87322a115640c11f13cb77b3f076ddcc5d6ae3c20242bedcde",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.2.0"
-      },
-      "sync_http": {
-        "dependency": "direct main",
-        "description": {
-          "name": "sync_http",
-          "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.3.1"
-      },
-      "term_glyph": {
-        "dependency": "direct main",
-        "description": {
-          "name": "term_glyph",
-          "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.2.1"
-      },
-      "test": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "test",
-          "sha256": "7ee44229615f8f642b68120165ae4c2a75fe77ae2065b1e55ae4711f6cf0899e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.25.7"
-      },
-      "test_api": {
-        "dependency": "direct main",
-        "description": {
-          "name": "test_api",
-          "sha256": "5b8a98dafc4d5c4c9c72d8b31ab2b23fc13422348d2997120294d3bac86b4ddb",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.7.2"
-      },
-      "test_core": {
-        "dependency": "direct main",
-        "description": {
-          "name": "test_core",
-          "sha256": "55ea5a652e38a1dfb32943a7973f3681a60f872f8c3a05a14664ad54ef9c6696",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.6.4"
-      },
-      "typed_data": {
-        "dependency": "direct main",
-        "description": {
-          "name": "typed_data",
-          "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.3.2"
-      },
-      "unified_analytics": {
-        "dependency": "direct main",
-        "description": {
-          "name": "unified_analytics",
-          "sha256": "916215af2dc2f54a204c6bfbc645ec401b6a150048764814379f42e09b557d2d",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "6.1.2"
-      },
-      "usage": {
-        "dependency": "direct main",
-        "description": {
-          "name": "usage",
-          "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.1.1"
-      },
-      "uuid": {
-        "dependency": "direct main",
-        "description": {
-          "name": "uuid",
-          "sha256": "648e103079f7c64a36dc7d39369cabb358d377078a051d6ae2ad3aa539519313",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.7"
-      },
-      "vm_service": {
-        "dependency": "direct main",
-        "description": {
-          "name": "vm_service",
-          "sha256": "5c5f338a667b4c644744b661f309fb8080bb94b18a7e91ef1dbd343bed00ed6d",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "14.2.5"
-      },
-      "vm_service_interface": {
-        "dependency": "direct main",
-        "description": {
-          "name": "vm_service_interface",
-          "sha256": "f827453d9a3f8ceae04e389810da26f9b67636bdd13aa2dd9405b110c4daf59c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.0"
-      },
-      "vm_snapshot_analysis": {
-        "dependency": "direct main",
-        "description": {
-          "name": "vm_snapshot_analysis",
-          "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.7.6"
-      },
-      "watcher": {
-        "dependency": "direct main",
-        "description": {
-          "name": "watcher",
-          "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.0"
-      },
-      "web": {
-        "dependency": "direct main",
-        "description": {
-          "name": "web",
-          "sha256": "97da13628db363c635202ad97068d47c5b8aa555808e7a9411963c533b449b27",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.5.1"
-      },
-      "web_socket_channel": {
-        "dependency": "direct main",
-        "description": {
-          "name": "web_socket_channel",
-          "sha256": "58c6666b342a38816b2e7e50ed0f1e261959630becd4c879c4f26bfa14aa5a42",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.4.5"
-      },
-      "webdriver": {
-        "dependency": "direct main",
-        "description": {
-          "name": "webdriver",
-          "sha256": "003d7da9519e1e5f329422b36c4dcdf18d7d2978d1ba099ea4e45ba490ed845e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.3"
-      },
-      "webkit_inspection_protocol": {
-        "dependency": "direct main",
-        "description": {
-          "name": "webkit_inspection_protocol",
-          "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.2.1"
-      },
-      "xml": {
-        "dependency": "direct main",
-        "description": {
-          "name": "xml",
-          "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "6.5.0"
-      },
-      "yaml": {
-        "dependency": "direct main",
-        "description": {
-          "name": "yaml",
-          "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.1.2"
-      },
-      "yaml_edit": {
-        "dependency": "direct main",
-        "description": {
-          "name": "yaml_edit",
-          "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.2.1"
-      }
-    },
-    "sdks": {
-      "dart": ">=3.4.3 <4.0.0"
-    }
-  }
-}
diff --git a/pkgs/development/compilers/flutter/versions/3_24/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/versions/3_24/patches/deregister-pub-dependencies-artifact.patch
deleted file mode 100644
index 01e34c6d292c..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_24/patches/deregister-pub-dependencies-artifact.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart
-index 252021cf78..e50ef0885d 100644
---- a/packages/flutter_tools/lib/src/flutter_cache.dart
-+++ b/packages/flutter_tools/lib/src/flutter_cache.dart
-@@ -51,14 +51,6 @@ class FlutterCache extends Cache {
-       registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform));
-     }
-     registerArtifact(FontSubsetArtifacts(this, platform: platform));
--    registerArtifact(PubDependencies(
--      logger: logger,
--      // flutter root and pub must be lazily initialized to avoid accessing
--      // before the version is determined.
--      flutterRoot: () => Cache.flutterRoot!,
--      pub: () => pub,
--      projectFactory: projectFactory,
--    ));
-   }
- }
- 
\ No newline at end of file
diff --git a/pkgs/development/compilers/flutter/versions/3_24/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_24/patches/disable-auto-update.patch
deleted file mode 100644
index 2ad292efd222..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_24/patches/disable-auto-update.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart
-index e4e474ab6e..5548599802 100644
---- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
-+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart
-@@ -1693,7 +1693,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and
- 
-     // Populate the cache. We call this before pub get below so that the
-     // sky_engine package is available in the flutter cache for pub to find.
--    if (shouldUpdateCache) {
-+    if (false) {
-       // First always update universal artifacts, as some of these (e.g.
-       // ios-deploy on macOS) are required to determine `requiredArtifacts`.
-       final bool offline;
-diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-index 50783f8435..db94062840 100644
---- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-@@ -377,11 +377,7 @@ class FlutterCommandRunner extends CommandRunner<void> {
-           globals.analytics.suppressTelemetry();
-         }
- 
--        globals.flutterVersion.ensureVersionFile();
-         final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false;
--        if (await _shouldCheckForUpdates(topLevelResults, topLevelMachineFlag: machineFlag)) {
--          await globals.flutterVersion.checkFlutterVersionFreshness();
--        }
- 
-         // See if the user specified a specific device.
-         final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?;
-
diff --git a/pkgs/development/compilers/flutter/versions/3_24/patches/fix-ios-build-xcode-backend-sh.patch b/pkgs/development/compilers/flutter/versions/3_24/patches/fix-ios-build-xcode-backend-sh.patch
deleted file mode 100644
index 825d40fc6176..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_24/patches/fix-ios-build-xcode-backend-sh.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 6df275df3b8694daf16302b407520e3b1dee6724 Mon Sep 17 00:00:00 2001
-From: Philip Hayes <philiphayes9@gmail.com>
-Date: Thu, 12 Sep 2024 13:23:00 -0700
-Subject: [PATCH] fix: cleanup xcode_backend.sh to fix iOS build w/
- `NixOS/nixpkgs` flutter
-
-This patch cleans up `xcode_backend.sh`. It now effectively just runs
-`exec $FLUTTER_ROOT/bin/dart ./xcode_backend.dart`.
-
-The previous `xcode_backend.sh` tries to discover `$FLUTTER_ROOT` from
-argv[0], even though its presence is already guaranteed (the wrapped
-`xcode_backend.dart` also relies on this env).
-
-When using nixpkgs flutter, the flutter SDK directory is composed of several
-layers, joined together using symlinks (called a `symlinkJoin`). Without this
-patch, the auto-discover traverses the symlinks into the wrong layer, and so it
-uses an "unwrapped" `dart` command instead of a "wrapped" dart that sets some
-important envs/flags (like `$FLUTTER_ROOT`).
-
-Using the "unwrapped" dart then manifests in this error when compiling, since
-it doesn't see the ios build-support artifacts:
-
-```
-$ flutter run -d iphone
-Running Xcode build...
-Xcode build done.                                            6.4s
-Failed to build iOS app
-Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "/<nix-store>/XXXX-flutter-3.24.1-unwrapped/bin/cache/artifacts".
-```
----
- packages/flutter_tools/bin/xcode_backend.sh | 25 ++++-----------------
- 1 file changed, 4 insertions(+), 21 deletions(-)
-
-diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh
-index 2889d7c8e4..48b9d06c6e 100755
---- a/packages/flutter_tools/bin/xcode_backend.sh
-+++ b/packages/flutter_tools/bin/xcode_backend.sh
-@@ -6,24 +6,7 @@
- # exit on error, or usage of unset var
- set -euo pipefail
- 
--# Needed because if it is set, cd may print the path it changed to.
--unset CDPATH
--
--function follow_links() (
--  cd -P "$(dirname -- "$1")"
--  file="$PWD/$(basename -- "$1")"
--  while [[ -h "$file" ]]; do
--    cd -P "$(dirname -- "$file")"
--    file="$(readlink -- "$file")"
--    cd -P "$(dirname -- "$file")"
--    file="$PWD/$(basename -- "$file")"
--  done
--  echo "$file"
--)
--
--PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")"
--BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
--FLUTTER_ROOT="$BIN_DIR/../../.."
--DART="$FLUTTER_ROOT/bin/dart"
--
--"$DART" "$BIN_DIR/xcode_backend.dart" "$@"
-+# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT.
-+dart="${FLUTTER_ROOT}/bin/dart"
-+xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart"
-+exec "${dart}" "${xcode_backend_dart}" "$@"
--- 
-2.46.0
-
diff --git a/pkgs/development/compilers/flutter/versions/3_24/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_24/patches/gradle-flutter-tools-wrapper.patch
deleted file mode 100644
index de6080efbba8..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_24/patches/gradle-flutter-tools-wrapper.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-This patch introduces an intermediate Gradle build step to alter the behavior
-of flutter_tools' Gradle project, specifically moving the creation of `build`
-and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`.
-
-Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle`
-directories within the Nix Store. Resulting in read-only errors when trying to build a
-Flutter Android app at runtime.
-
-This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project
-when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")`
-
-`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory.
-
-The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` and `includeBuild`s it.
-This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting
-`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`.
-
-Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, but `build` doesn't.
-To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` as well, we need to set `buildDirectory`.
-diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle
-new file mode 100644
-index 0000000000..b2485c94b4
---- /dev/null
-+++ b/packages/flutter_tools/gradle/settings.gradle
-@@ -0,0 +1,19 @@
-+rootProject.buildFileName = "/dev/null"
-+
-+def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10)
-+def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev")
-+dir.mkdirs()
-+def file = new File(dir, "settings.gradle")
-+
-+file.text = """
-+rootProject.projectDir = new File("$settingsDir")
-+apply from: new File("$settingsDir/settings.gradle.kts")
-+
-+gradle.allprojects { project ->
-+  project.beforeEvaluate {
-+    project.layout.buildDirectory = new File("$dir/build")
-+  }
-+}
-+"""
-+
-+includeBuild(dir)
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 09c9e0d8900a..3f8c2e03b6c8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -562,6 +562,7 @@ mapAliases {
   floorp-unwrapped = throw "floorp-unwrapped has been replaced with floorp-bin-unwrapped, as building from upstream sources has become unfeasible starting with version 12.x"; # Added 2025-09-06
   flow-editor = throw "'flow-editor' has been renamed to/replaced by 'flow-control'"; # Converted to throw 2025-10-27
   flut-renamer = throw "flut-renamer is unmaintained and has been removed"; # Added 2025-08-26
+  flutter324 = throw "flutter324 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-10-28
   flutter326 = throw "flutter326 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-06-08
   fmsynth = throw "'fmsynth' has been removed as it was broken and unmaintained both upstream and in nixpkgs."; # Added 2025-09-01
   follow = lib.warnOnInstantiate "follow has been renamed to folo" folo; # Added 2025-05-18
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4c7a9f8a4a1c..1c5cfe7cd156 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4527,7 +4527,6 @@ with pkgs;
   flutter332 = flutterPackages.v3_32;
   flutter329 = flutterPackages.v3_29;
   flutter327 = flutterPackages.v3_27;
-  flutter324 = flutterPackages.v3_24;
 
   fpc = callPackage ../development/compilers/fpc { };
 

From 5e75ea03bc85db222848d236d0b39e5971cdc51c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 29 Oct 2025 23:31:17 +0000
Subject: [PATCH 4059/6226] python3Packages.numexpr: 2.11.0 -> 2.14.1

---
 pkgs/development/python-modules/numexpr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/numexpr/default.nix b/pkgs/development/python-modules/numexpr/default.nix
index 2c6a4c3de606..48ec1179cc67 100644
--- a/pkgs/development/python-modules/numexpr/default.nix
+++ b/pkgs/development/python-modules/numexpr/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "numexpr";
-  version = "2.11.0";
+  version = "2.14.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-dbLAGk7aLnw1e8Z6P1w912UGwVtf1NxChF7y4YIYG60=";
+    hash = "sha256-S+ALEIbHt6XDLjFVgSK3uAJD/gmFebFwln2oPzFStIs=";
   };
 
   build-system = [

From 760e51de1ae079b093f9f635bcec195e01021c72 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 30 Oct 2025 00:54:31 +0100
Subject: [PATCH 4060/6226] kea: 3.0.1 -> 3.0.2

https://gitlab.isc.org/isc-projects/kea/-/wikis/Release-Notes/release-notes-3.0.2

Fixes: CVE-2025-11232
---
 pkgs/by-name/ke/kea/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ke/kea/package.nix b/pkgs/by-name/ke/kea/package.nix
index 18754620d86f..c2017262a9e5 100644
--- a/pkgs/by-name/ke/kea/package.nix
+++ b/pkgs/by-name/ke/kea/package.nix
@@ -29,11 +29,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kea";
-  version = "3.0.1"; # only even minor versions are stable
+  version = "3.0.2"; # only even minor versions are stable
 
   src = fetchurl {
     url = "https://ftp.isc.org/isc/kea/${finalAttrs.version}/kea-${finalAttrs.version}.tar.xz";
-    hash = "sha256-7IT+xLt/a50VqC51Wlcek0jrTW+8Yrs/bxKWzXokxWY=";
+    hash = "sha256-KfTkT6SPYv4VFY0XQR4ANJYgMlDbezRZwsecCfN5pUE=";
   };
 
   patches = [

From a74985906f825105733e48344922ea30cc7757a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 00:27:44 +0000
Subject: [PATCH 4061/6226] python3Packages.streamlit: 1.50.0 -> 1.51.0

---
 pkgs/development/python-modules/streamlit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/streamlit/default.nix b/pkgs/development/python-modules/streamlit/default.nix
index fd34995f750e..fc155688f46a 100644
--- a/pkgs/development/python-modules/streamlit/default.nix
+++ b/pkgs/development/python-modules/streamlit/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "streamlit";
-  version = "1.50.0";
+  version = "1.51.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hyIdVoqsWFJ0oF7xijeLA98zK5PggQP//PPNhNhSr0Y=";
+    hash = "sha256-HnQqnAtpj0Zsb1v1jTM77aWh++jeZgdDl2eRtcFEbvY=";
   };
 
   build-system = [

From b8008de778c7aab2358aa9ed25f93fe92688ef18 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 00:40:56 +0000
Subject: [PATCH 4062/6226] cwtch-ui: 1.16.0 -> 1.16.1

---
 pkgs/by-name/cw/cwtch-ui/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cw/cwtch-ui/package.nix b/pkgs/by-name/cw/cwtch-ui/package.nix
index 56ec33b81e40..b4adced87422 100644
--- a/pkgs/by-name/cw/cwtch-ui/package.nix
+++ b/pkgs/by-name/cw/cwtch-ui/package.nix
@@ -12,12 +12,12 @@ let
 in
 flutter329.buildFlutterApplication rec {
   pname = "cwtch-ui";
-  version = "1.16.0";
+  version = "1.16.1";
   # This Gitea instance has archive downloads disabled, so: fetchgit
   src = fetchgit {
     url = "https://git.openprivacy.ca/cwtch.im/cwtch-ui";
     rev = "v${version}";
-    hash = "sha256-887BiDqu35kocQmren9/rRhLdMNEXPmzsQFAixUvTxo=";
+    hash = "sha256-VKR02cRcjEapiIo+bQqeJOenmv0Rmzg6qfkI1LtWF10=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.json;

From 3083e3b442c0dc27af2a6bb1c77941e71c17362a Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 29 Oct 2025 17:35:16 -0700
Subject: [PATCH 4063/6226] quodlibet: disable known flaky test

---
 pkgs/applications/audio/quodlibet/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index 8d6518a1e323..b26ed41e1d67 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -148,6 +148,8 @@ python3.pkgs.buildPythonApplication rec {
     "--deselect=tests/test_browsers_iradio.py::TInternetRadio::test_click_add_station"
     # upstream does actually not enforce source code linting
     "--ignore=tests/quality"
+    # marked as flaky, breaks in sandbox
+    "--deselect=tests/test_library_file.py::TWatchedFileLibrary::test_watched_adding"
   ]
   ++ lib.optionals (withXineBackend || !withGstPlugins) [
     "--ignore=tests/plugin/test_replaygain.py"

From a984a02bdb9f62166b264a4ec1e768877555a31d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 00:49:28 +0000
Subject: [PATCH 4064/6226] slade-unstable: 3.2.8-unstable-2025-10-25 ->
 3.2.8-unstable-2025-10-28

---
 pkgs/by-name/sl/slade-unstable/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sl/slade-unstable/package.nix b/pkgs/by-name/sl/slade-unstable/package.nix
index ed86e1b0feeb..ac98cf9049a1 100644
--- a/pkgs/by-name/sl/slade-unstable/package.nix
+++ b/pkgs/by-name/sl/slade-unstable/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation {
   pname = "slade";
-  version = "3.2.8-unstable-2025-10-25";
+  version = "3.2.8-unstable-2025-10-28";
 
   src = fetchFromGitHub {
     owner = "sirjuddington";
     repo = "SLADE";
-    rev = "d473699512b6d41bc9e58c8e6df3b8f24156f3b4";
-    hash = "sha256-y5MB5BytWfcRe8orPwqZrObRKilCWz9eITxhQmgVmHc=";
+    rev = "3b82f41dea2bd67570af1479550653c20d192a6c";
+    hash = "sha256-utvsQVw20q1qkkOP11fBVo3IdMKijm8Ya5Ryr/BoNhU=";
   };
 
   nativeBuildInputs = [

From a07501acc5546e67158d993c9d77bea0f9e02704 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 30 Oct 2025 01:43:28 +0100
Subject: [PATCH 4065/6226] gitea: 1.24.7 -> 1.25.0

Changelog: https://github.com/go-gitea/gitea/releases/tag/v1.25.0
---
 pkgs/by-name/gi/gitea/package.nix            | 28 +++++++++++++-------
 pkgs/by-name/gi/gitea/static-root-path.patch |  8 +++---
 2 files changed, 23 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix
index 37ece7f0cf99..3634b94d7875 100644
--- a/pkgs/by-name/gi/gitea/package.nix
+++ b/pkgs/by-name/gi/gitea/package.nix
@@ -9,44 +9,54 @@
   compressDrvWeb,
   gitea,
   gzip,
+  nodejs,
   openssh,
+  pnpm,
+  stdenv,
   sqliteSupport ? true,
   nixosTests,
-  buildNpmPackage,
 }:
 
 let
-  frontend = buildNpmPackage {
+  frontend = stdenv.mkDerivation (finalAttrs: {
     pname = "gitea-frontend";
     inherit (gitea) src version;
 
-    npmDepsHash = "sha256-86SIiBamHdilEWbwBk6usVU/tzdYTT3Zvph3w/ZVjTs=";
+    pnpmDeps = pnpm.fetchDeps {
+      inherit (finalAttrs) pname version src;
+      fetcherVersion = 2;
+      hash = "sha256-0p7P68BvO3hv0utUbnPpHSpGLlV7F9HHmOITvJAb/ww=";
+    };
+
+    nativeBuildInputs = [
+      nodejs
+      pnpm.configHook
+    ];
 
-    # use webpack directly instead of 'make frontend' as the packages are already installed
     buildPhase = ''
-      BROWSERSLIST_IGNORE_OLD_DATA=true npx webpack
+      make frontend
     '';
 
     installPhase = ''
       mkdir -p $out
       cp -R public $out/
     '';
-  };
+  });
 in
 buildGoModule rec {
   pname = "gitea";
-  version = "1.24.7";
+  version = "1.25.0";
 
   src = fetchFromGitHub {
     owner = "go-gitea";
     repo = "gitea";
     tag = "v${gitea.version}";
-    hash = "sha256-0UOzEVy7SqYVnH3dJCzS9/jvRg7F/uqjZgQvUhh7RoE=";
+    hash = "sha256-uBBL62Q/aigsCo0S0hwNooKljTn+OfcqoJxan6Ac0rM=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-t9KeK1S16xaPxfg+LYRp6/PuuxeEOgRF4GEvgKusDiI=";
+  vendorHash = "sha256-HHW7xgXJKnzj6HLKAUXKYIZgOKKbXVSK+YGSKCwBeLU=";
 
   outputs = [
     "out"
diff --git a/pkgs/by-name/gi/gitea/static-root-path.patch b/pkgs/by-name/gi/gitea/static-root-path.patch
index 7f70329c6040..db2857cfe5ea 100644
--- a/pkgs/by-name/gi/gitea/static-root-path.patch
+++ b/pkgs/by-name/gi/gitea/static-root-path.patch
@@ -1,10 +1,10 @@
 diff --git a/modules/setting/server.go b/modules/setting/server.go
-index 183906268..fa02e8915 100644
+index 38e166e02a..bbe9af4718 100644
 --- a/modules/setting/server.go
 +++ b/modules/setting/server.go
-@@ -319,7 +319,7 @@ func loadServerFrom(rootCfg ConfigProvider) {
- 	OfflineMode = sec.Key("OFFLINE_MODE").MustBool()
- 	Log.DisableRouterLog = sec.Key("DISABLE_ROUTER_LOG").MustBool()
+@@ -351,7 +351,7 @@ func loadServerFrom(rootCfg ConfigProvider) {
+ 	RedirectorUseProxyProtocol = sec.Key("REDIRECTOR_USE_PROXY_PROTOCOL").MustBool(UseProxyProtocol)
+ 	OfflineMode = sec.Key("OFFLINE_MODE").MustBool(true)
  	if len(StaticRootPath) == 0 {
 -		StaticRootPath = AppWorkPath
 +		StaticRootPath = "@data@"

From 5aa0a697c91aaf98a63728066faff2b775c457cb Mon Sep 17 00:00:00 2001
From: Sean Buckley <sean.bck@gmail.com>
Date: Wed, 29 Oct 2025 21:12:30 -0400
Subject: [PATCH 4066/6226] brave: 1.83.120 -> 1.84.132

https://community.brave.app/t/release-channel-1-84-132/644886
---
 pkgs/by-name/br/brave/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index cb38c191c8a7..2cbbacccb688 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,24 +3,24 @@
 
 let
   pname = "brave";
-  version = "1.83.120";
+  version = "1.84.132";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-DQX+HKNLakI6G7K53SmcmtmA+h7ZmvkcjUgd/k3C/cc=";
+      hash = "sha256-/3LF5T/Y7eyjrDZMJ6UtBmjqxSZTsBcJJ6LtDG3Xnvc=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-E1IKc6ftBO88WVXa0RgjAFhtckBNm/hTQgxzMzK17PY=";
+      hash = "sha256-UPV4krI4jnXNNL6RjvhO/ftxS53eWernG1YVVI2AXbg=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-aMyTGhxnExd1kaoHHTZu7UU42/WSOkB9PAyc8M0B/xU=";
+      hash = "sha256-FzWiCVwscggFgjKLd4thp1j3A5xMn4AjCSE3PvaBYR0=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-lTxFrmQzWWegmlyBc71fL81iTPqVLB3r8q2gqvrlM3o=";
+      hash = "sha256-CBjBfqy9n5/WH2NBc1GUz13n8KyqhryTx849gMUq+j8=";
     };
   };
 

From 56d9ee22506ddf7314bb85ade68ee0d3e40ea185 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 29 Oct 2025 18:28:41 -0700
Subject: [PATCH 4067/6226] python3Packages.ical: 11.0.0 -> 11.1.0

Diff: https://github.com/allenporter/ical/compare/11.0.0...11.1.0

Changelog: https://github.com/allenporter/ical/releases/tag/11.1.0
---
 pkgs/development/python-modules/ical/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/ical/default.nix b/pkgs/development/python-modules/ical/default.nix
index 88dee1d87ced..3380f34e20ee 100644
--- a/pkgs/development/python-modules/ical/default.nix
+++ b/pkgs/development/python-modules/ical/default.nix
@@ -5,11 +5,9 @@
   fetchFromGitHub,
   freezegun,
   tzdata,
-  pyparsing,
   pydantic,
   pytest-benchmark,
   pytestCheckHook,
-  pythonOlder,
   python-dateutil,
   setuptools,
   syrupy,
@@ -17,16 +15,14 @@
 
 buildPythonPackage rec {
   pname = "ical";
-  version = "11.0.0";
+  version = "11.1.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "allenporter";
     repo = "ical";
     tag = version;
-    hash = "sha256-jn4xPwnJ/RQNTItYv4QY54UejayI0MmDhKZtg2lkpr8=";
+    hash = "sha256-NpE+YHVgaUBR9MzC+zXwqalCwSjF/f+NH/k0S/JusiI=";
   };
 
   build-system = [ setuptools ];
@@ -35,7 +31,6 @@ buildPythonPackage rec {
     python-dateutil
     tzdata
     pydantic
-    pyparsing
   ];
 
   nativeCheckInputs = [

From 68ed260e1673d1f815334ee58625c29738f8a886 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sat, 25 Oct 2025 11:00:22 +0800
Subject: [PATCH 4068/6226] nativefiledialog-extended: init at 1.2.1

---
 .../na/nativefiledialog-extended/package.nix  | 75 +++++++++++++++++++
 1 file changed, 75 insertions(+)
 create mode 100644 pkgs/by-name/na/nativefiledialog-extended/package.nix

diff --git a/pkgs/by-name/na/nativefiledialog-extended/package.nix b/pkgs/by-name/na/nativefiledialog-extended/package.nix
new file mode 100644
index 000000000000..d9ff1ca3b206
--- /dev/null
+++ b/pkgs/by-name/na/nativefiledialog-extended/package.nix
@@ -0,0 +1,75 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  SDL2,
+  SDL2_ttf,
+  gtk3,
+  testers,
+  enableShared ? !stdenv.hostPlatform.isStatic,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "nativefiledialog-extended";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "btzy";
+    repo = "nativefiledialog-extended";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-GwT42lMZAAKSJpUJE6MYOpSLKUD5o9nSe9lcsoeXgJY=";
+  };
+
+  outputs = [
+    "out"
+    "dev"
+  ];
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    SDL2
+    SDL2_ttf
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isLinux [
+    gtk3
+  ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
+    (lib.cmakeBool "nfd_ROOT_PROJECT" true)
+    (lib.cmakeBool "NFD_BUILD_TESTS" true)
+    (lib.cmakeBool "NFD_BUILD_SDL2_TESTS" true)
+    (lib.cmakeBool "NFD_INSTALL" true)
+  ];
+
+  # NOTE: Although the tests have been compiled, they still require GUI
+  # interactions. Let's disable running them for now.
+  doCheck = false;
+
+  passthru.tests = {
+    cmake-config = testers.hasCmakeConfigModules {
+      package = finalAttrs.finalPackage;
+      moduleNames = [ "nfd" ];
+    };
+  };
+
+  meta = {
+    homepage = "https://github.com/btzy/nativefiledialog-extended";
+    description = "Cross platform native file dialog library with C and C++ bindings";
+    longDescription = ''
+      A small C library with that portably invokes native file open, folder
+      select and file save dialogs. Write dialog code once and have it pop up
+      native dialogs on all supported platforms. Avoid linking large
+      dependencies like wxWidgets and Qt.
+    '';
+    license = lib.licenses.zlib;
+    maintainers = with lib.maintainers; [ yzx9 ];
+    platforms = with lib.platforms; linux ++ darwin;
+  };
+})

From 3ecdb073308fc5c3c10355e353593c81ec14749c Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sat, 25 Oct 2025 13:54:54 +0800
Subject: [PATCH 4069/6226] feather-tk: use nativefiledialog-extended by
 default

---
 pkgs/by-name/fe/feather-tk/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fe/feather-tk/package.nix b/pkgs/by-name/fe/feather-tk/package.nix
index 22454b56bf90..4168898f019c 100644
--- a/pkgs/by-name/fe/feather-tk/package.nix
+++ b/pkgs/by-name/fe/feather-tk/package.nix
@@ -11,13 +11,13 @@
   libGL,
   libpng,
   lunasvg,
+  nativefiledialog-extended,
   nlohmann_json,
   plutovg,
   xorg,
   zlib,
-  nativeFileDialog ? null,
   python3Packages ? null,
-  enableNFD ? false,
+  enableNFD ? true,
   enablePython ? false,
   enableTests ? false,
   enableExamples ? false,
@@ -51,8 +51,8 @@ stdenv.mkDerivation (finalAttrs: {
     zlib
     libGL
   ]
-  ++ lib.optionals (enableNFD && nativeFileDialog != null) [
-    nativeFileDialog
+  ++ lib.optionals enableNFD [
+    nativefiledialog-extended
   ]
   ++ lib.optionals (enableNFD && stdenv.isLinux) [
     gtk3

From c84307e3a3d2e9131c611c21640f52fcd522c3d3 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sat, 25 Oct 2025 13:59:28 +0800
Subject: [PATCH 4070/6226] feather-tk: build shared libs

---
 pkgs/by-name/fe/feather-tk/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fe/feather-tk/package.nix b/pkgs/by-name/fe/feather-tk/package.nix
index 4168898f019c..18dca96dc0b2 100644
--- a/pkgs/by-name/fe/feather-tk/package.nix
+++ b/pkgs/by-name/fe/feather-tk/package.nix
@@ -21,6 +21,7 @@
   enablePython ? false,
   enableTests ? false,
   enableExamples ? false,
+  enableShared ? !stdenv.hostPlatform.isStatic,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -31,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "darbyjohnston";
     repo = "feather-tk";
     tag = finalAttrs.version;
-    fetchSubmodules = true;
     hash = "sha256-hcV99y14o3YFUtKDLEKaR7MxBB3pBdd3sferrYvtvYw=";
   };
 
@@ -63,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     (lib.cmakeFeature "CMAKE_BUILD_TYPE" "Release")
+    (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
     (lib.cmakeBool "feather_tk_UI_LIB" true)
     (lib.cmakeFeature "feather_tk_API" "GL_4_1")
     (lib.cmakeBool "feather_tk_nfd" enableNFD)

From a850f666b3f0b1bbbc4b071db87203fd0c28c2d7 Mon Sep 17 00:00:00 2001
From: botnk <github-botnk@korz.dev>
Date: Thu, 30 Oct 2025 01:49:54 +0000
Subject: [PATCH 4071/6226] zed-editor: 0.209.7 -> 0.210.4

Changelog: https://github.com/zed-industries/zed/releases/tag/v0.210.4
---
 pkgs/by-name/ze/zed-editor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index ed74dd70f5d8..bbd8b88a2f43 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -101,7 +101,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.209.7";
+  version = "0.210.4";
 
   outputs = [
     "out"
@@ -114,7 +114,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vmHBPpRFSaqj62NZCAKtc3ZiMe8P++Ji57aJ5cuWjWQ=";
+    hash = "sha256-xSADK/LAbcb47Hd66p+11GuylOFSsbNTVtJtiVOylNQ=";
   };
 
   postPatch = ''
@@ -134,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm -r $out/git/*/candle-book/
   '';
 
-  cargoHash = "sha256-UM01zsi/brSyxzAaEUQ+ZUB8j5c6LMHv0eAhyuQ1huA=";
+  cargoHash = "sha256-bVRDOhjeRwS/j0Lul7JtnvXKUldOYH4dOJhUgMhfeuQ=";
 
   nativeBuildInputs = [
     cmake

From 719539150783ed7bb2460203d5efce8ea3ed055f Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 29 Oct 2025 22:51:28 -0300
Subject: [PATCH 4072/6226] spotify/darwin: 1.2.74.477 -> 1.2.75.510

---
 pkgs/by-name/sp/spotify/darwin.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sp/spotify/darwin.nix b/pkgs/by-name/sp/spotify/darwin.nix
index 3620e348bdbd..eb755a90b8bc 100644
--- a/pkgs/by-name/sp/spotify/darwin.nix
+++ b/pkgs/by-name/sp/spotify/darwin.nix
@@ -11,7 +11,7 @@
 stdenv.mkDerivation {
   inherit pname;
 
-  version = "1.2.74.477";
+  version = "1.2.75.510";
 
   src =
     # WARNING: This Wayback Machine URL redirects to the closest timestamp.
@@ -20,13 +20,13 @@ stdenv.mkDerivation {
     # https://web.archive.org/web/*/https://download.scdn.co/Spotify.dmg
     if stdenv.hostPlatform.isAarch64 then
       (fetchurl {
-        url = "https://web.archive.org/web/20251010104459/https://download.scdn.co/SpotifyARM64.dmg";
-        hash = "sha256-0gwoptqLBJBM0qJQ+dGAZdCD6WXzDJEs0BfOxz7f2nQ=";
+        url = "https://web.archive.org/web/20251029235406/https://download.scdn.co/SpotifyARM64.dmg";
+        hash = "sha256-gEZxRBT7Jo2m6pirf+CreJiMeE2mhIkpe9Mv5t0RI58=";
       })
     else
       (fetchurl {
-        url = "https://web.archive.org/web/20251010104433/https://download.scdn.co/Spotify.dmg";
-        hash = "sha256-8CrhLbnswbuAjRMaan2cTnnOMsr3vpW92IQ00KwPUHo=";
+        url = "https://web.archive.org/web/20251029235833/https://download.scdn.co/Spotify.dmg";
+        hash = "sha256-fhQYm7yMrlvY57gMuWGU31EbWidZ2l9bd44mhokZKTw=";
       });
 
   nativeBuildInputs = [ undmg ];

From 196e1e83a7b13cefd23612219f552ac54611afc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 29 Oct 2025 18:56:18 -0700
Subject: [PATCH 4073/6226] python3Packages.python-pooldose: 0.7.0 -> 0.7.8

Diff: https://github.com/lmaertin/python-pooldose/compare/0.7.0...0.7.8

Changelog: https://github.com/lmaertin/python-pooldose/blob/0.7.8/CHANGELOG.md
---
 pkgs/development/python-modules/python-pooldose/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-pooldose/default.nix b/pkgs/development/python-modules/python-pooldose/default.nix
index 1f3c9b7a2a3b..a91945b27487 100644
--- a/pkgs/development/python-modules/python-pooldose/default.nix
+++ b/pkgs/development/python-modules/python-pooldose/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "python-pooldose";
-  version = "0.7.0";
+  version = "0.7.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lmaertin";
     repo = "python-pooldose";
     tag = version;
-    hash = "sha256-tTJNmcBSSmrJgMnKeV5YTrvZWHFnmVKysJrEBXYTpAo=";
+    hash = "sha256-TOwogNRWmdbzEjvjSUYw9+5CXHfF2OXq8Jxaj3KsQ+A=";
   };
 
   build-system = [ setuptools ];

From ab7cfd3930ba9a7c7f21fd8b59ed521c09ac9053 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 29 Oct 2025 18:59:23 -0700
Subject: [PATCH 4074/6226] python3Packages.letpot: 0.6.2 -> 0.6.3

Diff: https://github.com/jpelgrom/python-letpot/compare/v0.6.2...v0.6.3

Changelog: https://github.com/jpelgrom/python-letpot/releases/tag/v0.6.3
---
 pkgs/development/python-modules/letpot/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/letpot/default.nix b/pkgs/development/python-modules/letpot/default.nix
index d6d2b03d56b5..ccb4949b75d4 100644
--- a/pkgs/development/python-modules/letpot/default.nix
+++ b/pkgs/development/python-modules/letpot/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "letpot";
-  version = "0.6.2";
+  version = "0.6.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jpelgrom";
     repo = "python-letpot";
     tag = "v${version}";
-    hash = "sha256-aSnh1tCHAa5nLWkt0vmEXE0Dow6A5Zb6AkbTX15F6A0=";
+    hash = "sha256-ULU+KBeE7T7qFQvw4KXz3/o2ZkZZa/C1QGqTPwlK7+c=";
   };
 
   build-system = [ poetry-core ];

From e2d9e094d23dd614477dffd1ee69a3aea8ca1f28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 29 Oct 2025 19:01:03 -0700
Subject: [PATCH 4075/6226] python3Packages.python-ecobee-api: 0.3.1 -> 0.3.2

Diff: https://github.com/nkgilley/python-ecobee-api/compare/0.3.1...0.3.2

Changelog: https://github.com/nkgilley/python-ecobee-api/releases/tag/0.3.2
---
 .../python-modules/python-ecobee-api/default.nix           | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/python-ecobee-api/default.nix b/pkgs/development/python-modules/python-ecobee-api/default.nix
index 3ccbd71be866..81cd2477e97e 100644
--- a/pkgs/development/python-modules/python-ecobee-api/default.nix
+++ b/pkgs/development/python-modules/python-ecobee-api/default.nix
@@ -2,23 +2,20 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   requests,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "python-ecobee-api";
-  version = "0.3.1";
+  version = "0.3.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "nkgilley";
     repo = "python-ecobee-api";
     tag = version;
-    hash = "sha256-7AFt5WHtAr1DRG1kjmUwYMHVwbonltNvzgewDuFa6Tk=";
+    hash = "sha256-6uZc022C3EgEgsPGD302qAtFqubwQSETQr3SQSYXeb8=";
   };
 
   build-system = [ setuptools ];

From 16a364eb66e5ccbc3640ba644e4ae146ac68dd6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 29 Oct 2025 19:03:16 -0700
Subject: [PATCH 4076/6226] python3Packages.watergate-local-api: 2024.4.1 ->
 2025.1.0

Diff: https://github.com/watergate-ai/watergate-local-api-python/compare/2024.4.1...2025.1.0

Changelog: https://github.com/watergate-ai/watergate-local-api-python/releases/tag/2025.1.0
---
 .../python-modules/watergate-local-api/default.nix           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/watergate-local-api/default.nix b/pkgs/development/python-modules/watergate-local-api/default.nix
index d8d2d4a2e2bd..ac7435549ac3 100644
--- a/pkgs/development/python-modules/watergate-local-api/default.nix
+++ b/pkgs/development/python-modules/watergate-local-api/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "watergate-local-api";
-  version = "2024.4.1";
+  version = "2025.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "watergate-ai";
     repo = "watergate-local-api-python";
     tag = version;
-    hash = "sha256-zEbujtXTXjRRzpNdowh7xjBvCxwp7Z1QYRm6ZM8rFR8=";
+    hash = "sha256-px1vtWGW9JlU9ZXvmTq9YXZDmWIU0xYy3KOyamGyY74=";
   };
 
   build-system = [ setuptools ];
@@ -36,6 +36,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
+    changelog = "https://github.com/watergate-ai/watergate-local-api-python/releases/tag/${src.tag}";
     description = "Python package to interact with the Watergate Local API";
     homepage = "https://github.com/watergate-ai/watergate-local-api-python";
     license = lib.licenses.gpl3Only;

From 5f37a22460f2d75b049525c024641c1898048bec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 02:06:38 +0000
Subject: [PATCH 4077/6226] klipper: 0.13.0-unstable-2025-10-23 ->
 0.13.0-unstable-2025-10-27

---
 pkgs/servers/klipper/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix
index 81c297d1b898..8b0215338abb 100644
--- a/pkgs/servers/klipper/default.nix
+++ b/pkgs/servers/klipper/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "klipper";
-  version = "0.13.0-unstable-2025-10-23";
+  version = "0.13.0-unstable-2025-10-27";
 
   src = fetchFromGitHub {
     owner = "KevinOConnor";
     repo = "klipper";
-    rev = "6465921a5adb3a3335494598463066a6c3540cb5";
-    sha256 = "sha256-UKLJ+sf2g6BSbF+aNZ+QGcqVjFkV5GX9Sei6BCdqQL4=";
+    rev = "99c0bfca4f4875e8a602c9b4ffc698d9e5cc59a0";
+    sha256 = "sha256-U+oDa8g5o8F5i2A81/glOPaTTrBv6dBEHdYht2jrVu4=";
   };
 
   sourceRoot = "${src.name}/klippy";

From 8c8277819cf29ed901715550a6189127ad0ae8e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 02:07:01 +0000
Subject: [PATCH 4078/6226] stalwart-mail: 0.14.0 -> 0.14.1

---
 pkgs/by-name/st/stalwart-mail/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix
index c39e939280b6..89f81f4a97cf 100644
--- a/pkgs/by-name/st/stalwart-mail/package.nix
+++ b/pkgs/by-name/st/stalwart-mail/package.nix
@@ -21,16 +21,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "stalwart-mail" + (lib.optionalString stalwartEnterprise "-enterprise");
-  version = "0.14.0";
+  version = "0.14.1";
 
   src = fetchFromGitHub {
     owner = "stalwartlabs";
     repo = "stalwart";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KH68lFF1eqYZiI5AjzDRX6Z21MQ9At4jH6x9jsQzejE=";
+    hash = "sha256-Wsk4n6jLOAFhxYb5Hw8XvQem0xccGGoD729nRz3bRF0=";
   };
 
-  cargoHash = "sha256-pjmAIC7g8SbMxZvTgaXH8GrRPhITDjC5psJpfT+vV6M=";
+  cargoHash = "sha256-LFXpv8/rHQwzdKEyS4VplQSwFUnZrgv0qDIhZUOGfpo=";
 
   depsBuildBuild = [
     pkg-config

From c6e56e77a12dbb311037ae66e0c26aaaf9bca8e3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 02:14:04 +0000
Subject: [PATCH 4079/6226] python3Packages.twilio: 9.8.4 -> 9.8.5

---
 pkgs/development/python-modules/twilio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix
index 6eef16930505..f2144153303b 100644
--- a/pkgs/development/python-modules/twilio/default.nix
+++ b/pkgs/development/python-modules/twilio/default.nix
@@ -21,7 +21,7 @@
 
 buildPythonPackage rec {
   pname = "twilio";
-  version = "9.8.4";
+  version = "9.8.5";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -30,7 +30,7 @@ buildPythonPackage rec {
     owner = "twilio";
     repo = "twilio-python";
     tag = version;
-    hash = "sha256-vkRGSFWCOHcGUC5oBmgvCi1mNFp/SsHv5/bhceYVlY0=";
+    hash = "sha256-krEhiuE3Yd4w9zGpCzvR8X2w6M0dvPRZsavrtTNhKDA=";
   };
 
   build-system = [ setuptools ];

From e75c9220415065f45772e60bb9a50e539639fd15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 02:22:51 +0000
Subject: [PATCH 4080/6226] vdo: 8.3.1.1 -> 8.3.2.1

---
 pkgs/by-name/vd/vdo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vd/vdo/package.nix b/pkgs/by-name/vd/vdo/package.nix
index 64860aa4202d..4f143f3a7c12 100644
--- a/pkgs/by-name/vd/vdo/package.nix
+++ b/pkgs/by-name/vd/vdo/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "vdo";
-  version = "8.3.1.1";
+  version = "8.3.2.1";
 
   src = fetchFromGitHub {
     owner = "dm-vdo";
     repo = "vdo";
     rev = version;
-    hash = "sha256-6oX3ngsBPhE6XsMfliWw5Qzu3UosnsIFIAFRCqckU7U=";
+    hash = "sha256-y3u9f17jMV9dwhfJrsW/GOqszVNvPLDyETfku1t3Djo=";
   };
 
   nativeBuildInputs = [

From 1df02b65599769a7be56579dc123aa9cd0b28ca0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 29 Oct 2025 19:38:40 -0700
Subject: [PATCH 4081/6226] python3Packages.vegehub: 0.1.25 -> 0.1.26

Diff: https://github.com/Thulrus/VegeHubPyPiLib/compare/V0.1.25...V0.1.26

Changelog: https://github.com/Thulrus/VegeHubPyPiLib/releases/tag/V0.1.26
---
 pkgs/development/python-modules/vegehub/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/vegehub/default.nix b/pkgs/development/python-modules/vegehub/default.nix
index a110601dbac3..5ec7c0d89948 100644
--- a/pkgs/development/python-modules/vegehub/default.nix
+++ b/pkgs/development/python-modules/vegehub/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "vegehub";
-  version = "0.1.25";
+  version = "0.1.26";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Thulrus";
     repo = "VegeHubPyPiLib";
     tag = "V${version}";
-    hash = "sha256-jdD+vYcnrwPVJhVBVvB7ULcD1KrOudUC2K/agxHLnwY=";
+    hash = "sha256-OrHUT1WchsaoPNFBZn74jpihd8I/R1RB0+KZRKg9Zrs=";
   };
 
   postPatch = ''

From 6ae9f9c5dbae3e7cd1ffe64f29586969c56b8b1f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 02:59:38 +0000
Subject: [PATCH 4082/6226] python3Packages.loro: 1.8.1 -> 1.8.2

---
 pkgs/development/python-modules/loro/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/loro/default.nix b/pkgs/development/python-modules/loro/default.nix
index 32d7e528a6f8..706c4b241e1e 100644
--- a/pkgs/development/python-modules/loro/default.nix
+++ b/pkgs/development/python-modules/loro/default.nix
@@ -8,17 +8,17 @@
 
 buildPythonPackage rec {
   pname = "loro";
-  version = "1.8.1";
+  version = "1.8.2";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Is+xliW9ckXpdH7p1DsQURwWo1d1o4z5FNx0hjxNvog=";
+    hash = "sha256-0i3BfL7GUu2L9if4AaCjLieoe0R2oquW9FoC0WPXM64=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-b1zzDVK/pdxkAUeksmZZ8sbgyrXtJbwAfpNxkH4PevY=";
+    hash = "sha256-pJJiwLHh10G9L+NZhxcCif2OP1cpjyNCaeG28YyYxmM=";
   };
 
   build-system = [

From 68585d53f982a4baadec4ef9efbf2c197cb11b32 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 03:06:21 +0000
Subject: [PATCH 4083/6226] kubernetes-validate: 1.33.1 -> 1.34.1

---
 pkgs/by-name/ku/kubernetes-validate/unwrapped.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix b/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix
index 2c9098ab25fa..7b55b7f76acf 100644
--- a/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix
+++ b/pkgs/by-name/ku/kubernetes-validate/unwrapped.nix
@@ -14,13 +14,13 @@
 }:
 buildPythonPackage rec {
   pname = "kubernetes-validate";
-  version = "1.33.1";
+  version = "1.34.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "kubernetes_validate";
     inherit version;
-    hash = "sha256-U2Nb9mpeBJASCa5/av8OjBnvoUXMmpCHI0TJKjE1Opk=";
+    hash = "sha256-uC2kR6QG/EdauD4PZ4tkQixZX8EHcN0nMyDCRMm0AxU=";
   };
 
   build-system = [

From a29e13056894ed180b17bf0b3625d7c760c329db Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Wed, 29 Oct 2025 16:09:54 +0800
Subject: [PATCH 4084/6226] python3Packages.warp-lang: organize files and
 patches

---
 .../python-modules/warp-lang/clang-libs.patch |  15 ++
 .../python-modules/warp-lang/clang-path.patch |  28 +++
 ...dalone-cxx11-abi.patch => cxx11-abi.patch} |   0
 .../warp-lang/darwin-libcxx.patch             |  17 --
 .../python-modules/warp-lang/default.nix      | 168 +++++-------------
 .../python-modules/warp-lang/libmathdx.nix    |  95 ++++++++++
 ...{standalone-llvm.patch => llvm-libs.patch} |  15 +-
 7 files changed, 185 insertions(+), 153 deletions(-)
 create mode 100644 pkgs/development/python-modules/warp-lang/clang-libs.patch
 create mode 100644 pkgs/development/python-modules/warp-lang/clang-path.patch
 rename pkgs/development/python-modules/warp-lang/{standalone-cxx11-abi.patch => cxx11-abi.patch} (100%)
 create mode 100644 pkgs/development/python-modules/warp-lang/libmathdx.nix
 rename pkgs/development/python-modules/warp-lang/{standalone-llvm.patch => llvm-libs.patch} (71%)

diff --git a/pkgs/development/python-modules/warp-lang/clang-libs.patch b/pkgs/development/python-modules/warp-lang/clang-libs.patch
new file mode 100644
index 000000000000..3c8a5b87a0b8
--- /dev/null
+++ b/pkgs/development/python-modules/warp-lang/clang-libs.patch
@@ -0,0 +1,15 @@
+diff --git a/warp/build_dll.py b/warp/build_dll.py
+index 2218ff13..3fcf5796 100644
+--- a/warp/build_dll.py
++++ b/warp/build_dll.py
+@@ -404,8 +404,8 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: Optional[
+         cuda_compiler = "clang++" if getattr(args, "clang_build_toolchain", False) else "nvcc"
+         cpp_compiler = "clang++" if getattr(args, "clang_build_toolchain", False) else "g++"
+ 
+-        cpp_includes = f' -I"{warp_home_path.parent}/external/llvm-project/out/install/{mode}-{arch}/include"'
+-        cpp_includes += f' -I"{warp_home_path.parent}/_build/host-deps/llvm-project/release-{arch}/include"'
++        cpp_includes = ' -I"@LLVM_DEV@/include"'
++        cpp_includes += ' -I"@LIBCLANG_DEV@/include"'
+         cuda_includes = f' -I"{cuda_home}/include"' if cu_path else ""
+         includes = cpp_includes + cuda_includes
+
diff --git a/pkgs/development/python-modules/warp-lang/clang-path.patch b/pkgs/development/python-modules/warp-lang/clang-path.patch
new file mode 100644
index 000000000000..ad87f9b3ab15
--- /dev/null
+++ b/pkgs/development/python-modules/warp-lang/clang-path.patch
@@ -0,0 +1,28 @@
+diff --git a/warp/build_dll.py b/warp/build_dll.py
+index 11d2a898..33fb2a76 100644
+--- a/warp/build_dll.py
++++ b/warp/build_dll.py
+@@ -636,8 +636,8 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: list[str]
+ 
+     else:
+         # Unix compilation
+-        cuda_compiler = "clang++" if getattr(args, "clang_build_toolchain", False) else "nvcc"
+-        cpp_compiler = "clang++" if getattr(args, "clang_build_toolchain", False) else "g++"
++        cuda_compiler = "@CLANG@" if getattr(args, "clang_build_toolchain", False) else "nvcc"
++        cpp_compiler = "@CLANG@" if getattr(args, "clang_build_toolchain", False) else "g++"
+ 
+         cpp_includes = f' -I"{warp_home_path.parent}/external/llvm-project/out/install/{mode}-{arch}/include"'
+         cpp_includes += f' -I"{warp_home_path.parent}/_build/host-deps/llvm-project/release-{arch}/include"'
+@@ -687,9 +687,9 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: list[str]
+             else:
+                 # Use Clang compiler
+                 if mode == "debug":
+-                    cuda_cmd = f'clang++ -Werror -Wuninitialized -Wno-unknown-cuda-version {" ".join(clang_opts)} -g -O0 -fPIC -fvisibility=hidden -D_DEBUG -D_ITERATOR_DEBUG_LEVEL=0 -DWP_ENABLE_CUDA=1 -I"{native_dir}" -D{mathdx_enabled} {libmathdx_includes} -o "{cu_out}" -c "{cu_path}"'
++                    cuda_cmd = f'@CLANG@ -Werror -Wuninitialized -Wno-unknown-cuda-version {" ".join(clang_opts)} -g -O0 -fPIC -fvisibility=hidden -D_DEBUG -D_ITERATOR_DEBUG_LEVEL=0 -DWP_ENABLE_CUDA=1 -I"{native_dir}" -D{mathdx_enabled} {libmathdx_includes} -o "{cu_out}" -c "{cu_path}"'
+                 elif mode == "release":
+-                    cuda_cmd = f'clang++ -Werror -Wuninitialized -Wno-unknown-cuda-version {" ".join(clang_opts)} -O3 -fPIC -fvisibility=hidden -DNDEBUG -DWP_ENABLE_CUDA=1 -I"{native_dir}" -D{mathdx_enabled} {libmathdx_includes} -o "{cu_out}" -c "{cu_path}"'
++                    cuda_cmd = f'@CLANG@ -Werror -Wuninitialized -Wno-unknown-cuda-version {" ".join(clang_opts)} -O3 -fPIC -fvisibility=hidden -DNDEBUG -DWP_ENABLE_CUDA=1 -I"{native_dir}" -D{mathdx_enabled} {libmathdx_includes} -o "{cu_out}" -c "{cu_path}"'
+ 
+             with ScopedTimer("build_cuda", active=args.verbose):
+                 run_cmd(cuda_cmd)
+
diff --git a/pkgs/development/python-modules/warp-lang/standalone-cxx11-abi.patch b/pkgs/development/python-modules/warp-lang/cxx11-abi.patch
similarity index 100%
rename from pkgs/development/python-modules/warp-lang/standalone-cxx11-abi.patch
rename to pkgs/development/python-modules/warp-lang/cxx11-abi.patch
diff --git a/pkgs/development/python-modules/warp-lang/darwin-libcxx.patch b/pkgs/development/python-modules/warp-lang/darwin-libcxx.patch
index 64bc5c58c7e5..beda9f58e6de 100644
--- a/pkgs/development/python-modules/warp-lang/darwin-libcxx.patch
+++ b/pkgs/development/python-modules/warp-lang/darwin-libcxx.patch
@@ -18,20 +18,3 @@ index 2218ff13..53786017 100644
          if cu_path:
              cu_out = cu_path + ".o"
  
-diff --git a/warp/native/crt.h b/warp/native/crt.h
-index 47ef9983..89ae289b 100644
---- a/warp/native/crt.h
-+++ b/warp/native/crt.h
-@@ -65,6 +65,12 @@ extern "C" WP_API int _wp_isinf(double);
- #include <float.h>
- #include <string.h>
- 
-+#undef isfinite
-+#undef isinf
-+#undef isnan
-+
-+#include <cmath>
-+
- #else
- 
- // These definitions are taken from Jitify: https://github.com/NVIDIA/jitify
diff --git a/pkgs/development/python-modules/warp-lang/default.nix b/pkgs/development/python-modules/warp-lang/default.nix
index e09e7560bb55..0f90b01b2801 100644
--- a/pkgs/development/python-modules/warp-lang/default.nix
+++ b/pkgs/development/python-modules/warp-lang/default.nix
@@ -1,11 +1,10 @@
 {
-  _cuda,
   autoAddDriverRunpath,
   buildPythonPackage,
   config,
   cudaPackages,
+  callPackage,
   fetchFromGitHub,
-  fetchurl,
   jax,
   lib,
   llvmPackages, # TODO: use llvm 21 in 1.10, see python-packages.nix
@@ -33,100 +32,16 @@
   # libmathdxSupport ? cudaSupport && stdenv.hostPlatform.isLinux,
   libmathdxSupport ? cudaSupport,
 }@args:
+
 assert libmathdxSupport -> cudaSupport;
+
 let
   effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else args.stdenv;
   stdenv = throw "Use effectiveStdenv instead of stdenv directly, as it may be replaced by cudaPackages.backendStdenv";
 
   version = "1.9.1";
 
-  libmathdx = effectiveStdenv.mkDerivation (finalAttrs: {
-    # NOTE: The version used should match the version Warp requires:
-    # https://github.com/NVIDIA/warp/blob/${version}/deps/libmathdx-deps.packman.xml
-    pname = "libmathdx";
-    version = "0.2.3";
-
-    outputs = [
-      "out"
-      "static"
-    ];
-
-    src =
-      let
-        baseURL = "https://developer.nvidia.com/downloads/compute/cublasdx/redist/cublasdx";
-        cudaMajorVersion = cudaPackages.cudaMajorVersion; # only 12, 13 supported
-        cudaVersion = "${cudaMajorVersion}.0"; # URL example: ${baseURL}/cuda12/${name}-${version}-cuda12.0.zip
-        name = lib.concatStringsSep "-" [
-          finalAttrs.pname
-          "Linux"
-          effectiveStdenv.hostPlatform.parsed.cpu.name
-          finalAttrs.version
-          "cuda${cudaVersion}"
-        ];
-
-        # nix-hash --type sha256 --to-sri $(nix-prefetch-url "https://...")
-        hashes = {
-          "12" = {
-            aarch64-linux = "sha256-d/aBC+zU2ciaw3isv33iuviXYaLGLdVDdzynGk9SFck=";
-            x86_64-linux = "sha256-CHIH0s4SnA67COtHBkwVCajW/3f0VxNBmuDLXy4LFIg=";
-          };
-          "13" = {
-            aarch64-linux = "sha256-TetJbMts8tpmj5PV4+jpnUHMcooDrXUEKL3aGWqilKI=";
-            x86_64-linux = "sha256-wLJLbRpQWa6QEm8ibm1gxt3mXvkWvu0vEzpnqTIvE1M=";
-          };
-        };
-      in
-      lib.mapNullable (
-        hash:
-        fetchurl {
-          inherit hash name;
-          url = "${baseURL}/cuda${cudaMajorVersion}/${name}.tar.gz";
-        }
-      ) (hashes.${cudaMajorVersion}.${effectiveStdenv.hostPlatform.system} or null);
-
-    dontUnpack = true;
-    dontConfigure = true;
-    dontBuild = true;
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p "$out"
-      tar -xzf "$src" -C "$out"
-
-      mkdir -p "$static"
-      moveToOutput "lib/libmathdx_static.a" "$static"
-
-      runHook postInstall
-    '';
-
-    meta = {
-      description = "Library used to integrate cuBLASDx and cuFFTDx into Warp";
-      homepage = "https://developer.nvidia.com/cublasdx-downloads";
-      sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
-      license = with lib.licenses; [
-        # By downloading and using the software, you agree to fully
-        # comply with the terms and conditions of the NVIDIA Software
-        # License Agreement.
-        _cuda.lib.licenses.math_sdk_sla
-
-        # Some of the libmathdx routines were written by or derived
-        # from code written by Meta Platforms, Inc. and affiliates and
-        # are subject to the BSD License.
-        bsd3
-
-        # Some of the libmathdx routines were written by or derived from
-        # code written by Victor Zverovich and are subject to the following
-        # license:
-        mit
-      ];
-      platforms = [
-        "aarch64-linux"
-        "x86_64-linux"
-      ];
-      maintainers = with lib.maintainers; [ yzx9 ];
-    };
-  });
+  libmathdx = callPackage ./libmathdx.nix { };
 in
 buildPythonPackage {
   pname = "warp-lang";
@@ -147,41 +62,51 @@ buildPythonPackage {
     hash = "sha256-Atp3WyxQ7GYwWLmQIUgoPULyVlNjduh4/9CBixNWFwc=";
   };
 
-  patches =
-    lib.optionals effectiveStdenv.hostPlatform.isDarwin [
-      (replaceVars ./darwin-libcxx.patch {
-        LIBCXX_DEV = llvmPackages.libcxx.dev;
-        LIBCXX_LIB = llvmPackages.libcxx;
-      })
-      ./darwin-single-target.patch
-    ]
-    ++ lib.optionals standaloneSupport [
-      (replaceVars ./standalone-llvm.patch {
-        LLVM_DEV = llvmPackages.llvm.dev;
-        LLVM_LIB = llvmPackages.llvm.lib;
-        LIBCLANG_DEV = llvmPackages.libclang.dev;
-        LIBCLANG_LIB = llvmPackages.libclang.lib;
-      })
-      ./standalone-cxx11-abi.patch
-    ];
+  patches = [
+    ./cxx11-abi.patch
+  ]
+  ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [
+    (replaceVars ./darwin-libcxx.patch {
+      LIBCXX_DEV = llvmPackages.libcxx.dev;
+      LIBCXX_LIB = llvmPackages.libcxx;
+    })
+
+    ./darwin-single-target.patch
+  ]
+  ++ lib.optionals (effectiveStdenv.cc.isClang || standaloneSupport) [
+    (replaceVars ./clang-path.patch {
+      CLANG = "${effectiveStdenv.cc}/bin/cc";
+    })
+
+    (replaceVars ./clang-libs.patch {
+      LLVM_DEV = llvmPackages.llvm.dev;
+      LIBCLANG_DEV = llvmPackages.libclang.dev;
+    })
+  ]
+  ++ lib.optionals standaloneSupport [
+    (replaceVars ./llvm-libs.patch {
+      LLVM_LIB = llvmPackages.llvm.lib;
+      LIBCLANG_LIB = llvmPackages.libclang.lib;
+    })
+  ];
 
   postPatch =
     # Patch build_dll.py to use our gencode flags rather than NVIDIA's very broad defaults.
     lib.optionalString cudaSupport ''
       nixLog "patching $PWD/warp/build_dll.py to use our gencode flags"
       substituteInPlace "$PWD/warp/build_dll.py" \
-          --replace-fail \
-            '*gencode_opts,' \
-            '${
-              lib.concatMapStringsSep ", " (gencodeString: ''"${gencodeString}"'') cudaPackages.flags.gencode
-            },' \
-          --replace-fail \
-            '*clang_arch_flags,' \
-            '${
-              lib.concatMapStringsSep ", " (
-                realArch: ''"--cuda-gpu-arch=${realArch}"''
-              ) cudaPackages.flags.realArches
-            },'
+        --replace-fail \
+          '*gencode_opts,' \
+          '${
+            lib.concatMapStringsSep ", " (gencodeString: ''"${gencodeString}"'') cudaPackages.flags.gencode
+          },' \
+        --replace-fail \
+          '*clang_arch_flags,' \
+          '${
+            lib.concatMapStringsSep ", " (
+              realArch: ''"--cuda-gpu-arch=${realArch}"''
+            ) cudaPackages.flags.realArches
+          },'
     ''
     # Patch build_dll.py to use dynamic libraries rather than static ones.
     # NOTE: We do not patch the `nvptxcompiler_static` path because it is not available as a dynamic library.
@@ -232,11 +157,10 @@ buildPythonPackage {
     numpy
   ];
 
-  # NOTE: While normally we wouldn't include autoAddDriverRunpath for packages built from source, since Warp
-  # will be loading GPU drivers at runtime, we need to inject the path to our video drivers.
   nativeBuildInputs = lib.optionals cudaSupport [
+    # NOTE: While normally we wouldn't include autoAddDriverRunpath for packages built from source, since Warp
+    # will be loading GPU drivers at runtime, we need to inject the path to our video drivers.
     autoAddDriverRunpath
-    cudaPackages.cuda_nvcc
   ];
 
   buildInputs =
@@ -246,7 +170,7 @@ buildPythonPackage {
       llvmPackages.libcxx
     ]
     ++ lib.optionals cudaSupport [
-      (lib.getOutput "static" cudaPackages.cuda_nvcc) # dependency on nvptxcompiler_static; no dynamic version available
+      (lib.getStatic cudaPackages.cuda_nvcc) # dependency on nvptxcompiler_static; no dynamic version available
       cudaPackages.cuda_cccl
       cudaPackages.cuda_cudart
       cudaPackages.cuda_nvcc
diff --git a/pkgs/development/python-modules/warp-lang/libmathdx.nix b/pkgs/development/python-modules/warp-lang/libmathdx.nix
new file mode 100644
index 000000000000..1de70997fd66
--- /dev/null
+++ b/pkgs/development/python-modules/warp-lang/libmathdx.nix
@@ -0,0 +1,95 @@
+{
+  _cuda,
+  cudaPackages,
+  fetchurl,
+  lib,
+  stdenvNoCC,
+}:
+
+stdenvNoCC.mkDerivation (finalAttrs: {
+  # NOTE: The version used should match the version Warp requires:
+  # https://github.com/NVIDIA/warp/blob/${version}/deps/libmathdx-deps.packman.xml
+  pname = "libmathdx";
+  version = "0.2.3";
+
+  outputs = [
+    "out"
+    "static"
+  ];
+
+  src =
+    let
+      baseURL = "https://developer.nvidia.com/downloads/compute/cublasdx/redist/cublasdx";
+      cudaMajorVersion = cudaPackages.cudaMajorVersion; # only 12, 13 supported
+      cudaVersion = "${cudaMajorVersion}.0"; # URL example: ${baseURL}/cuda12/${name}-${version}-cuda12.0.zip
+      name = lib.concatStringsSep "-" [
+        finalAttrs.pname
+        "Linux"
+        stdenvNoCC.hostPlatform.parsed.cpu.name
+        finalAttrs.version
+        "cuda${cudaVersion}"
+      ];
+
+      # nix-hash --type sha256 --to-sri $(nix-prefetch-url "https://...")
+      hashes = {
+        "12" = {
+          aarch64-linux = "sha256-d/aBC+zU2ciaw3isv33iuviXYaLGLdVDdzynGk9SFck=";
+          x86_64-linux = "sha256-CHIH0s4SnA67COtHBkwVCajW/3f0VxNBmuDLXy4LFIg=";
+        };
+        "13" = {
+          aarch64-linux = "sha256-TetJbMts8tpmj5PV4+jpnUHMcooDrXUEKL3aGWqilKI=";
+          x86_64-linux = "sha256-wLJLbRpQWa6QEm8ibm1gxt3mXvkWvu0vEzpnqTIvE1M=";
+        };
+      };
+    in
+    lib.mapNullable (
+      hash:
+      fetchurl {
+        inherit hash name;
+        url = "${baseURL}/cuda${cudaMajorVersion}/${name}.tar.gz";
+      }
+    ) (hashes.${cudaMajorVersion}.${stdenvNoCC.hostPlatform.system} or null);
+
+  dontUnpack = true;
+  dontConfigure = true;
+  dontBuild = true;
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out"
+    tar -xzf "$src" -C "$out"
+
+    mkdir -p "$static"
+    moveToOutput "lib/libmathdx_static.a" "$static"
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "Library used to integrate cuBLASDx and cuFFTDx into Warp";
+    homepage = "https://developer.nvidia.com/cublasdx-downloads";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = with lib.licenses; [
+      # By downloading and using the software, you agree to fully
+      # comply with the terms and conditions of the NVIDIA Software
+      # License Agreement.
+      _cuda.lib.licenses.math_sdk_sla
+
+      # Some of the libmathdx routines were written by or derived
+      # from code written by Meta Platforms, Inc. and affiliates and
+      # are subject to the BSD License.
+      bsd3
+
+      # Some of the libmathdx routines were written by or derived from
+      # code written by Victor Zverovich and are subject to the following
+      # license:
+      mit
+    ];
+    platforms = [
+      "aarch64-linux"
+      "x86_64-linux"
+    ];
+    maintainers = with lib.maintainers; [ yzx9 ];
+  };
+})
diff --git a/pkgs/development/python-modules/warp-lang/standalone-llvm.patch b/pkgs/development/python-modules/warp-lang/llvm-libs.patch
similarity index 71%
rename from pkgs/development/python-modules/warp-lang/standalone-llvm.patch
rename to pkgs/development/python-modules/warp-lang/llvm-libs.patch
index 83860f49fbba..9eaf4e1ee023 100644
--- a/pkgs/development/python-modules/warp-lang/standalone-llvm.patch
+++ b/pkgs/development/python-modules/warp-lang/llvm-libs.patch
@@ -46,17 +46,4 @@ index aee0a9f1..6b9806c9 100644
              libs.append("-lpthread")
              libs.append("-ldl")
              if sys.platform != "darwin":
-diff --git a/warp/build_dll.py b/warp/build_dll.py
-index 2218ff13..3fcf5796 100644
---- a/warp/build_dll.py
-+++ b/warp/build_dll.py
-@@ -404,8 +404,8 @@ def build_dll_for_arch(args, dll_path, cpp_paths, cu_path, arch, libs: Optional[
-         cuda_compiler = "clang++" if getattr(args, "clang_build_toolchain", False) else "nvcc"
-         cpp_compiler = "clang++" if getattr(args, "clang_build_toolchain", False) else "g++"
- 
--        cpp_includes = f' -I"{warp_home_path.parent}/external/llvm-project/out/install/{mode}-{arch}/include"'
--        cpp_includes += f' -I"{warp_home_path.parent}/_build/host-deps/llvm-project/release-{arch}/include"'
-+        cpp_includes = ' -I"@LLVM_DEV@/include"'
-+        cpp_includes += ' -I"@LIBCLANG_DEV@/include"'
-         cuda_includes = f' -I"{cuda_home}/include"' if cu_path else ""
-         includes = cpp_includes + cuda_includes
+

From bde133813053445a0485231aaf61354f3b18a6be Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Wed, 29 Oct 2025 16:20:54 +0800
Subject: [PATCH 4085/6226] python3Packages.warp-lang: dynamic link llvm and
 clang-cpp

---
 .../python-modules/warp-lang/llvm-libs.patch    | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/warp-lang/llvm-libs.patch b/pkgs/development/python-modules/warp-lang/llvm-libs.patch
index 9eaf4e1ee023..60c967004001 100644
--- a/pkgs/development/python-modules/warp-lang/llvm-libs.patch
+++ b/pkgs/development/python-modules/warp-lang/llvm-libs.patch
@@ -1,8 +1,8 @@
 diff --git a/build_llvm.py b/build_llvm.py
-index aee0a9f1..6b9806c9 100644
+index aee0a9f1..20cfe8f3 100644
 --- a/build_llvm.py
 +++ b/build_llvm.py
-@@ -350,25 +350,19 @@ def build_warp_clang_for_arch(args, lib_name: str, arch: str) -> None:
+@@ -350,33 +350,23 @@ def build_warp_clang_for_arch(args, lib_name: str, arch: str) -> None:
  
          clang_dll_path = os.path.join(build_path, f"bin/{lib_name}")
  
@@ -15,18 +15,14 @@ index aee0a9f1..6b9806c9 100644
 -            fetch_prebuilt_libraries(arch)
 -            libpath = os.path.join(base_path, f"_build/host-deps/llvm-project/release-{arch}/lib")
 -
-+        # obtain Clang and LLVM libraries from the local build
-         libs = []
+-        libs = []
 -
 -        for _, _, libraries in os.walk(libpath):
 -            libs.extend(libraries)
 -            break  # just the top level contains library files
++        libs = ["LLVM", "clang-cpp"]
 +        install_paths = ["@LLVM_LIB@", "@LIBCLANG_LIB@"]
 +        libpaths = [os.path.join(install_path, "lib") for install_path in install_paths]
-+        for libpath in libpaths:
-+            for _, _, libraries in os.walk(libpath):
-+                libs.extend(libraries)
-+                break  # just the top level contains library files
  
          if os.name == "nt":
              libs.append("Version.lib")
@@ -34,9 +30,10 @@ index aee0a9f1..6b9806c9 100644
 -            libs.append(f'/LIBPATH:"{libpath}"')
 +            libs.extend(f'/LIBPATH:"{libpath}"' for libpath in libpaths)
          else:
-             libs = [f"-l{lib[3:-2]}" for lib in libs if os.path.splitext(lib)[1] == ".a"]
+-            libs = [f"-l{lib[3:-2]}" for lib in libs if os.path.splitext(lib)[1] == ".a"]
++            libs = [f"-l{lib}" for lib in libs]
              if sys.platform == "darwin":
-@@ -376,7 +370,8 @@ def build_warp_clang_for_arch(args, lib_name: str, arch: str) -> None:
+                 libs += libs  # prevents unresolved symbols due to link order
              else:
                  libs.insert(0, "-Wl,--start-group")
                  libs.append("-Wl,--end-group")

From 5ccc792a876c119b7455b23bdcd5d7808d282b22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 03:45:44 +0000
Subject: [PATCH 4086/6226] zoom-us: 6.6.5.5215 -> 6.6.6.5306

---
 pkgs/by-name/zo/zoom-us/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/zo/zoom-us/package.nix b/pkgs/by-name/zo/zoom-us/package.nix
index b61742fa0849..287782ce0350 100644
--- a/pkgs/by-name/zo/zoom-us/package.nix
+++ b/pkgs/by-name/zo/zoom-us/package.nix
@@ -54,25 +54,25 @@ let
   # Zoom versions are released at different times per platform and often with different versions.
   # We write them on three lines like this (rather than using {}) so that the updater script can
   # find where to edit them.
-  versions.aarch64-darwin = "6.6.5.67181";
-  versions.x86_64-darwin = "6.6.5.67181";
+  versions.aarch64-darwin = "6.6.6.67409";
+  versions.x86_64-darwin = "6.6.6.67409";
 
   # This is the fallback version so that evaluation can produce a meaningful result.
-  versions.x86_64-linux = "6.6.5.5215";
+  versions.x86_64-linux = "6.6.6.5306";
 
   srcs = {
     aarch64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
       name = "zoomusInstallerFull.pkg";
-      hash = "sha256-u8jRZNtVM6QdFcrBK5BcO4yPCAMNmKUv1aGRGqdORGw=";
+      hash = "sha256-puoU/uTKkx9X2ZhnS0+YIzDwrt1M0tHSIFdb5tAnwB0=";
     };
     x86_64-darwin = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
-      hash = "sha256-pKCzrW4Y9YFTS2FyLQR9WA+6oC2hdzzExpEN/VH3PnA=";
+      hash = "sha256-ZtVMXFO1Aa/CVBBMtO1Kqjzp9I0kuYF+CsAXPHseY9E=";
     };
     x86_64-linux = fetchurl {
       url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
-      hash = "sha256-sh1PbAxLGd5zsBO6lsIJV7Z22o9A15xAdopdJZ17ZUw=";
+      hash = "sha256-a8Yngk6KwBsUCouv5FFfEZQheJSU88grlQm27qhANRw=";
     };
   };
 

From ea8eccdc196221f2199506dc05b575ed8f54190b Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 30 Oct 2025 00:32:17 -0300
Subject: [PATCH 4087/6226] itsycal: 0.15.6 -> 0.15.7

---
 pkgs/by-name/it/itsycal/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/it/itsycal/package.nix b/pkgs/by-name/it/itsycal/package.nix
index 5c212cf10109..b60ea425eb6b 100644
--- a/pkgs/by-name/it/itsycal/package.nix
+++ b/pkgs/by-name/it/itsycal/package.nix
@@ -6,11 +6,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "itsycal";
-  version = "0.15.6";
+  version = "0.15.7";
 
   src = fetchzip {
     url = "https://itsycal.s3.amazonaws.com/Itsycal-${finalAttrs.version}.zip";
-    hash = "sha256-e1h81Lsi9mC/3HfUbCk9JkLztGZSVRG6NeQb9voPDk0=";
+    hash = "sha256-0JQ7fZ0cZM8DnAODZQKzUQEHQGhkNvV+0NY10Ef7MEw=";
   };
 
   installPhase = ''

From a8afde469edfe0eda300bb7b411ab650303284ac Mon Sep 17 00:00:00 2001
From: sapphire-arches <srkoser+github@gmail.com>
Date: Wed, 29 Oct 2025 21:04:22 -0700
Subject: [PATCH 4088/6226] sby: 0.57 -> 0.58

Drops boolector since it is now archived and does not build with CMake4
---
 pkgs/by-name/sb/sby/package.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sb/sby/package.nix b/pkgs/by-name/sb/sby/package.nix
index 9cc4797657f7..462cdd581115 100644
--- a/pkgs/by-name/sb/sby/package.nix
+++ b/pkgs/by-name/sb/sby/package.nix
@@ -6,7 +6,6 @@
   python3,
   yosys,
   yices,
-  boolector,
   z3,
   aiger,
   btor2tools,
@@ -19,13 +18,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sby";
-  version = "0.57";
+  version = "0.58";
 
   src = fetchFromGitHub {
     owner = "YosysHQ";
     repo = "sby";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vhgLP2twPPGsey5lzmt/zUFme4GjIdWgRyWoCHxLxRU=";
+    hash = "sha256-msQ+aqdp8i5KMLUABYU6vA5VBkI6G3zF06RrQzfJucY=";
   };
 
   postPatch = ''
@@ -44,7 +43,6 @@ stdenv.mkDerivation (finalAttrs: {
     # Fix various executable references
     substituteInPlace sbysrc/sby_core.py \
       --replace-fail '"/usr/bin/env", "bash"' '"${lib.getExe bash}"' \
-      --replace-fail ', "btormc"'             ', "${lib.getExe' boolector "btormc"}"' \
       --replace-fail ', "aigbmc"'             ', "${lib.getExe' aiger "aigbmc"}"'
 
     substituteInPlace sbysrc/sby_core.py \
@@ -73,7 +71,6 @@ stdenv.mkDerivation (finalAttrs: {
     python3
     python3.pkgs.xmlschema
     yosys
-    boolector
     yices
     z3
     aiger

From 21124ba61b0291bbad7c3dac526eaca74ecaf7e3 Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Wed, 29 Oct 2025 21:18:30 -0700
Subject: [PATCH 4089/6226] mdio-tools: init at 1.3.1

---
 pkgs/by-name/md/mdio-tools/package.nix | 41 ++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 pkgs/by-name/md/mdio-tools/package.nix

diff --git a/pkgs/by-name/md/mdio-tools/package.nix b/pkgs/by-name/md/mdio-tools/package.nix
new file mode 100644
index 000000000000..4f797a0fdbc0
--- /dev/null
+++ b/pkgs/by-name/md/mdio-tools/package.nix
@@ -0,0 +1,41 @@
+{
+  autoreconfHook,
+  fetchFromGitHub,
+  lib,
+  libmnl,
+  pkg-config,
+  stdenv,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "mdio-tools";
+  version = "1.3.1";
+
+  src = fetchFromGitHub {
+    owner = "wkz";
+    repo = "mdio-tools";
+    tag = finalAttrs.version;
+    hash = "sha256-NomChJrYwMDPXNw5r2p11kGfYUvJBHCdLXy1SA8kOaM=";
+  };
+
+  nativeBuildInputs = [
+    autoreconfHook
+    pkg-config
+  ];
+  buildInputs = [ libmnl ];
+
+  postPatch = ''
+    substituteInPlace configure.ac \
+      --replace-fail "git describe --always --dirty --tags" "echo ${finalAttrs.version}"
+  '';
+
+  meta = {
+    description = "Low-level debug tools for MDIO devices";
+    homepage = "https://github.com/wkz/mdio-tools";
+    changelog = "https://github.com/wkz/mdio-tools/blob/${finalAttrs.src.rev}/ChangeLog.md";
+    license = lib.licenses.gpl2Only;
+    maintainers = [ lib.maintainers.jmbaur ];
+    mainProgram = "mdio";
+    platforms = lib.platforms.linux;
+  };
+})

From d2330710357546ab874511176052fcd543a0716c Mon Sep 17 00:00:00 2001
From: kashw2 <supra4keanu@hotmail.com>
Date: Thu, 30 Oct 2025 14:37:25 +1000
Subject: [PATCH 4090/6226] tempo: add kashw2 as maintainer

---
 pkgs/by-name/te/tempo/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/tempo/package.nix b/pkgs/by-name/te/tempo/package.nix
index 2f52cb8cbe7e..3ef7d7d18681 100644
--- a/pkgs/by-name/te/tempo/package.nix
+++ b/pkgs/by-name/te/tempo/package.nix
@@ -39,11 +39,11 @@ buildGoModule (finalAttrs: {
 
   passthru.updateScript = nix-update-script { };
 
-  meta = with lib; {
+  meta = {
     description = "High volume, minimal dependency trace storage";
     changelog = "https://github.com/grafana/tempo/releases/tag/v${finalAttrs.version}";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     homepage = "https://grafana.com/oss/tempo/";
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.kashw2 ];
   };
 })

From 4f43ba9a4400c4c349ec07a322407ebcd143bc46 Mon Sep 17 00:00:00 2001
From: kashw2 <supra4keanu@hotmail.com>
Date: Thu, 30 Oct 2025 14:38:10 +1000
Subject: [PATCH 4091/6226] tempo: 2.8.2 -> 2.9.0

---
 pkgs/by-name/te/tempo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/te/tempo/package.nix b/pkgs/by-name/te/tempo/package.nix
index 3ef7d7d18681..688b2bf3d036 100644
--- a/pkgs/by-name/te/tempo/package.nix
+++ b/pkgs/by-name/te/tempo/package.nix
@@ -7,14 +7,14 @@
 
 buildGoModule (finalAttrs: {
   pname = "tempo";
-  version = "2.8.2";
+  version = "2.9.0";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "tempo";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-mROhsqbCwPulxtg3pHVZi8FmW9PrYzGPdE0ajVvzRBY=";
+    hash = "sha256-98qK+U1SltwTdeNH+MXVU9ql9Be2tMOYZ9W3dEqBqAI=";
   };
 
   vendorHash = null;

From 739a492e55476adb2319333e4c9e24630ee00025 Mon Sep 17 00:00:00 2001
From: C4 Patino <c4patino@gmail.com>
Date: Wed, 29 Oct 2025 23:39:09 -0500
Subject: [PATCH 4092/6226] tor-browser: 14.5.8 -> 15.0

---
 pkgs/by-name/to/tor-browser/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/to/tor-browser/package.nix b/pkgs/by-name/to/tor-browser/package.nix
index 75f6988c6454..2f52b3481bf9 100644
--- a/pkgs/by-name/to/tor-browser/package.nix
+++ b/pkgs/by-name/to/tor-browser/package.nix
@@ -102,7 +102,7 @@ let
     ++ lib.optionals mediaSupport [ ffmpeg ]
   );
 
-  version = "14.5.8";
+  version = "15.0";
 
   sources = {
     x86_64-linux = fetchurl {
@@ -112,7 +112,7 @@ let
         "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
       ];
-      hash = "sha256-hf3pkl+J9Hs28XSyNoXCZM0B9A7g4/n6F7WFkD/hl/o=";
+      hash = "sha256-I2dNohgNfhtcNaqbOZiPc55Obpcn07f6VHpVEjzI/qA=";
     };
 
     i686-linux = fetchurl {
@@ -122,7 +122,7 @@ let
         "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
       ];
-      hash = "sha256-iSHeHCyBg66pbGw8glmViTFMvys3EArOkXVpqJBXEfc=";
+      hash = "sha256-W+jPCVtCkJtvgErcp2a/wSNd7SL3qPqvxHBN4hYBuqg=";
     };
   };
 

From f0a32eb0d653b17117e9e7b128ee37736c1b2cec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 04:40:08 +0000
Subject: [PATCH 4093/6226] python3Packages.fast-array-utils: 1.2.5 -> 1.3

---
 pkgs/development/python-modules/fast-array-utils/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fast-array-utils/default.nix b/pkgs/development/python-modules/fast-array-utils/default.nix
index 4e1e6ffc2c16..f230b7ba7e4a 100644
--- a/pkgs/development/python-modules/fast-array-utils/default.nix
+++ b/pkgs/development/python-modules/fast-array-utils/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "fast-array-utils";
-  version = "1.2.5";
+  version = "1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scverse";
     repo = "fast-array-utils";
     tag = "v${version}";
-    hash = "sha256-iJcnmCh0AssbUEJg62cKURu1afHQiS/cZhYmGsZQM9I=";
+    hash = "sha256-cU5kBOgjinsievGtnl52RQ39txHuXG5n7YeKGF/9O0Q=";
   };
 
   # hatch-min-requirements tries to talk to PyPI by default. See https://github.com/tlambert03/hatch-min-requirements?tab=readme-ov-file#environment-variables.

From 2ad7e66ba60d1eafa70570e73c78ab0aadd0139c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 04:55:09 +0000
Subject: [PATCH 4094/6226] starlark: 0-unstable-2025-10-24 ->
 0-unstable-2025-10-29

---
 pkgs/by-name/st/starlark/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/starlark/package.nix b/pkgs/by-name/st/starlark/package.nix
index 4effde335c3c..8ec3dafe8d38 100644
--- a/pkgs/by-name/st/starlark/package.nix
+++ b/pkgs/by-name/st/starlark/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule {
   pname = "starlark";
-  version = "0-unstable-2025-10-24";
+  version = "0-unstable-2025-10-29";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "starlark-go";
-    rev = "6d2315cd1916ff6bc9ab3d6b3415e29da31df64d";
-    hash = "sha256-GAxcKJHrvTPK2IvK3AEhNvYcFZw7mkaubXNiFnsiqDo=";
+    rev = "7849196f18cf4dd77298ae77c1b42ad53225c348";
+    hash = "sha256-oDA81ow+KPy9d/iIhPxzYSl9wvcLvNM85X4CV5Jq5LQ=";
   };
 
   vendorHash = "sha256-8drlCBy+KROyqXzm/c+HBe/bMVOyvwRoLHxOApJhMfo=";

From 18f5bb1b3e217713b19472b748a92ba6a5d62bff Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 05:06:35 +0000
Subject: [PATCH 4095/6226] python3Packages.rigour: 1.3.13 -> 1.4.0

---
 pkgs/development/python-modules/rigour/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rigour/default.nix b/pkgs/development/python-modules/rigour/default.nix
index 5f831293e994..d70d39d7b379 100644
--- a/pkgs/development/python-modules/rigour/default.nix
+++ b/pkgs/development/python-modules/rigour/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "rigour";
-  version = "1.3.13";
+  version = "1.4.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "opensanctions";
     repo = "rigour";
     tag = "v${version}";
-    hash = "sha256-mcQ1GqmNWv4/ul9oRw/+MnTEcIcn3OP0C5eXi4HWKMU=";
+    hash = "sha256-PxlYJQN2y+mqS48Cbd3/dCubzNzMVL+Q+MR5YJmAVtI=";
   };
 
   build-system = [

From 6371dc10e0a49bc61a2c2e5df5c0ed425e2cfa00 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 05:13:11 +0000
Subject: [PATCH 4096/6226] hledger-fmt: 0.3.1 -> 0.3.5

---
 pkgs/by-name/hl/hledger-fmt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hl/hledger-fmt/package.nix b/pkgs/by-name/hl/hledger-fmt/package.nix
index bb5d8fe1b2d9..5f9315e3e493 100644
--- a/pkgs/by-name/hl/hledger-fmt/package.nix
+++ b/pkgs/by-name/hl/hledger-fmt/package.nix
@@ -9,20 +9,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hledger-fmt";
-  version = "0.3.1";
+  version = "0.3.5";
 
   src = fetchFromGitHub {
     owner = "mondeja";
     repo = "hledger-fmt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5dPKSUJLxQ5WXZefuwr3wLhr3MNzy+dzpJkgKFU0/SE=";
+    hash = "sha256-VyDVdXxTge3ERTrkIIWgR75m7TaEbbPmFDNsoYOi9tM=";
   };
 
   nativeBuildInputs = [
     installShellFiles
   ];
 
-  cargoHash = "sha256-yErH9AyfBZF0PByqViVhXHB/FAc0awz4bOyAHtcHe0s=";
+  cargoHash = "sha256-jn4ptV0IVnnXR2oCxxUnGaoWG/LBlRkf25/8Nasm9qI=";
 
   # Tests try to invoke the binary from "target/debug/hledger-fmt"
   # https://github.com/mondeja/hledger-fmt/blob/783abdb32eefb20195c7e9562858552935bb9c8e/src/cli/tests.rs#L5

From 96d1cb94d4b416890d65e64c3ace283476af7c90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 05:19:38 +0000
Subject: [PATCH 4097/6226] copilot-language-server: 1.388.0 -> 1.389.0

---
 pkgs/by-name/co/copilot-language-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix
index 70e6e4ab0cf3..8f1970e33872 100644
--- a/pkgs/by-name/co/copilot-language-server/package.nix
+++ b/pkgs/by-name/co/copilot-language-server/package.nix
@@ -10,11 +10,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "copilot-language-server";
-  version = "1.388.0";
+  version = "1.389.0";
 
   src = fetchzip {
     url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
-    hash = "sha256-qFFLDy1/4w5Qlp3wcWlISoBMYVNHCsVLW27JBuoCcMk=";
+    hash = "sha256-QX3gSKV/FABXbeu1KzrSEyxFJU/xptSVvuxqTjTI9Go=";
     stripRoot = false;
   };
 

From 44fb977bd4fa9e3ca0b9126077ec64fd5f818583 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 30 Oct 2025 05:23:41 +0000
Subject: [PATCH 4098/6226] anubis: 1.22.0 -> 1.23.0

Changelog: https://github.com/TecharoHQ/anubis/releases/tag/v1.23.0
Diff: https://github.com/TecharoHQ/anubis/compare/v1.22.0...v1.23.0
---
 pkgs/by-name/an/anubis/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/an/anubis/package.nix b/pkgs/by-name/an/anubis/package.nix
index 98ebf26eb7ca..6622627602a2 100644
--- a/pkgs/by-name/an/anubis/package.nix
+++ b/pkgs/by-name/an/anubis/package.nix
@@ -15,21 +15,21 @@
 
 buildGoModule (finalAttrs: {
   pname = "anubis";
-  version = "1.22.0";
+  version = "1.23.0";
 
   src = fetchFromGitHub {
     owner = "TecharoHQ";
     repo = "anubis";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LOYBl9r00AJljGvlacd506cLeMr8Ndh817/ZIw46Uu0=";
+    hash = "sha256-uuYPtkhHMP2WafV7iFMwuh8Bm39Mf7ww6H/io54dwCM=";
   };
 
-  vendorHash = "sha256-/iTAbwYSHTz9SrJ0vrAXsA+3yS0jUreJDF52gju9CgU=";
+  vendorHash = "sha256-0W3nBc4vu3hnQTDB561zmx/2rOYo7D+vo8jvx10cBUc=";
 
   npmDeps = fetchNpmDeps {
     name = "anubis-npm-deps";
     inherit (finalAttrs) src;
-    hash = "sha256-s+OxVf6Iysobfuo0nAh5qF157opD2sR5D+7awAx6GTs=";
+    hash = "sha256-KEQYF+LTSw0g3+wF4e8u31ERYsNVHlOjTMdDH6Q2/hI=";
   };
 
   nativeBuildInputs = [

From 9a78f804ffb836643b7fb1789e2ef184962ee716 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 28 Oct 2025 20:12:09 +0000
Subject: [PATCH 4099/6226] bruijn: 0-unstable-2025-10-09 ->
 0-unstable-2025-10-28

Diff: https://github.com/marvinborner/bruijn/compare/3e9636b4c0c37f5c5df509e30fb37564464e5850...9b7ff47f7c4d75093fcf6910b8d33aa44e0516ad
---
 pkgs/by-name/br/bruijn/generated.nix | 4 ++--
 pkgs/by-name/br/bruijn/version.txt   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/br/bruijn/generated.nix b/pkgs/by-name/br/bruijn/generated.nix
index 6ca9c88dd9c0..58286f57abc8 100644
--- a/pkgs/by-name/br/bruijn/generated.nix
+++ b/pkgs/by-name/br/bruijn/generated.nix
@@ -24,8 +24,8 @@ mkDerivation {
   pname = "bruijn";
   version = "0.1.0.0";
   src = fetchzip {
-    url = "https://github.com/marvinborner/bruijn/archive/3e9636b4c0c37f5c5df509e30fb37564464e5850.tar.gz";
-    sha256 = "0pk6vyw03ys0jp1na0m3kz5k0x4xqr9zcna8c53dzkzlk5h5d85z";
+    url = "https://github.com/marvinborner/bruijn/archive/9b7ff47f7c4d75093fcf6910b8d33aa44e0516ad.tar.gz";
+    sha256 = "1zx2pcrd25gsq6qz0rixpsdwm0h05cjn5f1a2d2ivbmax88yvsjf";
   };
   isLibrary = true;
   isExecutable = true;
diff --git a/pkgs/by-name/br/bruijn/version.txt b/pkgs/by-name/br/bruijn/version.txt
index ab71cfe80a63..796b237cd580 100644
--- a/pkgs/by-name/br/bruijn/version.txt
+++ b/pkgs/by-name/br/bruijn/version.txt
@@ -1 +1 @@
-0-unstable-2025-10-09
+0-unstable-2025-10-28

From d62bd9b163d86829106a1d3dbad21b9a770ad161 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 05:38:21 +0000
Subject: [PATCH 4100/6226] v2ray-domain-list-community: 20251026234004 ->
 20251028154325

---
 pkgs/by-name/v2/v2ray-domain-list-community/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
index fdc6171a71d1..38166cc31d10 100644
--- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
+++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
@@ -9,12 +9,12 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20251026234004";
+    version = "20251028154325";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-bZM47aPNLvdkmmCFyie/dlUs9JdGPngkdmGrVzDl8as=";
+      hash = "sha256-ugNLlCfAhXvIPQTae3Z22rlpNG32RmIrIt/iilIj+iA=";
     };
     vendorHash = "sha256-HmIXpF7P3J+lPXpmWWoFpSYAu5zbBQSDrj6S88LgWSU=";
     meta = with lib; {

From 79fb161194709edef3c8deed4fcd520b5fb30334 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 05:57:45 +0000
Subject: [PATCH 4101/6226] python3Packages.environs: 14.3.0 -> 14.4.0

---
 pkgs/development/python-modules/environs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix
index f9d1671f9e26..91ec68a0a511 100644
--- a/pkgs/development/python-modules/environs/default.nix
+++ b/pkgs/development/python-modules/environs/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "environs";
-  version = "14.3.0";
+  version = "14.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "sloria";
     repo = "environs";
     tag = version;
-    hash = "sha256-DGcYIir2ckzCJ9423OiFwSi0xMXyox6RNYnhOGQhOuc=";
+    hash = "sha256-901TvjY5VzWLzQGBmTQ/K0giPt010+GH5eVWk58Pqng=";
   };
 
   nativeBuildInputs = [ flit-core ];

From 506f06214cd20e79eba0fb5259a08c1cce35242e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 29 Oct 2025 23:11:14 -0700
Subject: [PATCH 4102/6226] python3Packages.pyglet: 2.0.10 -> 2.1.9

Diff: https://github.com/pyglet/pyglet/compare/v2.0.10...v2.1.9

Changelog: https://github.com/pyglet/pyglet/blob/v2.1.9/RELEASE_NOTES
---
 .../python-modules/pyglet/default.nix         | 26 +++++++++++--------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix
index ecf741205aea..8cd0c81b9280 100644
--- a/pkgs/development/python-modules/pyglet/default.nix
+++ b/pkgs/development/python-modules/pyglet/default.nix
@@ -2,9 +2,8 @@
   lib,
   stdenv,
   buildPythonPackage,
-  fetchPypi,
-  unzip,
-  pythonOlder,
+  fetchFromGitHub,
+  flit-core,
   libGL,
   libGLU,
   xorg,
@@ -22,15 +21,15 @@
 }:
 
 buildPythonPackage rec {
-  version = "2.0.10";
-  format = "setuptools";
+  version = "2.1.9";
   pname = "pyglet";
-  disabled = pythonOlder "3.6";
+  pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-JCvrGzvWfFvr3+W6EexWtpathrUMbn8qMX+NeDJWuck=";
-    extension = "zip";
+  src = fetchFromGitHub {
+    owner = "pyglet";
+    repo = "pyglet";
+    tag = "v${version}";
+    hash = "sha256-hdLqtSvtsj6dcpTxFAs2UO27gkUAlsdjsi624ucpGU8=";
   };
 
   # find_library doesn't reliably work with nix (https://github.com/NixOS/nixpkgs/issues/7307).
@@ -77,6 +76,10 @@ buildPythonPackage rec {
                   path = '${xorg.libXi}/lib/libXi${ext}'
               elif name == 'Xinerama':
                   path = '${xorg.libXinerama}/lib/libXinerama${ext}'
+              elif name == 'Xrandr':
+                  path = '${lib.getLib xorg.libXrandr}/lib/libXrandr${ext}'
+              elif name == 'Xrender':
+                  path = '${lib.getLib xorg.libXrender}/lib/libXrender${ext}'
               elif name == 'Xxf86vm':
                   path = '${xorg.libXxf86vm}/lib/libXxf86vm${ext}'
               elif name == 'harfbuzz':
@@ -115,7 +118,7 @@ buildPythonPackage rec {
       EOF
     '';
 
-  nativeBuildInputs = [ unzip ];
+  build-system = [ flit-core ];
 
   # needs GL set up which isn't really possible in a build environment even in headless mode.
   # tests do run and pass in nix-shell, however.
@@ -140,6 +143,7 @@ buildPythonPackage rec {
 
   meta = {
     homepage = "http://www.pyglet.org/";
+    changelog = "https://github.com/pyglet/pyglet/blob/${src.tag}/RELEASE_NOTES";
     description = "Cross-platform windowing and multimedia library";
     license = lib.licenses.bsd3;
     # The patch needs adjusting for other platforms.

From ae20b532bca760fd2eec3d01c860a606941a35b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 06:31:36 +0000
Subject: [PATCH 4103/6226] mirrord: 3.168.1 -> 3.170.0

---
 pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json
index 82bdb877d1c0..52c5c48ae386 100644
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -1,21 +1,21 @@
 {
-  "version": "3.168.1",
+  "version": "3.170.0",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.168.1/mirrord_linux_x86_64",
-      "hash": "sha256-guBC7Zuh5xT+d/lcJVwDLZ++tMy97mcLZo31XkkU2HM="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.170.0/mirrord_linux_x86_64",
+      "hash": "sha256-q5A4KELOl/rbWxrlBk2XjCOq4A/tFySx46FNhDanTsE="
     },
     "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.168.1/mirrord_linux_aarch64",
-      "hash": "sha256-ScKDz4nc4N0mjdaN2mBIJfXckZJZkQ32OValSl3JbQ8="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.170.0/mirrord_linux_aarch64",
+      "hash": "sha256-G8xrksOIqJ//kXYY7tdL9GzKFrt4ttPnviRnCUuyvuk="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.168.1/mirrord_mac_universal",
-      "hash": "sha256-tSpVWlfbJQi2Ww1Ovc2BPXfeb/Bm7vgfDDPKyMfLZMg="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.170.0/mirrord_mac_universal",
+      "hash": "sha256-N7PS2iNVTb9uuPavyfcMNPughGIJzt9PHeSbNSwST9Y="
     },
     "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.168.1/mirrord_mac_universal",
-      "hash": "sha256-tSpVWlfbJQi2Ww1Ovc2BPXfeb/Bm7vgfDDPKyMfLZMg="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.170.0/mirrord_mac_universal",
+      "hash": "sha256-N7PS2iNVTb9uuPavyfcMNPughGIJzt9PHeSbNSwST9Y="
     }
   }
 }

From 234ff061e0008d06213a439d8d873431a2ca7292 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 06:32:04 +0000
Subject: [PATCH 4104/6226] ed-odyssey-materials-helper: 3.0.7 -> 3.1.2

---
 .../ed/ed-odyssey-materials-helper/deps.json  | 179 ++++++++++--------
 .../ed-odyssey-materials-helper/package.nix   |   4 +-
 2 files changed, 106 insertions(+), 77 deletions(-)

diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
index 125341926c7d..05a174b9a69d 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/deps.json
@@ -54,24 +54,24 @@
   "jakarta/platform#jakartaee-api-parent/9.1.0": {
    "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA="
   },
-  "net/jsign#jsign-core/7.2": {
-   "jar": "sha256-xzyar4S3WGndJhSk2eaIgajlImHtsKh6Uzgs8osLf00=",
-   "pom": "sha256-4DteLTjsvktBBuGdgKwCzPDQLIO6v4R9p4Jaa8HdK1Q="
+  "net/jsign#jsign-core/7.3": {
+   "jar": "sha256-bA9oYq6wsr2CyLAQI1/9kyg5InyW23aKyPsXhHkC9XA=",
+   "pom": "sha256-iBAcWvZMjJl+0DIQwLyFGLjInvcF0bKM5E49qse5F34="
   },
-  "net/jsign#jsign-crypto/7.2": {
-   "jar": "sha256-UJQnz8cturPc5ceYvV55rP+rID7v4E/D88/DAo3qNJc=",
-   "pom": "sha256-tDqAde1LDp0G++vg2fT9SbKaKtDCpLe0wHPEOTFC4dw="
+  "net/jsign#jsign-crypto/7.3": {
+   "jar": "sha256-slHwB5e/C8I1QbLxK8q3/relDaudPFAFHIPtIk2ZiRo=",
+   "pom": "sha256-ewX0NDiexnCXAihAy7CBudcRK9n4xlUYdS20NSEAN6s="
   },
-  "net/jsign#jsign-gradle-plugin/7.2": {
-   "jar": "sha256-+uyJfxc85kMoLWYEMxgLpN8W+SOl0y+xbuxL1JQtcpU=",
-   "module": "sha256-pdEQ33z7JGZdGHHECeUFeDhtsEPZpEZgWTuWvhjZ048=",
-   "pom": "sha256-j6lgWfT7m/xQJh0JJodpYUi8/9MnxA4dcnmfhebPtUs="
+  "net/jsign#jsign-gradle-plugin/7.3": {
+   "jar": "sha256-hIO6LPpch+KPHBOAvReuXeGTU4Ogz4gdZ3Lb9v+P0R4=",
+   "module": "sha256-HZbhMlaO0Uhz0JHItnQ+4kL3q+79Ky0BCEJ/zXOAeY8=",
+   "pom": "sha256-QnV3M85vh7bSorpuyXrb0NZrJzua/Dw7KN4+txkF9Ac="
   },
-  "net/jsign#jsign-parent/7.2": {
-   "pom": "sha256-BuIjfFMHFgcwGQh/4BcgrpDT/hRukfR3u1lqBH99vbc="
+  "net/jsign#jsign-parent/7.3": {
+   "pom": "sha256-nI9hwRHaJ0oG5ImYa76vDGTOpYY+6vYNvVO+ugov0yg="
   },
-  "net/jsign#net.jsign.gradle.plugin/7.2": {
-   "pom": "sha256-/fXnGXhngCBVFSar0Ns+U2jjaAwvpd8lzvoaw4i/06I="
+  "net/jsign#net.jsign.gradle.plugin/7.3": {
+   "pom": "sha256-1iba9d1D6mjxyJIpjy4Qpegv5jV/DLiQ2P3pb/p9a2c="
   },
   "net/rdrei/android/buildtimetracker#net.rdrei.android.buildtimetracker.gradle.plugin/0.11.0": {
    "pom": "sha256-SbQtvX9N5DU8ntUmpcpTtrTdDhla7rQR7L213fZ6kG8="
@@ -214,16 +214,16 @@
    "jar": "sha256-9pwt46aVwRPRJayAU8kqaAo86dAuolhFCVzy1GJqdmM=",
    "pom": "sha256-WCLfSRg9+SK6Wa53Oi2Mzrhq4eIPQfGYcxMd0YJJT3o="
   },
-  "ch/qos/logback#logback-classic/1.5.18": {
-   "jar": "sha256-PhUz0DIfiBXu9GdQruARG0FVT5pGRMPE0tQEdEsJ9g8=",
-   "pom": "sha256-1VfNKrI95KR+zocGQhYqn5Rzn80LHDE+J4MlFO4gODM="
+  "ch/qos/logback#logback-classic/1.5.20": {
+   "jar": "sha256-EijbmeGvYC4ZGisUIlLYqvaBKeZDwZ5/khN85fcgmtM=",
+   "pom": "sha256-s+hotrfIsqgGswDIrsddcCeI/l5lM9P2ljYHmu1bU3c="
   },
-  "ch/qos/logback#logback-core/1.5.18": {
-   "jar": "sha256-hROee1e0ZPjl42Mm3YExdki+0ZnMxPmM1CWF+NdXECc=",
-   "pom": "sha256-x3JHKX1dm7ngTpLUyC51xujqviRUNokvkRQzW4t5DIM="
+  "ch/qos/logback#logback-core/1.5.20": {
+   "jar": "sha256-Kf4JW7e3+FCQeuw/3etAyNOZ2F5WgOjTUz49pdmq6Rc=",
+   "pom": "sha256-XFJJldocTKrot6y/aQFin468ltUkfZGw2afuCKsQ7Eo="
   },
-  "ch/qos/logback#logback-parent/1.5.18": {
-   "pom": "sha256-U8PiGxI7vTijAbQNDYFAlOrUehAj0h1hPMdI1w57nGk="
+  "ch/qos/logback#logback-parent/1.5.20": {
+   "pom": "sha256-Fwus2jsPfYA9jteOcPEg7Ncmu5qKk8F6MmfzP8HryiA="
   },
   "com/fasterxml#oss-parent/30": {
    "pom": "sha256-0OJUZlIJgf9X7K29yUA00dFpA7kulQvp+dQkQcWU+fA="
@@ -478,9 +478,9 @@
   "io/freefair/lombok#io.freefair.lombok.gradle.plugin/9.0.0": {
    "pom": "sha256-xWt36BjHjUZoXWbQ/2UJ85G5KE3+hrueEnARHrwBJYI="
   },
-  "io/github/classgraph#classgraph/4.8.181": {
-   "jar": "sha256-YqZDbWlxDvX6tuwkN4HOTFspkEftGEG1+SdGroUs5UU=",
-   "pom": "sha256-kj4br0msZAeQ30WHuMz0AfYG8L/HBZZh9xhVG2Jw8Ug="
+  "io/github/classgraph#classgraph/4.8.184": {
+   "jar": "sha256-blZOKc7JWjkiaKYJ8JBx1WGZOD2QascOkXU6eZjRo+g=",
+   "pom": "sha256-N7I1NJqAx1rokS+gCO3unouINL52mortCLp0xbCvgeA="
   },
   "io/github/pustike#commons-csv/1.7.0": {
    "jar": "sha256-PB0BZmOIW/KPqgi3rE//Ewin5PFd6BZvd2D5jC5m3LI=",
@@ -505,10 +505,10 @@
    "module": "sha256-2jn02k/u133+ELmAnVyysvO0Ra6nG2nhUjKkJpiThzs=",
    "pom": "sha256-chJrr7gKEse1WFJNCRkj5pYSODxHQay34Aw1ybBUazQ="
   },
-  "io/sentry#sentry/8.22.0": {
-   "jar": "sha256-7QJzzosBRsvyeZkmkyqLWXiAlUkABQcC646p8eM6GOE=",
-   "module": "sha256-5ZOJtyrsJgmO9B7sNS7xLKh945o/o3sWdyKisjW5Zr8=",
-   "pom": "sha256-9wniVOh/5PhDESS1X9IEwhgiBqrl5PVCFINpVIr9HBE="
+  "io/sentry#sentry/8.23.0": {
+   "jar": "sha256-qbL8cx7DCXkJ/pOOb6f9F3spGNIwsbPXt1j115CNUFk=",
+   "module": "sha256-WLKcCwmvgkJJ3XEihti2Q4hrLql1wX4NPfcMcoFt2EI=",
+   "pom": "sha256-wWqaLKt1YvEdl9DEdmBJAWFmzPEvanTKmzp93YvPEY4="
   },
   "jakarta/json/bind#jakarta.json.bind-api/2.0.0": {
    "jar": "sha256-peYGtYiLQStIkHrWiLNN/k4wroGJxvJ8wEkbjzwDYoc=",
@@ -551,6 +551,10 @@
    "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=",
    "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ="
   },
+  "me/xdrop#fuzzywuzzy/1.4.0": {
+   "jar": "sha256-I6LdH1S5EGdZRPTI1IRdfq8beA3Q6ol2NzP9C0OoJYo=",
+   "pom": "sha256-vbc6Si9VvNZAv42a4SlslYY2TK4Vxvw/MDsCdLCiJ3I="
+  },
   "net/bytebuddy#byte-buddy-agent/1.17.7": {
    "jar": "sha256-qbqIfcolKtYbfVFTKU805vO99LJzawQ3PRNhWmlfwP8=",
    "pom": "sha256-gU7kLWsBF/S40etrHWLBbbTAtZfYOzrY2qV4HrFF19w="
@@ -571,13 +575,13 @@
   "net/java#jvnet-parent/5": {
    "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo="
   },
-  "net/java/dev/jna#jna-platform/5.18.0": {
-   "jar": "sha256-eH7Jywp2Eh/1TTVI8GKNsJAB8TVSHj7b+/rJV953qzw=",
-   "pom": "sha256-4zkW2g+tjn0EZgihqx3/6RzJ4trVsUqY4LpkD//iP58="
+  "net/java/dev/jna#jna-platform/5.18.1": {
+   "jar": "sha256-rRTBsexPQ9OWIxIZ36Y16/go9zjqyfiQ6hvAd5WJLZo=",
+   "pom": "sha256-OdU4qVmaRHR3CDiGXtQs+j5rPRMIbLHld7i7QxSNGmU="
   },
-  "net/java/dev/jna#jna/5.18.0": {
-   "jar": "sha256-/ifB5eNKasqEy0TaXxUnHNaQabHPcBq1unMgxXxVxDk=",
-   "pom": "sha256-SIq1HOC+VwAYcI0M0VtfpPp9Kx022BzvdTfVG9TXsDs="
+  "net/java/dev/jna#jna/5.18.1": {
+   "jar": "sha256-JgxLHiKx254RDuRBxPE84RX4QfpIxB14dQmGIUs5VVc=",
+   "pom": "sha256-mLYq5v8oDXR/s1n8QuSP7RE9Rbw3Kagj3DC4MIqAZkU="
   },
   "net/rdrei/android/buildtimetracker#gradle-plugin/0.11.1": {
    "jar": "sha256-VTLp3rXka/R3KpkXFRrW4TqRLj8jZH8ffuoi/DsLTsg=",
@@ -840,55 +844,75 @@
    "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=",
    "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI="
   },
-  "org/junit/jupiter#junit-jupiter-api/5.13.4": {
-   "jar": "sha256-0buBq/2eA0GDBrTmozkMjbUsWDcudJwpgKwp8MCCePE=",
-   "module": "sha256-/kZNN/XIEKgF/zGRmBZcrDPCVY4iYQIdjzEqglpIZx8=",
-   "pom": "sha256-xWBTV9MRgTZCxABEHgR7ynF8rcFXs/5+GJhbxv8jLls="
+  "org/junit#junit-bom/5.14.0": {
+   "module": "sha256-etPdstdOanfWWuiaykXUaMl7+ZFba8UvRJ1nXk5vmzU=",
+   "pom": "sha256-9apHs2ZIPo0fm+8Q5noMZvZq/A8zHJ+WaxMQutYND28="
   },
-  "org/junit/jupiter#junit-jupiter-engine/5.13.4": {
-   "jar": "sha256-AnQEqS/mGLckZXkqJXlRSVxQOn1XUeJ5Hg9RyH9n9bw=",
-   "module": "sha256-zu7m0ANKc4E1vZ84IM/gicZWkWPGI7qOPptE9yCP0ho=",
-   "pom": "sha256-E4Nt6C2Xf/JSCPXgypvfEzFV3C7+0Wr2Dfrojp3KzUc="
+  "org/junit#junit-bom/6.0.0": {
+   "module": "sha256-R98chw1F2mEXtKYNzAYhRmrD332s6I2aL5TXhAYkbkU=",
+   "pom": "sha256-s9mDL1wRu7aw5ihRuTqinSeMOfsadR63cbRtAEohYhk="
   },
-  "org/junit/jupiter#junit-jupiter-params/5.13.4": {
-   "jar": "sha256-OoxjZXFtu2mMDUmgVFbB4a0FxAZhPFUPndUAN4cu/EE=",
-   "module": "sha256-/DZvvmB5ma/IzwK53KldHgKgawzocqRWBanZaMJG9LQ=",
-   "pom": "sha256-wPNik+IEJzLWJu4HWMrlLDeMKklXnUW9CBUojyDdTGw="
+  "org/junit/jupiter#junit-jupiter-api/6.0.0": {
+   "jar": "sha256-iNaQ0tNzzWYXB3DDF5dxls6eRl8jiJMPS8lmXohzhfY=",
+   "module": "sha256-ulAS9rG1AydsxsokGUPC2bJuJFkCXowg3VjsMeumcXU=",
+   "pom": "sha256-rNeSzwaDpEvqadPP/uujfRm5kAwdnogijjKfJsRBNQM="
   },
-  "org/junit/jupiter#junit-jupiter/5.13.4": {
-   "jar": "sha256-uWD3khfdAchjAxtnjwffRzC78erGUMdK1rDGH6rXg3k=",
-   "module": "sha256-RpRiJ8KWfRZZ6VX1PTTshzGBHUr0AcKsfWRveTx44fk=",
-   "pom": "sha256-q3sscJnzXPorMVmhpaQLlO414hKyWo172XwSJ7+u5Y4="
+  "org/junit/jupiter#junit-jupiter-engine/6.0.0": {
+   "jar": "sha256-j6HWw32ymm70cYO0mFHudnbwj9exwntozPOk5XzgL0g=",
+   "module": "sha256-/BOeA32ssQfRpQ6FVVg2h0+pwgKIwx17a86To9PoUEw=",
+   "pom": "sha256-qzyiIIkCJq8xuRVzeT+n8APHqBdSuskFZx3Krum5fXM="
   },
-  "org/junit/platform#junit-platform-commons/1.13.4": {
-   "jar": "sha256-HCXKZB66rkT/OtIcobLvaNDdhL/rB8SAW6eECJm3dAg=",
-   "module": "sha256-Gnot58eYmV+5eyRNbvnpnDpXmbV6D7rNaElrp+6BWdc=",
-   "pom": "sha256-RKWQ1nrsTSdskMUVj+EEePITPwoj7DLPqzqlXUK4aIM="
+  "org/junit/jupiter#junit-jupiter-params/6.0.0": {
+   "jar": "sha256-IIR+RcVT1R45JEbgM1UGnxOP4MUekdfvG9v/wNOvBFQ=",
+   "module": "sha256-VfWJwqiUZt40HEAL8AzdGihwp+bc1oUL2tcyLbONc7c=",
+   "pom": "sha256-91zeM8lEa0XsSlqaKC3LWyv7dj1KMKshv8+EgqZg5UI="
   },
-  "org/junit/platform#junit-platform-engine/1.13.4": {
-   "jar": "sha256-OQxfd7hCg6ZLZE+IJRs5fgsN67gL3MUPiZiBrs/0Olo=",
-   "module": "sha256-NeT9aOvzFOYmYBSJNkNrOa4QXTVb6qwapU65HCBmync=",
-   "pom": "sha256-lYOVQk9rRhK9edgWXte9+vWmWU9GmbjviTmVyljDwKU="
+  "org/junit/jupiter#junit-jupiter/6.0.0": {
+   "jar": "sha256-jb8LIX4usBPWU9kW/BBgkklrfMrI8IQyiYHlXjZzrnE=",
+   "module": "sha256-YdlnTuitkcdk2IbQzTFjO1up967ad6okIPglNaJVXOE=",
+   "pom": "sha256-9j4gTo0IDEzis05lnzGVzHHYpKZrcyqAW5pv0rjyVrs="
   },
-  "org/junit/platform#junit-platform-launcher/1.13.4": {
-   "jar": "sha256-Cwvq62iAoxFJZB0thIuGNxKIVGlnDBIJlYbX95hSJWQ=",
-   "module": "sha256-EV93RVdA4MPFOYvN2EHIqmmcLYACsRAPKuemQ9lAWSg=",
-   "pom": "sha256-OuOHauC4fbi96hJ5ryuXjaKfE4selfYFoD2aUtE529I="
+  "org/junit/platform#junit-platform-commons/1.14.0": {
+   "module": "sha256-Kwq1YmEUumwASZEJ6MOJoXy6XhP7+BEExBjoY3UNSLw=",
+   "pom": "sha256-Ed3u4UN656ybNGhLDophehZaIKobIjyk0YM3ZMxwZJI="
   },
-  "org/junit/platform#junit-platform-runner/1.13.4": {
-   "jar": "sha256-ISaDWloIABNZhDxmhl2lgqo1pWsM+O3yzI0epCnL6ao=",
-   "module": "sha256-pozyPYUVEngVDtPLL+9m4mk1Oza26ZlfVnqwp7nIjyg=",
-   "pom": "sha256-C7mXJe+9m3MoLKcKCzpk2zbp4bHC/tOjPpLlIHXX3Lo="
+  "org/junit/platform#junit-platform-commons/6.0.0": {
+   "jar": "sha256-huj6+H8xUaPVRYUIUqDyzFXqiiQ07ungj4OIHFLVWZI=",
+   "module": "sha256-oNE82wfx2950q74HZmT/XcQEOtXRO/+UD3i55gTyElE=",
+   "pom": "sha256-lDFdk3FOzUB6kg2TOcj0S0DPCEBBMWMu1/m3dwzxCgU="
   },
-  "org/junit/platform#junit-platform-suite-api/1.13.4": {
-   "jar": "sha256-mgW/d+EoNx9bPiX/yJ969Gep9o3TZf387UaevPUzq8k=",
-   "module": "sha256-OfuRkgMHvFx6FjAHOpV2CiYURYJgiA0pO5F2wc0ImIQ=",
-   "pom": "sha256-hxhnBdIt+Wrdoe/aMqShB1f49lgAbxd350zvJ6XkLKg="
+  "org/junit/platform#junit-platform-engine/6.0.0": {
+   "jar": "sha256-b4GELpwT6ZfKxmtEYUUi82OUGeI4iuLQAMS8CmuS2T8=",
+   "module": "sha256-GcijGiINhY0hWr20mfYjuLxy/ig3jMBABI0ymTCliSE=",
+   "pom": "sha256-TD7A1PapQGLOgr3kLuvtHya5m7XLHWl24VmPzF+KSS0="
   },
-  "org/junit/platform#junit-platform-suite-commons/1.13.4": {
-   "jar": "sha256-59rPz6O8aSwKekE879X1GuQgQVoU05CRvfiK6/26cLY=",
-   "module": "sha256-WQtO531F+0Lf0GGccCGndnkgbQSJ9Cbn8Auazlmqvh0=",
-   "pom": "sha256-VOR+M8iA1vupejBP02oXJVdQLDRR2nQM2beBTp6Nh5k="
+  "org/junit/platform#junit-platform-launcher/1.14.0": {
+   "module": "sha256-pJlI15aokT/22Jl1ITnUl2YxQ7AS3fgEqxzlMuC/1zw=",
+   "pom": "sha256-q41bLHzlSaDJEsG9E7yNV0dYOcLneiLlb4DxniPcdQI="
+  },
+  "org/junit/platform#junit-platform-launcher/6.0.0": {
+   "jar": "sha256-Xwl7AMZxS7cez7XexitZu0wveJdj+v0ezpbE7w5sKA8=",
+   "module": "sha256-/OwWMsXFlyf/nn6jCKmTh9ci/6iC2FzKUFKv7Iw47ug=",
+   "pom": "sha256-RwG8mhY9lbI1zhatdt4Z8qyFTFyjT689LsThAYsIzHQ="
+  },
+  "org/junit/platform#junit-platform-runner/1.14.0": {
+   "jar": "sha256-PtsxSpMnsqcyMAAOmFCmf0CnVcj03CKLiKTGsFO0gRM=",
+   "module": "sha256-QBQISBtUFXXU/7SRBPdRbfexxp8Nj+pcAQwdJ92v9lU=",
+   "pom": "sha256-Nl+KzheLaRQi9D6bMXgpQ+6jo6sHVnDVnhP/6I0dvEk="
+  },
+  "org/junit/platform#junit-platform-suite-api/1.14.0": {
+   "module": "sha256-tx89J31twkIWiSbi7Bh/Krxruz+hW5aoR3ep3gxL068=",
+   "pom": "sha256-BDhG11banrl+29u1t5momv0fhNUBleBbVfKQMZlCmaY="
+  },
+  "org/junit/platform#junit-platform-suite-api/6.0.0": {
+   "jar": "sha256-JDr0KmCoOf21WE7wCKNClWOSq3UXOI/v4jx8Iqm7PsY=",
+   "module": "sha256-GglozfimQNCDuT9Tb78XOzVS2vcnp6RXSqrXXjLixJc=",
+   "pom": "sha256-r+n5I0po+iwNbxJLD8gAm0nAuWpl9nh4t+StAk505s8="
+  },
+  "org/junit/platform#junit-platform-suite-commons/1.14.0": {
+   "jar": "sha256-uGgjf4yy4ZN3Xj9xK5QFyz1P+qGAV5zIOn/h9tucXME=",
+   "module": "sha256-2b8/TF1wJ0gCDDgzNw47kevnlo80Eq9txTKGlrSfptE=",
+   "pom": "sha256-9Uvj4x1RgvEvW/xo8yuE5hfQtmuazPI9kukalCJojlA="
   },
   "org/leadpony/justify#justify-parent/3.1.0": {
    "pom": "sha256-ckfhOlVhg4gPqnP7EeWQJ7R+fG1Ghx0sUIg3WwDbJY0="
@@ -1104,6 +1128,11 @@
     "release": "1.5"
    }
   },
+  "jixxed/ed/confidential#ed-confidential-api/1.3": {
+   "jar": "sha256-iPBjgHIFGjuquG+zga0ZdTxMMIEqAquzGt41IDriGKw=",
+   "module": "sha256-THaam0o2oBL75yHgsXW7+pPz3lbjf9ktcRL+N+WFs98=",
+   "pom": "sha256-0pk2PyeZ6u7PJSqzsCwdwv90wpXnOAoRHaHYpIBGLDc="
+  },
   "jixxed/lept4j#lept4j/1.16.6": {
    "jar": "sha256-39j+jS92/MW/A8WLaUZYKTkNPB+0IgNWkjcau9MMlx0=",
    "module": "sha256-fPk3r5TQdJrz0O5SgutXUWnI44UqKJxPBiiQC+wcSgA=",
diff --git a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
index 38b9eade1aec..66882f5d6de2 100644
--- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
+++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix
@@ -21,13 +21,13 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "ed-odyssey-materials-helper";
-  version = "3.0.7";
+  version = "3.1.2";
 
   src = fetchFromGitHub {
     owner = "jixxed";
     repo = "ed-odyssey-materials-helper";
     tag = version;
-    hash = "sha256-TcRj+TZ4shY1UAE7TseRXZZJZtL8aaD79pBL9LeoMJA=";
+    hash = "sha256-2xUMl8AqZD/v+js/QyWBD4RfV8nfCAqVr0UgWaOtBrk=";
   };
 
   nativeBuildInputs = [

From a689038a50792eea3bf84bca1d5bacc59113f375 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 06:45:10 +0000
Subject: [PATCH 4105/6226] terraform-providers.okta_okta: 6.3.0 -> 6.4.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 cca0d968e74b..48083d3275bb 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1003,13 +1003,13 @@
     "vendorHash": "sha256-0UM4I/oxIsWIP1G93KJsJxYofXrO4Yy86PEk0FnB1DE="
   },
   "okta_okta": {
-    "hash": "sha256-Y0gNIhJDJoK6wL5FoCjyhccywYBkCygovXGxVTylTn8=",
+    "hash": "sha256-7vjNorBNdfF3cTu1ANx+5Uh5chAL54lWZ7R9cMI/gpA=",
     "homepage": "https://registry.terraform.io/providers/okta/okta",
     "owner": "okta",
     "repo": "terraform-provider-okta",
-    "rev": "v6.3.0",
+    "rev": "v6.4.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-oE4nB0dFsiz82kj9QOr0vIjD3aBR+jxeAW5/ZWUxp44="
+    "vendorHash": "sha256-gLFMFVw44jJcuVzY6OcUHJ74rRCIQuon4p9RNoQPLPs="
   },
   "oktadeveloper_oktaasa": {
     "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=",

From 52b403a15377c791c11aea68d37115ee820abc28 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 30 Oct 2025 06:50:40 +0000
Subject: [PATCH 4106/6226] rust-analyzer-unwrapped: 2025-10-27 -> 2025-10-28

Changes: https://github.com/rust-lang/rust-analyzer/releases/tag/2025-10-28
---
 pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
index a158be7bf751..8c0705762c6a 100644
--- a/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
+++ b/pkgs/by-name/ru/rust-analyzer-unwrapped/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rust-analyzer-unwrapped";
-  version = "2025-10-27";
+  version = "2025-10-28";
 
   cargoHash = "sha256-iw+Pgtv5VkCRSa07ap5fjhVZQgo+sfNjp5A4yaHdX1M=";
 
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
     owner = "rust-lang";
     repo = "rust-analyzer";
     rev = version;
-    hash = "sha256-syeBTCCU96qPJHcVpwHeCwmPCiLTDHHgYQYhpZ0iwLo=";
+    hash = "sha256-rNsxpCKWzVNJ5FR71mpZFSEPxuvZfAQzcVpgfwgajQU=";
   };
 
   cargoBuildFlags = [

From 38b9b6481226ceb722da2a1a9d4445bcf39e4b67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= <fabianhjr@protonmail.com>
Date: Thu, 30 Oct 2025 00:51:32 -0600
Subject: [PATCH 4107/6226] linux: cleanup common-config after 5.4 drop

---
 .../linux/kernel/common-config.nix            | 189 ++++++++----------
 1 file changed, 84 insertions(+), 105 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index cb70dfbeeccf..1c6d3ed7bfe8 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -77,7 +77,7 @@ let
       # FIXME: figure out how to actually make BTFs reproducible instead
       # See https://github.com/NixOS/nixpkgs/pull/181456 for details.
       MODULE_ALLOW_BTF_MISMATCH = whenAtLeast "5.18" (option yes);
-      BPF_LSM = whenAtLeast "5.7" (option yes);
+      BPF_LSM = option yes;
       DEBUG_KERNEL = yes;
       DEBUG_DEVRES = no;
       DYNAMIC_DEBUG = yes;
@@ -154,10 +154,10 @@ let
       CPU_FREQ_STAT = yes;
 
       # Enable CPU energy model for scheduling
-      ENERGY_MODEL = whenAtLeast "5.0" yes;
+      ENERGY_MODEL = yes;
 
       # Enable thermal interface netlink API
-      THERMAL_NETLINK = whenAtLeast "5.9" yes;
+      THERMAL_NETLINK = yes;
 
       # Prefer power-efficient workqueue implementation to per-CPU workqueues,
       # which is slightly slower, but improves battery life.
@@ -182,24 +182,24 @@ let
       X86_INTEL_PSTATE = yes;
       X86_AMD_PSTATE = whenAtLeast "5.17" yes;
       # Intel DPTF (Dynamic Platform and Thermal Framework) Support
-      ACPI_DPTF = whenAtLeast "5.10" yes;
+      ACPI_DPTF = yes;
 
       # Required to bring up some Bay Trail devices properly
       I2C = yes;
       I2C_DESIGNWARE_CORE = yes;
       I2C_DESIGNWARE_PLATFORM = yes;
-      PMIC_OPREGION = whenAtLeast "5.10" yes;
-      INTEL_SOC_PMIC = whenAtLeast "5.10" yes;
-      BYTCRC_PMIC_OPREGION = whenAtLeast "5.10" yes;
-      CHTCRC_PMIC_OPREGION = whenAtLeast "5.10" yes;
-      XPOWER_PMIC_OPREGION = whenAtLeast "5.10" yes;
-      BXT_WC_PMIC_OPREGION = whenAtLeast "5.10" yes;
-      INTEL_SOC_PMIC_CHTWC = whenAtLeast "5.10" yes;
-      CHT_WC_PMIC_OPREGION = whenAtLeast "5.10" yes;
-      INTEL_SOC_PMIC_CHTDC_TI = whenAtLeast "5.10" yes;
-      CHT_DC_TI_PMIC_OPREGION = whenAtLeast "5.10" yes;
-      MFD_TPS68470 = whenBetween "5.10" "5.13" yes;
-      TPS68470_PMIC_OPREGION = whenAtLeast "5.10" yes;
+      PMIC_OPREGION = yes;
+      INTEL_SOC_PMIC = yes;
+      BYTCRC_PMIC_OPREGION = yes;
+      CHTCRC_PMIC_OPREGION = yes;
+      XPOWER_PMIC_OPREGION = yes;
+      BXT_WC_PMIC_OPREGION = yes;
+      INTEL_SOC_PMIC_CHTWC = yes;
+      CHT_WC_PMIC_OPREGION = yes;
+      INTEL_SOC_PMIC_CHTDC_TI = yes;
+      CHT_DC_TI_PMIC_OPREGION = yes;
+      MFD_TPS68470 = whenOlder "5.13" yes;
+      TPS68470_PMIC_OPREGION = yes;
 
       # Enable Intel thermal hardware feedback
       INTEL_HFI_THERMAL = whenAtLeast "5.18" yes;
@@ -251,11 +251,9 @@ let
     # Include the CFQ I/O scheduler in the kernel, rather than as a
     # module, so that the initrd gets a good I/O scheduler.
     scheduler = {
-      IOSCHED_CFQ = whenOlder "5.0" yes; # Removed in 5.0-RC1
       BLK_CGROUP = yes; # required by CFQ"
       BLK_CGROUP_IOLATENCY = yes;
       BLK_CGROUP_IOCOST = yes;
-      IOSCHED_DEADLINE = whenOlder "5.0" yes; # Removed in 5.0-RC1
       MQ_IOSCHED_DEADLINE = yes;
       BFQ_GROUP_IOSCHED = yes;
       MQ_IOSCHED_KYBER = yes;
@@ -379,13 +377,13 @@ let
       INET_DIAG_DESTROY = lib.mkDefault yes;
 
       # IPsec over TCP
-      INET_ESPINTCP = whenAtLeast "5.8" yes;
-      INET6_ESPINTCP = whenAtLeast "5.8" yes;
+      INET_ESPINTCP = yes;
+      INET6_ESPINTCP = yes;
 
       # enable multipath-tcp
-      MPTCP = whenAtLeast "5.6" yes;
-      MPTCP_IPV6 = whenAtLeast "5.6" yes;
-      INET_MPTCP_DIAG = whenAtLeast "5.9" (lib.mkDefault module);
+      MPTCP = yes;
+      MPTCP_IPV6 = yes;
+      INET_MPTCP_DIAG = lib.mkDefault module;
 
       # Kernel TLS
       TLS = module;
@@ -444,14 +442,8 @@ let
       RTL8XXXU_UNTESTED = option yes;
 
       RTW88 = module;
-      RTW88_8822BE = lib.mkMerge [
-        (whenOlder "5.8" yes)
-        (whenAtLeast "5.8" module)
-      ];
-      RTW88_8822CE = lib.mkMerge [
-        (whenOlder "5.8" yes)
-        (whenAtLeast "5.8" module)
-      ];
+      RTW88_8822BE = module;
+      RTW88_8822CE = module;
     };
 
     fb = {
@@ -483,7 +475,7 @@ let
       FONT_8x8 = yes;
       FONT_8x16 = yes;
       # High DPI font
-      FONT_TER16x32 = whenAtLeast "5.0" yes;
+      FONT_TER16x32 = yes;
     };
 
     video =
@@ -494,7 +486,7 @@ let
           || isPower64
           || isS390x
           || isx86_64
-          || (lib.versionAtLeast version "5.7" && isAarch64)
+          || isAarch64
           || (lib.versionAtLeast version "6.11" && isRiscV64)
         );
       in
@@ -530,18 +522,15 @@ let
         DRM_DP_AUX_CHARDEV = whenOlder "6.10" yes;
         DRM_DISPLAY_DP_AUX_CHARDEV = whenAtLeast "6.10" yes;
         # amdgpu display core (DC) support
-        DRM_AMD_DC_DCN1_0 = lib.mkIf stdenv.hostPlatform.isx86 (whenOlder "5.6" yes);
-        DRM_AMD_DC_DCN2_0 = lib.mkIf stdenv.hostPlatform.isx86 (whenOlder "5.6" yes);
-        DRM_AMD_DC_DCN2_1 = lib.mkIf stdenv.hostPlatform.isx86 (whenOlder "5.6" yes);
-        DRM_AMD_DC_DCN3_0 = lib.mkIf (with stdenv.hostPlatform; isx86) (whenBetween "5.9" "5.11" yes);
+        DRM_AMD_DC_DCN3_0 = lib.mkIf (with stdenv.hostPlatform; isx86) (whenOlder "5.11" yes);
         DRM_AMD_DC_DCN = lib.mkIf (with stdenv.hostPlatform; isx86 || isPower64) (
           whenBetween "5.11" "6.4" yes
         );
         # Not available when using clang
         # See: https://github.com/torvalds/linux/blob/172a9d94339cea832d89630b89d314e41d622bd8/drivers/gpu/drm/amd/display/Kconfig#L14
         DRM_AMD_DC_FP = lib.mkIf (!stdenv.cc.isClang) (whenAtLeast "6.4" yes);
-        DRM_AMD_DC_HDCP = whenBetween "5.5" "6.4" yes;
-        DRM_AMD_DC_SI = whenAtLeast "5.10" yes;
+        DRM_AMD_DC_HDCP = whenOlder "6.4" yes;
+        DRM_AMD_DC_SI = yes;
 
         # Enable AMD Audio Coprocessor support for HDMI outputs
         DRM_AMD_ACP = yes;
@@ -567,7 +556,7 @@ let
 
         # Enable HDMI-CEC receiver support
         RC_CORE = yes;
-        MEDIA_CEC_RC = whenAtLeast "5.10" yes;
+        MEDIA_CEC_RC = yes;
 
         # Enable CEC over DisplayPort
         DRM_DP_CEC = whenOlder "6.10" yes;
@@ -619,48 +608,43 @@ let
       SND_HDA_RECONFIG = yes; # Support reconfiguration of jack functions
       # Support configuring jack functions via fw mechanism at boot
       SND_HDA_PATCH_LOADER = yes;
-      SND_HDA_CODEC_CA0132_DSP = whenOlder "5.7" yes; # Enable DSP firmware loading on Creative Soundblaster Z/Zx/ZxR/Recon
       SND_HDA_CODEC_CS8409 = whenAtLeast "6.6" module; # Cirrus Logic HDA Bridge CS8409
       SND_OSSEMUL = yes;
       SND_USB_CAIAQ_INPUT = yes;
       SND_USB_AUDIO_MIDI_V2 = whenAtLeast "6.5" yes;
       # Enable Sound Open Firmware support
     }
-    //
-      lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux" && lib.versionAtLeast version "5.5")
-        {
-          SND_SOC_INTEL_SOUNDWIRE_SOF_MACH = whenAtLeast "5.10" module;
-          SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES = whenAtLeast "5.10" yes; # dep of SOF_MACH
-          SND_SOC_SOF_INTEL_SOUNDWIRE_LINK = whenBetween "5.10" "5.11" yes; # dep of SOF_MACH
-          SND_SOC_SOF_TOPLEVEL = yes;
-          SND_SOC_SOF_ACPI = module;
-          SND_SOC_SOF_PCI = module;
-          SND_SOC_SOF_APOLLOLAKE = whenAtLeast "5.12" module;
-          SND_SOC_SOF_APOLLOLAKE_SUPPORT = whenOlder "5.12" yes;
-          SND_SOC_SOF_CANNONLAKE = whenAtLeast "5.12" module;
-          SND_SOC_SOF_CANNONLAKE_SUPPORT = whenOlder "5.12" yes;
-          SND_SOC_SOF_COFFEELAKE = whenAtLeast "5.12" module;
-          SND_SOC_SOF_COFFEELAKE_SUPPORT = whenOlder "5.12" yes;
-          SND_SOC_SOF_COMETLAKE = whenAtLeast "5.12" module;
-          SND_SOC_SOF_COMETLAKE_H_SUPPORT = whenOlder "5.8" yes;
-          SND_SOC_SOF_COMETLAKE_LP_SUPPORT = whenOlder "5.12" yes;
-          SND_SOC_SOF_ELKHARTLAKE = whenAtLeast "5.12" module;
-          SND_SOC_SOF_ELKHARTLAKE_SUPPORT = whenOlder "5.12" yes;
-          SND_SOC_SOF_GEMINILAKE = whenAtLeast "5.12" module;
-          SND_SOC_SOF_GEMINILAKE_SUPPORT = whenOlder "5.12" yes;
-          SND_SOC_SOF_HDA_AUDIO_CODEC = yes;
-          SND_SOC_SOF_HDA_COMMON_HDMI_CODEC = whenOlder "5.7" yes;
-          SND_SOC_SOF_HDA_LINK = yes;
-          SND_SOC_SOF_ICELAKE = whenAtLeast "5.12" module;
-          SND_SOC_SOF_ICELAKE_SUPPORT = whenOlder "5.12" yes;
-          SND_SOC_SOF_INTEL_TOPLEVEL = yes;
-          SND_SOC_SOF_JASPERLAKE = whenAtLeast "5.12" module;
-          SND_SOC_SOF_JASPERLAKE_SUPPORT = whenOlder "5.12" yes;
-          SND_SOC_SOF_MERRIFIELD = whenAtLeast "5.12" module;
-          SND_SOC_SOF_MERRIFIELD_SUPPORT = whenOlder "5.12" yes;
-          SND_SOC_SOF_TIGERLAKE = whenAtLeast "5.12" module;
-          SND_SOC_SOF_TIGERLAKE_SUPPORT = whenOlder "5.12" yes;
-        };
+    // lib.optionalAttrs (stdenv.hostPlatform.system == "x86_64-linux") {
+      SND_SOC_INTEL_SOUNDWIRE_SOF_MACH = module;
+      SND_SOC_INTEL_USER_FRIENDLY_LONG_NAMES = yes; # dep of SOF_MACH
+      SND_SOC_SOF_INTEL_SOUNDWIRE_LINK = whenOlder "5.11" yes; # dep of SOF_MACH
+      SND_SOC_SOF_TOPLEVEL = yes;
+      SND_SOC_SOF_ACPI = module;
+      SND_SOC_SOF_PCI = module;
+      SND_SOC_SOF_APOLLOLAKE = whenAtLeast "5.12" module;
+      SND_SOC_SOF_APOLLOLAKE_SUPPORT = whenOlder "5.12" yes;
+      SND_SOC_SOF_CANNONLAKE = whenAtLeast "5.12" module;
+      SND_SOC_SOF_CANNONLAKE_SUPPORT = whenOlder "5.12" yes;
+      SND_SOC_SOF_COFFEELAKE = whenAtLeast "5.12" module;
+      SND_SOC_SOF_COFFEELAKE_SUPPORT = whenOlder "5.12" yes;
+      SND_SOC_SOF_COMETLAKE = whenAtLeast "5.12" module;
+      SND_SOC_SOF_COMETLAKE_LP_SUPPORT = whenOlder "5.12" yes;
+      SND_SOC_SOF_ELKHARTLAKE = whenAtLeast "5.12" module;
+      SND_SOC_SOF_ELKHARTLAKE_SUPPORT = whenOlder "5.12" yes;
+      SND_SOC_SOF_GEMINILAKE = whenAtLeast "5.12" module;
+      SND_SOC_SOF_GEMINILAKE_SUPPORT = whenOlder "5.12" yes;
+      SND_SOC_SOF_HDA_AUDIO_CODEC = yes;
+      SND_SOC_SOF_HDA_LINK = yes;
+      SND_SOC_SOF_ICELAKE = whenAtLeast "5.12" module;
+      SND_SOC_SOF_ICELAKE_SUPPORT = whenOlder "5.12" yes;
+      SND_SOC_SOF_INTEL_TOPLEVEL = yes;
+      SND_SOC_SOF_JASPERLAKE = whenAtLeast "5.12" module;
+      SND_SOC_SOF_JASPERLAKE_SUPPORT = whenOlder "5.12" yes;
+      SND_SOC_SOF_MERRIFIELD = whenAtLeast "5.12" module;
+      SND_SOC_SOF_MERRIFIELD_SUPPORT = whenOlder "5.12" yes;
+      SND_SOC_SOF_TIGERLAKE = whenAtLeast "5.12" module;
+      SND_SOC_SOF_TIGERLAKE_SUPPORT = whenOlder "5.12" yes;
+    };
 
     usb = {
       USB = yes; # compile USB core into kernel, so we can use USB_SERIAL_CONSOLE before modules
@@ -680,7 +664,7 @@ let
       USB_SERIAL = yes;
       USB_SERIAL_GENERIC = yes; # USB Generic Serial Driver
       USB_SERIAL_CONSOLE = yes; # Allow using USB serial adapter as console
-      U_SERIAL_CONSOLE = whenAtLeast "5.10" yes; # Allow using USB gadget as console
+      U_SERIAL_CONSOLE = yes; # Allow using USB gadget as console
     };
 
     # Filesystem options - in particular, enable extended attributes and
@@ -730,11 +714,9 @@ let
 
       F2FS_FS = module;
       F2FS_FS_SECURITY = option yes;
-      F2FS_FS_COMPRESSION = whenAtLeast "5.6" yes;
+      F2FS_FS_COMPRESSION = yes;
       UDF_FS = module;
 
-      NFSD_V2_ACL = whenOlder "5.10" yes;
-      NFSD_V3 = whenOlder "5.10" yes;
       NFSD_V3_ACL = yes;
       NFSD_V4 = yes;
       NFSD_V4_SECURITY_LABEL = yes;
@@ -815,10 +797,9 @@ let
 
       SECURITY_DMESG_RESTRICT = yes;
 
-      RANDOM_TRUST_CPU = lib.mkIf (
-        with stdenv.hostPlatform;
-        isPower64 || isS390 || isx86 || (lib.versionAtLeast version "5.6" && isAarch64)
-      ) (whenOlder "6.2" yes); # allow RDRAND to seed the RNG
+      RANDOM_TRUST_CPU = lib.mkIf (with stdenv.hostPlatform; isPower64 || isS390 || isx86 || isAarch64) (
+        whenOlder "6.2" yes
+      ); # allow RDRAND to seed the RNG
       RANDOM_TRUST_BOOTLOADER = whenOlder "6.2" yes; # allow the bootloader to seed the RNG
 
       MODULE_SIG = no; # r13y, generates a random key during build and bakes it in
@@ -941,7 +922,7 @@ let
       STACK_TRACER = yes;
       UPROBE_EVENTS = option yes;
       BPF_SYSCALL = yes;
-      BPF_UNPRIV_DEFAULT_OFF = whenBetween "5.10" "5.16" yes;
+      BPF_UNPRIV_DEFAULT_OFF = whenOlder "5.16" yes;
       BPF_EVENTS = yes;
       FUNCTION_PROFILER = yes;
       RING_BUFFER_BENCHMARK = no;
@@ -1035,7 +1016,7 @@ let
       ZRAM_BACKEND_ZSTD = whenAtLeast "6.12" yes;
       ZRAM_DEF_COMP_ZSTD = whenAtLeast "5.11" yes;
       ZSWAP = option yes;
-      ZSWAP_COMPRESSOR_DEFAULT_ZSTD = whenAtLeast "5.7" (lib.mkOptionDefault yes);
+      ZSWAP_COMPRESSOR_DEFAULT_ZSTD = lib.mkOptionDefault yes;
       ZPOOL = whenOlder "6.18" yes;
       ZSMALLOC = option yes;
     };
@@ -1065,8 +1046,7 @@ let
       LOCK_TORTURE_TEST = option no;
       MTD_TESTS = option no;
       NOTIFIER_ERROR_INJECTION = option no;
-      RCU_PERF_TEST = whenOlder "5.9" no;
-      RCU_SCALE_TEST = whenAtLeast "5.10" no;
+      RCU_SCALE_TEST = no;
       TEST_ASYNC_DRIVER_PROBE = option no;
       WW_MUTEX_SELFTEST = option no;
       XZ_DEC_TEST = option no;
@@ -1086,7 +1066,7 @@ let
       let
         # Use zstd for kernel compression if 64-bit and newer than 5.9, otherwise xz.
         # i686 issues: https://github.com/NixOS/nixpkgs/pull/117961#issuecomment-812106375
-        useZstd = stdenv.buildPlatform.is64bit && lib.versionAtLeast version "5.9";
+        useZstd = stdenv.buildPlatform.is64bit;
       in
       {
         # stdenv.hostPlatform.linux-kernel.target assumes uncompressed on RISC-V.
@@ -1181,9 +1161,9 @@ let
         BLK_SED_OPAL = yes;
 
         # Enable support for block layer inline encryption
-        BLK_INLINE_ENCRYPTION = whenAtLeast "5.8" yes;
+        BLK_INLINE_ENCRYPTION = yes;
         # ...but fall back to CPU encryption if unavailable
-        BLK_INLINE_ENCRYPTION_FALLBACK = whenAtLeast "5.8" yes;
+        BLK_INLINE_ENCRYPTION_FALLBACK = yes;
 
         BSD_PROCESS_ACCT_V3 = yes;
 
@@ -1213,7 +1193,7 @@ let
 
         EFI = lib.mkIf stdenv.hostPlatform.isEfi yes;
         EFI_STUB = yes; # EFI bootloader in the bzImage itself
-        EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER = whenOlder "6.2" (whenAtLeast "5.8" yes); # initrd kernel parameter for EFI
+        EFI_GENERIC_STUB_INITRD_CMDLINE_LOADER = whenOlder "6.2" yes; # initrd kernel parameter for EFI
 
         # Generic compression support for EFI payloads
         # Add new platforms only after they have been verified to build and boot.
@@ -1261,7 +1241,7 @@ let
         NVME_TCP_TLS = whenAtLeast "6.7" yes;
 
         NVME_TARGET = module;
-        NVME_TARGET_PASSTHRU = whenAtLeast "5.9" yes;
+        NVME_TARGET_PASSTHRU = yes;
         NVME_TARGET_AUTH = whenAtLeast "6.0" yes;
         NVME_TARGET_TCP_TLS = whenAtLeast "6.7" yes;
 
@@ -1271,7 +1251,7 @@ let
           || isPower64
           || isS390x
           || isx86_64
-          || (lib.versionAtLeast version "5.7" && isAarch64)
+          || isAarch64
           || (lib.versionAtLeast version "6.11" && isRiscV64)
         ) yes;
 
@@ -1313,7 +1293,7 @@ let
 
         HWMON = yes;
         THERMAL_HWMON = yes; # Hardware monitoring support
-        NVME_HWMON = whenAtLeast "5.5" yes; # NVMe drives temperature reporting
+        NVME_HWMON = yes; # NVMe drives temperature reporting
         UEVENT_HELPER = no;
 
         USERFAULTFD = yes;
@@ -1346,7 +1326,7 @@ let
           || isPower64
           || isS390x
           || isx86_64
-          || (lib.versionAtLeast version "5.7" && isAarch64)
+          || isAarch64
           || (lib.versionAtLeast version "6.11" && isRiscV64)
         ) yes;
 
@@ -1387,15 +1367,15 @@ let
         };
         ANDROID_BINDER_IPC = {
           optional = true;
-          tristate = whenAtLeast "5.0" "y";
+          tristate = "y";
         };
         ANDROID_BINDERFS = {
           optional = true;
-          tristate = whenAtLeast "5.0" "y";
+          tristate = "y";
         };
         ANDROID_BINDER_DEVICES = {
           optional = true;
-          freeform = whenAtLeast "5.0" "binder,hwbinder,vndbinder";
+          freeform = "binder,hwbinder,vndbinder";
         };
 
         TASKSTATS = yes;
@@ -1408,7 +1388,7 @@ let
 
         # > CONFIG_KUNIT should not be enabled in a production environment. Enabling KUnit disables Kernel Address-Space Layout Randomization (KASLR), and tests may affect the state of the kernel in ways not suitable for production.
         # https://www.kernel.org/doc/html/latest/dev-tools/kunit/start.html
-        KUNIT = whenAtLeast "5.5" no;
+        KUNIT = no;
 
         # Set system time from RTC on startup and resume
         RTC_HCTOSYS = option yes;
@@ -1418,7 +1398,7 @@ let
 
         # Enable generic kernel watch queues
         # See https://docs.kernel.org/core-api/watch_queue.html
-        WATCH_QUEUE = whenAtLeast "5.8" yes;
+        WATCH_QUEUE = yes;
       }
       //
         lib.optionalAttrs
@@ -1437,7 +1417,7 @@ let
               || isPower
               || isS390
               || isx86
-              || (lib.versionAtLeast version "5.7" && isAarch64)
+              || isAarch64
               || (lib.versionAtLeast version "6.11" && isRiscV)
             ) yes;
             HOTPLUG_CPU = yes;
@@ -1458,8 +1438,7 @@ let
             CROS_EC_I2C = module;
             CROS_EC_SPI = module;
             CROS_KBD_LED_BACKLIGHT = module;
-            MFD_CROS_EC = whenOlder "5.10" module;
-            TCG_TIS_SPI_CR50 = whenAtLeast "5.5" yes;
+            TCG_TIS_SPI_CR50 = yes;
           }
       //
         lib.optionalAttrs
@@ -1521,7 +1500,7 @@ let
         CHROMEOS_PSTORE = module;
 
         # Enable x86 resource control
-        X86_CPU_RESCTRL = whenAtLeast "5.0" yes;
+        X86_CPU_RESCTRL = yes;
 
         # Enable TSX on CPUs where it's not vulnerable
         X86_INTEL_TSX_MODE_AUTO = yes;

From 190d3acdcdcc7235e4091b5666b3e47b69c426e9 Mon Sep 17 00:00:00 2001
From: Benjamin Lemouzy <blemouzy.ml@gmail.com>
Date: Thu, 30 Oct 2025 08:07:02 +0100
Subject: [PATCH 4108/6226] saleae-logic-2: 2.4.29 -> 2.4.36

---
 pkgs/by-name/sa/saleae-logic-2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sa/saleae-logic-2/package.nix b/pkgs/by-name/sa/saleae-logic-2/package.nix
index 3cea47a1a90a..1d37f2594d2b 100644
--- a/pkgs/by-name/sa/saleae-logic-2/package.nix
+++ b/pkgs/by-name/sa/saleae-logic-2/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "saleae-logic-2";
-  version = "2.4.29";
+  version = "2.4.36";
   src = fetchurl {
     url = "https://downloads2.saleae.com/logic2/Logic-${version}-linux-x64.AppImage";
-    hash = "sha256-eCG2Al6MmWTCiYtaO6qIoNji4QreMryoZRcfKjk5d1c=";
+    hash = "sha256-M6sjmFHonByjh3rHnAMuSpFKkvOsXqd4XevFDxuEOp4=";
   };
   desktopItem = makeDesktopItem {
     name = "saleae-logic-2";

From 1aeb6c7b28cbe66337ab85af9408656579e8a981 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 30 Oct 2025 08:10:22 +0100
Subject: [PATCH 4109/6226] rcu: 4.0.29 -> 4.0.30

---
 pkgs/by-name/rc/rcu/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/rc/rcu/package.nix b/pkgs/by-name/rc/rcu/package.nix
index 1165087ab22a..08707fb7ba56 100644
--- a/pkgs/by-name/rc/rcu/package.nix
+++ b/pkgs/by-name/rc/rcu/package.nix
@@ -19,11 +19,12 @@
 }:
 
 let
+  # shiboken2 is broken on Python > 3.12
   python3Packages = python312Packages;
 in
 python3Packages.buildPythonApplication rec {
   pname = "rcu";
-  version = "4.0.29";
+  version = "4.0.30";
 
   format = "other";
 
@@ -31,7 +32,7 @@ python3Packages.buildPythonApplication rec {
     let
       src-tarball = requireFile {
         name = "rcu-${version}-source.tar.gz";
-        hash = "sha256-qbHjRKH9GOwBduyod8AOm2SYOjGUH1mYSpCTifOehVM=";
+        hash = "sha256-SJnDTW6oQUd+UjWgJz74Po+ibk3JfotFU7CIt4J/nDA=";
         url = "https://www.davisr.me/projects/rcu/";
       };
     in

From 0a9af82107b2acfbdfa912a2579f0495b5bb8433 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Thu, 30 Oct 2025 08:44:54 +0100
Subject: [PATCH 4110/6226] claude-code: 2.0.28 -> 2.0.29

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
---
 .../vscode/extensions/anthropic.claude-code/default.nix     | 4 ++--
 pkgs/by-name/cl/claude-code/package-lock.json               | 4 ++--
 pkgs/by-name/cl/claude-code/package.nix                     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 9c28968154eb..94ccac2bd80d 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "2.0.28";
-    hash = "sha256-RfZDKiGPnmfNuq4D8dSO+Rk97g+Amo4G1apqgqVZttg=";
+    version = "2.0.29";
+    hash = "sha256-g5k2Lov2BBxDR2TCSiVVU8+6jo4ajp0IIYJnVmg/NMQ=";
   };
 
   meta = {
diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index c2cba3254f18..a101b2ac2361 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.0.28",
+  "version": "2.0.29",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.0.28",
+      "version": "2.0.29",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 44895e0db84e..cc7c9e82eec7 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,14 +7,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.0.28";
+  version = "2.0.29";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-S8Qp6xzbEnU0GOx8BfblHMsjmOZkPuTvSeCAHEZN8+E=";
+    hash = "sha256-6YN0iSX05S+CqZ4NCDM1D+vGlLNV29NpPaVd31JN/u4=";
   };
 
-  npmDepsHash = "sha256-EjvkOHRwhiBBMV9xZuYqObuz93CxbqUwNgc2enBA5go=";
+  npmDepsHash = "sha256-ULesV9VeFhJRBJdTexCp92wuUMj6abNQ2xE+ZtcpzqE=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 8ab2843df91d3c9c44210ca7bf984e6de73defb0 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Wed, 29 Oct 2025 20:05:38 +0100
Subject: [PATCH 4111/6226] aws-workspaces: add missing `ffmpeg` dependency

See context at https://github.com/NixOS/nixpkgs/pull/411943#issuecomment-3466449268
---
 pkgs/by-name/aw/aws-workspaces/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/aw/aws-workspaces/package.nix b/pkgs/by-name/aw/aws-workspaces/package.nix
index bdcf2e63b8b8..520da33fdc94 100644
--- a/pkgs/by-name/aw/aws-workspaces/package.nix
+++ b/pkgs/by-name/aw/aws-workspaces/package.nix
@@ -3,6 +3,7 @@
   writeShellApplication,
   buildFHSEnv,
   webkitgtk_4_1,
+  ffmpeg,
   gtk3,
   pango,
   atk,
@@ -49,6 +50,7 @@ buildFHSEnv {
     custom_lsb_release
     webkitgtk_4_1
     gtk3
+    ffmpeg
     pango
     atk
     cairo

From 0b9120e332a168ced38c0868a4dc532c6718ec2f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 08:04:19 +0000
Subject: [PATCH 4112/6226] pgrok: 1.4.5 -> 1.4.6

---
 pkgs/by-name/pg/pgrok/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pg/pgrok/package.nix b/pkgs/by-name/pg/pgrok/package.nix
index cff0a849af48..6ee47544a65d 100644
--- a/pkgs/by-name/pg/pgrok/package.nix
+++ b/pkgs/by-name/pg/pgrok/package.nix
@@ -9,12 +9,12 @@
 
 let
   pname = "pgrok";
-  version = "1.4.5";
+  version = "1.4.6";
   src = fetchFromGitHub {
     owner = "pgrok";
     repo = "pgrok";
     tag = "v${version}";
-    hash = "sha256-eDtYnsHZpdIGcgRGHTptlfVf//bxup6ZDWvVkBJdBbE=";
+    hash = "sha256-Meavhgq0xHRAfCgzdazC1wu8aDw39qQCZrVtZUScwgs=";
   };
 in
 
@@ -37,7 +37,7 @@ buildGoModule {
     hash = "sha256-o6wxO8EGRmhcYggJnfxDkH+nbt+isc8bfHji8Hu9YKg=";
   };
 
-  vendorHash = "sha256-nIxsG1O5RG+PDSWBcUWpk+4aFq2cYaxpkgOoDqLjY90=";
+  vendorHash = "sha256-l/tUO7fevi+zUmUp6CQoVNrzMF7LIzbo2Qsa/ez6LiA=";
 
   ldflags = [
     "-s"

From 614155af3810938c8e864508ebc3f01974d5fcfb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 08:06:24 +0000
Subject: [PATCH 4113/6226] biome: 2.2.7 -> 2.3.2

---
 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 133780819c08..becb12af6579 100644
--- a/pkgs/by-name/bi/biome/package.nix
+++ b/pkgs/by-name/bi/biome/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "biome";
-  version = "2.2.7";
+  version = "2.3.2";
 
   src = fetchFromGitHub {
     owner = "biomejs";
     repo = "biome";
     rev = "@biomejs/biome@${finalAttrs.version}";
-    hash = "sha256-VBNFQkgruomZjDaQouR4KZooGNN/0VCRYFRomdhPFF8=";
+    hash = "sha256-SUihyk1tbSiF3uY19/T9ZgQsURVc81p8lFMN933p6f0=";
   };
 
-  cargoHash = "sha256-CkKwzTi9yqao8mGqIu4F2lqMKZVpFsLUtccXOSXr+uw=";
+  cargoHash = "sha256-nzQb2GJFltktA10Rrl7tltHVjVYNPgLNpDzOXCHQeQA=";
 
   nativeBuildInputs = [ pkg-config ];
 

From ebbb35e943efcc3793eff20c5c5f167302db653d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 08:20:46 +0000
Subject: [PATCH 4114/6226] ente-web: 1.2.11 -> 1.2.15

---
 pkgs/by-name/en/ente-web/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/en/ente-web/package.nix b/pkgs/by-name/en/ente-web/package.nix
index 07a97615b0b5..64b3d99025fe 100644
--- a/pkgs/by-name/en/ente-web/package.nix
+++ b/pkgs/by-name/en/ente-web/package.nix
@@ -19,7 +19,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ente-web-${enteApp}";
-  version = "1.2.11";
+  version = "1.2.15";
 
   src = fetchFromGitHub {
     owner = "ente-io";
@@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: {
     sparseCheckout = [ "web" ];
     tag = "photos-v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-h+Bkz41rOAQhRqDdzUx+CWNq2QYvGFw+TE0ryps63bI=";
+    hash = "sha256-27Jmv7dbXwR31KBvWcMZ4p972BxUivN2tbZq7ISplSg=";
   };
   sourceRoot = "${finalAttrs.src.name}/web";
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/web/yarn.lock";
-    hash = "sha256-g6g4VCn6pQWIqhaUctMISHvbQv+o+B+MFSWKT+S7YVU=";
+    hash = "sha256-m+7woB5XnOPDMLpoIBui1GxeW1BOms18SKJ8vaJcv68=";
   };
 
   nativeBuildInputs = [

From bb36e103897d8a4a9175815047cbfef647d9ef3c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 08:27:23 +0000
Subject: [PATCH 4115/6226] python3Packages.nodriver: 0.47.0 -> 0.48.0

---
 pkgs/development/python-modules/nodriver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nodriver/default.nix b/pkgs/development/python-modules/nodriver/default.nix
index 2a408c9a2572..95288e479324 100644
--- a/pkgs/development/python-modules/nodriver/default.nix
+++ b/pkgs/development/python-modules/nodriver/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "nodriver";
-  version = "0.47.0";
+  version = "0.48.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-X8MRgqTbcl6lb8BCJpopoT5Vorr4Pf3XMKqFHdUmlgg=";
+    hash = "sha256-i7HsT9dZH3RFerJ49hFYEiXu0BVi44eRPm2wairAuC8=";
   };
 
   disabled = pythonOlder "3.9";

From 69d4092d192dcb9f9c987fc2daea76f5b12c5981 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Wed, 29 Oct 2025 15:53:06 +0100
Subject: [PATCH 4116/6226] arcan: 0.6.3.3 -> 0.7.0.1; add ngi team

---
 pkgs/by-name/ar/arcan/package.nix | 14 ++++----------
 pkgs/by-name/ar/arcan/sources.nix | 12 ++++++------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ar/arcan/package.nix b/pkgs/by-name/ar/arcan/package.nix
index 8be48491c5bb..0f723a613e20 100644
--- a/pkgs/by-name/ar/arcan/package.nix
+++ b/pkgs/by-name/ar/arcan/package.nix
@@ -2,7 +2,6 @@
   lib,
   SDL2,
   callPackage,
-  fetchpatch2,
   cmake,
   espeak-ng,
   ffmpeg,
@@ -28,6 +27,7 @@
   libvncserver,
   libxcb,
   libxkbcommon,
+  luajit,
   makeWrapper,
   libgbm,
   mupdf,
@@ -48,7 +48,7 @@
   xz,
   # Boolean flags
   buildManPages ? true,
-  useBuiltinLua ? true,
+  useBuiltinLua ? false,
   useEspeak ? !stdenv.hostPlatform.isDarwin,
   useStaticLibuvc ? true,
   useStaticOpenAL ? true,
@@ -62,14 +62,6 @@
 stdenv.mkDerivation (finalAttrs: {
   inherit (sources.letoram-arcan) pname version src;
 
-  patches = [
-    # (encode) remove deprecated use of pts/channel-layout
-    (fetchpatch2 {
-      url = "https://github.com/letoram/arcan/commit/e717c1b5833bdc2dea7dc6f64eeaf39c683ebd26.patch?full_index=1";
-      hash = "sha256-nUmOWfphGtGiLehUa78EJWqTlD7SvqJgl8lnn90vTFU=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     makeWrapper
@@ -117,6 +109,7 @@ stdenv.mkDerivation (finalAttrs: {
     xcbutilwm
     xz
   ]
+  ++ lib.optionals (!useBuiltinLua) [ luajit ]
   ++ lib.optionals useEspeak [ espeak-ng ];
 
   cmakeFlags = [
@@ -206,6 +199,7 @@ stdenv.mkDerivation (finalAttrs: {
       lgpl2Plus
     ];
     maintainers = [ ];
+    teams = with lib.teams; [ ngi ];
     platforms = lib.platforms.unix;
   };
 })
diff --git a/pkgs/by-name/ar/arcan/sources.nix b/pkgs/by-name/ar/arcan/sources.nix
index fbc7645a1bf2..8197cc1fb668 100644
--- a/pkgs/by-name/ar/arcan/sources.nix
+++ b/pkgs/by-name/ar/arcan/sources.nix
@@ -7,13 +7,13 @@
     let
       self = {
         pname = "arcan";
-        version = "0.6.3.3";
+        version = "0.7.0.1";
 
         src = fetchFromGitHub {
           owner = "letoram";
           repo = "arcan";
-          rev = self.version;
-          hash = "sha256-YH3VGU3gSR5gqHnAlA2vrzU8vasKd0hOpc+2ludnV+Y=";
+          tag = self.version;
+          hash = "sha256-AbIMZOyEvRQzlmNetImLnBBoSaFUsy4k1NNSO0mI8FI=";
         };
       };
     in
@@ -21,13 +21,13 @@
 
   letoram-openal = {
     pname = "letoram-openal";
-    version = "0.6.2";
+    version = "0.6.2-unstable-2025-06-26";
 
     src = fetchFromGitHub {
       owner = "letoram";
       repo = "openal";
-      rev = "81e1b364339b6aa2b183f39fc16c55eb5857e97a";
-      hash = "sha256-X3C3TDZPiOhdZdpApC4h4KeBiWFMxkFsmE3gQ1Rz420=";
+      rev = "731bdaefeb9cfcc52267bb8fc884248e4420e9ec";
+      hash = "sha256-jrgZRekhEiztJ8vodWnCpeYmT54Ei/c27XrD5S98gjk=";
     };
   };
 

From 81092f29a761913a4b89c3b45c7e09806c181593 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Thu, 30 Oct 2025 08:44:45 +0100
Subject: [PATCH 4117/6226] aws-workspaces: do not reuse `pname`

---
 pkgs/by-name/aw/aws-workspaces/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/aw/aws-workspaces/package.nix b/pkgs/by-name/aw/aws-workspaces/package.nix
index 520da33fdc94..3362e90367a0 100644
--- a/pkgs/by-name/aw/aws-workspaces/package.nix
+++ b/pkgs/by-name/aw/aws-workspaces/package.nix
@@ -1,4 +1,5 @@
 {
+  lib,
   callPackage,
   writeShellApplication,
   buildFHSEnv,
@@ -34,14 +35,12 @@ let
       echo "Release: 22.04"
     '';
   };
-  pname = "aws-workspaces";
-
 in
 buildFHSEnv {
-  inherit pname;
+  pname = "aws-workspaces";
   inherit (workspacesclient) version;
 
-  runScript = "${workspacesclient}/bin/workspacesclient";
+  runScript = lib.getExe workspacesclient;
 
   includeClosures = true;
 
@@ -66,7 +65,7 @@ buildFHSEnv {
 
   # expected executable doesn't match the name of this package
   extraInstallCommands = ''
-    mv $out/bin/${pname} $out/bin/workspacesclient
+    mv $out/bin/aws-workspaces $out/bin/${workspacesclient.meta.mainProgram}
 
     ln -s ${workspacesclient}/share $out/
   '';

From a9d91573e9c747e9aa96d3419f78311967da4c0e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 30 Oct 2025 09:38:15 +0100
Subject: [PATCH 4118/6226] postgresqlPackages.anonymizer: fix maintainer pings

Because of `lib.getAttrs`,
`postgresqlPackages.anonymizer.meta.teamsPosition` returned the path to
`lib/attrsets.nix`. This caused maintainer pings for that file for the
maintainers of `postgresqlPackages.anonymizer`.

Using regular `inherit` syntax moves the definition of the `teams`
attribute in the right file and fixes the maintainer pings.
---
 pkgs/servers/sql/postgresql/ext/anonymizer.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/sql/postgresql/ext/anonymizer.nix b/pkgs/servers/sql/postgresql/ext/anonymizer.nix
index 410bcd6966f8..23958e28a7cc 100644
--- a/pkgs/servers/sql/postgresql/ext/anonymizer.nix
+++ b/pkgs/servers/sql/postgresql/ext/anonymizer.nix
@@ -23,7 +23,8 @@ buildPgrxExtension {
 
   passthru.tests = nixosTests.postgresql.anonymizer.passthru.override postgresql;
 
-  meta = lib.getAttrs [ "homepage" "teams" "license" ] pg-dump-anon.meta // {
+  meta = {
+    inherit (pg-dump-anon.meta) homepage teams license;
     description = "Extension to mask or replace personally identifiable information (PII) or commercially sensitive data from a PostgreSQL database";
   };
 }

From 07e1822285fe6f09f2b18f3bec431e865a162ce0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 08:51:49 +0000
Subject: [PATCH 4119/6226] python3Packages.pypugjs: 5.12.0 -> 6.0.1

---
 pkgs/development/python-modules/pypugjs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pypugjs/default.nix b/pkgs/development/python-modules/pypugjs/default.nix
index 46a40dfe6673..bacf8cf34bd0 100644
--- a/pkgs/development/python-modules/pypugjs/default.nix
+++ b/pkgs/development/python-modules/pypugjs/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "pypugjs";
-  version = "5.12.0";
+  version = "6.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kakulukia";
     repo = "pypugjs";
     tag = "v${version}";
-    hash = "sha256-JHZzyEilCjpZFIrl5kk1oJ4C/vgQTfVoRRGBK+DuHAE=";
+    hash = "sha256-aHTWRlRrUh4LCsNUcszce4g8C4O0A/aPZKTz6Zl0UYg=";
   };
 
   build-system = [

From f1554c35a5dd8f3a828c04280e954b4453431359 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Thu, 30 Oct 2025 17:01:57 +0800
Subject: [PATCH 4120/6226] nezha: buildGo124Module -> buildGoModule

---
 pkgs/by-name/ne/nezha/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix
index 6d328b2213ce..9dc5f808335c 100644
--- a/pkgs/by-name/ne/nezha/package.nix
+++ b/pkgs/by-name/ne/nezha/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  buildGo124Module,
+  buildGoModule,
   fetchFromGitHub,
   go-swag,
   versionCheckHook,
@@ -51,7 +51,7 @@ let
       ++ map mkTemplate withThemes
     );
 in
-buildGo124Module {
+buildGoModule {
   inherit pname version;
 
   src = fetchFromGitHub {

From 383430f0c2d3a13feb354e90b2d4c3502102bfc5 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Thu, 30 Oct 2025 17:03:31 +0800
Subject: [PATCH 4121/6226] nezha: 1.14.3 -> 1.14.9

---
 pkgs/by-name/ne/nezha/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix
index 9dc5f808335c..2e6d7b9e6c03 100644
--- a/pkgs/by-name/ne/nezha/package.nix
+++ b/pkgs/by-name/ne/nezha/package.nix
@@ -14,7 +14,7 @@
 
 let
   pname = "nezha";
-  version = "1.14.3";
+  version = "1.14.9";
 
   frontendName = lib.removePrefix "nezha-theme-";
 
@@ -58,7 +58,7 @@ buildGoModule {
     owner = "nezhahq";
     repo = "nezha";
     tag = "v${version}";
-    hash = "sha256-ORPu7mCNqHfuXq/nB3TuNoevbw5ZMvZFetR6NPX/b3U=";
+    hash = "sha256-q4LxqoelZ0Haz8rArINOPvopQQKGnkqIMZ2INo/2C3c=";
   };
 
   proxyVendor = true;
@@ -96,7 +96,7 @@ buildGoModule {
     GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d . -g ./cmd/dashboard/main.go -o ./cmd/dashboard/docs --parseGoList=false
   '';
 
-  vendorHash = "sha256-e4FlXKE9A7WpZpafSv0Ais97cyta56ElD9pL4eIvnUk=";
+  vendorHash = "sha256-Q+ur9hIG0xVJHdi79K5e4sV8xuR45qp195ptEDbHAvc=";
 
   ldflags = [
     "-s"

From e53d27e5ded10e24e9621acceae1d6052c3925c8 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 30 Oct 2025 09:03:31 +0000
Subject: [PATCH 4122/6226] saga: cleanup

---
 pkgs/by-name/sa/saga/package.nix | 95 +++++++++++++++++---------------
 1 file changed, 52 insertions(+), 43 deletions(-)

diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix
index f935cd93dc36..8b6062988af4 100644
--- a/pkgs/by-name/sa/saga/package.nix
+++ b/pkgs/by-name/sa/saga/package.nix
@@ -1,47 +1,51 @@
 {
-  stdenv,
   lib,
+  stdenv,
   fetchurl,
-  # native
+
+  # nativeBuildInputs
   cmake,
-  desktopToDarwinBundle,
   dos2unix,
   pkg-config,
   wrapGAppsHook3,
-  # not native
-  gdal,
-  wxGTK32,
-  proj,
-  libsForQt5,
+  # darwin-specific
+  desktopToDarwinBundle,
+
+  # buildInputs
   curl,
-  libiodbc,
-  xz,
-  libharu,
-  opencv,
-  vigra,
-  pdal,
-  libpq,
-  unixODBC,
-  poppler,
-  hdf5,
-  netcdf,
-  sqlite,
-  qhull,
-  giflib,
-  libsvm,
   fftw,
+  gdal,
+  giflib,
+  hdf5,
+  libharu,
+  libiodbc,
+  libpq,
+  libsForQt5,
+  libsvm,
+  opencv,
+  pdal,
+  proj,
+  qhull,
+  vigra,
+  wxGTK32,
+  xz,
+  # darwin-specific
+  netcdf,
+  poppler,
+  sqlite,
+  unixODBC,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "saga";
   version = "9.10.0";
 
   src = fetchurl {
-    url = "mirror://sourceforge/saga-gis/saga-${version}.tar.gz";
+    url = "mirror://sourceforge/saga-gis/saga-${finalAttrs.version}.tar.gz";
     hash = "sha256-xsXOB4WCzkZhH/mIYEUQNiQ9NnX+0CF2IcWkmwEJBUA=";
   };
 
-  sourceRoot = "saga-${version}/saga-gis";
+  sourceRoot = "saga-${finalAttrs.version}/saga-gis";
 
   postPatch = ''
     dos2unix src/saga_core/saga_gui/res/org.saga_gis.saga_gui.desktop
@@ -50,37 +54,42 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = [
     cmake
     dos2unix
-    wrapGAppsHook3
     pkg-config
+    wrapGAppsHook3
   ]
-  ++ lib.optional stdenv.hostPlatform.isDarwin desktopToDarwinBundle;
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    desktopToDarwinBundle
+  ];
 
   buildInputs = [
     curl
-    libsForQt5.dxflib
     fftw
-    libsvm
-    hdf5
     gdal
-    wxGTK32
+    giflib
+    hdf5
+    libharu
+    libiodbc
+    libpq
+    libsForQt5.dxflib
+    libsvm
+    opencv
     pdal
     proj
-    libharu
-    opencv
-    vigra
-    libpq
-    libiodbc
-    xz
     qhull
-    giflib
+    vigra
+    wxGTK32
+    xz
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_cudart
   ]
   # See https://groups.google.com/forum/#!topic/nix-devel/h_vSzEJAPXs
   # for why the have additional buildInputs on darwin
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    unixODBC
-    poppler
     netcdf
+    poppler
     sqlite
+    unixODBC
   ];
 
   cmakeFlags = [
@@ -90,7 +99,7 @@ stdenv.mkDerivation rec {
   meta = {
     description = "System for Automated Geoscientific Analyses";
     homepage = "https://saga-gis.sourceforge.io";
-    changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog%20${version}/";
+    changelog = "https://sourceforge.net/p/saga-gis/wiki/Changelog%20${finalAttrs.version}/";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
       michelk
@@ -99,4 +108,4 @@ stdenv.mkDerivation rec {
     teams = [ lib.teams.geospatial ];
     platforms = with lib.platforms; unix;
   };
-}
+})

From ac8ee5518fdebe5d04e773b6ad48eb6535270fe9 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 30 Oct 2025 09:03:51 +0000
Subject: [PATCH 4123/6226] saga: fix build with cudaSupport

---
 pkgs/by-name/sa/saga/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix
index 8b6062988af4..533797675ed8 100644
--- a/pkgs/by-name/sa/saga/package.nix
+++ b/pkgs/by-name/sa/saga/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  config,
   fetchurl,
 
   # nativeBuildInputs
@@ -8,6 +9,8 @@
   dos2unix,
   pkg-config,
   wrapGAppsHook3,
+  # cuda-specific
+  cudaPackages,
   # darwin-specific
   desktopToDarwinBundle,
 
@@ -34,6 +37,8 @@
   poppler,
   sqlite,
   unixODBC,
+
+  cudaSupport ? config.cudaSupport,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -57,6 +62,9 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     wrapGAppsHook3
   ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_nvcc
+  ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     desktopToDarwinBundle
   ];

From 2133624a26d8e8a13cc270fdcaffa9493b6a1d06 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Thu, 30 Oct 2025 09:07:01 +0000
Subject: [PATCH 4124/6226] hath-rust: 1.13.1 -> 1.14.0

---
 pkgs/by-name/ha/hath-rust/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ha/hath-rust/package.nix b/pkgs/by-name/ha/hath-rust/package.nix
index bb1918b01075..caba2f932eb2 100644
--- a/pkgs/by-name/ha/hath-rust/package.nix
+++ b/pkgs/by-name/ha/hath-rust/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hath-rust";
-  version = "1.13.1";
+  version = "1.14.0";
 
   src = fetchFromGitHub {
     owner = "james58899";
     repo = "hath-rust";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3fi18oarPXe9vUhn4MkyLWA4I2d6PtcbW+rpEYsq8/o=";
+    hash = "sha256-shixrhIl4bbZQrJea2Dx4bbeGXOaPvMKUHgHq+JfAWs=";
   };
 
-  cargoHash = "sha256-/n4GwqK2i2YwH1q7U29PZh9JzDTuEbP3YRJktsknQeM=";
+  cargoHash = "sha256-eoki+QXqBC26PC7qNlOLlgkXxc6Fsx7T4o9GIbAaO8Y=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";

From f114b0ebee1fc857c9889f3620918f4947897bfc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 09:14:38 +0000
Subject: [PATCH 4125/6226] terraform-providers.rootlyhq_rootly: 4.3.3 -> 4.3.5

---
 .../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 cca0d968e74b..65a6462a38f0 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1129,13 +1129,13 @@
     "vendorHash": "sha256-M2lJKmIR66lQKFkInjizn68ax2Gq4sim5Y3vZKyDhZ8="
   },
   "rootlyhq_rootly": {
-    "hash": "sha256-4YjmP7DMaqsDADi0+B39Wn0CA2M3MEhV3VKA+M/gHMg=",
+    "hash": "sha256-215PagKhONN483SGvYsLWQfKnSWmUKL1vCM4mr2xuGo=",
     "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
     "owner": "rootlyhq",
     "repo": "terraform-provider-rootly",
-    "rev": "v4.3.3",
+    "rev": "v4.3.5",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-auyQLDDQ+tfMQCqICDR5tfvaYrO89Eani7lAsfoPwwU="
+    "vendorHash": "sha256-MNddgnKFdrOCfpj84McqW/8lmU/t36x2Whsl9xkmrhM="
   },
   "rundeck_rundeck": {
     "hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=",

From 408a5325dab78b78e68dbe0f3e7f09bb87cb6961 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 09:19:04 +0000
Subject: [PATCH 4126/6226] opcr-policy: 0.3.0 -> 0.3.2

---
 pkgs/by-name/op/opcr-policy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opcr-policy/package.nix b/pkgs/by-name/op/opcr-policy/package.nix
index c4a5fdc98f97..eb27d683be48 100644
--- a/pkgs/by-name/op/opcr-policy/package.nix
+++ b/pkgs/by-name/op/opcr-policy/package.nix
@@ -6,15 +6,15 @@
 
 buildGoModule rec {
   pname = "opcr-policy";
-  version = "0.3.0";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "opcr-io";
     repo = "policy";
     rev = "v${version}";
-    sha256 = "sha256-vTUlC/LQTQEpzd1AXgcJJBZXmbSuX8JACbM60KVuT9E=";
+    sha256 = "sha256-T6awF6NXVsglYBBVzGfuIF42imXjqCwxUAI3RPZNmGo=";
   };
-  vendorHash = "sha256-3KBHK9CKn9h45eq0wAwLivm3Lj3COGYn/zGltonLP9k=";
+  vendorHash = "sha256-0oZpogeKMQW4SS4e2n5qK6nStYwB/nsHleftvrdXWrw=";
 
   ldflags = [
     "-s"

From d096ff8c1e6b03a69801858bd3ade08a23990862 Mon Sep 17 00:00:00 2001
From: Yaya <github@uwu.is>
Date: Tue, 14 Oct 2025 09:36:38 +0200
Subject: [PATCH 4127/6226] postfixadmin: init at 4.0.1

This commit reintroduces postfixadmin after having been removed in
2cb89c0aeffc13c550bbf023a5c5bed2f7570b7e. I am only able to take over
maintainership of the package, but not the NixOS module
`services.postfixadmin` at the moment.

https://github.com/postfixadmin/postfixadmin/releases/tag/v4.0.1
---
 pkgs/by-name/po/postfixadmin/composer.lock | 6063 ++++++++++++++++++++
 pkgs/by-name/po/postfixadmin/package.nix   |   44 +
 pkgs/top-level/aliases.nix                 |    1 -
 3 files changed, 6107 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/po/postfixadmin/composer.lock
 create mode 100644 pkgs/by-name/po/postfixadmin/package.nix

diff --git a/pkgs/by-name/po/postfixadmin/composer.lock b/pkgs/by-name/po/postfixadmin/composer.lock
new file mode 100644
index 000000000000..c4ffd31dff9c
--- /dev/null
+++ b/pkgs/by-name/po/postfixadmin/composer.lock
@@ -0,0 +1,6063 @@
+{
+    "_readme": [
+        "This file locks the dependencies of your project to a known state",
+        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
+        "This file is @generated automatically"
+    ],
+    "content-hash": "eb92e08e356e7bf8277eacd8402a3097",
+    "packages": [
+        {
+            "name": "bacon/bacon-qr-code",
+            "version": "v3.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Bacon/BaconQrCode.git",
+                "reference": "f9cc1f52b5a463062251d666761178dbdb6b544f"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Bacon/BaconQrCode/zipball/f9cc1f52b5a463062251d666761178dbdb6b544f",
+                "reference": "f9cc1f52b5a463062251d666761178dbdb6b544f",
+                "shasum": ""
+            },
+            "require": {
+                "dasprid/enum": "^1.0.3",
+                "ext-iconv": "*",
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "phly/keep-a-changelog": "^2.12",
+                "phpunit/phpunit": "^10.5.11 || 11.0.4",
+                "spatie/phpunit-snapshot-assertions": "^5.1.5",
+                "squizlabs/php_codesniffer": "^3.9"
+            },
+            "suggest": {
+                "ext-imagick": "to generate QR code images"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "BaconQrCode\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ben Scholzen 'DASPRiD'",
+                    "email": "mail@dasprids.de",
+                    "homepage": "https://dasprids.de/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "BaconQrCode is a QR code generator for PHP.",
+            "homepage": "https://github.com/Bacon/BaconQrCode",
+            "support": {
+                "issues": "https://github.com/Bacon/BaconQrCode/issues",
+                "source": "https://github.com/Bacon/BaconQrCode/tree/v3.0.1"
+            },
+            "time": "2024-10-01T13:55:55+00:00"
+        },
+        {
+            "name": "beberlei/assert",
+            "version": "v3.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/beberlei/assert.git",
+                "reference": "b5fd8eacd8915a1b627b8bfc027803f1939734dd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/beberlei/assert/zipball/b5fd8eacd8915a1b627b8bfc027803f1939734dd",
+                "reference": "b5fd8eacd8915a1b627b8bfc027803f1939734dd",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "ext-simplexml": "*",
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "*",
+                "phpstan/phpstan": "*",
+                "phpunit/phpunit": ">=6.0.0",
+                "yoast/phpunit-polyfills": "^0.1.0"
+            },
+            "suggest": {
+                "ext-intl": "Needed to allow Assertion::count(), Assertion::isCountable(), Assertion::minCount(), and Assertion::maxCount() to operate on ResourceBundles"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "lib/Assert/functions.php"
+                ],
+                "psr-4": {
+                    "Assert\\": "lib/Assert"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Benjamin Eberlei",
+                    "email": "kontakt@beberlei.de",
+                    "role": "Lead Developer"
+                },
+                {
+                    "name": "Richard Quadling",
+                    "email": "rquadling@gmail.com",
+                    "role": "Collaborator"
+                }
+            ],
+            "description": "Thin assertion library for input validation in business models.",
+            "keywords": [
+                "assert",
+                "assertion",
+                "validation"
+            ],
+            "support": {
+                "issues": "https://github.com/beberlei/assert/issues",
+                "source": "https://github.com/beberlei/assert/tree/v3.3.3"
+            },
+            "time": "2024-07-15T13:18:35+00:00"
+        },
+        {
+            "name": "dasprid/enum",
+            "version": "1.0.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/DASPRiD/Enum.git",
+                "reference": "b5874fa9ed0043116c72162ec7f4fb50e02e7cce"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/DASPRiD/Enum/zipball/b5874fa9ed0043116c72162ec7f4fb50e02e7cce",
+                "reference": "b5874fa9ed0043116c72162ec7f4fb50e02e7cce",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1 <9.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^7 || ^8 || ^9 || ^10 || ^11",
+                "squizlabs/php_codesniffer": "*"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "DASPRiD\\Enum\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Ben Scholzen 'DASPRiD'",
+                    "email": "mail@dasprids.de",
+                    "homepage": "https://dasprids.de/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "PHP 7.1 enum implementation",
+            "keywords": [
+                "enum",
+                "map"
+            ],
+            "support": {
+                "issues": "https://github.com/DASPRiD/Enum/issues",
+                "source": "https://github.com/DASPRiD/Enum/tree/1.0.7"
+            },
+            "time": "2025-09-16T12:23:56+00:00"
+        },
+        {
+            "name": "endroid/qr-code",
+            "version": "5.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/endroid/qr-code.git",
+                "reference": "393fec6c4cbdc1bd65570ac9d245704428010122"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/endroid/qr-code/zipball/393fec6c4cbdc1bd65570ac9d245704428010122",
+                "reference": "393fec6c4cbdc1bd65570ac9d245704428010122",
+                "shasum": ""
+            },
+            "require": {
+                "bacon/bacon-qr-code": "^3.0",
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "endroid/quality": "dev-main",
+                "ext-gd": "*",
+                "khanamiryan/qrcode-detector-decoder": "^2.0.2",
+                "setasign/fpdf": "^1.8.2"
+            },
+            "suggest": {
+                "ext-gd": "Enables you to write PNG images",
+                "khanamiryan/qrcode-detector-decoder": "Enables you to use the image validator",
+                "roave/security-advisories": "Makes sure package versions with known security issues are not installed",
+                "setasign/fpdf": "Enables you to use the PDF writer"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "5.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Endroid\\QrCode\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jeroen van den Enden",
+                    "email": "info@endroid.nl"
+                }
+            ],
+            "description": "Endroid QR Code",
+            "homepage": "https://github.com/endroid/qr-code",
+            "keywords": [
+                "code",
+                "endroid",
+                "php",
+                "qr",
+                "qrcode"
+            ],
+            "support": {
+                "issues": "https://github.com/endroid/qr-code/issues",
+                "source": "https://github.com/endroid/qr-code/tree/5.1.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/endroid",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-09-08T08:52:55+00:00"
+        },
+        {
+            "name": "paragonie/constant_time_encoding",
+            "version": "v2.8.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/paragonie/constant_time_encoding.git",
+                "reference": "e30811f7bc69e4b5b6d5783e712c06c8eabf0226"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/paragonie/constant_time_encoding/zipball/e30811f7bc69e4b5b6d5783e712c06c8eabf0226",
+                "reference": "e30811f7bc69e4b5b6d5783e712c06c8eabf0226",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7|^8"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^6|^7|^8|^9",
+                "vimeo/psalm": "^1|^2|^3|^4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "ParagonIE\\ConstantTime\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Paragon Initiative Enterprises",
+                    "email": "security@paragonie.com",
+                    "homepage": "https://paragonie.com",
+                    "role": "Maintainer"
+                },
+                {
+                    "name": "Steve 'Sc00bz' Thomas",
+                    "email": "steve@tobtu.com",
+                    "homepage": "https://www.tobtu.com",
+                    "role": "Original Developer"
+                }
+            ],
+            "description": "Constant-time Implementations of RFC 4648 Encoding (Base-64, Base-32, Base-16)",
+            "keywords": [
+                "base16",
+                "base32",
+                "base32_decode",
+                "base32_encode",
+                "base64",
+                "base64_decode",
+                "base64_encode",
+                "bin2hex",
+                "encoding",
+                "hex",
+                "hex2bin",
+                "rfc4648"
+            ],
+            "support": {
+                "email": "info@paragonie.com",
+                "issues": "https://github.com/paragonie/constant_time_encoding/issues",
+                "source": "https://github.com/paragonie/constant_time_encoding"
+            },
+            "time": "2025-09-24T15:12:37+00:00"
+        },
+        {
+            "name": "postfixadmin/password-hashing",
+            "version": "0.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/postfixadmin/pacrypt.git",
+                "reference": "20d8714d3e587570bf2336259e53c4aae0813ad5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/postfixadmin/pacrypt/zipball/20d8714d3e587570bf2336259e53c4aae0813ad5",
+                "reference": "20d8714d3e587570bf2336259e53c4aae0813ad5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.4"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "*",
+                "phpunit/phpunit": "^8|^9",
+                "psalm/phar": "^5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PostfixAdmin\\PasswordHashing\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "GPL-2.0"
+            ],
+            "authors": [
+                {
+                    "name": "David Goodwin",
+                    "email": "david@codepoets.co.uk"
+                }
+            ],
+            "description": "Routines to generate password hashes, useful for Dovecot or Courier Mail servers",
+            "support": {
+                "issues": "https://github.com/postfixadmin/pacrypt/issues",
+                "source": "https://github.com/postfixadmin/pacrypt/tree/0.0.2"
+            },
+            "time": "2025-02-21T13:35:53+00:00"
+        },
+        {
+            "name": "shardj/zf1-future",
+            "version": "1.24.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Shardj/zf1-future.git",
+                "reference": "3582cce4bcf2c820191be56cf17fdef0addf0771"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Shardj/zf1-future/zipball/3582cce4bcf2c820191be56cf17fdef0addf0771",
+                "reference": "3582cce4bcf2c820191be56cf17fdef0addf0771",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1",
+                "symfony/polyfill-ctype": "^1.30",
+                "symfony/polyfill-mbstring": "^1.30",
+                "symfony/polyfill-php81": "^1.30",
+                "symfony/polyfill-php83": "^1.30"
+            },
+            "replace": {
+                "zendframework/zendframework1": ">=1.12.20"
+            },
+            "require-dev": {
+                "friendsofphp/php-cs-fixer": "^3",
+                "php-parallel-lint/php-parallel-lint": "^1.3",
+                "phpstan/phpstan": "^1.4 || ^2.0",
+                "phpunit/phpunit": "^7|^8|^9",
+                "rector/rector": "0.12.19 || ^1.2 || ^2.0",
+                "yoast/phpunit-polyfills": "^2.0"
+            },
+            "suggest": {
+                "ext-mbstring": "Multibyte strings handling"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.12.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-0": {
+                    "Zend_": "library/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "include-path": [
+                "library/"
+            ],
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "Zend Framework 1. The aim is to keep ZF1 working with the latest PHP versions",
+            "homepage": "https://github.com/Shardj/zf1-future/",
+            "keywords": [
+                "ZF1",
+                "framework"
+            ],
+            "support": {
+                "issues": "https://github.com/Shardj/zf1-future/issues",
+                "source": "https://github.com/Shardj/zf1-future/tree/release-1.24.4"
+            },
+            "time": "2025-06-26T19:09:46+00:00"
+        },
+        {
+            "name": "smarty/smarty",
+            "version": "v4.5.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/smarty-php/smarty.git",
+                "reference": "a8d77c86660ca0562ec2fb781fbbda737fb7a62b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/smarty-php/smarty/zipball/a8d77c86660ca0562ec2fb781fbbda737fb7a62b",
+                "reference": "a8d77c86660ca0562ec2fb781fbbda737fb7a62b",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^8.5 || ^7.5",
+                "smarty/smarty-lexer": "^3.1"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "libs/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "LGPL-3.0"
+            ],
+            "authors": [
+                {
+                    "name": "Monte Ohrt",
+                    "email": "monte@ohrt.com"
+                },
+                {
+                    "name": "Uwe Tews",
+                    "email": "uwe.tews@googlemail.com"
+                },
+                {
+                    "name": "Rodney Rehm",
+                    "email": "rodney.rehm@medialize.de"
+                },
+                {
+                    "name": "Simon Wisselink",
+                    "homepage": "https://www.iwink.nl/"
+                }
+            ],
+            "description": "Smarty - the compiling PHP template engine",
+            "homepage": "https://smarty-php.github.io/smarty/",
+            "keywords": [
+                "templating"
+            ],
+            "support": {
+                "forum": "https://github.com/smarty-php/smarty/discussions",
+                "issues": "https://github.com/smarty-php/smarty/issues",
+                "source": "https://github.com/smarty-php/smarty/tree/v4.5.6"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/wisskid",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-08-26T08:37:46+00:00"
+        },
+        {
+            "name": "spomky-labs/otphp",
+            "version": "v10.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Spomky-Labs/otphp.git",
+                "reference": "9784d9f7c790eed26e102d6c78f12c754036c366"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Spomky-Labs/otphp/zipball/9784d9f7c790eed26e102d6c78f12c754036c366",
+                "reference": "9784d9f7c790eed26e102d6c78f12c754036c366",
+                "shasum": ""
+            },
+            "require": {
+                "beberlei/assert": "^3.0",
+                "ext-mbstring": "*",
+                "paragonie/constant_time_encoding": "^2.0",
+                "php": "^7.2|^8.0",
+                "thecodingmachine/safe": "^0.1.14|^1.0|^2.0"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "^2.0",
+                "phpstan/phpstan": "^0.12",
+                "phpstan/phpstan-beberlei-assert": "^0.12",
+                "phpstan/phpstan-deprecation-rules": "^0.12",
+                "phpstan/phpstan-phpunit": "^0.12",
+                "phpstan/phpstan-strict-rules": "^0.12",
+                "phpunit/phpunit": "^8.0",
+                "thecodingmachine/phpstan-safe-rule": "^1.0 || ^2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "v8.3": "8.3.x-dev",
+                    "v9.0": "9.0.x-dev",
+                    "v10.0": "10.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "OTPHP\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Florent Morselli",
+                    "homepage": "https://github.com/Spomky"
+                },
+                {
+                    "name": "All contributors",
+                    "homepage": "https://github.com/Spomky-Labs/otphp/contributors"
+                }
+            ],
+            "description": "A PHP library for generating one time passwords according to RFC 4226 (HOTP Algorithm) and the RFC 6238 (TOTP Algorithm) and compatible with Google Authenticator",
+            "homepage": "https://github.com/Spomky-Labs/otphp",
+            "keywords": [
+                "FreeOTP",
+                "RFC 4226",
+                "RFC 6238",
+                "google authenticator",
+                "hotp",
+                "otp",
+                "totp"
+            ],
+            "support": {
+                "issues": "https://github.com/Spomky-Labs/otphp/issues",
+                "source": "https://github.com/Spomky-Labs/otphp/tree/v10.0.3"
+            },
+            "time": "2022-03-17T08:00:35+00:00"
+        },
+        {
+            "name": "symfony/polyfill-ctype",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-ctype.git",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "reference": "a3cc8b044a6ea513310cbd48ef7333b384945638",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "provide": {
+                "ext-ctype": "*"
+            },
+            "suggest": {
+                "ext-ctype": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Gert de Pagter",
+                    "email": "BackEndTea@gmail.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for ctype functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "ctype",
+                "polyfill",
+                "portable"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-09T11:45:10+00:00"
+        },
+        {
+            "name": "symfony/polyfill-mbstring",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-mbstring.git",
+                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/6d857f4d76bd4b343eac26d6b539585d2bc56493",
+                "reference": "6d857f4d76bd4b343eac26d6b539585d2bc56493",
+                "shasum": ""
+            },
+            "require": {
+                "ext-iconv": "*",
+                "php": ">=7.2"
+            },
+            "provide": {
+                "ext-mbstring": "*"
+            },
+            "suggest": {
+                "ext-mbstring": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for the Mbstring extension",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "mbstring",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-12-23T08:48:59+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php81",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php81.git",
+                "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php81/zipball/4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
+                "reference": "4a4cfc2d253c21a5ad0e53071df248ed48c6ce5c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php81\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.1+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php81/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-09T11:45:10+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php83",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php83.git",
+                "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php83/zipball/17f6f9a6b1735c0f163024d959f700cfbc5155e5",
+                "reference": "17f6f9a6b1735c0f163024d959f700cfbc5155e5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php83\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.3+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php83/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-07-08T02:45:35+00:00"
+        },
+        {
+            "name": "thecodingmachine/safe",
+            "version": "v2.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thecodingmachine/safe.git",
+                "reference": "3115ecd6b4391662b4931daac4eba6b07a2ac1f0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thecodingmachine/safe/zipball/3115ecd6b4391662b4931daac4eba6b07a2ac1f0",
+                "reference": "3115ecd6b4391662b4931daac4eba6b07a2ac1f0",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.5",
+                "phpunit/phpunit": "^9.5",
+                "squizlabs/php_codesniffer": "^3.2",
+                "thecodingmachine/phpstan-strict-rules": "^1.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.2.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "deprecated/apc.php",
+                    "deprecated/array.php",
+                    "deprecated/datetime.php",
+                    "deprecated/libevent.php",
+                    "deprecated/misc.php",
+                    "deprecated/password.php",
+                    "deprecated/mssql.php",
+                    "deprecated/stats.php",
+                    "deprecated/strings.php",
+                    "lib/special_cases.php",
+                    "deprecated/mysqli.php",
+                    "generated/apache.php",
+                    "generated/apcu.php",
+                    "generated/array.php",
+                    "generated/bzip2.php",
+                    "generated/calendar.php",
+                    "generated/classobj.php",
+                    "generated/com.php",
+                    "generated/cubrid.php",
+                    "generated/curl.php",
+                    "generated/datetime.php",
+                    "generated/dir.php",
+                    "generated/eio.php",
+                    "generated/errorfunc.php",
+                    "generated/exec.php",
+                    "generated/fileinfo.php",
+                    "generated/filesystem.php",
+                    "generated/filter.php",
+                    "generated/fpm.php",
+                    "generated/ftp.php",
+                    "generated/funchand.php",
+                    "generated/gettext.php",
+                    "generated/gmp.php",
+                    "generated/gnupg.php",
+                    "generated/hash.php",
+                    "generated/ibase.php",
+                    "generated/ibmDb2.php",
+                    "generated/iconv.php",
+                    "generated/image.php",
+                    "generated/imap.php",
+                    "generated/info.php",
+                    "generated/inotify.php",
+                    "generated/json.php",
+                    "generated/ldap.php",
+                    "generated/libxml.php",
+                    "generated/lzf.php",
+                    "generated/mailparse.php",
+                    "generated/mbstring.php",
+                    "generated/misc.php",
+                    "generated/mysql.php",
+                    "generated/network.php",
+                    "generated/oci8.php",
+                    "generated/opcache.php",
+                    "generated/openssl.php",
+                    "generated/outcontrol.php",
+                    "generated/pcntl.php",
+                    "generated/pcre.php",
+                    "generated/pgsql.php",
+                    "generated/posix.php",
+                    "generated/ps.php",
+                    "generated/pspell.php",
+                    "generated/readline.php",
+                    "generated/rpminfo.php",
+                    "generated/rrd.php",
+                    "generated/sem.php",
+                    "generated/session.php",
+                    "generated/shmop.php",
+                    "generated/sockets.php",
+                    "generated/sodium.php",
+                    "generated/solr.php",
+                    "generated/spl.php",
+                    "generated/sqlsrv.php",
+                    "generated/ssdeep.php",
+                    "generated/ssh2.php",
+                    "generated/stream.php",
+                    "generated/strings.php",
+                    "generated/swoole.php",
+                    "generated/uodbc.php",
+                    "generated/uopz.php",
+                    "generated/url.php",
+                    "generated/var.php",
+                    "generated/xdiff.php",
+                    "generated/xml.php",
+                    "generated/xmlrpc.php",
+                    "generated/yaml.php",
+                    "generated/yaz.php",
+                    "generated/zip.php",
+                    "generated/zlib.php"
+                ],
+                "classmap": [
+                    "lib/DateTime.php",
+                    "lib/DateTimeImmutable.php",
+                    "lib/Exceptions/",
+                    "deprecated/Exceptions/",
+                    "generated/Exceptions/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "PHP core functions that throw exceptions instead of returning FALSE on error",
+            "support": {
+                "issues": "https://github.com/thecodingmachine/safe/issues",
+                "source": "https://github.com/thecodingmachine/safe/tree/v2.5.0"
+            },
+            "time": "2023-04-05T11:54:14+00:00"
+        }
+    ],
+    "packages-dev": [
+        {
+            "name": "clue/ndjson-react",
+            "version": "v1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/clue/reactphp-ndjson.git",
+                "reference": "392dc165fce93b5bb5c637b67e59619223c931b0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/clue/reactphp-ndjson/zipball/392dc165fce93b5bb5c637b67e59619223c931b0",
+                "reference": "392dc165fce93b5bb5c637b67e59619223c931b0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3",
+                "react/stream": "^1.2"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35",
+                "react/event-loop": "^1.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Clue\\React\\NDJson\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering"
+                }
+            ],
+            "description": "Streaming newline-delimited JSON (NDJSON) parser and encoder for ReactPHP.",
+            "homepage": "https://github.com/clue/reactphp-ndjson",
+            "keywords": [
+                "NDJSON",
+                "json",
+                "jsonlines",
+                "newline",
+                "reactphp",
+                "streaming"
+            ],
+            "support": {
+                "issues": "https://github.com/clue/reactphp-ndjson/issues",
+                "source": "https://github.com/clue/reactphp-ndjson/tree/v1.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://clue.engineering/support",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/clue",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-12-23T10:58:28+00:00"
+        },
+        {
+            "name": "composer/pcre",
+            "version": "3.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/pcre.git",
+                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
+                "reference": "b2bed4734f0cc156ee1fe9c0da2550420d99a21e",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.4 || ^8.0"
+            },
+            "conflict": {
+                "phpstan/phpstan": "<1.11.10"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.12 || ^2",
+                "phpstan/phpstan-strict-rules": "^1 || ^2",
+                "phpunit/phpunit": "^8 || ^9"
+            },
+            "type": "library",
+            "extra": {
+                "phpstan": {
+                    "includes": [
+                        "extension.neon"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Pcre\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "PCRE wrapping library that offers type-safe preg_* replacements.",
+            "keywords": [
+                "PCRE",
+                "preg",
+                "regex",
+                "regular expression"
+            ],
+            "support": {
+                "issues": "https://github.com/composer/pcre/issues",
+                "source": "https://github.com/composer/pcre/tree/3.3.2"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-11-12T16:29:46+00:00"
+        },
+        {
+            "name": "composer/semver",
+            "version": "3.4.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/semver.git",
+                "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/semver/zipball/198166618906cb2de69b95d7d47e5fa8aa1b2b95",
+                "reference": "198166618906cb2de69b95d7d47e5fa8aa1b2b95",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.11",
+                "symfony/phpunit-bridge": "^3 || ^7"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Semver\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nils Adermann",
+                    "email": "naderman@naderman.de",
+                    "homepage": "http://www.naderman.de"
+                },
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                },
+                {
+                    "name": "Rob Bast",
+                    "email": "rob.bast@gmail.com",
+                    "homepage": "http://robbast.nl"
+                }
+            ],
+            "description": "Semver library that offers utilities, version constraint parsing and validation.",
+            "keywords": [
+                "semantic",
+                "semver",
+                "validation",
+                "versioning"
+            ],
+            "support": {
+                "irc": "ircs://irc.libera.chat:6697/composer",
+                "issues": "https://github.com/composer/semver/issues",
+                "source": "https://github.com/composer/semver/tree/3.4.4"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-08-20T19:15:30+00:00"
+        },
+        {
+            "name": "composer/xdebug-handler",
+            "version": "3.0.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/xdebug-handler.git",
+                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/6c1925561632e83d60a44492e0b344cf48ab85ef",
+                "reference": "6c1925561632e83d60a44492e0b344cf48ab85ef",
+                "shasum": ""
+            },
+            "require": {
+                "composer/pcre": "^1 || ^2 || ^3",
+                "php": "^7.2.5 || ^8.0",
+                "psr/log": "^1 || ^2 || ^3"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.0",
+                "phpstan/phpstan-strict-rules": "^1.1",
+                "phpunit/phpunit": "^8.5 || ^9.6 || ^10.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Composer\\XdebugHandler\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "John Stevenson",
+                    "email": "john-stevenson@blueyonder.co.uk"
+                }
+            ],
+            "description": "Restarts a process without Xdebug.",
+            "keywords": [
+                "Xdebug",
+                "performance"
+            ],
+            "support": {
+                "irc": "ircs://irc.libera.chat:6697/composer",
+                "issues": "https://github.com/composer/xdebug-handler/issues",
+                "source": "https://github.com/composer/xdebug-handler/tree/3.0.5"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-05-06T16:37:16+00:00"
+        },
+        {
+            "name": "doctrine/instantiator",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/doctrine/instantiator.git",
+                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
+                "reference": "c6222283fa3f4ac679f8b9ced9a4e23f163e80d0",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^8.1"
+            },
+            "require-dev": {
+                "doctrine/coding-standard": "^11",
+                "ext-pdo": "*",
+                "ext-phar": "*",
+                "phpbench/phpbench": "^1.2",
+                "phpstan/phpstan": "^1.9.4",
+                "phpstan/phpstan-phpunit": "^1.3",
+                "phpunit/phpunit": "^9.5.27",
+                "vimeo/psalm": "^5.4"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Marco Pivetta",
+                    "email": "ocramius@gmail.com",
+                    "homepage": "https://ocramius.github.io/"
+                }
+            ],
+            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
+            "homepage": "https://www.doctrine-project.org/projects/instantiator.html",
+            "keywords": [
+                "constructor",
+                "instantiate"
+            ],
+            "support": {
+                "issues": "https://github.com/doctrine/instantiator/issues",
+                "source": "https://github.com/doctrine/instantiator/tree/2.0.0"
+            },
+            "funding": [
+                {
+                    "url": "https://www.doctrine-project.org/sponsorship.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://www.patreon.com/phpdoctrine",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-12-30T00:23:10+00:00"
+        },
+        {
+            "name": "evenement/evenement",
+            "version": "v3.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/igorw/evenement.git",
+                "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/igorw/evenement/zipball/0a16b0d71ab13284339abb99d9d2bd813640efbc",
+                "reference": "0a16b0d71ab13284339abb99d9d2bd813640efbc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9 || ^6"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Evenement\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Igor Wiedler",
+                    "email": "igor@wiedler.ch"
+                }
+            ],
+            "description": "Événement is a very simple event dispatching library for PHP",
+            "keywords": [
+                "event-dispatcher",
+                "event-emitter"
+            ],
+            "support": {
+                "issues": "https://github.com/igorw/evenement/issues",
+                "source": "https://github.com/igorw/evenement/tree/v3.0.2"
+            },
+            "time": "2023-08-08T05:53:35+00:00"
+        },
+        {
+            "name": "fidry/cpu-core-counter",
+            "version": "1.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theofidry/cpu-core-counter.git",
+                "reference": "db9508f7b1474469d9d3c53b86f817e344732678"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theofidry/cpu-core-counter/zipball/db9508f7b1474469d9d3c53b86f817e344732678",
+                "reference": "db9508f7b1474469d9d3c53b86f817e344732678",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "require-dev": {
+                "fidry/makefile": "^0.2.0",
+                "fidry/php-cs-fixer-config": "^1.1.2",
+                "phpstan/extension-installer": "^1.2.0",
+                "phpstan/phpstan": "^2.0",
+                "phpstan/phpstan-deprecation-rules": "^2.0.0",
+                "phpstan/phpstan-phpunit": "^2.0",
+                "phpstan/phpstan-strict-rules": "^2.0",
+                "phpunit/phpunit": "^8.5.31 || ^9.5.26",
+                "webmozarts/strict-phpunit": "^7.5"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Fidry\\CpuCoreCounter\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Théo FIDRY",
+                    "email": "theo.fidry@gmail.com"
+                }
+            ],
+            "description": "Tiny utility to get the number of CPU cores.",
+            "keywords": [
+                "CPU",
+                "core"
+            ],
+            "support": {
+                "issues": "https://github.com/theofidry/cpu-core-counter/issues",
+                "source": "https://github.com/theofidry/cpu-core-counter/tree/1.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/theofidry",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-08-14T07:29:31+00:00"
+        },
+        {
+            "name": "friendsofphp/php-cs-fixer",
+            "version": "v3.88.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
+                "reference": "a8d15584bafb0f0d9d938827840060fd4a3ebc99"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/a8d15584bafb0f0d9d938827840060fd4a3ebc99",
+                "reference": "a8d15584bafb0f0d9d938827840060fd4a3ebc99",
+                "shasum": ""
+            },
+            "require": {
+                "clue/ndjson-react": "^1.3",
+                "composer/semver": "^3.4",
+                "composer/xdebug-handler": "^3.0.5",
+                "ext-filter": "*",
+                "ext-hash": "*",
+                "ext-json": "*",
+                "ext-tokenizer": "*",
+                "fidry/cpu-core-counter": "^1.3",
+                "php": "^7.4 || ^8.0",
+                "react/child-process": "^0.6.6",
+                "react/event-loop": "^1.5",
+                "react/promise": "^3.3",
+                "react/socket": "^1.16",
+                "react/stream": "^1.4",
+                "sebastian/diff": "^4.0.6 || ^5.1.1 || ^6.0.2 || ^7.0",
+                "symfony/console": "^5.4.47 || ^6.4.24 || ^7.0",
+                "symfony/event-dispatcher": "^5.4.45 || ^6.4.24 || ^7.0",
+                "symfony/filesystem": "^5.4.45 || ^6.4.24 || ^7.0",
+                "symfony/finder": "^5.4.45 || ^6.4.24 || ^7.0",
+                "symfony/options-resolver": "^5.4.45 || ^6.4.24 || ^7.0",
+                "symfony/polyfill-mbstring": "^1.33",
+                "symfony/polyfill-php80": "^1.33",
+                "symfony/polyfill-php81": "^1.33",
+                "symfony/polyfill-php84": "^1.33",
+                "symfony/process": "^5.4.47 || ^6.4.24 || ^7.2",
+                "symfony/stopwatch": "^5.4.45 || ^6.4.24 || ^7.0"
+            },
+            "require-dev": {
+                "facile-it/paraunit": "^1.3.1 || ^2.7",
+                "infection/infection": "^0.31.0",
+                "justinrainbow/json-schema": "^6.5",
+                "keradus/cli-executor": "^2.2",
+                "mikey179/vfsstream": "^1.6.12",
+                "php-coveralls/php-coveralls": "^2.8",
+                "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.6",
+                "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.6",
+                "phpunit/phpunit": "^9.6.25 || ^10.5.53 || ^11.5.34",
+                "symfony/var-dumper": "^5.4.48 || ^6.4.24 || ^7.3.2",
+                "symfony/yaml": "^5.4.45 || ^6.4.24 || ^7.3.2"
+            },
+            "suggest": {
+                "ext-dom": "For handling output formats in XML",
+                "ext-mbstring": "For handling non-UTF8 characters."
+            },
+            "bin": [
+                "php-cs-fixer"
+            ],
+            "type": "application",
+            "autoload": {
+                "psr-4": {
+                    "PhpCsFixer\\": "src/"
+                },
+                "exclude-from-classmap": [
+                    "src/Fixer/Internal/*"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Dariusz Rumiński",
+                    "email": "dariusz.ruminski@gmail.com"
+                }
+            ],
+            "description": "A tool to automatically fix PHP code style",
+            "keywords": [
+                "Static code analysis",
+                "fixer",
+                "standards",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
+                "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.88.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/keradus",
+                    "type": "github"
+                }
+            ],
+            "time": "2025-09-27T00:24:15+00:00"
+        },
+        {
+            "name": "guzzlehttp/guzzle",
+            "version": "7.10.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/guzzle.git",
+                "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
+                "reference": "b51ac707cfa420b7bfd4e4d5e510ba8008e822b4",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "guzzlehttp/promises": "^2.3",
+                "guzzlehttp/psr7": "^2.8",
+                "php": "^7.2.5 || ^8.0",
+                "psr/http-client": "^1.0",
+                "symfony/deprecation-contracts": "^2.2 || ^3.0"
+            },
+            "provide": {
+                "psr/http-client-implementation": "1.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "ext-curl": "*",
+                "guzzle/client-integration-tests": "3.0.2",
+                "php-http/message-factory": "^1.1",
+                "phpunit/phpunit": "^8.5.39 || ^9.6.20",
+                "psr/log": "^1.1 || ^2.0 || ^3.0"
+            },
+            "suggest": {
+                "ext-curl": "Required for CURL handler support",
+                "ext-intl": "Required for Internationalized Domain Name (IDN) support",
+                "psr/log": "Required for using the Log middleware"
+            },
+            "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "GuzzleHttp\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Jeremy Lindblom",
+                    "email": "jeremeamia@gmail.com",
+                    "homepage": "https://github.com/jeremeamia"
+                },
+                {
+                    "name": "George Mponos",
+                    "email": "gmponos@gmail.com",
+                    "homepage": "https://github.com/gmponos"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://github.com/sagikazarmark"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
+                    "homepage": "https://github.com/Tobion"
+                }
+            ],
+            "description": "Guzzle is a PHP HTTP client library",
+            "keywords": [
+                "client",
+                "curl",
+                "framework",
+                "http",
+                "http client",
+                "psr-18",
+                "psr-7",
+                "rest",
+                "web service"
+            ],
+            "support": {
+                "issues": "https://github.com/guzzle/guzzle/issues",
+                "source": "https://github.com/guzzle/guzzle/tree/7.10.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/guzzle",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-23T22:36:01+00:00"
+        },
+        {
+            "name": "guzzlehttp/promises",
+            "version": "2.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/promises.git",
+                "reference": "481557b130ef3790cf82b713667b43030dc9c957"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/promises/zipball/481557b130ef3790cf82b713667b43030dc9c957",
+                "reference": "481557b130ef3790cf82b713667b43030dc9c957",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5 || ^8.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "phpunit/phpunit": "^8.5.44 || ^9.6.25"
+            },
+            "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Promise\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
+                    "homepage": "https://github.com/Tobion"
+                }
+            ],
+            "description": "Guzzle promises library",
+            "keywords": [
+                "promise"
+            ],
+            "support": {
+                "issues": "https://github.com/guzzle/promises/issues",
+                "source": "https://github.com/guzzle/promises/tree/2.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/promises",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-22T14:34:08+00:00"
+        },
+        {
+            "name": "guzzlehttp/psr7",
+            "version": "2.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/guzzle/psr7.git",
+                "reference": "21dc724a0583619cd1652f673303492272778051"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/guzzle/psr7/zipball/21dc724a0583619cd1652f673303492272778051",
+                "reference": "21dc724a0583619cd1652f673303492272778051",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2.5 || ^8.0",
+                "psr/http-factory": "^1.0",
+                "psr/http-message": "^1.1 || ^2.0",
+                "ralouphie/getallheaders": "^3.0"
+            },
+            "provide": {
+                "psr/http-factory-implementation": "1.0",
+                "psr/http-message-implementation": "1.0"
+            },
+            "require-dev": {
+                "bamarni/composer-bin-plugin": "^1.8.2",
+                "http-interop/http-factory-tests": "0.9.0",
+                "phpunit/phpunit": "^8.5.44 || ^9.6.25"
+            },
+            "suggest": {
+                "laminas/laminas-httphandlerrunner": "Emit PSR-7 responses"
+            },
+            "type": "library",
+            "extra": {
+                "bamarni-bin": {
+                    "bin-links": true,
+                    "forward-command": false
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "GuzzleHttp\\Psr7\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Graham Campbell",
+                    "email": "hello@gjcampbell.co.uk",
+                    "homepage": "https://github.com/GrahamCampbell"
+                },
+                {
+                    "name": "Michael Dowling",
+                    "email": "mtdowling@gmail.com",
+                    "homepage": "https://github.com/mtdowling"
+                },
+                {
+                    "name": "George Mponos",
+                    "email": "gmponos@gmail.com",
+                    "homepage": "https://github.com/gmponos"
+                },
+                {
+                    "name": "Tobias Nyholm",
+                    "email": "tobias.nyholm@gmail.com",
+                    "homepage": "https://github.com/Nyholm"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://github.com/sagikazarmark"
+                },
+                {
+                    "name": "Tobias Schultze",
+                    "email": "webmaster@tubo-world.de",
+                    "homepage": "https://github.com/Tobion"
+                },
+                {
+                    "name": "Márk Sági-Kazár",
+                    "email": "mark.sagikazar@gmail.com",
+                    "homepage": "https://sagikazarmark.hu"
+                }
+            ],
+            "description": "PSR-7 message implementation that also provides common utility methods",
+            "keywords": [
+                "http",
+                "message",
+                "psr-7",
+                "request",
+                "response",
+                "stream",
+                "uri",
+                "url"
+            ],
+            "support": {
+                "issues": "https://github.com/guzzle/psr7/issues",
+                "source": "https://github.com/guzzle/psr7/tree/2.8.0"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/GrahamCampbell",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/Nyholm",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/guzzlehttp/psr7",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-23T21:21:41+00:00"
+        },
+        {
+            "name": "myclabs/deep-copy",
+            "version": "1.13.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/myclabs/DeepCopy.git",
+                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/07d290f0c47959fd5eed98c95ee5602db07e0b6a",
+                "reference": "07d290f0c47959fd5eed98c95ee5602db07e0b6a",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "conflict": {
+                "doctrine/collections": "<1.6.8",
+                "doctrine/common": "<2.13.3 || >=3 <3.2.2"
+            },
+            "require-dev": {
+                "doctrine/collections": "^1.6.8",
+                "doctrine/common": "^2.13.3 || ^3.2.2",
+                "phpspec/prophecy": "^1.10",
+                "phpunit/phpunit": "^7.5.20 || ^8.5.23 || ^9.5.13"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/DeepCopy/deep_copy.php"
+                ],
+                "psr-4": {
+                    "DeepCopy\\": "src/DeepCopy/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Create deep copies (clones) of your objects",
+            "keywords": [
+                "clone",
+                "copy",
+                "duplicate",
+                "object",
+                "object graph"
+            ],
+            "support": {
+                "issues": "https://github.com/myclabs/DeepCopy/issues",
+                "source": "https://github.com/myclabs/DeepCopy/tree/1.13.4"
+            },
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-01T08:46:24+00:00"
+        },
+        {
+            "name": "nikic/php-parser",
+            "version": "v5.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/nikic/PHP-Parser.git",
+                "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
+                "reference": "f103601b29efebd7ff4a1ca7b3eeea9e3336a2a2",
+                "shasum": ""
+            },
+            "require": {
+                "ext-ctype": "*",
+                "ext-json": "*",
+                "ext-tokenizer": "*",
+                "php": ">=7.4"
+            },
+            "require-dev": {
+                "ircmaxell/php-yacc": "^0.0.7",
+                "phpunit/phpunit": "^9.0"
+            },
+            "bin": [
+                "bin/php-parse"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "PhpParser\\": "lib/PhpParser"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Nikita Popov"
+                }
+            ],
+            "description": "A PHP parser written in PHP",
+            "keywords": [
+                "parser",
+                "php"
+            ],
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v5.6.1"
+            },
+            "time": "2025-08-13T20:13:15+00:00"
+        },
+        {
+            "name": "phar-io/manifest",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/manifest.git",
+                "reference": "54750ef60c58e43759730615a392c31c80e23176"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/manifest/zipball/54750ef60c58e43759730615a392c31c80e23176",
+                "reference": "54750ef60c58e43759730615a392c31c80e23176",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "ext-phar": "*",
+                "ext-xmlwriter": "*",
+                "phar-io/version": "^3.0.1",
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
+            "support": {
+                "issues": "https://github.com/phar-io/manifest/issues",
+                "source": "https://github.com/phar-io/manifest/tree/2.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-03T12:33:53+00:00"
+        },
+        {
+            "name": "phar-io/version",
+            "version": "3.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/phar-io/version.git",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/phar-io/version/zipball/4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+                "reference": "4f7fd7836c6f332bb2933569e566a0d6c4cbed74",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Heuer",
+                    "email": "sebastian@phpeople.de",
+                    "role": "Developer"
+                },
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "Library for handling version information and constraints",
+            "support": {
+                "issues": "https://github.com/phar-io/version/issues",
+                "source": "https://github.com/phar-io/version/tree/3.2.1"
+            },
+            "time": "2022-02-21T01:04:05+00:00"
+        },
+        {
+            "name": "php-coveralls/php-coveralls",
+            "version": "v2.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-coveralls/php-coveralls.git",
+                "reference": "00b9fce4d785a98760ca02f305c197f5fcfb6004"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-coveralls/php-coveralls/zipball/00b9fce4d785a98760ca02f305c197f5fcfb6004",
+                "reference": "00b9fce4d785a98760ca02f305c197f5fcfb6004",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-simplexml": "*",
+                "guzzlehttp/guzzle": "^6.0 || ^7.0",
+                "php": "^7.0 || ^8.0",
+                "psr/log": "^1.0 || ^2.0",
+                "symfony/config": "^2.1 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+                "symfony/console": "^2.1 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+                "symfony/stopwatch": "^2.0 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0",
+                "symfony/yaml": "^2.0.5 || ^3.0 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
+            },
+            "require-dev": {
+                "phpspec/prophecy-phpunit": "^1.1 || ^2.3",
+                "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0 || ^7.0 || >=8.0 <8.5.29 || >=9.0 <9.5.23",
+                "sanmai/phpunit-legacy-adapter": "^6.1 || ^8.0"
+            },
+            "suggest": {
+                "symfony/http-kernel": "Allows Symfony integration"
+            },
+            "bin": [
+                "bin/php-coveralls"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "PhpCoveralls\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Kitamura Satoshi",
+                    "email": "with.no.parachute@gmail.com",
+                    "homepage": "https://www.facebook.com/satooshi.jp",
+                    "role": "Original creator"
+                },
+                {
+                    "name": "Takashi Matsuo",
+                    "email": "tmatsuo@google.com"
+                },
+                {
+                    "name": "Google Inc"
+                },
+                {
+                    "name": "Dariusz Ruminski",
+                    "email": "dariusz.ruminski@gmail.com",
+                    "homepage": "https://github.com/keradus"
+                },
+                {
+                    "name": "Contributors",
+                    "homepage": "https://github.com/php-coveralls/php-coveralls/graphs/contributors"
+                }
+            ],
+            "description": "PHP client library for Coveralls API",
+            "homepage": "https://github.com/php-coveralls/php-coveralls",
+            "keywords": [
+                "ci",
+                "coverage",
+                "github",
+                "test"
+            ],
+            "support": {
+                "issues": "https://github.com/php-coveralls/php-coveralls/issues",
+                "source": "https://github.com/php-coveralls/php-coveralls/tree/v2.8.0"
+            },
+            "time": "2025-05-12T08:35:27+00:00"
+        },
+        {
+            "name": "php-parallel-lint/php-parallel-lint",
+            "version": "v1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-parallel-lint/PHP-Parallel-Lint.git",
+                "reference": "6db563514f27e19595a19f45a4bf757b6401194e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-parallel-lint/PHP-Parallel-Lint/zipball/6db563514f27e19595a19f45a4bf757b6401194e",
+                "reference": "6db563514f27e19595a19f45a4bf757b6401194e",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": ">=5.3.0"
+            },
+            "replace": {
+                "grogy/php-parallel-lint": "*",
+                "jakub-onderka/php-parallel-lint": "*"
+            },
+            "require-dev": {
+                "nette/tester": "^1.3 || ^2.0",
+                "php-parallel-lint/php-console-highlighter": "0.* || ^1.0",
+                "squizlabs/php_codesniffer": "^3.6"
+            },
+            "suggest": {
+                "php-parallel-lint/php-console-highlighter": "Highlight syntax in code snippet"
+            },
+            "bin": [
+                "parallel-lint"
+            ],
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "./src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-2-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Jakub Onderka",
+                    "email": "ahoj@jakubonderka.cz"
+                }
+            ],
+            "description": "This tool checks the syntax of PHP files about 20x faster than serial check.",
+            "homepage": "https://github.com/php-parallel-lint/PHP-Parallel-Lint",
+            "keywords": [
+                "lint",
+                "static analysis"
+            ],
+            "support": {
+                "issues": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/issues",
+                "source": "https://github.com/php-parallel-lint/PHP-Parallel-Lint/tree/v1.4.0"
+            },
+            "time": "2024-03-27T12:14:49+00:00"
+        },
+        {
+            "name": "phpunit/php-code-coverage",
+            "version": "9.2.32",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
+                "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/85402a822d1ecf1db1096959413d35e1c37cf1a5",
+                "reference": "85402a822d1ecf1db1096959413d35e1c37cf1a5",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-libxml": "*",
+                "ext-xmlwriter": "*",
+                "nikic/php-parser": "^4.19.1 || ^5.1.0",
+                "php": ">=7.3",
+                "phpunit/php-file-iterator": "^3.0.6",
+                "phpunit/php-text-template": "^2.0.4",
+                "sebastian/code-unit-reverse-lookup": "^2.0.3",
+                "sebastian/complexity": "^2.0.3",
+                "sebastian/environment": "^5.1.5",
+                "sebastian/lines-of-code": "^1.0.4",
+                "sebastian/version": "^3.0.2",
+                "theseer/tokenizer": "^1.2.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.6"
+            },
+            "suggest": {
+                "ext-pcov": "PHP extension that provides line coverage",
+                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "9.2.x-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
+            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
+            "keywords": [
+                "coverage",
+                "testing",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues",
+                "security": "https://github.com/sebastianbergmann/php-code-coverage/security/policy",
+                "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.32"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-08-22T04:23:01+00:00"
+        },
+        {
+            "name": "phpunit/php-file-iterator",
+            "version": "3.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "reference": "cf1c2e7c203ac650e352f4cc675a7021e7d1b3cf",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
+            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
+            "keywords": [
+                "filesystem",
+                "iterator"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues",
+                "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.6"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2021-12-02T12:48:52+00:00"
+        },
+        {
+            "name": "phpunit/php-invoker",
+            "version": "3.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-invoker.git",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "ext-pcntl": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-pcntl": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Invoke callables with a timeout",
+            "homepage": "https://github.com/sebastianbergmann/php-invoker/",
+            "keywords": [
+                "process"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-invoker/issues",
+                "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:58:55+00:00"
+        },
+        {
+            "name": "phpunit/php-text-template",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-text-template.git",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Simple template engine.",
+            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
+            "keywords": [
+                "template"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-text-template/issues",
+                "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T05:33:50+00:00"
+        },
+        {
+            "name": "phpunit/php-timer",
+            "version": "5.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/php-timer.git",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Utility class for timing",
+            "homepage": "https://github.com/sebastianbergmann/php-timer/",
+            "keywords": [
+                "timer"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:16:10+00:00"
+        },
+        {
+            "name": "phpunit/phpunit",
+            "version": "9.6.29",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/phpunit.git",
+                "reference": "9ecfec57835a5581bc888ea7e13b51eb55ab9dd3"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9ecfec57835a5581bc888ea7e13b51eb55ab9dd3",
+                "reference": "9ecfec57835a5581bc888ea7e13b51eb55ab9dd3",
+                "shasum": ""
+            },
+            "require": {
+                "doctrine/instantiator": "^1.5.0 || ^2",
+                "ext-dom": "*",
+                "ext-json": "*",
+                "ext-libxml": "*",
+                "ext-mbstring": "*",
+                "ext-xml": "*",
+                "ext-xmlwriter": "*",
+                "myclabs/deep-copy": "^1.13.4",
+                "phar-io/manifest": "^2.0.4",
+                "phar-io/version": "^3.2.1",
+                "php": ">=7.3",
+                "phpunit/php-code-coverage": "^9.2.32",
+                "phpunit/php-file-iterator": "^3.0.6",
+                "phpunit/php-invoker": "^3.1.1",
+                "phpunit/php-text-template": "^2.0.4",
+                "phpunit/php-timer": "^5.0.3",
+                "sebastian/cli-parser": "^1.0.2",
+                "sebastian/code-unit": "^1.0.8",
+                "sebastian/comparator": "^4.0.9",
+                "sebastian/diff": "^4.0.6",
+                "sebastian/environment": "^5.1.5",
+                "sebastian/exporter": "^4.0.8",
+                "sebastian/global-state": "^5.0.8",
+                "sebastian/object-enumerator": "^4.0.4",
+                "sebastian/resource-operations": "^3.0.4",
+                "sebastian/type": "^3.2.1",
+                "sebastian/version": "^3.0.2"
+            },
+            "suggest": {
+                "ext-soap": "To be able to generate mocks based on WSDL files",
+                "ext-xdebug": "PHP extension that provides line coverage as well as branch and path coverage"
+            },
+            "bin": [
+                "phpunit"
+            ],
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "9.6-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/Framework/Assert/Functions.php"
+                ],
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "The PHP Unit Testing framework.",
+            "homepage": "https://phpunit.de/",
+            "keywords": [
+                "phpunit",
+                "testing",
+                "xunit"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpunit/issues",
+                "security": "https://github.com/sebastianbergmann/phpunit/security/policy",
+                "source": "https://github.com/sebastianbergmann/phpunit/tree/9.6.29"
+            },
+            "funding": [
+                {
+                    "url": "https://phpunit.de/sponsors.html",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpunit/phpunit",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-09-24T06:29:11+00:00"
+        },
+        {
+            "name": "psalm/phar",
+            "version": "4.30.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/psalm/phar.git",
+                "reference": "33723713902e1345904a5c9064ef7848bee0d490"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/psalm/phar/zipball/33723713902e1345904a5c9064ef7848bee0d490",
+                "reference": "33723713902e1345904a5c9064ef7848bee0d490",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.1 || ^8.0"
+            },
+            "conflict": {
+                "vimeo/psalm": "*"
+            },
+            "bin": [
+                "psalm.phar"
+            ],
+            "type": "library",
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "description": "Composer-based Psalm Phar",
+            "support": {
+                "issues": "https://github.com/psalm/phar/issues",
+                "source": "https://github.com/psalm/phar/tree/4.30.0"
+            },
+            "time": "2022-11-06T20:41:58+00:00"
+        },
+        {
+            "name": "psr/container",
+            "version": "2.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/container.git",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "reference": "c71ecc56dfe541dbd90c5360474fbc405f8d5963",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.4.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Container\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common Container Interface (PHP FIG PSR-11)",
+            "homepage": "https://github.com/php-fig/container",
+            "keywords": [
+                "PSR-11",
+                "container",
+                "container-interface",
+                "container-interop",
+                "psr"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/2.0.2"
+            },
+            "time": "2021-11-05T16:47:00+00:00"
+        },
+        {
+            "name": "psr/event-dispatcher",
+            "version": "1.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/event-dispatcher.git",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/event-dispatcher/zipball/dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "reference": "dbefd12671e8a14ec7f180cab83036ed26714bb0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\EventDispatcher\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "http://www.php-fig.org/"
+                }
+            ],
+            "description": "Standard interfaces for event handling.",
+            "keywords": [
+                "events",
+                "psr",
+                "psr-14"
+            ],
+            "support": {
+                "issues": "https://github.com/php-fig/event-dispatcher/issues",
+                "source": "https://github.com/php-fig/event-dispatcher/tree/1.0.0"
+            },
+            "time": "2019-01-08T18:20:26+00:00"
+        },
+        {
+            "name": "psr/http-client",
+            "version": "1.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-client.git",
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-client/zipball/bb5906edc1c324c9a05aa0873d40117941e5fa90",
+                "reference": "bb5906edc1c324c9a05aa0873d40117941e5fa90",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.0 || ^8.0",
+                "psr/http-message": "^1.0 || ^2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Client\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP clients",
+            "homepage": "https://github.com/php-fig/http-client",
+            "keywords": [
+                "http",
+                "http-client",
+                "psr",
+                "psr-18"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-client"
+            },
+            "time": "2023-09-23T14:17:50+00:00"
+        },
+        {
+            "name": "psr/http-factory",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-factory.git",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-factory/zipball/2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "reference": "2b4765fddfe3b508ac62f829e852b1501d3f6e8a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1",
+                "psr/http-message": "^1.0 || ^2.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "PSR-17: Common interfaces for PSR-7 HTTP message factories",
+            "keywords": [
+                "factory",
+                "http",
+                "message",
+                "psr",
+                "psr-17",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-factory"
+            },
+            "time": "2024-04-15T12:06:14+00:00"
+        },
+        {
+            "name": "psr/http-message",
+            "version": "2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/http-message.git",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/http-message/zipball/402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "reference": "402d35bcb92c70c026d1a6a9883f06b2ead23d71",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Http\\Message\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for HTTP messages",
+            "homepage": "https://github.com/php-fig/http-message",
+            "keywords": [
+                "http",
+                "http-message",
+                "psr",
+                "psr-7",
+                "request",
+                "response"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/http-message/tree/2.0"
+            },
+            "time": "2023-04-04T09:54:51+00:00"
+        },
+        {
+            "name": "psr/log",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/php-fig/log.git",
+                "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/php-fig/log/zipball/ef29f6d262798707a9edd554e2b82517ef3a9376",
+                "reference": "ef29f6d262798707a9edd554e2b82517ef3a9376",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.0.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Psr\\Log\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "PHP-FIG",
+                    "homepage": "https://www.php-fig.org/"
+                }
+            ],
+            "description": "Common interface for logging libraries",
+            "homepage": "https://github.com/php-fig/log",
+            "keywords": [
+                "log",
+                "psr",
+                "psr-3"
+            ],
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/2.0.0"
+            },
+            "time": "2021-07-14T16:41:46+00:00"
+        },
+        {
+            "name": "ralouphie/getallheaders",
+            "version": "3.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/ralouphie/getallheaders.git",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/ralouphie/getallheaders/zipball/120b605dfeb996808c31b6477290a714d356e822",
+                "reference": "120b605dfeb996808c31b6477290a714d356e822",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.6"
+            },
+            "require-dev": {
+                "php-coveralls/php-coveralls": "^2.1",
+                "phpunit/phpunit": "^5 || ^6.5"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/getallheaders.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ralph Khattar",
+                    "email": "ralph.khattar@gmail.com"
+                }
+            ],
+            "description": "A polyfill for getallheaders.",
+            "support": {
+                "issues": "https://github.com/ralouphie/getallheaders/issues",
+                "source": "https://github.com/ralouphie/getallheaders/tree/develop"
+            },
+            "time": "2019-03-08T08:55:37+00:00"
+        },
+        {
+            "name": "react/cache",
+            "version": "v1.2.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/cache.git",
+                "reference": "d47c472b64aa5608225f47965a484b75c7817d5b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/cache/zipball/d47c472b64aa5608225f47965a484b75c7817d5b",
+                "reference": "d47c472b64aa5608225f47965a484b75c7817d5b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "react/promise": "^3.0 || ^2.0 || ^1.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5 || ^5.7 || ^4.8.35"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Cache\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Async, Promise-based cache interface for ReactPHP",
+            "keywords": [
+                "cache",
+                "caching",
+                "promise",
+                "reactphp"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/cache/issues",
+                "source": "https://github.com/reactphp/cache/tree/v1.2.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2022-11-30T15:59:55+00:00"
+        },
+        {
+            "name": "react/child-process",
+            "version": "v0.6.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/child-process.git",
+                "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/child-process/zipball/1721e2b93d89b745664353b9cfc8f155ba8a6159",
+                "reference": "1721e2b93d89b745664353b9cfc8f155ba8a6159",
+                "shasum": ""
+            },
+            "require": {
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.0",
+                "react/event-loop": "^1.2",
+                "react/stream": "^1.4"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+                "react/socket": "^1.16",
+                "sebastian/environment": "^5.0 || ^3.0 || ^2.0 || ^1.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\ChildProcess\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Event-driven library for executing child processes with ReactPHP.",
+            "keywords": [
+                "event-driven",
+                "process",
+                "reactphp"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/child-process/issues",
+                "source": "https://github.com/reactphp/child-process/tree/v0.6.6"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2025-01-01T16:37:48+00:00"
+        },
+        {
+            "name": "react/dns",
+            "version": "v1.13.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/dns.git",
+                "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/dns/zipball/eb8ae001b5a455665c89c1df97f6fb682f8fb0f5",
+                "reference": "eb8ae001b5a455665c89c1df97f6fb682f8fb0f5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0",
+                "react/cache": "^1.0 || ^0.6 || ^0.5",
+                "react/event-loop": "^1.2",
+                "react/promise": "^3.2 || ^2.7 || ^1.2.1"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+                "react/async": "^4.3 || ^3 || ^2",
+                "react/promise-timer": "^1.11"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Dns\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Async DNS resolver for ReactPHP",
+            "keywords": [
+                "async",
+                "dns",
+                "dns-resolver",
+                "reactphp"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/dns/issues",
+                "source": "https://github.com/reactphp/dns/tree/v1.13.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-06-13T14:18:03+00:00"
+        },
+        {
+            "name": "react/event-loop",
+            "version": "v1.5.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/event-loop.git",
+                "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/event-loop/zipball/bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354",
+                "reference": "bbe0bd8c51ffc05ee43f1729087ed3bdf7d53354",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=5.3.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
+            },
+            "suggest": {
+                "ext-pcntl": "For signal handling support when using the StreamSelectLoop"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\EventLoop\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "ReactPHP's core reactor event loop that libraries can use for evented I/O.",
+            "keywords": [
+                "asynchronous",
+                "event-loop"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/event-loop/issues",
+                "source": "https://github.com/reactphp/event-loop/tree/v1.5.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2023-11-13T13:48:05+00:00"
+        },
+        {
+            "name": "react/promise",
+            "version": "v3.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/promise.git",
+                "reference": "23444f53a813a3296c1368bb104793ce8d88f04a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/promise/zipball/23444f53a813a3296c1368bb104793ce8d88f04a",
+                "reference": "23444f53a813a3296c1368bb104793ce8d88f04a",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.1.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "1.12.28 || 1.4.10",
+                "phpunit/phpunit": "^9.6 || ^7.5"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "React\\Promise\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "A lightweight implementation of CommonJS Promises/A for PHP",
+            "keywords": [
+                "promise",
+                "promises"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/promise/issues",
+                "source": "https://github.com/reactphp/promise/tree/v3.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2025-08-19T18:57:03+00:00"
+        },
+        {
+            "name": "react/socket",
+            "version": "v1.16.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/socket.git",
+                "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/socket/zipball/23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
+                "reference": "23e4ff33ea3e160d2d1f59a0e6050e4b0fb0eac1",
+                "shasum": ""
+            },
+            "require": {
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.0",
+                "react/dns": "^1.13",
+                "react/event-loop": "^1.2",
+                "react/promise": "^3.2 || ^2.6 || ^1.2.1",
+                "react/stream": "^1.4"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36",
+                "react/async": "^4.3 || ^3.3 || ^2",
+                "react/promise-stream": "^1.4",
+                "react/promise-timer": "^1.11"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Socket\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Async, streaming plaintext TCP/IP and secure TLS socket server and client connections for ReactPHP",
+            "keywords": [
+                "Connection",
+                "Socket",
+                "async",
+                "reactphp",
+                "stream"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/socket/issues",
+                "source": "https://github.com/reactphp/socket/tree/v1.16.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-07-26T10:38:09+00:00"
+        },
+        {
+            "name": "react/stream",
+            "version": "v1.4.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/reactphp/stream.git",
+                "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/reactphp/stream/zipball/1e5b0acb8fe55143b5b426817155190eb6f5b18d",
+                "reference": "1e5b0acb8fe55143b5b426817155190eb6f5b18d",
+                "shasum": ""
+            },
+            "require": {
+                "evenement/evenement": "^3.0 || ^2.0 || ^1.0",
+                "php": ">=5.3.8",
+                "react/event-loop": "^1.2"
+            },
+            "require-dev": {
+                "clue/stream-filter": "~1.2",
+                "phpunit/phpunit": "^9.6 || ^5.7 || ^4.8.36"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "React\\Stream\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Christian Lück",
+                    "email": "christian@clue.engineering",
+                    "homepage": "https://clue.engineering/"
+                },
+                {
+                    "name": "Cees-Jan Kiewiet",
+                    "email": "reactphp@ceesjankiewiet.nl",
+                    "homepage": "https://wyrihaximus.net/"
+                },
+                {
+                    "name": "Jan Sorgalla",
+                    "email": "jsorgalla@gmail.com",
+                    "homepage": "https://sorgalla.com/"
+                },
+                {
+                    "name": "Chris Boden",
+                    "email": "cboden@gmail.com",
+                    "homepage": "https://cboden.dev/"
+                }
+            ],
+            "description": "Event-driven readable and writable streams for non-blocking I/O in ReactPHP",
+            "keywords": [
+                "event-driven",
+                "io",
+                "non-blocking",
+                "pipe",
+                "reactphp",
+                "readable",
+                "stream",
+                "writable"
+            ],
+            "support": {
+                "issues": "https://github.com/reactphp/stream/issues",
+                "source": "https://github.com/reactphp/stream/tree/v1.4.0"
+            },
+            "funding": [
+                {
+                    "url": "https://opencollective.com/reactphp",
+                    "type": "open_collective"
+                }
+            ],
+            "time": "2024-06-11T12:45:25+00:00"
+        },
+        {
+            "name": "sebastian/cli-parser",
+            "version": "1.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/cli-parser.git",
+                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
+                "reference": "2b56bea83a09de3ac06bb18b92f068e60cc6f50b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for parsing CLI options",
+            "homepage": "https://github.com/sebastianbergmann/cli-parser",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/cli-parser/issues",
+                "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-02T06:27:43+00:00"
+        },
+        {
+            "name": "sebastian/code-unit",
+            "version": "1.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit.git",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/code-unit",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:08:54+00:00"
+        },
+        {
+            "name": "sebastian/code-unit-reverse-lookup",
+            "version": "2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Looks up which function or method a line of code belongs to",
+            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues",
+                "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T05:30:19+00:00"
+        },
+        {
+            "name": "sebastian/comparator",
+            "version": "4.0.9",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/comparator.git",
+                "reference": "67a2df3a62639eab2cc5906065e9805d4fd5dfc5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/67a2df3a62639eab2cc5906065e9805d4fd5dfc5",
+                "reference": "67a2df3a62639eab2cc5906065e9805d4fd5dfc5",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3",
+                "sebastian/diff": "^4.0",
+                "sebastian/exporter": "^4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@2bepublished.at"
+                }
+            ],
+            "description": "Provides the functionality to compare PHP values for equality",
+            "homepage": "https://github.com/sebastianbergmann/comparator",
+            "keywords": [
+                "comparator",
+                "compare",
+                "equality"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/comparator/issues",
+                "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.9"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/comparator",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-10T06:51:50+00:00"
+        },
+        {
+            "name": "sebastian/complexity",
+            "version": "2.0.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/complexity.git",
+                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/25f207c40d62b8b7aa32f5ab026c53561964053a",
+                "reference": "25f207c40d62b8b7aa32f5ab026c53561964053a",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.18 || ^5.0",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for calculating the complexity of PHP code units",
+            "homepage": "https://github.com/sebastianbergmann/complexity",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/complexity/issues",
+                "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-12-22T06:19:30+00:00"
+        },
+        {
+            "name": "sebastian/diff",
+            "version": "4.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/diff.git",
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/ba01945089c3a293b01ba9badc29ad55b106b0bc",
+                "reference": "ba01945089c3a293b01ba9badc29ad55b106b0bc",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3",
+                "symfony/process": "^4.2 || ^5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Kore Nordmann",
+                    "email": "mail@kore-nordmann.de"
+                }
+            ],
+            "description": "Diff implementation",
+            "homepage": "https://github.com/sebastianbergmann/diff",
+            "keywords": [
+                "diff",
+                "udiff",
+                "unidiff",
+                "unified diff"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/diff/issues",
+                "source": "https://github.com/sebastianbergmann/diff/tree/4.0.6"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-02T06:30:58+00:00"
+        },
+        {
+            "name": "sebastian/environment",
+            "version": "5.1.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/environment.git",
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
+                "reference": "830c43a844f1f8d5b7a1f6d6076b784454d8b7ed",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-posix": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.1-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides functionality to handle HHVM/PHP environments",
+            "homepage": "http://www.github.com/sebastianbergmann/environment",
+            "keywords": [
+                "Xdebug",
+                "environment",
+                "hhvm"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/environment/issues",
+                "source": "https://github.com/sebastianbergmann/environment/tree/5.1.5"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T06:03:51+00:00"
+        },
+        {
+            "name": "sebastian/exporter",
+            "version": "4.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/exporter.git",
+                "reference": "14c6ba52f95a36c3d27c835d65efc7123c446e8c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/14c6ba52f95a36c3d27c835d65efc7123c446e8c",
+                "reference": "14c6ba52f95a36c3d27c835d65efc7123c446e8c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3",
+                "sebastian/recursion-context": "^4.0"
+            },
+            "require-dev": {
+                "ext-mbstring": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Volker Dusch",
+                    "email": "github@wallbash.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                },
+                {
+                    "name": "Bernhard Schussek",
+                    "email": "bschussek@gmail.com"
+                }
+            ],
+            "description": "Provides the functionality to export PHP variables for visualization",
+            "homepage": "https://www.github.com/sebastianbergmann/exporter",
+            "keywords": [
+                "export",
+                "exporter"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/exporter/issues",
+                "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.8"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/exporter",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-09-24T06:03:27+00:00"
+        },
+        {
+            "name": "sebastian/global-state",
+            "version": "5.0.8",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/global-state.git",
+                "reference": "b6781316bdcd28260904e7cc18ec983d0d2ef4f6"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/b6781316bdcd28260904e7cc18ec983d0d2ef4f6",
+                "reference": "b6781316bdcd28260904e7cc18ec983d0d2ef4f6",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
+            },
+            "require-dev": {
+                "ext-dom": "*",
+                "phpunit/phpunit": "^9.3"
+            },
+            "suggest": {
+                "ext-uopz": "*"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "5.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Snapshotting of global state",
+            "homepage": "http://www.github.com/sebastianbergmann/global-state",
+            "keywords": [
+                "global state"
+            ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/global-state/issues",
+                "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.8"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/global-state",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-10T07:10:35+00:00"
+        },
+        {
+            "name": "sebastian/lines-of-code",
+            "version": "1.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/lines-of-code.git",
+                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/e1e4a170560925c26d424b6a03aed157e7dcc5c5",
+                "reference": "e1e4a170560925c26d424b6a03aed157e7dcc5c5",
+                "shasum": ""
+            },
+            "require": {
+                "nikic/php-parser": "^4.18 || ^5.0",
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "1.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library for counting the lines of code in PHP source code",
+            "homepage": "https://github.com/sebastianbergmann/lines-of-code",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/lines-of-code/issues",
+                "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-12-22T06:20:34+00:00"
+        },
+        {
+            "name": "sebastian/object-enumerator",
+            "version": "4.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71",
+                "reference": "5c9eeac41b290a3712d88851518825ad78f45c71",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3",
+                "sebastian/object-reflector": "^2.0",
+                "sebastian/recursion-context": "^4.0"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
+            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-enumerator/issues",
+                "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:12:34+00:00"
+        },
+        {
+            "name": "sebastian/object-reflector",
+            "version": "2.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/object-reflector.git",
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "2.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Allows reflection of object attributes, including inherited and non-public ones",
+            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/object-reflector/issues",
+                "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-10-26T13:14:26+00:00"
+        },
+        {
+            "name": "sebastian/recursion-context",
+            "version": "4.0.6",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/recursion-context.git",
+                "reference": "539c6691e0623af6dc6f9c20384c120f963465a0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/539c6691e0623af6dc6f9c20384c120f963465a0",
+                "reference": "539c6691e0623af6dc6f9c20384c120f963465a0",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "4.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                },
+                {
+                    "name": "Jeff Welch",
+                    "email": "whatthejeff@gmail.com"
+                },
+                {
+                    "name": "Adam Harvey",
+                    "email": "aharvey@php.net"
+                }
+            ],
+            "description": "Provides functionality to recursively process PHP variables",
+            "homepage": "https://github.com/sebastianbergmann/recursion-context",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/recursion-context/issues",
+                "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.6"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                },
+                {
+                    "url": "https://liberapay.com/sebastianbergmann",
+                    "type": "liberapay"
+                },
+                {
+                    "url": "https://thanks.dev/u/gh/sebastianbergmann",
+                    "type": "thanks_dev"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/sebastian/recursion-context",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-10T06:57:39+00:00"
+        },
+        {
+            "name": "sebastian/resource-operations",
+            "version": "3.0.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/resource-operations.git",
+                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
+                "reference": "05d5692a7993ecccd56a03e40cd7e5b09b1d404e",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de"
+                }
+            ],
+            "description": "Provides a list of PHP built-in functions that operate on resources",
+            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
+            "support": {
+                "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.4"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-14T16:00:52+00:00"
+        },
+        {
+            "name": "sebastian/type",
+            "version": "3.2.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/type.git",
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
+                "reference": "75e2c2a32f5e0b3aef905b9ed0b179b953b3d7c7",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "require-dev": {
+                "phpunit/phpunit": "^9.5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.2-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Collection of value objects that represent the types of the PHP type system",
+            "homepage": "https://github.com/sebastianbergmann/type",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/type/issues",
+                "source": "https://github.com/sebastianbergmann/type/tree/3.2.1"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2023-02-03T06:13:03+00:00"
+        },
+        {
+            "name": "sebastian/version",
+            "version": "3.0.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/sebastianbergmann/version.git",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c",
+                "reference": "c6c1022351a901512170118436c764e473f6de8c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.3"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "3.0-dev"
+                }
+            },
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Sebastian Bergmann",
+                    "email": "sebastian@phpunit.de",
+                    "role": "lead"
+                }
+            ],
+            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
+            "homepage": "https://github.com/sebastianbergmann/version",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/3.0.2"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sebastianbergmann",
+                    "type": "github"
+                }
+            ],
+            "time": "2020-09-28T06:39:44+00:00"
+        },
+        {
+            "name": "symfony/config",
+            "version": "v7.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/config.git",
+                "reference": "8a09223170046d2cfda3d2e11af01df2c641e961"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/config/zipball/8a09223170046d2cfda3d2e11af01df2c641e961",
+                "reference": "8a09223170046d2cfda3d2e11af01df2c641e961",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/filesystem": "^7.1",
+                "symfony/polyfill-ctype": "~1.8"
+            },
+            "conflict": {
+                "symfony/finder": "<6.4",
+                "symfony/service-contracts": "<2.5"
+            },
+            "require-dev": {
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/finder": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/yaml": "^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Config\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Helps you find, load, combine, autofill and validate configuration values of any kind",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/config/tree/v7.3.4"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-09-22T12:46:16+00:00"
+        },
+        {
+            "name": "symfony/console",
+            "version": "v7.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/console.git",
+                "reference": "2b9c5fafbac0399a20a2e82429e2bd735dcfb7db"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/console/zipball/2b9c5fafbac0399a20a2e82429e2bd735dcfb7db",
+                "reference": "2b9c5fafbac0399a20a2e82429e2bd735dcfb7db",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3",
+                "symfony/polyfill-mbstring": "~1.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/string": "^7.2"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<6.4",
+                "symfony/dotenv": "<6.4",
+                "symfony/event-dispatcher": "<6.4",
+                "symfony/lock": "<6.4",
+                "symfony/process": "<6.4"
+            },
+            "provide": {
+                "psr/log-implementation": "1.0|2.0|3.0"
+            },
+            "require-dev": {
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/event-dispatcher": "^6.4|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/http-kernel": "^6.4|^7.0",
+                "symfony/lock": "^6.4|^7.0",
+                "symfony/messenger": "^6.4|^7.0",
+                "symfony/process": "^6.4|^7.0",
+                "symfony/stopwatch": "^6.4|^7.0",
+                "symfony/var-dumper": "^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Console\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Eases the creation of beautiful and testable command line interfaces",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "cli",
+                "command-line",
+                "console",
+                "terminal"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/console/tree/v7.3.4"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-09-22T15:31:00+00:00"
+        },
+        {
+            "name": "symfony/deprecation-contracts",
+            "version": "v3.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/deprecation-contracts.git",
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/63afe740e99a13ba87ec199bb07bbdee937a5b62",
+                "reference": "63afe740e99a13ba87ec199bb07bbdee937a5b62",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.6-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "function.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "A generic function and convention to trigger deprecation notices",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/deprecation-contracts/tree/v3.6.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-25T14:21:43+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher",
+            "version": "v7.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher.git",
+                "reference": "b7dc69e71de420ac04bc9ab830cf3ffebba48191"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b7dc69e71de420ac04bc9ab830cf3ffebba48191",
+                "reference": "b7dc69e71de420ac04bc9ab830cf3ffebba48191",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/event-dispatcher-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "symfony/dependency-injection": "<6.4",
+                "symfony/service-contracts": "<2.5"
+            },
+            "provide": {
+                "psr/event-dispatcher-implementation": "1.0",
+                "symfony/event-dispatcher-implementation": "2.0|3.0"
+            },
+            "require-dev": {
+                "psr/log": "^1|^2|^3",
+                "symfony/config": "^6.4|^7.0",
+                "symfony/dependency-injection": "^6.4|^7.0",
+                "symfony/error-handler": "^6.4|^7.0",
+                "symfony/expression-language": "^6.4|^7.0",
+                "symfony/http-foundation": "^6.4|^7.0",
+                "symfony/service-contracts": "^2.5|^3",
+                "symfony/stopwatch": "^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\EventDispatcher\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides tools that allow your application components to communicate with each other by dispatching events and listening to them",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher/tree/v7.3.3"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-13T11:49:31+00:00"
+        },
+        {
+            "name": "symfony/event-dispatcher-contracts",
+            "version": "v3.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/event-dispatcher-contracts.git",
+                "reference": "59eb412e93815df44f05f342958efa9f46b1e586"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/59eb412e93815df44f05f342958efa9f46b1e586",
+                "reference": "59eb412e93815df44f05f342958efa9f46b1e586",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "psr/event-dispatcher": "^1"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\EventDispatcher\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to dispatching event",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/event-dispatcher-contracts/tree/v3.6.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-25T14:21:43+00:00"
+        },
+        {
+            "name": "symfony/filesystem",
+            "version": "v7.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/filesystem.git",
+                "reference": "edcbb768a186b5c3f25d0643159a787d3e63b7fd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/edcbb768a186b5c3f25d0643159a787d3e63b7fd",
+                "reference": "edcbb768a186b5c3f25d0643159a787d3e63b7fd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-mbstring": "~1.8"
+            },
+            "require-dev": {
+                "symfony/process": "^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Filesystem\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides basic utilities for the filesystem",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/filesystem/tree/v7.3.2"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-07-07T08:17:47+00:00"
+        },
+        {
+            "name": "symfony/finder",
+            "version": "v7.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/finder.git",
+                "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/2a6614966ba1074fa93dae0bc804227422df4dfe",
+                "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2"
+            },
+            "require-dev": {
+                "symfony/filesystem": "^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Finder\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Finds files and directories via an intuitive fluent interface",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/v7.3.2"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-07-15T13:41:35+00:00"
+        },
+        {
+            "name": "symfony/options-resolver",
+            "version": "v7.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/options-resolver.git",
+                "reference": "0ff2f5c3df08a395232bbc3c2eb7e84912df911d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/0ff2f5c3df08a395232bbc3c2eb7e84912df911d",
+                "reference": "0ff2f5c3df08a395232bbc3c2eb7e84912df911d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\OptionsResolver\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides an improved replacement for the array_replace PHP function",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "config",
+                "configuration",
+                "options"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/options-resolver/tree/v7.3.3"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-05T10:16:07+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-grapheme",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
+                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/380872130d3a5dd3ace2f4010d95125fde5d5c70",
+                "reference": "380872130d3a5dd3ace2f4010d95125fde5d5c70",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's grapheme_* functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "grapheme",
+                "intl",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-grapheme/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-06-27T09:58:17+00:00"
+        },
+        {
+            "name": "symfony/polyfill-intl-normalizer",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/3833d7255cc303546435cb650316bff708a1c75c",
+                "reference": "3833d7255cc303546435cb650316bff708a1c75c",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "suggest": {
+                "ext-intl": "For best performance"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill for intl's Normalizer class and related functions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "intl",
+                "normalizer",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2024-09-09T11:45:10+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php80",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php80.git",
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
+                "reference": "0cc9dd0f17f61d8131e7df6b84bd344899fe2608",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ion Bazan",
+                    "email": "ion.bazan@gmail.com"
+                },
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.0+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php80/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-01-02T08:10:11+00:00"
+        },
+        {
+            "name": "symfony/polyfill-php84",
+            "version": "v1.33.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/polyfill-php84.git",
+                "reference": "d8ced4d875142b6a7426000426b8abc631d6b191"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/polyfill-php84/zipball/d8ced4d875142b6a7426000426b8abc631d6b191",
+                "reference": "d8ced4d875142b6a7426000426b8abc631d6b191",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=7.2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/polyfill",
+                    "name": "symfony/polyfill"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "bootstrap.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php84\\": ""
+                },
+                "classmap": [
+                    "Resources/stubs"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Symfony polyfill backporting some PHP 8.4+ features to lower PHP versions",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "compatibility",
+                "polyfill",
+                "portable",
+                "shim"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-php84/tree/v1.33.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-06-24T13:30:11+00:00"
+        },
+        {
+            "name": "symfony/process",
+            "version": "v7.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/process.git",
+                "reference": "f24f8f316367b30810810d4eb30c543d7003ff3b"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/process/zipball/f24f8f316367b30810810d4eb30c543d7003ff3b",
+                "reference": "f24f8f316367b30810810d4eb30c543d7003ff3b",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Process\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Executes commands in sub-processes",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/process/tree/v7.3.4"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-09-11T10:12:26+00:00"
+        },
+        {
+            "name": "symfony/service-contracts",
+            "version": "v3.6.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/service-contracts.git",
+                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
+                "reference": "f021b05a130d35510bd6b25fe9053c2a8a15d5d4",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.1",
+                "psr/container": "^1.1|^2.0",
+                "symfony/deprecation-contracts": "^2.5|^3"
+            },
+            "conflict": {
+                "ext-psr": "<1.1|>=2"
+            },
+            "type": "library",
+            "extra": {
+                "thanks": {
+                    "url": "https://github.com/symfony/contracts",
+                    "name": "symfony/contracts"
+                },
+                "branch-alias": {
+                    "dev-main": "3.6-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Contracts\\Service\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Test/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Generic abstractions related to writing services",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "abstractions",
+                "contracts",
+                "decoupling",
+                "interfaces",
+                "interoperability",
+                "standards"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/service-contracts/tree/v3.6.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-04-25T09:37:31+00:00"
+        },
+        {
+            "name": "symfony/stopwatch",
+            "version": "v7.3.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/stopwatch.git",
+                "reference": "5a49289e2b308214c8b9c2fda4ea454d8b8ad7cd"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/5a49289e2b308214c8b9c2fda4ea454d8b8ad7cd",
+                "reference": "5a49289e2b308214c8b9c2fda4ea454d8b8ad7cd",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/service-contracts": "^2.5|^3"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Stopwatch\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides a way to profile code",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/stopwatch/tree/v7.3.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-02-24T10:49:57+00:00"
+        },
+        {
+            "name": "symfony/string",
+            "version": "v7.3.4",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/string.git",
+                "reference": "f96476035142921000338bad71e5247fbc138872"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/string/zipball/f96476035142921000338bad71e5247fbc138872",
+                "reference": "f96476035142921000338bad71e5247fbc138872",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-intl-grapheme": "~1.0",
+                "symfony/polyfill-intl-normalizer": "~1.0",
+                "symfony/polyfill-mbstring": "~1.0"
+            },
+            "conflict": {
+                "symfony/translation-contracts": "<2.5"
+            },
+            "require-dev": {
+                "symfony/emoji": "^7.1",
+                "symfony/http-client": "^6.4|^7.0",
+                "symfony/intl": "^6.4|^7.0",
+                "symfony/translation-contracts": "^2.5|^3.0",
+                "symfony/var-exporter": "^6.4|^7.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "Resources/functions.php"
+                ],
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Nicolas Grekas",
+                    "email": "p@tchwork.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Provides an object-oriented API to strings and deals with bytes, UTF-8 code points and grapheme clusters in a unified way",
+            "homepage": "https://symfony.com",
+            "keywords": [
+                "grapheme",
+                "i18n",
+                "string",
+                "unicode",
+                "utf-8",
+                "utf8"
+            ],
+            "support": {
+                "source": "https://github.com/symfony/string/tree/v7.3.4"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-09-11T14:36:48+00:00"
+        },
+        {
+            "name": "symfony/yaml",
+            "version": "v7.3.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/symfony/yaml.git",
+                "reference": "d4f4a66866fe2451f61296924767280ab5732d9d"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/symfony/yaml/zipball/d4f4a66866fe2451f61296924767280ab5732d9d",
+                "reference": "d4f4a66866fe2451f61296924767280ab5732d9d",
+                "shasum": ""
+            },
+            "require": {
+                "php": ">=8.2",
+                "symfony/deprecation-contracts": "^2.5|^3.0",
+                "symfony/polyfill-ctype": "^1.8"
+            },
+            "conflict": {
+                "symfony/console": "<6.4"
+            },
+            "require-dev": {
+                "symfony/console": "^6.4|^7.0"
+            },
+            "bin": [
+                "Resources/bin/yaml-lint"
+            ],
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "Symfony\\Component\\Yaml\\": ""
+                },
+                "exclude-from-classmap": [
+                    "/Tests/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Fabien Potencier",
+                    "email": "fabien@symfony.com"
+                },
+                {
+                    "name": "Symfony Community",
+                    "homepage": "https://symfony.com/contributors"
+                }
+            ],
+            "description": "Loads and dumps YAML files",
+            "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/yaml/tree/v7.3.3"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://github.com/nicolas-grekas",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2025-08-27T11:34:33+00:00"
+        },
+        {
+            "name": "theseer/tokenizer",
+            "version": "1.2.3",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/theseer/tokenizer.git",
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "reference": "737eda637ed5e28c3413cb1ebe8bb52cbf1ca7a2",
+                "shasum": ""
+            },
+            "require": {
+                "ext-dom": "*",
+                "ext-tokenizer": "*",
+                "ext-xmlwriter": "*",
+                "php": "^7.2 || ^8.0"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "src/"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Arne Blankerts",
+                    "email": "arne@blankerts.de",
+                    "role": "Developer"
+                }
+            ],
+            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
+            "support": {
+                "issues": "https://github.com/theseer/tokenizer/issues",
+                "source": "https://github.com/theseer/tokenizer/tree/1.2.3"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/theseer",
+                    "type": "github"
+                }
+            ],
+            "time": "2024-03-03T12:36:25+00:00"
+        }
+    ],
+    "aliases": [],
+    "minimum-stability": "stable",
+    "stability-flags": {},
+    "prefer-stable": false,
+    "prefer-lowest": false,
+    "platform": {
+        "php": ">=7.4"
+    },
+    "platform-dev": {
+        "ext-mysqli": "*",
+        "ext-sqlite3": "*",
+        "ext-mbstring": "*"
+    },
+    "plugin-api-version": "2.6.0"
+}
diff --git a/pkgs/by-name/po/postfixadmin/package.nix b/pkgs/by-name/po/postfixadmin/package.nix
new file mode 100644
index 000000000000..e7b72492e147
--- /dev/null
+++ b/pkgs/by-name/po/postfixadmin/package.nix
@@ -0,0 +1,44 @@
+{
+  fetchFromGitHub,
+  lib,
+  php84,
+}:
+
+let
+  php = php84;
+in
+php.buildComposerProject2 (finalAttrs: {
+  pname = "postfixadmin";
+  version = "4.0.1";
+
+  src = fetchFromGitHub {
+    owner = "postfixadmin";
+    repo = "postfixadmin";
+    tag = "postfixadmin-${finalAttrs.version}";
+    hash = "sha256-mr5FBURTGP2J3JMlcexXjz4GFJNqPR4rZyqHVN7+6iM=";
+  };
+
+  vendorHash = "sha256-gv6QYuHGo2r2WgtLPLco/PmKxYSijDkpWoF/vIR5y5s=";
+
+  # Upstream does not ship a lock file, we have to maintain our own for now.
+  # https://github.com/postfixadmin/postfixadmin/issues/948
+  composerLock = ./composer.lock;
+
+  postInstall = ''
+    out_dir="$out"/share/php/postfixadmin/
+
+    ln -sf /etc/postfixadmin/config.local.php "$out_dir"
+    ln -sf /var/cache/postfixadmin/templates_c "$out_dir"
+  '';
+
+  passthru.phpPackage = php;
+
+  meta = {
+    changelog = "https://github.com/postfixadmin/postfixadmin/releases/tag/${finalAttrs.src.tag}";
+    description = "Web based virtual user administration interface for Postfix mail servers";
+    homepage = "https://postfixadmin.sourceforge.io/";
+    maintainers = with lib.maintainers; [ yayayayaka ];
+    license = lib.licenses.gpl2Plus;
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index fc47f1566450..9bac57a6a413 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1215,7 +1215,6 @@ mapAliases {
   polypane = throw "'polypane' has been removed due to lack of maintenance in nixpkgs"; # Added 2025-06-25
   poppler_utils = throw "'poppler_utils' has been renamed to/replaced by 'poppler-utils'"; # Converted to throw 2025-10-27
   posterazor = throw "posterazor was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
-  postfixadmin = throw "'postfixadmin' has been removed due to lack of maintenance and missing support for PHP >8.1"; # Added 2025-10-03
   postgis = throw "'postgis' has been removed. Use 'postgresqlPackages.postgis' instead."; # Added 2025-07-19
   postgres-lsp = lib.warnOnInstantiate "'postgres-lsp' has been renamed to 'postgres-language-server'" postgres-language-server; # Added 2025-10-28
   postgresql13JitPackages = throw "'postgresql13JitPackages' has been renamed to/replaced by 'postgresql13Packages'"; # Converted to throw 2025-10-27

From 17e1f26d80dccee875c57c3db9a5a06092fa70b8 Mon Sep 17 00:00:00 2001
From: Yaya <github@uwu.is>
Date: Thu, 30 Oct 2025 10:19:02 +0100
Subject: [PATCH 4128/6226] nixos/rl-25.11: Mention removed
 `services.postfixadmin` module

---
 nixos/doc/manual/release-notes/rl-2511.section.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index ec4bd00544df..2e73fe06aa0e 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -265,6 +265,8 @@
 
 - The `services.siproxd` module has been removed as `siproxd` is unmaintained and broken with libosip 5.x.
 
+- The `services.postfixadmin` module has been removed due to a lack of active maintainers.
+
 - `services.tor.torsocks.enable` no longer defaults to true if Tor and Tor client functionality is enabled.
 
 - `netbox-manage` script created by the `netbox` module no longer uses `sudo -u netbox` internally. It can be run as root and will change it's user to `netbox` using `runuser`

From 8154527d3df2049b2cbb52390ddf63da92ba7324 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 09:20:59 +0000
Subject: [PATCH 4129/6226] s7: 11.7-unstable-2025-10-26 ->
 11.7-unstable-2025-10-29

---
 pkgs/by-name/s7/s7/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix
index f4f741529e75..c35856dd68ad 100644
--- a/pkgs/by-name/s7/s7/package.nix
+++ b/pkgs/by-name/s7/s7/package.nix
@@ -26,14 +26,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "s7";
-  version = "11.7-unstable-2025-10-26";
+  version = "11.7-unstable-2025-10-29";
 
   src = fetchFromGitLab {
     domain = "cm-gitlab.stanford.edu";
     owner = "bil";
     repo = "s7";
-    rev = "6fc94288ed46533527b1ddb24c3b162a9d0f7ab7";
-    hash = "sha256-kJhvgZ/GTSSplmY6bzHxHhtgukssepBsSWD7kwXwnps=";
+    rev = "cb3da9a414401e447066c6f2ccd4476c2da886ec";
+    hash = "sha256-RHYALNWKxQ5mgU/mvQVsVW87Efd+kxgIBkw7vOgwVAo=";
   };
 
   buildInputs =

From e80def116d86323f2c0f215d01064cc2af92b3b1 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Thu, 30 Oct 2025 17:28:17 +0800
Subject: [PATCH 4130/6226] nezha-theme-admin: 1.13.1 -> 1.14.4

---
 .../ne/nezha-theme-admin/package-lock.json    | 3235 ++++++++---------
 pkgs/by-name/ne/nezha-theme-admin/package.nix |    6 +-
 2 files changed, 1576 insertions(+), 1665 deletions(-)

diff --git a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json
index 3a638401dc4f..77114d34f3ab 100644
--- a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json
+++ b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json
@@ -8,69 +8,73 @@
             "name": "admin-frontend",
             "version": "0.0.0",
             "dependencies": {
-                "@hookform/resolvers": "^3.10.0",
-                "@radix-ui/react-alert-dialog": "^1.1.5",
-                "@radix-ui/react-avatar": "^1.1.2",
-                "@radix-ui/react-checkbox": "^1.1.3",
-                "@radix-ui/react-dialog": "^1.1.5",
-                "@radix-ui/react-dropdown-menu": "^2.1.5",
-                "@radix-ui/react-label": "^2.1.1",
-                "@radix-ui/react-navigation-menu": "^1.2.4",
-                "@radix-ui/react-popover": "^1.1.5",
-                "@radix-ui/react-scroll-area": "^1.2.2",
-                "@radix-ui/react-select": "^2.1.5",
-                "@radix-ui/react-separator": "^1.1.1",
-                "@radix-ui/react-slot": "^1.1.1",
-                "@radix-ui/react-tabs": "^1.1.2",
-                "@tanstack/react-table": "^8.20.6",
+                "@hookform/resolvers": "^5.2.2",
+                "@radix-ui/react-alert-dialog": "^1.1.15",
+                "@radix-ui/react-avatar": "^1.1.10",
+                "@radix-ui/react-checkbox": "^1.3.3",
+                "@radix-ui/react-dialog": "^1.1.15",
+                "@radix-ui/react-dropdown-menu": "^2.1.16",
+                "@radix-ui/react-label": "^2.1.7",
+                "@radix-ui/react-navigation-menu": "^1.2.14",
+                "@radix-ui/react-popover": "^1.1.15",
+                "@radix-ui/react-scroll-area": "^1.2.10",
+                "@radix-ui/react-select": "^2.2.6",
+                "@radix-ui/react-separator": "^1.1.7",
+                "@radix-ui/react-slot": "^1.2.3",
+                "@radix-ui/react-switch": "^1.2.6",
+                "@radix-ui/react-tabs": "^1.1.13",
+                "@tailwindcss/postcss": "^4.1.14",
+                "@tanstack/react-table": "^8.21.3",
                 "@trivago/prettier-plugin-sort-imports": "^5.2.2",
-                "@types/luxon": "^3.4.2",
+                "@types/luxon": "^3.7.1",
                 "@xterm/addon-attach": "^0.11.0",
                 "@xterm/addon-fit": "^0.10.0",
                 "@xterm/xterm": "^5.5.0",
                 "class-variance-authority": "^0.7.1",
                 "clsx": "^2.1.1",
-                "cmdk": "^1.0.4",
+                "cmdk": "^1.1.1",
                 "copy-to-clipboard": "^3.3.3",
-                "framer-motion": "^11.18.2",
-                "i18next": "^24.2.2",
-                "i18next-browser-languagedetector": "^8.0.2",
+                "date-fns": "^4.1.0",
+                "framer-motion": "^12.23.22",
+                "i18next": "^25.5.3",
+                "i18next-browser-languagedetector": "^8.2.0",
                 "jotai-zustand": "^0.6.0",
-                "lucide-react": "^0.454.0",
-                "luxon": "^3.5.0",
+                "lucide-react": "^0.545.0",
+                "luxon": "^3.7.2",
                 "next-themes": "^0.4.6",
-                "prettier-plugin-tailwindcss": "^0.6.11",
-                "react": "^19.0.0",
-                "react-dom": "^19.0.0",
-                "react-hook-form": "^7.54.2",
-                "react-i18next": "^15.4.0",
-                "react-router-dom": "^7.1.5",
-                "react-virtuoso": "^4.12.3",
-                "sonner": "^1.7.4",
-                "swr": "^2.3.0",
-                "tailwind-merge": "^2.6.0",
+                "prettier-plugin-tailwindcss": "^0.6.14",
+                "react": "^19.2.0",
+                "react-day-picker": "^9.11.1",
+                "react-dom": "^19.2.0",
+                "react-hook-form": "^7.64.0",
+                "react-i18next": "^16.0.0",
+                "react-router-dom": "^7.9.4",
+                "react-virtuoso": "^4.14.1",
+                "sonner": "^2.0.7",
+                "swr": "^2.3.6",
+                "tailwind-merge": "^3.3.1",
                 "tailwindcss-animate": "^1.0.7",
                 "vaul": "^1.1.2",
-                "zod": "^3.24.1",
-                "zustand": "^5.0.3"
+                "zod": "^4.1.12",
+                "zustand": "^5.0.8"
             },
             "devDependencies": {
-                "@eslint/js": "^9.19.0",
-                "@types/node": "^22.13.0",
-                "@types/react": "^18.3.18",
-                "@types/react-dom": "^18.3.5",
-                "@vitejs/plugin-react": "^4.3.4",
-                "autoprefixer": "^10.4.20",
-                "eslint": "^9.19.0",
-                "eslint-plugin-react-hooks": "^5.1.0",
-                "eslint-plugin-react-refresh": "^0.4.18",
-                "globals": "^15.14.0",
-                "postcss": "^8.5.1",
-                "swagger-typescript-api": "^13.0.23",
-                "tailwindcss": "^3.4.17",
-                "typescript": "~5.6.3",
-                "typescript-eslint": "^8.22.0",
-                "vite": "^6.0.11"
+                "@eslint/js": "^9.37.0",
+                "@types/node": "^24.7.0",
+                "@types/react": "^19.2.2",
+                "@types/react-dom": "^19.2.1",
+                "@vitejs/plugin-react": "^5.0.4",
+                "autoprefixer": "^10.4.21",
+                "eslint": "^9.37.0",
+                "eslint-plugin-react-hooks": "^7.0.0",
+                "eslint-plugin-react-refresh": "^0.4.23",
+                "globals": "^16.4.0",
+                "postcss": "^8.5.6",
+                "swagger-typescript-api": "^13.2.15",
+                "tailwindcss": "^4.1.14",
+                "typescript": "~5.9.3",
+                "typescript-eslint": "^8.46.0",
+                "vite": "^7.1.9"
             }
         },
         "node_modules/@alloc/quick-lru": {
@@ -85,20 +89,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/@ampproject/remapping": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz",
-            "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==",
-            "devOptional": true,
-            "license": "Apache-2.0",
-            "dependencies": {
-                "@jridgewell/gen-mapping": "^0.3.5",
-                "@jridgewell/trace-mapping": "^0.3.24"
-            },
-            "engines": {
-                "node": ">=6.0.0"
-            }
-        },
         "node_modules/@babel/code-frame": {
             "version": "7.27.1",
             "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
@@ -114,9 +104,9 @@
             }
         },
         "node_modules/@babel/compat-data": {
-            "version": "7.28.0",
-            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.0.tgz",
-            "integrity": "sha512-60X7qkglvrap8mn1lh2ebxXdZYtUcpd7gsmy9kLaBJ4i/WdY8PqTSdxyA8qraikqKQK5C1KRBKXqznrVapyNaw==",
+            "version": "7.28.5",
+            "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.5.tgz",
+            "integrity": "sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==",
             "devOptional": true,
             "license": "MIT",
             "engines": {
@@ -124,22 +114,22 @@
             }
         },
         "node_modules/@babel/core": {
-            "version": "7.28.0",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.0.tgz",
-            "integrity": "sha512-UlLAnTPrFdNGoFtbSXwcGFQBtQZJCNjaN6hQNP3UPvuNXT1i82N26KL3dZeIpNalWywr9IuQuncaAfUaS1g6sQ==",
+            "version": "7.28.5",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.5.tgz",
+            "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==",
             "devOptional": true,
             "license": "MIT",
             "dependencies": {
-                "@ampproject/remapping": "^2.2.0",
                 "@babel/code-frame": "^7.27.1",
-                "@babel/generator": "^7.28.0",
+                "@babel/generator": "^7.28.5",
                 "@babel/helper-compilation-targets": "^7.27.2",
-                "@babel/helper-module-transforms": "^7.27.3",
-                "@babel/helpers": "^7.27.6",
-                "@babel/parser": "^7.28.0",
+                "@babel/helper-module-transforms": "^7.28.3",
+                "@babel/helpers": "^7.28.4",
+                "@babel/parser": "^7.28.5",
                 "@babel/template": "^7.27.2",
-                "@babel/traverse": "^7.28.0",
-                "@babel/types": "^7.28.0",
+                "@babel/traverse": "^7.28.5",
+                "@babel/types": "^7.28.5",
+                "@jridgewell/remapping": "^2.3.5",
                 "convert-source-map": "^2.0.0",
                 "debug": "^4.1.0",
                 "gensync": "^1.0.0-beta.2",
@@ -155,13 +145,13 @@
             }
         },
         "node_modules/@babel/generator": {
-            "version": "7.28.0",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.0.tgz",
-            "integrity": "sha512-lJjzvrbEeWrhB4P3QBsH7tey117PjLZnDbLiQEKjQ/fNJTjuq4HSqgFA+UNSwZT8D7dxxbnuSBMsa1lrWzKlQg==",
+            "version": "7.28.5",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz",
+            "integrity": "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==",
             "license": "MIT",
             "dependencies": {
-                "@babel/parser": "^7.28.0",
-                "@babel/types": "^7.28.0",
+                "@babel/parser": "^7.28.5",
+                "@babel/types": "^7.28.5",
                 "@jridgewell/gen-mapping": "^0.3.12",
                 "@jridgewell/trace-mapping": "^0.3.28",
                 "jsesc": "^3.0.2"
@@ -211,15 +201,15 @@
             }
         },
         "node_modules/@babel/helper-module-transforms": {
-            "version": "7.27.3",
-            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.27.3.tgz",
-            "integrity": "sha512-dSOvYwvyLsWBeIRyOeHXp5vPj5l1I011r52FM1+r1jCERv+aFXYk4whgQccYEGYxK2H3ZAIA8nuPkQ0HaUo3qg==",
+            "version": "7.28.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz",
+            "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==",
             "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/helper-module-imports": "^7.27.1",
                 "@babel/helper-validator-identifier": "^7.27.1",
-                "@babel/traverse": "^7.27.3"
+                "@babel/traverse": "^7.28.3"
             },
             "engines": {
                 "node": ">=6.9.0"
@@ -248,9 +238,9 @@
             }
         },
         "node_modules/@babel/helper-validator-identifier": {
-            "version": "7.27.1",
-            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.27.1.tgz",
-            "integrity": "sha512-D2hP9eA+Sqx1kBZgzxZh0y1trbuU+JoDkiEwqhQ36nodYqJwyEIhPSdMNd7lOm/4io72luTPWH20Yda0xOuUow==",
+            "version": "7.28.5",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+            "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
             "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
@@ -267,26 +257,26 @@
             }
         },
         "node_modules/@babel/helpers": {
-            "version": "7.28.2",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.2.tgz",
-            "integrity": "sha512-/V9771t+EgXz62aCcyofnQhGM8DQACbRhvzKFsXKC9QM+5MadF8ZmIm0crDMaz3+o0h0zXfJnd4EhbYbxsrcFw==",
+            "version": "7.28.4",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz",
+            "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==",
             "devOptional": true,
             "license": "MIT",
             "dependencies": {
                 "@babel/template": "^7.27.2",
-                "@babel/types": "^7.28.2"
+                "@babel/types": "^7.28.4"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@babel/parser": {
-            "version": "7.28.0",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.0.tgz",
-            "integrity": "sha512-jVZGvOxOuNSsuQuLRTh13nU0AogFlw32w/MT+LV6D3sP5WdbW61E77RnkbaO2dUvmPAYrBDJXGn5gGS6tH4j8g==",
+            "version": "7.28.5",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
+            "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
             "license": "MIT",
             "dependencies": {
-                "@babel/types": "^7.28.0"
+                "@babel/types": "^7.28.5"
             },
             "bin": {
                 "parser": "bin/babel-parser.js"
@@ -328,9 +318,9 @@
             }
         },
         "node_modules/@babel/runtime": {
-            "version": "7.28.2",
-            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.2.tgz",
-            "integrity": "sha512-KHp2IflsnGywDjBWDkR9iEqiWSpc8GIi0lgTT3mOElT0PP1tG26P4tmFI2YvAdzgq9RGyoHZQEIEdZy6Ec5xCA==",
+            "version": "7.28.4",
+            "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
+            "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
             "license": "MIT",
             "engines": {
                 "node": ">=6.9.0"
@@ -351,17 +341,17 @@
             }
         },
         "node_modules/@babel/traverse": {
-            "version": "7.28.0",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.0.tgz",
-            "integrity": "sha512-mGe7UK5wWyh0bKRfupsUchrQGqvDbZDbKJw+kcRGSmdHVYrv+ltd0pnpDTVpiTqnaBru9iEvA8pz8W46v0Amwg==",
+            "version": "7.28.5",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.5.tgz",
+            "integrity": "sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==",
             "license": "MIT",
             "dependencies": {
                 "@babel/code-frame": "^7.27.1",
-                "@babel/generator": "^7.28.0",
+                "@babel/generator": "^7.28.5",
                 "@babel/helper-globals": "^7.28.0",
-                "@babel/parser": "^7.28.0",
+                "@babel/parser": "^7.28.5",
                 "@babel/template": "^7.27.2",
-                "@babel/types": "^7.28.0",
+                "@babel/types": "^7.28.5",
                 "debug": "^4.3.1"
             },
             "engines": {
@@ -369,28 +359,28 @@
             }
         },
         "node_modules/@babel/types": {
-            "version": "7.28.2",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.2.tgz",
-            "integrity": "sha512-ruv7Ae4J5dUYULmeXw1gmb7rYRz57OWCPM57pHojnLq/3Z1CK2lNSLTCVjxVk1F/TZHwOZZrOWi0ur95BbLxNQ==",
+            "version": "7.28.5",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
+            "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
             "license": "MIT",
             "dependencies": {
                 "@babel/helper-string-parser": "^7.27.1",
-                "@babel/helper-validator-identifier": "^7.27.1"
+                "@babel/helper-validator-identifier": "^7.28.5"
             },
             "engines": {
                 "node": ">=6.9.0"
             }
         },
         "node_modules/@biomejs/js-api": {
-            "version": "2.0.3",
-            "resolved": "https://registry.npmjs.org/@biomejs/js-api/-/js-api-2.0.3.tgz",
-            "integrity": "sha512-fg4hGhg1LtohDqLdG9uggROlVsydcuFwZhPoUOTi9+bkvGMULDKL9dEP5iN6++CIA/AN0T20U82rLYuaxc+VDQ==",
+            "version": "3.0.0",
+            "resolved": "https://registry.npmjs.org/@biomejs/js-api/-/js-api-3.0.0.tgz",
+            "integrity": "sha512-5QcGJFj9IO+yXl76ICjvkdE38uxRcTDsBzcCZHEZ+ma+Te/nbvJg4A3KtAds9HCrEF0JKLWiyjMhAbqazuJvYA==",
             "dev": true,
             "license": "MIT OR Apache-2.0",
             "peerDependencies": {
-                "@biomejs/wasm-bundler": "^2.1.1",
-                "@biomejs/wasm-nodejs": "^2.1.1",
-                "@biomejs/wasm-web": "^2.1.1"
+                "@biomejs/wasm-bundler": "^2.2.0",
+                "@biomejs/wasm-nodejs": "^2.2.0",
+                "@biomejs/wasm-web": "^2.2.0"
             },
             "peerDependenciesMeta": {
                 "@biomejs/wasm-bundler": {
@@ -405,16 +395,22 @@
             }
         },
         "node_modules/@biomejs/wasm-nodejs": {
-            "version": "2.1.4",
-            "resolved": "https://registry.npmjs.org/@biomejs/wasm-nodejs/-/wasm-nodejs-2.1.4.tgz",
-            "integrity": "sha512-BuvuOiXtTJg9w5+ApMXeJDD5H+XkIJSazIjPJeIxfkCqzVtCByLjCqPC6gbECbylRl9IhrZMWVIskTD6aJ9MzA==",
+            "version": "2.2.6",
+            "resolved": "https://registry.npmjs.org/@biomejs/wasm-nodejs/-/wasm-nodejs-2.2.6.tgz",
+            "integrity": "sha512-lUEcvW+2eyMTgCofknBT04AvY7KkQSqKe3Nv40+ZxWVlStsPB0v2RWLu7xks69Yxcb3TfNGsfq21OWkdrmO2NQ==",
             "dev": true,
             "license": "MIT OR Apache-2.0"
         },
+        "node_modules/@date-fns/tz": {
+            "version": "1.4.1",
+            "resolved": "https://registry.npmjs.org/@date-fns/tz/-/tz-1.4.1.tgz",
+            "integrity": "sha512-P5LUNhtbj6YfI3iJjw5EL9eUAG6OitD0W3fWQcpQjDRc/QIsL0tRNuO1PcDvPccWL1fSTXXdE1ds+l95DV/OFA==",
+            "license": "MIT"
+        },
         "node_modules/@esbuild/aix-ppc64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.8.tgz",
-            "integrity": "sha512-urAvrUedIqEiFR3FYSLTWQgLu5tb+m0qZw0NBEasUeo6wuqatkMDaRT+1uABiGXEu5vqgPd7FGE1BhsAIy9QVA==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.11.tgz",
+            "integrity": "sha512-Xt1dOL13m8u0WE8iplx9Ibbm+hFAO0GsU2P34UNoDGvZYkY8ifSiy6Zuc1lYxfG7svWE2fzqCUmFp5HCn51gJg==",
             "cpu": [
                 "ppc64"
             ],
@@ -429,9 +425,9 @@
             }
         },
         "node_modules/@esbuild/android-arm": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.8.tgz",
-            "integrity": "sha512-RONsAvGCz5oWyePVnLdZY/HHwA++nxYWIX1atInlaW6SEkwq6XkP3+cb825EUcRs5Vss/lGh/2YxAb5xqc07Uw==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.11.tgz",
+            "integrity": "sha512-uoa7dU+Dt3HYsethkJ1k6Z9YdcHjTrSb5NUy66ZfZaSV8hEYGD5ZHbEMXnqLFlbBflLsl89Zke7CAdDJ4JI+Gg==",
             "cpu": [
                 "arm"
             ],
@@ -446,9 +442,9 @@
             }
         },
         "node_modules/@esbuild/android-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.8.tgz",
-            "integrity": "sha512-OD3p7LYzWpLhZEyATcTSJ67qB5D+20vbtr6vHlHWSQYhKtzUYrETuWThmzFpZtFsBIxRvhO07+UgVA9m0i/O1w==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.11.tgz",
+            "integrity": "sha512-9slpyFBc4FPPz48+f6jyiXOx/Y4v34TUeDDXJpZqAWQn/08lKGeD8aDp9TMn9jDz2CiEuHwfhRmGBvpnd/PWIQ==",
             "cpu": [
                 "arm64"
             ],
@@ -463,9 +459,9 @@
             }
         },
         "node_modules/@esbuild/android-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.8.tgz",
-            "integrity": "sha512-yJAVPklM5+4+9dTeKwHOaA+LQkmrKFX96BM0A/2zQrbS6ENCmxc4OVoBs5dPkCCak2roAD+jKCdnmOqKszPkjA==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.11.tgz",
+            "integrity": "sha512-Sgiab4xBjPU1QoPEIqS3Xx+R2lezu0LKIEcYe6pftr56PqPygbB7+szVnzoShbx64MUupqoE0KyRlN7gezbl8g==",
             "cpu": [
                 "x64"
             ],
@@ -480,9 +476,9 @@
             }
         },
         "node_modules/@esbuild/darwin-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.8.tgz",
-            "integrity": "sha512-Jw0mxgIaYX6R8ODrdkLLPwBqHTtYHJSmzzd+QeytSugzQ0Vg4c5rDky5VgkoowbZQahCbsv1rT1KW72MPIkevw==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.11.tgz",
+            "integrity": "sha512-VekY0PBCukppoQrycFxUqkCojnTQhdec0vevUL/EDOCnXd9LKWqD/bHwMPzigIJXPhC59Vd1WFIL57SKs2mg4w==",
             "cpu": [
                 "arm64"
             ],
@@ -497,9 +493,9 @@
             }
         },
         "node_modules/@esbuild/darwin-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.8.tgz",
-            "integrity": "sha512-Vh2gLxxHnuoQ+GjPNvDSDRpoBCUzY4Pu0kBqMBDlK4fuWbKgGtmDIeEC081xi26PPjn+1tct+Bh8FjyLlw1Zlg==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.11.tgz",
+            "integrity": "sha512-+hfp3yfBalNEpTGp9loYgbknjR695HkqtY3d3/JjSRUyPg/xd6q+mQqIb5qdywnDxRZykIHs3axEqU6l1+oWEQ==",
             "cpu": [
                 "x64"
             ],
@@ -514,9 +510,9 @@
             }
         },
         "node_modules/@esbuild/freebsd-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.8.tgz",
-            "integrity": "sha512-YPJ7hDQ9DnNe5vxOm6jaie9QsTwcKedPvizTVlqWG9GBSq+BuyWEDazlGaDTC5NGU4QJd666V0yqCBL2oWKPfA==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.11.tgz",
+            "integrity": "sha512-CmKjrnayyTJF2eVuO//uSjl/K3KsMIeYeyN7FyDBjsR3lnSJHaXlVoAK8DZa7lXWChbuOk7NjAc7ygAwrnPBhA==",
             "cpu": [
                 "arm64"
             ],
@@ -531,9 +527,9 @@
             }
         },
         "node_modules/@esbuild/freebsd-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.8.tgz",
-            "integrity": "sha512-MmaEXxQRdXNFsRN/KcIimLnSJrk2r5H8v+WVafRWz5xdSVmWLoITZQXcgehI2ZE6gioE6HirAEToM/RvFBeuhw==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.11.tgz",
+            "integrity": "sha512-Dyq+5oscTJvMaYPvW3x3FLpi2+gSZTCE/1ffdwuM6G1ARang/mb3jvjxs0mw6n3Lsw84ocfo9CrNMqc5lTfGOw==",
             "cpu": [
                 "x64"
             ],
@@ -548,9 +544,9 @@
             }
         },
         "node_modules/@esbuild/linux-arm": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.8.tgz",
-            "integrity": "sha512-FuzEP9BixzZohl1kLf76KEVOsxtIBFwCaLupVuk4eFVnOZfU+Wsn+x5Ryam7nILV2pkq2TqQM9EZPsOBuMC+kg==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.11.tgz",
+            "integrity": "sha512-TBMv6B4kCfrGJ8cUPo7vd6NECZH/8hPpBHHlYI3qzoYFvWu2AdTvZNuU/7hsbKWqu/COU7NIK12dHAAqBLLXgw==",
             "cpu": [
                 "arm"
             ],
@@ -565,9 +561,9 @@
             }
         },
         "node_modules/@esbuild/linux-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.8.tgz",
-            "integrity": "sha512-WIgg00ARWv/uYLU7lsuDK00d/hHSfES5BzdWAdAig1ioV5kaFNrtK8EqGcUBJhYqotlUByUKz5Qo6u8tt7iD/w==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.11.tgz",
+            "integrity": "sha512-Qr8AzcplUhGvdyUF08A1kHU3Vr2O88xxP0Tm8GcdVOUm25XYcMPp2YqSVHbLuXzYQMf9Bh/iKx7YPqECs6ffLA==",
             "cpu": [
                 "arm64"
             ],
@@ -582,9 +578,9 @@
             }
         },
         "node_modules/@esbuild/linux-ia32": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.8.tgz",
-            "integrity": "sha512-A1D9YzRX1i+1AJZuFFUMP1E9fMaYY+GnSQil9Tlw05utlE86EKTUA7RjwHDkEitmLYiFsRd9HwKBPEftNdBfjg==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.11.tgz",
+            "integrity": "sha512-TmnJg8BMGPehs5JKrCLqyWTVAvielc615jbkOirATQvWWB1NMXY77oLMzsUjRLa0+ngecEmDGqt5jiDC6bfvOw==",
             "cpu": [
                 "ia32"
             ],
@@ -599,9 +595,9 @@
             }
         },
         "node_modules/@esbuild/linux-loong64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.8.tgz",
-            "integrity": "sha512-O7k1J/dwHkY1RMVvglFHl1HzutGEFFZ3kNiDMSOyUrB7WcoHGf96Sh+64nTRT26l3GMbCW01Ekh/ThKM5iI7hQ==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.11.tgz",
+            "integrity": "sha512-DIGXL2+gvDaXlaq8xruNXUJdT5tF+SBbJQKbWy/0J7OhU8gOHOzKmGIlfTTl6nHaCOoipxQbuJi7O++ldrxgMw==",
             "cpu": [
                 "loong64"
             ],
@@ -616,9 +612,9 @@
             }
         },
         "node_modules/@esbuild/linux-mips64el": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.8.tgz",
-            "integrity": "sha512-uv+dqfRazte3BzfMp8PAQXmdGHQt2oC/y2ovwpTteqrMx2lwaksiFZ/bdkXJC19ttTvNXBuWH53zy/aTj1FgGw==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.11.tgz",
+            "integrity": "sha512-Osx1nALUJu4pU43o9OyjSCXokFkFbyzjXb6VhGIJZQ5JZi8ylCQ9/LFagolPsHtgw6himDSyb5ETSfmp4rpiKQ==",
             "cpu": [
                 "mips64el"
             ],
@@ -633,9 +629,9 @@
             }
         },
         "node_modules/@esbuild/linux-ppc64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.8.tgz",
-            "integrity": "sha512-GyG0KcMi1GBavP5JgAkkstMGyMholMDybAf8wF5A70CALlDM2p/f7YFE7H92eDeH/VBtFJA5MT4nRPDGg4JuzQ==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.11.tgz",
+            "integrity": "sha512-nbLFgsQQEsBa8XSgSTSlrnBSrpoWh7ioFDUmwo158gIm5NNP+17IYmNWzaIzWmgCxq56vfr34xGkOcZ7jX6CPw==",
             "cpu": [
                 "ppc64"
             ],
@@ -650,9 +646,9 @@
             }
         },
         "node_modules/@esbuild/linux-riscv64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.8.tgz",
-            "integrity": "sha512-rAqDYFv3yzMrq7GIcen3XP7TUEG/4LK86LUPMIz6RT8A6pRIDn0sDcvjudVZBiiTcZCY9y2SgYX2lgK3AF+1eg==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.11.tgz",
+            "integrity": "sha512-HfyAmqZi9uBAbgKYP1yGuI7tSREXwIb438q0nqvlpxAOs3XnZ8RsisRfmVsgV486NdjD7Mw2UrFSw51lzUk1ww==",
             "cpu": [
                 "riscv64"
             ],
@@ -667,9 +663,9 @@
             }
         },
         "node_modules/@esbuild/linux-s390x": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.8.tgz",
-            "integrity": "sha512-Xutvh6VjlbcHpsIIbwY8GVRbwoviWT19tFhgdA7DlenLGC/mbc3lBoVb7jxj9Z+eyGqvcnSyIltYUrkKzWqSvg==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.11.tgz",
+            "integrity": "sha512-HjLqVgSSYnVXRisyfmzsH6mXqyvj0SA7pG5g+9W7ESgwA70AXYNpfKBqh1KbTxmQVaYxpzA/SvlB9oclGPbApw==",
             "cpu": [
                 "s390x"
             ],
@@ -684,9 +680,9 @@
             }
         },
         "node_modules/@esbuild/linux-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.8.tgz",
-            "integrity": "sha512-ASFQhgY4ElXh3nDcOMTkQero4b1lgubskNlhIfJrsH5OKZXDpUAKBlNS0Kx81jwOBp+HCeZqmoJuihTv57/jvQ==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.11.tgz",
+            "integrity": "sha512-HSFAT4+WYjIhrHxKBwGmOOSpphjYkcswF449j6EjsjbinTZbp8PJtjsVK1XFJStdzXdy/jaddAep2FGY+wyFAQ==",
             "cpu": [
                 "x64"
             ],
@@ -701,9 +697,9 @@
             }
         },
         "node_modules/@esbuild/netbsd-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.8.tgz",
-            "integrity": "sha512-d1KfruIeohqAi6SA+gENMuObDbEjn22olAR7egqnkCD9DGBG0wsEARotkLgXDu6c4ncgWTZJtN5vcgxzWRMzcw==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.11.tgz",
+            "integrity": "sha512-hr9Oxj1Fa4r04dNpWr3P8QKVVsjQhqrMSUzZzf+LZcYjZNqhA3IAfPQdEh1FLVUJSiu6sgAwp3OmwBfbFgG2Xg==",
             "cpu": [
                 "arm64"
             ],
@@ -718,9 +714,9 @@
             }
         },
         "node_modules/@esbuild/netbsd-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.8.tgz",
-            "integrity": "sha512-nVDCkrvx2ua+XQNyfrujIG38+YGyuy2Ru9kKVNyh5jAys6n+l44tTtToqHjino2My8VAY6Lw9H7RI73XFi66Cg==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.11.tgz",
+            "integrity": "sha512-u7tKA+qbzBydyj0vgpu+5h5AeudxOAGncb8N6C9Kh1N4n7wU1Xw1JDApsRjpShRpXRQlJLb9wY28ELpwdPcZ7A==",
             "cpu": [
                 "x64"
             ],
@@ -735,9 +731,9 @@
             }
         },
         "node_modules/@esbuild/openbsd-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.8.tgz",
-            "integrity": "sha512-j8HgrDuSJFAujkivSMSfPQSAa5Fxbvk4rgNAS5i3K+r8s1X0p1uOO2Hl2xNsGFppOeHOLAVgYwDVlmxhq5h+SQ==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.11.tgz",
+            "integrity": "sha512-Qq6YHhayieor3DxFOoYM1q0q1uMFYb7cSpLD2qzDSvK1NAvqFi8Xgivv0cFC6J+hWVw2teCYltyy9/m/14ryHg==",
             "cpu": [
                 "arm64"
             ],
@@ -752,9 +748,9 @@
             }
         },
         "node_modules/@esbuild/openbsd-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.8.tgz",
-            "integrity": "sha512-1h8MUAwa0VhNCDp6Af0HToI2TJFAn1uqT9Al6DJVzdIBAd21m/G0Yfc77KDM3uF3T/YaOgQq3qTJHPbTOInaIQ==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.11.tgz",
+            "integrity": "sha512-CN+7c++kkbrckTOz5hrehxWN7uIhFFlmS/hqziSFVWpAzpWrQoAG4chH+nN3Be+Kzv/uuo7zhX716x3Sn2Jduw==",
             "cpu": [
                 "x64"
             ],
@@ -769,9 +765,9 @@
             }
         },
         "node_modules/@esbuild/openharmony-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.8.tgz",
-            "integrity": "sha512-r2nVa5SIK9tSWd0kJd9HCffnDHKchTGikb//9c7HX+r+wHYCpQrSgxhlY6KWV1nFo1l4KFbsMlHk+L6fekLsUg==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.11.tgz",
+            "integrity": "sha512-rOREuNIQgaiR+9QuNkbkxubbp8MSO9rONmwP5nKncnWJ9v5jQ4JxFnLu4zDSRPf3x4u+2VN4pM4RdyIzDty/wQ==",
             "cpu": [
                 "arm64"
             ],
@@ -786,9 +782,9 @@
             }
         },
         "node_modules/@esbuild/sunos-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.8.tgz",
-            "integrity": "sha512-zUlaP2S12YhQ2UzUfcCuMDHQFJyKABkAjvO5YSndMiIkMimPmxA+BYSBikWgsRpvyxuRnow4nS5NPnf9fpv41w==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.11.tgz",
+            "integrity": "sha512-nq2xdYaWxyg9DcIyXkZhcYulC6pQ2FuCgem3LI92IwMgIZ69KHeY8T4Y88pcwoLIjbed8n36CyKoYRDygNSGhA==",
             "cpu": [
                 "x64"
             ],
@@ -803,9 +799,9 @@
             }
         },
         "node_modules/@esbuild/win32-arm64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.8.tgz",
-            "integrity": "sha512-YEGFFWESlPva8hGL+zvj2z/SaK+pH0SwOM0Nc/d+rVnW7GSTFlLBGzZkuSU9kFIGIo8q9X3ucpZhu8PDN5A2sQ==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.11.tgz",
+            "integrity": "sha512-3XxECOWJq1qMZ3MN8srCJ/QfoLpL+VaxD/WfNRm1O3B4+AZ/BnLVgFbUV3eiRYDMXetciH16dwPbbHqwe1uU0Q==",
             "cpu": [
                 "arm64"
             ],
@@ -820,9 +816,9 @@
             }
         },
         "node_modules/@esbuild/win32-ia32": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.8.tgz",
-            "integrity": "sha512-hiGgGC6KZ5LZz58OL/+qVVoZiuZlUYlYHNAmczOm7bs2oE1XriPFi5ZHHrS8ACpV5EjySrnoCKmcbQMN+ojnHg==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.11.tgz",
+            "integrity": "sha512-3ukss6gb9XZ8TlRyJlgLn17ecsK4NSQTmdIXRASVsiS2sQ6zPPZklNJT5GR5tE/MUarymmy8kCEf5xPCNCqVOA==",
             "cpu": [
                 "ia32"
             ],
@@ -837,9 +833,9 @@
             }
         },
         "node_modules/@esbuild/win32-x64": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.8.tgz",
-            "integrity": "sha512-cn3Yr7+OaaZq1c+2pe+8yxC8E144SReCQjN6/2ynubzYjvyqZjTXfQJpAcQpsdJq3My7XADANiYGHoFC69pLQw==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.11.tgz",
+            "integrity": "sha512-D7Hpz6A2L4hzsRpPaCYkQnGOotdUpDzSGRIv9I+1ITdHROSFUWW95ZPZWQmGka1Fg7W3zFJowyn9WGwMJ0+KPA==",
             "cpu": [
                 "x64"
             ],
@@ -854,9 +850,9 @@
             }
         },
         "node_modules/@eslint-community/eslint-utils": {
-            "version": "4.7.0",
-            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.7.0.tgz",
-            "integrity": "sha512-dyybb3AcajC7uha6CvhdVRJqaKyn7w2YKqKyAN37NKYgZT36w+iRb0Dymmc5qEJ549c/S31cMMSFd75bteCpCw==",
+            "version": "4.9.0",
+            "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz",
+            "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -886,9 +882,9 @@
             }
         },
         "node_modules/@eslint-community/regexpp": {
-            "version": "4.12.1",
-            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
-            "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+            "version": "4.12.2",
+            "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz",
+            "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -896,13 +892,13 @@
             }
         },
         "node_modules/@eslint/config-array": {
-            "version": "0.21.0",
-            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.0.tgz",
-            "integrity": "sha512-ENIdc4iLu0d93HeYirvKmrzshzofPw6VkZRKQGe9Nv46ZnWUzcF1xV01dcvEg/1wXUR61OmmlSfyeyO7EvjLxQ==",
+            "version": "0.21.1",
+            "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz",
+            "integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@eslint/object-schema": "^2.1.6",
+                "@eslint/object-schema": "^2.1.7",
                 "debug": "^4.3.1",
                 "minimatch": "^3.1.2"
             },
@@ -911,19 +907,35 @@
             }
         },
         "node_modules/@eslint/config-helpers": {
-            "version": "0.3.1",
-            "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.3.1.tgz",
-            "integrity": "sha512-xR93k9WhrDYpXHORXpxVL5oHj3Era7wo6k/Wd8/IsQNnZUTzkGS29lyn3nAT05v6ltUuTFVCCYDEGfy2Or/sPA==",
+            "version": "0.4.2",
+            "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz",
+            "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==",
             "dev": true,
             "license": "Apache-2.0",
+            "dependencies": {
+                "@eslint/core": "^0.17.0"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
+        "node_modules/@eslint/config-helpers/node_modules/@eslint/core": {
+            "version": "0.17.0",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz",
+            "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@types/json-schema": "^7.0.15"
+            },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             }
         },
         "node_modules/@eslint/core": {
-            "version": "0.15.2",
-            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.15.2.tgz",
-            "integrity": "sha512-78Md3/Rrxh83gCxoUc0EiciuOHsIITzLy53m3d9UyiW8y9Dj2D29FeETqyKA+BRK76tnTp6RXWb3pCay8Oyomg==",
+            "version": "0.16.0",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.16.0.tgz",
+            "integrity": "sha512-nmC8/totwobIiFcGkDza3GIKfAw1+hLiYVrh3I1nIomQ8PEr5cxg34jnkmGawul/ep52wGRAcyeDCNtWKSOj4Q==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
@@ -971,9 +983,9 @@
             }
         },
         "node_modules/@eslint/js": {
-            "version": "9.33.0",
-            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.33.0.tgz",
-            "integrity": "sha512-5K1/mKhWaMfreBGJTwval43JJmkip0RmM+3+IuqupeSKNC/Th2Kc7ucaq5ovTSra/OOKB9c58CGSz3QMVbWt0A==",
+            "version": "9.38.0",
+            "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.38.0.tgz",
+            "integrity": "sha512-UZ1VpFvXf9J06YG9xQBdnzU+kthors6KjhMAl6f4gH4usHyh31rUf2DLGInT8RFYIReYXNSydgPY0V2LuWgl7A==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -984,9 +996,9 @@
             }
         },
         "node_modules/@eslint/object-schema": {
-            "version": "2.1.6",
-            "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
-            "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
+            "version": "2.1.7",
+            "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz",
+            "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==",
             "dev": true,
             "license": "Apache-2.0",
             "engines": {
@@ -994,19 +1006,32 @@
             }
         },
         "node_modules/@eslint/plugin-kit": {
-            "version": "0.3.5",
-            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.3.5.tgz",
-            "integrity": "sha512-Z5kJ+wU3oA7MMIqVR9tyZRtjYPr4OC004Q4Rw7pgOKUOKkJfZ3O24nz3WYfGRpMDNmcOi3TwQOmgm7B7Tpii0w==",
+            "version": "0.4.1",
+            "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz",
+            "integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
-                "@eslint/core": "^0.15.2",
+                "@eslint/core": "^0.17.0",
                 "levn": "^0.4.1"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
             }
         },
+        "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
+            "version": "0.17.0",
+            "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz",
+            "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==",
+            "dev": true,
+            "license": "Apache-2.0",
+            "dependencies": {
+                "@types/json-schema": "^7.0.15"
+            },
+            "engines": {
+                "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+            }
+        },
         "node_modules/@exodus/schemasafe": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/@exodus/schemasafe/-/schemasafe-1.3.0.tgz",
@@ -1024,9 +1049,9 @@
             }
         },
         "node_modules/@floating-ui/dom": {
-            "version": "1.7.3",
-            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.3.tgz",
-            "integrity": "sha512-uZA413QEpNuhtb3/iIKoYMSK07keHPYeXF02Zhd6e213j+d1NamLix/mCLxBUDW/Gx52sPH2m+chlUsyaBs/Ag==",
+            "version": "1.7.4",
+            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.4.tgz",
+            "integrity": "sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==",
             "license": "MIT",
             "dependencies": {
                 "@floating-ui/core": "^1.7.3",
@@ -1034,12 +1059,12 @@
             }
         },
         "node_modules/@floating-ui/react-dom": {
-            "version": "2.1.5",
-            "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.5.tgz",
-            "integrity": "sha512-HDO/1/1oH9fjj4eLgegrlH3dklZpHtUYYFiVwMUwfGvk9jWDRWqkklA2/NFScknrcNSspbV868WjXORvreDX+Q==",
+            "version": "2.1.6",
+            "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.6.tgz",
+            "integrity": "sha512-4JX6rEatQEvlmgU80wZyq9RT96HZJa88q8hp0pBd+LrczeDI4o6uA2M+uvxngVHo4Ihr8uibXxH6+70zhAFrVw==",
             "license": "MIT",
             "dependencies": {
-                "@floating-ui/dom": "^1.7.3"
+                "@floating-ui/dom": "^1.7.4"
             },
             "peerDependencies": {
                 "react": ">=16.8.0",
@@ -1053,12 +1078,15 @@
             "license": "MIT"
         },
         "node_modules/@hookform/resolvers": {
-            "version": "3.10.0",
-            "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-3.10.0.tgz",
-            "integrity": "sha512-79Dv+3mDF7i+2ajj7SkypSKHhl1cbln1OGavqrsF7p6mbUv11xpqpacPsGDCTRvCSjEEIez2ef1NveSVL3b0Ag==",
+            "version": "5.2.2",
+            "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-5.2.2.tgz",
+            "integrity": "sha512-A/IxlMLShx3KjV/HeTcTfaMxdwy690+L/ZADoeaTltLx+CVuzkeVIPuybK3jrRfw7YZnmdKsVVHAlEPIAEUNlA==",
             "license": "MIT",
+            "dependencies": {
+                "@standard-schema/utils": "^0.3.0"
+            },
             "peerDependencies": {
-                "react-hook-form": "^7.0.0"
+                "react-hook-form": "^7.55.0"
             }
         },
         "node_modules/@humanfs/core": {
@@ -1072,33 +1100,19 @@
             }
         },
         "node_modules/@humanfs/node": {
-            "version": "0.16.6",
-            "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
-            "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
+            "version": "0.16.7",
+            "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
+            "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
             "dev": true,
             "license": "Apache-2.0",
             "dependencies": {
                 "@humanfs/core": "^0.19.1",
-                "@humanwhocodes/retry": "^0.3.0"
+                "@humanwhocodes/retry": "^0.4.0"
             },
             "engines": {
                 "node": ">=18.18.0"
             }
         },
-        "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
-            "version": "0.3.1",
-            "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
-            "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "engines": {
-                "node": ">=18.18"
-            },
-            "funding": {
-                "type": "github",
-                "url": "https://github.com/sponsors/nzakas"
-            }
-        },
         "node_modules/@humanwhocodes/module-importer": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
@@ -1127,33 +1141,26 @@
                 "url": "https://github.com/sponsors/nzakas"
             }
         },
-        "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/@jridgewell/gen-mapping": {
-            "version": "0.3.12",
-            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.12.tgz",
-            "integrity": "sha512-OuLGC46TjB5BbN1dH8JULVVZY4WTdkF7tV9Ys6wLL1rubZnCMstOhNHueU5bLCrnRuDhKPDM4g6sw4Bel5Gzqg==",
+            "version": "0.3.13",
+            "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+            "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
             "license": "MIT",
             "dependencies": {
                 "@jridgewell/sourcemap-codec": "^1.5.0",
                 "@jridgewell/trace-mapping": "^0.3.24"
             }
         },
+        "node_modules/@jridgewell/remapping": {
+            "version": "2.3.5",
+            "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz",
+            "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==",
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/gen-mapping": "^0.3.5",
+                "@jridgewell/trace-mapping": "^0.3.24"
+            }
+        },
         "node_modules/@jridgewell/resolve-uri": {
             "version": "3.1.2",
             "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
@@ -1164,15 +1171,15 @@
             }
         },
         "node_modules/@jridgewell/sourcemap-codec": {
-            "version": "1.5.4",
-            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.4.tgz",
-            "integrity": "sha512-VT2+G1VQs/9oz078bLrYbecdZKs912zQlkelYpuf+SXF+QvZDYJlbx/LSx+meSAwdDFnF8FVXW92AVjjkVmgFw==",
+            "version": "1.5.5",
+            "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+            "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
             "license": "MIT"
         },
         "node_modules/@jridgewell/trace-mapping": {
-            "version": "0.3.29",
-            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.29.tgz",
-            "integrity": "sha512-uw6guiW/gcAGPDhLmd77/6lW8QLeiV5RUTsAX46Db6oLhGaVj4lhnPwb184s1bkc8kdVg/+h988dro8GRDpmYQ==",
+            "version": "0.3.31",
+            "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+            "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
             "license": "MIT",
             "dependencies": {
                 "@jridgewell/resolve-uri": "^3.1.0",
@@ -1183,6 +1190,7 @@
             "version": "2.1.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
             "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@nodelib/fs.stat": "2.0.5",
@@ -1196,6 +1204,7 @@
             "version": "2.0.5",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
             "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 8"
@@ -1205,6 +1214,7 @@
             "version": "1.2.8",
             "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
             "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@nodelib/fs.scandir": "2.1.5",
@@ -1214,16 +1224,6 @@
                 "node": ">= 8"
             }
         },
-        "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/@radix-ui/number": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.1.tgz",
@@ -1231,21 +1231,21 @@
             "license": "MIT"
         },
         "node_modules/@radix-ui/primitive": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.2.tgz",
-            "integrity": "sha512-XnbHrrprsNqZKQhStrSwgRUQzoCI1glLzdw79xiZPoofhGICeZRSQ3dIxAKH1gb3OHfNf4d6f+vAv3kil2eggA==",
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.3.tgz",
+            "integrity": "sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==",
             "license": "MIT"
         },
         "node_modules/@radix-ui/react-alert-dialog": {
-            "version": "1.1.14",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.14.tgz",
-            "integrity": "sha512-IOZfZ3nPvN6lXpJTBCunFQPRSvK8MDgSc1FB85xnIpUKOw9en0dJj8JmCAxV7BiZdtYlUpmrQjoTFkVYtdoWzQ==",
+            "version": "1.1.15",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.15.tgz",
+            "integrity": "sha512-oTVLkEw5GpdRe29BqJ0LSDFWI3qu0vR1M0mUkOQWDIUnY/QIkLpgDMWuKxP94c2NAC2LGcgVhG1ImF3jkZ5wXw==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
-                "@radix-ui/react-dialog": "1.1.14",
+                "@radix-ui/react-dialog": "1.1.15",
                 "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-slot": "1.2.3"
             },
@@ -1315,15 +1315,15 @@
             }
         },
         "node_modules/@radix-ui/react-checkbox": {
-            "version": "1.3.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.3.2.tgz",
-            "integrity": "sha512-yd+dI56KZqawxKZrJ31eENUwqc1QSqg4OZ15rybGjF2ZNwMO+wCyHzAVLRp9qoYJf7kYy0YpZ2b0JCzJ42HZpA==",
+            "version": "1.3.3",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.3.3.tgz",
+            "integrity": "sha512-wBbpv+NQftHDdG86Qc0pIyXk5IR3tM8Vd0nWLKDcX8nNn4nXFOFwsKuqw2okA/1D/mpaAkmuyndrPJTYDNZtFw==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
-                "@radix-ui/react-presence": "1.1.4",
+                "@radix-ui/react-presence": "1.1.5",
                 "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-use-controllable-state": "1.2.2",
                 "@radix-ui/react-use-previous": "1.1.1",
@@ -1401,20 +1401,20 @@
             }
         },
         "node_modules/@radix-ui/react-dialog": {
-            "version": "1.1.14",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.14.tgz",
-            "integrity": "sha512-+CpweKjqpzTmwRwcYECQcNYbI8V9VSQt0SNFKeEBLgfucbsLssU6Ppq7wUdNXEGb573bMjFhVjKVll8rmV6zMw==",
+            "version": "1.1.15",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.15.tgz",
+            "integrity": "sha512-TCglVRtzlffRNxRMEyR36DGBLJpeusFcgMVD9PZEzAKnUs1lKCgX5u9BmC2Yg+LL9MgZDugFFs1Vl+Jp4t/PGw==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
-                "@radix-ui/react-dismissable-layer": "1.1.10",
-                "@radix-ui/react-focus-guards": "1.1.2",
+                "@radix-ui/react-dismissable-layer": "1.1.11",
+                "@radix-ui/react-focus-guards": "1.1.3",
                 "@radix-ui/react-focus-scope": "1.1.7",
                 "@radix-ui/react-id": "1.1.1",
                 "@radix-ui/react-portal": "1.1.9",
-                "@radix-ui/react-presence": "1.1.4",
+                "@radix-ui/react-presence": "1.1.5",
                 "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-slot": "1.2.3",
                 "@radix-ui/react-use-controllable-state": "1.2.2",
@@ -1452,12 +1452,12 @@
             }
         },
         "node_modules/@radix-ui/react-dismissable-layer": {
-            "version": "1.1.10",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.10.tgz",
-            "integrity": "sha512-IM1zzRV4W3HtVgftdQiiOmA0AdJlCtMLe00FXaHwgt3rAnNsIyDqshvkIW3hj/iu5hu8ERP7KIYki6NkqDxAwQ==",
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.11.tgz",
+            "integrity": "sha512-Nqcp+t5cTB8BinFkZgXiMJniQH0PsUt2k51FUhbdfeKvc4ACcG2uQniY/8+h1Yv6Kza4Q7lD7PQV0z0oicE0Mg==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-use-callback-ref": "1.1.1",
@@ -1479,16 +1479,16 @@
             }
         },
         "node_modules/@radix-ui/react-dropdown-menu": {
-            "version": "2.1.15",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.15.tgz",
-            "integrity": "sha512-mIBnOjgwo9AH3FyKaSWoSu/dYj6VdhJ7frEPiGTeXCdUFHjl9h3mFh2wwhEtINOmYXWhdpf1rY2minFsmaNgVQ==",
+            "version": "2.1.16",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.16.tgz",
+            "integrity": "sha512-1PLGQEynI/3OX/ftV54COn+3Sud/Mn8vALg2rWnBLnRaGtJDduNW/22XjlGgPdpcIbiQxjKtb7BkcjP00nqfJw==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
                 "@radix-ui/react-id": "1.1.1",
-                "@radix-ui/react-menu": "2.1.15",
+                "@radix-ui/react-menu": "2.1.16",
                 "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-use-controllable-state": "1.2.2"
             },
@@ -1508,9 +1508,9 @@
             }
         },
         "node_modules/@radix-ui/react-focus-guards": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.2.tgz",
-            "integrity": "sha512-fyjAACV62oPV925xFCrH8DR5xWhg9KYtJT4s3u54jxp+L/hbpTY2kIeEFFbFe+a/HCE94zGQMZLIpVTPVZDhaA==",
+            "version": "1.1.3",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.3.tgz",
+            "integrity": "sha512-0rFg/Rj2Q62NCm62jZw0QX7a3sz6QCQU0LpZdNrJX8byRGaGVTqbrW9jAoIAHyMQqsNpeZ81YgSizOt5WXq0Pw==",
             "license": "MIT",
             "peerDependencies": {
                 "@types/react": "*",
@@ -1589,25 +1589,25 @@
             }
         },
         "node_modules/@radix-ui/react-menu": {
-            "version": "2.1.15",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.15.tgz",
-            "integrity": "sha512-tVlmA3Vb9n8SZSd+YSbuFR66l87Wiy4du+YE+0hzKQEANA+7cWKH1WgqcEX4pXqxUFQKrWQGHdvEfw00TjFiew==",
+            "version": "2.1.16",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.16.tgz",
+            "integrity": "sha512-72F2T+PLlphrqLcAotYPp0uJMr5SjP5SL01wfEspJbru5Zs5vQaSHb4VB3ZMJPimgHHCHG7gMOeOB9H3Hdmtxg==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@radix-ui/react-collection": "1.1.7",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
                 "@radix-ui/react-direction": "1.1.1",
-                "@radix-ui/react-dismissable-layer": "1.1.10",
-                "@radix-ui/react-focus-guards": "1.1.2",
+                "@radix-ui/react-dismissable-layer": "1.1.11",
+                "@radix-ui/react-focus-guards": "1.1.3",
                 "@radix-ui/react-focus-scope": "1.1.7",
                 "@radix-ui/react-id": "1.1.1",
-                "@radix-ui/react-popper": "1.2.7",
+                "@radix-ui/react-popper": "1.2.8",
                 "@radix-ui/react-portal": "1.1.9",
-                "@radix-ui/react-presence": "1.1.4",
+                "@radix-ui/react-presence": "1.1.5",
                 "@radix-ui/react-primitive": "2.1.3",
-                "@radix-ui/react-roving-focus": "1.1.10",
+                "@radix-ui/react-roving-focus": "1.1.11",
                 "@radix-ui/react-slot": "1.2.3",
                 "@radix-ui/react-use-callback-ref": "1.1.1",
                 "aria-hidden": "^1.2.4",
@@ -1629,19 +1629,19 @@
             }
         },
         "node_modules/@radix-ui/react-navigation-menu": {
-            "version": "1.2.13",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.13.tgz",
-            "integrity": "sha512-WG8wWfDiJlSF5hELjwfjSGOXcBR/ZMhBFCGYe8vERpC39CQYZeq1PQ2kaYHdye3V95d06H89KGMsVCIE4LWo3g==",
+            "version": "1.2.14",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.14.tgz",
+            "integrity": "sha512-YB9mTFQvCOAQMHU+C/jVl96WmuWeltyUEpRJJky51huhds5W2FQr1J8D/16sQlf0ozxkPK8uF3niQMdUwZPv5w==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@radix-ui/react-collection": "1.1.7",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
                 "@radix-ui/react-direction": "1.1.1",
-                "@radix-ui/react-dismissable-layer": "1.1.10",
+                "@radix-ui/react-dismissable-layer": "1.1.11",
                 "@radix-ui/react-id": "1.1.1",
-                "@radix-ui/react-presence": "1.1.4",
+                "@radix-ui/react-presence": "1.1.5",
                 "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-use-callback-ref": "1.1.1",
                 "@radix-ui/react-use-controllable-state": "1.2.2",
@@ -1665,21 +1665,21 @@
             }
         },
         "node_modules/@radix-ui/react-popover": {
-            "version": "1.1.14",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.14.tgz",
-            "integrity": "sha512-ODz16+1iIbGUfFEfKx2HTPKizg2MN39uIOV8MXeHnmdd3i/N9Wt7vU46wbHsqA0xoaQyXVcs0KIlBdOA2Y95bw==",
+            "version": "1.1.15",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.15.tgz",
+            "integrity": "sha512-kr0X2+6Yy/vJzLYJUPCZEc8SfQcf+1COFoAqauJm74umQhta9M7lNJHP7QQS3vkvcGLQUbWpMzwrXYwrYztHKA==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
-                "@radix-ui/react-dismissable-layer": "1.1.10",
-                "@radix-ui/react-focus-guards": "1.1.2",
+                "@radix-ui/react-dismissable-layer": "1.1.11",
+                "@radix-ui/react-focus-guards": "1.1.3",
                 "@radix-ui/react-focus-scope": "1.1.7",
                 "@radix-ui/react-id": "1.1.1",
-                "@radix-ui/react-popper": "1.2.7",
+                "@radix-ui/react-popper": "1.2.8",
                 "@radix-ui/react-portal": "1.1.9",
-                "@radix-ui/react-presence": "1.1.4",
+                "@radix-ui/react-presence": "1.1.5",
                 "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-slot": "1.2.3",
                 "@radix-ui/react-use-controllable-state": "1.2.2",
@@ -1702,9 +1702,9 @@
             }
         },
         "node_modules/@radix-ui/react-popper": {
-            "version": "1.2.7",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.7.tgz",
-            "integrity": "sha512-IUFAccz1JyKcf/RjB552PlWwxjeCJB8/4KxT7EhBHOJM+mN7LdW+B3kacJXILm32xawcMMjb2i0cIZpo+f9kiQ==",
+            "version": "1.2.8",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.8.tgz",
+            "integrity": "sha512-0NJQ4LFFUuWkE7Oxf0htBKS6zLkkjBH+hM1uk7Ng705ReR8m/uelduy1DBo0PyBXPKVnBA6YBlU94MBGXrSBCw==",
             "license": "MIT",
             "dependencies": {
                 "@floating-ui/react-dom": "^2.0.0",
@@ -1758,9 +1758,9 @@
             }
         },
         "node_modules/@radix-ui/react-presence": {
-            "version": "1.1.4",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.4.tgz",
-            "integrity": "sha512-ueDqRbdc4/bkaQT3GIpLQssRlFgWaL/U2z/S31qRwwLWoxHLgry3SIfCwhxeQNbirEUXFa+lq3RL3oBYXtcmIA==",
+            "version": "1.1.5",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.5.tgz",
+            "integrity": "sha512-/jfEwNDdQVBCNvjkGit4h6pMOzq8bHkopq458dPt2lMjx+eBQUohZNG9A7DtO/O5ukSbxuaNGXMjHicgwy6rQQ==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/react-compose-refs": "1.1.2",
@@ -1805,12 +1805,12 @@
             }
         },
         "node_modules/@radix-ui/react-roving-focus": {
-            "version": "1.1.10",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.10.tgz",
-            "integrity": "sha512-dT9aOXUen9JSsxnMPv/0VqySQf5eDQ6LCk5Sw28kamz8wSOW2bJdlX2Bg5VUIIcV+6XlHpWTIuTPCf/UNIyq8Q==",
+            "version": "1.1.11",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.11.tgz",
+            "integrity": "sha512-7A6S9jSgm/S+7MdtNDSb+IU859vQqJ/QAtcYQcfFC6W8RS4IxIZDldLR0xqCFZ6DCyrQLjLPsxtTNch5jVA4lA==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@radix-ui/react-collection": "1.1.7",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
@@ -1836,17 +1836,17 @@
             }
         },
         "node_modules/@radix-ui/react-scroll-area": {
-            "version": "1.2.9",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.9.tgz",
-            "integrity": "sha512-YSjEfBXnhUELsO2VzjdtYYD4CfQjvao+lhhrX5XsHD7/cyUNzljF1FHEbgTPN7LH2MClfwRMIsYlqTYpKTTe2A==",
+            "version": "1.2.10",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.10.tgz",
+            "integrity": "sha512-tAXIa1g3sM5CGpVT0uIbUx/U3Gs5N8T52IICuCtObaos1S8fzsrPXG5WObkQN3S6NVl6wKgPhAIiBGbWnvc97A==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/number": "1.1.1",
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
                 "@radix-ui/react-direction": "1.1.1",
-                "@radix-ui/react-presence": "1.1.4",
+                "@radix-ui/react-presence": "1.1.5",
                 "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-use-callback-ref": "1.1.1",
                 "@radix-ui/react-use-layout-effect": "1.1.1"
@@ -1867,22 +1867,22 @@
             }
         },
         "node_modules/@radix-ui/react-select": {
-            "version": "2.2.5",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.2.5.tgz",
-            "integrity": "sha512-HnMTdXEVuuyzx63ME0ut4+sEMYW6oouHWNGUZc7ddvUWIcfCva/AMoqEW/3wnEllriMWBa0RHspCYnfCWJQYmA==",
+            "version": "2.2.6",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.2.6.tgz",
+            "integrity": "sha512-I30RydO+bnn2PQztvo25tswPH+wFBjehVGtmagkU78yMdwTwVf12wnAOF+AeP8S2N8xD+5UPbGhkUfPyvT+mwQ==",
             "license": "MIT",
             "dependencies": {
                 "@radix-ui/number": "1.1.1",
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
                 "@radix-ui/react-collection": "1.1.7",
                 "@radix-ui/react-compose-refs": "1.1.2",
                 "@radix-ui/react-context": "1.1.2",
                 "@radix-ui/react-direction": "1.1.1",
-                "@radix-ui/react-dismissable-layer": "1.1.10",
-                "@radix-ui/react-focus-guards": "1.1.2",
+                "@radix-ui/react-dismissable-layer": "1.1.11",
+                "@radix-ui/react-focus-guards": "1.1.3",
                 "@radix-ui/react-focus-scope": "1.1.7",
                 "@radix-ui/react-id": "1.1.1",
-                "@radix-ui/react-popper": "1.2.7",
+                "@radix-ui/react-popper": "1.2.8",
                 "@radix-ui/react-portal": "1.1.9",
                 "@radix-ui/react-primitive": "2.1.3",
                 "@radix-ui/react-slot": "1.2.3",
@@ -1950,19 +1950,48 @@
                 }
             }
         },
-        "node_modules/@radix-ui/react-tabs": {
-            "version": "1.1.12",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.12.tgz",
-            "integrity": "sha512-GTVAlRVrQrSw3cEARM0nAx73ixrWDPNZAruETn3oHCNP6SbZ/hNxdxp+u7VkIEv3/sFoLq1PfcHrl7Pnp0CDpw==",
+        "node_modules/@radix-ui/react-switch": {
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.2.6.tgz",
+            "integrity": "sha512-bByzr1+ep1zk4VubeEVViV592vu2lHE2BZY5OnzehZqOOgogN80+mNtCqPkhn2gklJqOpxWgPoYTSnhBCqpOXQ==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.2",
+                "@radix-ui/primitive": "1.1.3",
+                "@radix-ui/react-compose-refs": "1.1.2",
+                "@radix-ui/react-context": "1.1.2",
+                "@radix-ui/react-primitive": "2.1.3",
+                "@radix-ui/react-use-controllable-state": "1.2.2",
+                "@radix-ui/react-use-previous": "1.1.1",
+                "@radix-ui/react-use-size": "1.1.1"
+            },
+            "peerDependencies": {
+                "@types/react": "*",
+                "@types/react-dom": "*",
+                "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+                "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+            },
+            "peerDependenciesMeta": {
+                "@types/react": {
+                    "optional": true
+                },
+                "@types/react-dom": {
+                    "optional": true
+                }
+            }
+        },
+        "node_modules/@radix-ui/react-tabs": {
+            "version": "1.1.13",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.13.tgz",
+            "integrity": "sha512-7xdcatg7/U+7+Udyoj2zodtI9H/IIopqo+YOIcZOq1nJwXWBZ9p8xiu5llXlekDbZkca79a/fozEYQXIA4sW6A==",
+            "license": "MIT",
+            "dependencies": {
+                "@radix-ui/primitive": "1.1.3",
                 "@radix-ui/react-context": "1.1.2",
                 "@radix-ui/react-direction": "1.1.1",
                 "@radix-ui/react-id": "1.1.1",
-                "@radix-ui/react-presence": "1.1.4",
+                "@radix-ui/react-presence": "1.1.5",
                 "@radix-ui/react-primitive": "2.1.3",
-                "@radix-ui/react-roving-focus": "1.1.10",
+                "@radix-ui/react-roving-focus": "1.1.11",
                 "@radix-ui/react-use-controllable-state": "1.2.2"
             },
             "peerDependencies": {
@@ -2164,16 +2193,16 @@
             "license": "MIT"
         },
         "node_modules/@rolldown/pluginutils": {
-            "version": "1.0.0-beta.27",
-            "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.27.tgz",
-            "integrity": "sha512-+d0F4MKMCbeVUJwG96uQ4SgAznZNSq93I3V+9NHA4OpvqG8mRCpGdKmK8l/dl02h2CCDHwW2FqilnTyDcAnqjA==",
+            "version": "1.0.0-beta.43",
+            "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-beta.43.tgz",
+            "integrity": "sha512-5Uxg7fQUCmfhax7FJke2+8B6cqgeUJUD9o2uXIKXhD+mG0mL6NObmVoi9wXEU1tY89mZKgAYA6fTbftx3q2ZPQ==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/@rollup/rollup-android-arm-eabi": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.46.2.tgz",
-            "integrity": "sha512-Zj3Hl6sN34xJtMv7Anwb5Gu01yujyE/cLBDB2gnHTAHaWS1Z38L7kuSG+oAh0giZMqG060f/YBStXtMH6FvPMA==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.5.tgz",
+            "integrity": "sha512-8c1vW4ocv3UOMp9K+gToY5zL2XiiVw3k7f1ksf4yO1FlDFQ1C2u72iACFnSOceJFsWskc2WZNqeRhFRPzv+wtQ==",
             "cpu": [
                 "arm"
             ],
@@ -2185,9 +2214,9 @@
             ]
         },
         "node_modules/@rollup/rollup-android-arm64": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.46.2.tgz",
-            "integrity": "sha512-nTeCWY83kN64oQ5MGz3CgtPx8NSOhC5lWtsjTs+8JAJNLcP3QbLCtDDgUKQc/Ro/frpMq4SHUaHN6AMltcEoLQ==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.5.tgz",
+            "integrity": "sha512-mQGfsIEFcu21mvqkEKKu2dYmtuSZOBMmAl5CFlPGLY94Vlcm+zWApK7F/eocsNzp8tKmbeBP8yXyAbx0XHsFNA==",
             "cpu": [
                 "arm64"
             ],
@@ -2199,9 +2228,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-arm64": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.46.2.tgz",
-            "integrity": "sha512-HV7bW2Fb/F5KPdM/9bApunQh68YVDU8sO8BvcW9OngQVN3HHHkw99wFupuUJfGR9pYLLAjcAOA6iO+evsbBaPQ==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.5.tgz",
+            "integrity": "sha512-takF3CR71mCAGA+v794QUZ0b6ZSrgJkArC+gUiG6LB6TQty9T0Mqh3m2ImRBOxS2IeYBo4lKWIieSvnEk2OQWA==",
             "cpu": [
                 "arm64"
             ],
@@ -2213,9 +2242,9 @@
             ]
         },
         "node_modules/@rollup/rollup-darwin-x64": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.46.2.tgz",
-            "integrity": "sha512-SSj8TlYV5nJixSsm/y3QXfhspSiLYP11zpfwp6G/YDXctf3Xkdnk4woJIF5VQe0of2OjzTt8EsxnJDCdHd2xMA==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.5.tgz",
+            "integrity": "sha512-W901Pla8Ya95WpxDn//VF9K9u2JbocwV/v75TE0YIHNTbhqUTv9w4VuQ9MaWlNOkkEfFwkdNhXgcLqPSmHy0fA==",
             "cpu": [
                 "x64"
             ],
@@ -2227,9 +2256,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-arm64": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.46.2.tgz",
-            "integrity": "sha512-ZyrsG4TIT9xnOlLsSSi9w/X29tCbK1yegE49RYm3tu3wF1L/B6LVMqnEWyDB26d9Ecx9zrmXCiPmIabVuLmNSg==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.5.tgz",
+            "integrity": "sha512-QofO7i7JycsYOWxe0GFqhLmF6l1TqBswJMvICnRUjqCx8b47MTo46W8AoeQwiokAx3zVryVnxtBMcGcnX12LvA==",
             "cpu": [
                 "arm64"
             ],
@@ -2241,9 +2270,9 @@
             ]
         },
         "node_modules/@rollup/rollup-freebsd-x64": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.46.2.tgz",
-            "integrity": "sha512-pCgHFoOECwVCJ5GFq8+gR8SBKnMO+xe5UEqbemxBpCKYQddRQMgomv1104RnLSg7nNvgKy05sLsY51+OVRyiVw==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.5.tgz",
+            "integrity": "sha512-jr21b/99ew8ujZubPo9skbrItHEIE50WdV86cdSoRkKtmWa+DDr6fu2c/xyRT0F/WazZpam6kk7IHBerSL7LDQ==",
             "cpu": [
                 "x64"
             ],
@@ -2255,9 +2284,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.46.2.tgz",
-            "integrity": "sha512-EtP8aquZ0xQg0ETFcxUbU71MZlHaw9MChwrQzatiE8U/bvi5uv/oChExXC4mWhjiqK7azGJBqU0tt5H123SzVA==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.5.tgz",
+            "integrity": "sha512-PsNAbcyv9CcecAUagQefwX8fQn9LQ4nZkpDboBOttmyffnInRy8R8dSg6hxxl2Re5QhHBf6FYIDhIj5v982ATQ==",
             "cpu": [
                 "arm"
             ],
@@ -2269,9 +2298,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.46.2.tgz",
-            "integrity": "sha512-qO7F7U3u1nfxYRPM8HqFtLd+raev2K137dsV08q/LRKRLEc7RsiDWihUnrINdsWQxPR9jqZ8DIIZ1zJJAm5PjQ==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.5.tgz",
+            "integrity": "sha512-Fw4tysRutyQc/wwkmcyoqFtJhh0u31K+Q6jYjeicsGJJ7bbEq8LwPWV/w0cnzOqR2m694/Af6hpFayLJZkG2VQ==",
             "cpu": [
                 "arm"
             ],
@@ -2283,9 +2312,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-gnu": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.46.2.tgz",
-            "integrity": "sha512-3dRaqLfcOXYsfvw5xMrxAk9Lb1f395gkoBYzSFcc/scgRFptRXL9DOaDpMiehf9CO8ZDRJW2z45b6fpU5nwjng==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.5.tgz",
+            "integrity": "sha512-a+3wVnAYdQClOTlyapKmyI6BLPAFYs0JM8HRpgYZQO02rMR09ZcV9LbQB+NL6sljzG38869YqThrRnfPMCDtZg==",
             "cpu": [
                 "arm64"
             ],
@@ -2297,9 +2326,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-arm64-musl": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.46.2.tgz",
-            "integrity": "sha512-fhHFTutA7SM+IrR6lIfiHskxmpmPTJUXpWIsBXpeEwNgZzZZSg/q4i6FU4J8qOGyJ0TR+wXBwx/L7Ho9z0+uDg==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.5.tgz",
+            "integrity": "sha512-AvttBOMwO9Pcuuf7m9PkC1PUIKsfaAJ4AYhy944qeTJgQOqJYJ9oVl2nYgY7Rk0mkbsuOpCAYSs6wLYB2Xiw0Q==",
             "cpu": [
                 "arm64"
             ],
@@ -2310,10 +2339,10 @@
                 "linux"
             ]
         },
-        "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.46.2.tgz",
-            "integrity": "sha512-i7wfGFXu8x4+FRqPymzjD+Hyav8l95UIZ773j7J7zRYc3Xsxy2wIn4x+llpunexXe6laaO72iEjeeGyUFmjKeA==",
+        "node_modules/@rollup/rollup-linux-loong64-gnu": {
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.5.tgz",
+            "integrity": "sha512-DkDk8pmXQV2wVrF6oq5tONK6UHLz/XcEVow4JTTerdeV1uqPeHxwcg7aFsfnSm9L+OO8WJsWotKM2JJPMWrQtA==",
             "cpu": [
                 "loong64"
             ],
@@ -2325,9 +2354,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-ppc64-gnu": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.46.2.tgz",
-            "integrity": "sha512-B/l0dFcHVUnqcGZWKcWBSV2PF01YUt0Rvlurci5P+neqY/yMKchGU8ullZvIv5e8Y1C6wOn+U03mrDylP5q9Yw==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.5.tgz",
+            "integrity": "sha512-W/b9ZN/U9+hPQVvlGwjzi+Wy4xdoH2I8EjaCkMvzpI7wJUs8sWJ03Rq96jRnHkSrcHTpQe8h5Tg3ZzUPGauvAw==",
             "cpu": [
                 "ppc64"
             ],
@@ -2339,9 +2368,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.46.2.tgz",
-            "integrity": "sha512-32k4ENb5ygtkMwPMucAb8MtV8olkPT03oiTxJbgkJa7lJ7dZMr0GCFJlyvy+K8iq7F/iuOr41ZdUHaOiqyR3iQ==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.5.tgz",
+            "integrity": "sha512-sjQLr9BW7R/ZiXnQiWPkErNfLMkkWIoCz7YMn27HldKsADEKa5WYdobaa1hmN6slu9oWQbB6/jFpJ+P2IkVrmw==",
             "cpu": [
                 "riscv64"
             ],
@@ -2353,9 +2382,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-riscv64-musl": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.46.2.tgz",
-            "integrity": "sha512-t5B2loThlFEauloaQkZg9gxV05BYeITLvLkWOkRXogP4qHXLkWSbSHKM9S6H1schf/0YGP/qNKtiISlxvfmmZw==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.5.tgz",
+            "integrity": "sha512-hq3jU/kGyjXWTvAh2awn8oHroCbrPm8JqM7RUpKjalIRWWXE01CQOf/tUNWNHjmbMHg/hmNCwc/Pz3k1T/j/Lg==",
             "cpu": [
                 "riscv64"
             ],
@@ -2367,9 +2396,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-s390x-gnu": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.46.2.tgz",
-            "integrity": "sha512-YKjekwTEKgbB7n17gmODSmJVUIvj8CX7q5442/CK80L8nqOUbMtf8b01QkG3jOqyr1rotrAnW6B/qiHwfcuWQA==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.5.tgz",
+            "integrity": "sha512-gn8kHOrku8D4NGHMK1Y7NA7INQTRdVOntt1OCYypZPRt6skGbddska44K8iocdpxHTMMNui5oH4elPH4QOLrFQ==",
             "cpu": [
                 "s390x"
             ],
@@ -2381,9 +2410,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-gnu": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.46.2.tgz",
-            "integrity": "sha512-Jj5a9RUoe5ra+MEyERkDKLwTXVu6s3aACP51nkfnK9wJTraCC8IMe3snOfALkrjTYd2G1ViE1hICj0fZ7ALBPA==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.5.tgz",
+            "integrity": "sha512-hXGLYpdhiNElzN770+H2nlx+jRog8TyynpTVzdlc6bndktjKWyZyiCsuDAlpd+j+W+WNqfcyAWz9HxxIGfZm1Q==",
             "cpu": [
                 "x64"
             ],
@@ -2395,9 +2424,9 @@
             ]
         },
         "node_modules/@rollup/rollup-linux-x64-musl": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.46.2.tgz",
-            "integrity": "sha512-7kX69DIrBeD7yNp4A5b81izs8BqoZkCIaxQaOpumcJ1S/kmqNFjPhDu1LHeVXv0SexfHQv5cqHsxLOjETuqDuA==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.5.tgz",
+            "integrity": "sha512-arCGIcuNKjBoKAXD+y7XomR9gY6Mw7HnFBv5Rw7wQRvwYLR7gBAgV7Mb2QTyjXfTveBNFAtPt46/36vV9STLNg==",
             "cpu": [
                 "x64"
             ],
@@ -2408,10 +2437,24 @@
                 "linux"
             ]
         },
+        "node_modules/@rollup/rollup-openharmony-arm64": {
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.5.tgz",
+            "integrity": "sha512-QoFqB6+/9Rly/RiPjaomPLmR/13cgkIGfA40LHly9zcH1S0bN2HVFYk3a1eAyHQyjs3ZJYlXvIGtcCs5tko9Cw==",
+            "cpu": [
+                "arm64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "openharmony"
+            ]
+        },
         "node_modules/@rollup/rollup-win32-arm64-msvc": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.46.2.tgz",
-            "integrity": "sha512-wiJWMIpeaak/jsbaq2HMh/rzZxHVW1rU6coyeNNpMwk5isiPjSTx0a4YLSlYDwBH/WBvLz+EtsNqQScZTLJy3g==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.5.tgz",
+            "integrity": "sha512-w0cDWVR6MlTstla1cIfOGyl8+qb93FlAVutcor14Gf5Md5ap5ySfQ7R9S/NjNaMLSFdUnKGEasmVnu3lCMqB7w==",
             "cpu": [
                 "arm64"
             ],
@@ -2423,9 +2466,9 @@
             ]
         },
         "node_modules/@rollup/rollup-win32-ia32-msvc": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.46.2.tgz",
-            "integrity": "sha512-gBgaUDESVzMgWZhcyjfs9QFK16D8K6QZpwAaVNJxYDLHWayOta4ZMjGm/vsAEy3hvlS2GosVFlBlP9/Wb85DqQ==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.5.tgz",
+            "integrity": "sha512-Aufdpzp7DpOTULJCuvzqcItSGDH73pF3ko/f+ckJhxQyHtp67rHw3HMNxoIdDMUITJESNE6a8uh4Lo4SLouOUg==",
             "cpu": [
                 "ia32"
             ],
@@ -2436,10 +2479,10 @@
                 "win32"
             ]
         },
-        "node_modules/@rollup/rollup-win32-x64-msvc": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.46.2.tgz",
-            "integrity": "sha512-CvUo2ixeIQGtF6WvuB87XWqPQkoFAFqW+HUo/WzHwuHDvIwZCtjdWXoYCcr06iKGydiqTclC4jU/TNObC/xKZg==",
+        "node_modules/@rollup/rollup-win32-x64-gnu": {
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.5.tgz",
+            "integrity": "sha512-UGBUGPFp1vkj6p8wCRraqNhqwX/4kNQPS57BCFc8wYh0g94iVIW33wJtQAx3G7vrjjNtRaxiMUylM0ktp/TRSQ==",
             "cpu": [
                 "x64"
             ],
@@ -2450,6 +2493,336 @@
                 "win32"
             ]
         },
+        "node_modules/@rollup/rollup-win32-x64-msvc": {
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.5.tgz",
+            "integrity": "sha512-TAcgQh2sSkykPRWLrdyy2AiceMckNf5loITqXxFI5VuQjS5tSuw3WlwdN8qv8vzjLAUTvYaH/mVjSFpbkFbpTg==",
+            "cpu": [
+                "x64"
+            ],
+            "dev": true,
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ]
+        },
+        "node_modules/@standard-schema/utils": {
+            "version": "0.3.0",
+            "resolved": "https://registry.npmjs.org/@standard-schema/utils/-/utils-0.3.0.tgz",
+            "integrity": "sha512-e7Mew686owMaPJVNNLs55PUvgz371nKgwsc4vxE49zsODpJEnxgxRo2y/OKrqueavXgZNMDVj3DdHFlaSAeU8g==",
+            "license": "MIT"
+        },
+        "node_modules/@tailwindcss/node": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.1.16.tgz",
+            "integrity": "sha512-BX5iaSsloNuvKNHRN3k2RcCuTEgASTo77mofW0vmeHkfrDWaoFAFvNHpEgtu0eqyypcyiBkDWzSMxJhp3AUVcw==",
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/remapping": "^2.3.4",
+                "enhanced-resolve": "^5.18.3",
+                "jiti": "^2.6.1",
+                "lightningcss": "1.30.2",
+                "magic-string": "^0.30.19",
+                "source-map-js": "^1.2.1",
+                "tailwindcss": "4.1.16"
+            }
+        },
+        "node_modules/@tailwindcss/oxide": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.1.16.tgz",
+            "integrity": "sha512-2OSv52FRuhdlgyOQqgtQHuCgXnS8nFSYRp2tJ+4WZXKgTxqPy7SMSls8c3mPT5pkZ17SBToGM5LHEJBO7miEdg==",
+            "license": "MIT",
+            "engines": {
+                "node": ">= 10"
+            },
+            "optionalDependencies": {
+                "@tailwindcss/oxide-android-arm64": "4.1.16",
+                "@tailwindcss/oxide-darwin-arm64": "4.1.16",
+                "@tailwindcss/oxide-darwin-x64": "4.1.16",
+                "@tailwindcss/oxide-freebsd-x64": "4.1.16",
+                "@tailwindcss/oxide-linux-arm-gnueabihf": "4.1.16",
+                "@tailwindcss/oxide-linux-arm64-gnu": "4.1.16",
+                "@tailwindcss/oxide-linux-arm64-musl": "4.1.16",
+                "@tailwindcss/oxide-linux-x64-gnu": "4.1.16",
+                "@tailwindcss/oxide-linux-x64-musl": "4.1.16",
+                "@tailwindcss/oxide-wasm32-wasi": "4.1.16",
+                "@tailwindcss/oxide-win32-arm64-msvc": "4.1.16",
+                "@tailwindcss/oxide-win32-x64-msvc": "4.1.16"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-android-arm64": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.1.16.tgz",
+            "integrity": "sha512-8+ctzkjHgwDJ5caq9IqRSgsP70xhdhJvm+oueS/yhD5ixLhqTw9fSL1OurzMUhBwE5zK26FXLCz2f/RtkISqHA==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-darwin-arm64": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.1.16.tgz",
+            "integrity": "sha512-C3oZy5042v2FOALBZtY0JTDnGNdS6w7DxL/odvSny17ORUnaRKhyTse8xYi3yKGyfnTUOdavRCdmc8QqJYwFKA==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-darwin-x64": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.1.16.tgz",
+            "integrity": "sha512-vjrl/1Ub9+JwU6BP0emgipGjowzYZMjbWCDqwA2Z4vCa+HBSpP4v6U2ddejcHsolsYxwL5r4bPNoamlV0xDdLg==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-freebsd-x64": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.1.16.tgz",
+            "integrity": "sha512-TSMpPYpQLm+aR1wW5rKuUuEruc/oOX3C7H0BTnPDn7W/eMw8W+MRMpiypKMkXZfwH8wqPIRKppuZoedTtNj2tg==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.1.16.tgz",
+            "integrity": "sha512-p0GGfRg/w0sdsFKBjMYvvKIiKy/LNWLWgV/plR4lUgrsxFAoQBFrXkZ4C0w8IOXfslB9vHK/JGASWD2IefIpvw==",
+            "cpu": [
+                "arm"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-linux-arm64-gnu": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.1.16.tgz",
+            "integrity": "sha512-DoixyMmTNO19rwRPdqviTrG1rYzpxgyYJl8RgQvdAQUzxC1ToLRqtNJpU/ATURSKgIg6uerPw2feW0aS8SNr/w==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-linux-arm64-musl": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.1.16.tgz",
+            "integrity": "sha512-H81UXMa9hJhWhaAUca6bU2wm5RRFpuHImrwXBUvPbYb+3jo32I9VIwpOX6hms0fPmA6f2pGVlybO6qU8pF4fzQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-linux-x64-gnu": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.1.16.tgz",
+            "integrity": "sha512-ZGHQxDtFC2/ruo7t99Qo2TTIvOERULPl5l0K1g0oK6b5PGqjYMga+FcY1wIUnrUxY56h28FxybtDEla+ICOyew==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-linux-x64-musl": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.1.16.tgz",
+            "integrity": "sha512-Oi1tAaa0rcKf1Og9MzKeINZzMLPbhxvm7rno5/zuP1WYmpiG0bEHq4AcRUiG2165/WUzvxkW4XDYCscZWbTLZw==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.1.16.tgz",
+            "integrity": "sha512-B01u/b8LteGRwucIBmCQ07FVXLzImWESAIMcUU6nvFt/tYsQ6IHz8DmZ5KtvmwxD+iTYBtM1xwoGXswnlu9v0Q==",
+            "bundleDependencies": [
+                "@napi-rs/wasm-runtime",
+                "@emnapi/core",
+                "@emnapi/runtime",
+                "@tybys/wasm-util",
+                "@emnapi/wasi-threads",
+                "tslib"
+            ],
+            "cpu": [
+                "wasm32"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@emnapi/core": "^1.5.0",
+                "@emnapi/runtime": "^1.5.0",
+                "@emnapi/wasi-threads": "^1.1.0",
+                "@napi-rs/wasm-runtime": "^1.0.7",
+                "@tybys/wasm-util": "^0.10.1",
+                "tslib": "^2.4.0"
+            },
+            "engines": {
+                "node": ">=14.0.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/core": {
+            "version": "1.5.0",
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@emnapi/wasi-threads": "1.1.0",
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/runtime": {
+            "version": "1.5.0",
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": {
+            "version": "1.1.0",
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": {
+            "version": "1.0.7",
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "@emnapi/core": "^1.5.0",
+                "@emnapi/runtime": "^1.5.0",
+                "@tybys/wasm-util": "^0.10.1"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@tybys/wasm-util": {
+            "version": "0.10.1",
+            "inBundle": true,
+            "license": "MIT",
+            "optional": true,
+            "dependencies": {
+                "tslib": "^2.4.0"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/tslib": {
+            "version": "2.8.1",
+            "inBundle": true,
+            "license": "0BSD",
+            "optional": true
+        },
+        "node_modules/@tailwindcss/oxide-win32-arm64-msvc": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.1.16.tgz",
+            "integrity": "sha512-zX+Q8sSkGj6HKRTMJXuPvOcP8XfYON24zJBRPlszcH1Np7xuHXhWn8qfFjIujVzvH3BHU+16jBXwgpl20i+v9A==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/oxide-win32-x64-msvc": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.1.16.tgz",
+            "integrity": "sha512-m5dDFJUEejbFqP+UXVstd4W/wnxA4F61q8SoL+mqTypId2T2ZpuxosNSgowiCnLp2+Z+rivdU0AqpfgiD7yCBg==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MIT",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 10"
+            }
+        },
+        "node_modules/@tailwindcss/postcss": {
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/@tailwindcss/postcss/-/postcss-4.1.16.tgz",
+            "integrity": "sha512-Qn3SFGPXYQMKR/UtqS+dqvPrzEeBZHrFA92maT4zijCVggdsXnDBMsPFJo1eArX3J+O+Gi+8pV4PkqjLCNBk3A==",
+            "license": "MIT",
+            "dependencies": {
+                "@alloc/quick-lru": "^5.2.0",
+                "@tailwindcss/node": "4.1.16",
+                "@tailwindcss/oxide": "4.1.16",
+                "postcss": "^8.4.41",
+                "tailwindcss": "4.1.16"
+            }
+        },
         "node_modules/@tanstack/react-table": {
             "version": "8.21.3",
             "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.21.3.tgz",
@@ -2576,6 +2949,13 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/@types/lodash": {
+            "version": "4.17.20",
+            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.20.tgz",
+            "integrity": "sha512-H3MHACvFUEiujabxhaI/ImO6gUrd8oOurg7LQtS7mbwIXA/cUqWrvBsaeJ23aZEPk1TAYkurjfMbSELfoCXlGA==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/@types/luxon": {
             "version": "3.7.1",
             "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.7.1.tgz",
@@ -2583,41 +2963,33 @@
             "license": "MIT"
         },
         "node_modules/@types/node": {
-            "version": "22.17.1",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-22.17.1.tgz",
-            "integrity": "sha512-y3tBaz+rjspDTylNjAX37jEC3TETEFGNJL6uQDxwF9/8GLLIjW1rvVHlynyuUKMnMr1Roq8jOv3vkopBjC4/VA==",
+            "version": "24.9.2",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-24.9.2.tgz",
+            "integrity": "sha512-uWN8YqxXxqFMX2RqGOrumsKeti4LlmIMIyV0lgut4jx7KQBcBiW6vkDtIBvHnHIquwNfJhk8v2OtmO8zXWHfPA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "undici-types": "~6.21.0"
+                "undici-types": "~7.16.0"
             }
         },
-        "node_modules/@types/prop-types": {
-            "version": "15.7.15",
-            "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.15.tgz",
-            "integrity": "sha512-F6bEyamV9jKGAFBEmlQnesRPGOQqS2+Uwi0Em15xenOxHaf2hv6L8YCVn3rPdPJOiJfPiCnLIRyvwVaqMY3MIw==",
-            "devOptional": true,
-            "license": "MIT"
-        },
         "node_modules/@types/react": {
-            "version": "18.3.23",
-            "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.23.tgz",
-            "integrity": "sha512-/LDXMQh55EzZQ0uVAZmKKhfENivEvWz6E+EYzh+/MCjMhNsotd+ZHhBGIjFDTi6+fz0OhQQQLbTgdQIxxCsC0w==",
+            "version": "19.2.2",
+            "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.2.tgz",
+            "integrity": "sha512-6mDvHUFSjyT2B2yeNx2nUgMxh9LtOWvkhIU3uePn2I2oyNymUAX1NIsdgviM4CH+JSrp2D2hsMvJOkxY+0wNRA==",
             "devOptional": true,
             "license": "MIT",
             "dependencies": {
-                "@types/prop-types": "*",
                 "csstype": "^3.0.2"
             }
         },
         "node_modules/@types/react-dom": {
-            "version": "18.3.7",
-            "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-18.3.7.tgz",
-            "integrity": "sha512-MEe3UeoENYVFXzoXEWsvcpg6ZvlrFNlOQ7EOsvhI3CfAXwzPfO8Qwuxd40nepsYKqyyVQnTdEfv68q91yLcKrQ==",
+            "version": "19.2.2",
+            "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.2.2.tgz",
+            "integrity": "sha512-9KQPoO6mZCi7jcIStSnlOWn2nEF3mNmyr3rIAsGnAbQKYbRLyqmeSc39EVgtxXVia+LMT8j3knZLAZAh+xLmrw==",
             "devOptional": true,
             "license": "MIT",
             "peerDependencies": {
-                "@types/react": "^18.0.0"
+                "@types/react": "^19.2.0"
             }
         },
         "node_modules/@types/swagger-schema-official": {
@@ -2628,17 +3000,17 @@
             "license": "MIT"
         },
         "node_modules/@typescript-eslint/eslint-plugin": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.39.0.tgz",
-            "integrity": "sha512-bhEz6OZeUR+O/6yx9Jk6ohX6H9JSFTaiY0v9/PuKT3oGK0rn0jNplLmyFUGV+a9gfYnVNwGDwS/UkLIuXNb2Rw==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.46.2.tgz",
+            "integrity": "sha512-ZGBMToy857/NIPaaCucIUQgqueOiq7HeAKkhlvqVV4lm089zUFW6ikRySx2v+cAhKeUCPuWVHeimyk6Dw1iY3w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/regexpp": "^4.10.0",
-                "@typescript-eslint/scope-manager": "8.39.0",
-                "@typescript-eslint/type-utils": "8.39.0",
-                "@typescript-eslint/utils": "8.39.0",
-                "@typescript-eslint/visitor-keys": "8.39.0",
+                "@typescript-eslint/scope-manager": "8.46.2",
+                "@typescript-eslint/type-utils": "8.46.2",
+                "@typescript-eslint/utils": "8.46.2",
+                "@typescript-eslint/visitor-keys": "8.46.2",
                 "graphemer": "^1.4.0",
                 "ignore": "^7.0.0",
                 "natural-compare": "^1.4.0",
@@ -2652,7 +3024,7 @@
                 "url": "https://opencollective.com/typescript-eslint"
             },
             "peerDependencies": {
-                "@typescript-eslint/parser": "^8.39.0",
+                "@typescript-eslint/parser": "^8.46.2",
                 "eslint": "^8.57.0 || ^9.0.0",
                 "typescript": ">=4.8.4 <6.0.0"
             }
@@ -2668,16 +3040,16 @@
             }
         },
         "node_modules/@typescript-eslint/parser": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.39.0.tgz",
-            "integrity": "sha512-g3WpVQHngx0aLXn6kfIYCZxM6rRJlWzEkVpqEFLT3SgEDsp9cpCbxxgwnE504q4H+ruSDh/VGS6nqZIDynP+vg==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.46.2.tgz",
+            "integrity": "sha512-BnOroVl1SgrPLywqxyqdJ4l3S2MsKVLDVxZvjI1Eoe8ev2r3kGDo+PcMihNmDE+6/KjkTubSJnmqGZZjQSBq/g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/scope-manager": "8.39.0",
-                "@typescript-eslint/types": "8.39.0",
-                "@typescript-eslint/typescript-estree": "8.39.0",
-                "@typescript-eslint/visitor-keys": "8.39.0",
+                "@typescript-eslint/scope-manager": "8.46.2",
+                "@typescript-eslint/types": "8.46.2",
+                "@typescript-eslint/typescript-estree": "8.46.2",
+                "@typescript-eslint/visitor-keys": "8.46.2",
                 "debug": "^4.3.4"
             },
             "engines": {
@@ -2693,14 +3065,14 @@
             }
         },
         "node_modules/@typescript-eslint/project-service": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.39.0.tgz",
-            "integrity": "sha512-CTzJqaSq30V/Z2Og9jogzZt8lJRR5TKlAdXmWgdu4hgcC9Kww5flQ+xFvMxIBWVNdxJO7OifgdOK4PokMIWPew==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.46.2.tgz",
+            "integrity": "sha512-PULOLZ9iqwI7hXcmL4fVfIsBi6AN9YxRc0frbvmg8f+4hQAjQ5GYNKK0DIArNo+rOKmR/iBYwkpBmnIwin4wBg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/tsconfig-utils": "^8.39.0",
-                "@typescript-eslint/types": "^8.39.0",
+                "@typescript-eslint/tsconfig-utils": "^8.46.2",
+                "@typescript-eslint/types": "^8.46.2",
                 "debug": "^4.3.4"
             },
             "engines": {
@@ -2715,14 +3087,14 @@
             }
         },
         "node_modules/@typescript-eslint/scope-manager": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.39.0.tgz",
-            "integrity": "sha512-8QOzff9UKxOh6npZQ/4FQu4mjdOCGSdO3p44ww0hk8Vu+IGbg0tB/H1LcTARRDzGCC8pDGbh2rissBuuoPgH8A==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.46.2.tgz",
+            "integrity": "sha512-LF4b/NmGvdWEHD2H4MsHD8ny6JpiVNDzrSZr3CsckEgCbAGZbYM4Cqxvi9L+WqDMT+51Ozy7lt2M+d0JLEuBqA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.39.0",
-                "@typescript-eslint/visitor-keys": "8.39.0"
+                "@typescript-eslint/types": "8.46.2",
+                "@typescript-eslint/visitor-keys": "8.46.2"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2733,9 +3105,9 @@
             }
         },
         "node_modules/@typescript-eslint/tsconfig-utils": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.39.0.tgz",
-            "integrity": "sha512-Fd3/QjmFV2sKmvv3Mrj8r6N8CryYiCS8Wdb/6/rgOXAWGcFuc+VkQuG28uk/4kVNVZBQuuDHEDUpo/pQ32zsIQ==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.46.2.tgz",
+            "integrity": "sha512-a7QH6fw4S57+F5y2FIxxSDyi5M4UfGF+Jl1bCGd7+L4KsaUY80GsiF/t0UoRFDHAguKlBaACWJRmdrc6Xfkkag==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -2750,15 +3122,15 @@
             }
         },
         "node_modules/@typescript-eslint/type-utils": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.39.0.tgz",
-            "integrity": "sha512-6B3z0c1DXVT2vYA9+z9axjtc09rqKUPRmijD5m9iv8iQpHBRYRMBcgxSiKTZKm6FwWw1/cI4v6em35OsKCiN5Q==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.46.2.tgz",
+            "integrity": "sha512-HbPM4LbaAAt/DjxXaG9yiS9brOOz6fabal4uvUmaUYe6l3K1phQDMQKBRUrr06BQkxkvIZVVHttqiybM9nJsLA==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.39.0",
-                "@typescript-eslint/typescript-estree": "8.39.0",
-                "@typescript-eslint/utils": "8.39.0",
+                "@typescript-eslint/types": "8.46.2",
+                "@typescript-eslint/typescript-estree": "8.46.2",
+                "@typescript-eslint/utils": "8.46.2",
                 "debug": "^4.3.4",
                 "ts-api-utils": "^2.1.0"
             },
@@ -2775,9 +3147,9 @@
             }
         },
         "node_modules/@typescript-eslint/types": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.39.0.tgz",
-            "integrity": "sha512-ArDdaOllnCj3yn/lzKn9s0pBQYmmyme/v1HbGIGB0GB/knFI3fWMHloC+oYTJW46tVbYnGKTMDK4ah1sC2v0Kg==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.46.2.tgz",
+            "integrity": "sha512-lNCWCbq7rpg7qDsQrd3D6NyWYu+gkTENkG5IKYhUIcxSb59SQC/hEQ+MrG4sTgBVghTonNWq42bA/d4yYumldQ==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -2789,16 +3161,16 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.39.0.tgz",
-            "integrity": "sha512-ndWdiflRMvfIgQRpckQQLiB5qAKQ7w++V4LlCHwp62eym1HLB/kw7D9f2e8ytONls/jt89TEasgvb+VwnRprsw==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.46.2.tgz",
+            "integrity": "sha512-f7rW7LJ2b7Uh2EiQ+7sza6RDZnajbNbemn54Ob6fRwQbgcIn+GWfyuHDHRYgRoZu1P4AayVScrRW+YfbTvPQoQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/project-service": "8.39.0",
-                "@typescript-eslint/tsconfig-utils": "8.39.0",
-                "@typescript-eslint/types": "8.39.0",
-                "@typescript-eslint/visitor-keys": "8.39.0",
+                "@typescript-eslint/project-service": "8.46.2",
+                "@typescript-eslint/tsconfig-utils": "8.46.2",
+                "@typescript-eslint/types": "8.46.2",
+                "@typescript-eslint/visitor-keys": "8.46.2",
                 "debug": "^4.3.4",
                 "fast-glob": "^3.3.2",
                 "is-glob": "^4.0.3",
@@ -2844,9 +3216,9 @@
             }
         },
         "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": {
-            "version": "7.7.2",
-            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.2.tgz",
-            "integrity": "sha512-RF0Fw+rO5AMf9MAyaRXI4AV0Ulj5lMHqVxxdSgiVbixSCXoEmmX/jk0CuJw4+3SqroYO9VoUh+HcuJivvtJemA==",
+            "version": "7.7.3",
+            "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+            "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
             "dev": true,
             "license": "ISC",
             "bin": {
@@ -2857,16 +3229,16 @@
             }
         },
         "node_modules/@typescript-eslint/utils": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.39.0.tgz",
-            "integrity": "sha512-4GVSvNA0Vx1Ktwvf4sFE+exxJ3QGUorQG1/A5mRfRNZtkBT2xrA/BCO2H0eALx/PnvCS6/vmYwRdDA41EoffkQ==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.46.2.tgz",
+            "integrity": "sha512-sExxzucx0Tud5tE0XqR0lT0psBQvEpnpiul9XbGUB1QwpWJJAps1O/Z7hJxLGiZLBKMCutjTzDgmd1muEhBnVg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@eslint-community/eslint-utils": "^4.7.0",
-                "@typescript-eslint/scope-manager": "8.39.0",
-                "@typescript-eslint/types": "8.39.0",
-                "@typescript-eslint/typescript-estree": "8.39.0"
+                "@typescript-eslint/scope-manager": "8.46.2",
+                "@typescript-eslint/types": "8.46.2",
+                "@typescript-eslint/typescript-estree": "8.46.2"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2881,13 +3253,13 @@
             }
         },
         "node_modules/@typescript-eslint/visitor-keys": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.39.0.tgz",
-            "integrity": "sha512-ldgiJ+VAhQCfIjeOgu8Kj5nSxds0ktPOSO9p4+0VDH2R2pLvQraaM5Oen2d7NxzMCm+Sn/vJT+mv2H5u6b/3fA==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.46.2.tgz",
+            "integrity": "sha512-tUFMXI4gxzzMXt4xpGJEsBsTox0XbNQ1y94EwlD/CuZwFcQP79xfQqMhau9HsRc/J0cAPA/HZt1dZPtGn9V/7w==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/types": "8.39.0",
+                "@typescript-eslint/types": "8.46.2",
                 "eslint-visitor-keys": "^4.2.1"
             },
             "engines": {
@@ -2899,21 +3271,21 @@
             }
         },
         "node_modules/@vitejs/plugin-react": {
-            "version": "4.7.0",
-            "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-4.7.0.tgz",
-            "integrity": "sha512-gUu9hwfWvvEDBBmgtAowQCojwZmJ5mcLn3aufeCsitijs3+f2NsrPtlAWIR6OPiqljl96GVCUbLe0HyqIpVaoA==",
+            "version": "5.1.0",
+            "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-5.1.0.tgz",
+            "integrity": "sha512-4LuWrg7EKWgQaMJfnN+wcmbAW+VSsCmqGohftWjuct47bv8uE4n/nPpq4XjJPsxgq00GGG5J8dvBczp8uxScew==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@babel/core": "^7.28.0",
+                "@babel/core": "^7.28.4",
                 "@babel/plugin-transform-react-jsx-self": "^7.27.1",
                 "@babel/plugin-transform-react-jsx-source": "^7.27.1",
-                "@rolldown/pluginutils": "1.0.0-beta.27",
+                "@rolldown/pluginutils": "1.0.0-beta.43",
                 "@types/babel__core": "^7.20.5",
-                "react-refresh": "^0.17.0"
+                "react-refresh": "^0.18.0"
             },
             "engines": {
-                "node": "^14.18.0 || >=16.0.0"
+                "node": "^20.19.0 || >=22.12.0"
             },
             "peerDependencies": {
                 "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0"
@@ -2984,21 +3356,20 @@
             }
         },
         "node_modules/ansi-regex": {
-            "version": "6.1.0",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-            "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+            "version": "5.0.1",
+            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+            "dev": true,
             "license": "MIT",
             "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-regex?sponsor=1"
+                "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==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "color-convert": "^2.0.1"
@@ -3010,31 +3381,6 @@
                 "url": "https://github.com/chalk/ansi-styles?sponsor=1"
             }
         },
-        "node_modules/any-promise": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-            "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
-            "license": "MIT"
-        },
-        "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/arg": {
-            "version": "5.0.2",
-            "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
-            "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
-            "license": "MIT"
-        },
         "node_modules/argparse": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
@@ -3096,18 +3442,17 @@
             "version": "1.0.2",
             "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
             "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+            "dev": true,
             "license": "MIT"
         },
-        "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/baseline-browser-mapping": {
+            "version": "2.8.21",
+            "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.21.tgz",
+            "integrity": "sha512-JU0h5APyQNsHOlAM7HnQnPToSDQoEBZqzu/YBlqDnEeymPnZDREeXJA3KBMQee+dKteAxZ2AtvQEvVYdZf241Q==",
+            "devOptional": true,
+            "license": "Apache-2.0",
+            "bin": {
+                "baseline-browser-mapping": "dist/cli.js"
             }
         },
         "node_modules/brace-expansion": {
@@ -3125,6 +3470,7 @@
             "version": "3.0.3",
             "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz",
             "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "fill-range": "^7.1.1"
@@ -3134,9 +3480,9 @@
             }
         },
         "node_modules/browserslist": {
-            "version": "4.25.2",
-            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.25.2.tgz",
-            "integrity": "sha512-0si2SJK3ooGzIawRu61ZdPCO1IncZwS8IzuX73sPZsXW6EQ/w/DAfPyKI8l1ETTCr2MnvqWitmlCUxgdul45jA==",
+            "version": "4.27.0",
+            "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.27.0.tgz",
+            "integrity": "sha512-AXVQwdhot1eqLihwasPElhX2tAZiBjWdJ9i/Zcj2S6QYIjkx62OKSfnobkriB81C3l4w0rVy3Nt4jaTBltYEpw==",
             "devOptional": true,
             "funding": [
                 {
@@ -3154,10 +3500,11 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "caniuse-lite": "^1.0.30001733",
-                "electron-to-chromium": "^1.5.199",
-                "node-releases": "^2.0.19",
-                "update-browserslist-db": "^1.1.3"
+                "baseline-browser-mapping": "^2.8.19",
+                "caniuse-lite": "^1.0.30001751",
+                "electron-to-chromium": "^1.5.238",
+                "node-releases": "^2.0.26",
+                "update-browserslist-db": "^1.1.4"
             },
             "bin": {
                 "browserslist": "cli.js"
@@ -3167,23 +3514,23 @@
             }
         },
         "node_modules/c12": {
-            "version": "3.2.0",
-            "resolved": "https://registry.npmjs.org/c12/-/c12-3.2.0.tgz",
-            "integrity": "sha512-ixkEtbYafL56E6HiFuonMm1ZjoKtIo7TH68/uiEq4DAwv9NcUX2nJ95F8TrbMeNjqIkZpruo3ojXQJ+MGG5gcQ==",
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/c12/-/c12-3.3.1.tgz",
+            "integrity": "sha512-LcWQ01LT9tkoUINHgpIOv3mMs+Abv7oVCrtpMRi1PaapVEpWoMga5WuT7/DqFTu7URP9ftbOmimNw1KNIGh9DQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "chokidar": "^4.0.3",
                 "confbox": "^0.2.2",
                 "defu": "^6.1.4",
-                "dotenv": "^17.2.1",
+                "dotenv": "^17.2.3",
                 "exsolve": "^1.0.7",
                 "giget": "^2.0.0",
-                "jiti": "^2.5.1",
+                "jiti": "^2.6.1",
                 "ohash": "^2.0.11",
                 "pathe": "^2.0.3",
-                "perfect-debounce": "^1.0.0",
-                "pkg-types": "^2.2.0",
+                "perfect-debounce": "^2.0.0",
+                "pkg-types": "^2.3.0",
                 "rc9": "^2.1.2"
             },
             "peerDependencies": {
@@ -3212,19 +3559,10 @@
                 "node": ">=6"
             }
         },
-        "node_modules/camelcase-css": {
-            "version": "2.0.1",
-            "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
-            "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 6"
-            }
-        },
         "node_modules/caniuse-lite": {
-            "version": "1.0.30001733",
-            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001733.tgz",
-            "integrity": "sha512-e4QKw/O2Kavj2VQTKZWrwzkt3IxOmIlU6ajRb6LP64LHpBo1J67k2Hi4Vu/TgJWsNtynurfS0uK3MaUTCPfu5Q==",
+            "version": "1.0.30001751",
+            "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001751.tgz",
+            "integrity": "sha512-A0QJhug0Ly64Ii3eIqHu5X51ebln3k4yTUkY1j8drqpWHVreg/VLijN48cZ1bYPiqOQuqpkIKnzr/Ul8V+p6Cw==",
             "devOptional": true,
             "funding": [
                 {
@@ -3312,69 +3650,6 @@
                 "node": ">=12"
             }
         },
-        "node_modules/cliui/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==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/cliui/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==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/cliui/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==",
-            "dev": true,
-            "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/cliui/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==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ansi-regex": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/cliui/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==",
-            "dev": true,
-            "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/clsx": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
@@ -3404,6 +3679,7 @@
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
             "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "color-name": "~1.1.4"
@@ -3416,17 +3692,9 @@
             "version": "1.1.4",
             "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
             "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+            "dev": true,
             "license": "MIT"
         },
-        "node_modules/commander": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-            "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 6"
-            }
-        },
         "node_modules/concat-map": {
             "version": "0.0.1",
             "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
@@ -3480,6 +3748,7 @@
             "version": "7.0.6",
             "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
             "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "path-key": "^3.1.0",
@@ -3490,18 +3759,6 @@
                 "node": ">= 8"
             }
         },
-        "node_modules/cssesc": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-            "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-            "license": "MIT",
-            "bin": {
-                "cssesc": "bin/cssesc"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
         "node_modules/csstype": {
             "version": "3.1.3",
             "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
@@ -3509,10 +3766,26 @@
             "devOptional": true,
             "license": "MIT"
         },
+        "node_modules/date-fns": {
+            "version": "4.1.0",
+            "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
+            "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
+            "license": "MIT",
+            "funding": {
+                "type": "github",
+                "url": "https://github.com/sponsors/kossnocorp"
+            }
+        },
+        "node_modules/date-fns-jalali": {
+            "version": "4.1.0-0",
+            "resolved": "https://registry.npmjs.org/date-fns-jalali/-/date-fns-jalali-4.1.0-0.tgz",
+            "integrity": "sha512-hTIP/z+t+qKwBDcmmsnmjWTduxCg+5KfdqWQvb2X/8C9+knYY6epN/pfxdDuyVlSVeFz0sM5eEfwIUQ70U4ckg==",
+            "license": "MIT"
+        },
         "node_modules/debug": {
-            "version": "4.4.1",
-            "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.1.tgz",
-            "integrity": "sha512-KcKCqiftBJcZr++7ykoDIEwSa3XWowTfNPo92BYxjXiyYEVrUQh2aLyhxBCwww+heortUFxEJYcRzosstTEBYQ==",
+            "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"
@@ -3556,28 +3829,25 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/detect-libc": {
+            "version": "2.1.2",
+            "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz",
+            "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==",
+            "license": "Apache-2.0",
+            "engines": {
+                "node": ">=8"
+            }
+        },
         "node_modules/detect-node-es": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
             "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==",
             "license": "MIT"
         },
-        "node_modules/didyoumean": {
-            "version": "1.2.2",
-            "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
-            "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
-            "license": "Apache-2.0"
-        },
-        "node_modules/dlv": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
-            "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
-            "license": "MIT"
-        },
         "node_modules/dotenv": {
-            "version": "17.2.1",
-            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.1.tgz",
-            "integrity": "sha512-kQhDYKZecqnM0fCnzI5eIv5L4cAe/iRI+HqMbO/hbRdTAeXDG+M9FjipUxNfbARuEg4iHIbhnhs78BCHNbSxEQ==",
+            "version": "17.2.3",
+            "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.2.3.tgz",
+            "integrity": "sha512-JVUnt+DUIzu87TABbhPmNfVdBDt18BLOWjMUFJMSi/Qqg7NTYtabbvSNJGOJ7afbRuv9D/lngizHtP7QyLQ+9w==",
             "dev": true,
             "license": "BSD-2-Clause",
             "engines": {
@@ -3587,25 +3857,33 @@
                 "url": "https://dotenvx.com"
             }
         },
-        "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/electron-to-chromium": {
-            "version": "1.5.199",
-            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.199.tgz",
-            "integrity": "sha512-3gl0S7zQd88kCAZRO/DnxtBKuhMO4h0EaQIN3YgZfV6+pW+5+bf2AdQeHNESCoaQqo/gjGVYEf2YM4O5HJQqpQ==",
+            "version": "1.5.243",
+            "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.243.tgz",
+            "integrity": "sha512-ZCphxFW3Q1TVhcgS9blfut1PX8lusVi2SvXQgmEEnK4TCmE1JhH2JkjJN+DNt0pJJwfBri5AROBnz2b/C+YU9g==",
             "devOptional": true,
             "license": "ISC"
         },
         "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==",
+            "version": "8.0.0",
+            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
+            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
+            "dev": true,
             "license": "MIT"
         },
+        "node_modules/enhanced-resolve": {
+            "version": "5.18.3",
+            "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.3.tgz",
+            "integrity": "sha512-d4lC8xfavMeBjzGr2vECC3fsGXziXZQyJxD868h2M/mBI3PwAuODxAkLkq5HYuvrPYcUtiLzsTo8U3PgX3Ocww==",
+            "license": "MIT",
+            "dependencies": {
+                "graceful-fs": "^4.2.4",
+                "tapable": "^2.2.0"
+            },
+            "engines": {
+                "node": ">=10.13.0"
+            }
+        },
         "node_modules/es6-promise": {
             "version": "3.3.1",
             "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-3.3.1.tgz",
@@ -3614,9 +3892,9 @@
             "license": "MIT"
         },
         "node_modules/esbuild": {
-            "version": "0.25.8",
-            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.8.tgz",
-            "integrity": "sha512-vVC0USHGtMi8+R4Kz8rt6JhEWLxsv9Rnu/lGYbPR8u47B+DCBksq9JarW0zOO7bs37hyOK1l2/oqtbciutL5+Q==",
+            "version": "0.25.11",
+            "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.11.tgz",
+            "integrity": "sha512-KohQwyzrKTQmhXDW1PjCv3Tyspn9n5GcY2RTDqeORIdIJY8yKIF7sTSopFmn/wpMPW4rdPXI0UE5LJLuq3bx0Q==",
             "dev": true,
             "hasInstallScript": true,
             "license": "MIT",
@@ -3627,32 +3905,32 @@
                 "node": ">=18"
             },
             "optionalDependencies": {
-                "@esbuild/aix-ppc64": "0.25.8",
-                "@esbuild/android-arm": "0.25.8",
-                "@esbuild/android-arm64": "0.25.8",
-                "@esbuild/android-x64": "0.25.8",
-                "@esbuild/darwin-arm64": "0.25.8",
-                "@esbuild/darwin-x64": "0.25.8",
-                "@esbuild/freebsd-arm64": "0.25.8",
-                "@esbuild/freebsd-x64": "0.25.8",
-                "@esbuild/linux-arm": "0.25.8",
-                "@esbuild/linux-arm64": "0.25.8",
-                "@esbuild/linux-ia32": "0.25.8",
-                "@esbuild/linux-loong64": "0.25.8",
-                "@esbuild/linux-mips64el": "0.25.8",
-                "@esbuild/linux-ppc64": "0.25.8",
-                "@esbuild/linux-riscv64": "0.25.8",
-                "@esbuild/linux-s390x": "0.25.8",
-                "@esbuild/linux-x64": "0.25.8",
-                "@esbuild/netbsd-arm64": "0.25.8",
-                "@esbuild/netbsd-x64": "0.25.8",
-                "@esbuild/openbsd-arm64": "0.25.8",
-                "@esbuild/openbsd-x64": "0.25.8",
-                "@esbuild/openharmony-arm64": "0.25.8",
-                "@esbuild/sunos-x64": "0.25.8",
-                "@esbuild/win32-arm64": "0.25.8",
-                "@esbuild/win32-ia32": "0.25.8",
-                "@esbuild/win32-x64": "0.25.8"
+                "@esbuild/aix-ppc64": "0.25.11",
+                "@esbuild/android-arm": "0.25.11",
+                "@esbuild/android-arm64": "0.25.11",
+                "@esbuild/android-x64": "0.25.11",
+                "@esbuild/darwin-arm64": "0.25.11",
+                "@esbuild/darwin-x64": "0.25.11",
+                "@esbuild/freebsd-arm64": "0.25.11",
+                "@esbuild/freebsd-x64": "0.25.11",
+                "@esbuild/linux-arm": "0.25.11",
+                "@esbuild/linux-arm64": "0.25.11",
+                "@esbuild/linux-ia32": "0.25.11",
+                "@esbuild/linux-loong64": "0.25.11",
+                "@esbuild/linux-mips64el": "0.25.11",
+                "@esbuild/linux-ppc64": "0.25.11",
+                "@esbuild/linux-riscv64": "0.25.11",
+                "@esbuild/linux-s390x": "0.25.11",
+                "@esbuild/linux-x64": "0.25.11",
+                "@esbuild/netbsd-arm64": "0.25.11",
+                "@esbuild/netbsd-x64": "0.25.11",
+                "@esbuild/openbsd-arm64": "0.25.11",
+                "@esbuild/openbsd-x64": "0.25.11",
+                "@esbuild/openharmony-arm64": "0.25.11",
+                "@esbuild/sunos-x64": "0.25.11",
+                "@esbuild/win32-arm64": "0.25.11",
+                "@esbuild/win32-ia32": "0.25.11",
+                "@esbuild/win32-x64": "0.25.11"
             }
         },
         "node_modules/escalade": {
@@ -3679,25 +3957,24 @@
             }
         },
         "node_modules/eslint": {
-            "version": "9.33.0",
-            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.33.0.tgz",
-            "integrity": "sha512-TS9bTNIryDzStCpJN93aC5VRSW3uTx9sClUn4B87pwiCaJh220otoI0X8mJKr+VcPtniMdN8GKjlwgWGUv5ZKA==",
+            "version": "9.38.0",
+            "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.38.0.tgz",
+            "integrity": "sha512-t5aPOpmtJcZcz5UJyY2GbvpDlsK5E8JqRqoKtfiKE3cNh437KIqfJr3A3AKf5k64NPx6d0G3dno6XDY05PqPtw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@eslint-community/eslint-utils": "^4.2.0",
+                "@eslint-community/eslint-utils": "^4.8.0",
                 "@eslint-community/regexpp": "^4.12.1",
-                "@eslint/config-array": "^0.21.0",
-                "@eslint/config-helpers": "^0.3.1",
-                "@eslint/core": "^0.15.2",
+                "@eslint/config-array": "^0.21.1",
+                "@eslint/config-helpers": "^0.4.1",
+                "@eslint/core": "^0.16.0",
                 "@eslint/eslintrc": "^3.3.1",
-                "@eslint/js": "9.33.0",
-                "@eslint/plugin-kit": "^0.3.5",
+                "@eslint/js": "9.38.0",
+                "@eslint/plugin-kit": "^0.4.0",
                 "@humanfs/node": "^0.16.6",
                 "@humanwhocodes/module-importer": "^1.0.1",
                 "@humanwhocodes/retry": "^0.4.2",
                 "@types/estree": "^1.0.6",
-                "@types/json-schema": "^7.0.15",
                 "ajv": "^6.12.4",
                 "chalk": "^4.0.0",
                 "cross-spawn": "^7.0.6",
@@ -3740,22 +4017,29 @@
             }
         },
         "node_modules/eslint-plugin-react-hooks": {
-            "version": "5.2.0",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.2.0.tgz",
-            "integrity": "sha512-+f15FfK64YQwZdJNELETdn5ibXEUQmW1DZL6KXhNnc2heoy/sg9VJJeT7n8TlMWouzWqSWavFkIhHyIbIAEapg==",
+            "version": "7.0.1",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-7.0.1.tgz",
+            "integrity": "sha512-O0d0m04evaNzEPoSW+59Mezf8Qt0InfgGIBJnpC0h3NH/WjUAR7BIKUfysC6todmtiZ/A0oUVS8Gce0WhBrHsA==",
             "dev": true,
             "license": "MIT",
+            "dependencies": {
+                "@babel/core": "^7.24.4",
+                "@babel/parser": "^7.24.4",
+                "hermes-parser": "^0.25.1",
+                "zod": "^3.25.0 || ^4.0.0",
+                "zod-validation-error": "^3.5.0 || ^4.0.0"
+            },
             "engines": {
-                "node": ">=10"
+                "node": ">=18"
             },
             "peerDependencies": {
                 "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0"
             }
         },
         "node_modules/eslint-plugin-react-refresh": {
-            "version": "0.4.20",
-            "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.20.tgz",
-            "integrity": "sha512-XpbHQ2q5gUF8BGOX4dHe+71qoirYMhApEPZ7sfhF/dNnOF1UXnCMGZf79SFTBO7Bz5YEIT4TMieSlJBWhP9WBA==",
+            "version": "0.4.24",
+            "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.24.tgz",
+            "integrity": "sha512-nLHIW7TEq3aLrEYWpVaJ1dRgFR+wLDPN8e8FpYAql/bMV2oBEfC37K0gLEGgv9fy66juNShSMV8OkTqzltcG/w==",
             "dev": true,
             "license": "MIT",
             "peerDependencies": {
@@ -3857,9 +4141,9 @@
             }
         },
         "node_modules/eta": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/eta/-/eta-2.2.0.tgz",
-            "integrity": "sha512-UVQ72Rqjy/ZKQalzV5dCCJP80GrmPrMxh6NlNf+erV6ObL0ZFkhCstWRawS85z3smdr3d2wXPsZEY7rDPfGd2g==",
+            "version": "3.5.0",
+            "resolved": "https://registry.npmjs.org/eta/-/eta-3.5.0.tgz",
+            "integrity": "sha512-e3x3FBvGzeCIHhF+zhK8FZA2vC5uFn6b4HJjegUbIWrDb4mJ7JjTGMJY9VGIbRVpmSwHopNiaJibhjIr+HfLug==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -3887,6 +4171,7 @@
             "version": "3.3.3",
             "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
             "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "@nodelib/fs.stat": "^2.0.2",
@@ -3903,6 +4188,7 @@
             "version": "5.1.2",
             "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
             "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+            "dev": true,
             "license": "ISC",
             "dependencies": {
                 "is-glob": "^4.0.1"
@@ -3936,6 +4222,7 @@
             "version": "1.19.1",
             "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
             "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
+            "dev": true,
             "license": "ISC",
             "dependencies": {
                 "reusify": "^1.0.4"
@@ -3958,6 +4245,7 @@
             "version": "7.1.1",
             "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
             "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "to-regex-range": "^5.0.1"
@@ -4004,22 +4292,6 @@
             "dev": true,
             "license": "ISC"
         },
-        "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/fraction.js": {
             "version": "4.3.7",
             "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
@@ -4035,13 +4307,13 @@
             }
         },
         "node_modules/framer-motion": {
-            "version": "11.18.2",
-            "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-11.18.2.tgz",
-            "integrity": "sha512-5F5Och7wrvtLVElIpclDT0CBzMVg3dL22B64aZwHtsIY8RB4mXICLrkajK4G9R+ieSAGcgrLeae2SeUTg2pr6w==",
+            "version": "12.23.24",
+            "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.23.24.tgz",
+            "integrity": "sha512-HMi5HRoRCTou+3fb3h9oTLyJGBxHfW+HnNE25tAXOvVx/IvwMHK0cx7IR4a2ZU6sh3IX1Z+4ts32PcYBOqka8w==",
             "license": "MIT",
             "dependencies": {
-                "motion-dom": "^11.18.1",
-                "motion-utils": "^11.18.1",
+                "motion-dom": "^12.23.23",
+                "motion-utils": "^12.23.6",
                 "tslib": "^2.4.0"
             },
             "peerDependencies": {
@@ -4065,6 +4337,7 @@
             "version": "2.3.3",
             "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
             "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+            "dev": true,
             "hasInstallScript": true,
             "license": "MIT",
             "optional": true,
@@ -4075,15 +4348,6 @@
                 "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
             }
         },
-        "node_modules/function-bind": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-            "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-            "license": "MIT",
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
         "node_modules/gensync": {
             "version": "1.0.0-beta.2",
             "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
@@ -4131,30 +4395,11 @@
                 "giget": "dist/cli.mjs"
             }
         },
-        "node_modules/glob": {
-            "version": "10.4.5",
-            "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-            "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
-            "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/glob-parent": {
             "version": "6.0.2",
             "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
             "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+            "dev": true,
             "license": "ISC",
             "dependencies": {
                 "is-glob": "^4.0.3"
@@ -4163,34 +4408,10 @@
                 "node": ">=10.13.0"
             }
         },
-        "node_modules/glob/node_modules/brace-expansion": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
-            "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
-            "license": "MIT",
-            "dependencies": {
-                "balanced-match": "^1.0.0"
-            }
-        },
-        "node_modules/glob/node_modules/minimatch": {
-            "version": "9.0.5",
-            "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-            "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-            "license": "ISC",
-            "dependencies": {
-                "brace-expansion": "^2.0.1"
-            },
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/isaacs"
-            }
-        },
         "node_modules/globals": {
-            "version": "15.15.0",
-            "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz",
-            "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==",
+            "version": "16.4.0",
+            "resolved": "https://registry.npmjs.org/globals/-/globals-16.4.0.tgz",
+            "integrity": "sha512-ob/2LcVVaVGCYN+r14cnwnoDPUufjiYgSqRhiFD0Q1iI4Odora5RE8Iv1D24hAz5oMophRGkGz+yuvQmmUMnMw==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -4200,6 +4421,12 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
+        "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/graphemer": {
             "version": "1.4.0",
             "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
@@ -4217,16 +4444,21 @@
                 "node": ">=8"
             }
         },
-        "node_modules/hasown": {
-            "version": "2.0.2",
-            "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-            "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+        "node_modules/hermes-estree": {
+            "version": "0.25.1",
+            "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.25.1.tgz",
+            "integrity": "sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw==",
+            "dev": true,
+            "license": "MIT"
+        },
+        "node_modules/hermes-parser": {
+            "version": "0.25.1",
+            "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.25.1.tgz",
+            "integrity": "sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
-                "function-bind": "^1.1.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
+                "hermes-estree": "0.25.1"
             }
         },
         "node_modules/html-parse-stringify": {
@@ -4246,9 +4478,9 @@
             "license": "MIT"
         },
         "node_modules/i18next": {
-            "version": "24.2.3",
-            "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.3.tgz",
-            "integrity": "sha512-lfbf80OzkocvX7nmZtu7nSTNbrTYR52sLWxPtlXX1zAhVw8WEnFk4puUkCR4B1dNQwbSpEHHHemcZu//7EcB7A==",
+            "version": "25.6.0",
+            "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.6.0.tgz",
+            "integrity": "sha512-tTn8fLrwBYtnclpL5aPXK/tAYBLWVvoHM1zdfXoRNLcI+RvtMsoZRV98ePlaW3khHYKuNh/Q65W/+NVFUeIwVw==",
             "funding": [
                 {
                     "type": "individual",
@@ -4265,7 +4497,7 @@
             ],
             "license": "MIT",
             "dependencies": {
-                "@babel/runtime": "^7.26.10"
+                "@babel/runtime": "^7.27.6"
             },
             "peerDependencies": {
                 "typescript": "^5"
@@ -4322,37 +4554,11 @@
                 "node": ">=0.8.19"
             }
         },
-        "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-core-module": {
-            "version": "2.16.1",
-            "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-            "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
-            "license": "MIT",
-            "dependencies": {
-                "hasown": "^2.0.2"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
         "node_modules/is-extglob": {
             "version": "2.1.1",
             "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
             "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
@@ -4362,6 +4568,7 @@
             "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==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=8"
@@ -4371,6 +4578,7 @@
             "version": "4.0.3",
             "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
             "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "is-extglob": "^2.1.1"
@@ -4383,6 +4591,7 @@
             "version": "7.0.0",
             "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
             "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=0.12.0"
@@ -4392,23 +4601,9 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
             "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+            "dev": true,
             "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/javascript-natural-sort": {
             "version": "0.7.1",
             "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
@@ -4416,19 +4611,18 @@
             "license": "MIT"
         },
         "node_modules/jiti": {
-            "version": "2.5.1",
-            "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.5.1.tgz",
-            "integrity": "sha512-twQoecYPiVA5K/h6SxtORw/Bs3ar+mLUtoPSc7iMXzQzK8d7eJ/R09wmTwAjiamETn1cXYPGfNnu7DMoHgu12w==",
-            "dev": true,
+            "version": "2.6.1",
+            "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz",
+            "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==",
             "license": "MIT",
             "bin": {
                 "jiti": "lib/jiti-cli.mjs"
             }
         },
         "node_modules/jotai": {
-            "version": "2.13.0",
-            "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.13.0.tgz",
-            "integrity": "sha512-H43zXdanNTdpfOEJ4NVbm4hgmrctpXLZagjJNcqAywhUv+sTE7esvFjwm5oBg/ywT9Qw63lIkM6fjrhFuW8UDg==",
+            "version": "2.15.0",
+            "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.15.0.tgz",
+            "integrity": "sha512-nbp/6jN2Ftxgw0VwoVnOg0m5qYM1rVcfvij+MZx99Z5IK13eGve9FJoCwGv+17JvVthTjhSmNtT5e1coJnr6aw==",
             "license": "MIT",
             "peer": true,
             "engines": {
@@ -4553,23 +4747,254 @@
                 "node": ">= 0.8.0"
             }
         },
-        "node_modules/lilconfig": {
-            "version": "3.1.3",
-            "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
-            "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
-            "license": "MIT",
+        "node_modules/lightningcss": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.30.2.tgz",
+            "integrity": "sha512-utfs7Pr5uJyyvDETitgsaqSyjCb2qNRAtuqUeWIAKztsOYdcACf2KtARYXg2pSvhkt+9NfoaNY7fxjl6nuMjIQ==",
+            "license": "MPL-2.0",
+            "dependencies": {
+                "detect-libc": "^2.0.3"
+            },
             "engines": {
-                "node": ">=14"
+                "node": ">= 12.0.0"
             },
             "funding": {
-                "url": "https://github.com/sponsors/antonk52"
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            },
+            "optionalDependencies": {
+                "lightningcss-android-arm64": "1.30.2",
+                "lightningcss-darwin-arm64": "1.30.2",
+                "lightningcss-darwin-x64": "1.30.2",
+                "lightningcss-freebsd-x64": "1.30.2",
+                "lightningcss-linux-arm-gnueabihf": "1.30.2",
+                "lightningcss-linux-arm64-gnu": "1.30.2",
+                "lightningcss-linux-arm64-musl": "1.30.2",
+                "lightningcss-linux-x64-gnu": "1.30.2",
+                "lightningcss-linux-x64-musl": "1.30.2",
+                "lightningcss-win32-arm64-msvc": "1.30.2",
+                "lightningcss-win32-x64-msvc": "1.30.2"
             }
         },
-        "node_modules/lines-and-columns": {
-            "version": "1.2.4",
-            "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-            "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-            "license": "MIT"
+        "node_modules/lightningcss-android-arm64": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.30.2.tgz",
+            "integrity": "sha512-BH9sEdOCahSgmkVhBLeU7Hc9DWeZ1Eb6wNS6Da8igvUwAe0sqROHddIlvU06q3WyXVEOYDZ6ykBZQnjTbmo4+A==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "android"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-darwin-arm64": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.30.2.tgz",
+            "integrity": "sha512-ylTcDJBN3Hp21TdhRT5zBOIi73P6/W0qwvlFEk22fkdXchtNTOU4Qc37SkzV+EKYxLouZ6M4LG9NfZ1qkhhBWA==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-darwin-x64": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.30.2.tgz",
+            "integrity": "sha512-oBZgKchomuDYxr7ilwLcyms6BCyLn0z8J0+ZZmfpjwg9fRVZIR5/GMXd7r9RH94iDhld3UmSjBM6nXWM2TfZTQ==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "darwin"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-freebsd-x64": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.30.2.tgz",
+            "integrity": "sha512-c2bH6xTrf4BDpK8MoGG4Bd6zAMZDAXS569UxCAGcA7IKbHNMlhGQ89eRmvpIUGfKWNVdbhSbkQaWhEoMGmGslA==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "freebsd"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-linux-arm-gnueabihf": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.30.2.tgz",
+            "integrity": "sha512-eVdpxh4wYcm0PofJIZVuYuLiqBIakQ9uFZmipf6LF/HRj5Bgm0eb3qL/mr1smyXIS1twwOxNWndd8z0E374hiA==",
+            "cpu": [
+                "arm"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-linux-arm64-gnu": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.30.2.tgz",
+            "integrity": "sha512-UK65WJAbwIJbiBFXpxrbTNArtfuznvxAJw4Q2ZGlU8kPeDIWEX1dg3rn2veBVUylA2Ezg89ktszWbaQnxD/e3A==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-linux-arm64-musl": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.30.2.tgz",
+            "integrity": "sha512-5Vh9dGeblpTxWHpOx8iauV02popZDsCYMPIgiuw97OJ5uaDsL86cnqSFs5LZkG3ghHoX5isLgWzMs+eD1YzrnA==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-linux-x64-gnu": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.30.2.tgz",
+            "integrity": "sha512-Cfd46gdmj1vQ+lR6VRTTadNHu6ALuw2pKR9lYq4FnhvgBc4zWY1EtZcAc6EffShbb1MFrIPfLDXD6Xprbnni4w==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-linux-x64-musl": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.30.2.tgz",
+            "integrity": "sha512-XJaLUUFXb6/QG2lGIW6aIk6jKdtjtcffUT0NKvIqhSBY3hh9Ch+1LCeH80dR9q9LBjG3ewbDjnumefsLsP6aiA==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "linux"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-win32-arm64-msvc": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.30.2.tgz",
+            "integrity": "sha512-FZn+vaj7zLv//D/192WFFVA0RgHawIcHqLX9xuWiQt7P0PtdFEVaxgF9rjM/IRYHQXNnk61/H/gb2Ei+kUQ4xQ==",
+            "cpu": [
+                "arm64"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
+        },
+        "node_modules/lightningcss-win32-x64-msvc": {
+            "version": "1.30.2",
+            "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.30.2.tgz",
+            "integrity": "sha512-5g1yc73p+iAkid5phb4oVFMB45417DkRevRbt/El/gKXJk4jid+vPFF/AXbxn05Aky8PapwzZrdJShv5C0avjw==",
+            "cpu": [
+                "x64"
+            ],
+            "license": "MPL-2.0",
+            "optional": true,
+            "os": [
+                "win32"
+            ],
+            "engines": {
+                "node": ">= 12.0.0"
+            },
+            "funding": {
+                "type": "opencollective",
+                "url": "https://opencollective.com/parcel"
+            }
         },
         "node_modules/locate-path": {
             "version": "6.0.0",
@@ -4611,27 +5036,37 @@
             }
         },
         "node_modules/lucide-react": {
-            "version": "0.454.0",
-            "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.454.0.tgz",
-            "integrity": "sha512-hw7zMDwykCLnEzgncEEjHeA6+45aeEzRYuKHuyRSOPkhko+J3ySGjGIzu+mmMfDFG1vazHepMaYFYHbTFAZAAQ==",
+            "version": "0.545.0",
+            "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.545.0.tgz",
+            "integrity": "sha512-7r1/yUuflQDSt4f1bpn5ZAocyIxcTyVyBBChSVtBKn5M+392cPmI5YJMWOJKk/HUWGm5wg83chlAZtCcGbEZtw==",
             "license": "ISC",
             "peerDependencies": {
-                "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc"
+                "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0"
             }
         },
         "node_modules/luxon": {
-            "version": "3.7.1",
-            "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.1.tgz",
-            "integrity": "sha512-RkRWjA926cTvz5rAb1BqyWkKbbjzCGchDUIKMCUvNi17j6f6j8uHGDV82Aqcqtzd+icoYpELmG3ksgGiFNNcNg==",
+            "version": "3.7.2",
+            "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.7.2.tgz",
+            "integrity": "sha512-vtEhXh/gNjI9Yg1u4jX/0YVPMvxzHuGgCm6tC5kZyb08yjGWGnqAjGJvcXbqQR2P3MyMEFnRbpcdFS6PBcLqew==",
             "license": "MIT",
             "engines": {
                 "node": ">=12"
             }
         },
+        "node_modules/magic-string": {
+            "version": "0.30.21",
+            "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
+            "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==",
+            "license": "MIT",
+            "dependencies": {
+                "@jridgewell/sourcemap-codec": "^1.5.5"
+            }
+        },
         "node_modules/merge2": {
             "version": "1.4.1",
             "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
             "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">= 8"
@@ -4641,6 +5076,7 @@
             "version": "4.0.8",
             "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
             "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "braces": "^3.0.3",
@@ -4663,28 +5099,19 @@
                 "node": "*"
             }
         },
-        "node_modules/minipass": {
-            "version": "7.1.2",
-            "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-            "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-            "license": "ISC",
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
-            }
-        },
         "node_modules/motion-dom": {
-            "version": "11.18.1",
-            "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-11.18.1.tgz",
-            "integrity": "sha512-g76KvA001z+atjfxczdRtw/RXOM3OMSdd1f4DL77qCTF/+avrRJiawSG4yDibEQ215sr9kpinSlX2pCTJ9zbhw==",
+            "version": "12.23.23",
+            "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.23.23.tgz",
+            "integrity": "sha512-n5yolOs0TQQBRUFImrRfs/+6X4p3Q4n1dUEqt/H58Vx7OW6RF+foWEgmTVDhIWJIMXOuNNL0apKH2S16en9eiA==",
             "license": "MIT",
             "dependencies": {
-                "motion-utils": "^11.18.1"
+                "motion-utils": "^12.23.6"
             }
         },
         "node_modules/motion-utils": {
-            "version": "11.18.1",
-            "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-11.18.1.tgz",
-            "integrity": "sha512-49Kt+HKjtbJKLtgO/LKj9Ld+6vw9BjH5d9sc40R/kVyH8GLAXgT42M2NnuPcJNuA3s9ZfZBUcwIgpmZWGEE+hA==",
+            "version": "12.23.6",
+            "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.23.6.tgz",
+            "integrity": "sha512-eAWoPgr4eFEOFfg2WjIsMoqJTW6Z8MTUCgn/GZ3VRpClWBdnbjryiA3ZSNLyxCTmCQx4RmYX6jX1iWHbenUPNQ==",
             "license": "MIT"
         },
         "node_modules/ms": {
@@ -4693,17 +5120,6 @@
             "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
             "license": "MIT"
         },
-        "node_modules/mz": {
-            "version": "2.7.0",
-            "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-            "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
-            "license": "MIT",
-            "dependencies": {
-                "any-promise": "^1.0.0",
-                "object-assign": "^4.0.1",
-                "thenify-all": "^1.0.0"
-            }
-        },
         "node_modules/nanoid": {
             "version": "3.3.11",
             "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
@@ -4791,21 +5207,12 @@
             }
         },
         "node_modules/node-releases": {
-            "version": "2.0.19",
-            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
-            "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
+            "version": "2.0.27",
+            "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz",
+            "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==",
             "devOptional": true,
             "license": "MIT"
         },
-        "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/normalize-range": {
             "version": "0.1.2",
             "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
@@ -4817,16 +5224,16 @@
             }
         },
         "node_modules/nypm": {
-            "version": "0.6.1",
-            "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.6.1.tgz",
-            "integrity": "sha512-hlacBiRiv1k9hZFiphPUkfSQ/ZfQzZDzC+8z0wL3lvDAOUu/2NnChkKuMoMjNur/9OpKuz2QsIeiPVN0xM5Q0w==",
+            "version": "0.6.2",
+            "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.6.2.tgz",
+            "integrity": "sha512-7eM+hpOtrKrBDCh7Ypu2lJ9Z7PNZBdi/8AT3AX8xoCj43BBVHD0hPSTEvMtkMpfs8FCqBGhxB+uToIQimA111g==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "citty": "^0.1.6",
                 "consola": "^3.4.2",
                 "pathe": "^2.0.3",
-                "pkg-types": "^2.2.0",
+                "pkg-types": "^2.3.0",
                 "tinyexec": "^1.0.1"
             },
             "bin": {
@@ -4941,24 +5348,6 @@
                 "node": ">= 6"
             }
         },
-        "node_modules/object-assign": {
-            "version": "4.1.1",
-            "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-            "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/object-hash": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
-            "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 6"
-            }
-        },
         "node_modules/ohash": {
             "version": "2.0.11",
             "resolved": "https://registry.npmjs.org/ohash/-/ohash-2.0.11.tgz",
@@ -4966,6 +5355,13 @@
             "dev": true,
             "license": "MIT"
         },
+        "node_modules/openapi-types": {
+            "version": "12.1.3",
+            "resolved": "https://registry.npmjs.org/openapi-types/-/openapi-types-12.1.3.tgz",
+            "integrity": "sha512-N4YtSYJqghVu4iek2ZUvcN/0aqH1kRDuNqzcycDxhOUpg7GdvLa2F3DgS6yBNhInhv2r/6I0Flkn7CqL8+nIcw==",
+            "dev": true,
+            "license": "MIT"
+        },
         "node_modules/optionator": {
             "version": "0.9.4",
             "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
@@ -5016,12 +5412,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "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/parent-module": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -5049,39 +5439,12 @@
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
             "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=8"
             }
         },
-        "node_modules/path-parse": {
-            "version": "1.0.7",
-            "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-            "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-            "license": "MIT"
-        },
-        "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/path-scurry/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/pathe": {
             "version": "2.0.3",
             "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz",
@@ -5090,9 +5453,9 @@
             "license": "MIT"
         },
         "node_modules/perfect-debounce": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz",
-            "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==",
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-2.0.0.tgz",
+            "integrity": "sha512-fkEH/OBiKrqqI/yIgjR92lMfs2K8105zt/VT6+7eTjNwisrsh47CeIED9z58zI7DfKdH3uHAn25ziRZn3kgAow==",
             "dev": true,
             "license": "MIT"
         },
@@ -5106,6 +5469,7 @@
             "version": "2.3.1",
             "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
             "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=8.6"
@@ -5114,28 +5478,10 @@
                 "url": "https://github.com/sponsors/jonschlinkert"
             }
         },
-        "node_modules/pify": {
-            "version": "2.3.0",
-            "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-            "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=0.10.0"
-            }
-        },
-        "node_modules/pirates": {
-            "version": "4.0.7",
-            "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
-            "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 6"
-            }
-        },
         "node_modules/pkg-types": {
-            "version": "2.2.0",
-            "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.2.0.tgz",
-            "integrity": "sha512-2SM/GZGAEkPp3KWORxQZns4M+WSeXbC2HEvmOIJe3Cmiv6ieAJvdVhDldtHqM5J1Y7MrR1XhkBT/rMlhh9FdqQ==",
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.0.tgz",
+            "integrity": "sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -5172,119 +5518,11 @@
                 "node": "^10 || ^12 || >=14"
             }
         },
-        "node_modules/postcss-import": {
-            "version": "15.1.0",
-            "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
-            "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
-            "license": "MIT",
-            "dependencies": {
-                "postcss-value-parser": "^4.0.0",
-                "read-cache": "^1.0.0",
-                "resolve": "^1.1.7"
-            },
-            "engines": {
-                "node": ">=14.0.0"
-            },
-            "peerDependencies": {
-                "postcss": "^8.0.0"
-            }
-        },
-        "node_modules/postcss-js": {
-            "version": "4.0.1",
-            "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
-            "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
-            "license": "MIT",
-            "dependencies": {
-                "camelcase-css": "^2.0.1"
-            },
-            "engines": {
-                "node": "^12 || ^14 || >= 16"
-            },
-            "funding": {
-                "type": "opencollective",
-                "url": "https://opencollective.com/postcss/"
-            },
-            "peerDependencies": {
-                "postcss": "^8.4.21"
-            }
-        },
-        "node_modules/postcss-load-config": {
-            "version": "4.0.2",
-            "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz",
-            "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==",
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/postcss/"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "lilconfig": "^3.0.0",
-                "yaml": "^2.3.4"
-            },
-            "engines": {
-                "node": ">= 14"
-            },
-            "peerDependencies": {
-                "postcss": ">=8.0.9",
-                "ts-node": ">=9.0.0"
-            },
-            "peerDependenciesMeta": {
-                "postcss": {
-                    "optional": true
-                },
-                "ts-node": {
-                    "optional": true
-                }
-            }
-        },
-        "node_modules/postcss-nested": {
-            "version": "6.2.0",
-            "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
-            "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==",
-            "funding": [
-                {
-                    "type": "opencollective",
-                    "url": "https://opencollective.com/postcss/"
-                },
-                {
-                    "type": "github",
-                    "url": "https://github.com/sponsors/ai"
-                }
-            ],
-            "license": "MIT",
-            "dependencies": {
-                "postcss-selector-parser": "^6.1.1"
-            },
-            "engines": {
-                "node": ">=12.0"
-            },
-            "peerDependencies": {
-                "postcss": "^8.2.14"
-            }
-        },
-        "node_modules/postcss-selector-parser": {
-            "version": "6.1.2",
-            "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
-            "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
-            "license": "MIT",
-            "dependencies": {
-                "cssesc": "^3.0.0",
-                "util-deprecate": "^1.0.2"
-            },
-            "engines": {
-                "node": ">=4"
-            }
-        },
         "node_modules/postcss-value-parser": {
             "version": "4.2.0",
             "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
             "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+            "dev": true,
             "license": "MIT"
         },
         "node_modules/prelude-ls": {
@@ -5413,6 +5651,7 @@
             "version": "1.2.3",
             "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
             "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+            "dev": true,
             "funding": [
                 {
                     "type": "github",
@@ -5441,30 +5680,51 @@
             }
         },
         "node_modules/react": {
-            "version": "19.1.1",
-            "resolved": "https://registry.npmjs.org/react/-/react-19.1.1.tgz",
-            "integrity": "sha512-w8nqGImo45dmMIfljjMwOGtbmC/mk4CMYhWIicdSflH91J9TyCyczcPFXJzrZ/ZXcgGRFeP6BU0BEJTw6tZdfQ==",
+            "version": "19.2.0",
+            "resolved": "https://registry.npmjs.org/react/-/react-19.2.0.tgz",
+            "integrity": "sha512-tmbWg6W31tQLeB5cdIBOicJDJRR2KzXsV7uSK9iNfLWQ5bIZfxuPEHp7M8wiHyHnn0DD1i7w3Zmin0FtkrwoCQ==",
             "license": "MIT",
             "engines": {
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/react-dom": {
-            "version": "19.1.1",
-            "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.1.1.tgz",
-            "integrity": "sha512-Dlq/5LAZgF0Gaz6yiqZCf6VCcZs1ghAJyrsu84Q/GT0gV+mCxbfmKNoGRKBYMJ8IEdGPqu49YWXD02GCknEDkw==",
+        "node_modules/react-day-picker": {
+            "version": "9.11.1",
+            "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-9.11.1.tgz",
+            "integrity": "sha512-l3ub6o8NlchqIjPKrRFUCkTUEq6KwemQlfv3XZzzwpUeGwmDJ+0u0Upmt38hJyd7D/vn2dQoOoLV/qAp0o3uUw==",
             "license": "MIT",
             "dependencies": {
-                "scheduler": "^0.26.0"
+                "@date-fns/tz": "^1.4.1",
+                "date-fns": "^4.1.0",
+                "date-fns-jalali": "^4.1.0-0"
+            },
+            "engines": {
+                "node": ">=18"
+            },
+            "funding": {
+                "type": "individual",
+                "url": "https://github.com/sponsors/gpbl"
             },
             "peerDependencies": {
-                "react": "^19.1.1"
+                "react": ">=16.8.0"
+            }
+        },
+        "node_modules/react-dom": {
+            "version": "19.2.0",
+            "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.0.tgz",
+            "integrity": "sha512-UlbRu4cAiGaIewkPyiRGJk0imDN2T3JjieT6spoL2UeSf5od4n5LB/mQ4ejmxhCFT1tYe8IvaFulzynWovsEFQ==",
+            "license": "MIT",
+            "dependencies": {
+                "scheduler": "^0.27.0"
+            },
+            "peerDependencies": {
+                "react": "^19.2.0"
             }
         },
         "node_modules/react-hook-form": {
-            "version": "7.62.0",
-            "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.62.0.tgz",
-            "integrity": "sha512-7KWFejc98xqG/F4bAxpL41NB3o1nnvQO1RWZT3TqRZYL8RryQETGfEdVnJN2fy1crCiBLLjkRBVK05j24FxJGA==",
+            "version": "7.65.0",
+            "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.65.0.tgz",
+            "integrity": "sha512-xtOzDz063WcXvGWaHgLNrNzlsdFgtUWcb32E6WFaGTd7kPZG3EeDusjdZfUsPwKCKVXy1ZlntifaHZ4l8pAsmw==",
             "license": "MIT",
             "engines": {
                 "node": ">=18.0.0"
@@ -5478,16 +5738,17 @@
             }
         },
         "node_modules/react-i18next": {
-            "version": "15.6.1",
-            "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.6.1.tgz",
-            "integrity": "sha512-uGrzSsOUUe2sDBG/+FJq2J1MM+Y4368/QW8OLEKSFvnDflHBbZhSd1u3UkW0Z06rMhZmnB/AQrhCpYfE5/5XNg==",
+            "version": "16.2.2",
+            "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-16.2.2.tgz",
+            "integrity": "sha512-iKgJMloKpkLUCy6w/0BEJSVQ5jG2WbnFiO2w/9wwa8nc+obsEZjQErRCw27O7BHlpscKfpWSu5vTnC+3fBMQfQ==",
             "license": "MIT",
             "dependencies": {
                 "@babel/runtime": "^7.27.6",
-                "html-parse-stringify": "^3.0.1"
+                "html-parse-stringify": "^3.0.1",
+                "use-sync-external-store": "^1.6.0"
             },
             "peerDependencies": {
-                "i18next": ">= 23.2.3",
+                "i18next": ">= 25.5.2",
                 "react": ">= 16.8.0",
                 "typescript": "^5"
             },
@@ -5504,9 +5765,9 @@
             }
         },
         "node_modules/react-refresh": {
-            "version": "0.17.0",
-            "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz",
-            "integrity": "sha512-z6F7K9bV85EfseRCp2bzrpyQ0Gkw1uLoCel9XBVWPg/TjRj94SkJzUTGfOa4bs7iJvBWtQG0Wq7wnI0syw3EBQ==",
+            "version": "0.18.0",
+            "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.18.0.tgz",
+            "integrity": "sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==",
             "dev": true,
             "license": "MIT",
             "engines": {
@@ -5561,9 +5822,9 @@
             }
         },
         "node_modules/react-router": {
-            "version": "7.8.0",
-            "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.8.0.tgz",
-            "integrity": "sha512-r15M3+LHKgM4SOapNmsH3smAizWds1vJ0Z9C4mWaKnT9/wD7+d/0jYcj6LmOvonkrO4Rgdyp4KQ/29gWN2i1eg==",
+            "version": "7.9.5",
+            "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.9.5.tgz",
+            "integrity": "sha512-JmxqrnBZ6E9hWmf02jzNn9Jm3UqyeimyiwzD69NjxGySG6lIz/1LVPsoTCwN7NBX2XjCEa1LIX5EMz1j2b6u6A==",
             "license": "MIT",
             "dependencies": {
                 "cookie": "^1.0.1",
@@ -5583,12 +5844,12 @@
             }
         },
         "node_modules/react-router-dom": {
-            "version": "7.8.0",
-            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.8.0.tgz",
-            "integrity": "sha512-ntInsnDVnVRdtSu6ODmTQ41cbluak/ENeTif7GBce0L6eztFg6/e1hXAysFQI8X25C8ipKmT9cClbJwxx3Kaqw==",
+            "version": "7.9.5",
+            "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.9.5.tgz",
+            "integrity": "sha512-mkEmq/K8tKN63Ae2M7Xgz3c9l9YNbY+NHH6NNeUmLA3kDkhKXRsNb/ZpxaEunvGo2/3YXdk5EJU3Hxp3ocaBPw==",
             "license": "MIT",
             "dependencies": {
-                "react-router": "7.8.0"
+                "react-router": "7.9.5"
             },
             "engines": {
                 "node": ">=20.0.0"
@@ -5621,24 +5882,15 @@
             }
         },
         "node_modules/react-virtuoso": {
-            "version": "4.13.0",
-            "resolved": "https://registry.npmjs.org/react-virtuoso/-/react-virtuoso-4.13.0.tgz",
-            "integrity": "sha512-XHv2Fglpx80yFPdjZkV9d1baACKghg/ucpDFEXwaix7z0AfVQj+mF6lM+YQR6UC/TwzXG2rJKydRMb3+7iV3PA==",
+            "version": "4.14.1",
+            "resolved": "https://registry.npmjs.org/react-virtuoso/-/react-virtuoso-4.14.1.tgz",
+            "integrity": "sha512-NRUF1ak8lY+Tvc6WN9cce59gU+lilzVtOozP+pm9J7iHshLGGjsiAB4rB2qlBPHjFbcXOQpT+7womNHGDUql8w==",
             "license": "MIT",
             "peerDependencies": {
                 "react": ">=16 || >=17 || >= 18 || >= 19",
                 "react-dom": ">=16 || >=17 || >= 18 || >=19"
             }
         },
-        "node_modules/read-cache": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
-            "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
-            "license": "MIT",
-            "dependencies": {
-                "pify": "^2.3.0"
-            }
-        },
         "node_modules/readdirp": {
             "version": "4.1.2",
             "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-4.1.2.tgz",
@@ -5673,26 +5925,6 @@
                 "node": ">=0.10.0"
             }
         },
-        "node_modules/resolve": {
-            "version": "1.22.10",
-            "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
-            "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
-            "license": "MIT",
-            "dependencies": {
-                "is-core-module": "^2.16.0",
-                "path-parse": "^1.0.7",
-                "supports-preserve-symlinks-flag": "^1.0.0"
-            },
-            "bin": {
-                "resolve": "bin/resolve"
-            },
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
         "node_modules/resolve-from": {
             "version": "4.0.0",
             "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
@@ -5707,6 +5939,7 @@
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
             "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "iojs": ">=1.0.0",
@@ -5714,9 +5947,9 @@
             }
         },
         "node_modules/rollup": {
-            "version": "4.46.2",
-            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.46.2.tgz",
-            "integrity": "sha512-WMmLFI+Boh6xbop+OAGo9cQ3OgX9MIg7xOQjn+pTCwOkk+FNDAeAemXkJ3HzDJrVXleLOFVa1ipuc1AmEx1Dwg==",
+            "version": "4.52.5",
+            "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.52.5.tgz",
+            "integrity": "sha512-3GuObel8h7Kqdjt0gxkEzaifHTqLVW56Y/bjN7PSQtkKr0w3V/QYSdt6QWYtd7A1xUtYQigtdUfgj1RvWVtorw==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
@@ -5730,26 +5963,28 @@
                 "npm": ">=8.0.0"
             },
             "optionalDependencies": {
-                "@rollup/rollup-android-arm-eabi": "4.46.2",
-                "@rollup/rollup-android-arm64": "4.46.2",
-                "@rollup/rollup-darwin-arm64": "4.46.2",
-                "@rollup/rollup-darwin-x64": "4.46.2",
-                "@rollup/rollup-freebsd-arm64": "4.46.2",
-                "@rollup/rollup-freebsd-x64": "4.46.2",
-                "@rollup/rollup-linux-arm-gnueabihf": "4.46.2",
-                "@rollup/rollup-linux-arm-musleabihf": "4.46.2",
-                "@rollup/rollup-linux-arm64-gnu": "4.46.2",
-                "@rollup/rollup-linux-arm64-musl": "4.46.2",
-                "@rollup/rollup-linux-loongarch64-gnu": "4.46.2",
-                "@rollup/rollup-linux-ppc64-gnu": "4.46.2",
-                "@rollup/rollup-linux-riscv64-gnu": "4.46.2",
-                "@rollup/rollup-linux-riscv64-musl": "4.46.2",
-                "@rollup/rollup-linux-s390x-gnu": "4.46.2",
-                "@rollup/rollup-linux-x64-gnu": "4.46.2",
-                "@rollup/rollup-linux-x64-musl": "4.46.2",
-                "@rollup/rollup-win32-arm64-msvc": "4.46.2",
-                "@rollup/rollup-win32-ia32-msvc": "4.46.2",
-                "@rollup/rollup-win32-x64-msvc": "4.46.2",
+                "@rollup/rollup-android-arm-eabi": "4.52.5",
+                "@rollup/rollup-android-arm64": "4.52.5",
+                "@rollup/rollup-darwin-arm64": "4.52.5",
+                "@rollup/rollup-darwin-x64": "4.52.5",
+                "@rollup/rollup-freebsd-arm64": "4.52.5",
+                "@rollup/rollup-freebsd-x64": "4.52.5",
+                "@rollup/rollup-linux-arm-gnueabihf": "4.52.5",
+                "@rollup/rollup-linux-arm-musleabihf": "4.52.5",
+                "@rollup/rollup-linux-arm64-gnu": "4.52.5",
+                "@rollup/rollup-linux-arm64-musl": "4.52.5",
+                "@rollup/rollup-linux-loong64-gnu": "4.52.5",
+                "@rollup/rollup-linux-ppc64-gnu": "4.52.5",
+                "@rollup/rollup-linux-riscv64-gnu": "4.52.5",
+                "@rollup/rollup-linux-riscv64-musl": "4.52.5",
+                "@rollup/rollup-linux-s390x-gnu": "4.52.5",
+                "@rollup/rollup-linux-x64-gnu": "4.52.5",
+                "@rollup/rollup-linux-x64-musl": "4.52.5",
+                "@rollup/rollup-openharmony-arm64": "4.52.5",
+                "@rollup/rollup-win32-arm64-msvc": "4.52.5",
+                "@rollup/rollup-win32-ia32-msvc": "4.52.5",
+                "@rollup/rollup-win32-x64-gnu": "4.52.5",
+                "@rollup/rollup-win32-x64-msvc": "4.52.5",
                 "fsevents": "~2.3.2"
             }
         },
@@ -5757,6 +5992,7 @@
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
             "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+            "dev": true,
             "funding": [
                 {
                     "type": "github",
@@ -5777,9 +6013,9 @@
             }
         },
         "node_modules/scheduler": {
-            "version": "0.26.0",
-            "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.26.0.tgz",
-            "integrity": "sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==",
+            "version": "0.27.0",
+            "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz",
+            "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
             "license": "MIT"
         },
         "node_modules/semver": {
@@ -5793,15 +6029,16 @@
             }
         },
         "node_modules/set-cookie-parser": {
-            "version": "2.7.1",
-            "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
-            "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==",
+            "version": "2.7.2",
+            "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz",
+            "integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==",
             "license": "MIT"
         },
         "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==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "shebang-regex": "^3.0.0"
@@ -5814,6 +6051,7 @@
             "version": "3.0.0",
             "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
             "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+            "dev": true,
             "license": "MIT",
             "engines": {
                 "node": ">=8"
@@ -5879,22 +6117,10 @@
             "dev": true,
             "license": "MIT"
         },
-        "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/sonner": {
-            "version": "1.7.4",
-            "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.7.4.tgz",
-            "integrity": "sha512-DIS8z4PfJRbIyfVFDVnK9rO3eYDtse4Omcm6bt0oEr5/jtLgysmjuBl1frJ9E/EQZrFmKx2A8m/s5s9CRXIzhw==",
+            "version": "2.0.7",
+            "resolved": "https://registry.npmjs.org/sonner/-/sonner-2.0.7.tgz",
+            "integrity": "sha512-W6ZN4p58k8aDKA4XPcx2hpIQXBRAgyiWVkYhT7CvK6D3iAu7xjvVyhQHg2/iaKJZ1XVJ4r7XuwGL+WGEK37i9w==",
             "license": "MIT",
             "peerDependencies": {
                 "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc",
@@ -5911,27 +6137,10 @@
             }
         },
         "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/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==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "emoji-regex": "^8.0.0",
@@ -5942,53 +6151,11 @@
                 "node": ">=8"
             }
         },
-        "node_modules/string-width-cjs/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/string-width-cjs/node_modules/emoji-regex": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "license": "MIT"
-        },
-        "node_modules/string-width-cjs/node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "license": "MIT",
-            "dependencies": {
-                "ansi-regex": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/strip-ansi": {
-            "version": "7.1.0",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-            "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
-            "license": "MIT",
-            "dependencies": {
-                "ansi-regex": "^6.0.1"
-            },
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-            }
-        },
-        "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==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "ansi-regex": "^5.0.1"
@@ -5997,15 +6164,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/strip-ansi-cjs/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/strip-json-comments": {
             "version": "3.1.1",
             "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
@@ -6019,28 +6177,6 @@
                 "url": "https://github.com/sponsors/sindresorhus"
             }
         },
-        "node_modules/sucrase": {
-            "version": "3.35.0",
-            "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",
-            "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==",
-            "license": "MIT",
-            "dependencies": {
-                "@jridgewell/gen-mapping": "^0.3.2",
-                "commander": "^4.0.0",
-                "glob": "^10.3.10",
-                "lines-and-columns": "^1.1.6",
-                "mz": "^2.7.0",
-                "pirates": "^4.0.1",
-                "ts-interface-checker": "^0.1.9"
-            },
-            "bin": {
-                "sucrase": "bin/sucrase",
-                "sucrase-node": "bin/sucrase-node"
-            },
-            "engines": {
-                "node": ">=16 || 14 >=14.17"
-            }
-        },
         "node_modules/supports-color": {
             "version": "7.2.0",
             "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
@@ -6054,18 +6190,6 @@
                 "node": ">=8"
             }
         },
-        "node_modules/supports-preserve-symlinks-flag": {
-            "version": "1.0.0",
-            "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
-            "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-            "license": "MIT",
-            "engines": {
-                "node": ">= 0.4"
-            },
-            "funding": {
-                "url": "https://github.com/sponsors/ljharb"
-            }
-        },
         "node_modules/swagger-schema-official": {
             "version": "2.0.0-bab6bed",
             "resolved": "https://registry.npmjs.org/swagger-schema-official/-/swagger-schema-official-2.0.0-bab6bed.tgz",
@@ -6074,25 +6198,27 @@
             "license": "ISC"
         },
         "node_modules/swagger-typescript-api": {
-            "version": "13.2.8",
-            "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.2.8.tgz",
-            "integrity": "sha512-TgC8cB2GwrQctiUrLW9cVcPkiH5/zGbUCD3Y5zjeeFAtcCBGxLlBp9Df/UK+ux/oQ2J8x3C5a4TOz+tAZ8jOkQ==",
+            "version": "13.2.16",
+            "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.2.16.tgz",
+            "integrity": "sha512-PbjfCbNMx1mxqLamUpMA96fl2HJQh9Q5qRWyVRXmZslRJFHBkMfAj7OnEv6IOtSnmD+TXp073yBhKWiUxqeLhQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@biomejs/js-api": "2.0.3",
-                "@biomejs/wasm-nodejs": "2.1.4",
+                "@biomejs/js-api": "3.0.0",
+                "@biomejs/wasm-nodejs": "2.2.6",
+                "@types/lodash": "^4.17.20",
                 "@types/swagger-schema-official": "^2.0.25",
-                "c12": "^3.0.4",
+                "c12": "^3.3.0",
                 "citty": "^0.1.6",
                 "consola": "^3.4.2",
-                "eta": "^2.2.0",
-                "js-yaml": "^4.1.0",
+                "eta": "^3.5.0",
                 "lodash": "^4.17.21",
-                "nanoid": "^5.1.5",
+                "nanoid": "^5.1.6",
+                "openapi-types": "^12.1.3",
                 "swagger-schema-official": "2.0.0-bab6bed",
                 "swagger2openapi": "^7.0.8",
-                "typescript": "~5.9.2"
+                "typescript": "~5.9.3",
+                "yaml": "^2.8.1"
             },
             "bin": {
                 "sta": "dist/cli.js",
@@ -6103,9 +6229,9 @@
             }
         },
         "node_modules/swagger-typescript-api/node_modules/nanoid": {
-            "version": "5.1.5",
-            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.5.tgz",
-            "integrity": "sha512-Ir/+ZpE9fDsNH0hQ3C68uyThDXzYcim2EqcZ8zn8Chtt1iylPT9xXJB0kPCnqzgcEGikO9RxSrh63MsmVCU7Fw==",
+            "version": "5.1.6",
+            "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.6.tgz",
+            "integrity": "sha512-c7+7RQ+dMB5dPwwCp4ee1/iV/q2P6aK1mTZcfr1BTuVlyW9hJYiMPybJCcnBlQtuSmTIWNeazm/zqNoZSSElBg==",
             "dev": true,
             "funding": [
                 {
@@ -6121,20 +6247,6 @@
                 "node": "^18 || >=20"
             }
         },
-        "node_modules/swagger-typescript-api/node_modules/typescript": {
-            "version": "5.9.2",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.2.tgz",
-            "integrity": "sha512-CWBzXQrc/qOkhidw1OzBTQuYRbfyxDXJMVJ1XNwUHGROVmuaeiEm3OslpZ1RV96d7SKKjZKrSJu3+t/xlw3R9A==",
-            "dev": true,
-            "license": "Apache-2.0",
-            "bin": {
-                "tsc": "bin/tsc",
-                "tsserver": "bin/tsserver"
-            },
-            "engines": {
-                "node": ">=14.17"
-            }
-        },
         "node_modules/swagger2openapi": {
             "version": "7.0.8",
             "resolved": "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-7.0.8.tgz",
@@ -6174,9 +6286,9 @@
             }
         },
         "node_modules/swr": {
-            "version": "2.3.5",
-            "resolved": "https://registry.npmjs.org/swr/-/swr-2.3.5.tgz",
-            "integrity": "sha512-4e7pjTVulZTIL+b/S0RYFsgDcTcXPLUOvBPqyh9YdD+PkHeEMoaPwDmF9Kv6I1nnPg1OFKhiiEYpsYaaE2W2jA==",
+            "version": "2.3.6",
+            "resolved": "https://registry.npmjs.org/swr/-/swr-2.3.6.tgz",
+            "integrity": "sha512-wfHRmHWk/isGNMwlLGlZX5Gzz/uTgo0o2IRuTMcf4CPuPFJZlq0rDaKUx+ozB5nBOReNV1kiOyzMfj+MBMikLw==",
             "license": "MIT",
             "dependencies": {
                 "dequal": "^2.0.3",
@@ -6187,9 +6299,9 @@
             }
         },
         "node_modules/tailwind-merge": {
-            "version": "2.6.0",
-            "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz",
-            "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==",
+            "version": "3.3.1",
+            "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.3.1.tgz",
+            "integrity": "sha512-gBXpgUm/3rp1lMZZrM/w7D8GKqshif0zAymAhbCyIt8KMe+0v9DQ7cdYLR4FHH/cKpdTXb+A/tKKU3eolfsI+g==",
             "license": "MIT",
             "funding": {
                 "type": "github",
@@ -6197,41 +6309,10 @@
             }
         },
         "node_modules/tailwindcss": {
-            "version": "3.4.17",
-            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.17.tgz",
-            "integrity": "sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==",
-            "license": "MIT",
-            "dependencies": {
-                "@alloc/quick-lru": "^5.2.0",
-                "arg": "^5.0.2",
-                "chokidar": "^3.6.0",
-                "didyoumean": "^1.2.2",
-                "dlv": "^1.1.3",
-                "fast-glob": "^3.3.2",
-                "glob-parent": "^6.0.2",
-                "is-glob": "^4.0.3",
-                "jiti": "^1.21.6",
-                "lilconfig": "^3.1.3",
-                "micromatch": "^4.0.8",
-                "normalize-path": "^3.0.0",
-                "object-hash": "^3.0.0",
-                "picocolors": "^1.1.1",
-                "postcss": "^8.4.47",
-                "postcss-import": "^15.1.0",
-                "postcss-js": "^4.0.1",
-                "postcss-load-config": "^4.0.2",
-                "postcss-nested": "^6.2.0",
-                "postcss-selector-parser": "^6.1.2",
-                "resolve": "^1.22.8",
-                "sucrase": "^3.35.0"
-            },
-            "bin": {
-                "tailwind": "lib/cli.js",
-                "tailwindcss": "lib/cli.js"
-            },
-            "engines": {
-                "node": ">=14.0.0"
-            }
+            "version": "4.1.16",
+            "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.1.16.tgz",
+            "integrity": "sha512-pONL5awpaQX4LN5eiv7moSiSPd/DLDzKVRJz8Q9PgzmAdd1R4307GQS2ZpfiN7ZmekdQrfhZZiSE5jkLR4WNaA==",
+            "license": "MIT"
         },
         "node_modules/tailwindcss-animate": {
             "version": "1.0.7",
@@ -6242,82 +6323,17 @@
                 "tailwindcss": ">=3.0.0 || insiders"
             }
         },
-        "node_modules/tailwindcss/node_modules/chokidar": {
-            "version": "3.6.0",
-            "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz",
-            "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==",
+        "node_modules/tapable": {
+            "version": "2.3.0",
+            "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz",
+            "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==",
             "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"
+                "node": ">=6"
             },
             "funding": {
-                "url": "https://paulmillr.com/funding/"
-            },
-            "optionalDependencies": {
-                "fsevents": "~2.3.2"
-            }
-        },
-        "node_modules/tailwindcss/node_modules/chokidar/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/tailwindcss/node_modules/jiti": {
-            "version": "1.21.7",
-            "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
-            "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
-            "license": "MIT",
-            "bin": {
-                "jiti": "bin/jiti.js"
-            }
-        },
-        "node_modules/tailwindcss/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/thenify": {
-            "version": "3.3.1",
-            "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
-            "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
-            "license": "MIT",
-            "dependencies": {
-                "any-promise": "^1.0.0"
-            }
-        },
-        "node_modules/thenify-all": {
-            "version": "1.6.0",
-            "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
-            "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
-            "license": "MIT",
-            "dependencies": {
-                "thenify": ">= 3.1.0 < 4"
-            },
-            "engines": {
-                "node": ">=0.8"
+                "type": "opencollective",
+                "url": "https://opencollective.com/webpack"
             }
         },
         "node_modules/tinyexec": {
@@ -6328,14 +6344,14 @@
             "license": "MIT"
         },
         "node_modules/tinyglobby": {
-            "version": "0.2.14",
-            "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.14.tgz",
-            "integrity": "sha512-tX5e7OM1HnYr2+a2C/4V0htOcSQcoSTH9KgJnVvNm5zm/cyEWKJ7j7YutsH9CxMdtOkkLFy2AHrMci9IM8IPZQ==",
+            "version": "0.2.15",
+            "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz",
+            "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "fdir": "^6.4.4",
-                "picomatch": "^4.0.2"
+                "fdir": "^6.5.0",
+                "picomatch": "^4.0.3"
             },
             "engines": {
                 "node": ">=12.0.0"
@@ -6345,11 +6361,14 @@
             }
         },
         "node_modules/tinyglobby/node_modules/fdir": {
-            "version": "6.4.6",
-            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
-            "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
+            "version": "6.5.0",
+            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+            "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
             "dev": true,
             "license": "MIT",
+            "engines": {
+                "node": ">=12.0.0"
+            },
             "peerDependencies": {
                 "picomatch": "^3 || ^4"
             },
@@ -6376,6 +6395,7 @@
             "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==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "is-number": "^7.0.0"
@@ -6410,12 +6430,6 @@
                 "typescript": ">=4.8.4"
             }
         },
-        "node_modules/ts-interface-checker": {
-            "version": "0.1.13",
-            "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
-            "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",
-            "license": "Apache-2.0"
-        },
         "node_modules/tslib": {
             "version": "2.8.1",
             "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
@@ -6436,9 +6450,9 @@
             }
         },
         "node_modules/typescript": {
-            "version": "5.6.3",
-            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
-            "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
+            "version": "5.9.3",
+            "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz",
+            "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==",
             "devOptional": true,
             "license": "Apache-2.0",
             "bin": {
@@ -6450,16 +6464,16 @@
             }
         },
         "node_modules/typescript-eslint": {
-            "version": "8.39.0",
-            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.39.0.tgz",
-            "integrity": "sha512-lH8FvtdtzcHJCkMOKnN73LIn6SLTpoojgJqDAxPm1jCR14eWSGPX8ul/gggBdPMk/d5+u9V854vTYQ8T5jF/1Q==",
+            "version": "8.46.2",
+            "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.46.2.tgz",
+            "integrity": "sha512-vbw8bOmiuYNdzzV3lsiWv6sRwjyuKJMQqWulBOU7M0RrxedXledX8G8kBbQeiOYDnTfiXz0Y4081E1QMNB6iQg==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
-                "@typescript-eslint/eslint-plugin": "8.39.0",
-                "@typescript-eslint/parser": "8.39.0",
-                "@typescript-eslint/typescript-estree": "8.39.0",
-                "@typescript-eslint/utils": "8.39.0"
+                "@typescript-eslint/eslint-plugin": "8.46.2",
+                "@typescript-eslint/parser": "8.46.2",
+                "@typescript-eslint/typescript-estree": "8.46.2",
+                "@typescript-eslint/utils": "8.46.2"
             },
             "engines": {
                 "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -6474,16 +6488,16 @@
             }
         },
         "node_modules/undici-types": {
-            "version": "6.21.0",
-            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz",
-            "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==",
+            "version": "7.16.0",
+            "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz",
+            "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==",
             "dev": true,
             "license": "MIT"
         },
         "node_modules/update-browserslist-db": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz",
-            "integrity": "sha512-UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==",
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.4.tgz",
+            "integrity": "sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==",
             "devOptional": true,
             "funding": [
                 {
@@ -6565,20 +6579,14 @@
             }
         },
         "node_modules/use-sync-external-store": {
-            "version": "1.5.0",
-            "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.5.0.tgz",
-            "integrity": "sha512-Rb46I4cGGVBmjamjphe8L/UnvJD+uPPtTkNvX5mZgqdbavhI4EbgIWJiIHXJ8bc/i9EQGPRh4DwEURJ552Do0A==",
+            "version": "1.6.0",
+            "resolved": "https://registry.npmjs.org/use-sync-external-store/-/use-sync-external-store-1.6.0.tgz",
+            "integrity": "sha512-Pp6GSwGP/NrPIrxVFAIkOQeyw8lFenOHijQWkUTrDvrF4ALqylP2C/KCkeS9dpUM3KvYRQhna5vt7IL95+ZQ9w==",
             "license": "MIT",
             "peerDependencies": {
                 "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
             }
         },
-        "node_modules/util-deprecate": {
-            "version": "1.0.2",
-            "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-            "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
-            "license": "MIT"
-        },
         "node_modules/vaul": {
             "version": "1.1.2",
             "resolved": "https://registry.npmjs.org/vaul/-/vaul-1.1.2.tgz",
@@ -6593,24 +6601,24 @@
             }
         },
         "node_modules/vite": {
-            "version": "6.3.5",
-            "resolved": "https://registry.npmjs.org/vite/-/vite-6.3.5.tgz",
-            "integrity": "sha512-cZn6NDFE7wdTpINgs++ZJ4N49W2vRp8LCKrn3Ob1kYNtOo21vfDoaV5GzBfLU4MovSAB8uNRm4jgzVQZ+mBzPQ==",
+            "version": "7.1.12",
+            "resolved": "https://registry.npmjs.org/vite/-/vite-7.1.12.tgz",
+            "integrity": "sha512-ZWyE8YXEXqJrrSLvYgrRP7p62OziLW7xI5HYGWFzOvupfAlrLvURSzv/FyGyy0eidogEM3ujU+kUG1zuHgb6Ug==",
             "dev": true,
             "license": "MIT",
             "dependencies": {
                 "esbuild": "^0.25.0",
-                "fdir": "^6.4.4",
-                "picomatch": "^4.0.2",
-                "postcss": "^8.5.3",
-                "rollup": "^4.34.9",
-                "tinyglobby": "^0.2.13"
+                "fdir": "^6.5.0",
+                "picomatch": "^4.0.3",
+                "postcss": "^8.5.6",
+                "rollup": "^4.43.0",
+                "tinyglobby": "^0.2.15"
             },
             "bin": {
                 "vite": "bin/vite.js"
             },
             "engines": {
-                "node": "^18.0.0 || ^20.0.0 || >=22.0.0"
+                "node": "^20.19.0 || >=22.12.0"
             },
             "funding": {
                 "url": "https://github.com/vitejs/vite?sponsor=1"
@@ -6619,14 +6627,14 @@
                 "fsevents": "~2.3.3"
             },
             "peerDependencies": {
-                "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
+                "@types/node": "^20.19.0 || >=22.12.0",
                 "jiti": ">=1.21.0",
-                "less": "*",
+                "less": "^4.0.0",
                 "lightningcss": "^1.21.0",
-                "sass": "*",
-                "sass-embedded": "*",
-                "stylus": "*",
-                "sugarss": "*",
+                "sass": "^1.70.0",
+                "sass-embedded": "^1.70.0",
+                "stylus": ">=0.54.8",
+                "sugarss": "^5.0.0",
                 "terser": "^5.16.0",
                 "tsx": "^4.8.1",
                 "yaml": "^2.4.2"
@@ -6668,11 +6676,14 @@
             }
         },
         "node_modules/vite/node_modules/fdir": {
-            "version": "6.4.6",
-            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.6.tgz",
-            "integrity": "sha512-hiFoqpyZcfNm1yc4u8oWCf9A2c4D3QjCrks3zmoVKVxpQRzmPNar1hUJcBG2RQHvEVGDN+Jm81ZheVLAQMK6+w==",
+            "version": "6.5.0",
+            "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz",
+            "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==",
             "dev": true,
             "license": "MIT",
+            "engines": {
+                "node": ">=12.0.0"
+            },
             "peerDependencies": {
                 "picomatch": "^3 || ^4"
             },
@@ -6726,6 +6737,7 @@
             "version": "2.0.2",
             "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
             "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+            "dev": true,
             "license": "ISC",
             "dependencies": {
                 "isexe": "^2.0.0"
@@ -6748,27 +6760,10 @@
             }
         },
         "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/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==",
+            "dev": true,
             "license": "MIT",
             "dependencies": {
                 "ansi-styles": "^4.0.0",
@@ -6782,59 +6777,6 @@
                 "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
             }
         },
-        "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
-            "version": "5.0.1",
-            "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-            "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
-            "version": "8.0.0",
-            "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
-            "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
-            "license": "MIT"
-        },
-        "node_modules/wrap-ansi-cjs/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/wrap-ansi-cjs/node_modules/strip-ansi": {
-            "version": "6.0.1",
-            "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-            "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-            "license": "MIT",
-            "dependencies": {
-                "ansi-regex": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/wrap-ansi/node_modules/ansi-styles": {
-            "version": "6.2.1",
-            "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-            "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
-            "license": "MIT",
-            "engines": {
-                "node": ">=12"
-            },
-            "funding": {
-                "url": "https://github.com/chalk/ansi-styles?sponsor=1"
-            }
-        },
         "node_modules/y18n": {
             "version": "5.0.8",
             "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
@@ -6856,6 +6798,7 @@
             "version": "2.8.1",
             "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
             "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
+            "dev": true,
             "license": "ISC",
             "bin": {
                 "yaml": "bin.mjs"
@@ -6893,51 +6836,6 @@
                 "node": ">=12"
             }
         },
-        "node_modules/yargs/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==",
-            "dev": true,
-            "license": "MIT",
-            "engines": {
-                "node": ">=8"
-            }
-        },
-        "node_modules/yargs/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==",
-            "dev": true,
-            "license": "MIT"
-        },
-        "node_modules/yargs/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==",
-            "dev": true,
-            "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/yargs/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==",
-            "dev": true,
-            "license": "MIT",
-            "dependencies": {
-                "ansi-regex": "^5.0.1"
-            },
-            "engines": {
-                "node": ">=8"
-            }
-        },
         "node_modules/yocto-queue": {
             "version": "0.1.0",
             "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
@@ -6952,18 +6850,31 @@
             }
         },
         "node_modules/zod": {
-            "version": "3.25.76",
-            "resolved": "https://registry.npmjs.org/zod/-/zod-3.25.76.tgz",
-            "integrity": "sha512-gzUt/qt81nXsFGKIFcC3YnfEAx5NkunCfnDlvuBSSFS02bcXu4Lmea0AFIUwbLWxWPx3d9p8S5QoaujKcNQxcQ==",
+            "version": "4.1.12",
+            "resolved": "https://registry.npmjs.org/zod/-/zod-4.1.12.tgz",
+            "integrity": "sha512-JInaHOamG8pt5+Ey8kGmdcAcg3OL9reK8ltczgHTAwNhMys/6ThXHityHxVV2p3fkw/c+MAvBHFVYHFZDmjMCQ==",
             "license": "MIT",
             "funding": {
                 "url": "https://github.com/sponsors/colinhacks"
             }
         },
+        "node_modules/zod-validation-error": {
+            "version": "4.0.2",
+            "resolved": "https://registry.npmjs.org/zod-validation-error/-/zod-validation-error-4.0.2.tgz",
+            "integrity": "sha512-Q6/nZLe6jxuU80qb/4uJ4t5v2VEZ44lzQjPDhYJNztRQ4wyWc6VF3D3Kb/fAuPetZQnhS3hnajCf9CsWesghLQ==",
+            "dev": true,
+            "license": "MIT",
+            "engines": {
+                "node": ">=18.0.0"
+            },
+            "peerDependencies": {
+                "zod": "^3.25.0 || ^4.0.0"
+            }
+        },
         "node_modules/zustand": {
-            "version": "5.0.7",
-            "resolved": "https://registry.npmjs.org/zustand/-/zustand-5.0.7.tgz",
-            "integrity": "sha512-Ot6uqHDW/O2VdYsKLLU8GQu8sCOM1LcoE8RwvLv9uuRT9s6SOHCKs0ZEOhxg+I1Ld+A1Q5lwx+UlKXXUoCZITg==",
+            "version": "5.0.8",
+            "resolved": "https://registry.npmjs.org/zustand/-/zustand-5.0.8.tgz",
+            "integrity": "sha512-gyPKpIaxY9XcO2vSMrLbiER7QMAMGOQZVRdJ6Zi782jkbzZygq5GI9nG8g+sMgitRtndwaBSl7uiqC49o1SSiw==",
             "license": "MIT",
             "engines": {
                 "node": ">=12.20.0"
diff --git a/pkgs/by-name/ne/nezha-theme-admin/package.nix b/pkgs/by-name/ne/nezha-theme-admin/package.nix
index a0672d82fc53..2779e3669ed1 100644
--- a/pkgs/by-name/ne/nezha-theme-admin/package.nix
+++ b/pkgs/by-name/ne/nezha-theme-admin/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage rec {
   pname = "nezha-theme-admin";
-  version = "1.13.1";
+  version = "1.14.4";
 
   src = fetchFromGitHub {
     owner = "nezhahq";
     repo = "admin-frontend";
     tag = "v${version}";
-    hash = "sha256-VHj6eUIBdIUJ1eUoa2Yog3maee89aMF5yEO9NbDXflQ=";
+    hash = "sha256-bQJGAw6q7yJoPDKOEqx35iTpyD/jGtATIjDi8C9D8dA=";
   };
 
   # TODO: Switch to the bun build function once available in nixpkgs
@@ -21,7 +21,7 @@ buildNpmPackage rec {
     cp ${./package-lock.json} package-lock.json
   '';
 
-  npmDepsHash = "sha256-th0rnTrS/gZ5gMuZda0/fllVc8g9iPc8/gEos+3E3kU=";
+  npmDepsHash = "sha256-ZXEBSrQsZ6e18LK/LFttEmZY4nK9+vrQ3ryw5xw/5YE=";
 
   npmPackFlags = [ "--ignore-scripts" ];
 

From 5824efabfd00cd915f3b774b086ca330be9d47fb Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 30 Oct 2025 12:36:17 +0300
Subject: [PATCH 4131/6226] opencloud: 3.5.0 -> 3.6.0

---
 pkgs/by-name/op/opencloud/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/opencloud/package.nix b/pkgs/by-name/op/opencloud/package.nix
index 95ed0bf4adb9..f592b11447de 100644
--- a/pkgs/by-name/op/opencloud/package.nix
+++ b/pkgs/by-name/op/opencloud/package.nix
@@ -28,13 +28,13 @@ let
 in
 buildGoModule rec {
   pname = "opencloud";
-  version = "3.5.0";
+  version = "3.6.0";
 
   src = fetchFromGitHub {
     owner = "opencloud-eu";
     repo = "opencloud";
     tag = "v${version}";
-    hash = "sha256-NPBz9pevjDUqDrEg/S6Vtk+jAA9f2H95ehO8EgcB1eY=";
+    hash = "sha256-D9bqTsRMOgaeAj8k1H2Jz1zhagnaq1SCSzN8HHy4A3k=";
   };
 
   postPatch = ''

From 2d3cbee32a00a7aaf9aa098304aab02c972780a5 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 30 Oct 2025 12:36:24 +0300
Subject: [PATCH 4132/6226] opencloud-web: 4.0.0 -> 4.1.0

---
 pkgs/by-name/op/opencloud/web.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opencloud/web.nix b/pkgs/by-name/op/opencloud/web.nix
index dd47943591d9..b25847a1f2d2 100644
--- a/pkgs/by-name/op/opencloud/web.nix
+++ b/pkgs/by-name/op/opencloud/web.nix
@@ -9,19 +9,19 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencloud-web";
-  version = "4.0.0";
+  version = "4.1.0";
 
   src = fetchFromGitHub {
     owner = "opencloud-eu";
     repo = "web";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IMFbDPVn32offVIHHxQvHjauQLGYnFf/s1mAo6OF7Mk=";
+    hash = "sha256-m02qZS2au6gH0D009Mt8H2qKp2VdVxSIT0q3RKRkh8U=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-CHImAISDPhjfhB+Qj3fuo6jaOyi+wBVwuLm8ODzRU4M=";
+    hash = "sha256-wHrVBb/um7+6prBTzc30MXMCtERgGFV0mGvfS19tyTI=";
   };
 
   nativeBuildInputs = [

From 790d95b4eed485f9bdf016cd0db5a1c6950d3ca0 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Thu, 30 Oct 2025 10:45:48 +0100
Subject: [PATCH 4133/6226] mir: Restrict supported platforms to LE-only

Implementation of supported buffer formats for non-LE is marked as a TODO. Builds, but tests fail and compositors fail to start.
---
 pkgs/servers/mir/common.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/mir/common.nix b/pkgs/servers/mir/common.nix
index 944242dceed3..f28c27aded5b 100644
--- a/pkgs/servers/mir/common.nix
+++ b/pkgs/servers/mir/common.nix
@@ -238,7 +238,9 @@ stdenv.mkDerivation (finalAttrs: {
       onny
       OPNA2608
     ];
-    platforms = lib.platforms.linux;
+    # Onle LE has valid graphics buffer formats
+    # https://github.com/canonical/mir/blob/ba8e83f75084379dec8e23131fdf04fa4a4567ac/src/platforms/common/server/shm_buffer.cpp#L61-L65
+    platforms = lib.lists.intersectLists lib.platforms.linux lib.platforms.littleEndian;
     pkgConfigModules = [
       "miral"
       "mircommon"

From 2b1f0ea3ee3952e68b164efa0a1c5e394ef2e781 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 30 Oct 2025 12:49:21 +0300
Subject: [PATCH 4134/6226] mesa: 25.2.5 -> 25.2.6

Diff: https://gitlab.freedesktop.org/mesa/mesa/-/compare/mesa-25.2.5...mesa-25.2.6

Changelog: https://docs.mesa3d.org/relnotes/25.2.6.html
---
 pkgs/development/libraries/mesa/common.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/mesa/common.nix b/pkgs/development/libraries/mesa/common.nix
index 09885ec6b7d0..732fc979c1cb 100644
--- a/pkgs/development/libraries/mesa/common.nix
+++ b/pkgs/development/libraries/mesa/common.nix
@@ -5,14 +5,14 @@
 # nix build .#legacyPackages.x86_64-darwin.mesa .#legacyPackages.aarch64-darwin.mesa
 rec {
   pname = "mesa";
-  version = "25.2.5";
+  version = "25.2.6";
 
   src = fetchFromGitLab {
     domain = "gitlab.freedesktop.org";
     owner = "mesa";
     repo = "mesa";
     rev = "mesa-${version}";
-    hash = "sha256-3ZoC1aY0EMbyoQe4twNfyVHaZeyCbvqTJ57tMuc1YYo=";
+    hash = "sha256-erfvNR1Yor3k8gVVClyiBJsgyaOv7BMFd1NSgieTY5I=";
   };
 
   meta = {

From 791bdb7416623f4d2621dc1e394306e7d6d849c3 Mon Sep 17 00:00:00 2001
From: Jo <jopejoe1@missing.ninja>
Date: Thu, 30 Oct 2025 10:51:42 +0100
Subject: [PATCH 4135/6226] check-meta: de-dupe maintainers list

This makes it so that the maintainers list is not unneccery filled with dupelicated entriy caused by addition of adding team members.
---
 pkgs/stdenv/generic/check-meta.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index c59e92e114ea..90eb661c3952 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -34,6 +34,7 @@ let
     toList
     isList
     elem
+    unique
     ;
 
   inherit (lib.meta)
@@ -667,8 +668,9 @@ let
       # Maintainers should be inclusive of teams.
       # Note that there may be external consumers of this API (repology, for instance) -
       # if you add a new maintainer or team attribute please ensure that this expectation is still met.
-      maintainers =
-        attrs.meta.maintainers or [ ] ++ concatMap (team: team.members or [ ]) attrs.meta.teams or [ ];
+      maintainers = unique (
+        attrs.meta.maintainers or [ ] ++ concatMap (team: team.members or [ ]) attrs.meta.teams or [ ]
+      );
 
       identifiers =
         let

From 9258dea3a9c0c1608bcd442770685c3c1162c831 Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Sun, 26 Oct 2025 10:52:56 +0100
Subject: [PATCH 4136/6226] git-cola: 4.15.0 -> 4.16.0

https://github.com/git-cola/git-cola/releases/tag/v4.16.0
---
 pkgs/by-name/gi/git-cola/package.nix | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/gi/git-cola/package.nix b/pkgs/by-name/gi/git-cola/package.nix
index 0db36da8e687..7e134ceb6fbc 100644
--- a/pkgs/by-name/gi/git-cola/package.nix
+++ b/pkgs/by-name/gi/git-cola/package.nix
@@ -5,7 +5,7 @@
   python3Packages,
   gettext,
   git,
-  qt5,
+  qt6,
   versionCheckHook,
   copyDesktopItems,
   imagemagick,
@@ -14,33 +14,36 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "git-cola";
-  version = "4.15.0";
+  version = "4.16.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "git-cola";
     repo = "git-cola";
     tag = "v${version}";
-    hash = "sha256-h3W7CsdJK1hid8Nmp1bvFwiHVS4UV/gziwtyZuxSxHY=";
+    hash = "sha256-gBqMwqmpu0+gMeffiFdwy/kBdCUQRpJr+3vzUkBCRSk=";
   };
 
-  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ qt5.qtwayland ];
+  build-system = with python3Packages; [
+    setuptools-scm
+  ];
 
-  propagatedBuildInputs = [
+  buildInputs = [
     git
+    qt6.qtbase
   ]
-  ++ (with python3Packages; [
-    setuptools
-    pyqt5
+  ++ lib.optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ];
+
+  dependencies = with python3Packages; [
+    polib
+    pyqt6
     qtpy
     send2trash
-    polib
-  ]);
+  ];
 
   nativeBuildInputs = [
     gettext
-    qt5.wrapQtAppsHook
-    python3Packages.setuptools-scm
+    qt6.wrapQtAppsHook
     imagemagick
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ copyDesktopItems ];

From c38cd91cbba253b965631f63f3c3212cf3bd326b Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Wed, 29 Oct 2025 15:36:58 +0100
Subject: [PATCH 4137/6226] opentrack: move to by-name, clean up

---
 .../misc => by-name/op}/opentrack/aruco.nix   | 29 +++---
 .../op/opentrack/package.nix}                 | 96 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 -
 3 files changed, 64 insertions(+), 63 deletions(-)
 rename pkgs/{applications/misc => by-name/op}/opentrack/aruco.nix (51%)
 rename pkgs/{applications/misc/opentrack/default.nix => by-name/op/opentrack/package.nix} (64%)

diff --git a/pkgs/applications/misc/opentrack/aruco.nix b/pkgs/by-name/op/opentrack/aruco.nix
similarity index 51%
rename from pkgs/applications/misc/opentrack/aruco.nix
rename to pkgs/by-name/op/opentrack/aruco.nix
index 291ff7ad24f9..7fabda370d71 100644
--- a/pkgs/applications/misc/opentrack/aruco.nix
+++ b/pkgs/by-name/op/opentrack/aruco.nix
@@ -4,38 +4,39 @@
   cmake,
   fetchFromGitHub,
   opencv4,
+  opentrack,
 }:
 
 stdenv.mkDerivation {
   pname = "opentrack-aruco";
-  version = "unstable-20190303";
+  version = "0-unstable-2022-03-10";
 
   src = fetchFromGitHub {
     owner = "opentrack";
     repo = "aruco";
-    rev = "12dc60efd61149227bd05c805208d9bcce308f6d";
-    sha256 = "0gkrixgfbpg8pls4qqilphbz4935mg5z4p18a0vv6kclmfccw9ad";
+    rev = "e08d336bd2c70859efd19622582817fe8eabe714";
+    hash = "sha256-Wf5y//vxRWIZfOxwgZsPPTsUHliA3cbt2FOjouh4/rQ=";
   };
 
+  strictDeps = true;
   nativeBuildInputs = [ cmake ];
-
   buildInputs = [ opencv4 ];
 
   env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3";
 
-  preInstall = ''
-    mkdir -p $out/include/aruco
+  installPhase = ''
+    runHook preInstall
+
+    install -Dt $out/include/aruco ./src/include/aruco/*
+    install -Dt $out/lib ./src/libaruco.a
+
+    runHook postInstall
   '';
 
-  # copy headers required by main package
-  postInstall = ''
-    cp $src/src/*.h $out/include/aruco
-  '';
-
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/opentrack/aruco";
     description = "C++ library for detection of AR markers based on OpenCV";
-    license = licenses.isc;
-    maintainers = with maintainers; [ zaninime ];
+    license = lib.licenses.isc;
+    maintainers = opentrack.meta.maintainers;
   };
 }
diff --git a/pkgs/applications/misc/opentrack/default.nix b/pkgs/by-name/op/opentrack/package.nix
similarity index 64%
rename from pkgs/applications/misc/opentrack/default.nix
rename to pkgs/by-name/op/opentrack/package.nix
index 097378626fe3..27a8cb50c47a 100644
--- a/pkgs/applications/misc/opentrack/default.nix
+++ b/pkgs/by-name/op/opentrack/package.nix
@@ -1,6 +1,5 @@
 {
-  pkgs,
-  mkDerivation,
+  stdenv,
   lib,
   callPackage,
   fetchzip,
@@ -9,38 +8,26 @@
   pkg-config,
   ninja,
   copyDesktopItems,
-  qtbase,
-  qttools,
+  qt5,
   opencv4,
   procps,
   eigen,
   libXdmcp,
   libevdev,
   makeDesktopItem,
-  fetchurl,
   fetchpatch,
   wineWowPackages,
   onnxruntime,
+  withWine ? stdenv.targetPlatform.isx86_64,
 }:
-let
-  version = "2023.3.0";
-
-  aruco = callPackage ./aruco.nix { };
-
-  # license.txt inside the zip file is MIT
-  xplaneSdk = fetchzip {
-    url = "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sdk_zip_files/XPSDK401.zip";
-    hash = "sha256-tUT9yV1949QVr5VebU/7esg7wwWkyak2TSA/kQSrbeo=";
-  };
-in
-mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "opentrack";
-  inherit version;
+  version = "2023.3.0";
 
   src = fetchFromGitHub {
     owner = "opentrack";
     repo = "opentrack";
-    rev = "opentrack-${version}";
+    tag = "opentrack-${finalAttrs.version}";
     hash = "sha256-C0jLS55DcLJh/e5yM8kLG7fhhKvBNllv5HkfCWRIfc4=";
   };
 
@@ -52,49 +39,60 @@ mkDerivation {
     })
   ];
 
+  aruco = callPackage ./aruco.nix { };
+
+  xplaneSdk = fetchzip {
+    url = "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sdk_zip_files/XPSDK401.zip";
+    hash = "sha256-tUT9yV1949QVr5VebU/7esg7wwWkyak2TSA/kQSrbeo=";
+    # see license.txt inside the zip file
+    meta.license = lib.licenses.free;
+  };
+
+  strictDeps = true;
+
   nativeBuildInputs = [
     cmake
-    pkg-config
-    ninja
     copyDesktopItems
-  ];
+    ninja
+    pkg-config
+    qt5.wrapQtAppsHook
+  ]
+  ++ lib.optionals withWine [ wineWowPackages.stable ];
+
   buildInputs = [
-    qtbase
-    qttools
-    opencv4
-    procps
+    finalAttrs.aruco
     eigen
     libXdmcp
     libevdev
-    aruco
     onnxruntime
-  ]
-  ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 [ wineWowPackages.stable ];
-
-  env.NIX_CFLAGS_COMPILE = "-Wall -Wextra -Wpedantic -ffast-math -O3";
-  dontWrapQtApps = true;
+    opencv4
+    procps
+    qt5.qtbase
+    qt5.qttools
+  ];
 
   cmakeFlags = [
-    "-GNinja"
-    "-DCMAKE_BUILD_TYPE=Release"
-    "-DSDK_ARUCO_LIBPATH=${aruco}/lib/libaruco.a"
-    "-DSDK_XPLANE=${xplaneSdk}"
-  ]
-  ++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 [ "-DSDK_WINE=ON" ];
+    (lib.cmakeBool "SDK_WINE" withWine)
+    (lib.cmakeFeature "SDK_ARUCO_LIBPATH" "${finalAttrs.aruco}/lib/libaruco.a")
+    (lib.cmakeFeature "SDK_XPLANE" finalAttrs.xplaneSdk.outPath)
+  ];
 
   postInstall = ''
+    install -Dt $out/share/icons/hicolor/256x256 $src/gui/images/opentrack.png
+  '';
+
+  # manually wrap just the main binary
+  dontWrapQtApps = true;
+  preFixup = ''
     wrapQtApp $out/bin/opentrack
   '';
 
   desktopItems = [
-    (makeDesktopItem rec {
+    (makeDesktopItem {
       name = "opentrack";
       exec = "opentrack";
-      icon = fetchurl {
-        url = "https://github.com/opentrack/opentrack/raw/opentrack-${version}/gui/images/opentrack.png";
-        hash = "sha256-9k3jToEpdW14ErbNGHM4c0x/LH7k14RmtvY4dOYnITQ=";
-      };
-      desktopName = name;
+      icon = "opentrack";
+      desktopName = "opentrack";
       genericName = "Head tracking software";
       categories = [ "Utility" ];
     })
@@ -104,8 +102,12 @@ mkDerivation {
     homepage = "https://github.com/opentrack/opentrack";
     description = "Head tracking software for MS Windows, Linux, and Apple OSX";
     mainProgram = "opentrack";
-    changelog = "https://github.com/opentrack/opentrack/releases/tag/${version}";
+    changelog = "https://github.com/opentrack/opentrack/releases";
     license = lib.licenses.isc;
-    maintainers = with lib.maintainers; [ zaninime ];
+    maintainers = [
+      lib.maintainers.nekowinston
+      lib.maintainers.zaninime
+    ];
+    platforms = lib.platforms.linux;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f38323f85cb8..42dfc5a8fda2 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3640,8 +3640,6 @@ with pkgs;
 
   sshd-openpgp-auth = callPackage ../by-name/ss/ssh-openpgp-auth/daemon.nix { };
 
-  opentrack = libsForQt5.callPackage ../applications/misc/opentrack { };
-
   openvpn = callPackage ../tools/networking/openvpn { };
 
   openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { };

From ce7ef4a6e21cd0f4e17caf72aeadaebdb9ceaa1c Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Wed, 29 Oct 2025 16:31:30 +0100
Subject: [PATCH 4138/6226] opentrack: 2023.3.0 -> 2024.1.1-unstable-2025-10-29

---
 pkgs/by-name/op/opentrack/package.nix | 36 +++++++++++++--------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/op/opentrack/package.nix b/pkgs/by-name/op/opentrack/package.nix
index 27a8cb50c47a..13e21edba534 100644
--- a/pkgs/by-name/op/opentrack/package.nix
+++ b/pkgs/by-name/op/opentrack/package.nix
@@ -8,42 +8,34 @@
   pkg-config,
   ninja,
   copyDesktopItems,
-  qt5,
+  qt6,
   opencv4,
   procps,
   eigen,
   libXdmcp,
   libevdev,
   makeDesktopItem,
-  fetchpatch,
   wineWowPackages,
   onnxruntime,
+  nix-update-script,
   withWine ? stdenv.targetPlatform.isx86_64,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "opentrack";
-  version = "2023.3.0";
+  version = "2024.1.1-unstable-2025-10-29";
 
   src = fetchFromGitHub {
     owner = "opentrack";
     repo = "opentrack";
-    tag = "opentrack-${finalAttrs.version}";
-    hash = "sha256-C0jLS55DcLJh/e5yM8kLG7fhhKvBNllv5HkfCWRIfc4=";
+    rev = "766808196cf63ddf9ceb102fba193582daceb9de";
+    hash = "sha256-xS87LFAbnRg7uBbN7ARoGts3bNYkcpOm3xhojBepgIo=";
   };
 
-  patches = [
-    # https://github.com/opentrack/opentrack/pull/1754
-    (fetchpatch {
-      url = "https://github.com/opentrack/opentrack/commit/d501d7e0b237ed0c305525788b423d842ffa356d.patch";
-      hash = "sha256-XMGHV78vt/Xn3hS+4V//pqtsdBQCfJPjIXxfwtdXX+Q=";
-    })
-  ];
-
   aruco = callPackage ./aruco.nix { };
 
   xplaneSdk = fetchzip {
-    url = "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sdk_zip_files/XPSDK401.zip";
-    hash = "sha256-tUT9yV1949QVr5VebU/7esg7wwWkyak2TSA/kQSrbeo=";
+    url = "https://developer.x-plane.com/wp-content/plugins/code-sample-generation/sdk_zip_files/XPSDK411.zip";
+    hash = "sha256-zay5QrHJctllVFl+JhlyTDzH68h5UoxncEt+TpW3UgI=";
     # see license.txt inside the zip file
     meta.license = lib.licenses.free;
   };
@@ -55,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: {
     copyDesktopItems
     ninja
     pkg-config
-    qt5.wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ]
   ++ lib.optionals withWine [ wineWowPackages.stable ];
 
@@ -67,8 +59,8 @@ stdenv.mkDerivation (finalAttrs: {
     onnxruntime
     opencv4
     procps
-    qt5.qtbase
-    qt5.qttools
+    qt6.qtbase
+    qt6.qttools
   ];
 
   cmakeFlags = [
@@ -98,6 +90,14 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version=branch"
+      "--version-regex"
+      "^opentrack-(.+)"
+    ];
+  };
+
   meta = {
     homepage = "https://github.com/opentrack/opentrack";
     description = "Head tracking software for MS Windows, Linux, and Apple OSX";

From c78a06b08dccdbe23b162335c8b180de08949c05 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Thu, 30 Oct 2025 09:30:22 +0000
Subject: [PATCH 4139/6226] nezha-theme-user: 1.13.3 -> 1.32.0

---
 .../ne/nezha-theme-user/package-lock.json     | 2631 ++++++-----------
 pkgs/by-name/ne/nezha-theme-user/package.nix  |    6 +-
 2 files changed, 871 insertions(+), 1766 deletions(-)

diff --git a/pkgs/by-name/ne/nezha-theme-user/package-lock.json b/pkgs/by-name/ne/nezha-theme-user/package-lock.json
index 54143f7bae33..9a742fa2bdec 100644
--- a/pkgs/by-name/ne/nezha-theme-user/package-lock.json
+++ b/pkgs/by-name/ne/nezha-theme-user/package-lock.json
@@ -1,74 +1,77 @@
 {
-  "name": "nazha-dashboard-vite",
-  "version": "1.0.1",
+  "name": "nazha-dash-v1",
+  "version": "1.0.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "nazha-dashboard-vite",
-      "version": "1.0.1",
+      "name": "nazha-dash-v1",
+      "version": "1.0.0",
       "dependencies": {
-        "@fontsource/inter": "^5.1.1",
-        "@heroicons/react": "^2.2.0",
-        "@radix-ui/react-accordion": "^1.2.2",
-        "@radix-ui/react-checkbox": "^1.1.3",
-        "@radix-ui/react-dialog": "^1.1.4",
-        "@radix-ui/react-dropdown-menu": "^2.1.4",
-        "@radix-ui/react-label": "^2.1.1",
-        "@radix-ui/react-popover": "^1.1.4",
-        "@radix-ui/react-progress": "^1.1.1",
-        "@radix-ui/react-separator": "^1.1.1",
-        "@radix-ui/react-slot": "^1.1.1",
-        "@radix-ui/react-switch": "^1.1.2",
-        "@tanstack/react-query": "^5.63.0",
-        "@tanstack/react-query-devtools": "^5.63.0",
-        "@tanstack/react-table": "^8.20.6",
-        "@trivago/prettier-plugin-sort-imports": "^5.2.1",
-        "@types/d3-geo": "^3.1.0",
-        "@types/luxon": "^3.4.2",
-        "class-variance-authority": "^0.7.1",
-        "clsx": "^2.1.1",
-        "country-flag-icons": "^1.5.13",
-        "d3-geo": "^3.1.1",
-        "dayjs": "^1.11.13",
-        "framer-motion": "^12.0.0-alpha.2",
-        "i18n-iso-countries": "^7.13.0",
-        "i18next": "^24.2.1",
-        "lucide-react": "^0.460.0",
-        "luxon": "^3.5.0",
-        "prettier-plugin-tailwindcss": "^0.6.9",
-        "react": "^19.0.0",
-        "react-dom": "^19.0.0",
-        "react-i18next": "^15.4.0",
-        "react-router-dom": "^7.1.1",
-        "recharts": "^2.15.0",
-        "sonner": "^1.7.1",
-        "tailwind-merge": "^2.6.0",
-        "tailwindcss-animate": "^1.0.7"
+        "@fontsource/inter": "5.1.1",
+        "@heroicons/react": "2.2.0",
+        "@number-flow/react": "0.5.5",
+        "@radix-ui/react-accordion": "1.2.3",
+        "@radix-ui/react-checkbox": "1.1.4",
+        "@radix-ui/react-dialog": "1.1.6",
+        "@radix-ui/react-dropdown-menu": "2.1.6",
+        "@radix-ui/react-label": "2.1.2",
+        "@radix-ui/react-popover": "1.1.6",
+        "@radix-ui/react-progress": "1.1.2",
+        "@radix-ui/react-select": "2.1.6",
+        "@radix-ui/react-separator": "1.1.2",
+        "@radix-ui/react-slot": "1.1.2",
+        "@radix-ui/react-switch": "1.1.3",
+        "@radix-ui/react-tooltip": "1.1.8",
+        "@tanstack/react-query": "5.66.7",
+        "@tanstack/react-query-devtools": "5.66.7",
+        "@tanstack/react-table": "8.21.2",
+        "@trivago/prettier-plugin-sort-imports": "5.2.2",
+        "@types/d3-geo": "3.1.0",
+        "@types/luxon": "3.4.2",
+        "class-variance-authority": "0.7.1",
+        "clsx": "2.1.1",
+        "cmdk": "1.1.1",
+        "country-flag-icons": "1.5.18",
+        "d3-geo": "3.1.1",
+        "dayjs": "1.11.13",
+        "framer-motion": "12.4.5",
+        "i18n-iso-countries": "7.14.0",
+        "i18next": "24.2.2",
+        "lucide-react": "0.460.0",
+        "luxon": "3.5.0",
+        "prettier-plugin-tailwindcss": "0.6.11",
+        "react": "19.0.0",
+        "react-dom": "19.0.0",
+        "react-i18next": "15.4.1",
+        "react-router-dom": "7.2.0",
+        "recharts": "2.15.1",
+        "sonner": "1.7.4",
+        "tailwind-merge": "2.6.0",
+        "tailwindcss-animate": "1.0.7"
       },
       "devDependencies": {
-        "@eslint/js": "^9.17.0",
-        "@types/node": "^22.10.5",
-        "@types/react": "^19.0.4",
-        "@types/react-dom": "^19.0.2",
-        "@vitejs/plugin-react-swc": "^3.7.2",
-        "autoprefixer": "^10.4.20",
-        "eslint": "^9.17.0",
-        "eslint-plugin-react-hooks": "^5.1.0",
-        "eslint-plugin-react-refresh": "^0.4.16",
-        "globals": "^15.14.0",
-        "postcss": "^8.4.49",
-        "tailwindcss": "^3.4.17",
+        "@eslint/js": "9.20.0",
+        "@types/node": "22.13.4",
+        "@types/react": "19.0.10",
+        "@types/react-dom": "19.0.4",
+        "@vitejs/plugin-react-swc": "3.8.0",
+        "autoprefixer": "10.4.20",
+        "eslint": "9.20.1",
+        "eslint-plugin-react-hooks": "5.1.0",
+        "eslint-plugin-react-refresh": "0.4.19",
+        "globals": "15.15.0",
+        "postcss": "8.5.3",
+        "tailwindcss": "3.4.17",
         "typescript": "~5.6.3",
-        "typescript-eslint": "^8.19.1",
-        "vite": "^6.0.7"
+        "typescript-eslint": "8.24.1",
+        "vite": "6.1.1"
       }
     },
     "node_modules/@alloc/quick-lru": {
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
       "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -80,7 +83,6 @@
       "version": "7.26.2",
       "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
       "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
-      "license": "MIT",
       "dependencies": {
         "@babel/helper-validator-identifier": "^7.25.9",
         "js-tokens": "^4.0.0",
@@ -94,7 +96,6 @@
       "version": "7.26.5",
       "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz",
       "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==",
-      "license": "MIT",
       "dependencies": {
         "@babel/parser": "^7.26.5",
         "@babel/types": "^7.26.5",
@@ -110,7 +111,6 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
       "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
@@ -119,18 +119,16 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
       "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
-      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.5.tgz",
-      "integrity": "sha512-SRJ4jYmXRqV1/Xc+TIVG84WjHBXKlxO9sHQnA2Pf12QQEAp1LOh6kDzNHXcUnbH1QI0FDoPPVOt+vyUDucxpaw==",
-      "license": "MIT",
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.7.tgz",
+      "integrity": "sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w==",
       "dependencies": {
-        "@babel/types": "^7.26.5"
+        "@babel/types": "^7.26.7"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -143,7 +141,6 @@
       "version": "7.26.0",
       "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz",
       "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
-      "license": "MIT",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -155,7 +152,6 @@
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
       "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
-      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "^7.25.9",
         "@babel/parser": "^7.25.9",
@@ -165,17 +161,42 @@
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/template/node_modules/@babel/parser": {
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz",
+      "integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==",
+      "dependencies": {
+        "@babel/types": "^7.26.3"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/@babel/template/node_modules/@babel/types": {
+      "version": "7.26.3",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz",
+      "integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==",
+      "dependencies": {
+        "@babel/helper-string-parser": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.25.9"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/traverse": {
-      "version": "7.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.5.tgz",
-      "integrity": "sha512-rkOSPOw+AXbgtwUga3U4u8RpoK9FEFWBNAlTpcnkLFjL5CT+oyHNuUUC/xx6XefEJ16r38r8Bc/lfp6rYuHeJQ==",
-      "license": "MIT",
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.7.tgz",
+      "integrity": "sha512-1x1sgeyRLC3r5fQOM0/xtQKsYjyxmFjaOrLJNtZ81inNjyJHGIolTULPiSc/2qe1/qfpFLisLQYFnnZl7QoedA==",
       "dependencies": {
         "@babel/code-frame": "^7.26.2",
         "@babel/generator": "^7.26.5",
-        "@babel/parser": "^7.26.5",
+        "@babel/parser": "^7.26.7",
         "@babel/template": "^7.25.9",
-        "@babel/types": "^7.26.5",
+        "@babel/types": "^7.26.7",
         "debug": "^4.3.1",
         "globals": "^11.1.0"
       },
@@ -187,16 +208,14 @@
       "version": "11.12.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
       "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.5.tgz",
-      "integrity": "sha512-L6mZmwFDK6Cjh1nRCLXpa6no13ZIioJDz7mdkzHv399pThrTa/k0nUlNaenOeh2kWu/iaOQYElEpKPUswUa9Vg==",
-      "license": "MIT",
+      "version": "7.26.7",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.7.tgz",
+      "integrity": "sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==",
       "dependencies": {
         "@babel/helper-string-parser": "^7.25.9",
         "@babel/helper-validator-identifier": "^7.25.9"
@@ -205,278 +224,6 @@
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@esbuild/aix-ppc64": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz",
-      "integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "aix"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-arm": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz",
-      "integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-arm64": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz",
-      "integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/android-x64": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz",
-      "integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/darwin-arm64": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz",
-      "integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/darwin-x64": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz",
-      "integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/freebsd-arm64": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz",
-      "integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/freebsd-x64": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz",
-      "integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-arm": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz",
-      "integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-arm64": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz",
-      "integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-ia32": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz",
-      "integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz",
-      "integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-mips64el": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz",
-      "integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==",
-      "cpu": [
-        "mips64el"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-ppc64": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz",
-      "integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-riscv64": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz",
-      "integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/linux-s390x": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz",
-      "integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/@esbuild/linux-x64": {
       "version": "0.24.2",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz",
@@ -485,7 +232,6 @@
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -494,157 +240,17 @@
         "node": ">=18"
       }
     },
-    "node_modules/@esbuild/netbsd-arm64": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz",
-      "integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/netbsd-x64": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz",
-      "integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "netbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openbsd-arm64": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz",
-      "integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/openbsd-x64": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz",
-      "integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "openbsd"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/sunos-x64": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz",
-      "integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "sunos"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-arm64": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz",
-      "integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-ia32": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz",
-      "integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
-    "node_modules/@esbuild/win32-x64": {
-      "version": "0.24.2",
-      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz",
-      "integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=18"
-      }
-    },
     "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.1.tgz",
-      "integrity": "sha512-s3O3waFUrMV8P/XaF/+ZTp1X9XBZW1a4B97ZnjQF2KYWaFD2A8KyFBsrsfSjEmjn3RGWAIuvlneuZm3CUK3jbA==",
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
+      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "eslint-visitor-keys": "^3.4.3"
+        "eslint-visitor-keys": "^3.3.0"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
-      },
       "peerDependencies": {
         "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
@@ -654,7 +260,6 @@
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
       "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -667,19 +272,17 @@
       "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
       "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
     },
     "node_modules/@eslint/config-array": {
-      "version": "0.19.1",
-      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.1.tgz",
-      "integrity": "sha512-fo6Mtm5mWyKjA/Chy1BYTdn5mGJoDNjC7C64ug20ADsRDGrA85bN3uK3MaKbeRkRuuIEAR5N33Jr1pbm411/PA==",
+      "version": "0.19.2",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz",
+      "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/object-schema": "^2.1.5",
+        "@eslint/object-schema": "^2.1.6",
         "debug": "^4.3.1",
         "minimatch": "^3.1.2"
       },
@@ -688,11 +291,10 @@
       }
     },
     "node_modules/@eslint/core": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.10.0.tgz",
-      "integrity": "sha512-gFHJ+xBOo4G3WRlR1e/3G8A6/KZAH6zcE/hkLRCZTi/B9avAG365QhFA8uOGzTMqgTghpn7/fSnscW++dpMSAw==",
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.11.0.tgz",
+      "integrity": "sha512-DWUB2pksgNEb6Bz2fggIy1wh6fGgZP4Xyy/Mt0QZPiloKKXerbqq9D3SBQTlCRYOrcRPu4vuz+CGjwdfqxnoWA==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@types/json-schema": "^7.0.15"
       },
@@ -701,11 +303,10 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.2.0.tgz",
-      "integrity": "sha512-grOjVNN8P3hjJn/eIETF1wwd12DdnwFDoyceUJLYYdkpbwq3nLi+4fqrTAONx7XDALqlL220wC/RHSC/QTI/0w==",
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.0.tgz",
+      "integrity": "sha512-yaVPAiNAalnCZedKLdR21GOGILMLKPyqSLWaAjQFvYA2i/ciDi8ArYVr69Anohb6cH2Ukhqti4aFnYyPm8wdwQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
@@ -729,7 +330,6 @@
       "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
       "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -738,63 +338,69 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "9.18.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.18.0.tgz",
-      "integrity": "sha512-fK6L7rxcq6/z+AaQMtiFTkvbHkBLNlwyRxHpKawP0x3u9+NC6MQTnFW+AdpwC6gfHTW0051cokQgtTN2FqlxQA==",
+      "version": "9.20.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.20.0.tgz",
+      "integrity": "sha512-iZA07H9io9Wn836aVTytRaNqh00Sad+EamwOVJT12GTLw1VGMFV/4JaME+JjLtr9fiGaoWgYnS54wrfWsSs4oQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
     "node_modules/@eslint/object-schema": {
-      "version": "2.1.5",
-      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.5.tgz",
-      "integrity": "sha512-o0bhxnL89h5Bae5T318nFoFzGy+YE5i/gGkoPAgkmTVdRKTiv3p8JHevPiPaMwoloKfEiiaHlawCqaZMqRm+XQ==",
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
+      "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.2.5",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.5.tgz",
-      "integrity": "sha512-lB05FkqEdUg2AA0xEbUz0SnkXT1LcCTa438W4IWTUh4hdOnVbQyOJ81OrDXsJk/LSiJHubgGEFoR5EHq1NsH1A==",
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.7.tgz",
+      "integrity": "sha512-JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.10.0",
+        "@eslint/core": "^0.12.0",
         "levn": "^0.4.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
-    "node_modules/@floating-ui/core": {
-      "version": "1.6.9",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.9.tgz",
-      "integrity": "sha512-uMXCuQ3BItDUbAMhIXw7UPXRfAlOAvZzdK9BWpE60MCn+Svt3aLn9jsPTi/WNGlRUu2uI0v5S7JiIUsbsvh3fw==",
-      "license": "MIT",
+    "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz",
+      "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==",
+      "dev": true,
       "dependencies": {
-        "@floating-ui/utils": "^0.2.9"
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      }
+    },
+    "node_modules/@floating-ui/core": {
+      "version": "1.6.8",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.8.tgz",
+      "integrity": "sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==",
+      "dependencies": {
+        "@floating-ui/utils": "^0.2.8"
       }
     },
     "node_modules/@floating-ui/dom": {
-      "version": "1.6.13",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.13.tgz",
-      "integrity": "sha512-umqzocjDgNRGTuO7Q8CU32dkHkECqI8ZdMZ5Swb6QAM0t5rnlrN3lGo1hdpscRd3WS8T6DKYK4ephgIH9iRh3w==",
-      "license": "MIT",
+      "version": "1.6.11",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.11.tgz",
+      "integrity": "sha512-qkMCxSR24v2vGkhYDo/UzxfJN3D4syqSjyuTFz6C7XcpU1pASPRieNI0Kj5VP3/503mOfYiGY891ugBX1GlABQ==",
       "dependencies": {
         "@floating-ui/core": "^1.6.0",
-        "@floating-ui/utils": "^0.2.9"
+        "@floating-ui/utils": "^0.2.8"
       }
     },
     "node_modules/@floating-ui/react-dom": {
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.2.tgz",
       "integrity": "sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==",
-      "license": "MIT",
       "dependencies": {
         "@floating-ui/dom": "^1.0.0"
       },
@@ -804,22 +410,19 @@
       }
     },
     "node_modules/@floating-ui/utils": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.9.tgz",
-      "integrity": "sha512-MDWhGtE+eHw5JW7lq4qhc5yRLS11ERl1c7Z6Xd0a58DozHES6EnNNwUWbMiG4J9Cgj053Bhk8zvlhFYKVhULwg==",
-      "license": "MIT"
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz",
+      "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig=="
     },
     "node_modules/@fontsource/inter": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/@fontsource/inter/-/inter-5.1.1.tgz",
-      "integrity": "sha512-weN3E+rq0Xb3Z93VHJ+Rc7WOQX9ETJPTAJ+gDcaMHtjft67L58sfS65rAjC5tZUXQ2FdZ/V1/sSzCwZ6v05kJw==",
-      "license": "OFL-1.1"
+      "integrity": "sha512-weN3E+rq0Xb3Z93VHJ+Rc7WOQX9ETJPTAJ+gDcaMHtjft67L58sfS65rAjC5tZUXQ2FdZ/V1/sSzCwZ6v05kJw=="
     },
     "node_modules/@heroicons/react": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@heroicons/react/-/react-2.2.0.tgz",
       "integrity": "sha512-LMcepvRaS9LYHJGsF0zzmgKCUim/X3N/DQKc4jepAXJ7l8QxJ1PmxJzqplF2Z3FE4PqBAIGyJAQ/w4B5dsqbtQ==",
-      "license": "MIT",
       "peerDependencies": {
         "react": ">= 16 || ^19.0.0-rc"
       }
@@ -829,7 +432,6 @@
       "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
       "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=18.18.0"
       }
@@ -839,7 +441,6 @@
       "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
       "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@humanfs/core": "^0.19.1",
         "@humanwhocodes/retry": "^0.3.0"
@@ -853,7 +454,6 @@
       "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
       "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=18.18"
       },
@@ -867,7 +467,6 @@
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
       "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=12.22"
       },
@@ -877,11 +476,10 @@
       }
     },
     "node_modules/@humanwhocodes/retry": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.1.tgz",
-      "integrity": "sha512-c7hNEllBlenFTHBky65mhq8WD2kbN9Q6gk0bTk8lSBvc554jpXSkST1iePudpt7+A/AQvuHs9EMqjHDXMY1lrA==",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz",
+      "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": ">=18.18"
       },
@@ -894,7 +492,6 @@
       "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",
@@ -907,11 +504,25 @@
         "node": ">=12"
       }
     },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.8.tgz",
-      "integrity": "sha512-imAbBGkb+ebQyxKgzv5Hu2nmROxoDOXHh80evxdoXNOrvAnVx7zimzc1Oo5h9RlfV4vPXaE2iM5pOFbvOCClWA==",
+    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
+      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
       "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
+      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
       "dependencies": {
         "@jridgewell/set-array": "^1.2.1",
         "@jridgewell/sourcemap-codec": "^1.4.10",
@@ -925,7 +536,6 @@
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
       "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -934,7 +544,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
       "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
-      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
@@ -942,14 +551,12 @@
     "node_modules/@jridgewell/sourcemap-codec": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==",
-      "license": "MIT"
+      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.25",
       "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
       "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -959,7 +566,6 @@
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
-      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -972,7 +578,6 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
-      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -981,7 +586,6 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
-      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -990,36 +594,51 @@
         "node": ">= 8"
       }
     },
+    "node_modules/@number-flow/react": {
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/@number-flow/react/-/react-0.5.5.tgz",
+      "integrity": "sha512-Zdju5n0osxrb+7jbcpUJ9L2VJ2+9ptwjz5+A+2wq9Q32hs3PW/noPJjHtLTrtGINM9mEw76DcDg0ac/dx6j1aA==",
+      "dependencies": {
+        "esm-env": "^1.1.4",
+        "number-flow": "0.5.3"
+      },
+      "peerDependencies": {
+        "react": "^18 || ^19",
+        "react-dom": "^18 || ^19"
+      }
+    },
     "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/@radix-ui/number": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.0.tgz",
+      "integrity": "sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ=="
+    },
     "node_modules/@radix-ui/primitive": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.1.tgz",
-      "integrity": "sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA==",
-      "license": "MIT"
+      "integrity": "sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA=="
     },
     "node_modules/@radix-ui/react-accordion": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-accordion/-/react-accordion-1.2.2.tgz",
-      "integrity": "sha512-b1oh54x4DMCdGsB4/7ahiSrViXxaBwRPotiZNnYXjLha9vfuURSAZErki6qjDoSIV0eXx5v57XnTGVtGwnfp2g==",
-      "license": "MIT",
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-accordion/-/react-accordion-1.2.3.tgz",
+      "integrity": "sha512-RIQ15mrcvqIkDARJeERSuXSry2N8uYnxkdDetpfmalT/+0ntOXLkFOsh9iwlAsCv+qcmhZjbdJogIm6WBa6c4A==",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
-        "@radix-ui/react-collapsible": "1.1.2",
-        "@radix-ui/react-collection": "1.1.1",
+        "@radix-ui/react-collapsible": "1.1.3",
+        "@radix-ui/react-collection": "1.1.2",
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
         "@radix-ui/react-direction": "1.1.0",
         "@radix-ui/react-id": "1.1.0",
-        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-controllable-state": "1.1.0"
       },
       "peerDependencies": {
@@ -1038,12 +657,11 @@
       }
     },
     "node_modules/@radix-ui/react-arrow": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.1.tgz",
-      "integrity": "sha512-NaVpZfmv8SKeZbn4ijN2V3jlHA9ngBG16VnIIm22nUR0Yk8KUALyBxT3KYEUnNuch9sTE8UTsS3whzBgKOL30w==",
-      "license": "MIT",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.2.tgz",
+      "integrity": "sha512-G+KcpzXHq24iH0uGG/pF8LyzpFJYGD4RfLjCIBfGdSLXvjLHST31RUiRVrupIBMvIppMgSzQ6l66iAxl03tdlg==",
       "dependencies": {
-        "@radix-ui/react-primitive": "2.0.1"
+        "@radix-ui/react-primitive": "2.0.2"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -1061,16 +679,15 @@
       }
     },
     "node_modules/@radix-ui/react-checkbox": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.1.3.tgz",
-      "integrity": "sha512-HD7/ocp8f1B3e6OHygH0n7ZKjONkhciy1Nh0yuBgObqThc3oyx+vuMfFHKAknXRHHWVE9XvXStxJFyjUmB8PIw==",
-      "license": "MIT",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.1.4.tgz",
+      "integrity": "sha512-wP0CPAHq+P5I4INKe3hJrIa1WoNqqrejzW+zoU0rOvo1b9gDEJJFl2rYfO1PYJUQCc2H1WZxIJmyv9BS8i5fLw==",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
         "@radix-ui/react-presence": "1.1.2",
-        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-controllable-state": "1.1.0",
         "@radix-ui/react-use-previous": "1.1.0",
         "@radix-ui/react-use-size": "1.1.0"
@@ -1091,17 +708,16 @@
       }
     },
     "node_modules/@radix-ui/react-collapsible": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.2.tgz",
-      "integrity": "sha512-PliMB63vxz7vggcyq0IxNYk8vGDrLXVWw4+W4B8YnwI1s18x7YZYqlG9PLX7XxAJUi0g2DxP4XKJMFHh/iVh9A==",
-      "license": "MIT",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.3.tgz",
+      "integrity": "sha512-jFSerheto1X03MUC0g6R7LedNW9EEGWdg9W1+MlpkMLwGkgkbUXLPBH/KIuWKXUoeYRVY11llqbTBDzuLg7qrw==",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
         "@radix-ui/react-id": "1.1.0",
         "@radix-ui/react-presence": "1.1.2",
-        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-controllable-state": "1.1.0",
         "@radix-ui/react-use-layout-effect": "1.1.0"
       },
@@ -1121,15 +737,14 @@
       }
     },
     "node_modules/@radix-ui/react-collection": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.1.tgz",
-      "integrity": "sha512-LwT3pSho9Dljg+wY2KN2mrrh6y3qELfftINERIzBUO9e0N+t0oMTyn3k9iv+ZqgrwGkRnLpNJrsMv9BZlt2yuA==",
-      "license": "MIT",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.2.tgz",
+      "integrity": "sha512-9z54IEKRxIa9VityapoEYMuByaG42iSy1ZXlY2KcuLSEtq8x4987/N6m15ppoMffgZX72gER2uHe1D9Y6Unlcw==",
       "dependencies": {
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
-        "@radix-ui/react-primitive": "2.0.1",
-        "@radix-ui/react-slot": "1.1.1"
+        "@radix-ui/react-primitive": "2.0.2",
+        "@radix-ui/react-slot": "1.1.2"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -1150,7 +765,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.1.tgz",
       "integrity": "sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==",
-      "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
         "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
@@ -1165,7 +779,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.1.tgz",
       "integrity": "sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==",
-      "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
         "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
@@ -1177,25 +790,24 @@
       }
     },
     "node_modules/@radix-ui/react-dialog": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.4.tgz",
-      "integrity": "sha512-Ur7EV1IwQGCyaAuyDRiOLA5JIUZxELJljF+MbM/2NC0BYwfuRrbpS30BiQBJrVruscgUkieKkqXYDOoByaxIoA==",
-      "license": "MIT",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.6.tgz",
+      "integrity": "sha512-/IVhJV5AceX620DUJ4uYVMymzsipdKBzo3edo+omeskCKGm9FRHM0ebIdbPnlQVJqyuHbuBltQUOG2mOTq2IYw==",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
-        "@radix-ui/react-dismissable-layer": "1.1.3",
+        "@radix-ui/react-dismissable-layer": "1.1.5",
         "@radix-ui/react-focus-guards": "1.1.1",
-        "@radix-ui/react-focus-scope": "1.1.1",
+        "@radix-ui/react-focus-scope": "1.1.2",
         "@radix-ui/react-id": "1.1.0",
-        "@radix-ui/react-portal": "1.1.3",
+        "@radix-ui/react-portal": "1.1.4",
         "@radix-ui/react-presence": "1.1.2",
-        "@radix-ui/react-primitive": "2.0.1",
-        "@radix-ui/react-slot": "1.1.1",
+        "@radix-ui/react-primitive": "2.0.2",
+        "@radix-ui/react-slot": "1.1.2",
         "@radix-ui/react-use-controllable-state": "1.1.0",
-        "aria-hidden": "^1.1.1",
-        "react-remove-scroll": "^2.6.1"
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.6.3"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -1216,7 +828,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.0.tgz",
       "integrity": "sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==",
-      "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
         "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
@@ -1228,14 +839,13 @@
       }
     },
     "node_modules/@radix-ui/react-dismissable-layer": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.3.tgz",
-      "integrity": "sha512-onrWn/72lQoEucDmJnr8uczSNTujT0vJnA/X5+3AkChVPowr8n1yvIKIabhWyMQeMvvmdpsvcyDqx3X1LEXCPg==",
-      "license": "MIT",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.5.tgz",
+      "integrity": "sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg==",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
-        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-callback-ref": "1.1.0",
         "@radix-ui/react-use-escape-keydown": "1.1.0"
       },
@@ -1255,17 +865,16 @@
       }
     },
     "node_modules/@radix-ui/react-dropdown-menu": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.4.tgz",
-      "integrity": "sha512-iXU1Ab5ecM+yEepGAWK8ZhMyKX4ubFdCNtol4sT9D0OVErG9PNElfx3TQhjw7n7BC5nFVz68/5//clWy+8TXzA==",
-      "license": "MIT",
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.6.tgz",
+      "integrity": "sha512-no3X7V5fD487wab/ZYSHXq3H37u4NVeLDKI/Ks724X/eEFSSEFYZxWgsIlr1UBeEyDaM29HM5x9p1Nv8DuTYPA==",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
         "@radix-ui/react-id": "1.1.0",
-        "@radix-ui/react-menu": "2.1.4",
-        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-menu": "2.1.6",
+        "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-controllable-state": "1.1.0"
       },
       "peerDependencies": {
@@ -1287,7 +896,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.1.tgz",
       "integrity": "sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==",
-      "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
         "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
@@ -1299,13 +907,12 @@
       }
     },
     "node_modules/@radix-ui/react-focus-scope": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.1.tgz",
-      "integrity": "sha512-01omzJAYRxXdG2/he/+xy+c8a8gCydoQ1yOxnWNcRhrrBW5W+RQJ22EK1SaO8tb3WoUsuEw7mJjBozPzihDFjA==",
-      "license": "MIT",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.2.tgz",
+      "integrity": "sha512-zxwE80FCU7lcXUGWkdt6XpTTCKPitG1XKOwViTxHVKIJhZl9MvIl2dVHeZENCWD9+EdWv05wlaEkRXUykU27RA==",
       "dependencies": {
         "@radix-ui/react-compose-refs": "1.1.1",
-        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-callback-ref": "1.1.0"
       },
       "peerDependencies": {
@@ -1327,7 +934,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.0.tgz",
       "integrity": "sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==",
-      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-use-layout-effect": "1.1.0"
       },
@@ -1342,12 +948,11 @@
       }
     },
     "node_modules/@radix-ui/react-label": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.1.tgz",
-      "integrity": "sha512-UUw5E4e/2+4kFMH7+YxORXGWggtY6sM8WIwh5RZchhLuUg2H1hc98Py+pr8HMz6rdaYrK2t296ZEjYLOCO5uUw==",
-      "license": "MIT",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.2.tgz",
+      "integrity": "sha512-zo1uGMTaNlHehDyFQcDZXRJhUPDuukcnHz0/jnrup0JA6qL+AFpAnty+7VKa9esuU5xTblAZzTGYJKSKaBxBhw==",
       "dependencies": {
-        "@radix-ui/react-primitive": "2.0.1"
+        "@radix-ui/react-primitive": "2.0.2"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -1365,29 +970,28 @@
       }
     },
     "node_modules/@radix-ui/react-menu": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.4.tgz",
-      "integrity": "sha512-BnOgVoL6YYdHAG6DtXONaR29Eq4nvbi8rutrV/xlr3RQCMMb3yqP85Qiw/3NReozrSW+4dfLkK+rc1hb4wPU/A==",
-      "license": "MIT",
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.6.tgz",
+      "integrity": "sha512-tBBb5CXDJW3t2mo9WlO7r6GTmWV0F0uzHZVFmlRmYpiSK1CDU5IKojP1pm7oknpBOrFZx/YgBRW9oorPO2S/Lg==",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
-        "@radix-ui/react-collection": "1.1.1",
+        "@radix-ui/react-collection": "1.1.2",
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
         "@radix-ui/react-direction": "1.1.0",
-        "@radix-ui/react-dismissable-layer": "1.1.3",
+        "@radix-ui/react-dismissable-layer": "1.1.5",
         "@radix-ui/react-focus-guards": "1.1.1",
-        "@radix-ui/react-focus-scope": "1.1.1",
+        "@radix-ui/react-focus-scope": "1.1.2",
         "@radix-ui/react-id": "1.1.0",
-        "@radix-ui/react-popper": "1.2.1",
-        "@radix-ui/react-portal": "1.1.3",
+        "@radix-ui/react-popper": "1.2.2",
+        "@radix-ui/react-portal": "1.1.4",
         "@radix-ui/react-presence": "1.1.2",
-        "@radix-ui/react-primitive": "2.0.1",
-        "@radix-ui/react-roving-focus": "1.1.1",
-        "@radix-ui/react-slot": "1.1.1",
+        "@radix-ui/react-primitive": "2.0.2",
+        "@radix-ui/react-roving-focus": "1.1.2",
+        "@radix-ui/react-slot": "1.1.2",
         "@radix-ui/react-use-callback-ref": "1.1.0",
-        "aria-hidden": "^1.1.1",
-        "react-remove-scroll": "^2.6.1"
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.6.3"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -1405,26 +1009,25 @@
       }
     },
     "node_modules/@radix-ui/react-popover": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.4.tgz",
-      "integrity": "sha512-aUACAkXx8LaFymDma+HQVji7WhvEhpFJ7+qPz17Nf4lLZqtreGOFRiNQWQmhzp7kEWg9cOyyQJpdIMUMPc/CPw==",
-      "license": "MIT",
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.6.tgz",
+      "integrity": "sha512-NQouW0x4/GnkFJ/pRqsIS3rM/k97VzKnVb2jB7Gq7VEGPy5g7uNV1ykySFt7eWSp3i2uSGFwaJcvIRJBAHmmFg==",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
-        "@radix-ui/react-dismissable-layer": "1.1.3",
+        "@radix-ui/react-dismissable-layer": "1.1.5",
         "@radix-ui/react-focus-guards": "1.1.1",
-        "@radix-ui/react-focus-scope": "1.1.1",
+        "@radix-ui/react-focus-scope": "1.1.2",
         "@radix-ui/react-id": "1.1.0",
-        "@radix-ui/react-popper": "1.2.1",
-        "@radix-ui/react-portal": "1.1.3",
+        "@radix-ui/react-popper": "1.2.2",
+        "@radix-ui/react-portal": "1.1.4",
         "@radix-ui/react-presence": "1.1.2",
-        "@radix-ui/react-primitive": "2.0.1",
-        "@radix-ui/react-slot": "1.1.1",
+        "@radix-ui/react-primitive": "2.0.2",
+        "@radix-ui/react-slot": "1.1.2",
         "@radix-ui/react-use-controllable-state": "1.1.0",
-        "aria-hidden": "^1.1.1",
-        "react-remove-scroll": "^2.6.1"
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.6.3"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -1442,16 +1045,15 @@
       }
     },
     "node_modules/@radix-ui/react-popper": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.1.tgz",
-      "integrity": "sha512-3kn5Me69L+jv82EKRuQCXdYyf1DqHwD2U/sxoNgBGCB7K9TRc3bQamQ+5EPM9EvyPdli0W41sROd+ZU1dTCztw==",
-      "license": "MIT",
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.2.tgz",
+      "integrity": "sha512-Rvqc3nOpwseCyj/rgjlJDYAgyfw7OC1tTkKn2ivhaMGcYt8FSBlahHOZak2i3QwkRXUXgGgzeEe2RuqeEHuHgA==",
       "dependencies": {
         "@floating-ui/react-dom": "^2.0.0",
-        "@radix-ui/react-arrow": "1.1.1",
+        "@radix-ui/react-arrow": "1.1.2",
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
-        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-callback-ref": "1.1.0",
         "@radix-ui/react-use-layout-effect": "1.1.0",
         "@radix-ui/react-use-rect": "1.1.0",
@@ -1474,12 +1076,11 @@
       }
     },
     "node_modules/@radix-ui/react-portal": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.3.tgz",
-      "integrity": "sha512-NciRqhXnGojhT93RPyDaMPfLH3ZSl4jjIFbZQ1b/vxvZEdHsBZ49wP9w8L3HzUQwep01LcWtkUvm0OVB5JAHTw==",
-      "license": "MIT",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.4.tgz",
+      "integrity": "sha512-sn2O9k1rPFYVyKd5LAJfo96JlSGVFpa1fS6UuBJfrZadudiw5tAmru+n1x7aMRQ84qDM71Zh1+SzK5QwU0tJfA==",
       "dependencies": {
-        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-layout-effect": "1.1.0"
       },
       "peerDependencies": {
@@ -1501,7 +1102,6 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.2.tgz",
       "integrity": "sha512-18TFr80t5EVgL9x1SwF/YGtfG+l0BS0PRAlCWBDoBEiDQjeKgnNZRVJp/oVBl24sr3Gbfwc/Qpj4OcWTQMsAEg==",
-      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-use-layout-effect": "1.1.0"
@@ -1522,12 +1122,11 @@
       }
     },
     "node_modules/@radix-ui/react-primitive": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.1.tgz",
-      "integrity": "sha512-sHCWTtxwNn3L3fH8qAfnF3WbUZycW93SM1j3NFDzXBiz8D6F5UTTy8G1+WFEaiCdvCVRJWj6N2R4Xq6HdiHmDg==",
-      "license": "MIT",
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.2.tgz",
+      "integrity": "sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w==",
       "dependencies": {
-        "@radix-ui/react-slot": "1.1.1"
+        "@radix-ui/react-slot": "1.1.2"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -1545,13 +1144,12 @@
       }
     },
     "node_modules/@radix-ui/react-progress": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-progress/-/react-progress-1.1.1.tgz",
-      "integrity": "sha512-6diOawA84f/eMxFHcWut0aE1C2kyE9dOyCTQOMRR2C/qPiXz/X0SaiA/RLbapQaXUCmy0/hLMf9meSccD1N0pA==",
-      "license": "MIT",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-progress/-/react-progress-1.1.2.tgz",
+      "integrity": "sha512-u1IgJFQ4zNAUTjGdDL5dcl/U8ntOR6jsnhxKb5RKp5Ozwl88xKR9EqRZOe/Mk8tnx0x5tNUe2F+MzsyjqMg0MA==",
       "dependencies": {
         "@radix-ui/react-context": "1.1.1",
-        "@radix-ui/react-primitive": "2.0.1"
+        "@radix-ui/react-primitive": "2.0.2"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -1569,18 +1167,17 @@
       }
     },
     "node_modules/@radix-ui/react-roving-focus": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.1.tgz",
-      "integrity": "sha512-QE1RoxPGJ/Nm8Qmk0PxP8ojmoaS67i0s7hVssS7KuI2FQoc/uzVlZsqKfQvxPE6D8hICCPHJ4D88zNhT3OOmkw==",
-      "license": "MIT",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.2.tgz",
+      "integrity": "sha512-zgMQWkNO169GtGqRvYrzb0Zf8NhMHS2DuEB/TiEmVnpr5OqPU3i8lfbxaAmC2J/KYuIQxyoQQ6DxepyXp61/xw==",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
-        "@radix-ui/react-collection": "1.1.1",
+        "@radix-ui/react-collection": "1.1.2",
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
         "@radix-ui/react-direction": "1.1.0",
         "@radix-ui/react-id": "1.1.0",
-        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-callback-ref": "1.1.0",
         "@radix-ui/react-use-controllable-state": "1.1.0"
       },
@@ -1599,13 +1196,54 @@
         }
       }
     },
-    "node_modules/@radix-ui/react-separator": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.1.tgz",
-      "integrity": "sha512-RRiNRSrD8iUiXriq/Y5n4/3iE8HzqgLHsusUSg5jVpU2+3tqcUFPJXHDymwEypunc2sWxDUS3UC+rkZRlHedsw==",
-      "license": "MIT",
+    "node_modules/@radix-ui/react-select": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.1.6.tgz",
+      "integrity": "sha512-T6ajELxRvTuAMWH0YmRJ1qez+x4/7Nq7QIx7zJ0VK3qaEWdnWpNbEDnmWldG1zBDwqrLy5aLMUWcoGirVj5kMg==",
       "dependencies": {
-        "@radix-ui/react-primitive": "2.0.1"
+        "@radix-ui/number": "1.1.0",
+        "@radix-ui/primitive": "1.1.1",
+        "@radix-ui/react-collection": "1.1.2",
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-context": "1.1.1",
+        "@radix-ui/react-direction": "1.1.0",
+        "@radix-ui/react-dismissable-layer": "1.1.5",
+        "@radix-ui/react-focus-guards": "1.1.1",
+        "@radix-ui/react-focus-scope": "1.1.2",
+        "@radix-ui/react-id": "1.1.0",
+        "@radix-ui/react-popper": "1.2.2",
+        "@radix-ui/react-portal": "1.1.4",
+        "@radix-ui/react-primitive": "2.0.2",
+        "@radix-ui/react-slot": "1.1.2",
+        "@radix-ui/react-use-callback-ref": "1.1.0",
+        "@radix-ui/react-use-controllable-state": "1.1.0",
+        "@radix-ui/react-use-layout-effect": "1.1.0",
+        "@radix-ui/react-use-previous": "1.1.0",
+        "@radix-ui/react-visually-hidden": "1.1.2",
+        "aria-hidden": "^1.2.4",
+        "react-remove-scroll": "^2.6.3"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@radix-ui/react-separator": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.2.tgz",
+      "integrity": "sha512-oZfHcaAp2Y6KFBX6I5P1u7CQoy4lheCGiYj+pGFrHy8E/VNRb5E39TkTr3JrV520csPBTZjkuKFdEsjS5EUNKQ==",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.0.2"
       },
       "peerDependencies": {
         "@types/react": "*",
@@ -1623,10 +1261,9 @@
       }
     },
     "node_modules/@radix-ui/react-slot": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.1.tgz",
-      "integrity": "sha512-RApLLOcINYJA+dMVbOju7MYv1Mb2EBp2nH4HdDzXTSyaR5optlm6Otrz1euW3HbdOR8UmmFK06TD+A9frYWv+g==",
-      "license": "MIT",
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.2.tgz",
+      "integrity": "sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ==",
       "dependencies": {
         "@radix-ui/react-compose-refs": "1.1.1"
       },
@@ -1641,15 +1278,14 @@
       }
     },
     "node_modules/@radix-ui/react-switch": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.1.2.tgz",
-      "integrity": "sha512-zGukiWHjEdBCRyXvKR6iXAQG6qXm2esuAD6kDOi9Cn+1X6ev3ASo4+CsYaD6Fov9r/AQFekqnD/7+V0Cs6/98g==",
-      "license": "MIT",
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.1.3.tgz",
+      "integrity": "sha512-1nc+vjEOQkJVsJtWPSiISGT6OKm4SiOdjMo+/icLxo2G4vxz1GntC5MzfL4v8ey9OEfw787QCD1y3mUv0NiFEQ==",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
-        "@radix-ui/react-primitive": "2.0.1",
+        "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-controllable-state": "1.1.0",
         "@radix-ui/react-use-previous": "1.1.0",
         "@radix-ui/react-use-size": "1.1.0"
@@ -1669,11 +1305,43 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-tooltip": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-tooltip/-/react-tooltip-1.1.8.tgz",
+      "integrity": "sha512-YAA2cu48EkJZdAMHC0dqo9kialOcRStbtiY4nJPaht7Ptrhcvpo+eDChaM6BIs8kL6a8Z5l5poiqLnXcNduOkA==",
+      "dependencies": {
+        "@radix-ui/primitive": "1.1.1",
+        "@radix-ui/react-compose-refs": "1.1.1",
+        "@radix-ui/react-context": "1.1.1",
+        "@radix-ui/react-dismissable-layer": "1.1.5",
+        "@radix-ui/react-id": "1.1.0",
+        "@radix-ui/react-popper": "1.2.2",
+        "@radix-ui/react-portal": "1.1.4",
+        "@radix-ui/react-presence": "1.1.2",
+        "@radix-ui/react-primitive": "2.0.2",
+        "@radix-ui/react-slot": "1.1.2",
+        "@radix-ui/react-use-controllable-state": "1.1.0",
+        "@radix-ui/react-visually-hidden": "1.1.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/react-use-callback-ref": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz",
       "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==",
-      "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
         "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
@@ -1688,7 +1356,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz",
       "integrity": "sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==",
-      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-use-callback-ref": "1.1.0"
       },
@@ -1706,7 +1373,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz",
       "integrity": "sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==",
-      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-use-callback-ref": "1.1.0"
       },
@@ -1724,7 +1390,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz",
       "integrity": "sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==",
-      "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
         "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
@@ -1739,7 +1404,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.0.tgz",
       "integrity": "sha512-Z/e78qg2YFnnXcW88A4JmTtm4ADckLno6F7OXotmkQfeuCVaKuYzqAATPhVzl3delXE7CxIV8shofPn3jPc5Og==",
-      "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
         "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
@@ -1754,7 +1418,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.0.tgz",
       "integrity": "sha512-0Fmkebhr6PiseyZlYAOtLS+nb7jLmpqTrJyv61Pe68MKYW6OWdRE2kI70TaYY27u7H0lajqM3hSMMLFq18Z7nQ==",
-      "license": "MIT",
       "dependencies": {
         "@radix-ui/rect": "1.1.0"
       },
@@ -1772,7 +1435,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.0.tgz",
       "integrity": "sha512-XW3/vWuIXHa+2Uwcc2ABSfcCledmXhhQPlGbfcRXbiUQI5Icjcg19BGCZVKKInYbvUCut/ufbbLLPFC5cbb1hw==",
-      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-use-layout-effect": "1.1.0"
       },
@@ -1786,285 +1448,65 @@
         }
       }
     },
+    "node_modules/@radix-ui/react-visually-hidden": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.2.tgz",
+      "integrity": "sha512-1SzA4ns2M1aRlvxErqhLHsBHoS5eI5UUcI2awAMgGUp4LoaoWOKYmvqDY2s/tltuPkh3Yk77YF/r3IRj+Amx4Q==",
+      "dependencies": {
+        "@radix-ui/react-primitive": "2.0.2"
+      },
+      "peerDependencies": {
+        "@types/react": "*",
+        "@types/react-dom": "*",
+        "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc",
+        "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "@types/react-dom": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/@radix-ui/rect": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.0.tgz",
-      "integrity": "sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==",
-      "license": "MIT"
-    },
-    "node_modules/@rollup/rollup-android-arm-eabi": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.31.0.tgz",
-      "integrity": "sha512-9NrR4033uCbUBRgvLcBrJofa2KY9DzxL2UKZ1/4xA/mnTNyhZCWBuD8X3tPm1n4KxcgaraOYgrFKSgwjASfmlA==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-android-arm64": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.31.0.tgz",
-      "integrity": "sha512-iBbODqT86YBFHajxxF8ebj2hwKm1k8PTBQSojSt3d1FFt1gN+xf4CowE47iN0vOSdnd+5ierMHBbu/rHc7nq5g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "android"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-arm64": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.31.0.tgz",
-      "integrity": "sha512-WHIZfXgVBX30SWuTMhlHPXTyN20AXrLH4TEeH/D0Bolvx9PjgZnn4H677PlSGvU6MKNsjCQJYczkpvBbrBnG6g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-darwin-x64": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.31.0.tgz",
-      "integrity": "sha512-hrWL7uQacTEF8gdrQAqcDy9xllQ0w0zuL1wk1HV8wKGSGbKPVjVUv/DEwT2+Asabf8Dh/As+IvfdU+H8hhzrQQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ]
-    },
-    "node_modules/@rollup/rollup-freebsd-arm64": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.31.0.tgz",
-      "integrity": "sha512-S2oCsZ4hJviG1QjPY1h6sVJLBI6ekBeAEssYKad1soRFv3SocsQCzX6cwnk6fID6UQQACTjeIMB+hyYrFacRew==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-freebsd-x64": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.31.0.tgz",
-      "integrity": "sha512-pCANqpynRS4Jirn4IKZH4tnm2+2CqCNLKD7gAdEjzdLGbH1iO0zouHz4mxqg0uEMpO030ejJ0aA6e1PJo2xrPA==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "freebsd"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.31.0.tgz",
-      "integrity": "sha512-0O8ViX+QcBd3ZmGlcFTnYXZKGbFu09EhgD27tgTdGnkcYXLat4KIsBBQeKLR2xZDCXdIBAlWLkiXE1+rJpCxFw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.31.0.tgz",
-      "integrity": "sha512-w5IzG0wTVv7B0/SwDnMYmbr2uERQp999q8FMkKG1I+j8hpPX2BYFjWe69xbhbP6J9h2gId/7ogesl9hwblFwwg==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-gnu": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.31.0.tgz",
-      "integrity": "sha512-JyFFshbN5xwy6fulZ8B/8qOqENRmDdEkcIMF0Zz+RsfamEW+Zabl5jAb0IozP/8UKnJ7g2FtZZPEUIAlUSX8cA==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-arm64-musl": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.31.0.tgz",
-      "integrity": "sha512-kpQXQ0UPFeMPmPYksiBL9WS/BDiQEjRGMfklVIsA0Sng347H8W2iexch+IEwaR7OVSKtr2ZFxggt11zVIlZ25g==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-loongarch64-gnu": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loongarch64-gnu/-/rollup-linux-loongarch64-gnu-4.31.0.tgz",
-      "integrity": "sha512-pMlxLjt60iQTzt9iBb3jZphFIl55a70wexvo8p+vVFK+7ifTRookdoXX3bOsRdmfD+OKnMozKO6XM4zR0sHRrQ==",
-      "cpu": [
-        "loong64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-powerpc64le-gnu": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-powerpc64le-gnu/-/rollup-linux-powerpc64le-gnu-4.31.0.tgz",
-      "integrity": "sha512-D7TXT7I/uKEuWiRkEFbed1UUYZwcJDU4vZQdPTcepK7ecPhzKOYk4Er2YR4uHKme4qDeIh6N3XrLfpuM7vzRWQ==",
-      "cpu": [
-        "ppc64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.31.0.tgz",
-      "integrity": "sha512-wal2Tc8O5lMBtoePLBYRKj2CImUCJ4UNGJlLwspx7QApYny7K1cUYlzQ/4IGQBLmm+y0RS7dwc3TDO/pmcneTw==",
-      "cpu": [
-        "riscv64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
-    },
-    "node_modules/@rollup/rollup-linux-s390x-gnu": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.31.0.tgz",
-      "integrity": "sha512-O1o5EUI0+RRMkK9wiTVpk2tyzXdXefHtRTIjBbmFREmNMy7pFeYXCFGbhKFwISA3UOExlo5GGUuuj3oMKdK6JQ==",
-      "cpu": [
-        "s390x"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ]
+      "integrity": "sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg=="
     },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.31.0.tgz",
-      "integrity": "sha512-zSoHl356vKnNxwOWnLd60ixHNPRBglxpv2g7q0Cd3Pmr561gf0HiAcUBRL3S1vPqRC17Zo2CX/9cPkqTIiai1g==",
+      "version": "4.34.6",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.6.tgz",
+      "integrity": "sha512-Sht4aFvmA4ToHd2vFzwMFaQCiYm2lDFho5rPcvPBT5pCdC+GwHG6CMch4GQfmWTQ1SwRKS0dhDYb54khSrjDWw==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.31.0.tgz",
-      "integrity": "sha512-ypB/HMtcSGhKUQNiFwqgdclWNRrAYDH8iMYH4etw/ZlGwiTVxBz2tDrGRrPlfZu6QjXwtd+C3Zib5pFqID97ZA==",
+      "version": "4.34.6",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.6.tgz",
+      "integrity": "sha512-zmmpOQh8vXc2QITsnCiODCDGXFC8LMi64+/oPpPx5qz3pqv0s6x46ps4xoycfUiVZps5PFn1gksZzo4RGTKT+A==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
-    "node_modules/@rollup/rollup-win32-arm64-msvc": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.31.0.tgz",
-      "integrity": "sha512-JuhN2xdI/m8Hr+aVO3vspO7OQfUFO6bKLIRTAy0U15vmWjnZDLrEgCZ2s6+scAYaQVpYSh9tZtRijApw9IXyMw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-ia32-msvc": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.31.0.tgz",
-      "integrity": "sha512-U1xZZXYkvdf5MIWmftU8wrM5PPXzyaY1nGCI4KI4BFfoZxHamsIe+BtnPLIvvPykvQWlVbqUXdLa4aJUuilwLQ==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
-    "node_modules/@rollup/rollup-win32-x64-msvc": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.31.0.tgz",
-      "integrity": "sha512-ul8rnCsUumNln5YWwz0ted2ZHFhzhRRnkpBZ+YRuHoRAlUji9KChpOUOndY7uykrPEPXVbHLlsdo6v5yXo/TXw==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ]
-    },
     "node_modules/@swc/core": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.10.9.tgz",
-      "integrity": "sha512-MQ97YSXu2oibzm7wi4GNa7hhndjLuVt/lmO2sq53+P37oZmyg/JQ/IYYtSiC6UGK3+cHoiVAykrK+glxLjJbag==",
+      "version": "1.10.15",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.10.15.tgz",
+      "integrity": "sha512-/iFeQuNaGdK7mfJbQcObhAhsMqLT7qgMYl7jX2GEIO+VDTejESpzAyKwaMeYXExN8D6e5BRHBCe7M5YlsuzjDA==",
       "dev": true,
       "hasInstallScript": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@swc/counter": "^0.1.3",
         "@swc/types": "^0.1.17"
@@ -2077,16 +1519,16 @@
         "url": "https://opencollective.com/swc"
       },
       "optionalDependencies": {
-        "@swc/core-darwin-arm64": "1.10.9",
-        "@swc/core-darwin-x64": "1.10.9",
-        "@swc/core-linux-arm-gnueabihf": "1.10.9",
-        "@swc/core-linux-arm64-gnu": "1.10.9",
-        "@swc/core-linux-arm64-musl": "1.10.9",
-        "@swc/core-linux-x64-gnu": "1.10.9",
-        "@swc/core-linux-x64-musl": "1.10.9",
-        "@swc/core-win32-arm64-msvc": "1.10.9",
-        "@swc/core-win32-ia32-msvc": "1.10.9",
-        "@swc/core-win32-x64-msvc": "1.10.9"
+        "@swc/core-darwin-arm64": "1.10.15",
+        "@swc/core-darwin-x64": "1.10.15",
+        "@swc/core-linux-arm-gnueabihf": "1.10.15",
+        "@swc/core-linux-arm64-gnu": "1.10.15",
+        "@swc/core-linux-arm64-musl": "1.10.15",
+        "@swc/core-linux-x64-gnu": "1.10.15",
+        "@swc/core-linux-x64-musl": "1.10.15",
+        "@swc/core-win32-arm64-msvc": "1.10.15",
+        "@swc/core-win32-ia32-msvc": "1.10.15",
+        "@swc/core-win32-x64-msvc": "1.10.15"
       },
       "peerDependencies": {
         "@swc/helpers": "*"
@@ -2097,100 +1539,14 @@
         }
       }
     },
-    "node_modules/@swc/core-darwin-arm64": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.10.9.tgz",
-      "integrity": "sha512-XTHLtijFervv2B+i1ngM993umhSj9K1IeMomvU/Db84Asjur2XmD4KXt9QPnGDRFgv2kLSjZ+DDL25Qk0f4r+w==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0 AND MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@swc/core-darwin-x64": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.10.9.tgz",
-      "integrity": "sha512-bi3el9/FV/la8HIsolSjeDar+tM7m9AmSF1w7X6ZByW2qgc4Z1tmq0A4M4H9aH3TfHesZbfq8hgaNtc2/VtzzQ==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0 AND MIT",
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@swc/core-linux-arm-gnueabihf": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.10.9.tgz",
-      "integrity": "sha512-xsLHV02S+RTDuI+UJBkA2muNk/s0ETRpoc1K/gNt0i8BqTurPYkrvGDDALN9+leiUPydHvZi9P1qdExbgUJnXw==",
-      "cpu": [
-        "arm"
-      ],
-      "dev": true,
-      "license": "Apache-2.0",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@swc/core-linux-arm64-gnu": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.10.9.tgz",
-      "integrity": "sha512-41hJgPoGhIa12U6Tud+yLF/m64YA3mGut3TmBEkj2R7rdJdE0mljdtR0tf4J2RoQaWZPPi0DBSqGdROiAEx9dg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0 AND MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@swc/core-linux-arm64-musl": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.10.9.tgz",
-      "integrity": "sha512-DUMRhl49b9r7bLg9oNzCdW4lLcDJKrRBn87Iq5APPvixsm1auGnsVQycGkQcDDKvVllxIFSbmCYzjagx3l8Hnw==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0 AND MIT",
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@swc/core-linux-x64-gnu": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.10.9.tgz",
-      "integrity": "sha512-xW0y88vQvmzYo3Gn7yFnY03TfHMwuca4aFH3ZmhwDNOYHmTOi6fmhAkg/13F/NrwjMYO+GnF5uJTjdjb3B6tdQ==",
+      "version": "1.10.15",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.10.15.tgz",
+      "integrity": "sha512-S1+ZEEn3+a/MiMeQqQypbwTGoBG8/sPoCvpNbk+uValyygT+jSn3U0xVr45FbukpmMB+NhBMqfedMLqKA0QnJA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "Apache-2.0 AND MIT",
       "optional": true,
       "os": [
         "linux"
@@ -2200,14 +1556,13 @@
       }
     },
     "node_modules/@swc/core-linux-x64-musl": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.10.9.tgz",
-      "integrity": "sha512-jYs32BEx+CPVuxN6NdsWEpdehjnmAag25jyJzwjQx+NCGYwHEV3bT5y8TX4eFhaVB1rafmqJOlYQPs4+MSyGCg==",
+      "version": "1.10.15",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.10.15.tgz",
+      "integrity": "sha512-qW+H9g/2zTJ4jP7NDw4VAALY0ZlNEKzYsEoSj/HKi7k3tYEHjMzsxjfsY9I8WZCft23bBdV3RTCPoxCshaj1CQ==",
       "cpu": [
         "x64"
       ],
       "dev": true,
-      "license": "Apache-2.0 AND MIT",
       "optional": true,
       "os": [
         "linux"
@@ -2216,101 +1571,45 @@
         "node": ">=10"
       }
     },
-    "node_modules/@swc/core-win32-arm64-msvc": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.10.9.tgz",
-      "integrity": "sha512-Uhh5T3Fq3Nyom96Bm3ACBNASH3iqNc76in7ewZz8PooUqeTIO8aZpsghnncjctRNE9T819/8btpiFIhHo3sKtg==",
-      "cpu": [
-        "arm64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0 AND MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@swc/core-win32-ia32-msvc": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.10.9.tgz",
-      "integrity": "sha512-bD5BpbojEsDfrAvT+1qjQPf5RCKLg4UL+3Uwm019+ZR02hd8qO538BlOnQdOqRqccu+75DF6aRglQ7AJ24Cs0Q==",
-      "cpu": [
-        "ia32"
-      ],
-      "dev": true,
-      "license": "Apache-2.0 AND MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@swc/core-win32-x64-msvc": {
-      "version": "1.10.9",
-      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.10.9.tgz",
-      "integrity": "sha512-NwkuUNeBBQnAaXVvcGw8Zr6RR8kylyjFUnlYZZ3G0QkQZ4rYLXYTafAmiRjrfzgVb0LcMF/sBzJvGOk7SwtIDg==",
-      "cpu": [
-        "x64"
-      ],
-      "dev": true,
-      "license": "Apache-2.0 AND MIT",
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@swc/counter": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
       "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
-      "dev": true,
-      "license": "Apache-2.0"
+      "dev": true
     },
     "node_modules/@swc/types": {
       "version": "0.1.17",
       "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.17.tgz",
       "integrity": "sha512-V5gRru+aD8YVyCOMAjMpWR1Ui577DD5KSJsHP8RAxopAH22jFz6GZd/qxqjO6MJHQhcsjvjOFXyDhyLQUnMveQ==",
       "dev": true,
-      "license": "Apache-2.0",
       "dependencies": {
         "@swc/counter": "^0.1.3"
       }
     },
     "node_modules/@tanstack/query-core": {
-      "version": "5.64.2",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.64.2.tgz",
-      "integrity": "sha512-hdO8SZpWXoADNTWXV9We8CwTkXU88OVWRBcsiFrk7xJQnhm6WRlweDzMD+uH+GnuieTBVSML6xFa17C2cNV8+g==",
-      "license": "MIT",
+      "version": "5.66.4",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.66.4.tgz",
+      "integrity": "sha512-skM/gzNX4shPkqmdTCSoHtJAPMTtmIJNS0hE+xwTTUVYwezArCT34NMermABmBVUg5Ls5aiUXEDXfqwR1oVkcA==",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
       }
     },
     "node_modules/@tanstack/query-devtools": {
-      "version": "5.64.2",
-      "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.64.2.tgz",
-      "integrity": "sha512-3DautR5UpVZdk/qNIhioZVF7g8fdQZ1U98sBEEk4Tzz3tihSBNMPgwlP40nzgbPEDBIrn/j/oyyvNBVSo083Vw==",
-      "license": "MIT",
+      "version": "5.65.0",
+      "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.65.0.tgz",
+      "integrity": "sha512-g5y7zc07U9D3esMdqUfTEVu9kMHoIaVBsD0+M3LPdAdD710RpTcLiNvJY1JkYXqkq9+NV+CQoemVNpQPBXVsJg==",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
       }
     },
     "node_modules/@tanstack/react-query": {
-      "version": "5.64.2",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.64.2.tgz",
-      "integrity": "sha512-3pakNscZNm8KJkxmovvtZ4RaXLyiYYobwleTMvpIGUoKRa8j8VlrQKNl5W8VUEfVfZKkikvXVddLuWMbcSCA1Q==",
-      "license": "MIT",
+      "version": "5.66.7",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.66.7.tgz",
+      "integrity": "sha512-qd3q/tUpF2K1xItfPZddk1k/8pSXnovg41XyCqJgPoyYEirMBtB0sVEVVQ/CsAOngzgWtBPXimVf4q4kM9uO6A==",
       "dependencies": {
-        "@tanstack/query-core": "5.64.2"
+        "@tanstack/query-core": "5.66.4"
       },
       "funding": {
         "type": "github",
@@ -2321,29 +1620,27 @@
       }
     },
     "node_modules/@tanstack/react-query-devtools": {
-      "version": "5.64.2",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.64.2.tgz",
-      "integrity": "sha512-+ZjJVnPzc8BUV/Eklu2k9T/IAyAyvwoCHqOaOrk2sbU33LFhM52BpX4eyENXn0bx5LwV3DJZgEQlIzucoemfGQ==",
-      "license": "MIT",
+      "version": "5.66.7",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.66.7.tgz",
+      "integrity": "sha512-40z4PPkz06tYIF0vwLZZIZfZxKUH4OAaBOR14blCFyYm6hlU6qc+M82mkZ+D00HcEMhV7P4XeJiEuDhFq0q9Qw==",
       "dependencies": {
-        "@tanstack/query-devtools": "5.64.2"
+        "@tanstack/query-devtools": "5.65.0"
       },
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
       },
       "peerDependencies": {
-        "@tanstack/react-query": "^5.64.2",
+        "@tanstack/react-query": "^5.66.7",
         "react": "^18 || ^19"
       }
     },
     "node_modules/@tanstack/react-table": {
-      "version": "8.20.6",
-      "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.20.6.tgz",
-      "integrity": "sha512-w0jluT718MrOKthRcr2xsjqzx+oEM7B7s/XXyfs19ll++hlId3fjTm+B2zrR3ijpANpkzBAr15j1XGVOMxpggQ==",
-      "license": "MIT",
+      "version": "8.21.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.21.2.tgz",
+      "integrity": "sha512-11tNlEDTdIhMJba2RBH+ecJ9l1zgS2kjmexDPAraulc8jeNA4xocSNeyzextT0XJyASil4XsCYlJmf5jEWAtYg==",
       "dependencies": {
-        "@tanstack/table-core": "8.20.5"
+        "@tanstack/table-core": "8.21.2"
       },
       "engines": {
         "node": ">=12"
@@ -2358,10 +1655,9 @@
       }
     },
     "node_modules/@tanstack/table-core": {
-      "version": "8.20.5",
-      "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.20.5.tgz",
-      "integrity": "sha512-P9dF7XbibHph2PFRz8gfBKEXEY/HJPOhym8CHmjF8y3q5mWpKx9xtZapXQUWCgkqvsK0R46Azuz+VaxD4Xl+Tg==",
-      "license": "MIT",
+      "version": "8.21.2",
+      "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.21.2.tgz",
+      "integrity": "sha512-uvXk/U4cBiFMxt+p9/G7yUWI/UbHYbyghLCjlpWZ3mLeIZiUBSKcUnw9UnKkdRz7Z/N4UBuFLWQdJCjUe7HjvA==",
       "engines": {
         "node": ">=12"
       },
@@ -2371,15 +1667,14 @@
       }
     },
     "node_modules/@trivago/prettier-plugin-sort-imports": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-5.2.1.tgz",
-      "integrity": "sha512-NDZndt0fmVThIx/8cExuJHLZagUVzfGCoVrwH9x6aZvwfBdkrDFTYujecek6X2WpG4uUFsVaPg5+aNQPSyjcmw==",
-      "license": "Apache-2.0",
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-5.2.2.tgz",
+      "integrity": "sha512-fYDQA9e6yTNmA13TLVSA+WMQRc5Bn/c0EUBditUHNfMMxN7M82c38b1kEggVE3pLpZ0FwkwJkUEKMiOi52JXFA==",
       "dependencies": {
-        "@babel/generator": "^7.26.2",
-        "@babel/parser": "^7.26.2",
-        "@babel/traverse": "^7.25.9",
-        "@babel/types": "^7.26.0",
+        "@babel/generator": "^7.26.5",
+        "@babel/parser": "^7.26.7",
+        "@babel/traverse": "^7.26.7",
+        "@babel/types": "^7.26.7",
         "javascript-natural-sort": "^0.7.1",
         "lodash": "^4.17.21"
       },
@@ -2407,32 +1702,27 @@
     "node_modules/@types/cookie": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
-      "license": "MIT"
+      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA=="
     },
     "node_modules/@types/d3-array": {
       "version": "3.2.1",
       "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz",
-      "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg==",
-      "license": "MIT"
+      "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg=="
     },
     "node_modules/@types/d3-color": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
-      "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
-      "license": "MIT"
+      "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A=="
     },
     "node_modules/@types/d3-ease": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
-      "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==",
-      "license": "MIT"
+      "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA=="
     },
     "node_modules/@types/d3-geo": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz",
       "integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==",
-      "license": "MIT",
       "dependencies": {
         "@types/geojson": "*"
       }
@@ -2441,7 +1731,6 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
       "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
-      "license": "MIT",
       "dependencies": {
         "@types/d3-color": "*"
       }
@@ -2449,111 +1738,98 @@
     "node_modules/@types/d3-path": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.0.tgz",
-      "integrity": "sha512-P2dlU/q51fkOc/Gfl3Ul9kicV7l+ra934qBFXCFhrZMOL6du1TM0pm1ThYvENukyOn5h9v+yMJ9Fn5JK4QozrQ==",
-      "license": "MIT"
+      "integrity": "sha512-P2dlU/q51fkOc/Gfl3Ul9kicV7l+ra934qBFXCFhrZMOL6du1TM0pm1ThYvENukyOn5h9v+yMJ9Fn5JK4QozrQ=="
     },
     "node_modules/@types/d3-scale": {
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz",
       "integrity": "sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==",
-      "license": "MIT",
       "dependencies": {
         "@types/d3-time": "*"
       }
     },
     "node_modules/@types/d3-shape": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.7.tgz",
-      "integrity": "sha512-VLvUQ33C+3J+8p+Daf+nYSOsjB4GXp19/S/aGo60m9h1v6XaxjiT82lKVWJCfzhtuZ3yD7i/TPeC/fuKLLOSmg==",
-      "license": "MIT",
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.6.tgz",
+      "integrity": "sha512-5KKk5aKGu2I+O6SONMYSNflgiP0WfZIQvVUMan50wHsLG1G94JlxEVnCpQARfTtzytuY0p/9PXXZb3I7giofIA==",
       "dependencies": {
         "@types/d3-path": "*"
       }
     },
     "node_modules/@types/d3-time": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz",
-      "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==",
-      "license": "MIT"
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.3.tgz",
+      "integrity": "sha512-2p6olUZ4w3s+07q3Tm2dbiMZy5pCDfYwtLXXHUnVzXgQlZ/OyPtUz6OL382BkOuGlLXqfT+wqv8Fw2v8/0geBw=="
     },
     "node_modules/@types/d3-timer": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
-      "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
-      "license": "MIT"
+      "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw=="
     },
     "node_modules/@types/estree": {
       "version": "1.0.6",
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
       "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/geojson": {
-      "version": "7946.0.15",
-      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.15.tgz",
-      "integrity": "sha512-9oSxFzDCT2Rj6DfcHF8G++jxBKS7mBqXl5xrRW+Kbvjry6Uduya2iiwqHPhVXpasAVMBYKkEPGgKhd3+/HZ6xA==",
-      "license": "MIT"
+      "version": "7946.0.14",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz",
+      "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg=="
     },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
       "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/@types/luxon": {
       "version": "3.4.2",
       "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.4.2.tgz",
-      "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==",
-      "license": "MIT"
+      "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA=="
     },
     "node_modules/@types/node": {
-      "version": "22.10.7",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.10.7.tgz",
-      "integrity": "sha512-V09KvXxFiutGp6B7XkpaDXlNadZxrzajcY50EuoLIpQ6WWYCSvf19lVIazzfIzQvhUN2HjX12spLojTnhuKlGg==",
+      "version": "22.13.4",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.4.tgz",
+      "integrity": "sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "undici-types": "~6.20.0"
       }
     },
     "node_modules/@types/react": {
-      "version": "19.0.7",
-      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.0.7.tgz",
-      "integrity": "sha512-MoFsEJKkAtZCrC1r6CM8U22GzhG7u2Wir8ons/aCKH6MBdD1ibV24zOSSkdZVUKqN5i396zG5VKLYZ3yaUZdLA==",
+      "version": "19.0.10",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-19.0.10.tgz",
+      "integrity": "sha512-JuRQ9KXLEjaUNjTWpzuR231Z2WpIwczOkBEIvbHNCzQefFIT0L8IqE6NV6ULLyC1SI/i234JnDoMkfg+RjQj2g==",
       "devOptional": true,
-      "license": "MIT",
       "dependencies": {
         "csstype": "^3.0.2"
       }
     },
     "node_modules/@types/react-dom": {
-      "version": "19.0.3",
-      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.0.3.tgz",
-      "integrity": "sha512-0Knk+HJiMP/qOZgMyNFamlIjw9OFCsyC2ZbigmEEyXXixgre6IQpm/4V+r3qH4GC1JPvRJKInw+on2rV6YZLeA==",
+      "version": "19.0.4",
+      "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.0.4.tgz",
+      "integrity": "sha512-4fSQ8vWFkg+TGhePfUzVmat3eC14TXYSsiiDSLI0dVLsrm9gZFABjPy/Qu6TKgl1tq1Bu1yDsuQgY3A3DOjCcg==",
       "devOptional": true,
-      "license": "MIT",
       "peerDependencies": {
         "@types/react": "^19.0.0"
       }
     },
     "node_modules/@typescript-eslint/eslint-plugin": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.21.0.tgz",
-      "integrity": "sha512-eTH+UOR4I7WbdQnG4Z48ebIA6Bgi7WO8HvFEneeYBxG8qCOYgTOFPSg6ek9ITIDvGjDQzWHcoWHCDO2biByNzA==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.24.1.tgz",
+      "integrity": "sha512-ll1StnKtBigWIGqvYDVuDmXJHVH4zLVot1yQ4fJtLpL7qacwkxJc1T0bptqw+miBQ/QfUbhl1TcQ4accW5KUyA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
-        "@typescript-eslint/scope-manager": "8.21.0",
-        "@typescript-eslint/type-utils": "8.21.0",
-        "@typescript-eslint/utils": "8.21.0",
-        "@typescript-eslint/visitor-keys": "8.21.0",
+        "@typescript-eslint/scope-manager": "8.24.1",
+        "@typescript-eslint/type-utils": "8.24.1",
+        "@typescript-eslint/utils": "8.24.1",
+        "@typescript-eslint/visitor-keys": "8.24.1",
         "graphemer": "^1.4.0",
         "ignore": "^5.3.1",
         "natural-compare": "^1.4.0",
-        "ts-api-utils": "^2.0.0"
+        "ts-api-utils": "^2.0.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2569,16 +1845,15 @@
       }
     },
     "node_modules/@typescript-eslint/parser": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.21.0.tgz",
-      "integrity": "sha512-Wy+/sdEH9kI3w9civgACwabHbKl+qIOu0uFZ9IMKzX3Jpv9og0ZBJrZExGrPpFAY7rWsXuxs5e7CPPP17A4eYA==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.24.1.tgz",
+      "integrity": "sha512-Tqoa05bu+t5s8CTZFaGpCH2ub3QeT9YDkXbPd3uQ4SfsLoh1/vv2GEYAioPoxCWJJNsenXlC88tRjwoHNts1oQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/scope-manager": "8.21.0",
-        "@typescript-eslint/types": "8.21.0",
-        "@typescript-eslint/typescript-estree": "8.21.0",
-        "@typescript-eslint/visitor-keys": "8.21.0",
+        "@typescript-eslint/scope-manager": "8.24.1",
+        "@typescript-eslint/types": "8.24.1",
+        "@typescript-eslint/typescript-estree": "8.24.1",
+        "@typescript-eslint/visitor-keys": "8.24.1",
         "debug": "^4.3.4"
       },
       "engines": {
@@ -2594,14 +1869,13 @@
       }
     },
     "node_modules/@typescript-eslint/scope-manager": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.21.0.tgz",
-      "integrity": "sha512-G3IBKz0/0IPfdeGRMbp+4rbjfSSdnGkXsM/pFZA8zM9t9klXDnB/YnKOBQ0GoPmoROa4bCq2NeHgJa5ydsQ4mA==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.24.1.tgz",
+      "integrity": "sha512-OdQr6BNBzwRjNEXMQyaGyZzgg7wzjYKfX2ZBV3E04hUCBDv3GQCHiz9RpqdUIiVrMgJGkXm3tcEh4vFSHreS2Q==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.21.0",
-        "@typescript-eslint/visitor-keys": "8.21.0"
+        "@typescript-eslint/types": "8.24.1",
+        "@typescript-eslint/visitor-keys": "8.24.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2612,16 +1886,15 @@
       }
     },
     "node_modules/@typescript-eslint/type-utils": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.21.0.tgz",
-      "integrity": "sha512-95OsL6J2BtzoBxHicoXHxgk3z+9P3BEcQTpBKriqiYzLKnM2DeSqs+sndMKdamU8FosiadQFT3D+BSL9EKnAJQ==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.24.1.tgz",
+      "integrity": "sha512-/Do9fmNgCsQ+K4rCz0STI7lYB4phTtEXqqCAs3gZW0pnK7lWNkvWd5iW545GSmApm4AzmQXmSqXPO565B4WVrw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/typescript-estree": "8.21.0",
-        "@typescript-eslint/utils": "8.21.0",
+        "@typescript-eslint/typescript-estree": "8.24.1",
+        "@typescript-eslint/utils": "8.24.1",
         "debug": "^4.3.4",
-        "ts-api-utils": "^2.0.0"
+        "ts-api-utils": "^2.0.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2636,11 +1909,10 @@
       }
     },
     "node_modules/@typescript-eslint/types": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.21.0.tgz",
-      "integrity": "sha512-PAL6LUuQwotLW2a8VsySDBwYMm129vFm4tMVlylzdoTybTHaAi0oBp7Ac6LhSrHHOdLM3efH+nAR6hAWoMF89A==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.24.1.tgz",
+      "integrity": "sha512-9kqJ+2DkUXiuhoiYIUvIYjGcwle8pcPpdlfkemGvTObzgmYfJ5d0Qm6jwb4NBXP9W1I5tss0VIAnWFumz3mC5A==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -2650,20 +1922,19 @@
       }
     },
     "node_modules/@typescript-eslint/typescript-estree": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.21.0.tgz",
-      "integrity": "sha512-x+aeKh/AjAArSauz0GiQZsjT8ciadNMHdkUSwBB9Z6PrKc/4knM4g3UfHml6oDJmKC88a6//cdxnO/+P2LkMcg==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.24.1.tgz",
+      "integrity": "sha512-UPyy4MJ/0RE648DSKQe9g0VDSehPINiejjA6ElqnFaFIhI6ZEiZAkUI0D5MCk0bQcTf/LVqZStvQ6K4lPn/BRg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.21.0",
-        "@typescript-eslint/visitor-keys": "8.21.0",
+        "@typescript-eslint/types": "8.24.1",
+        "@typescript-eslint/visitor-keys": "8.24.1",
         "debug": "^4.3.4",
         "fast-glob": "^3.3.2",
         "is-glob": "^4.0.3",
         "minimatch": "^9.0.4",
         "semver": "^7.6.0",
-        "ts-api-utils": "^2.0.0"
+        "ts-api-utils": "^2.0.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2676,22 +1947,11 @@
         "typescript": ">=4.8.4 <5.8.0"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
       "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -2702,17 +1962,25 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dev": true,
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/@typescript-eslint/utils": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.21.0.tgz",
-      "integrity": "sha512-xcXBfcq0Kaxgj7dwejMbFyq7IOHgpNMtVuDveK7w3ZGwG9owKzhALVwKpTF2yrZmEwl9SWdetf3fxNzJQaVuxw==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.24.1.tgz",
+      "integrity": "sha512-OOcg3PMMQx9EXspId5iktsI3eMaXVwlhC8BvNnX6B5w9a4dVgpkQZuU8Hy67TolKcl+iFWq0XX+jbDGN4xWxjQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
-        "@typescript-eslint/scope-manager": "8.21.0",
-        "@typescript-eslint/types": "8.21.0",
-        "@typescript-eslint/typescript-estree": "8.21.0"
+        "@typescript-eslint/scope-manager": "8.24.1",
+        "@typescript-eslint/types": "8.24.1",
+        "@typescript-eslint/typescript-estree": "8.24.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2727,13 +1995,12 @@
       }
     },
     "node_modules/@typescript-eslint/visitor-keys": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.21.0.tgz",
-      "integrity": "sha512-BkLMNpdV6prozk8LlyK/SOoWLmUFi+ZD+pcqti9ILCbVvHGk1ui1g4jJOc2WDLaeExz2qWwojxlPce5PljcT3w==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.24.1.tgz",
+      "integrity": "sha512-EwVHlp5l+2vp8CoqJm9KikPZgi3gbdZAtabKT9KPShGeOcJhsv4Zdo3oc8T8I0uKEmYoU4ItyxbptjF08enaxg==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/types": "8.21.0",
+        "@typescript-eslint/types": "8.24.1",
         "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
@@ -2745,13 +2012,12 @@
       }
     },
     "node_modules/@vitejs/plugin-react-swc": {
-      "version": "3.7.2",
-      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react-swc/-/plugin-react-swc-3.7.2.tgz",
-      "integrity": "sha512-y0byko2b2tSVVf5Gpng1eEhX1OvPC7x8yns1Fx8jDzlJp4LS6CMkCPfLw47cjyoMrshQDoQw4qcgjsU9VvlCew==",
+      "version": "3.8.0",
+      "resolved": "https://registry.npmjs.org/@vitejs/plugin-react-swc/-/plugin-react-swc-3.8.0.tgz",
+      "integrity": "sha512-T4sHPvS+DIqDP51ifPqa9XIRAz/kIvIi8oXcnOZZgHmMotgmmdxe/DD5tMFlt5nuIRzT0/QuiwmKlH0503Aapw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@swc/core": "^1.7.26"
+        "@swc/core": "^1.10.15"
       },
       "peerDependencies": {
         "vite": "^4 || ^5 || ^6"
@@ -2762,7 +2028,6 @@
       "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
       "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
       "dev": true,
-      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -2775,7 +2040,6 @@
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
-      "license": "MIT",
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
@@ -2785,7 +2049,6 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -2801,7 +2064,6 @@
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
       "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -2813,7 +2075,6 @@
       "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"
       },
@@ -2827,14 +2088,12 @@
     "node_modules/any-promise": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
-      "license": "MIT"
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
     },
     "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"
@@ -2846,21 +2105,18 @@
     "node_modules/arg": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
-      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
-      "license": "MIT"
+      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="
     },
     "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==",
-      "dev": true,
-      "license": "Python-2.0"
+      "dev": true
     },
     "node_modules/aria-hidden": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.4.tgz",
       "integrity": "sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==",
-      "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -2887,7 +2143,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "browserslist": "^4.23.3",
         "caniuse-lite": "^1.0.30001646",
@@ -2909,14 +2164,12 @@
     "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"
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
     "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"
       },
@@ -2929,7 +2182,6 @@
       "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
       "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -2939,7 +2191,6 @@
       "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"
       },
@@ -2966,7 +2217,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "caniuse-lite": "^1.0.30001688",
         "electron-to-chromium": "^1.5.73",
@@ -2985,7 +2235,6 @@
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -2994,15 +2243,14 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
       "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
-      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001695",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001695.tgz",
-      "integrity": "sha512-vHyLade6wTgI2u1ec3WQBxv+2BrTERV28UXQu9LO6lZ9pYeMk34vjXFLOxo1A4UBA8XTL4njRQZdno/yYaSmWw==",
+      "version": "1.0.30001703",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001703.tgz",
+      "integrity": "sha512-kRlAGTRWgPsOj7oARC9m1okJEXdL/8fekFVcxA8Hl7GH4r/sN4OJn/i6Flde373T50KS7Y37oFbMwlE8+F42kQ==",
       "dev": true,
       "funding": [
         {
@@ -3017,15 +2265,13 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ],
-      "license": "CC-BY-4.0"
+      ]
     },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -3041,7 +2287,6 @@
       "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",
@@ -3065,7 +2310,6 @@
       "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"
       },
@@ -3077,7 +2321,6 @@
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/class-variance-authority/-/class-variance-authority-0.7.1.tgz",
       "integrity": "sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==",
-      "license": "Apache-2.0",
       "dependencies": {
         "clsx": "^2.1.1"
       },
@@ -3089,16 +2332,29 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
       "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
     },
+    "node_modules/cmdk": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/cmdk/-/cmdk-1.1.1.tgz",
+      "integrity": "sha512-Vsv7kFaXm+ptHDMZ7izaRsP70GgrW9NBNGswt9OZaVBLlE0SNpDq8eu/VGXyF9r7M0azK3Wy7OlYXsuyYLFzHg==",
+      "dependencies": {
+        "@radix-ui/react-compose-refs": "^1.1.1",
+        "@radix-ui/react-dialog": "^1.1.6",
+        "@radix-ui/react-id": "^1.1.0",
+        "@radix-ui/react-primitive": "^2.0.2"
+      },
+      "peerDependencies": {
+        "react": "^18 || ^19 || ^19.0.0-rc",
+        "react-dom": "^18 || ^19 || ^19.0.0-rc"
+      }
+    },
     "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"
       },
@@ -3109,14 +2365,12 @@
     "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"
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
     },
     "node_modules/commander": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
       "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
-      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -3125,29 +2379,26 @@
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/cookie": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
       "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==",
-      "license": "MIT",
       "engines": {
         "node": ">=18"
       }
     },
     "node_modules/country-flag-icons": {
-      "version": "1.5.14",
-      "resolved": "https://registry.npmjs.org/country-flag-icons/-/country-flag-icons-1.5.14.tgz",
-      "integrity": "sha512-GAFsVzHDu3bdAhbQ1LwBRqk/Ad8+ZzS5zU49P+lRla0KGy/V1V8ywNa1SxBOAmI/lyEOT9dfH3Q++q1lqJlvBA==",
-      "license": "MIT"
+      "version": "1.5.18",
+      "resolved": "https://registry.npmjs.org/country-flag-icons/-/country-flag-icons-1.5.18.tgz",
+      "integrity": "sha512-z+Uzesi8u8IdkViqqbzzbkf3+a7WJpcET5B7sPwTg7GXqPYpVEgNlZ/FC3l8KO4mEf+mNkmzKLppKTN4PlCJEQ=="
     },
     "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",
+      "dev": true,
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -3161,7 +2412,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
       "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "license": "MIT",
       "bin": {
         "cssesc": "bin/cssesc"
       },
@@ -3172,14 +2422,12 @@
     "node_modules/csstype": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-      "license": "MIT"
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
     },
     "node_modules/d3-array": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
       "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
-      "license": "ISC",
       "dependencies": {
         "internmap": "1 - 2"
       },
@@ -3191,7 +2439,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
       "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -3200,7 +2447,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
       "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=12"
       }
@@ -3209,7 +2455,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
       "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -3218,7 +2463,6 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
       "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
-      "license": "ISC",
       "dependencies": {
         "d3-array": "2.5.0 - 3"
       },
@@ -3230,7 +2474,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
       "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
-      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3"
       },
@@ -3242,7 +2485,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
       "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -3251,7 +2493,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
       "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
-      "license": "ISC",
       "dependencies": {
         "d3-array": "2.10.0 - 3",
         "d3-format": "1 - 3",
@@ -3267,7 +2508,6 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
       "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
-      "license": "ISC",
       "dependencies": {
         "d3-path": "^3.1.0"
       },
@@ -3279,7 +2519,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
       "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
-      "license": "ISC",
       "dependencies": {
         "d3-array": "2 - 3"
       },
@@ -3291,7 +2530,6 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
       "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
-      "license": "ISC",
       "dependencies": {
         "d3-time": "1 - 3"
       },
@@ -3303,7 +2541,6 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
       "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -3311,14 +2548,12 @@
     "node_modules/dayjs": {
       "version": "1.11.13",
       "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
-      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
-      "license": "MIT"
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
     },
     "node_modules/debug": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
-      "license": "MIT",
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
       "dependencies": {
         "ms": "^2.1.3"
       },
@@ -3334,45 +2569,38 @@
     "node_modules/decimal.js-light": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/decimal.js-light/-/decimal.js-light-2.5.1.tgz",
-      "integrity": "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==",
-      "license": "MIT"
+      "integrity": "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg=="
     },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/detect-node-es": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
-      "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==",
-      "license": "MIT"
+      "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ=="
     },
     "node_modules/diacritics": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/diacritics/-/diacritics-1.3.0.tgz",
-      "integrity": "sha512-wlwEkqcsaxvPJML+rDh/2iS824jbREk6DUMUKkEaSlxdYHeS43cClJtsWglvw2RfeXGm6ohKDqsXteJ5sP5enA==",
-      "license": "MIT"
+      "integrity": "sha512-wlwEkqcsaxvPJML+rDh/2iS824jbREk6DUMUKkEaSlxdYHeS43cClJtsWglvw2RfeXGm6ohKDqsXteJ5sP5enA=="
     },
     "node_modules/didyoumean": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
-      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
-      "license": "Apache-2.0"
+      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="
     },
     "node_modules/dlv": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
-      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
-      "license": "MIT"
+      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
     },
     "node_modules/dom-helpers": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
       "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
-      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.8.7",
         "csstype": "^3.0.2"
@@ -3381,21 +2609,18 @@
     "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"
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.84",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.84.tgz",
-      "integrity": "sha512-I+DQ8xgafao9Ha6y0qjHHvpZ9OfyA1qKlkHkjywxzniORU2awxyz7f/iVJcULmrF2yrM3nHQf+iDjJtbbexd/g==",
-      "dev": true,
-      "license": "ISC"
+      "version": "1.5.114",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.114.tgz",
+      "integrity": "sha512-DFptFef3iktoKlFQK/afbo274/XNWD00Am0xa7M8FZUepHlHT8PEuiNBoRfFHbH1okqN58AlhbJ4QTkcnXorjA==",
+      "dev": true
     },
     "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"
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
     },
     "node_modules/esbuild": {
       "version": "0.24.2",
@@ -3403,7 +2628,6 @@
       "integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==",
       "dev": true,
       "hasInstallScript": true,
-      "license": "MIT",
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -3443,7 +2667,6 @@
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
       "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -3453,7 +2676,6 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -3462,18 +2684,17 @@
       }
     },
     "node_modules/eslint": {
-      "version": "9.18.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.18.0.tgz",
-      "integrity": "sha512-+waTfRWQlSbpt3KWE+CjrPPYnbq9kfZIYUqapc0uBXyjTp8aYXZDsUH16m39Ryq3NjAVP4tjuF7KaukeqoCoaA==",
+      "version": "9.20.1",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.20.1.tgz",
+      "integrity": "sha512-m1mM33o6dBUjxl2qb6wv6nGNwCAsns1eKtaQ4l/NPHeTvhiUPbtdfMyktxN4B3fgHIgsYh1VT3V9txblpQHq+g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
         "@eslint/config-array": "^0.19.0",
-        "@eslint/core": "^0.10.0",
+        "@eslint/core": "^0.11.0",
         "@eslint/eslintrc": "^3.2.0",
-        "@eslint/js": "9.18.0",
+        "@eslint/js": "9.20.0",
         "@eslint/plugin-kit": "^0.2.5",
         "@humanfs/node": "^0.16.6",
         "@humanwhocodes/module-importer": "^1.0.1",
@@ -3526,7 +2747,6 @@
       "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.1.0.tgz",
       "integrity": "sha512-mpJRtPgHN2tNAvZ35AMfqeB3Xqeo273QxrHJsbBEPWODRM4r0yB6jfoROqKEYrOn27UtRPpcpHc2UqyBSuUNTw==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -3535,21 +2755,19 @@
       }
     },
     "node_modules/eslint-plugin-react-refresh": {
-      "version": "0.4.18",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.18.tgz",
-      "integrity": "sha512-IRGEoFn3OKalm3hjfolEWGqoF/jPqeEYFp+C8B0WMzwGwBMvlRDQd06kghDhF0C61uJ6WfSDhEZE/sAQjduKgw==",
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.19.tgz",
+      "integrity": "sha512-eyy8pcr/YxSYjBoqIFSrlbn9i/xvxUFa8CjzAYo9cFjgGXqq1hyjihcpZvxRLalpaWmueWR81xn7vuKmAFijDQ==",
       "dev": true,
-      "license": "MIT",
       "peerDependencies": {
         "eslint": ">=8.40"
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
-      "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
+      "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
@@ -3566,7 +2784,6 @@
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
       "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
       "dev": true,
-      "license": "Apache-2.0",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -3574,12 +2791,16 @@
         "url": "https://opencollective.com/eslint"
       }
     },
+    "node_modules/esm-env": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.2.2.tgz",
+      "integrity": "sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA=="
+    },
     "node_modules/espree": {
       "version": "10.3.0",
       "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
       "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "acorn": "^8.14.0",
         "acorn-jsx": "^5.3.2",
@@ -3597,7 +2818,6 @@
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
       "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
-      "license": "BSD-3-Clause",
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -3610,7 +2830,6 @@
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -3623,7 +2842,6 @@
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
@@ -3633,7 +2851,6 @@
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3641,36 +2858,32 @@
     "node_modules/eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
-      "license": "MIT"
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/fast-equals": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-5.2.2.tgz",
-      "integrity": "sha512-V7/RktU11J3I36Nwq2JnZEM7tNm17eBJz+u25qdxBZeCKiX6BkVSZQjwWIr+IobgnZy+ag73tTZgZi7tr0LrBw==",
-      "license": "MIT",
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-5.0.1.tgz",
+      "integrity": "sha512-WF1Wi8PwwSY7/6Kx0vKXtw8RwuSGoM1bvDaJbu7MxDlR1vovZjIAKrnzyrThgAjm6JDTu0fVgWXDlMGspodfoQ==",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/fast-glob": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
-      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
-      "license": "MIT",
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
+      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
         "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.8"
+        "micromatch": "^4.0.4"
       },
       "engines": {
         "node": ">=8.6.0"
@@ -3680,7 +2893,6 @@
       "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"
       },
@@ -3692,21 +2904,18 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/fastq": {
-      "version": "1.18.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.18.0.tgz",
-      "integrity": "sha512-QKHXPW0hD8g4UET03SdOdunzSouc9N4AuHdsX8XNcTsuz+yYFILVNIX4l9yHABMhiEI9Db0JTTIpu0wB+Y1QQw==",
-      "license": "ISC",
+      "version": "1.17.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
+      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -3716,7 +2925,6 @@
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
       "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "flat-cache": "^4.0.0"
       },
@@ -3728,7 +2936,6 @@
       "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"
       },
@@ -3741,7 +2948,6 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
       "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
@@ -3758,7 +2964,6 @@
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
       "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "flatted": "^3.2.9",
         "keyv": "^4.5.4"
@@ -3768,17 +2973,15 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.2.tgz",
-      "integrity": "sha512-AiwGJM8YcNOaobumgtng+6NHuOqC3A7MixFeDafM3X9cIUM+xUXoS5Vfgf+OihAYe20fxqNM9yPBXJzRtZ/4eA==",
-      "dev": true,
-      "license": "ISC"
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
+      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
+      "dev": true
     },
     "node_modules/foreground-child": {
       "version": "3.3.0",
       "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
       "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
-      "license": "ISC",
       "dependencies": {
         "cross-spawn": "^7.0.0",
         "signal-exit": "^4.0.1"
@@ -3790,12 +2993,24 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/foreground-child/node_modules/cross-spawn": {
+      "version": "7.0.3",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
+      "engines": {
+        "node": ">= 8"
+      }
+    },
     "node_modules/fraction.js": {
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
       "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": "*"
       },
@@ -3805,12 +3020,11 @@
       }
     },
     "node_modules/framer-motion": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.0.1.tgz",
-      "integrity": "sha512-u6p0Qc4cY/AEQAtrC7qiYlXla39qnWoI4JXY7OCNBDXwJ5yRBD8HU+RhaOqqziw2m/b0BDh32f44W94+wXonMQ==",
-      "license": "MIT",
+      "version": "12.4.5",
+      "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.4.5.tgz",
+      "integrity": "sha512-9+8wglyIJFeUpVg4U8Ohvoo5x7zmvRqawWXhEUThcYdwL/5A1/OkLvQo68Zz5taUE11HKG/Ex+LPaN2+fMkRdA==",
       "dependencies": {
-        "motion-dom": "^12.0.0",
+        "motion-dom": "^12.4.5",
         "motion-utils": "^12.0.0",
         "tslib": "^2.4.0"
       },
@@ -3831,25 +3045,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/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -3858,7 +3057,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz",
       "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==",
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -3867,7 +3065,6 @@
       "version": "10.4.5",
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
       "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
-      "license": "ISC",
       "dependencies": {
         "foreground-child": "^3.1.0",
         "jackspeak": "^3.1.2",
@@ -3887,7 +3084,6 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -3895,20 +3091,10 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/glob/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "license": "MIT",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
     "node_modules/glob/node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
       "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -3919,12 +3105,19 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/glob/node_modules/minimatch/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/globals": {
-      "version": "15.14.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-15.14.0.tgz",
-      "integrity": "sha512-OkToC372DtlQeje9/zHIo5CT8lRP/FUgEOKBEhU4e0abL7J7CD24fD9ohiLN5hagG/kWCYj4K5oaxxtj2Z0Dig==",
+      "version": "15.15.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz",
+      "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -3936,15 +3129,13 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
       "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -3953,7 +3144,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
       "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -3965,16 +3155,14 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
       "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
-      "license": "MIT",
       "dependencies": {
         "void-elements": "3.1.0"
       }
     },
     "node_modules/i18n-iso-countries": {
-      "version": "7.13.0",
-      "resolved": "https://registry.npmjs.org/i18n-iso-countries/-/i18n-iso-countries-7.13.0.tgz",
-      "integrity": "sha512-pVh4CjdgAHZswI98hzG+1BItQlsQfR+yGDsjDISoWIV/jHDAvCmSyZ5vj2YWwAjfVZ8/BhBDqWcFvuGOyHe4vg==",
-      "license": "MIT",
+      "version": "7.14.0",
+      "resolved": "https://registry.npmjs.org/i18n-iso-countries/-/i18n-iso-countries-7.14.0.tgz",
+      "integrity": "sha512-nXHJZYtNrfsi1UQbyRqm3Gou431elgLjKl//CYlnBGt5aTWdRPH1PiS2T/p/n8Q8LnqYqzQJik3Q7mkwvLokeg==",
       "dependencies": {
         "diacritics": "1.3.0"
       },
@@ -3983,9 +3171,9 @@
       }
     },
     "node_modules/i18next": {
-      "version": "24.2.1",
-      "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.1.tgz",
-      "integrity": "sha512-Q2wC1TjWcSikn1VAJg13UGIjc+okpFxQTxjVAymOnSA3RpttBQNMPf2ovcgoFVsV4QNxTfNZMAxorXZXsk4fBA==",
+      "version": "24.2.2",
+      "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.2.tgz",
+      "integrity": "sha512-NE6i86lBCKRYZa5TaUDkU5S4HFgLIEJRLr3Whf2psgaxBleQ2LC1YW1Vc+SCgkAW7VEzndT6al6+CzegSUHcTQ==",
       "funding": [
         {
           "type": "individual",
@@ -4000,7 +3188,6 @@
           "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.23.2"
       },
@@ -4018,7 +3205,6 @@
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
       "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
@@ -4028,7 +3214,6 @@
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
       "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -4045,7 +3230,6 @@
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.8.19"
       }
@@ -4054,7 +3238,6 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
       "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
-      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -4063,7 +3246,6 @@
       "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"
       },
@@ -4072,10 +3254,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
-      "license": "MIT",
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
+      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
       "dependencies": {
         "hasown": "^2.0.2"
       },
@@ -4090,7 +3271,6 @@
       "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"
       }
@@ -4099,7 +3279,6 @@
       "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"
       }
@@ -4108,7 +3287,6 @@
       "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"
       },
@@ -4120,7 +3298,6 @@
       "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"
       }
@@ -4128,14 +3305,12 @@
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
-      "license": "ISC"
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
     },
     "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"
       },
@@ -4149,14 +3324,12 @@
     "node_modules/javascript-natural-sort": {
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
-      "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==",
-      "license": "MIT"
+      "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw=="
     },
     "node_modules/jiti": {
-      "version": "1.21.7",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
-      "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
-      "license": "MIT",
+      "version": "1.21.6",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz",
+      "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==",
       "bin": {
         "jiti": "bin/jiti.js"
       }
@@ -4164,15 +3337,13 @@
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
-      "license": "MIT"
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
       "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -4184,7 +3355,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
       "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
-      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
       },
@@ -4196,29 +3366,25 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
       "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/keyv": {
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
       "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -4228,7 +3394,6 @@
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -4241,7 +3406,6 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
       "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
-      "license": "MIT",
       "engines": {
         "node": ">=14"
       },
@@ -4252,15 +3416,13 @@
     "node_modules/lines-and-columns": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
-      "license": "MIT"
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
     },
     "node_modules/locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
       "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-locate": "^5.0.0"
       },
@@ -4274,21 +3436,18 @@
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "license": "MIT"
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "license": "MIT",
       "dependencies": {
         "js-tokens": "^3.0.0 || ^4.0.0"
       },
@@ -4299,14 +3458,12 @@
     "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"
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
     },
     "node_modules/lucide-react": {
       "version": "0.460.0",
       "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.460.0.tgz",
       "integrity": "sha512-BVtq/DykVeIvRTJvRAgCsOwaGL8Un3Bxh8MbDxMhEWlZay3T4IpEKDEpwt5KZ0KJMHzgm6jrltxlT5eXOWXDHg==",
-      "license": "ISC",
       "peerDependencies": {
         "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc"
       }
@@ -4315,7 +3472,6 @@
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz",
       "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==",
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       }
@@ -4324,7 +3480,6 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -4333,7 +3488,6 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
       "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-      "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
         "picomatch": "^2.3.1"
@@ -4347,7 +3501,6 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
-      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -4359,37 +3512,32 @@
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
       "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-      "license": "ISC",
       "engines": {
         "node": ">=16 || 14 >=14.17"
       }
     },
     "node_modules/motion-dom": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.0.0.tgz",
-      "integrity": "sha512-CvYd15OeIR6kHgMdonCc1ihsaUG4MYh/wrkz8gZ3hBX/uamyZCXN9S9qJoYF03GqfTt7thTV/dxnHYX4+55vDg==",
-      "license": "MIT",
+      "version": "12.5.0",
+      "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.5.0.tgz",
+      "integrity": "sha512-uH2PETDh7m+Hjd1UQQ56yHqwn83SAwNjimNPE/kC+Kds0t4Yh7+29rfo5wezVFpPOv57U4IuWved5d1x0kNhbQ==",
       "dependencies": {
-        "motion-utils": "^12.0.0"
+        "motion-utils": "^12.5.0"
       }
     },
     "node_modules/motion-utils": {
-      "version": "12.0.0",
-      "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.0.0.tgz",
-      "integrity": "sha512-MNFiBKbbqnmvOjkPyOKgHUp3Q6oiokLkI1bEwm5QA28cxMZrv0CbbBGDNmhF6DIXsi1pCQBSs0dX8xjeER1tmA==",
-      "license": "MIT"
+      "version": "12.5.0",
+      "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.5.0.tgz",
+      "integrity": "sha512-+hFFzvimn0sBMP9iPxBa9OtRX35ZQ3py0UHnb8U29VD+d8lQ8zH3dTygJWqK7av2v6yhg7scj9iZuvTS0f4+SA=="
     },
     "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"
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
     "node_modules/mz": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
       "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
-      "license": "MIT",
       "dependencies": {
         "any-promise": "^1.0.0",
         "object-assign": "^4.0.1",
@@ -4406,7 +3554,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -4418,21 +3565,18 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/node-releases": {
       "version": "2.0.19",
       "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
       "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "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"
       }
@@ -4442,16 +3586,22 @@
       "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
       "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
+    "node_modules/number-flow": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/number-flow/-/number-flow-0.5.3.tgz",
+      "integrity": "sha512-iLKyssImNWQmJ41rza9K7P5lHRZTyishi/9FarWPLQHYY2Ydtl6eiXINEjZ1fa8dHeY0O7+YOD+Py3ZsJddYkg==",
+      "dependencies": {
+        "esm-env": "^1.1.4"
+      }
+    },
     "node_modules/object-assign": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4460,7 +3610,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
       "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
-      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -4470,7 +3619,6 @@
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
       "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
@@ -4488,7 +3636,6 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -4504,7 +3651,6 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
       "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "p-limit": "^3.0.2"
       },
@@ -4518,15 +3664,13 @@
     "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"
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="
     },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -4539,7 +3683,6 @@
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -4548,7 +3691,6 @@
       "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"
       }
@@ -4556,14 +3698,12 @@
     "node_modules/path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
-      "license": "MIT"
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
     },
     "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"
@@ -4578,14 +3718,12 @@
     "node_modules/picocolors": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
-      "license": "ISC"
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -4597,7 +3735,6 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4606,15 +3743,14 @@
       "version": "4.0.6",
       "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
       "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
-      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/postcss": {
-      "version": "8.5.1",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.1.tgz",
-      "integrity": "sha512-6oz2beyjc5VMn/KV1pPw8fliQkhBXrVn1Z3TVyqZxU8kZpzEKhBdmCFqI6ZbmGtamQvQGuU1sgPTk8ZrXDD7jQ==",
+      "version": "8.5.3",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz",
+      "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==",
       "funding": [
         {
           "type": "opencollective",
@@ -4629,7 +3765,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "nanoid": "^3.3.8",
         "picocolors": "^1.1.1",
@@ -4643,7 +3778,6 @@
       "version": "15.1.0",
       "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
       "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
-      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.0.0",
         "read-cache": "^1.0.0",
@@ -4660,7 +3794,6 @@
       "version": "4.0.1",
       "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
       "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
-      "license": "MIT",
       "dependencies": {
         "camelcase-css": "^2.0.1"
       },
@@ -4689,7 +3822,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "lilconfig": "^3.0.0",
         "yaml": "^2.3.4"
@@ -4710,6 +3842,17 @@
         }
       }
     },
+    "node_modules/postcss-load-config/node_modules/lilconfig": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz",
+      "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antonk52"
+      }
+    },
     "node_modules/postcss-nested": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
@@ -4724,7 +3867,6 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "postcss-selector-parser": "^6.1.1"
       },
@@ -4739,7 +3881,6 @@
       "version": "6.1.2",
       "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
       "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
-      "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -4751,15 +3892,13 @@
     "node_modules/postcss-value-parser": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
-      "license": "MIT"
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
     },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">= 0.8.0"
       }
@@ -4768,7 +3907,6 @@
       "version": "3.4.2",
       "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz",
       "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==",
-      "license": "MIT",
       "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
@@ -4781,10 +3919,9 @@
       }
     },
     "node_modules/prettier-plugin-tailwindcss": {
-      "version": "0.6.10",
-      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.10.tgz",
-      "integrity": "sha512-ndj2WLDaMzACnr1gAYZiZZLs5ZdOeBYgOsbBmHj3nvW/6q8h8PymsXiEnKvj/9qgCCAoHyvLOisoQdIcsDvIgw==",
-      "license": "MIT",
+      "version": "0.6.11",
+      "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.11.tgz",
+      "integrity": "sha512-YxaYSIvZPAqhrrEpRtonnrXdghZg1irNg4qrjboCXrpybLWVs55cW2N3juhspVJiO0JBvYJT8SYsJpc8OQSnsA==",
       "engines": {
         "node": ">=14.21.3"
       },
@@ -4862,7 +3999,6 @@
       "version": "15.8.1",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
       "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
-      "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
@@ -4872,15 +4008,13 @@
     "node_modules/prop-types/node_modules/react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "license": "MIT"
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
     "node_modules/punycode": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -4902,14 +4036,12 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ],
-      "license": "MIT"
+      ]
     },
     "node_modules/react": {
       "version": "19.0.0",
       "resolved": "https://registry.npmjs.org/react/-/react-19.0.0.tgz",
       "integrity": "sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==",
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4918,7 +4050,6 @@
       "version": "19.0.0",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0.tgz",
       "integrity": "sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==",
-      "license": "MIT",
       "dependencies": {
         "scheduler": "^0.25.0"
       },
@@ -4927,10 +4058,9 @@
       }
     },
     "node_modules/react-i18next": {
-      "version": "15.4.0",
-      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.4.0.tgz",
-      "integrity": "sha512-Py6UkX3zV08RTvL6ZANRoBh9sL/ne6rQq79XlkHEdd82cZr2H9usbWpUNVadJntIZP2pu3M2rL1CN+5rQYfYFw==",
-      "license": "MIT",
+      "version": "15.4.1",
+      "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.4.1.tgz",
+      "integrity": "sha512-ahGab+IaSgZmNPYXdV1n+OYky95TGpFwnKRflX/16dY04DsYYKHtVLjeny7sBSCREEcoMbAgSkFiGLF5g5Oofw==",
       "dependencies": {
         "@babel/runtime": "^7.25.0",
         "html-parse-stringify": "^3.0.1"
@@ -4951,20 +4081,18 @@
     "node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
-      "license": "MIT"
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
     },
     "node_modules/react-remove-scroll": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.6.2.tgz",
-      "integrity": "sha512-KmONPx5fnlXYJQqC62Q+lwIeAk64ws/cUw6omIumRzMRPqgnYqhSSti99nbj0Ry13bv7dF+BKn7NB+OqkdZGTw==",
-      "license": "MIT",
+      "version": "2.6.3",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.6.3.tgz",
+      "integrity": "sha512-pnAi91oOk8g8ABQKGF5/M9qxmmOPxaAnopyTHYfqYEwJhyFrbbBtHuSgtKEoH0jpcxx5o3hXqH1mNd9/Oi+8iQ==",
       "dependencies": {
         "react-remove-scroll-bar": "^2.3.7",
-        "react-style-singleton": "^2.2.1",
+        "react-style-singleton": "^2.2.3",
         "tslib": "^2.1.0",
         "use-callback-ref": "^1.3.3",
-        "use-sidecar": "^1.1.2"
+        "use-sidecar": "^1.1.3"
       },
       "engines": {
         "node": ">=10"
@@ -4983,7 +4111,6 @@
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.8.tgz",
       "integrity": "sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==",
-      "license": "MIT",
       "dependencies": {
         "react-style-singleton": "^2.2.2",
         "tslib": "^2.0.0"
@@ -5002,10 +4129,9 @@
       }
     },
     "node_modules/react-router": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.1.3.tgz",
-      "integrity": "sha512-EezYymLY6Guk/zLQ2vRA8WvdUhWFEj5fcE3RfWihhxXBW7+cd1LsIiA3lmx+KCmneAGQuyBv820o44L2+TtkSA==",
-      "license": "MIT",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.2.0.tgz",
+      "integrity": "sha512-fXyqzPgCPZbqhrk7k3hPcCpYIlQ2ugIXDboHUzhJISFVy2DEPsmHgN588MyGmkIOv3jDgNfUE3kJi83L28s/LQ==",
       "dependencies": {
         "@types/cookie": "^0.6.0",
         "cookie": "^1.0.1",
@@ -5026,12 +4152,11 @@
       }
     },
     "node_modules/react-router-dom": {
-      "version": "7.1.3",
-      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.1.3.tgz",
-      "integrity": "sha512-qQGTE+77hleBzv9SIUIkGRvuFBQGagW+TQKy53UTZAO/3+YFNBYvRsNIZ1GT17yHbc63FylMOdS+m3oUriF1GA==",
-      "license": "MIT",
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.2.0.tgz",
+      "integrity": "sha512-cU7lTxETGtQRQbafJubvZKHEn5izNABxZhBY0Jlzdv0gqQhCPQt2J8aN5ZPjS6mQOXn5NnirWNh+FpE8TTYN0Q==",
       "dependencies": {
-        "react-router": "7.1.3"
+        "react-router": "7.2.0"
       },
       "engines": {
         "node": ">=20.0.0"
@@ -5045,7 +4170,6 @@
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-4.0.4.tgz",
       "integrity": "sha512-gnGKTpYwqL0Iii09gHobNolvX4Kiq4PKx6eWBCYYix+8cdw+cGo3do906l1NBPKkSWx1DghC1dlWG9L2uGd61Q==",
-      "license": "MIT",
       "dependencies": {
         "fast-equals": "^5.0.1",
         "prop-types": "^15.8.1",
@@ -5060,7 +4184,6 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.3.tgz",
       "integrity": "sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==",
-      "license": "MIT",
       "dependencies": {
         "get-nonce": "^1.0.0",
         "tslib": "^2.0.0"
@@ -5082,7 +4205,6 @@
       "version": "4.4.5",
       "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
       "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
-      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/runtime": "^7.5.5",
         "dom-helpers": "^5.0.1",
@@ -5098,7 +4220,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
       "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
-      "license": "MIT",
       "dependencies": {
         "pify": "^2.3.0"
       }
@@ -5107,7 +4228,6 @@
       "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"
       },
@@ -5116,16 +4236,15 @@
       }
     },
     "node_modules/recharts": {
-      "version": "2.15.0",
-      "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.15.0.tgz",
-      "integrity": "sha512-cIvMxDfpAmqAmVgc4yb7pgm/O1tmmkl/CjrvXuW+62/+7jj/iF9Ykm+hb/UJt42TREHMyd3gb+pkgoa2MxgDIw==",
-      "license": "MIT",
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.15.1.tgz",
+      "integrity": "sha512-v8PUTUlyiDe56qUj82w/EDVuzEFXwEHp9/xOowGAZwfLjB9uAy3GllQVIYMWF6nU+qibx85WF75zD7AjqoT54Q==",
       "dependencies": {
         "clsx": "^2.0.0",
         "eventemitter3": "^4.0.1",
         "lodash": "^4.17.21",
         "react-is": "^18.3.1",
-        "react-smooth": "^4.0.0",
+        "react-smooth": "^4.0.4",
         "recharts-scale": "^0.4.4",
         "tiny-invariant": "^1.3.1",
         "victory-vendor": "^36.6.8"
@@ -5142,7 +4261,6 @@
       "version": "0.4.5",
       "resolved": "https://registry.npmjs.org/recharts-scale/-/recharts-scale-0.4.5.tgz",
       "integrity": "sha512-kivNFO+0OcUNu7jQquLXAxz1FIwZj8nrj+YkOKc5694NbjCvcT6aSZiIzNzd2Kul4o4rTto8QVR9lMNtxD4G1w==",
-      "license": "MIT",
       "dependencies": {
         "decimal.js-light": "^2.4.1"
       }
@@ -5150,25 +4268,20 @@
     "node_modules/regenerator-runtime": {
       "version": "0.14.1",
       "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw==",
-      "license": "MIT"
+      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
     },
     "node_modules/resolve": {
-      "version": "1.22.10",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.10.tgz",
-      "integrity": "sha512-NPRy+/ncIMeDlTAsuqwKIiferiawhefFJtkNSW0qZJEqMEb+qBt/77B/jGeeek+F0uOeN05CDa6HXbbIgtVX4w==",
-      "license": "MIT",
+      "version": "1.22.8",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
+      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
       "dependencies": {
-        "is-core-module": "^2.16.0",
+        "is-core-module": "^2.13.0",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
       "bin": {
         "resolve": "bin/resolve"
       },
-      "engines": {
-        "node": ">= 0.4"
-      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -5178,7 +4291,6 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
@@ -5187,18 +4299,16 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
       "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
-      "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
       }
     },
     "node_modules/rollup": {
-      "version": "4.31.0",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.31.0.tgz",
-      "integrity": "sha512-9cCE8P4rZLx9+PjoyqHLs31V9a9Vpvfo4qNcs6JCiGWYhw2gijSetFbH6SSy1whnkgcefnUwr8sad7tgqsGvnw==",
+      "version": "4.34.6",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.6.tgz",
+      "integrity": "sha512-wc2cBWqJgkU3Iz5oztRkQbfVkbxoz5EhnCGOrnJvnLnQ7O0WhQUYyv18qQI79O8L7DdHrrlJNeCHd4VGpnaXKQ==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "@types/estree": "1.0.6"
       },
@@ -5210,25 +4320,25 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.31.0",
-        "@rollup/rollup-android-arm64": "4.31.0",
-        "@rollup/rollup-darwin-arm64": "4.31.0",
-        "@rollup/rollup-darwin-x64": "4.31.0",
-        "@rollup/rollup-freebsd-arm64": "4.31.0",
-        "@rollup/rollup-freebsd-x64": "4.31.0",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.31.0",
-        "@rollup/rollup-linux-arm-musleabihf": "4.31.0",
-        "@rollup/rollup-linux-arm64-gnu": "4.31.0",
-        "@rollup/rollup-linux-arm64-musl": "4.31.0",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.31.0",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.31.0",
-        "@rollup/rollup-linux-riscv64-gnu": "4.31.0",
-        "@rollup/rollup-linux-s390x-gnu": "4.31.0",
-        "@rollup/rollup-linux-x64-gnu": "4.31.0",
-        "@rollup/rollup-linux-x64-musl": "4.31.0",
-        "@rollup/rollup-win32-arm64-msvc": "4.31.0",
-        "@rollup/rollup-win32-ia32-msvc": "4.31.0",
-        "@rollup/rollup-win32-x64-msvc": "4.31.0",
+        "@rollup/rollup-android-arm-eabi": "4.34.6",
+        "@rollup/rollup-android-arm64": "4.34.6",
+        "@rollup/rollup-darwin-arm64": "4.34.6",
+        "@rollup/rollup-darwin-x64": "4.34.6",
+        "@rollup/rollup-freebsd-arm64": "4.34.6",
+        "@rollup/rollup-freebsd-x64": "4.34.6",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.34.6",
+        "@rollup/rollup-linux-arm-musleabihf": "4.34.6",
+        "@rollup/rollup-linux-arm64-gnu": "4.34.6",
+        "@rollup/rollup-linux-arm64-musl": "4.34.6",
+        "@rollup/rollup-linux-loongarch64-gnu": "4.34.6",
+        "@rollup/rollup-linux-powerpc64le-gnu": "4.34.6",
+        "@rollup/rollup-linux-riscv64-gnu": "4.34.6",
+        "@rollup/rollup-linux-s390x-gnu": "4.34.6",
+        "@rollup/rollup-linux-x64-gnu": "4.34.6",
+        "@rollup/rollup-linux-x64-musl": "4.34.6",
+        "@rollup/rollup-win32-arm64-msvc": "4.34.6",
+        "@rollup/rollup-win32-ia32-msvc": "4.34.6",
+        "@rollup/rollup-win32-x64-msvc": "4.34.6",
         "fsevents": "~2.3.2"
       }
     },
@@ -5250,7 +4360,6 @@
           "url": "https://feross.org/support"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
@@ -5258,15 +4367,13 @@
     "node_modules/scheduler": {
       "version": "0.25.0",
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0.tgz",
-      "integrity": "sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==",
-      "license": "MIT"
+      "integrity": "sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA=="
     },
     "node_modules/semver": {
       "version": "7.6.3",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
       "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
       "dev": true,
-      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -5277,14 +4384,12 @@
     "node_modules/set-cookie-parser": {
       "version": "2.7.1",
       "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
-      "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==",
-      "license": "MIT"
+      "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ=="
     },
     "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"
       },
@@ -5296,7 +4401,6 @@
       "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"
       }
@@ -5305,7 +4409,6 @@
       "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"
       },
@@ -5314,10 +4417,9 @@
       }
     },
     "node_modules/sonner": {
-      "version": "1.7.2",
-      "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.7.2.tgz",
-      "integrity": "sha512-zMbseqjrOzQD1a93lxahm+qMGxWovdMxBlkTbbnZdNqVLt4j+amF9PQxUCL32WfztOFt9t9ADYkejAL3jF9iNA==",
-      "license": "MIT",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.7.4.tgz",
+      "integrity": "sha512-DIS8z4PfJRbIyfVFDVnK9rO3eYDtse4Omcm6bt0oEr5/jtLgysmjuBl1frJ9E/EQZrFmKx2A8m/s5s9CRXIzhw==",
       "peerDependencies": {
         "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc",
         "react-dom": "^18.0.0 || ^19.0.0 || ^19.0.0-rc"
@@ -5327,7 +4429,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
       "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
-      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5364,37 +4465,16 @@
         "node": ">=8"
       }
     },
-    "node_modules/string-width-cjs/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/string-width-cjs/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "license": "MIT"
     },
-    "node_modules/string-width-cjs/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/strip-ansi": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
-      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+    "node_modules/string-width/node_modules/strip-ansi": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
+      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
       "license": "MIT",
       "dependencies": {
         "ansi-regex": "^6.0.1"
@@ -5406,6 +4486,17 @@
         "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
+    "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==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/strip-ansi-cjs": {
       "name": "strip-ansi",
       "version": "6.0.1",
@@ -5428,12 +4519,19 @@
         "node": ">=8"
       }
     },
+    "node_modules/strip-ansi/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==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -5445,7 +4543,6 @@
       "version": "3.35.0",
       "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",
       "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==",
-      "license": "MIT",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.2",
         "commander": "^4.0.0",
@@ -5468,7 +4565,6 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -5480,7 +4576,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
-      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -5492,7 +4587,6 @@
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz",
       "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==",
-      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/dcastil"
@@ -5502,7 +4596,6 @@
       "version": "3.4.17",
       "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.17.tgz",
       "integrity": "sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==",
-      "license": "MIT",
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
         "arg": "^5.0.2",
@@ -5539,16 +4632,58 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/tailwindcss-animate/-/tailwindcss-animate-1.0.7.tgz",
       "integrity": "sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==",
-      "license": "MIT",
       "peerDependencies": {
         "tailwindcss": ">=3.0.0 || insiders"
       }
     },
+    "node_modules/tailwindcss/node_modules/postcss": {
+      "version": "8.4.49",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14"
+      }
+    },
+    "node_modules/tailwindcss/node_modules/postcss/node_modules/nanoid": {
+      "version": "3.3.7",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
+      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
     "node_modules/thenify": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
       "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
-      "license": "MIT",
       "dependencies": {
         "any-promise": "^1.0.0"
       }
@@ -5557,7 +4692,6 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
       "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
-      "license": "MIT",
       "dependencies": {
         "thenify": ">= 3.1.0 < 4"
       },
@@ -5568,14 +4702,12 @@
     "node_modules/tiny-invariant": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
-      "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==",
-      "license": "MIT"
+      "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg=="
     },
     "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"
       },
@@ -5584,11 +4716,10 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.0.tgz",
-      "integrity": "sha512-xCt/TOAc+EOHS1XPnijD3/yzpH6qg2xppZO1YDqGoVsNXfQfzHpOdNuXwrwOU8u4ITXJyDCTyt8w5g1sZv9ynQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.1.tgz",
+      "integrity": "sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=18.12"
       },
@@ -5599,27 +4730,23 @@
     "node_modules/ts-interface-checker": {
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
-      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",
-      "license": "Apache-2.0"
+      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="
     },
     "node_modules/tslib": {
-      "version": "2.8.1",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
-      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
-      "license": "0BSD"
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
+      "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA=="
     },
     "node_modules/turbo-stream": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz",
-      "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==",
-      "license": "ISC"
+      "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g=="
     },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1"
       },
@@ -5632,7 +4759,6 @@
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
       "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
       "devOptional": true,
-      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -5642,15 +4768,14 @@
       }
     },
     "node_modules/typescript-eslint": {
-      "version": "8.21.0",
-      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.21.0.tgz",
-      "integrity": "sha512-txEKYY4XMKwPXxNkN8+AxAdX6iIJAPiJbHE/FpQccs/sxw8Lf26kqwC3cn0xkHlW8kEbLhkhCsjWuMveaY9Rxw==",
+      "version": "8.24.1",
+      "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.24.1.tgz",
+      "integrity": "sha512-cw3rEdzDqBs70TIcb0Gdzbt6h11BSs2pS0yaq7hDWDBtCCSei1pPSUXE9qUdQ/Wm9NgFg8mKtMt1b8fTHIl1jA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
-        "@typescript-eslint/eslint-plugin": "8.21.0",
-        "@typescript-eslint/parser": "8.21.0",
-        "@typescript-eslint/utils": "8.21.0"
+        "@typescript-eslint/eslint-plugin": "8.24.1",
+        "@typescript-eslint/parser": "8.24.1",
+        "@typescript-eslint/utils": "8.24.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -5668,13 +4793,12 @@
       "version": "6.20.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
       "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true,
-      "license": "MIT"
+      "dev": true
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.2.tgz",
-      "integrity": "sha512-PPypAm5qvlD7XMZC3BujecnaOxwhrtoFR+Dqkk5Aa/6DssiH0ibKoketaj9w8LP7Bont1rYeoV5plxD7RTEPRg==",
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
+      "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
       "dev": true,
       "funding": [
         {
@@ -5690,10 +4814,9 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
-      "license": "MIT",
       "dependencies": {
         "escalade": "^3.2.0",
-        "picocolors": "^1.1.1"
+        "picocolors": "^1.1.0"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -5707,7 +4830,6 @@
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "dev": true,
-      "license": "BSD-2-Clause",
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -5716,7 +4838,6 @@
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.3.tgz",
       "integrity": "sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==",
-      "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -5737,7 +4858,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.3.tgz",
       "integrity": "sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==",
-      "license": "MIT",
       "dependencies": {
         "detect-node-es": "^1.1.0",
         "tslib": "^2.0.0"
@@ -5758,14 +4878,12 @@
     "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"
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
     "node_modules/victory-vendor": {
       "version": "36.9.2",
       "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.9.2.tgz",
       "integrity": "sha512-PnpQQMuxlwYdocC8fIJqVXvkeViHYzotI+NJrCuav0ZYFoq912ZHBk3mCeuj+5/VpodOjPe1z0Fk2ihgzlXqjQ==",
-      "license": "MIT AND ISC",
       "dependencies": {
         "@types/d3-array": "^3.0.3",
         "@types/d3-ease": "^3.0.0",
@@ -5784,15 +4902,14 @@
       }
     },
     "node_modules/vite": {
-      "version": "6.0.11",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-6.0.11.tgz",
-      "integrity": "sha512-4VL9mQPKoHy4+FE0NnRE/kbY51TOfaknxAjt3fJbGJxhIpBZiqVzlZDEesWWsuREXHwNdAoOFZ9MkPEVXczHwg==",
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-6.1.1.tgz",
+      "integrity": "sha512-4GgM54XrwRfrOp297aIYspIti66k56v16ZnqHvrIM7mG+HjDlAwS7p+Srr7J6fGvEdOJ5JcQ/D9T7HhtdXDTzA==",
       "dev": true,
-      "license": "MIT",
       "dependencies": {
         "esbuild": "^0.24.2",
-        "postcss": "^8.4.49",
-        "rollup": "^4.23.0"
+        "postcss": "^8.5.2",
+        "rollup": "^4.30.1"
       },
       "bin": {
         "vite": "bin/vite.js"
@@ -5859,7 +4976,6 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
       "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5868,7 +4984,6 @@
       "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"
       },
@@ -5884,7 +4999,6 @@
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
       "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5924,15 +5038,6 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
-      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -5953,23 +5058,10 @@
         "node": ">=8"
       }
     },
-    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/wrap-ansi/node_modules/ansi-styles": {
       "version": "6.2.1",
       "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
       "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
-      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -5977,11 +5069,25 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
+    "node_modules/wrap-ansi/node_modules/strip-ansi": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
+      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^6.0.1"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
+      }
+    },
     "node_modules/yaml": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.7.0.tgz",
-      "integrity": "sha512-+hSoy/QHluxmC9kCIJyL/uyFmLmc+e5CFR5Wa+bpIhIj85LVb9ZH2nVnqrHoSvKogwODv0ClqZkmiSSaIH5LTA==",
-      "license": "ISC",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz",
+      "integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==",
       "bin": {
         "yaml": "bin.mjs"
       },
@@ -5994,7 +5100,6 @@
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true,
-      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
diff --git a/pkgs/by-name/ne/nezha-theme-user/package.nix b/pkgs/by-name/ne/nezha-theme-user/package.nix
index 2f74a81208d0..83e311d551c8 100644
--- a/pkgs/by-name/ne/nezha-theme-user/package.nix
+++ b/pkgs/by-name/ne/nezha-theme-user/package.nix
@@ -7,13 +7,13 @@
 
 buildNpmPackage rec {
   pname = "nezha-theme-user";
-  version = "1.13.3";
+  version = "1.32.0";
 
   src = fetchFromGitHub {
     owner = "hamster1963";
     repo = "nezha-dash-v1";
     tag = "v${version}";
-    hash = "sha256-dg46wJtaY+b0gfL0+HchVNGFAx41Cz/moqL/8InNYp4=";
+    hash = "sha256-W3UnDDvzj5AWT8EQyNL7TtDxQlgQpfYeLZsvSCF/dGw=";
   };
 
   # TODO: Switch to the bun build function once available in nixpkgs
@@ -27,7 +27,7 @@ buildNpmPackage rec {
       --replace-fail '/commit/' '/tree/'
   '';
 
-  npmDepsHash = "sha256-n7ejpEkakvWO89GhHyy/QbxNvDaXXIDGERc8neeIyoU=";
+  npmDepsHash = "sha256-hlCZqeMkqLgtRpN1+zKhcNK4ECSC4q8XPxzL6jVziqQ=";
 
   npmPackFlags = [ "--ignore-scripts" ];
 

From e08b831e1a92333667eb6abef7e1656a101db109 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Thu, 16 Oct 2025 09:43:36 +0200
Subject: [PATCH 4140/6226] bambu-studio: 02.02.02.56 -> 02.03.01.51

---
 pkgs/by-name/ba/bambu-studio/package.nix      |   8 +-
 .../ba/bambu-studio/patches/cmake.patch       | 200 ++++++++++++++++++
 .../ba/bambu-studio/patches/no-cereal.patch   |  40 ++++
 3 files changed, 246 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/by-name/ba/bambu-studio/patches/cmake.patch
 create mode 100644 pkgs/by-name/ba/bambu-studio/patches/no-cereal.patch

diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix
index 441b62d5a67f..b3a178601789 100644
--- a/pkgs/by-name/ba/bambu-studio/package.nix
+++ b/pkgs/by-name/ba/bambu-studio/package.nix
@@ -56,13 +56,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "bambu-studio";
-  version = "02.02.02.56";
+  version = "02.03.01.51";
 
   src = fetchFromGitHub {
     owner = "bambulab";
     repo = "BambuStudio";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vg+sEIztFBfzROl2surRd4l/afZ+tGMtG65m3kDIPAY=";
+    hash = "sha256-SnWOTFymTVHzYqraMzohOrpM0UuLW+PRfZBqkFASEWs=";
   };
 
   nativeBuildInputs = [
@@ -117,6 +117,10 @@ stdenv.mkDerivation (finalAttrs: {
     ./patches/dont-link-opencv-world-bambu.patch
     # Don't link osmesa
     ./patches/no-osmesa.patch
+    # Don't link cereal
+    ./patches/no-cereal.patch
+    # Cmake 4 support
+    ./patches/cmake.patch
   ];
 
   doCheck = true;
diff --git a/pkgs/by-name/ba/bambu-studio/patches/cmake.patch b/pkgs/by-name/ba/bambu-studio/patches/cmake.patch
new file mode 100644
index 000000000000..7ed1752bad92
--- /dev/null
+++ b/pkgs/by-name/ba/bambu-studio/patches/cmake.patch
@@ -0,0 +1,200 @@
+diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake
+index 76ddb0d2f..4d30f6865 100644
+--- a/cmake/modules/FindOpenVDB.cmake
++++ b/cmake/modules/FindOpenVDB.cmake
+@@ -123,7 +123,7 @@ if (OPENVDB_FIND_MODULE_PATH)
+ endif ()
+ # ###########################################################################
+ 
+-cmake_minimum_required(VERSION 3.3)
++cmake_minimum_required(VERSION 3.3...3.10)
+ # Monitoring <PackageName>_ROOT variables
+ if(POLICY CMP0074)
+   cmake_policy(SET CMP0074 NEW)
+diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt
+index 54b9a2497..3b4a32829 100644
+--- a/deps/CMakeLists.txt
++++ b/deps/CMakeLists.txt
+@@ -21,7 +21,7 @@
+ #
+ 
+ project(BambuStudio-deps)
+-cmake_minimum_required(VERSION 3.2)
++cmake_minimum_required(VERSION 3.2...3.10)
+ 
+ include(ExternalProject)
+ include(ProcessorCount)
+diff --git a/deps/EXPAT/expat/CMakeLists.txt b/deps/EXPAT/expat/CMakeLists.txt
+index 585a678b8..77d3c13d8 100644
+--- a/deps/EXPAT/expat/CMakeLists.txt
++++ b/deps/EXPAT/expat/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.0...3.10)
+ 
+ project(EXPAT)
+ 
+diff --git a/deps/GLEW/glew/CMakeLists.txt b/deps/GLEW/glew/CMakeLists.txt
+index 513ee4ebb..e262f65e8 100644
+--- a/deps/GLEW/glew/CMakeLists.txt
++++ b/deps/GLEW/glew/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.0...3.10)
+ project(GLEW)
+ 
+ find_package(OpenGL REQUIRED)
+diff --git a/sandboxes/opencsg/CMakeLists.txt b/sandboxes/opencsg/CMakeLists.txt
+index ace8f4d53..304ff4e01 100644
+--- a/sandboxes/opencsg/CMakeLists.txt
++++ b/sandboxes/opencsg/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.0...3.10)
+ 
+ project(OpenCSG-example)
+ 
+diff --git a/src/Shiny/CMakeLists.txt b/src/Shiny/CMakeLists.txt
+index abdb96a72..7e6f16500 100644
+--- a/src/Shiny/CMakeLists.txt
++++ b/src/Shiny/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 2.8.12...3.10)
+ project(Shiny)
+ 
+ add_library(Shiny STATIC
+diff --git a/src/admesh/CMakeLists.txt b/src/admesh/CMakeLists.txt
+index 217976318..6450abc87 100644
+--- a/src/admesh/CMakeLists.txt
++++ b/src/admesh/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 2.8.12...3.10)
+ project(admesh)
+ 
+ add_library(admesh STATIC
+diff --git a/src/boost/CMakeLists.txt b/src/boost/CMakeLists.txt
+index e8c9e11ce..3c62ccf7e 100644
+--- a/src/boost/CMakeLists.txt
++++ b/src/boost/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 2.8.12...3.10)
+ project(nowide)
+ 
+ add_library(nowide STATIC
+diff --git a/src/clipper/CMakeLists.txt b/src/clipper/CMakeLists.txt
+index f62508820..44aa59f23 100644
+--- a/src/clipper/CMakeLists.txt
++++ b/src/clipper/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 2.8.12...3.10)
+ project(clipper)
+ 
+ add_library(clipper STATIC
+diff --git a/src/earcut/CMakeLists.txt b/src/earcut/CMakeLists.txt
+index 08c7bb1be..cb10fea7b 100644
+--- a/src/earcut/CMakeLists.txt
++++ b/src/earcut/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.2)
++cmake_minimum_required(VERSION 3.2...3.10)
+ project(earcut_hpp LANGUAGES CXX C)
+ 
+ option(EARCUT_BUILD_TESTS "Build the earcut test program" ON)
+diff --git a/src/glu-libtess/CMakeLists.txt b/src/glu-libtess/CMakeLists.txt
+index 8fca992a3..662b5593e 100644
+--- a/src/glu-libtess/CMakeLists.txt
++++ b/src/glu-libtess/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 2.8.12...3.10)
+ project(glu-libtess)
+ 
+ add_library(glu-libtess STATIC 
+diff --git a/src/imgui/CMakeLists.txt b/src/imgui/CMakeLists.txt
+index 592e78c8e..718a05439 100644
+--- a/src/imgui/CMakeLists.txt
++++ b/src/imgui/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 2.8.12...3.10)
+ project(imgui)
+ 
+ add_library(imgui STATIC
+diff --git a/src/imguizmo/CMakeLists.txt b/src/imguizmo/CMakeLists.txt
+index fec443180..461d4f684 100644
+--- a/src/imguizmo/CMakeLists.txt
++++ b/src/imguizmo/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 2.8.12...3.10)
+ project(imguizmo)
+ 
+ add_library(imguizmo STATIC
+diff --git a/src/libigl/CMakeLists.txt b/src/libigl/CMakeLists.txt
+index f023826a5..449a3cbef 100644
+--- a/src/libigl/CMakeLists.txt
++++ b/src/libigl/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.0)
++cmake_minimum_required(VERSION 3.0...3.10)
+ project(libigl)
+ 
+ add_library(libigl INTERFACE)
+diff --git a/src/minilzo/CMakeLists.txt b/src/minilzo/CMakeLists.txt
+index c5122ccf0..97e749e04 100644
+--- a/src/minilzo/CMakeLists.txt
++++ b/src/minilzo/CMakeLists.txt
+@@ -1,5 +1,5 @@
+ project(minilzo)
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 2.6...3.10)
+ 
+ add_library(minilzo INTERFACE)
+ 
+diff --git a/src/miniz/CMakeLists.txt b/src/miniz/CMakeLists.txt
+index 04d562b76..e3d6fbc6f 100644
+--- a/src/miniz/CMakeLists.txt
++++ b/src/miniz/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 2.8.12...3.10)
+ project(miniz)
+ 
+ add_library(miniz INTERFACE)
+diff --git a/src/qhull/CMakeLists.txt b/src/qhull/CMakeLists.txt
+index ab9aba9af..350539681 100644
+--- a/src/qhull/CMakeLists.txt
++++ b/src/qhull/CMakeLists.txt
+@@ -28,7 +28,7 @@ endif()
+ else(Qhull_FOUND)
+ 
+ project(qhull)
+-cmake_minimum_required(VERSION 2.6)
++cmake_minimum_required(VERSION 2.6...3.10)
+ 
+ # Define qhull_VERSION in CMakeLists.txt, Makefile, qhull-exports.def, qhull_p-exports.def, qhull_r-exports.def, qhull-warn.pri
+ set(qhull_VERSION2 "2015.2 2016/01/18")  # not used, See global.c, global_r.c, rbox.c, rbox_r.c
+diff --git a/src/semver/CMakeLists.txt b/src/semver/CMakeLists.txt
+index 4b61a7456..76a231074 100644
+--- a/src/semver/CMakeLists.txt
++++ b/src/semver/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.12)
++cmake_minimum_required(VERSION 2.8.12...3.10)
+ project(semver)
+ 
+ add_library(semver STATIC
+diff --git a/tests/cpp17/CMakeLists.txt b/tests/cpp17/CMakeLists.txt
+index 4e151ecbf..2ac0a9e3d 100644
+--- a/tests/cpp17/CMakeLists.txt
++++ b/tests/cpp17/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 3.1)
++cmake_minimum_required(VERSION 3.1...3.10)
+ 
+ project(Cpp17Test)
+ 
diff --git a/pkgs/by-name/ba/bambu-studio/patches/no-cereal.patch b/pkgs/by-name/ba/bambu-studio/patches/no-cereal.patch
new file mode 100644
index 000000000000..b1c591a58d0e
--- /dev/null
+++ b/pkgs/by-name/ba/bambu-studio/patches/no-cereal.patch
@@ -0,0 +1,40 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 0b4b9a8..8c22f60 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -125,7 +125,7 @@ if (NOT WIN32 AND NOT APPLE)
+     configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/unix/BuildLinuxImage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/BuildLinuxImage.sh @ONLY)
+ endif ()
+
+-target_link_libraries(BambuStudio libslic3r cereal)
++target_link_libraries(BambuStudio libslic3r)
+ if (APPLE)
+ #    add_compile_options(-stdlib=libc++)
+ #    add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE)
+diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt
+index 4481362..7d41af3 100644
+--- a/src/libslic3r/CMakeLists.txt
++++ b/src/libslic3r/CMakeLists.txt
+@@ -574,7 +574,6 @@ set(OCCT_LIBS
+ target_link_libraries(libslic3r
+     libnest2d
+     admesh
+-    cereal
+     libigl
+     miniz
+     boost_libs
+diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt
+index 0a852a4..2da0533 100644
+--- a/src/slic3r/CMakeLists.txt
++++ b/src/slic3r/CMakeLists.txt
+@@ -671,8 +671,8 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SLIC3R_GUI_SOURCES})
+
+ encoding_check(libslic3r_gui)
+
+-target_link_libraries(libslic3r_gui libslic3r cereal imgui imguizmo minilzo GLEW::GLEW OpenGL::GL hidapi ${wxWidgets_LIBRARIES} glfw libcurl OpenSSL::SSL OpenSSL::Crypto)
+-#target_link_libraries(libslic3r_gui libslic3r cereal imgui imguizmo minilzo GLEW::GLEW OpenGL::GL hidapi libcurl OpenSSL::SSL OpenSSL::Crypto ${wxWidgets_LIBRARIES} glfw)
++target_link_libraries(libslic3r_gui libslic3r imgui imguizmo minilzo GLEW::GLEW OpenGL::GL hidapi ${wxWidgets_LIBRARIES} glfw libcurl OpenSSL::SSL OpenSSL::Crypto)
++#target_link_libraries(libslic3r_gui libslic3r imgui imguizmo minilzo GLEW::GLEW OpenGL::GL hidapi libcurl OpenSSL::SSL OpenSSL::Crypto ${wxWidgets_LIBRARIES} glfw)
+
+ if (MSVC)
+     target_link_libraries(libslic3r_gui Setupapi.lib)

From 34668b6cc0749346b362c4dc43b500a2175ff70c Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Thu, 30 Oct 2025 11:09:00 +0100
Subject: [PATCH 4141/6226] matrix-synapse: 1.140.0 -> 1.141.0

ChangeLog: https://github.com/element-hq/synapse/releases/tag/v1.141.0
---
 pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
index 3335cb72067c..4ba829f3b248 100644
--- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
+++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix
@@ -14,14 +14,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "matrix-synapse";
-  version = "1.140.0";
+  version = "1.141.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "synapse";
     rev = "v${version}";
-    hash = "sha256-nk1nOfJQOBgnlIAju+Q8+0Q0wTGaymhSQSdwecTJLUY=";
+    hash = "sha256-trn5+OOtubOOjlOjJ7WCgeMz2IAsxurHvPQYg/RkEX4=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From a0b181ad536687a73749ce144c75b09b4def69be Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 10:11:20 +0000
Subject: [PATCH 4142/6226] all-the-package-names: 2.0.2247 -> 2.0.2250

---
 pkgs/by-name/al/all-the-package-names/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix
index c1099d396515..cd619c8ef3a4 100644
--- a/pkgs/by-name/al/all-the-package-names/package.nix
+++ b/pkgs/by-name/al/all-the-package-names/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "all-the-package-names";
-  version = "2.0.2247";
+  version = "2.0.2250";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-IK94a6XOTOqyUnMPfjV3GzKUpf0WpPwINbhxzbTvAKA=";
+    hash = "sha256-Txh+ijQwl2x2FBQp5oWtmGdDRvDnmQoQYc1QShsFEo8=";
   };
 
-  npmDepsHash = "sha256-sdCRKOtwDEixjCZdg1Tl5CXvfAcFOIWK7Iw17h1caOE=";
+  npmDepsHash = "sha256-V3Zm1vy333WfarVVUbnpeEKkXW3HBwVDO3JltRLVNSk=";
 
   passthru.updateScript = nix-update-script { };
 

From 220a1f5fc77da86ad2265a13dc61445ad9a6d574 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 10:34:24 +0000
Subject: [PATCH 4143/6226] python3Packages.publicsuffixlist: 1.0.2.20251027 ->
 1.0.2.20251030

---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index 80818f8347eb..f8a4cc2115b0 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20251027";
+  version = "1.0.2.20251030";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-anbYf4eCK8QIdLWYYx1PG4sImXK2lWMd0oAlsonvb1Q=";
+    hash = "sha256-vEQp18br81UIBQtfVW8XAsR3i9iMhTiPtDKQqyJhW9w=";
   };
 
   build-system = [ setuptools ];

From 32257c8e85cc1d07f3658916aef3816c84956aac Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Tue, 14 Oct 2025 09:37:41 +0000
Subject: [PATCH 4144/6226] nemorosa: init at 0.3.0

---
 pkgs/by-name/ne/nemorosa/package.nix | 65 ++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)
 create mode 100644 pkgs/by-name/ne/nemorosa/package.nix

diff --git a/pkgs/by-name/ne/nemorosa/package.nix b/pkgs/by-name/ne/nemorosa/package.nix
new file mode 100644
index 000000000000..11f772be2daf
--- /dev/null
+++ b/pkgs/by-name/ne/nemorosa/package.nix
@@ -0,0 +1,65 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "nemorosa";
+  version = "0.3.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "KyokoMiki";
+    repo = "nemorosa";
+    tag = version;
+    hash = "sha256-UBvtff5fU3kH/+Kw426+yyoyJ3aASBIYDPX+X5jqkA8=";
+  };
+
+  # Upstream uses overly strict, fresh version specifiers
+  pythonRelaxDeps = true;
+
+  # `build-system` requirements are seemingly not covered by pythonRelaxDeps
+  postPatch = ''
+    sed -i 's/requires = \["uv_build.*"\]/requires = ["uv_build"]/' pyproject.toml
+  '';
+
+  build-system = with python3Packages; [ uv-build ];
+
+  dependencies =
+    with python3Packages;
+    [
+      aiolimiter
+      apscheduler
+      beautifulsoup4
+      defusedxml
+      deluge-client
+      fastapi
+      httpx
+      humanfriendly
+      msgspec
+      platformdirs
+      qbittorrent-api
+      reflink-copy
+      sqlalchemy
+      torf
+      transmission-rpc
+      uvicorn
+      uvloop
+    ]
+    ++ beautifulsoup4.optional-dependencies.lxml
+    ++ msgspec.optional-dependencies.yaml
+    ++ sqlalchemy.optional-dependencies.aiosqlite
+    ++ uvicorn.optional-dependencies.standard;
+
+  pythonImportsCheck = [ "nemorosa" ];
+
+  meta = {
+    description = "Specialized cross-seeding tool designed for music torrents";
+    homepage = "https://github.com/KyokoMiki/nemorosa";
+    changelog = "https://github.com/KyokoMiki/nemorosa/releases";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ambroisie ];
+    mainProgram = "nemorosa";
+  };
+}

From f6ee2d82d45c1a9c5df0f4f03b04b1d017b376c3 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 30 Oct 2025 10:15:50 +0000
Subject: [PATCH 4145/6226] python3Packages.apache-beam: 2.68.0 -> 2.69.0

Diff: https://github.com/apache/beam/compare/v2.68.0...v2.69.0

Changelog: https://github.com/apache/beam/blob/v2.69.0/CHANGES.md
---
 .../python-modules/apache-beam/default.nix        | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/apache-beam/default.nix b/pkgs/development/python-modules/apache-beam/default.nix
index 22ea916e8758..ff12480ceb25 100644
--- a/pkgs/development/python-modules/apache-beam/default.nix
+++ b/pkgs/development/python-modules/apache-beam/default.nix
@@ -19,6 +19,7 @@
   # dependencies
   beartype,
   crcmod,
+  cryptography,
   dill,
   fastavro,
   fasteners,
@@ -63,14 +64,14 @@
 
 buildPythonPackage rec {
   pname = "apache-beam";
-  version = "2.68.0";
+  version = "2.69.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "apache";
     repo = "beam";
     tag = "v${version}";
-    hash = "sha256-ENtvgu9qT1OPsDqFJQzKgIATE7F+S5I+AfoBT2iEL8M=";
+    hash = "sha256-7trrdGQ9jkzG+5/PyBMvHXjR0B4HjOxBhUuxXEcKkLg=";
   };
 
   sourceRoot = "${src.name}/sdks/python";
@@ -123,6 +124,7 @@ buildPythonPackage rec {
   dependencies = [
     beartype
     crcmod
+    cryptography
     dill
     fastavro
     fasteners
@@ -254,10 +256,15 @@ buildPythonPackage rec {
     "test_reshuffle_custom_window_preserves_metadata_1"
     "test_reshuffle_default_window_preserves_metadata_1"
 
-    # AttributeError: 'MaybeReshuffle' object has no attribute 'side_inputs'
-    # https://github.com/apache/beam/issues/33854
+    # Dill version 0.3.1.1 is required when using pickle_library=dill.
+    # Other versions of dill are untested with Apache Beam.
+    "LocalCombineFnLifecycleTest_0_dill"
+    "LocalCombineFnLifecycleTest_2_dill"
     "test_runner_overrides_default_pickler"
 
+    # Require internet access
+    "test_local_jar_fallback_to_google_maven_mirror"
+
     # AssertionError: Lists differ
     "test_default_resources"
     "test_files_to_stage"

From b9c38ab5db7b86d8e7118c95a995fe9731e66947 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Thu, 30 Oct 2025 10:41:49 +0000
Subject: [PATCH 4146/6226] rectangle-pro: 3.62 -> 3.63

Changelog: https://rectangleapp.com/pro/versions
---
 pkgs/by-name/re/rectangle-pro/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/rectangle-pro/package.nix b/pkgs/by-name/re/rectangle-pro/package.nix
index 23fc1665feac..e82940b53a39 100644
--- a/pkgs/by-name/re/rectangle-pro/package.nix
+++ b/pkgs/by-name/re/rectangle-pro/package.nix
@@ -7,11 +7,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rectangle-pro";
-  version = "3.62";
+  version = "3.63";
 
   src = fetchurl {
     url = "https://rectangleapp.com/pro/downloads/Rectangle%20Pro%20${finalAttrs.version}.dmg";
-    hash = "sha256-0pJ2vhBaxNRYu40IjlzY4P6LS/TyvxalodcdKV0eqA4=";
+    hash = "sha256-ysRIf19Woo6odCEgkNfoRDelF7gflDhaiNH+hjygz/Q=";
   };
 
   sourceRoot = ".";

From b70a68d8502150a6c89c9512a230cf9f061414f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 10:46:35 +0000
Subject: [PATCH 4147/6226] terraform-providers.metio_migadu: 2025.10.16 ->
 2025.10.30

---
 .../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 f4631f4e9dda..8e2932b2e10c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -886,13 +886,13 @@
     "vendorHash": "sha256-I8yMdS+yOk5doWGU9VPdl5ITGNrPhs5tGwluwXSrnI0="
   },
   "metio_migadu": {
-    "hash": "sha256-FDZOBxxoY9fZ9g24onNoFn4e0xtBMYLCoqdYcdhIj4E=",
+    "hash": "sha256-Itfy/EZiBI6j4GU9I3pQGpsMkykN8FVZ4FPhcUre8a0=",
     "homepage": "https://registry.terraform.io/providers/metio/migadu",
     "owner": "metio",
     "repo": "terraform-provider-migadu",
-    "rev": "2025.10.16",
+    "rev": "2025.10.30",
     "spdx": "0BSD",
-    "vendorHash": "sha256-bxq4AB9qvhZPxtG4lmfVXQL3mil7UaJ46EWU1iD0ymE="
+    "vendorHash": "sha256-LMCFXZYZ9qwuu0/hA8mRNktCwwC4DRaqveW2dAJWQTQ="
   },
   "mongey_kafka": {
     "hash": "sha256-rTa6c7jAMH027V7h/yUGVGz6TS0PDdObilxU0Vpr6FI=",

From 681a2fca1df78bafafd3f65b2ebb617bf199736e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 11:01:25 +0000
Subject: [PATCH 4148/6226] armadillo: 15.2.0 -> 15.2.1

---
 pkgs/by-name/ar/armadillo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ar/armadillo/package.nix b/pkgs/by-name/ar/armadillo/package.nix
index 6129fd149edf..4404a640e21e 100644
--- a/pkgs/by-name/ar/armadillo/package.nix
+++ b/pkgs/by-name/ar/armadillo/package.nix
@@ -11,11 +11,11 @@
 
 stdenv.mkDerivation rec {
   pname = "armadillo";
-  version = "15.2.0";
+  version = "15.2.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    hash = "sha256-L3HAZh/EpG4t1Wt2Uc87tZKLSZpLEN8x78GkJB7fAEM=";
+    hash = "sha256-pbgQnaPBaYAvUaFNO9EkY5XCS7ylVgF2CwyWo8Cy+Po=";
   };
 
   nativeBuildInputs = [ cmake ];

From e027cb6506ae04f7243eccf490180c558f7f5b25 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 30 Oct 2025 10:04:58 +0000
Subject: [PATCH 4149/6226] python3Packages.torchao: skip failing tests

---
 .../python-modules/torchao/default.nix        | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/pkgs/development/python-modules/torchao/default.nix b/pkgs/development/python-modules/torchao/default.nix
index 2af60a2115b0..e2a21306f432 100644
--- a/pkgs/development/python-modules/torchao/default.nix
+++ b/pkgs/development/python-modules/torchao/default.nix
@@ -104,6 +104,52 @@ buildPythonPackage rec {
 
     # FileNotFoundError: [Errno 2] No such file or directory: 'checkpoints/meta-llama/Llama-2-7b-chat-hf/model.pth'
     "test_gptq_mt"
+
+    # KeyError: '_guards_fn
+    "test_add"
+    "test_add_relu"
+    "test_allow_exported_model_train_eval"
+    "test_allow_exported_model_train_eval_idempotent"
+    "test_conv2d"
+    "test_disallow_eval_train"
+    "test_dynamic_linear"
+    "test_fold_bn_erases_bn_node"
+    "test_fold_bn_erases_bn_node"
+    "test_maxpool2d"
+    "test_move_exported_model_bn_device_cpu"
+    "test_move_exported_model_dropout"
+    "test_move_exported_model_dropout_inplace"
+    "test_preserve_nn_module_stack"
+    "test_qat_bn_conv2d"
+    "test_qat_conv2d"
+    "test_qat_conv2d_binary"
+    "test_qat_conv2d_binary2"
+    "test_qat_conv2d_binary_unary"
+    "test_qat_conv2d_unary"
+    "test_qat_conv_bn_bias_derived_qspec"
+    "test_qat_conv_bn_fusion"
+    "test_qat_conv_bn_fusion_literal_args"
+    "test_qat_conv_bn_fusion_no_conv_bias"
+    "test_qat_conv_bn_per_channel_weight_bias"
+    "test_qat_conv_bn_relu_fusion"
+    "test_qat_conv_bn_relu_fusion_no_conv_bias"
+    "test_qat_conv_transpose_bn"
+    "test_qat_conv_transpose_bn_relu"
+    "test_qat_per_channel_weight_custom_dtype"
+    "test_qat_preserve_source_fn_stack"
+    "test_qat_qconv2d"
+    "test_qat_qconv2d_add"
+    "test_qat_qconv2d_add_relu"
+    "test_qat_qconv2d_hardswish"
+    "test_qat_qconv2d_hardtanh"
+    "test_qat_qconv2d_relu"
+    "test_qat_qconv2d_relu6"
+    "test_qat_qconv2d_silu"
+    "test_qat_update_shared_qspec"
+    "test_qdq"
+    "test_qdq_per_channel"
+    "test_reentrant"
+    "test_static_linear"
   ]
   ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [
     # AssertionError: tensor(False) is not true
@@ -135,6 +181,10 @@ buildPythonPackage rec {
     # RuntimeError: No packed_weights_format was selected
     "TestIntxOpaqueTensor"
     "test_accuracy_kleidiai"
+
+    # RuntimeError: quantized engine NoQEngine is not supported
+    "test_smooth_linear_cpu"
+    "test_smooth_linear_edge_cases"
   ]
   ++ lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
     # Flaky: [gw0] node down: keyboard-interrupt

From ba2391c8d0be2c234fa4aecaea4aabcfb54f5e88 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 30 Oct 2025 09:54:57 +0100
Subject: [PATCH 4150/6226] various: fix maintainer teams

The maintainers field currently expects actual maintainers only, not
entire teams. These can be added via `meta.teams` or via
`<team>.members` for NixOS tests, which don't support teams, yet.
---
 nixos/tests/nominatim.nix                                     | 4 ++--
 pkgs/by-name/py/pyroscope/package.nix                         | 2 +-
 pkgs/development/python-modules/rpy2-rinterface/default.nix   | 2 +-
 .../6/miopen/test-frugally-deep-model-loading.nix             | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/nixos/tests/nominatim.nix b/nixos/tests/nominatim.nix
index 3919f245abd1..cff589f2807e 100644
--- a/nixos/tests/nominatim.nix
+++ b/nixos/tests/nominatim.nix
@@ -11,8 +11,8 @@ in
   name = "nominatim";
   meta = {
     maintainers = with lib.teams; [
-      geospatial
-      ngi
+      geospatial.members
+      ngi.members
     ];
   };
 
diff --git a/pkgs/by-name/py/pyroscope/package.nix b/pkgs/by-name/py/pyroscope/package.nix
index d7396634b116..18f2bf17ecff 100644
--- a/pkgs/by-name/py/pyroscope/package.nix
+++ b/pkgs/by-name/py/pyroscope/package.nix
@@ -56,7 +56,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/grafana/pyroscope";
     changelog = "https://github.com/grafana/pyroscope/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.agpl3Only;
-    maintainers = [ lib.teams.mercury ];
+    teams = [ lib.teams.mercury ];
     mainProgram = "pyroscope";
   };
 })
diff --git a/pkgs/development/python-modules/rpy2-rinterface/default.nix b/pkgs/development/python-modules/rpy2-rinterface/default.nix
index 13b20da717c8..cdc47e8e4df4 100644
--- a/pkgs/development/python-modules/rpy2-rinterface/default.nix
+++ b/pkgs/development/python-modules/rpy2-rinterface/default.nix
@@ -74,6 +74,6 @@ buildPythonPackage rec {
     description = "Python interface to R";
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
-    maintainers = with lib; [ teams.sage ];
+    teams = with lib.teams; [ sage ];
   };
 }
diff --git a/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix b/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix
index 36cadd774a65..7f82083d2349 100644
--- a/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix
+++ b/pkgs/development/rocm-modules/6/miopen/test-frugally-deep-model-loading.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation {
 
   meta = {
     description = "Test that frugally-deep can load MIOpen model files";
-    maintainers = with lib.teams; [ rocm ];
+    teams = with lib.teams; [ rocm ];
     platforms = lib.platforms.linux;
   };
 }

From 0c50dddb4e91098bed22c4fc2a449865b929bab6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 11:03:55 +0000
Subject: [PATCH 4151/6226] capnproto-rust: 0.21.4 -> 0.23.2

---
 pkgs/by-name/ca/capnproto-rust/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/capnproto-rust/package.nix b/pkgs/by-name/ca/capnproto-rust/package.nix
index 45dd91b43b7d..a8204ea3f101 100644
--- a/pkgs/by-name/ca/capnproto-rust/package.nix
+++ b/pkgs/by-name/ca/capnproto-rust/package.nix
@@ -8,15 +8,15 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "capnproto-rust";
-  version = "0.21.4";
+  version = "0.23.2";
 
   src = fetchCrate {
     crateName = "capnpc";
     inherit version;
-    hash = "sha256-pJF0S6mRxPjpwa367eOUgc7GBeKgUwux1GgUIJE8JuI=";
+    hash = "sha256-dmLR1jMH90axlylkA3m48FK367c67o4CgIc+M6gKz0o=";
   };
 
-  cargoHash = "sha256-nPDfBpY7WtNr1St6HAymWBLho5n0UXibqDjVA1vXeNg=";
+  cargoHash = "sha256-g3/SpeqVtNCu35jj7apAg64/R5R/m1Z2jbKMARph7jo=";
 
   postInstall = ''
     mkdir -p $out/include/capnp

From 9e4b90753e77a479088f78d3a0968b6bfe9143f9 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Fri, 24 Oct 2025 13:08:33 +0200
Subject: [PATCH 4152/6226] lxqt.qlipper: 5.1.2-unstable-2025-07-04 ->
 5.1.2-unstable-2025-10-29

This fixes the build with Qt >= 6.10 .
---
 pkgs/desktops/lxqt/qlipper/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix
index 8c6e5b8bd261..325864cd98df 100644
--- a/pkgs/desktops/lxqt/qlipper/default.nix
+++ b/pkgs/desktops/lxqt/qlipper/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation {
   pname = "qlipper";
-  version = "5.1.2-unstable-2025-07-04";
+  version = "5.1.2-unstable-2025-10-29";
 
   src = fetchFromGitHub {
     owner = "pvanek";
     repo = "qlipper";
-    rev = "d3e605fb9d44c523a95e3aac53c7d179a560c85f";
-    hash = "sha256-9V9s0oxWKqd9MHKlkZF3SetrAjHX4cAenAg7as4TLn0=";
+    rev = "4e9fcfe6684c465944baa153aeb7603ec27728b1";
+    hash = "sha256-7qaLY3F67uBtX1wI667MaqtrKLDfeG9jKwlC1pUOteQ=";
   };
 
   nativeBuildInputs = [

From 71d7666ea367bcab875f7efb755fabb16ecbba9a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 11:08:39 +0000
Subject: [PATCH 4153/6226] cosmic-ext-applet-caffeine: 0-unstable-2025-10-22
 -> 0-unstable-2025-10-29

---
 pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix b/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix
index f9f5f1eb28fa..fdcb486eadc1 100644
--- a/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix
+++ b/pkgs/by-name/co/cosmic-ext-applet-caffeine/package.nix
@@ -9,13 +9,13 @@
 }:
 rustPlatform.buildRustPackage {
   pname = "cosmic-ext-applet-caffeine";
-  version = "0-unstable-2025-10-22";
+  version = "0-unstable-2025-10-29";
 
   src = fetchFromGitHub {
     owner = "tropicbliss";
     repo = "cosmic-ext-applet-caffeine";
-    rev = "2d27a3dec13ca455975f39927bad040f36576d03";
-    hash = "sha256-4MP1H3U1sr7+h5Psf6wTiQuJJgEtlRrgQKdF7COkosI=";
+    rev = "5eeb6e505eba172fbfee6b9551df8f8a3702213e";
+    hash = "sha256-sTvP62oQknRzuc3qQqUAK70uS2MqXl8lAF27V0To8NM=";
   };
 
   cargoHash = "sha256-89/0XEdQ7MCycAkHhTkA5FCj/eKVLgWDhljKB/Lo4+4=";

From ae9c72354c40afd641a050398f1451e79cc89893 Mon Sep 17 00:00:00 2001
From: kilianar <mail@kilianar.de>
Date: Thu, 30 Oct 2025 12:13:09 +0100
Subject: [PATCH 4154/6226] ausweisapp: 2.3.2 -> 2.4.0

https://github.com/Governikus/AusweisApp/releases/tag/2.4.0
---
 pkgs/applications/misc/ausweisapp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/ausweisapp/default.nix b/pkgs/applications/misc/ausweisapp/default.nix
index 164ec577ac57..e5396ceae468 100644
--- a/pkgs/applications/misc/ausweisapp/default.nix
+++ b/pkgs/applications/misc/ausweisapp/default.nix
@@ -16,13 +16,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "ausweisapp";
-  version = "2.3.2";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "Governikus";
     repo = "AusweisApp2";
     rev = finalAttrs.version;
-    hash = "sha256-xY5V5Z6HVtkFzLzWOVRTKdms356OO0EKnG+Nymurowo=";
+    hash = "sha256-vMvCnYSj7y6ETGoudV1YJwI2bibXePSkR4nQ4T5HqTo=";
   };
 
   nativeBuildInputs = [

From 67506595acc2c2103b9edcf464f2b1f8ae3d36c1 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 27 Oct 2025 15:16:58 +0100
Subject: [PATCH 4155/6226] workflows/test: prefix artifacts

Once we start running similar jobs in the PR and Merge Queue workflows,
the Test workflow will run into a problem: Both nested workflows will
try to upload the same artifacts, which errors out.

By providing a prefix to use for artifact names, this will be a
non-issue when we later run more of Eval in the merge queue or when we
add the build jobs to the queue as well.
---
 .github/workflows/build.yml       |  5 ++++-
 .github/workflows/eval.yml        | 13 +++++++++----
 .github/workflows/merge-group.yml |  4 ++++
 .github/workflows/pr.yml          |  8 ++++++++
 .github/workflows/reviewers.yml   | 10 ++++++++--
 .github/workflows/test.yml        |  3 +++
 6 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2062ccd7c14a..69bbc48c9099 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -3,6 +3,9 @@ name: Build
 on:
   workflow_call:
     inputs:
+      artifact-prefix:
+        required: true
+        type: string
       baseBranch:
         required: true
         type: string
@@ -100,5 +103,5 @@ jobs:
           contains(fromJSON(inputs.baseBranch).type, 'primary')
         uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
-          name: nixos-manual-${{ matrix.name }}
+          name: ${{ inputs.artifact-prefix }}nixos-manual-${{ matrix.name }}
           path: nixos-manual
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index d6e6ca7a05ba..4f950b5dffd3 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -3,6 +3,9 @@ name: Eval
 on:
   workflow_call:
     inputs:
+      artifact-prefix:
+        required: true
+        type: string
       mergedSha:
         required: true
         type: string
@@ -145,7 +148,7 @@ jobs:
         if: inputs.targetSha
         uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
-          name: ${{ matrix.version && format('{0}-', matrix.version) || '' }}diff-${{ matrix.system }}
+          name: ${{ inputs.artifact-prefix }}${{ matrix.version && format('{0}-', matrix.version) || '' }}diff-${{ matrix.system }}
           path: diff/*
 
   compare:
@@ -169,7 +172,7 @@ jobs:
       - name: Download output paths and eval stats for all systems
         uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
-          pattern: diff-*
+          pattern: ${{ inputs.artifact-prefix }}diff-*
           path: diff
           merge-multiple: true
 
@@ -202,7 +205,7 @@ jobs:
       - name: Upload the comparison results
         uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
-          name: comparison
+          name: ${{ inputs.artifact-prefix }}comparison
           path: comparison/*
 
       - name: Add eval summary to commit statuses
@@ -250,6 +253,7 @@ jobs:
       - name: Add version comparison table to job summary
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         env:
+          ARTIFACT_PREFIX: ${{ inputs.artifact-prefix }}
           SYSTEMS: ${{ inputs.systems }}
           VERSIONS: ${{ needs.versions.outputs.versions }}
         with:
@@ -257,6 +261,7 @@ jobs:
             const { readFileSync } = require('node:fs')
             const path = require('node:path')
 
+            const prefix = process.env.ARTIFACT_PREFIX
             const systems = JSON.parse(process.env.SYSTEMS)
             const versions = JSON.parse(process.env.VERSIONS)
 
@@ -272,7 +277,7 @@ jobs:
                   [{ data: version }].concat(
                     systems.map((system) => {
                       try {
-                        const artifact = path.join('versions', `${version}-diff-${system}`)
+                        const artifact = path.join('versions', `${prefix}${version}-diff-${system}`)
                         const time = Math.round(
                           parseFloat(
                             readFileSync(
diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml
index 24ab1095ea7d..32fe9130b835 100644
--- a/.github/workflows/merge-group.yml
+++ b/.github/workflows/merge-group.yml
@@ -4,6 +4,9 @@ on:
   merge_group:
   workflow_call:
     inputs:
+      artifact-prefix:
+        required: true
+        type: string
       mergedSha:
         required: true
         type: string
@@ -54,6 +57,7 @@ jobs:
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
     with:
+      artifact-prefix: ${{ inputs.artifact-prefix }}
       mergedSha: ${{ inputs.mergedSha || github.event.merge_group.head_sha }}
       systems: ${{ needs.prepare.outputs.systems }}
 
diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 1ba548a4c44e..75b9b4be128a 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -3,6 +3,10 @@ name: PR
 on:
   pull_request_target:
   workflow_call:
+    inputs:
+      artifact-prefix:
+        required: true
+        type: string
     secrets:
       CACHIX_AUTH_TOKEN:
         required: true
@@ -85,6 +89,7 @@ jobs:
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
     with:
+      artifact-prefix: ${{ inputs.artifact-prefix }}
       mergedSha: ${{ needs.prepare.outputs.mergedSha }}
       targetSha: ${{ needs.prepare.outputs.targetSha }}
       systems: ${{ needs.prepare.outputs.systems }}
@@ -111,6 +116,8 @@ jobs:
     uses: ./.github/workflows/reviewers.yml
     secrets:
       OWNER_APP_PRIVATE_KEY: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
+    with:
+      artifact-prefix: ${{ inputs.artifact-prefix }}
 
   build:
     name: Build
@@ -119,6 +126,7 @@ jobs:
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
     with:
+      artifact-prefix: ${{ inputs.artifact-prefix }}
       baseBranch: ${{ needs.prepare.outputs.baseBranch }}
       mergedSha: ${{ needs.prepare.outputs.mergedSha }}
 
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 6d23e1dde9b7..b5d0ada43b9d 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -7,6 +7,10 @@ on:
   pull_request_target:
     types: [ready_for_review]
   workflow_call:
+    inputs:
+      artifact-prefix:
+        required: true
+        type: string
     secrets:
       OWNER_APP_PRIVATE_KEY:
         required: true
@@ -91,6 +95,8 @@ jobs:
       - name: Wait for comparison to be done
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         id: eval
+        env:
+          ARTIFACT: ${{ inputs.artifact-prefix }}comparison
         with:
           script: |
             const run_id = (await github.rest.actions.listWorkflowRuns({
@@ -111,7 +117,7 @@ jobs:
                 owner: context.repo.owner,
                 repo: context.repo.repo,
                 run_id,
-                name: 'comparison'
+                name: process.env.ARTIFACT,
               })
               if (result.data.total_count > 0) return
               await new Promise(resolve => setTimeout(resolve, 5000))
@@ -128,7 +134,7 @@ jobs:
         with:
           run-id: ${{ steps.eval.outputs.run-id }}
           github-token: ${{ github.token }}
-          pattern: comparison
+          pattern: ${{ inputs.artifact-prefix }}comparison
           path: comparison
           merge-multiple: true
 
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 67b416a6dfb2..4cac4b3f0bb6 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -79,6 +79,7 @@ jobs:
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
     with:
+      artifact-prefix: mg-
       mergedSha: ${{ needs.prepare.outputs.mergedSha }}
       targetSha: ${{ needs.prepare.outputs.targetSha }}
 
@@ -95,3 +96,5 @@ jobs:
     secrets:
       CACHIX_AUTH_TOKEN: ${{ secrets.CACHIX_AUTH_TOKEN }}
       NIXPKGS_CI_APP_PRIVATE_KEY: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
+    with:
+      artifact-prefix: pr-

From c316b3deabce78783df6e382d1fef08ba739b4c4 Mon Sep 17 00:00:00 2001
From: Slava Gorbunov <slava@fizlesh.org.ru>
Date: Thu, 30 Oct 2025 14:18:34 +0300
Subject: [PATCH 4156/6226] Restrict to ghc < 9.12

---
 pkgs/development/compilers/ghc/common-hadrian.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index 1097692029db..4bd05012e7f9 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -859,7 +859,7 @@ stdenv.mkDerivation (
       ghc-settings-edit "$settingsFile" \
       "windres command" "${toolPath "windres" installCC}"
     ''
-    + lib.optionalString stdenv.targetPlatform.isGhcjs ''
+    + lib.optionalString (stdenv.targetPlatform.isGhcjs && lib.versionOlder version "9.12") ''
       ghc-settings-edit "$settingsFile" \
         "JavaScript CPP command" "${toolPath "cc" installCC}"
       ghc-settings-edit "$settingsFile" \

From 38323f62f04570f48732bf2261d79c40a2df98cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 11:33:51 +0000
Subject: [PATCH 4157/6226] kazumi: 1.8.6 -> 1.8.7

---
 pkgs/by-name/ka/kazumi/package.nix       | 4 ++--
 pkgs/by-name/ka/kazumi/pubspec.lock.json | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix
index 0d62a00e6a0e..633649f389cc 100644
--- a/pkgs/by-name/ka/kazumi/package.nix
+++ b/pkgs/by-name/ka/kazumi/package.nix
@@ -17,13 +17,13 @@
 }:
 
 let
-  version = "1.8.6";
+  version = "1.8.7";
 
   src = fetchFromGitHub {
     owner = "Predidit";
     repo = "Kazumi";
     tag = version;
-    hash = "sha256-/CtWN9E9O0PS9uzRfywO3QECkZvS8qy0CJfb3oellw4=";
+    hash = "sha256-pt5mM6dCI0v+WExs7oExSGhDKj8yJ9Dpjk5NfCvr20I=";
   };
 in
 flutter335.buildFlutterApplication {
diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json
index b3d0bf23f777..8ef0d9c140e2 100644
--- a/pkgs/by-name/ka/kazumi/pubspec.lock.json
+++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json
@@ -2223,6 +2223,6 @@
   },
   "sdks": {
     "dart": ">=3.8.0 <4.0.0",
-    "flutter": ">=3.35.6"
+    "flutter": ">=3.35.7"
   }
 }

From 5516393ce39a2ba847def97dc7bf23dcb27cf014 Mon Sep 17 00:00:00 2001
From: tye-exe <tye@mailbox.org>
Date: Mon, 27 Oct 2025 16:23:35 +0000
Subject: [PATCH 4158/6226] minhtml: 0.16.4 -> 0.18.1

---
 pkgs/by-name/mi/minhtml/Cargo.lock  | 2063 ---------------------------
 pkgs/by-name/mi/minhtml/package.nix |   33 +-
 2 files changed, 9 insertions(+), 2087 deletions(-)
 delete mode 100644 pkgs/by-name/mi/minhtml/Cargo.lock

diff --git a/pkgs/by-name/mi/minhtml/Cargo.lock b/pkgs/by-name/mi/minhtml/Cargo.lock
deleted file mode 100644
index cef443b0778b..000000000000
--- a/pkgs/by-name/mi/minhtml/Cargo.lock
+++ /dev/null
@@ -1,2063 +0,0 @@
-# This file is automatically @generated by Cargo.
-# It is not intended for manual editing.
-version = 4
-
-[[package]]
-name = "addr2line"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler2"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
-
-[[package]]
-name = "ahash"
-version = "0.7.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
-dependencies = [
- "getrandom 0.2.16",
- "once_cell",
- "version_check",
-]
-
-[[package]]
-name = "ahash"
-version = "0.8.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
-dependencies = [
- "cfg-if 1.0.1",
- "getrandom 0.3.3",
- "once_cell",
- "version_check",
- "zerocopy",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "0.7.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc936419f96fa211c1b9166887b38e5e40b19958e5b895be7c1f93adec7071ac"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "1.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
-[[package]]
-name = "ascii"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e"
-
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi",
- "libc",
- "winapi",
-]
-
-[[package]]
-name = "autocfg"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
-
-[[package]]
-name = "backtrace"
-version = "0.3.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
-dependencies = [
- "addr2line",
- "cfg-if 1.0.1",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "base64-simd"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "781dd20c3aff0bd194fe7d2a977dd92f21c173891f3a03b677359e5fa457e5d5"
-dependencies = [
- "simd-abstraction",
-]
-
-[[package]]
-name = "bindgen"
-version = "0.69.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271383c67ccabffb7381723dea0672a673f292304fcb45c01cc648c7a8d58088"
-dependencies = [
- "bitflags 2.9.1",
- "cexpr",
- "clang-sys",
- "itertools 0.12.1",
- "lazy_static",
- "lazycell",
- "proc-macro2",
- "quote",
- "regex",
- "rustc-hash 1.1.0",
- "shlex",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "bitflags"
-version = "1.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
-
-[[package]]
-name = "bitflags"
-version = "2.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
-
-[[package]]
-name = "bitvec"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
-dependencies = [
- "funty",
- "radium",
- "tap",
- "wyz",
-]
-
-[[package]]
-name = "bumpalo"
-version = "3.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee"
-
-[[package]]
-name = "bytecheck"
-version = "0.6.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2"
-dependencies = [
- "bytecheck_derive",
- "ptr_meta",
- "simdutf8",
-]
-
-[[package]]
-name = "bytecheck_derive"
-version = "0.6.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
-[[package]]
-name = "bytes"
-version = "1.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
-
-[[package]]
-name = "c14n"
-version = "0.0.1"
-dependencies = [
- "minify-html",
-]
-
-[[package]]
-name = "cc"
-version = "1.2.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d487aa071b5f64da6f19a3e848e3578944b726ee5a4854b82172f02aa876bfdc"
-dependencies = [
- "shlex",
-]
-
-[[package]]
-name = "cesu8"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
-
-[[package]]
-name = "cexpr"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
-dependencies = [
- "nom",
-]
-
-[[package]]
-name = "cfg-if"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
-
-[[package]]
-name = "cfg-if"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
-
-[[package]]
-name = "charlines"
-version = "0.0.1"
-
-[[package]]
-name = "clang-sys"
-version = "1.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
-dependencies = [
- "glob",
- "libc",
- "libloading 0.8.8",
-]
-
-[[package]]
-name = "clap"
-version = "2.34.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c"
-dependencies = [
- "ansi_term",
- "atty",
- "bitflags 1.3.2",
- "strsim",
- "textwrap",
- "unicode-width",
- "vec_map",
-]
-
-[[package]]
-name = "combine"
-version = "3.8.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da3da6baa321ec19e1cc41d31bf599f00c783d0517095cdaf0332e3fe8d20680"
-dependencies = [
- "ascii",
- "byteorder",
- "either",
- "memchr",
- "unreachable",
-]
-
-[[package]]
-name = "console_error_panic_hook"
-version = "0.1.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc"
-dependencies = [
- "cfg-if 1.0.1",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "const-str"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21077772762a1002bb421c3af42ac1725fa56066bfc53d9a55bb79905df2aaf3"
-dependencies = [
- "const-str-proc-macro",
-]
-
-[[package]]
-name = "const-str-proc-macro"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e1e0fdd2e5d3041e530e1b21158aeeef8b5d0e306bc5c1e3d6cf0930d10e25a"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "convert_case"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "crossbeam-deque"
-version = "0.8.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
-dependencies = [
- "crossbeam-epoch",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-epoch"
-version = "0.9.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
-dependencies = [
- "crossbeam-utils",
-]
-
-[[package]]
-name = "crossbeam-utils"
-version = "0.8.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
-
-[[package]]
-name = "cssparser"
-version = "0.33.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9be934d936a0fbed5bcdc01042b770de1398bf79d0e192f49fa7faea0e99281e"
-dependencies = [
- "cssparser-macros",
- "dtoa-short",
- "itoa",
- "phf",
- "smallvec",
-]
-
-[[package]]
-name = "cssparser-color"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "556c099a61d85989d7af52b692e35a8d68a57e7df8c6d07563dc0778b3960c9f"
-dependencies = [
- "cssparser",
-]
-
-[[package]]
-name = "cssparser-macros"
-version = "0.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331"
-dependencies = [
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "dashmap"
-version = "5.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
-dependencies = [
- "cfg-if 1.0.1",
- "hashbrown 0.14.5",
- "lock_api",
- "once_cell",
- "parking_lot_core",
-]
-
-[[package]]
-name = "data-encoding"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
-
-[[package]]
-name = "data-url"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a30bfce702bcfa94e906ef82421f2c0e61c076ad76030c16ee5d2e9a32fe193"
-dependencies = [
- "matches",
-]
-
-[[package]]
-name = "dtoa"
-version = "1.0.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6add3b8cff394282be81f3fc1a0605db594ed69890078ca6e2cab1c408bcf04"
-
-[[package]]
-name = "dtoa-short"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd1511a7b6a56299bd043a9c167a6d2bfb37bf84a6dfceaba651168adfb43c87"
-dependencies = [
- "dtoa",
-]
-
-[[package]]
-name = "either"
-version = "1.15.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
-
-[[package]]
-name = "equivalent"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
-
-[[package]]
-name = "error-chain"
-version = "0.12.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc"
-dependencies = [
- "backtrace",
- "version_check",
-]
-
-[[package]]
-name = "funty"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
-
-[[package]]
-name = "getrandom"
-version = "0.2.16"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
-dependencies = [
- "cfg-if 1.0.1",
- "js-sys",
- "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "getrandom"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
-dependencies = [
- "cfg-if 1.0.1",
- "libc",
- "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
-]
-
-[[package]]
-name = "gimli"
-version = "0.31.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
-
-[[package]]
-name = "glob"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
-
-[[package]]
-name = "hashbrown"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
-dependencies = [
- "ahash 0.7.8",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
-dependencies = [
- "ahash 0.8.12",
- "bumpalo",
-]
-
-[[package]]
-name = "hashbrown"
-version = "0.14.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
-
-[[package]]
-name = "hashbrown"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
-
-[[package]]
-name = "heck"
-version = "0.3.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c"
-dependencies = [
- "unicode-segmentation",
-]
-
-[[package]]
-name = "heck"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
-
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
-[[package]]
-name = "index"
-version = "0.16.4"
-dependencies = [
- "console_error_panic_hook",
- "getrandom 0.2.16",
- "js-sys",
- "minify-html",
- "wasm-bindgen",
- "wasm-bindgen-test",
- "wee_alloc",
-]
-
-[[package]]
-name = "indexmap"
-version = "2.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cea70ddb795996207ad57735b50c5982d8844f38ba9ee5f1aedcfb708a2aa11e"
-dependencies = [
- "equivalent",
- "hashbrown 0.15.4",
- "serde",
-]
-
-[[package]]
-name = "indoc"
-version = "2.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
-
-[[package]]
-name = "itertools"
-version = "0.10.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itertools"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
-dependencies = [
- "either",
-]
-
-[[package]]
-name = "itoa"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
-
-[[package]]
-name = "jni"
-version = "0.14.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1981310da491a4f0f815238097d0d43d8072732b5ae5f8bd0d8eadf5bf245402"
-dependencies = [
- "cesu8",
- "combine",
- "error-chain",
- "jni-sys",
- "log",
- "walkdir",
-]
-
-[[package]]
-name = "jni-sys"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
-
-[[package]]
-name = "js-sys"
-version = "0.3.77"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
-dependencies = [
- "once_cell",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "lazy_static"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-
-[[package]]
-name = "lazycell"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
-
-[[package]]
-name = "libc"
-version = "0.2.174"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
-
-[[package]]
-name = "libloading"
-version = "0.6.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "351a32417a12d5f7e82c368a66781e307834dae04c6ce0cd4456d52989229883"
-dependencies = [
- "cfg-if 1.0.1",
- "winapi",
-]
-
-[[package]]
-name = "libloading"
-version = "0.8.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07033963ba89ebaf1584d767badaa2e8fcec21aedea6b8c0346d487d49c28667"
-dependencies = [
- "cfg-if 1.0.1",
- "windows-targets 0.53.2",
-]
-
-[[package]]
-name = "lightningcss"
-version = "1.0.0-alpha.66"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a73ffa17de66534e4b527232f44aa0a89fad22c4f4e0735f9be35494f058e54"
-dependencies = [
- "ahash 0.8.12",
- "bitflags 2.9.1",
- "const-str",
- "cssparser",
- "cssparser-color",
- "dashmap",
- "data-encoding",
- "getrandom 0.2.16",
- "indexmap",
- "itertools 0.10.5",
- "lazy_static",
- "lightningcss-derive",
- "parcel_selectors",
- "parcel_sourcemap",
- "paste",
- "pathdiff",
- "rayon",
- "serde",
- "smallvec",
-]
-
-[[package]]
-name = "lightningcss-derive"
-version = "1.0.0-alpha.43"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c12744d1279367caed41739ef094c325d53fb0ffcd4f9b84a368796f870252"
-dependencies = [
- "convert_case",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "lock_api"
-version = "0.4.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
-dependencies = [
- "autocfg",
- "scopeguard",
-]
-
-[[package]]
-name = "log"
-version = "0.4.27"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
-
-[[package]]
-name = "magnus"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1597ef40aa8c36be098249e82c9a20cf7199278ac1c1a1a995eeead6a184479"
-dependencies = [
- "magnus-macros",
- "rb-sys",
- "rb-sys-env",
- "seq-macro",
-]
-
-[[package]]
-name = "magnus-macros"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5968c820e2960565f647819f5928a42d6e874551cab9d88d75e3e0660d7f71e3"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "matches"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
-
-[[package]]
-name = "memchr"
-version = "2.7.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
-
-[[package]]
-name = "memoffset"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
-dependencies = [
- "autocfg",
-]
-
-[[package]]
-name = "memory_units"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8452105ba047068f40ff7093dd1d9da90898e63dd61736462e9cdda6a90ad3c3"
-
-[[package]]
-name = "minhtml"
-version = "0.16.4"
-dependencies = [
- "minify-html",
- "rayon",
- "structopt",
-]
-
-[[package]]
-name = "minicov"
-version = "0.3.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f27fe9f1cc3c22e1687f9446c2083c4c5fc7f0bcf1c7a86bdbded14985895b4b"
-dependencies = [
- "cc",
- "walkdir",
-]
-
-[[package]]
-name = "minify-html"
-version = "0.16.4"
-dependencies = [
- "ahash 0.8.12",
- "aho-corasick 0.7.20",
- "lightningcss",
- "memchr",
- "minify-html-common",
- "minify-js",
- "once_cell",
-]
-
-[[package]]
-name = "minify-html-bench"
-version = "0.0.1"
-dependencies = [
- "minify-html",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "minify-html-common"
-version = "0.0.2"
-dependencies = [
- "ahash 0.8.12",
- "aho-corasick 0.7.20",
- "itertools 0.12.1",
- "memchr",
- "once_cell",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "minify-html-java"
-version = "0.16.4"
-dependencies = [
- "jni",
- "minify-html",
-]
-
-[[package]]
-name = "minify-html-nodejs"
-version = "0.16.4"
-dependencies = [
- "minify-html",
- "neon",
-]
-
-[[package]]
-name = "minify-html-onepass"
-version = "0.16.4"
-dependencies = [
- "ahash 0.8.12",
- "aho-corasick 0.7.20",
- "lightningcss",
- "memchr",
- "minify-html-common",
- "minify-js",
- "once_cell",
-]
-
-[[package]]
-name = "minify-html-onepass-bench"
-version = "0.0.1"
-dependencies = [
- "minify-html-onepass",
- "serde",
- "serde_json",
-]
-
-[[package]]
-name = "minify-html-onepass-python"
-version = "0.16.4"
-dependencies = [
- "minify-html-onepass",
- "pyo3",
-]
-
-[[package]]
-name = "minify-html-python"
-version = "0.16.4"
-dependencies = [
- "minify-html",
- "pyo3",
-]
-
-[[package]]
-name = "minify-html-ruby"
-version = "0.16.4"
-dependencies = [
- "magnus",
- "minify-html",
-]
-
-[[package]]
-name = "minify-js"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1fa5546ee8bd66024113e506cabe4230e76635a094c06ea2051b66021dda92e"
-dependencies = [
- "aho-corasick 0.7.20",
- "lazy_static",
- "parse-js",
-]
-
-[[package]]
-name = "minimal-lexical"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
-
-[[package]]
-name = "miniz_oxide"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
-dependencies = [
- "adler2",
-]
-
-[[package]]
-name = "neon"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28e15415261d880aed48122e917a45e87bb82cf0260bb6db48bbab44b7464373"
-dependencies = [
- "neon-build",
- "neon-macros",
- "neon-runtime",
- "semver",
- "smallvec",
-]
-
-[[package]]
-name = "neon-build"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bac98a702e71804af3dacfde41edde4a16076a7bbe889ae61e56e18c5b1c811"
-
-[[package]]
-name = "neon-macros"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b7288eac8b54af7913c60e0eb0e2a7683020dffa342ab3fd15e28f035ba897cf"
-dependencies = [
- "quote",
- "syn 1.0.109",
- "syn-mid",
-]
-
-[[package]]
-name = "neon-runtime"
-version = "0.10.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4676720fa8bb32c64c3d9f49c47a47289239ec46b4bdb66d0913cc512cb0daca"
-dependencies = [
- "cfg-if 1.0.1",
- "libloading 0.6.7",
- "smallvec",
-]
-
-[[package]]
-name = "nom"
-version = "7.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
-dependencies = [
- "memchr",
- "minimal-lexical",
-]
-
-[[package]]
-name = "object"
-version = "0.36.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "once_cell"
-version = "1.21.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
-
-[[package]]
-name = "outref"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f222829ae9293e33a9f5e9f440c6760a3d450a64affe1846486b140db81c1f4"
-
-[[package]]
-name = "parcel_selectors"
-version = "0.28.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "54fd03f1ad26cb6b3ec1b7414fa78a3bd639e7dbb421b1a60513c96ce886a196"
-dependencies = [
- "bitflags 2.9.1",
- "cssparser",
- "log",
- "phf",
- "phf_codegen",
- "precomputed-hash",
- "rustc-hash 2.1.1",
- "smallvec",
-]
-
-[[package]]
-name = "parcel_sourcemap"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "485b74d7218068b2b7c0e3ff12fbc61ae11d57cb5d8224f525bd304c6be05bbb"
-dependencies = [
- "base64-simd",
- "data-url",
- "rkyv",
- "serde",
- "serde_json",
- "vlq",
-]
-
-[[package]]
-name = "parking_lot_core"
-version = "0.9.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
-dependencies = [
- "cfg-if 1.0.1",
- "libc",
- "redox_syscall",
- "smallvec",
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "parse-js"
-version = "0.20.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2742b5e32dcb5930447ed9f9e401a7dfd883867fc079c4fac44ae8ba3593710e"
-dependencies = [
- "aho-corasick 0.7.20",
- "bumpalo",
- "hashbrown 0.13.2",
- "lazy_static",
- "memchr",
-]
-
-[[package]]
-name = "paste"
-version = "1.0.15"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
-
-[[package]]
-name = "pathdiff"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3"
-
-[[package]]
-name = "phf"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
-dependencies = [
- "phf_macros",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_codegen"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aef8048c789fa5e851558d709946d6d79a8ff88c0440c587967f8e94bfb1216a"
-dependencies = [
- "phf_generator",
- "phf_shared",
-]
-
-[[package]]
-name = "phf_generator"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c80231409c20246a13fddb31776fb942c38553c51e871f8cbd687a4cfb5843d"
-dependencies = [
- "phf_shared",
- "rand",
-]
-
-[[package]]
-name = "phf_macros"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84ac04429c13a7ff43785d75ad27569f2951ce0ffd30a3321230db2fc727216"
-dependencies = [
- "phf_generator",
- "phf_shared",
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "phf_shared"
-version = "0.11.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
-dependencies = [
- "siphasher",
-]
-
-[[package]]
-name = "portable-atomic"
-version = "1.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
-
-[[package]]
-name = "precomputed-hash"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
-
-[[package]]
-name = "proc-macro-error"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
-dependencies = [
- "proc-macro-error-attr",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro-error-attr"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
-dependencies = [
- "proc-macro2",
- "quote",
- "version_check",
-]
-
-[[package]]
-name = "proc-macro2"
-version = "1.0.95"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "ptr_meta"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1"
-dependencies = [
- "ptr_meta_derive",
-]
-
-[[package]]
-name = "ptr_meta_derive"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "pyo3"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5203598f366b11a02b13aa20cab591229ff0a89fd121a308a5df751d5fc9219"
-dependencies = [
- "cfg-if 1.0.1",
- "indoc",
- "libc",
- "memoffset",
- "once_cell",
- "portable-atomic",
- "pyo3-build-config",
- "pyo3-ffi",
- "pyo3-macros",
- "unindent",
-]
-
-[[package]]
-name = "pyo3-build-config"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99636d423fa2ca130fa5acde3059308006d46f98caac629418e53f7ebb1e9999"
-dependencies = [
- "once_cell",
- "python3-dll-a",
- "target-lexicon",
-]
-
-[[package]]
-name = "pyo3-ffi"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78f9cf92ba9c409279bc3305b5409d90db2d2c22392d443a87df3a1adad59e33"
-dependencies = [
- "libc",
- "pyo3-build-config",
-]
-
-[[package]]
-name = "pyo3-macros"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b999cb1a6ce21f9a6b147dcf1be9ffedf02e0043aec74dc390f3007047cecd9"
-dependencies = [
- "proc-macro2",
- "pyo3-macros-backend",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "pyo3-macros-backend"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "822ece1c7e1012745607d5cf0bcb2874769f0f7cb34c4cde03b9358eb9ef911a"
-dependencies = [
- "heck 0.5.0",
- "proc-macro2",
- "pyo3-build-config",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "python3-dll-a"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d381ef313ae70b4da5f95f8a4de773c6aa5cd28f73adec4b4a31df70b66780d8"
-dependencies = [
- "cc",
-]
-
-[[package]]
-name = "quote"
-version = "1.0.40"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
-dependencies = [
- "proc-macro2",
-]
-
-[[package]]
-name = "r-efi"
-version = "5.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
-
-[[package]]
-name = "radium"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
-
-[[package]]
-name = "rand"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
-dependencies = [
- "rand_core",
-]
-
-[[package]]
-name = "rand_core"
-version = "0.6.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
-
-[[package]]
-name = "rayon"
-version = "1.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
-dependencies = [
- "either",
- "rayon-core",
-]
-
-[[package]]
-name = "rayon-core"
-version = "1.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
-dependencies = [
- "crossbeam-deque",
- "crossbeam-utils",
-]
-
-[[package]]
-name = "rb-sys"
-version = "0.9.116"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7059846f68396df83155779c75336ca24567741cb95256e6308c9fcc370e8dad"
-dependencies = [
- "rb-sys-build",
-]
-
-[[package]]
-name = "rb-sys-build"
-version = "0.9.116"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac217510df41b9ffc041573e68d7a02aaff770c49943c7494441c4b224b0ecd0"
-dependencies = [
- "bindgen",
- "lazy_static",
- "proc-macro2",
- "quote",
- "regex",
- "shell-words",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "rb-sys-env"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a35802679f07360454b418a5d1735c89716bde01d35b1560fc953c1415a0b3bb"
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
-dependencies = [
- "bitflags 2.9.1",
-]
-
-[[package]]
-name = "regex"
-version = "1.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
-dependencies = [
- "aho-corasick 1.1.3",
- "memchr",
- "regex-automata",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-automata"
-version = "0.4.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
-dependencies = [
- "aho-corasick 1.1.3",
- "memchr",
- "regex-syntax",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.8.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
-
-[[package]]
-name = "rend"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c"
-dependencies = [
- "bytecheck",
-]
-
-[[package]]
-name = "rkyv"
-version = "0.7.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
-dependencies = [
- "bitvec",
- "bytecheck",
- "bytes",
- "hashbrown 0.12.3",
- "ptr_meta",
- "rend",
- "rkyv_derive",
- "seahash",
- "tinyvec",
- "uuid",
-]
-
-[[package]]
-name = "rkyv_derive"
-version = "0.7.45"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "rustc-demangle"
-version = "0.1.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
-
-[[package]]
-name = "rustc-hash"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-
-[[package]]
-name = "rustc-hash"
-version = "2.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
-
-[[package]]
-name = "rustversion"
-version = "1.0.21"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
-
-[[package]]
-name = "ryu"
-version = "1.0.20"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
-
-[[package]]
-name = "same-file"
-version = "1.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "scopeguard"
-version = "1.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
-
-[[package]]
-name = "seahash"
-version = "4.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
-
-[[package]]
-name = "semver"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
-dependencies = [
- "semver-parser",
-]
-
-[[package]]
-name = "semver-parser"
-version = "0.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
-
-[[package]]
-name = "seq-macro"
-version = "0.3.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1bc711410fbe7399f390ca1c3b60ad0f53f80e95c5eb935e52268a0e2cd49acc"
-
-[[package]]
-name = "serde"
-version = "1.0.219"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
-dependencies = [
- "serde_derive",
-]
-
-[[package]]
-name = "serde_derive"
-version = "1.0.219"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "serde_json"
-version = "1.0.140"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
-dependencies = [
- "itoa",
- "memchr",
- "ryu",
- "serde",
-]
-
-[[package]]
-name = "shell-words"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24188a676b6ae68c3b2cb3a01be17fbf7240ce009799bb56d5b1409051e78fde"
-
-[[package]]
-name = "shlex"
-version = "1.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
-
-[[package]]
-name = "simd-abstraction"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cadb29c57caadc51ff8346233b5cec1d240b68ce55cf1afc764818791876987"
-dependencies = [
- "outref",
-]
-
-[[package]]
-name = "simdutf8"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
-
-[[package]]
-name = "siphasher"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
-
-[[package]]
-name = "smallvec"
-version = "1.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
-
-[[package]]
-name = "strsim"
-version = "0.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a"
-
-[[package]]
-name = "structopt"
-version = "0.3.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10"
-dependencies = [
- "clap",
- "lazy_static",
- "structopt-derive",
-]
-
-[[package]]
-name = "structopt-derive"
-version = "0.4.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0"
-dependencies = [
- "heck 0.3.3",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "syn"
-version = "1.0.109"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn"
-version = "2.0.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
-dependencies = [
- "proc-macro2",
- "quote",
- "unicode-ident",
-]
-
-[[package]]
-name = "syn-mid"
-version = "0.5.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fea305d57546cc8cd04feb14b62ec84bf17f50e3f7b12560d7bfa9265f39d9ed"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "tap"
-version = "1.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
-
-[[package]]
-name = "target-lexicon"
-version = "0.13.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"
-
-[[package]]
-name = "textwrap"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
-dependencies = [
- "unicode-width",
-]
-
-[[package]]
-name = "tinyvec"
-version = "1.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
-dependencies = [
- "tinyvec_macros",
-]
-
-[[package]]
-name = "tinyvec_macros"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
-
-[[package]]
-name = "unicode-ident"
-version = "1.0.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
-
-[[package]]
-name = "unicode-segmentation"
-version = "1.12.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f6ccf251212114b54433ec949fd6a7841275f9ada20dddd2f29e9ceea4501493"
-
-[[package]]
-name = "unicode-width"
-version = "0.1.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
-
-[[package]]
-name = "unindent"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
-
-[[package]]
-name = "unreachable"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
-dependencies = [
- "void",
-]
-
-[[package]]
-name = "uuid"
-version = "1.17.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cf4199d1e5d15ddd86a694e4d0dffa9c323ce759fea589f00fef9d81cc1931d"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "vec_map"
-version = "0.8.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191"
-
-[[package]]
-name = "version_check"
-version = "0.9.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
-
-[[package]]
-name = "vlq"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65dd7eed29412da847b0f78bcec0ac98588165988a8cfe41d4ea1d429f8ccfff"
-
-[[package]]
-name = "void"
-version = "1.0.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
-
-[[package]]
-name = "walkdir"
-version = "2.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
-dependencies = [
- "same-file",
- "winapi-util",
-]
-
-[[package]]
-name = "wasi"
-version = "0.11.1+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
-
-[[package]]
-name = "wasi"
-version = "0.14.2+wasi-0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
-dependencies = [
- "wit-bindgen-rt",
-]
-
-[[package]]
-name = "wasm-bindgen"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
-dependencies = [
- "cfg-if 1.0.1",
- "once_cell",
- "rustversion",
- "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn 2.0.104",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-futures"
-version = "0.4.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
-dependencies = [
- "cfg-if 1.0.1",
- "js-sys",
- "once_cell",
- "wasm-bindgen",
- "web-sys",
-]
-
-[[package]]
-name = "wasm-bindgen-macro"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
-dependencies = [
- "quote",
- "wasm-bindgen-macro-support",
-]
-
-[[package]]
-name = "wasm-bindgen-macro-support"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
- "wasm-bindgen-backend",
- "wasm-bindgen-shared",
-]
-
-[[package]]
-name = "wasm-bindgen-shared"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
-dependencies = [
- "unicode-ident",
-]
-
-[[package]]
-name = "wasm-bindgen-test"
-version = "0.3.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "66c8d5e33ca3b6d9fa3b4676d774c5778031d27a578c2b007f905acf816152c3"
-dependencies = [
- "js-sys",
- "minicov",
- "wasm-bindgen",
- "wasm-bindgen-futures",
- "wasm-bindgen-test-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-test-macro"
-version = "0.3.50"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17d5042cc5fa009658f9a7333ef24291b1291a25b6382dd68862a7f3b969f69b"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
-
-[[package]]
-name = "web-sys"
-version = "0.3.77"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
-dependencies = [
- "js-sys",
- "wasm-bindgen",
-]
-
-[[package]]
-name = "wee_alloc"
-version = "0.4.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbb3b5a6b2bb17cb6ad44a2e68a43e8d2722c997da10e928665c72ec6c0a0b8e"
-dependencies = [
- "cfg-if 0.1.10",
- "libc",
- "memory_units",
- "winapi",
-]
-
-[[package]]
-name = "winapi"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
-dependencies = [
- "winapi-i686-pc-windows-gnu",
- "winapi-x86_64-pc-windows-gnu",
-]
-
-[[package]]
-name = "winapi-i686-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
-
-[[package]]
-name = "winapi-util"
-version = "0.1.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
-dependencies = [
- "windows-sys",
-]
-
-[[package]]
-name = "winapi-x86_64-pc-windows-gnu"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-
-[[package]]
-name = "windows-sys"
-version = "0.59.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
-dependencies = [
- "windows-targets 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
-dependencies = [
- "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu 0.52.6",
- "windows_i686_gnullvm 0.52.6",
- "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc 0.52.6",
-]
-
-[[package]]
-name = "windows-targets"
-version = "0.53.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
-dependencies = [
- "windows_aarch64_gnullvm 0.53.0",
- "windows_aarch64_msvc 0.53.0",
- "windows_i686_gnu 0.53.0",
- "windows_i686_gnullvm 0.53.0",
- "windows_i686_msvc 0.53.0",
- "windows_x86_64_gnu 0.53.0",
- "windows_x86_64_gnullvm 0.53.0",
- "windows_x86_64_msvc 0.53.0",
-]
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
-
-[[package]]
-name = "windows_aarch64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
-
-[[package]]
-name = "windows_aarch64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
-
-[[package]]
-name = "windows_i686_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
-
-[[package]]
-name = "windows_i686_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
-
-[[package]]
-name = "windows_i686_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
-
-[[package]]
-name = "windows_x86_64_gnu"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
-
-[[package]]
-name = "windows_x86_64_gnullvm"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.52.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
-
-[[package]]
-name = "windows_x86_64_msvc"
-version = "0.53.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
-
-[[package]]
-name = "wit-bindgen-rt"
-version = "0.39.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-dependencies = [
- "bitflags 2.9.1",
-]
-
-[[package]]
-name = "wyz"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
-dependencies = [
- "tap",
-]
-
-[[package]]
-name = "zerocopy"
-version = "0.8.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
-dependencies = [
- "zerocopy-derive",
-]
-
-[[package]]
-name = "zerocopy-derive"
-version = "0.8.26"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.104",
-]
diff --git a/pkgs/by-name/mi/minhtml/package.nix b/pkgs/by-name/mi/minhtml/package.nix
index 02448af08a0c..3b2145b93548 100644
--- a/pkgs/by-name/mi/minhtml/package.nix
+++ b/pkgs/by-name/mi/minhtml/package.nix
@@ -1,36 +1,21 @@
 {
   lib,
-  fetchFromGitHub,
   rustPlatform,
+  fetchCrate,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "minhtml";
-  version = "0.16.4";
+  version = "0.18.1";
 
-  src = fetchFromGitHub {
-    owner = "wilsonzlin";
-    repo = "minify-html";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-SoCSHhgTLfztSfvzxxpZn/nQpXbKlkE4iiP0YZ0MVjY=";
+  # Upstream does not include a lock file.
+  # See https://github.com/wilsonzlin/minify-html/issues/255
+  src = fetchCrate {
+    pname = "minhtml";
+    inherit (finalAttrs) version;
+    hash = "sha256-yrZueueww9rQXaHCeBO6d2pO58SZ8yz2a9Ia5dp7lBY=";
   };
 
-  # Upstream does not include a lock file so one has to be patched in.
-  cargoLock = {
-    lockFile = ./Cargo.lock;
-  };
-  postPatch = ''
-    cp ${./Cargo.lock} Cargo.lock
-  '';
-
-  # Ensures that only the correct package gets built, as upstream contains multiple.
-  cargoBuildFlags = [
-    "-p"
-    "minhtml"
-  ];
-  cargoTestFlags = [
-    "-p"
-    "minhtml"
-  ];
+  cargoHash = "sha256-TFlDbVL8JARwV/xSQ+Cbwguqnr11nw24/L0MbHJazas=";
 
   meta = {
     description = "Minifier for HTML, JavaScript, and CSS";

From 089a29e00f3462249d5db5da297eec133e82be4f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 30 Oct 2025 13:19:59 +0100
Subject: [PATCH 4159/6226] workflows/pr: retry for 422 in prepare

I recently tried to increase retries to 3 to fix the 422 "Sorry, this
diff is taking too long to generate" errors that appear frequently as of
late. Little did I know that, this specific status code would not be
retried by default. Thus, try again.
---
 .github/workflows/pr.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
index 1ba548a4c44e..56017f0b4943 100644
--- a/.github/workflows/pr.yml
+++ b/.github/workflows/pr.yml
@@ -42,6 +42,11 @@ jobs:
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           retries: 3
+          # The default for this includes code 422, which happens regularly for us when comparing commits:
+          #   422 - Server Error: Sorry, this diff is taking too long to generate.
+          # Listing all other values from here to effectively remove 422:
+          #   https://github.com/octokit/plugin-retry.js/blob/9a2443746c350b3beedec35cf26e197ea318a261/src/index.ts#L14
+          retry-exempt-status-codes: 400,401,403,404
           script: |
             require('./ci/github-script/prepare.js')({
               github,

From cefbc62931a8cbcfdc0ee618f3cca25d35beb22b Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 30 Oct 2025 09:06:44 -0400
Subject: [PATCH 4160/6226] mimir: 2.17.1 -> 2.17.2

https://github.com/grafana/mimir/releases/tag/mimir-2.17.2
---
 pkgs/by-name/mi/mimir/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix
index 1cd1f76ddc59..6dae638cf3d0 100644
--- a/pkgs/by-name/mi/mimir/package.nix
+++ b/pkgs/by-name/mi/mimir/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGoModule rec {
   pname = "mimir";
-  version = "2.17.1";
+  version = "2.17.2";
 
   src = fetchFromGitHub {
     rev = "mimir-${version}";
     owner = "grafana";
     repo = "mimir";
-    hash = "sha256-Ob0l+C5LnFL1yl76/cdSX83bHEcamPlb9Sau8rMO2sM=";
+    hash = "sha256-aESZvcKZQwT563cGQQcrMTXEPo55niS8cQrGFFrLfoU=";
   };
 
   vendorHash = null;

From 13bfa7557e925536e49be5dbc25610f9e9aafd4e Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Thu, 30 Oct 2025 09:10:33 -0400
Subject: [PATCH 4161/6226] crush: 0.12.1 -> 0.13.5

https://github.com/charmbracelet/crush/releases/tag/v0.13.0
https://github.com/charmbracelet/crush/releases/tag/v0.13.1
https://github.com/charmbracelet/crush/releases/tag/v0.13.2
https://github.com/charmbracelet/crush/releases/tag/v0.13.3
https://github.com/charmbracelet/crush/releases/tag/v0.13.4
https://github.com/charmbracelet/crush/releases/tag/v0.13.5
---
 pkgs/by-name/cr/crush/package.nix | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix
index 0d4ec7a3bd24..61bf85bc841f 100644
--- a/pkgs/by-name/cr/crush/package.nix
+++ b/pkgs/by-name/cr/crush/package.nix
@@ -1,32 +1,24 @@
 {
   lib,
-  buildGo125Module,
+  buildGoModule,
   fetchFromGitHub,
   nix-update-script,
   writableTmpDirAsHomeHook,
   versionCheckHook,
 }:
 
-buildGo125Module (finalAttrs: {
+buildGoModule (finalAttrs: {
   pname = "crush";
-  version = "0.12.1";
+  version = "0.13.5";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "crush";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-uESS76cPJ/sYGbsTpaUKlF8g0y2+LYbF4zd7dAoKWWU=";
+    hash = "sha256-MKX26HptDwlwWvmP+9FDlFJzly5xKA0mNVsbeHi1zhg=";
   };
 
-  vendorHash = "sha256-lqoAPp8EW2tW+QjwCuBgxZDbKT3XMvP3qwx/yES1mx4=";
-
-  # rename TestMain to prevent it from running, as it panics in the sandbox.
-  postPatch = ''
-    substituteInPlace internal/llm/provider/openai_test.go \
-      --replace-fail \
-        "func TestMain" \
-        "func DisabledTestMain"
-  '';
+  vendorHash = "sha256-OiNmZKg+NN7Aoeao8L72Dvgz0moeaZGQ7KVJdvuWagY=";
 
   ldflags = [
     "-s"
@@ -37,6 +29,7 @@ buildGo125Module (finalAttrs: {
     let
       # these tests fail in the sandbox
       skippedTests = [
+        "TestCoderAgent"
         "TestOpenAIClientStreamChoices"
         "TestGrepWithIgnoreFiles"
         "TestSearchImplementations"

From f88cf0d931a1fa0dcd6a6ee963820a076a46ef3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 10:43:54 +0000
Subject: [PATCH 4162/6226] python3Packages.pycrdt: 0.12.40 -> 0.12.42

---
 .../python-modules/pycrdt/Cargo.lock          | 95 ++++++++-----------
 .../python-modules/pycrdt/default.nix         |  4 +-
 2 files changed, 41 insertions(+), 58 deletions(-)

diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock
index d73808d037f5..481c87c59d33 100644
--- a/pkgs/development/python-modules/pycrdt/Cargo.lock
+++ b/pkgs/development/python-modules/pycrdt/Cargo.lock
@@ -38,9 +38,9 @@ checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
 [[package]]
 name = "bitflags"
-version = "2.9.4"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2261d10cca569e4643e526d8dc2e62e433cc8aba21ab764233731f8d369bf394"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 
 [[package]]
 name = "bumpalo"
@@ -50,9 +50,9 @@ checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
 [[package]]
 name = "cfg-if"
-version = "1.0.3"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "concurrent-queue"
@@ -140,9 +140,12 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
 [[package]]
 name = "indoc"
-version = "2.0.6"
+version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
+checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
+dependencies = [
+ "rustversion",
+]
 
 [[package]]
 name = "itoa"
@@ -152,9 +155,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "js-sys"
-version = "0.3.81"
+version = "0.3.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec48937a97411dcb524a265206ccd4c90bb711fca92b2792c407f268825b9305"
+checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -162,9 +165,9 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.176"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
 name = "lock_api"
@@ -175,12 +178,6 @@ dependencies = [
  "scopeguard",
 ]
 
-[[package]]
-name = "log"
-version = "0.4.28"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
-
 [[package]]
 name = "memchr"
 version = "2.7.6"
@@ -235,16 +232,16 @@ checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.101"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pycrdt"
-version = "0.12.40"
+version = "0.12.42"
 dependencies = [
  "pyo3",
  "serde_json",
@@ -253,9 +250,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3"
-version = "0.26.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ba0117f4212101ee6544044dae45abe1083d30ce7b29c4b5cbdfa2354e07383"
+checksum = "37a6df7eab65fc7bee654a421404947e10a0f7085b6951bf2ea395f4659fb0cf"
 dependencies = [
  "indoc",
  "libc",
@@ -270,18 +267,18 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.26.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fc6ddaf24947d12a9aa31ac65431fb1b851b8f4365426e182901eabfb87df5f"
+checksum = "f77d387774f6f6eec64a004eac0ed525aab7fa1966d94b42f743797b3e395afb"
 dependencies = [
  "target-lexicon",
 ]
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.26.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "025474d3928738efb38ac36d4744a74a400c901c7596199e20e45d98eb194105"
+checksum = "2dd13844a4242793e02df3e2ec093f540d948299a6a77ea9ce7afd8623f542be"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -289,9 +286,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.26.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2e64eb489f22fe1c95911b77c44cc41e7c19f3082fc81cce90f657cdc42ffded"
+checksum = "eaf8f9f1108270b90d3676b8679586385430e5c0bb78bb5f043f95499c821a71"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -301,9 +298,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.26.0"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "100246c0ecf400b475341b8455a9213344569af29a3c841d29270e53102e0fcf"
+checksum = "70a3b2274450ba5288bc9b8c1b69ff569d1d61189d4bff38f8d22e03d17f932b"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -408,9 +405,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "syn"
-version = "2.0.106"
+version = "2.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -445,9 +442,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.19"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
 [[package]]
 name = "unindent"
@@ -463,9 +460,9 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.104"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c1da10c01ae9f1ae40cbfac0bac3b1e724b320abfcf52229f80b547c0d250e2d"
+checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
 dependencies = [
  "cfg-if",
  "once_cell",
@@ -474,25 +471,11 @@ dependencies = [
  "wasm-bindgen-shared",
 ]
 
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.104"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "671c9a5a66f49d8a47345ab942e2cb93c7d1d0339065d4f8139c486121b43b19"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn",
- "wasm-bindgen-shared",
-]
-
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.104"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ca60477e4c59f5f2986c50191cd972e3a50d8a95603bc9434501cf156a9a119"
+checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -500,22 +483,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.104"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f07d2f20d4da7b26400c9f4a0511e6e0345b040694e8a75bd41d578fa4421d7"
+checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
  "syn",
- "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.104"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bad67dc8b2a1a6e5448428adec4c3e84c43e561d8c9ee8a9e5aabeb193ec41d1"
+checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
 dependencies = [
  "unicode-ident",
 ]
diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix
index 495037a80899..1a4c9dce6af4 100644
--- a/pkgs/development/python-modules/pycrdt/default.nix
+++ b/pkgs/development/python-modules/pycrdt/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "pycrdt";
-  version = "0.12.40";
+  version = "0.12.42";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "y-crdt";
     repo = "pycrdt";
     tag = version;
-    hash = "sha256-4aKR/mTpuPKv3zq00PI40vbWUNBNQbVRyH39AtADb0Y=";
+    hash = "sha256-TEuP6mkd4phic2vJv0BYD50GvlrNj4Z4/jMknLfnYI8=";
   };
 
   postPatch = ''

From 43b91492a7c544a42649a72265eee27692e3468f Mon Sep 17 00:00:00 2001
From: Arsenii Zorin <me@wrb.bz>
Date: Mon, 20 Oct 2025 12:12:19 +0300
Subject: [PATCH 4163/6226] pulumi-bin: 3.202.0 -> 3.205.0

---
 pkgs/tools/admin/pulumi-bin/data.nix | 290 +++++++++++++--------------
 1 file changed, 145 insertions(+), 145 deletions(-)

diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix
index 679ef32cef10..4963885fb804 100644
--- a/pkgs/tools/admin/pulumi-bin/data.nix
+++ b/pkgs/tools/admin/pulumi-bin/data.nix
@@ -1,12 +1,12 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "3.202.0";
+  version = "3.205.0";
   pulumiPkgs = {
     x86_64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.202.0-linux-x64.tar.gz";
-        sha256 = "118nzhyb6xh6x2qpqjvbdc9p7r2a84r52g69n8pfqik5y1fh0lnk";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.205.0-linux-x64.tar.gz";
+        sha256 = "14pqc1qvkb8jp2wisld02qm6zf68i3i3iyymiwgg2ngr1ps40191";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.0-linux-amd64.tar.gz";
@@ -17,48 +17,48 @@
         sha256 = "0r7hc0vvf95a87pk6v4sm7m1i9li9ymhijvwsxzjdbpmjcp65ywg";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.86.1-linux-amd64.tar.gz";
-        sha256 = "10mz7gv2bm93hvkvqvhsvqhkcziyci2wbxmqj9ggplgv44k49w68";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.87.0-linux-amd64.tar.gz";
+        sha256 = "08s73nag5wb4i473krk87718p91q87xjp62riscffzv0xn68x343";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-linux-amd64.tar.gz";
         sha256 = "02pgy8m9f32ky69vs7kw7fn8b41l0y4w2gg7s15nw5c069vvnpy4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.29.0-linux-amd64.tar.gz";
-        sha256 = "0032ax8kazj8gxmxz6sgffv5r7y67vp92xwzlfpq4y6jlqiapwi9";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.30.0-linux-amd64.tar.gz";
+        sha256 = "1nl1rzgxci67wj0l1gg89r8zxp284w0pjcqaxjmr8bv4whny5r01";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.8.0-linux-amd64.tar.gz";
-        sha256 = "1f1zj1m3alz9zvdab9fvqrlzjafzwx21wpnifi7fs3sf27p1vs2l";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.10.0-linux-amd64.tar.gz";
+        sha256 = "11sgjzwspiyjimaqaad4rv8zfri1gk3cpi18cbxqvl02qc45nl2c";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-linux-amd64.tar.gz";
         sha256 = "1kvcw8163ghfnrdgc2rzvhfc9npfql7c2d6y6p32j6arwf7h2k4m";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.1-linux-amd64.tar.gz";
-        sha256 = "0r0s72v99wx2ggb45ifs0hjy76nq8aa6z66zlxjb8wgda3yrsldz";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.2-linux-amd64.tar.gz";
+        sha256 = "0i952s6ib6k21fzwwa5cb5xrb280an4lyfk26szm4nvmyy623jf7";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.28.0-linux-amd64.tar.gz";
         sha256 = "0agh234zr757kx6b41k1q7p9rpzb3jv30nkyzs5xqhjnv44lky97";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.0-linux-amd64.tar.gz";
-        sha256 = "0gjhdf6ai64k3kkdfvprpszc93b6yim622kk4m76s15kpcnnlnzz";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.1-linux-amd64.tar.gz";
+        sha256 = "03r7s8g17gpp5zhckjmii67hlkpp49nwlx7jcr6bipd7g21isx1b";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.1-linux-amd64.tar.gz";
-        sha256 = "00gkdgb6s0wqjl6m69sc8dz320aiy2s751qqn73894jyaqa8v9zk";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.2-linux-amd64.tar.gz";
+        sha256 = "1r0yrm3x1762ysbb3cm78avs8cjmsaqgknyypn7zmq1fr1hs6n22";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.57.0-linux-amd64.tar.gz";
-        sha256 = "1bgbnmkc0g4yqspv9bfn7zmyf0rykibyshmjrjmhr3q32jz9ffyg";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.59.0-linux-amd64.tar.gz";
+        sha256 = "0y6s7hyj6zlnpjbahgm4zcb6iknhy2q6mamq639n214a22s1a1mp";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.53.0-linux-amd64.tar.gz";
-        sha256 = "1vd4wcpkwb01wb3916nna3wwqhbym234jj6ggyayw0mawhrx52rm";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.54.0-linux-amd64.tar.gz";
+        sha256 = "1623gjdclwyvgavcmksjyb76k8a3arzdwsi8336san9dg3jxsdhq";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.9.0-linux-amd64.tar.gz";
@@ -77,12 +77,12 @@
         sha256 = "04m8b9d1dsfm3kw3n214g46i946fgn56j0k10dzfa2l023y491gc";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-linux-amd64.tar.gz";
-        sha256 = "192bz3xl0hiy3k68fgcb9mw6j1hb6ngrahf53h8zb7agikzwiy3m";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.0-linux-amd64.tar.gz";
+        sha256 = "0f07prmwm0rgd5r2amd3fxm9cpnfrgj2282d6iczl7pnnl5jn7wp";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.3.0-linux-amd64.tar.gz";
-        sha256 = "0bl8r0d2zyd2yfx1wv84gxjjq5mp2kw52sv4vqpqihmzvcwr0rcv";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.4.0-linux-amd64.tar.gz";
+        sha256 = "1ayscjrlsib4lgh86kp5c4acccqfm1wcv8d6p34rhd12xj1zw72h";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-amd64.tar.gz";
@@ -101,12 +101,12 @@
         sha256 = "11zb5z8yzb87irf7sqc8b664wibicwk6vnmbshsrf41nv4lrys1r";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.11-linux-amd64.tar.gz";
-        sha256 = "1vvdn7p0m9kyb62r0g52ypidbm7060mhaz1iy0zd7915whxk900p";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.12-linux-amd64.tar.gz";
+        sha256 = "1ysfm0iq2g2x8ml4dlisyf5g5lfdwjzf8spzc2670kk11vxsb0sy";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.11-linux-amd64.tar.gz";
-        sha256 = "0sawhhcmnhgwdv3wl05z65parmrc74mgk2cpyhgp0hcvbpgagknj";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.12-linux-amd64.tar.gz";
+        sha256 = "05h57r3r5cwdb9pb4nh9k4y2rfww2csarqaydayi4qr2xwgq09p3";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.3-linux-amd64.tar.gz";
@@ -117,12 +117,12 @@
         sha256 = "1wyl8xr07b8gj933w7lxip36mc7xxqwb9i46826il7w67gb2vfb4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.3-linux-amd64.tar.gz";
-        sha256 = "1n3ndir2n1pq4mmnbkiqvv0rf3w4dgz3a9b221vimsi2lks212kw";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.4-linux-amd64.tar.gz";
+        sha256 = "12xw7fc5xsdbjlwbxwp0jdyv89l2af0hh6b2890fh1g83jp80rxs";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.7.0-linux-amd64.tar.gz";
-        sha256 = "18iaybm8sqg468a8fan2dm1lsyybch3l1wiawvz5qyh6ap5x2fv7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.8.0-linux-amd64.tar.gz";
+        sha256 = "0gphzxkpr7fk8jw5mqldqp1vk2l0xlrcjy7lycwc71921nid3knn";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.125.0-linux-amd64.tar.gz";
@@ -141,20 +141,20 @@
         sha256 = "1vh28r2gk85a82c7jsa95n21my19hzavkyc9pjdpw517r63gvyjw";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.0-linux-amd64.tar.gz";
-        sha256 = "0vdrh5ss7vlmyv0a0mvrj2w9mrsazqrl7hcvwn5riym4ba0daq03";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.1-linux-amd64.tar.gz";
+        sha256 = "168a1hqpildnal3xnivpimlmfr9dgkcrc1fp03www96qvnwa5b0c";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-linux-amd64.tar.gz";
         sha256 = "070kb73yix9aha55x9n4h6f4khp9a8wylqgvzdhsa7c7k35fx6q5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.0-linux-amd64.tar.gz";
-        sha256 = "0p3rjsppf2zl7xwcs9qr2s262bxkilvzy8yi7nybydhfscl1rmrr";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.1-linux-amd64.tar.gz";
+        sha256 = "1yr8pi9w343h555l6bxfzxrf04y7s4lxqnvjw89594nl30ldz866";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.10-linux-amd64.tar.gz";
-        sha256 = "0pbf995jvp3fkvnqdv2ds0zf3yr88rh61i9q4ab7b3141hsghvha";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.11-linux-amd64.tar.gz";
+        sha256 = "0x71yr3hvpwhnvrj51fzvbyw9sbdzkb8l58a4xn2rg6xw1sbx23r";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-amd64.tar.gz";
@@ -163,8 +163,8 @@
     ];
     x86_64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.202.0-darwin-x64.tar.gz";
-        sha256 = "0qrz36gn6rszklz2i4rshhzsfqiz3kndfmzmiqba764hanfddj77";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.205.0-darwin-x64.tar.gz";
+        sha256 = "1vscn2idp2qjrmz9gzykb4jqcyyipkndyjk8r424qp95v6w6vrkb";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.0-darwin-amd64.tar.gz";
@@ -175,48 +175,48 @@
         sha256 = "0mw37ncmm78j9gx7nw3400jrmzirqkwqhp957p36q193gnsd4747";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.86.1-darwin-amd64.tar.gz";
-        sha256 = "1b8lwjbvppj7ssncfwqync169ydz7m8wx3zkxdvc8yw4ggcl2kxs";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.87.0-darwin-amd64.tar.gz";
+        sha256 = "0wd7gsghsbchb2gj6yv7lis8ni640dhrklgjipgbw61zhv6ib0ci";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-darwin-amd64.tar.gz";
         sha256 = "09c2kdhad10c6g1j955dxkvvfapk6qqc8wdd69qcl85lkpgzn3cz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.29.0-darwin-amd64.tar.gz";
-        sha256 = "0xy3z460nw89i0zjj5bn0qwpqc18xcas4zk3wgvvrsk7v0jj1cin";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.30.0-darwin-amd64.tar.gz";
+        sha256 = "1nxfxi3gj92lqyqiagh31j5gd6s4ah24k96pgja50xvpsbsz3kbj";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.8.0-darwin-amd64.tar.gz";
-        sha256 = "0iq60sxszffaqv6anh4hi2bx963k462g6y0ylpwx0662wi7d6m5w";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.10.0-darwin-amd64.tar.gz";
+        sha256 = "120cdkrw9rqj6p8pqh3g13khciqnzfr6w7lcg3q5k8fvbj8inyn1";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-darwin-amd64.tar.gz";
         sha256 = "1cdpx3540y3kp76ml1qi0awfzvm3172bzc76khdbsdcz9b8f3kb7";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.1-darwin-amd64.tar.gz";
-        sha256 = "124fk2mxxzc06dav25kk1wn8gqrys6607gg3nm53fk813wx76zg6";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.2-darwin-amd64.tar.gz";
+        sha256 = "0a7lrp0xrpcd4hsnwcjzfbxihl0hcw39c6bhprpa4f1lzi4fdgv5";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.28.0-darwin-amd64.tar.gz";
         sha256 = "0b7ryynm4np70d4si2i9jwjjqd1nd3b6m23fgv9c2cwwnrg2xmiz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.0-darwin-amd64.tar.gz";
-        sha256 = "0l1r3qdmf90g0fpi0jvac0v4phksnwqjhihx6rcnrcpc9ihfr2pa";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.1-darwin-amd64.tar.gz";
+        sha256 = "019w76n8zksz62chnbdfhbjar2z1g3359pamahdcm415kdghhar2";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.1-darwin-amd64.tar.gz";
-        sha256 = "1n3afyncwk16cbkc8wch3370z08b2vabpvpp8g55xarhqvqk1qpz";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.2-darwin-amd64.tar.gz";
+        sha256 = "1p435crgs1cgqn9z7rplrdac60rwizk2ifxg2r9vpvcmv36z1c04";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.57.0-darwin-amd64.tar.gz";
-        sha256 = "1wgcbn02r9xv9lanfssm85ac9y1p712ba2jg2jh0hb9mmx7dvhrl";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.59.0-darwin-amd64.tar.gz";
+        sha256 = "15jjn9hs0g63g484skwavyc7p9yi4z81qs3bfb2bmarnzmw21amc";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.53.0-darwin-amd64.tar.gz";
-        sha256 = "1vpp01zh6g2p3s1x061hrkzl83qcahf5mw6cdhl0m0h425mbzvam";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.54.0-darwin-amd64.tar.gz";
+        sha256 = "1w7rbyh800vx13j05d3gkbqccl5ib64lczywvbz541ra03gnrcss";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.9.0-darwin-amd64.tar.gz";
@@ -235,12 +235,12 @@
         sha256 = "1hphg8mhpgzmm9hz12fdpzjgrx35b4bhxinm74slw8fki3vpgqdl";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-darwin-amd64.tar.gz";
-        sha256 = "0bsfi36kihw2334gs39z9gwm6gwr0bypbcx7wfckj5zzml94jg6y";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.0-darwin-amd64.tar.gz";
+        sha256 = "1d2chprn9xjdm9qrvdzma3r5f0v457ksfxbc98i753ncqr7cnzf3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.3.0-darwin-amd64.tar.gz";
-        sha256 = "01kncjmknz9ynhjyp06gn5n1d8010k4riz2zzh2sgsq9icvphh3b";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.4.0-darwin-amd64.tar.gz";
+        sha256 = "0bwar26bw474k216659gqzc5ghk7pmww9s1pn24d230zp19g17ps";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-amd64.tar.gz";
@@ -259,12 +259,12 @@
         sha256 = "1v309axkjh9gv8cy3y7wpdq7b88129b5p5q030qdrk2hzalxvvrh";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.11-darwin-amd64.tar.gz";
-        sha256 = "0pzc0girgfy3p03rxzwm6n9g72x2qinn4g151dmwl0mdgn0bh8rh";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.12-darwin-amd64.tar.gz";
+        sha256 = "1yabhr80yvnwzvn0gd95kpicng99j8m06y6cdz9lwq63kycsnghc";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.11-darwin-amd64.tar.gz";
-        sha256 = "18hxq1kmaxb6xjajcm84zjc3crpaqh412mkrs0xai97p3pbdfkzn";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.12-darwin-amd64.tar.gz";
+        sha256 = "0sw0382d4inkbgah62b8s7wszjd2lj39ybq96skl72vsizkp0njw";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.3-darwin-amd64.tar.gz";
@@ -275,12 +275,12 @@
         sha256 = "0vjjki7lzx4kxi91qfsm07vs2jz4nl3l816hcn3kkj22ypnx11w2";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.3-darwin-amd64.tar.gz";
-        sha256 = "1b3znzx5m20xlvmgj9njmip7q32fs6hm62zfckra73bqh2mc9492";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.4-darwin-amd64.tar.gz";
+        sha256 = "0zbmrhh5f19r9rg3pcmry325l2lfpam9j6krqdbcwsals971qvw6";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.7.0-darwin-amd64.tar.gz";
-        sha256 = "1cyh4zlaayyg4x6qzgc8pxm7kvc6b2xjm93v9rb25vbxb4yjv1nw";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.8.0-darwin-amd64.tar.gz";
+        sha256 = "1vafsy1ah61y3qwiv3cc8y8lx6c9pimr0hnknah22k6cxshm0bg9";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.125.0-darwin-amd64.tar.gz";
@@ -299,20 +299,20 @@
         sha256 = "1ji9zz1r7rj57w7spf6mwa9fxl1jgiy0qmxvlia21hpj60b536f5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.0-darwin-amd64.tar.gz";
-        sha256 = "097kjmmyqdwaa9ghn228d52sjj2ypr3kqbgkfxvjmq494b5mf74s";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.1-darwin-amd64.tar.gz";
+        sha256 = "15hyg61id2r7b7l6279grabvfphhj22ffi4y0q20zzypx98xr599";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-darwin-amd64.tar.gz";
         sha256 = "1c38gqm2vk9fwxyqmzzf27p8xdis9pa8ikj9pgwyjaf208b63gir";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.0-darwin-amd64.tar.gz";
-        sha256 = "0jrzy2dm6wnkxwk97njhvyw36gy9l1axcw2962drilc60zdc82mb";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.1-darwin-amd64.tar.gz";
+        sha256 = "0yph0sjsyicb3z2bhw1xw1rn7v930vygsgwww4n1zmy6p8059z4a";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.10-darwin-amd64.tar.gz";
-        sha256 = "1h43zanz810i2p0x12hp60r6k5rfkr5lvh49l32090xj1v6cr8la";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.11-darwin-amd64.tar.gz";
+        sha256 = "115g6sn2sxd9vpzv1a01hah91cnd1irfzif7k8xj5aisixdmfyhh";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-amd64.tar.gz";
@@ -321,8 +321,8 @@
     ];
     aarch64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.202.0-linux-arm64.tar.gz";
-        sha256 = "0jv19av1060gh0q8hlllbqlg4m8lzkpassajhjh1r5ncqf27y5hy";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.205.0-linux-arm64.tar.gz";
+        sha256 = "0i80py5r711k58yh14c5d8vhlsl5jd5f41gxfqq3gllhwy3q54db";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.0-linux-arm64.tar.gz";
@@ -333,48 +333,48 @@
         sha256 = "16jd9hrv60jy6qzl57h9fmk955ll05ng7cfmn4af1vjsyay6knjl";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.86.1-linux-arm64.tar.gz";
-        sha256 = "11hbjq49a1znx38xk81q2gp2pdq99c8sz166xxb2cmrv84bm2xfi";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.87.0-linux-arm64.tar.gz";
+        sha256 = "0jy2za4z4f63i51a06nwy1pv4nma9rl46pl39gkkgq5kslhgah5h";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-linux-arm64.tar.gz";
         sha256 = "03as3y5bflq1m8qfcx7h916vlxa7qn5xla2d1gi2q87gz4giki24";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.29.0-linux-arm64.tar.gz";
-        sha256 = "0v9a59cbzs5s9vylmbwfb5chydccdy1xkhp90ci2lz52yik45lg5";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.30.0-linux-arm64.tar.gz";
+        sha256 = "0mx7yx96xnalrpsqc4dp14gck7p8hciasgkkk89v3dsjmjlk1wwi";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.8.0-linux-arm64.tar.gz";
-        sha256 = "1lwr5cbf3g3zkk8mvdd17b8bmsjkxbzjg15y2lzsxb294r677b3l";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.10.0-linux-arm64.tar.gz";
+        sha256 = "04sq78vzcyc8dm3cx0f5gizkdwy03j2fsw3vcjxpk75pkkhxh2gf";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-linux-arm64.tar.gz";
         sha256 = "17lndnmwmxshxz7n2zhgc07gr8cqfd06b1mgblyzbx8n2lc0x0sv";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.1-linux-arm64.tar.gz";
-        sha256 = "0mmkjim8q5wh0mikwjw3qzg87hm845777jyisz7256p211nrsmyx";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.2-linux-arm64.tar.gz";
+        sha256 = "15p2gh2cqkz5rxnq5b5bx30mha02hcd3df44lwh9qb4lbjlfdzfv";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.28.0-linux-arm64.tar.gz";
         sha256 = "0hg628ik9vvadxs249v4z53y36nzrw3bgjdh1fgjahx875z23m06";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.0-linux-arm64.tar.gz";
-        sha256 = "1l2a54qjgh5blwx8mw2i52m5yhff3izqirlh17ws3l04xcldd4d9";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.1-linux-arm64.tar.gz";
+        sha256 = "1x5iqm07zjf637w14pzhhifgi7vs1imvqjqr2xmi1z5cqfjknm5j";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.1-linux-arm64.tar.gz";
-        sha256 = "15n44dya58sqpirhpiicp1x6w9x15qf94a6vamk2h6jbzpfi7c03";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.2-linux-arm64.tar.gz";
+        sha256 = "06y78vlb3s36n900v44l0av126xr0gaf192ciq6435cr0b4v80h3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.57.0-linux-arm64.tar.gz";
-        sha256 = "0d02sl9l4mqhm6mb9rxdc0pc6dr7qkd6zzm4y3ff8dv84qn8sy9n";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.59.0-linux-arm64.tar.gz";
+        sha256 = "14hgjf71j5fsxzfibb6gv7adn0cap9lsz44xdcczgs1xc206ng6k";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.53.0-linux-arm64.tar.gz";
-        sha256 = "033lry88mpn9vfqim26hkjg13dc0jl9sqn28zhld1asx7sqbck3y";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.54.0-linux-arm64.tar.gz";
+        sha256 = "1zs5ar106zxv8np22n5c1kph65z35pbwgd32wn1vx5lgkz0jry7x";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.9.0-linux-arm64.tar.gz";
@@ -393,12 +393,12 @@
         sha256 = "111rblka8wz87pqd9v27gmv4lz5048kwdj9i252r7bnd1gw92i4x";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-linux-arm64.tar.gz";
-        sha256 = "1nfsgjfas5md9k67n90hcvcza7gg2iwp9wivmfzf49vz2k25iz44";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.0-linux-arm64.tar.gz";
+        sha256 = "0nnap94wign1vydi56k29s0cp1xgdngm1yj3hwz5s02fkhkcvw6f";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.3.0-linux-arm64.tar.gz";
-        sha256 = "0jynj7qz66jl47982gvg47fkdbgifb4030225vxz85a705ingjdl";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.4.0-linux-arm64.tar.gz";
+        sha256 = "01w6y0pmpc9c81hpck2nqin0hk9s3ijdcg1a4jicaw9g6j716gsp";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-linux-arm64.tar.gz";
@@ -417,12 +417,12 @@
         sha256 = "0l33hzkgcm9lr39k7dndga36k3f0agbsj7q4wx0rwhfabz1fgcd1";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.11-linux-arm64.tar.gz";
-        sha256 = "0by18hd8zyfl0xac4wanz5lq6sw6wmkclvy0va9cjpfgns916qsk";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.12-linux-arm64.tar.gz";
+        sha256 = "0b2yrfxxrkwxsp76ihv06vibwg86lpyz2c92mi49bldrp767ibys";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.11-linux-arm64.tar.gz";
-        sha256 = "1gd9l1zdkg5faqlfvc5rl9gqchndxhxp742mx21hizhmp4rsv577";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.12-linux-arm64.tar.gz";
+        sha256 = "1y2a451m6qhb0z1g304axwm4hcbdwba3rl8pdfj4c4ifkiaxm0mr";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.3-linux-arm64.tar.gz";
@@ -433,12 +433,12 @@
         sha256 = "0arnnishqszj7s9a2azjk0a61n2sp3wb97snj9xpj9bp243w5lmf";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.3-linux-arm64.tar.gz";
-        sha256 = "02jix4w49n9mal8wg6ixgxvnd865ml7zx0lnz6prckfrzgrj36ih";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.4-linux-arm64.tar.gz";
+        sha256 = "0a5gl6fpl6w8bcy1bl1z7dynrpm42kg0hq45hzhs7h667bgaqkzs";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.7.0-linux-arm64.tar.gz";
-        sha256 = "05fwkafsjv5gd23fzkb2hv3xah9vvqr4w2sc9sjrzcwzghiw0pbh";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.8.0-linux-arm64.tar.gz";
+        sha256 = "02b1alm53isvmzs7crgjqbpyskr3l2nnzwkxvfkhpsa3rbpnf42f";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.125.0-linux-arm64.tar.gz";
@@ -457,20 +457,20 @@
         sha256 = "1zbm7ql3rqypqmckbmlzbiy4akmqjkbzfkl7788q6sm7xh6bm8q1";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.0-linux-arm64.tar.gz";
-        sha256 = "1csiv24nmg1c8vb0ay36lsw7dpfim5hr9b3rhdawpsyjdi5s4hsd";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.1-linux-arm64.tar.gz";
+        sha256 = "185rjhfcr8hh7vxyb91dfsmq7vc78z17qrvn0gn7bxf2sd0zfnap";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-linux-arm64.tar.gz";
         sha256 = "1rfzj89s7avim702aqvkrmsg4d1qzajw1k5pr24jzrs4xiyarkzb";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.0-linux-arm64.tar.gz";
-        sha256 = "1sbxv37pi1yy6dvjz0yifj44l68mscxaf033a7nbgb3281r15lq1";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.1-linux-arm64.tar.gz";
+        sha256 = "0gc31g4wmv9h5ygaiykas0kjrk3dfmdpzabs5k493d8zcqyk2219";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.10-linux-arm64.tar.gz";
-        sha256 = "113czcq1fm2dywn8q5v1z5lyz4l30b1433hrdjnfkr8qwzxncr48";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.11-linux-arm64.tar.gz";
+        sha256 = "1pqwam73vz01zvr569643918n4vfvlnaqx0ljc8wvij42fvbdfgs";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-linux-arm64.tar.gz";
@@ -479,8 +479,8 @@
     ];
     aarch64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.202.0-darwin-arm64.tar.gz";
-        sha256 = "1nb7g3dyv4a2fgr738a6mpf88n7pfmbbggq5l746kgg1jpzd2ald";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.205.0-darwin-arm64.tar.gz";
+        sha256 = "07bxw10xcm5s8c8zssqh461v9rj4c5l27nzxzg84q3vyzil02460";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.0-darwin-arm64.tar.gz";
@@ -491,48 +491,48 @@
         sha256 = "1fig9bn080dbnibm0dp76ygyg1g2sv2295kyyknx3wlap0nrj2w3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.86.1-darwin-arm64.tar.gz";
-        sha256 = "1cglc5a507fy973wkk062wd22yn1pwn1pdn2laqqlk0n6y1hp33y";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.87.0-darwin-arm64.tar.gz";
+        sha256 = "0p87dqzhpra4s1hxnzc63xk1pvw2n6pa8nxisgbrlrf4bxy229wq";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-darwin-arm64.tar.gz";
         sha256 = "0sqmpk1n98vs079qrs1nf9ifjmjz4s9s0f406c8r0cxpn3l08zvp";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.29.0-darwin-arm64.tar.gz";
-        sha256 = "1a13wviv678k1ls57vwvffkk6qa5fdc55zw2byid910m2bjs7bz0";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.30.0-darwin-arm64.tar.gz";
+        sha256 = "1dz54wc5aw9rfhwx2hrmvdfl9xd3fd26jx00f5asb4gjlirasdhl";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.8.0-darwin-arm64.tar.gz";
-        sha256 = "0k0kmjqc5iq3dhcvrxkz6d7kbj2q1s0cigqjqp7qpj5ppyss901g";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.10.0-darwin-arm64.tar.gz";
+        sha256 = "0jqpviykdsvb6zfk021wl27i2aa1v7mv08kalxn73r8zbj2hh1ls";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-darwin-arm64.tar.gz";
         sha256 = "0b4srhyq2adbpzh74s0kcmfflayrk6c7jbq63s2l3zfq2zln4sbm";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.1-darwin-arm64.tar.gz";
-        sha256 = "00gahf4jlihzywbsd7rmw73jrnjfdsqxhag4qm7ms90gwl5qspa4";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.2-darwin-arm64.tar.gz";
+        sha256 = "0pqyd2qgng49g0cvmn5nvcqsymwgakyc75p6swb2c94h6pp4x4bc";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v6.28.0-darwin-arm64.tar.gz";
         sha256 = "0jidnrvvk2d6jdfx795yrnkpwmw1843nfylchhynlidf279z21vm";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.0-darwin-arm64.tar.gz";
-        sha256 = "1cr924w029hah14j9cq0rsy2k0arph8r7dcmhi6zimw3wm0168dd";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.1-darwin-arm64.tar.gz";
+        sha256 = "1kiq9771rqz935bfnrl06c561xw7g583a9hm1dn4yclssn02pshf";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.1-darwin-arm64.tar.gz";
-        sha256 = "1lva9jp2fbz58gfgsdbwlyrdd60wpy1xy55af7f8dmabgcc8j391";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.2-darwin-arm64.tar.gz";
+        sha256 = "1dwncdxq6rxi1ip9vv52amdmh78wgynymn5sc6b3dh8q1sx6ghdq";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.57.0-darwin-arm64.tar.gz";
-        sha256 = "06gdvb7d5mj7ggnjifi86nb2n7hyzv79rq5wh2dfl0fkf19qam69";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.59.0-darwin-arm64.tar.gz";
+        sha256 = "0ys4nb53gbddv8rgb8daz5qbw2gigk90gl9g5iqyrdjlsv7cv4w8";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.53.0-darwin-arm64.tar.gz";
-        sha256 = "0v50vs1d1cm6dgfjz9adzka34hbws3j6hwr1s3vxk6f6apx9p3x0";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v4.54.0-darwin-arm64.tar.gz";
+        sha256 = "048paqhq05a74rrp1rcsx1kaxsszhpb4shxgb5l74xii9fdklwm2";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v4.9.0-darwin-arm64.tar.gz";
@@ -551,12 +551,12 @@
         sha256 = "0nd7hv0yf40xc566wg76k8h91ig88lvd6y0f0ffsjfyb40kgm7sc";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.7.3-darwin-arm64.tar.gz";
-        sha256 = "13il7mq0g853x1nllvxnhbhflrlqx8i11p4xkg46bvshay15xh9x";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.0-darwin-arm64.tar.gz";
+        sha256 = "17naiz9k71dc0ax1x7843slna1cycjgd9yvy5xhg5613rrl7h4nc";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.3.0-darwin-arm64.tar.gz";
-        sha256 = "0mf0pxpxjb2fpz4px3dg4b699fqvzf56crvrj00vyc6ld5hmmnpm";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.4.0-darwin-arm64.tar.gz";
+        sha256 = "06g373h6i1ps7sd0nclcgvaparg4bv94s5c9ps5izxvhl87bcbf6";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-google-native-v0.32.0-darwin-arm64.tar.gz";
@@ -575,12 +575,12 @@
         sha256 = "0fjlp0afa5z6x85ldw8bwl4zgxz2rmwinihw1vbqa33pyjrk08xn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.11-darwin-arm64.tar.gz";
-        sha256 = "1kkbgmhgp02qzxsh37m9x3jahwjnq5ls9dhjhgbxjjq6xalcqf79";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.12-darwin-arm64.tar.gz";
+        sha256 = "02fpl2jrawswcyhiqfgjrhhxc153pdgij3f5kpjqdn1h6dyhv4iz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.11-darwin-arm64.tar.gz";
-        sha256 = "0n1wmplyj2c5qhaq0gplphi8p2i7g4jwrnlwzkv0m1wixrlx3fw5";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.12-darwin-arm64.tar.gz";
+        sha256 = "034pw70i8n12gr69ng5xj2cci11v1d47fsw6j5mgmck5mrsjjr0i";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-openstack-v5.3.3-darwin-arm64.tar.gz";
@@ -591,12 +591,12 @@
         sha256 = "0k7w2a1zppw1pgy077iidvnlic21ynw4w7f15z3hw793inzj2wm3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.3-darwin-arm64.tar.gz";
-        sha256 = "1bb3bzybmfi5blagh13bm6q1avjbp80lmjdv4q5yc2dbfbs653xi";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v4.18.4-darwin-arm64.tar.gz";
+        sha256 = "0vygxiqrx70i03d3p1mmc26zkai4cxzwjzjf6bszz6cmqvnc5pnr";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.7.0-darwin-arm64.tar.gz";
-        sha256 = "1f409m7ls96vvx6x6lsfydp2vn809wy58s5cbh5p8s390s30q2zf";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.8.0-darwin-arm64.tar.gz";
+        sha256 = "0hzrqqk78hgxrn3fxmnmy9y8l5011ifs6smbs2wrm9na9lag3frb";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.125.0-darwin-arm64.tar.gz";
@@ -615,20 +615,20 @@
         sha256 = "1qih4kprfaa82p7mg4zg8amy8vp4c76vqkmwf3df2x8bn69jdrc0";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.0-darwin-arm64.tar.gz";
-        sha256 = "1p3nb3aazr47kiprq7k3js6x8jk87dsql6d4qkn6c60mbrm9mlal";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.1-darwin-arm64.tar.gz";
+        sha256 = "0r80rz0fs8w4iqnq1rsqxqvbs1plfr7hvlsr2dik4k8ngiwvbfps";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-darwin-arm64.tar.gz";
         sha256 = "03qhd6p77d40dbcvr6ifw6ii37303jmcqhns63r8gmpbfkdg52a2";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.0-darwin-arm64.tar.gz";
-        sha256 = "1x3g6j9adkc1k937s271zqwk82w9w07fkm4d8dwcv85sf1m1phhj";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vsphere-v4.16.1-darwin-arm64.tar.gz";
+        sha256 = "1q3qqlyzfc77ybp2q5mspyrh9c1h1m4p9mzq0l1z6hzn6r41z4n5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.10-darwin-arm64.tar.gz";
-        sha256 = "1ga7zvw6przmkbcpi3vq081g4bh8p4bzrfhi3jyxd6kh4slb3g9d";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-wavefront-v3.1.11-darwin-arm64.tar.gz";
+        sha256 = "0mnya4lc1aabxwzm44k5k72xlz0ng0aiy3rkikvcdk0c3mmckyrk";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-yandex-v0.13.0-darwin-arm64.tar.gz";

From 4541de0c1deb8daa04822714c23d694eb677283a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 14:09:49 +0000
Subject: [PATCH 4164/6226] supabase-cli: 2.54.8 -> 2.55.4

---
 pkgs/by-name/su/supabase-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix
index 67bd8b05d94c..d2b09bc1f1d7 100644
--- a/pkgs/by-name/su/supabase-cli/package.nix
+++ b/pkgs/by-name/su/supabase-cli/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "supabase-cli";
-  version = "2.54.8";
+  version = "2.55.4";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-iU2NFb97458ouDYuTwgCIYtBpM11MXPWS4hV/Q4IDMs=";
+    hash = "sha256-BJjNWZKqf59sl9+kVIRuBWF71X19wk8fbIJqlXDhM5Q=";
   };
 
-  vendorHash = "sha256-JhPKfSFQxFwH5nIYIO3mACdDfURIhuISs1tANiCfWSk=";
+  vendorHash = "sha256-ASNo3T0ziPcMm/xXBnokyVWVTTq2ZEn4qg9yHjxinEA=";
 
   ldflags = [
     "-s"

From 0df0d364e5c34f8b7af2cec7d87614e771c6c38c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 14:11:15 +0000
Subject: [PATCH 4165/6226] cryptoverif: 2.11 -> 2.12

---
 pkgs/by-name/cr/cryptoverif/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cr/cryptoverif/package.nix b/pkgs/by-name/cr/cryptoverif/package.nix
index e23707651298..7d86585df43d 100644
--- a/pkgs/by-name/cr/cryptoverif/package.nix
+++ b/pkgs/by-name/cr/cryptoverif/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cryptoverif";
-  version = "2.11";
+  version = "2.12";
 
   src = fetchurl {
     url = "http://prosecco.gforge.inria.fr/personal/bblanche/cryptoverif/cryptoverif${finalAttrs.version}.tar.gz";
-    hash = "sha256-duc7t0Qpr1Z2FZEoufdQ7kcBlLbXHO+r9ivEgUxqK9s=";
+    hash = "sha256-d3MIYb57+95bB493hdtHiGnTOronYaQo1Qqq1TcJh1c=";
   };
 
   /*

From 585e547f254071ed9243adf9f6ab556005e0be06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Felix=20Schr=C3=B6ter?= <dev@felschr.com>
Date: Thu, 30 Oct 2025 15:14:44 +0100
Subject: [PATCH 4166/6226] mullvad-browser: 14.5.8 -> 15.0

https://github.com/mullvad/mullvad-browser/releases/tag/15.0
---
 pkgs/by-name/mu/mullvad-browser/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix
index dae3483f249a..1496b01ddbe4 100644
--- a/pkgs/by-name/mu/mullvad-browser/package.nix
+++ b/pkgs/by-name/mu/mullvad-browser/package.nix
@@ -97,7 +97,7 @@ let
     ++ lib.optionals mediaSupport [ ffmpeg ]
   );
 
-  version = "14.5.8";
+  version = "15.0";
 
   sources = {
     x86_64-linux = fetchurl {
@@ -109,7 +109,7 @@ let
         "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
         "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"
       ];
-      hash = "sha256-82Y1QpnvXFKEXQtgUHCGh+2KYytbA+B1YwF0OtfvtSA=";
+      hash = "sha256-BD5pnPeE3PZHJKNoJE46Gm6i+ksc7wdl9Eq7pWqB84g=";
     };
   };
 

From 4809503a01af453b4d677ed19c218e04fd253e95 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 30 Oct 2025 22:30:32 +0800
Subject: [PATCH 4167/6226] pantheon.switchboard-plug-power: 8.0.1 -> 8.1.0

https://github.com/elementary/switchboard-plug-power/compare/8.0.1...8.1.0
---
 .../pantheon/apps/switchboard-plugs/power/default.nix  | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
index 52a174b213a8..8f828a70040c 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/power/default.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "switchboard-plug-power";
-  version = "8.0.1";
+  version = "8.1.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
-    repo = "switchboard-plug-power";
-    rev = version;
-    sha256 = "sha256-GKZouuWdWl1JDCmzPImeW/hStyFQA6NOAFFmAhiiFe8=";
+    repo = "settings-power";
+    tag = version;
+    hash = "sha256-JfOLGDS2/Qa6RmEfiDBZfeT+dM4NN4N2NoXRNJ4Q+Es=";
   };
 
   nativeBuildInputs = [
@@ -58,7 +58,7 @@ stdenv.mkDerivation rec {
 
   meta = with lib; {
     description = "Switchboard Power Plug";
-    homepage = "https://github.com/elementary/switchboard-plug-power";
+    homepage = "https://github.com/elementary/settings-power";
     license = licenses.gpl2Plus;
     platforms = platforms.linux;
     teams = [ teams.pantheon ];

From 22683f076dd967870be140889906b1e8b8424d36 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 14:44:08 +0000
Subject: [PATCH 4168/6226] esp-generate: 0.6.0 -> 1.0.0

---
 pkgs/by-name/es/esp-generate/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/es/esp-generate/package.nix b/pkgs/by-name/es/esp-generate/package.nix
index 09e252140c63..11803d55ee99 100644
--- a/pkgs/by-name/es/esp-generate/package.nix
+++ b/pkgs/by-name/es/esp-generate/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "esp-generate";
-  version = "0.6.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "esp-generate";
     rev = "v${version}";
-    hash = "sha256-4yvJgYMaASCHHz86Fh73yd2vSo/0cIjVkwZMh55ZWKc=";
+    hash = "sha256-lcxYsMeigXjwFdJQ4fJZnQL9PqVhgr7bOIsaTu2Oa88=";
   };
 
-  cargoHash = "sha256-OS2ZAXdOh+oL/ImIuEuo+gBsK9wk4X1vgoJbnHTJ2f4=";
+  cargoHash = "sha256-0p07C4OGHOkEivnokti0s9z+xXdcayUOkzTqksxUZ6o=";
 
   meta = {
     description = "Template generation tool to create no_std applications targeting Espressif's chips";

From 6c81f75b75f06a3bc1f8ce50fd3c738ddaed94b7 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Thu, 30 Oct 2025 23:16:55 +0900
Subject: [PATCH 4169/6226] homebridge-config-ui-x: add versionCheckHook

Prepare to fix meta.mainProgram.
Currently, meta.mainProgram points to a non-existent path.
This hook has checked mainProgram since befb2beebd2382aa9a6274b0fd609fbd872d8cc8.
Adding it will help automatically verify the executable name's correctness.
---
 pkgs/by-name/ho/homebridge-config-ui-x/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix
index a00f0829a058..7f5ec18f49ea 100644
--- a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix
+++ b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix
@@ -7,6 +7,7 @@
   npmHooks,
   python3,
   cacert,
+  versionCheckHook,
 }:
 
 buildNpmPackage (finalAttrs: {
@@ -53,6 +54,12 @@ buildNpmPackage (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ cacert ];
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+
   meta = {
     description = "Configure Homebridge, monitor and backup from a browser";
     homepage = "https://github.com/homebridge/homebridge-config-ui-x";

From 9e595e99b828ec0eb1f1ed1ce15b4d58f179f757 Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Thu, 30 Oct 2025 23:22:38 +0900
Subject: [PATCH 4170/6226] homebridge-config-ui-x: fix meta.mainProgram

$out/bin currently contains only this executable.

ref: https://github.com/homebridge/homebridge-config-ui-x/blob/v5.6.0/package.json#L54-L56
---
 pkgs/by-name/ho/homebridge-config-ui-x/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix
index 7f5ec18f49ea..d2546ae30c22 100644
--- a/pkgs/by-name/ho/homebridge-config-ui-x/package.nix
+++ b/pkgs/by-name/ho/homebridge-config-ui-x/package.nix
@@ -64,7 +64,7 @@ buildNpmPackage (finalAttrs: {
     description = "Configure Homebridge, monitor and backup from a browser";
     homepage = "https://github.com/homebridge/homebridge-config-ui-x";
     license = lib.licenses.mit;
-    mainProgram = "homebridge-config-ui-x";
+    mainProgram = "hb-service";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     maintainers = with lib.maintainers; [ fmoda3 ];
     # Works on darwin when not in sandbox because it downloads a prebuilt binary

From 5141623b342edc8eccbe2f919620538b3cabbde7 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Wed, 29 Oct 2025 17:56:52 +0100
Subject: [PATCH 4171/6226] pixi: 0.58.0 -> 0.59.0

https://github.com/prefix-dev/pixi/releases/tag/v0.59.0

Fixes CVE-2025-62518
---
 pkgs/by-name/pi/pixi/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/pixi/package.nix b/pkgs/by-name/pi/pixi/package.nix
index 9c076d7cb760..daea4b4409c6 100644
--- a/pkgs/by-name/pi/pixi/package.nix
+++ b/pkgs/by-name/pi/pixi/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pixi";
-  version = "0.58.0";
+  version = "0.59.0";
 
   src = fetchFromGitHub {
     owner = "prefix-dev";
     repo = "pixi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-+Bhyt01gTNWVOL0WG6pdjzbRqIfm2MUEHnbTGg3nG2k=";
+    hash = "sha256-aDwuMRceMxRCh9w89Q2ktpNWwmStg3KzggwhZUAAauk=";
   };
 
-  cargoHash = "sha256-b7/UiIkeLddo9hUipqd7zLGvFumAjFolf/jODZ0qOQw=";
+  cargoHash = "sha256-BbPX+ZKMfLtKWBnrGBRfrl6d40rBQaWJLBg0Vv5UnZE=";
 
   nativeBuildInputs = [
     pkg-config

From 22a405b9ddc5f0b790a23c8dc7d92e957a21125f Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 30 Oct 2025 21:59:06 +0800
Subject: [PATCH 4172/6226] opentelemetry-cpp: build on Darwin

---
 pkgs/by-name/op/opentelemetry-cpp/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/opentelemetry-cpp/package.nix b/pkgs/by-name/op/opentelemetry-cpp/package.nix
index 11f686c0d75b..49e73751bb98 100644
--- a/pkgs/by-name/op/opentelemetry-cpp/package.nix
+++ b/pkgs/by-name/op/opentelemetry-cpp/package.nix
@@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: {
       jfroche
       panicgh
     ];
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.all;
     # https://github.com/protocolbuffers/protobuf/issues/14492
     broken = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform);
   };

From 23a9569c9ce1fbb68ae87cb3f5de6b05113690e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 14:55:43 +0000
Subject: [PATCH 4173/6226] eliza: 0-unstable-2025-10-06 ->
 0-unstable-2025-10-28

---
 pkgs/by-name/el/eliza/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/el/eliza/package.nix b/pkgs/by-name/el/eliza/package.nix
index 167f39b29877..064d181d76fe 100644
--- a/pkgs/by-name/el/eliza/package.nix
+++ b/pkgs/by-name/el/eliza/package.nix
@@ -7,12 +7,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "eliza";
-  version = "0-unstable-2025-10-06";
+  version = "0-unstable-2025-10-28";
   src = fetchFromGitHub {
     owner = "anthay";
     repo = "ELIZA";
-    rev = "448707201101635eb4a56911d2d45f5b36e4a3cd";
-    hash = "sha256-tCNuF+WbukSL9Sp8mCdjJUMRV4hlbCDsrMdpe8Xi84U=";
+    rev = "e4c47439232c162ca0d515c5f8e1a714a80fefc0";
+    hash = "sha256-xHJLn/nxs8nWwXJE8p8fVhHzeIo1H3gxW5g4/jGCSx8=";
   };
 
   doCheck = true;

From 8c3591bbabd75ea66a360922224defc8a7edcef5 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Thu, 30 Oct 2025 15:59:01 +0100
Subject: [PATCH 4174/6226] protonup-rs: 0.9.1 -> 0.9.2

https://github.com/auyer/Protonup-rs/releases/tag/v0.9.2

Fix CVE-2025-62518
---
 pkgs/by-name/pr/protonup-rs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/protonup-rs/package.nix b/pkgs/by-name/pr/protonup-rs/package.nix
index b9dbc1f46e42..b0699685a9b7 100644
--- a/pkgs/by-name/pr/protonup-rs/package.nix
+++ b/pkgs/by-name/pr/protonup-rs/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "protonup-rs";
-  version = "0.9.1";
+  version = "0.9.2";
 
   src = fetchCrate {
     inherit (finalAttrs) pname version;
-    hash = "sha256-zUsb+ZJmKUizBVwE4Uf/YnIukRn0AEQa7UeXdIIWYt8=";
+    hash = "sha256-mysYcBmXKkXz1vlhZv8okVnnD83h/QyGwT9ijluOgms=";
   };
 
-  cargoHash = "sha256-baa3VtGUnVFMwlPdKSa4jXecSlKogRHjKMfcGbqUFM0=";
+  cargoHash = "sha256-NiJwaD7lH2jnxfc/Hreo3bJ3LC+0UAOlsVMt1UYRcdY=";
 
   checkFlags = [
     # Requires internet access

From 97b472ac81aebe063277541fe6f3d270089ba43e Mon Sep 17 00:00:00 2001
From: arexon <arexonreal@gmail.com>
Date: Thu, 30 Oct 2025 18:03:07 +0300
Subject: [PATCH 4175/6226] mcpelauncher-client: fix sdl3 audio

---
 pkgs/by-name/mc/mcpelauncher-client/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/mc/mcpelauncher-client/package.nix b/pkgs/by-name/mc/mcpelauncher-client/package.nix
index 598fe0b50c14..386a94f1721a 100644
--- a/pkgs/by-name/mc/mcpelauncher-client/package.nix
+++ b/pkgs/by-name/mc/mcpelauncher-client/package.nix
@@ -98,7 +98,7 @@ clangStdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "USE_OWN_CURL" false)
     (lib.cmakeBool "ENABLE_DEV_PATHS" false)
     (lib.cmakeFeature "GAMEWINDOW_SYSTEM" "GLFW")
-    (lib.cmakeBool "USE_SDL3_AUDIO" false)
+    (lib.cmakeBool "SDL3_VENDORED" false)
     (lib.cmakeBool "BUILD_WEBVIEW" withQtWebview)
     (lib.cmakeBool "XAL_WEBVIEW_USE_CLI" (!withQtWebview))
     (lib.cmakeBool "XAL_WEBVIEW_USE_QT" withQtWebview)

From ae2bb666bb7a844a36d5988455529bf2ed90a934 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 30 Oct 2025 23:04:50 +0800
Subject: [PATCH 4176/6226] mate.libmateweather: 1.28.0 -> 1.28.1

https://github.com/mate-desktop/libmateweather/compare/v1.28.0...v1.28.1
---
 pkgs/desktops/mate/libmateweather/default.nix   | 17 ++++++++++++-----
 .../mate/libmateweather/libsoup_3_support.patch |  6 +++---
 2 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/mate/libmateweather/default.nix b/pkgs/desktops/mate/libmateweather/default.nix
index 2315ba4c11a9..5aa9e3a8fbd3 100644
--- a/pkgs/desktops/mate/libmateweather/default.nix
+++ b/pkgs/desktops/mate/libmateweather/default.nix
@@ -1,8 +1,9 @@
 {
   lib,
   stdenv,
+  fetchFromGitHub,
+  autoconf-archive,
   autoreconfHook,
-  fetchurl,
   pkg-config,
   gettext,
   glib,
@@ -12,15 +13,18 @@
   gtk-doc,
   libsoup_3,
   tzdata,
+  mate-common,
   mateUpdateScript,
 }:
 stdenv.mkDerivation rec {
   pname = "libmateweather";
-  version = "1.28.0";
+  version = "1.28.1";
 
-  src = fetchurl {
-    url = "https://pub.mate-desktop.org/releases/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
-    sha256 = "VUNz3rWzk7nYSydd0spmyaSi0ObskgRPq4qlPjAy0rU=";
+  src = fetchFromGitHub {
+    owner = "mate-desktop";
+    repo = "libmateweather";
+    tag = "v${version}";
+    hash = "sha256-W0p4+OMr2sgkQP10DGjZLf2VTSGa2A+5ey+nYBr+HJQ=";
   };
 
   patches = [
@@ -31,12 +35,15 @@ stdenv.mkDerivation rec {
   strictDeps = true;
 
   nativeBuildInputs = [
+    autoconf-archive
     autoreconfHook # the libsoup patch changes the autoconf file
     pkg-config
     gettext
     glib # glib-compile-schemas
+    gtk3 # gtk-update-icon-cache
     gtk-doc # required for autoconf
     libxml2 # xmllint
+    mate-common # mate-compiler-flags.m4 macros
   ];
 
   buildInputs = [
diff --git a/pkgs/desktops/mate/libmateweather/libsoup_3_support.patch b/pkgs/desktops/mate/libmateweather/libsoup_3_support.patch
index c5395f9e0ac7..09fa79934119 100644
--- a/pkgs/desktops/mate/libmateweather/libsoup_3_support.patch
+++ b/pkgs/desktops/mate/libmateweather/libsoup_3_support.patch
@@ -351,7 +351,7 @@ index 7bc24fc..d470822 100644
  
      loc = info->location;
  
-     searchkey = g_strdup_printf ("<raw_text>%s", loc->code);
+     searchkey = g_strdup_printf ("<raw_text>METAR %s", loc->code);
 -    p = strstr (msg->response_body->data, searchkey);
 -    g_free (searchkey);
 +
@@ -398,7 +398,7 @@ index 7bc24fc..d470822 100644
      }
  
 -    msg = soup_form_request_new (
--        "GET", "https://aviationweather.gov/cgi-bin/data/dataserver.php",
+-        "GET", "https://aviationweather.gov/api/data/dataserver",
 +    query = soup_form_encode (
          "dataSource", "metars",
          "requestType", "retrieve",
@@ -409,7 +409,7 @@ index 7bc24fc..d470822 100644
          NULL);
 -    soup_session_queue_message (info->session, msg, metar_finish, info);
 +    msg = soup_message_new_from_encoded_form (
-+        "GET", "https://aviationweather.gov/cgi-bin/data/dataserver.php",
++        "GET", "https://aviationweather.gov/api/data/dataserver",
 +        query);
 +    soup_session_send_and_read_async (info->session, msg, G_PRIORITY_DEFAULT,
 +                                      NULL, metar_finish, info);

From 807a8ba8dbf4794bbe8d30ec514425d80b525a03 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 15:29:51 +0000
Subject: [PATCH 4177/6226] halloy: 2025.10 -> 2025.11

---
 pkgs/by-name/ha/halloy/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix
index ad247e61ec57..ffa767e5e3ef 100644
--- a/pkgs/by-name/ha/halloy/package.nix
+++ b/pkgs/by-name/ha/halloy/package.nix
@@ -18,13 +18,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "halloy";
-  version = "2025.10";
+  version = "2025.11";
 
   src = fetchFromGitHub {
     owner = "squidowl";
     repo = "halloy";
     tag = version;
-    hash = "sha256-kWIzog56lx28v7CoyEwqwthzBnl7kbnr8QwyHQTbyCY=";
+    hash = "sha256-5cYTHb3KK5EiPv5P8GZOoQwSSIe0FO+qBnpvLZtuByI=";
   };
 
   cargoHash = "sha256-gGVclMEcvgdl3ZTiEdhW48xhC9/eONeHp0KX1lHKKxU=";

From de326642ac1ef9ec167054ce8718c8eed9576c10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 15:30:17 +0000
Subject: [PATCH 4178/6226] exploitdb: 2025-09-18 -> 2025-10-30

---
 pkgs/by-name/ex/exploitdb/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix
index 36496b0a25e0..2b47cbd3b9d9 100644
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "exploitdb";
-  version = "2025-09-18";
+  version = "2025-10-30";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     tag = finalAttrs.version;
-    hash = "sha256-+5zXe+64tZD7zjZKXrAuv5ggBRb1ecKzKZSY2Knzklg=";
+    hash = "sha256-3e1NRjuLNgxKTEPTAhNp1rJNJ7ZQGnPZOXCCpuAYvLM=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 379b7d49e1c4426b4b3855180caaf97167ca6854 Mon Sep 17 00:00:00 2001
From: Yethal <26117918+Yethal@users.noreply.github.com>
Date: Thu, 30 Oct 2025 16:34:02 +0100
Subject: [PATCH 4179/6226] roon-server: 2.55.1559 -> 2.56.1582

---
 pkgs/by-name/ro/roon-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ro/roon-server/package.nix b/pkgs/by-name/ro/roon-server/package.nix
index 7622cb01527b..efbbe77a34d8 100644
--- a/pkgs/by-name/ro/roon-server/package.nix
+++ b/pkgs/by-name/ro/roon-server/package.nix
@@ -16,7 +16,7 @@
   stdenv,
 }:
 let
-  version = "2.55.1559";
+  version = "2.56.1582";
   urlVersion = builtins.replaceStrings [ "." ] [ "0" ] version;
 in
 stdenv.mkDerivation {
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
 
   src = fetchurl {
     url = "https://download.roonlabs.com/updates/production/RoonServer_linuxx64_${urlVersion}.tar.bz2";
-    hash = "sha256-eeQ6Gci63GRdN5HOtT5+RFgWcnpTeCG6hBk1bNKXYoE=";
+    hash = "sha256-LKuno7SpOpxx3JpM36tYlOHjJWWRLRjPiA096Bv/QvQ=";
   };
 
   dontConfigure = true;

From 4354cf9f7bc121d5e37a84bb1cb79cb73c24a7ba Mon Sep 17 00:00:00 2001
From: Benjamin Sparks <b.sparks@alugha.com>
Date: Thu, 30 Oct 2025 15:39:26 +0000
Subject: [PATCH 4180/6226] ty: 0.0.1-alpha.24 -> 0.0.1-alpha.25

---
 pkgs/by-name/ty/ty/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/ty/package.nix b/pkgs/by-name/ty/ty/package.nix
index 31297822df3b..3846715e48f9 100644
--- a/pkgs/by-name/ty/ty/package.nix
+++ b/pkgs/by-name/ty/ty/package.nix
@@ -14,14 +14,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ty";
-  version = "0.0.1-alpha.24";
+  version = "0.0.1-alpha.25";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ty";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-QcWYrXWKxoqaaVNXgsrL05DyCbewltlVHgd7xQWd0g4=";
+    hash = "sha256-roN8sU0WjGXd1jfQiTXSJ0OQRW8MbNYUfCdz744lnRM=";
   };
 
   # For Darwin platforms, remove the integration test for file notifications,
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoBuildFlags = [ "--package=ty" ];
 
-  cargoHash = "sha256-fo1he5WyQK4qu1gz50snah49GMopfQtbtJRwSimT1Fg=";
+  cargoHash = "sha256-A2lPCweusmDPwh6IXAj4D6+GRK6CaZSP5gFDhrsBI5Q=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 804c0e52f6387c5ed5c7f3340d1219ba1f1e5e06 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 15:41:16 +0000
Subject: [PATCH 4181/6226] sozu: 1.0.6 -> 1.1.0

---
 pkgs/by-name/so/sozu/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/so/sozu/package.nix b/pkgs/by-name/so/sozu/package.nix
index 6998bdc71f35..2dc4b0b972da 100644
--- a/pkgs/by-name/so/sozu/package.nix
+++ b/pkgs/by-name/so/sozu/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sozu";
-  version = "1.0.6";
+  version = "1.1.0";
 
   src = fetchFromGitHub {
     owner = "sozu-proxy";
     repo = "sozu";
     rev = version;
-    hash = "sha256-Cda53lhKPxm2w8guoKuQjdjhZNWJinzR1PHc5S57y2w=";
+    hash = "sha256-yODApjpcHl9wmf+6TEVzXTme8e68b3Ee1y64D/u7NW8=";
   };
 
-  cargoHash = "sha256-AIj59MqK+TqyTTDjGzN1Oec3svPaXRBkHJTBtxTwZNg=";
+  cargoHash = "sha256-HADNumewYIejVPHXknGayrK4hZ5hBCk0rTFQ/xeG3Mo=";
 
   nativeBuildInputs = [ protobuf ];
 

From 876df71365b3c0ab2d363cd6af36a80199879430 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Thu, 30 Oct 2025 15:39:37 +0000
Subject: [PATCH 4182/6226] opencode: 0.15.14 -> 0.15.29

---
 pkgs/by-name/op/opencode/package.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index a3def7a3309d..de6b5a9e4f29 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -22,12 +22,12 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.15.14";
+  version = "0.15.29";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "opencode";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-K7TmsJm11uDNjN3fUaapM1A01FmHUSfXMiqOzhLzRI8=";
+    hash = "sha256-L3IcADx0fbtnqlf8Ysc1J5DVJp6ZQtN2faBJqAFMD3g=";
   };
 
   tui = buildGoModule {
@@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     modRoot = "packages/tui";
 
-    vendorHash = "sha256-g3+2q7yRaM6BgIs5oIXz/u7B84ZMMjnxXpvFpqDePU4=";
+    vendorHash = "sha256-muwry7B0GlgueV8+9pevAjz3Cg3MX9AMr+rBwUcQ9CM=";
 
     subPackages = [ "cmd/opencode" ];
 
@@ -111,10 +111,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
     outputHash =
       {
-        x86_64-linux = "sha256-8pJBLNPuF7+wcUCNoI9z68q5Pl6Mvm1ZvIDianLPdHo=";
-        aarch64-linux = "sha256-zODR/4mcE4Hh3I6Yh8ExUi3WdBttrRBf00ItQ4TmVMU=";
-        x86_64-darwin = "sha256-ZJFT0qY82UK9jXVMQweXXjZ4ohZLKVJEf+CjfRkJB9E=";
-        aarch64-darwin = "sha256-0bjdbPXm2TkOEsSyqvPJnFLIzmBJt5SH40hwYutWYBY=";
+        x86_64-linux = "sha256-QX+6uxG1V4QdecJX5vyFlgy5pBPPv8rne7pklSA2k3c=";
+        aarch64-linux = "sha256-S8nuMMgGeGAuCevuLxMK5j9+VFbqWuqf+ZYZSVzAp/k=";
+        x86_64-darwin = "sha256-qwRMCTSj7+0tygwWO4INYdblpGpUZm2RMhnELdd6sw4=";
+        aarch64-darwin = "sha256-vJ1tSW/ozE1Fz16RFcV46DDyyITGeuBhbqNMegIoGAo=";
       }
       .${stdenv.hostPlatform.system};
     outputHashAlgo = "sha256";
@@ -194,6 +194,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   meta = {
     description = "AI coding agent built for the terminal";
+    changelog = "https://github.com/sst/opencode/releases/tag/${finalAttrs.src.tag}";
     longDescription = ''
       OpenCode is a terminal-based agent that can build anything.
       It combines a TypeScript/JavaScript core with a Go-based TUI

From db07f2a7a1eb12118d19a5c7c438b003c49284f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 15:46:45 +0000
Subject: [PATCH 4183/6226] reindeer: 2025.10.20.00 -> 2025.10.27.00

---
 pkgs/by-name/re/reindeer/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix
index f625eb94e134..6908f925be6b 100644
--- a/pkgs/by-name/re/reindeer/package.nix
+++ b/pkgs/by-name/re/reindeer/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "reindeer";
-  version = "2025.10.20.00";
+  version = "2025.10.27.00";
 
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "reindeer";
     tag = "v${version}";
-    hash = "sha256-SHJIDFhK5y+XxOS76pbSXW8Hr1Y5g0uhSw4km5usIsM=";
+    hash = "sha256-ykey6fdL9bjf+IfIAKzlIs5Pw/r2rAe6VB8BR1fUtz4=";
   };
 
-  cargoHash = "sha256-XTp0GaqJhNf6auZzdv0+aGgIJ6hh3027EqPr90nWB3I=";
+  cargoHash = "sha256-aFDMVxWLeE8TtQCW5U2ULh9yJBc67vkXkPjgo+QPxYM=";
 
   nativeBuildInputs = [ pkg-config ];
 

From e3a99ce98497ef5ff09be8e9c5aee4489b8dc4f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 15:53:22 +0000
Subject: [PATCH 4184/6226] python3Packages.pymiele: 0.5.5 -> 0.5.6

---
 pkgs/development/python-modules/pymiele/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymiele/default.nix b/pkgs/development/python-modules/pymiele/default.nix
index bd9db22d7a2d..1712b7cb8025 100644
--- a/pkgs/development/python-modules/pymiele/default.nix
+++ b/pkgs/development/python-modules/pymiele/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pymiele";
-  version = "0.5.5";
+  version = "0.5.6";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-C1E5z/h4XCDhUP07EL8s6Xv++M03vx8KZOMjWySyUMw=";
+    hash = "sha256-JRP7k5XbNBYCx9pdulL6UIv/E/OdbzxnEYsLXoI41sI=";
   };
 
   build-system = [ setuptools ];

From 55064d4eff97feb52f218e5b2928861c76f77e7b Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 30 Oct 2025 15:14:15 +0100
Subject: [PATCH 4185/6226] scion-bootstrapper: 0.0.7 ->
 0.0.8-unstable-2024-11-28

---
 .../0001-Update-to-Go-1.24.patch              | 148 ++++++++++++++++++
 .../by-name/sc/scion-bootstrapper/package.nix |  36 ++++-
 2 files changed, 179 insertions(+), 5 deletions(-)
 create mode 100644 pkgs/by-name/sc/scion-bootstrapper/0001-Update-to-Go-1.24.patch

diff --git a/pkgs/by-name/sc/scion-bootstrapper/0001-Update-to-Go-1.24.patch b/pkgs/by-name/sc/scion-bootstrapper/0001-Update-to-Go-1.24.patch
new file mode 100644
index 000000000000..5cb3afbc2fb0
--- /dev/null
+++ b/pkgs/by-name/sc/scion-bootstrapper/0001-Update-to-Go-1.24.patch
@@ -0,0 +1,148 @@
+From 3c42f5b7f2648020e1b6710ab8c169a1ca2a4af2 Mon Sep 17 00:00:00 2001
+From: Marten Gartner <martenwallewein@web.de>
+Date: Wed, 23 Apr 2025 11:41:41 +0200
+Subject: [PATCH] Update to Go 1.24
+
+---
+ go.mod | 29 +++++++++++++++++------------
+ go.sum | 31 +++++++++++++++++++++++++++++++
+ 2 files changed, 48 insertions(+), 12 deletions(-)
+
+diff --git a/go.mod b/go.mod
+index d4a4809..e6b36ea 100644
+--- a/go.mod
++++ b/go.mod
+@@ -2,29 +2,34 @@ module github.com/netsec-ethz/bootstrapper
+ 
+ require (
+ 	github.com/grandcat/zeroconf v1.0.0
+-	github.com/inconshreveable/log15 v0.0.0-20201112154412-8562bdadbbac
+-	github.com/insomniacslk/dhcp v0.0.0-20200922210017-67c425063dca
+-	github.com/mdlayher/ndp v0.10.0
+-	github.com/miekg/dns v1.1.27
+-	github.com/pelletier/go-toml v1.8.1-0.20200708110244-34de94e6a887
++	github.com/inconshreveable/log15 v2.16.0+incompatible
++	github.com/insomniacslk/dhcp v0.0.0-20250417080101-5f8cf70e8c5f
++	github.com/mdlayher/ndp v1.1.0
++	github.com/miekg/dns v1.1.65
++	github.com/pelletier/go-toml v1.9.5
+ 	github.com/stretchr/testify v1.6.1
+-	golang.org/x/net v0.0.0-20220225172249-27dd8689420f
+-	golang.org/x/sys v0.0.0-20220317061510-51cd9980dadf
++	golang.org/x/net v0.39.0
++	golang.org/x/sys v0.32.0
+ )
+ 
+ require (
+ 	github.com/cenkalti/backoff v2.2.1+incompatible // indirect
+ 	github.com/davecgh/go-spew v1.1.1 // indirect
+-	github.com/go-stack/stack v1.8.0 // indirect
+-	github.com/mattn/go-colorable v0.1.8 // indirect
+-	github.com/mattn/go-isatty v0.0.12 // indirect
++	github.com/go-stack/stack v1.8.1 // indirect
++	github.com/mattn/go-colorable v0.1.14 // indirect
++	github.com/mattn/go-isatty v0.0.20 // indirect
+ 	github.com/pmezard/go-difflib v1.0.0 // indirect
+ 	github.com/u-root/u-root v7.0.0+incompatible // indirect
+ 	gitlab.com/golang-commonmark/puny v0.0.0-20191124015043-9f83538fa04f // indirect
+-	golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 // indirect
++	golang.org/x/crypto v0.37.0 // indirect
++	golang.org/x/mod v0.24.0 // indirect
++	golang.org/x/sync v0.13.0 // indirect
++	golang.org/x/term v0.31.0 // indirect
++	golang.org/x/text v0.24.0 // indirect
++	golang.org/x/tools v0.32.0 // indirect
+ 	gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
+ )
+ 
+ replace github.com/insomniacslk/dhcp => github.com/stapelberg/dhcp v0.0.0-20190429172946-5244c0daddf0
+ 
+-go 1.22
++go 1.24
+diff --git a/go.sum b/go.sum
+index f01ae89..33c192f 100644
+--- a/go.sum
++++ b/go.sum
+@@ -5,22 +5,36 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
+ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+ github.com/go-stack/stack v1.8.0 h1:5SgMzNM5HxrEjV0ww2lTmX6E2Izsfxas4+YHWRs3Lsk=
+ github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
++github.com/go-stack/stack v1.8.1 h1:ntEHSVwIt7PNXNpgPmVfMrNhLtgjlmnZha2kOpuRiDw=
++github.com/go-stack/stack v1.8.1/go.mod h1:dcoOX6HbPZSZptuspn9bctJ+N/CnF5gGygcUP3XYfe4=
+ github.com/google/go-cmp v0.5.7 h1:81/ik6ipDQS2aGcBfIN5dHDB36BwrStyeAQquSYCV4o=
+ github.com/google/go-cmp v0.5.7/go.mod h1:n+brtR0CgQNWTVd5ZUFpTBC8YFBDLK/h/bpaJ8/DtOE=
+ github.com/grandcat/zeroconf v1.0.0 h1:uHhahLBKqwWBV6WZUDAT71044vwOTL+McW0mBJvo6kE=
+ github.com/grandcat/zeroconf v1.0.0/go.mod h1:lTKmG1zh86XyCoUeIHSA4FJMBwCJiQmGfcP2PdzytEs=
+ github.com/inconshreveable/log15 v0.0.0-20201112154412-8562bdadbbac h1:n1DqxAo4oWPMvH1+v+DLYlMCecgumhhgnxAPdqDIFHI=
+ github.com/inconshreveable/log15 v0.0.0-20201112154412-8562bdadbbac/go.mod h1:cOaXtrgN4ScfRrD9Bre7U1thNq5RtJ8ZoP4iXVGRj6o=
++github.com/inconshreveable/log15 v2.16.0+incompatible h1:6nvMKxtGcpgm7q0KiGs+Vc+xDvUXaBqsPKHWKsinccw=
++github.com/inconshreveable/log15 v2.16.0+incompatible/go.mod h1:cOaXtrgN4ScfRrD9Bre7U1thNq5RtJ8ZoP4iXVGRj6o=
+ github.com/mattn/go-colorable v0.1.8 h1:c1ghPdyEDarC70ftn0y+A/Ee++9zz8ljHG1b13eJ0s8=
+ github.com/mattn/go-colorable v0.1.8/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
++github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
++github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
+ github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
+ github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
++github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
++github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
+ github.com/mdlayher/ndp v0.10.0 h1:Zdwol2bq1EHY8xSnejIYkq6LEj7dLjLymJX0o/2tjGw=
+ github.com/mdlayher/ndp v0.10.0/go.mod h1:Uv6IWvgvqirNUu2N3ZXJEB86xu6foyUsG0NrClSSfek=
++github.com/mdlayher/ndp v1.1.0 h1:QylGKGVtH60sKZUE88+IW5ila1Z/M9/OXhWdsVKuscs=
++github.com/mdlayher/ndp v1.1.0/go.mod h1:FmgESgemgjl38vuOIyAHWUUL6vQKA/pQNkvXdWsdQFM=
+ github.com/miekg/dns v1.1.27 h1:aEH/kqUzUxGJ/UHcEKdJY+ugH6WEzsEBBSPa8zuy1aM=
+ github.com/miekg/dns v1.1.27/go.mod h1:KNUDUusw/aVsxyTYZM1oqvCicbwhgbNgztCETuNZ7xM=
++github.com/miekg/dns v1.1.65 h1:0+tIPHzUW0GCge7IiK3guGP57VAw7hoPDfApjkMD1Fc=
++github.com/miekg/dns v1.1.65/go.mod h1:Dzw9769uoKVaLuODMDZz9M6ynFU6Em65csPuoi8G0ck=
+ github.com/pelletier/go-toml v1.8.1-0.20200708110244-34de94e6a887 h1:0r6tAXtt8p5+IJtshL5f+5E/z0qH2aE89UmV4/tRF64=
+ github.com/pelletier/go-toml v1.8.1-0.20200708110244-34de94e6a887/go.mod h1:T2/BmBdy8dvIRq1a/8aqjN41wvWlN4lrapLU/GW4pbc=
++github.com/pelletier/go-toml v1.9.5 h1:4yBQzkHv+7BHq2PQUZF3Mx0IYxG7LsP222s7Agd3ve8=
++github.com/pelletier/go-toml v1.9.5/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
+ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
+ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
+ github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+@@ -39,16 +53,24 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk
+ golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
+ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 h1:psW17arqaxU48Z5kZ0CQnkZWQJsqcURM6tKiBApRjXI=
+ golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
++golang.org/x/crypto v0.37.0 h1:kJNSjF/Xp7kU0iB2Z+9viTPMW4EqqsrywMXLJOOsXSE=
++golang.org/x/crypto v0.37.0/go.mod h1:vg+k43peMZ0pUMhYmVAWysMK35e6ioLh3wB8ZCAfbVc=
+ golang.org/x/mod v0.1.1-0.20191105210325-c90efee705ee/go.mod h1:QqPTAvyqsEbceGzBzNggFXnrqF1CaUcvgkdR5Ot7KZg=
++golang.org/x/mod v0.24.0 h1:ZfthKaKaT4NrhGVZHO1/WDTwGES4De8KtWO0SIbNJMU=
++golang.org/x/mod v0.24.0/go.mod h1:IXM97Txy2VM4PJ3gI61r1YEk/gAj6zAHN3AdZt6S9Ww=
+ golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
+ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+ golang.org/x/net v0.0.0-20190923162816-aa69164e4478/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+ golang.org/x/net v0.0.0-20200114155413-6afb5195e5aa/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
+ golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
+ golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
++golang.org/x/net v0.39.0 h1:ZCu7HMWDxpXpaiKdhzIfaltL9Lp31x/3fCP11bc6/fY=
++golang.org/x/net v0.39.0/go.mod h1:X7NRbYVEA+ewNkCNyJ513WmMdQ3BineSwVtN2zD/d+E=
+ golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
+ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
+ golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
++golang.org/x/sync v0.13.0 h1:AauUjRAJ9OSnvULf/ARrrVywoJDy0YS2AwQ98I37610=
++golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+ golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
+ golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+@@ -56,8 +78,17 @@ golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod h1:h1NjWce9XRLGQEsW7w
+ golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+ golang.org/x/sys v0.0.0-20220317061510-51cd9980dadf h1:Fm4IcnUL803i92qDlmB0obyHmosDrxZWxJL3gIeNqOw=
+ golang.org/x/sys v0.0.0-20220317061510-51cd9980dadf/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
++golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
++golang.org/x/sys v0.32.0 h1:s77OFDvIQeibCmezSnk/q6iAfkdiQaJi4VzroCFrN20=
++golang.org/x/sys v0.32.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
++golang.org/x/term v0.31.0 h1:erwDkOK1Msy6offm1mOgvspSkslFnIGsFnxOKoufg3o=
++golang.org/x/term v0.31.0/go.mod h1:R4BeIy7D95HzImkxGkTW1UQTtP54tio2RyHz7PwK0aw=
+ golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
++golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
++golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
+ golang.org/x/tools v0.0.0-20191216052735-49a3e744a425/go.mod h1:TB2adYChydJhpapKDTa4BR/hXlZSLoq2Wpct/0txZ28=
++golang.org/x/tools v0.32.0 h1:Q7N1vhpkQv7ybVzLFtTjvQya2ewbwNDZzUgfXGqtMWU=
++golang.org/x/tools v0.32.0/go.mod h1:ZxrU41P/wAbZD8EDa6dDCa6XfpkhJ7HFMjHJXfBDu8s=
+ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
+ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+-- 
+2.50.1
+
diff --git a/pkgs/by-name/sc/scion-bootstrapper/package.nix b/pkgs/by-name/sc/scion-bootstrapper/package.nix
index 306368b7ec4e..b73ecd744438 100644
--- a/pkgs/by-name/sc/scion-bootstrapper/package.nix
+++ b/pkgs/by-name/sc/scion-bootstrapper/package.nix
@@ -2,28 +2,54 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+
+  # tests
+  scion,
+  openssl,
 }:
 
 buildGoModule rec {
   pname = "scion-bootstrapper";
-  version = "0.0.7";
+  version = "0.0.8-unstable-2024-11-28";
 
   src = fetchFromGitHub {
     owner = "netsec-ethz";
     repo = "bootstrapper";
-    rev = "v${version}";
-    hash = "sha256-X4lNgd6klIw0NW9NVG+d1JK+WNfOclbu43GYucelB7o=";
+    rev = "3fc6dad144843b3e7724e1b7e0af63235936168e";
+    hash = "sha256-rs8BVN+jqwpSIfdtUzi9X9zSRStHJZSWjr32m8vWQ8g=";
   };
 
-  vendorHash = "sha256-X4bOIvNlyQoAWOd3L6suE64KnlCV6kuE1ieVecVYWOw=";
+  vendorHash = "sha256-SITnZXQ76eVedNVYWVwtH1ezDoMBmE1Uh9FpHA5+T8c=";
 
-  doCheck = false;
+  patches = [
+    # https://github.com/netsec-ethz/bootstrapper/pull/31
+    ./0001-Update-to-Go-1.24.patch
+  ];
+
+  nativeCheckInputs = [
+    scion
+    openssl
+  ];
 
   ldflags = [
     "-s"
     "-w"
   ];
 
+  checkFlags =
+    let
+      skippedTests = [
+        # non-reproducible since it depends on the cert time
+        "TestVerify"
+        # requires internet access
+        "TestDNSLookupAkaNS"
+        "TestDNSLookupExternalIP"
+        "TestReverseLookupDomains"
+        "TestReverseLookupWHOIS"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
   postInstall = ''
     mv $out/bin/bootstrapper $out/bin/scion-bootstrapper
   '';

From 1031f9a88513d7c0d62ed179af98f4e27a9d8ff9 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 30 Oct 2025 15:16:02 +0100
Subject: [PATCH 4186/6226] scion-bootstrapper: small improvements

- Add update script
- Add NGI team
- Use finalAttrs
---
 pkgs/by-name/sc/scion-bootstrapper/package.nix | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sc/scion-bootstrapper/package.nix b/pkgs/by-name/sc/scion-bootstrapper/package.nix
index b73ecd744438..ab96b3757f3d 100644
--- a/pkgs/by-name/sc/scion-bootstrapper/package.nix
+++ b/pkgs/by-name/sc/scion-bootstrapper/package.nix
@@ -2,13 +2,14 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nix-update-script,
 
   # tests
   scion,
   openssl,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "scion-bootstrapper";
   version = "0.0.8-unstable-2024-11-28";
 
@@ -54,14 +55,17 @@ buildGoModule rec {
     mv $out/bin/bootstrapper $out/bin/scion-bootstrapper
   '';
 
-  meta = with lib; {
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
     description = "Bootstrapper for SCION network configuration";
     homepage = "https://github.com/netsec-ethz/bootstrapper";
-    license = licenses.asl20;
-    maintainers = with maintainers; [
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [
       matthewcroughan
       sarcasticadmin
     ];
+    teams = with lib.teams; [ ngi ];
     mainProgram = "scion-bootstrapper";
   };
-}
+})

From 23515ff9424c224b7cec73c32473018203bdd147 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Thu, 30 Oct 2025 16:13:15 +0000
Subject: [PATCH 4187/6226] polkadot: 2506-1 -> 2509-1

---
 pkgs/by-name/po/polkadot/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/po/polkadot/package.nix b/pkgs/by-name/po/polkadot/package.nix
index 1e50ded77ad6..33600ba484ab 100644
--- a/pkgs/by-name/po/polkadot/package.nix
+++ b/pkgs/by-name/po/polkadot/package.nix
@@ -17,13 +17,13 @@ let
 in
 rustPlatform.buildRustPackage rec {
   pname = "polkadot";
-  version = "2506-1";
+  version = "2509-1";
 
   src = fetchFromGitHub {
     owner = "paritytech";
     repo = "polkadot-sdk";
     rev = "polkadot-stable${version}";
-    hash = "sha256-gnPfhdlOakfm9Ieitl8CBLBht1ECkfXhguK9eNeI6k4=";
+    hash = "sha256-XisQA5WNmFaFfY7T4EMcwlOD8FUfAjmLDV7NSWsh3vA=";
 
     # the build process of polkadot requires a .git folder in order to determine
     # the git commit hash that is being built and add it to the version string.
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
     rm .git_commit
   '';
 
-  cargoHash = "sha256-f6VI8pWZ+yRyFGO347ASD31k3WyBuRixqIUfzBqIr+s=";
+  cargoHash = "sha256-QqtLr6SvJGYrY0wGZw196amrGqLZg/Nea+QTYM1RzIs=";
 
   buildType = "production";
   buildAndTestSubdir = "polkadot";

From feedb2b7cdb8b84657904639c3004b83673f1026 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 16:15:11 +0000
Subject: [PATCH 4188/6226] python3Packages.btrees: 6.1 -> 6.2

---
 pkgs/development/python-modules/btrees/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix
index 2ba7e1e848d4..0ec699163c41 100644
--- a/pkgs/development/python-modules/btrees/default.nix
+++ b/pkgs/development/python-modules/btrees/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "btrees";
-  version = "6.1";
+  version = "6.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-4YdG+GQYaaIPRTKMm1+X3GxxoRlZYDVq72O3X1yNRF8=";
+    hash = "sha256-SnxwN2aEfrD6tYrpudacyAWIy/1uNFcrur1FU+B5/is=";
   };
 
   propagatedBuildInputs = [

From 20ccdc6cc40c8378cce5d9d577c3ea096bff3bf4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 16:37:37 +0000
Subject: [PATCH 4189/6226] dblab: 0.34.1 -> 0.34.2

---
 pkgs/by-name/db/dblab/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/db/dblab/package.nix b/pkgs/by-name/db/dblab/package.nix
index c4ceef8920c7..fecee5b4328b 100644
--- a/pkgs/by-name/db/dblab/package.nix
+++ b/pkgs/by-name/db/dblab/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "dblab";
-  version = "0.34.1";
+  version = "0.34.2";
 
   src = fetchFromGitHub {
     owner = "danvergara";
     repo = "dblab";
     rev = "v${version}";
-    hash = "sha256-9gQjO9u/wONqmJjt5ejztWlFkqsJ8HUyPp3j5OyZEz4=";
+    hash = "sha256-e3p2+QBoxyJu15fTb/7gH32zE4h8V2iDxbxoNMVqElM=";
   };
 
   vendorHash = "sha256-NhBT0dBS3jKgWHxCMVV6NUMcvqCbKS+tlm3y1YI/sAE=";

From 3927778ea97df2ffce3684cd0773d46a8a39af5d Mon Sep 17 00:00:00 2001
From: Manuel Mendez <git@i.m.mmlb.dev>
Date: Mon, 27 Oct 2025 13:17:06 -0400
Subject: [PATCH 4190/6226] cargo-nextest: Avoid usdt on macos entirely

usdt depends on dtrace for macos which is unsupported in nixpkgs, so
need to avoid. Disable by patching so future updates will likely fail to
apply the patch if anything changes here.
---
 .../ca/cargo-nextest/no-dtrace-macos.patch    | 62 +++++++++++++++++++
 pkgs/by-name/ca/cargo-nextest/package.nix     |  6 ++
 2 files changed, 68 insertions(+)
 create mode 100644 pkgs/by-name/ca/cargo-nextest/no-dtrace-macos.patch

diff --git a/pkgs/by-name/ca/cargo-nextest/no-dtrace-macos.patch b/pkgs/by-name/ca/cargo-nextest/no-dtrace-macos.patch
new file mode 100644
index 000000000000..ffd49c79d4dc
--- /dev/null
+++ b/pkgs/by-name/ca/cargo-nextest/no-dtrace-macos.patch
@@ -0,0 +1,62 @@
+diff --git a/nextest-runner/Cargo.toml b/nextest-runner/Cargo.toml
+index 776c9341..06196bd2 100644
+--- a/nextest-runner/Cargo.toml
++++ b/nextest-runner/Cargo.toml
+@@ -118,7 +118,7 @@ nix.workspace = true
+ #
+ # Also, usdt 0.6.0 fails to compile on x86_64-apple-darwin, so restrict it to
+ # aarch64-apple-darwin.
+-[target.'cfg(any(all(target_arch = "x86_64", any(target_os = "linux", target_os = "freebsd", target_os = "illumos")), all(target_arch = "aarch64", any(target_os = "macos", target_os = "freebsd", target_os = "illumos"))))'.dependencies]
++[target.'cfg(any(all(target_arch = "x86_64", any(target_os = "linux", target_os = "freebsd", target_os = "illumos")), all(target_arch = "aarch64", any(target_os = "freebsd", target_os = "illumos"))))'.dependencies]
+ usdt = "0.6.0"
+ 
+ [target.'cfg(windows)'.dependencies]
+diff --git a/nextest-runner/src/usdt.rs b/nextest-runner/src/usdt.rs
+index 7732eeb4..af69015b 100644
+--- a/nextest-runner/src/usdt.rs
++++ b/nextest-runner/src/usdt.rs
+@@ -28,7 +28,7 @@ use serde::Serialize;
+     ),
+     all(
+         target_arch = "aarch64",
+-        any(target_os = "macos", target_os = "freebsd", target_os = "illumos")
++        any(target_os = "freebsd", target_os = "illumos")
+     )
+ ))]
+ pub fn register_probes() -> Result<(), usdt::Error> {
+@@ -43,7 +43,7 @@ pub fn register_probes() -> Result<(), usdt::Error> {
+     ),
+     all(
+         target_arch = "aarch64",
+-        any(target_os = "macos", target_os = "freebsd", target_os = "illumos")
++        any(target_os = "freebsd", target_os = "illumos")
+     )
+ )))]
+ pub fn register_probes() -> Result<(), std::convert::Infallible> {
+@@ -57,7 +57,7 @@ pub fn register_probes() -> Result<(), std::convert::Infallible> {
+     ),
+     all(
+         target_arch = "aarch64",
+-        any(target_os = "macos", target_os = "freebsd", target_os = "illumos")
++        any(target_os = "freebsd", target_os = "illumos")
+     )
+ ))]
+ #[usdt::provider(provider = "nextest")]
+@@ -135,7 +135,7 @@ pub mod usdt_probes {
+     ),
+     all(
+         target_arch = "aarch64",
+-        any(target_os = "macos", target_os = "freebsd", target_os = "illumos")
++        any(target_os = "freebsd", target_os = "illumos")
+     )
+ ))]
+ #[macro_export]
+@@ -246,7 +246,7 @@ macro_rules! fire_usdt {
+     ),
+     all(
+         target_arch = "aarch64",
+-        any(target_os = "macos", target_os = "freebsd", target_os = "illumos")
++        any(target_os = "freebsd", target_os = "illumos")
+     )
+ )))]
+ #[macro_export]
diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix
index 2089b3bee2c4..549f8f579250 100644
--- a/pkgs/by-name/ca/cargo-nextest/package.nix
+++ b/pkgs/by-name/ca/cargo-nextest/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   rustPlatform,
   fetchFromGitHub,
   nix-update-script,
@@ -16,6 +17,11 @@ rustPlatform.buildRustPackage rec {
     hash = "sha256-DY/FNtlNQg9Ym6PKo6UqSuWzGC3cDhbNU6MKTDxIaU4=";
   };
 
+  # FIXME: we don't support dtrace probe generation on macOS until we have a dtrace build: https://github.com/NixOS/nixpkgs/pull/392918
+  patches = lib.optionals stdenv.isDarwin [
+    ./no-dtrace-macos.patch
+  ];
+
   cargoHash = "sha256-uQH9d+9VByXe/lL4Ybz07p+iYWUhbATMBCu7mYKxOSE=";
 
   cargoBuildFlags = [

From 3ad5ed9484347f646eded224be750ab5533daccc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 30 Oct 2025 09:45:26 -0700
Subject: [PATCH 4191/6226] python3Packages.affine-gaps: 0.2.3 -> 0.2.4

Diff: https://github.com/gata-bio/affine-gaps/compare/v0.2.3...v0.2.4

Changelog: https://github.com/gata-bio/affine-gaps/releases/tag/v0.2.4
---
 pkgs/development/python-modules/affine-gaps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/affine-gaps/default.nix b/pkgs/development/python-modules/affine-gaps/default.nix
index ac5bce042918..a71d94b2ac93 100644
--- a/pkgs/development/python-modules/affine-gaps/default.nix
+++ b/pkgs/development/python-modules/affine-gaps/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "affine-gaps";
-  version = "0.2.3";
+  version = "0.2.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "gata-bio";
     repo = "affine-gaps";
     tag = "v${version}";
-    hash = "sha256-GP6Ahp1LQYnKp9V7jDEeFsntMC9Qav5kWm+5bSldtyM=";
+    hash = "sha256-WMH2wUqzA196FSe2TpfslQVW0PGwk7lGMRSKyfCG9rg=";
   };
 
   build-system = [ hatchling ];

From 256443093ec2c779f8c12eb80ef3c628226bd18e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 16:54:35 +0000
Subject: [PATCH 4192/6226] siyuan: 3.3.5 -> 3.3.6

---
 pkgs/by-name/si/siyuan/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/si/siyuan/package.nix b/pkgs/by-name/si/siyuan/package.nix
index da9f0ed4387f..869dfbc265ed 100644
--- a/pkgs/by-name/si/siyuan/package.nix
+++ b/pkgs/by-name/si/siyuan/package.nix
@@ -35,20 +35,20 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "siyuan";
-  version = "3.3.5";
+  version = "3.3.6";
 
   src = fetchFromGitHub {
     owner = "siyuan-note";
     repo = "siyuan";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-6CKY5rIPI+8uKh1vjw9nBI01J8o7U4vlxEPJS7xaAVg=";
+    hash = "sha256-LG6JVeP5OmC/8OcUq+a3Xj/BTNB5C4XXhp0VVE8BZ6k=";
   };
 
   kernel = buildGoModule {
     name = "${finalAttrs.pname}-${finalAttrs.version}-kernel";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/kernel";
-    vendorHash = "sha256-kDWOkAY6GiSp/oLkyLya2VYWmLz4fPxZPRKGlb2B8M4=";
+    vendorHash = "sha256-ZUSfehCqHUZyWHHisulg4x9v+YtnoktqaLDR7SjeGQo=";
 
     patches = [
       (replaceVars ./set-pandoc-path.patch {
@@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: {
       postPatch
       ;
     fetcherVersion = 1;
-    hash = "sha256-Q67JRE0XXjrIAyC30DDCtdh1Ja+9ME2mmIfh21Lx+mw=";
+    hash = "sha256-uAv/KTkLy/cvVctceBFA5xwlgGeSmbutgUP39zvZIhU=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/app";

From 8cad8c58059f7855eb65971854447891e6884bff Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexfmpe@proton.me>
Date: Thu, 30 Oct 2025 16:54:38 +0000
Subject: [PATCH 4193/6226] redu: disable nightly

Not needed since 0.2.13 release
---
 pkgs/by-name/re/redu/package.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/re/redu/package.nix b/pkgs/by-name/re/redu/package.nix
index fc117ebaa136..6d27b9b7a05a 100644
--- a/pkgs/by-name/re/redu/package.nix
+++ b/pkgs/by-name/re/redu/package.nix
@@ -18,8 +18,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-ZUA9zmWzPvyFmqQFW3ShnQRqG3TODN7K8Ex1jrOZxd0=";
 
-  env.RUSTC_BOOTSTRAP = 1;
-
   passthru.updateScript = nix-update-script { };
 
   meta = {

From 6112f3e8f6c75230d2bd76d519a4a23623eb4086 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Tue, 28 Oct 2025 11:59:16 -0700
Subject: [PATCH 4194/6226] python3Packages.gst-python: use `mesonCheckPhase`

---
 pkgs/development/python-modules/gst-python/default.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index 12e20e097e81..d2f700ecb0ef 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -82,9 +82,10 @@ buildPythonPackage rec {
     "-Dpython-exe=${python.pythonOnBuildForHost.interpreter}"
   ];
 
-  # TODO: Meson setup hook does not like buildPythonPackage
-  # https://github.com/NixOS/nixpkgs/issues/47390
-  installCheckPhase = "meson test --print-errorlogs";
+  # `buildPythonPackage` uses `installCheckPhase` and leaves `checkPhase`
+  # empty. It renames `doCheck` from its arguments, but not `checkPhase`.
+  # See: https://github.com/NixOS/nixpkgs/issues/47390
+  installCheckPhase = "mesonCheckPhase";
 
   preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
     export DYLD_LIBRARY_PATH="${gst_all_1.gst-plugins-base}/lib"

From db781ef3e131c0a6be190110c186991615b70ec8 Mon Sep 17 00:00:00 2001
From: Rebecca Turner <rbt@sent.as>
Date: Tue, 28 Oct 2025 11:59:16 -0700
Subject: [PATCH 4195/6226] python3Packages.gst-python: disable tests on darwin

Closes #454955

These tests are very flaky on Darwin for whatever reason. Sometimes they
just mysteriously time out.

When setting `doCheck = !stdenv.hostPlatform.isDarwin`, I discovered
that the `checkInputs` entry `gst-rtsp-server` is in fact needed to
build the project, so this incorporates #451261 to fix that issue.
---
 .../python-modules/gst-python/default.nix     | 22 +++++++++++++------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/gst-python/default.nix b/pkgs/development/python-modules/gst-python/default.nix
index d2f700ecb0ef..be3bbbc83125 100644
--- a/pkgs/development/python-modules/gst-python/default.nix
+++ b/pkgs/development/python-modules/gst-python/default.nix
@@ -6,6 +6,9 @@
   fetchpatch,
   meson,
   ninja,
+  # TODO: We can get rid of this once `buildPythonPackage` accepts `finalAttrs`.
+  # See: https://github.com/NixOS/nixpkgs/pull/271387
+  gst-python,
 
   pkg-config,
   python,
@@ -42,13 +45,6 @@ buildPythonPackage rec {
     })
   ];
 
-  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
-    # The analytics tests often timeout under load on Darwin (e.g. on Hydra), so remove them
-    substituteInPlace testsuite/meson.build --replace-fail \
-      "['Test analytics', 'test_analytics.py', ['gst-plugins-bad/gst-libs/gst/analytics', 'gst-plugins-base/gst-libs/gst/video']]," \
-      ""
-  '';
-
   # Python 2.x is not supported.
   disabled = !isPy3k;
 
@@ -80,8 +76,20 @@ buildPythonPackage rec {
     "-Dpygi-overrides-dir=${placeholder "out"}/${python.sitePackages}/gi/overrides"
     # Exec format error during configure
     "-Dpython-exe=${python.pythonOnBuildForHost.interpreter}"
+    # This is needed to prevent the project from looking for `gst-rtsp-server`
+    # from `checkInputs`.
+    #
+    # TODO: This should probably be moved at least partially into the Meson hook.
+    #
+    # NB: We need to use `doInstallCheck` here because `buildPythonPackage`
+    # renames `doCheck` to `doInstallCheck`.
+    (lib.mesonEnable "tests" gst-python.doInstallCheck)
   ];
 
+  # Tests are very flaky on Darwin.
+  # See: https://github.com/NixOS/nixpkgs/issues/454955
+  doCheck = !stdenv.hostPlatform.isDarwin;
+
   # `buildPythonPackage` uses `installCheckPhase` and leaves `checkPhase`
   # empty. It renames `doCheck` from its arguments, but not `checkPhase`.
   # See: https://github.com/NixOS/nixpkgs/issues/47390

From 13b0bf2fb5c18ea109bbe044d2bc23959a02da22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 17:11:25 +0000
Subject: [PATCH 4196/6226] python3Packages.linode-api: 5.37.0 -> 5.38.0

---
 pkgs/development/python-modules/linode-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/linode-api/default.nix b/pkgs/development/python-modules/linode-api/default.nix
index 81d65e2e7972..4d345816c264 100644
--- a/pkgs/development/python-modules/linode-api/default.nix
+++ b/pkgs/development/python-modules/linode-api/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "linode-api";
-  version = "5.37.0";
+  version = "5.38.0";
   pyproject = true;
 
   # Sources from Pypi exclude test fixtures
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "linode";
     repo = "python-linode-api";
     tag = "v${version}";
-    hash = "sha256-fRTTXWkn1YBWW9xrFm3y6o7f8ZdYhObqVLSHAuiNHak=";
+    hash = "sha256-ToM3ur0bqU5xXCtO8ekZwpvM1bRxtwa7CqOzGJEyY7I=";
   };
 
   build-system = [ setuptools ];

From 120671ec7683678e96a918385a44dc94b19d590e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 30 Oct 2025 10:12:30 -0700
Subject: [PATCH 4197/6226] vips: 8.17.2 -> 8.17.3

Diff: https://github.com/libvips/libvips/compare/v8.17.2...v8.17.3

Changelog: https://github.com/libvips/libvips/blob/refs/tags/v8.17.3/ChangeLog
---
 pkgs/by-name/vi/vips/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/vips/package.nix b/pkgs/by-name/vi/vips/package.nix
index aa753468ae7e..a2213c1e1679 100644
--- a/pkgs/by-name/vi/vips/package.nix
+++ b/pkgs/by-name/vi/vips/package.nix
@@ -52,7 +52,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vips";
-  version = "8.17.2";
+  version = "8.17.3";
 
   outputs = [
     "bin"
@@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "libvips";
     repo = "libvips";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Jwb1bH0y3lmv/IU5JqcnAxiMK4gj+aTBj5nLKZ+XnKY=";
+    hash = "sha256-yxjfkb2R3JPHbz0vCG4hkW9Davoc9MUPHL9Cqc+Ik0Y=";
     # Remove unicode file names which leads to different checksums on HFS+
     # vs. other filesystems because of unicode normalisation.
     postFetch = ''

From 00b4a425c779c7220fa6a3300960bd1056ae1a6f Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Fri, 31 Oct 2025 02:05:05 +0900
Subject: [PATCH 4198/6226] typespec: update fetcherVersion in pnpm.fetchDeps

The hash appears flaky when building on GitHub-hosted Linux runners.
As far as I see, applying the new fetcher introduced in 0eec779fcc1fcc027a0d37ed3b6cd251343c22a5
makes the result stable.
---
 pkgs/by-name/ty/typespec/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ty/typespec/package.nix b/pkgs/by-name/ty/typespec/package.nix
index e6825050b51c..386c64b616a0 100644
--- a/pkgs/by-name/ty/typespec/package.nix
+++ b/pkgs/by-name/ty/typespec/package.nix
@@ -38,8 +38,8 @@ stdenvNoCC.mkDerivation (finalAttrs: {
       pnpmWorkspaces
       postPatch
       ;
-    fetcherVersion = 1;
-    hash = "sha256-/Y7KhdNeyUV2CQQWjhYBDDT24oE6UdBO6HTweUUaNqc=";
+    fetcherVersion = 2;
+    hash = "sha256-ztig1B10cQQy+4XKZjwwlCxGenwcU+C28TfTWHqZ59Y=";
   };
 
   postPatch = ''

From 04ac774406db687d894ecaa5365e66b666d1cf0d Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Fri, 31 Oct 2025 02:16:35 +0900
Subject: [PATCH 4199/6226] typespec: prefer versionCheckHook over
 testers.testVersion

---
 pkgs/by-name/ty/typespec/package.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ty/typespec/package.nix b/pkgs/by-name/ty/typespec/package.nix
index 386c64b616a0..2a06e30892ea 100644
--- a/pkgs/by-name/ty/typespec/package.nix
+++ b/pkgs/by-name/ty/typespec/package.nix
@@ -6,7 +6,7 @@
   nix-update-script,
   nodejs,
   pnpm,
-  testers,
+  versionCheckHook,
 }:
 
 let
@@ -91,9 +91,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  passthru.tests.version = testers.testVersion {
-    package = finalAttrs.finalPackage;
-  };
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
 
   passthru.updateScript = nix-update-script {
     extraArgs = [ ''--version-regex=typespec-stable@(\d+\.\d+\.\d+)'' ];

From 378096bb8e112ff4e0a4ead4165a6a098d4e6df7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 17:34:00 +0000
Subject: [PATCH 4200/6226] linuxKernel.kernels.linux_zen: 6.17.2 -> 6.17.6

---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index e6ec7052f1fc..d0f7d0a4e830 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -16,9 +16,9 @@ let
   variants = {
     # ./update-zen.py zen
     zen = {
-      version = "6.17.2"; # zen
+      version = "6.17.6"; # zen
       suffix = "zen1"; # zen
-      sha256 = "0xb0x8726znk7v39incvdsmqh0plfzyjj4sg0dmbjqlgi2kh560r"; # zen
+      sha256 = "0kkrfmxj1q7il7njc1s8fnn459rcgviyy5q2kbynasrqij5kdciy"; # zen
       isLqx = false;
     };
     # ./update-zen.py lqx

From bfd50c9548f757da271091953adada2e699b560a Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Thu, 30 Oct 2025 12:17:38 -0400
Subject: [PATCH 4201/6226] python3Packages.mprisify: init at 1.0.0

---
 .../python-modules/mprisify/default.nix       | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/mprisify/default.nix

diff --git a/pkgs/development/python-modules/mprisify/default.nix b/pkgs/development/python-modules/mprisify/default.nix
new file mode 100644
index 000000000000..bf91f8e449f2
--- /dev/null
+++ b/pkgs/development/python-modules/mprisify/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitLab,
+  pydbus,
+  pygobject3,
+  setuptools,
+  strenum,
+}:
+buildPythonPackage rec {
+  pname = "mprisify";
+  version = "1.0.0";
+  pyproject = true;
+
+  src = fetchFromGitLab {
+    owner = "zehkira";
+    repo = "mprisify";
+    tag = "v${version}";
+    hash = "sha256-05i3N61cqRgGaBjYOEhxeCSV2wDh9yMaXTvEZ/JGrZo=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    pydbus
+    pygobject3
+    strenum
+  ];
+
+  pythonImportsCheck = [ "mprisify" ];
+
+  meta = {
+    description = "Python MPRIS server library for Linux media player apps";
+    homepage = "https://gitlab.com/zehkira/mprisify";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ quadradical ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e4334ca2a112..e554826924fe 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9786,6 +9786,8 @@ self: super: with self; {
 
   mpris-server = callPackage ../development/python-modules/mpris-server { };
 
+  mprisify = callPackage ../development/python-modules/mprisify { };
+
   mpv = callPackage ../development/python-modules/mpv { inherit (pkgs) mpv; };
 
   mpyq = callPackage ../development/python-modules/mpyq { };

From 9bdf1311eeaecd888147452ee1977d9aa327878d Mon Sep 17 00:00:00 2001
From: Jared Baur <jaredbaur@fastmail.com>
Date: Wed, 29 Oct 2025 21:18:44 -0700
Subject: [PATCH 4202/6226] mdio-netlink: init at 1.3.1

---
 .../linux/mdio-netlink/default.nix            | 29 +++++++++++++++++++
 pkgs/top-level/linux-kernels.nix              |  2 ++
 2 files changed, 31 insertions(+)
 create mode 100644 pkgs/os-specific/linux/mdio-netlink/default.nix

diff --git a/pkgs/os-specific/linux/mdio-netlink/default.nix b/pkgs/os-specific/linux/mdio-netlink/default.nix
new file mode 100644
index 000000000000..3e63364f5b8e
--- /dev/null
+++ b/pkgs/os-specific/linux/mdio-netlink/default.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  stdenv,
+  kernel,
+  mdio-tools,
+}:
+
+stdenv.mkDerivation {
+  pname = "mdio-netlink";
+  version = "${mdio-tools.version}-${kernel.version}";
+
+  inherit (mdio-tools) src;
+  sourceRoot = "source/kernel";
+
+  nativeBuildInputs = kernel.moduleBuildDependencies;
+
+  makeFlags = kernel.commonMakeFlags ++ [
+    "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    "INSTALL_MOD_PATH=${placeholder "out"}"
+  ];
+
+  meta = {
+    description = "Netlink support for MDIO devices";
+    homepage = "https://github.com/wkz/mdio-tools";
+    license = lib.licenses.gpl2Only;
+    maintainers = [ lib.maintainers.jmbaur ];
+    platforms = lib.platforms.linux;
+  };
+}
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 4e00998806b0..3e4f6b6a613c 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -558,6 +558,8 @@ in
 
         mba6x_bl = callPackage ../os-specific/linux/mba6x_bl { };
 
+        mdio-netlink = callPackage ../os-specific/linux/mdio-netlink { };
+
         mwprocapture = callPackage ../os-specific/linux/mwprocapture { };
 
         mxu11x0 = callPackage ../os-specific/linux/mxu11x0 { };

From ac811a24bcb13e3f79fc498d7d772e134119de31 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 30 Oct 2025 18:54:16 +0100
Subject: [PATCH 4203/6226] pretix: 2025.8.0 -> 2025.9.0

https://pretix.eu/about/en/blog/20251030-release-2025-9/
---
 pkgs/by-name/pr/pretix/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/pretix/package.nix b/pkgs/by-name/pr/pretix/package.nix
index 3dba95437a1b..715167c9f029 100644
--- a/pkgs/by-name/pr/pretix/package.nix
+++ b/pkgs/by-name/pr/pretix/package.nix
@@ -42,13 +42,13 @@ let
   };
 
   pname = "pretix";
-  version = "2025.8.0";
+  version = "2025.9.0";
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix";
     rev = "refs/tags/v${version}";
-    hash = "sha256-89BAQZpXyyTg6T9hxm4EV8QHZDcD3FcnGKxAulxziyg=";
+    hash = "sha256-d0RunBCUUvS4tosbXWkEp7mvUKEOa5KgvIZK4XydN7I=";
   };
 
   npmDeps = buildNpmPackage {
@@ -56,7 +56,7 @@ let
     inherit version src;
 
     sourceRoot = "${src.name}/src/pretix/static/npm_dir";
-    npmDepsHash = "sha256-E2K9SYqRbhpQi83va8D02cwPnf51haoKv4P/ppU2m08=";
+    npmDepsHash = "sha256-0FQldyGJXFhXFv7L7ozAoWEfpUTo+d2pibWyhnJ4F7A=";
 
     dontBuild = true;
 

From 511218fa7d8b8d3c0676603c5eefb6593d5e7e95 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 30 Oct 2025 18:55:06 +0100
Subject: [PATCH 4204/6226] pretix.plugins.mollie: 2.4.1 -> 2.5.0

https://github.com/pretix/pretix-mollie/compare/v2.4.1...v2.5.0
---
 pkgs/by-name/pr/pretix/plugins/mollie/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
index 1e5b148b0981..037a94a8fde5 100644
--- a/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/mollie/package.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pretix-mollie";
-  version = "2.4.1";
+  version = "2.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-mollie";
     tag = "v${version}";
-    hash = "sha256-YdBDYpxKqb0UOkSU6zEYoLAtlUbkfDHUTIA538ILbjk=";
+    hash = "sha256-lQ1y6w7zP0sy67jf5+K6584DP10LAZqo1hLsHF3H2UA=";
   };
 
   build-system = [

From 01359dd192f461a99cd66aa30da489595a01a36b Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 30 Oct 2025 18:55:51 +0100
Subject: [PATCH 4205/6226] pretix.plugins.zugferd: 2.5.0 -> 2.6.0

https://github.com/pretix/pretix-zugferd/compare/v2.5.0...v2.6.0
---
 pkgs/by-name/pr/pretix/plugins/zugferd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix
index a606f3480c8e..915c2f2028fb 100644
--- a/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix
+++ b/pkgs/by-name/pr/pretix/plugins/zugferd/package.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pretix-zugferd";
-  version = "2.5.0";
+  version = "2.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pretix";
     repo = "pretix-zugferd";
     rev = "v${version}";
-    hash = "sha256-Qy/yfinj5EGjzhJmiczOSIP/GsTZabFt8e6Ki4AaN6w=";
+    hash = "sha256-yBlbHhiA+Tk1IHnFqYxu0hrQHWQP8LrLHgzu9+OHyN4=";
   };
 
   postPatch = ''

From 3e82e012cb05e4c8897c12d600d8a683e227c9e8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 30 Oct 2025 19:00:01 +0100
Subject: [PATCH 4206/6226] python3Packages.sentry-sdk: 2.39.0 -> 2.43.0

https://github.com/getsentry/sentry-python/blob/2.43.0/CHANGELOG.md
---
 pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix
index 736cc627d4b6..0745d055e92a 100644
--- a/pkgs/development/python-modules/sentry-sdk/default.nix
+++ b/pkgs/development/python-modules/sentry-sdk/default.nix
@@ -67,14 +67,14 @@
 
 buildPythonPackage rec {
   pname = "sentry-sdk";
-  version = "2.39.0";
+  version = "2.43.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-python";
     tag = version;
-    hash = "sha256-2M5Uvo8dl6hOqY13Eqjo4aKFySdlqEO8BHrPxZ/l+fw=";
+    hash = "sha256-ua/ojnyKZXnc1li65EMmPzhmY2Pu8B7A/NXlBzzPyRQ=";
   };
 
   postPatch = ''

From dd61e1cd3f808d2c240f9b2ac7e8495a2c6a0cb7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 18:01:27 +0000
Subject: [PATCH 4207/6226] python3Packages.pyspelling: 2.11 -> 2.12

---
 pkgs/development/python-modules/pyspelling/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyspelling/default.nix b/pkgs/development/python-modules/pyspelling/default.nix
index f5674995960f..b441e1893743 100644
--- a/pkgs/development/python-modules/pyspelling/default.nix
+++ b/pkgs/development/python-modules/pyspelling/default.nix
@@ -14,12 +14,12 @@
 
 buildPythonPackage rec {
   pname = "pyspelling";
-  version = "2.11";
+  version = "2.12";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-lMxu+pecJneWAa1mb42Yat9S0kezEzN61nqscWN0nQ4=";
+    hash = "sha256-ezl5EeRrf6fBBWsoZ8AugVR/yNALvNhEZWVd8j5J26o=";
   };
 
   build-system = [

From 8d7200d9f36ca01ea0d9d08bb510b06139cf4e6a Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 30 Oct 2025 19:22:57 +0100
Subject: [PATCH 4208/6226] aliases: remove hacky workaround for warnings on
 strings

This causes confusing eval errors when not using these values (here:
`system`) in a string interpolation context.

The change will potentially be noisy for nix search. If we want a
deprecation period for this attribute instead of just throwing
immediately, we will have to accept this, at least temporarily.
---
 pkgs/top-level/aliases.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a11d2bb9e8c7..c18ed414a063 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -230,11 +230,6 @@ let
       arg: lib.warn msg (v arg)
     else if lib.isList v then
       map (lib.warn msg) v
-    else if lib.isString v then
-      # Unlike the other cases, this changes the type of the value and
-      # is therefore a breaking change for some code, but it’s the best
-      # we can do.
-      { __toString = lib.warn msg (lib.const v); }
     else
       # Can’t do better than this, and a `throw` would be more
       # disruptive for users…

From 47a38d48a3390b9e367a78054a50fdacf2c11004 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 30 Oct 2025 19:59:29 +0100
Subject: [PATCH 4209/6226] postgresqlPackages.timescaledb: 2.22.1 -> 2.23.0

Release Notes:
https://github.com/timescale/timescaledb/releases/tag/2.23.0
---
 pkgs/servers/sql/postgresql/ext/timescaledb.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/timescaledb.nix b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
index 207e1577328c..4b81f42b68ba 100644
--- a/pkgs/servers/sql/postgresql/ext/timescaledb.nix
+++ b/pkgs/servers/sql/postgresql/ext/timescaledb.nix
@@ -13,13 +13,13 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "timescaledb${lib.optionalString (!enableUnfree) "-apache"}";
-  version = "2.22.1";
+  version = "2.23.0";
 
   src = fetchFromGitHub {
     owner = "timescale";
     repo = "timescaledb";
     tag = finalAttrs.version;
-    hash = "sha256-SEuxHbSxgTC4Uk6nnznVzUqvoZMGgF+KSMNzkYfgfpI=";
+    hash = "sha256-wgRaWxGr48p8xMc+yOQEN196KAKyptMCk/UFKn23cos=";
   };
 
   nativeBuildInputs = [ cmake ];
@@ -101,13 +101,6 @@ postgresqlBuildExtension (finalAttrs: {
     maintainers = with lib.maintainers; [ kirillrdy ];
     platforms = postgresql.meta.platforms;
     license = with lib.licenses; if enableUnfree then tsl else asl20;
-    broken =
-      lib.versionOlder postgresql.version "15"
-      ||
-        # PostgreSQL 18 support issue upstream: https://github.com/timescale/timescaledb/issues/8233
-        # Check after next package update.
-        lib.warnIf (finalAttrs.version != "2.22.1") "Is postgresql18Packages.timescaledb still broken?" (
-          lib.versionAtLeast postgresql.version "18"
-        );
+    broken = lib.versionOlder postgresql.version "15";
   };
 })

From 969bd4539c2cf8079884abb1ffbf14dc5315728c Mon Sep 17 00:00:00 2001
From: Henry-Hiles <henry@henryhiles.com>
Date: Thu, 30 Oct 2025 15:03:43 -0400
Subject: [PATCH 4210/6226] monophony: 3.4.2 -> 4.1.1

---
 pkgs/by-name/mo/monophony/package.nix | 28 ++++++++++-----------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/mo/monophony/package.nix b/pkgs/by-name/mo/monophony/package.nix
index d18fa37612ce..9552d4625bfb 100644
--- a/pkgs/by-name/mo/monophony/package.nix
+++ b/pkgs/by-name/mo/monophony/package.nix
@@ -3,37 +3,36 @@
   fetchFromGitLab,
   python3Packages,
   wrapGAppsHook4,
-  gst_all_1,
   gobject-introspection,
   yt-dlp,
+  gst_all_1,
   libadwaita,
   glib-networking,
   nix-update-script,
 }:
 python3Packages.buildPythonApplication rec {
   pname = "monophony";
-  version = "3.4.2";
+  version = "4.1.1";
   pyproject = true;
 
   src = fetchFromGitLab {
     owner = "zehkira";
     repo = "monophony";
-    rev = "v${version}";
-    hash = "sha256-D/3yJ1KIXF1rv8iH4+HvfD6N94LzkZGRippZj8nk1nQ=";
+    tag = "v${version}";
+    hash = "sha256-0/yzOoO9WeArTm9qlL3++rn0EUCJAjmUX2zxClu3LRE=";
   };
 
   sourceRoot = "${src.name}/source";
 
   dependencies = with python3Packages; [
-    mpris-server
-    pygobject3
+    mprisify
+    requests
     ytmusicapi
   ];
 
   build-system = with python3Packages; [
-    pip
     setuptools
-    wheel
+    pip
   ];
 
   nativeBuildInputs = [
@@ -52,14 +51,7 @@ python3Packages.buildPythonApplication rec {
     gstreamer
   ]);
 
-  pythonRelaxDeps = [
-    "mpris_server"
-    "ytmusicapi"
-  ];
-
-  postInstall = ''
-    make install prefix=$out
-  '';
+  postInstall = "make install prefix=$out";
 
   dontWrapGApps = true;
 
@@ -74,9 +66,9 @@ python3Packages.buildPythonApplication rec {
 
   meta = {
     description = "Linux app for streaming music from YouTube";
-    longDescription = "Monophony is a free and open source Linux app for streaming music from YouTube. It has no ads and does not require an account.";
+    longDescription = "Monophony allows you to stream and download music from YouTube Music without ads, as well as create and import playlists without signing in.";
     homepage = "https://gitlab.com/zehkira/monophony";
-    license = lib.licenses.agpl3Plus;
+    license = lib.licenses.bsd0;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [ quadradical ];
     mainProgram = "monophony";

From 623b53dbe3700604c65c9e24e4cc2b92edf99fc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Oliv=C3=A9r=20Falvai?= <ofalvai@gmail.com>
Date: Wed, 29 Oct 2025 08:08:36 +0100
Subject: [PATCH 4211/6226] deno: 2.5.3 -> 2.5.6

---
 pkgs/by-name/de/deno/package.nix              | 11 +++---
 .../patches/0005-tests-fix-deno-path.patch    | 34 -------------------
 2 files changed, 4 insertions(+), 41 deletions(-)
 delete mode 100644 pkgs/by-name/de/deno/patches/0005-tests-fix-deno-path.patch

diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix
index 34c4a78f9bfd..2554001f67c0 100644
--- a/pkgs/by-name/de/deno/package.nix
+++ b/pkgs/by-name/de/deno/package.nix
@@ -29,17 +29,17 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "deno";
-  version = "2.5.3";
+  version = "2.5.6";
 
   src = fetchFromGitHub {
     owner = "denoland";
     repo = "deno";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true; # required for tests
-    hash = "sha256-UqD9Va33XVX73bjwUdb6woZ3kP/Xz6iBVqV1ceRbXq0=";
+    hash = "sha256-Ppw2fyfFvSmGO+FcEvclkOU7LATOqkYH3wErBdKgWJY=";
   };
 
-  cargoHash = "sha256-OrKg3bOA5AyLQA+LIsHwWpk9DHodhcCVzdKW/S9+mNY=";
+  cargoHash = "sha256-EN87p8wX5QAzf3cWfX8I/+XzYRc9rA5EWj996iUpSPg=";
 
   patches = [
     # Patch out the remote upgrade (deno update) check.
@@ -53,10 +53,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ./patches/0002-tests-replace-hardcoded-paths.patch
     ./patches/0003-tests-linux-no-chown.patch
     ./patches/0004-tests-darwin-fixes.patch
-    # some new TS tests don't identify `deno` location from parent actively
-    # running `deno` instance
-    # https://github.com/denoland/deno/pull/30914
-    ./patches/0005-tests-fix-deno-path.patch
   ];
   postPatch = ''
     # Use patched nixpkgs libffi in order to fix https://github.com/libffi/libffi/pull/857
@@ -182,6 +178,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     "--skip=watcher"
     "--skip=node_unit_tests::_fs_watch_test"
     "--skip=js_unit_tests::fs_events_test"
+    "--skip=js_unit_tests::utime_test"
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [
     # Wants to access /etc/resolv.conf: https://github.com/hickory-dns/hickory-dns/issues/2959
diff --git a/pkgs/by-name/de/deno/patches/0005-tests-fix-deno-path.patch b/pkgs/by-name/de/deno/patches/0005-tests-fix-deno-path.patch
deleted file mode 100644
index aab217408237..000000000000
--- a/pkgs/by-name/de/deno/patches/0005-tests-fix-deno-path.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 798fc5e7e87c1b985a383b7b92a7e55c82e41efa Mon Sep 17 00:00:00 2001
-From: 06kellyjac <dev@j-k.io>
-Date: Fri, 3 Oct 2025 14:20:53 +0100
-Subject: [PATCH] test: leverage `Deno.execPath()` matching other tests
-
-Currently most TS tests use `Deno.execPath()` to identify where `deno` lives
-In the event deno is not on the `$PATH` these tests will fail.
-If deno is on the `$PATH` you can end up testing the wrong instance of `deno`.
----
- tests/unit/process_test.ts | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/tests/unit/process_test.ts b/tests/unit/process_test.ts
-index 7b82fe5ba782f5..1c26a6f990d1b0 100644
---- a/tests/unit/process_test.ts
-+++ b/tests/unit/process_test.ts
-@@ -623,7 +623,7 @@ Deno.test(
- 
-     // @ts-ignore `Deno.run()` was soft-removed in Deno 2.
-     const p = Deno.run({
--      cmd: ["deno", "run", "--watch", tempFile],
-+      cmd: [Deno.execPath(), "run", "--watch", tempFile],
-       stdout: "piped",
-       stderr: "null",
-     });
-@@ -661,7 +661,7 @@ Deno.serve({ signal: ac.signal }, () => new Response("Hello World"));
- 
-     // @ts-ignore `Deno.run()` was soft-removed in Deno 2.
-     const p = Deno.run({
--      cmd: ["deno", "run", "--watch", tempFile],
-+      cmd: [Deno.execPath(), "run", "--watch", tempFile],
-       stdout: "piped",
-       stderr: "null",
-     });

From 2abed6dcaf73c191555e97924761ac499b4c8300 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 27 Oct 2025 07:54:07 +0800
Subject: [PATCH 4212/6226] sly: use flutter335

---
 pkgs/by-name/sl/sly/package.nix       |   4 +-
 pkgs/by-name/sl/sly/pubspec.lock.json | 248 +++++++++++++-------------
 2 files changed, 126 insertions(+), 126 deletions(-)

diff --git a/pkgs/by-name/sl/sly/package.nix b/pkgs/by-name/sl/sly/package.nix
index 0a8b7aaaa8bd..1942accedd6f 100644
--- a/pkgs/by-name/sl/sly/package.nix
+++ b/pkgs/by-name/sl/sly/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   fetchFromGitHub,
-  flutter327,
+  flutter335,
   runCommand,
   yq,
   sly,
@@ -9,7 +9,7 @@
   gitUpdater,
 }:
 
-flutter327.buildFlutterApplication rec {
+flutter335.buildFlutterApplication rec {
   pname = "sly";
   version = "1.0.0";
 
diff --git a/pkgs/by-name/sl/sly/pubspec.lock.json b/pkgs/by-name/sl/sly/pubspec.lock.json
index 75cf3d4ac115..42f179ac1731 100644
--- a/pkgs/by-name/sl/sly/pubspec.lock.json
+++ b/pkgs/by-name/sl/sly/pubspec.lock.json
@@ -4,51 +4,51 @@
       "dependency": "transitive",
       "description": {
         "name": "archive",
-        "sha256": "08064924cbf0ab88280a0c3f60db9dd24fec693927e725ecb176f16c629d1cb8",
+        "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.1"
+      "version": "4.0.7"
     },
     "args": {
       "dependency": "transitive",
       "description": {
         "name": "args",
-        "sha256": "bf9f5caeea8d8fe6721a9c358dd8a5c1947b27f1cfaa18b39c301273594919e6",
+        "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.6.0"
+      "version": "2.7.0"
     },
     "async": {
       "dependency": "transitive",
       "description": {
         "name": "async",
-        "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
+        "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.11.0"
+      "version": "2.13.0"
     },
     "boolean_selector": {
       "dependency": "transitive",
       "description": {
         "name": "boolean_selector",
-        "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
+        "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.1.2"
     },
     "characters": {
       "dependency": "transitive",
       "description": {
         "name": "characters",
-        "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605",
+        "sha256": "f71061c654a3380576a52b451dd5532377954cf9dbd272a78fc8479606670803",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.0"
     },
     "cli_util": {
       "dependency": "transitive",
@@ -64,21 +64,21 @@
       "dependency": "transitive",
       "description": {
         "name": "clock",
-        "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
+        "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "1.1.2"
     },
     "collection": {
       "dependency": "transitive",
       "description": {
         "name": "collection",
-        "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf",
+        "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.19.0"
+      "version": "1.19.1"
     },
     "console": {
       "dependency": "transitive",
@@ -94,11 +94,11 @@
       "dependency": "direct main",
       "description": {
         "name": "crop_image",
-        "sha256": "2e629cd141a360cb9060b5a0837fd49b0260d3d931244717213bf164f6813c82",
+        "sha256": "4fdebd00d0c7d1a6e3abeb1e3843efbc202204b867f3e377fcebcf77aaf69a17",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.15"
+      "version": "1.0.16"
     },
     "cross_file": {
       "dependency": "transitive",
@@ -134,21 +134,21 @@
       "dependency": "transitive",
       "description": {
         "name": "fake_async",
-        "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
+        "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.1"
+      "version": "1.3.3"
     },
     "ffi": {
       "dependency": "transitive",
       "description": {
         "name": "ffi",
-        "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
+        "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.3"
+      "version": "2.1.4"
     },
     "file": {
       "dependency": "transitive",
@@ -164,31 +164,31 @@
       "dependency": "direct main",
       "description": {
         "name": "file_selector",
-        "sha256": "5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828",
+        "sha256": "5f1d15a7f17115038f433d1b0ea57513cc9e29a9d5338d166cb0bef3fa90a7a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.3"
+      "version": "1.0.4"
     },
     "file_selector_android": {
       "dependency": "transitive",
       "description": {
         "name": "file_selector_android",
-        "sha256": "98ac58e878b05ea2fdb204e7f4fc4978d90406c9881874f901428e01d3b18fbc",
+        "sha256": "2db9a2d05f66b49a3b45c4a7c2f040dd5fcd457ca30f39df7cdcf80b8cd7f2d4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.1+12"
+      "version": "0.5.2+1"
     },
     "file_selector_ios": {
       "dependency": "transitive",
       "description": {
         "name": "file_selector_ios",
-        "sha256": "94b98ad950b8d40d96fee8fa88640c2e4bd8afcdd4817993bd04e20310f45420",
+        "sha256": "fc3c3fc567cd9bcae784dfeb98d37c46a8ded9e8757d37ea67e975c399bc14e0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.5.3+1"
+      "version": "0.5.3+3"
     },
     "file_selector_linux": {
       "dependency": "transitive",
@@ -204,11 +204,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_macos",
-        "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc",
+        "sha256": "88707a3bec4b988aaed3b4df5d7441ee4e987f20b286cddca5d6a8270cab23f2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.4+2"
+      "version": "0.9.4+5"
     },
     "file_selector_platform_interface": {
       "dependency": "transitive",
@@ -234,11 +234,11 @@
       "dependency": "transitive",
       "description": {
         "name": "file_selector_windows",
-        "sha256": "8f5d2f6590d51ecd9179ba39c64f722edc15226cc93dcc8698466ad36a4a85a4",
+        "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.9.3+3"
+      "version": "0.9.3+4"
     },
     "fl_chart": {
       "dependency": "direct main",
@@ -270,11 +270,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "615a505aef59b151b46bbeef55b36ce2b6ed299d160c51d84281946f0aa0ce0e",
+        "sha256": "306f0596590e077338312f38837f595c04f28d6cdeeac392d3d74df2f0003687",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.24"
+      "version": "2.0.32"
     },
     "flutter_test": {
       "dependency": "direct dev",
@@ -292,21 +292,21 @@
       "dependency": "direct main",
       "description": {
         "name": "gal",
-        "sha256": "2771519c8b29f784d5e27f4efc2667667eef51c6c47cccaa0435a8fe8aa208e4",
+        "sha256": "969598f986789127fd407a750413249e1352116d4c2be66e81837ffeeaafdfee",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.1"
+      "version": "2.3.2"
     },
     "get_it": {
       "dependency": "transitive",
       "description": {
         "name": "get_it",
-        "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1",
+        "sha256": "a4292e7cf67193f8e7c1258203104eb2a51ec8b3a04baa14695f4064c144297b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.7.0"
+      "version": "8.2.0"
     },
     "handy_window": {
       "dependency": "direct main",
@@ -322,111 +322,111 @@
       "dependency": "transitive",
       "description": {
         "name": "http",
-        "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
+        "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.2"
+      "version": "1.5.0"
     },
     "http_parser": {
       "dependency": "transitive",
       "description": {
         "name": "http_parser",
-        "sha256": "2aa08ce0341cc9b354a498388e30986515406668dbcc4f7c950c3e715496693b",
+        "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.0.2"
+      "version": "4.1.2"
     },
     "image": {
       "dependency": "direct main",
       "description": {
         "name": "image",
-        "sha256": "20842a5ad1555be624c314b0c0cc0566e8ece412f61e859a42efeb6d4101a26c",
+        "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.0"
+      "version": "4.5.4"
     },
     "image_picker": {
       "dependency": "direct main",
       "description": {
         "name": "image_picker",
-        "sha256": "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a",
+        "sha256": "736eb56a911cf24d1859315ad09ddec0b66104bc41a7f8c5b96b4e2620cf5041",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.2.0"
     },
     "image_picker_android": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_android",
-        "sha256": "fa8141602fde3f7e2f81dbf043613eb44dfa325fa0bcf93c0f142c9f7a2c193e",
+        "sha256": "58a85e6f09fe9c4484d53d18a0bd6271b72c53fce1d05e6f745ae36d8c18efca",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+18"
+      "version": "0.8.13+5"
     },
     "image_picker_for_web": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_for_web",
-        "sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83",
+        "sha256": "40c2a6a0da15556dc0f8e38a3246064a971a9f512386c3339b89f76db87269b6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.6"
+      "version": "3.1.0"
     },
     "image_picker_ios": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_ios",
-        "sha256": "4f0568120c6fcc0aaa04511cb9f9f4d29fc3d0139884b1d06be88dcec7641d6b",
+        "sha256": "e675c22790bcc24e9abd455deead2b7a88de4b79f7327a281812f14de1a56f58",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+1"
+      "version": "0.8.13+1"
     },
     "image_picker_linux": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_linux",
-        "sha256": "4ed1d9bb36f7cd60aa6e6cd479779cc56a4cb4e4de8f49d487b1aaad831300fa",
+        "sha256": "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.2"
     },
     "image_picker_macos": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_macos",
-        "sha256": "3f5ad1e8112a9a6111c46d0b57a7be2286a9a07fc6e1976fdf5be2bd31d4ff62",
+        "sha256": "86f0f15a309de7e1a552c12df9ce5b59fe927e71385329355aec4776c6a8ec91",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.2+1"
     },
     "image_picker_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_platform_interface",
-        "sha256": "9ec26d410ff46f483c5519c29c02ef0e02e13a543f882b152d4bfd2f06802f80",
+        "sha256": "567e056716333a1647c64bb6bd873cff7622233a5c3f694be28a583d4715690c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.10.0"
+      "version": "2.11.1"
     },
     "image_picker_windows": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_windows",
-        "sha256": "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb",
+        "sha256": "d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.2"
     },
     "json_annotation": {
       "dependency": "transitive",
@@ -442,31 +442,31 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06",
+        "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.7"
+      "version": "11.0.2"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379",
+        "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.8"
+      "version": "3.0.10"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_testing",
-        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+        "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.2"
     },
     "lints": {
       "dependency": "transitive",
@@ -482,11 +482,11 @@
       "dependency": "transitive",
       "description": {
         "name": "matcher",
-        "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
+        "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.12.16+1"
+      "version": "0.12.17"
     },
     "material_color_utilities": {
       "dependency": "transitive",
@@ -502,11 +502,11 @@
       "dependency": "transitive",
       "description": {
         "name": "meta",
-        "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
+        "sha256": "e3641ec5d63ebf0d9b41bd43201a66e3fc79a65db5f61fc181f04cd27aab950c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.15.0"
+      "version": "1.16.0"
     },
     "mime": {
       "dependency": "transitive",
@@ -522,31 +522,31 @@
       "dependency": "direct dev",
       "description": {
         "name": "msix",
-        "sha256": "c50d6bd1aafe0d071a3c1e5a5ccb056404502935cb0a549e3178c4aae16caf33",
+        "sha256": "f88033fcb9e0dd8de5b18897cbebbd28ea30596810f4a7c86b12b0c03ace87e5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.16.8"
+      "version": "3.16.12"
     },
     "package_config": {
       "dependency": "transitive",
       "description": {
         "name": "package_config",
-        "sha256": "92d4488434b520a62570293fbd33bb556c7d49230791c1b4bbd973baf6d2dc67",
+        "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.1"
+      "version": "2.2.0"
     },
     "path": {
       "dependency": "transitive",
       "description": {
         "name": "path",
-        "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
+        "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.9.0"
+      "version": "1.9.1"
     },
     "path_provider_linux": {
       "dependency": "transitive",
@@ -582,11 +582,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
+        "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.2"
+      "version": "7.0.1"
     },
     "platform": {
       "dependency": "transitive",
@@ -612,21 +612,21 @@
       "dependency": "transitive",
       "description": {
         "name": "posix",
-        "sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a",
+        "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.1"
+      "version": "6.0.3"
     },
     "pub_semver": {
       "dependency": "transitive",
       "description": {
         "name": "pub_semver",
-        "sha256": "7b3cfbf654f3edd0c6298ecd5be782ce997ddf0e00531b9464b55245185bbbbd",
+        "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.5"
+      "version": "2.2.0"
     },
     "screen_retriever": {
       "dependency": "transitive",
@@ -682,31 +682,31 @@
       "dependency": "direct main",
       "description": {
         "name": "shared_preferences",
-        "sha256": "3c7e73920c694a436afaf65ab60ce3453d91f84208d761fbd83fc21182134d93",
+        "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.4"
+      "version": "2.5.3"
     },
     "shared_preferences_android": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "02a7d8a9ef346c9af715811b01fbd8e27845ad2c41148eefd31321471b41863d",
+        "sha256": "34266009473bf71d748912da4bf62d439185226c03e01e2d9687bc65bbfcb713",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.15"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_foundation",
-        "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03",
+        "sha256": "1c33a907142607c40a7542768ec9badfd16293bac51da3a4482623d15845f88b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.4"
+      "version": "2.5.5"
     },
     "shared_preferences_linux": {
       "dependency": "transitive",
@@ -732,11 +732,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_web",
-        "sha256": "d2ca4132d3946fec2184261726b355836a82c33d7d5b67af32692aff18a4684e",
+        "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.2"
+      "version": "2.4.3"
     },
     "shared_preferences_windows": {
       "dependency": "transitive",
@@ -758,61 +758,61 @@
       "dependency": "transitive",
       "description": {
         "name": "source_span",
-        "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
+        "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.10.0"
+      "version": "1.10.1"
     },
     "stack_trace": {
       "dependency": "transitive",
       "description": {
         "name": "stack_trace",
-        "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
+        "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.12.0"
+      "version": "1.12.1"
     },
     "stream_channel": {
       "dependency": "transitive",
       "description": {
         "name": "stream_channel",
-        "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
+        "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.2"
+      "version": "2.1.4"
     },
     "string_scanner": {
       "dependency": "transitive",
       "description": {
         "name": "string_scanner",
-        "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3",
+        "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.0"
+      "version": "1.4.1"
     },
     "term_glyph": {
       "dependency": "transitive",
       "description": {
         "name": "term_glyph",
-        "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
+        "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.1"
+      "version": "1.2.2"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
+        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.3"
+      "version": "0.7.6"
     },
     "typed_data": {
       "dependency": "transitive",
@@ -828,31 +828,31 @@
       "dependency": "direct main",
       "description": {
         "name": "url_launcher",
-        "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603",
+        "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.1"
+      "version": "6.3.2"
     },
     "url_launcher_android": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "6fc2f56536ee873eeb867ad176ae15f304ccccc357848b351f6f0d8d4a40d193",
+        "sha256": "5c8b6c2d89a78f5a1cca70a73d9d5f86c701b36b42f9c9dac7bad592113c28e9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.14"
+      "version": "6.3.24"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626",
+        "sha256": "6b63f1441e4f653ae799166a72b50b1767321ecc263a57aadf825a7a2a5477d9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.2"
+      "version": "6.3.5"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
@@ -868,11 +868,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_macos",
-        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
+        "sha256": "8262208506252a3ed4ff5c0dc1e973d2c0e0ef337d0a074d35634da5d44397c9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.2"
+      "version": "3.2.4"
     },
     "url_launcher_platform_interface": {
       "dependency": "transitive",
@@ -888,51 +888,51 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_web",
-        "sha256": "772638d3b34c779ede05ba3d38af34657a05ac55b06279ea6edd409e323dca8e",
+        "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.3"
+      "version": "2.4.1"
     },
     "url_launcher_windows": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_windows",
-        "sha256": "44cf3aabcedde30f2dba119a9dea3b0f2672fbe6fa96e85536251d678216b3c4",
+        "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.3"
+      "version": "3.1.4"
     },
     "vector_math": {
       "dependency": "transitive",
       "description": {
         "name": "vector_math",
-        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+        "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "vm_service": {
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b",
+        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "14.3.0"
+      "version": "15.0.2"
     },
     "web": {
       "dependency": "transitive",
       "description": {
         "name": "web",
-        "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
+        "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.0"
+      "version": "1.1.1"
     },
     "window_manager": {
       "dependency": "direct main",
@@ -958,25 +958,25 @@
       "dependency": "transitive",
       "description": {
         "name": "xml",
-        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+        "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.5.0"
+      "version": "6.6.1"
     },
     "yaml": {
       "dependency": "transitive",
       "description": {
         "name": "yaml",
-        "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
+        "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.2"
+      "version": "3.1.3"
     }
   },
   "sdks": {
-    "dart": ">=3.5.0 <4.0.0",
-    "flutter": ">=3.24.0"
+    "dart": ">=3.9.0 <4.0.0",
+    "flutter": ">=3.35.0"
   }
 }

From 5f168f912863015a27fbec8cf51b93a85e2ec0a8 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 27 Oct 2025 07:54:12 +0800
Subject: [PATCH 4213/6226] localsend: use flutter329

---
 pkgs/by-name/lo/localsend/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lo/localsend/package.nix b/pkgs/by-name/lo/localsend/package.nix
index f07e589d9f37..6648bb188a06 100644
--- a/pkgs/by-name/lo/localsend/package.nix
+++ b/pkgs/by-name/lo/localsend/package.nix
@@ -3,7 +3,7 @@
   stdenv,
   fetchurl,
   fetchFromGitHub,
-  flutter327,
+  flutter329,
   makeDesktopItem,
   copyDesktopItems,
   nixosTests,
@@ -16,7 +16,7 @@ let
   pname = "localsend";
   version = "1.17.0";
 
-  linux = flutter327.buildFlutterApplication rec {
+  linux = flutter329.buildFlutterApplication rec {
     inherit pname version;
 
     src = fetchFromGitHub {

From 08bee0d36eb69e11821a599ab5a4993abd41de77 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 27 Oct 2025 07:54:15 +0800
Subject: [PATCH 4214/6226] evolve-core: use flutter329

---
 pkgs/by-name/ev/evolve-core/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ev/evolve-core/package.nix b/pkgs/by-name/ev/evolve-core/package.nix
index 4c94f52eaf3f..aa1600caf939 100644
--- a/pkgs/by-name/ev/evolve-core/package.nix
+++ b/pkgs/by-name/ev/evolve-core/package.nix
@@ -1,12 +1,12 @@
 {
   lib,
   fetchFromGitHub,
-  flutter327,
+  flutter329,
   makeDesktopItem,
   copyDesktopItems,
 }:
 
-flutter327.buildFlutterApplication rec {
+flutter329.buildFlutterApplication rec {
   pname = "evolve-core";
   version = "1.7";
 

From cec755ba1e4091798053278fd6959874b82fb672 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 27 Oct 2025 07:54:18 +0800
Subject: [PATCH 4215/6226] pied: use flutter329

---
 pkgs/by-name/pi/pied/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pi/pied/package.nix b/pkgs/by-name/pi/pied/package.nix
index adb55f8e4562..b76499e7f527 100644
--- a/pkgs/by-name/pi/pied/package.nix
+++ b/pkgs/by-name/pi/pied/package.nix
@@ -1,11 +1,11 @@
 {
   lib,
   fetchFromGitHub,
-  flutter327,
+  flutter329,
   gst_all_1,
 }:
 
-flutter327.buildFlutterApplication rec {
+flutter329.buildFlutterApplication rec {
   pname = "pied";
   version = "0.3.1";
 

From 7758b7a10fbd413ca01d4cdde95ffedc7a518306 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 27 Oct 2025 07:54:22 +0800
Subject: [PATCH 4216/6226] bluebubbles: use flutter329

---
 pkgs/by-name/bl/bluebubbles/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bl/bluebubbles/package.nix b/pkgs/by-name/bl/bluebubbles/package.nix
index da4665d51bc8..4e2f45c4f595 100644
--- a/pkgs/by-name/bl/bluebubbles/package.nix
+++ b/pkgs/by-name/bl/bluebubbles/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  flutter327,
+  flutter329,
   fetchFromGitHub,
   autoPatchelfHook,
   webkitgtk_4_1,
@@ -10,7 +10,7 @@
   mpv,
 }:
 
-flutter327.buildFlutterApplication rec {
+flutter329.buildFlutterApplication rec {
   pname = "bluebubbles";
   version = "1.15.4";
 

From ee21b31ef7a1c4cc5b792646df7bae001c749a05 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Mon, 27 Oct 2025 07:54:25 +0800
Subject: [PATCH 4217/6226] flutter327: drop

---
 .../compilers/flutter/versions/3_27/data.json | 1056 -----------------
 ...deregister-pub-dependencies-artifact.patch |   19 -
 .../3_27/patches/disable-auto-update.patch    |   30 -
 .../fix-ios-build-xcode-backend-sh.patch      |   69 --
 .../gradle-flutter-tools-wrapper.patch        |   44 -
 pkgs/top-level/aliases.nix                    |    1 +
 pkgs/top-level/all-packages.nix               |    1 -
 7 files changed, 1 insertion(+), 1219 deletions(-)
 delete mode 100644 pkgs/development/compilers/flutter/versions/3_27/data.json
 delete mode 100644 pkgs/development/compilers/flutter/versions/3_27/patches/deregister-pub-dependencies-artifact.patch
 delete mode 100644 pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch
 delete mode 100644 pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch
 delete mode 100644 pkgs/development/compilers/flutter/versions/3_27/patches/gradle-flutter-tools-wrapper.patch

diff --git a/pkgs/development/compilers/flutter/versions/3_27/data.json b/pkgs/development/compilers/flutter/versions/3_27/data.json
deleted file mode 100644
index c6361eb21b06..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_27/data.json
+++ /dev/null
@@ -1,1056 +0,0 @@
-{
-  "version": "3.27.4",
-  "engineVersion": "82bd5b7209295a5b7ff8cae0df96e7870171e3a5",
-  "engineSwiftShaderHash": "sha256-mRLCvhNkmHz7Rv6GzXkY7OB1opBSq+ATWZ466qZdgto=",
-  "engineSwiftShaderRev": "2fa7e9b99ae4e70ea5ae2cc9c8d3afb43391384f",
-  "channel": "stable",
-  "engineHashes": {
-    "aarch64-linux": {
-      "aarch64-linux": "sha256-Av8G5i4g9s6SrOpLUIw9WOSJ4hMQO+ANIaTIVpTsP+Y=",
-      "x86_64-linux": "sha256-Av8G5i4g9s6SrOpLUIw9WOSJ4hMQO+ANIaTIVpTsP+Y="
-    },
-    "x86_64-linux": {
-      "aarch64-linux": "sha256-PDSA0B/6mZTLC5gRlR8F6+p8V5dKmM7OALjehrPlQ1g=",
-      "x86_64-linux": "sha256-PDSA0B/6mZTLC5gRlR8F6+p8V5dKmM7OALjehrPlQ1g="
-    }
-  },
-  "dartVersion": "3.6.2",
-  "dartHash": {
-    "x86_64-linux": "sha256-um3/S/XleAVGor8YVUIjhViDAXUiSKnJI7RchM9k1yc=",
-    "aarch64-linux": "sha256-PSGO/MVDO3fgvlrfzdXQizgtVI5+fDWwHk/DG3yH0X4=",
-    "x86_64-darwin": "sha256-QshSLyTOYZn7N+vE6AfqLZ5CFei4h3xlWJo//iyaVA4=",
-    "aarch64-darwin": "sha256-Js1Mk0M19+0eQwprtlDSryI1vDEO5wvx8gzklb5au0Y="
-  },
-  "flutterHash": "sha256-OvWmEvrkXrGGda3vVVuMo90pZeZcWOzJUztL5qW5Foc=",
-  "artifactHashes": {
-    "android": {
-      "aarch64-darwin": "sha256-yaw7wBcJx1rZLdZCMc7xJMKgU1KIiDFDSZ+O4mMOBY8=",
-      "aarch64-linux": "sha256-53Jxb+GcrpABdMkQ1J+xEaXO5+AQTqRmaPVDY77Vu2Q=",
-      "x86_64-darwin": "sha256-yaw7wBcJx1rZLdZCMc7xJMKgU1KIiDFDSZ+O4mMOBY8=",
-      "x86_64-linux": "sha256-53Jxb+GcrpABdMkQ1J+xEaXO5+AQTqRmaPVDY77Vu2Q="
-    },
-    "fuchsia": {
-      "aarch64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
-      "aarch64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
-      "x86_64-darwin": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk=",
-      "x86_64-linux": "sha256-eu0BERdz53CkSexbpu3KA7O6Q4g0s9SGD3t1Snsk3Fk="
-    },
-    "ios": {
-      "aarch64-darwin": "sha256-h0HdJl3Ptu/zNVMkg6oM/dtGC++KBjiUXhieJwhUUZk=",
-      "aarch64-linux": "sha256-h0HdJl3Ptu/zNVMkg6oM/dtGC++KBjiUXhieJwhUUZk=",
-      "x86_64-darwin": "sha256-h0HdJl3Ptu/zNVMkg6oM/dtGC++KBjiUXhieJwhUUZk=",
-      "x86_64-linux": "sha256-h0HdJl3Ptu/zNVMkg6oM/dtGC++KBjiUXhieJwhUUZk="
-    },
-    "linux": {
-      "aarch64-darwin": "sha256-Mrj4+et2rr7ePrrMHk4jyQCR3YnyA5ltCeVLtp5ZlAk=",
-      "aarch64-linux": "sha256-Mrj4+et2rr7ePrrMHk4jyQCR3YnyA5ltCeVLtp5ZlAk=",
-      "x86_64-darwin": "sha256-us1EjjtmJ8Diy/uCqnzt8xVlIvS9uQnR8AqZCTqBXWg=",
-      "x86_64-linux": "sha256-us1EjjtmJ8Diy/uCqnzt8xVlIvS9uQnR8AqZCTqBXWg="
-    },
-    "macos": {
-      "aarch64-darwin": "sha256-rRqZ/gDOxGpeT6CEU972DzLBBH/gNaQvZVkOT/PNt5M=",
-      "aarch64-linux": "sha256-rRqZ/gDOxGpeT6CEU972DzLBBH/gNaQvZVkOT/PNt5M=",
-      "x86_64-darwin": "sha256-rRqZ/gDOxGpeT6CEU972DzLBBH/gNaQvZVkOT/PNt5M=",
-      "x86_64-linux": "sha256-rRqZ/gDOxGpeT6CEU972DzLBBH/gNaQvZVkOT/PNt5M="
-    },
-    "universal": {
-      "aarch64-darwin": "sha256-48EzEp20xrYt63fo7onlTkb74w0zipIkM3vBlV8x5DE=",
-      "aarch64-linux": "sha256-m1eTxvOef6V6Mo5nXd+Jr3NNrOhE8lq9QBz+93ipvS8=",
-      "x86_64-darwin": "sha256-05XSP1LcjchgwTNg4qTyFRQRLS04N1e13lNSdk5YaXQ=",
-      "x86_64-linux": "sha256-QwcKF6APpvTLGVRKHHwAJ0QYYaQPC7PeMggb+fn61ro="
-    },
-    "web": {
-      "aarch64-darwin": "sha256-hYRBoRRVKauvFaorijlEPcVvY3RtXQmCe+9XBHJABpc=",
-      "aarch64-linux": "sha256-hYRBoRRVKauvFaorijlEPcVvY3RtXQmCe+9XBHJABpc=",
-      "x86_64-darwin": "sha256-hYRBoRRVKauvFaorijlEPcVvY3RtXQmCe+9XBHJABpc=",
-      "x86_64-linux": "sha256-hYRBoRRVKauvFaorijlEPcVvY3RtXQmCe+9XBHJABpc="
-    },
-    "windows": {
-      "x86_64-darwin": "sha256-QIZm6Ro+47B1aPjit8mlVt/p3Fwg69AOdzDXF+Yodqg=",
-      "x86_64-linux": "sha256-QIZm6Ro+47B1aPjit8mlVt/p3Fwg69AOdzDXF+Yodqg="
-    }
-  },
-  "pubspecLock": {
-    "packages": {
-      "_fe_analyzer_shared": {
-        "dependency": "direct main",
-        "description": {
-          "name": "_fe_analyzer_shared",
-          "sha256": "f6dbf021f4b214d85c79822912c5fcd142a2c4869f01222ad371bc51f9f1c356",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "74.0.0"
-      },
-      "_macros": {
-        "dependency": "transitive",
-        "description": "dart",
-        "source": "sdk",
-        "version": "0.3.3"
-      },
-      "analyzer": {
-        "dependency": "direct main",
-        "description": {
-          "name": "analyzer",
-          "sha256": "f7e8caf82f2d3190881d81012606effdf8a38e6c1ab9e30947149733065f817c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "6.9.0"
-      },
-      "archive": {
-        "dependency": "direct main",
-        "description": {
-          "name": "archive",
-          "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.6.1"
-      },
-      "args": {
-        "dependency": "direct main",
-        "description": {
-          "name": "args",
-          "sha256": "7cf60b9f0cc88203c5a190b4cd62a99feea42759a7fa695010eb5de1c0b2252a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.5.0"
-      },
-      "async": {
-        "dependency": "direct main",
-        "description": {
-          "name": "async",
-          "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.11.0"
-      },
-      "boolean_selector": {
-        "dependency": "direct main",
-        "description": {
-          "name": "boolean_selector",
-          "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.1"
-      },
-      "browser_launcher": {
-        "dependency": "direct main",
-        "description": {
-          "name": "browser_launcher",
-          "sha256": "54a2da4d152c34760b87cbd4a9fe8a563379487e57bfcd1b387be394dfa91734",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.2"
-      },
-      "built_collection": {
-        "dependency": "direct main",
-        "description": {
-          "name": "built_collection",
-          "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "5.1.1"
-      },
-      "built_value": {
-        "dependency": "direct main",
-        "description": {
-          "name": "built_value",
-          "sha256": "c7913a9737ee4007efedaffc968c049fd0f3d0e49109e778edc10de9426005cb",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "8.9.2"
-      },
-      "checked_yaml": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "checked_yaml",
-          "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.0.3"
-      },
-      "cli_config": {
-        "dependency": "direct main",
-        "description": {
-          "name": "cli_config",
-          "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.2.0"
-      },
-      "clock": {
-        "dependency": "direct main",
-        "description": {
-          "name": "clock",
-          "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.1"
-      },
-      "collection": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "collection",
-          "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.19.0"
-      },
-      "completion": {
-        "dependency": "direct main",
-        "description": {
-          "name": "completion",
-          "sha256": "f11b7a628e6c42b9edc9b0bc3aa490e2d930397546d2f794e8e1325909d11c60",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.1"
-      },
-      "convert": {
-        "dependency": "direct main",
-        "description": {
-          "name": "convert",
-          "sha256": "0f08b14755d163f6e2134cb58222dd25ea2a2ee8a195e53983d57c075324d592",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.1.1"
-      },
-      "coverage": {
-        "dependency": "direct main",
-        "description": {
-          "name": "coverage",
-          "sha256": "c1fb2dce3c0085f39dc72668e85f8e0210ec7de05345821ff58530567df345a5",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.9.2"
-      },
-      "crypto": {
-        "dependency": "direct main",
-        "description": {
-          "name": "crypto",
-          "sha256": "ec30d999af904f33454ba22ed9a86162b35e52b44ac4807d1d93c288041d7d27",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.5"
-      },
-      "csslib": {
-        "dependency": "direct main",
-        "description": {
-          "name": "csslib",
-          "sha256": "706b5707578e0c1b4b7550f64078f0a0f19dec3f50a178ffae7006b0a9ca58fb",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.0"
-      },
-      "dap": {
-        "dependency": "direct main",
-        "description": {
-          "name": "dap",
-          "sha256": "c0e53b52c9529d901329045afc4c5acb04304a28acde4b54ab0a08a93da546aa",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.3.0"
-      },
-      "dds": {
-        "dependency": "direct main",
-        "description": {
-          "name": "dds",
-          "sha256": "c90723eb1f1402429c57f717550ce5af80288d74a27c45ccbe754a0e3e038f95",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.2.7"
-      },
-      "dds_service_extensions": {
-        "dependency": "direct main",
-        "description": {
-          "name": "dds_service_extensions",
-          "sha256": "390ae1d0128bb43ffe11f8e3c6cd3a481c1920492d1026883d379cee50bdf1a2",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.0.0"
-      },
-      "devtools_shared": {
-        "dependency": "direct main",
-        "description": {
-          "name": "devtools_shared",
-          "sha256": "72369878105eccd563547afbad97407a2431b96bd4c04a1d6da75cb068437f50",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "10.0.2"
-      },
-      "dtd": {
-        "dependency": "direct main",
-        "description": {
-          "name": "dtd",
-          "sha256": "6e4e508c0d03e12e2c96f21faa0e5acc191f9431ecd02adb8daee64dbfae6b86",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.3.0"
-      },
-      "dwds": {
-        "dependency": "direct main",
-        "description": {
-          "name": "dwds",
-          "sha256": "d0cf9d18511df6b397c40527f3fd8ddb47b7efcc501e703dd94f13cabaf82ffc",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "24.1.0"
-      },
-      "extension_discovery": {
-        "dependency": "direct main",
-        "description": {
-          "name": "extension_discovery",
-          "sha256": "de1fce715ab013cdfb00befc3bdf0914bea5e409c3a567b7f8f144bc061611a7",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.0"
-      },
-      "fake_async": {
-        "dependency": "direct main",
-        "description": {
-          "name": "fake_async",
-          "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.3.1"
-      },
-      "ffi": {
-        "dependency": "direct main",
-        "description": {
-          "name": "ffi",
-          "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.3"
-      },
-      "file": {
-        "dependency": "direct main",
-        "description": {
-          "name": "file",
-          "sha256": "5fc22d7c25582e38ad9a8515372cd9a93834027aacf1801cf01164dac0ffa08c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "7.0.0"
-      },
-      "file_testing": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "file_testing",
-          "sha256": "0aaadb4025bd350403f4308ad6c4cea953278d9407814b8342558e4946840fb5",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.0"
-      },
-      "fixnum": {
-        "dependency": "direct main",
-        "description": {
-          "name": "fixnum",
-          "sha256": "25517a4deb0c03aa0f32fd12db525856438902d9c16536311e76cdc57b31d7d1",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.0"
-      },
-      "flutter_template_images": {
-        "dependency": "direct main",
-        "description": {
-          "name": "flutter_template_images",
-          "sha256": "fd3e55af73c577b9e3f88d4080d3e366cb5c8ef3fbd50b94dfeca56bb0235df6",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.2.0"
-      },
-      "frontend_server_client": {
-        "dependency": "direct main",
-        "description": {
-          "name": "frontend_server_client",
-          "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.0.0"
-      },
-      "glob": {
-        "dependency": "direct main",
-        "description": {
-          "name": "glob",
-          "sha256": "0e7014b3b7d4dac1ca4d6114f82bf1782ee86745b9b42a92c9289c23d8a0ab63",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.2"
-      },
-      "graphs": {
-        "dependency": "direct main",
-        "description": {
-          "name": "graphs",
-          "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.3.2"
-      },
-      "html": {
-        "dependency": "direct main",
-        "description": {
-          "name": "html",
-          "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.15.4"
-      },
-      "http": {
-        "dependency": "direct main",
-        "description": {
-          "name": "http",
-          "sha256": "b9c29a161230ee03d3ccf545097fccd9b87a5264228c5d348202e0f0c28f9010",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.2.2"
-      },
-      "http_multi_server": {
-        "dependency": "direct main",
-        "description": {
-          "name": "http_multi_server",
-          "sha256": "97486f20f9c2f7be8f514851703d0119c3596d14ea63227af6f7a481ef2b2f8b",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.2.1"
-      },
-      "http_parser": {
-        "dependency": "direct main",
-        "description": {
-          "name": "http_parser",
-          "sha256": "40f592dd352890c3b60fec1b68e786cefb9603e05ff303dbc4dda49b304ecdf4",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.1.0"
-      },
-      "intl": {
-        "dependency": "direct main",
-        "description": {
-          "name": "intl",
-          "sha256": "d6f56758b7d3014a48af9701c085700aac781a92a87a62b1333b46d8879661cf",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.19.0"
-      },
-      "io": {
-        "dependency": "direct main",
-        "description": {
-          "name": "io",
-          "sha256": "2ec25704aba361659e10e3e5f5d672068d332fc8ac516421d483a11e5cbd061e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.4"
-      },
-      "js": {
-        "dependency": "direct main",
-        "description": {
-          "name": "js",
-          "sha256": "c1b2e9b5ea78c45e1a0788d29606ba27dc5f71f019f32ca5140f61ef071838cf",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.7.1"
-      },
-      "json_annotation": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "json_annotation",
-          "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.9.0"
-      },
-      "json_rpc_2": {
-        "dependency": "direct main",
-        "description": {
-          "name": "json_rpc_2",
-          "sha256": "5e469bffa23899edacb7b22787780068d650b106a21c76db3c49218ab7ca447e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.2"
-      },
-      "logging": {
-        "dependency": "direct main",
-        "description": {
-          "name": "logging",
-          "sha256": "623a88c9594aa774443aa3eb2d41807a48486b5613e67599fb4c41c0ad47c340",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.2.0"
-      },
-      "macros": {
-        "dependency": "transitive",
-        "description": {
-          "name": "macros",
-          "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.1.3-main.0"
-      },
-      "matcher": {
-        "dependency": "direct main",
-        "description": {
-          "name": "matcher",
-          "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.12.16+1"
-      },
-      "meta": {
-        "dependency": "direct main",
-        "description": {
-          "name": "meta",
-          "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.15.0"
-      },
-      "mime": {
-        "dependency": "direct main",
-        "description": {
-          "name": "mime",
-          "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.6"
-      },
-      "multicast_dns": {
-        "dependency": "direct main",
-        "description": {
-          "name": "multicast_dns",
-          "sha256": "982c4cc4cda5f98dd477bddfd623e8e4bd1014e7dbf9e7b05052e14a5b550b99",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.3.2+7"
-      },
-      "mustache_template": {
-        "dependency": "direct main",
-        "description": {
-          "name": "mustache_template",
-          "sha256": "a46e26f91445bfb0b60519be280555b06792460b27b19e2b19ad5b9740df5d1c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.0.0"
-      },
-      "native_assets_builder": {
-        "dependency": "direct main",
-        "description": {
-          "name": "native_assets_builder",
-          "sha256": "ad76e66cc1ca7aa922d682651aee2663cd80e6ba483a346d13a8c40f604ebfd9",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.8.3"
-      },
-      "native_assets_cli": {
-        "dependency": "direct main",
-        "description": {
-          "name": "native_assets_cli",
-          "sha256": "db902509468ec2a6c6d11fa9ce02805ede280e8dbfb5f0014ef3de8483cadfce",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.8.0"
-      },
-      "native_stack_traces": {
-        "dependency": "direct main",
-        "description": {
-          "name": "native_stack_traces",
-          "sha256": "8ba566c10ea781491c203876b04b9bdcf19dfbe17b9e486869f20eaae0ee470f",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.6.0"
-      },
-      "node_preamble": {
-        "dependency": "direct main",
-        "description": {
-          "name": "node_preamble",
-          "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.0.2"
-      },
-      "package_config": {
-        "dependency": "direct main",
-        "description": {
-          "name": "package_config",
-          "sha256": "1c5b77ccc91e4823a5af61ee74e6b972db1ef98c2ff5a18d3161c982a55448bd",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.0"
-      },
-      "path": {
-        "dependency": "direct main",
-        "description": {
-          "name": "path",
-          "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.9.0"
-      },
-      "petitparser": {
-        "dependency": "direct main",
-        "description": {
-          "name": "petitparser",
-          "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "6.0.2"
-      },
-      "platform": {
-        "dependency": "direct main",
-        "description": {
-          "name": "platform",
-          "sha256": "9b71283fc13df574056616011fb138fd3b793ea47cc509c189a6c3fa5f8a1a65",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.1.5"
-      },
-      "pool": {
-        "dependency": "direct main",
-        "description": {
-          "name": "pool",
-          "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.5.1"
-      },
-      "process": {
-        "dependency": "direct main",
-        "description": {
-          "name": "process",
-          "sha256": "21e54fd2faf1b5bdd5102afd25012184a6793927648ea81eea80552ac9405b32",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "5.0.2"
-      },
-      "pub_semver": {
-        "dependency": "direct main",
-        "description": {
-          "name": "pub_semver",
-          "sha256": "40d3ab1bbd474c4c2328c91e3a7df8c6dd629b79ece4c4bd04bee496a224fb0c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.4"
-      },
-      "pubspec_parse": {
-        "dependency": "direct dev",
-        "description": {
-          "name": "pubspec_parse",
-          "sha256": "c799b721d79eb6ee6fa56f00c04b472dcd44a30d258fac2174a6ec57302678f8",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.3.0"
-      },
-      "shelf": {
-        "dependency": "direct main",
-        "description": {
-          "name": "shelf",
-          "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.4.2"
-      },
-      "shelf_packages_handler": {
-        "dependency": "direct main",
-        "description": {
-          "name": "shelf_packages_handler",
-          "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.2"
-      },
-      "shelf_proxy": {
-        "dependency": "direct main",
-        "description": {
-          "name": "shelf_proxy",
-          "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.0.4"
-      },
-      "shelf_static": {
-        "dependency": "direct main",
-        "description": {
-          "name": "shelf_static",
-          "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.3"
-      },
-      "shelf_web_socket": {
-        "dependency": "direct main",
-        "description": {
-          "name": "shelf_web_socket",
-          "sha256": "073c147238594ecd0d193f3456a5fe91c4b0abbcc68bf5cd95b36c4e194ac611",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.0.0"
-      },
-      "source_map_stack_trace": {
-        "dependency": "direct main",
-        "description": {
-          "name": "source_map_stack_trace",
-          "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.2"
-      },
-      "source_maps": {
-        "dependency": "direct main",
-        "description": {
-          "name": "source_maps",
-          "sha256": "708b3f6b97248e5781f493b765c3337db11c5d2c81c3094f10904bfa8004c703",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.10.12"
-      },
-      "source_span": {
-        "dependency": "direct main",
-        "description": {
-          "name": "source_span",
-          "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.10.0"
-      },
-      "sprintf": {
-        "dependency": "direct main",
-        "description": {
-          "name": "sprintf",
-          "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "7.0.0"
-      },
-      "sse": {
-        "dependency": "direct main",
-        "description": {
-          "name": "sse",
-          "sha256": "111a05843ea9035042975744fe61d5e8b95bc4d38656dbafc5532da77a0bb89a",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.1.6"
-      },
-      "stack_trace": {
-        "dependency": "direct main",
-        "description": {
-          "name": "stack_trace",
-          "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.12.0"
-      },
-      "standard_message_codec": {
-        "dependency": "direct main",
-        "description": {
-          "name": "standard_message_codec",
-          "sha256": "fc7dd712d191b7e33196a0ecf354c4573492bb95995e7166cb6f73b047f9cae0",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.0.1+4"
-      },
-      "stream_channel": {
-        "dependency": "direct main",
-        "description": {
-          "name": "stream_channel",
-          "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.1.2"
-      },
-      "string_scanner": {
-        "dependency": "direct main",
-        "description": {
-          "name": "string_scanner",
-          "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.3.0"
-      },
-      "sync_http": {
-        "dependency": "direct main",
-        "description": {
-          "name": "sync_http",
-          "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.3.1"
-      },
-      "term_glyph": {
-        "dependency": "direct main",
-        "description": {
-          "name": "term_glyph",
-          "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.2.1"
-      },
-      "test": {
-        "dependency": "direct main",
-        "description": {
-          "name": "test",
-          "sha256": "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.25.8"
-      },
-      "test_api": {
-        "dependency": "direct main",
-        "description": {
-          "name": "test_api",
-          "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.7.3"
-      },
-      "test_core": {
-        "dependency": "direct main",
-        "description": {
-          "name": "test_core",
-          "sha256": "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.6.5"
-      },
-      "typed_data": {
-        "dependency": "direct main",
-        "description": {
-          "name": "typed_data",
-          "sha256": "facc8d6582f16042dd49f2463ff1bd6e2c9ef9f3d5da3d9b087e244a7b564b3c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.3.2"
-      },
-      "unified_analytics": {
-        "dependency": "direct main",
-        "description": {
-          "name": "unified_analytics",
-          "sha256": "9f3c68cb30faa6d05b920498d2af79eace00fef0bae9beba9f3cda84fdbe46df",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "6.1.4"
-      },
-      "usage": {
-        "dependency": "direct main",
-        "description": {
-          "name": "usage",
-          "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.1.1"
-      },
-      "uuid": {
-        "dependency": "direct main",
-        "description": {
-          "name": "uuid",
-          "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "4.5.1"
-      },
-      "vm_service": {
-        "dependency": "direct main",
-        "description": {
-          "name": "vm_service",
-          "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "14.3.0"
-      },
-      "vm_service_interface": {
-        "dependency": "direct main",
-        "description": {
-          "name": "vm_service_interface",
-          "sha256": "f827453d9a3f8ceae04e389810da26f9b67636bdd13aa2dd9405b110c4daf59c",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.0"
-      },
-      "vm_snapshot_analysis": {
-        "dependency": "direct main",
-        "description": {
-          "name": "vm_snapshot_analysis",
-          "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.7.6"
-      },
-      "watcher": {
-        "dependency": "direct main",
-        "description": {
-          "name": "watcher",
-          "sha256": "3d2ad6751b3c16cf07c7fca317a1413b3f26530319181b37e3b9039b84fc01d8",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.0"
-      },
-      "web": {
-        "dependency": "direct main",
-        "description": {
-          "name": "web",
-          "sha256": "cd3543bd5798f6ad290ea73d210f423502e71900302dde696f8bff84bf89a1cb",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.1.0"
-      },
-      "web_socket": {
-        "dependency": "direct main",
-        "description": {
-          "name": "web_socket",
-          "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "0.1.6"
-      },
-      "web_socket_channel": {
-        "dependency": "direct main",
-        "description": {
-          "name": "web_socket_channel",
-          "sha256": "9f187088ed104edd8662ca07af4b124465893caf063ba29758f97af57e61da8f",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.1"
-      },
-      "webdriver": {
-        "dependency": "direct main",
-        "description": {
-          "name": "webdriver",
-          "sha256": "3d773670966f02a646319410766d3b5e1037efb7f07cc68f844d5e06cd4d61c8",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.0.4"
-      },
-      "webkit_inspection_protocol": {
-        "dependency": "direct main",
-        "description": {
-          "name": "webkit_inspection_protocol",
-          "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "1.2.1"
-      },
-      "xml": {
-        "dependency": "direct main",
-        "description": {
-          "name": "xml",
-          "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "6.5.0"
-      },
-      "yaml": {
-        "dependency": "direct main",
-        "description": {
-          "name": "yaml",
-          "sha256": "75769501ea3489fca56601ff33454fe45507ea3bfb014161abc3b43ae25989d5",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "3.1.2"
-      },
-      "yaml_edit": {
-        "dependency": "direct main",
-        "description": {
-          "name": "yaml_edit",
-          "sha256": "e9c1a3543d2da0db3e90270dbb1e4eebc985ee5e3ffe468d83224472b2194a5f",
-          "url": "https://pub.dev"
-        },
-        "source": "hosted",
-        "version": "2.2.1"
-      }
-    },
-    "sdks": {
-      "dart": ">=3.4.3 <4.0.0"
-    }
-  }
-}
diff --git a/pkgs/development/compilers/flutter/versions/3_27/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/deregister-pub-dependencies-artifact.patch
deleted file mode 100644
index 01e34c6d292c..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_27/patches/deregister-pub-dependencies-artifact.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart
-index 252021cf78..e50ef0885d 100644
---- a/packages/flutter_tools/lib/src/flutter_cache.dart
-+++ b/packages/flutter_tools/lib/src/flutter_cache.dart
-@@ -51,14 +51,6 @@ class FlutterCache extends Cache {
-       registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform));
-     }
-     registerArtifact(FontSubsetArtifacts(this, platform: platform));
--    registerArtifact(PubDependencies(
--      logger: logger,
--      // flutter root and pub must be lazily initialized to avoid accessing
--      // before the version is determined.
--      flutterRoot: () => Cache.flutterRoot!,
--      pub: () => pub,
--      projectFactory: projectFactory,
--    ));
-   }
- }
- 
\ No newline at end of file
diff --git a/pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch
deleted file mode 100644
index 2ad292efd222..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_27/patches/disable-auto-update.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart
-index e4e474ab6e..5548599802 100644
---- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
-+++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart
-@@ -1693,7 +1693,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and
- 
-     // Populate the cache. We call this before pub get below so that the
-     // sky_engine package is available in the flutter cache for pub to find.
--    if (shouldUpdateCache) {
-+    if (false) {
-       // First always update universal artifacts, as some of these (e.g.
-       // ios-deploy on macOS) are required to determine `requiredArtifacts`.
-       final bool offline;
-diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-index 50783f8435..db94062840 100644
---- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-+++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
-@@ -377,11 +377,7 @@ class FlutterCommandRunner extends CommandRunner<void> {
-           globals.analytics.suppressTelemetry();
-         }
- 
--        globals.flutterVersion.ensureVersionFile();
-         final bool machineFlag = topLevelResults[FlutterGlobalOptions.kMachineFlag] as bool? ?? false;
--        if (await _shouldCheckForUpdates(topLevelResults, topLevelMachineFlag: machineFlag)) {
--          await globals.flutterVersion.checkFlutterVersionFreshness();
--        }
- 
-         // See if the user specified a specific device.
-         final String? specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?;
-
diff --git a/pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch
deleted file mode 100644
index 825d40fc6176..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_27/patches/fix-ios-build-xcode-backend-sh.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 6df275df3b8694daf16302b407520e3b1dee6724 Mon Sep 17 00:00:00 2001
-From: Philip Hayes <philiphayes9@gmail.com>
-Date: Thu, 12 Sep 2024 13:23:00 -0700
-Subject: [PATCH] fix: cleanup xcode_backend.sh to fix iOS build w/
- `NixOS/nixpkgs` flutter
-
-This patch cleans up `xcode_backend.sh`. It now effectively just runs
-`exec $FLUTTER_ROOT/bin/dart ./xcode_backend.dart`.
-
-The previous `xcode_backend.sh` tries to discover `$FLUTTER_ROOT` from
-argv[0], even though its presence is already guaranteed (the wrapped
-`xcode_backend.dart` also relies on this env).
-
-When using nixpkgs flutter, the flutter SDK directory is composed of several
-layers, joined together using symlinks (called a `symlinkJoin`). Without this
-patch, the auto-discover traverses the symlinks into the wrong layer, and so it
-uses an "unwrapped" `dart` command instead of a "wrapped" dart that sets some
-important envs/flags (like `$FLUTTER_ROOT`).
-
-Using the "unwrapped" dart then manifests in this error when compiling, since
-it doesn't see the ios build-support artifacts:
-
-```
-$ flutter run -d iphone
-Running Xcode build...
-Xcode build done.                                            6.4s
-Failed to build iOS app
-Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "/<nix-store>/XXXX-flutter-3.24.1-unwrapped/bin/cache/artifacts".
-```
----
- packages/flutter_tools/bin/xcode_backend.sh | 25 ++++-----------------
- 1 file changed, 4 insertions(+), 21 deletions(-)
-
-diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh
-index 2889d7c8e4..48b9d06c6e 100755
---- a/packages/flutter_tools/bin/xcode_backend.sh
-+++ b/packages/flutter_tools/bin/xcode_backend.sh
-@@ -6,24 +6,7 @@
- # exit on error, or usage of unset var
- set -euo pipefail
- 
--# Needed because if it is set, cd may print the path it changed to.
--unset CDPATH
--
--function follow_links() (
--  cd -P "$(dirname -- "$1")"
--  file="$PWD/$(basename -- "$1")"
--  while [[ -h "$file" ]]; do
--    cd -P "$(dirname -- "$file")"
--    file="$(readlink -- "$file")"
--    cd -P "$(dirname -- "$file")"
--    file="$PWD/$(basename -- "$file")"
--  done
--  echo "$file"
--)
--
--PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")"
--BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
--FLUTTER_ROOT="$BIN_DIR/../../.."
--DART="$FLUTTER_ROOT/bin/dart"
--
--"$DART" "$BIN_DIR/xcode_backend.dart" "$@"
-+# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT.
-+dart="${FLUTTER_ROOT}/bin/dart"
-+xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart"
-+exec "${dart}" "${xcode_backend_dart}" "$@"
--- 
-2.46.0
-
diff --git a/pkgs/development/compilers/flutter/versions/3_27/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_27/patches/gradle-flutter-tools-wrapper.patch
deleted file mode 100644
index de6080efbba8..000000000000
--- a/pkgs/development/compilers/flutter/versions/3_27/patches/gradle-flutter-tools-wrapper.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-This patch introduces an intermediate Gradle build step to alter the behavior
-of flutter_tools' Gradle project, specifically moving the creation of `build`
-and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`.
-
-Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle`
-directories within the Nix Store. Resulting in read-only errors when trying to build a
-Flutter Android app at runtime.
-
-This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project
-when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")`
-
-`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory.
-
-The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` and `includeBuild`s it.
-This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting
-`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`.
-
-Now the `.gradle` will be built in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, but `build` doesn't.
-To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` as well, we need to set `buildDirectory`.
-diff --git a/packages/flutter_tools/gradle/settings.gradle b/packages/flutter_tools/gradle/settings.gradle
-new file mode 100644
-index 0000000000..b2485c94b4
---- /dev/null
-+++ b/packages/flutter_tools/gradle/settings.gradle
-@@ -0,0 +1,19 @@
-+rootProject.buildFileName = "/dev/null"
-+
-+def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10)
-+def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev")
-+dir.mkdirs()
-+def file = new File(dir, "settings.gradle")
-+
-+file.text = """
-+rootProject.projectDir = new File("$settingsDir")
-+apply from: new File("$settingsDir/settings.gradle.kts")
-+
-+gradle.allprojects { project ->
-+  project.beforeEvaluate {
-+    project.layout.buildDirectory = new File("$dir/build")
-+  }
-+}
-+"""
-+
-+includeBuild(dir)
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 0bf044175aac..9dd0272f3894 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -565,6 +565,7 @@ mapAliases {
   flut-renamer = throw "flut-renamer is unmaintained and has been removed"; # Added 2025-08-26
   flutter324 = throw "flutter324 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-10-28
   flutter326 = throw "flutter326 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-06-08
+  flutter327 = throw "flutter327 has been removed because it isn't updated anymore, and no packages in nixpkgs use it. If you still need it, use flutter.mkFlutter to get a custom version"; # Added 2025-10-28
   fmsynth = throw "'fmsynth' has been removed as it was broken and unmaintained both upstream and in nixpkgs."; # Added 2025-09-01
   follow = warnAlias "follow has been renamed to folo" folo; # Added 2025-05-18
   forceSystem = warnAlias "forceSystem is deprecated in favour of explicitly importing Nixpkgs" (
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f924889c22fa..bdcc1bc49b6e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4505,7 +4505,6 @@ with pkgs;
   flutter335 = flutterPackages.v3_35;
   flutter332 = flutterPackages.v3_32;
   flutter329 = flutterPackages.v3_29;
-  flutter327 = flutterPackages.v3_27;
 
   fpc = callPackage ../development/compilers/fpc { };
 

From 9c44331f59859b1c7e19f7ebf04fcf69c590f5ab Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Thu, 30 Oct 2025 15:33:54 -0400
Subject: [PATCH 4218/6226] davinci-resolve: remove dependency on appimage-run
 fhs

This has a huge closure size simply for extracting the appimage in the
build. Notably, onetbb is in its multiPkgs so gets built for i686-linux
on x86_64-linux. When evaling nixpkgs with `config.cudaSupport = true`,
this then may fail.
---
 pkgs/by-name/da/davinci-resolve/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/da/davinci-resolve/package.nix b/pkgs/by-name/da/davinci-resolve/package.nix
index 44c8fdb3cf59..2742fbc51974 100644
--- a/pkgs/by-name/da/davinci-resolve/package.nix
+++ b/pkgs/by-name/da/davinci-resolve/package.nix
@@ -5,13 +5,12 @@
   curl,
   runCommandLocal,
   unzip,
-  appimage-run,
+  appimageTools,
   addDriverRunpath,
   dbus,
   libGLU,
   xorg,
   buildFHSEnv,
-  buildFHSEnvChroot,
   bash,
   writeText,
   ocl-icd,
@@ -38,7 +37,7 @@ let
       version = "20.2.2";
 
       nativeBuildInputs = [
-        (appimage-run.override { buildFHSEnv = buildFHSEnvChroot; })
+        appimageTools.appimage-exec
         addDriverRunpath
         copyDesktopItems
         unzip
@@ -148,7 +147,7 @@ let
 
           mkdir -p $out
           test -e ${lib.escapeShellArg appimageName}
-          appimage-run ${lib.escapeShellArg appimageName} -i -y -n -C $out
+          appimage-exec.sh -x $out ${lib.escapeShellArg appimageName}
 
           mkdir -p $out/{"Apple Immersive/Calibration",configs,DolbyVision,easyDCP,Extras,Fairlight,GPUCache,logs,Media,"Resolve Disk Database",.crashreport,.license,.LUT}
           runHook postInstall

From 5ca3549b55eed7cd4e802da697632c52db348dcb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Thu, 30 Oct 2025 20:36:21 +0100
Subject: [PATCH 4219/6226] python313Packages.botocore-stubs: 1.40.61 ->
 1.40.62

---
 pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index 74093bd904cb..7f5b46e65d1d 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.40.61";
+  version = "1.40.62";
   pyproject = true;
 
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-wgjZBmYT1pkMyj623Tovy+8e8CNo5d9nAcXjVzVSf+Q=";
+    hash = "sha256-fZXH1kEflCQ/I3cp4NJ8W645GDoHcYPgW2PlKREJF6I=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 01cd69e12c5950569d547f1e2bd17e4187519f98 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Thu, 30 Oct 2025 20:36:25 +0100
Subject: [PATCH 4220/6226] python313Packages.boto3-stubs: 1.40.61 -> 1.40.62

---
 pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index 3ce272f7f546..a23b6a8bedb1 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -358,13 +358,13 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.40.61";
+  version = "1.40.62";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-GDfhwp1516jQltYCNcuJz/n0FCRm2e4xDMH4Vi2jQO4=";
+    hash = "sha256-73hYe2ywyLnoKoq52RDa8pagC8p2Wt6eNMxuj50bDvo=";
   };
 
   build-system = [ setuptools ];

From 5ef6474c340de4812f0f3ae27de0dcfdddb7f282 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 19:38:51 +0000
Subject: [PATCH 4221/6226] loksh: 7.7 -> 7.8

---
 pkgs/by-name/lo/loksh/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lo/loksh/package.nix b/pkgs/by-name/lo/loksh/package.nix
index 39690af2f820..baa307d9ca99 100644
--- a/pkgs/by-name/lo/loksh/package.nix
+++ b/pkgs/by-name/lo/loksh/package.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "loksh";
-  version = "7.7";
+  version = "7.8";
 
   src = fetchFromGitHub {
     owner = "dimkr";
     repo = "loksh";
     tag = finalAttrs.version;
     fetchSubmodules = true;
-    hash = "sha256-BxQ7SZwRP9PlD2MV7DqG7tQ2lqzlkTwmaKwbgC7NYrc=";
+    hash = "sha256-daodwoq2NoJ343CWjtT6qqBirEIuHBWLQO9MkAN4s/Q=";
   };
 
   outputs = [

From bf9120647960c29e83755ce1df814a34b5ab65ab Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Thu, 30 Oct 2025 20:47:57 +0100
Subject: [PATCH 4222/6226] checkov: 3.2.488 -> 3.2.489

Diff: https://github.com/bridgecrewio/checkov/compare/3.2.488...3.2.489

Changelog: https://github.com/bridgecrewio/checkov/releases/tag/3.2.489
---
 pkgs/by-name/ch/checkov/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix
index 65d1bf40b199..80d267e35b8b 100644
--- a/pkgs/by-name/ch/checkov/package.nix
+++ b/pkgs/by-name/ch/checkov/package.nix
@@ -37,14 +37,14 @@ with py.pkgs;
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.488";
+  version = "3.2.489";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     tag = version;
-    hash = "sha256-j1NcGruoYrZfaeKZZ6iNPg8k2v5L7srrSgaHXmX8eec=";
+    hash = "sha256-uh6yp3hPRv9+EtJbsN6cnOQeDNzlJNJOHeJeGmKP8rQ=";
   };
 
   pythonRelaxDeps = [

From 5271f4112a758b8419a721b0d9de1ac44d8737a9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Thu, 30 Oct 2025 20:48:18 +0100
Subject: [PATCH 4223/6226] python313Packages.iamdata: 0.1.202510291 ->
 0.1.202510301

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202510291...v0.1.202510301

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202510301
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index dace1878608f..fee8b1341676 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202510291";
+  version = "0.1.202510301";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-MApdvk2tVwvlE8F7nmBxex/NbNBlHHh2lmbwLMn0N+4=";
+    hash = "sha256-83vicOeL/CufgkOO+oKLbydv0Hu08kMcPxVjrQGzn3c=";
   };
 
   build-system = [ hatchling ];

From e95b6e4fd870e9aca9851e1128d4b29de0b61d6e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 19:55:17 +0000
Subject: [PATCH 4224/6226] vscode-extensions.betterthantomorrow.calva: 2.0.538
 -> 2.0.539

---
 .../vscode/extensions/betterthantomorrow.calva/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
index e094742ff39d..7a91185146f2 100644
--- a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix
@@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "calva";
     publisher = "betterthantomorrow";
-    version = "2.0.538";
-    hash = "sha256-lJ9AnTNN9TkPDh9u2KV1BLn/fgZOWSOXNOTAdV+r6s4=";
+    version = "2.0.539";
+    hash = "sha256-nNlEBm89sVQzLMfQjeE4uBUH/bH/mw8mYF+3/JfB78U=";
   };
 
   nativeBuildInputs = [

From 92e6ad6fc87270af62a059b434840af1f11c75ca Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Sun, 19 Oct 2025 01:24:44 +0200
Subject: [PATCH 4225/6226] fastmail-desktop: 1.0.0 -> 1.0.3, add linux support

---
 pkgs/by-name/fa/fastmail-desktop/darwin.nix  | 27 +++++++
 pkgs/by-name/fa/fastmail-desktop/linux.nix   | 84 ++++++++++++++++++++
 pkgs/by-name/fa/fastmail-desktop/package.nix | 36 ++++-----
 pkgs/by-name/fa/fastmail-desktop/sources.nix | 20 +++++
 pkgs/by-name/fa/fastmail-desktop/update.sh   | 41 ++++++++++
 5 files changed, 188 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/by-name/fa/fastmail-desktop/darwin.nix
 create mode 100644 pkgs/by-name/fa/fastmail-desktop/linux.nix
 create mode 100644 pkgs/by-name/fa/fastmail-desktop/sources.nix
 create mode 100755 pkgs/by-name/fa/fastmail-desktop/update.sh

diff --git a/pkgs/by-name/fa/fastmail-desktop/darwin.nix b/pkgs/by-name/fa/fastmail-desktop/darwin.nix
new file mode 100644
index 000000000000..6e815849081c
--- /dev/null
+++ b/pkgs/by-name/fa/fastmail-desktop/darwin.nix
@@ -0,0 +1,27 @@
+{
+  pname,
+  version,
+  src,
+  passthru,
+  meta,
+  stdenvNoCC,
+}:
+stdenvNoCC.mkDerivation {
+  inherit
+    pname
+    version
+    src
+    passthru
+    meta
+    ;
+
+  installPhase = ''
+    mkdir -p $out/Applications
+    cp -R Fastmail.app $out/Applications/
+  '';
+
+  dontBuild = true;
+
+  # Fastmail is notarized
+  dontFixup = true;
+}
diff --git a/pkgs/by-name/fa/fastmail-desktop/linux.nix b/pkgs/by-name/fa/fastmail-desktop/linux.nix
new file mode 100644
index 000000000000..63d8fbeb2ef9
--- /dev/null
+++ b/pkgs/by-name/fa/fastmail-desktop/linux.nix
@@ -0,0 +1,84 @@
+{
+  pname,
+  version,
+  src,
+  passthru,
+  meta,
+  lib,
+  stdenvNoCC,
+  appimageTools,
+  asar,
+  autoPatchelfHook,
+  makeWrapper,
+  electron,
+  libXScrnSaver,
+  libXtst,
+  libappindicator,
+  libgcc,
+  musl,
+  vips,
+}:
+let
+  appimageContents = appimageTools.extract { inherit pname version src; };
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  inherit pname version passthru;
+
+  dontUnpack = true;
+  dontBuild = true;
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    asar
+    autoPatchelfHook
+    makeWrapper
+  ];
+
+  buildInputs = [
+    libgcc
+    musl
+    vips
+  ];
+
+  libPath = lib.makeLibraryPath [
+    libXScrnSaver
+    libXtst
+    libappindicator
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p "$out/opt"
+    cp -r --no-preserve=mode "${appimageContents}/resources" "$out/opt/fastmail"
+    asar extract "$out/opt/fastmail/app.asar" "$out/opt/fastmail/app.asar.unpacked"
+    rm "$out/opt/fastmail/app.asar"
+
+    install -D "${appimageContents}/production.desktop" "$out/share/applications/fastmail.desktop"
+    substituteInPlace "$out/share/applications/fastmail.desktop" \
+      --replace-fail "Exec=AppRun --no-sandbox %U" "Exec=fastmail" \
+      --replace-fail "Icon=production" "Icon=fastmail" \
+
+    for res in 16 24 32 48 64 128 256 512 1024; do
+      resdir="''${res}x''${res}"
+      mkdir -p "$out/share/icons/hicolor/$resdir/apps"
+      cp -r --no-preserve=mode \
+        "${appimageContents}/usr/share/icons/hicolor/$resdir/apps/production.png" \
+        "$out/share/icons/hicolor/$resdir/apps/fastmail.png"
+    done
+
+    makeWrapper "${electron}/bin/electron" "$out/bin/fastmail" \
+      --add-flags "$out/opt/fastmail/app.asar.unpacked" \
+      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-wayland-ime=true --wayland-text-input-version=3}}" \
+      --prefix LD_LIBRARY_PATH : ${finalAttrs.libPath}:$out/opt/fastmail \
+      --set-default ELECTRON_IS_DEV 0 \
+      --inherit-argv0
+
+    runHook postInstall
+  '';
+
+  meta = meta // {
+    mainProgram = "fastmail";
+  };
+})
diff --git a/pkgs/by-name/fa/fastmail-desktop/package.nix b/pkgs/by-name/fa/fastmail-desktop/package.nix
index 5e0bb16ac1dc..d05a182e80be 100644
--- a/pkgs/by-name/fa/fastmail-desktop/package.nix
+++ b/pkgs/by-name/fa/fastmail-desktop/package.nix
@@ -1,34 +1,30 @@
 {
   lib,
+  callPackage,
   stdenvNoCC,
+  fetchurl,
   fetchzip,
 }:
-stdenvNoCC.mkDerivation (finalAttrs: {
+let
+  inherit (stdenvNoCC.hostPlatform) isDarwin system;
+
+  sources = import ./sources.nix { inherit fetchurl fetchzip; };
+in
+callPackage (if isDarwin then ./darwin.nix else ./linux.nix) {
   pname = "fastmail-desktop";
-  version = "1.0.0";
+  inherit (sources.${system} or (throw "Unsupported system: ${system}")) version src;
 
-  src = fetchzip {
-    url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-${finalAttrs.version}-arm64-mac.zip";
-    hash = "sha256-wIWU0F08wEQeLjbZz2LqahfyeOfowC+dDQkeMZI6gbk=";
-    stripRoot = false;
-  };
-
-  installPhase = ''
-    mkdir -p $out/Applications
-    cp -R Fastmail.app $out/Applications/
-  '';
-
-  dontBuild = true;
-
-  # Fastmail is notarized
-  dontFixup = true;
+  passthru.updateScript = ./update.sh;
 
   meta = {
     description = "Dedicated desktop app for Fastmail";
     homepage = "https://www.fastmail.com/blog/desktop-app/";
     license = lib.licenses.unfree;
-    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
     maintainers = [ lib.maintainers.Enzime ];
-    platforms = [ "aarch64-darwin" ];
+    platforms = [
+      "aarch64-darwin"
+      "x86_64-linux"
+    ];
   };
-})
+}
diff --git a/pkgs/by-name/fa/fastmail-desktop/sources.nix b/pkgs/by-name/fa/fastmail-desktop/sources.nix
new file mode 100644
index 000000000000..da373f653e94
--- /dev/null
+++ b/pkgs/by-name/fa/fastmail-desktop/sources.nix
@@ -0,0 +1,20 @@
+# Generated by ./update.sh - do not update manually!
+# Last updated: 2025-10-30
+{ fetchurl, fetchzip }:
+{
+  aarch64-darwin = {
+    version = "1.0.3";
+    src = fetchzip {
+      url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.0.3-arm64-mac.zip";
+      hash = "sha512-lqJj0tTwOJx1jzzXtlKOOduUEtSgVHpQCM5WkbXjmOh2OejLRcdJ1Y9CxvZJGSPBGWrErKzytMOB8QmJ1BkIdw==";
+      stripRoot = false;
+    };
+  };
+  x86_64-linux = {
+    version = "1.0.3";
+    src = fetchurl {
+      url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/Fastmail-1.0.3.AppImage";
+      hash = "sha512-L+h0GHAAlZndB4Q5Z7GiHuZqv1kTF5yCAJYYb9tPXnHfdcrwHvfBRnixEnVPPia46rp2IJ56z4ZS8RSut3ATFQ==";
+    };
+  };
+}
diff --git a/pkgs/by-name/fa/fastmail-desktop/update.sh b/pkgs/by-name/fa/fastmail-desktop/update.sh
new file mode 100755
index 000000000000..52c07e300a96
--- /dev/null
+++ b/pkgs/by-name/fa/fastmail-desktop/update.sh
@@ -0,0 +1,41 @@
+#!/usr/bin/env nix-shell
+#! nix-shell -i bash --pure -p cacert curl yq nix
+
+set -euo pipefail
+
+cd "$(readlink -e "$(dirname "${BASH_SOURCE[0]}")")"
+
+x86_64_linux_info=$(curl -fsS "https://dl.fastmailcdn.com/desktop/production/linux/x64/latest-linux.yml")
+aarch64_darwin_info=$(curl -fsS "https://dl.fastmailcdn.com/desktop/production/mac/arm64/latest-mac.yml")
+
+x86_64_linux_version=$(yq -r '.version' <<<"$x86_64_linux_info")
+aarch64_darwin_version=$(yq -r '.version' <<<"$aarch64_darwin_info")
+
+x86_64_linux_url="https://dl.fastmailcdn.com/desktop/production/linux/x64/$(yq -r '.path' <<<"$x86_64_linux_info")"
+aarch64_darwin_url="https://dl.fastmailcdn.com/desktop/production/mac/arm64/$(yq -r '.path' <<<"$aarch64_darwin_info")"
+
+x86_64_linux_hash=$(nix-hash --type sha512 --to-sri "$(yq -r '.sha512' <<<"$x86_64_linux_info")")
+aarch64_darwin_hash=$(nix-hash --type sha512 --to-sri "$(yq -r '.sha512' <<<"$aarch64_darwin_info")")
+
+cat >sources.nix <<EOF
+# Generated by ./update.sh - do not update manually!
+# Last updated: $(date +%F)
+{ fetchurl, fetchzip }:
+{
+  aarch64-darwin = {
+    version = "$aarch64_darwin_version";
+    src = fetchzip {
+      url = "$aarch64_darwin_url";
+      hash = "$aarch64_darwin_hash";
+      stripRoot = false;
+    };
+  };
+  x86_64-linux = {
+    version = "$x86_64_linux_version";
+    src = fetchurl {
+      url = "$x86_64_linux_url";
+      hash = "$x86_64_linux_hash";
+    };
+  };
+}
+EOF

From c77215da96ff3037b8ea321b8f47738043bcc9ed Mon Sep 17 00:00:00 2001
From: winston <hey@winston.sh>
Date: Thu, 23 Oct 2025 16:45:36 +0200
Subject: [PATCH 4226/6226] fastmail-desktop: add nekowinston to maintainers

---
 pkgs/by-name/fa/fastmail-desktop/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fa/fastmail-desktop/package.nix b/pkgs/by-name/fa/fastmail-desktop/package.nix
index d05a182e80be..531fdce45e84 100644
--- a/pkgs/by-name/fa/fastmail-desktop/package.nix
+++ b/pkgs/by-name/fa/fastmail-desktop/package.nix
@@ -21,7 +21,10 @@ callPackage (if isDarwin then ./darwin.nix else ./linux.nix) {
     homepage = "https://www.fastmail.com/blog/desktop-app/";
     license = lib.licenses.unfree;
     sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
-    maintainers = [ lib.maintainers.Enzime ];
+    maintainers = [
+      lib.maintainers.Enzime
+      lib.maintainers.nekowinston
+    ];
     platforms = [
       "aarch64-darwin"
       "x86_64-linux"

From 5911c1fdb8ae0ce305269af22711f0ec8e8e8315 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 20:04:30 +0000
Subject: [PATCH 4227/6226] python3Packages.comet-ml: 3.53.2 -> 3.54.0

---
 pkgs/development/python-modules/comet-ml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/comet-ml/default.nix b/pkgs/development/python-modules/comet-ml/default.nix
index 61a9e17c83f2..d432b793f639 100644
--- a/pkgs/development/python-modules/comet-ml/default.nix
+++ b/pkgs/development/python-modules/comet-ml/default.nix
@@ -23,12 +23,12 @@
 
 buildPythonPackage rec {
   pname = "comet-ml";
-  version = "3.53.2";
+  version = "3.54.0";
 
   src = fetchPypi {
     pname = "comet_ml";
     inherit version;
-    hash = "sha256-8OEcuC79Kf4CTCxKkzIMle9zph27UvE9f1P3Wt0/eGM=";
+    hash = "sha256-ETcRFf1wPGYrbkjknTt5omqVC4/NhhbFkCpELuY54Y0=";
   };
 
   pyproject = true;

From 0bb2c84a5065715d4704fd2d3f29cebe34872fca Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Fri, 31 Oct 2025 01:37:49 +0530
Subject: [PATCH 4228/6226] nixos/tests/dep-scan: update vdb assets

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 nixos/tests/dep-scan.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/dep-scan.nix b/nixos/tests/dep-scan.nix
index 7bfe6e9b94e4..82eb6923c5c8 100644
--- a/nixos/tests/dep-scan.nix
+++ b/nixos/tests/dep-scan.nix
@@ -31,16 +31,16 @@
     # the program will try to download them at runtime.
     # https://github.com/owasp-dep-scan/dep-scan/issues/443
     environment.etc."vdb/data.index.vdb6".source = pkgs.fetchurl {
-      url = "https://huggingface.co/datasets/AppThreat/vdb/resolve/72377024f9742c6e700a113fc7059b18f738081c/app-2y/data.index.vdb6";
-      hash = "sha256-/9RIL6KVwmUmcKteOhWlnzjtZzGUbmRzua5o4Z8Mu9I=";
+      url = "https://huggingface.co/datasets/AppThreat/vdb/resolve/40609f230dd7c83178e054e0219c367b49a2c920/app-2y/data.index.vdb6";
+      hash = "sha256-UyE0xiLT0T4ygBdEvDi4VQW/vxwalN6YV9EJ9RoLYy4=";
     };
     environment.etc."vdb/data.vdb6".source = pkgs.fetchurl {
-      url = "https://huggingface.co/datasets/AppThreat/vdb/resolve/72377024f9742c6e700a113fc7059b18f738081c/app-2y/data.vdb6";
-      hash = "sha256-6gCftnjal9ZMXV+25fVANdJRuI/CN083OOnc8yA5TTw=";
+      url = "https://huggingface.co/datasets/AppThreat/vdb/resolve/40609f230dd7c83178e054e0219c367b49a2c920/app-2y/data.vdb6";
+      hash = "sha256-k5QIowFD8H/hwaRz1p8RXlFEIrKjnFUtxtZTfD67B+U=";
     };
     environment.etc."vdb/vdb.meta".source = pkgs.fetchurl {
-      url = "https://huggingface.co/datasets/AppThreat/vdb/resolve/72377024f9742c6e700a113fc7059b18f738081c/app-2y/vdb.meta";
-      hash = "sha256-i0oI3ODrmm8PF9UGJ9gy9QzQ0SKjLo9DdqYX/kqoHak=";
+      url = "https://huggingface.co/datasets/AppThreat/vdb/resolve/40609f230dd7c83178e054e0219c367b49a2c920/app-2y/vdb.meta";
+      hash = "sha256-eQB0dHlNw31sKsRcVUByhIfuIN35+m3VAcBHIfusNPY=";
     };
     environment.variables = {
       VDB_HOME = "/tmp/vdb";

From 6fab44ceecd0b094040bd1a5917b31b231c7ed9d Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 30 Oct 2025 20:12:04 +0000
Subject: [PATCH 4229/6226] linux_xanmod: 6.12.55 -> 6.12.56

- Changelog: https://dl.xanmod.org/changelog/6.12/ChangeLog-6.12.56-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/6.12.55-xanmod1..6.12.56-xanmod1?from_project_id=51590166
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index aa1b6de6dab0..aecb582d8f47 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -15,8 +15,8 @@ let
   variants = {
     # ./update-xanmod.sh lts
     lts = {
-      version = "6.12.55";
-      hash = "sha256-JxCRiUw8dwxsEhPrvNRRRRvVSTE6JFluLRZZ4C2yoqo=";
+      version = "6.12.56";
+      hash = "sha256-+uMzNrX97n16vuMJU2J4l9gNwge46LQDVrPxSftpvyA=";
       isLTS = true;
     };
     # ./update-xanmod.sh main

From be0b22850148cdb4a4d96f3f1fe5419770edaf50 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 30 Oct 2025 20:15:09 +0000
Subject: [PATCH 4230/6226] linux_xanmod_latest: 6.17.5 -> 6.17.6

- Changelog: https://dl.xanmod.org/changelog/6.17/ChangeLog-6.17.6-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/6.17.5-xanmod1..6.17.6-xanmod1?from_project_id=51590166
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index aecb582d8f47..d928f71c757d 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -21,8 +21,8 @@ let
     };
     # ./update-xanmod.sh main
     main = {
-      version = "6.17.5";
-      hash = "sha256-w07UZmKXZ59h5DVzqH2ECzIMmeXyLfrq83FcTN5TVXo=";
+      version = "6.17.6";
+      hash = "sha256-SGaM42dN+pl0GAQRDmCR6QB0ET1loqfFwC7kUxTXEjw=";
     };
   };
 

From 5a3445b59a3cbb0f70dba91eb1344fb925e7795a Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Thu, 30 Oct 2025 15:30:25 -0500
Subject: [PATCH 4231/6226] 
 ath9k-htc-blobless-firmware,ath9k-htc-blobless-firmware-unstable: fix cmake 4
 error

---
 pkgs/os-specific/linux/firmware/ath9k/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/os-specific/linux/firmware/ath9k/default.nix b/pkgs/os-specific/linux/firmware/ath9k/default.nix
index 5c9660968579..d7c1bac92f39 100644
--- a/pkgs/os-specific/linux/firmware/ath9k/default.nix
+++ b/pkgs/os-specific/linux/firmware/ath9k/default.nix
@@ -39,6 +39,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   postPatch = ''
     patchShebangs target_firmware/firmware-crc.pl
+    substituteInPlace target_firmware/CMakeLists.txt \
+    --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" \
+                   "CMAKE_MINIMUM_REQUIRED(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [

From 03bb7d81954de1161110e4b8da50bd7e14f3b17e Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 30 Oct 2025 22:17:02 +0200
Subject: [PATCH 4232/6226] all-packages: do not export lib functions from pkgs

---
 nixos/tests/all-tests.nix                     | 27 ++++---
 nixos/tests/kubo/default.nix                  |  4 +-
 nixos/tests/web-apps/movim/default.nix        |  5 +-
 nixos/tests/web-servers/h2o/default.nix       |  5 +-
 .../applications/editors/emacs/make-emacs.nix |  3 +-
 .../editors/neovim/tests/default.nix          |  2 +-
 .../graphics/tesseract/default.nix            |  3 +-
 pkgs/build-support/fetchpypi/default.nix      |  4 +-
 pkgs/by-name/la/lammps-mpi/package.nix        |  4 +-
 pkgs/development/compilers/dotnet/default.nix |  7 +-
 pkgs/development/compilers/dotnet/wrapper.nix |  3 +-
 pkgs/development/compilers/gcc/all.nix        |  3 +-
 pkgs/development/compilers/gcc/ng/default.nix |  3 +-
 .../compilers/llvm/common/default.nix         |  7 +-
 pkgs/development/compilers/llvm/default.nix   |  3 +-
 .../interpreters/lua-5/tests/default.nix      |  2 +-
 pkgs/development/rocm-modules/6/default.nix   |  3 +-
 .../buildbot/default.nix                      |  3 +-
 pkgs/games/dwarf-fortress/default.nix         |  1 -
 pkgs/games/openra_2019/default.nix            |  4 +-
 pkgs/os-specific/linux/lvm2/common.nix        |  3 +-
 .../web-apps/pingvin-share/default.nix        |  4 +-
 pkgs/servers/web-apps/szurubooru/default.nix  |  4 +-
 pkgs/test/cuda/default.nix                    |  5 +-
 pkgs/test/default.nix                         | 72 +++++++++++--------
 pkgs/test/nixos-functions/default.nix         |  2 +-
 pkgs/test/vim/default.nix                     |  4 +-
 .../games/minecraft/optifine/default.nix      |  3 +-
 pkgs/tools/text/gawk/gawkextlib.nix           |  3 +-
 .../tools/typesetting/tex/texlive/default.nix |  3 +-
 pkgs/top-level/aliases.nix                    | 10 ++-
 pkgs/top-level/all-packages.nix               | 61 ++++++++--------
 pkgs/top-level/coq-packages.nix               |  5 +-
 pkgs/top-level/emacs-packages.nix             | 10 ++-
 pkgs/top-level/haskell-packages.nix           |  2 +-
 pkgs/top-level/java-packages.nix              | 16 +++--
 pkgs/top-level/linux-kernels.nix              |  4 +-
 pkgs/top-level/packages-config.nix            |  2 +-
 pkgs/top-level/python-packages.nix            |  2 +-
 pkgs/top-level/rocq-packages.nix              |  3 +-
 40 files changed, 157 insertions(+), 157 deletions(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 0e1146e54052..bcb00f3b067f 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -14,10 +14,15 @@
 # where said tests are unsupported.
 # Example callTest that just extracts the derivation from the test:
 #   callTest = t: t.test;
-
-with pkgs.lib;
-
 let
+  inherit (pkgs.lib)
+    isAttrs
+    isFunction
+    mapAttrs
+    elem
+    recurseIntoAttrs
+    ;
+
   # TODO: remove when handleTest is gone (make sure nixosTests and nixos/release.nix#tests are unaffected)
   # TODO: when removing, also deprecate `test` attribute in ../lib/testing/run.nix
   discoverTests =
@@ -667,7 +672,7 @@ in
   guacamole-server = runTest ./guacamole-server.nix;
   guix = handleTest ./guix { };
   gvisor = runTest ./gvisor.nix;
-  h2o = import ./web-servers/h2o { inherit recurseIntoAttrs runTest; };
+  h2o = import ./web-servers/h2o { inherit runTest; };
   hadoop = import ./hadoop {
     inherit handleTestOn;
     package = pkgs.hadoop;
@@ -737,13 +742,13 @@ in
   immich-vectorchord-migration = runTest ./web-apps/immich-vectorchord-migration.nix;
   immich-vectorchord-reindex = runTest ./web-apps/immich-vectorchord-reindex.nix;
   incron = runTest ./incron.nix;
-  incus = pkgs.recurseIntoAttrs (
+  incus = recurseIntoAttrs (
     handleTest ./incus {
       lts = false;
       inherit system pkgs;
     }
   );
-  incus-lts = pkgs.recurseIntoAttrs (handleTest ./incus { inherit system pkgs; });
+  incus-lts = recurseIntoAttrs (handleTest ./incus { inherit system pkgs; });
   influxdb = runTest ./influxdb.nix;
   influxdb2 = runTest ./influxdb2.nix;
   initrd-luks-empty-passphrase = runTest ./initrd-luks-empty-passphrase.nix;
@@ -754,7 +759,7 @@ in
   initrdNetwork = runTest ./initrd-network.nix;
   input-remapper = runTest ./input-remapper.nix;
   inspircd = runTest ./inspircd.nix;
-  installed-tests = pkgs.recurseIntoAttrs (handleTest ./installed-tests { });
+  installed-tests = recurseIntoAttrs (handleTest ./installed-tests { });
   installer = handleTest ./installer.nix { };
   installer-systemd-stage-1 = handleTest ./installer-systemd-stage-1.nix { };
   intune = runTest ./intune.nix;
@@ -808,7 +813,7 @@ in
   ksm = runTest ./ksm.nix;
   kthxbye = runTest ./kthxbye.nix;
   kubernetes = handleTestOn [ "x86_64-linux" ] ./kubernetes { };
-  kubo = import ./kubo { inherit recurseIntoAttrs runTest; };
+  kubo = import ./kubo { inherit runTest; };
   lact = runTest ./lact.nix;
   ladybird = runTest ./ladybird.nix;
   languagetool = runTest ./languagetool.nix;
@@ -891,7 +896,7 @@ in
   man = runTest ./man.nix;
   mariadb-galera = handleTest ./mysql/mariadb-galera.nix { };
   marytts = runTest ./marytts.nix;
-  mastodon = pkgs.recurseIntoAttrs (handleTest ./web-apps/mastodon { inherit handleTestOn; });
+  mastodon = recurseIntoAttrs (handleTest ./web-apps/mastodon { inherit handleTestOn; });
   mate = runTest ./mate.nix;
   mate-wayland = runTest ./mate-wayland.nix;
   matomo = runTest ./matomo.nix;
@@ -953,7 +958,7 @@ in
   mopidy = runTest ./mopidy.nix;
   morph-browser = runTest ./morph-browser.nix;
   mosquitto = runTest ./mosquitto.nix;
-  movim = import ./web-apps/movim { inherit recurseIntoAttrs runTest; };
+  movim = import ./web-apps/movim { inherit runTest; };
   mpd = runTest ./mpd.nix;
   mpv = runTest ./mpv.nix;
   mtp = runTest ./mtp.nix;
@@ -1410,7 +1415,7 @@ in
   suricata = runTest ./suricata.nix;
   suwayomi-server = import ./suwayomi-server.nix {
     inherit runTest;
-    lib = pkgs.lib;
+    inherit (pkgs) lib;
   };
   svnserve = runTest ./svnserve.nix;
   swap-file-btrfs = runTest ./swap-file-btrfs.nix;
diff --git a/nixos/tests/kubo/default.nix b/nixos/tests/kubo/default.nix
index 629922fc366d..a28df9823ebf 100644
--- a/nixos/tests/kubo/default.nix
+++ b/nixos/tests/kubo/default.nix
@@ -1,5 +1,5 @@
-{ recurseIntoAttrs, runTest }:
-recurseIntoAttrs {
+{ lib, runTest }:
+lib.recurseIntoAttrs {
   kubo = runTest ./kubo.nix;
   kubo-fuse = runTest ./kubo-fuse.nix;
 }
diff --git a/nixos/tests/web-apps/movim/default.nix b/nixos/tests/web-apps/movim/default.nix
index 7da1e7d88e67..daeb386b7563 100644
--- a/nixos/tests/web-apps/movim/default.nix
+++ b/nixos/tests/web-apps/movim/default.nix
@@ -1,6 +1,5 @@
-{ recurseIntoAttrs, runTest }:
-
-recurseIntoAttrs {
+{ lib, runTest }:
+lib.recurseIntoAttrs {
   ejabberd-h2o = runTest ./ejabberd-h2o.nix;
   prosody-nginx = runTest ./prosody-nginx.nix;
 }
diff --git a/nixos/tests/web-servers/h2o/default.nix b/nixos/tests/web-servers/h2o/default.nix
index d4a74ba71728..a9ddbda4acc5 100644
--- a/nixos/tests/web-servers/h2o/default.nix
+++ b/nixos/tests/web-servers/h2o/default.nix
@@ -1,6 +1,5 @@
-{ recurseIntoAttrs, runTest }:
-
-recurseIntoAttrs {
+{ lib, runTest }:
+lib.recurseIntoAttrs {
   basic = runTest ./basic.nix;
   mruby = runTest ./mruby.nix;
   tls-recommendations = runTest ./tls-recommendations.nix;
diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix
index cc082bf5a22d..f9e5c7367dcd 100644
--- a/pkgs/applications/editors/emacs/make-emacs.nix
+++ b/pkgs/applications/editors/emacs/make-emacs.nix
@@ -53,7 +53,6 @@
   ncurses,
   nixosTests,
   pkg-config,
-  recurseIntoAttrs,
   sigtool,
   sqlite,
   replaceVars,
@@ -496,7 +495,7 @@ stdenv.mkDerivation (finalAttrs: {
     inherit withNativeCompilation;
     inherit withTreeSitter;
     inherit withXwidgets;
-    pkgs = recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage);
+    pkgs = lib.recurseIntoAttrs (emacsPackagesFor finalAttrs.finalPackage);
     tests = {
       inherit (nixosTests) emacs-daemon;
       withPackages = callPackage ./build-support/wrapper-test.nix {
diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix
index 2f5f9c7b07f8..5b5568892ec5 100644
--- a/pkgs/applications/editors/neovim/tests/default.nix
+++ b/pkgs/applications/editors/neovim/tests/default.nix
@@ -128,7 +128,7 @@ let
     }
   );
 in
-pkgs.recurseIntoAttrs rec {
+pkgs.lib.recurseIntoAttrs rec {
 
   inherit nmt;
 
diff --git a/pkgs/applications/graphics/tesseract/default.nix b/pkgs/applications/graphics/tesseract/default.nix
index fe173e376ba5..d549af53f21e 100644
--- a/pkgs/applications/graphics/tesseract/default.nix
+++ b/pkgs/applications/graphics/tesseract/default.nix
@@ -1,9 +1,10 @@
 {
+  lib,
   callPackage,
-  lowPrio,
 }:
 
 let
+  inherit (lib) lowPrio;
   base3 = callPackage ./tesseract3.nix { };
   base4 = callPackage ./tesseract4.nix { };
   base5 = callPackage ./tesseract5.nix { };
diff --git a/pkgs/build-support/fetchpypi/default.nix b/pkgs/build-support/fetchpypi/default.nix
index d291c57429c1..71530bddff37 100644
--- a/pkgs/build-support/fetchpypi/default.nix
+++ b/pkgs/build-support/fetchpypi/default.nix
@@ -1,7 +1,7 @@
 # `fetchPypi` function for fetching artifacts from PyPI.
 {
+  lib,
   fetchurl,
-  makeOverridable,
 }:
 
 let
@@ -46,7 +46,7 @@ let
     compute (removeAttrs attrs [ "format" ]);
 
 in
-makeOverridable (
+lib.makeOverridable (
   {
     format ? "setuptools",
     sha256 ? "",
diff --git a/pkgs/by-name/la/lammps-mpi/package.nix b/pkgs/by-name/la/lammps-mpi/package.nix
index 1ac2e6a8bcb2..79c0ebddfd0f 100644
--- a/pkgs/by-name/la/lammps-mpi/package.nix
+++ b/pkgs/by-name/la/lammps-mpi/package.nix
@@ -1,10 +1,10 @@
 {
+  lib,
   lammps,
   mpi,
-  lowPrio,
 }:
 
-lowPrio (
+lib.lowPrio (
   lammps.override {
     extraBuildInputs = [
       mpi
diff --git a/pkgs/development/compilers/dotnet/default.nix b/pkgs/development/compilers/dotnet/default.nix
index 72d5cde2e1c3..3f0dc69af3e4 100644
--- a/pkgs/development/compilers/dotnet/default.nix
+++ b/pkgs/development/compilers/dotnet/default.nix
@@ -8,7 +8,6 @@
 {
   lib,
   config,
-  recurseIntoAttrs,
   generateSplicesForMkScope,
   makeScopeWithSplicing',
   writeScriptBin,
@@ -92,9 +91,9 @@ let
         mkNugetDeps = callPackage ../../../build-support/dotnet/make-nuget-deps { };
         addNuGetDeps = callPackage ../../../build-support/dotnet/add-nuget-deps { };
 
-        dotnet_8 = recurseIntoAttrs (callPackage ./8 { });
-        dotnet_9 = recurseIntoAttrs (callPackage ./9 { });
-        dotnet_10 = recurseIntoAttrs (callPackage ./10 { });
+        dotnet_8 = lib.recurseIntoAttrs (callPackage ./8 { });
+        dotnet_9 = lib.recurseIntoAttrs (callPackage ./9 { });
+        dotnet_10 = lib.recurseIntoAttrs (callPackage ./10 { });
       }
     );
   };
diff --git a/pkgs/development/compilers/dotnet/wrapper.nix b/pkgs/development/compilers/dotnet/wrapper.nix
index 16d8441af83b..e4cf6e158f71 100644
--- a/pkgs/development/compilers/dotnet/wrapper.nix
+++ b/pkgs/development/compilers/dotnet/wrapper.nix
@@ -19,7 +19,6 @@
   nugetPackageHook,
   xmlstarlet,
   pkgs,
-  recurseIntoAttrs,
 }:
 type: unwrapped:
 stdenvNoCC.mkDerivation (finalAttrs: {
@@ -282,7 +281,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         };
       }
       // lib.optionalAttrs (type == "sdk") {
-        buildDotnetModule = recurseIntoAttrs (
+        buildDotnetModule = lib.recurseIntoAttrs (
           (pkgs.appendOverlays [
             (self: super: {
               dotnet-sdk = finalAttrs.finalPackage;
diff --git a/pkgs/development/compilers/gcc/all.nix b/pkgs/development/compilers/gcc/all.nix
index 1aba286411bd..9bc67ee9ce6b 100644
--- a/pkgs/development/compilers/gcc/all.nix
+++ b/pkgs/development/compilers/gcc/all.nix
@@ -6,7 +6,6 @@
   callPackage,
   isl_0_20,
   noSysDirs,
-  lowPrio,
   wrapCC,
 }@args:
 
@@ -18,7 +17,7 @@ let
       majorVersion = lib.versions.major majorMinorVersion;
       atLeast = lib.versionAtLeast majorMinorVersion;
       attrName = "gcc${lib.replaceStrings [ "." ] [ "" ] majorMinorVersion}";
-      pkg = lowPrio (
+      pkg = lib.lowPrio (
         wrapCC (
           callPackage ./default.nix {
             inherit noSysDirs;
diff --git a/pkgs/development/compilers/gcc/ng/default.nix b/pkgs/development/compilers/gcc/ng/default.nix
index dd70df537853..a205ab6a055a 100644
--- a/pkgs/development/compilers/gcc/ng/default.nix
+++ b/pkgs/development/compilers/gcc/ng/default.nix
@@ -3,7 +3,6 @@
   callPackage,
   stdenv,
   stdenvAdapters,
-  recurseIntoAttrs,
   gccVersions ? { },
   patchesFn ? lib.id,
   buildPackages,
@@ -44,7 +43,7 @@ let
         args.name or (if (gitRelease != null) then "git" else lib.versions.major release_version);
     in
     lib.nameValuePair attrName (
-      recurseIntoAttrs (
+      lib.recurseIntoAttrs (
         callPackage ./common (
           {
             inherit (stdenvAdapters) overrideCC;
diff --git a/pkgs/development/compilers/llvm/common/default.nix b/pkgs/development/compilers/llvm/common/default.nix
index 28e29cb43a61..806cf214b4ea 100644
--- a/pkgs/development/compilers/llvm/common/default.nix
+++ b/pkgs/development/compilers/llvm/common/default.nix
@@ -1,5 +1,4 @@
 {
-  lowPrio,
   pkgs,
   targetPackages,
   lib,
@@ -190,14 +189,14 @@ makeScopeWithSplicing' {
 
       clang-unwrapped = self.libclang;
 
-      llvm-manpages = lowPrio (
+      llvm-manpages = lib.lowPrio (
         self.libllvm.override {
           enableManpages = true;
           python3 = pkgs.python3; # don't use python-boot
         }
       );
 
-      clang-manpages = lowPrio (
+      clang-manpages = lib.lowPrio (
         self.libclang.override {
           enableManpages = true;
           python3 = pkgs.python3; # don't use python-boot
@@ -261,7 +260,7 @@ makeScopeWithSplicing' {
 
       lldb = callPackage ./lldb { };
 
-      lldb-manpages = lowPrio (
+      lldb-manpages = lib.lowPrio (
         self.lldb.override {
           enableManpages = true;
           python3 = pkgs.python3; # don't use python-boot
diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index a5ad13cf0f39..bb986c4c3da9 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -6,7 +6,6 @@
   targetPackages,
   stdenv,
   pkgs,
-  recurseIntoAttrs,
   # This is the default binutils, but with *this* version of LLD rather
   # than the default LLVM version's, if LLD is the choice. We use these for
   # the `useLLVM` bootstrapping below.
@@ -56,7 +55,7 @@ let
         args.name or (if (gitRelease != null) then "git" else lib.versions.major release_version);
     in
     lib.nameValuePair attrName (
-      recurseIntoAttrs (
+      lib.recurseIntoAttrs (
         callPackage ./common (
           {
             inherit (stdenvAdapters) overrideCC;
diff --git a/pkgs/development/interpreters/lua-5/tests/default.nix b/pkgs/development/interpreters/lua-5/tests/default.nix
index 69cd8532d738..a8559005be35 100644
--- a/pkgs/development/interpreters/lua-5/tests/default.nix
+++ b/pkgs/development/interpreters/lua-5/tests/default.nix
@@ -58,7 +58,7 @@ let
       ";./?.lua;${lua}/share/luajit-2.1/?.lua;/usr/local/share/lua/5.1/?.lua;/usr/local/share/lua/5.1/?/init.lua;${lua}/share/lua/5.1/?.lua;${lua}/share/lua/5.1/?/init.lua;";
   };
 in
-pkgs.recurseIntoAttrs {
+lib.recurseIntoAttrs {
 
   checkInterpreterPath =
     let
diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index be9b1d2a9174..6654bafef12d 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -3,7 +3,6 @@
   config,
   callPackage,
   newScope,
-  recurseIntoAttrs,
   symlinkJoin,
   fetchFromGitHub,
   boost179,
@@ -33,7 +32,7 @@ let
       rocmUpdateScript = self.callPackage ./update.nix { };
 
       ## ROCm ##
-      llvm = recurseIntoAttrs (
+      llvm = lib.recurseIntoAttrs (
         callPackage ./llvm/default.nix {
           # rocm-device-libs is used for .src only
           # otherwise would cause infinite recursion
diff --git a/pkgs/development/tools/continuous-integration/buildbot/default.nix b/pkgs/development/tools/continuous-integration/buildbot/default.nix
index 6a5da56092d8..580948eea030 100644
--- a/pkgs/development/tools/continuous-integration/buildbot/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildbot/default.nix
@@ -2,7 +2,6 @@
   lib,
   newScope,
   python3,
-  recurseIntoAttrs,
 }:
 # Take packages from self first, then python.pkgs (and secondarily pkgs)
 lib.makeScope (self: newScope (self.python.pkgs // self)) (self: {
@@ -14,7 +13,7 @@ lib.makeScope (self: newScope (self.python.pkgs // self)) (self: {
 
   buildbot = self.callPackage ./master.nix { };
 
-  buildbot-plugins = recurseIntoAttrs (self.callPackage ./plugins.nix { });
+  buildbot-plugins = lib.recurseIntoAttrs (self.callPackage ./plugins.nix { });
 
   buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]);
 
diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix
index bc28480a125c..36975a26bcf7 100644
--- a/pkgs/games/dwarf-fortress/default.nix
+++ b/pkgs/games/dwarf-fortress/default.nix
@@ -3,7 +3,6 @@
   stdenvNoCC,
   gccStdenv,
   lib,
-  recurseIntoAttrs,
   libsForQt5,
   newScope,
   perlPackages,
diff --git a/pkgs/games/openra_2019/default.nix b/pkgs/games/openra_2019/default.nix
index 375f7b7eef29..4dc2b194966c 100644
--- a/pkgs/games/openra_2019/default.nix
+++ b/pkgs/games/openra_2019/default.nix
@@ -49,7 +49,7 @@ let
   callWithName = name: value: if lib.isFunction value then value name else value;
   buildOpenRASet =
     f: args:
-    pkgs.recurseIntoAttrs (
+    lib.recurseIntoAttrs (
       lib.mapAttrs callWithName (
         f (
           {
@@ -65,7 +65,7 @@ let
     );
 
 in
-pkgs.recurseIntoAttrs rec {
+lib.recurseIntoAttrs rec {
   # The whole attribute set is destructered to ensure those (and only those) attributes are given
   # and to provide defaults for those that are optional.
   buildOpenRAEngine =
diff --git a/pkgs/os-specific/linux/lvm2/common.nix b/pkgs/os-specific/linux/lvm2/common.nix
index e5c480935230..c357a3e7ebdc 100644
--- a/pkgs/os-specific/linux/lvm2/common.nix
+++ b/pkgs/os-specific/linux/lvm2/common.nix
@@ -28,7 +28,6 @@
   multipath-tools,
   nixosTests,
   buildFHSEnv,
-  recurseIntoAttrs,
 }:
 
 # configure: error: --enable-dmeventd requires --enable-cmdlib to be used as well
@@ -224,7 +223,7 @@ stdenv.mkDerivation rec {
 
   passthru.tests = {
     installer = nixosTests.installer.lvm;
-    lvm2 = recurseIntoAttrs nixosTests.lvm2;
+    lvm2 = lib.recurseIntoAttrs nixosTests.lvm2;
 
     # https://github.com/NixOS/nixpkgs/issues/369732
     lvm2-fhs-env = buildFHSEnv {
diff --git a/pkgs/servers/web-apps/pingvin-share/default.nix b/pkgs/servers/web-apps/pingvin-share/default.nix
index 08a1907646b7..6a607d957902 100644
--- a/pkgs/servers/web-apps/pingvin-share/default.nix
+++ b/pkgs/servers/web-apps/pingvin-share/default.nix
@@ -1,7 +1,7 @@
 {
+  lib,
   callPackage,
   fetchFromGitHub,
-  recurseIntoAttrs,
 }:
 
 let
@@ -14,7 +14,7 @@ let
   };
 in
 
-recurseIntoAttrs {
+lib.recurseIntoAttrs {
   backend = callPackage ./backend.nix { inherit src version; };
 
   frontend = callPackage ./frontend.nix { inherit src version; };
diff --git a/pkgs/servers/web-apps/szurubooru/default.nix b/pkgs/servers/web-apps/szurubooru/default.nix
index d2c5339b245f..22da5573b36c 100644
--- a/pkgs/servers/web-apps/szurubooru/default.nix
+++ b/pkgs/servers/web-apps/szurubooru/default.nix
@@ -1,7 +1,7 @@
 {
   callPackage,
   fetchFromGitHub,
-  recurseIntoAttrs,
+  lib,
 }:
 
 let
@@ -14,7 +14,7 @@ let
   };
 in
 
-recurseIntoAttrs {
+lib.recurseIntoAttrs {
   client = callPackage ./client.nix { inherit src version; };
   server = callPackage ./server.nix { inherit src version; };
 }
diff --git a/pkgs/test/cuda/default.nix b/pkgs/test/cuda/default.nix
index 88c58169d2a6..633bacc8f7a5 100644
--- a/pkgs/test/cuda/default.nix
+++ b/pkgs/test/cuda/default.nix
@@ -1,17 +1,16 @@
 {
   lib,
   pkgs,
-  recurseIntoAttrs,
 }:
 let
   getTests =
     cps:
-    recurseIntoAttrs {
+    lib.recurseIntoAttrs {
       inherit (cps) saxpy;
       inherit (cps.tests) cuda-library-samples;
     };
 in
-recurseIntoAttrs (
+lib.recurseIntoAttrs (
   lib.mapAttrs (_: getTests) {
     inherit (pkgs)
       cudaPackages
diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index 62e29d24ce0b..8864de64dc76 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -1,16 +1,30 @@
-{ pkgs, callPackage }:
-
-with pkgs;
-
+{ pkgs }:
+let
+  inherit (pkgs) callPackages callPackage stdenv;
+  inherit (pkgs.lib)
+    recurseIntoAttrs
+    attrNames
+    pipe
+    hasPrefix
+    hasSuffix
+    filter
+    genAttrs
+    optionals
+    filterAttrs
+    meta
+    concatMapAttrs
+    optionalAttrs
+    ;
+  inherit (pkgs.lib.strings) toJSON;
+in
 {
   cc-wrapper =
-    with builtins;
     let
       pkgNames = (attrNames pkgs);
       llvmTests =
         let
-          pkgSets = lib.pipe pkgNames [
-            (filter (lib.hasPrefix "llvmPackages"))
+          pkgSets = pipe pkgNames [
+            (filter (hasPrefix "llvmPackages"))
             # Are aliases.
             (filter (n: n != "llvmPackages_latest"))
             (filter (n: n != "llvmPackages_9"))
@@ -23,7 +37,7 @@ with pkgs;
             (filter (n: n != "llvmPackages_16"))
             (filter (n: n != "llvmPackages_17"))
           ];
-          tests = lib.genAttrs pkgSets (
+          tests = genAttrs pkgSets (
             name:
             recurseIntoAttrs {
               clang = callPackage ./cc-wrapper { stdenv = pkgs.${name}.stdenv; };
@@ -34,10 +48,10 @@ with pkgs;
         tests;
       gccTests =
         let
-          pkgSets = lib.pipe (attrNames pkgs) (
+          pkgSets = pipe (attrNames pkgs) (
             [
-              (filter (lib.hasPrefix "gcc"))
-              (filter (lib.hasSuffix "Stdenv"))
+              (filter (hasPrefix "gcc"))
+              (filter (hasSuffix "Stdenv"))
               (filter (n: n != "gccCrossLibcStdenv"))
               (filter (n: n != "gcc49Stdenv"))
               (filter (n: n != "gcc6Stdenv"))
@@ -49,7 +63,7 @@ with pkgs;
               (filter (n: n != "gcc12Stdenv"))
             ]
             ++
-              lib.optionals
+              optionals
                 (
                   !(
                     (stdenv.buildPlatform.isLinux && stdenv.buildPlatform.isx86_64)
@@ -57,11 +71,11 @@ with pkgs;
                   )
                 )
                 [
-                  (filter (n: !lib.hasSuffix "MultiStdenv" n))
+                  (filter (n: !hasSuffix "MultiStdenv" n))
                 ]
           );
         in
-        lib.genAttrs pkgSets (name: callPackage ./cc-wrapper { stdenv = pkgs.${name}; });
+        genAttrs pkgSets (name: callPackage ./cc-wrapper { stdenv = pkgs.${name}; });
     in
     recurseIntoAttrs {
       default = callPackage ./cc-wrapper { };
@@ -70,9 +84,8 @@ with pkgs;
         name = "cc-wrapper-supported";
         builtGCC =
           let
-            inherit (lib) filterAttrs;
-            sets = lib.pipe gccTests [
-              (filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.stdenv.cc))
+            sets = pipe gccTests [
+              (filterAttrs (_: v: meta.availableOn stdenv.hostPlatform v.stdenv.cc))
               # Broken
               (filterAttrs (n: _: n != "gccMultiStdenv"))
             ];
@@ -81,10 +94,9 @@ with pkgs;
 
         builtLLVM =
           let
-            inherit (lib) filterAttrs;
-            sets = lib.pipe llvmTests [
-              (filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.clang.stdenv.cc))
-              (filterAttrs (_: v: lib.meta.availableOn stdenv.hostPlatform v.libcxx.stdenv.cc))
+            sets = pipe llvmTests [
+              (filterAttrs (_: v: meta.availableOn stdenv.hostPlatform v.clang.stdenv.cc))
+              (filterAttrs (_: v: meta.availableOn stdenv.hostPlatform v.libcxx.stdenv.cc))
             ];
           in
           toJSON sets;
@@ -105,12 +117,12 @@ with pkgs;
   hardeningFlags = recurseIntoAttrs (callPackage ./cc-wrapper/hardening.nix { });
   hardeningFlags-gcc = recurseIntoAttrs (
     callPackage ./cc-wrapper/hardening.nix {
-      stdenv = gccStdenv;
+      stdenv = pkgs.gccStdenv;
     }
   );
   hardeningFlags-clang = recurseIntoAttrs (
     callPackage ./cc-wrapper/hardening.nix {
-      stdenv = llvmPackages.stdenv;
+      stdenv = pkgs.llvmPackages.stdenv;
     }
   );
 
@@ -122,8 +134,8 @@ with pkgs;
 
   hooks = recurseIntoAttrs (callPackage ./hooks { });
 
-  cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; };
-  cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; };
+  cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = pkgs.gccMultiStdenv; };
+  cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = pkgs.clangMultiStdenv; };
 
   compress-drv = callPackage ../build-support/compress-drv/test.nix { };
 
@@ -131,7 +143,7 @@ with pkgs;
   fetchtorrent = recurseIntoAttrs (callPackages ../build-support/fetchtorrent/tests.nix { });
   fetchpatch = recurseIntoAttrs (callPackages ../build-support/fetchpatch/tests.nix { });
   fetchpatch2 = recurseIntoAttrs (
-    callPackages ../build-support/fetchpatch/tests.nix { fetchpatch = fetchpatch2; }
+    callPackages ../build-support/fetchpatch/tests.nix { fetchpatch = pkgs.fetchpatch2; }
   );
   fetchDebianPatch = recurseIntoAttrs (callPackages ../build-support/fetchdebianpatch/tests.nix { });
   fetchzip = recurseIntoAttrs (callPackages ../build-support/fetchzip/tests.nix { });
@@ -199,7 +211,7 @@ with pkgs;
       # Enable sanitizers in the tests only, to avoid the performance cost in regular usage.
       # The sanitizers cause errors on aarch64-darwin, see https://github.com/NixOS/nixpkgs/pull/150079#issuecomment-994132734
       sanitizers =
-        pkgs.lib.optionals (!(pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64))
+        optionals (!(pkgs.stdenv.hostPlatform.isDarwin && pkgs.stdenv.hostPlatform.isAarch64))
           [
             "undefined"
             "address"
@@ -215,12 +227,12 @@ with pkgs;
 
   # Accumulate all passthru.tests from arrayUtilities into a single attribute set.
   arrayUtilities = recurseIntoAttrs (
-    lib.concatMapAttrs (
+    concatMapAttrs (
       name: value:
-      lib.optionalAttrs (value ? passthru.tests) {
+      optionalAttrs (value ? passthru.tests) {
         ${name} = value.passthru.tests;
       }
-    ) arrayUtilities
+    ) pkgs.arrayUtilities
   );
 
   srcOnly = callPackage ../build-support/src-only/tests.nix { };
diff --git a/pkgs/test/nixos-functions/default.nix b/pkgs/test/nixos-functions/default.nix
index 4cc738cfaebe..33d3342f3854 100644
--- a/pkgs/test/nixos-functions/default.nix
+++ b/pkgs/test/nixos-functions/default.nix
@@ -22,7 +22,7 @@ let
   };
 in
 lib.optionalAttrs (stdenv.hostPlatform.isLinux) (
-  pkgs.recurseIntoAttrs {
+  lib.recurseIntoAttrs {
     nixos-test =
       (pkgs.nixos {
         system.nixos = dummyVersioning;
diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix
index a6f52963cd8a..75e8ee2c2af4 100644
--- a/pkgs/test/vim/default.nix
+++ b/pkgs/test/vim/default.nix
@@ -1,8 +1,8 @@
 {
+  lib,
   vimUtils,
   vim-full,
   vimPlugins,
-  pkgs,
 }:
 let
   inherit (vimUtils) buildVimPlugin;
@@ -10,7 +10,7 @@ let
   packages.myVimPackage.start = with vimPlugins; [ vim-nix ];
 
 in
-pkgs.recurseIntoAttrs {
+lib.recurseIntoAttrs {
   vim_empty_config = vimUtils.vimrcFile {
     beforePlugins = "";
     customRC = "";
diff --git a/pkgs/tools/games/minecraft/optifine/default.nix b/pkgs/tools/games/minecraft/optifine/default.nix
index 7eefb18fcc60..8f2512a1c229 100644
--- a/pkgs/tools/games/minecraft/optifine/default.nix
+++ b/pkgs/tools/games/minecraft/optifine/default.nix
@@ -1,5 +1,4 @@
 {
-  recurseIntoAttrs,
   callPackage,
   lib,
 }:
@@ -11,6 +10,6 @@
 # To do so, change directory to nixpkgs root, and do:
 # $ nix-shell ./maintainers/scripts/update.nix --argstr package optifinePackages.optifine-latest --argstr commit true
 
-recurseIntoAttrs (
+lib.recurseIntoAttrs (
   lib.mapAttrs (name: value: callPackage ./generic.nix value) (lib.importJSON ./versions.json)
 )
diff --git a/pkgs/tools/text/gawk/gawkextlib.nix b/pkgs/tools/text/gawk/gawkextlib.nix
index abea3e32a139..7fc2b6177fc7 100644
--- a/pkgs/tools/text/gawk/gawkextlib.nix
+++ b/pkgs/tools/text/gawk/gawkextlib.nix
@@ -1,7 +1,6 @@
 {
   lib,
   stdenv,
-  recurseIntoAttrs,
   fetchgit,
   pkg-config,
   autoreconfHook,
@@ -212,7 +211,7 @@ let
     };
   };
 in
-recurseIntoAttrs (
+lib.recurseIntoAttrs (
   libs
   // {
     inherit gawkextlib buildExtension;
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
index ade00aa8a608..f23fcc28b61e 100644
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
@@ -42,7 +42,6 @@
   makeFontsConf,
   useFixedHashes ? true,
   extraMirrors ? [ ],
-  recurseIntoAttrs,
   nixfmt,
   luajit,
 }:
@@ -543,7 +542,7 @@ let
     license = licenses.scheme-infraonly;
   };
 
-  combined = recurseIntoAttrs (
+  combined = lib.recurseIntoAttrs (
     lib.genAttrs
       [
         "scheme-basic"
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 0bf044175aac..c43b9d8748f9 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -246,8 +246,8 @@ mapAliases {
   llvmPackages_latest = llvmPackages_21;
   llvmPackages_git = (callPackages ../development/compilers/llvm { }).git;
   # these are for convenience, not for backward compat., and shouldn't expire until the package is deprecated.
-  clang18Stdenv = lowPrio llvmPackages_18.stdenv;
-  clang19Stdenv = lowPrio llvmPackages_19.stdenv;
+  clang18Stdenv = lib.lowPrio llvmPackages_18.stdenv;
+  clang19Stdenv = lib.lowPrio llvmPackages_19.stdenv;
 
   # Various to preserve
   autoReconfHook = throw "You meant 'autoreconfHook', with a lowercase 'r'."; # preserve, reason: common typo
@@ -497,6 +497,7 @@ mapAliases {
   docker_27 = throw "'docker_27' has been removed because it has been unmaintained since May 2025. Use docker_28 or newer instead."; # Added 2025-06-15
   dockerfile-language-server-nodejs = warnAlias "'dockerfile-language-server-nodejs' has been renamed to 'dockerfile-language-server'" dockerfile-language-server; # Added 2025-09-12
   dolphin-emu-beta = throw "'dolphin-emu-beta' has been renamed to/replaced by 'dolphin-emu'"; # Converted to throw 2025-10-27
+  dontRecurseIntoAttrs = warnAlias "dontRecurseIntoAttrs has been removed from pkgs, use `lib.dontRecurseIntoAttrs` instead" lib.dontRecurseIntoAttrs; # Added 2025-10-30
   dotnetenv = throw "'dotnetenv' has been removed because it was unmaintained in Nixpkgs"; # Added 2025-07-11
   dotty = throw "'dotty' has been renamed to/replaced by 'scala_3'"; # Converted to throw 2025-10-27
   dovecot_fts_xapian = throw "'dovecot_fts_xapian' has been removed because it was unmaintained in Nixpkgs. Consider using dovecot-fts-flatcurve instead"; # Added 2025-08-16
@@ -687,6 +688,7 @@ mapAliases {
   hibernate = throw "hibernate has been removed due to lack of maintenance"; # Added 2025-09-10
   hiddify-app = throw "hiddify-app has been removed, since it is unmaintained"; # added 2025-08-20
   himitsu-firefox = throw "himitsu-firefox has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-11
+  hiPrio = warnAlias "'hiPrio' has been removed from pkgs, use `lib.hiPrio` instead" lib.hiPrio; # Added 2025-10-30
   hobbes = throw "hobbes has been removed, as it does not build with supported LLVM versions"; # Added 2025-08-20
   hostPlatform = warnAlias "'hostPlatform' has been renamed to/replaced by 'stdenv.hostPlatform'" stdenv.hostPlatform; # Converted to warning 2025-10-28
   hpmyroom = throw "hpmyroom has been removed because it has been marked as broken since May 2024."; # Added 2025-10-11
@@ -925,6 +927,7 @@ mapAliases {
   llvmPackages_16 = throw "llvmPackages_16 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   llvmPackages_17 = throw "llvmPackages_17 has been removed, as it is unmaintained and obsolete"; # Added 2025-08-09
   loco-cli = throw "'loco-cli' has been renamed to/replaced by 'loco'"; # Converted to throw 2025-10-27
+  lowPrio = warnAlias "'lowPrio' has been removed from pkgs, use `lib.lowPrio` instead" lib.lowPrio; # Added 2025-10-30
   LPCNet = throw "'LPCNet' has been renamed to/replaced by 'lpcnet'"; # Converted to throw 2025-10-27
   luci-go = throw "luci-go has been removed since it was unused and failing to build for 5 months"; # Added 2025-08-27
   lxd = throw "
@@ -968,6 +971,7 @@ mapAliases {
   mailcore2 = throw "'mailcore2' has been removed due to lack of upstream maintenance."; # Added 2025-06-09
   mailnag = throw "mailnag has been removed because it has been marked as broken since 2022."; # Added 2025-10-12
   mailnagWithPlugins = throw "mailnagWithPlugins has been removed because mailnag has been marked as broken since 2022."; # Added 2025-10-12
+  makeOverridable = warnAlias "'makeOverridable' has been removed from pkgs, use `lib.makeOverridable` instead" lib.makeOverridable; # Added 2025-10-30
   manaplus = throw "manaplus has been removed, as it was broken"; # Added 2025-08-25
   mariadb-client = throw "mariadb-client has been renamed to mariadb.client"; # Converted to throw 2025-10-26
   marwaita-manjaro = throw "'marwaita-manjaro' has been renamed to/replaced by 'marwaita-teal'"; # Converted to throw 2025-10-27
@@ -1290,6 +1294,7 @@ mapAliases {
   railway-travel = throw "'railway-travel' has been renamed to/replaced by 'diebahn'"; # Converted to throw 2025-10-27
   rambox-pro = throw "'rambox-pro' has been renamed to/replaced by 'rambox'"; # Converted to throw 2025-10-27
   rapidjson-unstable = throw "'rapidjson-unstable' has been renamed to/replaced by 'rapidjson'"; # Converted to throw 2025-10-27
+  recurseIntoAttrs = warnAlias "'recurseIntoAttrs' has been removed from pkgs, use `lib.recurseIntoAttrs` instead" lib.recurseIntoAttrs; # Added 2025-10-30
   redict = throw "'redict' has been removed due to lack of nixpkgs maintenance and a slow upstream development pace. Consider using 'valkey'."; # Added 2025-10-16
   redoc-cli = throw "'redoc-cli' been removed because it has been marked as broken since at least November 2024. Consider using 'redocly' instead."; # Added 2025-10-01
   redocly-cli = throw "'redocly-cli' has been renamed to/replaced by 'redocly'"; # Converted to throw 2025-10-27
@@ -1406,6 +1411,7 @@ mapAliases {
   StormLib = throw "'StormLib' has been renamed to/replaced by 'stormlib'"; # Converted to throw 2025-10-27
   strawberry-qt5 = throw "strawberry-qt5 has been replaced by strawberry"; # Converted to throw 2025-07-19
   strawberry-qt6 = throw "strawberry-qt6 has been replaced by strawberry"; # Added 2025-07-19
+  stringsWithDeps = warnAlias "'stringsWithDeps' has been removed from pkgs, use `lib.stringsWithDeps` instead" lib.stringsWithDeps; # Added 2025-10-30
   subberthehut = throw "'subberthehut' has been removed as it was unmaintained upstream"; # Added 2025-05-17
   sublime-music = throw "`sublime-music` has been removed because upstream has announced it is no longer maintained. Upstream suggests using `supersonic` instead."; # Added 2025-09-20
   substituteAll = throw "`substituteAll` has been removed. Use `replaceVars` instead."; # Added 2025-05-23
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f924889c22fa..e918baf5920c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12,6 +12,17 @@
   config,
   overlays,
 }:
+let
+  # Add inherited lib functions only here, so they are not exported from pkgs
+  inherit (lib)
+    lowPrio
+    hiPrio
+    recurseIntoAttrs
+    dontRecurseIntoAttrs
+    makeOverridable
+    ;
+in
+
 res: pkgs: super:
 
 with pkgs;
@@ -32,6 +43,12 @@ with pkgs;
   # all-packages.nix)
   _type = "pkgs";
 
+  ### Helper functions.
+  inherit lib config overlays;
+
+  # For convenience, allow callers to get the path to Nixpkgs.
+  path = ../..;
+
   # A stdenv capable of building 32-bit binaries.
   # On x86_64-linux, it uses GCC compiled with multilib support; on i686-linux,
   # it's just the plain stdenv.
@@ -91,35 +108,13 @@ with pkgs;
   gccStdenvNoLibs = mkStdenvNoLibs gccStdenv;
   clangStdenvNoLibs = mkStdenvNoLibs clangStdenv;
 
-  # For convenience, allow callers to get the path to Nixpkgs.
-  path = ../..;
-
-  ### Helper functions.
-  inherit lib config overlays;
-
-  # do not import 'appendToName' to get consistent package-names with the same
-  # set of package-parameters: https://github.com/NixOS/nixpkgs/issues/68519
-  inherit (lib) lowPrio hiPrio makeOverridable;
-
-  inherit (lib) recurseIntoAttrs;
-
-  # This is intended to be the reverse of recurseIntoAttrs, as it is
-  # defined now it exists mainly for documentation purposes, but you
-  # can also override this with recurseIntoAttrs to recurseInto all
-  # the Attrs which is useful for testing massive changes. Ideally,
-  # every package subset not marked with recurseIntoAttrs should be
-  # marked with this.
-  inherit (lib) dontRecurseIntoAttrs;
-
-  stringsWithDeps = lib.stringsWithDeps;
-
   ### Evaluating the entire Nixpkgs naively will likely fail, make failure fast
   AAAAAASomeThingsFailToEvaluate = throw ''
     This pseudo-package is likely not the only part of Nixpkgs that fails to evaluate.
     You should not evaluate entire Nixpkgs without measures to handle failing packages.
   '';
 
-  tests = lib.recurseIntoAttrs (callPackages ../test { });
+  tests = recurseIntoAttrs (callPackages ../test { });
 
   defaultPkgConfigPackages =
     # We don't want nix-env -q to enter this, because all of these are aliases.
@@ -2185,7 +2180,7 @@ with pkgs;
 
   mpd-sima = python3Packages.callPackage ../tools/audio/mpd-sima { };
 
-  nltk-data = lib.recurseIntoAttrs (callPackage ../tools/text/nltk-data { });
+  nltk-data = recurseIntoAttrs (callPackage ../tools/text/nltk-data { });
 
   seabios-coreboot = seabios.override { ___build-type = "coreboot"; };
   seabios-csm = seabios.override { ___build-type = "csm"; };
@@ -5555,7 +5550,7 @@ with pkgs;
   cbqn-standalone-replxx = cbqn-bootstrap.phase0-replxx;
 
   # Below, the classic self-bootstrapping process
-  cbqn-bootstrap = lib.dontRecurseIntoAttrs {
+  cbqn-bootstrap = dontRecurseIntoAttrs {
     # Use clang to compile CBQN if we aren't already.
     # CBQN's upstream primarily targets and tests clang which means using gcc
     # will result in slower binaries and on some platforms failing/broken builds.
@@ -8170,7 +8165,7 @@ with pkgs;
     nvidia-docker
     ;
 
-  nvidia-vaapi-driver = lib.hiPrio (callPackage ../development/libraries/nvidia-vaapi-driver { });
+  nvidia-vaapi-driver = hiPrio (callPackage ../development/libraries/nvidia-vaapi-driver { });
 
   nvidia-system-monitor-qt = libsForQt5.callPackage ../tools/system/nvidia-system-monitor-qt { };
 
@@ -9263,13 +9258,13 @@ with pkgs;
   home-assistant = callPackage ../servers/home-assistant { };
 
   buildHomeAssistantComponent = callPackage ../servers/home-assistant/build-custom-component { };
-  home-assistant-custom-components = lib.recurseIntoAttrs (
+  home-assistant-custom-components = recurseIntoAttrs (
     lib.packagesFromDirectoryRecursive {
       inherit (home-assistant.python.pkgs) callPackage;
       directory = ../servers/home-assistant/custom-components;
     }
   );
-  home-assistant-custom-lovelace-modules = lib.recurseIntoAttrs (
+  home-assistant-custom-lovelace-modules = recurseIntoAttrs (
     lib.packagesFromDirectoryRecursive {
       inherit callPackage;
       directory = ../servers/home-assistant/custom-lovelace-modules;
@@ -10939,7 +10934,7 @@ with pkgs;
   emacsPackagesFor =
     emacs:
     import ./emacs-packages.nix {
-      inherit (lib) makeScope makeOverridable dontRecurseIntoAttrs;
+      inherit lib;
       emacs' = emacs;
       pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set
     };
@@ -11003,7 +10998,7 @@ with pkgs;
       python = python3;
     };
   };
-  gnuradioPackages = lib.recurseIntoAttrs gnuradio.pkgs;
+  gnuradioPackages = recurseIntoAttrs gnuradio.pkgs;
 
   goldendict = libsForQt5.callPackage ../applications/misc/goldendict { };
   goldendict-ng = qt6Packages.callPackage ../applications/misc/goldendict-ng { };
@@ -11681,7 +11676,7 @@ with pkgs;
 
   magic-wormhole = with python3Packages; toPythonApplication magic-wormhole;
 
-  magnetophonDSP = lib.recurseIntoAttrs {
+  magnetophonDSP = recurseIntoAttrs {
     CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { };
     CompBus = callPackage ../applications/audio/magnetophonDSP/CompBus { };
     ConstantDetuneChorus = callPackage ../applications/audio/magnetophonDSP/ConstantDetuneChorus { };
@@ -11937,7 +11932,7 @@ with pkgs;
     inherit (darwin) DarwinTools;
   };
 
-  open-music-kontrollers = lib.recurseIntoAttrs {
+  open-music-kontrollers = recurseIntoAttrs {
     eteroj = callPackage ../applications/audio/open-music-kontrollers/eteroj.nix { };
     jit = callPackage ../applications/audio/open-music-kontrollers/jit.nix { };
     mephisto = callPackage ../applications/audio/open-music-kontrollers/mephisto.nix { };
@@ -12568,7 +12563,7 @@ with pkgs;
   # more usecases when wrapping neovim. The interface is being actively worked on
   # so expect breakage. use wrapNeovim instead if you want a stable alternative
   wrapNeovimUnstable = callPackage ../applications/editors/neovim/wrapper.nix { };
-  wrapNeovim = neovim-unwrapped: lib.makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped);
+  wrapNeovim = neovim-unwrapped: makeOverridable (neovimUtils.legacyWrapper neovim-unwrapped);
   neovim-unwrapped = callPackage ../by-name/ne/neovim-unwrapped/package.nix {
     lua = if lib.meta.availableOn stdenv.hostPlatform luajit then luajit else lua5_1;
   };
diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix
index 6d9d9fab80d6..8a35e3a59feb 100644
--- a/pkgs/top-level/coq-packages.nix
+++ b/pkgs/top-level/coq-packages.nix
@@ -5,7 +5,6 @@
   fetchzip,
   callPackage,
   newScope,
-  recurseIntoAttrs,
   ocamlPackages_4_09,
   ocamlPackages_4_10,
   ocamlPackages_4_12,
@@ -42,7 +41,7 @@ let
       };
       mkCoqDerivation = lib.makeOverridable (callPackage ../build-support/coq { });
 
-      contribs = recurseIntoAttrs (callPackage ../development/coq-modules/contribs { });
+      contribs = lib.recurseIntoAttrs (callPackage ../development/coq-modules/contribs { });
 
       aac-tactics = callPackage ../development/coq-modules/aac-tactics { };
       addition-chains = callPackage ../development/coq-modules/addition-chains { };
@@ -337,6 +336,6 @@ rec {
   coqPackages_9_0 = mkCoqPackages coq_9_0;
   coqPackages_9_1 = mkCoqPackages coq_9_1;
 
-  coqPackages = recurseIntoAttrs coqPackages_9_0;
+  coqPackages = lib.recurseIntoAttrs coqPackages_9_0;
   coq = coqPackages.coq;
 }
diff --git a/pkgs/top-level/emacs-packages.nix b/pkgs/top-level/emacs-packages.nix
index c1eaf78f1532..6055b609e506 100644
--- a/pkgs/top-level/emacs-packages.nix
+++ b/pkgs/top-level/emacs-packages.nix
@@ -15,11 +15,9 @@
 */
 
 {
+  lib,
   pkgs',
   emacs',
-  makeScope,
-  makeOverridable,
-  dontRecurseIntoAttrs,
 }:
 
 let
@@ -73,9 +71,9 @@ let
     };
 
 in
-makeScope pkgs'.newScope (
+lib.makeScope pkgs'.newScope (
   self:
-  makeOverridable (
+  lib.makeOverridable (
     {
       pkgs ? pkgs',
       lib ? pkgs.lib,
@@ -122,7 +120,7 @@ makeScope pkgs'.newScope (
         # Propagate overridden scope
         emacs = emacs'.overrideAttrs (old: {
           passthru = (old.passthru or { }) // {
-            pkgs = dontRecurseIntoAttrs self;
+            pkgs = lib.dontRecurseIntoAttrs self;
           };
         });
 
diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix
index 827685681415..fc7eae850cbb 100644
--- a/pkgs/top-level/haskell-packages.nix
+++ b/pkgs/top-level/haskell-packages.nix
@@ -217,7 +217,7 @@ in
             pkgs.lib.attrNames compiler
           );
         in
-        pkgs.recurseIntoAttrs (
+        pkgs.lib.recurseIntoAttrs (
           pkgs.lib.genAttrs nativeBignumGhcNames (
             name: compiler.${name}.override { enableNativeBignum = true; }
           )
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index c5f7ebd013fa..a890010cd152 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -1,10 +1,14 @@
 { pkgs }:
-
-with pkgs;
-
+let
+  inherit (pkgs)
+    stdenv
+    callPackage
+    config
+    lib
+    ;
+in
 {
   inherit (pkgs) openjfx17 openjfx21 openjfx23;
-
   compiler = lib.recurseIntoAttrs (
     let
       # merge meta.platforms of both packages so that dependent packages and hydra build them
@@ -56,7 +60,7 @@ with pkgs;
       openjdk11-bootstrap = temurin-bin.jdk-11;
       openjdk17-bootstrap = temurin-bin.jdk-17;
 
-      temurin-bin = recurseIntoAttrs (
+      temurin-bin = lib.recurseIntoAttrs (
         let
           temurinLinux = import ../development/compilers/temurin-bin/jdk-linux.nix {
             inherit (pkgs) lib callPackage stdenv;
@@ -68,7 +72,7 @@ with pkgs;
         lib.mapAttrs (name: drv: mkLinuxDarwin drv temurinDarwin.${name}) temurinLinux
       );
 
-      semeru-bin = recurseIntoAttrs (
+      semeru-bin = lib.recurseIntoAttrs (
         let
           semeruLinux = import ../development/compilers/semeru-bin/jdk-linux.nix {
             inherit (pkgs) lib callPackage;
diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 4e00998806b0..5bc4e7c5dcef 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -5,9 +5,6 @@
   config,
   buildPackages,
   callPackage,
-  makeOverridable,
-  recurseIntoAttrs,
-  dontRecurseIntoAttrs,
   stdenv,
   stdenvNoCC,
   newScope,
@@ -22,6 +19,7 @@
 with linuxKernel;
 
 let
+  inherit (lib) recurseIntoAttrs dontRecurseIntoAttrs;
   markBroken =
     drv:
     drv.overrideAttrs (
diff --git a/pkgs/top-level/packages-config.nix b/pkgs/top-level/packages-config.nix
index ccff7dba3fd0..cb09d08eed98 100644
--- a/pkgs/top-level/packages-config.nix
+++ b/pkgs/top-level/packages-config.nix
@@ -9,7 +9,7 @@
   packageOverrides =
     super:
     with super;
-    lib.mapAttrs (_: set: recurseIntoAttrs set) {
+    lib.mapAttrs (_: set: lib.recurseIntoAttrs set) {
       inherit (super)
         rPackages
         sourceHanPackages
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e4334ca2a112..f3c74406a29f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20051,7 +20051,7 @@ self: super: with self; {
     wasmer-compiler-singlepass
     ;
 
-  wasmerPackages = pkgs.recurseIntoAttrs (callPackage ../development/python-modules/wasmer { });
+  wasmerPackages = lib.recurseIntoAttrs (callPackage ../development/python-modules/wasmer { });
 
   wasserstein = callPackage ../development/python-modules/wasserstein { };
 
diff --git a/pkgs/top-level/rocq-packages.nix b/pkgs/top-level/rocq-packages.nix
index 1d84b16196f1..a4fc9459776b 100644
--- a/pkgs/top-level/rocq-packages.nix
+++ b/pkgs/top-level/rocq-packages.nix
@@ -5,7 +5,6 @@
   fetchzip,
   callPackage,
   newScope,
-  recurseIntoAttrs,
   ocamlPackages_4_14,
   fetchpatch,
   makeWrapper,
@@ -93,6 +92,6 @@ rec {
   rocqPackages_9_0 = mkRocqPackages rocq-core_9_0;
   rocqPackages_9_1 = mkRocqPackages rocq-core_9_1;
 
-  rocqPackages = recurseIntoAttrs rocqPackages_9_0;
+  rocqPackages = lib.recurseIntoAttrs rocqPackages_9_0;
   rocq-core = rocqPackages.rocq-core;
 }

From 94ed560a951132d100ff2cd0212ef0b3463c07ef Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 30 Oct 2025 22:19:03 +0200
Subject: [PATCH 4233/6226] linux-kernels: remove global with

---
 pkgs/top-level/linux-kernels.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/linux-kernels.nix b/pkgs/top-level/linux-kernels.nix
index 5bc4e7c5dcef..ee013f4ef37d 100644
--- a/pkgs/top-level/linux-kernels.nix
+++ b/pkgs/top-level/linux-kernels.nix
@@ -16,10 +16,20 @@
 # - Update packageAliases.linux_latest to the latest version
 # - Update linux_latest_hardened when the patches become available
 
-with linuxKernel;
-
 let
   inherit (lib) recurseIntoAttrs dontRecurseIntoAttrs;
+  inherit (linuxKernel)
+    kernels
+    kernelPatches
+    manualConfig
+    packages
+    packagesFor
+    packageAliases
+    vanillaPackages
+    rtPackages
+    rpiPackages
+    ;
+
   markBroken =
     drv:
     drv.overrideAttrs (

From 02c3f819d7887d6c9fd3eed690e3477c169e3f5e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 5 Oct 2025 11:55:52 +0200
Subject: [PATCH 4234/6226] python313Packages.locust-cloud: add changelog to
 meta

---
 pkgs/development/python-modules/locust-cloud/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/locust-cloud/default.nix b/pkgs/development/python-modules/locust-cloud/default.nix
index ac503a0593c0..2f259ad21e56 100644
--- a/pkgs/development/python-modules/locust-cloud/default.nix
+++ b/pkgs/development/python-modules/locust-cloud/default.nix
@@ -42,7 +42,8 @@ buildPythonPackage rec {
 
   meta = {
     description = "Hosted version of Locust to run distributed load tests";
-    homepage = "https://www.locust.cloud/";
+    homepage = "https://github.com/locustcloud/locust-cloud";
+    changelog = "https://github.com/locustcloud/locust-cloud/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ magicquark ];
   };

From 4e2a3f183b22a7e7e9dc73d6606e9893ac64a12f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 5 Oct 2025 12:02:32 +0200
Subject: [PATCH 4235/6226] python313Packages.locust-cloud: add
 pythonImportsCheck

---
 pkgs/development/python-modules/locust-cloud/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/locust-cloud/default.nix b/pkgs/development/python-modules/locust-cloud/default.nix
index 2f259ad21e56..079416c5252d 100644
--- a/pkgs/development/python-modules/locust-cloud/default.nix
+++ b/pkgs/development/python-modules/locust-cloud/default.nix
@@ -1,11 +1,11 @@
 {
+  lib,
   buildPythonPackage,
   configargparse,
   fetchFromGitHub,
   gevent,
   hatch-vcs,
   hatchling,
-  lib,
   platformdirs,
   python-engineio,
   python-socketio,
@@ -40,6 +40,8 @@ buildPythonPackage rec {
     tomli
   ];
 
+  pythonImportsCheck = [ "locust_cloud" ];
+
   meta = {
     description = "Hosted version of Locust to run distributed load tests";
     homepage = "https://github.com/locustcloud/locust-cloud";

From ca68306a91130e27a14bc38652319219272d6c67 Mon Sep 17 00:00:00 2001
From: Philipp Arras <c@philipp-arras.de>
Date: Thu, 30 Oct 2025 15:36:53 +0100
Subject: [PATCH 4236/6226] python3Packages.python-socketio: 5.13.0 -> 5.14.3

---
 .../python-modules/python-socketio/default.nix            | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix
index cd621b30166d..4e5d9c86e1dc 100644
--- a/pkgs/development/python-modules/python-socketio/default.nix
+++ b/pkgs/development/python-modules/python-socketio/default.nix
@@ -21,19 +21,21 @@
   pytest7CheckHook,
   simple-websocket,
   uvicorn,
+  redis,
+  valkey,
 
 }:
 
 buildPythonPackage rec {
   pname = "python-socketio";
-  version = "5.13.0";
+  version = "5.14.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "miguelgrinberg";
     repo = "python-socketio";
     tag = "v${version}";
-    hash = "sha256-iOipxGALYOXLvUwn6OSjLCMZoUl7u4S5eCktUgcs/X0=";
+    hash = "sha256-2zts0gkwAoUCC8S1UDg0PlBaFH23jTv04hgGblHSX7c=";
   };
 
   build-system = [ setuptools ];
@@ -56,6 +58,8 @@ buildPythonPackage rec {
     pytest7CheckHook
     uvicorn
     simple-websocket
+    redis
+    valkey
   ]
   ++ lib.flatten (lib.attrValues optional-dependencies);
 

From 1969163519edb14b809faae99bb537a71c81cd7a Mon Sep 17 00:00:00 2001
From: Philipp Arras <c@philipp-arras.de>
Date: Thu, 30 Oct 2025 15:38:03 +0100
Subject: [PATCH 4237/6226] python3Packages.locust-cloud: 1.27.0 -> 1.27.9

---
 pkgs/development/python-modules/locust-cloud/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/locust-cloud/default.nix b/pkgs/development/python-modules/locust-cloud/default.nix
index 079416c5252d..c46d093dbb3e 100644
--- a/pkgs/development/python-modules/locust-cloud/default.nix
+++ b/pkgs/development/python-modules/locust-cloud/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "locust-cloud";
-  version = "1.27.0";
+  version = "1.27.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "locustcloud";
     repo = "locust-cloud";
     tag = version;
-    hash = "sha256-K69VIyQggwWQQoMld0JpzmtJRQc6HYrKAGA6E9O69MQ=";
+    hash = "sha256-7k1IZNBVkz+E5WW/wZWpB+yl/W7ONuHlUM8wOKvu0ow=";
   };
 
   build-system = [

From 48c7b2bdbc26682d1022c3c846a9b70977b54ef7 Mon Sep 17 00:00:00 2001
From: Cathal Mullan <contact@cathal.dev>
Date: Thu, 30 Oct 2025 20:56:47 +0000
Subject: [PATCH 4238/6226] zizmor: Use system jemalloc

---
 pkgs/by-name/zi/zizmor/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/zi/zizmor/package.nix b/pkgs/by-name/zi/zizmor/package.nix
index 5fc7dbadb45d..e3654c0f667f 100644
--- a/pkgs/by-name/zi/zizmor/package.nix
+++ b/pkgs/by-name/zi/zizmor/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  rust-jemalloc-sys,
   installShellFiles,
   nix-update-script,
   rustPlatform,
@@ -21,6 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-4+1EURDrDYG4luaNV9KdRVojXY++H9LNNl2oINfWeLc=";
 
+  buildInputs = [
+    rust-jemalloc-sys
+  ];
+
   nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [
     installShellFiles
   ];

From 579e7cc779a0cc2b25dad032c1a826fb785109d1 Mon Sep 17 00:00:00 2001
From: Philipp Arras <c@philipp-arras.de>
Date: Thu, 30 Oct 2025 15:39:09 +0100
Subject: [PATCH 4239/6226] python3Packages.locust: 2.37.14 -> 2.42.1

---
 pkgs/development/python-modules/locust/default.nix | 7 +++++--
 pkgs/development/python-modules/locust/webui.nix   | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/locust/default.nix b/pkgs/development/python-modules/locust/default.nix
index 40b5d08429ec..d59ba37d5ac9 100644
--- a/pkgs/development/python-modules/locust/default.nix
+++ b/pkgs/development/python-modules/locust/default.nix
@@ -18,6 +18,7 @@
   locust-cloud,
   psutil,
   pyquery,
+  pytest,
   pyzmq,
   requests,
   retry,
@@ -27,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "locust";
-  version = "2.37.14";
+  version = "2.42.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "locustio";
     repo = "locust";
     tag = version;
-    hash = "sha256-16pMl72OIZlAi6jNx0qv0TO9RTm6O9CgiE84sndsEhc=";
+    hash = "sha256-yyG4HVti0BAcGWQHID799YfkCEIBmpTkUUm8QzXMivc=";
   };
 
   postPatch = ''
@@ -65,6 +66,7 @@ buildPythonPackage rec {
     "flask-login"
     # version 6.0.1 is listed as 0.0.1 in the dependency check and 0.0.1 is not >= 3.0.10
     "flask-cors"
+    "requests"
   ];
 
   dependencies = [
@@ -81,6 +83,7 @@ buildPythonPackage rec {
     requests
     tomli
     werkzeug
+    pytest
   ];
 
   pythonImportsCheck = [ "locust" ];
diff --git a/pkgs/development/python-modules/locust/webui.nix b/pkgs/development/python-modules/locust/webui.nix
index 964329564533..8905429828ef 100644
--- a/pkgs/development/python-modules/locust/webui.nix
+++ b/pkgs/development/python-modules/locust/webui.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: {
   missingHashes = ./missing-hashes.json;
   yarnOfflineCache = yarn-berry.fetchYarnBerryDeps {
     inherit (finalAttrs) src missingHashes;
-    hash = "sha256-FbKaU3wezuvcn98FOcUZbmoot/iHtmeStp4n0dNwFYA=";
+    hash = "sha256-dxt7rRA6kh0msjy3DAUvtj7LoE7vEaf4pmP2B95HoeY=";
   };
 
   nativeBuildInputs = [

From 31dd6d8bf03661a20a652a526d6cdf1144ece0d8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Thu, 30 Oct 2025 21:59:15 +0100
Subject: [PATCH 4240/6226] python313Packages.iamdata: enable on darwin

---
 pkgs/development/python-modules/iamdata/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index fee8b1341676..d7e62a3d31c3 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -18,6 +18,8 @@ buildPythonPackage rec {
     hash = "sha256-83vicOeL/CufgkOO+oKLbydv0Hu08kMcPxVjrQGzn3c=";
   };
 
+  __darwinAllowLocalNetworking = true;
+
   build-system = [ hatchling ];
 
   nativeCheckInputs = [ pytestCheckHook ];

From d45cc53ab353baa2e70827c81e459b8ec2bb1627 Mon Sep 17 00:00:00 2001
From: "Peter H. Hoeg" <peter@hoeg.com>
Date: Thu, 30 Oct 2025 22:01:02 +0100
Subject: [PATCH 4241/6226] haruna: 1.4.0 -> 1.6.0

---
 pkgs/by-name/ha/haruna/package.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ha/haruna/package.nix b/pkgs/by-name/ha/haruna/package.nix
index 467a6427dbeb..9da98a615246 100644
--- a/pkgs/by-name/ha/haruna/package.nix
+++ b/pkgs/by-name/ha/haruna/package.nix
@@ -4,21 +4,23 @@
   fetchFromGitLab,
   cmake,
   ffmpeg-headless,
+  kdsingleapplication,
+  libass,
   kdePackages,
   pkg-config,
   qt6,
   yt-dlp,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "haruna";
-  version = "1.4.0";
+  version = "1.6.0";
 
   src = fetchFromGitLab {
     owner = "multimedia";
     repo = "haruna";
-    rev = "v${version}";
-    hash = "sha256-7983qZ7c3i8Ilyvu36t02zeIcVO96PXGNLH3wq6JsvI=";
+    rev = "v${finalAttrs.finalPackage.version}";
+    hash = "sha256-pAFO6zclJNmHD91ady0vlnBg6ebSWMzJq7TZN/uBGnM=";
     domain = "invent.kde.org";
   };
 
@@ -34,6 +36,8 @@ stdenv.mkDerivation rec {
     yt-dlp
 
     ffmpeg-headless
+    kdsingleapplication
+    libass
     kdePackages.kconfig
     kdePackages.kcoreaddons
     kdePackages.kdeclarative
@@ -55,6 +59,8 @@ stdenv.mkDerivation rec {
     qt6.wrapQtAppsHook
   ];
 
+  env.LANG = "C.UTF-8";
+
   meta = {
     homepage = "https://invent.kde.org/multimedia/haruna";
     description = "Open source video player built with Qt/QML and libmpv";
@@ -73,4 +79,4 @@ stdenv.mkDerivation rec {
     ];
     mainProgram = "haruna";
   };
-}
+})

From 850659303425f4f9c1d8834605d30896f06df6ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 21:24:54 +0000
Subject: [PATCH 4242/6226] tideways-daemon: 1.10.0 -> 1.11.4

---
 pkgs/by-name/ti/tideways-daemon/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ti/tideways-daemon/package.nix b/pkgs/by-name/ti/tideways-daemon/package.nix
index 4515b76beb5d..37f2ef718a4f 100644
--- a/pkgs/by-name/ti/tideways-daemon/package.nix
+++ b/pkgs/by-name/ti/tideways-daemon/package.nix
@@ -10,7 +10,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "tideways-daemon";
-  version = "1.10.0";
+  version = "1.11.4";
 
   src =
     finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
@@ -28,15 +28,15 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sources = {
       "x86_64-linux" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_amd64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-XxKwT7VgdEZclim14H3oZNAE25DoALcpRzx/IPEE4sc=";
+        hash = "sha256-wHiVNkoiaPF4HhE6dnBQXlGMOTqi6Mq0L7HCIFfybRk=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_linux_aarch64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-0G9SwZHZSHgTAfB+GWTEoSGVhk+Xk8o/aX2zCcnoInI=";
+        hash = "sha256-5ga73KByQ2g/L23t+TOLrd3tQa4O5ehN/C26I/mbVuM=";
       };
       "aarch64-darwin" = fetchurl {
         url = "https://tideways.s3.amazonaws.com/daemon/${finalAttrs.version}/tideways-daemon_macos_arm64-${finalAttrs.version}.tar.gz";
-        hash = "sha256-nD2d5XOxV2N4o5LiiF+ZomHXdWmVEYUIz5Yhs0awjEs=";
+        hash = "sha256-5fSEqaTDR0u6vnQuIv8cRuIMlfFDfw2vh9uFzAf7nTs=";
       };
     };
     updateScript = "${

From ef4f6b99e3ab4416e621a03ecee356b954e11ec6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 21:48:02 +0000
Subject: [PATCH 4243/6226] mymake: 2.3.6 -> 2.4.1

---
 pkgs/by-name/my/mymake/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/my/mymake/package.nix b/pkgs/by-name/my/mymake/package.nix
index d30ec4f40f85..9d7907a58b51 100644
--- a/pkgs/by-name/my/mymake/package.nix
+++ b/pkgs/by-name/my/mymake/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mymake";
-  version = "2.3.6";
+  version = "2.4.1";
 
   src = fetchFromGitHub {
     owner = "fstromback";
     repo = "mymake";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-UQjvxdOvD9O6TrzBFJwh3CistDGZM9HZbcwVPx1n4+A=";
+    hash = "sha256-FVY6Ep6619W3fMDRYdU/FdnltNUahkY33aVhz8kXEGU=";
   };
 
   buildPhase = ''

From 0751cc0f71e703dd245a1867fbfe3259a6b6ca8c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 30 Oct 2025 21:48:31 +0000
Subject: [PATCH 4244/6226] harlequin: 2.4.0 -> 2.4.1

Diff: https://github.com/tconbeer/harlequin/compare/v2.4.0...v2.4.1

Changelog: https://github.com/tconbeer/harlequin/releases/tag/v2.4.1
---
 pkgs/by-name/ha/harlequin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix
index 8ce6cfd95c93..4c85ce0e4a52 100644
--- a/pkgs/by-name/ha/harlequin/package.nix
+++ b/pkgs/by-name/ha/harlequin/package.nix
@@ -12,14 +12,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "harlequin";
-  version = "2.4.0";
+  version = "2.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tconbeer";
     repo = "harlequin";
     tag = "v${version}";
-    hash = "sha256-jg29EEwPVTy1n6PYAxNqbyCsmmAxzRWD3vLCvvMd+6E=";
+    hash = "sha256-W/Za/k/XusZmPLiX4ER9XaQWG4jdkrIh7JualHeeqZM=";
   };
 
   pythonRelaxDeps = [

From 5a67943c16433463202323c46c7031175c6e37d1 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 30 Oct 2025 21:58:48 +0000
Subject: [PATCH 4245/6226] python3Packages.mizani: 0.14.2 -> 0.14.3

Diff: https://github.com/has2k1/mizani/compare/v0.14.2...v0.14.3

Changelog: https://github.com/has2k1/mizani/releases/tag/v0.14.3
---
 pkgs/development/python-modules/mizani/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix
index adad2c3a3c7b..6035a4a37efd 100644
--- a/pkgs/development/python-modules/mizani/default.nix
+++ b/pkgs/development/python-modules/mizani/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "mizani";
-  version = "0.14.2";
+  version = "0.14.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "has2k1";
     repo = "mizani";
     tag = "v${version}";
-    hash = "sha256-g7eGajqFLgFWxNKefuYVWF439zVohU8W1j3w91nblEY=";
+    hash = "sha256-LUustvdD+8J6xu4HrvdFlVHlPGnt+h/0ZvGH7ZiVBUY=";
   };
 
   build-system = [ setuptools-scm ];

From a6a76ce74c88657dc7f657f238b14f2adcbddbce Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Fri, 26 Sep 2025 06:55:47 +0800
Subject: [PATCH 4246/6226] fvm: 4.0.0-beta.1 -> 4.0.0

---
 pkgs/by-name/fv/fvm/package.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/fv/fvm/package.nix b/pkgs/by-name/fv/fvm/package.nix
index 77831eeda270..3fed21626ade 100644
--- a/pkgs/by-name/fv/fvm/package.nix
+++ b/pkgs/by-name/fv/fvm/package.nix
@@ -5,17 +5,17 @@
   runCommand,
   yq-go,
   _experimental-update-script-combinators,
-  gitUpdater,
+  nix-update-script,
 }:
 
 let
-  version = "4.0.0-beta.1";
+  version = "4.0.0";
 
   src = fetchFromGitHub {
     owner = "leoafarias";
     repo = "fvm";
     tag = version;
-    hash = "sha256-O2VU0cXgrm+Xf85e5l31kfnUOCUI9ZuVQCVRUppqCE4=";
+    hash = "sha256-gJZHQRFCIlHvyMVr/+FCnZcCO8ZTA1gGyBEaRywbvNQ=";
   };
 in
 buildDartApplication {
@@ -35,8 +35,13 @@ buildDartApplication {
           yq eval --output-format=json --prettyPrint $src/pubspec.lock > "$out"
         '';
     updateScript = _experimental-update-script-combinators.sequence [
-      (gitUpdater { })
-      (_experimental-update-script-combinators.copyAttrOutputToFile "fvm.pubspecSource" ./pubspec.lock.json)
+      (nix-update-script { })
+      (
+        (_experimental-update-script-combinators.copyAttrOutputToFile "fvm.pubspecSource" ./pubspec.lock.json)
+        // {
+          supportedFeatures = [ ];
+        }
+      )
     ];
   };
 
@@ -44,6 +49,7 @@ buildDartApplication {
     description = "Simple CLI to manage Flutter SDK versions";
     homepage = "https://github.com/leoafarias/fvm";
     license = lib.licenses.mit;
+    mainProgram = "fvm";
     maintainers = [ ];
   };
 }

From 29514138fa9d263f65e445a98f10ec56bf88534b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 22:19:11 +0000
Subject: [PATCH 4247/6226] python3Packages.aiowinreg: 0.0.12 -> 0.0.13

---
 pkgs/development/python-modules/aiowinreg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiowinreg/default.nix b/pkgs/development/python-modules/aiowinreg/default.nix
index 6be789ed2cd2..fccc01f7eb8a 100644
--- a/pkgs/development/python-modules/aiowinreg/default.nix
+++ b/pkgs/development/python-modules/aiowinreg/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "aiowinreg";
-  version = "0.0.12";
+  version = "0.0.13";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "skelsec";
     repo = "aiowinreg";
     tag = version;
-    hash = "sha256-XQDBvBfocz5loUg9eZQz4FKGiCGCaczwhYE/vhy7mC0=";
+    hash = "sha256-vY5SrGTFH/xsv9k2WciE0xNx9r3W53sxxLGXFX34EuE=";
   };
 
   nativeBuildInputs = [ setuptools ];

From bd107d4d8fefaf7c96773742524db27ea4da34c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 30 Oct 2025 21:28:21 +0100
Subject: [PATCH 4248/6226] prefer-remote-fetch: fix fetchurl eval

---
 pkgs/build-support/prefer-remote-fetch/default.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/prefer-remote-fetch/default.nix b/pkgs/build-support/prefer-remote-fetch/default.nix
index 47b633da8faf..d686533f69e0 100644
--- a/pkgs/build-support/prefer-remote-fetch/default.nix
+++ b/pkgs/build-support/prefer-remote-fetch/default.nix
@@ -22,6 +22,12 @@ self: super: {
   fetchrepoproject = args: super.fetchrepoproject ({ preferLocalBuild = false; } // args);
   fetchs3 = args: super.fetchs3 ({ preferLocalBuild = false; } // args);
   fetchsvn = args: super.fetchsvn ({ preferLocalBuild = false; } // args);
-  fetchurl = args: super.fetchurl ({ preferLocalBuild = false; } // args);
+  fetchurl =
+    fpArgs:
+    super.fetchurl (
+      super.lib.extends (finalAttrs: args: { preferLocalBuild = args.preferLocalBuild or false; }) (
+        super.lib.toFunction fpArgs
+      )
+    );
   mkNugetSource = args: super.mkNugetSource ({ preferLocalBuild = false; } // args);
 }

From 0de00f716bac1295e083cfde9f36bbdf792fe6fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 22:23:20 +0000
Subject: [PATCH 4249/6226] temporal: 1.29.0 -> 1.29.1

---
 pkgs/by-name/te/temporal/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/te/temporal/package.nix b/pkgs/by-name/te/temporal/package.nix
index eeff38ecea96..85ca39845bb7 100644
--- a/pkgs/by-name/te/temporal/package.nix
+++ b/pkgs/by-name/te/temporal/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "temporal";
-  version = "1.29.0";
+  version = "1.29.1";
 
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = "temporal";
     rev = "v${version}";
-    hash = "sha256-oxn/78nQCvlEkSqabVV47siWSSnz32tpDOweqScPYvY=";
+    hash = "sha256-rUm1zHxM0KYPgKpK7w0XLU7aF3H6sECgSe/UtbNdgJM=";
   };
 
   vendorHash = "sha256-HW2j8swbaWwU1i3udqlT8VyFreML6ZH14zWxF8L5NTQ=";

From 09bc9da94bb3e7b9000ffb366943b8a53c12a852 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Thu, 30 Oct 2025 23:21:48 +0100
Subject: [PATCH 4250/6226] signal-desktop: 7.76.0 -> 7.77.1

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/si/signal-desktop/package.nix    | 14 ++--
 .../replace-apple-emoji-with-noto-emoji.patch | 67 +++++++++----------
 pkgs/by-name/si/signal-desktop/ringrtc.nix    |  6 +-
 3 files changed, 40 insertions(+), 47 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop/package.nix b/pkgs/by-name/si/signal-desktop/package.nix
index 028c523da7e5..2220f87cbd7f 100644
--- a/pkgs/by-name/si/signal-desktop/package.nix
+++ b/pkgs/by-name/si/signal-desktop/package.nix
@@ -52,13 +52,13 @@ let
     '';
   });
 
-  version = "7.76.0";
+  version = "7.77.1";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "Signal-Desktop";
     tag = "v${version}";
-    hash = "sha256-zwywpQ/1LYSofXPMLtYt7c0PLlzgNedRGqslPJur61g=";
+    hash = "sha256-IFMNUuGL3sQVlEJI4N2rXrYStcDEZW/YxmZyPM0hhVU=";
   };
 
   sticker-creator = stdenv.mkDerivation (finalAttrs: {
@@ -69,7 +69,7 @@ let
     pnpmDeps = pnpm.fetchDeps {
       inherit (finalAttrs) pname src version;
       fetcherVersion = 1;
-      hash = "sha256-WUwclz7dJl+s5zRjWu/HTJ5eZroAFA6vR8mZzwib6Po=";
+      hash = "sha256-m/JxsKnVhcya7dUz1MBMQKwEdqoV3xQiGOoT4egh3K4=";
     };
 
     strictDeps = true;
@@ -120,7 +120,7 @@ stdenv.mkDerivation (finalAttrs: {
     # resource if the nixpkgs version is different. To fix this we hardcode
     # the electron version to the declared one here instead of interpolating
     # it at runtime.
-    substituteInPlace app/updateDefaultSession.ts \
+    substituteInPlace app/updateDefaultSession.main.ts \
       --replace-fail "\''${process.versions.electron}" "`jq -r '.devDependencies.electron' < package.json`"
   '';
 
@@ -134,15 +134,15 @@ stdenv.mkDerivation (finalAttrs: {
     fetcherVersion = 1;
     hash =
       if withAppleEmojis then
-        "sha256-b13di3TdaS6CT8gAZfBqlu4WheIHL+X8LvAo148H8kI="
+        "sha256-RquJqKUDdz8QRJXz7eWiAcdUF+WhYEqnyOkhrIw7tgQ="
       else
-        "sha256-/Yy9R+MRN5e5vGU0XgwJa7oFpHn8bi8B0y89aaT2LQI=";
+        "sha256-v1KbjFLo5pD1uoNtDrX2kUbhCgGeEqbuHLZRIJqshHw=";
   };
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
     SIGNAL_ENV = "production";
-    SOURCE_DATE_EPOCH = 1761172657;
+    SOURCE_DATE_EPOCH = 1761859038;
   };
 
   preBuild = ''
diff --git a/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch
index 4f7f0bebcf26..71e6d448bfab 100644
--- a/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch
+++ b/pkgs/by-name/si/signal-desktop/replace-apple-emoji-with-noto-emoji.patch
@@ -1,8 +1,8 @@
 diff --git a/ACKNOWLEDGMENTS.md b/ACKNOWLEDGMENTS.md
-index 2c963f1..96edd02 100644
+index 273a9e097..ffb5b6eb6 100644
 --- a/ACKNOWLEDGMENTS.md
 +++ b/ACKNOWLEDGMENTS.md
-@@ -1636,30 +1636,6 @@ Signal Desktop makes use of the following open source projects.
+@@ -3667,30 +3667,6 @@ Signal Desktop makes use of the following open source projects.
      OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
      SOFTWARE.
  
@@ -33,11 +33,11 @@ index 2c963f1..96edd02 100644
  ## emoji-regex
  
      Copyright Mathias Bynens <https://mathiasbynens.be/>
-diff --git a/app/protocol_filter.ts b/app/protocol_filter.ts
-index 68dceea..4b35bb1 100644
---- a/app/protocol_filter.ts
-+++ b/app/protocol_filter.ts
-@@ -59,6 +59,7 @@ function _createFileHandler({
+diff --git a/app/protocol_filter.node.ts b/app/protocol_filter.node.ts
+index 483d1c4e4..66609d9e9 100644
+--- a/app/protocol_filter.node.ts
++++ b/app/protocol_filter.node.ts
+@@ -62,6 +62,7 @@ function _createFileHandler({
    const allowedRoots = [
      userDataPath,
      installPath,
@@ -46,10 +46,10 @@ index 68dceea..4b35bb1 100644
      getBadgesPath(userDataPath),
      getDraftPath(userDataPath),
 diff --git a/package.json b/package.json
-index 5755fec..86125ba 100644
+index 31399e645..05fc46b8b 100644
 --- a/package.json
 +++ b/package.json
-@@ -154,7 +154,6 @@
+@@ -156,7 +156,6 @@
      "dashdash": "2.0.0",
      "direction": "1.0.4",
      "emoji-datasource": "16.0.0",
@@ -57,18 +57,11 @@ index 5755fec..86125ba 100644
      "emoji-regex": "10.4.0",
      "encoding": "0.1.13",
      "fabric": "4.6.0",
-@@ -649,4 +648,4 @@
-       "sticker-creator/dist/**"
-     ]
-   }
--}
-+}
-\ No newline at end of file
-diff --git i/pnpm-lock.yaml w/pnpm-lock.yaml
-index b162101a8..82ee9d67e 100644
---- i/pnpm-lock.yaml
-+++ w/pnpm-lock.yaml
-@@ -197,9 +197,6 @@ importers:
+diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
+index 223557f67..2250b619d 100644
+--- a/pnpm-lock.yaml
++++ b/pnpm-lock.yaml
+@@ -200,9 +200,6 @@ importers:
        emoji-datasource:
          specifier: 16.0.0
          version: 16.0.0
@@ -78,32 +71,32 @@ index b162101a8..82ee9d67e 100644
        emoji-regex:
          specifier: 10.4.0
          version: 10.4.0
-@@ -5814,9 +5811,6 @@ packages:
+@@ -5835,9 +5832,6 @@ packages:
      resolution: {integrity: sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==}
      engines: {node: '>=12'}
-
+ 
 -  emoji-datasource-apple@16.0.0:
 -    resolution: {integrity: sha512-dVYjsK0FnCry9F+PBtnivhG2K0xdwlmqYaSgiUtztUdAGPYiHYhZcVKvNBqC791g2qyEcFNTBO6utg4eQ3uLTw==}
 -
    emoji-datasource@16.0.0:
      resolution: {integrity: sha512-/qHKqK5Nr3+8zhgO6kHmF43Fm5C8HNn0AaFRIpgw8HF3+uF0Vfc8jgLI1ZQS5ba1vBzksS8NBCjHejwLb2D/Sg==}
-
-@@ -17037,8 +17031,6 @@ snapshots:
-
+ 
+@@ -17062,8 +17056,6 @@ snapshots:
+ 
    emittery@0.13.1: {}
-
+ 
 -  emoji-datasource-apple@16.0.0: {}
 -
    emoji-datasource@16.0.0: {}
-
+ 
    emoji-regex@10.4.0: {}
 diff --git a/stylesheets/components/fun/FunEmoji.scss b/stylesheets/components/fun/FunEmoji.scss
-index ea029fd5b..0e3563b4f 100644
---- i/stylesheets/components/fun/FunEmoji.scss
-+++ w/stylesheets/components/fun/FunEmoji.scss
+index 1cc4bb43c..a6444101a 100644
+--- a/stylesheets/components/fun/FunEmoji.scss
++++ b/stylesheets/components/fun/FunEmoji.scss
 @@ -5,19 +5,9 @@
  $emoji-sprite-sheet-grid-item-count: 62;
-
+ 
  @mixin emoji-sprite($sheet, $margin, $scale) {
 -  $size: calc($sheet * 1px * $scale);
 -  $margin-start: calc($margin * $scale);
@@ -123,11 +116,11 @@ index ea029fd5b..0e3563b4f 100644
 +  background-position: center;
    background-repeat: no-repeat;
  }
-
-diff --git a/ts/components/fun/FunEmoji.tsx b/ts/components/fun/FunEmoji.tsx
-index ddb30bf6d..5fc39339b 100644
---- a/ts/components/fun/FunEmoji.tsx
-+++ b/ts/components/fun/FunEmoji.tsx
+ 
+diff --git a/ts/components/fun/FunEmoji.dom.tsx b/ts/components/fun/FunEmoji.dom.tsx
+index ea031e9a8..3d760a43e 100644
+--- a/ts/components/fun/FunEmoji.dom.tsx
++++ b/ts/components/fun/FunEmoji.dom.tsx
 @@ -20,13 +20,14 @@ function getEmojiJumboBackground(
    emoji: EmojiVariantData,
    size: number | undefined
diff --git a/pkgs/by-name/si/signal-desktop/ringrtc.nix b/pkgs/by-name/si/signal-desktop/ringrtc.nix
index bd81befd9330..f6837ba9747e 100644
--- a/pkgs/by-name/si/signal-desktop/ringrtc.nix
+++ b/pkgs/by-name/si/signal-desktop/ringrtc.nix
@@ -19,16 +19,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ringrtc";
-  version = "2.59.0";
+  version = "2.59.2";
 
   src = fetchFromGitHub {
     owner = "signalapp";
     repo = "ringrtc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-zgDXkkKJrcD357DxbPq/sL/c4AG8xyMPY5IpcBtvATY=";
+    hash = "sha256-PpfGjeBSYus4yo6eC1PjRaGRhOOKAg2EgDw3AMEwR1I=";
   };
 
-  cargoHash = "sha256-uwMNJ+PQa/Q7XZ9QONo+vm2wMqGwOEB97Kl/RFQkdhU=";
+  cargoHash = "sha256-ex0/RA5wwSId6Pgi9y62KG42vBs3DxWcGso6Qk9iRlU=";
 
   preConfigure = ''
     # Check for matching webrtc version

From a04b6c7acd0e2de7fec927e469b68043a8ff3ff5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 22:31:29 +0000
Subject: [PATCH 4251/6226] unciv: 4.18.10 -> 4.18.11

---
 pkgs/by-name/un/unciv/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix
index da6aec474562..b8eaa299e3bb 100644
--- a/pkgs/by-name/un/unciv/package.nix
+++ b/pkgs/by-name/un/unciv/package.nix
@@ -12,7 +12,7 @@
   nix-update-script,
 }:
 let
-  version = "4.18.10";
+  version = "4.18.11";
 
   desktopItem = makeDesktopItem {
     name = "unciv";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
-    hash = "sha256-8gp4h+fKK+gmwL8OnmfKb5pmO4mehClu8FeQe2KJiDk=";
+    hash = "sha256-k6jIvJvEfLgcYexpzjg7GFGGw9HhFGnhdShEX6zUxiQ=";
   };
 
   dontUnpack = true;

From c2623e72340e21d1b3c89d71a6c499e66b728a37 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Thu, 30 Oct 2025 23:44:54 +0100
Subject: [PATCH 4252/6226] SDL_compat: 1.2.68 -> 1.2.70

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/sd/SDL_compat/package.nix | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/sd/SDL_compat/package.nix b/pkgs/by-name/sd/SDL_compat/package.nix
index e61692af5306..737170945a9f 100644
--- a/pkgs/by-name/sd/SDL_compat/package.nix
+++ b/pkgs/by-name/sd/SDL_compat/package.nix
@@ -27,13 +27,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "SDL_compat";
-  version = "1.2.68";
+  version = "1.2.70";
 
   src = fetchFromGitHub {
     owner = "libsdl-org";
     repo = "sdl12-compat";
     rev = "release-" + finalAttrs.version;
-    hash = "sha256-f2dl3L7/qoYNl4sjik1npcW/W09zsEumiV9jHuKnUmM=";
+    hash = "sha256-vmbkeBpuzgq1B/6rp9/Gy8+Y7aF5uz8lC/mK0uA9v7I=";
   };
 
   nativeBuildInputs = [
@@ -56,11 +56,6 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals openglSupport [ libGLU ];
 
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace-fail 'set(CMAKE_SKIP_RPATH TRUE)' 'set(CMAKE_SKIP_RPATH FALSE)'
-  '';
-
   dontPatchELF = true; # don't strip rpath
 
   cmakeFlags =
@@ -79,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: {
   doCheck = !stdenv.hostPlatform.isDarwin;
   checkPhase = ''
     runHook preCheck
-    ./testver
+    ./test/testver
     runHook postCheck
   '';
 

From b7665da7e103dfe6533509ca7acb9b65bd4c7e2f Mon Sep 17 00:00:00 2001
From: Jade Lovelace <jadel@mercury.com>
Date: Wed, 4 Jun 2025 12:42:13 -0700
Subject: [PATCH 4253/6226] dockerTools: support `meta` attribute

I want to be able to set descriptions on my docker image derivations
since these can be ingested by various tooling for helpfulness.
---
 doc/build-helpers/images/dockertools.section.md |  8 ++++++++
 pkgs/build-support/docker/default.nix           | 14 +++++++++++++-
 pkgs/build-support/docker/examples.nix          |  8 ++++++++
 3 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/doc/build-helpers/images/dockertools.section.md b/doc/build-helpers/images/dockertools.section.md
index f0d240098c41..f0b561d480e5 100644
--- a/doc/build-helpers/images/dockertools.section.md
+++ b/doc/build-helpers/images/dockertools.section.md
@@ -202,6 +202,10 @@ Similarly, if you encounter errors similar to `Error_Protocol ("certificate has
 
   _Default value:_ `false`.
 
+`meta` (Attribute Set)
+
+: The `meta` attribute of the resulting derivation, as in `stdenv.mkDerivation`. Accepts `description`, `maintainers` and any other `meta` attributes.
+
 `contents` **DEPRECATED**
 
 : This attribute is deprecated, and users are encouraged to use `copyToRoot` instead.
@@ -635,6 +639,10 @@ This allows the function to produce reproducible images.
 
   _Default value:_ `false`.
 
+`meta` (Attribute Set)
+
+: The `meta` attribute of the resulting derivation, as in `stdenv.mkDerivation`. Accepts `description`, `maintainers` and any other `meta` attributes.
+
 `passthru` (Attribute Set; _optional_)
 
 : Use this to pass any attributes as [`passthru`](#chap-passthru) for the resulting derivation.
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix
index 9cd3aa0a7c18..886019af54f7 100644
--- a/pkgs/build-support/docker/default.nix
+++ b/pkgs/build-support/docker/default.nix
@@ -579,10 +579,16 @@ rec {
     {
       name,
       compressor ? "gz",
+      meta ? { },
       ...
     }@args:
     let
-      stream = streamLayeredImage (removeAttrs args [ "compressor" ]);
+      stream = streamLayeredImage (
+        removeAttrs args [
+          "compressor"
+          "meta"
+        ]
+      );
       compress = compressorForImage compressor name;
     in
     runCommand "${baseNameOf name}.tar${compress.ext}" {
@@ -592,6 +598,7 @@ rec {
         inherit stream;
       };
       nativeBuildInputs = compress.nativeInputs;
+      inherit meta;
     } "${stream} | ${compress.compress} > $out"
   );
 
@@ -641,6 +648,8 @@ rec {
       includeNixDB ? false,
       # Deprecated.
       contents ? null,
+      # Meta options to set on the resulting derivation.
+      meta ? { },
     }:
 
     let
@@ -735,6 +744,7 @@ rec {
                 lib.head (
                   lib.strings.splitString "-" (baseNameOf (builtins.unsafeDiscardStringContext result.outPath))
                 );
+            inherit meta;
           }
           ''
             ${lib.optionalString (tag == null) ''
@@ -1008,6 +1018,7 @@ rec {
       includeStorePaths ? true,
       includeNixDB ? false,
       passthru ? { },
+      meta ? { },
       # Pipeline used to produce docker layers. If not set, popularity contest
       # algorithm is used. If set, maxLayers is ignored as the author of the
       # pipeline can use one of the available functions (like "limit_layers")
@@ -1233,6 +1244,7 @@ rec {
               isExe = true;
             };
             nativeBuildInputs = [ makeWrapper ];
+            inherit meta;
           }
           ''
             makeWrapper $streamScript $out --add-flags $conf
diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix
index b904f188a4af..3293821f1dd5 100644
--- a/pkgs/build-support/docker/examples.nix
+++ b/pkgs/build-support/docker/examples.nix
@@ -77,6 +77,8 @@ let
           "${nginxPort}/tcp" = { };
         };
       };
+
+      meta.description = "Basic nginx docker image example";
     };
 
 in
@@ -91,6 +93,8 @@ rec {
       paths = [ pkgs.bashInteractive ];
       pathsToLink = [ "/bin" ];
     };
+
+    meta.description = "Basic example image";
   };
 
   # 2. service example, layered on another image
@@ -138,6 +142,8 @@ rec {
         Retries = 3;
       };
     };
+
+    meta.description = "Service example, layered on another image";
   };
 
   # 3. another service example
@@ -204,6 +210,8 @@ rec {
         "USER=nobody"
       ];
     };
+
+    meta.description = "nix example to play with the container nix store";
   };
 
   # 7. example of adding something on top of an image pull by our

From 84a11ebe4220d8d575b9fd634c9b8d3f65778ced Mon Sep 17 00:00:00 2001
From: Aryeh Hillman <aryeh@aryeh.fun>
Date: Thu, 30 Oct 2025 15:54:32 -0700
Subject: [PATCH 4254/6226] Update instructions for Nix remote builder
 connection

Clarify instructions for connecting to the default remote builder and add information on SSH access.
---
 doc/packages/darwin-builder.section.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/doc/packages/darwin-builder.section.md b/doc/packages/darwin-builder.section.md
index fb71a78d6eb3..da46e0ee8f7d 100644
--- a/doc/packages/darwin-builder.section.md
+++ b/doc/packages/darwin-builder.section.md
@@ -64,13 +64,15 @@ builders = ssh-ng://builder@linux-builder ${ARCH}-linux /etc/nix/builder_ed25519
 builders-use-substitutes = true
 ```
 
-To allow Nix to connect to a remote builder not running on port 22, you will also need to create a new file at `/etc/ssh/ssh_config.d/100-linux-builder.conf`:
+To allow Nix to connect to the default remote builder, which does not run on port 22, you will also need to create a new file at `/etc/ssh/ssh_config.d/100-linux-builder.conf`:
 
 ```
 Host linux-builder
   Hostname localhost
   HostKeyAlias linux-builder
   Port 31022
+  User builder
+  IdentityFile /etc/nix/builder_ed25519
 ```
 
 … and then restart your Nix daemon to apply the change:
@@ -79,6 +81,8 @@ Host linux-builder
 $ sudo launchctl kickstart -k system/org.nixos.nix-daemon
 ```
 
+Note that if the builder is running and you have created the above ssh conf file, you can ssh into the builder with `sudo ssh builder@linux-builder`.
+
 ## Example flake usage {#sec-darwin-builder-example-flake}
 
 ```nix

From 3df33b38cb041ebe4a152ebbef8d84eecdb1f9dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 23:00:46 +0000
Subject: [PATCH 4255/6226] ubports-pdk: 0-unstable-2025-06-23 ->
 0-unstable-2025-10-29

---
 pkgs/by-name/ub/ubports-pdk/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ub/ubports-pdk/package.nix b/pkgs/by-name/ub/ubports-pdk/package.nix
index a22e26a14fe6..838d63264de8 100644
--- a/pkgs/by-name/ub/ubports-pdk/package.nix
+++ b/pkgs/by-name/ub/ubports-pdk/package.nix
@@ -15,13 +15,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "ubports-pdk";
-  version = "0-unstable-2025-06-23";
+  version = "0-unstable-2025-10-29";
 
   src = fetchFromGitHub {
     owner = "ubports";
     repo = "ubports-pdk";
-    rev = "f97daec1a96f9427b23e35c8cc12e7c21fe893fd";
-    hash = "sha256-s9GC5TiIQSn5JGRy3TU5COdbcW9cDZZ8eQpflSffyOw=";
+    rev = "10d9e3c09fedefd990c13f7202accef30e59e7ab";
+    hash = "sha256-Vb82029iDzHKLgAjUINJHYZRzTWKoJ5+XhcHm4z0k1Y=";
   };
 
   strictDeps = true;

From bca8c52d62c7a9d3ca629c0bc3ac4392616265e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 23:12:59 +0000
Subject: [PATCH 4256/6226] sentry-native: 0.11.3 -> 0.12.0

---
 pkgs/by-name/se/sentry-native/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix
index aa009698916a..09c04b2381d3 100644
--- a/pkgs/by-name/se/sentry-native/package.nix
+++ b/pkgs/by-name/se/sentry-native/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sentry-native";
-  version = "0.11.3";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-native";
     tag = version;
-    hash = "sha256-I+vWQWxFpvLnfW7S3YufjM0CD8YgaLy/FL6xGndiXwE=";
+    hash = "sha256-f9G2sCh49ChFcLaDALpfgrOwHh2mxMaUEQTeYffjXks=";
   };
 
   nativeBuildInputs = [

From 6a8bfd27fbed9f37a21a1eedc1be5c9140914538 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 23:15:53 +0000
Subject: [PATCH 4257/6226] qwen-code: 0.1.0 -> 0.1.1

---
 pkgs/by-name/qw/qwen-code/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/qw/qwen-code/package.nix b/pkgs/by-name/qw/qwen-code/package.nix
index cf265c7999b5..78273cb98b48 100644
--- a/pkgs/by-name/qw/qwen-code/package.nix
+++ b/pkgs/by-name/qw/qwen-code/package.nix
@@ -13,16 +13,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "qwen-code";
-  version = "0.1.0";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "QwenLM";
     repo = "qwen-code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5XC4Pwf+vuK1T3/bPptUejg8v9wj3izF80Mt+iqVr9Y=";
+    hash = "sha256-AciiXcSbRWZJ8+79h8Np2DphzUvxoJ1krsXw4rZxv/E=";
   };
 
-  npmDepsHash = "sha256-Psj/5SDWBnsRJVJnJwXGUgVbqUnjoH6HpAqqFruHkYw=";
+  npmDepsHash = "sha256-MKpfLzmWIATAPEf8USr2ZJR8ZGTWKkdlXuA4ByYW/jg=";
 
   nativeBuildInputs = [
     jq

From 2d79346d5fd9dd324b40bcaf114ba4747d8a47d5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 23:21:44 +0000
Subject: [PATCH 4258/6226] openapi-python-client: 0.26.2 -> 0.27.0

---
 pkgs/by-name/op/openapi-python-client/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openapi-python-client/package.nix b/pkgs/by-name/op/openapi-python-client/package.nix
index 9392b5ad3bf2..fc1e89340071 100644
--- a/pkgs/by-name/op/openapi-python-client/package.nix
+++ b/pkgs/by-name/op/openapi-python-client/package.nix
@@ -11,7 +11,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "openapi-python-client";
-  version = "0.26.2";
+  version = "0.27.0";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
     owner = "openapi-generators";
     repo = "openapi-python-client";
     tag = "v${version}";
-    hash = "sha256-RSz8UCOJBcF4zRYURRqzJahfkX49hBq7/yiTWE3es3M=";
+    hash = "sha256-fQm6BlBqCztV3lqXTHwXece80TYJZ1bGoIJwGye3F2I=";
   };
 
   nativeBuildInputs = [

From 3f52b63305547e14985825ba4a6b52a36e9cc721 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 23:30:18 +0000
Subject: [PATCH 4259/6226] boinc: 8.2.5 -> 8.2.6

---
 pkgs/by-name/bo/boinc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bo/boinc/package.nix b/pkgs/by-name/bo/boinc/package.nix
index 9b88c6d4ab60..fb98264a223e 100644
--- a/pkgs/by-name/bo/boinc/package.nix
+++ b/pkgs/by-name/bo/boinc/package.nix
@@ -28,14 +28,14 @@
 
 stdenv.mkDerivation rec {
   pname = "boinc";
-  version = "8.2.5";
+  version = "8.2.6";
 
   src = fetchFromGitHub {
     name = "${pname}-${version}-src";
     owner = "BOINC";
     repo = "boinc";
     rev = "client_release/${lib.versions.majorMinor version}/${version}";
-    hash = "sha256-e5XkGAnMvqG/rRc9Vpw9QNPbpkTwcJ//DDuBqfrSRhE=";
+    hash = "sha256-ci5KwQgeWVSvq04S3cEpeMmFz/qXUxqO2pcZZw17BUU=";
   };
 
   nativeBuildInputs = [

From 724cc6bc7f0f31b106b4504d44fd3a8bfd553fe3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 30 Oct 2025 23:41:51 +0000
Subject: [PATCH 4260/6226] mkbrr: 1.17.0 -> 1.18.0

---
 pkgs/by-name/mk/mkbrr/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mk/mkbrr/package.nix b/pkgs/by-name/mk/mkbrr/package.nix
index d2b5528b1c03..2a5dc3e86229 100644
--- a/pkgs/by-name/mk/mkbrr/package.nix
+++ b/pkgs/by-name/mk/mkbrr/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "mkbrr";
-  version = "1.17.0";
+  version = "1.18.0";
 
   src = fetchFromGitHub {
     owner = "autobrr";
     repo = "mkbrr";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LVSavGep3/mfDoDkj4uJ8WUTkhdeq+VEi2w7qr44DQg=";
+    hash = "sha256-WeBqMqxxb49tmlWVfL4EUBerNBgUspHZ0Ava1AVqmsY=";
   };
 
   vendorHash = "sha256-mbcbACOKMohBw0SH5gH06CTkHtJk3WmbAqpcO0qMFOs=";

From bc4592d8483f4c968f21f5a8975818dfcae3b262 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@users.noreply.github.com>
Date: Thu, 30 Oct 2025 17:08:44 -0700
Subject: [PATCH 4261/6226] terraform-providers.integrations_github: 6.7.1 ->
 6.7.3

---
 .../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 3cbee60d213d..1abdfe8a7027 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -741,11 +741,11 @@
     "vendorHash": null
   },
   "integrations_github": {
-    "hash": "sha256-FVDx8KH7foy1rZigDVEWMEalQ9nJnLkRjkJsFi0aEuM=",
+    "hash": "sha256-EjCL6RcTw+2uhfwgyiFRfsXYkkDHZqlSSzEcb4CRvIo=",
     "homepage": "https://registry.terraform.io/providers/integrations/github",
     "owner": "integrations",
     "repo": "terraform-provider-github",
-    "rev": "v6.7.1",
+    "rev": "v6.7.3",
     "spdx": "MIT",
     "vendorHash": null
   },

From df2220456d1a7e8b2c9105854e7fd09f76c6527d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 00:10:47 +0000
Subject: [PATCH 4262/6226] cargo-dist: 0.30.0 -> 0.30.1

---
 pkgs/by-name/ca/cargo-dist/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-dist/package.nix b/pkgs/by-name/ca/cargo-dist/package.nix
index a536a53db570..3ef98571917c 100644
--- a/pkgs/by-name/ca/cargo-dist/package.nix
+++ b/pkgs/by-name/ca/cargo-dist/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-dist";
-  version = "0.30.0";
+  version = "0.30.1";
 
   src = fetchFromGitHub {
     owner = "axodotdev";
     repo = "cargo-dist";
     rev = "v${version}";
-    hash = "sha256-+Nzli2SDzG+CBNSZ5z2mAuucS2a3WS7HqtUJs2JxIbo=";
+    hash = "sha256-kYmrV8GdtACtWPB3DckCriMqKeCn0Kz7HBDvXd9kr40=";
   };
 
-  cargoHash = "sha256-QjWBuI3hZkDNqyCNfFpz6qvZUYHEKRQZ4gbZGxkMaiw=";
+  cargoHash = "sha256-SShnaCaaB/mgQn8PtttXtvUjdPfrYRopvjl0uGJbvzE=";
 
   nativeBuildInputs = [
     pkg-config

From 3bf188ab7575c46577c898d7855b522de85e84cf Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@users.noreply.github.com>
Date: Thu, 30 Oct 2025 17:10:51 -0700
Subject: [PATCH 4263/6226] terraform-providers.tailscale_tailscale: 0.23.0 ->
 0.24.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 3cbee60d213d..8f5834f68e04 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1282,13 +1282,13 @@
     "vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50="
   },
   "tailscale_tailscale": {
-    "hash": "sha256-hkqlstHLHBERVenwyVUew+b26liFQpRh99vIMI0TCBY=",
+    "hash": "sha256-EiaQKO4Pg+89Mc8nwSarKhHBtr+yEKWEyZ4i0LeOfu4=",
     "homepage": "https://registry.terraform.io/providers/tailscale/tailscale",
     "owner": "tailscale",
     "repo": "terraform-provider-tailscale",
-    "rev": "v0.23.0",
+    "rev": "v0.24.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-9VyRFLpwF/+5iidLdzilztAdv/YaujUKoRwIyLgiV6o="
+    "vendorHash": "sha256-GhXplzkv0ouWSo4fNs7C0h87sFguhre6ez4d0Pgd/5w="
   },
   "telmate_proxmox": {
     "hash": "sha256-1aKKlOIk1mH4yx66eD635d1IaUWXIiBGHEt4A2F2mGM=",

From 01568236fe74a9093ada2d3c9aa65f4dc5e65943 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 00:30:59 +0000
Subject: [PATCH 4264/6226] eksctl: 0.215.0 -> 0.216.0

---
 pkgs/by-name/ek/eksctl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix
index cd9d92407cd8..42b6c34c761c 100644
--- a/pkgs/by-name/ek/eksctl/package.nix
+++ b/pkgs/by-name/ek/eksctl/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "eksctl";
-  version = "0.215.0";
+  version = "0.216.0";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = "eksctl";
     rev = version;
-    hash = "sha256-4voPrM5HNEcM0Xa5rVt18pgTSFcgPii3MZo1+QZ9PwE=";
+    hash = "sha256-uHwBzX/85B2oKmB0N4+uNxYzeAJpKSJamgu9M7bB3fg=";
   };
 
-  vendorHash = "sha256-+fAmY932lvD/4Jiq7vd2N/rcKw5Q2pkPnQFD1P2mU8w=";
+  vendorHash = "sha256-pELsbEy+VUkGXywJQpPNGL2o00BoO9OPnrS148gMRFA=";
 
   doCheck = false;
 

From 1bbfe03a763998a824c0aafabd28886d805daada Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 00:31:13 +0000
Subject: [PATCH 4265/6226] mattermostLatest: 11.0.2 -> 11.0.4

---
 pkgs/by-name/ma/mattermostLatest/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix
index 47305a7125eb..028180f792b4 100644
--- a/pkgs/by-name/ma/mattermostLatest/package.nix
+++ b/pkgs/by-name/ma/mattermostLatest/package.nix
@@ -11,9 +11,9 @@ mattermost.override {
     # and make sure the version regex is up to date here.
     # Ensure you also check ../mattermost/package.nix for ESR releases.
     regex = "^v(11\\.[0-9]+\\.[0-9]+)$";
-    version = "11.0.2";
-    srcHash = "sha256-2w9v/ktmqSwzcylq8ayRDZD5BsHo9tBL+9X3GRNlvd0=";
-    vendorHash = "sha256-JkQvj92q5FZjQWB5gGCsAz7EpHO+IckBSFoFEFi3v0A=";
+    version = "11.0.4";
+    srcHash = "sha256-odBY/TVvED7h7+u+5nSRng4rRnjt1eee7fUWjxqnAJ4=";
+    vendorHash = "sha256-QlBq8YlphD2YuOrdnhW8g5XXeMkESVDRvKg6i5MGA0k=";
     npmDepsHash = "sha256-YU6FDsMX0QIGFatUDRos/AkgwljIBeI5w/TJt/lglw0=";
     lockfileOverlay = ''
       unlock(.; "@floating-ui/react"; "channels/node_modules/@floating-ui/react")

From 163c6858a9884338ebb58dec95f89c47624c9a8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 00:31:39 +0000
Subject: [PATCH 4266/6226] mpi: 5.0.8 -> 5.0.9

---
 pkgs/by-name/op/openmpi/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openmpi/package.nix b/pkgs/by-name/op/openmpi/package.nix
index 1ce33581b090..df150d6eb66d 100644
--- a/pkgs/by-name/op/openmpi/package.nix
+++ b/pkgs/by-name/op/openmpi/package.nix
@@ -40,11 +40,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openmpi";
-  version = "5.0.8";
+  version = "5.0.9";
 
   src = fetchurl {
     url = "https://www.open-mpi.org/software/ompi/v${lib.versions.majorMinor finalAttrs.version}/downloads/openmpi-${finalAttrs.version}.tar.bz2";
-    sha256 = "sha256-UxMeGlfnJw9kVwf4sLZbpWBI9bWsP2j6q+0+sNcQ5Ek=";
+    sha256 = "sha256-37cnYlMRcIR68+Sg8h1317I8829nznzpAzZZJzZ32As=";
   };
 
   postPatch = ''

From c824faba86a8b1d46cce0d27a156397f0c4eb9aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 00:31:49 +0000
Subject: [PATCH 4267/6226] vscode-extensions.jeff-hykin.better-nix-syntax:
 2.2.3 -> 2.3.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index a4bc315f6f86..8c508700e94d 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2476,8 +2476,8 @@ let
         mktplcRef = {
           publisher = "jeff-hykin";
           name = "better-nix-syntax";
-          version = "2.2.3";
-          hash = "sha256-KhmkCMBWagi0JjZvupgaU7LA6hsGRE6SiHqdJlXyyX8=";
+          version = "2.3.0";
+          hash = "sha256-Zb4RFs2qkSMeQKkNXk4brrZBDiRK4e08taOOgdRWQEk=";
         };
         meta = {
           description = "Visual Studio Code extension providing Nix Syntax highlighting";

From 5b443ab417db1c6b5691d53c60da0f1d096d3bbc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 01:12:56 +0000
Subject: [PATCH 4268/6226] google-chrome: 141.0.7390.122 -> 142.0.7444.59

---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index e9d941a6a651..c298509da46c 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -170,11 +170,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "141.0.7390.122";
+    version = "142.0.7444.59";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-svzUxJiw5ldHwl413QV+9Egixes8D7tEmqFU+k94mlA=";
+      hash = "sha256-j7WXeRIyuqwvwWGtds4g20kKM+wWkj0R7O/nw6kdsPo=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -272,11 +272,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "141.0.7390.123";
+    version = "142.0.7444.60";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/adavkzngpjaayzmntr45fwn25nyq_141.0.7390.123/GoogleChrome-141.0.7390.123.dmg";
-      hash = "sha256-06sXHnSG2x8+OSbgXcPsErgdmjypIlbylrb61Du6j7U=";
+      url = "http://dl.google.com/release2/chrome/pgkesp3xybyklm4wlxch42zlny_142.0.7444.60/GoogleChrome-142.0.7444.60.dmg";
+      hash = "sha256-OhtURSA1rH6j7Bxp0Mg3kGREd44lwVbqH2gEnG8wrFg=";
     };
 
     dontPatch = true;

From 6e08682e02bc33268ab25946cca83c737e2f2734 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 02:33:34 +0000
Subject: [PATCH 4269/6226] lcevcdec: 4.0.2 -> 4.0.3

---
 pkgs/by-name/lc/lcevcdec/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lc/lcevcdec/package.nix b/pkgs/by-name/lc/lcevcdec/package.nix
index 0a9c77633acf..b957997e4563 100644
--- a/pkgs/by-name/lc/lcevcdec/package.nix
+++ b/pkgs/by-name/lc/lcevcdec/package.nix
@@ -14,7 +14,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lcevcdec";
-  version = "4.0.2";
+  version = "4.0.3";
 
   outputs = [
     "out"
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "v-novaltd";
     repo = "LCEVCdec";
     tag = finalAttrs.version;
-    hash = "sha256-NbaU543M+xCF5OmMKwE6jK0F5USlpp/Jaw6g3qz+iN4=";
+    hash = "sha256-UGOKl4fr+zOlzRm75BcL1+jIU5+A0d6GHXE1cOHsPP8=";
   };
 
   postPatch = ''

From dd73cc810b72cb0c031538596d9c67bc580dfe20 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 03:27:14 +0000
Subject: [PATCH 4270/6226] renovate: 41.149.2 -> 41.166.0

---
 pkgs/by-name/re/renovate/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/renovate/package.nix b/pkgs/by-name/re/renovate/package.nix
index f92687dd7227..c9d79e5e2280 100644
--- a/pkgs/by-name/re/renovate/package.nix
+++ b/pkgs/by-name/re/renovate/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "renovate";
-  version = "41.149.2";
+  version = "41.166.0";
 
   src = fetchFromGitHub {
     owner = "renovatebot";
     repo = "renovate";
     tag = finalAttrs.version;
-    hash = "sha256-mYBOcVUH6LvSBmPrUu+JxAu70qFYjGaYuuSh5iiXp0I=";
+    hash = "sha256-nwGV9Ut0WhrBw/n+BaKFrYMNCCu+HuWJ5Fj3W28/yf4=";
   };
 
   postPatch = ''
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-ouqy34xMhHvNilEPjmcFfpFRvrFrM3IBBT5nNvyW1r8=";
+    hash = "sha256-nsr3TEbOdCrI1czWYQhjLSl/S+9ZgcezNKWppjleRBk=";
   };
 
   env.COREPACK_ENABLE_STRICT = 0;

From 61d98ccbeda09d820473e53d5fe09f279472c9c2 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 31 Oct 2025 03:32:56 +0000
Subject: [PATCH 4271/6226] models-dev: 0-unstable-2025-10-28 ->
 0-unstable-2025-10-30

---
 pkgs/by-name/mo/models-dev/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index bb1aca4119e2..edcb0195cebd 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -8,12 +8,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "models-dev";
-  version = "0-unstable-2025-10-28";
+  version = "0-unstable-2025-10-30";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "86138343a8c048caa813c17ac56fda39e92458bf";
-    hash = "sha256-VYR9Sp7AKQ6abJg1Dyhr/GyYwGgE9XcuKHLW3an5/wY=";
+    rev = "b97ee9233088cb71668ee91a679d41b36ffae312";
+    hash = "sha256-uN9hCqzELCpOLRtNqp5M/80pHqo2zmdXXfnqVqdIAjY=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From 85bf97fbaec0b580622016d903122b440fb98b3c Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Thu, 30 Oct 2025 23:45:21 -0400
Subject: [PATCH 4272/6226] pbrt: 2018-08-15 -> 2023-09-03

---
 pkgs/by-name/pb/pbrt/package.nix | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/pb/pbrt/package.nix b/pkgs/by-name/pb/pbrt/package.nix
index cb9b8d6f0519..5004e17e56b1 100644
--- a/pkgs/by-name/pb/pbrt/package.nix
+++ b/pkgs/by-name/pb/pbrt/package.nix
@@ -9,20 +9,19 @@
 }:
 
 stdenv.mkDerivation {
-  version = "2018-08-15";
+  version = "2023-09-03";
   pname = "pbrt-v3";
 
   src = fetchFromGitHub {
-    rev = "86b5821308088deea70b207bc8c22219d0103d65";
+    rev = "13d871faae88233b327d04cda24022b8bb0093ee";
     owner = "mmp";
     repo = "pbrt-v3";
-    sha256 = "0f7ivsczba6zfk5f0bba1js6dcwf6w6jrkiby147qp1sx5k35cv8";
+    hash = "sha256-xg99l1o4MychQiOYkfsvD9vO0ysfmgQyaNaf8oqoWzk=";
     fetchSubmodules = true;
   };
 
-  patches = [
-    # https://github.com/mmp/pbrt-v3/issues/196
-    ./openexr-cmake-3.12.patch
+  cmakeFlags = [
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
   ];
 
   nativeBuildInputs = [
@@ -32,12 +31,12 @@ stdenv.mkDerivation {
   ];
   buildInputs = [ zlib ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://pbrt.org/";
     description = "Renderer described in the third edition of the book 'Physically Based Rendering: From Theory To Implementation'";
-    platforms = platforms.linux;
-    license = licenses.bsd2;
-    maintainers = [ maintainers.juliendehos ];
+    platforms = lib.platforms.linux;
+    license = lib.licenses.bsd2;
+    maintainers = [ lib.maintainers.juliendehos ];
     priority = 10;
   };
 }

From 9e36cdab2801f5d23d99b4ee0f7645d16db8e36e Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Oct 2025 22:32:20 -0500
Subject: [PATCH 4273/6226] vimPlugins: update on 2025-10-31

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../editors/vim/plugins/generated.nix         | 802 +++++++++---------
 .../editors/vim/plugins/overrides.nix         |   4 +-
 2 files changed, 404 insertions(+), 402 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index f046d7edbe55..6606a112481e 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -74,12 +74,12 @@ final: prev: {
 
   CopilotChat-nvim = buildVimPlugin {
     pname = "CopilotChat.nvim";
-    version = "2025-10-18";
+    version = "2025-10-24";
     src = fetchFromGitHub {
       owner = "CopilotC-Nvim";
       repo = "CopilotChat.nvim";
-      rev = "98435447243eb80a7c228b1447f14f3294d39739";
-      sha256 = "1dv8x5yh0hzshlybxnb786pcpcqsqn8adzmhlmqfx23d0326y2dw";
+      rev = "a7138a0ee04d8af42c262554eccee168bbf1454f";
+      sha256 = "115hnj4mkpqkyal3d1w3drs1jrxp4lhiz0bfqpak5n58j2ly8678";
     };
     meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/";
     meta.hydraPlatforms = [ ];
@@ -204,12 +204,12 @@ final: prev: {
 
   LazyVim = buildVimPlugin {
     pname = "LazyVim";
-    version = "2025-10-20";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "LazyVim";
       repo = "LazyVim";
-      rev = "e8a1d8b6286f82d75e5830de5ea93bd7622cec8c";
-      sha256 = "0kb5aasd3kaz67yc1arrbk9h5qs40lmbpi8pkd55h0d686nfrb0w";
+      rev = "064e61058b6bbaef02a6143662628d105695b8e5";
+      sha256 = "0lh0japff6lywy17kfa20aws9p81ig8g9fpzm6jxh6w0xhnhzzb1";
     };
     meta.homepage = "https://github.com/LazyVim/LazyVim/";
     meta.hydraPlatforms = [ ];
@@ -217,12 +217,12 @@ final: prev: {
 
   LeaderF = buildVimPlugin {
     pname = "LeaderF";
-    version = "2025-10-17";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "Yggdroot";
       repo = "LeaderF";
-      rev = "8614aeec5dae1739129c1207b88f749ba71f7f35";
-      sha256 = "1j9h013xsr4xyackm8x752hmcpdjvvhgcj91j2232c75l1bsyha7";
+      rev = "37ef81678d288d21272ada4cb85b2c0769bcd50b";
+      sha256 = "1q1p6v9xarr2viyscrmg04j57dd298piraqz4xr75rh1w50lry3x";
     };
     meta.homepage = "https://github.com/Yggdroot/LeaderF/";
     meta.hydraPlatforms = [ ];
@@ -412,12 +412,12 @@ final: prev: {
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "2025-10-20";
+    version = "2025-10-29";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "960a5cf992c033170499ccc7003df59734ed40a8";
-      sha256 = "0v9amvvi8vscbzl2shffhn8bh1jjwvxzlx6n3absc4sd2zcjzyjv";
+      rev = "3b0d7d781589ce98ce577202d25d07741ffcf479";
+      sha256 = "0zswfigqlic5rn9l3762x9383qhhwcx6bvswgs0ak8srlbd5zwng";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
     meta.hydraPlatforms = [ ];
@@ -778,12 +778,12 @@ final: prev: {
 
   ale = buildVimPlugin {
     pname = "ale";
-    version = "2025-09-06";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "dense-analysis";
       repo = "ale";
-      rev = "4217461c4859c4fac31ce3d2e22574218f244cf5";
-      sha256 = "044q1zgaz4r6s1b8v1d0k9ib50d81cm97byb10zaj3x0bq7r4f5m";
+      rev = "b9d7f56471084e7ac8070c90315170ef703217ff";
+      sha256 = "18ld6cai28xgf084ar77j1nm6ym50yk18365h1scfn4mg9vjbxqn";
     };
     meta.homepage = "https://github.com/dense-analysis/ale/";
     meta.hydraPlatforms = [ ];
@@ -817,12 +817,12 @@ final: prev: {
 
   alpha-nvim = buildVimPlugin {
     pname = "alpha-nvim";
-    version = "2025-07-09";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "goolord";
       repo = "alpha-nvim";
-      rev = "2b3cbcdd980cae1e022409289245053f62fb50f6";
-      sha256 = "1ngim3ia9qbv1sxkscryvbn8xkw95rna5iy724yxgnq5sqxxg1jc";
+      rev = "3979b01cb05734331c7873049001d3f2bb8477f4";
+      sha256 = "12l57r2hl62b5kj9m2qr8gixybmp3p8k40dnripji5i8hyjw39jv";
     };
     meta.homepage = "https://github.com/goolord/alpha-nvim/";
     meta.hydraPlatforms = [ ];
@@ -830,12 +830,12 @@ final: prev: {
 
   amp-nvim = buildVimPlugin {
     pname = "amp.nvim";
-    version = "2025-10-19";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "sourcegraph";
       repo = "amp.nvim";
-      rev = "f25e09cd3552fb74c29fcf86e9902ffce09f36d4";
-      sha256 = "0da7m3r6ficdpxfywrcw8k5iydxknfz4mcxvqr1ib4ns390561zx";
+      rev = "621f1ca375fc2887d30a4ac32a8b6c582d28f9c0";
+      sha256 = "09f3md3khk5ccvhf897ddp387qjkvwwz5d9wjvlafb06cdixlagz";
     };
     meta.homepage = "https://github.com/sourcegraph/amp.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1038,12 +1038,12 @@ final: prev: {
 
   asyncomplete-lsp-vim = buildVimPlugin {
     pname = "asyncomplete-lsp.vim";
-    version = "2025-10-09";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "prabirshrestha";
       repo = "asyncomplete-lsp.vim";
-      rev = "4b0cc02bef04f0f3ae196aacacc2156e0b842d29";
-      sha256 = "1hw2mv0wr9gw37g697sllznwbsqkdxackfvahywh172ph5bximai";
+      rev = "d5d91e1ad70edb00368c11d3e81008835ac14dd1";
+      sha256 = "0fp7vv5qh4mpg9plrzax3iy8jy6g815vpjlg83f0nqvcky8k3bk7";
     };
     meta.homepage = "https://github.com/prabirshrestha/asyncomplete-lsp.vim/";
     meta.hydraPlatforms = [ ];
@@ -1142,12 +1142,12 @@ final: prev: {
 
   augment-vim = buildVimPlugin {
     pname = "augment.vim";
-    version = "2025-10-02";
+    version = "2025-10-21";
     src = fetchFromGitHub {
       owner = "augmentcode";
       repo = "augment.vim";
-      rev = "3e357e385d59c1e641543f85e539c65021dc21b8";
-      sha256 = "0wsj5b3khfy2jwc276s4bjwpxs2vpc1hpaqqpdql2kj0dzqlfxv1";
+      rev = "96e8d6d16268e9fc2b0b1cc98ec754effa24690e";
+      sha256 = "0fkdyr8ak3j7jkccgcndzjkfxgx8mwjhb082lxw12sdaq9amgi6m";
     };
     meta.homepage = "https://github.com/augmentcode/augment.vim/";
     meta.hydraPlatforms = [ ];
@@ -1168,12 +1168,12 @@ final: prev: {
 
   auto-fix-return-nvim = buildVimPlugin {
     pname = "auto-fix-return.nvim";
-    version = "2025-08-12";
+    version = "2025-10-22";
     src = fetchFromGitHub {
       owner = "Jay-Madden";
       repo = "auto-fix-return.nvim";
-      rev = "b3b672ac05039ea7e1527e99064f4221166b0f84";
-      sha256 = "1sfpbzznfkisslr21h4lv99fgd6kz3d5r0kdhiranjrj5wviqm5h";
+      rev = "700458d7e5b87b9434a07701bbc64fe4de0df486";
+      sha256 = "0s6ggdjap21l0pjlxjgk8izg8w4y4dz6983bmy11c7h9zb0iihrw";
     };
     meta.homepage = "https://github.com/Jay-Madden/auto-fix-return.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1233,12 +1233,12 @@ final: prev: {
 
   auto-session = buildVimPlugin {
     pname = "auto-session";
-    version = "2025-10-07";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "rmagatti";
       repo = "auto-session";
-      rev = "517a75727d28a4d1ee9c79b56dde239a5408778f";
-      sha256 = "02zn9scv39hdl16k5qz35v33qvhxyql9cy8v7rzx1ajqxz9sxf5z";
+      rev = "292492ab7af4bd8b9e37e28508bc8ce995722fd5";
+      sha256 = "1bhnss104mn308ml5zhbpaw6cb0cn68bq8ws9g0268hr81frzx7p";
     };
     meta.homepage = "https://github.com/rmagatti/auto-session/";
     meta.hydraPlatforms = [ ];
@@ -1403,12 +1403,12 @@ final: prev: {
 
   barbar-nvim = buildVimPlugin {
     pname = "barbar.nvim";
-    version = "2025-08-12";
+    version = "2025-10-20";
     src = fetchFromGitHub {
       owner = "romgrk";
       repo = "barbar.nvim";
-      rev = "549ee11d97057eae207bafa2c23c315942cca097";
-      sha256 = "107d46s7d4ljvb4ra6m14z6zd64mbvpnzcwcnwxjsf68g4d6a4n6";
+      rev = "fb4369940a07dda35fa4d7f54cf4a36aa00440e6";
+      sha256 = "0pnryr8m5dj1h0ki11b2mzq9wkcd8lg0l0w4pkyrd51a3dfa6wv1";
     };
     meta.homepage = "https://github.com/romgrk/barbar.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1533,12 +1533,12 @@ final: prev: {
 
   blame-nvim = buildVimPlugin {
     pname = "blame.nvim";
-    version = "2025-09-24";
+    version = "2025-10-21";
     src = fetchFromGitHub {
       owner = "FabijanZulj";
       repo = "blame.nvim";
-      rev = "d5f4ad5c8ebca3caecc773dda5983709c5a5da8f";
-      sha256 = "0vgwdb1x5vjsfw5xznnw00w9h1rfcc5h1cv4crfq8dh000iqmzr0";
+      rev = "f3f6153ea94e1120f2776f22bbbd63c4aeebaf32";
+      sha256 = "05q4wwz9rm1ycjg536ys3jsdqlnndhpm8jm6vb4wqlza3gqgm3h9";
     };
     meta.homepage = "https://github.com/FabijanZulj/blame.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1598,12 +1598,12 @@ final: prev: {
 
   blink-cmp-dictionary = buildVimPlugin {
     pname = "blink-cmp-dictionary";
-    version = "2025-06-20";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "Kaiser-Yang";
       repo = "blink-cmp-dictionary";
-      rev = "43b701fe9728a704bc63e4667c5d8b398bf129b2";
-      sha256 = "0zf7q6n7hl3p83f9idrryd0mzcw78ljgdcv5ak09946nh9nqsc5k";
+      rev = "944b3b215b01303672d4213758db7c5c5a1e3c92";
+      sha256 = "10lgn0pz7ywip8yq35fsbf7h8y16jfv4hqzhy72djx2bz2wrrjvv";
     };
     meta.homepage = "https://github.com/Kaiser-Yang/blink-cmp-dictionary/";
     meta.hydraPlatforms = [ ];
@@ -1689,12 +1689,12 @@ final: prev: {
 
   blink-copilot = buildVimPlugin {
     pname = "blink-copilot";
-    version = "2025-09-30";
+    version = "2025-10-29";
     src = fetchFromGitHub {
       owner = "fang2hou";
       repo = "blink-copilot";
-      rev = "5d35fd07fcc148be20442da1bdd2407e03263d7d";
-      sha256 = "1686djbjrk3327d7varbzqwwfimz9irgpagl7yk8nnighfygz7mk";
+      rev = "7ad8209b2f880a2840c94cdcd80ab4dc511d4f39";
+      sha256 = "0m3d88z83akivsjj7p07dgqmacpkalij3kziagkb6rf5d59dnfvh";
     };
     meta.homepage = "https://github.com/fang2hou/blink-copilot/";
     meta.hydraPlatforms = [ ];
@@ -1702,12 +1702,12 @@ final: prev: {
 
   blink-emoji-nvim = buildVimPlugin {
     pname = "blink-emoji.nvim";
-    version = "2025-05-24";
+    version = "2025-10-22";
     src = fetchFromGitHub {
       owner = "moyiz";
       repo = "blink-emoji.nvim";
-      rev = "f22ce8cac02a6ece05368220f1e38bd34fe376f9";
-      sha256 = "1vnx779arsm4n1sjjwhraczp07am0i2n4m13jqv7ij01vd4c9wd4";
+      rev = "066013e4c98a9318408ee3f1ca2dbcb6fa3e4c06";
+      sha256 = "1hzzbx8sjjlwm0b2mdbi6wgkc87cf089pp2i3kycw7z0jsyk41wi";
     };
     meta.homepage = "https://github.com/moyiz/blink-emoji.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1728,12 +1728,12 @@ final: prev: {
 
   blink-ripgrep-nvim = buildVimPlugin {
     pname = "blink-ripgrep.nvim";
-    version = "2025-10-20";
+    version = "2025-10-29";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "blink-ripgrep.nvim";
-      rev = "166fe9ee93007ae87dd47f42dce6e14fbc46d41e";
-      sha256 = "04w3fv6k148fc8kpfyr5bj4f3b7z8r4pw4inw20jirls2ds9yvc3";
+      rev = "e6705fcfccc71636f93f7417296f6831303c30ac";
+      sha256 = "1qgr8ikhmg5x1wwhqianm8ijkk7ip1d16an1f3ljc0q8h2sr9pm6";
     };
     meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1949,12 +1949,12 @@ final: prev: {
 
   catppuccin-nvim = buildVimPlugin {
     pname = "catppuccin-nvim";
-    version = "2025-10-08";
+    version = "2025-10-25";
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "nvim";
-      rev = "af58927c55c9f3272c940ff02b3cee94a1249f26";
-      sha256 = "0gbaw3yqnxr75csl40rl3rc0ynsmvzc6jn78c07ksj0i510ib4n8";
+      rev = "8c4125e3c746976ba025dc5d908fa22c6aa09486";
+      sha256 = "0gfsia8p9si1wh3430rl5pklw48c0h3zmx6q5bkvm1ajidndfgrp";
     };
     meta.homepage = "https://github.com/catppuccin/nvim/";
     meta.hydraPlatforms = [ ];
@@ -2053,12 +2053,12 @@ final: prev: {
 
   checkmate-nvim = buildVimPlugin {
     pname = "checkmate.nvim";
-    version = "2025-10-20";
+    version = "2025-10-26";
     src = fetchFromGitHub {
       owner = "bngarren";
       repo = "checkmate.nvim";
-      rev = "4cc5de61f2527e8fef6884f366b3d3f29b32e0a1";
-      sha256 = "0p9zmjx6fa6bs7159y6hgh5mhnw0gz493bz1g5wjw7gy7ljrzi89";
+      rev = "ebc9cbc305865e7f4952cd938d83fd992206245f";
+      sha256 = "0q9gssx8237lvhfr1f4zzvgalv5abggwv24sqd6m65lji9kfs8jd";
     };
     meta.homepage = "https://github.com/bngarren/checkmate.nvim/";
     meta.hydraPlatforms = [ ];
@@ -2924,12 +2924,12 @@ final: prev: {
 
   cmp_yanky = buildVimPlugin {
     pname = "cmp_yanky";
-    version = "2025-09-08";
+    version = "2025-10-20";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "cmp_yanky";
-      rev = "9ed96f1d474c3bf7d445e943dc5d4a4277c19019";
-      sha256 = "0gfbdv29svr4bzk0c2psvq8ivss6y5qsd9nq6m1chvj6z9k25krl";
+      rev = "feea98d9b4d3ced314dc59b0f967ac2097c0b045";
+      sha256 = "087yan40lzzvkm2q3j7kxxh18x5hsg3v7mmn84xwvh07kq7kg6aj";
     };
     meta.homepage = "https://github.com/chrisgrieser/cmp_yanky/";
     meta.hydraPlatforms = [ ];
@@ -2937,12 +2937,12 @@ final: prev: {
 
   cobalt2-nvim = buildVimPlugin {
     pname = "cobalt2.nvim";
-    version = "2025-10-02";
+    version = "2025-09-06";
     src = fetchFromGitHub {
       owner = "lalitmee";
       repo = "cobalt2.nvim";
-      rev = "b3fe7d51c7d07157a183c7f9c6ad0b562f491aa3";
-      sha256 = "0kjdswy1n8z7cwybzl8lcc9nlnljv94gdjmfkh39jjh02yqw5f06";
+      rev = "0cc17f3491feba19ed62b2d9622577f7822a0113";
+      sha256 = "06mmdiissgwpwh298nhcn16sgf38w1aq0bcjh4jh0ksnmglmsqv2";
     };
     meta.homepage = "https://github.com/lalitmee/cobalt2.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3015,12 +3015,12 @@ final: prev: {
 
   coc-nvim = buildVimPlugin {
     pname = "coc.nvim";
-    version = "2025-10-16";
+    version = "2025-10-27";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "4fc88d4f70750e6896e0de317a231e49850bb374";
-      sha256 = "09x7skhcwzblb60x2magi6ckyah2pw0r99qipdkj7mz6cs5yspyy";
+      rev = "547b38eb42176194b326fdaa871685ec11d84c1d";
+      sha256 = "01ppa31ksfgwgx68xbm672xrzc7cihhvdjff1f31bb7cwy36q3v3";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3093,12 +3093,12 @@ final: prev: {
 
   codecompanion-nvim = buildVimPlugin {
     pname = "codecompanion.nvim";
-    version = "2025-10-20";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      rev = "9d49b758de4a3f2c4c2e8a0561e6d126e47dad85";
-      sha256 = "1nf3kszrllm480h2dp9rk3znanb56rf1ad07z12h69n20hf16qhb";
+      rev = "50ea30ec76e1a2695164991a7480f0fa0662e9db";
+      sha256 = "13dsgrwk6m9l35idcd5j6q0si6451yy66psr4wi97dzhw8lvfc41";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3418,12 +3418,12 @@ final: prev: {
 
   conform-nvim = buildVimPlugin {
     pname = "conform.nvim";
-    version = "2025-10-08";
+    version = "2025-10-22";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "conform.nvim";
-      rev = "fbcb4fa7f34bfea9be702ffff481a8e336ebf6ed";
-      sha256 = "0x1hi9na2d64r9vv6wm2azkdmhbvc5qpvwsp6akj21cvlvcnld7c";
+      rev = "9fd3d5e0b689ec1bf400c53cbbec72c6fdf24081";
+      sha256 = "1igspxqkqqv9f1fqh0sf6dlap1p8an8jl167a93v33c8ig2h6if9";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/conform.nvim/";
@@ -3432,12 +3432,12 @@ final: prev: {
 
   conjure = buildVimPlugin {
     pname = "conjure";
-    version = "2025-10-17";
+    version = "2025-10-24";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "conjure";
-      rev = "4e0601be2ecd0f59e294b3f3d53c19b9f9285645";
-      sha256 = "0244sbs4laqkw9d5pqgjsszlrxw1zybyffi3kkdm1cbva52x0qhz";
+      rev = "c5da84f291ec7d9f9f6e449c8aeb28b4c2d01562";
+      sha256 = "0cchd39g2hym8kmnrxqka84aj8cvhpv5x5syfysnirrkww8s6d9z";
     };
     meta.homepage = "https://github.com/Olical/conjure/";
     meta.hydraPlatforms = [ ];
@@ -3510,12 +3510,12 @@ final: prev: {
 
   copilot-lua = buildVimPlugin {
     pname = "copilot.lua";
-    version = "2025-10-17";
+    version = "2025-10-27";
     src = fetchFromGitHub {
       owner = "zbirenbaum";
       repo = "copilot.lua";
-      rev = "3123983d00ae6859f8bc987d14ebb524bb41b618";
-      sha256 = "0z9b7y7bda4vzxrv2z5rnvm17myv2fb59wz0b29dnhs130ackkic";
+      rev = "93adf9844dcbe09a37e7a72eaa286d33d38bf628";
+      sha256 = "1b741nmj241ixqc3rik0w1d8mdgqy1q73vr8pblqcz5937dr8j1a";
     };
     meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
     meta.hydraPlatforms = [ ];
@@ -3575,12 +3575,12 @@ final: prev: {
 
   coq-thirdparty = buildVimPlugin {
     pname = "coq.thirdparty";
-    version = "2025-01-18";
+    version = "2025-10-29";
     src = fetchFromGitHub {
       owner = "ms-jpq";
       repo = "coq.thirdparty";
-      rev = "6ee3c221c308dca7071387267ac76c9272b184a9";
-      sha256 = "1ckk38c9szyhdg3kn09hs3xpgnvywwq7fmyzkp2vsjcz87n7180r";
+      rev = "2bd969a2bcd2624f9c260b1000957c7e665e308e";
+      sha256 = "08k5dd2w0ix47gfdbhqrmdy27dgabvlfx7aysnkp55kl3c00rv4p";
     };
     meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/";
     meta.hydraPlatforms = [ ];
@@ -3614,12 +3614,12 @@ final: prev: {
 
   cornelis = buildVimPlugin {
     pname = "cornelis";
-    version = "2025-07-30";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "agda";
       repo = "cornelis";
-      rev = "37641138d8c65a00d417a0f3b9d041b6b5c1a9dc";
-      sha256 = "0kaadvmg86j2094q39f53kq5sdwdy22z6h5pd9b4l3hnz7k85gkq";
+      rev = "d18cb7c13c73f429a80536dc4c4f96eed2ffb51b";
+      sha256 = "1lz3jzdzklhjx50z38vwz8ihhy38vwcxazvm1rx50z3adpwiw5mh";
     };
     meta.homepage = "https://github.com/agda/cornelis/";
     meta.hydraPlatforms = [ ];
@@ -3796,12 +3796,12 @@ final: prev: {
 
   cutlass-nvim = buildVimPlugin {
     pname = "cutlass.nvim";
-    version = "2023-12-18";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "gbprod";
       repo = "cutlass.nvim";
-      rev = "1ac7e4b53d79410be52a9e464d44c60556282b3e";
-      sha256 = "0p00xjn6da7hj10vwnighsf1y0zmndfx9d2nb95whnq6awkbyr6f";
+      rev = "d01b5c1943050fcda8edf5c89d4419c41a65890e";
+      sha256 = "09hivhxpynvw1n8f2b2fzz7jq11vrm6dvyhj9qksikrgnabsiyh9";
     };
     meta.homepage = "https://github.com/gbprod/cutlass.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4186,12 +4186,12 @@ final: prev: {
 
   denops-vim = buildVimPlugin {
     pname = "denops.vim";
-    version = "2025-08-24";
+    version = "2025-10-26";
     src = fetchFromGitHub {
       owner = "vim-denops";
       repo = "denops.vim";
-      rev = "a278b8342459e4687f24d4d575d72ff593326cee";
-      sha256 = "1k1zcqf88z6yxxwvs0mjcharmykqis57jh505s37xaff2zvmb114";
+      rev = "5cfca39988a36e42d81b925264fc846077a727e3";
+      sha256 = "1mwan663n7hhfg7hzlw0fmvbpspsfm0q3f3dbni0mf3sg1kh4070";
     };
     meta.homepage = "https://github.com/vim-denops/denops.vim/";
     meta.hydraPlatforms = [ ];
@@ -4708,12 +4708,12 @@ final: prev: {
 
   easy-dotnet-nvim = buildVimPlugin {
     pname = "easy-dotnet.nvim";
-    version = "2025-10-19";
+    version = "2025-10-22";
     src = fetchFromGitHub {
       owner = "GustavEikaas";
       repo = "easy-dotnet.nvim";
-      rev = "4c4e222929c07f9f92aca04a3555d5cf5b58971f";
-      sha256 = "0h503rlqz2fgbmwqpf6aggc411sn6avc327wxwca3mynnzp1gfg4";
+      rev = "97cf26a039a10f53bb5474ba7bf32fbc67eac592";
+      sha256 = "1w9c595nhrdk5pxd510r0wrjzvnh68jj3i1r78v362llwm44j37q";
     };
     meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4734,12 +4734,12 @@ final: prev: {
 
   ecolog-nvim = buildVimPlugin {
     pname = "ecolog.nvim";
-    version = "2025-10-07";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "ph1losof";
       repo = "ecolog.nvim";
-      rev = "95ee6e265edbf682d6b2f35e857156009dec1861";
-      sha256 = "07d36ailqv4wgk7ljszxgnzgj9rwdsidmxca52i7mfk3aaha2jxx";
+      rev = "e4b2644a02d0b1c97a548ed93df6db13df90781f";
+      sha256 = "07a1d8gzd8bwzsadzy0lnb78w61qbicz2dndj1fhlnkdlyzhmsz5";
     };
     meta.homepage = "https://github.com/ph1losof/ecolog.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4773,12 +4773,12 @@ final: prev: {
 
   edgy-nvim = buildVimPlugin {
     pname = "edgy.nvim";
-    version = "2025-10-08";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "edgy.nvim";
-      rev = "541705c0e2d67c8925d1c072ac11d30a644ca6a7";
-      sha256 = "16hrqbbqlm070yj9a5swkc9k2qqb1n0v4gh6hnlgq6hn4igpmcp8";
+      rev = "8bfd2808994a988c975694122f68624b8a219f5f";
+      sha256 = "0hwingrqjxvvb2wpq5s6z08idqzi766svghbqd9zavpqjhzb2wfh";
     };
     meta.homepage = "https://github.com/folke/edgy.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4944,12 +4944,12 @@ final: prev: {
 
   everforest = buildVimPlugin {
     pname = "everforest";
-    version = "2025-09-22";
+    version = "2025-10-27";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "everforest";
-      rev = "3fffb096f6ac11372944ac964c60f8af41d8809f";
-      sha256 = "0fwcdbbr9plmgzrahdswvh9rd5di17bxsgxf5zpk2fsdhz58pg6b";
+      rev = "0909c23a2b8cbc337cffe91fda36381747e88506";
+      sha256 = "1m0mhqqmcicpyfmxzp57c7b7pcfm8vxy8iymsfq629xkdf2lqbqj";
     };
     meta.homepage = "https://github.com/sainnhe/everforest/";
     meta.hydraPlatforms = [ ];
@@ -5179,12 +5179,12 @@ final: prev: {
 
   flash-nvim = buildVimPlugin {
     pname = "flash.nvim";
-    version = "2025-10-08";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "flash.nvim";
-      rev = "2febce67ff9cf7638d2569d17c41af02c38401eb";
-      sha256 = "0j4wahallpj7xmq821mcvirdivf4qywdgd03m0i98gbgidp8lzfh";
+      rev = "fcea7ff883235d9024dc41e638f164a450c14ca2";
+      sha256 = "1xm26117d95qcnx2hpi8g469awmsr8wwdg1bmvipgjkzjys78y54";
     };
     meta.homepage = "https://github.com/folke/flash.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5349,12 +5349,12 @@ final: prev: {
 
   fortune-nvim = buildVimPlugin {
     pname = "fortune.nvim";
-    version = "2025-08-27";
+    version = "2025-10-21";
     src = fetchFromGitHub {
       owner = "rubiin";
       repo = "fortune.nvim";
-      rev = "c5ad74c2eec74c6938ce813241ca1061ab1392eb";
-      sha256 = "0vhwczrgczikc16vl0w66zyg3wz9j1m85cln9qh9y0hsxdd5ipbh";
+      rev = "4df0e988dc3b9badcad98f4a9cbd340324d61269";
+      sha256 = "0capain2pz50aqkrzhkhl74mx3j7ywak2i91mhcnzghfqx61csj1";
     };
     meta.homepage = "https://github.com/rubiin/fortune.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5804,12 +5804,12 @@ final: prev: {
 
   go-nvim = buildVimPlugin {
     pname = "go.nvim";
-    version = "2025-10-02";
+    version = "2025-10-26";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "go.nvim";
-      rev = "db20146ef63322949af69b0955f80ee7d98145bd";
-      sha256 = "06przzv69hzc600vawnjakmql3fn99m6jz0531n1y5hpbrik3k5s";
+      rev = "eb92453bc049c156290ed402f90f74090aa86363";
+      sha256 = "194xwv39i0ml4400pc7j5wy613vfa33jfgaz6633wqd2xy4jf6ih";
     };
     meta.homepage = "https://github.com/ray-x/go.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5921,12 +5921,12 @@ final: prev: {
 
   gruber-darker-nvim = buildVimPlugin {
     pname = "gruber-darker.nvim";
-    version = "2025-10-16";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "blazkowolf";
       repo = "gruber-darker.nvim";
-      rev = "59643c57ae868a60968cca75bac5ec2de7695dc2";
-      sha256 = "0vcj7idxkadqw8d12fcccxs3l3cb5vxlh0n1hm0kz6dqvbp78i5c";
+      rev = "98a2e141981cbd5a194a97eae024bf55af854579";
+      sha256 = "0bxv33isymnbdzf71w79pfxkwi8ylhjiq3ir9ws2as1d73nnl6lv";
     };
     meta.homepage = "https://github.com/blazkowolf/gruber-darker.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6025,12 +6025,12 @@ final: prev: {
 
   guard-collection = buildVimPlugin {
     pname = "guard-collection";
-    version = "2025-08-24";
+    version = "2025-10-25";
     src = fetchFromGitHub {
       owner = "nvimdev";
       repo = "guard-collection";
-      rev = "2fbf8449609ce522c36050e4e27235575c2d5439";
-      sha256 = "01xbpd4nm4c1gcxg5yqyk7g4d1fbdzkyc1x1m6ba7laq7cf15zql";
+      rev = "6bd5ad7941fc4c182f29c29a743eabc31fdac2e8";
+      sha256 = "1m20rdxaxgdq8sp8d2mxsjj2snxwzjg06c7l5ixj9rcapy7a0npq";
     };
     meta.homepage = "https://github.com/nvimdev/guard-collection/";
     meta.hydraPlatforms = [ ];
@@ -6156,12 +6156,12 @@ final: prev: {
 
   haskell-scope-highlighting-nvim = buildVimPlugin {
     pname = "haskell-scope-highlighting.nvim";
-    version = "2024-12-18";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "kiyoon";
       repo = "haskell-scope-highlighting.nvim";
-      rev = "0b6238e1c5b2a53093e7d99a433ecdd4efff5db1";
-      sha256 = "013fa6vdjgw5jl7h9yvi68v8awg2zznrxz5gfgl6i1cv9ry2l900";
+      rev = "0ee8d06ef1a900977c9517e4fb2a55e5b5cbb03d";
+      sha256 = "0cdrxxp18lbsjjpssl68wp0ydqhpw9jmgxfn1hiqk26h718q4h14";
     };
     meta.homepage = "https://github.com/kiyoon/haskell-scope-highlighting.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6221,12 +6221,12 @@ final: prev: {
 
   headhunter-nvim = buildVimPlugin {
     pname = "headhunter.nvim";
-    version = "2025-10-06";
+    version = "2025-10-21";
     src = fetchFromGitHub {
       owner = "StackInTheWild";
       repo = "headhunter.nvim";
-      rev = "45eff1653c27a19c47c8a2dfed4897d4a434408d";
-      sha256 = "14p5kcn5drbfsklyvdajfgxyax6d5rpkn8qdnabibsqrw31bkj91";
+      rev = "de8b66662e9c5309b133708d30b08a6d180a7cfd";
+      sha256 = "0wwwyxcl5q60qvw1zqlp1g3r39gr8flgbyrd9905ixg30rr13z7z";
     };
     meta.homepage = "https://github.com/StackInTheWild/headhunter.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6260,12 +6260,12 @@ final: prev: {
 
   helm-ls-nvim = buildVimPlugin {
     pname = "helm-ls.nvim";
-    version = "2025-09-11";
+    version = "2025-10-26";
     src = fetchFromGitHub {
       owner = "qvalentin";
       repo = "helm-ls.nvim";
-      rev = "f36ecbd3e7b0b2ac8358a9d6a3213888e29943db";
-      sha256 = "01ad96y17yhwjr5a90v152r73j9a1qgx0r0gcaann4hs0328jfwz";
+      rev = "142777b0ad47f0b007051b187602fad13f00557f";
+      sha256 = "1c8lmq8gqv0zpw8a4bbbb3jpwk481a16hanav4yw88jnlvq3bm14";
     };
     meta.homepage = "https://github.com/qvalentin/helm-ls.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6964,12 +6964,12 @@ final: prev: {
 
   jule-nvim = buildVimPlugin {
     pname = "jule.nvim";
-    version = "2025-08-07";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "julelang";
       repo = "jule.nvim";
-      rev = "64f1cae1a5244d55136be3106b3f4edb30164f29";
-      sha256 = "1mb3lniqh4vl3kqivvs88l53cz9jk9ry18560lbizmva3l7q3zrr";
+      rev = "6c0b4ffed1c610d76bacaa91fdb09b501df5dada";
+      sha256 = "1p68k55mbps2s3f0k5dbw2a6c0f7jfg57kvx3gzdmp0lc1ph10if";
     };
     meta.homepage = "https://github.com/julelang/jule.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7016,12 +7016,12 @@ final: prev: {
 
   kanagawa-paper-nvim = buildVimPlugin {
     pname = "kanagawa-paper.nvim";
-    version = "2025-10-17";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "thesimonho";
       repo = "kanagawa-paper.nvim";
-      rev = "3ed25ea76837f6990bb7d9c7eef99001060d5a85";
-      sha256 = "19c8286p428k02k4057a61xaqlgfyxfsbn877i389vv3izxh5kf9";
+      rev = "f8d7de5293b6cb1ee0fb7833d10e277beae4966a";
+      sha256 = "0axbw3ngkdnclj344v0zdrvr8nd08xnwzsqywdpk5pii3khfkscb";
     };
     meta.homepage = "https://github.com/thesimonho/kanagawa-paper.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7146,12 +7146,12 @@ final: prev: {
 
   kulala-nvim = buildVimPlugin {
     pname = "kulala.nvim";
-    version = "2025-10-19";
+    version = "2025-10-25";
     src = fetchFromGitHub {
       owner = "mistweaverco";
       repo = "kulala.nvim";
-      rev = "183bf444bfffe957fdb83c5aac53b10cd4dced00";
-      sha256 = "1kxk9y1bsq66z7q27fbrr2i3ivvy2kvjcamnzgn3rhjzqjbc5rgb";
+      rev = "9a9308b664f71159f1c150e8cfb18541b143a9e9";
+      sha256 = "1vjyaav4cv89c5kr35x37fdd0avh2sy3kdvpg7lw226977iy0nvz";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
@@ -7225,12 +7225,12 @@ final: prev: {
 
   lazy-lsp-nvim = buildVimPlugin {
     pname = "lazy-lsp.nvim";
-    version = "2025-10-15";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "dundalek";
       repo = "lazy-lsp.nvim";
-      rev = "d74741ce1a588fe11900b5bcd5cd160b04998f60";
-      sha256 = "1sxr9rlimjl0w0kw50jddv6mgnvcc4m28b6l48s8vw0xhcws5276";
+      rev = "ccaaed19d7963bdc06000052eade993452b7ad86";
+      sha256 = "10f7fkhkisbmw7fp0prd8j5wknyb5gk64lhlgx8l2q53iv7fq5qm";
     };
     meta.homepage = "https://github.com/dundalek/lazy-lsp.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7238,12 +7238,12 @@ final: prev: {
 
   lazy-nvim = buildVimPlugin {
     pname = "lazy.nvim";
-    version = "2025-10-09";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "lazy.nvim";
-      rev = "1ea3c4085785f460fb0e46d2fe1ee895f5f9e7c1";
-      sha256 = "1zyxqdhlqniy0z4nrvisd5fjc75wb6nx4i53621di8k6r3il2541";
+      rev = "f0f5bbb9e5bfae5e6468f9359ffea3d151418176";
+      sha256 = "08ki2mi4p1wdlkynapx8zrm36m7akvxybxxk7mg69ihdrkcrg6w1";
     };
     meta.homepage = "https://github.com/folke/lazy.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7251,12 +7251,12 @@ final: prev: {
 
   lazydev-nvim = buildVimPlugin {
     pname = "lazydev.nvim";
-    version = "2025-10-08";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "lazydev.nvim";
-      rev = "e28ce52fc7ff79fcb76f0e79ee6fb6182fca90b9";
-      sha256 = "1jzpwh6r2zw27aygacbjgf2fsfvlxkbqwbcvmgcz4c16v53d9721";
+      rev = "faf46237f0df43a29e12abd143ff1a0bbac27b7e";
+      sha256 = "0xjsxpc4dilprms34yzkh845rd4fnlsirp5434xzi6yjrp1h4lax";
     };
     meta.homepage = "https://github.com/folke/lazydev.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7303,12 +7303,12 @@ final: prev: {
 
   lean-nvim = buildVimPlugin {
     pname = "lean.nvim";
-    version = "2025-10-18";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "Julian";
       repo = "lean.nvim";
-      rev = "17e1f63a6f2168f0ce5ec89d6480fd448b7854e3";
-      sha256 = "1xkdk1dpy8bbwb9c9hc8r0pknkbnwnryv2kmr94hxda36h7g7c9n";
+      rev = "4f2d243482fbf578db41c16f5c6b2dc34e0d1206";
+      sha256 = "1jfqfsab8rly9rrn1wgg46qpk9m91caxkk0xjvm1hmwmg6qm4lbs";
     };
     meta.homepage = "https://github.com/Julian/lean.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7342,12 +7342,12 @@ final: prev: {
 
   leap-nvim = buildVimPlugin {
     pname = "leap.nvim";
-    version = "2025-10-19";
+    version = "2025-10-24";
     src = fetchFromGitHub {
       owner = "ggandor";
       repo = "leap.nvim";
-      rev = "7068a0576694efb72798696de65155d503bcb0ef";
-      sha256 = "0hganix9n2d6hks3i05hj1zgql310lq0wjwvyr3j6v2zbjjk1d5p";
+      rev = "44e3a60a7a62069e5c9445b7a8104612d4f060cb";
+      sha256 = "0g9r5356p8azann21i2bxx7p6h63k4lnk9vwlip8j9psw9mgmr7s";
     };
     meta.homepage = "https://github.com/ggandor/leap.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7394,12 +7394,12 @@ final: prev: {
 
   lensline-nvim = buildVimPlugin {
     pname = "lensline.nvim";
-    version = "2025-09-27";
+    version = "2025-10-26";
     src = fetchFromGitHub {
       owner = "oribarilan";
       repo = "lensline.nvim";
-      rev = "9ae1e4a4d47533dc5bba301e790dcda44ec62be6";
-      sha256 = "0p8cylbpdlh7xvxzk4g4jbq5r3wnxaarv5ka0nb781msqlhqphv8";
+      rev = "ee938078aeee9751aafc20b055fcbb8aa579bb76";
+      sha256 = "1m7mj353jkfsgj3ad6ciyx7ms00z30byq449vnws06b40wyv79hh";
     };
     meta.homepage = "https://github.com/oribarilan/lensline.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7745,12 +7745,12 @@ final: prev: {
 
   llama-vim = buildVimPlugin {
     pname = "llama.vim";
-    version = "2025-10-16";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "ggml-org";
       repo = "llama.vim";
-      rev = "59d3e7a5014f5eaffb2b340cfcb399a93c331fa2";
-      sha256 = "01f0fkxvf6qqxm4zydk1z20cwyqk2w8dn2z12zwn1vcxrc5x8r4a";
+      rev = "ade8966eff57dcbe4a359dd26fb1ea97378ea03c";
+      sha256 = "11mkav5qd2ian851hkg65lks3sg4ijy1npnghnkchm4anmj8xymq";
     };
     meta.homepage = "https://github.com/ggml-org/llama.vim/";
     meta.hydraPlatforms = [ ];
@@ -8149,12 +8149,12 @@ final: prev: {
 
   mason-lspconfig-nvim = buildVimPlugin {
     pname = "mason-lspconfig.nvim";
-    version = "2025-10-18";
+    version = "2025-10-29";
     src = fetchFromGitHub {
       owner = "mason-org";
       repo = "mason-lspconfig.nvim";
-      rev = "2304ff65ecc8cb2afc2484de3e2ed9a407edf0b9";
-      sha256 = "1v96mcqnqfydyxl2yb8s88vjqllyqkm190rwrk3pfk40rfrxpp3d";
+      rev = "3590d66effccc7376d8c3dbe45e8291f9fed2843";
+      sha256 = "018hvw7amg33j6iffaj9yw6csscr1cgxg2i7irzwyd8h3gm2s5k8";
     };
     meta.homepage = "https://github.com/mason-org/mason-lspconfig.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8487,12 +8487,12 @@ final: prev: {
 
   mini-completion = buildVimPlugin {
     pname = "mini.completion";
-    version = "2025-10-19";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.completion";
-      rev = "0cb66df2123bf1c4dc5cf1843817452df427a93c";
-      sha256 = "1r8izqix9n1w04wy9p5m1p0vkss9qrh1cwx9mk82afs8vkd7h534";
+      rev = "2ab1c8078061a647b0867581a1dcedb046b9ce27";
+      sha256 = "0gf5mfp0rafm534snd5np4zyqa3rk6d6izln3bzn9nqr370ba73d";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.completion/";
     meta.hydraPlatforms = [ ];
@@ -8526,12 +8526,12 @@ final: prev: {
 
   mini-diff = buildVimPlugin {
     pname = "mini.diff";
-    version = "2025-10-03";
+    version = "2025-10-24";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.diff";
-      rev = "a2df2a9a485328c20252b7cadb11feb717020e45";
-      sha256 = "1l7k6dg8w9yvr01mdv0j37fr8f0ada9whgjx4ybnwkr1039iz8hp";
+      rev = "98fc732d5835eb7b6539f43534399b07b17f4e28";
+      sha256 = "04xalxirbxwlxay6i4vqvva661lrw0q4lplgxyinn8nmrabfr996";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.diff/";
     meta.hydraPlatforms = [ ];
@@ -8565,12 +8565,12 @@ final: prev: {
 
   mini-files = buildVimPlugin {
     pname = "mini.files";
-    version = "2025-10-03";
+    version = "2025-10-24";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.files";
-      rev = "51db5ded1b7ac4dd8ca4c22c66f156dac5309304";
-      sha256 = "025927ixm304qb8by37l4vgw7blafqbg6yasv99mzjq5xx469177";
+      rev = "d5c1337441aff47768288e8562eb66ae8b5171a9";
+      sha256 = "1fs75zshh1lkynm5wrs6y6g5c5wws8mibz1khvb7hh5v24gap383";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.files/";
     meta.hydraPlatforms = [ ];
@@ -8617,12 +8617,12 @@ final: prev: {
 
   mini-hues = buildVimPlugin {
     pname = "mini.hues";
-    version = "2025-10-20";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.hues";
-      rev = "973b8d642cba3a98b97b3361ac165d3f953818cf";
-      sha256 = "0gvjj0jcm961kylhaljaa279wmr0240isfh4hhsfqfrzz150jhgg";
+      rev = "902810225edbf68a76dbbdc6a03a54a540af380e";
+      sha256 = "18nciyjx5qlfj7x2q63ynyz8c9b3g9c7i33apgldc13lia1ysgrf";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.hues/";
     meta.hydraPlatforms = [ ];
@@ -8747,12 +8747,12 @@ final: prev: {
 
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "2025-10-20";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.nvim";
-      rev = "14145d3769eacdb48aa1cfd21f1e244896a85f68";
-      sha256 = "1vnfhfjfnw9i1wv8sxj34vrlflkv9klfiin6pdwirzdvp32p5s9k";
+      rev = "ee4a4a4abed25e3d108d985b0553c5271f2f71aa";
+      sha256 = "1bg5fkramwrx1d247x827rpigpmf83asqwj7ijffrp80djp15lwk";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8864,12 +8864,12 @@ final: prev: {
 
   mini-surround = buildVimPlugin {
     pname = "mini.surround";
-    version = "2025-10-09";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.surround";
-      rev = "444e155147e2b5159dd28a65f9736254c16cb817";
-      sha256 = "1b34pvaipvqwsb2kngzv5zvqrdmbr4q9v29qh1rwg80byifi33f4";
+      rev = "3c73e2a4d20f46f8bcb610020db2be5fde8319fb";
+      sha256 = "1b5anbvi5v7qpfpxk0rmz29lhxjjf18g5kaiy84gkfamwvd2y747";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.surround/";
     meta.hydraPlatforms = [ ];
@@ -8929,12 +8929,12 @@ final: prev: {
 
   minuet-ai-nvim = buildVimPlugin {
     pname = "minuet-ai.nvim";
-    version = "2025-10-15";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "milanglacier";
       repo = "minuet-ai.nvim";
-      rev = "3fb81e155c4c0c86416427cf1e63d608a6303dca";
-      sha256 = "0s4jyraw7lix23l35xkqgxfvpxqmkfm65gg7hy6cg5hwpx79767q";
+      rev = "5d565cb23e0b365af14f9e9a2a45b2b46e7c4f3e";
+      sha256 = "0mb7lqy3h7hnm035lclsh205nv92bg0d2ql06xhi02x10c807mn4";
     };
     meta.homepage = "https://github.com/milanglacier/minuet-ai.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8981,12 +8981,12 @@ final: prev: {
 
   modicator-nvim = buildVimPlugin {
     pname = "modicator.nvim";
-    version = "2025-01-09";
+    version = "2025-10-24";
     src = fetchFromGitHub {
       owner = "mawkler";
       repo = "modicator.nvim";
-      rev = "45b64561e109cd04de551b081fb947b4f856009e";
-      sha256 = "1p0giz93qaz1y09p6i4lagphi50j8316wjlrfr3h152dv96s1b2s";
+      rev = "0bc989b32a7ba3cab06cb79a433557384eb2a0be";
+      sha256 = "18qn7h88wlgkf76kqwxsgwlc5hr2n30xxz8wridk41si5iv8lz9x";
     };
     meta.homepage = "https://github.com/mawkler/modicator.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9397,12 +9397,12 @@ final: prev: {
 
   neo-tree-nvim = buildVimPlugin {
     pname = "neo-tree.nvim";
-    version = "2025-10-15";
+    version = "2025-10-29";
     src = fetchFromGitHub {
       owner = "nvim-neo-tree";
       repo = "neo-tree.nvim";
-      rev = "20244beec28b9d79ffb75fe1b1606f4dd8d476fc";
-      sha256 = "1d234zk5pz1l5ydy0ixg463638yg5dwbci89iramma14sz62g6k3";
+      rev = "146408d801da2e9d917ca275f86b788fe612df85";
+      sha256 = "0ggyd84qslf6jpzv952g92jls2k7m1xd1h1p6ijs49ia0qd8gynd";
     };
     meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9423,12 +9423,12 @@ final: prev: {
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "2025-10-17";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "0089570322ddbc953d87e1295d280d487e338574";
-      sha256 = "0kwpibkq1khpyxhibs2fmrnnkfxgka6swq46rp16jk1rwxncqwzd";
+      rev = "d2400cd4ba2efe9b3dc4e4b2a76f5fd362b7a136";
+      sha256 = "03kp8d4kb61jf6b4x1c6badqiv5qdj3l1i4fw4x5yiy8mr945vih";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9501,12 +9501,12 @@ final: prev: {
 
   neogit = buildVimPlugin {
     pname = "neogit";
-    version = "2025-10-13";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "0f48491ae0046796841aaa97d439267982fe72db";
-      sha256 = "1srsjkianc6d3m8kv8haas5wyfw2b8vs2v6dinr2k0k32vqbc5z7";
+      rev = "c6d00913f802acedfb93c01267e89185f25800ca";
+      sha256 = "03f440mc8d5q7clwjzrw8l3d71vsg8v4a47mf5k8kiacj0qbc5v5";
     };
     meta.homepage = "https://github.com/NeogitOrg/neogit/";
     meta.hydraPlatforms = [ ];
@@ -9776,12 +9776,12 @@ final: prev: {
 
   neotest-golang = buildVimPlugin {
     pname = "neotest-golang";
-    version = "2025-10-20";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "fredrikaverpil";
       repo = "neotest-golang";
-      rev = "f8743de8294e1d4c30c746c9ce80866c18253aee";
-      sha256 = "0zz9xj0x5wpz61zl63kv0pmvqckj21pk834cw9s70dwr0b8iaffc";
+      rev = "525325d904416eeea1be9140263b0991e7f7ec0c";
+      sha256 = "0incbyxlnlh5msgyvpr0zzq7gcl7qlh6a0nyqj13kx167pmazh1k";
     };
     meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/";
     meta.hydraPlatforms = [ ];
@@ -9816,12 +9816,12 @@ final: prev: {
 
   neotest-haskell = buildVimPlugin {
     pname = "neotest-haskell";
-    version = "2025-10-20";
+    version = "2025-10-26";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "neotest-haskell";
-      rev = "72bb59f11110e5c26f0435ba4a3b2c5390a644ec";
-      sha256 = "141x1801rg5l31zcdwxghzyphpr5ygky0zp3clxmwzr4ifa4zh22";
+      rev = "122864eb2ceacf82a6354f3854443f2bcfca54d8";
+      sha256 = "18w8dqsvynjccqbgf7vavhdayyhl5p8w4z8rnn9nz5n1xn88bdjq";
     };
     meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
     meta.hydraPlatforms = [ ];
@@ -9829,12 +9829,12 @@ final: prev: {
 
   neotest-java = buildVimPlugin {
     pname = "neotest-java";
-    version = "2025-10-17";
+    version = "2025-10-25";
     src = fetchFromGitHub {
       owner = "rcasia";
       repo = "neotest-java";
-      rev = "08ce53f18ad82248ea37e806137f03f5bced3c65";
-      sha256 = "02z1l70i79z66qyz1zw1w1kh3sx1045m4mgxfl0xn3j9byk762d5";
+      rev = "fbdf5c3208007ccef1a8941e1229fc5f872c760e";
+      sha256 = "12v734jk1sybzpl4584bbpb4vkr9fm2dqs1lyhmvnqrwm6mn2mrv";
     };
     meta.homepage = "https://github.com/rcasia/neotest-java/";
     meta.hydraPlatforms = [ ];
@@ -9842,12 +9842,12 @@ final: prev: {
 
   neotest-jest = buildVimPlugin {
     pname = "neotest-jest";
-    version = "2025-09-24";
+    version = "2025-10-24";
     src = fetchFromGitHub {
       owner = "nvim-neotest";
       repo = "neotest-jest";
-      rev = "2f657403aabab7d68eaa2cb9181dc4bb7fdd8a08";
-      sha256 = "0kvys4bcv1zwybc4qcym18qlz1s0pj8c545nzychwp7m839yzqps";
+      rev = "5dc15386a2b04080fd24901eb2450aaf787bd172";
+      sha256 = "0fyw2nvljs0d6x98cnsr5bwgxxxmncddp2dlsbqprxfy867qdnzc";
     };
     meta.homepage = "https://github.com/nvim-neotest/neotest-jest/";
     meta.hydraPlatforms = [ ];
@@ -9868,12 +9868,12 @@ final: prev: {
 
   neotest-mocha = buildVimPlugin {
     pname = "neotest-mocha";
-    version = "2025-08-30";
+    version = "2025-10-20";
     src = fetchFromGitHub {
       owner = "adrigzr";
       repo = "neotest-mocha";
-      rev = "342664d54d2177cd0b21742ddf8c447ff278df46";
-      sha256 = "1dnsgyh0ybx8sy9ryqklh61h967gq2d44phd1d39ghzjn60zv7al";
+      rev = "bf24f5ba9bbb35ba5156b9642bccb80b8cc80eb0";
+      sha256 = "03rh4wj0jdsm4zbk80whnrv0k1bb06cjjs29rfv30jd10xg0drh0";
     };
     meta.homepage = "https://github.com/adrigzr/neotest-mocha/";
     meta.hydraPlatforms = [ ];
@@ -10024,12 +10024,12 @@ final: prev: {
 
   neovim-ayu = buildVimPlugin {
     pname = "neovim-ayu";
-    version = "2025-08-20";
+    version = "2025-10-21";
     src = fetchFromGitHub {
       owner = "Shatur";
       repo = "neovim-ayu";
-      rev = "cc78e880cce5dfc1187d144ed7251c746feff259";
-      sha256 = "1fdxapbm08g1hqdk31261c2fnfr4vawgb9pg0kxglc8lkyrn2w8b";
+      rev = "38caa8b5b969010b1dcae8ab1a569d7669a643d5";
+      sha256 = "18a7gj7l6ahhbb1hpsmb9gh21dmcd0fkjzgl4cncq42rjby7ysyq";
     };
     meta.homepage = "https://github.com/Shatur/neovim-ayu/";
     meta.hydraPlatforms = [ ];
@@ -10180,12 +10180,12 @@ final: prev: {
 
   nfnl = buildVimPlugin {
     pname = "nfnl";
-    version = "2025-10-18";
+    version = "2025-10-24";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "nfnl";
-      rev = "6a7fbe05718dc072851fa2b241dac950b0f2c026";
-      sha256 = "1602jns47c5algr6gbxan1jk2db38hnv7kk03nm4q92ira3ncnl8";
+      rev = "d439796e6ef940cca8c535559a9d204476e51633";
+      sha256 = "0bgxqla1ircwy95wqvil1h021xwrqym79qx1h3nrn8zxmkdk0jrl";
     };
     meta.homepage = "https://github.com/Olical/nfnl/";
     meta.hydraPlatforms = [ ];
@@ -10232,12 +10232,12 @@ final: prev: {
 
   nightfly = buildVimPlugin {
     pname = "nightfly";
-    version = "2025-10-11";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "bluz71";
       repo = "vim-nightfly-colors";
-      rev = "7818d2b40d1e35bd351d673c0ffef4f4bb9230c6";
-      sha256 = "1mp7qqd6qfhw68pyr8xmx6bk3wjx7z3577jarqhgmya1nxmq2ndy";
+      rev = "2a92a9291a461d99c01b4cdcc8fa41ec17a2209d";
+      sha256 = "0p3wqwna2bv4c76iwgydcqrm39p1qm5zpgbyfsp0w9ycz9xhg78m";
     };
     meta.homepage = "https://github.com/bluz71/vim-nightfly-colors/";
     meta.hydraPlatforms = [ ];
@@ -10297,12 +10297,12 @@ final: prev: {
 
   nlsp-settings-nvim = buildVimPlugin {
     pname = "nlsp-settings.nvim";
-    version = "2025-10-20";
+    version = "2025-10-27";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "a6230cb4464fd94c6dcf98b84b678d1106296c2b";
-      sha256 = "15wz4nf62j6a68nv1cchy0pi5kibw12d47hlx83ajdpmmd7n4x2b";
+      rev = "3e9ea1b897bb4419477bada535a7108bea76cf9c";
+      sha256 = "1phz299jhq63wczr793j8f5jzc1p0ka5g4faxba951fwcks5ivmc";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
     meta.hydraPlatforms = [ ];
@@ -10362,12 +10362,12 @@ final: prev: {
 
   noice-nvim = buildVimPlugin {
     pname = "noice.nvim";
-    version = "2025-10-18";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "noice.nvim";
-      rev = "db248375c12c5322fbb9b505c1dc6f08e4527684";
-      sha256 = "1hsvqwq4g73i1ivcj50vbp16kn4mixsdrq89zcy9wzr3sm5qd4gb";
+      rev = "5099348591f7d3ba9e547b1e631c694c65bbe0b9";
+      sha256 = "12c28is03zyz8ba3qa33mmf9g0r6nb7iavxfqidbd2l0bmyqg79x";
     };
     meta.homepage = "https://github.com/folke/noice.nvim/";
     meta.hydraPlatforms = [ ];
@@ -10492,12 +10492,12 @@ final: prev: {
 
   nvchad-ui = buildVimPlugin {
     pname = "nvchad-ui";
-    version = "2025-09-27";
+    version = "2025-10-25";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "ui";
-      rev = "03b9718140375e7f3f5e4f3e04bc2b6c907440ec";
-      sha256 = "1fh33a0bc6iwc45bfa9hbbvfp170n9j98iba3plfffn4yj4i2rwb";
+      rev = "bea2af0a76c1098fac0988ad296aa028cad2a333";
+      sha256 = "0fv4qx354mndv6mx6s0qnglm5qgm774x6cmcgawm045bcfp29crd";
     };
     meta.homepage = "https://github.com/nvchad/ui/";
     meta.hydraPlatforms = [ ];
@@ -10830,12 +10830,12 @@ final: prev: {
 
   nvim-dap-view = buildVimPlugin {
     pname = "nvim-dap-view";
-    version = "2025-10-19";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "igorlfs";
       repo = "nvim-dap-view";
-      rev = "0746f356b6de4acb588ddc0ef91f0f734306cfe8";
-      sha256 = "07j2354qsvpf6j0j2d7xxlsr8xhr6j10b38hm9sjqk75dnix8czp";
+      rev = "8f50aca151fb6f539ebc9e0ded9fa05b1f8cb69f";
+      sha256 = "00pamp59csgy8m3amwvydqlkbir5lq7z5cv29c11p2n4z2r6pz56";
     };
     meta.homepage = "https://github.com/igorlfs/nvim-dap-view/";
     meta.hydraPlatforms = [ ];
@@ -11194,12 +11194,12 @@ final: prev: {
 
   nvim-lilypond-suite = buildVimPlugin {
     pname = "nvim-lilypond-suite";
-    version = "2025-10-12";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "martineausimon";
       repo = "nvim-lilypond-suite";
-      rev = "5d5f433824f3658fe6446318c432338f9c58c57d";
-      sha256 = "1444sp9h4vyyammwzqi3b4mldk4ad4ipbrkv7yl3836czdgh4l04";
+      rev = "d26c1fd42060fa9a5d076a78b478b0fc3825974a";
+      sha256 = "1cx2jwb4smrf42crhbq94nsa0vy0ms43xwl10kkanc78vz5ap10i";
     };
     meta.homepage = "https://github.com/martineausimon/nvim-lilypond-suite/";
     meta.hydraPlatforms = [ ];
@@ -11259,12 +11259,12 @@ final: prev: {
 
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2025-10-11";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "ac98db2f9f06a56498ec890a96928774eae412c3";
-      sha256 = "0ncrknyldkaf2i053bkmzd7x58jflsyv6y5fr1wnbq26ynrxf245";
+      rev = "e25994a1c2373784364852cd904cb39b6d75f227";
+      sha256 = "18s6ngglynajysmvp0975lnbhavd1dckj87g0hyzbydrj73f401m";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
     meta.hydraPlatforms = [ ];
@@ -11441,12 +11441,12 @@ final: prev: {
 
   nvim-origami = buildVimPlugin {
     pname = "nvim-origami";
-    version = "2025-10-20";
+    version = "2025-10-22";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-origami";
-      rev = "4134748ba22da25cab9389fb7289e28750f96f5b";
-      sha256 = "0mf45w5xsrxi49kr6w678y3ka2k87n565ypz6zral6q1k0ab2z9q";
+      rev = "d42d11008a32f5f8c92bca6fd63f6782f197d114";
+      sha256 = "06c086h6214c65g83z4ixvg1ifqsv8h56pcw5l9vwqfn413x02kw";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-origami/";
     meta.hydraPlatforms = [ ];
@@ -11688,12 +11688,12 @@ final: prev: {
 
   nvim-surround = buildVimPlugin {
     pname = "nvim-surround";
-    version = "2025-09-20";
+    version = "2025-10-25";
     src = fetchFromGitHub {
       owner = "kylechui";
       repo = "nvim-surround";
-      rev = "75de1782c781961e392efcca57601bf436f4d550";
-      sha256 = "1ik23ii18ndh4fbv92m24cccwh7l5ms8m601phd99lm2q9pybipf";
+      rev = "fcfa7e02323d57bfacc3a141f8a74498e1522064";
+      sha256 = "0jnrxsiyid1g63px4rmjs4kbzgjpqw636fffkigvhb813nl0vw0i";
     };
     meta.homepage = "https://github.com/kylechui/nvim-surround/";
     meta.hydraPlatforms = [ ];
@@ -11740,12 +11740,12 @@ final: prev: {
 
   nvim-tinygit = buildVimPlugin {
     pname = "nvim-tinygit";
-    version = "2025-10-13";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-tinygit";
-      rev = "7a3e0707095880e6c9a7d32532b2196ede0bb8c9";
-      sha256 = "1pd7wiap68lxg2a938l5drx0xnw010vsy06fvyidlvmvrfmp1mif";
+      rev = "a2910ba000901071cbcf347d4dd5c4a9c63fd510";
+      sha256 = "02sbv5c95c214gafhq3xb747hrf6ssfbkjjn3vlp142g5615bzmd";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-tinygit/";
     meta.hydraPlatforms = [ ];
@@ -11779,12 +11779,12 @@ final: prev: {
 
   nvim-treesitter-context = buildVimPlugin {
     pname = "nvim-treesitter-context";
-    version = "2025-09-10";
+    version = "2025-10-21";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-context";
-      rev = "41847d3dafb5004464708a3db06b14f12bde548a";
-      sha256 = "0p6pslcr1pqhz7nv66cnk6z5g1siwidzznbxr50zazb6rdpgqa7v";
+      rev = "ec308c7827b5f8cb2dd0ad303a059c945dd21969";
+      sha256 = "1x2q0y644n7pf6xzfwsayg5cy8kpihln955pggq8445c2avnrmj1";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/";
     meta.hydraPlatforms = [ ];
@@ -11857,12 +11857,12 @@ final: prev: {
 
   nvim-treesitter-textobjects = buildVimPlugin {
     pname = "nvim-treesitter-textobjects";
-    version = "2025-10-20";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "nvim-treesitter";
       repo = "nvim-treesitter-textobjects";
-      rev = "a9742cbc1f95db9eaf3293bf8cd0622ca36542bb";
-      sha256 = "1lppnjsa0v1nyqc4mh7lh63hdbbn403ili9xf1cbflxsqcjhz2bh";
+      rev = "5ca4aaa6efdcc59be46b95a3e876300cfead05ef";
+      sha256 = "10qgbb381xr5v18pyvg46mzccqcdzdh575pmss725smx5g0q1zwm";
     };
     meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/";
     meta.hydraPlatforms = [ ];
@@ -11948,12 +11948,12 @@ final: prev: {
 
   nvim-unity = buildVimPlugin {
     pname = "nvim-unity";
-    version = "2025-08-22";
+    version = "2025-10-29";
     src = fetchFromGitHub {
       owner = "apyra";
       repo = "nvim-unity";
-      rev = "22aa4a977bbe4a9cd2c09617f43744eda76fb315";
-      sha256 = "0hxpj6nh6w73mz29p4jpfapfc4nrmsnpcrw2cyggcrblfmm844f8";
+      rev = "0305a5f21917ddf40d89a9467d8c153cf5cc82fa";
+      sha256 = "13g95p2nqs4wpg3201077rm9bhq1mdg43fx8621qw7svkw9f8gyi";
     };
     meta.homepage = "https://github.com/apyra/nvim-unity/";
     meta.hydraPlatforms = [ ];
@@ -12117,12 +12117,12 @@ final: prev: {
 
   obsidian-nvim = buildVimPlugin {
     pname = "obsidian.nvim";
-    version = "2025-10-19";
+    version = "2025-10-24";
     src = fetchFromGitHub {
       owner = "obsidian-nvim";
       repo = "obsidian.nvim";
-      rev = "ac66c4f1daf612905c24ff2252942226a94d0329";
-      sha256 = "044cxl4j7jp81x4dr2rk6q5rl2qva4mb0p7f9wcj6908dy4bnanp";
+      rev = "1a1a475846a4cfa3cfedde1c59141d99b6212951";
+      sha256 = "1ianli3dqpgwiyfhbfxs866bxsqn4m0c09nd4s3048sj6ay6g6pj";
     };
     meta.homepage = "https://github.com/obsidian-nvim/obsidian.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12156,12 +12156,12 @@ final: prev: {
 
   octo-nvim = buildVimPlugin {
     pname = "octo.nvim";
-    version = "2025-10-19";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "a6297cf215405c140c9e8f6a01b8e5d9aca794f2";
-      sha256 = "1vrqz49k5ffa93r0xkvdgmp5vbaip4snbnk1k7s7sxwq0gv0g95v";
+      rev = "4be7903a962875a47422110d0e9ff3e475db1d27";
+      sha256 = "0d4mzs4by6nzd3hr8hw513gpmvs387zzz9vs8amdydf9crplkf9f";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12377,12 +12377,12 @@ final: prev: {
 
   opencode-nvim = buildVimPlugin {
     pname = "opencode.nvim";
-    version = "2025-10-20";
+    version = "2025-10-29";
     src = fetchFromGitHub {
       owner = "NickvanDyke";
       repo = "opencode.nvim";
-      rev = "2129d213f9dc8b125bae8eaaa80466cd018d92f2";
-      sha256 = "0nrsyk53rr57281jzawk00m571zcddmxlqsm9nr8nmsdzns2ibrg";
+      rev = "c7594f8727541ca5ca3b44aa4796b8ffcb0d1bad";
+      sha256 = "0kc1bc39gp1d70va97270b1dp2brgnxb9j5g8qdan2mr51dhnzxs";
     };
     meta.homepage = "https://github.com/NickvanDyke/opencode.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12703,12 +12703,12 @@ final: prev: {
 
   persistence-nvim = buildVimPlugin {
     pname = "persistence.nvim";
-    version = "2025-10-08";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "persistence.nvim";
-      rev = "51eef57272742b773468949f6bd0503ec3f83874";
-      sha256 = "1qyf4c4raij7dc6d0z60zv0kn6rhnqvf48kps89q7jjz8rp5kz60";
+      rev = "b20b2a7887bd39c1a356980b45e03250f3dce49c";
+      sha256 = "1qzf0nbff2pihdh0y2fxsmws6rjssm4b1rv2bzv26dhckq986aq0";
     };
     meta.homepage = "https://github.com/folke/persistence.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12977,12 +12977,12 @@ final: prev: {
 
   project-nvim = buildVimPlugin {
     pname = "project.nvim";
-    version = "2025-10-20";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "DrKJeff16";
       repo = "project.nvim";
-      rev = "f38cb046123076a28eefac17978b5b5634be5b7e";
-      sha256 = "1h4g126bzrxq10nk69k7fr0a3b4dlf1cdzc0wb4n7qz17fw1cqjm";
+      rev = "06b363b62587279dad7ab9365bc24f2f4d5b71ac";
+      sha256 = "0hw87j44j3vrx5irb3q3k2008if0ivmzhw0ihnkl8lyplxlan615";
     };
     meta.homepage = "https://github.com/DrKJeff16/project.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13316,12 +13316,12 @@ final: prev: {
 
   refactoring-nvim = buildVimPlugin {
     pname = "refactoring.nvim";
-    version = "2025-06-26";
+    version = "2025-10-21";
     src = fetchFromGitHub {
       owner = "theprimeagen";
       repo = "refactoring.nvim";
-      rev = "74b608dfee827c2372250519d433cc21cb083407";
-      sha256 = "15byk3sjilrdnkg212mf7zbh5s7sdsc0m36lmzm7ccfvg5is9hmc";
+      rev = "6784b54587e6d8a6b9ea199318512170ffb9e418";
+      sha256 = "1wl2167fly4r3yzpkhl0qlprcn1p4n6p6cg6g1dy3sas8mzzan98";
     };
     meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13407,12 +13407,12 @@ final: prev: {
 
   render-markdown-nvim = buildVimPlugin {
     pname = "render-markdown.nvim";
-    version = "2025-10-17";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "MeanderingProgrammer";
       repo = "render-markdown.nvim";
-      rev = "475d3ad8cae486b0df6fc6050cf5b5ea1de42db8";
-      sha256 = "0338an5ynjx36v1rql1s6pwmxzv85yvfa7gsa86fxsa76nf82wq5";
+      rev = "10126effbafb74541b69219711dfb2c631e7ebf8";
+      sha256 = "02la4cclxsaz7fqf805v7kz089vrgpc91fzn1sr9j27cgh3jsn4g";
     };
     meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13538,12 +13538,12 @@ final: prev: {
 
   roslyn-nvim = buildVimPlugin {
     pname = "roslyn.nvim";
-    version = "2025-10-07";
+    version = "2025-10-22";
     src = fetchFromGitHub {
       owner = "seblyng";
       repo = "roslyn.nvim";
-      rev = "7d8819239c5e2c4a0d8150da1c00fa583f761704";
-      sha256 = "1vsswy5g8537kizy1wgnq4sk5hzazg5spc4skrlpmfs6h046pn6g";
+      rev = "7ba2dd0a5628c5ad3d8cc5a22e66ece3efc371bc";
+      sha256 = "0l7szb2f1f1mdbrbdm5wldh7xkn7mmwjmaphpa2k141kanfikp7q";
     };
     meta.homepage = "https://github.com/seblyng/roslyn.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13603,12 +13603,12 @@ final: prev: {
 
   rzls-nvim = buildVimPlugin {
     pname = "rzls.nvim";
-    version = "2025-07-20";
+    version = "2025-10-21";
     src = fetchFromGitHub {
       owner = "tris203";
       repo = "rzls.nvim";
-      rev = "1798c64830547d711b14dc2f3f47da15584d8aab";
-      sha256 = "1znmjcf6xd6b5mqggqj14h21gd5csal24h1y96hc168b7jaagyn8";
+      rev = "bbfe0f5429cc74ca53815875faf4710c2a54f01b";
+      sha256 = "0bgcpqcqx520fyhqzn9xqr1z4bpipw0wp2wbcwcw5y3gjsnc0dkp";
     };
     meta.homepage = "https://github.com/tris203/rzls.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13668,12 +13668,12 @@ final: prev: {
 
   schema-companion-nvim = buildVimPlugin {
     pname = "schema-companion.nvim";
-    version = "2025-10-14";
+    version = "2025-10-26";
     src = fetchFromGitHub {
       owner = "cenk1cenk2";
       repo = "schema-companion.nvim";
-      rev = "6317db88c58c3450dca1a63cef5942ce7e80940b";
-      sha256 = "1m2pc7jn35q4cjwssj18dbpp78gfdmqmkh6yblzxs4kj4a7f0k0i";
+      rev = "9a8cbeb9429958524331f49a4bd9c25cfbc2c208";
+      sha256 = "0r8cha1k800c694vbwswmy640f7f1bwrgs6wyiidhbgffpqmq5is";
     };
     meta.homepage = "https://github.com/cenk1cenk2/schema-companion.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13863,12 +13863,12 @@ final: prev: {
 
   sidekick-nvim = buildVimPlugin {
     pname = "sidekick.nvim";
-    version = "2025-10-20";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "sidekick.nvim";
-      rev = "9941a1cf4eb7ca1cb9c155207a4249ff45e6123d";
-      sha256 = "0f8zxzfq0q4lipkfc0dwbcsdnjhvmkz2frjw33bgpjf6ny73mcrc";
+      rev = "317ada137f2b34cccc872b68f0a29d987cbce438";
+      sha256 = "0bh948g2ggm6ic9n4b5m939hfxy8qw23i8mxywcricg673nvf7qr";
     };
     meta.homepage = "https://github.com/folke/sidekick.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13942,12 +13942,12 @@ final: prev: {
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2025-10-17";
+    version = "2025-10-24";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "9a2614505a021d8fcac3278b12e5fe3f14b80441";
-      sha256 = "0nsijjbjp0ka7srvqw7yajxsk4hj5zj13h6cbb3mpdd83k5p5bhn";
+      rev = "6c7c64b6e1be6eb95fd9583c0969e0df625c6cd6";
+      sha256 = "10bphggh0n9x81cc9yi33a2h0bb4vzxjmjkd7aw6l42sfgc1zvvd";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14007,12 +14007,12 @@ final: prev: {
 
   snacks-nvim = buildVimPlugin {
     pname = "snacks.nvim";
-    version = "2025-10-21";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "snacks.nvim";
-      rev = "d293b21fe1a603dfb4757feb82ab3e67b78589f2";
-      sha256 = "1qfjcx1d55b7lqikkhr326gs74h9lq9pdpadpd33wdjrbjgv0a09";
+      rev = "0bc7c2631a3bb35a20e0e5938401765bb9516496";
+      sha256 = "1avi0za8r7bfvadcsx71wsjchbxd8rparhjnk85s4p73wvindwrg";
     };
     meta.homepage = "https://github.com/folke/snacks.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14228,12 +14228,12 @@ final: prev: {
 
   splitjoin-vim = buildVimPlugin {
     pname = "splitjoin.vim";
-    version = "2025-09-04";
+    version = "2025-10-25";
     src = fetchFromGitHub {
       owner = "AndrewRadev";
       repo = "splitjoin.vim";
-      rev = "b55d5ba3e2b2649317925c21a68f90c8f28ec3e9";
-      sha256 = "1q49bb0l5c9pdcp64p1hxw5xj5hvc72q8l6shnn75556bsafcx4x";
+      rev = "cace6c962b67312fc1265d55337048e80d64ca90";
+      sha256 = "1p9lxglifb75lz2b0kgvj7ibd7901b8y4410v55mp0m9914armzy";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -14398,12 +14398,12 @@ final: prev: {
 
   styler-nvim = buildVimPlugin {
     pname = "styler.nvim";
-    version = "2025-10-08";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "styler.nvim";
-      rev = "aece087c9d4859bf30a5c1cd0a028593feff4b4a";
-      sha256 = "1j7rx2m56rrcb6q0vwvkqngj25flaa1d6h3s3jc9rrn9q2jqkjlk";
+      rev = "d73d868541a2536a96d057c793d53c50e5f407bb";
+      sha256 = "16b0kwnay6pbhfg0q32ylrr4xqzyfsvv88nxy0vbazsp4hmqfiv8";
     };
     meta.homepage = "https://github.com/folke/styler.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15495,12 +15495,12 @@ final: prev: {
 
   tiny-inline-diagnostic-nvim = buildVimPlugin {
     pname = "tiny-inline-diagnostic.nvim";
-    version = "2025-10-14";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "rachartier";
       repo = "tiny-inline-diagnostic.nvim";
-      rev = "1cb11cc658ee24a9826e3b909ca0b0f5e60597c7";
-      sha256 = "1bdps1x1ah1c8ahwqmivnkfy2g0m71mscjnymvmhzybx4bgfyg0f";
+      rev = "994c13daf8e75011af82edf30fb0fd90c019a898";
+      sha256 = "1cz0ggdpahy4rdckdik94dgj4i8zl8dz95y3yvw902qmqw377wwf";
     };
     meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15573,12 +15573,12 @@ final: prev: {
 
   todo-comments-nvim = buildVimPlugin {
     pname = "todo-comments.nvim";
-    version = "2025-10-08";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "todo-comments.nvim";
-      rev = "19d461ddd543e938eb22505fb03fa878800270b6";
-      sha256 = "1kpzji8al0dsxcilh3jkndxsfgnhm5nclw36hkgly5ksslnpg8s2";
+      rev = "411503d3bedeff88484de572f2509c248e499b38";
+      sha256 = "1cvijn65ashf7vlcl47b6f56gjkjdkxzag34w4lljg0q5bzyfkjl";
     };
     meta.homepage = "https://github.com/folke/todo-comments.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15613,12 +15613,12 @@ final: prev: {
 
   tokyonight-nvim = buildVimPlugin {
     pname = "tokyonight.nvim";
-    version = "2025-10-19";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "tokyonight.nvim";
-      rev = "e63c42a42b11cd6225f009dd949b9ee0fccc15ef";
-      sha256 = "0fc0xwzjszxkn1779jghakc0l01k2d6g13ld10wvjvz84sph0ax8";
+      rev = "2642dbb83333e0575d1c3436e1d837926871c5fb";
+      sha256 = "0835zvgf1k6xszc4rz5pyb5cz1cyf95vj1q17nx48zz95p4vk0bl";
     };
     meta.homepage = "https://github.com/folke/tokyonight.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15692,12 +15692,12 @@ final: prev: {
 
   treewalker-nvim = buildVimPlugin {
     pname = "treewalker.nvim";
-    version = "2025-10-03";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "aaronik";
       repo = "treewalker.nvim";
-      rev = "2f6fc4957bf428764863aa35f57549e9246a3943";
-      sha256 = "1d6pswhz8alq4x37fhc0bldibzqmn1w05ipigk7xrbmkn2zb4a9k";
+      rev = "5895593a4bccadd0a91988cbd3fe0908508e7451";
+      sha256 = "0zwhivajzwf83n76zbpihy69qfpbxqy506m0z6m7cqgxj2yak9l7";
     };
     meta.homepage = "https://github.com/aaronik/treewalker.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15745,12 +15745,12 @@ final: prev: {
 
   trouble-nvim = buildVimPlugin {
     pname = "trouble.nvim";
-    version = "2025-10-08";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "trouble.nvim";
-      rev = "c098362fe603d3922095e7db595961e020bdf2d0";
-      sha256 = "1v4dx3ilmiwvspdwlfl7ia0zml8y0cb9jqlq5yzl6w3068b4m2di";
+      rev = "d7494d8bc563f8ae8b3f35d78c7478cf842b0ab9";
+      sha256 = "1m5gv12dskjcd8y8dlrz3678dp51f0qdkv0yz10wlnryqm8sk8c2";
     };
     meta.homepage = "https://github.com/folke/trouble.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15797,12 +15797,12 @@ final: prev: {
 
   ts-comments-nvim = buildVimPlugin {
     pname = "ts-comments.nvim";
-    version = "2025-10-08";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "ts-comments.nvim";
-      rev = "217ab9cc137fceb6659b53790bd25e608219abe1";
-      sha256 = "1ds48xh1lsyixlhf5a9mjlg8zqs03c1chgsjh063q6a1w4rlg9mb";
+      rev = "123a9fb12e7229342f807ec9e6de478b1102b041";
+      sha256 = "1819dm9grjz6v6y6b80bxdl24q16hrnk1psnlypsldf0j5gbf4ir";
     };
     meta.homepage = "https://github.com/folke/ts-comments.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15862,12 +15862,12 @@ final: prev: {
 
   twilight-nvim = buildVimPlugin {
     pname = "twilight.nvim";
-    version = "2025-10-08";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "twilight.nvim";
-      rev = "c2650ddf665df997e4c7f57d7ef0e7352d4678a7";
-      sha256 = "0ka59109zp5aikcc20n7s6dnmn64a2dx62pp320q3a8x3l39lq5p";
+      rev = "664e752f4a219801265cc3fc18782b457b58c1e1";
+      sha256 = "02mriiwfzlxparrjc742vcqcf5kb1qy6ljf4c2k7xgd1yk1cb82p";
     };
     meta.homepage = "https://github.com/folke/twilight.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15927,11 +15927,11 @@ final: prev: {
 
   typst-preview-nvim = buildVimPlugin {
     pname = "typst-preview.nvim";
-    version = "2025-10-19";
+    version = "2025-10-29";
     src = fetchFromGitHub {
       owner = "chomosuke";
       repo = "typst-preview.nvim";
-      rev = "e544812bba84b4f7976590f2b6c0dfbd099e1893";
+      rev = "64469f832c4d214683c12e0fceba98055cb1ce3b";
       sha256 = "13340nd2rvvh3s9nyrg0kp72pxy6dpsh6nbh3zpqd7simlz1ys44";
     };
     meta.homepage = "https://github.com/chomosuke/typst-preview.nvim/";
@@ -15940,12 +15940,12 @@ final: prev: {
 
   typst-vim = buildVimPlugin {
     pname = "typst.vim";
-    version = "2025-04-27";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "kaarmu";
       repo = "typst.vim";
-      rev = "323539709e29a537ff39dfce6c05f175a8921504";
-      sha256 = "0di84i53g1azxr02jlfm9kzzg0fg1dprxn2llrm9in4wglxf9yix";
+      rev = "235e0423ab8b1ec83a29d8b1a45cfbd6c0296382";
+      sha256 = "0ydyx24d58zxr4gcsgm6750jyvx7nifb1w1sqwddz93n9a36fmnq";
     };
     meta.homepage = "https://github.com/kaarmu/typst.vim/";
     meta.hydraPlatforms = [ ];
@@ -15966,12 +15966,12 @@ final: prev: {
 
   ultimate-autopair-nvim = buildVimPlugin {
     pname = "ultimate-autopair.nvim";
-    version = "2025-10-20";
+    version = "2025-10-21";
     src = fetchFromGitHub {
       owner = "altermo";
       repo = "ultimate-autopair.nvim";
-      rev = "06e94d532bde24b1975d5f2e47a72760efbb4e55";
-      sha256 = "0gja5agabzw7kffjh3fp9l7sj12qi2mdkg8n0m83gmhcpgv1zxh5";
+      rev = "6a51446c2c8f09a7c207d2dc2aaa5bbbda36e093";
+      sha256 = "05m9nz0gzk2cwik4ax8bhffgnv8xjvssfi4kimvwc3aghijr5z0h";
     };
     meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/";
     meta.hydraPlatforms = [ ];
@@ -16057,12 +16057,12 @@ final: prev: {
 
   unison = buildVimPlugin {
     pname = "unison";
-    version = "2025-10-17";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "unisonweb";
       repo = "unison";
-      rev = "be859728cbdbf7138c8536df418a475be4179a3d";
-      sha256 = "0d10kabrf8pkzrn7b1p132d9hlxw5crychz77gs20yr4lhgw6jd6";
+      rev = "ba185505e1f7d61961c0c23966f692306f31d460";
+      sha256 = "0b1xlb2b4n24ykx3p6i3x4kw1lzdgg2bb4l283mf4qqc1zyavv9l";
     };
     meta.homepage = "https://github.com/unisonweb/unison/";
     meta.hydraPlatforms = [ ];
@@ -16083,12 +16083,12 @@ final: prev: {
 
   url-open = buildVimPlugin {
     pname = "url-open";
-    version = "2024-02-03";
+    version = "2025-10-29";
     src = fetchFromGitHub {
       owner = "sontungexpt";
       repo = "url-open";
-      rev = "9f8f4a56ac709f26aa17d8ef921b272bf2262a30";
-      sha256 = "0caphlqkvz8labx54ap7nasvyx5kgsnp49zw98cvrd43hn60mrsa";
+      rev = "dce2a9bc51e4885ea80ca03da5b4d0f719aaf820";
+      sha256 = "002560m8yhx87rlalssjlrhs9w0yx1rijim7kq59kr5jk12gcsrm";
     };
     meta.homepage = "https://github.com/sontungexpt/url-open/";
     meta.hydraPlatforms = [ ];
@@ -16161,12 +16161,12 @@ final: prev: {
 
   vague-nvim = buildVimPlugin {
     pname = "vague.nvim";
-    version = "2025-10-20";
+    version = "2025-10-24";
     src = fetchFromGitHub {
       owner = "vague-theme";
       repo = "vague.nvim";
-      rev = "ac4ecdaa7c82ec806bfa6bfdf6ca71f44af51dc7";
-      sha256 = "1m9qs7xp4wlmz5bhq7zi9y9nm7k9wbpfbd220842ga5ah2iwb1z6";
+      rev = "5689afda42d60c8db12ff93dd6e1322f59e46a93";
+      sha256 = "10qvvsxa5v3g1891wgjg6ga63a4gjis38vga0fd4gv2va6j0wn8i";
     };
     meta.homepage = "https://github.com/vague-theme/vague.nvim/";
     meta.hydraPlatforms = [ ];
@@ -16187,12 +16187,12 @@ final: prev: {
 
   venv-selector-nvim = buildVimPlugin {
     pname = "venv-selector.nvim";
-    version = "2025-10-21";
+    version = "2025-10-27";
     src = fetchFromGitHub {
       owner = "linux-cultist";
       repo = "venv-selector.nvim";
-      rev = "9d528643ab17795c69dc42ce018120c397a36f8b";
-      sha256 = "03jag019p5kfwghff0f1w0xk3sfkpza71pprpm7gnwxi49y77pvi";
+      rev = "567dcd6cc555caf5163c99ca2ba6a86c661393e5";
+      sha256 = "11xxidmjwbpcq6apwzc7bqxdxyb1d596lfvczzh9j5q1y0jjbpig";
     };
     meta.homepage = "https://github.com/linux-cultist/venv-selector.nvim/";
     meta.hydraPlatforms = [ ];
@@ -18007,12 +18007,12 @@ final: prev: {
 
   vim-floaterm = buildVimPlugin {
     pname = "vim-floaterm";
-    version = "2025-06-25";
+    version = "2025-10-26";
     src = fetchFromGitHub {
       owner = "voldikss";
       repo = "vim-floaterm";
-      rev = "fd4bdd66eca56c6cc59f2119e4447496d8cde2ea";
-      sha256 = "1blbvnip3z25dp3mn5mzgcz96bbw6dqpa1myiih4bppgilvr77gw";
+      rev = "a720490bd9dc02c5492e800aa08d4802f22b01f8";
+      sha256 = "0im1nf4pnrldzrycrx12nv5qzas7i01m7iizmq6yqlxpnrqrjw4c";
     };
     meta.homepage = "https://github.com/voldikss/vim-floaterm/";
     meta.hydraPlatforms = [ ];
@@ -18384,12 +18384,12 @@ final: prev: {
 
   vim-habamax = buildVimPlugin {
     pname = "vim-habamax";
-    version = "2025-10-14";
+    version = "2025-10-22";
     src = fetchFromGitHub {
       owner = "habamax";
       repo = "vim-habamax";
-      rev = "df3c672b244c5d3a7edeca11beba57a05e0936a8";
-      sha256 = "0yrv378qizar8y31yhh8jvig8wrvx31a25wwk3yh7ihk9mwi4k0g";
+      rev = "4d4192f17a15905ef2b0eca3c4bb5c93454cc6a8";
+      sha256 = "05zmqc505r73l7k28g01fjagzysqbicxlyhchzjqsmj8iwrsdsnn";
     };
     meta.homepage = "https://github.com/habamax/vim-habamax/";
     meta.hydraPlatforms = [ ];
@@ -18997,12 +18997,12 @@ final: prev: {
 
   vim-just = buildVimPlugin {
     pname = "vim-just";
-    version = "2025-10-03";
+    version = "2025-10-21";
     src = fetchFromGitHub {
       owner = "NoahTheDuke";
       repo = "vim-just";
-      rev = "3deeee5998408ce5a0ff3959a0e6b4bce530c37e";
-      sha256 = "0h8xpnn3d45ny7jys8yivcss8qsmv7p704rd25ag4l4nbw7ivv7m";
+      rev = "c13e317dda76ea01c2521cbed2a5c552a96951bd";
+      sha256 = "0c3ywicf0c4z2r633flz9is73008phzcfs5bp2iv3gk6cr7i51m1";
     };
     meta.homepage = "https://github.com/NoahTheDuke/vim-just/";
     meta.hydraPlatforms = [ ];
@@ -19101,12 +19101,12 @@ final: prev: {
 
   vim-ledger = buildVimPlugin {
     pname = "vim-ledger";
-    version = "2025-10-14";
+    version = "2025-10-25";
     src = fetchFromGitHub {
       owner = "ledger";
       repo = "vim-ledger";
-      rev = "b5bc6ab65d325c53e39fb02d8f0dd42e2de5d72d";
-      sha256 = "1s7186sdqslzv8ayqdiskbghfshk2id3axzj813l2krrfav6f4yk";
+      rev = "225969f63ddaa6104fd4234d6bc17dd37deea567";
+      sha256 = "1fqv9cg769cysblfbgr3kpiz4ggxsr20s07kr671sxz9hz2srfy1";
     };
     meta.homepage = "https://github.com/ledger/vim-ledger/";
     meta.hydraPlatforms = [ ];
@@ -19283,12 +19283,12 @@ final: prev: {
 
   vim-lsp-settings = buildVimPlugin {
     pname = "vim-lsp-settings";
-    version = "2025-10-18";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "vim-lsp-settings";
-      rev = "a54b96b92b37d6f585bfa1a49d513c9203cd4a44";
-      sha256 = "1bjl3nb2bv94xxil01m5ip83kphyw53wcbiyg01cfyj8h9k1kry6";
+      rev = "fadc9609d2ccbf4ad6c70ab963e64176712d89f1";
+      sha256 = "07hjjbgdvark1v9vmgm7f6lf8d5bd1y02sg4djpgsvz9bpzga9nn";
     };
     meta.homepage = "https://github.com/mattn/vim-lsp-settings/";
     meta.hydraPlatforms = [ ];
@@ -19374,12 +19374,12 @@ final: prev: {
 
   vim-markdown = buildVimPlugin {
     pname = "vim-markdown";
-    version = "2024-09-20";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "vim-markdown";
-      rev = "8f6cb3a6ca4e3b6bcda0730145a0b700f3481b51";
-      sha256 = "14x6jfla4921jyx4xxqng9vzmb0iaj2nn7wckhmlx8jpks6r4834";
+      rev = "1bc9d0cd8e1cc3e901b0a49c2b50a843f1c89397";
+      sha256 = "1g7fjnnmwkic6q7d12vb500yn4v21ifjwd6n45iva5xy5d250ibf";
     };
     meta.homepage = "https://github.com/preservim/vim-markdown/";
     meta.hydraPlatforms = [ ];
@@ -19543,12 +19543,12 @@ final: prev: {
 
   vim-moonfly-colors = buildVimPlugin {
     pname = "vim-moonfly-colors";
-    version = "2025-10-11";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "bluz71";
       repo = "vim-moonfly-colors";
-      rev = "8129169a07cb64fef644f73c3fd27db2e50e818a";
-      sha256 = "0fmhi9xih3imgavxrda9znl6wm3h9y94mf8nm4nfxvmd9cc5va8l";
+      rev = "ef85b89739bee184e204c89bc06280d62bd84039";
+      sha256 = "1jgyn9pg0ikvf92nva8irybnnxgca1bsqvqczgbhicc2b251wvjm";
     };
     meta.homepage = "https://github.com/bluz71/vim-moonfly-colors/";
     meta.hydraPlatforms = [ ];
@@ -20648,12 +20648,12 @@ final: prev: {
 
   vim-sexp = buildVimPlugin {
     pname = "vim-sexp";
-    version = "2025-10-19";
+    version = "2025-10-26";
     src = fetchFromGitHub {
       owner = "guns";
       repo = "vim-sexp";
-      rev = "b5be9fa60bde76fcc8d87b2e5f247d70ee867279";
-      sha256 = "1400h7m7yc5ri41ni6wfljz9wmp4x7nzv6sk2hj6xdwiydrikajf";
+      rev = "d8df22690b146ce07fdaf49940e3214def76a69c";
+      sha256 = "19g7jymp3qmh9mx1kpj9yksykm4lhrsdpbvkzpw4sfhhw2mzxk4c";
     };
     meta.homepage = "https://github.com/guns/vim-sexp/";
     meta.hydraPlatforms = [ ];
@@ -20882,12 +20882,12 @@ final: prev: {
 
   vim-snippets = buildVimPlugin {
     pname = "vim-snippets";
-    version = "2025-09-04";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "honza";
       repo = "vim-snippets";
-      rev = "f371d635f6f6350d34bbb483e37e383db322d145";
-      sha256 = "1jwqxjf9553hi41ynaw8xgffhz9gbkxkxcnhcbkzr179054kvz8x";
+      rev = "ededcf7581962ee616cadab360d5966f3307f11a";
+      sha256 = "1l9j1hs4r2pq9n4s5mysyfbrssrbsv3hclfjiwylci6vpb5jrmza";
     };
     meta.homepage = "https://github.com/honza/vim-snippets/";
     meta.hydraPlatforms = [ ];
@@ -20947,12 +20947,12 @@ final: prev: {
 
   vim-spirv = buildVimPlugin {
     pname = "vim-spirv";
-    version = "2025-10-11";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "kbenzie";
       repo = "vim-spirv";
-      rev = "72ab51ebaf2fb09bd8e8f06dbceea360eda1b6e2";
-      sha256 = "019dqi5j55appij3hajy58ykim832b2x1k3spxy5fj1lim6664gd";
+      rev = "449ad78bdbb5d860a53988e0ca29c6d7912fa070";
+      sha256 = "0zwl80y68aki3zky2j2sw785hfw5d4i25vg5a3nlp8s62k2s6ykf";
     };
     meta.homepage = "https://github.com/kbenzie/vim-spirv/";
     meta.hydraPlatforms = [ ];
@@ -21064,12 +21064,12 @@ final: prev: {
 
   vim-suda = buildVimPlugin {
     pname = "vim-suda";
-    version = "2024-12-08";
+    version = "2025-10-29";
     src = fetchFromGitHub {
       owner = "lambdalisue";
       repo = "vim-suda";
-      rev = "9adda7d195222d4e2854efb2a88005a120296c47";
-      sha256 = "1fg892y34zabvivs0h9afdbsh1vp0s590lfxaq5jaf0xn3g35az3";
+      rev = "c492741b4679b3cdd4d9e34138209784e061d916";
+      sha256 = "1rddfpvlvb6873id8dpvxkf2d2r67i8zfzsn1k1z1d44v741vjn9";
     };
     meta.homepage = "https://github.com/lambdalisue/vim-suda/";
     meta.hydraPlatforms = [ ];
@@ -21923,12 +21923,12 @@ final: prev: {
 
   vimade = buildVimPlugin {
     pname = "vimade";
-    version = "2025-10-20";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "TaDaa";
       repo = "vimade";
-      rev = "ea27ed8da1f8be245d58d27ea5d89662a43b7e94";
-      sha256 = "1j828z0vng9adz1v495bikpy5jgsxshkhjyb5hmw8zzjf5j9360m";
+      rev = "27279c2fccc3c490cc6ca31c28bb0f6d84089eb4";
+      sha256 = "0dplck7xfaxxgfphk1w9xfys04bsfijpbwxwm2cdkb48ihiva3g1";
     };
     meta.homepage = "https://github.com/TaDaa/vimade/";
     meta.hydraPlatforms = [ ];
@@ -22067,12 +22067,12 @@ final: prev: {
 
   vimux = buildVimPlugin {
     pname = "vimux";
-    version = "2025-07-23";
+    version = "2025-10-26";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "vimux";
-      rev = "04f299e53eb81883da0edea6a57018067f3b4938";
-      sha256 = "191z46bcgg9ajqbw2g34mvismqfi4gb94k35isp9dn4322lkhgk6";
+      rev = "66d53eab51aa7d2c0f55f3ee2e381b923e705e37";
+      sha256 = "0kjr181j55f5wy468w6h2nyvvpq13aqf06vm2vsfvnwwzycgmsfq";
     };
     meta.homepage = "https://github.com/preservim/vimux/";
     meta.hydraPlatforms = [ ];
@@ -22171,12 +22171,12 @@ final: prev: {
 
   vs-tasks-nvim = buildVimPlugin {
     pname = "vs-tasks.nvim";
-    version = "2025-10-15";
+    version = "2025-10-27";
     src = fetchFromGitHub {
       owner = "EthanJWright";
       repo = "vs-tasks.nvim";
-      rev = "99d8e41c18d188efcc04fcec19caa2c29999bb90";
-      sha256 = "0by5767n3jzz3z07a21qyhmvas1wqvig4gz1b3mrhdl9fi1bdr1x";
+      rev = "1dafea1a206590644d04a71159cd4f7651b6fb8e";
+      sha256 = "1c7kb5hx46f9g87iryjjpbcif1al96dlh0am1k7zzddd5hyjyq1l";
     };
     meta.homepage = "https://github.com/EthanJWright/vs-tasks.nvim/";
     meta.hydraPlatforms = [ ];
@@ -22249,12 +22249,12 @@ final: prev: {
 
   which-key-nvim = buildVimPlugin {
     pname = "which-key.nvim";
-    version = "2025-10-08";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "which-key.nvim";
-      rev = "b4177e3eaf15fe5eb8357ebac2286d488be1ed00";
-      sha256 = "05g22fvbi7yhjnq16cszryc1aqs68v9mcrwgaa9xz0glj9bpwz9p";
+      rev = "3aab2147e74890957785941f0c1ad87d0a44c15a";
+      sha256 = "1dwri7gxqgb58pfy829s0ns709m0nrcj1cgz2wj1k09qfffri9mc";
     };
     meta.homepage = "https://github.com/folke/which-key.nvim/";
     meta.hydraPlatforms = [ ];
@@ -22301,12 +22301,12 @@ final: prev: {
 
   wiki-vim = buildVimPlugin {
     pname = "wiki.vim";
-    version = "2025-09-20";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "lervag";
       repo = "wiki.vim";
-      rev = "75a491775b498e5eac1de9c440b67942bdeab2a6";
-      sha256 = "1l4p93j5zi43n3i480pzx1s2p0w5yibvkihmliq4y3dqq0llw6f0";
+      rev = "44b8a6cc97bcb1e647c20874334a28460de71d45";
+      sha256 = "0kkjlwqgjvrngmq6vi0ms18yy1naxvvk1lqgzk5vmkpx43a9rda6";
     };
     meta.homepage = "https://github.com/lervag/wiki.vim/";
     meta.hydraPlatforms = [ ];
@@ -22483,12 +22483,12 @@ final: prev: {
 
   wtf-nvim = buildVimPlugin {
     pname = "wtf.nvim";
-    version = "2025-09-22";
+    version = "2025-10-24";
     src = fetchFromGitHub {
       owner = "piersolenski";
       repo = "wtf.nvim";
-      rev = "62437210d1da5a4343a74ab859b59c8ba0d682a2";
-      sha256 = "0cr28yw7zg568qig3b0fpavrj15f3rx7vxihbkbd29x98f0xlpx3";
+      rev = "0c53ebe0d8b74dc6c70632b3703eada3b74708ab";
+      sha256 = "18bigy34qijb4q44lw0wq81p3k9ac5w29sm2f8686pdzsblh1q7j";
     };
     meta.homepage = "https://github.com/piersolenski/wtf.nvim/";
     meta.hydraPlatforms = [ ];
@@ -22496,12 +22496,12 @@ final: prev: {
 
   xeno-nvim = buildVimPlugin {
     pname = "xeno.nvim";
-    version = "2025-08-27";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "kyza0d";
       repo = "xeno.nvim";
-      rev = "4a1d3946b5c3b9b581e76a84746a06b0977b1fed";
-      sha256 = "1lbj321vz1gzgy4wdmzca74hrwzizy2i0645bqix0id4q3zm7lfd";
+      rev = "f70c22447c7d954973f35c10dd9e9942cd7fb2eb";
+      sha256 = "13z0lq26g9yhzplsn3nm1prbvcgks1vjpz7q28m1hkkip6b9qcfd";
     };
     meta.homepage = "https://github.com/kyza0d/xeno.nvim/";
     meta.hydraPlatforms = [ ];
@@ -22601,12 +22601,12 @@ final: prev: {
 
   yazi-nvim = buildVimPlugin {
     pname = "yazi.nvim";
-    version = "2025-10-20";
+    version = "2025-10-30";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "yazi.nvim";
-      rev = "47e83f06a06ab319fc92168553cbdafbbac3fe84";
-      sha256 = "0b05kv4f9xdps711n4pygf5vy937264j5aql31f2jl8g6jm80y7x";
+      rev = "f710a9ebfa9aa6fdac9ee1bc636f8f92030c745c";
+      sha256 = "0nrj069f2sqkfdh02b0r2hwady6xnz9x064h8mci2mb0008mqkv4";
     };
     meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
     meta.hydraPlatforms = [ ];
@@ -22692,12 +22692,12 @@ final: prev: {
 
   zen-mode-nvim = buildVimPlugin {
     pname = "zen-mode.nvim";
-    version = "2025-10-08";
+    version = "2025-10-28";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "zen-mode.nvim";
-      rev = "438a59c33763d79e34ceb394e012c3bfd6aa1084";
-      sha256 = "07h4a9ncnz2x4z8f46dvc60crylhpglh962axyz8j7kggsda9c2f";
+      rev = "8564ce6d29ec7554eb9df578efa882d33b3c23a7";
+      sha256 = "0kjiakg4w869j8pxjgzn0h9wi0wv40hzm6mc3igli7nv7ngp44mx";
     };
     meta.homepage = "https://github.com/folke/zen-mode.nvim/";
     meta.hydraPlatforms = [ ];
@@ -22783,12 +22783,12 @@ final: prev: {
 
   zotcite = buildVimPlugin {
     pname = "zotcite";
-    version = "2025-10-14";
+    version = "2025-10-23";
     src = fetchFromGitHub {
       owner = "jalvesaq";
       repo = "zotcite";
-      rev = "2b30ba09bc05d52c0c7dcf486e14d43c824b5f7c";
-      sha256 = "121rcg763ibjpl1zyzd678n50z9c8z4wps9hywnbwq1bdkxjn5cx";
+      rev = "b4f5b0832311aa3b6ba624275d389ce8070f7aa6";
+      sha256 = "05qyjmyvgqnr3qm5il4h85xapaf7ya8739sxbrgyx00gzjkrxzcx";
     };
     meta.homepage = "https://github.com/jalvesaq/zotcite/";
     meta.hydraPlatforms = [ ];
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index da7e0ec094e0..2691a6020e82 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -3190,6 +3190,7 @@ assertNoAdditions {
       "snacks.dashboard"
       "snacks.debug"
       "snacks.dim"
+      "snacks.explorer.init"
       "snacks.git"
       "snacks.image.convert"
       "snacks.image.image"
@@ -4090,8 +4091,9 @@ assertNoAdditions {
 
   wiki-vim = super.wiki-vim.overrideAttrs {
     checkInputs = [
-      # Optional telescope integration
+      # Optional picker integration
       self.telescope-nvim
+      self.fzf-lua
     ];
   };
 

From 3eebda314bc1d92d30b3c35de5dcfa51245d95a3 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Oct 2025 22:33:20 -0500
Subject: [PATCH 4274/6226] vimPlugins.nvim-treesitter: update grammars

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../vim/plugins/nvim-treesitter/generated.nix | 59 +++++++++----------
 1 file changed, 29 insertions(+), 30 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index 4ba366e7b8b6..c2dd5c50f55f 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -242,12 +242,12 @@
   };
   c3 = buildGrammar {
     language = "c3";
-    version = "0.0.0+rev=057a75d";
+    version = "0.0.0+rev=e457069";
     src = fetchFromGitHub {
       owner = "c3lang";
       repo = "tree-sitter-c3";
-      rev = "057a75df0c866034d8edce989f701ee2cb0481d8";
-      hash = "sha256-MeeyiX9ZozGDbTNbO/Tvs97tQyzic5pu2sIPgXow2ok=";
+      rev = "e4570693b8064a83cd7826795d5ef29400313d3c";
+      hash = "sha256-gzlLKP/BE5sNM8tJ7ObKQNvd36CqWipFWhMkb4XqjjU=";
     };
     meta.homepage = "https://github.com/c3lang/tree-sitter-c3";
   };
@@ -518,14 +518,14 @@
   };
   diff = buildGrammar {
     language = "diff";
-    version = "0.0.0+rev=e42b8de";
+    version = "0.0.0+rev=2520c3f";
     src = fetchFromGitHub {
-      owner = "the-mikedavis";
+      owner = "tree-sitter-grammars";
       repo = "tree-sitter-diff";
-      rev = "e42b8def4f75633568f1aecfe01817bf15164928";
-      hash = "sha256-1ibGin1e6+geAQNoV/KLCBOoXYcZo7S5+Q2XgsZPIfU=";
+      rev = "2520c3f934b3179bb540d23e0ef45f75304b5fed";
+      hash = "sha256-8rYLNGgoZSvvfqO2++nAgFKmvbkKJ3m+9B8bTXp6Us4=";
     };
-    meta.homepage = "https://github.com/the-mikedavis/tree-sitter-diff";
+    meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-diff";
   };
   disassembly = buildGrammar {
     language = "disassembly";
@@ -562,12 +562,12 @@
   };
   dot = buildGrammar {
     language = "dot";
-    version = "0.0.0+rev=71e2c52";
+    version = "0.0.0+rev=80327ab";
     src = fetchFromGitHub {
       owner = "rydesun";
       repo = "tree-sitter-dot";
-      rev = "71e2c5241eef9de920a4efedfefd1d527dd9a118";
-      hash = "sha256-Z1XtNX1zV8xGlsaFbqh2VXPAx0fs4D7JxwqaEWSWcB0=";
+      rev = "80327abbba6f47530edeb0df9f11bd5d5c93c14d";
+      hash = "sha256-sepmaKnpbj/bgMBa06ksQFOMPtcCqGaINiJqFBJN/0Y=";
     };
     meta.homepage = "https://github.com/rydesun/tree-sitter-dot";
   };
@@ -1082,12 +1082,12 @@
   };
   gomod = buildGrammar {
     language = "gomod";
-    version = "0.0.0+rev=6efb596";
+    version = "0.0.0+rev=2e88687";
     src = fetchFromGitHub {
       owner = "camdencheek";
       repo = "tree-sitter-go-mod";
-      rev = "6efb59652d30e0e9cd5f3b3a669afd6f1a926d3c";
-      hash = "sha256-KD6Fio9qie3wbGAvQaYsMdYOK1QjnRrGExt1oL/6mis=";
+      rev = "2e886870578eeba1927a2dc4bd2e2b3f598c5f9a";
+      hash = "sha256-OfhV3lxdyIhA3XZYbafEtdOsQsTCSSCBrN3WbzSVg0g=";
     };
     meta.homepage = "https://github.com/camdencheek/tree-sitter-go-mod";
   };
@@ -1369,23 +1369,23 @@
   };
   hyprlang = buildGrammar {
     language = "hyprlang";
-    version = "0.0.0+rev=d626ec0";
+    version = "0.0.0+rev=b23e85d";
     src = fetchFromGitHub {
       owner = "tree-sitter-grammars";
       repo = "tree-sitter-hyprlang";
-      rev = "d626ec06e4d876fc41200a30b3e6f2b4714c7367";
-      hash = "sha256-f8CjiLd2tof+zfr7ze/CxZWtKRqQv8sK9Q21ZxEg6C8=";
+      rev = "b23e85dded5d150ffee0ac83c01cbeb1520aad2f";
+      hash = "sha256-COIl7ngqTzQQBxgmRNCwF8x7OHNGCrUa5G/hPrlXsmw=";
     };
     meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hyprlang";
   };
   idl = buildGrammar {
     language = "idl";
-    version = "0.0.0+rev=3632e92";
+    version = "0.0.0+rev=86d434e";
     src = fetchFromGitHub {
       owner = "cathaysia";
       repo = "tree-sitter-idl";
-      rev = "3632e926ef4ba924b05993683111480af0d5c9e3";
-      hash = "sha256-fywOjqJ0yrG/QayyBXdc2iOtaytdc9bqd1leQ8kxR/0=";
+      rev = "86d434e732f971ecec24571e0dcb6b14c8b19952";
+      hash = "sha256-u+2KBpk9ctry5cHlvqarYS8l5ERFlWrs9D09u2C6cvI=";
     };
     meta.homepage = "https://github.com/cathaysia/tree-sitter-idl";
   };
@@ -1624,12 +1624,12 @@
   };
   kitty = buildGrammar {
     language = "kitty";
-    version = "0.0.0+rev=064d1b4";
+    version = "0.0.0+rev=2e9b602";
     src = fetchFromGitHub {
       owner = "OXY2DEV";
       repo = "tree-sitter-kitty";
-      rev = "064d1b4d8ae1b93244de0ff6bc9f0ee0cffee3b5";
-      hash = "sha256-DN6SWXZM1HedUtV7mDEEgictaI2V/pQHh5cg906qfO0=";
+      rev = "2e9b602ca676cac63887cca5a4535106f3475c82";
+      hash = "sha256-9knYf4/0G8zX2grWJi6U/1TQmUWQCjdMK3Vd/fw93C0=";
     };
     meta.homepage = "https://github.com/OXY2DEV/tree-sitter-kitty";
   };
@@ -1891,12 +1891,12 @@
   };
   mlir = buildGrammar {
     language = "mlir";
-    version = "0.0.0+rev=47c3f2c";
+    version = "0.0.0+rev=6543579";
     src = fetchFromGitHub {
       owner = "artagnon";
       repo = "tree-sitter-mlir";
-      rev = "47c3f2cf3b10016503f2577c2d99c15bb2053402";
-      hash = "sha256-1NmkSEGh6Y9BIGcdW4HrMNdqlKKfVHgcY1Amk4EKf8U=";
+      rev = "65435795eb4132d5eff66d62347050e863e5ebe5";
+      hash = "sha256-s7oNzU7rTjejwgW9F28GayuxEe/Gn51+yQi7iPqgFfw=";
     };
     generate = true;
     meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -2692,14 +2692,13 @@
   };
   scfg = buildGrammar {
     language = "scfg";
-    version = "0.0.0+rev=2f3709e";
+    version = "0.0.0+rev=d850fd4";
     src = fetchFromGitHub {
       owner = "rockorager";
       repo = "tree-sitter-scfg";
-      rev = "2f3709e7656fa2c443f92041c91a9f843f8cd625";
-      hash = "sha256-2/n+pSR6Ojahm8iBnpNsQscrXQqzZflKBA42gX29u50=";
+      rev = "d850fd470445d73de318a21d734d1e09e29b773c";
+      hash = "sha256-AnyOcQFA3N6AFZiG7eLS1xCm1qX6hko9lFV4oV9p/E8=";
     };
-    generate = true;
     meta.homepage = "https://github.com/rockorager/tree-sitter-scfg";
   };
   scheme = buildGrammar {

From e8bf12601d57875c1b598672307b30463b17f3e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 03:55:56 +0000
Subject: [PATCH 4275/6226] sydbox: 3.41.0 -> 3.41.4

---
 pkgs/by-name/sy/sydbox/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sy/sydbox/package.nix b/pkgs/by-name/sy/sydbox/package.nix
index d848b16bb536..2ae0939f2706 100644
--- a/pkgs/by-name/sy/sydbox/package.nix
+++ b/pkgs/by-name/sy/sydbox/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sydbox";
-  version = "3.41.0";
+  version = "3.41.4";
 
   outputs = [
     "out"
@@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "Sydbox";
     repo = "sydbox";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Qb7BYBMHKb+hCLNADOgBL8r/YeTiw9Rmy0pTV/jk93o=";
+    hash = "sha256-RILehKm5DzhCLfhGRUuoXYmrpO/b5TSTnzrVNvhSNrg=";
   };
 
-  cargoHash = "sha256-dx/AP5CiKz6asfYPEmjo+7ZELMyyxaEHZ5virL68IB4=";
+  cargoHash = "sha256-t9p4RDQnz/C5TLgbDug3vnod+osY7oEPtW+dNzz9pEE=";
 
   nativeBuildInputs = [
     mandoc

From 4f068078fd10c50cdf2602dbbc97b2a6bc540203 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 04:05:42 +0000
Subject: [PATCH 4276/6226] gate: 0.57.1 -> 0.58.0

---
 pkgs/by-name/ga/gate/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ga/gate/package.nix b/pkgs/by-name/ga/gate/package.nix
index 91fa29ed0e8c..3fcb498b34d3 100644
--- a/pkgs/by-name/ga/gate/package.nix
+++ b/pkgs/by-name/ga/gate/package.nix
@@ -6,7 +6,7 @@
 
 let
   pname = "gate";
-  version = "0.57.1";
+  version = "0.58.0";
 in
 buildGoModule {
   inherit pname version;
@@ -15,7 +15,7 @@ buildGoModule {
     owner = "minekube";
     repo = "gate";
     tag = "v${version}";
-    hash = "sha256-G4kmXGiogl/W6SYVWZyQsQE+6YO5Yggk8K4rH+t9znE=";
+    hash = "sha256-1E6Ge3c+LQpDlyy5Jtyw21VFuKqyF4XVpxF41qOjk+w=";
   };
 
   vendorHash = "sha256-2ZRfvjIGUznHjn7KA20uzEpVbI7EByNUYu6xALJEUfo=";

From 31bcb0b49387ba8ce7f4424e8d9aff7a7cf44378 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Oct 2025 23:09:22 -0500
Subject: [PATCH 4277/6226] luaPackages: update on 2025-10-31

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../lua-modules/generated-packages.nix        | 74 +++++++++----------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 13e4c3c6508d..2db7cd6f67bb 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -651,17 +651,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "fennel";
-      version = "1.5.3-1";
+      version = "1.6.0-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/fennel-1.5.3-1.rockspec";
-          sha256 = "1nlibaa6zlik0c164z4c57yy3zizqx8q0wifql5x4ya3s0bn0d9r";
+          url = "mirror://luarocks/fennel-1.6.0-1.rockspec";
+          sha256 = "043nxxr69biy69avpmqx7dsingcpgq7zgihygfdb583aj0xfmry7";
         }).outPath;
       src = fetchFromGitHub {
         owner = "bakpakin";
         repo = "Fennel";
-        rev = "1.5.3";
-        hash = "sha256-7Tq6Vx032jxnfPmtsKiTBQ/yH8vHO8+wMoQHZSIevWY=";
+        rev = "1.6.0";
+        hash = "sha256-WzsQwYgFU0Jm8YeaLCcJ0TbqNJao72TBxnigj7jw8yU=";
       };
 
       disabled = luaOlder "5.1";
@@ -814,15 +814,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "fzf-lua";
-      version = "0.0.2277-1";
+      version = "0.0.2296-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/fzf-lua-0.0.2277-1.rockspec";
-          sha256 = "0nbr18w8wyksxr4rwaf62aw56pznlifb79gkirwqb5qn0a40fmi8";
+          url = "mirror://luarocks/fzf-lua-0.0.2296-1.rockspec";
+          sha256 = "1nlsfr036l09ry34pidnq8w2ihz4zn16bmzb8jn2nlrf7l8jibqn";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/ibhagwan/fzf-lua/archive/c102a4eeb10a04ed7e69ce80918923c4175c19d8.zip";
-        sha256 = "0lc4gnpcm917s5w3bi62j57nm17kqzyp1py6jc39kr1f5by7ydbi";
+        url = "https://github.com/ibhagwan/fzf-lua/archive/a8458b79a957a6e3e217d84106a0fd4b9470ff4c.zip";
+        sha256 = "0wswrbfjjyid1zgqmjcxkl7mljsmlayzkfnkpc3zy82ry8li0nis";
       };
 
       disabled = luaOlder "5.1";
@@ -2012,17 +2012,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "lua-resty-openssl";
-      version = "1.6.4-1";
+      version = "1.7.0-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/lua-resty-openssl-1.6.4-1.rockspec";
-          sha256 = "1i8hj91kj2wmpqxk9ahjfhdx6bbkv35f7d2f71nklgvg7wychn6x";
+          url = "mirror://luarocks/lua-resty-openssl-1.7.0-1.rockspec";
+          sha256 = "0p4i14ypbw39ap3dvxhfnnb221909z2lqlk16nbqx33brawydl64";
         }).outPath;
       src = fetchFromGitHub {
         owner = "fffonion";
         repo = "lua-resty-openssl";
-        rev = "1.6.4";
-        hash = "sha256-MO8opf8CgiB6/iESRugrg2OMAyERWJ4Sf5ccgWKJyKs=";
+        rev = "1.7.0";
+        hash = "sha256-xcEnic0aQCgzIlgU/Z6dxH7WTyTK+g5UKo4BiKcvNxQ=";
       };
 
       meta = {
@@ -3907,15 +3907,15 @@ final: prev: {
     { buildLuarocksPackage, fetchurl }:
     buildLuarocksPackage {
       pname = "mpack";
-      version = "1.0.12-0";
+      version = "1.0.13-0";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/mpack-1.0.12-0.rockspec";
-          sha256 = "01jr8vvkqdvadr5kpgsd17gjyz729hbd609qsm682ylggabgqsyy";
+          url = "mirror://luarocks/mpack-1.0.13-0.rockspec";
+          sha256 = "1lyjbmyj6yfv0bhyj50rpz2qm993zsbyw494j9kz4bcvxx0gqac5";
         }).outPath;
       src = fetchurl {
-        url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.12/libmpack-lua-1.0.12.tar.gz";
-        sha256 = "1gzqks9cq3krd9rs3dq9jm1m23pjpqjv9ymkxj9gbyjcy6qn5dh6";
+        url = "https://github.com/libmpack/libmpack-lua/releases/download/1.0.13/libmpack-lua-1.0.13.tar.gz";
+        sha256 = "1mwk54jnayw5wjclijyha24xq4sj0lyidb04zyndd9i0yr4anlnx";
       };
 
       meta = {
@@ -3980,15 +3980,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "neotest";
-      version = "5.13.0-1";
+      version = "5.13.1-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/neotest-5.13.0-1.rockspec";
-          sha256 = "05jajrfvlh6phn8dblwymb17j6zm3g8cmibdzyqgxfivqm748q03";
+          url = "mirror://luarocks/neotest-5.13.1-1.rockspec";
+          sha256 = "1c60i9vdakbafaij2ip3ki0m1jwd2c2adrq2i0gy3l796w03cf9n";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/nvim-neotest/neotest/archive/7166dc36af2760a76479e021e0521e23f62165f1.zip";
-        sha256 = "1mfdlns4y4dxf1im7rwcq264jqwm3814dlnf37c41yq13pc7fd13";
+        url = "https://github.com/nvim-neotest/neotest/archive/366175e1e74ff112787f9adbfb072eeaedd2a88e.zip";
+        sha256 = "0d3rlbpdqsj1wk9v6xs63w8pbnhk9nrxdp6kmc4mkj0nf71b3j9a";
       };
 
       disabled = luaOlder "5.1";
@@ -4081,8 +4081,8 @@ final: prev: {
       src = fetchFromGitHub {
         owner = "hrsh7th";
         repo = "nvim-cmp";
-        rev = "a7bcf1d88069fc67c9ace8a62ba480b8fe879025";
-        hash = "sha256-wkESSNUViVI5DE+3t4AVTaSLQ/hTB43vrm+PH6uA8H4=";
+        rev = "cf22c9e32512de3be1fd6b65fd25e3aabead4d8b";
+        hash = "sha256-ePRShNaOBYjsUBrGbNRXAzEs+JNG+LMjMm6Hu+QX1kE=";
       };
 
       disabled = luaOlder "5.1" || luaAtLeast "5.4";
@@ -4648,15 +4648,15 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "rustaceanvim";
-      version = "6.9.2-1";
+      version = "6.9.6-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/rustaceanvim-6.9.2-1.rockspec";
-          sha256 = "0smfa296h60xd88fv9xbhb9l6wxf4vmz3299spiac59r02kalkmr";
+          url = "mirror://luarocks/rustaceanvim-6.9.6-1.rockspec";
+          sha256 = "0azl1qrr7jgrczhgv39f2way8d8693kxid1psvv2zrzqyk5h81gm";
         }).outPath;
       src = fetchzip {
-        url = "https://github.com/mrcjkb/rustaceanvim/archive/v6.9.2.zip";
-        sha256 = "1bkg713a0y9mg86ra3wrn7j3h4wfgk54zzhb2sc6y0km66p136a2";
+        url = "https://github.com/mrcjkb/rustaceanvim/archive/v6.9.6.zip";
+        sha256 = "0n27nkjzr8hcy6yqx3zfxjrwc26imivnqlm28yxncpzvqvwivy4v";
       };
 
       disabled = luaOlder "5.1";
@@ -5066,17 +5066,17 @@ final: prev: {
     }:
     buildLuarocksPackage {
       pname = "tl";
-      version = "0.24.7-1";
+      version = "0.24.8-1";
       knownRockspec =
         (fetchurl {
-          url = "mirror://luarocks/tl-0.24.7-1.rockspec";
-          sha256 = "0c2xfrw2wasiy3g8b6fpqvlnzb0bp5l9s3pvi9ky1w4b6nbc81s7";
+          url = "mirror://luarocks/tl-0.24.8-1.rockspec";
+          sha256 = "1m60ydmp6mn6iczg2an20ivvgn5rrz6sn0mhpnld9img3khvj7sf";
         }).outPath;
       src = fetchFromGitHub {
         owner = "teal-language";
         repo = "tl";
-        rev = "v0.24.7";
-        hash = "sha256-5saLQczm/3jRXmhHUyasGKMH95ft96+CMHkVeI7ip3A=";
+        rev = "v0.24.8";
+        hash = "sha256-bjk/e+FuW0pSaVkRXIiYWhaNGU08Mgyvb7U7lc+8k2w=";
       };
 
       propagatedBuildInputs = [

From 27ea5b1a461525f0bfa92f407a14a73322fb20c0 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Thu, 30 Oct 2025 22:45:41 +0800
Subject: [PATCH 4278/6226] fakehttp: init at 0.9.18

---
 pkgs/by-name/fa/fakehttp/package.nix | 50 ++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 pkgs/by-name/fa/fakehttp/package.nix

diff --git a/pkgs/by-name/fa/fakehttp/package.nix b/pkgs/by-name/fa/fakehttp/package.nix
new file mode 100644
index 000000000000..33629b69fe78
--- /dev/null
+++ b/pkgs/by-name/fa/fakehttp/package.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  libnetfilter_queue,
+  libnfnetlink,
+  libmnl,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "fakehttp";
+  version = "0.9.18";
+
+  src = fetchFromGitHub {
+    owner = "MikeWang000000";
+    repo = "FakeHTTP";
+    tag = finalAttrs.version;
+    hash = "sha256-XjWveBsRJq5iNpk3e9lmVKMoB3q5tr4OiNY+kYEqtEE=";
+  };
+
+  buildInputs = [
+    libnetfilter_queue
+    libnfnetlink
+    libmnl
+  ];
+
+  makeFlags = [
+    "CROSS_PREFIX=${stdenv.cc.targetPrefix}"
+    "VERSION=${finalAttrs.version}"
+  ];
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Obfuscate all your TCP connections into HTTP protocol";
+    homepage = "https://github.com/MikeWang000000/FakeHTTP";
+    changelog = "https://github.com/MikeWang000000/FakeHTTP/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ moraxyc ];
+    mainProgram = "fakehttp";
+    platforms = lib.platforms.linux;
+  };
+})

From c9e1f5a0c2e9aeff4e276b253877d1436d4ac473 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Oct 2025 23:28:04 -0500
Subject: [PATCH 4279/6226] yaziPlugins: update on 2025-10-30
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- dupes: 0-unstable-2025-10-16 → 0-unstable-2025-10-23
- recycle-bin: 0-unstable-2025-09-16 → 0-unstable-2025-10-25
- rich-preview: 0-unstable-2025-05-31 → 0-unstable-2025-10-22
- rsync: 0-unstable-2025-09-20 → 0-unstable-2025-10-23

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/ya/yazi/plugins/dupes/default.nix        | 6 +++---
 pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix  | 6 +++---
 pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix | 6 +++---
 pkgs/by-name/ya/yazi/plugins/rsync/default.nix        | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ya/yazi/plugins/dupes/default.nix b/pkgs/by-name/ya/yazi/plugins/dupes/default.nix
index 91d13ed09275..c078d2eb70cc 100644
--- a/pkgs/by-name/ya/yazi/plugins/dupes/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/dupes/default.nix
@@ -7,13 +7,13 @@
 }:
 mkYaziPlugin {
   pname = "dupes.yazi";
-  version = "0-unstable-2025-10-16";
+  version = "0-unstable-2025-10-23";
 
   src = fetchFromGitHub {
     owner = "mshnwq";
     repo = "dupes.yazi";
-    rev = "012a21e1864296503f7bb1e7297b71fe57af8994";
-    hash = "sha256-VUF7vmtnXuEsbyS0/pPTgwrDDrnMqt77eIkeQZFxoZk=";
+    rev = "18a9395d38f42e406805b92834154fc7ad15a7b8";
+    hash = "sha256-hBpUoMKGZgKrgxAOYZQ9CU4BKPSiYpYVWyuHYXHZ/Pc=";
   };
 
   postPatch = ''
diff --git a/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix b/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix
index c621c86acd4f..5de164d5d744 100644
--- a/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/recycle-bin/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "recycle-bin.yazi";
-  version = "0-unstable-2025-09-16";
+  version = "0-unstable-2025-10-25";
 
   src = fetchFromGitHub {
     owner = "uhs-robert";
     repo = "recycle-bin.yazi";
-    rev = "03f6c4a3085c218a0909671dcc2014558fff18a7";
-    hash = "sha256-M33RjtFQhnh9pIFKQKrsvZuWZNbe0lfepDKFsAuaYC4=";
+    rev = "8bb62865fdef06ea27c10367595017c118ef2831";
+    hash = "sha256-p7UBJCWvyOHpt2EbjDNJJ0wuPxK425vyy+9lf9al9F0=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix b/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix
index f1738bf96d7a..412035d7c296 100644
--- a/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/rich-preview/default.nix
@@ -5,13 +5,13 @@
 }:
 mkYaziPlugin {
   pname = "rich-preview.yazi";
-  version = "0-unstable-2025-05-31";
+  version = "0-unstable-2025-10-22";
 
   src = fetchFromGitHub {
     owner = "AnirudhG07";
     repo = "rich-preview.yazi";
-    rev = "843c3faf0a99f5ce31d02372c868d8dae92ca29d";
-    hash = "sha256-celObHo9Y3pFCd1mTx1Lz77Tc22SJTleRblAkbH/RqY=";
+    rev = "831234e828d292913f4b174a1ca2be2fb1080f22";
+    hash = "sha256-CK3ynjs53I1tRqARoOYMgBczBrcle+pwpUhHt3VpSXs=";
   };
 
   meta = {
diff --git a/pkgs/by-name/ya/yazi/plugins/rsync/default.nix b/pkgs/by-name/ya/yazi/plugins/rsync/default.nix
index 1fe61990500d..3ee1b393b3c8 100644
--- a/pkgs/by-name/ya/yazi/plugins/rsync/default.nix
+++ b/pkgs/by-name/ya/yazi/plugins/rsync/default.nix
@@ -5,12 +5,12 @@
 }:
 mkYaziPlugin {
   pname = "rsync.yazi";
-  version = "0-unstable-2025-09-20";
+  version = "0-unstable-2025-10-23";
   src = fetchFromGitHub {
     owner = "GianniBYoung";
     repo = "rsync.yazi";
-    rev = "824d8a35bf1f13742d19ecd93521bedc547fa809";
-    hash = "sha256-GqrwhJ4Fyxk4vzOSkFPoxvq5EV50YejaB84m2K006Bc=";
+    rev = "14d28283f49b39593a2763d7457e0dacb78f7597";
+    hash = "sha256-LT+4NKiCkiF72RG9g/tOjS6F+Wc4tY3vtnHNHPxbn1w=";
   };
 
   meta = {

From 968f0c2e6a0e3ff169f6370187b3a44fb812c3cc Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Thu, 30 Oct 2025 23:32:48 -0500
Subject: [PATCH 4280/6226] teams-for-linux: 2.6.6 -> 2.6.7

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/te/teams-for-linux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index 028f5ace77dd..bcb26588ce3e 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "2.6.6";
+  version = "2.6.7";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-Vf3Fz96kZIASjWeSUGVPKVrn7RBG0PPhFqIz8GOI8K4=";
+    hash = "sha256-8jIQbeUhGBqVSz6tO48wTbwcJig+xnL8sIsROtEBsv4=";
   };
 
-  npmDepsHash = "sha256-HfBSlfa5FzoBlRTIR7ayUs4FwFJisbfLVKbFhf+K218=";
+  npmDepsHash = "sha256-DKHQwJb9y75jX+h2XNudyn6mYnT9GywwBhZZtkknKKE=";
 
   nativeBuildInputs = [
     makeWrapper

From 0cfccfa02618370f11e05d8e52e451a6db0811f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 04:49:14 +0000
Subject: [PATCH 4281/6226] maptool: 1.18.5 -> 1.18.6

---
 pkgs/by-name/ma/maptool/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/maptool/package.nix b/pkgs/by-name/ma/maptool/package.nix
index e1f71c3abf51..4a596f8a7874 100644
--- a/pkgs/by-name/ma/maptool/package.nix
+++ b/pkgs/by-name/ma/maptool/package.nix
@@ -13,11 +13,11 @@
 }:
 let
   pname = "maptool";
-  version = "1.18.5";
+  version = "1.18.6";
   repoBase = "https://github.com/RPTools/maptool";
   src = fetchurl {
     url = "${repoBase}/releases/download/${version}/maptool-${version}-x86_64.pkg.tar.zst";
-    hash = "sha256-67szWKgx3B5HacpzYThxGDHKHK5qz2GQ15+ZEuEGlAU=";
+    hash = "sha256-QSJjXgzjoKIwTvIx6iWCHjleJTAAI7qnbcxZb8sygxY=";
   };
 
   meta = with lib; {

From 4a06cd9d4c57f9e5f510322f3323d5516d81b442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 30 Oct 2025 21:52:53 -0700
Subject: [PATCH 4282/6226] python3Packages.pycync: 0.4.2 -> 0.4.3

Diff: https://github.com/Kinachi249/pycync/compare/v0.4.2...v0.4.3

Changelog: https://github.com/Kinachi249/pycync/releases/tag/v0.4.3
---
 pkgs/development/python-modules/pycync/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pycync/default.nix b/pkgs/development/python-modules/pycync/default.nix
index 62dcf3c65b36..199e7ae69e44 100644
--- a/pkgs/development/python-modules/pycync/default.nix
+++ b/pkgs/development/python-modules/pycync/default.nix
@@ -7,18 +7,21 @@
   pytest-asyncio,
   pytest-mock,
   pytestCheckHook,
+  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "pycync";
-  version = "0.4.2";
+  version = "0.4.3";
   pyproject = true;
 
+  disabled = pythonOlder "3.13";
+
   src = fetchFromGitHub {
     owner = "Kinachi249";
     repo = "pycync";
     tag = "v${version}";
-    hash = "sha256-PDCS+ucfO5RRvTshGGjxir3ez7L405k5tL5svMxZMsg=";
+    hash = "sha256-UjodZbgicTiJV4T5yqWy5J4oAeZGbggVfaPMoDmL74M=";
   };
 
   build-system = [ hatchling ];

From f0cabb0c6516f717efd13c10161beea4ae408e66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 30 Oct 2025 21:54:35 -0700
Subject: [PATCH 4283/6226] python3Packages.simsimd: 6.5.3 -> 6.5.4

Diff: https://github.com/ashvardanian/SimSIMD/compare/v6.5.3...v6.5.4

Changelog: https://github.com/ashvardanian/SimSIMD/releases/tag/v6.5.4
---
 pkgs/development/python-modules/simsimd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/simsimd/default.nix b/pkgs/development/python-modules/simsimd/default.nix
index 43ea46749d15..87e0ba56d192 100644
--- a/pkgs/development/python-modules/simsimd/default.nix
+++ b/pkgs/development/python-modules/simsimd/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "simsimd";
-  version = "6.5.3";
+  version = "6.5.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ashvardanian";
     repo = "SimSIMD";
     tag = "v${version}";
-    hash = "sha256-vEtMBpBoPbnBjGaxGw7ApGTJ8RFJ7vQcAH0DF4AOIEE=";
+    hash = "sha256-q+URgLfsc40OgZkqYj8yiBzpB33aksWsn4K0f5V0HSg=";
   };
 
   build-system = [

From 355bee82de932f69da3e01eeccb35e3cd3892b08 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Mon, 29 Sep 2025 02:08:13 +0800
Subject: [PATCH 4284/6226] atlassian-cli: rename to appfire-cli

---
 pkgs/by-name/{at/atlassian-cli => ap/appfire-cli}/package.nix | 2 +-
 pkgs/by-name/{at/atlassian-cli => ap/appfire-cli}/wrapper.sh  | 0
 pkgs/top-level/aliases.nix                                    | 1 +
 3 files changed, 2 insertions(+), 1 deletion(-)
 rename pkgs/by-name/{at/atlassian-cli => ap/appfire-cli}/package.nix (97%)
 rename pkgs/by-name/{at/atlassian-cli => ap/appfire-cli}/wrapper.sh (100%)

diff --git a/pkgs/by-name/at/atlassian-cli/package.nix b/pkgs/by-name/ap/appfire-cli/package.nix
similarity index 97%
rename from pkgs/by-name/at/atlassian-cli/package.nix
rename to pkgs/by-name/ap/appfire-cli/package.nix
index 3e1d1ddcc3e3..aee338267f91 100644
--- a/pkgs/by-name/at/atlassian-cli/package.nix
+++ b/pkgs/by-name/ap/appfire-cli/package.nix
@@ -6,7 +6,7 @@
 }:
 
 stdenv.mkDerivation rec {
-  pname = "atlassian-cli";
+  pname = "appfire-cli";
   version = "9.6.0";
 
   src = fetchzip {
diff --git a/pkgs/by-name/at/atlassian-cli/wrapper.sh b/pkgs/by-name/ap/appfire-cli/wrapper.sh
similarity index 100%
rename from pkgs/by-name/at/atlassian-cli/wrapper.sh
rename to pkgs/by-name/ap/appfire-cli/wrapper.sh
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c43b9d8748f9..a6c2644a0639 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -305,6 +305,7 @@ mapAliases {
   aseprite-unfree = throw "'aseprite-unfree' has been renamed to/replaced by 'aseprite'"; # Converted to throw 2025-10-27
   asitop = throw "'asitop' has been renamed to/replaced by 'macpm'"; # Converted to throw 2025-10-27
   asterisk_18 = throw "asterisk_18: Asterisk 18 is end of life and has been removed"; # Added 2025-10-19
+  atlassian-cli = appfire-cli; # Added 2025-09-29
   ats = throw "'ats' has been removed as it is unmaintained for 10 years and broken"; # Added 2025-05-17
   AusweisApp2 = throw "'AusweisApp2' has been renamed to/replaced by 'ausweisapp'"; # Converted to throw 2025-10-27
   autoconf213 = throw "'autoconf213' has been removed in favor of 'autoconf'"; # Added 2025-07-21

From be124e69296df5c6aa7059af48f4bc5ef37a1aa3 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Mon, 29 Sep 2025 02:29:59 +0800
Subject: [PATCH 4285/6226] appfire-cli: refactor; 9.6.0 -> 12.1.0

---
 pkgs/by-name/ap/appfire-cli/package.nix | 105 ++++++++++++++++--------
 pkgs/by-name/ap/appfire-cli/wrapper.sh  |  20 -----
 2 files changed, 69 insertions(+), 56 deletions(-)
 delete mode 100755 pkgs/by-name/ap/appfire-cli/wrapper.sh

diff --git a/pkgs/by-name/ap/appfire-cli/package.nix b/pkgs/by-name/ap/appfire-cli/package.nix
index aee338267f91..a4519d548f3d 100644
--- a/pkgs/by-name/ap/appfire-cli/package.nix
+++ b/pkgs/by-name/ap/appfire-cli/package.nix
@@ -2,53 +2,86 @@
   lib,
   stdenv,
   fetchzip,
+  makeBinaryWrapper,
+  coreutils,
+  findutils,
   jre,
+
+  testers,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "appfire-cli";
-  version = "9.6.0";
+  version = "12.1.0";
 
   src = fetchzip {
-    url = "https://bobswift.atlassian.net/wiki/download/attachments/16285777/${pname}-${version}-distribution.zip";
-    sha256 = "sha256-55ydhprVC9NdDMUrKbpSAEQBb9zRYgwOc7k8aP4R89A=";
+    url = "https://appfire.atlassian.net/wiki/download/attachments/60562669/acli-${finalAttrs.version}-distribution.zip";
+    hash = "sha256-6p8i5ec8IAygACdsdzP8g5u24mQZ7Ci684xuu/kAADo=";
   };
 
-  tools = [
-    "agile"
-    "bamboo"
-    "bitbucket"
-    "confluence"
-    "csv"
-    "hipchat"
-    "jira"
-    "servicedesk"
-    "structure"
-    "tempo"
-    "trello"
-    "upm"
-  ];
+  nativeBuildInputs = [ makeBinaryWrapper ];
 
   installPhase = ''
-    mkdir -p $out/{bin,share/doc/atlassian-cli}
-    cp -r lib $out/share/java
-    cp -r README.txt license $out/share/doc/atlassian-cli
-    for tool in $tools
-    do
-      substitute ${./wrapper.sh} $out/bin/$tool \
-        --subst-var out \
-        --subst-var-by jre ${jre} \
-        --subst-var-by tool $tool
-      chmod +x $out/bin/$tool
-    done
+    runHook preInstall
+
+    mkdir -p $out/share/{,doc/}appfire-cli
+    cp -r acli.sh lib $out/share/appfire-cli
+    cp -r README.txt license $out/share/doc/appfire-cli
+
+    ACLI_SHELL=${finalAttrs.passthru.shellNames.${stdenv.hostPlatform.system} or "unsupport"}
+    if test -f $ACLI_SHELL; then
+      install -Dm755 $ACLI_SHELL $out/share/appfire-cli/$ACLI_SHELL
+    fi
+
+    substituteInPlace $out/share/appfire-cli/acli.sh \
+      --replace-fail 'java $' '${lib.getExe jre} $' \
+      --replace-fail '(find' '(${lib.getExe findutils}' \
+      --replace-fail dirname ${lib.getExe' coreutils "dirname"} \
+      --replace-fail uname ${lib.getExe' coreutils "uname"}
+    makeBinaryWrapper $out/share/appfire-cli/acli.sh $out/bin/acli
+
+    runHook postInstall
   '';
 
-  meta = with lib; {
-    description = "Integrated family of CLI’s for various Atlassian applications";
-    homepage = "https://bobswift.atlassian.net/wiki/spaces/ACLI/overview";
-    license = licenses.unfreeRedistributable;
-    sourceProvenance = with sourceTypes; [ binaryBytecode ];
-    maintainers = with maintainers; [ twey ];
+  passthru = {
+    shellNames = {
+      "x86_64-linux" = "bin/shell-linux-amd64";
+      "aarch64-linux" = "bin/shell-linux-arm64";
+      "x86_64-darwin" = "bin/shell-macos-amd64";
+      "aarch64-darwin" = "bin/shell-macos-arm64";
+    };
+    # versionCheckHook cannot be used because appfire-cli requires $HOME to be set
+    tests.version = testers.testVersion {
+      package = finalAttrs.finalPackage;
+      command = "acli -a getClientInfo";
+    };
+  };
+
+  meta = {
+    description = "Integrated family of CLIs for Atlassian, Atlassian-related, and other applications";
+    longDescription = ''
+      Appfire CLI (ACLI) is an integrated family of CLIs for Atlassian,
+      Atlassian-related, and other applications.
+
+      ACLI provides a consistent and reliable automation platform that allows
+      users, administrators, script writers, and DevOps developers to perform
+      tasks, implement business processes, or apply general automation with
+      Atlassian products.
+
+      The CLIs are built on the Atlassian remote APIs and deliver a higher
+      level, client-based API that is easier to use and more powerful than
+      the underlying product APIs.
+
+      The upstream documentation describes configuring acli by placing
+      {file}`acli.properties` in the same directory as {file}`acli.sh`.
+      Since the /nix/store is not writable, you can instead place the file
+      at {file}`$HOME/acli.properties` to achieve the same effect.
+    '';
+    homepage = "https://apps.appf.re/acli";
+    license = lib.licenses.unfreeRedistributable;
+    sourceProvenance = with lib.sourceTypes; [ binaryBytecode ];
+    maintainers = with lib.maintainers; [ twey ];
+    mainProgram = "acli";
     inherit (jre.meta) platforms;
   };
-}
+})
diff --git a/pkgs/by-name/ap/appfire-cli/wrapper.sh b/pkgs/by-name/ap/appfire-cli/wrapper.sh
deleted file mode 100755
index 80b60dbc468c..000000000000
--- a/pkgs/by-name/ap/appfire-cli/wrapper.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-tool=@tool@
-user=ATLASSIAN_${tool^^}_USER
-host=ATLASSIAN_${tool^^}_HOST
-pass=ATLASSIAN_${tool^^}_PASS
-
-[ -f ~/.atlassian-cli ] && source ~/.atlassian-cli
-if [ x = ${!user-x} ] || [ x = ${!host-x} ] || [ x = ${!pass-x} ]
-then
-    >&2 echo please define $user, $host, and $pass in '~/.atlassian-cli'
-    exit 1
-fi
-
-@jre@/bin/java \
-    -jar @out@/share/java/@tool@-cli-* \
-    --server "${!host}" \
-    --user "${!user}" \
-    --password "${!pass}" \
-    "$@"

From e7eb76578cb2c28f7548c2cab9960249fd380160 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 04:55:01 +0000
Subject: [PATCH 4286/6226] magic-vlsi: 8.3.568 -> 8.3.570

---
 pkgs/by-name/ma/magic-vlsi/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix
index 2e7dd207f7cb..a9e69721d3e1 100644
--- a/pkgs/by-name/ma/magic-vlsi/package.nix
+++ b/pkgs/by-name/ma/magic-vlsi/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "magic-vlsi";
-  version = "8.3.568";
+  version = "8.3.570";
 
   src = fetchFromGitHub {
     owner = "RTimothyEdwards";
     repo = "magic";
     tag = "${version}";
-    sha256 = "sha256-H9hPXsOBDBs1v5UzgcuoUC6D7+JYZ45WhHlyzwCPoqk=";
+    sha256 = "sha256-ytITe6NtCqD1HTKry8O2famVkhB1+txIIa8UQlXa9qM=";
     leaveDotGit = true;
   };
 

From 8a3b9d1893a27c7e37f083cbc48190677555f61b Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Thu, 30 Oct 2025 22:41:11 -0400
Subject: [PATCH 4287/6226] calamares-nixos-extension: Set build-dir during
 nixos-install

---
 .../src/modules/nixos/main.py                         | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py b/pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py
index 85e259d42d11..261a03cc9a8c 100644
--- a/pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py
+++ b/pkgs/by-name/ca/calamares-nixos-extensions/src/modules/nixos/main.py
@@ -797,7 +797,16 @@ def run():
             "nixos-install",
             "--no-root-passwd",
             "--root",
-            root_mount_point
+            root_mount_point,
+            # Nix requires its build directory to have no
+            # world-writable parent directories. The chroot store that
+            # nixos-install uses will use the state dir in the chroot
+            # for the build-dir, but the chroot is under /tmp, which
+            # is writable. It doesn't have to be in the chroot though,
+            # so we can just realign it with the host state dir.
+            "--option",
+            "build-dir",
+            "/nix/var/nix/builds",
         ]
     )
 

From 03a0f04ca7ccc2e46997670db9ded2fe32fc4331 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Fri, 31 Oct 2025 06:57:18 +0200
Subject: [PATCH 4288/6226] tmux: replace `systemd` with `systemdLibs`

1. SD executables aren't used anyway
2. It noticeably reduces closure size

Tail of `dix result-*` output:
  SIZE: 177 MiB -> 41.4 MiB
  DIFF: -135 MiB
---
 pkgs/by-name/tm/tmux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tm/tmux/package.nix b/pkgs/by-name/tm/tmux/package.nix
index 830bb3aad435..f3b22356a735 100644
--- a/pkgs/by-name/tm/tmux/package.nix
+++ b/pkgs/by-name/tm/tmux/package.nix
@@ -8,8 +8,8 @@
   ncurses,
   pkg-config,
   runCommand,
-  withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd,
-  systemd,
+  withSystemd ? lib.meta.availableOn stdenv.hostPlatform systemdLibs,
+  systemdLibs,
   # broken on i686-linux https://github.com/tmux/tmux/issues/4597
   withUtf8proc ? !(stdenv.hostPlatform.is32bit),
   utf8proc, # gets Unicode updates faster than glibc
@@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     ncurses
     libevent
   ]
-  ++ lib.optionals withSystemd [ systemd ]
+  ++ lib.optionals withSystemd [ systemdLibs ]
   ++ lib.optionals withUtf8proc [ utf8proc ]
   ++ lib.optionals withUtempter [ libutempter ];
 

From 14d0327e9c459d5d353e24890f3c0e0b6c8bd618 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Fri, 31 Oct 2025 13:11:29 +0800
Subject: [PATCH 4289/6226] fakesip: init at 0.9.1

---
 pkgs/by-name/fa/fakesip/package.nix | 50 +++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 pkgs/by-name/fa/fakesip/package.nix

diff --git a/pkgs/by-name/fa/fakesip/package.nix b/pkgs/by-name/fa/fakesip/package.nix
new file mode 100644
index 000000000000..a0ce111a7d5f
--- /dev/null
+++ b/pkgs/by-name/fa/fakesip/package.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  libnetfilter_queue,
+  libnfnetlink,
+  libmnl,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "fakesip";
+  version = "0.9.1";
+
+  src = fetchFromGitHub {
+    owner = "MikeWang000000";
+    repo = "FakeSIP";
+    tag = finalAttrs.version;
+    hash = "sha256-iY9EAvy4E6aM59B1sn9d0xoUMdOsX75LslVzB/Cf5XM=";
+  };
+
+  buildInputs = [
+    libnetfilter_queue
+    libnfnetlink
+    libmnl
+  ];
+
+  makeFlags = [
+    "CROSS_PREFIX=${stdenv.cc.targetPrefix}"
+    "VERSION=${finalAttrs.version}"
+  ];
+
+  installFlags = [ "PREFIX=$(out)" ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Disguise your UDP traffic as SIP protocol to evade DPI detection";
+    homepage = "https://github.com/MikeWang000000/FakeSIP";
+    changelog = "https://github.com/MikeWang000000/FakeSIP/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ moraxyc ];
+    mainProgram = "fakesip";
+    platforms = lib.platforms.linux;
+  };
+})

From 63773f99bfe03513c921a84bb0ee45aa45940d75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 30 Oct 2025 22:46:13 -0700
Subject: [PATCH 4290/6226] python3Packages.knx-frontend: 2025.10.17.202411 ->
 2025.10.26.81530

Changelog: https://github.com/XKNX/knx-frontend/releases/tag/2025.10.26.81530
---
 pkgs/development/python-modules/knx-frontend/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix
index 803c8fdffd1b..bb97a632251b 100644
--- a/pkgs/development/python-modules/knx-frontend/default.nix
+++ b/pkgs/development/python-modules/knx-frontend/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "knx-frontend";
-  version = "2025.10.17.202411";
+  version = "2025.10.26.81530";
   pyproject = true;
 
   # TODO: source build, uses yarn.lock
   src = fetchPypi {
     pname = "knx_frontend";
     inherit version;
-    hash = "sha256-nD56FfraKuT4H/Mqw6o2lP3xP4kHAGof369UJdJeT6w=";
+    hash = "sha256-8JRiKgltnY8aPlcVP4yr1/z9mJYG0Axr1KnXPK9XgLI=";
   };
 
   build-system = [ setuptools ];

From 5b809affe07d25a8fe6bc5b0e059e898ab57dab5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 30 Oct 2025 22:52:08 -0700
Subject: [PATCH 4291/6226] python3Packages.teslemetry-stream: 0.7.9 -> 0.7.10

Diff: https://github.com/Teslemetry/python-teslemetry-stream/compare/v0.7.9...v0.7.10

Changelog: https://github.com/Teslemetry/python-teslemetry-stream/releases/tag/v0.7.10
---
 pkgs/development/python-modules/teslemetry-stream/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/teslemetry-stream/default.nix b/pkgs/development/python-modules/teslemetry-stream/default.nix
index 2b8d9a907534..73468408f8c9 100644
--- a/pkgs/development/python-modules/teslemetry-stream/default.nix
+++ b/pkgs/development/python-modules/teslemetry-stream/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "teslemetry-stream";
-  version = "0.7.9";
+  version = "0.7.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Teslemetry";
     repo = "python-teslemetry-stream";
     tag = "v${version}";
-    hash = "sha256-qfe73wLj4CGfHU4MyQfUfM/P+R52Hd6FLr39wbIGg9Y=";
+    hash = "sha256-2ZKoDb5ZKo27qHTyUmyDa2LlhcyJTkQByrJotY/qw4o=";
   };
 
   build-system = [ setuptools ];

From 07132165ece1fd22c9c586b392d85a420ca7de32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 30 Oct 2025 22:54:23 -0700
Subject: [PATCH 4292/6226] python3Packages.universal-silabs-flasher: 0.0.36 ->
 0.0.37

Diff: https://github.com/NabuCasa/universal-silabs-flasher/compare/v0.0.36...v0.0.37

Changelog: https://github.com/NabuCasa/universal-silabs-flasher/releases/tag/v0.0.37
---
 .../python-modules/universal-silabs-flasher/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/universal-silabs-flasher/default.nix b/pkgs/development/python-modules/universal-silabs-flasher/default.nix
index 36fa6c553bf5..222ef7b64123 100644
--- a/pkgs/development/python-modules/universal-silabs-flasher/default.nix
+++ b/pkgs/development/python-modules/universal-silabs-flasher/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "universal-silabs-flasher";
-  version = "0.0.36";
+  version = "0.0.37";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "NabuCasa";
     repo = "universal-silabs-flasher";
     tag = "v${version}";
-    hash = "sha256-NKsVgbcUHJsqGrpCqCbBT+LLJp9+BjUGKbE4Cx0uv8Y=";
+    hash = "sha256-XvDzv39at+6h1Q2tmiYiNsLpcMTx+sOd958K+PB0WSc=";
   };
 
   postPatch = ''

From 13cf19b6b0f427d2ab8e55d6b2a14a43c2295c6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 05:58:47 +0000
Subject: [PATCH 4293/6226] fabric-ai: 1.4.319 -> 1.4.320

---
 pkgs/by-name/fa/fabric-ai/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix
index 846599272c74..9fe423d3fa58 100644
--- a/pkgs/by-name/fa/fabric-ai/package.nix
+++ b/pkgs/by-name/fa/fabric-ai/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "fabric-ai";
-  version = "1.4.319";
+  version = "1.4.320";
 
   src = fetchFromGitHub {
     owner = "danielmiessler";
     repo = "fabric";
     tag = "v${version}";
-    hash = "sha256-PTxBDJS2Fm3hqvQO9LGLZ+8vWeUQjw4UXk2J8j06ZTQ=";
+    hash = "sha256-/K70Gm96TYD8djNZkeFAB1hS3BXWuW/Nqtu583d055o=";
   };
 
   vendorHash = "sha256-V24r/xl/E37OYW59apD/ccXtDIpP3MeUEq9HvHdTSgM=";

From 71cdfb59e09c5c37ac77c53f6460a7a9ac99ac80 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Fri, 31 Oct 2025 06:08:41 +0000
Subject: [PATCH 4294/6226] olivetin: 2025.10.27 -> 2025.10.30

Changelog: https://github.com/OliveTin/OliveTin/releases/tag/2025.10.30
Diff: https://github.com/OliveTin/OliveTin/compare/2025.10.27...2025.10.30
---
 pkgs/by-name/ol/olivetin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ol/olivetin/package.nix b/pkgs/by-name/ol/olivetin/package.nix
index 511a3438fba2..f963e1eea386 100644
--- a/pkgs/by-name/ol/olivetin/package.nix
+++ b/pkgs/by-name/ol/olivetin/package.nix
@@ -86,13 +86,13 @@ buildGoModule (
 
   {
     pname = "olivetin";
-    version = "2025.10.27";
+    version = "2025.10.30";
 
     src = fetchFromGitHub {
       owner = "OliveTin";
       repo = "OliveTin";
       tag = finalAttrs.version;
-      hash = "sha256-iMfdOB2g1bNhkTaxuV9wUbslVmlKs+Ha5LL67IRgZm8=";
+      hash = "sha256-yzgyv/YLHXCU8h+c53qZQoY9dNOJdF0/EBBZJkN8Urc=";
     };
 
     modRoot = "service";

From f0ea2e1023af82e03e44ac25a578819a9498c7e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 06:23:11 +0000
Subject: [PATCH 4295/6226] vscode-extensions.foam.foam-vscode: 0.28.3 ->
 0.29.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index a4bc315f6f86..c22426952813 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1725,8 +1725,8 @@ let
         mktplcRef = {
           name = "foam-vscode";
           publisher = "foam";
-          version = "0.28.3";
-          hash = "sha256-rRJrzCle1/epqJL+gaUb3QZwrmdaLvagUwxRx1Aq1ZY=";
+          version = "0.29.0";
+          hash = "sha256-eAfWsIVAqRRfBNDZZq4SilqR48daY5IezjGULaU8AzU=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog";

From 404c85f193f5606fdeb0ec9bf8e8e1d79f5fb5f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 06:28:23 +0000
Subject: [PATCH 4296/6226] vscode-extensions.ocamllabs.ocaml-platform: 1.32.3
 -> 1.32.4

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index a4bc315f6f86..0f63de825655 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3641,8 +3641,8 @@ let
         mktplcRef = {
           name = "ocaml-platform";
           publisher = "ocamllabs";
-          version = "1.32.3";
-          hash = "sha256-KUzLrt7y3I6szpWVGk0NtBfXncw6ovNAkm1HyHj+MDk=";
+          version = "1.32.4";
+          hash = "sha256-ySJ6SLm+L2LPGbnus/skbk4WUPJ3VMXpCMEins3F8cc=";
         };
       };
 

From fa73a6ee9176126fd77f55d8dd242c95157b7c17 Mon Sep 17 00:00:00 2001
From: Philipp Arras <c@philipp-arras.de>
Date: Fri, 31 Oct 2025 07:57:46 +0100
Subject: [PATCH 4297/6226] python3Packages.python-socketio: increase test
 coverage

---
 pkgs/development/python-modules/python-socketio/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-socketio/default.nix b/pkgs/development/python-modules/python-socketio/default.nix
index 4e5d9c86e1dc..ca137a296fec 100644
--- a/pkgs/development/python-modules/python-socketio/default.nix
+++ b/pkgs/development/python-modules/python-socketio/default.nix
@@ -18,11 +18,12 @@
 
   # tests
   msgpack,
-  pytest7CheckHook,
+  pytestCheckHook,
   simple-websocket,
   uvicorn,
   redis,
   valkey,
+  pytest-asyncio,
 
 }:
 
@@ -55,11 +56,12 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     msgpack
-    pytest7CheckHook
+    pytestCheckHook
     uvicorn
     simple-websocket
     redis
     valkey
+    pytest-asyncio
   ]
   ++ lib.flatten (lib.attrValues optional-dependencies);
 

From a756bcdcb8805e74c134130156b80be2a1b943f1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sun, 5 Oct 2025 12:13:09 +0200
Subject: [PATCH 4298/6226] python313Packages.locust-cloud: enable tests

---
 .../python-modules/locust-cloud/default.nix   | 29 +++++++++++++++++++
 1 file changed, 29 insertions(+)

diff --git a/pkgs/development/python-modules/locust-cloud/default.nix b/pkgs/development/python-modules/locust-cloud/default.nix
index c46d093dbb3e..726c20a852c2 100644
--- a/pkgs/development/python-modules/locust-cloud/default.nix
+++ b/pkgs/development/python-modules/locust-cloud/default.nix
@@ -10,7 +10,11 @@
   python-engineio,
   python-socketio,
   requests,
+  gevent-websocket,
   tomli,
+  flask,
+  requests-mock,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -40,8 +44,33 @@ buildPythonPackage rec {
     tomli
   ];
 
+  nativeCheckInputs = [
+    flask
+    gevent-websocket
+    pytestCheckHook
+    requests-mock
+  ];
+
   pythonImportsCheck = [ "locust_cloud" ];
 
+  preCheck = ''
+    export LOCUSTCLOUD_USERNAME=dummy
+    export LOCUSTCLOUD_PASSWORD=dummy
+  '';
+
+  disabledTests = [
+    # AssertionError
+    "test_recursive_imports"
+    "test_from_import_file"
+  ];
+
+  disabledTestPaths = [
+    # Tests require network access
+    "tests/web_login_test.py"
+    "tests/cloud_test.py"
+    "tests/websocket_test.py"
+  ];
+
   meta = {
     description = "Hosted version of Locust to run distributed load tests";
     homepage = "https://github.com/locustcloud/locust-cloud";

From 14b11b6a9cb214136bb0d3fc6c2a41e3bf4ffa5e Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Thu, 30 Oct 2025 11:48:16 +0530
Subject: [PATCH 4299/6226] warp-plus: use go_1_24

Drop -w from ldflags because -s already implies -w
Move to finalAttrs pattern

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/wa/warp-plus/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/wa/warp-plus/package.nix b/pkgs/by-name/wa/warp-plus/package.nix
index 5257c82f64d1..f52fb5b94622 100644
--- a/pkgs/by-name/wa/warp-plus/package.nix
+++ b/pkgs/by-name/wa/warp-plus/package.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  buildGoModule,
+  buildGo124Module,
   fetchFromGitHub,
 
   nix-update-script,
@@ -8,7 +8,9 @@
   warp-plus,
 }:
 
-buildGoModule rec {
+# fails with go 1.25, downgrade to 1.24
+# error tls.ConnectionState: struct field count mismatch: 17 vs 16
+buildGo124Module (finalAttrs: {
   pname = "warp-plus";
   version = "1.2.6-unstable-2025-10-28";
 
@@ -23,8 +25,7 @@ buildGoModule rec {
 
   ldflags = [
     "-s"
-    "-w"
-    "-X main.version=${version}"
+    "-X main.version=${finalAttrs.version}"
   ];
 
   patches = [
@@ -59,4 +60,4 @@ buildGoModule rec {
     maintainers = with lib.maintainers; [ phanirithvij ];
     mainProgram = "warp-plus";
   };
-}
+})

From eaa870433641e2581921c56b8e0d38a797160dc9 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Fri, 31 Oct 2025 13:03:34 +0530
Subject: [PATCH 4300/6226] warp-plus: prefer versionCheckHook instead of
 testers.testVersion

add changelog entry in package meta

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/wa/warp-plus/package.nix | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/wa/warp-plus/package.nix b/pkgs/by-name/wa/warp-plus/package.nix
index f52fb5b94622..306d24e41939 100644
--- a/pkgs/by-name/wa/warp-plus/package.nix
+++ b/pkgs/by-name/wa/warp-plus/package.nix
@@ -4,8 +4,7 @@
   fetchFromGitHub,
 
   nix-update-script,
-  testers,
-  warp-plus,
+  versionCheckHook,
 }:
 
 # fails with go 1.25, downgrade to 1.24
@@ -45,15 +44,14 @@ buildGo124Module (finalAttrs: {
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
 
-  passthru = {
-    updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
-    tests.version = testers.testVersion {
-      package = warp-plus;
-      command = "warp-plus version";
-    };
-  };
+  nativeCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 
   meta = {
+    changelog = "https://github.com/bepass-org/warp-plus/releases";
     description = "Warp + Psiphon, an anti censorship utility for Iran";
     homepage = "https://github.com/bepass-org/warp-plus";
     license = lib.licenses.mit;

From 165615116ee16eb1c81a72c2a456b6fdfe367928 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 29 Oct 2025 20:01:51 -0300
Subject: [PATCH 4301/6226] ente-desktop: 1.7.14 -> 1.7.15

---
 pkgs/by-name/en/ente-desktop/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/en/ente-desktop/package.nix b/pkgs/by-name/en/ente-desktop/package.nix
index 9b971204ff7a..c2f5f833c491 100644
--- a/pkgs/by-name/en/ente-desktop/package.nix
+++ b/pkgs/by-name/en/ente-desktop/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   fetchYarnDeps,
   nodejs,
-  electron_37,
+  electron_38,
   yarnConfigHook,
   copyDesktopItems,
   vips,
@@ -15,12 +15,12 @@
   imagemagick,
 }:
 let
-  electron = electron_37;
+  electron = electron_38;
 in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ente-desktop";
-  version = "1.7.14";
+  version = "1.7.15";
 
   src = fetchFromGitHub {
     owner = "ente-io";
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
       "web"
     ];
     tag = "photosd-v${finalAttrs.version}";
-    hash = "sha256-UtKXg3SZxHo18VKuVP7W40SfZfa9ni+QJ7+GvGWptSA=";
+    hash = "sha256-QnJp+oHkRsb/uMobA33Hgo2VOzfDFDtJ6vchCAzyb+c=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/desktop";
@@ -39,13 +39,13 @@ stdenv.mkDerivation (finalAttrs: {
   offlineCache = fetchYarnDeps {
     name = "ente-desktop-${finalAttrs.version}-offline-cache";
     inherit (finalAttrs) src sourceRoot;
-    hash = "sha256-6o5TaqlgEQWZjde5cthiSVLVy5JiCHXApn7uXBWmTo0=";
+    hash = "sha256-dnjTH68lNqSD/RIiaYdip0U8a2RXCNanqF05WnhzjEA=";
   };
   webOfflineCache = fetchYarnDeps {
     name = "ente-desktop-${finalAttrs.version}-web-offline-cache";
     inherit (finalAttrs) src;
     sourceRoot = "${finalAttrs.src.name}/web";
-    hash = "sha256-gwOeznAp4nGu4spilkFl8Dbmdye3Wg8VnBLroSdUjUo=";
+    hash = "sha256-m+7woB5XnOPDMLpoIBui1GxeW1BOms18SKJ8vaJcv68=";
   };
 
   nativeBuildInputs = [

From d77cb1dc419712f2a373bbae93b7c65c52877da0 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 30 Oct 2025 19:36:51 -0300
Subject: [PATCH 4302/6226] ente-desktop: mark as broken on darwin

---
 pkgs/by-name/en/ente-desktop/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/en/ente-desktop/package.nix b/pkgs/by-name/en/ente-desktop/package.nix
index c2f5f833c491..679e230e52cf 100644
--- a/pkgs/by-name/en/ente-desktop/package.nix
+++ b/pkgs/by-name/en/ente-desktop/package.nix
@@ -145,5 +145,6 @@ stdenv.mkDerivation (finalAttrs: {
       iedame
     ];
     platforms = lib.platforms.all;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })

From be8c31f2c4fa503c7309566e3206655f62a1b4c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 08:40:02 +0000
Subject: [PATCH 4303/6226] python3Packages.schedula: 1.5.65 -> 1.5.69

---
 pkgs/development/python-modules/schedula/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/schedula/default.nix b/pkgs/development/python-modules/schedula/default.nix
index d247f11c611f..395a46fe100a 100644
--- a/pkgs/development/python-modules/schedula/default.nix
+++ b/pkgs/development/python-modules/schedula/default.nix
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "schedula";
-  version = "1.5.65";
+  version = "1.5.69";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "vinci1it2000";
     repo = "schedula";
     tag = "v${version}";
-    hash = "sha256-f67W6oyX7oEZSGXTth+FHOa8efj1tQ+B0taDDqjOSR8=";
+    hash = "sha256-4TIppCYfCIf5mEqBeuX/pP27RyAI40es1ULidb+i+o8=";
   };
 
   build-system = [ setuptools ];

From aed67158fcece24f16a20dc101ef70631d9ea44b Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Tue, 28 Oct 2025 11:48:43 +0100
Subject: [PATCH 4304/6226] readest: 0.9.88 -> 0.9.90

Changelog: https://github.com/readest/readest/releases/tag/v0.9.90
Diff: https://github.com/readest/readest/compare/v0.9.88...v0.9.90
---
 pkgs/by-name/re/readest/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix
index d6f1b65ee125..703cddb1641c 100644
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@@ -20,13 +20,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "readest";
-  version = "0.9.88";
+  version = "0.9.90";
 
   src = fetchFromGitHub {
     owner = "readest";
     repo = "readest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-z9bRRXQkXsqZRW1EPj0c8A9ZHWytYYtP6o40K86+Fio=";
+    hash = "sha256-y7fk27uISjjP7fKhaNlZE8cYwxia6lexOPbY+Qe9cMs=";
     fetchSubmodules = true;
   };
 
@@ -40,12 +40,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-sRa1IO8JmMsA0/7dMuYF0as/MYHpclEwAknZIycNQ3Y=";
+    hash = "sha256-RsmI0avMnVWlLMzwGJJmPNSEJpNaq7IWimjpMJ+nR80=";
   };
 
   pnpmRoot = "../..";
 
-  cargoHash = "sha256-oNzgsxJb8N++AGCkXuJmK+51iF7XZ0xmShPlOpkAQEg=";
+  cargoHash = "sha256-nNMD2LnMDz91kI2QniD+zD/Ug9BSVjTIiuxWdz8UxL0=";
 
   cargoRoot = "../..";
 

From 6c79b3b19e9d4766148741dc7cb0cafe67703b06 Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Wed, 29 Oct 2025 17:05:41 +0100
Subject: [PATCH 4305/6226] readest: 0.9.90 -> 0.9.91

Changelog: https://github.com/readest/readest/releases/tag/v0.9.91
Diff: https://github.com/readest/readest/compare/v0.9.90...v0.9.91
---
 pkgs/by-name/re/readest/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/readest/package.nix b/pkgs/by-name/re/readest/package.nix
index 703cddb1641c..38861008971e 100644
--- a/pkgs/by-name/re/readest/package.nix
+++ b/pkgs/by-name/re/readest/package.nix
@@ -20,13 +20,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "readest";
-  version = "0.9.90";
+  version = "0.9.91";
 
   src = fetchFromGitHub {
     owner = "readest";
     repo = "readest";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-y7fk27uISjjP7fKhaNlZE8cYwxia6lexOPbY+Qe9cMs=";
+    hash = "sha256-Xz+s+yv0L2bj7T6GA6IkMGTAk2oGyFuYR5zzyeLbTuc=";
     fetchSubmodules = true;
   };
 

From a798bc8225340574da7434947c410fd942c81fe3 Mon Sep 17 00:00:00 2001
From: Martin Joerg <martin.joerg@gmail.com>
Date: Fri, 31 Oct 2025 08:46:36 +0000
Subject: [PATCH 4306/6226] magic-wormhole: 0.21.0 -> 0.21.1

https://github.com/magic-wormhole/magic-wormhole/blob/refs/tags/0.21.1/NEWS.md
https://github.com/magic-wormhole/magic-wormhole/compare/refs/tags/0.21.0...refs/tags/0.21.1
---
 pkgs/development/python-modules/magic-wormhole/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/magic-wormhole/default.nix b/pkgs/development/python-modules/magic-wormhole/default.nix
index 850224bbeb70..74594ae40a5f 100644
--- a/pkgs/development/python-modules/magic-wormhole/default.nix
+++ b/pkgs/development/python-modules/magic-wormhole/default.nix
@@ -42,14 +42,14 @@
 
 buildPythonPackage rec {
   pname = "magic-wormhole";
-  version = "0.21.0";
+  version = "0.21.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "magic-wormhole";
     repo = "magic-wormhole";
     tag = version;
-    hash = "sha256-gsNdV6JvxsdlyPOSn07nTrvU4ju+3si3SQhyN8ZX/ac=";
+    hash = "sha256-HZ6ZS2dkJoW+yL6F3U9WguUHicfG2KWnk4/YuNPwpUc=";
   };
 
   postPatch =

From b5c94b39c4588a23c4179deb5eccec62272f3258 Mon Sep 17 00:00:00 2001
From: Nikolay Korotkiy <sikmir@disroot.org>
Date: Fri, 31 Oct 2025 01:46:17 +0400
Subject: [PATCH 4307/6226] ladybird: fix websocket support

---
 pkgs/by-name/la/ladybird/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix
index 65f7df642424..8ec22f84aef2 100644
--- a/pkgs/by-name/la/ladybird/package.nix
+++ b/pkgs/by-name/la/ladybird/package.nix
@@ -9,7 +9,7 @@
   cmake,
   ninja,
   pkg-config,
-  curl,
+  curlFull, # Websocket support
   libavif,
   angle, # libEGL
   libjxl,
@@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
-    curl
+    curlFull
     fast-float
     ffmpeg
     fontconfig

From 1206e28b69652e18a67fe616bde419463ccae00f Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 31 Oct 2025 06:02:02 -0300
Subject: [PATCH 4308/6226] plistcpp: fix build with cmake4

---
 pkgs/by-name/pl/plistcpp/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/pl/plistcpp/package.nix b/pkgs/by-name/pl/plistcpp/package.nix
index 4b1aea8d1218..73c4179960b3 100644
--- a/pkgs/by-name/pl/plistcpp/package.nix
+++ b/pkgs/by-name/pl/plistcpp/package.nix
@@ -21,6 +21,9 @@ stdenv.mkDerivation {
 
   postPatch = ''
     sed -i "1i #include <algorithm>" src/Plist.cpp
+
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required (VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   nativeBuildInputs = [

From 3aa934399eac85f6673909dc13d7f0cfc2df4ca7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 09:07:36 +0000
Subject: [PATCH 4309/6226] terraform-providers.hashicorp_azurerm: 4.50.0 ->
 4.51.0

---
 .../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 f88925a16688..708f87a0c25a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -516,11 +516,11 @@
     "vendorHash": null
   },
   "hashicorp_azurerm": {
-    "hash": "sha256-sWSz/ixfrJOf5hS5PV70jXfsAD+nhL3PS8wLLGnndQI=",
+    "hash": "sha256-kFjvjaUDmiK3IfO/hioTTTkUetij4CSYJ359bxmpG40=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm",
     "owner": "hashicorp",
     "repo": "terraform-provider-azurerm",
-    "rev": "v4.50.0",
+    "rev": "v4.51.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 9c9af80c0ea8e66687645abf16fc47ad25e9f09f Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Fri, 31 Oct 2025 09:26:35 +0100
Subject: [PATCH 4310/6226] wash-cli: 0.39.0 -> 1.0.0-beta.10

https://github.com/wasmCloud/wash/releases/tag/wash-v1.0.0-beta.10
---
 pkgs/by-name/wa/wash-cli/package.nix | 60 ++++++++++------------------
 1 file changed, 22 insertions(+), 38 deletions(-)

diff --git a/pkgs/by-name/wa/wash-cli/package.nix b/pkgs/by-name/wa/wash-cli/package.nix
index 89375f733618..ca0455f62d50 100644
--- a/pkgs/by-name/wa/wash-cli/package.nix
+++ b/pkgs/by-name/wa/wash-cli/package.nix
@@ -1,51 +1,35 @@
 {
   lib,
-  fetchCrate,
+  fetchFromGitHub,
   rustPlatform,
-  pkg-config,
-  openssl,
-  fetchurl,
 }:
 
-let
-  wasiPreviewCommandComponentAdapter = fetchurl {
-    url = "https://github.com/bytecodealliance/wasmtime/releases/download/v22.0.0/wasi_snapshot_preview1.command.wasm";
-    hash = "sha256-UVBFddlI0Yh1ZNs0b2jSnKsHvGGAS5U09yuwm8Q6lxw=";
-  };
-  wasiPreviewReactorComponentAdapter = fetchurl {
-    url = "https://github.com/bytecodealliance/wasmtime/releases/download/v22.0.0/wasi_snapshot_preview1.reactor.wasm";
-    hash = "sha256-oE53IRMZgysSWT7RhrpZJjdaIyzCRf0h4d1yjqj/PSk=";
-  };
-
-in
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "wash-cli";
-  version = "0.39.0";
+  version = "1.0.0-beta.10";
 
-  src = fetchCrate {
-    inherit version pname;
-    hash = "sha256-qOxYBhwkcn4g1cUBHuF0AoecpxN4ukgTjBnzVhWtw7A=";
+  src = fetchFromGitHub {
+    owner = "wasmCloud";
+    repo = "wash";
+    tag = "wash-v${finalAttrs.version}";
+    hash = "sha256-g1OXyxLSKicMz0mnTyHNmihtt5WMx91bNo83NhZpx9s=";
   };
 
-  cargoHash = "sha256-dPHzRZh5jBxbPt+1a9wVbsBclAkfrcAXhpZgTw7e4Qo=";
+  cargoHash = "sha256-/Dah1F3pJBqtrCw7iVRGidQUl8rmD31Eoqva9ejc1iw=";
 
-  nativeBuildInputs = [ pkg-config ];
+  checkFlags = [
+    # Requires internet access
+    "--skip=test_end_to_end_template_to_execution"
+    "--skip=test_plugin_test_inspect_comprehensive"
+    "--skip=test_pull_and_validate_ghcr_component"
+  ];
 
-  buildInputs = [ openssl ];
-
-  preBuild = "
-    export WASI_PREVIEW1_COMMAND_COMPONENT_ADAPTER=${wasiPreviewCommandComponentAdapter}
-    export WASI_PREVIEW1_REACTOR_COMPONENT_ADAPTER=${wasiPreviewReactorComponentAdapter}
-  ";
-
-  # Tests require the internet and don't work when running in nix
-  doCheck = false;
-
-  meta = with lib; {
-    description = "wasmCloud Shell (wash) CLI tool";
-    homepage = "https://wasmcloud.com/";
+  meta = {
+    description = "Command-line tool for developing, building, and managing WebAssembly components";
+    homepage = "https://github.com/wasmCloud/wash";
+    changelog = "https://github.com/wasmCloud/wash/releases/tag/wash-v${finalAttrs.version}";
     mainProgram = "wash";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ bloveless ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ bloveless ];
   };
-}
+})

From ec72e4fb1505d52c06fec2e9cedd2970648a15fd Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 31 Oct 2025 09:11:53 +0000
Subject: [PATCH 4311/6226] ruff: 0.14.2 -> 0.14.3

Diff: https://github.com/astral-sh/ruff/compare/0.14.2...0.14.3

Changelog: https://github.com/astral-sh/ruff/releases/tag/0.14.3
---
 pkgs/by-name/ru/ruff/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 1f8b1afdd4a0..3d1547d0bf11 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -16,18 +16,18 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruff";
-  version = "0.14.2";
+  version = "0.14.3";
 
   src = fetchFromGitHub {
     owner = "astral-sh";
     repo = "ruff";
     tag = finalAttrs.version;
-    hash = "sha256-bHcmnfbdPzCX/Eqy5o+hVqhggfsPwZeUVjXV9wF6fNE=";
+    hash = "sha256-iYXZyB0s3rlGV3HQLN1fuAohFUm/53VLAwA3Ahj6HzM=";
   };
 
   cargoBuildFlags = [ "--package=ruff" ];
 
-  cargoHash = "sha256-lAluzoRONfkyspcMCp7wNei0R3dgpAwwwpRAmbTNl1k=";
+  cargoHash = "sha256-dYXFNe+nglKelgzi2Afo0AJyt53qfCAJ7reTMMfjWOI=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From cab1853414d6de3ee962e2c4ef7f0f7a88a62783 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Fri, 31 Oct 2025 09:12:32 +0000
Subject: [PATCH 4312/6226] codex: 0.50.0 -> 0.53.0

---
 pkgs/by-name/co/codex/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index 3be9b3d74537..32896d0b6a1b 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -14,18 +14,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codex";
-  version = "0.50.0";
+  version = "0.53.0";
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "codex";
     tag = "rust-v${finalAttrs.version}";
-    hash = "sha256-8qNQ92VV0aog3USzeAMqWXws7kaQ//6/A/M85USTTXY=";
+    hash = "sha256-sDL7gpq73RyyTgi97sxWDq6mhqQiYLyvSN76H8Pp3Uk=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/codex-rs";
 
-  cargoHash = "sha256-T6Zt5U2aCJWflwKzTbJXwK+BeE7L6IP4WAmISitrpRg=";
+  cargoHash = "sha256-EXDvcCY1l2C/IVJLQtou11Lmcsrn8SBGCo8DexEjpbg=";
 
   nativeBuildInputs = [
     installShellFiles

From 627199717d1fab47733be9255bac6374ee1240b2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 09:19:25 +0000
Subject: [PATCH 4313/6226] libretro-shaders-slang: 0-unstable-2025-10-27 ->
 0-unstable-2025-10-30

---
 pkgs/by-name/li/libretro-shaders-slang/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix
index 656354f80d7e..4d294e14732f 100644
--- a/pkgs/by-name/li/libretro-shaders-slang/package.nix
+++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "libretro-shaders-slang";
-  version = "0-unstable-2025-10-27";
+  version = "0-unstable-2025-10-30";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "slang-shaders";
-    rev = "1e632419233373cc72c104467ca6f7b8229c7594";
-    hash = "sha256-PrSZUi2II6ppks5U4c9VTG8C72fp5ZGuI0/dqAKd9IY=";
+    rev = "bb15fc268529cad6132f288f90e87c07c37212e3";
+    hash = "sha256-EVthZs6zrqJYWpTPae8ZNxY9J69YauVxr45MQ0OXQc4=";
   };
 
   dontConfigure = true;

From 6b79c98c5a7508c3598dcca4f5bf549a7c10fbcf Mon Sep 17 00:00:00 2001
From: Kirill Radzikhovskyy <kirillrdy@gmail.com>
Date: Fri, 31 Oct 2025 18:32:37 +0900
Subject: [PATCH 4314/6226] awsebcli: 3.25.1 -> 3.25.2

Changelog: https://github.com/aws/aws-elastic-beanstalk-cli/blob/3.25.2/CHANGES.rst
---
 pkgs/by-name/aw/awsebcli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix
index 951ffa898bce..e8df0f738cdc 100644
--- a/pkgs/by-name/aw/awsebcli/package.nix
+++ b/pkgs/by-name/aw/awsebcli/package.nix
@@ -25,14 +25,14 @@ in
 
 python.pkgs.buildPythonApplication rec {
   pname = "awsebcli";
-  version = "3.25.1";
+  version = "3.25.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-elastic-beanstalk-cli";
     tag = version;
-    hash = "sha256-objIzpYMyuFjEc85H9dXhQez3MZfNu3lWSWm6+E2iJs=";
+    hash = "sha256-6PeOn0owjEjTWdEwgXILiGq+6T5GBBc61viiG5GNeYo=";
   };
 
   pythonRelaxDeps = [

From f4965728453e79f4697e39a870cbd0746bf65936 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Fri, 31 Oct 2025 09:56:07 +0000
Subject: [PATCH 4315/6226] claude-code: 2.0.29 -> 2.0.30

---
 .../vscode/extensions/anthropic.claude-code/default.nix     | 4 ++--
 pkgs/by-name/cl/claude-code/package-lock.json               | 4 ++--
 pkgs/by-name/cl/claude-code/package.nix                     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 94ccac2bd80d..a49434ee5ddd 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "2.0.29";
-    hash = "sha256-g5k2Lov2BBxDR2TCSiVVU8+6jo4ajp0IIYJnVmg/NMQ=";
+    version = "2.0.30";
+    hash = "sha256-KQ+3yk5WmHIiu6evpPSWfzEbqVKFj2XY8wwGxcqGOJc=";
   };
 
   meta = {
diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index a101b2ac2361..b27f98862384 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.0.29",
+  "version": "2.0.30",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.0.29",
+      "version": "2.0.30",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index cc7c9e82eec7..91202e5bb751 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,14 +7,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.0.29";
+  version = "2.0.30";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-6YN0iSX05S+CqZ4NCDM1D+vGlLNV29NpPaVd31JN/u4=";
+    hash = "sha256-8XpxFnS+d8xYvK21bsVyCz879Gl39i/wDWr6RtEGE3Q=";
   };
 
-  npmDepsHash = "sha256-ULesV9VeFhJRBJdTexCp92wuUMj6abNQ2xE+ZtcpzqE=";
+  npmDepsHash = "sha256-ZDRgLH3AhkcLBrzUys/ON2OBvBV7trPmlOJ2l6gQpV4=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From f4c393066fab5bbb9b84af673273acdf592ffcc1 Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 31 Oct 2025 18:57:31 +0900
Subject: [PATCH 4316/6226] gitlab-container-registry: set `meta.mainProgram`

---
 pkgs/by-name/gi/gitlab-container-registry/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix
index a460c4c5de58..b21069e3614f 100644
--- a/pkgs/by-name/gi/gitlab-container-registry/package.nix
+++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix
@@ -42,5 +42,6 @@ buildGo124Module rec {
       cyberus
     ];
     platforms = platforms.unix;
+    mainProgram = "registry";
   };
 }

From 6ae5f33c8570507704f24920393e5f6ff3dbb441 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 29 Oct 2025 21:06:21 +0100
Subject: [PATCH 4317/6226] workflows/merge-group: compare eval against
 previous queue item

This runs the compare step in the merge queue, to get a combined diff
against the previous queue item. This can be used as a base for multiple
different features in the future, for example preventing accidental mass
rebuilds in the merge queue, or diffing of packages' meta.
---
 .github/workflows/eval.yml        | 27 ++++++++++++++++++---------
 .github/workflows/merge-group.yml |  1 +
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 4f950b5dffd3..3a7509622b78 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -113,7 +113,7 @@ jobs:
           MATRIX_SYSTEM: ${{ matrix.system }}
           MATRIX_VERSION: ${{ matrix.version || 'nixVersions.latest' }}
         run: |
-          nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned  -A eval.singleSystem \
+          nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A eval.singleSystem \
             --argstr evalSystem "$MATRIX_SYSTEM" \
             --arg chunkSize 8000 \
             --argstr nixPath "$MATRIX_VERSION" \
@@ -122,19 +122,29 @@ jobs:
           # Note: Keep the same further down in sync!
 
       - name: Evaluate the ${{ matrix.system }} output paths at the target commit
-        if: inputs.targetSha
         env:
           MATRIX_SYSTEM: ${{ matrix.system }}
-        # This is very quick, because it pulls the eval results from Cachix.
         run: |
-          nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.singleSystem \
+          TARGET_DRV=$(nix-instantiate nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.singleSystem \
             --argstr evalSystem "$MATRIX_SYSTEM" \
             --arg chunkSize 8000 \
-            --argstr nixPath "nixVersions.latest" \
-            --out-link target
+            --argstr nixPath "nixVersions.latest")
+
+          # Try to fetch this from Cachix a few times, for up to 30 seconds. This avoids running Eval
+          # twice in the Merge Queue, when a later item finishes Eval at the merge commit earlier.
+          for _i in {1..6}; do
+            # Using --max-jobs 0 will cause nix-build to fail if this can't be substituted from cachix.
+            if nix-build "$TARGET_DRV" --max-jobs 0; then
+              break
+            fi
+            sleep 5
+          done
+
+          # Either fetches from Cachix or runs Eval itself. The fallback is required
+          # for pull requests into wip-branches without merge queue.
+          nix-build "$TARGET_DRV" --out-link target
 
       - name: Compare outpaths against the target branch
-        if: inputs.targetSha
         env:
           MATRIX_SYSTEM: ${{ matrix.system }}
         run: |
@@ -145,7 +155,6 @@ jobs:
             --out-link diff
 
       - name: Upload outpaths diff and stats
-        if: inputs.targetSha
         uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: ${{ inputs.artifact-prefix }}${{ matrix.version && format('{0}-', matrix.version) || '' }}diff-${{ matrix.system }}
@@ -154,7 +163,7 @@ jobs:
   compare:
     runs-on: ubuntu-24.04-arm
     needs: [eval]
-    if: inputs.targetSha && !cancelled() && !failure()
+    if: ${{ !cancelled() && !failure() }}
     permissions:
       statuses: write
     timeout-minutes: 5
diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml
index 32fe9130b835..fe3d8fcc27d0 100644
--- a/.github/workflows/merge-group.yml
+++ b/.github/workflows/merge-group.yml
@@ -59,6 +59,7 @@ jobs:
     with:
       artifact-prefix: ${{ inputs.artifact-prefix }}
       mergedSha: ${{ inputs.mergedSha || github.event.merge_group.head_sha }}
+      targetSha: ${{ inputs.targetSha || github.event.merge_group.base_sha }}
       systems: ${{ needs.prepare.outputs.systems }}
 
   # This job's only purpose is to create the target for the "Required Status Checks" branch ruleset.

From 350a469f731122997b3a54b876f9b3a59fa0b63d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 30 Oct 2025 08:42:11 +0100
Subject: [PATCH 4318/6226] ci/eval/diff: avoid copying paths.json

Currently the `diff-<system>` artifacts are 6-7 MB in size - and almost
all of that is the `paths.json` file, which is only used to generate the
diff itself. This had been stored in the artifact previously for
debugging purposes. Ever since we moved to Cachix this is not required
anymore, since it's possible to run the same eval locally and thus fetch
the `eval.singleSystem` result, including `paths.json`, from Cachix.

This will be even more helpful when the next step adds `meta.json` -
which is magnitudes bigger than `paths.json`.
---
 ci/eval/diff.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/ci/eval/diff.nix b/ci/eval/diff.nix
index 692e2ec60194..0f757ce3dd12 100644
--- a/ci/eval/diff.nix
+++ b/ci/eval/diff.nix
@@ -80,7 +80,10 @@ in
 runCommand "diff" { } ''
   mkdir -p $out/${evalSystem}
 
-  cp -r ${before} $out/before
-  cp -r ${after} $out/after
+  cp -r --no-preserve=mode ${before} $out/before
+  cp -r --no-preserve=mode ${after} $out/after
+  # JSON files will be processed above explicitly, so avoid copying over
+  # the source files to keep the artifacts smaller.
+  find $out/before $out/after -iname '*.json' -delete
   cp ${diffJson} $out/${evalSystem}/diff.json
 ''

From 5c01bd9df67fe9590e337d1551ef29eeb8c98835 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 30 Oct 2025 08:58:45 +0100
Subject: [PATCH 4319/6226] ci/eval/utils: refactor to use lib.init

---
 ci/eval/compare/utils.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/eval/compare/utils.nix b/ci/eval/compare/utils.nix
index 65a558d8be60..969622ee16f1 100644
--- a/ci/eval/compare/utils.nix
+++ b/ci/eval/compare/utils.nix
@@ -22,7 +22,7 @@ rec {
       splittedPath = lib.splitString "." packagePlatformPath;
 
       # ["python312Packages" "numpy" "aarch64-linux"] -> ["python312Packages" "numpy"]
-      packagePath = lib.sublist 0 (lib.length splittedPath - 1) splittedPath;
+      packagePath = lib.init splittedPath;
 
       # "python312Packages.numpy"
       name = lib.concatStringsSep "." packagePath;

From 498574f238960ab7401cb91138036ac5c98955ba Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 30 Oct 2025 11:22:27 +0100
Subject: [PATCH 4320/6226] workflows/eval: upload maintainer list of all
 packages as artifact

This creates a simple mapping of all packages to github ids of all their
maintainers. This is uploaded as an artifact and is then available for
download on the latest commit of each branch with a merge queue. This
will allow scheduled jobs to use this information for setting
maintainer-related labels, to request reviewers and to implement the
merge-bot.

The advantage over querying this information directly via Nix in each
case: The scheduled job does not need to install Nix and does not need
to checkout the target branch.

Compared to obtaining the maintainer information just for a single PR
during Eval, this will allow retroactively changing maintainers for a
package: For example, it allows to request a new maintainer as reviewer
for a PR that was created before they became maintainer, but is still
open - and similarly for maintainer labels and merge-bot rights.

None of these extensions are implemented by this PR, yet.
---
 .github/workflows/eval.yml |  6 ++++++
 ci/eval/default.nix        | 10 ++++++++++
 ci/eval/diff.nix           | 22 ++++++++++++++++++++++
 3 files changed, 38 insertions(+)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 3a7509622b78..b037b29c9558 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -194,6 +194,12 @@ jobs:
             --arg diffDir ./diff \
             --out-link combined
 
+      - name: Upload the maintainer list
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
+        with:
+          name: ${{ inputs.artifact-prefix }}maintainers
+          path: combined/maintainers.json
+
       - name: Compare against the target branch
         env:
           AUTHOR_ID: ${{ github.event.pull_request.user.id }}
diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 9cc5ad6857b7..75b2eb9cba5d 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -111,6 +111,7 @@ let
           --option allow-import-from-derivation false \
           --query --available \
           --out-path --json \
+          --meta \
           --show-trace \
           --arg chunkSize "$chunkSize" \
           --arg myChunk "$myChunk" \
@@ -204,6 +205,7 @@ let
         fi
 
         cat "$chunkOutputDir"/result/* | jq -s 'add | map_values(.outputs)' > $out/${evalSystem}/paths.json
+        cat "$chunkOutputDir"/result/* | jq -s 'add | map_values(.meta)' > $out/${evalSystem}/meta.json
       '';
 
   diff = callPackage ./diff.nix { };
@@ -232,6 +234,14 @@ let
           })
         ' > $out/combined-diff.json
 
+        # Combine maintainers from all systems
+        cat ${diffDir}/*/maintainers.json | jq -s '
+          add | group_by(.package) | map({
+            key: .[0].package,
+            value: map(.maintainers) | flatten | unique
+          }) | from_entries
+        ' > $out/maintainers.json
+
         mkdir -p $out/before/stats
         for d in ${diffDir}/before/*; do
           cp -r "$d"/stats-by-chunk $out/before/stats/$(basename "$d")
diff --git a/ci/eval/diff.nix b/ci/eval/diff.nix
index 0f757ce3dd12..bb8ba8088c7f 100644
--- a/ci/eval/diff.nix
+++ b/ci/eval/diff.nix
@@ -76,6 +76,27 @@ let
   afterAttrs = getAttrs after;
   diffAttrs = diff beforeAttrs afterAttrs;
   diffJson = writeText "diff.json" (builtins.toJSON diffAttrs);
+
+  # The maintainer list is not diffed, but just taken as is, to provide a map
+  # of maintainers on the target branch. A list of GitHub IDs is sufficient for
+  # all our purposes and reduces size massively.
+  meta = lib.importJSON "${after}/${evalSystem}/meta.json";
+  maintainers = lib.pipe meta [
+    (lib.mapAttrsToList (
+      k: v: {
+        # splits off the platform suffix
+        package = lib.pipe k [
+          (lib.splitString ".")
+          lib.init
+          (lib.concatStringsSep ".")
+        ];
+        maintainers = map (m: m.githubId) v.maintainers or [ ];
+      }
+    ))
+    # Some paths don't have a platform suffix, those will appear with an empty package here.
+    (lib.filter ({ package, maintainers }: package != "" && maintainers != [ ]))
+  ];
+  maintainersJson = writeText "maintainers.json" (builtins.toJSON maintainers);
 in
 runCommand "diff" { } ''
   mkdir -p $out/${evalSystem}
@@ -86,4 +107,5 @@ runCommand "diff" { } ''
   # the source files to keep the artifacts smaller.
   find $out/before $out/after -iname '*.json' -delete
   cp ${diffJson} $out/${evalSystem}/diff.json
+  cp ${maintainersJson} $out/${evalSystem}/maintainers.json
 ''

From 77b2de23b2279e4e622d087f15353577f55910c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 09:59:58 +0000
Subject: [PATCH 4321/6226] coder: 2.26.2 -> 2.26.3

---
 pkgs/by-name/co/coder/package.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/co/coder/package.nix b/pkgs/by-name/co/coder/package.nix
index 3621ccf59f16..ab969d17d3c7 100644
--- a/pkgs/by-name/co/coder/package.nix
+++ b/pkgs/by-name/co/coder/package.nix
@@ -15,21 +15,21 @@ let
 
   channels = {
     stable = {
-      version = "2.26.2";
+      version = "2.26.3";
       hash = {
-        x86_64-linux = "sha256-bIt20dfLgKtR/pnm2ZKAdMOw5tBGSiL7VdY7n1+KtGo=";
-        x86_64-darwin = "sha256-VSoNXyHXKLJTxEOCNQ04j4bk3s9zRL9ITxfO8Ow7Sw4=";
-        aarch64-linux = "sha256-7J6KneDZZyXwaM0ebTmVezUFcwR9w7dxIDsp9aSuPbs=";
-        aarch64-darwin = "sha256-tfECXi7deg73fyQU10a5G+XU7Ql1A/jyOlJwAAVqeA8=";
+        x86_64-linux = "sha256-CqV3fCx3TtMLFjzo0Y7/vpAgXyOLABiFyqS8N5pA6xc=";
+        x86_64-darwin = "sha256-PDPU3k1Bao5ibLFx3Zjbh1xsxSpJWUOOHuRbuwMmYDg=";
+        aarch64-linux = "sha256-iq9LPHK6wPSdDRQqWRPr7OfN/HoESIIkOxf9luRS9ck=";
+        aarch64-darwin = "sha256-n+jUocq1MaDRe14gibeA+ujLoGcSCdKQ58wihcTmdlI=";
       };
     };
     mainline = {
-      version = "2.27.1";
+      version = "2.27.3";
       hash = {
-        x86_64-linux = "sha256-BkUC6D9Qdewj+nQo8Oi8BiJkrdSnud4bFHDbXCthKqQ=";
-        x86_64-darwin = "sha256-OPL7Fb0mUhGBEjdjPOTh3W6SWqOB7JvVosft/6K0Sos=";
-        aarch64-linux = "sha256-oMCR5hroO9HqygakQwxRTlrJiha2MTj+gQsY8WEVe7w=";
-        aarch64-darwin = "sha256-UDOaG+cT0X6t2UX4N7Wlgok9MxLLDTDZ9eY9TMN6iT8=";
+        x86_64-linux = "sha256-VGAvqipJkQM+zxBhFt57VasX/gM626xPRpV0uR7FEJA=";
+        x86_64-darwin = "sha256-j41nX7CQhLsjVCBp6vaxmOcbXKXXz/iFm/TY2HXLWHA=";
+        aarch64-linux = "sha256-dsjwZSoC2bQj4Zn/M7SlN83ZKMEpBjs78J4PrNGDHxE=";
+        aarch64-darwin = "sha256-TLB3E1l+UNVsvgy0TVtA17lqagtBkKA4Bd2SbMjTalI=";
       };
     };
   };

From 39e93806aa7560e5b5bf06d344698d893cc045cf Mon Sep 17 00:00:00 2001
From: h7x4 <h7x4@nani.wtf>
Date: Fri, 31 Oct 2025 11:03:32 +0100
Subject: [PATCH 4322/6226] Revert "various: replace
 `systemd.services.<name>.{script,preStart}` with `ExecStart{,Pre}`"

---
 nixos/modules/security/soteria.nix            |  2 +-
 .../services/blockchain/ethereum/geth.nix     | 68 +++++++++----------
 .../services/computing/boinc/client.nix       |  4 +-
 .../services/computing/slurm/slurm.nix        |  6 +-
 .../services/games/minetest-server.nix        |  9 ++-
 nixos/modules/services/hardware/pommed.nix    |  2 +-
 .../services/home-automation/zigbee2mqtt.nix  |  4 +-
 nixos/modules/services/logging/heartbeat.nix  |  4 +-
 .../modules/services/logging/journalbeat.nix  |  8 +--
 .../services/logging/journaldriver.nix        |  2 +-
 nixos/modules/services/logging/promtail.nix   |  5 +-
 nixos/modules/services/logging/syslog-ng.nix  |  2 +-
 nixos/modules/services/mail/cyrus-imap.nix    |  4 +-
 nixos/modules/services/mail/dkimproxy-out.nix |  4 +-
 nixos/modules/services/mail/nullmailer.nix    |  8 +--
 nixos/modules/services/mail/postgrey.nix      | 10 +--
 nixos/modules/services/mail/stalwart-mail.nix | 19 +++---
 nixos/modules/services/misc/autofs.nix        |  7 +-
 nixos/modules/services/misc/dictd.nix         |  2 +-
 .../modules/services/misc/docker-registry.nix |  4 +-
 nixos/modules/services/misc/errbot.nix        |  8 +--
 nixos/modules/services/misc/gollum.nix        |  8 ++-
 nixos/modules/services/misc/paperless.nix     |  9 ++-
 nixos/modules/services/misc/svnserve.nix      |  4 +-
 .../modules/services/misc/tandoor-recipes.nix | 13 ++--
 .../prometheus/exporters/pgbouncer.nix        |  4 +-
 .../modules/services/networking/dnscache.nix  |  9 +--
 .../services/networking/freeradius.nix        |  4 +-
 .../networking/ircd-hybrid/default.nix        |  2 +-
 nixos/modules/services/networking/ncps.nix    |  5 +-
 .../services/networking/nghttpx/default.nix   |  4 +-
 .../networking/nm-file-secret-agent.nix       |  2 +-
 nixos/modules/services/networking/oidentd.nix |  2 +-
 nixos/modules/services/networking/oink.nix    |  2 +-
 nixos/modules/services/networking/opengfw.nix | 29 ++++----
 .../modules/services/networking/ostinato.nix  |  4 +-
 .../modules/services/networking/pangolin.nix  | 10 +--
 nixos/modules/services/networking/pdnsd.nix   | 10 +--
 .../modules/services/networking/redsocks.nix  |  2 +-
 .../modules/services/networking/smokeping.nix |  8 +--
 nixos/modules/services/networking/supybot.nix |  6 +-
 .../modules/services/networking/tailscale.nix |  4 +-
 .../modules/services/networking/thelounge.nix |  2 +-
 nixos/modules/services/networking/tinydns.nix |  9 ++-
 nixos/modules/services/networking/toxvpn.nix  | 25 +++----
 .../modules/services/networking/twingate.nix  |  2 +-
 nixos/modules/services/networking/xinetd.nix  |  3 +-
 nixos/modules/services/networking/xray.nix    |  4 +-
 nixos/modules/services/networking/zerobin.nix |  8 +--
 nixos/modules/services/security/authelia.nix  |  2 +-
 nixos/modules/services/security/certmgr.nix   | 10 +--
 .../services/security/hologram-agent.nix      |  4 +-
 nixos/modules/services/web-apps/bluemap.nix   |  4 +-
 nixos/modules/services/web-apps/cloudlog.nix  | 21 ++----
 nixos/modules/services/web-apps/galene.nix    | 11 +--
 nixos/modules/services/web-apps/glitchtip.nix |  5 +-
 .../services/web-apps/healthchecks.nix        | 11 +--
 .../modules/services/web-apps/mediagoblin.nix | 34 +++++-----
 nixos/modules/services/web-apps/miniflux.nix  | 12 +++-
 nixos/modules/services/web-apps/misskey.nix   | 24 +++----
 nixos/modules/services/web-apps/nexus.nix     |  3 +-
 nixos/modules/services/web-apps/part-db.nix   |  5 +-
 .../services/web-apps/peering-manager.nix     |  5 +-
 .../services/web-apps/silverbullet.nix        |  4 +-
 nixos/modules/services/web-apps/wakapi.nix    |  6 +-
 .../services/web-servers/h2o/default.nix      |  3 +-
 .../services/web-servers/jboss/default.nix    |  2 +-
 nixos/tests/paperless.nix                     |  4 +-
 68 files changed, 304 insertions(+), 242 deletions(-)

diff --git a/nixos/modules/security/soteria.nix b/nixos/modules/security/soteria.nix
index 1e2b59e5714d..3b2f8349c4e5 100644
--- a/nixos/modules/security/soteria.nix
+++ b/nixos/modules/security/soteria.nix
@@ -36,8 +36,8 @@ in
       wants = [ "graphical-session.target" ];
       after = [ "graphical-session.target" ];
 
+      script = lib.getExe cfg.package;
       serviceConfig = {
-        ExecStart = lib.getExe cfg.package;
         Type = "simple";
         Restart = "on-failure";
         RestartSec = 1;
diff --git a/nixos/modules/services/blockchain/ethereum/geth.nix b/nixos/modules/services/blockchain/ethereum/geth.nix
index f58ca9d9819a..570c556ef849 100644
--- a/nixos/modules/services/blockchain/ethereum/geth.nix
+++ b/nixos/modules/services/blockchain/ethereum/geth.nix
@@ -206,43 +206,6 @@ in
           after = [ "network.target" ];
 
           serviceConfig = {
-            ExecStart =
-              let
-                args = lib.cli.toCommandLineShellGNU { } {
-                  inherit (cfg)
-                    syncmode
-                    gcmode
-                    port
-                    maxpeers
-                    ;
-                  nousb = true;
-                  ipcdisable = true;
-                  datadir = dataDir;
-                  ${cfg.network} = true;
-
-                  http = cfg.http.enable;
-                  "http.addr" = if cfg.http.enable then cfg.http.address else null;
-                  "http.port" = if cfg.http.enable then cfg.http.port else null;
-                  "http.api" = if cfg.http.apis != null then lib.concatStringsSep "," cfg.http.apis else null;
-
-                  ws = cfg.websocket.enable;
-                  "ws.addr" = if cfg.websocket.enable then cfg.websocket.address else null;
-                  "ws.port" = if cfg.websocket.enable then cfg.websocket.port else null;
-                  "ws.api" = if cfg.websocket.apis != null then lib.concatStringsSep "," cfg.websocket.apis else null;
-
-                  metrics = cfg.metrics.enable;
-                  "metrics.addr" = if cfg.metrics.enable then cfg.metrics.address else null;
-                  "metrics.port" = if cfg.metrics.enable then cfg.metrics.port else null;
-
-                  "authrpc.addr" = cfg.authrpc.address;
-                  "authrpc.port" = cfg.authrpc.port;
-                  "authrpc.vhosts" = lib.concatStringsSep "," cfg.authrpc.vhosts;
-                  "authrpc.jwtsecret" =
-                    if cfg.authrpc.jwtsecret != "" then cfg.authrpc.jwtsecret else "${dataDir}/geth/jwtsecret";
-                };
-              in
-              "${lib.getExe cfg.package} ${args} ${lib.escapeShellArgs cfg.extraArgs}";
-
             DynamicUser = true;
             Restart = "always";
             StateDirectory = stateDir;
@@ -254,6 +217,37 @@ in
             PrivateDevices = "true";
             MemoryDenyWriteExecute = "true";
           };
+
+          script = ''
+            ${cfg.package}/bin/geth \
+              --nousb \
+              --ipcdisable \
+              ${lib.optionalString (cfg.network != null) ''--${cfg.network}''} \
+              --syncmode ${cfg.syncmode} \
+              --gcmode ${cfg.gcmode} \
+              --port ${toString cfg.port} \
+              --maxpeers ${toString cfg.maxpeers} \
+              ${lib.optionalString cfg.http.enable ''--http --http.addr ${cfg.http.address} --http.port ${toString cfg.http.port}''} \
+              ${
+                lib.optionalString (cfg.http.apis != null) ''--http.api ${lib.concatStringsSep "," cfg.http.apis}''
+              } \
+              ${lib.optionalString cfg.websocket.enable ''--ws --ws.addr ${cfg.websocket.address} --ws.port ${toString cfg.websocket.port}''} \
+              ${
+                lib.optionalString (
+                  cfg.websocket.apis != null
+                ) ''--ws.api ${lib.concatStringsSep "," cfg.websocket.apis}''
+              } \
+              ${lib.optionalString cfg.metrics.enable ''--metrics --metrics.addr ${cfg.metrics.address} --metrics.port ${toString cfg.metrics.port}''} \
+              --authrpc.addr ${cfg.authrpc.address} --authrpc.port ${toString cfg.authrpc.port} --authrpc.vhosts ${lib.concatStringsSep "," cfg.authrpc.vhosts} \
+              ${
+                if (cfg.authrpc.jwtsecret != "") then
+                  ''--authrpc.jwtsecret ${cfg.authrpc.jwtsecret}''
+                else
+                  ''--authrpc.jwtsecret ${dataDir}/geth/jwtsecret''
+              } \
+              ${lib.escapeShellArgs cfg.extraArgs} \
+              --datadir ${dataDir}
+          '';
         }
       ))
     ) eachGeth;
diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix
index a0d244337be8..8467e4b297c1 100644
--- a/nixos/modules/services/computing/boinc/client.nix
+++ b/nixos/modules/services/computing/boinc/client.nix
@@ -99,8 +99,10 @@ in
       description = "BOINC Client";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
+      script = ''
+        exec ${fhsEnvExecutable} --dir ${cfg.dataDir} ${allowRemoteGuiRpcFlag}
+      '';
       serviceConfig = {
-        ExecStart = "${fhsEnvExecutable} --dir ${cfg.dataDir} ${allowRemoteGuiRpcFlag}";
         User = "boinc";
         Nice = 10;
       };
diff --git a/nixos/modules/services/computing/slurm/slurm.nix b/nixos/modules/services/computing/slurm/slurm.nix
index 989053da173b..4d01d4533f67 100644
--- a/nixos/modules/services/computing/slurm/slurm.nix
+++ b/nixos/modules/services/computing/slurm/slurm.nix
@@ -475,13 +475,15 @@ in
             ''}
           '';
 
-          environment.SLURM_CONF = configPath;
+          script = ''
+            export SLURM_CONF=${configPath}
+            exec ${cfg.package}/bin/slurmdbd -D
+          '';
 
           serviceConfig = {
             RuntimeDirectory = "slurmdbd";
             Type = "simple";
             PIDFile = "/run/slurmdbd.pid";
-            ExecStart = "${lib.getExe' cfg.package "slurmdbd"} -D";
             ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
           };
         };
diff --git a/nixos/modules/services/games/minetest-server.nix b/nixos/modules/services/games/minetest-server.nix
index 49b0f88d9674..d1718d3bca9d 100644
--- a/nixos/modules/services/games/minetest-server.nix
+++ b/nixos/modules/services/games/minetest-server.nix
@@ -172,9 +172,12 @@ in
       serviceConfig.Restart = "always";
       serviceConfig.User = "minetest";
       serviceConfig.Group = "minetest";
-      serviceConfig.StateDirectory = "minetest";
-      serviceConfig.WorkingDirectory = "/var/lib/minetest";
-      serviceConfig.ExecStart = "${pkgs.minetest}/bin/minetest ${lib.escapeShellArgs flags}";
+
+      script = ''
+        cd /var/lib/minetest
+
+        exec ${pkgs.minetest}/bin/minetest ${lib.escapeShellArgs flags}
+      '';
     };
   };
 }
diff --git a/nixos/modules/services/hardware/pommed.nix b/nixos/modules/services/hardware/pommed.nix
index ba627c009efd..3bb53ce4603a 100644
--- a/nixos/modules/services/hardware/pommed.nix
+++ b/nixos/modules/services/hardware/pommed.nix
@@ -51,7 +51,7 @@ in
     systemd.services.pommed = {
       description = "Pommed Apple Hotkeys Daemon";
       wantedBy = [ "multi-user.target" ];
-      serviceConfig.ExecStart = "${lib.getExe pkgs.pommed_light} -f";
+      script = "${pkgs.pommed_light}/bin/pommed -f";
     };
   };
 }
diff --git a/nixos/modules/services/home-automation/zigbee2mqtt.nix b/nixos/modules/services/home-automation/zigbee2mqtt.nix
index 0bf3a636c18e..d02cc7484991 100644
--- a/nixos/modules/services/home-automation/zigbee2mqtt.nix
+++ b/nixos/modules/services/home-automation/zigbee2mqtt.nix
@@ -79,7 +79,6 @@ in
       after = [ "network.target" ];
       environment.ZIGBEE2MQTT_DATA = cfg.dataDir;
       serviceConfig = {
-        ExecStartPre = "${lib.getExe' pkgs.coreutils "cp"} --no-preserve=mode ${configFile} '${cfg.dataDir}/configuration.yaml'";
         ExecStart = "${cfg.package}/bin/zigbee2mqtt";
         User = "zigbee2mqtt";
         Group = "zigbee2mqtt";
@@ -130,6 +129,9 @@ in
         ];
         UMask = "0077";
       };
+      preStart = ''
+        cp --no-preserve=mode ${configFile} "${cfg.dataDir}/configuration.yaml"
+      '';
     };
 
     users.users.zigbee2mqtt = {
diff --git a/nixos/modules/services/logging/heartbeat.nix b/nixos/modules/services/logging/heartbeat.nix
index 8cc99e84c9bf..2280c4349144 100644
--- a/nixos/modules/services/logging/heartbeat.nix
+++ b/nixos/modules/services/logging/heartbeat.nix
@@ -67,10 +67,12 @@ in
     systemd.services.heartbeat = {
       description = "heartbeat log shipper";
       wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        mkdir -p "${cfg.stateDir}"/{data,logs}
+      '';
       serviceConfig = {
         User = "nobody";
         AmbientCapabilities = "cap_net_raw";
-        ExecStartPre = "${lib.getExe' pkgs.coreutils "mkdir"} -p '${cfg.stateDir}'/data '${cfg.stateDir}'/logs";
         ExecStart = "${cfg.package}/bin/heartbeat -c \"${heartbeatYml}\" -path.data \"${cfg.stateDir}/data\" -path.logs \"${cfg.stateDir}/logs\"";
       };
     };
diff --git a/nixos/modules/services/logging/journalbeat.nix b/nixos/modules/services/logging/journalbeat.nix
index acd178234ab7..af178a3838d2 100644
--- a/nixos/modules/services/logging/journalbeat.nix
+++ b/nixos/modules/services/logging/journalbeat.nix
@@ -71,12 +71,12 @@ in
       wantedBy = [ "multi-user.target" ];
       wants = [ "elasticsearch.service" ];
       after = [ "elasticsearch.service" ];
+      preStart = ''
+        mkdir -p ${cfg.stateDir}/data
+        mkdir -p ${cfg.stateDir}/logs
+      '';
       serviceConfig = {
         StateDirectory = cfg.stateDir;
-        ExecStartPre = [
-          "${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.stateDir}/data"
-          "${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.stateDir}/logs"
-        ];
         ExecStart = ''
           ${cfg.package}/bin/journalbeat \
             -c ${journalbeatYml} \
diff --git a/nixos/modules/services/logging/journaldriver.nix b/nixos/modules/services/logging/journaldriver.nix
index d9f0ccd39d97..efb53de0b484 100644
--- a/nixos/modules/services/logging/journaldriver.nix
+++ b/nixos/modules/services/logging/journaldriver.nix
@@ -91,12 +91,12 @@ in
   config = mkIf cfg.enable {
     systemd.services.journaldriver = {
       description = "Stackdriver Logging journal forwarder";
+      script = "${pkgs.journaldriver}/bin/journaldriver";
       wants = [ "network-online.target" ];
       after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
 
       serviceConfig = {
-        ExecStart = lib.getExe pkgs.journaldriver;
         Restart = "always";
         DynamicUser = true;
 
diff --git a/nixos/modules/services/logging/promtail.nix b/nixos/modules/services/logging/promtail.nix
index 4bf59a783df1..f346070441b3 100644
--- a/nixos/modules/services/logging/promtail.nix
+++ b/nixos/modules/services/logging/promtail.nix
@@ -66,11 +66,14 @@ in
       wantedBy = [ "multi-user.target" ];
       stopIfChanged = false;
 
+      preStart = ''
+        ${lib.getExe pkgs.promtail} -config.file=${configFile} -check-syntax
+      '';
+
       serviceConfig = {
         Restart = "on-failure";
         TimeoutStopSec = 10;
 
-        ExecStartPre = "${lib.getExe pkgs.promtail} -config.file=${configFile} -check-syntax";
         ExecStart = "${pkgs.promtail}/bin/promtail -config.file=${configFile} ${escapeShellArgs cfg.extraFlags}";
 
         ProtectSystem = "strict";
diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix
index 6b3e7c3e599d..4c04d1f1f5dd 100644
--- a/nixos/modules/services/logging/syslog-ng.nix
+++ b/nixos/modules/services/logging/syslog-ng.nix
@@ -79,6 +79,7 @@ in
   config = lib.mkIf cfg.enable {
     systemd.services.syslog-ng = {
       description = "syslog-ng daemon";
+      preStart = "mkdir -p /{var,run}/syslog-ng";
       wantedBy = [ "multi-user.target" ];
       after = [ "multi-user.target" ]; # makes sure hostname etc is set
       serviceConfig = {
@@ -86,7 +87,6 @@ in
         PIDFile = pidFile;
         StandardOutput = "null";
         Restart = "on-failure";
-        ExecStartPre = "${lib.getExe' pkgs.coreutils "mkdir"} -p /var/syslog-ng /run/syslog-ng";
         ExecStart = "${cfg.package}/sbin/syslog-ng ${lib.concatStringsSep " " syslogngOptions}";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
       };
diff --git a/nixos/modules/services/mail/cyrus-imap.nix b/nixos/modules/services/mail/cyrus-imap.nix
index dc67ccaaad66..9ee7cf8ee44b 100644
--- a/nixos/modules/services/mail/cyrus-imap.nix
+++ b/nixos/modules/services/mail/cyrus-imap.nix
@@ -342,7 +342,6 @@ in
         User = if (cfg.user == null) then "cyrus" else cfg.user;
         Group = if (cfg.group == null) then "cyrus" else cfg.group;
         Type = "simple";
-        ExecStartPre = "${lib.getExe' pkgs.coreutils "mkdir"} -p '${cfg.imapdSettings.configdirectory}/socket' '${cfg.tmpDBDir}' /run/cyrus/proc /run/cyrus/lock";
         ExecStart = "${cyrus-imapdPkg}/libexec/master -l $LISTENQUEUE -C /etc/imapd.conf -M /etc/cyrus.conf -p /run/cyrus/master.pid -D";
         Restart = "on-failure";
         RestartSec = "1s";
@@ -368,6 +367,9 @@ in
         RestrictNamespaces = true;
         RestrictRealtime = true;
       };
+      preStart = ''
+        mkdir -p '${cfg.imapdSettings.configdirectory}/socket' '${cfg.tmpDBDir}' /run/cyrus/proc /run/cyrus/lock
+      '';
     };
     environment.systemPackages = [ cyrus-imapdPkg ];
   };
diff --git a/nixos/modules/services/mail/dkimproxy-out.nix b/nixos/modules/services/mail/dkimproxy-out.nix
index 168bbdd5a1a9..2fefcd6b68a2 100644
--- a/nixos/modules/services/mail/dkimproxy-out.nix
+++ b/nixos/modules/services/mail/dkimproxy-out.nix
@@ -109,8 +109,10 @@ in
             chown -R dkimproxy-out:dkimproxy-out "${keydir}"
           fi
         '';
+        script = ''
+          exec ${pkgs.dkimproxy}/bin/dkimproxy.out --conf_file=${configfile}
+        '';
         serviceConfig = {
-          ExecStart = "${pkgs.dkimproxy}/bin/dkimproxy.out --conf_file=${configfile}";
           User = "dkimproxy-out";
           PermissionsStartOnly = true;
         };
diff --git a/nixos/modules/services/mail/nullmailer.nix b/nixos/modules/services/mail/nullmailer.nix
index a8b1cf76f351..6dc278f89f29 100644
--- a/nixos/modules/services/mail/nullmailer.nix
+++ b/nixos/modules/services/mail/nullmailer.nix
@@ -245,13 +245,13 @@
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
 
+        preStart = ''
+          rm -f /var/spool/nullmailer/trigger && mkfifo -m 660 /var/spool/nullmailer/trigger
+        '';
+
         serviceConfig = {
           User = cfg.user;
           Group = cfg.group;
-          ExecStartPre = [
-            "${lib.getExe' pkgs.coreutils "rm"} -f /var/spool/nullmailer/trigger"
-            "${lib.getExe' pkgs.coreutils "mkfifo"} -m 660 /var/spool/nullmailer/trigger"
-          ];
           ExecStart = "${pkgs.nullmailer}/bin/nullmailer-send";
           Restart = "always";
         };
diff --git a/nixos/modules/services/mail/postgrey.nix b/nixos/modules/services/mail/postgrey.nix
index 67a97f6a244f..463757fa8440 100644
--- a/nixos/modules/services/mail/postgrey.nix
+++ b/nixos/modules/services/mail/postgrey.nix
@@ -210,13 +210,13 @@ in
         description = "Postfix Greylisting Service";
         wantedBy = [ "multi-user.target" ];
         before = [ "postfix.service" ];
+        preStart = ''
+          mkdir -p /var/postgrey
+          chown postgrey:postgrey /var/postgrey
+          chmod 0770 /var/postgrey
+        '';
         serviceConfig = {
           Type = "simple";
-          ExecStartPre = [
-            "${lib.getExe' pkgs.coreutils "mkdir"} -p /var/postgrey"
-            "${lib.getExe' pkgs.coreutils "chown"} postgrey:postgrey /var/postgrey"
-            "${lib.getExe' pkgs.coreutils "chmod"} 0770 /var/postgrey"
-          ];
           ExecStart = ''
             ${pkgs.postgrey}/bin/postgrey \
                       ${bind-flag} \
diff --git a/nixos/modules/services/mail/stalwart-mail.nix b/nixos/modules/services/mail/stalwart-mail.nix
index 3c1fc27e45f8..34004da62ef7 100644
--- a/nixos/modules/services/mail/stalwart-mail.nix
+++ b/nixos/modules/services/mail/stalwart-mail.nix
@@ -162,16 +162,17 @@ in
           "network.target"
         ];
 
+        preStart =
+          if useLegacyStorage then
+            ''
+              mkdir -p ${cfg.dataDir}/data/blobs
+            ''
+          else
+            ''
+              mkdir -p ${cfg.dataDir}/db
+            '';
+
         serviceConfig = {
-          ExecStartPre =
-            if useLegacyStorage then
-              ''
-                ${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.dataDir}/data/blobs
-              ''
-            else
-              ''
-                ${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.dataDir}/db
-              '';
           ExecStart = [
             ""
             "${lib.getExe cfg.package} --config=${configFile}"
diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix
index edfefac1fdf2..e258fb20b7ea 100644
--- a/nixos/modules/services/misc/autofs.nix
+++ b/nixos/modules/services/misc/autofs.nix
@@ -88,11 +88,14 @@ in
       wants = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
 
+      preStart = ''
+        # There should be only one autofs service managed by systemd, so this should be safe.
+        rm -f /tmp/autofs-running
+      '';
+
       serviceConfig = {
         Type = "forking";
         PIDFile = "/run/autofs.pid";
-        # There should be only one autofs service managed by systemd, so this should be safe.
-        ExecStartPre = "${lib.getExe' pkgs.coreutils "rm"} -f /tmp/autofs-running";
         ExecStart = "${pkgs.autofs5}/bin/automount ${lib.optionalString cfg.debug "-d"} -p /run/autofs.pid -t ${builtins.toString cfg.timeout} ${autoMaster}";
         ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";
       };
diff --git a/nixos/modules/services/misc/dictd.nix b/nixos/modules/services/misc/dictd.nix
index 3de6ccb1896e..b216459b2d9b 100644
--- a/nixos/modules/services/misc/dictd.nix
+++ b/nixos/modules/services/misc/dictd.nix
@@ -78,7 +78,7 @@ in
         # with code 143 instead of exiting with code 0.
         serviceConfig.SuccessExitStatus = [ 143 ];
         serviceConfig.Type = "forking";
-        serviceConfig.ExecStart = "${pkgs.dict}/sbin/dictd -s -c ${dictdb}/share/dictd/dictd.conf --locale en_US.UTF-8";
+        script = "${pkgs.dict}/sbin/dictd -s -c ${dictdb}/share/dictd/dictd.conf --locale en_US.UTF-8";
       };
     };
 }
diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix
index ea364d68c36a..f4abe2c8bf86 100644
--- a/nixos/modules/services/misc/docker-registry.nix
+++ b/nixos/modules/services/misc/docker-registry.nix
@@ -143,9 +143,11 @@ in
       description = "Docker Container Registry";
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
+      script = ''
+        ${cfg.package}/bin/registry serve ${configFile}
+      '';
 
       serviceConfig = {
-        ExecStart = "${lib.getExe cfg.package} serve ${configFile}";
         User = "docker-registry";
         WorkingDirectory = cfg.storagePath;
         AmbientCapabilities = lib.mkIf (cfg.port < 1024) "cap_net_bind_service";
diff --git a/nixos/modules/services/misc/errbot.nix b/nixos/modules/services/misc/errbot.nix
index aa94368d61d2..d9f52af7fe72 100644
--- a/nixos/modules/services/misc/errbot.nix
+++ b/nixos/modules/services/misc/errbot.nix
@@ -100,13 +100,13 @@ in
         {
           after = [ "network-online.target" ];
           wantedBy = [ "multi-user.target" ];
+          preStart = ''
+            mkdir -p ${dataDir}
+            chown -R errbot:errbot ${dataDir}
+          '';
           serviceConfig = {
             User = "errbot";
             Restart = "on-failure";
-            ExecStartPre = [
-              "${lib.getExe' pkgs.coreutils "mkdir"} -p ${dataDir}"
-              "${lib.getExe' pkgs.coreutils "chown"} -R errbot:errbot ${dataDir}"
-            ];
             ExecStart = "${pkgs.errbot}/bin/errbot -c ${mkConfigDir instanceCfg dataDir}/config.py";
             PermissionsStartOnly = true;
           };
diff --git a/nixos/modules/services/misc/gollum.nix b/nixos/modules/services/misc/gollum.nix
index a6793362d188..ccfa63d3823d 100644
--- a/nixos/modules/services/misc/gollum.nix
+++ b/nixos/modules/services/misc/gollum.nix
@@ -138,13 +138,17 @@ in
       description = "Gollum wiki";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
+      path = [ pkgs.git ];
+
+      preStart = ''
+        # This is safe to be run on an existing repo
+        git init ${cfg.stateDir}
+      '';
 
       serviceConfig = {
         User = cfg.user;
         Group = cfg.group;
         WorkingDirectory = cfg.stateDir;
-        # This is safe to be run on an existing repo
-        ExecStartPre = "${lib.getExe pkgs.git} init ${cfg.stateDir}";
         ExecStart = ''
           ${cfg.package}/bin/gollum \
             --port ${toString cfg.port} \
diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix
index 04759856ac7a..14bb792790a7 100644
--- a/nixos/modules/services/misc/paperless.nix
+++ b/nixos/modules/services/misc/paperless.nix
@@ -664,9 +664,6 @@ in
           serviceConfig = {
             User = cfg.user;
             WorkingDirectory = cfg.dataDir;
-            ExecStart = "${manage}/bin/paperless-manage document_exporter ${cfg.exporter.directory} ${
-              lib.cli.toCommandLineShellGNU { } cfg.exporter.settings
-            }";
           };
           unitConfig =
             let
@@ -685,7 +682,13 @@ in
               OnFailure = services;
               OnSuccess = services;
             };
+          enableStrictShellChecks = true;
           path = [ manage ];
+          script = ''
+            paperless-manage document_exporter ${cfg.exporter.directory} ${
+              lib.cli.toCommandLineShellGNU { } cfg.exporter.settings
+            }
+          '';
         };
       })
     ]
diff --git a/nixos/modules/services/misc/svnserve.nix b/nixos/modules/services/misc/svnserve.nix
index 716eed8d35cd..b72e6186c1cd 100644
--- a/nixos/modules/services/misc/svnserve.nix
+++ b/nixos/modules/services/misc/svnserve.nix
@@ -40,8 +40,8 @@ in
     systemd.services.svnserve = {
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      services.ExecStartPre = "${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.svnBaseDir}";
-      services.ExecStart = "${pkgs.subversion.out}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/run/svnserve.pid";
+      preStart = "mkdir -p ${cfg.svnBaseDir}";
+      script = "${pkgs.subversion.out}/bin/svnserve -r ${cfg.svnBaseDir} -d --foreground --pid-file=/run/svnserve.pid";
     };
   };
 }
diff --git a/nixos/modules/services/misc/tandoor-recipes.nix b/nixos/modules/services/misc/tandoor-recipes.nix
index 10d28c390a38..549b3ad5fa3d 100644
--- a/nixos/modules/services/misc/tandoor-recipes.nix
+++ b/nixos/modules/services/misc/tandoor-recipes.nix
@@ -119,12 +119,6 @@ in
       after = lib.optional cfg.database.createLocally "postgresql.target";
 
       serviceConfig = {
-        ExecStartPre = [
-          "${lib.getExe' pkgs.coreutils "ln"} -sf ${manage} tandoor-recipes-manage"
-
-          # Let django migrate the DB as needed
-          "${lib.getExe pkg} migrate"
-        ];
         ExecStart = ''
           ${pkg.python.pkgs.gunicorn}/bin/gunicorn recipes.wsgi
         '';
@@ -178,6 +172,13 @@ in
 
       wantedBy = [ "multi-user.target" ];
 
+      preStart = ''
+        ln -sf ${manage} tandoor-recipes-manage
+
+        # Let django migrate the DB as needed
+        ${pkg}/bin/tandoor-recipes migrate
+      '';
+
       environment = env // {
         PYTHONPATH = "${pkg.python.pkgs.makePythonPath pkg.propagatedBuildInputs}:${pkg}/lib/tandoor-recipes";
       };
diff --git a/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix b/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix
index 380f49fbba01..4b9cc658bf4a 100644
--- a/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix
+++ b/nixos/modules/services/monitoring/prometheus/exporters/pgbouncer.nix
@@ -139,9 +139,9 @@ in
 
   serviceOpts = {
     after = [ "pgbouncer.service" ];
-    serviceConfig.ExecStart = concatStringsSep " " (
+    script = concatStringsSep " " (
       [
-        "${escapeShellArg (getExe cfg.package)}"
+        "exec -- ${escapeShellArg (getExe cfg.package)}"
         "--web.listen-address ${cfg.listenAddress}:${toString cfg.port}"
       ]
       ++ optionals (cfg.connectionString != null) [
diff --git a/nixos/modules/services/networking/dnscache.nix b/nixos/modules/services/networking/dnscache.nix
index 938033a8583f..f360aa86c7b8 100644
--- a/nixos/modules/services/networking/dnscache.nix
+++ b/nixos/modules/services/networking/dnscache.nix
@@ -108,16 +108,17 @@ in
         daemontools
         djbdns
       ];
-      environment.FORWARDONLY = lib.mkIf cfg.forwardOnly "1";
       preStart = ''
         rm -rf /var/lib/dnscache
         dnscache-conf dnscache dnscache /var/lib/dnscache ${config.services.dnscache.ip}
         rm -rf /var/lib/dnscache/root
         ln -sf ${dnscache-root} /var/lib/dnscache/root
       '';
-      serviceConfig.StateDirectory = "dnscache";
-      serviceConfig.WorkingDirectory = "/var/lib/dnscache";
-      serviceConfig.ExecStart = "/var/lib/dnscache/run";
+      script = ''
+        cd /var/lib/dnscache/
+        ${lib.optionalString cfg.forwardOnly "export FORWARDONLY=1"}
+        exec ./run
+      '';
     };
   };
 }
diff --git a/nixos/modules/services/networking/freeradius.nix b/nixos/modules/services/networking/freeradius.nix
index 569734f6d70b..cd766f919579 100644
--- a/nixos/modules/services/networking/freeradius.nix
+++ b/nixos/modules/services/networking/freeradius.nix
@@ -13,9 +13,11 @@ let
     wantedBy = [ "multi-user.target" ];
     after = [ "network.target" ];
     wants = [ "network.target" ];
+    preStart = ''
+      ${cfg.package}/bin/radiusd -C -d ${cfg.configDir} -l stdout
+    '';
 
     serviceConfig = {
-      ExecStartPre = "${cfg.package}/bin/radiusd -C -d ${cfg.configDir} -l stdout";
       ExecStart =
         "${cfg.package}/bin/radiusd -f -d ${cfg.configDir} -l stdout" + lib.optionalString cfg.debug " -xx";
       ExecReload = [
diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix
index 1504a93d9203..95e19636edaf 100644
--- a/nixos/modules/services/networking/ircd-hybrid/default.nix
+++ b/nixos/modules/services/networking/ircd-hybrid/default.nix
@@ -152,7 +152,7 @@ in
       wants = [ "network-online.target" ];
       after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
-      serviceConfig.ExecStart = "${ircdService}/bin/control start";
+      script = "${ircdService}/bin/control start";
     };
   };
 }
diff --git a/nixos/modules/services/networking/ncps.nix b/nixos/modules/services/networking/ncps.nix
index 4a938f50652e..ebc3af2cec0f 100644
--- a/nixos/modules/services/networking/ncps.nix
+++ b/nixos/modules/services/networking/ncps.nix
@@ -275,9 +275,12 @@ in
       wants = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
 
+      preStart = ''
+        ${lib.getExe cfg.dbmatePackage} --migrations-dir=${cfg.package}/share/ncps/db/migrations --url=${cfg.cache.databaseURL} up
+      '';
+
       serviceConfig = lib.mkMerge [
         {
-          ExecStartPre = "${lib.getExe cfg.dbmatePackage} --migrations-dir=${cfg.package}/share/ncps/db/migrations --url=${cfg.cache.databaseURL} up";
           ExecStart = "${lib.getExe cfg.package} ${globalFlags} serve ${serveFlags}";
           User = "ncps";
           Group = "ncps";
diff --git a/nixos/modules/services/networking/nghttpx/default.nix b/nixos/modules/services/networking/nghttpx/default.nix
index a9ae12ac6c62..40eba4849adc 100644
--- a/nixos/modules/services/networking/nghttpx/default.nix
+++ b/nixos/modules/services/networking/nghttpx/default.nix
@@ -115,9 +115,11 @@ in
       nghttpx = {
         wantedBy = [ "multi-user.target" ];
         after = [ "network.target" ];
+        script = ''
+          ${pkgs.nghttp2}/bin/nghttpx --conf=${configurationFile}
+        '';
 
         serviceConfig = {
-          ExecStart = "${pkgs.nghttp2}/bin/nghttpx --conf=${configurationFile}";
           Restart = "on-failure";
           RestartSec = 60;
         };
diff --git a/nixos/modules/services/networking/nm-file-secret-agent.nix b/nixos/modules/services/networking/nm-file-secret-agent.nix
index 4a1a36244cca..669a6e208deb 100644
--- a/nixos/modules/services/networking/nm-file-secret-agent.nix
+++ b/nixos/modules/services/networking/nm-file-secret-agent.nix
@@ -125,7 +125,7 @@ in
       after = [ "NetworkManager.service" ];
       wantedBy = [ "multi-user.target" ];
       restartTriggers = [ nmFileSecretAgentConfigFile ];
-      serviceConfig.ExecStart = "${lib.getExe cfg.ensureProfiles.secrets.package} --conf ${nmFileSecretAgentConfigFile}";
+      script = "${lib.getExe cfg.ensureProfiles.secrets.package} --conf ${nmFileSecretAgentConfigFile}";
     };
   };
 }
diff --git a/nixos/modules/services/networking/oidentd.nix b/nixos/modules/services/networking/oidentd.nix
index e3c38cf2dfd6..159da0913995 100644
--- a/nixos/modules/services/networking/oidentd.nix
+++ b/nixos/modules/services/networking/oidentd.nix
@@ -32,7 +32,7 @@ with lib;
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
       serviceConfig.Type = "forking";
-      serviceConfig.ExecStart = "${lib.getExe pkgs.oidentd} -u oidentd -g nogroup";
+      script = "${pkgs.oidentd}/sbin/oidentd -u oidentd -g nogroup";
     };
 
     users.users.oidentd = {
diff --git a/nixos/modules/services/networking/oink.nix b/nixos/modules/services/networking/oink.nix
index bc255ffc6ba9..5c76a7de5036 100644
--- a/nixos/modules/services/networking/oink.nix
+++ b/nixos/modules/services/networking/oink.nix
@@ -84,8 +84,8 @@ in
       description = "Dynamic DNS client for Porkbun";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
+      script = "${cfg.package}/bin/oink -c ${oinkConfig}";
       serviceConfig = {
-        ExecStart = "${lib.getExe cfg.package} -c ${oinkConfig}";
         Restart = "on-failure";
         RestartSec = "10";
       };
diff --git a/nixos/modules/services/networking/opengfw.nix b/nixos/modules/services/networking/opengfw.nix
index 38678156fd03..4b92a230842d 100644
--- a/nixos/modules/services/networking/opengfw.nix
+++ b/nixos/modules/services/networking/opengfw.nix
@@ -374,22 +374,21 @@ in
         after = [ "network.target" ];
         path = with pkgs; [ iptables ];
 
+        preStart = ''
+          ${optionalString (rules != null) "ln -sf ${rules} rules.yaml"}
+          ${optionalString (settings != null) "ln -sf ${settings} config.yaml"}
+        '';
+
+        script = ''
+          ${config.security.wrapperDir}/OpenGFW \
+            -f ${cfg.logFormat} \
+            -l ${cfg.logLevel} \
+            ${optionalString (cfg.pcapReplay != null) "-p ${cfg.pcapReplay}"} \
+            -c config.yaml \
+            rules.yaml
+        '';
+
         serviceConfig = rec {
-          ExecStartPre =
-            lib.optionals (rules != null) [ "${lib.getExe' pkgs.coreutils "ln"} -sf ${rules} rules.yaml" ]
-            ++ lib.optionals (settings != null) [
-              "${lib.getExe' pkgs.coreutils "ln"} -sf ${settings} config.yaml"
-            ];
-          ExecStart =
-            let
-              args = lib.cli.toCommandLineShellGNU { } {
-                f = cfg.logFormat;
-                l = cfg.logLevel;
-                p = cfg.pcapReplay;
-                c = "config.yaml";
-              };
-            in
-            "${config.security.wrapperDir}/OpenGFW ${args} rules.yaml";
           WorkingDirectory = cfg.dir;
           ExecReload = "${lib.getExe' pkgs.coreutils "kill"} -HUP $MAINPID";
           Restart = "always";
diff --git a/nixos/modules/services/networking/ostinato.nix b/nixos/modules/services/networking/ostinato.nix
index 9006a8b97e7b..cfe7f934bf36 100644
--- a/nixos/modules/services/networking/ostinato.nix
+++ b/nixos/modules/services/networking/ostinato.nix
@@ -108,7 +108,9 @@ in
     systemd.services.drone = {
       description = "Ostinato agent-controller";
       wantedBy = [ "multi-user.target" ];
-      serviceConfig.ExecStart = "${pkg}/bin/drone ${toString cfg.port} ${configFile}";
+      script = ''
+        ${pkg}/bin/drone ${toString cfg.port} ${configFile}
+      '';
     };
 
   };
diff --git a/nixos/modules/services/networking/pangolin.nix b/nixos/modules/services/networking/pangolin.nix
index ee7d1458ed70..9b5bdb9d3690 100644
--- a/nixos/modules/services/networking/pangolin.nix
+++ b/nixos/modules/services/networking/pangolin.nix
@@ -241,6 +241,11 @@ in
           requires = [ "network.target" ];
           after = [ "network.target" ];
 
+          preStart = ''
+            mkdir -p ${cfg.dataDir}/config
+            cp -f ${cfgFile} ${cfg.dataDir}/config/config.yml
+          '';
+
           serviceConfig = {
             User = "pangolin";
             Group = "fossorial";
@@ -312,11 +317,6 @@ in
               "~@swap:EPERM"
               "~@timer:EPERM"
             ];
-
-            ExecStartPre = [
-              "${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.dataDir}/config"
-              "${lib.getExe' pkgs.coreutils "cp"} -f ${cfgFile} ${cfg.dataDir}/config/config.yml"
-            ];
             ExecStart = lib.getExe cfg.package;
           };
         };
diff --git a/nixos/modules/services/networking/pdnsd.nix b/nixos/modules/services/networking/pdnsd.nix
index abc78b5d569b..cda55cc2a7e8 100644
--- a/nixos/modules/services/networking/pdnsd.nix
+++ b/nixos/modules/services/networking/pdnsd.nix
@@ -80,13 +80,13 @@ in
     systemd.services.pdnsd = {
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
+      preStart = ''
+        mkdir -p "${cfg.cacheDir}"
+        touch "${cfg.cacheDir}/pdnsd.cache"
+        chown -R ${pdnsdUser}:${pdnsdGroup} "${cfg.cacheDir}"
+      '';
       description = "pdnsd";
       serviceConfig = {
-        ExecStartPre = [
-          "${lib.getExe' pkgs.coreutils "mkdir"} -p '${cfg.cacheDir}'"
-          "${lib.getExe' pkgs.coreutils "touch"} '${cfg.cacheDir}/pdnsd.cache'"
-          "${lib.getExe' pkgs.coreutils "chown"} -R ${pdnsdUser}:${pdnsdGroup} '${cfg.cacheDir}'"
-        ];
         ExecStart = "${pdnsd}/bin/pdnsd -c ${pdnsdConf}";
       };
     };
diff --git a/nixos/modules/services/networking/redsocks.nix b/nixos/modules/services/networking/redsocks.nix
index 1c4ef08fdc7f..852dcc8ff431 100644
--- a/nixos/modules/services/networking/redsocks.nix
+++ b/nixos/modules/services/networking/redsocks.nix
@@ -276,7 +276,7 @@ in
         description = "Redsocks";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
-        serviceConfig.ExecStart = "${lib.getExe pkgs.redsocks} -c ${configfile}";
+        script = "${pkgs.redsocks}/bin/redsocks -c ${configfile}";
       };
 
       networking.firewall.extraCommands = iptables;
diff --git a/nixos/modules/services/networking/smokeping.nix b/nixos/modules/services/networking/smokeping.nix
index 5990c0d4fa2e..d15f8689dd73 100644
--- a/nixos/modules/services/networking/smokeping.nix
+++ b/nixos/modules/services/networking/smokeping.nix
@@ -337,12 +337,12 @@ in
       serviceConfig = {
         User = cfg.user;
         Restart = "on-failure";
-        ExecStartPre = [
-          "${cfg.package}/bin/smokeping --check --config=${configPath}"
-          "${cfg.package}/bin/smokeping --static --config=${configPath}"
-        ];
         ExecStart = "${cfg.package}/bin/smokeping --config=/etc/smokeping.conf --nodaemon";
       };
+      preStart = ''
+        ${cfg.package}/bin/smokeping --check --config=${configPath}
+        ${cfg.package}/bin/smokeping --static --config=${configPath}
+      '';
     };
 
     systemd.tmpfiles.rules = [
diff --git a/nixos/modules/services/networking/supybot.nix b/nixos/modules/services/networking/supybot.nix
index 6a9d64a97cc2..f05e1fe30112 100644
--- a/nixos/modules/services/networking/supybot.nix
+++ b/nixos/modules/services/networking/supybot.nix
@@ -104,12 +104,14 @@ in
       documentation = [ "https://limnoria.readthedocs.io/" ];
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
+      preStart = ''
+        # This needs to be created afresh every time
+        rm -f '${cfg.stateDir}/supybot.cfg.bak'
+      '';
 
       startLimitIntervalSec = 5 * 60; # 5 min
       startLimitBurst = 1;
       serviceConfig = {
-        # This needs to be created afresh every time
-        ExecStartPre = "${lib.getExe' pkgs.coreutils "rm"} -f '${cfg.stateDir}/supybot.cfg.bak'";
         ExecStart = "${pyEnv}/bin/supybot ${cfg.stateDir}/supybot.cfg";
         PIDFile = "/run/supybot.pid";
         User = "supybot";
diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix
index b673d29bb40e..0b6e110d2caa 100644
--- a/nixos/modules/services/networking/tailscale.nix
+++ b/nixos/modules/services/networking/tailscale.nix
@@ -240,8 +240,10 @@ in
       wantedBy = [ "multi-user.target" ];
       serviceConfig = {
         Type = "oneshot";
-        ExecStart = "${lib.getExe cfg.package} set ${escapeShellArgs cfg.extraSetFlags}";
       };
+      script = ''
+        ${lib.getExe cfg.package} set ${escapeShellArgs cfg.extraSetFlags}
+      '';
     };
 
     boot.kernel.sysctl = mkIf (cfg.useRoutingFeatures == "server" || cfg.useRoutingFeatures == "both") {
diff --git a/nixos/modules/services/networking/thelounge.nix b/nixos/modules/services/networking/thelounge.nix
index 4a3ef4d1c426..a8104c2e1b88 100644
--- a/nixos/modules/services/networking/thelounge.nix
+++ b/nixos/modules/services/networking/thelounge.nix
@@ -112,11 +112,11 @@ in
     systemd.services.thelounge = {
       description = "The Lounge web IRC client";
       wantedBy = [ "multi-user.target" ];
+      preStart = "ln -sf ${pkgs.writeText "config.js" configJsData} ${dataDir}/config.js";
       environment.THELOUNGE_PACKAGES = mkIf (cfg.plugins != [ ]) "${plugins}";
       serviceConfig = {
         User = "thelounge";
         StateDirectory = baseNameOf dataDir;
-        ExecStartPre = "${lib.getExe' pkgs.coreutils "ln"} -sf ${pkgs.writeText "config.js" configJsData} ${dataDir}/config.js";
         ExecStart = "${getExe cfg.package} start";
       };
     };
diff --git a/nixos/modules/services/networking/tinydns.nix b/nixos/modules/services/networking/tinydns.nix
index 709f751ee825..145357b828b1 100644
--- a/nixos/modules/services/networking/tinydns.nix
+++ b/nixos/modules/services/networking/tinydns.nix
@@ -58,11 +58,10 @@ with lib;
         ln -sf ${pkgs.writeText "tinydns-data" config.services.tinydns.data} data
         tinydns-data
       '';
-      serviceConfig = {
-        StateDirectory = "tinydns";
-        WorkingDirectory = "/var/lib/tinydns";
-        ExecStart = "/var/lib/tinydns/run";
-      };
+      script = ''
+        cd /var/lib/tinydns
+        exec ./run
+      '';
     };
   };
 }
diff --git a/nixos/modules/services/networking/toxvpn.nix b/nixos/modules/services/networking/toxvpn.nix
index 4688e410cee4..112c86187666 100644
--- a/nixos/modules/services/networking/toxvpn.nix
+++ b/nixos/modules/services/networking/toxvpn.nix
@@ -43,19 +43,20 @@ with lib;
       wantedBy = [ "multi-user.target" ];
       after = [ "network.target" ];
 
+      preStart = ''
+        mkdir -p /run/toxvpn || true
+        chown toxvpn /run/toxvpn
+      '';
+
+      path = [ pkgs.toxvpn ];
+
+      script = ''
+        exec toxvpn -i ${config.services.toxvpn.localip} -l /run/toxvpn/control -u toxvpn -p ${toString config.services.toxvpn.port} ${
+          lib.concatMapStringsSep " " (x: "-a ${x}") config.services.toxvpn.auto_add_peers
+        }
+      '';
+
       serviceConfig = {
-        ExecStart =
-          let
-            args = lib.cli.toCommandLineShellGNU { } {
-              i = config.services.toxvpn.localip;
-              l = "/run/toxvpn/control";
-              u = "toxvpn";
-              p = config.services.toxvpn.port;
-              a = config.services.toxvpn.auto_add_peers;
-            };
-          in
-          "${lib.getExe pkgs.toxvpn} ${args}";
-        RuntimeDirectory = "toxvpn";
         KillMode = "process";
         Restart = "on-success";
         Type = "notify";
diff --git a/nixos/modules/services/networking/twingate.nix b/nixos/modules/services/networking/twingate.nix
index 14baae06bc89..4e9edf6bb23d 100644
--- a/nixos/modules/services/networking/twingate.nix
+++ b/nixos/modules/services/networking/twingate.nix
@@ -17,7 +17,7 @@ in
   config = lib.mkIf cfg.enable {
     systemd.packages = [ cfg.package ];
     systemd.services.twingate = {
-      serviceConfig.ExecStartPre = "${lib.getExe' pkgs.coreutils "cp"} -r --update=none ${cfg.package}/etc/twingate/. /etc/twingate/";
+      preStart = "cp -r --update=none ${cfg.package}/etc/twingate/. /etc/twingate/";
       wantedBy = [ "multi-user.target" ];
     };
 
diff --git a/nixos/modules/services/networking/xinetd.nix b/nixos/modules/services/networking/xinetd.nix
index f1be424e075a..d33b4d97519b 100644
--- a/nixos/modules/services/networking/xinetd.nix
+++ b/nixos/modules/services/networking/xinetd.nix
@@ -143,7 +143,8 @@ in
       description = "xinetd server";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      serviceConfig.ExecStart = "${lib.getExe pkgs.xinetd} -syslog daemon -dontfork -stayalive -f ${configFile}";
+      path = [ pkgs.xinetd ];
+      script = "exec xinetd -syslog daemon -dontfork -stayalive -f ${configFile}";
     };
   };
 }
diff --git a/nixos/modules/services/networking/xray.nix b/nixos/modules/services/networking/xray.nix
index fc638f7ce766..1d0d514d2e48 100644
--- a/nixos/modules/services/networking/xray.nix
+++ b/nixos/modules/services/networking/xray.nix
@@ -93,8 +93,10 @@ with lib;
         description = "xray Daemon";
         after = [ "network.target" ];
         wantedBy = [ "multi-user.target" ];
+        script = ''
+          exec "${cfg.package}/bin/xray" -config "$CREDENTIALS_DIRECTORY/config.json"
+        '';
         serviceConfig = {
-          ExecStart = "${cfg.package}/bin/xray -config %d/config.json";
           DynamicUser = true;
           LoadCredential = "config.json:${settingsFile}";
           CapabilityBoundingSet = "CAP_NET_ADMIN CAP_NET_BIND_SERVICE";
diff --git a/nixos/modules/services/networking/zerobin.nix b/nixos/modules/services/networking/zerobin.nix
index 0673070d1ee6..96cf4cc7148d 100644
--- a/nixos/modules/services/networking/zerobin.nix
+++ b/nixos/modules/services/networking/zerobin.nix
@@ -91,14 +91,14 @@ in
       enable = true;
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      serviceConfig.ExecStartPre = [
-        "${lib.getExe' pkgs.coreutils "mkdir"} -p ${cfg.dataDir}"
-        "${lib.getExe' pkgs.coreutils "chown"} ${cfg.user} ${cfg.dataDir}"
-      ];
       serviceConfig.ExecStart = "${pkgs.zerobin}/bin/zerobin ${cfg.listenAddress} ${toString cfg.listenPort} false ${cfg.user} ${cfg.group} ${zerobin_config}";
       serviceConfig.PrivateTmp = "yes";
       serviceConfig.User = cfg.user;
       serviceConfig.Group = cfg.group;
+      preStart = ''
+        mkdir -p ${cfg.dataDir}
+        chown ${cfg.user} ${cfg.dataDir}
+      '';
     };
   };
 }
diff --git a/nixos/modules/services/security/authelia.nix b/nixos/modules/services/security/authelia.nix
index 33c0be9e788a..059337e3a425 100644
--- a/nixos/modules/services/security/authelia.nix
+++ b/nixos/modules/services/security/authelia.nix
@@ -375,10 +375,10 @@ in
             })
             // instance.environmentVariables;
 
+          preStart = "${execCommand} ${configArg} validate-config";
           serviceConfig = {
             User = instance.user;
             Group = instance.group;
-            ExecStartPre = "${execCommand} ${configArg} validate-config";
             ExecStart = "${execCommand} ${configArg}";
             Restart = "always";
             RestartSec = "5s";
diff --git a/nixos/modules/services/security/certmgr.nix b/nixos/modules/services/security/certmgr.nix
index a2e00ca35a82..6a744e572101 100644
--- a/nixos/modules/services/security/certmgr.nix
+++ b/nixos/modules/services/security/certmgr.nix
@@ -34,6 +34,11 @@ let
         [ spec ]
     ) (lib.attrValues cfg.specs)
   );
+
+  preStart = ''
+    ${lib.concatStringsSep " \\\n" ([ "mkdir -p" ] ++ map lib.escapeShellArg specPaths)}
+    ${cfg.package}/bin/certmgr -f ${certmgrYaml} check
+  '';
 in
 {
   options.services.certmgr = {
@@ -210,14 +215,11 @@ in
       wants = [ "network-online.target" ];
       after = [ "network-online.target" ];
       wantedBy = [ "multi-user.target" ];
+      inherit preStart;
 
       serviceConfig = {
         Restart = "always";
         RestartSec = "10s";
-        ExecStartPre = [
-          "${lib.getExe' pkgs.coreutils "mkdir"} -p ${lib.escapeShellArgs specPaths}"
-          "${lib.getExe cfg.package} -f ${certmgrYaml} check"
-        ];
         ExecStart = "${cfg.package}/bin/certmgr -f ${certmgrYaml}";
       };
     };
diff --git a/nixos/modules/services/security/hologram-agent.nix b/nixos/modules/services/security/hologram-agent.nix
index 6152a57ffb8c..21bedc4fabd2 100644
--- a/nixos/modules/services/security/hologram-agent.nix
+++ b/nixos/modules/services/security/hologram-agent.nix
@@ -55,8 +55,10 @@ in
         "network-link-dummy0.service"
         "network-addresses-dummy0.service"
       ];
+      preStart = ''
+        /run/current-system/sw/bin/rm -fv /run/hologram.sock
+      '';
       serviceConfig = {
-        ExecStartPre = "/run/current-system/sw/bin/rm -fv /run/hologram.sock";
         ExecStart = "${pkgs.hologram}/bin/hologram-agent -debug -conf ${cfgFile} -port ${cfg.httpPort}";
       };
     };
diff --git a/nixos/modules/services/web-apps/bluemap.nix b/nixos/modules/services/web-apps/bluemap.nix
index bd01d6470186..5829b7c3e0dd 100644
--- a/nixos/modules/services/web-apps/bluemap.nix
+++ b/nixos/modules/services/web-apps/bluemap.nix
@@ -298,8 +298,10 @@ in
         Type = "oneshot";
         Group = "nginx";
         UMask = "026";
-        ExecStart = "${lib.getExe pkgs.bluemap} -c ${configFolder} -gs -r";
       };
+      script = ''
+        ${lib.getExe pkgs.bluemap} -c ${configFolder} -gs -r
+      '';
     };
 
     systemd.timers."render-bluemap-maps" = lib.mkIf cfg.enableRender {
diff --git a/nixos/modules/services/web-apps/cloudlog.nix b/nixos/modules/services/web-apps/cloudlog.nix
index a0ec5fe4134b..bec59aa779e1 100644
--- a/nixos/modules/services/web-apps/cloudlog.nix
+++ b/nixos/modules/services/web-apps/cloudlog.nix
@@ -383,44 +383,37 @@ in
         cloudlog-upload-lotw = {
           description = "Upload QSOs to LoTW if certs have been provided";
           enable = cfg.upload-lotw.enable;
-          serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/lotw/lotw_upload";
-          serviceConfig.Type = "oneshot";
+          script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/lotw/lotw_upload";
         };
         cloudlog-update-lotw-users = {
           description = "Update LOTW Users Database";
           enable = cfg.update-lotw-users.enable;
-          serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/lotw/load_users";
-          serviceConfig.Type = "oneshot";
+          script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/lotw/load_users";
         };
         cloudlog-update-dok = {
           description = "Update DOK File for autocomplete";
           enable = cfg.update-dok.enable;
-          serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/update/update_dok";
-          serviceConfig.Type = "oneshot";
+          script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_dok";
         };
         cloudlog-update-clublog-scp = {
           description = "Update Clublog SCP Database File";
           enable = cfg.update-clublog-scp.enable;
-          serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/update/update_clublog_scp";
-          serviceConfig.Type = "oneshot";
+          script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_clublog_scp";
         };
         cloudlog-update-wwff = {
           description = "Update WWFF File for autocomplete";
           enable = cfg.update-wwff.enable;
-          serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/update/update_wwff";
-          serviceConfig.Type = "oneshot";
+          script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_wwff";
         };
         cloudlog-upload-qrz = {
           description = "Upload QSOs to QRZ Logbook";
           enable = cfg.upload-qrz.enable;
-          serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/qrz/upload";
-          serviceConfig.Type = "oneshot";
+          script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/qrz/upload";
         };
         cloudlog-update-sota = {
           description = "Update SOTA File for autocomplete";
           enable = cfg.update-sota.enable;
-          serviceConfig.ExecStart = "${lib.getExe pkgs.curl} -s ${cfg.baseUrl}/update/update_sota";
-          serviceConfig.Type = "oneshot";
+          script = "${pkgs.curl}/bin/curl -s ${cfg.baseUrl}/update/update_sota";
         };
       };
       timers = {
diff --git a/nixos/modules/services/web-apps/galene.nix b/nixos/modules/services/web-apps/galene.nix
index 6733a95d706c..969615e6490a 100644
--- a/nixos/modules/services/web-apps/galene.nix
+++ b/nixos/modules/services/web-apps/galene.nix
@@ -133,16 +133,19 @@ in
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
+      preStart = ''
+        ${optionalString (cfg.insecure != true && cfg.certFile != null && cfg.keyFile != null) ''
+          install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.certFile} ${cfg.dataDir}/cert.pem
+          install -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.keyFile} ${cfg.dataDir}/key.pem
+        ''}
+      '';
+
       serviceConfig = mkMerge [
         {
           Type = "simple";
           User = cfg.user;
           Group = cfg.group;
           WorkingDirectory = cfg.stateDir;
-          ExecStartPre = lib.mkIf (cfg.insecure != true && cfg.certFile != null && cfg.keyFile != null) [
-            "${lib.getExe' pkgs.coreutils "install"} -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.certFile} ${cfg.dataDir}/cert.pem"
-            "${lib.getExe' pkgs.coreutils "install"} -m 700 -o '${cfg.user}' -g '${cfg.group}' ${cfg.keyFile} ${cfg.dataDir}/key.pem"
-          ];
           ExecStart = ''
             ${cfg.package}/bin/galene \
             ${optionalString (cfg.insecure) "-insecure"} \
diff --git a/nixos/modules/services/web-apps/glitchtip.nix b/nixos/modules/services/web-apps/glitchtip.nix
index 54ddf7f542b6..6a74cda886a1 100644
--- a/nixos/modules/services/web-apps/glitchtip.nix
+++ b/nixos/modules/services/web-apps/glitchtip.nix
@@ -236,8 +236,11 @@ in
         glitchtip = commonService // {
           description = "GlitchTip";
 
+          preStart = ''
+            ${lib.getExe pkg} migrate
+          '';
+
           serviceConfig = commonServiceConfig // {
-            ExecStartPre = "${lib.getExe pkg} migrate";
             ExecStart = ''
               ${lib.getExe python.pkgs.gunicorn} \
                 --bind=${cfg.listenAddress}:${toString cfg.port} \
diff --git a/nixos/modules/services/web-apps/healthchecks.nix b/nixos/modules/services/web-apps/healthchecks.nix
index ea97222f25e0..eec40a8a07f9 100644
--- a/nixos/modules/services/web-apps/healthchecks.nix
+++ b/nixos/modules/services/web-apps/healthchecks.nix
@@ -237,13 +237,14 @@ in
           wantedBy = [ "healthchecks.target" ];
           after = [ "healthchecks-migration.service" ];
 
+          preStart = ''
+            ${pkg}/opt/healthchecks/manage.py collectstatic --no-input
+            ${pkg}/opt/healthchecks/manage.py remove_stale_contenttypes --no-input
+          ''
+          + lib.optionalString (cfg.settings.DEBUG != "True") "${pkg}/opt/healthchecks/manage.py compress";
+
           serviceConfig = commonConfig // {
             Restart = "always";
-            ExecStartPre = [
-              "${pkg}/opt/healthchecks/manage.py collectstatic --no-input"
-              "${pkg}/opt/healthchecks/manage.py remove_stale_contenttypes --no-input"
-            ]
-            ++ lib.optionals (cfg.settings.DEBUG != "True") [ "${pkg}/opt/healthchecks/manage.py compress" ];
             ExecStart = ''
               ${pkgs.python3Packages.gunicorn}/bin/gunicorn hc.wsgi \
                 --bind ${cfg.listenAddress}:${toString cfg.port} \
diff --git a/nixos/modules/services/web-apps/mediagoblin.nix b/nixos/modules/services/web-apps/mediagoblin.nix
index 934afe082dae..081bfa763f9b 100644
--- a/nixos/modules/services/web-apps/mediagoblin.nix
+++ b/nixos/modules/services/web-apps/mediagoblin.nix
@@ -310,6 +310,19 @@ in
       in
       {
         mediagoblin-celeryd = lib.recursiveUpdate serviceDefaults {
+          # we cannot change DEFAULT.data_dir inside mediagoblin.ini because of an annoying bug
+          # https://todo.sr.ht/~mediagoblin/mediagoblin/57
+          preStart = ''
+            cp --remove-destination ${
+              pkgs.writeText "mediagoblin.ini" (
+                lib.generators.toINI { } (lib.filterAttrsRecursive (n: v: n != "plugins") cfg.settings)
+                + "\n"
+                + lib.generators.toINI { mkKeyValue = mkSubSectionKeyValue 2; } {
+                  inherit (cfg.settings.mediagoblin) plugins;
+                }
+              )
+            } /var/lib/mediagoblin/mediagoblin.ini
+          '';
           serviceConfig = {
             Environment = [
               "CELERY_CONFIG_MODULE=mediagoblin.init.celery.from_celery"
@@ -318,19 +331,6 @@ in
               "MEDIAGOBLIN_CONFIG=/var/lib/mediagoblin/mediagoblin.ini"
               "PASTE_CONFIG=${pasteConfig}"
             ];
-            # we cannot change DEFAULT.data_dir inside mediagoblin.ini because of an annoying bug
-            # https://todo.sr.ht/~mediagoblin/mediagoblin/57
-            ExecStartPre = ''
-              ${lib.getExe' pkgs.coreutils "cp"} --remove-destination ${
-                pkgs.writeText "mediagoblin.ini" (
-                  lib.generators.toINI { } (lib.filterAttrsRecursive (n: v: n != "plugins") cfg.settings)
-                  + "\n"
-                  + lib.generators.toINI { mkKeyValue = mkSubSectionKeyValue 2; } {
-                    inherit (cfg.settings.mediagoblin) plugins;
-                  }
-                )
-              } /var/lib/mediagoblin/mediagoblin.ini
-            '';
             ExecStart = "${lib.getExe' finalPackage "celery"} worker --loglevel=INFO";
           };
           unitConfig.Description = "MediaGoblin Celery";
@@ -345,16 +345,16 @@ in
             "mediagoblin-celeryd.service"
             "postgresql.target"
           ];
+          preStart = ''
+            cp --remove-destination ${pasteConfig} /var/lib/mediagoblin/paste.ini
+            ${lib.getExe' finalPackage "gmg"} dbupdate
+          '';
           serviceConfig = {
             Environment = [
               "CELERY_ALWAYS_EAGER=false"
               "GI_TYPELIB_PATH=${GI_TYPELIB_PATH}"
               "GST_PLUGIN_PATH=${GST_PLUGIN_PATH}"
             ];
-            ExecStartPre = [
-              "${lib.getExe' pkgs.coreutils "cp"} --remove-destination ${pasteConfig} /var/lib/mediagoblin/paste.ini"
-              "${lib.getExe' finalPackage "gmg"} dbupdate"
-            ];
             ExecStart = "${lib.getExe' finalPackage "paster"} serve /var/lib/mediagoblin/paste.ini";
           };
           unitConfig.Description = "Mediagoblin";
diff --git a/nixos/modules/services/web-apps/miniflux.nix b/nixos/modules/services/web-apps/miniflux.nix
index 3a94f943b426..dac5f508aa70 100644
--- a/nixos/modules/services/web-apps/miniflux.nix
+++ b/nixos/modules/services/web-apps/miniflux.nix
@@ -18,6 +18,14 @@ let
   cfg = config.services.miniflux;
 
   boolToInt = b: if b then 1 else 0;
+
+  pgbin = "${config.services.postgresql.package}/bin";
+  # The hstore extension is no longer needed as of v2.2.14
+  # and would prevent Miniflux from starting.
+  preStart = pkgs.writeScript "miniflux-pre-start" ''
+    #!${pkgs.runtimeShell}
+    ${pgbin}/psql "miniflux" -c "DROP EXTENSION IF EXISTS hstore"
+  '';
 in
 
 {
@@ -133,9 +141,7 @@ in
       serviceConfig = {
         Type = "oneshot";
         User = config.services.postgresql.superUser;
-        # The hstore extension is no longer needed as of v2.2.14
-        # and would prevent Miniflux from starting.
-        ExecStart = ''${config.services.postgresql.package}/bin/psql "miniflux" -c "DROP EXTENSION IF EXISTS hstore"'';
+        ExecStart = preStart;
       };
     };
 
diff --git a/nixos/modules/services/web-apps/misskey.nix b/nixos/modules/services/web-apps/misskey.nix
index d1f147fdfa11..c601943479cf 100644
--- a/nixos/modules/services/web-apps/misskey.nix
+++ b/nixos/modules/services/web-apps/misskey.nix
@@ -326,19 +326,19 @@ in
       environment = {
         MISSKEY_CONFIG_YML = "/run/misskey/default.yml";
       };
+      preStart = ''
+        install -m 700 ${settingsFormat.generate "misskey-config.yml" cfg.settings} /run/misskey/default.yml
+      ''
+      + (lib.optionalString (cfg.database.passwordFile != null) ''
+        ${pkgs.replace-secret}/bin/replace-secret '@DATABASE_PASSWORD@' "${cfg.database.passwordFile}" /run/misskey/default.yml
+      '')
+      + (lib.optionalString (cfg.redis.passwordFile != null) ''
+        ${pkgs.replace-secret}/bin/replace-secret '@REDIS_PASSWORD@' "${cfg.redis.passwordFile}" /run/misskey/default.yml
+      '')
+      + (lib.optionalString (cfg.meilisearch.keyFile != null) ''
+        ${pkgs.replace-secret}/bin/replace-secret '@MEILISEARCH_KEY@' "${cfg.meilisearch.keyFile}" /run/misskey/default.yml
+      '');
       serviceConfig = {
-        ExecStartPre = [
-          "${lib.getExe' pkgs.coreutils "install"} -m 700 ${settingsFormat.generate "misskey-config.yml" cfg.settings} /run/misskey/default.yml"
-        ]
-        ++ (lib.optionals (cfg.database.passwordFile != null) [
-          "${lib.getExe pkgs.replace-secret} '@DATABASE_PASSWORD@' '${cfg.database.passwordFile}' /run/misskey/default.yml"
-        ])
-        ++ (lib.optionals (cfg.redis.passwordFile != null) [
-          "${lib.getExe pkgs.replace-secret} '@REDIS_PASSWORD@' '${cfg.redis.passwordFile}' /run/misskey/default.yml"
-        ])
-        ++ (lib.optionals (cfg.meilisearch.keyFile != null) [
-          "${lib.getExe pkgs.replace-secret} '@MEILISEARCH_KEY@' '${cfg.meilisearch.keyFile}' /run/misskey/default.yml"
-        ]);
         ExecStart = "${cfg.package}/bin/misskey migrateandstart";
         RuntimeDirectory = "misskey";
         RuntimeDirectoryMode = "700";
diff --git a/nixos/modules/services/web-apps/nexus.nix b/nixos/modules/services/web-apps/nexus.nix
index 8afba754315f..1a97c88900f9 100644
--- a/nixos/modules/services/web-apps/nexus.nix
+++ b/nixos/modules/services/web-apps/nexus.nix
@@ -142,8 +142,9 @@ in
         fi
       '';
 
+      script = "${cfg.package}/bin/nexus run";
+
       serviceConfig = {
-        ExecStart = "${cfg.package}/bin/nexus run";
         User = cfg.user;
         Group = cfg.group;
         PrivateTmp = true;
diff --git a/nixos/modules/services/web-apps/part-db.nix b/nixos/modules/services/web-apps/part-db.nix
index eb110d4362c0..086cf8b31213 100644
--- a/nixos/modules/services/web-apps/part-db.nix
+++ b/nixos/modules/services/web-apps/part-db.nix
@@ -200,7 +200,6 @@ in
           requires = [ "postgresql.target" ];
           wantedBy = [ "multi-user.target" ];
           serviceConfig = {
-            ExecStart = "${lib.getExe cfg.phpPackage} ${lib.getExe' cfg.package "console"} doctrine:migrations:migrate --no-interaction";
             Type = "oneshot";
             RemainAfterExit = true;
             User = "part-db";
@@ -208,6 +207,10 @@ in
           restartTriggers = [
             cfg.package
           ];
+          script = ''
+            set -euo pipefail
+            ${lib.getExe cfg.phpPackage} ${lib.getExe' cfg.package "console"} doctrine:migrations:migrate --no-interaction
+          '';
         };
 
         phpfpm-part-db = {
diff --git a/nixos/modules/services/web-apps/peering-manager.nix b/nixos/modules/services/web-apps/peering-manager.nix
index 046122e3b704..40533ae760e1 100644
--- a/nixos/modules/services/web-apps/peering-manager.nix
+++ b/nixos/modules/services/web-apps/peering-manager.nix
@@ -307,8 +307,11 @@ in
           ]
           ++ lib.optionals (cfg.environmentFile != null) [ "peering-manager-config.service" ];
 
+          preStart = ''
+            ${pkg}/bin/peering-manager remove_stale_contenttypes --no-input
+          '';
+
           serviceConfig = {
-            ExecStartPre = "${pkg}/bin/peering-manager remove_stale_contenttypes --no-input";
             ExecStart = ''
               ${pkg.python.pkgs.gunicorn}/bin/gunicorn peering_manager.wsgi \
                 --bind ${cfg.listenAddress}:${toString cfg.port} \
diff --git a/nixos/modules/services/web-apps/silverbullet.nix b/nixos/modules/services/web-apps/silverbullet.nix
index 6d14842ebebc..789fafb68f7f 100644
--- a/nixos/modules/services/web-apps/silverbullet.nix
+++ b/nixos/modules/services/web-apps/silverbullet.nix
@@ -95,6 +95,7 @@ in
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
 
+      preStart = lib.mkIf (!lib.hasPrefix "/var/lib/" cfg.spaceDir) "mkdir -p '${cfg.spaceDir}'";
       serviceConfig = {
         Type = "simple";
         User = "${cfg.user}";
@@ -103,9 +104,6 @@ in
         StateDirectory = lib.mkIf (lib.hasPrefix "/var/lib/" cfg.spaceDir) (
           lib.last (lib.splitString "/" cfg.spaceDir)
         );
-        ExecStartPre = lib.mkIf (
-          !lib.hasPrefix "/var/lib/" cfg.spaceDir
-        ) "${lib.getExe' pkgs.coreutils "mkdir"} -p '${cfg.spaceDir}'";
         ExecStart =
           "${lib.getExe cfg.package} --port ${toString cfg.listenPort} --hostname '${cfg.listenAddress}' '${cfg.spaceDir}' "
           + lib.concatStringsSep " " cfg.extraArgs;
diff --git a/nixos/modules/services/web-apps/wakapi.nix b/nixos/modules/services/web-apps/wakapi.nix
index 4533d322d2b8..6634e4894546 100644
--- a/nixos/modules/services/web-apps/wakapi.nix
+++ b/nixos/modules/services/web-apps/wakapi.nix
@@ -143,6 +143,10 @@ in
       ++ optional (cfg.database.dialect == "postgres") "postgresql.target";
       wantedBy = [ "multi-user.target" ];
 
+      script = ''
+        exec ${getExe cfg.package} -config ${settingsFile}
+      '';
+
       serviceConfig = {
         Environment = mkMerge [
           (mkIf (cfg.passwordSalt != null) "WAKAPI_PASSWORD_SALT=${cfg.passwordSalt}")
@@ -153,8 +157,6 @@ in
           (lib.optional (cfg.passwordSaltFile != null) cfg.passwordSaltFile)
           ++ (lib.optional (cfg.smtpPasswordFile != null) cfg.smtpPasswordFile);
 
-        ExecStart = "${getExe cfg.package} -config ${settingsFile}";
-
         User = config.users.users.wakapi.name;
         Group = config.users.users.wakapi.group;
 
diff --git a/nixos/modules/services/web-servers/h2o/default.nix b/nixos/modules/services/web-servers/h2o/default.nix
index 719f6401103e..331c31fefc9b 100644
--- a/nixos/modules/services/web-servers/h2o/default.nix
+++ b/nixos/modules/services/web-servers/h2o/default.nix
@@ -443,7 +443,6 @@ in
       ++ builtins.map (certName: "acme-${certName}.service") acmeCertNames.all;
 
       serviceConfig = {
-        ExecStartPre = "${h2oExe} --mode 'test'";
         ExecStart = "${h2oExe} --mode 'master'";
         ExecReload = [
           "${h2oExe} --mode 'test'"
@@ -484,6 +483,8 @@ in
         AmbientCapabilities = [ "CAP_NET_BIND_SERVICE" ];
         CapabilitiesBoundingSet = [ "CAP_NET_BIND_SERVICE" ];
       };
+
+      preStart = "${h2oExe} --mode 'test'";
     };
 
     # This service waits for all certificates to be available before reloading
diff --git a/nixos/modules/services/web-servers/jboss/default.nix b/nixos/modules/services/web-servers/jboss/default.nix
index 516f887022b8..88bd1071b35b 100644
--- a/nixos/modules/services/web-servers/jboss/default.nix
+++ b/nixos/modules/services/web-servers/jboss/default.nix
@@ -93,7 +93,7 @@ in
   config = mkIf config.services.jboss.enable {
     systemd.services.jboss = {
       description = "JBoss server";
-      serviceConfig.ExecStart = "${jbossService}/bin/control start";
+      script = "${jbossService}/bin/control start";
       wantedBy = [ "multi-user.target" ];
     };
   };
diff --git a/nixos/tests/paperless.nix b/nixos/tests/paperless.nix
index 64610e584e01..3f215febda7c 100644
--- a/nixos/tests/paperless.nix
+++ b/nixos/tests/paperless.nix
@@ -116,9 +116,9 @@
           assert "1 timers listed." in timers, "incorrect number of timers"
 
           # Double check that our attrset option override works as expected
-          cmdline = node.succeed("systemctl cat paperless-exporter | grep ExecStart | grep 'paperless-manage' | cut -f 2 -d=")
+          cmdline = node.succeed("grep 'paperless-manage' $(systemctl cat paperless-exporter | grep ExecStart | cut -f 2 -d=)")
           print(f"Exporter command line {cmdline!r}")
-          assert cmdline.strip().endswith("paperless-manage document_exporter /var/lib/paperless/export --compare-checksums --delete --no-progress-bar --no-thumbnail"), "Unexpected exporter command line"
+          assert cmdline.strip() == "paperless-manage document_exporter /var/lib/paperless/export --compare-checksums --delete --no-progress-bar --no-thumbnail", "Unexpected exporter command line"
 
     test_paperless(simple)
     simple.send_monitor_command("quit")

From 23d567494db3446838bc5e069b96453019ad11fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 10:27:06 +0000
Subject: [PATCH 4323/6226] gcsfuse: 3.4.1 -> 3.4.3

---
 pkgs/by-name/gc/gcsfuse/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix
index 15c8c9fd21de..1f027aa60d47 100644
--- a/pkgs/by-name/gc/gcsfuse/package.nix
+++ b/pkgs/by-name/gc/gcsfuse/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "gcsfuse";
-  version = "3.4.1";
+  version = "3.4.3";
 
   src = fetchFromGitHub {
     owner = "googlecloudplatform";
     repo = "gcsfuse";
     rev = "v${version}";
-    hash = "sha256-KB7iq92U5NIchC3Lj2q2eesYLlKa1zee0rUPU81xb5k=";
+    hash = "sha256-fjZdBf7tUMlAqumTz8b5LDqIcLstr56ugGmdsPb/FBI=";
   };
 
   vendorHash = "sha256-BirzhmYwFSs2poA5tNOlK2bDO71mCkgSck7fE9la2wA=";

From c3793a77580f34e4594560d13706d7af0da2fa2f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 30 Oct 2025 15:27:29 +0300
Subject: [PATCH 4324/6226] rusty-path-of-building: init at 0.2.6

---
 .../ru/rusty-path-of-building/package.nix     | 134 ++++++++++++++++++
 1 file changed, 134 insertions(+)
 create mode 100644 pkgs/by-name/ru/rusty-path-of-building/package.nix

diff --git a/pkgs/by-name/ru/rusty-path-of-building/package.nix b/pkgs/by-name/ru/rusty-path-of-building/package.nix
new file mode 100644
index 000000000000..d25cf32ca346
--- /dev/null
+++ b/pkgs/by-name/ru/rusty-path-of-building/package.nix
@@ -0,0 +1,134 @@
+{
+  lib,
+  rustPlatform,
+  fetchurl,
+  fetchFromGitHub,
+  copyDesktopItems,
+  makeDesktopItem,
+  makeWrapper,
+  pkg-config,
+  icoutils,
+  luajit,
+  zlib,
+  libxkbcommon,
+  vulkan-loader,
+  wayland,
+}:
+
+let
+  icon = fetchurl {
+    url = "https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding-Launcher/9ee18657fa6597c42811152604da4e6b73fac342/PathOfBuilding.ico";
+    hash = "sha256-9EW4ld+xg7GLfd4dEY/xUCBMnKb3uu7LBq2Of3Gq1Y8=";
+  };
+in
+rustPlatform.buildRustPackage rec {
+  pname = "rusty-path-of-building";
+  version = "0.2.6";
+
+  src = fetchFromGitHub {
+    owner = "meehl";
+    repo = "rusty-path-of-building";
+    rev = "v${version}";
+    hash = "sha256-U2OWNV8bUNXo8/Sro+gV/o3O/D1lMWVlbX3tCONmGOk=";
+  };
+
+  cargoHash = "sha256-xB7nhCqUalGE0M762Zw7vVFKzz/TgnMU77xbEHorJ2U=";
+
+  nativeBuildInputs = [
+    pkg-config
+    icoutils
+    copyDesktopItems
+    makeWrapper
+  ];
+
+  buildInputs = [
+    luajit
+    luajit.pkgs.lua-curl
+    luajit.pkgs.luautf8
+    luajit.pkgs.luasocket
+
+    # this is weird and vendored and should probably stay that way
+    (luajit.pkgs.buildLuaPackage {
+      pname = "lzip";
+      inherit version;
+      src = "${src}/lua/libs/lzip";
+
+      nativeBuildInputs = [ pkg-config ];
+      buildInputs = [ zlib ];
+      installFlags = [ "LUA_CMOD=$(out)/lib/lua/${luajit.luaversion}" ];
+    })
+
+    wayland
+  ];
+
+  postInstall = ''
+    icotool -x ${icon}
+
+    for size in 16 32 48 256; do
+      mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
+      install -Dm 644 *PathOfBuilding*"$size"x"$size"*.png \
+        $out/share/icons/hicolor/"$size"x"$size"/apps/pathofbuilding.png
+    done
+  '';
+
+  postFixup = ''
+    patchelf $out/bin/rusty-path-of-building \
+      --add-rpath ${
+        lib.makeLibraryPath [
+          libxkbcommon
+          vulkan-loader
+          wayland
+        ]
+      }
+
+    wrapProgram $out/bin/rusty-path-of-building \
+      --set LUA_PATH "$LUA_PATH" \
+      --set LUA_CPATH "$LUA_CPATH"
+  '';
+
+  desktopItems = [
+    (makeDesktopItem {
+      name = "rusty-path-of-building";
+      desktopName = "Path of Building";
+      comment = "Offline build planner for Path of Exile";
+      exec = "rusty-path-of-building poe1";
+      terminal = false;
+      type = "Application";
+      icon = "pathofbuilding";
+      categories = [ "Game" ];
+      keywords = [
+        "poe"
+        "pob"
+        "pobc"
+        "path"
+        "exile"
+      ];
+    })
+    (makeDesktopItem {
+      name = "rusty-path-of-building-2";
+      desktopName = "Path of Building 2";
+      comment = "Offline build planner for Path of Exile 2";
+      exec = "rusty-path-of-building poe2";
+      terminal = false;
+      type = "Application";
+      icon = "pathofbuilding";
+      categories = [ "Game" ];
+      keywords = [
+        "poe"
+        "pob"
+        "pobc"
+        "path"
+        "exile"
+      ];
+    })
+  ];
+
+  meta = {
+    description = "A cross-platform runtime for Path of Building and Path of Building 2.";
+    homepage = "https://github.com/meehl/rusty-path-of-building";
+    changelog = "https://github.com/meehl/rusty-path-of-building/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ k900 ];
+    mainProgram = "rusty-path-of-building";
+  };
+}

From d75a41357254229c9bdf1d25c0feff935daeda12 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 30 Oct 2025 15:28:53 +0300
Subject: [PATCH 4325/6226] path-of-building: drop

---
 pkgs/games/path-of-building/default.nix | 133 ------------------------
 pkgs/top-level/aliases.nix              |   1 +
 pkgs/top-level/all-packages.nix         |   2 -
 3 files changed, 1 insertion(+), 135 deletions(-)
 delete mode 100644 pkgs/games/path-of-building/default.nix

diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix
deleted file mode 100644
index ad44114be3a7..000000000000
--- a/pkgs/games/path-of-building/default.nix
+++ /dev/null
@@ -1,133 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchFromGitHub,
-  unzip,
-  meson,
-  ninja,
-  pkg-config,
-  qtbase,
-  qttools,
-  wrapQtAppsHook,
-  icoutils,
-  copyDesktopItems,
-  makeDesktopItem,
-  luajit,
-}:
-let
-  data = stdenv.mkDerivation (finalAttrs: {
-    pname = "path-of-building-data";
-    version = "2.56.0";
-
-    src = fetchFromGitHub {
-      owner = "PathOfBuildingCommunity";
-      repo = "PathOfBuilding";
-      rev = "v${finalAttrs.version}";
-      hash = "sha256-vzTMkrZgXtsCtEyxaDkea/MRj8tZDzDV3JAc440xrM8=";
-    };
-
-    nativeBuildInputs = [ unzip ];
-
-    buildCommand = ''
-      # I have absolutely no idea how this file is generated
-      # and I don't think I want to know. The Flatpak also does this.
-      unzip -j -d $out $src/runtime-win32.zip lua/sha1.lua
-
-      # Install the actual data
-      cp -r $src/src $src/runtime/lua/*.lua $src/manifest.xml $out
-
-      # Pretend this is an official build so we don't get the ugly "dev mode" warning
-      substituteInPlace $out/manifest.xml --replace '<Version' '<Version platform="nixos"'
-      touch $out/installed.cfg
-
-      # Completely stub out the update check
-      chmod +w $out/src/UpdateCheck.lua
-      echo 'return "none"' > $out/src/UpdateCheck.lua
-    '';
-  });
-in
-stdenv.mkDerivation {
-  pname = "path-of-building";
-  version = "${data.version}-unstable-2023-04-09";
-
-  src = fetchFromGitHub {
-    owner = "ernstp";
-    repo = "pobfrontend";
-    rev = "9faa19aa362f975737169824c1578d5011487c18";
-    hash = "sha256-zhw2PZ6ZNMgZ2hG+a6AcYBkeg7kbBHNc2eSt4if17Wk=";
-  };
-
-  nativeBuildInputs = [
-    meson
-    ninja
-    pkg-config
-    qttools
-    wrapQtAppsHook
-    icoutils
-  ]
-  ++ lib.optional stdenv.hostPlatform.isLinux copyDesktopItems;
-
-  buildInputs = [
-    qtbase
-    luajit
-    luajit.pkgs.lua-curl
-    luajit.pkgs.luautf8
-  ];
-
-  installPhase = ''
-    runHook preInstall
-    install -Dm555 pobfrontend $out/bin/pobfrontend
-
-    wrestool -x -t 14 ${data.src}/runtime/Path{space}of{space}Building.exe -o pathofbuilding.ico
-    icotool -x pathofbuilding.ico
-
-    for size in 16 32 48 256; do
-      mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
-      install -Dm 644 pathofbuilding*"$size"x"$size"*.png \
-        $out/share/icons/hicolor/"$size"x"$size"/apps/pathofbuilding.png
-    done
-    rm pathofbuilding.ico
-
-    runHook postInstall
-  '';
-
-  preFixup = ''
-    qtWrapperArgs+=(
-      --set LUA_PATH "$LUA_PATH"
-      --set LUA_CPATH "$LUA_CPATH"
-      --chdir "${data}"
-    )
-  '';
-
-  desktopItems = [
-    (makeDesktopItem {
-      name = "path-of-building";
-      desktopName = "Path of Building";
-      comment = "Offline build planner for Path of Exile";
-      exec = "pobfrontend %U";
-      terminal = false;
-      type = "Application";
-      icon = "pathofbuilding";
-      categories = [ "Game" ];
-      keywords = [
-        "poe"
-        "pob"
-        "pobc"
-        "path"
-        "exile"
-      ];
-      mimeTypes = [ "x-scheme-handler/pob" ];
-    })
-  ];
-
-  passthru.data = data;
-
-  meta = {
-    description = "Offline build planner for Path of Exile";
-    homepage = "https://pathofbuilding.community/";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.k900 ];
-    mainProgram = "pobfrontend";
-    broken = stdenv.hostPlatform.isDarwin; # doesn't find uic6 for some reason
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 5b6e9734e6fe..c33a16a25343 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1161,6 +1161,7 @@ mapAliases {
   paperless-ng = throw "'paperless-ng' has been renamed to/replaced by 'paperless-ngx'"; # Converted to throw 2025-10-27
   parcellite = throw "'parcellite' was remove due to lack of maintenance and relying on gtk2"; # Added 2025-10-03
   patchelfStable = throw "'patchelfStable' has been renamed to/replaced by 'patchelf'"; # Converted to throw 2025-10-27
+  path-of-building = lib.warnOnInstantiate "'path-of-building' has been replaced by 'rusty-path-of-building'" rusty-path-of-building; # Added 2025-10-30
   paup = throw "'paup' has been renamed to/replaced by 'paup-cli'"; # Converted to throw 2025-10-27
   pcp = throw "'pcp' has been removed because the upstream repo was archived and it hasn't been updated since 2021"; # Added 2025-09-23
   pcre16 = throw "'pcre16' has been removed because it is obsolete. Consider migrating to 'pcre2' instead."; # Added 2025-05-29
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f924889c22fa..8c54c699f95c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13245,8 +13245,6 @@ with pkgs;
 
   papermc = papermcServers.papermc;
 
-  path-of-building = qt6Packages.callPackage ../games/path-of-building { };
-
   pentobi = libsForQt5.callPackage ../games/pentobi { };
 
   pokerth = libsForQt5.callPackage ../games/pokerth {

From de985cdeffe4d04bf745097561086c02f1f527a3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 10:36:54 +0000
Subject: [PATCH 4326/6226] terraform-providers.sysdiglabs_sysdig: 3.0.1 ->
 3.1.0

---
 .../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 f88925a16688..2397935afcba 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1273,11 +1273,11 @@
     "vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo="
   },
   "sysdiglabs_sysdig": {
-    "hash": "sha256-b30SVfem2G3lBX9J5KGyxow0KK7kksOZLZ9135PyYPY=",
+    "hash": "sha256-hqcnyBWB7PWTTRCOczgF6hSBibvlGl+x9EkYn3vi4v8=",
     "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig",
     "owner": "sysdiglabs",
     "repo": "terraform-provider-sysdig",
-    "rev": "v3.0.1",
+    "rev": "v3.1.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-rWiafaFE1RolO9JUN1WoW4EWJjR7kpfeVEOTLf21j50="
   },

From ef82ab6ef896b43cda39a393f1297b82b2375595 Mon Sep 17 00:00:00 2001
From: Arnout Engelen <arnout@bzzt.net>
Date: Fri, 31 Oct 2025 11:42:24 +0100
Subject: [PATCH 4327/6226] nextcloud: specify sourceProvenance for apps

Looks like most apps are built from tarballs that contain
compiled vue templates and vendored dependencies, so this
seems like a more accurate default.
---
 pkgs/build-support/fetchnextcloudapp/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/build-support/fetchnextcloudapp/default.nix b/pkgs/build-support/fetchnextcloudapp/default.nix
index 138ac8fb10cf..f24b4e44c07f 100644
--- a/pkgs/build-support/fetchnextcloudapp/default.nix
+++ b/pkgs/build-support/fetchnextcloudapp/default.nix
@@ -39,6 +39,10 @@ applyPatches {
       ${if longDescription == null then null else "longDescription"} = longDescription;
       ${if homepage == null then null else "homepage"} = homepage;
       inherit maintainers teams;
+      sourceProvenance = with lib.sourceTypes; [
+        fromSource
+        binaryBytecode # vendored deps, compiled vue templates, etc
+      ];
     };
   };
   prePatch = ''

From 64dac50a8467f9f57ef3c70e89d991ea736166ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 10:44:28 +0000
Subject: [PATCH 4328/6226] steam-lancache-prefill: 3.3.0 -> 3.4.0

---
 pkgs/by-name/st/steam-lancache-prefill/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/steam-lancache-prefill/package.nix b/pkgs/by-name/st/steam-lancache-prefill/package.nix
index b1254d4f09ce..5afe8b4be93c 100644
--- a/pkgs/by-name/st/steam-lancache-prefill/package.nix
+++ b/pkgs/by-name/st/steam-lancache-prefill/package.nix
@@ -10,13 +10,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "steam-lancache-prefill";
-  version = "3.3.0";
+  version = "3.4.0";
 
   src = fetchFromGitHub {
     owner = "tpill90";
     repo = "steam-lancache-prefill";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-V3hegWhJCkQiE6pkGLRVKw6UcNNEt0dF9URSfBz3BEk=";
+    hash = "sha256-8iYAg6Cpoehnnk/JXdBLkG0QSNnD9hpqizX0jCtp3PM=";
     fetchSubmodules = true;
   };
 

From 9797ef150ff666455d1f7096de592b23de6ecca7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 11:02:46 +0000
Subject: [PATCH 4329/6226] ripdrag: 0.4.10 -> 0.4.11

---
 pkgs/by-name/ri/ripdrag/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ri/ripdrag/package.nix b/pkgs/by-name/ri/ripdrag/package.nix
index 73b50b3d8026..e4ebba193714 100644
--- a/pkgs/by-name/ri/ripdrag/package.nix
+++ b/pkgs/by-name/ri/ripdrag/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ripdrag";
-  version = "0.4.10";
+  version = "0.4.11";
 
   src = fetchFromGitHub {
     owner = "nik012003";
     repo = "ripdrag";
     rev = "v${version}";
-    hash = "sha256-aK/1f56sHspohbYO0z2Hf1NDJsN8Dbf1NoL/QadbVSY=";
+    hash = "sha256-1IUS0PNzIoSrlBXQrUmw/lXUD8auVVKhu/irSoYoK6w=";
   };
 
-  cargoHash = "sha256-w6gy149pbzRmN3XnRqMZuxAsKGXUglQpn/7g9L8+rZU=";
+  cargoHash = "sha256-LtkSGu261rPFgofaD/t2rSilxUPL6eHBpd/Tz9gR8ZM=";
 
   nativeBuildInputs = [
     pkg-config

From 304610aceee07f2f1166fc0281e9d51adf7a9781 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Fri, 31 Oct 2025 12:04:00 +0100
Subject: [PATCH 4330/6226] vesktop: 1.6.0 -> 1.6.1

---
 pkgs/by-name/ve/vesktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ve/vesktop/package.nix b/pkgs/by-name/ve/vesktop/package.nix
index d230d55e1cb2..b31f5a78d051 100644
--- a/pkgs/by-name/ve/vesktop/package.nix
+++ b/pkgs/by-name/ve/vesktop/package.nix
@@ -24,13 +24,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vesktop";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "Vencord";
     repo = "Vesktop";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-kzJsSjaTH6HtBfhEtX4NLJS96zgYr0/Us6H0tDJvb9A=";
+    hash = "sha256-ZFAsyH+5duKerZissOR/lESLetqqEMLk86msLlQO1xU=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
@@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
       patches
       ;
     fetcherVersion = 2;
-    hash = "sha256-Vn+Imarp1OTPfe/PoMgFHU5eWnye5Oa+qoGZaTxOUmU=";
+    hash = "sha256-7fYD4lTSLCMOa+CqGlL45Mjw6qMfIJddPcRF5/dGGrk=";
   };
 
   nativeBuildInputs = [

From fcc20fbb35d60546496f93f6b836bca334b8af31 Mon Sep 17 00:00:00 2001
From: Amadej Kastelic <amadejkastelic7@gmail.com>
Date: Fri, 31 Oct 2025 12:04:15 +0100
Subject: [PATCH 4331/6226] vesktop: fix use_system_vencord.patch

---
 .../ve/vesktop/use_system_vencord.patch       | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ve/vesktop/use_system_vencord.patch b/pkgs/by-name/ve/vesktop/use_system_vencord.patch
index 99ac643ef653..a9df59da9268 100644
--- a/pkgs/by-name/ve/vesktop/use_system_vencord.patch
+++ b/pkgs/by-name/ve/vesktop/use_system_vencord.patch
@@ -1,13 +1,10 @@
-diff --git a/src/main/constants.ts b/src/main/constants.ts
-index 40d91a5..7b46bbf 100644
---- a/src/main/constants.ts
-+++ b/src/main/constants.ts
-@@ -49,7 +49,7 @@ export const VENCORD_THEMES_DIR = join(DATA_DIR, "themes");
- // as otherwise "DATA_DIR" (which is used by ./settings) will be uninitialised
- export const VENCORD_FILES_DIR =
-     (require("./settings") as typeof import("./settings")).State.store.vencordDir ||
--    join(SESSION_DATA_DIR, "vencordFiles");
-+    "@vencord@";
- 
- export const USER_AGENT = `Vesktop/${app.getVersion()} (https://github.com/Vencord/Vesktop)`;
+diff --git a/src/main/vencordFilesDir.ts b/src/main/vencordFilesDir.ts
+index 8ef9ab8..ac376e0 100644
+--- a/src/main/vencordFilesDir.ts
++++ b/src/main/vencordFilesDir.ts
+@@ -10,4 +10,4 @@ import { SESSION_DATA_DIR } from "./constants";
+ import { State } from "./settings";
  
+ // this is in a separate file to avoid circular dependencies
+-export const VENCORD_FILES_DIR = State.store.vencordDir || join(SESSION_DATA_DIR, "vencordFiles");
++export const VENCORD_FILES_DIR = State.store.vencordDir || "@vencord@";

From dbc4e4b44465e923aa5c7e94721b502336a36554 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 11:08:05 +0000
Subject: [PATCH 4332/6226] rucio: 38.4.0 -> 38.5.0

---
 pkgs/development/python-modules/rucio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rucio/default.nix b/pkgs/development/python-modules/rucio/default.nix
index 78681732514d..91c865f96e77 100644
--- a/pkgs/development/python-modules/rucio/default.nix
+++ b/pkgs/development/python-modules/rucio/default.nix
@@ -40,13 +40,13 @@
 }:
 
 let
-  version = "38.4.0";
+  version = "38.5.0";
 
   src = fetchFromGitHub {
     owner = "rucio";
     repo = "rucio";
     tag = version;
-    hash = "sha256-PGBVStSLyNHbW8vmx7enxsqaw7KRMzR2HPXun9GMPQY=";
+    hash = "sha256-j+VFPS4obKdbbFPj3HZnpe5bzIMgOGaCeaKAiRuc0Gk=";
   };
 in
 buildPythonPackage {

From 178b252be8bb74aee66be193d287e8429c8c174a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 11:15:26 +0000
Subject: [PATCH 4333/6226] laravel: 5.22.0 -> 5.23.0

---
 pkgs/by-name/la/laravel/composer.lock | 60 +++++++++++++--------------
 pkgs/by-name/la/laravel/package.nix   |  6 +--
 2 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/pkgs/by-name/la/laravel/composer.lock b/pkgs/by-name/la/laravel/composer.lock
index d9fae099ba7a..d6fbbde2d9db 100644
--- a/pkgs/by-name/la/laravel/composer.lock
+++ b/pkgs/by-name/la/laravel/composer.lock
@@ -167,16 +167,16 @@
         },
         {
             "name": "illuminate/collections",
-            "version": "v12.35.0",
+            "version": "v12.36.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/collections.git",
-                "reference": "b323866d9e571f8c444f3ccca6f645c05fadf568"
+                "reference": "419a151ce65ce38037ba80d9875d4bed8ea7eaf5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/collections/zipball/b323866d9e571f8c444f3ccca6f645c05fadf568",
-                "reference": "b323866d9e571f8c444f3ccca6f645c05fadf568",
+                "url": "https://api.github.com/repos/illuminate/collections/zipball/419a151ce65ce38037ba80d9875d4bed8ea7eaf5",
+                "reference": "419a151ce65ce38037ba80d9875d4bed8ea7eaf5",
                 "shasum": ""
             },
             "require": {
@@ -222,11 +222,11 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-10-10T13:31:43+00:00"
+            "time": "2025-10-28T19:20:34+00:00"
         },
         {
             "name": "illuminate/conditionable",
-            "version": "v12.35.0",
+            "version": "v12.36.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/conditionable.git",
@@ -272,7 +272,7 @@
         },
         {
             "name": "illuminate/contracts",
-            "version": "v12.35.0",
+            "version": "v12.36.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/contracts.git",
@@ -320,16 +320,16 @@
         },
         {
             "name": "illuminate/filesystem",
-            "version": "v12.35.0",
+            "version": "v12.36.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/filesystem.git",
-                "reference": "c7c3bbcd05c0836af89f1b49bf70c3170c011c13"
+                "reference": "46a3cdb0c572c0956d06ac70a819b32199d9717a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/c7c3bbcd05c0836af89f1b49bf70c3170c011c13",
-                "reference": "c7c3bbcd05c0836af89f1b49bf70c3170c011c13",
+                "url": "https://api.github.com/repos/illuminate/filesystem/zipball/46a3cdb0c572c0956d06ac70a819b32199d9717a",
+                "reference": "46a3cdb0c572c0956d06ac70a819b32199d9717a",
                 "shasum": ""
             },
             "require": {
@@ -383,11 +383,11 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-09-30T17:35:38+00:00"
+            "time": "2025-10-26T17:15:12+00:00"
         },
         {
             "name": "illuminate/macroable",
-            "version": "v12.35.0",
+            "version": "v12.36.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/macroable.git",
@@ -433,16 +433,16 @@
         },
         {
             "name": "illuminate/support",
-            "version": "v12.35.0",
+            "version": "v12.36.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/illuminate/support.git",
-                "reference": "eefcefcf6edff2c986f746f10fad3da3e79a1223"
+                "reference": "100294d4ea7fa7761e8ac05b54fb861748bc1e89"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/illuminate/support/zipball/eefcefcf6edff2c986f746f10fad3da3e79a1223",
-                "reference": "eefcefcf6edff2c986f746f10fad3da3e79a1223",
+                "url": "https://api.github.com/repos/illuminate/support/zipball/100294d4ea7fa7761e8ac05b54fb861748bc1e89",
+                "reference": "100294d4ea7fa7761e8ac05b54fb861748bc1e89",
                 "shasum": ""
             },
             "require": {
@@ -508,7 +508,7 @@
                 "issues": "https://github.com/laravel/framework/issues",
                 "source": "https://github.com/laravel/framework"
             },
-            "time": "2025-10-18T13:23:12+00:00"
+            "time": "2025-10-28T14:38:53+00:00"
         },
         {
             "name": "laravel/prompts",
@@ -902,16 +902,16 @@
         },
         {
             "name": "symfony/console",
-            "version": "v7.3.4",
+            "version": "v7.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "2b9c5fafbac0399a20a2e82429e2bd735dcfb7db"
+                "reference": "cdb80fa5869653c83cfe1a9084a673b6daf57ea7"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/2b9c5fafbac0399a20a2e82429e2bd735dcfb7db",
-                "reference": "2b9c5fafbac0399a20a2e82429e2bd735dcfb7db",
+                "url": "https://api.github.com/repos/symfony/console/zipball/cdb80fa5869653c83cfe1a9084a673b6daf57ea7",
+                "reference": "cdb80fa5869653c83cfe1a9084a673b6daf57ea7",
                 "shasum": ""
             },
             "require": {
@@ -976,7 +976,7 @@
                 "terminal"
             ],
             "support": {
-                "source": "https://github.com/symfony/console/tree/v7.3.4"
+                "source": "https://github.com/symfony/console/tree/v7.3.5"
             },
             "funding": [
                 {
@@ -996,7 +996,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-09-22T15:31:00+00:00"
+            "time": "2025-10-14T15:46:26+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
@@ -1067,16 +1067,16 @@
         },
         {
             "name": "symfony/finder",
-            "version": "v7.3.2",
+            "version": "v7.3.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe"
+                "reference": "9f696d2f1e340484b4683f7853b273abff94421f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/2a6614966ba1074fa93dae0bc804227422df4dfe",
-                "reference": "2a6614966ba1074fa93dae0bc804227422df4dfe",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/9f696d2f1e340484b4683f7853b273abff94421f",
+                "reference": "9f696d2f1e340484b4683f7853b273abff94421f",
                 "shasum": ""
             },
             "require": {
@@ -1111,7 +1111,7 @@
             "description": "Finds files and directories via an intuitive fluent interface",
             "homepage": "https://symfony.com",
             "support": {
-                "source": "https://github.com/symfony/finder/tree/v7.3.2"
+                "source": "https://github.com/symfony/finder/tree/v7.3.5"
             },
             "funding": [
                 {
@@ -1131,7 +1131,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2025-07-15T13:41:35+00:00"
+            "time": "2025-10-15T18:45:57+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
diff --git a/pkgs/by-name/la/laravel/package.nix b/pkgs/by-name/la/laravel/package.nix
index c7c3626719ec..b05b8c7a94de 100644
--- a/pkgs/by-name/la/laravel/package.nix
+++ b/pkgs/by-name/la/laravel/package.nix
@@ -7,19 +7,19 @@
 }:
 php.buildComposerProject2 (finalAttrs: {
   pname = "laravel";
-  version = "5.22.0";
+  version = "5.23.0";
 
   src = fetchFromGitHub {
     owner = "laravel";
     repo = "installer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kC6RD+rtjHXrOGhF/E9l8/eArTnDrXIw3D6lnDpsl7I=";
+    hash = "sha256-yTwpoIJMFFYTNHZmB7xhKj6MFlMfLbvi4fWoo4EHTgg=";
   };
 
   nativeBuildInputs = [ makeWrapper ];
 
   composerLock = ./composer.lock;
-  vendorHash = "sha256-s+wBvGnDyKbzniZoKJ4wUcv0FCo7XnrD6KYvYhllBFM=";
+  vendorHash = "sha256-lKyMzBamoUTqQ43RwpOokeA0BZzUqabYqaFY7JpzRoA=";
 
   # Adding npm (nodejs) and php composer to path
   postInstall = ''

From c58a925076fc684fc81586ca403314964eec2311 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 11:26:27 +0000
Subject: [PATCH 4334/6226] vscode-extensions.ionide.ionide-fsharp: 7.28.1 ->
 7.28.3

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 8c508700e94d..f81787c5a9e9 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2350,8 +2350,8 @@ let
         mktplcRef = {
           name = "Ionide-fsharp";
           publisher = "Ionide";
-          version = "7.28.1";
-          hash = "sha256-JDrJAZB1QvLG/dXHOhg6VM8dgwEc1eV6BycoRfEQmuY=";
+          version = "7.28.3";
+          hash = "sha256-MUoYoElDVMZZHsUZ17fhfwZaHNAJ4j50lTqhhRw8EBI=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog";

From 643bffb975c90b5de7595a325544e32f71de257c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 11:55:49 +0000
Subject: [PATCH 4335/6226] polarity: latest-unstable-2025-10-27 ->
 latest-unstable-2025-10-30

---
 pkgs/by-name/po/polarity/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix
index b43ed6676176..6c7ed240c923 100644
--- a/pkgs/by-name/po/polarity/package.nix
+++ b/pkgs/by-name/po/polarity/package.nix
@@ -7,13 +7,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "polarity";
-  version = "latest-unstable-2025-10-27";
+  version = "latest-unstable-2025-10-30";
 
   src = fetchFromGitHub {
     owner = "polarity-lang";
     repo = "polarity";
-    rev = "bac4a2ba743551fe5986d8b4e840ee53ae8e065d";
-    hash = "sha256-7sp/7U1AoudUEEM9Pa4BcXNRiym70MnOx3NiSUOQb9o=";
+    rev = "309532f08f8bac21b52708ccce0cedad42f0ab39";
+    hash = "sha256-s/sDx9SWrsbNuidfDNQyXeJflvwvwwMH4IEiSQ6Fh24=";
   };
 
   cargoHash = "sha256-DyqK5cxdsZWMr79clw8oRHTAAlzGzP8i4Vu/UXH/ptE=";

From d819624fa370bab187e1e0528bcca6fba2bcec92 Mon Sep 17 00:00:00 2001
From: Naxdy <naxdy@naxdy.org>
Date: Fri, 31 Oct 2025 13:02:30 +0100
Subject: [PATCH 4336/6226] cudaPackages.buildRedist: do not require
 `config.cudaSupport` to be enabled

---
 pkgs/development/cuda-modules/buildRedist/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/cuda-modules/buildRedist/default.nix b/pkgs/development/cuda-modules/buildRedist/default.nix
index 0317d85c9b22..421432c6dc87 100644
--- a/pkgs/development/cuda-modules/buildRedist/default.nix
+++ b/pkgs/development/cuda-modules/buildRedist/default.nix
@@ -375,10 +375,6 @@ extendMkDerivation {
         # a package is missing and is required for the build -- that should go in platformAssertions,
         # because attempts to access attributes on the package will cause evaluation errors.
         brokenAssertions = [
-          {
-            message = "CUDA support is enabled by config.cudaSupport";
-            assertion = config.cudaSupport;
-          }
           {
             message = "lib output precedes static output";
             assertion =

From 474f62e91479d82bc04eec72e68652eb80a3d64f Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 31 Oct 2025 13:09:52 +0100
Subject: [PATCH 4337/6226] build-support/go: clarify `vendorHash`

So programs doesn't need dependencies (e.g., issue2md), that
doesn't mean the dependencies are in the source tree.
---
 pkgs/build-support/go/module.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/go/module.nix b/pkgs/build-support/go/module.nix
index c1c644e4294e..eaeb6e075ae4 100644
--- a/pkgs/build-support/go/module.nix
+++ b/pkgs/build-support/go/module.nix
@@ -24,8 +24,8 @@ lib.extendMkDerivation {
       modRoot ? "./",
 
       # The SRI hash of the vendored dependencies.
-      # If `vendorHash` is `null`, no dependencies are fetched and
-      # the build relies on the vendor folder within the source.
+      # If `null`, it means the project either has no external dependencies
+      # or the vendored dependencies are already present in the source tree.
       vendorHash ? throw (
         if args ? vendorSha256 then
           "buildGoModule: Expect vendorHash instead of vendorSha256"

From da95be33945199e317f18a47fda81879aa397aa0 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 31 Oct 2025 13:14:16 +0100
Subject: [PATCH 4338/6226] issue2md: add `ldflags`

Context:
- https://github.com/NixOS/nixpkgs/pull/456918#discussion_r2479429015
- https://github.com/NixOS/nixpkgs/issues/346380
---
 pkgs/by-name/is/issue2md/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/is/issue2md/package.nix b/pkgs/by-name/is/issue2md/package.nix
index 8ccd32577397..947f354f96e4 100644
--- a/pkgs/by-name/is/issue2md/package.nix
+++ b/pkgs/by-name/is/issue2md/package.nix
@@ -17,6 +17,10 @@ buildGoModule (finalAttrs: {
 
   vendorHash = null;
 
+  ldflags = [
+    "-s"
+  ];
+
   meta = {
     description = "CLI tool to convert GitHub issue into Markdown file";
     homepage = "https://github.com/bigwhite/issue2md";

From 208f47bbf864f4b31dd1f8d7f8742cfb6f43cb3c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 12:21:03 +0000
Subject: [PATCH 4339/6226] crosvm: 0-unstable-2025-10-27 ->
 0-unstable-2025-10-30

---
 pkgs/by-name/cr/crosvm/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix
index 0d01d8291ccb..4b82ac879d6d 100644
--- a/pkgs/by-name/cr/crosvm/package.nix
+++ b/pkgs/by-name/cr/crosvm/package.nix
@@ -21,12 +21,12 @@
 
 rustPlatform.buildRustPackage {
   pname = "crosvm";
-  version = "0-unstable-2025-10-27";
+  version = "0-unstable-2025-10-30";
 
   src = fetchgit {
     url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
-    rev = "4630761f03d5a389d36c22bf685df107b43083a7";
-    hash = "sha256-hp90A/uSXS/RNn1HCCWF4Sv3X8AOtcCOk9DRv95epVc=";
+    rev = "7f9512777db72a1e89ba0880af7bc5467ee461bf";
+    hash = "sha256-ptx9JA/uyH05r/NvgtK4ppifOiW/zjl7Bsy7vgBYkjI=";
     fetchSubmodules = true;
   };
 

From e66c33c09fcc63d479592d1206dabe43e11538d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 12:29:03 +0000
Subject: [PATCH 4340/6226] python3Packages.clevercsv: 0.8.3 -> 0.8.4

---
 pkgs/development/python-modules/clevercsv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/clevercsv/default.nix b/pkgs/development/python-modules/clevercsv/default.nix
index 4f10df8c8159..053167518a8c 100644
--- a/pkgs/development/python-modules/clevercsv/default.nix
+++ b/pkgs/development/python-modules/clevercsv/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "clevercsv";
-  version = "0.8.3";
+  version = "0.8.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "alan-turing-institute";
     repo = "CleverCSV";
     tag = "v${version}";
-    hash = "sha256-T4eYTr3+MUr1fPWE490v1m8THdZrBUP4wODftjpvnLQ=";
+    hash = "sha256-yp102f0WHu9wdVpXBIXn4lP7fi1UOQdA7M11hyVyRyM=";
   };
 
   build-system = [ setuptools ];

From 23030d71f7fb60043f884563988667945e5a5fac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 12:31:52 +0000
Subject: [PATCH 4341/6226] cpufetch: 1.06 -> 1.07

---
 pkgs/by-name/cp/cpufetch/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cp/cpufetch/package.nix b/pkgs/by-name/cp/cpufetch/package.nix
index e3c7c5df79a4..d6afdd378943 100644
--- a/pkgs/by-name/cp/cpufetch/package.nix
+++ b/pkgs/by-name/cp/cpufetch/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cpufetch";
-  version = "1.06";
+  version = "1.07";
 
   src = fetchFromGitHub {
     owner = "Dr-Noob";
     repo = "cpufetch";
     rev = "v${version}";
-    sha256 = "sha256-sE3i2rw8W362BExFEImjw/t17qX8D4/0Ty8jG63bjbk=";
+    sha256 = "sha256-qmT7WBWKtSWGIK/dEd3/bF1bBjqSjfkP99htfnlFLCw=";
   };
 
   nativeBuildInputs = [

From 81b863527d0013114566253df5462cb58ebe3e4d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 12:33:04 +0000
Subject: [PATCH 4342/6226] opensmtpd: 7.7.0p0 -> 7.8.0p0

---
 pkgs/by-name/op/opensmtpd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/opensmtpd/package.nix b/pkgs/by-name/op/opensmtpd/package.nix
index 8f7930623b37..3304486a8919 100644
--- a/pkgs/by-name/op/opensmtpd/package.nix
+++ b/pkgs/by-name/op/opensmtpd/package.nix
@@ -18,7 +18,7 @@
 
 stdenv.mkDerivation rec {
   pname = "opensmtpd";
-  version = "7.7.0p0";
+  version = "7.8.0p0";
 
   nativeBuildInputs = [
     autoreconfHook
@@ -38,7 +38,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://www.opensmtpd.org/archives/${pname}-${version}.tar.gz";
-    hash = "sha256-sJU9oc4sv+S+E5zbGaqTX7+rQs8KmT1CWzejl9xIOWg=";
+    hash = "sha256-QDTeLpLGH6g+7a2x2Ni9/mXlfrUM6WeeAUCVDjTKSrc=";
   };
 
   patches = [

From cc559b7bb0be44ab532122bef8a4ce769287a896 Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Fri, 31 Oct 2025 13:25:50 +0100
Subject: [PATCH 4343/6226] karere: init at 0.9.4

---
 pkgs/by-name/ka/karere/package.nix | 58 ++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 pkgs/by-name/ka/karere/package.nix

diff --git a/pkgs/by-name/ka/karere/package.nix b/pkgs/by-name/ka/karere/package.nix
new file mode 100644
index 000000000000..1a28df71813d
--- /dev/null
+++ b/pkgs/by-name/ka/karere/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  vala,
+  meson,
+  ninja,
+  pkg-config,
+  wrapGAppsHook4,
+  blueprint-compiler,
+  desktop-file-utils,
+  appstream,
+  gtk4,
+  libadwaita,
+  webkitgtk_6_0,
+  json-glib,
+  libgee,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "karere";
+  version = "0.9.4";
+
+  src = fetchFromGitHub {
+    owner = "tobagin";
+    repo = "karere";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-qfBAA9PFXqU+hS9evsX8898ysE58IcZz3df4kVsnaa8=";
+  };
+
+  nativeBuildInputs = [
+    vala
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook4
+    blueprint-compiler
+    desktop-file-utils
+    appstream
+  ];
+
+  buildInputs = [
+    gtk4
+    libadwaita
+    webkitgtk_6_0
+    json-glib
+    libgee
+  ];
+
+  meta = {
+    description = "Gtk4 Whatsapp client";
+    homepage = "https://github.com/tobagin/karere";
+    changelog = "https://github.com/tobagin/karere/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ marcel ];
+    mainProgram = "karere";
+  };
+})

From 44f1db823f47d3e408e284458c4252a1e0dffdf7 Mon Sep 17 00:00:00 2001
From: Slava Gorbunov <slava@fizlesh.org.ru>
Date: Fri, 31 Oct 2025 15:40:36 +0300
Subject: [PATCH 4344/6226] Use the same CPP flags as ghc-9.12

---
 pkgs/development/compilers/ghc/common-hadrian.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/ghc/common-hadrian.nix b/pkgs/development/compilers/ghc/common-hadrian.nix
index 4bd05012e7f9..62691f861584 100644
--- a/pkgs/development/compilers/ghc/common-hadrian.nix
+++ b/pkgs/development/compilers/ghc/common-hadrian.nix
@@ -863,7 +863,7 @@ stdenv.mkDerivation (
       ghc-settings-edit "$settingsFile" \
         "JavaScript CPP command" "${toolPath "cc" installCC}"
       ghc-settings-edit "$settingsFile" \
-        "JavaScript CPP flags" "-E"
+        "JavaScript CPP flags" "-E -CC -Wno-unicode -nostdinc"
     ''
     + ''
 

From d137913f8281950428aa65bac33322875a6c37bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 12:48:26 +0000
Subject: [PATCH 4345/6226] python3Packages.elevenlabs: 2.20.1 -> 2.21.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 2734adc85037..c42af62a6c95 100644
--- a/pkgs/development/python-modules/elevenlabs/default.nix
+++ b/pkgs/development/python-modules/elevenlabs/default.nix
@@ -13,7 +13,7 @@
 }:
 
 let
-  version = "2.20.1";
+  version = "2.21.0";
   tag = "v${version}";
 in
 buildPythonPackage {
@@ -25,7 +25,7 @@ buildPythonPackage {
     owner = "elevenlabs";
     repo = "elevenlabs-python";
     inherit tag;
-    hash = "sha256-uJ6uy2/DUtwP5k694Ev672JfDnc5j6Qx0HuineAI7bI=";
+    hash = "sha256-jDpTCflRPfm13ZFA5OUsl1bsFZ8ftSbf23BtgcpL5pQ=";
   };
 
   build-system = [ poetry-core ];

From ae79cb3df795c7a7b82970e9d5be977c39cf58d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 12:57:33 +0000
Subject: [PATCH 4346/6226] checkip: 0.47.7 -> 0.49.0

---
 pkgs/by-name/ch/checkip/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/checkip/package.nix b/pkgs/by-name/ch/checkip/package.nix
index 6f5ccb4f6396..8d5aec83de0b 100644
--- a/pkgs/by-name/ch/checkip/package.nix
+++ b/pkgs/by-name/ch/checkip/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "checkip";
-  version = "0.47.7";
+  version = "0.49.0";
 
   src = fetchFromGitHub {
     owner = "jreisinger";
     repo = "checkip";
     tag = "v${version}";
-    hash = "sha256-bjKRHIY9OIEft//g8VHKHTUrwWn8UU38SPP4IdPbIQE=";
+    hash = "sha256-zhc32H4EUjFbU5weab+IQYARSrJXD8zqkxHLgO5jIJs=";
   };
 
-  vendorHash = "sha256-hTjSOufyrOKdY6wdPXvbpXwgWiHIRI+t4ByqHBY6cPQ=";
+  vendorHash = "sha256-5sUBrzo6wJfaMMvgNflcjB2QNSIeaD2TN7qBao53NFs=";
 
   ldflags = [
     "-w"

From b08c058249ebea7fe8e9838a242efb892e101c65 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Fri, 31 Oct 2025 21:00:04 +0800
Subject: [PATCH 4347/6226] vgmstream: fix build on darwin

---
 pkgs/by-name/vg/vgmstream/package.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/vg/vgmstream/package.nix b/pkgs/by-name/vg/vgmstream/package.nix
index d17e6585ecc8..6342295917e8 100644
--- a/pkgs/by-name/vg/vgmstream/package.nix
+++ b/pkgs/by-name/vg/vgmstream/package.nix
@@ -13,8 +13,14 @@
   libao,
   speex,
   nix-update-script,
+
+  audaciousSupport ? stdenv.hostPlatform.isLinux,
 }:
 
+assert lib.assertMsg (
+  audaciousSupport -> stdenv.hostPlatform.isLinux
+) "Only Linux supports building the Audacious plugin.";
+
 let
   # https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/atrac9.cmake
   atrac9-src = fetchFromGitHub {
@@ -54,10 +60,7 @@ stdenv.mkDerivation rec {
     ];
   };
 
-  outputs = [
-    "out"
-    "audacious"
-  ];
+  outputs = [ "out" ] ++ lib.optional audaciousSupport "audacious";
 
   nativeBuildInputs = [
     cmake
@@ -71,8 +74,8 @@ stdenv.mkDerivation rec {
     libvorbis
     libao
     speex
-    audacious-bare
-  ];
+  ]
+  ++ lib.optional audaciousSupport audacious-bare;
 
   preConfigure = ''
     substituteInPlace cmake/dependencies/audacious.cmake \
@@ -89,6 +92,7 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     "-DATRAC9_PATH=${atrac9-src}"
+    (lib.cmakeBool "BUILD_AUDACIOUS" audaciousSupport)
   ]
   # Only supported on x86_64-linux
   ++ lib.optionals (stdenv.system == "x86_64-linux") [

From 4cbbf6da55bc28eb8a83bf34c214461cbe280eb8 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Fri, 31 Oct 2025 21:02:51 +0800
Subject: [PATCH 4348/6226] vgmstream: migrate to finalAttrs

---
 pkgs/by-name/vg/vgmstream/package.nix | 68 +++++++++++++--------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/pkgs/by-name/vg/vgmstream/package.nix b/pkgs/by-name/vg/vgmstream/package.nix
index 6342295917e8..f1c3ef1a0447 100644
--- a/pkgs/by-name/vg/vgmstream/package.nix
+++ b/pkgs/by-name/vg/vgmstream/package.nix
@@ -21,45 +21,17 @@ assert lib.assertMsg (
   audaciousSupport -> stdenv.hostPlatform.isLinux
 ) "Only Linux supports building the Audacious plugin.";
 
-let
-  # https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/atrac9.cmake
-  atrac9-src = fetchFromGitHub {
-    owner = "Thealexbarney";
-    repo = "LibAtrac9";
-    rev = "6a9e00f6c7abd74d037fd210b6670d3cdb313049";
-    hash = "sha256-n47CzIbh8NxJ4GzKLjZQeS27k2lGx08trC1m4AOzVZc=";
-  };
-
-  # https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/celt.cmake
-  celt-0_6_1-src = fetchzip {
-    url = "https://downloads.xiph.org/releases/celt/celt-0.6.1.tar.gz";
-    hash = "sha256-DI1z10mTDQOn/R1FssaegmOa6ZNx3bXNiWHwLnytJWw=";
-  };
-  celt-0_11_0-src = fetchzip {
-    url = "https://downloads.xiph.org/releases/celt/celt-0.11.0.tar.gz";
-    hash = "sha256-JI3b44iCxQ29bqJGNH/L18pEuWiTFZ2132ceaqe8U0E=";
-  };
-in
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "vgmstream";
   version = "2055";
 
   src = fetchFromGitHub {
     owner = "vgmstream";
     repo = "vgmstream";
-    tag = "r${version}";
+    tag = "r${finalAttrs.version}";
     hash = "sha256-GNsoWCTLDd49T639lKkLoyBWpWYocDP6gZB2e8ZUyEU=";
   };
 
-  passthru.updateScript = nix-update-script {
-    attrPath = "vgmstream";
-    extraArgs = [
-      "--version-regex"
-      "r(.*)"
-    ];
-  };
-
   outputs = [ "out" ] ++ lib.optional audaciousSupport "audacious";
 
   nativeBuildInputs = [
@@ -86,21 +58,49 @@ stdenv.mkDerivation rec {
     # Therefore, CELT_0110_PATH needs to point to a mutable directory.
     lib.optionalString (stdenv.system == "x86_64-linux") ''
       mkdir -p dependencies/celt-0.11.0/
-      cp -r ${celt-0_11_0-src}/* dependencies/celt-0.11.0/
+      cp -r ${finalAttrs.passthru.sources.celt-0_11_0-src}/* dependencies/celt-0.11.0/
       chmod -R +w dependencies/celt-0.11.0/
     '';
 
   cmakeFlags = [
-    "-DATRAC9_PATH=${atrac9-src}"
+    "-DATRAC9_PATH=${finalAttrs.passthru.sources.atrac9-src}"
     (lib.cmakeBool "BUILD_AUDACIOUS" audaciousSupport)
   ]
   # Only supported on x86_64-linux
   ++ lib.optionals (stdenv.system == "x86_64-linux") [
-    "-DCELT_0061_PATH=${celt-0_6_1-src}"
+    "-DCELT_0061_PATH=${finalAttrs.passthru.sources.celt-0_6_1-src}"
     "-DCELT_0110_PATH=../dependencies/celt-0.11.0"
     # libg719_decode omitted because it doesn't have a free software license
   ];
 
+  passthru = {
+    updateScript = nix-update-script {
+      attrPath = "vgmstream";
+      extraArgs = [
+        "--version-regex"
+        "r(.*)"
+      ];
+    };
+    sources = {
+      # https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/atrac9.cmake
+      atrac9-src = fetchFromGitHub {
+        owner = "Thealexbarney";
+        repo = "LibAtrac9";
+        rev = "6a9e00f6c7abd74d037fd210b6670d3cdb313049";
+        hash = "sha256-n47CzIbh8NxJ4GzKLjZQeS27k2lGx08trC1m4AOzVZc=";
+      };
+      # https://github.com/vgmstream/vgmstream/blob/1b6a7915bf98ca14a71a0d44bef7a2c6a75c686d/cmake/dependencies/celt.cmake
+      celt-0_6_1-src = fetchzip {
+        url = "https://downloads.xiph.org/releases/celt/celt-0.6.1.tar.gz";
+        hash = "sha256-DI1z10mTDQOn/R1FssaegmOa6ZNx3bXNiWHwLnytJWw=";
+      };
+      celt-0_11_0-src = fetchzip {
+        url = "https://downloads.xiph.org/releases/celt/celt-0.11.0.tar.gz";
+        hash = "sha256-JI3b44iCxQ29bqJGNH/L18pEuWiTFZ2132ceaqe8U0E=";
+      };
+    };
+  };
+
   meta = with lib; {
     description = "Library for playback of various streamed audio formats used in video games";
     homepage = "https://vgmstream.org";
@@ -114,4 +114,4 @@ stdenv.mkDerivation rec {
       ++ optional (stdenv.system == "x86_64-linux") bsd2;
     platforms = with platforms; unix;
   };
-}
+})

From 388f15513eeb733eca23ce3b2e7bd8677f8c5303 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 16 Sep 2025 21:16:19 -0400
Subject: [PATCH 4349/6226] fermyon-spin: 3.0.0 -> 3.5.0; add updateScript

[Release on GitHub](https://github.com/spinframework/spin/releases/tag/v3.5.0)
[Compare changes on GitHub](https://github.com/spinframework/spin/compare/v3.0.0...v3.5.0)
---
 pkgs/by-name/fe/fermyon-spin/package.nix | 36 ++++++++--------
 pkgs/by-name/fe/fermyon-spin/update.py   | 55 ++++++++++++++++++++++++
 pkgs/by-name/fe/fermyon-spin/update.sh   | 31 -------------
 3 files changed, 74 insertions(+), 48 deletions(-)
 create mode 100755 pkgs/by-name/fe/fermyon-spin/update.py
 delete mode 100755 pkgs/by-name/fe/fermyon-spin/update.sh

diff --git a/pkgs/by-name/fe/fermyon-spin/package.nix b/pkgs/by-name/fe/fermyon-spin/package.nix
index 8ea754ff8ee3..0ec9ac574e72 100644
--- a/pkgs/by-name/fe/fermyon-spin/package.nix
+++ b/pkgs/by-name/fe/fermyon-spin/package.nix
@@ -19,27 +19,24 @@ let
     }
     .${system} or (throw "Unsupported system: ${system}");
 
-  # TODO: It'd be nice to write an update script that would update all of these
-  # hashes together.
-  packageHash =
-    {
-      x86_64-linux = "sha256-r/F3Tj3WeeL2R27ussX+ebFWpW+8z2e7tdBK4MHFMpk=";
-      aarch64-linux = "sha256-BSFxDJeY7fOOxDqAV+6FJf0hup1Y5IJ/czqwc4W7qSA=";
-      x86_64-darwin = "sha256-T6J9IjfXdt9DnZksndAmZRkYyH/5H60J7V6xU0ltD2A=";
-      aarch64-darwin = "sha256-6x+0PB5/2oqYDVNiNhc0xcs/ESCLvvSsWtm2KlTIeBo=";
-    }
-    .${system} or (throw "Unsupported system: ${system}");
+  packageHashes = {
+    x86_64-linux = "sha256-TWWT60H8KtZlJTRY+RnS2pP7r0eKBDzGVm890uGdtHU=";
+    aarch64-linux = "sha256-MBZ/AgUz5dg8tFj4q+alnwlHu3d6/rfYZk9B1jYnGbw=";
+    x86_64-darwin = "sha256-F2wgyyf0L2Ci5MV0VQD5CnjckudbgvQEpNbZUIkw9Gc=";
+    aarch64-darwin = "sha256-9Onvzsc2UInjgX9AeWMFNvpUv2Y4i5wUR6z3Igyrzy0=";
+  };
 
+  packageHash = packageHashes.${system} or (throw "Unsupported system: ${system}");
 in
 stdenv.mkDerivation rec {
   pname = "fermyon-spin";
-  version = "3.0.0";
+  version = "3.5.0";
 
   # Use fetchurl rather than fetchzip as these tarballs are built by the project
   # and not by GitHub (and thus are stable) - this simplifies the update script
   # by allowing it to use the output of `nix store prefetch-file`.
   src = fetchurl {
-    url = "https://github.com/fermyon/spin/releases/download/v${version}/spin-v${version}-${platform}.tar.gz";
+    url = "https://github.com/spinframework/spin/releases/download/v${version}/spin-v${version}-${platform}.tar.gz";
     hash = packageHash;
   };
 
@@ -63,13 +60,18 @@ stdenv.mkDerivation rec {
     runHook postInstall
   '';
 
-  meta = with lib; {
+  passthru = {
+    inherit packageHashes; # needed by updateScript
+    updateScript = ./update.py;
+  };
+
+  meta = {
     description = "Framework for building, deploying, and running fast, secure, and composable cloud microservices with WebAssembly";
-    homepage = "https://github.com/fermyon/spin";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = with licenses; [ asl20 ];
+    homepage = "https://github.com/spinframework/spin";
+    sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
+    license = with lib.licenses; [ asl20 ];
     mainProgram = "spin";
     maintainers = [ ];
-    platforms = platforms.linux ++ platforms.darwin;
+    platforms = builtins.attrNames packageHashes;
   };
 }
diff --git a/pkgs/by-name/fe/fermyon-spin/update.py b/pkgs/by-name/fe/fermyon-spin/update.py
new file mode 100755
index 000000000000..2a2129a5926e
--- /dev/null
+++ b/pkgs/by-name/fe/fermyon-spin/update.py
@@ -0,0 +1,55 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i python3 -p python3 bash nix-update jq
+import subprocess
+from os.path import join, dirname
+
+# Outer keys are as in Nix, the inner dict's values are as in upstream.
+# We set oldHash and newHash fields in the inner dict later.
+systems = {
+  "x86_64-linux": {"os": "linux", "arch": "amd64"},
+  "x86_64-darwin": {"os": "macos", "arch": "amd64"},
+  "aarch64-linux": {"os": "linux", "arch": "aarch64"},
+  "aarch64-darwin": {"os": "macos", "arch": "aarch64"},
+}
+
+# This will set the version correctly,
+# and will also set the hash for one of the systems.
+subprocess.run([
+  "nix-update",
+  "fermyon-spin",
+  "--version-regex",
+  r"^v([\d\.]*)",
+  "--url",
+  "https://github.com/spinframework/spin"
+])
+
+newVer = subprocess.run(
+  ["nix-instantiate", "--eval", "--raw", "-A", "fermyon-spin.version"], capture_output=True, encoding="locale"
+).stdout
+
+for nixTuple in systems:
+  url = (
+    "https://github.com/spinframework/spin/releases/download/v"
+    f"{newVer}/spin-v{newVer}-{systems[nixTuple]['os']}-{systems[nixTuple]['arch']}.tar.gz"
+  )
+
+  systems[nixTuple]["oldHash"] = subprocess.run(
+    ["nix-instantiate", "--eval", "--raw", "-A", f"fermyon-spin.passthru.packageHashes.{nixTuple}"],
+    capture_output=True,
+    encoding="locale",
+  ).stdout
+
+  systems[nixTuple]["newHash"] = subprocess.run(
+    ["bash", "-c", f"nix store prefetch-file {url} --json | jq -r '.hash'"],
+    capture_output=True,
+    encoding="locale",
+  ).stdout.strip()  # Has a newline
+
+with open(join(dirname(__file__), "package.nix"), "r") as f:
+  file = f.read()
+
+for nixTuple in systems:
+  file = file.replace(systems[nixTuple]["oldHash"], systems[nixTuple]["newHash"])
+
+with open(join(dirname(__file__), "package.nix"), "w") as f:
+  f.write(file)
diff --git a/pkgs/by-name/fe/fermyon-spin/update.sh b/pkgs/by-name/fe/fermyon-spin/update.sh
deleted file mode 100755
index 9d00621f1c37..000000000000
--- a/pkgs/by-name/fe/fermyon-spin/update.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env nix-shell
-#!nix-shell -i bash -p jq
-#shellcheck shell=bash
-
-CURRENT_HASH=""
-
-print_hash() {
-    OS="$1"
-    ARCH="$2"
-    VERSION="$3"
-
-    URL="https://github.com/fermyon/spin/releases/download/v${VERSION}/spin-v${VERSION}-${OS}-${ARCH}.tar.gz"
-    echo
-    CURRENT_HASH=$(nix store prefetch-file "$URL" --json | jq -r '.hash')
-
-    echo "${ARCH}-${OS}: $CURRENT_HASH"
-}
-
-if [[ -z "$VER" && -n "$1" ]]; then
-    VER="$1"
-fi
-
-if [[ -z "$VER" ]]; then
-    echo "No 'VER' environment variable provided, skipping"
-else
-    print_hash "linux"  "amd64"   "$VER"
-    print_hash "linux"  "aarch64" "$VER"
-    print_hash "macos" "amd64"   "$VER"
-    print_hash "macos" "aarch64" "$VER"
-fi
-

From efa40191164bd19770c405d53425d1a8a9c44bb8 Mon Sep 17 00:00:00 2001
From: Thore Sommer <thore.sommer@tum.de>
Date: Fri, 24 Oct 2025 13:05:14 +0200
Subject: [PATCH 4350/6226] spdk: enable crypto support

---
 pkgs/by-name/sp/spdk/package.nix             | 35 ++++++++++++++++++++
 pkgs/by-name/sp/spdk/patches/configure.patch | 14 ++++++++
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/by-name/sp/spdk/patches/configure.patch

diff --git a/pkgs/by-name/sp/spdk/package.nix b/pkgs/by-name/sp/spdk/package.nix
index 83fc98dbe95d..20abc59efc7d 100644
--- a/pkgs/by-name/sp/spdk/package.nix
+++ b/pkgs/by-name/sp/spdk/package.nix
@@ -10,6 +10,10 @@
   libaio,
   libbsd,
   libuuid,
+  nasm,
+  autoconf,
+  automake,
+  libtool,
   numactl,
   openssl,
   pkg-config,
@@ -76,24 +80,46 @@ stdenv.mkDerivation rec {
     ncurses
     zlib
     zstd
+    nasm
+    autoconf
+    automake
+    libtool
   ];
 
   propagatedBuildInputs = [
     python3.pkgs.configshell-fb
   ];
 
+  patches = [
+    # Otherwise the DPDK version is not detected correctly
+    # Fix already upstream: https://github.com/spdk/spdk/commit/c3618c42ac3f6fdfcc9c04e29953fd6cf4f71c11
+    ./patches/configure.patch
+  ];
+
   postPatch = ''
     patchShebangs .
     # Override pip install command to use hatchling directly without downloading dependencies
     substituteInPlace python/Makefile \
       --replace-fail "setup_cmd = pip install --prefix=\$(CONFIG_PREFIX)" \
                      "setup_cmd = python3 -m pip install --no-deps --no-build-isolation --prefix=\$(CONFIG_PREFIX)"
+
+    # The nasm detection in the vendored version of isa-l_crypto is broken
+    # Upstream fix: https://github.com/intel/isa-l_crypto/commit/0850c01cc03e45f77d5883372dd6be983ba163ce
+    substituteInPlace isa-l-crypto/configure.ac \
+      --replace-fail "AC_LANG_CONFTEST([AC_LANG_SOURCE([[vpcompressb zmm0, k1, zmm1;]])])" \
+                     "AC_LANG_CONFTEST([AC_LANG_SOURCE([[vpcompressb zmm0 {k1}, zmm1;]])])"
   '';
 
   enableParallelBuilding = true;
 
+  # Required for the vendored isa-l version to find nasm
+  preConfigure = ''
+    export AS=nasm
+  '';
+
   configureFlags = [
     "--with-dpdk=${dpdk'}"
+    "--with-crypto"
   ]
   ++ lib.optional (!stdenv.hostPlatform.isStatic) "--with-shared";
 
@@ -106,6 +132,15 @@ stdenv.mkDerivation rec {
   postInstall = ''
     unset patchelf
 
+    # Clean up rpaths to remove /build references to the vendored isa-l and isa-l_crypto libs
+    for f in $(find $out/lib $out/bin -executable -type f 2>/dev/null); do
+      if patchelf --print-rpath "$f" 2>/dev/null | grep /build; then
+        echo "Stripping rpath of $f"
+        newrp=$(patchelf --print-rpath "$f" | sed -r "s|/build[^:]*:||g")
+        patchelf --set-rpath "$newrp" "$f"
+      fi
+    done
+
     # SPDK scripts assume that they can read the includes also relative to the scripts.
     # Therefore we are not copying them into $out/share.
     mkdir $out/scripts
diff --git a/pkgs/by-name/sp/spdk/patches/configure.patch b/pkgs/by-name/sp/spdk/patches/configure.patch
new file mode 100644
index 000000000000..93c221058adc
--- /dev/null
+++ b/pkgs/by-name/sp/spdk/patches/configure.patch
@@ -0,0 +1,14 @@
+diff --git a/configure b/configure
+index b0fdef9ec..413b7a968 100755
+--- a/configure
++++ b/configure
+@@ -959,6 +959,9 @@
+ 		dpdk_ver=$(< "$rootdir/dpdk/VERSION")
+ 	elif [[ -f "${CONFIG[DPDK_DIR]}"/../VERSION ]]; then
+ 		dpdk_ver=$(< "${CONFIG[DPDK_DIR]}"/../VERSION)
++       elif [[ "${CONFIG[DPDK_LIB_DIR]}" != "" && -e "${CONFIG[DPDK_LIB_DIR]}"/pkgconfig ]]; then
++               # Try pkg-config to figure out the module version
++               dpdk_ver=$(PKG_CONFIG_PATH="${CONFIG[DPDK_LIB_DIR]}"/pkgconfig pkg-config --modversion libdpdk)
+ 	fi
+ 	echo $dpdk_ver
+ }

From 09afbaaf499fcfe6366ee0e4e02c78bda17e0201 Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Fri, 31 Oct 2025 14:32:29 +0100
Subject: [PATCH 4351/6226] typescript-language-server: 5.0.1 -> 5.1.0

---
 pkgs/by-name/ty/typescript-language-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/typescript-language-server/package.nix b/pkgs/by-name/ty/typescript-language-server/package.nix
index 68982c758621..04a997db0805 100644
--- a/pkgs/by-name/ty/typescript-language-server/package.nix
+++ b/pkgs/by-name/ty/typescript-language-server/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "typescript-language-server";
-  version = "5.0.1";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "typescript-language-server";
     repo = "typescript-language-server";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Ziiiw6MXoIa1bWtME7dvzg+kQ8iXMG3P5rNR1B/Iifg=";
+    hash = "sha256-MpcTyjew/SgmWrpeqXLjQPPdwUuMTWQYyyM9TG5jNbQ=";
   };
 
   patches = [
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   offlineCache = fetchYarnDeps {
     yarnLock = "${finalAttrs.src}/yarn.lock";
-    hash = "sha256-ODO1G1AJd38cGqHhau1t4D8Mrug44pLk36d9dGtb/nM=";
+    hash = "sha256-CSjxiuUN+hHmoWwkVe6c5lLFeX3ROB3QlBQ15rVmPhk=";
   };
 
   nativeBuildInputs = [

From 14aff891d2d77caa251052dfe4d17a975d0ce62e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 13:33:03 +0000
Subject: [PATCH 4352/6226] terraform-providers.huaweicloud_huaweicloud: 1.79.2
 -> 1.80.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 2397935afcba..a94aaac74374 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -705,11 +705,11 @@
     "vendorHash": "sha256-jwDezL9gI6A9pCdD1CUgEOJT8dqVuPX/sFjTO4Jiqs4="
   },
   "huaweicloud_huaweicloud": {
-    "hash": "sha256-X/pEv7osVytLe16B/ERbp8izuPLtMb/TeMiQVI0jZWc=",
+    "hash": "sha256-k0XUu+QyxTLGp+r+gBbHx1+wqVCC5Xy2D4fMqWTCMOo=",
     "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud",
     "owner": "huaweicloud",
     "repo": "terraform-provider-huaweicloud",
-    "rev": "v1.79.2",
+    "rev": "v1.80.1",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From a0ac0db99956d5be100e57682154a1bed1cfe6cb Mon Sep 17 00:00:00 2001
From: Marcel <me@m4rc3l.de>
Date: Fri, 31 Oct 2025 14:29:11 +0100
Subject: [PATCH 4353/6226] python3Packages.super-collections: 0.5.4 -> 0.6.2

---
 .../python-modules/super-collections/default.nix            | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/super-collections/default.nix b/pkgs/development/python-modules/super-collections/default.nix
index edd693d512ad..b33a228292f3 100644
--- a/pkgs/development/python-modules/super-collections/default.nix
+++ b/pkgs/development/python-modules/super-collections/default.nix
@@ -6,18 +6,19 @@
   hjson,
   pytestCheckHook,
   rich,
+  pyyaml,
 }:
 
 buildPythonPackage rec {
   pname = "super-collections";
-  version = "0.5.4";
+  version = "0.6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fralau";
     repo = "super-collections";
     tag = "v${version}";
-    hash = "sha256-gp5BREoa1oHGm1ymDlIdlLTqyIvB0RmkNLYDJssI3VE=";
+    hash = "sha256-7QW5cL+TZlPX8ZMNNH+xZSGNIGr8Cy2jP1oSWy5tKaY=";
   };
 
   build-system = [
@@ -31,6 +32,7 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     pytestCheckHook
     rich
+    pyyaml
   ];
 
   pythonImportsCheck = [

From c9d3246f89d4cdc4db534720a9cf8c96a720c239 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 13:47:47 +0000
Subject: [PATCH 4354/6226] jreleaser-cli: 1.20.0 -> 1.21.0

---
 pkgs/by-name/jr/jreleaser-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/jr/jreleaser-cli/package.nix b/pkgs/by-name/jr/jreleaser-cli/package.nix
index 10e4d907a51c..5479cd5ca1fb 100644
--- a/pkgs/by-name/jr/jreleaser-cli/package.nix
+++ b/pkgs/by-name/jr/jreleaser-cli/package.nix
@@ -7,11 +7,11 @@
 }:
 stdenv.mkDerivation rec {
   pname = "jreleaser-cli";
-  version = "1.20.0";
+  version = "1.21.0";
 
   src = fetchurl {
     url = "https://github.com/jreleaser/jreleaser/releases/download/v${version}/jreleaser-tool-provider-${version}.jar";
-    hash = "sha256-47MpBFUEHx2yVk05Gd9CyVrHYHRK7NtcGosBJJbdhD0=";
+    hash = "sha256-X3lepk3T/Bc55Xkj0rLRo5ALohxqh0NCuUYvac/uijY=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 892c1127c73b023ebae7983d68919f072e1dcbd9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 13:51:51 +0000
Subject: [PATCH 4355/6226] mackup: 0.9.3 -> 0.9.5

---
 pkgs/by-name/ma/mackup/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/mackup/package.nix b/pkgs/by-name/ma/mackup/package.nix
index 9138561c8f16..07db1071d379 100644
--- a/pkgs/by-name/ma/mackup/package.nix
+++ b/pkgs/by-name/ma/mackup/package.nix
@@ -7,14 +7,14 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "mackup";
-  version = "0.9.3";
+  version = "0.9.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lra";
     repo = "mackup";
     rev = "${version}";
-    hash = "sha256-ysVABY/PWwqbWEATpzIrMkppHExOxDcia5HFr+VGQQc=";
+    hash = "sha256-10Q0lb2wiDjD4v2yFBvG3tvy9r+/T/ni4QhHUPyxFO0=";
   };
 
   postPatch = ''

From 86a71ab2df9b4c22fa5a70fa360b227664859141 Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Thu, 16 Oct 2025 14:39:11 +0200
Subject: [PATCH 4356/6226] signal-desktop-bin(aarch64-linux): 7.71.0 -> 7.77.1

---
 .../si/signal-desktop-bin/signal-desktop-aarch64.nix        | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
index 0133dd2596e7..546c213d48b7 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-aarch64.nix
@@ -1,7 +1,7 @@
 { callPackage, commandLineArgs }:
 callPackage ./generic.nix { inherit commandLineArgs; } {
   pname = "signal-desktop-bin";
-  version = "7.71.0";
+  version = "7.77.1";
 
   libdir = "usr/lib64/signal-desktop";
   bindir = "usr/bin";
@@ -10,6 +10,6 @@ callPackage ./generic.nix { inherit commandLineArgs; } {
     bsdtar -xf $downloadedFile -C "$out"
   '';
 
-  url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09571107-signal-desktop/signal-desktop-7.71.0-1.fc42.aarch64.rpm";
-  hash = "sha256-sNGIkO2HAXl0ykFyZNNV75iVUQ+oRGv6NZW8tVUxfJA=";
+  url = "https://download.copr.fedorainfracloud.org/results/useidel/signal-desktop/fedora-42-aarch64/09751999-signal-desktop/signal-desktop-7.77.1-1.fc42.aarch64.rpm";
+  hash = "sha256-IkAJxq3JK3kKdtLy1lkVUfJNuEStMjn7iQEwsFurwOs=";
 }

From fed69e3a5d3fabec18cec08e5c9e7ac68da2d84a Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Thu, 16 Oct 2025 14:39:27 +0200
Subject: [PATCH 4357/6226] signal-desktop-bin(darwin): 7.71.0 -> 7.77.1

---
 pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
index 7ae71cf68b65..495b872e41a6 100644
--- a/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
+++ b/pkgs/by-name/si/signal-desktop-bin/signal-desktop-darwin.nix
@@ -6,11 +6,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "signal-desktop-bin";
-  version = "7.71.0";
+  version = "7.77.1";
 
   src = fetchurl {
     url = "https://updates.signal.org/desktop/signal-desktop-mac-universal-${finalAttrs.version}.dmg";
-    hash = "sha256-G4wCIzKnWwBYSTuXhZ6681Z2+0Rn2bpvb3vhKMAXFc4=";
+    hash = "sha256-vnNR5KTdeTKUMlHnjfB+WkBtpcLP+KEmIPoTfk7Q1+w=";
   };
   sourceRoot = ".";
 

From 7ab39422cc13218f979bb60532c0167dedca7d0e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 13:57:36 +0000
Subject: [PATCH 4358/6226] python3Packages.hyperscan: 0.7.25 -> 0.7.28

---
 pkgs/development/python-modules/hyperscan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hyperscan/default.nix b/pkgs/development/python-modules/hyperscan/default.nix
index 3622fa465f1b..e6075d20ef78 100644
--- a/pkgs/development/python-modules/hyperscan/default.nix
+++ b/pkgs/development/python-modules/hyperscan/default.nix
@@ -23,14 +23,14 @@ let
 in
 buildPythonPackage rec {
   pname = "hyperscan";
-  version = "0.7.25";
+  version = "0.7.28";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "darvid";
     repo = "python-hyperscan";
     tag = "v${version}";
-    hash = "sha256-YFT/SPAI/H6D7paWL/9rMyvY1s7ffE9bDHcQ9TbbA6w=";
+    hash = "sha256-U7MGa3xzNzx0TCeSaO1yaDEgOSFwoSm02yqskmOIMiM=";
   };
 
   env.CMAKE_ARGS = "-DHS_SRC_ROOT=${pkgs.hyperscan.src} -DHS_BUILD_LIB_ROOT=${lib-deps}/lib";

From 22575e2fdea896934c43780303b65f9384aa95d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 14:19:56 +0000
Subject: [PATCH 4359/6226] chez: 10.2.0 -> 10.3.0

---
 pkgs/by-name/ch/chez/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ch/chez/package.nix b/pkgs/by-name/ch/chez/package.nix
index 0eea53f8bd98..c09310a7a1ab 100644
--- a/pkgs/by-name/ch/chez/package.nix
+++ b/pkgs/by-name/ch/chez/package.nix
@@ -33,13 +33,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "chez-scheme";
-  version = "10.2.0";
+  version = "10.3.0";
 
   src = fetchFromGitHub {
     owner = "cisco";
     repo = "ChezScheme";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-wAEnuC6hktCK/l00G48jYD9fwdyiXkzHjC2YYVeCJXo=";
+    hash = "sha256-5h9W4Tdn8EKEhdecKttLOn8J2OfNp5iaIg017UIk3CI=";
     # Vendored nanopass and stex
     fetchSubmodules = true;
   };

From 688db3bd68c965ed3741274519fa035474e1fcd0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 14:20:24 +0000
Subject: [PATCH 4360/6226] python3Packages.reuse: 6.1.2 -> 6.2.0

---
 pkgs/development/python-modules/reuse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reuse/default.nix b/pkgs/development/python-modules/reuse/default.nix
index 1d1bcb8be32a..88457b0cd273 100644
--- a/pkgs/development/python-modules/reuse/default.nix
+++ b/pkgs/development/python-modules/reuse/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "reuse";
-  version = "6.1.2";
+  version = "6.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fsfe";
     repo = "reuse-tool";
     tag = "v${version}";
-    hash = "sha256-vWBM8bvzsMAT8ONmdx3qy00SPySLsBBXPOd3sgQs/ig=";
+    hash = "sha256-J49RIt7MxnsMJqJAaGvYgUzXMHAT9/frMmrkhWXe5tQ=";
   };
 
   outputs = [

From 787229b82606da7fa41f56eba006b0b26e2492cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 14:36:22 +0000
Subject: [PATCH 4361/6226] vscode-extensions.biomejs.biome: 2025.7.41733 ->
 2025.10.241456

---
 .../editors/vscode/extensions/biomejs.biome/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/biomejs.biome/default.nix b/pkgs/applications/editors/vscode/extensions/biomejs.biome/default.nix
index ab7ec182ce25..c346ae961c75 100644
--- a/pkgs/applications/editors/vscode/extensions/biomejs.biome/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/biomejs.biome/default.nix
@@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "biome";
     publisher = "biomejs";
-    version = "2025.7.41733";
-    hash = "sha256-wWyLIjNOBjIe72ed+wwfQWGH7Vzuea/0Xux0XJkhAkY=";
+    version = "2025.10.241456";
+    hash = "sha256-tihEFcDDYr/khLIcJbR5VSC/RujEvp/gcnWlokAqNBc=";
   };
 
   postInstall = ''

From c864ff8e662be87ebd3c2af1bd017eef59cae176 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 14:42:20 +0000
Subject: [PATCH 4362/6226] vscode-extensions.saoudrizwan.claude-dev: 3.33.1 ->
 3.35.0

---
 .../vscode/extensions/saoudrizwan.claude-dev/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
index 9cfd6d964706..c241ce3317ce 100644
--- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-dev";
     publisher = "saoudrizwan";
-    version = "3.33.1";
-    hash = "sha256-DSLRfzAL4jqj32XZOmGGSb/BBGEfzJ9fbkiSLLpaYM4=";
+    version = "3.35.0";
+    hash = "sha256-fPoSrpWHfDEGLbawTVV65MAQAXWUy6WTb7ijhKaoLvc=";
   };
 
   meta = {

From d54b927034533818df97317c6b63b94aa75ed462 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 14:45:05 +0000
Subject: [PATCH 4363/6226] twitch-hls-client: 1.5.0 -> 1.6.0

---
 pkgs/by-name/tw/twitch-hls-client/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/tw/twitch-hls-client/package.nix b/pkgs/by-name/tw/twitch-hls-client/package.nix
index 982ef9919ca4..ed2d8aaebb45 100644
--- a/pkgs/by-name/tw/twitch-hls-client/package.nix
+++ b/pkgs/by-name/tw/twitch-hls-client/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "twitch-hls-client";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "2bc4";
     repo = "twitch-hls-client";
     rev = version;
-    hash = "sha256-B/gOqgn5g3L8Qs7a6vvjdHX4s+5KW2zg2z9mkzsdQqA=";
+    hash = "sha256-ARAIinaUDXD3hRsPNvWof/3s7vx/DTQCv65rXZ5UzmY=";
   };
 
-  cargoHash = "sha256-5LEMYUwPu6ydmL0mZVgXHKGkjnamvhw9e6II/xEnr04=";
+  cargoHash = "sha256-Qm/J+pkfVDQdhls+AIeGudUYj4HYXYVHiEr6kZHJF20=";
 
   meta = with lib; {
     description = "Minimal CLI client for watching/recording Twitch streams";

From 63d3d16d6124920f9e4f3fc6b75aab70c07f05fa Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Fri, 31 Oct 2025 22:52:22 +0800
Subject: [PATCH 4364/6226] pantheon.elementary-session-settings:
 8.0.1-unstable-2025-09-15 -> 8.1.0

https://github.com/elementary/session-settings/compare/e708fd49356f145acd926d30683012d9488f0f9d...8.1.0
---
 .../desktop/elementary-session-settings/default.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
index ebc521c3b292..6af460863614 100644
--- a/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
+++ b/pkgs/desktops/pantheon/desktop/elementary-session-settings/default.nix
@@ -19,17 +19,16 @@
   meson,
   ninja,
 }:
-stdenv.mkDerivation {
+
+stdenv.mkDerivation (finalAttrs: {
   pname = "elementary-session-settings";
-  # Allow disabling x11 session
-  # nixpkgs-update: no auto update
-  version = "8.0.1-unstable-2025-09-15";
+  version = "8.1.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "session-settings";
-    rev = "e708fd49356f145acd926d30683012d9488f0f9d";
-    hash = "sha256-wb9UUrEtwtmqtfNS2YPli99ZeY17UdJFQijTKs8mHn4=";
+    tag = finalAttrs.version;
+    hash = "sha256-mdfmCzR9ikXDlDc7FeOITsdbPbz+G66jUrl1BobY+g8=";
   };
 
   /*
@@ -91,4 +90,4 @@ stdenv.mkDerivation {
     platforms = platforms.linux;
     teams = [ teams.pantheon ];
   };
-}
+})

From af9e231e168ba2dfc71bc74763261730ef30e8cd Mon Sep 17 00:00:00 2001
From: Steve Purcell <steve@sanityinc.com>
Date: Mon, 20 Oct 2025 12:44:21 +0100
Subject: [PATCH 4365/6226] watchgha: init at 2.4.2

This adds a new package for watchgha, which provides a small TUI
utility for watching the current state of all GitHub Actions runs for
a branch or repo.
---
 pkgs/by-name/wa/watchgha/package.nix | 44 ++++++++++++++++++++++++++++
 1 file changed, 44 insertions(+)
 create mode 100644 pkgs/by-name/wa/watchgha/package.nix

diff --git a/pkgs/by-name/wa/watchgha/package.nix b/pkgs/by-name/wa/watchgha/package.nix
new file mode 100644
index 000000000000..ac87868e3033
--- /dev/null
+++ b/pkgs/by-name/wa/watchgha/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  python3Packages,
+  fetchPypi,
+}:
+python3Packages.buildPythonApplication rec {
+  pname = "watchgha";
+  version = "2.4.2";
+  pyproject = true;
+
+  src = fetchPypi {
+    inherit version;
+    pname = "watchgha";
+    hash = "sha256-RtmCC+twOk+viWY7WTbTzuxHTM3MOww+sRuEvlemCcI=";
+  };
+
+  build-system = with python3Packages; [
+    setuptools
+  ];
+
+  dependencies = with python3Packages; [
+    click
+    dulwich
+    exceptiongroup
+    httpx
+    rich
+    trio
+  ];
+
+  nativeCheckInputs = [
+    python3Packages.pytestCheckHook
+  ];
+
+  pythonImportsCheck = [ "watchgha" ];
+
+  meta = {
+    description = "Live display of current GitHub action runs";
+    mainProgram = "watch_gha_runs";
+    homepage = "https://github.com/nedbat/watchgha";
+    license = lib.licenses.apsl20;
+    maintainers = with lib.maintainers; [ purcell ];
+    platforms = lib.platforms.all;
+  };
+}

From db84944bff2858a4d2c375ae968d5b27e415ac1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 15:01:43 +0000
Subject: [PATCH 4366/6226] aliyun-cli: 3.0.308 -> 3.1.0

---
 pkgs/by-name/al/aliyun-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix
index 00212eda320d..2c518e3952c5 100644
--- a/pkgs/by-name/al/aliyun-cli/package.nix
+++ b/pkgs/by-name/al/aliyun-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "aliyun-cli";
-  version = "3.0.308";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "aliyun";
     repo = "aliyun-cli";
     tag = "v${version}";
-    hash = "sha256-W6ooP9Ua7GtaD9ROBc0AbJdFHMUU6OYwT2JZulvn5+Q=";
+    hash = "sha256-5gwI2lhEMkKZZnYwzyegVm8EByox1XexHjW799vVeLE=";
     fetchSubmodules = true;
   };
 

From 8c503e76472191f043b3f4cf5ed3898d0cd98a5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 08:21:09 -0700
Subject: [PATCH 4367/6226] python3Packages.mashumaro: 3.16 -> 3.17

Diff: https://github.com/Fatal1ty/mashumaro/compare/v3.16...v3.17

Changelog: https://github.com/Fatal1ty/mashumaro/releases/tag/v3.17
---
 .../development/python-modules/mashumaro/default.nix | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/mashumaro/default.nix b/pkgs/development/python-modules/mashumaro/default.nix
index d0acb1d790d8..499193da4cf0 100644
--- a/pkgs/development/python-modules/mashumaro/default.nix
+++ b/pkgs/development/python-modules/mashumaro/default.nix
@@ -18,16 +18,14 @@
 
 buildPythonPackage rec {
   pname = "mashumaro";
-  version = "3.16";
+  version = "3.17";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "Fatal1ty";
     repo = "mashumaro";
     tag = "v${version}";
-    hash = "sha256-SAdhBNQx5zWsXFwWxEAozprb2c7eJRdxZQwZMgBj/iA=";
+    hash = "sha256-oQKSIDrIPlY1m63uP9Jxpgf7ruaZpt9uZF4hTso503U=";
   };
 
   build-system = [ setuptools ];
@@ -51,11 +49,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "mashumaro" ];
 
-  meta = with lib; {
+  meta = {
     description = "Serialization library on top of dataclasses";
     homepage = "https://github.com/Fatal1ty/mashumaro";
     changelog = "https://github.com/Fatal1ty/mashumaro/releases/tag/${src.tag}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ tjni ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ tjni ];
   };
 }

From 2666dd43f552a0c2dc63d5fc0917a305b9bd8874 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 08:16:51 -0700
Subject: [PATCH 4368/6226] python3Packages.pyportainer: 1.0.10 -> 1.0.12

Diff: https://github.com/erwindouna/pyportainer/compare/v1.0.10...v1.0.12

Changelog: https://github.com/erwindouna/pyportainer/releases/tag/v1.0.11
           https://github.com/erwindouna/pyportainer/releases/tag/v1.0.12
---
 .../python-modules/pyportainer/default.nix          | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyportainer/default.nix b/pkgs/development/python-modules/pyportainer/default.nix
index 1b44bf2482eb..e1f6d3bc459c 100644
--- a/pkgs/development/python-modules/pyportainer/default.nix
+++ b/pkgs/development/python-modules/pyportainer/default.nix
@@ -3,6 +3,7 @@
   aresponses,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
   lib,
   mashumaro,
   orjson,
@@ -15,16 +16,24 @@
 
 buildPythonPackage rec {
   pname = "pyportainer";
-  version = "1.0.10";
+  version = "1.0.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "erwindouna";
     repo = "pyportainer";
     tag = "v${version}";
-    hash = "sha256-8wMh41fmeRhZ5kTrBqeZWy8VxJhnKxAlAp3wk732+M4=";
+    hash = "sha256-goTYZhv/+4o2/SMOqANMnR3u4YxwDJVcvT0pz8MT7M8=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "remove-mkdocs-from-dependencies.patch";
+      url = "https://github.com/erwindouna/pyportainer/commit/8ed65c3870ff368465267e9bf2cda441b7b28994.patch";
+      hash = "sha256-3FE8NngAajIt8lDjG//sDPULq8mZ0f53iVemJ2xJ4MQ=";
+    })
+  ];
+
   build-system = [ poetry-core ];
 
   dependencies = [

From 72569af210c9afc81ad7656fddccdb395ad3c047 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 15:25:09 +0000
Subject: [PATCH 4369/6226] usacloud: 1.18.0 -> 1.19.2

---
 pkgs/by-name/us/usacloud/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/us/usacloud/package.nix b/pkgs/by-name/us/usacloud/package.nix
index bc798ad1916b..95b59318b802 100644
--- a/pkgs/by-name/us/usacloud/package.nix
+++ b/pkgs/by-name/us/usacloud/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "usacloud";
-  version = "1.18.0";
+  version = "1.19.2";
 
   src = fetchFromGitHub {
     owner = "sacloud";
     repo = "usacloud";
     tag = "v${version}";
-    hash = "sha256-zYp5CRRjH4YjB6g9NZgC83F0xiz3Ntrpyql9d2/6K6U=";
+    hash = "sha256-Yci2mka92covvddDehT5PkEdmaUnS2rhPn7FT3oCvks=";
   };
 
-  vendorHash = "sha256-AxdazqJ1t1+azKJu1/scRmMxTqdILgWADbomlUKq2TE=";
+  vendorHash = "sha256-sSM7ZdGknhVvccKJtkwPmzwXEPRzUmxGlGojasqpul8=";
 
   ldflags = [
     "-s"

From a61020a1560db59f4f9d4ee8581bc9ceb0b83756 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Fri, 31 Oct 2025 11:30:43 -0400
Subject: [PATCH 4370/6226] mimir: 2.17.2 -> 3.0.0

Changelog: https://github.com/grafana/mimir/releases/tag/mimir-3.0.0
---
 pkgs/by-name/mi/mimir/package.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix
index 6dae638cf3d0..abc11fd89570 100644
--- a/pkgs/by-name/mi/mimir/package.nix
+++ b/pkgs/by-name/mi/mimir/package.nix
@@ -5,15 +5,15 @@
   nixosTests,
   nix-update-script,
 }:
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "mimir";
-  version = "2.17.2";
+  version = "3.0.0";
 
   src = fetchFromGitHub {
-    rev = "mimir-${version}";
+    rev = "mimir-${finalAttrs.version}";
     owner = "grafana";
     repo = "mimir";
-    hash = "sha256-aESZvcKZQwT563cGQQcrMTXEPo55niS8cQrGFFrLfoU=";
+    hash = "sha256-eLdlfGz5OQ3bPWhO2niBynaIPtxXg3x2qD89VK7uuA0=";
   };
 
   vendorHash = null;
@@ -54,7 +54,7 @@ buildGoModule rec {
     [
       "-s"
       "-w"
-      "-X ${t}.Version=${version}"
+      "-X ${t}.Version=${finalAttrs.version}"
       "-X ${t}.Revision=unknown"
       "-X ${t}.Branch=unknown"
     ];
@@ -62,6 +62,7 @@ buildGoModule rec {
   meta = with lib; {
     description = "Grafana Mimir provides horizontally scalable, highly available, multi-tenant, long-term storage for Prometheus. ";
     homepage = "https://github.com/grafana/mimir";
+    changelog = "https://github.com/grafana/mimir/releases/tag/mimir-${finalAttrs.version}";
     license = licenses.agpl3Only;
     maintainers = with maintainers; [
       happysalada
@@ -69,4 +70,4 @@ buildGoModule rec {
       adamcstephens
     ];
   };
-}
+})

From 8b876d5e1126f647b76c668095444de157027fe6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 08:34:14 -0700
Subject: [PATCH 4371/6226] python3Packages.pyswitchbot: 0.72.0 -> 0.72.1

Diff: https://github.com/Danielhiversen/pySwitchbot/compare/0.72.0...0.72.1

Changelog: https://github.com/Danielhiversen/pySwitchbot/releases/tag/0.72.1
---
 .../python-modules/pyswitchbot/default.nix           | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix
index b231fd1d0980..fbbd3e713495 100644
--- a/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/pkgs/development/python-modules/pyswitchbot/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "pyswitchbot";
-  version = "0.72.0";
+  version = "0.72.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Danielhiversen";
     repo = "pySwitchbot";
     tag = version;
-    hash = "sha256-ouvsAZe3HeaSMdCdia+ttliKMxqNtps/TbHBkri/iaw=";
+    hash = "sha256-QwCeq9EnE7oKqTtb6lmMcEw37dOK7WYbDEC984NujzY=";
   };
 
   build-system = [ setuptools ];
@@ -43,12 +43,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "switchbot" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python library to control Switchbot IoT devices";
     homepage = "https://github.com/Danielhiversen/pySwitchbot";
     changelog = "https://github.com/Danielhiversen/pySwitchbot/releases/tag/${src.tag}";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
+    platforms = lib.platforms.linux;
   };
 }

From c5115e937322594ef6e40f4503ae77fba4085472 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 15:36:12 +0000
Subject: [PATCH 4372/6226] hysteria: 2.6.4 -> 2.6.5

---
 pkgs/by-name/hy/hysteria/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hy/hysteria/package.nix b/pkgs/by-name/hy/hysteria/package.nix
index 337513b34072..bc4a23dd1e7b 100644
--- a/pkgs/by-name/hy/hysteria/package.nix
+++ b/pkgs/by-name/hy/hysteria/package.nix
@@ -6,16 +6,16 @@
 }:
 buildGoModule rec {
   pname = "hysteria";
-  version = "2.6.4";
+  version = "2.6.5";
 
   src = fetchFromGitHub {
     owner = "apernet";
     repo = "hysteria";
     rev = "app/v${version}";
-    hash = "sha256-j6MvVq/+buv/Md/84xUFyRh2zp8qms/1IdEREZ5trXM=";
+    hash = "sha256-EiucZQ8poLmWVGd7MElZ4FWhDdDuM0/8CiomN+TKolw=";
   };
 
-  vendorHash = "sha256-lCq+/RPbqstMR47ILJ+BdtBowFVWBDczFEg0KuF8DAQ=";
+  vendorHash = "sha256-ho5AC9kehhvPVS3CoB2Yucbk5vCVqWAe1MZGInusKk8=";
   proxyVendor = true;
 
   ldflags =

From 52b705c097dba110f6418a411370d75e2a2fee0d Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Fri, 31 Oct 2025 17:40:22 +0200
Subject: [PATCH 4373/6226] maintainers: drop thammers

---
 maintainers/maintainer-list.nix         | 6 ------
 pkgs/by-name/fl/flvstreamer/package.nix | 2 +-
 pkgs/by-name/tm/tmux/package.nix        | 1 -
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3197d3c90b29..3915f7193ba2 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -25743,12 +25743,6 @@
     githubId = 102452;
     name = "Niclas Thall";
   };
-  thammers = {
-    email = "jawr@gmx.de";
-    github = "tobias-hammerschmidt";
-    githubId = 2543259;
-    name = "Tobias Hammerschmidt";
-  };
   thanegill = {
     email = "me@thanegill.com";
     github = "thanegill";
diff --git a/pkgs/by-name/fl/flvstreamer/package.nix b/pkgs/by-name/fl/flvstreamer/package.nix
index d16f0ea23951..dfe18eebd698 100644
--- a/pkgs/by-name/fl/flvstreamer/package.nix
+++ b/pkgs/by-name/fl/flvstreamer/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
 
     homepage = "https://savannah.nongnu.org/projects/flvstreamer";
 
-    maintainers = [ lib.maintainers.thammers ];
+    maintainers = [ ];
     platforms = with lib.platforms; linux ++ darwin;
   };
 }
diff --git a/pkgs/by-name/tm/tmux/package.nix b/pkgs/by-name/tm/tmux/package.nix
index 830bb3aad435..ab6ccad03b37 100644
--- a/pkgs/by-name/tm/tmux/package.nix
+++ b/pkgs/by-name/tm/tmux/package.nix
@@ -118,7 +118,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.unix;
     mainProgram = "tmux";
     maintainers = with lib.maintainers; [
-      thammers
       fpletz
     ];
   };

From 27767283176858b2786fd485b1a99535a47a05ed Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Tue, 21 Oct 2025 17:21:26 -0700
Subject: [PATCH 4374/6226] onnxruntime: add ROCm support

---
 pkgs/by-name/on/onnxruntime/package.nix | 62 +++++++++++++++++++++++--
 1 file changed, 58 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix
index 05ecb2453419..bd91c2d2584f 100644
--- a/pkgs/by-name/on/onnxruntime/package.nix
+++ b/pkgs/by-name/on/onnxruntime/package.nix
@@ -14,6 +14,7 @@
   howard-hinnant-date,
   libpng,
   nlohmann_json,
+  perl,
   pkg-config,
   python3Packages,
   re2,
@@ -24,8 +25,10 @@
   pythonSupport ? true,
   cudaSupport ? config.cudaSupport,
   ncclSupport ? cudaSupport && cudaPackages.nccl.meta.available,
+  rocmSupport ? config.rocmSupport,
   withFullProtobuf ? false,
   cudaPackages ? { },
+  rocmPackages,
 }@inputs:
 
 let
@@ -121,6 +124,9 @@ effectiveStdenv.mkDerivation rec {
   ]
   ++ lib.optionals isCudaJetson [
     cudaPackages.autoAddCudaCompatRunpath
+  ]
+  ++ lib.optionals rocmSupport [
+    perl # for tools/ci_build/hipify-perl
   ];
 
   buildInputs = [
@@ -156,6 +162,22 @@ effectiveStdenv.mkDerivation rec {
     ]
     ++ lib.optionals ncclSupport [ nccl ]
   )
+  ++ lib.optionals rocmSupport [
+    rocmPackages.clr
+    rocmPackages.hipblas
+    rocmPackages.hipcub
+    rocmPackages.hipfft
+    rocmPackages.hiprand
+    rocmPackages.hipsparse
+    rocmPackages.rocblas
+    rocmPackages.rocprim
+    rocmPackages.rocrand
+    rocmPackages.rocthrust
+    rocmPackages.miopen
+    rocmPackages.rccl
+    rocmPackages.rocm-smi
+    rocmPackages.roctracer
+  ]
   ++ lib.optionals effectiveStdenv.hostPlatform.isDarwin [
     (darwinMinVersionHook "13.3")
   ];
@@ -203,6 +225,7 @@ effectiveStdenv.mkDerivation rec {
     (lib.cmakeBool "onnxruntime_USE_FULL_PROTOBUF" withFullProtobuf)
     (lib.cmakeBool "onnxruntime_USE_CUDA" cudaSupport)
     (lib.cmakeBool "onnxruntime_USE_NCCL" (cudaSupport && ncclSupport))
+    (lib.cmakeBool "onnxruntime_USE_ROCM" rocmSupport)
     (lib.cmakeBool "onnxruntime_ENABLE_LTO" (!cudaSupport || cudaPackages.cudaOlder "12.8"))
   ]
   ++ lib.optionals pythonSupport [
@@ -213,15 +236,43 @@ effectiveStdenv.mkDerivation rec {
     (lib.cmakeFeature "onnxruntime_CUDNN_HOME" "${cudaPackages.cudnn}")
     (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" cudaArchitecturesString)
     (lib.cmakeFeature "onnxruntime_NVCC_THREADS" "1")
+  ]
+  ++ lib.optionals rocmSupport [
+    # Werror combines with rocprim header issues to cause errors (warp size const deprecation)
+    "--compile-no-warning-as-error"
+    (lib.cmakeFeature "CMAKE_HIP_ARCHITECTURES" (
+      builtins.concatStringsSep ";" rocmPackages.clr.localGpuTargets or rocmPackages.clr.gpuTargets
+    ))
+    (lib.cmakeFeature "onnxruntime_ROCM_HOME" "${rocmPackages.clr}")
+    # Incompatible with packaged version, far too slow to build vendored version
+    (lib.cmakeBool "onnxruntime_USE_COMPOSABLE_KERNEL" false)
+    (lib.cmakeBool "onnxruntime_USE_COMPOSABLE_KERNEL_CK_TILE" false)
   ];
 
-  env = lib.optionalAttrs effectiveStdenv.cc.isClang {
-    NIX_CFLAGS_COMPILE = "-Wno-error";
-  };
+  env =
+    lib.optionalAttrs effectiveStdenv.cc.isClang {
+      NIX_CFLAGS_COMPILE = "-Wno-error";
+    }
+    // lib.optionalAttrs rocmSupport {
+      MIOPEN_PATH = rocmPackages.miopen;
+      # HIP steps fail to find ROCm libs when not in HIPFLAGS, causing
+      # fatal error: 'rocrand/rocrand.h' file not found
+      HIPFLAGS = lib.concatMapStringsSep " " (pkg: "-I${lib.getInclude pkg}/include") [
+        rocmPackages.hipblas
+        rocmPackages.hipcub
+        rocmPackages.hiprand
+        rocmPackages.hipsparse
+        rocmPackages.rocblas
+        rocmPackages.rocprim
+        rocmPackages.rocrand
+        rocmPackages.rocthrust
+      ];
+    };
 
   doCheck =
     !(
       cudaSupport
+      || rocmSupport
       || builtins.elem effectiveStdenv.buildPlatform.system [
         # aarch64-linux fails cpuinfo test, because /sys/devices/system/cpu/ does not exist in the sandbox
         "aarch64-linux"
@@ -231,7 +282,7 @@ effectiveStdenv.mkDerivation rec {
       ]
     );
 
-  requiredSystemFeatures = lib.optionals cudaSupport [ "big-parallel" ];
+  requiredSystemFeatures = lib.optionals (cudaSupport || rocmSupport) [ "big-parallel" ];
 
   hardeningEnable = lib.optionals (effectiveStdenv.hostPlatform.system == "loongarch64-linux") [
     "nostrictaliasing"
@@ -247,6 +298,9 @@ effectiveStdenv.mkDerivation rec {
       "GetRuntimePath() const { return PathString(); }" \
       "GetRuntimePath() const { return PathString(\"$out/lib/\"); }"
   ''
+  + lib.optionalString rocmSupport ''
+    patchShebangs tools/ci_build/hipify-perl
+  ''
   + lib.optionalString (effectiveStdenv.hostPlatform.system == "aarch64-linux") ''
     # https://github.com/NixOS/nixpkgs/pull/226734#issuecomment-1663028691
     rm -v onnxruntime/test/optimizer/nhwc_transformer_test.cc

From a4f5889084f9f86c7c313c7e415dfea474f6afef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 15:50:25 +0000
Subject: [PATCH 4375/6226] python3Packages.sshfs: 2025.2.0 -> 2025.10.0

---
 pkgs/development/python-modules/sshfs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sshfs/default.nix b/pkgs/development/python-modules/sshfs/default.nix
index c8b72c32eb32..eab87385b4ba 100644
--- a/pkgs/development/python-modules/sshfs/default.nix
+++ b/pkgs/development/python-modules/sshfs/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "sshfs";
-  version = "2025.2.0";
+  version = "2025.10.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fsspec";
     repo = "sshfs";
     tag = version;
-    hash = "sha256-O9Va3dLfTko9AfyK4iJa8U6xrtJsNNEeBn9UeRAgmVc=";
+    hash = "sha256-IG+/aXM6F+sNtxmhgiaD6OXhRpbiCm0zW2ki0y8nuLE=";
   };
 
   build-system = [

From 49df0d02ed8f1a75bad289b449e70e97da60b029 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 08:55:15 -0700
Subject: [PATCH 4376/6226] python3Packages.xeger: init at 0.3.5

---
 .../python-modules/xeger/default.nix          | 35 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/python-modules/xeger/default.nix

diff --git a/pkgs/development/python-modules/xeger/default.nix b/pkgs/development/python-modules/xeger/default.nix
new file mode 100644
index 000000000000..0dc10b852e91
--- /dev/null
+++ b/pkgs/development/python-modules/xeger/default.nix
@@ -0,0 +1,35 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "xeger";
+  version = "0.3.5";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "crdoconnor";
+    repo = "xeger";
+    tag = version;
+    hash = "sha256-XujytGzBwJ59C5VihuFUJUxqhyjOIU4sI60hXUqLQvM=";
+  };
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "xeger" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Library to generate random strings from regular expressions";
+    homepage = "https://github.com/crdoconnor/xeger";
+    license = lib.licenses.bsd3;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f3c74406a29f..1821e238a78c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -20374,6 +20374,8 @@ self: super: with self; {
 
   xeddsa = toPythonModule (callPackage ../development/python-modules/xeddsa { });
 
+  xeger = callPackage ../development/python-modules/xeger { };
+
   xen = toPythonModule (pkgs.xen.override { python3Packages = self; });
 
   xformers = callPackage ../development/python-modules/xformers {

From 6c106807ebffec23352ba5cab4a84b63fe3dfa4b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 08:43:28 -0700
Subject: [PATCH 4377/6226] python3Packages.raspyrfm-client: 1.2.8 -> 1.2.9

Diff: https://github.com/markusressel/raspyrfm-client/compare/1.2.8...1.2.9

Changelog: https://github.com/markusressel/raspyrfm-client/releases/tag/1.2.9
---
 .../raspyrfm-client/default.nix               | 39 ++++++-------------
 1 file changed, 12 insertions(+), 27 deletions(-)

diff --git a/pkgs/development/python-modules/raspyrfm-client/default.nix b/pkgs/development/python-modules/raspyrfm-client/default.nix
index 25bd389e83f7..5d5a20ff9589 100644
--- a/pkgs/development/python-modules/raspyrfm-client/default.nix
+++ b/pkgs/development/python-modules/raspyrfm-client/default.nix
@@ -2,51 +2,36 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  setuptools,
-  rstr,
-  python,
+  poetry-core,
+  pytestCheckHook,
+  xeger,
 }:
 
 buildPythonPackage rec {
   pname = "raspyrfm-client";
-  version = "1.2.8";
+  version = "1.2.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "markusressel";
     repo = "raspyrfm-client";
-    tag = "v${version}";
-    hash = "sha256-WiL69bb4h8xVdMYxAVU0NHEfTWyW2NVR86zigsr5dmk=";
+    tag = version;
+    hash = "sha256-+TraMrVoR8GXrjfjJnu1uyyW6KTnu8KrRqAHYU8thFw=";
   };
 
-  # while we may not actually be on master, the script needs a git branch to function
-  # and master here is better than beta or pre-alpha
-  postPatch = ''
-    substituteInPlace ./setup.py \
-      --replace-fail 'subprocess.check_output(["git", "rev-parse", "--abbrev-ref", "HEAD"])' '"master"' \
-      --replace-fail 'GIT_BRANCH.decode()' '"master"' \
-      --replace-fail 'GIT_BRANCH.rstrip()' '"master"'
-  '';
-
-  build-system = [ setuptools ];
+  build-system = [ poetry-core ];
 
   pythonImportsCheck = [ "raspyrfm_client" ];
 
-  nativeCheckInputs = [ rstr ];
-
-  # pytestCheckHook does not auto detect the only test, run manually
-  checkPhase = ''
-    runHook preCheck
-
-    ${python.interpreter} tests/automatic_tests.py
-
-    runHook postCheck
-  '';
+  nativeCheckInputs = [
+    pytestCheckHook
+    xeger
+  ];
 
   meta = {
     description = "Send rc signals with the RaspyRFM module";
     homepage = "https://github.com/markusressel/raspyrfm-client";
-    changelog = "https://github.com/markusressel/raspyrfm-client/releases/tag/v${version}";
+    changelog = "https://github.com/markusressel/raspyrfm-client/releases/tag/${src.tag}";
     maintainers = with lib.maintainers; [ ethancedwards8 ];
   };
 }

From 80e5f4c3ee6360830f11e8bd199f4f0736df9d2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 15:57:49 +0000
Subject: [PATCH 4378/6226] stasis: 0.5.1 -> 0.5.2

---
 pkgs/by-name/st/stasis/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/stasis/package.nix b/pkgs/by-name/st/stasis/package.nix
index 54dbec552df9..63ebd8057440 100644
--- a/pkgs/by-name/st/stasis/package.nix
+++ b/pkgs/by-name/st/stasis/package.nix
@@ -14,16 +14,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "stasis";
-  version = "0.5.1";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "saltnpepper97";
     repo = "stasis";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-tRw5sHj3nEwcEviEKKcfSUyY16MjsFzLcmnb0/AtAME=";
+    hash = "sha256-t8molNHV0FnJO9F2muME2JAfw6EtxDQZiQX3JFW8DTs=";
   };
 
-  cargoHash = "sha256-qfS/AR4XjFUeYpz7tNJ31B5fkVsxvXlwFpNe8U3J94o=";
+  cargoHash = "sha256-nACVS4BAjtI+aRO8Tg0FdOQSXiZMX/iVh22w0s6NLpw=";
 
   nativeBuildInputs = [
     pkg-config

From bc5d52f1f364002949bbc9a5dee2341635d0ea6b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 16:14:13 +0000
Subject: [PATCH 4379/6226] nnd: 0.56 -> 0.57

---
 pkgs/by-name/nn/nnd/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nn/nnd/package.nix b/pkgs/by-name/nn/nnd/package.nix
index 5da77ad70a91..3eee2f2ee8d8 100644
--- a/pkgs/by-name/nn/nnd/package.nix
+++ b/pkgs/by-name/nn/nnd/package.nix
@@ -8,16 +8,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nnd";
-  version = "0.56";
+  version = "0.57";
 
   src = fetchFromGitHub {
     owner = "al13n321";
     repo = "nnd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3xxb42dCnH41ufT6Thp/3z7Vs/Rlsxm6IOHMKi0jvQI=";
+    hash = "sha256-olW1Sx29TPw9TFCKZcIbKZU1LHObVGD6/vpl4EY27BE=";
   };
 
-  cargoHash = "sha256-PGPBNBg+71U201iSo1WYOOUJlWPi+njasGaXbhqmaVw=";
+  cargoHash = "sha256-9y0CLBYFfasyJLWyD26B3ZdUkkNJV9Y8BHJGdMEVwKY=";
 
   meta = {
     description = "Debugger for Linux";

From ea2e5bb73f0982cc01ab24c5a96f14259abf0aa9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 16:14:54 +0000
Subject: [PATCH 4380/6226] evcc: 0.209.4 -> 0.209.5

---
 pkgs/by-name/ev/evcc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix
index a282bc4f5ec8..8eb10fc382d2 100644
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@@ -17,13 +17,13 @@
 }:
 
 let
-  version = "0.209.4";
+  version = "0.209.5";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     tag = version;
-    hash = "sha256-MfTVLhU4AHvaQcJgdB7fQpY4C+wA0/VpeQ19gKnFTpI=";
+    hash = "sha256-3qpuRutCCKJWYvHao4Ez9El40QYflhzhW4NTmi4hG1Q=";
   };
 
   vendorHash = "sha256-SVdoeioBtUa+V2n717ckYCQBFmYSXdi7ryRVfb9xKnY=";

From 6f068041da977fd7ba722f255ae06955023dc350 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Fri, 31 Oct 2025 11:51:00 -0400
Subject: [PATCH 4381/6226] windows.sdk: Split fetch & splat phases to fix
 Darwin

---
 pkgs/os-specific/windows/msvcSdk/default.nix  | 55 ++++-------
 .../windows/msvcSdk/fetchWinSdk.nix           | 91 +++++++++++++++++++
 pkgs/os-specific/windows/msvcSdk/hashes.json  |  2 +-
 pkgs/os-specific/windows/msvcSdk/update.nu    |  4 +-
 4 files changed, 113 insertions(+), 39 deletions(-)
 create mode 100644 pkgs/os-specific/windows/msvcSdk/fetchWinSdk.nix

diff --git a/pkgs/os-specific/windows/msvcSdk/default.nix b/pkgs/os-specific/windows/msvcSdk/default.nix
index f57d2bf90de9..05a728dee6e7 100644
--- a/pkgs/os-specific/windows/msvcSdk/default.nix
+++ b/pkgs/os-specific/windows/msvcSdk/default.nix
@@ -1,71 +1,54 @@
 {
   lib,
-  config,
   stdenvNoCC,
   xwin,
   testers,
   llvmPackages,
+  callPackage,
 }:
 let
   version = (builtins.fromJSON (builtins.readFile ./manifest.json)).info.buildVersion;
 
   hashes = (builtins.fromJSON (builtins.readFile ./hashes.json));
 
-  host = stdenvNoCC.hostPlatform;
-  arch =
-    if host.isx86_64 then
-      "x86_64"
-    else if host.isAarch64 then
-      "aarch64"
-    else if host.isx86_32 then
-      "x86"
-    else if host.isAarch32 then
-      "aarch"
-    else
-      throw "Unsupported system";
+  fetchWinSdk = callPackage ./fetchWinSdk.nix { };
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   inherit version;
-  pname = "msvc-sdk";
-  dontUnpack = true;
+  pname = "win-sdk";
+
+  src = fetchWinSdk {
+    manifest = ./manifest.json;
+    hash = hashes.${finalAttrs.src.arch};
+  };
 
   strictDeps = true;
-  nativeBuildInputs = [ xwin ];
-
-  outputHashAlgo = "sha256";
-  outputHashMode = "recursive";
-  outputHash =
-    if !config.microsoftVisualStudioLicenseAccepted then
-      throw ''
-        Microsoft Software License Terms are not accepted with config.microsoftVisualStudioLicenseAccepted.
-        Please read https://visualstudio.microsoft.com/license-terms/mt644918/ and if you agree, change your
-        config to indicate so.
-      ''
-    else
-      hashes.${arch};
+  nativeBuildInputs = [
+    xwin
+  ];
 
   __structuredAttrs = true;
   xwinArgs = [
     "--accept-license"
-    "--cache-dir=xwin-out"
+    "--cache-dir=."
     "--manifest=${./manifest.json}"
-    "--arch=${arch}"
+    "--arch=${finalAttrs.src.arch}"
     "splat"
     "--preserve-ms-arch-notation"
   ];
 
-  buildPhase = ''
-    runHook preBuild
+  installPhase = ''
+    runHook preInstall
 
     xwin "''${xwinArgs[@]}"
-    mkdir "$out"
-    mv xwin-out/splat/* "$out"
 
-    runHook postBuild
+    mkdir -p "$out"
+    cp -r splat/* "$out"
+
+    runHook postInstall
   '';
 
   dontFixup = true;
-  dontInstall = true;
 
   passthru = {
     updateScript = ./update.nu;
diff --git a/pkgs/os-specific/windows/msvcSdk/fetchWinSdk.nix b/pkgs/os-specific/windows/msvcSdk/fetchWinSdk.nix
new file mode 100644
index 000000000000..3c498df81b74
--- /dev/null
+++ b/pkgs/os-specific/windows/msvcSdk/fetchWinSdk.nix
@@ -0,0 +1,91 @@
+{
+  lib,
+  config,
+  stdenvNoCC,
+  xwin,
+}:
+let
+  host = stdenvNoCC.hostPlatform;
+
+  hostArch =
+    if host.isx86_64 then
+      "x86_64"
+    else if host.isAarch64 then
+      "aarch64"
+    else if host.isx86_32 then
+      "x86"
+    else if host.isAarch32 then
+      "aarch"
+    else
+      throw "Unsupported system";
+in
+lib.extendMkDerivation {
+  constructDrv = stdenvNoCC.mkDerivation;
+
+  excludeDrvArgNames = [
+    "manifest"
+    "arch"
+  ];
+
+  extendDrvArgs =
+    finalAttrs:
+    {
+      name ? "xwin-fetch-msvc",
+      hash ? lib.fakeHash,
+      manifest ? null,
+      arch ? hostArch,
+      ...
+    }@args:
+    {
+      inherit name;
+      __structuredAttrs = true;
+      dontUnpack = true;
+      dontFixup = true;
+      dontInstall = true;
+
+      strictDeps = true;
+
+      nativeBuildInputs = [ xwin ];
+
+      outputHashAlgo = "sha256";
+      outputHashMode = "recursive";
+      outputHash =
+        if !config.microsoftVisualStudioLicenseAccepted then
+          throw ''
+            Microsoft Software License Terms are not accepted with config.microsoftVisualStudioLicenseAccepted.
+            Please read https://visualstudio.microsoft.com/license-terms/mt644918/ and if you agree, change your
+            config to indicate so.
+          ''
+        else
+          hash;
+
+      xwinArgs = lib.optionals (manifest != null) [ "--manifest=${manifest}" ] ++ [
+        "--accept-license"
+        "--cache-dir=${placeholder "out"}"
+        "--arch=${arch}"
+        "download"
+      ];
+
+      buildPhase =
+        args.buildPhase or ''
+          runHook preBuild
+
+          xwin "''${xwinArgs[@]}"
+
+          runHook postBuild
+        '';
+
+      passthru = {
+        inherit arch;
+      };
+
+      meta.license = {
+        deprecated = false;
+        fullName = "Microsoft Software License Terms";
+        shortName = "msvc";
+        spdxId = "unknown";
+        free = false;
+        url = "https://www.visualstudio.com/license-terms/mt644918/";
+      };
+    };
+}
diff --git a/pkgs/os-specific/windows/msvcSdk/hashes.json b/pkgs/os-specific/windows/msvcSdk/hashes.json
index 6df8b21c9516..fb2b7e0597a3 100644
--- a/pkgs/os-specific/windows/msvcSdk/hashes.json
+++ b/pkgs/os-specific/windows/msvcSdk/hashes.json
@@ -1,5 +1,5 @@
 {
-  "x86_64": "sha256-kp+xePTRZgqdAV3/BYhqKke3dXIkLWLM+IWFXtN2rHM=",
+  "x86_64": "sha256-noXgXgsB6eneVxkIZkjJhAiXgsG0BBIuoYGjf7fi8t4=",
   "x86": "sha256-xEXV+XBNoXpAO8R/oDj8gfGb5tICr9ps4DN8Q4lqK2k=",
   "aarch64": "sha256-r0tTQUq3CePJ/7Vuzf4Zsy3Ebu0KiXNBwRHmrO3d15E="
 }
diff --git a/pkgs/os-specific/windows/msvcSdk/update.nu b/pkgs/os-specific/windows/msvcSdk/update.nu
index 7c6ce40880e8..a2f8b7b8a4f8 100755
--- a/pkgs/os-specific/windows/msvcSdk/update.nu
+++ b/pkgs/os-specific/windows/msvcSdk/update.nu
@@ -36,9 +36,9 @@ def main [] {
     |arch|
     let dir = mktemp -d
 
-    xwin --accept-license --cache-dir $dir --manifest $"($PATH | path join manifest.json)" --arch $arch splat --preserve-ms-arch-notation
+    xwin --accept-license --cache-dir $dir --manifest $"($PATH | path join manifest.json)" --arch $arch download
 
-    let hash = nix hash path ($dir | path join splat)
+    let hash = nix hash path $dir
 
     {arch: $arch, hash: $hash}
   } | transpose -r -d

From 7dcbd0d6c8b3cf576733deb31649d7804e97fe27 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Fri, 31 Oct 2025 12:07:34 -0400
Subject: [PATCH 4382/6226] windows.sdk: 17.14.36414.22 -> 17.14.36623.8

---
 pkgs/os-specific/windows/msvcSdk/hashes.json  |   6 +-
 .../os-specific/windows/msvcSdk/manifest.json | 117 +++++++++---------
 2 files changed, 61 insertions(+), 62 deletions(-)

diff --git a/pkgs/os-specific/windows/msvcSdk/hashes.json b/pkgs/os-specific/windows/msvcSdk/hashes.json
index fb2b7e0597a3..02bd7c5ca0de 100644
--- a/pkgs/os-specific/windows/msvcSdk/hashes.json
+++ b/pkgs/os-specific/windows/msvcSdk/hashes.json
@@ -1,5 +1,5 @@
 {
-  "x86_64": "sha256-noXgXgsB6eneVxkIZkjJhAiXgsG0BBIuoYGjf7fi8t4=",
-  "x86": "sha256-xEXV+XBNoXpAO8R/oDj8gfGb5tICr9ps4DN8Q4lqK2k=",
-  "aarch64": "sha256-r0tTQUq3CePJ/7Vuzf4Zsy3Ebu0KiXNBwRHmrO3d15E="
+  "x86_64": "sha256-rEHwc09hLh3dKvA2TYHJKeFDycajPe8Ewfcdw85QY48=",
+  "x86": "sha256-yibiyIwGe9kSJzTFpDc8ilF65aKQ9qMLrx2k14uM4Zk=",
+  "aarch64": "sha256-RB/Hubhm+73kPUiKOKtm6vwf2ldm1raezNmmGEdQf9w="
 }
diff --git a/pkgs/os-specific/windows/msvcSdk/manifest.json b/pkgs/os-specific/windows/msvcSdk/manifest.json
index bb4ee81c35f2..4abcbbffa00f 100644
--- a/pkgs/os-specific/windows/msvcSdk/manifest.json
+++ b/pkgs/os-specific/windows/msvcSdk/manifest.json
@@ -1,51 +1,50 @@
 {
   "manifestVersion": "1.1",
   "info": {
-    "id": "VisualStudio.17.Release/17.14.13+36414.22.-august.2025-",
+    "id": "VisualStudio.17.Release/17.14.19+36623.8",
     "buildBranch": "d17.14",
-    "buildVersion": "17.14.36414.22",
-    "commitId": "1481a1f5e0b5858ec46c868f91b27039ed0d233d",
-    "communityOrLowerFlightId": "1f9f81a7bb554db",
+    "buildVersion": "17.14.36623.8",
+    "commitId": "8a9fda4969482fc6fc5ced0d2d47b928d1b82678",
+    "communityOrLowerFlightId": "4e87ee4468fd451",
     "localBuild": "build-lab",
     "manifestName": "VisualStudio.17.Release",
     "manifestType": "channel",
-    "productDisplayVersion": "17.14.13 (August 2025)",
+    "productDisplayVersion": "17.14.19",
     "productLine": "Dev17",
     "productLineVersion": "2022",
     "productMilestone": "RTW",
     "productMilestoneIsPreRelease": "False",
     "productName": "Visual Studio",
-    "productPatchVersion": "13",
+    "productPatchVersion": "19",
     "productPreReleaseMilestoneSuffix": "1.0",
-    "productReleaseNameSuffix": "(August 2025)",
-    "productSemanticVersion": "17.14.13+36414.22.-august.2025-",
-    "professionalOrGreaterFlightId": "39d353be42bf474",
-    "qBuildSessionId": "e533c3b6-eb6e-a0b2-8734-a13c66345cb8"
+    "productSemanticVersion": "17.14.19+36623.8",
+    "professionalOrGreaterFlightId": "4bb63b1960eb466",
+    "qBuildSessionId": "32622f7c-25ab-329b-fa1e-eebd68dbf0a2"
   },
   "channelItems": [
     {
       "id": "Microsoft.VisualStudio.Manifests.VisualStudio",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "Manifest",
       "payloads": [
         {
           "fileName": "VisualStudio.vsman",
-          "sha256": "0cacd8477885cc6f8d7c5de44af0f86e6a53ec9138a7c3d559e227ccacab8f46",
-          "size": 30484157,
-          "url": "https://download.visualstudio.microsoft.com/download/pr/89ee1303-1ba2-4f66-b07c-5099983fd1e4/0cacd8477885cc6f8d7c5de44af0f86e6a53ec9138a7c3d559e227ccacab8f46/VisualStudio.vsman"
+          "sha256": "b674dd46f83a684142689b3a86c73ba5f2e2477018087e4df218516214bbad58",
+          "size": 30425509,
+          "url": "https://download.visualstudio.microsoft.com/download/pr/5011a9cc-e8ef-42cb-ad72-87de1031accc/b674dd46f83a684142689b3a86c73ba5f2e2477018087e4df218516214bbad58/VisualStudio.vsman"
         }
       ]
     },
     {
       "id": "Microsoft.VisualStudio.Product.BuildTools",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "ChannelProduct",
       "icon": {
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
       "isHidden": true,
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19",
       "localizedResources": [
         {
           "language": "en-us",
@@ -135,7 +134,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.Community",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "arm64",
@@ -143,7 +142,7 @@
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19",
       "supportsDownloadThenUpdate": true,
       "localizedResources": [
         {
@@ -240,7 +239,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.Community",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "x64",
@@ -248,7 +247,7 @@
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19",
       "supportsDownloadThenUpdate": true,
       "localizedResources": [
         {
@@ -356,7 +355,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.Enterprise",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "arm64",
@@ -364,7 +363,7 @@
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19",
       "supportsDownloadThenUpdate": true,
       "localizedResources": [
         {
@@ -461,7 +460,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.Enterprise",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "x64",
@@ -469,7 +468,7 @@
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19",
       "supportsDownloadThenUpdate": true,
       "localizedResources": [
         {
@@ -577,7 +576,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.Professional",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "arm64",
@@ -585,7 +584,7 @@
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19",
       "supportsDownloadThenUpdate": true,
       "localizedResources": [
         {
@@ -682,7 +681,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.Professional",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "x64",
@@ -690,7 +689,7 @@
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19",
       "supportsDownloadThenUpdate": true,
       "localizedResources": [
         {
@@ -798,7 +797,7 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.TeamExplorer",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "ChannelProduct",
       "chip": "x64",
       "productArch": "x64",
@@ -807,7 +806,7 @@
         "base64": "PHN2ZyBpZD0iTGF5ZXJfMSIgZGF0YS1uYW1lPSJMYXllciAxIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB2aWV3Qm94PSIwIDAgMjQgMjQiPg0KICA8ZGVmcz4NCiAgICA8c3R5bGU+LmNscy0xe2ZpbGw6IzVlNDM4Zjt9LmNscy0ye29wYWNpdHk6MC4xO2lzb2xhdGlvbjppc29sYXRlO30uY2xzLTN7ZmlsbDp1cmwoI2xpbmVhci1ncmFkaWVudCk7fS5jbHMtNHtmaWxsOnVybCgjbGluZWFyLWdyYWRpZW50LTIpO30uY2xzLTV7ZmlsbDojYzE4ZWYxO308L3N0eWxlPg0KICAgIDxsaW5lYXJHcmFkaWVudCBpZD0ibGluZWFyLWdyYWRpZW50IiB4MT0iMy42MTIiIHkxPSItMTUuMzUyIiB4Mj0iMTkuNTc1IiB5Mj0iMS4zNjkiIGdyYWRpZW50VHJhbnNmb3JtPSJtYXRyaXgoMSwgMCwgMCwgLTEsIDAsIDQpIiBncmFkaWVudFVuaXRzPSJ1c2VyU3BhY2VPblVzZSI+DQogICAgICA8c3RvcCBvZmZzZXQ9IjAiIHN0b3AtY29sb3I9IiM3MjUyYWEiLz4NCiAgICAgIDxzdG9wIG9mZnNldD0iMSIgc3RvcC1jb2xvcj0iIzcyNTJhYSIvPg0KICAgIDwvbGluZWFyR3JhZGllbnQ+DQogICAgPGxpbmVhckdyYWRpZW50IGlkPSJsaW5lYXItZ3JhZGllbnQtMiIgeDE9IjguODQ0IiB5MT0iMzguNjc5IiB4Mj0iMTMuODcxIiB5Mj0iMzMuMjE2IiBncmFkaWVudFRyYW5zZm9ybT0idHJhbnNsYXRlKDAgLTIyKSIgZ3JhZGllbnRVbml0cz0idXNlclNwYWNlT25Vc2UiPg0KICAgICAgPHN0b3Agb2Zmc2V0PSIwIiBzdG9wLWNvbG9yPSIjYWU3ZmUyIi8+DQogICAgICA8c3RvcCBvZmZzZXQ9IjEiIHN0b3AtY29sb3I9IiM5YTcwZDQiLz4NCiAgICA8L2xpbmVhckdyYWRpZW50Pg0KICA8L2RlZnM+DQogIDxwYXRoIGNsYXNzPSJjbHMtMSIgZD0iTTQuNCwyMC4zbC00LTNhLjkxMS45MTEsMCwwLDEtLjQtLjh2LTlhLjkxMS45MTEsMCwwLDEsLjQtLjhsNC0zYS45MTEuOTExLDAsMCwwLS40Ljh2MTVBLjkxMS45MTEsMCwwLDAsNC40LDIwLjNaIi8+DQogIDxwYXRoIGNsYXNzPSJjbHMtMiIgZD0iTTEuMSwxNy4yYS41MTcuNTE3LDAsMCwxLS40LjIuMzY2LjM2NiwwLDAsMS0uMy0uMWgwbDQsM2EuOTExLjkxMSwwLDAsMS0uNC0uOFYxMy44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0uNCw2LjdoMGEuNS41LDAsMCwxLC42OTMuMDlMMS4xLDYuOCw0LDEwLjJWNC41YS45MTEuOTExLDAsMCwxLC40LS44WiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTMiIGQ9Ik0yMy42LDQuMkExLjQyMywxLjQyMywwLDAsMCwyMyw0YS45MDguOTA4LDAsMCwwLS43LjNsLS4xLjFMMTgsOC40LDE0LjMsMTIsOS45LDE2LjIsNS44LDIwLjFsLS4xLjFhLjkwOC45MDgsMCwwLDEtLjcuMywxLjQyMywxLjQyMywwLDAsMS0uNi0uMmwtNC0zYTEuMDcxLDEuMDcxLDAsMCwwLDEuNC0uMUw0LDE0LjYsNi4yLDEyLDkuOCw3LjgsMTYuMi40QS45MTEuOTExLDAsMCwxLDE3LDBhMS40MjMsMS40MjMsMCwwLDEsLjYuMloiLz4NCiAgPHBvbHlnb24gY2xhc3M9ImNscy0yIiBwb2ludHM9IjEwLjIgNy40IDkuOCA3LjggNi4yIDEyIDUuOSAxMi40IDkuNSAxNi42IDkuNSAxNi42IDkuOCAxNi4yIDE0LjMgMTIgMTQuNiAxMS43IDEwLjIgNy40Ii8+DQogIDxwYXRoIGNsYXNzPSJjbHMtNCIgZD0iTTIzLjYsMTkuOGwtNiw0Yy0uMSwwLS4yLjEtLjMuMWgwYS45LjksMCwwLDEtMS0uM0w5LjksMTYuMiw2LjIsMTIsNCw5LjQsMS44LDYuOEExLjIwOCwxLjIwOCwwLDAsMCwuNCw2LjdsNC0zQTEuNDIzLDEuNDIzLDAsMCwxLDUsMy41YS45MDguOTA4LDAsMCwxLC43LjNsLjEuMUw5LjksNy44LDE0LjMsMTJsMy4yLDMuMS41LjUsNC4yLDQuMS4xLjFhLjkwOC45MDgsMCwwLDAsLjcuM1oiLz4NCiAgPHBhdGggY2xhc3M9ImNscy0yIiBkPSJNMjMuNiwxOS44bC02LDRjLS4xLDAtLjIuMS0uMy4xYS43NjIuNzYyLDAsMCwwLC4yLS40VjE1LjFsLjUuNSw0LjIsNC4xLjEuMWEuOTA4LjkwOCwwLDAsMCwuNy4zWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTIiIGQ9Ik0xNy41LjJhLjM2Ni4zNjYsMCwwLDAtLjMtLjEuNTE3LjUxNywwLDAsMSwuMi40VjguOWwuNi0uNSw0LjItNC4xLjEtLjFBMS40NDgsMS40NDgsMCwwLDEsMjMsNGExLjQyMywxLjQyMywwLDAsMSwuNi4yWiIvPg0KICA8cGF0aCBjbGFzcz0iY2xzLTUiIGQ9Ik0yNCw1VjE5YTEsMSwwLDAsMS0uNDQ1LjgzNWwtNiw0QTEsMSwwLDAsMCwxOCwyM1YxYTEuMDEsMS4wMSwwLDAsMC0uNDYtLjgzNWw2LjAxNSw0QTEuMDA5LDEuMDA5LDAsMCwxLDI0LDVaIi8+DQo8L3N2Zz4="
       },
       "isHidden": true,
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19",
       "localizedResources": [
         {
           "language": "en-us",
@@ -914,14 +913,14 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.TestAgent",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "ChannelProduct",
       "icon": {
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0MCA0MCI+DQogIDxzdHlsZT4uaWNvbi1jYW52YXMtdHJhbnNwYXJlbnR7b3BhY2l0eTowO2ZpbGw6I2Y2ZjZmNn0uYnJhbmQtdnNpZGV7ZmlsbDojODY1ZmM1fTwvc3R5bGU+DQogIDxwYXRoIGNsYXNzPSJpY29uLWNhbnZhcy10cmFuc3BhcmVudCIgZD0iTTQwIDQwSDBWMGg0MHY0MHoiIGlkPSJjYW52YXMiLz4NCiAgPHBhdGggY2xhc3M9ImJyYW5kLXZzaWRlIiBkPSJNMzAuMjIxLS4wMDJMMTMuODg3IDE2LjE2IDQuMDUyIDguNzQ2IDAgMTAuMTAyVjI5LjlsNC4wNTIgMS4zNTYgOS44MzUtNy40MTQgMTYuMzM0IDE2LjE2TDQwIDM1Ljg0MlY0LjE1OGwtOS43NzktNC4xNnpNNC4wNTIgMjUuODlWMTQuMTExTDEwLjAwNCAyMGwtNS45NTIgNS44OXpNMzAgMjguNDcyTDE4Ljk4MyAyMCAzMCAxMS41Mjh2MTYuOTQ0eiIvPg0KPC9zdmc+"
       },
       "isHidden": true,
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19",
       "localizedResources": [
         {
           "language": "en-us",
@@ -1011,14 +1010,14 @@
     },
     {
       "id": "Microsoft.VisualStudio.Product.TestController",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "ChannelProduct",
       "icon": {
         "mimeType": "image/svg+xml",
         "base64": "PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA0MCA0MCI+DQogIDxzdHlsZT4uaWNvbi1jYW52YXMtdHJhbnNwYXJlbnR7b3BhY2l0eTowO2ZpbGw6I2Y2ZjZmNn0uYnJhbmQtdnNpZGV7ZmlsbDojODY1ZmM1fTwvc3R5bGU+DQogIDxwYXRoIGNsYXNzPSJpY29uLWNhbnZhcy10cmFuc3BhcmVudCIgZD0iTTQwIDQwSDBWMGg0MHY0MHoiIGlkPSJjYW52YXMiLz4NCiAgPHBhdGggY2xhc3M9ImJyYW5kLXZzaWRlIiBkPSJNMzAuMjIxLS4wMDJMMTMuODg3IDE2LjE2IDQuMDUyIDguNzQ2IDAgMTAuMTAyVjI5LjlsNC4wNTIgMS4zNTYgOS44MzUtNy40MTQgMTYuMzM0IDE2LjE2TDQwIDM1Ljg0MlY0LjE1OGwtOS43NzktNC4xNnpNNC4wNTIgMjUuODlWMTQuMTExTDEwLjAwNCAyMGwtNS45NTIgNS44OXpNMzAgMjguNDcyTDE4Ljk4MyAyMCAzMCAxMS41Mjh2MTYuOTQ0eiIvPg0KPC9zdmc+"
       },
       "isHidden": true,
-      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.13",
+      "releaseNotes": "https://docs.microsoft.com/en-us/visualstudio/releases/2022/release-notes-v17.14#17.14.19",
       "localizedResources": [
         {
           "language": "en-us",
@@ -1108,7 +1107,7 @@
     },
     {
       "id": "VisualStudio.17.Release",
-      "version": "17.14.36414.22",
+      "version": "17.14.36623.8",
       "type": "Channel",
       "localizedResources": [
         {
@@ -1120,61 +1119,61 @@
         {
           "language": "zh-cn",
           "title": "Current",
-          "description": "当前频道包括已可供生产使用的最新功能和修补程序。",
+          "description": "Current 频道包括已可供生产使用的最新功能和修补程序。",
           "channelSuffix": ""
         },
         {
           "language": "zh-tw",
           "title": "Current",
-          "description": "目前通道包含可供生產環境使用的最新功能和修正程式。",
+          "description": "Current 通道包含可供生產環境使用的最新功能和修正程式。",
           "channelSuffix": ""
         },
         {
           "language": "cs-cz",
           "title": "Current",
-          "description": "Aktuální kanál zahrnuje nejnovější funkce a opravy, které jsou připravené k použití v produkčním prostředí.",
+          "description": "Kanál Current zahrnuje nejnovější funkce a opravy, které jsou připravené k použití v produkčním prostředí.",
           "channelSuffix": ""
         },
         {
           "language": "de-de",
           "title": "Current",
-          "description": "Der aktuelle Kanal enthält die neuesten Features und Fixes, die für die Produktion bereit sind.",
+          "description": "Der Current-Kanal enthält die neuesten Features und Fixes, die zur Nutzung in der Produktion bereit sind.",
           "channelSuffix": ""
         },
         {
           "language": "es-es",
           "title": "Current",
-          "description": "El canal actual incluye las características y correcciones más recientes que están listas para el uso de producción.",
+          "description": "El canal Current incluye las características y correcciones más recientes que están listas para el uso de producción.",
           "channelSuffix": ""
         },
         {
           "language": "fr-fr",
           "title": "Current",
-          "description": "Le canal actuel inclut les dernières fonctionnalités et correctifs prêts pour une utilisation en production.",
+          "description": "Le canal Current inclut les dernières fonctionnalités et correctifs prêts pour une utilisation en production.",
           "channelSuffix": ""
         },
         {
           "language": "it-it",
           "title": "Current",
-          "description": "Il Canale corrente include le funzionalità e le correzioni più recenti pronte per l'uso in produzione.",
+          "description": "Il canale Current include le funzionalità e le correzioni più recenti pronte per l'uso in produzione.",
           "channelSuffix": ""
         },
         {
           "language": "ja-jp",
           "title": "Current",
-          "description": "現在のチャネルには、運用環境で使用する準備が整っている最新の機能と修正が含まれています。",
+          "description": "Current チャネルには、運用環境で使用する準備が整っている最新の機能と修正が含まれています。",
           "channelSuffix": ""
         },
         {
           "language": "ko-kr",
           "title": "Current",
-          "description": "현재 채널에는 프로덕션용으로 사용할 준비가 된 최신 기능과 수정 사항이 포함되어 있습니다.",
+          "description": "Current 채널에는 프로덕션용으로 사용할 준비가 된 최신 기능과 수정 사항이 포함되어 있습니다.",
           "channelSuffix": ""
         },
         {
           "language": "pl-pl",
           "title": "Current",
-          "description": "Bieżący kanał obejmuje najnowsze funkcje i poprawki, które są gotowe do użycia w środowisku produkcyjnym.",
+          "description": "Kanał Current obejmuje najnowsze funkcje i poprawki, które są gotowe do użycia w środowisku produkcyjnym.",
           "channelSuffix": ""
         },
         {
@@ -1186,28 +1185,28 @@
         {
           "language": "ru-ru",
           "title": "Current",
-          "description": "Актуальный канал включает последние функции и исправления, готовые к использованию в рабочей среде.",
+          "description": "Канал Current включает последние функции и исправления, готовые к использованию в рабочей среде.",
           "channelSuffix": ""
         },
         {
           "language": "tr-tr",
           "title": "Current",
-          "description": "Geçerli kanal, üretim kullanımı için hazır olan en son özellikleri ve düzeltmeleri içerir.",
+          "description": "Güncel kanal, üretim kullanımı için hazır olan en son özellikleri ve düzeltmeleri içerir.",
           "channelSuffix": ""
         }
       ]
     },
     {
       "id": "VisualStudio.17.Release.Bootstrappers.Setup",
-      "version": "3.14.2084.286130193",
+      "version": "3.14.2086.286130193",
       "type": "Bootstrapper",
-      "installerVersion": "3.14.2084.208",
+      "installerVersion": "3.14.2086.54749",
       "payloads": [
         {
           "fileName": "vs_Setup.exe",
-          "sha256": "1d6cf12ef1543d5e9e54731aec6f10b3931c910abb397f39466a30b6303314db",
-          "size": 4464984,
-          "url": "https://download.visualstudio.microsoft.com/download/pr/89ee1303-1ba2-4f66-b07c-5099983fd1e4/1d6cf12ef1543d5e9e54731aec6f10b3931c910abb397f39466a30b6303314db/vs_Setup.exe"
+          "sha256": "bf287d4f6e9ac7c97ec40c7a145d17da9c0af8c6178066205302e56d1840da66",
+          "size": 4459056,
+          "url": "https://download.visualstudio.microsoft.com/download/pr/5011a9cc-e8ef-42cb-ad72-87de1031accc/bf287d4f6e9ac7c97ec40c7a145d17da9c0af8c6178066205302e56d1840da66/vs_Setup.exe"
         }
       ]
     }
@@ -1216,32 +1215,32 @@
     "signInfo": {
       "signatureMethod": "sha256RSA_cng",
       "digestMethod": "sha256",
-      "digestValue": "lbYNxXS9fhWwdYlTA8367Q14VLuZk7VWROdUyhPwraI=",
+      "digestValue": "83F1SIxSq6LnHvmLy16/R1NTdTwucODN4ozLAdpmnZs=",
       "canonicalization": ""
     },
-    "signatureValue": "Y5Ni1cH09prdAaftGTIdPVSXAEUfVJILWtNJJbdM59Y33c9uGb+jU9JTQA1dl4Fj4ubmYO+6uxp4wYkNMb8eJY3ZAu76PzabU3duyLe8bsBHAW+3t8qi4raMUP4UXfzawIBKnO0GLAcGLka4NcjNq3vA57pdN5e98TsUZKCwgezqBMEkCjOeBkl26uedWjlrv+HCqTYxFarFargd+elD3IPIB/9RhPwwkyJ+divdoUgqclcoNWV7dC9+TWkJrInCBGVAudOpJEBbotu/nyWYN6AFoB90TuhXpV+LLidY1/i5iA8w0V6y61TsK2ERhJNZoIMFqdYLNeqDEWg7eto0MQ==",
+    "signatureValue": "SNXykEZvJLICsFwUje0R3Z9HJ/jDRP1fO6f6OqiV0cBh5Jh3cM+cRXA1vlUaTT7h7Dfu7Dn2Xe5qUNHcgQZdnStSRWvOPnALj/OfTO8IkNgF3IFpkGadHINv9Gf2XPCjof6yn85bjVfniHNoLkQ8DB4pPOwi82cFL5Fo8bbiEe5IbGIjy3l7T3wLMTbj9PGsyBzKZSzg9Bzl2Xj2Yim9sIyDx5n7qHp9Cg+pcMig8hSJs7NzmhtralBABCUJCweB9gdHJSmhvwP8+sFu9++9Fhsrjqwa2sQdAhXhF+gPHM3wmQJFLrOvMRVIfN2ypCFrG9LwvERzVbbYIRlGJvajCw==",
     "keyInfo": {
       "keyValue": {
         "rsaKeyValue": {
-          "modulus": "7XpKjCg5837MnNU9UKR3xba/q5Iq/JXcyzypjF20Q6LlVwLLwX3ehPNrT4+GM2kpbhg0KF9zaTCqKCnlRY4zUat+8sk/4dUEyzAfHaZrGf+9FDPlP7GMb7dT1lsS4zDSF6swfD4xuoux9mBYJOGDoXxknpL581td3SwLX4w9MIsERD7wjZYpUc+16BXXuSjtNXhYlnrXoePKlDqlGgJCM5wuFwd7BXdS1lJrqVxytOUHyUpp3ovamSQWE7fGYQKxg4e50J/mNYzgN6AYglCeJ9QjGlnQ4a4HTLrtNuqFgG3wt6a6pFJ/C1qdvB/tki3rTRuSkGWcL8t2XJ+/j0BpeQ==",
+          "modulus": "wEpIdXKb7lKn26sXpXuywkhxGplTQXxROLmNRZBrAHVBf7546RNXZwA/bzDqsuWTuPSC4T+I4j/z9j5/WqPuUw7SpnEPqWXc2xu7eN8kVyQt5170xkK6KHT4vVEkIvayPtIMLl0SgSCOy/pN5DJCi5ha7FlI84F1Qi2GumR+wQgCwHCVmU8Fj6Ik+B6akISXGCwe6X3rQFQngRFWQ/IrSkOkAOfy0EfvV+nZUo+FcbWuCZ6cb4Eq5I1ws/rZSeuwAWeedZcNt0VlNbsn4AnxBYQX4sj0dlko7JD5fWqeqq3/HzUNbBmLp9qeCXV8XlACn9YVWv900F47z04kVwpyTw==",
           "exponent": "AQAB"
         }
       },
       "x509Data": [
-        "MIIGAzCCA+ugAwIBAgITMwAABISY4hLgeKMxXQAAAAAEhDANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSgwJgYDVQQDEx9NaWNyb3NvZnQgQ29kZSBTaWduaW5nIFBDQSAyMDExMB4XDTI1MDYxOTE4MjEzNVoXDTI2MDYxNzE4MjEzNVowdDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEeMBwGA1UEAxMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA7XpKjCg5837MnNU9UKR3xba/q5Iq/JXcyzypjF20Q6LlVwLLwX3ehPNrT4+GM2kpbhg0KF9zaTCqKCnlRY4zUat+8sk/4dUEyzAfHaZrGf+9FDPlP7GMb7dT1lsS4zDSF6swfD4xuoux9mBYJOGDoXxknpL581td3SwLX4w9MIsERD7wjZYpUc+16BXXuSjtNXhYlnrXoePKlDqlGgJCM5wuFwd7BXdS1lJrqVxytOUHyUpp3ovamSQWE7fGYQKxg4e50J/mNYzgN6AYglCeJ9QjGlnQ4a4HTLrtNuqFgG3wt6a6pFJ/C1qdvB/tki3rTRuSkGWcL8t2XJ+/j0BpeQIDAQABo4IBgjCCAX4wHwYDVR0lBBgwFgYKKwYBBAGCN0wIAQYIKwYBBQUHAwMwHQYDVR0OBBYEFATf9G+hYepzHROBQMWBvZFgqW2FMFQGA1UdEQRNMEukSTBHMS0wKwYDVQQLEyRNaWNyb3NvZnQgSXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxFjAUBgNVBAUTDTIzMDAxMis1MDUzNjIwHwYDVR0jBBgwFoAUSG5k5VAF04KqFzc3IrVtqMp1ApUwVAYDVR0fBE0wSzBJoEegRYZDaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jcmwvTWljQ29kU2lnUENBMjAxMV8yMDExLTA3LTA4LmNybDBhBggrBgEFBQcBAQRVMFMwUQYIKwYBBQUHMAKGRWh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvY2VydHMvTWljQ29kU2lnUENBMjAxMV8yMDExLTA3LTA4LmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4ICAQBi0KbNV1OEU3KAyAyz+kBtzZ0RN6f1kjKetQrPGfiVL98SVhrQc2JgiDZh1Rb+ovKWBf3u/RTSuj9aCo3bsah0onAXYPDI9JPJAxQP9HlNumzwUUFCGolq4bAzq11nS5u2ZrudeqEKFFnCDbOIwX4wxFVeG5oEGH3vuPzFCcECfYepnxPpHAj+B5T+AoSEAVB6EspmpHEwb2cPkLLe7G3beSp0CpEhDdNQszxtWsApQiOsyyn/7yiMJ6h8P/lr3AK+4MCpVjZi8EzYvNO6/a1rF0HqdUPGDJCLhpmdGtagndxrjpEkc589v9KI3mVWIWcqIQkItQbPsX0ZL/38tB31d5jcjttnRVLx8wWYKhORWxo5lJ60q9cfJQqyvrOAPmzhqdiHozqYVqGRDxjnKPxxM52eS5OsOlvhNictzx6BRNGPE7ZEhOP/NGNpQSYS49u3fLnifCHUIUqS/1s04457mB+w8eaPaVnSBkmhTWLkqjmMa1VuzeABEFUQ2Xqg3H6jxtzuq+UjbMV23e9QwiEFEbVCrLOdzjfr65VdK44igSHcLzDS0PcytI8u+6MA8l16GJEMWpDdrhSATtVDQLwmF47OK8N0kZgV/aomeRDcXJ/6SzJIsm+vEHcB1F8/tXyOnmt/446TT8+g5XP0THFyFnjDJIbqf1xG8Lu91Prs/w==",
+        "MIIF9DCCA9ygAwIBAgITMwAABIVemewOWS/N1wAAAAAEhTANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSgwJgYDVQQDEx9NaWNyb3NvZnQgQ29kZSBTaWduaW5nIFBDQSAyMDExMB4XDTI1MDYxOTE4MjEzN1oXDTI2MDYxNzE4MjEzN1owdDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEeMBwGA1UEAxMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwEpIdXKb7lKn26sXpXuywkhxGplTQXxROLmNRZBrAHVBf7546RNXZwA/bzDqsuWTuPSC4T+I4j/z9j5/WqPuUw7SpnEPqWXc2xu7eN8kVyQt5170xkK6KHT4vVEkIvayPtIMLl0SgSCOy/pN5DJCi5ha7FlI84F1Qi2GumR+wQgCwHCVmU8Fj6Ik+B6akISXGCwe6X3rQFQngRFWQ/IrSkOkAOfy0EfvV+nZUo+FcbWuCZ6cb4Eq5I1ws/rZSeuwAWeedZcNt0VlNbsn4AnxBYQX4sj0dlko7JD5fWqeqq3/HzUNbBmLp9qeCXV8XlACn9YVWv900F47z04kVwpyTwIDAQABo4IBczCCAW8wHwYDVR0lBBgwFgYKKwYBBAGCN0wIAQYIKwYBBQUHAwMwHQYDVR0OBBYEFLgmchogri2BNGlO4+UxamNOZJKNMEUGA1UdEQQ+MDykOjA4MR4wHAYDVQQLExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xFjAUBgNVBAUTDTIzMDAxMis1MDUzNTkwHwYDVR0jBBgwFoAUSG5k5VAF04KqFzc3IrVtqMp1ApUwVAYDVR0fBE0wSzBJoEegRYZDaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jcmwvTWljQ29kU2lnUENBMjAxMV8yMDExLTA3LTA4LmNybDBhBggrBgEFBQcBAQRVMFMwUQYIKwYBBQUHMAKGRWh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvY2VydHMvTWljQ29kU2lnUENBMjAxMV8yMDExLTA3LTA4LmNydDAMBgNVHRMBAf8EAjAAMA0GCSqGSIb3DQEBCwUAA4ICAQAo5qgKdgouLEx2XIvqpLRACrBZORzVRislkdqxRl7He3IIGdOB+VOEldHwC+nzhPXS77eCOxwRy4aRnROVIy8uDcS0xtmwwJHgFZsZndrillRisptWmqw8V379xgjeJkV/j5+HPqct0v+ipLeXkgwCCLK8ysNyodkltYQsF1/5Nb+G/jR9RY5fov8TybKVwhbmQeGguRS0+X4G0Sqp7FngHZ/A7K2EIU90Fy7ejb9/3TM7+xvwnaW3XKLpfBWJfrd3ZlzPkiApQt5dmntMDpTa0ONskBMnLj1OTqKi0/OY7Ge/uAmknHxSDZTu5e2O6/8Wrqh20j0Na96CAvnu9ebNhtwpWWt8vfWmMdpZ12HtbK3KyMfDQF01YosqV1Z/WRphJHzXHw4qhkMJJpec/Z5t6VogWevWnWgQWwBRI8iRuMtGu+m3pf+LAwlb2mcyzN0xW8VTvQUK42UbWyWW5At1wK6S6mUn8ed0rmHXXcT1/Kb3KhbhLvMHFHg9ObfcTWyeE7XQBAiZRItL7wcZZjObcxV8tqmXqjzFx0kGKj4GfY70nGejcM5xQ9Pt95G88oTks/1rhmwLuHB2RvICp5UFU+LgNg4nsfQzLNlh4qJDZJ2JS6FHll1tUKyS6ajvNky8ik2wTP6GRwHSHNJM6Ek66PW9/r459vNPQ9PkjjglWQ==",
         "MIIHejCCBWKgAwIBAgIKYQ6Q0gAAAAAAAzANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTEwHhcNMTEwNzA4MjA1OTA5WhcNMjYwNzA4MjEwOTA5WjB+MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSgwJgYDVQQDEx9NaWNyb3NvZnQgQ29kZSBTaWduaW5nIFBDQSAyMDExMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAq/D6chAcLq3YbqqCEE00uvK2WCGfQhsqa+laUKq4BjgaBEm6f8MMHt03a8YS2AvwOMKZBrDIOdUBFDFC04kNeWSHfpRgJGyvnkmc6Whe0t+bU7IKLMOv2akrrnoJr9eWWcpgGgXpZnboMlImEi/nqwhQz7NEt13YxC4Ddato88tt8zpcoRb0RrrgOGSsbmQ1eKagYw8t00CT+OPeBw3VXHmlSSnnDb6gE3e+lD3v++MrWhAfTVYoonpy4BI6t0le2O3tQ5GD2Xuye4Yb2T6xjF3oiU+EGvKhL1nkkDstrjNYxbc+/jLTswM9sbKvkjh+0p2ALPVOVpEhNSXDOW5kf1O6nA+tGSOEy/S6A4aN91/w0FK/jJSHvMAhdCVfGCi2zCcoOCWYOUo2z3yxkq4cI6epZuxhH2rhKEmdX4jiJV3TIUs+UsS1Vz8kA/DRelsv1SPjcF0PUUZ3s/gA4bysAoJf28AVs70b1FVL5zmhD+kjSbwYuER8ReTBw3J64HLnJN+/RpnF78IcV9uDjexNSTCnq47f7Fufr/zdsGbiwZeBe+3W7UvnSSmnEyimp31ngOaKYnhfsi+E11ecXL93KCjx7W3DKI8sj0A3T8HhhUSJxAlMxdSlQy90lfdu+HggWCwTXWCVmj5PM4TasIgX3p5O9JawvEagbJjS4NaIjAsCAwEAAaOCAe0wggHpMBAGCSsGAQQBgjcVAQQDAgEAMB0GA1UdDgQWBBRIbmTlUAXTgqoXNzcitW2oynUClTAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBRyLToCMZBDuRQFTuHqp8cx0SOJNDBaBgNVHR8EUzBRME+gTaBLhklodHRwOi8vY3JsLm1pY3Jvc29mdC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXQyMDExXzIwMTFfMDNfMjIuY3JsMF4GCCsGAQUFBwEBBFIwUDBOBggrBgEFBQcwAoZCaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraS9jZXJ0cy9NaWNSb29DZXJBdXQyMDExXzIwMTFfMDNfMjIuY3J0MIGfBgNVHSAEgZcwgZQwgZEGCSsGAQQBgjcuAzCBgzA/BggrBgEFBQcCARYzaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9kb2NzL3ByaW1hcnljcHMuaHRtMEAGCCsGAQUFBwICMDQeMiAdAEwAZQBnAGEAbABfAHAAbwBsAGkAYwB5AF8AcwB0AGEAdABlAG0AZQBuAHQALiAdMA0GCSqGSIb3DQEBCwUAA4ICAQBn8oalmOBUeRou09h0ZyKbC5YR4WOSmUKWfdJ5DJDBZV8uLD74w3LRbYP+vj/oCso7v0epo/Np22O/IjWll11lhJB9i0ZQVdgMknzSGksc8zxCi1LQsP1r4z4HLimb5j0bpdS1HXeUOeLpZMlEPXh6I/MTfaaQdION9MsmAkYqwooQu6SpBQyb7Wj6aC6VoCo/KmtYSWMfCWluWpiW5IP0wI/zRive/DvQvTXvbiWu5a8n7dDd8w6vmSiXmE0OPQvyCInWH8MyGOLwxS3OW560STkKxgrCxq2u5bLZ2xWIUUVYODJxJxp/sfQn+N4sOiBpmLJZiWhub6e3dMNABQamASooPoI/E01mC8CzTfXhj38cbxV9Rad25UAqZaPDXVJihsMdYzaXht/a8/jyFqGaJ+HNpZfQ7l1jQeNbB5yHPgZ3BtEGsXUfFL5hYbXw3MYbBL7fQccOKO7eZS/sl/ahXJbYANahRr1Z85elCUtIEJmAH9AAKcWxm6U/RXceNcbSoqKfenoi+kiVH6v7RyOA9Z74v2u3S5fi63V4GuzqN5l5GEv/1rMjaHXmr/r8i+sLgOppO6/8MO0ETI7f33VtY5E90Z1WTk+/gFcioXgRMiF670EKsT/7qMykXcGhiJtXcVZOSEXAQsmbdlsKgEhr/Xmfwb1tbWrJUnMTDXpQzQ==",
         "MIIF7TCCA9WgAwIBAgIQP4vItfyfspZDtWnWbELhRDANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTEwHhcNMTEwMzIyMjIwNTI4WhcNMzYwMzIyMjIxMzA0WjCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTEwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCygEGqNThNE3IyaCJNuLLx/9VSvGzH9dJKjDbu0cJcfoyKrq8TKG/Ac+M6ztAlqFo6be+ouFmrEyNozQwph9FvgFyPRH9dkAFSWKxRxV8qh9zc2AodwQO5e7BW6KPeZGHCnvjzfLnsDbVU/ky2ZU+I8JxImQxCCwl8MVkXeQZ4KI2JOkwDJb5xalwL54RgpJki49KvhKSn+9GY7Qyp3pSJ4Q6g3MDOmT3qCFK7VnnkH4S6Hri0xElcTzFLh93dBWcmmYDgcRGjuKVB4qRTufcyKYMME782XgSzS0NHL2vikR7TmE/dQgfI6B0S/Jmpaz6SfsjWaTr8ZL22CZ3K/QwLopt3YEsDlKQwaRLWQi3BQUzK3Kr9j1uDRprZ/LHR47PJf0h6zSTwQY9cdNCssBAgBkm3xy0hyFfj0IbzA2j70M5xwYmZSmQBbP3sMJHPQTySx+W6hh1hhMdfgzlirrSSL0fzC/hV66AfWdC7dJse0Hbm8ukG1xDo+mTeacY1logC8Ea4PyeZb8txiSk190gWAjWP1Xl8TQLPX+uKg09FcYj5qQ1OcunCnAfPSRtOBA5jUYxe2ADBVSy2xuDCZU7JNDn1nLPEfuhhbhNfFcRf2X7tHc7uROzLLoax7Dj2cO2rXBPB2Q8Nx4CyVe0096yb5MPa50c8prWPMd/FS6/r8QIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUci06AjGQQ7kUBU7h6qfHMdEjiTQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQELBQADggIBAH9yzw+3xRXbm8BJyiZb/p4T5tPw0tuXX/JLP02zrhmu7deXoKzvqTqjwkGw5biRnhOBJAPmCf0/V0A5ISRW0RAvS0CpNoZLtFNXmvvxfomPEf4YbFGq6O0JlbXlccmh6Yd1phV/yX43VF50k8XDZ8wNT2uoFwxtCJJ+i92Bqi1wIcM9BhS7vyRep4TXPw8hIr1LAAbblxzYXtTFC1yHblCk6MM4pPvLLMWSZpuFXst6bJN8gClYW1e1QGm6CHmmZGIVnYeWRbVmIyADixxzoNOieTPgUFmG2y/lAiXqcyqfABTINseSO+lOAOzYVgm5M0kS0lQLAausR7aRKX1MtHWAUgHoyoL2n8ysnI8X6i8msKtyrAv+nlEex0NVZ09Rs1fWtuzuUrc66U7h14GIvE+OdbtLqPA1qibUZ2dJsnBMO5PcHd94kIZysjik0dySTclY6ysSXNQ7roxrsIPlAT/4CTL2kzU0Iq/dNw13CYArzUgA8YyZGUcFAenRv9FO0OYoQzeZpApKCNmacXPSqs0xE2N2oTdvkjgefRI8ZjLny23h/FKJ3crWZgWalmG+oijHHKOnNlA8OqTfSm7mhzvO6/DggTedEzxSjr25HTTGHdUKaj2YKXCMiSrRq4IQSB/c9O+lxbtVGjhjhE63bK2VVOxlIhBJF7jAHscPrFRH"
       ]
     },
     "counterSign": {
       "x509Data": [
-        "MIIHKDCCBRCgAwIBAgITMwAAAf8SOHz3wWXWoQABAAAB/zANBgkqhkiG9w0BAQsFADB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMDAeFw0yNDA3MjUxODMxMTlaFw0yNTEwMjIxODMxMTlaMIHTMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMS0wKwYDVQQLEyRNaWNyb3NvZnQgSXJlbGFuZCBPcGVyYXRpb25zIExpbWl0ZWQxJzAlBgNVBAsTHm5TaGllbGQgVFNTIEVTTjo0QzFBLTA1RTAtRDk0NzElMCMGA1UEAxMcTWljcm9zb2Z0IFRpbWUtU3RhbXAgU2VydmljZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMnoldKQe24PP6nP5pIg3SV58yVj2IJPZkxniN6c0KbMq0SURFnCmB3f/XW/oN8+HVOFQpAGRF6r5MT+UDU7QRuSKXsaaYeD4W4iSsL1/lEuCpEhYX9cH5QwGNbbvQkKoYcXxxVe74bZqhywgpg8YWT5ggYff13xSUCFMFWUfEbVJIM5jfW5lomIH19EfmwwJ53FHbadcYxpgqXQTMoJPytId21E1M0B2+JD39spZCj6FhWJ9hjWIFsPDxgVDtL0zCo2A+qS3gT9IWQ4eT93+MYRi5usffMbiEKf0RZ8wW4LYcklxpfjU9XGQKhshIU+y9EnUe6kJb+acAzXq2yt2EhAypN7A4fUutISyTaj+9YhypBte+RwMoOs5hOad3zja/f3yBKTwJQvGIrMV2hl+EaQwWFSqRo9BQmcIrImbMZtF/cOmUpPDjl3/CcU2FiKn0bls3VIq9Gd44jjrWg6u13cqQeIGa4a/dCnD0w0cL8utM60HGv9Q9Sez0CQCTm24mm6ItdrrFfGsbZU/3QnjwuJ3XBXGq9b/n5wpYbPbtxZ+i5Bw0WXzc4V4CwxMG+nQOMt7OhvoEN+aPdI9oumpmmvCbFf3Ahfog0hswMWWNbENZq3TJs8X1s1zerDyTMuPbXbFkyIGVlTkkvblB4UmJG4DMZy3oil3geTAfUDHDknAgMBAAGjggFJMIIBRTAdBgNVHQ4EFgQUw/qV5P60/3exP9EBO4R9MM/ulGEwHwYDVR0jBBgwFoAUn6cVXQBeYl2D9OXSZacbUzUZ6XIwXwYDVR0fBFgwVjBUoFKgUIZOaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jcmwvTWljcm9zb2Z0JTIwVGltZS1TdGFtcCUyMFBDQSUyMDIwMTAoMSkuY3JsMGwGCCsGAQUFBwEBBGAwXjBcBggrBgEFBQcwAoZQaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jZXJ0cy9NaWNyb3NvZnQlMjBUaW1lLVN0YW1wJTIwUENBJTIwMjAxMCgxKS5jcnQwDAYDVR0TAQH/BAIwADAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCDAOBgNVHQ8BAf8EBAMCB4AwDQYJKoZIhvcNAQELBQADggIBADkjTeTKS4srp5vOun61iItIXWsyjS4Ead1mT34WIDwtyvwzTMy5YmEFAKelrYKJSK2rYr14zhtZSI2shva+nsOB9Z+V2XQ3yddgy46KWqeXtYlP2JNHrrT8nzonr327CM05PxudfrolCZO+9p1c2ruoSNihshgSTrwGwFRUdIPKaWcC4IU+M95pBmY6vzuGfz3JlRrYxqbNkwrSOK2YzzVvDuHP+GiUZmEPzXVvdSUazl0acl60ylD3t5DfDeeo6ZfZKLS4Xb3fPUWzrCTX9l86mwFe141eHGgoJQNm7cw8XMn38F4S7vRzFN3S2EwCPdYEzVBewQPatRL0pQiipTfDddGOIlNJ8iJH6UcWMgG0cquUD2DyRxgNE8tDw/N2gre/UWtCHQyDErsF5aVJ8iMscKw8pYHzhssrFgcEP47NuPW6kDmD3acjnYEXvLV3Rq4A6AXrlTivnEQpV6YpjWMK+taGdv5DzM1a80VGDJAV3vVqnUns4fLcrbrpWGHESveaooRdIq0LOv1jkCZbUF+/ZcxVxPRRZZ/TIsdGrPguBz83fktGwTdwN10UTsAL9NeiArk/IWNSJ8lu48FZjfjpENc3ouui61OUbQM9J08ceTnj8o502iLU0mODhrhlNUl2h+PSUj97fMhmAP76K21uFZ3ng+9tRYMGiU6BxZDi",
+        "MIIHIDCCBQigAwIBAgITMwAAAgcsETmJzYX7xQABAAACBzANBgkqhkiG9w0BAQsFADB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMDAeFw0yNTAxMzAxOTQyNTJaFw0yNjA0MjIxOTQyNTJaMIHLMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSUwIwYDVQQLExxNaWNyb3NvZnQgQW1lcmljYSBPcGVyYXRpb25zMScwJQYDVQQLEx5uU2hpZWxkIFRTUyBFU046ODYwMy0wNUUwLUQ5NDcxJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDFP/96dPmcfgODe3/nuFveuBst/JmSxSkOn89ZFytHQm344iLoPqkVws+CiUejQabKf+/c7KU1nqwAmmtiPnG8zm4Sl9+RJZaQ4Dx3qtA9mdQdS7Chf6YUbP4Z++8laNbTQigJoXCmzlV34vmC4zpFrET4KAATjXSPK0sQuFhKr7ltNaMFGclXSnIhcnScj9QUDVLQpAsJtsKHyHN7cN74aEXLpFGc1I+WYFRxaTgqSPqGRfEfuQ2yGrAbWjJYOXueeTA1MVKhW8zzSEpfjKeK/t2XuKykpCUaKn5s8sqNbI3bHt/rE/pNzwWnAKz+POBRbJxIkmL+n/EMVir5u8uyWPl1t88MK551AGVh+2H4ziR14YDxzyCG924gaonKjicYnWUBOtXrnPK6AS/LN6Y+8Kxh26a6vKbFbzaqWXAjzEiQ8EY9K9pYI/KCygixjDwHfUgVSWCyT8Kw7mGByUZmRPPxXONluMe/P8CtBJMpuh8CBWyjvFfFmOSNRK8ETkUmlTUAR1CIOaeBqLGwscShFfyvDQrbChmhXib4nRMX5U9Yr9d7VcYHn6eZJsgyzh5QKlIbCQC/YvhFK42ceCBDMbc+Ot5R6T/Mwce5jVyVCmqXVxWOaQc4rA2nV7onMOZC6UvCG8LGFSZBnj1loDDLWo/I+RuRok2j/Q4zcMnwkQIDAQABo4IBSTCCAUUwHQYDVR0OBBYEFHK1UmLCvXrQCvR98JBq18/4zo0eMB8GA1UdIwQYMBaAFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMF8GA1UdHwRYMFYwVKBSoFCGTmh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvY3JsL01pY3Jvc29mdCUyMFRpbWUtU3RhbXAlMjBQQ0ElMjAyMDEwKDEpLmNybDBsBggrBgEFBQcBAQRgMF4wXAYIKwYBBQUHMAKGUGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvY2VydHMvTWljcm9zb2Z0JTIwVGltZS1TdGFtcCUyMFBDQSUyMDIwMTAoMSkuY3J0MAwGA1UdEwEB/wQCMAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwDgYDVR0PAQH/BAQDAgeAMA0GCSqGSIb3DQEBCwUAA4ICAQDju0quPbnix0slEjD7j2224pYOPGTmdDvO0+bNRCNkZqUv07P04nf1If3Y/iJEmUaU7w12Fm582ImpD/Kw2ClXrNKLPTBO6nfxvOPGtalpAl4wqoGgZxvpxb2yEunG4yZQ6EQOpg1dE9uOXoze3gD4Hjtcc75kca8yivowEI+rhXuVUWB7vog4TGUxKdnDvpk5GSGXnOhPDhdId+g6hRyXdZiwgEa+q9M9Xctz4TGhDgOKFsYxFhXNJZo9KRuGq6evhtyNduYrkzjDtWS6gW8akR59UhuLGsVq+4AgqEY8WlXjQGM2OTkyBnlQLpB8qD7x9jRpY2Cq0OWWlK0wfH/1zefrWN5+be87Sw2TPcIudIJn39bbDG7awKMVYDHfsPJ8ZvxgWkZuf6ZZAkph0eYGh3IV845taLkdLOCvw49Wxqha5Dmi2Ojh8Gja5v9kyY3KTFyX3T4C2scxfgp/6xRd+DGOhNVPvVPa/3yRUqY5s5UYpy8DnbppV7nQO2se3HvCSbrb+yPyeob1kUfMYa9fE2bEsoMbOaHRgGji8ZPt/Jd2bPfdQoBHcUOqPwjHBUIcSc7xdJZYjRb4m81qxjma3DLjuOFljMZTYovRiGvEML9xZj2pHRUyv+s5v7VGwcM6rjNYM4qzZQM6A2RGYJGU780GQG0QO98w+sucuTVrfQ==",
         "MIIHcTCCBVmgAwIBAgITMwAAABXF52ueAptJmQAAAAAAFTANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTAwHhcNMjEwOTMwMTgyMjI1WhcNMzAwOTMwMTgzMjI1WjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOThpkzntHIhC3miy9ckeb0O1YLT/e6cBwfSqWxOdcjKNVf2AX9sSuDivbk+F2Az/1xPx2b3lVNxWuJ+Slr+uDZnhUYjDLWNE893MsAQGOhgfWpSg0S3po5GawcU88V29YZQ3MFEyHFcUTE3oAo4bo3t1w/YJlN8OWECesSq/XJprx2rrPY2vjUmZNqYO7oaezOtgFt+jBAcnVL+tuhiJdxqD89d9P6OU8/W7IVWTe/dvI2k45GPsjksUZzpcGkNyjYtcI4xyDUoveO0hyTD4MmPfrVUj9z6BVWYbWg7mka97aSueik3rMvrg0XnRm7KMtXAhjBcTyziYrLNueKNiOSWrAFKu75xqRdbZ2De+JKRHh09/SDPc31BmkZ1zcRfNN0Sidb9pSB9fvzZnkXftnIv231fgLrbqn427DZM9ituqBJR6L8FA6PRc6ZNN3SUHDSCD/AQ8rdHGO2n6Jl8P0zbr17C89XYcz1DTsEzOUyOArxCaC4Q6oRRRuLRvWoYWmEBc8pnol7XKHYC4jMYctenIPDC+hIK12NvDMk2ZItboKaDIV1fMHSRlJTYuVD5C4lh8zYGNRiER9vcG9H9stQcxWv2XFJRXRLbJbqvUAV6bMURHXLvjflSxIUXk8A8FdsaN8cIFRg/eKtFtvUeh17aj54WcmnGrnu3tz5q4i6tAgMBAAGjggHdMIIB2TASBgkrBgEEAYI3FQEEBQIDAQABMCMGCSsGAQQBgjcVAgQWBBQqp1L+ZMSavoKRPEY1Kc8Q/y8E7jAdBgNVHQ4EFgQUn6cVXQBeYl2D9OXSZacbUzUZ6XIwXAYDVR0gBFUwUzBRBgwrBgEEAYI3TIN9AQEwQTA/BggrBgEFBQcCARYzaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9Eb2NzL1JlcG9zaXRvcnkuaHRtMBMGA1UdJQQMMAoGCCsGAQUFBwMIMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMAsGA1UdDwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNX2VsuP6KJcYmjRPZSQW9fOmhjEMFYGA1UdHwRPME0wS6BJoEeGRWh0dHA6Ly9jcmwubWljcm9zb2Z0LmNvbS9wa2kvY3JsL3Byb2R1Y3RzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNybDBaBggrBgEFBQcBAQROMEwwSgYIKwYBBQUHMAKGPmh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2kvY2VydHMvTWljUm9vQ2VyQXV0XzIwMTAtMDYtMjMuY3J0MA0GCSqGSIb3DQEBCwUAA4ICAQCdVX38Kq3hLB9nATEkW+Geckv8qW/qXBS2Pk5HZHixBpOXPTEztTnXwnE2P9pkbHzQdTltuw8x5MKP+2zRoZQYIu7pZmc6U03dmLq2HnjYNi6cqYJWAAOwBb6J6Gngugnue99qb74py27YP0h1AdkY3m2CDPVtI1TkeFN1JFe53Z/zjj3G82jfZfakVqr3lbYoVSfQJL1AoL8ZthISEV09J+BAljis9/kpicO8F7BUhUKz/AyeixmJ5/ALaoHCgRlCGVJ1ijbCHcNhcy4sa3tuPywJeBTpkbKpW99Jo3QMvOyRgNI95ko+ZjtPu4b6MhrZlvSP9pEB9s7GdP32THJvEKt1MMU0sHrYUP4KWN1APMdUbZ1jdEgssU5HLcEUBHG/ZPkkvnNtyo4JvbMBV0lUZNlz138eW0QBjloZkWsNn6Qo3GcZKCS6OEuabvshVGtqRRFHqfG3rsjoiV5PndLQTHa1V1QJsWkBRH58oWFsc/4Ku+xBZj1p/cvBQUl+fpO+y/g75LcVv7TOPqUxUYS8vwLBgqJ7Fx0ViY1w/ue10CgaiQuPNtq6TPmb/wrpNPgkNWcr4A245oyZ1uEi6vAnQj0llOZ0dFtq0Z4+7X6gMTN9vMvpe784cETRkPHIqzqKOghif9lwY1NNje6CbaUFEMFxBmoQtB1VM1izoXBm8g==",
         "MIIF7TCCA9WgAwIBAgIQKMw6Jb+6RKxEmptYa0M5qjANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTAwHhcNMTAwNjIzMjE1NzI0WhcNMzUwNjIzMjIwNDAxWjCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC5CJ4o5OTsBk5QaLNBxXvrrraOr4G6IkQfZTRpTL5wQBfyFnvief2G7Q059BuorZKQHss9do9a2bWREC48BY2KbSRU5x/tVq2DtFCcFaUXdIhZIPwIxYR202jUbyh4zly481CQRP/jY1++oZoslhUE1gf+HoQh4EIxEcQoNpTPUKRinsnWq3EAslsM5pbUCiSW9f/G1bcb18u3IWKvEtyhXTfjGvsaRpjAm8DnYx8qCJMCfh5qjvKfGInkIoWisYRXQP/1DthvnO3iRTEBzRfpf7CBReOqIUAmoXKqp088AQV+7oNYsV4GY5likXiCtw2TDCRqtBvbJ+xflQQ/k0ow9ZcYs6f5GaeTMx0ByNsiUlzXJclG+aL7h1lDvptisY0thkQaRqx4YX4wCfquicRBKiJmA5E5RZzHiwyoyg0v+1LqDPdjMyOd/rAfrWfWp1ADxgRwY7UssYZaQ7f7rvluKW4hIUEmBozJw+6wwoWTobmF2eYybEtMP9Zdo+W1nXfDnMBVt3QA47g4q4OXUOGaQiQdxsCjMNEaWshSNPdz8ccYHzOteuzLQWDzI5QgwkhFrFxRxi6AwuJ3Fb2Fh+02nZaR7gC1o3Dsn+ONgGiDdrqvXXBSIhbiZvu6s8XC9z4vd6bK3sGmxkhMwzdRI9Mn17hOcJbwoUR2r3jPmuFmEwIDAQABo1EwTzALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQU1fZWy4/oolxiaNE9lJBb186aGMQwEAYJKwYBBAGCNxUBBAMCAQAwDQYJKoZIhvcNAQELBQADggIBAKylloy/u66m9tdxh0MxVoj9HDJxWzW31PCR8q834hTx8wImBT4WFH8UurhP+4mysufUCcxtuVs7ZGVwZrfysVrfGgLz9VG4Z215879We+SEuSsem0CcJjT5RxiYadgc17bRv49hwmfEte9gQ44QGzZJ5CDKrafBsSdlCfjN9Vsq0IQz8+8f8vWcC1iTN6B1oN5y3mx1KmYi9YwGMFafQLkwqkB3FYLXi+zA07K9g8V3DB6urxlToE15cZ8PrzDOZ/nWLMwiQXoH8pdCGM5ZeRBV3m8Q5Ljag2ZAFgloI1uXLiaaArtXjMW4umliMoCJnqH9wJJ8eyszGYQqY8UAaGL6n0eNmXpFOqfp7e5pQrXzgZtHVhB7/HA2hBhz6u/5l02eMyPdJgu6Krc/RNyDJ/+9YVkrEbfKT9vFiwwcMa4y+Pi5Qvd/3GGadrFaBOERPWZFtxhxvskkhdbz1LpBNF0SLSW5jaYTSG1LsAd9mZMJYYF0VyaKq2nj5NnHiMwk2OxSJFwevJEU4pbe6wrant1fs1vb1ILsxiBQhyVAOvvH7s3+M+Vuw4QJVQMlOcDpNV1lMaj2v6AJzSnHszYyLtyV84PBWs+LjfbqsyH4pO0eMQ62TBGrYAukEiMiF6M2ZIKRBBLgq28ey1AFYbRA/1mGcdHVM2l8qXOKONdkDPFp"
       ],
-      "timestamp": "2025-08-14-07:37:33",
+      "timestamp": "2025-10-23-07:30:29",
       "counterSignatureMethod": "timeStamp",
-      "counterSignature": "MIIXmAYJKoZIhvcNAQcCoIIXiTCCF4UCAQMxDzANBglghkgBZQMEAgEFADCCAV0GCyqGSIb3DQEJEAEEoIIBTASCAUgwggFEAgEBBgorBgEEAYRZCgMBMDEwDQYJYIZIAWUDBAIBBQAEIPIVdDv5yLUBRQZGsZ7lC10/RB9UrYCBWuetUfd6yLdRAgZok+pHITYYEzIwMjUwODE1MDIzNzMzLjA1M1owBIACAfQCAUyggdmkgdYwgdMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlvbnMgTGltaXRlZDEnMCUGA1UECxMeblNoaWVsZCBUU1MgRVNOOjRDMUEtMDVFMC1EOTQ3MSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFtcCBTZXJ2aWNloIIR+zCCBygwggUQoAMCAQICEzMAAAH/Ejh898Fl1qEAAQAAAf8wDQYJKoZIhvcNAQELBQAwfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwHhcNMjQwNzI1MTgzMTE5WhcNMjUxMDIyMTgzMTE5WjCB0zELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEtMCsGA1UECxMkTWljcm9zb2Z0IElyZWxhbmQgT3BlcmF0aW9ucyBMaW1pdGVkMScwJQYDVQQLEx5uU2hpZWxkIFRTUyBFU046NEMxQS0wNUUwLUQ5NDcxJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2UwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDJ6JXSkHtuDz+pz+aSIN0lefMlY9iCT2ZMZ4jenNCmzKtElERZwpgd3/11v6DfPh1ThUKQBkReq+TE/lA1O0Ebkil7GmmHg+FuIkrC9f5RLgqRIWF/XB+UMBjW270JCqGHF8cVXu+G2aocsIKYPGFk+YIGH39d8UlAhTBVlHxG1SSDOY31uZaJiB9fRH5sMCedxR22nXGMaYKl0EzKCT8rSHdtRNTNAdviQ9/bKWQo+hYVifYY1iBbDw8YFQ7S9MwqNgPqkt4E/SFkOHk/d/jGEYubrH3zG4hCn9EWfMFuC2HJJcaX41PVxkCobISFPsvRJ1HupCW/mnAM16tsrdhIQMqTewOH1LrSEsk2o/vWIcqQbXvkcDKDrOYTmnd842v398gSk8CULxiKzFdoZfhGkMFhUqkaPQUJnCKyJmzGbRf3DplKTw45d/wnFNhYip9G5bN1SKvRneOI461oOrtd3KkHiBmuGv3Qpw9MNHC/LrTOtBxr/UPUns9AkAk5tuJpuiLXa6xXxrG2VP90J48Lid1wVxqvW/5+cKWGz27cWfouQcNFl83OFeAsMTBvp0DjLezob6BDfmj3SPaLpqZprwmxX9wIX6INIbMDFljWxDWat0ybPF9bNc3qw8kzLj212xZMiBlZU5JL25QeFJiRuAzGct6Ipd4HkwH1Axw5JwIDAQABo4IBSTCCAUUwHQYDVR0OBBYEFMP6leT+tP93sT/RATuEfTDP7pRhMB8GA1UdIwQYMBaAFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMF8GA1UdHwRYMFYwVKBSoFCGTmh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvY3JsL01pY3Jvc29mdCUyMFRpbWUtU3RhbXAlMjBQQ0ElMjAyMDEwKDEpLmNybDBsBggrBgEFBQcBAQRgMF4wXAYIKwYBBQUHMAKGUGh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvY2VydHMvTWljcm9zb2Z0JTIwVGltZS1TdGFtcCUyMFBDQSUyMDIwMTAoMSkuY3J0MAwGA1UdEwEB/wQCMAAwFgYDVR0lAQH/BAwwCgYIKwYBBQUHAwgwDgYDVR0PAQH/BAQDAgeAMA0GCSqGSIb3DQEBCwUAA4ICAQA5I03kykuLK6ebzrp+tYiLSF1rMo0uBGndZk9+FiA8Lcr8M0zMuWJhBQCnpa2CiUitq2K9eM4bWUiNrIb2vp7DgfWfldl0N8nXYMuOilqnl7WJT9iTR660/J86J699uwjNOT8bnX66JQmTvvadXNq7qEjYobIYEk68BsBUVHSDymlnAuCFPjPeaQZmOr87hn89yZUa2MamzZMK0jitmM81bw7hz/holGZhD811b3UlGs5dGnJetMpQ97eQ3w3nqOmX2Si0uF293z1Fs6wk1/ZfOpsBXteNXhxoKCUDZu3MPFzJ9/BeEu70cxTd0thMAj3WBM1QXsED2rUS9KUIoqU3w3XRjiJTSfIiR+lHFjIBtHKrlA9g8kcYDRPLQ8PzdoK3v1FrQh0MgxK7BeWlSfIjLHCsPKWB84bLKxYHBD+Ozbj1upA5g92nI52BF7y1d0auAOgF65U4r5xEKVemKY1jCvrWhnb+Q8zNWvNFRgyQFd71ap1J7OHy3K266VhhxEr3mqKEXSKtCzr9Y5AmW1Bfv2XMVcT0UWWf0yLHRqz4Lgc/N35LRsE3cDddFE7AC/TXogK5PyFjUifJbuPBWY346RDXN6LroutTlG0DPSdPHHk54/KOdNoi1NJjg4a4ZTVJdofj0lI/e3zIZgD++ittbhWd54PvbUWDBolOgcWQ4jCCB3EwggVZoAMCAQICEzMAAAAVxedrngKbSZkAAAAAABUwDQYJKoZIhvcNAQELBQAwgYgxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xMjAwBgNVBAMTKU1pY3Jvc29mdCBSb290IENlcnRpZmljYXRlIEF1dGhvcml0eSAyMDEwMB4XDTIxMDkzMDE4MjIyNVoXDTMwMDkzMDE4MzIyNVowfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDk4aZM57RyIQt5osvXJHm9DtWC0/3unAcH0qlsTnXIyjVX9gF/bErg4r25PhdgM/9cT8dm95VTcVrifkpa/rg2Z4VGIwy1jRPPdzLAEBjoYH1qUoNEt6aORmsHFPPFdvWGUNzBRMhxXFExN6AKOG6N7dcP2CZTfDlhAnrEqv1yaa8dq6z2Nr41JmTamDu6GnszrYBbfowQHJ1S/rboYiXcag/PXfT+jlPP1uyFVk3v3byNpOORj7I5LFGc6XBpDco2LXCOMcg1KL3jtIckw+DJj361VI/c+gVVmG1oO5pGve2krnopN6zL64NF50ZuyjLVwIYwXE8s4mKyzbnijYjklqwBSru+cakXW2dg3viSkR4dPf0gz3N9QZpGdc3EXzTdEonW/aUgfX782Z5F37ZyL9t9X4C626p+Nuw2TPYrbqgSUei/BQOj0XOmTTd0lBw0gg/wEPK3Rxjtp+iZfD9M269ewvPV2HM9Q07BMzlMjgK8QmguEOqEUUbi0b1qGFphAXPKZ6Je1yh2AuIzGHLXpyDwwvoSCtdjbwzJNmSLW6CmgyFdXzB0kZSU2LlQ+QuJYfM2BjUYhEfb3BvR/bLUHMVr9lxSUV0S2yW6r1AFemzFER1y7435UsSFF5PAPBXbGjfHCBUYP3irRbb1Hode2o+eFnJpxq57t7c+auIurQIDAQABo4IB3TCCAdkwEgYJKwYBBAGCNxUBBAUCAwEAATAjBgkrBgEEAYI3FQIEFgQUKqdS/mTEmr6CkTxGNSnPEP8vBO4wHQYDVR0OBBYEFJ+nFV0AXmJdg/Tl0mWnG1M1GelyMFwGA1UdIARVMFMwUQYMKwYBBAGCN0yDfQEBMEEwPwYIKwYBBQUHAgEWM2h0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2lvcHMvRG9jcy9SZXBvc2l0b3J5Lmh0bTATBgNVHSUEDDAKBggrBgEFBQcDCDAZBgkrBgEEAYI3FAIEDB4KAFMAdQBiAEMAQTALBgNVHQ8EBAMCAYYwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBTV9lbLj+iiXGJo0T2UkFvXzpoYxDBWBgNVHR8ETzBNMEugSaBHhkVodHRwOi8vY3JsLm1pY3Jvc29mdC5jb20vcGtpL2NybC9wcm9kdWN0cy9NaWNSb29DZXJBdXRfMjAxMC0wNi0yMy5jcmwwWgYIKwYBBQUHAQEETjBMMEoGCCsGAQUFBzAChj5odHRwOi8vd3d3Lm1pY3Jvc29mdC5jb20vcGtpL2NlcnRzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNydDANBgkqhkiG9w0BAQsFAAOCAgEAnVV9/Cqt4SwfZwExJFvhnnJL/Klv6lwUtj5OR2R4sQaTlz0xM7U518JxNj/aZGx80HU5bbsPMeTCj/ts0aGUGCLu6WZnOlNN3Zi6th542DYunKmCVgADsAW+iehp4LoJ7nvfam++Kctu2D9IdQHZGN5tggz1bSNU5HhTdSRXud2f8449xvNo32X2pFaq95W2KFUn0CS9QKC/GbYSEhFdPSfgQJY4rPf5KYnDvBewVIVCs/wMnosZiefwC2qBwoEZQhlSdYo2wh3DYXMuLGt7bj8sCXgU6ZGyqVvfSaN0DLzskYDSPeZKPmY7T7uG+jIa2Zb0j/aRAfbOxnT99kxybxCrdTDFNLB62FD+CljdQDzHVG2dY3RILLFORy3BFARxv2T5JL5zbcqOCb2zAVdJVGTZc9d/HltEAY5aGZFrDZ+kKNxnGSgkujhLmm77IVRrakURR6nxt67I6IleT53S0Ex2tVdUCbFpAUR+fKFhbHP+CrvsQWY9af3LwUFJfn6Tvsv4O+S3Fb+0zj6lMVGEvL8CwYKiexcdFYmNcP7ntdAoGokLjzbaukz5m/8K6TT4JDVnK+ANuOaMmdbhIurwJ0I9JZTmdHRbatGePu1+oDEzfbzL6Xu/OHBE0ZDxyKs6ijoIYn/ZcGNTTY3ugm2lBRDBcQZqELQdVTNYs6FwZvKhggNWMIICPgIBATCCAQGhgdmkgdYwgdMxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xLTArBgNVBAsTJE1pY3Jvc29mdCBJcmVsYW5kIE9wZXJhdGlvbnMgTGltaXRlZDEnMCUGA1UECxMeblNoaWVsZCBUU1MgRVNOOjRDMUEtMDVFMC1EOTQ3MSUwIwYDVQQDExxNaWNyb3NvZnQgVGltZS1TdGFtcCBTZXJ2aWNloiMKAQEwBwYFKw4DAhoDFQCpE4xsxLwlxSVyc+TBEsVE9cWymaCBgzCBgKR+MHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBDQSAyMDEwMA0GCSqGSIb3DQEBCwUAAgUA7Ej0AzAiGA8yMDI1MDgxNDIzNDcxNVoYDzIwMjUwODE1MjM0NzE1WjB0MDoGCisGAQQBhFkKBAExLDAqMAoCBQDsSPQDAgEAMAcCAQACAhv6MAcCAQACAhKpMAoCBQDsSkWDAgEAMDYGCisGAQQBhFkKBAIxKDAmMAwGCisGAQQBhFkKAwKgCjAIAgEAAgMHoSChCjAIAgEAAgMBhqAwDQYJKoZIhvcNAQELBQADggEBAK9fpi47WvMujqooPn8AldaYVVTd/MknJtSAfWHf4talrClHZ/GY3RO9tO0acKtSswr3jH2AMF6lAZj+839y/4N0s+bSGllnh9ivYTHw4LeEd3G0PNmbM3aNMKpdlHkXtK4N/6cRwFlkt5zCZvLGaXbkkqrKGqh2Q9X90yxbgbs1H69TAR4/HWcjHTmz0iM093b/w/oJS4LQMciF6g0gpzWVktLVtwfQkzUt16J57c1Z2ipgHojIkeKh09jVPGONJWvABMLmhuahJTDwud4UoHtqrict23MAqaLXzamFbp+98co3t0PCBnJUmpz4VLPQqjp7hZXJOsQK+G64hGxjzcoxggQNMIIECQIBATCBkzB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMAITMwAAAf8SOHz3wWXWoQABAAAB/zANBglghkgBZQMEAgEFAKCCAUowGgYJKoZIhvcNAQkDMQ0GCyqGSIb3DQEJEAEEMC8GCSqGSIb3DQEJBDEiBCDXBkeR4xTPjhDrPRQ1qvy98Ybi5Vhtp3ov4Z2GiCR/MDCB+gYLKoZIhvcNAQkQAi8xgeowgecwgeQwgb0EIOQy777JAndprJwi4xPq8Dsk24xpU4jeoONIRXy6nKf9MIGYMIGApH4wfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTACEzMAAAH/Ejh898Fl1qEAAQAAAf8wIgQg54faFq0iHrgxPYuiO0j9wz5AMnXH4ONR1azCBODS3e8wDQYJKoZIhvcNAQELBQAEggIAogObF40R8uk/BOJK2PFjNq2yumWOFcywt0eqZP3QDfy46ul9no0QPjJw+Xgd0Xil5KQiclWmVAE8AUaLXO8dohdf9uuNDgIF3gqEDbug6NPIhJAqEW5AQuSkC+kSqr5K//StsjQEO86OBZRDjqwF2hPAcKUi6yM0vM1EUXBM0wzdsBjKYBmcXSU027HNmawtlj1jJdBdOq8beqVm5G0b2WAVwvdp9kSE0KjslsDNQYMpZjM10AyiGocjb2sgASk5FP8dMzd21mUMDg5OBREXmJIObMQa91ppJLwtgC9jMXOgK4kG1nq4CfSUu4q74+hvc7woNYZx61KAZjA7TdRkv9Vta68JDE+FePNORKXc8NJ+uOqNV8OVzdBLP1++G6yzT+4azot71gvl8V0e+06B43Q9jEkSdX3tOZ6+kUZ9pox1PJ0dAGfs1gcbjH16IdA2ZSktuOkzWxwXs1K9zCyPdmK017dwXQwz2IEY9noycI4L/Id+tXBUKvnHDxzZsz/snNWJPpiyA3mhEXrSAo6nrlCXrHCp5TT0CX8aPjuwuJz1pQG5pF4f1m1mNh2tW4L/D9ZXOql5S3/o3hm8ovjJGTaUTrIG/oBw9OB+1qzBnA07YJ0uSKpEJSFTD3fMUYAUtHq8YzYi4TQjStgddA0h8Q0LWaE2nwEUkVgXGTDt+3wA"
+      "counterSignature": "MIIXfwYJKoZIhvcNAQcCoIIXcDCCF2wCAQMxDzANBglghkgBZQMEAgEFADCCAVUGCyqGSIb3DQEJEAEEoIIBRASCAUAwggE8AgEBBgorBgEEAYRZCgMBMDEwDQYJYIZIAWUDBAIBBQAEIK4oF3FRZnonOkP77IO4n16Qc/WvCwE0UvhkCmG226NBAgZo8BpWavAYEzIwMjUxMDI0MDIzMDI4LjkwOFowBIACAfQCAfOggdGkgc4wgcsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xJTAjBgNVBAsTHE1pY3Jvc29mdCBBbWVyaWNhIE9wZXJhdGlvbnMxJzAlBgNVBAsTHm5TaGllbGQgVFNTIEVTTjo4NjAzLTA1RTAtRDk0NzElMCMGA1UEAxMcTWljcm9zb2Z0IFRpbWUtU3RhbXAgU2VydmljZaCCEeowggcgMIIFCKADAgECAhMzAAACBywROYnNhfvFAAEAAAIHMA0GCSqGSIb3DQEBCwUAMHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBDQSAyMDEwMB4XDTI1MDEzMDE5NDI1MloXDTI2MDQyMjE5NDI1MlowgcsxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xJTAjBgNVBAsTHE1pY3Jvc29mdCBBbWVyaWNhIE9wZXJhdGlvbnMxJzAlBgNVBAsTHm5TaGllbGQgVFNTIEVTTjo4NjAzLTA1RTAtRDk0NzElMCMGA1UEAxMcTWljcm9zb2Z0IFRpbWUtU3RhbXAgU2VydmljZTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMU//3p0+Zx+A4N7f+e4W964Gy38mZLFKQ6fz1kXK0dCbfjiIug+qRXCz4KJR6NBpsp/79zspTWerACaa2I+cbzObhKX35EllpDgPHeq0D2Z1B1LsKF/phRs/hn77yVo1tNCKAmhcKbOVXfi+YLjOkWsRPgoABONdI8rSxC4WEqvuW01owUZyVdKciFydJyP1BQNUtCkCwm2wofIc3tw3vhoRcukUZzUj5ZgVHFpOCpI+oZF8R+5DbIasBtaMlg5e555MDUxUqFbzPNISl+Mp4r+3Ze4rKSkJRoqfmzyyo1sjdse3+sT+k3PBacArP484FFsnEiSYv6f8QxWKvm7y7JY+XW3zwwrnnUAZWH7YfjOJHXhgPHPIIb3biBqicqOJxidZQE61euc8roBL8s3pj7wrGHbprq8psVvNqpZcCPMSJDwRj0r2lgj8oLKCLGMPAd9SBVJYLJPwrDuYYHJRmZE8/Fc42W4x78/wK0Ekym6HwIFbKO8V8WY5I1ErwRORSaVNQBHUIg5p4GosbCxxKEV/K8NCtsKGaFeJvidExflT1iv13tVxgefp5kmyDLOHlAqUhsJAL9i+EUrjZx4IEMxtz463lHpP8zBx7mNXJUKapdXFY5pBzisDadXuicw5kLpS8IbwsYVJkGePWWgMMtaj8j5G5GiTaP9DjNwyfCRAgMBAAGjggFJMIIBRTAdBgNVHQ4EFgQUcrVSYsK9etAK9H3wkGrXz/jOjR4wHwYDVR0jBBgwFoAUn6cVXQBeYl2D9OXSZacbUzUZ6XIwXwYDVR0fBFgwVjBUoFKgUIZOaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jcmwvTWljcm9zb2Z0JTIwVGltZS1TdGFtcCUyMFBDQSUyMDIwMTAoMSkuY3JsMGwGCCsGAQUFBwEBBGAwXjBcBggrBgEFBQcwAoZQaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9jZXJ0cy9NaWNyb3NvZnQlMjBUaW1lLVN0YW1wJTIwUENBJTIwMjAxMCgxKS5jcnQwDAYDVR0TAQH/BAIwADAWBgNVHSUBAf8EDDAKBggrBgEFBQcDCDAOBgNVHQ8BAf8EBAMCB4AwDQYJKoZIhvcNAQELBQADggIBAOO7Sq49ueLHSyUSMPuPbbbilg48ZOZ0O87T5s1EI2RmpS/Ts/Tid/Uh/dj+IkSZRpTvDXYWbnzYiakP8rDYKVes0os9ME7qd/G848a1qWkCXjCqgaBnG+nFvbIS6cbjJlDoRA6mDV0T245ejN7eAPgeO1xzvmRxrzKK+jAQj6uFe5VRYHu+iDhMZTEp2cO+mTkZIZec6E8OF0h36DqFHJd1mLCARr6r0z1dy3PhMaEOA4oWxjEWFc0lmj0pG4arp6+G3I125iuTOMO1ZLqBbxqRHn1SG4saxWr7gCCoRjxaVeNAYzY5OTIGeVAukHyoPvH2NGljYKrQ5ZaUrTB8f/XN5+tY3n5t7ztLDZM9wi50gmff1tsMbtrAoxVgMd+w8nxm/GBaRm5/plkCSmHR5gaHchXzjm1ouR0s4K/Dj1bGqFrkOaLY6OHwaNrm/2TJjcpMXJfdPgLaxzF+Cn/rFF34MY6E1U+9U9r/fJFSpjmzlRinLwOdumlXudA7ax7ce8JJutv7I/J6hvWRR8xhr18TZsSygxs5odGAaOLxk+38l3Zs991CgEdxQ6o/CMcFQhxJzvF0lliNFvibzWrGOZrcMuO44WWMxlNii9GIa8Qwv3FmPakdFTK/6zm/tUbBwzquM1gzirNlAzoDZEZgkZTvzQZAbRA73zD6y5y5NWt9MIIHcTCCBVmgAwIBAgITMwAAABXF52ueAptJmQAAAAAAFTANBgkqhkiG9w0BAQsFADCBiDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEyMDAGA1UEAxMpTWljcm9zb2Z0IFJvb3QgQ2VydGlmaWNhdGUgQXV0aG9yaXR5IDIwMTAwHhcNMjEwOTMwMTgyMjI1WhcNMzAwOTMwMTgzMjI1WjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMDCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAOThpkzntHIhC3miy9ckeb0O1YLT/e6cBwfSqWxOdcjKNVf2AX9sSuDivbk+F2Az/1xPx2b3lVNxWuJ+Slr+uDZnhUYjDLWNE893MsAQGOhgfWpSg0S3po5GawcU88V29YZQ3MFEyHFcUTE3oAo4bo3t1w/YJlN8OWECesSq/XJprx2rrPY2vjUmZNqYO7oaezOtgFt+jBAcnVL+tuhiJdxqD89d9P6OU8/W7IVWTe/dvI2k45GPsjksUZzpcGkNyjYtcI4xyDUoveO0hyTD4MmPfrVUj9z6BVWYbWg7mka97aSueik3rMvrg0XnRm7KMtXAhjBcTyziYrLNueKNiOSWrAFKu75xqRdbZ2De+JKRHh09/SDPc31BmkZ1zcRfNN0Sidb9pSB9fvzZnkXftnIv231fgLrbqn427DZM9ituqBJR6L8FA6PRc6ZNN3SUHDSCD/AQ8rdHGO2n6Jl8P0zbr17C89XYcz1DTsEzOUyOArxCaC4Q6oRRRuLRvWoYWmEBc8pnol7XKHYC4jMYctenIPDC+hIK12NvDMk2ZItboKaDIV1fMHSRlJTYuVD5C4lh8zYGNRiER9vcG9H9stQcxWv2XFJRXRLbJbqvUAV6bMURHXLvjflSxIUXk8A8FdsaN8cIFRg/eKtFtvUeh17aj54WcmnGrnu3tz5q4i6tAgMBAAGjggHdMIIB2TASBgkrBgEEAYI3FQEEBQIDAQABMCMGCSsGAQQBgjcVAgQWBBQqp1L+ZMSavoKRPEY1Kc8Q/y8E7jAdBgNVHQ4EFgQUn6cVXQBeYl2D9OXSZacbUzUZ6XIwXAYDVR0gBFUwUzBRBgwrBgEEAYI3TIN9AQEwQTA/BggrBgEFBQcCARYzaHR0cDovL3d3dy5taWNyb3NvZnQuY29tL3BraW9wcy9Eb2NzL1JlcG9zaXRvcnkuaHRtMBMGA1UdJQQMMAoGCCsGAQUFBwMIMBkGCSsGAQQBgjcUAgQMHgoAUwB1AGIAQwBBMAsGA1UdDwQEAwIBhjAPBgNVHRMBAf8EBTADAQH/MB8GA1UdIwQYMBaAFNX2VsuP6KJcYmjRPZSQW9fOmhjEMFYGA1UdHwRPME0wS6BJoEeGRWh0dHA6Ly9jcmwubWljcm9zb2Z0LmNvbS9wa2kvY3JsL3Byb2R1Y3RzL01pY1Jvb0NlckF1dF8yMDEwLTA2LTIzLmNybDBaBggrBgEFBQcBAQROMEwwSgYIKwYBBQUHMAKGPmh0dHA6Ly93d3cubWljcm9zb2Z0LmNvbS9wa2kvY2VydHMvTWljUm9vQ2VyQXV0XzIwMTAtMDYtMjMuY3J0MA0GCSqGSIb3DQEBCwUAA4ICAQCdVX38Kq3hLB9nATEkW+Geckv8qW/qXBS2Pk5HZHixBpOXPTEztTnXwnE2P9pkbHzQdTltuw8x5MKP+2zRoZQYIu7pZmc6U03dmLq2HnjYNi6cqYJWAAOwBb6J6Gngugnue99qb74py27YP0h1AdkY3m2CDPVtI1TkeFN1JFe53Z/zjj3G82jfZfakVqr3lbYoVSfQJL1AoL8ZthISEV09J+BAljis9/kpicO8F7BUhUKz/AyeixmJ5/ALaoHCgRlCGVJ1ijbCHcNhcy4sa3tuPywJeBTpkbKpW99Jo3QMvOyRgNI95ko+ZjtPu4b6MhrZlvSP9pEB9s7GdP32THJvEKt1MMU0sHrYUP4KWN1APMdUbZ1jdEgssU5HLcEUBHG/ZPkkvnNtyo4JvbMBV0lUZNlz138eW0QBjloZkWsNn6Qo3GcZKCS6OEuabvshVGtqRRFHqfG3rsjoiV5PndLQTHa1V1QJsWkBRH58oWFsc/4Ku+xBZj1p/cvBQUl+fpO+y/g75LcVv7TOPqUxUYS8vwLBgqJ7Fx0ViY1w/ue10CgaiQuPNtq6TPmb/wrpNPgkNWcr4A245oyZ1uEi6vAnQj0llOZ0dFtq0Z4+7X6gMTN9vMvpe784cETRkPHIqzqKOghif9lwY1NNje6CbaUFEMFxBmoQtB1VM1izoXBm8qGCA00wggI1AgEBMIH5oYHRpIHOMIHLMQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSUwIwYDVQQLExxNaWNyb3NvZnQgQW1lcmljYSBPcGVyYXRpb25zMScwJQYDVQQLEx5uU2hpZWxkIFRTUyBFU046ODYwMy0wNUUwLUQ5NDcxJTAjBgNVBAMTHE1pY3Jvc29mdCBUaW1lLVN0YW1wIFNlcnZpY2WiIwoBATAHBgUrDgMCGgMVANO9VT9iP2VRLJ4MJqInYNrmFSJLoIGDMIGApH4wfDELMAkGA1UEBhMCVVMxEzARBgNVBAgTCldhc2hpbmd0b24xEDAOBgNVBAcTB1JlZG1vbmQxHjAcBgNVBAoTFU1pY3Jvc29mdCBDb3Jwb3JhdGlvbjEmMCQGA1UEAxMdTWljcm9zb2Z0IFRpbWUtU3RhbXAgUENBIDIwMTAwDQYJKoZIhvcNAQELBQACBQDspSPlMCIYDzIwMjUxMDIzMjIwMDA1WhgPMjAyNTEwMjQyMjAwMDVaMHQwOgYKKwYBBAGEWQoEATEsMCowCgIFAOylI+UCAQAwBwIBAAICDIAwBwIBAAICE+EwCgIFAOymdWUCAQAwNgYKKwYBBAGEWQoEAjEoMCYwDAYKKwYBBAGEWQoDAqAKMAgCAQACAwehIKEKMAgCAQACAwGGoDANBgkqhkiG9w0BAQsFAAOCAQEAye6HL3JOOUTky9aJIDuhkkTjGnjQPRuKZaYGIAlCNQOhO3x2dnN6hr/QbEMWcBjYsDgGS53NFEghq7JuYhpFLdYeyuQ2iRYgKaHIlwtMm6820NpKwX8XUXY66bodX3q1VFYK05r7czu77T0XXKYaFwk4XokcJQEpnBtAExVzTAHqZTjqXFeP0+gak+/DJp3dh4SKjg2gOAaD8vUrSACj/NeGtiWp7Ir+l6e+rKTCYKRieopd8bX0W5wyLBVPryRuoUKcFMfKHNNwps07R/tcPi7RS3OUggFhsrEmGuMoZbIUCAl2/qYegY2Qa0/ldDr/qM8dDhURXzsTztDlHmhQ6zGCBA0wggQJAgEBMIGTMHwxCzAJBgNVBAYTAlVTMRMwEQYDVQQIEwpXYXNoaW5ndG9uMRAwDgYDVQQHEwdSZWRtb25kMR4wHAYDVQQKExVNaWNyb3NvZnQgQ29ycG9yYXRpb24xJjAkBgNVBAMTHU1pY3Jvc29mdCBUaW1lLVN0YW1wIFBDQSAyMDEwAhMzAAACBywROYnNhfvFAAEAAAIHMA0GCWCGSAFlAwQCAQUAoIIBSjAaBgkqhkiG9w0BCQMxDQYLKoZIhvcNAQkQAQQwLwYJKoZIhvcNAQkEMSIEIBjnMfOWDqIDZJW2SPZFayuz8o4hCjjigQEODZyAULIYMIH6BgsqhkiG9w0BCRACLzGB6jCB5zCB5DCBvQQgL/fU0dB2zUhnmw+e/n2n6/oGMEOCgM8jCICafQ8ep7MwgZgwgYCkfjB8MQswCQYDVQQGEwJVUzETMBEGA1UECBMKV2FzaGluZ3RvbjEQMA4GA1UEBxMHUmVkbW9uZDEeMBwGA1UEChMVTWljcm9zb2Z0IENvcnBvcmF0aW9uMSYwJAYDVQQDEx1NaWNyb3NvZnQgVGltZS1TdGFtcCBQQ0EgMjAxMAITMwAAAgcsETmJzYX7xQABAAACBzAiBCBOzXy++iBlQ/6F8GM/DefasEvwxo+NeER+lUeJUsI9XjANBgkqhkiG9w0BAQsFAASCAgCbuAm03ToxRPdheyBPnwcj/g7nliEJWPRpJnAClqqRhkei0Zyy4P3PLOsGtkuWSBUAlRorfd7BCs2T0hVmk5kBzDyD7I+b/dU9LOwFzpOGRJ1KYdd26NmSyqvUJAnQke9JW2ftpJI2zSkl54dmJHwcefNxG82kBQKFpQ7fPct1kTIc2TiIlKnZ71uKUZC0rpCQ0Oc3eTCeSAOM9V9CBI67a8oKmzwIL9G3BoeTayVMRmir6bgGQYu0HmMw/rjaLWWZkpRYBP0VGMRGhyraqCIdQIzH6UmeCKnbgwrNNfZLO3wIGxqbxujiKgFStq426mCryG+0fY9XTiWLZ5MZa9bJCR/NCdn3MFuZGEg4Tdu8XuoKvwh+3bNcssDZODulU76NfQ38GXsFHio+e3f1jkwVjciHfa4HbKHiwIUwaHn6bYGNIOcxa92IzDlG0CjK0EIhI4h6izwD8xp/ZJPSKe1fmGhhLa2VypgPZ3kvvIxTSSYPYlIZB/Yx01hDyoNMbXoNY3HYZVLlxgZ5TOy0rm9ZhUBZgAXzUSjh/edRz2ElCAvsX4YXdtCJhbh2tdtOQoygWjVbmJgqZ+zyF9O2+aQvRKuz+T/5ojh05xoa/3sBH4R6VtgCRlhekxHON94EEjTcJze0TtsnRE8fZewAywORhlkK90D80OJUyzTqYJ2TZQA="
     }
   }
 }

From 863bf3dfa6b5e8566643b9ba6c6727162b4edfc5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 09:30:20 -0700
Subject: [PATCH 4383/6226] python3Packages.python-jsonpath: init at 2.0.1

---
 .../python-jsonpath/default.nix               | 46 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 48 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-jsonpath/default.nix

diff --git a/pkgs/development/python-modules/python-jsonpath/default.nix b/pkgs/development/python-modules/python-jsonpath/default.nix
new file mode 100644
index 000000000000..af58dc59b57a
--- /dev/null
+++ b/pkgs/development/python-modules/python-jsonpath/default.nix
@@ -0,0 +1,46 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+  lib,
+  pytestCheckHook,
+  regex,
+}:
+
+buildPythonPackage rec {
+  pname = "python-jsonpath";
+  version = "2.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "jg-rp";
+    repo = "python-jsonpath";
+    tag = "v${version}";
+    fetchSubmodules = true;
+    hash = "sha256-DiXBIo/I36rrn+RCQda+khfViCnzHwiGzK2X9ACF3io=";
+  };
+
+  build-system = [ hatchling ];
+
+  optional-dependencies = {
+    strict = [
+      # FIXME package iregexp-check
+      regex
+    ];
+  };
+
+  pythonImportsCheck = [ "jsonpath" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ]
+  ++ optional-dependencies.strict;
+
+  meta = {
+    changelog = "https://github.com/jg-rp/python-jsonpath/blob/${src.tag}/CHANGELOG.md";
+    description = "Flexible JSONPath engine for Python with JSON Pointer and JSON Patch";
+    homepage = "https://github.com/jg-rp/python-jsonpath";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5e46457699d2..32cbf4afb055 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14989,6 +14989,8 @@ self: super: with self; {
 
   python-json-logger = callPackage ../development/python-modules/python-json-logger { };
 
+  python-jsonpath = callPackage ../development/python-modules/python-jsonpath { };
+
   python-jsonrpc-server = callPackage ../development/python-modules/python-jsonrpc-server { };
 
   python-juicenet = callPackage ../development/python-modules/python-juicenet { };

From f46561f77b261ae6427d5d52724e81788c46dc79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 09:22:31 -0700
Subject: [PATCH 4384/6226] python3Packages.pyenphase: 2.3.1 -> 2.4.1

Diff: https://github.com/pyenphase/pyenphase/compare/v2.3.1...v2.4.1

Changelog: https://github.com/pyenphase/pyenphase/blob/v2.4.1/CHANGELOG.md
---
 pkgs/development/python-modules/pyenphase/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pyenphase/default.nix b/pkgs/development/python-modules/pyenphase/default.nix
index a75dac805a92..f3fe876b808d 100644
--- a/pkgs/development/python-modules/pyenphase/default.nix
+++ b/pkgs/development/python-modules/pyenphase/default.nix
@@ -14,7 +14,7 @@
   pytest-cov-stub,
   pytest-timeout,
   pytestCheckHook,
-  pythonOlder,
+  python-jsonpath,
   respx,
   syrupy,
   tenacity,
@@ -22,16 +22,14 @@
 
 buildPythonPackage rec {
   pname = "pyenphase";
-  version = "2.3.1";
+  version = "2.4.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "pyenphase";
     repo = "pyenphase";
     tag = "v${version}";
-    hash = "sha256-Z6txaTkIkUTYWVWbsmvoI/huDTZKX5DxePqM5rsmIWY=";
+    hash = "sha256-KgkXOWnKjnG3qHJN+NxHxeqEo+zVrWtWP0l3Lmn+NtI=";
   };
 
   pythonRelaxDeps = [ "tenacity" ];
@@ -54,6 +52,7 @@ buildPythonPackage rec {
     pytest-cov-stub
     pytest-timeout
     pytestCheckHook
+    python-jsonpath
     respx
     syrupy
   ];

From 9f34c83f272d6ec392a1c3dc1ebeb41f36fea2f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 09:36:36 -0700
Subject: [PATCH 4385/6226] python3Packages.denonavr: 1.1.2 -> 1.2.0

Diff: https://github.com/ol-iver/denonavr/compare/1.1.2...1.2.0

Changelog: https://github.com/ol-iver/denonavr/releases/tag/1.2.0
---
 pkgs/development/python-modules/denonavr/default.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/denonavr/default.nix b/pkgs/development/python-modules/denonavr/default.nix
index 957cce7a860d..b1b338c707c6 100644
--- a/pkgs/development/python-modules/denonavr/default.nix
+++ b/pkgs/development/python-modules/denonavr/default.nix
@@ -19,18 +19,16 @@
 
 buildPythonPackage rec {
   pname = "denonavr";
-  version = "1.1.2";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ol-iver";
     repo = "denonavr";
     tag = version;
-    hash = "sha256-r8Gg7mZwEiSq1iFQJXLb9xCb/iYxTbaCKGBH2EDZQqs=";
+    hash = "sha256-/GhlSZhl4VAl0em3QLolSRS0wZQeOhhF+B/91ohqVPw=";
   };
 
-  pythonRelaxDeps = [ "defusedxml" ];
-
   build-system = [ setuptools ];
 
   dependencies = [
@@ -52,11 +50,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "denonavr" ];
 
-  meta = with lib; {
+  meta = {
     description = "Automation Library for Denon AVR receivers";
     homepage = "https://github.com/ol-iver/denonavr";
     changelog = "https://github.com/ol-iver/denonavr/releases/tag/${src.tag}";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }

From 5382a79cf9f974525a26527c00c07073bede8d61 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 16:41:46 +0000
Subject: [PATCH 4386/6226] python3Packages.dashscope: 1.24.7 -> 1.24.9

---
 pkgs/development/python-modules/dashscope/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dashscope/default.nix b/pkgs/development/python-modules/dashscope/default.nix
index 8739c4c9cc25..eafc7554d17f 100644
--- a/pkgs/development/python-modules/dashscope/default.nix
+++ b/pkgs/development/python-modules/dashscope/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "dashscope";
-  version = "1.24.7";
+  version = "1.24.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dashscope";
     repo = "dashscope-sdk-python";
     tag = "v${version}";
-    hash = "sha256-Hss6kCE8lkstRZlFX9V+q91N2Zcp0aVbx89WpBR2uC4=";
+    hash = "sha256-Mb36V0yGYPblNXnAYa24yd7YJXsjWTErl+VVvBTZ1j8=";
   };
 
   build-system = [ setuptools ];

From 5317c870cc937e2e3700ba571d69972d0d769690 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 09:43:35 -0700
Subject: [PATCH 4387/6226] python3Packages.snowflake-connector-python: unpin
 cffi

---
 .../python-modules/snowflake-connector-python/default.nix        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix
index c0f0b7773b8b..19e472e14af2 100644
--- a/pkgs/development/python-modules/snowflake-connector-python/default.nix
+++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix
@@ -72,6 +72,7 @@ buildPythonPackage rec {
   ];
 
   pythonRelaxDeps = [
+    "cffi"
     "pyopenssl"
   ];
 

From cb1aa5dae77645f85e40ac09e42148064dcc8e56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 16:46:09 +0000
Subject: [PATCH 4388/6226] python3Packages.stringzilla: 4.2.2 -> 4.2.3

---
 pkgs/development/python-modules/stringzilla/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/stringzilla/default.nix b/pkgs/development/python-modules/stringzilla/default.nix
index 131ce9ae00c6..6cdac52a6c74 100644
--- a/pkgs/development/python-modules/stringzilla/default.nix
+++ b/pkgs/development/python-modules/stringzilla/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "stringzilla";
-  version = "4.2.2";
+  version = "4.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ashvardanian";
     repo = "stringzilla";
     tag = "v${version}";
-    hash = "sha256-J1k8gYPStnnXHFvbHG6nHuQMQy1+XSiS5ERk/reL/Z4=";
+    hash = "sha256-QxdiGqVz/3dNHlkilbf/CZ/QB2iPEBYS4hkrQusad2c=";
   };
 
   build-system = [

From 9178a47bacab7b7a0480268b048b87cbef207f28 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 16:52:56 +0000
Subject: [PATCH 4389/6226] probe-rs-tools: 0.29.1 -> 0.30.0

---
 pkgs/by-name/pr/probe-rs-tools/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/probe-rs-tools/package.nix b/pkgs/by-name/pr/probe-rs-tools/package.nix
index 25a9ad55f84f..5f4f74aabfde 100644
--- a/pkgs/by-name/pr/probe-rs-tools/package.nix
+++ b/pkgs/by-name/pr/probe-rs-tools/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "probe-rs-tools";
-  version = "0.29.1";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "probe-rs";
     repo = "probe-rs";
     tag = "v${version}";
-    hash = "sha256-/gP9abygktYSzg/054o1PEcQywiPFTtKNdUdI3hCYyc=";
+    hash = "sha256-3tVCsMXrNTFhTQit4PNTXtHOXq8GSEWdLBJ9iqtgWyQ=";
   };
 
-  cargoHash = "sha256-txHl0+HDCVdmbZppGsFqPjsEbPBCJVEB3XZWZJBBoOk=";
+  cargoHash = "sha256-CL+aTPllQqa22ENU2FWhBMSe0Mf1MAfemytIiqf0bHk=";
 
   buildAndTestSubdir = pname;
 

From 7a19eee1bec729b87e5a563f9187c18b3b3eaa1e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 17:05:44 +0000
Subject: [PATCH 4390/6226] models-dev: 0-unstable-2025-10-30 ->
 0-unstable-2025-10-31

---
 pkgs/by-name/mo/models-dev/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index edcb0195cebd..b412839c20ee 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -8,12 +8,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "models-dev";
-  version = "0-unstable-2025-10-30";
+  version = "0-unstable-2025-10-31";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "b97ee9233088cb71668ee91a679d41b36ffae312";
-    hash = "sha256-uN9hCqzELCpOLRtNqp5M/80pHqo2zmdXXfnqVqdIAjY=";
+    rev = "91a03818a6eb45508d042c91cb4cf21a331296f1";
+    hash = "sha256-cjyGeTLfv8CpW8OuyPDG3KKYJ6N7u2EUhMFTGTGOIPM=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From 610b963008cd0bafbd15be3fef6f655044bd7ec9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 17:10:53 +0000
Subject: [PATCH 4391/6226] grafanaPlugins.volkovlabs-echarts-panel: 7.1.0 ->
 7.2.2

---
 .../grafana/plugins/volkovlabs-echarts-panel/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix
index ef4dc23cd78f..39e53f921201 100644
--- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-echarts-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "volkovlabs-echarts-panel";
-  version = "7.1.0";
-  zipHash = "sha256-J4FhMh50+zcBpURQgIoVZQxQaNy0oYk/7SbIqQjkEyA=";
+  version = "7.2.2";
+  zipHash = "sha256-4y7L8SSqjtQ2bk+v8FeZsZ8gTd9qnBvi2F9cNLPjKGE=";
   meta = with lib; {
     description = "Visualization panel for Grafana that allows you to incorporate the popular Apache ECharts library into your Grafana dashboard";
     license = licenses.asl20;

From cd43c0935f64bd4c3f3b2f98b4b01de1510683a6 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 31 Oct 2025 14:12:56 -0300
Subject: [PATCH 4392/6226] microsoft-edge: 141.0.3537.99 -> 142.0.3595.53

---
 pkgs/by-name/mi/microsoft-edge/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix
index e80f99193251..bd98470847ec 100644
--- a/pkgs/by-name/mi/microsoft-edge/package.nix
+++ b/pkgs/by-name/mi/microsoft-edge/package.nix
@@ -162,11 +162,11 @@ let
 in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "microsoft-edge";
-  version = "141.0.3537.99";
+  version = "142.0.3595.53";
 
   src = fetchurl {
     url = "https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-stable/microsoft-edge-stable_${finalAttrs.version}-1_amd64.deb";
-    hash = "sha256-XMFAHCa7gGsSu9nFXkgvYX+CMY9nFgQEJLNKf+TodRw=";
+    hash = "sha256-cSSKWxIkQe8jrv7gL5lX2Cs9roU8eD2MIHuLGQMnycM=";
   };
 
   # With strictDeps on, some shebangs were not being patched correctly

From f2633f428b8a365514b7d9a9528710f4b01ca464 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 17:30:57 +0000
Subject: [PATCH 4393/6226] keychain: 2.9.6 -> 2.9.7

---
 pkgs/by-name/ke/keychain/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ke/keychain/package.nix b/pkgs/by-name/ke/keychain/package.nix
index 59a718a4f37f..35523f15ab94 100644
--- a/pkgs/by-name/ke/keychain/package.nix
+++ b/pkgs/by-name/ke/keychain/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "keychain";
-  version = "2.9.6";
+  version = "2.9.7";
 
   src = fetchFromGitHub {
     owner = "funtoo";
     repo = "keychain";
     rev = version;
-    sha256 = "sha256-R70W8/tE4suGgiSqkJ1RJ0fJ3C+exdoVesXtvxPORVo=";
+    sha256 = "sha256-/8OY/URIhVl8bTlJPRGidExHzkwzckm/v3QUq7Fxe04=";
   };
 
   nativeBuildInputs = [

From 87dd81bd93422ccf2139ff52e1a7b9d868235b7a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 17:54:58 +0000
Subject: [PATCH 4394/6226] python3Packages.faster-whisper: 1.2.0 -> 1.2.1

---
 pkgs/development/python-modules/faster-whisper/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/faster-whisper/default.nix b/pkgs/development/python-modules/faster-whisper/default.nix
index 86fd907cc6c8..babb0f44cc68 100644
--- a/pkgs/development/python-modules/faster-whisper/default.nix
+++ b/pkgs/development/python-modules/faster-whisper/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "faster-whisper";
-  version = "1.2.0";
+  version = "1.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SYSTRAN";
     repo = "faster-whisper";
     tag = "v${version}";
-    hash = "sha256-kv2pLszImGzrPI0q2eglX//BMrj2pF0oMHnZ+7VKrHI=";
+    hash = "sha256-pWVYxC1h0kIhhBxAt9oT2USuvoarlcwwYmaLUJlZZwY=";
   };
 
   build-system = [

From 26d4980f85e2ed39e0f55708452c72d058e303f7 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Fri, 31 Oct 2025 19:02:31 +0100
Subject: [PATCH 4395/6226] electron: update.py: add --force parameter

---
 pkgs/development/tools/electron/update.py | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/tools/electron/update.py b/pkgs/development/tools/electron/update.py
index 94ba8eca4fa7..2ae0c2e4664d 100755
--- a/pkgs/development/tools/electron/update.py
+++ b/pkgs/development/tools/electron/update.py
@@ -17,7 +17,8 @@ to specify the major release to be updated.
 The `update-all command updates all non-eol major releases.
 
 The `update` and `update-all` commands accept an optional `--commit`
-flag to automatically commit the changes for you.
+flag to automatically commit the changes for you, and `--force` to
+skip the up-to-date version check.
 """
 import base64
 import json
@@ -178,12 +179,13 @@ def non_eol_releases(releases: Iterable[int]) -> Iterable[int]:
     return tuple(filter(lambda x: x in supported_version_range(), releases))
 
 
-def update_source(version: str, commit: bool) -> None:
+def update_source(version: str, commit: bool, force: bool) -> None:
     """Update a given electron-source release
 
     Args:
         version: The major version number, e.g. '27'
         commit: Whether the updater should commit the result
+        force: Whether to fetch even when the version is already up-to-date
     """
     major_version = version
 
@@ -198,7 +200,7 @@ def update_source(version: str, commit: bool) -> None:
     )
 
     m, rev = get_latest_version(major_version)
-    if old_version == m["version"]:
+    if old_version == m["version"] and not force:
         print(f"{package_name} is up-to-date")
         return
 
@@ -222,13 +224,15 @@ def cli() -> None:
 @cli.command("update", help="Update a single major release")
 @click.option("-v", "--version", required=True, type=str, help="The major version, e.g. '23'")
 @click.option("-c", "--commit", is_flag=True, default=False, help="Commit the result")
-def update(version: str, commit: bool) -> None:
-    update_source(version, commit)
+@click.option("-f", "--force", is_flag=True, default=False, help="Skip up-to-date version check")
+def update(version: str, commit: bool, force: bool) -> None:
+    update_source(version, commit, force)
 
 
 @cli.command("update-all", help="Update all releases at once")
 @click.option("-c", "--commit", is_flag=True, default=False, help="Commit the result")
-def update_all(commit: bool) -> None:
+@click.option("-f", "--force", is_flag=True, default=False, help="Skip up-to-date version check")
+def update_all(commit: bool, force: bool) -> None:
     """Update all eletron-source releases at once
 
     Args:
@@ -239,7 +243,7 @@ def update_all(commit: bool) -> None:
     filtered_releases = non_eol_releases(tuple(map(lambda x: int(x), old_info.keys())))
 
     for major_version in filtered_releases:
-        update_source(str(major_version), commit)
+        update_source(str(major_version), commit, force)
 
 
 if __name__ == "__main__":

From 06ef7e2585aa3808f05eb9b794168cf6b7a76236 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 18:04:19 +0000
Subject: [PATCH 4396/6226] melonDS: 1.0-unstable-2025-10-27 ->
 1.0-unstable-2025-10-30

---
 pkgs/by-name/me/melonDS/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix
index fcfe24412e90..987d7c0b9f53 100644
--- a/pkgs/by-name/me/melonDS/package.nix
+++ b/pkgs/by-name/me/melonDS/package.nix
@@ -29,13 +29,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "melonDS";
-  version = "1.0-unstable-2025-10-27";
+  version = "1.0-unstable-2025-10-30";
 
   src = fetchFromGitHub {
     owner = "melonDS-emu";
     repo = "melonDS";
-    rev = "1588f0b69b024523b48ad0276d4792b8eafbcc40";
-    hash = "sha256-ytrgqLUrOFfac44KUTnxputPU7OjcpCpHKLNqBnXlOY=";
+    rev = "8a1ef8e30d6c1c2f2b0c9151b74e427dcf112a7a";
+    hash = "sha256-yf5xSXxWeIBDJ1UHJSY2grAQr6by/KU6Lj61nFR9E9Y=";
   };
 
   patches = [ ./fix-build-qt-6.10.patch ];

From 5d29c1d402c75695e899eb0f36c9e3b8b608a505 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 18:08:08 +0000
Subject: [PATCH 4397/6226] python3Packages.python-toolbox: 1.2.8 -> 1.2.9

---
 pkgs/development/python-modules/python-toolbox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-toolbox/default.nix b/pkgs/development/python-modules/python-toolbox/default.nix
index 358037d3c8eb..af5ffe828be8 100644
--- a/pkgs/development/python-modules/python-toolbox/default.nix
+++ b/pkgs/development/python-modules/python-toolbox/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "python-toolbox";
-  version = "1.2.8";
+  version = "1.2.9";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "cool-RR";
     repo = "python_toolbox";
     tag = version;
-    hash = "sha256-jP7umFVyt7myF9SwV8b+shh6ZDwVDCZKlF+6zMkR3+M=";
+    hash = "sha256-qzzFgP5dTw4qSxovnmrSgGkW0AQw/tNOy2TbE/7wqxI=";
   };
 
   build-system = [ setuptools ];

From ba9424227b9aa7c72e51bdc999459184698bc93c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 18:11:58 +0000
Subject: [PATCH 4398/6226] ipxe: 1.21.1-unstable-2025-10-28 ->
 1.21.1-unstable-2025-10-29

---
 pkgs/by-name/ip/ipxe/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix
index e067b5764229..106b0c87069e 100644
--- a/pkgs/by-name/ip/ipxe/package.nix
+++ b/pkgs/by-name/ip/ipxe/package.nix
@@ -48,7 +48,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ipxe";
-  version = "1.21.1-unstable-2025-10-28";
+  version = "1.21.1-unstable-2025-10-29";
 
   nativeBuildInputs = [
     mtools
@@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ipxe";
     repo = "ipxe";
-    rev = "0336e2987c3e671298af8c2817ec17aa67e98065";
-    hash = "sha256-janNModKaSeKuGd+zeJrJlowNAR97/hrUbj5TGlpV7I=";
+    rev = "fde35ff003a610eca04db0e11fb81e8dfee8a681";
+    hash = "sha256-wDdqP+EgZqAx+44oy/2x36ZuDJPbTSiiztAISbaVi3o=";
   };
 
   # Calling syslinux on a FAT image isn't going to work on Aarch64.

From bac0ad4b1824287e0346dc2d2b84d9937af6d595 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Fri, 31 Oct 2025 11:14:54 -0700
Subject: [PATCH 4399/6226] python3Packages.google-auth-oauthlib: 1.2.2 ->
 1.2.3

changelog: https://github.com/googleapis/google-auth-library-python-oauthlib/releases/tag/v1.2.3
---
 .../python-modules/google-auth-oauthlib/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/google-auth-oauthlib/default.nix b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
index b66e813e9dce..d62b2797bb78 100644
--- a/pkgs/development/python-modules/google-auth-oauthlib/default.nix
+++ b/pkgs/development/python-modules/google-auth-oauthlib/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-auth-oauthlib";
-  version = "1.2.2";
+  version = "1.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "googleapis";
     repo = "google-auth-library-python-oauthlib";
-    rev = "v${version}";
-    sha256 = "sha256-nkXS1vNsq7k30EmNHclRblsmGTMYuIAaHuaVDORqRmc=";
+    tag = "v${version}";
+    hash = "sha256-1BBtEZfCVTLnbIJQV2o0uXNuAic/ArmgHoAIIJVKRrg=";
   };
 
   build-system = [ setuptools ];

From 7ced918e6a81ca5fca1b0ee9e7f67d13492ec0a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 18:28:33 +0000
Subject: [PATCH 4400/6226] enzyme: 0.0.204 -> 0.0.206

---
 pkgs/by-name/en/enzyme/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix
index 8ee122dc321b..bf9d31ce1c5e 100644
--- a/pkgs/by-name/en/enzyme/package.nix
+++ b/pkgs/by-name/en/enzyme/package.nix
@@ -7,13 +7,13 @@
 }:
 llvmPackages.stdenv.mkDerivation rec {
   pname = "enzyme";
-  version = "0.0.204";
+  version = "0.0.206";
 
   src = fetchFromGitHub {
     owner = "EnzymeAD";
     repo = "Enzyme";
     rev = "v${version}";
-    hash = "sha256-s5gddwMq2S4m+OtX9FHWqHTa8GaVXQm+08qRI+dGENA=";
+    hash = "sha256-eTRdigqNxCI9HvmKpFZUOWq6tHfldJoeNdmtd+i3aZU=";
   };
 
   postPatch = ''

From c9a798a92686d58a7fefe3b09050dd18b790e59a Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Wed, 29 Oct 2025 17:27:01 +0100
Subject: [PATCH 4401/6226] ethersync: 0.8.0 -> teamtype: 0.9.0; update editor
 plugins

ethersync was renamed to teamtype

Changelog: https://github.com/teamtype/teamtype/releases/tag/v0.9.0
Diff: https://github.com/teamtype/teamtype/compare/v0.8.0...v0.9.0

update editor plugins as well
---
 .../editors/vim/plugins/aliases.nix           |  1 +
 .../{ethersync => teamtype}/default.nix       |  4 +-
 .../editors/vscode/extensions/default.nix     |  2 +-
 .../default.nix                               | 12 ++--
 pkgs/by-name/et/ethersync/package.nix         | 42 --------------
 pkgs/by-name/te/teamtype/package.nix          | 58 +++++++++++++++++++
 pkgs/top-level/aliases.nix                    |  1 +
 7 files changed, 69 insertions(+), 51 deletions(-)
 rename pkgs/applications/editors/vim/plugins/non-generated/{ethersync => teamtype}/default.nix (79%)
 rename pkgs/applications/editors/vscode/extensions/{ethersync.ethersync => teamtype.teamtype}/default.nix (60%)
 delete mode 100644 pkgs/by-name/et/ethersync/package.nix
 create mode 100644 pkgs/by-name/te/teamtype/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix
index 454b0496e86d..8a5ec6b533fe 100644
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
@@ -73,6 +73,7 @@ mapAliases (
     easymotion = vim-easymotion;
     echodoc = echodoc-vim;
     eighties = vim-eighties;
+    ethersync = teamtype;
     extradite = vim-extradite;
     feline-nvim = throw "feline.nvim has been removed: upstream deleted repository. Consider using lualine"; # Added 2025-02-09
     fugitive = vim-fugitive;
diff --git a/pkgs/applications/editors/vim/plugins/non-generated/ethersync/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/teamtype/default.nix
similarity index 79%
rename from pkgs/applications/editors/vim/plugins/non-generated/ethersync/default.nix
rename to pkgs/applications/editors/vim/plugins/non-generated/teamtype/default.nix
index 8e6f58e1a105..7c29c2d21447 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/ethersync/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/teamtype/default.nix
@@ -1,9 +1,9 @@
 {
   vimUtils,
-  ethersync,
+  teamtype,
 }:
 vimUtils.buildVimPlugin rec {
-  inherit (ethersync)
+  inherit (teamtype)
     pname
     version
     src
diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 8c508700e94d..9e2cd3c59059 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1617,7 +1617,7 @@ let
         };
       };
 
-      ethersync.ethersync = callPackage ./ethersync.ethersync { };
+      teamtype.teamtype = callPackage ./teamtype.teamtype { };
 
       eugleo.magic-racket = callPackage ./eugleo.magic-racket { };
 
diff --git a/pkgs/applications/editors/vscode/extensions/ethersync.ethersync/default.nix b/pkgs/applications/editors/vscode/extensions/teamtype.teamtype/default.nix
similarity index 60%
rename from pkgs/applications/editors/vscode/extensions/ethersync.ethersync/default.nix
rename to pkgs/applications/editors/vscode/extensions/teamtype.teamtype/default.nix
index b359b9c74088..67356471a408 100644
--- a/pkgs/applications/editors/vscode/extensions/ethersync.ethersync/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/teamtype.teamtype/default.nix
@@ -5,16 +5,16 @@
 
 vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
-    publisher = "ethersync";
-    name = "ethersync";
-    version = "0.6.0";
-    hash = "sha256-KuidePUxQ+FhnIGTUf6i+WxBQfbQVlq68xbuOeEouIE=";
+    publisher = "teamtype";
+    name = "teamtype";
+    version = "0.8.0";
+    hash = "sha256-p9bynTMmCn6pu7SVEABeSawv9VjWpE8KecQOeIsE/LE=";
   };
 
   meta = {
     description = "Extension for real-time co-editing of local text files";
-    downloadPage = "https://marketplace.visualstudio.com/items?itemName=ethersync.ethersync";
-    homepage = "https://github.com/ethersync/ethersync/tree/main/vscode-plugin";
+    downloadPage = "https://marketplace.visualstudio.com/items?itemName=teamtype.teamtype";
+    homepage = "https://github.com/teamtype/teamtype/tree/main/vscode-plugin";
     license = lib.licenses.agpl3Plus;
     maintainers = [ lib.maintainers.ethancedwards8 ];
     teams = [ lib.teams.ngi ];
diff --git a/pkgs/by-name/et/ethersync/package.nix b/pkgs/by-name/et/ethersync/package.nix
deleted file mode 100644
index d33aac2b7f3a..000000000000
--- a/pkgs/by-name/et/ethersync/package.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  fetchFromGitHub,
-  lib,
-  rustPlatform,
-  versionCheckHook,
-  nix-update-script,
-}:
-
-rustPlatform.buildRustPackage (finalAttrs: {
-  pname = "ethersync";
-  version = "0.8.0";
-
-  src = fetchFromGitHub {
-    owner = "ethersync";
-    repo = "ethersync";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-GPZD/TshZMr+WeCd4WRN/Ewu7zINSzPNPci52bjsV3E=";
-  };
-
-  sourceRoot = "${finalAttrs.src.name}/daemon";
-
-  cargoHash = "sha256-F2wVRha63TOdMCWW3KNaQ8kbYjuYbdY5yKmTHOJqODA=";
-
-  nativeInstallCheckInputs = [ versionCheckHook ];
-  versionCheckProgramArg = "--version";
-  doInstallCheck = true;
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Real-time co-editing of local text files";
-    homepage = "https://ethersync.github.io/ethersync/";
-    downloadPage = "https://github.com/ethersync/ethersync";
-    changelog = "https://github.com/ethersync/ethersync/blob/${finalAttrs.src.tag}/CHANGELOG.md";
-    license = lib.licenses.agpl3Plus;
-    teams = [ lib.teams.ngi ];
-    maintainers = with lib.maintainers; [
-      prince213
-      ethancedwards8
-    ];
-  };
-})
diff --git a/pkgs/by-name/te/teamtype/package.nix b/pkgs/by-name/te/teamtype/package.nix
new file mode 100644
index 000000000000..8ef60ecc8cfd
--- /dev/null
+++ b/pkgs/by-name/te/teamtype/package.nix
@@ -0,0 +1,58 @@
+{
+  fetchFromGitHub,
+  lib,
+  rustPlatform,
+  versionCheckHook,
+  installShellFiles,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "teamtype";
+  version = "0.9.0";
+
+  src = fetchFromGitHub {
+    owner = "teamtype";
+    repo = "teamtype";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-B/4xR16cEG90fK12XQqjlpWzd6tyUVYXOBXK0j5fvNU=";
+  };
+
+  sourceRoot = "${finalAttrs.src.name}/daemon";
+
+  cargoHash = "sha256-yuAk4SqYzNK1gD6lqVVDOyAJNq/NIf44DWdZ3aM/Q8s=";
+
+  nativeBuildInputs = [ installShellFiles ];
+
+  postInstall = ''
+    installManPage \
+      target/manpages/teamtype.1 \
+      target/manpages/teamtype-client.1 \
+      target/manpages/teamtype-join.1 \
+      target/manpages/teamtype-share.1
+
+    installShellCompletion --bash target/completions/teamtype.bash
+    installShellCompletion --zsh target/completions/_teamtype
+    installShellCompletion --fish target/completions/teamtype.fish
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Real-time co-editing of local text files";
+    homepage = "https://teamtype.github.io/teamtype/";
+    downloadPage = "https://github.com/teamtype/teamtype";
+    changelog = "https://github.com/teamtype/teamtype/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = lib.licenses.agpl3Plus;
+    mainProgram = "teamtype";
+    teams = [ lib.teams.ngi ];
+    maintainers = with lib.maintainers; [
+      prince213
+      ethancedwards8
+    ];
+  };
+})
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index c43b9d8748f9..56e5e5bf3fde 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -530,6 +530,7 @@ mapAliases {
   eris-go = throw "'eris-go' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   eriscmd = throw "'eriscmd' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   erlang-ls = throw "'erlang-ls' has been removed as it has been archived upstream. Consider using 'erlang-language-platform' instead"; # Added 2025-10-02
+  ethersync = teamtype; # Added 2025-10-31
   eww-wayland = throw "'eww-wayland' has been renamed to/replaced by 'eww'"; # Converted to throw 2025-10-27
   f3d_egl = warnAlias "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # added 2025-07-18
   fastnlo_toolkit = throw "'fastnlo_toolkit' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2025-10-27

From 9a1074994de93b369472e944670de28d846f4882 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 18:34:20 +0000
Subject: [PATCH 4402/6226] libyang: 3.13.5 -> 3.13.6

---
 pkgs/by-name/li/libyang/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libyang/package.nix b/pkgs/by-name/li/libyang/package.nix
index 5d474a6f919b..e71823151a31 100644
--- a/pkgs/by-name/li/libyang/package.nix
+++ b/pkgs/by-name/li/libyang/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libyang";
-  version = "3.13.5";
+  version = "3.13.6";
 
   src = fetchFromGitHub {
     owner = "CESNET";
     repo = "libyang";
     rev = "v${version}";
-    hash = "sha256-yO2gk8l+NY++PHsUBawItCtDXgBBd561xnyJcjtjd/g=";
+    hash = "sha256-rc/WdBCVZDwensqnVMrQXCPevLg0INidzN9Qwhqw2Mk=";
   };
 
   outputs = [

From 5c553e292e8a10d5966a7f5c7359ef168e0d460b Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Wed, 29 Oct 2025 23:28:14 +0100
Subject: [PATCH 4403/6226] postgresql: expose callPackage

---
 pkgs/servers/sql/postgresql/ext.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/servers/sql/postgresql/ext.nix b/pkgs/servers/sql/postgresql/ext.nix
index 0fe5c4b5e734..1be386255117 100644
--- a/pkgs/servers/sql/postgresql/ext.nix
+++ b/pkgs/servers/sql/postgresql/ext.nix
@@ -7,6 +7,8 @@ in
   directory = ./ext;
 })
 // {
+  inherit (super) callPackage;
+
   timescaledb-apache = super.callPackage ./ext/timescaledb.nix { enableUnfree = false; };
 }
 // lib.optionalAttrs (!self.perlSupport) {

From 30ba7d34a2c382ae2a9866bb72b06f27147db124 Mon Sep 17 00:00:00 2001
From: Augustin Trancart <augustin.trancart@gmail.com>
Date: Fri, 31 Oct 2025 08:27:53 +0100
Subject: [PATCH 4404/6226] postgresql: document the use of callPackage

---
 .../modules/services/databases/postgresql.md  | 54 +++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md
index 6b95478c70f2..af10dace3086 100644
--- a/nixos/modules/services/databases/postgresql.md
+++ b/nixos/modules/services/databases/postgresql.md
@@ -354,6 +354,60 @@ self: super: {
 }
 ```
 
+You can add a custom PostgreSQL extension to an environment by calling `postgresqlPackages.callPackage` on the derivation.
+In addition to the correct `postgresql` package, `callPackage` will provide additional functions to build those extensions:
+
+- `postgresqlBuildExtension`, extending `mkDerivation` for C and SQL extensions.
+- `buildPgrxExtension`, extending `mkDerivation` for pgrx (Rust) extensions.
+- `postgresqlTestExtension`, a helper to test these extensions on a PostgreSQL instance.
+
+We can define our extension as such:
+
+```nix
+# my-extension.nix
+{
+  postgresql,
+  postgresqlBuildExtension,
+  # other regular mkDerivation arguments
+  fetchFromGitHub,
+}:
+postgresqlBuildExtension (finalAttrs: {
+  pname = "myext";
+  # ...
+  src = fetchFromGitHub {
+    # ...
+  };
+  meta = {
+    platforms = postgresql.meta.platforms;
+    # other meta properties
+  };
+})
+```
+
+We can then build it with `callPackage`, for instance in a NixOS config:
+
+```nix
+{
+  services.postgresql.extensions =
+    ps: with ps; [
+      pg_repack
+      postgis
+      (ps.callPackage ./my-extension.nix { })
+    ];
+}
+```
+Or to include it in a shell environment:
+
+```nix
+{
+  postgresql_custom = self.postgresql_17.withPackages (ps: [
+    ps.pg_repack
+    ps.postgis
+    (ps.callPackage ./my-extension.nix { })
+  ]);
+}
+```
+
 ## Procedural Languages {#module-services-postgres-pls}
 
 PostgreSQL ships the additional procedural languages PL/Perl, PL/Python and PL/Tcl as extensions.

From 00b6cb2739aaabc1263194d5fe81a707a496aed7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 18:50:05 +0000
Subject: [PATCH 4405/6226] cnquery: 12.7.0 -> 12.7.1

---
 pkgs/by-name/cn/cnquery/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix
index 090061be06b7..ad7293fc72c1 100644
--- a/pkgs/by-name/cn/cnquery/package.nix
+++ b/pkgs/by-name/cn/cnquery/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "cnquery";
-  version = "12.7.0";
+  version = "12.7.1";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnquery";
     tag = "v${version}";
-    hash = "sha256-l4pMVg9ScLXccw4i7DJPWkdRhzU6REqxP/6U9/F3vTE=";
+    hash = "sha256-LYEMJ1G+zr0LIeLGlWkoAEu+nwVrDrREBSwVH3BlIsE=";
   };
 
   subPackages = [ "apps/cnquery" ];

From 25a6f9bfc3b9cb60312b545490f4059ebfc6947d Mon Sep 17 00:00:00 2001
From: Johan Larsson <jolars@posteo.com>
Date: Fri, 31 Oct 2025 16:44:30 +0100
Subject: [PATCH 4406/6226] tomat: init at 2.3.0

Init tomat at 2.3.0 (https://github.com/jolars/tomat). This is a
server-client application that feeds information to status bars like
waybar and i3status-rust.
---
 pkgs/by-name/to/tomat/package.nix | 46 +++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)
 create mode 100644 pkgs/by-name/to/tomat/package.nix

diff --git a/pkgs/by-name/to/tomat/package.nix b/pkgs/by-name/to/tomat/package.nix
new file mode 100644
index 000000000000..b08eed1802e9
--- /dev/null
+++ b/pkgs/by-name/to/tomat/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  alsa-lib,
+}:
+
+rustPlatform.buildRustPackage rec {
+  pname = "tomat";
+  version = "2.3.0";
+
+  src = fetchFromGitHub {
+    owner = "jolars";
+    repo = "tomat";
+    tag = "v${version}";
+    hash = "sha256-lkNBcTn7uXWifIVNoXmggPy+UjozL5YqVYorH9XAejo=";
+  };
+
+  cargoHash = "sha256-jBpZyNfsJKchJnKwWJQeVavj0Yog83QrCM8kOJFVugg=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    alsa-lib
+  ];
+
+  checkFlags = [
+    # Skip tests that require access to file system locations not available during Nix builds
+    "--skip=timer::tests::test_icon_path_creation"
+    "--skip=timer::tests::test_notification_icon_config"
+    "--skip=integration::"
+  ];
+
+  meta = {
+    description = "Pomodoro timer for status bars";
+    homepage = "https://github.com/jolars/tomat";
+    changelog = "https://github.com/jolars/tomat/blob/${src.rev}/CHANGELOG.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ jolars ];
+    mainProgram = "tomat";
+    platforms = lib.platforms.linux;
+  };
+}

From 11749394dfc69a6c5843fd30e749161a3ff20f86 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 31 Oct 2025 20:03:17 +0100
Subject: [PATCH 4407/6226] ci/eval: avoid passing args around

There is no point in passing these arguments around between all the
different parts of the eval chain - these global settings should surely
not be modified between different steps.

This also makes it simpler to add new arguments like extra nixpkgs
configuration.
---
 ci/eval/default.nix | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 75b2eb9cba5d..23a2d4cb4f72 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -19,6 +19,15 @@
   nix,
 }:
 
+{
+  # The number of attributes per chunk, see ./README.md for more info.
+  chunkSize ? 5000,
+  # Whether to just evaluate a single chunk for quick testing
+  quickTest ? false,
+  # Don't try to eval packages marked as broken.
+  includeBroken ? false,
+}:
+
 let
   nixpkgs =
     with lib.fileset;
@@ -79,13 +88,6 @@ let
       evalSystem ? builtins.currentSystem,
       # The path to the `paths.json` file from `attrpathsSuperset`
       attrpathFile ? "${attrpathsSuperset { inherit evalSystem; }}/paths.json",
-      # The number of attributes per chunk, see ./README.md for more info.
-      chunkSize ? 5000,
-
-      # Don't try to eval packages marked as broken.
-      includeBroken ? false,
-      # Whether to just evaluate a single chunk for quick testing
-      quickTest ? false,
     }:
     let
       singleChunk = writeShellScript "single-chunk" ''
@@ -259,16 +261,13 @@ let
     {
       # Whether to evaluate on a specific set of systems, by default all are evaluated
       evalSystems ? if quickTest then [ "x86_64-linux" ] else supportedSystems,
-      # The number of attributes per chunk, see ./README.md for more info.
-      chunkSize ? 5000,
-      quickTest ? false,
     }:
     symlinkJoin {
       name = "nixpkgs-eval-baseline";
       paths = map (
         evalSystem:
         singleSystem {
-          inherit quickTest evalSystem chunkSize;
+          inherit evalSystem;
         }
       ) evalSystems;
     };
@@ -277,9 +276,6 @@ let
     {
       # Whether to evaluate on a specific set of systems, by default all are evaluated
       evalSystems ? if quickTest then [ "x86_64-linux" ] else supportedSystems,
-      # The number of attributes per chunk, see ./README.md for more info.
-      chunkSize ? 5000,
-      quickTest ? false,
       baseline,
       # Which maintainer should be considered the author?
       # Defaults to nixpkgs-ci which is not a maintainer and skips the check.
@@ -300,7 +296,7 @@ let
             inherit evalSystem;
             beforeDir = baseline;
             afterDir = singleSystem {
-              inherit quickTest evalSystem chunkSize;
+              inherit evalSystem;
             };
           }
         ) evalSystems;

From 65fbb0b968c5878c684c36be4da79604d83a1e40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 19:04:37 +0000
Subject: [PATCH 4408/6226] python3Packages.granian: 2.5.5 -> 2.5.6

---
 pkgs/development/python-modules/granian/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/granian/default.nix b/pkgs/development/python-modules/granian/default.nix
index 554bf9e0d676..5bbceb734299 100644
--- a/pkgs/development/python-modules/granian/default.nix
+++ b/pkgs/development/python-modules/granian/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "granian";
-  version = "2.5.5";
+  version = "2.5.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "emmett-framework";
     repo = "granian";
     tag = "v${version}";
-    hash = "sha256-+KHszcVpfa3FiWUlSQxHDqxnd/ezWdWt430ULW2+83g=";
+    hash = "sha256-XSDBSl7QWqIN5u48z4H5yPHR+ltRmmmrP0JSmvcCcsA=";
   };
 
   # Granian forces a custom allocator for all the things it runs,
@@ -39,7 +39,7 @@ buildPythonPackage rec {
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-kul1U002f154ghMqeVuuqizVx2LtIyCkmAA08KyjW3U=";
+    hash = "sha256-zQAHJcBWNx5IT/t2wtm7UeOfVNnvfowcp137TePnwiM=";
   };
 
   nativeBuildInputs = with rustPlatform; [

From a366e979b2389c1b55ce84183c4285e2651402a5 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Fri, 31 Oct 2025 20:07:29 +0100
Subject: [PATCH 4409/6226] element-desktop: 1.12.1 -> 1.12.2

Release notes: https://github.com/element-hq/element-desktop/releases/tag/v1.12.2
Full changelog: https://github.com/element-hq/element-desktop/compare/v1.12.1...v1.12.2
---
 pkgs/by-name/el/element-desktop/element-desktop-pin.nix   | 6 +++---
 pkgs/by-name/el/element-desktop/yarn.nix                  | 6 ++++++
 pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix | 6 +++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
index b113722a0d9a..c3c1b7005e3c 100644
--- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
+++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.12.1";
+  "version" = "1.12.2";
   "hashes" = {
-    "desktopSrcHash" = "sha256-4C4WJ3HjiXh24umt80lWujeiDvRaS1mf2IjCj6+n87U=";
-    "desktopYarnHash" = "sha256-CyP0zy/nJoGolmB/p81jL0qAoD7d5xe5kvlmKW7Yaw8=";
+    "desktopSrcHash" = "sha256-P/pQpI3kyWGGZo1CK0nnkcg52jlVMrhGh8EFWWn0Euc=";
+    "desktopYarnHash" = "sha256-M6vz2u7MQuMW1ag3aJW6s2RI6rU6RC2aFEvVvKwtwaA=";
   };
 }
diff --git a/pkgs/by-name/el/element-desktop/yarn.nix b/pkgs/by-name/el/element-desktop/yarn.nix
index 5a1274349537..159a1db2aaea 100644
--- a/pkgs/by-name/el/element-desktop/yarn.nix
+++ b/pkgs/by-name/el/element-desktop/yarn.nix
@@ -1,5 +1,6 @@
 {
   stdenvNoCC,
+  nodejs,
   yarn,
   cacert,
   git,
@@ -13,6 +14,7 @@ stdenvNoCC.mkDerivation {
 
   nativeBuildInputs = [
     cacert
+    nodejs
     yarn
     git
   ];
@@ -26,6 +28,10 @@ stdenvNoCC.mkDerivation {
     export YARN_ENABLE_TELEMETRY=0
 
     yarn install --frozen-lockfile --ignore-platform --skip-integrity-check --ignore-scripts --no-progress --non-interactive
+    # Apply upstream patch
+    # Can be removed if upstream removes patches/@types+auto-launch+5.0.5.patch introduced in
+    # https://github.com/element-hq/element-desktop/commit/5e882f8e08d58bf9663c8e3ab33885bf7b3709de
+    node ./node_modules/patch-package/index.js
 
     mkdir -p $out/node_modules
     cp -r node_modules/* $out/node_modules/
diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
index 1b8cdd761417..0230c5e0b02b 100644
--- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.12.1";
+  "version" = "1.12.2";
   "hashes" = {
-    "webSrcHash" = "sha256-c9VoR+F33xDvLn4PkPGBXW5+Yl9vX7FzedN6HfjfHEI=";
-    "webYarnHash" = "sha256-Bu0rrzPNRdY5G/nhSlhXpBMq6tcjuc16s0UQR64gUc8=";
+    "webSrcHash" = "sha256-f81axhmX3KRSzlvi7cST/QfmOySkLhTcDTlnpTETQ6c=";
+    "webYarnHash" = "sha256-NvFpyopXQ/ZI96f2kFN6tud4JkdBONgobkr9u9Rk4z4=";
   };
 }

From 0e3281844141a0767c81bd390c1e026f8acf4ae8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 19:07:45 +0000
Subject: [PATCH 4410/6226] pokeget-rs: 1.6.5 -> 1.6.7

---
 pkgs/by-name/po/pokeget-rs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/po/pokeget-rs/package.nix b/pkgs/by-name/po/pokeget-rs/package.nix
index 72fc5437cb9d..d7217b162fe0 100644
--- a/pkgs/by-name/po/pokeget-rs/package.nix
+++ b/pkgs/by-name/po/pokeget-rs/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "pokeget-rs";
-  version = "1.6.5";
+  version = "1.6.7";
 
   src = fetchFromGitHub {
     owner = "talwat";
     repo = "pokeget-rs";
     tag = version;
-    hash = "sha256-EtEmaA0ukLoK0vaX+s3d8xodB3pUwSb1EyeyMBF0+rc=";
+    hash = "sha256-kvfGtdWVeEvaKxIDs5aCZk/HBXxB67PukXHz2VvLhdw=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-fK5OLgw5XWqfAZDxIZr26ft7X8KmInSPbYlaXOEyzN0=";
+  cargoHash = "sha256-EusvBjrtm7PAZ5exDUuCu2n300x1b1c9oks+T6cR2c8=";
 
   meta = with lib; {
     description = "Better rust version of pokeget";

From dfb654dc61adfc821138c9fd3bc2c0eb23f951de Mon Sep 17 00:00:00 2001
From: Kiyotoko <karl.zschiebsch@gmail.com>
Date: Fri, 31 Oct 2025 20:21:24 +0100
Subject: [PATCH 4411/6226] vscode-extensions.oracle.oracle-java: fix broken
 hash

---
 .../editors/vscode/extensions/oracle.oracle-java/default.nix    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix b/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix
index 5fc3cec8a9c9..0be0ff82b558 100644
--- a/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/oracle.oracle-java/default.nix
@@ -8,7 +8,7 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
     name = "oracle-java";
     publisher = "oracle";
     version = "24.1.2";
-    hash = "sha256-sw+FJbpdkHABKgnRsA5tS6FYEjBD0/iVRCHHzf49Xx4=";
+    hash = "sha256-RX+Yq7fVmN797qlvSWV9hOqQV3lpWBzDjOMm/1sbv0k=";
   };
 
   meta = {

From 4db28e06a179bcdc5231f57a5ea24038f7992c5b Mon Sep 17 00:00:00 2001
From: Cobalt <cobalt@cobalt.rocks>
Date: Fri, 31 Oct 2025 20:22:09 +0100
Subject: [PATCH 4412/6226] borgbackup: 1.4.1 -> 1.4.2

---
 pkgs/by-name/bo/borgbackup/package.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/bo/borgbackup/package.nix b/pkgs/by-name/bo/borgbackup/package.nix
index ce5fac7b8dd4..f17b4f0859aa 100644
--- a/pkgs/by-name/bo/borgbackup/package.nix
+++ b/pkgs/by-name/bo/borgbackup/package.nix
@@ -4,7 +4,6 @@
   acl,
   e2fsprogs,
   fetchFromGitHub,
-  fetchpatch,
   libb2,
   lz4,
   openssh,
@@ -21,24 +20,16 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "borgbackup";
-  version = "1.4.1";
+  version = "1.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "borgbackup";
     repo = "borg";
     tag = version;
-    hash = "sha256-1RRizsHY6q1ruofTkRZ4sSN4k6Hoo+sG85w2zz+7yL8=";
+    hash = "sha256-KoOulgOkMgnkN3I0Gw9z0YKZvqvPJ0A9sIAxRLOlchU=";
   };
 
-  patches = [
-    (fetchpatch {
-      name = "allow-msgpack-1.1.1.patch";
-      url = "https://github.com/borgbackup/borg/commit/f6724bfef2515ed5bf66c9a0434655c60a82aae2.patch";
-      hash = "sha256-UfLaAFKEAHvbIR5WDYJY7bz3aiffdwAXJKfzZZU+NT8=";
-    })
-  ];
-
   postPatch = ''
     # sandbox does not support setuid/setgid/sticky bits
     substituteInPlace src/borg/testsuite/archiver.py \

From af349af742cf6bedbeea30c15b2544b262a26697 Mon Sep 17 00:00:00 2001
From: Yaya <github@uwu.is>
Date: Tue, 28 Oct 2025 10:21:08 +0100
Subject: [PATCH 4413/6226] electron-chromedriver_39: init at 39.0.0

https://github.com/electron/electron/releases/tag/v39.0.0
---
 .../development/tools/electron/chromedriver/info.json | 11 +++++++++++
 pkgs/top-level/all-packages.nix                       |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/development/tools/electron/chromedriver/info.json b/pkgs/development/tools/electron/chromedriver/info.json
index 641805a3b778..35116c365d38 100644
--- a/pkgs/development/tools/electron/chromedriver/info.json
+++ b/pkgs/development/tools/electron/chromedriver/info.json
@@ -42,5 +42,16 @@
             "x86_64-linux": "af7e2c995608b2635ea484ed2589a7ff7f79e3b05dd8c14a332f78c13b2a6892"
         },
         "version": "38.4.0"
+    },
+    "39": {
+        "hashes": {
+            "aarch64-darwin": "86718e1f93188928d9daf239e55ad07d08b3601bbe603a87a9524fa70fc5414c",
+            "aarch64-linux": "e42b6a850426d1f74305543caf688a71f41f9e4c7dcdec9d3a4522a059f2af36",
+            "armv7l-linux": "64295d9b93c4c67386b8de714d124046e311ed87828394c897592afa51285f74",
+            "headers": "12b50anxwimg8xs8595zgr02ihch49m8252r2yqlbd787rz0rg59",
+            "x86_64-darwin": "46467a2331a8da420e3e23d46d2a3f968d12fed2e863f1029dd4f94e35198943",
+            "x86_64-linux": "904052986ae1e1b42f92b2b29cf15dbd642eaf4ed4a0dcd1d4ff7cf609b8a3de"
+        },
+        "version": "39.0.0"
     }
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 90dc9a4368aa..8542179213a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6169,6 +6169,7 @@ with pkgs;
     electron-chromedriver_36
     electron-chromedriver_37
     electron-chromedriver_38
+    electron-chromedriver_39
     ;
 
   electron_35 = electron_35-bin;

From 22b231ca10f9baecb44f38157dcdfe2df5085f4d Mon Sep 17 00:00:00 2001
From: Yaya <github@uwu.is>
Date: Tue, 28 Oct 2025 10:21:41 +0100
Subject: [PATCH 4414/6226] electron_39-bin: init at 39.0.0

https://github.com/electron/electron/releases/tag/v39.0.0
---
 pkgs/development/tools/electron/binary/info.json | 11 +++++++++++
 pkgs/top-level/all-packages.nix                  |  1 +
 2 files changed, 12 insertions(+)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index d5d96c3f8457..b79efa230aec 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -42,5 +42,16 @@
             "x86_64-linux": "8e0b7f6f1eb6ceb7ac04bc6be09acc58a6ab96c3ca6f53d663b0a619c0bf06f2"
         },
         "version": "38.4.0"
+    },
+    "39": {
+        "hashes": {
+            "aarch64-darwin": "678e51190e5b29af4eb5842d4724db35409efb706ce17b1a40faf823720a9c70",
+            "aarch64-linux": "8985a9b2055c17f2bdae4418af140d6accd12b28f929319f5a918ca79b0a3d43",
+            "armv7l-linux": "54ea84c5e3b7139a24cae32ee4bb5b73eccb517174430a02da1a91aa5335759e",
+            "headers": "12b50anxwimg8xs8595zgr02ihch49m8252r2yqlbd787rz0rg59",
+            "x86_64-darwin": "49f6cfe1d35b8f363f62bce73925dae3b8ff44b0201d9f7095592e7275e920d5",
+            "x86_64-linux": "4520cbd92eeed370d7cfd2b1c60135647c02b8f634d6179d8a9a3f64b64baf2f"
+        },
+        "version": "39.0.0"
     }
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8542179213a0..c8fe2a3180e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6162,6 +6162,7 @@ with pkgs;
     electron_36-bin
     electron_37-bin
     electron_38-bin
+    electron_39-bin
     ;
 
   inherit (callPackages ../development/tools/electron/chromedriver { })

From 7267b649e39dae7ee08c612fe16001d9b3f267ac Mon Sep 17 00:00:00 2001
From: Yaya <github@uwu.is>
Date: Tue, 28 Oct 2025 10:42:53 +0100
Subject: [PATCH 4415/6226] electron-source.electron_39: init at 39.0.0

https://github.com/electron/electron/releases/tag/v39.0.0
---
 pkgs/development/tools/electron/info.json | 1348 +++++++++++++++++++++
 pkgs/top-level/all-packages.nix           |    5 +
 2 files changed, 1353 insertions(+)

diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 9c91b2ad7be5..64c2ec0f0154 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -3978,5 +3978,1353 @@
         "modules": "139",
         "node": "22.20.0",
         "version": "38.4.0"
+    },
+    "39": {
+        "chrome": "142.0.7444.52",
+        "chromium": {
+            "deps": {
+                "gn": {
+                    "hash": "sha256-sm5GWbkm3ua7EkCWTuY4TG6EXKe3asXTrH1APnNARJQ=",
+                    "rev": "81b24e01531ecf0eff12ec9359a555ec3944ec4e",
+                    "version": "0-unstable-2025-09-18"
+                }
+            },
+            "version": "142.0.7444.52"
+        },
+        "chromium_npm_hash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE=",
+        "deps": {
+            "src": {
+                "args": {
+                    "hash": "sha256-K/3+t+Vh2IZZSx3Ld82m0I8GWAVVKYzAaS1HA6GNleU=",
+                    "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
+                    "tag": "142.0.7444.52",
+                    "url": "https://chromium.googlesource.com/chromium/src.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/chrome/test/data/perf/canvas_bench": {
+                "args": {
+                    "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=",
+                    "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732",
+                    "url": "https://chromium.googlesource.com/chromium/canvas_bench.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/chrome/test/data/perf/frame_rate/content": {
+                "args": {
+                    "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=",
+                    "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9",
+                    "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/chrome/test/data/xr/webvr_info": {
+                "args": {
+                    "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=",
+                    "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248",
+                    "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/docs/website": {
+                "args": {
+                    "hash": "sha256-+2OBUpLLVPB/fDlF/9mEwTsvH2Una3ZYKUJY06nZauo=",
+                    "rev": "3913dbd6fdde06b914d0e1119fcc884f8115e4f8",
+                    "url": "https://chromium.googlesource.com/website.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/electron": {
+                "args": {
+                    "hash": "sha256-yAV/co8euqwTeUg43nnKwYF0/NQIm2WVh7CWOeP8vyE=",
+                    "owner": "electron",
+                    "repo": "electron",
+                    "tag": "v39.0.0"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/media/cdm/api": {
+                "args": {
+                    "hash": "sha256-voZaq/OiP5/QSSZmBx1ifriBc6HQ9+m4pUz0o9+O9x8=",
+                    "rev": "a4cbc4325e6de42ead733f2af43c08292d0e65a8",
+                    "url": "https://chromium.googlesource.com/chromium/cdm.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/net/third_party/quiche/src": {
+                "args": {
+                    "hash": "sha256-ACXkivQ4tqePgNIg2hpl4DQFa8n0CUkCOqPlgh56oLs=",
+                    "rev": "c0df0d316bd7e4ddf44e5ba094b5c5b061d94b0c",
+                    "url": "https://quiche.googlesource.com/quiche.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/testing/libfuzzer/fuzzers/wasm_corpus": {
+                "args": {
+                    "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY=",
+                    "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b",
+                    "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/angle": {
+                "args": {
+                    "hash": "sha256-FWPyOxpsXvFtOD6OJ950NQUBcpVIeYvjuAKaqnER6A0=",
+                    "rev": "e5b338502c7c65bd38d4695bc557938ca4cc3aa7",
+                    "url": "https://chromium.googlesource.com/angle/angle.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/angle/third_party/VK-GL-CTS/src": {
+                "args": {
+                    "hash": "sha256-VYROUPvcpkV+skw3RKXoCpB+4xVA2Qem+15YKjV7pMg=",
+                    "rev": "c67cffddd65aba724950e062343fa1cc89560b33",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/angle/third_party/glmark2/src": {
+                "args": {
+                    "hash": "sha256-VebUALLFKwEa4+oE+jF8mBSzhJd6aflphPmcK1Em8bw=",
+                    "rev": "6edcf02205fd1e8979dc3f3964257a81959b80c8",
+                    "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/angle/third_party/rapidjson/src": {
+                "args": {
+                    "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=",
+                    "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f",
+                    "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/anonymous_tokens/src": {
+                "args": {
+                    "hash": "sha256-jwfszvnWRtTmzPm5x/lyceX1Y0G0hyIATcKlYkKj/SY=",
+                    "rev": "50e04fb27eacd49a5e2bfde5977ac689e13ebeeb",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/boringssl/src": {
+                "args": {
+                    "hash": "sha256-rhUF9fuWbiAkaGbHnhANZxCYEhkkoMQoiYzn1EfR270=",
+                    "rev": "91f3df0a20f6d3dd3e2f749b4a2730b68c3d585e",
+                    "url": "https://boringssl.googlesource.com/boringssl.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/breakpad/breakpad": {
+                "args": {
+                    "hash": "sha256-jGdQyM3+p3qt+Hjt44Wpg7XKiUt7kz9Lv1xRG7vp+dM=",
+                    "rev": "a1220f673dc44632e821bd1a217089e5a159a203",
+                    "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/cast_core/public/src": {
+                "args": {
+                    "hash": "sha256-yQxm1GMMne80bLl1P7OAN3bJLz1qRNAvou2/5MKp2ig=",
+                    "rev": "f5ee589bdaea60418f670fa176be15ccb9a34942",
+                    "url": "https://chromium.googlesource.com/cast_core/public"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/catapult": {
+                "args": {
+                    "hash": "sha256-Is8yDmTyNyseTBPIDwIlhRthqfkFPgQIvu3b6u5c0m0=",
+                    "rev": "04c85a1d0e324464c6be4b3d193b47cb6177d03a",
+                    "url": "https://chromium.googlesource.com/catapult.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ced/src": {
+                "args": {
+                    "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=",
+                    "rev": "ba412eaaacd3186085babcd901679a48863c7dd5",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/clang-format/script": {
+                "args": {
+                    "hash": "sha256-d9uweklBffiuCWEb03ti1eFLnMac2qRtvggzXY1n/RU=",
+                    "rev": "37f6e68a107df43b7d7e044fd36a13cbae3413f2",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/cld_3/src": {
+                "args": {
+                    "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=",
+                    "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/colorama/src": {
+                "args": {
+                    "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=",
+                    "rev": "3de9f013df4b470069d03d250224062e8cf15c49",
+                    "url": "https://chromium.googlesource.com/external/colorama.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/compiler-rt/src": {
+                "args": {
+                    "hash": "sha256-XTPhIXHzTW4EjyER/49mKJVDQQVNGuyLu2OBAxSt+CQ=",
+                    "rev": "05f2a5dd0d1386777ae9d7fac9da776f82e7e0f2",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/content_analysis_sdk/src": {
+                "args": {
+                    "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=",
+                    "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc",
+                    "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/cpu_features/src": {
+                "args": {
+                    "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=",
+                    "rev": "936b9ab5515dead115606559502e3864958f7f6e",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/cpuinfo/src": {
+                "args": {
+                    "hash": "sha256-JW83AgI1cWv4TSpXNe9sv/hNYAA7MOdUeTHY8+0lHgc=",
+                    "rev": "877328f188a3c7d1fa855871a278eb48d530c4c0",
+                    "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/crabbyavif/src": {
+                "args": {
+                    "hash": "sha256-HUGkuQWfUGsE6crsluI7l5H2DYalruoDKqBjbVfE7BM=",
+                    "rev": "3ba05863e84fd3acb4f4af2b4545221b317a2e55",
+                    "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/crc32c/src": {
+                "args": {
+                    "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=",
+                    "rev": "d3d60ac6e0f16780bcfcc825385e1d338801a558",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/cros-components/src": {
+                "args": {
+                    "hash": "sha256-g7LzBd2V21AaLdSdCw65WGYvKfrbtpRXsYc+3ILdiKs=",
+                    "rev": "7ccdbf60606671c2c057628125908fbfef9bd0c8",
+                    "url": "https://chromium.googlesource.com/external/google3/cros_components.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/cros_system_api": {
+                "args": {
+                    "hash": "sha256-N8/0tVMBi6yFe9HkR5wxDJ1+QAP1IV1Bz99Il3RZNFU=",
+                    "rev": "c33ff08e2b27ddaed22c8799fefd3a4b7d3c49a9",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/crossbench": {
+                "args": {
+                    "hash": "sha256-JbgzTTFEFuA8ZyRLih3T/Fa3RhcOK4fi+9RuzZioiPI=",
+                    "rev": "f6e9d3627685e3bcb82d5a24c1f075b8dd0d881c",
+                    "url": "https://chromium.googlesource.com/crossbench.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/crossbench-web-tests": {
+                "args": {
+                    "hash": "sha256-yJmi1IpUiKhdoHAXyazkpm+Ezuc4Hp8pOIBntG5hN+U=",
+                    "rev": "3c76c8201f0732fe9781742229ab8ac43bf90cbf",
+                    "url": "https://chromium.googlesource.com/chromium/web-tests.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dav1d/libdav1d": {
+                "args": {
+                    "hash": "sha256-dPVDZ4SyrHWsRWERUl6UKbbdUG/5dC/UTte6sItMYxg=",
+                    "rev": "af5cf2b1e7f03d6f6de84477e1ca8eed1f3eb03d",
+                    "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn": {
+                "args": {
+                    "hash": "sha256-loKRLJfTxBxlTbPVWZqGdx0DyPvEopbs2zIf4gaxoLo=",
+                    "rev": "cee9cb0d67e749bf42f5e90cb3b8a6f525dbb920",
+                    "url": "https://dawn.googlesource.com/dawn.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/dxc": {
+                "args": {
+                    "hash": "sha256-kcmuSCdAAzyQrg33b3dlkUErd0x5TDZkE8iXMEYW8wo=",
+                    "rev": "2b58d6d865832f7146d6e22e2106e562458bbd0a",
+                    "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/dxheaders": {
+                "args": {
+                    "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=",
+                    "rev": "980971e835876dc0cde415e8f9bc646e64667bf7",
+                    "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/glfw": {
+                "args": {
+                    "hash": "sha256-E1zXIDiw87badrLOZTvV+Wh9NZHu51nb70ZK9vlAlqE=",
+                    "rev": "b35641f4a3c62aa86a0b3c983d163bc0fe36026d",
+                    "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/khronos/EGL-Registry": {
+                "args": {
+                    "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=",
+                    "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/khronos/OpenGL-Registry": {
+                "args": {
+                    "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=",
+                    "rev": "5bae8738b23d06968e7c3a41308568120943ae77",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/webgpu-cts": {
+                "args": {
+                    "hash": "sha256-lZgUbs1+6+tLeHmJTIWMbpT6oSVzC3A9/J3vKONgxSs=",
+                    "rev": "18f1cc77dea7254258eeee21839d1c249b506576",
+                    "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dawn/third_party/webgpu-headers/src": {
+                "args": {
+                    "hash": "sha256-V/JhZyjLNSElllXbLduqyNjJqjrxB4SwwPpRHIcfIis=",
+                    "rev": "53a87a3d8cb4c32ec026978ce003020741df6f53",
+                    "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/depot_tools": {
+                "args": {
+                    "hash": "sha256-oL/WjK90HWqtyE0sJhDUp3UxlC8jr4dZfp+Q80xu3sM=",
+                    "rev": "675a3a9ccd7cf9367bb4caa58c30f08b56d45ef5",
+                    "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/devtools-frontend/src": {
+                "args": {
+                    "hash": "sha256-bUJuFEDqgUFdMfmMyroX4s2ky/2n37PsTWaV+iQHCJg=",
+                    "rev": "38cfe98a56a034da33ee62a5f1ea235fe47f58a7",
+                    "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dom_distiller_js/dist": {
+                "args": {
+                    "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=",
+                    "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d",
+                    "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/domato/src": {
+                "args": {
+                    "hash": "sha256-fYxoA0fxKe9U23j+Jp0MWj4m7RfsRpM0XjF6/yOhX1I=",
+                    "rev": "053714bccbda79cf76dac3fee48ab2b27f21925e",
+                    "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/dragonbox/src": {
+                "args": {
+                    "hash": "sha256-AOniXMPgwKpkJqivRd+GazEnhdw53FzhxKqG+GdU+cc=",
+                    "rev": "6c7c925b571d54486b9ffae8d9d18a822801cbda",
+                    "url": "https://chromium.googlesource.com/external/github.com/jk-jeon/dragonbox.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/eigen3/src": {
+                "args": {
+                    "hash": "sha256-ZXDzAuvTu46YhieLIQ7MSQ0os+v2RF+KBtFuKU9fCWE=",
+                    "rev": "430e35fbd15d3c946d2d2ba19ec41c16ba217cb3",
+                    "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/electron_node": {
+                "args": {
+                    "hash": "sha256-mguNvnynyvdqpk3JEgmKTI1vMRMeiD1jICsK6gqkvLQ=",
+                    "owner": "nodejs",
+                    "repo": "node",
+                    "tag": "v22.20.0"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/third_party/emoji-segmenter/src": {
+                "args": {
+                    "hash": "sha256-KdQdKBBipEBRT8UmNGao6yCB4m2CU8/SrMVvcXlb5qE=",
+                    "rev": "955936be8b391e00835257059607d7c5b72ce744",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/engflow-reclient-configs": {
+                "args": {
+                    "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=",
+                    "owner": "EngFlow",
+                    "repo": "reclient-configs",
+                    "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/third_party/expat/src": {
+                "args": {
+                    "hash": "sha256-qe8O7otL6YcDDBx2DS/+c5mWIS8Rf8RQXVtLFMIAeyk=",
+                    "rev": "69d6c054c1bd5258c2a13405a7f5628c72c177c2",
+                    "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/farmhash/src": {
+                "args": {
+                    "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=",
+                    "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/fast_float/src": {
+                "args": {
+                    "hash": "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ=",
+                    "rev": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4",
+                    "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/federated_compute/src": {
+                "args": {
+                    "hash": "sha256-5kuTp0TXOUCQQ7XcnwBRsQRxugl869hZhx8MbxDLwYk=",
+                    "rev": "e51058dfe7888094ecc09cda38bfceffd4d4664b",
+                    "url": "https://chromium.googlesource.com/external/github.com/google-parfait/federated-compute.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ffmpeg": {
+                "args": {
+                    "hash": "sha256-ZeFzrCE9LkDcp3VTMJkm5ypX29RGZCyZkp3tEr7yFKU=",
+                    "rev": "9e751092c9498b84bbb77e2e0689ef9f50fe608f",
+                    "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/flac": {
+                "args": {
+                    "hash": "sha256-Y5TXyJ8lVh8TaVC5S4BVxOmFxySBzPbJYEe8YJS6ZR4=",
+                    "rev": "807e251d9f8c5dd6059e547931e9c6a4251967af",
+                    "url": "https://chromium.googlesource.com/chromium/deps/flac.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/flatbuffers/src": {
+                "args": {
+                    "hash": "sha256-u5AVjbep3iWwGNXLrkPJUnF8SbmIXlHOYoy3NIlUl/E=",
+                    "rev": "1c514626e83c20fffa8557e75641848e1e15cd5e",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/fontconfig/src": {
+                "args": {
+                    "hash": "sha256-2h0dWn7MxAX+4o2tMZLyjRFAES+FTMaGaf8M7ySkSV8=",
+                    "rev": "f0ed9c3f43161d3555f6f7a5234b22fe7ca60727",
+                    "url": "https://chromium.googlesource.com/external/fontconfig.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/fp16/src": {
+                "args": {
+                    "hash": "sha256-CR7h1d9RFE86l6btk4N8vbQxy0KQDxSMvckbiO87JEg=",
+                    "rev": "3d2de1816307bac63c16a297e8c4dc501b4076df",
+                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/freetype/src": {
+                "args": {
+                    "hash": "sha256-b74O5i4xhHq8y0qepP8Wup2nuj9LFzBX7ahMCCVhc98=",
+                    "rev": "d3668e00da732654b50e4e81f982544ed6e26390",
+                    "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/fuzztest/src": {
+                "args": {
+                    "hash": "sha256-gMIDf/Alh9BCk0Gm0m+mmhHoKreHCiN7/WOomcMbS/k=",
+                    "rev": "e101ca021a40733d0fa76a3bd9b49b5f76da4f8a",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/fxdiv/src": {
+                "args": {
+                    "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=",
+                    "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8",
+                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/gemmlowp/src": {
+                "args": {
+                    "hash": "sha256-e6AeRhZioIiTG5R+IA9g2GBqI4o74wijJYmqINLOtQs=",
+                    "rev": "16e8662c34917be0065110bfcd9cc27d30f52fdf",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/glslang/src": {
+                "args": {
+                    "hash": "sha256-/DwdyuSGCx22zsXZrcZGTECfsIqvzPQzTZ2mU8EkjxY=",
+                    "rev": "a57276bf558f5cf94d3a9854ebdf5a2236849a5a",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/google_benchmark/src": {
+                "args": {
+                    "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=",
+                    "rev": "761305ec3b33abf30e08d50eb829e19a802581cc",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/googletest/src": {
+                "args": {
+                    "hash": "sha256-A3kDQbt9ITaxCjl/tJtwySsPUyH+NNb8erdjBzq81o8=",
+                    "rev": "244cec869d12e53378fa0efb610cd4c32a454ec8",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/harfbuzz-ng/src": {
+                "args": {
+                    "hash": "sha256-gUUXBd2/di6MYhUzo0QkGQvRY6KLcy7qdDlSClnmnL8=",
+                    "rev": "7d936359a27abb2d7cb14ecc102463bb15c11843",
+                    "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/highway/src": {
+                "args": {
+                    "hash": "sha256-HNrlqtAs1vKCoSJ5TASs34XhzjEbLW+ISco1NQON+BI=",
+                    "rev": "84379d1c73de9681b54fbe1c035a23c7bd5d272d",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/highway.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/hunspell_dictionaries": {
+                "args": {
+                    "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=",
+                    "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e",
+                    "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/icu": {
+                "args": {
+                    "hash": "sha256-k3z31DhDPoqjcZdUL4vjyUMVpUiNk44+7rCMTDVPH8Q=",
+                    "rev": "1b2e3e8a421efae36141a7b932b41e315b089af8",
+                    "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ink/src": {
+                "args": {
+                    "hash": "sha256-SVwZWhM63iN2ajTMldgug0mfJV1rdvxTZwj/zyLe4WA=",
+                    "rev": "4e6081ad7052f97df7d77e1d87cea2d70c18a47b",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ink.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ink_stroke_modeler/src": {
+                "args": {
+                    "hash": "sha256-4iXoBgCCbWCqGbpchiAYQhKBK9rO1Xb6wP98iMd06cY=",
+                    "rev": "fe79520c9ad7d2d445d26d3c59fda6fc54eb4d5c",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/instrumented_libs": {
+                "args": {
+                    "hash": "sha256-8kokdsnn5jD9KgM/6g0NuITBbKkGXWEM4BMr1nCrfdU=",
+                    "rev": "69015643b3f68dbd438c010439c59adc52cac808",
+                    "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/jetstream/main": {
+                "args": {
+                    "hash": "sha256-jn6Twi+fc/qKjsqLqkrWxhQ677wY3rSCx3JfWCGhxr0=",
+                    "rev": "b400dd340af3457890ec7b4a903fefb02fcf2dc6",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/jetstream/v2.2": {
+                "args": {
+                    "hash": "sha256-zucA2tqNOsvjhwYQKZ5bFUC73ZF/Fu7KpBflSelvixw=",
+                    "rev": "2145cedef4ca2777b792cb0059d3400ee2a6153c",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/jsoncpp/source": {
+                "args": {
+                    "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=",
+                    "rev": "42e892d96e47b1f6e29844cc705e148ec4856448",
+                    "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/leveldatabase/src": {
+                "args": {
+                    "hash": "sha256-ANtMVRZmW6iOjDVn2y15ak2fTagFTTaz1Se6flUHL8w=",
+                    "rev": "4ee78d7ea98330f7d7599c42576ca99e3c6ff9c5",
+                    "url": "https://chromium.googlesource.com/external/leveldb.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libFuzzer/src": {
+                "args": {
+                    "hash": "sha256-TDi1OvYClJKmEDikanKVTmy8uxUXJ95nuVKo5u+uFPM=",
+                    "rev": "bea408a6e01f0f7e6c82a43121fe3af4506c932e",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libaddressinput/src": {
+                "args": {
+                    "hash": "sha256-6h4/DQUBoBtuGfbaTL5Te1Z+24qjTaBuIydcTV18j80=",
+                    "rev": "2610f7b1043d6784ada41392fc9392d1ea09ea07",
+                    "url": "https://chromium.googlesource.com/external/libaddressinput.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libaom/source/libaom": {
+                "args": {
+                    "hash": "sha256-RWm/xaX3WGgCy6o4lM5g6j0vS6mc6ZbDAhRw6OQgJlU=",
+                    "rev": "2a70ad7bee390757eaa83aff12f310ba53915e9f",
+                    "url": "https://aomedia.googlesource.com/aom.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libc++/src": {
+                "args": {
+                    "hash": "sha256-IemCFOw1X+Kcna6cuj9e29FUhitqvVGn1DeMCShkbOs=",
+                    "rev": "b77132b512d5411f8393fd3decb3abaeaf1d3ec8",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libc++abi/src": {
+                "args": {
+                    "hash": "sha256-7TUY05CW5OCyd1C1oq69rptr1RkvOMS+1CAJc7yKRFQ=",
+                    "rev": "864f61dc9253d56586ada34c388278565ef513f6",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libdrm/src": {
+                "args": {
+                    "hash": "sha256-woSYEDUfcEBpYOYnli13wLMt754A7KnUbmTEcFQdFGw=",
+                    "rev": "ad78bb591d02162d3b90890aa4d0a238b2a37cde",
+                    "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libgav1/src": {
+                "args": {
+                    "hash": "sha256-BgTfWmbcMvJB1KewJpRcMtbOd2FVuJ+fi1zAXBXfkrg=",
+                    "rev": "c05bf9be660cf170d7c26bd06bb42b3322180e58",
+                    "url": "https://chromium.googlesource.com/codecs/libgav1.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libipp/libipp": {
+                "args": {
+                    "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=",
+                    "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libjpeg_turbo": {
+                "args": {
+                    "hash": "sha256-Ig+tmprZDvlf/M72/DTar2pbxat9ZElgSqdXdoM0lPs=",
+                    "rev": "e14cbfaa85529d47f9f55b0f104a579c1061f9ad",
+                    "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/liblouis/src": {
+                "args": {
+                    "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=",
+                    "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376",
+                    "url": "https://chromium.googlesource.com/external/liblouis-github.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libpfm4/src": {
+                "args": {
+                    "hash": "sha256-awpZ22rovLZWQkX/qog93vL4u2gJ+F3w5IGFNlZ0heQ=",
+                    "rev": "964baf9d35d5f88d8422f96d8a82c672042e7064",
+                    "url": "https://chromium.googlesource.com/external/git.code.sf.net/p/perfmon2/libpfm4.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libphonenumber/dist": {
+                "args": {
+                    "hash": "sha256-ZbuDrZEUVp/ekjUP8WO/FsjAomRjeDBptT4nQZvTVi4=",
+                    "rev": "9d46308f313f2bf8dbce1dfd4f364633ca869ca7",
+                    "url": "https://chromium.googlesource.com/external/libphonenumber.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libprotobuf-mutator/src": {
+                "args": {
+                    "hash": "sha256-EaEC6R7SzqLw4QjEcWXFXhZc84lNBp6RSa9izjGnWKE=",
+                    "rev": "7bf98f78a30b067e22420ff699348f084f802e12",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libsrtp": {
+                "args": {
+                    "hash": "sha256-bkG1+ss+1a2rCHGwZjhvf5UaNVbPPZJt9HZSIPBKGwM=",
+                    "rev": "a52756acb1c5e133089c798736dd171567df11f5",
+                    "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libsync/src": {
+                "args": {
+                    "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=",
+                    "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6",
+                    "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libunwind/src": {
+                "args": {
+                    "hash": "sha256-veSxr/ICnBsdP+3vWjCbPxduHiEzbT0DUdwfo0xcM30=",
+                    "rev": "322be580a5a193a921c349a15747eeeb9a716ad1",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libva-fake-driver/src": {
+                "args": {
+                    "hash": "sha256-em/8rNqwv6szlxyji7mnYr3nObSW/x3OzEEnkiLuqpI=",
+                    "rev": "a9bcab9cd6b15d4e3634ca44d5e5f7652c612194",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform/libva-fake-driver.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libvpx/source/libvpx": {
+                "args": {
+                    "hash": "sha256-44k28SJ7AbcABv1YV1tICtJ1II4AXTuvcAELSTUht6c=",
+                    "rev": "8d00aca60b951444582b1373e4e47f0ca6e0871c",
+                    "url": "https://chromium.googlesource.com/webm/libvpx.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libwebm/source": {
+                "args": {
+                    "hash": "sha256-SxDGt7nPVkSxwRF/lMmcch1h+C2Dyh6GZUXoZjnXWb4=",
+                    "rev": "f2a982d748b80586ae53b89a2e6ebbc305848b8c",
+                    "url": "https://chromium.googlesource.com/webm/libwebm.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libwebp/src": {
+                "args": {
+                    "hash": "sha256-yKVLUxzIK5ybYM/22fVaQlqSCG5Hx4Notxj+3kI2LCg=",
+                    "rev": "b0e8039062eedbcb20ebb1bad62bfeaee2b94ec6",
+                    "url": "https://chromium.googlesource.com/webm/libwebp.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/libyuv": {
+                "args": {
+                    "hash": "sha256-8sxr0TMQaCzBqQ39FADqWTATcmQlL6TOV3nFM/YySyY=",
+                    "rev": "94417b9d213364905ce849c25719b819b8dbbaaa",
+                    "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/llvm-libc/src": {
+                "args": {
+                    "hash": "sha256-U/ToyQwIzZlaPic6LAnR17ySrZ6eGhReJ6iKVFrIHPg=",
+                    "rev": "0c61a55402c6a0d9d6ca2aeb3c6a2613a8bc8c55",
+                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/lss": {
+                "args": {
+                    "hash": "sha256-rhp4EcZYdgSfu9cqn+zxxGx6v2IW8uX8V+iA0UfZhFY=",
+                    "rev": "ed31caa60f20a4f6569883b2d752ef7522de51e0",
+                    "url": "https://chromium.googlesource.com/linux-syscall-support.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/material_color_utilities/src": {
+                "args": {
+                    "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=",
+                    "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465",
+                    "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/minigbm/src": {
+                "args": {
+                    "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=",
+                    "rev": "3018207f4d89395cc271278fb9a6558b660885f5",
+                    "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/nan": {
+                "args": {
+                    "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=",
+                    "owner": "nodejs",
+                    "repo": "nan",
+                    "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/third_party/nasm": {
+                "args": {
+                    "hash": "sha256-TxzAcp+CoKnnM0lCGjm+L3h6M30vYHjM07vW6zUe/vY=",
+                    "rev": "e2c93c34982b286b27ce8b56dd7159e0b90869a2",
+                    "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/nearby/src": {
+                "args": {
+                    "hash": "sha256-Mwuo2RlKweqZPkDw4OcJDD+QNRiXVysSyzLdjHsG1mA=",
+                    "rev": "0bad8b0c9877f92eeeb550654f1ea51a71a085e4",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/neon_2_sse/src": {
+                "args": {
+                    "hash": "sha256-AkDAHOPO5NdXXk0hETS5D67mzw0RVXwPDDKqM0XXo5g=",
+                    "rev": "eb8b80b28f956275e291ea04a7beb5ed8289e872",
+                    "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/oak/src": {
+                "args": {
+                    "hash": "sha256-+ouwII+i5CbWoJ3NAxQPmczofzkPwtZTtjIPaXyyXt8=",
+                    "rev": "96c00a6c99ac382f3f3a8f376bc7a70890d1adaa",
+                    "url": "https://chromium.googlesource.com/external/github.com/project-oak/oak.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/openh264/src": {
+                "args": {
+                    "hash": "sha256-tf0lnxATCkoq+xRti6gK6J47HwioAYWnpEsLGSA5Xdg=",
+                    "rev": "652bdb7719f30b52b08e506645a7322ff1b2cc6f",
+                    "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/openscreen/src": {
+                "args": {
+                    "hash": "sha256-gg9PtdIuCN3eQJhutbBz411zIsyCpagb5BARGdCWLMA=",
+                    "rev": "4654d7968ac1a1e825a84bd4d85acadd7993c49a",
+                    "url": "https://chromium.googlesource.com/openscreen"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/openscreen/src/buildtools": {
+                "args": {
+                    "hash": "sha256-WnbgaCzZ/BJli6M60kP9e4mVPFDx0yu3eCac5wmQ7iM=",
+                    "rev": "077a66f30fcf281b066fafb6dfc60818c238efb6",
+                    "url": "https://chromium.googlesource.com/chromium/src/buildtools"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/openscreen/src/third_party/tinycbor/src": {
+                "args": {
+                    "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=",
+                    "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7",
+                    "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ots/src": {
+                "args": {
+                    "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=",
+                    "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33",
+                    "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/pdfium": {
+                "args": {
+                    "hash": "sha256-tZXu+3w+CplXbP8TgRetyl1Q2gacAqWtP9uJ6XZchHk=",
+                    "rev": "e95c6ead2f97716c98526ec42d5fd9ebb50e6e23",
+                    "url": "https://pdfium.googlesource.com/pdfium.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/perfetto": {
+                "args": {
+                    "hash": "sha256-FfOCX3Z7aKGkMAf8hK5itt7+8N5kBRd9NJGjOLiUjQs=",
+                    "rev": "d5bbee7afdf259af4212929ccbff467dd5349953",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/protobuf-javascript/src": {
+                "args": {
+                    "hash": "sha256-1o6N9+1wsQSu1B4w5LlGlwzIUmuPCIYHPqwOyt234ZM=",
+                    "rev": "e6d763860001ba1a76a63adcff5efb12b1c96024",
+                    "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/pthreadpool/src": {
+                "args": {
+                    "hash": "sha256-M9uMq/ZkvrWNep+CIFzx6xLfepLkfY8tjgL7ed2vjU0=",
+                    "rev": "f5a07eddbf4be8f23e29e60a2ccf66b78b71f119",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/pyelftools": {
+                "args": {
+                    "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=",
+                    "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae",
+                    "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/pywebsocket3/src": {
+                "args": {
+                    "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=",
+                    "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2",
+                    "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/quic_trace/src": {
+                "args": {
+                    "hash": "sha256-vbXqddDgwqetU0bDYn3qo7OBqT5eG926/MbA1hKkCT0=",
+                    "rev": "ed3deb8a056b260c59f2fd42af6dfa3db48a8cad",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/re2/src": {
+                "args": {
+                    "hash": "sha256-YXYRgSWUrX+tkaMiRpaCFrrP3vyhzGIP9ApsxWX08VQ=",
+                    "rev": "cd7b2823a8375371f7efe6dae17837c9ab407693",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/readability/src": {
+                "args": {
+                    "hash": "sha256-liNoIZreSx/RgL5/oSKyzOuqChAgDwTtViNq0KiY0R0=",
+                    "rev": "1f0ec42686c89a4a1c71789849f7ffde349ab197",
+                    "url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ruy/src": {
+                "args": {
+                    "hash": "sha256-fV0El2ZgjxLqstKVN35SL72+diHNK0FkBmG5UwVZFrk=",
+                    "rev": "9940fbf1e0c0863907e77e0600b99bb3e2bc2b9f",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/search_engines_data/resources": {
+                "args": {
+                    "hash": "sha256-WWkOOnOI3ohPuO+M9/x53hyDO11P6E6Z6ZZvKmQEyjI=",
+                    "rev": "94eb2a9a225078cb5f40e82fd890bce387c8121a",
+                    "url": "https://chromium.googlesource.com/external/search_engines_data.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/securemessage/src": {
+                "args": {
+                    "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=",
+                    "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/skia": {
+                "args": {
+                    "hash": "sha256-7dpaRB/du2Y13BV3K7/Zx6lQwMtgtF17oKPoBtyEc64=",
+                    "rev": "f4ed99d2443962782cf5f8b4dd27179f131e7cbe",
+                    "url": "https://skia.googlesource.com/skia.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/smhasher/src": {
+                "args": {
+                    "hash": "sha256-OgZQwkQcVgRMf62ROGuY+3zQhBoWuUSP4naTmSKdq8s=",
+                    "rev": "0ff96f7835817a27d0487325b6c16033e2992eb5",
+                    "url": "https://chromium.googlesource.com/external/smhasher.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/snappy/src": {
+                "args": {
+                    "hash": "sha256-jUwnjbaqXz7fgI2TPRK7SlUPQUVzcpjp4ZlFbEzwA+o=",
+                    "rev": "32ded457c0b1fe78ceb8397632c416568d6714a0",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/speedometer/main": {
+                "args": {
+                    "hash": "sha256-3TlVewJ9C3MXvlIudzLHshQZOCAmUkMYsZzAazSbMLY=",
+                    "rev": "06449bdc34789a7459393405dd777e02d78a3743",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/speedometer/v2.0": {
+                "args": {
+                    "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4=",
+                    "rev": "732af0dfe867f8815e662ac637357e55f285dbbb",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/speedometer/v2.1": {
+                "args": {
+                    "hash": "sha256-0z5tZlz32fYh9I1ALqfLm2WWO8HiRBwt0hcmgKQhaeM=",
+                    "rev": "8bf7946e39e47c875c00767177197aea5727e84a",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/speedometer/v3.0": {
+                "args": {
+                    "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=",
+                    "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/speedometer/v3.1": {
+                "args": {
+                    "hash": "sha256-G89mrrgRaANT1vqzhKPQKemHbz56YwR+oku7rlRoCHw=",
+                    "rev": "1386415be8fef2f6b6bbdbe1828872471c5d802a",
+                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/spirv-cross/src": {
+                "args": {
+                    "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=",
+                    "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/spirv-headers/src": {
+                "args": {
+                    "hash": "sha256-gewCQvcVRw+qdWPWRlYUMTt/aXrZ7Lea058WyqL5c08=",
+                    "rev": "01e0577914a75a2569c846778c2f93aa8e6feddd",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/spirv-tools/src": {
+                "args": {
+                    "hash": "sha256-wP/ZjSXXB1NrRVmtaqxoJ+jdHlRNsXg7dRxYp9zfKKc=",
+                    "rev": "d5d5b61e2d5ae9b98ef403b3f3f922711812888a",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/sqlite/src": {
+                "args": {
+                    "hash": "sha256-13HMEpzzcFx/UKqt4V68619R+0j4B/GOl6NYlhpBk0c=",
+                    "rev": "7d348fc79216a09b864ff881d8561a6222301666",
+                    "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/squirrel.mac": {
+                "args": {
+                    "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=",
+                    "owner": "Squirrel",
+                    "repo": "Squirrel.Mac",
+                    "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/third_party/squirrel.mac/vendor/Mantle": {
+                "args": {
+                    "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=",
+                    "owner": "Mantle",
+                    "repo": "Mantle",
+                    "rev": "78d3966b3c331292ea29ec38661b25df0a245948"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/third_party/squirrel.mac/vendor/ReactiveObjC": {
+                "args": {
+                    "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=",
+                    "owner": "ReactiveCocoa",
+                    "repo": "ReactiveObjC",
+                    "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76"
+                },
+                "fetcher": "fetchFromGitHub"
+            },
+            "src/third_party/swiftshader": {
+                "args": {
+                    "hash": "sha256-raNaqoF6CYdBowrQOGRZk6vDdpr/2xAXR2+RaDF0ypk=",
+                    "rev": "5f1c459a11bb4899301e89609cbf7547f9f31e20",
+                    "url": "https://swiftshader.googlesource.com/SwiftShader.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/text-fragments-polyfill/src": {
+                "args": {
+                    "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=",
+                    "rev": "c036420683f672d685e27415de0a5f5e85bdc23f",
+                    "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/tflite/src": {
+                "args": {
+                    "hash": "sha256-9RWrxIDA2vvobr9Cg13SkwfScw+Lk/NCeaPVIXTCKmY=",
+                    "rev": "313f58ae85278ced9ccc7f90ee630bdf8735c52f",
+                    "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/ukey2/src": {
+                "args": {
+                    "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=",
+                    "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan-deps": {
+                "args": {
+                    "hash": "sha256-zziYZlVaxG5UQPm/SlodT85f+pAoGwuAO9FKnkSN53E=",
+                    "rev": "02470a3c2773a9fa236c7e8dacd72deb4b5131e3",
+                    "url": "https://chromium.googlesource.com/vulkan-deps"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan-headers/src": {
+                "args": {
+                    "hash": "sha256-Sg/zp6UhRC5wqBS3vdfs0sQL8cBgLiwvfG0oY0v9MWU=",
+                    "rev": "a4f8ada9f4f97c45b8c89c57997be9cebaae65d2",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan-loader/src": {
+                "args": {
+                    "hash": "sha256-3BBltVh3M9OnBk1uf+xpaaJaaF9QP9DHeX7tu6ET05Y=",
+                    "rev": "f703f919c30c5b67958d35d40a4297cb3823ed78",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan-tools/src": {
+                "args": {
+                    "hash": "sha256-E8VEn0s/ZuIIx4sH9ItLx+3+FOPi8gbQ0Ht7iIyYBUU=",
+                    "rev": "d643b80d6ba8c191bc289fdda52867c3bb3c190b",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan-utility-libraries/src": {
+                "args": {
+                    "hash": "sha256-qcCATZWM0YJ02Dl5VxjvbFYoE2b0r7Ku+ELr2is2VIg=",
+                    "rev": "4322db5906e67b57ec9c327e6afe3d98ed893df7",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan-validation-layers/src": {
+                "args": {
+                    "hash": "sha256-ugV2Gwgrerbqbtc5SgKN5wm4eT4JbXRCiryu1bLGR+M=",
+                    "rev": "83d96b88de7b85c3f29545170857e54e348421b2",
+                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/vulkan_memory_allocator": {
+                "args": {
+                    "hash": "sha256-yBCs3zfqs/60htsZAOscjcyKhVbAWE6znweuXcs1oKo=",
+                    "rev": "cb0597213b0fcb999caa9ed08c2f88dc45eb7d50",
+                    "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/wayland-protocols/gtk": {
+                "args": {
+                    "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=",
+                    "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0",
+                    "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/wayland-protocols/kde": {
+                "args": {
+                    "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=",
+                    "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e",
+                    "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/wayland-protocols/src": {
+                "args": {
+                    "hash": "sha256-tdpEK7soY0aKSk6VD4nulH7ORubX8RfjXYmNAd/cWKY=",
+                    "rev": "efbc060534be948b63e1f395d69b583eebba3235",
+                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/wayland/src": {
+                "args": {
+                    "hash": "sha256-oK0Z8xO2ILuySGZS0m37ZF0MOyle2l8AXb0/6wai0/w=",
+                    "rev": "a156431ea66fe67d69c9fbba8a8ad34dabbab81c",
+                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/webdriver/pylib": {
+                "args": {
+                    "hash": "sha256-k5qx4xyO83jPtHaMh6aMigMJ3hsytFdFQOcZLmwPEYo=",
+                    "rev": "1e954903022e9386b9acf452c24f4458dd4c4fc1",
+                    "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/webgl/src": {
+                "args": {
+                    "hash": "sha256-mSketnpcDtz3NnhPkXMpMpq8MWcFiSviJbK6h06fcnw=",
+                    "rev": "c01b768bce4a143e152c1870b6ba99ea6267d2b0",
+                    "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/webgpu-cts/src": {
+                "args": {
+                    "hash": "sha256-L3DuBVH7x1vxpDp/wrykcyPCjVLJr4ox4gEl76f320A=",
+                    "rev": "b62c3fc76c9c644a8597399b0d23f7032cabb366",
+                    "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/webpagereplay": {
+                "args": {
+                    "hash": "sha256-W/f+vYNC9xiCPVvHezlVPFAze77OTCMMj7PgNN5ixaw=",
+                    "rev": "9057e5d942f2bfcee71cc20415a7f86c966241f8",
+                    "url": "https://chromium.googlesource.com/webpagereplay.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/webrtc": {
+                "args": {
+                    "hash": "sha256-kVzks2ncpgd+aQ7JT2pAV/WJXxFIE7Es5Yzd/XGgm4w=",
+                    "rev": "29d6eabaf0b5c1a62af6e7fd03adebf5e1a446e8",
+                    "url": "https://webrtc.googlesource.com/src.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/weston/src": {
+                "args": {
+                    "hash": "sha256-o49a3sp+D9FycxeB+uMcKouVvlKWoWpfws7FLEGJ/V8=",
+                    "rev": "bdba2f9adaca673fd58339d8140bc04727ee279d",
+                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/wuffs/src": {
+                "args": {
+                    "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=",
+                    "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
+                    "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/xdg-utils": {
+                "args": {
+                    "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=",
+                    "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44",
+                    "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/xnnpack/src": {
+                "args": {
+                    "hash": "sha256-oxpMzIFwJ3L5cYLkwcSL7a8XS1AGHXKQjwtHoe/2mZw=",
+                    "rev": "4d098efeac50c44a7c03e6feb1794908db4c3158",
+                    "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/third_party/zstd/src": {
+                "args": {
+                    "hash": "sha256-xFObjxA4LKOnCugxaYek3cU4ld3JwLj5jFoRJ20hje4=",
+                    "rev": "89d685e42dbcf815a16ed0fcd7d050ef74ccad96",
+                    "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            },
+            "src/v8": {
+                "args": {
+                    "hash": "sha256-ovlKdiBYD9RAjA1XI0PLp/pt25LAvm3fn5AqWlJQfgs=",
+                    "rev": "bb294624702efbb17691b642333f06bf5108e600",
+                    "url": "https://chromium.googlesource.com/v8/v8.git"
+                },
+                "fetcher": "fetchFromGitiles"
+            }
+        },
+        "electron_yarn_hash": "19mpwfjb85d9kw1awiymj47h06rjk6vxqcgfajh612cgwkbz4m6f",
+        "modules": "140",
+        "node": "22.20.0",
+        "version": "39.0.0"
     }
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index c8fe2a3180e4..1f7e19e93965 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6189,6 +6189,11 @@ with pkgs;
       electron-source.electron_38
     else
       electron_38-bin;
+  electron_39 =
+    if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_39 then
+      electron-source.electron_39
+    else
+      electron_39-bin;
   electron = electron_38;
   electron-bin = electron_38-bin;
   electron-chromedriver = electron-chromedriver_38;

From f6a38f9a4e93843f83942b735f316ff85d495600 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Fri, 31 Oct 2025 12:25:46 -0700
Subject: [PATCH 4416/6226] Revert "config: add and document
 {allow,block}listedLicenses"

This reverts commit f5deefd4631e6062a2b84c62f1eb6d0c1a8e4ccf.

See:

- https://github.com/NixOS/nixpkgs/pull/437723 (introduced commit)
- https://github.com/NixOS/nixpkgs/issues/456994 (reported breakage)
- https://github.com/NixOS/nixpkgs/pull/457038 (attempted fix, closed in favor of this revert)
- https://github.com/NixOS/nixpkgs/pull/457120 (fix which would require more breaking changes)
---
 pkgs/stdenv/generic/check-meta.nix |  4 ++--
 pkgs/top-level/config.nix          | 30 ------------------------------
 2 files changed, 2 insertions(+), 32 deletions(-)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index c59e92e114ea..1a3e65ea650d 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -64,8 +64,8 @@ let
     in
     if envVar != "" then envVar != "0" else config.allowNonSource or true;
 
-  allowlist = config.allowlistedLicenses;
-  blocklist = config.blocklistedLicenses;
+  allowlist = config.allowlistedLicenses or config.whitelistedLicenses or [ ];
+  blocklist = config.blocklistedLicenses or config.blacklistedLicenses or [ ];
 
   areLicenseListsValid =
     if mutuallyExclusive allowlist blocklist then
diff --git a/pkgs/top-level/config.nix b/pkgs/top-level/config.nix
index bf9419571158..09d31a2d117c 100644
--- a/pkgs/top-level/config.nix
+++ b/pkgs/top-level/config.nix
@@ -229,36 +229,6 @@ let
       '';
     };
 
-    allowlistedLicenses = mkOption {
-      description = ''
-        Allow licenses that are specifically acceptable. `allowlistedLicenses` only applies to unfree licenses unless
-        `allowUnfree` is enabled. It is not a generic allowlist for all types of licenses.
-      '';
-      default = [ ];
-      type = types.listOf (types.attrsOf types.anything);
-      example = literalExpression ''
-        with lib.licenses; [
-          amd
-          wtfpl
-        ]
-      '';
-    };
-
-    blocklistedLicenses = mkOption {
-      description = ''
-        Block licenses that are specifically unacceptable. Unlike `allowlistedLicenses`, `blocklistedLicenses`
-        applies to all licenses.
-      '';
-      default = [ ];
-      type = types.listOf (types.attrsOf types.anything);
-      example = literalExpression ''
-        with lib.licenses; [
-          agpl3Only
-          gpl3Only
-        ]
-      '';
-    };
-
     cudaSupport = mkMassRebuild {
       feature = "build packages with CUDA support by default";
     };

From a629db211a804a7feed3f90bfb7ff8dd6fc40c94 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Oct 2025 13:20:19 +0000
Subject: [PATCH 4417/6226] prometheus-node-exporter: 1.9.1 -> 1.10.2

---
 pkgs/by-name/pr/prometheus-node-exporter/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/prometheus-node-exporter/package.nix b/pkgs/by-name/pr/prometheus-node-exporter/package.nix
index a26054c42efb..00fdc2b5c3b9 100644
--- a/pkgs/by-name/pr/prometheus-node-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-node-exporter/package.nix
@@ -7,17 +7,17 @@
 
 buildGoModule rec {
   pname = "node_exporter";
-  version = "1.9.1";
+  version = "1.10.2";
   rev = "v${version}";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "prometheus";
     repo = "node_exporter";
-    hash = "sha256-il0wf00pUSHUrqz0Y1lr++yywlhr+Ww2pGKBeGAEnPc=";
+    hash = "sha256-UaybbRmcvifXNwTNXg7mIYN9JnonSxwG62KfvU5auIE=";
   };
 
-  vendorHash = "sha256-ujW5dH3ItIaML+LlaTXT0BK/T1ZGZq/cKnLOqNPBhWc=";
+  vendorHash = "sha256-zQn3Hn40zZT3ZLiYQc/68i9t791eisBSiB6Re24/Ncg=";
 
   # FIXME: tests fail due to read-only nix store
   doCheck = false;

From f2640ee208003ca7102cbda97740b07871fa7635 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 25 Oct 2025 22:07:04 +0200
Subject: [PATCH 4418/6226] top-level: return __splicedPackages

---
 nixos/lib/testing/driver.nix             | 2 +-
 nixos/modules/misc/nixpkgs.nix           | 2 +-
 nixos/modules/misc/nixpkgs/read-only.nix | 2 +-
 pkgs/stdenv/booter.nix                   | 6 +++++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/nixos/lib/testing/driver.nix b/nixos/lib/testing/driver.nix
index 6abfac7b3191..9eb7f8b7e3e8 100644
--- a/nixos/lib/testing/driver.nix
+++ b/nixos/lib/testing/driver.nix
@@ -202,7 +202,7 @@ in
     _module.args = {
       hostPkgs =
         # Comment is in nixos/modules/misc/nixpkgs.nix
-        lib.mkOverride lib.modules.defaultOverridePriority config.hostPkgs.__splicedPackages;
+        lib.mkOverride lib.modules.defaultOverridePriority config.hostPkgs;
     };
 
     driver = withChecks driver;
diff --git a/nixos/modules/misc/nixpkgs.nix b/nixos/modules/misc/nixpkgs.nix
index 07845a4ece8e..12b4a6453449 100644
--- a/nixos/modules/misc/nixpkgs.nix
+++ b/nixos/modules/misc/nixpkgs.nix
@@ -355,7 +355,7 @@ in
         # which is somewhat costly for Nixpkgs. With an explicit priority, we only
         # evaluate the wrapper to find out that the priority is lower, and then we
         # don't need to evaluate `finalPkgs`.
-        lib.mkOverride lib.modules.defaultOverridePriority finalPkgs.__splicedPackages;
+        lib.mkOverride lib.modules.defaultOverridePriority finalPkgs;
     };
 
     assertions =
diff --git a/nixos/modules/misc/nixpkgs/read-only.nix b/nixos/modules/misc/nixpkgs/read-only.nix
index db43615c12f0..fa372d13e545 100644
--- a/nixos/modules/misc/nixpkgs/read-only.nix
+++ b/nixos/modules/misc/nixpkgs/read-only.nix
@@ -63,7 +63,7 @@ in
       # find mistaken definitions
       builtins.seq cfg.config builtins.seq cfg.overlays builtins.seq cfg.hostPlatform builtins.seq
         cfg.buildPlatform
-        cfg.pkgs.__splicedPackages;
+        cfg.pkgs;
     nixpkgs.config = cfg.pkgs.config;
     nixpkgs.overlays = cfg.pkgs.overlays;
     nixpkgs.hostPlatform = cfg.pkgs.stdenv.hostPlatform;
diff --git a/pkgs/stdenv/booter.nix b/pkgs/stdenv/booter.nix
index 1954e861eae1..934e7b87d14d 100644
--- a/pkgs/stdenv/booter.nix
+++ b/pkgs/stdenv/booter.nix
@@ -162,5 +162,9 @@ let
         buildPackages.stdenv.cc;
   };
 
+  pkgs = dfold folder postStage (_: { }) withAllowCustomOverrides;
+
 in
-dfold folder postStage (_: { }) withAllowCustomOverrides
+# Return the spliced package set, so that consumers of the nixpkgs top-level
+# attributes, like NixOS, don't break when cross-compiling.
+pkgs.__splicedPackages

From 1605f07ce9404ef021e065d3b52aa3c1f876c713 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 19:43:28 +0000
Subject: [PATCH 4419/6226] grafanaPlugins.volkovlabs-variable-panel: 4.1.0 ->
 5.1.1

---
 .../grafana/plugins/volkovlabs-variable-panel/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
index dbfb4c90a859..c018e0503c2b 100644
--- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-variable-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "volkovlabs-variable-panel";
-  version = "4.1.0";
-  zipHash = "sha256-3AkCebT9KcQdsi+T3+0XMhwZaEmqlOmY90RidcVqUb4=";
+  version = "5.1.1";
+  zipHash = "sha256-lLzOCgOh4a/Ee6QO5gJkJkHoPzylk9Y3vilXBtvn5G8=";
   meta = with lib; {
     description = "Variable panel allows you to have dashboard filters in a separate panel which you can place anywhere on the dashboard";
     license = licenses.asl20;

From 010c6fd0469ffa3827840dc8a29d8032c38f4862 Mon Sep 17 00:00:00 2001
From: KunyaKud <wafuu@posteo.net>
Date: Fri, 31 Oct 2025 20:48:55 +0100
Subject: [PATCH 4420/6226] maintainers: update KunyaKud's email

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3197d3c90b29..81050761a468 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14100,7 +14100,7 @@
   };
   KunyaKud = {
     name = "KunyaKud";
-    email = "KunyaKud@proton.me";
+    email = "wafuu@posteo.net";
     github = "KunyaKud";
     githubId = 238898928;
   };

From 738dcf167d04689293fb6c5caa7af84902a3262f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 30 Oct 2025 11:28:46 -0700
Subject: [PATCH 4421/6226] immich: 2.1.0 -> 2.2.1

Diff: https://github.com/immich-app/immich/compare/v2.1.0...v2.2.1

Changelog: https://github.com/immich-app/immich/releases/tag/v2.2.0
           https://github.com/immich-app/immich/releases/tag/v2.2.1
---
 pkgs/by-name/im/immich-cli/package.nix              | 2 +-
 pkgs/by-name/im/immich-machine-learning/package.nix | 5 +++++
 pkgs/by-name/im/immich/package.nix                  | 6 +++---
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/im/immich-cli/package.nix b/pkgs/by-name/im/immich-cli/package.nix
index d327a778ea77..57c223e9e794 100644
--- a/pkgs/by-name/im/immich-cli/package.nix
+++ b/pkgs/by-name/im/immich-cli/package.nix
@@ -12,7 +12,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "immich-cli";
-  version = "2.2.97";
+  version = "2.2.99";
   inherit (immich) src pnpmDeps;
 
   postPatch = ''
diff --git a/pkgs/by-name/im/immich-machine-learning/package.nix b/pkgs/by-name/im/immich-machine-learning/package.nix
index ce78b6c6c49a..92bf2b833aab 100644
--- a/pkgs/by-name/im/immich-machine-learning/package.nix
+++ b/pkgs/by-name/im/immich-machine-learning/package.nix
@@ -22,6 +22,10 @@ python.pkgs.buildPythonApplication rec {
     "pydantic-settings"
   ];
 
+  pythonRemoveDeps = [
+    "setuptools"
+  ];
+
   build-system = with python.pkgs; [
     hatchling
     cython
@@ -45,6 +49,7 @@ python.pkgs.buildPythonApplication rec {
       gunicorn
       huggingface-hub
       tokenizers
+      rapidocr
     ]
     ++ uvicorn.optional-dependencies.standard;
 
diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index a354d5dbbe5d..ec7dae1eb449 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -34,7 +34,7 @@
 }:
 let
   pnpm = pnpm_10;
-  version = "2.1.0";
+  version = "2.2.1";
 
   esbuild' = buildPackages.esbuild.override {
     buildGoModule =
@@ -108,14 +108,14 @@ let
     owner = "immich-app";
     repo = "immich";
     tag = "v${version}";
-    hash = "sha256-xbOzTJKutuR5/oRBUyXjZ4FWAmDnWO+nS7dQcNNRHlE=";
+    hash = "sha256-PBhUTDnZtl7Ri9thSAXuazpcmpWEUNn7BXLix+AuaE8=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     pname = "immich";
     inherit version src;
     fetcherVersion = 2;
-    hash = "sha256-JqI7te2M88CVfvqEOIggGn64Ue0rkrMlC6HvSRW1CU0=";
+    hash = "sha256-igkO0ID0/9uPtFAXL2v5bcFbCpZK2lcYEctWBKtFKdU=";
   };
 
   web = stdenv.mkDerivation {

From 9cf94d26c866f9dd083c3898c965fc5cf9409e13 Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Thu, 30 Oct 2025 09:08:16 -0400
Subject: [PATCH 4422/6226] fluffychat: 2.1.1 -> 2.2.0

changelog: https://github.com/krille-chan/fluffychat/releases/tag/v2.2.0
---
 pkgs/by-name/fl/fluffychat/package.nix        |   8 +-
 pkgs/by-name/fl/fluffychat/pubspec.lock.json  | 445 ++++++++----------
 .../flutter_vodozemac/default.nix             |   1 +
 3 files changed, 212 insertions(+), 242 deletions(-)

diff --git a/pkgs/by-name/fl/fluffychat/package.nix b/pkgs/by-name/fl/fluffychat/package.nix
index 2091bfea6abf..a3eabb01055d 100644
--- a/pkgs/by-name/fl/fluffychat/package.nix
+++ b/pkgs/by-name/fl/fluffychat/package.nix
@@ -7,6 +7,7 @@
   libgbm,
   libdrm,
   flutter332,
+  flutter335,
   pulseaudio,
   copyDesktopItems,
   makeDesktopItem,
@@ -28,23 +29,22 @@ let
     sha256 = "sha256-lRfymTSfoNUtR5tSUiAptAvrrTwbB8p+SaYQeOevMzA=";
   };
 in
-flutter332.buildFlutterApplication (
+flutter335.buildFlutterApplication (
   rec {
     pname = "fluffychat-${targetFlutterPlatform}";
-    version = "2.1.1";
+    version = "2.2.0";
 
     src = fetchFromGitHub {
       owner = "krille-chan";
       repo = "fluffychat";
       tag = "v${version}";
-      hash = "sha256-Gk3PtIb90rmrEIq52aL+vBHhRG6LoyfG2jrAGH5Iyqo=";
+      hash = "sha256-+puhKlg+ZJVjmL0hoWUXm7JU5hpoKqPZ3T5rWy+rPsQ=";
     };
 
     inherit pubspecLock;
 
     gitHashes = {
       flutter_web_auth_2 = "sha256-3aci73SP8eXg6++IQTQoyS+erUUuSiuXymvR32sxHFw=";
-      flutter_typeahead = "sha256-ZGXbbEeSddrdZOHcXE47h3Yu3w6oV7q+ZnO6GyW7Zg8=";
       flutter_secure_storage_linux = "sha256-cFNHW7dAaX8BV7arwbn68GgkkBeiAgPfhMOAFSJWlyY=";
     };
 
diff --git a/pkgs/by-name/fl/fluffychat/pubspec.lock.json b/pkgs/by-name/fl/fluffychat/pubspec.lock.json
index 91db916d77fa..77863a7be372 100644
--- a/pkgs/by-name/fl/fluffychat/pubspec.lock.json
+++ b/pkgs/by-name/fl/fluffychat/pubspec.lock.json
@@ -24,11 +24,11 @@
       "dependency": "direct main",
       "description": {
         "name": "animations",
-        "sha256": "d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb",
+        "sha256": "a8031b276f0a7986ac907195f10ca7cd04ecf2a8a566bd6dbe03018a9b02b427",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.11"
+      "version": "2.1.0"
     },
     "ansicolor": {
       "dependency": "transitive",
@@ -224,11 +224,11 @@
       "dependency": "direct main",
       "description": {
         "name": "chewie",
-        "sha256": "19b93a1e60e4ba640a792208a6543f1c7d5b124d011ce0199e2f18802199d984",
+        "sha256": "44bcfc5f0dfd1de290c87c9d86a61308b3282a70b63435d5557cfd60f54a69ca",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.12.1"
+      "version": "1.13.0"
     },
     "cli_config": {
       "dependency": "transitive",
@@ -374,11 +374,11 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_webrtc",
-        "sha256": "a2ae542cdadc21359022adedc26138fa3487cc3b3547c24ff4f556681869e28c",
+        "sha256": "51bcda4ba5d7dd9e65a309244ce3ac0b58025e6e1f6d7442cee4cd02134ef65f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.3+hotfix.4"
+      "version": "1.6.0"
     },
     "dbus": {
       "dependency": "transitive",
@@ -394,11 +394,11 @@
       "dependency": "direct main",
       "description": {
         "name": "desktop_drop",
-        "sha256": "927511f590ce01ee90d0d80f79bc71b9c919d8522d01e495e89a00c6f4a4fb5b",
+        "sha256": "e70b46b2d61f1af7a81a40d1f79b43c28a879e30a4ef31e87e9c27bea4d784e8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.1"
+      "version": "0.7.0"
     },
     "desktop_notifications": {
       "dependency": "direct main",
@@ -414,11 +414,11 @@
       "dependency": "direct main",
       "description": {
         "name": "device_info_plus",
-        "sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a",
+        "sha256": "dd0e8e02186b2196c7848c9d394a5fd6e5b57a43a546082c5820b1ec72317e33",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.5.0"
+      "version": "12.2.0"
     },
     "device_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -460,16 +460,6 @@
       "source": "hosted",
       "version": "0.9.9"
     },
-    "enhanced_enum": {
-      "dependency": "transitive",
-      "description": {
-        "name": "enhanced_enum",
-        "sha256": "074c5a8b9664799ca91e1e8b68003b8694cb19998671cbafd9c7779c13fcdecf",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.2.4"
-    },
     "fake_async": {
       "dependency": "transitive",
       "description": {
@@ -504,21 +494,21 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "ef7d2a085c1b1d69d17b6842d0734aad90156de08df6bd3c12496d0bd6ddf8e2",
+        "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.3.1"
+      "version": "10.3.3"
     },
     "file_selector": {
       "dependency": "direct main",
       "description": {
         "name": "file_selector",
-        "sha256": "5019692b593455127794d5718304ff1ae15447dea286cdda9f0db2a796a1b828",
+        "sha256": "5f1d15a7f17115038f433d1b0ea57513cc9e29a9d5338d166cb0bef3fa90a7a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.3"
+      "version": "1.0.4"
     },
     "file_selector_android": {
       "dependency": "transitive",
@@ -632,66 +622,6 @@
       "source": "hosted",
       "version": "0.1.1"
     },
-    "flutter_keyboard_visibility": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility",
-        "sha256": "98664be7be0e3ffca00de50f7f6a287ab62c763fc8c762e0a21584584a3ff4f8",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "6.0.0"
-    },
-    "flutter_keyboard_visibility_linux": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility_linux",
-        "sha256": "6fba7cd9bb033b6ddd8c2beb4c99ad02d728f1e6e6d9b9446667398b2ac39f08",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "flutter_keyboard_visibility_macos": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility_macos",
-        "sha256": "c5c49b16fff453dfdafdc16f26bdd8fb8d55812a1d50b0ce25fc8d9f2e53d086",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
-    "flutter_keyboard_visibility_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility_platform_interface",
-        "sha256": "e43a89845873f7be10cb3884345ceb9aebf00a659f479d1c8f4293fcb37022a4",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.0"
-    },
-    "flutter_keyboard_visibility_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility_web",
-        "sha256": "d3771a2e752880c79203f8d80658401d0c998e4183edca05a149f5098ce6e3d1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "2.0.0"
-    },
-    "flutter_keyboard_visibility_windows": {
-      "dependency": "transitive",
-      "description": {
-        "name": "flutter_keyboard_visibility_windows",
-        "sha256": "fc4b0f0b6be9b93ae527f3d527fb56ee2d918cd88bbca438c478af7bcfd0ef73",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
-    },
     "flutter_linkify": {
       "dependency": "direct main",
       "description": {
@@ -716,11 +646,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_local_notifications",
-        "sha256": "20ca0a9c82ce0c855ac62a2e580ab867f3fbea82680a90647f7953832d0850ae",
+        "sha256": "19ffb0a8bb7407875555e5e98d7343a633bb73707bae6c6a5f37c90014077875",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "19.4.0"
+      "version": "19.5.0"
     },
     "flutter_local_notifications_linux": {
       "dependency": "transitive",
@@ -746,11 +676,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_local_notifications_windows",
-        "sha256": "ed46d7ae4ec9d19e4c8fa2badac5fe27ba87a3fe387343ce726f927af074ec98",
+        "sha256": "8d658f0d367c48bd420e7cf2d26655e2d1130147bca1eea917e576ca76668aaf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.2"
+      "version": "1.0.3"
     },
     "flutter_localizations": {
       "dependency": "direct main",
@@ -762,21 +692,21 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_map",
-        "sha256": "df33e784b09fae857c6261a5521dd42bd4d3342cb6200884bb70730638af5fd5",
+        "sha256": "391e7dc95cc3f5190748210a69d4cfeb5d8f84dcdfa9c3235d0a9d7742ccb3f8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.2.1"
+      "version": "8.2.2"
     },
     "flutter_native_splash": {
       "dependency": "direct dev",
       "description": {
         "name": "flutter_native_splash",
-        "sha256": "8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc",
+        "sha256": "4fb9f4113350d3a80841ce05ebf1976a36de622af7d19aca0ca9a9911c7ff002",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.6"
+      "version": "2.4.7"
     },
     "flutter_new_badger": {
       "dependency": "direct main",
@@ -788,16 +718,6 @@
       "source": "hosted",
       "version": "1.1.1"
     },
-    "flutter_openssl_crypto": {
-      "dependency": "direct main",
-      "description": {
-        "name": "flutter_openssl_crypto",
-        "sha256": "293b4fcda13ab0710645a16e82f3d5b7de19bfc0ab2d06bcdb87637222eda5e1",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.5.0"
-    },
     "flutter_plugin_android_lifecycle": {
       "dependency": "transitive",
       "description": {
@@ -812,11 +732,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_rust_bridge",
-        "sha256": "b416ff56002789e636244fb4cc449f587656eff995e5a7169457eb0593fcaddb",
+        "sha256": "37ef40bc6f863652e865f0b2563ea07f0d3c58d8efad803cc01933a4b2ee067e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.10.0"
+      "version": "2.11.1"
     },
     "flutter_secure_storage": {
       "dependency": "direct main",
@@ -895,26 +815,15 @@
       "source": "sdk",
       "version": "0.0.0"
     },
-    "flutter_typeahead": {
-      "dependency": "direct main",
-      "description": {
-        "path": ".",
-        "ref": "main",
-        "resolved-ref": "3e209e67aa6e780cba61ced06cf49d2babbbcaa4",
-        "url": "https://github.com/famedly/flutter_typeahead.git"
-      },
-      "source": "git",
-      "version": "5.2.0"
-    },
     "flutter_vodozemac": {
       "dependency": "direct main",
       "description": {
         "name": "flutter_vodozemac",
-        "sha256": "2405ca121b84d1cd83200a14021022e1691b123a23bcefc36adc7740cefbc1f9",
+        "sha256": "54cd3790b6dfdc1afce928f8c46f7eeea9e4f8326f077400894935926f202057",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.2"
+      "version": "0.3.0"
     },
     "flutter_web_auth_2": {
       "dependency": "direct main",
@@ -947,11 +856,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_webrtc",
-        "sha256": "69095ba39b83da3de48286dfc0769aa8e9f10491f70058dc8d8ecc960ef7a260",
+        "sha256": "16ca9e30d428bae3dd32933e875c9f67c5843d1fa726c37cf1fc479eb9294549",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.2.0"
     },
     "frontend_server_client": {
       "dependency": "transitive",
@@ -1073,11 +982,11 @@
       "dependency": "direct main",
       "description": {
         "name": "go_router",
-        "sha256": "8b1f37dfaf6e958c6b872322db06f946509433bec3de753c3491a42ae9ec2b48",
+        "sha256": "d8f590a69729f719177ea68eb1e598295e8dbc41bbc247fed78b2c8a25660d7c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "16.1.0"
+      "version": "16.3.0"
     },
     "gsettings": {
       "dependency": "transitive",
@@ -1183,81 +1092,81 @@
       "dependency": "direct main",
       "description": {
         "name": "image_picker",
-        "sha256": "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a",
+        "sha256": "736eb56a911cf24d1859315ad09ddec0b66104bc41a7f8c5b96b4e2620cf5041",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.2.0"
     },
     "image_picker_android": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_android",
-        "sha256": "317a5d961cec5b34e777b9252393f2afbd23084aa6e60fcf601dcf6341b9ebeb",
+        "sha256": "e83b2b05141469c5e19d77e1dfa11096b6b1567d09065b2265d7c6904560050c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+23"
+      "version": "0.8.13"
     },
     "image_picker_for_web": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_for_web",
-        "sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83",
+        "sha256": "40c2a6a0da15556dc0f8e38a3246064a971a9f512386c3339b89f76db87269b6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.6"
+      "version": "3.1.0"
     },
     "image_picker_ios": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_ios",
-        "sha256": "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100",
+        "sha256": "eb06fe30bab4c4497bad449b66448f50edcc695f1c59408e78aa3a8059eb8f0e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.8.12+2"
+      "version": "0.8.13"
     },
     "image_picker_linux": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_linux",
-        "sha256": "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9",
+        "sha256": "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+2"
+      "version": "0.2.2"
     },
     "image_picker_macos": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_macos",
-        "sha256": "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1",
+        "sha256": "d58cd9d67793d52beefd6585b12050af0a7663c0c2a6ece0fb110a35d6955e04",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+2"
+      "version": "0.2.2"
     },
     "image_picker_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_platform_interface",
-        "sha256": "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0",
+        "sha256": "9f143b0dba3e459553209e20cc425c9801af48e6dfa4f01a0fcf927be3f41665",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.10.1"
+      "version": "2.11.0"
     },
     "image_picker_windows": {
       "dependency": "transitive",
       "description": {
         "name": "image_picker_windows",
-        "sha256": "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb",
+        "sha256": "d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.1+1"
+      "version": "0.2.2"
     },
     "import_sorter": {
       "dependency": "direct dev",
@@ -1319,21 +1228,21 @@
       "dependency": "direct main",
       "description": {
         "name": "just_audio",
-        "sha256": "679637a3ec5b6e00f36472f5a3663667df00ee4822cbf5dafca0f568c710960a",
+        "sha256": "9694e4734f515f2a052493d1d7e0d6de219ee0427c7c29492e246ff32a219908",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.10.4"
+      "version": "0.10.5"
     },
     "just_audio_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "just_audio_platform_interface",
-        "sha256": "4cd94536af0219fa306205a58e78d67e02b0555283c1c094ee41e402a14a5c4a",
+        "sha256": "2532c8d6702528824445921c5ff10548b518b13f808c2e34c2fd54793b999a6a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.0"
+      "version": "4.6.0"
     },
     "just_audio_web": {
       "dependency": "transitive",
@@ -1359,31 +1268,31 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
+        "sha256": "8dcda04c3fc16c14f48a7bb586d4be1f0d1572731b6d81d51772ef47c02081e0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.9"
+      "version": "11.0.1"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
+        "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.9"
+      "version": "3.0.10"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_testing",
-        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+        "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.2"
     },
     "license_checker": {
       "dependency": "direct dev",
@@ -1479,11 +1388,11 @@
       "dependency": "direct main",
       "description": {
         "name": "matrix",
-        "sha256": "4e6c186115ee041c430aa5ed5210499d60e4323f907cea1f5e8a2f73a513a1bf",
+        "sha256": "84354dd61f47b297631a3fe5eeebb5c1e0725f872b8fae75851a49cd5689c4f1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.1"
+      "version": "3.0.1"
     },
     "meta": {
       "dependency": "transitive",
@@ -1739,11 +1648,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
+        "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.0"
+      "version": "7.0.1"
     },
     "platform": {
       "dependency": "transitive",
@@ -1765,46 +1674,6 @@
       "source": "hosted",
       "version": "2.1.8"
     },
-    "pointer_interceptor": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pointer_interceptor",
-        "sha256": "57210410680379aea8b1b7ed6ae0c3ad349bfd56fe845b8ea934a53344b9d523",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.10.1+2"
-    },
-    "pointer_interceptor_ios": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pointer_interceptor_ios",
-        "sha256": "a6906772b3205b42c44614fcea28f818b1e5fdad73a4ca742a7bd49818d9c917",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.10.1"
-    },
-    "pointer_interceptor_platform_interface": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pointer_interceptor_platform_interface",
-        "sha256": "0597b0560e14354baeb23f8375cd612e8bd4841bf8306ecb71fcd0bb78552506",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.10.0+1"
-    },
-    "pointer_interceptor_web": {
-      "dependency": "transitive",
-      "description": {
-        "name": "pointer_interceptor_web",
-        "sha256": "7a7087782110f8c1827170660b09f8aa893e0e9a61431dbbe2ac3fc482e8c044",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "0.10.2+1"
-    },
     "pool": {
       "dependency": "transitive",
       "description": {
@@ -1859,11 +1728,11 @@
       "dependency": "direct main",
       "description": {
         "name": "provider",
-        "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84",
+        "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.5"
+      "version": "6.1.5+1"
     },
     "pub_semver": {
       "dependency": "transitive",
@@ -1909,11 +1778,11 @@
       "dependency": "direct main",
       "description": {
         "name": "qr_code_scanner_plus",
-        "sha256": "39696b50d277097ee4d90d4292de36f38c66213a4f5216a06b2bdd2b63117859",
+        "sha256": "41f4a834a48d670d25e3917cb9f1dbb4742298a0b4ab60d82416b295b73931e1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.10+1"
+      "version": "2.0.13"
     },
     "qr_image": {
       "dependency": "direct main",
@@ -1949,81 +1818,81 @@
       "dependency": "direct main",
       "description": {
         "name": "record",
-        "sha256": "daeb3f9b3fea9797094433fe6e49a879d8e4ca4207740bc6dc7e4a58764f0817",
+        "sha256": "6bad72fb3ea6708d724cf8b6c97c4e236cf9f43a52259b654efeb6fd9b737f1f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.0"
+      "version": "6.1.2"
     },
     "record_android": {
       "dependency": "transitive",
       "description": {
         "name": "record_android",
-        "sha256": "97d7122455f30de89a01c6c244c839085be6b12abca251fc0e78f67fed73628b",
+        "sha256": "fb54ee4e28f6829b8c580252a9ef49d9c549cfd263b0660ad7eeac0908658e9f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.3"
+      "version": "1.4.4"
     },
     "record_ios": {
       "dependency": "transitive",
       "description": {
         "name": "record_ios",
-        "sha256": "73706ebbece6150654c9d6f57897cf9b622c581148304132ba85dba15df0fdfb",
+        "sha256": "765b42ac1be019b1674ddd809b811fc721fe5a93f7bb1da7803f0d16772fd6d7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.1.4"
     },
     "record_linux": {
       "dependency": "transitive",
       "description": {
         "name": "record_linux",
-        "sha256": "fcb5964a84292813de70d52253663c1caca00a15f849fb5d0fdf9b929b28a7b9",
+        "sha256": "235b1f1fb84e810f8149cc0c2c731d7d697f8d1c333b32cb820c449bf7bb72d8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.2.1"
     },
     "record_macos": {
       "dependency": "transitive",
       "description": {
         "name": "record_macos",
-        "sha256": "02240833fde16c33fcf2c589f3e08d4394b704761b4a3bb609d872ff3043fbbd",
+        "sha256": "842ea4b7e95f4dd237aacffc686d1b0ff4277e3e5357865f8d28cd28bc18ed95",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.1.2"
     },
     "record_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "record_platform_interface",
-        "sha256": "8a575828733d4c3cb5983c914696f40db8667eab3538d4c41c50cbb79e722ef4",
+        "sha256": "b0065fdf1ec28f5a634d676724d388a77e43ce7646fb049949f58c69f3fcb4ed",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.0"
+      "version": "1.4.0"
     },
     "record_web": {
       "dependency": "transitive",
       "description": {
         "name": "record_web",
-        "sha256": "654c08113961051dcb5427e63f56315ba47c0752781ba990dac9313d0ec23c70",
+        "sha256": "4f0adf20c9ccafcc02d71111fd91fba1ca7b17a7453902593e5a9b25b74a5c56",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.6"
+      "version": "1.2.0"
     },
     "record_windows": {
       "dependency": "transitive",
       "description": {
         "name": "record_windows",
-        "sha256": "85a22fc97f6d73ecd67c8ba5f2f472b74ef1d906f795b7970f771a0914167e99",
+        "sha256": "223258060a1d25c62bae18282c16783f28581ec19401d17e56b5205b9f039d78",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.6"
+      "version": "1.0.7"
     },
     "retry": {
       "dependency": "transitive",
@@ -2055,6 +1924,56 @@
       "source": "hosted",
       "version": "1.1.2"
     },
+    "screen_retriever": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever",
+        "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_linux",
+        "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_macos": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_macos",
+        "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_platform_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_platform_interface",
+        "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
+    "screen_retriever_windows": {
+      "dependency": "transitive",
+      "description": {
+        "name": "screen_retriever_windows",
+        "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.2.0"
+    },
     "scroll_to_index": {
       "dependency": "direct main",
       "description": {
@@ -2079,11 +1998,11 @@
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "d7dc0630a923883c6328ca31b89aa682bacbf2f8304162d29f7c6aaff03a27a1",
+        "sha256": "14c8860d4de93d3a7e53af51bff479598c4e999605290756bbbe45cf65b37840",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.1.0"
+      "version": "12.0.1"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
@@ -2395,31 +2314,31 @@
       "dependency": "transitive",
       "description": {
         "name": "test",
-        "sha256": "301b213cd241ca982e9ba50266bd3f5bd1ea33f1455554c5abb85d1be0e2d87e",
+        "sha256": "65e29d831719be0591f7b3b1a32a3cda258ec98c58c7b25f7b84241bc31215bb",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.25.15"
+      "version": "1.26.2"
     },
     "test_api": {
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
+        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.4"
+      "version": "0.7.6"
     },
     "test_core": {
       "dependency": "transitive",
       "description": {
         "name": "test_core",
-        "sha256": "84d17c3486c8dfdbe5e12a50c8ae176d15e2a771b96909a9442b40173649ccaa",
+        "sha256": "80bf5a02b60af04b09e14f6fe68b921aad119493e26e490deaca5993fef1b05a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.6.8"
+      "version": "0.6.11"
     },
     "timezone": {
       "dependency": "transitive",
@@ -2485,41 +2404,61 @@
       "dependency": "direct main",
       "description": {
         "name": "unifiedpush",
-        "sha256": "1418375efb580af9640de4eaf4209cb6481f9a48792648ced3051f30e67d9568",
+        "sha256": "8ed9767f750a1dc6159a77e2171641d0cb825dc87682d1ce1b8618689b79f58e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.0.2"
+      "version": "6.2.0"
     },
     "unifiedpush_android": {
       "dependency": "transitive",
       "description": {
         "name": "unifiedpush_android",
-        "sha256": "2f25db8eb2fc3183bf2e43db89fff20b2587adc1c361e1d1e06b223a0d45b50a",
+        "sha256": "556796c81e8151ee8e4275baea2f7191119e8b1412ec35523cc2ac1c44c348bf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.1"
+      "version": "3.4.0"
+    },
+    "unifiedpush_linux": {
+      "dependency": "transitive",
+      "description": {
+        "name": "unifiedpush_linux",
+        "sha256": "c062d5eedd1cec70bcd33270cc4e01ae0ff6501f33d471167c06b34a968adfeb",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
     },
     "unifiedpush_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "unifiedpush_platform_interface",
-        "sha256": "bb49d2748211520e35e0374ab816faa8a2c635267e71909d334ad868d532eba5",
+        "sha256": "83372bc8d794b8b12ef6993b518d7be907dcfc2191bdf6de0ece5c4445d89880",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "4.0.0"
+    },
+    "unifiedpush_storage_interface": {
+      "dependency": "transitive",
+      "description": {
+        "name": "unifiedpush_storage_interface",
+        "sha256": "b8d423a4695efc616aa21d8ab48fb5ef99d6288c68b56282b8faac1579ceabd9",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
     },
     "unifiedpush_ui": {
       "dependency": "direct main",
       "description": {
         "name": "unifiedpush_ui",
-        "sha256": "cf86f0214f37debd41f25c0425c8489df85e27f9f8784fed571eb7a86d39ba11",
+        "sha256": "1b36b2aa0bc6b61577e2661c1183bd3442969ecf77b4c78174796d324f66dd1d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.0"
+      "version": "0.2.0"
     },
     "universal_html": {
       "dependency": "direct main",
@@ -2655,11 +2594,11 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_math",
-        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+        "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "video_compress": {
       "dependency": "direct main",
@@ -2735,21 +2674,21 @@
       "dependency": "transitive",
       "description": {
         "name": "vodozemac",
-        "sha256": "dba14017e042748fb22d270e8ab1d3e46965b89788dd3857dba938ec07571968",
+        "sha256": "95cac62ffab94db99e134c8f9aac198f8131a4eed0bed76a6cfc9c72add229b9",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.2.0"
+      "version": "0.3.0"
     },
     "wakelock_plus": {
       "dependency": "direct main",
       "description": {
         "name": "wakelock_plus",
-        "sha256": "a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678",
+        "sha256": "61713aa82b7f85c21c9f4cd0a148abd75f38a74ec645fcb1e446f882c82fd09b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.3.3"
     },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
@@ -2801,6 +2740,16 @@
       "source": "hosted",
       "version": "3.0.3"
     },
+    "webcrypto": {
+      "dependency": "transitive",
+      "description": {
+        "name": "webcrypto",
+        "sha256": "e393b3d0b01694a8f81efecf278ed7392877130e6e7b29f578863e4f2d0b2ebd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.8"
+    },
     "webdriver": {
       "dependency": "transitive",
       "description": {
@@ -2821,15 +2770,25 @@
       "source": "hosted",
       "version": "1.2.1"
     },
+    "webpush_encryption": {
+      "dependency": "transitive",
+      "description": {
+        "name": "webpush_encryption",
+        "sha256": "63046b7d6909f4a72ce3c153fa574726e257aaf21b1995ba063dc241a1b1520b",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "1.0.0"
+    },
     "webrtc_interface": {
       "dependency": "direct main",
       "description": {
         "name": "webrtc_interface",
-        "sha256": "86fe3afc81a08481dfb25cf14a5a94e27062ecef25544783f352c914e0bbc1ca",
+        "sha256": "2e604a31703ad26781782fb14fa8a4ee621154ee2c513d2b9938e486fa695233",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.2+hotfix.2"
+      "version": "1.3.0"
     },
     "win32": {
       "dependency": "transitive",
@@ -2851,6 +2810,16 @@
       "source": "hosted",
       "version": "2.1.0"
     },
+    "window_manager": {
+      "dependency": "transitive",
+      "description": {
+        "name": "window_manager",
+        "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "0.5.1"
+    },
     "window_to_front": {
       "dependency": "transitive",
       "description": {
@@ -2885,11 +2854,11 @@
       "dependency": "transitive",
       "description": {
         "name": "xml",
-        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+        "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.5.0"
+      "version": "6.6.1"
     },
     "yaml": {
       "dependency": "transitive",
@@ -2904,6 +2873,6 @@
   },
   "sdks": {
     "dart": ">=3.8.0 <4.0.0",
-    "flutter": ">=3.29.0"
+    "flutter": ">=3.32.0"
   }
 }
diff --git a/pkgs/development/compilers/dart/package-source-builders/flutter_vodozemac/default.nix b/pkgs/development/compilers/dart/package-source-builders/flutter_vodozemac/default.nix
index 4b5ae9129273..3bd9994cf9e9 100644
--- a/pkgs/development/compilers/dart/package-source-builders/flutter_vodozemac/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/flutter_vodozemac/default.nix
@@ -17,6 +17,7 @@ let
     cargoHash =
       {
         _0_2_2 = "sha256-Iw0AkHVjR1YmPe+C0YYBTDu5FsRk/ZpaRyBilcvqm6M=";
+        _0_3_0 = "sha256-eKKrcroV2yl/FV2WmgZWFPO5MPAGz0xCvpr0fgIuGZ4=";
       }
       .${"_" + (lib.replaceStrings [ "." ] [ "_" ] version)} or (throw ''
         Unsupported version of pub 'flutter_vodozemac': '${version}'

From 67181a6ebbfc09506c2cba52e30bcf5f0240fc25 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 20:37:34 +0000
Subject: [PATCH 4423/6226] vacuum-go: 0.19.1 -> 0.19.4

---
 pkgs/by-name/va/vacuum-go/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix
index c34a640aeead..30edc97de040 100644
--- a/pkgs/by-name/va/vacuum-go/package.nix
+++ b/pkgs/by-name/va/vacuum-go/package.nix
@@ -7,17 +7,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "vacuum-go";
-  version = "0.19.1";
+  version = "0.19.4";
 
   src = fetchFromGitHub {
     owner = "daveshanley";
     repo = "vacuum";
     # using refs/tags because simple version gives: 'the given path has multiple possibilities' error
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MJM8gwSMwdr83NN2Rt6hGf2tJUrmMdhUp5QtylsldtM=";
+    hash = "sha256-TAnzsTa0143K5qHPBd00Plt6mmABIsbRmDf/k4dLU0M=";
   };
 
-  vendorHash = "sha256-w3TSTM0WezYuajMPSy5OIWb5coE+SgIRuJISe1kYokg=";
+  vendorHash = "sha256-udFygHjA8Ygqs8YD97wwoUZqozVSs87Q1ss52Udq+nw=";
 
   env.CGO_ENABLED = 0;
   ldflags = [

From 23a5149f163b623e2341077ef667dc85517af82d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 20:48:37 +0000
Subject: [PATCH 4424/6226] pkgsite: 0-unstable-2025-10-24 ->
 0-unstable-2025-10-29

---
 pkgs/by-name/pk/pkgsite/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix
index 22657c8fc112..c185c8cf82d2 100644
--- a/pkgs/by-name/pk/pkgsite/package.nix
+++ b/pkgs/by-name/pk/pkgsite/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule {
   pname = "pkgsite";
-  version = "0-unstable-2025-10-24";
+  version = "0-unstable-2025-10-29";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "pkgsite";
-    rev = "4bd6c634f204f1469ab5130fc5b65eb843e98aac";
-    hash = "sha256-zKgx7nQgmQyyHEobTlu92FMGPn3DABAA9KwkBaIjRsQ=";
+    rev = "950d5ec0f5e9dbe92b2d1b1301322ea7f75ca1de";
+    hash = "sha256-wclB22O0YEWwWA6zC7VByntmLeP9X5QLOb+hcFermko=";
   };
 
   vendorHash = "sha256-EbZ+38LLnp5aefiuBAOFHA3uPPUmPGLsDIEMln5Vh7c=";

From 2856550b7abbb8d7d0c471d3cf20365dfaef44dc Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 31 Oct 2025 18:05:56 -0300
Subject: [PATCH 4425/6226] nethack-qt: mark as broken on darwin

---
 pkgs/by-name/ne/nethack/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ne/nethack/package.nix b/pkgs/by-name/ne/nethack/package.nix
index cda6763fd87b..db5b8c7b01c5 100644
--- a/pkgs/by-name/ne/nethack/package.nix
+++ b/pkgs/by-name/ne/nethack/package.nix
@@ -238,5 +238,6 @@ stdenvUsed.mkDerivation (finalAttrs: {
     platforms = if x11Mode then lib.platforms.linux else lib.platforms.unix;
     maintainers = with lib.maintainers; [ iedame ];
     mainProgram = "nethack";
+    broken = if qtMode then stdenv.hostPlatform.isDarwin else false;
   };
 })

From a2d3f5eeaf6b0bc41bbcf4f78c2658f4ebc0410c Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Fri, 31 Oct 2025 22:11:20 +0100
Subject: [PATCH 4426/6226] ungoogled-chromium: 141.0.7390.122-1 ->
 142.0.7444.59-1

https://developer.chrome.com/blog/new-in-chrome-142

https://developer.chrome.com/release-notes/142

https://chromereleases.googleblog.com/2025/10/stable-channel-update-for-desktop_28.html

This update includes 20 security fixes.

CVEs:
CVE-2025-12428 CVE-2025-12429 CVE-2025-12430 CVE-2025-12431
CVE-2025-12432 CVE-2025-12433 CVE-2025-12036 CVE-2025-12434
CVE-2025-12435 CVE-2025-12436 CVE-2025-12437 CVE-2025-12438
CVE-2025-12439 CVE-2025-12440 CVE-2025-12441 CVE-2025-12443
CVE-2025-12444 CVE-2025-12445 CVE-2025-12446 CVE-2025-12447
---
 .../networking/browsers/chromium/info.json    | 273 +++++++++---------
 1 file changed, 139 insertions(+), 134 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index dae78c01133a..b33c225dde59 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -813,28 +813,28 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "141.0.7390.122",
+    "version": "142.0.7444.59",
     "deps": {
       "depot_tools": {
-        "rev": "3f41e54ae17d53d4a39feecad64c3d3e6871b219",
-        "hash": "sha256-ow0L+KQuUTsz29yfO1qvqPu4XVgdoUe+yexMPi7POoA="
+        "rev": "675a3a9ccd7cf9367bb4caa58c30f08b56d45ef5",
+        "hash": "sha256-oL/WjK90HWqtyE0sJhDUp3UxlC8jr4dZfp+Q80xu3sM="
       },
       "gn": {
-        "version": "0-unstable-2025-08-29",
-        "rev": "5d0a4153b0bcc86c5a23310d5b648a587be3c56d",
-        "hash": "sha256-WERLGrReUATmn3RhxtmyZcJBxdIY/WZqBDranCLDYEg="
+        "version": "0-unstable-2025-09-18",
+        "rev": "81b24e01531ecf0eff12ec9359a555ec3944ec4e",
+        "hash": "sha256-sm5GWbkm3ua7EkCWTuY4TG6EXKe3asXTrH1APnNARJQ="
       },
       "ungoogled-patches": {
-        "rev": "141.0.7390.122-1",
-        "hash": "sha256-xFJdvGHLMXNcotHTamh9Q4M2/ctoJ3b5ORHBWtZOY90="
+        "rev": "142.0.7444.59-1",
+        "hash": "sha256-WlrUSUcV1kN2xWbOJO+VshELAgGhXInIDvZswrWYfsQ="
       },
       "npmHash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "b477534e7e10d193e916cd4e2967c589383625b2",
-        "hash": "sha256-3sVHRzERwlLzXl2qSn2Lil4U4d6N63MUOomSUrjy2YY=",
+        "rev": "4b8153ab58d3c3f4c9f7e4baad9616ecf80db5fa",
+        "hash": "sha256-RZQD9aL/YglC8chM7tqtB1Y2u6DF+6kkgwklUohaBXc=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -844,28 +844,28 @@
       },
       "src/third_party/compiler-rt/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git",
-        "rev": "d1877a8622be9c5a692dc5ed9ea5a54a78c9360e",
-        "hash": "sha256-Vtz6Xj4ktP/8q2QDVt2bQnwkz7eDKuPx9KswagxgqmY="
+        "rev": "05f2a5dd0d1386777ae9d7fac9da776f82e7e0f2",
+        "hash": "sha256-XTPhIXHzTW4EjyER/49mKJVDQQVNGuyLu2OBAxSt+CQ="
       },
       "src/third_party/libc++/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git",
-        "rev": "9ce37ed6b68eda96a67199e6564ceb958ad4b37e",
-        "hash": "sha256-2URJyICEyBwIXJRDkJt1B27DXq6nLZTCbW7dD8MBQk0="
+        "rev": "b77132b512d5411f8393fd3decb3abaeaf1d3ec8",
+        "hash": "sha256-IemCFOw1X+Kcna6cuj9e29FUhitqvVGn1DeMCShkbOs="
       },
       "src/third_party/libc++abi/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git",
-        "rev": "f7f5a32b3e9582092d8a4511acec036a09ae8524",
-        "hash": "sha256-8hqb7ZtY3PAC8R9S0KTay79xlD8QBKjy0ZR5oUVr4p0="
+        "rev": "864f61dc9253d56586ada34c388278565ef513f6",
+        "hash": "sha256-7TUY05CW5OCyd1C1oq69rptr1RkvOMS+1CAJc7yKRFQ="
       },
       "src/third_party/libunwind/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git",
-        "rev": "92fb77dfd4d86aa120730359f5e4d6bb47f1c129",
-        "hash": "sha256-n7U+CKQ839Oa35JpygygPUhk9JqWIyafJRj0jYSMlwg="
+        "rev": "322be580a5a193a921c349a15747eeeb9a716ad1",
+        "hash": "sha256-veSxr/ICnBsdP+3vWjCbPxduHiEzbT0DUdwfo0xcM30="
       },
       "src/third_party/llvm-libc/src": {
         "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git",
-        "rev": "46f8689c0b3999bd4b3a60adef01ceb3d8c0071f",
-        "hash": "sha256-qItKSIS5p4iIN+iSXgXYbFXq1CFFgwQV5NCQxunl0Zg="
+        "rev": "0c61a55402c6a0d9d6ca2aeb3c6a2613a8bc8c55",
+        "hash": "sha256-U/ToyQwIzZlaPic6LAnR17ySrZ6eGhReJ6iKVFrIHPg="
       },
       "src/chrome/test/data/perf/canvas_bench": {
         "url": "https://chromium.googlesource.com/chromium/canvas_bench.git",
@@ -884,8 +884,8 @@
       },
       "src/docs/website": {
         "url": "https://chromium.googlesource.com/website.git",
-        "rev": "c6edf98e7fab2385c90caac6211f00b62e9b773d",
-        "hash": "sha256-i08iEbbV+RAvSQKxWutCSjpZkfcbTQdRUZkgtPZfLck="
+        "rev": "3913dbd6fdde06b914d0e1119fcc884f8115e4f8",
+        "hash": "sha256-+2OBUpLLVPB/fDlF/9mEwTsvH2Una3ZYKUJY06nZauo="
       },
       "src/media/cdm/api": {
         "url": "https://chromium.googlesource.com/chromium/cdm.git",
@@ -894,8 +894,8 @@
       },
       "src/net/third_party/quiche/src": {
         "url": "https://quiche.googlesource.com/quiche.git",
-        "rev": "62826931e84c49c94192065c896931576d8273c8",
-        "hash": "sha256-YZFFKQKFyJUvrfG1bm84Hl3AGOkSgpqefwY5mHh1O0A="
+        "rev": "c0df0d316bd7e4ddf44e5ba094b5c5b061d94b0c",
+        "hash": "sha256-ACXkivQ4tqePgNIg2hpl4DQFa8n0CUkCOqPlgh56oLs="
       },
       "src/testing/libfuzzer/fuzzers/wasm_corpus": {
         "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git",
@@ -904,8 +904,8 @@
       },
       "src/third_party/angle": {
         "url": "https://chromium.googlesource.com/angle/angle.git",
-        "rev": "bb55ea10fcef3759e4db7ef8a473a9ceac2c6aa6",
-        "hash": "sha256-NIy3fOwfheHeGo0MX8tmZbaGMBwqM5+k7cCypeoS6GI="
+        "rev": "e5b338502c7c65bd38d4695bc557938ca4cc3aa7",
+        "hash": "sha256-FWPyOxpsXvFtOD6OJ950NQUBcpVIeYvjuAKaqnER6A0="
       },
       "src/third_party/angle/third_party/glmark2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2",
@@ -919,13 +919,13 @@
       },
       "src/third_party/angle/third_party/VK-GL-CTS/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS",
-        "rev": "15469c3d00394c8c365d1b1951fcf6255c589afb",
-        "hash": "sha256-Bd/Q181NBMJkLwkEmttNvjNBQqtRRT7p+nbevqvt2HI="
+        "rev": "c67cffddd65aba724950e062343fa1cc89560b33",
+        "hash": "sha256-VYROUPvcpkV+skw3RKXoCpB+4xVA2Qem+15YKjV7pMg="
       },
       "src/third_party/anonymous_tokens/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git",
-        "rev": "50b2ee441f1c3bad73ab7430c41fd1ea5a7a06a6",
-        "hash": "sha256-NiqQy4CEK8qWb2khi4zTSb3fAf3n9LvBsmceSeyQ+Q0="
+        "rev": "50e04fb27eacd49a5e2bfde5977ac689e13ebeeb",
+        "hash": "sha256-jwfszvnWRtTmzPm5x/lyceX1Y0G0hyIATcKlYkKj/SY="
       },
       "src/third_party/readability/src": {
         "url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git",
@@ -944,8 +944,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "9caf49389e5e0564d18e0504c6cfa45c88b4e4fd",
-        "hash": "sha256-d6WHeELxGtZ7nZzHIm18QaHY+2sc8KSRJgdH+vTuWN8="
+        "rev": "cee9cb0d67e749bf42f5e90cb3b8a6f525dbb920",
+        "hash": "sha256-loKRLJfTxBxlTbPVWZqGdx0DyPvEopbs2zIf4gaxoLo="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -954,8 +954,8 @@
       },
       "src/third_party/dawn/third_party/dxc": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler",
-        "rev": "4e0f5364a3692f4122de0874ebb0f5550a27c867",
-        "hash": "sha256-ocnWUgw3rBYTsKS7j+Zq6hTGhhB4VRgifASMqBO66Os="
+        "rev": "2b58d6d865832f7146d6e22e2106e562458bbd0a",
+        "hash": "sha256-kcmuSCdAAzyQrg33b3dlkUErd0x5TDZkE8iXMEYW8wo="
       },
       "src/third_party/dawn/third_party/dxheaders": {
         "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers",
@@ -974,33 +974,38 @@
       },
       "src/third_party/dawn/third_party/webgpu-cts": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts",
-        "rev": "0558b1933531e6379ac5875129b92aac9d1ce035",
-        "hash": "sha256-247bXbblup/bg+iWeIwlUxLinvvQK5hX+Jm0jKiaEbM="
+        "rev": "18f1cc77dea7254258eeee21839d1c249b506576",
+        "hash": "sha256-lZgUbs1+6+tLeHmJTIWMbpT6oSVzC3A9/J3vKONgxSs="
       },
       "src/third_party/dawn/third_party/webgpu-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers",
-        "rev": "c8b371dd2ff8a2b028fdc0206af5958521181ba8",
-        "hash": "sha256-rHDN4ln5kTMzabW427Xktl93E+8EVhWa2i8n4Mh2BgQ="
+        "rev": "53a87a3d8cb4c32ec026978ce003020741df6f53",
+        "hash": "sha256-V/JhZyjLNSElllXbLduqyNjJqjrxB4SwwPpRHIcfIis="
       },
       "src/third_party/highway/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/highway.git",
-        "rev": "00fe003dac355b979f36157f9407c7c46448958e",
-        "hash": "sha256-IS7m1wBwpPBUNhx2GttY1fzvmLIeAp3o2gXfrFpRdvY="
+        "rev": "84379d1c73de9681b54fbe1c035a23c7bd5d272d",
+        "hash": "sha256-HNrlqtAs1vKCoSJ5TASs34XhzjEbLW+ISco1NQON+BI="
       },
       "src/third_party/google_benchmark/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git",
         "rev": "761305ec3b33abf30e08d50eb829e19a802581cc",
         "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w="
       },
+      "src/third_party/libpfm4/src": {
+        "url": "https://chromium.googlesource.com/external/git.code.sf.net/p/perfmon2/libpfm4.git",
+        "rev": "964baf9d35d5f88d8422f96d8a82c672042e7064",
+        "hash": "sha256-awpZ22rovLZWQkX/qog93vL4u2gJ+F3w5IGFNlZ0heQ="
+      },
       "src/third_party/boringssl/src": {
         "url": "https://boringssl.googlesource.com/boringssl.git",
-        "rev": "40e035a9e5d721b3b7c15c46259d782ffe7d9e96",
-        "hash": "sha256-m2WNsjSwlg57ACftIDCcIWJ/jwbD7FU43lhGcpGDhCw="
+        "rev": "91f3df0a20f6d3dd3e2f749b4a2730b68c3d585e",
+        "hash": "sha256-rhUF9fuWbiAkaGbHnhANZxCYEhkkoMQoiYzn1EfR270="
       },
       "src/third_party/breakpad/breakpad": {
         "url": "https://chromium.googlesource.com/breakpad/breakpad.git",
-        "rev": "44ba5b579bf2f5c8548ad5016664fef8458c43b4",
-        "hash": "sha256-b8+7NGE9SelVFFuDOVr/k/nrk3jr/r8zwuW7vpm4c74="
+        "rev": "a1220f673dc44632e821bd1a217089e5a159a203",
+        "hash": "sha256-jGdQyM3+p3qt+Hjt44Wpg7XKiUt7kz9Lv1xRG7vp+dM="
       },
       "src/third_party/cast_core/public/src": {
         "url": "https://chromium.googlesource.com/cast_core/public",
@@ -1009,8 +1014,8 @@
       },
       "src/third_party/catapult": {
         "url": "https://chromium.googlesource.com/catapult.git",
-        "rev": "3c5077921dbacc75db5768cf4fc0b1d9ca05d2e0",
-        "hash": "sha256-w/tFeyek51/izvLSMkGP3RCW2j6KJdIa3l1PzxKjnaM="
+        "rev": "04c85a1d0e324464c6be4b3d193b47cb6177d03a",
+        "hash": "sha256-Is8yDmTyNyseTBPIDwIlhRthqfkFPgQIvu3b6u5c0m0="
       },
       "src/third_party/ced/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git",
@@ -1034,8 +1039,8 @@
       },
       "src/third_party/cpuinfo/src": {
         "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git",
-        "rev": "e414c0446436ed34151de3158d18f8ae32e55d03",
-        "hash": "sha256-748MwxVi7oONccrirjUWgtDNBWWijrXSXlZdHoowYz0="
+        "rev": "877328f188a3c7d1fa855871a278eb48d530c4c0",
+        "hash": "sha256-JW83AgI1cWv4TSpXNe9sv/hNYAA7MOdUeTHY8+0lHgc="
       },
       "src/third_party/crc32c/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git",
@@ -1044,13 +1049,13 @@
       },
       "src/third_party/cros_system_api": {
         "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git",
-        "rev": "ed91ea4a3cd063cbace42360d769983fb08163b4",
-        "hash": "sha256-vauYEQW9iTs8VZwyKAYeahLl9LTzkOR0krzcBR4VYus="
+        "rev": "c33ff08e2b27ddaed22c8799fefd3a4b7d3c49a9",
+        "hash": "sha256-N8/0tVMBi6yFe9HkR5wxDJ1+QAP1IV1Bz99Il3RZNFU="
       },
       "src/third_party/crossbench": {
         "url": "https://chromium.googlesource.com/crossbench.git",
-        "rev": "b560604e8f2261a2c685c28359b69af74b92a196",
-        "hash": "sha256-vgWATYq/7UXnFhfdJZ0JXvGpr4eI08sSU115MWpD1js="
+        "rev": "f6e9d3627685e3bcb82d5a24c1f075b8dd0d881c",
+        "hash": "sha256-JbgzTTFEFuA8ZyRLih3T/Fa3RhcOK4fi+9RuzZioiPI="
       },
       "src/third_party/crossbench-web-tests": {
         "url": "https://chromium.googlesource.com/chromium/web-tests.git",
@@ -1059,13 +1064,13 @@
       },
       "src/third_party/depot_tools": {
         "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git",
-        "rev": "3f41e54ae17d53d4a39feecad64c3d3e6871b219",
-        "hash": "sha256-ow0L+KQuUTsz29yfO1qvqPu4XVgdoUe+yexMPi7POoA="
+        "rev": "675a3a9ccd7cf9367bb4caa58c30f08b56d45ef5",
+        "hash": "sha256-oL/WjK90HWqtyE0sJhDUp3UxlC8jr4dZfp+Q80xu3sM="
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "9c2c4cc7cf6c82ad460e1f3b49f34bb702d5fe11",
-        "hash": "sha256-qj1vR0FW2jiR2v18Nv8RqYgy/UEw2rgGUsQ68EhdHos="
+        "rev": "38cfe98a56a034da33ee62a5f1ea235fe47f58a7",
+        "hash": "sha256-bUJuFEDqgUFdMfmMyroX4s2ky/2n37PsTWaV+iQHCJg="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1079,8 +1084,8 @@
       },
       "src/third_party/eigen3/src": {
         "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git",
-        "rev": "81044ec13df7608d0d9d86aff2ef9805fc69bed1",
-        "hash": "sha256-W0uonGzjDaN2RbY2U+Kl1a5/nrEZ9T9W426f+a7NUzY="
+        "rev": "430e35fbd15d3c946d2d2ba19ec41c16ba217cb3",
+        "hash": "sha256-ZXDzAuvTu46YhieLIQ7MSQ0os+v2RF+KBtFuKU9fCWE="
       },
       "src/third_party/farmhash/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git",
@@ -1094,8 +1099,8 @@
       },
       "src/third_party/federated_compute/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google-parfait/federated-compute.git",
-        "rev": "cf49f95f941eb872f596522890055878240c3a22",
-        "hash": "sha256-R8KE0Whpb4qsZ6HxWG4/uFSsrT2nnpwNV2nQcNYHEXg="
+        "rev": "e51058dfe7888094ecc09cda38bfceffd4d4664b",
+        "hash": "sha256-5kuTp0TXOUCQQ7XcnwBRsQRxugl869hZhx8MbxDLwYk="
       },
       "src/third_party/ffmpeg": {
         "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git",
@@ -1109,28 +1114,28 @@
       },
       "src/third_party/flatbuffers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git",
-        "rev": "8db59321d9f02cdffa30126654059c7d02f70c32",
-        "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM="
+        "rev": "1c514626e83c20fffa8557e75641848e1e15cd5e",
+        "hash": "sha256-u5AVjbep3iWwGNXLrkPJUnF8SbmIXlHOYoy3NIlUl/E="
       },
       "src/third_party/fontconfig/src": {
         "url": "https://chromium.googlesource.com/external/fontconfig.git",
-        "rev": "86b48ec01ece451d5270d0c5181a43151e45a042",
-        "hash": "sha256-6HLV0U/MA1XprKJ70TKvwUBdkGQPwgqP4Oj5dINsKp0="
+        "rev": "f0ed9c3f43161d3555f6f7a5234b22fe7ca60727",
+        "hash": "sha256-2h0dWn7MxAX+4o2tMZLyjRFAES+FTMaGaf8M7ySkSV8="
       },
       "src/third_party/fp16/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git",
-        "rev": "b3720617faf1a4581ed7e6787cc51722ec7751f0",
-        "hash": "sha256-nDJH3Jmztrglr9hnwegfS7NNLAXklnwdeH9iWWwwZt4="
+        "rev": "3d2de1816307bac63c16a297e8c4dc501b4076df",
+        "hash": "sha256-CR7h1d9RFE86l6btk4N8vbQxy0KQDxSMvckbiO87JEg="
       },
       "src/third_party/gemmlowp/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git",
-        "rev": "13d57703abca3005d97b19df1f2db731607a7dc2",
-        "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA="
+        "rev": "16e8662c34917be0065110bfcd9cc27d30f52fdf",
+        "hash": "sha256-e6AeRhZioIiTG5R+IA9g2GBqI4o74wijJYmqINLOtQs="
       },
       "src/third_party/freetype/src": {
         "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git",
-        "rev": "61a423426089e65c27699d824303f209026b2f05",
-        "hash": "sha256-XaSl1YJk5TUR72PDbKwnn5IGT46VR7ip1wVxUMEkvu8="
+        "rev": "d3668e00da732654b50e4e81f982544ed6e26390",
+        "hash": "sha256-b74O5i4xhHq8y0qepP8Wup2nuj9LFzBX7ahMCCVhc98="
       },
       "src/third_party/fxdiv/src": {
         "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git",
@@ -1164,8 +1169,8 @@
       },
       "src/third_party/oak/src": {
         "url": "https://chromium.googlesource.com/external/github.com/project-oak/oak.git",
-        "rev": "bd9e19ed20525444be0882bd5848ec475ac8c040",
-        "hash": "sha256-F/qSxLpbPPOBjY4/Gowq6HUINb1hH+ll9T+mDMGeJ7c="
+        "rev": "96c00a6c99ac382f3f3a8f376bc7a70890d1adaa",
+        "hash": "sha256-+ouwII+i5CbWoJ3NAxQPmczofzkPwtZTtjIPaXyyXt8="
       },
       "src/third_party/ots/src": {
         "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git",
@@ -1209,8 +1214,8 @@
       },
       "src/third_party/fuzztest/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git",
-        "rev": "169baf17795850fd4b2c29e4d52136aa8d955b61",
-        "hash": "sha256-jcpUwHKWV4aWJSOZ4AlFk5YXZoTuXrrSE4jmwrrvoKI="
+        "rev": "e101ca021a40733d0fa76a3bd9b49b5f76da4f8a",
+        "hash": "sha256-gMIDf/Alh9BCk0Gm0m+mmhHoKreHCiN7/WOomcMbS/k="
       },
       "src/third_party/domato/src": {
         "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git",
@@ -1224,18 +1229,18 @@
       },
       "src/third_party/libaom/source/libaom": {
         "url": "https://aomedia.googlesource.com/aom.git",
-        "rev": "4703185b29b381e5651eb1caed66630f623bf752",
-        "hash": "sha256-f3IPUpLB0jYrBwwJCBzatJgzayGtUxV6NsCLU2TiIqs="
+        "rev": "2a70ad7bee390757eaa83aff12f310ba53915e9f",
+        "hash": "sha256-RWm/xaX3WGgCy6o4lM5g6j0vS6mc6ZbDAhRw6OQgJlU="
       },
       "src/third_party/crabbyavif/src": {
         "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git",
-        "rev": "4c70b98d1ebc8a210f2919be7ccabbcf23061cb5",
-        "hash": "sha256-PHtOD9HWxgwlfmcoDDHYyjhHpV/LclCVIk+ci9eUaIc="
+        "rev": "3ba05863e84fd3acb4f4af2b4545221b317a2e55",
+        "hash": "sha256-HUGkuQWfUGsE6crsluI7l5H2DYalruoDKqBjbVfE7BM="
       },
       "src/third_party/nearby/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git",
-        "rev": "5f27145da57a32eb8db215c40fe867a20beea987",
-        "hash": "sha256-ZbrbLnL/5LYu8cW06KnjNaUjMSlJCrzl0ywthOjNeX0="
+        "rev": "0bad8b0c9877f92eeeb550654f1ea51a71a085e4",
+        "hash": "sha256-Mwuo2RlKweqZPkDw4OcJDD+QNRiXVysSyzLdjHsG1mA="
       },
       "src/third_party/securemessage/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git",
@@ -1244,8 +1249,8 @@
       },
       "src/third_party/jetstream/main": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
-        "rev": "f8e3d7e50ed5c7ac071a9d90d3ee36cb68a8678c",
-        "hash": "sha256-7JF4A2ayMOAFOP3DH2Z2iBx9MHvMN9hogCY5unJZDbQ="
+        "rev": "b400dd340af3457890ec7b4a903fefb02fcf2dc6",
+        "hash": "sha256-jn6Twi+fc/qKjsqLqkrWxhQ677wY3rSCx3JfWCGhxr0="
       },
       "src/third_party/jetstream/v2.2": {
         "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git",
@@ -1339,8 +1344,8 @@
       },
       "src/third_party/libvpx/source/libvpx": {
         "url": "https://chromium.googlesource.com/webm/libvpx.git",
-        "rev": "b122dc0932009e78f928386c5081bb69d3c2de5c",
-        "hash": "sha256-y5yD3YwsQjWZn60VPUH4H2D1AwkBoGGmTNpyxGneciY="
+        "rev": "8d00aca60b951444582b1373e4e47f0ca6e0871c",
+        "hash": "sha256-44k28SJ7AbcABv1YV1tICtJ1II4AXTuvcAELSTUht6c="
       },
       "src/third_party/libwebm/source": {
         "url": "https://chromium.googlesource.com/webm/libwebm.git",
@@ -1354,8 +1359,8 @@
       },
       "src/third_party/libyuv": {
         "url": "https://chromium.googlesource.com/libyuv/libyuv.git",
-        "rev": "36edc5fa8b2da5aa00b8c2c68b25ffd64219d0ba",
-        "hash": "sha256-RTgcspt8hOHN79ZD5jjwuX7XFrFkuAJemIXmjoBKVMk="
+        "rev": "94417b9d213364905ce849c25719b819b8dbbaaa",
+        "hash": "sha256-8sxr0TMQaCzBqQ39FADqWTATcmQlL6TOV3nFM/YySyY="
       },
       "src/third_party/lss": {
         "url": "https://chromium.googlesource.com/linux-syscall-support.git",
@@ -1389,8 +1394,8 @@
       },
       "src/third_party/openscreen/src": {
         "url": "https://chromium.googlesource.com/openscreen",
-        "rev": "9756d3a568a78213678eeb52e044b9658e195e15",
-        "hash": "sha256-LK1b2O4pgLyGBViXLid2w6+DxtstK44msyOJUNFn1ek="
+        "rev": "4654d7968ac1a1e825a84bd4d85acadd7993c49a",
+        "hash": "sha256-gg9PtdIuCN3eQJhutbBz411zIsyCpagb5BARGdCWLMA="
       },
       "src/third_party/openscreen/src/buildtools": {
         "url": "https://chromium.googlesource.com/chromium/src/buildtools",
@@ -1404,13 +1409,13 @@
       },
       "src/third_party/pdfium": {
         "url": "https://pdfium.googlesource.com/pdfium.git",
-        "rev": "0a74b90b9a53b2033de1a53ed8401730f906a453",
-        "hash": "sha256-eTq4d9nE9J6ZbX2b7QK5gVacApSv6EQXUmvy1P641Eo="
+        "rev": "e95c6ead2f97716c98526ec42d5fd9ebb50e6e23",
+        "hash": "sha256-tZXu+3w+CplXbP8TgRetyl1Q2gacAqWtP9uJ6XZchHk="
       },
       "src/third_party/perfetto": {
         "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git",
-        "rev": "43afaf571d990c0f3275c6800cf3ed42138bdc26",
-        "hash": "sha256-I5MrV4zYZjH0iSnc1aZ95xAg6e3OxQXX/rQoD8/OQIk="
+        "rev": "d5bbee7afdf259af4212929ccbff467dd5349953",
+        "hash": "sha256-FfOCX3Z7aKGkMAf8hK5itt7+8N5kBRd9NJGjOLiUjQs="
       },
       "src/third_party/protobuf-javascript/src": {
         "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript",
@@ -1419,8 +1424,8 @@
       },
       "src/third_party/pthreadpool/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git",
-        "rev": "149f0a86f5ad215e9f0441684385ce09f345dbe4",
-        "hash": "sha256-3/FnJ2FL6fQSlymqJS/UoXTB4ZiW9d7xpvK3Ur8Ynp4="
+        "rev": "f5a07eddbf4be8f23e29e60a2ccf66b78b71f119",
+        "hash": "sha256-M9uMq/ZkvrWNep+CIFzx6xLfepLkfY8tjgL7ed2vjU0="
       },
       "src/third_party/pyelftools": {
         "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git",
@@ -1439,8 +1444,8 @@
       },
       "src/third_party/re2/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/re2.git",
-        "rev": "6569a9a3df256f4c0c3813cb8ee2f8eef6e2c1fb",
-        "hash": "sha256-e18aSNVEE42LNzCDMay/Fa3BNg36pBPeEtfNvWqlnWE="
+        "rev": "cd7b2823a8375371f7efe6dae17837c9ab407693",
+        "hash": "sha256-YXYRgSWUrX+tkaMiRpaCFrrP3vyhzGIP9ApsxWX08VQ="
       },
       "src/third_party/ruy/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git",
@@ -1449,13 +1454,13 @@
       },
       "src/third_party/search_engines_data/resources": {
         "url": "https://chromium.googlesource.com/external/search_engines_data.git",
-        "rev": "629f034fd4473fca4ee8886ed886943672fc72fa",
-        "hash": "sha256-iWtSJ8AL2rbjltg+FHO/w4mL1XHsemCc39lEFWKAVGA="
+        "rev": "94eb2a9a225078cb5f40e82fd890bce387c8121a",
+        "hash": "sha256-WWkOOnOI3ohPuO+M9/x53hyDO11P6E6Z6ZZvKmQEyjI="
       },
       "src/third_party/skia": {
         "url": "https://skia.googlesource.com/skia.git",
-        "rev": "5eefbe51d17d2e379fa2d7353827e0ccb1e1f601",
-        "hash": "sha256-hjihCH6CykIfNcQ8TWCD8+buN0ZBYDwQr4I2Z2hUmxM="
+        "rev": "f4ed99d2443962782cf5f8b4dd27179f131e7cbe",
+        "hash": "sha256-7dpaRB/du2Y13BV3K7/Zx6lQwMtgtF17oKPoBtyEc64="
       },
       "src/third_party/smhasher/src": {
         "url": "https://chromium.googlesource.com/external/smhasher.git",
@@ -1474,8 +1479,8 @@
       },
       "src/third_party/swiftshader": {
         "url": "https://swiftshader.googlesource.com/SwiftShader.git",
-        "rev": "7cd1022cdc50fa3ac4f0ca5d0cdd64ce20af3c4f",
-        "hash": "sha256-YNQYUe3xgnPny6tYmlYOjC6/jszy896y+/u5aXjthvU="
+        "rev": "5f1c459a11bb4899301e89609cbf7547f9f31e20",
+        "hash": "sha256-raNaqoF6CYdBowrQOGRZk6vDdpr/2xAXR2+RaDF0ypk="
       },
       "src/third_party/text-fragments-polyfill/src": {
         "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git",
@@ -1484,18 +1489,18 @@
       },
       "src/third_party/tflite/src": {
         "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git",
-        "rev": "fe38b1b8c23d86ed93c13ef367b19496e398462d",
-        "hash": "sha256-51tpID94hoxm0I2Mf3WFQBf5MsuzIzlkS9lOto/8tC4="
+        "rev": "313f58ae85278ced9ccc7f90ee630bdf8735c52f",
+        "hash": "sha256-9RWrxIDA2vvobr9Cg13SkwfScw+Lk/NCeaPVIXTCKmY="
       },
       "src/third_party/vulkan-deps": {
         "url": "https://chromium.googlesource.com/vulkan-deps",
-        "rev": "a493d027dfa1ebf220dea834757f5114494f0f92",
-        "hash": "sha256-n52ZDzn4/SxcdUzCENBpUfjJk3+0IQSe+qj9FVgFn2w="
+        "rev": "02470a3c2773a9fa236c7e8dacd72deb4b5131e3",
+        "hash": "sha256-zziYZlVaxG5UQPm/SlodT85f+pAoGwuAO9FKnkSN53E="
       },
       "src/third_party/glslang/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang",
-        "rev": "3289b1d61b69a6c66c4b7cd2c6d3ab2a6df031e5",
-        "hash": "sha256-9xGshr6ts0TdER7Sy86XpKrUItukeM59ozCIwkFy26A="
+        "rev": "a57276bf558f5cf94d3a9854ebdf5a2236849a5a",
+        "hash": "sha256-/DwdyuSGCx22zsXZrcZGTECfsIqvzPQzTZ2mU8EkjxY="
       },
       "src/third_party/spirv-cross/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross",
@@ -1504,38 +1509,38 @@
       },
       "src/third_party/spirv-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers",
-        "rev": "3397e1e4fe0a9964e1837c2934b81835093494b8",
-        "hash": "sha256-Yp+HE/XIPJD/Baj9Nvs3H7J5Bx816qkYFpL6zARyY/8="
+        "rev": "01e0577914a75a2569c846778c2f93aa8e6feddd",
+        "hash": "sha256-gewCQvcVRw+qdWPWRlYUMTt/aXrZ7Lea058WyqL5c08="
       },
       "src/third_party/spirv-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools",
-        "rev": "392b4893c4955125c1873c33a97f2a8ee8363bd3",
-        "hash": "sha256-HMzQps2F9TAnHHPvBeqowADHPlTvfRWUekE37AKMcaw="
+        "rev": "d5d5b61e2d5ae9b98ef403b3f3f922711812888a",
+        "hash": "sha256-wP/ZjSXXB1NrRVmtaqxoJ+jdHlRNsXg7dRxYp9zfKKc="
       },
       "src/third_party/vulkan-headers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers",
-        "rev": "d1cd37e925510a167d4abef39340dbdea47d8989",
-        "hash": "sha256-WUj4nmr4SJFTDoaOuZBVfqOrJykzW9Kg2sqaplm8E1A="
+        "rev": "a4f8ada9f4f97c45b8c89c57997be9cebaae65d2",
+        "hash": "sha256-Sg/zp6UhRC5wqBS3vdfs0sQL8cBgLiwvfG0oY0v9MWU="
       },
       "src/third_party/vulkan-loader/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader",
-        "rev": "fe92c7d7e54664b1d3f3a0d734fd6f2ffd92e485",
-        "hash": "sha256-9Oe3JIuOT/yc+pUgKptnex9gKQFsHo1uBb3zeTegL6Q="
+        "rev": "f703f919c30c5b67958d35d40a4297cb3823ed78",
+        "hash": "sha256-3BBltVh3M9OnBk1uf+xpaaJaaF9QP9DHeX7tu6ET05Y="
       },
       "src/third_party/vulkan-tools/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools",
-        "rev": "8ce6f121d1fcbdf60f0f4264e23fbcd247b9101d",
-        "hash": "sha256-3OcmtPp8mhrVYrPoCe9qnisXllMhYLdZ4dEulDhlq8k="
+        "rev": "d643b80d6ba8c191bc289fdda52867c3bb3c190b",
+        "hash": "sha256-E8VEn0s/ZuIIx4sH9ItLx+3+FOPi8gbQ0Ht7iIyYBUU="
       },
       "src/third_party/vulkan-utility-libraries/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries",
-        "rev": "a528f95dc2f92bdd83c0c32efe2d13c806428c9d",
-        "hash": "sha256-7VEYvq1x+BYPuMGi47a7/R9ZrIR9CoIaV15wLpk97bg="
+        "rev": "4322db5906e67b57ec9c327e6afe3d98ed893df7",
+        "hash": "sha256-qcCATZWM0YJ02Dl5VxjvbFYoE2b0r7Ku+ELr2is2VIg="
       },
       "src/third_party/vulkan-validation-layers/src": {
         "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers",
-        "rev": "88a897d5921f737c9826fdd4db1ae2010d23dbb3",
-        "hash": "sha256-X5JFPq+4rqpfKLO7ImHOcR1nvO3+PCCglP0+hhUeiJ0="
+        "rev": "83d96b88de7b85c3f29545170857e54e348421b2",
+        "hash": "sha256-ugV2Gwgrerbqbtc5SgKN5wm4eT4JbXRCiryu1bLGR+M="
       },
       "src/third_party/vulkan_memory_allocator": {
         "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git",
@@ -1574,18 +1579,18 @@
       },
       "src/third_party/webgpu-cts/src": {
         "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git",
-        "rev": "b500efdd5fdd62404322ab9ecd70b938ac59a47f",
-        "hash": "sha256-gGyXYaHH0nk3rbJTtazNyj9vO4PqDPJ0OG1/CisrIq0="
+        "rev": "b62c3fc76c9c644a8597399b0d23f7032cabb366",
+        "hash": "sha256-L3DuBVH7x1vxpDp/wrykcyPCjVLJr4ox4gEl76f320A="
       },
       "src/third_party/webpagereplay": {
         "url": "https://chromium.googlesource.com/webpagereplay.git",
-        "rev": "eebd5c62cb5c6a5afbb36eccdcc3b3e01f28adc9",
-        "hash": "sha256-WXiWUVTX4JBuavc3qxPpWeM2qZsyMr64iqF/fu9fzRI="
+        "rev": "9057e5d942f2bfcee71cc20415a7f86c966241f8",
+        "hash": "sha256-W/f+vYNC9xiCPVvHezlVPFAze77OTCMMj7PgNN5ixaw="
       },
       "src/third_party/webrtc": {
         "url": "https://webrtc.googlesource.com/src.git",
-        "rev": "d2eaa5570fc9959f8dbde32912a16366b8ee75f4",
-        "hash": "sha256-vWz+CAlgvavAmoCgy+D5FDGSyYoe15vfKI2fw33K8cc="
+        "rev": "29d6eabaf0b5c1a62af6e7fd03adebf5e1a446e8",
+        "hash": "sha256-kVzks2ncpgd+aQ7JT2pAV/WJXxFIE7Es5Yzd/XGgm4w="
       },
       "src/third_party/wuffs/src": {
         "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git",
@@ -1604,18 +1609,18 @@
       },
       "src/third_party/xnnpack/src": {
         "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git",
-        "rev": "63e7e89ddc0cf5671d2659cd34a3eb64a008dd63",
-        "hash": "sha256-cqzSTeRziIZFdArk6Ty/1JyeSM8w/aH2buoNy5GOIdg="
+        "rev": "4d098efeac50c44a7c03e6feb1794908db4c3158",
+        "hash": "sha256-oxpMzIFwJ3L5cYLkwcSL7a8XS1AGHXKQjwtHoe/2mZw="
       },
       "src/third_party/zstd/src": {
         "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git",
-        "rev": "e128976193546dceb24249206a02ff8f444f7120",
-        "hash": "sha256-09KBWIUdz53TOSGhi32BJ2/FIA/BXxRNvgZMZJYiWgw="
+        "rev": "89d685e42dbcf815a16ed0fcd7d050ef74ccad96",
+        "hash": "sha256-xFObjxA4LKOnCugxaYek3cU4ld3JwLj5jFoRJ20hje4="
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "ad8af0fc661d278e87627fcaa3a7cf795ee80dd8",
-        "hash": "sha256-NOhavmx5NYJx6MSDwRS6RXHcn3DB7kNlTjIFZr6rMMY="
+        "rev": "bb294624702efbb17691b642333f06bf5108e600",
+        "hash": "sha256-ovlKdiBYD9RAjA1XI0PLp/pt25LAvm3fn5AqWlJQfgs="
       }
     }
   }

From 30a9ccd95e4056e9aedcfe9051fbf2dc9df44725 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 21:24:49 +0000
Subject: [PATCH 4427/6226] python3Packages.fastcore: 1.8.13 -> 1.8.14

---
 pkgs/development/python-modules/fastcore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix
index c408ab3d9282..4a118b65acbc 100644
--- a/pkgs/development/python-modules/fastcore/default.nix
+++ b/pkgs/development/python-modules/fastcore/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "fastcore";
-  version = "1.8.13";
+  version = "1.8.14";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fastai";
     repo = "fastcore";
     tag = version;
-    hash = "sha256-5bgFV7ZGk+s8jjQaE13lWY+fIStin701ZrzyoJ7ziyY=";
+    hash = "sha256-75HeMXzOYECh09ah+mvazQeEQOgcFuy8Cw9AYgu6Sz8=";
   };
 
   build-system = [ setuptools ];

From 36e05e197b77667560de73c368822eef8c3583b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 21:41:51 +0000
Subject: [PATCH 4428/6226] ladybird: 0-unstable-2025-10-28 ->
 0-unstable-2025-10-31

---
 pkgs/by-name/la/ladybird/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix
index 8ec22f84aef2..ba91f71d49a0 100644
--- a/pkgs/by-name/la/ladybird/package.nix
+++ b/pkgs/by-name/la/ladybird/package.nix
@@ -34,13 +34,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ladybird";
-  version = "0-unstable-2025-10-28";
+  version = "0-unstable-2025-10-31";
 
   src = fetchFromGitHub {
     owner = "LadybirdBrowser";
     repo = "ladybird";
-    rev = "d2b2d573879a50d8f3d568f9c35b8c660bc43013";
-    hash = "sha256-OOqAYUXjyoZHdXOaPqddeUfYD/SNCNZh6a9ysnEseLA=";
+    rev = "35c6d52d7df251555ed006091b680a2299f6390e";
+    hash = "sha256-2bjjM0tQebmUIM6sjtUpRyJbSjDP3E/7WOq7qR2E+k8=";
   };
 
   postPatch = ''

From 212ef28fc0e0b56a7f9cbef96722efa1e590987a Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Fri, 31 Oct 2025 17:43:37 -0400
Subject: [PATCH 4429/6226] ngtcp2: avoid building examples on FreeBSD due to
 Linux-specific socket APIs

The ngtcp2 examples use Linux-specific socket options (IP_PKTINFO,
IPTOS_ECN_MASK, IP_RECVTOS) for packet metadata and ECN support that
are not available on FreeBSD.

Enable ENABLE_LIB_ONLY on FreeBSD to skip examples while building
the core library.
---
 pkgs/development/libraries/ngtcp2/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/ngtcp2/default.nix b/pkgs/development/libraries/ngtcp2/default.nix
index 1f88deb6363f..49a2f417a0d5 100644
--- a/pkgs/development/libraries/ngtcp2/default.nix
+++ b/pkgs/development/libraries/ngtcp2/default.nix
@@ -39,7 +39,8 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     # The examples try to link against `ngtcp2_crypto_ossl` and `ngtcp2` libraries.
     # This works in the dynamic case where the targets have the same name, but not here where they're suffixed with `_static`.
-    (lib.cmakeBool "ENABLE_LIB_ONLY" stdenv.hostPlatform.isStatic)
+    # Also, the examples depend on Linux-specific APIs, so we avoid them on FreeBSD too.
+    (lib.cmakeBool "ENABLE_LIB_ONLY" (stdenv.hostPlatform.isStatic || stdenv.hostPlatform.isFreeBSD))
     (lib.cmakeBool "ENABLE_SHARED_LIB" (!stdenv.hostPlatform.isStatic))
     (lib.cmakeBool "ENABLE_STATIC_LIB" stdenv.hostPlatform.isStatic)
   ];

From 35c51e32d3963f2364f7bf8a7696c750fd1dd591 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 24 Oct 2025 17:11:38 +0200
Subject: [PATCH 4430/6226] vkquake: fix build with glslang 16

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/qu/quakespasm/vulkan.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/qu/quakespasm/vulkan.nix b/pkgs/by-name/qu/quakespasm/vulkan.nix
index 1f1db3b66a0d..b71f9e69af97 100644
--- a/pkgs/by-name/qu/quakespasm/vulkan.nix
+++ b/pkgs/by-name/qu/quakespasm/vulkan.nix
@@ -1,6 +1,7 @@
 {
   SDL2,
   fetchFromGitHub,
+  fetchpatch2,
   flac,
   glslang,
   gzip,
@@ -20,6 +21,7 @@
   vulkan-loader,
   copyDesktopItems,
   makeDesktopItem,
+  spirv-tools,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vkquake";
@@ -35,6 +37,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     makeWrapper
     glslang
+    spirv-tools
     meson
     ninja
     pkg-config
@@ -57,6 +60,14 @@ stdenv.mkDerivation (finalAttrs: {
     vulkan-headers
   ];
 
+  patches = [
+    (fetchpatch2 {
+      # https://github.com/Novum/vkQuake/pull/809
+      url = "https://github.com/Novum/vkQuake/commit/85ddf2386f15944c26317a763d4044077fc8731f.patch?full_index=1";
+      hash = "sha256-t+atA+ilCwGwLpql5BZO2OF4Xh1KdzRFjOpglTIA/KY=";
+    })
+  ];
+
   mesonFlags = [ "-Ddo_userdirs=enabled" ];
 
   env = lib.optionalAttrs stdenv.hostPlatform.isDarwin {

From 97f4dd3ef7972117b9e7588c73be662d7c67ac8b Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Fri, 24 Oct 2025 17:13:58 +0200
Subject: [PATCH 4431/6226] vkquake: move to by-name

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 .../{qu/quakespasm/vulkan.nix => vk/vkquake/package.nix}        | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/by-name/{qu/quakespasm/vulkan.nix => vk/vkquake/package.nix} (100%)

diff --git a/pkgs/by-name/qu/quakespasm/vulkan.nix b/pkgs/by-name/vk/vkquake/package.nix
similarity index 100%
rename from pkgs/by-name/qu/quakespasm/vulkan.nix
rename to pkgs/by-name/vk/vkquake/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dc8144c1cfcb..2faee7e207fb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13259,8 +13259,6 @@ with pkgs;
     quake3hires
     ;
 
-  vkquake = callPackage ../by-name/qu/quakespasm/vulkan.nix { };
-
   rott-shareware = callPackage ../by-name/ro/rott/package.nix {
     buildShareware = true;
   };

From 593d2ac61dc262047cf636a5893e468c67f6ddf1 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 31 Oct 2025 18:52:16 -0300
Subject: [PATCH 4432/6226] genmap: mark as broken on darwin

---
 pkgs/by-name/ge/genmap/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ge/genmap/package.nix b/pkgs/by-name/ge/genmap/package.nix
index 1c26feb1209a..f3ab17dcbe89 100644
--- a/pkgs/by-name/ge/genmap/package.nix
+++ b/pkgs/by-name/ge/genmap/package.nix
@@ -46,5 +46,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/cpockrandt/genmap";
     maintainers = with lib.maintainers; [ jbedo ];
     platforms = lib.platforms.unix;
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From 2c40a3091b1e2c1ceae3396142ea68274675691b Mon Sep 17 00:00:00 2001
From: Tim Schumacher <timschumi@gmx.de>
Date: Sat, 9 Aug 2025 19:27:45 +0200
Subject: [PATCH 4433/6226] mtkclient: init at 2.0.1-unstable-2025-09-26

Co-authored-by: Dom Rodriguez <shymega@shymega.org.uk>
---
 pkgs/by-name/mt/mtkclient/package.nix | 50 +++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 pkgs/by-name/mt/mtkclient/package.nix

diff --git a/pkgs/by-name/mt/mtkclient/package.nix b/pkgs/by-name/mt/mtkclient/package.nix
new file mode 100644
index 000000000000..8424253da942
--- /dev/null
+++ b/pkgs/by-name/mt/mtkclient/package.nix
@@ -0,0 +1,50 @@
+{
+  lib,
+  fetchFromGitHub,
+  python3Packages,
+}:
+
+python3Packages.buildPythonApplication {
+  pname = "mtkclient";
+  version = "2.0.1-unstable-2025-09-26";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "bkerler";
+    repo = "mtkclient";
+    rev = "399b3a1c25e73ddf4951f12efd20f7254ee04a39";
+    hash = "sha256-XNPYeVhp5P+zQdumS9IzlUd5+WebL56qcgs10WS2/LY=";
+  };
+
+  build-system = [ python3Packages.hatchling ];
+
+  dependencies = with python3Packages; [
+    colorama
+    fusepy
+    pycryptodome
+    pycryptodomex
+    pyserial
+    pyside6
+    pyusb
+    shiboken6
+  ];
+
+  pythonImportsCheck = [ "mtkclient" ];
+
+  # Note: No need to install mtkclient udev rules, 50-android.rules is covered by
+  #       systemd 258 or newer and 51-edl.rules only applies to Qualcomm (i.e. not MTK).
+
+  meta = {
+    description = "MTK reverse engineering and flash tool";
+    homepage = "https://github.com/bkerler/mtkclient";
+    mainProgram = "mtk";
+    license = lib.licenses.gpl3;
+    sourceProvenance = with lib.sourceTypes; [
+      # loaders, preloaders and exploit payloads
+      binaryFirmware
+      # everything else
+      fromSource
+    ];
+    maintainers = [ lib.maintainers.timschumi ];
+  };
+}

From 7d16bb783cf816da0703830ea7cc94cd5b07e73a Mon Sep 17 00:00:00 2001
From: Jon Hermansen <jon@jh86.org>
Date: Fri, 31 Oct 2025 18:12:33 -0400
Subject: [PATCH 4434/6226] bison: force tests to run serially on FreeBSD

---
 pkgs/by-name/bi/bison/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/bi/bison/package.nix b/pkgs/by-name/bi/bison/package.nix
index d1c015601320..6b5fbd750de3 100644
--- a/pkgs/by-name/bi/bison/package.nix
+++ b/pkgs/by-name/bi/bison/package.nix
@@ -41,6 +41,8 @@ stdenv.mkDerivation rec {
   propagatedBuildInputs = [ m4 ];
 
   enableParallelBuilding = true;
+  # tests are flaky / timing sensitive on FreeBSD
+  enableParallelChecking = !stdenv.hostPlatform.isFreeBSD;
 
   # Normal check and install check largely execute the same test suite
   doCheck = false;

From 9ef339f27d59a5858c14bf07c71f33b275b290f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 22:17:17 +0000
Subject: [PATCH 4435/6226] androidStudioPackages.canary: 2025.2.2.1 ->
 2025.2.2.3

---
 pkgs/applications/editors/android-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index c7d329b85b15..7f3c0c447693 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -24,8 +24,8 @@ let
     sha256Hash = "sha256-l+bJ0AWIrJ3qNcKJWiE+onrl6ZpLb6YWFXE3HtIejUs=";
   };
   latestVersion = {
-    version = "2025.2.2.1"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 Canary 1"
-    sha256Hash = "sha256-sSp9IpGpo7pE0x7C5wSmZiGKt2uLoUlNVh7NHF4j/N4=";
+    version = "2025.2.2.3"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 Canary 3"
+    sha256Hash = "sha256-lhqGfHUSUJw4IQryJprqvJuGMUVHHem3xf7CeeZ7kCo=";
   };
 in
 {

From 81cf80a2a5ccbe7f284381330da4fcd30ef0eba5 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 31 Oct 2025 22:20:33 +0000
Subject: [PATCH 4436/6226] diffoscope: 306 -> 307

Changes: https://lists.reproducible-builds.org/pipermail/diffoscope/2025-October/002867.html
---
 pkgs/by-name/di/diffoscope/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix
index dee2dc5008af..7df82ec5f70d 100644
--- a/pkgs/by-name/di/diffoscope/package.nix
+++ b/pkgs/by-name/di/diffoscope/package.nix
@@ -106,12 +106,12 @@ in
 # Note: when upgrading this package, please run the list-missing-tools.sh script as described below!
 python.pkgs.buildPythonApplication rec {
   pname = "diffoscope";
-  version = "306";
+  version = "307";
   pyproject = true;
 
   src = fetchurl {
     url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
-    hash = "sha256-Yr4xynjR5N7aImb8VVLsiUE+OoKOoneDUbw9O7b77b8=";
+    hash = "sha256-ccMBoupgrDwbKaWAQa+Tqo6WfB5Qsva17uvpg2UX4jY=";
   };
 
   outputs = [

From c8b6169b5a128ffd7c5f15932758615370ac7564 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Oct 2025 22:37:46 +0200
Subject: [PATCH 4437/6226] gallia: 2.0.0a4 -> 2.0.0b2

Changelog: https://github.com/Fraunhofer-AISEC/gallia/releases/tag/v2.0.0b2
---
 pkgs/by-name/ga/gallia/package.nix | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ga/gallia/package.nix b/pkgs/by-name/ga/gallia/package.nix
index a729c2e14d37..8204f924245a 100644
--- a/pkgs/by-name/ga/gallia/package.nix
+++ b/pkgs/by-name/ga/gallia/package.nix
@@ -8,17 +8,19 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "gallia";
-  version = "2.0.0a4";
+  version = "2.0.0b2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Fraunhofer-AISEC";
     repo = "gallia";
     tag = "v${version}";
-    hash = "sha256-by2zlfVN/FUNU9d5nn4JZ8xzto3k60DITPYhYqwm3Ms=";
+    hash = "sha256-CZsVd9ob4FHC9KeepK7OHWatVTJUiJEjqtaylhD+yS0=";
   };
 
-  build-system = with python3.pkgs; [ hatchling ];
+  pythonRelaxDeps = [ "pydantic" ];
+
+  build-system = with python3.pkgs; [ uv-build ];
 
   dependencies = with python3.pkgs; [
     aiosqlite
@@ -49,8 +51,8 @@ python3.pkgs.buildPythonApplication rec {
   meta = {
     description = "Extendable Pentesting Framework for the Automotive Domain";
     homepage = "https://github.com/Fraunhofer-AISEC/gallia";
-    changelog = "https://github.com/Fraunhofer-AISEC/gallia/releases/tag/v${version}";
-    license = with lib.licenses; [ asl20 ];
+    changelog = "https://github.com/Fraunhofer-AISEC/gallia/releases/tag/${src.tag}";
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       fab
       rumpelsepp

From 56c6ad83e30e6c04e48c8c9683a397b18f06e207 Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@users.noreply.github.com>
Date: Fri, 31 Oct 2025 15:29:13 -0700
Subject: [PATCH 4438/6226] terraform-providers.integrations_github: 6.7.3 ->
 6.7.4

---
 .../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 dc65a78176e4..618512bdd217 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -741,11 +741,11 @@
     "vendorHash": null
   },
   "integrations_github": {
-    "hash": "sha256-EjCL6RcTw+2uhfwgyiFRfsXYkkDHZqlSSzEcb4CRvIo=",
+    "hash": "sha256-W7VO2HVP9XMEs0KBTBsyhkLfuTaqrxLSyR54SGTemG0=",
     "homepage": "https://registry.terraform.io/providers/integrations/github",
     "owner": "integrations",
     "repo": "terraform-provider-github",
-    "rev": "v6.7.3",
+    "rev": "v6.7.4",
     "spdx": "MIT",
     "vendorHash": null
   },

From f12dd4eda38dc004a94f184f3a92d4d3aa9dfe01 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 30 Oct 2025 01:04:01 +0100
Subject: [PATCH 4439/6226] python313Packages.aiomisc: remove disabled

---
 pkgs/development/python-modules/aiomisc/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix
index b748b26d851c..e6486edd833f 100644
--- a/pkgs/development/python-modules/aiomisc/default.nix
+++ b/pkgs/development/python-modules/aiomisc/default.nix
@@ -12,11 +12,9 @@
   logging-journald,
   poetry-core,
   pytestCheckHook,
-  pythonOlder,
   raven,
   rich,
   setproctitle,
-  typing-extensions,
   uvloop,
 }:
 
@@ -25,8 +23,6 @@ buildPythonPackage rec {
   version = "17.9.6";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-qZcoKRXbBbRY2cTY2bTFTk+IpqJ5Pe+szfA76G7kJ+Q=";
@@ -37,7 +33,6 @@ buildPythonPackage rec {
   dependencies = [
     colorlog
   ]
-  ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ logging-journald ];
 
   nativeCheckInputs = [

From 175843d50547a2078291cd51a2ff499a3ad83e9d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 22:33:49 +0000
Subject: [PATCH 4440/6226] phpExtensions.xdebug: 3.4.6 -> 3.4.7

---
 pkgs/development/php-packages/xdebug/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/php-packages/xdebug/default.nix b/pkgs/development/php-packages/xdebug/default.nix
index 56af7dd6bf5a..3f4a75990c44 100644
--- a/pkgs/development/php-packages/xdebug/default.nix
+++ b/pkgs/development/php-packages/xdebug/default.nix
@@ -5,7 +5,7 @@
 }:
 
 let
-  version = "3.4.6";
+  version = "3.4.7";
 in
 buildPecl {
   inherit version;
@@ -16,7 +16,7 @@ buildPecl {
     owner = "xdebug";
     repo = "xdebug";
     rev = version;
-    hash = "sha256-xld8qUCkAOWqLQjqT9wl2PN+giXtq4gu/yFHBLdmg+c=";
+    hash = "sha256-TxwEyXyUGq3rUWyLExyDopJZ29eAoh9QG1TC2+hImmc=";
   };
 
   doCheck = true;

From de7682771511e9aa470968e5987d0aad5cf19673 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 22:35:32 +0000
Subject: [PATCH 4441/6226] hydralauncher: 3.6.8 -> 3.7.3

---
 pkgs/by-name/hy/hydralauncher/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix
index 0b837078abef..5153c04bd11f 100644
--- a/pkgs/by-name/hy/hydralauncher/package.nix
+++ b/pkgs/by-name/hy/hydralauncher/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "hydralauncher";
-  version = "3.6.8";
+  version = "3.7.3";
   src = fetchurl {
     url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage";
-    hash = "sha256-wZszjO+4n1BaiWX9Dw+chZvL89hPmugHju5JlRfPYl4=";
+    hash = "sha256-prX/6cmWEz81nj/W28QbclyaJyNmGOug/ANXee3e0Cs=";
   };
 
   appimageContents = appimageTools.extractType2 { inherit pname src version; };

From 977dfc579af065fdb2d70f1129a0b7f999b73fe3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 22:37:54 +0000
Subject: [PATCH 4442/6226] home-assistant-custom-components.polaris-mqtt:
 1.0.10 -> 1.0.11

---
 .../home-assistant/custom-components/polaris-mqtt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix b/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix
index fcac276d5358..f2d15104a5b8 100644
--- a/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/polaris-mqtt/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "samoswall";
   domain = "polaris";
-  version = "1.0.10";
+  version = "1.0.11";
 
   src = fetchFromGitHub {
     owner = "samoswall";
     repo = "polaris-mqtt";
     tag = "v${version}";
-    hash = "sha256-GxNGZISV/YjMLH2hpoyuyKGvRDiZ3ejI2eJ7o00dqK8=";
+    hash = "sha256-ei0O+PTi/nV8Jb3ul+52vsmQxC3irYu0YjBotqYoipc=";
   };
 
   meta = {

From f31938a03c2259cf4b0a57a316687fa3236e42a9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Fri, 31 Oct 2025 23:38:26 +0100
Subject: [PATCH 4443/6226] mediawriter: 5.2.8 -> 5.2.9

Diff: https://github.com/FedoraQt/MediaWriter/compare/5.2.8...5.2.9

Changelog: https://github.com/FedoraQt/MediaWriter/releases/tag/5.2.9
---
 pkgs/by-name/me/mediawriter/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/me/mediawriter/package.nix b/pkgs/by-name/me/mediawriter/package.nix
index 90827c58682f..4f6cee140794 100644
--- a/pkgs/by-name/me/mediawriter/package.nix
+++ b/pkgs/by-name/me/mediawriter/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "mediawriter";
-  version = "5.2.8";
+  version = "5.2.9";
 
   src = fetchFromGitHub {
     owner = "FedoraQt";
     repo = "MediaWriter";
     tag = version;
-    hash = "sha256-8nTWwBf8I4IENh0wColzPg3xjsXg3bubg6ZqNpfLE3c=";
+    hash = "sha256-tZ0GzaEzhklD/FJocnRmet+dvBwZoNYVhJfF1NY6puE=";
   };
 
   nativeBuildInputs = [

From 9f261152547f62e5cac695eb85cc85bb99b69206 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 15:17:29 -0700
Subject: [PATCH 4444/6226] python3Packages.speechbrain: fix build with
 torchaudio 2.9

---
 .../python-modules/speechbrain/default.nix       | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/development/python-modules/speechbrain/default.nix b/pkgs/development/python-modules/speechbrain/default.nix
index d9fabf1dc0de..cd49c5dee1d6 100644
--- a/pkgs/development/python-modules/speechbrain/default.nix
+++ b/pkgs/development/python-modules/speechbrain/default.nix
@@ -2,6 +2,10 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch,
+
+  # build-system
+  setuptools,
 
   # dependencies
   huggingface-hub,
@@ -28,6 +32,18 @@ buildPythonPackage rec {
     hash = "sha256-H45kTOIO6frbrRu+TP+udn1z60ZEcrShNB9iTCLInQs=";
   };
 
+  patches = [
+    # https://github.com/speechbrain/speechbrain/pull/2988
+    (fetchpatch {
+      name = "torchaudio-2.9-compat.patch";
+      url = "https://github.com/speechbrain/speechbrain/commit/927530fa95e238fbc396000618e839a4a986dd7d.patch";
+      excludes = [ "pyproject.toml" ];
+      hash = "sha256-TJxBQLggX2ZHppUJwMcg9+A9r0r+D20XUfivBFW7y/U=";
+    })
+  ];
+
+  build-system = [ setuptools ];
+
   dependencies = [
     huggingface-hub
     hyperpyyaml

From aa57b7b2193c5943918b9d2dc4d62181f6937d85 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Thu, 30 Oct 2025 20:46:33 +0100
Subject: [PATCH 4445/6226] python313Packages.tencentcloud-sdk-python: 3.0.1480
 -> 3.0.1481

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.0.1480...3.0.1481

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1481/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index a32685a3aef7..7a90fa7d3d55 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1480";
+  version = "3.0.1481";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-5ArEEnuokneSV5JtLZjRHcuOtes40wxuk3r6aW7db8s=";
+    hash = "sha256-bqfF1Z1hrFT2HR5At5v9gKWdKY/OEHTCBgGPo4LnStE=";
   };
 
   build-system = [ setuptools ];

From 59fc11c2862b592277f750a34f9a8d8c29cbd7b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 22:50:38 +0000
Subject: [PATCH 4446/6226] hifile: 0.9.12.1 -> 0.9.12.2

---
 pkgs/by-name/hi/hifile/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hi/hifile/package.nix b/pkgs/by-name/hi/hifile/package.nix
index 4969188fd3b5..075df1040c83 100644
--- a/pkgs/by-name/hi/hifile/package.nix
+++ b/pkgs/by-name/hi/hifile/package.nix
@@ -2,8 +2,8 @@
   lib,
   appimageTools,
   fetchurl,
-  version ? "0.9.12.1",
-  hash ? "sha256-6Lun0HyfAi7anivgGsGdUPPX9kZrWwh8fq+qvVL/CdU=",
+  version ? "0.9.12.2",
+  hash ? "sha256-nhBLtsc9zz1tCFn7BWIqTVD/iTLHFUjXPmnslewoUCw=",
 }:
 
 let

From c9c7c7ed3076ab74922de8d3fc3b7f25a9023e9d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 22:50:49 +0000
Subject: [PATCH 4447/6226] ovhcloud-cli: 0.7.1 -> 0.8.1

---
 pkgs/by-name/ov/ovhcloud-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ov/ovhcloud-cli/package.nix b/pkgs/by-name/ov/ovhcloud-cli/package.nix
index 5e6cd30d88ee..75881b5cc8f7 100644
--- a/pkgs/by-name/ov/ovhcloud-cli/package.nix
+++ b/pkgs/by-name/ov/ovhcloud-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "ovhcloud-cli";
-  version = "0.7.1";
+  version = "0.8.1";
 
   src = fetchFromGitHub {
     owner = "ovh";
     repo = "ovhcloud-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pps6PuaIJxZ0ewrBXgq4TnICOW3wjHJQDDmcQUfYDNg=";
+    hash = "sha256-Z5CMOZ1NJ0tcO/aKkFQetW/E0eURucv/CyT6KnoMCHQ=";
   };
 
   vendorHash = "sha256-WNONEceR/cDVloosQ/BMYjPTk9elQ1oTX89lgzENSAI=";

From 04eeba053638bbf3278ea90de945321005e60f56 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 22:58:55 +0000
Subject: [PATCH 4448/6226] python3Packages.aioesphomeapi: 42.2.0 -> 42.5.0

---
 pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index edeaabdb4575..61266462b20e 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "42.2.0";
+  version = "42.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "aioesphomeapi";
     tag = "v${version}";
-    hash = "sha256-3ao0RM+NFzbsj0Ws+A19S+OGwinZI+syU8PFgqcIYMU=";
+    hash = "sha256-naYlRUJFYnxI3mOR+th+Sh2xSnAq67HSRdoopLLbqYo=";
   };
 
   build-system = [

From 2aa60580ff13b2403b2c37aff3c97964b83f5276 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 15:58:06 -0700
Subject: [PATCH 4449/6226] python3Packages.sfrbox-api: 0.0.12 -> 0.1.0

Diff: https://github.com/hacf-fr/sfrbox-api/compare/v0.0.12...v0.1.0

Changelog: https://github.com/hacf-fr/sfrbox-api/releases/tag/v0.1.0
---
 .../python-modules/sfrbox-api/default.nix     | 25 +++++++------------
 1 file changed, 9 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/sfrbox-api/default.nix b/pkgs/development/python-modules/sfrbox-api/default.nix
index dcffe7e23817..c65e60a4edc9 100644
--- a/pkgs/development/python-modules/sfrbox-api/default.nix
+++ b/pkgs/development/python-modules/sfrbox-api/default.nix
@@ -1,42 +1,35 @@
 {
   lib,
+  aiohttp,
+  aioresponses,
   buildPythonPackage,
   click,
   defusedxml,
   fetchFromGitHub,
-  httpx,
   mashumaro,
   poetry-core,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
-  respx,
 }:
 
 buildPythonPackage rec {
   pname = "sfrbox-api";
-  version = "0.0.12";
+  version = "0.1.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "hacf-fr";
     repo = "sfrbox-api";
     tag = "v${version}";
-    hash = "sha256-LUQwBzNNuH+hBAGAF7Qcc22I6u53rh+RDRrUuy9xhu8=";
+    hash = "sha256-B29wpOr8yClAuA0KfWTCs4nRLOm2gMU8ayyr5VbF+qQ=";
   };
 
-  pythonRelaxDeps = [
-    "defusedxml"
-  ];
-
   build-system = [ poetry-core ];
 
   dependencies = [
+    aiohttp
     defusedxml
     mashumaro
-    httpx
   ];
 
   optional-dependencies = {
@@ -44,20 +37,20 @@ buildPythonPackage rec {
   };
 
   nativeCheckInputs = [
+    aioresponses
     pytest-asyncio
     pytestCheckHook
-    respx
   ]
   ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   pythonImportsCheck = [ "sfrbox_api" ];
 
-  meta = with lib; {
+  meta = {
     description = "Module for the SFR Box API";
     homepage = "https://github.com/hacf-fr/sfrbox-api";
     changelog = "https://github.com/hacf-fr/sfrbox-api/releases/tag/${src.tag}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "sfrbox-api";
   };
 }

From 569dba35bb415fdd7ab3045ba9621f14e01c0589 Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Thu, 30 Oct 2025 23:19:26 -0400
Subject: [PATCH 4450/6226] python313Packages.pydicom: add missing
 pydicom[pixeldata] optdepends

Also moved tests to passthru to break dependency cycle
---
 .../python-modules/pydicom/default.nix            | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pydicom/default.nix b/pkgs/development/python-modules/pydicom/default.nix
index fe473e4f0c57..0a8ca2dcf87c 100644
--- a/pkgs/development/python-modules/pydicom/default.nix
+++ b/pkgs/development/python-modules/pydicom/default.nix
@@ -10,7 +10,9 @@
   # optional/test dependencies
   gdcm,
   pillow,
+  pydicom,
   pyjpegls,
+  pylibjpeg,
   pylibjpeg-libjpeg,
   writableTmpDirAsHomeHook,
 }:
@@ -46,11 +48,12 @@ buildPythonPackage rec {
     pixeldata = [
       pillow
       pyjpegls
-      #pylibjpeg.optional-dependencies.openjpeg # infinite recursion
-      #pylibjpeg.optional-dependencies.rle # infinite recursion
+      pylibjpeg
       pylibjpeg-libjpeg
       gdcm
-    ];
+    ]
+    ++ pylibjpeg.optional-dependencies.openjpeg
+    ++ pylibjpeg.optional-dependencies.rle;
   };
 
   nativeCheckInputs = [
@@ -61,6 +64,12 @@ buildPythonPackage rec {
 
   passthru.pydicom-data = test_data;
 
+  doCheck = false; # circular dependency
+
+  passthru.tests.pytest = pydicom.overridePythonAttrs {
+    doCheck = true;
+  };
+
   # Setting $HOME to prevent pytest to try to create a folder inside
   # /homeless-shelter which is read-only.
   # Linking pydicom-data dicom files to $HOME/.pydicom/data

From 31494ac98d315cedd0c26bd3380988ea770bc518 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:10:41 +0100
Subject: [PATCH 4451/6226] python313Packages.asyncwhois: 1.1.10 -> 1.1.12

Diff: https://github.com/pogzyb/asyncwhois/compare/v1.1.10...v1.1.12

Changelog: https://github.com/pogzyb/asyncwhois/releases/tag/v1.1.12
---
 pkgs/development/python-modules/asyncwhois/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/asyncwhois/default.nix b/pkgs/development/python-modules/asyncwhois/default.nix
index c74ba0d38046..c26d3c2f5a78 100644
--- a/pkgs/development/python-modules/asyncwhois/default.nix
+++ b/pkgs/development/python-modules/asyncwhois/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "asyncwhois";
-  version = "1.1.10";
+  version = "1.1.12";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "pogzyb";
     repo = "asyncwhois";
     tag = "v${version}";
-    hash = "sha256-vNXz8a0tXMxgcJ3xGKyJFgxQuIxpBg/xUeeG1TPXB0E=";
+    hash = "sha256-bi8tBT6htxEgE/qoDID2GykCrHVfpe8EcH/Mbq9B0T4=";
   };
 
   build-system = [ hatchling ];

From 0d5f9e66414c57c8ac5d77d34c348d3492b71add Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 31 Oct 2025 11:12:27 +0100
Subject: [PATCH 4452/6226] ci/eval: add extraNixpkgsConfig argument

---
 ci/eval/attrpaths.nix | 2 ++
 ci/eval/chunk.nix     | 2 ++
 ci/eval/default.nix   | 4 ++++
 ci/eval/outpaths.nix  | 6 +++++-
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/ci/eval/attrpaths.nix b/ci/eval/attrpaths.nix
index 6938e5dfe3cb..ff1bdabbb350 100644
--- a/ci/eval/attrpaths.nix
+++ b/ci/eval/attrpaths.nix
@@ -18,6 +18,7 @@
   lib ? import (path + "/lib"),
   trace ? false,
   path ? ./../..,
+  extraNixpkgsConfigJson ? "{}",
 }:
 let
 
@@ -46,6 +47,7 @@ let
 
   outpaths = import ./outpaths.nix {
     inherit path;
+    extraNixpkgsConfig = builtins.fromJSON extraNixpkgsConfigJson;
     attrNamesOnly = true;
   };
 
diff --git a/ci/eval/chunk.nix b/ci/eval/chunk.nix
index 43c684074602..e1759c2c6615 100644
--- a/ci/eval/chunk.nix
+++ b/ci/eval/chunk.nix
@@ -8,6 +8,7 @@
   myChunk,
   includeBroken,
   systems,
+  extraNixpkgsConfigJson,
 }:
 
 let
@@ -17,6 +18,7 @@ let
   unfiltered = import ./outpaths.nix {
     inherit path;
     inherit includeBroken systems;
+    extraNixpkgsConfig = builtins.fromJSON extraNixpkgsConfigJson;
   };
 
   # Turns the unfiltered recursive attribute set into one that is limited to myAttrpaths
diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 23a2d4cb4f72..a4eb839570a1 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -26,6 +26,8 @@
   quickTest ? false,
   # Don't try to eval packages marked as broken.
   includeBroken ? false,
+  # Customize the config used to evaluate nixpkgs
+  extraNixpkgsConfig ? { },
 }:
 
 let
@@ -75,6 +77,7 @@ let
             "$src/ci/eval/attrpaths.nix" \
             -A paths \
             -I "$src" \
+            --argstr extraNixpkgsConfigJson ${lib.escapeShellArg (builtins.toJSON extraNixpkgsConfig)} \
             --option restrict-eval true \
             --option allow-import-from-derivation false \
             --option eval-system "${evalSystem}" > $out/paths.json
@@ -120,6 +123,7 @@ let
           --arg attrpathFile "${attrpathFile}" \
           --arg systems "[ \"$system\" ]" \
           --arg includeBroken ${lib.boolToString includeBroken} \
+          --argstr extraNixpkgsConfigJson ${lib.escapeShellArg (builtins.toJSON extraNixpkgsConfig)} \
           -I ${nixpkgs} \
           -I ${attrpathFile} \
           > "$outputDir/result/$myChunk" \
diff --git a/ci/eval/outpaths.nix b/ci/eval/outpaths.nix
index 6d003dafc3c9..9abe08e1b165 100644
--- a/ci/eval/outpaths.nix
+++ b/ci/eval/outpaths.nix
@@ -11,6 +11,9 @@
 
   # Set this to `null` to build for builtins.currentSystem only
   systems ? builtins.fromJSON (builtins.readFile ../supportedSystems.json),
+
+  # Customize the config used to evaluate nixpkgs
+  extraNixpkgsConfig ? { },
 }:
 let
   lib = import (path + "/lib");
@@ -55,7 +58,8 @@ let
                 true;
 
             inHydra = true;
-          };
+          }
+          // extraNixpkgsConfig;
 
           __allowFileset = false;
         };

From 5a967f4a1ec77245fafae1247979f75c03276eca Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Tue, 8 Jul 2025 20:08:38 +0200
Subject: [PATCH 4453/6226] nixos/kubo: increase maximum UDP buffer sizes

The [quic-go wiki](https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes) now recommends a larger maximum send- and receive buffer size.
The change to the documentation was made in April 2024: https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes/_compare/597639d834d5d6c242d37d49a02ed04ca65332c9...a3327deff89d2428d48596ce0e643531f9944f99.

Without this change, the Kubo daemon will output this warning:
```
failed to sufficiently increase receive buffer size (was: 208 kiB, wanted: 7168 kiB, got: 4882 kiB). See https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes for details.
```
This can be seen while running the NixOS tests.
---
 nixos/modules/services/network-filesystems/kubo.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix
index 87d83971c706..8c1053f3a55a 100644
--- a/nixos/modules/services/network-filesystems/kubo.nix
+++ b/nixos/modules/services/network-filesystems/kubo.nix
@@ -330,8 +330,8 @@ in
     environment.variables.IPFS_PATH = fakeKuboRepo;
 
     # https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes
-    boot.kernel.sysctl."net.core.rmem_max" = lib.mkDefault 2500000;
-    boot.kernel.sysctl."net.core.wmem_max" = lib.mkDefault 2500000;
+    boot.kernel.sysctl."net.core.rmem_max" = lib.mkDefault 7500000;
+    boot.kernel.sysctl."net.core.wmem_max" = lib.mkDefault 7500000;
 
     programs.fuse = lib.mkIf cfg.autoMount {
       userAllowOther = true;

From 5fcc08a90708e5752f84e07bd6174f353dc23d28 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Sun, 19 Oct 2025 12:39:48 +0200
Subject: [PATCH 4454/6226] kubo: 0.36.0 -> 0.37.0

https://github.com/ipfs/kubo/releases/tag/v0.37.0

Kubo v0.37.0 embeds the repository migration from repo version v16 to v17 and the kubo-fs-repo-migrations package will not reveive any more updates.
I'll keep the `kubo-fs-repo-migrations` and `kubo-migrator` packages around for now until a future version of Kubo no longer supports calling the external migration binaries.
Since the (newest) migrations are now built into Kubo, the NixOS module now needs to call `ipfs repo migrate --to=xx --allow-downgrade` instead of `fs-repo-migrations --to xx -y`.
The `--allow-downgrade` flag is only there for the unlikely situation that someone downgrades their local Kubo version with an overlay, separate channel input or similar means. It does however not work for rolling back the NixOS generation after a Kubo upgrade which increases the repo version (not all Kubo upgrades increase the repo version). This is because the Kubo version of the previous NixOS generation doesn't have the code for upgrading to or downgrading from the newer repo version.
Since we only have one version of Kubo in Nixpkgs at a time, migrations cannot be tested automatically. I manually verified that `ipfs repo migrate` uses binaries like `fs-repo-15-to-16` provided by the `kubo-fs-repo-migrations` packages for older migrations. I also tested that the migration from v16 to v17 works on my machine using the NixOS module.
---
 nixos/modules/services/network-filesystems/kubo.nix | 10 ++++------
 pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix |  3 ++-
 pkgs/by-name/ku/kubo/package.nix                    |  6 +++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix
index 8c1053f3a55a..de4718229797 100644
--- a/nixos/modules/services/network-filesystems/kubo.nix
+++ b/nixos/modules/services/network-filesystems/kubo.nix
@@ -167,7 +167,7 @@ in
       autoMigrate = lib.mkOption {
         type = lib.types.bool;
         default = true;
-        description = "Whether Kubo should try to run the fs-repo-migration at startup.";
+        description = "Whether Kubo should try to migrate its filesystem repository automatically.";
       };
 
       enableGC = lib.mkOption {
@@ -344,9 +344,6 @@ in
         createHome = false;
         uid = config.ids.uids.ipfs;
         description = "IPFS daemon user";
-        packages = [
-          pkgs.kubo-migrator
-        ];
       };
     };
 
@@ -377,6 +374,7 @@ in
       path = [
         "/run/wrappers"
         cfg.package
+        pkgs.kubo-fs-repo-migrations # Used by 'ipfs repo migrate --to=...'
       ];
       environment.IPFS_PATH = cfg.dataDir;
 
@@ -388,7 +386,7 @@ in
           rm -vf "$IPFS_PATH/api"
       ''
       + lib.optionalString cfg.autoMigrate ''
-        '${lib.getExe pkgs.kubo-migrator}' -to '${cfg.package.repoVersion}' -y
+        '${lib.getExe cfg.package}' repo migrate '--to=${cfg.package.repoVersion}' --allow-downgrade
       ''
       + ''
         fi
@@ -412,7 +410,7 @@ in
       serviceConfig = {
         ExecStart = [
           ""
-          "${cfg.package}/bin/ipfs daemon ${kuboFlags}"
+          "${lib.getExe cfg.package} daemon ${kuboFlags}"
         ];
         User = cfg.user;
         Group = cfg.group;
diff --git a/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix b/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix
index 7496c1ed274c..463a79a43405 100644
--- a/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix
+++ b/pkgs/by-name/ku/kubo-fs-repo-migrations/package.nix
@@ -258,7 +258,8 @@ symlinkJoin {
     longDescription = ''
       This package contains all the individual migrations in the bin directory.
       This is used by fs-repo-migrations and could also be used by Kubo itself
-      when starting it like this: ipfs daemon --migrate
+      when starting it like this: `ipfs daemon --migrate`
+      or when calling `ipfs repo migrate --to=16`.
     '';
   };
 }
diff --git a/pkgs/by-name/ku/kubo/package.nix b/pkgs/by-name/ku/kubo/package.nix
index fc6930a8dfe7..5d18579daba1 100644
--- a/pkgs/by-name/ku/kubo/package.nix
+++ b/pkgs/by-name/ku/kubo/package.nix
@@ -8,15 +8,15 @@
 
 buildGoModule rec {
   pname = "kubo";
-  version = "0.36.0"; # When updating, also check if the repo version changed and adjust repoVersion below
+  version = "0.37.0"; # When updating, also check if the repo version changed and adjust repoVersion below
   rev = "v${version}";
 
-  passthru.repoVersion = "16"; # Also update kubo-migrator when changing the repo version
+  passthru.repoVersion = "17";
 
   # Kubo makes changes to its source tarball that don't match the git source.
   src = fetchurl {
     url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
-    hash = "sha256-JbWt6d1cX3F2lmivjszcxcyE+wKYk+Sy03xhb4E3oHw=";
+    hash = "sha256-/7yWGxqqbiUajkWF5/YL/HUpH0/aevutQwy70VJuieA=";
   };
 
   # tarball contains multiple files/directories

From b8f0ee5c0c22bb3879459271232e74b195e5c287 Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Sun, 19 Oct 2025 15:08:25 +0200
Subject: [PATCH 4455/6226] kubo: 0.37.0 -> 0.38.2

https://github.com/ipfs/kubo/releases/tag/v0.38.0
https://github.com/ipfs/kubo/releases/tag/v0.38.1
https://github.com/ipfs/kubo/releases/tag/v0.38.2
---
 pkgs/by-name/ku/kubo/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ku/kubo/package.nix b/pkgs/by-name/ku/kubo/package.nix
index 5d18579daba1..70636ced3a48 100644
--- a/pkgs/by-name/ku/kubo/package.nix
+++ b/pkgs/by-name/ku/kubo/package.nix
@@ -8,15 +8,15 @@
 
 buildGoModule rec {
   pname = "kubo";
-  version = "0.37.0"; # When updating, also check if the repo version changed and adjust repoVersion below
+  version = "0.38.2"; # When updating, also check if the repo version changed and adjust repoVersion below
   rev = "v${version}";
 
-  passthru.repoVersion = "17";
+  passthru.repoVersion = "18";
 
   # Kubo makes changes to its source tarball that don't match the git source.
   src = fetchurl {
     url = "https://github.com/ipfs/kubo/releases/download/${rev}/kubo-source.tar.gz";
-    hash = "sha256-/7yWGxqqbiUajkWF5/YL/HUpH0/aevutQwy70VJuieA=";
+    hash = "sha256-A02edHUZoU2oQk4OyCmc/wMfk3k+EWkdO2RxPGlUrXg=";
   };
 
   # tarball contains multiple files/directories

From 4b8be773cceee527b4b4f5df057e35ec9a1d7bfa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 23:39:59 +0000
Subject: [PATCH 4456/6226] terraform-providers.selectel_selectel: 6.8.0 ->
 7.1.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 2397935afcba..1fcd39fe612c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1192,13 +1192,13 @@
     "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0="
   },
   "selectel_selectel": {
-    "hash": "sha256-J0hz5qtT3bBKqoZ9SkZn0oxix1fIQRmwv7feME7CljM=",
+    "hash": "sha256-qGqoljx5G7fmqrnhfVll+hX1afR3+3blcY1Hob5ujYY=",
     "homepage": "https://registry.terraform.io/providers/selectel/selectel",
     "owner": "selectel",
     "repo": "terraform-provider-selectel",
-    "rev": "v6.8.0",
+    "rev": "v7.1.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-TQXj2Em665zhCqXiT2BG1xxvVCo0/G2SaQKUbqGwcQM="
+    "vendorHash": "sha256-K70gvX9XcMoDCNQk9k7dtBBQxYSiS3TkqGBxMK3pOK0="
   },
   "siderolabs_talos": {
     "hash": "sha256-PPD4blyXt4/IalzwEn4+lvuD1Qx7VuUD/CUJILDRI5k=",

From 6fc9854dda0831fdb41ccf3d9571fda8b244b2c6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 23:51:19 +0000
Subject: [PATCH 4457/6226] stackit-cli: 0.45.0 -> 0.46.0

---
 pkgs/by-name/st/stackit-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/stackit-cli/package.nix b/pkgs/by-name/st/stackit-cli/package.nix
index 48fda0c614f6..a81bb73492bf 100644
--- a/pkgs/by-name/st/stackit-cli/package.nix
+++ b/pkgs/by-name/st/stackit-cli/package.nix
@@ -12,16 +12,16 @@
 
 buildGoModule rec {
   pname = "stackit-cli";
-  version = "0.45.0";
+  version = "0.46.0";
 
   src = fetchFromGitHub {
     owner = "stackitcloud";
     repo = "stackit-cli";
     rev = "v${version}";
-    hash = "sha256-fZ1SlWmPfxhUrLU7mzhM1IP93QgCg2EO3b1JjFDTkcY=";
+    hash = "sha256-f7Af7Zk8rRrYyGChMgAM/a2Cs7fo3ZlN78aq5teZ0oo=";
   };
 
-  vendorHash = "sha256-pgO+KN6s9MNsOaTiiX4xxsVYPPE5KoTDvG9R8vlRiTw=";
+  vendorHash = "sha256-tMPj4w/9fO9NlmwZoN4F3G4Cc+8wLmAr+fTueHGBn+A=";
 
   subPackages = [ "." ];
 

From 77e154c591c62a15bf96b0011a8785fe949959fa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 23:56:35 +0000
Subject: [PATCH 4458/6226] python3Packages.paddleocr: 3.2.0 -> 3.3.1

---
 pkgs/development/python-modules/paddleocr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/paddleocr/default.nix b/pkgs/development/python-modules/paddleocr/default.nix
index d25a209c63b8..012d9f3186bc 100644
--- a/pkgs/development/python-modules/paddleocr/default.nix
+++ b/pkgs/development/python-modules/paddleocr/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "paddleocr";
-  version = "3.2.0";
+  version = "3.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "PaddlePaddle";
     repo = "PaddleOCR";
     tag = "v${version}";
-    hash = "sha256-lrFwrbDzOYFzZEz+P0roTtQMxeWBCDZuEVviyUzM3M4=";
+    hash = "sha256-cXxt/SxOVDcI+00WLSySSxMDU6qSHik+MWAZ6y4wRJw=";
   };
 
   patches = [

From 3e5b8617dee9fcd02acf90d05b44b46bf32f5fe9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 00:11:54 +0000
Subject: [PATCH 4459/6226] bottles-unwrapped: 51.24 -> 51.25

---
 pkgs/by-name/bo/bottles-unwrapped/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix
index be62985a1590..49c8d15fcf77 100644
--- a/pkgs/by-name/bo/bottles-unwrapped/package.nix
+++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix
@@ -32,13 +32,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "bottles-unwrapped";
-  version = "51.24";
+  version = "51.25";
 
   src = fetchFromGitHub {
     owner = "bottlesdevs";
     repo = "bottles";
     tag = version;
-    hash = "sha256-cKW2b8MVpVksDnthn9kPBtUoCiiCMTQ993KTJSJuZDE=";
+    hash = "sha256-W25MpdXLO+vcMvvCJmA87lB9WiBOJHsWp8D/LU0xjAY=";
   };
 
   patches = [

From 9cfa421ad0482159eebea17631e3ce781a8e43ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 00:21:45 +0000
Subject: [PATCH 4460/6226] abracadabra: 3.3.1 -> 3.3.2

---
 pkgs/by-name/ab/abracadabra/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ab/abracadabra/package.nix b/pkgs/by-name/ab/abracadabra/package.nix
index e69274fb39b5..da69e5021756 100644
--- a/pkgs/by-name/ab/abracadabra/package.nix
+++ b/pkgs/by-name/ab/abracadabra/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "abracadabra";
-  version = "3.3.1";
+  version = "3.3.2";
 
   src = fetchFromGitHub {
     owner = "KejPi";
     repo = "AbracaDABra";
     tag = "v${version}";
-    hash = "sha256-cx5Kq5V0XTUJdqEDI0iDICIygbYkGu8JwdCACNLMgtY=";
+    hash = "sha256-QR3wc+eltIpmdNpyzQqJd4Zo40JVlTzRBNSr11tE0X8=";
   };
 
   nativeBuildInputs = [

From ed5cc06b1afeb3ba773a8e9a8c20b1579ccc7332 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 00:23:33 +0000
Subject: [PATCH 4461/6226] cargo-tauri: 2.9.1 -> 2.9.2

---
 pkgs/by-name/ca/cargo-tauri/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix
index 119d6352fdfa..3fa44d6fe442 100644
--- a/pkgs/by-name/ca/cargo-tauri/package.nix
+++ b/pkgs/by-name/ca/cargo-tauri/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tauri";
-  version = "2.9.1";
+  version = "2.9.2";
 
   src = fetchFromGitHub {
     owner = "tauri-apps";
     repo = "tauri";
     tag = "tauri-cli-v${finalAttrs.version}";
-    hash = "sha256-MOhcTG8r7kDVTg5PY1rmrkd8U94CqT7RdPSfaakqf2M=";
+    hash = "sha256-kkCeNQL5NR7DGKa3rbPx3NRQv1vAOHw741icHmzj5v8=";
   };
 
-  cargoHash = "sha256-lWBCMS7xFEqXPpMpBzfZmdwQOq8Yaux83FGFaRyaBNg=";
+  cargoHash = "sha256-oTL/kwvuFio7RTnpVqeEXNsWCsNUKY8GlNlh+59LVxg=";
 
   nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [
     pkg-config

From 507c9d83371b9c8b0e7abee0a0c8793b6e349ba2 Mon Sep 17 00:00:00 2001
From: kero0 <kbakheat@gmail.com>
Date: Fri, 31 Oct 2025 20:25:34 -0400
Subject: [PATCH 4462/6226] mpd: fix build on darwin

---
 pkgs/by-name/mp/mpd/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/mp/mpd/package.nix b/pkgs/by-name/mp/mpd/package.nix
index 3bcc8851ae0a..661f95ed122b 100644
--- a/pkgs/by-name/mp/mpd/package.nix
+++ b/pkgs/by-name/mp/mpd/package.nix
@@ -234,7 +234,13 @@ stdenv.mkDerivation (finalAttrs: {
         substituteInPlace src/output/plugins/OSXOutputPlugin.cxx \
           --replace kAudioObjectPropertyElement{Main,Master} \
           --replace kAudioHardwareServiceDeviceProperty_Virtual{Main,Master}Volume
-      '';
+      ''
+    +
+      lib.optionalString
+        (stdenv.hostPlatform.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinSdkVersion "13.3")
+        ''
+          sed -i "/subdir('time')/d" test/meson.build
+        '';
 
   # Otherwise, the meson log says:
   #

From d4de40a650dda54149348d7664e545c211276aec Mon Sep 17 00:00:00 2001
From: Xaver Wenhart <git@xavwe.dev>
Date: Tue, 19 Aug 2025 23:13:52 +0200
Subject: [PATCH 4463/6226] literata: init at 3.103

---
 pkgs/by-name/li/literata/package.nix | 32 ++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 pkgs/by-name/li/literata/package.nix

diff --git a/pkgs/by-name/li/literata/package.nix b/pkgs/by-name/li/literata/package.nix
new file mode 100644
index 000000000000..30b06fa81592
--- /dev/null
+++ b/pkgs/by-name/li/literata/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchzip,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "literata";
+  version = "3.103";
+
+  src = fetchzip {
+    url = "https://github.com/googlefonts/literata/releases/download/${finalAttrs.version}/${finalAttrs.version}.zip";
+    hash = "sha256-XwwvyzwO2uhi1Bay9HtB75j1QfAJR4TMETgy/zyvwZ0=";
+    stripRoot = false;
+  };
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/share/fonts/truetype
+    find . -name "*.ttf" -exec cp {} "$out/share/fonts/truetype/" \;
+
+    runHook postInstall
+  '';
+
+  meta = {
+    description = "A serif typeface designed for ebooks and optimized for reading";
+    homepage = "https://github.com/googlefonts/literata";
+    license = lib.licenses.ofl;
+    maintainers = with lib.maintainers; [ xavwe ];
+    platforms = lib.platforms.all;
+  };
+})

From a616813a9a1593ff94252e416e3ff8815d122158 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Fri, 31 Oct 2025 00:01:15 -0400
Subject: [PATCH 4464/6226] driftnet: 1.5.0 -> 1.6.0

---
 pkgs/by-name/dr/driftnet/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/dr/driftnet/package.nix b/pkgs/by-name/dr/driftnet/package.nix
index 5d5d3c54c250..7c7fdb19d060 100644
--- a/pkgs/by-name/dr/driftnet/package.nix
+++ b/pkgs/by-name/dr/driftnet/package.nix
@@ -6,7 +6,7 @@
   fetchFromGitHub,
   giflib,
   glib,
-  gtk2-x11,
+  gtk3,
   libjpeg,
   libpcap,
   libpng,
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "driftnet";
-  version = "1.5.0";
+  version = "1.6.0";
 
   src = fetchFromGitHub {
     owner = "deiv";
     repo = "driftnet";
     tag = "v${version}";
-    hash = "sha256-lMn60vtOMPs1Tr+SnAOUZDrNIO7gEXdHpizjXiEkkoM=";
+    hash = "sha256-f7EPC/n3CyxVOXC6j43Nnwkgu/aDVst8lQpzfgegDsI=";
   };
 
   enableParallelBuilding = true;
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     cairo
     giflib
     glib
-    gtk2-x11
+    gtk3
     libjpeg
     libpcap
     libpng

From 9b5248ca0ec240223c0a2ad5f10cec37041a07b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 00:58:55 +0000
Subject: [PATCH 4465/6226] terraform-providers.bpg_proxmox: 0.85.1 -> 0.86.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 2397935afcba..19e5f37cabc3 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -100,13 +100,13 @@
     "vendorHash": null
   },
   "bpg_proxmox": {
-    "hash": "sha256-OCgBc+rQnWnehgzZRymsCsLkr13tW9wB+aY7lKBlgRo=",
+    "hash": "sha256-VVLezja8qq+2sZHwHsXJ5oIAG76+Z60hkcGP7oNPIqA=",
     "homepage": "https://registry.terraform.io/providers/bpg/proxmox",
     "owner": "bpg",
     "repo": "terraform-provider-proxmox",
-    "rev": "v0.85.1",
+    "rev": "v0.86.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-XivDgvuoSq8fboZTOa5yh3t+k1ouHEhhF4iwlrhEfCo="
+    "vendorHash": "sha256-01KdQygPJap5cmk8bItHCtHIbBYHYti20KNQDj4uC68="
   },
   "brightbox_brightbox": {
     "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=",

From a60985f50c50c4ab87a5233418ec04ebee026815 Mon Sep 17 00:00:00 2001
From: Wolfgang Meier <womeier@posteo.de>
Date: Sat, 1 Nov 2025 02:16:49 +0100
Subject: [PATCH 4466/6226] wasmcert 2.2.0 is compatible with 9.0

---
 pkgs/development/coq-modules/wasmcert/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/coq-modules/wasmcert/default.nix b/pkgs/development/coq-modules/wasmcert/default.nix
index 60cdc24283e8..124e78b285b8 100644
--- a/pkgs/development/coq-modules/wasmcert/default.nix
+++ b/pkgs/development/coq-modules/wasmcert/default.nix
@@ -32,7 +32,7 @@ mkCoqDerivation {
     lib.switch
       [ coq.coq-version mathcomp-boot.version ]
       [
-        (case (isEq "8.20") (isEq "2.4") "2.2.0")
+        (case (range "8.20" "9.0") (isEq "2.4") "2.2.0")
       ]
       null;
 

From 700c1538acf97ed18d270ba093c9620e9832b7b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 01:29:49 +0000
Subject: [PATCH 4467/6226] nakama: 3.32.1 -> 3.33.0

---
 pkgs/by-name/na/nakama/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/na/nakama/package.nix b/pkgs/by-name/na/nakama/package.nix
index 6ea82575b579..7790fe196058 100644
--- a/pkgs/by-name/na/nakama/package.nix
+++ b/pkgs/by-name/na/nakama/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "nakama";
-  version = "3.32.1";
+  version = "3.33.0";
 
   src = fetchFromGitHub {
     owner = "heroiclabs";
     repo = "nakama";
     tag = "v${version}";
-    hash = "sha256-guoKppChjT4f1IOM4Cxg6XZkJrYNVv9gwOTy57t7wDs=";
+    hash = "sha256-GiUufoWLwWBuZxId+vMkJPaJIb/FWLJAJLb7WKoyn5M=";
   };
 
   vendorHash = null;

From 69d0dcad9e047cf5efd17c9550074d312f53c2a5 Mon Sep 17 00:00:00 2001
From: Cole Mickens <cole.mickens@gmail.com>
Date: Wed, 10 Sep 2025 15:19:43 -0700
Subject: [PATCH 4468/6226] prs: 0.5.2 -> 0.5.4

---
 pkgs/by-name/pr/prs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/prs/package.nix b/pkgs/by-name/pr/prs/package.nix
index 042eadab05ee..56cf6a577891 100644
--- a/pkgs/by-name/pr/prs/package.nix
+++ b/pkgs/by-name/pr/prs/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "prs";
-  version = "0.5.2";
+  version = "0.5.4";
 
   src = fetchFromGitLab {
     owner = "timvisee";
     repo = "prs";
     rev = "refs/tags/v${version}";
-    hash = "sha256-W5wNmZWjSsM6Xe50fCpa/aGsJ8PDyh2INs1Oj86et04=";
+    hash = "sha256-RWquV2apUazgGiwzTc0cMzKNItJOBZDSRMp13k+mhS0=";
   };
 
-  cargoHash = "sha256-IRWOY+FudPH2AEUTplwUWKK431x+CRkVF3VXxVWFKeI=";
+  cargoHash = "sha256-v5jZJQHXxMENJ5EbZjoI4sZ0EpCfVZOkOX442S1TReU=";
 
   nativeBuildInputs = [
     gpgme

From 9b316df866ea4b3cc2ae2a3472fd98da2604198b Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Fri, 31 Oct 2025 20:24:40 -0500
Subject: [PATCH 4469/6226] pkgs/games/doom-ports: migrate to by-name

---
 .../en/enyo-launcher/package.nix}                    |  0
 .../fmod.nix => by-name/fm/fmodex/package.nix}       |  0
 pkgs/by-name/za/zandronum-server/package.nix         |  7 +++++++
 .../default.nix => by-name/za/zandronum/package.nix} |  0
 .../doom-ports => by-name/za}/zandronum/sqlite.nix   |  0
 .../za}/zandronum/zan_configure_impurity.patch       |  0
 pkgs/top-level/all-packages.nix                      | 12 ------------
 7 files changed, 7 insertions(+), 12 deletions(-)
 rename pkgs/{games/doom-ports/enyo-launcher/default.nix => by-name/en/enyo-launcher/package.nix} (100%)
 rename pkgs/{games/doom-ports/zandronum/fmod.nix => by-name/fm/fmodex/package.nix} (100%)
 create mode 100644 pkgs/by-name/za/zandronum-server/package.nix
 rename pkgs/{games/doom-ports/zandronum/default.nix => by-name/za/zandronum/package.nix} (100%)
 rename pkgs/{games/doom-ports => by-name/za}/zandronum/sqlite.nix (100%)
 rename pkgs/{games/doom-ports => by-name/za}/zandronum/zan_configure_impurity.patch (100%)

diff --git a/pkgs/games/doom-ports/enyo-launcher/default.nix b/pkgs/by-name/en/enyo-launcher/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/enyo-launcher/default.nix
rename to pkgs/by-name/en/enyo-launcher/package.nix
diff --git a/pkgs/games/doom-ports/zandronum/fmod.nix b/pkgs/by-name/fm/fmodex/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/zandronum/fmod.nix
rename to pkgs/by-name/fm/fmodex/package.nix
diff --git a/pkgs/by-name/za/zandronum-server/package.nix b/pkgs/by-name/za/zandronum-server/package.nix
new file mode 100644
index 000000000000..12056a754794
--- /dev/null
+++ b/pkgs/by-name/za/zandronum-server/package.nix
@@ -0,0 +1,7 @@
+{
+  zandronum,
+}:
+
+zandronum.override {
+  serverOnly = true;
+}
diff --git a/pkgs/games/doom-ports/zandronum/default.nix b/pkgs/by-name/za/zandronum/package.nix
similarity index 100%
rename from pkgs/games/doom-ports/zandronum/default.nix
rename to pkgs/by-name/za/zandronum/package.nix
diff --git a/pkgs/games/doom-ports/zandronum/sqlite.nix b/pkgs/by-name/za/zandronum/sqlite.nix
similarity index 100%
rename from pkgs/games/doom-ports/zandronum/sqlite.nix
rename to pkgs/by-name/za/zandronum/sqlite.nix
diff --git a/pkgs/games/doom-ports/zandronum/zan_configure_impurity.patch b/pkgs/by-name/za/zandronum/zan_configure_impurity.patch
similarity index 100%
rename from pkgs/games/doom-ports/zandronum/zan_configure_impurity.patch
rename to pkgs/by-name/za/zandronum/zan_configure_impurity.patch
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2faee7e207fb..45ea67a634f3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -12999,18 +12999,6 @@ with pkgs;
 
   vanillara = callPackage ../by-name/va/vanillatd/package.nix { appName = "vanillara"; };
 
-  ### GAMES/DOOM-PORTS
-
-  enyo-launcher = libsForQt5.callPackage ../games/doom-ports/enyo-launcher { };
-
-  zandronum = callPackage ../games/doom-ports/zandronum { };
-
-  zandronum-server = zandronum.override {
-    serverOnly = true;
-  };
-
-  fmodex = callPackage ../games/doom-ports/zandronum/fmod.nix { };
-
   anki-utils = callPackage ../by-name/an/anki/addons/anki-utils.nix { };
   ankiAddons = recurseIntoAttrs (callPackage ../by-name/an/anki/addons { });
 

From b2a85b9ba2c17223f0667a82b7a0e0313ee5eb90 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 01:41:24 +0000
Subject: [PATCH 4470/6226] source-meta-json-schema: 12.0.0 -> 12.1.1

---
 pkgs/by-name/so/source-meta-json-schema/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/so/source-meta-json-schema/package.nix b/pkgs/by-name/so/source-meta-json-schema/package.nix
index ed3639ded3b5..157feee1c4ad 100644
--- a/pkgs/by-name/so/source-meta-json-schema/package.nix
+++ b/pkgs/by-name/so/source-meta-json-schema/package.nix
@@ -5,7 +5,7 @@
   cmake,
 }:
 let
-  version = "12.0.0";
+  version = "12.1.1";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "source-meta-json-schema";
@@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "sourcemeta";
     repo = "jsonschema";
     rev = "v${version}";
-    hash = "sha256-fhY/DNuQWzVWQC/Ur0Ksp5eW3S7flV2jEaVQiva160Q=";
+    hash = "sha256-LZxH+S0Vv6ZzQM5BU9f5eqwspPZXxQmweUF/EmHj2IU=";
   };
 
   nativeBuildInputs = [

From 7b6cf79ba274e295f8cdfbb5f804640ac6b18bcf Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sat, 1 Nov 2025 02:45:45 +0100
Subject: [PATCH 4471/6226] evcc: 0.209.5 -> 0.209.6

https://github.com/evcc-io/evcc/releases/tag/0.209.6
---
 pkgs/by-name/ev/evcc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix
index 8eb10fc382d2..31534c0271de 100644
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@@ -17,13 +17,13 @@
 }:
 
 let
-  version = "0.209.5";
+  version = "0.209.6";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     tag = version;
-    hash = "sha256-3qpuRutCCKJWYvHao4Ez9El40QYflhzhW4NTmi4hG1Q=";
+    hash = "sha256-WTfLnd2w9maCrCVHkJUZrry4LloiimNWZxRYVgHRyT8=";
   };
 
   vendorHash = "sha256-SVdoeioBtUa+V2n717ckYCQBFmYSXdi7ryRVfb9xKnY=";

From 414a3231fa2cda16f039440f98e57a870d4fb0f5 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Fri, 31 Oct 2025 22:41:16 +0000
Subject: [PATCH 4472/6226] sendme: 0.27.0 -> 0.30.0

Diff: https://github.com/n0-computer/sendme/compare/v0.27.0...v0.30.0
---
 pkgs/by-name/se/sendme/package.nix | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix
index 259e8bc8800c..1a44281ae6b8 100644
--- a/pkgs/by-name/se/sendme/package.nix
+++ b/pkgs/by-name/se/sendme/package.nix
@@ -6,25 +6,19 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sendme";
-  version = "0.27.0";
+  version = "0.30.0";
 
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = "sendme";
     rev = "v${version}";
-    hash = "sha256-A1dZH7qeQTsMaJdB4UejpP/HD5tE07gCHFv2Mb1ZXWY=";
+    hash = "sha256-LcSQuvNXSHqaiBE6GR3rNALAYPc9Xezf5cV8Im9qYMo=";
   };
 
-  cargoHash = "sha256-Iwm1VGxIBfuT3nXk5Si9gpDFJRjHBOc3nfE8DFvI5YE=";
+  cargoHash = "sha256-/hgkMWEokcOh3ebZ2pIunktJmuq0YpI6IixO7XoNRCk=";
 
-  __darwinAllowLocalNetworking = true;
-
-  # On Darwin, sendme invokes CoreFoundation APIs that read ICU data from the
-  # system. Ensure these paths are accessible in the sandbox to avoid segfaults
-  # during checkPhase.
-  sandboxProfile = ''
-    (allow file-read* (subpath "/usr/share/icu"))
-  '';
+  # The tests require contacting external servers.
+  doCheck = false;
 
   meta = with lib; {
     description = "Tool to send files and directories, based on iroh";

From 09f8d478566e05f27bb6772b68fe8449a9fce596 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 02:08:19 +0000
Subject: [PATCH 4473/6226] lux-cli: 0.18.7 -> 0.18.8

---
 pkgs/by-name/lu/lux-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix
index cd31f73f87ef..dd7c01bfeca8 100644
--- a/pkgs/by-name/lu/lux-cli/package.nix
+++ b/pkgs/by-name/lu/lux-cli/package.nix
@@ -18,18 +18,18 @@
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lux-cli";
 
-  version = "0.18.7";
+  version = "0.18.8";
 
   src = fetchFromGitHub {
     owner = "lumen-oss";
     repo = "lux";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nZslDD09PfETa0a3LuZGXlj7GETXTXK9vH8kpb40i9Y=";
+    hash = "sha256-AHmIdVkU4a+zmJPWfGkmRI7Mc/NdX+KokKHn9CZ9tOM=";
   };
 
   buildAndTestSubdir = "lux-cli";
 
-  cargoHash = "sha256-+j0Rs4aO+1BZ5fWN1we+MM9sJcXsupVF3LajhjJeoTA=";
+  cargoHash = "sha256-noOyrKNxfndkq7VlyxLs8R8FG+1xkwM7MbKu0vO4Nh8=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From bc10e7b12f1955dd6d7368319b7f2a5871ac670d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 02:25:40 +0000
Subject: [PATCH 4474/6226] debian-devscripts: 2.25.21 -> 2.25.22

---
 pkgs/by-name/de/debian-devscripts/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/de/debian-devscripts/package.nix b/pkgs/by-name/de/debian-devscripts/package.nix
index a9ec8c5e9203..6f920a4dd69a 100644
--- a/pkgs/by-name/de/debian-devscripts/package.nix
+++ b/pkgs/by-name/de/debian-devscripts/package.nix
@@ -30,14 +30,14 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "debian-devscripts";
-  version = "2.25.21";
+  version = "2.25.22";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "debian";
     repo = "devscripts";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5X3bhtUSCBUzIZ3EScppnK+VS2IxnmDwqt2BwQG4fMA=";
+    hash = "sha256-FiqM2n33tbzHgwZGZ2CaAvNTrAUgTuwMtNbXbn6EYJ4=";
   };
 
   patches = [

From 6015511bd9d0eb09498457eb04e8778a71554499 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 1 Nov 2025 10:44:24 +0800
Subject: [PATCH 4475/6226] vboot_reference: rename to vboot-utils

---
 pkgs/by-name/vb/{vboot_reference => vboot-utils}/package.nix | 0
 pkgs/top-level/aliases.nix                                   | 1 +
 2 files changed, 1 insertion(+)
 rename pkgs/by-name/vb/{vboot_reference => vboot-utils}/package.nix (100%)

diff --git a/pkgs/by-name/vb/vboot_reference/package.nix b/pkgs/by-name/vb/vboot-utils/package.nix
similarity index 100%
rename from pkgs/by-name/vb/vboot_reference/package.nix
rename to pkgs/by-name/vb/vboot-utils/package.nix
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b4a6e14d7d4e..b3ee95ce368a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1533,6 +1533,7 @@ mapAliases {
   vamp.vampSDK = throw "'vamp.vampSDK' has been renamed to/replaced by 'vamp-plugin-sdk'"; # Converted to throw 2025-10-27
   vaultwarden-vault = throw "'vaultwarden-vault' has been renamed to/replaced by 'vaultwarden.webvault'"; # Converted to throw 2025-10-27
   vbetool = throw "'vbetool' has been removed as it is broken and not maintained upstream."; # Added 2025-06-11
+  vboot_reference = vboot-utils; # Added 2025-11-01
   vc_0_7 = throw "'vc_0_7' has been removed as it was broken, unused in nixpkgs and unmaintained"; # Added 2025-10-20
   vdirsyncerStable = throw "'vdirsyncerStable' has been renamed to/replaced by 'vdirsyncer'"; # Converted to throw 2025-10-27
   ventoy-bin = throw "'ventoy-bin' has been renamed to/replaced by 'ventoy'"; # Converted to throw 2025-10-27

From e4aabc0530bc80210ae35cc570f93134d62aefde Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 1 Nov 2025 10:46:53 +0800
Subject: [PATCH 4476/6226] vboot-utils: migrate to finalAttrs

---
 pkgs/by-name/vb/vboot-utils/package.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vb/vboot-utils/package.nix b/pkgs/by-name/vb/vboot-utils/package.nix
index 3c9ffbf9a881..40d3246e4c37 100644
--- a/pkgs/by-name/vb/vboot-utils/package.nix
+++ b/pkgs/by-name/vb/vboot-utils/package.nix
@@ -9,13 +9,13 @@
   xz,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "vboot_reference";
   version = "135.16209";
 
   src = fetchFromGitiles {
     url = "https://chromium.googlesource.com/chromiumos/platform/vboot_reference";
-    rev = "bf4b21294a1c2c6b94f400819d3fce4a905b3afe"; # refs/heads/release-R135-16209.B
+    rev = "refs/heads/release-R${finalAttrs.passthru.versionFormatted}.B";
     hash = "sha256-frg7NkK173wAHJRedtbJI5jI8Kee/VkByh5DCUzD9OA=";
   };
 
@@ -56,10 +56,14 @@ stdenv.mkDerivation {
     cp -r tests/devkeys* $out/share/vboot/
   '';
 
+  passthru = {
+    versionFormatted = lib.concatStringsSep "-" (lib.versions.splitVersion finalAttrs.version);
+  };
+
   meta = {
     description = "Chrome OS partitioning and kernel signing tools";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.linux;
     maintainers = [ lib.maintainers.jmbaur ];
   };
-}
+})

From 2ccdc74273e5903dec078a8d7ed4285b5d30cf0b Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 1 Nov 2025 10:53:53 +0800
Subject: [PATCH 4477/6226] vboot-utils: 135.16209 -> 143.16463

---
 pkgs/by-name/vb/vboot-utils/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vb/vboot-utils/package.nix b/pkgs/by-name/vb/vboot-utils/package.nix
index 40d3246e4c37..baa9892df342 100644
--- a/pkgs/by-name/vb/vboot-utils/package.nix
+++ b/pkgs/by-name/vb/vboot-utils/package.nix
@@ -11,12 +11,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vboot_reference";
-  version = "135.16209";
+  version = "143.16463";
 
   src = fetchFromGitiles {
     url = "https://chromium.googlesource.com/chromiumos/platform/vboot_reference";
     rev = "refs/heads/release-R${finalAttrs.passthru.versionFormatted}.B";
-    hash = "sha256-frg7NkK173wAHJRedtbJI5jI8Kee/VkByh5DCUzD9OA=";
+    hash = "sha256-8a49xD+EYXDouFuBmLyAtPxThYET6DtKImBPzXVhpxE=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 9d748b82bb7fe80147ae8662ed9dc771a5a6490d Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 1 Nov 2025 10:56:36 +0800
Subject: [PATCH 4478/6226] vboot-utils: add flashrom support

---
 pkgs/by-name/vb/vboot-utils/package.nix | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vb/vboot-utils/package.nix b/pkgs/by-name/vb/vboot-utils/package.nix
index baa9892df342..051bb0ac0382 100644
--- a/pkgs/by-name/vb/vboot-utils/package.nix
+++ b/pkgs/by-name/vb/vboot-utils/package.nix
@@ -7,6 +7,9 @@
   openssl,
   libyaml,
   xz,
+  flashrom,
+
+  withFlashrom ? true,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -25,7 +28,8 @@ stdenv.mkDerivation (finalAttrs: {
     libyaml
     openssl
     xz
-  ];
+  ]
+  ++ lib.optional withFlashrom finalAttrs.passthru.flashromChromeos;
 
   enableParallelBuilding = true;
 
@@ -42,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
   makeFlags = [
     "DESTDIR=$(out)"
     "HOST_ARCH=${stdenv.hostPlatform.parsed.cpu.name}"
-    "USE_FLASHROM=0"
+    "USE_FLASHROM=${if withFlashrom then "1" else "0"}"
     # Upstream has weird opinions about DESTDIR
     # https://chromium.googlesource.com/chromiumos/platform/vboot_reference/+/refs/heads/release-R135-16209.B/Makefile#51
     "UB_DIR=${placeholder "out"}/bin"
@@ -58,6 +62,19 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru = {
     versionFormatted = lib.concatStringsSep "-" (lib.versions.splitVersion finalAttrs.version);
+    flashromChromeos = flashrom.overrideAttrs (_prev: {
+      src = fetchFromGitiles {
+        url = "https://chromium.googlesource.com/chromiumos/third_party/flashrom";
+        rev = "refs/heads/release-R${finalAttrs.passthru.versionFormatted}.B-master";
+        hash = "sha256-zOoWpuS/vDLvnRPdA9FNGhNbcwh3PMQwbdfqsyqj858=";
+      };
+
+      # requires git
+      mesonFlags = _prev.mesonFlags ++ [ (lib.mesonEnable "documentation" false) ];
+
+      # requires specific hardware
+      doCheck = false;
+    });
   };
 
   meta = {

From feb8b3e2e1a790ed4d373cd4fe3b4d8ada8ab6f5 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 1 Nov 2025 10:59:12 +0800
Subject: [PATCH 4479/6226] vboot-utils: fix flashrom not found

---
 pkgs/by-name/vb/vboot-utils/package.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/vb/vboot-utils/package.nix b/pkgs/by-name/vb/vboot-utils/package.nix
index 051bb0ac0382..030354e9326c 100644
--- a/pkgs/by-name/vb/vboot-utils/package.nix
+++ b/pkgs/by-name/vb/vboot-utils/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   fetchFromGitiles,
   pkg-config,
+  makeBinaryWrapper,
   libuuid,
   openssl,
   libyaml,
@@ -22,7 +23,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-8a49xD+EYXDouFuBmLyAtPxThYET6DtKImBPzXVhpxE=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  nativeBuildInputs = [
+    pkg-config
+    makeBinaryWrapper
+  ];
+
   buildInputs = [
     libuuid
     libyaml
@@ -58,6 +63,10 @@ stdenv.mkDerivation (finalAttrs: {
   postInstall = ''
     mkdir -p $out/share/vboot
     cp -r tests/devkeys* $out/share/vboot/
+  ''
+  + lib.optionalString withFlashrom ''
+    wrapProgram $out/bin/crossystem \
+      --prefix PATH : ${lib.makeBinPath [ finalAttrs.passthru.flashromChromeos ]}
   '';
 
   passthru = {

From e3115a58eefa26c8d05ecfbeacd46ae7b3260bd7 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 1 Nov 2025 11:07:36 +0800
Subject: [PATCH 4480/6226] vboot-utils: fix pname

---
 pkgs/by-name/vb/vboot-utils/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/vb/vboot-utils/package.nix b/pkgs/by-name/vb/vboot-utils/package.nix
index 030354e9326c..981202ea1fa0 100644
--- a/pkgs/by-name/vb/vboot-utils/package.nix
+++ b/pkgs/by-name/vb/vboot-utils/package.nix
@@ -14,7 +14,7 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  pname = "vboot_reference";
+  pname = "vboot-utils";
   version = "143.16463";
 
   src = fetchFromGitiles {

From cafc4d8754e92d9832593a253dd2723f7eb693f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 03:10:24 +0000
Subject: [PATCH 4481/6226] steampipe: 2.2.0 -> 2.3.1

---
 pkgs/by-name/st/steampipe/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/steampipe/package.nix b/pkgs/by-name/st/steampipe/package.nix
index 45d9c558fd2d..3d67ca9ce95c 100644
--- a/pkgs/by-name/st/steampipe/package.nix
+++ b/pkgs/by-name/st/steampipe/package.nix
@@ -11,7 +11,7 @@
 
 buildGoModule rec {
   pname = "steampipe";
-  version = "2.2.0";
+  version = "2.3.1";
 
   env.CGO_ENABLED = 0;
 
@@ -19,10 +19,10 @@ buildGoModule rec {
     owner = "turbot";
     repo = "steampipe";
     tag = "v${version}";
-    hash = "sha256-bYnwtGeFOtUfYzlx0o0jtfuyeItXU9LiO0fJy8UGv6k=";
+    hash = "sha256-be9Q3X/XZ7OdJChRxVFQzglhMfpLzbzaCfSn7hUR5AA=";
   };
 
-  vendorHash = "sha256-VHAbMgBISWWGhZBRl5JA0gytRSSdaFMCJUzMxmoNtPc=";
+  vendorHash = "sha256-1o7ANCyz19WSIkYYoA0DpYzkY2qBXHHSfAGrAG2+k88=";
   proxyVendor = true;
 
   postPatch = ''

From ee9c2d543bc744584120e412e5dbd01a0cbb5edc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 23 Sep 2025 02:46:19 -0700
Subject: [PATCH 4482/6226] igraph: 0.10.17 -> 1.0.0

Diff: https://github.com/igraph/igraph/compare/0.10.17...1.0.0

Changelog: https://github.com/igraph/igraph/blob/1.0.0/CHANGELOG.md
---
 pkgs/by-name/ig/igraph/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ig/igraph/package.nix b/pkgs/by-name/ig/igraph/package.nix
index 89400f253c05..0d9c5f99c6ba 100644
--- a/pkgs/by-name/ig/igraph/package.nix
+++ b/pkgs/by-name/ig/igraph/package.nix
@@ -25,13 +25,13 @@ assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !bla
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "igraph";
-  version = "0.10.17";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "igraph";
     repo = "igraph";
-    rev = finalAttrs.version;
-    hash = "sha256-NzLn2GXpMgwE8fY1vp5SU0Y7EfyVpQfphGdqU6sQGW4=";
+    tag = finalAttrs.version;
+    hash = "sha256-SwcihzISSmeVhpMrysOhWrUzVVuB4ZBVEjC0vHJwrdw=";
   };
 
   postPatch = ''
@@ -107,7 +107,7 @@ stdenv.mkDerivation (finalAttrs: {
   meta = with lib; {
     description = "C library for complex network analysis and graph theory";
     homepage = "https://igraph.org/";
-    changelog = "https://github.com/igraph/igraph/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/igraph/igraph/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = licenses.gpl2Plus;
     platforms = platforms.all;
     maintainers = with maintainers; [

From 6226de268933d103e8adfec4639f5284c1281749 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 24 Sep 2025 00:01:02 -0700
Subject: [PATCH 4483/6226] libleidenalg: 0.11.1 -> 0.12.0

Diff: https://github.com/vtraag/libleidenalg/compare/0.11.1...0.12.0

Changelog: https://github.com/vtraag/libleidenalg/releases/tag/0.12.0
---
 pkgs/by-name/li/libleidenalg/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/li/libleidenalg/package.nix b/pkgs/by-name/li/libleidenalg/package.nix
index 748cc5982264..7c0dfd5e5c2a 100644
--- a/pkgs/by-name/li/libleidenalg/package.nix
+++ b/pkgs/by-name/li/libleidenalg/package.nix
@@ -6,15 +6,15 @@
   igraph,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "libleidenalg";
-  version = "0.11.1";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "vtraag";
     repo = "libleidenalg";
-    tag = version;
-    hash = "sha256-hEES/OHvgN0yRDp5ZBZTCQfWr1j7s8NqE+Sp9WMHEEY=";
+    tag = finalAttrs.version;
+    hash = "sha256-ptfX31/1cUHLluc+Y+g28s4BEoGC0LqC9HH0cpkJRJQ=";
   };
 
   nativeBuildInputs = [
@@ -26,11 +26,11 @@ stdenv.mkDerivation rec {
   ];
 
   meta = {
-    changelog = "https://github.com/vtraag/libleidenalg/blob/${version}/CHANGELOG";
+    changelog = "https://github.com/vtraag/libleidenalg/blob/${finalAttrs.src.tag}/CHANGELOG";
     description = "C++ library of Leiden algorithm";
     homepage = "https://github.com/vtraag/libleidenalg";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [ dotlambda ];
     platforms = lib.platforms.all;
   };
-}
+})

From 7862797e08a92e72dc6cc8fc0f9fd65b58821538 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 23 Oct 2025 08:42:12 -0700
Subject: [PATCH 4484/6226] python3Packages.igraph: 0.11.9 -> 1.0.0

Diff: https://github.com/igraph/python-igraph/compare/0.11.9...1.0.0

Changelog: https://github.com/igraph/python-igraph/blob/refs/tags/1.0.0/CHANGELOG.md
---
 pkgs/development/python-modules/igraph/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/igraph/default.nix b/pkgs/development/python-modules/igraph/default.nix
index 1ca2dc1cc08c..59974797d4e5 100644
--- a/pkgs/development/python-modules/igraph/default.nix
+++ b/pkgs/development/python-modules/igraph/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "igraph";
-  version = "0.11.9";
+  version = "1.0.0";
 
   pyproject = true;
 
@@ -27,7 +27,7 @@ buildPythonPackage rec {
       # export-subst prevents reproducability
       rm $out/.git_archival.json
     '';
-    hash = "sha256-rmIICiIyEr5JCmkDAzcdisVaaKDraTQEquPHjK4d7oU=";
+    hash = "sha256-Y7ZQ1yNoD8A5b6c92OGz9Unietdg1uNt/Za6nxdCSP0=";
   };
 
   postPatch = ''

From 6f65820ed31189aee5566a27f03147b4f36b5a13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 13:33:01 -0700
Subject: [PATCH 4485/6226] python3Packages.leidenalg: 0.10.2 -> 0.11.0

Diff: https://github.com/vtraag/leidenalg/compare/0.10.2...0.11.0

Changelog: https://github.com/vtraag/leidenalg/blob/0.11.0/CHANGELOG
---
 .../python-modules/leidenalg/default.nix      | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/leidenalg/default.nix b/pkgs/development/python-modules/leidenalg/default.nix
index ce95c5bd7f26..85f25ad082f2 100644
--- a/pkgs/development/python-modules/leidenalg/default.nix
+++ b/pkgs/development/python-modules/leidenalg/default.nix
@@ -6,26 +6,23 @@
   igraph,
   igraph-c,
   libleidenalg,
-  pythonOlder,
   setuptools-scm,
   unittestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "leidenalg";
-  version = "0.10.2";
+  version = "0.11.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "vtraag";
     repo = "leidenalg";
     tag = version;
-    hash = "sha256-oaTV+BIB/YQBWKrVXuiIEMH/1MxPxeHhjUzbmxt6hlw=";
+    hash = "sha256-u4xW1gsWDpbsFVLlOIiPZtpw9t4iFBC7fzwn04flev8=";
   };
 
-  nativeBuildInputs = [ setuptools-scm ];
+  build-system = [ setuptools-scm ];
 
   buildInputs = [
     igraph-c
@@ -34,18 +31,18 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ igraph ];
 
-  checkInputs = [
+  nativeCheckInputs = [
     ddt
     unittestCheckHook
   ];
 
   pythonImportsCheck = [ "leidenalg" ];
 
-  meta = with lib; {
-    changelog = "https://github.com/vtraag/leidenalg/blob/${version}/CHANGELOG";
+  meta = {
+    changelog = "https://github.com/vtraag/leidenalg/blob/${src.tag}/CHANGELOG";
     description = "Implementation of the Leiden algorithm for various quality functions to be used with igraph in Python";
     homepage = "https://github.com/vtraag/leidenalg";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ jboy ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ jboy ];
   };
 }

From 7655529213230cc1b794c9e2911a305dc2ac11cc Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Sat, 1 Nov 2025 11:10:52 +0800
Subject: [PATCH 4486/6226] ubootPythonTools.binman: use vboot-utils

---
 pkgs/misc/uboot/python.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/misc/uboot/python.nix b/pkgs/misc/uboot/python.nix
index 0e1bb72b657f..dc81ec04f37f 100644
--- a/pkgs/misc/uboot/python.nix
+++ b/pkgs/misc/uboot/python.nix
@@ -12,7 +12,7 @@
   lzop,
   openssl,
   ubootTools,
-  vboot_reference,
+  vboot-utils,
   xilinx-bootgen,
   xz,
   zstd,
@@ -85,7 +85,7 @@ rec {
         lzop
         openssl
         ubootTools
-        vboot_reference
+        vboot-utils
         xilinx-bootgen
         xz
         zstd

From 70f655badfea4d625e2e3cfef54cd927d278619c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 03:12:10 +0000
Subject: [PATCH 4487/6226] pyenv: 2.6.11 -> 2.6.12

---
 pkgs/by-name/py/pyenv/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/py/pyenv/package.nix b/pkgs/by-name/py/pyenv/package.nix
index 2b665619c36a..625cd52110dd 100644
--- a/pkgs/by-name/py/pyenv/package.nix
+++ b/pkgs/by-name/py/pyenv/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pyenv";
-  version = "2.6.11";
+  version = "2.6.12";
 
   src = fetchFromGitHub {
     owner = "pyenv";
     repo = "pyenv";
     tag = "v${version}";
-    hash = "sha256-8k4R7Ctxa+9tb2fcfls4mqrTUR4wmP4zxJJInr0Q+oo=";
+    hash = "sha256-oGhdODWjE1FFcFdKUMAznUQ7kdWZMJ2M/ssBOEd+Ce0=";
   };
 
   nativeBuildInputs = [

From 162ee4c735cac0354eb6d8ce1336757951402481 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 03:12:52 +0000
Subject: [PATCH 4488/6226] python3Packages.garth: 0.5.18 -> 0.5.19

---
 pkgs/development/python-modules/garth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/garth/default.nix b/pkgs/development/python-modules/garth/default.nix
index f2714d2d0c8e..633956e1d73b 100644
--- a/pkgs/development/python-modules/garth/default.nix
+++ b/pkgs/development/python-modules/garth/default.nix
@@ -12,12 +12,12 @@
 
 buildPythonPackage rec {
   pname = "garth";
-  version = "0.5.18";
+  version = "0.5.19";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-+Df40ZYj5+Vo9IFFF+9wfGiKvhCWWy7hqhoBVZKsdx0=";
+    hash = "sha256-no9qxDtk6k5YXOEwFfwPJb4EylQRKOGorVIgvhwd4dY=";
   };
 
   pythonRelaxDeps = [ "requests-oauthlib" ];

From c3ed4686fe74c553110700cfae9daf86802587fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 20:08:40 -0700
Subject: [PATCH 4489/6226] igraph_0: init at 0.10.17

---
 pkgs/by-name/ig/igraph_0/package.nix | 112 +++++++++++++++++++++++++++
 1 file changed, 112 insertions(+)
 create mode 100644 pkgs/by-name/ig/igraph_0/package.nix

diff --git a/pkgs/by-name/ig/igraph_0/package.nix b/pkgs/by-name/ig/igraph_0/package.nix
new file mode 100644
index 000000000000..8ad73481f351
--- /dev/null
+++ b/pkgs/by-name/ig/igraph_0/package.nix
@@ -0,0 +1,112 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  arpack,
+  bison,
+  blas,
+  cmake,
+  flex,
+  fop,
+  glpk,
+  gmp,
+  hal-hardware-analyzer,
+  lapack,
+  libxml2,
+  libxslt,
+  llvmPackages,
+  pkg-config,
+  plfit,
+  python3,
+  sourceHighlight,
+  xmlto,
+}:
+
+assert (blas.isILP64 == lapack.isILP64 && blas.isILP64 == arpack.isILP64 && !blas.isILP64);
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "igraph";
+  version = "0.10.17";
+
+  src = fetchFromGitHub {
+    owner = "igraph";
+    repo = "igraph";
+    tag = finalAttrs.version;
+    hash = "sha256-NzLn2GXpMgwE8fY1vp5SU0Y7EfyVpQfphGdqU6sQGW4=";
+  };
+
+  postPatch = ''
+    echo "${finalAttrs.version}" > IGRAPH_VERSION
+  '';
+
+  outputs = [
+    "out"
+    "dev"
+    "doc"
+  ];
+
+  nativeBuildInputs = [
+    bison
+    cmake
+    flex
+    fop
+    libxml2
+    libxslt
+    pkg-config
+    python3
+    sourceHighlight
+    xmlto
+  ];
+
+  buildInputs = [
+    arpack
+    blas
+    glpk
+    gmp
+    lapack
+    libxml2
+    plfit
+  ]
+  ++ lib.optionals stdenv.cc.isClang [
+    llvmPackages.openmp
+  ];
+
+  cmakeFlags = [
+    "-DIGRAPH_USE_INTERNAL_BLAS=OFF"
+    "-DIGRAPH_USE_INTERNAL_LAPACK=OFF"
+    "-DIGRAPH_USE_INTERNAL_ARPACK=OFF"
+    "-DIGRAPH_USE_INTERNAL_GLPK=OFF"
+    "-DIGRAPH_USE_INTERNAL_GMP=OFF"
+    "-DIGRAPH_USE_INTERNAL_PLFIT=OFF"
+    "-DIGRAPH_GLPK_SUPPORT=ON"
+    "-DIGRAPH_GRAPHML_SUPPORT=ON"
+    "-DIGRAPH_OPENMP_SUPPORT=ON"
+    "-DIGRAPH_ENABLE_LTO=AUTO"
+    "-DIGRAPH_ENABLE_TLS=ON"
+    "-DBUILD_SHARED_LIBS=ON"
+  ];
+
+  doCheck = true;
+
+  postInstall = ''
+    mkdir -p "$out/share"
+    cp -r doc "$out/share"
+  '';
+
+  postFixup = ''
+    substituteInPlace $dev/lib/cmake/igraph/igraph-targets.cmake \
+      --replace-fail "_IMPORT_PREFIX \"$out\"" "_IMPORT_PREFIX \"$dev\""
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    install_name_tool -change libblas.dylib ${blas}/lib/libblas.dylib $out/lib/libigraph.dylib
+  '';
+
+  meta = with lib; {
+    description = "C library for complex network analysis and graph theory";
+    homepage = "https://igraph.org/";
+    changelog = "https://github.com/igraph/igraph/blob/${finalAttrs.src.tag}/CHANGELOG.md";
+    license = licenses.gpl2Plus;
+    platforms = platforms.all;
+    inherit (hal-hardware-analyzer.meta) maintainers;
+  };
+})

From c2b6652aa3f31bd75317427554fc718e7b86b019 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 03:28:14 +0000
Subject: [PATCH 4490/6226] python3Packages.datalad: 1.2.2 -> 1.2.3

---
 pkgs/development/python-modules/datalad/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/datalad/default.nix b/pkgs/development/python-modules/datalad/default.nix
index 53a768445bc6..4eff6daf3a68 100644
--- a/pkgs/development/python-modules/datalad/default.nix
+++ b/pkgs/development/python-modules/datalad/default.nix
@@ -51,14 +51,14 @@
 
 buildPythonPackage rec {
   pname = "datalad";
-  version = "1.2.2";
+  version = "1.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "datalad";
     repo = "datalad";
     tag = version;
-    hash = "sha256-OjWOWdfAQoCQzc2EH5hBhJ3G/Z62U9oRgv8tp23L/Qw=";
+    hash = "sha256-VkHTX0j963N2HMwHoJv8M314SykXFB9u4eqIUDeJ+tw=";
   };
 
   postPatch = ''

From 11123199225d1a325e3b4917ec9bb22082c9d3f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 20:28:51 -0700
Subject: [PATCH 4491/6226] python3Packages.nsapi: 3.1.2 -> 3.1.3

Diff: https://github.com/aquatix/ns-api/compare/v3.1.2...v3.1.3

Changelog: https://github.com/aquatix/ns-api/releases/tag/v3.1.3
---
 pkgs/development/python-modules/nsapi/default.nix | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/nsapi/default.nix b/pkgs/development/python-modules/nsapi/default.nix
index 92a669e7571c..cb92ca9806d0 100644
--- a/pkgs/development/python-modules/nsapi/default.nix
+++ b/pkgs/development/python-modules/nsapi/default.nix
@@ -2,23 +2,20 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pythonOlder,
   pytz,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "nsapi";
-  version = "3.1.2";
+  version = "3.1.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "aquatix";
     repo = "ns-api";
     tag = "v${version}";
-    sha256 = "sha256-H8qxqzcGZ52W/HbTuKdnfnaYdZFaxzuUhrniS1zsL2w=";
+    hash = "sha256-Buhc0643WeX/4ZU/RkzNWiFjfEAJUtNL6uJ98unTnCg=";
   };
 
   build-system = [ setuptools ];
@@ -30,11 +27,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "ns_api" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python module to query routes of the Dutch railways";
     homepage = "https://github.com/aquatix/ns-api/";
-    changelog = "https://github.com/aquatix/ns-api/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    changelog = "https://github.com/aquatix/ns-api/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

From 95af7aed7b8cb29dc0dca097940e1c8ab189b217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 20:32:18 -0700
Subject: [PATCH 4492/6226] python3Packages.bluetooth-data-tools: 1.28.3 ->
 1.28.4

Diff: https://github.com/Bluetooth-Devices/bluetooth-data-tools/compare/v1.28.3...v1.28.4

Changelog: https://github.com/Bluetooth-Devices/bluetooth-data-tools/blob/v1.28.4/CHANGELOG.md
---
 .../python-modules/bluetooth-data-tools/default.nix  | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix
index 2233fedecc9d..f3479add8be5 100644
--- a/pkgs/development/python-modules/bluetooth-data-tools/default.nix
+++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix
@@ -5,26 +5,22 @@
   cryptography,
   cython,
   poetry-core,
-  pytest-benchmark,
   pytest-codspeed,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "bluetooth-data-tools";
-  version = "1.28.3";
+  version = "1.28.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "bluetooth-data-tools";
     tag = "v${version}";
-    hash = "sha256-xeBqxGOyxjR/O593ctyfwASxBZIeRBTdpVI981gOw5o=";
+    hash = "sha256-IAGlM1B/PAPyaBIfHG3RScn8odboZMg3YmQJSfoyKR4=";
   };
 
   # The project can build both an optimized cython version and an unoptimized
@@ -40,15 +36,11 @@ buildPythonPackage rec {
   dependencies = [ cryptography ];
 
   nativeCheckInputs = [
-    pytest-benchmark
     pytest-codspeed
     pytest-cov-stub
-    pytest-codspeed
     pytestCheckHook
   ];
 
-  pytestFlags = [ "--benchmark-disable" ];
-
   pythonImportsCheck = [ "bluetooth_data_tools" ];
 
   meta = with lib; {

From 0724807b2dd20997dabe23dd41cc20556926d3eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 03:41:54 +0000
Subject: [PATCH 4493/6226] gitea-mcp-server: 0.4.0 -> 0.5.0

---
 pkgs/by-name/gi/gitea-mcp-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/gitea-mcp-server/package.nix b/pkgs/by-name/gi/gitea-mcp-server/package.nix
index 5923dd4033d0..932a198dd014 100644
--- a/pkgs/by-name/gi/gitea-mcp-server/package.nix
+++ b/pkgs/by-name/gi/gitea-mcp-server/package.nix
@@ -5,17 +5,17 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "gitea-mcp-server";
-  version = "0.4.0";
+  version = "0.5.0";
 
   src = fetchFromGitea {
     domain = "gitea.com";
     owner = "gitea";
     repo = "gitea-mcp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-MWH50NOZKp0OxuIELnbp34GKLWFaVOZCZOQnNLvYHro=";
+    hash = "sha256-Wrqy8RpDoK8GYldjGiTs8zwB3qzApKYJyK5Vhh0fMRg=";
   };
 
-  vendorHash = "sha256-LZIgADgUUNrMPBdCF0kz4koZUvGfHvzb8T+hwbiIYjs=";
+  vendorHash = "sha256-N1Ct479Q5RH4TCxcSbIBoGDP/atBlWkxwBLJLk82juM=";
 
   subPackages = [ "." ];
 

From 7cce4aa77299baf128c9f67024ba045220a303cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 03:46:42 +0000
Subject: [PATCH 4494/6226] blackmagic-desktop-video: 15.1 -> 15.2

---
 pkgs/by-name/bl/blackmagic-desktop-video/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bl/blackmagic-desktop-video/package.nix b/pkgs/by-name/bl/blackmagic-desktop-video/package.nix
index 9a57031ac34a..f28b0e06d8c1 100644
--- a/pkgs/by-name/bl/blackmagic-desktop-video/package.nix
+++ b/pkgs/by-name/bl/blackmagic-desktop-video/package.nix
@@ -14,7 +14,7 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "blackmagic-desktop-video";
-  version = "15.1";
+  version = "15.2";
 
   buildInputs = [
     autoPatchelfHook
@@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: {
       {
         outputHashMode = "recursive";
         outputHashAlgo = "sha256";
-        outputHash = "sha256-nZXfUbUyk9PDhBeXUHGt6T95hfMMDEH1oOgcm1wwi3E=";
+        outputHash = "sha256-OCpzKmwa4HbKTGSeVxBlYXB6TNe5uqLhtowLwAQjIJQ=";
 
         impureEnvVars = lib.fetchers.proxyImpureEnvVars;
 

From f1c4541375efa804f5b90fff4c1b68ce73d600b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 20:46:59 -0700
Subject: [PATCH 4495/6226] python3Packages.airthings-ble: 1.1.1 -> 1.2.0

Diff: https://github.com/vincegio/airthings-ble/compare/1.1.1...1.2.0

Changelog: https://github.com/vincegio/airthings-ble/releases/tag/1.2.0
---
 .../development/python-modules/airthings-ble/default.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix
index 480cf805eafe..0e0bb8970d4c 100644
--- a/pkgs/development/python-modules/airthings-ble/default.nix
+++ b/pkgs/development/python-modules/airthings-ble/default.nix
@@ -9,27 +9,30 @@
   poetry-core,
   pytest-cov-stub,
   pytestCheckHook,
+  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "airthings-ble";
-  version = "1.1.1";
+  version = "1.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "vincegio";
     repo = "airthings-ble";
     tag = version;
-    hash = "sha256-fZvmgRQuSrgraj6e3BtsoKyFX38BedqVh6cHsliT9ns=";
+    hash = "sha256-y6vpkq3u5JKImwxevMupUVVAclUcsyrqxoIOYRK0YGQ=";
   };
 
   build-system = [ poetry-core ];
 
   dependencies = [
     async-interrupt
-    bleak
     bleak-retry-connector
     cbor2
+  ]
+  ++ lib.optionals (pythonOlder "3.14") [
+    bleak
   ];
 
   nativeCheckInputs = [

From 7aebac99c040df73d15198784a6da075e971e4e1 Mon Sep 17 00:00:00 2001
From: "Else, Someone" <else@someonex.net>
Date: Sat, 1 Nov 2025 04:42:47 +0200
Subject: [PATCH 4496/6226] cudaPackages: fix regression, propagating too much

Code moved around in CUDA13 PR also changed actual behaviour
---
 .../cuda-modules/buildRedist/default.nix           |  2 --
 .../cuda-modules/packages/cuda_cudart.nix          | 14 ++++++++++----
 .../cuda-modules/packages/cuda_nvcc.nix            |  3 ++-
 3 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/cuda-modules/buildRedist/default.nix b/pkgs/development/cuda-modules/buildRedist/default.nix
index 421432c6dc87..3cf532859a32 100644
--- a/pkgs/development/cuda-modules/buildRedist/default.nix
+++ b/pkgs/development/cuda-modules/buildRedist/default.nix
@@ -279,8 +279,6 @@ extendMkDerivation {
       ]
       ++ nativeBuildInputs;
 
-      propagatedBuildInputs = [ setupCudaHook ] ++ propagatedBuildInputs;
-
       buildInputs = [
         # autoPatchelfHook will search for a libstdc++ and we're giving it
         # one that is compatible with the rest of nixpkgs, even when
diff --git a/pkgs/development/cuda-modules/packages/cuda_cudart.nix b/pkgs/development/cuda-modules/packages/cuda_cudart.nix
index 8ec7c4f8b3c6..ff647525aad3 100644
--- a/pkgs/development/cuda-modules/packages/cuda_cudart.nix
+++ b/pkgs/development/cuda-modules/packages/cuda_cudart.nix
@@ -32,12 +32,15 @@ buildRedist (finalAttrs: {
   # NOTE: `cuda_compat` can be disabled by setting the package to `null`. This is useful in cases where
   # the host OS has a recent enough CUDA driver that the compatibility library isn't needed.
   propagatedBuildInputs =
-    # Add the dependency on NVCC's include directory.
-    # - crt/host_config.h
+    # TODO(@SomeoneSerge): Consider propagating `crt/host_config.h`, but only
+    # once we managed to split out `cuda_nvcc`'s headers into a separate output
+    #
     # TODO(@connorbaker): Check that the dependency offset for this is correct.
-    [ (lib.getOutput "include" cuda_nvcc) ]
+    #
+    # [ (lib.getInclude cuda_nvcc) ]
+
     # TODO(@connorbaker): From CUDA 13.0, crt/host_config.h is in cuda_crt
-    ++ lib.optionals (cudaAtLeast "13.0") [ (lib.getOutput "include" cuda_crt) ]
+    lib.optionals (cudaAtLeast "13.0") [ (lib.getOutput "include" cuda_crt) ]
     # Add the dependency on CCCL's include directory.
     # - nv/target
     # TODO(@connorbaker): Check that the dependency offset for this is correct.
@@ -86,5 +89,8 @@ buildRedist (finalAttrs: {
     popd >/dev/null
   '';
 
+  # "Never again", cf. https://github.com/NixOS/nixpkgs/pull/457424
+  disallowedRequisites = [ (lib.getBin cuda_nvcc) ];
+
   meta.description = "CUDA Runtime";
 })
diff --git a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix
index 47906b5977c1..27eacde61847 100644
--- a/pkgs/development/cuda-modules/packages/cuda_nvcc.nix
+++ b/pkgs/development/cuda-modules/packages/cuda_nvcc.nix
@@ -2,6 +2,7 @@
   _cuda,
   backendStdenv,
   buildRedist,
+  setupCudaHook,
   cudaAtLeast,
   cudaOlder,
   cuda_cccl,
@@ -22,7 +23,7 @@ buildRedist (finalAttrs: {
   allowFHSReferences = true;
 
   # Entries here will be in nativeBuildInputs when cuda_nvcc is in nativeBuildInputs
-  propagatedBuildInputs = [ backendStdenv.cc ];
+  propagatedBuildInputs = [ setupCudaHook ];
 
   # Patch the nvcc.profile.
   # Syntax:

From f13e0ef544cf45d36da1c1b634ec424d20c4767d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 03:52:55 +0000
Subject: [PATCH 4497/6226] spicedb: 1.46.0 -> 1.46.2

---
 pkgs/by-name/sp/spicedb/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sp/spicedb/package.nix b/pkgs/by-name/sp/spicedb/package.nix
index ca09384217c3..8668d971de5e 100644
--- a/pkgs/by-name/sp/spicedb/package.nix
+++ b/pkgs/by-name/sp/spicedb/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "spicedb";
-  version = "1.46.0";
+  version = "1.46.2";
 
   src = fetchFromGitHub {
     owner = "authzed";
     repo = "spicedb";
     tag = "v${version}";
-    hash = "sha256-laLUhJkD4XbwKo4wjngBN1PkDpt2fHgMmVv2JTzZl6Q=";
+    hash = "sha256-4/6u/yYlPB85Et+9Bkv6qsVwIvhHoyvkbYkEtbRdDVM=";
   };
 
-  vendorHash = "sha256-XqXbQYUAQiOZ0MjWwFSRe0suaQzXb6KQb+KoGAvvceM=";
+  vendorHash = "sha256-WICi1OPVLrawmo6zW4hOygf0UXsdtuuwl6Cp78yCC9c=";
 
   ldflags = [
     "-X 'github.com/jzelinskie/cobrautil/v2.Version=${src.tag}'"

From daefd00c6c81c650798cc4f5b8e6f1976857bd61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 20:55:11 -0700
Subject: [PATCH 4498/6226] python3Packages.aiorussound: 4.8.2 -> 4.9.0

Diff: https://github.com/noahhusby/aiorussound/compare/4.8.2...4.9.0

Changelog: https://github.com/noahhusby/aiorussound/releases/tag/4.9.0
---
 pkgs/development/python-modules/aiorussound/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiorussound/default.nix b/pkgs/development/python-modules/aiorussound/default.nix
index 2c215840e9ad..91e1be9c6464 100644
--- a/pkgs/development/python-modules/aiorussound/default.nix
+++ b/pkgs/development/python-modules/aiorussound/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "aiorussound";
-  version = "4.8.2";
+  version = "4.9.0";
   pyproject = true;
 
   # requires newer f-strings introduced in 3.12
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "noahhusby";
     repo = "aiorussound";
     tag = version;
-    hash = "sha256-5g1LdltGw96EZWWj0Fei8i6l5yslQgicI/oI9jr1w0U=";
+    hash = "sha256-okuDbY4Dx57a7zQc+LYCwe+FOjQS+hbAzSAK47uhGFg=";
   };
 
   build-system = [ poetry-core ];

From 406c575b4b31d49156777cedf532e9cf44044e3b Mon Sep 17 00:00:00 2001
From: eveeifyeve <88671402+Eveeifyeve@users.noreply.github.com>
Date: Sat, 1 Nov 2025 14:59:12 +1100
Subject: [PATCH 4499/6226] base16384: fix hash

fixes: https://hydra.nixos.org/build/309554150
---
 pkgs/by-name/ba/base16384/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ba/base16384/package.nix b/pkgs/by-name/ba/base16384/package.nix
index ca6badfda00d..e066d25885d7 100644
--- a/pkgs/by-name/ba/base16384/package.nix
+++ b/pkgs/by-name/ba/base16384/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation rec {
     owner = "fumiama";
     repo = "base16384";
     rev = "v${version}";
-    hash = "sha256-Xkub0sWT+1oJlznDnnV1mDgQNiMQj8gsWemrCOAYYgE=";
+    hash = "sha256-qaDnv+KpXMYdx6eqH7pU0pEjSpU5xg9I7afxpoO3iGs=";
   };
 
   nativeBuildInputs = [ cmake ];

From e7ef1999f936971c7d09e8d2549d3d1270843e09 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 04:01:11 +0000
Subject: [PATCH 4500/6226] bcachefs-tools: 1.31.11 -> 1.31.12

---
 pkgs/by-name/bc/bcachefs-tools/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix
index 998ccafdf98b..385ec6b5d620 100644
--- a/pkgs/by-name/bc/bcachefs-tools/package.nix
+++ b/pkgs/by-name/bc/bcachefs-tools/package.nix
@@ -28,18 +28,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bcachefs-tools";
-  version = "1.31.11";
+  version = "1.31.12";
 
   src = fetchFromGitHub {
     owner = "koverstreet";
     repo = "bcachefs-tools";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-CnRB/iS1NZ0Ebsi12wXFvVb0qdv0V9q1oC3nLj13mqs=";
+    hash = "sha256-gbSyybWTG38mI3r6kdOHFaEx7S82x25OMPEAWZql7Mo=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) src;
-    hash = "sha256-50xy1nqDctgz/lXd5JsfaU6yxDoRCQRtiYBwuEuiKFA=";
+    hash = "sha256-w8dcbaJBCsn02JFPXzhOj2Ozuti0Xkr6mssdZhYKEFs=";
   };
 
   postPatch = ''

From 49cf03303ba08d0c516c7bde57332b9f148792ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 21:00:45 -0700
Subject: [PATCH 4501/6226] python3Packages.bleak-retry-connector: update
 dependencies

---
 .../bleak-retry-connector/default.nix           | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix
index 1c665e12d6e8..5d3578df5ef2 100644
--- a/pkgs/development/python-modules/bleak-retry-connector/default.nix
+++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix
@@ -9,6 +9,8 @@
   pytestCheckHook,
   pytest-asyncio,
   pytest-cov-stub,
+  pythonOlder,
+  stdenv,
 }:
 
 buildPythonPackage rec {
@@ -25,11 +27,16 @@ buildPythonPackage rec {
 
   build-system = [ poetry-core ];
 
-  dependencies = [
-    bleak
-    bluetooth-adapters
-    dbus-fast
-  ];
+  dependencies =
+    lib.optionals (pythonOlder "3.14") [
+      bleak
+    ]
+    ++ lib.optionals (stdenv.hostPlatform.isLinux && pythonOlder "3.14") [
+      bluetooth-adapters
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isLinux [
+      dbus-fast
+    ];
 
   nativeCheckInputs = [
     pytest-asyncio

From ccd6e70fa357249eb7cb2b6131c4abb5e9124b54 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 04:07:04 +0000
Subject: [PATCH 4502/6226] zwave-js-ui: 11.5.2 -> 11.6.1

---
 pkgs/by-name/zw/zwave-js-ui/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zw/zwave-js-ui/package.nix b/pkgs/by-name/zw/zwave-js-ui/package.nix
index 2d9c065f454b..380fd85a7b01 100644
--- a/pkgs/by-name/zw/zwave-js-ui/package.nix
+++ b/pkgs/by-name/zw/zwave-js-ui/package.nix
@@ -7,15 +7,15 @@
 
 buildNpmPackage rec {
   pname = "zwave-js-ui";
-  version = "11.5.2";
+  version = "11.6.1";
 
   src = fetchFromGitHub {
     owner = "zwave-js";
     repo = "zwave-js-ui";
     tag = "v${version}";
-    hash = "sha256-G/ZHp5JmCpFCsjbgHyAS4+5eihyzqVtkcZT5vj6Pxos=";
+    hash = "sha256-SNxwZw4ebcngUD6EEI9GGAsxhcR6wQBs2sdnmuZycmw=";
   };
-  npmDepsHash = "sha256-amw6eVKWCIuF/XcY1dHb9/qMADGkUANT4WmQNx3O+NY=";
+  npmDepsHash = "sha256-Aec2IWCeeOTrHMfk1uqCHNL30Kbsa5uCf4NkZc+Q4rA=";
 
   passthru.tests.zwave-js-ui = nixosTests.zwave-js-ui;
 

From 5b7f51fbfaa1a087fb79439ee9e735478e75bca8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 04:25:19 +0000
Subject: [PATCH 4503/6226] dokieli: 0-unstable-2025-09-10 ->
 0-unstable-2025-10-31

---
 pkgs/by-name/do/dokieli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/do/dokieli/package.nix b/pkgs/by-name/do/dokieli/package.nix
index 9524664729a1..a9619332d1c4 100644
--- a/pkgs/by-name/do/dokieli/package.nix
+++ b/pkgs/by-name/do/dokieli/package.nix
@@ -16,13 +16,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "dokieli";
-  version = "0-unstable-2025-09-10";
+  version = "0-unstable-2025-10-31";
 
   src = fetchFromGitHub {
     owner = "dokieli";
     repo = "dokieli";
-    rev = "7c9f3d9f02d8725822594009ffa1742db44fc857";
-    hash = "sha256-ah7Qct0MHRsH5bktyat/Q5mxJKACJl/ci2IVOl5mzvE=";
+    rev = "491ba0313e7890443ea9efefe83529821ca5689f";
+    hash = "sha256-7ZY2s/dC6+ITxnoaOWP8VnB1hYwaVfxMTWh6OlqOuc4=";
   };
 
   missingHashes = ./missing-hashes.json;

From 0c340e12ced479724610f683faad71d87a056277 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 04:40:08 +0000
Subject: [PATCH 4504/6226] vscode-extensions.tsandall.opa: 0.19.0 -> 0.20.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 4f50d9fdef85..1d6950d04f86 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4735,8 +4735,8 @@ let
         mktplcRef = {
           name = "opa";
           publisher = "tsandall";
-          version = "0.19.0";
-          hash = "sha256-jRwZD4TwLMdwBdV59HonMkF2ds4heXHPtpw1sxq1RsA=";
+          version = "0.20.0";
+          hash = "sha256-1o7v9lncnmYWr9FPEjQmamfNW/Lui9A0V+l7bCjn/hw=";
         };
         meta = {
           changelog = "https://github.com/open-policy-agent/vscode-opa/blob/master/CHANGELOG.md";

From 138d5cd1e06432d64a1f14f6a81fd894490f1362 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 04:52:04 +0000
Subject: [PATCH 4505/6226] python3Packages.pynordpool: 0.3.1 -> 0.3.2

---
 pkgs/development/python-modules/pynordpool/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pynordpool/default.nix b/pkgs/development/python-modules/pynordpool/default.nix
index 605a6fc7c18a..1210ae02d0c8 100644
--- a/pkgs/development/python-modules/pynordpool/default.nix
+++ b/pkgs/development/python-modules/pynordpool/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "pynordpool";
-  version = "0.3.1";
+  version = "0.3.2";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "gjohansson-ST";
     repo = "pynordpool";
     tag = "v${version}";
-    hash = "sha256-4s43E3VUO0EOTte4c2ZnWY2fccyVAgqSOVPpxz0+L5s=";
+    hash = "sha256-3yMVhdfjl2l56WzI+uRMUwFuYafSH3YfabYqKSK25Y4=";
   };
 
   build-system = [ poetry-core ];

From a5ecd12ef27a0362d5a90ca7bd145b1ab39f07fc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 05:05:21 +0000
Subject: [PATCH 4506/6226] terraform-providers.scaleway_scaleway: 2.60.5 ->
 2.61.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 2397935afcba..6a3749c876b3 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1174,13 +1174,13 @@
     "vendorHash": "sha256-OqbnkuEy9w6F1DxmlYhRNYhBaYhWV0FtMK4wdwSybh8="
   },
   "scaleway_scaleway": {
-    "hash": "sha256-ArjX1/OCR9rKGAGg4o5Rd98n8n8l7+Toz5XlH5A/LSE=",
+    "hash": "sha256-E0nhKVAJavR7ZEz65p4fE2Iwtchmzs9Fu/UqrVFmnIA=",
     "homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
     "owner": "scaleway",
     "repo": "terraform-provider-scaleway",
-    "rev": "v2.60.5",
+    "rev": "v2.61.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-PWUXuCrZz78ggiXo4DVb/C75cB8gzbQD9H0vdJZCUII="
+    "vendorHash": "sha256-QzFIhUMJqslwir+fa50vMZvROJfp4j2SCUKjlXLTs8s="
   },
   "scottwinkler_shell": {
     "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",

From df237d360b9e15c991e4e98fb65252288575ff61 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 05:11:14 +0000
Subject: [PATCH 4507/6226] myks: 5.0.0 -> 5.1.0

---
 pkgs/by-name/my/myks/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix
index 3b2c2fedb72a..69db57b6e89b 100644
--- a/pkgs/by-name/my/myks/package.nix
+++ b/pkgs/by-name/my/myks/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "myks";
-  version = "5.0.0";
+  version = "5.1.0";
 
   src = fetchFromGitHub {
     owner = "mykso";
     repo = "myks";
     tag = "v${version}";
-    hash = "sha256-W1k65a67/77f8NBGOzHV4eVzoICnynxNeIYAefq+Fzo=";
+    hash = "sha256-nVm5AmfKfoBDBIFt2g4PXc5Ff2kbrBGTThqdpslpYow=";
   };
 
-  vendorHash = "sha256-+YMR9Y5iSkpcHEg1IlSN3kB3fZAx5WNcOU71LXHhVV0=";
+  vendorHash = "sha256-jprXaNd/S2fJcejSG5nH7rvg/yNmRRRgCOkJrUkiwmY=";
 
   subPackages = ".";
 

From e39d65bdbde8fdd1945017c2343cd9906a0d82cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 05:24:18 +0000
Subject: [PATCH 4508/6226] numix-icon-theme: 25.10.17.2 -> 25.10.26

---
 pkgs/data/icons/numix-icon-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/icons/numix-icon-theme/default.nix b/pkgs/data/icons/numix-icon-theme/default.nix
index 0e597a783999..907e51a6e5cf 100644
--- a/pkgs/data/icons/numix-icon-theme/default.nix
+++ b/pkgs/data/icons/numix-icon-theme/default.nix
@@ -12,13 +12,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "numix-icon-theme";
-  version = "25.10.17.2";
+  version = "25.10.26";
 
   src = fetchFromGitHub {
     owner = "numixproject";
     repo = "numix-icon-theme";
     rev = version;
-    sha256 = "sha256-0s35a7GkjNL/DNEJI/A2TfI+FawvpKn/HY46tqXKbcY=";
+    sha256 = "sha256-YKR4dncq2uuX8CMJj/Zr/0pdl7gLC8VZGvb/HI1+Uwc=";
   };
 
   nativeBuildInputs = [

From 4ec373cf7711186fa2fbc508201e6a428a09ee6a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 05:51:36 +0000
Subject: [PATCH 4509/6226] llama-cpp: 6869 -> 6908

---
 pkgs/by-name/ll/llama-cpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix
index 7de7a14e7b25..5aa3e6002e84 100644
--- a/pkgs/by-name/ll/llama-cpp/package.nix
+++ b/pkgs/by-name/ll/llama-cpp/package.nix
@@ -75,13 +75,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "llama-cpp";
-  version = "6869";
+  version = "6908";
 
   src = fetchFromGitHub {
     owner = "ggml-org";
     repo = "llama.cpp";
     tag = "b${finalAttrs.version}";
-    hash = "sha256-LZSeejn1IPybmfoRsOhg1YpTCFl0LrRJZyKT8ECbVjo=";
+    hash = "sha256-7zgeVK1dQLFy9rm6VsaVK9/vIadMst+RNry5Vf7yk+A=";
     leaveDotGit = true;
     postFetch = ''
       git -C "$out" rev-parse --short HEAD > $out/COMMIT

From 42734a7936b34670f8f6477fa1d4d098d88c383a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 05:52:27 +0000
Subject: [PATCH 4510/6226] python3Packages.disposable-email-domains: 0.0.143
 -> 0.0.145

---
 .../python-modules/disposable-email-domains/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/disposable-email-domains/default.nix b/pkgs/development/python-modules/disposable-email-domains/default.nix
index 267bad65f450..37b92dfff92c 100644
--- a/pkgs/development/python-modules/disposable-email-domains/default.nix
+++ b/pkgs/development/python-modules/disposable-email-domains/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "disposable-email-domains";
-  version = "0.0.143";
+  version = "0.0.145";
   pyproject = true;
 
   # No tags on GitHub
   src = fetchPypi {
     pname = "disposable_email_domains";
     inherit version;
-    hash = "sha256-AOQbmUHx6nQYnKzOlPSh+r/Fzn2r2CtsTGYswnJI05E=";
+    hash = "sha256-l8Il11KKgYUNKNCg9sDJ0Wsucaq+Hat5l7DnkTBjmzY=";
   };
 
   build-system = [

From c3af60a2720602c30dfae07b54ced2fa0582aaab Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss@proton.me>
Date: Sat, 1 Nov 2025 08:09:47 +0300
Subject: [PATCH 4511/6226] topiary: 0.6.1 -> 0.7.0

---
 pkgs/by-name/to/topiary/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/to/topiary/package.nix b/pkgs/by-name/to/topiary/package.nix
index 79439f3a1d25..29eaa77dfef3 100644
--- a/pkgs/by-name/to/topiary/package.nix
+++ b/pkgs/by-name/to/topiary/package.nix
@@ -10,19 +10,19 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "topiary";
-  version = "0.6.1";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "tweag";
     repo = "topiary";
     tag = "v${version}";
-    hash = "sha256-CyqZhkzAOqC3xWhwUzCpkDO0UFsO0S4/3sV7zIILiVg=";
+    hash = "sha256-49LTUtgroD0wCwJYYb/IN1lsWbAtdfKjGNMuUa2+vhI=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
   nativeInstallCheckInputs = [ versionCheckHook ];
+  cargoHash = "sha256-I3hsaA4N2x00J5+U0z2B1gi1N7QVf7Vnab2scjDpWoo=";
 
-  cargoHash = "sha256-akAjn9a7dMwjPSNveDY2KJ62evjHCAWpRR3A7Ghkb5A=";
 
   # https://github.com/NixOS/nixpkgs/pull/359145#issuecomment-2542418786
   depsExtraArgs.postBuild = ''

From e42a25c564191c95a48febf2664763952cdcfca8 Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss@proton.me>
Date: Sat, 1 Nov 2025 08:11:03 +0300
Subject: [PATCH 4512/6226] topiary: remove unused postBuild, refactor

---
 pkgs/by-name/to/topiary/package.nix | 27 +++++++++------------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/to/topiary/package.nix b/pkgs/by-name/to/topiary/package.nix
index 29eaa77dfef3..af0174829dfa 100644
--- a/pkgs/by-name/to/topiary/package.nix
+++ b/pkgs/by-name/to/topiary/package.nix
@@ -3,41 +3,29 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
-  iconv,
   installShellFiles,
   versionCheckHook,
   nix-update-script,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "topiary";
   version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "tweag";
     repo = "topiary";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-49LTUtgroD0wCwJYYb/IN1lsWbAtdfKjGNMuUa2+vhI=";
   };
 
-  nativeBuildInputs = [ installShellFiles ];
-  nativeInstallCheckInputs = [ versionCheckHook ];
   cargoHash = "sha256-I3hsaA4N2x00J5+U0z2B1gi1N7QVf7Vnab2scjDpWoo=";
 
-
-  # https://github.com/NixOS/nixpkgs/pull/359145#issuecomment-2542418786
-  depsExtraArgs.postBuild = ''
-    find $out -name '*.ps1' -print | while read -r file; do
-      if [ "$(file --brief --mime-encoding "$file")" == utf-16be ]; then
-        ${iconv}/bin/iconv -f UTF-16BE -t UTF16LE "$file" > tmp && mv tmp "$file"
-      fi
-    done
-  '';
+  nativeBuildInputs = [ installShellFiles ];
 
   cargoBuildFlags = [
     "-p"
     "topiary-cli"
   ];
-  cargoTestFlags = cargoBuildFlags;
 
   # Skip tests that cannot be executed in sandbox (operation not permitted)
   checkFlags = [
@@ -76,6 +64,7 @@ rustPlatform.buildRustPackage rec {
     "--skip=test_vis"
     "--skip=test_vis_invalid"
   ];
+  cargoTestFlags = finalAttrs.cargoBuildFlags;
 
   env.TOPIARY_LANGUAGE_DIR = "${placeholder "out"}/share/queries";
 
@@ -89,6 +78,8 @@ rustPlatform.buildRustPackage rec {
       --zsh <($out/bin/topiary completion zsh)
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   doInstallCheck = true;
   versionCheckProgramArg = "--version";
 
@@ -96,13 +87,13 @@ rustPlatform.buildRustPackage rec {
 
   meta = {
     description = "Uniform formatter for simple languages, as part of the Tree-sitter ecosystem";
-    mainProgram = "topiary";
     homepage = "https://github.com/tweag/topiary";
-    changelog = "https://github.com/tweag/topiary/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/tweag/topiary/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       figsoda
       nartsiss
     ];
+    mainProgram = "topiary";
   };
-}
+})

From 9b6dcd78f0e946d6db1c320d326b12c6f98aab34 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 06:05:33 +0000
Subject: [PATCH 4513/6226] gatus: 5.28.0 -> 5.30.0

---
 pkgs/by-name/ga/gatus/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix
index 468f319a936b..17f51ca2fb2a 100644
--- a/pkgs/by-name/ga/gatus/package.nix
+++ b/pkgs/by-name/ga/gatus/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "gatus";
-  version = "5.28.0";
+  version = "5.30.0";
 
   src = fetchFromGitHub {
     owner = "TwiN";
     repo = "gatus";
     rev = "v${version}";
-    hash = "sha256-p60iqMzTch3dX+REaiKuLflIHLunGFI2JWx/TGo30g0=";
+    hash = "sha256-iQp/oIEuyD+lVf20BH3fMScUtRxvEVrbu1zoJE5YkVI=";
   };
 
   vendorHash = "sha256-vvYnNFRpDTaNBX30btvSrwmhimPobio/zAs7zQnZ7b8=";

From 806d24f4b2193e0541854846d76ac6fb36d222dc Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 1 Nov 2025 06:25:29 +0000
Subject: [PATCH 4514/6226] arc_unpacker: fix `cmake-4` build

Without the change the build fails as https://hydra.nixos.org/build/310523160:

    CMake Error at CMakeLists.txt:1 (cmake_minimum_required):
      Compatibility with CMake < 3.5 has been removed from CMake.
---
 pkgs/by-name/ar/arc_unpacker/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ar/arc_unpacker/package.nix b/pkgs/by-name/ar/arc_unpacker/package.nix
index e11506a976c6..667b723b868b 100644
--- a/pkgs/by-name/ar/arc_unpacker/package.nix
+++ b/pkgs/by-name/ar/arc_unpacker/package.nix
@@ -43,6 +43,11 @@ stdenv.mkDerivation {
     cp ${catch2}/include/catch2/catch.hpp tests/test_support/catch.h
     sed '1i#include <limits>' -i src/dec/eagls/pak_archive_decoder.cc # gcc12
     sed '1i#include <vector>' -i src/flow/cli_facade.h # gcc14
+
+    # cmake-4 support
+    substituteInPlace CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 2.8.8)' \
+      'cmake_minimum_required(VERSION 3.10)'
   '';
 
   nativeBuildInputs = [

From b1193479351fa318d68bb28aaf3ea1e226383e68 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 06:26:46 +0000
Subject: [PATCH 4515/6226] ecspresso: 2.6.2 -> 2.6.3

---
 pkgs/by-name/ec/ecspresso/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ec/ecspresso/package.nix b/pkgs/by-name/ec/ecspresso/package.nix
index 7928e5d1f210..c05d90e3f81b 100644
--- a/pkgs/by-name/ec/ecspresso/package.nix
+++ b/pkgs/by-name/ec/ecspresso/package.nix
@@ -7,20 +7,20 @@
 
 buildGoModule rec {
   pname = "ecspresso";
-  version = "2.6.2";
+  version = "2.6.3";
 
   src = fetchFromGitHub {
     owner = "kayac";
     repo = "ecspresso";
     tag = "v${version}";
-    hash = "sha256-9C/OJ1rnH77jcF3hDr2uyXcNViAkM84LjmkJsKmQkXo=";
+    hash = "sha256-ZruQx2Nm/1An9yGNhQ/2Kbah4eSFBD/pp3c6WZIBGXA=";
   };
 
   subPackages = [
     "cmd/ecspresso"
   ];
 
-  vendorHash = "sha256-tL/AjGU/Pi5ypcv9jqUukg6sGJqpPlHhwxzve7/KgDo=";
+  vendorHash = "sha256-oq2BOzSHwAq/gNBknwm1LXUKu+est/kjM1jlVBvQZbg=";
 
   ldflags = [
     "-s"

From a22c426f6083e64f42da977969cf081310681cd2 Mon Sep 17 00:00:00 2001
From: John Ericson <John.Ericson@Obsidian.Systems>
Date: Mon, 27 Oct 2025 12:48:11 -0400
Subject: [PATCH 4516/6226] freebsd: Fix cross compilation

It looks like upgrading to newer clang has caused some `-Werror`
problems. We should probably disable `-Werror` entirely, but for now,
I've done the more targetted fix of disabling one specific warning, and
sending https://github.com/freebsd/freebsd-src/pull/1882 upstream.
---
 pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix   | 14 ++++++++++++++
 pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix | 11 +++++++++++
 2 files changed, 25 insertions(+)

diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix b/pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix
index bd33c4121f7c..d60de4758af2 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/libthr.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   mkDerivation,
   libcMinimal,
   include,
@@ -32,6 +33,19 @@ mkDerivation {
     libgcc
   ];
 
+  patches = [
+    # https://github.com/freebsd/freebsd-src/pull/1882
+    (fetchpatch {
+      name = "freebsd-libthr-use-nonstring-attribute.patch";
+      url = "https://github.com/freebsd/freebsd-src/pull/1882/commits/650800993deb513dc31e99ef5cdecd50ee70bb04.diff";
+      hash = "sha256-WKN7dfGAs1+XADT4aLUkkKmQQ4n7gsyFUTCeo6mcuMY=";
+      includes = [ "lib/libthr/thread/thr_printf.c" ];
+    })
+  ];
+
+  # Presumably newer Clang has gotten more strict.
+  CWARNEXTRA = "-Wno-cast-function-type-mismatch";
+
   preBuild = ''
     export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -B${csu}/lib"
   '';
diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix b/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
index 27f90f4cf05c..f9ecef321bc4 100644
--- a/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
+++ b/pkgs/os-specific/bsd/freebsd/pkgs/rtld-elf.nix
@@ -1,5 +1,6 @@
 {
   mkDerivation,
+  fetchpatch,
   include,
   rpcgen,
   flex,
@@ -30,6 +31,16 @@ mkDerivation {
   ]
   ++ extraSrc;
 
+  patches = [
+    # https://github.com/freebsd/freebsd-src/pull/1882
+    (fetchpatch {
+      name = "freebsd-rtld-use-nonstring-attribute.patch";
+      url = "https://github.com/freebsd/freebsd-src/pull/1882/commits/650800993deb513dc31e99ef5cdecd50ee70bb04.diff";
+      hash = "sha256-V9jDE/5Fu6hLIzlG1e6AqLnGwlzW2OjonyUgvSVtm58=";
+      includes = [ "libexec/rtld-elf/rtld.c" ];
+    })
+  ];
+
   outputs = [
     "out"
     "man"

From 57c64002f1c09839b4a746d08222e90fb4c421f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 06:46:17 +0000
Subject: [PATCH 4517/6226] composer-require-checker: 4.16.1 -> 4.18.0

---
 pkgs/by-name/co/composer-require-checker/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix
index 239debebbb08..5989b16545b5 100644
--- a/pkgs/by-name/co/composer-require-checker/package.nix
+++ b/pkgs/by-name/co/composer-require-checker/package.nix
@@ -7,16 +7,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "composer-require-checker";
-  version = "4.16.1";
+  version = "4.18.0";
 
   # Upstream no longer provides the composer.lock in their release artifact
   src = fetchgit {
     url = "https://github.com/maglnet/ComposerRequireChecker";
     tag = finalAttrs.version;
-    hash = "sha256-UAofdc8mqSnJXhCTABSf9JZERqur86lzNDI66EHgEQE=";
+    hash = "sha256-8y8ziaWCno389ti263N+xinADoPZZGXqhTHoc9ZkF4Y=";
   };
 
-  vendorHash = "sha256-TlBrL4KyMVHaxqlfvnTkj3TkmU8h5/0BRC5e8yWrhCI=";
+  vendorHash = "sha256-BDGxHoDLSEdukN+zv8QNZPtVXfRpp/o95ysGFs0wl9Q=";
 
   doInstallCheck = true;
   nativeInstallCheckInputs = [ versionCheckHook ];

From 856c9d4bca9255f5ac893122dc96a154c234a9b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 06:49:23 +0000
Subject: [PATCH 4518/6226] python3Packages.iminuit: 2.31.1 -> 2.31.3

---
 pkgs/development/python-modules/iminuit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix
index 5b6239fe5ce4..28e9c4cd36d0 100644
--- a/pkgs/development/python-modules/iminuit/default.nix
+++ b/pkgs/development/python-modules/iminuit/default.nix
@@ -21,14 +21,14 @@
 
 buildPythonPackage rec {
   pname = "iminuit";
-  version = "2.31.1";
+  version = "2.31.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-1eAE8f/YPSoHZAn79KeWkeehfJ1zlQu2NGWvMuEE3hg=";
+    hash = "sha256-/7Oust4mxADQr/fit0V/ZM1gmklMRe5Xnv/ugbG8XXg=";
   };
 
   nativeBuildInputs = [

From 1204a9389a5b9bb3dcc550402af40be456e238bb Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Sat, 1 Nov 2025 06:56:41 +0000
Subject: [PATCH 4519/6226] blur-effect: fix `cmake-4` build

Without the change the build fails as https://hydra.nixos.org/build/310527669:

    CMake Error at CMakeLists.txt:1 (cmake_minimum_required):
      Compatibility with CMake < 3.5 has been removed from CMake.
---
 pkgs/by-name/bl/blur-effect/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/bl/blur-effect/package.nix b/pkgs/by-name/bl/blur-effect/package.nix
index b194a7884134..1330442ab55a 100644
--- a/pkgs/by-name/bl/blur-effect/package.nix
+++ b/pkgs/by-name/bl/blur-effect/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   pkg-config,
   cmake,
   gdk-pixbuf,
@@ -20,6 +21,16 @@ stdenv.mkDerivation rec {
     sha256 = "0cjw7iz0p7x1bi4vmwrivfidry5wlkgfgdl9wly88cm3z9ib98jj";
   };
 
+  patches = [
+    # Pull cmake-4 fix:
+    #   https://github.com/sonald/blur-effect/pull/7
+    (fetchpatch {
+      name = "cmake-4.patch";
+      url = "https://github.com/sonald/blur-effect/commit/76322ad8bd0e653726a6791eb8ebcc829cbb1b38.patch?full_index=1";
+      hash = "sha256-f0PBhfdrcLCZBzYx+j8+qIG9boW3S4CSyz+bS9vFKRc=";
+    })
+  ];
+
   nativeBuildInputs = [
     pkg-config
     cmake

From 793cfe507e2a881efa2444ed9dd65e44b214ff8f Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 1 Nov 2025 14:54:54 +0800
Subject: [PATCH 4520/6226] pantheon.elementary-icon-theme: 8.1.0 -> 8.2.0

https://github.com/elementary/icons/compare/8.1.0...8.2.0
---
 .../pantheon/artwork/elementary-icon-theme/default.nix    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
index a75c7f4f9ca1..6bffd49239cb 100644
--- a/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
+++ b/pkgs/desktops/pantheon/artwork/elementary-icon-theme/default.nix
@@ -5,6 +5,7 @@
   nix-update-script,
   meson,
   ninja,
+  adwaita-icon-theme,
   hicolor-icon-theme,
   gtk3,
   xcursorgen,
@@ -13,13 +14,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "elementary-icon-theme";
-  version = "8.1.0";
+  version = "8.2.0";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "icons";
-    rev = version;
-    sha256 = "sha256-WltMfWMcfUqpnfuGa6NzfxSeTais0MLsiu82ybaOcvs=";
+    tag = version;
+    hash = "sha256-ntv+efkyfB66HL3tWEkiOj+MFRGqhfMo1/FUO2fIqBM=";
   };
 
   nativeBuildInputs = [
@@ -31,6 +32,7 @@ stdenvNoCC.mkDerivation rec {
   ];
 
   propagatedBuildInputs = [
+    adwaita-icon-theme
     hicolor-icon-theme
   ];
 

From 1de239c03bef056657e1ec6b5fe2fe0a99c94cba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 07:09:23 +0000
Subject: [PATCH 4521/6226] bitwarden-directory-connector: 2025.9.0 ->
 2025.10.0

---
 .../security/bitwarden-directory-connector/default.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/bitwarden-directory-connector/default.nix b/pkgs/tools/security/bitwarden-directory-connector/default.nix
index 77b03e236090..a5680ad34a8c 100644
--- a/pkgs/tools/security/bitwarden-directory-connector/default.nix
+++ b/pkgs/tools/security/bitwarden-directory-connector/default.nix
@@ -19,14 +19,14 @@ let
     }:
     buildNpmPackage rec {
       pname = name;
-      version = "2025.9.0";
+      version = "2025.10.0";
       nodejs = nodejs_22;
 
       src = fetchFromGitHub {
         owner = "bitwarden";
         repo = "directory-connector";
         rev = "v${version}";
-        hash = "sha256-owzOgaYSbtsnZ0AvSWWFdSx96agJyBUM2steGIeg2E4=";
+        hash = "sha256-QzXZN1YWpWCila2wuSyzzuugW4W6UVkJNQM9xQr1Og0=";
       };
 
       postPatch = ''
@@ -38,7 +38,7 @@ let
           --replace-fail "AppImage" "dir"
       '';
 
-      npmDepsHash = "sha256-brO+GGwdZyCDYycur5QnLKCcFZc1J2pM+vQPLtjUD/I=";
+      npmDepsHash = "sha256-VgzQGfP13n9Zl/7V5g2KWFLa9J15rUhY3wx5E5CWMi0=";
 
       env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1";
 

From ffe4f4b02bef8f435cbdefb03f1ea2814e0a3538 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 07:30:01 +0000
Subject: [PATCH 4522/6226] oha: 1.10.0 -> 1.11.0

---
 pkgs/by-name/oh/oha/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix
index a9392b3602a0..fa76e11cdf82 100644
--- a/pkgs/by-name/oh/oha/package.nix
+++ b/pkgs/by-name/oh/oha/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "oha";
-  version = "1.10.0";
+  version = "1.11.0";
 
   src = fetchFromGitHub {
     owner = "hatoo";
     repo = "oha";
     tag = "v${version}";
-    hash = "sha256-xzzlW0oYjlvOItSTmMM5wBlPd7JcmLvpJ+Bf0cCh4ao=";
+    hash = "sha256-N52j8WYEVlmHQdr0HZJZZo92OhIz4V0R1SdaWlOD684=";
   };
 
-  cargoHash = "sha256-k3NlPGtWyj8mTvH+FIasiwrf7JjyY2yKJVTHFjPnIEI=";
+  cargoHash = "sha256-M6wJy5X9JRM9tOOGT8b6YIUT0OakXQxjw17iuqaRT5s=";
 
   nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [
     pkg-config

From 6a28c39e2e6af300bc95ff133691a784d8241ded Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:04:27 +0100
Subject: [PATCH 4523/6226] python312Packages.mypy-boto3-amp: 1.40.55 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index bafcfdd03ef9..842b75a75950 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -62,8 +62,8 @@ in
       "sha256-MqxsI64KEyipR0iiaifc42HQLHsVIFMmtvN2/Vx1EJU=";
 
   mypy-boto3-amp =
-    buildMypyBoto3Package "amp" "1.40.55"
-      "sha256-21GPpp3jvggAtA6U8dKuaSIc9UBObYSDhEzp3KWiK5c=";
+    buildMypyBoto3Package "amp" "1.40.63"
+      "sha256-CWtt4C1qln56Wzu5I9NOaCoJgMwGNX7iZnD5XkZQC34=";
 
   mypy-boto3-amplify =
     buildMypyBoto3Package "amplify" "1.40.54"

From 3d185606e929c4b42107298035a5ee7baa8a22e1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:04:30 +0100
Subject: [PATCH 4524/6226] python312Packages.mypy-boto3-apigateway: 1.40.0 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 842b75a75950..ba720beba15e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -78,8 +78,8 @@ in
       "sha256-ZqZTg/CLPUBTcZ5mbZJsA9f2sdIkgwQDn83xVWLrWpY=";
 
   mypy-boto3-apigateway =
-    buildMypyBoto3Package "apigateway" "1.40.0"
-      "sha256-mfMTQ3XSVHDjTjQEY/EL1xq4t0KRaPwG2Nu0Pwsbk3o=";
+    buildMypyBoto3Package "apigateway" "1.40.63"
+      "sha256-X2wxkeKYvNCGbgFwA2jWSrAdPg5Pc7XCOvTauiZlLaQ=";
 
   mypy-boto3-apigatewaymanagementapi =
     buildMypyBoto3Package "apigatewaymanagementapi" "1.40.54"

From be667fc50af55eec6a0860cb293121a54d84c221 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:04:32 +0100
Subject: [PATCH 4525/6226] python312Packages.mypy-boto3-appconfig: 1.40.0 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index ba720beba15e..822c34e8c5ba 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -90,8 +90,8 @@ in
       "sha256-C0MDOmvUXvJN3FuDsDm8fZQZUFFzACdw+0EpWCIpjEc=";
 
   mypy-boto3-appconfig =
-    buildMypyBoto3Package "appconfig" "1.40.0"
-      "sha256-n0P3k9Bs7ckTEim/cHXLQzt5qsjxzq59TYlOair61mU=";
+    buildMypyBoto3Package "appconfig" "1.40.63"
+      "sha256-5mjQ5qZjHW67dP9S34ojNIcwgNN8xbwuVwKo+7PtkeI=";
 
   mypy-boto3-appconfigdata =
     buildMypyBoto3Package "appconfigdata" "1.40.55"

From 21b8be06457f21be5131f64b5a9991c8e27acb85 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:04:33 +0100
Subject: [PATCH 4526/6226] python312Packages.mypy-boto3-appflow: 1.40.17 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 822c34e8c5ba..d9e647b08cf4 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -102,8 +102,8 @@ in
       "sha256-X7RcwPwiYMSaj7QN8NHekxaLyzG7A+LcvJSElkeKZm0=";
 
   mypy-boto3-appflow =
-    buildMypyBoto3Package "appflow" "1.40.17"
-      "sha256-eBbaAv0NU/VcaZNNPaBvU2pt7rXNm2DwqZ0xtoX2WwU=";
+    buildMypyBoto3Package "appflow" "1.40.63"
+      "sha256-/JAEmxuUuHyGeoehZY6LZjUEk0k0WxuR/48kEc7SmsE=";
 
   mypy-boto3-appintegrations =
     buildMypyBoto3Package "appintegrations" "1.40.55"

From d48d9467646c0e7d369c6ebeaa04359439f9529a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:04:36 +0100
Subject: [PATCH 4527/6226] 
 python312Packages.mypy-boto3-applicationcostprofiler: 1.40.20 -> 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d9e647b08cf4..f0fb93eb81f5 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -118,8 +118,8 @@ in
       "sha256-JWzHe+4UxLenKYXdNXhShTGWTGDFgWx6O8TAfxEaWPI=";
 
   mypy-boto3-applicationcostprofiler =
-    buildMypyBoto3Package "applicationcostprofiler" "1.40.20"
-      "sha256-owSt/dJ4jtYwAjvi7/gKHqdn9ZdlXrdVggeqP09/GI8=";
+    buildMypyBoto3Package "applicationcostprofiler" "1.40.63"
+      "sha256-FjGdsXuu/NPABrsl5JK3sPsOHGnAwTvIIv+G3MRxZxg=";
 
   mypy-boto3-appmesh =
     buildMypyBoto3Package "appmesh" "1.40.0"

From 05e362b76c6eea3a955fb5c04f5bfaf129b172e1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:04:37 +0100
Subject: [PATCH 4528/6226] python312Packages.mypy-boto3-appmesh: 1.40.0 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index f0fb93eb81f5..34aa29ea39a9 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -122,8 +122,8 @@ in
       "sha256-FjGdsXuu/NPABrsl5JK3sPsOHGnAwTvIIv+G3MRxZxg=";
 
   mypy-boto3-appmesh =
-    buildMypyBoto3Package "appmesh" "1.40.0"
-      "sha256-ZMDdjJse4uyAnWIy/cwQQuAemTrUBdm8PYQp0LTuHgE=";
+    buildMypyBoto3Package "appmesh" "1.40.63"
+      "sha256-jGO22gbzqaa9VcBKyyEo8QLVf/Uia6RrQGaHgIApQPQ=";
 
   mypy-boto3-apprunner =
     buildMypyBoto3Package "apprunner" "1.40.54"

From aaea893507eedaaed5c47367e9d94bbc60a4b51e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:04:39 +0100
Subject: [PATCH 4529/6226] python312Packages.mypy-boto3-appsync: 1.40.0 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 34aa29ea39a9..e13cbfd2e8fc 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -134,8 +134,8 @@ in
       "sha256-l1Zrigv4T4W9z+9MrZTTcTeeVISb5wnjepBpfSv554g=";
 
   mypy-boto3-appsync =
-    buildMypyBoto3Package "appsync" "1.40.0"
-      "sha256-NgOa+Na/gU7IrtEJ8bVMJaSCNgTnGreX2TsjsAlIN+Y=";
+    buildMypyBoto3Package "appsync" "1.40.63"
+      "sha256-KRa98jsQ6MPZBWwZbPAmxmSgUvO9Y6XGkWngL1p5L7I=";
 
   mypy-boto3-arc-zonal-shift =
     buildMypyBoto3Package "arc-zonal-shift" "1.40.55"

From 7a4e54c41fa10953bf6c3f2447726e5bcdb7712f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:04:41 +0100
Subject: [PATCH 4530/6226] python312Packages.mypy-boto3-auditmanager: 1.40.1
 -> 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e13cbfd2e8fc..32cbc6b60168 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -146,8 +146,8 @@ in
       "sha256-hBkW8prNkpdP+7ZEY5YIs540fPDZX1sqbHzEHDWcZgw=";
 
   mypy-boto3-auditmanager =
-    buildMypyBoto3Package "auditmanager" "1.40.1"
-      "sha256-p8jnTJigD8QuLe3vjZwE7ZyGgBblpSdM0II0Cr/xFS8=";
+    buildMypyBoto3Package "auditmanager" "1.40.63"
+      "sha256-dzUf+/dAnrEsjxTcm2AZOqJeeWmQ8///8ORR8/o52S4=";
 
   mypy-boto3-autoscaling =
     buildMypyBoto3Package "autoscaling" "1.40.57"

From 9601f8cf45e49bcc7376b06baaa6c2732cc74050 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:04:44 +0100
Subject: [PATCH 4531/6226] python312Packages.mypy-boto3-chime: 1.40.19 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 32cbc6b60168..1035c8453b6b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -186,8 +186,8 @@ in
       "sha256-vV/nuOJeFelanrZSHeP7m92h1yf4Eg9hlURXzGqZNGA=";
 
   mypy-boto3-chime =
-    buildMypyBoto3Package "chime" "1.40.19"
-      "sha256-j90U6EWrV/zhn0KTitm4/WMV8xh+wm4yjKWFaQ0C4UA=";
+    buildMypyBoto3Package "chime" "1.40.63"
+      "sha256-KpeAk7Kt3wZwgvGv8fOilXyx0FimkX6XFBEqEDvb5Zo=";
 
   mypy-boto3-chime-sdk-identity =
     buildMypyBoto3Package "chime-sdk-identity" "1.40.60"

From bc5461a7f6e9e6134e35ef0e6aeadf5dd4957b3d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:04:46 +0100
Subject: [PATCH 4532/6226] python312Packages.mypy-boto3-cleanrooms: 1.40.45 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 1035c8453b6b..250b4eaa7b72 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -210,8 +210,8 @@ in
       "sha256-yJHnaO8KvjYYWiJF8c4lrnf6Px2FyjSsMZsSjVFdkE0=";
 
   mypy-boto3-cleanrooms =
-    buildMypyBoto3Package "cleanrooms" "1.40.45"
-      "sha256-a4FbYJ7O9YpOfT90vAZdxmDDdDHsITCwLjNSAeYtrco=";
+    buildMypyBoto3Package "cleanrooms" "1.40.63"
+      "sha256-qmN6w6OGOBjOfEcb7bb24niw4cgot1UPyzFPmZeHgXM=";
 
   mypy-boto3-cloud9 =
     buildMypyBoto3Package "cloud9" "1.40.61"

From 356ea83c09872a00f82230540704900b116dd4b2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:04:48 +0100
Subject: [PATCH 4533/6226] python312Packages.mypy-boto3-cloudcontrol: 1.40.0
 -> 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 250b4eaa7b72..8cf33008939d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -218,8 +218,8 @@ in
       "sha256-iS3jyYE2WKaSTegaRLK9jnWd2UxzqPR9F1dpuB2D1mo=";
 
   mypy-boto3-cloudcontrol =
-    buildMypyBoto3Package "cloudcontrol" "1.40.0"
-      "sha256-38IFJI1enFd6XnWe81zuf80N23Orfl1CUCRt57g0zEE=";
+    buildMypyBoto3Package "cloudcontrol" "1.40.63"
+      "sha256-oFy3Q1W7tGdeXbMphjF7pYJjs1WVbKRQok/GQbjwbGs=";
 
   mypy-boto3-clouddirectory =
     buildMypyBoto3Package "clouddirectory" "1.40.16"

From 7f4666072400766d5768554787fb33f12e400e30 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:04:49 +0100
Subject: [PATCH 4534/6226] python312Packages.mypy-boto3-clouddirectory:
 1.40.16 -> 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 8cf33008939d..837a079d00bb 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -222,8 +222,8 @@ in
       "sha256-oFy3Q1W7tGdeXbMphjF7pYJjs1WVbKRQok/GQbjwbGs=";
 
   mypy-boto3-clouddirectory =
-    buildMypyBoto3Package "clouddirectory" "1.40.16"
-      "sha256-fFnHwgB8r239cpVnWSfeiGO1MNOxkXn9MNMUA5ohm04=";
+    buildMypyBoto3Package "clouddirectory" "1.40.63"
+      "sha256-icJPjlbaZhbXRImXTU+guTKyEln0Dg/VCbQLOVKhZvw=";
 
   mypy-boto3-cloudformation =
     buildMypyBoto3Package "cloudformation" "1.40.57"

From 26b0806e930214b85b5355c16c185d52501ecefe Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:04:52 +0100
Subject: [PATCH 4535/6226] python312Packages.mypy-boto3-cloudsearch: 1.40.17
 -> 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 837a079d00bb..c056ee09bcda 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -242,8 +242,8 @@ in
       "sha256-T9ek0te0KDC5Z3kdsprbEm9LvmlfbSW7Nnoi5s4hGWg=";
 
   mypy-boto3-cloudsearch =
-    buildMypyBoto3Package "cloudsearch" "1.40.17"
-      "sha256-bnLdoUOM0daHl74qUUfv6RO6Mqkk8Su97RzCjKettQQ=";
+    buildMypyBoto3Package "cloudsearch" "1.40.63"
+      "sha256-EdwdwO83n4Gx3zcDeQtW9vHj0mg/wVXL+/REyWvNjK8=";
 
   mypy-boto3-cloudsearchdomain =
     buildMypyBoto3Package "cloudsearchdomain" "1.40.61"

From e3dba69b3109b677255b6747adaf882946c84337 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:04:54 +0100
Subject: [PATCH 4536/6226] python312Packages.mypy-boto3-cloudwatch: 1.40.38 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index c056ee09bcda..a1bcb37d8ad0 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -258,8 +258,8 @@ in
       "sha256-ywvJwaPTrQIoZ6xrQtK1/7FFVMM59ls1HOCUFSA9Pv0=";
 
   mypy-boto3-cloudwatch =
-    buildMypyBoto3Package "cloudwatch" "1.40.38"
-      "sha256-JCKTfyeEvYsw8b2EOGJVh+Y6lgpzMFecj2y35o3K9Mo=";
+    buildMypyBoto3Package "cloudwatch" "1.40.63"
+      "sha256-rIshJJ2HohBPXYlWF+y3KY7GuS5adzYWrjll0Y7HqZU=";
 
   mypy-boto3-codeartifact =
     buildMypyBoto3Package "codeartifact" "1.40.60"

From f8925b42cc88578469bc87dcc2bf2f8cf45e86f5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:04:56 +0100
Subject: [PATCH 4537/6226] python312Packages.mypy-boto3-codecatalyst: 1.40.0
 -> 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a1bcb37d8ad0..b01d8e106ada 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -270,8 +270,8 @@ in
       "sha256-IluCF13Ch70pP6vikKKgr0eN/SeiFLb8Cnxio6S58AU=";
 
   mypy-boto3-codecatalyst =
-    buildMypyBoto3Package "codecatalyst" "1.40.0"
-      "sha256-cPLylCvda6iHWRcPMVaL/qEkeg7EzBs38G2mX1eP0ZI=";
+    buildMypyBoto3Package "codecatalyst" "1.40.63"
+      "sha256-ecfKyHRa435PMsQppEie2wFYN9CE1HcQUZSd3TLe7z8=";
 
   mypy-boto3-codecommit =
     buildMypyBoto3Package "codecommit" "1.40.18"

From be1db9bc8f21f5a7d5b09a9f22001eca317bc400 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:04:57 +0100
Subject: [PATCH 4538/6226] python312Packages.mypy-boto3-codecommit: 1.40.18 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b01d8e106ada..37f16deae38d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -274,8 +274,8 @@ in
       "sha256-ecfKyHRa435PMsQppEie2wFYN9CE1HcQUZSd3TLe7z8=";
 
   mypy-boto3-codecommit =
-    buildMypyBoto3Package "codecommit" "1.40.18"
-      "sha256-+T9NGuE7gN1OjOBhIU8QCo09FiAQ1qdiABitoQpDZrk=";
+    buildMypyBoto3Package "codecommit" "1.40.63"
+      "sha256-jKSLa9U393dahneBYIzFpHPa57EtcqJ3rJvB62EsKlU=";
 
   mypy-boto3-codedeploy =
     buildMypyBoto3Package "codedeploy" "1.40.20"

From c3709eb03e37c61c8684a117875677ef16931934 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:04:59 +0100
Subject: [PATCH 4539/6226] python312Packages.mypy-boto3-codedeploy: 1.40.20 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 37f16deae38d..f853531f5da1 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -278,8 +278,8 @@ in
       "sha256-jKSLa9U393dahneBYIzFpHPa57EtcqJ3rJvB62EsKlU=";
 
   mypy-boto3-codedeploy =
-    buildMypyBoto3Package "codedeploy" "1.40.20"
-      "sha256-1YBZlgDBAmYmkSgI0BGWAlyDGwSEjISd+NDqk2PPlbI=";
+    buildMypyBoto3Package "codedeploy" "1.40.63"
+      "sha256-sD53LSKVeYIipxKLw8SBR2zcxksM01zfVQhHtW5fZkA=";
 
   mypy-boto3-codeguru-reviewer =
     buildMypyBoto3Package "codeguru-reviewer" "1.40.57"

From e640c97e9b08de065ec2fcc73f2b7fd6716e0754 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:05:03 +0100
Subject: [PATCH 4540/6226] python312Packages.mypy-boto3-cognito-sync: 1.40.16
 -> 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index f853531f5da1..dc330270c150 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -318,8 +318,8 @@ in
       "sha256-TgZlbzlU4ZPk3/aQQrwhTbXvV167tgahtfy23D1v0y4=";
 
   mypy-boto3-cognito-sync =
-    buildMypyBoto3Package "cognito-sync" "1.40.16"
-      "sha256-NFaYYsnZD0MlDKl7t9FCMLV2eo/WH34ach4o6N/xrm0=";
+    buildMypyBoto3Package "cognito-sync" "1.40.63"
+      "sha256-PzwZSGvdN1+tNmWZPOlZErP5WWk2eE0pE7XCh2/5AJc=";
 
   mypy-boto3-comprehend =
     buildMypyBoto3Package "comprehend" "1.40.60"

From b38d46cd17372881172b3a09e35f8239f130eaf3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:05:06 +0100
Subject: [PATCH 4541/6226] python312Packages.mypy-boto3-compute-optimizer:
 1.40.0 -> 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index dc330270c150..e8dfffdabd96 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -330,8 +330,8 @@ in
       "sha256-P/frAydh31frX9xNis2vyi2XbswpcA0BJXW8TJKncFg=";
 
   mypy-boto3-compute-optimizer =
-    buildMypyBoto3Package "compute-optimizer" "1.40.0"
-      "sha256-CSfC9Kg73LydRU5aH4kqdc0pJWqEf98ebu6FOBE7oVU=";
+    buildMypyBoto3Package "compute-optimizer" "1.40.63"
+      "sha256-9dwQLNrI8jlK7ay0r8rfNRLIgJhptrtMi94iZW+YzA8=";
 
   mypy-boto3-config =
     buildMypyBoto3Package "config" "1.40.58"

From ca7cfcc84a9a29681f60e55598b35fe5d18c43ad Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:05:08 +0100
Subject: [PATCH 4542/6226] python312Packages.mypy-boto3-connectcases: 1.40.44
 -> 1.40.64

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e8dfffdabd96..3b5c7423befb 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -350,8 +350,8 @@ in
       "sha256-q5aHrusyuFPI1ItuoaFskLoRQmDkBLwjV/Sch+G2l+U=";
 
   mypy-boto3-connectcases =
-    buildMypyBoto3Package "connectcases" "1.40.44"
-      "sha256-T4E5rin+Y0DJWARRqzA7agLwcF11v4CGy/Fe/x/F7vY=";
+    buildMypyBoto3Package "connectcases" "1.40.64"
+      "sha256-qizL2lYo7Un0mJtAdyksYV4dSsk3T4p+9F+9AvQLHmk=";
 
   mypy-boto3-connectparticipant =
     buildMypyBoto3Package "connectparticipant" "1.40.57"

From 410374c5e02353598412032f8e6b4853060d70a5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:05:13 +0100
Subject: [PATCH 4543/6226] python312Packages.mypy-boto3-devops-guru: 1.40.17
 -> 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 3b5c7423befb..be28628e6134 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -398,8 +398,8 @@ in
       "sha256-qekCLt6+vbE6AKkuNG6x/0m72NDOK2v8uCAP6gYWHTY=";
 
   mypy-boto3-devops-guru =
-    buildMypyBoto3Package "devops-guru" "1.40.17"
-      "sha256-cDV8kPjBB3Mu5cqsAVsRjTk6KMozwEMHx/Fu0SRp5EQ=";
+    buildMypyBoto3Package "devops-guru" "1.40.63"
+      "sha256-saiHuNzlpD9LKnRpQVRaqIz1KPdWbB0wUm1kchmSqGI=";
 
   mypy-boto3-directconnect =
     buildMypyBoto3Package "directconnect" "1.40.57"

From ff3dff54f1bbad90646de77fa1aec12fcd215318 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:05:16 +0100
Subject: [PATCH 4544/6226] python312Packages.mypy-boto3-docdb: 1.40.59 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index be28628e6134..512c7ffa183e 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -418,8 +418,8 @@ in
       "sha256-wGVRK+B6DoxsK++kNZEWQdWozrpPHr7jGOzq3D52xE4=";
 
   mypy-boto3-docdb =
-    buildMypyBoto3Package "docdb" "1.40.59"
-      "sha256-/GawEPC2vYYqQ0ISSjTebM7a/NsCUyDMDa4xTZHOFjg=";
+    buildMypyBoto3Package "docdb" "1.40.63"
+      "sha256-N0RWxdWolQadRfOC2zoJrixVNjtcZdA6hlmwjbeKUrQ=";
 
   mypy-boto3-docdb-elastic =
     buildMypyBoto3Package "docdb-elastic" "1.40.58"

From ea7ea146e89f612fbbaeedb66fe7118bf6cab360 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:05:19 +0100
Subject: [PATCH 4545/6226] python312Packages.mypy-boto3-ec2: 1.40.61 ->
 1.40.64

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 512c7ffa183e..e06f7ec73bc3 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -446,8 +446,8 @@ in
       "sha256-eKwS+FXicnxiHr2aTDG+ih6kDxQ24NLCkI9XPt2LjvQ=";
 
   mypy-boto3-ec2 =
-    buildMypyBoto3Package "ec2" "1.40.61"
-      "sha256-NfY+6/jTnWgQs8g+RSst9fqojvaXgC0Ulzd+VBlMq0E=";
+    buildMypyBoto3Package "ec2" "1.40.64"
+      "sha256-6+jjuG6iqXLjjuztY1FX/exSl5BjdKsrg1EOQM1w0Io=";
 
   mypy-boto3-ec2-instance-connect =
     buildMypyBoto3Package "ec2-instance-connect" "1.40.57"

From 1e75d970c2fe4f0928a13d41f7379e71c760ab61 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:05:23 +0100
Subject: [PATCH 4546/6226] python312Packages.mypy-boto3-ecs: 1.40.61 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e06f7ec73bc3..1eccce48a83a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -462,8 +462,8 @@ in
       "sha256-gyNKT8yjYFgDgEvBgUIvC0iVKIOLaCbLWcF9eYzQWUQ=";
 
   mypy-boto3-ecs =
-    buildMypyBoto3Package "ecs" "1.40.61"
-      "sha256-bVLBi8CzUkmzE7oWyj4KLAcFs4P8lvwrUGMpl30AEXI=";
+    buildMypyBoto3Package "ecs" "1.40.63"
+      "sha256-4cZrAPPo9rol9c+KFPYKaZZK1vQB2WYl34TiJfEbWco=";
 
   mypy-boto3-efs =
     buildMypyBoto3Package "efs" "1.40.61"

From a7f936c99b8569ea78a411f59cacd17f7155ddb4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:05:25 +0100
Subject: [PATCH 4547/6226] python312Packages.mypy-boto3-elasticache: 1.40.19
 -> 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 1eccce48a83a..9ceb3b4a34de 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -478,8 +478,8 @@ in
       "sha256-duU3LIeW3FNiplVmduZsNXBoDK7vbO6ecrBt1Y7C9rU=";
 
   mypy-boto3-elasticache =
-    buildMypyBoto3Package "elasticache" "1.40.19"
-      "sha256-YaNGVCO/MGDn/9YQBquhqqg1YHmJK3grdk/wVdF4erQ=";
+    buildMypyBoto3Package "elasticache" "1.40.63"
+      "sha256-o4EYOb30TxE+tLIKdEMVSEyyRSJ082ZwkavHHeUDr+0=";
 
   mypy-boto3-elasticbeanstalk =
     buildMypyBoto3Package "elasticbeanstalk" "1.40.60"

From c7691fea982a4d9ebac00109cdc9eada714c0bfb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:05:27 +0100
Subject: [PATCH 4548/6226] python312Packages.mypy-boto3-emr: 1.40.56 ->
 1.40.64

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 9ceb3b4a34de..af3928e8ab4d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -498,8 +498,8 @@ in
       "sha256-TGc78KsQ4y8QSFutN+/cj/gr2iJWi7fYh52OYFCFwho=";
 
   mypy-boto3-emr =
-    buildMypyBoto3Package "emr" "1.40.56"
-      "sha256-Khke6Z4btoZe5VlLDLJEmwxDD3o/uOYImj/bUy92Wdc=";
+    buildMypyBoto3Package "emr" "1.40.64"
+      "sha256-NxYFJHvE3QifWP6csT3Rp/R0Yd2hYXjSjfe6ds3UQz0=";
 
   mypy-boto3-emr-containers =
     buildMypyBoto3Package "emr-containers" "1.40.61"

From 06b81ab544f5a700a30fef4d848bda9a879cbb63 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:05:29 +0100
Subject: [PATCH 4549/6226] python312Packages.mypy-boto3-emr-serverless: 1.40.0
 -> 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index af3928e8ab4d..306704697784 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -506,8 +506,8 @@ in
       "sha256-uIOqO9W5VRFJtm1iZQsVdWIUomuHnbO6imSNBNBosMA=";
 
   mypy-boto3-emr-serverless =
-    buildMypyBoto3Package "emr-serverless" "1.40.0"
-      "sha256-9Iz9FapUQCWa9bjmH0Ar9O1mtTv+ovWlxikddb5+Wlc=";
+    buildMypyBoto3Package "emr-serverless" "1.40.63"
+      "sha256-6UY8UreMCPqP2EA/HJNwXLmVnbtSM1rA/iRm/r/+Ng4=";
 
   mypy-boto3-entityresolution =
     buildMypyBoto3Package "entityresolution" "1.40.60"

From d55c03f6ee640ce1a8671bc4d121770c37e3fd51 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:05:31 +0100
Subject: [PATCH 4550/6226] python312Packages.mypy-boto3-firehose: 1.40.0 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 306704697784..19898e7717bf 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -534,8 +534,8 @@ in
       "sha256-CQzN5qc5N34JKeF0gKoIzVb5wtdc8r2uar+Q6Y2Gd3g=";
 
   mypy-boto3-firehose =
-    buildMypyBoto3Package "firehose" "1.40.0"
-      "sha256-Zzp7VoPaVIHX3KccxlFILesGNJP7f1p63uXLwN3rLcs=";
+    buildMypyBoto3Package "firehose" "1.40.63"
+      "sha256-IdEuluW+mpjEDeuhptskEGDRoqQjylHCv9B2j8sYtrY=";
 
   mypy-boto3-fis =
     buildMypyBoto3Package "fis" "1.40.59"

From 61b62d9c130779ef24c9c2001573a010b3a8732c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:05:33 +0100
Subject: [PATCH 4551/6226] python312Packages.mypy-boto3-fms: 1.40.20 ->
 1.40.64

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 19898e7717bf..695d67482fe2 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -542,8 +542,8 @@ in
       "sha256-FEBW/Vtx+MooC2lNBh9xFA8mWpbLK7qqBWWAnG80kvg=";
 
   mypy-boto3-fms =
-    buildMypyBoto3Package "fms" "1.40.20"
-      "sha256-yBhVmfeAexcJzkxC3AdtWOC4PjCoTDozxYT6qrgEHJ8=";
+    buildMypyBoto3Package "fms" "1.40.64"
+      "sha256-TxHLddGOy2Pa0bld44WQCnkvhb1Gl6ohckI1TNG56uc=";
 
   mypy-boto3-forecast =
     buildMypyBoto3Package "forecast" "1.40.60"

From 15ee6fb6db92c7579b0c635620c5d38fc48ff179 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:05:35 +0100
Subject: [PATCH 4552/6226] python312Packages.mypy-boto3-frauddetector: 1.40.19
 -> 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 695d67482fe2..e3ef0f926fa2 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -554,8 +554,8 @@ in
       "sha256-isp1Xxwze6EL2Be4I881yiGnQh9zcXVPXZ768Cz/Y68=";
 
   mypy-boto3-frauddetector =
-    buildMypyBoto3Package "frauddetector" "1.40.19"
-      "sha256-BpY3WWeFvaGfDaGk/dxJijSK3giz7wrgvHk/lKOaxzk=";
+    buildMypyBoto3Package "frauddetector" "1.40.63"
+      "sha256-Qex9NGctqp5L2XkIxw6J9t4C5rqVzDmNCKWzQLI+040=";
 
   mypy-boto3-fsx =
     buildMypyBoto3Package "fsx" "1.40.42"

From 5bcd99e8ad591d3ab4422744ad390b9e659ef016 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:05:36 +0100
Subject: [PATCH 4553/6226] python312Packages.mypy-boto3-fsx: 1.40.42 ->
 1.40.64

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e3ef0f926fa2..a2522b4a403b 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -558,8 +558,8 @@ in
       "sha256-Qex9NGctqp5L2XkIxw6J9t4C5rqVzDmNCKWzQLI+040=";
 
   mypy-boto3-fsx =
-    buildMypyBoto3Package "fsx" "1.40.42"
-      "sha256-phgje7MZt9KoKUb6bQYqZ4/BqjYflEDPJ/uN7J04zuE=";
+    buildMypyBoto3Package "fsx" "1.40.64"
+      "sha256-b3G9urLiNhC/8SnEqRBTlm/ns1vi7KtVqZzZ2U8G6kw=";
 
   mypy-boto3-gamelift =
     buildMypyBoto3Package "gamelift" "1.40.54"

From 8a5f7f0ef232b39a5d5c689f077226dab1716665 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:05:38 +0100
Subject: [PATCH 4554/6226] python312Packages.mypy-boto3-glue: 1.40.50 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a2522b4a403b..bdda4c7cd610 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -574,8 +574,8 @@ in
       "sha256-NkEe4fOx9ZH6SHfa3A8UHXLyxIgjVGvy4UL+HkUiCDA=";
 
   mypy-boto3-glue =
-    buildMypyBoto3Package "glue" "1.40.50"
-      "sha256-1LgvvSs/ZFxrCT/7MhZDATFUI6az5yTAhuc41QQ1kGk=";
+    buildMypyBoto3Package "glue" "1.40.63"
+      "sha256-1nuI+XZIfxrcCxdyyK090Gqq6UojBGkkq9TRu1PbJLk=";
   mypy-boto3-grafana =
     buildMypyBoto3Package "grafana" "1.40.54"
       "sha256-GeYE+d3wv+KTcS0ve0ftTLXazGS5a5KMQmVMXMl9jtM=";

From ef4922bce4f5b8a4515d64a273e8ddacce192d0d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:05:40 +0100
Subject: [PATCH 4555/6226] python312Packages.mypy-boto3-greengrassv2: 1.40.15
 -> 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index bdda4c7cd610..95f2184d5578 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -585,8 +585,8 @@ in
       "sha256-+H/q11j6CwdS40V1BO8890nBwOYKo2JCz/plaemZHJY=";
 
   mypy-boto3-greengrassv2 =
-    buildMypyBoto3Package "greengrassv2" "1.40.15"
-      "sha256-/O+fM3MU2HtFIt1S8+yE3RG59dsHKwJbnINaVmYUnD0=";
+    buildMypyBoto3Package "greengrassv2" "1.40.63"
+      "sha256-Q4Qxdpy59x3JkyJ3I54xRvGk789J6mhWtpLZcSWqr/A=";
 
   mypy-boto3-groundstation =
     buildMypyBoto3Package "groundstation" "1.40.61"

From f1d2e78cb1413c01c38ee67289c87d9891a1e470 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:05:42 +0100
Subject: [PATCH 4556/6226] python312Packages.mypy-boto3-health: 1.40.0 ->
 1.40.64

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 95f2184d5578..37fc3ba1b770 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -597,8 +597,8 @@ in
       "sha256-gTfRwvZekeaQ8V7QgepE4S+i134YQiJ1UXDTU+otVZ8=";
 
   mypy-boto3-health =
-    buildMypyBoto3Package "health" "1.40.0"
-      "sha256-c/QCgM8mWIAe76C7e3+g9z3i/ukvOz9QGungofo2hY8=";
+    buildMypyBoto3Package "health" "1.40.64"
+      "sha256-sakRBiIRCBnOmEy171tY5496TT8GpWvw4IH0Su0plXk=";
 
   mypy-boto3-healthlake =
     buildMypyBoto3Package "healthlake" "1.40.58"

From 7beb650f608af494c87e1183ac5a7d0f98eae342 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:05:50 +0100
Subject: [PATCH 4557/6226] python312Packages.mypy-boto3-iotevents-data:
 1.40.15 -> 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 37fc3ba1b770..b784f684d2c8 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -665,8 +665,8 @@ in
       "sha256-j/LzJRyYqyThvR4MzPrSVJvlpHDhFkb4Hm5TjXdeWqY=";
 
   mypy-boto3-iotevents-data =
-    buildMypyBoto3Package "iotevents-data" "1.40.15"
-      "sha256-CIr9UTs6qHRvEWrlHLooTOYzFKaWA+BwG/N8Fp+XTJg=";
+    buildMypyBoto3Package "iotevents-data" "1.40.63"
+      "sha256-jhLj/7AWoC9oqprKhm+vCnwFSWU1aMBK8tmL3rX9sSA=";
 
   mypy-boto3-iotfleethub =
     buildMypyBoto3Package "iotfleethub" "1.40.17"

From 3a6320f28b6d6deda7fef91fd222259c07d11458 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:05:57 +0100
Subject: [PATCH 4558/6226] python312Packages.mypy-boto3-kinesis: 1.40.60 ->
 1.40.64

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index b784f684d2c8..069bddc36718 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -729,8 +729,8 @@ in
       "sha256-NLkf8t9W/ZKA7S9qc/qJ1u4bzh87unvsQLUeh92sbvg=";
 
   mypy-boto3-kinesis =
-    buildMypyBoto3Package "kinesis" "1.40.60"
-      "sha256-mMh6y7S68A7epORt0CkJ5U9Y0w8UwJmVf6L8d/G0HUA=";
+    buildMypyBoto3Package "kinesis" "1.40.64"
+      "sha256-5g/KLB69FD9/lojdZ5S3vWPuHBgdOjyrXxyDh0RZd8k=";
 
   mypy-boto3-kinesis-video-archived-media =
     buildMypyBoto3Package "kinesis-video-archived-media" "1.40.58"

From 3605a33137e20f728766e339f1857e02e329497e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:06:01 +0100
Subject: [PATCH 4559/6226] python312Packages.mypy-boto3-kms: 1.40.54 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 069bddc36718..4bbc763b14b8 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -761,8 +761,8 @@ in
       "sha256-lViXLfbEMpMenVxZmcp2cfhd0SqH2IiMPOIaOdimU00=";
 
   mypy-boto3-kms =
-    buildMypyBoto3Package "kms" "1.40.54"
-      "sha256-0+dJmIiBbQPcy6xbmn/qjvAyI84YF5AvGJFzZBQAP3g=";
+    buildMypyBoto3Package "kms" "1.40.63"
+      "sha256-TI+hBy1rbDzEaxb4aTQ5PbZyhGNChowdlmjDvVKltIU=";
 
   mypy-boto3-lakeformation =
     buildMypyBoto3Package "lakeformation" "1.40.55"

From 467469a109d6d4da9862b6850e132a8e4d501523 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:06:02 +0100
Subject: [PATCH 4560/6226] python312Packages.mypy-boto3-lambda: 1.40.61 ->
 1.40.64

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 4bbc763b14b8..433aa8d1755f 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -769,8 +769,8 @@ in
       "sha256-IcUBufhnr3GfgJ0FG/JTwo0EgNZBtgKvTd6TtyttWRQ=";
 
   mypy-boto3-lambda =
-    buildMypyBoto3Package "lambda" "1.40.61"
-      "sha256-ffnXUIpAaIsKSLQ23Wh3fyL7CVgg/RIneMGFN9cAn7k=";
+    buildMypyBoto3Package "lambda" "1.40.64"
+      "sha256-w4xoyD1wEmYcn1V5zjNg2J5Zxe45QffCKsz9qQ0UCR8=";
 
   mypy-boto3-lex-models =
     buildMypyBoto3Package "lex-models" "1.40.54"

From 9957b4f0033529783f6dbde6bad523f074d52379 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:06:06 +0100
Subject: [PATCH 4561/6226] 
 python312Packages.mypy-boto3-license-manager-linux-subscriptions: 1.40.0 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 433aa8d1755f..a2f6c2797ccf 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -793,8 +793,8 @@ in
       "sha256-d9i0AUux2ChlTnW2UWJ/de9KRYc8HtvLSFENETuy72U=";
 
   mypy-boto3-license-manager-linux-subscriptions =
-    buildMypyBoto3Package "license-manager-linux-subscriptions" "1.40.0"
-      "sha256-pfIQS9as02Gm4mHUc3q3gMKRHz+wT/lRKHWUc2ugt1s=";
+    buildMypyBoto3Package "license-manager-linux-subscriptions" "1.40.63"
+      "sha256-5nHjl/kDJHf0QvaWqQVFSDkYxJpH78sQA+ilMCzu6DQ=";
 
   mypy-boto3-license-manager-user-subscriptions =
     buildMypyBoto3Package "license-manager-user-subscriptions" "1.40.55"

From dab59fd5a2dfbdd17be8ff27ff8e636351577729 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:06:08 +0100
Subject: [PATCH 4562/6226] python312Packages.mypy-boto3-logs: 1.40.32 ->
 1.40.64

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index a2f6c2797ccf..60a144890a43 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -809,8 +809,8 @@ in
       "sha256-mQBymsl2+/hka8QiR+AzxS7gtONHroTgY3qmgt+YKOw=";
 
   mypy-boto3-logs =
-    buildMypyBoto3Package "logs" "1.40.32"
-      "sha256-udjRe+Pb6Yvbh6OHYs32VCTddkrAo/y1Se32A+FM1/M=";
+    buildMypyBoto3Package "logs" "1.40.64"
+      "sha256-XWGsDqlDWAmh4treGhQDb9t0QF8cAKWRdkJwY62qdOY=";
 
   mypy-boto3-lookoutequipment =
     buildMypyBoto3Package "lookoutequipment" "1.40.54"

From 9ce61322cfb17afb195ba7592f1ce8f3736d6b5f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:06:13 +0100
Subject: [PATCH 4563/6226] python312Packages.mypy-boto3-marketplace-catalog:
 1.40.55 -> 1.40.64

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 60a144890a43..48d282edb012 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -845,8 +845,8 @@ in
       "sha256-YC5sNBnH5wS6JSCfPK7cp08WXgBLaDypDRBALMciLQQ=";
 
   mypy-boto3-marketplace-catalog =
-    buildMypyBoto3Package "marketplace-catalog" "1.40.55"
-      "sha256-UqI1ypP3nBu8cc1bFg4RWtOUm5BbE4lA2zvAvbWTQac=";
+    buildMypyBoto3Package "marketplace-catalog" "1.40.64"
+      "sha256-Gla00GNkoQ9C/AocSEkHQwTK1JP51F+pnhmRfQRFCpg=";
 
   mypy-boto3-marketplace-entitlement =
     buildMypyBoto3Package "marketplace-entitlement" "1.40.54"

From 9b477602791a4c1e330d770f5484305191c3b573 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:06:16 +0100
Subject: [PATCH 4564/6226] python312Packages.mypy-boto3-mediaconvert: 1.40.56
 -> 1.40.64

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 48d282edb012..7e9197d83ae7 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -861,8 +861,8 @@ in
       "sha256-18sD6lfs5Y9BBp3j8c/TVjI/3KZbO6pKuYPYKir1NQY=";
 
   mypy-boto3-mediaconvert =
-    buildMypyBoto3Package "mediaconvert" "1.40.56"
-      "sha256-oxrbkvlpIII2Ib8hMF0UnZ6PNFYnDHceA6V9M1thF18=";
+    buildMypyBoto3Package "mediaconvert" "1.40.64"
+      "sha256-TRr19ppRe4jRZNMHPQmXwUXXmtt/vzwLjc5Xq+H/RYw=";
 
   mypy-boto3-medialive =
     buildMypyBoto3Package "medialive" "1.40.57"

From 0eb3d775597c5f1bc21440bd8837cb0459892087 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:06:25 +0100
Subject: [PATCH 4565/6226] python312Packages.mypy-boto3-neptune: 1.40.38 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 7e9197d83ae7..f879e6939637 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -941,8 +941,8 @@ in
       "sha256-84N2KuK/XAPJqnmeDuWNpC5X6NRodH0luXfP+ZjH0pQ=";
 
   mypy-boto3-neptune =
-    buildMypyBoto3Package "neptune" "1.40.38"
-      "sha256-3vbUWdYw7jqTM5TPM3btPROlXPW1xR+3cI29ImVrt1w=";
+    buildMypyBoto3Package "neptune" "1.40.63"
+      "sha256-oo88POk9T+Ys/awYIRLRw0JwFfFtyyrKC2t/lclKE2I=";
 
   mypy-boto3-neptunedata =
     buildMypyBoto3Package "neptunedata" "1.40.58"

From 627032b7e5b82451c453a3fc0a16b6cc0a22a0e8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:06:28 +0100
Subject: [PATCH 4566/6226] python312Packages.mypy-boto3-omics: 1.40.58 ->
 1.40.64

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index f879e6939637..54e3b90321dd 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -965,8 +965,8 @@ in
       "sha256-jobSOTxwJ6mzhr4O+opLrCvGuq4MMRe+zjhHWpq4JsA=";
 
   mypy-boto3-omics =
-    buildMypyBoto3Package "omics" "1.40.58"
-      "sha256-weugGpAmdljYGGImQm7Ic46FH/H1RrQqe0Vkc0sWhTQ=";
+    buildMypyBoto3Package "omics" "1.40.64"
+      "sha256-hjgvlTcA18OeMpJIgpl+ml4zSc73HXrUrM0adOzScl4=";
 
   mypy-boto3-opensearch =
     buildMypyBoto3Package "opensearch" "1.40.61"

From cdf8437c13777f6d8d10cbdc2be68c5f06d71f14 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:06:31 +0100
Subject: [PATCH 4567/6226] python312Packages.mypy-boto3-payment-cryptography:
 1.40.59 -> 1.40.64

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 54e3b90321dd..74f8265b3063 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1001,8 +1001,8 @@ in
       "sha256-Rf6XuOTE/09pKpotR/AY6526gfPP+pP2Y9WAfhBSL6E=";
 
   mypy-boto3-payment-cryptography =
-    buildMypyBoto3Package "payment-cryptography" "1.40.59"
-      "sha256-7B7yO41CKkQPBxY4hDwVt5LmkbweyLZtCkeO+B0OLmc=";
+    buildMypyBoto3Package "payment-cryptography" "1.40.64"
+      "sha256-4jXXEaS2Uy+k+FQScXyaLToUC6E3+poejhOLAOGBFdg=";
 
   mypy-boto3-payment-cryptography-data =
     buildMypyBoto3Package "payment-cryptography-data" "1.40.59"

From 7225117cab823faa755de3f40ae0f251c57ef212 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:06:40 +0100
Subject: [PATCH 4568/6226] python312Packages.mypy-boto3-redshift: 1.40.40 ->
 1.40.64

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 74f8265b3063..d14b362ded2c 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1093,8 +1093,8 @@ in
       "sha256-tPhLjs0Gw9CunnNhnWc9UMyOwY7f1B9V/XzEHOOoLg4=";
 
   mypy-boto3-redshift =
-    buildMypyBoto3Package "redshift" "1.40.40"
-      "sha256-S2Kq4+up5zWfLS2rM14qwmzLd1h13hz8YURBq9O715w=";
+    buildMypyBoto3Package "redshift" "1.40.64"
+      "sha256-FyWVufVC/yjEMju/Zdj382CqZgOEGNDCJ64I7jbGu7E=";
 
   mypy-boto3-redshift-data =
     buildMypyBoto3Package "redshift-data" "1.40.57"

From 916ba0a489bcbd46283fba20607f636020776351 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:06:42 +0100
Subject: [PATCH 4569/6226] 
 python312Packages.mypy-boto3-resourcegroupstaggingapi: 1.40.17 -> 1.40.64

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d14b362ded2c..d0e76952dae0 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1121,8 +1121,8 @@ in
       "sha256-ZKa2t6TPCQBID9YGi6vkYnw9icZQinedflGoqFyXqc0=";
 
   mypy-boto3-resourcegroupstaggingapi =
-    buildMypyBoto3Package "resourcegroupstaggingapi" "1.40.17"
-      "sha256-y80XkJoge5ED3oj4562wlG8GaXcCzTI8It58RW+skRQ=";
+    buildMypyBoto3Package "resourcegroupstaggingapi" "1.40.64"
+      "sha256-zcNW4Ll7oTzeZIL+fV7DaP/YYTjmSzvPhnDukyVFGog=";
 
   mypy-boto3-robomaker =
     buildMypyBoto3Package "robomaker" "1.40.59"

From 76bd98fe914c83bbd8413d50bd611632f53cd0b0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:06:48 +0100
Subject: [PATCH 4570/6226] python312Packages.mypy-boto3-s3outposts: 1.40.15 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d0e76952dae0..d6a5fb803042 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1169,8 +1169,8 @@ in
       "sha256-yyzFGMna0sVQnoc/xQSXTMO/RR1RiyQuWHeiVHHk7ZI=";
 
   mypy-boto3-s3outposts =
-    buildMypyBoto3Package "s3outposts" "1.40.15"
-      "sha256-HPAyUwvfUNZl3Ts3H0evVO7UifAiiwrDPyYJ4titkqA=";
+    buildMypyBoto3Package "s3outposts" "1.40.63"
+      "sha256-AL/XZLrWVNvZXxHvFXCsR/7L0F+9gCS20AhyJOSk5XE=";
 
   mypy-boto3-sagemaker =
     buildMypyBoto3Package "sagemaker" "1.40.61"

From 4fd27d9bd7b30d45a8df6732259e2184848a3f6c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:06:49 +0100
Subject: [PATCH 4571/6226] python312Packages.mypy-boto3-sagemaker: 1.40.61 ->
 1.40.64

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d6a5fb803042..751beccfb3b9 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1173,8 +1173,8 @@ in
       "sha256-AL/XZLrWVNvZXxHvFXCsR/7L0F+9gCS20AhyJOSk5XE=";
 
   mypy-boto3-sagemaker =
-    buildMypyBoto3Package "sagemaker" "1.40.61"
-      "sha256-qHC0znSbcBD0eNkq5b9Hq2h8+iM7BiQIAdm+2JOEuZo=";
+    buildMypyBoto3Package "sagemaker" "1.40.64"
+      "sha256-voJIB6srDcuVmJJ3d+gJrOSC5X/I7FqOmNqiFzhunxM=";
 
   mypy-boto3-sagemaker-a2i-runtime =
     buildMypyBoto3Package "sagemaker-a2i-runtime" "1.40.57"

From b5c0cd972360ec5f03b706ab5714dd64e469b54e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:06:53 +0100
Subject: [PATCH 4572/6226] python312Packages.mypy-boto3-sagemaker-runtime:
 1.40.17 -> 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 751beccfb3b9..2e87fe728959 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1197,8 +1197,8 @@ in
       "sha256-7Z+kgd+6TYaE5cNmcJi2eWeAsCs0kSv+c+CLr3c9FnU=";
 
   mypy-boto3-sagemaker-runtime =
-    buildMypyBoto3Package "sagemaker-runtime" "1.40.17"
-      "sha256-NuIRRV2eq/OSMyeqKuZXGFfjzGQpX41Gx5Tv9l/2jOo=";
+    buildMypyBoto3Package "sagemaker-runtime" "1.40.63"
+      "sha256-QbpaTAAmqvN4Vo6vq3U25bcYLgTGZUTvgaxl6BGbxZQ=";
 
   mypy-boto3-savingsplans =
     buildMypyBoto3Package "savingsplans" "1.40.58"

From a8b9bb1f025f340f083e5aede3c23bdc6d145dd8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:06:54 +0100
Subject: [PATCH 4573/6226] python312Packages.mypy-boto3-savingsplans: 1.40.58
 -> 1.40.64

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 2e87fe728959..3178647b44c8 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1201,8 +1201,8 @@ in
       "sha256-QbpaTAAmqvN4Vo6vq3U25bcYLgTGZUTvgaxl6BGbxZQ=";
 
   mypy-boto3-savingsplans =
-    buildMypyBoto3Package "savingsplans" "1.40.58"
-      "sha256-hwVYt4TCYXK6G8N0x52swjdf/k1roNzwRhYl8JO4VM0=";
+    buildMypyBoto3Package "savingsplans" "1.40.64"
+      "sha256-o9l8b3o+Z+ft+t5UBUleHbOfHexY6UBUo10ko6Ru/IA=";
 
   mypy-boto3-scheduler =
     buildMypyBoto3Package "scheduler" "1.40.60"

From 40660dc4b26a9987101700317b64752a331cb000 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:06:56 +0100
Subject: [PATCH 4574/6226] python312Packages.mypy-boto3-schemas: 1.40.19 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 3178647b44c8..799c1d73db8d 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1209,8 +1209,8 @@ in
       "sha256-ckZ45QZgelh3hVVmMrxdFO0I9qRs8f4EmmRizHB8MVk=";
 
   mypy-boto3-schemas =
-    buildMypyBoto3Package "schemas" "1.40.19"
-      "sha256-cNAGZVXZKDxfU1x92cBHYa2MlVFCaFTVENt3pbsYpcY=";
+    buildMypyBoto3Package "schemas" "1.40.63"
+      "sha256-QV0qMR8NdhDx4WR3okTGpYvkosZfD3QslmegvvPyvZQ=";
 
   mypy-boto3-sdb =
     buildMypyBoto3Package "sdb" "1.40.0"

From d583513a741da8253ff9c8df8558a0fd5b9db0f6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:06:58 +0100
Subject: [PATCH 4575/6226] python312Packages.mypy-boto3-serverlessrepo:
 1.40.17 -> 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 799c1d73db8d..00fd74439697 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1229,8 +1229,8 @@ in
       "sha256-bwX8OJWCayO3dpMuhB9VelSzhl/y+vVch0hY8w2NFm0=";
 
   mypy-boto3-serverlessrepo =
-    buildMypyBoto3Package "serverlessrepo" "1.40.17"
-      "sha256-1YK+zUZhTf37giAyXYuZDJ8Gmg4LUZO1FwaAGViIXos=";
+    buildMypyBoto3Package "serverlessrepo" "1.40.63"
+      "sha256-zj7R0tvQvheGrQIAuXQsHBJrm01lQlkoCxkJLZDJR/8=";
 
   mypy-boto3-service-quotas =
     buildMypyBoto3Package "service-quotas" "1.40.48"

From 065570a5404427dcee9232b965fb44e6ed43d072 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:07:00 +0100
Subject: [PATCH 4576/6226] python312Packages.mypy-boto3-servicecatalog: 1.40.0
 -> 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 00fd74439697..9e89171b3a8a 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1237,8 +1237,8 @@ in
       "sha256-9lvZvist3G5plkmsvZ4iHM2iBim8V3BmCYTbk6xDrmc=";
 
   mypy-boto3-servicecatalog =
-    buildMypyBoto3Package "servicecatalog" "1.40.0"
-      "sha256-NQpBAN1iSAgS0TcKWe8GURwxKVdjmslcfkpF8rEL3G4=";
+    buildMypyBoto3Package "servicecatalog" "1.40.63"
+      "sha256-fKcu/kTLFF/SCXN37pnaKidNi+KxUCnF7FsKTYRucrA=";
 
   mypy-boto3-servicecatalog-appregistry =
     buildMypyBoto3Package "servicecatalog-appregistry" "1.40.61"

From 647c719059e96c6b09a6513b63287d2d463e8a4b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:07:08 +0100
Subject: [PATCH 4577/6226] python312Packages.mypy-boto3-snowball: 1.40.17 ->
 1.40.64

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 9e89171b3a8a..d6164223f1dd 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1281,8 +1281,8 @@ in
       "sha256-n9fTVYvwyPnGIkLjHpALZ1nqZC6XrClJltHicNbgd1k=";
 
   mypy-boto3-snowball =
-    buildMypyBoto3Package "snowball" "1.40.17"
-      "sha256-MVXzb+7NvziTkEQuuo3GQdoHrrnL9859f0i07qQGnYc=";
+    buildMypyBoto3Package "snowball" "1.40.64"
+      "sha256-G4DP0bpdEItLqe8nNyQIrH9YjaLsQulihQh85yT4nt0=";
 
   mypy-boto3-sns =
     buildMypyBoto3Package "sns" "1.40.57"

From 043fc5a3e09da91fbcc5e6442c7aa1f0a5594b85 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:07:12 +0100
Subject: [PATCH 4578/6226] python312Packages.mypy-boto3-sso: 1.40.20 ->
 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index d6164223f1dd..6ac66ea07d47 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1309,8 +1309,8 @@ in
       "sha256-KPj/5+bRGnfGct08/e50UhrR14xm+HDYVxoM+U6ugec=";
 
   mypy-boto3-sso =
-    buildMypyBoto3Package "sso" "1.40.20"
-      "sha256-XlnYeHhZ5IttMBKIa2rsk22QDRp2M72x1nAeJ3CiKa0=";
+    buildMypyBoto3Package "sso" "1.40.63"
+      "sha256-sNbfCSaPWCpF67SQcKcy290OSiMPdHpJsYTUq7uaeyU=";
 
   mypy-boto3-sso-admin =
     buildMypyBoto3Package "sso-admin" "1.40.60"

From 4e979184b5f028f6c369f11ee709aae13b66eae0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:07:17 +0100
Subject: [PATCH 4579/6226] python312Packages.mypy-boto3-sts: 1.40.0 -> 1.40.63

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 6ac66ea07d47..e129279b6cf3 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1329,8 +1329,8 @@ in
       "sha256-aRgrg0Mpzc+gk2GIPjofavpf6IkMNW3kB+vU6aNelhk=";
 
   mypy-boto3-sts =
-    buildMypyBoto3Package "sts" "1.40.0"
-      "sha256-61XlCWCuYZTQlIhGTDAhljkt9xKmpfQwi2oOJCRM/Vw=";
+    buildMypyBoto3Package "sts" "1.40.63"
+      "sha256-O3TsxQZwDrBQKZP2JMqqKGVZ417H4FrTjuPxdR4KCiQ=";
 
   mypy-boto3-support =
     buildMypyBoto3Package "support" "1.40.17"

From 55e6b44fc7c976b843393638649934b854e81358 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:07:21 +0100
Subject: [PATCH 4580/6226] python312Packages.mypy-boto3-textract: 1.40.0 ->
 1.40.64

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index e129279b6cf3..6100e142e9dc 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1349,8 +1349,8 @@ in
       "sha256-naC16by9nRoZvRfSIIYJdk4jT/lxqUDeogtGb+q+avk=";
 
   mypy-boto3-textract =
-    buildMypyBoto3Package "textract" "1.40.0"
-      "sha256-hMLxKQ6aMwdquw2oOgeB33OigX25MOQFJhGEBfEyf7U=";
+    buildMypyBoto3Package "textract" "1.40.64"
+      "sha256-KPHmg5J3t6O7SsukkdqnLiNxHpnbS81kPjCD5gxlrzs=";
 
   mypy-boto3-timestream-query =
     buildMypyBoto3Package "timestream-query" "1.40.54"

From bacbd7d17ed4259174afed564e337ecc316afebd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:07:29 +0100
Subject: [PATCH 4581/6226] python312Packages.mypy-boto3-waf: 1.40.20 ->
 1.40.64

---
 pkgs/development/python-modules/mypy-boto3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mypy-boto3/default.nix b/pkgs/development/python-modules/mypy-boto3/default.nix
index 6100e142e9dc..16cddd338585 100644
--- a/pkgs/development/python-modules/mypy-boto3/default.nix
+++ b/pkgs/development/python-modules/mypy-boto3/default.nix
@@ -1389,8 +1389,8 @@ in
       "sha256-39fPl4F2Xiz6+AN8HeGi33Yjj9mfxvU3ZmklLY0STMk=";
 
   mypy-boto3-waf =
-    buildMypyBoto3Package "waf" "1.40.20"
-      "sha256-ypvb9EgrioTSxnTcoiEO7XV5xACxGhY9HUPbOeWVFBI=";
+    buildMypyBoto3Package "waf" "1.40.64"
+      "sha256-6hFX0XgzB+dMqyaEUJQADjivNJH71oD4KG4KulkqRjE=";
 
   mypy-boto3-waf-regional =
     buildMypyBoto3Package "waf-regional" "1.40.60"

From c6972e04f603cbb0dfeb9d91ee2686e8fa030972 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:07:43 +0100
Subject: [PATCH 4582/6226] python313Packages.botocore-stubs: 1.40.62 ->
 1.40.64

---
 pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index 7f5b46e65d1d..b219273da754 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.40.62";
+  version = "1.40.64";
   pyproject = true;
 
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-fZXH1kEflCQ/I3cp4NJ8W645GDoHcYPgW2PlKREJF6I=";
+    hash = "sha256-m6tH000Oxxg+BKM1bj+i3/wRru+oRFs3qzV8cJg4/xQ=";
   };
 
   nativeBuildInputs = [ setuptools ];

From af2e18da0e5a5c26856205ce8177bfd0d11b3d71 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 00:07:48 +0100
Subject: [PATCH 4583/6226] python313Packages.boto3-stubs: 1.40.62 -> 1.40.64

---
 pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix
index a23b6a8bedb1..f9f690d775ab 100644
--- a/pkgs/development/python-modules/boto3-stubs/default.nix
+++ b/pkgs/development/python-modules/boto3-stubs/default.nix
@@ -358,13 +358,13 @@
 
 buildPythonPackage rec {
   pname = "boto3-stubs";
-  version = "1.40.62";
+  version = "1.40.64";
   pyproject = true;
 
   src = fetchPypi {
     pname = "boto3_stubs";
     inherit version;
-    hash = "sha256-73hYe2ywyLnoKoq52RDa8pagC8p2Wt6eNMxuj50bDvo=";
+    hash = "sha256-r0p/tnvaDBJ3r81FolBlYFVn0mCor9NLvfF5nSSSM08=";
   };
 
   build-system = [ setuptools ];

From 7ac221f97f4b3e3ac5af8e05826a5604c5509596 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 08:58:21 +0100
Subject: [PATCH 4584/6226] python313Packages.cyclonedx-python-lib: 11.4.0 ->
 11.5.0

Diff: https://github.com/CycloneDX/cyclonedx-python-lib/compare/v11.4.0...v11.5.0

Changelog: https://github.com/CycloneDX/cyclonedx-python-lib/releases/tag/v11.5.0
---
 .../python-modules/cyclonedx-python-lib/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
index e885e4da84ad..277f0afd13cb 100644
--- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
+++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "cyclonedx-python-lib";
-  version = "11.4.0";
+  version = "11.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cyclonedx-python-lib";
     tag = "v${version}";
-    hash = "sha256-fCumFp9ubzCtTrO0r/R/OF83cc0v4XX5K/2vfxQrT84=";
+    hash = "sha256-AN3PjJ1HAERDXlmE9K8k2OGLAh5vs1286EhJShH0xE4=";
   };
 
   pythonRelaxDeps = [ "py-serializable" ];

From 1e1711e13b352f389fc1c7baa234fd0b435806c1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 08:58:57 +0100
Subject: [PATCH 4585/6226] python313Packages.cyclopts: 4.1.0 -> 4.2.1

Diff: https://github.com/BrianPugh/cyclopts/compare/v4.1.0...v4.2.1

Changelog: https://github.com/BrianPugh/cyclopts/releases/tag/v4.2.1
---
 pkgs/development/python-modules/cyclopts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cyclopts/default.nix b/pkgs/development/python-modules/cyclopts/default.nix
index e8b8121bafa2..62a88b1521eb 100644
--- a/pkgs/development/python-modules/cyclopts/default.nix
+++ b/pkgs/development/python-modules/cyclopts/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "cyclopts";
-  version = "4.1.0";
+  version = "4.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "BrianPugh";
     repo = "cyclopts";
     tag = "v${version}";
-    hash = "sha256-829a2THiOszIiwJDh6WiAU8jZG84so0Jy1xD42ZSZgc=";
+    hash = "sha256-dBI7ax7ljmCrE7ymcMa/B9uMtLyRTC42unrKBJ9QYQg=";
   };
 
   build-system = [

From 066a02d6f59724840b497bdb211e0c1652d124c7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 08:59:38 +0100
Subject: [PATCH 4586/6226] python313Packages.dvclive: 3.48.5 -> 3.49.0

Diff: https://github.com/iterative/dvclive/compare/3.48.5...3.49.0

Changelog: https://github.com/iterative/dvclive/releases/tag/3.49.0
---
 pkgs/development/python-modules/dvclive/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix
index e681d16fa3b2..900434d31081 100644
--- a/pkgs/development/python-modules/dvclive/default.nix
+++ b/pkgs/development/python-modules/dvclive/default.nix
@@ -41,14 +41,14 @@
 
 buildPythonPackage rec {
   pname = "dvclive";
-  version = "3.48.5";
+  version = "3.49.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "iterative";
     repo = "dvclive";
     tag = version;
-    hash = "sha256-ucMtYHDwdpyYnnC7QCn5T6gCS8SarohKh6lxFXtPXgc=";
+    hash = "sha256-jjYglvXPtwPJEp2Qo309QeRLYooUmsDhO1Dc1S3OjQg=";
   };
 
   build-system = [ setuptools-scm ];

From 413debbc1474fecd210229d1814be1f8795ca2eb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 08:00:52 +0000
Subject: [PATCH 4587/6226] python3Packages.arxiv: 2.2.0 -> 2.3.0

---
 pkgs/development/python-modules/arxiv/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/arxiv/default.nix b/pkgs/development/python-modules/arxiv/default.nix
index ad01b4b3a17e..710e393c071e 100644
--- a/pkgs/development/python-modules/arxiv/default.nix
+++ b/pkgs/development/python-modules/arxiv/default.nix
@@ -16,14 +16,14 @@
 }:
 buildPythonPackage rec {
   pname = "arxiv";
-  version = "2.2.0";
+  version = "2.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lukasschwab";
     repo = "arxiv.py";
     tag = version;
-    hash = "sha256-/lXUWRJ1lbRPWUC/gMRA0NIcuV0HNzFlUVLyhcPAsCQ=";
+    hash = "sha256-E1Slg7EWSULY68BrevmJO82L47UVFZBreKLVIDko1x0=";
   };
 
   build-system = [ setuptools ];

From 85c989a41cefa90b08f189e103c915795c76a101 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 09:01:19 +0100
Subject: [PATCH 4588/6226] python313Packages.elkm1-lib: 2.2.11 -> 2.2.12

Diff: https://github.com/gwww/elkm1/compare/2.2.11...2.2.12

Changelog: https://github.com/gwww/elkm1/blob/2.2.12/CHANGELOG.md
---
 pkgs/development/python-modules/elkm1-lib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/elkm1-lib/default.nix b/pkgs/development/python-modules/elkm1-lib/default.nix
index f723438867ad..ee20c43cdff3 100644
--- a/pkgs/development/python-modules/elkm1-lib/default.nix
+++ b/pkgs/development/python-modules/elkm1-lib/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "elkm1-lib";
-  version = "2.2.11";
+  version = "2.2.12";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "gwww";
     repo = "elkm1";
     tag = version;
-    hash = "sha256-wi115LppK628EBw3AFeQHNnLv51dcfaZZi5R6S9+WJE=";
+    hash = "sha256-66Yen8QZAIKzMePFzxOgeprTIMKj3fanicMCBeqhyO4=";
   };
 
   build-system = [ hatchling ];

From 060a9934933f662c298aed85d05a08bbca6527b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 08:08:07 +0000
Subject: [PATCH 4589/6226] python3Packages.llm-fragments-pypi: 0.1.1 -> 0.1.2

---
 .../development/python-modules/llm-fragments-pypi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llm-fragments-pypi/default.nix b/pkgs/development/python-modules/llm-fragments-pypi/default.nix
index c07f2cbc4f01..33f78d7a1f93 100644
--- a/pkgs/development/python-modules/llm-fragments-pypi/default.nix
+++ b/pkgs/development/python-modules/llm-fragments-pypi/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "llm-fragments-pypi";
-  version = "0.1.1";
+  version = "0.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "samueldg";
     repo = "llm-fragments-pypi";
     tag = version;
-    hash = "sha256-1XqAmuZ1WMHD6JbLbLsK9K4Uf3FvvKJD4mn1G2J/3C8=";
+    hash = "sha256-6gG7oPughxbpG0ZgKGniTfS9pJAcmXL7unru5kE2bEY=";
   };
 
   build-system = [ hatchling ];

From f0a070e4c40466b9d9a76e26048d2ebe44649cbf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 08:08:12 +0000
Subject: [PATCH 4590/6226] python3Packages.stdlib-list: 0.11.1 -> 0.12.0

---
 pkgs/development/python-modules/stdlib-list/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/stdlib-list/default.nix b/pkgs/development/python-modules/stdlib-list/default.nix
index ea81c10bf39d..be1b25fb2c1e 100644
--- a/pkgs/development/python-modules/stdlib-list/default.nix
+++ b/pkgs/development/python-modules/stdlib-list/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "stdlib-list";
-  version = "0.11.1";
+  version = "0.12.0";
   format = "pyproject";
 
   src = fetchPypi {
     pname = "stdlib_list";
     inherit version;
-    hash = "sha256-levR1z2pMzu6A8zAl/W6wF46oD5oIqDAKQ+H4QR/GFc=";
+    hash = "sha256-UXgk8n7onlkdiufB3Z/zT2curlDuiG6jG7iBbXdTVnU=";
   };
 
   nativeBuildInputs = [ flit-core ];

From dc6af80bc1ab513dd45d4d60acb67f6f06f6a347 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 1 Nov 2025 07:17:20 +0000
Subject: [PATCH 4591/6226] =?UTF-8?q?gthumb:=203.12.7=20=E2=86=92=203.12.8?=
 =?UTF-8?q?.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://gitlab.gnome.org/GNOME/gthumb/-/compare/3.12.7...3.12.8.1

Also clean up mesonFlags since they are identical to upstream's default.
---
 pkgs/by-name/gt/gthumb/package.nix | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/gt/gthumb/package.nix b/pkgs/by-name/gt/gthumb/package.nix
index 946782f8e0ff..9e2069a3a996 100644
--- a/pkgs/by-name/gt/gthumb/package.nix
+++ b/pkgs/by-name/gt/gthumb/package.nix
@@ -6,7 +6,6 @@
   pkg-config,
   meson,
   ninja,
-  adwaita-icon-theme,
   exiv2,
   libheif,
   libjpeg,
@@ -22,8 +21,10 @@
   libX11,
   lcms2,
   bison,
+  brasero,
   flex,
   clutter-gtk,
+  colord,
   wrapGAppsHook3,
   shared-mime-info,
   python3,
@@ -33,13 +34,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gthumb";
-  version = "3.12.7";
+  version = "3.12.8.1";
 
   src = fetchurl {
     url = "mirror://gnome/sources/gthumb/${lib.versions.majorMinor finalAttrs.version}/gthumb-${finalAttrs.version}.tar.xz";
-    sha256 = "sha256-7hLSTPIxAQJB91jWyVudU6c4Enj6dralGLPQmzce+uw=";
+    sha256 = "sha256-JzYvwRylxYHzFoIjDJUCDlofzd9M/+vnVVeCjGF021s=";
   };
 
+  strictDeps = true;
+
   nativeBuildInputs = [
     bison
     desktop-file-utils
@@ -53,10 +56,11 @@ stdenv.mkDerivation (finalAttrs: {
   ];
 
   buildInputs = [
+    brasero
     clutter-gtk
+    colord
     exiv2
     glib
-    adwaita-icon-theme
     gsettings-desktop-schemas
     gst_all_1.gst-plugins-base
     (gst_all_1.gst-plugins-good.override { gtkSupport = true; })
@@ -75,14 +79,6 @@ stdenv.mkDerivation (finalAttrs: {
     libX11
   ];
 
-  mesonFlags = [
-    "-Dlibjxl=true"
-    # Depends on libsoup2.
-    # https://gitlab.gnome.org/GNOME/gthumb/-/issues/244
-    "-Dlibchamplain=false"
-    "-Dwebservices=false"
-  ];
-
   postPatch = ''
     chmod +x gthumb/make-gthumb-h.py
 

From 4f59e2fa23e1a8be23f95e12c9ee14b1124da002 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 31 Oct 2025 21:35:45 +0000
Subject: [PATCH 4592/6226] whisper: built with `-no-pie` (prebuilt libraries)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without the change the build fails as https://hydra.nixos.org/build/310775846:

    ld: libs/libz.a(deflate.o): relocation R_X86_64_32S against `.rodata' can not be used when making a PIE object; recompile with -fPIE
    ld: failed to set dynamic section sizes: bad value

It happens because `libs/libz.a` comes from a
"source" tarball. As some libraries are not packaged
in `nixpkgs` let's fall back to `-no-pie`.

Co-authored-by: Justin Bedő <cu@cua0.org>
---
 pkgs/by-name/wh/whisper/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/wh/whisper/package.nix b/pkgs/by-name/wh/whisper/package.nix
index 08aa9ffc4c0b..9ce1836b25d3 100644
--- a/pkgs/by-name/wh/whisper/package.nix
+++ b/pkgs/by-name/wh/whisper/package.nix
@@ -35,6 +35,12 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  # The package comes with prebuilt static
+  # libraries of bzip2, zlib, libdeflate and asmlib.
+  # They are not built with -fPIE and thus linking fails.
+  # As asmlib is not packages in nixpkgs let's disable PIE.
+  env.NIX_LDFLAGS = "-no-pie";
+
   installPhase = ''
     runHook preInstall
     install -Dt $out/bin whisper whisper-index
@@ -48,5 +54,6 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/refresh-bio/whisper";
     maintainers = with maintainers; [ jbedo ];
     platforms = platforms.x86_64;
+    sourceProvenance = [ sourceTypes.binaryNativeCode ];
   };
 }

From 399375b1758dc0469e58e4968ca6ad74133eb729 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 08:14:36 +0000
Subject: [PATCH 4593/6226] gtree: 1.11.9 -> 1.12.0

---
 pkgs/by-name/gt/gtree/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gt/gtree/package.nix b/pkgs/by-name/gt/gtree/package.nix
index 68adfa1cfd64..f5773b4b908a 100644
--- a/pkgs/by-name/gt/gtree/package.nix
+++ b/pkgs/by-name/gt/gtree/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "gtree";
-  version = "1.11.9";
+  version = "1.12.0";
 
   src = fetchFromGitHub {
     owner = "ddddddO";
     repo = "gtree";
     rev = "v${version}";
-    hash = "sha256-JLYHFSlT6mSkBmpOD9ls80uC0lGaCYmcLeRaUc+NqjE=";
+    hash = "sha256-wb7VzjAxcxFDOquYd1P9jcqR0ivBIuEUZ1R/812w7Ew=";
   };
 
-  vendorHash = "sha256-vgwop6QaYsUp65WHxQeZd141Hz4z/pgIvZAJFx3Zztg=";
+  vendorHash = "sha256-3r3nriiOtKX6pzSpAI4ro1VqcQRTArocEuleqhYKOj0=";
 
   subPackages = [
     "cmd/gtree"

From 6fa61c1aa0997062a6c5f0318471a0abb63a1286 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 08:27:37 +0000
Subject: [PATCH 4594/6226] searxng: 0-unstable-2025-10-23 ->
 0-unstable-2025-10-31

---
 pkgs/by-name/se/searxng/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/searxng/package.nix b/pkgs/by-name/se/searxng/package.nix
index 745c3b3b087e..0dcd47dcb9e5 100644
--- a/pkgs/by-name/se/searxng/package.nix
+++ b/pkgs/by-name/se/searxng/package.nix
@@ -13,14 +13,14 @@ in
 python.pkgs.toPythonModule (
   python.pkgs.buildPythonApplication rec {
     pname = "searxng";
-    version = "0-unstable-2025-10-23";
+    version = "0-unstable-2025-10-31";
     pyproject = true;
 
     src = fetchFromGitHub {
       owner = "searxng";
       repo = "searxng";
-      rev = "e363db970c77e9cab8f3611bb6b6f8a59646a035";
-      hash = "sha256-phJRQ+euSTEmsn1wS5dgO8UPwAJ8cr8ov3K3fSzWQVA=";
+      rev = "b8e4ebdc0cd3b6dc5f58d8ff54deced2b14b13b1";
+      hash = "sha256-qx4y79utIVyLWQlF/RN1TzHKCM/EMDv7tR9WGEbaYoQ=";
     };
 
     nativeBuildInputs = with python.pkgs; [ pythonRelaxDepsHook ];

From a0f652db496fbba51ab114c9937dfc68f78ddfa2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 08:40:50 +0000
Subject: [PATCH 4595/6226] papermc: 1.21.9-41 -> 1.21.10-91

---
 pkgs/games/papermc/versions.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/papermc/versions.json b/pkgs/games/papermc/versions.json
index 1a6a735d7de1..81377f8dccd0 100644
--- a/pkgs/games/papermc/versions.json
+++ b/pkgs/games/papermc/versions.json
@@ -88,7 +88,11 @@
         "version": "1.21.8-60"
     },
     "1.21.9": {
-        "hash": "sha256-YXZVx7iTC3EViKM8r4SKBLgArd0JcZ9jziZuBtWBYOc=",
-        "version": "1.21.9-41"
+        "hash": "sha256-rsAC53x1ZuSUlP3wVDC5YHj/0ddDDmUtTzOP75UeehA=",
+        "version": "1.21.9-59"
+    },
+    "1.21.10": {
+        "hash": "sha256-9tjYDSWmh8xSoCodBMsl8We7OoqCgnGiY74vRK2pEsw=",
+        "version": "1.21.10-91"
     }
 }

From deb1c8ffa89eb7f48e90318db273f42e36d8b7f4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 1 Nov 2025 09:50:33 +0100
Subject: [PATCH 4596/6226] python313Packages.stdlib-list: modernize

---
 pkgs/development/python-modules/stdlib-list/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/stdlib-list/default.nix b/pkgs/development/python-modules/stdlib-list/default.nix
index be1b25fb2c1e..a5eaf80e0220 100644
--- a/pkgs/development/python-modules/stdlib-list/default.nix
+++ b/pkgs/development/python-modules/stdlib-list/default.nix
@@ -2,15 +2,13 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-
-  # build-system
   flit-core,
 }:
 
 buildPythonPackage rec {
   pname = "stdlib-list";
   version = "0.12.0";
-  format = "pyproject";
+  pyproject = true;
 
   src = fetchPypi {
     pname = "stdlib_list";
@@ -18,7 +16,7 @@ buildPythonPackage rec {
     hash = "sha256-UXgk8n7onlkdiufB3Z/zT2curlDuiG6jG7iBbXdTVnU=";
   };
 
-  nativeBuildInputs = [ flit-core ];
+  build-system = [ flit-core ];
 
   pythonImportsCheck = [ "stdlib_list" ];
 
@@ -26,9 +24,9 @@ buildPythonPackage rec {
   doCheck = false;
 
   meta = with lib; {
-    changelog = "https://github.com/pypi/stdlib-list/releases/tag/v${version}";
     description = "List of Python Standard Libraries";
     homepage = "https://github.com/jackmaney/python-stdlib-list";
+    changelog = "https://github.com/pypi/stdlib-list/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = [ ];
   };

From a954e34429ee802ba78d246b766fc043c2478ede Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 1 Nov 2025 09:51:42 +0100
Subject: [PATCH 4597/6226] python313Packages.pynordpool: remove disabled

Removed the restriction for Python version older than 3.11.
---
 pkgs/development/python-modules/pynordpool/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/pynordpool/default.nix b/pkgs/development/python-modules/pynordpool/default.nix
index 1210ae02d0c8..e1899f3cb4dd 100644
--- a/pkgs/development/python-modules/pynordpool/default.nix
+++ b/pkgs/development/python-modules/pynordpool/default.nix
@@ -4,7 +4,6 @@
   buildPythonPackage,
   fetchFromGitHub,
   poetry-core,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -12,8 +11,6 @@ buildPythonPackage rec {
   version = "0.3.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "gjohansson-ST";
     repo = "pynordpool";

From 309d5c625ddd115ec2aa6623cc4ecb7dd6f21ca6 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Sat, 1 Nov 2025 09:55:53 +0100
Subject: [PATCH 4598/6226] shader-slang: 2025.20 -> 2025.21

https://github.com/shader-slang/slang/releases/tag/v2025.21
---
 pkgs/by-name/sh/shader-slang/package.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix
index 1e09232e8475..4f509f8a22e8 100644
--- a/pkgs/by-name/sh/shader-slang/package.nix
+++ b/pkgs/by-name/sh/shader-slang/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shader-slang";
-  version = "2025.20";
+  version = "2025.21";
 
   src = fetchFromGitHub {
     owner = "shader-slang";
     repo = "slang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-p2Wk1JgXoQPq8TrOaLv6igWPZtkXgKXEdKTiiQUklLU=";
+    hash = "sha256-BObV2Yj84i2AE9L929yRjz68nxzGKDNUcFLySjVpc1U=";
     fetchSubmodules = true;
   };
 
@@ -89,6 +89,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeFeature "CMAKE_CONFIGURATION_TYPES" "RelWithDebInfo")
     # Handled by separateDebugInfo so we don't need special installation handling
     (lib.cmakeBool "SLANG_ENABLE_SPLIT_DEBUG_INFO" false)
+    (lib.cmakeFeature "SLANG_VERSION_NUMERIC" finalAttrs.version)
     (lib.cmakeFeature "SLANG_VERSION_FULL" "v${finalAttrs.version}-nixpkgs")
     (lib.cmakeBool "SLANG_USE_SYSTEM_MINIZ" true)
     (lib.cmakeBool "SLANG_USE_SYSTEM_LZ4" true)

From 68c86c1d3b8eaabb8466e9e3ccb7ac8f495c4b64 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 09:09:41 +0000
Subject: [PATCH 4599/6226] parallel: 20250822 -> 20251022

---
 pkgs/by-name/pa/parallel/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pa/parallel/package.nix b/pkgs/by-name/pa/parallel/package.nix
index b9ff9d0d9e85..028c0524267c 100644
--- a/pkgs/by-name/pa/parallel/package.nix
+++ b/pkgs/by-name/pa/parallel/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "parallel";
-  version = "20250822";
+  version = "20251022";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/parallel-${finalAttrs.version}.tar.bz2";
-    hash = "sha256-AZ0yhyKGfP/pGMRJNkMIwN8EhFbGkpm5FFGj5vrJFno=";
+    hash = "sha256-R0Mm1ZaI0vwHjPiaewtKEcyWhCKbP6AVj+i8A/G2nuE=";
   };
 
   outputs = [

From ff206f282c10361b6f14290aeac2fd652fcf9a0d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 09:11:05 +0000
Subject: [PATCH 4600/6226] python3Packages.cysignals: 1.12.5 -> 1.12.6

---
 pkgs/development/python-modules/cysignals/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cysignals/default.nix b/pkgs/development/python-modules/cysignals/default.nix
index 090a8fccd1da..839e3cfd2385 100644
--- a/pkgs/development/python-modules/cysignals/default.nix
+++ b/pkgs/development/python-modules/cysignals/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "cysignals";
-  version = "1.12.5";
+  version = "1.12.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sagemath";
     repo = "cysignals";
     tag = version;
-    hash = "sha256-y7CA0aih2vATLz0Fhwf19/wRw6GnQvNhGo9lS4+VrgI=";
+    hash = "sha256-uZNKmnn1Jf1pERdG4bywpAUClKMw3og+7Q5B0yPlqEY=";
   };
 
   build-system = [

From 38275454cd763d9984d77078e5378d6dc594ae75 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 1 Nov 2025 10:24:40 +0100
Subject: [PATCH 4601/6226] python313Packages.btrees: modernize

---
 pkgs/development/python-modules/btrees/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/btrees/default.nix b/pkgs/development/python-modules/btrees/default.nix
index 0ec699163c41..8e25d0bd94d2 100644
--- a/pkgs/development/python-modules/btrees/default.nix
+++ b/pkgs/development/python-modules/btrees/default.nix
@@ -7,22 +7,22 @@
   transaction,
   zope-testrunner,
   python,
-  pythonOlder,
+  setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "btrees";
   version = "6.2";
-  format = "setuptools";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-SnxwN2aEfrD6tYrpudacyAWIy/1uNFcrur1FU+B5/is=";
   };
 
-  propagatedBuildInputs = [
+  build-system = [ setuptools ];
+
+  dependencies = [
     persistent
     zope-interface
   ];
@@ -34,7 +34,9 @@ buildPythonPackage rec {
 
   checkPhase = ''
     runHook preCheck
+
     ${python.interpreter} -m zope.testrunner --test-path=src --auto-color --auto-progress
+
     runHook postCheck
   '';
 
@@ -48,6 +50,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Scalable persistent components";
     homepage = "http://packages.python.org/BTrees";
+    changelog = "https://github.com/zopefoundation/BTrees/blob/${version}/CHANGES.rst";
     license = licenses.zpl21;
     maintainers = [ ];
   };

From 9165040c91278e4b66e270f71ef8bb121e0a3e10 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 10:35:37 +0100
Subject: [PATCH 4602/6226] python313Packages.llama-cloud-services: 0.6.69 ->
 0.6.77

Changelog: https://github.com/run-llama/llama_cloud_services/releases/tag/llama-cloud-services-py%400.6.77
---
 .../python-modules/llama-cloud-services/default.nix         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/llama-cloud-services/default.nix b/pkgs/development/python-modules/llama-cloud-services/default.nix
index 8e89b1f83bb6..bc0c6206b330 100644
--- a/pkgs/development/python-modules/llama-cloud-services/default.nix
+++ b/pkgs/development/python-modules/llama-cloud-services/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "llama-cloud-services";
-  version = "0.6.69";
+  version = "0.6.77";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "run-llama";
     repo = "llama_cloud_services";
-    tag = "v${version}";
-    hash = "sha256-+90b/EwG8OfpjG/MJM5shvQHLsLpLe+TviufwoWI7mg=";
+    tag = "llama-cloud-services-py%40${version}";
+    hash = "sha256-Fl4rmKJ26yeXYjR2qhpusQrRa0sCe6TigWqEyfjA8lQ=";
   };
 
   sourceRoot = "${src.name}/py";

From 6b5e6cbbee63d64e74ff205dba9ac2759fec6538 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 31 Oct 2025 10:25:16 +0100
Subject: [PATCH 4603/6226] ci/github-script/labels: set maintainer labels from
 latest maintainer map

Instead of setting the maintainer-related labels based entirely on Eval
results, this uses the new maintainer map from the target branch. This
allows labeling PRs correctly, that had been created *before* a
contributor became a maintainer of the respective package.
---
 .github/workflows/eval.yml      |   2 -
 .github/workflows/labels.yml    |   4 -
 ci/eval/compare/default.nix     |  29 +++----
 ci/eval/compare/maintainers.nix |  10 +--
 ci/eval/default.nix             |   5 +-
 ci/github-script/labels.js      | 132 +++++++++++++++++++++++++++++---
 6 files changed, 143 insertions(+), 39 deletions(-)

diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index b037b29c9558..7c218d60a0bc 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -202,7 +202,6 @@ jobs:
 
       - name: Compare against the target branch
         env:
-          AUTHOR_ID: ${{ github.event.pull_request.user.id }}
           TARGET_SHA: ${{ inputs.mergedSha }}
         run: |
           git -C nixpkgs/trusted diff --name-only "$TARGET_SHA" \
@@ -212,7 +211,6 @@ jobs:
           nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.compare \
             --arg combinedDir ./combined \
             --arg touchedFilesJson ./touched-files.json \
-            --argstr githubAuthorId "$AUTHOR_ID" \
             --out-link comparison
 
           cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY"
diff --git a/.github/workflows/labels.yml b/.github/workflows/labels.yml
index 74838ebb52ae..e3dfe2642e50 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/labels.yml
@@ -39,10 +39,6 @@ jobs:
   update:
     runs-on: ubuntu-24.04-arm
     if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'
-    env:
-      # TODO: Remove after 2026-03-04, when Node 24 becomes the default.
-      # https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/
-      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index d0820618a0a0..eabc28af4d36 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -48,7 +48,6 @@ in
 {
   combinedDir,
   touchedFilesJson,
-  githubAuthorId,
 }:
 let
   # Usually we expect a derivation, but when evaluating in multiple separate steps, we pass
@@ -155,22 +154,19 @@ let
                 # Only set this label when no other label with indication for staging has been set.
                 # This avoids confusion whether to target staging or batch this with kernel updates.
                 lib.last (lib.sort lib.lessThan (lib.attrValues rebuildCountByKernel)) <= 500;
-            # Set the "11.by: package-maintainer" label to whether all packages directly
-            # changed are maintained by the PR's author.
-            "11.by: package-maintainer" =
-              maintainers ? ${githubAuthorId}
-              && lib.all (lib.flip lib.elem maintainers.${githubAuthorId}) (
-                lib.flatten (lib.attrValues maintainers)
-              );
           };
       }
     );
 
-  maintainers = callPackage ./maintainers.nix { } {
-    changedattrs = lib.attrNames (lib.groupBy (a: a.name) changedPackagePlatformAttrs);
-    changedpathsjson = touchedFilesJson;
-    removedattrs = lib.attrNames (lib.groupBy (a: a.name) removedPackagePlatformAttrs);
-  };
+  inherit
+    (callPackage ./maintainers.nix { } {
+      changedattrs = lib.attrNames (lib.groupBy (a: a.name) changedPackagePlatformAttrs);
+      changedpathsjson = touchedFilesJson;
+      removedattrs = lib.attrNames (lib.groupBy (a: a.name) removedPackagePlatformAttrs);
+    })
+    maintainers
+    packages
+    ;
 in
 runCommand "compare"
   {
@@ -180,7 +176,11 @@ runCommand "compare"
       cmp-stats
     ];
     maintainers = builtins.toJSON maintainers;
-    passAsFile = [ "maintainers" ];
+    packages = builtins.toJSON packages;
+    passAsFile = [
+      "maintainers"
+      "packages"
+    ];
   }
   ''
     mkdir $out
@@ -223,4 +223,5 @@ runCommand "compare"
     fi
 
     cp "$maintainersPath" "$out/maintainers.json"
+    cp "$packagesPath" "$out/packages.json"
   ''
diff --git a/ci/eval/compare/maintainers.nix b/ci/eval/compare/maintainers.nix
index 9f19a4c382eb..7f945f2c387f 100644
--- a/ci/eval/compare/maintainers.nix
+++ b/ci/eval/compare/maintainers.nix
@@ -105,9 +105,9 @@ let
   ) attrsWithModifiedFiles;
 
   byMaintainer = lib.groupBy (ping: toString ping.id) listToPing;
-
-  packagesPerMaintainer = lib.mapAttrs (
-    maintainer: packages: map (pkg: pkg.packageName) packages
-  ) byMaintainer;
 in
-packagesPerMaintainer
+{
+  maintainers = lib.mapAttrs (_: lib.catAttrs "packageName") byMaintainer;
+
+  packages = lib.catAttrs "packageName" listToPing;
+}
diff --git a/ci/eval/default.nix b/ci/eval/default.nix
index 75b2eb9cba5d..b753c42c2aef 100644
--- a/ci/eval/default.nix
+++ b/ci/eval/default.nix
@@ -281,9 +281,6 @@ let
       chunkSize ? 5000,
       quickTest ? false,
       baseline,
-      # Which maintainer should be considered the author?
-      # Defaults to nixpkgs-ci which is not a maintainer and skips the check.
-      githubAuthorId ? "nixpkgs-ci",
       # What files have been touched? Defaults to none; use the expression below to calculate it.
       # ```
       # git diff --name-only --merge-base master HEAD \
@@ -307,7 +304,7 @@ let
       };
       comparisonReport = compare {
         combinedDir = combine { diffDir = diffs; };
-        inherit touchedFilesJson githubAuthorId;
+        inherit touchedFilesJson;
       };
     in
     comparisonReport;
diff --git a/ci/github-script/labels.js b/ci/github-script/labels.js
index 2d7bafb6c5ae..a435e6e68bf5 100644
--- a/ci/github-script/labels.js
+++ b/ci/github-script/labels.js
@@ -3,9 +3,98 @@ module.exports = async ({ github, context, core, dry }) => {
   const { DefaultArtifactClient } = require('@actions/artifact')
   const { readFile, writeFile } = require('node:fs/promises')
   const withRateLimit = require('./withRateLimit.js')
+  const { classify } = require('../supportedBranches.js')
 
   const artifactClient = new DefaultArtifactClient()
 
+  async function downloadMaintainerMap(branch) {
+    let run
+
+    const commits = (
+      await github.rest.repos.listCommits({
+        ...context.repo,
+        sha: branch,
+        // We look at 10 commits to find a maintainer map, but this is an arbitrary number. The
+        // head commit might not have a map, if the queue was bypassed to merge it. This happens
+        // frequently on staging-esque branches. The branch with the highest chance of getting
+        // 10 consecutive bypassing commits is the stable staging-next branch. Luckily, this
+        // also means that the number of PRs open towards that branch is very low, so falling
+        // back to slightly imprecise maintainer data from master only has a marginal effect.
+        per_page: 10,
+      })
+    ).data
+
+    for (const commit of commits) {
+      const run = (
+        await github.rest.actions.listWorkflowRuns({
+          ...context.repo,
+          workflow_id: 'merge-group.yml',
+          status: 'success',
+          exclude_pull_requests: true,
+          per_page: 1,
+          head_sha: commit.sha,
+        })
+      ).data.workflow_runs[0]
+      if (!run) continue
+
+      const artifact = (
+        await github.rest.actions.listWorkflowRunArtifacts({
+          ...context.repo,
+          run_id: run.id,
+          name: 'maintainers',
+        })
+      ).data.artifacts[0]
+      if (!artifact) continue
+
+      await artifactClient.downloadArtifact(artifact.id, {
+        findBy: {
+          repositoryName: context.repo.repo,
+          repositoryOwner: context.repo.owner,
+          token: core.getInput('github-token'),
+        },
+        path: path.resolve(path.join('branches', branch)),
+        expectedHash: artifact.digest,
+      })
+
+      return JSON.parse(
+        await readFile(
+          path.resolve(path.join('branches', branch, 'maintainers.json')),
+          'utf-8',
+        ),
+      )
+    }
+
+    // We get here when none of the 10 commits we looked at contained a maintainer map.
+    // For the master branch, we don't have any fallback options, so we error out.
+    // For other branches, we select a suitable fallback below.
+    if (branch === 'master') throw new Error('No maintainer map found.')
+
+    const { stable, version } = classify(branch)
+
+    const release = `release-${version}`
+    if (stable && branch !== release) {
+      // Only fallback to the release branch from *other* stable branches.
+      // Explicitly avoids infinite recursion.
+      return await getMaintainerMap(release)
+    } else {
+      // Falling back to master as last resort.
+      // This can either be the case for unstable staging-esque or wip branches,
+      // or for the primary stable branch (release-XX.YY).
+      return await getMaintainerMap('master')
+    }
+  }
+
+  // Simple cache for maintainer maps to avoid downloading the same artifacts
+  // over and over again. Ultimately returns a promise, so the result must be
+  // awaited for.
+  const maintainerMaps = {}
+  function getMaintainerMap(branch) {
+    if (!maintainerMaps[branch]) {
+      maintainerMaps[branch] = downloadMaintainerMap(branch)
+    }
+    return maintainerMaps[branch]
+  }
+
   async function handlePullRequest({ item, stats }) {
     const log = (k, v) => core.info(`PR #${item.number} - ${k}: ${v}`)
 
@@ -177,21 +266,44 @@ module.exports = async ({ github, context, core, dry }) => {
         expectedHash: artifact.digest,
       })
 
-      const maintainers = new Set(
-        Object.keys(
-          JSON.parse(
-            await readFile(`${pull_number}/maintainers.json`, 'utf-8'),
-          ),
-        ).map((m) => Number.parseInt(m, 10)),
-      )
-
       const evalLabels = JSON.parse(
         await readFile(`${pull_number}/changed-paths.json`, 'utf-8'),
       ).labels
 
+      // TODO: Get "changed packages" information from list of changed by-name files
+      // in addition to just the Eval results, to make this work for these packages
+      // when Eval results have expired as well.
+      let packages
+      try {
+        packages = JSON.parse(
+          await readFile(`${pull_number}/packages.json`, 'utf-8'),
+        )
+      } catch (e) {
+        if (e.code !== 'ENOENT') throw e
+        // TODO: Remove this fallback code once all old artifacts without packages.json
+        // have expired. This should be the case in ~ February 2026.
+        packages = Array.from(
+          new Set(
+            Object.values(
+              JSON.parse(
+                await readFile(`${pull_number}/maintainers.json`, 'utf-8'),
+              ),
+            ).flat(1),
+          ),
+        )
+      }
+
+      const maintainers = await getMaintainerMap(pull_request.base.ref)
+
       Object.assign(prLabels, evalLabels, {
-        '12.approved-by: package-maintainer':
-          maintainers.intersection(approvals).size > 0,
+        '11.by: package-maintainer':
+          packages.length &&
+          packages.every((pkg) =>
+            maintainers[pkg].includes(pull_request.user.id),
+          ),
+        '12.approved-by: package-maintainer': packages.some((pkg) =>
+          maintainers[pkg].some((m) => approvals.has(m)),
+        ),
       })
     }
 

From 22f482a5bf5bf958186d6069fe3abd421b71ed4f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 10:38:28 +0100
Subject: [PATCH 4604/6226] python313Packages.llama-parse: 0.6.54 -> 0.6.77

---
 pkgs/development/python-modules/llama-parse/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/llama-parse/default.nix b/pkgs/development/python-modules/llama-parse/default.nix
index 0038081e5f69..883223793a8f 100644
--- a/pkgs/development/python-modules/llama-parse/default.nix
+++ b/pkgs/development/python-modules/llama-parse/default.nix
@@ -8,13 +8,13 @@
 
 buildPythonPackage rec {
   pname = "llama-parse";
-  version = "0.6.54";
+  version = "0.6.77";
   pyproject = true;
 
   src = fetchPypi {
     pname = "llama_parse";
     inherit version;
-    hash = "sha256-xwezEVIVXJuuhOMW+reQu8jIX02IJc5e44br632yWPE=";
+    hash = "sha256-cxjDJT/ADoPwDmN4Cg06AyQvJcasGZwmw6ctuHVNRLc=";
   };
 
   build-system = [ hatchling ];

From 496148e4db746157decd133081963edb5de19c9f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 09:50:11 +0000
Subject: [PATCH 4605/6226] sphinx-lint: 1.0.0 -> 1.0.1

---
 pkgs/by-name/sp/sphinx-lint/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sp/sphinx-lint/package.nix b/pkgs/by-name/sp/sphinx-lint/package.nix
index ed3d8ca6cceb..3b2e3f999bad 100644
--- a/pkgs/by-name/sp/sphinx-lint/package.nix
+++ b/pkgs/by-name/sp/sphinx-lint/package.nix
@@ -6,14 +6,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "sphinx-lint";
-  version = "1.0.0";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sphinx-contrib";
     repo = "sphinx-lint";
     tag = "v${version}";
-    hash = "sha256-VM8PyUZVQQFdXLR14eN7+hPT/iGOVHG6s1bcac4MPo4=";
+    hash = "sha256-9xqGb/RdaySTys3gjIU0GJSqGOWXQQ/NeSRS8dmx5lg=";
   };
 
   build-system = [

From 1a78b4a94ee3dde2284a0a213c18fb5e17f9aa68 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 10:51:24 +0100
Subject: [PATCH 4606/6226] python313Packages.mitogen: 0.3.29 -> 0.3.30

Diff: https://github.com/mitogen-hq/mitogen/compare/v0.3.29...v0.3.30

Changelog: https://github.com/mitogen-hq/mitogen/blob/v0.3.30/docs/changelog.rst
---
 pkgs/development/python-modules/mitogen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mitogen/default.nix b/pkgs/development/python-modules/mitogen/default.nix
index eee637d211fb..b11f0420ecfd 100644
--- a/pkgs/development/python-modules/mitogen/default.nix
+++ b/pkgs/development/python-modules/mitogen/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "mitogen";
-  version = "0.3.29";
+  version = "0.3.30";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "mitogen-hq";
     repo = "mitogen";
     tag = "v${version}";
-    hash = "sha256-j2VT46bYi9lmFKNNCHshs56b2HqqvfpEDBHnaHvfYgY=";
+    hash = "sha256-witxGRPi2TOwLOnsJcxOKLJdZ6ggapANXneFMJdHa98=";
   };
 
   build-system = [ setuptools ];

From 2088538ecc299c7c0eecbf7c9ebedb83515b7313 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 10:52:59 +0100
Subject: [PATCH 4607/6226] python313Packages.publicsuffixlist: 1.0.2.20251030
 -> 1.0.2.20251031

Changelog: https://github.com/ko-zu/psl/blob/v1.0.2.20251031-gha/CHANGES.md
---
 pkgs/development/python-modules/publicsuffixlist/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/publicsuffixlist/default.nix b/pkgs/development/python-modules/publicsuffixlist/default.nix
index f8a4cc2115b0..11a48fa548b6 100644
--- a/pkgs/development/python-modules/publicsuffixlist/default.nix
+++ b/pkgs/development/python-modules/publicsuffixlist/default.nix
@@ -10,12 +10,12 @@
 
 buildPythonPackage rec {
   pname = "publicsuffixlist";
-  version = "1.0.2.20251030";
+  version = "1.0.2.20251031";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-vEQp18br81UIBQtfVW8XAsR3i9iMhTiPtDKQqyJhW9w=";
+    hash = "sha256-pMZj8al1ps6NMzOcBJK5eO3ckNnYX0dFYKQ/3stVmmQ=";
   };
 
   build-system = [ setuptools ];

From bd7df729e4edf926a1c8ee467a29bfe391bf219e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <fabian@affolter-engineering.ch>
Date: Sat, 1 Nov 2025 10:54:28 +0100
Subject: [PATCH 4608/6226] python313Packages.iamdata: 0.1.202510301 ->
 0.1.202511011

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202510301...v0.1.202511011

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202511011
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index d7e62a3d31c3..d61cf2c0c4dc 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202510301";
+  version = "0.1.202511011";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-83vicOeL/CufgkOO+oKLbydv0Hu08kMcPxVjrQGzn3c=";
+    hash = "sha256-uVZdWEFh9yLYl5gywj4Nwopwz9J0f/0nfaseK3mhTyA=";
   };
 
   __darwinAllowLocalNetworking = true;

From c7bcd0b4932230142f6b245c601f1b650be4bff4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 1 Nov 2025 11:21:48 +0100
Subject: [PATCH 4609/6226] python313Packages.iminuit: modernize

---
 pkgs/development/python-modules/iminuit/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix
index 28e9c4cd36d0..6721d627eb18 100644
--- a/pkgs/development/python-modules/iminuit/default.nix
+++ b/pkgs/development/python-modules/iminuit/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  pythonOlder,
 
   # build-system
   cmake,
@@ -22,9 +21,7 @@
 buildPythonPackage rec {
   pname = "iminuit";
   version = "2.31.3";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.6";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
@@ -40,7 +37,7 @@ buildPythonPackage rec {
     pyproject-metadata
   ];
 
-  propagatedBuildInputs = [ numpy ];
+  dependencies = [ numpy ];
 
   dontUseCmakeConfigure = true;
 

From 696822bcdbcfd5f71e9901c72bdda51a42e75e10 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 10:22:06 +0000
Subject: [PATCH 4610/6226] geph: 0.2.83 -> 0.2.85

---
 pkgs/by-name/ge/geph/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ge/geph/package.nix b/pkgs/by-name/ge/geph/package.nix
index 5c5b98411091..97fa7273f163 100644
--- a/pkgs/by-name/ge/geph/package.nix
+++ b/pkgs/by-name/ge/geph/package.nix
@@ -24,16 +24,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "geph5";
-  version = "0.2.83";
+  version = "0.2.85";
 
   src = fetchFromGitHub {
     owner = "geph-official";
     repo = "geph5";
     rev = "geph5-client-v${finalAttrs.version}";
-    hash = "sha256-gEhr+goQYcjhgkoFGG1swbC0LHKwVlGAijFcwzBEF/Q=";
+    hash = "sha256-n9LeGXXL4HK4fy/lvOlyXhhu10JmxGILmhIYxhEJ1B8=";
   };
 
-  cargoHash = "sha256-k0VZFyVqGdfXFsmQ5cscTMZZeEk3PxaEDHzfqLGH3H4=";
+  cargoHash = "sha256-XCaf2sa4898xZFJLcFBRe9HTk2NCGpefQF6bfvrlca4=";
 
   postPatch = ''
     substituteInPlace binaries/geph5-client/src/vpn/*.sh \

From 9799cb99d36b9f8283433e21b5c88b50e4066c83 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 1 Nov 2025 11:23:17 +0100
Subject: [PATCH 4611/6226] python313Packages.iminuit: add changelog to meta

---
 pkgs/development/python-modules/iminuit/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/iminuit/default.nix b/pkgs/development/python-modules/iminuit/default.nix
index 6721d627eb18..88f545992b0a 100644
--- a/pkgs/development/python-modules/iminuit/default.nix
+++ b/pkgs/development/python-modules/iminuit/default.nix
@@ -45,6 +45,7 @@ buildPythonPackage rec {
 
   meta = with lib; {
     homepage = "https://github.com/scikit-hep/iminuit";
+    changelog = "https://github.com/scikit-hep/iminuit/releases/tag/v{version}";
     description = "Python interface for the Minuit2 C++ library";
     license = with licenses; [
       mit

From 8f1238e669e6dfa037b3a5a555e69a2b77ad1423 Mon Sep 17 00:00:00 2001
From: patka <patka@patka.dev>
Date: Sat, 1 Nov 2025 11:26:18 +0100
Subject: [PATCH 4612/6226] phpunit: 12.4.1 -> 12.4.2

---
 pkgs/by-name/ph/phpunit/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ph/phpunit/package.nix b/pkgs/by-name/ph/phpunit/package.nix
index 14597363261f..c4a6e2838a85 100644
--- a/pkgs/by-name/ph/phpunit/package.nix
+++ b/pkgs/by-name/ph/phpunit/package.nix
@@ -10,16 +10,16 @@
 
 php.buildComposerProject2 (finalAttrs: {
   pname = "phpunit";
-  version = "12.4.1";
+  version = "12.4.2";
 
   src = fetchFromGitHub {
     owner = "sebastianbergmann";
     repo = "phpunit";
     tag = finalAttrs.version;
-    hash = "sha256-QDZ5vwmBv+rfXzecg7gvrT7BRnRgIzmKkRpwTwxDQ5w=";
+    hash = "sha256-UXPFCnsUQhq3RS/MD9jfW0YKheHjzwQoV9TqLRi05nQ=";
   };
 
-  vendorHash = "sha256-zG6Q7y7EBTyPYBvCWvehy0KaZ+utUyzveEAaqsedOgE=";
+  vendorHash = "sha256-Fsj+pu1MYuuIpGE0QC6lSPmPwYCpF1ID/HMoYLFxwFE=";
 
   passthru = {
     updateScript = nix-update-script { };

From b5dce996dd91527b4e762b9197073f6c3e3f789b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 10:40:37 +0000
Subject: [PATCH 4613/6226] pluto: 5.22.5 -> 5.22.6

---
 pkgs/by-name/pl/pluto/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pl/pluto/package.nix b/pkgs/by-name/pl/pluto/package.nix
index 828f7724e857..5874718b28b7 100644
--- a/pkgs/by-name/pl/pluto/package.nix
+++ b/pkgs/by-name/pl/pluto/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "pluto";
-  version = "5.22.5";
+  version = "5.22.6";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "pluto";
     rev = "v${version}";
-    hash = "sha256-MserKZcOkif56XeTLRzHDDk6HYeVhgKsnOjsfv0vPeQ=";
+    hash = "sha256-6Xi+EWQvFYtdiVywhSB4Lmzsc6Z1nE8UWO8vBteVOnE=";
   };
 
   vendorHash = "sha256-59mRVfQ2rduTvIJE1l/j3K+PY3OEMfNpjjYg3hqNUhs=";

From 532ba62c26e7f1d85bac9fd507574e438be519e4 Mon Sep 17 00:00:00 2001
From: Benedikt Hiemer <ben.email@posteo.de>
Date: Sat, 1 Nov 2025 11:41:41 +0100
Subject: [PATCH 4614/6226] nixos/journald-gateway: remove assertion making
 system and user args truly optional

---
 .../modules/system/boot/systemd/journald-gateway.nix | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/nixos/modules/system/boot/systemd/journald-gateway.nix b/nixos/modules/system/boot/systemd/journald-gateway.nix
index f0d80077e6d6..952177f85805 100644
--- a/nixos/modules/system/boot/systemd/journald-gateway.nix
+++ b/nixos/modules/system/boot/systemd/journald-gateway.nix
@@ -108,18 +108,6 @@ in
   };
 
   config = lib.mkIf cfg.enable {
-    assertions = [
-      {
-        # This prevents the weird case were disabling "system" and "user"
-        # actually enables both because the cli flags are not present.
-        assertion = cfg.system || cfg.user;
-        message = ''
-          systemd-journal-gatewayd cannot serve neither "system" nor "user"
-          journals.
-        '';
-      }
-    ];
-
     systemd.additionalUpstreamSystemUnits = [
       "systemd-journal-gatewayd.socket"
       "systemd-journal-gatewayd.service"

From 27a9c7d6c4ba41355abbfa3714ae6bdcfb844141 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 10:42:35 +0000
Subject: [PATCH 4615/6226] ast-grep: 0.39.6 -> 0.39.7

---
 pkgs/by-name/as/ast-grep/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix
index 7789f0e5ee9d..94c1cc3909fd 100644
--- a/pkgs/by-name/as/ast-grep/package.nix
+++ b/pkgs/by-name/as/ast-grep/package.nix
@@ -11,13 +11,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ast-grep";
-  version = "0.39.6";
+  version = "0.39.7";
 
   src = fetchFromGitHub {
     owner = "ast-grep";
     repo = "ast-grep";
     tag = finalAttrs.version;
-    hash = "sha256-ZZ9GQcvNj038GUEKCGO9X+t1U5vqcztrm97o7y8RLGM=";
+    hash = "sha256-D/fdy2oMwlXVMzoSCcYSz1fiazVCypvj4X3G6vBWBUw=";
   };
 
   # error: linker `aarch64-linux-gnu-gcc` not found
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm .cargo/config.toml
   '';
 
-  cargoHash = "sha256-BPw/BczPspW3pvkLwR2PBCkEzcVKmHK5r18KBvwAAa8=";
+  cargoHash = "sha256-AuVD3n+T9UNLw6+IuM9l2AoMb7eEFhr+ZlktYZQYI80=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 7b4a437e9920b1ff522f5039281f7cefcd466640 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 1 Nov 2025 11:47:45 +0100
Subject: [PATCH 4616/6226] ci/github-script/labels: fix unmaintained packages

The labeler currently breaks for unmaintained packages after the recent
change to use maintainer maps.
---
 ci/github-script/labels.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ci/github-script/labels.js b/ci/github-script/labels.js
index a435e6e68bf5..adb730aa257d 100644
--- a/ci/github-script/labels.js
+++ b/ci/github-script/labels.js
@@ -299,10 +299,10 @@ module.exports = async ({ github, context, core, dry }) => {
         '11.by: package-maintainer':
           packages.length &&
           packages.every((pkg) =>
-            maintainers[pkg].includes(pull_request.user.id),
+            maintainers[pkg]?.includes(pull_request.user.id),
           ),
         '12.approved-by: package-maintainer': packages.some((pkg) =>
-          maintainers[pkg].some((m) => approvals.has(m)),
+          maintainers[pkg]?.some((m) => approvals.has(m)),
         ),
       })
     }

From 1ba14be674d7340e68fe4508d8086dde424a4178 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 31 Oct 2025 20:25:57 +0000
Subject: [PATCH 4617/6226] tic-80: 1.1-unstable-2025-05-26 -> 1.1-2025-10-21

---
 pkgs/by-name/ti/tic-80/package.nix | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/ti/tic-80/package.nix b/pkgs/by-name/ti/tic-80/package.nix
index 8d90bf1d68c2..82e08012f082 100644
--- a/pkgs/by-name/ti/tic-80/package.nix
+++ b/pkgs/by-name/ti/tic-80/package.nix
@@ -21,7 +21,7 @@
 }:
 let
   # git rev-list HEAD --count
-  revision = "3016";
+  revision = "3042";
   year = "2025";
 in
 
@@ -29,18 +29,18 @@ stdenv.mkDerivation {
   pname = "tic-80";
   # use an untagged version until upstream tags a new version. We want
   # 'PREFER_SYSTEM_LIBRARIES', and without it tic-80 won't build
-  version = "1.1-unstable-2025-05-26";
+  version = "1.1-unstable-2025-10-21";
 
   src = fetchFromGitHub {
     owner = "nesbox";
     repo = "TIC-80";
-    rev = "663d43924abf6fd7620de6bf25c009ce5b30ab83";
-    hash = "sha256-UjBnXxYZ5gfk58sI1qek5fkKpJ7LzOVmrxdjVgONcXc=";
+    rev = "a2c875f7275541e7724199ce8e504fb578b819a6";
     # TIC-80 vendors its dependencies as submodules. For the following dependencies,
     # there are no (or no compatible) packages in nixpkgs yet, so we use the vendored
     # ones as a fill-in: wasm, squirrel, pocketpy, argparse, naett,
     # sdlgpu, mruby.
     fetchSubmodules = true;
+    hash = "sha256-S/v1WHrvVndW4qHFWRJc3dcQkjw5vCU1/mN0PW9Wfkc=";
   };
 
   # TIC-80 tries to determine the revision part of the version using its Git history.
@@ -101,7 +101,7 @@ stdenv.mkDerivation {
     SDL2
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Free and open source fantasy computer for making, playing and sharing tiny games";
     longDescription = ''
       TIC-80 is a free and open source fantasy computer for making, playing and
@@ -119,9 +119,9 @@ stdenv.mkDerivation {
       channel sound and etc.
     '';
     homepage = "https://github.com/nesbox/TIC-80";
-    license = licenses.mit;
-    platforms = with platforms; linux ++ darwin;
+    license = lib.licenses.mit;
+    platforms = with lib.platforms; linux ++ darwin;
     mainProgram = "tic80";
-    maintainers = with maintainers; [ blinry ];
+    maintainers = with lib.maintainers; [ blinry ];
   };
 }

From 5db3262fc43e4fa29b11b5e142f60ca1d00a3e17 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sat, 1 Nov 2025 05:00:04 -0600
Subject: [PATCH 4618/6226] lazygit: 0.55.1 -> 0.56.0

https://github.com/jesseduffield/lazygit/releases/tag/v0.56.0
Diff: https://github.com/jesseduffield/lazygit/compare/v0.55.1...v0.56.0
---
 pkgs/by-name/la/lazygit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix
index 538e8a3ba683..8074bf20281d 100644
--- a/pkgs/by-name/la/lazygit/package.nix
+++ b/pkgs/by-name/la/lazygit/package.nix
@@ -8,13 +8,13 @@
 }:
 buildGoModule rec {
   pname = "lazygit";
-  version = "0.55.1";
+  version = "0.56.0";
 
   src = fetchFromGitHub {
     owner = "jesseduffield";
     repo = "lazygit";
     tag = "v${version}";
-    hash = "sha256-UofhgILZhVXnYiGpb25m4Ct4sbu5pRmjVgj3oEf5Uyk=";
+    hash = "sha256-oTj+9zDmbXD4rlFZ++hcd1WSfskSNI7ojI9gN8UcpT8=";
   };
 
   vendorHash = null;

From db11048f00b48782cebadb9967cd479c614e1429 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 1 Nov 2025 11:05:12 +0000
Subject: [PATCH 4619/6226] python3Packages.textual: 6.4.0 -> 6.5.0

Diff: https://github.com/Textualize/textual/compare/v6.4.0...v6.5.0

Changelog: https://github.com/Textualize/textual/blob/v6.5.0/CHANGELOG.md
---
 pkgs/development/python-modules/textual/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/textual/default.nix b/pkgs/development/python-modules/textual/default.nix
index 68eee933c737..76856cedeb58 100644
--- a/pkgs/development/python-modules/textual/default.nix
+++ b/pkgs/development/python-modules/textual/default.nix
@@ -30,14 +30,14 @@
 
 buildPythonPackage rec {
   pname = "textual";
-  version = "6.4.0";
+  version = "6.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Textualize";
     repo = "textual";
     tag = "v${version}";
-    hash = "sha256-lwtgPJK62SntL0ThoIpmEq0Ngjf8wl73Q8PXjvut3ps=";
+    hash = "sha256-Z9KevcicU+mt1XglYOdGWnMbRa1zpbts+0D2nwtgAac=";
   };
 
   build-system = [ poetry-core ];

From eb2815e2bace871f7b0d1c04a85a9286bcfa0b17 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 11:14:54 +0000
Subject: [PATCH 4620/6226] python3Packages.python-docs-theme: 2025.9.2 ->
 2025.10

---
 pkgs/development/python-modules/python-docs-theme/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-docs-theme/default.nix b/pkgs/development/python-modules/python-docs-theme/default.nix
index 81e9744b25e6..6c8e0daf0b38 100644
--- a/pkgs/development/python-modules/python-docs-theme/default.nix
+++ b/pkgs/development/python-modules/python-docs-theme/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "python-docs-theme";
-  version = "2025.9.2";
+  version = "2025.10";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "python";
     repo = "python-docs-theme";
     tag = version;
-    hash = "sha256-G9QhrNqwSonyCQXxBv1GkUx39GyOQs+0gciJDQwWvVQ=";
+    hash = "sha256-vuQsGHj39znL3RvSvnc9ET1g30/FcSnDnFby2bm84hY=";
   };
 
   build-system = [ flit-core ];

From e6112d24d0fc9764ec1c4ff76246382a64ffe002 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 1 Nov 2025 12:31:56 +0100
Subject: [PATCH 4621/6226] emacsPackages: revert throw

We recently retired a lot of old aliases, but emacsPackages is still
exposed on search.nixos.org, so should not have been removed. I argued
previously, that this should not have been an alias in the first place:
If it's exposed on search.nixos.org, then it is expected to be used,
too.

We will also need that once we teach Eval to evaluate more packages than
hydra builds.
---
 pkgs/top-level/aliases.nix      | 1 -
 pkgs/top-level/all-packages.nix | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b4a6e14d7d4e..34f3fa5abc80 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -520,7 +520,6 @@ mapAliases {
   elm-github-install = throw "'elm-github-install' has been removed as it is abandoned upstream and only supports Elm 0.18.0"; # Added 2025-08-25
   emacsMacport = throw "'emacsMacport' has been renamed to/replaced by 'emacs-macport'"; # Converted to throw 2025-10-27
   emacsNativeComp = throw "'emacsNativeComp' has been renamed to/replaced by 'emacs'"; # Converted to throw 2025-10-27
-  emacsPackages = throw "'emacsPackages' has been renamed to/replaced by 'emacs.pkgs'"; # Converted to throw 2025-10-27
   embree2 = throw "embree2 has been removed, as it is unmaintained upstream and depended on tbb_2020"; # Added 2025-09-14
   EmptyEpsilon = throw "'EmptyEpsilon' has been renamed to/replaced by 'empty-epsilon'"; # Converted to throw 2025-10-27
   emulationstation = throw "emulationstation was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 45ea67a634f3..7e69b55e6fcb 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10937,6 +10937,10 @@ with pkgs;
       pkgs' = pkgs; # default pkgs used for bootstrapping the emacs package set
     };
 
+  # emacsPackages is exposed on search.nixos.org.
+  # Also see pkgs/top-level/packages-config.nix
+  emacsPackages = dontRecurseIntoAttrs emacs.pkgs;
+
   espeak-classic = callPackage ../applications/audio/espeak { };
 
   espeak = espeak-ng;

From 2e0ae49ba1d9e4d11fb5b2cc51e3e4e1a8d76f9e Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sat, 1 Nov 2025 00:30:02 +0000
Subject: [PATCH 4622/6226] gromacsDouble{,Mpi}: explicitly disable CUDA
 support (incompatible with singlePrec)

---
 .../applications/science/molecular-dynamics/gromacs/default.nix | 2 +-
 pkgs/top-level/all-packages.nix                                 | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
index 31d4b31dc56c..031b996a2b87 100644
--- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
+++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix
@@ -20,7 +20,7 @@
   cpuAcceleration ? null,
 }:
 
-# CUDA is only implemented for single precission
+# CUDA is only implemented for single precision
 assert enableCuda -> singlePrec;
 
 let
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2faee7e207fb..b0bb4beb919c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13644,6 +13644,7 @@ with pkgs;
   gromacsDouble = lowPrio (
     gromacs.override {
       singlePrec = false;
+      enableCuda = false; # CUDA is only implemented for single precision
       fftw = fftw;
     }
   );
@@ -13651,6 +13652,7 @@ with pkgs;
   gromacsDoubleMpi = lowPrio (
     gromacs.override {
       singlePrec = false;
+      enableCuda = false; # CUDA is only implemented for single precision
       enableMpi = true;
       fftw = fftw;
     }

From 9718f2952f51307a2800c2869a49162f5c121dce Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 1 Nov 2025 12:51:27 +0100
Subject: [PATCH 4623/6226] workflows/check: run codeowners validator from
 trusted checkout

In f7d6d11e8e8e046faaa6fbc55c2c1312e967cf04 I wrongly assumed that
running from the untrusted checkout should be fine for the codeowners
validator, because we removed all the logic for privileged tokens.
However, this job also contains access to the cachix secret, which could
be used to push malicious code to cachix, which would then be pulled by
a more privileged workflow like reviewers.yml later.
---
 .github/workflows/check.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index f55ff86dfdcf..d6b136204d9b 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -80,6 +80,7 @@ jobs:
         uses: ./.github/actions/checkout
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
+          target-as-trusted-at: ${{ inputs.targetSha }}
 
       - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
 
@@ -92,7 +93,7 @@ jobs:
           pushFilter: -source$
 
       - name: Build codeowners validator
-        run: nix-build nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A codeownersValidator
+        run: nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A codeownersValidator
 
       - name: Validate codeowners
         env:

From 5f26deb6ffbcf1277ab56be7886ded3dbb833df6 Mon Sep 17 00:00:00 2001
From: adisbladis <adisbladis@gmail.com>
Date: Sun, 2 Nov 2025 00:47:43 +1300
Subject: [PATCH 4624/6226] ci/OWNERS: Add adisbladis as owner for
 stdenv/check-meta & stdenv/meta-types

I want to monitor this for performance regressions & things like https://github.com/NixOS/nixpkgs/pull/421125.
---
 ci/OWNERS | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index e03682addd23..cb45babf254b 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -58,7 +58,8 @@
 /pkgs/top-level/by-name-overlay.nix              @infinisil @philiptaron
 /pkgs/stdenv                                     @philiptaron @NixOS/stdenv
 /pkgs/stdenv/generic                             @Ericson2314 @NixOS/stdenv
-/pkgs/stdenv/generic/check-meta.nix              @Ericson2314 @NixOS/stdenv
+/pkgs/stdenv/generic/check-meta.nix              @Ericson2314 @adisbladis @NixOS/stdenv
+/pkgs/stdenv/generic/meta-types.nix              @adisbladis @NixOS/stdenv
 /pkgs/stdenv/cross                               @Ericson2314 @NixOS/stdenv
 /pkgs/build-support                              @philiptaron
 /pkgs/build-support/cc-wrapper                   @Ericson2314

From f66a380ea3ddb2b8899255b81467a9a01327cc1f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 1 Nov 2025 12:53:03 +0100
Subject: [PATCH 4625/6226] workflows/pr: rename to pull-request-target

To be able to disable the pr.yml workflow on GitHub, we need to rename
it to a different name. Let's use the long name for consistency with
merge-group.yml. This only affects the GitHub-internal name, not the
visible name in the PR checklist, which is still "PR". This visible name
is also used by nixpkgs-review, so that won't break.
---
 .github/workflows/README.md                        |  2 +-
 .../workflows/{pr.yml => pull-request-target.yml}  |  0
 .github/workflows/reviewers.yml                    |  2 +-
 .github/workflows/test.yml                         |  4 ++--
 ci/github-script/labels.js                         | 14 +++++++++++++-
 5 files changed, 17 insertions(+), 5 deletions(-)
 rename .github/workflows/{pr.yml => pull-request-target.yml} (100%)

diff --git a/.github/workflows/README.md b/.github/workflows/README.md
index 2c739bd56129..4aed9617cae4 100644
--- a/.github/workflows/README.md
+++ b/.github/workflows/README.md
@@ -64,7 +64,7 @@ This results in a key with the following semantics:
 
 ## Required Status Checks
 
-The "Required Status Checks" branch ruleset is implemented in two top-level workflows: `pr.yml` and `merge-group.yml`.
+The "Required Status Checks" branch ruleset is implemented in two top-level workflows: `pull-request-target.yml` and `merge-group.yml`.
 
 The PR workflow defines all checks that need to succeed to add a Pull Request to the Merge Queue.
 If no Merge Queue is set up for a branch, the PR workflow defines the checks required to merge into the target branch.
diff --git a/.github/workflows/pr.yml b/.github/workflows/pull-request-target.yml
similarity index 100%
rename from .github/workflows/pr.yml
rename to .github/workflows/pull-request-target.yml
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index b5d0ada43b9d..f22e44d7cbff 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -102,7 +102,7 @@ jobs:
             const run_id = (await github.rest.actions.listWorkflowRuns({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              workflow_id: context.eventName === 'pull_request' ? 'test.yml' : 'pr.yml',
+              workflow_id: context.eventName === 'pull_request' ? 'test.yml' : 'pull-request-target.yml',
               event: context.eventName,
               head_sha: context.payload.pull_request.head.sha
             })).data.workflow_runs[0].id
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 4cac4b3f0bb6..b26f7ee98998 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -63,7 +63,7 @@ jobs:
               '.github/workflows/eval.yml',
               '.github/workflows/labels.yml',
               '.github/workflows/lint.yml',
-              '.github/workflows/pr.yml',
+              '.github/workflows/pull-request-target.yml',
               '.github/workflows/reviewers.yml',
               '.github/workflows/test.yml',
             ].includes(file))) core.setOutput('pr', true)
@@ -87,7 +87,7 @@ jobs:
     if: needs.prepare.outputs.pr
     name: PR
     needs: [prepare]
-    uses: ./.github/workflows/pr.yml
+    uses: ./.github/workflows/pull-request-target.yml
     # Those are actually only used on the pull_request_target event, but will throw an error if not set.
     permissions:
       issues: write
diff --git a/ci/github-script/labels.js b/ci/github-script/labels.js
index adb730aa257d..bd6c81bd9d99 100644
--- a/ci/github-script/labels.js
+++ b/ci/github-script/labels.js
@@ -199,12 +199,24 @@ module.exports = async ({ github, context, core, dry }) => {
       (
         await github.rest.actions.listWorkflowRuns({
           ...context.repo,
+          workflow_id: 'pull-request-target.yml',
+          event: 'pull_request_target',
+          exclude_pull_requests: true,
+          head_sha: pull_request.head.sha,
+        })
+      ).data.workflow_runs[0] ??
+      // TODO: Remove this after 2026-02-01, at which point all pr.yml artifacts will have expired.
+      (
+        await github.rest.actions.listWorkflowRuns({
+          ...context.repo,
+          // In older PRs, we need pr.yml instead of pull-request-target.yml.
           workflow_id: 'pr.yml',
           event: 'pull_request_target',
           exclude_pull_requests: true,
           head_sha: pull_request.head.sha,
         })
-      ).data.workflow_runs[0] ?? {}
+      ).data.workflow_runs[0] ??
+      {}
 
     // Newer PRs might not have run Eval to completion, yet.
     // Older PRs might not have an eval.yml workflow, yet.

From 0bfa880935d9b43aa12dbb155debb07412c56a08 Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Sat, 1 Nov 2025 12:00:00 +0000
Subject: [PATCH 4626/6226] evolution: fix crash when opening attachments

https://gitlab.gnome.org/GNOME/evolution/-/issues/3124

it's fixed in a later released version of evolution that we should get
in https://github.com/NixOS/nixpkgs/pull/440720
---
 .../mailreaders/evolution/evolution/default.nix       | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
index 6213da291bd8..f02a9d700bf0 100644
--- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
+++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  fetchpatch,
   cmake,
   ninja,
   intltool,
@@ -53,6 +54,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-ff3JrrLasybav9wfhXfE7MEjoS2gAS+MZKcmBlo8Cys=";
   };
 
+  patches = [
+    # fix crash when opening attachment with recent webkitgtk versions
+    # https://gitlab.gnome.org/GNOME/evolution/-/issues/3124
+    # remove when updating to 3.58.0
+    (fetchpatch {
+      url = "https://gitlab.gnome.org/GNOME/evolution/-/commit/811a6df1f990855e49ecc0ba7b1a7f7a5ec251e6.patch";
+      hash = "sha256-Aj8H7PnAblInX2zRPQH7n0HOdLNuhITNHunWRYCPBsI=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     intltool

From 9afc73703f1bc502846f0a440a90867a3122cdcc Mon Sep 17 00:00:00 2001
From: Guillaume Girol <symphorien+git@xlumurb.eu>
Date: Sat, 1 Nov 2025 12:00:00 +0000
Subject: [PATCH 4627/6226] nixos/printing: fix printing from cups-browsed (eg,
 from ipp-usb)

When cups-browsed was separated from cups in f1f9a54031dbc95b6e924772fddd125debb697bb
the implicitclass backend ($out/lib/cups/backend/implicitclass) was
moved from cups-filters to cups-browsed. When ipp-usb advertises a
printer, cups-browsed configures cups to add an implicitclass://...
printer and cups fails to find the corresponding backend:

cups.service cupsd[788465] DEBUG Canon_TR4500_series_USB device-uri: Unknown scheme in URI
cups.service cupsd[788465] DEBUG CUPS-Add-Modify-Printer client-error-not-possible: Bad device-uri scheme "implicitclass".
cups.service cupsd[788465] ERROR [Client 6] Returning IPP client-error-not-possible for CUPS-Add-Modify-Printer (ipp://localhost/printers/Canon_TR4500_series_USB) from localhost

This commit adds cups-browsed to the packages that compose the ServerBin
option of cups-files.conf so that cups can find the implicitclass
backend.
---
 nixos/modules/services/printing/cupsd.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix
index ce0b1159470a..37e15130b8cd 100644
--- a/nixos/modules/services/printing/cupsd.nix
+++ b/nixos/modules/services/printing/cupsd.nix
@@ -54,6 +54,7 @@ let
       cups-filters
       pkgs.ghostscript
     ]
+    ++ lib.optional cfg.browsed.enable cfg.browsed.package
     ++ cfg.drivers;
     pathsToLink = [
       "/lib"

From c3016c199dee57850db796da41e79f2649af1586 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 12:13:35 +0000
Subject: [PATCH 4628/6226] jawiki-all-titles-in-ns0: 0-unstable-2025-10-01 ->
 0-unstable-2025-11-01

---
 pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix b/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix
index dfe3bdd3e2be..b8b1f4ab1759 100644
--- a/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix
+++ b/pkgs/by-name/ja/jawiki-all-titles-in-ns0/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "jawiki-all-titles-in-ns0";
-  version = "0-unstable-2025-10-01";
+  version = "0-unstable-2025-11-01";
 
   src = fetchFromGitHub {
     owner = "musjj";
     repo = "jawiki-archive";
-    rev = "81e6379ffeb292a5ff6db4302347d80ba053fb1e";
-    hash = "sha256-jbfJ+Vf7jkCjjePbwHP0BTFA/J1NcIQkhFK1jqD4bPE=";
+    rev = "417baa847977539d641dfb83c9960c2b6b10c1d7";
+    hash = "sha256-uBregjxM/LDkAyYMLiXLVGSa83DStFxz352pFORqVdY=";
   };
 
   installPhase = ''

From 5e43b8b62e3b75ee07a31ed7219bed425e79f4b4 Mon Sep 17 00:00:00 2001
From: FlameFlag <57304299+FlameFlag@users.noreply.github.com>
Date: Sat, 1 Nov 2025 14:14:40 +0200
Subject: [PATCH 4629/6226] koboldcpp: 1.100.1 -> 1.101

Changelog: https://github.com/LostRuins/koboldcpp/releases/tag/v1.101
Diff: https://github.com/LostRuins/koboldcpp/compare/v1.100.1...v1.101
---
 pkgs/by-name/ko/koboldcpp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix
index 02d441eca883..949081fc8774 100644
--- a/pkgs/by-name/ko/koboldcpp/package.nix
+++ b/pkgs/by-name/ko/koboldcpp/package.nix
@@ -41,13 +41,13 @@ let
 in
 effectiveStdenv.mkDerivation (finalAttrs: {
   pname = "koboldcpp";
-  version = "1.100.1";
+  version = "1.101";
 
   src = fetchFromGitHub {
     owner = "LostRuins";
     repo = "koboldcpp";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Z3yPsC7WDFHwXVInnu96ZVWAjn6XyN0aVviwGkvoe1A=";
+    hash = "sha256-WwTl+u7FJ4E+x+jjwh0wmPM7fjsPxu7+TrEwKQQfyLA=";
   };
 
   enableParallelBuilding = true;

From 7ad131bda58f608c10a6077dbcd2e2b2086ff128 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 12:28:04 +0000
Subject: [PATCH 4630/6226] karing: 1.2.5.880 -> 1.2.5.881

---
 pkgs/by-name/ka/karing/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ka/karing/package.nix b/pkgs/by-name/ka/karing/package.nix
index 1033c35d0d62..442bb3f6dbd7 100644
--- a/pkgs/by-name/ka/karing/package.nix
+++ b/pkgs/by-name/ka/karing/package.nix
@@ -24,11 +24,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "karing";
-  version = "1.2.5.880";
+  version = "1.2.5.881";
 
   src = fetchurl {
     url = "https://github.com/KaringX/karing/releases/download/v${finalAttrs.version}/karing_${finalAttrs.version}_linux_amd64.deb";
-    hash = "sha256-hnKnp2VIC9GxyoLxPC0xxbnhvhS68OUgKAGr3z0UbFU=";
+    hash = "sha256-gkuKdOq07C7xd8xNoXWlcqaZ7xe9VmjU8e43Hg1yN7w=";
   };
 
   nativeBuildInputs = [

From 067930047e9ea26e4a6e45e47d420d323914f06d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 12:31:27 +0000
Subject: [PATCH 4631/6226] python3Packages.langgraph-cli: 0.4.4 -> 0.4.5

---
 pkgs/development/python-modules/langgraph-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix
index 5015885a6864..8fde1a853412 100644
--- a/pkgs/development/python-modules/langgraph-cli/default.nix
+++ b/pkgs/development/python-modules/langgraph-cli/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-cli";
-  version = "0.4.4";
+  version = "0.4.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "cli==${version}";
-    hash = "sha256-Ka/fm+lWxP6bpd4/Umgwfo1J1T05A6LHZb/ZeQ8HTSo=";
+    hash = "sha256-YGO1eq1IEKkxuH/9ZsaeaWpQ2vD97du32iopdXFqZf8=";
   };
 
   sourceRoot = "${src.name}/libs/cli";

From 13e06e2728e0221d0218df1e29804a88f0fb1106 Mon Sep 17 00:00:00 2001
From: ede1998 <online@erik-hennig.me>
Date: Thu, 30 Oct 2025 20:56:14 +0100
Subject: [PATCH 4632/6226] kgeotag: 1.8.0-unstable-2025-07-25 ->
 1.8.0-unstable-2025-11-01

This fixes a crash on startup because of missing `kgeotagui.rc`.
---
 pkgs/by-name/kg/kgeotag/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/kg/kgeotag/package.nix b/pkgs/by-name/kg/kgeotag/package.nix
index 9e29ba873586..ea6950ce7983 100644
--- a/pkgs/by-name/kg/kgeotag/package.nix
+++ b/pkgs/by-name/kg/kgeotag/package.nix
@@ -9,14 +9,14 @@
 
 stdenv.mkDerivation {
   pname = "kgeotag";
-  version = "1.8.0-unstable-2025-07-25";
+  version = "1.8.0-unstable-2025-11-01";
 
   src = fetchFromGitLab {
     domain = "invent.kde.org";
     repo = "kgeotag";
     owner = "graphics";
-    rev = "b2b140e8f72ab37bad3729bea527203324d12131";
-    hash = "sha256-jUcKm4IPQt2JiZUmIjMJ9EG0kDjzoPGjzBPMHZ6j9lM=";
+    rev = "879418eb57e96beb5be3e3a69d0bab2b666b7c7f";
+    hash = "sha256-RFC8UMrURn2vsTRjPFyLNlsep/PWRadkRkS7aFtTlKE=";
   };
 
   nativeBuildInputs = [

From b2d1946eb28740b5817cc49ff8abd0b8b69bc28f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 1 Nov 2025 10:52:38 +0100
Subject: [PATCH 4633/6226] workflows/reviewers: request owners and maintainers
 at once

Instead of requesting owners and maintainer separately, each with their
own limit of 10 review requests, we now run this together. This unties
the logic and allows easier refactoring. Also, it gives us a consistent
threshold of when not to request reviews anymore, which I set to 15.
Before, this could have been anything between 10 and 20, depending on
how the reviewers distributed over owners and maintainers.
---
 .github/workflows/reviewers.yml                  | 10 +++++-----
 ci/request-reviews/request-code-owner-reviews.sh |  5 +----
 ci/request-reviews/request-reviewers.sh          |  2 +-
 3 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index f22e44d7cbff..4b49972e0732 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -69,15 +69,14 @@ jobs:
           GH_TOKEN: ${{ steps.app-token.outputs.token }}
         run: gh api /rate_limit | jq
 
-      - name: Requesting code owner reviews
+      - name: Determining code owner reviews
         if: steps.app-token.outputs.token
         env:
           GH_TOKEN: ${{ steps.app-token.outputs.token }}
           REPOSITORY: ${{ github.repository }}
           NUMBER: ${{ github.event.number }}
-          # Don't do anything on draft PRs
-          DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}
-        run: result/bin/request-code-owner-reviews.sh "$REPOSITORY" "$NUMBER" ci/OWNERS
+        run: |
+          result/bin/request-code-owner-reviews.sh "$REPOSITORY" "$NUMBER" ci/OWNERS > owners.txt
 
       - name: Log current API rate limits (app-token)
         if: ${{ steps.app-token.outputs.token }}
@@ -149,7 +148,7 @@ jobs:
           GH_TOKEN: ${{ github.token }}
         run: gh api /rate_limit | jq
 
-      - name: Requesting maintainer reviews
+      - name: Requesting reviews
         if: ${{ steps.app-token.outputs.token }}
         env:
           GH_TOKEN: ${{ github.token }}
@@ -164,6 +163,7 @@ jobs:
           # There appears to be no API to request reviews based on GitHub IDs
           jq -r 'keys[]' comparison/maintainers.json \
             | while read -r id; do gh api /user/"$id" --jq .login; done \
+            | cat owners.txt - \
             | GH_TOKEN="$APP_GH_TOKEN" result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR"
 
       - name: Log current API rate limits (app-token)
diff --git a/ci/request-reviews/request-code-owner-reviews.sh b/ci/request-reviews/request-code-owner-reviews.sh
index 663285ae03fe..0ec61ab9f04e 100755
--- a/ci/request-reviews/request-code-owner-reviews.sh
+++ b/ci/request-reviews/request-code-owner-reviews.sh
@@ -31,8 +31,6 @@ prRepo=$(jq -r .head.repo.full_name <<< "$prInfo")
 log "PR repo: $prRepo"
 prBranch=$(jq -r .head.ref <<< "$prInfo")
 log "PR branch: $prBranch"
-prAuthor=$(jq -r .user.login <<< "$prInfo")
-log "PR author: $prAuthor"
 
 extraArgs=()
 if pwdRepo=$(git rev-parse --show-toplevel 2>/dev/null); then
@@ -56,5 +54,4 @@ git -C "$tmp/nixpkgs.git" fetch --no-tags fork "$prBranch"
 headRef=$(git -C "$tmp/nixpkgs.git" rev-parse refs/remotes/fork/"$prBranch")
 
 log "Requesting reviews from code owners"
-"$SCRIPT_DIR"/get-code-owners.sh "$tmp/nixpkgs.git" "$ownersFile" "$baseBranch" "$headRef" | \
-    "$SCRIPT_DIR"/request-reviewers.sh "$baseRepo" "$prNumber" "$prAuthor"
+"$SCRIPT_DIR"/get-code-owners.sh "$tmp/nixpkgs.git" "$ownersFile" "$baseBranch" "$headRef"
diff --git a/ci/request-reviews/request-reviewers.sh b/ci/request-reviews/request-reviewers.sh
index 1c105e385d28..6782b621b70b 100755
--- a/ci/request-reviews/request-reviewers.sh
+++ b/ci/request-reviews/request-reviewers.sh
@@ -68,7 +68,7 @@ for user in "${!users[@]}"; do
     fi
 done
 
-if [[ "${#users[@]}" -gt 10 ]]; then
+if [[ "${#users[@]}" -gt 15 ]]; then
     log "Too many reviewers (${!users[*]}), skipping review requests"
     exit 0
 fi

From d177d6057df8446f21297279047387edb350cf83 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 1 Nov 2025 11:04:46 +0100
Subject: [PATCH 4634/6226] ci/request-reviews: move git calls out of
 get-code-owners

This is just a refactor, no functional change. It is a preparation for a
future change, where `get-code-owners.sh` can be moved entirely into
eval/compare. This can only happen once we removed the remaining `gh
api` calls from it.
---
 ci/request-reviews/get-code-owners.sh            | 15 ++++-----------
 ci/request-reviews/request-code-owner-reviews.sh |  8 +++++++-
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/ci/request-reviews/get-code-owners.sh b/ci/request-reviews/get-code-owners.sh
index 13a377429b92..5d121f69a74c 100755
--- a/ci/request-reviews/get-code-owners.sh
+++ b/ci/request-reviews/get-code-owners.sh
@@ -9,32 +9,25 @@ log() {
 }
 
 if (( "$#" < 4 )); then
-    log "Usage: $0 GIT_REPO OWNERS_FILE BASE_REF HEAD_REF"
+    log "Usage: $0 TOUCHED_FILES_FILE OWNERS_FILE"
     exit 1
 fi
 
-gitRepo=$1
+touchedFilesFile=$1
 ownersFile=$2
-baseRef=$3
-headRef=$4
 
 tmp=$(mktemp -d)
 trap 'rm -rf "$tmp"' exit
 
-git -C "$gitRepo" diff --name-only --merge-base "$baseRef" "$headRef" > "$tmp/touched-files"
-readarray -t touchedFiles < "$tmp/touched-files"
+readarray -t touchedFiles < "$touchedFilesFile"
 log "This PR touches ${#touchedFiles[@]} files"
 
-# Get the owners file from the base, because we don't want to allow PRs to
-# remove code owners to avoid pinging them
-git -C "$gitRepo" show "$baseRef":"$ownersFile" > "$tmp"/codeowners
-
 # Associative array with the user as the key for easy de-duplication
 # Make sure to always lowercase keys to avoid duplicates with different casings
 declare -A users=()
 
 for file in "${touchedFiles[@]}"; do
-    result=$(codeowners --file "$tmp"/codeowners "$file")
+    result=$(codeowners --file "$ownersFile" "$file")
 
     # Remove the file prefix and trim the surrounding spaces
     read -r owners <<< "${result#"$file"}"
diff --git a/ci/request-reviews/request-code-owner-reviews.sh b/ci/request-reviews/request-code-owner-reviews.sh
index 0ec61ab9f04e..09df38304854 100755
--- a/ci/request-reviews/request-code-owner-reviews.sh
+++ b/ci/request-reviews/request-code-owner-reviews.sh
@@ -53,5 +53,11 @@ git -C "$tmp/nixpkgs.git" config remote.fork.promisor true
 git -C "$tmp/nixpkgs.git" fetch --no-tags fork "$prBranch"
 headRef=$(git -C "$tmp/nixpkgs.git" rev-parse refs/remotes/fork/"$prBranch")
 
+git -C "$tmp/nixpkgs.git" diff --name-only --merge-base "$baseBranch" "$headRef" > "$tmp/touched-files"
+
+# Get the owners file from the base, because we don't want to allow PRs to
+# remove code owners to avoid pinging them
+git -C "$tmp/nixpkgs.git" show "$baseBranch":"$ownersFile" > "$tmp"/codeowners
+
 log "Requesting reviews from code owners"
-"$SCRIPT_DIR"/get-code-owners.sh "$tmp/nixpkgs.git" "$ownersFile" "$baseBranch" "$headRef"
+"$SCRIPT_DIR"/get-code-owners.sh "$tmp/touched-files" "$tmp"/codeowners

From 981d9986ba5aa4b226f177919e23853c5eeb2c7a Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 1 Nov 2025 12:34:41 +0000
Subject: [PATCH 4635/6226] python312Packages.blosc2: 3.7.1 -> 3.11.0

---
 pkgs/development/python-modules/blosc2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/blosc2/default.nix b/pkgs/development/python-modules/blosc2/default.nix
index d62178ee476b..050e881ea0de 100644
--- a/pkgs/development/python-modules/blosc2/default.nix
+++ b/pkgs/development/python-modules/blosc2/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "blosc2";
-  version = "3.7.1";
+  version = "3.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Blosc";
     repo = "python-blosc2";
     tag = "v${version}";
-    hash = "sha256-mA7/8i77wtl9b6IT4Wp/uFDYp/IacnPnAsRoXe64+z4=";
+    hash = "sha256-L4NTURGmRlM2ZY11NvP36EoImPu1ncb+CBFCeuCC+eQ=";
   };
 
   nativeBuildInputs = [

From 4bceb410017e7e729c47248887b78280cc1691cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 13:13:54 +0000
Subject: [PATCH 4636/6226] datafusion-cli: 50.1.0 -> 50.3.0

---
 pkgs/by-name/da/datafusion-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/da/datafusion-cli/package.nix b/pkgs/by-name/da/datafusion-cli/package.nix
index 44dd61e2a17e..12b14072c299 100644
--- a/pkgs/by-name/da/datafusion-cli/package.nix
+++ b/pkgs/by-name/da/datafusion-cli/package.nix
@@ -6,17 +6,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "datafusion-cli";
-  version = "50.1.0";
+  version = "50.3.0";
 
   src = fetchFromGitHub {
     name = "datafusion-cli-source";
     owner = "apache";
     repo = "arrow-datafusion";
     tag = finalAttrs.version;
-    hash = "sha256-SYvdz/rGs8bZHKuM5ws2c+pSdYx7mVfQ69dliCDp8ec=";
+    hash = "sha256-Zv3XW1BbqOHrhnPa47YoS67v/INJBgXyitvU6/wQVSM=";
   };
 
-  cargoHash = "sha256-WHmNbmP8rqP0W+5PvV9Qi5szdWIwLsZuNqDVnV6JL9o=";
+  cargoHash = "sha256-VjDcqoI5KKIGqXMhvxkWan6jP1/0H/fkbl78C2WPhQI=";
 
   buildAndTestSubdir = "datafusion-cli";
 

From 18ab6b721e288ca9b6f9c0000ea62bebd070d5a1 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 1 Nov 2025 12:02:44 +0100
Subject: [PATCH 4637/6226] ci/request-reviews: move gh api calls out of
 get-code-owners

All the github related logic is now bundled in `request-reviewers.sh`.
This allows moving the `get-code-owners.sh` file into the eval/compare
step in the next commit.
---
 .github/workflows/reviewers.yml         | 14 --------
 ci/request-reviews/get-code-owners.sh   | 43 ++-----------------------
 ci/request-reviews/request-reviewers.sh | 34 ++++++++++++++++++-
 3 files changed, 35 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 4b49972e0732..a6822aa9af0e 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -63,27 +63,13 @@ jobs:
           permission-members: read
           permission-pull-requests: write
 
-      - name: Log current API rate limits (app-token)
-        if: ${{ steps.app-token.outputs.token }}
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh api /rate_limit | jq
-
       - name: Determining code owner reviews
-        if: steps.app-token.outputs.token
         env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
           REPOSITORY: ${{ github.repository }}
           NUMBER: ${{ github.event.number }}
         run: |
           result/bin/request-code-owner-reviews.sh "$REPOSITORY" "$NUMBER" ci/OWNERS > owners.txt
 
-      - name: Log current API rate limits (app-token)
-        if: ${{ steps.app-token.outputs.token }}
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh api /rate_limit | jq
-
       - name: Log current API rate limits (github.token)
         env:
           GH_TOKEN: ${{ github.token }}
diff --git a/ci/request-reviews/get-code-owners.sh b/ci/request-reviews/get-code-owners.sh
index 5d121f69a74c..33963bce7f30 100755
--- a/ci/request-reviews/get-code-owners.sh
+++ b/ci/request-reviews/get-code-owners.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-# Get the code owners of the files changed by a PR, returning one username per line
+# Get the code owners of the files changed by a PR, returning one username or team per line
 
 set -euo pipefail
 
@@ -16,16 +16,9 @@ fi
 touchedFilesFile=$1
 ownersFile=$2
 
-tmp=$(mktemp -d)
-trap 'rm -rf "$tmp"' exit
-
 readarray -t touchedFiles < "$touchedFilesFile"
 log "This PR touches ${#touchedFiles[@]} files"
 
-# Associative array with the user as the key for easy de-duplication
-# Make sure to always lowercase keys to avoid duplicates with different casings
-declare -A users=()
-
 for file in "${touchedFiles[@]}"; do
     result=$(codeowners --file "$ownersFile" "$file")
 
@@ -52,39 +45,7 @@ for file in "${touchedFiles[@]}"; do
         # The first regex match is everything after the @
         entry=${BASH_REMATCH[1]}
 
-        if [[ "$entry" =~ (.*)/(.*) ]]; then
-            # Teams look like $org/$team
-            org=${BASH_REMATCH[1]}
-            team=${BASH_REMATCH[2]}
-
-            # Instead of requesting a review from the team itself,
-            # we request reviews from the individual users.
-            # This is because once somebody from a team reviewed the PR,
-            # the API doesn't expose that the team was already requested for a review,
-            # so we wouldn't be able to avoid rerequesting reviews
-            # without saving some some extra state somewhere
-
-            # We could also consider implementing a more advanced heuristic
-            # in the future that e.g. only pings one team member,
-            # but escalates to somebody else if that member doesn't respond in time.
-            gh api \
-                --cache=1h \
-                -H "Accept: application/vnd.github+json" \
-                -H "X-GitHub-Api-Version: 2022-11-28" \
-                "/orgs/$org/teams/$team/members" \
-                --jq '.[].login' > "$tmp/team-members"
-            readarray -t members < "$tmp/team-members"
-            log "Team $entry has these members: ${members[*]}"
-
-            for user in "${members[@]}"; do
-                users[${user,,}]=
-            done
-        else
-            # Everything else is a user
-            users[${entry,,}]=
-        fi
+        echo "$entry"
     done
 
 done
-
-printf "%s\n" "${!users[@]}"
diff --git a/ci/request-reviews/request-reviewers.sh b/ci/request-reviews/request-reviewers.sh
index 6782b621b70b..b4288669db93 100755
--- a/ci/request-reviews/request-reviewers.sh
+++ b/ci/request-reviews/request-reviewers.sh
@@ -33,9 +33,41 @@ prAuthor=$3
 tmp=$(mktemp -d)
 trap 'rm -rf "$tmp"' exit
 
+# Associative array with the user as the key for easy de-duplication
+# Make sure to always lowercase keys to avoid duplicates with different casings
 declare -A users=()
 while read -r handle && [[ -n "$handle" ]]; do
-    users[${handle,,}]=
+    if [[ "$handle" =~ (.*)/(.*) ]]; then
+        # Teams look like $org/$team
+        org=${BASH_REMATCH[1]}
+        team=${BASH_REMATCH[2]}
+
+        # Instead of requesting a review from the team itself,
+        # we request reviews from the individual users.
+        # This is because once somebody from a team reviewed the PR,
+        # the API doesn't expose that the team was already requested for a review,
+        # so we wouldn't be able to avoid rerequesting reviews
+        # without saving some some extra state somewhere
+
+        # We could also consider implementing a more advanced heuristic
+        # in the future that e.g. only pings one team member,
+        # but escalates to somebody else if that member doesn't respond in time.
+        gh api \
+            --cache=1h \
+            -H "Accept: application/vnd.github+json" \
+            -H "X-GitHub-Api-Version: 2022-11-28" \
+            "/orgs/$org/teams/$team/members" \
+            --jq '.[].login' > "$tmp/team-members"
+        readarray -t members < "$tmp/team-members"
+        log "Team $entry has these members: ${members[*]}"
+
+        for user in "${members[@]}"; do
+            users[${user,,}]=
+        done
+    else
+        # Everything else is a user
+        users[${handle,,}]=
+    fi
 done
 
 # Cannot request a review from the author

From 9934ed11b602d35498d5c945733bdbb7c1b37669 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 13:14:36 +0000
Subject: [PATCH 4638/6226] python3Packages.pyscard: 2.3.0 -> 2.3.1

---
 pkgs/development/python-modules/pyscard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyscard/default.nix b/pkgs/development/python-modules/pyscard/default.nix
index 7f19bfb0c4c1..8ad883cdd919 100644
--- a/pkgs/development/python-modules/pyscard/default.nix
+++ b/pkgs/development/python-modules/pyscard/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyscard";
-  version = "2.3.0";
+  version = "2.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "LudovicRousseau";
     repo = "pyscard";
     tag = version;
-    hash = "sha256-rz3m8eVbmJUMcQFuEMZwF3k/ES75KcNA8R+xix+Mgq8=";
+    hash = "sha256-MW/Cg7Ta/LdY/pOomsEecVIt62rc5qSAGjpJl4m+ruM=";
   };
 
   build-system = [ setuptools ];

From e4a0c83258d7fa9748f9c68525c9ee31409bd222 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 13:17:20 +0000
Subject: [PATCH 4639/6226] python3Packages.seabreeze: 2.10.1 -> 2.11.0

---
 pkgs/development/python-modules/seabreeze/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/seabreeze/default.nix b/pkgs/development/python-modules/seabreeze/default.nix
index 03220410191c..976382e408b9 100644
--- a/pkgs/development/python-modules/seabreeze/default.nix
+++ b/pkgs/development/python-modules/seabreeze/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "seabreeze";
-  version = "2.10.1";
+  version = "2.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ap--";
     repo = "python-seabreeze";
     tag = "v${version}";
-    hash = "sha256-q4qBblebCb5z67KgWBIzsvCWNZf146I7LHPCyAabDUM=";
+    hash = "sha256-PplymlXZlRt+BzhCzIYRMjr+rMFf+XfSq846QAlbRi0=";
     leaveDotGit = true;
   };
 

From 8009a9af9e06ab62b57da81ef929aed483ebc701 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 13:18:37 +0000
Subject: [PATCH 4640/6226] oksh: 7.7 -> 7.8

---
 pkgs/by-name/ok/oksh/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ok/oksh/package.nix b/pkgs/by-name/ok/oksh/package.nix
index 780b83c1f43a..fb5eea3d5bcc 100644
--- a/pkgs/by-name/ok/oksh/package.nix
+++ b/pkgs/by-name/ok/oksh/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "oksh";
-  version = "7.7";
+  version = "7.8";
 
   src = fetchFromGitHub {
     owner = "ibara";
     repo = "oksh";
     rev = "oksh-${version}";
-    hash = "sha256-Go73MvL9Mi/Rz1KzrKM7KP9UkI9GQFTduMPSUxEbl70=";
+    hash = "sha256-fgTwj1U/bySVkQReE799Z2gZ0/SEek08WSdpHUHCHhk=";
   };
 
   strictDeps = true;

From d0b4678be791ba34ea9fc47233d651d0afdb17ae Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 13:24:04 +0000
Subject: [PATCH 4641/6226] php83: 8.3.26 -> 8.3.27

---
 pkgs/development/interpreters/php/8.3.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.3.nix b/pkgs/development/interpreters/php/8.3.nix
index fe25d10dc5de..d10414d7c7ff 100644
--- a/pkgs/development/interpreters/php/8.3.nix
+++ b/pkgs/development/interpreters/php/8.3.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.3.26";
-      hash = "sha256-chtj1TSfEx9Ql1N7O+a6aAHi2Ob6uh8fLqlbT9YudSU=";
+      version = "8.3.27";
+      hash = "sha256-od0rUbQ3wKYzfgGQBHeKjvJT206a/31I2IeYypG34qQ=";
     }
   );
 in

From 2aa2a574d2561fdfaabc07236cb89e1ddc8abaef Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Sat, 1 Nov 2025 13:31:59 +0000
Subject: [PATCH 4642/6226] python3Packages.tables: add patch for numexpr
 2.13.0+ compatibility

---
 pkgs/development/python-modules/tables/default.nix | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/pkgs/development/python-modules/tables/default.nix b/pkgs/development/python-modules/tables/default.nix
index 0357ae53d639..62321f1d9385 100644
--- a/pkgs/development/python-modules/tables/default.nix
+++ b/pkgs/development/python-modules/tables/default.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchPypi,
+  fetchpatch,
   buildPythonPackage,
   pythonOlder,
   blosc2,
@@ -34,6 +35,15 @@ buildPythonPackage rec {
     hash = "sha256-JUSBKnGG+tuoMdbdNOtJzNeI1qg/TkwrQxuDW2eWyRA=";
   };
 
+  patches = [
+    # should be included in next release
+    (fetchpatch {
+      name = "numexpr-2.13.0-compat.patch";
+      url = "https://github.com/PyTables/PyTables/commit/41270019ce1ffd97ce8f23b21d635e00e12b0ccb.patch";
+      hash = "sha256-CaDBYKiABVtlM5e9ChCsf8dWOwEnMPOIXQ100JTnlnE=";
+    })
+  ];
+
   build-system = [
     blosc2
     cython

From 3bef0dcf6588c23c95ce882e17a592d6ec66aa21 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 1 Nov 2025 14:27:15 +0100
Subject: [PATCH 4643/6226] ci/request-reviews: move get-code-owners to
 eval/compare

This moves the parsing of ci/OWNERS into the Nix sandbox. We also get
rid of checking out the nixpkgs repo another time in the reviewers
workflow - we already have everything we need in the eval/compare job.

The creation of owners.txt in this way is only temporary, it should
eventually be moved further, similar to how maintainers.json is
currently migrating to a maintainer map for the whole repo stored on the
target branch as artifact.
---
 .github/workflows/reviewers.yml               |  9 +--
 ci/eval/compare/default.nix                   | 39 ++++++++++++
 ci/request-reviews/default.nix                |  8 ---
 ci/request-reviews/get-code-owners.sh         | 51 ---------------
 .../request-code-owner-reviews.sh             | 63 -------------------
 5 files changed, 40 insertions(+), 130 deletions(-)
 delete mode 100755 ci/request-reviews/get-code-owners.sh
 delete mode 100755 ci/request-reviews/request-code-owner-reviews.sh

diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index a6822aa9af0e..03d8caa2661b 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -63,13 +63,6 @@ jobs:
           permission-members: read
           permission-pull-requests: write
 
-      - name: Determining code owner reviews
-        env:
-          REPOSITORY: ${{ github.repository }}
-          NUMBER: ${{ github.event.number }}
-        run: |
-          result/bin/request-code-owner-reviews.sh "$REPOSITORY" "$NUMBER" ci/OWNERS > owners.txt
-
       - name: Log current API rate limits (github.token)
         env:
           GH_TOKEN: ${{ github.token }}
@@ -149,7 +142,7 @@ jobs:
           # There appears to be no API to request reviews based on GitHub IDs
           jq -r 'keys[]' comparison/maintainers.json \
             | while read -r id; do gh api /user/"$id" --jq .login; done \
-            | cat owners.txt - \
+            | cat comparison/owners.txt - \
             | GH_TOKEN="$APP_GH_TOKEN" result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR"
 
       - name: Log current API rate limits (app-token)
diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index eabc28af4d36..571e6ba41068 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -7,6 +7,7 @@
   python3,
   stdenvNoCC,
   makeWrapper,
+  codeowners,
 }:
 let
   python = python3.withPackages (ps: [
@@ -48,6 +49,7 @@ in
 {
   combinedDir,
   touchedFilesJson,
+  ownersFile ? ../../OWNERS,
 }:
 let
   # Usually we expect a derivation, but when evaluating in multiple separate steps, we pass
@@ -174,6 +176,7 @@ runCommand "compare"
     nativeBuildInputs = map lib.getBin [
       jq
       cmp-stats
+      codeowners
     ];
     maintainers = builtins.toJSON maintainers;
     packages = builtins.toJSON packages;
@@ -222,6 +225,42 @@ runCommand "compare"
       } >> $out/step-summary.md
     fi
 
+    jq -r '.[]' "${touchedFilesJson}" > ./touched-files
+    readarray -t touchedFiles < ./touched-files
+    echo "This PR touches ''${#touchedFiles[@]} files"
+
+    # TODO: Move ci/OWNERS to Nix and produce owners.json instead of owners.txt.
+    for file in "''${touchedFiles[@]}"; do
+        result=$(codeowners --file "${ownersFile}" "$file")
+
+        # Remove the file prefix and trim the surrounding spaces
+        read -r owners <<< "''${result#"$file"}"
+        if [[ "$owners" == "(unowned)" ]]; then
+            echo "File $file is unowned"
+            continue
+        fi
+        echo "File $file is owned by $owners"
+
+        # Split up multiple owners, separated by arbitrary amounts of spaces
+        IFS=" " read -r -a entries <<< "$owners"
+
+        for entry in "''${entries[@]}"; do
+            # GitHub technically also supports Emails as code owners,
+            # but we can't easily support that, so let's not
+            if [[ ! "$entry" =~ @(.*) ]]; then
+                echo -e "\e[33mCodeowner \"$entry\" for file $file is not valid: Must start with \"@\"\e[0m"
+                # Don't fail, because the PR for which this script runs can't fix it,
+                # it has to be fixed in the base branch
+                continue
+            fi
+            # The first regex match is everything after the @
+            entry=''${BASH_REMATCH[1]}
+
+            echo "$entry" >> "$out/owners.txt"
+        done
+
+    done
+
     cp "$maintainersPath" "$out/maintainers.json"
     cp "$packagesPath" "$out/packages.json"
   ''
diff --git a/ci/request-reviews/default.nix b/ci/request-reviews/default.nix
index 075ff52fd564..55a1889fe89f 100644
--- a/ci/request-reviews/default.nix
+++ b/ci/request-reviews/default.nix
@@ -3,20 +3,15 @@
   stdenvNoCC,
   makeWrapper,
   coreutils,
-  codeowners,
   jq,
-  curl,
   github-cli,
-  gitMinimal,
 }:
 stdenvNoCC.mkDerivation {
   name = "request-reviews";
   src = lib.fileset.toSource {
     root = ./.;
     fileset = lib.fileset.unions [
-      ./get-code-owners.sh
       ./request-reviewers.sh
-      ./request-code-owner-reviews.sh
     ];
   };
   nativeBuildInputs = [ makeWrapper ];
@@ -29,11 +24,8 @@ stdenvNoCC.mkDerivation {
         --set PATH ${
           lib.makeBinPath [
             coreutils
-            codeowners
             jq
-            curl
             github-cli
-            gitMinimal
           ]
         }
     done
diff --git a/ci/request-reviews/get-code-owners.sh b/ci/request-reviews/get-code-owners.sh
deleted file mode 100755
index 33963bce7f30..000000000000
--- a/ci/request-reviews/get-code-owners.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env bash
-
-# Get the code owners of the files changed by a PR, returning one username or team per line
-
-set -euo pipefail
-
-log() {
-    echo "$@" >&2
-}
-
-if (( "$#" < 4 )); then
-    log "Usage: $0 TOUCHED_FILES_FILE OWNERS_FILE"
-    exit 1
-fi
-
-touchedFilesFile=$1
-ownersFile=$2
-
-readarray -t touchedFiles < "$touchedFilesFile"
-log "This PR touches ${#touchedFiles[@]} files"
-
-for file in "${touchedFiles[@]}"; do
-    result=$(codeowners --file "$ownersFile" "$file")
-
-    # Remove the file prefix and trim the surrounding spaces
-    read -r owners <<< "${result#"$file"}"
-    if [[ "$owners" == "(unowned)" ]]; then
-        log "File $file is unowned"
-        continue
-    fi
-    log "File $file is owned by $owners"
-
-    # Split up multiple owners, separated by arbitrary amounts of spaces
-    IFS=" " read -r -a entries <<< "$owners"
-
-    for entry in "${entries[@]}"; do
-        # GitHub technically also supports Emails as code owners,
-        # but we can't easily support that, so let's not
-        if [[ ! "$entry" =~ @(.*) ]]; then
-            warn -e "\e[33mCodeowner \"$entry\" for file $file is not valid: Must start with \"@\"\e[0m" >&2
-            # Don't fail, because the PR for which this script runs can't fix it,
-            # it has to be fixed in the base branch
-            continue
-        fi
-        # The first regex match is everything after the @
-        entry=${BASH_REMATCH[1]}
-
-        echo "$entry"
-    done
-
-done
diff --git a/ci/request-reviews/request-code-owner-reviews.sh b/ci/request-reviews/request-code-owner-reviews.sh
deleted file mode 100755
index 09df38304854..000000000000
--- a/ci/request-reviews/request-code-owner-reviews.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env bash
-
-# Requests reviews for a PR
-
-set -euo pipefail
-tmp=$(mktemp -d)
-trap 'rm -rf "$tmp"' exit
-SCRIPT_DIR=$(dirname "$0")
-
-log() {
-    echo "$@" >&2
-}
-
-if (( $# < 3 )); then
-    log "Usage: $0 GITHUB_REPO PR_NUMBER OWNERS_FILE"
-    exit 1
-fi
-baseRepo=$1
-prNumber=$2
-ownersFile=$3
-
-log "Fetching PR info"
-prInfo=$(gh api \
-  -H "Accept: application/vnd.github+json" \
-  -H "X-GitHub-Api-Version: 2022-11-28" \
-  "/repos/$baseRepo/pulls/$prNumber")
-
-baseBranch=$(jq -r .base.ref <<< "$prInfo")
-log "Base branch: $baseBranch"
-prRepo=$(jq -r .head.repo.full_name <<< "$prInfo")
-log "PR repo: $prRepo"
-prBranch=$(jq -r .head.ref <<< "$prInfo")
-log "PR branch: $prBranch"
-
-extraArgs=()
-if pwdRepo=$(git rev-parse --show-toplevel 2>/dev/null); then
-    # Speedup for local runs
-    extraArgs+=(--reference-if-able "$pwdRepo")
-fi
-
-log "Fetching Nixpkgs commit history"
-# We only need the commit history, not the contents, so we can do a tree-less clone using tree:0
-# https://github.blog/open-source/git/get-up-to-speed-with-partial-clone-and-shallow-clone/#user-content-quick-summary
-git clone --bare --filter=tree:0 --no-tags --origin upstream "${extraArgs[@]}" https://github.com/"$baseRepo".git "$tmp"/nixpkgs.git
-
-log "Fetching the PR commit history"
-# Fetch the PR
-git -C "$tmp/nixpkgs.git" remote add fork https://github.com/"$prRepo".git
-# This remote config is the same as --filter=tree:0 when cloning
-git -C "$tmp/nixpkgs.git" config remote.fork.partialclonefilter tree:0
-git -C "$tmp/nixpkgs.git" config remote.fork.promisor true
-
-git -C "$tmp/nixpkgs.git" fetch --no-tags fork "$prBranch"
-headRef=$(git -C "$tmp/nixpkgs.git" rev-parse refs/remotes/fork/"$prBranch")
-
-git -C "$tmp/nixpkgs.git" diff --name-only --merge-base "$baseBranch" "$headRef" > "$tmp/touched-files"
-
-# Get the owners file from the base, because we don't want to allow PRs to
-# remove code owners to avoid pinging them
-git -C "$tmp/nixpkgs.git" show "$baseBranch":"$ownersFile" > "$tmp"/codeowners
-
-log "Requesting reviews from code owners"
-"$SCRIPT_DIR"/get-code-owners.sh "$tmp/touched-files" "$tmp"/codeowners

From d78de156279d3d132ab6446456357011f7c912fa Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Fri, 10 Oct 2025 16:35:00 +0200
Subject: [PATCH 4644/6226] workflows/bot: rename from labels

This workflow / script is already doing more than must labeling: it's
already auto-closing package request issues.

Since we're going to migrate the nixpkgs-merge-bot into this workflow,
we'll rename things to a more generic name.
---
 .github/labeler-development-branches.yml  |  2 +-
 .github/labeler-no-sync.yml               |  2 +-
 .github/labeler.yml                       |  2 +-
 .github/workflows/{labels.yml => bot.yml} | 10 +++++-----
 .github/workflows/pull-request-target.yml |  6 +++---
 .github/workflows/test.yml                |  2 +-
 ci/github-script/{labels.js => bot.js}    |  2 +-
 ci/github-script/run                      |  8 ++++----
 8 files changed, 17 insertions(+), 17 deletions(-)
 rename .github/workflows/{labels.yml => bot.yml} (94%)
 rename ci/github-script/{labels.js => bot.js} (99%)

diff --git a/.github/labeler-development-branches.yml b/.github/labeler-development-branches.yml
index 5ce799c2f8d4..bb1c47a23fa0 100644
--- a/.github/labeler-development-branches.yml
+++ b/.github/labeler-development-branches.yml
@@ -1,4 +1,4 @@
-# This file is used by .github/workflows/labels.yml
+# This file is used by .github/workflows/bot.yml
 # This version is only run for Pull Requests from development branches like staging-next, haskell-updates or python-updates.
 
 "4.workflow: package set update":
diff --git a/.github/labeler-no-sync.yml b/.github/labeler-no-sync.yml
index 69249f6ac27d..99d1b85c3c7b 100644
--- a/.github/labeler-no-sync.yml
+++ b/.github/labeler-no-sync.yml
@@ -1,4 +1,4 @@
-# This file is used by .github/workflows/labels.yml
+# This file is used by .github/workflows/bot.yml
 # This version uses `sync-labels: false`, meaning that a non-match will NOT remove the label
 
 # keep-sorted start case=no numeric=yes newline_separated=yes skip_lines=1
diff --git a/.github/labeler.yml b/.github/labeler.yml
index adfc49ef6ee2..abec7c37288c 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,4 +1,4 @@
-# This file is used by .github/workflows/labels.yml
+# This file is used by .github/workflows/bot.yml
 # This version uses `sync-labels: true`, meaning that a non-match will remove the label
 
 # keep-sorted start case=no numeric=yes newline_separated=yes skip_lines=1
diff --git a/.github/workflows/labels.yml b/.github/workflows/bot.yml
similarity index 94%
rename from .github/workflows/labels.yml
rename to .github/workflows/bot.yml
index e3dfe2642e50..1fbef1134f14 100644
--- a/.github/workflows/labels.yml
+++ b/.github/workflows/bot.yml
@@ -3,7 +3,7 @@
 # access to the GitHub API. This means that it should not evaluate user input in
 # a way that allows code injection.
 
-name: Labels
+name: Bot
 
 on:
   schedule:
@@ -21,7 +21,7 @@ on:
 concurrency:
   # This explicitly avoids using `run_id` for the concurrency key to make sure that only
   # *one* scheduled run can run at a time.
-  group: labels-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number }}
+  group: bot-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number }}
   # PR-triggered runs will be cancelled, but scheduled runs will be queued.
   cancel-in-progress: ${{ github.event_name != 'schedule' }}
 
@@ -36,7 +36,7 @@ defaults:
     shell: bash
 
 jobs:
-  update:
+  run:
     runs-on: ubuntu-24.04-arm
     if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'
     steps:
@@ -64,13 +64,13 @@ jobs:
           GH_TOKEN: ${{ steps.app-token.outputs.token || github.token }}
         run: gh api /rate_limit | jq
 
-      - name: Labels from API data and Eval results
+      - name: Run bot
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
           github-token: ${{ steps.app-token.outputs.token || github.token }}
           retries: 3
           script: |
-            require('./ci/github-script/labels.js')({
+            require('./ci/github-script/bot.js')({
               github,
               context,
               core,
diff --git a/.github/workflows/pull-request-target.yml b/.github/workflows/pull-request-target.yml
index 8a305a953933..d73f6fdc7e5c 100644
--- a/.github/workflows/pull-request-target.yml
+++ b/.github/workflows/pull-request-target.yml
@@ -100,10 +100,10 @@ jobs:
       systems: ${{ needs.prepare.outputs.systems }}
       testVersions: ${{ contains(fromJSON(needs.prepare.outputs.touched), 'pinned') && !contains(fromJSON(needs.prepare.outputs.headBranch).type, 'development') }}
 
-  labels:
-    name: Labels
+  bot:
+    name: Bot
     needs: [prepare, eval]
-    uses: ./.github/workflows/labels.yml
+    uses: ./.github/workflows/bot.yml
     permissions:
       issues: write
       pull-requests: write
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b26f7ee98998..f938ea5f64b1 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -58,10 +58,10 @@ jobs:
 
             if (files.some(file => [
               '.github/actions/checkout/action.yml',
+              '.github/workflows/bot.yml',
               '.github/workflows/build.yml',
               '.github/workflows/check.yml',
               '.github/workflows/eval.yml',
-              '.github/workflows/labels.yml',
               '.github/workflows/lint.yml',
               '.github/workflows/pull-request-target.yml',
               '.github/workflows/reviewers.yml',
diff --git a/ci/github-script/labels.js b/ci/github-script/bot.js
similarity index 99%
rename from ci/github-script/labels.js
rename to ci/github-script/bot.js
index bd6c81bd9d99..807b134843dc 100644
--- a/ci/github-script/labels.js
+++ b/ci/github-script/bot.js
@@ -484,7 +484,7 @@ module.exports = async ({ github, context, core, dry }) => {
       const lastRun = (
         await github.rest.actions.listWorkflowRuns({
           ...context.repo,
-          workflow_id: 'labels.yml',
+          workflow_id: 'bot.yml',
           event: 'schedule',
           status: 'success',
           exclude_pull_requests: true,
diff --git a/ci/github-script/run b/ci/github-script/run
index 782e3fa7db1f..8a2906606cac 100755
--- a/ci/github-script/run
+++ b/ci/github-script/run
@@ -65,19 +65,19 @@ program
   })
 
 program
-  .command('labels')
-  .description('Manage labels on pull requests.')
+  .command('bot')
+  .description('Run automation on pull requests and issues.')
   .argument('<owner>', 'Owner of the GitHub repository to label (Example: NixOS)')
   .argument('<repo>', 'Name of the GitHub repository to label (Example: nixpkgs)')
   .argument('[pr]', 'Number of the Pull Request to label')
   .option('--no-dry', 'Make actual modifications')
   .action(async (owner, repo, pr, options) => {
-    const labels = (await import('./labels.js')).default
+    const bot = (await import('./bot.js')).default
     const tmp = mkdtempSync(join(tmpdir(), 'github-script-'))
     try {
       process.env.GITHUB_WORKSPACE = tmp
       process.chdir(tmp)
-      await run(labels, owner, repo, pr, options)
+      await run(bot, owner, repo, pr, options)
     } finally {
       rmSync(tmp, { recursive: true })
     }

From f1640b71d81c06ce30378758c0ff5bb977105756 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 12 Oct 2025 13:16:10 +0200
Subject: [PATCH 4645/6226] workflows/{review,reviewed}: rename from
 dismissed-review and review-dismissed

This is just a separate commit for a better diff. This workflow will be
extended with the `submitted` type in the next commit, so needs a
different naming.

While at it, also remove the useless concurrency group: This workflow is
never run in a PR context, so will never be cancelled.
---
 .github/workflows/{dismissed-review.yml => review.yml}   | 8 ++------
 .github/workflows/{review-dismissed.yml => reviewed.yml} | 2 +-
 2 files changed, 3 insertions(+), 7 deletions(-)
 rename .github/workflows/{dismissed-review.yml => review.yml} (91%)
 rename .github/workflows/{review-dismissed.yml => reviewed.yml} (91%)

diff --git a/.github/workflows/dismissed-review.yml b/.github/workflows/review.yml
similarity index 91%
rename from .github/workflows/dismissed-review.yml
rename to .github/workflows/review.yml
index db5799c80913..6679f6852766 100644
--- a/.github/workflows/dismissed-review.yml
+++ b/.github/workflows/review.yml
@@ -1,15 +1,11 @@
-name: Dismissed review
+name: Review
 
 on:
   workflow_run:
     workflows:
-      - Review dismissed
+      - Reviewed
     types: [completed]
 
-concurrency:
-  group: dismissed-review-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
-  cancel-in-progress: true
-
 permissions:
   pull-requests: write
 
diff --git a/.github/workflows/review-dismissed.yml b/.github/workflows/reviewed.yml
similarity index 91%
rename from .github/workflows/review-dismissed.yml
rename to .github/workflows/reviewed.yml
index 988b4a47df14..ab959d8c2117 100644
--- a/.github/workflows/review-dismissed.yml
+++ b/.github/workflows/reviewed.yml
@@ -1,4 +1,4 @@
-name: Review dismissed
+name: Reviewed
 
 on:
   pull_request_review:

From 99c233148dcf8ef5298a4619246bbd863ae8c968 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 14:27:57 +0000
Subject: [PATCH 4646/6226] python3Packages.os-service-types: 1.8.0 -> 1.8.1

---
 pkgs/development/python-modules/os-service-types/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/os-service-types/default.nix b/pkgs/development/python-modules/os-service-types/default.nix
index 6368bedb27df..d23a814af3de 100644
--- a/pkgs/development/python-modules/os-service-types/default.nix
+++ b/pkgs/development/python-modules/os-service-types/default.nix
@@ -10,13 +10,13 @@
 
 buildPythonPackage rec {
   pname = "os-service-types";
-  version = "1.8.0";
+  version = "1.8.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "os_service_types";
     inherit version;
-    hash = "sha256-iQznTxMsozTCsj8AJRErR8aSbabSjC91vPwKg96jYD4=";
+    hash = "sha256-w9YBNO5QnPVUUsc/+L1BiRvLbPQkIaFZwBOIJOEmQCs=";
   };
 
   postPatch = ''

From 4b48ce458bead78a63f77e642ae91e3bde508f49 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 14:31:34 +0000
Subject: [PATCH 4647/6226] libretro.ppsspp: 0-unstable-2025-10-22 ->
 0-unstable-2025-10-31

---
 pkgs/applications/emulators/libretro/cores/ppsspp.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
index 7acd6a288f8a..8b55fc42292b 100644
--- a/pkgs/applications/emulators/libretro/cores/ppsspp.nix
+++ b/pkgs/applications/emulators/libretro/cores/ppsspp.nix
@@ -13,13 +13,13 @@
 }:
 mkLibretroCore {
   core = "ppsspp";
-  version = "0-unstable-2025-10-22";
+  version = "0-unstable-2025-10-31";
 
   src = fetchFromGitHub {
     owner = "hrydgard";
     repo = "ppsspp";
-    rev = "28790c19af7ddfa822c4152a3cae4a7fb6c06bc7";
-    hash = "sha256-m1qmgr92Ni8wAYer6kIdcu+BUiBSROFcSC/M3v/JOmA=";
+    rev = "884ec9d16e39272d6f04ce6e7e202290ec31f45d";
+    hash = "sha256-vC2GPK5hHjOUtoxG2rw2ESiAbTOsQRx8tDABxNjRkFw=";
     fetchSubmodules = true;
   };
 

From 520a3885400c847834e12ec88035bf1fd2552df9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 14:39:49 +0000
Subject: [PATCH 4648/6226] ipget: 0.12.0 -> 0.12.1

---
 pkgs/by-name/ip/ipget/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ip/ipget/package.nix b/pkgs/by-name/ip/ipget/package.nix
index 3d0b3f66dee9..408c5e4c5a97 100644
--- a/pkgs/by-name/ip/ipget/package.nix
+++ b/pkgs/by-name/ip/ipget/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "ipget";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "ipfs";
     repo = "ipget";
     rev = "v${version}";
-    hash = "sha256-7/wXrjnd7YD2qhVvP0yBMJDkDZjxJC1vZcQuqVd44rU=";
+    hash = "sha256-a+dVqIo+cmEnYrc1A98/APJq0m2pSKC5HKIN04rfziY=";
   };
 
-  vendorHash = "sha256-b6Lulzi7zgO0VdWboxi5Vibx8cjuZ6r6O1PJvYubZu4=";
+  vendorHash = "sha256-tYBM0NGHhLNTRfsv+UgBmtpxItjPIr7Klo708vaXItw=";
 
   postPatch = ''
     # main module (github.com/ipfs/ipget) does not contain package github.com/ipfs/ipget/sharness/dependencies

From 6d0bedee72b736aad51624a033fb9c671efd87bc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 14:51:30 +0000
Subject: [PATCH 4649/6226] kubernetes-polaris: 10.1.1 -> 10.1.2

---
 pkgs/by-name/ku/kubernetes-polaris/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ku/kubernetes-polaris/package.nix b/pkgs/by-name/ku/kubernetes-polaris/package.nix
index d6cb4f3a5554..8ac6c5fdc82d 100644
--- a/pkgs/by-name/ku/kubernetes-polaris/package.nix
+++ b/pkgs/by-name/ku/kubernetes-polaris/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "kubernetes-polaris";
-  version = "10.1.1";
+  version = "10.1.2";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "polaris";
     rev = version;
-    sha256 = "sha256-1viEKPU+V+VqFDnrtjSTvNLtgE3TB1ijKv1YOz6AAUo=";
+    sha256 = "sha256-wu/Ouozi89y1abFgDk16uqBHoYDQDIzoqPgwA0BofLo=";
   };
 
-  vendorHash = "sha256-4eznwhNf3anhs+GlZGrHJWAproej0dO2NbzfhJeReNY=";
+  vendorHash = "sha256-ihA9RJDFHePox1G47Jr4Q1NSVJ9k5KDXgm8KTe2wYBQ=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From eea09eb9d320d5f011c94d4572fc78ff89ee3bc0 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 11 Oct 2025 13:19:10 +0200
Subject: [PATCH 4650/6226] workflows/bot: migrate nixpkgs-merge-bot to GHA

Running the nixpkgs-merge-bot in GitHub Actions instead of a separate
workflow has multiple advantages:
- A much better development workflow, with improved testability.
- The ability to label PRs with a "merge-bot eligible" label from the
same codebase.
- Using more data for merge strategy decisions, for example the number
of rebuilds.

This commits re-implements most of the features from the current
nxipkgs-merge-bot directly in the bot workflow. Instead of reacting to
webhook events, this now runs on the regular 10 minute schedule. Some
merges might be delayed a few minutes, but that should not be a problem
in practice.

To give the user early feedback, there are additional workflows running
when a comment or review is posted. These react with "eyes" to make the
user aware that the comment has been recognized.

The only feature not taken over was the size check for files in the PR.
This kind of check is not really relevant for maintainer merges only -
if we want to prevent bigger files from making it into the tree, then we
need a generic CI check, which is out of scope for the merge-bot.

Other than that, everything should be implemented - any omissions are by
accident.
---
 .github/workflows/bot.yml      |   5 +
 .github/workflows/comment.yml  |  54 +++++++
 .github/workflows/review.yml   |  68 ++++++---
 .github/workflows/reviewed.yml |   2 +-
 ci/github-script/bot.js        |  40 +++--
 ci/github-script/merge.js      | 257 +++++++++++++++++++++++++++++++++
 6 files changed, 395 insertions(+), 31 deletions(-)
 create mode 100644 .github/workflows/comment.yml
 create mode 100644 ci/github-script/merge.js

diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
index 1fbef1134f14..cb1df7bdb0a1 100644
--- a/.github/workflows/bot.yml
+++ b/.github/workflows/bot.yml
@@ -39,6 +39,10 @@ jobs:
   run:
     runs-on: ubuntu-24.04-arm
     if: github.event_name != 'schedule' || github.repository_owner == 'NixOS'
+    env:
+      # TODO: Remove after 2026-03-04, when Node 24 becomes the default.
+      # https://github.blog/changelog/2025-09-19-deprecation-of-node-20-on-github-actions-runners/
+      FORCE_JAVASCRIPT_ACTIONS_TO_NODE24: "true"
     steps:
       - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
         with:
@@ -56,6 +60,7 @@ jobs:
         with:
           app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
           private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
+          permission-contents: write
           permission-issues: write
           permission-pull-requests: write
 
diff --git a/.github/workflows/comment.yml b/.github/workflows/comment.yml
new file mode 100644
index 000000000000..d09df6956c8c
--- /dev/null
+++ b/.github/workflows/comment.yml
@@ -0,0 +1,54 @@
+name: Comment
+
+on:
+  issue_comment:
+    types: [created]
+
+# This is used as fallback without app only.
+# This happens when testing in forks without setting up that app.
+permissions:
+  pull-requests: write
+
+defaults:
+  run:
+    shell: bash
+
+jobs:
+  # The `bot` workflow reacts to comments with @NixOS/nixpkgs-merge-bot references, but might only
+  # pick up a comment after up to 10 minutes. To give the user instant feedback, this job adds
+  # a reaction to these comments.
+  react:
+    name: React with eyes
+    runs-on: ubuntu-24.04-arm
+    timeout-minutes: 2
+    if: contains(github.event.comment.body, '@NixOS/nixpkgs-merge-bot merge')
+    steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+          sparse-checkout: |
+            ci/github-script
+
+      # Use the GitHub App to make sure the reaction happens with the same user who will later merge.
+      - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
+        id: app-token
+        with:
+          app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
+          private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
+          permission-pull-requests: write
+
+      - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
+        with:
+          github-token: ${{ steps.app-token.outputs.token || github.token }}
+          retries: 3
+          script: |
+            const { handleMergeComment } = require('./ci/github-script/merge.js')
+            const { body, node_id } = context.payload.comment
+
+            await handleMergeComment({
+              github,
+              body,
+              node_id,
+              reaction: 'EYES',
+            })
diff --git a/.github/workflows/review.yml b/.github/workflows/review.yml
index 6679f6852766..44ac3f0088d4 100644
--- a/.github/workflows/review.yml
+++ b/.github/workflows/review.yml
@@ -6,6 +6,8 @@ on:
       - Reviewed
     types: [completed]
 
+# This is used as fallback without app only.
+# This happens when testing in forks without setting up that app.
 permissions:
   pull-requests: write
 
@@ -14,18 +16,32 @@ defaults:
     shell: bash
 
 jobs:
-  # The `check-cherry-picks` workflow creates review comments which reviewers
-  # are encouraged to manually dismiss if they're not relevant.
-  # When a CI-generated review is dismissed, this job automatically minimizes
-  # it, preventing it from cluttering the PR.
-  minimize:
-    name: Minimize as resolved
+  process:
     runs-on: ubuntu-24.04-arm
     timeout-minutes: 2
     steps:
+      - uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        with:
+          persist-credentials: false
+          sparse-checkout: |
+            ci/github-script
+
+      # Use the GitHub App to make sure the reaction happens with the same user who will later merge.
+      - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
+        if: github.event_name != 'pull_request' && vars.NIXPKGS_CI_APP_ID
+        id: app-token
+        with:
+          app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
+          private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
+          permission-pull-requests: write
+
       - uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
+          github-token: ${{ steps.app-token.outputs.token || github.token }}
+          retries: 3
           script: |
+            const { handleMergeComment } = require('./ci/github-script/merge.js')
+
             // PRs from forks don't have any PRs associated by default.
             // Thus, we request the PR number with an API call *to* the fork's repo.
             // Multiple pull requests can be open from the same head commit, either via
@@ -44,19 +60,33 @@ jobs:
                     owner: context.repo.owner,
                     repo: context.repo.repo,
                     pull_number: pull_request.number
-                  })).filter(review =>
-                    review.user?.login == 'github-actions[bot]' &&
-                    review.state == 'DISMISSED'
-                  ).map(review => github.graphql(`
-                    mutation($node_id:ID!) {
-                      minimizeComment(input: {
-                        classifier: RESOLVED,
-                        subjectId: $node_id
-                      })
-                      { clientMutationId }
-                    }`,
-                    { node_id: review.node_id }
-                  ))
+                  })).map(review => {
+                    // The `check` workflow creates review comments which reviewers
+                    // are encouraged to manually dismiss if they're not relevant.
+                    // When a CI-generated review is dismissed, this job automatically minimizes
+                    // it, preventing it from cluttering the PR.
+                    if (review.user?.login == 'github-actions[bot]' && review.state == 'DISMISSED')
+                      return github.graphql(`
+                        mutation($node_id:ID!) {
+                          minimizeComment(input: {
+                            classifier: RESOLVED,
+                            subjectId: $node_id
+                          })
+                          { clientMutationId }
+                        }`,
+                        { node_id: review.node_id }
+                      )
+
+                    // The `bot` workflow reacts to comments with @NixOS/nixpkgs-merge-bot references, but might only
+                    // pick up a comment after up to 10 minutes. To give the user instant feedback, this job adds
+                    // a reaction to these comments.
+                    return handleMergeComment({
+                      github,
+                      body: review.body,
+                      node_id: review.node_id,
+                      reaction: 'EYES',
+                    })
+                  })
                 )
               )
             )
diff --git a/.github/workflows/reviewed.yml b/.github/workflows/reviewed.yml
index ab959d8c2117..d7d368739eaa 100644
--- a/.github/workflows/reviewed.yml
+++ b/.github/workflows/reviewed.yml
@@ -2,7 +2,7 @@ name: Reviewed
 
 on:
   pull_request_review:
-    types: [dismissed]
+    types: [submitted, dismissed]
 
 permissions: {}
 
diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index 807b134843dc..e0a67a747c82 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -4,6 +4,7 @@ module.exports = async ({ github, context, core, dry }) => {
   const { readFile, writeFile } = require('node:fs/promises')
   const withRateLimit = require('./withRateLimit.js')
   const { classify } = require('../supportedBranches.js')
+  const { handleMerge } = require('./merge.js')
 
   const artifactClient = new DefaultArtifactClient()
 
@@ -95,7 +96,7 @@ module.exports = async ({ github, context, core, dry }) => {
     return maintainerMaps[branch]
   }
 
-  async function handlePullRequest({ item, stats }) {
+  async function handlePullRequest({ item, stats, events }) {
     const log = (k, v) => core.info(`PR #${item.number} - ${k}: ${v}`)
 
     const pull_number = item.number
@@ -109,6 +110,19 @@ module.exports = async ({ github, context, core, dry }) => {
       })
     ).data
 
+    const maintainers = await getMaintainerMap(pull_request.base.ref)
+
+    await handleMerge({
+      github,
+      context,
+      core,
+      log,
+      dry,
+      pull_request,
+      events,
+      maintainers,
+    })
+
     // When the same change has already been merged to the target branch, a PR will still be
     // open and display the same changes - but will not actually have any effect. This causes
     // strange CI behavior, because the diff of the merge-commit is empty, no rebuilds will
@@ -305,8 +319,6 @@ module.exports = async ({ github, context, core, dry }) => {
         )
       }
 
-      const maintainers = await getMaintainerMap(pull_request.base.ref)
-
       Object.assign(prLabels, evalLabels, {
         '11.by: package-maintainer':
           packages.length &&
@@ -377,9 +389,21 @@ module.exports = async ({ github, context, core, dry }) => {
 
       const itemLabels = {}
 
+      const events = await github.paginate(
+        github.rest.issues.listEventsForTimeline,
+        {
+          ...context.repo,
+          issue_number,
+          per_page: 100,
+        },
+      )
+
       if (item.pull_request || context.payload.pull_request) {
         stats.prs++
-        Object.assign(itemLabels, await handlePullRequest({ item, stats }))
+        Object.assign(
+          itemLabels,
+          await handlePullRequest({ item, stats, events }),
+        )
       } else {
         stats.issues++
         if (item.labels.some(({ name }) => name === '4.workflow: auto-close')) {
@@ -391,13 +415,7 @@ module.exports = async ({ github, context, core, dry }) => {
       }
 
       const latest_event_at = new Date(
-        (
-          await github.paginate(github.rest.issues.listEventsForTimeline, {
-            ...context.repo,
-            issue_number,
-            per_page: 100,
-          })
-        )
+        events
           .filter(({ event }) =>
             [
               // These events are hand-picked from:
diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
new file mode 100644
index 000000000000..b08e2b4e2fdc
--- /dev/null
+++ b/ci/github-script/merge.js
@@ -0,0 +1,257 @@
+// Caching the list of committers saves API requests when running the bot on the schedule and
+// processing many PRs at once.
+let committers
+
+async function runChecklist({ github, context, pull_request, maintainers }) {
+  const pull_number = pull_request.number
+
+  if (!committers) {
+    committers = github
+      .paginate(github.rest.teams.listMembersInOrg, {
+        org: context.repo.owner,
+        team_slug: 'nixpkgs-committers',
+        per_page: 100,
+      })
+      .then((members) => new Set(members.map(({ id }) => id)))
+  }
+
+  const files = await github.paginate(github.rest.pulls.listFiles, {
+    ...context.repo,
+    pull_number,
+    per_page: 100,
+  })
+
+  const packages = files
+    .filter(({ filename }) => filename.startsWith('pkgs/by-name/'))
+    .map(({ filename }) => filename.split('/')[3])
+
+  const eligible = !packages.length
+    ? new Set()
+    : packages
+        .map((pkg) => new Set(maintainers[pkg]))
+        .reduce((acc, cur) => acc?.intersection(cur) ?? cur)
+
+  const checklist = {
+    'PR targets one of the allowed branches: master, staging, staging-next.': [
+      'master',
+      'staging',
+      'staging-next',
+    ].includes(pull_request.base.ref),
+    'PR touches only files in `pkgs/by-name/`.': files.every(({ filename }) =>
+      filename.startsWith('pkgs/by-name/'),
+    ),
+    'PR authored by r-ryantm or committer.':
+      pull_request.user.login === 'r-ryantm' ||
+      (await committers).has(pull_request.user.id),
+    'PR has maintainers eligible for merge.': eligible.size > 0,
+  }
+
+  return {
+    checklist,
+    eligible,
+    result: Object.values(checklist).every(Boolean),
+  }
+}
+
+// The merge command must be on a separate line and not within codeblocks or html comments.
+// Codeblocks can have any number of ` larger than 3 to open/close. We only look at code
+// blocks that are not indented, because the later regex wouldn't match those anyway.
+function hasMergeCommand(body) {
+  return (body ?? '')
+    .replace(/<!--.*?-->/gms, '')
+    .replace(/(^`{3,})[^`].*?\1/gms, '')
+    .match(/^@NixOS\/nixpkgs-merge-bot merge\s*$/m)
+}
+
+async function handleMergeComment({ github, body, node_id, reaction }) {
+  if (!hasMergeCommand(body)) return
+
+  await github.graphql(
+    `mutation($node_id: ID!, $reaction: ReactionContent!) {
+      addReaction(input: {
+        content: $reaction,
+        subjectId: $node_id
+      })
+      { clientMutationId }
+    }`,
+    { node_id, reaction },
+  )
+}
+
+async function handleMerge({
+  github,
+  context,
+  core,
+  log,
+  dry,
+  pull_request,
+  events,
+  maintainers,
+}) {
+  const pull_number = pull_request.number
+
+  const { checklist, eligible, result } = await runChecklist({
+    github,
+    context,
+    pull_request,
+    maintainers,
+  })
+  log('checklist', JSON.stringify(checklist))
+  log('eligible', JSON.stringify(Array.from(eligible)))
+  log('result', result)
+
+  // Only look through comments *after* the latest (force) push.
+  const latestChange = events.findLast(({ event }) =>
+    ['committed', 'head_ref_force_pushed'].includes(event),
+  ) ?? { sha: pull_request.head.sha }
+  const latestSha = latestChange.sha ?? latestChange.commit_id
+  log('latest sha', latestSha)
+  const latestIndex = events.indexOf(latestChange)
+
+  const comments = events.slice(latestIndex + 1).filter(
+    ({ event, body, node_id }) =>
+      ['commented', 'reviewed'].includes(event) &&
+      hasMergeCommand(body) &&
+      // Ignore comments which had already been responded to by the bot.
+      !events.some(
+        ({ event, user, body }) =>
+          ['commented'].includes(event) &&
+          // We're only testing this hidden reference, but not the author of the comment.
+          // We'll just assume that nobody creates comments with this marker on purpose.
+          // Additionally checking the author is quite annoying for local debugging.
+          body.match(new RegExp(`^<!-- comment: ${node_id} -->$`, 'm')),
+      ),
+  )
+
+  async function merge() {
+    if (dry) {
+      core.info(`Merging #${pull_number}... (dry)`)
+      return 'Merge completed (dry)'
+    }
+
+    // Using GraphQL's enablePullRequestAutoMerge mutation instead of the REST
+    // /merge endpoint, because the latter doesn't work with Merge Queues.
+    // This mutation works both with and without Merge Queues.
+    // It doesn't work when there are no required status checks for the target branch.
+    // All development branches have these enabled, so this is a non-issue.
+    try {
+      await github.graphql(
+        `mutation($node_id: ID!, $sha: GitObjectID) {
+          enablePullRequestAutoMerge(input: {
+            expectedHeadOid: $sha,
+            pullRequestId: $node_id
+          })
+          { clientMutationId }
+        }`,
+        { node_id: pull_request.node_id, sha: latestSha },
+      )
+      return 'Enabled Auto Merge'
+    } catch (e) {
+      log('Auto Merge failed', e.response.errors[0].message)
+    }
+
+    // Auto-merge doesn't work if the target branch has already run all CI, in which
+    // case the PR must be enqueued explicitly.
+    // We now have merge queues enabled on all development branches, thus don't need a
+    // fallback after this.
+    try {
+      const resp = await github.graphql(
+        `mutation($node_id: ID!, $sha: GitObjectID) {
+          enqueuePullRequest(input: {
+            expectedHeadOid: $sha,
+            pullRequestId: $node_id
+          })
+          {
+            clientMutationId,
+            mergeQueueEntry { mergeQueue { url } }
+          }
+        }`,
+        { node_id: pull_request.node_id, sha: latestSha },
+      )
+      return `[Queued](${resp.enqueuePullRequest.mergeQueueEntry.mergeQueue.url}) for merge`
+    } catch (e) {
+      log('Enqueing failed', e.response.errors[0].message)
+      throw new Error(e.response.errors[0].message)
+    }
+  }
+
+  for (const comment of comments) {
+    log('comment', comment.node_id)
+
+    async function react(reaction) {
+      if (dry) {
+        core.info(`Reaction ${reaction} on ${comment.node_id} (dry)`)
+        return
+      }
+
+      await handleMergeComment({
+        github,
+        body: comment.body,
+        node_id: comment.node_id,
+        reaction,
+      })
+    }
+
+    async function isMaintainer(username) {
+      try {
+        return (
+          (
+            await github.rest.teams.getMembershipForUserInOrg({
+              org: context.repo.owner,
+              team_slug: 'nixpkgs-maintainers',
+              username,
+            })
+          ).data.state === 'active'
+        )
+      } catch (e) {
+        if (e.status === 404) return false
+        else throw e
+      }
+    }
+
+    const canUseMergeBot = await isMaintainer(comment.user.login)
+    const isEligible = eligible.has(comment.user.id)
+    const canMerge = result && canUseMergeBot && isEligible
+
+    const body = [
+      `<!-- comment: ${comment.node_id} -->`,
+      '',
+      'Requirements to merge this PR:',
+      ...Object.entries(checklist).map(
+        ([msg, res]) => `- :${res ? 'white_check_mark' : 'x'}: ${msg}`,
+      ),
+      `- :${canUseMergeBot ? 'white_check_mark' : 'x'}: ${comment.user.login} can use the merge bot.`,
+      `- :${isEligible ? 'white_check_mark' : 'x'}: ${comment.user.login} is eligible to merge changes to the touched packages.`,
+      '',
+    ]
+
+    if (canMerge) {
+      await react('ROCKET')
+      try {
+        body.push(`:heavy_check_mark: ${await merge()} (#306934)`)
+      } catch (e) {
+        body.push(`:x: Merge failed with: ${e} (#371492)`)
+      }
+    } else {
+      await react('THUMBS_DOWN')
+      body.push(':x: Pull Request could not be merged (#305350)')
+    }
+
+    if (dry) {
+      core.info(body.join('\n'))
+    } else {
+      await github.rest.issues.createComment({
+        ...context.repo,
+        issue_number: pull_number,
+        body: body.join('\n'),
+      })
+    }
+
+    if (canMerge) break
+  }
+}
+
+module.exports = {
+  handleMerge,
+  handleMergeComment,
+}

From 89ace76ff11eebb7b0ab167df5b7b35f6b9629ae Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 12 Oct 2025 14:41:05 +0200
Subject: [PATCH 4651/6226] workflows/bot: retry failed merges

By not keeping the node_id in the comments resulting from a failed
merge, these merges will be automatically retried.
---
 ci/github-script/merge.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index b08e2b4e2fdc..3c7576d659bb 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -230,6 +230,8 @@ async function handleMerge({
       try {
         body.push(`:heavy_check_mark: ${await merge()} (#306934)`)
       } catch (e) {
+        // Remove the HTML comment with node_id reference to allow retrying this merge on the next run.
+        body.shift()
         body.push(`:x: Merge failed with: ${e} (#371492)`)
       }
     } else {

From 28d9cf4c1e00b6c6feabfbb23b928af30e07c593 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 14:57:49 +0000
Subject: [PATCH 4652/6226] artisan: 3.2.0 -> 3.4.0

---
 pkgs/by-name/ar/artisan/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ar/artisan/package.nix b/pkgs/by-name/ar/artisan/package.nix
index a0366a98acb4..e4a7a3925245 100644
--- a/pkgs/by-name/ar/artisan/package.nix
+++ b/pkgs/by-name/ar/artisan/package.nix
@@ -6,11 +6,11 @@
 }:
 let
   pname = "artisan";
-  version = "3.2.0";
+  version = "3.4.0";
 
   src = fetchurl {
     url = "https://github.com/artisan-roaster-scope/artisan/releases/download/v${version}/${pname}-linux-${version}.AppImage";
-    hash = "sha256-p8M9Z0z/0unJPOLXVOnN8INO4v0D5Ojjug42xT77oqQ=";
+    hash = "sha256-aAxFfghEf+MRDZBd0FD5OphOOVhz3Nt2wUOmhrwXGh4=";
   };
 
   appimageContents = appimageTools.extract {

From 39cc4c64e8fb7c2318aaf86aa36df7d90777c5db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 15:10:44 +0000
Subject: [PATCH 4653/6226] python3Packages.azure-storage-file-share: 12.23.0
 -> 12.23.1

---
 .../python-modules/azure-storage-file-share/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-storage-file-share/default.nix b/pkgs/development/python-modules/azure-storage-file-share/default.nix
index 6edd4835ab7a..35bd0337e11d 100644
--- a/pkgs/development/python-modules/azure-storage-file-share/default.nix
+++ b/pkgs/development/python-modules/azure-storage-file-share/default.nix
@@ -11,13 +11,13 @@
 
 buildPythonPackage rec {
   pname = "azure-storage-file-share";
-  version = "12.23.0";
+  version = "12.23.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "azure_storage_file_share";
     inherit version;
-    hash = "sha256-Zw8npEEA7GwI3V5LuY/Kp7Zh93mYKO3FI6KNbtVrn2Y=";
+    hash = "sha256-naU7VvgJD8U9kz7OWp+yRwEMO0p1/5CKlI4kje+yH64=";
   };
 
   build-system = [ setuptools ];

From e8bd73ba48399fb1c97596244ca189996bb3a389 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 15:17:44 +0000
Subject: [PATCH 4654/6226] precious: 0.10.0 -> 0.10.1

---
 pkgs/by-name/pr/precious/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/precious/package.nix b/pkgs/by-name/pr/precious/package.nix
index b59055913bbe..b97cab9b3ce5 100644
--- a/pkgs/by-name/pr/precious/package.nix
+++ b/pkgs/by-name/pr/precious/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "precious";
-  version = "0.10.0";
+  version = "0.10.1";
 
   src = fetchFromGitHub {
     owner = "houseabsolute";
     repo = "precious";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bHrn78wzdkxV92Lp3MzNUpSvMTyc8l3tw+z5NBxJPoA=";
+    hash = "sha256-xM4NqcT1NGR3tkLOPt59lfFpjRnohU+tTTk9Ijkf97o=";
   };
 
-  cargoHash = "sha256-OA1C98C0BHEVl056UCL5alT292djuBDGFjZn2HAytEQ=";
+  cargoHash = "sha256-tp0kvG5G7mW0czfZ43AbT7Lcv1sMnO5Zc+t2d5w4aqA=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;

From 9bb32eb3d8fcd57651e070d7eb717ba48de0c380 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 15:21:32 +0000
Subject: [PATCH 4655/6226] python3Packages.azure-mgmt-storage: 23.1.0 ->
 24.0.0

---
 .../development/python-modules/azure-mgmt-storage/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
index 0176d99e4bf2..5c430ada7a18 100644
--- a/pkgs/development/python-modules/azure-mgmt-storage/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-storage/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-storage";
-  version = "23.1.0";
+  version = "24.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "azure_mgmt_storage";
     inherit version;
-    hash = "sha256-K92SL5DJL4+QHnMtNGPZDO5mF8f3leDLRyROzQrpiyA=";
+    hash = "sha256-sa4iXvh62oXynALkBhQKtYlShcpk3ivP5QtjHEgYozc=";
   };
 
   build-system = [ setuptools ];

From 9efc113722a4b59a21a64a096d598708e0f3bac3 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Mon, 20 Oct 2025 03:35:56 +0200
Subject: [PATCH 4656/6226] jack-link: init at 0.2.4

---
 pkgs/by-name/ja/jack-link/package.nix | 40 +++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 pkgs/by-name/ja/jack-link/package.nix

diff --git a/pkgs/by-name/ja/jack-link/package.nix b/pkgs/by-name/ja/jack-link/package.nix
new file mode 100644
index 000000000000..7a5bae52f8a4
--- /dev/null
+++ b/pkgs/by-name/ja/jack-link/package.nix
@@ -0,0 +1,40 @@
+{
+  stdenv,
+  lib,
+  fetchFromGitHub,
+  unstableGitUpdater,
+  pkg-config,
+  libjack2,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "jack-link";
+  version = "0.2.4";
+
+  src = fetchFromGitHub {
+    owner = "rncbc";
+    repo = "jack_link";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-bIB3lxKKaI8DLtmnkRTTHXDopCZ3FAv15cAYcyJcBYA=";
+    fetchSubmodules = true;
+  };
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    libjack2
+  ];
+
+  makeFlags = [ "PREFIX=$(out)" ];
+
+  meta = {
+    homepage = "https://github.com/rncbc/jack_link";
+    description = "jack_link bridges JACK transport with Ableton Link";
+    license = lib.licenses.gpl2Plus;
+    mainProgram = "jack_link";
+    maintainers = with lib.maintainers; [ magnetophon ];
+    platforms = lib.platforms.linux;
+  };
+})

From a5296ec9d5d24f19511ca96a13461cff5a6ff212 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 1 Nov 2025 16:29:27 +0100
Subject: [PATCH 4657/6226] workflows/bot: request read permissions for members

The nixpkgs-ci token used in CI doesn't have permissions to read the
member list of the nixpkgs-committers team, yet. Let's request this
permission and see whether that fixes the errors we get so far.
---
 .github/workflows/bot.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
index cb1df7bdb0a1..8e37cf2aabc9 100644
--- a/.github/workflows/bot.yml
+++ b/.github/workflows/bot.yml
@@ -60,8 +60,10 @@ jobs:
         with:
           app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
           private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
+          permission-administration: read
           permission-contents: write
           permission-issues: write
+          permission-members: read
           permission-pull-requests: write
 
       - name: Log current API rate limits

From be2c4421ef0f1854de9b6e9ce3f28a412da38124 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 15:37:58 +0000
Subject: [PATCH 4658/6226] wine-staging: 10.17 -> 10.18

---
 pkgs/applications/emulators/wine/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix
index 2b73648a294b..44eaf9aed9b5 100644
--- a/pkgs/applications/emulators/wine/sources.nix
+++ b/pkgs/applications/emulators/wine/sources.nix
@@ -133,9 +133,9 @@ rec {
 
   unstable = fetchurl rec {
     # NOTE: Don't forget to change the hash for staging as well.
-    version = "10.17";
+    version = "10.18";
     url = "https://dl.winehq.org/wine/source/10.x/wine-${version}.tar.xz";
-    hash = "sha256-u/jn3jLOqf4wU2HUr4XjBJIlTEvwIDnuJtrHpmcBtOY=";
+    hash = "sha256-Uftyc9ZdCd6gMsSl4hl7EnJLJ8o2DhpiKyNz0e5QrXs=";
 
     patches = [
       # Also look for root certificates at $NIX_SSL_CERT_FILE
@@ -145,7 +145,7 @@ rec {
     # see https://gitlab.winehq.org/wine/wine-staging
     staging = fetchFromGitLab {
       inherit version;
-      hash = "sha256-fTEzj3o7A9H9jIh3yhw8SCfNsnVeJ6pyL3jERqhVbr8=";
+      hash = "sha256-vhIjeEbWLpcKtkBd/KeAeaLKOUZt7LAkH6GTebs3ROM=";
       domain = "gitlab.winehq.org";
       owner = "wine";
       repo = "wine-staging";

From 93c6bd84af86dbcffe20054bb226a04aa08522b7 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 1 Nov 2025 23:35:35 +0800
Subject: [PATCH 4659/6226] xdg-desktop-portal-xapp: Fix missing xapp schema

This is especially a problem on non-Cinnamon desktops (we have xapp
in cinnamon-gsettings-overrides packaging).
---
 pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
index bcb6d2d44c48..93cdd25fe14f 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-xapp/package.nix
@@ -11,8 +11,8 @@
   gtk3,
   gsettings-desktop-schemas,
   mate,
-  xdg-desktop-portal,
   xapp,
+  xdg-desktop-portal,
 }:
 
 stdenv.mkDerivation rec {
@@ -39,6 +39,7 @@ stdenv.mkDerivation rec {
     gtk3
     gsettings-desktop-schemas # org.gnome.system.location
     mate.mate-desktop # org.mate.background
+    xapp # org.x.apps.portal
     xdg-desktop-portal
   ];
 

From 5ad608b2b7c861c8c5eb42c81343a9e8bc879b0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 15:40:23 +0000
Subject: [PATCH 4660/6226] grafanaPlugins.marcusolsson-dynamictext-panel:
 6.0.0 -> 6.2.0

---
 .../plugins/marcusolsson-dynamictext-panel/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix
index 579088e408eb..8dea64d08d3d 100644
--- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-dynamictext-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "marcusolsson-dynamictext-panel";
-  version = "6.0.0";
-  zipHash = "sha256-OfQWEwEu+c0DvuACddBM5wjXZWxr6D3QP/N4KUQfQ+k=";
+  version = "6.2.0";
+  zipHash = "sha256-pxTmylBvI73csDM6rMoUjGN9EM5zR/PfH1ZE1XKW94c=";
   meta = with lib; {
     description = "Dynamic, data-driven text panel for Grafana";
     license = licenses.asl20;

From 020f1420f3c455d9e15727c22392cedbc85cdb55 Mon Sep 17 00:00:00 2001
From: Emi Katagiri-Simpson <emi@alchemi.dev>
Date: Sat, 1 Nov 2025 11:41:25 -0400
Subject: [PATCH 4661/6226] maintainers: add alch-emi

---
 maintainers/maintainer-list.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3197d3c90b29..a2c6edf7c75f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -1069,6 +1069,13 @@
       }
     ];
   };
+  alch-emi = {
+    email = "emi@alchemi.dev";
+    github = "Alch-Emi";
+    githubId = 38897201;
+    name = "Emi";
+    matrix = "@emi:the-apothecary.club";
+  };
   aldenparker = {
     github = "aldenparker";
     githubId = 32986873;

From 7cf8504f793408cf76fafe5638f6db1bf6fa2435 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 1 Nov 2025 23:46:42 +0800
Subject: [PATCH 4662/6226] xapp: Wrap xapp-sn-watcher

This is an executable.
---
 pkgs/by-name/xa/xapp/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/xa/xapp/package.nix b/pkgs/by-name/xa/xapp/package.nix
index 5fffab2ae0a8..b0453410b136 100644
--- a/pkgs/by-name/xa/xapp/package.nix
+++ b/pkgs/by-name/xa/xapp/package.nix
@@ -96,6 +96,10 @@ stdenv.mkDerivation rec {
   # Fix gtk3 module target dir. Proper upstream solution should be using define_variable.
   env.PKG_CONFIG_GTK__3_0_LIBDIR = "${placeholder "out"}/lib";
 
+  preFixup = ''
+    wrapGApp $out/lib/xapps/xapp-sn-watcher
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/linuxmint/xapp";
     description = "Cross-desktop libraries and common resources";

From 1cd12cc17e8333b8eeec34a3ba479691ffa34294 Mon Sep 17 00:00:00 2001
From: diamond-deluxe <112557036+diamond-deluxe@users.noreply.github.com>
Date: Sun, 26 Oct 2025 14:48:59 +0000
Subject: [PATCH 4663/6226] yafc-ce: 2.14.0 -> 2.16.0

Release: https://github.com/shpaass/yafc-ce/releases/tag/v2.16.0
---
 pkgs/by-name/ya/yafc-ce/deps.json   | 25 +++++++++++++++++++++++++
 pkgs/by-name/ya/yafc-ce/package.nix |  6 +++---
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yafc-ce/deps.json b/pkgs/by-name/ya/yafc-ce/deps.json
index e3e3d046b6da..b408392da3a5 100644
--- a/pkgs/by-name/ya/yafc-ce/deps.json
+++ b/pkgs/by-name/ya/yafc-ce/deps.json
@@ -34,6 +34,21 @@
     "version": "3.26.1",
     "hash": "sha256-1tHxDuJwwvJWZ3H9ooPFAKuaJIthSdTDlmjHlxH/euc="
   },
+  {
+    "pname": "Microsoft.CodeAnalysis.Analyzers",
+    "version": "3.11.0",
+    "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Common",
+    "version": "4.14.0",
+    "hash": "sha256-ne/zxH3GqoGB4OemnE8oJElG5mai+/67ASaKqwmL2BE="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.CSharp",
+    "version": "4.14.0",
+    "hash": "sha256-5Mzj3XkYYLkwDWh17r1NEXSbXwwWYQPiOmkSMlgo1JY="
+  },
   {
     "pname": "Microsoft.CodeCoverage",
     "version": "17.11.1",
@@ -94,11 +109,21 @@
     "version": "6.0.0",
     "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="
   },
+  {
+    "pname": "System.Collections.Immutable",
+    "version": "9.0.0",
+    "hash": "sha256-+6q5VMeoc5bm4WFsoV6nBXA9dV5pa/O4yW+gOdi8yac="
+  },
   {
     "pname": "System.Reflection.Metadata",
     "version": "1.6.0",
     "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
   },
+  {
+    "pname": "System.Reflection.Metadata",
+    "version": "9.0.0",
+    "hash": "sha256-avEWbcCh7XgpsSesnR3/SgxWi/6C5OxjR89Jf/SfRjQ="
+  },
   {
     "pname": "xunit",
     "version": "2.9.2",
diff --git a/pkgs/by-name/ya/yafc-ce/package.nix b/pkgs/by-name/ya/yafc-ce/package.nix
index 39a2b714a961..d2099636373b 100644
--- a/pkgs/by-name/ya/yafc-ce/package.nix
+++ b/pkgs/by-name/ya/yafc-ce/package.nix
@@ -12,13 +12,13 @@ let
 in
 buildDotnetModule (finalAttrs: {
   pname = "yafc-ce";
-  version = "2.14.0";
+  version = "2.16.0";
 
   src = fetchFromGitHub {
     owner = "shpaass";
     repo = "yafc-ce";
-    rev = finalAttrs.version;
-    hash = "sha256-EbVPPSci4AziF+n/8pIa9M44WEUj+vvEOQqu3HJ6aNQ=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-6+GGxEwn3tenmcukOZPTIZ7UZg/d9uudQP0qwU8mifY=";
   };
 
   projectFile = [

From 89b593f046bf5b15d735407403f19ddf0ef697b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 15:52:28 +0000
Subject: [PATCH 4664/6226] python3Packages.plumbum: 1.9.0 -> 1.10.0

---
 pkgs/development/python-modules/plumbum/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix
index fdd6b39f655c..64750378f233 100644
--- a/pkgs/development/python-modules/plumbum/default.nix
+++ b/pkgs/development/python-modules/plumbum/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "plumbum";
-  version = "1.9.0";
+  version = "1.10.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "tomerfiliba";
     repo = "plumbum";
     tag = "v${version}";
-    hash = "sha256-3PAvSjZ0+BMq+/g4qNNZl27KnAm01fWFYxBBY+feNTU=";
+    hash = "sha256-ca9avbBJnMecuKljIrx3mYIGA50QXmhC/LP3hM9Uvcs=";
   };
 
   build-system = [

From 00e7b934fb10ba7a3f57481586da52cc712317df Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 12 Oct 2025 13:40:49 +0200
Subject: [PATCH 4665/6226] workflows/bot: set "merge-bot eligible" label

This makes it more visible which PRs are merge-bot eligible, by setting
a label respectively.
---
 ci/github-script/bot.js   | 3 ++-
 ci/github-script/merge.js | 4 ++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index e0a67a747c82..a40b3b227957 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -112,7 +112,7 @@ module.exports = async ({ github, context, core, dry }) => {
 
     const maintainers = await getMaintainerMap(pull_request.base.ref)
 
-    await handleMerge({
+    const merge_bot_eligible = await handleMerge({
       github,
       context,
       core,
@@ -199,6 +199,7 @@ module.exports = async ({ github, context, core, dry }) => {
       // The second pass will then read the result from the first pass and set the label.
       '2.status: merge conflict':
         merge_commit_sha_valid && !pull_request.merge_commit_sha,
+      '2.status: merge-bot eligible': merge_bot_eligible,
       '12.approvals: 1': approvals.size === 1,
       '12.approvals: 2': approvals.size === 2,
       '12.approvals: 3+': approvals.size >= 3,
diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index 3c7576d659bb..0cb65a11ae97 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -251,6 +251,10 @@ async function handleMerge({
 
     if (canMerge) break
   }
+
+  // Returns a boolean, which indicates whether the PR is merge-bot eligible in principle.
+  // This is used to set the respective label in bot.js.
+  return result
 }
 
 module.exports = {

From 5ae966b9dcdf07cd5ac4534edcab2a1b67596b17 Mon Sep 17 00:00:00 2001
From: Heitor Augusto <44377258+HeitorAugustoLN@users.noreply.github.com>
Date: Wed, 29 Oct 2025 13:07:25 -0300
Subject: [PATCH 4666/6226] libcosmicAppHook: include only fallback themes from
 settings

---
 pkgs/by-name/li/libcosmicAppHook/package.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libcosmicAppHook/package.nix b/pkgs/by-name/li/libcosmicAppHook/package.nix
index f4bc7bd4f34f..f3042e13ac8e 100644
--- a/pkgs/by-name/li/libcosmicAppHook/package.nix
+++ b/pkgs/by-name/li/libcosmicAppHook/package.nix
@@ -7,6 +7,7 @@
   lib,
   stdenv,
   makeSetupHook,
+  runCommand,
   makeBinaryWrapper,
   pkg-config,
   targetPackages,
@@ -44,8 +45,16 @@ makeSetupHook {
     ];
 
   substitutions = {
-    fallbackXdgDirs = "${lib.optionalString includeSettings "${targetPackages.cosmic-settings}/share:"}${targetPackages.cosmic-icons}/share";
-
+    fallbackXdgDirs =
+      let
+        fallbackThemes = runCommand "cosmic-fallback-themes" { } ''
+          mkdir -p $out/share
+          ln -s ${targetPackages.cosmic-settings}/share/cosmic $out/share/cosmic
+        '';
+      in
+      lib.makeSearchPath "share" (
+        lib.optionals includeSettings [ fallbackThemes ] ++ [ targetPackages.cosmic-icons ]
+      );
     cargoLinkerVar = targetPackages.stdenv.hostPlatform.rust.cargoEnvVarTarget;
     # force linking for all libraries that may be dlopen'd by libcosmic/iced apps
     cargoLinkLibs = lib.escapeShellArgs (

From 8a16eae65f4e7dda17d6b7c9ce566c7b5263e245 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 16:54:49 +0000
Subject: [PATCH 4667/6226] terragrunt: 0.91.5 -> 0.93.0

---
 pkgs/by-name/te/terragrunt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/terragrunt/package.nix b/pkgs/by-name/te/terragrunt/package.nix
index 09fa59d731d2..304ce55bbca0 100644
--- a/pkgs/by-name/te/terragrunt/package.nix
+++ b/pkgs/by-name/te/terragrunt/package.nix
@@ -7,13 +7,13 @@
 }:
 buildGo125Module (finalAttrs: {
   pname = "terragrunt";
-  version = "0.91.5";
+  version = "0.93.0";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = "terragrunt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/XvqS3lTeoSuqF5NDcXmh2H60AOXn15jETKMUSaJx1w=";
+    hash = "sha256-wi5Ff2wYPMgMMHZAJlq1v/UHjnRyNFbAy3IUYA+T5yI=";
   };
 
   nativeBuildInputs = [
@@ -25,7 +25,7 @@ buildGo125Module (finalAttrs: {
     make generate-mocks
   '';
 
-  vendorHash = "sha256-iMzoee3MkOgU0Or0F+FVxNs1g5+306W4vC5wOh61mzw=";
+  vendorHash = "sha256-GLdUM5vlLO6B8ZCGiBAz5L32Wzr9eeYZxPtUc9MkjhE=";
 
   doCheck = false;
 

From 5dce07242bb3171999341796ca906b628585f29d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9-Paul=20D=2E?=
 <44802527+godelized@users.noreply.github.com>
Date: Fri, 31 Oct 2025 18:36:13 +0100
Subject: [PATCH 4668/6226] nixos/anubis: warn about legacy runtime directory
 when necessary

---
 nixos/modules/services/networking/anubis.nix | 31 +++++++++-----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/nixos/modules/services/networking/anubis.nix b/nixos/modules/services/networking/anubis.nix
index cb1ca0ee293e..fefc7001677d 100644
--- a/nixos/modules/services/networking/anubis.nix
+++ b/nixos/modules/services/networking/anubis.nix
@@ -25,14 +25,14 @@ let
   instanceUsesDedicatedRuntimeDirectory =
     name: instance:
     lib.any (lib.hasPrefix (runtimeDirectoryPrefix name)) (unixSocketAddrs instance.settings);
-  useDedicatedRuntimeDirectory =
+  useLegacyRuntimeDirectory =
     # Set when:
-    # - Multiple instances are configured to use unix sockets.
-    # - At least one instance uses the new runtime directory prefix: /run/anubis/anubis-<instance name>.
-    lib.count instanceUsesUnixSockets (lib.attrValues enabledInstances) > 1
-    || lib.any (attrs: instanceUsesDedicatedRuntimeDirectory attrs.name attrs.value) (
+    # - Only one instance is configured with unix sockets.
+    # - No instance uses the new runtime directory prefix: /run/anubis/anubis-<name>.
+    lib.count instanceUsesUnixSockets (lib.attrValues enabledInstances) == 1
+    && !(lib.any (attrs: instanceUsesDedicatedRuntimeDirectory attrs.name attrs.value) (
       lib.attrsToList enabledInstances
-    );
+    ));
 
   commonSubmodule =
     isDefault:
@@ -207,7 +207,7 @@ let
         default = "/run/anubis/${instanceName name}.sock";
         description = ''
           The address that Anubis listens to. See Go's [`net.Listen`](https://pkg.go.dev/net#Listen) for syntax.
-          Use the prefix ${runtimeDirectoryPrefix "<instance name>"} when configuring multiple instances.
+          Use the prefix "${runtimeDirectoryPrefix "<name>"}". The prefix "/run/anubis" is deprecated.
 
           Defaults to Unix domain sockets. To use TCP sockets, set this to a TCP address and `BIND_NETWORK` to `"tcp"`.
         '';
@@ -219,7 +219,7 @@ let
         description = ''
           The address Anubis' metrics server listens to. See Go's [`net.Listen`](https://pkg.go.dev/net#Listen) for
           syntax.
-          Use the prefix ${runtimeDirectoryPrefix "<instance name>"} when configuring multiple instances.
+          Use the prefix "${runtimeDirectoryPrefix "<name>"}". The prefix "/run/anubis" is deprecated.
 
           The metrics server is enabled by default and may be disabled. However, due to implementation details, this is
           only possible by setting a command line flag. See {option}`services.anubis.defaultOptions.extraFlags` for an
@@ -269,9 +269,7 @@ in
   };
 
   config = lib.mkIf (enabledInstances != { }) {
-    warnings = [
-      "RuntimeDirectory is going to be migrated from `anubis` to `anubis/anubis-<instance name>`, update BIND and METRICS_BIND to ${runtimeDirectoryPrefix "<instance name>"} if using unix sockets"
-    ];
+    warnings = lib.optional useLegacyRuntimeDirectory ''Anubis service: runtime directory is going to be migrated from "anubis" to "anubis/anubis-<name>". Update services.anubis.instances.<name>.BIND to "${runtimeDirectoryPrefix "<name>"}anubis.sock" and services.anubis.instances.<name>.METRICS_BIND to "${runtimeDirectoryPrefix "<name>"}anubis-metrics.sock". Note: if <name> is "", use the prefix "/run/anubis/anubis".'';
 
     assertions =
       let
@@ -282,9 +280,9 @@ in
       [
         {
           assertion =
-            !useDedicatedRuntimeDirectory
+            useLegacyRuntimeDirectory
             || lib.all validInstanceUnixSocketAddrs (lib.attrsToList enabledInstances);
-          message = "use the prefix ${runtimeDirectoryPrefix "<instance name>"} in BIND and METRICS_BIND when configuring multiple instances";
+          message = ''use the prefix "${runtimeDirectoryPrefix "<name>"}" in services.anubis.instances.<name>.BIND and services.anubis.instances.<name>.METRICS_BIND'';
         }
       ];
 
@@ -331,12 +329,11 @@ in
             (lib.singleton (lib.getExe cfg.package)) ++ instance.extraFlags
           );
           RuntimeDirectory =
-            if useDedicatedRuntimeDirectory then
-              "anubis/${instanceName name}"
-            else if instanceUsesUnixSockets instance then
-              # `dedicatedRuntimeDirectory = false`: /run/anubis may still be used.
+            if useLegacyRuntimeDirectory && instanceUsesUnixSockets instance then
               # Warning: `anubis` will be deprecated eventually.
               "anubis"
+            else if instanceUsesUnixSockets instance then
+              "anubis/${instanceName name}"
             else
               null;
           # hardening

From 3a6cce61c9602a101c9eea95267d1548ed592cde Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 17:16:04 +0000
Subject: [PATCH 4669/6226] faugus-launcher: 1.9.6 -> 1.9.9

---
 pkgs/by-name/fa/faugus-launcher/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fa/faugus-launcher/package.nix b/pkgs/by-name/fa/faugus-launcher/package.nix
index 90c77d359724..60a97b2d1c24 100644
--- a/pkgs/by-name/fa/faugus-launcher/package.nix
+++ b/pkgs/by-name/fa/faugus-launcher/package.nix
@@ -18,14 +18,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "faugus-launcher";
-  version = "1.9.6";
+  version = "1.9.9";
   pyproject = false;
 
   src = fetchFromGitHub {
     owner = "Faugus";
     repo = "faugus-launcher";
     tag = version;
-    hash = "sha256-7brHeRwrH6MbRcGCb5qufU1PHLgg5fCfgLhvdCQr+ak=";
+    hash = "sha256-4ySI6j74DmeHAKtIYuAp+dnmyz9/gc6cQomcfP6V5IM=";
   };
 
   nativeBuildInputs = [

From 37778c6666756eb2f00f92a900aad52fa1f78dbd Mon Sep 17 00:00:00 2001
From: Gerg-L <GregLeyda@proton.me>
Date: Sat, 1 Nov 2025 13:20:33 -0400
Subject: [PATCH 4670/6226] nixos/searx: correct redis/valkey rename error

---
 nixos/modules/services/networking/searx.nix | 30 +++++++++++++++------
 1 file changed, 22 insertions(+), 8 deletions(-)

diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix
index e64bf6a9e792..8603084f0658 100644
--- a/nixos/modules/services/networking/searx.nix
+++ b/nixos/modules/services/networking/searx.nix
@@ -13,7 +13,9 @@ let
 
   cfg = config.services.searx;
 
-  settingsFile = pkgs.writeText "settings.yml" (builtins.toJSON cfg.settings);
+  settingsFile = pkgs.writeText "settings.yml" (
+    builtins.toJSON (builtins.removeAttrs cfg.settings [ "redis" ])
+  );
 
   faviconsSettingsFile = (pkgs.formats.toml { }).generate "favicons.toml" cfg.faviconsSettings;
   limiterSettingsFile = (pkgs.formats.toml { }).generate "limiter.toml" cfg.limiterSettings;
@@ -79,12 +81,22 @@ in
       };
 
       settings = mkOption {
-        type = types.submodule {
-          freeformType = settingType;
-          imports = [
-            (mkRenamedOptionModule [ "redis" ] [ "valkey" ])
-          ];
-        };
+        type = types.submodule (
+          { config, ... }:
+          {
+            options = {
+              valkey = lib.mkOption {
+                internal = true;
+                default = { };
+              };
+            };
+            config.valkey = lib.mkIf (config ? redis) (
+              lib.warn "Obsolete option `services.searx.settings.redis' is used. It was renamed to `services.searx.settings.valkey'" config.redis
+            );
+
+            freeformType = settingType;
+          }
+        );
         default = { };
         example = literalExpression ''
           {
@@ -287,7 +299,9 @@ in
               ]
             )) "s"
           }://${cfg.domain}/";
-          valkey.url = lib.mkIf cfg.redisCreateLocally "unix://${config.services.redis.servers.searx.unixSocket}";
+          valkey = lib.mkIf cfg.redisCreateLocally {
+            url = "unix://${config.services.redis.servers.searx.unixSocket}";
+          };
         };
       };
 

From 4a940eb14af40e824f541e6e71d5906172b26708 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 1 Nov 2025 17:41:40 +0100
Subject: [PATCH 4671/6226] dia: unstable-2023-09-28 -> 0-unstable-2025-10-26

---
 pkgs/by-name/di/dia/package.nix | 99 ++++++++++++++++++++++-----------
 1 file changed, 65 insertions(+), 34 deletions(-)

diff --git a/pkgs/by-name/di/dia/package.nix b/pkgs/by-name/di/dia/package.nix
index 2f6671196bfe..296096a060c3 100644
--- a/pkgs/by-name/di/dia/package.nix
+++ b/pkgs/by-name/di/dia/package.nix
@@ -1,14 +1,16 @@
 {
   lib,
   stdenv,
-  fetchFromGitLab,
-  appstream-glib,
+  appstream,
   dblatex,
   desktop-file-utils,
+  docbook-xsl-nons,
+  docbook_xml_dtd_45,
+  fetchFromGitLab,
+  gdk-pixbuf,
   graphene,
-  gtk3,
   gtk-mac-integration-gtk3,
-  intltool,
+  gtk3,
   libxml2,
   libxslt,
   meson,
@@ -17,62 +19,91 @@
   poppler,
   python3,
   wrapGAppsHook3,
-  # Building with docs are still failing in unstable-2023-09-28
-  withDocs ? false,
 }:
 
+let
+  xpm-pixbuf = stdenv.mkDerivation {
+    pname = "xpm-pixbuf";
+    version = "0-unstable-2024-05-24";
+
+    src = fetchFromGitLab {
+      domain = "gitlab.gnome.org";
+      owner = "ZanderBrown";
+      repo = "xpm-pixbuf";
+      rev = "d290a0c846687b22d2a8c5aaec83a6689f30e1c3";
+      hash = "sha256-LU6nKe7IIecF/3wwhlwR1hyABBvfwvujVW5zJJSzkqo=";
+    };
+
+    nativeBuildInputs = [
+      meson
+      ninja
+      pkg-config
+    ];
+
+    buildInputs = [ gdk-pixbuf ];
+
+    meta = {
+      license = lib.licenses.lgpl21;
+      homepage = "https://gitlab.gnome.org/ZanderBrown/xpm-pixbuf";
+    };
+  };
+in
 stdenv.mkDerivation {
   pname = "dia";
-  version = "unstable-2023-09-28";
+  version = "unstable-2025-10-26";
 
   src = fetchFromGitLab {
+    domain = "gitlab.gnome.org";
     owner = "GNOME";
     repo = "dia";
-    domain = "gitlab.gnome.org";
-    rev = "bd551bb2558dcc89bc0bf7b4dd85b38cd85ad322";
-    hash = "sha256-U+8TUE1ULt6MNxnvw9kFjCAVBecUy2Sarof6H9+kR7Q=";
+    rev = "efdf829e8afdbbeb371820932769e35415ebe886";
+    hash = "sha256-VFFU5iJnVJdZ2tkNszZ2ooBD+GiCL6MqanzpEWIJerk=";
   };
 
-  # Required for the PDF plugin
-  CXXFLAGS = "-std=c++20";
-
-  preConfigure = ''
-    patchShebangs .
+  postPatch = ''
+    # Fix build with poppler 25.10.0
+    substituteInPlace plug-ins/pdf/pdf-import.cpp \
+      --replace-fail 's->getLength();' 's->size();'
   '';
 
+  strictDeps = true;
+
+  dontUseCmakeConfigure = true;
+
+  nativeBuildInputs = [
+    appstream
+    dblatex
+    dblatex.tex
+    desktop-file-utils
+    docbook-xsl-nons
+    docbook_xml_dtd_45
+    libxml2 # xmllint
+    libxslt
+    meson
+    ninja
+    pkg-config
+    wrapGAppsHook3
+  ];
+
   buildInputs = [
     graphene
     gtk3
-    (libxml2.override { zlibSupport = true; })
+    libxml2
+    libxslt
     python3
     poppler
-  ]
-  ++ lib.optionals withDocs [
-    libxslt
+    xpm-pixbuf
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     gtk-mac-integration-gtk3
   ];
 
-  nativeBuildInputs = [
-    appstream-glib
-    desktop-file-utils
-    intltool
-    meson
-    ninja
-    pkg-config
-    wrapGAppsHook3
-  ]
-  ++ lib.optionals withDocs [
-    dblatex
-  ];
-
   meta = with lib; {
     description = "Gnome Diagram drawing software";
     mainProgram = "dia";
-    homepage = "http://live.gnome.org/Dia";
+    homepage = "https://wiki.gnome.org/Apps/Dia";
     maintainers = with maintainers; [ raskin ];
-    license = licenses.gpl2;
+    license = licenses.gpl2Plus;
     platforms = platforms.unix;
   };
 }

From 8cd6da015178c5f25f2317c17cf655c81284dbf6 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 1 Nov 2025 10:28:01 -0700
Subject: [PATCH 4672/6226] python3Packages.psycopg: disable flaky test

---
 pkgs/development/python-modules/psycopg/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/psycopg/default.nix b/pkgs/development/python-modules/psycopg/default.nix
index c360a08e7791..b6558b5ff693 100644
--- a/pkgs/development/python-modules/psycopg/default.nix
+++ b/pkgs/development/python-modules/psycopg/default.nix
@@ -199,6 +199,8 @@ buildPythonPackage rec {
     "test_connect_error_multi_hosts_each_message_preserved"
     # Flaky, fails intermittently
     "test_break_attempts"
+    # ConnectionResetError: [Errno 104] Connection reset by peer
+    "test_wait_r"
   ];
 
   disabledTestPaths = [

From 17930fbc80605cbfe55285ef612133270f8491c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 10:34:04 -0700
Subject: [PATCH 4673/6226] libdeltachat: 2.22.0 -> 2.23.0

Diff: https://github.com/chatmail/core/compare/v2.22.0...v2.23.0

Changelog: https://github.com/chatmail/core/blob/v2.23.0/CHANGELOG.md
---
 pkgs/by-name/li/libdeltachat/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix
index b9ccd2ce6043..129725fca9a6 100644
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdeltachat";
-  version = "2.22.0";
+  version = "2.23.0";
 
   src = fetchFromGitHub {
     owner = "chatmail";
     repo = "core";
     tag = "v${version}";
-    hash = "sha256-DKqqdcG3C7/RF/wz2SqaiPUjZ/7vMFJTR5DIGTXjoTY=";
+    hash = "sha256-abSLSXD1bZ4Md2cs9pm7wlielLQicyl+/11TeShIsYI=";
   };
 
   patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   cargoDeps = rustPlatform.fetchCargoVendor {
     pname = "chatmail-core";
     inherit version src;
-    hash = "sha256-x71vytk9ytIhHlRR0lDhDcIaDNJGDdPwb6fkB1SI+NQ=";
+    hash = "sha256-dLcJV2WUwQJ1YdfqrsGp3nkMyilDhmtYA304jeSjxVQ=";
   };
 
   nativeBuildInputs = [

From efa1a8f4f59ceefb266971ce3f06338283cbdbc7 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sat, 1 Nov 2025 18:48:54 +0100
Subject: [PATCH 4674/6226] php84: 8.4.13 -> 8.4.14

ChangeLog: https://www.php.net/ChangeLog-8.php#8.4.14
---
 pkgs/development/interpreters/php/8.4.nix |  4 ++--
 pkgs/top-level/php-packages.nix           | 29 ++++++++---------------
 2 files changed, 12 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/interpreters/php/8.4.nix b/pkgs/development/interpreters/php/8.4.nix
index 87784a47966a..bc43493b9d1a 100644
--- a/pkgs/development/interpreters/php/8.4.nix
+++ b/pkgs/development/interpreters/php/8.4.nix
@@ -4,8 +4,8 @@ let
   base = callPackage ./generic.nix (
     _args
     // {
-      version = "8.4.13";
-      hash = "sha256-hRgd3Kez4D8UhSGwQ71iQRlQ1GjGZ9tkAEefGxCBIZQ=";
+      version = "8.4.14";
+      hash = "sha256-8hOc5Mt6bFZD7pjKo05cMrqEHCuik+NKPQNX+qhLs+c=";
     }
   );
 in
diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix
index fd753977bf87..5a2781659262 100644
--- a/pkgs/top-level/php-packages.nix
+++ b/pkgs/top-level/php-packages.nix
@@ -447,25 +447,16 @@ lib.makeScope pkgs.newScope (
               configureFlags = [
                 "--enable-dom"
               ];
-              patches =
-                lib.optionals (lib.versionAtLeast php.version "8.4") [
-                  # Fix build of ext-dom.
-                  # https://github.com/php/php-src/pull/20023 (will be part of 8.4.14)
-                  (fetchpatch {
-                    url = "https://github.com/php/php-src/commit/4fe040290da2822c70d3b60d30a2c1256264735d.patch";
-                    hash = "sha256-hCs59X5gCApXMjU9dKEtgdTJBHYq3BcKr9tlQjRCTIA=";
-                  })
-                ]
-                ++ lib.optionals (lib.versionOlder php.version "8.3") [
-                  # Fix gh10234 test with libxml 2.15.0
-                  (fetchpatch {
-                    url = "https://github.com/php/php-src/commit/d6e70e705323a50b616ffee9402245ab97de3e4e.patch";
-                    hash = "sha256-Axu09l3uQ83qe30aDsR+Bt29cJiF4mLknwDyQf94vic=";
-                    includes = [
-                      "ext/dom/tests/gh10234.phpt"
-                    ];
-                  })
-                ];
+              patches = lib.optionals (lib.versionOlder php.version "8.3") [
+                # Fix gh10234 test with libxml 2.15.0
+                (fetchpatch {
+                  url = "https://github.com/php/php-src/commit/d6e70e705323a50b616ffee9402245ab97de3e4e.patch";
+                  hash = "sha256-Axu09l3uQ83qe30aDsR+Bt29cJiF4mLknwDyQf94vic=";
+                  includes = [
+                    "ext/dom/tests/gh10234.phpt"
+                  ];
+                })
+              ];
             }
             {
               name = "enchant";

From 77a3b006cd6154ab2c3590c1d8229669e9f66265 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 1 Nov 2025 18:49:14 +0100
Subject: [PATCH 4675/6226] workflows/test: trigger on some github-scripts as
 well

Changes in these files can easily cause the Test workflow to break, so
they should be tested as well.
---
 .github/workflows/test.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index f938ea5f64b1..8c0451a54754 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -66,6 +66,9 @@ jobs:
               '.github/workflows/pull-request-target.yml',
               '.github/workflows/reviewers.yml',
               '.github/workflows/test.yml',
+              'ci/github-script/bot.js',
+              'ci/github-script/merge.js',
+              'ci/github-script/withRateLimit.js',
             ].includes(file))) core.setOutput('pr', true)
 
   merge-group:

From 421974863f031fef03690906c2897483f60eccec Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 1 Nov 2025 17:37:03 +0100
Subject: [PATCH 4676/6226] workflows/bot: avoid access teams endpoints in Test
 workflow

We have no chance of getting a token that can request the team endpoints
in the pull_request context. This makes sense, because non-members of
the org are also not allowed to view the teams' memberships.

Thus, just fake an empty team - that's fine for the Test workflow.
---
 ci/github-script/merge.js | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index 3c7576d659bb..42d350fe3f39 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -6,13 +6,21 @@ async function runChecklist({ github, context, pull_request, maintainers }) {
   const pull_number = pull_request.number
 
   if (!committers) {
-    committers = github
-      .paginate(github.rest.teams.listMembersInOrg, {
-        org: context.repo.owner,
-        team_slug: 'nixpkgs-committers',
-        per_page: 100,
-      })
-      .then((members) => new Set(members.map(({ id }) => id)))
+    if (context.eventName === 'pull_request') {
+      // We have no chance of getting a token in the pull_request context with the right
+      // permissions to access the members endpoint below. Thus, we're pretending to have
+      // no committers. This is OK; because this is only for the Test workflow, not for
+      // real use.
+      committers = new Set()
+    } else {
+      committers = github
+        .paginate(github.rest.teams.listMembersInOrg, {
+          org: context.repo.owner,
+          team_slug: 'nixpkgs-committers',
+          per_page: 100,
+        })
+        .then((members) => new Set(members.map(({ id }) => id)))
+    }
   }
 
   const files = await github.paginate(github.rest.pulls.listFiles, {

From 7c8d0180eef6c91c51d31aae28a31602bcecc7c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 20:10:13 -0700
Subject: [PATCH 4677/6226] hal-hardware-analyzer: use igraph_0

---
 pkgs/by-name/ha/hal-hardware-analyzer/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ha/hal-hardware-analyzer/package.nix b/pkgs/by-name/ha/hal-hardware-analyzer/package.nix
index 081e0b6db4e4..3e9f177e52db 100644
--- a/pkgs/by-name/ha/hal-hardware-analyzer/package.nix
+++ b/pkgs/by-name/ha/hal-hardware-analyzer/package.nix
@@ -5,7 +5,7 @@
   cmake,
   fetchFromGitHub,
   graphviz,
-  igraph,
+  igraph_0, # https://github.com/emsec/hal/issues/623
   llvmPackages,
   ninja,
   nlohmann_json,
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     libsForQt5.qtsvg
     boost
     rapidjson
-    igraph
+    igraph_0
     nlohmann_json
     spdlog
     graphviz

From 37644003c3e62263785b926f6b4c8ffab7c6b40f Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Sat, 1 Nov 2025 18:55:43 +0100
Subject: [PATCH 4678/6226] python3.pkgs.localzone: Fix tests with dnspython
 2.8.0

Fixes build of `lexicon`.
---
 pkgs/development/python-modules/localzone/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/localzone/default.nix b/pkgs/development/python-modules/localzone/default.nix
index 4ce88e0a71c3..3839d19b6954 100644
--- a/pkgs/development/python-modules/localzone/default.nix
+++ b/pkgs/development/python-modules/localzone/default.nix
@@ -30,6 +30,13 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "localzone" ];
 
+  postPatch = ''
+    # Fix tests with dnspython 2.8.0
+    # https://github.com/ags-slc/localzone/pull/6
+    substituteInPlace tests/test_models.py \
+      --replace-fail 'raises((AttributeError, DNSSyntaxError))' 'raises((AttributeError, DNSSyntaxError, ValueError))'
+  '';
+
   meta = with lib; {
     description = "Simple DNS library for managing zone files";
     homepage = "https://localzone.iomaestro.com";

From 905ddb5e0e0c268093bdee2ebe31e80ebe2b2114 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 10:56:21 -0700
Subject: [PATCH 4679/6226] python3Packages.textnets: 0.10.3 -> 0.10.4

Diff: https://github.com/jboynyc/textnets/compare/v0.10.3...v0.10.4

Changelog: https://github.com/jboynyc/textnets/blob/v0.10.4/HISTORY.rst
---
 pkgs/development/python-modules/textnets/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/textnets/default.nix b/pkgs/development/python-modules/textnets/default.nix
index 3456f1b11050..cdf31e786afc 100644
--- a/pkgs/development/python-modules/textnets/default.nix
+++ b/pkgs/development/python-modules/textnets/default.nix
@@ -5,7 +5,7 @@
   fetchFromGitHub,
 
   # build-system
-  cython_0,
+  cython,
   pdm-backend,
   setuptools,
 
@@ -29,24 +29,23 @@
 
 buildPythonPackage rec {
   pname = "textnets";
-  version = "0.10.3";
+  version = "0.10.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jboynyc";
     repo = "textnets";
     tag = "v${version}";
-    hash = "sha256-BK0bBoe6GrZpVL4HvTwzRlXRWXfKdYJDhLD2UQctTjc=";
+    hash = "sha256-GbJH+6EqfP+miqpYitnBwNDO6uQQq3h9Fy58nVaF1vw=";
   };
 
   build-system = [
-    cython_0
+    cython
     pdm-backend
     setuptools
   ];
 
   pythonRelaxDeps = [
-    "pyarrow"
     "toolz"
   ];
 

From 2ea6634a1f95e08095832442b754f94fb0f2d7e6 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 1 Nov 2025 10:50:19 -0700
Subject: [PATCH 4680/6226] firebase-tools: replace missing package-lock.json

---
 pkgs/by-name/fi/firebase-tools/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix
index b64a7d7d8514..36e6d61f4941 100644
--- a/pkgs/by-name/fi/firebase-tools/package.nix
+++ b/pkgs/by-name/fi/firebase-tools/package.nix
@@ -21,6 +21,11 @@ buildNpmPackage rec {
 
   npmDepsHash = "sha256-laYq6NNGsJ2YGhg6i0iFCVk+qyRqYdZPSSWzVHailcc=";
 
+  # No more package-lock.json in upstream src
+  postPatch = ''
+    cp ./npm-shrinkwrap.json ./package-lock.json
+  '';
+
   nativeBuildInputs = [
     python3
   ]

From 72a5f80e84a04521958d0f4c9d7c427a140bd951 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 26 Oct 2025 16:34:48 +0100
Subject: [PATCH 4681/6226] ams-lv2: drop

It's been archived upstream and has been marked broken for a while.
I was unable to fix the build.
---
 pkgs/by-name/am/ams-lv2/package.nix | 56 -----------------------------
 pkgs/top-level/aliases.nix          |  1 +
 2 files changed, 1 insertion(+), 56 deletions(-)
 delete mode 100644 pkgs/by-name/am/ams-lv2/package.nix

diff --git a/pkgs/by-name/am/ams-lv2/package.nix b/pkgs/by-name/am/ams-lv2/package.nix
deleted file mode 100644
index 00b4916fe55e..000000000000
--- a/pkgs/by-name/am/ams-lv2/package.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cairo,
-  fftw,
-  gtkmm2,
-  lv2,
-  lvtk,
-  pkg-config,
-  wafHook,
-  python3,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "ams-lv2";
-  version = "1.2.2";
-
-  src = fetchFromGitHub {
-    owner = "blablack";
-    repo = "ams-lv2";
-    rev = version;
-    sha256 = "1lz2mvk4gqsyf92yxd3aaldx0d0qi28h4rnnvsaz4ls0ccqm80nk";
-  };
-
-  nativeBuildInputs = [
-    pkg-config
-    wafHook
-    python3
-  ];
-  buildInputs = [
-    cairo
-    fftw
-    gtkmm2
-    lv2
-    lvtk
-  ];
-
-  postPatch = ''
-    # U was removed in python 3.11 because it had no effect
-    substituteInPlace waflib/*.py \
-      --replace "m='rU" "m='r"
-  '';
-
-  meta = with lib; {
-    description = "LV2 port of the internal modules found in Alsa Modular Synth";
-    homepage = "https://github.com/blablack/ams-lv2";
-    license = licenses.gpl3;
-    maintainers = [ ];
-    platforms = platforms.linux;
-    # Build uses `-msse` and `-mfpmath=sse`
-    badPlatforms = [ "aarch64-linux" ];
-    # `ModuleNotFoundError: No module named 'imp'`
-    broken = true;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ad0b662fe317..dda5476de33b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -278,6 +278,7 @@ mapAliases {
   akkoma-frontends.akkoma-fe = throw "'akkoma-frontends.akkoma-fe' has been renamed to/replaced by 'akkoma-fe'"; # Converted to throw 2025-10-27
   amazon-qldb-shell = throw "'amazon-qldb-shell' has been removed due to being unmaintained upstream"; # Added 2025-07-30
   amdvlk = throw "'amdvlk' has been removed since it was deprecated by AMD. Its replacement, RADV, is enabled by default."; # Added 2025-09-20
+  ams-lv2 = throw "'ams-lv2' has been removed due to being archived upstream."; # Added 2025-10-26
   android-udev-rules = throw "'android-udev-rules' has been removed due to being superseded by built-in systemd uaccess rules."; # Added 2025-10-21
   androidndkPkgs_21 = throw "androidndkPkgs_21 has been removed, as it is EOL"; # Added 2025-08-09
   androidndkPkgs_23 = throw "androidndkPkgs_23 has been removed, as it is EOL"; # Added 2025-08-09

From 03a0f3eefcff3622e3b6595f1973d0842ce32a9f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 18:38:24 +0000
Subject: [PATCH 4682/6226] xremap: 0.14.2 -> 0.14.3

---
 pkgs/by-name/xr/xremap/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/xr/xremap/package.nix b/pkgs/by-name/xr/xremap/package.nix
index eb7939f9f189..ae68a1135a58 100644
--- a/pkgs/by-name/xr/xremap/package.nix
+++ b/pkgs/by-name/xr/xremap/package.nix
@@ -43,13 +43,13 @@ assert (
 );
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xremap${variant.suffix or ""}";
-  version = "0.14.2";
+  version = "0.14.3";
 
   src = fetchFromGitHub {
     owner = "xremap";
     repo = "xremap";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5BHet5kKpmJFpjga7QZoLPydtzs5iPX5glxP4YvsYx0=";
+    hash = "sha256-UHkwTz5KEDAqXKpN/YVzY0xP7b6nN8WkPilzpF8YU3A=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildNoDefaultFeatures = true;
   buildFeatures = variant.features;
 
-  cargoHash = "sha256-NZNLO+wmzEdIZPp5Zu81m/ux8Au+8EMq31QpuZN9l5w=";
+  cargoHash = "sha256-ucyBQPCskHwz8rYzOULJ3enL6rhvpLxJzS7sTNwuBW4=";
 
   passthru = lib.mapAttrs (name: lib.const (xremap.override { withVariant = name; })) variants;
 

From 436876e07079d6cc604c1177ff328d164c77bad2 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 1 Nov 2025 19:44:30 +0100
Subject: [PATCH 4683/6226] workflows/pull-request-target: increase retries for
 prepare step

We still get plenty of errors in the prepare step for the diff requests
to take way too long - let's increase the number of retries massively
now. These are repeated with exponential backoff, so hopefully they will
succeed with some cooldown, when GitHub had time to compute the right
diff in the background.
---
 .github/workflows/pull-request-target.yml | 2 +-
 .github/workflows/test.yml                | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pull-request-target.yml b/.github/workflows/pull-request-target.yml
index d73f6fdc7e5c..76a77c7942e5 100644
--- a/.github/workflows/pull-request-target.yml
+++ b/.github/workflows/pull-request-target.yml
@@ -45,7 +45,7 @@ jobs:
       - id: prepare
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
-          retries: 3
+          retries: 10
           # The default for this includes code 422, which happens regularly for us when comparing commits:
           #   422 - Server Error: Sorry, this diff is taking too long to generate.
           # Listing all other values from here to effectively remove 422:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 8c0451a54754..b9369de2af3d 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -28,7 +28,12 @@ jobs:
       - id: prepare
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
-          retries: 3
+          retries: 10
+          # The default for this includes code 422, which happens regularly for us when comparing commits:
+          #   422 - Server Error: Sorry, this diff is taking too long to generate.
+          # Listing all other values from here to effectively remove 422:
+          #   https://github.com/octokit/plugin-retry.js/blob/9a2443746c350b3beedec35cf26e197ea318a261/src/index.ts#L14
+          retry-exempt-status-codes: 400,401,403,404
           script: |
             require('./ci/github-script/prepare.js')({
               github,

From b59b5bae807cdd638b4a92b26e2c85853afce1ef Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sat, 1 Nov 2025 11:02:43 -0700
Subject: [PATCH 4684/6226] python3Packages.torch: fix ROCm build by disabling
 USE_FBGEMM_GENAI

---
 pkgs/development/python-modules/torch/source/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index cae1d47971e9..660131cb53c5 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -521,6 +521,9 @@ buildPythonPackage.override { inherit stdenv; } rec {
   }
   // lib.optionalAttrs rocmSupport {
     AOTRITON_INSTALLED_PREFIX = "${rocmPackages.aotriton}";
+    # Broken HIP flag setup, fails to compile due to not finding rocthrust
+    # Only supports gfx942 so let's turn it off for now
+    USE_FBGEMM_GENAI = setBool false;
   };
 
   nativeBuildInputs = [

From 0610e52b10842a9a3359858449c3af86ac65a570 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sat, 1 Nov 2025 11:58:55 -0700
Subject: [PATCH 4685/6226] python3Packages.torch: add LunNova to maintainers

---
 pkgs/development/python-modules/torch/source/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/torch/source/default.nix b/pkgs/development/python-modules/torch/source/default.nix
index 660131cb53c5..960a5c2a109d 100644
--- a/pkgs/development/python-modules/torch/source/default.nix
+++ b/pkgs/development/python-modules/torch/source/default.nix
@@ -763,6 +763,7 @@ buildPythonPackage.override { inherit stdenv; } rec {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       GaetanLepage
+      LunNova # esp. for ROCm
       teh
       thoughtpolice
       tscholak

From 15b63acaf70168f69124a9987ae60f45171c3fea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 19:07:08 +0000
Subject: [PATCH 4686/6226] python3Packages.temporalio: 1.18.1 -> 1.18.2

---
 pkgs/development/python-modules/temporalio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/temporalio/default.nix b/pkgs/development/python-modules/temporalio/default.nix
index deda5f3bdc1b..f2d6a29d4be9 100644
--- a/pkgs/development/python-modules/temporalio/default.nix
+++ b/pkgs/development/python-modules/temporalio/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "temporalio";
-  version = "1.18.1";
+  version = "1.18.2";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "temporalio";
     repo = "sdk-python";
     rev = "refs/tags/${version}";
-    hash = "sha256-53UDG6eN7Jv8nUUh84I1SX9Gc+gZK66o6e4pqe9aWq4=";
+    hash = "sha256-EUys/UMblFVzICvMZmcGUXAqmtjPOdJKgtIx5TFB/9U=";
     fetchSubmodules = true;
   };
 

From 3200ff47e6c32249b2114ee7eca8f01a1735e0f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 19:08:02 +0000
Subject: [PATCH 4687/6226] vunnel: 0.41.0 -> 0.43.0

---
 pkgs/by-name/vu/vunnel/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix
index 681c5441f286..b8ef20873450 100644
--- a/pkgs/by-name/vu/vunnel/package.nix
+++ b/pkgs/by-name/vu/vunnel/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "vunnel";
-  version = "0.41.0";
+  version = "0.43.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "vunnel";
     tag = "v${version}";
-    hash = "sha256-YlyhIT8hlkFGo7xBjxa/5feiqv7H2HfA/E4+gz9cCkw=";
+    hash = "sha256-DHuNhizYDY/z3DPAPPOgGWn1m86yGHamiVCHGxlaC1w=";
     leaveDotGit = true;
   };
 

From 02cd57c97af37620d10442241e666e123ab606eb Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sat, 1 Nov 2025 12:15:48 -0700
Subject: [PATCH 4688/6226] Revert "python3Packages.pycrdt-websocket: 0.15.5 ->
 0.16.0"

This reverts commit bed1841135644d3021abe2b2af2b924b34f748b5.
---
 .../python-modules/pycrdt-websocket/default.nix           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pycrdt-websocket/default.nix b/pkgs/development/python-modules/pycrdt-websocket/default.nix
index 573c4917bbc5..7a3a2362de00 100644
--- a/pkgs/development/python-modules/pycrdt-websocket/default.nix
+++ b/pkgs/development/python-modules/pycrdt-websocket/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "pycrdt-websocket";
-  version = "0.16.0";
+  version = "0.15.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jupyter-server";
     repo = "pycrdt-websocket";
-    tag = version;
-    hash = "sha256-Qux8IxJR1nGbdpGz7RZBKJjYN0qfwfEpd2UDlduOna0=";
+    tag = "v${version}";
+    hash = "sha256-piNd85X5YsTAOC9frYQRDyb/DPfzZicIPJ+bEVzgOsU=";
   };
 
   build-system = [ hatchling ];
@@ -77,7 +77,7 @@ buildPythonPackage rec {
   meta = {
     description = "WebSocket Connector for pycrdt";
     homepage = "https://github.com/jupyter-server/pycrdt-websocket";
-    changelog = "https://github.com/jupyter-server/pycrdt-websocket/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/jupyter-server/pycrdt-websocket/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     teams = [ lib.teams.jupyter ];
   };

From 3f2c25adcf8e8af0cfa28b738fdc0dcfaceefe04 Mon Sep 17 00:00:00 2001
From: Christoph Jabs <contact@christophjabs.info>
Date: Tue, 16 Sep 2025 09:52:14 +0300
Subject: [PATCH 4689/6226] python3Packages.python-sat: switch to fetchPypi

- match the version numbering used on PyPI
- since releases are not tagged in the upstream git repo, this way the
automatic update script should work
---
 .../python-modules/python-sat/default.nix         | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix
index 8b6e8716a56b..6db040811517 100644
--- a/pkgs/development/python-modules/python-sat/default.nix
+++ b/pkgs/development/python-modules/python-sat/default.nix
@@ -1,21 +1,20 @@
 {
   buildPythonPackage,
-  fetchFromGitHub,
+  fetchPypi,
   lib,
   six,
   pypblib,
   pytestCheckHook,
 }:
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "python-sat";
-  version = "0.1.8.dev20";
+  version = "1.8.dev20";
   format = "setuptools";
 
-  src = fetchFromGitHub {
-    owner = "pysathq";
-    repo = "pysat";
-    rev = "d94f51e5eff2feef35abbc25480659eafa615cc0"; # upstream does not tag releases
-    hash = "sha256-fKZcdEVuqpv8jWnK8Cr1UJ7szJqXivK6x3YPYHH5ccI=";
+  src = fetchPypi {
+    inherit version;
+    pname = "python_sat";
+    hash = "sha256-8uUi6DtPVh/87EWSgTtGq7UhAs+Glw8KARPkK3ukeMg=";
   };
 
   # Build SAT solver backends in parallel and fix hard-coded g++ reference for

From 5843ce3f454990bdebbb9e8d0d51463934a214d8 Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Sat, 1 Nov 2025 20:20:25 +0100
Subject: [PATCH 4690/6226] ethersync: use warnAlias

---
 pkgs/applications/editors/vim/plugins/aliases.nix | 2 +-
 pkgs/top-level/aliases.nix                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix
index 8a5ec6b533fe..d3099a3b5b51 100644
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
@@ -73,7 +73,7 @@ mapAliases (
     easymotion = vim-easymotion;
     echodoc = echodoc-vim;
     eighties = vim-eighties;
-    ethersync = teamtype;
+    ethersync = lib.warnOnInstantiate "'ethersync' has been renamed to 'teamtype'" teamtype; # Added 2025-10-31
     extradite = vim-extradite;
     feline-nvim = throw "feline.nvim has been removed: upstream deleted repository. Consider using lualine"; # Added 2025-02-09
     fugitive = vim-fugitive;
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index dda5476de33b..566391839b61 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -531,7 +531,7 @@ mapAliases {
   eris-go = throw "'eris-go' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   eriscmd = throw "'eriscmd' has been removed due to a hostile upstream moving tags and breaking src FODs"; # Added 2025-09-01
   erlang-ls = throw "'erlang-ls' has been removed as it has been archived upstream. Consider using 'erlang-language-platform' instead"; # Added 2025-10-02
-  ethersync = teamtype; # Added 2025-10-31
+  ethersync = warnAlias "'ethersync' has been renamed to 'teamtype'" teamtype; # Added 2025-10-31
   eww-wayland = throw "'eww-wayland' has been renamed to/replaced by 'eww'"; # Converted to throw 2025-10-27
   f3d_egl = warnAlias "'f3d' now build with egl support by default, so `f3d_egl` is deprecated, consider using 'f3d' instead." f3d; # added 2025-07-18
   fastnlo_toolkit = throw "'fastnlo_toolkit' has been renamed to/replaced by 'fastnlo-toolkit'"; # Converted to throw 2025-10-27

From 585ade0863d2bbfcae234c16761d72e347112c2c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 19:28:17 +0000
Subject: [PATCH 4691/6226] kubexporter: 0.7.0 -> 0.7.1

---
 pkgs/by-name/ku/kubexporter/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ku/kubexporter/package.nix b/pkgs/by-name/ku/kubexporter/package.nix
index caa5061347e7..934b843ec25c 100644
--- a/pkgs/by-name/ku/kubexporter/package.nix
+++ b/pkgs/by-name/ku/kubexporter/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "kubexporter";
-  version = "0.7.0";
+  version = "0.7.1";
 
   src = fetchFromGitHub {
     owner = "bakito";
     repo = "kubexporter";
     tag = "v${version}";
-    hash = "sha256-QdMA/wehzESEkzBEzM1hIlIOzi2G/5QdMG+KlzGtiiU=";
+    hash = "sha256-cSYUR6EfRMLyPNaKDBbwWzpSy7/Gxe9UtnCz+cWHwrw=";
   };
 
-  vendorHash = "sha256-pWmcLjZxGoUkOTrvxxmKBU/GjhMj3LVPJ9menAqFICk=";
+  vendorHash = "sha256-gPjfjOOh2HZaAaZt2FIb/Zy3xYKUNxC9+30TudfnDFQ=";
 
   ldflags = [
     "-s"

From c01d7fbe0a0baf4ef37583687c697dc8026a7397 Mon Sep 17 00:00:00 2001
From: Christoph Jabs <contact@christophjabs.info>
Date: Tue, 16 Sep 2025 10:34:42 +0300
Subject: [PATCH 4692/6226] python3Packages.python-sat: cleanup and convert to
 pyproject true

- fix pytest import issue
    As described in https://github.com/NixOS/nixpkgs/issues/255262, `python
    -m pytest` adds the local directory to PYTHONPATH, which gives
    precendence to local imports. Remove the local `pysat` directory to only
    import the installed variant.
- convert to pyproject true
- update description
---
 .../python-modules/python-sat/default.nix     | 33 +++++++++++++++----
 1 file changed, 26 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix
index 6db040811517..7ff726cb5daf 100644
--- a/pkgs/development/python-modules/python-sat/default.nix
+++ b/pkgs/development/python-modules/python-sat/default.nix
@@ -2,6 +2,7 @@
   buildPythonPackage,
   fetchPypi,
   lib,
+  setuptools,
   six,
   pypblib,
   pytestCheckHook,
@@ -9,7 +10,9 @@
 buildPythonPackage rec {
   pname = "python-sat";
   version = "1.8.dev20";
-  format = "setuptools";
+  pyproject = true;
+
+  build-system = [ setuptools ];
 
   src = fetchPypi {
     inherit version;
@@ -17,26 +20,42 @@ buildPythonPackage rec {
     hash = "sha256-8uUi6DtPVh/87EWSgTtGq7UhAs+Glw8KARPkK3ukeMg=";
   };
 
-  # Build SAT solver backends in parallel and fix hard-coded g++ reference for
-  # darwin, where stdenv uses clang
+  # Fix hard-coded g++ reference for darwin, where stdenv uses clang
+  # FIXME: remove once https://github.com/pysathq/pysat/pull/204 is merged and
+  # has hit PyPI
   postPatch = ''
-    substituteInPlace solvers/prepare.py \
-      --replace-fail "&& make &&" "&& make -j$NIX_BUILD_CORES &&"
     substituteInPlace solvers/patches/glucose421.patch \
       --replace-fail "+CXX      := g++" "+CXX      := c++"
   '';
 
+  preBuild = ''
+    export MAKEFLAGS="-j$NIX_BUILD_CORES"
+  '';
+
   propagatedBuildInputs = [
     six
     pypblib
   ];
 
+  pythonImportsCheck = [
+    "pysat"
+    "pysat.examples"
+    "pysat.allies"
+  ];
+
   nativeCheckInputs = [ pytestCheckHook ];
 
-  disabledTestPaths = [ "tests/test_unique_mus.py" ];
+  # Due to `python -m pytest` appending the local directory to `PYTHONPATH`,
+  # importing `pysat.examples` in the tests fails. Removing the `pysat`
+  # directory fixes since then only the installed version in `$out` is
+  # imported, which has `pysat.examples` correctly installed.
+  # See https://github.com/NixOS/nixpkgs/issues/255262
+  preCheck = ''
+    rm -r pysat
+  '';
 
   meta = with lib; {
-    description = "Toolkit to provide interface for various SAT (without optional dependancy py-aiger-cnf)";
+    description = "Toolkit for SAT-based prototyping in Python (without optional dependencies)";
     homepage = "https://github.com/pysathq/pysat";
     changelog = "https://pysathq.github.io/updates/";
     license = licenses.mit;

From b921ac91d1541d89826722bc79809ddde354280c Mon Sep 17 00:00:00 2001
From: Christoph Jabs <contact@christophjabs.info>
Date: Wed, 17 Sep 2025 10:38:36 +0300
Subject: [PATCH 4693/6226] python3Packages.python-sat: 1.8.dev20 -> 1.8.dev24

---
 .../python-modules/python-sat/default.nix            | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/python-sat/default.nix b/pkgs/development/python-modules/python-sat/default.nix
index 7ff726cb5daf..4624eb5cb6ef 100644
--- a/pkgs/development/python-modules/python-sat/default.nix
+++ b/pkgs/development/python-modules/python-sat/default.nix
@@ -9,7 +9,7 @@
 }:
 buildPythonPackage rec {
   pname = "python-sat";
-  version = "1.8.dev20";
+  version = "1.8.dev24";
   pyproject = true;
 
   build-system = [ setuptools ];
@@ -17,17 +17,9 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "python_sat";
-    hash = "sha256-8uUi6DtPVh/87EWSgTtGq7UhAs+Glw8KARPkK3ukeMg=";
+    hash = "sha256-f9NnaPcHdNNInWTvpkg91ieaYejJ29kAAOLcbnbDmM0=";
   };
 
-  # Fix hard-coded g++ reference for darwin, where stdenv uses clang
-  # FIXME: remove once https://github.com/pysathq/pysat/pull/204 is merged and
-  # has hit PyPI
-  postPatch = ''
-    substituteInPlace solvers/patches/glucose421.patch \
-      --replace-fail "+CXX      := g++" "+CXX      := c++"
-  '';
-
   preBuild = ''
     export MAKEFLAGS="-j$NIX_BUILD_CORES"
   '';

From 3fd62da27fa06cfcf1e7f4bc8b84b9709d9ef8d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20M=C3=A9meint?= <git@nicomem.com>
Date: Thu, 25 Sep 2025 18:58:00 +0200
Subject: [PATCH 4694/6226] nixos/crowdsec-firewall-bouncer: init module

---
 .../manual/release-notes/rl-2511.section.md   |   2 +
 nixos/modules/module-list.nix                 |   1 +
 .../security/crowdsec-firewall-bouncer.nix    | 390 ++++++++++++++++++
 3 files changed, 393 insertions(+)
 create mode 100644 nixos/modules/services/security/crowdsec-firewall-bouncer.nix

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 2e73fe06aa0e..24ca7061f630 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -100,6 +100,8 @@
 
 - [crowdsec](https://www.crowdsec.net/), a free, open-source and collaborative IPS. Available as [services.crowdsec](#opt-services.crowdsec.enable).
 
+- [crowdsec-firewall-bouncer](https://www.crowdsec.net/), the CrowdSec Remediation Component for fetching new and old decisions from a CrowdSec API and adding them to a blocklist used by supported firewalls. Available as [services.crowdsec-firewall-bouncer](#opt-services.crowdsec-firewall-bouncer.enable).
+
 - [tsidp](https://github.com/tailscale/tsidp), a simple OIDC / OAuth Identity Provider (IdP) server for your tailnet. Available as [services.tsidp](#opt-services.tsidp.enable).
 
 - [Newt](https://github.com/fosrl/newt), a fully user space WireGuard tunnel client and TCP/UDP proxy, designed to securely expose private resources controlled by Pangolin. Available as [services.newt](options.html#opt-services.newt.enable).
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index f66d92bf6f77..09a858a434db 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -1460,6 +1460,7 @@
   ./services/security/certmgr.nix
   ./services/security/cfssl.nix
   ./services/security/clamav.nix
+  ./services/security/crowdsec-firewall-bouncer.nix
   ./services/security/crowdsec.nix
   ./services/security/e-imzo.nix
   ./services/security/endlessh-go.nix
diff --git a/nixos/modules/services/security/crowdsec-firewall-bouncer.nix b/nixos/modules/services/security/crowdsec-firewall-bouncer.nix
new file mode 100644
index 000000000000..5091ba4156a4
--- /dev/null
+++ b/nixos/modules/services/security/crowdsec-firewall-bouncer.nix
@@ -0,0 +1,390 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  cfg = config.services.crowdsec-firewall-bouncer;
+  format = pkgs.formats.yaml { };
+in
+{
+  options.services.crowdsec-firewall-bouncer =
+    let
+      inherit (lib)
+        types
+        mkOption
+        mkEnableOption
+        mkPackageOption
+        ;
+    in
+    {
+      enable = mkEnableOption "CrowdSec Firewall Bouncer";
+
+      package = mkPackageOption pkgs "crowdsec-firewall-bouncer" { };
+
+      createRulesets = mkOption {
+        type = types.bool;
+        description = ''
+          Whether to have the module create the appropriate firewall configuration
+          based on the bouncer settings.
+          You may disable this option to manually configure it.
+        '';
+        default = true;
+      };
+
+      registerBouncer = {
+        enable = mkOption {
+          type = types.bool;
+          description = ''
+            Whether to automatically register the bouncer to the locally running
+            `crowdsec` service.
+
+            When authenticating to an external CrowdSec API, you may use the
+            [](#opt-services.crowdsec-firewall-bouncer.secrets.apiKeyPath) option
+            instead.
+          '';
+          default = config.services.crowdsec.enable;
+          defaultText = lib.literalExpression ''config.services.crowdsec.enable'';
+        };
+        bouncerName = mkOption {
+          type = types.nonEmptyStr;
+          description = "Name to register the bouncer as to the CrowdSec API";
+          default = "crowdsec-firewall-bouncer";
+        };
+      };
+
+      secrets = {
+        apiKeyPath = mkOption {
+          type = types.nullOr types.path;
+          description = ''
+            Path to the API key to authenticate with a local CrowdSec API.
+
+            You need to call `cscli bouncers add <bouncer-name>` to register
+            the bouncer and get this API key.
+
+            When authenticating to the locally running `crowdsec` service, you may use the
+            [](#opt-services.crowdsec-firewall-bouncer.registerBouncer.enable) option instead.
+          '';
+          default = null;
+        };
+      };
+
+      settings = mkOption {
+        description = ''
+          Settings for the main CrowdSec Firewall Bouncer.
+
+          Refer to the defaults at <https://github.com/crowdsecurity/cs-firewall-bouncer/blob/main/config/crowdsec-firewall-bouncer.yaml>.
+        '';
+        default = { };
+        type = types.submodule {
+          freeformType = format.type;
+          options = {
+            mode = mkOption {
+              type = types.str;
+              description = "Firewall mode to use.";
+              default = if config.networking.nftables.enable then "nftables" else "iptables";
+              defaultText = lib.literalExpression ''if config.networking.nftables.enable then "nftables" else "iptables"'';
+            };
+            api_url = mkOption {
+              type = types.str;
+              description = "URL of the local API.";
+              example = "http://127.0.0.1:8080";
+              default = "http://${config.services.crowdsec.settings.general.api.server.listen_uri}";
+              defaultText = lib.literalExpression ''http://$\{config.services.crowdsec.settings.general.api.server.listen_uri}'';
+            };
+            api_key = mkOption {
+              type = types.nullOr types.str;
+              description = ''
+                API key to authenticate with a local crowdsec API.
+
+                You need to call `cscli bouncers add <bouncer-name>` to register
+                the bouncer and get this API key.
+
+                Setting this option will store this secret in the Nix store.
+                Instead, you should set the `services.crowdsec-firewall-bouncer.secrets.apiKeyPath`
+                option, which will read the value at runtime.
+              '';
+              default = null;
+            };
+          };
+        };
+      };
+    };
+
+  config = lib.mkIf cfg.enable {
+    assertions = [
+      {
+        assertion =
+          cfg.registerBouncer.enable || (cfg.secrets.apiKeyPath != null) || (cfg.settings.api_key != null);
+        message = ''
+          An API key must be set for the bouncer to be able to authenticate to a local crowdsec API.
+
+          See the `registerBouncer.enable` and `secrets.apiKeyPath` options of
+          `services.crowdsec-firewall-bouncer` for more information.
+        '';
+      }
+      {
+        assertion = !(cfg.registerBouncer.enable && (cfg.secrets.apiKeyPath != null));
+        message = ''
+          The `registerBouncer.enable` and `secrets.apiKeyPath` options of
+          `services.crowdsec-firewall-bouncer` are mutually exclusive.
+        '';
+      }
+      {
+        assertion = !(cfg.registerBouncer.enable && !config.services.crowdsec.enable);
+        message = ''
+          The `services.crowdsec-firewall-bouncer.registerBouncer.enable` option
+          requires the `crowdsec` service to be enabled.
+        '';
+      }
+      {
+        assertion = !(cfg.settings.mode == "ipset" && cfg.createRulesets);
+        message = ''
+          The crowdsec-firewall-bouncer module is currently not able to configure the firewall in "ipset" mode.
+
+          Either set the `services.crowdsec-firewall-bouncer.settings.mode` to "iptables" to leave the bouncer
+          manage the firewall configuration, or disable the `services.crowdsec-firewall-bouncer.createRulesets`
+          option and manually configure your firewall.
+        '';
+      }
+    ];
+
+    # Default settings
+    services.crowdsec-firewall-bouncer.settings = {
+      update_frequency = lib.mkDefault "10s";
+      log_mode = lib.mkDefault "stdout";
+      log_level = lib.mkDefault "info";
+
+      # iptables-specific config
+      blacklists_ipv4 = lib.mkDefault "crowdsec-blacklists";
+      blacklists_ipv6 = lib.mkDefault "crowdsec6-blacklists";
+      iptables_chains = lib.mkDefault [ "INPUT" ];
+
+      # nftables-specific config
+      nftables = {
+        ipv4 = {
+          enabled = lib.mkDefault true;
+          set-only = lib.mkDefault true;
+          table = lib.mkDefault "crowdsec";
+          chain = lib.mkDefault "crowdsec-chain";
+        };
+        ipv6 = {
+          enabled = lib.mkDefault true;
+          set-only = lib.mkDefault true;
+          table = lib.mkDefault "crowdsec6";
+          chain = lib.mkDefault "crowdsec6-chain";
+        };
+      };
+    };
+
+    # Use a placeholder for the api_key if it is to be read from a file at runtime
+    services.crowdsec-firewall-bouncer.settings.api_key = lib.mkIf (
+      cfg.registerBouncer.enable || (cfg.secrets.apiKeyPath != null)
+    ) "@API_KEY_FILE@";
+
+    networking.nftables.tables = lib.mkIf (cfg.settings.mode == "nftables") {
+      "${cfg.settings.nftables.ipv4.table}" =
+        lib.mkIf
+          (cfg.createRulesets && cfg.settings.nftables.ipv4.enabled && cfg.settings.nftables.ipv4.set-only)
+          {
+            family = "ip";
+            content = ''
+              set crowdsec-blacklists {
+                type ipv4_addr
+                flags timeout
+              }
+
+              chain ${cfg.settings.nftables.ipv4.chain} {
+                type filter hook input priority filter; policy accept;
+                ip saddr @crowdsec-blacklists drop
+              }
+            '';
+          };
+      "${cfg.settings.nftables.ipv6.table}" =
+        lib.mkIf
+          (cfg.createRulesets && cfg.settings.nftables.ipv6.enabled && cfg.settings.nftables.ipv6.set-only)
+          {
+            family = "ip6";
+            content = ''
+              set crowdsec6-blacklists {
+                type ipv6_addr
+                flags timeout
+              }
+
+              chain ${cfg.settings.nftables.ipv6.chain} {
+                type filter hook input priority filter; policy accept;
+                ip6 saddr @crowdsec6-blacklists drop
+              }
+            '';
+          };
+    };
+
+    systemd.services =
+      let
+        apiKeyFile = "/var/lib/crowdsec-firewall-bouncer-register/api-key.cred";
+      in
+      {
+        crowdsec-firewall-bouncer-register = lib.mkIf cfg.registerBouncer.enable rec {
+          description = "Register the CrowdSec Firewall Bouncer to the local CrowdSec service";
+          wantedBy = [ "multi-user.target" ];
+          after = [ "crowdsec.service" ];
+          wants = after;
+          script = ''
+            cscli=/run/current-system/sw/bin/cscli
+            if $cscli bouncers list --output json | ${lib.getExe pkgs.jq} -e -- ${lib.escapeShellArg "any(.[]; .name == \"${cfg.registerBouncer.bouncerName}\")"} >/dev/null; then
+              # Bouncer already registered. Verify the API key is still present
+              if [ ! -f ${apiKeyFile} ]; then
+                echo "Bouncer registered but API key is not present"
+                exit 1
+              fi
+            else
+              # Bouncer not registered
+              # Remove any previously saved API key
+              rm -f '${apiKeyFile}'
+              # Register the bouncer and save the new API key
+              if ! $cscli bouncers add --output raw -- ${lib.escapeShellArg cfg.registerBouncer.bouncerName} >${apiKeyFile}; then
+                # Failed to register the bouncer
+                rm ${apiKeyFile}
+                exit 1
+              fi
+            fi
+          '';
+          serviceConfig = {
+            Type = "oneshot";
+
+            # Run as crowdsec user to be able to use cscli
+            User = config.services.crowdsec.user;
+            Group = config.services.crowdsec.group;
+
+            StateDirectory = "crowdsec-firewall-bouncer-register";
+
+            ReadWritePaths = [
+              # Needs write permissions to add the bouncer
+              "/var/lib/crowdsec"
+            ];
+
+            DynamicUser = true;
+            LockPersonality = true;
+            PrivateDevices = true;
+            ProcSubset = "pid";
+            ProtectClock = true;
+            ProtectControlGroups = true;
+            ProtectHome = true;
+            ProtectHostname = true;
+            ProtectKernelLogs = true;
+            ProtectKernelModules = true;
+            ProtectKernelTunables = true;
+            ProtectProc = "invisible";
+            RestrictNamespaces = true;
+            RestrictRealtime = true;
+            SystemCallArchitectures = "native";
+
+            RestrictAddressFamilies = "none";
+            CapabilityBoundingSet = [ "" ];
+            SystemCallFilter = [
+              "@system-service"
+              "~@privileged"
+              "~@resources"
+            ];
+            UMask = "0077";
+          };
+        };
+
+        crowdsec-firewall-bouncer =
+          let
+            runtime-dir-name = "crowdsec-firewall-bouncer";
+            final-config-file = "/run/${runtime-dir-name}/config.yaml";
+            generateConfig = pkgs.writeShellScript "crowdsec-firewall-bouncer-config" ''
+              set -euo pipefail
+              umask 077
+
+              # Copy the template to the final location
+              cp ${format.generate "crowdsec-firewall-bouncer-config-template.yml" cfg.settings} ${final-config-file}
+              chmod 0600 ${final-config-file}
+
+              # Replace the api_key placeholder with the secret
+              ${lib.getExe pkgs.replace-secret} '@API_KEY_FILE@' "$CREDENTIALS_DIRECTORY/API_KEY_FILE" ${final-config-file}
+            '';
+          in
+          rec {
+            description = "CrowdSec Firewall Bouncer";
+            wantedBy = [ "multi-user.target" ];
+            after = [ "network.target" ] ++ (lib.optional config.services.crowdsec.enable "crowdsec.service");
+            wants = after;
+            requires = lib.optional cfg.registerBouncer.enable "crowdsec-firewall-bouncer-register.service";
+
+            # When using iptables/ipset modes, the bouncer calls external binaries so they must be added to the path.
+            # For nftables mode, it does not depend on external binaries.
+            path = lib.optionals ((cfg.settings.mode == "iptables") || (cfg.settings.mode == "ipset")) [
+              pkgs.iptables
+              pkgs.ipset
+            ];
+
+            serviceConfig = rec {
+              Type = "notify";
+              ExecStartPre = [
+                generateConfig
+                "${lib.getExe cfg.package} -c ${final-config-file} -t"
+              ];
+              ExecStart = [
+                "${lib.getExe cfg.package} -c ${final-config-file}"
+              ];
+
+              # Same as upstream
+              LimitNOFILE = 65536;
+              KillMode = "mixed";
+
+              # Load the api_key secret to be able to use it when generating the final config
+              LoadCredential =
+                if (cfg.registerBouncer.enable) then
+                  "API_KEY_FILE:${apiKeyFile}"
+                else if (cfg.secrets.apiKeyPath != null) then
+                  "API_KEY_FILE:${cfg.secrets.apiKeyPath}"
+                else
+                  null;
+
+              DynamicUser = true;
+              RuntimeDirectory = runtime-dir-name;
+
+              LockPersonality = true;
+              PrivateDevices = true;
+              ProcSubset = "pid";
+              ProtectClock = true;
+              ProtectControlGroups = true;
+              ProtectHome = true;
+              ProtectHostname = true;
+              ProtectKernelLogs = true;
+              ProtectKernelModules = true;
+              ProtectKernelTunables = true;
+              ProtectProc = "invisible";
+              RestrictNamespaces = true;
+              RestrictRealtime = true;
+              SystemCallArchitectures = "native";
+
+              RestrictAddressFamilies = [
+                "AF_NETLINK"
+                "AF_UNIX"
+                "AF_INET"
+                "AF_INET6"
+              ];
+              AmbientCapabilities = [
+                # Needed to be able to manipulate the rulesets
+                "CAP_NET_ADMIN"
+              ];
+              CapabilityBoundingSet = AmbientCapabilities;
+              SystemCallFilter = [
+                "@system-service"
+                "~@privileged"
+                "~@resources"
+              ];
+              UMask = "0077";
+            };
+          };
+      };
+  };
+
+  meta = {
+    maintainers = with lib.maintainers; [ nicomem ];
+  };
+}

From ef036020e52ac4d5dd28211b330b6fb8310949e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 20:04:38 +0000
Subject: [PATCH 4695/6226] rustical: 0.9.13 -> 0.9.14

---
 pkgs/by-name/ru/rustical/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/rustical/package.nix b/pkgs/by-name/ru/rustical/package.nix
index b341e5222a81..edfa14e60af8 100644
--- a/pkgs/by-name/ru/rustical/package.nix
+++ b/pkgs/by-name/ru/rustical/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rustical";
-  version = "0.9.13";
+  version = "0.9.14";
 
   src = fetchFromGitHub {
     owner = "lennart-k";
     repo = "rustical";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-cRBButySRX5j8W2ZAJVVCM1Z7SPBlTIdyfyqL57JR9o=";
+    hash = "sha256-Q5dtkeKX9aqKHKKMTDU1sZkroRfG+kSq66Zj7idwEJg=";
   };
 
-  cargoHash = "sha256-SbTJ/F9kH7JYz4DfI6fcycoPLCN/JWEL8UhcOJ//lJQ=";
+  cargoHash = "sha256-v4aUK1pbaZGuuQD36MPxAZYHJMnkhqvrKzlOdJTOV5g=";
 
   nativeBuildInputs = [ pkg-config ];
   buildInputs = [ openssl ];

From f5065539a6badbbba4217f3e2438124ea7904224 Mon Sep 17 00:00:00 2001
From: Wulpey <wulpine@proton.me>
Date: Sat, 1 Nov 2025 22:11:20 +0300
Subject: [PATCH 4696/6226] texmaker: fix build with Qt 6.10

---
 pkgs/applications/editors/texmaker/default.nix      |  5 +++++
 .../editors/texmaker/fix-build-with-qt-6-10.patch   | 13 +++++++++++++
 2 files changed, 18 insertions(+)
 create mode 100644 pkgs/applications/editors/texmaker/fix-build-with-qt-6-10.patch

diff --git a/pkgs/applications/editors/texmaker/default.nix b/pkgs/applications/editors/texmaker/default.nix
index 10388a6d822d..216f21518538 100644
--- a/pkgs/applications/editors/texmaker/default.nix
+++ b/pkgs/applications/editors/texmaker/default.nix
@@ -22,6 +22,11 @@ stdenv.mkDerivation rec {
     hash = "sha256-uMI13wzY/XcUzXDTte42MWOwJUqd6pGAeBuPDi5GyvY=";
   };
 
+  patches = [
+    # Check if the patch can be removed next release
+    ./fix-build-with-qt-6-10.patch
+  ];
+
   buildInputs = [
     poppler
     qtbase
diff --git a/pkgs/applications/editors/texmaker/fix-build-with-qt-6-10.patch b/pkgs/applications/editors/texmaker/fix-build-with-qt-6-10.patch
new file mode 100644
index 000000000000..4de5263f6922
--- /dev/null
+++ b/pkgs/applications/editors/texmaker/fix-build-with-qt-6-10.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ef6a4e6..b564be8 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -386,7 +386,7 @@ set(CMAKE_CXX_STANDARD 17)
+ set(CMAKE_CXX_STANDARD_REQUIRED ON)
+ set(CMAKE_AUTORCC ON)
+ 
+-find_package(Qt6 REQUIRED COMPONENTS Gui Concurrent Core Core5Compat Network PrintSupport Qml Widgets Xml LinguistTools)
++find_package(Qt6 REQUIRED COMPONENTS Gui Concurrent Core CorePrivate Core5Compat Network PrintSupport Qml Widgets Xml LinguistTools)
+ 
+ qt_standard_project_setup()
+ 

From 8de797d4bf3d636c3351a995e2b0a0ad7d245f5f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 20:20:00 +0000
Subject: [PATCH 4697/6226] openimageio: 3.1.6.2 -> 3.1.7.0

---
 pkgs/by-name/op/openimageio/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openimageio/package.nix b/pkgs/by-name/op/openimageio/package.nix
index f8ff843e92bb..b5f479de0aa1 100644
--- a/pkgs/by-name/op/openimageio/package.nix
+++ b/pkgs/by-name/op/openimageio/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openimageio";
-  version = "3.1.6.2";
+  version = "3.1.7.0";
 
   src = fetchFromGitHub {
     owner = "AcademySoftwareFoundation";
     repo = "OpenImageIO";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0AfkJXFn+dEPUJF4GJq6Gk5vBJDRPL2Z03dVa5+xKVA=";
+    hash = "sha256-7yZez5oXeAghwhi/AFaPjCuwwIsMrPJzc8k/oR4v19Y=";
   };
 
   outputs = [

From ef4b163629f1a711af1b944040243e68acd103c6 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Sat, 1 Nov 2025 14:06:59 +0000
Subject: [PATCH 4698/6226] opencode: 0.15.29 -> 1.0.10

---
 .../op/opencode/local-models-dev.patch        |  20 --
 pkgs/by-name/op/opencode/package.nix          | 228 +++++-------------
 2 files changed, 59 insertions(+), 189 deletions(-)
 delete mode 100644 pkgs/by-name/op/opencode/local-models-dev.patch

diff --git a/pkgs/by-name/op/opencode/local-models-dev.patch b/pkgs/by-name/op/opencode/local-models-dev.patch
deleted file mode 100644
index 21ecd38fb0c8..000000000000
--- a/pkgs/by-name/op/opencode/local-models-dev.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git i/packages/opencode/src/provider/models-macro.ts w/packages/opencode/src/provider/models-macro.ts
-index 91a0348..4f60069 100644
---- i/packages/opencode/src/provider/models-macro.ts
-+++ w/packages/opencode/src/provider/models-macro.ts
-@@ -1,4 +1,15 @@
- export async function data() {
-+  const localApiJsonPath = process.env.MODELS_DEV_API_JSON
-+  
-+  // Try to read from local file if path is provided
-+  if (localApiJsonPath) {
-+    const localFile = Bun.file(localApiJsonPath)
-+    if (await localFile.exists()) {
-+      return await localFile.text()
-+    }
-+  }
-+  
-+  // Fallback to fetching from remote URL
-   const json = await fetch("https://models.dev/api.json").then((x) => x.text())
-   return json
- }
diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index de6b5a9e4f29..ff700c2444ed 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -1,200 +1,90 @@
 {
   lib,
-  stdenv,
   stdenvNoCC,
-  buildGoModule,
-  bun,
-  fetchFromGitHub,
-  makeBinaryWrapper,
-  models-dev,
-  nix-update-script,
+  fetchurl,
+  autoPatchelfHook,
+  common-updater-scripts,
+  curl,
+  installShellFiles,
+  jq,
+  unzip,
   testers,
-  writableTmpDirAsHomeHook,
+  writeShellScript,
 }:
-
-let
-  bun-target = {
-    "aarch64-darwin" = "bun-darwin-arm64";
-    "aarch64-linux" = "bun-linux-arm64";
-    "x86_64-darwin" = "bun-darwin-x64";
-    "x86_64-linux" = "bun-linux-x64";
-  };
-in
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "0.15.29";
-  src = fetchFromGitHub {
-    owner = "sst";
-    repo = "opencode";
-    tag = "v${finalAttrs.version}";
-    hash = "sha256-L3IcADx0fbtnqlf8Ysc1J5DVJp6ZQtN2faBJqAFMD3g=";
-  };
+  version = "1.0.10";
 
-  tui = buildGoModule {
-    pname = "opencode-tui";
-    inherit (finalAttrs) version src;
-
-    modRoot = "packages/tui";
-
-    vendorHash = "sha256-muwry7B0GlgueV8+9pevAjz3Cg3MX9AMr+rBwUcQ9CM=";
-
-    subPackages = [ "cmd/opencode" ];
-
-    env.CGO_ENABLED = 0;
-
-    ldflags = [
-      "-s"
-      "-X=main.Version=${finalAttrs.version}"
-    ];
-
-    installPhase = ''
-      runHook preInstall
-
-      install -Dm755 $GOPATH/bin/opencode $out/bin/tui
-
-      runHook postInstall
-    '';
-  };
-
-  node_modules = stdenvNoCC.mkDerivation {
-    pname = "opencode-node_modules";
-    inherit (finalAttrs) version src;
-
-    impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
-      "GIT_PROXY_COMMAND"
-      "SOCKS_SERVER"
-    ];
-
-    nativeBuildInputs = [
-      bun
-      writableTmpDirAsHomeHook
-    ];
-
-    dontConfigure = true;
-
-    buildPhase = ''
-      runHook preBuild
-
-      export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
-
-      # NOTE: Disabling post-install scripts with `--ignore-scripts` to avoid
-      # shebang issues
-      # NOTE: `--linker=hoisted` temporarily disables Bun's isolated installs,
-      # which became the default in Bun 1.3.0.
-      # See: https://bun.com/blog/bun-v1.3#isolated-installs-are-now-the-default-for-workspaces
-      # This workaround is required because the 'yargs' dependency is currently
-      # missing when building opencode. Remove this flag once upstream is
-      # compatible with Bun 1.3.0.
-      bun install \
-        --filter=opencode \
-        --force \
-        --frozen-lockfile \
-        --ignore-scripts \
-        --linker=hoisted \
-        --no-progress \
-        --production
-
-      runHook postBuild
-    '';
-
-    installPhase = ''
-      runHook preInstall
-
-      mkdir -p $out/node_modules
-      cp -R ./node_modules $out
-
-      runHook postInstall
-    '';
-
-    # Required else we get errors that our fixed-output derivation references store paths
-    dontFixup = true;
-
-    outputHash =
-      {
-        x86_64-linux = "sha256-QX+6uxG1V4QdecJX5vyFlgy5pBPPv8rne7pklSA2k3c=";
-        aarch64-linux = "sha256-S8nuMMgGeGAuCevuLxMK5j9+VFbqWuqf+ZYZSVzAp/k=";
-        x86_64-darwin = "sha256-qwRMCTSj7+0tygwWO4INYdblpGpUZm2RMhnELdd6sw4=";
-        aarch64-darwin = "sha256-vJ1tSW/ozE1Fz16RFcV46DDyyITGeuBhbqNMegIoGAo=";
-      }
-      .${stdenv.hostPlatform.system};
-    outputHashAlgo = "sha256";
-    outputHashMode = "recursive";
-  };
+  src =
+    finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
+      or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
+  sourceRoot = ".";
 
+  strictDeps = true;
   nativeBuildInputs = [
-    bun
-    makeBinaryWrapper
-    models-dev
-  ];
+    unzip
+    installShellFiles
+  ]
+  ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ];
 
-  patches = [
-    # Patch `packages/opencode/src/provider/models-macro.ts` to get contents of
-    # `_api.json` from the file bundled with `bun build`.
-    ./local-models-dev.patch
-  ];
-
-  configurePhase = ''
-    runHook preConfigure
-
-    cp -R ${finalAttrs.node_modules}/node_modules .
-
-    runHook postConfigure
-  '';
-
-  env.MODELS_DEV_API_JSON = "${models-dev}/dist/_api.json";
-
-  buildPhase = ''
-    runHook preBuild
-
-    bun build \
-      --define OPENCODE_TUI_PATH="'${finalAttrs.tui}/bin/tui'" \
-      --define OPENCODE_VERSION="'${finalAttrs.version}'" \
-      --compile \
-      --target=${bun-target.${stdenvNoCC.hostPlatform.system}} \
-      --outfile=opencode \
-      ./packages/opencode/src/index.ts \
-
-    runHook postBuild
-  '';
-
-  dontStrip = true;
+  dontConfigure = true;
+  dontBuild = true;
 
   installPhase = ''
     runHook preInstall
 
-    install -Dm755 opencode $out/bin/opencode
+    install -Dm 755 ./opencode $out/bin/opencode
 
     runHook postInstall
   '';
 
-  # Execution of commands using bash-tool fail on linux with
-  # Error [ERR_DLOPEN_FAILED]: libstdc++.so.6: cannot open shared object file: No such
-  # file or directory
-  # Thus, we add libstdc++.so.6 manually to LD_LIBRARY_PATH
-  postFixup = ''
-    wrapProgram $out/bin/opencode \
-      --set LD_LIBRARY_PATH "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}"
-  '';
-
   passthru = {
+    sources = {
+      "aarch64-darwin" = fetchurl {
+        url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-darwin-arm64.zip";
+        hash = "sha256-D34OcJgIXVkqDOf5Vyce30v5/avDKKYbOAcMWD8HmXM=";
+      };
+      "aarch64-linux" = fetchurl {
+        url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-linux-arm64.zip";
+        hash = "sha256-v3j0oL2WL4DezOxdEKgOq4f8BkdR01zlYHUzbUUjgtE=";
+      };
+      "x86_64-darwin" = fetchurl {
+        url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-darwin-x64.zip";
+        hash = "sha256-+kycX2mbCy7p6VOKO9HequCoJi/5nT8Pf09obZEuj1E=";
+      };
+      "x86_64-linux" = fetchurl {
+        url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-linux-x64.zip";
+        hash = "sha256-MO8IeCnrTUyNroY7T7XY4WCXP8wgI3r4PxhfGwprh9I=";
+      };
+    };
     tests.version = testers.testVersion {
       package = finalAttrs.finalPackage;
       command = "HOME=$(mktemp -d) opencode --version";
       inherit (finalAttrs) version;
     };
-    updateScript = nix-update-script {
-      extraArgs = [
-        "--subpackage"
-        "tui"
-        "--subpackage"
-        "node_modules"
-      ];
-    };
+    updateScript = writeShellScript "update-opencode" ''
+      set -o errexit
+      export PATH="${
+        lib.makeBinPath [
+          curl
+          jq
+          common-updater-scripts
+        ]
+      }"
+      NEW_VERSION=$(curl --silent https://api.github.com/repos/sst/opencode/releases/latest | jq '.tag_name | ltrimstr("v")' --raw-output)
+      if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then
+          echo "No update available."
+          exit 0
+      fi
+      for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do
+        update-source-version "opencode" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform"
+      done
+    '';
   };
 
   meta = {
     description = "AI coding agent built for the terminal";
-    changelog = "https://github.com/sst/opencode/releases/tag/${finalAttrs.src.tag}";
+    changelog = "https://github.com/sst/opencode/releases/tag/v${finalAttrs.version}";
     longDescription = ''
       OpenCode is a terminal-based agent that can build anything.
       It combines a TypeScript/JavaScript core with a Go-based TUI
@@ -202,7 +92,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     '';
     homepage = "https://github.com/sst/opencode";
     license = lib.licenses.mit;
-    platforms = lib.platforms.unix;
+    platforms = builtins.attrNames finalAttrs.passthru.sources;
     maintainers = with lib.maintainers; [
       zestsystem
       delafthi

From 37f37f59b59d38a9ad8044f8074edd1ac9785e85 Mon Sep 17 00:00:00 2001
From: Reuben Ferabend <63928521+railwhale@users.noreply.github.com>
Date: Wed, 29 Oct 2025 23:08:11 +1300
Subject: [PATCH 4699/6226] nixos/facter: fix conflict with `readOnlyPkgs`

---
 nixos/modules/hardware/facter/system.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/modules/hardware/facter/system.nix b/nixos/modules/hardware/facter/system.nix
index 02e329f8e162..ef51b0e44f1d 100644
--- a/nixos/modules/hardware/facter/system.nix
+++ b/nixos/modules/hardware/facter/system.nix
@@ -5,11 +5,11 @@
   ...
 }:
 {
-  # Skip setting hostPlatform in test VMs where it's read-only
-  # Tests have virtualisation.test options and import read-only.nix
-  config.nixpkgs = lib.optionalAttrs (!(options ? virtualisation.test)) {
-    hostPlatform = lib.mkIf (
-      config.hardware.facter.report.system or null != null && !options.nixpkgs.pkgs.isDefined
-    ) (lib.mkDefault config.hardware.facter.report.system);
-  };
+  # Skip setting hostPlatform if it's read-only
+  nixpkgs =
+    lib.optionalAttrs
+      (config.hardware.facter.report.system or null != null && !options.nixpkgs.hostPlatform.readOnly)
+      {
+        hostPlatform = lib.mkDefault config.hardware.facter.report.system;
+      };
 }

From 55b946d737964789380587175d14dea658ecdaee Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sat, 1 Nov 2025 16:51:10 -0400
Subject: [PATCH 4700/6226] nodePackages.create-cycle-app: drop

unmaintained and throws errors.
---
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 466 ------------------
 pkgs/top-level/aliases.nix                    |   1 +
 pkgs/top-level/all-packages.nix               |   2 -
 5 files changed, 2 insertions(+), 469 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 26007a2ff79c..2db1f0c61a26 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -93,6 +93,7 @@ mapAliases {
   inherit (pkgs) configurable-http-proxy; # added 2023-08-19
   copy-webpack-plugin = throw "copy-webpack-plugin was removed because it is a JS library, so your project should lock it with a JS package manager instead."; # Added 2024-12-16
   inherit (pkgs) cordova; # added 2023-08-18
+  create-cycle-app = throw "create-cycle-app has been removed because it is unmaintained and has issues installing with recent nodejs versions."; # Added 2025-11-01
   create-react-native-app = throw "create-react-native-app was removed because it was deprecated. Upstream suggests using a framework for React Native."; # added 2024-12-08
   inherit (pkgs) cspell;
   dat = throw "dat was removed because it was broken"; # added 2023-08-21
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index d52b3f54164c..636c48917790 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -58,7 +58,6 @@
 , "code-theme-converter"
 , "conventional-changelog-cli"
 , "cpy-cli"
-, "create-cycle-app"
 , "csslint"
 , "dhcp"
 , "diff2html-cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 68a3997d4b52..68919b112fb7 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -2064,60 +2064,6 @@ let
         sha512 = "UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==";
       };
     };
-    "@cycle/dom-18.3.0" = {
-      name = "_at_cycle_slash_dom";
-      packageName = "@cycle/dom";
-      version = "18.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cycle/dom/-/dom-18.3.0.tgz";
-        sha512 = "f0/+Hk/fCiODGlCDIcs3O5Gv4AZ8vehs/BbL8EnYB07M/H3sECxox2iYeC/1yVhiUY6kTxyF5ms5bpzJHi8jEQ==";
-      };
-    };
-    "@cycle/http-14.10.0" = {
-      name = "_at_cycle_slash_http";
-      packageName = "@cycle/http";
-      version = "14.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cycle/http/-/http-14.10.0.tgz";
-        sha512 = "FhGyDGraqIUpsBSiqgv6FJNaEJ2MVg/8oJ5obgwQgdrheSIiviXYSq+NQ6PtHfuThes/Z16aY/LrvsqLF5hJMw==";
-      };
-    };
-    "@cycle/isolate-3.4.0" = {
-      name = "_at_cycle_slash_isolate";
-      packageName = "@cycle/isolate";
-      version = "3.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cycle/isolate/-/isolate-3.4.0.tgz";
-        sha512 = "mOAlwLeTr6wTdHwKWAfaFeuKeD540kKcJlLVKsqLhbfLp6orF1B3CzMfFNlmqNY30t6o6TORCFfV+0EATK9Y7Q==";
-      };
-    };
-    "@cycle/run-3.4.0" = {
-      name = "_at_cycle_slash_run";
-      packageName = "@cycle/run";
-      version = "3.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cycle/run/-/run-3.4.0.tgz";
-        sha512 = "YUZyPu0nC4YDC31mLH5PGxbMoPEH5dNEV+nmgt34GgGgJ0ykDd4PrY7/ph5MAEpQE6rOfov0VN44qQRs6beQow==";
-      };
-    };
-    "@cycle/run-4.4.0" = {
-      name = "_at_cycle_slash_run";
-      packageName = "@cycle/run";
-      version = "4.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cycle/run/-/run-4.4.0.tgz";
-        sha512 = "vVxnTqKKlgasE+we9X2z3og8z5KouO2RMiIgHWkVek+NomsdaeZwfvbutqzm3VToEImaz0DE2Iln9AxtCOVjpQ==";
-      };
-    };
-    "@cycle/time-0.10.1" = {
-      name = "_at_cycle_slash_time";
-      packageName = "@cycle/time";
-      version = "0.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cycle/time/-/time-0.10.1.tgz";
-        sha512 = "BGzQLeZGA1PtwEkbwgItUEOEgE7kDZL151DuqMRaH172dY4NIMpFoLc6OghiGdtNBJGVkbfJ/UTKiM0iRsApIg==";
-      };
-    };
     "@dabh/diagnostics-2.0.3" = {
       name = "_at_dabh_slash_diagnostics";
       packageName = "@dabh/diagnostics";
@@ -5873,15 +5819,6 @@ let
         sha512 = "7uz5EHdzz2TqoMfV7ee61Egf5y6NkcO4FB/1iCCQnbeiI1F3xzv3vK5dBCXUCLQgGYS+mUeigK1iKQzvED+QnQ==";
       };
     };
-    "@types/cookiejar-2.1.5" = {
-      name = "_at_types_slash_cookiejar";
-      packageName = "@types/cookiejar";
-      version = "2.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/cookiejar/-/cookiejar-2.1.5.tgz";
-        sha512 = "he+DHOWReW0nghN24E1WUqM0efK4kI9oTqDm6XmK8ZPe2djZ90BSNdGnIyCLzCPw7/pogPlGbzI2wHGGmi4O/Q==";
-      };
-    };
     "@types/cors-2.8.17" = {
       name = "_at_types_slash_cors";
       packageName = "@types/cors";
@@ -6368,15 +6305,6 @@ let
         sha512 = "W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==";
       };
     };
-    "@types/superagent-3.8.2" = {
-      name = "_at_types_slash_superagent";
-      packageName = "@types/superagent";
-      version = "3.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/superagent/-/superagent-3.8.2.tgz";
-        sha512 = "kdU8ydio1weSvhIIh9rptZ6MdMiR2NQGFnlnZ5qQ7OiQS1ej79zK4GaJ9qX3naSTpOA7iWqwUnZCQpd7SpD1NA==";
-      };
-    };
     "@types/supports-color-8.1.3" = {
       name = "_at_types_slash_supports-color";
       packageName = "@types/supports-color";
@@ -12408,15 +12336,6 @@ let
         sha512 = "Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q==";
       };
     };
-    "cross-spawn-5.1.0" = {
-      name = "cross-spawn";
-      packageName = "cross-spawn";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz";
-        sha512 = "pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A==";
-      };
-    };
     "cross-spawn-6.0.6" = {
       name = "cross-spawn";
       packageName = "cross-spawn";
@@ -12534,15 +12453,6 @@ let
         sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==";
       };
     };
-    "cssauron-1.4.0" = {
-      name = "cssauron";
-      packageName = "cssauron";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cssauron/-/cssauron-1.4.0.tgz";
-        sha512 = "Ht70DcFBh+/ekjVrYS2PlDMdSQEl3OFNmjK6lcn49HptBgilXf/Zwg4uFh9Xn0pX3Q8YOkSjIFOfK2osvdqpBw==";
-      };
-    };
     "cssesc-3.0.0" = {
       name = "cssesc";
       packageName = "cssesc";
@@ -12669,15 +12579,6 @@ let
         sha512 = "TVF6svNzeQCOpjCqsy0/CSy8VgObG3wXusJ73xW2GbG5rGx7lC8zxDSURicsXI2UsGdi2L0QNRCi745/wUDvsA==";
       };
     };
-    "cycle-onionify-4.0.0" = {
-      name = "cycle-onionify";
-      packageName = "cycle-onionify";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cycle-onionify/-/cycle-onionify-4.0.0.tgz";
-        sha512 = "DJxoCbxU8lNxtTUx/q6Xzb+uTVn+MZcq8FgbFzMQlEQyH9+C1HmAPliBjmtHx40BRVE9wIqV7lGR681u2s1sHQ==";
-      };
-    };
     "cyclist-0.1.1" = {
       name = "cyclist";
       packageName = "cyclist";
@@ -13038,15 +12939,6 @@ let
         sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==";
       };
     };
-    "debug-3.2.7" = {
-      name = "debug";
-      packageName = "debug";
-      version = "3.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz";
-        sha512 = "CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==";
-      };
-    };
     "debug-4.1.1" = {
       name = "debug";
       packageName = "debug";
@@ -16764,15 +16656,6 @@ let
         sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==";
       };
     };
-    "form-data-2.5.3" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "2.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-2.5.3.tgz";
-        sha512 = "XHIrMD0NpDrNM/Ckf7XJiBbLl57KEhT3+i3yY+eWm+cqYZJQTZrKo8Y8AWKnuV5GT4scfuUGt9LzNoIx3dU1nQ==";
-      };
-    };
     "form-data-4.0.0" = {
       name = "form-data";
       packageName = "form-data";
@@ -17790,15 +17673,6 @@ let
         sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==";
       };
     };
-    "globalthis-1.0.4" = {
-      name = "globalthis";
-      packageName = "globalthis";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz";
-        sha512 = "DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==";
-      };
-    };
     "globby-11.1.0" = {
       name = "globby";
       packageName = "globby";
@@ -19599,15 +19473,6 @@ let
         sha512 = "p9+jcDKhFHKTunvpffCk7I9eKt8+NPNWO8hMSSoLPv5vahP5Vhr78qWzDtA+6FBWQtFTuLFUWmxTyhC6G2Xz/Q==";
       };
     };
-    "inquirer-3.3.0" = {
-      name = "inquirer";
-      packageName = "inquirer";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-3.3.0.tgz";
-        sha512 = "h+xtnyk4EwKvFWHrUYsWErEVR+igKtLdchu+o0Z1RL7VU/jVMFbYir2bp6bAj8efFNxWqHX0dIss6fJQ+/+qeQ==";
-      };
-    };
     "inquirer-5.2.0" = {
       name = "inquirer";
       packageName = "inquirer";
@@ -23577,15 +23442,6 @@ let
         sha512 = "WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==";
       };
     };
-    "lru-cache-4.1.5" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "4.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz";
-        sha512 = "sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==";
-      };
-    };
     "lru-cache-5.1.1" = {
       name = "lru-cache";
       packageName = "lru-cache";
@@ -29609,15 +29465,6 @@ let
         sha512 = "0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==";
       };
     };
-    "pseudomap-1.0.2" = {
-      name = "pseudomap";
-      packageName = "pseudomap";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz";
-        sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==";
-      };
-    };
     "psl-1.15.0" = {
       name = "psl";
       packageName = "psl";
@@ -29879,15 +29726,6 @@ let
         sha512 = "AAFUA5O1d83pIHEhJwWCq/RQcRukCkn/NSm2QsTEMle5f2hP0ChI2+3Xb051PZCkLryI/Ir1MVKviT2FIloaTQ==";
       };
     };
-    "quicktask-1.1.0" = {
-      name = "quicktask";
-      packageName = "quicktask";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/quicktask/-/quicktask-1.1.0.tgz";
-        sha512 = "b3w19IEXnt5auacLAbePVsqPyVQUwmuhJQrrWnVhm4pP8PAMg2U9vFHbAD9XYXXbMDjdLJs0x5NLqwTV8uFK4g==";
-      };
-    };
     "quotation-2.0.3" = {
       name = "quotation";
       packageName = "quotation";
@@ -29897,15 +29735,6 @@ let
         sha512 = "yEc24TEgCFLXx7D4JHJJkK4JFVtatO8fziwUxY4nB/Jbea9o9CVS3gt22mA0W7rPYAGW2fWzYDSOtD94PwOyqA==";
       };
     };
-    "raf-3.3.2" = {
-      name = "raf";
-      packageName = "raf";
-      version = "3.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/raf/-/raf-3.3.2.tgz";
-        sha512 = "1s5BQAy643nfjtnZZrH8V2fhj3snKrKkwp8cDaf2KfjW4/auwB+qffSEsvs1/iOuKiOr5vK7R0HQ0dQ1zituiQ==";
-      };
-    };
     "ramda-0.27.2" = {
       name = "ramda";
       packageName = "ramda";
@@ -32039,24 +31868,6 @@ let
         sha512 = "1I1+G2gteLB8Tkt8YI1sJvSIfa0lWuRtC8GjvtyPBcLSF5jBCCJJqKrpER5JU5r6Bhe+i9/pK3VMuUcXu0kdwQ==";
       };
     };
-    "rx-lite-4.0.8" = {
-      name = "rx-lite";
-      packageName = "rx-lite";
-      version = "4.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rx-lite/-/rx-lite-4.0.8.tgz";
-        sha512 = "Cun9QucwK6MIrp3mry/Y7hqD1oFqTYLQ4pGxaHTjIdaFDWRGGLikqp6u8LcWJnzpoALg9hap+JGk8sFIUuEGNA==";
-      };
-    };
-    "rx-lite-aggregates-4.0.8" = {
-      name = "rx-lite-aggregates";
-      packageName = "rx-lite-aggregates";
-      version = "4.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rx-lite-aggregates/-/rx-lite-aggregates-4.0.8.tgz";
-        sha512 = "3xPNZGW93oCjiO7PtKxRK6iOVYBWBvtf9QHDfU23Oc+dLIQmAV//UnyXV/yihv81VS/UqoQPk4NegS8EFi55Hg==";
-      };
-    };
     "rxjs-5.5.12" = {
       name = "rxjs";
       packageName = "rxjs";
@@ -33137,24 +32948,6 @@ let
         sha512 = "c3iQfVBeHIqsPW2vD7x3UcYuCl7QDNtQm+HLV3jB434hoi2A/jOOPqi1nLSuWQKX51v4j9+aMA0VN8LIOObTNw==";
       };
     };
-    "snabbdom-0.7.0" = {
-      name = "snabbdom";
-      packageName = "snabbdom";
-      version = "0.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/snabbdom/-/snabbdom-0.7.0.tgz";
-        sha512 = "LCg6lH9p2OD5n52SI4LlpYmDW2bscxsyN7rhnGJB/R3LQy/FdJfqNBM5aVST+zOfM4OdKFl8pxVUhjGsPtQA1w==";
-      };
-    };
-    "snabbdom-selector-1.2.1" = {
-      name = "snabbdom-selector";
-      packageName = "snabbdom-selector";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/snabbdom-selector/-/snabbdom-selector-1.2.1.tgz";
-        sha512 = "g0w2Ft4RJl+F/1/tQvA4BUsH09s+RNd0RRa+So24Inv5yzce5xUnPzxlEWNUBG5TwQjfKDZSFWrf2rXz+e1Q2g==";
-      };
-    };
     "snake-case-3.0.4" = {
       name = "snake-case";
       packageName = "snake-case";
@@ -33380,15 +33173,6 @@ let
         sha512 = "2sqgzeFlid6N4Z2fUQ1cvFmTOLRi/sEDzSQ0OKYchqgoPmQBVyM3959qYx3fpS6Esef80KjmpgPeEr028dP3OA==";
       };
     };
-    "sorted-immutable-list-1.1.0" = {
-      name = "sorted-immutable-list";
-      packageName = "sorted-immutable-list";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sorted-immutable-list/-/sorted-immutable-list-1.1.0.tgz";
-        sha512 = "TJBqEU5iFISlA9lfaGKK44sDo7FTLqKvGOIQh8PN/JO1uJQOL3PeAitec2sNTzVe4FiLbBpa3XNlMrd+HglkjA==";
-      };
-    };
     "source-map-0.5.7" = {
       name = "source-map";
       packageName = "source-map";
@@ -34577,15 +34361,6 @@ let
         sha512 = "MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==";
       };
     };
-    "superagent-3.8.3" = {
-      name = "superagent";
-      packageName = "superagent";
-      version = "3.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/superagent/-/superagent-3.8.3.tgz";
-        sha512 = "GLQtLMCoEIK4eDv6OGtkOoSMt3D+oq0y3dsxMuYuDvaNUvuT8eFBuLmfR0iYYzHC1e8hpzC6ZsxbuP6DIalMFA==";
-      };
-    };
     "superagent-7.1.6" = {
       name = "superagent";
       packageName = "superagent";
@@ -34721,15 +34496,6 @@ let
         sha512 = "e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ==";
       };
     };
-    "symbol-observable-2.0.3" = {
-      name = "symbol-observable";
-      packageName = "symbol-observable";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/symbol-observable/-/symbol-observable-2.0.3.tgz";
-        sha512 = "sQV7phh2WCYAn81oAkakC5qjq2Ml0g8ozqz03wOGnx9dDlG1de6yrF+0RAzSJD8fPUow3PTSMf2SAbOGxb93BA==";
-      };
-    };
     "symbol-observable-4.0.0" = {
       name = "symbol-observable";
       packageName = "symbol-observable";
@@ -37349,15 +37115,6 @@ let
         sha512 = "aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg==";
       };
     };
-    "variable-diff-1.1.0" = {
-      name = "variable-diff";
-      packageName = "variable-diff";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/variable-diff/-/variable-diff-1.1.0.tgz";
-        sha512 = "0Jk/MsCNtL/fCuVIbsLxwXpABGZCzN57btcPbSsjOOAwkdHJ3Y58fo8BoUfG7jghnvglbwo+5Hk1KOJ2W2Ormw==";
-      };
-    };
     "vary-1.1.2" = {
       name = "vary";
       packageName = "vary";
@@ -39023,15 +38780,6 @@ let
         sha512 = "SH7nAaaPQx57dx6qvfcIgqKRXIh4L0A1iYEqim4s1u7c9VoCgzZc+63FY90AKU4ZzOC2cfJzTnpO4zK7fCUzzw==";
       };
     };
-    "xstream-11.14.0" = {
-      name = "xstream";
-      packageName = "xstream";
-      version = "11.14.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xstream/-/xstream-11.14.0.tgz";
-        sha512 = "1bLb+kKKtKPbgTK6i/BaoAn03g47PpFstlbe1BA+y3pNS/LfvcaghS5BFf9+EE1J+KwSQsEpfJvFN5GqFtiNmw==";
-      };
-    };
     "xtend-2.1.2" = {
       name = "xtend";
       packageName = "xtend";
@@ -39077,15 +38825,6 @@ let
         sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==";
       };
     };
-    "yallist-2.1.2" = {
-      name = "yallist";
-      packageName = "yallist";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz";
-        sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==";
-      };
-    };
     "yallist-3.1.1" = {
       name = "yallist";
       packageName = "yallist";
@@ -45277,211 +45016,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  create-cycle-app = nodeEnv.buildNodePackage {
-    name = "create-cycle-app";
-    packageName = "create-cycle-app";
-    version = "5.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/create-cycle-app/-/create-cycle-app-5.0.0.tgz";
-      sha512 = "Ic10lxNqRXWtO9CUbvsWcOWEigWuGApKEiRo0DNybhrsCuUQBeGhxfdVRYb3TD+keK+2LVCBFCdVbWb4UqqcdA==";
-    };
-    dependencies = [
-      sources."@cycle/dom-18.3.0"
-      sources."@cycle/http-14.10.0"
-      (
-        sources."@cycle/isolate-3.4.0"
-        // {
-          dependencies = [
-            sources."@cycle/run-4.4.0"
-          ];
-        }
-      )
-      sources."@cycle/run-3.4.0"
-      sources."@cycle/time-0.10.1"
-      sources."@types/cookiejar-2.1.5"
-      sources."@types/node-22.13.10"
-      sources."@types/superagent-3.8.2"
-      sources."ansi-escapes-3.2.0"
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-2.2.1"
-      sources."asynckit-0.4.0"
-      sources."call-bind-apply-helpers-1.0.2"
-      sources."call-bound-1.0.4"
-      (
-        sources."chalk-2.4.2"
-        // {
-          dependencies = [
-            sources."ansi-styles-3.2.1"
-            sources."supports-color-5.5.0"
-          ];
-        }
-      )
-      sources."chardet-0.4.2"
-      sources."cli-cursor-2.1.0"
-      sources."cli-width-2.2.1"
-      sources."color-convert-1.9.3"
-      sources."color-name-1.1.3"
-      sources."combine-errors-3.0.3"
-      sources."combined-stream-1.0.8"
-      sources."component-emitter-1.3.1"
-      sources."cookiejar-2.1.4"
-      sources."core-util-is-1.0.3"
-      sources."cross-spawn-5.1.0"
-      sources."cssauron-1.4.0"
-      sources."custom-error-instance-2.1.1"
-      sources."cycle-onionify-4.0.0"
-      sources."d-1.0.2"
-      sources."debug-3.2.7"
-      sources."define-data-property-1.1.4"
-      sources."define-properties-1.2.1"
-      sources."delayed-stream-1.0.0"
-      sources."dunder-proto-1.0.1"
-      sources."es-define-property-1.0.1"
-      sources."es-errors-1.3.0"
-      sources."es-object-atoms-1.1.1"
-      sources."es-set-tostringtag-2.1.0"
-      sources."es5-ext-0.10.64"
-      sources."es6-iterator-2.0.3"
-      sources."es6-map-0.1.5"
-      sources."es6-set-0.1.6"
-      sources."es6-symbol-3.1.4"
-      sources."escape-string-regexp-1.0.5"
-      sources."esniff-2.0.1"
-      sources."event-emitter-0.3.5"
-      sources."ext-1.7.0"
-      sources."extend-3.0.2"
-      sources."external-editor-2.2.0"
-      sources."figures-2.0.0"
-      sources."form-data-2.5.3"
-      sources."formidable-1.2.6"
-      sources."function-bind-1.1.2"
-      sources."get-intrinsic-1.3.0"
-      sources."get-proto-1.0.1"
-      sources."globalthis-1.0.4"
-      sources."gopd-1.2.0"
-      sources."has-ansi-2.0.0"
-      sources."has-flag-3.0.0"
-      sources."has-property-descriptors-1.0.2"
-      sources."has-symbols-1.1.0"
-      sources."has-tostringtag-1.0.2"
-      sources."hasown-2.0.2"
-      sources."iconv-lite-0.4.24"
-      sources."inherits-2.0.4"
-      (
-        sources."inquirer-3.3.0"
-        // {
-          dependencies = [
-            sources."ansi-regex-3.0.1"
-            sources."strip-ansi-4.0.0"
-          ];
-        }
-      )
-      sources."is-fullwidth-code-point-2.0.0"
-      sources."isarray-1.0.0"
-      sources."isexe-2.0.0"
-      sources."lodash-4.17.21"
-      sources."lodash._baseiteratee-4.7.0"
-      sources."lodash._basetostring-4.12.0"
-      sources."lodash._baseuniq-4.6.0"
-      sources."lodash._createset-4.0.3"
-      sources."lodash._root-3.0.1"
-      sources."lodash._stringtopath-4.8.0"
-      sources."lodash.uniqby-4.5.0"
-      sources."lru-cache-4.1.5"
-      sources."math-intrinsics-1.1.0"
-      sources."methods-1.1.2"
-      sources."mime-1.6.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."mimic-fn-1.2.0"
-      sources."minimist-1.2.8"
-      sources."ms-2.1.3"
-      sources."mute-stream-0.0.7"
-      sources."next-tick-1.1.0"
-      sources."object-assign-4.1.1"
-      sources."object-inspect-1.13.4"
-      sources."object-keys-1.1.1"
-      sources."onetime-2.0.1"
-      sources."os-tmpdir-1.0.2"
-      sources."performance-now-2.1.0"
-      sources."process-nextick-args-2.0.1"
-      sources."pseudomap-1.0.2"
-      sources."qs-6.14.0"
-      sources."quicktask-1.1.0"
-      sources."raf-3.3.2"
-      (
-        sources."readable-stream-2.3.8"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      sources."restore-cursor-2.0.0"
-      sources."run-async-2.4.1"
-      sources."rx-lite-4.0.8"
-      sources."rx-lite-aggregates-4.0.8"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."setimmediate-1.0.5"
-      sources."shebang-command-1.2.0"
-      sources."shebang-regex-1.0.0"
-      sources."side-channel-1.1.0"
-      sources."side-channel-list-1.0.0"
-      sources."side-channel-map-1.0.1"
-      sources."side-channel-weakmap-1.0.2"
-      sources."signal-exit-3.0.7"
-      sources."snabbdom-0.7.0"
-      sources."snabbdom-selector-1.2.1"
-      sources."sorted-immutable-list-1.1.0"
-      (
-        sources."string-width-2.1.1"
-        // {
-          dependencies = [
-            sources."ansi-regex-3.0.1"
-            sources."strip-ansi-4.0.0"
-          ];
-        }
-      )
-      (
-        sources."string_decoder-1.1.1"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      sources."strip-ansi-3.0.1"
-      sources."superagent-3.8.3"
-      sources."supports-color-2.0.0"
-      sources."symbol-observable-2.0.3"
-      sources."through-2.3.8"
-      sources."tmp-0.0.33"
-      sources."type-2.7.3"
-      sources."undici-types-6.20.0"
-      sources."util-deprecate-1.0.2"
-      (
-        sources."variable-diff-1.1.0"
-        // {
-          dependencies = [
-            sources."chalk-1.1.3"
-          ];
-        }
-      )
-      sources."which-1.3.1"
-      sources."xstream-11.14.0"
-      sources."yallist-2.1.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Create Cycle.js with no build configuration";
-      homepage = "https://github.com/cyclejs-community/create-cycle-app#readme";
-      license = "ISC";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   csslint = nodeEnv.buildNodePackage {
     name = "csslint";
     packageName = "csslint";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 843dfc5fb3d7..77c358aefd4b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -448,6 +448,7 @@ mapAliases {
   cosmic-tasks = throw "'cosmic-tasks' has been renamed to/replaced by 'tasks'"; # Converted to throw 2025-10-27
   cotton = throw "'cotton' has been removed since it is vulnerable to CVE-2025-62518 and upstream is unmaintained"; # Added 2025-10-26
   cpp-ipfs-api = throw "'cpp-ipfs-api' has been renamed to/replaced by 'cpp-ipfs-http-client'"; # Converted to throw 2025-10-27
+  create-cycle-app = throw "'create-cycle-app' has been removed because it is unmaintained and has issues installing with recent nodejs versions."; # Added 2025-11-01
   crispyDoom = throw "'crispyDoom' has been renamed to/replaced by 'crispy-doom'"; # Converted to throw 2025-10-27
   critcl = throw "'critcl' has been renamed to/replaced by 'tclPackages.critcl'"; # Converted to throw 2025-10-27
   cromite = throw "'cromite' has been removed from nixpkgs due to it not being maintained"; # Added 2025-06-12
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8fd9d837a60..2005703e9a1a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2512,8 +2512,6 @@ with pkgs;
     singleBinary = false;
   };
 
-  create-cycle-app = nodePackages.create-cycle-app;
-
   cron = isc-cron;
 
   # Top-level fix-point used in `cudaPackages`' internals

From 63c6dfb7ec8e977d25688091bff8dbf4f72f9776 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 21:13:22 +0000
Subject: [PATCH 4701/6226] fna3d: 25.10 -> 25.11

---
 pkgs/by-name/fn/fna3d/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fn/fna3d/package.nix b/pkgs/by-name/fn/fna3d/package.nix
index dc63bb22113e..ece22b880717 100644
--- a/pkgs/by-name/fn/fna3d/package.nix
+++ b/pkgs/by-name/fn/fna3d/package.nix
@@ -10,14 +10,14 @@
 
 stdenv.mkDerivation rec {
   pname = "fna3d";
-  version = "25.10";
+  version = "25.11";
 
   src = fetchFromGitHub {
     owner = "FNA-XNA";
     repo = "FNA3D";
     tag = version;
     fetchSubmodules = true;
-    hash = "sha256-Hbj1GGKSFaP2C7V0II6x6euxRDc/BYSK00cVsFMKGEw=";
+    hash = "sha256-4+bJWmNagUtKJJHIHefQM7Tiu39+l4OE9q51c34DiEk=";
   };
 
   cmakeFlags = [

From f516853cf76530726d64556c6041212eedac996c Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 1 Nov 2025 22:14:53 +0100
Subject: [PATCH 4702/6226] sdl-jstest: disable SDL1 build

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/sd/sdl-jstest/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sd/sdl-jstest/package.nix b/pkgs/by-name/sd/sdl-jstest/package.nix
index 57e47ca9ef61..b1cb7a1c09d0 100644
--- a/pkgs/by-name/sd/sdl-jstest/package.nix
+++ b/pkgs/by-name/sd/sdl-jstest/package.nix
@@ -4,7 +4,6 @@
   fetchFromGitHub,
   cmake,
   pkg-config,
-  SDL,
   SDL2,
   ncurses,
   docbook_xsl,
@@ -24,10 +23,10 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    SDL
     SDL2
     ncurses
   ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -35,11 +34,14 @@ stdenv.mkDerivation {
     git
   ];
 
+  cmakeFlags = [ (lib.cmakeBool "BUILD_SDL_JSTEST" false) ];
+
   meta = with lib; {
     homepage = "https://github.com/Grumbel/sdl-jstest";
     description = "Simple SDL joystick test application for the console";
     license = licenses.gpl3;
     platforms = platforms.linux;
     maintainers = [ ];
+    mainProgram = "sdl2-jstest";
   };
 }

From 788250ba78d1bc35c839c7ba26c1523dec860b08 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 1 Nov 2025 22:17:33 +0100
Subject: [PATCH 4703/6226] sdl-jstest: modernize

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/sd/sdl-jstest/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sd/sdl-jstest/package.nix b/pkgs/by-name/sd/sdl-jstest/package.nix
index b1cb7a1c09d0..cd9afdb4cdb1 100644
--- a/pkgs/by-name/sd/sdl-jstest/package.nix
+++ b/pkgs/by-name/sd/sdl-jstest/package.nix
@@ -36,11 +36,11 @@ stdenv.mkDerivation {
 
   cmakeFlags = [ (lib.cmakeBool "BUILD_SDL_JSTEST" false) ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/Grumbel/sdl-jstest";
     description = "Simple SDL joystick test application for the console";
-    license = licenses.gpl3;
-    platforms = platforms.linux;
+    license = lib.licenses.gpl3Plus;
+    platforms = lib.platforms.linux;
     maintainers = [ ];
     mainProgram = "sdl2-jstest";
   };

From eb93e57d6464e3cdf758203d5bc29563d8b36ec2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 21:51:45 +0000
Subject: [PATCH 4704/6226] cursor-cli: 0-unstable-2025-10-22 ->
 0-unstable-2025-10-28

---
 pkgs/by-name/cu/cursor-cli/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix
index 55d794f0ac5c..bdb8015ce19e 100644
--- a/pkgs/by-name/cu/cursor-cli/package.nix
+++ b/pkgs/by-name/cu/cursor-cli/package.nix
@@ -9,26 +9,26 @@ let
   inherit (stdenv) hostPlatform;
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2025.10.22-f894c20/linux/x64/agent-cli-package.tar.gz";
-      hash = "sha256-bblnHWrPXJ9UmStfjUis1jLYLyawRchF0+UBMmPHy7M=";
+      url = "https://downloads.cursor.com/lab/2025.10.28-0a91dc2/linux/x64/agent-cli-package.tar.gz";
+      hash = "sha256-mZ0T7rrKzwvaNUbrHBy3XO04vZSO6RQ4RmJmrdfaoJA=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/lab/2025.10.22-f894c20/linux/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-MnL1TLI7ggi9qaicUN//8o3EJoCPd0gF9KKfekIhUM0=";
+      url = "https://downloads.cursor.com/lab/2025.10.28-0a91dc2/linux/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-bchHYPQ0O/0YWiPdj3wnq43p/fKFoP4KXpeSVWpLYpE=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2025.10.22-f894c20/darwin/x64/agent-cli-package.tar.gz";
-      hash = "sha256-UEQyHEopNKf5uDUlZVzTESXVi8e2wHp83cD01diAISY=";
+      url = "https://downloads.cursor.com/lab/2025.10.28-0a91dc2/darwin/x64/agent-cli-package.tar.gz";
+      hash = "sha256-PWx5QAs84gWNOHYZL20uFnW+m4rApRT6g4LtabjL+lw=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/lab/2025.10.22-f894c20/darwin/arm64/agent-cli-package.tar.gz";
-      hash = "sha256-18u5K/4Mc9+R32umaBWD5chgMoatkd/ZSMCiPElmPJU=";
+      url = "https://downloads.cursor.com/lab/2025.10.28-0a91dc2/darwin/arm64/agent-cli-package.tar.gz";
+      hash = "sha256-VW76Lx2VKspiGkphp74ib4+F5FCdu8793f+xvD67OpM=";
     };
   };
 in
 stdenv.mkDerivation {
   pname = "cursor-cli";
-  version = "0-unstable-2025-10-22";
+  version = "0-unstable-2025-10-28";
 
   src = sources.${hostPlatform.system};
 

From 47502d47722cc8dc83bfaa79f6487dc67db0af3a Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sat, 1 Nov 2025 15:13:12 -0500
Subject: [PATCH 4705/6226] dosbox: migrate to by-name

---
 .../dosbox/default.nix => by-name/do/dosbox/package.nix}      | 2 +-
 pkgs/top-level/all-packages.nix                               | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)
 rename pkgs/{applications/emulators/dosbox/default.nix => by-name/do/dosbox/package.nix} (98%)

diff --git a/pkgs/applications/emulators/dosbox/default.nix b/pkgs/by-name/do/dosbox/package.nix
similarity index 98%
rename from pkgs/applications/emulators/dosbox/default.nix
rename to pkgs/by-name/do/dosbox/package.nix
index 7057f08a8e9d..b6a7cce40efd 100644
--- a/pkgs/applications/emulators/dosbox/default.nix
+++ b/pkgs/by-name/do/dosbox/package.nix
@@ -39,7 +39,7 @@ stdenv.mkDerivation rec {
     autoreconfHook
     copyDesktopItems
     graphicsmagick
-    SDL # for sdl-config during build time
+    SDL
   ];
 
   depsBuildBuild = [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index f8fd9d837a60..27a3db1de03a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1308,10 +1308,6 @@ with pkgs;
 
   cdemu-daemon = callPackage ../applications/emulators/cdemu/daemon.nix { };
 
-  dosbox = callPackage ../applications/emulators/dosbox {
-    SDL = if stdenv.hostPlatform.isDarwin then SDL else SDL_compat;
-  };
-
   fceux-qt5 = fceux.override { ___qtVersion = "5"; };
   fceux-qt6 = fceux.override { ___qtVersion = "6"; };
 

From f72cb1669a015e175d0f09efabc67e451fa9874f Mon Sep 17 00:00:00 2001
From: Will Fancher <elvishjerricco@gmail.com>
Date: Sat, 1 Nov 2025 17:53:42 -0400
Subject: [PATCH 4706/6226] linux/common-config: Disable `LEGACY_TIOCSTI`

See the commit message adding the kconfig:
https://github.com/torvalds/linux/commit/83efeeeb3d04b22aaed1df99bc70a48fe9d22c4d

At least Fedora and Arch both appear to disable this on their kernels.
---
 pkgs/os-specific/linux/kernel/common-config.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 4fa16a094bdc..db639b58f417 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -1409,6 +1409,8 @@ let
         TASK_XACCT = yes;
         TASK_IO_ACCOUNTING = yes;
 
+        LEGACY_TIOCSTI = whenAtLeast "6.2" no;
+
         # Fresh toolchains frequently break -Werror build for minor issues.
         WERROR = whenAtLeast "5.15" no;
 

From cd6eb54878d50d772682f2457f5263b138c55b0b Mon Sep 17 00:00:00 2001
From: Samuel Dionne-Riel <samuel@dionne-riel.com>
Date: Sat, 1 Nov 2025 17:57:50 -0400
Subject: [PATCH 4707/6226] linux: Partially revert "linux: drop hacky passing
 around of positions"

This partially reverts commit 845e340ed98ef6d8a5c5d7069663f2cd034e508a.

This re-introduces the `pos` juggling previous done.

The rationale used in the commit was:

> This is long obsolete since the versions are maintained in a JSON
> file now.

That is only accurate for `mainline`. Other in-tree kernels are
maintained in different ways. This led to a loss of information.

Before (cf3f5c4def3c):

```
nix-repl> linux_latest.meta.position
".../pkgs/os-specific/linux/kernel/mainline.nix:34"
nix-repl> linux_rpi0.meta.position
".../pkgs/os-specific/linux/kernel/linux-rpi.nix:20"

```

After (2fb006b87f04c):

```
nix-repl> linux_latest.meta.position
".../pkgs/os-specific/linux/kernel/build.nix:558"
nix-repl> linux_rpi0.meta.position
".../pkgs/os-specific/linux/kernel/build.nix:558"
```

This is also observable for out-of-tree kernels:

```
nix-repl> pkgs.linux_jovian.meta.position
".../Jovian-NixOS/pkgs/linux-jovian/default.nix:11"

nix-repl> :r # after updating the Nixpkgs input

nix-repl> pkgs.linux_jovian.meta.position
"/nix/store/xjjq52iwslhz6lbc621a31v0nfdhr5ks-source/pkgs/os-specific/linux/kernel/build.nix:558"
```

This also conveniently works around the root cause of an
`stdenv.mkDerivation`-based `pos` infrec regression when using the
kernel package version in a NixOS configuration to conditionally
apply kernel patches.
---
 pkgs/os-specific/linux/kernel/build.nix   | 4 ++++
 pkgs/os-specific/linux/kernel/generic.nix | 1 +
 2 files changed, 5 insertions(+)

diff --git a/pkgs/os-specific/linux/kernel/build.nix b/pkgs/os-specific/linux/kernel/build.nix
index da50861fb459..4ec0c63cb761 100644
--- a/pkgs/os-specific/linux/kernel/build.nix
+++ b/pkgs/os-specific/linux/kernel/build.nix
@@ -51,6 +51,8 @@ lib.makeOverridable (
     version,
     # The kernel pname (should be set for variants)
     pname ? "linux",
+    # Position of the Linux build expression
+    pos ? null,
     # Additional kernel make flags
     extraMakeFlags ? [ ],
     # The name of the kernel module directory
@@ -551,6 +553,8 @@ lib.makeOverridable (
 
     karch = stdenv.hostPlatform.linuxArch;
 
+    pos = lib.optionalDrvAttr (pos != null) pos;
+
     meta = {
       # https://github.com/NixOS/nixpkgs/pull/345534#issuecomment-2391238381
       broken = withRust && lib.versionOlder version "6.12";
diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix
index 8eecd334df70..456e9052d5c2 100644
--- a/pkgs/os-specific/linux/kernel/generic.nix
+++ b/pkgs/os-specific/linux/kernel/generic.nix
@@ -293,6 +293,7 @@ let
           configfile
           modDirVersion
           ;
+        pos = builtins.unsafeGetAttrPos "version" args;
 
         config = {
           CONFIG_MODULES = "y";

From 384dc3816109ba11708a1bb810a10a0f9c318d66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 15:37:00 -0700
Subject: [PATCH 4708/6226] python3Packages.textnets: skip test broken by
 igraph 1.0.0

---
 pkgs/development/python-modules/textnets/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/textnets/default.nix b/pkgs/development/python-modules/textnets/default.nix
index 3456f1b11050..d36f9e66e6db 100644
--- a/pkgs/development/python-modules/textnets/default.nix
+++ b/pkgs/development/python-modules/textnets/default.nix
@@ -69,6 +69,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # https://github.com/jboynyc/textnets/issues/66
+    "test_textnet_save_and_load"
+  ];
+
   pythonImportsCheck = [ "textnets" ];
 
   # Enable the package to find the cythonized .so files during testing. See #255262

From 1446e202504026f7c670edce540afdd3073cebf1 Mon Sep 17 00:00:00 2001
From: ash <x-hv2j5m@keysmash.solutions>
Date: Fri, 31 Oct 2025 20:36:20 +0000
Subject: [PATCH 4709/6226] aliases: fix `warnAlias` mangling attrsets

---
 pkgs/top-level/aliases.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index a8f9b06c4ad8..3db000733369 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -225,7 +225,7 @@ let
     if lib.isDerivation v then
       lib.warnOnInstantiate msg v
     else if lib.isAttrs v then
-      lib.mapAttrs (lib.warn msg) v
+      lib.mapAttrs (_: lib.warn msg) v
     else if lib.isFunction v then
       arg: lib.warn msg (v arg)
     else if lib.isList v then

From 0d0e0653a668636c1e4786b76ec5efbc0e364440 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 1 Nov 2025 23:01:32 +0000
Subject: [PATCH 4710/6226] terraform-providers.hashicorp_awscc: 1.61.0 ->
 1.62.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 b75f41877bba..7f41f4cee947 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -498,13 +498,13 @@
     "vendorHash": "sha256-Nxw5C4li2kH6MAlyaqHAUL+XYyuVPZYSkQ6PnmL3sV8="
   },
   "hashicorp_awscc": {
-    "hash": "sha256-SrJQG1F9V/HThL6TDduT/qEA2x3tzII56+JMVDFpqEk=",
+    "hash": "sha256-36mL++CVhKitNxzvTyNzvTsmBscZyRlBVOOYZCceqDk=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/awscc",
     "owner": "hashicorp",
     "repo": "terraform-provider-awscc",
-    "rev": "v1.61.0",
+    "rev": "v1.62.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-WKshejs/cOtCGpMLxrnzRV+eKDPkPWIjK2nvwDodoDk="
+    "vendorHash": "sha256-AfHyD8OqqBuwkKJOAJmzMxIsIFqnzT+dTFg6jH8qcKk="
   },
   "hashicorp_azuread": {
     "hash": "sha256-9vGXzFLRaQPXECcFtZMnbhHQvEm0FeGwYm4K9utpZf4=",

From b26f260a8280329d2e90f9f3fadd472113a7e13b Mon Sep 17 00:00:00 2001
From: arthsmn <arthsmn@proton.me>
Date: Sat, 1 Nov 2025 20:11:02 -0300
Subject: [PATCH 4711/6226] valuta: 1.3.2 -> 1.4.2

---
 pkgs/by-name/va/valuta/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/va/valuta/package.nix b/pkgs/by-name/va/valuta/package.nix
index 8e7c473742b1..366bdc07e61a 100644
--- a/pkgs/by-name/va/valuta/package.nix
+++ b/pkgs/by-name/va/valuta/package.nix
@@ -17,7 +17,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "valuta";
-  version = "1.3.2";
+  version = "1.4.2";
 
   pyproject = false;
 
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication rec {
     owner = "ideveCore";
     repo = "Valuta";
     rev = "v${version}";
-    hash = "sha256-g2x+pqs7dXdTMSxzSU5TeQtE+Q+tdQ93xaMtUVEE5/U=";
+    hash = "sha256-1vcjmSXEKy6XTEPV5jiz+ZxzFFUhVnmLK6MDjqoWTHs=";
   };
 
   nativeBuildInputs = [

From 830653ddac09678b1ed52ca05508af6457ea1744 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Sat, 1 Nov 2025 22:39:25 +0000
Subject: [PATCH 4712/6226] ci/README: document nixpkgs-merge-bot

Based on the README on the old nixpkgs-merge-bot repo[1], but updated to
reflect the current reality.

[1]: https://github.com/NixOS/nixpkgs-merge-bot
---
 ci/README.md | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/ci/README.md b/ci/README.md
index 389ef59f57b9..df0b9a12384a 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -18,6 +18,41 @@ The goal is to eventually have all GitHub specific code in `ci/github-script` an
 A lot of code has already been migrated, but some Bash code still remains.
 New CI features need to be introduced in JavaScript, not Bash.
 
+## Nixpkgs merge bot
+
+The Nixpkgs merge bot empowers package maintainers by enabling them to merge PRs related to their own packages.
+It serves as a bridge for maintainers to quickly respond to user feedback, facilitating a more self-reliant approach.
+Especially when considering there are roughly 20 maintainers for every committer, this bot is a game-changer.
+
+Following [RFC 172] the merge bot was originally implemented as a [python webapp](https://github.com/NixOS/nixpkgs-merge-bot), which has now been integrated into [`ci/github-script/bot.js`](./github-script/bot.js) and [`ci/github-script/merge.js`](./github-script/merge.js).
+
+### Using the merge bot
+
+To merge a PR, maintainers can simply comment:
+```gfm
+@NixOS/nixpkgs-merge-bot merge
+```
+
+The next time the bot runs it will verify the below constraints, then (if satisfied) merge the PR.
+
+The merge bot will reference [#306934](https://github.com/NixOS/nixpkgs/issues/306934) on PRs it merges successfully, [#305350](https://github.com/NixOS/nixpkgs/issues/305350) for unsuccessful attempts, or [#371492](https://github.com/NixOS/nixpkgs/issues/371492) if an error occurs.
+These issues effectively list PRs the merge bot has interacted with.
+
+### Merge bot constraints
+
+To ensure security and a focused utility, the bot adheres to specific limitations:
+
+- The PR targets `master`, `staging`, or `staging-next`.
+- The PR only touches files located under `pkgs/by-name/*`.
+- The PR is authored by [@r-ryantm](https://nix-community.github.io/nixpkgs-update/r-ryantm/) or a [committer][@NixOS/nixpkgs-committers].
+- The user attempting to merge is a member of [@NixOS/nixpkgs-maintainers].
+- The user attempting to merge is a maintainer of all packages touched by the PR.
+
+### Approving merge bot changes
+
+Changes to the bot can usually be approved by the [@NixOS/nixpkgs-ci] team, as with other CI changes.
+However, additional acknowledgement from the [@NixOS/nixpkgs-core] team is required for changes to what the merge bot will merge, who is eligible to use the merge bot, or similar changes in scope.
+
 ## `ci/nixpkgs-vet.sh BASE_BRANCH [REPOSITORY]`
 
 Runs the [`nixpkgs-vet` tool](https://github.com/NixOS/nixpkgs-vet) on the HEAD commit, closely matching what CI does.
@@ -58,3 +93,10 @@ Some branches also have a version component, which is either `unstable` or `YY.M
 `ci/supportedBranches.js` is a script imported by CI to classify the base and head branches of a Pull Request.
 This classification will then be used to skip certain jobs.
 This script can also be run locally to print basic test cases.
+
+
+[@NixOS/nixpkgs-maintainers]: https://github.com/orgs/NixOS/teams/nixpkgs-maintainers
+[@NixOS/nixpkgs-committers]: https://github.com/orgs/NixOS/teams/nixpkgs-committers
+[@NixOS/nixpkgs-ci]: https://github.com/orgs/NixOS/teams/nixpkgs-ci
+[@NixOS/nixpkgs-core]: https://github.com/orgs/NixOS/teams/nixpkgs-core
+[RFC 172]: https://github.com/NixOS/rfcs/pull/172

From d4dd65937e96f8a65a46a904e08cc104f8132c0a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Sun, 2 Nov 2025 01:04:01 +0100
Subject: [PATCH 4713/6226] zigbee2mqtt: 2.6.2 -> 2.6.3

https://github.com/Koenkk/zigbee2mqtt/releases/tag/2.6.3
---
 pkgs/by-name/zi/zigbee2mqtt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/zi/zigbee2mqtt/package.nix b/pkgs/by-name/zi/zigbee2mqtt/package.nix
index 3536c881cae6..2c894ab0d819 100644
--- a/pkgs/by-name/zi/zigbee2mqtt/package.nix
+++ b/pkgs/by-name/zi/zigbee2mqtt/package.nix
@@ -16,19 +16,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "zigbee2mqtt";
-  version = "2.6.2";
+  version = "2.6.3";
 
   src = fetchFromGitHub {
     owner = "Koenkk";
     repo = "zigbee2mqtt";
     tag = finalAttrs.version;
-    hash = "sha256-tPjIfFAXtezdHDXBSAYLRPYd0G4p1XnU9R36YBRkYTQ=";
+    hash = "sha256-50f5cSwrLiGfMeb3pqOc+599f0y8vG/7emQO1GLrO/4=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-E4FAtOa8FQnPbv0wiMdp1k/L/RYoVOLMPZynag5iGjM=";
+    hash = "sha256-Z8wZX4kGvCG6uAwBxhtY8kFn7WPid8PuxPFjr95nE/I=";
   };
 
   nativeBuildInputs = [

From dc77e91bb2b74de3e55df8f22b42f47bb35d0cb6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 00:15:56 +0000
Subject: [PATCH 4714/6226] python3Packages.mayim: 1.2.0 -> 1.3.0

---
 pkgs/development/python-modules/mayim/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mayim/default.nix b/pkgs/development/python-modules/mayim/default.nix
index 47d33a4c6aa5..8fd4a5732aa2 100644
--- a/pkgs/development/python-modules/mayim/default.nix
+++ b/pkgs/development/python-modules/mayim/default.nix
@@ -18,14 +18,14 @@
 
 buildPythonPackage rec {
   pname = "mayim";
-  version = "1.2.0";
+  version = "1.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ahopkins";
     repo = "mayim";
     tag = "v${version}";
-    hash = "sha256-azAx/+y1wrUsacCmQ1SCSkn4svf6GzSfhEW3WJwjoks=";
+    hash = "sha256-mXGbPPO19H6fsWkvRzYyIVykHRryQo46WtH/XfqSIgY=";
   };
 
   build-system = [

From 4da82aad39dc5dceafb602c71a3c86ddc4dde412 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 00:18:16 +0000
Subject: [PATCH 4715/6226] python3Packages.textual-serve: 1.1.2 -> 1.1.3

---
 pkgs/development/python-modules/textual-serve/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/textual-serve/default.nix b/pkgs/development/python-modules/textual-serve/default.nix
index 947bb63bdb26..87de708b2192 100644
--- a/pkgs/development/python-modules/textual-serve/default.nix
+++ b/pkgs/development/python-modules/textual-serve/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "textual-serve";
-  version = "1.1.2";
+  version = "1.1.3";
   pyproject = true;
 
   # No tags on GitHub
   src = fetchPypi {
     pname = "textual_serve";
     inherit version;
-    hash = "sha256-DMr5ud+cCNSy16CIfK0yciQ7qH9oGSw2T0vtW2g+S9Q=";
+    hash = "sha256-+PY2ri9f1lG3nZZUc8PpOD01Ic34lvm8KJcJGF2j9oM=";
   };
 
   build-system = [

From 8cf2fa69124bb7a6a03db11b8703c68173f78de4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 00:24:16 +0000
Subject: [PATCH 4716/6226] lrcsnc: 0.1.0 -> 0.1.1

---
 pkgs/by-name/lr/lrcsnc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lr/lrcsnc/package.nix b/pkgs/by-name/lr/lrcsnc/package.nix
index d2759ad8b7cb..198bb78c6a09 100644
--- a/pkgs/by-name/lr/lrcsnc/package.nix
+++ b/pkgs/by-name/lr/lrcsnc/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "lrcsnc";
-  version = "0.1.0";
+  version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "Endg4meZer0";
     repo = "lrcsnc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gKb0cTpCPlyvJFthV1csn8HaVcUvXq+KC+nTT5sGhww=";
+    hash = "sha256-fXsXRv6h7HfEUhszxSIxv2mnkrm7DLm4Zpw7/beNn2I=";
   };
 
   vendorHash = "sha256-ww+SXy29woGlb120sj1oGb4MIQJzpBCKGpUKYsYxTMk=";

From 0abec8eac557c2c9e52ce428dae637babeb55b71 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 00:51:30 +0000
Subject: [PATCH 4717/6226] python3Packages.bitsandbytes: 0.48.1 -> 0.48.2

---
 pkgs/development/python-modules/bitsandbytes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix
index 125386dec9b6..1cd1ef0b98e7 100644
--- a/pkgs/development/python-modules/bitsandbytes/default.nix
+++ b/pkgs/development/python-modules/bitsandbytes/default.nix
@@ -26,7 +26,7 @@
 
 let
   pname = "bitsandbytes";
-  version = "0.48.1";
+  version = "0.48.2";
 
   brokenConditions = lib.attrsets.filterAttrs (_: cond: cond) {
     "CUDA and ROCm are mutually exclusive" = cudaSupport && rocmSupport;
@@ -78,7 +78,7 @@ buildPythonPackage {
     owner = "bitsandbytes-foundation";
     repo = "bitsandbytes";
     tag = version;
-    hash = "sha256-OkhWv5Mb/cnWJteCXvDEkWQvK+QK26YQex39yWIezrQ=";
+    hash = "sha256-gtNOMxLeYTCZK5MVdpjOFOw6rxvqS+XJmY1Meiuz0Rw=";
   };
 
   patches = [

From 7e49f0d1d2c0cafb1168b0f8c6a353da581f2630 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 17:53:46 -0700
Subject: [PATCH 4718/6226] python3Packages.pytraccar: run tests

---
 pkgs/development/python-modules/pytraccar/default.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/pytraccar/default.nix b/pkgs/development/python-modules/pytraccar/default.nix
index 47c3a7233882..0a6c9873dc10 100644
--- a/pkgs/development/python-modules/pytraccar/default.nix
+++ b/pkgs/development/python-modules/pytraccar/default.nix
@@ -6,7 +6,6 @@
   poetry-core,
   pytestCheckHook,
   pytest-asyncio,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -14,8 +13,6 @@ buildPythonPackage rec {
   version = "3.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "ludeeus";
     repo = "pytraccar";
@@ -23,12 +20,9 @@ buildPythonPackage rec {
     hash = "sha256-DtxZCvLuvQpbu/1lIXz2BVbACt5Q1N2txVMyqwd4d9A=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [ aiohttp ];
-
-  # https://github.com/ludeeus/pytraccar/issues/31
-  doCheck = lib.versionOlder aiohttp.version "3.9.0";
+  dependencies = [ aiohttp ];
 
   nativeCheckInputs = [
     pytestCheckHook

From a638aca719601708cacedaebea241dc4a4941da9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 01:30:38 +0000
Subject: [PATCH 4719/6226] quantframe: 1.5.4 -> 1.5.9

---
 pkgs/by-name/qu/quantframe/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qu/quantframe/package.nix b/pkgs/by-name/qu/quantframe/package.nix
index 3be23108664b..dd896003c073 100644
--- a/pkgs/by-name/qu/quantframe/package.nix
+++ b/pkgs/by-name/qu/quantframe/package.nix
@@ -17,13 +17,13 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "quantframe";
-  version = "1.5.4";
+  version = "1.5.9";
 
   src = fetchFromGitHub {
     owner = "Kenya-DK";
     repo = "quantframe-react";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-PCfejmL+dztzw2bBZxXzZlXBiSLO/eRgvP9jLK/G8PQ=";
+    hash = "sha256-jrGDgK/Z9oLSvtFfC+uIs0vj4Nku4Sp/bdR1MX/SK2E=";
   };
 
   postPatch = ''

From cabace071c787cd4b2eadf3cae94ded0fd2b8d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 18:32:33 -0700
Subject: [PATCH 4720/6226] python3Packages.flake8-deprecated: 2.2.1 -> 2.3.0

Diff: https://github.com/gforcada/flake8-deprecated/compare/2.2.1...2.3.0

Changelog: https://github.com/gforcada/flake8-deprecated/blob/2.3.0/CHANGES.rst
---
 .../flake8-deprecated/default.nix             | 23 +++++++++----------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/flake8-deprecated/default.nix b/pkgs/development/python-modules/flake8-deprecated/default.nix
index e7601e6190bf..1c7fd6615d48 100644
--- a/pkgs/development/python-modules/flake8-deprecated/default.nix
+++ b/pkgs/development/python-modules/flake8-deprecated/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
-  pythonOlder,
-  fetchPypi,
+  fetchFromGitHub,
   buildPythonPackage,
   hatchling,
   flake8,
@@ -10,15 +9,14 @@
 
 buildPythonPackage rec {
   pname = "flake8-deprecated";
-  version = "2.2.1";
+  version = "2.3.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    pname = "flake8_deprecated";
-    inherit version;
-    hash = "sha256-7pbKAB0coFYfqORvI+LSRgsYqGaWNzyrZE4QKuD/KqI=";
+  src = fetchFromGitHub {
+    owner = "gforcada";
+    repo = "flake8-deprecated";
+    tag = version;
+    hash = "sha256-KF0hWhMZEWuSPUyfStayNa5Nfss9NpTvMXPeemWbQXU=";
   };
 
   build-system = [ hatchling ];
@@ -31,10 +29,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "flake8_deprecated" ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/gforcada/flake8-deprecated/blob/${src.tag}/CHANGES.rst";
     description = "Flake8 plugin that warns about deprecated method calls";
     homepage = "https://github.com/gforcada/flake8-deprecated";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ lopsided98 ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ lopsided98 ];
   };
 }

From 45e80db7d19d70926ca182ada77878d3335faf63 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 02:04:57 +0000
Subject: [PATCH 4721/6226] go-httpbin: 2.18.3 -> 2.19.0

---
 pkgs/by-name/go/go-httpbin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/go-httpbin/package.nix b/pkgs/by-name/go/go-httpbin/package.nix
index 9a77b98f4619..3ae14e615cb7 100644
--- a/pkgs/by-name/go/go-httpbin/package.nix
+++ b/pkgs/by-name/go/go-httpbin/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-httpbin";
-  version = "2.18.3";
+  version = "2.19.0";
 
   src = fetchFromGitHub {
     owner = "mccutchen";
     repo = "go-httpbin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ixEbmppQ+4Udc5ytV4YPOpOT/iEbhjQIYGoOGL0dIw8=";
+    hash = "sha256-agElHziDwv2MGwTUKPsyDMVlTNNkuSZp4OAR2/zbW1U=";
   };
 
   vendorHash = null;

From ce38be4442a326369862e703b4dafe24ca1fec4a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 02:24:19 +0000
Subject: [PATCH 4722/6226] _1password-gui: 8.11.14 -> 8.11.16

---
 pkgs/by-name/_1/_1password-gui/sources.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json
index 60fc6b2e723b..f0da36a7578b 100644
--- a/pkgs/by-name/_1/_1password-gui/sources.json
+++ b/pkgs/by-name/_1/_1password-gui/sources.json
@@ -1,28 +1,28 @@
 {
   "stable": {
     "linux": {
-      "version": "8.11.14",
+      "version": "8.11.16",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.14.x64.tar.gz",
-          "hash": "sha256-LdGw2AVDiQXwGAz9abEeoCosQUdr5q978OMo+kXATIc="
+          "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.11.16.x64.tar.gz",
+          "hash": "sha256-LZ0V296GLLdeokj3mgD0LnQCHqlMHnMwPLHlwI5b1K0="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.14.arm64.tar.gz",
-          "hash": "sha256-U+wJEH5NwWuPV+Oy6RJ+dki4lJB2A9aOVjvRSkm6zfY="
+          "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.11.16.arm64.tar.gz",
+          "hash": "sha256-itykcOtXCtODeJ7CtasN8M4Aq8DCV2pumpy646PADiE="
         }
       }
     },
     "darwin": {
-      "version": "8.11.14",
+      "version": "8.11.16",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.14-x86_64.zip",
-          "hash": "sha256-GXbwYxFNw6R8UdKxPL6k2lQF4uabFRgaEKNaFzecnZ0="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.16-x86_64.zip",
+          "hash": "sha256-puVz4k5jSFgkExE78sdxawCtVJzAqtP9jEEc+H4geMY="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.14-aarch64.zip",
-          "hash": "sha256-rViZC9b6kOaqkNNJibABmWu0Z5PEtBQE0jGtaUdd4LY="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.16-aarch64.zip",
+          "hash": "sha256-xuN6l5ejj7SZp1uGhAIaha+qMUfStZm2kTkPJU9pnos="
         }
       }
     }

From a62e8b86a5c43d6bd3ed567de8afaf2fd3ca2c81 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 02:31:08 +0000
Subject: [PATCH 4723/6226] prometheus-pushgateway: 1.11.1 -> 1.11.2

---
 pkgs/by-name/pr/prometheus-pushgateway/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/prometheus-pushgateway/package.nix b/pkgs/by-name/pr/prometheus-pushgateway/package.nix
index 4c6b453c5271..ddf5cab71bb8 100644
--- a/pkgs/by-name/pr/prometheus-pushgateway/package.nix
+++ b/pkgs/by-name/pr/prometheus-pushgateway/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "pushgateway";
-  version = "1.11.1";
+  version = "1.11.2";
 
   src = fetchFromGitHub {
     owner = "prometheus";
     repo = "pushgateway";
     rev = "v${version}";
-    sha256 = "sha256-qcG7yTJN+HvzX1MB6ImF2umT/HLqohFeUwIc/86G/ec=";
+    sha256 = "sha256-Mc4yEd9CRfLZ4ZpcMnwQpoIXQpUerdxYD90FWRBzS20=";
   };
 
-  vendorHash = "sha256-CUL9jj4Xu3G5+MIVCCY9IW4SxBe3xqaZatxA+0Our2M=";
+  vendorHash = "sha256-O/Vgn3WC0ZzRy5L/m0qR970joGtqQWWlmethoHAypgY=";
 
   ldflags = [
     "-s"

From c50f55a5b816f4bf3bbee610ef8d93f23102541f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 02:38:02 +0000
Subject: [PATCH 4724/6226] codebook: 0.3.15 -> 0.3.16

---
 pkgs/by-name/co/codebook/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix
index bc35fe20a220..45d274a0adec 100644
--- a/pkgs/by-name/co/codebook/package.nix
+++ b/pkgs/by-name/co/codebook/package.nix
@@ -7,17 +7,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codebook";
-  version = "0.3.15";
+  version = "0.3.16";
 
   src = fetchFromGitHub {
     owner = "blopker";
     repo = "codebook";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Sv1rB6Jvg+FX5NuWr4jwCwLdVPuub8OK1+Nin2D4XVY=";
+    hash = "sha256-kunYcWwb4b8ryQYZpG623RcyZaiWTGTKCXjfUq8iz+o=";
   };
 
   buildAndTestSubdir = "crates/codebook-lsp";
-  cargoHash = "sha256-DRXTCquhGhNIby+HMQZGF8NWAbto5Egaij6jDVwnSHQ=";
+  cargoHash = "sha256-cHcSmTEW4xpZkrv4a2lgTlK2VU7+kOvZiEo//jrnd8E=";
 
   # Integration tests require internet access for dictionaries
   doCheck = false;

From 5d41406ecfe3a1bfc3fefeda9d99bb190130b559 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sun, 2 Nov 2025 03:44:56 +0100
Subject: [PATCH 4725/6226] topgrade: 16.0.4 -> 16.1.2

Diff: https://github.com/topgrade-rs/topgrade/compare/v16.0.4...v16.1.2

Changelog: https://github.com/topgrade-rs/topgrade/releases/tag/v16.1.2
---
 pkgs/by-name/to/topgrade/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/to/topgrade/package.nix b/pkgs/by-name/to/topgrade/package.nix
index 7a01f13de2a8..97807599db2e 100644
--- a/pkgs/by-name/to/topgrade/package.nix
+++ b/pkgs/by-name/to/topgrade/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "topgrade";
-  version = "16.0.4";
+  version = "16.1.2";
 
   src = fetchFromGitHub {
     owner = "topgrade-rs";
     repo = "topgrade";
     rev = "v${version}";
-    hash = "sha256-b/xzmC49ETGtcf9ekrSkq75cKxSL4ZrvKPkparwz6zU=";
+    hash = "sha256-oDIEvBM7TDJlnkZSHkbtIUGRJ+RK48u9S4tuMeKSwO0=";
   };
 
-  cargoHash = "sha256-d6jX+3ZcCswhKy5SsSpvXZL9el70+OyIa7lYQ3B/o8M=";
+  cargoHash = "sha256-9jfKnjCbxo47qUWYdqBHoObxth3pporRZ0oauCkWwkc=";
 
   nativeBuildInputs = [
     installShellFiles

From 542f16f85f79e233fe4bec7c9c11fa9fa7a3d09c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 02:54:25 +0000
Subject: [PATCH 4726/6226] fetchmail: 6.5.7 -> 6.6.0

---
 pkgs/applications/misc/fetchmail/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix
index f25cc0a69017..ab61a26c5a32 100644
--- a/pkgs/applications/misc/fetchmail/default.nix
+++ b/pkgs/applications/misc/fetchmail/default.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "fetchmail";
-  version = "6.5.7";
+  version = "6.6.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
-    hash = "sha256-c+trHUIbWYaGatSmt3fBFAo5AFKYxjv4R95TeXbL+9s=";
+    hash = "sha256-e5wZ5mg+gn1VZ1GqXbXUS5Yeh76LMIdTW0kJuhtZMhw=";
   };
 
   buildInputs = [

From 625ab2b7e8ba6c8758ff32e632647e5193bb1db3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 02:54:33 +0000
Subject: [PATCH 4727/6226] prefect: 3.4.24 -> 3.5.0

---
 pkgs/by-name/pr/prefect/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/prefect/package.nix b/pkgs/by-name/pr/prefect/package.nix
index 18a6ca071b44..7c9776d635e6 100644
--- a/pkgs/by-name/pr/prefect/package.nix
+++ b/pkgs/by-name/pr/prefect/package.nix
@@ -8,7 +8,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "prefect";
-  version = "3.4.24";
+  version = "3.5.0";
   pyproject = true;
 
   # Trying to install from source is challenging
@@ -17,7 +17,7 @@ python3Packages.buildPythonApplication rec {
   # Source will be missing sdist, uv.lock, ui artefacts ...
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-jBDHgGNZRl1nr5qpj/5r5+D7o1skFFPcd6yTe60uMlE=";
+    hash = "sha256-BazzO+gR/mLcx+tlysPMJzcqmctUU0LSYL0YMZMyVrg=";
   };
 
   pythonRelaxDeps = [

From eaf80a754462f7df023cc232d2900bda067c85e0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 29 Oct 2025 18:42:39 -0700
Subject: [PATCH 4728/6226] udisks: modernize

---
 pkgs/os-specific/linux/udisks/2-default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix
index e3b9ea635d73..0514dac00904 100644
--- a/pkgs/os-specific/linux/udisks/2-default.nix
+++ b/pkgs/os-specific/linux/udisks/2-default.nix
@@ -47,8 +47,8 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "storaged-project";
     repo = "udisks";
-    rev = "${pname}-${version}";
-    sha256 = "sha256-W0vZY6tYxAJbqxNF3F6F6J6h6XxLT+Fon+LqR6jwFUQ=";
+    tag = "udisks-${version}";
+    hash = "sha256-W0vZY6tYxAJbqxNF3F6F6J6h6XxLT+Fon+LqR6jwFUQ=";
   };
 
   outputs = [
@@ -154,15 +154,15 @@ stdenv.mkDerivation rec {
     tests.vm = nixosTests.udisks2;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Daemon, tools and libraries to access and manipulate disks, storage devices and technologies";
     homepage = "https://www.freedesktop.org/wiki/Software/udisks/";
-    license = with licenses; [
+    license = with lib.licenses; [
       lgpl2Plus
       gpl2Plus
     ]; # lgpl2Plus for the library, gpl2Plus for the tools & daemon
-    maintainers = with maintainers; [ johnazoidberg ];
-    teams = [ teams.freedesktop ];
-    platforms = platforms.linux;
+    maintainers = with lib.maintainers; [ johnazoidberg ];
+    teams = [ lib.teams.freedesktop ];
+    platforms = lib.platforms.linux;
   };
 }

From 772dc221ae01f5de99f24d55b3692178937ddf6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 29 Oct 2025 18:45:24 -0700
Subject: [PATCH 4729/6226] udisks: move to pkgs/by-name

---
 pkgs/{os-specific/linux => by-name/ud}/udisks/fix-paths.patch  | 0
 pkgs/{os-specific/linux => by-name/ud}/udisks/force-path.patch | 0
 .../udisks/2-default.nix => by-name/ud/udisks/package.nix}     | 0
 pkgs/top-level/all-packages.nix                                | 3 +--
 4 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/{os-specific/linux => by-name/ud}/udisks/fix-paths.patch (100%)
 rename pkgs/{os-specific/linux => by-name/ud}/udisks/force-path.patch (100%)
 rename pkgs/{os-specific/linux/udisks/2-default.nix => by-name/ud/udisks/package.nix} (100%)

diff --git a/pkgs/os-specific/linux/udisks/fix-paths.patch b/pkgs/by-name/ud/udisks/fix-paths.patch
similarity index 100%
rename from pkgs/os-specific/linux/udisks/fix-paths.patch
rename to pkgs/by-name/ud/udisks/fix-paths.patch
diff --git a/pkgs/os-specific/linux/udisks/force-path.patch b/pkgs/by-name/ud/udisks/force-path.patch
similarity index 100%
rename from pkgs/os-specific/linux/udisks/force-path.patch
rename to pkgs/by-name/ud/udisks/force-path.patch
diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/by-name/ud/udisks/package.nix
similarity index 100%
rename from pkgs/os-specific/linux/udisks/2-default.nix
rename to pkgs/by-name/ud/udisks/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27a3db1de03a..5c32a5a4f265 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10337,8 +10337,7 @@ with pkgs;
     util-linux = util-linuxMinimal;
   };
 
-  udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { };
-  udisks = udisks2;
+  udisks2 = udisks;
 
   usbrelay = callPackage ../os-specific/linux/usbrelay { };
   usbrelayd = callPackage ../os-specific/linux/usbrelay/daemon.nix { };

From 702ded4de3c915bcbb49c82ad11388efa743873a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 30 Oct 2025 10:09:15 -0700
Subject: [PATCH 4730/6226] udisks2: turn into alias

---
 nixos/modules/services/hardware/udisks2.nix                   | 2 +-
 nixos/modules/services/misc/devmon.nix                        | 2 +-
 pkgs/applications/misc/cubocore-packages/libcsys/default.nix  | 4 ++--
 pkgs/by-name/bu/budgie-control-center/package.nix             | 4 ++--
 pkgs/by-name/ca/cantata/package.nix                           | 4 ++--
 pkgs/by-name/gn/gnome-control-center/package.nix              | 4 ++--
 pkgs/by-name/gn/gnome-disk-utility/package.nix                | 4 ++--
 pkgs/by-name/gv/gvfs/package.nix                              | 4 ++--
 pkgs/by-name/me/mediawriter/package.nix                       | 4 ++--
 pkgs/by-name/sp/spaceFM/package.nix                           | 4 ++--
 pkgs/by-name/ud/udiskie/package.nix                           | 4 ++--
 pkgs/by-name/us/usermount/package.nix                         | 4 ++--
 pkgs/by-name/vi/vifm/package.nix                              | 4 ++--
 pkgs/desktops/enlightenment/enlightenment/default.nix         | 4 ++--
 pkgs/desktops/mate/mate-control-center/default.nix            | 4 ++--
 pkgs/desktops/mate/mate-utils/default.nix                     | 4 ++--
 pkgs/desktops/pantheon/apps/elementary-monitor/default.nix    | 4 ++--
 .../pantheon/apps/switchboard-plugs/about/default.nix         | 4 ++--
 pkgs/top-level/aliases.nix                                    | 1 +
 pkgs/top-level/all-packages.nix                               | 4 +---
 20 files changed, 36 insertions(+), 37 deletions(-)

diff --git a/nixos/modules/services/hardware/udisks2.nix b/nixos/modules/services/hardware/udisks2.nix
index cbde9ca600d0..02edf5c8c259 100644
--- a/nixos/modules/services/hardware/udisks2.nix
+++ b/nixos/modules/services/hardware/udisks2.nix
@@ -25,7 +25,7 @@ in
 
       enable = lib.mkEnableOption "udisks2, a DBus service that allows applications to query and manipulate storage devices";
 
-      package = lib.mkPackageOption pkgs "udisks2" { };
+      package = lib.mkPackageOption pkgs "udisks" { };
 
       mountOnMedia = lib.mkOption {
         type = lib.types.bool;
diff --git a/nixos/modules/services/misc/devmon.nix b/nixos/modules/services/misc/devmon.nix
index 7bf801c6a4f5..64b356daae00 100644
--- a/nixos/modules/services/misc/devmon.nix
+++ b/nixos/modules/services/misc/devmon.nix
@@ -22,7 +22,7 @@ in
       path = [
         pkgs.udevil
         pkgs.procps
-        pkgs.udisks2
+        pkgs.udisks
         pkgs.which
       ];
       serviceConfig.ExecStart = "${pkgs.udevil}/bin/devmon";
diff --git a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix
index 0a028ddb8351..6948ca925f1e 100644
--- a/pkgs/applications/misc/cubocore-packages/libcsys/default.nix
+++ b/pkgs/applications/misc/cubocore-packages/libcsys/default.nix
@@ -2,7 +2,7 @@
   lib,
   stdenv,
   fetchFromGitLab,
-  udisks2,
+  udisks,
   qt6,
   cmake,
   ninja,
@@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     qt6.qtbase
-    udisks2
+    udisks
   ];
 
   dontWrapQtApps = true;
diff --git a/pkgs/by-name/bu/budgie-control-center/package.nix b/pkgs/by-name/bu/budgie-control-center/package.nix
index b638f9246ba0..0ac083351767 100644
--- a/pkgs/by-name/bu/budgie-control-center/package.nix
+++ b/pkgs/by-name/bu/budgie-control-center/package.nix
@@ -61,7 +61,7 @@
   shared-mime-info,
   testers,
   tzdata,
-  udisks2,
+  udisks,
   upower,
   webp-pixbuf-loader,
   wrapGAppsHook3,
@@ -145,7 +145,7 @@ stdenv.mkDerivation (finalAttrs: {
     networkmanager
     polkit
     samba
-    udisks2
+    udisks
     upower
   ];
 
diff --git a/pkgs/by-name/ca/cantata/package.nix b/pkgs/by-name/ca/cantata/package.nix
index 35482d168b9d..7f64c6c1d881 100644
--- a/pkgs/by-name/ca/cantata/package.nix
+++ b/pkgs/by-name/ca/cantata/package.nix
@@ -32,7 +32,7 @@
   libmtp,
   withOnlineServices ? true,
   withDevices ? true,
-  udisks2,
+  udisks,
   withDynamic ? true,
   withHttpServer ? true,
   withLibVlc ? true,
@@ -156,7 +156,7 @@ let
     {
       names = [ "UDISKS2" ];
       enable = withUdisks;
-      pkgs = [ udisks2 ];
+      pkgs = [ udisks ];
     }
   ];
 
diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix
index 2d5710716277..9b54758a8489 100644
--- a/pkgs/by-name/gn/gnome-control-center/package.nix
+++ b/pkgs/by-name/gn/gnome-control-center/package.nix
@@ -63,7 +63,7 @@
   tinysparql,
   localsearch,
   tzdata,
-  udisks2,
+  udisks,
   upower,
   wayland-scanner,
   libepoxy,
@@ -147,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: {
     samba
     tinysparql
     localsearch # for search locations dialog
-    udisks2
+    udisks
     upower
     # For animations in Mouse panel.
     gst_all_1.gst-plugins-base
diff --git a/pkgs/by-name/gn/gnome-disk-utility/package.nix b/pkgs/by-name/gn/gnome-disk-utility/package.nix
index 5231521e2431..5d0e571627ae 100644
--- a/pkgs/by-name/gn/gnome-disk-utility/package.nix
+++ b/pkgs/by-name/gn/gnome-disk-utility/package.nix
@@ -24,7 +24,7 @@
   ninja,
   pkg-config,
   systemd,
-  udisks2,
+  udisks,
   wrapGAppsHook3,
   xz,
 }:
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     libpwquality
     libsecret
     systemd
-    udisks2
+    udisks
     xz
   ];
 
diff --git a/pkgs/by-name/gv/gvfs/package.nix b/pkgs/by-name/gv/gvfs/package.nix
index e1d23355789c..e8e383077aee 100644
--- a/pkgs/by-name/gv/gvfs/package.nix
+++ b/pkgs/by-name/gv/gvfs/package.nix
@@ -11,7 +11,7 @@
   glib,
   udevSupport ? stdenv.hostPlatform.isLinux,
   libgudev,
-  udisks2,
+  udisks,
   libgcrypt,
   libcap,
   polkit,
@@ -94,7 +94,7 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals udevSupport [
     libgudev
-    udisks2
+    udisks
     fuse3
     libcdio
     samba
diff --git a/pkgs/by-name/me/mediawriter/package.nix b/pkgs/by-name/me/mediawriter/package.nix
index 4f6cee140794..fdcf965a896c 100644
--- a/pkgs/by-name/me/mediawriter/package.nix
+++ b/pkgs/by-name/me/mediawriter/package.nix
@@ -6,7 +6,7 @@
   cmake,
   fetchFromGitHub,
   qt6,
-  udisks2,
+  udisks,
   xz,
 }:
 
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
     qt6.qtbase
     qt6.qtdeclarative
     qt6.qtsvg
-    udisks2
+    udisks
     xz
   ];
 
diff --git a/pkgs/by-name/sp/spaceFM/package.nix b/pkgs/by-name/sp/spaceFM/package.nix
index e7180c74a156..7a00979d9b47 100644
--- a/pkgs/by-name/sp/spaceFM/package.nix
+++ b/pkgs/by-name/sp/spaceFM/package.nix
@@ -16,7 +16,7 @@
   ifuseSupport ? false,
   ifuse ? null,
   lsof,
-  udisks2,
+  udisks,
 }:
 
 stdenv.mkDerivation rec {
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     ffmpegthumbnailer
     jmtpfs
     lsof
-    udisks2
+    udisks
   ]
   ++ (lib.optionals ifuseSupport [ ifuse ]);
   # Introduced because ifuse doesn't build due to CVEs in libplist
diff --git a/pkgs/by-name/ud/udiskie/package.nix b/pkgs/by-name/ud/udiskie/package.nix
index 1fa8d58a5c8c..eeb66d548513 100644
--- a/pkgs/by-name/ud/udiskie/package.nix
+++ b/pkgs/by-name/ud/udiskie/package.nix
@@ -9,7 +9,7 @@
   libnotify,
   librsvg,
   python3Packages,
-  udisks2,
+  udisks,
   wrapGAppsHook3,
   testers,
   udiskie,
@@ -54,7 +54,7 @@ python3Packages.buildPythonApplication rec {
     libappindicator-gtk3
     libnotify
     librsvg # SVG icons
-    udisks2
+    udisks
   ];
 
   dependencies = with python3Packages; [
diff --git a/pkgs/by-name/us/usermount/package.nix b/pkgs/by-name/us/usermount/package.nix
index 3c8478000037..f1d02de14496 100644
--- a/pkgs/by-name/us/usermount/package.nix
+++ b/pkgs/by-name/us/usermount/package.nix
@@ -5,7 +5,7 @@
   pkg-config,
   dbus,
   libnotify,
-  udisks2,
+  udisks,
   gdk-pixbuf,
 }:
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   buildInputs = [
     dbus
     libnotify
-    udisks2
+    udisks
     gdk-pixbuf
   ];
 
diff --git a/pkgs/by-name/vi/vifm/package.nix b/pkgs/by-name/vi/vifm/package.nix
index 542cd901e8c6..b7b828443966 100644
--- a/pkgs/by-name/vi/vifm/package.nix
+++ b/pkgs/by-name/vi/vifm/package.nix
@@ -13,7 +13,7 @@
   # adds support for handling removable media (vifm-media). Linux only!
   mediaSupport ? false,
   python3 ? null,
-  udisks2 ? null,
+  udisks ? null,
   lib ? null,
   gitUpdater,
 }:
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
   postFixup =
     let
       path = lib.makeBinPath [
-        udisks2
+        udisks
         (python3.withPackages (p: [ p.dbus-python ]))
       ];
 
diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix
index 8521e6ff85cd..cbbe5d32c719 100644
--- a/pkgs/desktops/enlightenment/enlightenment/default.nix
+++ b/pkgs/desktops/enlightenment/enlightenment/default.nix
@@ -14,7 +14,7 @@
   libexif,
   pam,
   xkeyboard_config,
-  udisks2,
+  udisks,
   waylandSupport ? false,
   wayland-protocols,
   xwayland,
@@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
     libexif
     pam
     xkeyboard_config
-    udisks2 # for removable storage mounting/unmounting
+    udisks # for removable storage mounting/unmounting
   ]
   ++ lib.optional bluetoothSupport bluez5 # for bluetooth configuration and control
   ++ lib.optional pulseSupport libpulseaudio # for proper audio device control and redirection
diff --git a/pkgs/desktops/mate/mate-control-center/default.nix b/pkgs/desktops/mate/mate-control-center/default.nix
index 4a4126538b12..0ff0deef6bc3 100644
--- a/pkgs/desktops/mate/mate-control-center/default.nix
+++ b/pkgs/desktops/mate/mate-control-center/default.nix
@@ -28,7 +28,7 @@
   mate-menus,
   mate-panel,
   mate-settings-daemon,
-  udisks2,
+  udisks,
   systemd,
   hicolor-icon-theme,
   wrapGAppsHook3,
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
     mate-menus
     mate-panel # for org.mate.panel schema, see m-c-c#678
     mate-settings-daemon
-    udisks2
+    udisks
     systemd
   ];
 
diff --git a/pkgs/desktops/mate/mate-utils/default.nix b/pkgs/desktops/mate/mate-utils/default.nix
index ced2cfb68fb5..ac75a4848548 100644
--- a/pkgs/desktops/mate/mate-utils/default.nix
+++ b/pkgs/desktops/mate/mate-utils/default.nix
@@ -12,7 +12,7 @@
   libgtop,
   libcanberra-gtk3,
   inkscape,
-  udisks2,
+  udisks,
   mate-desktop,
   mate-panel,
   hicolor-icon-theme,
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
     libgtop
     libcanberra-gtk3
     libxml2
-    udisks2
+    udisks
     mate-desktop
     mate-panel
     hicolor-icon-theme
diff --git a/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix b/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix
index 0bcd1ea66166..bc03018529f3 100644
--- a/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-monitor/default.nix
@@ -22,7 +22,7 @@
   linuxPackages,
   live-chart,
   pciutils,
-  udisks2,
+  udisks,
   wingpanel,
   nix-update-script,
 }:
@@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: {
     linuxPackages.nvidia_x11.settings.libXNVCtrl
     live-chart
     pciutils
-    udisks2
+    udisks
     wingpanel
   ];
 
diff --git a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
index 91d7fb794fb0..fe14c2553960 100644
--- a/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
+++ b/pkgs/desktops/pantheon/apps/switchboard-plugs/about/default.nix
@@ -19,7 +19,7 @@
   packagekit,
   polkit,
   switchboard,
-  udisks2,
+  udisks,
   fwupd,
   appstream,
   elementary-settings-daemon,
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
     packagekit
     polkit
     switchboard
-    udisks2
+    udisks
   ];
 
   passthru = {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ba2b7755c455..47bc57b53499 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1524,6 +1524,7 @@ mapAliases {
   uade123 = throw "'uade123' has been renamed to/replaced by 'uade'"; # Converted to throw 2025-10-27
   uae = throw "'uae' has been removed due to lack of upstream maintenance. Consider using 'fsuae' instead."; # Added 2025-06-11
   ubuntu_font_family = throw "'ubuntu_font_family' has been renamed to/replaced by 'ubuntu-classic'"; # Converted to throw 2025-10-27
+  udisks2 = udisks; # added 2025-10-30
   unicap = throw "'unicap' has been removed because it is unmaintained"; # Added 2025-05-17
   unifi-poller = throw "'unifi-poller' has been renamed to/replaced by 'unpoller'"; # Converted to throw 2025-10-27
   unzoo = throw "'unzoo' has been removed since it is unmaintained upstream and doesn't compile with newer versions of GCC anymore"; # Removed 2025-05-24
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5c32a5a4f265..47d28220b825 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1419,7 +1419,7 @@ with pkgs;
 
   vifm-full = vifm.override {
     mediaSupport = true;
-    inherit lib udisks2 python3;
+    inherit lib udisks python3;
   };
 
   xfe = callPackage ../by-name/xf/xfe/package.nix {
@@ -10337,8 +10337,6 @@ with pkgs;
     util-linux = util-linuxMinimal;
   };
 
-  udisks2 = udisks;
-
   usbrelay = callPackage ../os-specific/linux/usbrelay { };
   usbrelayd = callPackage ../os-specific/linux/usbrelay/daemon.nix { };
 

From 0479a0b1ef58db1b593882c0dc5023fd4634c354 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 03:19:17 +0000
Subject: [PATCH 4731/6226] rime-wanxiang: 13.1.9 -> 13.2.4

---
 pkgs/by-name/ri/rime-wanxiang/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ri/rime-wanxiang/package.nix b/pkgs/by-name/ri/rime-wanxiang/package.nix
index 448ec74d24a7..ed1f0ca85a1f 100644
--- a/pkgs/by-name/ri/rime-wanxiang/package.nix
+++ b/pkgs/by-name/ri/rime-wanxiang/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rime-wanxiang";
-  version = "13.1.9";
+  version = "13.2.4";
 
   src = fetchFromGitHub {
     owner = "amzxyz";
     repo = "rime_wanxiang";
     tag = "v" + finalAttrs.version;
-    hash = "sha256-OQhjOXJ0wyJfMx9GMkmTdhf9vF6tX4t8o7a1xl6s6wk=";
+    hash = "sha256-kr9Gr6GBWy/SJtjHqdATbcZAF4Gt3bbkI956NQCAwCc=";
   };
 
   installPhase = ''

From 7f89ec838a10595141645f7cee7f474b914db543 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 03:21:29 +0000
Subject: [PATCH 4732/6226] backrest: 1.9.2 -> 1.10.1

---
 pkgs/by-name/ba/backrest/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix
index 56315431180a..2ab3f13341b0 100644
--- a/pkgs/by-name/ba/backrest/package.nix
+++ b/pkgs/by-name/ba/backrest/package.nix
@@ -14,13 +14,13 @@
 }:
 let
   pname = "backrest";
-  version = "1.9.2";
+  version = "1.10.1";
 
   src = fetchFromGitHub {
     owner = "garethgeorge";
     repo = "backrest";
     tag = "v${version}";
-    hash = "sha256-3lAWViC9K34R8la/z57kjGJmMmletGd8pJ1dDt+BeKQ=";
+    hash = "sha256-8WWs7XEVKAc/XmeL+dsw25azfLjUbHKp2MsB6Be14VE=";
   };
 
   frontend = stdenv.mkDerivation (finalAttrs: {
@@ -64,7 +64,7 @@ buildGoModule {
       internal/resticinstaller/resticinstaller.go
   '';
 
-  vendorHash = "sha256-oycV8JAJQF/PNc7mmYGzkZbpG8pMwxThmuys9e0+hcc=";
+  vendorHash = "sha256-cYqK/sddLI38K9bzCpnomcZOYbSRDBOEru4Y26rBLFw=";
 
   nativeBuildInputs = [
     gzip

From 2a47d5c6b6c1659fc57bc501f18e1f1343ef6c82 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 03:24:23 +0000
Subject: [PATCH 4733/6226] python3Packages.types-decorator: 5.2.0.20250324 ->
 5.2.0.20251101

---
 pkgs/development/python-modules/types-decorator/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/types-decorator/default.nix b/pkgs/development/python-modules/types-decorator/default.nix
index e732c6ad25d1..f322c2778a06 100644
--- a/pkgs/development/python-modules/types-decorator/default.nix
+++ b/pkgs/development/python-modules/types-decorator/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-decorator";
-  version = "5.2.0.20250324";
+  version = "5.2.0.20251101";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_decorator";
     inherit version;
-    hash = "sha256-j71ysNrcVhduSOUYfedE52/kW8yRolh0uqdWYkEhVdM=";
+    hash = "sha256-Eg4r9HkuyKR2U9scs4DHqstoYqeXwUkKkQqswhVIKGw=";
   };
 
   build-system = [ setuptools ];

From 5ecffc5205805a20609d4cc7bd160c28446e8e1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 20:27:38 -0700
Subject: [PATCH 4734/6226] fetchmail: move to pkgs/by-name

---
 .../fetchmail/default.nix => by-name/fe/fetchmail/package.nix}   | 0
 pkgs/top-level/all-packages.nix                                  | 1 -
 2 files changed, 1 deletion(-)
 rename pkgs/{applications/misc/fetchmail/default.nix => by-name/fe/fetchmail/package.nix} (100%)

diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/by-name/fe/fetchmail/package.nix
similarity index 100%
rename from pkgs/applications/misc/fetchmail/default.nix
rename to pkgs/by-name/fe/fetchmail/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 27a3db1de03a..0495fd741b74 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10951,7 +10951,6 @@ with pkgs;
         ];
       };
 
-  fetchmail = callPackage ../applications/misc/fetchmail { };
   fetchmail_7 = callPackage ../applications/misc/fetchmail/v7.nix { };
 
   firewalld-gui = firewalld.override { withGui = true; };

From 27b3cce3f2501df4499769154b9a6879ad415368 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 20:29:58 -0700
Subject: [PATCH 4735/6226] fetchmail_7: move to pkgs/by-name

---
 .../fetchmail/v7.nix => by-name/fe/fetchmail_7/package.nix}     | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 2 files changed, 2 deletions(-)
 rename pkgs/{applications/misc/fetchmail/v7.nix => by-name/fe/fetchmail_7/package.nix} (100%)

diff --git a/pkgs/applications/misc/fetchmail/v7.nix b/pkgs/by-name/fe/fetchmail_7/package.nix
similarity index 100%
rename from pkgs/applications/misc/fetchmail/v7.nix
rename to pkgs/by-name/fe/fetchmail_7/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0495fd741b74..0130772f5741 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -10951,8 +10951,6 @@ with pkgs;
         ];
       };
 
-  fetchmail_7 = callPackage ../applications/misc/fetchmail/v7.nix { };
-
   firewalld-gui = firewalld.override { withGui = true; };
 
   fldigi = callPackage ../applications/radio/fldigi {

From 58a59d0bcbadaf53ba3c326c48cc93085ac261e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 03:39:29 +0000
Subject: [PATCH 4736/6226] remnote: 1.21.9 -> 1.21.24

---
 pkgs/by-name/re/remnote/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/remnote/package.nix b/pkgs/by-name/re/remnote/package.nix
index e83afc7a0d0d..aeeaaf4751df 100644
--- a/pkgs/by-name/re/remnote/package.nix
+++ b/pkgs/by-name/re/remnote/package.nix
@@ -6,10 +6,10 @@
 }:
 let
   pname = "remnote";
-  version = "1.21.9";
+  version = "1.21.24";
   src = fetchurl {
     url = "https://download2.remnote.io/remnote-desktop2/RemNote-${version}.AppImage";
-    hash = "sha256-ywVNcB15Qp150gdhnweNMjYyI8w80tNxVXNDvv01Dpg=";
+    hash = "sha256-jJ7I5Xgq6RHZ4pT8VTMikX1f38C9FqLtJaSSgc2rWHA=";
   };
   appimageContents = appimageTools.extractType2 { inherit pname version src; };
 in

From ef48572a2e492d7cf7ee2128ed3b8988873ae11e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 03:42:21 +0000
Subject: [PATCH 4737/6226] mcap-cli: 0.0.55 -> 0.0.56

---
 pkgs/by-name/mc/mcap-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mc/mcap-cli/package.nix b/pkgs/by-name/mc/mcap-cli/package.nix
index ce2bf85ac5b2..f59859e0989b 100644
--- a/pkgs/by-name/mc/mcap-cli/package.nix
+++ b/pkgs/by-name/mc/mcap-cli/package.nix
@@ -8,7 +8,7 @@
   nix-update-script,
 }:
 let
-  version = "0.0.55";
+  version = "0.0.56";
 in
 buildGoModule {
 
@@ -20,7 +20,7 @@ buildGoModule {
     repo = "mcap";
     owner = "foxglove";
     rev = "releases/mcap-cli/v${version}";
-    hash = "sha256-3HV7FNlS91J089FgtKOQEXCzQEoDR39w0kBB8H88rSw=";
+    hash = "sha256-PPllUAkcuv/FXIjsuJFJ9KbzA6qHCaOBQz77N7D2JtA=";
   };
 
   vendorHash = "sha256-twuXJXiGhjTqlEZ3xD8G9CruSLxFC33PMs2GZadl1Ow=";

From 568735719ba4dbb7308c3b096c237893fb76339a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 03:49:50 +0000
Subject: [PATCH 4738/6226] terraform-providers.auth0_auth0: 1.32.0 -> 1.33.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 7f41f4cee947..093947426af2 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -63,13 +63,13 @@
     "vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g="
   },
   "auth0_auth0": {
-    "hash": "sha256-59GW5hWNTWc1OyoEuHLSRRw5HFYfTV+Tp6vB5Jj5Gtw=",
+    "hash": "sha256-+Bd+Nc16DqKcO6srCyNjYoEWvckJA8z5GyoGYylh2rg=",
     "homepage": "https://registry.terraform.io/providers/auth0/auth0",
     "owner": "auth0",
     "repo": "terraform-provider-auth0",
-    "rev": "v1.32.0",
+    "rev": "v1.33.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-z0YJIZ3PSZany4acKYOIP575qg8iaBJcDhlhzr+RptU="
+    "vendorHash": "sha256-xeng27kJrugxYZfZatrTLG0gql3xDJlnDWJ9pNFOp0c="
   },
   "aviatrixsystems_aviatrix": {
     "hash": "sha256-V1JRVOMHQu5KlPFw7q/qZuHlJjdVSQotI9w7s88v8GM=",

From 010b78c05781df05318f6eca96593d724e92745a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 04:14:52 +0000
Subject: [PATCH 4739/6226] noto-fonts: 2025.10.01 -> 2025.11.01

---
 pkgs/by-name/no/noto-fonts/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/no/noto-fonts/package.nix b/pkgs/by-name/no/noto-fonts/package.nix
index bfa4d6b2ab67..5757eef4320c 100644
--- a/pkgs/by-name/no/noto-fonts/package.nix
+++ b/pkgs/by-name/no/noto-fonts/package.nix
@@ -20,13 +20,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "noto-fonts${suffix}";
-  version = "2025.10.01";
+  version = "2025.11.01";
 
   src = fetchFromGitHub {
     owner = "notofonts";
     repo = "notofonts.github.io";
     rev = "noto-monthly-release-${version}";
-    hash = "sha256-SIF6G84sUvFSVatmZdF1zQve3pOYtlawJIXYFSW2srI=";
+    hash = "sha256-T7F8SUCbEEuJfgUYWk+/lDGuXn/df2DaGc+3hCuYhS0=";
   };
 
   outputs = [

From 14090557017bf13671872ae13372b3fc1695b47d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 04:18:11 +0000
Subject: [PATCH 4740/6226] picom-pijulius: 8.2-unstable-2025-08-25 ->
 8.2-unstable-2025-11-01

---
 pkgs/by-name/pi/picom-pijulius/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pi/picom-pijulius/package.nix b/pkgs/by-name/pi/picom-pijulius/package.nix
index de91c084031c..adf44f0f5af6 100644
--- a/pkgs/by-name/pi/picom-pijulius/package.nix
+++ b/pkgs/by-name/pi/picom-pijulius/package.nix
@@ -8,13 +8,13 @@
 
 picom.overrideAttrs (previousAttrs: {
   pname = "picom-pijulius";
-  version = "8.2-unstable-2025-08-25";
+  version = "8.2-unstable-2025-11-01";
 
   src = fetchFromGitHub {
     owner = "pijulius";
     repo = "picom";
-    rev = "8efe4707c7bc4e0baccd51166ea8e0d08d96bd85";
-    hash = "sha256-KCK6/gmcs2VFd64veL9w27LWjCWoA7WT221dv89dGZc=";
+    rev = "efaa7efdca20dda01f34c3a16bd2aadb1417c643";
+    hash = "sha256-YF1pCbrQAvC+mLbj6WeOZzcrdhpge2MDtXiNHcjTGvs=";
   };
 
   dontVersionCheck = true;

From 81cdc5ac214ac25a82d502ce622dae93ac8e4324 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 04:37:52 +0000
Subject: [PATCH 4741/6226] dbgate: 6.6.5 -> 6.6.9

---
 pkgs/by-name/db/dbgate/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/db/dbgate/package.nix b/pkgs/by-name/db/dbgate/package.nix
index 5150df43c757..dafa593efec1 100644
--- a/pkgs/by-name/db/dbgate/package.nix
+++ b/pkgs/by-name/db/dbgate/package.nix
@@ -8,25 +8,25 @@
 
 let
   pname = "dbgate";
-  version = "6.6.5";
+  version = "6.6.9";
   src =
     fetchurl
       {
         aarch64-linux = {
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_arm64.AppImage";
-          hash = "sha256-DIlFERRnNdh6VzApYNDoiUb78lESfE2RTgmEsffJ5EI=";
+          hash = "sha256-RS7fFP1ek59VvUv8Q7kjHSVUlH3r+ir3csotWHvyXaM=";
         };
         x86_64-linux = {
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage";
-          hash = "sha256-xn6KhD08K57T9kWy7AHvIar22zGXV+6/geK3dGIxKhk=";
+          hash = "sha256-S+OSTa0g8//ORhRrsfrdRcIkk8EavTKjw4sYOdGXvfE=";
         };
         x86_64-darwin = {
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg";
-          hash = "sha256-ycThFJ+f6NOWI97KyqgMES2Y2ZZ1aBkggBe6Z50Vhjs=";
+          hash = "sha256-qu2We2ejeRP51DcG8CsMQ2GpfZZoA073dNUaBcStI90=";
         };
         aarch64-darwin = {
           url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg";
-          hash = "sha256-bE16GScBk9a32k49P9WuT4fymscdY2AyP9k29UsN8HY=";
+          hash = "sha256-fW2Cz2u9LM2KMhGjbhq7EI0Oc8ACkTxddE2hOxR8TNU=";
         };
       }
       .${stdenv.hostPlatform.system} or (throw "dbgate: ${stdenv.hostPlatform.system} is unsupported.");

From f234302ec5a95bf2ac69483a29fc0863bc2846cf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 05:04:31 +0000
Subject: [PATCH 4742/6226] tparted: 2025-10-10 -> 2025-10-31

---
 pkgs/by-name/tp/tparted/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tp/tparted/package.nix b/pkgs/by-name/tp/tparted/package.nix
index 474f5d8d30ad..e2d8f8f56ea8 100644
--- a/pkgs/by-name/tp/tparted/package.nix
+++ b/pkgs/by-name/tp/tparted/package.nix
@@ -19,11 +19,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tparted";
-  version = "2025-10-10";
+  version = "2025-10-31";
 
   src = fetchurl {
     url = "https://github.com/Kagamma/tparted/releases/download/${finalAttrs.version}/linux_x86-64_tparted_${finalAttrs.version}.tar.gz";
-    hash = "sha256-eLeo+6AGUghrU5szkUFNcieQPA3D/D5pjZV4ZrINiGY=";
+    hash = "sha256-uBuYZUiQB/RnAXRNqwkz87rYjBanqiJBbRFAPSmEmnw=";
   };
 
   nativeBuildInputs = [

From 963c65f4ec7058b06f3e2375942ffc1e7c672855 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 05:23:56 +0000
Subject: [PATCH 4743/6226] protoc-gen-swift: 1.32.0 -> 1.33.3

---
 pkgs/by-name/pr/protoc-gen-swift/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/protoc-gen-swift/package.nix b/pkgs/by-name/pr/protoc-gen-swift/package.nix
index 939702ab34ca..c725f9afe1ca 100644
--- a/pkgs/by-name/pr/protoc-gen-swift/package.nix
+++ b/pkgs/by-name/pr/protoc-gen-swift/package.nix
@@ -11,13 +11,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "protoc-gen-swift";
-  version = "1.32.0";
+  version = "1.33.3";
 
   src = fetchFromGitHub {
     owner = "apple";
     repo = "swift-protobuf";
     rev = "${finalAttrs.version}";
-    hash = "sha256-YirKJjEA5zFVVs8U1/D3TYCgv+3FMO7dusCZ7ZuIeZs=";
+    hash = "sha256-FFFHnxuynKfcmWCgJ38rKk3FS/o5buLYS7VcEivF0v0=";
   };
 
   nativeBuildInputs = [

From df033f9879b8c2bcbee8ffefc0f93ece37856fb3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 05:24:21 +0000
Subject: [PATCH 4744/6226] pop-hp-wallpapers: 0-unstable-2022-04-01 ->
 0-unstable-2025-10-28

---
 pkgs/by-name/po/pop-hp-wallpapers/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/po/pop-hp-wallpapers/package.nix b/pkgs/by-name/po/pop-hp-wallpapers/package.nix
index 92e10c5e06b1..535476b673cb 100644
--- a/pkgs/by-name/po/pop-hp-wallpapers/package.nix
+++ b/pkgs/by-name/po/pop-hp-wallpapers/package.nix
@@ -8,15 +8,15 @@
 
 stdenvNoCC.mkDerivation {
   pname = "pop-hp-wallpapers";
-  version = "0-unstable-2022-04-01";
+  version = "0-unstable-2025-10-28";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "hp-wallpapers";
-    rev = "df86078846b0a2a4e3e64f584aaf2a21be47a7eb";
+    rev = "94f7df30f6bf1c3d71522018852d77c10b920ea3";
     forceFetchGit = true;
     fetchLFS = true;
-    hash = "sha256-NGSvPC9GadqqqgGH9uDNAYuSwfagosmCAE6QmDtmdMw=";
+    hash = "sha256-AthVQ9kQO+CvSH1xxz/U6WzAtpcXK1gvRwKyeo0vMSs=";
   };
 
   nativeBuildInputs = [ imagemagick ];

From ddee1c92686d329a880f4da82be1d2762acc265d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 05:35:50 +0000
Subject: [PATCH 4745/6226] vivify: 0.10.0 -> 0.11.0

---
 pkgs/by-name/vi/vivify/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/vivify/package.nix b/pkgs/by-name/vi/vivify/package.nix
index 32e76c26cb4c..e466377401d0 100644
--- a/pkgs/by-name/vi/vivify/package.nix
+++ b/pkgs/by-name/vi/vivify/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vivify";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "jannis-baum";
     repo = "Vivify";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-n2l0+CFQ7EXnTZXr+JO7NE1OVSzpphs6lUgHfjebX4M=";
+    hash = "sha256-LQX7HBTWDR43aMqJrogL9rDFL5qRF0Xzw/O35Uq7R3g=";
   };
 
   yarnOfflineCache = fetchYarnDeps {

From 426108bd43077e454c98db74d380f82ace47a8cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 06:34:58 +0000
Subject: [PATCH 4746/6226] python3Packages.onedrive-personal-sdk: 0.0.14 ->
 0.0.15

---
 .../python-modules/onedrive-personal-sdk/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix
index 73d47cff1c08..6fecc2fdcfba 100644
--- a/pkgs/development/python-modules/onedrive-personal-sdk/default.nix
+++ b/pkgs/development/python-modules/onedrive-personal-sdk/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "onedrive-personal-sdk";
-  version = "0.0.14";
+  version = "0.0.15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zweckj";
     repo = "onedrive-personal-sdk";
     tag = "v${version}";
-    hash = "sha256-WdnkIMmTzvid2bl7n9NHMtF153O91hutMib8bs5BgIs=";
+    hash = "sha256-XKFTwaerAtN0GEZGpJ4Uq81cIrENEkNFhqqqM+eNVII=";
   };
 
   build-system = [ setuptools ];

From c1e46857ccd2080e4fe6d386d644aced5f865808 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 06:58:16 +0000
Subject: [PATCH 4747/6226] amp-cli: 0.0.1761583653-gd8c2df ->
 0.0.1762056193-g37ad2e

---
 pkgs/by-name/am/amp-cli/package-lock.json | 8 ++++----
 pkgs/by-name/am/amp-cli/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/am/amp-cli/package-lock.json b/pkgs/by-name/am/amp-cli/package-lock.json
index a177c3c17851..7a393abfde79 100644
--- a/pkgs/by-name/am/amp-cli/package-lock.json
+++ b/pkgs/by-name/am/amp-cli/package-lock.json
@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "@sourcegraph/amp": "^0.0.1761583653-gd8c2df"
+        "@sourcegraph/amp": "^0.0.1762056193-g37ad2e"
       }
     },
     "node_modules/@napi-rs/keyring": {
@@ -228,9 +228,9 @@
       }
     },
     "node_modules/@sourcegraph/amp": {
-      "version": "0.0.1761583653-gd8c2df",
-      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1761583653-gd8c2df.tgz",
-      "integrity": "sha512-/sAPMVQkj3sLtuYfv4GAXRBfqrWPHcMXbeWXXqW0+i8GKMsrMIenawwkEzQdCoTH94eZYeS8JlBPde3YFsdDOA==",
+      "version": "0.0.1762056193-g37ad2e",
+      "resolved": "https://registry.npmjs.org/@sourcegraph/amp/-/amp-0.0.1762056193-g37ad2e.tgz",
+      "integrity": "sha512-dWhc7ajnw1QGCYwrOGwCbpyzedf5n2RoTCM97ibpzgpphDLCdyGTXh2XTC6mrxM2CNQLp5jJaWxvcDk9nM80Vg==",
       "dependencies": {
         "@napi-rs/keyring": "1.1.9"
       },
diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix
index d981668628e3..0dfeb0d3eac1 100644
--- a/pkgs/by-name/am/amp-cli/package.nix
+++ b/pkgs/by-name/am/amp-cli/package.nix
@@ -9,11 +9,11 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "amp-cli";
-  version = "0.0.1761583653-gd8c2df";
+  version = "0.0.1762056193-g37ad2e";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@sourcegraph/amp/-/amp-${finalAttrs.version}.tgz";
-    hash = "sha256-Q6iBVtSIXoy6r+9/s3GefLq5c9SFRSQoBxUjBlg/wh8=";
+    hash = "sha256-so/nlX4N9qhNLsK0OllmpfiqzyEBtPrt7KD/MoAChGc=";
   };
 
   postPatch = ''
@@ -45,7 +45,7 @@ buildNpmPackage (finalAttrs: {
     chmod +x bin/amp-wrapper.js
   '';
 
-  npmDepsHash = "sha256-n8dRIJPTFFhS3aQQKKRdqYcEeHxfpU9XGbeV+2XAVeY=";
+  npmDepsHash = "sha256-xhN5XJs8E7yCRQWRPlH9iZyh5FocUjFMto5QweaV8aI=";
 
   propagatedBuildInputs = [
     ripgrep

From e84aa97ae0140cd168e1f36c8d4b6ebf4cc2139f Mon Sep 17 00:00:00 2001
From: Jhony Angulo <leohjaf@gmail.com>
Date: Sun, 2 Nov 2025 01:53:37 -0500
Subject: [PATCH 4748/6226] docker-language-server: 0.16.0 -> 0.20.1

---
 pkgs/by-name/do/docker-language-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/do/docker-language-server/package.nix b/pkgs/by-name/do/docker-language-server/package.nix
index c08d016dfcc2..06d64fb121dd 100644
--- a/pkgs/by-name/do/docker-language-server/package.nix
+++ b/pkgs/by-name/do/docker-language-server/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "docker-language-server";
-  version = "0.16.0";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker-language-server";
     tag = "v${version}";
-    hash = "sha256-P3DwlCjQllFtf05ssXYNraQFGEEzChSE5eJvcODdF6Q=";
+    hash = "sha256-OSAySCTK2temrVxmkRnrl5YWVbmkp8DRlXFVxTzEW3Q=";
   };
 
-  vendorHash = "sha256-xvRHxi7aem88mrmdAmSyRNtBUSZD4rjUut2VjPeoejg=";
+  vendorHash = "sha256-ztA+/4l180UKTKrsqTyysDcD4oQSDgnBYUaiKDF6LvI=";
 
   nativeCheckInputs = [
     docker

From 35679fe916aff4ad83d6f27f871f6317f5878581 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 07:21:26 +0000
Subject: [PATCH 4749/6226] copybara: 20251020 -> 20251027

---
 pkgs/by-name/co/copybara/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/copybara/package.nix b/pkgs/by-name/co/copybara/package.nix
index 0bc3f592a8c0..095c388cd20e 100644
--- a/pkgs/by-name/co/copybara/package.nix
+++ b/pkgs/by-name/co/copybara/package.nix
@@ -13,11 +13,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "copybara";
-  version = "20251020";
+  version = "20251027";
 
   src = fetchurl {
     url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar";
-    hash = "sha256-Jpq35BtBpXKKQBFhP4qJFBpACiAJ+TZIv6R5pMKTIvQ=";
+    hash = "sha256-IHW6y6WXJFjX9RYD+IwVAMwAbEo36fLqonIKR+FaqpQ=";
   };
 
   nativeBuildInputs = [

From d2f6da346b4935143d61a635b4845e936f82947a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 07:32:09 +0000
Subject: [PATCH 4750/6226] kcl: 0.11.3 -> 0.11.4

---
 pkgs/by-name/kc/kcl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix
index 74b1a8b63094..8b55085e7bf9 100644
--- a/pkgs/by-name/kc/kcl/package.nix
+++ b/pkgs/by-name/kc/kcl/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule rec {
   pname = "kcl";
-  version = "0.11.3";
+  version = "0.11.4";
 
   src = fetchFromGitHub {
     owner = "kcl-lang";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-LJ+Mclw/dMyOeUHg6TAckSbvDGFYCf6mMGzDmiIQVZc=";
+    hash = "sha256-fFT8sUxx1E6WdyiJ8DyTagGkVEQ7YZ2CCGL5tVxkAEI=";
   };
 
-  vendorHash = "sha256-jNQ0g7BGXUoYKV5RkU/f9GrSC3ygeZv83SekAmyKLxc=";
+  vendorHash = "sha256-ohfNy3vOyJJuniQKEVFiDftffdHlEJejQ72TJEwNhIM=";
 
   subPackages = [ "cmd/kcl" ];
 

From 819a5a3cfa18a474286154c6a1cad865cb90a7a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 07:32:20 +0000
Subject: [PATCH 4751/6226] lilex: 2.610 -> 2.620

---
 pkgs/by-name/li/lilex/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/lilex/package.nix b/pkgs/by-name/li/lilex/package.nix
index d9b264882e65..bbf5393d5908 100644
--- a/pkgs/by-name/li/lilex/package.nix
+++ b/pkgs/by-name/li/lilex/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "lilex";
-  version = "2.610";
+  version = "2.620";
 
   src = fetchurl {
     url = "https://github.com/mishamyrt/Lilex/releases/download/${version}/Lilex.zip";
-    hash = "sha256-iU0NLIy0wAFFBDSYmjo7tjKQ+I1GJ1hZTkcByxePYGM=";
+    hash = "sha256-h2Xt1HIOlh4wwHK3bg5hxyWxi/W8GWMiRkaWF7fhngU=";
   };
 
   nativeBuildInputs = [ unzip ];

From d826563a62fd86fe48fb92da0b5345999ef205ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 07:44:43 +0000
Subject: [PATCH 4752/6226] jdt-language-server: 1.51.0 -> 1.52.0

---
 pkgs/by-name/jd/jdt-language-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/jd/jdt-language-server/package.nix b/pkgs/by-name/jd/jdt-language-server/package.nix
index c7987d0602b3..21a0d9d7f2da 100644
--- a/pkgs/by-name/jd/jdt-language-server/package.nix
+++ b/pkgs/by-name/jd/jdt-language-server/package.nix
@@ -7,15 +7,15 @@
 }:
 
 let
-  timestamp = "202510022025";
+  timestamp = "202510301627";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "jdt-language-server";
-  version = "1.51.0";
+  version = "1.52.0";
 
   src = fetchurl {
     url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz";
-    hash = "sha256-ilk3IReIG/W9wCIPIlRHKEa4gTfAWPNEsAp9QUJ3RaE=";
+    hash = "sha256-V+a0U2ZTVLQqiYgn0quTij7GtBwScsEJmDw7emDsR4U=";
   };
 
   sourceRoot = ".";

From 9182aaa0481b32fb19944d46ab61fe48d238a026 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 2 Nov 2025 12:11:33 +0800
Subject: [PATCH 4753/6226] nixosTests.xfce: Add tests for screensaver

Same as what is done in nixosTests.cinnamon.
---
 nixos/tests/xfce.nix | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/xfce.nix b/nixos/tests/xfce.nix
index cdd1f3ffc676..ae203c5ca26d 100644
--- a/nixos/tests/xfce.nix
+++ b/nixos/tests/xfce.nix
@@ -21,6 +21,7 @@
       environment.systemPackages = [ pkgs.xfce.xfce4-whiskermenu-plugin ];
 
       programs.thunar.plugins = [ pkgs.xfce.thunar-archive-plugin ];
+      programs.ydotool.enable = true;
     };
 
   enableOCR = true;
@@ -44,8 +45,9 @@
       with subtest("Check if Xfce components actually start"):
         machine.wait_for_window("xfce4-panel")
         machine.wait_for_window("Desktop")
-        for i in ["xfwm4", "xfsettingsd", "xfdesktop", "xfce4-screensaver", "xfce4-notifyd", "xfconfd"]:
-          machine.wait_until_succeeds(f"pgrep -f {i}")
+        for i in ["xfwm4", "xfsettingsd", "xfdesktop", "xfce4-notifyd", "xfconfd"]:
+          machine.wait_until_succeeds(f"pgrep {i}")
+        machine.wait_until_succeeds("pgrep -xf xfce4-screensaver")
 
       with subtest("Open whiskermenu"):
         machine.succeed("su - ${user.name} -c 'DISPLAY=:0 ${bus} xfconf-query -c xfce4-panel -p /plugins/plugin-1 -t string -s whiskermenu -n >&2 &'")
@@ -63,6 +65,17 @@
         machine.succeed("su - ${user.name} -c 'DISPLAY=:0 xfce4-terminal >&2 &'")
         machine.wait_for_window("Terminal")
 
+      with subtest("Lock the screen"):
+        machine.succeed("su - ${user.name} -c '${bus} xflock4 >&2 &'")
+        machine.wait_until_succeeds("su - ${user.name} -c '${bus} xfce4-screensaver-command -q' | grep 'The screensaver is active'")
+        machine.sleep(5)
+        machine.succeed("ydotool click 0xC0")
+        machine.wait_for_text("${user.description}|Unlock")
+        machine.screenshot("screensaver")
+        machine.send_chars("${user.password}\n", delay=0.2)
+        machine.wait_until_succeeds("su - ${user.name} -c '${bus} xfce4-screensaver-command -q' | grep 'The screensaver is inactive'")
+        machine.sleep(2)
+
       with subtest("Open Thunar"):
         machine.succeed("su - ${user.name} -c 'DISPLAY=:0 thunar >&2 &'")
         machine.wait_for_window("Thunar")

From 3a4305bc6bd168a9edba5e3d786534dc1752dcd2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 08:28:11 +0000
Subject: [PATCH 4754/6226] python3Packages.scooby: 0.10.2 -> 0.11.0

---
 pkgs/development/python-modules/scooby/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scooby/default.nix b/pkgs/development/python-modules/scooby/default.nix
index e3285ca6ddac..0649f928efd0 100644
--- a/pkgs/development/python-modules/scooby/default.nix
+++ b/pkgs/development/python-modules/scooby/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "scooby";
-  version = "0.10.2";
+  version = "0.11.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "banesullivan";
     repo = "scooby";
     tag = "v${version}";
-    hash = "sha256-vOcCs8U8HeBgO86bgS/kqYrNai1IsQ0upQveV06YfoE=";
+    hash = "sha256-krExDVT9evG9ODZjTGpX+S1ygh7lMob06fzOwhh/hzA=";
   };
 
   build-system = [ setuptools-scm ];

From 57c122f144cf1c5fe348651b5d0a79c861b28f12 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Sun, 2 Nov 2025 09:52:23 +0100
Subject: [PATCH 4755/6226] claude-code: 2.0.30 -> 2.0.31

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
---
 .../vscode/extensions/anthropic.claude-code/default.nix     | 4 ++--
 pkgs/by-name/cl/claude-code/package-lock.json               | 4 ++--
 pkgs/by-name/cl/claude-code/package.nix                     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index a49434ee5ddd..b57f8587bffa 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "2.0.30";
-    hash = "sha256-KQ+3yk5WmHIiu6evpPSWfzEbqVKFj2XY8wwGxcqGOJc=";
+    version = "2.0.31";
+    hash = "sha256-ylcb5Ty9x9uj38OY0RXsS+YNKVKUzc1c5x6RJsZ3E2g=";
   };
 
   meta = {
diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index b27f98862384..ca2b3582880a 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.0.30",
+  "version": "2.0.31",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.0.30",
+      "version": "2.0.31",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 91202e5bb751..11d98c002e6d 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,14 +7,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.0.30";
+  version = "2.0.31";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-8XpxFnS+d8xYvK21bsVyCz879Gl39i/wDWr6RtEGE3Q=";
+    hash = "sha256-KQRc9h2DG1bwWvMR1EnMWi9qygPF0Fsr97+TyKef3NI=";
   };
 
-  npmDepsHash = "sha256-ZDRgLH3AhkcLBrzUys/ON2OBvBV7trPmlOJ2l6gQpV4=";
+  npmDepsHash = "sha256-lv596UikbuAuiJ1Wl5xMJvSNITfGOnDvI1dLtaJagCY=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 74bd4f8bf27d34dc89b7daec3f60b24d4206bf27 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 09:02:56 +0000
Subject: [PATCH 4756/6226] incus-ui-canonical: 0.18.2 -> 0.18.3

---
 pkgs/by-name/in/incus-ui-canonical/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/in/incus-ui-canonical/package.nix b/pkgs/by-name/in/incus-ui-canonical/package.nix
index 2a3af34055bc..3f172a72a8d8 100644
--- a/pkgs/by-name/in/incus-ui-canonical/package.nix
+++ b/pkgs/by-name/in/incus-ui-canonical/package.nix
@@ -20,14 +20,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "incus-ui-canonical";
-  version = "0.18.2";
+  version = "0.18.3";
 
   src = fetchFromGitHub {
     owner = "zabbly";
     repo = "incus-ui-canonical";
     # only use tags prefixed by incus- they are the tested fork versions
     tag = "incus-${version}";
-    hash = "sha256-MVhyKV3NGeChsLnoKw7mC9bAQRQ9Rpg8cIWkelNFXeg=";
+    hash = "sha256-0wKGPH+ffJ/S8FA46ve5SzyNZJ9C2fv8Psiqu8p6D0s=";
   };
 
   offlineCache = fetchYarnDeps {

From 26860103b3344dc3938e65b87afb58d62ca2fc7d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 09:08:17 +0000
Subject: [PATCH 4757/6226] gemini-cli: 0.10.0 -> 0.11.3

---
 pkgs/by-name/ge/gemini-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix
index 789b24efd95a..5f151e0010f9 100644
--- a/pkgs/by-name/ge/gemini-cli/package.nix
+++ b/pkgs/by-name/ge/gemini-cli/package.nix
@@ -13,16 +13,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "gemini-cli";
-  version = "0.10.0";
+  version = "0.11.3";
 
   src = fetchFromGitHub {
     owner = "google-gemini";
     repo = "gemini-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-h6JyiIh0+PI/5JHlztMKlXlK5XQC8x6V7Yq1VyboaXs=";
+    hash = "sha256-43ohCUqdM0quxwoN3s/3vOq4IRc+sck+BkAfqMEDq8g=";
   };
 
-  npmDepsHash = "sha256-4RsZAs9+Q7vnRiyA1OMXC185d9Y9k6mwG+QkOE+5Pas=";
+  npmDepsHash = "sha256-wqzsHBFXo5NhsFHOErxVVG9Y08daEQs6YdRZHFeOq98=";
 
   nativeBuildInputs = [
     jq

From 22cb2ce30608b358741a7c7bf3309033b1e2a3ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 09:17:17 +0000
Subject: [PATCH 4758/6226] foundry: 1.4.3 -> 1.4.4

---
 pkgs/by-name/fo/foundry/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fo/foundry/package.nix b/pkgs/by-name/fo/foundry/package.nix
index 63b91c4b32ca..8db1a61165df 100644
--- a/pkgs/by-name/fo/foundry/package.nix
+++ b/pkgs/by-name/fo/foundry/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "foundry";
-  version = "1.4.3";
+  version = "1.4.4";
 
   src = fetchFromGitHub {
     owner = "foundry-rs";
     repo = "foundry";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SrkFfc9+cb3nDqEOj3gRkQq9aKOSfk3s7a3EGka5ACw=";
+    hash = "sha256-u+JCurH1gx4onC5Poxxd9+gVrUyyebcd6xnXY4Le6Rs=";
   };
 
-  cargoHash = "sha256-PoPfuMNeK6ArZddBd0lsR2r8UrvRieqkxYZ8jCCxw5o=";
+  cargoHash = "sha256-JLuCZckiNv0t+kPuDk6TWmPIXKOvqf3HR/oFrQ5fKKQ=";
 
   nativeBuildInputs = [
     pkg-config

From 10c345d8a82e106fdae22669814d2cbbd50e861b Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Sun, 2 Nov 2025 10:46:34 +0100
Subject: [PATCH 4759/6226] tinymist: 0.13.30 -> 0.14.0

Changelog:
https://github.com/Myriad-Dreamin/tinymist/releases/tag/v0.14.0
Diff:
https://github.com/Myriad-Dreamin/tinymist/compare/v0.13.30...v0.14.0
---
 .../vscode/extensions/myriad-dreamin.tinymist/default.nix   | 2 +-
 pkgs/by-name/ti/tinymist/package.nix                        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
index 1be8ef9daca7..2b1207a94c8f 100644
--- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix
@@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension {
     name = "tinymist";
     publisher = "myriad-dreamin";
     inherit (tinymist) version;
-    hash = "sha256-Sm2Ij1yHMQzPM9lKtiejHRrdCot/DRzgnxznwlZyyro=";
+    hash = "sha256-803feSIFyuBTyGGDH4zZ4hRGXRNN+J2y1p0C9I9qMro=";
   };
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/ti/tinymist/package.nix b/pkgs/by-name/ti/tinymist/package.nix
index 58f497322ad3..3538af9a24db 100644
--- a/pkgs/by-name/ti/tinymist/package.nix
+++ b/pkgs/by-name/ti/tinymist/package.nix
@@ -15,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tinymist";
   # Please update the corresponding vscode extension when updating
   # this derivation.
-  version = "0.13.30";
+  version = "0.14.0";
 
   src = fetchFromGitHub {
     owner = "Myriad-Dreamin";
     repo = "tinymist";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-7SUr23m+zUHsSmSZGlmKnwI5VUPh53Rxiw2Wx8yy+5k=";
+    hash = "sha256-0b9gB7vHvw1wjoTxWcQOcshpuIKfcaQJeI8GCo+rvF4=";
   };
 
-  cargoHash = "sha256-Qvj4xdbKI8PEbJ+N8Ba+sE5hDDHMegzU18gFtx/q/W8=";
+  cargoHash = "sha256-ctyb/llOYBiyBwKylacpXrEp3hXix64zwHxv/E54rrM=";
 
   nativeBuildInputs = [
     installShellFiles

From a9ba0af96148ada4d131a9a033823f97bf00c7c1 Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sun, 2 Nov 2025 10:49:50 +0100
Subject: [PATCH 4760/6226] virtualboxKvm: mark as broken

The patch does not apply on the latest version of Virtualbox.
---
 pkgs/applications/virtualization/virtualbox/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index 9132fe88ce71..e14bb5b95d0b 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -425,5 +425,7 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "VirtualBox";
+    # Patch is not compatible with the current version of Virtualbox
+    broken = enableKvm;
   };
 })

From 0ff44ce050d7d466cc13cdf2191da44fc9efbb13 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Sun, 2 Nov 2025 09:51:25 +0000
Subject: [PATCH 4761/6226] bluesky-pds: 0.4.182 -> 0.4.188

Diff: https://github.com/bluesky-social/pds/compare/v0.4.182...v0.4.188
---
 pkgs/by-name/bl/bluesky-pds/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bl/bluesky-pds/package.nix b/pkgs/by-name/bl/bluesky-pds/package.nix
index 40e24646d585..58b1ae48e455 100644
--- a/pkgs/by-name/bl/bluesky-pds/package.nix
+++ b/pkgs/by-name/bl/bluesky-pds/package.nix
@@ -21,13 +21,13 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "pds";
-  version = "0.4.182";
+  version = "0.4.188";
 
   src = fetchFromGitHub {
     owner = "bluesky-social";
     repo = "pds";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-FNfM3kr0PTJp9mKYtzd6uH5mUfupqv0aA3sAPRq+pF4=";
+    hash = "sha256-t8KdyEygXdbj/5Rhj8W40e1o8mXprELpjsKddHExmo0=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/service";
@@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: {
       sourceRoot
       ;
     fetcherVersion = 2;
-    hash = "sha256-pUCICsuuc3CeWGeJ6il0etLQkntPF9MKRiJsiNDfroo=";
+    hash = "sha256-D+yjUPnBkeEkC3hV5z5n6IDswbpvHsK5aYj7POYATCY=";
   };
 
   buildPhase = ''

From e3bb18193415323b0d43c9be1b6673639a6ec646 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 09:53:43 +0000
Subject: [PATCH 4762/6226] terraform-providers.newrelic_newrelic: 3.73.0 ->
 3.74.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 093947426af2..eb518b76241a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -949,13 +949,13 @@
     "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0="
   },
   "newrelic_newrelic": {
-    "hash": "sha256-/vHE+Eys773WyYMDe7xG3p0pgKvRc9U73s4jSDijNxY=",
+    "hash": "sha256-1OpvSayWq194591u/z9oHz80ZmPA9fSZpKSBwDHL/tk=",
     "homepage": "https://registry.terraform.io/providers/newrelic/newrelic",
     "owner": "newrelic",
     "repo": "terraform-provider-newrelic",
-    "rev": "v3.73.0",
+    "rev": "v3.74.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-45psSf69IetY0o8LjBDEv2GnOxaOzaQcPCnV2YHPXGs="
+    "vendorHash": "sha256-7zUUV3cqVesItNnE/EcO5/l+nafV04JdoNkmTxnulio="
   },
   "ns1-terraform_ns1": {
     "hash": "sha256-S0ji/gZsbMTgug7DwPODAcPx3IfRaw1JHYPJ6V+tqeM=",

From 9787457bffb3652246415b38f08a15511e64d6ba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 09:55:57 +0000
Subject: [PATCH 4763/6226] autotiling-rs: 0.1.5 -> 0.1.6

---
 pkgs/by-name/au/autotiling-rs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/au/autotiling-rs/package.nix b/pkgs/by-name/au/autotiling-rs/package.nix
index e18289c0540b..8e8a2aba61a5 100644
--- a/pkgs/by-name/au/autotiling-rs/package.nix
+++ b/pkgs/by-name/au/autotiling-rs/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "autotiling-rs";
-  version = "0.1.5";
+  version = "0.1.6";
 
   src = fetchFromGitHub {
     owner = "ammgws";
     repo = "autotiling-rs";
     rev = "v${version}";
-    sha256 = "sha256-S/6LRQTHdPGZkmbTAb0ufNoXE1nD+rIQ2ASJ8jjFS3E=";
+    sha256 = "sha256-21XIKZ2rzuQMpkaOhGu1pg4J3OGOzHNQ20Rcw1V4BfI=";
   };
 
-  cargoHash = "sha256-riQ1nOs4fBj9y/jK0nS7Y85vMejLrKrEJzNnsQKkoeg=";
+  cargoHash = "sha256-+5GibhSkiKmgRrESKrliKLrrtUQ7iv2sFz46OFwAIwE=";
 
   meta = with lib; {
     description = "Autotiling for sway (and possibly i3)";

From 4317d5e7a46a41f4285ec2ec397b1471bf633df3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 10:01:07 +0000
Subject: [PATCH 4764/6226] dprint-plugins.dprint-plugin-biome: 0.10.6 ->
 0.11.1

---
 pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
index d189ce665f8f..f7d97d9acbfa 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "Biome (JS/TS) wrapper plugin";
-  hash = "sha256-Ht63tW4FqykpuNlWtyw3cHD2HXs0b6U6Zo9Rd9AXqD8=";
+  hash = "sha256-kelyuSZpbah1l+qVZMIK9VhWLr7DWjZIm9HwD64bCTw=";
   initConfig = {
     configExcludes = [ "**/node_modules" ];
     configKey = "biome";
@@ -16,6 +16,6 @@ mkDprintPlugin {
   };
   pname = "dprint-plugin-biome";
   updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json";
-  url = "https://plugins.dprint.dev/biome-0.10.6.wasm";
-  version = "0.10.6";
+  url = "https://plugins.dprint.dev/biome-0.11.1.wasm";
+  version = "0.11.1";
 }

From 325198bba9e47c9753e92339b2abeceec241b1aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 10:12:00 +0000
Subject: [PATCH 4765/6226] postgresqlPackages.pg_repack: 1.5.2 -> 1.5.3

---
 pkgs/servers/sql/postgresql/ext/pg_repack.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pg_repack.nix b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
index 8131f5d49ed8..d56ef90deba4 100644
--- a/pkgs/servers/sql/postgresql/ext/pg_repack.nix
+++ b/pkgs/servers/sql/postgresql/ext/pg_repack.nix
@@ -10,7 +10,7 @@
 
 postgresqlBuildExtension (finalAttrs: {
   pname = "pg_repack";
-  version = "1.5.2";
+  version = "1.5.3";
 
   buildInputs = postgresql.buildInputs;
 
@@ -18,7 +18,7 @@ postgresqlBuildExtension (finalAttrs: {
     owner = "reorg";
     repo = "pg_repack";
     tag = "ver_${finalAttrs.version}";
-    hash = "sha256-wfjiLkx+S3zVrAynisX1GdazueVJ3EOwQEPcgUQt7eA=";
+    hash = "sha256-Ufh/dKrKumRKeQ/CpwvxbjAmgILAn04BduPZMRvS+nU=";
   };
 
   passthru.updateScript = gitUpdater {

From 04e39c75b93269ca8bc91ea1c50b1fd989fea64a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 2 Nov 2025 10:23:52 +0000
Subject: [PATCH 4766/6226] python3Packages.textual-textarea: skip failing
 tests

https://github.com/tconbeer/textual-textarea/issues/312
---
 .../python-modules/textual-textarea/default.nix            | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/textual-textarea/default.nix b/pkgs/development/python-modules/textual-textarea/default.nix
index ff311a5b988c..c01efb0342a7 100644
--- a/pkgs/development/python-modules/textual-textarea/default.nix
+++ b/pkgs/development/python-modules/textual-textarea/default.nix
@@ -46,6 +46,13 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTests = [
+    # AssertionError: assert None == 'word'
+    # https://github.com/tconbeer/textual-textarea/issues/312
+    "test_autocomplete"
+    "test_autocomplete_with_types"
+  ];
+
   pythonImportsCheck = [ "textual_textarea" ];
 
   meta = {

From 884c7190c03d52df9205dbed95ac7f396c91d8d0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 10:27:19 +0000
Subject: [PATCH 4767/6226] rmfakecloud: 0.0.25 -> 0.0.26

---
 pkgs/by-name/rm/rmfakecloud/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/rm/rmfakecloud/package.nix b/pkgs/by-name/rm/rmfakecloud/package.nix
index b825c908aff0..bc5a4b9dc389 100644
--- a/pkgs/by-name/rm/rmfakecloud/package.nix
+++ b/pkgs/by-name/rm/rmfakecloud/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "rmfakecloud";
-  version = "0.0.25";
+  version = "0.0.26";
 
   src = fetchFromGitHub {
     owner = "ddvk";
     repo = "rmfakecloud";
     rev = "v${version}";
-    hash = "sha256-dembIFEoKQEZabsl7oK8rzvV2G7nhmebfw0AGUBanYs=";
+    hash = "sha256-QV8RFg6gATyjIESwO3r5M3Yd9qWFsA6X6bYLmNpLek0=";
   };
 
   vendorHash = "sha256-ColOCdKa/sKoLnF/3idBIEyFB2JWYM+1y5TdC/LZT4A=";

From ee91a30752779854105a3dc9c2812085fa74211c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 10:45:29 +0000
Subject: [PATCH 4768/6226] kagen: 1.2.0 -> 1.2.1

---
 pkgs/by-name/ka/kagen/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ka/kagen/package.nix b/pkgs/by-name/ka/kagen/package.nix
index 57842dfa679a..f9593f948010 100644
--- a/pkgs/by-name/ka/kagen/package.nix
+++ b/pkgs/by-name/ka/kagen/package.nix
@@ -17,7 +17,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "kagen";
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "KarlsruheGraphGeneration";
@@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: {
     tag = "v${finalAttrs.version}";
     # use vendor libmorton and xxHash
     fetchSubmodules = true;
-    hash = "sha256-2jXHHS9Siu6hXrYPIrZSOWe6D2PgsvrbMw/7Ykpc3wk=";
+    hash = "sha256-VLQxeI9EzeJEp1krlLPRSct3SQmAF8cj34u3fkmppQg=";
   };
 
   nativeBuildInputs = [

From c8dc99fdc79dcbd7924884680e18efcf375f6fd6 Mon Sep 17 00:00:00 2001
From: Pavel Anpin <pavel@anpin.fyi>
Date: Sun, 2 Nov 2025 08:05:27 -0300
Subject: [PATCH 4769/6226] thinkfan: fix missing sleep bin in
 thinkfan-sleep.service

---
 pkgs/by-name/th/thinkfan/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/th/thinkfan/package.nix b/pkgs/by-name/th/thinkfan/package.nix
index 57347b91052d..17b964ee7286 100644
--- a/pkgs/by-name/th/thinkfan/package.nix
+++ b/pkgs/by-name/th/thinkfan/package.nix
@@ -7,6 +7,7 @@
   yaml-cpp,
   pkg-config,
   procps,
+  coreutils,
   smartSupport ? false,
   libatasmart,
 }:
@@ -31,6 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
   + ''
     substituteInPlace rcscripts/systemd/thinkfan-sleep.service \
       --replace-fail "/usr/bin/pkill" "${lib.getExe' procps "pkill"}"
+    substituteInPlace rcscripts/systemd/thinkfan-sleep.service \
+      --replace-fail "ExecStart=sleep " "ExecStart=${lib.getExe' coreutils "sleep"} "
     substituteInPlace rcscripts/systemd/thinkfan-wakeup.service \
       --replace-fail "/usr/bin/pkill" "${lib.getExe' procps "pkill"}"
     substituteInPlace rcscripts/systemd/thinkfan.service.cmake \

From 46a653ad1fdaa857b9328aecbfe87da2fb2cff8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 11:10:05 +0000
Subject: [PATCH 4770/6226] windsurf: 1.12.25 -> 1.12.27

---
 pkgs/by-name/wi/windsurf/info.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/wi/windsurf/info.json b/pkgs/by-name/wi/windsurf/info.json
index 803b03a35fc6..c5b1d6180859 100644
--- a/pkgs/by-name/wi/windsurf/info.json
+++ b/pkgs/by-name/wi/windsurf/info.json
@@ -1,20 +1,20 @@
 {
   "aarch64-darwin": {
-    "version": "1.12.25",
+    "version": "1.12.27",
     "vscodeVersion": "1.105.0",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/3dde4f1e45c3c089540abe588074eb5a4fe122c3/Windsurf-darwin-arm64-1.12.25.zip",
-    "sha256": "9fba99838189f4ad12ec35c0f0ee97e99652b43492fb19fe17908848a5f2b13c"
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/94ec85969ebc38d14c35c87a0284fafd84bff116/Windsurf-darwin-arm64-1.12.27.zip",
+    "sha256": "294f3a3aab7665caf936ef43b384540695849928c956c28b4b783bb3b34913a2"
   },
   "x86_64-darwin": {
-    "version": "1.12.25",
+    "version": "1.12.27",
     "vscodeVersion": "1.105.0",
-    "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/3dde4f1e45c3c089540abe588074eb5a4fe122c3/Windsurf-darwin-x64-1.12.25.zip",
-    "sha256": "893b0cf579b4fa4354f5f014b9caf8f0e7ae9f98b9bb0d4b597e2322863eb278"
+    "url": "https://windsurf-stable.codeiumdata.com/darwin-x64/stable/94ec85969ebc38d14c35c87a0284fafd84bff116/Windsurf-darwin-x64-1.12.27.zip",
+    "sha256": "61e0dac30fa014f42f99138434f289504d4d2a79aaa9f4cc61c30c663c6ab979"
   },
   "x86_64-linux": {
-    "version": "1.12.25",
+    "version": "1.12.27",
     "vscodeVersion": "1.105.0",
-    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/3dde4f1e45c3c089540abe588074eb5a4fe122c3/Windsurf-linux-x64-1.12.25.tar.gz",
-    "sha256": "c170f3249c95220b8e1b26feb4f2452d4a8be5dcbcfb2a1f1768fb0c0137101e"
+    "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/94ec85969ebc38d14c35c87a0284fafd84bff116/Windsurf-linux-x64-1.12.27.tar.gz",
+    "sha256": "8f380755df34a1b466c28448f22fc92d3cfb13da55e9d8f2c9db5a4db83f6cac"
   }
 }

From 38c5f68a0809cc2b67907d6bc591b402b98eb15d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 11:28:23 +0000
Subject: [PATCH 4771/6226] bitrise: 2.34.5 -> 2.34.6

---
 pkgs/by-name/bi/bitrise/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bi/bitrise/package.nix b/pkgs/by-name/bi/bitrise/package.nix
index 09139984a44e..0241eb4d667c 100644
--- a/pkgs/by-name/bi/bitrise/package.nix
+++ b/pkgs/by-name/bi/bitrise/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule rec {
   pname = "bitrise";
-  version = "2.34.5";
+  version = "2.34.6";
 
   src = fetchFromGitHub {
     owner = "bitrise-io";
     repo = "bitrise";
     rev = "v${version}";
-    hash = "sha256-QsGF5lDnY55OGdFagGJfXcq9/2P6qzmoHx64ijOkRfo=";
+    hash = "sha256-wA+IknAOkVxTwBohw8D4suksENoWymqPJycbfx6cFYQ=";
   };
 
   # many tests rely on writable $HOME/.bitrise and require network access

From 5444145fcee81ee239e34dcc874e54a958d13e97 Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Sun, 2 Nov 2025 12:30:47 +0100
Subject: [PATCH 4772/6226] nextcloudPackages: update

Closes #457582
---
 pkgs/servers/nextcloud/packages/31.json | 42 +++++++++++-----------
 pkgs/servers/nextcloud/packages/32.json | 48 ++++++++++++-------------
 2 files changed, 45 insertions(+), 45 deletions(-)

diff --git a/pkgs/servers/nextcloud/packages/31.json b/pkgs/servers/nextcloud/packages/31.json
index 89d4f58322d4..0c4a2d4ba82d 100644
--- a/pkgs/servers/nextcloud/packages/31.json
+++ b/pkgs/servers/nextcloud/packages/31.json
@@ -30,9 +30,9 @@
     ]
   },
   "collectives": {
-    "hash": "sha256-vWPT3FBSZlgA1z1zH1o1Kpd9JOmt2Ykfh3JMtMLWTjI=",
-    "url": "https://github.com/nextcloud/collectives/releases/download/v3.2.1/collectives-3.2.1.tar.gz",
-    "version": "3.2.1",
+    "hash": "sha256-ezFo8Vv8qFNzW9ZevcOmZdKBtmpDY6SpRqX4R/2UT1E=",
+    "url": "https://github.com/nextcloud/collectives/releases/download/v3.2.4/collectives-3.2.4.tar.gz",
+    "version": "3.2.4",
     "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n  tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n  owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n  [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n  for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
     "homepage": "https://github.com/nextcloud/collectives",
     "licenses": [
@@ -40,9 +40,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-J5ce01iRxpx4g24W5NAt7PgNX2hDjmA9VUzQAkLUrFE=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.3.4/contacts-v7.3.4.tar.gz",
-    "version": "7.3.4",
+    "hash": "sha256-aViRCE48yy52yz7xSVlNKR6yFCVdu9hfjysL81QjazU=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v7.3.5/contacts-v7.3.5.tar.gz",
+    "version": "7.3.5",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -50,9 +50,9 @@
     ]
   },
   "cookbook": {
-    "hash": "sha256-pdmltxubvC2+h5U5edTB8X5M8WW+wBShIEpkbR0yaQ0=",
-    "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.4/cookbook-0.11.4.tar.gz",
-    "version": "0.11.4",
+    "hash": "sha256-Bw5Oga5zawiicIR9tOLSflK0258Uy7q/9zJsXS5Ggd4=",
+    "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.5/cookbook-0.11.5.tar.gz",
+    "version": "0.11.5",
     "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.",
     "homepage": "https://github.com/nextcloud/cookbook/",
     "licenses": [
@@ -140,9 +140,9 @@
     ]
   },
   "gpoddersync": {
-    "hash": "sha256-xMSo5D3w/qIMxLclSTmBPVBHwNkyTbluqlXWtdbLUYk=",
-    "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.13.2/gpoddersync.tar.gz",
-    "version": "3.13.1",
+    "hash": "sha256-EQVs1fe0ierjqFZ5+KVc1Yj67zrwjLBAzY5A+QsC7AU=",
+    "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.13.2r/gpoddersync.tar.gz",
+    "version": "3.13.2",
     "description": "Expose GPodder API to sync podcast consumer apps like AntennaPod",
     "homepage": "https://github.com/thrillfall/nextcloud-gpodder",
     "licenses": [
@@ -230,9 +230,9 @@
     ]
   },
   "news": {
-    "hash": "sha256-K93swGriEwm1zBq9H7F4P2fHmTanYddFARfQp456bds=",
-    "url": "https://github.com/nextcloud/news/releases/download/27.0.1/news.tar.gz",
-    "version": "27.0.1",
+    "hash": "sha256-bKIEeRVmDoDjab8dusdG+q7Ms/gaOUFUyCH1C1pKJ04=",
+    "url": "https://github.com/nextcloud/news/releases/download/27.1.0/news.tar.gz",
+    "version": "27.1.0",
     "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
     "homepage": "https://github.com/nextcloud/news",
     "licenses": [
@@ -360,9 +360,9 @@
     ]
   },
   "sociallogin": {
-    "hash": "sha256-zuzQKtU+sEEYhBZ4UMfY1eMSsDfe7o/ymWYv2SJBiHw=",
-    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.2.2/release.tar.gz",
-    "version": "6.2.2",
+    "hash": "sha256-/vYEBgrlTImksgNfJafTvIiBxAZ8obwou8YjDM2P+aw=",
+    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.2.3/release.tar.gz",
+    "version": "6.2.3",
     "description": "# Social Login\n\nMake it possible to create users and log in via Telegram, OAuth, or OpenID.\n\nFor OAuth, you must create an app with certain providers. Login buttons will appear on the login page if an app ID is specified. Settings are located in the \"Social login\" section of the settings page.\n\n## Installation\n\nLog in to your Nextcloud installation as an administrator. Under \"Apps\", click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n## Custom OAuth2/OIDC Groups\n\nYou can use groups from your custom provider. For this, specify the \"Groups claim\" in the custom OAuth2/OIDC provider settings. This claim should be returned from the provider in the `id_token` or at the user info endpoint. The format should be an `array` or a comma-separated string. E.g., (with a claim named `roles`):\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nNested claims are also supported. For example, `resource_access.client-id.roles` for:\n\n```json\n\"resource_access\": {\n   \"client-id\": {\n     \"roles\": [\n       \"client-role-1\",\n       \"client-role-2\"\n     ]\n   }\n}\n```\n\n**DisplayName** support is also available:\n```json\n{\"roles\": [{\"gid\": 1, \"displayName\": \"admin\"}, {\"gid\": 2, \"displayName\": \"user\"}]}\n```\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing Nextcloud groups.\n2. Create provider groups in Nextcloud and associate them with users (if the appropriate option is enabled).\n\nTo sync groups on every login, ensure the \"Update user profile every login\" setting is checked.\n\n## Examples for Groups\n\n* Configure WSO2IS to return a roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff).\n* [GitLab OIDC configuration to allow specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md).\n\n## Built-in OAuth Providers\n\nCopy the link from a specific login button to get the correct \"redirect URL\" for OAuth app settings.\n\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Apple](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/apple.md)\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n* [Discord](#configure-discord)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [GitHub](https://github.com/settings/developers)\n* [GitLab](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Keycloak](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/keycloak.md)\n* [Mail.ru](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/mailru.md)\n* **PlexTv**: Use any title as the app ID.\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n\nFor details about Google's \"Allow login only from specified domain\" setting, see [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44). Use a comma-separated list for multiple domains.\n\n## Configuration\n\nAdd `'social_login_auto_redirect' => true` to `config.php` to automatically redirect unauthorized users to social login if only one provider is configured. To temporarily disable this (e.g., for local admin login), add `noredir=1` to the login URL: `https://cloud.domain.com/login?noredir=1`.\n\nConfigure HTTP client options using:\n```php\n  'social_login_http_client' => [\n    'timeout' => 45,\n    'proxy' => 'socks4://127.0.0.1:9050', // See <https://curl.se/libcurl/c/CURLOPT_PROXY.html> for allowed formats\n  ],\n```\nin `config.php`.\n\n### Configure a Provider via CLI\n\nUse the `occ` utility to configure providers via the command line. Replace variables and URLs with your deployment values:\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nFor Docker, prepend `docker exec -t -uwww-data CONTAINER_NAME` to the command or run interactively via `docker exec -it -uwww-data CONTAINER_NAME sh`.\n\nTo inspect configurations:\n```sql\nmysql -u nextcloud -p nextcloud\nPassword: <yourpassword>\n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\nOr run:\n```bash\ndocker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers\n```\n\n### Configure Discord\n\n1. Create a Discord application at [Discord Developer Portal](https://discord.com/developers/applications).\n2. Navigate to `Settings > OAuth2 > General`. Add a redirect URL: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy the `CLIENT ID` and generate a `CLIENT SECRET`.\n4. In Nextcloud, go to `Settings > Social Login`. Paste the `CLIENT ID` into \"App id\" and `CLIENT SECRET` into \"Secret\".\n5. Select a default group for new users.\n6. For group mapping, see [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395).\n\n## Hint\n\n### Callback (Reply) URL\nCopy the link from a login button on the Nextcloud login page and use it as the callback URL on your provider's site. To make the button visible temporarily, fill provider settings with placeholder data and update later.\n\nIf you encounter callback URL errors despite correct settings, ensure your Nextcloud server generates HTTPS URLs by adding `'overwriteprotocol' => 'https'` to `config.php`.",
     "homepage": "https://github.com/zorn-v/nextcloud-social-login",
     "licenses": [
@@ -480,9 +480,9 @@
     ]
   },
   "whiteboard": {
-    "hash": "sha256-2CSc9gRXAHaKiq4KfVl+44eWhtBFgjHYbMeTwE18xuA=",
-    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.3.0/whiteboard-v1.3.0.tar.gz",
-    "version": "1.3.0",
+    "hash": "sha256-i8qk1RZrLbF0Mex4lgVZp092ZrsUvosYeiLcJ4WMosQ=",
+    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.4.0/whiteboard-v1.4.0.tar.gz",
+    "version": "1.4.0",
     "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library",
     "homepage": "https://github.com/nextcloud/whiteboard",
     "licenses": [
diff --git a/pkgs/servers/nextcloud/packages/32.json b/pkgs/servers/nextcloud/packages/32.json
index 4efd07211f29..f0eaf8531e14 100644
--- a/pkgs/servers/nextcloud/packages/32.json
+++ b/pkgs/servers/nextcloud/packages/32.json
@@ -20,9 +20,9 @@
     ]
   },
   "collectives": {
-    "hash": "sha256-vWPT3FBSZlgA1z1zH1o1Kpd9JOmt2Ykfh3JMtMLWTjI=",
-    "url": "https://github.com/nextcloud/collectives/releases/download/v3.2.1/collectives-3.2.1.tar.gz",
-    "version": "3.2.1",
+    "hash": "sha256-ezFo8Vv8qFNzW9ZevcOmZdKBtmpDY6SpRqX4R/2UT1E=",
+    "url": "https://github.com/nextcloud/collectives/releases/download/v3.2.4/collectives-3.2.4.tar.gz",
+    "version": "3.2.4",
     "description": "Collectives is a Nextcloud App for activist and community projects to organize together.\nCome and gather in collectives to build shared knowledge.\n\n* 👥 **Collective and non-hierarchical workflow by heart**: Collectives are\n  tied to a [Nextcloud Team](https://github.com/nextcloud/circles) and\n  owned by the collective.\n* 📝 **Collaborative page editing** like known from Etherpad thanks to the\n  [Text app](https://github.com/nextcloud/text).\n* 🔤 **Well-known [Markdown](https://en.wikipedia.org/wiki/Markdown) syntax**\n  for page formatting.\n\n## Installation\n\nIn your Nextcloud instance, simply navigate to **»Apps«**, find the\n**»Teams«** and **»Collectives«** apps and enable them.",
     "homepage": "https://github.com/nextcloud/collectives",
     "licenses": [
@@ -30,9 +30,9 @@
     ]
   },
   "contacts": {
-    "hash": "sha256-GTIsL5oY6Kb8Ga79VL7WGD51lmxUvE2cHN38anvyf6w=",
-    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.0.4/contacts-v8.0.4.tar.gz",
-    "version": "8.0.4",
+    "hash": "sha256-DKCZD5wMZu2yWy6Wjv2/L8ZQG1nBgtXJmUEsAVICFjo=",
+    "url": "https://github.com/nextcloud-releases/contacts/releases/download/v8.0.5/contacts-v8.0.5.tar.gz",
+    "version": "8.0.5",
     "description": "The Nextcloud contacts app is a user interface for Nextcloud's CardDAV server. Easily sync contacts from various devices with your Nextcloud and edit them online.\n\n* 🚀 **Integration with other Nextcloud apps!** Currently Mail and Calendar – more to come.\n* 🎉 **Never forget a birthday!** You can sync birthdays and other recurring events with your Nextcloud Calendar.\n* 👥 **Sharing of Adressbooks!** You want to share your contacts with your friends or coworkers? No problem!\n* 🙈 **We’re not reinventing the wheel!** Based on the great and open SabreDAV library.",
     "homepage": "https://github.com/nextcloud/contacts#readme",
     "licenses": [
@@ -40,9 +40,9 @@
     ]
   },
   "cookbook": {
-    "hash": "sha256-pdmltxubvC2+h5U5edTB8X5M8WW+wBShIEpkbR0yaQ0=",
-    "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.4/cookbook-0.11.4.tar.gz",
-    "version": "0.11.4",
+    "hash": "sha256-Bw5Oga5zawiicIR9tOLSflK0258Uy7q/9zJsXS5Ggd4=",
+    "url": "https://github.com/christianlupus-nextcloud/cookbook-releases/releases/download/v0.11.5/cookbook-0.11.5.tar.gz",
+    "version": "0.11.5",
     "description": "A library for all your recipes. It uses JSON files following the schema.org recipe format. To add a recipe to the collection, you can paste in the URL of the recipe, and the provided web page will be parsed and downloaded to whichever folder you specify in the app settings.",
     "homepage": "https://github.com/nextcloud/cookbook/",
     "licenses": [
@@ -120,9 +120,9 @@
     ]
   },
   "gpoddersync": {
-    "hash": "sha256-xMSo5D3w/qIMxLclSTmBPVBHwNkyTbluqlXWtdbLUYk=",
-    "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.13.2/gpoddersync.tar.gz",
-    "version": "3.13.1",
+    "hash": "sha256-EQVs1fe0ierjqFZ5+KVc1Yj67zrwjLBAzY5A+QsC7AU=",
+    "url": "https://github.com/thrillfall/nextcloud-gpodder/releases/download/3.13.2r/gpoddersync.tar.gz",
+    "version": "3.13.2",
     "description": "Expose GPodder API to sync podcast consumer apps like AntennaPod",
     "homepage": "https://github.com/thrillfall/nextcloud-gpodder",
     "licenses": [
@@ -200,9 +200,9 @@
     ]
   },
   "news": {
-    "hash": "sha256-K93swGriEwm1zBq9H7F4P2fHmTanYddFARfQp456bds=",
-    "url": "https://github.com/nextcloud/news/releases/download/27.0.1/news.tar.gz",
-    "version": "27.0.1",
+    "hash": "sha256-bKIEeRVmDoDjab8dusdG+q7Ms/gaOUFUyCH1C1pKJ04=",
+    "url": "https://github.com/nextcloud/news/releases/download/27.1.0/news.tar.gz",
+    "version": "27.1.0",
     "description": "📰 A RSS/Atom Feed reader App for Nextcloud\n\n- 📲 Synchronize your feeds with multiple mobile or desktop [clients](https://nextcloud.github.io/news/clients/)\n- 🔄 Automatic updates of your news feeds\n- 🆓 Free and open source under AGPLv3, no ads or premium functions\n\n**System Cron is currently required for this app to work**\n\nRequirements can be found [here](https://nextcloud.github.io/news/install/#dependencies)\n\nThe Changelog is available [here](https://github.com/nextcloud/news/blob/master/CHANGELOG.md)\n\nCreate a [bug report](https://github.com/nextcloud/news/issues/new/choose)\n\nCreate a [feature request](https://github.com/nextcloud/news/discussions/new)\n\nReport a [feed issue](https://github.com/nextcloud/news/discussions/new)",
     "homepage": "https://github.com/nextcloud/news",
     "licenses": [
@@ -320,9 +320,9 @@
     ]
   },
   "sociallogin": {
-    "hash": "sha256-zuzQKtU+sEEYhBZ4UMfY1eMSsDfe7o/ymWYv2SJBiHw=",
-    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.2.2/release.tar.gz",
-    "version": "6.2.2",
+    "hash": "sha256-/vYEBgrlTImksgNfJafTvIiBxAZ8obwou8YjDM2P+aw=",
+    "url": "https://github.com/zorn-v/nextcloud-social-login/releases/download/v6.2.3/release.tar.gz",
+    "version": "6.2.3",
     "description": "# Social Login\n\nMake it possible to create users and log in via Telegram, OAuth, or OpenID.\n\nFor OAuth, you must create an app with certain providers. Login buttons will appear on the login page if an app ID is specified. Settings are located in the \"Social login\" section of the settings page.\n\n## Installation\n\nLog in to your Nextcloud installation as an administrator. Under \"Apps\", click \"Download and enable\" next to the \"Social Login\" app.\n\nSee below for setup and configuration instructions.\n\n## Custom OAuth2/OIDC Groups\n\nYou can use groups from your custom provider. For this, specify the \"Groups claim\" in the custom OAuth2/OIDC provider settings. This claim should be returned from the provider in the `id_token` or at the user info endpoint. The format should be an `array` or a comma-separated string. E.g., (with a claim named `roles`):\n\n```json\n{\"roles\": [\"admin\", \"user\"]}\n```\nor\n```json\n{\"roles\": \"admin,user\"}\n```\n\nNested claims are also supported. For example, `resource_access.client-id.roles` for:\n\n```json\n\"resource_access\": {\n   \"client-id\": {\n     \"roles\": [\n       \"client-role-1\",\n       \"client-role-2\"\n     ]\n   }\n}\n```\n\n**DisplayName** support is also available:\n```json\n{\"roles\": [{\"gid\": 1, \"displayName\": \"admin\"}, {\"gid\": 2, \"displayName\": \"user\"}]}\n```\n\nYou can use provider groups in two ways:\n\n1. Map provider groups to existing Nextcloud groups.\n2. Create provider groups in Nextcloud and associate them with users (if the appropriate option is enabled).\n\nTo sync groups on every login, ensure the \"Update user profile every login\" setting is checked.\n\n## Examples for Groups\n\n* Configure WSO2IS to return a roles claim with OIDC [here](https://medium.com/@dewni.matheesha/claim-mapping-and-retrieving-end-user-information-in-wso2is-cffd5f3937ff).\n* [GitLab OIDC configuration to allow specific GitLab groups](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md).\n\n## Built-in OAuth Providers\n\nCopy the link from a specific login button to get the correct \"redirect URL\" for OAuth app settings.\n\n* [Amazon](https://developer.amazon.com/loginwithamazon/console/site/lwa/overview.html)\n* [Apple](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/apple.md)\n* [Codeberg](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/codeberg.md)\n* [Discord](#configure-discord)\n* [Facebook](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/facebook.md)\n* [GitHub](https://github.com/settings/developers)\n* [GitLab](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/gitlab.md)\n* [Google](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/google.md)\n* [Keycloak](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/keycloak.md)\n* [Mail.ru](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/mailru.md)\n* **PlexTv**: Use any title as the app ID.\n* [Telegram](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/telegram.md)\n* [Twitter](https://github.com/zorn-v/nextcloud-social-login/blob/master/docs/sso/twitter.md)\n\nFor details about Google's \"Allow login only from specified domain\" setting, see [#44](https://github.com/zorn-v/nextcloud-social-login/issues/44). Use a comma-separated list for multiple domains.\n\n## Configuration\n\nAdd `'social_login_auto_redirect' => true` to `config.php` to automatically redirect unauthorized users to social login if only one provider is configured. To temporarily disable this (e.g., for local admin login), add `noredir=1` to the login URL: `https://cloud.domain.com/login?noredir=1`.\n\nConfigure HTTP client options using:\n```php\n  'social_login_http_client' => [\n    'timeout' => 45,\n    'proxy' => 'socks4://127.0.0.1:9050', // See <https://curl.se/libcurl/c/CURLOPT_PROXY.html> for allowed formats\n  ],\n```\nin `config.php`.\n\n### Configure a Provider via CLI\n\nUse the `occ` utility to configure providers via the command line. Replace variables and URLs with your deployment values:\n```bash\nphp occ config:app:set sociallogin custom_providers --value='{\"custom_oidc\": [{\"name\": \"gitlab_oidc\", \"title\": \"Gitlab\", \"authorizeUrl\": \"https://gitlab.my-domain.org/oauth/authorize\", \"tokenUrl\": \"https://gitlab.my-domain.org/oauth/token\", \"userInfoUrl\": \"https://gitlab.my-domain.org/oauth/userinfo\", \"logoutUrl\": \"\", \"clientId\": \"$my_application_id\", \"clientSecret\": \"$my_super_secret_secret\", \"scope\": \"openid\", \"groupsClaim\": \"groups\", \"style\": \"gitlab\", \"defaultGroup\": \"\"}]}'\n```\nFor Docker, prepend `docker exec -t -uwww-data CONTAINER_NAME` to the command or run interactively via `docker exec -it -uwww-data CONTAINER_NAME sh`.\n\nTo inspect configurations:\n```sql\nmysql -u nextcloud -p nextcloud\nPassword: <yourpassword>\n\n> SELECT * FROM oc_appconfig WHERE appid='sociallogin';\n```\nOr run:\n```bash\ndocker exec -t -uwww-data CONTAINER_NAME php occ config:app:get sociallogin custom_providers\n```\n\n### Configure Discord\n\n1. Create a Discord application at [Discord Developer Portal](https://discord.com/developers/applications).\n2. Navigate to `Settings > OAuth2 > General`. Add a redirect URL: `https://nextcloud.mydomain.com/apps/sociallogin/oauth/discord`.\n3. Copy the `CLIENT ID` and generate a `CLIENT SECRET`.\n4. In Nextcloud, go to `Settings > Social Login`. Paste the `CLIENT ID` into \"App id\" and `CLIENT SECRET` into \"Secret\".\n5. Select a default group for new users.\n6. For group mapping, see [#395](https://github.com/zorn-v/nextcloud-social-login/pull/395).\n\n## Hint\n\n### Callback (Reply) URL\nCopy the link from a login button on the Nextcloud login page and use it as the callback URL on your provider's site. To make the button visible temporarily, fill provider settings with placeholder data and update later.\n\nIf you encounter callback URL errors despite correct settings, ensure your Nextcloud server generates HTTPS URLs by adding `'overwriteprotocol' => 'https'` to `config.php`.",
     "homepage": "https://github.com/zorn-v/nextcloud-social-login",
     "licenses": [
@@ -330,9 +330,9 @@
     ]
   },
   "spreed": {
-    "hash": "sha256-tWWFUrJ5XQdXYb8BfoxHCFrMCKj+cwLit1zkoJtWfwk=",
-    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v22.0.0/spreed-v22.0.0.tar.gz",
-    "version": "22.0.0",
+    "hash": "sha256-w1rNmKWWhPbwhcc6F8WX5ouW8zsrl6vqpHQZGlHdSJM=",
+    "url": "https://github.com/nextcloud-releases/spreed/releases/download/v22.0.2/spreed-v22.0.2.tar.gz",
+    "version": "22.0.2",
     "description": "Chat, video & audio-conferencing using WebRTC\n\n* 💬 **Chat** Nextcloud Talk comes with a simple text chat, allowing you to share or upload files from your Nextcloud Files app or local device and mention other participants.\n* 👥 **Private, group, public and password protected calls!** Invite someone, a whole group or send a public link to invite to a call.\n* 🌐 **Federated chats** Chat with other Nextcloud users on their servers\n* 💻 **Screen sharing!** Share your screen with the participants of your call.\n* 🚀 **Integration with other Nextcloud apps** like Files, Calendar, User status, Dashboard, Flow, Maps, Smart picker, Contacts, Deck, and many more.\n* 🌉 **Sync with other chat solutions** With [Matterbridge](https://github.com/42wim/matterbridge/) being integrated in Talk, you can easily sync a lot of other chat solutions to Nextcloud Talk and vice-versa.",
     "homepage": "https://github.com/nextcloud/spreed",
     "licenses": [
@@ -430,9 +430,9 @@
     ]
   },
   "whiteboard": {
-    "hash": "sha256-2CSc9gRXAHaKiq4KfVl+44eWhtBFgjHYbMeTwE18xuA=",
-    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.3.0/whiteboard-v1.3.0.tar.gz",
-    "version": "1.3.0",
+    "hash": "sha256-i8qk1RZrLbF0Mex4lgVZp092ZrsUvosYeiLcJ4WMosQ=",
+    "url": "https://github.com/nextcloud-releases/whiteboard/releases/download/v1.4.0/whiteboard-v1.4.0.tar.gz",
+    "version": "1.4.0",
     "description": "The official whiteboard app for Nextcloud. It allows users to create and share whiteboards with other users and collaborate in real-time.\n\n**Whiteboard requires a separate collaboration server to work.** Please see the [documentation](https://github.com/nextcloud/whiteboard?tab=readme-ov-file#backend) on how to install it.\n\n- 🎨 Drawing shapes, writing text, connecting elements\n- 📝 Real-time collaboration\n- 🖼️ Add images with drag and drop\n- 📊 Easily add mermaid diagrams\n- ✨ Use the Smart Picker to embed other elements from Nextcloud\n- 📦 Image export\n- 💪 Strong foundation: We use Excalidraw as our base library",
     "homepage": "https://github.com/nextcloud/whiteboard",
     "licenses": [

From 9214a1d2c5f522caa002117a01bd8770c27d39dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 11:34:40 +0000
Subject: [PATCH 4773/6226] beam26Packages.elixir_1_19: 1.19.1 -> 1.19.2

---
 pkgs/development/interpreters/elixir/1.19.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/interpreters/elixir/1.19.nix b/pkgs/development/interpreters/elixir/1.19.nix
index 125028eef3a4..e864b3111c78 100644
--- a/pkgs/development/interpreters/elixir/1.19.nix
+++ b/pkgs/development/interpreters/elixir/1.19.nix
@@ -1,6 +1,6 @@
 import ./generic-builder.nix {
-  version = "1.19.1";
-  hash = "sha256-0rJx1BoJGDS0FsXyngBfQL3LhhNZvwh+TLQZjqOPFQw=";
+  version = "1.19.2";
+  hash = "sha256-sJNwWl6iCWzf8iDVG90DUxU8H3piKyGoU0mIAqfsphQ=";
   # https://hexdocs.pm/elixir/1.19.0-rc.1/compatibility-and-deprecations.html#between-elixir-and-erlang-otp
   minimumOTPVersion = "26";
   maximumOTPVersion = "28";

From 5f36f3ef6b530d6b5581623fce67b4342882a142 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Sun, 2 Nov 2025 13:03:47 +0100
Subject: [PATCH 4774/6226] nixos/actual: revert 452544: add environmentFile
 option

This reverts commit c13f744cdf287c4c2d85422668be22d0e266436d.
---
 nixos/modules/services/web-apps/actual.nix | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/nixos/modules/services/web-apps/actual.nix b/nixos/modules/services/web-apps/actual.nix
index 1ece9f7f04f1..af15471521f1 100644
--- a/nixos/modules/services/web-apps/actual.nix
+++ b/nixos/modules/services/web-apps/actual.nix
@@ -32,16 +32,6 @@ in
       description = "Whether to open the firewall for the specified port.";
     };
 
-    environmentFile = mkOption {
-      type = types.nullOr types.path;
-      default = null;
-      description = ''
-        Environment file for specifying additional settings such as secrets.
-
-        See <https://actualbudget.org/docs/config/oauth-auth#environment-variables>.
-      '';
-    };
-
     settings = mkOption {
       default = { };
       description = "Server settings, refer to [the documentation](https://actualbudget.org/docs/config/) for available options.";
@@ -86,7 +76,6 @@ in
         Group = "actual";
         StateDirectory = "actual";
         WorkingDirectory = dataDir;
-        EnvironmentFile = cfg.environmentFile;
         LimitNOFILE = "1048576";
         PrivateTmp = true;
         PrivateDevices = true;

From 40171764ab012446c7e20611e4e5445a1c22cc63 Mon Sep 17 00:00:00 2001
From: oddlama <oddlama@oddlama.org>
Date: Sun, 2 Nov 2025 13:12:08 +0100
Subject: [PATCH 4775/6226] nixos/actual: allow specifying secretus using
 genJqSecretsReplacementSnippet

---
 nixos/modules/services/web-apps/actual.nix | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/services/web-apps/actual.nix b/nixos/modules/services/web-apps/actual.nix
index af15471521f1..0e0bd29c4236 100644
--- a/nixos/modules/services/web-apps/actual.nix
+++ b/nixos/modules/services/web-apps/actual.nix
@@ -2,6 +2,7 @@
   lib,
   pkgs,
   config,
+  utils,
   ...
 }:
 let
@@ -16,7 +17,6 @@ let
     ;
 
   cfg = config.services.actual;
-  configFile = formatType.generate "config.json" cfg.settings;
   dataDir = "/var/lib/actual";
 
   formatType = pkgs.formats.json { };
@@ -34,7 +34,10 @@ in
 
     settings = mkOption {
       default = { };
-      description = "Server settings, refer to [the documentation](https://actualbudget.org/docs/config/) for available options.";
+      description = ''
+        Server settings, refer to [the documentation](https://actualbudget.org/docs/config/) for available options.
+        You can specify secret values in this configuration by setting `somevalue._secret = "/path/to/file"` instead of setting `somevalue` directly.
+      '';
       type = types.submodule {
         freeformType = formatType.type;
 
@@ -68,13 +71,20 @@ in
       description = "Actual server, a local-first personal finance app";
       after = [ "network.target" ];
       wantedBy = [ "multi-user.target" ];
-      environment.ACTUAL_CONFIG_PATH = configFile;
+      environment.ACTUAL_CONFIG_PATH = "/run/actual/config.json";
+
+      preStart = ''
+        # Generate config including secret values.
+        ${utils.genJqSecretsReplacementSnippet cfg.settings "/run/actual/config.json"}
+      '';
+
       serviceConfig = {
         ExecStart = getExe cfg.package;
         DynamicUser = true;
         User = "actual";
         Group = "actual";
         StateDirectory = "actual";
+        RuntimeDirectory = "actual";
         WorkingDirectory = dataDir;
         LimitNOFILE = "1048576";
         PrivateTmp = true;

From 37eaf9fee4fe1a91f4145c336b5d6a3d19aa51b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 12:30:33 +0000
Subject: [PATCH 4776/6226] gscreenshot: 3.10.0 -> 3.11.0

---
 pkgs/by-name/gs/gscreenshot/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gs/gscreenshot/package.nix b/pkgs/by-name/gs/gscreenshot/package.nix
index d7f5b0cc7899..f8a873468d72 100644
--- a/pkgs/by-name/gs/gscreenshot/package.nix
+++ b/pkgs/by-name/gs/gscreenshot/package.nix
@@ -19,14 +19,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "gscreenshot";
-  version = "3.10.0";
+  version = "3.11.0";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "thenaterhood";
     repo = "gscreenshot";
     tag = "v${version}";
-    sha256 = "sha256-y5G2eJ5G6FpH01n1/YTcjPh6u58N0nJO6gcC9yEr+84=";
+    sha256 = "sha256-ZdywZhH59L5fk1EB+o6fSj9zCOljS7T/HWpUd2tTl0o=";
   };
 
   # needed for wrapGAppsHook3 to function

From f65242ea0e68b0116abfb759287c44284ec63198 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 12:32:27 +0000
Subject: [PATCH 4777/6226] kubetui: 1.10.0 -> 1.10.1

---
 pkgs/by-name/ku/kubetui/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ku/kubetui/package.nix b/pkgs/by-name/ku/kubetui/package.nix
index 50247a5ced0f..c5a74505bec6 100644
--- a/pkgs/by-name/ku/kubetui/package.nix
+++ b/pkgs/by-name/ku/kubetui/package.nix
@@ -6,20 +6,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "kubetui";
-  version = "1.10.0";
+  version = "1.10.1";
 
   src = fetchFromGitHub {
     owner = "sarub0b0";
     repo = "kubetui";
     tag = "v${version}";
-    hash = "sha256-/gKz83IygwDcfE7AQbQCTfNT1vSRVvxyCz4JVAEcYoY=";
+    hash = "sha256-Fa/1A37uP8dYYP5S7qzxKJv7GXVWsRvdzVTmRfQ2n/c=";
   };
 
   checkFlags = [
     "--skip=workers::kube::store::tests::kubeconfigからstateを生成"
   ];
 
-  cargoHash = "sha256-W5EDeeK8oaubxgRnnuR7ef8XRvORGyv5xfSkSHZKIPc=";
+  cargoHash = "sha256-CzkXA+e0bcTU8u8Nj1OBj8Ovgzr8aDiW92AVzaYwqpA=";
 
   meta = {
     homepage = "https://github.com/sarub0b0/kubetui";

From 6e0311a0a1d0ef55b06ff136edb929b9892033ec Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 12:44:55 +0000
Subject: [PATCH 4778/6226] qovery-cli: 1.52.0 -> 1.53.0

---
 pkgs/by-name/qo/qovery-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/qo/qovery-cli/package.nix b/pkgs/by-name/qo/qovery-cli/package.nix
index 1e93754bb9e8..ab8083942882 100644
--- a/pkgs/by-name/qo/qovery-cli/package.nix
+++ b/pkgs/by-name/qo/qovery-cli/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "qovery-cli";
-  version = "1.52.0";
+  version = "1.53.0";
 
   src = fetchFromGitHub {
     owner = "Qovery";
     repo = "qovery-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-m6NdZ4K0FAZvTloworoK3Lluu9ySCGfS4L216ImByb8=";
+    hash = "sha256-kE45z/uObUcmjiYm7zO14Lhroe7PkD0pSYnRw4HbHcc=";
   };
 
-  vendorHash = "sha256-9rAAeJVKBndb4w3LNJLLBvkX5me/Y3GnA55SYGOxqi4=";
+  vendorHash = "sha256-TDvlICfKLtrG/0KPpfrN61wpUZejaJGiRR4DUBNEllY=";
 
   env.CGO_ENABLED = 0;
 

From d9430cfe41e219aed8ac856227d8d3414f1cc61b Mon Sep 17 00:00:00 2001
From: Emi Katagiri-Simpson <emi@alchemi.dev>
Date: Sat, 1 Nov 2025 12:12:23 -0400
Subject: [PATCH 4779/6226] zatackax: init at 1.1.0

Zatackax is an open-source remake of the early computer game *Achtung,
die Kurve!*  More information can be found on the projects
[GitHub](https://github.com/simenheg/zatackax).

Packaging considerations:
- **Is the package ready for general use?**
  Zatackax was originally released in 2010, and is still passively
  maintained to this day.
- **Does the project have a clear license statement?**
  Zatackax is licensed under GPL3+, as declared in its README.
- **How realistic is it that it will be used by other people?**
  Zatackax is currently packaged by Debian, OpenSUSE, the AUR, and more.
  A full list of repositories which include Zatackax is included on
  their README.
- **Is the software actively maintained upstream?**
  Zatackax currently recieves passive maintenance.  However,  it is not
  a security-critical package, nor is it integrated into a fast-changing
  ecosystem.
- **Are you willing to maintain the package?**
  Yes.  While I did choose to contribute this package first as an
  exercise to help familiarize myself with the process of contributing
  to nixpkgs, and I forsee only a very small maintance burden from this
  package, I understand that I am taking on a multi-year commitment, and
  am willing to provide maintainership for at least a release cycle, and
  likely much longer.

Including suggestions from Moraxyc Xu (@Moraxyc)
---
 pkgs/by-name/za/zatackax/package.nix | 50 ++++++++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 pkgs/by-name/za/zatackax/package.nix

diff --git a/pkgs/by-name/za/zatackax/package.nix b/pkgs/by-name/za/zatackax/package.nix
new file mode 100644
index 000000000000..8361f286d084
--- /dev/null
+++ b/pkgs/by-name/za/zatackax/package.nix
@@ -0,0 +1,50 @@
+{
+  autoreconfHook,
+  fetchFromGitHub,
+  SDL,
+  SDL_image,
+  SDL_mixer,
+  SDL_ttf,
+  stdenv,
+  lib,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "zatackax";
+  version = "1.1.0";
+
+  src = fetchFromGitHub {
+    owner = "simenheg";
+    repo = "zatackax";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-1m99hi0kjpj5Yl1nAmwSMMdQWcP0rfLLPFJPkU4oVbM=";
+  };
+
+  strictDeps = true;
+
+  nativeBuildInputs = [
+    autoreconfHook
+  ];
+
+  buildInputs = [
+    SDL_mixer
+    SDL_ttf
+    SDL_image
+    SDL
+  ];
+
+  configureFlags = [ "CFLAGS=-I${lib.getDev SDL}/include/SDL" ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Open-source remake of the early computer game \"Achtung, die Kurve!\"";
+    homepage = "https://github.com/simenheg/zatackax";
+    changelog = "https://github.com/simenheg/zatackax/releases";
+    license = lib.licenses.gpl3Plus;
+    maintainers = [ lib.maintainers.alch-emi ];
+    mainProgram = "zatackax";
+    platforms = lib.platforms.linux;
+  };
+})

From 816f60e96388d5f2d030f30d930143581c56cb18 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 12:50:43 +0000
Subject: [PATCH 4780/6226] beam26Packages.ex_doc: 0.39.0 -> 0.39.1

---
 pkgs/development/beam-modules/ex_doc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/beam-modules/ex_doc/default.nix b/pkgs/development/beam-modules/ex_doc/default.nix
index d0f121b41aa1..3d1f5a0e6320 100644
--- a/pkgs/development/beam-modules/ex_doc/default.nix
+++ b/pkgs/development/beam-modules/ex_doc/default.nix
@@ -14,12 +14,12 @@
 
 let
   pname = "ex_doc";
-  version = "0.39.0";
+  version = "0.39.1";
   src = fetchFromGitHub {
     owner = "elixir-lang";
     repo = "${pname}";
     rev = "v${version}";
-    hash = "sha256-7f4TQgQIeWb+SRMYLsqnOWnPHY7Pqi8qtruVe8OaZRY=";
+    hash = "sha256-edK484d5Fn5Kb/UEV1g3XinFF1rQJ1DypLEueET//Bg=";
   };
 in
 mixRelease {

From 9ab8d2256bec50518422f6f61652776ce3ae6000 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 12:54:00 +0000
Subject: [PATCH 4781/6226] github-mcp-server: 0.19.1 -> 0.20.1

---
 pkgs/by-name/gi/github-mcp-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix
index 76c41030464a..338b7e63b8f9 100644
--- a/pkgs/by-name/gi/github-mcp-server/package.nix
+++ b/pkgs/by-name/gi/github-mcp-server/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "github-mcp-server";
-  version = "0.19.1";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "github-mcp-server";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/i/Gk47IZtTGHUJ3ok9Y2LDTRHqlz0N4IrNmyRqSTNk=";
+    hash = "sha256-gB2MXeQQjVP/b+3hne6Mauork5szSOFz4uWIGzecN+U=";
   };
 
-  vendorHash = "sha256-esd4Ly8cbN3z9fxC1j4wQqotV2ULqK3PDf1bEovewUY=";
+  vendorHash = "sha256-DcRpKFsCdGV3sOVHeyZbo/djVVBkuxRgFh7Z5yyElRw=";
 
   ldflags = [
     "-s"

From 45bd9ae590f79bb857339fd85488c5717fbd14c9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 12:55:25 +0000
Subject: [PATCH 4782/6226] helmfile: 1.1.7 -> 1.1.9

---
 pkgs/by-name/he/helmfile/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/he/helmfile/package.nix b/pkgs/by-name/he/helmfile/package.nix
index 0892be8d042c..74e6df4729b8 100644
--- a/pkgs/by-name/he/helmfile/package.nix
+++ b/pkgs/by-name/he/helmfile/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "helmfile";
-  version = "1.1.7";
+  version = "1.1.9";
 
   src = fetchFromGitHub {
     owner = "helmfile";
     repo = "helmfile";
     rev = "v${version}";
-    hash = "sha256-DOLlibBuwzP31ZMakcuaeG/fdMDOXqgd8PKts4/gFVo=";
+    hash = "sha256-WatJSiNi/rUaoBGgIdRjczpMiXAwRQ21ck/ATVKyZe0=";
   };
 
-  vendorHash = "sha256-l7KQ67Rx2lsaUkpTHBJM6PRqqTdbwkkaeOhsUxj1MMI=";
+  vendorHash = "sha256-HTs176YgrQX8s+IrOqV4BQVZfhhFkNp+T3HbmmBFdTg=";
 
   proxyVendor = true; # darwin/linux hash mismatch
 

From 4dc9b83879ce51e180f37acb8e78ededdbf72798 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Fri, 31 Oct 2025 21:42:56 +0100
Subject: [PATCH 4783/6226] electron_39: fix build

---
 .../networking/browsers/chromium/common.nix     |  2 +-
 pkgs/by-name/gc/gclient2nix/gclient2nix.py      |  2 +-
 pkgs/development/tools/electron/common.nix      | 17 +++++++++++++++++
 pkgs/development/tools/electron/info.json       |  4 ++--
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix
index af42d74b4214..729b0bc9d5cd 100644
--- a/pkgs/applications/networking/browsers/chromium/common.nix
+++ b/pkgs/applications/networking/browsers/chromium/common.nix
@@ -624,7 +624,7 @@ let
 
         mkdir -p third_party/jdk/current/bin
       ''
-      + lib.optionalString (chromiumVersionAtLeast "142") ''
+      + lib.optionalString (!isElectron && chromiumVersionAtLeast "142") ''
         cat << EOF > gpu/webgpu/dawn_commit_hash.h
         /* Generated by lastchange.py, do not edit.*/
         #ifndef GPU_WEBGPU_DAWN_COMMIT_HASH_H_
diff --git a/pkgs/by-name/gc/gclient2nix/gclient2nix.py b/pkgs/by-name/gc/gclient2nix/gclient2nix.py
index e24cdce9be96..b26ef247d2e4 100755
--- a/pkgs/by-name/gc/gclient2nix/gclient2nix.py
+++ b/pkgs/by-name/gc/gclient2nix/gclient2nix.py
@@ -166,7 +166,7 @@ class GitilesRepo(Repo):
         # (making it count the compressed instead of uncompressed size)
         # rather than complying with it.
         if url == "https://chromium.googlesource.com/chromium/src.git":
-            self.args["postFetch"] = "rm -r $out/third_party/blink/web_tests; "
+            self.args["postFetch"] = "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); "
             self.args["postFetch"] += "rm -r $out/content/test/data; "
             self.args["postFetch"] += "rm -rf $out/courgette/testdata; "
             self.args["postFetch"] += "rm -r $out/extensions/test/data; "
diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix
index c058c68c9b9e..c28c0690bb79 100644
--- a/pkgs/development/tools/electron/common.nix
+++ b/pkgs/development/tools/electron/common.nix
@@ -190,6 +190,17 @@ in
     EOF
 
     echo -n '${info.deps."src/third_party/dawn".args.rev}' > gpu/webgpu/DAWN_VERSION
+  ''
+  + lib.optionalString (lib.versionAtLeast info.version "39") ''
+    cat << EOF > gpu/webgpu/dawn_commit_hash.h
+    /* Generated by lastchange.py, do not edit.*/
+    #ifndef GPU_WEBGPU_DAWN_COMMIT_HASH_H_
+    #define GPU_WEBGPU_DAWN_COMMIT_HASH_H_
+    #define DAWN_COMMIT_HASH "${info.deps."src/third_party/dawn".args.rev}"
+    #endif  // GPU_WEBGPU_DAWN_COMMIT_HASH_H_
+    EOF
+  ''
+  + ''
 
     (
       cd electron
@@ -273,6 +284,12 @@ in
     enable_dangling_raw_ptr_feature_flag = false;
     clang_unsafe_buffers_paths = "";
     enterprise_cloud_content_analysis = false;
+  }
+  // lib.optionalAttrs (lib.versionAtLeast info.version "39") {
+    enable_linux_installer = false;
+    enable_pdf_save_to_drive = false;
+  }
+  // {
 
     # other
     enable_widevine = false;
diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index 64c2ec0f0154..e3376fa7121c 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -3995,8 +3995,8 @@
         "deps": {
             "src": {
                 "args": {
-                    "hash": "sha256-K/3+t+Vh2IZZSx3Ld82m0I8GWAVVKYzAaS1HA6GNleU=",
-                    "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
+                    "hash": "sha256-/gjznJOMyWs7kaUquYf4c1peCi3P6LQXnHUGdLROtz4=",
+                    "postFetch": "rm -rf $(find $out/third_party/blink/web_tests ! -name BUILD.gn -mindepth 1 -maxdepth 1); rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
                     "tag": "142.0.7444.52",
                     "url": "https://chromium.googlesource.com/chromium/src.git"
                 },

From 06aa3ee5a879c382454a00a86a22869ae42f9f89 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 13:30:13 +0000
Subject: [PATCH 4784/6226] python3Packages.avwx-engine: 1.9.6 -> 1.9.7

---
 pkgs/development/python-modules/avwx-engine/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/avwx-engine/default.nix b/pkgs/development/python-modules/avwx-engine/default.nix
index 63afb979742a..781362fc6503 100644
--- a/pkgs/development/python-modules/avwx-engine/default.nix
+++ b/pkgs/development/python-modules/avwx-engine/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "avwx-engine";
-  version = "1.9.6";
+  version = "1.9.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "avwx-rest";
     repo = "avwx-engine";
     tag = version;
-    hash = "sha256-RxQm1n+U2UTzg1QlPwmOaPUWUptAj30URHfs9Degf/c=";
+    hash = "sha256-j+WT0v1h+dOGW90u+LIVQ0xIE4YzsWRo2E0mGOZUU1A=";
   };
 
   build-system = [ hatchling ];

From 6ba758e08afc3759db16b23ee749e38975e562f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 13:50:54 +0000
Subject: [PATCH 4785/6226] terraform-providers.opsgenie_opsgenie: 0.6.38 ->
 0.6.40

---
 .../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 093947426af2..0c1d47868463 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1039,11 +1039,11 @@
     "vendorHash": "sha256-57F7YS7r+/O8qSWfNhrT/5XAaq7CfX7RchY/45WBauw="
   },
   "opsgenie_opsgenie": {
-    "hash": "sha256-Mhpqi/9qgkRXZ/b2u2VFsJQBYwVgrJ5boqszvUKFu7A=",
+    "hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=",
     "homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie",
     "owner": "opsgenie",
     "repo": "terraform-provider-opsgenie",
-    "rev": "v0.6.38",
+    "rev": "v0.6.40",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 263a39fd48ef2582b4086fa8d0026a5e027e3005 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 00:43:51 +0000
Subject: [PATCH 4786/6226] python3Packages.cloudpathlib: 0.22.0 -> 0.23.0

---
 .../python-modules/cloudpathlib/default.nix   | 40 ++++++++++++-------
 1 file changed, 26 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/cloudpathlib/default.nix b/pkgs/development/python-modules/cloudpathlib/default.nix
index f8f00d04695f..e73068f90685 100644
--- a/pkgs/development/python-modules/cloudpathlib/default.nix
+++ b/pkgs/development/python-modules/cloudpathlib/default.nix
@@ -1,15 +1,23 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
+
+  # build-system
   flit-core,
+
+  # dependencies
+  pythonOlder,
   typing-extensions,
-  azure-identity,
+
+  # optional-dependencies
   azure-storage-blob,
   azure-storage-file-datalake,
   google-cloud-storage,
   boto3,
+
+  # tests
+  azure-identity,
   psutil,
   pydantic,
   pytestCheckHook,
@@ -23,27 +31,28 @@
 
 buildPythonPackage rec {
   pname = "cloudpathlib";
-  version = "0.22.0";
+  version = "0.23.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "drivendataorg";
     repo = "cloudpathlib";
     tag = "v${version}";
-    hash = "sha256-IeNYfYDvCALvK0CV4J6434E3lSz+/JvolQzQXZ8NizQ=";
+    hash = "sha256-lRZYWGX3Yqs1GTIL3ugOiu+K9RF6vJdbKP/SZAStHLc=";
   };
 
-  postPatch = ''
+  postPatch =
     # missing pytest-reportlog test dependency
-    substituteInPlace pyproject.toml \
-      --replace-fail "--report-log reportlog.jsonl" ""
-  '';
+    ''
+      substituteInPlace pyproject.toml \
+        --replace-fail "--report-log reportlog.jsonl" ""
+    '';
 
   build-system = [ flit-core ];
 
-  dependencies = lib.optional (pythonOlder "3.11") typing-extensions;
+  dependencies = lib.optionals (pythonOlder "3.11") [
+    typing-extensions
+  ];
 
   optional-dependencies = {
     all = optional-dependencies.azure ++ optional-dependencies.gs ++ optional-dependencies.s3;
@@ -71,10 +80,13 @@ buildPythonPackage rec {
   ]
   ++ optional-dependencies.all;
 
-  meta = with lib; {
+  __darwinAllowLocalNetworking = true;
+
+  meta = {
     description = "Python pathlib-style classes for cloud storage services such as Amazon S3, Azure Blob Storage, and Google Cloud Storage";
     homepage = "https://github.com/drivendataorg/cloudpathlib";
-    license = licenses.mit;
-    maintainers = with maintainers; [ GaetanLepage ];
+    changelog = "https://github.com/drivendataorg/cloudpathlib/blob/${src.tag}/HISTORY.md";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
   };
 }

From cebf318285fe91b62ec8526abd19de809e4f3a94 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 14:04:31 +0000
Subject: [PATCH 4787/6226] re-isearch: 2.20220925.4.0a-unstable-2025-10-22 ->
 2.20220925.4.0a-unstable-2025-11-02

---
 pkgs/by-name/re/re-isearch/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/re-isearch/package.nix b/pkgs/by-name/re/re-isearch/package.nix
index 69ea481a4a2e..f6332b86eeeb 100644
--- a/pkgs/by-name/re/re-isearch/package.nix
+++ b/pkgs/by-name/re/re-isearch/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation {
   pname = "re-Isearch";
-  version = "2.20220925.4.0a-unstable-2025-10-22";
+  version = "2.20220925.4.0a-unstable-2025-11-02";
 
   src = fetchFromGitHub {
     owner = "re-Isearch";
     repo = "re-Isearch";
-    rev = "749fa527c3d70aba1d82e4e1376e1fefb84ac06b";
-    hash = "sha256-AvptVlu3aU+vSYfoeHsUryHTixLnlq4HYkoisskBTdA=";
+    rev = "47e9a874d1343f68b67be16e8dd15661171c9270";
+    hash = "sha256-cwH4W6+7JwohP2sx5PjvZtu63GDTfmt6nWd7cSqZkBQ=";
   };
 
   patches = [

From 270d00096d68f56427e3a23084a0b1194bd0d881 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Sun, 2 Nov 2025 15:05:17 +0100
Subject: [PATCH 4788/6226] bitcoin-knots: add libsodium

---
 pkgs/applications/blockchains/bitcoin-knots/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/applications/blockchains/bitcoin-knots/default.nix b/pkgs/applications/blockchains/bitcoin-knots/default.nix
index 6d934130acd1..f4c67304d565 100644
--- a/pkgs/applications/blockchains/bitcoin-knots/default.nix
+++ b/pkgs/applications/blockchains/bitcoin-knots/default.nix
@@ -10,6 +10,7 @@
   wrapQtAppsHook ? null,
   boost,
   libevent,
+  libsodium,
   zeromq,
   zlib,
   db48,
@@ -67,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     boost
     libevent
+    libsodium
     zeromq
     zlib
   ]

From fe055834a87bb0c31edc9c0c9d5fcdb210b372fd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 14:09:13 +0000
Subject: [PATCH 4789/6226] ghostfolio: 2.211.0 -> 2.214.0

---
 pkgs/by-name/gh/ghostfolio/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix
index 5e3d2437af2f..29918109ef51 100644
--- a/pkgs/by-name/gh/ghostfolio/package.nix
+++ b/pkgs/by-name/gh/ghostfolio/package.nix
@@ -11,13 +11,13 @@
 
 buildNpmPackage rec {
   pname = "ghostfolio";
-  version = "2.211.0";
+  version = "2.214.0";
 
   src = fetchFromGitHub {
     owner = "ghostfolio";
     repo = "ghostfolio";
     tag = version;
-    hash = "sha256-RoIOk0MIf1IAQLPO4MwemkXqQfJuDZtYYqn+OS6IUb0=";
+    hash = "sha256-x8GUlC1/TxA40rDQu3Ae2P5v5LFtberOQWtx5GJ7rMw=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -27,7 +27,7 @@ buildNpmPackage rec {
     '';
   };
 
-  npmDepsHash = "sha256-Isy32xdxWlsGflqtcDJ6/lNaCA+IRbEOP8Z/BI0uV0s=";
+  npmDepsHash = "sha256-hHfT4gsf0D5XPY4RuQCKWNWp+iav9B75YMs70xayqtc=";
 
   nativeBuildInputs = [
     prisma

From d5ad86fed690a6baeea7eb91dc5418052e06b967 Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Sun, 2 Nov 2025 15:08:43 +0100
Subject: [PATCH 4790/6226] fastd-exporter: Use `hash` attribute in
 `fetchFromGitHub`

`sha256` shouldn't be used anymore. Use the `hash` attribute.

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/fa/fastd-exporter/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/fa/fastd-exporter/package.nix b/pkgs/by-name/fa/fastd-exporter/package.nix
index 229bb7ee2caf..df9a6ccfb567 100644
--- a/pkgs/by-name/fa/fastd-exporter/package.nix
+++ b/pkgs/by-name/fa/fastd-exporter/package.nix
@@ -12,7 +12,7 @@ buildGoModule {
     owner = "freifunk-darmstadt";
     repo = "fastd-exporter";
     rev = "374e4334af6661f4c91a3e83bf7ce071a2a72eca";
-    sha256 = "sha256-0oU4+9G19XP5qtGdcfMz08T04hjcoXX/O+FkaUPxzXE=";
+    hash = "sha256-0oU4+9G19XP5qtGdcfMz08T04hjcoXX/O+FkaUPxzXE=";
   };
 
   vendorHash = "sha256-r0W64dct6XWa9sIrzy0UdyoMw+kAq73Qc/QchmsYZkY=";

From 40fc08ff7dd0fe9d0ca42ab3804866b944f3a63a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 14:20:17 +0000
Subject: [PATCH 4791/6226] grafana-alloy: 1.11.2 -> 1.11.3

---
 pkgs/by-name/gr/grafana-alloy/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix
index c39c9f33df0d..86423689c708 100644
--- a/pkgs/by-name/gr/grafana-alloy/package.nix
+++ b/pkgs/by-name/gr/grafana-alloy/package.nix
@@ -17,13 +17,13 @@
 
 buildGoModule rec {
   pname = "grafana-alloy";
-  version = "1.11.2";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "alloy";
     tag = "v${version}";
-    hash = "sha256-HWnldpmt5M2+2zuEcA4doySgRyCBl4OnCCuXqtcYGkA=";
+    hash = "sha256-yO1r7GLXlD7f5Fpooit7SwkB7EB1hDO42o3BLvWY8Qo=";
   };
 
   proxyVendor = true;

From 66dd5aa3243d969e2c89c40b116076cb033bdc52 Mon Sep 17 00:00:00 2001
From: Morgan Helton <mhelton@gmail.com>
Date: Sun, 2 Nov 2025 08:26:48 -0600
Subject: [PATCH 4792/6226] chiaki-ng: add workaround for Qt 6.10

---
 pkgs/by-name/ch/chiaki-ng/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/ch/chiaki-ng/package.nix b/pkgs/by-name/ch/chiaki-ng/package.nix
index 1545b1a40148..8c38f73641da 100644
--- a/pkgs/by-name/ch/chiaki-ng/package.nix
+++ b/pkgs/by-name/ch/chiaki-ng/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   fetchFromGitHub,
+  fetchpatch,
   stdenv,
   cmake,
   pkg-config,
@@ -41,6 +42,14 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
+  patches = [
+    # fix for building with Qt >= 6.10 -- remove when updating past 1.9.9
+    (fetchpatch {
+      url = "https://github.com/streetpea/chiaki-ng/commit/fe5bfd87998c7ca67ade76436e31ab9924000c8b.patch";
+      hash = "sha256-7Eo5tcmhgbQszBrgtTGrnH34GewJXXAYSKqvqGN/viI=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config

From 0f4ff41b60e3a3fd92db1fc69e4d4c72bff6035a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 14:31:15 +0000
Subject: [PATCH 4793/6226] ddccontrol-db: 20250814 -> 20251102

---
 pkgs/by-name/dd/ddccontrol-db/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dd/ddccontrol-db/package.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix
index 91dc06bbec1b..b2fae63dc569 100644
--- a/pkgs/by-name/dd/ddccontrol-db/package.nix
+++ b/pkgs/by-name/dd/ddccontrol-db/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ddccontrol-db";
-  version = "20250814";
+  version = "20251102";
 
   src = fetchFromGitHub {
     owner = "ddccontrol";
     repo = "ddccontrol-db";
     rev = version;
-    sha256 = "sha256-DYDO7JZzriLdVKeqOaaEonHcdRaOD3SsvJPhScvSkVE=";
+    sha256 = "sha256-r87zucuHnWbvaqg++xI3s3Tghz80auQBgUxJzu7nmqU=";
   };
 
   nativeBuildInputs = [

From c5290a8d7c0f1173438fad0d2c977ba6b9c408e0 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Sun, 2 Nov 2025 08:34:02 -0600
Subject: [PATCH 4794/6226] cocoapods: move to pkgs/by-name and add
 cocoapods-beta variant

---
 pkgs/by-name/co/cocoapods-beta/package.nix             | 10 ++++++++++
 .../tools => by-name/co}/cocoapods/Gemfile             |  0
 .../tools => by-name/co}/cocoapods/Gemfile-beta        |  0
 .../tools => by-name/co}/cocoapods/Gemfile-beta.lock   |  0
 .../tools => by-name/co}/cocoapods/Gemfile.lock        |  0
 .../tools => by-name/co}/cocoapods/gemset-beta.nix     |  0
 .../tools => by-name/co}/cocoapods/gemset.nix          |  0
 .../default.nix => by-name/co/cocoapods/package.nix}   |  0
 .../{development/tools => by-name/co}/cocoapods/update |  0
 pkgs/top-level/all-packages.nix                        |  4 ----
 10 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 pkgs/by-name/co/cocoapods-beta/package.nix
 rename pkgs/{development/tools => by-name/co}/cocoapods/Gemfile (100%)
 rename pkgs/{development/tools => by-name/co}/cocoapods/Gemfile-beta (100%)
 rename pkgs/{development/tools => by-name/co}/cocoapods/Gemfile-beta.lock (100%)
 rename pkgs/{development/tools => by-name/co}/cocoapods/Gemfile.lock (100%)
 rename pkgs/{development/tools => by-name/co}/cocoapods/gemset-beta.nix (100%)
 rename pkgs/{development/tools => by-name/co}/cocoapods/gemset.nix (100%)
 rename pkgs/{development/tools/cocoapods/default.nix => by-name/co/cocoapods/package.nix} (100%)
 rename pkgs/{development/tools => by-name/co}/cocoapods/update (100%)

diff --git a/pkgs/by-name/co/cocoapods-beta/package.nix b/pkgs/by-name/co/cocoapods-beta/package.nix
new file mode 100644
index 000000000000..0d7850267707
--- /dev/null
+++ b/pkgs/by-name/co/cocoapods-beta/package.nix
@@ -0,0 +1,10 @@
+{
+  lib,
+  cocoapods,
+}:
+
+lib.lowPrio (
+  cocoapods.override {
+    beta = true;
+  }
+)
diff --git a/pkgs/development/tools/cocoapods/Gemfile b/pkgs/by-name/co/cocoapods/Gemfile
similarity index 100%
rename from pkgs/development/tools/cocoapods/Gemfile
rename to pkgs/by-name/co/cocoapods/Gemfile
diff --git a/pkgs/development/tools/cocoapods/Gemfile-beta b/pkgs/by-name/co/cocoapods/Gemfile-beta
similarity index 100%
rename from pkgs/development/tools/cocoapods/Gemfile-beta
rename to pkgs/by-name/co/cocoapods/Gemfile-beta
diff --git a/pkgs/development/tools/cocoapods/Gemfile-beta.lock b/pkgs/by-name/co/cocoapods/Gemfile-beta.lock
similarity index 100%
rename from pkgs/development/tools/cocoapods/Gemfile-beta.lock
rename to pkgs/by-name/co/cocoapods/Gemfile-beta.lock
diff --git a/pkgs/development/tools/cocoapods/Gemfile.lock b/pkgs/by-name/co/cocoapods/Gemfile.lock
similarity index 100%
rename from pkgs/development/tools/cocoapods/Gemfile.lock
rename to pkgs/by-name/co/cocoapods/Gemfile.lock
diff --git a/pkgs/development/tools/cocoapods/gemset-beta.nix b/pkgs/by-name/co/cocoapods/gemset-beta.nix
similarity index 100%
rename from pkgs/development/tools/cocoapods/gemset-beta.nix
rename to pkgs/by-name/co/cocoapods/gemset-beta.nix
diff --git a/pkgs/development/tools/cocoapods/gemset.nix b/pkgs/by-name/co/cocoapods/gemset.nix
similarity index 100%
rename from pkgs/development/tools/cocoapods/gemset.nix
rename to pkgs/by-name/co/cocoapods/gemset.nix
diff --git a/pkgs/development/tools/cocoapods/default.nix b/pkgs/by-name/co/cocoapods/package.nix
similarity index 100%
rename from pkgs/development/tools/cocoapods/default.nix
rename to pkgs/by-name/co/cocoapods/package.nix
diff --git a/pkgs/development/tools/cocoapods/update b/pkgs/by-name/co/cocoapods/update
similarity index 100%
rename from pkgs/development/tools/cocoapods/update
rename to pkgs/by-name/co/cocoapods/update
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0130772f5741..afda452ce4ab 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2489,10 +2489,6 @@ with pkgs;
 
   cmdpack = callPackages ../tools/misc/cmdpack { };
 
-  cocoapods = callPackage ../development/tools/cocoapods { };
-
-  cocoapods-beta = lowPrio (callPackage ../development/tools/cocoapods { beta = true; });
-
   comet-gog_heroic = callPackage ../by-name/co/comet-gog/package.nix { comet-gog_kind = "heroic"; };
 
   compass = callPackage ../development/tools/compass { };

From c75f59dd0e77e0a8e36cb08e18bcc105f9767857 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 14:45:21 +0000
Subject: [PATCH 4795/6226] mtail: 3.2.22 -> 3.2.23

---
 pkgs/by-name/mt/mtail/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mt/mtail/package.nix b/pkgs/by-name/mt/mtail/package.nix
index 0da601f9c892..478271d5be33 100644
--- a/pkgs/by-name/mt/mtail/package.nix
+++ b/pkgs/by-name/mt/mtail/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "mtail";
-  version = "3.2.22";
+  version = "3.2.23";
 
   src = fetchFromGitHub {
     owner = "jaqx0r";
     repo = "mtail";
     rev = "v${version}";
-    hash = "sha256-Cy5eXv1ccLdCZJUR0Qk0O+YMW5K+yYOeJ0B0dgvTCWo=";
+    hash = "sha256-UxEqPCQDtdVQXPgAOhzUMwXC8NWTSsHDrVLIUzfz5OA=";
   };
 
-  vendorHash = "sha256-CABKXYhW6wxac/VNqmm+3tHR0MtjpN7ZGNTiZhlgrHM=";
+  vendorHash = "sha256-uT0waytDtFavvf6v4lmMAjiX8Dd7GRx54k8L/pOjWNc=";
 
   nativeBuildInputs = [
     gotools # goyacc

From 1e181d5f6dba62e894b1fcec043c771dafe1a396 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 14:47:38 +0000
Subject: [PATCH 4796/6226] grafanactl: 0.1.6 -> 0.1.7

---
 pkgs/by-name/gr/grafanactl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/grafanactl/package.nix b/pkgs/by-name/gr/grafanactl/package.nix
index 784ce3cdf36a..81f057479a2e 100644
--- a/pkgs/by-name/gr/grafanactl/package.nix
+++ b/pkgs/by-name/gr/grafanactl/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "grafanactl";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "grafanactl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-elCTtsBkPthlDnUDWSOmM+JMBh/ms2+30b4hVsiJU6Q=";
+    hash = "sha256-6fyjawZsqP2+F3ZhIVf9KVus37/Ezi4GcE9Ywi5yzhk=";
   };
 
-  vendorHash = "sha256-WmMkLMxkfGWq8dGjVfME86hEI76Rlp5aWqbNKatUZ80=";
+  vendorHash = "sha256-wIp05nwc4MICkNFoEAjOd4kjs1RE7RpINcdYzIdq4YY=";
 
   ldflags = [
     "-X main.version=v${finalAttrs.version}"

From 2041f3c420a6a807144fe2815718652f35fcf678 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 14:54:40 +0000
Subject: [PATCH 4797/6226] equicord: 2025-10-18 -> 2025-11-02

---
 pkgs/by-name/eq/equicord/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/eq/equicord/package.nix b/pkgs/by-name/eq/equicord/package.nix
index 0284918c0497..fae5e5d0a724 100644
--- a/pkgs/by-name/eq/equicord/package.nix
+++ b/pkgs/by-name/eq/equicord/package.nix
@@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: {
   # the Equicord repository. Dates as tags (and automatic releases) were the compromise
   # we came to with upstream. Please do not change the version schema (e.g., to semver)
   # unless upstream changes the tag schema from dates.
-  version = "2025-10-18";
+  version = "2025-11-02";
 
   src = fetchFromGitHub {
     owner = "Equicord";
     repo = "Equicord";
     tag = "${finalAttrs.version}";
-    hash = "sha256-OTndJGxnr7Laf7So0vmSP+8OuyFDVV4xXi8tkuSR3U0=";
+    hash = "sha256-SThWYUi4h3OpsP28ouHW1f8+m1dr+wMAYhA/90LBYPg=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {

From ebb7fc6eaa00dac4365f913cb7cc5c2913f2e1d6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 15:07:53 +0000
Subject: [PATCH 4798/6226] dapr-cli: 1.16.1 -> 1.16.3

---
 pkgs/by-name/da/dapr-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/da/dapr-cli/package.nix b/pkgs/by-name/da/dapr-cli/package.nix
index f5d69221eba4..7616a26a52da 100644
--- a/pkgs/by-name/da/dapr-cli/package.nix
+++ b/pkgs/by-name/da/dapr-cli/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "dapr-cli";
-  version = "1.16.1";
+  version = "1.16.3";
 
   src = fetchFromGitHub {
     owner = "dapr";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-Z8Fuisx2hK6QAJ5NDh0f11t/hoHhbD2+/mZMsUFxPaQ=";
+    hash = "sha256-lDrVhY5dlaQe23WncUFpqsP7UuDgRPmMWrOlJezma/Y=";
   };
 
-  vendorHash = "sha256-qEbuu4+pQ6g3m1FtisYc26lG/4zY/boQM8d6qA5c1eo=";
+  vendorHash = "sha256-UzZJ9mgMvewahYjhTOBC/HgIaxk312a7iqbS4D5O2VU=";
 
   proxyVendor = true;
 

From e024420667da7d5c49fa088b01075beef5bac21c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 15:11:33 +0000
Subject: [PATCH 4799/6226] python3Packages.pyezvizapi: 1.0.4.1 -> 1.0.4.2

---
 pkgs/development/python-modules/pyezvizapi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyezvizapi/default.nix b/pkgs/development/python-modules/pyezvizapi/default.nix
index 3edb4e3683be..ff720b3aeb2a 100644
--- a/pkgs/development/python-modules/pyezvizapi/default.nix
+++ b/pkgs/development/python-modules/pyezvizapi/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "pyezvizapi";
-  version = "1.0.4.1";
+  version = "1.0.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "RenierM26";
     repo = "pyEzvizApi";
     tag = version;
-    hash = "sha256-BuGBEYoAZ8m5OUwzNUQC84lll5sP0BZq6bVRRCHsGcI=";
+    hash = "sha256-WZtXxkdUB7Rp4I2Hn4nzMv9GGnPWyXqPZuJClK/5eaU=";
   };
 
   build-system = [ setuptools ];

From 94c64967fb3caa7f3f775070e2cf6bc6d81be220 Mon Sep 17 00:00:00 2001
From: myypo <nikirsmcgl@gmail.com>
Date: Sun, 2 Nov 2025 17:20:40 +0200
Subject: [PATCH 4800/6226] postgres-language-server: 0.16.1 -> 0.17.2

---
 pkgs/by-name/po/postgres-language-server/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/po/postgres-language-server/package.nix b/pkgs/by-name/po/postgres-language-server/package.nix
index 290bc26f02f7..52668006deaf 100644
--- a/pkgs/by-name/po/postgres-language-server/package.nix
+++ b/pkgs/by-name/po/postgres-language-server/package.nix
@@ -8,22 +8,22 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "postgres-language-server";
-  version = "0.16.1";
+  version = "0.17.2";
 
   src = fetchgit {
     url = "https://github.com/supabase-community/postgres-language-server";
     tag = finalAttrs.version;
-    hash = "sha256-zdFgfZ9GtZObn839kkAIT71bBt7YHs28qkAWlp3k7kw=";
+    hash = "sha256-gUE6OlDFlqS+Y+gX1qYs2E8sJfNUSmS/ypMsh/q7VtE=";
     fetchSubmodules = true;
   };
 
-  cargoHash = "sha256-psgo5/tDHaQd0dkiD/3uhrKuxlOBLi/xG4x3gVPLZbw=";
+  cargoHash = "sha256-QP63SmAxjMdoz3yHLkvgM8xRleHXQmSRwTkyghbvJ+c=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook
 
     # Required to build the custom tree-sitter grammar
-    # https://github.com/supabase-community/postgres-language-server/blob/main/crates/pgt_treesitter_grammar/grammar.js
+    # https://github.com/supabase-community/postgres-language-server/blob/main/crates/pgls_treesitter_grammar/grammar.js
     tree-sitter
     nodejs
   ];
@@ -37,10 +37,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
     # As specified in the upstream: https://github.com/supabase-community/postgres-language-server/blob/main/.github/workflows/release.yml
     RUSTFLAGS = "-C strip=symbols -C codegen-units=1";
-    PGT_VERSION = finalAttrs.version;
+    PGLS_VERSION = finalAttrs.version;
   };
 
-  cargoBuildFlags = [ "-p=pgt_cli" ];
+  cargoBuildFlags = [ "-p=pgls_cli" ];
   cargoTestFlags = finalAttrs.cargoBuildFlags;
   checkFlags = [
     # Tries to write to the file system relatively to the current path

From d737091da31ed676b4b474f92f1687b510769136 Mon Sep 17 00:00:00 2001
From: Mitchell Skaggs <skaggsm333@gmail.com>
Date: Sat, 7 Dec 2024 00:23:56 -0600
Subject: [PATCH 4801/6226] nixos/man-db: set `preferLocalBuild = true`

When we _must_ build, prefer building locally since we probably already have the manpages here. Otherwise, Nix would send all the manpages to a remote builder which isn't likely to be much faster since building the DB is single-threaded. Hopefully a best-of-both worlds between keeping or removing https://github.com/NixOS/nixpkgs/commit/39e63f110e2b8607e4142e1461d08fb20b36497e.
---
 nixos/modules/misc/man-db.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/modules/misc/man-db.nix b/nixos/modules/misc/man-db.nix
index dc6af4fe9692..50ae6d790789 100644
--- a/nixos/modules/misc/man-db.nix
+++ b/nixos/modules/misc/man-db.nix
@@ -82,6 +82,7 @@ in
           pkgs.runCommand "man-cache"
             {
               nativeBuildInputs = [ buildPackage ];
+              preferLocalBuild = true;
             }
             ''
               echo "MANDB_MAP ${cfg.manualPages}/share/man $out" > man.conf

From 2113555142f53614af6b79bdf6b95a3c35bf5a30 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 15:29:37 +0000
Subject: [PATCH 4802/6226] python3Packages.nats-py: 2.11.0 -> 2.12.0

---
 pkgs/development/python-modules/nats-py/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix
index 4eb1555f61b2..77c57c6a37e8 100644
--- a/pkgs/development/python-modules/nats-py/default.nix
+++ b/pkgs/development/python-modules/nats-py/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "nats-py";
-  version = "2.11.0";
+  version = "2.12.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "nats-io";
     repo = "nats.py";
     tag = "v${version}";
-    hash = "sha256-wILjBhdlNU8U2lyJm4CmPy4DzOjJ7cBIkawKwW5KVgg=";
+    hash = "sha256-HQtoFyw3Gi/lIQFVrFvRtWWzHTY+TchZYKqTiHfUWFk=";
   };
 
   build-system = [ setuptools ];

From e3bf16ec9e0c4d72aac23a5dd494ca2764be94ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dyego=20Aur=C3=A9lio?= <dyegoaurelio@gmail.com>
Date: Sun, 2 Nov 2025 12:31:56 -0300
Subject: [PATCH 4803/6226] forge-mtg: fix darwin build alsa-lib is not
 available on darwin. fixes #457768

---
 pkgs/by-name/fo/forge-mtg/package.nix | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fo/forge-mtg/package.nix b/pkgs/by-name/fo/forge-mtg/package.nix
index 750be8e31532..c8f57b7ddcbb 100644
--- a/pkgs/by-name/fo/forge-mtg/package.nix
+++ b/pkgs/by-name/fo/forge-mtg/package.nix
@@ -3,6 +3,7 @@
   fetchFromGitHub,
   gnused,
   lib,
+  stdenv,
   maven,
   makeWrapper,
   openjdk,
@@ -108,10 +109,12 @@ maven.buildMavenPackage {
       PREFIX_CMD=""
       if [ "$commandToInstall" = "forge-adventure" ]; then
         PREFIX_CMD="--prefix LD_LIBRARY_PATH : ${
-          lib.makeLibraryPath [
-            libGL
-            alsa-lib
-          ]
+          lib.makeLibraryPath (
+            [
+              libGL
+            ]
+            ++ lib.optionals (lib.meta.availableOn stdenv.hostPlatform alsa-lib) [ alsa-lib ]
+          )
         }"
       fi
 

From c7766c637f4fe5a59761c293c78e7bc7375c6882 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 2 Nov 2025 10:11:42 +0100
Subject: [PATCH 4804/6226] ci/github-script/merge: improve caching of team
 members

This removes the need to `await` committers further down in the function
and allows re-using the cache for other teams later.
---
 ci/github-script/merge.js | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index 10e957db0362..1877a296f7e9 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -1,27 +1,32 @@
-// Caching the list of committers saves API requests when running the bot on the schedule and
+// Caching the list of team members saves API requests when running the bot on the schedule and
 // processing many PRs at once.
-let committers
+const members = {}
 
 async function runChecklist({ github, context, pull_request, maintainers }) {
   const pull_number = pull_request.number
 
-  if (!committers) {
+  function getTeamMembers(team_slug) {
     if (context.eventName === 'pull_request') {
       // We have no chance of getting a token in the pull_request context with the right
       // permissions to access the members endpoint below. Thus, we're pretending to have
-      // no committers. This is OK; because this is only for the Test workflow, not for
+      // no members. This is OK; because this is only for the Test workflow, not for
       // real use.
-      committers = new Set()
-    } else {
-      committers = github
+      return new Set()
+    }
+
+    if (!members[team_slug]) {
+      members[team_slug] = github
         .paginate(github.rest.teams.listMembersInOrg, {
           org: context.repo.owner,
-          team_slug: 'nixpkgs-committers',
+          team_slug,
           per_page: 100,
         })
         .then((members) => new Set(members.map(({ id }) => id)))
     }
+
+    return members[team_slug]
   }
+  committers = await getTeamMembers('nixpkgs-committers')
 
   const files = await github.paginate(github.rest.pulls.listFiles, {
     ...context.repo,
@@ -50,7 +55,7 @@ async function runChecklist({ github, context, pull_request, maintainers }) {
     ),
     'PR authored by r-ryantm or committer.':
       pull_request.user.login === 'r-ryantm' ||
-      (await committers).has(pull_request.user.id),
+      committers.has(pull_request.user.id),
     'PR has maintainers eligible for merge.': eligible.size > 0,
   }
 

From 4d3f2c8d57fd18299761e734622b84ef9b529b04 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 15:35:46 +0000
Subject: [PATCH 4805/6226] ansel: 0-unstable-2025-10-23 ->
 0-unstable-2025-10-25

---
 pkgs/by-name/an/ansel/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix
index 4ec69a015e2c..ebd133b45456 100644
--- a/pkgs/by-name/an/ansel/package.nix
+++ b/pkgs/by-name/an/ansel/package.nix
@@ -82,13 +82,13 @@ let
 in
 stdenv.mkDerivation {
   pname = "ansel";
-  version = "0-unstable-2025-10-23";
+  version = "0-unstable-2025-10-25";
 
   src = fetchFromGitHub {
     owner = "aurelienpierreeng";
     repo = "ansel";
-    rev = "9658941ac8e644f0bdc96700a59f822cccf8f44b";
-    hash = "sha256-fQnWSIRH7pJglBBpafwKy40J91RivTH7TTQIyQCiuow=";
+    rev = "0b268719d9a83c2296b5ce9fcc02bec9ad0f83f9";
+    hash = "sha256-LEVXZ9VUMAqDG39Kaew+JYedEqdlfxb5RdyG1X8PVpI=";
     fetchSubmodules = true;
   };
 

From 7ea127c83a3e898fd5d4d75a80a8c824af1eb89c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 2 Nov 2025 10:16:42 +0100
Subject: [PATCH 4806/6226] ci/github-script/merge: move API requests out of
 runChecklist

This makes runChecklist mostly a pure function (except for logging) to
allow calling it repeatedly later.
---
 ci/github-script/merge.js | 88 ++++++++++++++++++++-------------------
 1 file changed, 45 insertions(+), 43 deletions(-)

diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index 1877a296f7e9..481ea105f37b 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -1,39 +1,4 @@
-// Caching the list of team members saves API requests when running the bot on the schedule and
-// processing many PRs at once.
-const members = {}
-
-async function runChecklist({ github, context, pull_request, maintainers }) {
-  const pull_number = pull_request.number
-
-  function getTeamMembers(team_slug) {
-    if (context.eventName === 'pull_request') {
-      // We have no chance of getting a token in the pull_request context with the right
-      // permissions to access the members endpoint below. Thus, we're pretending to have
-      // no members. This is OK; because this is only for the Test workflow, not for
-      // real use.
-      return new Set()
-    }
-
-    if (!members[team_slug]) {
-      members[team_slug] = github
-        .paginate(github.rest.teams.listMembersInOrg, {
-          org: context.repo.owner,
-          team_slug,
-          per_page: 100,
-        })
-        .then((members) => new Set(members.map(({ id }) => id)))
-    }
-
-    return members[team_slug]
-  }
-  committers = await getTeamMembers('nixpkgs-committers')
-
-  const files = await github.paginate(github.rest.pulls.listFiles, {
-    ...context.repo,
-    pull_number,
-    per_page: 100,
-  })
-
+function runChecklist({ committers, files, pull_request, log, maintainers }) {
   const packages = files
     .filter(({ filename }) => filename.startsWith('pkgs/by-name/'))
     .map(({ filename }) => filename.split('/')[3])
@@ -59,10 +24,16 @@ async function runChecklist({ github, context, pull_request, maintainers }) {
     'PR has maintainers eligible for merge.': eligible.size > 0,
   }
 
+  const result = Object.values(checklist).every(Boolean)
+
+  log('checklist', JSON.stringify(checklist))
+  log('eligible', JSON.stringify(Array.from(eligible)))
+  log('result', result)
+
   return {
     checklist,
     eligible,
-    result: Object.values(checklist).every(Boolean),
+    result,
   }
 }
 
@@ -91,6 +62,10 @@ async function handleMergeComment({ github, body, node_id, reaction }) {
   )
 }
 
+// Caching the list of team members saves API requests when running the bot on the schedule and
+// processing many PRs at once.
+const members = {}
+
 async function handleMerge({
   github,
   context,
@@ -103,15 +78,42 @@ async function handleMerge({
 }) {
   const pull_number = pull_request.number
 
-  const { checklist, eligible, result } = await runChecklist({
-    github,
-    context,
+  function getTeamMembers(team_slug) {
+    if (context.eventName === 'pull_request') {
+      // We have no chance of getting a token in the pull_request context with the right
+      // permissions to access the members endpoint below. Thus, we're pretending to have
+      // no members. This is OK; because this is only for the Test workflow, not for
+      // real use.
+      return new Set()
+    }
+
+    if (!members[team_slug]) {
+      members[team_slug] = github
+        .paginate(github.rest.teams.listMembersInOrg, {
+          org: context.repo.owner,
+          team_slug,
+          per_page: 100,
+        })
+        .then((members) => new Set(members.map(({ id }) => id)))
+    }
+
+    return members[team_slug]
+  }
+  const committers = await getTeamMembers('nixpkgs-committers')
+
+  const files = await github.paginate(github.rest.pulls.listFiles, {
+    ...context.repo,
+    pull_number,
+    per_page: 100,
+  })
+
+  const { checklist, eligible, result } = runChecklist({
+    committers,
+    files,
     pull_request,
+    log,
     maintainers,
   })
-  log('checklist', JSON.stringify(checklist))
-  log('eligible', JSON.stringify(Array.from(eligible)))
-  log('result', result)
 
   // Only look through comments *after* the latest (force) push.
   const latestChange = events.findLast(({ event }) =>

From 6a3c294f6f0f3c171746434e1753a1a7fc153ffb Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 2 Nov 2025 10:36:52 +0100
Subject: [PATCH 4807/6226] ci/github-script/merge: move all conditions into
 runChecklist

No special casing anymore, all conditions are in the same place. This
also has the benefit of hiding the "has maintainers eligible for merge"
condition from comments, because it is only really relevant for
labeling.
---
 ci/github-script/merge.js | 56 ++++++++++++++++++++++++++-------------
 1 file changed, 38 insertions(+), 18 deletions(-)

diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index 481ea105f37b..255446c457b2 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -1,4 +1,12 @@
-function runChecklist({ committers, files, pull_request, log, maintainers }) {
+function runChecklist({
+  committers,
+  files,
+  pull_request,
+  log,
+  maintainers,
+  user,
+  userIsMaintainer,
+}) {
   const packages = files
     .filter(({ filename }) => filename.startsWith('pkgs/by-name/'))
     .map(({ filename }) => filename.split('/')[3])
@@ -21,7 +29,16 @@ function runChecklist({ committers, files, pull_request, log, maintainers }) {
     'PR authored by r-ryantm or committer.':
       pull_request.user.login === 'r-ryantm' ||
       committers.has(pull_request.user.id),
-    'PR has maintainers eligible for merge.': eligible.size > 0,
+  }
+
+  if (user) {
+    checklist[`${user.login} can use the merge bot.`] = userIsMaintainer
+    checklist[
+      `${user.login} is eligible to merge changes to the touched packages.`
+    ] = eligible.has(user.id)
+  } else {
+    // This is only used when no user is passed, i.e. for labeling.
+    checklist['PR has maintainers eligible to merge.'] = eligible.size > 0
   }
 
   const result = Object.values(checklist).every(Boolean)
@@ -32,7 +49,6 @@ function runChecklist({ committers, files, pull_request, log, maintainers }) {
 
   return {
     checklist,
-    eligible,
     result,
   }
 }
@@ -107,14 +123,6 @@ async function handleMerge({
     per_page: 100,
   })
 
-  const { checklist, eligible, result } = runChecklist({
-    committers,
-    files,
-    pull_request,
-    log,
-    maintainers,
-  })
-
   // Only look through comments *after* the latest (force) push.
   const latestChange = events.findLast(({ event }) =>
     ['committed', 'head_ref_force_pushed'].includes(event),
@@ -224,9 +232,15 @@ async function handleMerge({
       }
     }
 
-    const canUseMergeBot = await isMaintainer(comment.user.login)
-    const isEligible = eligible.has(comment.user.id)
-    const canMerge = result && canUseMergeBot && isEligible
+    const { result, checklist } = runChecklist({
+      committers,
+      files,
+      pull_request,
+      log,
+      maintainers,
+      user: comment.user,
+      userIsMaintainer: await isMaintainer(comment.user.login),
+    })
 
     const body = [
       `<!-- comment: ${comment.node_id} -->`,
@@ -235,12 +249,10 @@ async function handleMerge({
       ...Object.entries(checklist).map(
         ([msg, res]) => `- :${res ? 'white_check_mark' : 'x'}: ${msg}`,
       ),
-      `- :${canUseMergeBot ? 'white_check_mark' : 'x'}: ${comment.user.login} can use the merge bot.`,
-      `- :${isEligible ? 'white_check_mark' : 'x'}: ${comment.user.login} is eligible to merge changes to the touched packages.`,
       '',
     ]
 
-    if (canMerge) {
+    if (result) {
       await react('ROCKET')
       try {
         body.push(`:heavy_check_mark: ${await merge()} (#306934)`)
@@ -264,9 +276,17 @@ async function handleMerge({
       })
     }
 
-    if (canMerge) break
+    if (result) break
   }
 
+  const { result } = runChecklist({
+    committers,
+    files,
+    pull_request,
+    log,
+    maintainers,
+  })
+
   // Returns a boolean, which indicates whether the PR is merge-bot eligible in principle.
   // This is used to set the respective label in bot.js.
   return result

From 2d0a8791fea8a1b16161d3d0e41f6fad10986da8 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 2 Nov 2025 10:44:02 +0100
Subject: [PATCH 4808/6226] ci/github-script/merge: improve maintainer check

---
 ci/github-script/merge.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index 255446c457b2..8abc6a2ec2bd 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -7,6 +7,10 @@ function runChecklist({
   user,
   userIsMaintainer,
 }) {
+  const allByName = files.every(({ filename }) =>
+    filename.startsWith('pkgs/by-name/'),
+  )
+
   const packages = files
     .filter(({ filename }) => filename.startsWith('pkgs/by-name/'))
     .map(({ filename }) => filename.split('/')[3])
@@ -23,9 +27,7 @@ function runChecklist({
       'staging',
       'staging-next',
     ].includes(pull_request.base.ref),
-    'PR touches only files in `pkgs/by-name/`.': files.every(({ filename }) =>
-      filename.startsWith('pkgs/by-name/'),
-    ),
+    'PR touches only files in `pkgs/by-name/`.': allByName,
     'PR authored by r-ryantm or committer.':
       pull_request.user.login === 'r-ryantm' ||
       committers.has(pull_request.user.id),
@@ -33,9 +35,12 @@ function runChecklist({
 
   if (user) {
     checklist[`${user.login} can use the merge bot.`] = userIsMaintainer
-    checklist[
-      `${user.login} is eligible to merge changes to the touched packages.`
-    ] = eligible.has(user.id)
+    if (allByName) {
+      // We can only determine the below, if all packages are in by-name, since
+      // we can't reliably relate changed files to packages outside by-name.
+      checklist[`${user.login} is a maintainer of all touched packages.`] =
+        eligible.has(user.id)
+    }
   } else {
     // This is only used when no user is passed, i.e. for labeling.
     checklist['PR has maintainers eligible to merge.'] = eligible.size > 0

From db8f50b4de82a81f2f79410a2ad4bad1423443fe Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 1 Nov 2025 22:24:37 +0100
Subject: [PATCH 4809/6226] ci/github-script/merge: improve wording

---
 ci/README.md              | 2 +-
 ci/github-script/merge.js | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/ci/README.md b/ci/README.md
index df0b9a12384a..4d8c57a70d28 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -43,7 +43,7 @@ These issues effectively list PRs the merge bot has interacted with.
 To ensure security and a focused utility, the bot adheres to specific limitations:
 
 - The PR targets `master`, `staging`, or `staging-next`.
-- The PR only touches files located under `pkgs/by-name/*`.
+- The PR only touches packages located under `pkgs/by-name/*`.
 - The PR is authored by [@r-ryantm](https://nix-community.github.io/nixpkgs-update/r-ryantm/) or a [committer][@NixOS/nixpkgs-committers].
 - The user attempting to merge is a member of [@NixOS/nixpkgs-maintainers].
 - The user attempting to merge is a maintainer of all packages touched by the PR.
diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index 8abc6a2ec2bd..de3d2b020e8f 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -27,14 +27,16 @@ function runChecklist({
       'staging',
       'staging-next',
     ].includes(pull_request.base.ref),
-    'PR touches only files in `pkgs/by-name/`.': allByName,
+    'PR touches only packages in `pkgs/by-name/`.': allByName,
     'PR authored by r-ryantm or committer.':
       pull_request.user.login === 'r-ryantm' ||
       committers.has(pull_request.user.id),
   }
 
   if (user) {
-    checklist[`${user.login} can use the merge bot.`] = userIsMaintainer
+    checklist[
+      `${user.login} is a member of [@NixOS/nixpkgs-maintainers](https://github.com/orgs/NixOS/teams/nixpkgs-maintainers).`
+    ] = userIsMaintainer
     if (allByName) {
       // We can only determine the below, if all packages are in by-name, since
       // we can't reliably relate changed files to packages outside by-name.
@@ -249,8 +251,9 @@ async function handleMerge({
 
     const body = [
       `<!-- comment: ${comment.node_id} -->`,
+      `@${comment.user.login} wants to merge this PR.`,
       '',
-      'Requirements to merge this PR:',
+      'Requirements to merge this PR with `@NixOS/nixpkgs-merge-bot merge`:',
       ...Object.entries(checklist).map(
         ([msg, res]) => `- :${res ? 'white_check_mark' : 'x'}: ${msg}`,
       ),

From 6848f93842ac3def2769c70ab213685c26f7be1e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 1 Nov 2025 22:25:11 +0100
Subject: [PATCH 4810/6226] ci/github-script/merge: add TODO about second merge
 method

We have not observed this merge method being used in practice, yet. Not
in the new bot, not in the old bot. It seems like auto-merge works for
all cases.
---
 ci/github-script/merge.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index de3d2b020e8f..40ab02ae09d9 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -180,6 +180,7 @@ async function handleMerge({
       log('Auto Merge failed', e.response.errors[0].message)
     }
 
+    // TODO: Observe whether the below is true and whether manual enqueue is actually needed.
     // Auto-merge doesn't work if the target branch has already run all CI, in which
     // case the PR must be enqueued explicitly.
     // We now have merge queues enabled on all development branches, thus don't need a

From 8ab82d80a67f63f85440da8bcceaf5ac48896a5d Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 2 Nov 2025 15:34:10 +0000
Subject: [PATCH 4811/6226] python3Packages.ray: 2.51.0 -> 2.51.1

Changelog: https://github.com/ray-project/ray/releases/tag/ray-2.51.1
---
 .../python-modules/ray/default.nix            | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/python-modules/ray/default.nix b/pkgs/development/python-modules/ray/default.nix
index e5885874505f..5264772df53f 100644
--- a/pkgs/development/python-modules/ray/default.nix
+++ b/pkgs/development/python-modules/ray/default.nix
@@ -64,7 +64,7 @@
 
 let
   pname = "ray";
-  version = "2.51.0";
+  version = "2.51.1";
 in
 buildPythonPackage rec {
   inherit pname version;
@@ -84,22 +84,22 @@ buildPythonPackage rec {
       # Results are in ./ray-hashes.nix
       hashes = {
         x86_64-linux = {
-          cp310 = "sha256-Ag3Ynx7RHTOM75BhdGsatc8mNpDBkiQi4zPsdC8Cvpc=";
-          cp311 = "sha256-EYXBn2iHyik5DC+EQTD3LDOX1XNZRxX5paZN7PuyGUI=";
-          cp312 = "sha256-cLfLCsRVoZbIIRMkQAzy93c60NXwWF0htiVZ6aADOAk=";
-          cp313 = "sha256-yCsJhLPRDYhNI69cpK3oqjdoyVfMtDJwSvjpIOXN4y0=";
+          cp310 = "sha256-iiH1kUuqPe78tPpfOHjgO1icGQuGT+G4Dm3Ay/uiYAQ=";
+          cp311 = "sha256-3TUwENJUi8NF5GxFeV9wKRu0YMI2qmozk7UanNhhtW8=";
+          cp312 = "sha256-Tnhtp4Ys9zZkl30CEqUF1tWlhb6t9j59weHBKSWb7iA=";
+          cp313 = "sha256-Jl7Nb9bUppWwnGhuF9WPygwJ5xmMBzYornv0l0sD6co=";
         };
         aarch64-linux = {
-          cp310 = "sha256-48d59JxV5tth4iylLuET+Apo5APafNbaDoSAyuZi9QM=";
-          cp311 = "sha256-2Z31lVJ3rK4YasnGzux39Lp2Lw8hNaP3AVd3cYeu7T0=";
-          cp312 = "sha256-BHFnYv5SJOp9Dp25w5ZhBLGyrsyr/MhQhRAtdPAzShE=";
-          cp313 = "sha256-PfIB7kmN8ZCAN6N5VK33C77Id6gdPWD/Lcj0LIlh530=";
+          cp310 = "sha256-Nv61GfMcUtO0281o/7K6+TGVzuwG6nEeIVWQlrq5X+0=";
+          cp311 = "sha256-0tfIr0VEH/ULwAI1LTHgr+xchd1Qdb9ScCcXiTFJe84=";
+          cp312 = "sha256-C+2UCHErrRUR5laDpFUwL4jZTl5ctqWMxKFUth2KC0o=";
+          cp313 = "sha256-PyvSrPm39HOMF9CFksqq0m6vt6T8OArZq0LV8KePc60=";
         };
         aarch64-darwin = {
-          cp310 = "sha256-olwAGedusCeQeyi4y77LYteoYX55/0dcHWURYq/a/O0=";
-          cp311 = "sha256-eTY8nQJzJVEw81ncGJuhpye7mCiudzUxQ35WryCsaxw=";
-          cp312 = "sha256-BfktgeYrADF5pXwrMo3alloboyXdtSJWZVmapLUew6U=";
-          cp313 = "sha256-cRGOKyOm0t8hQoauqDEXU80+y6CNPApjGl8gsc8lJg0=";
+          cp310 = "sha256-6M4hjIXp9AQ8NxNvyQtBNDvbhE/NyVIPIcAA0djUn4k=";
+          cp311 = "sha256-vYIR/AM74bzpwDnkdOl6kHe+WTAgl4/c+6HXcL3EC6U=";
+          cp312 = "sha256-74R7AlynWLruRXGhygAdlziXytdy+OldfzA9JMOLZJ4=";
+          cp313 = "sha256-2BVHiGQ1FC29eb/x1OTt9Xil8g47EbvUztSc+vvTfSc=";
         };
       };
     in

From 84d6678f3bfd87436e25995abef9412ef5071e12 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sat, 1 Nov 2025 22:28:29 +0100
Subject: [PATCH 4812/6226] ci/github-script/merge: support OR conditions

This supports AND on the first and OR on the second level, which is
needed for some follow up work like backports, approval based merges or
trusted maintainers.
---
 ci/README.md              |  4 +++-
 ci/github-script/merge.js | 23 +++++++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/ci/README.md b/ci/README.md
index 4d8c57a70d28..500abbfb637f 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -44,7 +44,9 @@ To ensure security and a focused utility, the bot adheres to specific limitation
 
 - The PR targets `master`, `staging`, or `staging-next`.
 - The PR only touches packages located under `pkgs/by-name/*`.
-- The PR is authored by [@r-ryantm](https://nix-community.github.io/nixpkgs-update/r-ryantm/) or a [committer][@NixOS/nixpkgs-committers].
+- The PR is either:
+  - authored by a [committer][@NixOS/nixpkgs-committers], or
+  - created by [@r-ryantm](https://nix-community.github.io/nixpkgs-update/r-ryantm/).
 - The user attempting to merge is a member of [@NixOS/nixpkgs-maintainers].
 - The user attempting to merge is a maintainer of all packages touched by the PR.
 
diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index 40ab02ae09d9..5128124ac2eb 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -28,9 +28,10 @@ function runChecklist({
       'staging-next',
     ].includes(pull_request.base.ref),
     'PR touches only packages in `pkgs/by-name/`.': allByName,
-    'PR authored by r-ryantm or committer.':
-      pull_request.user.login === 'r-ryantm' ||
-      committers.has(pull_request.user.id),
+    'PR is at least one of:': {
+      'Authored by a committer.': committers.has(pull_request.user.id),
+      'Created by r-ryantm.': pull_request.user.login === 'r-ryantm',
+    },
   }
 
   if (user) {
@@ -48,7 +49,9 @@ function runChecklist({
     checklist['PR has maintainers eligible to merge.'] = eligible.size > 0
   }
 
-  const result = Object.values(checklist).every(Boolean)
+  const result = Object.values(checklist).every((v) =>
+    typeof v === 'boolean' ? v : Object.values(v).some(Boolean),
+  )
 
   log('checklist', JSON.stringify(checklist))
   log('eligible', JSON.stringify(Array.from(eligible)))
@@ -255,8 +258,16 @@ async function handleMerge({
       `@${comment.user.login} wants to merge this PR.`,
       '',
       'Requirements to merge this PR with `@NixOS/nixpkgs-merge-bot merge`:',
-      ...Object.entries(checklist).map(
-        ([msg, res]) => `- :${res ? 'white_check_mark' : 'x'}: ${msg}`,
+      ...Object.entries(checklist).flatMap(([msg, res]) =>
+        typeof res === 'boolean'
+          ? `- :${res ? 'white_check_mark' : 'x'}: ${msg}`
+          : [
+              `- :${Object.values(res).some(Boolean) ? 'white_check_mark' : 'x'}: ${msg}`,
+              ...Object.entries(res).map(
+                ([msg, res]) =>
+                  `  - ${res ? ':white_check_mark:' : ':white_large_square:'} ${msg}`,
+              ),
+            ],
       ),
       '',
     ]

From 7279555db7de1078ddfde3329d50faefbbd5b164 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sun, 2 Nov 2025 23:37:24 +0800
Subject: [PATCH 4813/6226] xfce.xfce4-panel-profiles: Add missing meta.license

Forgotten when porting this from mkXfceDerivation.
---
 .../xfce/applications/xfce4-panel-profiles/default.nix     | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix b/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix
index 88d2741a52f5..2cb7dea4c316 100644
--- a/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-panel-profiles/default.nix
@@ -57,11 +57,12 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = gitUpdater { rev-prefix = "xfce4-panel-profiles-"; };
 
-  meta = with lib; {
+  meta = {
     homepage = "https://docs.xfce.org/apps/xfce4-panel-profiles/start";
     description = "Simple application to manage Xfce panel layouts";
+    license = lib.licenses.gpl3Plus;
     mainProgram = "xfce4-panel-profiles";
-    teams = [ teams.xfce ];
-    platforms = platforms.linux;
+    teams = [ lib.teams.xfce ];
+    platforms = lib.platforms.linux;
   };
 })

From fd88829700b3ce6bb7b4ef84b6433f2eb92f3b08 Mon Sep 17 00:00:00 2001
From: mrtnvgr <martynovegorOF@yandex.ru>
Date: Sun, 2 Nov 2025 22:40:18 +0700
Subject: [PATCH 4814/6226] surge-XT: no with lib; in meta

---
 pkgs/by-name/su/surge-XT/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/su/surge-XT/package.nix b/pkgs/by-name/su/surge-XT/package.nix
index 3cc5357ef96c..d490517f1f12 100644
--- a/pkgs/by-name/su/surge-XT/package.nix
+++ b/pkgs/by-name/su/surge-XT/package.nix
@@ -71,12 +71,12 @@ stdenv.mkDerivation rec {
     export XDG_DOCUMENTS_DIR=$(mktemp -d)
   '';
 
-  meta = with lib; {
+  meta = {
     description = "LV2 & VST3 synthesizer plug-in (previously released as Vember Audio Surge)";
     homepage = "https://surge-synthesizer.github.io";
-    license = licenses.gpl3;
+    license = lib.licenses.gpl3;
     platforms = [ "x86_64-linux" ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       magnetophon
       orivej
     ];

From 292d548e37fb7a01478b3190a92f2c8808658374 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 15:48:05 +0000
Subject: [PATCH 4815/6226] python3Packages.pyexcel: 0.7.3 -> 0.7.4

---
 pkgs/development/python-modules/pyexcel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyexcel/default.nix b/pkgs/development/python-modules/pyexcel/default.nix
index e08dd1241f98..68cbb55daa19 100644
--- a/pkgs/development/python-modules/pyexcel/default.nix
+++ b/pkgs/development/python-modules/pyexcel/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "pyexcel";
-  version = "0.7.3";
+  version = "0.7.4";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-V7PD+1XdCaYsu/Kunx54qhG2J8K/xgcv8tlYfAIrBtQ=";
+    hash = "sha256-y73GBTK7sqIv5DA+gkqqOG7PbcUU0fh9GtA6E4X+5L0=";
   };
 
   build-system = [ setuptools ];

From 8d9b570065f021c4f3ec71458168ac28b67bde17 Mon Sep 17 00:00:00 2001
From: mrtnvgr <martynovegorOF@yandex.ru>
Date: Sun, 2 Nov 2025 22:49:08 +0700
Subject: [PATCH 4816/6226] surge-XT: add mrtnvgr to maintainers

---
 pkgs/by-name/su/surge-XT/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/su/surge-XT/package.nix b/pkgs/by-name/su/surge-XT/package.nix
index d490517f1f12..f4f36c8c1e67 100644
--- a/pkgs/by-name/su/surge-XT/package.nix
+++ b/pkgs/by-name/su/surge-XT/package.nix
@@ -79,6 +79,7 @@ stdenv.mkDerivation rec {
     maintainers = with lib.maintainers; [
       magnetophon
       orivej
+      mrtnvgr
     ];
   };
 }

From 51637f824a92b2017da1e156edbbb205e75255d6 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 2 Nov 2025 18:49:42 +0300
Subject: [PATCH 4817/6226] linux_6_17: 6.17.6 -> 6.17.7

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 5dc249ac5b4c..8a7956575e0c 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -30,8 +30,8 @@
         "lts": true
     },
     "6.17": {
-        "version": "6.17.6",
-        "hash": "sha256:17662dpl1rd24n20ihb1fsf66c8n3r6x1a24c6sanj1ld5mvrkwf",
+        "version": "6.17.7",
+        "hash": "sha256:03lxl2p8hvi4hdzbf72v3xh8yigr58826dmy6rqxbq9r8h6ymwnx",
         "lts": false
     }
 }

From c0d45e9e9eaf99a757ba2a87c5567f03fca26ee5 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 2 Nov 2025 18:49:45 +0300
Subject: [PATCH 4818/6226] linux_6_12: 6.12.56 -> 6.12.57

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 8a7956575e0c..9f8274cc7a64 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -25,8 +25,8 @@
         "lts": true
     },
     "6.12": {
-        "version": "6.12.56",
-        "hash": "sha256:15pclwn3nbwccdfwcqd3lkmdxwpjkmadhj63acqbzxsjycm2nhsm",
+        "version": "6.12.57",
+        "hash": "sha256:06jlsawz1wgk13gyxphkglb8a4iiwg0vg5hrfc7bj1s6gk1s2p0n",
         "lts": true
     },
     "6.17": {

From bf7a2d396b3398410f8a905180651cb1ae9e8c05 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Sun, 2 Nov 2025 18:49:48 +0300
Subject: [PATCH 4819/6226] linux_6_6: 6.6.115 -> 6.6.116

---
 pkgs/os-specific/linux/kernel/kernels-org.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/kernels-org.json b/pkgs/os-specific/linux/kernel/kernels-org.json
index 9f8274cc7a64..bcbd01d44244 100644
--- a/pkgs/os-specific/linux/kernel/kernels-org.json
+++ b/pkgs/os-specific/linux/kernel/kernels-org.json
@@ -20,8 +20,8 @@
         "lts": true
     },
     "6.6": {
-        "version": "6.6.115",
-        "hash": "sha256:0iwhzlrqcw9hzr21gn0pmsjix0d022a7g38vszx4jsqgimgc160a",
+        "version": "6.6.116",
+        "hash": "sha256:07d5629579apc1d8yb0ki226iyb5n3lwp1yw0p189qlvq919g9d9",
         "lts": true
     },
     "6.12": {

From b47d697f73b22a072ed07e81b60418578024bbc2 Mon Sep 17 00:00:00 2001
From: mrtnvgr <martynovegorOF@yandex.ru>
Date: Sun, 2 Nov 2025 22:50:06 +0700
Subject: [PATCH 4820/6226] surge-XT: use finalAttrs pattern

---
 pkgs/by-name/su/surge-XT/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/su/surge-XT/package.nix b/pkgs/by-name/su/surge-XT/package.nix
index f4f36c8c1e67..30545719a680 100644
--- a/pkgs/by-name/su/surge-XT/package.nix
+++ b/pkgs/by-name/su/surge-XT/package.nix
@@ -15,14 +15,14 @@
   libXrandr,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "surge-XT";
   version = "1.3.4";
 
   src = fetchFromGitHub {
     owner = "surge-synthesizer";
     repo = "surge";
-    tag = "release_xt_${version}";
+    tag = "release_xt_${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-4b0H3ZioiXFc4KCeQReobwQZJBl6Ep2/8JlRIwvq/hQ=";
   };
@@ -82,4 +82,4 @@ stdenv.mkDerivation rec {
       mrtnvgr
     ];
   };
-}
+})

From cf5ad65f9cb0224783f9cd36a9663bdaa6cf0e37 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 15:58:17 +0000
Subject: [PATCH 4821/6226] anilibria-winmaclinux: 2.2.31 -> 2.2.32

---
 pkgs/applications/video/anilibria-winmaclinux/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/video/anilibria-winmaclinux/default.nix b/pkgs/applications/video/anilibria-winmaclinux/default.nix
index 5b1fa114902d..6e4b6d9f18eb 100644
--- a/pkgs/applications/video/anilibria-winmaclinux/default.nix
+++ b/pkgs/applications/video/anilibria-winmaclinux/default.nix
@@ -21,13 +21,13 @@
 
 mkDerivation rec {
   pname = "anilibria-winmaclinux";
-  version = "2.2.31";
+  version = "2.2.32";
 
   src = fetchFromGitHub {
     owner = "anilibria";
     repo = "anilibria-winmaclinux";
     rev = version;
-    hash = "sha256-czLEYPz+5vXHisXexzRXLhwN4onka31hn69F4MaSnCs=";
+    hash = "sha256-Wxzv1iLJ+OWw+g6ndBX36AR2v9cSu2uZysegz97+XaM=";
   };
 
   sourceRoot = "${src.name}/src";

From 008ea3df2c95416552f41029742603a36b883458 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 2 Nov 2025 17:10:07 +0100
Subject: [PATCH 4822/6226] ci/request-reviews: fix request-reviewers.sh

We recently moved some code around and forgot to adjust the log line
here.
---
 ci/request-reviews/request-reviewers.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/request-reviews/request-reviewers.sh b/ci/request-reviews/request-reviewers.sh
index b4288669db93..a7cde16eb97b 100755
--- a/ci/request-reviews/request-reviewers.sh
+++ b/ci/request-reviews/request-reviewers.sh
@@ -59,7 +59,7 @@ while read -r handle && [[ -n "$handle" ]]; do
             "/orgs/$org/teams/$team/members" \
             --jq '.[].login' > "$tmp/team-members"
         readarray -t members < "$tmp/team-members"
-        log "Team $entry has these members: ${members[*]}"
+        log "Team $handle has these members: ${members[*]}"
 
         for user in "${members[@]}"; do
             users[${user,,}]=

From 3ef1d9a3ca71c307ba19a6191cba83cdedf98c61 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 16:22:29 +0000
Subject: [PATCH 4823/6226] python3Packages.apkinspector: 1.3.5 -> 1.3.6

---
 pkgs/development/python-modules/apkinspector/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/apkinspector/default.nix b/pkgs/development/python-modules/apkinspector/default.nix
index d2ebbfafe382..374b35a4065a 100644
--- a/pkgs/development/python-modules/apkinspector/default.nix
+++ b/pkgs/development/python-modules/apkinspector/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "apkinspector";
-  version = "1.3.5";
+  version = "1.3.6";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "erev0s";
     repo = "apkInspector";
     tag = "v${version}";
-    hash = "sha256-haJD5fioXd6KX7x2gNezGj2yUEMi/CFQUkCqa0t5yjA=";
+    hash = "sha256-xL4uUHYAn4V3cxqVb+XrIiOwK9az2VlYYTcJJt+9Cus=";
   };
 
   build-system = [ poetry-core ];

From 91c4d9236b2b95cda0b806a8185d6775626b0711 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 12 Oct 2025 14:27:24 +0200
Subject: [PATCH 4824/6226] workflows/bot: allow maintainers to merge backports

All other conditions equal, there is no reason to prevent maintainers
from backporting changes to their packages. Maintainers are probably in
the *best* position to tell whether a certain change is backportable or
not - because they know the package well.
---
 .github/workflows/backport.yml |  5 +++--
 ci/README.md                   |  5 +++--
 ci/github-script/merge.js      | 12 +++++++-----
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml
index 1826675c7501..b08714a31f12 100644
--- a/.github/workflows/backport.yml
+++ b/.github/workflows/backport.yml
@@ -57,8 +57,9 @@ jobs:
           pull_description: |-
             Bot-based backport to `${target_branch}`, triggered by a label in #${pull_number}.
 
-            * [ ] Before merging, ensure that this backport is [acceptable for the release](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#changes-acceptable-for-releases).
-              * Even as a non-committer, if you find that it is not acceptable, leave a comment.
+            **Before merging, ensure that this backport is [acceptable for the release](https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#changes-acceptable-for-releases).**
+
+            Even as a non-committer, if you find that it is not acceptable, leave a comment.
 
       - name: Log current API rate limits
         env:
diff --git a/ci/README.md b/ci/README.md
index 500abbfb637f..558a31735165 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -42,10 +42,11 @@ These issues effectively list PRs the merge bot has interacted with.
 
 To ensure security and a focused utility, the bot adheres to specific limitations:
 
-- The PR targets `master`, `staging`, or `staging-next`.
+- The PR targets one of the [development branches](#branch-classification).
 - The PR only touches packages located under `pkgs/by-name/*`.
 - The PR is either:
-  - authored by a [committer][@NixOS/nixpkgs-committers], or
+  - authored by a [committer][@NixOS/nixpkgs-committers],
+  - backported via label, or
   - created by [@r-ryantm](https://nix-community.github.io/nixpkgs-update/r-ryantm/).
 - The user attempting to merge is a member of [@NixOS/nixpkgs-maintainers].
 - The user attempting to merge is a maintainer of all packages touched by the PR.
diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index 5128124ac2eb..eb122a5a188d 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -1,3 +1,5 @@
+const { classify } = require('../supportedBranches.js')
+
 function runChecklist({
   committers,
   files,
@@ -22,14 +24,14 @@ function runChecklist({
         .reduce((acc, cur) => acc?.intersection(cur) ?? cur)
 
   const checklist = {
-    'PR targets one of the allowed branches: master, staging, staging-next.': [
-      'master',
-      'staging',
-      'staging-next',
-    ].includes(pull_request.base.ref),
+    'PR targets a [development branch](https://github.com/NixOS/nixpkgs/blob/-/ci/README.md#branch-classification).':
+      classify(pull_request.base.ref).type.includes('development'),
     'PR touches only packages in `pkgs/by-name/`.': allByName,
     'PR is at least one of:': {
       'Authored by a committer.': committers.has(pull_request.user.id),
+      'Backported via label.':
+        pull_request.user.login === 'nixpkgs-ci[bot]' &&
+        pull_request.head.ref.startsWith('backport-'),
       'Created by r-ryantm.': pull_request.user.login === 'r-ryantm',
     },
   }

From 70d710bba559c2a83125a9fe7b0cb80291732551 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 16:28:43 +0000
Subject: [PATCH 4825/6226] jotdown: 0.8.1 -> 0.9.0

---
 pkgs/by-name/jo/jotdown/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/jo/jotdown/package.nix b/pkgs/by-name/jo/jotdown/package.nix
index 8bfde8ead76c..a3594f78de58 100644
--- a/pkgs/by-name/jo/jotdown/package.nix
+++ b/pkgs/by-name/jo/jotdown/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "jotdown";
-  version = "0.8.1";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "hellux";
     repo = "jotdown";
     rev = version;
-    hash = "sha256-9gvTMcoKGdc6xYhGz1SQzTELUWeIK2VFbEwIVn/IjGs=";
+    hash = "sha256-4ZSRwQuZUtk2kY62lruj+uwP6H1sK9J7V6HFQL+t9tw=";
   };
 
-  cargoHash = "sha256-x61oImdXsLD/lU4hNcrQ2rjH5hAvTMEDJn4H3cVG6X4=";
+  cargoHash = "sha256-xPi/C9N3/9AsinmbHI/M9EGy4gvS7ZWXEl3xBf3f4LQ=";
 
   meta = with lib; {
     description = "Minimal Djot CLI";

From c0b6cc938773fd1beb71a57a2cfd38682f390526 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 2 Nov 2025 17:30:46 +0100
Subject: [PATCH 4826/6226] ci/eval/compare: fix without owners

Even without relevant owners, the owners.txt file must be created,
otherwise the next job will fail.
---
 ci/eval/compare/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix
index 571e6ba41068..9791d26e9550 100644
--- a/ci/eval/compare/default.nix
+++ b/ci/eval/compare/default.nix
@@ -230,6 +230,7 @@ runCommand "compare"
     echo "This PR touches ''${#touchedFiles[@]} files"
 
     # TODO: Move ci/OWNERS to Nix and produce owners.json instead of owners.txt.
+    touch "$out/owners.txt"
     for file in "''${touchedFiles[@]}"; do
         result=$(codeowners --file "${ownersFile}" "$file")
 

From 4d08539533708f83f27a4198b855b0315369f7f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 31 Oct 2025 20:00:45 +0000
Subject: [PATCH 4827/6226] idris2: 0.7.0 -> 0.8.0

---
 pkgs/by-name/id/idris2/package.nix |  4 ++--
 pkgs/by-name/id/idris2/tests.nix   | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/id/idris2/package.nix b/pkgs/by-name/id/idris2/package.nix
index 1b296d002c1f..f119eb143e4c 100644
--- a/pkgs/by-name/id/idris2/package.nix
+++ b/pkgs/by-name/id/idris2/package.nix
@@ -11,12 +11,12 @@ let
     in
     {
       # Compiler version & repo
-      idris2-version = "0.7.0";
+      idris2-version = "0.8.0";
       idris2-src = fetchFromGitHub {
         owner = "idris-lang";
         repo = "Idris2";
         rev = "v${self.idris2-version}";
-        hash = "sha256-VwveX3fZfrxEsytpbOc5Tm6rySpLFhTt5132J6rmrmM=";
+        hash = "sha256-MvFNSPpgONSTjACH3HGWEiNgz9aAeBPmyQwFe21+fe0=";
       };
       # Prelude libraries
       mkPrelude = callPackage ./mkPrelude.nix { }; # Build helper
diff --git a/pkgs/by-name/id/idris2/tests.nix b/pkgs/by-name/id/idris2/tests.nix
index 152b055ceefd..079ac6edc614 100644
--- a/pkgs/by-name/id/idris2/tests.nix
+++ b/pkgs/by-name/id/idris2/tests.nix
@@ -149,9 +149,9 @@ in
     transformBuildIdrisOutput = pkg: pkg.library { withSource = false; };
     expectedTree = ''
       `-- lib
-          `-- idris2-0.7.0
+          `-- idris2-${idris2.version}
               `-- pkg-0
-                  |-- 2023090800
+                  |-- 2025081600
                   |   |-- Main.ttc
                   |   `-- Main.ttm
                   `-- pkg.ipkg
@@ -186,9 +186,9 @@ in
     transformBuildIdrisOutput = pkg: pkg.library { withSource = true; };
     expectedTree = ''
       `-- lib
-          `-- idris2-0.7.0
+          `-- idris2-${idris2.version}
               `-- pkg-0
-                  |-- 2023090800
+                  |-- 2025081600
                   |   |-- Main.ttc
                   |   `-- Main.ttm
                   |-- Main.idr
@@ -224,9 +224,9 @@ in
     transformBuildIdrisOutput = pkg: pkg.library'.withSource;
     expectedTree = ''
       `-- lib
-          `-- idris2-0.7.0
+          `-- idris2-${idris2.version}
               `-- pkg-0
-                  |-- 2023090800
+                  |-- 2025081600
                   |   |-- Main.ttc
                   |   `-- Main.ttm
                   |-- Main.idr

From 4a0cc1a02649457768ee174f208a3bd18a3471c9 Mon Sep 17 00:00:00 2001
From: Ashish SHUKLA <ashish.is@lostca.se>
Date: Sun, 2 Nov 2025 17:46:13 +0100
Subject: [PATCH 4828/6226] goawk: 1.29.1 -> 1.30.0

Changes: https://github.com/benhoyt/goawk/releases/tag/v1.30.0
---
 pkgs/by-name/go/goawk/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/goawk/package.nix b/pkgs/by-name/go/goawk/package.nix
index 36f1382ce6db..3def6aaf3fde 100644
--- a/pkgs/by-name/go/goawk/package.nix
+++ b/pkgs/by-name/go/goawk/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "goawk";
-  version = "1.29.1";
+  version = "1.30.0";
 
   src = fetchFromGitHub {
     owner = "benhoyt";
     repo = "goawk";
     rev = "v${version}";
-    hash = "sha256-PQtayS2403ldNiE/xMQ/Oy+BsZB1ixDALuZcjhRyxLY=";
+    hash = "sha256-wy7rMZ0JyOKWr5u0CTaIaUDuu/SlUR8oVNf4gXWsMWY=";
   };
 
   vendorHash = null;

From 3b5520528ac597a2c0f903aa0acb2e7b8462ce0c Mon Sep 17 00:00:00 2001
From: da157 <da157@voidq.com>
Date: Sat, 1 Nov 2025 22:01:57 -0700
Subject: [PATCH 4829/6226] maintainers: rename awwpotato to da157

can be verified by visiting https://api.github.com/users/0xda157 and
https://awwpotato.xyz
---
 maintainers/maintainer-list.nix               | 14 +++++++-------
 pkgs/by-name/az/az-pim-cli/package.nix        |  2 +-
 pkgs/by-name/ca/calligraphy/package.nix       |  2 +-
 pkgs/by-name/dr/drip/package.nix              |  2 +-
 pkgs/by-name/fo/forgejo-cli/package.nix       |  2 +-
 pkgs/by-name/ma/mandown/package.nix           |  2 +-
 pkgs/by-name/nu/nucleus/package.nix           |  2 +-
 pkgs/by-name/pi/pigment/package.nix           |  2 +-
 pkgs/by-name/po/poliedros/package.nix         |  2 +-
 pkgs/by-name/re/rewaita/package.nix           |  2 +-
 pkgs/by-name/ru/rust-stakeholder/package.nix  |  2 +-
 pkgs/by-name/sl/slacky/package.nix            |  2 +-
 pkgs/by-name/so/sourcepawn-studio/package.nix |  2 +-
 pkgs/by-name/st/starship/package.nix          |  2 +-
 pkgs/by-name/ta/tarts/package.nix             |  2 +-
 pkgs/by-name/te/teleprompter/package.nix      |  2 +-
 pkgs/by-name/tu/tutanota-desktop/package.nix  |  2 +-
 pkgs/by-name/ty/typewriter/package.nix        |  2 +-
 pkgs/by-name/wr/wrkflw/package.nix            |  2 +-
 19 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index cd87f8f97907..46b063d95161 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -2633,13 +2633,6 @@
     github = "aware70";
     githubId = 7832566;
   };
-  awwpotato = {
-    email = "awwpotato@voidq.com";
-    matrix = "@awwpotato:envs.net";
-    github = "awwpotato";
-    githubId = 153149335;
-    name = "awwpotato";
-  };
   axertheaxe = {
     email = "axertheaxe@proton.me";
     github = "AxerTheAxe";
@@ -5561,6 +5554,13 @@
     githubId = 102048662;
     name = "Dalton Luce";
   };
+  da157 = {
+    email = "da157@voidq.com";
+    matrix = "@awwpotato:envs.net";
+    github = "0xda157";
+    githubId = 153149335;
+    name = "0xda157";
+  };
   dabao1955 = {
     email = "dabao1955@163.com";
     github = "dabao1955";
diff --git a/pkgs/by-name/az/az-pim-cli/package.nix b/pkgs/by-name/az/az-pim-cli/package.nix
index 8451ca93bac7..b77ea0de0c3e 100644
--- a/pkgs/by-name/az/az-pim-cli/package.nix
+++ b/pkgs/by-name/az/az-pim-cli/package.nix
@@ -59,7 +59,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/netr0m/az-pim-cli";
     changelog = "https://github.com/netr0m/az-pim-cli/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = [ lib.maintainers.da157 ];
     mainProgram = "az-pim-cli";
   };
 })
diff --git a/pkgs/by-name/ca/calligraphy/package.nix b/pkgs/by-name/ca/calligraphy/package.nix
index 815923e84192..d67e8edcdfd3 100644
--- a/pkgs/by-name/ca/calligraphy/package.nix
+++ b/pkgs/by-name/ca/calligraphy/package.nix
@@ -60,7 +60,7 @@ python3Packages.buildPythonApplication rec {
     mainProgram = "calligraphy";
     maintainers = with lib.maintainers; [
       aleksana
-      awwpotato
+      da157
     ];
     platforms = lib.platforms.linux;
   };
diff --git a/pkgs/by-name/dr/drip/package.nix b/pkgs/by-name/dr/drip/package.nix
index e0759d4ca862..04c96acf2cde 100644
--- a/pkgs/by-name/dr/drip/package.nix
+++ b/pkgs/by-name/dr/drip/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
       rybern
-      awwpotato
+      da157
     ];
   };
 })
diff --git a/pkgs/by-name/fo/forgejo-cli/package.nix b/pkgs/by-name/fo/forgejo-cli/package.nix
index 6f3439873a69..6ee01cf036c0 100644
--- a/pkgs/by-name/fo/forgejo-cli/package.nix
+++ b/pkgs/by-name/fo/forgejo-cli/package.nix
@@ -59,7 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       mit
     ];
     maintainers = with lib.maintainers; [
-      awwpotato
+      da157
       isabelroses
     ];
     mainProgram = "fj";
diff --git a/pkgs/by-name/ma/mandown/package.nix b/pkgs/by-name/ma/mandown/package.nix
index 55b57a63e5a4..5b9208d83e25 100644
--- a/pkgs/by-name/ma/mandown/package.nix
+++ b/pkgs/by-name/ma/mandown/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       asl20 # or
       mit
     ];
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = [ lib.maintainers.da157 ];
     mainProgram = "mandown";
   };
 })
diff --git a/pkgs/by-name/nu/nucleus/package.nix b/pkgs/by-name/nu/nucleus/package.nix
index 96fd47a7c1fe..1de65f7de02d 100644
--- a/pkgs/by-name/nu/nucleus/package.nix
+++ b/pkgs/by-name/nu/nucleus/package.nix
@@ -60,6 +60,6 @@ python3Packages.buildPythonApplication {
     license = lib.licenses.gpl3Plus;
     mainProgram = "nucleus";
     platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = [ lib.maintainers.da157 ];
   };
 }
diff --git a/pkgs/by-name/pi/pigment/package.nix b/pkgs/by-name/pi/pigment/package.nix
index 8a62ad321bed..89cfee0bd17e 100644
--- a/pkgs/by-name/pi/pigment/package.nix
+++ b/pkgs/by-name/pi/pigment/package.nix
@@ -64,6 +64,6 @@ python3Packages.buildPythonApplication {
     license = lib.licenses.gpl3Plus;
     mainProgram = "pigment";
     platforms = lib.platforms.linux;
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = [ lib.maintainers.da157 ];
   };
 }
diff --git a/pkgs/by-name/po/poliedros/package.nix b/pkgs/by-name/po/poliedros/package.nix
index 48bb166275a2..8ac5093b4f09 100644
--- a/pkgs/by-name/po/poliedros/package.nix
+++ b/pkgs/by-name/po/poliedros/package.nix
@@ -55,6 +55,6 @@ python3Packages.buildPythonApplication {
     changelog = "https://github.com/kriptolix/Poliedros/releases/tag/v${version}";
     license = lib.licenses.gpl3Plus;
     mainProgram = "poliedros";
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = [ lib.maintainers.da157 ];
   };
 }
diff --git a/pkgs/by-name/re/rewaita/package.nix b/pkgs/by-name/re/rewaita/package.nix
index e90782854d23..6fcf29703dea 100644
--- a/pkgs/by-name/re/rewaita/package.nix
+++ b/pkgs/by-name/re/rewaita/package.nix
@@ -72,7 +72,7 @@ python3Packages.buildPythonApplication {
     mainProgram = "rewaita";
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
-      awwpotato
+      da157
       getchoo
     ];
   };
diff --git a/pkgs/by-name/ru/rust-stakeholder/package.nix b/pkgs/by-name/ru/rust-stakeholder/package.nix
index b0b8472d6723..209e31b56a87 100644
--- a/pkgs/by-name/ru/rust-stakeholder/package.nix
+++ b/pkgs/by-name/ru/rust-stakeholder/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage {
     description = "Generate impressive-looking terminal output to look busy when stakeholders walk by";
     homepage = "https://github.com/giacomo-b/rust-stakeholder";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = [ lib.maintainers.da157 ];
     mainProgram = "rust-stakeholder";
   };
 }
diff --git a/pkgs/by-name/sl/slacky/package.nix b/pkgs/by-name/sl/slacky/package.nix
index 8686481126f0..8d496e842464 100644
--- a/pkgs/by-name/sl/slacky/package.nix
+++ b/pkgs/by-name/sl/slacky/package.nix
@@ -70,7 +70,7 @@ buildNpmPackage (finalAttrs: {
     homepage = "https://github.com/andirsun/Slacky";
     changelog = "https://github.com/andirsun/Slacky/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ awwpotato ];
+    maintainers = with lib.maintainers; [ da157 ];
     platforms = lib.platforms.linux;
     mainProgram = "slacky";
   };
diff --git a/pkgs/by-name/so/sourcepawn-studio/package.nix b/pkgs/by-name/so/sourcepawn-studio/package.nix
index b2c65c0c7a50..d0ad1266047d 100644
--- a/pkgs/by-name/so/sourcepawn-studio/package.nix
+++ b/pkgs/by-name/so/sourcepawn-studio/package.nix
@@ -36,6 +36,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://sarrus1.github.io/sourcepawn-studio/";
     changelog = "https://github.com/Sarrus1/sourcepawn-studio/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = [ lib.maintainers.da157 ];
   };
 })
diff --git a/pkgs/by-name/st/starship/package.nix b/pkgs/by-name/st/starship/package.nix
index 9195f9d024dc..596a22c6d1e7 100644
--- a/pkgs/by-name/st/starship/package.nix
+++ b/pkgs/by-name/st/starship/package.nix
@@ -65,7 +65,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       danth
       Br1ght0ne
       Frostman
-      awwpotato
+      da157
       sigmasquadron
     ];
     mainProgram = "starship";
diff --git a/pkgs/by-name/ta/tarts/package.nix b/pkgs/by-name/ta/tarts/package.nix
index e6c8cbb5051b..59785e43a152 100644
--- a/pkgs/by-name/ta/tarts/package.nix
+++ b/pkgs/by-name/ta/tarts/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage {
     description = "Screen saves and visual effects for your terminal";
     homepage = "https://github.com/oiwn/tarts";
     license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = [ lib.maintainers.da157 ];
     mainProgram = "tarts";
   };
 }
diff --git a/pkgs/by-name/te/teleprompter/package.nix b/pkgs/by-name/te/teleprompter/package.nix
index 6ca518f821e2..50b602c81591 100644
--- a/pkgs/by-name/te/teleprompter/package.nix
+++ b/pkgs/by-name/te/teleprompter/package.nix
@@ -57,6 +57,6 @@ python3Packages.buildPythonApplication {
     changelog = "https://github.com/Nokse22/teleprompter/releases/tag/v${version}";
     license = lib.licenses.gpl3Plus;
     mainProgram = "teleprompter";
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = [ lib.maintainers.da157 ];
   };
 }
diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix
index 3d7987579513..4aa4f6cc0020 100644
--- a/pkgs/by-name/tu/tutanota-desktop/package.nix
+++ b/pkgs/by-name/tu/tutanota-desktop/package.nix
@@ -47,7 +47,7 @@ appimageTools.wrapType2 rec {
     license = lib.licenses.gpl3Only;
     sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ];
     maintainers = with lib.maintainers; [
-      awwpotato
+      da157
       s0ssh
     ];
     mainProgram = "tutanota-desktop";
diff --git a/pkgs/by-name/ty/typewriter/package.nix b/pkgs/by-name/ty/typewriter/package.nix
index f45935c8b31f..706257a3a2e6 100644
--- a/pkgs/by-name/ty/typewriter/package.nix
+++ b/pkgs/by-name/ty/typewriter/package.nix
@@ -63,6 +63,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://gitlab.gnome.org/JanGernert/typewriter/-/releases/v.${finalAttrs.version}";
     platforms = lib.platforms.linux;
     license = lib.licenses.gpl3Plus;
-    maintainers = [ lib.maintainers.awwpotato ];
+    maintainers = [ lib.maintainers.da157 ];
   };
 })
diff --git a/pkgs/by-name/wr/wrkflw/package.nix b/pkgs/by-name/wr/wrkflw/package.nix
index 3ea67f6f612a..e25162c64481 100644
--- a/pkgs/by-name/wr/wrkflw/package.nix
+++ b/pkgs/by-name/wr/wrkflw/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/bahdotsh/wrkflw/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      awwpotato
+      da157
       FKouhai
       tebriel
     ];

From bfef391973a38fb14d0be856c54f496f52c934d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 17:09:57 +0000
Subject: [PATCH 4830/6226] quickjs-ng: 0.10.1 -> 0.11.0

---
 pkgs/by-name/qu/quickjs-ng/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qu/quickjs-ng/package.nix b/pkgs/by-name/qu/quickjs-ng/package.nix
index 15c563d00844..a96fd2804048 100644
--- a/pkgs/by-name/qu/quickjs-ng/package.nix
+++ b/pkgs/by-name/qu/quickjs-ng/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quickjs-ng";
-  version = "0.10.1";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "quickjs-ng";
     repo = "quickjs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WtjHyqxibP6bAO9HsXuqAW/Y1qgt/Tpj401CIk4bY7o=";
+    hash = "sha256-Mb0YyxTWU6a8HFTVBmlJ5yGEDmjKXHqTSszAvb8Y01U=";
   };
 
   outputs = [

From 7b13dda20bd11f8286897519914fc0dc59786205 Mon Sep 17 00:00:00 2001
From: Iwan <tracnar@gmail.com>
Date: Sun, 2 Nov 2025 18:10:49 +0100
Subject: [PATCH 4831/6226] python3Packages.yoto-api: 1.26.5 -> 2.1.2,
 home-assistant-custom-components.yoto_ha: 1.24.5 -> 2.2.0

---
 pkgs/development/python-modules/yoto-api/default.nix          | 4 ++--
 .../home-assistant/custom-components/yoto_ha/package.nix      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/yoto-api/default.nix b/pkgs/development/python-modules/yoto-api/default.nix
index e44dd9e98b41..71d39460a52c 100644
--- a/pkgs/development/python-modules/yoto-api/default.nix
+++ b/pkgs/development/python-modules/yoto-api/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "yoto-api";
-  version = "1.26.5";
+  version = "2.1.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cdnninja";
     repo = "yoto_api";
     tag = "v${version}";
-    hash = "sha256-QlcZZjyMPIPGG5zHTFM9E2Y8sa/etbvMmxRp15NzKEo=";
+    hash = "sha256-bRJjDgmMLJcmWyyxTg0BLjBukGi8JX9WWz9IoUl9Fcw=";
   };
 
   build-system = [ setuptools ];
diff --git a/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix b/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix
index e920794c99e8..bff0bd6f61ff 100644
--- a/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/yoto_ha/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "cdnninja";
   domain = "yoto";
-  version = "1.24.5";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "cdnninja";
     repo = "yoto_ha";
     tag = "v${version}";
-    hash = "sha256-z9BrZAjjtt9EC84CzDe3AzmJHQtCBLgEoWrCJpOPBK0=";
+    hash = "sha256-2h9lrs6vl4JVYbwaMkQKq2Sq/Iu1Sn1HmMJuso46SSE=";
   };
 
   dependencies = [

From 505b7741a780773910f056baaf8aea0a54b36834 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 17:20:11 +0000
Subject: [PATCH 4832/6226] libretro.fbneo: 0-unstable-2025-09-30 ->
 0-unstable-2025-11-02

---
 pkgs/applications/emulators/libretro/cores/fbneo.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix
index 67b9bf9d928d..0fa8f419c63b 100644
--- a/pkgs/applications/emulators/libretro/cores/fbneo.nix
+++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "fbneo";
-  version = "0-unstable-2025-09-30";
+  version = "0-unstable-2025-11-02";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "fbneo";
-    rev = "9726100ba22a558290860a2648e1e6a8b8719478";
-    hash = "sha256-mhXuHPwXtvuA8ltaLF3uOsBwLE0evJ2RiCrNX5hnRXM=";
+    rev = "442a0e901c3d7d60c94f21caf46c0535233086f6";
+    hash = "sha256-ewwF7btf5EEBmGzAVuH4LavrDpmVzEBD/BE1/T/p6bM=";
   };
 
   makefile = "Makefile";

From 5f17932c08871a21b3136df9a3ea4764ee4ba68a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 17:22:54 +0000
Subject: [PATCH 4833/6226] python3Packages.subarulink: 0.7.15 -> 0.7.16

---
 pkgs/development/python-modules/subarulink/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/subarulink/default.nix b/pkgs/development/python-modules/subarulink/default.nix
index ed0f5abbfbf8..5e717b742eac 100644
--- a/pkgs/development/python-modules/subarulink/default.nix
+++ b/pkgs/development/python-modules/subarulink/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "subarulink";
-  version = "0.7.15";
+  version = "0.7.16";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "G-Two";
     repo = "subarulink";
     tag = "v${version}";
-    hash = "sha256-7ymvnxZOpqVitUDHuHxYbYRl2Dnlgvuh+nXXUgE7cXo=";
+    hash = "sha256-IrQlqvYZwQ9o7eBgmjOTA9leETgvC2Ek6ccsul2CTX0=";
   };
 
   build-system = [ setuptools ];

From ee38c7a1db4909431ce1f51d3c7b1f1f35c52baa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 17:35:13 +0000
Subject: [PATCH 4834/6226] libretro.mame: 0-unstable-2025-09-26 ->
 0-unstable-2025-11-01

---
 pkgs/applications/emulators/libretro/cores/mame.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/mame.nix b/pkgs/applications/emulators/libretro/cores/mame.nix
index f23616c03969..ae4f1ca10acf 100644
--- a/pkgs/applications/emulators/libretro/cores/mame.nix
+++ b/pkgs/applications/emulators/libretro/cores/mame.nix
@@ -9,13 +9,13 @@
 }:
 mkLibretroCore {
   core = "mame";
-  version = "0-unstable-2025-09-26";
+  version = "0-unstable-2025-11-01";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "mame";
-    rev = "61743c76180f1ad454227ed1be0261a071d37d67";
-    hash = "sha256-R7zBl8Y5tnG+CkFgyTdwlGlCLwG/9Svs3hsJJp12fOY=";
+    rev = "a90e86e100f79533f257ac2b30ccefe26a76daad";
+    hash = "sha256-BD5DFl9EzSgnKBjF/TPXL8yvoyc3B1Ktzcwug8CEK38=";
     fetchSubmodules = true;
   };
 

From cf67993b3e17929aebd584c206bf82b7966fefe4 Mon Sep 17 00:00:00 2001
From: Shelvacu <git@shelvacu.com>
Date: Sun, 2 Nov 2025 09:37:24 -0800
Subject: [PATCH 4835/6226] partftpy: init at 0.4.0

This is a fork of tftpy required for copyparty
---
 .../python-modules/partftpy/default.nix       | 38 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/development/python-modules/partftpy/default.nix

diff --git a/pkgs/development/python-modules/partftpy/default.nix b/pkgs/development/python-modules/partftpy/default.nix
new file mode 100644
index 000000000000..8a0df4e5f57a
--- /dev/null
+++ b/pkgs/development/python-modules/partftpy/default.nix
@@ -0,0 +1,38 @@
+# mostly copied from https://github.com/9001/copyparty/blob/hovudstraum/contrib/package/nix/partftpy/default.nix
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+}:
+buildPythonPackage rec {
+  pname = "partftpy";
+  version = "0.4.0";
+
+  src = fetchFromGitHub {
+    owner = "9001";
+    repo = "partftpy";
+    tag = "v${version}";
+    hash = "sha256-9+zY9OpGQ3LbORwtjEYZF1lRaQCLmSyQ9KQdxaOzMuM=";
+  };
+
+  postPatch = ''
+    # poor setuptools gets confused by this dir
+    rm -r t
+  '';
+
+  pyproject = true;
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "partftpy.TftpServer" ];
+
+  meta = {
+    description = "Pure Python TFTP library (copyparty fork of tftpy)";
+    homepage = "https://github.com/9001/partftpy";
+    changelog = "https://github.com/9001/partftpy/releases/tag/${version}";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.shelvacu ];
+    platforms = lib.platforms.all;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 96b412d8e7a5..7533984b6ae0 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11550,6 +11550,8 @@ self: super: with self; {
 
   partd = callPackage ../development/python-modules/partd { };
 
+  partftpy = callPackage ../development/python-modules/partftpy { };
+
   partial-json-parser = callPackage ../development/python-modules/partial-json-parser { };
 
   particle = callPackage ../development/python-modules/particle { };

From 3a3699303aedfb2393c8de64e02ba6b72bb98617 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 2 Nov 2025 11:40:53 -0600
Subject: [PATCH 4836/6226] sketchybar: 2.22.1 -> 2.23.0

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 pkgs/by-name/sk/sketchybar/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sk/sketchybar/package.nix b/pkgs/by-name/sk/sketchybar/package.nix
index 501e14e1d263..e8f8ce09677a 100644
--- a/pkgs/by-name/sk/sketchybar/package.nix
+++ b/pkgs/by-name/sk/sketchybar/package.nix
@@ -19,13 +19,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "sketchybar";
-  version = "2.22.1";
+  version = "2.23.0";
 
   src = fetchFromGitHub {
     owner = "FelixKratz";
     repo = "SketchyBar";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-272lrH0ee4z4hcY4Hqt/UxjGwH6RFPEP4n0jz6Ab/+c=";
+    hash = "sha256-PvKvevsSyRb6OfPWc2+1Bcfj2ngmgeP1URBoBiVeEdk=";
   };
 
   buildInputs = [

From 6412660fe1beac9e1a067a9f80298908438662c6 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 09:47:26 -0800
Subject: [PATCH 4837/6226] python3Packages.fireworks-ai: remove duplicate
 dependencies

---
 pkgs/development/python-modules/fireworks-ai/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/python-modules/fireworks-ai/default.nix b/pkgs/development/python-modules/fireworks-ai/default.nix
index 7006fbfddf3f..1610d26d215a 100644
--- a/pkgs/development/python-modules/fireworks-ai/default.nix
+++ b/pkgs/development/python-modules/fireworks-ai/default.nix
@@ -115,16 +115,12 @@ buildPythonPackage rec {
     httpx
     httpx
     httpx-sse
-    httpx-sse
-    httpx-ws
     httpx-ws
     mmh3
     openai
     pillow
-    pillow
     protobuf
     pydantic
-    pydantic
     python-dateutil
     rich
     typing-extensions

From 288db06660b463d40d70e417b968590b634d980a Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 09:38:44 -0800
Subject: [PATCH 4838/6226] python3Packages.fireworks-ai: use packaged
 asyncstdlib-fw and betterproto-fw from nixpkgs

---
 .../python-modules/fireworks-ai/default.nix   | 57 +------------------
 1 file changed, 2 insertions(+), 55 deletions(-)

diff --git a/pkgs/development/python-modules/fireworks-ai/default.nix b/pkgs/development/python-modules/fireworks-ai/default.nix
index 1610d26d215a..a4562fbff573 100644
--- a/pkgs/development/python-modules/fireworks-ai/default.nix
+++ b/pkgs/development/python-modules/fireworks-ai/default.nix
@@ -6,11 +6,9 @@
   # build-system
   pdm-backend,
 
-  # local dependencies
-  black,
-  mypy,
-
   # dependencies
+  asyncstdlib-fw,
+  betterproto-fw,
   grpcio,
   grpclib,
   httpx-sse,
@@ -36,57 +34,6 @@
   tqdm,
 }:
 
-let
-  asyncstdlib-fw = buildPythonPackage rec {
-    pname = "asyncstdlib_fw";
-    version = "3.13.2";
-    pyproject = true;
-
-    src = fetchPypi {
-      inherit pname version;
-      hash = "sha256-Ua0JTCBMWTbDBA84wy/W1UmzkcmA8h8foJW2X7aAah8=";
-    };
-
-    build-system = [
-      pdm-backend
-    ];
-
-    dependencies = [
-      black
-      mypy
-    ];
-
-    pythonImportsCheck = [
-      "asyncstdlib"
-    ];
-  };
-
-  betterproto-fw = buildPythonPackage rec {
-    pname = "betterproto_fw";
-    version = "2.0.3";
-    pyproject = true;
-
-    src = fetchPypi {
-      inherit version pname;
-      hash = "sha256-ut5GchUiTygHhC2hj+gSWKCoVnZrrV8KIKFHTFzba5M=";
-    };
-
-    build-system = [
-      pdm-backend
-    ];
-
-    dependencies = [
-      grpclib
-      python-dateutil
-      typing-extensions
-    ];
-
-    pythonImportsCheck = [
-      "betterproto"
-    ];
-
-  };
-in
 buildPythonPackage rec {
   pname = "fireworks-ai";
   version = "0.17.16";

From 6c95436e45f5fb070bab4ad3a6cf66baa024f93f Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 09:41:15 -0800
Subject: [PATCH 4839/6226] python3Packages.fireworks-ai: 0.17.16 -> 0.19.20

---
 pkgs/development/python-modules/fireworks-ai/default.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fireworks-ai/default.nix b/pkgs/development/python-modules/fireworks-ai/default.nix
index a4562fbff573..9fcd5105dfe8 100644
--- a/pkgs/development/python-modules/fireworks-ai/default.nix
+++ b/pkgs/development/python-modules/fireworks-ai/default.nix
@@ -9,6 +9,7 @@
   # dependencies
   asyncstdlib-fw,
   betterproto-fw,
+  googleapis-common-protos,
   grpcio,
   grpclib,
   httpx-sse,
@@ -21,6 +22,7 @@
   pydantic,
   python-dateutil,
   rich,
+  toml,
   typing-extensions,
 
   # optional dependencies
@@ -36,14 +38,14 @@
 
 buildPythonPackage rec {
   pname = "fireworks-ai";
-  version = "0.17.16";
+  version = "0.19.20";
   pyproject = true;
 
   # no source available
   src = fetchPypi {
     pname = "fireworks_ai";
     inherit version;
-    hash = "sha256-WblcAaYjnzwPS4n5rixNHbHLNGTE3bTPXvQ9lYZ1f9A=";
+    hash = "sha256-zK8lO+vFnMEPPl79QGfqPdemZT7kQdCqAPiCrcXdqYQ=";
   };
 
   build-system = [
@@ -51,12 +53,14 @@ buildPythonPackage rec {
   ];
 
   pythonRelaxDeps = [
+    "attrs"
     "protobuf"
   ];
 
   dependencies = [
     asyncstdlib-fw
     betterproto-fw
+    googleapis-common-protos
     grpcio
     grpclib
     httpx
@@ -70,6 +74,7 @@ buildPythonPackage rec {
     pydantic
     python-dateutil
     rich
+    toml
     typing-extensions
   ];
 

From a1fce4a2329e2ca0282df97a7026fd462662a192 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 17:49:14 +0000
Subject: [PATCH 4840/6226] splash: 3.11.5 -> 3.11.6

---
 pkgs/by-name/sp/splash/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sp/splash/package.nix b/pkgs/by-name/sp/splash/package.nix
index ae922f857449..428cee00d8b1 100644
--- a/pkgs/by-name/sp/splash/package.nix
+++ b/pkgs/by-name/sp/splash/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "splash";
-  version = "3.11.5";
+  version = "3.11.6";
 
   src = fetchFromGitHub {
     owner = "danieljprice";
     repo = "splash";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-Zvg8QOpRBb9VmuJCKhwAxy0k04a4FOWDHfgFmIV9ruk=";
+    hash = "sha256-cnvsxHaTuz0xKOlGfWtjZDd/RDxNuurTNk03pTGYs78=";
   };
 
   nativeBuildInputs = [

From 9242bbbf3a7eafdd30a864c7739803565b6e4c74 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 17:57:27 +0000
Subject: [PATCH 4841/6226] quill-log: 10.1.0 -> 10.2.0

---
 pkgs/by-name/qu/quill-log/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qu/quill-log/package.nix b/pkgs/by-name/qu/quill-log/package.nix
index 16d72d333320..daca00bd5a21 100644
--- a/pkgs/by-name/qu/quill-log/package.nix
+++ b/pkgs/by-name/qu/quill-log/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "quill-log";
-  version = "10.1.0";
+  version = "10.2.0";
 
   src = fetchFromGitHub {
     owner = "odygrd";
     repo = "quill";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nCU+7y2ssvV8VDxQ51fjG4d/vsmWRkHpWWoUaXNTQcQ=";
+    hash = "sha256-BgUKxUKAaDRGm8OazhMDAfzbJSGXyScpJ5YR8lz5u6c=";
   };
 
   nativeBuildInputs = [ cmake ];

From 0e145b1eaaa548cde9dad562900ba7493e18a244 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 18:04:25 +0000
Subject: [PATCH 4842/6226] famistudio: 4.4.2 -> 4.4.3

---
 pkgs/by-name/fa/famistudio/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fa/famistudio/package.nix b/pkgs/by-name/fa/famistudio/package.nix
index 277747f7f846..d9b31f7d4fb6 100644
--- a/pkgs/by-name/fa/famistudio/package.nix
+++ b/pkgs/by-name/fa/famistudio/package.nix
@@ -29,13 +29,13 @@ let
 in
 buildDotnetModule (finalAttrs: {
   pname = "famistudio";
-  version = "4.4.2";
+  version = "4.4.3";
 
   src = fetchFromGitHub {
     owner = "BleuBleu";
     repo = "FamiStudio";
     tag = finalAttrs.version;
-    hash = "sha256-A4tC1khtCLTfacdEq5z8ulRzhoItNgBe438TAaPdyLA=";
+    hash = "sha256-DUXIQIZa0Ppr4EtvDKN5T3XZoc8rBILn+mVnjFGxlxA=";
   };
 
   postPatch =

From 4c0ec974ff7c27f37f1f1fb3975df95402cfd456 Mon Sep 17 00:00:00 2001
From: 9R <git@9-r.net>
Date: Sun, 2 Nov 2025 08:07:00 +0100
Subject: [PATCH 4843/6226] home-assistant-custom-components.moonraker: 1.11.0
 -> 1.11.1

Changelog:
https://github.com/marcolivierarsenault/moonraker-home-assistant/releases/tag/1.11.1

Changelog full:
https://github.com/marcolivierarsenault/moonraker-home-assistant/compare/1.11.0...1.11.1
---
 .../home-assistant/custom-components/moonraker/package.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix
index bed0477b38d3..05cbc40897c3 100644
--- a/pkgs/servers/home-assistant/custom-components/moonraker/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/moonraker/package.nix
@@ -13,13 +13,13 @@
 buildHomeAssistantComponent rec {
   owner = "marcolivierarsenault";
   domain = "moonraker";
-  version = "1.11.0";
+  version = "1.11.1";
 
   src = fetchFromGitHub {
     owner = "marcolivierarsenault";
     repo = "moonraker-home-assistant";
     tag = version;
-    hash = "sha256-By3gCFNkI6nJyjiQVdLLfISuUfZoXjM/9PnZ2lJpH3w=";
+    hash = "sha256-3qxTigKBZ7maUylx0NCf70tURNUWFpo2TzgxnxqjUpA=";
   };
 
   dependencies = [

From 5a9ec68e45fca43df34235d5787f0efc7a90beab Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 2 Nov 2025 18:03:51 +0000
Subject: [PATCH 4844/6226] python3Packages.gpytorch: 1.14 -> 1.14.2

Diff: https://github.com/cornellius-gp/gpytorch/compare/v1.14...v1.14.2
---
 .../python-modules/gpytorch/default.nix       | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/gpytorch/default.nix b/pkgs/development/python-modules/gpytorch/default.nix
index 08db11be0e4f..e6ac8ecadd65 100644
--- a/pkgs/development/python-modules/gpytorch/default.nix
+++ b/pkgs/development/python-modules/gpytorch/default.nix
@@ -2,27 +2,33 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  setuptools,
+  setuptools-scm,
+
+  # dependencies
   jaxtyping,
   linear-operator,
   mpmath,
   scikit-learn,
   scipy,
-  setuptools,
-  setuptools-scm,
   torch,
+
+  # tests
   pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "gpytorch";
-  version = "1.14";
+  version = "1.14.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cornellius-gp";
     repo = "gpytorch";
     tag = "v${version}";
-    hash = "sha256-whZjqAs3nyjKMzAGi+OnyBtboq0UuV8m11A4IzkWtec=";
+    hash = "sha256-yDIGiA7q4e6T7SdnO+ALcc3ezmJK964T5Nn48+NGJV8=";
   };
 
   build-system = [
@@ -30,8 +36,6 @@ buildPythonPackage rec {
     setuptools-scm
   ];
 
-  pythonRelaxDeps = [ "jaxtyping" ];
-
   dependencies = [
     jaxtyping
     linear-operator
@@ -56,10 +60,12 @@ buildPythonPackage rec {
     "test_t_matmul_matrix"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Highly efficient and modular implementation of Gaussian Processes, with GPU acceleration";
     homepage = "https://gpytorch.ai";
-    license = licenses.mit;
-    maintainers = with maintainers; [ veprbl ];
+    downloadPage = "https://github.com/cornellius-gp/gpytorch";
+    changelog = "https://github.com/cornellius-gp/gpytorch/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ veprbl ];
   };
 }

From eb8f297921a826a22e80cb0d0f6c7ce404829118 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 2 Nov 2025 18:00:50 +0000
Subject: [PATCH 4845/6226] python3Packages.botorch: 0.15.1 -> 0.16.0

Diff: https://github.com/pytorch/botorch/compare/v0.15.1...v0.16.0

Changelog: https://github.com/pytorch/botorch/blob/v0.16.0/CHANGELOG.md
---
 .../python-modules/botorch/default.nix          | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/botorch/default.nix b/pkgs/development/python-modules/botorch/default.nix
index f2b60e3b4a26..5cebb2e1e14e 100644
--- a/pkgs/development/python-modules/botorch/default.nix
+++ b/pkgs/development/python-modules/botorch/default.nix
@@ -15,7 +15,9 @@
   pyre-extensions,
   pyro-ppl,
   scipy,
+  threadpoolctl,
   torch,
+  typing-extensions,
 
   # optional-dependencies
   pymoo,
@@ -27,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "botorch";
-  version = "0.15.1";
+  version = "0.16.0";
   pyproject = true;
 
   src = fetchFromGitHub {
-    owner = "pytorch";
+    owner = "meta-pytorch";
     repo = "botorch";
     tag = "v${version}";
-    hash = "sha256-6hAsKIlwycZtLZn1vkcu4fR85uACA4FSkT5e/wos17A=";
+    hash = "sha256-XpcmWJcKaIxrM79MgjG7IF/DphTH402iltlh8ISeZ64=";
   };
 
   build-system = [
@@ -49,7 +51,9 @@ buildPythonPackage rec {
     pyre-extensions
     pyro-ppl
     scipy
+    threadpoolctl
     torch
+    typing-extensions
   ];
 
   optional-dependencies = {
@@ -62,6 +66,11 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTestPaths = [
+    # Requires unpackaged pfns
+    "test_community/models/test_prior_fitted_network.py"
+  ];
+
   disabledTests = [
     "test_all_cases_covered"
 
@@ -93,7 +102,7 @@ buildPythonPackage rec {
   requiredSystemFeatures = [ "big-parallel" ];
 
   meta = {
-    changelog = "https://github.com/pytorch/botorch/blob/${src.tag}/CHANGELOG.md";
+    changelog = "https://github.com/meta-pytorch/botorch/blob/${src.tag}/CHANGELOG.md";
     description = "Bayesian Optimization in PyTorch";
     homepage = "https://botorch.org";
     license = lib.licenses.mit;

From 07c0eaed4d08eec19af486f481e0dfbf0c83b26f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 18:19:39 +0000
Subject: [PATCH 4846/6226] comrak: 0.45.0 -> 0.47.0

---
 pkgs/by-name/co/comrak/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix
index d704ccfb4132..bef4b7dcdcde 100644
--- a/pkgs/by-name/co/comrak/package.nix
+++ b/pkgs/by-name/co/comrak/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "comrak";
-  version = "0.45.0";
+  version = "0.47.0";
 
   src = fetchFromGitHub {
     owner = "kivikakk";
     repo = "comrak";
     rev = "v${version}";
-    sha256 = "sha256-+87K5ITDrF/nH1H4z8zyqQlJnviOlRdNnV8v6xsS0uM=";
+    sha256 = "sha256-HPAhm0NWWHzdO4eOXxRN4ha4ucQ3O36XvAw09iPdhIc=";
   };
 
-  cargoHash = "sha256-efUiKSEsD+GguhriTpLmsyUxpQYzwr4rHJAC9FHMzdU=";
+  cargoHash = "sha256-/LdoXx0em/wp3IurQekQhudtrxbT0sxiNwTTXfE2K4M=";
 
   meta = {
     description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter";

From 0ac2c50228928623ea8c0a94e82b6eebc5a7e19e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 18:26:12 +0000
Subject: [PATCH 4847/6226] zlint: 3.6.7 -> 3.6.8

---
 pkgs/by-name/zl/zlint/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/zl/zlint/package.nix b/pkgs/by-name/zl/zlint/package.nix
index a2e1b497c529..ff92681b975e 100644
--- a/pkgs/by-name/zl/zlint/package.nix
+++ b/pkgs/by-name/zl/zlint/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "zlint";
-  version = "3.6.7";
+  version = "3.6.8";
 
   src = fetchFromGitHub {
     owner = "zmap";
     repo = "zlint";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-qd6QqOeSfLpXwbni8wqmG5X9zYXDXwAxRotCws4AWsA=";
+    hash = "sha256-Mi7ySXVqnL/LVi4YS1r4hBcM/JrjThJEkw3+1k1vjRQ=";
   };
 
   modRoot = "v3";

From 9abd3a1319bcbdc9943b72759062f777c91a1717 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 18:27:03 +0000
Subject: [PATCH 4848/6226] deck: 1.52.0 -> 1.52.1

---
 pkgs/by-name/de/deck/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix
index c9049708c5f7..86b41e94836c 100644
--- a/pkgs/by-name/de/deck/package.nix
+++ b/pkgs/by-name/de/deck/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "deck";
-  version = "1.52.0";
+  version = "1.52.1";
 
   src = fetchFromGitHub {
     owner = "Kong";
     repo = "deck";
     tag = "v${version}";
-    hash = "sha256-fKcI40DqQwVw4YzPXVOXdij4LAwRkCp2U+TpjYmIO8I=";
+    hash = "sha256-nxb7iuAf1hGHdjomgxFZuYwZSUuRrd5J3iVtFgEINY4=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
@@ -28,7 +28,7 @@ buildGoModule rec {
   ];
 
   proxyVendor = true; # darwin/linux hash mismatch
-  vendorHash = "sha256-h7wtQDw8kixqGK5RE9YQ6a/I3yRO1k/6qcHX/K4M6fc=";
+  vendorHash = "sha256-K6BOZ0LAy107UMQ0ZjkSnI4Q0lSqfHqvIG+EhCaal9A=";
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd deck \

From 9a637aa7a439739120b0a9c80435c3dc6b1ddb68 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 2 Nov 2025 19:35:27 +0100
Subject: [PATCH 4849/6226] ci/github-script/merge: restructure head SHA check

While it was already the case that only merge comments *after* the
latest push were acted on, the logic wasn't easy to understand. This
change should make it more obvious, specially in combination with the
next commit, that all steps (comments, approvals, merge) must happen on
the same SHA - the current head SHA of the PR.
---
 ci/github-script/merge.js | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index eb122a5a188d..51e76d5491b5 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -136,14 +136,13 @@ async function handleMerge({
   })
 
   // Only look through comments *after* the latest (force) push.
-  const latestChange = events.findLast(({ event }) =>
-    ['committed', 'head_ref_force_pushed'].includes(event),
-  ) ?? { sha: pull_request.head.sha }
-  const latestSha = latestChange.sha ?? latestChange.commit_id
-  log('latest sha', latestSha)
-  const latestIndex = events.indexOf(latestChange)
+  const lastPush = events.findLastIndex(
+    ({ event, sha, commit_id }) =>
+      ['committed', 'head_ref_force_pushed'].includes(event) &&
+      (sha ?? commit_id) === pull_request.head.sha,
+  )
 
-  const comments = events.slice(latestIndex + 1).filter(
+  const comments = events.slice(lastPush + 1).filter(
     ({ event, body, node_id }) =>
       ['commented', 'reviewed'].includes(event) &&
       hasMergeCommand(body) &&
@@ -178,7 +177,7 @@ async function handleMerge({
           })
           { clientMutationId }
         }`,
-        { node_id: pull_request.node_id, sha: latestSha },
+        { node_id: pull_request.node_id, sha: pull_request.head.sha },
       )
       return 'Enabled Auto Merge'
     } catch (e) {
@@ -202,7 +201,7 @@ async function handleMerge({
             mergeQueueEntry { mergeQueue { url } }
           }
         }`,
-        { node_id: pull_request.node_id, sha: latestSha },
+        { node_id: pull_request.node_id, sha: pull_request.head.sha },
       )
       return `[Queued](${resp.enqueuePullRequest.mergeQueueEntry.mergeQueue.url}) for merge`
     } catch (e) {

From ffdc8205e5bf7591133e23229e49874b629e8012 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 12 Oct 2025 16:30:50 +0200
Subject: [PATCH 4850/6226] workflows/bot: allow maintainer merges after
 committer approval

This allows committers to approve PRs with additional, optional nits
that the author-maintainer can either address or merge immediately
without these changes.

It also allows committers to approve a PR for merge, while still waiting
for other maintainers to give their feedback - they can then merge the
PR directly instead of passing it back to the committer.
---
 ci/README.md              |  5 +++--
 ci/github-script/merge.js | 17 +++++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/ci/README.md b/ci/README.md
index 558a31735165..4848805baf28 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -45,8 +45,9 @@ To ensure security and a focused utility, the bot adheres to specific limitation
 - The PR targets one of the [development branches](#branch-classification).
 - The PR only touches packages located under `pkgs/by-name/*`.
 - The PR is either:
-  - authored by a [committer][@NixOS/nixpkgs-committers],
-  - backported via label, or
+  - approved by a [committer][@NixOS/nixpkgs-committers].
+  - authored by a [committer][@NixOS/nixpkgs-committers].
+  - backported via label.
   - created by [@r-ryantm](https://nix-community.github.io/nixpkgs-update/r-ryantm/).
 - The user attempting to merge is a member of [@NixOS/nixpkgs-maintainers].
 - The user attempting to merge is a maintainer of all packages touched by the PR.
diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index 51e76d5491b5..c738ecc950f5 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -2,6 +2,7 @@ const { classify } = require('../supportedBranches.js')
 
 function runChecklist({
   committers,
+  events,
   files,
   pull_request,
   log,
@@ -23,11 +24,25 @@ function runChecklist({
         .map((pkg) => new Set(maintainers[pkg]))
         .reduce((acc, cur) => acc?.intersection(cur) ?? cur)
 
+  const approvals = new Set(
+    events
+      .filter(
+        ({ event, state, commit_id }) =>
+          event === 'reviewed' &&
+          state === 'approved' &&
+          // Only approvals for the current head SHA count, otherwise authors could push
+          // bad code between the approval and the merge.
+          commit_id === pull_request.head.sha,
+      )
+      .map(({ user }) => user.id),
+  )
+
   const checklist = {
     'PR targets a [development branch](https://github.com/NixOS/nixpkgs/blob/-/ci/README.md#branch-classification).':
       classify(pull_request.base.ref).type.includes('development'),
     'PR touches only packages in `pkgs/by-name/`.': allByName,
     'PR is at least one of:': {
+      'Approved by a committer.': committers.intersection(approvals).size > 0,
       'Authored by a committer.': committers.has(pull_request.user.id),
       'Backported via label.':
         pull_request.user.login === 'nixpkgs-ci[bot]' &&
@@ -246,6 +261,7 @@ async function handleMerge({
 
     const { result, checklist } = runChecklist({
       committers,
+      events,
       files,
       pull_request,
       log,
@@ -302,6 +318,7 @@ async function handleMerge({
 
   const { result } = runChecklist({
     committers,
+    events,
     files,
     pull_request,
     log,

From c6a1fb1b9bd1c60f6066162b4bbada2d1ae15936 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 18:41:23 +0000
Subject: [PATCH 4851/6226] python3Packages.pymobiledevice3: 5.0.0 -> 5.0.3

---
 pkgs/development/python-modules/pymobiledevice3/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymobiledevice3/default.nix b/pkgs/development/python-modules/pymobiledevice3/default.nix
index 41aed7fd6c41..5812bdbff51c 100644
--- a/pkgs/development/python-modules/pymobiledevice3/default.nix
+++ b/pkgs/development/python-modules/pymobiledevice3/default.nix
@@ -47,14 +47,14 @@
 
 buildPythonPackage rec {
   pname = "pymobiledevice3";
-  version = "5.0.0";
+  version = "5.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "doronz88";
     repo = "pymobiledevice3";
     tag = "v${version}";
-    hash = "sha256-1TMzG4q7eE65Uqeihf3EycdxTQ8f8x8EfNwZx4a5AhE=";
+    hash = "sha256-fw7KGijIgIXXFbtNpq1QBrxUP4F6ivLQXQn94YZnQL4=";
   };
 
   build-system = [

From c48bf3ff04c024f4567567382eef975f82b1152f Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Sun, 2 Nov 2025 19:41:27 +0100
Subject: [PATCH 4852/6226] literata: fix description

---
 pkgs/by-name/li/literata/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/literata/package.nix b/pkgs/by-name/li/literata/package.nix
index 30b06fa81592..260bef3f40eb 100644
--- a/pkgs/by-name/li/literata/package.nix
+++ b/pkgs/by-name/li/literata/package.nix
@@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "A serif typeface designed for ebooks and optimized for reading";
+    description = "Serif typeface designed for ebooks and optimized for reading";
     homepage = "https://github.com/googlefonts/literata";
     license = lib.licenses.ofl;
     maintainers = with lib.maintainers; [ xavwe ];

From 93b0edf10f18bdcdac96e00919e171ecd8743f47 Mon Sep 17 00:00:00 2001
From: Greaka <git@greaka.de>
Date: Sun, 2 Nov 2025 19:49:26 +0100
Subject: [PATCH 4853/6226] factorio: 2.0.69 -> 2.0.72

---
 pkgs/by-name/fa/factorio/versions.json | 74 +++++++++++++-------------
 1 file changed, 37 insertions(+), 37 deletions(-)

diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json
index 5f8e931e9abc..1702d1eb7f2a 100644
--- a/pkgs/by-name/fa/factorio/versions.json
+++ b/pkgs/by-name/fa/factorio/versions.json
@@ -3,38 +3,38 @@
     "alpha": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio_linux_2.0.69.tar.xz"
+          "factorio_linux_2.0.72.tar.xz"
         ],
-        "name": "factorio_alpha_x64-2.0.69.tar.xz",
+        "name": "factorio_alpha_x64-2.0.72.tar.xz",
         "needsAuth": true,
-        "sha256": "f3ea6a475eaf6157475169b302753f70f3ac6b6a357a4f682fec2e515339e678",
+        "sha256": "87d9f593569cbdf2f7a160f6a573f4939cbf01206209fbcdbaebf0385c2c7331",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/alpha/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.72/alpha/linux64",
+        "version": "2.0.72"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio_linux_2.0.69.tar.xz"
+          "factorio_linux_2.0.72.tar.xz"
         ],
-        "name": "factorio_alpha_x64-2.0.69.tar.xz",
+        "name": "factorio_alpha_x64-2.0.72.tar.xz",
         "needsAuth": true,
-        "sha256": "f3ea6a475eaf6157475169b302753f70f3ac6b6a357a4f682fec2e515339e678",
+        "sha256": "87d9f593569cbdf2f7a160f6a573f4939cbf01206209fbcdbaebf0385c2c7331",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/alpha/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.72/alpha/linux64",
+        "version": "2.0.72"
       }
     },
     "demo": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-demo_linux_2.0.69.tar.xz"
+          "factorio-demo_linux_2.0.70.tar.xz"
         ],
-        "name": "factorio_demo_x64-2.0.69.tar.xz",
+        "name": "factorio_demo_x64-2.0.70.tar.xz",
         "needsAuth": false,
-        "sha256": "a670a4cd2fa59cb8dc6db10d969867266080f171e47ebed78880ccd5ed42356c",
+        "sha256": "3be56bbfde644a3a97ab925a1fc2a32f9620e595fa14700bdcfbb127bc528bc8",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/demo/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.70/demo/linux64",
+        "version": "2.0.70"
       },
       "stable": {
         "candidateHashFilenames": [
@@ -51,51 +51,51 @@
     "expansion": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.69.tar.xz"
+          "factorio-space-age_linux_2.0.72.tar.xz"
         ],
-        "name": "factorio_expansion_x64-2.0.69.tar.xz",
+        "name": "factorio_expansion_x64-2.0.72.tar.xz",
         "needsAuth": true,
-        "sha256": "a44bf364c4a0037b1d21b8770d604f278e45b397481908cb4212b49411f3ddd2",
+        "sha256": "9a667dd899ad4c8c410739a1da3a9318b46a5f34ee190e8b75ec22beac708249",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/expansion/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.72/expansion/linux64",
+        "version": "2.0.72"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio-space-age_linux_2.0.69.tar.xz"
+          "factorio-space-age_linux_2.0.72.tar.xz"
         ],
-        "name": "factorio_expansion_x64-2.0.69.tar.xz",
+        "name": "factorio_expansion_x64-2.0.72.tar.xz",
         "needsAuth": true,
-        "sha256": "a44bf364c4a0037b1d21b8770d604f278e45b397481908cb4212b49411f3ddd2",
+        "sha256": "9a667dd899ad4c8c410739a1da3a9318b46a5f34ee190e8b75ec22beac708249",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/expansion/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.72/expansion/linux64",
+        "version": "2.0.72"
       }
     },
     "headless": {
       "experimental": {
         "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.69.tar.xz",
-          "factorio_headless_x64_2.0.69.tar.xz"
+          "factorio-headless_linux_2.0.72.tar.xz",
+          "factorio_headless_x64_2.0.72.tar.xz"
         ],
-        "name": "factorio_headless_x64-2.0.69.tar.xz",
+        "name": "factorio_headless_x64-2.0.72.tar.xz",
         "needsAuth": false,
-        "sha256": "235147bb3ed6b5f0a6993893c6c92fdfe535ba95ab866046f51f865284b57341",
+        "sha256": "cf3057340dbc9d82bd5161949ae3e7b8fad912ec7ca07b8a3151e0424a5568cd",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/headless/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.72/headless/linux64",
+        "version": "2.0.72"
       },
       "stable": {
         "candidateHashFilenames": [
-          "factorio-headless_linux_2.0.69.tar.xz",
-          "factorio_headless_x64_2.0.69.tar.xz"
+          "factorio-headless_linux_2.0.72.tar.xz",
+          "factorio_headless_x64_2.0.72.tar.xz"
         ],
-        "name": "factorio_headless_x64-2.0.69.tar.xz",
+        "name": "factorio_headless_x64-2.0.72.tar.xz",
         "needsAuth": false,
-        "sha256": "235147bb3ed6b5f0a6993893c6c92fdfe535ba95ab866046f51f865284b57341",
+        "sha256": "cf3057340dbc9d82bd5161949ae3e7b8fad912ec7ca07b8a3151e0424a5568cd",
         "tarDirectory": "x64",
-        "url": "https://factorio.com/get-download/2.0.69/headless/linux64",
-        "version": "2.0.69"
+        "url": "https://factorio.com/get-download/2.0.72/headless/linux64",
+        "version": "2.0.72"
       }
     }
   }

From 7fc0d0fe049bd43ed13f50aca883f414946a8a86 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sun, 2 Nov 2025 19:53:23 +0100
Subject: [PATCH 4854/6226] bash-git-prompt: fix hash

---
 pkgs/by-name/ba/bash-git-prompt/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ba/bash-git-prompt/package.nix b/pkgs/by-name/ba/bash-git-prompt/package.nix
index 9bcee20b24b3..2f943a887c38 100644
--- a/pkgs/by-name/ba/bash-git-prompt/package.nix
+++ b/pkgs/by-name/ba/bash-git-prompt/package.nix
@@ -13,7 +13,7 @@ stdenv.mkDerivation {
     owner = "magicmonty";
     repo = "bash-git-prompt";
     rev = "e733ada3e93fd9fdb6e9d1890e38e6e523522da7";
-    hash = "sha256-FWeYzISY4+cS2xg6skfcpTXgbkBs41E/EzEb3JNdFoQ=";
+    hash = "sha256-6uUoYSjpGJGOgnLiIR0SdmLZKPG4GNB+e2Y9HpJUODQ=";
   };
 
   buildInputs = [ python3 ];

From 5b48161fce7b2c08d02e2aa94d9910c606f0d432 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 19:00:23 +0000
Subject: [PATCH 4855/6226] python3Packages.types-deprecated: 1.2.15.20250304
 -> 1.3.1.20251101

---
 pkgs/development/python-modules/types-deprecated/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/types-deprecated/default.nix b/pkgs/development/python-modules/types-deprecated/default.nix
index e6cde7039037..1c9e55b09afb 100644
--- a/pkgs/development/python-modules/types-deprecated/default.nix
+++ b/pkgs/development/python-modules/types-deprecated/default.nix
@@ -7,13 +7,13 @@
 
 buildPythonPackage rec {
   pname = "types-deprecated";
-  version = "1.2.15.20250304";
+  version = "1.3.1.20251101";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_deprecated";
     inherit version;
-    hash = "sha256-wykDBVMCneXMbLMPJpwR9OAOWYxCQSkBefY82n0z9xk=";
+    hash = "sha256-8ALSZrcyAfRuxvxxLB8BYGfsbLRDV1Wc21DIawEJUac=";
   };
 
   build-system = [ setuptools ];

From 367082278c70d2659f672c895ec3a6c5f00904c5 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 2 Nov 2025 19:01:16 +0000
Subject: [PATCH 4856/6226] python3Packages.ax-platform: skip failing test

---
 pkgs/development/python-modules/ax-platform/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/python-modules/ax-platform/default.nix b/pkgs/development/python-modules/ax-platform/default.nix
index ca6562db40ca..b853ccf3858e 100644
--- a/pkgs/development/python-modules/ax-platform/default.nix
+++ b/pkgs/development/python-modules/ax-platform/default.nix
@@ -86,6 +86,9 @@ buildPythonPackage rec {
     "SQAStoreUtilsTest"
     "SQAStoreTest"
 
+    # ValueError: Expected dim to be an integer greater than or equal to 2. Found dim=1.
+    "test_get_model"
+
     # ValueError: `db_settings` argument should be of type ax.storage.sqa_store
     "test_get_next_trials_with_db"
 

From 8f80acbc3e3f40441206ffe4261478ff684f5879 Mon Sep 17 00:00:00 2001
From: Vasilis Manetas <vasilis.manetas@fh-erfurt.de>
Date: Mon, 13 Oct 2025 13:20:47 +0200
Subject: [PATCH 4857/6226] wheelwizard: init at 2.3.3

---
 pkgs/by-name/wh/wheelwizard/deps.json   | 522 ++++++++++++++++++++++++
 pkgs/by-name/wh/wheelwizard/package.nix |  80 ++++
 2 files changed, 602 insertions(+)
 create mode 100644 pkgs/by-name/wh/wheelwizard/deps.json
 create mode 100644 pkgs/by-name/wh/wheelwizard/package.nix

diff --git a/pkgs/by-name/wh/wheelwizard/deps.json b/pkgs/by-name/wh/wheelwizard/deps.json
new file mode 100644
index 000000000000..54158417541b
--- /dev/null
+++ b/pkgs/by-name/wh/wheelwizard/deps.json
@@ -0,0 +1,522 @@
+[
+  {
+    "pname": "Avalonia.Angle.Windows.Natives",
+    "version": "2.1.25547.20250602",
+    "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M="
+  },
+  {
+    "pname": "Avalonia.HtmlRenderer",
+    "version": "11.0.0",
+    "hash": "sha256-DBD113eQJNHeEgFmx/tVRSnHxhGBQIKWVKxr1QRilr4="
+  },
+  {
+    "pname": "Castle.Core",
+    "version": "5.1.1",
+    "hash": "sha256-oVkQB+ON7S6Q27OhXrTLaxTL0kWB58HZaFFuiw4iTrE="
+  },
+  {
+    "pname": "coverlet.collector",
+    "version": "6.0.4",
+    "hash": "sha256-ieiUl7G5pVKQ4V6rxhEe0ehep0/u1RBD3EAI63AQTI0="
+  },
+  {
+    "pname": "CSharpier.MsBuild",
+    "version": "0.30.6",
+    "hash": "sha256-FhXf9ggWmWzGp6vz6vJP+ly4SOeyluP6Ic3MfCz1uUA="
+  },
+  {
+    "pname": "DotNet.Glob",
+    "version": "3.1.3",
+    "hash": "sha256-5uGSaGY1IqDjq4RCDLPJm0Lg9oyWmyR96OiNeGqSj84="
+  },
+  {
+    "pname": "HarfBuzzSharp",
+    "version": "8.3.1.1",
+    "hash": "sha256-614yv6bK9ynhdUnvW4wIkgpBe2sqTh28U9cDZzdhPc0="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Linux",
+    "version": "8.3.1.1",
+    "hash": "sha256-sBbez6fc9axVcsBbIHbpQh/MM5NHlMJgSu6FyuZzVyU="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.macOS",
+    "version": "8.3.1.1",
+    "hash": "sha256-hK20KbX2OpewIO5qG5gWw5Ih6GoLcIDgFOqCJIjXR/Q="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.WebAssembly",
+    "version": "8.3.1.1",
+    "hash": "sha256-mLKoLqI47ZHXqTMLwP1UCm7faDptUfQukNvdq6w/xxw="
+  },
+  {
+    "pname": "HarfBuzzSharp.NativeAssets.Win32",
+    "version": "8.3.1.1",
+    "hash": "sha256-Um4iwLdz9XtaDSAsthNZdev6dMiy7OBoHOrorMrMYyo="
+  },
+  {
+    "pname": "ini-parser",
+    "version": "2.5.2",
+    "hash": "sha256-IGUP2iEBuL8QpcllvPfeuqn7O908H16Kg0oOrXUUJ3Y="
+  },
+  {
+    "pname": "MicroCom.Runtime",
+    "version": "0.11.0",
+    "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0="
+  },
+  {
+    "pname": "Microsoft.Bcl.AsyncInterfaces",
+    "version": "6.0.0",
+    "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU="
+  },
+  {
+    "pname": "Microsoft.CodeAnalysis.Analyzers",
+    "version": "3.11.0",
+    "hash": "sha256-hQ2l6E6PO4m7i+ZsfFlEx+93UsLPo4IY3wDkNG11/Sw="
+  },
+  {
+    "pname": "Microsoft.CodeCoverage",
+    "version": "17.13.0",
+    "hash": "sha256-GKrIxeyQo5Az1mztfQgea1kGtJwonnNOrXK/0ULfu8o="
+  },
+  {
+    "pname": "Microsoft.Extensions.AmbientMetadata.Application",
+    "version": "9.3.0",
+    "hash": "sha256-aTR4eSGHPWdbmVsmUYJ+qKEG1ah+zubpZyrM6jEqOEQ="
+  },
+  {
+    "pname": "Microsoft.Extensions.Caching.Abstractions",
+    "version": "10.0.0-preview.3.25171.5",
+    "hash": "sha256-yc4xSH5JuFXsCka5A5FGuUtvgEIjyj1VDav8pZ52s3U="
+  },
+  {
+    "pname": "Microsoft.Extensions.Caching.Memory",
+    "version": "10.0.0-preview.3.25171.5",
+    "hash": "sha256-jLC6jhzDJTNcOMuwdaGEMaAKuftIMFnO+oPwjTcLNh0="
+  },
+  {
+    "pname": "Microsoft.Extensions.Compliance.Abstractions",
+    "version": "9.3.0",
+    "hash": "sha256-kTZy+spk9bbXIWXcL9PS42v8NkJc7XHVtRF+B10JOkA="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration",
+    "version": "8.0.0",
+    "hash": "sha256-9BPsASlxrV8ilmMCjdb3TiUcm5vFZxkBnAI/fNBSEyA="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Abstractions",
+    "version": "8.0.0",
+    "hash": "sha256-4eBpDkf7MJozTZnOwQvwcfgRKQGcNXe0K/kF+h5Rl8o="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Binder",
+    "version": "8.0.0",
+    "hash": "sha256-GanfInGzzoN2bKeNwON8/Hnamr6l7RTpYLA49CNXD9Q="
+  },
+  {
+    "pname": "Microsoft.Extensions.Configuration.Binder",
+    "version": "8.0.2",
+    "hash": "sha256-aGB0VuoC34YadAEqrwoaXLc5qla55pswDV2xLSmR7SE="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection",
+    "version": "9.0.3",
+    "hash": "sha256-/gAk+YbJT1/XjMfPBrEg9wUbljA0g1vFJuE+mFOPwV0="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "10.0.0-preview.3.25171.5",
+    "hash": "sha256-kcXuldbnR8++yNGQj9/rVJOyFaJPKPxecWU9b0KX7AY="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "8.0.0",
+    "hash": "sha256-75KzEGWjbRELczJpCiJub+ltNUMMbz5A/1KQU+5dgP8="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "8.0.2",
+    "hash": "sha256-UfLfEQAkXxDaVPC7foE/J3FVEXd31Pu6uQIhTic3JgY="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.Abstractions",
+    "version": "9.0.3",
+    "hash": "sha256-90HSc8MgyemdtRTBN7Indq62DRaqI2mjai9iV/pi/o4="
+  },
+  {
+    "pname": "Microsoft.Extensions.DependencyInjection.AutoActivation",
+    "version": "9.3.0",
+    "hash": "sha256-Y5C0GmvBqaH7LbDpnNUgGLSEUkhLTdbio40wjqRcSiE="
+  },
+  {
+    "pname": "Microsoft.Extensions.Diagnostics",
+    "version": "8.0.1",
+    "hash": "sha256-CraHNCaVlMiYx6ff9afT6U7RC/MoOCXM3pn2KrXkiLc="
+  },
+  {
+    "pname": "Microsoft.Extensions.Diagnostics.Abstractions",
+    "version": "8.0.1",
+    "hash": "sha256-d5DVXhA8qJFY9YbhZjsTqs5w5kDuxF5v+GD/WZR1QL0="
+  },
+  {
+    "pname": "Microsoft.Extensions.Diagnostics.ExceptionSummarization",
+    "version": "9.3.0",
+    "hash": "sha256-r1HuCwGdX90bU3FzBvq8sxmA/gw3MVCjuG6hqowdoqs="
+  },
+  {
+    "pname": "Microsoft.Extensions.FileProviders.Abstractions",
+    "version": "8.0.0",
+    "hash": "sha256-uQSXmt47X2HGoVniavjLICbPtD2ReQOYQMgy3l0xuMU="
+  },
+  {
+    "pname": "Microsoft.Extensions.Hosting.Abstractions",
+    "version": "8.0.1",
+    "hash": "sha256-/bIVL9uvBQhV/KQmjA1ZjR74sMfaAlBb15sVXsGDEVA="
+  },
+  {
+    "pname": "Microsoft.Extensions.Http",
+    "version": "8.0.1",
+    "hash": "sha256-ScPwhBvD3Jd4S0E7JQ18+DqY3PtQvdFLbkohUBbFd3o="
+  },
+  {
+    "pname": "Microsoft.Extensions.Http.Diagnostics",
+    "version": "9.3.0",
+    "hash": "sha256-e1Sq+sEtZA5oVoB7WjICrFg9SZ1IiOp+CUpk5rJCSRU="
+  },
+  {
+    "pname": "Microsoft.Extensions.Http.Resilience",
+    "version": "9.3.0",
+    "hash": "sha256-X5MIsQsvIGJ8DmsUZHyY9ZOSeKKI7LZ+WoHYDgaFERc="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging",
+    "version": "9.0.3",
+    "hash": "sha256-w1cKHraJW+i7avhTseoJ+u0parEAJ7r51E2qvsuXZDA="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "10.0.0-preview.3.25171.5",
+    "hash": "sha256-8ls/8wAEqMI5HEAeHz82tjmM9Xel/m3JymxEdUni6ig="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "8.0.0",
+    "hash": "sha256-Jmddjeg8U5S+iBTwRlVAVLeIHxc4yrrNgqVMOB7EjM4="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "8.0.2",
+    "hash": "sha256-cHpe8X2BgYa5DzulZfq24rg8O2K5Lmq2OiLhoyAVgJc="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "8.0.3",
+    "hash": "sha256-5MSY1aEwUbRXehSPHYw0cBZyFcUH4jkgabddxhMiu3Q="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Abstractions",
+    "version": "9.0.3",
+    "hash": "sha256-f/K3A9NPpCOTGlyha5DJf+OIjfAVWu+dJ4rAqQ+3sso="
+  },
+  {
+    "pname": "Microsoft.Extensions.Logging.Configuration",
+    "version": "8.0.1",
+    "hash": "sha256-E2JbJG2EXlv2HUWLi17kIkAL6RC9rC2E18C3gAyOuaE="
+  },
+  {
+    "pname": "Microsoft.Extensions.ObjectPool",
+    "version": "8.0.14",
+    "hash": "sha256-qd+fKVbI6xjy8pm2JIPWljFjdphHQhxHv5sOLzsW1B8="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "10.0.0-preview.3.25171.5",
+    "hash": "sha256-TqviXNJUy9wTWwSLP6/QdfN6+VUg2HHR7skVrotPHGU="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "8.0.0",
+    "hash": "sha256-n2m4JSegQKUTlOsKLZUUHHKMq926eJ0w9N9G+I3FoFw="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "8.0.2",
+    "hash": "sha256-AjcldddddtN/9aH9pg7ClEZycWtFHLi9IPe1GGhNQys="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options",
+    "version": "9.0.3",
+    "hash": "sha256-h4CLVA1cZdte8hd/bcb5dsi61MhAAScHRZU4LR2W5Z8="
+  },
+  {
+    "pname": "Microsoft.Extensions.Options.ConfigurationExtensions",
+    "version": "8.0.0",
+    "hash": "sha256-A5Bbzw1kiNkgirk5x8kyxwg9lLTcSngojeD+ocpG1RI="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "10.0.0-preview.3.25171.5",
+    "hash": "sha256-E1rTPmEYK/ssqHS1CF7xUTRbFWuYxbelV9w2VRST01E="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "5.0.1",
+    "hash": "sha256-e4uoLnUSmON4If9qJh78+4z14IzW9qCu5YkqLdQqWQU="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "8.0.0",
+    "hash": "sha256-FU8qj3DR8bDdc1c+WeGZx/PCZeqqndweZM9epcpXjSo="
+  },
+  {
+    "pname": "Microsoft.Extensions.Primitives",
+    "version": "9.0.3",
+    "hash": "sha256-iBwolNt6Lb2OqjDWBVnUj8vZDSID9EQw/JPI1xcuFus="
+  },
+  {
+    "pname": "Microsoft.Extensions.Resilience",
+    "version": "9.3.0",
+    "hash": "sha256-GegeV0A5RNlSJuA5Pq78hIE5tZJxQWXQZ3fVtQZRZr8="
+  },
+  {
+    "pname": "Microsoft.Extensions.Telemetry",
+    "version": "9.3.0",
+    "hash": "sha256-DCwTXtK81v+rDeRrRQQCdiiwCzZpQEEwwU1wVJgbEbs="
+  },
+  {
+    "pname": "Microsoft.Extensions.Telemetry.Abstractions",
+    "version": "9.3.0",
+    "hash": "sha256-X9hooaCbC2G5PT022Yj7iJgEzS/bFyBxJbh6QQJTOQU="
+  },
+  {
+    "pname": "Microsoft.NET.Test.Sdk",
+    "version": "17.13.0",
+    "hash": "sha256-sc2wvyV8cGm1FrNP2GGHEI584RCvRPu15erYCsgw5QY="
+  },
+  {
+    "pname": "Microsoft.TestPlatform.ObjectModel",
+    "version": "17.13.0",
+    "hash": "sha256-6S0fjfj8vA+h6dJVNwLi6oZhYDO/I/6hBZaq2VTW+Uk="
+  },
+  {
+    "pname": "Microsoft.TestPlatform.TestHost",
+    "version": "17.13.0",
+    "hash": "sha256-L/CJzou7dhmShUgXq3aXL3CaLTJll17Q+JY2DBdUUpo="
+  },
+  {
+    "pname": "Newtonsoft.Json",
+    "version": "13.0.1",
+    "hash": "sha256-K2tSVW4n4beRPzPu3rlVaBEMdGvWSv/3Q1fxaDh4Mjo="
+  },
+  {
+    "pname": "NSubstitute",
+    "version": "5.3.0",
+    "hash": "sha256-fa6Hn9Qmpia2labWOs1Xp2LnJBOHfrWIwxvqKRRccs0="
+  },
+  {
+    "pname": "Polly.Core",
+    "version": "8.4.2",
+    "hash": "sha256-4fn5n6Bu29uqWg8ciii3MDsi9bO2/moPa9B3cJ9Ihe8="
+  },
+  {
+    "pname": "Polly.Extensions",
+    "version": "8.4.2",
+    "hash": "sha256-oyf9CNi8NXLyeMLwBBCifFvV6erIEaurs8i9BZdr0ik="
+  },
+  {
+    "pname": "Polly.RateLimiting",
+    "version": "8.4.2",
+    "hash": "sha256-432TfbcJ8UUhDWKLcAFksMjbcU0PlLrK+BrrDxFw4/8="
+  },
+  {
+    "pname": "Refit",
+    "version": "8.0.0",
+    "hash": "sha256-YORvtZtDy0+wlUoJTur1lO5wJMovFY/jxoIvfkEkObI="
+  },
+  {
+    "pname": "Refit.HttpClientFactory",
+    "version": "8.0.0",
+    "hash": "sha256-VNVCqzq3HwPSRK/GrcBkbdhb2iRYrqoeDBvGnPNyrbA="
+  },
+  {
+    "pname": "Semver",
+    "version": "3.0.0",
+    "hash": "sha256-nX5ka27GY6pz9S73H6sLSQCrnAyyI9xDVdzrtlMp4BQ="
+  },
+  {
+    "pname": "Serilog",
+    "version": "3.1.1",
+    "hash": "sha256-L263y8jkn7dNFD2jAUK6mgvyRTqFe39i1tRhVZsNZTI="
+  },
+  {
+    "pname": "Serilog",
+    "version": "4.0.0",
+    "hash": "sha256-j8hQ5TdL1TjfdGiBO9PyHJFMMPvATHWN1dtrrUZZlNw="
+  },
+  {
+    "pname": "Serilog.Extensions.Logging",
+    "version": "8.0.0",
+    "hash": "sha256-GoWxCpkdahMvYd7ZrhwBxxTyjHGcs9ENNHJCp0la6iA="
+  },
+  {
+    "pname": "Serilog.Sinks.Console",
+    "version": "6.0.0",
+    "hash": "sha256-QH8ykDkLssJ99Fgl+ZBFBr+RQRl0wRTkeccQuuGLyro="
+  },
+  {
+    "pname": "Serilog.Sinks.File",
+    "version": "6.0.0",
+    "hash": "sha256-KQmlUpG9ovRpNqKhKe6rz3XMLUjkBqjyQhEm2hV5Sow="
+  },
+  {
+    "pname": "SharpCompress",
+    "version": "0.39.0",
+    "hash": "sha256-Me88MMn5NUiw5bugFKCKFRnFSXQKIFZJ+k97Ex6jgZE="
+  },
+  {
+    "pname": "SkiaSharp",
+    "version": "2.88.9",
+    "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Linux",
+    "version": "2.88.9",
+    "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.macOS",
+    "version": "2.88.9",
+    "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.WebAssembly",
+    "version": "2.88.9",
+    "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY="
+  },
+  {
+    "pname": "SkiaSharp.NativeAssets.Win32",
+    "version": "2.88.9",
+    "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4="
+  },
+  {
+    "pname": "System.Buffers",
+    "version": "4.6.0",
+    "hash": "sha256-c2QlgFB16IlfBms5YLsTCFQ/QeKoS6ph1a9mdRkq/Jc="
+  },
+  {
+    "pname": "System.Diagnostics.DiagnosticSource",
+    "version": "10.0.0-preview.3.25171.5",
+    "hash": "sha256-iI1z0kg5z1aTg3fTm/tMCXGQe7JqgOxaCf6Ac85G9+Y="
+  },
+  {
+    "pname": "System.Diagnostics.DiagnosticSource",
+    "version": "9.0.3",
+    "hash": "sha256-zgZF8BTksBk5oucX0j0Ju8qNG8oKJbIGio0GM+egT9M="
+  },
+  {
+    "pname": "System.Diagnostics.EventLog",
+    "version": "6.0.0",
+    "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="
+  },
+  {
+    "pname": "System.IO.Pipelines",
+    "version": "8.0.0",
+    "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE="
+  },
+  {
+    "pname": "System.Linq.Async",
+    "version": "6.0.1",
+    "hash": "sha256-uH5fZhcyQVtnsFc6GTUaRRrAQm05v5euJyWCXSFSOYI="
+  },
+  {
+    "pname": "System.Reflection.Metadata",
+    "version": "1.6.0",
+    "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E="
+  },
+  {
+    "pname": "System.Threading.Channels",
+    "version": "9.0.2",
+    "hash": "sha256-Ubs57l7OtgMyC/N1qiAFcfqAxqghRVXs9tB7Jws30t8="
+  },
+  {
+    "pname": "System.Threading.RateLimiting",
+    "version": "8.0.0",
+    "hash": "sha256-KOEWEt6ZthvZHJ2Wp70d9nBhBrPqobGQDi2twlKYh/w="
+  },
+  {
+    "pname": "TestableIO.System.IO.Abstractions.Analyzers",
+    "version": "2022.0.0",
+    "hash": "sha256-BbH3iS85/cmk9+9xUq69cCCgHQasyoHAYsa+QaYNInE="
+  },
+  {
+    "pname": "Testably.Abstractions",
+    "version": "9.0.0",
+    "hash": "sha256-9X6gA+8wBb2JzryKrq2Vt3flbDJA7v/cLTY2alaNoQA="
+  },
+  {
+    "pname": "Testably.Abstractions.FileSystem.Interface",
+    "version": "9.0.0",
+    "hash": "sha256-6JW+qDtqQT9StP4oTR7uO0NnmVc2xcjSZ6ds2H71wtg="
+  },
+  {
+    "pname": "Testably.Abstractions.Interface",
+    "version": "9.0.0",
+    "hash": "sha256-UuzE7101YnWkuPvOJsEZ8xVjXl3P/gyDyKdScmT51do="
+  },
+  {
+    "pname": "Testably.Abstractions.Testing",
+    "version": "4.0.1",
+    "hash": "sha256-EXIEjrR91ZMOwU6Qf0Se5G7v0XEWMEMQe95EXkV1Iw4="
+  },
+  {
+    "pname": "Tmds.DBus.Protocol",
+    "version": "0.21.2",
+    "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI="
+  },
+  {
+    "pname": "xunit",
+    "version": "2.9.3",
+    "hash": "sha256-BPrpSbjlIB7PoH+ocCusqMDrMZgRQZSzeTeJzHK/I9c="
+  },
+  {
+    "pname": "xunit.abstractions",
+    "version": "2.0.3",
+    "hash": "sha256-0D1y/C34iARI96gb3bAOG8tcGPMjx+fMabTPpydGlAM="
+  },
+  {
+    "pname": "xunit.analyzers",
+    "version": "1.18.0",
+    "hash": "sha256-DOgamLnfi9Ua5IDm3JVm9MaOFbSSbmq5l8j2NPO3qd0="
+  },
+  {
+    "pname": "xunit.assert",
+    "version": "2.9.3",
+    "hash": "sha256-vHYOde8bd10pOmr7iTAYNtPlqHzsJl4x3t1DDuYdDCA="
+  },
+  {
+    "pname": "xunit.core",
+    "version": "2.9.3",
+    "hash": "sha256-qkVQ8Jw/LZWmxirkPOwiry7bvZn3IuaRzu/sp2H8anw="
+  },
+  {
+    "pname": "xunit.extensibility.core",
+    "version": "2.9.3",
+    "hash": "sha256-mcpVX+m0R7F0ev9CaBnbai9gtu4GVcqijEuRqe89D0g="
+  },
+  {
+    "pname": "xunit.extensibility.execution",
+    "version": "2.9.3",
+    "hash": "sha256-2rxMs2Dt4cAcmOFMwP5Yd3RpP0BnmiL8cXlKysXY0jw="
+  },
+  {
+    "pname": "xunit.runner.visualstudio",
+    "version": "3.0.2",
+    "hash": "sha256-Q0IxAFO9EDnIGzRl2HCWBujPZL8kqBcNZez1Y29hjPc="
+  },
+  {
+    "pname": "ZstdSharp.Port",
+    "version": "0.8.4",
+    "hash": "sha256-4bFUNK++6yUOnY7bZQiibClSJUQjH0uIiUbQLBtPWbo="
+  }
+]
diff --git a/pkgs/by-name/wh/wheelwizard/package.nix b/pkgs/by-name/wh/wheelwizard/package.nix
new file mode 100644
index 000000000000..432da15a993f
--- /dev/null
+++ b/pkgs/by-name/wh/wheelwizard/package.nix
@@ -0,0 +1,80 @@
+{
+  lib,
+  buildDotnetModule,
+  desktop-file-utils,
+  dotnetCorePackages,
+  fetchFromGitHub,
+  makeDesktopItem,
+  makeWrapper,
+  avalonia,
+  #Runtime dependencies
+  libglvnd,
+}:
+buildDotnetModule rec {
+  pname = "wheelwizard";
+  version = "2.3.3";
+
+  src = fetchFromGitHub {
+    owner = "TeamWheelWizard";
+    repo = "WheelWizard";
+    tag = "${version}";
+    hash = "sha256-DuEI6bmvNP6wRuZX9Do0FGDsu80ldy0SCefBk6gqT9s=";
+  };
+  postPatch = ''
+    rm .config/dotnet-tools.json
+  '';
+
+  projectFile = "WheelWizard.sln";
+  buildType = "Release";
+  dotnet-sdk = dotnetCorePackages.sdk_8_0-bin;
+  dotnet-runtime = dotnetCorePackages.runtime_8_0-bin;
+  nugetDeps = ./deps.json;
+  mapNuGetDependencies = true;
+
+  nativeBuildInputs = [
+    makeWrapper
+    desktop-file-utils
+  ];
+
+  buildInputs = [
+    avalonia
+  ];
+
+  runtimeDeps = [
+    libglvnd
+  ];
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/wheelwizard $out/bin
+    cp -r WheelWizard/bin/Release/net8.0/* $out/lib/wheelwizard/
+
+    makeWrapper $out/lib/wheelwizard/WheelWizard $out/bin/WheelWizard \
+      --prefix PATH : ${lib.makeBinPath [ dotnet-runtime ]}
+
+    install -D $desktopItem/share/applications/* -t $out/share/applications
+
+    runHook postInstall
+  '';
+
+  postFixup = ''
+    rm $out/bin/*.{so,dylib}
+  '';
+
+  desktopItem = makeDesktopItem {
+    name = "wheelwizard";
+    exec = "WheelWizard";
+    comment = "WheelWizard, Retro Rewind Launcher";
+    desktopName = "Wheel Wizard";
+    categories = [ "Game" ];
+  };
+
+  meta = with lib; {
+    description = "WheelWizard, Retro Rewind Launcher";
+    homepage = "https://github.com/TeamWheelWizard/WheelWizard";
+    license = licenses.gpl3;
+    platforms = platforms.linux;
+    mainProgram = "WheelWizard";
+  };
+}

From fedf6ea397402276e84b156dc4bb90bc4a5ef707 Mon Sep 17 00:00:00 2001
From: Vasilis Manetas <vasilis.manetas@fh-erfurt.de>
Date: Wed, 22 Oct 2025 14:42:42 +0200
Subject: [PATCH 4858/6226] maintainers: add DerHalbGrieche

---
 maintainers/maintainer-list.nix         | 6 ++++++
 pkgs/by-name/wh/wheelwizard/package.nix | 1 +
 2 files changed, 7 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 913ad6e09d50..8ac4a26db815 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -6276,6 +6276,12 @@
     githubId = 19733;
     name = "Moritz Heidkamp";
   };
+  DerHalbGrieche = {
+    email = "vasilis12.manetas@gmail.com";
+    github = "DerHalbGrieche";
+    githubId = 77843198;
+    name = "Vasilis Manetas";
+  };
   DerickEddington = {
     email = "derick.eddington@pm.me";
     github = "DerickEddington";
diff --git a/pkgs/by-name/wh/wheelwizard/package.nix b/pkgs/by-name/wh/wheelwizard/package.nix
index 432da15a993f..c006e4a5d742 100644
--- a/pkgs/by-name/wh/wheelwizard/package.nix
+++ b/pkgs/by-name/wh/wheelwizard/package.nix
@@ -76,5 +76,6 @@ buildDotnetModule rec {
     license = licenses.gpl3;
     platforms = platforms.linux;
     mainProgram = "WheelWizard";
+    maintainers = with maintainers; [ DerHalbGrieche ];
   };
 }

From a6482039f563b1a4dbaa8fd921058926fb2e3c74 Mon Sep 17 00:00:00 2001
From: Daniel Fahey <daniel.fahey@pm.me>
Date: Sun, 2 Nov 2025 17:54:00 +0000
Subject: [PATCH 4859/6226] python3Packages.bitsandbytes: add missing CUDA
 include outputs

The CUDA manifest restructuring in 29ce0536172 moved headers to separate `include` outputs. Add the `include` outputs from libcublas and libcusparse to cuda-common-redist to fix the build failure reported in https://github.com/NixOS/nixpkgs/issues/456713.
---
 pkgs/development/python-modules/bitsandbytes/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/bitsandbytes/default.nix b/pkgs/development/python-modules/bitsandbytes/default.nix
index 1cd1ef0b98e7..16d12a9091b7 100644
--- a/pkgs/development/python-modules/bitsandbytes/default.nix
+++ b/pkgs/development/python-modules/bitsandbytes/default.nix
@@ -45,10 +45,12 @@ let
     (lib.getDev cuda_cccl) # <thrust/*>
     (lib.getDev libcublas) # cublas_v2.h
     (lib.getLib libcublas)
+    (lib.getInclude libcublas) # cublasLt.h
     libcurand
     libcusolver # cusolverDn.h
     (lib.getDev libcusparse) # cusparse.h
     (lib.getLib libcusparse) # cusparse.h
+    (lib.getInclude libcusparse) # cusparse.h
     (lib.getDev cuda_cudart) # cuda_runtime.h cuda_runtime_api.h
   ];
 

From c48eb21dded9aceed9fbb92790d95591c192fea2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 19:16:39 +0000
Subject: [PATCH 4860/6226] osv-scanner: 2.2.3 -> 2.2.4

---
 pkgs/by-name/os/osv-scanner/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/os/osv-scanner/package.nix b/pkgs/by-name/os/osv-scanner/package.nix
index 4f5c2f0635f8..c1d02e136d59 100644
--- a/pkgs/by-name/os/osv-scanner/package.nix
+++ b/pkgs/by-name/os/osv-scanner/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "osv-scanner";
-  version = "2.2.3";
+  version = "2.2.4";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "osv-scanner";
     tag = "v${version}";
-    hash = "sha256-YdtTF1u5uyXERRZXidumBFoWq4yA5L7cwIaoYJ4ktSM=";
+    hash = "sha256-8ossrNtZgxvzbTLLeELd5ODk3VuIcrC+aIavPzEDQqs=";
   };
 
-  vendorHash = "sha256-/+VtmLnceOzcqWvpBnihtsAf9Q4x/56Zk6UjjejzWHQ=";
+  vendorHash = "sha256-SiWQL33DZcg3H3ECXI+7RJQ1IxrrAmSTRUWPL0m2hcc=";
 
   subPackages = [
     "cmd/osv-scanner"

From 3be3ef3bc624b3849e700289403ee4c03300008b Mon Sep 17 00:00:00 2001
From: Manuel Frischknecht <manuel.frischknecht@macd.com>
Date: Sun, 2 Nov 2025 17:40:40 +0100
Subject: [PATCH 4861/6226] openorienteering-mapper: fix build

---
 pkgs/by-name/op/openorienteering-mapper/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/op/openorienteering-mapper/package.nix b/pkgs/by-name/op/openorienteering-mapper/package.nix
index 2b9489a08865..21a0d40c1832 100644
--- a/pkgs/by-name/op/openorienteering-mapper/package.nix
+++ b/pkgs/by-name/op/openorienteering-mapper/package.nix
@@ -36,6 +36,11 @@ stdenv.mkDerivation rec {
       url = "https://github.com/OpenOrienteering/mapper/commit/d1f214ee2abf140ae3615a2995f08c19ad81418a.patch";
       hash = "sha256-eJZpHdFPW7A69aazI+WRSK9N87d4A6x973hMYTHdw5I=";
     })
+    # https://github.com/OpenOrienteering/mapper/pull/2227
+    (fetchpatch {
+      url = "https://github.com/OpenOrienteering/mapper/commit/fa694d74f2840d7f18976d7f35debcb99bd173eb.patch";
+      hash = "sha256-GVlNeIFiCG7anPsJR2nDCbgXEeUEAUvTcSaJ53Q/eV4=";
+    })
   ];
 
   postPatch = ''

From 7ec92ade2dfe86f3daa3482a16060cb2479c18b8 Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Wed, 15 Oct 2025 10:23:44 +0300
Subject: [PATCH 4862/6226] olive-editor: fix build of pinned openimageio

- add `override` to pinned `openimageio` with `fmt_10`, it does not
build with new default `fmt_11`

Fixes build failure of pinned `openimageio`:
```
CMake Error at src/cmake/modules/Findfmt.cmake:19 (string):
  string sub-command REGEX, mode MATCHALL needs at least 5 arguments total to
  command.
Call Stack (most recent call first):
  src/cmake/externalpackages.cmake:325 (find_package)
  src/cmake/externalpackages.cmake:354 (find_or_download_fmt)
  CMakeLists.txt:166 (include)
```
---
 pkgs/by-name/ol/olive-editor/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ol/olive-editor/package.nix b/pkgs/by-name/ol/olive-editor/package.nix
index 1be1af06b3b9..110701b74a91 100644
--- a/pkgs/by-name/ol/olive-editor/package.nix
+++ b/pkgs/by-name/ol/olive-editor/package.nix
@@ -14,12 +14,13 @@
   portaudio,
   imath,
   qt6,
+  fmt_10,
 }:
 
 let
   # https://github.com/olive-editor/olive/issues/2284
   # we patch support for 2.3+, but 2.5 fails
-  openimageio' = openimageio.overrideAttrs (old: rec {
+  openimageio' = (openimageio.override { fmt = fmt_10; }).overrideAttrs (old: rec {
     version = "2.4.15.0";
     src = (
       old.src.override {

From b7052db720df88b792ea4b607412fb953c98fc94 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 19:44:20 +0000
Subject: [PATCH 4863/6226] libastyle: 3.6.12 -> 3.6.13

---
 pkgs/by-name/as/astyle/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/as/astyle/package.nix b/pkgs/by-name/as/astyle/package.nix
index 20be5951493f..afb4a3537142 100644
--- a/pkgs/by-name/as/astyle/package.nix
+++ b/pkgs/by-name/as/astyle/package.nix
@@ -9,11 +9,11 @@
 
 stdenv.mkDerivation rec {
   pname = "astyle";
-  version = "3.6.12";
+  version = "3.6.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.bz2";
-    hash = "sha256-Gd6wahq25QELlsKBuuNQVg2XicvIluMD82EBeYMv0r4=";
+    hash = "sha256-BIt0sUxuAff66OY7dn2jMwOrOdkCKv4zBVzkueVvFi0=";
   };
 
   nativeBuildInputs = [ cmake ];

From 77714927496ac249d5ff19e39775f79fa25cd477 Mon Sep 17 00:00:00 2001
From: Vasilis Manetas <vasilis.manetas@fh-erfurt.de>
Date: Sun, 2 Nov 2025 20:48:55 +0100
Subject: [PATCH 4864/6226] wheelwizard: add update script

---
 pkgs/by-name/wh/wheelwizard/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/wh/wheelwizard/package.nix b/pkgs/by-name/wh/wheelwizard/package.nix
index c006e4a5d742..633344d45f7f 100644
--- a/pkgs/by-name/wh/wheelwizard/package.nix
+++ b/pkgs/by-name/wh/wheelwizard/package.nix
@@ -7,8 +7,10 @@
   makeDesktopItem,
   makeWrapper,
   avalonia,
-  #Runtime dependencies
+  # Runtime dependencies
   libglvnd,
+  # passthru
+  nix-update-script,
 }:
 buildDotnetModule rec {
   pname = "wheelwizard";
@@ -70,6 +72,8 @@ buildDotnetModule rec {
     categories = [ "Game" ];
   };
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "WheelWizard, Retro Rewind Launcher";
     homepage = "https://github.com/TeamWheelWizard/WheelWizard";

From 4b7dbbf94fcd7fa87ffcd2acdfeab29df5a45716 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Sun, 2 Nov 2025 13:56:50 -0600
Subject: [PATCH 4865/6226] vimPlugins.blink-pairs: 0.3.0 -> 0.4.1

Changelog: https://github.com/Saghen/blink.pairs/blob/v0.4.1/CHANGELOG.md
Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../vim/plugins/non-generated/blink-pairs/default.nix    | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix
index 5a0247b9bbc5..52ac17aaf698 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix
@@ -8,23 +8,26 @@
   nix-update-script,
 }:
 let
-  version = "0.3.0";
+  version = "0.4.1";
 
   src = fetchFromGitHub {
     owner = "Saghen";
     repo = "blink.pairs";
     tag = "v${version}";
-    hash = "sha256-RTY/uGviyHlO+ZmLwOC5BabKr+kRDAXGZNdS9fVRPWA=";
+    hash = "sha256-IfnFSusQMm6LujE1AmihK9wEF2RSGfKYwpV2fedg0fc=";
   };
 
   blink-pairs-lib = rustPlatform.buildRustPackage {
     pname = "blink-pairs";
     inherit version src;
 
-    cargoHash = "sha256-j+zk0UMjvaVgsdF5iaRVO4Puf/XtGu08Cs92jKPaM1g=";
+    cargoHash = "sha256-Cn9zRsQkBwaKbBD/JEpFMBOF6CBZTDx7fQa6Aoic4YU=";
 
     env.RUSTC_BOOTSTRAP = 1;
 
+    # NOTE: Disabled upstream too
+    doCheck = false;
+
     nativeBuildInputs = [
       pkg-config
     ];

From e074d3a35f541b6232c70effabaf5bde636d4893 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 29 Oct 2025 12:20:07 -0400
Subject: [PATCH 4866/6226] dotenv-cli: 10.0.0 -> 11.0.0

---
 pkgs/by-name/do/dotenv-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/do/dotenv-cli/package.nix b/pkgs/by-name/do/dotenv-cli/package.nix
index 169c9ea0b3fe..0d732fb54b3e 100644
--- a/pkgs/by-name/do/dotenv-cli/package.nix
+++ b/pkgs/by-name/do/dotenv-cli/package.nix
@@ -10,18 +10,18 @@
 }:
 stdenv.mkDerivation rec {
   pname = "dotenv-cli";
-  version = "10.0.0";
+  version = "11.0.0";
 
   src = fetchFromGitHub {
     owner = "entropitor";
     repo = "dotenv-cli";
     rev = "v${version}";
-    hash = "sha256-prSGIEHf6wRqOFVsn3Ws25yG7Ga2YEbiU/IMP3QeLXU=";
+    hash = "sha256-oPgi2l6YNt7WyaOzr7EkjgXOitpw9PY7tmN86bUM88Q=";
   };
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/yarn.lock";
-    hash = "sha256-rbG1oM1mEZSB/eYp87YMi6v9ves5YR7u7rkQRlziz7I=";
+    hash = "sha256-I/DzRBETcusE4YS3nC47I1igsVzophNXoVtcD+upZPc=";
   };
 
   nativeBuildInputs = [

From eb6354c2285b5ce0971b1360e99d9d35074b2db7 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 29 Oct 2025 12:19:22 -0400
Subject: [PATCH 4867/6226] atproto-goat: 0-unstable-2025-02-01 -> 0.1.2

Upstream now has tagged versions, let's use those
---
 pkgs/by-name/at/atproto-goat/package.nix | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/at/atproto-goat/package.nix b/pkgs/by-name/at/atproto-goat/package.nix
index 7889da55ebd2..0b3714faf8cd 100644
--- a/pkgs/by-name/at/atproto-goat/package.nix
+++ b/pkgs/by-name/at/atproto-goat/package.nix
@@ -2,31 +2,29 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
-  unstableGitUpdater,
+  nix-update-script,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "atproto-goat";
-  version = "0-unstable-2025-02-01";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "bluesky-social";
     repo = "goat";
-    rev = "e79169f1d8fba9838274b1106d74751fc54eeb9c";
-    hash = "sha256-cLS44J6MlSSti7NRd9vSsdWXoYiMGwt3odg5p60W6ew=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-xbvSO3keFheklnzPNEceS01CjIG3pPB+8e2M+3PD85U=";
   };
 
   postPatch = ''
     substituteInPlace main.go \
-      --replace-fail "versioninfo.Short()" '"${version}"' \
+      --replace-fail "versioninfo.Short()" '"${finalAttrs.version}"' \
       --replace-fail '"github.com/earthboundkid/versioninfo/v2"' ""
   '';
 
-  vendorHash = "sha256-l9oSdTAO1YxfrBjMWJDzlmhaZkbo90FGTk5LedjbZB8=";
+  vendorHash = "sha256-hLsMme054E23NV8GDHsmZTYh/vY/w8gKWvpVIPeAiCY=";
 
-  passthru.updateScript = unstableGitUpdater {
-    hardcodeZeroVersion = true;
-  };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Go AT protocol CLI tool";
@@ -38,4 +36,4 @@ buildGoModule rec {
     maintainers = with lib.maintainers; [ pyrox0 ];
     mainProgram = "goat";
   };
-}
+})

From fd200bdc9076a5150243d67e343f7f8fec3d5e3a Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 29 Oct 2025 12:23:20 -0400
Subject: [PATCH 4868/6226] coc-{diagnostic,spell-checker}: Remove update
 script

Need to be bumped manually, but also haven't gotten updates in years, so
not worried about these.
---
 pkgs/by-name/co/coc-diagnostic/package.nix    | 3 ---
 pkgs/by-name/co/coc-spell-checker/package.nix | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/pkgs/by-name/co/coc-diagnostic/package.nix b/pkgs/by-name/co/coc-diagnostic/package.nix
index f34b3287e046..8a8c8d1bc30a 100644
--- a/pkgs/by-name/co/coc-diagnostic/package.nix
+++ b/pkgs/by-name/co/coc-diagnostic/package.nix
@@ -7,7 +7,6 @@
   yarnBuildHook,
   nodejs,
   npmHooks,
-  nix-update-script,
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "coc-diagnostic";
@@ -38,8 +37,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     unlink $out/lib/node_modules/coc-diagnostic/node_modules/.bin/node-which
   '';
 
-  passthru.updateScript = nix-update-script { };
-
   meta = {
     description = "Diagnostic-languageserver extension for coc.nvim";
     homepage = "https://github.com/iamcco/coc-diagnostic";
diff --git a/pkgs/by-name/co/coc-spell-checker/package.nix b/pkgs/by-name/co/coc-spell-checker/package.nix
index 9ef1edc43bae..afb716ce7d1c 100644
--- a/pkgs/by-name/co/coc-spell-checker/package.nix
+++ b/pkgs/by-name/co/coc-spell-checker/package.nix
@@ -7,7 +7,6 @@
   yarnBuildHook,
   yarnInstallHook,
   nodejs,
-  nix-update-script,
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "coc-spell-checker";
@@ -35,8 +34,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   NODE_OPTIONS = "--openssl-legacy-provider";
 
-  passthru.updateScript = nix-update-script { };
-
   meta = {
     description = "Basic spell checker that works well with camelCase code for (Neo)vim";
     homepage = "https://github.com/iamcco/coc-spell-checker";

From 5820fc8b25f37410e459d16b0e49dd63a3a4a14d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 20:39:47 +0000
Subject: [PATCH 4869/6226] go-critic: 0.14.0 -> 0.14.2

---
 pkgs/by-name/go/go-critic/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/go-critic/package.nix b/pkgs/by-name/go/go-critic/package.nix
index 766ada2c9437..5387413709c1 100644
--- a/pkgs/by-name/go/go-critic/package.nix
+++ b/pkgs/by-name/go/go-critic/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-critic";
-  version = "0.14.0";
+  version = "0.14.2";
 
   src = fetchFromGitHub {
     owner = "go-critic";
     repo = "go-critic";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-dTUjcGULG/47FogLQbFkge66v5/V6WbJDx5eJiSPQOs=";
+    hash = "sha256-+PYIZBjq3kHaTXoZInfqT0EJDeil2+kyTxgKY2sKTs0=";
   };
 
-  vendorHash = "sha256-3iLJiwW/VgmWpK5sGYkIyz7V2XGnsNcCd7kwz7ctRX4=";
+  vendorHash = "sha256-2tzBJI2d9/EY1lPgJDrOGfgh8dz2bYwP5kWifJ46a8I=";
 
   subPackages = [
     "cmd/gocritic"

From 8783460610fbd68cdca5363cab11690c9ab28c3e Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 2 Nov 2025 17:57:18 -0300
Subject: [PATCH 4870/6226] zdelta: mark as broken on darwin

---
 pkgs/by-name/zd/zdelta/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/zd/zdelta/package.nix b/pkgs/by-name/zd/zdelta/package.nix
index fd0cf1ae08b4..41f3573b5450 100644
--- a/pkgs/by-name/zd/zdelta/package.nix
+++ b/pkgs/by-name/zd/zdelta/package.nix
@@ -24,5 +24,7 @@ stdenv.mkDerivation {
     homepage = "https://web.archive.org/web/20160316212948/http://cis.poly.edu/zdelta/";
     platforms = platforms.all;
     license = licenses.zlib;
+    # last successful hydra build on darwin was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From d09aec1b2769b6d64e590c0fa921cef2415529db Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Sun, 2 Nov 2025 22:38:58 +0300
Subject: [PATCH 4871/6226] olive-editor: fix build with qt6-6.10

- add patch from merged upstream PR of `kddockwidgets` submodule:
https://www.github.com/KDAB/KDDockWidgets/pull/615
https://github.com/KDAB/KDDockWidgets/commit/f2b50fff29bd4b49acdfed3ed8fc42eb0a502032
(does not apply with `fetchpatch`)

Fixes build failure with qt6-6.10:
```
CMake Error at ext/KDDockWidgets/src/CMakeLists.txt:306 (target_link_libraries):
  Target "kddockwidgets" links to:

    Qt6::WidgetsPrivate

  but the target was not found.  Possible reasons include:

    * There is a typo in the target name.
    * A find_package call is missing for an IMPORTED target.
    * An ALIAS target is missing.
```
---
 ...kddockwidgets-fix-build-with-qt-6_10.patch | 21 +++++++++++++++++++
 pkgs/by-name/ol/olive-editor/package.nix      |  5 +++++
 2 files changed, 26 insertions(+)
 create mode 100644 pkgs/by-name/ol/olive-editor/olive-editor-kddockwidgets-fix-build-with-qt-6_10.patch

diff --git a/pkgs/by-name/ol/olive-editor/olive-editor-kddockwidgets-fix-build-with-qt-6_10.patch b/pkgs/by-name/ol/olive-editor/olive-editor-kddockwidgets-fix-build-with-qt-6_10.patch
new file mode 100644
index 000000000000..3ab25e679764
--- /dev/null
+++ b/pkgs/by-name/ol/olive-editor/olive-editor-kddockwidgets-fix-build-with-qt-6_10.patch
@@ -0,0 +1,21 @@
+diff --git a/ext/KDDockWidgets/CMakeLists.txt b/ext/KDDockWidgets/CMakeLists.txt
+index 608a2491..d0edc399 100644
+--- a/ext/KDDockWidgets/CMakeLists.txt
++++ b/ext/KDDockWidgets/CMakeLists.txt
+@@ -160,8 +160,16 @@
+ include(KDQtInstallPaths) #to set QT_INSTALL_FOO variables
+ 
+ set(${PROJECT_NAME}_DEPS "widgets")
++if(Qt6Core_VERSION VERSION_GREATER_EQUAL "6.10.0")
++    set(QT_NO_PRIVATE_MODULE_WARNING ON)
++    find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONENTS WidgetsPrivate)
++endif()
+ if(${PROJECT_NAME}_QTQUICK)
+     find_package(Qt${Qt_VERSION_MAJOR} NO_MODULE REQUIRED COMPONENTS Quick QuickControls2)
++    if(Qt6Core_VERSION VERSION_GREATER_EQUAL "6.10.0")
++        set(QT_NO_PRIVATE_MODULE_WARNING ON)
++        find_package(Qt6 ${QT_MIN_VERSION} NO_MODULE REQUIRED COMPONENTS QuickPrivate)
++    endif()
+     add_definitions(-DKDDOCKWIDGETS_QTQUICK)
+     set(${PROJECT_NAME}_DEPS "${${PROJECT_NAME}_DEPS} quick quickcontrols2")
+ else()
diff --git a/pkgs/by-name/ol/olive-editor/package.nix b/pkgs/by-name/ol/olive-editor/package.nix
index 110701b74a91..6d98955eea6c 100644
--- a/pkgs/by-name/ol/olive-editor/package.nix
+++ b/pkgs/by-name/ol/olive-editor/package.nix
@@ -57,6 +57,11 @@ stdenv.mkDerivation {
       url = "https://github.com/olive-editor/olive/commit/311eeb72944f93f873d1cd1784ee2bf423e1e7c2.patch";
       hash = "sha256-lswWn4DbXGH1qPvPla0jSgUJQXuqU7LQGHIPoXAE8ag=";
     })
+
+    # Fix build of `kddockwidgets` with qt6-6.10, adapted from:
+    # https://github.com/KDAB/KDDockWidgets/pull/615
+    # https://github.com/KDAB/KDDockWidgets/commit/f2b50fff29bd4b49acdfed3ed8fc42eb0a502032
+    ./olive-editor-kddockwidgets-fix-build-with-qt-6_10.patch
   ];
 
   # https://github.com/olive-editor/olive/issues/2200

From 711c12925734d4cc2079553a08e9c5401f4b2f30 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 20:59:32 +0000
Subject: [PATCH 4872/6226] cargo-rdme: 1.4.9 -> 1.5.0

---
 pkgs/by-name/ca/cargo-rdme/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-rdme/package.nix b/pkgs/by-name/ca/cargo-rdme/package.nix
index d9bf09e84f5e..e823b3455f98 100644
--- a/pkgs/by-name/ca/cargo-rdme/package.nix
+++ b/pkgs/by-name/ca/cargo-rdme/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-rdme";
-  version = "1.4.9";
+  version = "1.5.0";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-ostDwjj93WhDfBKJY9xpKd74knQi9z9UFb5Q84waHuM=";
+    hash = "sha256-TmV6Fc5vlc4fm9w4+iuxmnonwsEbqoJ3jvpIyQOuxjg=";
   };
 
-  cargoHash = "sha256-pk7tYvN2Drn+Gpk170ITsAF38dVWjk+RBfrnb0YpZc4=";
+  cargoHash = "sha256-EjIvKf1XgHubvyWPOAjysNH4nD0xqOWYg1FeiPSYh4c=";
 
   meta = {
     description = "Cargo command to create the README.md from your crate's documentation";

From cdb2f931c3f1ae0d675006026be1b9f50aee0ba8 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Sun, 2 Nov 2025 21:49:24 +0100
Subject: [PATCH 4873/6226] gradle_7: fix meta eval

Currently `gradle_7.meta` does not evaluate, because evaluation is
forced in the wrapper adding the updateScript. We can move the update
script to `gradle_8-unwrapped`, for which we don't need to do this
check.
---
 .../tools/build-managers/gradle/default.nix   | 36 ++++++++++---------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index c18b542fa7b4..e2ef742c7217 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -3,6 +3,7 @@
   jdk11,
   jdk17,
   jdk21,
+  nix-update-script,
 }:
 
 let
@@ -15,11 +16,6 @@ let
       symlinkJoin,
       concatTextFile,
       makeSetupHook,
-      nix-update-script,
-
-      # This is the "current" version of gradle in nixpkgs.
-      # Used to define the update script.
-      gradle-unwrapped,
 
       runCommand,
     }:
@@ -84,17 +80,6 @@ let
                 '';
           }
           // gradle.tests;
-        }
-        // lib.optionalAttrs (this-gradle-unwrapped == gradle-unwrapped) {
-          updateScript = nix-update-script {
-            extraArgs = [
-              "--url=https://github.com/gradle/gradle"
-              # Gradle’s .0 releases are tagged as `vX.Y.0`, but the actual
-              # release version omits the `.0`, so we’ll wanto to only capture
-              # the version up but not including the the trailing `.0`.
-              "--version-regex=^v(\\d+\\.\\d+(?:\\.[1-9]\\d?)?)(\\.0)?$"
-            ];
-          };
         };
 
         meta = gradle.meta // {
@@ -133,6 +118,10 @@ let
       # Extra attributes to be merged into the resulting derivation's
       # meta attribute.
       meta ? { },
+
+      # Put the update script in passthru. Should only be on a single attrpath
+      # so that nixpkgs-update doesn't create duplicate PRs.
+      enableUpdateScript ? false,
     }@genArgs:
 
     {
@@ -287,6 +276,19 @@ let
       };
       passthru.jdk = defaultJava;
       passthru.wrapped = callPackage wrapGradle { } (gen' genArgs);
+      passthru.updateScript =
+        if enableUpdateScript then
+          nix-update-script {
+            extraArgs = [
+              "--url=https://github.com/gradle/gradle"
+              # Gradle’s .0 releases are tagged as `vX.Y.0`, but the actual
+              # release version omits the `.0`, so we’ll wanto to only capture
+              # the version up but not including the the trailing `.0`.
+              "--version-regex=^v(\\d+\\.\\d+(?:\\.[1-9]\\d?)?)(\\.0)?$"
+            ];
+          }
+        else
+          null;
 
       meta =
         with lib;
@@ -337,6 +339,8 @@ rec {
     version = "8.14.3";
     hash = "sha256-vXEQIhNJMGCVbsIp2Ua+7lcVjb2J0OYrkbyg+ixfNTE=";
     defaultJava = jdk21;
+    # Only enable this on *one* version to avoid duplicate PRs.
+    enableUpdateScript = true;
   };
   gradle_7 = gen' {
     version = "7.6.6";

From c4cafe7a3808e1fb29fbb8dfb30945211a511f3a Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sun, 2 Nov 2025 22:10:53 +0100
Subject: [PATCH 4874/6226] csdr: fix build with cmake 4

---
 pkgs/by-name/cs/csdr/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/cs/csdr/package.nix b/pkgs/by-name/cs/csdr/package.nix
index a5c5d6a7ea5d..a3773541426a 100644
--- a/pkgs/by-name/cs/csdr/package.nix
+++ b/pkgs/by-name/cs/csdr/package.nix
@@ -22,6 +22,10 @@ stdenv.mkDerivation rec {
   postPatch = ''
     # function is not defined in any headers but used in libcsdr.c
     echo "int errhead();" >> src/predefined.h
+
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required (VERSION 3.0)" \
+      "cmake_minimum_required (VERSION 3.10)"
   '';
 
   nativeBuildInputs = [

From a7326e00e5f6c072df4c5dba17a4a5ee682d8b42 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 21:20:30 +0000
Subject: [PATCH 4875/6226] openmm: 8.3.1 -> 8.4.0

---
 pkgs/by-name/op/openmm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openmm/package.nix b/pkgs/by-name/op/openmm/package.nix
index e76046dd84cb..f63175e4e7a8 100644
--- a/pkgs/by-name/op/openmm/package.nix
+++ b/pkgs/by-name/op/openmm/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "openmm";
-  version = "8.3.1";
+  version = "8.4.0";
 
   src = fetchFromGitHub {
     owner = "openmm";
     repo = "openmm";
     rev = finalAttrs.version;
-    hash = "sha256-3e0+8f2V+UCrPJA1wQUZKPvjpmWU9FfOAt9Ako0Lnl0=";
+    hash = "sha256-vD0daqhEwiM+OMqW//mpc3p6ho/TI2muA6VopXyLYVE=";
   };
 
   # "This test is stochastic and may occasionally fail". It does.

From e82952b2c3d481e2d9a5ef2d3731d6215fb4821b Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Sun, 2 Nov 2025 15:21:24 -0600
Subject: [PATCH 4876/6226] stub-ld: remove 32-bit test as it's no longer
 provided

stub-ld 32-bit support was removed in e9b95509b20f328e25e6b5123248cd22b9a6d245
---
 nixos/tests/stub-ld.nix | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/nixos/tests/stub-ld.nix b/nixos/tests/stub-ld.nix
index c6d045f60c05..a6ba3da49e54 100644
--- a/nixos/tests/stub-ld.nix
+++ b/nixos/tests/stub-ld.nix
@@ -24,12 +24,6 @@ import ./make-test-python.nix (
         libDir = pkgs.stdenv.hostPlatform.libDir;
         ldsoBasename = lib.last (lib.splitString "/" pkgs.stdenv.cc.bintools.dynamicLinker);
 
-        check32 = pkgs.stdenv.hostPlatform.isx86_64;
-        pkgs32 = pkgs.pkgsi686Linux;
-
-        libDir32 = pkgs32.stdenv.hostPlatform.libDir;
-        ldsoBasename32 = lib.last (lib.splitString "/" pkgs32.stdenv.cc.bintools.dynamicLinker);
-
         test-exec =
           builtins.mapAttrs
             (
@@ -45,8 +39,6 @@ import ./make-test-python.nix (
               aarch64-linux.hash = "sha256-hnldbd2cctQIAhIKoEZLIWY8H3jiFBClkNy2UlyyvAs=";
             };
         exec-name = "rustic";
-
-        if32 = pythonStatement: if check32 then pythonStatement else "pass";
       in
       ''
         machine.start()
@@ -54,35 +46,26 @@ import ./make-test-python.nix (
 
         with subtest("Check for stub (enabled, initial)"):
             machine.succeed('test -L /${libDir}/${ldsoBasename}')
-            ${if32 "machine.succeed('test -L /${libDir32}/${ldsoBasename32}')"}
 
         with subtest("Try FHS executable"):
             machine.copy_from_host('${test-exec.${pkgs.stdenv.hostPlatform.system}}','test-exec')
             machine.succeed('if test-exec/${exec-name} 2>outfile; then false; else [ $? -eq 127 ];fi')
             machine.succeed('grep -qi nixos outfile')
-            ${if32 "machine.copy_from_host('${
-              test-exec.${pkgs32.stdenv.hostPlatform.system}
-            }','test-exec32')"}
-            ${if32 "machine.succeed('if test-exec32/${exec-name} 2>outfile32; then false; else [ $? -eq 127 ];fi')"}
-            ${if32 "machine.succeed('grep -qi nixos outfile32')"}
 
         with subtest("Disable stub"):
             machine.succeed("/run/booted-system/specialisation/nostub/bin/switch-to-configuration test")
 
         with subtest("Check for stub (disabled)"):
             machine.fail('test -e /${libDir}/${ldsoBasename}')
-            ${if32 "machine.fail('test -e /${libDir32}/${ldsoBasename32}')"}
 
         with subtest("Create file in stub location (to be overwritten)"):
             machine.succeed('mkdir -p /${libDir};touch /${libDir}/${ldsoBasename}')
-            ${if32 "machine.succeed('mkdir -p /${libDir32};touch /${libDir32}/${ldsoBasename32}')"}
 
         with subtest("Re-enable stub"):
             machine.succeed("/run/booted-system/bin/switch-to-configuration test")
 
         with subtest("Check for stub (enabled, final)"):
             machine.succeed('test -L /${libDir}/${ldsoBasename}')
-            ${if32 "machine.succeed('test -L /${libDir32}/${ldsoBasename32}')"}
       '';
   }
 )

From bd251c50aa926f6198d1f16cb214e6d08aa47dc5 Mon Sep 17 00:00:00 2001
From: Maxime Brunet <max@brnt.mx>
Date: Sat, 18 Oct 2025 11:45:21 -0300
Subject: [PATCH 4877/6226] automatic-timezoned: Remove usage of rec and with

---
 pkgs/by-name/au/automatic-timezoned/package.nix | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix
index e68e56272081..86feba867250 100644
--- a/pkgs/by-name/au/automatic-timezoned/package.nix
+++ b/pkgs/by-name/au/automatic-timezoned/package.nix
@@ -2,28 +2,34 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
+  versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "automatic-timezoned";
   version = "2.0.96";
 
   src = fetchFromGitHub {
     owner = "maxbrunet";
     repo = "automatic-timezoned";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-Y2dx0Y5wfYXewJkf7W2YgupdTfwsJg7MTPsFpLmJ9k8=";
   };
 
   cargoHash = "sha256-c5KDy767GxZwTwrcjsnfEQVlFiYxmjSdpFx07ymMtBE=";
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+
   meta = {
     description = "Automatically update system timezone based on location";
     homepage = "https://github.com/maxbrunet/automatic-timezoned";
-    changelog = "https://github.com/maxbrunet/automatic-timezoned/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/maxbrunet/automatic-timezoned/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.gpl3;
-    maintainers = with lib.maintainers; [ maxbrunet ];
+    maintainers = [ lib.maintainers.maxbrunet ];
     platforms = lib.platforms.linux;
     mainProgram = "automatic-timezoned";
   };
-}
+})

From 02506d0ca369b39c02adfd0c592c75924c14d6e0 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sun, 2 Nov 2025 22:39:59 +0100
Subject: [PATCH 4878/6226] csdr: add version check

---
 pkgs/by-name/cs/csdr/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/cs/csdr/package.nix b/pkgs/by-name/cs/csdr/package.nix
index a3773541426a..12c8453819b5 100644
--- a/pkgs/by-name/cs/csdr/package.nix
+++ b/pkgs/by-name/cs/csdr/package.nix
@@ -6,6 +6,7 @@
   pkg-config,
   fftwFloat,
   libsamplerate,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation rec {
@@ -46,6 +47,10 @@ stdenv.mkDerivation rec {
       --replace '=''${exec_prefix}//' '=/'
   '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "version";
+  doInstallCheck = true;
+
   meta = with lib; {
     homepage = "https://github.com/jketterl/csdr";
     description = "Simple DSP library and command-line tool for Software Defined Radio";

From adca6f14cf626df43c68cbcf6d7c28feb3b9ef30 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sun, 2 Nov 2025 22:40:24 +0100
Subject: [PATCH 4879/6226] digiham: fix build with cmake 4

---
 pkgs/by-name/di/digiham/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/di/digiham/package.nix b/pkgs/by-name/di/digiham/package.nix
index e373f97e082e..889b19698e2b 100644
--- a/pkgs/by-name/di/digiham/package.nix
+++ b/pkgs/by-name/di/digiham/package.nix
@@ -26,6 +26,12 @@ stdenv.mkDerivation (finalAttrs: {
     ./cpp-17.patch
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt --replace-fail \
+      "cmake_minimum_required (VERSION 3.0)" \
+      "cmake_minimum_required (VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [
     cmake
   ];

From 71ceecf997f7547d134e8cbf44bd78014666afa3 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sun, 2 Nov 2025 22:40:53 +0100
Subject: [PATCH 4880/6226] openwebrx: fix build with cmake 4

---
 pkgs/by-name/op/openwebrx/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/op/openwebrx/package.nix b/pkgs/by-name/op/openwebrx/package.nix
index 000f783f70bc..2e3a61b205e7 100644
--- a/pkgs/by-name/op/openwebrx/package.nix
+++ b/pkgs/by-name/op/openwebrx/package.nix
@@ -54,6 +54,12 @@ let
       hash = "sha256-1H0TJ8QN3b6Lof5TWvyokhCeN+dN7ITwzRvEo2X8OWc=";
     };
 
+    postPatch = ''
+      substituteInPlace CMakeLists.txt --replace-fail \
+        "cmake_minimum_required (VERSION 3.0)" \
+        "cmake_minimum_required (VERSION 3.10)"
+    '';
+
     nativeBuildInputs = [
       cmake
       pkg-config

From b0857a62d19c508b8f8fb95498ce053b26b9e4e6 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 2 Nov 2025 18:44:24 -0300
Subject: [PATCH 4881/6226] vite: unstable-2022-05-17 -> 1.4

---
 .../science/misc/vite/default.nix             | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix
index 4684bccc31e0..1bdabe3875d6 100644
--- a/pkgs/applications/science/misc/vite/default.nix
+++ b/pkgs/applications/science/misc/vite/default.nix
@@ -1,6 +1,7 @@
 {
   stdenv,
   fetchFromGitLab,
+  fetchpatch,
   lib,
   cmake,
   qtbase,
@@ -13,18 +14,26 @@
   wrapQtAppsHook,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "vite";
-  version = "unstable-2022-05-17";
+  version = "1.4";
 
   src = fetchFromGitLab {
     domain = "gitlab.inria.fr";
     owner = "solverstack";
     repo = "vite";
-    rev = "6d497cc519fac623e595bd174e392939c4de845c";
-    hash = "sha256-Yf2jYALZplIXzVtd/sg6gzEYrZ+oU0zLG1ETd/hiTi0=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-z2M4BazLzO/NCcq/VKb+tgrZ6QUs+AX0BbzJW809Krg=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "cmake4-fix";
+      url = "https://gitlab.inria.fr/solverstack/vite/-/commit/0359f78c8b11ced3a79ac4d73f4ecb9087eba1e8.patch";
+      hash = "sha256-UMg21ZlwyRSVQ4CD1oKNUkT+RNxqOIQi2WNBLbYPkJg=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     qttools
@@ -54,4 +63,4 @@ stdenv.mkDerivation {
     maintainers = [ ];
     platforms = lib.platforms.linux;
   };
-}
+})

From 38fff9c03943a891b2d993557adc49f1c7cc6ff0 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 2 Nov 2025 13:33:56 -0800
Subject: [PATCH 4882/6226] gradle: pass through wrapper override arguments to
 unwrapped Gradle

Comments on #436358 and #402297 indicated a desire to have a more
controllable Gradle wrapper derivation. We were previously hiding the
Gradle being wrapped in the closure of wrapGradle, forcing us to expose
wrapGradle and use makeOverridable. Simply use callPackage to make it
easier for consumers to override things without us needing to expose gradleGen.
---
 .../tools/build-managers/gradle/default.nix   | 143 +++++++++---------
 1 file changed, 72 insertions(+), 71 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index e2ef742c7217..fe426f145f7f 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -16,79 +16,76 @@ let
       symlinkJoin,
       concatTextFile,
       makeSetupHook,
-
+      gradle-unwrapped,
       runCommand,
-    }:
-    this-gradle-unwrapped:
-    lib.makeOverridable (
-      args:
-      let
-        gradle = this-gradle-unwrapped.override args;
-      in
-      symlinkJoin {
-        pname = "gradle";
-        inherit (gradle) version;
+      ...
+    }@args:
+    let
+      gradle = gradle-unwrapped.override args;
+    in
+    symlinkJoin {
+      pname = "gradle";
+      inherit (gradle) version;
 
-        paths = [
-          (makeSetupHook { name = "gradle-setup-hook"; } (concatTextFile {
-            name = "setup-hook.sh";
-            files = [
-              (mitm-cache.setupHook)
-              (replaceVars ./setup-hook.sh {
-                # jdk used for keytool
-                inherit (gradle) jdk;
-                init_script = "${./init-build.gradle}";
-              })
-            ];
-          }))
-          gradle
-          mitm-cache
-        ];
+      paths = [
+        (makeSetupHook { name = "gradle-setup-hook"; } (concatTextFile {
+          name = "setup-hook.sh";
+          files = [
+            (mitm-cache.setupHook)
+            (replaceVars ./setup-hook.sh {
+              # jdk used for keytool
+              inherit (gradle) jdk;
+              init_script = "${./init-build.gradle}";
+            })
+          ];
+        }))
+        gradle
+        mitm-cache
+      ];
 
-        passthru = {
-          fetchDeps = callPackage ./fetch-deps.nix { inherit mitm-cache; };
-          inherit (gradle) jdk;
-          unwrapped = gradle;
-          tests = {
-            toolchains =
-              let
-                javaVersion = lib.getVersion jdk11;
-                javaMajorVersion = lib.versions.major javaVersion;
-              in
-              runCommand "detects-toolchains-from-nix-env"
-                {
-                  # Use JDKs that are not the default for any of the gradle versions
-                  nativeBuildInputs = [
-                    (gradle.override {
-                      javaToolchains = [
-                        jdk11
-                      ];
-                    })
-                  ];
-                  src = ./tests/toolchains;
-                }
-                ''
-                  cp -a $src/* .
-                  substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaMajorVersion}'
-                  env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \
-                  gradle run --no-daemon --quiet --console plain > $out
-                  actual="$(<$out)"
-                  if [[ "${javaVersion}" != "$actual"* ]]; then
-                    echo "Error: Expected '${javaVersion}', to start with '$actual'" >&2
-                    exit 1
-                  fi
-                '';
-          }
-          // gradle.tests;
-        };
+      passthru = {
+        fetchDeps = callPackage ./fetch-deps.nix { inherit mitm-cache; };
+        inherit (gradle) jdk;
+        unwrapped = gradle;
+        tests = {
+          toolchains =
+            let
+              javaVersion = lib.getVersion jdk11;
+              javaMajorVersion = lib.versions.major javaVersion;
+            in
+            runCommand "detects-toolchains-from-nix-env"
+              {
+                # Use JDKs that are not the default for any of the gradle versions
+                nativeBuildInputs = [
+                  (gradle.override {
+                    javaToolchains = [
+                      jdk11
+                    ];
+                  })
+                ];
+                src = ./tests/toolchains;
+              }
+              ''
+                cp -a $src/* .
+                substituteInPlace ./build.gradle --replace-fail '@JAVA_VERSION@' '${javaMajorVersion}'
+                env GRADLE_USER_HOME=$TMPDIR/gradle org.gradle.native.dir=$TMPDIR/native \
+                gradle run --no-daemon --quiet --console plain > $out
+                actual="$(<$out)"
+                if [[ "${javaVersion}" != "$actual"* ]]; then
+                  echo "Error: Expected '${javaVersion}', to start with '$actual'" >&2
+                  exit 1
+                fi
+              '';
+        }
+        // gradle.tests;
+      };
 
-        meta = gradle.meta // {
-          # prefer normal gradle/mitm-cache over this wrapper, this wrapper only provides the setup hook
-          # and passthru
-          priority = (gradle.meta.priority or lib.meta.defaultPriority) + 1;
-        };
-      }
-    ) { };
+      meta = gradle.meta // {
+        # prefer normal gradle/mitm-cache over this wrapper, this wrapper only provides the setup hook
+        # and passthru
+        priority = (gradle.meta.priority or lib.meta.defaultPriority) + 1;
+      };
+    };
 
   gen =
     {
@@ -146,8 +143,10 @@ let
       # Additional JDK/JREs to be registered as toolchains.
       # See https://docs.gradle.org/current/userguide/toolchains.html
       javaToolchains ? [ ],
-    }:
 
+      # Ignored arguments from calling .override on the wrapper.
+      ...
+    }:
     stdenv.mkDerivation (finalAttrs: {
       pname = "gradle";
       inherit version;
@@ -275,7 +274,9 @@ let
         };
       };
       passthru.jdk = defaultJava;
-      passthru.wrapped = callPackage wrapGradle { } (gen' genArgs);
+      passthru.wrapped = callPackage wrapGradle {
+        gradle-unwrapped = gen' genArgs;
+      };
       passthru.updateScript =
         if enableUpdateScript then
           nix-update-script {

From 32eb09cad7cc48a14a73316422a974d6ac384449 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Sun, 2 Nov 2025 22:47:51 +0100
Subject: [PATCH 4883/6226] openwebrx: add version checks

---
 pkgs/by-name/op/openwebrx/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/op/openwebrx/package.nix b/pkgs/by-name/op/openwebrx/package.nix
index 2e3a61b205e7..4707d53e4e27 100644
--- a/pkgs/by-name/op/openwebrx/package.nix
+++ b/pkgs/by-name/op/openwebrx/package.nix
@@ -14,6 +14,7 @@
   sox,
   wsjtx,
   codecserver,
+  versionCheckHook,
 }:
 
 let
@@ -73,6 +74,10 @@ let
       soapysdr-with-plugins
     ];
 
+    nativeInstallCheckInputs = [ versionCheckHook ];
+    versionCheckProgram = "${placeholder "out"}/bin/rtl_connector";
+    doInstallCheck = true;
+
     meta = {
       homepage = "https://github.com/jketterl/owrx_connector";
       description = "Set of connectors that are used by OpenWebRX to interface with SDR hardware";
@@ -119,6 +124,9 @@ python3Packages.buildPythonApplication rec {
     "test"
   ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+
   passthru = {
     inherit js8py owrx_connector;
   };

From 058acd2bd4deda57934118bc9707c4e174fd4987 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 2 Nov 2025 18:48:13 -0300
Subject: [PATCH 4884/6226] vite: add maintainer iedame

---
 pkgs/applications/science/misc/vite/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix
index 1bdabe3875d6..956cf1f81569 100644
--- a/pkgs/applications/science/misc/vite/default.nix
+++ b/pkgs/applications/science/misc/vite/default.nix
@@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     homepage = "http://vite.gforge.inria.fr/";
     license = lib.licenses.cecill20;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ iedame ];
     platforms = lib.platforms.linux;
   };
 })

From eae54e1af2fe63d922db8e161d0339b256ab311b Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 2 Nov 2025 23:07:05 +0100
Subject: [PATCH 4885/6226] gxmatcheq: modernize

---
 pkgs/by-name/gx/gxmatcheq-lv2/package.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/gx/gxmatcheq-lv2/package.nix b/pkgs/by-name/gx/gxmatcheq-lv2/package.nix
index 5a037d1a4ef0..1845be27c664 100644
--- a/pkgs/by-name/gx/gxmatcheq-lv2/package.nix
+++ b/pkgs/by-name/gx/gxmatcheq-lv2/package.nix
@@ -8,16 +8,15 @@
   lv2,
   pkg-config,
 }:
-
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "GxMatchEQ.lv2";
   version = "0.1";
 
   src = fetchFromGitHub {
     owner = "brummer10";
     repo = "GxMatchEQ.lv2";
-    rev = "V${version}";
-    sha256 = "0azdmgzqwjn26nx38iw13666a1i4y2bv39wk89pf6ihdi46klf72";
+    rev = "V${finalAttrs.version}";
+    hash = "sha256-4jg6DYkNRuNuQpOnsZfwJAZljBmBRzS6NcJKjv+r7Ss=";
   };
 
   nativeBuildInputs = [ pkg-config ];
@@ -33,10 +32,10 @@ stdenv.mkDerivation rec {
 
   installFlags = [ "INSTALL_DIR=$(out)/lib/lv2" ];
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/brummer10/GxMatchEQ.lv2";
     description = "Matching Equalizer to apply EQ curve from one source to another source";
-    maintainers = [ maintainers.magnetophon ];
-    license = licenses.gpl3;
+    maintainers = with lib.maintainers; [ magnetophon ];
+    license = lib.licenses.gpl3;
   };
-}
+})

From 18042df49653f6aa69d601727d16cf4e2c76cc7e Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Sun, 2 Nov 2025 23:08:02 +0100
Subject: [PATCH 4886/6226] gxmatcheq: fix build

---
 pkgs/by-name/gx/gxmatcheq-lv2/package.nix | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gx/gxmatcheq-lv2/package.nix b/pkgs/by-name/gx/gxmatcheq-lv2/package.nix
index 1845be27c664..340f1b9a895c 100644
--- a/pkgs/by-name/gx/gxmatcheq-lv2/package.nix
+++ b/pkgs/by-name/gx/gxmatcheq-lv2/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  gcc13Stdenv,
   fetchFromGitHub,
   xorg,
   xorgproto,
@@ -8,7 +9,12 @@
   lv2,
   pkg-config,
 }:
-stdenv.mkDerivation (finalAttrs: {
+let
+  # see: https://github.com/brummer10/GxMatchEQ.lv2/issues/8
+  # Use gcc13 on Linux, but default stdenv (clang) elsewhere
+  buildStdenv = if stdenv.hostPlatform.isLinux then gcc13Stdenv else stdenv;
+in
+buildStdenv.mkDerivation (finalAttrs: {
   pname = "GxMatchEQ.lv2";
   version = "0.1";
 

From 55f863d0b328004852be2a40c64f3a9bb1cff74f Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 2 Nov 2025 19:09:20 -0300
Subject: [PATCH 4887/6226] veryfasttree: mark as broken on darwin

---
 pkgs/by-name/ve/veryfasttree/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ve/veryfasttree/package.nix b/pkgs/by-name/ve/veryfasttree/package.nix
index 98682898e598..a20bcbd1f06b 100644
--- a/pkgs/by-name/ve/veryfasttree/package.nix
+++ b/pkgs/by-name/ve/veryfasttree/package.nix
@@ -35,5 +35,7 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3Plus;
     maintainers = [ ];
     platforms = lib.platforms.all;
+    # last successful hydra build on darwin was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })

From c46e2bb59dab31335b7c7de622a174bfaafa4ed5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 22:17:28 +0000
Subject: [PATCH 4888/6226] python3Packages.iamdata: 0.1.202511011 ->
 0.1.202511021

---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index d61cf2c0c4dc..7ce9c2a95abc 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202511011";
+  version = "0.1.202511021";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-uVZdWEFh9yLYl5gywj4Nwopwz9J0f/0nfaseK3mhTyA=";
+    hash = "sha256-iB5ke9vOdW/OHemITGC7t1i8iQKm5TjytVxRyUjb0Gk=";
   };
 
   __darwinAllowLocalNetworking = true;

From ed9152aa1275b34a0f2af2934d9a28a31b3bd4db Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 2 Nov 2025 23:55:39 +0100
Subject: [PATCH 4889/6226] python313Packages.nats-py: remove disabled

---
 pkgs/development/python-modules/nats-py/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix
index 77c57c6a37e8..ea16db8dfc1d 100644
--- a/pkgs/development/python-modules/nats-py/default.nix
+++ b/pkgs/development/python-modules/nats-py/default.nix
@@ -8,7 +8,6 @@
   nats-server,
   nkeys,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   uvloop,
 }:
@@ -18,8 +17,6 @@ buildPythonPackage rec {
   version = "2.12.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "nats-io";
     repo = "nats.py";
@@ -71,7 +68,7 @@ buildPythonPackage rec {
     description = "Python client for NATS.io";
     homepage = "https://github.com/nats-io/nats.py";
     changelog = "https://github.com/nats-io/nats.py/releases/tag/${src.tag}";
-    license = with licenses; [ asl20 ];
+    license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
   };
 }

From 031f235dcd4754c1487ca0a6f4f32feca939b525 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 23:09:50 +0000
Subject: [PATCH 4890/6226] python3Packages.ultralytics-thop: 2.0.17 -> 2.0.18

---
 pkgs/development/python-modules/ultralytics-thop/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ultralytics-thop/default.nix b/pkgs/development/python-modules/ultralytics-thop/default.nix
index adf61bf830bb..cff90dd11b3f 100644
--- a/pkgs/development/python-modules/ultralytics-thop/default.nix
+++ b/pkgs/development/python-modules/ultralytics-thop/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "ultralytics-thop";
-  version = "2.0.17";
+  version = "2.0.18";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ultralytics";
     repo = "thop";
     tag = "v${version}";
-    hash = "sha256-7bNwSbazDlxsaDbyqx2DVhiQ8JgFF3Z+olNLa91jDb4=";
+    hash = "sha256-Vi3QURIEZaOk/PJFRB+GEFmksvo2ZSkhXe+HQE6yWcU=";
   };
 
   build-system = [ setuptools ];

From 2788f37f6476561100ce33b76c771a8540855f52 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 2 Nov 2025 15:03:21 -0800
Subject: [PATCH 4891/6226] gradle: expose gradle-packages.mkGradle and
 gradle-packages.wrapGradle

Users may want to use a completely custom version of Gradle. Add
mkGradle and wrapGradle as non-toplevel APIs for this.
---
 .../tools/build-managers/gradle/default.nix    | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix
index fe426f145f7f..2d340c9bca3c 100644
--- a/pkgs/development/tools/build-managers/gradle/default.nix
+++ b/pkgs/development/tools/build-managers/gradle/default.nix
@@ -87,7 +87,8 @@ let
       };
     };
 
-  gen =
+  # Creates a Gradle without calling the package.
+  mkGradle' =
     {
       version,
       hash,
@@ -275,7 +276,7 @@ let
       };
       passthru.jdk = defaultJava;
       passthru.wrapped = callPackage wrapGradle {
-        gradle-unwrapped = gen' genArgs;
+        gradle-unwrapped = mkGradle genArgs;
       };
       passthru.updateScript =
         if enableUpdateScript then
@@ -324,26 +325,31 @@ let
     });
 
   # Calls the generated Gradle package with default arguments.
-  gen' = args: callPackage (gen args) { };
+  mkGradle = args: callPackage (mkGradle' args) { };
 in
 rec {
+  # Keep these exposed (but not at toplevel) so users can call
+  # `gradle-packages.mkGradle` as we do below,
+  # and still have wrapGradle available if necessary.
+  inherit mkGradle wrapGradle;
+
   # NOTE: Default JDKs that are hardcoded below must be LTS versions
   # and respect the compatibility matrix at
   # https://docs.gradle.org/current/userguide/compatibility.html
 
-  gradle_9 = gen' {
+  gradle_9 = mkGradle {
     version = "9.1.0";
     hash = "sha256-oX3dhaJran9d23H/iwX8UQTAICxuZHgkKXkMkzaGyAY=";
     defaultJava = jdk21;
   };
-  gradle_8 = gen' {
+  gradle_8 = mkGradle {
     version = "8.14.3";
     hash = "sha256-vXEQIhNJMGCVbsIp2Ua+7lcVjb2J0OYrkbyg+ixfNTE=";
     defaultJava = jdk21;
     # Only enable this on *one* version to avoid duplicate PRs.
     enableUpdateScript = true;
   };
-  gradle_7 = gen' {
+  gradle_7 = mkGradle {
     version = "7.6.6";
     hash = "sha256-Zz2XdvMDvHBI/DMp0jLW6/EFGweJO9nRFhb62ahnO+A=";
     defaultJava = jdk17;

From 637ff94be0425de180a86b1f124f9ed912a318d6 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Sun, 2 Nov 2025 15:10:53 -0800
Subject: [PATCH 4892/6226] aliases: add gradleGen and wrapGradle

---
 pkgs/top-level/aliases.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ba2b7755c455..d2e24c4b6c43 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -675,6 +675,7 @@ mapAliases {
   graalvm-oracle = throw "'graalvm-oracle' has been renamed to/replaced by 'graalvmPackages.graalvm-oracle'"; # Converted to throw 2025-10-27
   graalvmCEPackages = throw "'graalvmCEPackages' has been renamed to/replaced by 'graalvmPackages'"; # Converted to throw 2025-10-27
   gradience = throw "`gradience` has been removed because it was archived upstream."; # Added 2025-09-20
+  gradleGen = throw "'gradleGen' has been moved to `gradle-packages.mkGradle`."; # Added 2025-11-02
   grafana_reporter = throw "'grafana_reporter' has been renamed to/replaced by 'grafana-reporter'"; # Converted to throw 2025-10-27
   graphite-kde-theme = throw "'graphite-kde-theme' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   gringo = throw "'gringo' has been renamed to/replaced by 'clingo'"; # Converted to throw 2025-10-27
@@ -1586,6 +1587,7 @@ mapAliases {
   worldengine-cli = throw "'worldengine-cli' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-04
   wpa_supplicant_ro_ssids = throw "'wpa_supplicant_ro_ssids' has been renamed to/replaced by 'wpa_supplicant'"; # Converted to throw 2025-10-27
   wrapGAppsHook = throw "'wrapGAppsHook' has been renamed to/replaced by 'wrapGAppsHook3'"; # Converted to throw 2025-10-27
+  wrapGradle = throw "'wrapGradle' has been removed; use `gradle-packages.wrapGradle` or `(gradle-packages.mkGradle { ... }).wrapped` instead"; # Added 2025-11-02
   write_stylus = throw "'write_stylus' has been renamed to/replaced by 'styluslabs-write-bin'"; # Converted to throw 2025-10-27
   wxGTK33 = wxwidgets_3_3; # Added 2025-07-20
   xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28

From ac324844a38b766f7d434aea815025ab678fa828 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 15:18:48 -0800
Subject: [PATCH 4893/6226] python3Packages.certipy-ad: relax dependency on
 dnspython

---
 pkgs/development/python-modules/certipy-ad/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/certipy-ad/default.nix b/pkgs/development/python-modules/certipy-ad/default.nix
index a384399b0d9e..671a40ed4ede 100644
--- a/pkgs/development/python-modules/certipy-ad/default.nix
+++ b/pkgs/development/python-modules/certipy-ad/default.nix
@@ -34,8 +34,9 @@ buildPythonPackage rec {
   pythonRelaxDeps = [
     "argcomplete"
     "cryptography"
-    "pycryptodome"
+    "dnspython"
     "ldap3"
+    "pycryptodome"
     "pyopenssl"
   ];
 

From da61fd19169ce364a6e088814e60128c254a04eb Mon Sep 17 00:00:00 2001
From: Mathew Polzin <mpolzin@workwithopal.com>
Date: Sun, 2 Nov 2025 10:39:15 -0600
Subject: [PATCH 4894/6226] idris2Packages.idris2Lsp: 2024-01-21 -> 2025-09-10

---
 pkgs/development/compilers/idris2/idris2-lsp.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/compilers/idris2/idris2-lsp.nix b/pkgs/development/compilers/idris2/idris2-lsp.nix
index 68f7084df45e..388bcb77b3a3 100644
--- a/pkgs/development/compilers/idris2/idris2-lsp.nix
+++ b/pkgs/development/compilers/idris2/idris2-lsp.nix
@@ -22,24 +22,24 @@ let
   inherit (idris2Packages) idris2Api;
   lspLib = idris2Packages.buildIdris {
     ipkgName = "lsp-lib";
-    version = "2024-01-21";
+    version = "2025-08-14";
     src = fetchFromGitHub {
       owner = "idris-community";
       repo = "LSP-lib";
-      rev = "03851daae0c0274a02d94663d8f53143a94640da";
-      hash = "sha256-ICW9oOOP70hXneJFYInuPY68SZTDw10dSxSPTW4WwWM=";
+      rev = "ca77e80a392b8cfeee3aaeb150069957699cdb82";
+      hash = "sha256-maXHx/OrflIdV7XPfDCRShUGZekLbLOSFQPHnL6DxnI=";
     };
     idrisLibraries = [ ];
   };
 
   lspPkg = idris2Packages.buildIdris {
     ipkgName = "idris2-lsp";
-    version = "2024-01-21";
+    version = "2025-09-10";
     src = fetchFromGitHub {
       owner = "idris-community";
       repo = "idris2-lsp";
-      rev = "a77ef2d563418925aa274fa29f06880dde43f4ec";
-      hash = "sha256-zjfVfkpiQS9AdmTfq0hYRSelJq5Caa9VGTuFLtSvl5o=";
+      rev = "81344545c134c8e7105ecf1fdd7a1caae6647035";
+      hash = "sha256-uYmg9Jd98RiO5SpRFox2xNAxY4nocPuK//zxuaIi/DM=";
     };
     idrisLibraries = [
       idris2Api

From 71b0bb479fdcaa5c72e0fddd362ada16d0abea61 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 3 Nov 2025 00:34:54 +0100
Subject: [PATCH 4895/6226] libreoffice: hide rhino behind withJava option

This should not meaningfully change the build without Java,
but it prevents eval from complaining about nonSource packages
related to rhino.
---
 pkgs/applications/office/libreoffice/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index c177eae425c6..1ef286791917 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -617,9 +617,6 @@ stdenv.mkDerivation (finalAttrs: {
     # cannot find headers, no idea why
     "--without-system-boost"
 
-    "--with-system-rhino"
-    "--with-rhino-jar=${rhino}/share/java/js.jar"
-
     "--without-system-java-websocket"
   ]
   ++ optionals kdeIntegration [
@@ -627,6 +624,9 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-qt6"
   ]
   ++ optionals withJava [
+    "--with-system-rhino"
+    "--with-rhino-jar=${rhino}/share/java/js.jar"
+
     "--with-system-beanshell"
     "--with-ant-home=${ant.home}"
     "--with-beanshell-jar=${bsh}"

From 14ccade9389abaf2fba60659d634ac201eabfaed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 23:43:25 +0000
Subject: [PATCH 4896/6226] python3Packages.typst: 0.13.7 -> 0.14.1

---
 pkgs/development/python-modules/typst/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/typst/default.nix b/pkgs/development/python-modules/typst/default.nix
index bbeed6182aea..8f820d103f02 100644
--- a/pkgs/development/python-modules/typst/default.nix
+++ b/pkgs/development/python-modules/typst/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "typst";
-  version = "0.13.7";
+  version = "0.14.1";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,12 +22,12 @@ buildPythonPackage rec {
     owner = "messense";
     repo = "typst-py";
     tag = "v${version}";
-    hash = "sha256-kbdYiWix1gDZPTkmjtrSRV/g60bLKxGbv776ezPaSCA=";
+    hash = "sha256-O6pjw0rVdpVn4PooKjI0deQ+upzL0E7uHTA6wUz40UY=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-IhTrGAgGgSPCD1d3pblCOME0AHv5GMV9xRUNSGTXEws=";
+    hash = "sha256-LHaAHoF/7znQ6WFJyxEFo7TRBtqAlPBuSCfOe6GhjQ0=";
   };
 
   build-system = [

From e285e89480cd7dd33d9bd56960c1a6153b1ed624 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Sun, 2 Nov 2025 23:49:02 +0000
Subject: [PATCH 4897/6226] terraform-providers.integrations_github: 6.7.4 ->
 6.7.5

---
 .../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 8506c9145fcd..0cfe831df4e4 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -741,11 +741,11 @@
     "vendorHash": null
   },
   "integrations_github": {
-    "hash": "sha256-W7VO2HVP9XMEs0KBTBsyhkLfuTaqrxLSyR54SGTemG0=",
+    "hash": "sha256-Xicv5L4DnSoIs4vCXDVawHzxKI7PzTfdBZ4+0jzg1uc=",
     "homepage": "https://registry.terraform.io/providers/integrations/github",
     "owner": "integrations",
     "repo": "terraform-provider-github",
-    "rev": "v6.7.4",
+    "rev": "v6.7.5",
     "spdx": "MIT",
     "vendorHash": null
   },

From e2f68babd6f1a1948ebbb4446584be971e292a14 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 2 Nov 2025 23:49:56 +0000
Subject: [PATCH 4898/6226] python3Packages.anndata: 0.12.2 -> 0.12.4

---
 pkgs/development/python-modules/anndata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/anndata/default.nix b/pkgs/development/python-modules/anndata/default.nix
index f42cbc100c70..ecbe0c49d412 100644
--- a/pkgs/development/python-modules/anndata/default.nix
+++ b/pkgs/development/python-modules/anndata/default.nix
@@ -32,14 +32,14 @@
 
 buildPythonPackage rec {
   pname = "anndata";
-  version = "0.12.2";
+  version = "0.12.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scverse";
     repo = "anndata";
     tag = version;
-    hash = "sha256-uGkeSlYcphRnIFfe9UcLvnupKeMzAIm5wT8fp3gmPKw=";
+    hash = "sha256-8tHM46wRr896JzZcWKBDy1QLrz/iwKE8YKfRby2Fmb8=";
   };
 
   build-system = [

From d4a15f921b805d13826fb723b560db29178781fb Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Mon, 3 Nov 2025 02:59:36 +0300
Subject: [PATCH 4899/6226] rusty-path-of-building: 0.2.6 -> 0.2.7

Also use icon that's now vendored in upstream repo.
---
 .../ru/rusty-path-of-building/package.nix     | 26 +++++--------------
 1 file changed, 7 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/ru/rusty-path-of-building/package.nix b/pkgs/by-name/ru/rusty-path-of-building/package.nix
index d25cf32ca346..4812537786fb 100644
--- a/pkgs/by-name/ru/rusty-path-of-building/package.nix
+++ b/pkgs/by-name/ru/rusty-path-of-building/package.nix
@@ -15,24 +15,18 @@
   wayland,
 }:
 
-let
-  icon = fetchurl {
-    url = "https://raw.githubusercontent.com/PathOfBuildingCommunity/PathOfBuilding-Launcher/9ee18657fa6597c42811152604da4e6b73fac342/PathOfBuilding.ico";
-    hash = "sha256-9EW4ld+xg7GLfd4dEY/xUCBMnKb3uu7LBq2Of3Gq1Y8=";
-  };
-in
 rustPlatform.buildRustPackage rec {
   pname = "rusty-path-of-building";
-  version = "0.2.6";
+  version = "0.2.7";
 
   src = fetchFromGitHub {
     owner = "meehl";
     repo = "rusty-path-of-building";
     rev = "v${version}";
-    hash = "sha256-U2OWNV8bUNXo8/Sro+gV/o3O/D1lMWVlbX3tCONmGOk=";
+    hash = "sha256-J/tTifOcbY1mfcNbQFN4Vdyl78O7vTVbfew3fcnVyTA=";
   };
 
-  cargoHash = "sha256-xB7nhCqUalGE0M762Zw7vVFKzz/TgnMU77xbEHorJ2U=";
+  cargoHash = "sha256-Oekl6SDIvgFIzPnve7nuib3fEjPGC46F/TNULmgOpew=";
 
   nativeBuildInputs = [
     pkg-config
@@ -62,13 +56,7 @@ rustPlatform.buildRustPackage rec {
   ];
 
   postInstall = ''
-    icotool -x ${icon}
-
-    for size in 16 32 48 256; do
-      mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps
-      install -Dm 644 *PathOfBuilding*"$size"x"$size"*.png \
-        $out/share/icons/hicolor/"$size"x"$size"/apps/pathofbuilding.png
-    done
+    install -Dm444 assets/icon.png $out/share/icons/hicolor/256x256/apps/path-of-building.png
   '';
 
   postFixup = ''
@@ -88,13 +76,13 @@ rustPlatform.buildRustPackage rec {
 
   desktopItems = [
     (makeDesktopItem {
-      name = "rusty-path-of-building";
+      name = "rusty-path-of-building-1";
       desktopName = "Path of Building";
       comment = "Offline build planner for Path of Exile";
       exec = "rusty-path-of-building poe1";
       terminal = false;
       type = "Application";
-      icon = "pathofbuilding";
+      icon = "path-of-building";
       categories = [ "Game" ];
       keywords = [
         "poe"
@@ -111,7 +99,7 @@ rustPlatform.buildRustPackage rec {
       exec = "rusty-path-of-building poe2";
       terminal = false;
       type = "Application";
-      icon = "pathofbuilding";
+      icon = "path-of-building";
       categories = [ "Game" ];
       keywords = [
         "poe"

From 3a24c5af86874bb7137c74c0a940e41d6cc01899 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 00:02:14 +0000
Subject: [PATCH 4900/6226] libretro.bluemsx: 0-unstable-2025-10-24 ->
 0-unstable-2025-11-01

---
 pkgs/applications/emulators/libretro/cores/bluemsx.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/bluemsx.nix b/pkgs/applications/emulators/libretro/cores/bluemsx.nix
index 39b99eb8e1de..db0bd46bd5c0 100644
--- a/pkgs/applications/emulators/libretro/cores/bluemsx.nix
+++ b/pkgs/applications/emulators/libretro/cores/bluemsx.nix
@@ -5,13 +5,13 @@
 }:
 mkLibretroCore {
   core = "bluemsx";
-  version = "0-unstable-2025-10-24";
+  version = "0-unstable-2025-11-01";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "bluemsx-libretro";
-    rev = "3a2855e30c7f39a41064ca36264e9bf9f6170f8e";
-    hash = "sha256-k0j15MqmgaTrUc/FoZHuIyALCnMJXeSkx4dfnfrfG5o=";
+    rev = "1f8aeb9ac3f3a4202736ac22e1785f01a834b975";
+    hash = "sha256-VnTL7MLhB/WEHm9930OvM84I5Vp4AaAI6qh7I4QRkVw=";
   };
 
   meta = {

From f84ff9aeb46f6693d12485a0425c68bd143cbb1a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 00:05:06 +0000
Subject: [PATCH 4901/6226] google-cloud-sql-proxy: 2.18.3 -> 2.19.0

---
 pkgs/by-name/go/google-cloud-sql-proxy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
index 8fd3e16d27c3..5b4c3daf73c2 100644
--- a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
+++ b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule rec {
   pname = "google-cloud-sql-proxy";
-  version = "2.18.3";
+  version = "2.19.0";
 
   src = fetchFromGitHub {
     owner = "GoogleCloudPlatform";
     repo = "cloud-sql-proxy";
     rev = "v${version}";
-    hash = "sha256-Lwg6p7qVFMH3rXxGT6lc5My9WovhpDzb4S5b/4ECcgg=";
+    hash = "sha256-LF9ALCBgO2cIVLRTH0KxdmsIhfnnCO4akmoGS3kIWm0=";
   };
 
   subPackages = [ "." ];
 
-  vendorHash = "sha256-gZFzRUy/OWNppFAi+1fAHNBYZgmDgjKUc9kyCSWF58g=";
+  vendorHash = "sha256-RtWTVb1JWNgVM3NZf28CMKIgPjGIgZztYYULqTM7nQg=";
 
   checkFlags = [
     "-short"

From 1c34e2b59320de55f9a68b3b36e44628f7b45e5c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 00:24:14 +0000
Subject: [PATCH 4902/6226] files-cli: 2.15.126 -> 2.15.131

---
 pkgs/by-name/fi/files-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix
index f673af2539e1..9f8f148a0878 100644
--- a/pkgs/by-name/fi/files-cli/package.nix
+++ b/pkgs/by-name/fi/files-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "files-cli";
-  version = "2.15.126";
+  version = "2.15.131";
 
   src = fetchFromGitHub {
     repo = "files-cli";
     owner = "files-com";
     rev = "v${version}";
-    hash = "sha256-eZK3boCydiecyrdAaDaMiNQH5vqPR2itWG6qRd2S1Bc=";
+    hash = "sha256-G2GnYYcY2CQLwlbcnykC50ajrSQlKoGYUoRY6hHD8Bo=";
   };
 
-  vendorHash = "sha256-4HIu3KraynnBe5Vn74PFIlvWUvT/yk5hfwGiOiRnKgM=";
+  vendorHash = "sha256-c5bRlz4i8/7esBCmfbQxbGd8d+yvl5Y9BSZL8nV0Sfw=";
 
   ldflags = [
     "-s"

From 53279b42b069cee1418b3aaa13dcb3332b5e63df Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 00:30:23 +0000
Subject: [PATCH 4903/6226] python3Packages.internetarchive: 5.7.0 -> 5.7.1

---
 pkgs/development/python-modules/internetarchive/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/internetarchive/default.nix b/pkgs/development/python-modules/internetarchive/default.nix
index bb4056a524df..0d5fb116b2a5 100644
--- a/pkgs/development/python-modules/internetarchive/default.nix
+++ b/pkgs/development/python-modules/internetarchive/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "internetarchive";
-  version = "5.7.0";
+  version = "5.7.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "jjjake";
     repo = "internetarchive";
     tag = "v${version}";
-    hash = "sha256-3llzEZFMtyAUemNZ1QH+uYezGf0tioNyTXzLiml7Ric=";
+    hash = "sha256-SNzscVFFuvRyG976lWtktPobcIvfQgk4tAQ8+NXu4yw=";
   };
 
   build-system = [ setuptools ];

From fdfc06db0cdc1d9ec86e6aa658b02992118cf473 Mon Sep 17 00:00:00 2001
From: Trim Bresilla <trim.bresilla@gmail.com>
Date: Mon, 3 Nov 2025 01:35:18 +0100
Subject: [PATCH 4904/6226] rerun: add C++ SDK support, build librerun_c from
 source

This commit adds C++ SDK support to the rerun package by:

- Building librerun_c.a library from Rust source (crates/top/rerun_c)
  instead of using prebuilt binaries
- Installing C++ headers to the dev output
- Installing CMake configuration files for integration
- Propagating arrow-cpp as a build dependency

This enables C++ developers to use Rerun without GLIBC compatibility
issues from prebuilt binaries. The library is now compiled fresh during
each build with the system's toolchain.

Package now provides:
- out: rerun CLI binary + librerun_c.a (48MB, built from source)
- dev: C++ headers + CMake config files
---
 pkgs/by-name/re/rerun/package.nix | 32 +++++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/rerun/package.nix b/pkgs/by-name/re/rerun/package.nix
index c87f367d0a3e..f74f05fd1ba4 100644
--- a/pkgs/by-name/re/rerun/package.nix
+++ b/pkgs/by-name/re/rerun/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
+  arrow-cpp,
   # nativeBuildInputs
   binaryen,
   lld,
@@ -36,6 +37,11 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "rerun";
   version = "0.26.2";
 
+  outputs = [
+    "out"
+    "dev"
+  ];
+
   src = fetchFromGitHub {
     owner = "rerun-io";
     repo = "rerun";
@@ -51,7 +57,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-EH/R+OgLeLNrZnkIGqutTo4K9XzhW+CGwG/uQKwWGXA=";
 
-  cargoBuildFlags = [ "--package rerun-cli" ];
+  cargoBuildFlags = [
+    "--package rerun-cli"
+    "--package rerun_c"
+  ];
   cargoTestFlags = [ "--package rerun-cli" ];
   buildNoDefaultFeatures = true;
   buildFeatures = [
@@ -128,6 +137,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ]
   ++ lib.optionals stdenv.hostPlatform.isLinux [ (lib.getLib wayland) ];
 
+  propagatedBuildInputs = [ arrow-cpp ];
+
   addDlopenRunpaths = map (p: "${lib.getLib p}/lib") (
     lib.optionals stdenv.hostPlatform.isLinux [
       libxkbcommon
@@ -155,6 +166,23 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   postPhases = lib.optionals stdenv.hostPlatform.isLinux [ "addDlopenRunpathsPhase" ];
 
+  postInstall = ''
+    # Install C++ SDK components
+    mkdir -p $dev/include
+    cp -r $src/rerun_cpp/src/* $dev/include/
+
+    # Install rerun_c library (built from Rust)
+    if [ -f "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/librerun_c.a" ]; then
+      cp "target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/librerun_c.a" $out/lib/
+    fi
+
+    # Install CMake config files
+    mkdir -p $dev/lib/cmake/rerun_sdk
+    cp $src/rerun_cpp/CMakeLists.txt $dev/lib/cmake/rerun_sdk/
+    cp $src/rerun_cpp/Config.cmake.in $dev/lib/cmake/rerun_sdk/
+    cp $src/rerun_cpp/download_and_build_arrow.cmake $dev/lib/cmake/rerun_sdk/
+  '';
+
   nativeInstallCheckInputs = [
     versionCheckHook
   ];
@@ -169,7 +197,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   };
 
   meta = {
-    description = "Visualize streams of multimodal data. Fast, easy to use, and simple to integrate.  Built in Rust using egui";
+    description = "Visualize streams of multimodal data. Fast, easy to use, and simple to integrate. Built in Rust using egui. Includes C++ SDK";
     homepage = "https://github.com/rerun-io/rerun";
     changelog = "https://github.com/rerun-io/rerun/blob/${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [

From 63c98b9ea26e4928f7ca37e540135227016d6880 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 00:52:40 +0000
Subject: [PATCH 4905/6226] ravedude: 0.2.1 -> 0.2.2

---
 pkgs/by-name/ra/ravedude/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ra/ravedude/package.nix b/pkgs/by-name/ra/ravedude/package.nix
index 8248e7be72c1..3a19616ec8cd 100644
--- a/pkgs/by-name/ra/ravedude/package.nix
+++ b/pkgs/by-name/ra/ravedude/package.nix
@@ -13,14 +13,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "ravedude";
-  version = "0.2.1";
+  version = "0.2.2";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-LYHWUVREnGNR/vqtj+VklV3o74KUJu+Yi8ftulCJt9s=";
+    hash = "sha256-Ar2oQx7dKKfzkM3FMcJXiPHxNa0KcMRht38q+NgowfU=";
   };
 
-  cargoHash = "sha256-rD8rFs3zfWjQXm3mLvY2tpVS6X8wHJka2qs4D3/pa4E=";
+  cargoHash = "sha256-ME9egPOMTv/nEsmuxI+gJ6Tqa1Vqc/enlPttHXfTdBg=";
 
   nativeBuildInputs = [
     pkg-config

From d69f435a774ab7381fb51c0717843b00f386c14e Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 16:59:01 -0800
Subject: [PATCH 4906/6226] python3Packages.torf: cleanup

---
 pkgs/development/python-modules/torf/default.nix | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/torf/default.nix b/pkgs/development/python-modules/torf/default.nix
index 6d4a9c159201..2ae49857288b 100644
--- a/pkgs/development/python-modules/torf/default.nix
+++ b/pkgs/development/python-modules/torf/default.nix
@@ -2,13 +2,19 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   flatbencode,
+
+  # test
   pytest-cov-stub,
   pytest-httpserver,
   pytest-mock,
   pytest-xdist,
   pytestCheckHook,
-  setuptools,
 }:
 
 buildPythonPackage rec {
@@ -48,10 +54,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "torf" ];
 
-  meta = with lib; {
+  meta = {
     description = "Create, parse and edit torrent files and magnet links";
     homepage = "https://github.com/rndusr/torf";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ ambroisie ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ ambroisie ];
   };
 }

From f266dedd51ce0541da00070ab4a8ab7a4b946953 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 01:02:05 +0000
Subject: [PATCH 4907/6226] nb: 7.22.1 -> 7.23.0

---
 pkgs/by-name/nb/nb/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nb/nb/package.nix b/pkgs/by-name/nb/nb/package.nix
index b8ad06aba369..cf69d9776b35 100644
--- a/pkgs/by-name/nb/nb/package.nix
+++ b/pkgs/by-name/nb/nb/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "nb";
-  version = "7.22.1";
+  version = "7.23.0";
 
   src = fetchFromGitHub {
     owner = "xwmx";
     repo = "nb";
     rev = version;
-    hash = "sha256-WYOU4ybcuZa45P68r6NlhMYii1YUvCTmYicpVuGg7BM=";
+    hash = "sha256-n94ZEQtkTXItZ3T6T3W181IH3wU8xWznGqsizTdu4a8=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 6b79217b1717739329f39d98db86dfd4080601ae Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Mon, 3 Nov 2025 02:13:44 +0100
Subject: [PATCH 4908/6226] drawing: fix double wrapping

---
 pkgs/by-name/dr/drawing/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/dr/drawing/package.nix b/pkgs/by-name/dr/drawing/package.nix
index 86e6b711add7..c42420618191 100644
--- a/pkgs/by-name/dr/drawing/package.nix
+++ b/pkgs/by-name/dr/drawing/package.nix
@@ -60,6 +60,13 @@ python3.pkgs.buildPythonApplication rec {
     patchShebangs build-aux/meson/postinstall.py
   '';
 
+  # Prevent double wrapping because of wrapGAppsHook3
+  dontWrapGApps = true;
+
+  preFixup = ''
+    makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+  '';
+
   strictDeps = false;
 
   meta = {

From eb833639c8973f13da3d8619a385a0819657a455 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 26 Oct 2025 13:12:31 -0400
Subject: [PATCH 4909/6226] treewide: drop figsoda as maintainer (part 1)

s/maintainers = with lib.maintainers; [ figsoda ];/maintainers = with lib.maintainers; [ ];/
---
 nixos/modules/programs/git.nix                      | 2 +-
 nixos/modules/programs/sniffnet.nix                 | 2 +-
 nixos/modules/programs/trippy.nix                   | 2 +-
 pkgs/applications/video/mpv/scripts/thumbnail.nix   | 2 +-
 pkgs/by-name/ab/abbreviate/package.nix              | 2 +-
 pkgs/by-name/ai/ain/package.nix                     | 2 +-
 pkgs/by-name/ar/argc/package.nix                    | 2 +-
 pkgs/by-name/ar/artem/package.nix                   | 2 +-
 pkgs/by-name/as/askalono/package.nix                | 2 +-
 pkgs/by-name/br/browsr/package.nix                  | 2 +-
 pkgs/by-name/ca/cargo-binstall/package.nix          | 2 +-
 pkgs/by-name/ca/cargo-hack/package.nix              | 2 +-
 pkgs/by-name/ca/cargo-zigbuild/package.nix          | 2 +-
 pkgs/by-name/ch/checkpwn/package.nix                | 2 +-
 pkgs/by-name/ch/cherrybomb/package.nix              | 2 +-
 pkgs/by-name/co/codemov/package.nix                 | 2 +-
 pkgs/by-name/co/confetty/package.nix                | 2 +-
 pkgs/by-name/cr/crabz/package.nix                   | 2 +-
 pkgs/by-name/do/doctave/package.nix                 | 2 +-
 pkgs/by-name/du/dum/package.nix                     | 2 +-
 pkgs/by-name/em/emmet-ls/package.nix                | 2 +-
 pkgs/by-name/ep/epick/package.nix                   | 2 +-
 pkgs/by-name/eu/eureka-ideas/package.nix            | 2 +-
 pkgs/by-name/fa/faketty/package.nix                 | 2 +-
 pkgs/by-name/fc/fcp/package.nix                     | 2 +-
 pkgs/by-name/fe/felix-fm/package.nix                | 2 +-
 pkgs/by-name/fr/frawk/package.nix                   | 2 +-
 pkgs/by-name/fx/fx/package.nix                      | 2 +-
 pkgs/by-name/ge/genact/package.nix                  | 2 +-
 pkgs/by-name/gi/gifski/package.nix                  | 2 +-
 pkgs/by-name/gi/git-mit/package.nix                 | 2 +-
 pkgs/by-name/gl/glitter/package.nix                 | 2 +-
 pkgs/by-name/go/gobang/package.nix                  | 2 +-
 pkgs/by-name/ha/halp/package.nix                    | 2 +-
 pkgs/by-name/ha/hayagriva/package.nix               | 2 +-
 pkgs/by-name/hm/hmm/package.nix                     | 2 +-
 pkgs/by-name/ho/hors/package.nix                    | 2 +-
 pkgs/by-name/ht/httplz/package.nix                  | 2 +-
 pkgs/by-name/in/inferno/package.nix                 | 2 +-
 pkgs/by-name/iw/iwgtk/package.nix                   | 2 +-
 pkgs/by-name/ju/jumpy/package.nix                   | 2 +-
 pkgs/by-name/ke/keyscope/package.nix                | 2 +-
 pkgs/by-name/le/lemmy-help/package.nix              | 2 +-
 pkgs/by-name/li/linuxwave/package.nix               | 2 +-
 pkgs/by-name/me/menyoki/package.nix                 | 2 +-
 pkgs/by-name/mi/minizign/package.nix                | 2 +-
 pkgs/by-name/mm/mmtc/package.nix                    | 2 +-
 pkgs/by-name/mu/muffet/package.nix                  | 2 +-
 pkgs/by-name/ni/nix-init/package.nix                | 2 +-
 pkgs/by-name/ni/nixpkgs-hammering/package.nix       | 2 +-
 pkgs/by-name/nu/nurl/package.nix                    | 2 +-
 pkgs/by-name/oh/oha/package.nix                     | 2 +-
 pkgs/by-name/ox/oxlint/package.nix                  | 2 +-
 pkgs/by-name/pa/pactorio/package.nix                | 2 +-
 pkgs/by-name/pa/patsh/package.nix                   | 2 +-
 pkgs/by-name/pi/piping-server-rust/package.nix      | 2 +-
 pkgs/by-name/pk/pkgtop/package.nix                  | 2 +-
 pkgs/by-name/pl/planus/package.nix                  | 2 +-
 pkgs/by-name/po/pods/package.nix                    | 2 +-
 pkgs/by-name/po/poethepoet/package.nix              | 2 +-
 pkgs/by-name/po/pomsky/package.nix                  | 2 +-
 pkgs/by-name/pr/protox/package.nix                  | 2 +-
 pkgs/by-name/py/python-launcher/package.nix         | 2 +-
 pkgs/by-name/re/rewrk/package.nix                   | 2 +-
 pkgs/by-name/ri/riff/package.nix                    | 2 +-
 pkgs/by-name/rn/rnr/package.nix                     | 2 +-
 pkgs/by-name/rs/rsass/package.nix                   | 2 +-
 pkgs/by-name/rs/rsonpath/package.nix                | 2 +-
 pkgs/by-name/ru/rune-languageserver/package.nix     | 2 +-
 pkgs/by-name/ru/rune/package.nix                    | 2 +-
 pkgs/by-name/ru/runme/package.nix                   | 2 +-
 pkgs/by-name/ru/rust-motd/package.nix               | 2 +-
 pkgs/by-name/ru/rust-script/package.nix             | 2 +-
 pkgs/by-name/ru/rustscan/package.nix                | 2 +-
 pkgs/by-name/ru/rustycli/package.nix                | 2 +-
 pkgs/by-name/sa/sagoin/package.nix                  | 2 +-
 pkgs/by-name/sa/samply/package.nix                  | 2 +-
 pkgs/by-name/sc/scraper/package.nix                 | 2 +-
 pkgs/by-name/se/selene/package.nix                  | 2 +-
 pkgs/by-name/si/sic-image-cli/package.nix           | 2 +-
 pkgs/by-name/sn/sniffnet/package.nix                | 2 +-
 pkgs/by-name/sn/snixembed/package.nix               | 2 +-
 pkgs/by-name/st/starlark-rust/package.nix           | 2 +-
 pkgs/by-name/st/stylua/package.nix                  | 2 +-
 pkgs/by-name/te/teip/package.nix                    | 2 +-
 pkgs/by-name/te/termimage/package.nix               | 2 +-
 pkgs/by-name/ti/tidy-viewer/package.nix             | 2 +-
 pkgs/by-name/tm/tml/package.nix                     | 2 +-
 pkgs/by-name/tv/tv/package.nix                      | 2 +-
 pkgs/by-name/ty/typeshare/package.nix               | 2 +-
 pkgs/by-name/ze/zet/package.nix                     | 2 +-
 pkgs/by-name/zp/zps/package.nix                     | 2 +-
 pkgs/by-name/zt/ztags/package.nix                   | 2 +-
 pkgs/by-name/zx/zxpy/package.nix                    | 2 +-
 pkgs/development/lua-modules/generated-packages.nix | 2 +-
 pkgs/development/python-modules/pynvim/default.nix  | 2 +-
 96 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/nixos/modules/programs/git.nix b/nixos/modules/programs/git.nix
index f9da88376ee9..e247ff1a7a33 100644
--- a/nixos/modules/programs/git.nix
+++ b/nixos/modules/programs/git.nix
@@ -115,5 +115,5 @@ in
     })
   ];
 
-  meta.maintainers = with lib.maintainers; [ figsoda ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/modules/programs/sniffnet.nix b/nixos/modules/programs/sniffnet.nix
index 36c298b84e72..91d56871dac6 100644
--- a/nixos/modules/programs/sniffnet.nix
+++ b/nixos/modules/programs/sniffnet.nix
@@ -25,5 +25,5 @@ in
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ figsoda ];
+  meta.maintainers = [ ];
 }
diff --git a/nixos/modules/programs/trippy.nix b/nixos/modules/programs/trippy.nix
index 6b906cb58f52..0de14f44cb22 100644
--- a/nixos/modules/programs/trippy.nix
+++ b/nixos/modules/programs/trippy.nix
@@ -25,5 +25,5 @@ in
     };
   };
 
-  meta.maintainers = with lib.maintainers; [ figsoda ];
+  meta.maintainers = [ ];
 }
diff --git a/pkgs/applications/video/mpv/scripts/thumbnail.nix b/pkgs/applications/video/mpv/scripts/thumbnail.nix
index f789a4553da5..a3ed87ee74a2 100644
--- a/pkgs/applications/video/mpv/scripts/thumbnail.nix
+++ b/pkgs/applications/video/mpv/scripts/thumbnail.nix
@@ -32,6 +32,6 @@ buildLua rec {
     changelog = "https://github.com/marzzzello/mpv_thumbnail_script/releases/tag/${version}";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.all;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ab/abbreviate/package.nix b/pkgs/by-name/ab/abbreviate/package.nix
index 779f6bb0cde9..cb9c397c1db4 100644
--- a/pkgs/by-name/ab/abbreviate/package.nix
+++ b/pkgs/by-name/ab/abbreviate/package.nix
@@ -41,6 +41,6 @@ buildGoModule rec {
     homepage = "https://github.com/dnnrly/abbreviate";
     changelog = "https://github.com/dnnrly/abbreviate/releases/tag/${src.rev}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ai/ain/package.nix b/pkgs/by-name/ai/ain/package.nix
index 22b8ca8b173e..ef36ab1eecc5 100644
--- a/pkgs/by-name/ai/ain/package.nix
+++ b/pkgs/by-name/ai/ain/package.nix
@@ -31,7 +31,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/jonaslu/ain";
     changelog = "https://github.com/jonaslu/ain/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "ain";
   };
 })
diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix
index 5492ae34eab8..40e50b6b8176 100644
--- a/pkgs/by-name/ar/argc/package.nix
+++ b/pkgs/by-name/ar/argc/package.nix
@@ -69,6 +69,6 @@ rustPlatform.buildRustPackage rec {
       # or
       asl20
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ar/artem/package.nix b/pkgs/by-name/ar/artem/package.nix
index 12998fe7e581..d866c43f04df 100644
--- a/pkgs/by-name/ar/artem/package.nix
+++ b/pkgs/by-name/ar/artem/package.nix
@@ -42,7 +42,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/finefindus/artem";
     changelog = "https://github.com/finefindus/artem/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "artem";
   };
 }
diff --git a/pkgs/by-name/as/askalono/package.nix b/pkgs/by-name/as/askalono/package.nix
index 98d73845c109..dc23859eb1ee 100644
--- a/pkgs/by-name/as/askalono/package.nix
+++ b/pkgs/by-name/as/askalono/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/jpeddicord/askalono";
     changelog = "https://github.com/jpeddicord/askalono/blob/${version}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "askalono";
   };
 }
diff --git a/pkgs/by-name/br/browsr/package.nix b/pkgs/by-name/br/browsr/package.nix
index 15a8007156e6..6a1ab78df485 100644
--- a/pkgs/by-name/br/browsr/package.nix
+++ b/pkgs/by-name/br/browsr/package.nix
@@ -97,6 +97,6 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://juftin.com/browsr";
     changelog = "https://github.com/juftin/browsr/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix
index b7e8dbaa5f5d..c894974e9a07 100644
--- a/pkgs/by-name/ca/cargo-binstall/package.nix
+++ b/pkgs/by-name/ca/cargo-binstall/package.nix
@@ -68,6 +68,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/cargo-bins/cargo-binstall";
     changelog = "https://github.com/cargo-bins/cargo-binstall/releases/tag/v${version}";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-hack/package.nix b/pkgs/by-name/ca/cargo-hack/package.nix
index 34f41e4ae16c..d77072ad3783 100644
--- a/pkgs/by-name/ca/cargo-hack/package.nix
+++ b/pkgs/by-name/ca/cargo-hack/package.nix
@@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec {
       asl20 # or
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-zigbuild/package.nix b/pkgs/by-name/ca/cargo-zigbuild/package.nix
index 7d6d71cf46cd..f5f7927f82ee 100644
--- a/pkgs/by-name/ca/cargo-zigbuild/package.nix
+++ b/pkgs/by-name/ca/cargo-zigbuild/package.nix
@@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/messense/cargo-zigbuild";
     changelog = "https://github.com/messense/cargo-zigbuild/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ch/checkpwn/package.nix b/pkgs/by-name/ch/checkpwn/package.nix
index eb67c1d1b27a..e1d0989d0997 100644
--- a/pkgs/by-name/ch/checkpwn/package.nix
+++ b/pkgs/by-name/ch/checkpwn/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/brycx/checkpwn";
     changelog = "https://github.com/brycx/checkpwn/releases/tag/${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "checkpwn";
   };
 }
diff --git a/pkgs/by-name/ch/cherrybomb/package.nix b/pkgs/by-name/ch/cherrybomb/package.nix
index 34bbe713dc0e..b4d993e7bb48 100644
--- a/pkgs/by-name/ch/cherrybomb/package.nix
+++ b/pkgs/by-name/ch/cherrybomb/package.nix
@@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/blst-security/cherrybomb";
     changelog = "https://github.com/blst-security/cherrybomb/releases/tag/v${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/co/codemov/package.nix b/pkgs/by-name/co/codemov/package.nix
index f4321e49c307..667f41b45ed0 100644
--- a/pkgs/by-name/co/codemov/package.nix
+++ b/pkgs/by-name/co/codemov/package.nix
@@ -55,7 +55,7 @@ rustPlatform.buildRustPackage {
     description = "Create a video of how a git repository's code changes over time";
     homepage = "https://github.com/sloganking/codemov";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "codemov";
   };
 }
diff --git a/pkgs/by-name/co/confetty/package.nix b/pkgs/by-name/co/confetty/package.nix
index e70c90bdfc2c..f73697100581 100644
--- a/pkgs/by-name/co/confetty/package.nix
+++ b/pkgs/by-name/co/confetty/package.nix
@@ -26,7 +26,7 @@ buildGoModule {
     description = "Confetti in your TTY";
     homepage = "https://github.com/maaslalani/confetty";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "confetty";
   };
 }
diff --git a/pkgs/by-name/cr/crabz/package.nix b/pkgs/by-name/cr/crabz/package.nix
index dd7fe1b8c09a..de5433a94109 100644
--- a/pkgs/by-name/cr/crabz/package.nix
+++ b/pkgs/by-name/cr/crabz/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
       unlicense # or
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "crabz";
   };
 }
diff --git a/pkgs/by-name/do/doctave/package.nix b/pkgs/by-name/do/doctave/package.nix
index 9828b2ec5918..8e78e0fba4a2 100644
--- a/pkgs/by-name/do/doctave/package.nix
+++ b/pkgs/by-name/do/doctave/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/doctave/doctave";
     changelog = "https://github.com/doctave/doctave/blob/${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "doctave";
   };
 }
diff --git a/pkgs/by-name/du/dum/package.nix b/pkgs/by-name/du/dum/package.nix
index 2f1eeb147914..75b8063f3412 100644
--- a/pkgs/by-name/du/dum/package.nix
+++ b/pkgs/by-name/du/dum/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/egoist/dum";
     changelog = "https://github.com/egoist/dum/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/em/emmet-ls/package.nix b/pkgs/by-name/em/emmet-ls/package.nix
index 8bda81c23310..85ba65d23fba 100644
--- a/pkgs/by-name/em/emmet-ls/package.nix
+++ b/pkgs/by-name/em/emmet-ls/package.nix
@@ -32,7 +32,7 @@ buildNpmPackage rec {
     homepage = "https://github.com/aca/emmet-ls";
     changelog = "https://github.com/aca/emmet-ls/releases/tag/${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "emmet-ls";
   };
 }
diff --git a/pkgs/by-name/ep/epick/package.nix b/pkgs/by-name/ep/epick/package.nix
index 2d85f9a8b7ae..abc25b068154 100644
--- a/pkgs/by-name/ep/epick/package.nix
+++ b/pkgs/by-name/ep/epick/package.nix
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/vv9k/epick";
     changelog = "https://github.com/vv9k/epick/blob/${version}/CHANGELOG.md";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "epick";
   };
 }
diff --git a/pkgs/by-name/eu/eureka-ideas/package.nix b/pkgs/by-name/eu/eureka-ideas/package.nix
index cabe43ba49f4..36f0fa92b93a 100644
--- a/pkgs/by-name/eu/eureka-ideas/package.nix
+++ b/pkgs/by-name/eu/eureka-ideas/package.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/simeg/eureka";
     changelog = "https://github.com/simeg/eureka/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "eureka";
   };
 }
diff --git a/pkgs/by-name/fa/faketty/package.nix b/pkgs/by-name/fa/faketty/package.nix
index efde2cdb8efc..90bc0e38d8c3 100644
--- a/pkgs/by-name/fa/faketty/package.nix
+++ b/pkgs/by-name/fa/faketty/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
       asl20 # or
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "faketty";
   };
 }
diff --git a/pkgs/by-name/fc/fcp/package.nix b/pkgs/by-name/fc/fcp/package.nix
index 27f11e12aa16..5cfc14a9b027 100644
--- a/pkgs/by-name/fc/fcp/package.nix
+++ b/pkgs/by-name/fc/fcp/package.nix
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/svetlitski/fcp/releases/tag/v${version}";
     license = lib.licenses.bsd3;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "fcp";
   };
 }
diff --git a/pkgs/by-name/fe/felix-fm/package.nix b/pkgs/by-name/fe/felix-fm/package.nix
index 7311aae5ea21..45d9db1e00a6 100644
--- a/pkgs/by-name/fe/felix-fm/package.nix
+++ b/pkgs/by-name/fe/felix-fm/package.nix
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/kyoheiu/felix";
     changelog = "https://github.com/kyoheiu/felix/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "fx";
   };
 }
diff --git a/pkgs/by-name/fr/frawk/package.nix b/pkgs/by-name/fr/frawk/package.nix
index 54fd2937e012..f5d9a4f51a08 100644
--- a/pkgs/by-name/fr/frawk/package.nix
+++ b/pkgs/by-name/fr/frawk/package.nix
@@ -51,6 +51,6 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/fx/fx/package.nix b/pkgs/by-name/fx/fx/package.nix
index b36b7d208437..8dcc65af790c 100644
--- a/pkgs/by-name/fx/fx/package.nix
+++ b/pkgs/by-name/fx/fx/package.nix
@@ -36,6 +36,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/antonmedv/fx";
     license = lib.licenses.mit;
     mainProgram = "fx";
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/ge/genact/package.nix b/pkgs/by-name/ge/genact/package.nix
index 7b867f193ceb..bd365a949579 100644
--- a/pkgs/by-name/ge/genact/package.nix
+++ b/pkgs/by-name/ge/genact/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/svenstaro/genact";
     changelog = "https://github.com/svenstaro/genact/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "genact";
   };
 }
diff --git a/pkgs/by-name/gi/gifski/package.nix b/pkgs/by-name/gi/gifski/package.nix
index 807249396e4a..22e48a069f97 100644
--- a/pkgs/by-name/gi/gifski/package.nix
+++ b/pkgs/by-name/gi/gifski/package.nix
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://gif.ski/";
     changelog = "https://github.com/ImageOptim/gifski/releases/tag/${src.rev}";
     license = lib.licenses.agpl3Plus;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "gifski";
   };
 }
diff --git a/pkgs/by-name/gi/git-mit/package.nix b/pkgs/by-name/gi/git-mit/package.nix
index 01df96b74045..d4785244e483 100644
--- a/pkgs/by-name/gi/git-mit/package.nix
+++ b/pkgs/by-name/gi/git-mit/package.nix
@@ -47,6 +47,6 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/PurpleBooth/git-mit";
     changelog = "https://github.com/PurpleBooth/git-mit/releases/tag/v${version}";
     license = lib.licenses.cc0;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/gl/glitter/package.nix b/pkgs/by-name/gl/glitter/package.nix
index df93a780f517..1e22d686effe 100644
--- a/pkgs/by-name/gl/glitter/package.nix
+++ b/pkgs/by-name/gl/glitter/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/milo123459/glitter";
     changelog = "https://github.com/Milo123459/glitter/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "glitter";
   };
 }
diff --git a/pkgs/by-name/go/gobang/package.nix b/pkgs/by-name/go/gobang/package.nix
index 13f38313fd36..050575366276 100644
--- a/pkgs/by-name/go/gobang/package.nix
+++ b/pkgs/by-name/go/gobang/package.nix
@@ -25,6 +25,6 @@ rustPlatform.buildRustPackage {
     description = "Cross-platform TUI database management tool written in Rust";
     homepage = "https://github.com/tako8ki/gobang";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ha/halp/package.nix b/pkgs/by-name/ha/halp/package.nix
index c339cdaffd9f..72e963e1a984 100644
--- a/pkgs/by-name/ha/halp/package.nix
+++ b/pkgs/by-name/ha/halp/package.nix
@@ -72,7 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       asl20
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "halp";
   };
 })
diff --git a/pkgs/by-name/ha/hayagriva/package.nix b/pkgs/by-name/ha/hayagriva/package.nix
index 3a7bad181bcf..8c80544781ff 100644
--- a/pkgs/by-name/ha/hayagriva/package.nix
+++ b/pkgs/by-name/ha/hayagriva/package.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "hayagriva";
   };
 }
diff --git a/pkgs/by-name/hm/hmm/package.nix b/pkgs/by-name/hm/hmm/package.nix
index 4ea87fb7cab8..ad620d1500de 100644
--- a/pkgs/by-name/hm/hmm/package.nix
+++ b/pkgs/by-name/hm/hmm/package.nix
@@ -31,6 +31,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/samwho/hmm";
     changelog = "https://github.com/samwho/hmm/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ho/hors/package.nix b/pkgs/by-name/ho/hors/package.nix
index d5468d6cbf82..e1ceeb7ad6d3 100644
--- a/pkgs/by-name/ho/hors/package.nix
+++ b/pkgs/by-name/ho/hors/package.nix
@@ -26,6 +26,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/windsoilder/hors";
     changelog = "https://github.com/WindSoilder/hors/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ht/httplz/package.nix b/pkgs/by-name/ht/httplz/package.nix
index 623acd17a275..ec9a253369c4 100644
--- a/pkgs/by-name/ht/httplz/package.nix
+++ b/pkgs/by-name/ht/httplz/package.nix
@@ -49,6 +49,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/thecoshman/http";
     changelog = "https://github.com/thecoshman/http/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/in/inferno/package.nix b/pkgs/by-name/in/inferno/package.nix
index 0365f5a7a60f..8dec3cfe2da2 100644
--- a/pkgs/by-name/in/inferno/package.nix
+++ b/pkgs/by-name/in/inferno/package.nix
@@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/jonhoo/inferno";
     changelog = "https://github.com/jonhoo/inferno/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.cddl;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/iw/iwgtk/package.nix b/pkgs/by-name/iw/iwgtk/package.nix
index 537d4af0c72a..62e513b1f264 100644
--- a/pkgs/by-name/iw/iwgtk/package.nix
+++ b/pkgs/by-name/iw/iwgtk/package.nix
@@ -47,7 +47,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/j-lentz/iwgtk";
     changelog = "https://github.com/j-lentz/iwgtk/blob/v${version}/CHANGELOG";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "iwgtk";
   };
diff --git a/pkgs/by-name/ju/jumpy/package.nix b/pkgs/by-name/ju/jumpy/package.nix
index a05ccb27e649..528bc3e1de29 100644
--- a/pkgs/by-name/ju/jumpy/package.nix
+++ b/pkgs/by-name/ju/jumpy/package.nix
@@ -92,6 +92,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       # Assets
       cc-by-nc-40
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/ke/keyscope/package.nix b/pkgs/by-name/ke/keyscope/package.nix
index 043832efd7ea..1a13b5ef337a 100644
--- a/pkgs/by-name/ke/keyscope/package.nix
+++ b/pkgs/by-name/ke/keyscope/package.nix
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/spectralops/keyscope";
     changelog = "https://github.com/spectralops/keyscope/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "keyscope";
   };
 }
diff --git a/pkgs/by-name/le/lemmy-help/package.nix b/pkgs/by-name/le/lemmy-help/package.nix
index 661d5a2403b9..1fe3ac92e848 100644
--- a/pkgs/by-name/le/lemmy-help/package.nix
+++ b/pkgs/by-name/le/lemmy-help/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/numToStr/lemmy-help";
     changelog = "https://github.com/numToStr/lemmy-help/releases/tag/v${version}";
     license = with lib.licenses; [ mit ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "lemmy-help";
   };
 }
diff --git a/pkgs/by-name/li/linuxwave/package.nix b/pkgs/by-name/li/linuxwave/package.nix
index 2fef04972a75..51bb162bfd14 100644
--- a/pkgs/by-name/li/linuxwave/package.nix
+++ b/pkgs/by-name/li/linuxwave/package.nix
@@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Generate music from the entropy of Linux";
     changelog = "https://github.com/orhun/linuxwave/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     inherit (zig.meta) platforms;
     mainProgram = "linuxwave";
   };
diff --git a/pkgs/by-name/me/menyoki/package.nix b/pkgs/by-name/me/menyoki/package.nix
index 036fa64fec11..e590c11abcc6 100644
--- a/pkgs/by-name/me/menyoki/package.nix
+++ b/pkgs/by-name/me/menyoki/package.nix
@@ -54,7 +54,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://menyoki.cli.rs/";
     changelog = "https://github.com/orhun/menyoki/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "menyoki";
   };
 }
diff --git a/pkgs/by-name/mi/minizign/package.nix b/pkgs/by-name/mi/minizign/package.nix
index ea85e75a5329..fb7c0d38b886 100644
--- a/pkgs/by-name/mi/minizign/package.nix
+++ b/pkgs/by-name/mi/minizign/package.nix
@@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Minisign reimplemented in Zig";
     homepage = "https://github.com/jedisct1/zig-minisign";
     license = lib.licenses.isc;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "minizign";
     inherit (zig.meta) platforms;
   };
diff --git a/pkgs/by-name/mm/mmtc/package.nix b/pkgs/by-name/mm/mmtc/package.nix
index 4d0e8b20715b..c349ea017dfd 100644
--- a/pkgs/by-name/mm/mmtc/package.nix
+++ b/pkgs/by-name/mm/mmtc/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/figsoda/mmtc";
     changelog = "https://github.com/figsoda/mmtc/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "mmtc";
   };
 }
diff --git a/pkgs/by-name/mu/muffet/package.nix b/pkgs/by-name/mu/muffet/package.nix
index f490fba48285..9a11c26799d3 100644
--- a/pkgs/by-name/mu/muffet/package.nix
+++ b/pkgs/by-name/mu/muffet/package.nix
@@ -27,7 +27,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/raviqqe/muffet";
     changelog = "https://github.com/raviqqe/muffet/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "muffet";
   };
 })
diff --git a/pkgs/by-name/ni/nix-init/package.nix b/pkgs/by-name/ni/nix-init/package.nix
index 7194d5d8d7ab..345dfc53d98f 100644
--- a/pkgs/by-name/ni/nix-init/package.nix
+++ b/pkgs/by-name/ni/nix-init/package.nix
@@ -96,6 +96,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/nix-community/nix-init";
     changelog = "https://github.com/nix-community/nix-init/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/ni/nixpkgs-hammering/package.nix b/pkgs/by-name/ni/nixpkgs-hammering/package.nix
index 97364eeb7f90..efd990d4e0ca 100644
--- a/pkgs/by-name/ni/nixpkgs-hammering/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-hammering/package.nix
@@ -41,6 +41,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/jtojnar/nixpkgs-hammering";
     license = lib.licenses.mit;
     mainProgram = "nixpkgs-hammer";
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/nu/nurl/package.nix b/pkgs/by-name/nu/nurl/package.nix
index 5ce4c166d4fe..5d60f79812f3 100644
--- a/pkgs/by-name/nu/nurl/package.nix
+++ b/pkgs/by-name/nu/nurl/package.nix
@@ -52,7 +52,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/nix-community/nurl";
     changelog = "https://github.com/nix-community/nurl/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "nurl";
   };
 }
diff --git a/pkgs/by-name/oh/oha/package.nix b/pkgs/by-name/oh/oha/package.nix
index a9392b3602a0..cfaeab4f8c61 100644
--- a/pkgs/by-name/oh/oha/package.nix
+++ b/pkgs/by-name/oh/oha/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/hatoo/oha";
     changelog = "https://github.com/hatoo/oha/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "oha";
   };
 }
diff --git a/pkgs/by-name/ox/oxlint/package.nix b/pkgs/by-name/ox/oxlint/package.nix
index 955a4cca750c..f604e36a4aec 100644
--- a/pkgs/by-name/ox/oxlint/package.nix
+++ b/pkgs/by-name/ox/oxlint/package.nix
@@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/oxc-project/oxc";
     changelog = "https://github.com/oxc-project/oxc/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "oxlint";
   };
 })
diff --git a/pkgs/by-name/pa/pactorio/package.nix b/pkgs/by-name/pa/pactorio/package.nix
index e0b3c8c2a9ff..fbd54eb5eb89 100644
--- a/pkgs/by-name/pa/pactorio/package.nix
+++ b/pkgs/by-name/pa/pactorio/package.nix
@@ -40,6 +40,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/figsoda/pactorio";
     changelog = "https://github.com/figsoda/pactorio/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/pa/patsh/package.nix b/pkgs/by-name/pa/patsh/package.nix
index acb079b30df5..63a7bfec0a5f 100644
--- a/pkgs/by-name/pa/patsh/package.nix
+++ b/pkgs/by-name/pa/patsh/package.nix
@@ -48,6 +48,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/nix-community/patsh";
     changelog = "https://github.com/nix-community/patsh/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/pi/piping-server-rust/package.nix b/pkgs/by-name/pi/piping-server-rust/package.nix
index 227e0f47e3cd..032be5b9ccfe 100644
--- a/pkgs/by-name/pi/piping-server-rust/package.nix
+++ b/pkgs/by-name/pi/piping-server-rust/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/nwtgck/piping-server-rust";
     changelog = "https://github.com/nwtgck/piping-server-rust/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "piping-server";
   };
 }
diff --git a/pkgs/by-name/pk/pkgtop/package.nix b/pkgs/by-name/pk/pkgtop/package.nix
index 09f4eff0fbb2..1f08905eb8f8 100644
--- a/pkgs/by-name/pk/pkgtop/package.nix
+++ b/pkgs/by-name/pk/pkgtop/package.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
     homepage = "https://github.com/orhun/pkgtop";
     changelog = "https://github.com/orhun/pkgtop/releases/tag/${version}";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "pkgtop";
   };
 }
diff --git a/pkgs/by-name/pl/planus/package.nix b/pkgs/by-name/pl/planus/package.nix
index 5e38b58ca998..4ce3eed4dd52 100644
--- a/pkgs/by-name/pl/planus/package.nix
+++ b/pkgs/by-name/pl/planus/package.nix
@@ -38,6 +38,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/po/pods/package.nix b/pkgs/by-name/po/pods/package.nix
index 634e08a6cdd9..be04adea7108 100644
--- a/pkgs/by-name/po/pods/package.nix
+++ b/pkgs/by-name/po/pods/package.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/marhkb/pods";
     changelog = "https://github.com/marhkb/pods/releases/tag/v${version}";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "pods";
   };
diff --git a/pkgs/by-name/po/poethepoet/package.nix b/pkgs/by-name/po/poethepoet/package.nix
index d1608d341a12..b862ed39de03 100644
--- a/pkgs/by-name/po/poethepoet/package.nix
+++ b/pkgs/by-name/po/poethepoet/package.nix
@@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/nat-n/poethepoet";
     changelog = "https://github.com/nat-n/poethepoet/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "poe";
   };
 }
diff --git a/pkgs/by-name/po/pomsky/package.nix b/pkgs/by-name/po/pomsky/package.nix
index 1692cf629566..34664008b532 100644
--- a/pkgs/by-name/po/pomsky/package.nix
+++ b/pkgs/by-name/po/pomsky/package.nix
@@ -44,6 +44,6 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/pr/protox/package.nix b/pkgs/by-name/pr/protox/package.nix
index af885f370a2b..c1475ec9e9c2 100644
--- a/pkgs/by-name/pr/protox/package.nix
+++ b/pkgs/by-name/pr/protox/package.nix
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/py/python-launcher/package.nix b/pkgs/by-name/py/python-launcher/package.nix
index 7be8b88fdea3..a9a09fda0169 100644
--- a/pkgs/by-name/py/python-launcher/package.nix
+++ b/pkgs/by-name/py/python-launcher/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/brettcannon/python-launcher";
     changelog = "https://github.com/brettcannon/python-launcher/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "py";
   };
 }
diff --git a/pkgs/by-name/re/rewrk/package.nix b/pkgs/by-name/re/rewrk/package.nix
index c68a403562e1..3b27f1ac6a5b 100644
--- a/pkgs/by-name/re/rewrk/package.nix
+++ b/pkgs/by-name/re/rewrk/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/lnx-search/rewrk";
     changelog = "https://github.com/lnx-search/rewrk/releases/tag/${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rewrk";
   };
 }
diff --git a/pkgs/by-name/ri/riff/package.nix b/pkgs/by-name/ri/riff/package.nix
index d59dfba9860a..4437a8d0e043 100644
--- a/pkgs/by-name/ri/riff/package.nix
+++ b/pkgs/by-name/ri/riff/package.nix
@@ -39,6 +39,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://riff.sh";
     changelog = "https://github.com/DeterminateSystems/riff/releases/tag/v${version}";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/rn/rnr/package.nix b/pkgs/by-name/rn/rnr/package.nix
index 5ebbcd8e2fb3..9da124082bfa 100644
--- a/pkgs/by-name/rn/rnr/package.nix
+++ b/pkgs/by-name/rn/rnr/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/ismaelgv/rnr";
     changelog = "https://github.com/ismaelgv/rnr/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/rs/rsass/package.nix b/pkgs/by-name/rs/rsass/package.nix
index a96bd5848e0a..b2b99af70126 100644
--- a/pkgs/by-name/rs/rsass/package.nix
+++ b/pkgs/by-name/rs/rsass/package.nix
@@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/rs/rsonpath/package.nix b/pkgs/by-name/rs/rsonpath/package.nix
index a48b05c238cf..134b3c8715c0 100644
--- a/pkgs/by-name/rs/rsonpath/package.nix
+++ b/pkgs/by-name/rs/rsonpath/package.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/v0ldek/rsonpath";
     changelog = "https://github.com/v0ldek/rsonpath/blob/${src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rq";
   };
 }
diff --git a/pkgs/by-name/ru/rune-languageserver/package.nix b/pkgs/by-name/ru/rune-languageserver/package.nix
index 155c1fdebc46..3c15a36fe587 100644
--- a/pkgs/by-name/ru/rune-languageserver/package.nix
+++ b/pkgs/by-name/ru/rune-languageserver/package.nix
@@ -27,7 +27,7 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rune-languageserver";
   };
 }
diff --git a/pkgs/by-name/ru/rune/package.nix b/pkgs/by-name/ru/rune/package.nix
index b754379731eb..56538861b345 100644
--- a/pkgs/by-name/ru/rune/package.nix
+++ b/pkgs/by-name/ru/rune/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rune";
   };
 }
diff --git a/pkgs/by-name/ru/runme/package.nix b/pkgs/by-name/ru/runme/package.nix
index 542f07cb3154..902c4d249c61 100644
--- a/pkgs/by-name/ru/runme/package.nix
+++ b/pkgs/by-name/ru/runme/package.nix
@@ -76,6 +76,6 @@ buildGoModule rec {
     homepage = "https://runme.dev";
     changelog = "https://github.com/runmedev/runme/releases/tag/v${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ru/rust-motd/package.nix b/pkgs/by-name/ru/rust-motd/package.nix
index 2a3ae32872a0..e043af16e495 100644
--- a/pkgs/by-name/ru/rust-motd/package.nix
+++ b/pkgs/by-name/ru/rust-motd/package.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/rust-motd/rust-motd";
     changelog = "https://github.com/rust-motd/rust-motd/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rust-motd";
   };
 }
diff --git a/pkgs/by-name/ru/rust-script/package.nix b/pkgs/by-name/ru/rust-script/package.nix
index 29fe468af4fd..d08252c4e1fc 100644
--- a/pkgs/by-name/ru/rust-script/package.nix
+++ b/pkgs/by-name/ru/rust-script/package.nix
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ru/rustscan/package.nix b/pkgs/by-name/ru/rustscan/package.nix
index e473867af745..2461399de9f3 100644
--- a/pkgs/by-name/ru/rustscan/package.nix
+++ b/pkgs/by-name/ru/rustscan/package.nix
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/RustScan/RustScan";
     changelog = "https://github.com/RustScan/RustScan/releases/tag/${version}";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rustscan";
   };
 }
diff --git a/pkgs/by-name/ru/rustycli/package.nix b/pkgs/by-name/ru/rustycli/package.nix
index b224c272a8af..c7568299a007 100644
--- a/pkgs/by-name/ru/rustycli/package.nix
+++ b/pkgs/by-name/ru/rustycli/package.nix
@@ -24,6 +24,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/pwnwriter/rustycli";
     changelog = "https://github.com/pwnwriter/rustycli/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/sa/sagoin/package.nix b/pkgs/by-name/sa/sagoin/package.nix
index 0fecc9529006..12735843e6b1 100644
--- a/pkgs/by-name/sa/sagoin/package.nix
+++ b/pkgs/by-name/sa/sagoin/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/figsoda/sagoin";
     changelog = "https://github.com/figsoda/sagoin/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.agpl3Plus;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "sagoin";
   };
 }
diff --git a/pkgs/by-name/sa/samply/package.nix b/pkgs/by-name/sa/samply/package.nix
index f7edb8ec8ef1..01051d19a4dd 100644
--- a/pkgs/by-name/sa/samply/package.nix
+++ b/pkgs/by-name/sa/samply/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "samply";
   };
 }
diff --git a/pkgs/by-name/sc/scraper/package.nix b/pkgs/by-name/sc/scraper/package.nix
index 9ae60f31b7e9..23704a7d251f 100644
--- a/pkgs/by-name/sc/scraper/package.nix
+++ b/pkgs/by-name/sc/scraper/package.nix
@@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/causal-agent/scraper";
     changelog = "https://github.com/causal-agent/scraper/releases/tag/v${version}";
     license = lib.licenses.isc;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/se/selene/package.nix b/pkgs/by-name/se/selene/package.nix
index dd9c9680ad5d..7168212e465a 100644
--- a/pkgs/by-name/se/selene/package.nix
+++ b/pkgs/by-name/se/selene/package.nix
@@ -36,6 +36,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/kampfkarren/selene";
     changelog = "https://github.com/kampfkarren/selene/blob/${version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/si/sic-image-cli/package.nix b/pkgs/by-name/si/sic-image-cli/package.nix
index a62d5b903fbe..9511263d55b6 100644
--- a/pkgs/by-name/si/sic-image-cli/package.nix
+++ b/pkgs/by-name/si/sic-image-cli/package.nix
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
       asl20 # or
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "sic";
   };
 }
diff --git a/pkgs/by-name/sn/sniffnet/package.nix b/pkgs/by-name/sn/sniffnet/package.nix
index 8b4abb822aa9..30f173f23310 100644
--- a/pkgs/by-name/sn/sniffnet/package.nix
+++ b/pkgs/by-name/sn/sniffnet/package.nix
@@ -99,7 +99,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       mit # or
       asl20
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     teams = [ lib.teams.ngi ];
     mainProgram = "sniffnet";
   };
diff --git a/pkgs/by-name/sn/snixembed/package.nix b/pkgs/by-name/sn/snixembed/package.nix
index 44b5b144ff6a..25910bc4fc40 100644
--- a/pkgs/by-name/sn/snixembed/package.nix
+++ b/pkgs/by-name/sn/snixembed/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     changelog = "https://git.sr.ht/~steef/snixembed/refs/${version}";
     license = lib.licenses.isc;
     platforms = lib.platforms.unix;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "snixembed";
   };
 }
diff --git a/pkgs/by-name/st/starlark-rust/package.nix b/pkgs/by-name/st/starlark-rust/package.nix
index 34eead9806a1..b5e9a5ae31d8 100644
--- a/pkgs/by-name/st/starlark-rust/package.nix
+++ b/pkgs/by-name/st/starlark-rust/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/facebook/starlark-rust";
     changelog = "https://github.com/facebook/starlark-rust/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "starlark";
   };
 }
diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix
index c0da19f43ca3..70f0035c86cc 100644
--- a/pkgs/by-name/st/stylua/package.nix
+++ b/pkgs/by-name/st/stylua/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/johnnymorganz/stylua";
     changelog = "https://github.com/johnnymorganz/stylua/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "stylua";
   };
 }
diff --git a/pkgs/by-name/te/teip/package.nix b/pkgs/by-name/te/teip/package.nix
index e32b148673ad..9a08eba9d865 100644
--- a/pkgs/by-name/te/teip/package.nix
+++ b/pkgs/by-name/te/teip/package.nix
@@ -43,6 +43,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/greymd/teip";
     changelog = "https://github.com/greymd/teip/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/te/termimage/package.nix b/pkgs/by-name/te/termimage/package.nix
index e11ba7ea2c42..4c7cb47c66a0 100644
--- a/pkgs/by-name/te/termimage/package.nix
+++ b/pkgs/by-name/te/termimage/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/nabijaczleweli/termimage";
     changelog = "https://github.com/nabijaczleweli/termimage/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "termimage";
   };
 }
diff --git a/pkgs/by-name/ti/tidy-viewer/package.nix b/pkgs/by-name/ti/tidy-viewer/package.nix
index 981f67f6ad16..44d7f7e4aba2 100644
--- a/pkgs/by-name/ti/tidy-viewer/package.nix
+++ b/pkgs/by-name/ti/tidy-viewer/package.nix
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/alexhallam/tv";
     changelog = "https://github.com/alexhallam/tv/blob/${version}/CHANGELOG.md";
     license = lib.licenses.unlicense;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/tm/tml/package.nix b/pkgs/by-name/tm/tml/package.nix
index 598f0c462528..71404f0f9926 100644
--- a/pkgs/by-name/tm/tml/package.nix
+++ b/pkgs/by-name/tm/tml/package.nix
@@ -28,6 +28,6 @@ buildGoModule rec {
     homepage = "https://github.com/liamg/tml";
     changelog = "https://github.com/liamg/tml/releases/tag/v${version}";
     license = lib.licenses.unlicense;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/tv/tv/package.nix b/pkgs/by-name/tv/tv/package.nix
index d749cd4d5f7d..91ff260607ae 100644
--- a/pkgs/by-name/tv/tv/package.nix
+++ b/pkgs/by-name/tv/tv/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/uzimaru0000/tv";
     changelog = "https://github.com/uzimaru0000/tv/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ty/typeshare/package.nix b/pkgs/by-name/ty/typeshare/package.nix
index 3ce54e6aa766..935f2d1a477f 100644
--- a/pkgs/by-name/ty/typeshare/package.nix
+++ b/pkgs/by-name/ty/typeshare/package.nix
@@ -39,6 +39,6 @@ rustPlatform.buildRustPackage rec {
       asl20 # or
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ze/zet/package.nix b/pkgs/by-name/ze/zet/package.nix
index f5b8a81bf02d..0a6b95bb02f5 100644
--- a/pkgs/by-name/ze/zet/package.nix
+++ b/pkgs/by-name/ze/zet/package.nix
@@ -30,6 +30,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       asl20
       mit
     ];
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/by-name/zp/zps/package.nix b/pkgs/by-name/zp/zps/package.nix
index 065642d495db..13b449e7dba8 100644
--- a/pkgs/by-name/zp/zps/package.nix
+++ b/pkgs/by-name/zp/zps/package.nix
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/orhun/zps";
     changelog = "https://github.com/orhun/zps/releases/tag/${version}";
     license = lib.licenses.gpl3Only;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     platforms = lib.platforms.linux;
     mainProgram = "zps";
   };
diff --git a/pkgs/by-name/zt/ztags/package.nix b/pkgs/by-name/zt/ztags/package.nix
index 5640918d8c55..9113ff02aca3 100644
--- a/pkgs/by-name/zt/ztags/package.nix
+++ b/pkgs/by-name/zt/ztags/package.nix
@@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Generate tags files for Zig projects";
     homepage = "https://github.com/gpanders/ztags";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "ztags";
     inherit (zig.meta) platforms;
   };
diff --git a/pkgs/by-name/zx/zxpy/package.nix b/pkgs/by-name/zx/zxpy/package.nix
index f107171d1185..3a89e406979c 100644
--- a/pkgs/by-name/zx/zxpy/package.nix
+++ b/pkgs/by-name/zx/zxpy/package.nix
@@ -39,7 +39,7 @@ python3Packages.buildPythonApplication rec {
     homepage = "https://github.com/tusharsadhwani/zxpy";
     changelog = "https://github.com/tusharsadhwani/zxpy/releases/tag/${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "zxpy";
   };
 }
diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix
index 2db7cd6f67bb..cc1440de0d58 100644
--- a/pkgs/development/lua-modules/generated-packages.nix
+++ b/pkgs/development/lua-modules/generated-packages.nix
@@ -5281,7 +5281,7 @@ final: prev: {
       meta = {
         homepage = "https://github.com/notomo/vusted";
         description = "`busted` wrapper for testing neovim plugin";
-        maintainers = with lib.maintainers; [ figsoda ];
+        maintainers = [ ];
         license.fullName = "MIT <http://opensource.org/licenses/MIT>";
       };
     }
diff --git a/pkgs/development/python-modules/pynvim/default.nix b/pkgs/development/python-modules/pynvim/default.nix
index f4e972e0bf41..dbbcfb6ece8e 100644
--- a/pkgs/development/python-modules/pynvim/default.nix
+++ b/pkgs/development/python-modules/pynvim/default.nix
@@ -40,6 +40,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/neovim/pynvim";
     changelog = "https://github.com/neovim/pynvim/releases/tag/${version}";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }

From 30420dabad11d22f91f981a52284bf0dab992765 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 26 Oct 2025 13:15:41 -0400
Subject: [PATCH 4910/6226] treewide: drop figsoda as maintainer (part 2)

s/maintainers = with maintainers; [ figsoda ];/maintainers = with maintainers; [ ];/
---
 .../editors/vim/plugins/nvim-treesitter/overrides.nix           | 2 +-
 pkgs/by-name/an/anew/package.nix                                | 2 +-
 pkgs/by-name/an/anewer/package.nix                              | 2 +-
 pkgs/by-name/an/anko/package.nix                                | 2 +-
 pkgs/by-name/as/asciicam/package.nix                            | 2 +-
 pkgs/by-name/as/asciinema-agg/package.nix                       | 2 +-
 pkgs/by-name/as/astronomer/package.nix                          | 2 +-
 pkgs/by-name/au/august/package.nix                              | 2 +-
 pkgs/by-name/ba/backdown/package.nix                            | 2 +-
 pkgs/by-name/ba/bartib/package.nix                              | 2 +-
 pkgs/by-name/bi/binocle/package.nix                             | 2 +-
 pkgs/by-name/bo/bombardier/package.nix                          | 2 +-
 pkgs/by-name/ca/cargo-benchcmp/package.nix                      | 2 +-
 pkgs/by-name/ca/cargo-bundle/package.nix                        | 2 +-
 pkgs/by-name/ca/cargo-codspeed/package.nix                      | 2 +-
 pkgs/by-name/ca/cargo-component/package.nix                     | 2 +-
 pkgs/by-name/ca/cargo-cranky/package.nix                        | 2 +-
 pkgs/by-name/ca/cargo-guppy/package.nix                         | 2 +-
 pkgs/by-name/ca/cargo-local-registry/package.nix                | 2 +-
 pkgs/by-name/ca/cargo-mutants/package.nix                       | 2 +-
 pkgs/by-name/ca/cargo-play/package.nix                          | 2 +-
 pkgs/by-name/ca/cargo-shuttle/package.nix                       | 2 +-
 pkgs/by-name/ca/catnip-gtk4/package.nix                         | 2 +-
 pkgs/by-name/ca/catnip/package.nix                              | 2 +-
 pkgs/by-name/ca/cauwugo/package.nix                             | 2 +-
 pkgs/by-name/cd/cdwe/package.nix                                | 2 +-
 pkgs/by-name/ce/cel-go/package.nix                              | 2 +-
 pkgs/by-name/ch/chit/package.nix                                | 2 +-
 pkgs/by-name/cl/clima/package.nix                               | 2 +-
 pkgs/by-name/co/codevis/package.nix                             | 2 +-
 pkgs/by-name/co/complgen/package.nix                            | 2 +-
 pkgs/by-name/cr/critcmp/package.nix                             | 2 +-
 pkgs/by-name/cs/csv2svg/package.nix                             | 2 +-
 pkgs/by-name/cs/csview/package.nix                              | 2 +-
 pkgs/by-name/cs/csvquote/package.nix                            | 2 +-
 pkgs/by-name/dj/djot-js/package.nix                             | 2 +-
 pkgs/by-name/dn/dnspeep/package.nix                             | 2 +-
 pkgs/by-name/do/dogdns/package.nix                              | 2 +-
 pkgs/by-name/do/done/package.nix                                | 2 +-
 pkgs/by-name/do/dool/package.nix                                | 2 +-
 pkgs/by-name/du/dutree/package.nix                              | 2 +-
 pkgs/by-name/en/encpipe/package.nix                             | 2 +-
 pkgs/by-name/er/erg/package.nix                                 | 2 +-
 pkgs/by-name/es/esbuild-config/package.nix                      | 2 +-
 pkgs/by-name/ex/expr/package.nix                                | 2 +-
 pkgs/by-name/ez/ezno/package.nix                                | 2 +-
 pkgs/by-name/fb/fblog/package.nix                               | 2 +-
 pkgs/by-name/fh/fh/package.nix                                  | 2 +-
 pkgs/by-name/fo/fontfinder/package.nix                          | 2 +-
 pkgs/by-name/fr/freshfetch/package.nix                          | 2 +-
 pkgs/by-name/fr/frogmouth/package.nix                           | 2 +-
 pkgs/by-name/fu/fundoc/package.nix                              | 2 +-
 pkgs/by-name/fu/funzzy/package.nix                              | 2 +-
 pkgs/by-name/fw/fw/package.nix                                  | 2 +-
 pkgs/by-name/ga/gambit-chess/package.nix                        | 2 +-
 pkgs/by-name/gd/gdrive3/package.nix                             | 2 +-
 pkgs/by-name/gi/git-dive/package.nix                            | 2 +-
 pkgs/by-name/gi/git-ignore/package.nix                          | 2 +-
 pkgs/by-name/gl/glicol-cli/package.nix                          | 2 +-
 pkgs/by-name/go/gopatch/package.nix                             | 2 +-
 pkgs/by-name/gp/gpython/package.nix                             | 2 +-
 pkgs/by-name/gq/gql/package.nix                                 | 2 +-
 pkgs/by-name/gr/gradescope-submit/package.nix                   | 2 +-
 pkgs/by-name/gr/grass-sass/package.nix                          | 2 +-
 pkgs/by-name/gr/gridlock/package.nix                            | 2 +-
 pkgs/by-name/gt/gtree/package.nix                               | 2 +-
 pkgs/by-name/hi/highlight-assertions/package.nix                | 2 +-
 pkgs/by-name/ht/httpref/package.nix                             | 2 +-
 pkgs/by-name/ht/httprobe/package.nix                            | 2 +-
 pkgs/by-name/hu/huniq/package.nix                               | 2 +-
 pkgs/by-name/hv/hvm/package.nix                                 | 2 +-
 pkgs/by-name/ic/icebreaker/package.nix                          | 2 +-
 pkgs/by-name/im/image-roll/package.nix                          | 2 +-
 pkgs/by-name/in/inlyne/package.nix                              | 2 +-
 pkgs/by-name/ja/jacoco/package.nix                              | 2 +-
 pkgs/by-name/je/jen/package.nix                                 | 2 +-
 pkgs/by-name/ji/jinja2-cli/package.nix                          | 2 +-
 pkgs/by-name/jo/jotdown/package.nix                             | 2 +-
 pkgs/by-name/js/jsonfmt/package.nix                             | 2 +-
 pkgs/by-name/kb/kbt/package.nix                                 | 2 +-
 pkgs/by-name/ki/kind2/package.nix                               | 2 +-
 pkgs/by-name/ko/kool/package.nix                                | 2 +-
 pkgs/by-name/la/lazycli/package.nix                             | 2 +-
 pkgs/by-name/le/leptosfmt/package.nix                           | 2 +-
 pkgs/by-name/li/lineselect/package.nix                          | 2 +-
 pkgs/by-name/li/lipl/package.nix                                | 2 +-
 pkgs/by-name/lu/luaformatter/package.nix                        | 2 +-
 pkgs/by-name/lu/lucky-commit/package.nix                        | 2 +-
 pkgs/by-name/lu/lunatic/package.nix                             | 2 +-
 pkgs/by-name/lw/lwc/package.nix                                 | 2 +-
 pkgs/by-name/ma/markscribe/package.nix                          | 2 +-
 pkgs/by-name/ma/mastotool/package.nix                           | 2 +-
 pkgs/by-name/md/mdr/package.nix                                 | 2 +-
 pkgs/by-name/na/namaka/package.nix                              | 2 +-
 pkgs/by-name/ne/nerdfix/package.nix                             | 2 +-
 pkgs/by-name/ni/nix-melt/package.nix                            | 2 +-
 pkgs/by-name/no/nomino/package.nix                              | 2 +-
 pkgs/by-name/or/oranda/package.nix                              | 2 +-
 pkgs/by-name/or/org-stats/package.nix                           | 2 +-
 pkgs/by-name/or/orz/package.nix                                 | 2 +-
 pkgs/by-name/pa/panamax/package.nix                             | 2 +-
 pkgs/by-name/pe/peep/package.nix                                | 2 +-
 pkgs/by-name/pi/piknik/package.nix                              | 2 +-
 pkgs/by-name/pi/pipe-rename/package.nix                         | 2 +-
 pkgs/by-name/po/poop/package.nix                                | 2 +-
 pkgs/by-name/pr/process-viewer/package.nix                      | 2 +-
 pkgs/by-name/pr/projectable/package.nix                         | 2 +-
 pkgs/by-name/pr/proximity-sort/package.nix                      | 2 +-
 pkgs/by-name/ps/psitop/package.nix                              | 2 +-
 pkgs/by-name/pw/pw-viz/package.nix                              | 2 +-
 pkgs/by-name/py/pysentation/package.nix                         | 2 +-
 pkgs/by-name/pz/pzip/package.nix                                | 2 +-
 pkgs/by-name/ra/rare-regex/package.nix                          | 2 +-
 pkgs/by-name/re/reason-shell/package.nix                        | 2 +-
 pkgs/by-name/re/regex-cli/package.nix                           | 2 +-
 pkgs/by-name/re/repgrep/package.nix                             | 2 +-
 pkgs/by-name/rh/rhack/package.nix                               | 2 +-
 pkgs/by-name/rh/rhai-doc/package.nix                            | 2 +-
 pkgs/by-name/ri/ripdrag/package.nix                             | 2 +-
 pkgs/by-name/ri/ripsecrets/package.nix                          | 2 +-
 pkgs/by-name/ri/risor/package.nix                               | 2 +-
 pkgs/by-name/rl/rlci/package.nix                                | 2 +-
 pkgs/by-name/ro/roogle/package.nix                              | 2 +-
 pkgs/by-name/rs/rsign2/package.nix                              | 2 +-
 pkgs/by-name/rs/rslint/package.nix                              | 2 +-
 pkgs/by-name/rt/rtz/package.nix                                 | 2 +-
 pkgs/by-name/ru/runiq/package.nix                               | 2 +-
 pkgs/by-name/ru/rust-audit-info/package.nix                     | 2 +-
 pkgs/by-name/ru/rust-code-analysis/package.nix                  | 2 +-
 pkgs/by-name/ru/rust-petname/package.nix                        | 2 +-
 pkgs/by-name/ru/rust-traverse/package.nix                       | 2 +-
 pkgs/by-name/ru/rustypaste-cli/package.nix                      | 2 +-
 pkgs/by-name/ru/rustywind/package.nix                           | 2 +-
 pkgs/by-name/sa/safecloset/package.nix                          | 2 +-
 pkgs/by-name/sc/scip/package.nix                                | 2 +-
 pkgs/by-name/sc/scriptisto/package.nix                          | 2 +-
 pkgs/by-name/sh/shell2http/package.nix                          | 2 +-
 pkgs/by-name/sl/slingshot/package.nix                           | 2 +-
 pkgs/by-name/sl/slippy/package.nix                              | 2 +-
 pkgs/by-name/sm/smartcrop/package.nix                           | 2 +-
 pkgs/by-name/sp/spacer/package.nix                              | 2 +-
 pkgs/by-name/sp/specr-transpile/package.nix                     | 2 +-
 pkgs/by-name/st/star-history/package.nix                        | 2 +-
 pkgs/by-name/st/starcharts/package.nix                          | 2 +-
 pkgs/by-name/st/starry/package.nix                              | 2 +-
 pkgs/by-name/st/static-server/package.nix                       | 2 +-
 pkgs/by-name/st/strace-analyzer/package.nix                     | 2 +-
 pkgs/by-name/su/suckit/package.nix                              | 2 +-
 pkgs/by-name/sy/symbolicator/package.nix                        | 2 +-
 pkgs/by-name/sy/synth/package.nix                               | 2 +-
 pkgs/by-name/ta/tailer/package.nix                              | 2 +-
 pkgs/by-name/ta/taizen/package.nix                              | 2 +-
 pkgs/by-name/ta/taplo/package.nix                               | 2 +-
 pkgs/by-name/te/teehee/package.nix                              | 2 +-
 pkgs/by-name/te/tela-icon-theme/package.nix                     | 2 +-
 pkgs/by-name/te/textplots/package.nix                           | 2 +-
 pkgs/by-name/te/texture-synthesis/package.nix                   | 2 +-
 pkgs/by-name/th/theme-sh/package.nix                            | 2 +-
 pkgs/by-name/th/thokr/package.nix                               | 2 +-
 pkgs/by-name/ti/timelimit/package.nix                           | 2 +-
 pkgs/by-name/to/toml2nix/package.nix                            | 2 +-
 pkgs/by-name/to/topfew-rs/package.nix                           | 2 +-
 pkgs/by-name/to/topfew/package.nix                              | 2 +-
 pkgs/by-name/tr/trippy/package.nix                              | 2 +-
 pkgs/by-name/tu/tui-journal/package.nix                         | 2 +-
 pkgs/by-name/tu/turtle-build/package.nix                        | 2 +-
 pkgs/by-name/ty/typer/package.nix                               | 2 +-
 pkgs/by-name/ty/typical/package.nix                             | 2 +-
 pkgs/by-name/ty/typioca/package.nix                             | 2 +-
 pkgs/by-name/ty/typst-live/package.nix                          | 2 +-
 pkgs/by-name/ty/tyson/package.nix                               | 2 +-
 pkgs/by-name/ul/ulid/package.nix                                | 2 +-
 pkgs/by-name/un/unfurl/package.nix                              | 2 +-
 pkgs/by-name/un/unimap/package.nix                              | 2 +-
 pkgs/by-name/un/unzrip/package.nix                              | 2 +-
 pkgs/by-name/up/upiano/package.nix                              | 2 +-
 pkgs/by-name/ve/verco/package.nix                               | 2 +-
 pkgs/by-name/wa/wasmer-pack/package.nix                         | 2 +-
 pkgs/by-name/wa/wazero/package.nix                              | 2 +-
 pkgs/by-name/wt/wthrr/package.nix                               | 2 +-
 pkgs/by-name/xq/xq-xml/package.nix                              | 2 +-
 pkgs/by-name/ya/yaegi/package.nix                               | 2 +-
 pkgs/development/compilers/rust/cargo-auditable.nix             | 2 +-
 pkgs/development/python-modules/art/default.nix                 | 2 +-
 pkgs/development/python-modules/dataclass-factory/default.nix   | 2 +-
 pkgs/development/python-modules/jello/default.nix               | 2 +-
 pkgs/development/python-modules/ochre/default.nix               | 2 +-
 pkgs/development/python-modules/pyfluidsynth/default.nix        | 2 +-
 pkgs/development/python-modules/rich-pixels/default.nix         | 2 +-
 pkgs/development/python-modules/shazamio/default.nix            | 2 +-
 pkgs/development/python-modules/stransi/default.nix             | 2 +-
 .../python-modules/textual-universal-directorytree/default.nix  | 2 +-
 pkgs/development/python-modules/universal-pathlib/default.nix   | 2 +-
 pkgs/development/python-modules/xdg-base-dirs/default.nix       | 2 +-
 pkgs/shells/fish/plugins/async-prompt.nix                       | 2 +-
 195 files changed, 195 insertions(+), 195 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
index f9b35edcf583..9b5592b99b98 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
@@ -167,6 +167,6 @@ in
     (super.nvim-treesitter.meta or { })
     // {
       license = licenses.asl20;
-      maintainers = with maintainers; [ figsoda ];
+      maintainers = [ ];
     };
 }
diff --git a/pkgs/by-name/an/anew/package.nix b/pkgs/by-name/an/anew/package.nix
index 1475a5072812..387152175add 100644
--- a/pkgs/by-name/an/anew/package.nix
+++ b/pkgs/by-name/an/anew/package.nix
@@ -27,6 +27,6 @@ buildGoModule rec {
     mainProgram = "anew";
     homepage = "https://github.com/tomnomnom/anew";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/an/anewer/package.nix b/pkgs/by-name/an/anewer/package.nix
index 5a42a3887571..2b0caacc36b2 100644
--- a/pkgs/by-name/an/anewer/package.nix
+++ b/pkgs/by-name/an/anewer/package.nix
@@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "anewer";
     homepage = "https://github.com/ysf/anewer";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/an/anko/package.nix b/pkgs/by-name/an/anko/package.nix
index 946599af780d..92b1714e84c7 100644
--- a/pkgs/by-name/an/anko/package.nix
+++ b/pkgs/by-name/an/anko/package.nix
@@ -28,6 +28,6 @@ buildGoModule rec {
     description = "Scriptable interpreter written in golang";
     homepage = "https://github.com/mattn/anko";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/as/asciicam/package.nix b/pkgs/by-name/as/asciicam/package.nix
index 167cc22354ca..34eba22b97d1 100644
--- a/pkgs/by-name/as/asciicam/package.nix
+++ b/pkgs/by-name/as/asciicam/package.nix
@@ -26,7 +26,7 @@ buildGoModule {
     description = "Displays your webcam on the terminal";
     homepage = "https://github.com/muesli/asciicam";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "asciicam";
   };
 }
diff --git a/pkgs/by-name/as/asciinema-agg/package.nix b/pkgs/by-name/as/asciinema-agg/package.nix
index 43ee2bc72845..70a9fa8cb661 100644
--- a/pkgs/by-name/as/asciinema-agg/package.nix
+++ b/pkgs/by-name/as/asciinema-agg/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/asciinema/agg";
     changelog = "https://github.com/asciinema/agg/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "agg";
   };
 }
diff --git a/pkgs/by-name/as/astronomer/package.nix b/pkgs/by-name/as/astronomer/package.nix
index 7df5c42af4e4..6e7325ebdcae 100644
--- a/pkgs/by-name/as/astronomer/package.nix
+++ b/pkgs/by-name/as/astronomer/package.nix
@@ -27,7 +27,7 @@ buildGoModule rec {
     homepage = "https://github.com/Ullaakut/astronomer";
     changelog = "https://github.com/Ullaakut/astronomer/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "astronomer";
   };
 }
diff --git a/pkgs/by-name/au/august/package.nix b/pkgs/by-name/au/august/package.nix
index 0d9090a3eff1..e0966fb5608a 100644
--- a/pkgs/by-name/au/august/package.nix
+++ b/pkgs/by-name/au/august/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "ag";
   };
 }
diff --git a/pkgs/by-name/ba/backdown/package.nix b/pkgs/by-name/ba/backdown/package.nix
index 968dd12d36e8..8a1bc83b608a 100644
--- a/pkgs/by-name/ba/backdown/package.nix
+++ b/pkgs/by-name/ba/backdown/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/Canop/backdown";
     changelog = "https://github.com/Canop/backdown/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "backdown";
   };
 }
diff --git a/pkgs/by-name/ba/bartib/package.nix b/pkgs/by-name/ba/bartib/package.nix
index 839749ebdb86..f8410b421a34 100644
--- a/pkgs/by-name/ba/bartib/package.nix
+++ b/pkgs/by-name/ba/bartib/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
     description = "Simple timetracker for the command line";
     homepage = "https://github.com/nikolassv/bartib";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "bartib";
   };
 }
diff --git a/pkgs/by-name/bi/binocle/package.nix b/pkgs/by-name/bi/binocle/package.nix
index b7b14e7f0651..6441a3980039 100644
--- a/pkgs/by-name/bi/binocle/package.nix
+++ b/pkgs/by-name/bi/binocle/package.nix
@@ -49,6 +49,6 @@ rustPlatform.buildRustPackage rec {
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/bo/bombardier/package.nix b/pkgs/by-name/bo/bombardier/package.nix
index db1a64994eca..9b5f385893b2 100644
--- a/pkgs/by-name/bo/bombardier/package.nix
+++ b/pkgs/by-name/bo/bombardier/package.nix
@@ -42,7 +42,7 @@ buildGoModule rec {
     homepage = "https://github.com/codesenberg/bombardier";
     changelog = "https://github.com/codesenberg/bombardier/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "bombardier";
   };
 }
diff --git a/pkgs/by-name/ca/cargo-benchcmp/package.nix b/pkgs/by-name/ca/cargo-benchcmp/package.nix
index 2be387f51be6..c81559855a73 100644
--- a/pkgs/by-name/ca/cargo-benchcmp/package.nix
+++ b/pkgs/by-name/ca/cargo-benchcmp/package.nix
@@ -39,6 +39,6 @@ rustPlatform.buildRustPackage rec {
       mit
       unlicense
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-bundle/package.nix b/pkgs/by-name/ca/cargo-bundle/package.nix
index 4370667d428a..02a620561354 100644
--- a/pkgs/by-name/ca/cargo-bundle/package.nix
+++ b/pkgs/by-name/ca/cargo-bundle/package.nix
@@ -39,6 +39,6 @@ rustPlatform.buildRustPackage {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-codspeed/package.nix b/pkgs/by-name/ca/cargo-codspeed/package.nix
index ee0b436be25b..8e4fb5c2138e 100644
--- a/pkgs/by-name/ca/cargo-codspeed/package.nix
+++ b/pkgs/by-name/ca/cargo-codspeed/package.nix
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec {
       mit
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "cargo-codspeed";
   };
 }
diff --git a/pkgs/by-name/ca/cargo-component/package.nix b/pkgs/by-name/ca/cargo-component/package.nix
index c964957264d5..237829ae0dcf 100644
--- a/pkgs/by-name/ca/cargo-component/package.nix
+++ b/pkgs/by-name/ca/cargo-component/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/bytecodealliance/cargo-component";
     changelog = "https://github.com/bytecodealliance/cargo-component/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "cargo-component";
   };
 }
diff --git a/pkgs/by-name/ca/cargo-cranky/package.nix b/pkgs/by-name/ca/cargo-cranky/package.nix
index 22b518fb9157..e03271e5b52c 100644
--- a/pkgs/by-name/ca/cargo-cranky/package.nix
+++ b/pkgs/by-name/ca/cargo-cranky/package.nix
@@ -26,6 +26,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-guppy/package.nix b/pkgs/by-name/ca/cargo-guppy/package.nix
index 0fc950dec036..b4670705aefe 100644
--- a/pkgs/by-name/ca/cargo-guppy/package.nix
+++ b/pkgs/by-name/ca/cargo-guppy/package.nix
@@ -40,6 +40,6 @@ rustPlatform.buildRustPackage {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-local-registry/package.nix b/pkgs/by-name/ca/cargo-local-registry/package.nix
index 709debde0024..8190fd61baf6 100644
--- a/pkgs/by-name/ca/cargo-local-registry/package.nix
+++ b/pkgs/by-name/ca/cargo-local-registry/package.nix
@@ -46,6 +46,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-mutants/package.nix b/pkgs/by-name/ca/cargo-mutants/package.nix
index 0356b2b16e52..3a90d9d2c976 100644
--- a/pkgs/by-name/ca/cargo-mutants/package.nix
+++ b/pkgs/by-name/ca/cargo-mutants/package.nix
@@ -26,6 +26,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/sourcefrog/cargo-mutants";
     changelog = "https://github.com/sourcefrog/cargo-mutants/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-play/package.nix b/pkgs/by-name/ca/cargo-play/package.nix
index 507b2cf647aa..ead15cb184a1 100644
--- a/pkgs/by-name/ca/cargo-play/package.nix
+++ b/pkgs/by-name/ca/cargo-play/package.nix
@@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "cargo-play";
     homepage = "https://github.com/fanzeyi/cargo-play";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ca/cargo-shuttle/package.nix b/pkgs/by-name/ca/cargo-shuttle/package.nix
index a7c4216409fa..9de6d2810b68 100644
--- a/pkgs/by-name/ca/cargo-shuttle/package.nix
+++ b/pkgs/by-name/ca/cargo-shuttle/package.nix
@@ -43,6 +43,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://shuttle.rs";
     changelog = "https://github.com/shuttle-hq/shuttle/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ca/catnip-gtk4/package.nix b/pkgs/by-name/ca/catnip-gtk4/package.nix
index 605abed2efc5..c47310df3bc0 100644
--- a/pkgs/by-name/ca/catnip-gtk4/package.nix
+++ b/pkgs/by-name/ca/catnip-gtk4/package.nix
@@ -44,7 +44,7 @@ buildGoModule {
     description = "GTK4 frontend for catnip";
     homepage = "https://github.com/diamondburned/catnip-gtk4";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "catnip-gtk4";
   };
 }
diff --git a/pkgs/by-name/ca/catnip/package.nix b/pkgs/by-name/ca/catnip/package.nix
index 66fc3b97967f..13275ec04617 100644
--- a/pkgs/by-name/ca/catnip/package.nix
+++ b/pkgs/by-name/ca/catnip/package.nix
@@ -46,7 +46,7 @@ buildGoModule rec {
     homepage = "https://github.com/noriah/catnip";
     changelog = "https://github.com/noriah/catnip/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "catnip";
   };
 }
diff --git a/pkgs/by-name/ca/cauwugo/package.nix b/pkgs/by-name/ca/cauwugo/package.nix
index 11f333fa354e..d13a988ab137 100644
--- a/pkgs/by-name/ca/cauwugo/package.nix
+++ b/pkgs/by-name/ca/cauwugo/package.nix
@@ -35,6 +35,6 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/cd/cdwe/package.nix b/pkgs/by-name/cd/cdwe/package.nix
index cad73a5bf830..58d22ae24816 100644
--- a/pkgs/by-name/cd/cdwe/package.nix
+++ b/pkgs/by-name/cd/cdwe/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     description = "Configurable cd wrapper that lets you define your environment per directory";
     homepage = "https://github.com/synoet/cdwe";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "cdwe";
   };
 }
diff --git a/pkgs/by-name/ce/cel-go/package.nix b/pkgs/by-name/ce/cel-go/package.nix
index e4c1fdaba998..3f2a5de27983 100644
--- a/pkgs/by-name/ce/cel-go/package.nix
+++ b/pkgs/by-name/ce/cel-go/package.nix
@@ -38,6 +38,6 @@ buildGoModule rec {
     homepage = "https://github.com/google/cel-go";
     changelog = "https://github.com/google/cel-go/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ch/chit/package.nix b/pkgs/by-name/ch/chit/package.nix
index f31d82f28468..db5df2fb21e5 100644
--- a/pkgs/by-name/ch/chit/package.nix
+++ b/pkgs/by-name/ch/chit/package.nix
@@ -49,6 +49,6 @@ rustPlatform.buildRustPackage rec {
     '';
     homepage = "https://github.com/peterheesterman/chit";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/cl/clima/package.nix b/pkgs/by-name/cl/clima/package.nix
index 90dbd6bb13cc..4161641879d4 100644
--- a/pkgs/by-name/cl/clima/package.nix
+++ b/pkgs/by-name/cl/clima/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/Canop/clima";
     changelog = "https://github.com/Canop/clima/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "clima";
   };
 }
diff --git a/pkgs/by-name/co/codevis/package.nix b/pkgs/by-name/co/codevis/package.nix
index 06ac2da90570..af0979e42d0d 100644
--- a/pkgs/by-name/co/codevis/package.nix
+++ b/pkgs/by-name/co/codevis/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/sloganking/codevis";
     changelog = "https://github.com/sloganking/codevis/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "codevis";
   };
 }
diff --git a/pkgs/by-name/co/complgen/package.nix b/pkgs/by-name/co/complgen/package.nix
index a39ece4aa553..8691ada41e4f 100644
--- a/pkgs/by-name/co/complgen/package.nix
+++ b/pkgs/by-name/co/complgen/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/adaszko/complgen";
     changelog = "https://github.com/adaszko/complgen/blob/${src.rev}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/cr/critcmp/package.nix b/pkgs/by-name/cr/critcmp/package.nix
index a45dab6a1837..30b33e709a4a 100644
--- a/pkgs/by-name/cr/critcmp/package.nix
+++ b/pkgs/by-name/cr/critcmp/package.nix
@@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec {
       mit
       unlicense
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/cs/csv2svg/package.nix b/pkgs/by-name/cs/csv2svg/package.nix
index d197451b68fc..b9ebd28e30d1 100644
--- a/pkgs/by-name/cs/csv2svg/package.nix
+++ b/pkgs/by-name/cs/csv2svg/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     description = "Take a csv as input and outputs svg";
     homepage = "https://github.com/Canop/csv2svg";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "csv2svg";
   };
 }
diff --git a/pkgs/by-name/cs/csview/package.nix b/pkgs/by-name/cs/csview/package.nix
index f937579fe02f..b6fb4eb83570 100644
--- a/pkgs/by-name/cs/csview/package.nix
+++ b/pkgs/by-name/cs/csview/package.nix
@@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/cs/csvquote/package.nix b/pkgs/by-name/cs/csvquote/package.nix
index 0342ee16641c..c2573b6e92a2 100644
--- a/pkgs/by-name/cs/csvquote/package.nix
+++ b/pkgs/by-name/cs/csvquote/package.nix
@@ -46,7 +46,7 @@ stdenv.mkDerivation rec {
     description = "Enables common unix utilities like cut, awk, wc, head to work correctly with csv data containing delimiters and newlines";
     homepage = "https://github.com/dbro/csvquote";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     platforms = platforms.all;
   };
 }
diff --git a/pkgs/by-name/dj/djot-js/package.nix b/pkgs/by-name/dj/djot-js/package.nix
index 441475f816b5..dd93707fbf41 100644
--- a/pkgs/by-name/dj/djot-js/package.nix
+++ b/pkgs/by-name/dj/djot-js/package.nix
@@ -31,7 +31,7 @@ buildNpmPackage rec {
     homepage = "https://github.com/jgm/djot.js";
     changelog = "https://github.com/jgm/djot.js/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "djot";
   };
 }
diff --git a/pkgs/by-name/dn/dnspeep/package.nix b/pkgs/by-name/dn/dnspeep/package.nix
index 28ee48c4ab19..96c2fbde29f9 100644
--- a/pkgs/by-name/dn/dnspeep/package.nix
+++ b/pkgs/by-name/dn/dnspeep/package.nix
@@ -26,6 +26,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "dnspeep";
     homepage = "https://github.com/jvns/dnspeep";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/do/dogdns/package.nix b/pkgs/by-name/do/dogdns/package.nix
index 1bffaed1b881..0b56d02ad79e 100644
--- a/pkgs/by-name/do/dogdns/package.nix
+++ b/pkgs/by-name/do/dogdns/package.nix
@@ -64,7 +64,7 @@ rustPlatform.buildRustPackage {
     description = "Command-line DNS client";
     homepage = "https://dns.lookup.dog";
     license = licenses.eupl12;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "dog";
   };
 }
diff --git a/pkgs/by-name/do/done/package.nix b/pkgs/by-name/do/done/package.nix
index cd8b4fa4c9ac..1b7f0fb26c23 100644
--- a/pkgs/by-name/do/done/package.nix
+++ b/pkgs/by-name/do/done/package.nix
@@ -65,6 +65,6 @@ stdenv.mkDerivation rec {
     changelog = "https://github.com/done-devs/done/blob/${src.rev}/CHANGES.md";
     license = licenses.mpl20;
     mainProgram = "done";
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/do/dool/package.nix b/pkgs/by-name/do/dool/package.nix
index 13855843769a..b2638fff650f 100644
--- a/pkgs/by-name/do/dool/package.nix
+++ b/pkgs/by-name/do/dool/package.nix
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/scottchiefbaker/dool";
     changelog = "https://github.com/scottchiefbaker/dool/blob/${src.rev}/ChangeLog";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "dool";
   };
diff --git a/pkgs/by-name/du/dutree/package.nix b/pkgs/by-name/du/dutree/package.nix
index 77878d1d291a..925d3d01808f 100644
--- a/pkgs/by-name/du/dutree/package.nix
+++ b/pkgs/by-name/du/dutree/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
     description = "Tool to analyze file system usage written in Rust";
     homepage = "https://github.com/nachoparker/dutree";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "dutree";
   };
 }
diff --git a/pkgs/by-name/en/encpipe/package.nix b/pkgs/by-name/en/encpipe/package.nix
index a36ae92e953f..de81afa34b26 100644
--- a/pkgs/by-name/en/encpipe/package.nix
+++ b/pkgs/by-name/en/encpipe/package.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     description = "Encryption tool";
     homepage = "https://github.com/jedisct1/encpipe";
     license = licenses.isc;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "encpipe";
   };
 }
diff --git a/pkgs/by-name/er/erg/package.nix b/pkgs/by-name/er/erg/package.nix
index 8308a2a47496..e479c13d79a0 100644
--- a/pkgs/by-name/er/erg/package.nix
+++ b/pkgs/by-name/er/erg/package.nix
@@ -65,6 +65,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/es/esbuild-config/package.nix b/pkgs/by-name/es/esbuild-config/package.nix
index bccddd4939aa..57d376f13b75 100644
--- a/pkgs/by-name/es/esbuild-config/package.nix
+++ b/pkgs/by-name/es/esbuild-config/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     description = "Config files for esbuild";
     homepage = "https://github.com/bpierre/esbuild-config";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "esbuild-config";
   };
 }
diff --git a/pkgs/by-name/ex/expr/package.nix b/pkgs/by-name/ex/expr/package.nix
index 0d0786290192..9d3e2ad6987b 100644
--- a/pkgs/by-name/ex/expr/package.nix
+++ b/pkgs/by-name/ex/expr/package.nix
@@ -33,7 +33,7 @@ buildGoModule rec {
     homepage = "https://github.com/expr-lang/expr";
     changelog = "https://github.com/expr-lang/expr/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "expr";
   };
 }
diff --git a/pkgs/by-name/ez/ezno/package.nix b/pkgs/by-name/ez/ezno/package.nix
index 3c8dff907b22..d23cc5524be8 100644
--- a/pkgs/by-name/ez/ezno/package.nix
+++ b/pkgs/by-name/ez/ezno/package.nix
@@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/kaleidawave/ezno";
     changelog = "https://github.com/kaleidawave/ezno/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/fb/fblog/package.nix b/pkgs/by-name/fb/fblog/package.nix
index a7ed02781531..90893c9e6987 100644
--- a/pkgs/by-name/fb/fblog/package.nix
+++ b/pkgs/by-name/fb/fblog/package.nix
@@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "fblog";
     homepage = "https://github.com/brocode/fblog";
     license = licenses.wtfpl;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/fh/fh/package.nix b/pkgs/by-name/fh/fh/package.nix
index fa6531c1a897..0d8a399053e8 100644
--- a/pkgs/by-name/fh/fh/package.nix
+++ b/pkgs/by-name/fh/fh/package.nix
@@ -50,7 +50,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/DeterminateSystems/fh";
     changelog = "https://github.com/DeterminateSystems/fh/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "fh";
   };
 }
diff --git a/pkgs/by-name/fo/fontfinder/package.nix b/pkgs/by-name/fo/fontfinder/package.nix
index a95d333f9029..e71104b33a18 100644
--- a/pkgs/by-name/fo/fontfinder/package.nix
+++ b/pkgs/by-name/fo/fontfinder/package.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/mmstick/fontfinder";
     changelog = "https://github.com/mmstick/fontfinder/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "fontfinder-gtk";
   };
 }
diff --git a/pkgs/by-name/fr/freshfetch/package.nix b/pkgs/by-name/fr/freshfetch/package.nix
index bc6c33b25148..52ebca152e2e 100644
--- a/pkgs/by-name/fr/freshfetch/package.nix
+++ b/pkgs/by-name/fr/freshfetch/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     description = "Fresh take on neofetch";
     homepage = "https://github.com/k4rakara/freshfetch";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "freshfetch";
   };
 }
diff --git a/pkgs/by-name/fr/frogmouth/package.nix b/pkgs/by-name/fr/frogmouth/package.nix
index 29680ad507a5..a963a34b1691 100644
--- a/pkgs/by-name/fr/frogmouth/package.nix
+++ b/pkgs/by-name/fr/frogmouth/package.nix
@@ -40,6 +40,6 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/Textualize/frogmouth";
     changelog = "https://github.com/Textualize/frogmouth/blob/${src.rev}/ChangeLog.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/fu/fundoc/package.nix b/pkgs/by-name/fu/fundoc/package.nix
index 5b706844b853..2cc010735e61 100644
--- a/pkgs/by-name/fu/fundoc/package.nix
+++ b/pkgs/by-name/fu/fundoc/package.nix
@@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "fundoc";
     homepage = "https://github.com/daynin/fundoc";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/fu/funzzy/package.nix b/pkgs/by-name/fu/funzzy/package.nix
index 01197637f30a..4ad552932f31 100644
--- a/pkgs/by-name/fu/funzzy/package.nix
+++ b/pkgs/by-name/fu/funzzy/package.nix
@@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/cristianoliveira/funzzy";
     changelog = "https://github.com/cristianoliveira/funzzy/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/fw/fw/package.nix b/pkgs/by-name/fw/fw/package.nix
index b75f1d149af1..4dfbb0f25089 100644
--- a/pkgs/by-name/fw/fw/package.nix
+++ b/pkgs/by-name/fw/fw/package.nix
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage rec {
     description = "Workspace productivity booster";
     homepage = "https://github.com/brocode/fw";
     license = licenses.wtfpl;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "fw";
   };
 }
diff --git a/pkgs/by-name/ga/gambit-chess/package.nix b/pkgs/by-name/ga/gambit-chess/package.nix
index c39fe64d522e..87e0d5d8278c 100644
--- a/pkgs/by-name/ga/gambit-chess/package.nix
+++ b/pkgs/by-name/ga/gambit-chess/package.nix
@@ -52,6 +52,6 @@ buildGoModule rec {
     homepage = "https://github.com/maaslalani/gambit";
     changelog = "https://github.com/maaslalani/gambit/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/gd/gdrive3/package.nix b/pkgs/by-name/gd/gdrive3/package.nix
index ce5c408e621c..d6f71b8ef83c 100644
--- a/pkgs/by-name/gd/gdrive3/package.nix
+++ b/pkgs/by-name/gd/gdrive3/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/glotlabs/gdrive";
     changelog = "https://github.com/glotlabs/gdrive/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "gdrive";
   };
 }
diff --git a/pkgs/by-name/gi/git-dive/package.nix b/pkgs/by-name/gi/git-dive/package.nix
index 1e39b8e81b25..9ceb21c69260 100644
--- a/pkgs/by-name/gi/git-dive/package.nix
+++ b/pkgs/by-name/gi/git-dive/package.nix
@@ -63,7 +63,7 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "git-dive";
   };
 }
diff --git a/pkgs/by-name/gi/git-ignore/package.nix b/pkgs/by-name/gi/git-ignore/package.nix
index d8648501f6ea..6a696219c143 100644
--- a/pkgs/by-name/gi/git-ignore/package.nix
+++ b/pkgs/by-name/gi/git-ignore/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/sondr3/git-ignore";
     changelog = "https://github.com/sondr3/git-ignore/blob/${src.rev}/CHANGELOG.md";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "git-ignore";
   };
 }
diff --git a/pkgs/by-name/gl/glicol-cli/package.nix b/pkgs/by-name/gl/glicol-cli/package.nix
index 56374a9d1cc7..9cfbbc9b691b 100644
--- a/pkgs/by-name/gl/glicol-cli/package.nix
+++ b/pkgs/by-name/gl/glicol-cli/package.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/glicol/glicol-cli";
     changelog = "https://github.com/glicol/glicol-cli/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "glicol-cli";
   };
 }
diff --git a/pkgs/by-name/go/gopatch/package.nix b/pkgs/by-name/go/gopatch/package.nix
index ad7a50f3d82e..2f3573ee5a64 100644
--- a/pkgs/by-name/go/gopatch/package.nix
+++ b/pkgs/by-name/go/gopatch/package.nix
@@ -41,6 +41,6 @@ buildGoModule rec {
     homepage = "https://github.com/uber-go/gopatch";
     changelog = "https://github.com/uber-go/gopatch/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/gp/gpython/package.nix b/pkgs/by-name/gp/gpython/package.nix
index 2891dd308d86..1358e3f9f2d1 100644
--- a/pkgs/by-name/gp/gpython/package.nix
+++ b/pkgs/by-name/gp/gpython/package.nix
@@ -44,6 +44,6 @@ buildGoModule rec {
     homepage = "https://github.com/go-python/gpython";
     changelog = "https://github.com/go-python/gpython/releases/tag/${src.rev}";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/gq/gql/package.nix b/pkgs/by-name/gq/gql/package.nix
index 708fcf107ded..d84408587a9f 100644
--- a/pkgs/by-name/gq/gql/package.nix
+++ b/pkgs/by-name/gq/gql/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/AmrDeveloper/GQL";
     changelog = "https://github.com/AmrDeveloper/GQL/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "gitql";
   };
 }
diff --git a/pkgs/by-name/gr/gradescope-submit/package.nix b/pkgs/by-name/gr/gradescope-submit/package.nix
index 8cd424e93907..b17350bedc48 100644
--- a/pkgs/by-name/gr/gradescope-submit/package.nix
+++ b/pkgs/by-name/gr/gradescope-submit/package.nix
@@ -30,7 +30,7 @@ ocamlPackages.buildDunePackage rec {
     description = "Small script to submit to Gradescope via GitHub";
     homepage = "https://github.com/nmittu/gradescope-submit";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "submit";
   };
 }
diff --git a/pkgs/by-name/gr/grass-sass/package.nix b/pkgs/by-name/gr/grass-sass/package.nix
index e578318e7296..e115a0b5c5ce 100644
--- a/pkgs/by-name/gr/grass-sass/package.nix
+++ b/pkgs/by-name/gr/grass-sass/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
       replaceStrings [ "." ] [ "" ] version
     }";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "grass";
   };
 }
diff --git a/pkgs/by-name/gr/gridlock/package.nix b/pkgs/by-name/gr/gridlock/package.nix
index 05a4a801f451..11800e875185 100644
--- a/pkgs/by-name/gr/gridlock/package.nix
+++ b/pkgs/by-name/gr/gridlock/package.nix
@@ -40,6 +40,6 @@ rustPlatform.buildRustPackage {
     description = "Nix compatible lockfile manager, without Nix";
     homepage = "https://github.com/lf-/gridlock";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/gt/gtree/package.nix b/pkgs/by-name/gt/gtree/package.nix
index 68adfa1cfd64..ba5dedb397b0 100644
--- a/pkgs/by-name/gt/gtree/package.nix
+++ b/pkgs/by-name/gt/gtree/package.nix
@@ -42,6 +42,6 @@ buildGoModule rec {
     homepage = "https://github.com/ddddddO/gtree";
     changelog = "https://github.com/ddddddO/gtree/releases/tag/${src.rev}";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/hi/highlight-assertions/package.nix b/pkgs/by-name/hi/highlight-assertions/package.nix
index 56df0193ec72..3c9e5ac064c0 100644
--- a/pkgs/by-name/hi/highlight-assertions/package.nix
+++ b/pkgs/by-name/hi/highlight-assertions/package.nix
@@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "highlight-assertions";
     homepage = "https://github.com/thehamsta/highlight-assertions";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ht/httpref/package.nix b/pkgs/by-name/ht/httpref/package.nix
index fb04d45c3d51..dd749206242b 100644
--- a/pkgs/by-name/ht/httpref/package.nix
+++ b/pkgs/by-name/ht/httpref/package.nix
@@ -28,6 +28,6 @@ buildGoModule rec {
     homepage = "https://github.com/dnnrly/httpref";
     changelog = "https://github.com/dnnrly/httpref/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ht/httprobe/package.nix b/pkgs/by-name/ht/httprobe/package.nix
index a1c2b4da34dc..8ffeee37e30a 100644
--- a/pkgs/by-name/ht/httprobe/package.nix
+++ b/pkgs/by-name/ht/httprobe/package.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
     description = "Take a list of domains and probe for working HTTP and HTTPS servers";
     homepage = "https://github.com/tomnomnom/httprobe";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "httprobe";
   };
 }
diff --git a/pkgs/by-name/hu/huniq/package.nix b/pkgs/by-name/hu/huniq/package.nix
index 92f2b2395069..98443496e4b4 100644
--- a/pkgs/by-name/hu/huniq/package.nix
+++ b/pkgs/by-name/hu/huniq/package.nix
@@ -20,6 +20,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "huniq";
     homepage = "https://github.com/koraa/huniq";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/hv/hvm/package.nix b/pkgs/by-name/hv/hvm/package.nix
index 30be3418d8e8..7727bab93a04 100644
--- a/pkgs/by-name/hv/hvm/package.nix
+++ b/pkgs/by-name/hv/hvm/package.nix
@@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "hvm";
     homepage = "https://github.com/higherorderco/hvm";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ic/icebreaker/package.nix b/pkgs/by-name/ic/icebreaker/package.nix
index 546fe4174e77..6c4c08816b6d 100644
--- a/pkgs/by-name/ic/icebreaker/package.nix
+++ b/pkgs/by-name/ic/icebreaker/package.nix
@@ -41,7 +41,7 @@ buildGoModule {
     description = "Web app that allows students to ask real-time, anonymous questions during class";
     homepage = "https://github.com/jonhoo/icebreaker";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "icebreaker";
   };
 }
diff --git a/pkgs/by-name/im/image-roll/package.nix b/pkgs/by-name/im/image-roll/package.nix
index 520a20799503..e5b3772d51b6 100644
--- a/pkgs/by-name/im/image-roll/package.nix
+++ b/pkgs/by-name/im/image-roll/package.nix
@@ -48,6 +48,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "image-roll";
     homepage = "https://github.com/weclaw1/image-roll";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/in/inlyne/package.nix b/pkgs/by-name/in/inlyne/package.nix
index ac90d2101b61..9b2478234ffd 100644
--- a/pkgs/by-name/in/inlyne/package.nix
+++ b/pkgs/by-name/in/inlyne/package.nix
@@ -72,7 +72,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/Inlyne-Project/inlyne";
     changelog = "https://github.com/Inlyne-Project/inlyne/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "inlyne";
   };
 }
diff --git a/pkgs/by-name/ja/jacoco/package.nix b/pkgs/by-name/ja/jacoco/package.nix
index 7702dc03137f..4779d1b3da21 100644
--- a/pkgs/by-name/ja/jacoco/package.nix
+++ b/pkgs/by-name/ja/jacoco/package.nix
@@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
     changelog = "https://www.jacoco.org/jacoco/trunk/doc/changes.html";
     license = licenses.epl20;
     platforms = platforms.all;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/je/jen/package.nix b/pkgs/by-name/je/jen/package.nix
index da38e57939ed..f59d6dbee404 100644
--- a/pkgs/by-name/je/jen/package.nix
+++ b/pkgs/by-name/je/jen/package.nix
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "jen";
     homepage = "https://github.com/whitfin/jen";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ji/jinja2-cli/package.nix b/pkgs/by-name/ji/jinja2-cli/package.nix
index 2b1392b4ecde..2b9529444413 100644
--- a/pkgs/by-name/ji/jinja2-cli/package.nix
+++ b/pkgs/by-name/ji/jinja2-cli/package.nix
@@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication rec {
     description = "CLI for Jinja2";
     homepage = "https://github.com/mattrobenolt/jinja2-cli";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "jinja2";
   };
 }
diff --git a/pkgs/by-name/jo/jotdown/package.nix b/pkgs/by-name/jo/jotdown/package.nix
index 8bfde8ead76c..d7a910e967ea 100644
--- a/pkgs/by-name/jo/jotdown/package.nix
+++ b/pkgs/by-name/jo/jotdown/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/hellux/jotdown";
     changelog = "https://github.com/hellux/jotdown/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/js/jsonfmt/package.nix b/pkgs/by-name/js/jsonfmt/package.nix
index 0c4e5e716d0e..d9c5f1f9c752 100644
--- a/pkgs/by-name/js/jsonfmt/package.nix
+++ b/pkgs/by-name/js/jsonfmt/package.nix
@@ -36,7 +36,7 @@ buildGoModule rec {
     homepage = "https://github.com/caarlos0/jsonfmt";
     changelog = "https://github.com/caarlos0/jsonfmt/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "jsonfmt";
   };
 }
diff --git a/pkgs/by-name/kb/kbt/package.nix b/pkgs/by-name/kb/kbt/package.nix
index 6157af531561..dfc0380b9e10 100644
--- a/pkgs/by-name/kb/kbt/package.nix
+++ b/pkgs/by-name/kb/kbt/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     description = "Keyboard tester in terminal";
     homepage = "https://github.com/bloznelis/kbt";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "kbt";
   };
 }
diff --git a/pkgs/by-name/ki/kind2/package.nix b/pkgs/by-name/ki/kind2/package.nix
index 1de95f77d260..f5106139344a 100644
--- a/pkgs/by-name/ki/kind2/package.nix
+++ b/pkgs/by-name/ki/kind2/package.nix
@@ -30,6 +30,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "kind2";
     homepage = "https://github.com/higherorderco/kind";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ko/kool/package.nix b/pkgs/by-name/ko/kool/package.nix
index 5527f9ffb065..d55de0b4339c 100644
--- a/pkgs/by-name/ko/kool/package.nix
+++ b/pkgs/by-name/ko/kool/package.nix
@@ -37,6 +37,6 @@ buildGoModule rec {
     homepage = "https://kool.dev";
     changelog = "https://github.com/kool-dev/kool/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/la/lazycli/package.nix b/pkgs/by-name/la/lazycli/package.nix
index 8fe39e3d140e..3c0ee41a5cfb 100644
--- a/pkgs/by-name/la/lazycli/package.nix
+++ b/pkgs/by-name/la/lazycli/package.nix
@@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec {
     description = "Tool to static turn CLI commands into TUIs";
     homepage = "https://github.com/jesseduffield/lazycli";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "lazycli";
   };
 }
diff --git a/pkgs/by-name/le/leptosfmt/package.nix b/pkgs/by-name/le/leptosfmt/package.nix
index b6931829597b..2ee8e4ab9253 100644
--- a/pkgs/by-name/le/leptosfmt/package.nix
+++ b/pkgs/by-name/le/leptosfmt/package.nix
@@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/li/lineselect/package.nix b/pkgs/by-name/li/lineselect/package.nix
index 5386172232ea..140ce971410e 100644
--- a/pkgs/by-name/li/lineselect/package.nix
+++ b/pkgs/by-name/li/lineselect/package.nix
@@ -33,7 +33,7 @@ buildNpmPackage rec {
     description = "Shell utility to interactively select lines from stdin";
     homepage = "https://github.com/chfritz/lineselect";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "lineselect";
   };
 }
diff --git a/pkgs/by-name/li/lipl/package.nix b/pkgs/by-name/li/lipl/package.nix
index 23871ddd4417..72d2c0734460 100644
--- a/pkgs/by-name/li/lipl/package.nix
+++ b/pkgs/by-name/li/lipl/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage {
     description = "Command line tool to analyse the output over time of custom shell commands";
     homepage = "https://github.com/yxdunc/lipl";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "lipl";
   };
 }
diff --git a/pkgs/by-name/lu/luaformatter/package.nix b/pkgs/by-name/lu/luaformatter/package.nix
index 06bded91452f..4f897ed991f3 100644
--- a/pkgs/by-name/lu/luaformatter/package.nix
+++ b/pkgs/by-name/lu/luaformatter/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/Koihik/LuaFormatter";
     license = licenses.asl20;
     platforms = platforms.all;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "lua-format";
   };
 }
diff --git a/pkgs/by-name/lu/lucky-commit/package.nix b/pkgs/by-name/lu/lucky-commit/package.nix
index 5763e99039f1..4190ef3a071e 100644
--- a/pkgs/by-name/lu/lucky-commit/package.nix
+++ b/pkgs/by-name/lu/lucky-commit/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
     description = "Change the start of your git commit hashes to whatever you want";
     homepage = "https://github.com/not-an-aardvark/lucky-commit";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "lucky_commit";
   };
 }
diff --git a/pkgs/by-name/lu/lunatic/package.nix b/pkgs/by-name/lu/lunatic/package.nix
index 4d4331414386..11f01928975b 100644
--- a/pkgs/by-name/lu/lunatic/package.nix
+++ b/pkgs/by-name/lu/lunatic/package.nix
@@ -46,6 +46,6 @@ rustPlatform.buildRustPackage {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/lw/lwc/package.nix b/pkgs/by-name/lw/lwc/package.nix
index d9006a5570f6..486f92e29fcf 100644
--- a/pkgs/by-name/lw/lwc/package.nix
+++ b/pkgs/by-name/lw/lwc/package.nix
@@ -27,7 +27,7 @@ buildGoModule rec {
     description = "Live-updating version of the UNIX wc command";
     homepage = "https://github.com/timdp/lwc";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "lwc";
   };
 }
diff --git a/pkgs/by-name/ma/markscribe/package.nix b/pkgs/by-name/ma/markscribe/package.nix
index 9dac443919f3..7124b951a9de 100644
--- a/pkgs/by-name/ma/markscribe/package.nix
+++ b/pkgs/by-name/ma/markscribe/package.nix
@@ -28,6 +28,6 @@ buildGoModule rec {
     homepage = "https://github.com/muesli/markscribe";
     changelog = "https://github.com/muesli/markscribe/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ma/mastotool/package.nix b/pkgs/by-name/ma/mastotool/package.nix
index c14432ab819f..a9b91c88b401 100644
--- a/pkgs/by-name/ma/mastotool/package.nix
+++ b/pkgs/by-name/ma/mastotool/package.nix
@@ -27,7 +27,7 @@ buildGoModule rec {
     homepage = "https://github.com/muesli/mastotool";
     changelog = "https://github.com/muesli/mastotool/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "mastotool";
   };
 }
diff --git a/pkgs/by-name/md/mdr/package.nix b/pkgs/by-name/md/mdr/package.nix
index 79aa9c543817..591c807b0c18 100644
--- a/pkgs/by-name/md/mdr/package.nix
+++ b/pkgs/by-name/md/mdr/package.nix
@@ -29,7 +29,7 @@ buildGoModule rec {
     description = "MarkDown Renderer for the terminal";
     homepage = "https://github.com/MichaelMure/mdr";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "mdr";
   };
 }
diff --git a/pkgs/by-name/na/namaka/package.nix b/pkgs/by-name/na/namaka/package.nix
index ee2e337c3eb3..6810ab0fef2b 100644
--- a/pkgs/by-name/na/namaka/package.nix
+++ b/pkgs/by-name/na/namaka/package.nix
@@ -45,6 +45,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/nix-community/namaka";
     changelog = "https://github.com/nix-community/namaka/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ne/nerdfix/package.nix b/pkgs/by-name/ne/nerdfix/package.nix
index 2ea8471f8813..47e5d66fa912 100644
--- a/pkgs/by-name/ne/nerdfix/package.nix
+++ b/pkgs/by-name/ne/nerdfix/package.nix
@@ -26,6 +26,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ni/nix-melt/package.nix b/pkgs/by-name/ni/nix-melt/package.nix
index 48f25deee1f1..5fcd038ae8f5 100644
--- a/pkgs/by-name/ni/nix-melt/package.nix
+++ b/pkgs/by-name/ni/nix-melt/package.nix
@@ -37,6 +37,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/nix-community/nix-melt";
     changelog = "https://github.com/nix-community/nix-melt/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mpl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/no/nomino/package.nix b/pkgs/by-name/no/nomino/package.nix
index 6986d6f60b9d..8108d270d350 100644
--- a/pkgs/by-name/no/nomino/package.nix
+++ b/pkgs/by-name/no/nomino/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "nomino";
   };
 }
diff --git a/pkgs/by-name/or/oranda/package.nix b/pkgs/by-name/or/oranda/package.nix
index 9b8caf125e99..43709d15407d 100644
--- a/pkgs/by-name/or/oranda/package.nix
+++ b/pkgs/by-name/or/oranda/package.nix
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "oranda";
   };
 }
diff --git a/pkgs/by-name/or/org-stats/package.nix b/pkgs/by-name/or/org-stats/package.nix
index 297c76095bfa..fc734f4f6a43 100644
--- a/pkgs/by-name/or/org-stats/package.nix
+++ b/pkgs/by-name/or/org-stats/package.nix
@@ -60,7 +60,7 @@ buildGoModule rec {
     homepage = "https://github.com/caarlos0/org-stats";
     changelog = "https://github.com/caarlos0/org-stats/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "org-stats";
   };
 }
diff --git a/pkgs/by-name/or/orz/package.nix b/pkgs/by-name/or/orz/package.nix
index 42832112ec1f..365ea3f22b91 100644
--- a/pkgs/by-name/or/orz/package.nix
+++ b/pkgs/by-name/or/orz/package.nix
@@ -39,7 +39,7 @@ rustPlatform.buildRustPackage {
     description = "High performance, general purpose data compressor written in rust";
     homepage = "https://github.com/richox/orz";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "orz";
   };
 }
diff --git a/pkgs/by-name/pa/panamax/package.nix b/pkgs/by-name/pa/panamax/package.nix
index 83fbae58203b..ef2929065f3f 100644
--- a/pkgs/by-name/pa/panamax/package.nix
+++ b/pkgs/by-name/pa/panamax/package.nix
@@ -35,6 +35,6 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/pe/peep/package.nix b/pkgs/by-name/pe/peep/package.nix
index 535b217910ec..1f7417801a7b 100644
--- a/pkgs/by-name/pe/peep/package.nix
+++ b/pkgs/by-name/pe/peep/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/ryochack/peep";
     changelog = "https://github.com/ryochack/peep/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "peep";
   };
 }
diff --git a/pkgs/by-name/pi/piknik/package.nix b/pkgs/by-name/pi/piknik/package.nix
index 16d25c09f0f9..e31f66f8711a 100644
--- a/pkgs/by-name/pi/piknik/package.nix
+++ b/pkgs/by-name/pi/piknik/package.nix
@@ -36,7 +36,7 @@ buildGoModule rec {
     homepage = "https://github.com/jedisct1/piknik";
     changelog = "https://github.com/jedisct1/piknik/blob/${src.rev}/ChangeLog";
     license = licenses.bsd2;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "piknik";
   };
 }
diff --git a/pkgs/by-name/pi/pipe-rename/package.nix b/pkgs/by-name/pi/pipe-rename/package.nix
index 5a23b123eb4d..4aa71106a680 100644
--- a/pkgs/by-name/pi/pipe-rename/package.nix
+++ b/pkgs/by-name/pi/pipe-rename/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     description = "Rename your files using your favorite text editor";
     homepage = "https://github.com/marcusbuffett/pipe-rename";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "renamer";
   };
 }
diff --git a/pkgs/by-name/po/poop/package.nix b/pkgs/by-name/po/poop/package.nix
index 3edae8fb889b..107fade87c08 100644
--- a/pkgs/by-name/po/poop/package.nix
+++ b/pkgs/by-name/po/poop/package.nix
@@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/andrewrk/poop";
     changelog = "https://github.com/andrewrk/poop/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     platforms = platforms.linux;
     mainProgram = "poop";
   };
diff --git a/pkgs/by-name/pr/process-viewer/package.nix b/pkgs/by-name/pr/process-viewer/package.nix
index 22d2b21503cd..ed2b78b81ed1 100644
--- a/pkgs/by-name/pr/process-viewer/package.nix
+++ b/pkgs/by-name/pr/process-viewer/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
     description = "Process viewer GUI in rust";
     homepage = "https://github.com/guillaumegomez/process-viewer";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "process_viewer";
   };
 }
diff --git a/pkgs/by-name/pr/projectable/package.nix b/pkgs/by-name/pr/projectable/package.nix
index 5333c183337b..92ddd7cc55d9 100644
--- a/pkgs/by-name/pr/projectable/package.nix
+++ b/pkgs/by-name/pr/projectable/package.nix
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/dzfrias/projectable";
     changelog = "https://github.com/dzfrias/projectable/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "prj";
   };
 }
diff --git a/pkgs/by-name/pr/proximity-sort/package.nix b/pkgs/by-name/pr/proximity-sort/package.nix
index 74a003ee691c..f812a071bdd7 100644
--- a/pkgs/by-name/pr/proximity-sort/package.nix
+++ b/pkgs/by-name/pr/proximity-sort/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "proximity-sort";
   };
 }
diff --git a/pkgs/by-name/ps/psitop/package.nix b/pkgs/by-name/ps/psitop/package.nix
index 573c6e970c9f..a4ecd0fb858d 100644
--- a/pkgs/by-name/ps/psitop/package.nix
+++ b/pkgs/by-name/ps/psitop/package.nix
@@ -26,7 +26,7 @@ buildGoModule rec {
     description = "Top for /proc/pressure";
     homepage = "https://github.com/jamespwilliams/psitop";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "psitop";
   };
 }
diff --git a/pkgs/by-name/pw/pw-viz/package.nix b/pkgs/by-name/pw/pw-viz/package.nix
index 1470a3f1f22d..435ee7d03fb6 100644
--- a/pkgs/by-name/pw/pw-viz/package.nix
+++ b/pkgs/by-name/pw/pw-viz/package.nix
@@ -62,7 +62,7 @@ rustPlatform.buildRustPackage rec {
     description = "Simple and elegant pipewire graph editor";
     homepage = "https://github.com/ax9d/pw-viz";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     platforms = platforms.linux;
   };
 }
diff --git a/pkgs/by-name/py/pysentation/package.nix b/pkgs/by-name/py/pysentation/package.nix
index 508d0486562d..128160dcceac 100644
--- a/pkgs/by-name/py/pysentation/package.nix
+++ b/pkgs/by-name/py/pysentation/package.nix
@@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://github.com/mimseyedi/pysentation";
     changelog = "https://github.com/mimseyedi/pysentation/releases/tag/${src.rev}";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "pysentation";
   };
 }
diff --git a/pkgs/by-name/pz/pzip/package.nix b/pkgs/by-name/pz/pzip/package.nix
index 36a95dd991df..ccac8c059a98 100644
--- a/pkgs/by-name/pz/pzip/package.nix
+++ b/pkgs/by-name/pz/pzip/package.nix
@@ -32,7 +32,7 @@ buildGoModule rec {
     homepage = "https://github.com/ybirader/pzip";
     changelog = "https://github.com/ybirader/pzip/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "pzip";
   };
 }
diff --git a/pkgs/by-name/ra/rare-regex/package.nix b/pkgs/by-name/ra/rare-regex/package.nix
index c9b10eeec338..197158d8653f 100644
--- a/pkgs/by-name/ra/rare-regex/package.nix
+++ b/pkgs/by-name/ra/rare-regex/package.nix
@@ -48,6 +48,6 @@ buildGoModule rec {
     homepage = "https://rare.zdyn.net";
     changelog = "https://github.com/zix99/rare/releases/tag/${src.rev}";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/re/reason-shell/package.nix b/pkgs/by-name/re/reason-shell/package.nix
index 092de4bafdf0..37b9b3a1b7ed 100644
--- a/pkgs/by-name/re/reason-shell/package.nix
+++ b/pkgs/by-name/re/reason-shell/package.nix
@@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/jaywonchung/reason";
     changelog = "https://github.com/jaywonchung/reason/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/re/regex-cli/package.nix b/pkgs/by-name/re/regex-cli/package.nix
index 09857a40045d..a9c7cb48e967 100644
--- a/pkgs/by-name/re/regex-cli/package.nix
+++ b/pkgs/by-name/re/regex-cli/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/re/repgrep/package.nix b/pkgs/by-name/re/repgrep/package.nix
index 24f55cb9b4f0..9c21d0c4a40f 100644
--- a/pkgs/by-name/re/repgrep/package.nix
+++ b/pkgs/by-name/re/repgrep/package.nix
@@ -53,7 +53,7 @@ rustPlatform.buildRustPackage rec {
       asl20
       unlicense
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rgr";
   };
 }
diff --git a/pkgs/by-name/rh/rhack/package.nix b/pkgs/by-name/rh/rhack/package.nix
index 9237f9d9e2df..68d39d9b040a 100644
--- a/pkgs/by-name/rh/rhack/package.nix
+++ b/pkgs/by-name/rh/rhack/package.nix
@@ -22,6 +22,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "rhack";
     homepage = "https://github.com/nakabonne/rhack";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/rh/rhai-doc/package.nix b/pkgs/by-name/rh/rhai-doc/package.nix
index cb3a9b09e507..c2dd992624e0 100644
--- a/pkgs/by-name/rh/rhai-doc/package.nix
+++ b/pkgs/by-name/rh/rhai-doc/package.nix
@@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rhai-doc";
   };
 }
diff --git a/pkgs/by-name/ri/ripdrag/package.nix b/pkgs/by-name/ri/ripdrag/package.nix
index e4ebba193714..747a8b2274c0 100644
--- a/pkgs/by-name/ri/ripdrag/package.nix
+++ b/pkgs/by-name/ri/ripdrag/package.nix
@@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/nik012003/ripdrag";
     changelog = "https://github.com/nik012003/ripdrag/releases/tag/${src.rev}";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "ripdrag";
   };
 }
diff --git a/pkgs/by-name/ri/ripsecrets/package.nix b/pkgs/by-name/ri/ripsecrets/package.nix
index f746c89f627d..b4388cfd3b68 100644
--- a/pkgs/by-name/ri/ripsecrets/package.nix
+++ b/pkgs/by-name/ri/ripsecrets/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/sirwart/ripsecrets";
     changelog = "https://github.com/sirwart/ripsecrets/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "ripsecrets";
   };
 }
diff --git a/pkgs/by-name/ri/risor/package.nix b/pkgs/by-name/ri/risor/package.nix
index f8e5db6e3eda..bd56015dc760 100644
--- a/pkgs/by-name/ri/risor/package.nix
+++ b/pkgs/by-name/ri/risor/package.nix
@@ -43,6 +43,6 @@ buildGoModule rec {
     homepage = "https://github.com/risor-io/risor";
     changelog = "https://github.com/risor-io/risor/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/rl/rlci/package.nix b/pkgs/by-name/rl/rlci/package.nix
index 43dd26e495f7..e16eaf314df3 100644
--- a/pkgs/by-name/rl/rlci/package.nix
+++ b/pkgs/by-name/rl/rlci/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/orsinium-labs/rlci";
     changelog = "https://github.com/orsinium-labs/rlci/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ro/roogle/package.nix b/pkgs/by-name/ro/roogle/package.nix
index 04f503d984fc..ccc528f98baf 100644
--- a/pkgs/by-name/ro/roogle/package.nix
+++ b/pkgs/by-name/ro/roogle/package.nix
@@ -25,6 +25,6 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/rs/rsign2/package.nix b/pkgs/by-name/rs/rsign2/package.nix
index 8c7a54f32460..833e5a8ae93e 100644
--- a/pkgs/by-name/rs/rsign2/package.nix
+++ b/pkgs/by-name/rs/rsign2/package.nix
@@ -19,7 +19,7 @@ rustPlatform.buildRustPackage rec {
     description = "Command-line tool to sign files and verify signatures";
     homepage = "https://github.com/jedisct1/rsign2";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rsign";
   };
 }
diff --git a/pkgs/by-name/rs/rslint/package.nix b/pkgs/by-name/rs/rslint/package.nix
index a2ae78e45362..166b46993283 100644
--- a/pkgs/by-name/rs/rslint/package.nix
+++ b/pkgs/by-name/rs/rslint/package.nix
@@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec {
     description = "Fast, customizable, and easy to use JavaScript and TypeScript linter";
     homepage = "https://rslint.org";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/rt/rtz/package.nix b/pkgs/by-name/rt/rtz/package.nix
index f8f1f6a8bf44..19267444a5e8 100644
--- a/pkgs/by-name/rt/rtz/package.nix
+++ b/pkgs/by-name/rt/rtz/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/twitchax/rtz";
     changelog = "https://github.com/twitchax/rtz/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rtz";
   };
 }
diff --git a/pkgs/by-name/ru/runiq/package.nix b/pkgs/by-name/ru/runiq/package.nix
index 85cd0995f1f5..c85b8ed4b46a 100644
--- a/pkgs/by-name/ru/runiq/package.nix
+++ b/pkgs/by-name/ru/runiq/package.nix
@@ -26,6 +26,6 @@ rustPlatform.buildRustPackage {
     mainProgram = "runiq";
     homepage = "https://github.com/whitfin/runiq";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ru/rust-audit-info/package.nix b/pkgs/by-name/ru/rust-audit-info/package.nix
index a08eb73b92e0..f9571cc03743 100644
--- a/pkgs/by-name/ru/rust-audit-info/package.nix
+++ b/pkgs/by-name/ru/rust-audit-info/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ru/rust-code-analysis/package.nix b/pkgs/by-name/ru/rust-code-analysis/package.nix
index 03319c79b69b..f614b87f20a2 100644
--- a/pkgs/by-name/ru/rust-code-analysis/package.nix
+++ b/pkgs/by-name/ru/rust-code-analysis/package.nix
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
       mit # grammars
       mpl20 # code
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rust-code-analysis-cli";
   };
 }
diff --git a/pkgs/by-name/ru/rust-petname/package.nix b/pkgs/by-name/ru/rust-petname/package.nix
index 52bcf3fc4722..ec655a6ee1aa 100644
--- a/pkgs/by-name/ru/rust-petname/package.nix
+++ b/pkgs/by-name/ru/rust-petname/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
     description = "Generate human readable random names";
     homepage = "https://github.com/allenap/rust-petname";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "petname";
   };
 }
diff --git a/pkgs/by-name/ru/rust-traverse/package.nix b/pkgs/by-name/ru/rust-traverse/package.nix
index aaa8fe5bed65..bcf9d76e7b35 100644
--- a/pkgs/by-name/ru/rust-traverse/package.nix
+++ b/pkgs/by-name/ru/rust-traverse/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/dmcg310/Rust-Traverse";
     changelog = "https://github.com/dmcg310/Rust-Traverse/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rt";
   };
 }
diff --git a/pkgs/by-name/ru/rustypaste-cli/package.nix b/pkgs/by-name/ru/rustypaste-cli/package.nix
index 0c98a85471a8..a62165a66d25 100644
--- a/pkgs/by-name/ru/rustypaste-cli/package.nix
+++ b/pkgs/by-name/ru/rustypaste-cli/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/orhun/rustypaste-cli";
     changelog = "https://github.com/orhun/rustypaste-cli/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "rpaste";
   };
 }
diff --git a/pkgs/by-name/ru/rustywind/package.nix b/pkgs/by-name/ru/rustywind/package.nix
index c788be55e039..ac04fdbffa0a 100644
--- a/pkgs/by-name/ru/rustywind/package.nix
+++ b/pkgs/by-name/ru/rustywind/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/avencera/rustywind";
     changelog = "https://github.com/avencera/rustywind/blob/${src.rev}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/sa/safecloset/package.nix b/pkgs/by-name/sa/safecloset/package.nix
index c03b53be8f01..74a29750c4ae 100644
--- a/pkgs/by-name/sa/safecloset/package.nix
+++ b/pkgs/by-name/sa/safecloset/package.nix
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/Canop/safecloset";
     changelog = "https://github.com/Canop/safecloset/blob/${src.rev}/CHANGELOG.md";
     license = licenses.agpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "safecloset";
   };
 }
diff --git a/pkgs/by-name/sc/scip/package.nix b/pkgs/by-name/sc/scip/package.nix
index 1ddfc127de6d..d9cfa6444b3b 100644
--- a/pkgs/by-name/sc/scip/package.nix
+++ b/pkgs/by-name/sc/scip/package.nix
@@ -44,6 +44,6 @@ buildGoModule rec {
     homepage = "https://github.com/sourcegraph/scip";
     changelog = "https://github.com/sourcegraph/scip/blob/${src.rev}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/sc/scriptisto/package.nix b/pkgs/by-name/sc/scriptisto/package.nix
index 98660ead97d8..3058e94cf36a 100644
--- a/pkgs/by-name/sc/scriptisto/package.nix
+++ b/pkgs/by-name/sc/scriptisto/package.nix
@@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/igor-petruk/scriptisto";
     changelog = "https://github.com/igor-petruk/scriptisto/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/sh/shell2http/package.nix b/pkgs/by-name/sh/shell2http/package.nix
index 0a60684c2abb..da316d17d282 100644
--- a/pkgs/by-name/sh/shell2http/package.nix
+++ b/pkgs/by-name/sh/shell2http/package.nix
@@ -48,6 +48,6 @@ buildGoModule rec {
     homepage = "https://github.com/msoap/shell2http";
     changelog = "https://github.com/msoap/shell2http/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/sl/slingshot/package.nix b/pkgs/by-name/sl/slingshot/package.nix
index 36b8921abfca..6be7d0ace34b 100644
--- a/pkgs/by-name/sl/slingshot/package.nix
+++ b/pkgs/by-name/sl/slingshot/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/caio-ishikawa/slingshot";
     changelog = "https://github.com/caio-ishikawa/slingshot/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "slingshot";
   };
 }
diff --git a/pkgs/by-name/sl/slippy/package.nix b/pkgs/by-name/sl/slippy/package.nix
index b932891fd2e3..0bbe1997e9ce 100644
--- a/pkgs/by-name/sl/slippy/package.nix
+++ b/pkgs/by-name/sl/slippy/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "slippy";
   };
 }
diff --git a/pkgs/by-name/sm/smartcrop/package.nix b/pkgs/by-name/sm/smartcrop/package.nix
index a65b19f45670..3473ed094a90 100644
--- a/pkgs/by-name/sm/smartcrop/package.nix
+++ b/pkgs/by-name/sm/smartcrop/package.nix
@@ -26,7 +26,7 @@ buildGoModule {
     description = "Find good image crops for arbitrary crop sizes";
     homepage = "https://github.com/muesli/smartcrop";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "smartcrop";
   };
 }
diff --git a/pkgs/by-name/sp/spacer/package.nix b/pkgs/by-name/sp/spacer/package.nix
index 0aff7424ff30..c860633900f4 100644
--- a/pkgs/by-name/sp/spacer/package.nix
+++ b/pkgs/by-name/sp/spacer/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/samwho/spacer";
     changelog = "https://github.com/samwho/spacer/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "spacer";
   };
 }
diff --git a/pkgs/by-name/sp/specr-transpile/package.nix b/pkgs/by-name/sp/specr-transpile/package.nix
index ffb3afd5d841..a7026c6dcac6 100644
--- a/pkgs/by-name/sp/specr-transpile/package.nix
+++ b/pkgs/by-name/sp/specr-transpile/package.nix
@@ -23,6 +23,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/st/star-history/package.nix b/pkgs/by-name/st/star-history/package.nix
index 533672aca660..733ad0ca3a8e 100644
--- a/pkgs/by-name/st/star-history/package.nix
+++ b/pkgs/by-name/st/star-history/package.nix
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "star-history";
   };
 }
diff --git a/pkgs/by-name/st/starcharts/package.nix b/pkgs/by-name/st/starcharts/package.nix
index 48e051049aad..8647ecd27e76 100644
--- a/pkgs/by-name/st/starcharts/package.nix
+++ b/pkgs/by-name/st/starcharts/package.nix
@@ -31,6 +31,6 @@ buildGoModule rec {
     homepage = "https://github.com/caarlos0/starcharts";
     changelog = "https://github.com/caarlos0/starcharts/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/st/starry/package.nix b/pkgs/by-name/st/starry/package.nix
index 04792fc253dd..2fb47599e5f0 100644
--- a/pkgs/by-name/st/starry/package.nix
+++ b/pkgs/by-name/st/starry/package.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
     description = "Current stars history tells only half the story";
     homepage = "https://github.com/Canop/starry";
     license = licenses.agpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "starry";
   };
 }
diff --git a/pkgs/by-name/st/static-server/package.nix b/pkgs/by-name/st/static-server/package.nix
index 57527d9e3c2c..70a14a5f77f7 100644
--- a/pkgs/by-name/st/static-server/package.nix
+++ b/pkgs/by-name/st/static-server/package.nix
@@ -53,7 +53,7 @@ buildGoModule rec {
     description = "Simple, zero-configuration HTTP server CLI for serving static files";
     homepage = "https://github.com/eliben/static-server";
     license = licenses.unlicense;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "static-server";
   };
 }
diff --git a/pkgs/by-name/st/strace-analyzer/package.nix b/pkgs/by-name/st/strace-analyzer/package.nix
index 3aedac217310..d4fa0f7bd7d0 100644
--- a/pkgs/by-name/st/strace-analyzer/package.nix
+++ b/pkgs/by-name/st/strace-analyzer/package.nix
@@ -31,6 +31,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "strace-analyzer";
     homepage = "https://github.com/wookietreiber/strace-analyzer";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/su/suckit/package.nix b/pkgs/by-name/su/suckit/package.nix
index 911b9ce66db5..15cc97e8831f 100644
--- a/pkgs/by-name/su/suckit/package.nix
+++ b/pkgs/by-name/su/suckit/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
       asl20 # or
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "suckit";
   };
 }
diff --git a/pkgs/by-name/sy/symbolicator/package.nix b/pkgs/by-name/sy/symbolicator/package.nix
index e4056c3e158e..6e84b2c50cf9 100644
--- a/pkgs/by-name/sy/symbolicator/package.nix
+++ b/pkgs/by-name/sy/symbolicator/package.nix
@@ -47,7 +47,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://getsentry.github.io/symbolicator/";
     changelog = "https://github.com/getsentry/symbolicator/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "symbolicator";
   };
 }
diff --git a/pkgs/by-name/sy/synth/package.nix b/pkgs/by-name/sy/synth/package.nix
index 8fe291d2667b..baa1bd3b9c76 100644
--- a/pkgs/by-name/sy/synth/package.nix
+++ b/pkgs/by-name/sy/synth/package.nix
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
     description = "Tool for generating realistic data using a declarative data model";
     homepage = "https://github.com/getsynth/synth";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ta/tailer/package.nix b/pkgs/by-name/ta/tailer/package.nix
index d9899b7d2cac..fd39be43ddf0 100644
--- a/pkgs/by-name/ta/tailer/package.nix
+++ b/pkgs/by-name/ta/tailer/package.nix
@@ -35,7 +35,7 @@ buildGoModule rec {
     description = "CLI tool to insert lines when command output stops";
     homepage = "https://github.com/hionay/tailer";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "tailer";
   };
 }
diff --git a/pkgs/by-name/ta/taizen/package.nix b/pkgs/by-name/ta/taizen/package.nix
index c5ea950928a3..313371f41073 100644
--- a/pkgs/by-name/ta/taizen/package.nix
+++ b/pkgs/by-name/ta/taizen/package.nix
@@ -41,7 +41,7 @@ rustPlatform.buildRustPackage {
     description = "Curses-based mediawiki browser";
     homepage = "https://github.com/oppiliappan/taizen";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "taizen";
   };
 }
diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix
index c38f2ba1816a..6594a78872ae 100644
--- a/pkgs/by-name/ta/taplo/package.nix
+++ b/pkgs/by-name/ta/taplo/package.nix
@@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec {
     description = "TOML toolkit written in Rust";
     homepage = "https://taplo.tamasfe.dev";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "taplo";
   };
 }
diff --git a/pkgs/by-name/te/teehee/package.nix b/pkgs/by-name/te/teehee/package.nix
index bb609016a324..b1e46c54a1a0 100644
--- a/pkgs/by-name/te/teehee/package.nix
+++ b/pkgs/by-name/te/teehee/package.nix
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/Gskartwii/teehee";
     changelog = "https://github.com/Gskartwii/teehee/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "teehee";
   };
 }
diff --git a/pkgs/by-name/te/tela-icon-theme/package.nix b/pkgs/by-name/te/tela-icon-theme/package.nix
index 149e88d07928..bb8a1ef8ee4f 100644
--- a/pkgs/by-name/te/tela-icon-theme/package.nix
+++ b/pkgs/by-name/te/tela-icon-theme/package.nix
@@ -56,6 +56,6 @@ stdenvNoCC.mkDerivation rec {
     license = licenses.gpl3Only;
     # darwin systems use case-insensitive filesystems that cause hash mismatches
     platforms = subtractLists platforms.darwin platforms.unix;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/te/textplots/package.nix b/pkgs/by-name/te/textplots/package.nix
index 041f0fefee13..b1f608802112 100644
--- a/pkgs/by-name/te/textplots/package.nix
+++ b/pkgs/by-name/te/textplots/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     description = "Terminal plotting written in Rust";
     homepage = "https://github.com/loony-bean/textplots-rs";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "textplots";
   };
 }
diff --git a/pkgs/by-name/te/texture-synthesis/package.nix b/pkgs/by-name/te/texture-synthesis/package.nix
index 2346dfe4c027..55e1499fac85 100644
--- a/pkgs/by-name/te/texture-synthesis/package.nix
+++ b/pkgs/by-name/te/texture-synthesis/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "texture-synthesis";
   };
 }
diff --git a/pkgs/by-name/th/theme-sh/package.nix b/pkgs/by-name/th/theme-sh/package.nix
index 653bf7b148a6..c1a9249f0a92 100644
--- a/pkgs/by-name/th/theme-sh/package.nix
+++ b/pkgs/by-name/th/theme-sh/package.nix
@@ -43,7 +43,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/lemnos/theme.sh";
     license = licenses.mit;
     platforms = platforms.all;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "theme.sh";
   };
 }
diff --git a/pkgs/by-name/th/thokr/package.nix b/pkgs/by-name/th/thokr/package.nix
index c59a6cae210f..6aae0ef9990e 100644
--- a/pkgs/by-name/th/thokr/package.nix
+++ b/pkgs/by-name/th/thokr/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     description = "Typing tui with visualized results and historical logging";
     homepage = "https://github.com/thatvegandev/thokr";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "thokr";
   };
 }
diff --git a/pkgs/by-name/ti/timelimit/package.nix b/pkgs/by-name/ti/timelimit/package.nix
index 75c708445708..d4af294c7e8f 100644
--- a/pkgs/by-name/ti/timelimit/package.nix
+++ b/pkgs/by-name/ti/timelimit/package.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
     homepage = "https://devel.ringlet.net/sysutils/timelimit/";
     license = licenses.bsd2;
     platforms = platforms.all;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "timelimit";
   };
 }
diff --git a/pkgs/by-name/to/toml2nix/package.nix b/pkgs/by-name/to/toml2nix/package.nix
index d173ad659d4b..3d4d84439aa5 100644
--- a/pkgs/by-name/to/toml2nix/package.nix
+++ b/pkgs/by-name/to/toml2nix/package.nix
@@ -27,6 +27,6 @@ rustPlatform.buildRustPackage rec {
       mit # or
       asl20
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/to/topfew-rs/package.nix b/pkgs/by-name/to/topfew-rs/package.nix
index 5f4b29c046e4..53d726e1e18e 100644
--- a/pkgs/by-name/to/topfew-rs/package.nix
+++ b/pkgs/by-name/to/topfew-rs/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     description = "Rust implementation of Tim Bray's topfew tool";
     homepage = "https://github.com/djc/topfew-rs";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "tf";
   };
 }
diff --git a/pkgs/by-name/to/topfew/package.nix b/pkgs/by-name/to/topfew/package.nix
index a4853fda5d23..8e88803fe238 100644
--- a/pkgs/by-name/to/topfew/package.nix
+++ b/pkgs/by-name/to/topfew/package.nix
@@ -35,7 +35,7 @@ buildGoModule rec {
     description = "Finds the fields (or combinations of fields) which appear most often in a stream of records";
     homepage = "https://github.com/timbray/topfew";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "tf";
   };
 }
diff --git a/pkgs/by-name/tr/trippy/package.nix b/pkgs/by-name/tr/trippy/package.nix
index b87fb6801510..1f060203854d 100644
--- a/pkgs/by-name/tr/trippy/package.nix
+++ b/pkgs/by-name/tr/trippy/package.nix
@@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://trippy.cli.rs";
     changelog = "https://github.com/fujiapple852/trippy/blob/${src.rev}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "trip";
   };
 }
diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix
index 57b72915a3fc..2b7fc3d46765 100644
--- a/pkgs/by-name/tu/tui-journal/package.nix
+++ b/pkgs/by-name/tu/tui-journal/package.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/AmmarAbouZor/tui-journal";
     changelog = "https://github.com/AmmarAbouZor/tui-journal/blob/${src.rev}/CHANGELOG.ron";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "tjournal";
   };
 }
diff --git a/pkgs/by-name/tu/turtle-build/package.nix b/pkgs/by-name/tu/turtle-build/package.nix
index f9bbdccd0eec..577f7d1acef9 100644
--- a/pkgs/by-name/tu/turtle-build/package.nix
+++ b/pkgs/by-name/tu/turtle-build/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "turtle";
   };
 }
diff --git a/pkgs/by-name/ty/typer/package.nix b/pkgs/by-name/ty/typer/package.nix
index bc7403b3e92a..5ae829b443a0 100644
--- a/pkgs/by-name/ty/typer/package.nix
+++ b/pkgs/by-name/ty/typer/package.nix
@@ -26,7 +26,7 @@ buildGoModule {
     description = "Typing test in your terminal";
     homepage = "https://github.com/maaslalani/typer";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "typer";
   };
 }
diff --git a/pkgs/by-name/ty/typical/package.nix b/pkgs/by-name/ty/typical/package.nix
index 815f96170e22..c9fba03465ce 100644
--- a/pkgs/by-name/ty/typical/package.nix
+++ b/pkgs/by-name/ty/typical/package.nix
@@ -46,6 +46,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/stepchowfun/typical";
     changelog = "https://github.com/stepchowfun/typical/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ty/typioca/package.nix b/pkgs/by-name/ty/typioca/package.nix
index dfc9d61398bb..d24a3db91b32 100644
--- a/pkgs/by-name/ty/typioca/package.nix
+++ b/pkgs/by-name/ty/typioca/package.nix
@@ -36,7 +36,7 @@ buildGoModule rec {
     homepage = "https://github.com/bloznelis/typioca";
     changelog = "https://github.com/bloznelis/typioca/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "typioca";
   };
 }
diff --git a/pkgs/by-name/ty/typst-live/package.nix b/pkgs/by-name/ty/typst-live/package.nix
index 1fb570f918e4..1fce6af1bb64 100644
--- a/pkgs/by-name/ty/typst-live/package.nix
+++ b/pkgs/by-name/ty/typst-live/package.nix
@@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec {
     description = "Hot reloading for your typst files";
     homepage = "https://github.com/ItsEthra/typst-live";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "typst-live";
   };
 }
diff --git a/pkgs/by-name/ty/tyson/package.nix b/pkgs/by-name/ty/tyson/package.nix
index ddd04518a6b0..14a2bf2ed790 100644
--- a/pkgs/by-name/ty/tyson/package.nix
+++ b/pkgs/by-name/ty/tyson/package.nix
@@ -41,6 +41,6 @@ buildGoModule rec {
     homepage = "https://github.com/jetify-com/tyson";
     changelog = "https://github.com/jetify-com/tyson/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ul/ulid/package.nix b/pkgs/by-name/ul/ulid/package.nix
index f1dffd0eee30..cc333c120aec 100644
--- a/pkgs/by-name/ul/ulid/package.nix
+++ b/pkgs/by-name/ul/ulid/package.nix
@@ -32,7 +32,7 @@ buildGoModule rec {
     homepage = "https://github.com/oklog/ulid";
     changelog = "https://github.com/oklog/ulid/blob/${src.rev}/CHANGELOG.md";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "ulid";
   };
 }
diff --git a/pkgs/by-name/un/unfurl/package.nix b/pkgs/by-name/un/unfurl/package.nix
index ccca02140d70..2f4e31f2bd57 100644
--- a/pkgs/by-name/un/unfurl/package.nix
+++ b/pkgs/by-name/un/unfurl/package.nix
@@ -32,6 +32,6 @@ buildGoModule rec {
     mainProgram = "unfurl";
     homepage = "https://github.com/tomnomnom/unfurl";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/un/unimap/package.nix b/pkgs/by-name/un/unimap/package.nix
index 8776c65270ee..112e1ac04d7c 100644
--- a/pkgs/by-name/un/unimap/package.nix
+++ b/pkgs/by-name/un/unimap/package.nix
@@ -51,7 +51,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/Edu4rdSHL/unimap";
     changelog = "https://github.com/Edu4rdSHL/unimap/releases/tag/${src.rev}";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "unimap";
   };
 }
diff --git a/pkgs/by-name/un/unzrip/package.nix b/pkgs/by-name/un/unzrip/package.nix
index ffec04c309fc..7e592bfce66c 100644
--- a/pkgs/by-name/un/unzrip/package.nix
+++ b/pkgs/by-name/un/unzrip/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage {
     description = "Unzip implementation, support for parallel decompression, automatic detection encoding";
     homepage = "https://github.com/quininer/unzrip";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "unzrip";
   };
 }
diff --git a/pkgs/by-name/up/upiano/package.nix b/pkgs/by-name/up/upiano/package.nix
index 3c6dda83a42f..5d210f2f0b67 100644
--- a/pkgs/by-name/up/upiano/package.nix
+++ b/pkgs/by-name/up/upiano/package.nix
@@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication rec {
     description = "Piano in your terminal";
     homepage = "https://github.com/eliasdorneles/upiano";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "upiano";
   };
 }
diff --git a/pkgs/by-name/ve/verco/package.nix b/pkgs/by-name/ve/verco/package.nix
index d1e5e09a7c11..27d99631c2eb 100644
--- a/pkgs/by-name/ve/verco/package.nix
+++ b/pkgs/by-name/ve/verco/package.nix
@@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec {
     description = "Simple Git/Mercurial/PlasticSCM tui client based on keyboard shortcuts";
     homepage = "https://vamolessa.github.io/verco";
     license = licenses.gpl3Only;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "verco";
   };
 }
diff --git a/pkgs/by-name/wa/wasmer-pack/package.nix b/pkgs/by-name/wa/wasmer-pack/package.nix
index f9f780bed6e7..84b454a42365 100644
--- a/pkgs/by-name/wa/wasmer-pack/package.nix
+++ b/pkgs/by-name/wa/wasmer-pack/package.nix
@@ -28,6 +28,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/wasmerio/wasmer-pack";
     changelog = "https://github.com/wasmerio/wasmer-pack/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/wa/wazero/package.nix b/pkgs/by-name/wa/wazero/package.nix
index e2ebdf957d1e..e35664ed0f31 100644
--- a/pkgs/by-name/wa/wazero/package.nix
+++ b/pkgs/by-name/wa/wazero/package.nix
@@ -46,7 +46,7 @@ buildGoModule rec {
     homepage = "https://github.com/tetratelabs/wazero";
     changelog = "https://github.com/tetratelabs/wazero/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "wazero";
   };
 }
diff --git a/pkgs/by-name/wt/wthrr/package.nix b/pkgs/by-name/wt/wthrr/package.nix
index 8c807433a1e5..bc01a7f3e448 100644
--- a/pkgs/by-name/wt/wthrr/package.nix
+++ b/pkgs/by-name/wt/wthrr/package.nix
@@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/ttytm/wthrr-the-weathercrab";
     changelog = "https://github.com/ttytm/wthrr-the-weathercrab/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     mainProgram = "wthrr";
   };
 }
diff --git a/pkgs/by-name/xq/xq-xml/package.nix b/pkgs/by-name/xq/xq-xml/package.nix
index 94571f41c3f8..924eed55e5d3 100644
--- a/pkgs/by-name/xq/xq-xml/package.nix
+++ b/pkgs/by-name/xq/xq-xml/package.nix
@@ -38,6 +38,6 @@ buildGoModule rec {
     homepage = "https://github.com/sibprogrammer/xq";
     changelog = "https://github.com/sibprogrammer/xq/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/ya/yaegi/package.nix b/pkgs/by-name/ya/yaegi/package.nix
index 50426b5d7946..2727ab51586a 100644
--- a/pkgs/by-name/ya/yaegi/package.nix
+++ b/pkgs/by-name/ya/yaegi/package.nix
@@ -42,6 +42,6 @@ buildGoModule rec {
     homepage = "https://github.com/traefik/yaegi";
     changelog = "https://github.com/traefik/yaegi/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/compilers/rust/cargo-auditable.nix b/pkgs/development/compilers/rust/cargo-auditable.nix
index 37728f81d5b3..4e253946a456 100644
--- a/pkgs/development/compilers/rust/cargo-auditable.nix
+++ b/pkgs/development/compilers/rust/cargo-auditable.nix
@@ -38,7 +38,7 @@ let
         mit # or
         asl20
       ];
-      maintainers = with maintainers; [ figsoda ];
+      maintainers = [ ];
       broken = stdenv.hostPlatform != stdenv.buildPlatform;
     };
   };
diff --git a/pkgs/development/python-modules/art/default.nix b/pkgs/development/python-modules/art/default.nix
index 095ecc918f5a..9a28f3774870 100644
--- a/pkgs/development/python-modules/art/default.nix
+++ b/pkgs/development/python-modules/art/default.nix
@@ -38,6 +38,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/sepandhaghighi/art";
     changelog = "https://github.com/sepandhaghighi/art/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/dataclass-factory/default.nix b/pkgs/development/python-modules/dataclass-factory/default.nix
index 83de3f721832..cdb50a5e970b 100644
--- a/pkgs/development/python-modules/dataclass-factory/default.nix
+++ b/pkgs/development/python-modules/dataclass-factory/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/reagento/dataclass-factory";
     changelog = "https://github.com/reagento/dataclass-factory/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/jello/default.nix b/pkgs/development/python-modules/jello/default.nix
index 27f52820f9d6..d5f676dc854a 100644
--- a/pkgs/development/python-modules/jello/default.nix
+++ b/pkgs/development/python-modules/jello/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/kellyjonbrazil/jello";
     changelog = "https://github.com/kellyjonbrazil/jello/blob/${src.tag}/CHANGELOG";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/ochre/default.nix b/pkgs/development/python-modules/ochre/default.nix
index 023fb09d1ef4..836ee041fbfb 100644
--- a/pkgs/development/python-modules/ochre/default.nix
+++ b/pkgs/development/python-modules/ochre/default.nix
@@ -33,6 +33,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/getcuia/ochre";
     changelog = "https://github.com/getcuia/ochre/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/pyfluidsynth/default.nix b/pkgs/development/python-modules/pyfluidsynth/default.nix
index de35f66d2a60..5e915c911435 100644
--- a/pkgs/development/python-modules/pyfluidsynth/default.nix
+++ b/pkgs/development/python-modules/pyfluidsynth/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     description = "Python bindings for FluidSynth, a MIDI synthesizer that uses SoundFont instruments";
     homepage = "https://github.com/nwhitehead/pyfluidsynth";
     license = licenses.lgpl21Plus;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/rich-pixels/default.nix b/pkgs/development/python-modules/rich-pixels/default.nix
index 12c85e474af0..35f9b8ab7960 100644
--- a/pkgs/development/python-modules/rich-pixels/default.nix
+++ b/pkgs/development/python-modules/rich-pixels/default.nix
@@ -45,6 +45,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/darrenburns/rich-pixels";
     changelog = "https://github.com/darrenburns/rich-pixels/releases/tag/${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/shazamio/default.nix b/pkgs/development/python-modules/shazamio/default.nix
index d46ea0258aa1..0a4234db5b3e 100644
--- a/pkgs/development/python-modules/shazamio/default.nix
+++ b/pkgs/development/python-modules/shazamio/default.nix
@@ -72,7 +72,7 @@ buildPythonPackage rec {
     homepage = "https://github.com/dotX12/ShazamIO";
     changelog = "https://github.com/dotX12/ShazamIO/releases/tag/${src.tag}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
     # https://github.com/shazamio/ShazamIO/issues/80
     broken = versionAtLeast pydantic.version "2";
   };
diff --git a/pkgs/development/python-modules/stransi/default.nix b/pkgs/development/python-modules/stransi/default.nix
index 52e6ee474549..784a5e70ab4a 100644
--- a/pkgs/development/python-modules/stransi/default.nix
+++ b/pkgs/development/python-modules/stransi/default.nix
@@ -36,6 +36,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/getcuia/stransi";
     changelog = "https://github.com/getcuia/stransi/releases/tag/${src.rev}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/textual-universal-directorytree/default.nix b/pkgs/development/python-modules/textual-universal-directorytree/default.nix
index f4e69131d21f..bf2fa499974a 100644
--- a/pkgs/development/python-modules/textual-universal-directorytree/default.nix
+++ b/pkgs/development/python-modules/textual-universal-directorytree/default.nix
@@ -53,6 +53,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/juftin/textual-universal-directorytree";
     changelog = "https://github.com/juftin/textual-universal-directorytree/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/universal-pathlib/default.nix b/pkgs/development/python-modules/universal-pathlib/default.nix
index 7878aa3b956b..d5acaff2b326 100644
--- a/pkgs/development/python-modules/universal-pathlib/default.nix
+++ b/pkgs/development/python-modules/universal-pathlib/default.nix
@@ -35,6 +35,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/fsspec/universal_pathlib";
     changelog = "https://github.com/fsspec/universal_pathlib/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/xdg-base-dirs/default.nix b/pkgs/development/python-modules/xdg-base-dirs/default.nix
index c467361a643a..d6608505d172 100644
--- a/pkgs/development/python-modules/xdg-base-dirs/default.nix
+++ b/pkgs/development/python-modules/xdg-base-dirs/default.nix
@@ -37,6 +37,6 @@ buildPythonPackage rec {
     homepage = "https://github.com/srstevenson/xdg-base-dirs";
     changelog = "https://github.com/srstevenson/xdg-base-dirs/releases/tag/${version}";
     license = licenses.isc;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/shells/fish/plugins/async-prompt.nix b/pkgs/shells/fish/plugins/async-prompt.nix
index 2f25dcf87060..93c880ffb77f 100644
--- a/pkgs/shells/fish/plugins/async-prompt.nix
+++ b/pkgs/shells/fish/plugins/async-prompt.nix
@@ -19,6 +19,6 @@ buildFishPlugin rec {
     description = "Make your prompt asynchronous to improve the reactivity";
     homepage = "https://github.com/acomagu/fish-async-prompt";
     license = licenses.mit;
-    maintainers = with maintainers; [ figsoda ];
+    maintainers = [ ];
   };
 }

From 1d0bb7b61b251a261b0963aacf4b141e770a4f1d Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 26 Oct 2025 13:16:57 -0400
Subject: [PATCH 4911/6226] treewide: drop figsoda as maintainer (part 3)

s/^\s*figsoda\s*$//
---
 maintainers/team-list.nix                            | 1 -
 nixos/modules/services/x11/display-managers/sx.nix   | 1 -
 nixos/tests/sx.nix                                   | 1 -
 pkgs/by-name/ba/bandwhich/package.nix                | 1 -
 pkgs/by-name/bi/biome/package.nix                    | 1 -
 pkgs/by-name/bo/bottom/package.nix                   | 1 -
 pkgs/by-name/bo/boxxy/package.nix                    | 1 -
 pkgs/by-name/ca/cargo-about/package.nix              | 1 -
 pkgs/by-name/ca/cargo-all-features/package.nix       | 1 -
 pkgs/by-name/ca/cargo-audit/package.nix              | 1 -
 pkgs/by-name/ca/cargo-bundle-licenses/package.nix    | 1 -
 pkgs/by-name/ca/cargo-careful/package.nix            | 1 -
 pkgs/by-name/ca/cargo-clone/package.nix              | 1 -
 pkgs/by-name/ca/cargo-deny/package.nix               | 1 -
 pkgs/by-name/ca/cargo-depgraph/package.nix           | 1 -
 pkgs/by-name/ca/cargo-dephell/package.nix            | 1 -
 pkgs/by-name/ca/cargo-diet/package.nix               | 1 -
 pkgs/by-name/ca/cargo-dist/package.nix               | 1 -
 pkgs/by-name/ca/cargo-duplicates/package.nix         | 1 -
 pkgs/by-name/ca/cargo-edit/package.nix               | 1 -
 pkgs/by-name/ca/cargo-expand/package.nix             | 1 -
 pkgs/by-name/ca/cargo-generate/package.nix           | 1 -
 pkgs/by-name/ca/cargo-hakari/package.nix             | 1 -
 pkgs/by-name/ca/cargo-info/package.nix               | 1 -
 pkgs/by-name/ca/cargo-insta/package.nix              | 1 -
 pkgs/by-name/ca/cargo-license/package.nix            | 1 -
 pkgs/by-name/ca/cargo-llvm-lines/package.nix         | 1 -
 pkgs/by-name/ca/cargo-lock/package.nix               | 1 -
 pkgs/by-name/ca/cargo-machete/package.nix            | 1 -
 pkgs/by-name/ca/cargo-make/package.nix               | 1 -
 pkgs/by-name/ca/cargo-modules/package.nix            | 1 -
 pkgs/by-name/ca/cargo-nextest/package.nix            | 1 -
 pkgs/by-name/ca/cargo-release/package.nix            | 1 -
 pkgs/by-name/ca/cargo-semver-checks/package.nix      | 1 -
 pkgs/by-name/ca/cargo-show-asm/package.nix           | 1 -
 pkgs/by-name/ca/cargo-sort/package.nix               | 1 -
 pkgs/by-name/ca/cargo-supply-chain/package.nix       | 1 -
 pkgs/by-name/ca/cargo-tally/package.nix              | 1 -
 pkgs/by-name/ca/cargo-tarpaulin/package.nix          | 1 -
 pkgs/by-name/ca/cargo-temp/package.nix               | 1 -
 pkgs/by-name/ca/cargo-ui/package.nix                 | 1 -
 pkgs/by-name/ca/cargo-unused-features/package.nix    | 1 -
 pkgs/by-name/ca/cargo-vet/package.nix                | 1 -
 pkgs/by-name/ca/cargo-workspaces/package.nix         | 1 -
 pkgs/by-name/ch/changie/package.nix                  | 1 -
 pkgs/by-name/co/comrak/package.nix                   | 1 -
 pkgs/by-name/de/delta/package.nix                    | 1 -
 pkgs/by-name/di/difftastic/package.nix               | 1 -
 pkgs/by-name/du/dua/package.nix                      | 1 -
 pkgs/by-name/du/duf/package.nix                      | 1 -
 pkgs/by-name/du/dufs/package.nix                     | 1 -
 pkgs/by-name/dy/dysk/package.nix                     | 1 -
 pkgs/by-name/eg/egglog/package.nix                   | 1 -
 pkgs/by-name/em/emblem/package.nix                   | 1 -
 pkgs/by-name/er/erdtree/package.nix                  | 1 -
 pkgs/by-name/ev/eva/package.nix                      | 1 -
 pkgs/by-name/ew/eww/package.nix                      | 1 -
 pkgs/by-name/fc/fclones/package.nix                  | 1 -
 pkgs/by-name/fd/fd/package.nix                       | 1 -
 pkgs/by-name/fi/findomain/package.nix                | 1 -
 pkgs/by-name/fz/fzf-make/package.nix                 | 1 -
 pkgs/by-name/gi/gitnr/package.nix                    | 1 -
 pkgs/by-name/hc/hck/package.nix                      | 1 -
 pkgs/by-name/he/hexyl/package.nix                    | 1 -
 pkgs/by-name/ho/hoard/package.nix                    | 1 -
 pkgs/by-name/hu/hurl/package.nix                     | 1 -
 pkgs/by-name/hy/hyperfine/package.nix                | 1 -
 pkgs/by-name/ja/jaq/package.nix                      | 1 -
 pkgs/by-name/jl/jless/package.nix                    | 1 -
 pkgs/by-name/jo/joshuto/package.nix                  | 1 -
 pkgs/by-name/jq/jql/package.nix                      | 1 -
 pkgs/by-name/jr/jrsonnet/package.nix                 | 1 -
 pkgs/by-name/ka/kalker/package.nix                   | 1 -
 pkgs/by-name/km/kmon/package.nix                     | 1 -
 pkgs/by-name/la/lact/package.nix                     | 1 -
 pkgs/by-name/le/lemmeknow/package.nix                | 1 -
 pkgs/by-name/lu/lua-language-server/package.nix      | 1 -
 pkgs/by-name/lu/lurk/package.nix                     | 3 +--
 pkgs/by-name/ma/macchina/package.nix                 | 1 -
 pkgs/by-name/ma/mask/package.nix                     | 1 -
 pkgs/by-name/mi/microbin/package.nix                 | 1 -
 pkgs/by-name/mi/miniserve/package.nix                | 1 -
 pkgs/by-name/ni/nil/package.nix                      | 1 -
 pkgs/by-name/ni/nix-index-unwrapped/package.nix      | 1 -
 pkgs/by-name/ni/nix-update/package.nix               | 1 -
 pkgs/by-name/ni/nixpkgs-lint-community/package.nix   | 1 -
 pkgs/by-name/ni/nixpkgs-review/package.nix           | 1 -
 pkgs/by-name/oc/oculante/package.nix                 | 1 -
 pkgs/by-name/on/onefetch/package.nix                 | 1 -
 pkgs/by-name/ou/ouch/package.nix                     | 1 -
 pkgs/by-name/ov/ov/package.nix                       | 1 -
 pkgs/by-name/po/popsicle/package.nix                 | 1 -
 pkgs/by-name/po/postgres-language-server/package.nix | 1 -
 pkgs/by-name/pw/pw-volume/package.nix                | 1 -
 pkgs/by-name/pw/pwvucontrol/package.nix              | 1 -
 pkgs/by-name/rq/rq/package.nix                       | 1 -
 pkgs/by-name/ru/ruff/package.nix                     | 1 -
 pkgs/by-name/ru/rusty-man/package.nix                | 1 -
 pkgs/by-name/ru/rustypaste/package.nix               | 1 -
 pkgs/by-name/sc/sccache/package.nix                  | 1 -
 pkgs/by-name/sh/shaq/package.nix                     | 1 -
 pkgs/by-name/sh/shotgun/package.nix                  | 1 -
 pkgs/by-name/si/simple-http-server/package.nix       | 1 -
 pkgs/by-name/sk/skate/package.nix                    | 1 -
 pkgs/by-name/sn/snazy/package.nix                    | 1 -
 pkgs/by-name/sr/src-cli/package.nix                  | 1 -
 pkgs/by-name/st/static-web-server/package.nix        | 1 -
 pkgs/by-name/st/statix/package.nix                   | 1 -
 pkgs/by-name/sv/svg2pdf/package.nix                  | 1 -
 pkgs/by-name/sx/sx/package.nix                       | 1 -
 pkgs/by-name/sy/systeroid/package.nix                | 1 -
 pkgs/by-name/th/the-way/package.nix                  | 1 -
 pkgs/by-name/to/topiary/package.nix                  | 1 -
 pkgs/by-name/tt/ttop/package.nix                     | 1 -
 pkgs/by-name/tt/ttyper/package.nix                   | 1 -
 pkgs/by-name/ty/typos/package.nix                    | 1 -
 pkgs/by-name/ty/typst/package.nix                    | 1 -
 pkgs/by-name/ty/typstfmt/package.nix                 | 1 -
 pkgs/by-name/xc/xc/package.nix                       | 1 -
 pkgs/by-name/xh/xh/package.nix                       | 1 -
 pkgs/by-name/xp/xplr/package.nix                     | 1 -
 pkgs/by-name/zf/zf/package.nix                       | 1 -
 pkgs/by-name/zi/zine/package.nix                     | 1 -
 pkgs/by-name/zo/zon2nix/package.nix                  | 1 -
 pkgs/development/tools/zls/default.nix               | 1 -
 pkgs/shells/fish/plugins/autopair.nix                | 1 -
 126 files changed, 1 insertion(+), 127 deletions(-)

diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix
index d6843424df61..857e84b7d286 100644
--- a/maintainers/team-list.nix
+++ b/maintainers/team-list.nix
@@ -982,7 +982,6 @@ with lib.maintainers;
 
   zig = {
     members = [
-      figsoda
       RossComputerGuy
     ];
     scope = "Maintain the Zig compiler toolchain and nixpkgs integration.";
diff --git a/nixos/modules/services/x11/display-managers/sx.nix b/nixos/modules/services/x11/display-managers/sx.nix
index 7d168124e67f..40381146c8a9 100644
--- a/nixos/modules/services/x11/display-managers/sx.nix
+++ b/nixos/modules/services/x11/display-managers/sx.nix
@@ -51,7 +51,6 @@ in
   };
 
   meta.maintainers = with lib.maintainers; [
-    figsoda
     thiagokokada
   ];
 }
diff --git a/nixos/tests/sx.nix b/nixos/tests/sx.nix
index 8fc41621a7c4..ced01a2697a9 100644
--- a/nixos/tests/sx.nix
+++ b/nixos/tests/sx.nix
@@ -2,7 +2,6 @@
 {
   name = "sx";
   meta.maintainers = with lib.maintainers; [
-    figsoda
     thiagokokada
   ];
 
diff --git a/pkgs/by-name/ba/bandwhich/package.nix b/pkgs/by-name/ba/bandwhich/package.nix
index 1d439116a757..f88ee2795720 100644
--- a/pkgs/by-name/ba/bandwhich/package.nix
+++ b/pkgs/by-name/ba/bandwhich/package.nix
@@ -50,7 +50,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       Br1ght0ne
-      figsoda
     ];
     platforms = lib.platforms.unix;
     mainProgram = "bandwhich";
diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix
index becb12af6579..72b7912c4a25 100644
--- a/pkgs/by-name/bi/biome/package.nix
+++ b/pkgs/by-name/bi/biome/package.nix
@@ -63,7 +63,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/biomejs/biome/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       isabelroses
       wrbbz
     ];
diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix
index 158eb53b8d0d..db6d3d44fe1a 100644
--- a/pkgs/by-name/bo/bottom/package.nix
+++ b/pkgs/by-name/bo/bottom/package.nix
@@ -59,7 +59,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "btm";
     maintainers = with lib.maintainers; [
       berbiche
-      figsoda
       gepbird
     ];
   };
diff --git a/pkgs/by-name/bo/boxxy/package.nix b/pkgs/by-name/bo/boxxy/package.nix
index dcb6898b8991..a95fd79f0655 100644
--- a/pkgs/by-name/bo/boxxy/package.nix
+++ b/pkgs/by-name/bo/boxxy/package.nix
@@ -38,7 +38,6 @@ rustPlatform.buildRustPackage rec {
     license = licenses.mit;
     maintainers = with maintainers; [
       dit7ya
-      figsoda
     ];
     platforms = platforms.linux;
     broken = stdenv.hostPlatform.isAarch64;
diff --git a/pkgs/by-name/ca/cargo-about/package.nix b/pkgs/by-name/ca/cargo-about/package.nix
index cb2762589585..ef527579df55 100644
--- a/pkgs/by-name/ca/cargo-about/package.nix
+++ b/pkgs/by-name/ca/cargo-about/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [
       evanjs
-      figsoda
       matthiasbeyer
     ];
     mainProgram = "cargo-about";
diff --git a/pkgs/by-name/ca/cargo-all-features/package.nix b/pkgs/by-name/ca/cargo-all-features/package.nix
index 1b36989bb011..fd8ecb5d28d4 100644
--- a/pkgs/by-name/ca/cargo-all-features/package.nix
+++ b/pkgs/by-name/ca/cargo-all-features/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-audit/package.nix b/pkgs/by-name/ca/cargo-audit/package.nix
index af23cd400b46..4dd7a3a2dae4 100644
--- a/pkgs/by-name/ca/cargo-audit/package.nix
+++ b/pkgs/by-name/ca/cargo-audit/package.nix
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [
       basvandijk
-      figsoda
       jk
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
index 4fdd5adb7bea..1931d584ce77 100644
--- a/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
+++ b/pkgs/by-name/ca/cargo-bundle-licenses/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
       asl20
     ];
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-careful/package.nix b/pkgs/by-name/ca/cargo-careful/package.nix
index de921f429c71..522e1d9b5ee2 100644
--- a/pkgs/by-name/ca/cargo-careful/package.nix
+++ b/pkgs/by-name/ca/cargo-careful/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-clone/package.nix b/pkgs/by-name/ca/cargo-clone/package.nix
index bf423c530b57..bf152c0164b3 100644
--- a/pkgs/by-name/ca/cargo-clone/package.nix
+++ b/pkgs/by-name/ca/cargo-clone/package.nix
@@ -40,7 +40,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       matthiasbeyer
       janlikar
     ];
diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix
index 34ffdbf04277..d7764f7b33c2 100644
--- a/pkgs/by-name/ca/cargo-deny/package.nix
+++ b/pkgs/by-name/ca/cargo-deny/package.nix
@@ -44,7 +44,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       matthiasbeyer
       jk
     ];
diff --git a/pkgs/by-name/ca/cargo-depgraph/package.nix b/pkgs/by-name/ca/cargo-depgraph/package.nix
index 532c43065468..8eaeac653937 100644
--- a/pkgs/by-name/ca/cargo-depgraph/package.nix
+++ b/pkgs/by-name/ca/cargo-depgraph/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://git.sr.ht/~jplatte/cargo-depgraph/tree/${src.rev}/item/CHANGELOG.md";
     license = licenses.gpl3Plus;
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-dephell/package.nix b/pkgs/by-name/ca/cargo-dephell/package.nix
index 291dbda66c4d..3ef32320070d 100644
--- a/pkgs/by-name/ca/cargo-dephell/package.nix
+++ b/pkgs/by-name/ca/cargo-dephell/package.nix
@@ -55,7 +55,6 @@ rustPlatform.buildRustPackage rec {
       asl20
     ];
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-diet/package.nix b/pkgs/by-name/ca/cargo-diet/package.nix
index 13da78be49a6..08e47f46bfba 100644
--- a/pkgs/by-name/ca/cargo-diet/package.nix
+++ b/pkgs/by-name/ca/cargo-diet/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/the-lean-crate/cargo-diet/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-dist/package.nix b/pkgs/by-name/ca/cargo-dist/package.nix
index 3ef98571917c..e4a0a9dc5d01 100644
--- a/pkgs/by-name/ca/cargo-dist/package.nix
+++ b/pkgs/by-name/ca/cargo-dist/package.nix
@@ -60,7 +60,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
       mistydemeo
     ];
diff --git a/pkgs/by-name/ca/cargo-duplicates/package.nix b/pkgs/by-name/ca/cargo-duplicates/package.nix
index a4955014c697..2a67b7cc8d5e 100644
--- a/pkgs/by-name/ca/cargo-duplicates/package.nix
+++ b/pkgs/by-name/ca/cargo-duplicates/package.nix
@@ -40,7 +40,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/Keruspe/cargo-duplicates";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-edit/package.nix b/pkgs/by-name/ca/cargo-edit/package.nix
index 00cb3e0e06aa..0d9cce570a27 100644
--- a/pkgs/by-name/ca/cargo-edit/package.nix
+++ b/pkgs/by-name/ca/cargo-edit/package.nix
@@ -39,7 +39,6 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [
       Br1ght0ne
-      figsoda
       gerschtli
       jb55
       killercup
diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix
index d5738b8a26ad..4df4374750de 100644
--- a/pkgs/by-name/ca/cargo-expand/package.nix
+++ b/pkgs/by-name/ca/cargo-expand/package.nix
@@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec {
       asl20
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       xrelkd
     ];
     mainProgram = "cargo-expand";
diff --git a/pkgs/by-name/ca/cargo-generate/package.nix b/pkgs/by-name/ca/cargo-generate/package.nix
index 74055bd7015d..fe3d6fe8156c 100644
--- a/pkgs/by-name/ca/cargo-generate/package.nix
+++ b/pkgs/by-name/ca/cargo-generate/package.nix
@@ -78,7 +78,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       mit
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       turbomack
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-hakari/package.nix b/pkgs/by-name/ca/cargo-hakari/package.nix
index e46cbf453230..a03ee537c969 100644
--- a/pkgs/by-name/ca/cargo-hakari/package.nix
+++ b/pkgs/by-name/ca/cargo-hakari/package.nix
@@ -45,7 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       asl20
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       macalinao
       nartsiss
     ];
diff --git a/pkgs/by-name/ca/cargo-info/package.nix b/pkgs/by-name/ca/cargo-info/package.nix
index 413863c60ef2..8b3e3fff7c49 100644
--- a/pkgs/by-name/ca/cargo-info/package.nix
+++ b/pkgs/by-name/ca/cargo-info/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec {
       asl20
     ];
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-insta/package.nix b/pkgs/by-name/ca/cargo-insta/package.nix
index 169220d1d0be..09dcfbd91cd1 100644
--- a/pkgs/by-name/ca/cargo-insta/package.nix
+++ b/pkgs/by-name/ca/cargo-insta/package.nix
@@ -35,7 +35,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/mitsuhiko/insta/blob/${version}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
-      figsoda
       oxalica
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-license/package.nix b/pkgs/by-name/ca/cargo-license/package.nix
index 39933fc46a34..107adda8b752 100644
--- a/pkgs/by-name/ca/cargo-license/package.nix
+++ b/pkgs/by-name/ca/cargo-license/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     license = with licenses; [ mit ];
     maintainers = with maintainers; [
       basvandijk
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-llvm-lines/package.nix b/pkgs/by-name/ca/cargo-llvm-lines/package.nix
index 38f4982e9d04..9ef4b933eefe 100644
--- a/pkgs/by-name/ca/cargo-llvm-lines/package.nix
+++ b/pkgs/by-name/ca/cargo-llvm-lines/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-lock/package.nix b/pkgs/by-name/ca/cargo-lock/package.nix
index 9a4afd026d87..80ea5a05c23f 100644
--- a/pkgs/by-name/ca/cargo-lock/package.nix
+++ b/pkgs/by-name/ca/cargo-lock/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-machete/package.nix b/pkgs/by-name/ca/cargo-machete/package.nix
index 4e95d8380472..102c7b768319 100644
--- a/pkgs/by-name/ca/cargo-machete/package.nix
+++ b/pkgs/by-name/ca/cargo-machete/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/bnjbvr/cargo-machete/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix
index ff48f1e3326e..3a263eb4fabf 100644
--- a/pkgs/by-name/ca/cargo-make/package.nix
+++ b/pkgs/by-name/ca/cargo-make/package.nix
@@ -47,7 +47,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/sagiegurari/cargo-make/blob/${version}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
-      figsoda
       xrelkd
     ];
     mainProgram = "cargo-make";
diff --git a/pkgs/by-name/ca/cargo-modules/package.nix b/pkgs/by-name/ca/cargo-modules/package.nix
index 6a7a27cb3958..b98c0b3538ea 100644
--- a/pkgs/by-name/ca/cargo-modules/package.nix
+++ b/pkgs/by-name/ca/cargo-modules/package.nix
@@ -52,7 +52,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/regexident/cargo-modules/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
-      figsoda
       rvarago
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix
index 549f8f579250..7df07b488840 100644
--- a/pkgs/by-name/ca/cargo-nextest/package.nix
+++ b/pkgs/by-name/ca/cargo-nextest/package.nix
@@ -46,7 +46,6 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with maintainers; [
       ekleog
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix
index 1155e61faedf..ce9d07b8d308 100644
--- a/pkgs/by-name/ca/cargo-release/package.nix
+++ b/pkgs/by-name/ca/cargo-release/package.nix
@@ -52,7 +52,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       gerschtli
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-semver-checks/package.nix b/pkgs/by-name/ca/cargo-semver-checks/package.nix
index da4f2d0b8cd7..a9c71a50977f 100644
--- a/pkgs/by-name/ca/cargo-semver-checks/package.nix
+++ b/pkgs/by-name/ca/cargo-semver-checks/package.nix
@@ -68,7 +68,6 @@ rustPlatform.buildRustPackage rec {
       asl20
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-show-asm/package.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix
index b3da7522a4a7..3d7fe28b45f0 100644
--- a/pkgs/by-name/ca/cargo-show-asm/package.nix
+++ b/pkgs/by-name/ca/cargo-show-asm/package.nix
@@ -46,7 +46,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       oxalica
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-sort/package.nix b/pkgs/by-name/ca/cargo-sort/package.nix
index 3f2fcea8443d..606cb8a23ed8 100644
--- a/pkgs/by-name/ca/cargo-sort/package.nix
+++ b/pkgs/by-name/ca/cargo-sort/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
       asl20
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-supply-chain/package.nix b/pkgs/by-name/ca/cargo-supply-chain/package.nix
index 5aa96ac9102e..23ef43511a4e 100644
--- a/pkgs/by-name/ca/cargo-supply-chain/package.nix
+++ b/pkgs/by-name/ca/cargo-supply-chain/package.nix
@@ -28,7 +28,6 @@ rustPlatform.buildRustPackage rec {
       zlib
     ]; # any of three
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix
index c16b90ba73c7..97f9f4989d4c 100644
--- a/pkgs/by-name/ca/cargo-tally/package.nix
+++ b/pkgs/by-name/ca/cargo-tally/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-tarpaulin/package.nix b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
index 4a894b86e891..80c2986f4e77 100644
--- a/pkgs/by-name/ca/cargo-tarpaulin/package.nix
+++ b/pkgs/by-name/ca/cargo-tarpaulin/package.nix
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec {
       asl20
     ];
     maintainers = with maintainers; [
-      figsoda
       hugoreeves
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-temp/package.nix b/pkgs/by-name/ca/cargo-temp/package.nix
index bfe22cef9c51..f90f7f29abf9 100644
--- a/pkgs/by-name/ca/cargo-temp/package.nix
+++ b/pkgs/by-name/ca/cargo-temp/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
       asl20
     ];
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-ui/package.nix b/pkgs/by-name/ca/cargo-ui/package.nix
index c66297f90f10..8ec65814ae99 100644
--- a/pkgs/by-name/ca/cargo-ui/package.nix
+++ b/pkgs/by-name/ca/cargo-ui/package.nix
@@ -67,7 +67,6 @@ rustPlatform.buildRustPackage rec {
       gpl3Only
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/ca/cargo-unused-features/package.nix b/pkgs/by-name/ca/cargo-unused-features/package.nix
index 77fc9f796577..6367350f5fb8 100644
--- a/pkgs/by-name/ca/cargo-unused-features/package.nix
+++ b/pkgs/by-name/ca/cargo-unused-features/package.nix
@@ -39,7 +39,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/timonpost/cargo-unused-features";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
     mainProgram = "unused-features";
diff --git a/pkgs/by-name/ca/cargo-vet/package.nix b/pkgs/by-name/ca/cargo-vet/package.nix
index 3422c9e8b3ba..a5361f65fbb5 100644
--- a/pkgs/by-name/ca/cargo-vet/package.nix
+++ b/pkgs/by-name/ca/cargo-vet/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       mit
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       jk
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ca/cargo-workspaces/package.nix b/pkgs/by-name/ca/cargo-workspaces/package.nix
index ccee8368d05a..b4776756e690 100644
--- a/pkgs/by-name/ca/cargo-workspaces/package.nix
+++ b/pkgs/by-name/ca/cargo-workspaces/package.nix
@@ -44,7 +44,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/pksunkara/cargo-workspaces/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       macalinao
       matthiasbeyer
     ];
diff --git a/pkgs/by-name/ch/changie/package.nix b/pkgs/by-name/ch/changie/package.nix
index 4a53390b5fd3..76e753d1ae33 100644
--- a/pkgs/by-name/ch/changie/package.nix
+++ b/pkgs/by-name/ch/changie/package.nix
@@ -43,7 +43,6 @@ buildGoModule rec {
     changelog = "https://github.com/miniscruff/changie/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix
index d704ccfb4132..0797b1d3595e 100644
--- a/pkgs/by-name/co/comrak/package.nix
+++ b/pkgs/by-name/co/comrak/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/kivikakk/comrak/blob/v${version}/changelog.txt";
     license = lib.licenses.bsd2;
     maintainers = with lib.maintainers; [
-      figsoda
       kivikakk
     ];
   };
diff --git a/pkgs/by-name/de/delta/package.nix b/pkgs/by-name/de/delta/package.nix
index 2b0e3c223725..728d4b29f6fa 100644
--- a/pkgs/by-name/de/delta/package.nix
+++ b/pkgs/by-name/de/delta/package.nix
@@ -65,7 +65,6 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [
       zowoq
       SuperSandro2000
-      figsoda
     ];
     mainProgram = "delta";
   };
diff --git a/pkgs/by-name/di/difftastic/package.nix b/pkgs/by-name/di/difftastic/package.nix
index 78d77621ff58..dea97b8f1ff7 100644
--- a/pkgs/by-name/di/difftastic/package.nix
+++ b/pkgs/by-name/di/difftastic/package.nix
@@ -39,7 +39,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       ethancedwards8
-      figsoda
       matthiasbeyer
       defelo
     ];
diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix
index 6ec17352a3b2..e9192fecaf46 100644
--- a/pkgs/by-name/du/dua/package.nix
+++ b/pkgs/by-name/du/dua/package.nix
@@ -46,7 +46,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/Byron/dua-cli/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [
-      figsoda
       killercup
       defelo
     ];
diff --git a/pkgs/by-name/du/duf/package.nix b/pkgs/by-name/du/duf/package.nix
index 45ec5bf6f90e..2841a39c95da 100644
--- a/pkgs/by-name/du/duf/package.nix
+++ b/pkgs/by-name/du/duf/package.nix
@@ -35,7 +35,6 @@ buildGoModule (finalAttrs: {
     description = "Disk Usage/Free Utility";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       penguwin
       sigmasquadron
     ];
diff --git a/pkgs/by-name/du/dufs/package.nix b/pkgs/by-name/du/dufs/package.nix
index 7933f526c152..7069b8cb8925 100644
--- a/pkgs/by-name/du/dufs/package.nix
+++ b/pkgs/by-name/du/dufs/package.nix
@@ -45,7 +45,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with maintainers; [
-      figsoda
       holymonson
     ];
   };
diff --git a/pkgs/by-name/dy/dysk/package.nix b/pkgs/by-name/dy/dysk/package.nix
index b81d6b5e7908..49af7bfc4ed4 100644
--- a/pkgs/by-name/dy/dysk/package.nix
+++ b/pkgs/by-name/dy/dysk/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/Canop/dysk/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       koral
     ];
     mainProgram = "dysk";
diff --git a/pkgs/by-name/eg/egglog/package.nix b/pkgs/by-name/eg/egglog/package.nix
index bb7951be9514..f2d549b443d4 100644
--- a/pkgs/by-name/eg/egglog/package.nix
+++ b/pkgs/by-name/eg/egglog/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/egraphs-good/egglog";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       XBagon
     ];
   };
diff --git a/pkgs/by-name/em/emblem/package.nix b/pkgs/by-name/em/emblem/package.nix
index 386180572979..de58a4f98b41 100644
--- a/pkgs/by-name/em/emblem/package.nix
+++ b/pkgs/by-name/em/emblem/package.nix
@@ -68,7 +68,6 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
-      figsoda
       foo-dogsquared
     ];
     teams = [ lib.teams.gnome-circle ];
diff --git a/pkgs/by-name/er/erdtree/package.nix b/pkgs/by-name/er/erdtree/package.nix
index 925081801ade..0f26a43f0e0b 100644
--- a/pkgs/by-name/er/erdtree/package.nix
+++ b/pkgs/by-name/er/erdtree/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/solidiquis/erdtree/releases/tag/${src.rev}";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       zendo
     ];
     mainProgram = "erd";
diff --git a/pkgs/by-name/ev/eva/package.nix b/pkgs/by-name/ev/eva/package.nix
index 0a83892b1cb7..0c5901dbe859 100644
--- a/pkgs/by-name/ev/eva/package.nix
+++ b/pkgs/by-name/ev/eva/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     license = licenses.mit;
     maintainers = with maintainers; [
       ma27
-      figsoda
     ];
     mainProgram = "eva";
   };
diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix
index 1e666b42f698..0f8f047b1913 100644
--- a/pkgs/by-name/ew/eww/package.nix
+++ b/pkgs/by-name/ew/eww/package.nix
@@ -71,7 +71,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       coffeeispower
-      figsoda
       lom
       w-lfchen
     ];
diff --git a/pkgs/by-name/fc/fclones/package.nix b/pkgs/by-name/fc/fclones/package.nix
index fcd1492822c4..0aa927c647c1 100644
--- a/pkgs/by-name/fc/fclones/package.nix
+++ b/pkgs/by-name/fc/fclones/package.nix
@@ -45,7 +45,6 @@ rustPlatform.buildRustPackage rec {
     license = licenses.mit;
     maintainers = with maintainers; [
       cyounkins
-      figsoda
     ];
     mainProgram = "fclones";
   };
diff --git a/pkgs/by-name/fd/fd/package.nix b/pkgs/by-name/fd/fd/package.nix
index bfc27802175a..edd5776f60c9 100644
--- a/pkgs/by-name/fd/fd/package.nix
+++ b/pkgs/by-name/fd/fd/package.nix
@@ -64,7 +64,6 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [
       dywedir
-      figsoda
       globin
       ma27
       zowoq
diff --git a/pkgs/by-name/fi/findomain/package.nix b/pkgs/by-name/fi/findomain/package.nix
index 20e7f61d8690..1c50809aad03 100644
--- a/pkgs/by-name/fi/findomain/package.nix
+++ b/pkgs/by-name/fi/findomain/package.nix
@@ -44,7 +44,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
       Br1ght0ne
-      figsoda
     ];
     mainProgram = "findomain";
   };
diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix
index 9f8bb9a1b299..d1f665c72cc8 100644
--- a/pkgs/by-name/fz/fzf-make/package.nix
+++ b/pkgs/by-name/fz/fzf-make/package.nix
@@ -42,7 +42,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/kyu08/fzf-make/releases/tag/${src.rev}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       sigmanificient
     ];
     mainProgram = "fzf-make";
diff --git a/pkgs/by-name/gi/gitnr/package.nix b/pkgs/by-name/gi/gitnr/package.nix
index cedc2cfc9a68..e88e472bc8f2 100644
--- a/pkgs/by-name/gi/gitnr/package.nix
+++ b/pkgs/by-name/gi/gitnr/package.nix
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/reemus-dev/gitnr/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
     mainProgram = "gitnr";
diff --git a/pkgs/by-name/hc/hck/package.nix b/pkgs/by-name/hc/hck/package.nix
index a38a5684794a..35e424c05d43 100644
--- a/pkgs/by-name/hc/hck/package.nix
+++ b/pkgs/by-name/hc/hck/package.nix
@@ -29,7 +29,6 @@ rustPlatform.buildRustPackage rec {
       unlicense
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       gepbird
     ];
     mainProgram = "hck";
diff --git a/pkgs/by-name/he/hexyl/package.nix b/pkgs/by-name/he/hexyl/package.nix
index 34f83d34ae67..c01266c629c7 100644
--- a/pkgs/by-name/he/hexyl/package.nix
+++ b/pkgs/by-name/he/hexyl/package.nix
@@ -41,7 +41,6 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with lib.maintainers; [
       dywedir
-      figsoda
       SuperSandro2000
     ];
     mainProgram = "hexyl";
diff --git a/pkgs/by-name/ho/hoard/package.nix b/pkgs/by-name/ho/hoard/package.nix
index 6bd991daeae1..693378367f2b 100644
--- a/pkgs/by-name/ho/hoard/package.nix
+++ b/pkgs/by-name/ho/hoard/package.nix
@@ -32,7 +32,6 @@ rustPlatform.buildRustPackage rec {
     license = licenses.mit;
     maintainers = with maintainers; [
       builditluc
-      figsoda
     ];
     mainProgram = "hoard";
   };
diff --git a/pkgs/by-name/hu/hurl/package.nix b/pkgs/by-name/hu/hurl/package.nix
index 0d59ebefa8a9..107a5a22de31 100644
--- a/pkgs/by-name/hu/hurl/package.nix
+++ b/pkgs/by-name/hu/hurl/package.nix
@@ -58,7 +58,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/Orange-OpenSource/hurl/blob/${version}/CHANGELOG.md";
     maintainers = with lib.maintainers; [
       eonpatapon
-      figsoda
     ];
     license = lib.licenses.asl20;
     mainProgram = "hurl";
diff --git a/pkgs/by-name/hy/hyperfine/package.nix b/pkgs/by-name/hy/hyperfine/package.nix
index d0ef09a8ab75..f8cd0c88aaa7 100644
--- a/pkgs/by-name/hy/hyperfine/package.nix
+++ b/pkgs/by-name/hy/hyperfine/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       thoughtpolice
     ];
     mainProgram = "hyperfine";
diff --git a/pkgs/by-name/ja/jaq/package.nix b/pkgs/by-name/ja/jaq/package.nix
index 7b4e5bbc271b..5a67ffa753d5 100644
--- a/pkgs/by-name/ja/jaq/package.nix
+++ b/pkgs/by-name/ja/jaq/package.nix
@@ -72,7 +72,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = lib.licenses.mit;
     teams = [ lib.teams.ngi ];
     maintainers = with lib.maintainers; [
-      figsoda
       siraben
     ];
     mainProgram = "jaq";
diff --git a/pkgs/by-name/jl/jless/package.nix b/pkgs/by-name/jl/jless/package.nix
index fbae8fff4aac..10412d048943 100644
--- a/pkgs/by-name/jl/jless/package.nix
+++ b/pkgs/by-name/jl/jless/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/PaulJuliusMartinez/jless/blob/${src.rev}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       jfchevrette
     ];
   };
diff --git a/pkgs/by-name/jo/joshuto/package.nix b/pkgs/by-name/jo/joshuto/package.nix
index 66bdcdfbb88a..a0a80ae9a4cb 100644
--- a/pkgs/by-name/jo/joshuto/package.nix
+++ b/pkgs/by-name/jo/joshuto/package.nix
@@ -34,7 +34,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/kamiyaa/joshuto/releases/tag/${src.rev}";
     license = licenses.lgpl3Only;
     maintainers = with maintainers; [
-      figsoda
       totoroot
       xrelkd
     ];
diff --git a/pkgs/by-name/jq/jql/package.nix b/pkgs/by-name/jq/jql/package.nix
index 9264d19e733a..63c062a4ae02 100644
--- a/pkgs/by-name/jq/jql/package.nix
+++ b/pkgs/by-name/jq/jql/package.nix
@@ -27,7 +27,6 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with maintainers; [
       akshgpt7
-      figsoda
     ];
     mainProgram = "jql";
   };
diff --git a/pkgs/by-name/jr/jrsonnet/package.nix b/pkgs/by-name/jr/jrsonnet/package.nix
index 6ce5831391aa..7cb2b868a913 100644
--- a/pkgs/by-name/jr/jrsonnet/package.nix
+++ b/pkgs/by-name/jr/jrsonnet/package.nix
@@ -44,7 +44,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/CertainLach/jrsonnet";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       lach
     ];
   };
diff --git a/pkgs/by-name/ka/kalker/package.nix b/pkgs/by-name/ka/kalker/package.nix
index 24c1b5ae0402..a5905a19a329 100644
--- a/pkgs/by-name/ka/kalker/package.nix
+++ b/pkgs/by-name/ka/kalker/package.nix
@@ -58,7 +58,6 @@ rustPlatform.buildRustPackage rec {
     '';
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       lovesegfault
     ];
     mainProgram = "kalker";
diff --git a/pkgs/by-name/km/kmon/package.nix b/pkgs/by-name/km/kmon/package.nix
index 663b36427b3d..f09cd82309dc 100644
--- a/pkgs/by-name/km/kmon/package.nix
+++ b/pkgs/by-name/km/kmon/package.nix
@@ -36,7 +36,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.linux;
     maintainers = with lib.maintainers; [
-      figsoda
       matthiasbeyer
     ];
     mainProgram = "kmon";
diff --git a/pkgs/by-name/la/lact/package.nix b/pkgs/by-name/la/lact/package.nix
index 6a0f2c0e2176..60057054f287 100644
--- a/pkgs/by-name/la/lact/package.nix
+++ b/pkgs/by-name/la/lact/package.nix
@@ -128,7 +128,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/ilya-zlobintsev/LACT";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       atemu
       cything
       johnrtitor
diff --git a/pkgs/by-name/le/lemmeknow/package.nix b/pkgs/by-name/le/lemmeknow/package.nix
index d2ff68114222..79ab202b0b95 100644
--- a/pkgs/by-name/le/lemmeknow/package.nix
+++ b/pkgs/by-name/le/lemmeknow/package.nix
@@ -21,7 +21,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/swanandx/lemmeknow/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       Br1ght0ne
     ];
     mainProgram = "lemmeknow";
diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix
index ca5af2e800dd..f9916365136c 100644
--- a/pkgs/by-name/lu/lua-language-server/package.nix
+++ b/pkgs/by-name/lu/lua-language-server/package.nix
@@ -133,7 +133,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/LuaLS/lua-language-server/blob/${finalAttrs.version}/changelog.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       gepbird
       sei40kr
     ];
diff --git a/pkgs/by-name/lu/lurk/package.nix b/pkgs/by-name/lu/lurk/package.nix
index 1fe34e63f662..6ac06d27e492 100644
--- a/pkgs/by-name/lu/lurk/package.nix
+++ b/pkgs/by-name/lu/lurk/package.nix
@@ -28,8 +28,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/jakwai01/lurk";
     license = lib.licenses.agpl3Only;
     mainProgram = "lurk";
-    maintainers = with lib.maintainers; [
-      figsoda
+    maintainers = [
     ];
     platforms = [
       "i686-linux"
diff --git a/pkgs/by-name/ma/macchina/package.nix b/pkgs/by-name/ma/macchina/package.nix
index 25feb19aa605..c8c231f2afe1 100644
--- a/pkgs/by-name/ma/macchina/package.nix
+++ b/pkgs/by-name/ma/macchina/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec {
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [
       _414owen
-      figsoda
     ];
     mainProgram = "macchina";
   };
diff --git a/pkgs/by-name/ma/mask/package.nix b/pkgs/by-name/ma/mask/package.nix
index 7236aeadebea..b82b4f42df79 100644
--- a/pkgs/by-name/ma/mask/package.nix
+++ b/pkgs/by-name/ma/mask/package.nix
@@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/jacobdeichert/mask/blob/mask/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       defelo
     ];
   };
diff --git a/pkgs/by-name/mi/microbin/package.nix b/pkgs/by-name/mi/microbin/package.nix
index afd9253ea84b..0f345e620ad5 100644
--- a/pkgs/by-name/mi/microbin/package.nix
+++ b/pkgs/by-name/mi/microbin/package.nix
@@ -80,7 +80,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [
       dit7ya
-      figsoda
     ];
     mainProgram = "microbin";
   };
diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix
index 25fdbfab5209..bc621976bb1d 100644
--- a/pkgs/by-name/mi/miniserve/package.nix
+++ b/pkgs/by-name/mi/miniserve/package.nix
@@ -69,7 +69,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/svenstaro/miniserve/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [ mit ];
     maintainers = with lib.maintainers; [
-      figsoda
       defelo
     ];
     mainProgram = "miniserve";
diff --git a/pkgs/by-name/ni/nil/package.nix b/pkgs/by-name/ni/nil/package.nix
index a91ee9517ebb..6f9c316de6ae 100644
--- a/pkgs/by-name/ni/nil/package.nix
+++ b/pkgs/by-name/ni/nil/package.nix
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec {
       asl20
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       oxalica
     ];
     mainProgram = "nil";
diff --git a/pkgs/by-name/ni/nix-index-unwrapped/package.nix b/pkgs/by-name/ni/nix-index-unwrapped/package.nix
index 36aba06ad9e3..97ce3cea62d2 100644
--- a/pkgs/by-name/ni/nix-index-unwrapped/package.nix
+++ b/pkgs/by-name/ni/nix-index-unwrapped/package.nix
@@ -44,7 +44,6 @@ rustPlatform.buildRustPackage rec {
     license = with licenses; [ bsd3 ];
     maintainers = with maintainers; [
       bennofs
-      figsoda
       ncfavier
     ];
   };
diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix
index 3d67a9329e63..0f266bb8c1a3 100644
--- a/pkgs/by-name/ni/nix-update/package.nix
+++ b/pkgs/by-name/ni/nix-update/package.nix
@@ -52,7 +52,6 @@ python3Packages.buildPythonApplication rec {
     changelog = "https://github.com/Mic92/nix-update/releases/tag/${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       mic92
     ];
     mainProgram = "nix-update";
diff --git a/pkgs/by-name/ni/nixpkgs-lint-community/package.nix b/pkgs/by-name/ni/nixpkgs-lint-community/package.nix
index ab32bfbbc4ca..334bfb88786e 100644
--- a/pkgs/by-name/ni/nixpkgs-lint-community/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-lint-community/package.nix
@@ -25,7 +25,6 @@ rustPlatform.buildRustPackage rec {
     license = licenses.mit;
     maintainers = with maintainers; [
       artturin
-      figsoda
     ];
   };
 }
diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix
index eb0120fb843d..ef6966de0d62 100644
--- a/pkgs/by-name/ni/nixpkgs-review/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-review/package.nix
@@ -86,7 +86,6 @@ python3Packages.buildPythonApplication rec {
     license = lib.licenses.mit;
     mainProgram = "nixpkgs-review";
     maintainers = with lib.maintainers; [
-      figsoda
       mic92
     ];
   };
diff --git a/pkgs/by-name/oc/oculante/package.nix b/pkgs/by-name/oc/oculante/package.nix
index 3341277459ad..72976e469153 100644
--- a/pkgs/by-name/oc/oculante/package.nix
+++ b/pkgs/by-name/oc/oculante/package.nix
@@ -91,7 +91,6 @@ rustPlatform.buildRustPackage rec {
     mainProgram = "oculante";
     maintainers = with lib.maintainers; [
       dit7ya
-      figsoda
     ];
   };
 }
diff --git a/pkgs/by-name/on/onefetch/package.nix b/pkgs/by-name/on/onefetch/package.nix
index 550abbecd344..b661d83a551b 100644
--- a/pkgs/by-name/on/onefetch/package.nix
+++ b/pkgs/by-name/on/onefetch/package.nix
@@ -71,7 +71,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       Br1ght0ne
-      figsoda
       kloenk
     ];
     mainProgram = "onefetch";
diff --git a/pkgs/by-name/ou/ouch/package.nix b/pkgs/by-name/ou/ouch/package.nix
index 432c67983a37..d897807c8fee 100644
--- a/pkgs/by-name/ou/ouch/package.nix
+++ b/pkgs/by-name/ou/ouch/package.nix
@@ -71,7 +71,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/ouch-org/ouch/blob/${version}/CHANGELOG.md";
     license = with lib.licenses; [ mit ] ++ lib.optionals enableUnfree [ unfreeRedistributable ];
     maintainers = with lib.maintainers; [
-      figsoda
       psibi
       krovuxdev
     ];
diff --git a/pkgs/by-name/ov/ov/package.nix b/pkgs/by-name/ov/ov/package.nix
index 8b2446df004f..cd534d4a0dbc 100644
--- a/pkgs/by-name/ov/ov/package.nix
+++ b/pkgs/by-name/ov/ov/package.nix
@@ -75,7 +75,6 @@ buildGoModule rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       farcaller
-      figsoda
     ];
     mainProgram = "ov";
   };
diff --git a/pkgs/by-name/po/popsicle/package.nix b/pkgs/by-name/po/popsicle/package.nix
index 5792c9348792..c0267f44fd3d 100644
--- a/pkgs/by-name/po/popsicle/package.nix
+++ b/pkgs/by-name/po/popsicle/package.nix
@@ -58,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/pop-os/popsicle/releases/tag/${finalAttrs.version}";
     maintainers = with lib.maintainers; [
       _13r0ck
-      figsoda
     ];
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/po/postgres-language-server/package.nix b/pkgs/by-name/po/postgres-language-server/package.nix
index 52668006deaf..a096835cdfa5 100644
--- a/pkgs/by-name/po/postgres-language-server/package.nix
+++ b/pkgs/by-name/po/postgres-language-server/package.nix
@@ -54,7 +54,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://pg-language-server.com";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       myypo
     ];
     mainProgram = "postgres-language-server";
diff --git a/pkgs/by-name/pw/pw-volume/package.nix b/pkgs/by-name/pw/pw-volume/package.nix
index f936de48254e..b9b252d7f602 100644
--- a/pkgs/by-name/pw/pw-volume/package.nix
+++ b/pkgs/by-name/pw/pw-volume/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       astro
-      figsoda
     ];
     platforms = lib.platforms.linux;
     mainProgram = "pw-volume";
diff --git a/pkgs/by-name/pw/pwvucontrol/package.nix b/pkgs/by-name/pw/pwvucontrol/package.nix
index 699f37ee388f..f0807791f312 100644
--- a/pkgs/by-name/pw/pwvucontrol/package.nix
+++ b/pkgs/by-name/pw/pwvucontrol/package.nix
@@ -94,7 +94,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/saivert/pwvucontrol";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
-      figsoda
       Guanran928
       johnrtitor
     ];
diff --git a/pkgs/by-name/rq/rq/package.nix b/pkgs/by-name/rq/rq/package.nix
index 4299fd89c97f..7009a75d4d89 100644
--- a/pkgs/by-name/rq/rq/package.nix
+++ b/pkgs/by-name/rq/rq/package.nix
@@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     maintainers = with lib.maintainers; [
       aristid
       Br1ght0ne
-      figsoda
     ];
   };
 })
diff --git a/pkgs/by-name/ru/ruff/package.nix b/pkgs/by-name/ru/ruff/package.nix
index 3d1547d0bf11..c56b26a73cce 100644
--- a/pkgs/by-name/ru/ruff/package.nix
+++ b/pkgs/by-name/ru/ruff/package.nix
@@ -95,7 +95,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     mainProgram = "ruff";
     maintainers = with lib.maintainers; [
       bengsparks
-      figsoda
       GaetanLepage
     ];
   };
diff --git a/pkgs/by-name/ru/rusty-man/package.nix b/pkgs/by-name/ru/rusty-man/package.nix
index fff4408f3af2..1ff58f933b6d 100644
--- a/pkgs/by-name/ru/rusty-man/package.nix
+++ b/pkgs/by-name/ru/rusty-man/package.nix
@@ -32,7 +32,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://git.sr.ht/~ireas/rusty-man/tree/v${finalAttrs.version}/item/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       defelo
     ];
   };
diff --git a/pkgs/by-name/ru/rustypaste/package.nix b/pkgs/by-name/ru/rustypaste/package.nix
index 6043e05a0ae8..0d9bb517f5fb 100644
--- a/pkgs/by-name/ru/rustypaste/package.nix
+++ b/pkgs/by-name/ru/rustypaste/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/orhun/rustypaste/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       seqizz
     ];
     mainProgram = "rustypaste";
diff --git a/pkgs/by-name/sc/sccache/package.nix b/pkgs/by-name/sc/sccache/package.nix
index f7648cf09e26..342987717c17 100644
--- a/pkgs/by-name/sc/sccache/package.nix
+++ b/pkgs/by-name/sc/sccache/package.nix
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/mozilla/sccache/releases/tag/v${finalAttrs.version}";
     maintainers = with lib.maintainers; [
       doronbehar
-      figsoda
     ];
     license = lib.licenses.asl20;
   };
diff --git a/pkgs/by-name/sh/shaq/package.nix b/pkgs/by-name/sh/shaq/package.nix
index ff7abe883a6b..bb6eba78b650 100644
--- a/pkgs/by-name/sh/shaq/package.nix
+++ b/pkgs/by-name/sh/shaq/package.nix
@@ -60,7 +60,6 @@ python3.pkgs.buildPythonApplication rec {
     changelog = "https://github.com/woodruffw/shaq/releases/tag/${src.rev}";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       mig4ng
     ];
     mainProgram = "shaq";
diff --git a/pkgs/by-name/sh/shotgun/package.nix b/pkgs/by-name/sh/shotgun/package.nix
index 0adca68b9825..7a2d82e35e3f 100644
--- a/pkgs/by-name/sh/shotgun/package.nix
+++ b/pkgs/by-name/sh/shotgun/package.nix
@@ -22,7 +22,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/neXromancers/shotgun";
     license = with licenses; [ mpl20 ];
     maintainers = with maintainers; [
-      figsoda
       lumi
     ];
     platforms = platforms.linux;
diff --git a/pkgs/by-name/si/simple-http-server/package.nix b/pkgs/by-name/si/simple-http-server/package.nix
index 40e0d8eb5b8c..055a62ff56cf 100644
--- a/pkgs/by-name/si/simple-http-server/package.nix
+++ b/pkgs/by-name/si/simple-http-server/package.nix
@@ -32,7 +32,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/TheWaWaR/simple-http-server/releases/tag/v${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       mephistophiles
     ];
     mainProgram = "simple-http-server";
diff --git a/pkgs/by-name/sk/skate/package.nix b/pkgs/by-name/sk/skate/package.nix
index 77fe2116c9a3..d9b7dddfebef 100644
--- a/pkgs/by-name/sk/skate/package.nix
+++ b/pkgs/by-name/sk/skate/package.nix
@@ -30,7 +30,6 @@ buildGoModule rec {
     changelog = "https://github.com/charmbracelet/skate/releases/tag/${src.rev}";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       penguwin
     ];
     mainProgram = "skate";
diff --git a/pkgs/by-name/sn/snazy/package.nix b/pkgs/by-name/sn/snazy/package.nix
index 77bdd8b1980b..3778a54bb5a2 100644
--- a/pkgs/by-name/sn/snazy/package.nix
+++ b/pkgs/by-name/sn/snazy/package.nix
@@ -47,7 +47,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/chmouel/snazy/releases/tag/${src.rev}";
     license = licenses.asl20;
     maintainers = with maintainers; [
-      figsoda
       jk
     ];
   };
diff --git a/pkgs/by-name/sr/src-cli/package.nix b/pkgs/by-name/sr/src-cli/package.nix
index 85bd208dd5fc..7c8a750e39b3 100644
--- a/pkgs/by-name/sr/src-cli/package.nix
+++ b/pkgs/by-name/sr/src-cli/package.nix
@@ -44,7 +44,6 @@ buildGoModule rec {
     changelog = "https://github.com/sourcegraph/src-cli/blob/${src.rev}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [
-      figsoda
       keegancsmith
     ];
     mainProgram = "src";
diff --git a/pkgs/by-name/st/static-web-server/package.nix b/pkgs/by-name/st/static-web-server/package.nix
index 75ee43e817b3..da749e0757ca 100644
--- a/pkgs/by-name/st/static-web-server/package.nix
+++ b/pkgs/by-name/st/static-web-server/package.nix
@@ -41,7 +41,6 @@ rustPlatform.buildRustPackage rec {
       asl20
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       misilelab
     ];
     mainProgram = "static-web-server";
diff --git a/pkgs/by-name/st/statix/package.nix b/pkgs/by-name/st/statix/package.nix
index 47584707d2fa..14a142581fea 100644
--- a/pkgs/by-name/st/statix/package.nix
+++ b/pkgs/by-name/st/statix/package.nix
@@ -33,7 +33,6 @@ rustPlatform.buildRustPackage rec {
     license = licenses.mit;
     mainProgram = "statix";
     maintainers = with maintainers; [
-      figsoda
       nerdypepper
     ];
   };
diff --git a/pkgs/by-name/sv/svg2pdf/package.nix b/pkgs/by-name/sv/svg2pdf/package.nix
index f70e0192d7b1..dafbaa95d41c 100644
--- a/pkgs/by-name/sv/svg2pdf/package.nix
+++ b/pkgs/by-name/sv/svg2pdf/package.nix
@@ -31,7 +31,6 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = with maintainers; [
       doronbehar
-      figsoda
     ];
     mainProgram = "svg2pdf";
   };
diff --git a/pkgs/by-name/sx/sx/package.nix b/pkgs/by-name/sx/sx/package.nix
index 0bd42715c42e..e9dc2bebe1b5 100644
--- a/pkgs/by-name/sx/sx/package.nix
+++ b/pkgs/by-name/sx/sx/package.nix
@@ -56,7 +56,6 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     mainProgram = "sx";
     maintainers = with lib.maintainers; [
-      figsoda
       thiagokokada
     ];
     platforms = lib.platforms.linux;
diff --git a/pkgs/by-name/sy/systeroid/package.nix b/pkgs/by-name/sy/systeroid/package.nix
index c5f316f0cb45..7e7c312944d4 100644
--- a/pkgs/by-name/sy/systeroid/package.nix
+++ b/pkgs/by-name/sy/systeroid/package.nix
@@ -40,7 +40,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with maintainers; [
-      figsoda
       matthiasbeyer
     ];
   };
diff --git a/pkgs/by-name/th/the-way/package.nix b/pkgs/by-name/th/the-way/package.nix
index 4a1d176549e7..1fc9a0b42d75 100644
--- a/pkgs/by-name/th/the-way/package.nix
+++ b/pkgs/by-name/th/the-way/package.nix
@@ -40,7 +40,6 @@ rustPlatform.buildRustPackage rec {
     license = with lib.licenses; [ mit ];
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
-      figsoda
       numkem
     ];
   };
diff --git a/pkgs/by-name/to/topiary/package.nix b/pkgs/by-name/to/topiary/package.nix
index 79439f3a1d25..083edc2144f0 100644
--- a/pkgs/by-name/to/topiary/package.nix
+++ b/pkgs/by-name/to/topiary/package.nix
@@ -101,7 +101,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/tweag/topiary/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       nartsiss
     ];
   };
diff --git a/pkgs/by-name/tt/ttop/package.nix b/pkgs/by-name/tt/ttop/package.nix
index 5ca4733fbc76..f160bd9ec15a 100644
--- a/pkgs/by-name/tt/ttop/package.nix
+++ b/pkgs/by-name/tt/ttop/package.nix
@@ -35,7 +35,6 @@ buildNimPackage (finalAttrs: {
     license = licenses.mit;
     platforms = platforms.linux;
     maintainers = with maintainers; [
-      figsoda
       sikmir
     ];
     mainProgram = "ttop";
diff --git a/pkgs/by-name/tt/ttyper/package.nix b/pkgs/by-name/tt/ttyper/package.nix
index 4fe025f650b0..a3645548774c 100644
--- a/pkgs/by-name/tt/ttyper/package.nix
+++ b/pkgs/by-name/tt/ttyper/package.nix
@@ -23,7 +23,6 @@ rustPlatform.buildRustPackage rec {
     changelog = "https://github.com/max-niederman/ttyper/releases/tag/${src.rev}";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       max-niederman
     ];
     mainProgram = "ttyper";
diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix
index b640031a3eca..68e025f314c8 100644
--- a/pkgs/by-name/ty/typos/package.nix
+++ b/pkgs/by-name/ty/typos/package.nix
@@ -43,7 +43,6 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with lib.maintainers; [
-      figsoda
       mgttlinger
     ];
   };
diff --git a/pkgs/by-name/ty/typst/package.nix b/pkgs/by-name/ty/typst/package.nix
index 5656247c28d3..cf9bad1243b7 100644
--- a/pkgs/by-name/ty/typst/package.nix
+++ b/pkgs/by-name/ty/typst/package.nix
@@ -82,7 +82,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     license = lib.licenses.asl20;
     mainProgram = "typst";
     maintainers = with lib.maintainers; [
-      figsoda
       kanashimia
       RossSmyth
     ];
diff --git a/pkgs/by-name/ty/typstfmt/package.nix b/pkgs/by-name/ty/typstfmt/package.nix
index b3d393eb8022..022ca537797c 100644
--- a/pkgs/by-name/ty/typstfmt/package.nix
+++ b/pkgs/by-name/ty/typstfmt/package.nix
@@ -24,7 +24,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.mit;
     mainProgram = "typstfmt";
     maintainers = with lib.maintainers; [
-      figsoda
       geri1701
     ];
   };
diff --git a/pkgs/by-name/xc/xc/package.nix b/pkgs/by-name/xc/xc/package.nix
index 0fd8c4647601..9a2e7b287c8f 100644
--- a/pkgs/by-name/xc/xc/package.nix
+++ b/pkgs/by-name/xc/xc/package.nix
@@ -50,7 +50,6 @@ buildGoModule (finalAttrs: {
     changelog = "https://github.com/joerdav/xc/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       joerdav
     ];
   };
diff --git a/pkgs/by-name/xh/xh/package.nix b/pkgs/by-name/xh/xh/package.nix
index 47e4e14ce9dd..c7dc146bbf62 100644
--- a/pkgs/by-name/xh/xh/package.nix
+++ b/pkgs/by-name/xh/xh/package.nix
@@ -71,7 +71,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/ducaale/xh/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
-      figsoda
       defelo
     ];
     mainProgram = "xh";
diff --git a/pkgs/by-name/xp/xplr/package.nix b/pkgs/by-name/xp/xplr/package.nix
index e433da28e38e..927620f41df4 100644
--- a/pkgs/by-name/xp/xplr/package.nix
+++ b/pkgs/by-name/xp/xplr/package.nix
@@ -52,7 +52,6 @@ rustPlatform.buildRustPackage rec {
       suryasr007
       pyrox0
       mimame
-      figsoda
     ];
   };
 }
diff --git a/pkgs/by-name/zf/zf/package.nix b/pkgs/by-name/zf/zf/package.nix
index 5dda2cbf9661..1f3cea51152d 100644
--- a/pkgs/by-name/zf/zf/package.nix
+++ b/pkgs/by-name/zf/zf/package.nix
@@ -66,7 +66,6 @@ stdenv.mkDerivation (finalAttrs: {
     platforms = lib.platforms.unix;
     maintainers = with lib.maintainers; [
       dit7ya
-      figsoda
       mmlb
     ];
     mainProgram = "zf";
diff --git a/pkgs/by-name/zi/zine/package.nix b/pkgs/by-name/zi/zine/package.nix
index e62e6af6b995..786afde2d789 100644
--- a/pkgs/by-name/zi/zine/package.nix
+++ b/pkgs/by-name/zi/zine/package.nix
@@ -37,7 +37,6 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [
       dit7ya
-      figsoda
     ];
     mainProgram = "zine";
   };
diff --git a/pkgs/by-name/zo/zon2nix/package.nix b/pkgs/by-name/zo/zon2nix/package.nix
index 380b52d1de21..1d2bdd9cefe5 100644
--- a/pkgs/by-name/zo/zon2nix/package.nix
+++ b/pkgs/by-name/zo/zon2nix/package.nix
@@ -36,7 +36,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/nix-community/zon2nix/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [
-      figsoda
       RossComputerGuy
     ];
     inherit (zig_0_14.meta) platforms;
diff --git a/pkgs/development/tools/zls/default.nix b/pkgs/development/tools/zls/default.nix
index 235375a22599..a729dfa8108c 100644
--- a/pkgs/development/tools/zls/default.nix
+++ b/pkgs/development/tools/zls/default.nix
@@ -18,7 +18,6 @@ let
       homepage = "https://github.com/zigtools/zls";
       license = lib.licenses.mit;
       maintainers = with lib.maintainers; [
-        figsoda
         moni
         _0x5a4
         jmbaur
diff --git a/pkgs/shells/fish/plugins/autopair.nix b/pkgs/shells/fish/plugins/autopair.nix
index 6832c0bf746b..d555d4ab8785 100644
--- a/pkgs/shells/fish/plugins/autopair.nix
+++ b/pkgs/shells/fish/plugins/autopair.nix
@@ -20,7 +20,6 @@ buildFishPlugin rec {
     homepage = "https://github.com/jorgebucaran/autopair.fish";
     license = licenses.mit;
     maintainers = with maintainers; [
-      figsoda
       kidonng
       pyrox0
     ];

From 41a3c23cdc94edcee320d202c672b42fa7e83674 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 26 Oct 2025 13:23:01 -0400
Subject: [PATCH 4912/6226] treewide: drop figsoda as maintainer (part 4)

These were done manually by me, either due to not matching the regexes in the previous ones, or because of nixf-diagnose, which I have as a pre-commit hook.
---
 ci/OWNERS                                 | 10 +++++-----
 maintainers/scripts/luarocks-packages.csv |  2 +-
 nixos/modules/config/xdg/mime.nix         |  2 +-
 pkgs/by-name/fc/fclones-gui/package.nix   |  2 +-
 pkgs/top-level/perl-packages.nix          | 18 +++++++++---------
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/ci/OWNERS b/ci/OWNERS
index cb45babf254b..6edaa4beab9d 100644
--- a/ci/OWNERS
+++ b/ci/OWNERS
@@ -215,10 +215,10 @@ nixos/modules/installer/tools/nix-fallback-paths.nix  @NixOS/nix-team @raitobeza
 /pkgs/development/r-modules         @jbedo
 
 # Rust
-/pkgs/development/compilers/rust @alyssais @Mic92 @zowoq @winterqt @figsoda
-/pkgs/build-support/rust @zowoq @winterqt @figsoda
+/pkgs/development/compilers/rust @alyssais @Mic92 @zowoq @winterqt
+/pkgs/build-support/rust @zowoq @winterqt
 /pkgs/build-support/rust/fetch-cargo-vendor* @TomaSajt
-/doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda
+/doc/languages-frameworks/rust.section.md @zowoq @winterqt
 
 # Tcl
 /pkgs/development/interpreters/tcl  @fgaz
@@ -447,8 +447,8 @@ pkgs/by-name/fo/forgejo/                @adamcstephens @bendlas @emilylange
 /pkgs/os-specific/linux/zfs              @adamcstephens @amarshall
 
 # Zig
-/pkgs/development/compilers/zig @figsoda @RossComputerGuy
-/doc/hooks/zig.section.md       @figsoda @RossComputerGuy
+/pkgs/development/compilers/zig @RossComputerGuy
+/doc/hooks/zig.section.md       @RossComputerGuy
 
 # Buildbot
 nixos/modules/services/continuous-integration/buildbot @Mic92 @zowoq
diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv
index 9fca1e9827f4..2acc4786f130 100644
--- a/maintainers/scripts/luarocks-packages.csv
+++ b/maintainers/scripts/luarocks-packages.csv
@@ -159,5 +159,5 @@ tree-sitter-http,,,,0.0.33-1,,
 tree-sitter-norg,,,,,5.1,mrcjkb
 tree-sitter-orgmode,,,,,,
 vstruct,,,,,,
-vusted,,,,,,figsoda
+vusted,,,,,,
 xml2lua,,,,,,teto
diff --git a/nixos/modules/config/xdg/mime.nix b/nixos/modules/config/xdg/mime.nix
index 9fe91fb6896d..2b2905bb2f0c 100644
--- a/nixos/modules/config/xdg/mime.nix
+++ b/nixos/modules/config/xdg/mime.nix
@@ -13,7 +13,7 @@ in
 
 {
   meta = {
-    maintainers = lib.teams.freedesktop.members ++ (with lib.maintainers; [ figsoda ]);
+    maintainers = lib.teams.freedesktop.members ++ [ ];
   };
 
   options = {
diff --git a/pkgs/by-name/fc/fclones-gui/package.nix b/pkgs/by-name/fc/fclones-gui/package.nix
index 999eb2bcf2ca..b1fe713d7aa0 100644
--- a/pkgs/by-name/fc/fclones-gui/package.nix
+++ b/pkgs/by-name/fc/fclones-gui/package.nix
@@ -46,6 +46,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/pkolaczk/fclones-gui";
     changelog = "https://github.com/pkolaczk/fclones-gui/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
-    maintainers = builtins.attrValues { inherit (lib.maintainers) figsoda; };
+    maintainers = [ ];
   };
 })
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4c712e9d854e..da631d4d9c3c 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -12322,11 +12322,11 @@ with self;
       hash = "sha256-VaUsIz4troYRP58Zs09hftz8hBb5vs5nEme9GBGxIRE=";
     };
     outputs = [ "out" ];
-    meta = with lib; {
+    meta = {
       description = "Simplified safe evaluation of Perl code";
       homepage = "https://github.com/mkende/perl-eval-safe";
-      license = licenses.mit;
-      maintainers = with maintainers; [ figsoda ];
+      license = lib.licenses.mit;
+      maintainers = [ ];
     };
   };
 
@@ -24770,14 +24770,14 @@ with self;
       TestPod
       TestPodCoverage
     ];
-    meta = with lib; {
+    meta = {
       description = "Perl bindings to the msgpack C library";
       homepage = "https://github.com/jacquesg/p5-MsgPack-Raw";
-      license = with licenses; [
+      license = with lib.licenses; [
         gpl1Plus # or
         artistic1
       ];
-      maintainers = with maintainers; [ figsoda ];
+      maintainers = [ ];
     };
   };
 
@@ -24927,14 +24927,14 @@ with self;
     ];
     # TODO: fix tests
     doCheck = false;
-    meta = with lib; {
+    meta = {
       description = "Perl bindings for Neovim";
       homepage = "https://github.com/jacquesg/p5-Neovim-Ext";
-      license = with licenses; [
+      license = with lib.licenses; [
         gpl1Plus # or
         artistic1
       ];
-      maintainers = with maintainers; [ figsoda ];
+      maintainers = [ ];
     };
   };
 

From ea5e3b2302a704afb1f78bc14efee0e2224575a3 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Sun, 26 Oct 2025 13:23:44 -0400
Subject: [PATCH 4913/6226] maintainers: remove figsoda

Inactive.
---
 maintainers/maintainer-list.nix | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3d75d92be980..c95509f3f52f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -8476,13 +8476,6 @@
     githubId = 52276064;
     name = "figboy9";
   };
-  figsoda = {
-    email = "figsoda@pm.me";
-    matrix = "@figsoda:matrix.org";
-    github = "figsoda";
-    githubId = 40620903;
-    name = "figsoda";
-  };
   fionera = {
     email = "nix@fionera.de";
     github = "fionera";

From a9901090afbbb240003f8be3fb3ce144db470ff8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 01:16:21 +0000
Subject: [PATCH 4914/6226] civo: 1.4.3 -> 1.4.4

---
 pkgs/by-name/ci/civo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ci/civo/package.nix b/pkgs/by-name/ci/civo/package.nix
index 7578339877a7..3707b7df9731 100644
--- a/pkgs/by-name/ci/civo/package.nix
+++ b/pkgs/by-name/ci/civo/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "civo";
-  version = "1.4.3";
+  version = "1.4.4";
 
   src = fetchFromGitHub {
     owner = "civo";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-0F8RF2vbuuLv39yIYQk7TdBw8CImcnMFQ9r+GSHGGiY=";
+    hash = "sha256-OnbIZAFlYQ6ofpipVZ7Y9LmLI68JSWY44Sn0+/DDS14=";
   };
 
   vendorHash = "sha256-TsaGXDUTvTsfDIBhM9+JwL2swEw/qSivn3NTA0tWkZw=";

From b83206434c643d60edff460fdf5188b876ce4af1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 01:20:19 +0000
Subject: [PATCH 4915/6226] 
 home-assistant-custom-lovelace-modules.advanced-camera-card: 7.19.0 -> 7.19.1

---
 .../custom-lovelace-modules/advanced-camera-card/package.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
index f623b11c07c8..d1e1c6fb5641 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/advanced-camera-card/package.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "advanced-camera-card";
-  version = "7.19.0";
+  version = "7.19.1";
 
   src = fetchzip {
     url = "https://github.com/dermotduffy/advanced-camera-card/releases/download/v${version}/advanced-camera-card.zip";
-    hash = "sha256-3HWkKUPuQ6rSIxvMiyXe5MNvmKMIS3sCv+KYOGMEun8=";
+    hash = "sha256-NkVgzmWnh+rB5joBA4RcGnrdLCZJ0n5aeDwv0rDsfYI=";
   };
 
   # TODO: build from source once yarn berry support lands in nixpkgs

From f5cd34557da716361057d7a2bba7c6122f3cde0f Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 16:55:46 -0800
Subject: [PATCH 4916/6226] python3Packages.torf: disable failing tests

---
 pkgs/development/python-modules/torf/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/torf/default.nix b/pkgs/development/python-modules/torf/default.nix
index 2ae49857288b..c467e3b373de 100644
--- a/pkgs/development/python-modules/torf/default.nix
+++ b/pkgs/development/python-modules/torf/default.nix
@@ -50,10 +50,17 @@ buildPythonPackage rec {
     "test_getting_info__xs_fails__as_fails"
     "test_getting_info__xs_returns_invalid_bytes"
     "test_getting_info__as_returns_invalid_bytes"
+    "test_file_in_singlefile_torrent_has_wrong_size"
+    "test_file_in_singlefile_torrent_doesnt_exist"
+    # Broken assertion
+    # AssertionError: assert 1000 < 1000
+    "test_callback_raises_exception"
   ];
 
   pythonImportsCheck = [ "torf" ];
 
+  __darwinAllowLocalNetworking = true;
+
   meta = {
     description = "Create, parse and edit torrent files and magnet links";
     homepage = "https://github.com/rndusr/torf";

From f0a15b8c4e5d0e65c4df82e64927181195280fea Mon Sep 17 00:00:00 2001
From: Ben Darwin <bcdarwin@gmail.com>
Date: Fri, 18 Jul 2025 00:17:36 -0400
Subject: [PATCH 4917/6226] connectome-workbench: 2.0.1 -> 2.1.0

Also support building with cmake 4 and bump Qt5 to Qt6.
---
 .../co/connectome-workbench/package.nix       | 44 +++++++++----------
 1 file changed, 22 insertions(+), 22 deletions(-)

diff --git a/pkgs/by-name/co/connectome-workbench/package.nix b/pkgs/by-name/co/connectome-workbench/package.nix
index 0f3ed3d244cf..ecd7044c3d67 100644
--- a/pkgs/by-name/co/connectome-workbench/package.nix
+++ b/pkgs/by-name/co/connectome-workbench/package.nix
@@ -6,57 +6,57 @@
   cmake,
   libGL,
   libGLU,
-  libsForQt5,
+  qt6,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "connectome-workbench";
-  version = "2.0.1";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     owner = "Washington-University";
     repo = "workbench";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-M5iverVDhBI/ijbgwfa6gHrthY4wrUi+/2A/443jBqg=";
+    hash = "sha256-f1T0i4x7rr3u/3ZvJ4cEAb377e7YcaGMKa2uUslVqR0=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src";
 
-  patches = [
-    # remove after next release:
-    (fetchpatch {
-      name = "fix-missing-includes-in-CZIlib";
-      url = "https://github.com/Washington-University/workbench/commit/7ba3345d161d567a4b628ceb02ab4471fc96cb20.diff";
-      hash = "sha256-DMrJOr/2Wr4o4Z3AuhWfMZTX8f/kOYWwZQzBUwIrTd8=";
-      relative = "src";
-    })
-  ];
-
   postPatch = ''
-    substituteInPlace CMakeLists.txt  \
-      --replace-fail "ADD_SUBDIRECTORY ( Tests )" ""  \
-      --replace-fail "ENABLE_TESTING()" ""
-  '';
-  # tests are minimal and test_driver fails to link (also -DBUILD_TESTING=... is ignored):
-  # ld: ../Brain/libBrain.a(BrainOpenGLVolumeObliqueSliceDrawing.cxx.o): undefined reference to symbol 'glGetFloatv'
-  # ld: /nix/store/a5vcvrkh1c2ng5kr584g3zw3991vnhks-libGL-1.7.0/lib/libGL.so.1: error adding symbols: DSO missing from command line
+    substituteInPlace kloewe/{cpuinfo,dot}/CMakeLists.txt --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  ''
+  +
+    # tests are minimal and test_driver fails to link (also -DBUILD_TESTING=... is ignored):
+    # ld: ../Brain/libBrain.a(BrainOpenGLVolumeObliqueSliceDrawing.cxx.o): undefined reference to symbol 'glGetFloatv'
+    # ld: /nix/store/a5vcvrkh1c2ng5kr584g3zw3991vnhks-libGL-1.7.0/lib/libGL.so.1: error adding symbols: DSO missing from command line
+    ''
+      substituteInPlace CMakeLists.txt  \
+        --replace-fail "ADD_SUBDIRECTORY ( Tests )" ""  \
+        --replace-fail "ENABLE_TESTING()" ""
+    '';
 
   env.NIX_CFLAGS_COMPILE = "-fpermissive";
 
   nativeBuildInputs = [
     cmake
-    libsForQt5.wrapQtAppsHook
+    qt6.wrapQtAppsHook
   ];
 
   buildInputs = [
     libGL
     libGLU
   ]
-  ++ (with libsForQt5; [
+  ++ (with qt6; [
     qtbase
+    qt5compat
   ]);
   # note: we should be able to unvendor a few libs (ftgl, quazip, qwt) but they aren't detected properly
 
+  cmakeFlags = [
+    "-DWORKBENCH_USE_QT6=TRUE"
+    "-DWORKBENCH_USE_QT5=FALSE"
+  ];
+
   meta = {
     description = "Visualization and discovery tool used to map neuroimaging data";
     homepage = "https://www.humanconnectome.org/software/connectome-workbench";

From 5ee5c9d9149b7b96802059cc28cf6c301e354c2c Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 17:32:39 -0800
Subject: [PATCH 4918/6226] python3Packages.aiobtclientapi: disable cpu
 speed-sensitive test

---
 pkgs/development/python-modules/aiobtclientapi/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/aiobtclientapi/default.nix b/pkgs/development/python-modules/aiobtclientapi/default.nix
index 49242150d55d..22926e017b13 100644
--- a/pkgs/development/python-modules/aiobtclientapi/default.nix
+++ b/pkgs/development/python-modules/aiobtclientapi/default.nix
@@ -48,6 +48,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aiobtclientapi" ];
 
+  disabledTests = [
+    # Timing-sensitive, e.g. "AssertionError: assert 9 <= 7"
+    "test_Monitor_block_until_timeout"
+  ];
+
   disabledTestPaths = [
     # AttributeError
     "tests/clients_test/rtorrent_test/rtorrent_api_test.py"

From 81d54e780fc3989e6fd0af22307b97e3875c766d Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 17:55:34 -0800
Subject: [PATCH 4919/6226] upsies: disable failing tests due to Darwin
 differences

---
 pkgs/by-name/up/upsies/package.nix | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)

diff --git a/pkgs/by-name/up/upsies/package.nix b/pkgs/by-name/up/upsies/package.nix
index 70a99363ef04..c849af8737c7 100644
--- a/pkgs/by-name/up/upsies/package.nix
+++ b/pkgs/by-name/up/upsies/package.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   fetchFromGitea,
   fetchpatch,
   ffmpeg-headless,
@@ -72,10 +73,32 @@ python3Packages.buildPythonApplication rec {
     ]
     ++ runtimeDeps;
 
+  disabledTests = lib.optionals stdenv.hostPlatform.isDarwin [
+    # Fail during object comparisons on Darwin
+    "test_group"
+    "test_has_commentary"
+    "test_special_case"
+    "test_set_release_info"
+    "test_Query_from_release"
+    # Depend on directory format
+    "test_home_directory_property"
+    # Depends on specific cocdecs not available on Darwin
+    "test_generate_episode_queries"
+    # Assert false == true
+    "test_is_mixed_scene_release"
+    # Fails due to expecting a non-darwin path format
+    "test_search"
+  ];
+
   disabledTestPaths = [
     # DNS resolution errors in the sandbox on some of the tests
     "tests/utils_test/http_test/http_test.py"
     "tests/utils_test/http_test/http_tls_test.py"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Fail due to the different set of codecs on Darwin
+    "tests/utils_test/predbs_test/predbs_integration_test.py"
+    "tests/utils_test/release_info_test.py"
   ];
 
   preCheck = ''
@@ -90,6 +113,8 @@ python3Packages.buildPythonApplication rec {
     (lib.makeBinPath runtimeDeps)
   ];
 
+  __darwinAllowLocalNetworking = true;
+
   meta = with lib; {
     description = "Toolkit for collecting, generating, normalizing and sharing video metadata";
     homepage = "https://upsies.readthedocs.io/";

From 5531dee1827d19d90e460b0113d628a5b1534898 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 18:13:45 -0800
Subject: [PATCH 4920/6226] upsies: remove 'with lib;'

---
 pkgs/by-name/up/upsies/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/up/upsies/package.nix b/pkgs/by-name/up/upsies/package.nix
index c849af8737c7..4720b0db79d2 100644
--- a/pkgs/by-name/up/upsies/package.nix
+++ b/pkgs/by-name/up/upsies/package.nix
@@ -115,11 +115,11 @@ python3Packages.buildPythonApplication rec {
 
   __darwinAllowLocalNetworking = true;
 
-  meta = with lib; {
+  meta = {
     description = "Toolkit for collecting, generating, normalizing and sharing video metadata";
     homepage = "https://upsies.readthedocs.io/";
-    license = licenses.gpl3Plus;
+    license = lib.licenses.gpl3Plus;
     mainProgram = "upsies";
-    maintainers = with maintainers; [ ambroisie ];
+    maintainers = with lib.maintainers; [ ambroisie ];
   };
 }

From 15040d81c07ee3c0f059e40e0e36e341dcd059e5 Mon Sep 17 00:00:00 2001
From: "nixpkgs-ci[bot]" <190413589+nixpkgs-ci[bot]@users.noreply.github.com>
Date: Mon, 3 Nov 2025 02:43:37 +0000
Subject: [PATCH 4921/6226] maintainers/github-teams.json: Automated sync

---
 maintainers/github-teams.json | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json
index e764f0cb80fe..e67875efe6c5 100644
--- a/maintainers/github-teams.json
+++ b/maintainers/github-teams.json
@@ -134,7 +134,6 @@
       "a-kenji": 65275785,
       "ahoneybun": 4884946,
       "drakon64": 6444703,
-      "griffi-gh": 45996170,
       "michaelBelsanti": 62124625,
       "thefossguy": 44400303
     },
@@ -668,7 +667,7 @@
     "name": "neovim"
   },
   "nix-formatting": {
-    "description": "Team to maintain the official Nix formatter and apply it to Nixpkgs",
+    "description": "Maintain the official Nix formatter and apply it to Nixpkgs: https://nixos.org/community/teams/formatting/",
     "id": 9676823,
     "maintainers": {
       "infinisil": 20525370,
@@ -876,7 +875,6 @@
     "id": 7304571,
     "maintainers": {
       "Mic92": 96200,
-      "figsoda": 40620903,
       "winterqt": 78392041,
       "zowoq": 59103226
     },

From df561e715b787e3448d8d99732c16c078dc06d86 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Nov 2025 19:15:22 -0800
Subject: [PATCH 4922/6226] libmamba: 2.3.2 -> 2.3.3

Diff: https://github.com/mamba-org/mamba/compare/2.3.2...2.3.3

Changelog: https://github.com/mamba-org/mamba/blob/2.3.3/CHANGELOG.md
---
 pkgs/by-name/li/libmamba/package.nix          |  5 +-
 .../python-modules/libmambapy/default.nix     | 49 ++++---------------
 2 files changed, 12 insertions(+), 42 deletions(-)

diff --git a/pkgs/by-name/li/libmamba/package.nix b/pkgs/by-name/li/libmamba/package.nix
index 55645cd648db..416e18fb5d63 100644
--- a/pkgs/by-name/li/libmamba/package.nix
+++ b/pkgs/by-name/li/libmamba/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libmamba";
-  version = "2.3.2";
+  version = "2.3.3";
 
   src = fetchFromGitHub {
     owner = "mamba-org";
     repo = "mamba";
     tag = finalAttrs.version;
-    hash = "sha256-344CRyIIrIFrDFbdxdGH7iOidoDhfovd3EySXlOF+4M=";
+    hash = "sha256-a1lumBYNEvKVu92JmnhvUvZFsRXy+n1bu6jKOg4pDM0=";
   };
 
   nativeBuildInputs = [
@@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
+    changelog = "https://github.com/mamba-org/mamba/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     description = "Library for the fast Cross-Platform Package Manager";
     homepage = "https://github.com/mamba-org/mamba";
     license = lib.licenses.bsd3;
diff --git a/pkgs/development/python-modules/libmambapy/default.nix b/pkgs/development/python-modules/libmambapy/default.nix
index 624002f4cc33..84eada8537bb 100644
--- a/pkgs/development/python-modules/libmambapy/default.nix
+++ b/pkgs/development/python-modules/libmambapy/default.nix
@@ -6,8 +6,7 @@
   ninja,
   libmamba,
   pybind11,
-  setuptools,
-  scikit-build,
+  scikit-build-core,
   fmt,
   spdlog,
   tl-expected,
@@ -18,25 +17,24 @@
   curl,
   zstd,
   bzip2,
-  wheel,
 }:
 
-buildPythonPackage {
+buildPythonPackage rec {
   pname = "libmambapy";
   pyproject = true;
 
   inherit (libmamba) version src;
 
-  nativeBuildInputs = [
+  sourceRoot = "${src.name}/libmambapy";
+
+  build-system = [
     cmake
     ninja
+    pybind11
+    scikit-build-core
   ];
 
-  env = {
-    NIX_CFLAGS_COMPILE = toString [
-      "-Wno-error=deprecated-declarations"
-    ];
-  };
+  dontUseCmakeConfigure = true;
 
   buildInputs = [
     (libmamba.override { python3 = python; })
@@ -52,42 +50,13 @@ buildPythonPackage {
     libsolv
   ];
 
-  dependencies = [
-    scikit-build
-    pybind11
-  ];
-
-  build-system = [
-    setuptools
-    wheel
-  ];
-
-  # patch needed to fix setuptools errors
-  # see these for reference
-  # https://stackoverflow.com/questions/72294299/multiple-top-level-packages-discovered-in-a-flat-layout
-  # https://github.com/pypa/setuptools/issues/3197#issuecomment-1078770109
-  postPatch = ''
-    substituteInPlace libmambapy/setup.py --replace-warn  "setuptools.setup()" "setuptools.setup(py_modules=[])"
-  '';
-
-  cmakeFlags = [
-    "-GNinja"
-    (lib.cmakeBool "BUILD_LIBMAMBAPY" true)
-  ];
-
-  buildPhase = ''
-    ninjaBuildPhase
-    cp -r libmambapy ../libmambapy
-    cd ../libmambapy
-    pypaBuildPhase
-  '';
-
   pythonImportsCheck = [
     "libmambapy"
     "libmambapy.bindings"
   ];
 
   meta = {
+    changelog = "https://github.com/mamba-org/mamba/blob/${src.tag}/libmambapy/CHANGELOG.md";
     description = "Python library for the fast Cross-Platform Package Manager";
     homepage = "https://github.com/mamba-org/mamba";
     license = lib.licenses.bsd3;

From 5c51dc9694344fbc0c27a9095aba4975c5250e65 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 03:41:07 +0000
Subject: [PATCH 4923/6226] ruffle: 0.2.0-nightly-2025-10-24 ->
 0.2.0-nightly-2025-11-03

---
 pkgs/by-name/ru/ruffle/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/ruffle/package.nix b/pkgs/by-name/ru/ruffle/package.nix
index 451c505b9fd7..1acc5e8c6098 100644
--- a/pkgs/by-name/ru/ruffle/package.nix
+++ b/pkgs/by-name/ru/ruffle/package.nix
@@ -27,13 +27,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "ruffle";
-  version = "0.2.0-nightly-2025-10-24";
+  version = "0.2.0-nightly-2025-11-03";
 
   src = fetchFromGitHub {
     owner = "ruffle-rs";
     repo = "ruffle";
     tag = lib.strings.removePrefix "0.2.0-" finalAttrs.version;
-    hash = "sha256-zp+2kILsWkRVDX5q7rCI294VCOz8C3PleDPgED3n+LM=";
+    hash = "sha256-CthzW6yJLQPqzLotDD8jy46nvQKSUbK5I3z18y/CyyU=";
   };
 
   postPatch =
@@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
                        "OpenH264Version(${major}, ${minor}, ${patch})"
     '';
 
-  cargoHash = "sha256-Eo9wLL/Xj/mWto3cRSxAv5dMf+jLOUUk5wCd8voQEeQ=";
+  cargoHash = "sha256-i0qyi3hBEmc5LuKaBpKPFwk24BQNj2AT26Erz2P5ENk=";
   cargoBuildFlags = lib.optional withRuffleTools "--workspace";
 
   env =

From 0dadfcda394976839e19b12dc78c9926b0c7aff3 Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Sun, 2 Nov 2025 21:48:05 -0600
Subject: [PATCH 4924/6226] nixos/tests: fix swap-random-encryption

It parses cryptsetup cli output and the format changed.
---
 nixos/tests/swap-random-encryption.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/swap-random-encryption.nix b/nixos/tests/swap-random-encryption.nix
index 0b88c21654ca..80601e89d108 100644
--- a/nixos/tests/swap-random-encryption.nix
+++ b/nixos/tests/swap-random-encryption.nix
@@ -78,7 +78,7 @@
       if not any(cipher_pattern.fullmatch(line) for line in results):
         raise Exception ("swap device encryption does not use the cipher specified in the configuration")
 
-      key_size_pattern = re.compile(r"\s*keysize:\s+512\s+bits\s*")
+      key_size_pattern = re.compile(r"\s*keysize:\s+512\s+\[?bits\]?\s*")
       if not any(key_size_pattern.fullmatch(line) for line in results):
         raise Exception ("swap device encryption does not use the key size specified in the configuration")
   '';

From eafc20d2b9a6963c6a52c79c4f1654525717b61d Mon Sep 17 00:00:00 2001
From: mrtnvgr <martynovegorOF@yandex.ru>
Date: Mon, 3 Nov 2025 10:50:28 +0700
Subject: [PATCH 4925/6226] surge-XT: fix build with cmake >= 4

---
 pkgs/by-name/su/surge-XT/package.nix | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/su/surge-XT/package.nix b/pkgs/by-name/su/surge-XT/package.nix
index 30545719a680..a6e6b2445b17 100644
--- a/pkgs/by-name/su/surge-XT/package.nix
+++ b/pkgs/by-name/su/surge-XT/package.nix
@@ -27,6 +27,17 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-4b0H3ZioiXFc4KCeQReobwQZJBl6Ep2/8JlRIwvq/hQ=";
   };
 
+  postPatch = ''
+    # see https://github.com/NixOS/nixpkgs/pull/149487#issuecomment-991747333
+    export XDG_DOCUMENTS_DIR=$(mktemp -d)
+
+    # Required for CMake 4
+    # NOTE: libsamplerate is no longer used in Surge-XT, remove on package update
+    substituteInPlace libs/libsamplerate/CMakeLists.txt --replace-fail \
+      'cmake_minimum_required(VERSION 3.1..3.18)' \
+      'cmake_minimum_required(VERSION 4.0)'
+  '';
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -50,11 +61,6 @@ stdenv.mkDerivation (finalAttrs: {
     "-DSURGE_BUILD_LV2=TRUE"
   ];
 
-  CXXFLAGS = [
-    # GCC 13: error: 'uint32_t' has not been declared
-    "-include cstdint"
-  ];
-
   # JUCE dlopen's these at runtime, crashes without them
   NIX_LDFLAGS = (
     toString [
@@ -66,11 +72,6 @@ stdenv.mkDerivation (finalAttrs: {
     ]
   );
 
-  # see https://github.com/NixOS/nixpkgs/pull/149487#issuecomment-991747333
-  postPatch = ''
-    export XDG_DOCUMENTS_DIR=$(mktemp -d)
-  '';
-
   meta = {
     description = "LV2 & VST3 synthesizer plug-in (previously released as Vember Audio Surge)";
     homepage = "https://surge-synthesizer.github.io";

From f976571e0d0afbece056f0a8d00b2779d514bc42 Mon Sep 17 00:00:00 2001
From: mrtnvgr <martynovegorOF@yandex.ru>
Date: Mon, 3 Nov 2025 10:51:25 +0700
Subject: [PATCH 4926/6226] surge-XT: add build options

---
 pkgs/by-name/su/surge-XT/clap-option.diff | 21 +++++++++++++++++++++
 pkgs/by-name/su/surge-XT/package.nix      | 20 +++++++++++++++++---
 2 files changed, 38 insertions(+), 3 deletions(-)
 create mode 100644 pkgs/by-name/su/surge-XT/clap-option.diff

diff --git a/pkgs/by-name/su/surge-XT/clap-option.diff b/pkgs/by-name/su/surge-XT/clap-option.diff
new file mode 100644
index 000000000000..e01502c4d9f8
--- /dev/null
+++ b/pkgs/by-name/su/surge-XT/clap-option.diff
@@ -0,0 +1,21 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 31bee8d5..834ee6f6 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -12,6 +12,8 @@ if (NOT SURGE_COMPILE_BLOCK_SIZE)
+   set(SURGE_COMPILE_BLOCK_SIZE 32)
+ endif()
+ 
++option(SURGE_BUILD_CLAP "Build Surge as a CLAP" ON)
++
+ set(SURGE_JUCE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/../libs/JUCE" CACHE STRING "Path to JUCE library source tree")
+ 
+ list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
+@@ -29,7 +31,6 @@ if(${CMAKE_VERSION} VERSION_LESS 3.21)
+   set(SURGE_BUILD_CLAP FALSE)
+ else()
+   message(STATUS "CMake version ${CMAKE_VERSION} allows CLAP build")
+-  set(SURGE_BUILD_CLAP TRUE)
+ endif()
+ 
+ if(SURGE_BUILD_CLAP)
diff --git a/pkgs/by-name/su/surge-XT/package.nix b/pkgs/by-name/su/surge-XT/package.nix
index a6e6b2445b17..b2958349ad5b 100644
--- a/pkgs/by-name/su/surge-XT/package.nix
+++ b/pkgs/by-name/su/surge-XT/package.nix
@@ -13,6 +13,11 @@
   libXext,
   libXinerama,
   libXrandr,
+
+  buildVST3 ? true,
+  buildLV2 ? true,
+  buildCLAP ? true,
+  buildStandalone ? true,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -27,6 +32,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-4b0H3ZioiXFc4KCeQReobwQZJBl6Ep2/8JlRIwvq/hQ=";
   };
 
+  patches = [
+    # NOTE: merged in upstream, remove on package update
+    #     (https://github.com/surge-synthesizer/surge/pull/8202)
+    ./clap-option.diff
+  ];
+
   postPatch = ''
     # see https://github.com/NixOS/nixpkgs/pull/149487#issuecomment-991747333
     export XDG_DOCUMENTS_DIR=$(mktemp -d)
@@ -47,18 +58,21 @@ stdenv.mkDerivation (finalAttrs: {
     alsa-lib
     freetype
     libjack2
-    lv2
     libX11
     libXcursor
     libXext
     libXinerama
     libXrandr
-  ];
+  ]
+  ++ lib.optionals buildLV2 [ lv2 ];
 
   enableParallelBuilding = true;
 
   cmakeFlags = [
-    "-DSURGE_BUILD_LV2=TRUE"
+    (lib.cmakeBool "SURGE_SKIP_STANDALONE" (!buildStandalone))
+    (lib.cmakeBool "SURGE_SKIP_VST3" (!buildVST3))
+    (lib.cmakeBool "SURGE_SKIP_LV2" buildLV2)
+    (lib.cmakeBool "SURGE_BUILD_CLAP" buildCLAP)
   ];
 
   # JUCE dlopen's these at runtime, crashes without them

From 67e64ebc5d7a91e116a810e54d322d4fcfdf9db7 Mon Sep 17 00:00:00 2001
From: mrtnvgr <martynovegorOF@yandex.ru>
Date: Mon, 3 Nov 2025 10:52:22 +0700
Subject: [PATCH 4927/6226] surge-XT: add updateScript

---
 pkgs/by-name/su/surge-XT/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/su/surge-XT/package.nix b/pkgs/by-name/su/surge-XT/package.nix
index b2958349ad5b..bed5df8bc456 100644
--- a/pkgs/by-name/su/surge-XT/package.nix
+++ b/pkgs/by-name/su/surge-XT/package.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  gitUpdater,
   cmake,
   pkg-config,
   alsa-lib,
@@ -27,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "surge-synthesizer";
     repo = "surge";
-    tag = "release_xt_${finalAttrs.version}";
+    tag = "${finalAttrs.finalPackage.passthru.rev-prefix}${finalAttrs.version}";
     fetchSubmodules = true;
     hash = "sha256-4b0H3ZioiXFc4KCeQReobwQZJBl6Ep2/8JlRIwvq/hQ=";
   };
@@ -86,6 +87,13 @@ stdenv.mkDerivation (finalAttrs: {
     ]
   );
 
+  passthru = {
+    rev-prefix = "release_xt_";
+    updateScript = gitUpdater {
+      inherit (finalAttrs.finalPackage.passthru) rev-prefix;
+    };
+  };
+
   meta = {
     description = "LV2 & VST3 synthesizer plug-in (previously released as Vember Audio Surge)";
     homepage = "https://surge-synthesizer.github.io";

From 2c5b420dd8a23dcc9ec6b02eef69d0d367bbc902 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 03:54:25 +0000
Subject: [PATCH 4928/6226] yoda: 2.1.0 -> 2.1.2

---
 pkgs/by-name/yo/yoda/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/yo/yoda/package.nix b/pkgs/by-name/yo/yoda/package.nix
index 79ee27477386..8990711ad726 100644
--- a/pkgs/by-name/yo/yoda/package.nix
+++ b/pkgs/by-name/yo/yoda/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "yoda";
-  version = "2.1.0";
+  version = "2.1.2";
 
   src = fetchFromGitLab {
     owner = "hepcedar";
     repo = "yoda";
     rev = "yoda-${version}";
-    hash = "sha256-cYJNB4Nk6r9EbTbMrhUFvj6s0VR/QH2o9wl/cUw9jQ0=";
+    hash = "sha256-cgThoxqPX6dVyGNTLXatW3uQV+41o38fTfkvHXsDs9A=";
   };
 
   nativeBuildInputs = with python3.pkgs; [

From a64a5a06301fd874b7da99d9a7c1991be89ffa04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Nov 2025 20:10:03 -0800
Subject: [PATCH 4929/6226] python3Packages.librehardwaremonitor-api: init at
 1.4.0

---
 .../librehardwaremonitor-api/default.nix      | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/librehardwaremonitor-api/default.nix

diff --git a/pkgs/development/python-modules/librehardwaremonitor-api/default.nix b/pkgs/development/python-modules/librehardwaremonitor-api/default.nix
new file mode 100644
index 000000000000..8e41c7041328
--- /dev/null
+++ b/pkgs/development/python-modules/librehardwaremonitor-api/default.nix
@@ -0,0 +1,40 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "librehardwaremonitor-api";
+  version = "1.4.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Sab44";
+    repo = "librehardwaremonitor-api";
+    tag = "v${version}";
+    hash = "sha256-yYJOizO6blfwRBWD9oFnaein7DK1F8Kl744ErehXU0Q=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+  ];
+
+  pythonImportsCheck = [ "librehardwaremonitor_api" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Python API client for LibreHardwareMonitor";
+    homepage = "https://github.com/Sab44/librehardwaremonitor-api";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 96b412d8e7a5..d644bb62eb65 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8377,6 +8377,8 @@ self: super: with self; {
     }
   );
 
+  librehardwaremonitor-api = callPackage ../development/python-modules/librehardwaremonitor-api { };
+
   librepo = lib.pipe pkgs.librepo [
     toPythonModule
     (

From a9cbabfa4fb9f1b2b4fa8d0afe466fedf8559bb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Nov 2025 20:10:49 -0800
Subject: [PATCH 4930/6226] home-assistant: support libre_hardware_monitor
 component

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index e02277331f0d..d8b05c3a638c 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -3282,7 +3282,8 @@
       ];
     "libre_hardware_monitor" =
       ps: with ps; [
-      ]; # missing inputs: librehardwaremonitor-api
+        librehardwaremonitor-api
+      ];
     "lidarr" =
       ps: with ps; [
         aiopyarr
@@ -7450,6 +7451,7 @@
     "lg_netcast"
     "lg_soundbar"
     "lg_thinq"
+    "libre_hardware_monitor"
     "lidarr"
     "life360"
     "lifx"

From 602891f66c28506a98ce5d88921966cc6557d566 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 2 Nov 2025 21:23:14 -0700
Subject: [PATCH 4931/6226] limine: 10.2.0 -> 10.2.1

https://codeberg.org/Limine/Limine/releases/tag/v10.2.1
Diff: https://codeberg.org/Limine/Limine/compare/v10.2.0...v10.2.1
---
 pkgs/by-name/li/limine/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index 9b34ffa7890e..bd103ed04a4a 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -47,14 +47,14 @@ in
 # as bootloader for various platforms and corresponding binary and helper files.
 stdenv.mkDerivation (finalAttrs: {
   pname = "limine";
-  version = "10.2.0";
+  version = "10.2.1";
 
   # We don't use the Git source but the release tarball, as the source has a
   # `./bootstrap` script performing network access to download resources.
   # Packaging that in Nix is very cumbersome.
   src = fetchurl {
     url = "https://codeberg.org/Limine/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz";
-    hash = "sha256-eKoKjRJ+JbawucYXNvYrRMtkdybnxB3G1xk/7KR4YSI=";
+    hash = "sha256-t9uNKbJKU9qvx9LJRCyDAeLeImDMBxl6m13VQt8E6BY=";
   };
 
   enableParallelBuilding = true;

From 9d81708078d8c6f1f14f3eca953d448847d402ed Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Sun, 2 Nov 2025 21:23:46 -0700
Subject: [PATCH 4932/6226] limine: add ryand56 as maintainer

---
 pkgs/by-name/li/limine/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix
index bd103ed04a4a..6e71ee80c310 100644
--- a/pkgs/by-name/li/limine/package.nix
+++ b/pkgs/by-name/li/limine/package.nix
@@ -118,6 +118,7 @@ stdenv.mkDerivation (finalAttrs: {
       prince213
       programmerlexi
       surfaceflinger
+      ryand56
     ];
   };
 })

From a4e561000b4d7d9aed352c6724a337d7458662f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 04:29:59 +0000
Subject: [PATCH 4933/6226] globalping-cli: 1.5.0 -> 1.5.1

---
 pkgs/by-name/gl/globalping-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gl/globalping-cli/package.nix b/pkgs/by-name/gl/globalping-cli/package.nix
index d8d220d8306d..b4ae966e8c29 100644
--- a/pkgs/by-name/gl/globalping-cli/package.nix
+++ b/pkgs/by-name/gl/globalping-cli/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "globalping-cli";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "jsdelivr";
     repo = "globalping-cli";
     rev = "v${version}";
-    hash = "sha256-UB2vYdyJ2+H8rFyJn1KBNnWoGUlRjwYorWXqoB9WDu0=";
+    hash = "sha256-muWhiKqPdNVhy7c7MSRHACGzOn5pIVRdqSdfdCJw2CA=";
   };
 
   vendorHash = "sha256-dJAuN5srL5EvMaRg8rHaTsurjYrdH45p965DeubpB0E=";

From 9fe1e0d3429bc3bc1220232d2f962f933e1bc11d Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Mon, 3 Nov 2025 09:42:35 +0800
Subject: [PATCH 4934/6226] arkenfox-userjs: 140.0 -> 140.1

---
 pkgs/by-name/ar/arkenfox-userjs/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ar/arkenfox-userjs/package.nix b/pkgs/by-name/ar/arkenfox-userjs/package.nix
index cb9b12a48148..35eafcb5edb2 100644
--- a/pkgs/by-name/ar/arkenfox-userjs/package.nix
+++ b/pkgs/by-name/ar/arkenfox-userjs/package.nix
@@ -6,11 +6,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "arkenfox-userjs";
-  version = "140.0";
+  version = "140.1";
 
   src = fetchurl {
-    url = "https://raw.githubusercontent.com/arkenfox/user.js/${finalAttrs.version}/user.js";
-    hash = "sha256-/cz0dnQXKa3c/DqUTAEwBV0I9Tc3x6uzU6rtYijg3Zo=";
+    url = "https://raw.githubusercontent.com/arkenfox/user.js/refs/tags/${finalAttrs.version}/user.js";
+    hash = "sha256-jxzIiARi+GXD+GSGPr1exeEHjR/LsXSUQPGZ+hF36xg=";
   };
 
   dontUnpack = true;
@@ -29,6 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   passthru.updateScript = nix-update-script { };
 
   meta = {
+    changelog = "https://github.com/arkenfox/user.js/releases/tag/${finalAttrs.version}";
     description = "Comprehensive user.js template for configuration and hardening";
     homepage = "https://github.com/arkenfox/user.js";
     license = lib.licenses.mit;

From fa1c27e4378da09308df7f8e95b7ca862946292a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 04:38:39 +0000
Subject: [PATCH 4935/6226] openhue-cli: 0.20 -> 0.21

---
 pkgs/by-name/op/openhue-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openhue-cli/package.nix b/pkgs/by-name/op/openhue-cli/package.nix
index 1c0ec32a1fe1..390524892449 100644
--- a/pkgs/by-name/op/openhue-cli/package.nix
+++ b/pkgs/by-name/op/openhue-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "openhue-cli";
-  version = "0.20";
+  version = "0.21";
 
   src = fetchFromGitHub {
     owner = "openhue";
     repo = "openhue-cli";
     tag = finalAttrs.version;
-    hash = "sha256-vUmJjuBcOjIhhtWrzq+y0fDlh+wQhgBwxnfuod27CBA=";
+    hash = "sha256-u6ulk+qv1FlZ7PdUiO9UXtRqWWp2MMRAnc8F9vHnRBo=";
     leaveDotGit = true;
     postFetch = ''
       cd "$out"
@@ -23,7 +23,7 @@ buildGoModule (finalAttrs: {
     '';
   };
 
-  vendorHash = "sha256-DhTe0fSWoAwzoGr8rZMsbSE92jJFr4T7aVx/ULMfVFo=";
+  vendorHash = "sha256-3930OjQ26n7J3XDWjCthfQjORP5wpJ3ZZK/m6/wi2X4=";
 
   env.CGO_ENABLED = 0;
 

From 2752e97f4cbe92873de6722ee6f70eff5c0e7653 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Mon, 3 Nov 2025 05:49:08 +0100
Subject: [PATCH 4936/6226] python3Packages.boltztrap2: fix build

---
 pkgs/development/python-modules/boltztrap2/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/boltztrap2/default.nix b/pkgs/development/python-modules/boltztrap2/default.nix
index 6ce0e46680ee..791596ce4a34 100644
--- a/pkgs/development/python-modules/boltztrap2/default.nix
+++ b/pkgs/development/python-modules/boltztrap2/default.nix
@@ -35,6 +35,8 @@ buildPythonPackage rec {
   };
 
   postPatch = ''
+    substituteInPlace external/spglib-1.9.9/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.4)" "cmake_minimum_required(VERSION 3.10)"
     substituteInPlace pyproject.toml \
       --replace-fail "numpy>=2.0.0" "numpy"
   '';

From 017b6667744e1e65da3e9fbc18aa16d7c744e22c Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 20:47:08 -0800
Subject: [PATCH 4937/6226] python3Packages.pyrate-limiter: cleanup

---
 .../python-modules/pyrate-limiter/default.nix    | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pyrate-limiter/default.nix b/pkgs/development/python-modules/pyrate-limiter/default.nix
index 3d15ac47bd26..c29fb157153e 100644
--- a/pkgs/development/python-modules/pyrate-limiter/default.nix
+++ b/pkgs/development/python-modules/pyrate-limiter/default.nix
@@ -2,14 +2,20 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  filelock,
+
+  # build-system
   poetry-core,
+
+  # optional dependencies
+  filelock,
   psycopg,
   psycopg-pool,
+  redis,
+
+  # test
   pytestCheckHook,
   pytest-asyncio,
   pytest-xdist,
-  redis,
   redisTestHook,
 }:
 
@@ -56,11 +62,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pyrate_limiter" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python Rate-Limiter using Leaky-Bucket Algorimth Family";
     homepage = "https://github.com/vutran1710/PyrateLimiter";
     changelog = "https://github.com/vutran1710/PyrateLimiter/blob/${src.tag}/CHANGELOG.md";
-    license = licenses.mit;
-    maintainers = with maintainers; [ kranzes ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ kranzes ];
   };
 }

From 9d58a228a78758202610d343fff33528a04bc84d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 04:54:59 +0000
Subject: [PATCH 4938/6226] python3Packages.petsc4py: 3.24.0 -> 3.24.1

---
 pkgs/by-name/pe/petsc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pe/petsc/package.nix b/pkgs/by-name/pe/petsc/package.nix
index 4a0837cba019..43e53cd79758 100644
--- a/pkgs/by-name/pe/petsc/package.nix
+++ b/pkgs/by-name/pe/petsc/package.nix
@@ -110,11 +110,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "petsc";
-  version = "3.24.0";
+  version = "3.24.1";
 
   src = fetchzip {
     url = "https://web.cels.anl.gov/projects/petsc/download/release-snapshots/petsc-${finalAttrs.version}.tar.gz";
-    hash = "sha256-5jqYTo5sfwLNByOlpry0zpI+q3u7ErwJJ97h7w5bvNQ=";
+    hash = "sha256-E/KPoTeeEfvsqfqjflpDTZFSI534YdtfVVWZ/Xa029I=";
   };
 
   patches = [

From 3f75e313346d3d9b837a508526d17cefd71e3d34 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 05:03:15 +0000
Subject: [PATCH 4939/6226] github-copilot-cli: 0.0.351 -> 0.0.353

---
 pkgs/by-name/gi/github-copilot-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/github-copilot-cli/package.nix b/pkgs/by-name/gi/github-copilot-cli/package.nix
index 0cea28613e50..ec8334fcd9ce 100644
--- a/pkgs/by-name/gi/github-copilot-cli/package.nix
+++ b/pkgs/by-name/gi/github-copilot-cli/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "github-copilot-cli";
-  version = "0.0.351";
+  version = "0.0.353";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@github/copilot/-/copilot-${finalAttrs.version}.tgz";
-    hash = "sha256-pv2/VTrAOtb2wlOCVbs6qmlb0jbCVl4KpwhlEnVxvP8=";
+    hash = "sha256-OWlEz75vVEvbtDNobLJ/a1iUuepYewCTWoqTbDG+4wg=";
   };
 
   nativeBuildInputs = [ makeBinaryWrapper ];

From 533d60cad2d5af6c345b9c5986d63bccbc3daaf3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 05:23:37 +0000
Subject: [PATCH 4940/6226] trealla: 2.84.1 -> 2.84.11

---
 pkgs/by-name/tr/trealla/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tr/trealla/package.nix b/pkgs/by-name/tr/trealla/package.nix
index 81f506b4df04..26228e5e77d4 100644
--- a/pkgs/by-name/tr/trealla/package.nix
+++ b/pkgs/by-name/tr/trealla/package.nix
@@ -23,13 +23,13 @@ assert lib.elem lineEditingLibrary [
 ];
 stdenv.mkDerivation (finalAttrs: {
   pname = "trealla";
-  version = "2.84.1";
+  version = "2.84.11";
 
   src = fetchFromGitHub {
     owner = "trealla-prolog";
     repo = "trealla";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-zbU0fdCqWafwUzF857jVHxHWPUChfNl4kAHuOKbkfaA=";
+    hash = "sha256-x42s6h0niDUnFqqi/t8Mn/FdncivlI7ApTmo6TIx1aE=";
   };
 
   postPatch = ''

From a72b0862328dc63779a272b441c3daa419ab2c69 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 05:47:14 +0000
Subject: [PATCH 4941/6226] terraform-providers.oracle_oci: 7.23.0 -> 7.24.0

---
 .../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 0cfe831df4e4..55dbaed3f1c9 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1048,11 +1048,11 @@
     "vendorHash": null
   },
   "oracle_oci": {
-    "hash": "sha256-KrsIw2GQNA3Nlhui4Ib8HwuBuQPCZaecKvws6A18mcI=",
+    "hash": "sha256-R+Khf/BCDaFf1ExD3+zUIEoL/egRw0ube83cP3opO/I=",
     "homepage": "https://registry.terraform.io/providers/oracle/oci",
     "owner": "oracle",
     "repo": "terraform-provider-oci",
-    "rev": "v7.23.0",
+    "rev": "v7.24.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 329c689038bd4e35c08406d763df3aa91a60b6f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 05:48:42 +0000
Subject: [PATCH 4942/6226] chatbox: 1.16.4 -> 1.17.0

---
 pkgs/by-name/ch/chatbox/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ch/chatbox/package.nix b/pkgs/by-name/ch/chatbox/package.nix
index e80f64164f39..42aaf3a64f51 100644
--- a/pkgs/by-name/ch/chatbox/package.nix
+++ b/pkgs/by-name/ch/chatbox/package.nix
@@ -6,11 +6,11 @@
 }:
 let
   pname = "chatbox";
-  version = "1.16.4";
+  version = "1.17.0";
 
   src = fetchurl {
     url = "https://download.chatboxai.app/releases/Chatbox-${version}-x86_64.AppImage";
-    hash = "sha256-hLYOiSIOOTjBH0bxWeji7IzH9F38+e10MCXm88YgYdQ=";
+    hash = "sha256-1TXaRZmmN8dYhCODDBXYDIE/0Rf4K5/4MAliuAZjmJw=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };

From e28e786c394501d62d727af860ca74658d55f392 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Thu, 30 Oct 2025 17:17:40 +0100
Subject: [PATCH 4943/6226] boolector: 3.2.3 -> 3.2.4

---
 pkgs/by-name/bo/boolector/package.nix | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/bo/boolector/package.nix b/pkgs/by-name/bo/boolector/package.nix
index ab80bc3fbdf7..5de394bf3bb0 100644
--- a/pkgs/by-name/bo/boolector/package.nix
+++ b/pkgs/by-name/bo/boolector/package.nix
@@ -3,7 +3,6 @@
   fetchFromGitHub,
   lib,
   python3,
-  fetchpatch,
   cmake,
   lingeling,
   btor2tools,
@@ -13,23 +12,19 @@
 
 stdenv.mkDerivation rec {
   pname = "boolector";
-  version = "3.2.3";
+  version = "3.2.4";
 
   src = fetchFromGitHub {
     owner = "boolector";
     repo = "boolector";
     tag = version;
-    hash = "sha256-CdfpXUbU1+yEmrNyl+hvHlJfpzzzx356naim6vRafDg=";
+    hash = "sha256-CKhaPaWUB6Fz0LfnCl81LVmTebCWzTvZLKeC0KH3by4=";
   };
 
-  patches = [
-    # present in master - remove after 3.2.3
-    (fetchpatch {
-      name = "update-unit-tests-to-cpp-14.patch";
-      url = "https://github.com/Boolector/boolector/commit/cc13f371c0c5093d98638ddd213dc835ef3aadf3.patch";
-      hash = "sha256-h8DBhAvUu+wXBwmvwRhHnJv3XrbEpBpvX9D1FI/+avc=";
-    })
-  ];
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.3)" "cmake_minimum_required(VERSION 3.10)"
+  '';
 
   nativeBuildInputs = [
     cmake

From 89fd9025cfae7cab49ea36134640952ad553c4fa Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Mon, 3 Nov 2025 07:02:11 +0100
Subject: [PATCH 4944/6226] =?UTF-8?q?ocamlPackages.ocamlformat:=200.27.0?=
 =?UTF-8?q?=20=E2=86=92=200.28.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/development/ocaml-modules/ocamlformat/generic.nix     | 3 ++-
 pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix | 1 +
 pkgs/top-level/all-packages.nix                            | 1 +
 pkgs/top-level/ocaml-packages.nix                          | 1 +
 4 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/ocaml-modules/ocamlformat/generic.nix b/pkgs/development/ocaml-modules/ocamlformat/generic.nix
index af78650c146e..d4f2f3336fe8 100644
--- a/pkgs/development/ocaml-modules/ocamlformat/generic.nix
+++ b/pkgs/development/ocaml-modules/ocamlformat/generic.nix
@@ -1,7 +1,7 @@
 {
   lib,
   fetchurl,
-  version ? "0.27.0",
+  version ? "0.28.1",
   astring,
   base,
   camlp-streams,
@@ -48,6 +48,7 @@ rec {
         "0.26.1" = "sha256-2gBuQn8VuexhL7gI1EZZm9m3w+4lq+s9VVdHpw10xtc=";
         "0.26.2" = "sha256-Lk9Za/eqNnqET+g7oPawvxSyplF53cCCNj/peT0DdcU=";
         "0.27.0" = "sha256-3b9ITAdtCPmUAO6Et5DsIx9cj8vV0zJKZADVOI6EbRU=";
+        "0.28.1" = "sha256-cL2gN9C+2WHtkb21GYsu7vVCREdQqLAV2AzLlLP/Qfs=";
       }
       ."${version}";
   };
diff --git a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
index 65f9dadbd957..2f6d2a596f4a 100644
--- a/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
+++ b/pkgs/development/ocaml-modules/ocamlformat/ocamlformat.nix
@@ -20,6 +20,7 @@ lib.throwIf
     || lib.versionAtLeast ocaml.version "5.1" && !lib.versionAtLeast version "0.25"
     || lib.versionAtLeast ocaml.version "5.2" && !lib.versionAtLeast version "0.26.2"
     || lib.versionAtLeast ocaml.version "5.3" && !lib.versionAtLeast version "0.27"
+    || lib.versionAtLeast ocaml.version "5.4" && !lib.versionAtLeast version "0.28"
   )
   "ocamlformat ${version} is not available for OCaml ${ocaml.version}"
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0130772f5741..10362b1780b1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5271,6 +5271,7 @@ with pkgs;
   inherit (ocamlPackages)
     ocamlformat # latest version
     ocamlformat_0_27_0
+    ocamlformat_0_28_1
     ;
 
   inherit (ocamlPackages) odig;
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index d06036960772..bbcebaa75530 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -1473,6 +1473,7 @@ let
         ocamlformat_0_26_1 = ocamlformat.override { version = "0.26.1"; };
         ocamlformat_0_26_2 = ocamlformat.override { version = "0.26.2"; };
         ocamlformat_0_27_0 = ocamlformat.override { version = "0.27.0"; };
+        ocamlformat_0_28_1 = ocamlformat.override { version = "0.28.1"; };
 
         ocamlformat = callPackage ../development/ocaml-modules/ocamlformat/ocamlformat.nix { };
 

From 3692ce043710796d7d1eec4651530dc067c72489 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 06:06:00 +0000
Subject: [PATCH 4945/6226] hddfancontrol: 2.0.5 -> 2.0.6

---
 pkgs/by-name/hd/hddfancontrol/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hd/hddfancontrol/package.nix b/pkgs/by-name/hd/hddfancontrol/package.nix
index 0ea029465a22..b00524358deb 100644
--- a/pkgs/by-name/hd/hddfancontrol/package.nix
+++ b/pkgs/by-name/hd/hddfancontrol/package.nix
@@ -11,16 +11,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hddfancontrol";
-  version = "2.0.5";
+  version = "2.0.6";
 
   src = fetchFromGitHub {
     owner = "desbma";
     repo = "hddfancontrol";
     tag = finalAttrs.version;
-    hash = "sha256-kKzjg2D/7Thzu6JzmLyu2eJAr+N6Bi95WEBKrqB/vXo=";
+    hash = "sha256-VnHXRheqh+NwbFBWsX9XUbRuto7weyX7aHZ+BDi2Vns=";
   };
 
-  cargoHash = "sha256-0TRNiRmxwV/p7nLOrU9GHjTzIaan4JV8C6e443nd2zY=";
+  cargoHash = "sha256-lm4ARffPOYCewNyREb1PQ8M5icqh8c+z6ZNXZKpBlRE=";
 
   nativeBuildInputs = [
     makeWrapper

From 6ae16baebafb169ed0d9548926fc1eb8e35a2661 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 06:10:09 +0000
Subject: [PATCH 4946/6226] affine: 0.25.1 -> 0.25.3

---
 pkgs/by-name/af/affine/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix
index 3c7a995f5e87..7decfcfb3c6e 100644
--- a/pkgs/by-name/af/affine/package.nix
+++ b/pkgs/by-name/af/affine/package.nix
@@ -36,17 +36,17 @@ in
 stdenv.mkDerivation (finalAttrs: {
   pname = binName;
 
-  version = "0.25.1";
+  version = "0.25.3";
   src = fetchFromGitHub {
     owner = "toeverything";
     repo = "AFFiNE";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TrPyxXgrhzODyiamLU49vbIwDzau+jI9D8VWGa734x8=";
+    hash = "sha256-pSKTmxkQGxw+A8gnQHI7RScSGkPz0fOXVb1tUId//fg=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-7btQd3i3rfJ3pJV7OXhSIz17Uy48D3OwrsXh/kls8Hc=";
+    hash = "sha256-h057oF2hsbx1GzbZMdGUFQQgBupMWvEMKQSxx59EM6U=";
   };
   yarnOfflineCache = stdenvNoCC.mkDerivation {
     name = "yarn-offline-cache";
@@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: {
       '';
     dontInstall = true;
     outputHashMode = "recursive";
-    outputHash = "sha256-cQFX49K27Q8pKRiZ+UqK4LIwfi3VEgZ7qS7N/rUj8rM=";
+    outputHash = "sha256-46oU8e4kTkD4EI8Xey95AwWT18LIeSsY8ffeKxw08pg=";
   };
 
   buildInputs = lib.optionals hostPlatform.isDarwin [

From 8bf615dd9e57f02949d4047184685043f0b736f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 06:13:58 +0000
Subject: [PATCH 4947/6226] warp-terminal: 0.2025.10.22.08.13.stable_01 ->
 0.2025.10.29.08.12.stable_03

---
 pkgs/by-name/wa/warp-terminal/versions.json | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/wa/warp-terminal/versions.json b/pkgs/by-name/wa/warp-terminal/versions.json
index bb5dd9214d4c..141842198ee4 100644
--- a/pkgs/by-name/wa/warp-terminal/versions.json
+++ b/pkgs/by-name/wa/warp-terminal/versions.json
@@ -1,14 +1,14 @@
 {
   "darwin": {
-    "hash": "sha256-8yv7R86ABmVSkedA+SPzZWvlXxLm6CHskTInpFbqvkQ=",
-    "version": "0.2025.10.22.08.13.stable_01"
+    "hash": "sha256-7l9U9onDdMhyWwXs2+qfkTJwujq+KricG40YCXknMF4=",
+    "version": "0.2025.10.29.08.12.stable_03"
   },
   "linux_x86_64": {
-    "hash": "sha256-dGn556xWjKJMixQF/PYJNCE5u9orPbvX3lsRQbOQbec=",
-    "version": "0.2025.10.22.08.13.stable_01"
+    "hash": "sha256-Se1/UN9W8jiI6ylhC8H9l4RKdg1OAm6gcg1OWjS31mo=",
+    "version": "0.2025.10.29.08.12.stable_03"
   },
   "linux_aarch64": {
-    "hash": "sha256-UO3kAgzsnFWOXLORfuj5fhlTfUzgK1C0QbUEQvBq2fE=",
-    "version": "0.2025.10.22.08.13.stable_01"
+    "hash": "sha256-9m0oK+OIxCOMp2YZaRUDlj5kBTUxsf+HIA0glMLeu8w=",
+    "version": "0.2025.10.29.08.12.stable_03"
   }
 }

From 603e38e57c84bd593b3d1ccb3449ef0438c0dbf2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 06:21:39 +0000
Subject: [PATCH 4948/6226] apko: 0.30.17 -> 0.30.18

---
 pkgs/by-name/ap/apko/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix
index 31c6a6ae6a5f..b0977f024449 100644
--- a/pkgs/by-name/ap/apko/package.nix
+++ b/pkgs/by-name/ap/apko/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "apko";
-  version = "0.30.17";
+  version = "0.30.18";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "apko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pFkNYtY2LAzLxMMo3GQxaa1WBZSWxqXdxE9K/FIjZ0s=";
+    hash = "sha256-pOG2dDo1iHtS+ez7Crj78IpI2vuBkjpfI+W4MxJrPOI=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-0wVuZy+SEiyFIk0RLIAbvv52DiFpTZk7Z6PzqY+jo5I=";
+  vendorHash = "sha256-F3b0mTSdPig8mDoqsusLTutfeMXM3Qfm5aosvHRO35k=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 372022d8f7cd36ed6693f2f097a8b11e6d110933 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 06:23:47 +0000
Subject: [PATCH 4949/6226] aws-codeartifact-proxy: 0.6.0 -> 1.0.0

---
 pkgs/by-name/aw/aws-codeartifact-proxy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix b/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix
index 423e02117daf..2f7667e33d2c 100644
--- a/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix
+++ b/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix
@@ -6,17 +6,17 @@
 
 buildGoModule rec {
   pname = "aws-codeartifact-proxy";
-  version = "0.6.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "sktan";
     repo = "aws-codeartifact-proxy";
     rev = "v${version}";
-    hash = "sha256-+P0AIg5m7nePy+Yd445nVfLVxya80Om9lJTPKZeTshc=";
+    hash = "sha256-dcUJ2r0VBUNk8kKY1fPkUHoJi1fhAQbd2K+9MC/ddGE=";
   };
   sourceRoot = "${src.name}/src";
 
-  vendorHash = "sha256-3MO+mRCstXw0FfySiyMSs1vaao7kUYIyJB2gAp1IE48=";
+  vendorHash = "sha256-5D/aKNU7ZtDMJW+KImBwN4bhpSexsldtCtA3IIHJrQU=";
 
   meta = {
     description = "AWS CodeArtifact proxy to allow unauthenticated read access";

From 1691c94c886c34c0cd27ac59847c7cbc32f74435 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 06:32:45 +0000
Subject: [PATCH 4950/6226] cloud-nuke: 0.44.0 -> 0.45.0

---
 pkgs/by-name/cl/cloud-nuke/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/cloud-nuke/package.nix b/pkgs/by-name/cl/cloud-nuke/package.nix
index 4c864981240e..3003dac20179 100644
--- a/pkgs/by-name/cl/cloud-nuke/package.nix
+++ b/pkgs/by-name/cl/cloud-nuke/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "cloud-nuke";
-  version = "0.44.0";
+  version = "0.45.0";
 
   src = fetchFromGitHub {
     owner = "gruntwork-io";
     repo = "cloud-nuke";
     tag = "v${version}";
-    hash = "sha256-6lbEThaszG3yw1HKqtHWKRpcmb7933mAlU1fra+h19c=";
+    hash = "sha256-Xv8m8hCg0kw82+AWCNKW0jcYyguR5SDHq/ldflR/iOA=";
   };
 
   vendorHash = "sha256-Qml8P9m8quUZAarsS7h3TGbcXBCJ2fRD3uyi8Do+lAw=";

From aa42b52e91ee601b9ae9df6005e82b1eb0ceedba Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 06:40:35 +0000
Subject: [PATCH 4951/6226] chirp: 0.4.0-unstable-2025-10-23 ->
 0.4.0-unstable-2025-10-30

---
 pkgs/by-name/ch/chirp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chirp/package.nix b/pkgs/by-name/ch/chirp/package.nix
index dcdc2a67546c..2b8bcba2d8f1 100644
--- a/pkgs/by-name/ch/chirp/package.nix
+++ b/pkgs/by-name/ch/chirp/package.nix
@@ -11,14 +11,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "chirp";
-  version = "0.4.0-unstable-2025-10-23";
+  version = "0.4.0-unstable-2025-10-30";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kk7ds";
     repo = "chirp";
-    rev = "8116c3782a6b6b7112cc372f0b423853d3645f5a";
-    hash = "sha256-64QKsdNL5HcjYHMH1H03Nm5PqH5ypkpeX9uqN2GdnuI=";
+    rev = "a3b973cceb46e431423b3599fb365668958963d5";
+    hash = "sha256-z68yLImyB7MvCd/+ZNiqZjFtXk6+fZ2uJPj5GUJZg8M=";
   };
 
   nativeBuildInputs = [

From 805e4c37a869d46dca138fa45eaf3a4d1ca8f4f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 06:54:23 +0000
Subject: [PATCH 4952/6226] cargo-nextest: 0.9.108 -> 0.9.110

---
 pkgs/by-name/ca/cargo-nextest/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix
index 549f8f579250..8a44128b0523 100644
--- a/pkgs/by-name/ca/cargo-nextest/package.nix
+++ b/pkgs/by-name/ca/cargo-nextest/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-nextest";
-  version = "0.9.108";
+  version = "0.9.110";
 
   src = fetchFromGitHub {
     owner = "nextest-rs";
     repo = "nextest";
     rev = "cargo-nextest-${version}";
-    hash = "sha256-DY/FNtlNQg9Ym6PKo6UqSuWzGC3cDhbNU6MKTDxIaU4=";
+    hash = "sha256-ipxPE3nugBJt/gLUdy/LQOTqat1Li2ovVPq3i81Yd/w=";
   };
 
   # FIXME: we don't support dtrace probe generation on macOS until we have a dtrace build: https://github.com/NixOS/nixpkgs/pull/392918
@@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec {
     ./no-dtrace-macos.patch
   ];
 
-  cargoHash = "sha256-uQH9d+9VByXe/lL4Ybz07p+iYWUhbATMBCu7mYKxOSE=";
+  cargoHash = "sha256-9IvBgn+2taygTU+RjUWoiS3yI1LzejvzrYJ7VoiHpJI=";
 
   cargoBuildFlags = [
     "-p"

From 3d8133c572d44075b5cf385bf11dc5f8bbeece55 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sun, 2 Nov 2025 22:46:17 -0800
Subject: [PATCH 4953/6226] gccNGPackages.libbacktrace: fix tests on darwin

The libbacktrace test suite was failing on darwin because the
btest_gnudebuglink tests attempted to use GNU debuglink functionality,
which only works on ELF binaries, not Mach-O on darwin.

We set `libbacktrace_cv_objcopy_debuglink=no`, allowing the remaining 21 tests to run successfully.
---
 .../compilers/gcc/ng/common/libbacktrace/default.nix         | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/compilers/gcc/ng/common/libbacktrace/default.nix b/pkgs/development/compilers/gcc/ng/common/libbacktrace/default.nix
index 33b817420035..307a7061bc57 100644
--- a/pkgs/development/compilers/gcc/ng/common/libbacktrace/default.nix
+++ b/pkgs/development/compilers/gcc/ng/common/libbacktrace/default.nix
@@ -47,6 +47,11 @@ stdenv.mkDerivation (finalAttrs: {
     mkdir ../../build
     cd ../../build
     configureScript=../$sourceRoot/configure
+  ''
+  + lib.optionalString stdenv.hostPlatform.isDarwin ''
+    # GNU debuglink is not supported on macOS (Mach-O format)
+    # Skip the gnudebuglink tests which fail on Darwin
+    export libbacktrace_cv_objcopy_debuglink=no
   '';
 
   installPhase = ''

From 775f9673fba498067dea36490c1c41e669f0adf4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 06:57:58 +0000
Subject: [PATCH 4954/6226] qrtool: 0.12.1 -> 0.13.1

---
 pkgs/by-name/qr/qrtool/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/qr/qrtool/package.nix b/pkgs/by-name/qr/qrtool/package.nix
index 2856348749d0..deaef3d36bb4 100644
--- a/pkgs/by-name/qr/qrtool/package.nix
+++ b/pkgs/by-name/qr/qrtool/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "qrtool";
-  version = "0.12.1";
+  version = "0.13.1";
 
   src = fetchFromGitHub {
     owner = "sorairolake";
     repo = "qrtool";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-I/LyDHV3pbRj+utzJBLvkgstEOodLkvfQT6uMLnOEgM=";
+    hash = "sha256-ckdtmnUupnKAaspLm/l+nmPNdQ/sFAusQehzWikxq7A=";
   };
 
-  cargoHash = "sha256-c1sw0zyJZDvJe3Hcn1W4UPkqTKqRhywHpR6HLrqAN+A=";
+  cargoHash = "sha256-RGEHsMay7+sjmrKz4g6uFXt6fUFiu0xIjr4fQaARKIM=";
 
   nativeBuildInputs = [
     asciidoctor

From 738c67d94a7ce68a2c8ec3071db934723ddbfaa8 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@determinate.systems>
Date: Sun, 2 Nov 2025 23:11:44 -0800
Subject: [PATCH 4955/6226] llvmPackages_git: 22.0.0-unstable-2025-10-27 ->
 22.0.0-unstable-2025-11-02

---
 pkgs/development/compilers/llvm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/compilers/llvm/default.nix b/pkgs/development/compilers/llvm/default.nix
index bb986c4c3da9..c8cd6d4f48ac 100644
--- a/pkgs/development/compilers/llvm/default.nix
+++ b/pkgs/development/compilers/llvm/default.nix
@@ -27,9 +27,9 @@ let
     "20.1.8".officialRelease.sha256 = "sha256-ysyB/EYxi2qE9fD5x/F2zI4vjn8UDoo1Z9ukiIrjFGw=";
     "21.1.2".officialRelease.sha256 = "sha256-SgZdBL0ivfv6/4EqmPQ+I57qT2t6i/rqnm20+T1BsFY=";
     "22.0.0-git".gitRelease = {
-      rev = "aed12c33ade9ea48f1a596cd98fde958803a17a7";
-      rev-version = "22.0.0-unstable-2025-10-27";
-      sha256 = "sha256-RnY+2/t4cGdjzh5sSsUPxOZ7xo4oUu4MkGSyOFBsk1s=";
+      rev = "492f82fa46065b3afcfed1a4dca9a029d7c5acf1";
+      rev-version = "22.0.0-unstable-2025-11-02";
+      sha256 = "sha256-N0OJrXy9vtEFrr6pxoEdPIdOUju6sIjKX1s6wtYZ/7c=";
     };
   }
   // llvmVersions;

From e61e676f4bfa945bc21f79e5c9251b36aed1e570 Mon Sep 17 00:00:00 2001
From: qzylinra <qzylinra@users.noreply.github.com>
Date: Fri, 24 Oct 2025 11:47:11 +0800
Subject: [PATCH 4956/6226] flutter338: init at 3.38.0-0.2.pre

---
 .../flutter/artifacts/fetch-artifacts.nix     |   10 +-
 .../flutter/artifacts/overrides/darwin.nix    |    2 +-
 .../flutter/artifacts/prepare-artifacts.nix   |    6 +-
 .../development/compilers/flutter/default.nix |   12 +-
 .../compilers/flutter/engine/dart.nix         |    5 +-
 .../compilers/flutter/engine/default.nix      |   42 +-
 .../compilers/flutter/engine/package.nix      |  276 +++--
 .../compilers/flutter/engine/pkg-config.py    |  247 ----
 .../compilers/flutter/engine/source.nix       |  124 +-
 .../compilers/flutter/engine/tools.nix        |   50 +-
 .../compilers/flutter/flutter-tools.nix       |   12 +-
 .../development/compilers/flutter/flutter.nix |   47 +-
 .../compilers/flutter/sdk-symlink.nix         |    6 +-
 .../flutter/update/get-artifact-hashes.nix.in |   40 +-
 .../flutter/update/get-dart-hashes.nix.in     |   23 +-
 .../flutter/update/get-engine-hashes.nix.in   |   41 +-
 .../flutter/update/get-flutter.nix.in         |    2 +-
 .../flutter/update/get-pubspec-lock.nix.in    |    8 +-
 .../compilers/flutter/versions/3_38/data.json | 1090 +++++++++++++++++
 ...deregister-pub-dependencies-artifact.patch |   21 +
 .../3_38/patches/disable-auto-update.patch    |   29 +
 .../fix-ios-build-xcode-backend-sh.patch      |   68 +
 .../fix-macos-build-macos-assemble-sh.patch   |   59 +
 .../gradle-flutter-tools-wrapper.patch        |  220 ++++
 .../development/compilers/flutter/wrapper.nix |   10 +-
 pkgs/top-level/all-packages.nix               |    1 +
 26 files changed, 1861 insertions(+), 590 deletions(-)
 delete mode 100644 pkgs/development/compilers/flutter/engine/pkg-config.py
 create mode 100644 pkgs/development/compilers/flutter/versions/3_38/data.json
 create mode 100644 pkgs/development/compilers/flutter/versions/3_38/patches/deregister-pub-dependencies-artifact.patch
 create mode 100644 pkgs/development/compilers/flutter/versions/3_38/patches/disable-auto-update.patch
 create mode 100644 pkgs/development/compilers/flutter/versions/3_38/patches/fix-ios-build-xcode-backend-sh.patch
 create mode 100644 pkgs/development/compilers/flutter/versions/3_38/patches/fix-macos-build-macos-assemble-sh.patch
 create mode 100644 pkgs/development/compilers/flutter/versions/3_38/patches/gradle-flutter-tools-wrapper.patch

diff --git a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
index 2b15b448538c..e7a9cfc9be13 100644
--- a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
+++ b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
@@ -71,7 +71,7 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}"
     ''
       export FLUTTER_ROOT="$NIX_BUILD_TOP"
       lndir -silent '${flutter'}' "$FLUTTER_ROOT"
-      rm -rf "$FLUTTER_ROOT/bin/cache"
+      rm --recursive --force "$FLUTTER_ROOT/bin/cache"
       mkdir "$FLUTTER_ROOT/bin/cache"
     ''
     + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") ''
@@ -89,18 +89,18 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}"
           flutter ? engine && flutter.engine.meta.available
         ) "--local-engine ${flutter.engine.outName}"
       } \
-        -v '--${flutterPlatform}' ${
+        --verbose '--${flutterPlatform}' ${
           builtins.concatStringsSep " " (map (p: "'--no-${p}'") (lib.remove flutterPlatform flutterPlatforms))
         }
 
-      rm -rf "$FLUTTER_ROOT/bin/cache/lockfile"
+      rm --recursive --force "$FLUTTER_ROOT/bin/cache/lockfile"
     ''
     + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") ''
-      rm -rf "$FLUTTER_ROOT/bin/cache/dart-sdk"
+      rm --recursive --force "$FLUTTER_ROOT/bin/cache/dart-sdk"
     ''
     + ''
       find "$FLUTTER_ROOT" -type l -lname '${flutter'}/*' -delete
 
-      cp -r bin/cache "$out"
+      cp --recursive bin/cache "$out"
     ''
   )
diff --git a/pkgs/development/compilers/flutter/artifacts/overrides/darwin.nix b/pkgs/development/compilers/flutter/artifacts/overrides/darwin.nix
index 0a79a707bbaa..dbdd81ba596a 100644
--- a/pkgs/development/compilers/flutter/artifacts/overrides/darwin.nix
+++ b/pkgs/development/compilers/flutter/artifacts/overrides/darwin.nix
@@ -4,9 +4,9 @@
   ...
 }:
 {
+  # Use arm64 instead of arm64e.
   postPatch = ''
     if [ "$pname" == "flutter-tools" ]; then
-      # Use arm64 instead of arm64e.
       substituteInPlace lib/src/ios/xcodeproj.dart \
         --replace-fail arm64e arm64
     fi
diff --git a/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix
index a98fa1ff0487..64eb4072d24e 100644
--- a/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix
+++ b/pkgs/development/compilers/flutter/artifacts/prepare-artifacts.nix
@@ -15,9 +15,9 @@
   installPhase = ''
     runHook preInstall
 
-    mkdir -p "$out/bin"
-    cp -r . "$out/bin/cache"
-    rm -f "$out/bin/cache/flutter.version.json"
+    mkdir --parents "$out/bin"
+    cp --recursive . "$out/bin/cache"
+    rm --force "$out/bin/cache/flutter.version.json"
 
     runHook postInstall
   '';
diff --git a/pkgs/development/compilers/flutter/default.nix b/pkgs/development/compilers/flutter/default.nix
index 32e7581df049..1b3cd7eecfce 100644
--- a/pkgs/development/compilers/flutter/default.nix
+++ b/pkgs/development/compilers/flutter/default.nix
@@ -54,19 +54,19 @@ let
           sources = {
             "${dartVersion}-x86_64-linux" = fetchzip {
               url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
-              sha256 = dartHash.x86_64-linux;
+              hash = dartHash.x86_64-linux;
             };
             "${dartVersion}-aarch64-linux" = fetchzip {
               url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
-              sha256 = dartHash.aarch64-linux;
+              hash = dartHash.aarch64-linux;
             };
             "${dartVersion}-x86_64-darwin" = fetchzip {
               url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip";
-              sha256 = dartHash.x86_64-darwin;
+              hash = dartHash.x86_64-darwin;
             };
             "${dartVersion}-aarch64-darwin" = fetchzip {
               url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-macos-arm64-release.zip";
-              sha256 = dartHash.aarch64-darwin;
+              hash = dartHash.aarch64-darwin;
             };
           };
         };
@@ -75,7 +75,7 @@ let
             source = fetchFromGitHub {
               owner = "flutter";
               repo = "flutter";
-              rev = version;
+              tag = version;
               hash = flutterHash;
             };
           in
@@ -83,7 +83,7 @@ let
             if lib.versionAtLeast version "3.32" then
               # # Could not determine engine revision
               (runCommand source.name { } ''
-                cp -r ${source} $out
+                cp --recursive ${source} $out
                 chmod +w $out/bin
                 mkdir $out/bin/cache
                 cp $out/bin/internal/engine.version $out/bin/cache/engine.stamp
diff --git a/pkgs/development/compilers/flutter/engine/dart.nix b/pkgs/development/compilers/flutter/engine/dart.nix
index 5d7d126cae02..4846392aa8ba 100644
--- a/pkgs/development/compilers/flutter/engine/dart.nix
+++ b/pkgs/development/compilers/flutter/engine/dart.nix
@@ -3,13 +3,10 @@ runCommand "flutter-engine-${engine.version}-dart"
   {
     version = engine.dartSdkVersion;
 
-    inherit engine;
-    inherit (engine) outName;
-
     meta = engine.meta // {
       description = "Dart SDK compiled from the Flutter Engine";
     };
   }
   ''
-    ln -s ${engine}/out/$outName/dart-sdk $out
+    ln --symbolic ${engine}/out/${engine.outName}/dart-sdk $out
   ''
diff --git a/pkgs/development/compilers/flutter/engine/default.nix b/pkgs/development/compilers/flutter/engine/default.nix
index 6e90cc916ec7..0821bce822a5 100644
--- a/pkgs/development/compilers/flutter/engine/default.nix
+++ b/pkgs/development/compilers/flutter/engine/default.nix
@@ -9,12 +9,9 @@
   url,
   patches,
   runtimeModes,
-  isOptimized ? null,
   lib,
   stdenv,
-  dart,
-  mainRuntimeMode ? null,
-  altRuntimeMode ? null,
+  ...
 }@args:
 let
   mainRuntimeMode = args.mainRuntimeMode or builtins.elemAt runtimeModes 0;
@@ -41,25 +38,16 @@ in
 stdenv.mkDerivation (
   {
     pname = "flutter-engine";
-    inherit url runtimeModes;
-    inherit (runtimeModesBuilds.${mainRuntimeMode})
-      meta
-      src
-      version
-      dartSdkVersion
-      isOptimized
-      runtimeMode
-      outName
-      dart
-      swiftshader
-      ;
-    inherit altRuntimeMode;
+    inherit url runtimeModes altRuntimeMode;
+    inherit (runtimeModesBuilds.${mainRuntimeMode}) version src meta;
 
     dontUnpack = true;
     dontBuild = true;
 
     installPhase = ''
-      mkdir -p $out/out
+      runHook preInstall
+
+      mkdir --parents $out/out
     ''
     + lib.concatMapStrings (
       runtimeMode:
@@ -68,9 +56,23 @@ stdenv.mkDerivation (
         runtimeModeOut = runtimeModeBuild.outName;
       in
       ''
-        ln -sf ${runtimeModeBuild}/out/${runtimeModeOut} $out/out/${runtimeModeOut}
+        ln --symbolic --force ${runtimeModeBuild}/out/${runtimeModeOut} $out/out/${runtimeModeOut}
       ''
-    ) runtimeModes;
+    ) runtimeModes
+    + ''
+      runHook postInstall
+    '';
+
+    passthru = {
+      inherit (runtimeModesBuilds.${mainRuntimeMode})
+        dartSdkVersion
+        isOptimized
+        runtimeMode
+        outName
+        dart
+        swiftshader
+        ;
+    };
   }
   // runtimeModesBuilds
 )
diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix
index 53438ed9794e..a1e5e73f0338 100644
--- a/pkgs/development/compilers/flutter/engine/package.nix
+++ b/pkgs/development/compilers/flutter/engine/package.nix
@@ -1,11 +1,12 @@
 {
   lib,
   callPackage,
-  writeText,
+  fetchurl,
+  bash,
+  bintools,
   symlinkJoin,
   darwin,
   clang,
-  llvm,
   tools ? callPackage ./tools.nix {
     inherit (stdenv)
       hostPlatform
@@ -13,10 +14,8 @@
       ;
   },
   stdenv,
-  stdenvNoCC,
   dart,
   fetchgit,
-  runCommand,
   llvmPackages,
   patchelf,
   openbox,
@@ -49,18 +48,12 @@
   isOptimized ? runtimeMode != "debug",
 }:
 let
-  expandSingleDep =
-    dep: lib.optionals (lib.isDerivation dep) ([ dep ] ++ map (output: dep.${output}) dep.outputs);
-
-  expandDeps = deps: lib.flatten (map expandSingleDep deps);
-
   constants = callPackage ./constants.nix { platform = stdenv.targetPlatform; };
 
   python3 = python312;
 
   src = callPackage ./source.nix {
     inherit
-      tools
       flutterVersion
       version
       hashes
@@ -93,22 +86,11 @@ let
 
   outName = "host_${runtimeMode}${lib.optionalString (!isOptimized) "_unopt"}";
 
-  dartPath = "${
-    if (lib.versionAtLeast flutterVersion "3.23") then "flutter/third_party" else "third_party"
-  }/dart";
+  dartPath = "flutter/third_party/dart";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "flutter-engine-${runtimeMode}${lib.optionalString (!isOptimized) "-unopt"}";
-  inherit
-    version
-    runtimeMode
-    patches
-    isOptimized
-    dartSdkVersion
-    src
-    outName
-    swiftshader
-    ;
+  inherit version src patches;
 
   setOutputFlags = false;
   doStrip = isOptimized;
@@ -117,36 +99,39 @@ stdenv.mkDerivation (finalAttrs: {
     name = "flutter-engine-toolchain-${version}";
 
     paths =
-      expandDeps (
-        lib.optionals (stdenv.hostPlatform.isLinux) [
-          gtk3
-          wayland
-          libepoxy
-          libglvnd
-          freetype
-          at-spi2-atk
-          glib
-          gdk-pixbuf
-          harfbuzz
-          pango
-          cairo
-          xorg.libxcb
-          xorg.libX11
-          xorg.libXcursor
-          xorg.libXrandr
-          xorg.libXrender
-          xorg.libXinerama
-          xorg.libXi
-          xorg.libXext
-          xorg.libXfixes
-          xorg.libXxf86vm
-          xorg.xorgproto
-          zlib
-        ]
-        ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
-          clang
-          llvm
-        ]
+      lib.flatten (
+        map (dep: lib.optionals (lib.isDerivation dep) ([ dep ] ++ map (output: dep.${output}) dep.outputs))
+          (
+            lib.optionals (stdenv.hostPlatform.isLinux) [
+              gtk3
+              wayland
+              libepoxy
+              libglvnd
+              freetype
+              at-spi2-atk
+              glib
+              gdk-pixbuf
+              harfbuzz
+              pango
+              cairo
+              xorg.libxcb
+              xorg.libX11
+              xorg.libXcursor
+              xorg.libXrandr
+              xorg.libXrender
+              xorg.libXinerama
+              xorg.libXi
+              xorg.libXext
+              xorg.libXfixes
+              xorg.libXxf86vm
+              xorg.xorgproto
+              zlib
+            ]
+            ++ lib.optionals (stdenv.hostPlatform.isDarwin) [
+              clang
+              llvm
+            ]
+          )
       )
       ++ [
         stdenv.cc.libc_dev
@@ -156,19 +141,16 @@ stdenv.mkDerivation (finalAttrs: {
     # Needed due to Flutter expecting everything to be relative to $out
     # and not true absolute path (ie relative to "/").
     postBuild = ''
-      mkdir -p $(dirname $(dirname "$out/$out"))
-      ln -s $(dirname "$out") $out/$(dirname "$out")
+      mkdir --parents $(dirname $(dirname "$out/$out"))
+      ln --symbolic $(dirname "$out") $out/$(dirname "$out")
     '';
   };
 
   NIX_CFLAGS_COMPILE = [
     "-I${finalAttrs.toolchain}/include"
+    "-Wno-error"
   ]
-  ++ lib.optional (!isOptimized) "-U_FORTIFY_SOURCE"
-  ++ lib.optionals (lib.versionAtLeast flutterVersion "3.35") [
-    "-Wno-macro-redefined"
-    "-Wno-error=macro-redefined"
-  ];
+  ++ lib.optional (!isOptimized) "-U_FORTIFY_SOURCE";
 
   nativeCheckInputs = lib.optionals stdenv.hostPlatform.isLinux [
     xorg.xorgserver
@@ -195,77 +177,93 @@ stdenv.mkDerivation (finalAttrs: {
   ]
   ++ lib.optionals (stdenv.cc.libc ? bin) [ stdenv.cc.libc.bin ];
 
-  buildInputs = [ gtk3 ];
+  buildInputs = [
+    gtk3
+    libepoxy
+  ];
 
   patchtools = [ "flutter/third_party/gn/gn" ];
 
   dontPatch = true;
 
-  patchgit = [
+  env.patchgit = toString [
     dartPath
     "flutter"
     "."
-  ]
-  ++ lib.optional (lib.versionAtLeast flutterVersion "3.21") "flutter/third_party/skia";
+    "flutter/third_party/skia"
+  ];
 
-  postUnpack = ''
-    pushd ${src.name}
+  sourceRoot = if lib.versionAtLeast flutterVersion "3.38" then "${src.name}/engine" else src.name;
 
-    cp ${./pkg-config.py} src/build/config/linux/pkg-config.py
+  postUnpack =
+    lib.optionalString (lib.versionAtLeast flutterVersion "3.38") ''
+      chmod --recursive +w ${src.name}
+      echo '#!${lib.getExe bash}' > ${src.name}/bin/internal/content_aware_hash.sh
+      echo 'echo 1111111111111111111111111111111111111111' >> ${src.name}/bin/internal/content_aware_hash.sh
+    ''
+    + ''
+      pushd ${finalAttrs.sourceRoot}
 
-    cp -pr --reflink=auto $swiftshader src/flutter/third_party/swiftshader
-    chmod -R u+w -- src/flutter/third_party/swiftshader
+      cp ${
+        fetchurl {
+          url = "https://raw.githubusercontent.com/chromium/chromium/631a813125b886a52274653144019fd1681a0e97/build/config/linux/pkg-config.py";
+          hash = "sha256-9coRpgCewlkFXSGrMVkudaZUll0IFc9jDRBP+2PloOI=";
+        }
+      } src/build/config/linux/pkg-config.py
 
-    ln -s ${llvmPackages.llvm.monorepoSrc} src/flutter/third_party/swiftshader/third_party/llvm-project
+      cp --preserve=mode,ownership,timestamps --recursive --reflink=auto ${swiftshader} src/flutter/third_party/swiftshader
+      chmod --recursive u+w -- src/flutter/third_party/swiftshader
 
-    mkdir -p src/flutter/buildtools/${constants.alt-platform}
-    ln -s ${llvm} src/flutter/buildtools/${constants.alt-platform}/clang
+      ln --symbolic ${llvmPackages.llvm.monorepoSrc} src/flutter/third_party/swiftshader/third_party/llvm-project
 
-    mkdir -p src/buildtools/${constants.alt-platform}
-    ln -s ${llvm} src/buildtools/${constants.alt-platform}/clang
+      mkdir --parents src/flutter/buildtools/${constants.alt-platform}
+      ln --symbolic ${llvm} src/flutter/buildtools/${constants.alt-platform}/clang
 
-    mkdir -p src/${dartPath}/tools/sdks
-    ln -s ${dart} src/${dartPath}/tools/sdks/dart-sdk
+      mkdir --parents src/buildtools/${constants.alt-platform}
+      ln --symbolic ${llvm} src/buildtools/${constants.alt-platform}/clang
 
-    ${lib.optionalString (stdenv.hostPlatform.isLinux) ''
-      for patchtool in ''${patchtools[@]}; do
-        patchelf src/$patchtool --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker)
+      mkdir --parents src/${dartPath}/tools/sdks
+      ln --symbolic ${dart} src/${dartPath}/tools/sdks/dart-sdk
+
+      ${lib.optionalString (stdenv.hostPlatform.isLinux) ''
+        for patchtool in ''${patchtools[@]}; do
+          patchelf src/$patchtool --set-interpreter ${bintools.dynamicLinker}
+        done
+      ''}
+
+      for dir in ''${patchgit[@]}; do
+        pushd src/$dir
+        rm --recursive --force .git
+        git init
+        git add .
+        git config user.name "nobody"
+        git config user.email "nobody@local.host"
+        git commit --all --message="$dir" --quiet
+        popd
+      done
+
+      dart src/${dartPath}/tools/generate_package_config.dart
+      echo "${dartSdkVersion}" >src/${dartPath}/sdk/version
+
+      rm --recursive --force src/third_party/angle/.git
+      python3 src/flutter/tools/pub_get_offline.py
+
+      pushd src/flutter
+
+      for p in ''${patches[@]}; do
+        patch -p1 -i $p
       done
-    ''}
 
-    for dir in ''${patchgit[@]}; do
-      pushd src/$dir
-      rm -rf .git
-      git init
-      git add .
-      git config user.name "nobody"
-      git config user.email "nobody@local.host"
-      git commit -a -m "$dir" --quiet
       popd
-    done
-
-    dart src/${dartPath}/tools/generate_package_config.dart
-    echo "${dartSdkVersion}" >src/${dartPath}/sdk/version
-
-    rm -rf src/third_party/angle/.git
-    python3 src/flutter/tools/pub_get_offline.py
-
-    pushd src/flutter
-
-    for p in ''${patches[@]}; do
-      patch -p1 -i $p
-    done
-
-    popd
-  ''
-  # error: 'close_range' is missing exception specification 'noexcept(true)'
-  + lib.optionalString (lib.versionAtLeast flutterVersion "3.35") ''
-    substituteInPlace src/flutter/third_party/dart/runtime/bin/process_linux.cc \
-      --replace-fail "(unsigned int first, unsigned int last, int flags)" "(unsigned int first, unsigned int last, int flags) noexcept(true)"
-  ''
-  + ''
-    popd
-  '';
+    ''
+    # error: 'close_range' is missing exception specification 'noexcept(true)'
+    + lib.optionalString (lib.versionAtLeast flutterVersion "3.35") ''
+      substituteInPlace src/flutter/third_party/dart/runtime/bin/process_linux.cc \
+        --replace-fail "(unsigned int first, unsigned int last, int flags)" "(unsigned int first, unsigned int last, int flags) noexcept(true)"
+    ''
+    + ''
+      popd
+    '';
 
   configureFlags = [
     "--no-prebuilt-dart-sdk"
@@ -281,7 +279,6 @@ stdenv.mkDerivation (finalAttrs: {
   ++ lib.optional finalAttrs.finalPackage.doCheck "--enable-unittests"
   ++ lib.optional (!finalAttrs.finalPackage.doCheck) "--no-enable-unittests";
 
-  # NOTE: Once https://github.com/flutter/flutter/issues/127606 is fixed, use "--no-prebuilt-dart-sdk"
   configurePhase = ''
     runHook preConfigure
 
@@ -292,12 +289,13 @@ stdenv.mkDerivation (finalAttrs: {
   ''
   + ''
     python3 ./src/flutter/tools/gn $configureFlags \
-      --runtime-mode $runtimeMode \
+      --runtime-mode ${runtimeMode} \
       --out-dir $out \
-      --target-sysroot $toolchain \
-      --target-dir $outName \
+      --target-sysroot ${finalAttrs.toolchain} \
+      --target-dir ${outName} \
       --target-triple ${stdenv.targetPlatform.config} \
-      --enable-fontconfig
+      --enable-fontconfig \
+      --no-prebuilt-dart-sdk
 
     runHook postConfigure
   '';
@@ -306,14 +304,14 @@ stdenv.mkDerivation (finalAttrs: {
     runHook preBuild
 
     export TERM=dumb
-
-    ${lib.optionalString (lib.versionAtLeast flutterVersion "3.29") ''
-      # ValueError: ZIP does not support timestamps before 1980
-      substituteInPlace src/flutter/build/zip.py \
-        --replace-fail "zipfile.ZipFile(args.output, 'w', zipfile.ZIP_DEFLATED)" "zipfile.ZipFile(args.output, 'w', zipfile.ZIP_DEFLATED, strict_timestamps=False)"
-    ''}
-
-    ninja -C $out/out/$outName -j$NIX_BUILD_CORES
+  ''
+  # ValueError: ZIP does not support timestamps before 1980
+  + lib.optionalString (lib.versionAtLeast flutterVersion "3.29") ''
+    substituteInPlace src/flutter/build/zip.py \
+      --replace-fail "zipfile.ZipFile(args.output, 'w', zipfile.ZIP_DEFLATED)" "zipfile.ZipFile(args.output, 'w', zipfile.ZIP_DEFLATED, strict_timestamps=False)"
+  ''
+  + ''
+    ninja -C $out/out/${outName} -j$NIX_BUILD_CORES
 
     runHook postBuild
   '';
@@ -321,28 +319,39 @@ stdenv.mkDerivation (finalAttrs: {
   # Tests are broken
   doCheck = false;
   checkPhase = ''
-    ln -s $out/out src/out
+    runHook preCheck
+
+    ln --symbolic $out/out src/out
     touch src/out/run_tests.log
-    sh src/flutter/testing/run_tests.sh $outName
+    sh src/flutter/testing/run_tests.sh ${outName}
     rm src/out/run_tests.log
+
+    runHook postCheck
   '';
 
   installPhase = ''
     runHook preInstall
 
-    rm -rf $out/out/$outName/{obj,exe.unstripped,lib.unstripped,zip_archives}
-    rm $out/out/$outName/{args.gn,build.ninja,build.ninja.d,compile_commands.json,toolchain.ninja}
-    find $out/out/$outName -name '*_unittests' -delete
-    find $out/out/$outName -name '*_benchmarks' -delete
+    rm -rf $out/out/${outName}/{obj,exe.unstripped,lib.unstripped,zip_archives}
+    rm $out/out/${outName}/{args.gn,build.ninja,build.ninja.d,compile_commands.json,toolchain.ninja}
+    find $out/out/${outName} -name '*_unittests' -delete
+    find $out/out/${outName} -name '*_benchmarks' -delete
   ''
   + lib.optionalString (finalAttrs.finalPackage.doCheck) ''
-    rm $out/out/$outName/{display_list_rendertests,flutter_tester}
+    rm $out/out/${outName}/{display_list_rendertests,flutter_tester}
   ''
   + ''
     runHook postInstall
   '';
 
   passthru = {
+    inherit
+      dartSdkVersion
+      isOptimized
+      runtimeMode
+      outName
+      swiftshader
+      ;
     dart = callPackage ./dart.nix { engine = finalAttrs.finalPackage; };
   };
 
@@ -359,6 +368,5 @@ stdenv.mkDerivation (finalAttrs: {
       "x86_64-darwin"
       "aarch64-darwin"
     ];
-  }
-  // lib.optionalAttrs (lib.versionOlder flutterVersion "3.22") { hydraPlatforms = [ ]; };
+  };
 })
diff --git a/pkgs/development/compilers/flutter/engine/pkg-config.py b/pkgs/development/compilers/flutter/engine/pkg-config.py
deleted file mode 100644
index 1df08211e570..000000000000
--- a/pkgs/development/compilers/flutter/engine/pkg-config.py
+++ /dev/null
@@ -1,247 +0,0 @@
-#!/usr/bin/env python3
-#
-# Copyright (c) 2013 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-
-
-import json
-import os
-import subprocess
-import sys
-import re
-from optparse import OptionParser
-
-# This script runs pkg-config, optionally filtering out some results, and
-# returns the result.
-#
-# The result will be [ <includes>, <cflags>, <libs>, <lib_dirs>, <ldflags> ]
-# where each member is itself a list of strings.
-#
-# You can filter out matches using "-v <regexp>" where all results from
-# pkgconfig matching the given regular expression will be ignored. You can
-# specify more than one regular expression my specifying "-v" more than once.
-#
-# You can specify a sysroot using "-s <sysroot>" where sysroot is the absolute
-# system path to the sysroot used for compiling. This script will attempt to
-# generate correct paths for the sysroot.
-#
-# When using a sysroot, you must also specify the architecture via
-# "-a <arch>" where arch is either "x86" or "x64".
-#
-# CrOS systemroots place pkgconfig files at <systemroot>/usr/share/pkgconfig
-# and one of <systemroot>/usr/lib/pkgconfig or <systemroot>/usr/lib64/pkgconfig
-# depending on whether the systemroot is for a 32 or 64 bit architecture. They
-# specify the 'lib' or 'lib64' of the pkgconfig path by defining the
-# 'system_libdir' variable in the args.gn file. pkg_config.gni communicates this
-# variable to this script with the "--system_libdir <system_libdir>" flag. If no
-# flag is provided, then pkgconfig files are assumed to come from
-# <systemroot>/usr/lib/pkgconfig.
-#
-# Additionally, you can specify the option --atleast-version. This will skip
-# the normal outputting of a dictionary and instead print true or false,
-# depending on the return value of pkg-config for the given package.
-
-
-def SetConfigPath(options):
-  """Set the PKG_CONFIG_LIBDIR environment variable.
-
-  This takes into account any sysroot and architecture specification from the
-  options on the given command line.
-  """
-
-  sysroot = options.sysroot
-  assert sysroot
-
-  # Compute the library path name based on the architecture.
-  arch = options.arch
-  if sysroot and not arch:
-    print("You must specify an architecture via -a if using a sysroot.")
-    sys.exit(1)
-
-  libdir = sysroot + '/' + options.system_libdir + '/pkgconfig'
-  libdir += ':' + sysroot + '/share/pkgconfig'
-  os.environ['PKG_CONFIG_LIBDIR'] = libdir
-  return libdir
-
-
-def GetPkgConfigPrefixToStrip(options, args):
-  """Returns the prefix from pkg-config where packages are installed.
-
-  This returned prefix is the one that should be stripped from the beginning of
-  directory names to take into account sysroots.
-  """
-  # Some sysroots, like the Chromium OS ones, may generate paths that are not
-  # relative to the sysroot. For example,
-  # /path/to/chroot/build/x86-generic/usr/lib/pkgconfig/pkg.pc may have all
-  # paths relative to /path/to/chroot (i.e. prefix=/build/x86-generic/usr)
-  # instead of relative to /path/to/chroot/build/x86-generic (i.e prefix=/usr).
-  # To support this correctly, it's necessary to extract the prefix to strip
-  # from pkg-config's |prefix| variable.
-  prefix = subprocess.check_output([options.pkg_config,
-      "--variable=prefix"] + args, env=os.environ).decode('utf-8')
-  return prefix
-
-
-def MatchesAnyRegexp(flag, list_of_regexps):
-  """Returns true if the first argument matches any regular expression in the
-  given list."""
-  for regexp in list_of_regexps:
-    if regexp.search(flag) != None:
-      return True
-  return False
-
-
-def RewritePath(path, strip_prefix, sysroot):
-  """Rewrites a path by stripping the prefix and prepending the sysroot."""
-  if os.path.isabs(path) and not path.startswith(sysroot):
-    if path.startswith(strip_prefix):
-      path = path[len(strip_prefix):]
-    path = path.lstrip('/')
-    return os.path.join(sysroot, path)
-  else:
-    return path
-
-
-def main():
-  # If this is run on non-Linux platforms, just return nothing and indicate
-  # success. This allows us to "kind of emulate" a Linux build from other
-  # platforms.
-  if "linux" not in sys.platform:
-    print("[[],[],[],[],[]]")
-    return 0
-
-  parser = OptionParser()
-  parser.add_option('-d', '--debug', action='store_true')
-  parser.add_option('-p', action='store', dest='pkg_config', type='string',
-                    default='pkg-config')
-  parser.add_option('-v', action='append', dest='strip_out', type='string')
-  parser.add_option('-s', action='store', dest='sysroot', type='string')
-  parser.add_option('-a', action='store', dest='arch', type='string')
-  parser.add_option('--system_libdir', action='store', dest='system_libdir',
-                    type='string', default='lib')
-  parser.add_option('--atleast-version', action='store',
-                    dest='atleast_version', type='string')
-  parser.add_option('--libdir', action='store_true', dest='libdir')
-  parser.add_option('--dridriverdir', action='store_true', dest='dridriverdir')
-  parser.add_option('--version-as-components', action='store_true',
-                    dest='version_as_components')
-  (options, args) = parser.parse_args()
-
-  # Make a list of regular expressions to strip out.
-  strip_out = []
-  if options.strip_out != None:
-    for regexp in options.strip_out:
-      strip_out.append(re.compile(regexp))
-
-  if options.sysroot:
-    libdir = SetConfigPath(options)
-    if options.debug:
-      sys.stderr.write('PKG_CONFIG_LIBDIR=%s\n' % libdir)
-    prefix = GetPkgConfigPrefixToStrip(options, args)
-  else:
-    prefix = ''
-
-  if options.atleast_version:
-    # When asking for the return value, just run pkg-config and print the return
-    # value, no need to do other work.
-    if not subprocess.call([options.pkg_config,
-                            "--atleast-version=" + options.atleast_version] +
-                            args):
-      print("true")
-    else:
-      print("false")
-    return 0
-
-  if options.version_as_components:
-    cmd = [options.pkg_config, "--modversion"] + args
-    try:
-      version_string = subprocess.check_output(cmd).decode('utf-8')
-    except:
-      sys.stderr.write('Error from pkg-config.\n')
-      return 1
-    print(json.dumps(list(map(int, version_string.strip().split(".")))))
-    return 0
-
-
-  if options.libdir:
-    cmd = [options.pkg_config, "--variable=libdir"] + args
-    if options.debug:
-      sys.stderr.write('Running: %s\n' % cmd)
-    try:
-      libdir = subprocess.check_output(cmd).decode('utf-8')
-    except:
-      print("Error from pkg-config.")
-      return 1
-    sys.stdout.write(libdir.strip())
-    return 0
-
-  if options.dridriverdir:
-    cmd = [options.pkg_config, "--variable=dridriverdir"] + args
-    if options.debug:
-      sys.stderr.write('Running: %s\n' % cmd)
-    try:
-      dridriverdir = subprocess.check_output(cmd).decode('utf-8')
-    except:
-      print("Error from pkg-config.")
-      return 1
-    sys.stdout.write(dridriverdir.strip())
-    return
-
-  cmd = [options.pkg_config, "--cflags", "--libs"] + args
-  if options.debug:
-    sys.stderr.write('Running: %s\n' % ' '.join(cmd))
-
-  try:
-    flag_string = subprocess.check_output(cmd).decode('utf-8')
-  except:
-    sys.stderr.write('Could not run pkg-config.\n')
-    return 1
-
-  # For now just split on spaces to get the args out. This will break if
-  # pkgconfig returns quoted things with spaces in them, but that doesn't seem
-  # to happen in practice.
-  all_flags = flag_string.strip().split(' ')
-
-
-  sysroot = options.sysroot
-  if not sysroot:
-    sysroot = ''
-
-  includes = []
-  cflags = []
-  libs = []
-  lib_dirs = []
-
-  for flag in all_flags[:]:
-    if len(flag) == 0 or MatchesAnyRegexp(flag, strip_out):
-      continue;
-
-    if flag[:2] == '-l':
-      libs.append(RewritePath(flag[2:], prefix, sysroot))
-    elif flag[:2] == '-L':
-      lib_dirs.append(RewritePath(flag[2:], prefix, sysroot))
-    elif flag[:2] == '-I':
-      includes.append(RewritePath(flag[2:], prefix, sysroot))
-    elif flag[:3] == '-Wl':
-      # Don't allow libraries to control ld flags.  These should be specified
-      # only in build files.
-      pass
-    elif flag == '-pthread':
-      # Many libs specify "-pthread" which we don't need since we always include
-      # this anyway. Removing it here prevents a bunch of duplicate inclusions
-      # on the command line.
-      pass
-    else:
-      cflags.append(flag)
-
-  # Output a GN array, the first one is the cflags, the second are the libs. The
-  # JSON formatter prints GN compatible lists when everything is a list of
-  # strings.
-  print(json.dumps([includes, cflags, libs, lib_dirs]))
-  return 0
-
-
-if __name__ == '__main__':
-  sys.exit(main())
diff --git a/pkgs/development/compilers/flutter/engine/source.nix b/pkgs/development/compilers/flutter/engine/source.nix
index 989953ce9d1f..acaa5b8be747 100644
--- a/pkgs/development/compilers/flutter/engine/source.nix
+++ b/pkgs/development/compilers/flutter/engine/source.nix
@@ -1,12 +1,10 @@
 {
   lib,
   callPackage,
-  fetchgit,
-  tools ? null,
-  curl,
+  curlMinimal,
   pkg-config,
-  git,
-  python3,
+  gitMinimal,
+  python312,
   runCommand,
   writeText,
   cacert,
@@ -17,6 +15,7 @@
   hostPlatform,
   targetPlatform,
   buildPlatform,
+  ...
 }@pkgs:
 let
   target-constants = callPackage ./constants.nix { platform = targetPlatform; };
@@ -24,20 +23,46 @@ let
   tools = pkgs.tools or (callPackage ./tools.nix { inherit hostPlatform buildPlatform; });
 
   boolOption = value: if value then "True" else "False";
+
+  gclient = writeText "flutter-engine-${version}.gclient" ''
+    solutions = [{
+      "managed": False,
+      "name": "${lib.optionalString (lib.versionAtLeast flutterVersion "3.29") "engine/"}src/flutter",
+      "url": "${url}",
+      "custom_vars": {
+        "download_fuchsia_deps": False,
+        "download_android_deps": False,
+        "download_linux_deps": ${boolOption targetPlatform.isLinux},
+        "setup_githooks": False,
+        "download_esbuild": False,
+        "download_dart_sdk": False,
+        "host_cpu": "${build-constants.alt-arch}",
+        "host_os": "${build-constants.alt-os}",
+      },
+    }]
+
+    target_os_only = True
+    target_os = [
+      "${target-constants.alt-os}"
+    ]
+
+    target_cpu_only = True
+    target_cpu = [
+      "${target-constants.alt-arch}"
+    ]
+  '';
 in
 runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPlatform.system}"
   {
     pname = "flutter-engine-source";
     inherit version;
 
-    inherit (tools) depot_tools;
-
     nativeBuildInputs = [
-      curl
+      curlMinimal
       pkg-config
-      git
+      gitMinimal
       tools.cipd
-      (python3.withPackages (
+      (python312.withPackages (
         ps: with ps; [
           httplib2
           six
@@ -45,40 +70,14 @@ runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPla
       ))
     ];
 
-    gclient = writeText "flutter-engine-${version}.gclient" ''
-      solutions = [{
-        "managed": False,
-        "name": "${lib.optionalString (lib.versionAtLeast flutterVersion "3.29") "engine/"}src/flutter",
-        "url": "${url}",
-        "custom_vars": {
-          "download_fuchsia_deps": False,
-          "download_android_deps": False,
-          "download_linux_deps": ${boolOption targetPlatform.isLinux},
-          "setup_githooks": False,
-          "download_esbuild": False,
-          "download_dart_sdk": False,
-          "host_cpu": "${build-constants.alt-arch}",
-          "host_os": "${build-constants.alt-os}",
-        },
-      }]
-
-      target_os_only = True
-      target_os = [
-        "${target-constants.alt-os}"
-      ]
-
-      target_cpu_only = True
-      target_cpu = [
-        "${target-constants.alt-arch}"
-      ]
-    '';
-
-    NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-    GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-    SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-    DEPOT_TOOLS_UPDATE = "0";
-    DEPOT_TOOLS_COLLECT_METRICS = "0";
-    PYTHONDONTWRITEBYTECODE = "1";
+    env = {
+      NIX_SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+      GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+      SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
+      DEPOT_TOOLS_UPDATE = "0";
+      DEPOT_TOOLS_COLLECT_METRICS = "0";
+      PYTHONDONTWRITEBYTECODE = "1";
+    };
 
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
@@ -96,34 +95,41 @@ runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPla
     + (
       if lib.versionAtLeast flutterVersion "3.29" then
         ''
-          mkdir -p source
-          cp $gclient source/.gclient
+          mkdir --parents source
+          cp ${gclient} source/.gclient
           cd source
         ''
       else
         ''
-          mkdir -p $out
-          cp $gclient $out/.gclient
+          mkdir --parents $out
+          cp ${gclient} $out/.gclient
           cd $out
         ''
     )
     + ''
-
-      export PATH=$PATH:$depot_tools
-      python3 $depot_tools/gclient.py sync --no-history --shallow --nohooks -j $NIX_BUILD_CORES
+      export PATH=$PATH:${tools.depot_tools}
+      python3 ${tools.depot_tools}/gclient.py sync --no-history --shallow --nohooks -j $NIX_BUILD_CORES
     ''
     + lib.optionalString (lib.versionAtLeast flutterVersion "3.29") ''
-      cp -r engine/src/flutter/third_party/* engine/src/flutter/engine/src/flutter/third_party/
-      mv engine/src/flutter/engine $out
+      cp --recursive engine/src/flutter/third_party/* engine/src/flutter/engine/src/flutter/third_party/
+      ${
+        if (lib.versionAtLeast flutterVersion "3.38") then
+          "mv engine/src/flutter $out"
+        else
+          "mv engine/src/flutter/engine $out"
+      }
     ''
     + ''
-      find $out -name '.git' -exec rm -rf {} \; || true
+      ${if (lib.versionAtLeast flutterVersion "3.38") then "pushd $out/engine" else "pushd $out"}
+      find $out -name '.git' -exec rm --recursive --force {} \; || true
 
-      rm -rf $out/src/{buildtools,fuchsia}
-      rm -rf $out/src/flutter/{buildtools,prebuilts,third_party/swiftshader,third_party/gn/.versions}
-      rm -rf $out/src/flutter/{third_party/dart/tools/sdks/dart-sdk,third_party/ninja/ninja,third_party/java}
-      rm -rf $out/src/third_party/{dart/tools/sdks/dart-sdk,libcxx/test}
+      rm --recursive --force src/{buildtools,fuchsia}
+      rm --recursive --force src/flutter/{buildtools,prebuilts,third_party/swiftshader,third_party/gn/.versions}
+      rm --recursive --force src/flutter/{third_party/dart/tools/sdks/dart-sdk,third_party/ninja/ninja,third_party/java}
+      rm --recursive --force src/third_party/{dart/tools/sdks/dart-sdk,libcxx/test}
 
-      rm -rf $out/.cipd $out/.gclient $out/.gclient_entries $out/.gclient_previous_custom_vars $out/.gclient_previous_sync_commits
+      rm --recursive --force .cipd .gclient .gclient_entries .gclient_previous_custom_vars .gclient_previous_sync_commits
+
+      popd
     ''
   )
diff --git a/pkgs/development/compilers/flutter/engine/tools.nix b/pkgs/development/compilers/flutter/engine/tools.nix
index 4baf34b201f7..d0f0c1148754 100644
--- a/pkgs/development/compilers/flutter/engine/tools.nix
+++ b/pkgs/development/compilers/flutter/engine/tools.nix
@@ -9,25 +9,28 @@
   runCommand,
   darwin,
   writeShellScriptBin,
-  depot_toolsCommit ? "7d95eb2eb054447592585c73a8ff7adad97ecba1",
-  depot_toolsHash ? "sha256-F7KDuVg11qLKkohIjuXpNdxpnSsT6Z3hE9+wFIG2sSk=",
-  cipdCommit ? "89ada246fcbf10f330011e4991d017332af2365b",
+  depot_toolsCommit ? "580b4ff3f5cd0dcaa2eacda28cefe0f45320e8f7",
+  depot_toolsHash ? "sha256-k+XQSYJQYc9vAUjwrRxaAlX/sK74W45m5byS31hSpwc=",
+  cipdCommit ? "7120a6a515089a3ff5d1f61ff4ee17750dc038af",
   cipdHashes ? {
-    "linux-386" = "7f264198598af2ef9d8878349d33c1940f1f3739e46d986962c352ec4cce2690";
-    "linux-amd64" = "2ada6b46ad1cd1350522c5c05899d273f5c894c7665e30104e7f57084a5aeeb9";
-    "linux-arm64" = "96eca7e49f6732c50122b94b793c3a5e62ed77bce1686787a8334906791b4168";
-    "linux-armv6l" = "06394601130652c5e1b055a7e4605c21fc7c6643af0b3b3cac8d2691491afa81";
-    "linux-mips64" = "f3eda6542b381b7aa8f582698498b0e197972c894590ec35f18faa467c868f5c";
-    "linux-mips64le" = "74229ada8e2afd9c8e7c58991126869b2880547780d4a197a27c1dfa96851622";
-    "linux-mipsle" = "2f3c18ec0ad48cd44a9ff39bb60e9afded83ca43fb9c7a5ea9949f6fdd4e1394";
-    "linux-ppc64" = "79425c0795fb8ba12b39a8856bf7ccb853e85def4317aa6413222f307d4c2dbd";
-    "linux-ppc64le" = "f9b3d85dde70f1b78cd7a41d2477834c15ac713a59317490a4cdac9f8f092325";
-    "linux-riscv64" = "bd695164563a66e8d3799e8835f90a398fbae9a4eec24e876c92d5f213943482";
-    "linux-s390x" = "6f501af80541e733fda23b4208a21ea05919c95d236036a2121e6b6334a2792c";
-    "macos-amd64" = "41d05580c0014912d6c32619c720646fd136e4557c9c7d7571ecc8c0462733a1";
-    "macos-arm64" = "dc672bd16d9faf277dd562f1dc00644b10c03c5d838d3cc3d3ea29925d76d931";
-    "windows-386" = "fa6ed0022a38ffc51ff8a927e3947fe7e59a64b2019dcddca9d3afacf7630444";
-    "windows-amd64" = "b5423e4b4429837f7fe4d571ce99c068aa0ccb37ddbebc1978a423fd2b0086df";
+    "linux-386" = "sha256-CshLfw49uglvWNwWE4K7ucBUF+IZlXDaIQsTXtFEJ8U=";
+    "linux-amd64" = "sha256-rxpI+HqfZiOYvzyyQ9P93s70feDmrLgbm4Xh3o88LwQ=";
+    "linux-arm64" = "sha256-XTTKbw1Q2lin+pf7VADalpBy3AWMTEd7yItsE/pePxw=";
+    "linux-armv6l" = "sha256-e5qe2KcguRLPuAq6wOG7A3YghHHon+oHY3fRLhU+e9E=";
+    "linux-loong64" = "sha256-LPTK4Ly173jac+cSGrsWw0ajrWEYepeJDGtP/7Xh528=";
+    "linux-mips" = "sha256-nR5khvHbAijs0MEr8+UgbuHTRNQAsMOyGTU/DI3K5Os=";
+    "linux-mips64" = "sha256-4a/zD1CrC/sxtBHqSRpom0SYVoN38bz3FAM40OSdVI0=";
+    "linux-mips64le" = "sha256-JnfKuBGLHYNLnRieS0KV8sYaTjh2rbp1yijvNOrU0FE=";
+    "linux-mipsle" = "sha256-nWqoay8c4faRk2+G5TvwbsbnndjTU4oglOTfhSC+TLQ=";
+    "linux-ppc64" = "sha256-pjeI/bx0i+QchQLhNB88ACPI34SrFvvFA01F5Nb16Ys=";
+    "linux-ppc64le" = "sha256-ZDMDwrP1zYlOI1hdbd3iZwKr59v/8CWj2sZ1RdosAiE=";
+    "linux-riscv64" = "sha256-O2EvOnjwbNssB7FtbK44yFcXfkrh9HOsPs/HF+uD2m8=";
+    "linux-s390x" = "sha256-BKeNDtuc9IkmV4GpuZcdsGc2F039KQeLdozxh7u+FDw=";
+    "mac-amd64" = "sha256-ZKBm8PbKjg4t0jIBPRKAv85L8eZOwJ1wBvh3cRSqHOI=";
+    "mac-arm64" = "sha256-AvjJp7JF05CetYDnwNJneAsotm1vBHWqB/vCdcIohoU=";
+    "windows-386" = "sha256-AVLbWh+WtJKynFDS6IfhuvYudw4Ow9s6w2JyDWG/2CI=";
+    "windows-amd64" = "sha256-puAQhiPGuwzkElWiBdTRGWOaUR2AIP7Qv9S3pwEY74E=";
+    "windows-arm64" = "sha256-4wxOMG+zvkM7gjhAiQvvNqNS0AamKKJdaBM/+rRxgXk=";
   },
 }:
 let
@@ -50,12 +53,12 @@ in
             src = fetchurl {
               name = "cipd-${cipdCommit}-unwrapped";
               url = "https://chrome-infra-packages.appspot.com/client?platform=${stdenv-constants.platform}&version=git_revision:${cipdCommit}";
-              sha256 = cipdHashes.${stdenv-constants.platform};
+              hash = cipdHashes.${stdenv-constants.platform};
             };
           }
           ''
-            mkdir -p $out/bin
-            install -m755 $src $out/bin/cipd
+            mkdir --parents $out/bin
+            install --mode=0755 $src $out/bin/cipd
           '';
     in
     writeShellScriptBin "cipd" ''
@@ -89,7 +92,10 @@ in
 
   vpython =
     pythonPkg:
-    runCommand "vpython3" { } "mkdir -p $out/bin && ln -s ${pythonPkg}/bin/python $out/bin/vpython3";
+    runCommand "vpython3" { } ''
+      mkdir --parents $out/bin
+      ln --symbolic ${pythonPkg}/bin/python $out/bin/vpython3
+    '';
 
   xcode-select = writeShellScriptBin "xcode-select" ''
     echo ${darwin.xcode}/Contents/Developer
diff --git a/pkgs/development/compilers/flutter/flutter-tools.nix b/pkgs/development/compilers/flutter/flutter-tools.nix
index 00db44021a8c..e99b347c69af 100644
--- a/pkgs/development/compilers/flutter/flutter-tools.nix
+++ b/pkgs/development/compilers/flutter/flutter-tools.nix
@@ -37,11 +37,13 @@ buildDartApplication.override { inherit dart; } {
 
   src = flutterSrc;
   sourceRoot = "${flutterSrc.name}/packages/flutter_tools";
-  postUnpack = ''chmod -R u+w "$NIX_BUILD_TOP/source"'';
 
   inherit patches;
   # The given patches are made for the entire SDK source tree.
-  prePatch = ''pushd "$NIX_BUILD_TOP/source"'';
+  prePatch = ''
+    chmod --recursive u+w "../.."
+    pushd "../.."
+  '';
   postPatch = ''
     popd
   ''
@@ -66,9 +68,9 @@ buildDartApplication.override { inherit dart; } {
   ];
   preConfigure = ''
     export HOME=.
-    export FLUTTER_ROOT="$NIX_BUILD_TOP/source"
-    mkdir -p "$FLUTTER_ROOT/bin/cache"
-    ln -s '${dart}' "$FLUTTER_ROOT/bin/cache/dart-sdk"
+    export FLUTTER_ROOT="$(realpath ../../)"
+    mkdir --parents "$FLUTTER_ROOT/bin/cache"
+    ln --symbolic '${dart}' "$FLUTTER_ROOT/bin/cache/dart-sdk"
   '';
 
   dartCompileFlags = [ "--define=NIX_FLUTTER_HOST_PLATFORM=${systemPlatform}" ];
diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
index 328be87053e8..3a5dc51d4fb8 100644
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -29,6 +29,7 @@
   gitMinimal,
   which,
   jq,
+  writableTmpDirAsHomeHook,
   flutterTools ? null,
 }@args:
 
@@ -90,34 +91,38 @@ let
     '';
 
     buildPhase = ''
-      # The flutter_tools package tries to run many Git commands. In most
-      # cases, unexpected output is handled gracefully, but commands are never
-      # expected to fail completely. A blank repository needs to be created.
-      rm -rf .git # Remove any existing Git directory
-      git init -b nixpkgs
+      runHook preBuild
+    ''
+    # The flutter_tools package tries to run many Git commands. In most
+    # cases, unexpected output is handled gracefully, but commands are never
+    # expected to fail completely. A blank repository needs to be created.
+    + ''
+      rm --recursive --force .git # Remove any existing Git directory
+      git init --initial-branch=nixpkgs
       GIT_AUTHOR_NAME=Nixpkgs GIT_COMMITTER_NAME=Nixpkgs \
       GIT_AUTHOR_EMAIL= GIT_COMMITTER_EMAIL= \
       GIT_AUTHOR_DATE='1/1/1970 00:00:00 +0000' GIT_COMMITTER_DATE='1/1/1970 00:00:00 +0000' \
-        git commit --allow-empty -m "Initial commit"
+        git commit --allow-empty --message="Initial commit"
       (. '${../../../build-support/fetchgit/deterministic-git}'; make_deterministic_repo .)
-
-      mkdir -p bin/cache
+    ''
+    + ''
+      mkdir --parents bin/cache
 
       # Add a flutter_tools artifact stamp, and build a snapshot.
       # This is the Flutter CLI application.
       echo "$(git rev-parse HEAD)" > bin/cache/flutter_tools.stamp
-      ln -s '${flutterTools}/share/flutter_tools.snapshot' bin/cache/flutter_tools.snapshot
+      ln --symbolic '${flutterTools}/share/flutter_tools.snapshot' bin/cache/flutter_tools.snapshot
 
       # Some of flutter_tools's dependencies contain static assets. The
       # application attempts to read its own package_config.json to find these
       # assets at runtime.
-      mkdir -p packages/flutter_tools/.dart_tool
-      ln -s '${flutterTools.pubcache}/package_config.json' packages/flutter_tools/.dart_tool/package_config.json
+      mkdir --parents packages/flutter_tools/.dart_tool
+      ln --symbolic '${flutterTools.pubcache}/package_config.json' packages/flutter_tools/.dart_tool/package_config.json
 
       echo -n "${version}" > version
       cat <<EOF > bin/cache/flutter.version.json
       {
-        "devToolsVersion": "$(cat "${dart}/bin/resources/devtools/version.json" | jq -r .version)",
+        "devToolsVersion": "$(cat "${dart}/bin/resources/devtools/version.json" | jq --raw-output .version)",
         "flutterVersion": "${version}",
         "frameworkVersion": "${version}",
         "channel": "${channel}",
@@ -131,22 +136,24 @@ let
 
       # Suppress a small error now that `.gradle`'s location changed.
       # Location changed because of the patch "gradle-flutter-tools-wrapper.patch".
-      mkdir -p "$out/packages/flutter_tools/gradle/.gradle"
+      mkdir --parents "$out/packages/flutter_tools/gradle/.gradle"
+
+      runHook postBuild
     '';
 
     installPhase = ''
       runHook preInstall
 
-      mkdir -p $out
-      cp -r . $out
-      rm -rf $out/bin/cache/dart-sdk
-      ln -sf ${dart} $out/bin/cache/dart-sdk
+      mkdir --parents $out
+      cp --recursive . $out
+      rm --recursive --force $out/bin/cache/dart-sdk
+      ln --symbolic --force ${dart} $out/bin/cache/dart-sdk
 
       # The regular launchers are designed to download/build/update SDK
       # components, and are not very useful in Nix.
       # Replace them with simple links and wrappers.
       rm "$out/bin"/{dart,flutter}
-      ln -s "$out/bin/cache/dart-sdk/bin/dart" "$out/bin/dart"
+      ln --symbolic "$out/bin/cache/dart-sdk/bin/dart" "$out/bin/dart"
       makeShellWrapper "$out/bin/dart" "$out/bin/flutter" \
         --set-default FLUTTER_ROOT "$out" \
         --set FLUTTER_ALREADY_LOCKED true \
@@ -158,15 +165,15 @@ let
     doInstallCheck = true;
     nativeInstallCheckInputs = [
       which
+      writableTmpDirAsHomeHook
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ];
     installCheckPhase = ''
       runHook preInstallCheck
 
-      export HOME="$(mktemp -d)"
       $out/bin/flutter config --android-studio-dir $HOME
       $out/bin/flutter config --android-sdk $HOME
-      $out/bin/flutter --version | fgrep -q '${builtins.substring 0 10 engineVersion}'
+      $out/bin/flutter --version | fgrep --quiet '${builtins.substring 0 10 engineVersion}'
 
       runHook postInstallCheck
     '';
diff --git a/pkgs/development/compilers/flutter/sdk-symlink.nix b/pkgs/development/compilers/flutter/sdk-symlink.nix
index c171b7dbd1da..d71bd5d09428 100644
--- a/pkgs/development/compilers/flutter/sdk-symlink.nix
+++ b/pkgs/development/compilers/flutter/sdk-symlink.nix
@@ -20,7 +20,7 @@ let
 
       # symlinkJoin seems to be missing the .git directory for some reason.
       if [ -d '${flutter.sdk}/.git' ]; then
-        ln -s '${flutter.sdk}/.git' "$out"
+        ln --symbolic '${flutter.sdk}/.git' "$out"
       fi
 
       # For iOS/macOS builds, *.xcframework/'s from the pre-built
@@ -40,8 +40,8 @@ let
         # Remove the symlinkJoin .xcframework dir and replace it with a symlink
         # to the unwrapped .xcframework dir.
         frameworkDir="$(dirname "$file")"
-        rm -r "$frameworkDir"
-        ln -s "$origFrameworkDir" "$frameworkDir"
+        rm --recursive "$frameworkDir"
+        ln --symbolic "$origFrameworkDir" "$frameworkDir"
       done
       shopt -u globstar
     '';
diff --git a/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in
index 73f3b3e1f13e..33693b2bae1b 100644
--- a/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in
+++ b/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in
@@ -1,8 +1,8 @@
-{ callPackage
-, flutterPackages
-, lib
-, symlinkJoin
-,
+{
+  callPackage,
+  flutterPackages,
+  lib,
+  symlinkJoin,
 }:
 let
   nixpkgsRoot = "@nixpkgs_root@";
@@ -25,25 +25,21 @@ let
     "aarch64-darwin"
   ];
 
-  derivations =
-    lib.foldl'
-      (
-        acc: flutterPlatform:
-          acc
-          ++ (map
-            (systemPlatform:
-              callPackage "${nixpkgsRoot}/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix" {
-                flutter = flutterPackages."v${flutterCompactVersion}";
-                inherit flutterPlatform;
-                inherit systemPlatform;
-                hash = lib.fakeSha256;
-              })
-            systemPlatforms)
-      ) [ ]
-      flutterPlatforms;
+  derivations = lib.foldl' (
+    acc: flutterPlatform:
+    acc
+    ++ (map (
+      systemPlatform:
+      callPackage "${nixpkgsRoot}/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix" {
+        flutter = flutterPackages."v${flutterCompactVersion}";
+        inherit flutterPlatform;
+        inherit systemPlatform;
+        hash = lib.fakeSha256;
+      }
+    ) systemPlatforms)
+  ) [ ] flutterPlatforms;
 in
 symlinkJoin {
   name = "evaluate-derivations";
   paths = derivations;
 }
-
diff --git a/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in
index 941a9769a9cb..44291afd59bc 100644
--- a/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in
+++ b/pkgs/development/compilers/flutter/update/get-dart-hashes.nix.in
@@ -4,24 +4,29 @@ let
   channel = "@channel@";
 in
 {
-  x86_64-linux = { fetchzip }:
+  x86_64-linux =
+    { fetchzip }:
     fetchzip {
       url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-linux-x64-release.zip";
-      sha256 = "0000000000000000000000000000000000000000000000000000";
+      hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
     };
-  aarch64-linux = { fetchzip }:
+  aarch64-linux =
+    { fetchzip }:
     fetchzip {
       url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-linux-arm64-release.zip";
-      sha256 = "0000000000000000000000000000000000000000000000000000";
+      hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
     };
-  x86_64-darwin = { fetchzip }:
+  x86_64-darwin =
+    { fetchzip }:
     fetchzip {
       url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-macos-x64-release.zip";
-      sha256 = "0000000000000000000000000000000000000000000000000000";
+      hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
     };
-  aarch64-darwin = { fetchzip }:
+  aarch64-darwin =
+    { fetchzip }:
     fetchzip {
       url = "https://storage.googleapis.com/dart-archive/channels/${channel}/release/${dartVersion}/sdk/dartsdk-macos-arm64-release.zip";
-      sha256 = "0000000000000000000000000000000000000000000000000000";
+      hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
     };
-}.${platform}
+}
+.${platform}
diff --git a/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in
index 25b200811a00..2e33ae5cd2d1 100644
--- a/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in
+++ b/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in
@@ -1,4 +1,8 @@
-{ callPackage, symlinkJoin, stdenv, lib }:
+{
+  callPackage,
+  symlinkJoin,
+  lib,
+}:
 let
   nixpkgsRoot = "@nixpkgs_root@";
   version = "@flutter_version@";
@@ -9,25 +13,22 @@ let
     "aarch64-linux"
   ];
 
-  derivations =
-    lib.foldl'
-      (
-        acc: buildPlatform:
-          acc
-          ++ (map
-            (targetPlatform:
-              callPackage "${nixpkgsRoot}/pkgs/development/compilers/flutter/engine/source.nix" {
-                targetPlatform = lib.systems.elaborate targetPlatform;
-                hostPlatform = lib.systems.elaborate buildPlatform;
-                buildPlatform = lib.systems.elaborate buildPlatform;
-                flutterVersion = version;
-                version = engineVersion;
-                url = "https://github.com/flutter/flutter.git@${engineVersion}";
-                hashes."${buildPlatform}"."${targetPlatform}" = lib.fakeSha256;
-              })
-            systemPlatforms)
-      ) [ ]
-      systemPlatforms;
+  derivations = lib.foldl' (
+    acc: buildPlatform:
+    acc
+    ++ (map (
+      targetPlatform:
+      callPackage "${nixpkgsRoot}/pkgs/development/compilers/flutter/engine/source.nix" {
+        targetPlatform = lib.systems.elaborate targetPlatform;
+        hostPlatform = lib.systems.elaborate buildPlatform;
+        buildPlatform = lib.systems.elaborate buildPlatform;
+        flutterVersion = version;
+        version = engineVersion;
+        url = "https://github.com/flutter/flutter.git@${engineVersion}";
+        hashes."${buildPlatform}"."${targetPlatform}" = lib.fakeSha256;
+      }
+    ) systemPlatforms)
+  ) [ ] systemPlatforms;
 in
 symlinkJoin {
   name = "evaluate-derivations";
diff --git a/pkgs/development/compilers/flutter/update/get-flutter.nix.in b/pkgs/development/compilers/flutter/update/get-flutter.nix.in
index 81680797229b..02d802e026f0 100644
--- a/pkgs/development/compilers/flutter/update/get-flutter.nix.in
+++ b/pkgs/development/compilers/flutter/update/get-flutter.nix.in
@@ -2,6 +2,6 @@
 fetchFromGitHub {
   owner = "flutter";
   repo = "flutter";
-  rev = "@flutter_version@";
+  tag = "@flutter_version@";
   hash = "@hash@";
 }
diff --git a/pkgs/development/compilers/flutter/update/get-pubspec-lock.nix.in b/pkgs/development/compilers/flutter/update/get-pubspec-lock.nix.in
index ff72046bcecb..0060b81c98c6 100644
--- a/pkgs/development/compilers/flutter/update/get-pubspec-lock.nix.in
+++ b/pkgs/development/compilers/flutter/update/get-pubspec-lock.nix.in
@@ -1,7 +1,7 @@
-{ flutterPackages
-, stdenv
-, cacert
-,
+{
+  flutterPackages,
+  stdenv,
+  cacert,
 }:
 let
   flutterCompactVersion = "@flutter_compact_version@";
diff --git a/pkgs/development/compilers/flutter/versions/3_38/data.json b/pkgs/development/compilers/flutter/versions/3_38/data.json
new file mode 100644
index 000000000000..6726942c0678
--- /dev/null
+++ b/pkgs/development/compilers/flutter/versions/3_38/data.json
@@ -0,0 +1,1090 @@
+{
+  "version": "3.38.0-0.2.pre",
+  "engineVersion": "d7ec7e8064d93a8d8bdd418103ec48cfafbc4841",
+  "engineSwiftShaderHash": "sha256-ATVcuxqPHqHOWYyO7DoX9LdgUiO3INUi7m9Mc6ccc1M=",
+  "engineSwiftShaderRev": "d040a5bab638bf7c226235c95787ba6288bb6416",
+  "channel": "beta",
+  "engineHashes": {
+    "aarch64-linux": {
+      "aarch64-linux": "sha256-rcZdEXo2L388X02qSR/EnvRb/rTSsJjw4E4y0wFzUmk=",
+      "x86_64-linux": "sha256-rcZdEXo2L388X02qSR/EnvRb/rTSsJjw4E4y0wFzUmk="
+    },
+    "x86_64-linux": {
+      "aarch64-linux": "sha256-lfhAF16MxDVeHjqfFE5FsRCTuxdiM9j254gd3/7Ylrc=",
+      "x86_64-linux": "sha256-lfhAF16MxDVeHjqfFE5FsRCTuxdiM9j254gd3/7Ylrc="
+    }
+  },
+  "dartVersion": "3.10.0-290.1.beta",
+  "dartHash": {
+    "x86_64-linux": "sha256-ygZTZBUC/ynV8jCIUTYpXU5GoSdo+o+FcNt4RkAvD3I=",
+    "aarch64-linux": "sha256-l3f1mo2zeB9C9fwAoTrRQEXhe8PCEhbmwT4w14H/ZJ4=",
+    "x86_64-darwin": "sha256-cLwwRwNvXGkJh0T5rr5jgzbRJXPed2uQzKPhiU0/kXs=",
+    "aarch64-darwin": "sha256-Iy+cmlBSCTQAMdT3e7Zt1f5p4CGtq/xewMl+gxzcjtM="
+  },
+  "flutterHash": "sha256-axcR0M1jQjll+D0fQobgHcX98ysGzYN+s3OgdUddmLc=",
+  "artifactHashes": {
+    "android": {
+      "aarch64-darwin": "sha256-IvM7Yxq0bJpkRZTfVvkYltn4kgltNE/7sP7no8Qwv7M=",
+      "aarch64-linux": "sha256-oTn2X/8UysTArqFc6i5kzdV3s3noJXcd5kigMued34Q=",
+      "x86_64-darwin": "sha256-IvM7Yxq0bJpkRZTfVvkYltn4kgltNE/7sP7no8Qwv7M=",
+      "x86_64-linux": "sha256-oTn2X/8UysTArqFc6i5kzdV3s3noJXcd5kigMued34Q="
+    },
+    "fuchsia": {
+      "aarch64-darwin": "sha256-C+45buxCUl5kRfl9nFDwDj65HkM4r/Z8tz9F1aqlsHY=",
+      "aarch64-linux": "sha256-C+45buxCUl5kRfl9nFDwDj65HkM4r/Z8tz9F1aqlsHY=",
+      "x86_64-darwin": "sha256-C+45buxCUl5kRfl9nFDwDj65HkM4r/Z8tz9F1aqlsHY=",
+      "x86_64-linux": "sha256-C+45buxCUl5kRfl9nFDwDj65HkM4r/Z8tz9F1aqlsHY="
+    },
+    "ios": {
+      "aarch64-darwin": "sha256-fwQ3PSD5fNqqCEMSZ+e9DuGuZ/vZ82Tc+vjBX20aqaQ=",
+      "aarch64-linux": "sha256-fwQ3PSD5fNqqCEMSZ+e9DuGuZ/vZ82Tc+vjBX20aqaQ=",
+      "x86_64-darwin": "sha256-fwQ3PSD5fNqqCEMSZ+e9DuGuZ/vZ82Tc+vjBX20aqaQ=",
+      "x86_64-linux": "sha256-fwQ3PSD5fNqqCEMSZ+e9DuGuZ/vZ82Tc+vjBX20aqaQ="
+    },
+    "linux": {
+      "aarch64-darwin": "sha256-9SNHFyTBUicTibXWN7kvFNsI1bZspz7BznwaNd8irwU=",
+      "aarch64-linux": "sha256-9SNHFyTBUicTibXWN7kvFNsI1bZspz7BznwaNd8irwU=",
+      "x86_64-darwin": "sha256-cU0tc23FCjz0TsfalcFLFSS3MqeBtIN/H8EMIxcaLos=",
+      "x86_64-linux": "sha256-cU0tc23FCjz0TsfalcFLFSS3MqeBtIN/H8EMIxcaLos="
+    },
+    "macos": {
+      "aarch64-darwin": "sha256-g1ETjdKMk8kR8mM45dkt2sV9tjq+jLZ18tHk1PbCJLA=",
+      "aarch64-linux": "sha256-g1ETjdKMk8kR8mM45dkt2sV9tjq+jLZ18tHk1PbCJLA=",
+      "x86_64-darwin": "sha256-g1ETjdKMk8kR8mM45dkt2sV9tjq+jLZ18tHk1PbCJLA=",
+      "x86_64-linux": "sha256-g1ETjdKMk8kR8mM45dkt2sV9tjq+jLZ18tHk1PbCJLA="
+    },
+    "universal": {
+      "aarch64-darwin": "sha256-V3ImxYK12PYaB7zX5FnvCJoiIG6DhzQkflJT/hYi4iw=",
+      "aarch64-linux": "sha256-iNHp9UGYI6Q8kWbfw6UhgEu80nBBYLboJMou1uzUPtI=",
+      "x86_64-darwin": "sha256-YMeoAm3HmYnrAcSaAtjoJHRSUDHhMtxdDS5iiGw5YaU=",
+      "x86_64-linux": "sha256-4otDADLa0HoFsyasQSaoNu018mwSjXDQOiUQUEgxE1g="
+    },
+    "web": {
+      "aarch64-darwin": "sha256-jcJNYQGyvYd7fITCUk4PNvuFJsfEbKzkFqcubifILA4=",
+      "aarch64-linux": "sha256-jcJNYQGyvYd7fITCUk4PNvuFJsfEbKzkFqcubifILA4=",
+      "x86_64-darwin": "sha256-jcJNYQGyvYd7fITCUk4PNvuFJsfEbKzkFqcubifILA4=",
+      "x86_64-linux": "sha256-jcJNYQGyvYd7fITCUk4PNvuFJsfEbKzkFqcubifILA4="
+    },
+    "windows": {
+      "x86_64-darwin": "sha256-tetSC5y9Zb5tNPR2mm9ukP0cZRmYVdAzVipF7mMAn1U=",
+      "x86_64-linux": "sha256-tetSC5y9Zb5tNPR2mm9ukP0cZRmYVdAzVipF7mMAn1U="
+    }
+  },
+  "pubspecLock": {
+    "packages": {
+      "_fe_analyzer_shared": {
+        "dependency": "direct main",
+        "description": {
+          "name": "_fe_analyzer_shared",
+          "sha256": "dd3d2ad434b9510001d089e8de7556d50c834481b9abc2891a0184a8493a19dc",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "89.0.0"
+      },
+      "analyzer": {
+        "dependency": "direct main",
+        "description": {
+          "name": "analyzer",
+          "sha256": "c22b6e7726d1f9e5db58c7251606076a71ca0dbcf76116675edfadbec0c9e875",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "8.2.0"
+      },
+      "archive": {
+        "dependency": "direct main",
+        "description": {
+          "name": "archive",
+          "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.6.1"
+      },
+      "args": {
+        "dependency": "direct main",
+        "description": {
+          "name": "args",
+          "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.7.0"
+      },
+      "async": {
+        "dependency": "direct main",
+        "description": {
+          "name": "async",
+          "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.13.0"
+      },
+      "boolean_selector": {
+        "dependency": "direct main",
+        "description": {
+          "name": "boolean_selector",
+          "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.1.2"
+      },
+      "browser_launcher": {
+        "dependency": "direct main",
+        "description": {
+          "name": "browser_launcher",
+          "sha256": "ca2557663d3033845f2ef2b60f94fc249528324fd1affddccb7c63ac0ccd6c67",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.1.3"
+      },
+      "built_collection": {
+        "dependency": "direct main",
+        "description": {
+          "name": "built_collection",
+          "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "5.1.1"
+      },
+      "built_value": {
+        "dependency": "direct main",
+        "description": {
+          "name": "built_value",
+          "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "8.12.0"
+      },
+      "checked_yaml": {
+        "dependency": "direct dev",
+        "description": {
+          "name": "checked_yaml",
+          "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.0.4"
+      },
+      "cli_config": {
+        "dependency": "direct main",
+        "description": {
+          "name": "cli_config",
+          "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.2.0"
+      },
+      "clock": {
+        "dependency": "direct main",
+        "description": {
+          "name": "clock",
+          "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.1.2"
+      },
+      "code_assets": {
+        "dependency": "direct main",
+        "description": {
+          "name": "code_assets",
+          "sha256": "5865a34983367f6884e8311f67d9ae459945b99bad20c0e66484a1aae7feaae0",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.19.7"
+      },
+      "code_builder": {
+        "dependency": "direct main",
+        "description": {
+          "name": "code_builder",
+          "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "4.11.0"
+      },
+      "collection": {
+        "dependency": "direct main",
+        "description": {
+          "name": "collection",
+          "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.19.1"
+      },
+      "completion": {
+        "dependency": "direct main",
+        "description": {
+          "name": "completion",
+          "sha256": "82fa09800c0b71a2e8396bf3ca6b36b43cd35fe7ba2aeab53b6349ac671d0f5b",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.0.2"
+      },
+      "convert": {
+        "dependency": "direct main",
+        "description": {
+          "name": "convert",
+          "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.1.2"
+      },
+      "coverage": {
+        "dependency": "direct main",
+        "description": {
+          "name": "coverage",
+          "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.15.0"
+      },
+      "crypto": {
+        "dependency": "direct main",
+        "description": {
+          "name": "crypto",
+          "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.0.6"
+      },
+      "csslib": {
+        "dependency": "direct main",
+        "description": {
+          "name": "csslib",
+          "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.0.2"
+      },
+      "dap": {
+        "dependency": "direct main",
+        "description": {
+          "name": "dap",
+          "sha256": "42b0b083a09c59a118741769e218fc3738980ab591114f09d1026241d2b9c290",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.4.0"
+      },
+      "dart_service_protocol_shared": {
+        "dependency": "transitive",
+        "description": {
+          "name": "dart_service_protocol_shared",
+          "sha256": "1737875c176d7e3d87bb3a359182828b542fe20a0b34198b8d31a81af5c7a76d",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.0.3"
+      },
+      "dart_style": {
+        "dependency": "direct main",
+        "description": {
+          "name": "dart_style",
+          "sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.1.2"
+      },
+      "data_assets": {
+        "dependency": "direct main",
+        "description": {
+          "name": "data_assets",
+          "sha256": "ecd2682157e882f17d5653110b835f4885f36379eaef7f21b500af2485a0d6dd",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.19.3"
+      },
+      "dds": {
+        "dependency": "direct main",
+        "description": {
+          "name": "dds",
+          "sha256": "b80c44468f5549867f65c43b0c6ecf0872261e86beb75087ed6c1d7f82e9db22",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "5.0.3"
+      },
+      "dds_service_extensions": {
+        "dependency": "direct main",
+        "description": {
+          "name": "dds_service_extensions",
+          "sha256": "afe0fce921953ac0c5bb276bccd7e36fa5035d7769567d122523fdd09beb4d03",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.1.0"
+      },
+      "devtools_shared": {
+        "dependency": "direct main",
+        "description": {
+          "name": "devtools_shared",
+          "sha256": "275e48a8a145fa09c7ae433a96fd433c01cc079d39b40acf5ba883236ae2c887",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "12.0.0"
+      },
+      "dtd": {
+        "dependency": "direct main",
+        "description": {
+          "name": "dtd",
+          "sha256": "09ddb228b3d1478a093556357692a4c203ff4f9d5f8cda05dfdca0ff3fb7c5d3",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "4.0.0"
+      },
+      "dwds": {
+        "dependency": "direct main",
+        "description": {
+          "name": "dwds",
+          "sha256": "40b2ca48063d593a0a31144beba282b6688e64e3b0e9f5dbe17250fef078f352",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "25.1.0+2"
+      },
+      "extension_discovery": {
+        "dependency": "direct main",
+        "description": {
+          "name": "extension_discovery",
+          "sha256": "de1fce715ab013cdfb00befc3bdf0914bea5e409c3a567b7f8f144bc061611a7",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.1.0"
+      },
+      "fake_async": {
+        "dependency": "direct main",
+        "description": {
+          "name": "fake_async",
+          "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.3.3"
+      },
+      "ffi": {
+        "dependency": "direct main",
+        "description": {
+          "name": "ffi",
+          "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.1.4"
+      },
+      "file": {
+        "dependency": "direct main",
+        "description": {
+          "name": "file",
+          "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "7.0.1"
+      },
+      "file_testing": {
+        "dependency": "direct dev",
+        "description": {
+          "name": "file_testing",
+          "sha256": "eb0c85fd118ddc0d41c295c09f64e0924c256b071087cdc9828d5372c80d554d",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.0.2"
+      },
+      "fixnum": {
+        "dependency": "direct main",
+        "description": {
+          "name": "fixnum",
+          "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.1.1"
+      },
+      "flutter_template_images": {
+        "dependency": "direct main",
+        "description": {
+          "name": "flutter_template_images",
+          "sha256": "0120589a786dbae4e86af1f61748baccd8530abd56a60e7a13479647a75222fe",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "5.0.0"
+      },
+      "frontend_server_client": {
+        "dependency": "direct main",
+        "description": {
+          "name": "frontend_server_client",
+          "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "4.0.0"
+      },
+      "glob": {
+        "dependency": "direct main",
+        "description": {
+          "name": "glob",
+          "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.1.3"
+      },
+      "graphs": {
+        "dependency": "direct main",
+        "description": {
+          "name": "graphs",
+          "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.3.2"
+      },
+      "hooks": {
+        "dependency": "direct main",
+        "description": {
+          "name": "hooks",
+          "sha256": "22abd27b650a571e53576abe732e4d9053aacaaa6dee23e9ff106c63e3e5b96c",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.20.1"
+      },
+      "hooks_runner": {
+        "dependency": "direct main",
+        "description": {
+          "name": "hooks_runner",
+          "sha256": "da70762516f169bedf97978fe142853c4599ff26f48b77167ba0e8158629ec14",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.23.0"
+      },
+      "html": {
+        "dependency": "direct main",
+        "description": {
+          "name": "html",
+          "sha256": "6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.15.6"
+      },
+      "http": {
+        "dependency": "direct main",
+        "description": {
+          "name": "http",
+          "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.5.0"
+      },
+      "http_multi_server": {
+        "dependency": "direct main",
+        "description": {
+          "name": "http_multi_server",
+          "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.2.2"
+      },
+      "http_parser": {
+        "dependency": "direct main",
+        "description": {
+          "name": "http_parser",
+          "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "4.1.2"
+      },
+      "intl": {
+        "dependency": "direct main",
+        "description": {
+          "name": "intl",
+          "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.20.2"
+      },
+      "io": {
+        "dependency": "direct main",
+        "description": {
+          "name": "io",
+          "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.0.5"
+      },
+      "js": {
+        "dependency": "direct dev",
+        "description": {
+          "name": "js",
+          "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.7.2"
+      },
+      "json_annotation": {
+        "dependency": "direct dev",
+        "description": {
+          "name": "json_annotation",
+          "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "4.9.0"
+      },
+      "json_rpc_2": {
+        "dependency": "direct main",
+        "description": {
+          "name": "json_rpc_2",
+          "sha256": "246b321532f0e8e2ba474b4d757eaa558ae4fdd0688fdbc1e1ca9705f9b8ca0e",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.0.3"
+      },
+      "logging": {
+        "dependency": "direct main",
+        "description": {
+          "name": "logging",
+          "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.3.0"
+      },
+      "matcher": {
+        "dependency": "direct main",
+        "description": {
+          "name": "matcher",
+          "sha256": "dc58c723c3c24bf8d3e2d3ad3f2f9d7bd9cf43ec6feaa64181775e60190153f2",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.12.17"
+      },
+      "meta": {
+        "dependency": "direct main",
+        "description": {
+          "name": "meta",
+          "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.17.0"
+      },
+      "mime": {
+        "dependency": "direct main",
+        "description": {
+          "name": "mime",
+          "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.0.0"
+      },
+      "multicast_dns": {
+        "dependency": "direct main",
+        "description": {
+          "name": "multicast_dns",
+          "sha256": "de72ada5c3db6fdd6ad4ae99452fe05fb403c4bb37c67ceb255ddd37d2b5b1eb",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.3.3"
+      },
+      "mustache_template": {
+        "dependency": "direct main",
+        "description": {
+          "name": "mustache_template",
+          "sha256": "d9aa84d114368b7f1727b7014b85bb0b234daeafe1518824c82d32703b3964f6",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.0.1"
+      },
+      "native_stack_traces": {
+        "dependency": "direct main",
+        "description": {
+          "name": "native_stack_traces",
+          "sha256": "d34cf916db87b14d39465b3e3b4b4a8ee1f304bde6ed7605571e34802e3d6a11",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.6.1"
+      },
+      "node_preamble": {
+        "dependency": "direct dev",
+        "description": {
+          "name": "node_preamble",
+          "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.0.2"
+      },
+      "package_config": {
+        "dependency": "direct main",
+        "description": {
+          "name": "package_config",
+          "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.2.0"
+      },
+      "path": {
+        "dependency": "direct main",
+        "description": {
+          "name": "path",
+          "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.9.1"
+      },
+      "petitparser": {
+        "dependency": "direct main",
+        "description": {
+          "name": "petitparser",
+          "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "6.1.0"
+      },
+      "platform": {
+        "dependency": "direct main",
+        "description": {
+          "name": "platform",
+          "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.1.6"
+      },
+      "pool": {
+        "dependency": "direct main",
+        "description": {
+          "name": "pool",
+          "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.5.2"
+      },
+      "process": {
+        "dependency": "direct main",
+        "description": {
+          "name": "process",
+          "sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "5.0.5"
+      },
+      "pub_semver": {
+        "dependency": "direct main",
+        "description": {
+          "name": "pub_semver",
+          "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.2.0"
+      },
+      "pubspec_parse": {
+        "dependency": "direct main",
+        "description": {
+          "name": "pubspec_parse",
+          "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.5.0"
+      },
+      "shelf": {
+        "dependency": "direct main",
+        "description": {
+          "name": "shelf",
+          "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.4.2"
+      },
+      "shelf_packages_handler": {
+        "dependency": "direct main",
+        "description": {
+          "name": "shelf_packages_handler",
+          "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.0.2"
+      },
+      "shelf_proxy": {
+        "dependency": "direct main",
+        "description": {
+          "name": "shelf_proxy",
+          "sha256": "a71d2307f4393211930c590c3d2c00630f6c5a7a77edc1ef6436dfd85a6a7ee3",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.0.4"
+      },
+      "shelf_static": {
+        "dependency": "direct main",
+        "description": {
+          "name": "shelf_static",
+          "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.1.3"
+      },
+      "shelf_web_socket": {
+        "dependency": "direct main",
+        "description": {
+          "name": "shelf_web_socket",
+          "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.0.1"
+      },
+      "source_map_stack_trace": {
+        "dependency": "direct main",
+        "description": {
+          "name": "source_map_stack_trace",
+          "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.1.2"
+      },
+      "source_maps": {
+        "dependency": "direct main",
+        "description": {
+          "name": "source_maps",
+          "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.10.13"
+      },
+      "source_span": {
+        "dependency": "direct main",
+        "description": {
+          "name": "source_span",
+          "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.10.1"
+      },
+      "sprintf": {
+        "dependency": "direct main",
+        "description": {
+          "name": "sprintf",
+          "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "7.0.0"
+      },
+      "sse": {
+        "dependency": "direct main",
+        "description": {
+          "name": "sse",
+          "sha256": "fcc97470240bb37377f298e2bd816f09fd7216c07928641c0560719f50603643",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "4.1.8"
+      },
+      "stack_trace": {
+        "dependency": "direct main",
+        "description": {
+          "name": "stack_trace",
+          "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.12.1"
+      },
+      "standard_message_codec": {
+        "dependency": "direct main",
+        "description": {
+          "name": "standard_message_codec",
+          "sha256": "fc7dd712d191b7e33196a0ecf354c4573492bb95995e7166cb6f73b047f9cae0",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.0.1+4"
+      },
+      "stream_channel": {
+        "dependency": "direct main",
+        "description": {
+          "name": "stream_channel",
+          "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.1.4"
+      },
+      "string_scanner": {
+        "dependency": "direct main",
+        "description": {
+          "name": "string_scanner",
+          "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.4.1"
+      },
+      "sync_http": {
+        "dependency": "direct main",
+        "description": {
+          "name": "sync_http",
+          "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.3.1"
+      },
+      "term_glyph": {
+        "dependency": "direct main",
+        "description": {
+          "name": "term_glyph",
+          "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.2.2"
+      },
+      "test": {
+        "dependency": "direct dev",
+        "description": {
+          "name": "test",
+          "sha256": "75906bf273541b676716d1ca7627a17e4c4070a3a16272b7a3dc7da3b9f3f6b7",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.26.3"
+      },
+      "test_api": {
+        "dependency": "direct main",
+        "description": {
+          "name": "test_api",
+          "sha256": "ab2726c1a94d3176a45960b6234466ec367179b87dd74f1611adb1f3b5fb9d55",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.7.7"
+      },
+      "test_core": {
+        "dependency": "direct main",
+        "description": {
+          "name": "test_core",
+          "sha256": "0cc24b5ff94b38d2ae73e1eb43cc302b77964fbf67abad1e296025b78deb53d0",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.6.12"
+      },
+      "typed_data": {
+        "dependency": "direct main",
+        "description": {
+          "name": "typed_data",
+          "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.4.0"
+      },
+      "unified_analytics": {
+        "dependency": "direct main",
+        "description": {
+          "name": "unified_analytics",
+          "sha256": "8d1429a4b27320a9c4fc854287d18c8fde1549bf622165c5837202a9f370b53d",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "8.0.5"
+      },
+      "usage": {
+        "dependency": "direct main",
+        "description": {
+          "name": "usage",
+          "sha256": "0bdbde65a6e710343d02a56552eeaefd20b735e04bfb6b3ee025b6b22e8d0e15",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "4.1.1"
+      },
+      "uuid": {
+        "dependency": "direct main",
+        "description": {
+          "name": "uuid",
+          "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "4.5.1"
+      },
+      "vm_service": {
+        "dependency": "direct main",
+        "description": {
+          "name": "vm_service",
+          "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "15.0.2"
+      },
+      "vm_service_interface": {
+        "dependency": "direct main",
+        "description": {
+          "name": "vm_service_interface",
+          "sha256": "503c92c26cf9f77d688bf8fca27fa9ec40450adbf02ec1ec5f12828ded508ac0",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.0.1"
+      },
+      "vm_snapshot_analysis": {
+        "dependency": "direct main",
+        "description": {
+          "name": "vm_snapshot_analysis",
+          "sha256": "5a79b9fbb6be2555090f55b03b23907e75d44c3fd7bdd88da09848aa5a1914c8",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "0.7.6"
+      },
+      "watcher": {
+        "dependency": "direct main",
+        "description": {
+          "name": "watcher",
+          "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.1.4"
+      },
+      "web": {
+        "dependency": "direct main",
+        "description": {
+          "name": "web",
+          "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.1.1"
+      },
+      "web_socket": {
+        "dependency": "direct main",
+        "description": {
+          "name": "web_socket",
+          "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.0.1"
+      },
+      "web_socket_channel": {
+        "dependency": "direct main",
+        "description": {
+          "name": "web_socket_channel",
+          "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.0.3"
+      },
+      "webdriver": {
+        "dependency": "direct main",
+        "description": {
+          "name": "webdriver",
+          "sha256": "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.1.0"
+      },
+      "webkit_inspection_protocol": {
+        "dependency": "direct main",
+        "description": {
+          "name": "webkit_inspection_protocol",
+          "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "1.2.1"
+      },
+      "xml": {
+        "dependency": "direct main",
+        "description": {
+          "name": "xml",
+          "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "6.5.0"
+      },
+      "yaml": {
+        "dependency": "direct main",
+        "description": {
+          "name": "yaml",
+          "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "3.1.3"
+      },
+      "yaml_edit": {
+        "dependency": "direct main",
+        "description": {
+          "name": "yaml_edit",
+          "sha256": "fb38626579fb345ad00e674e2af3a5c9b0cc4b9bfb8fd7f7ff322c7c9e62aef5",
+          "url": "https://pub.dev"
+        },
+        "source": "hosted",
+        "version": "2.2.2"
+      }
+    },
+    "sdks": {
+      "dart": ">=3.9.0 <4.0.0"
+    }
+  }
+}
diff --git a/pkgs/development/compilers/flutter/versions/3_38/patches/deregister-pub-dependencies-artifact.patch b/pkgs/development/compilers/flutter/versions/3_38/patches/deregister-pub-dependencies-artifact.patch
new file mode 100644
index 000000000000..c99d771299fe
--- /dev/null
+++ b/pkgs/development/compilers/flutter/versions/3_38/patches/deregister-pub-dependencies-artifact.patch
@@ -0,0 +1,21 @@
+diff --git a/packages/flutter_tools/lib/src/flutter_cache.dart b/packages/flutter_tools/lib/src/flutter_cache.dart
+index df67547..eacc7c4 100644
+--- a/packages/flutter_tools/lib/src/flutter_cache.dart
++++ b/packages/flutter_tools/lib/src/flutter_cache.dart
+@@ -51,16 +51,6 @@ class FlutterCache extends Cache {
+       registerArtifact(IosUsbArtifacts(artifactName, this, platform: platform));
+     }
+     registerArtifact(FontSubsetArtifacts(this, platform: platform));
+-    registerArtifact(
+-      PubDependencies(
+-        logger: logger,
+-        // flutter root and pub must be lazily initialized to avoid accessing
+-        // before the version is determined.
+-        flutterRoot: () => Cache.flutterRoot!,
+-        pub: () => pub,
+-        projectFactory: projectFactory,
+-      ),
+-    );
+   }
+ }
+ 
diff --git a/pkgs/development/compilers/flutter/versions/3_38/patches/disable-auto-update.patch b/pkgs/development/compilers/flutter/versions/3_38/patches/disable-auto-update.patch
new file mode 100644
index 000000000000..58be974b10db
--- /dev/null
+++ b/pkgs/development/compilers/flutter/versions/3_38/patches/disable-auto-update.patch
@@ -0,0 +1,29 @@
+diff --git a/packages/flutter_tools/lib/src/runner/flutter_command.dart b/packages/flutter_tools/lib/src/runner/flutter_command.dart
+index e4e474ab6e..5548599802 100644
+--- a/packages/flutter_tools/lib/src/runner/flutter_command.dart
++++ b/packages/flutter_tools/lib/src/runner/flutter_command.dart
+@@ -1693,7 +1693,7 @@ Run 'flutter -h' (or 'flutter <command> -h') for available flutter commands and
+ 
+     // Populate the cache. We call this before pub get below so that the
+     // sky_engine package is available in the flutter cache for pub to find.
+-    if (shouldUpdateCache) {
++    if (false) {
+       // First always update universal artifacts, as some of these (e.g.
+       // ios-deploy on macOS) are required to determine `requiredArtifacts`.
+       final bool offline;
+diff --git a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+index a1104da..1749d65 100644
+--- a/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
++++ b/packages/flutter_tools/lib/src/runner/flutter_command_runner.dart
+@@ -437,11 +437,6 @@
+         // Required to support `flutter --version` before artifacts are cached.
+         await globals.cache.updateAll(<DevelopmentArtifact>{DevelopmentArtifact.informative});
+ 
+-        globals.flutterVersion.ensureVersionFile();
+-        if (await _shouldCheckForUpdates(topLevelResults)) {
+-          await globals.flutterVersion.checkFlutterVersionFreshness();
+-        }
+-
+         // See if the user specified a specific device.
+         final specifiedDeviceId = topLevelResults[FlutterGlobalOptions.kDeviceIdOption] as String?;
+         if (specifiedDeviceId != null) {
diff --git a/pkgs/development/compilers/flutter/versions/3_38/patches/fix-ios-build-xcode-backend-sh.patch b/pkgs/development/compilers/flutter/versions/3_38/patches/fix-ios-build-xcode-backend-sh.patch
new file mode 100644
index 000000000000..9e43b62cbb4d
--- /dev/null
+++ b/pkgs/development/compilers/flutter/versions/3_38/patches/fix-ios-build-xcode-backend-sh.patch
@@ -0,0 +1,68 @@
+From 6df275df3b8694daf16302b407520e3b1dee6724 Mon Sep 17 00:00:00 2001
+From: Philip Hayes <philiphayes9@gmail.com>
+Date: Thu, 12 Sep 2024 13:23:00 -0700
+Subject: [PATCH] fix: cleanup xcode_backend.sh to fix iOS build w/
+ `NixOS/nixpkgs` flutter
+
+This patch cleans up `xcode_backend.sh`. It now effectively just runs
+`exec $FLUTTER_ROOT/bin/dart ./xcode_backend.dart`.
+
+The previous `xcode_backend.sh` tries to discover `$FLUTTER_ROOT` from
+argv[0], even though its presence is already guaranteed (the wrapped
+`xcode_backend.dart` also relies on this env).
+
+When using nixpkgs flutter, the flutter SDK directory is composed of several
+layers, joined together using symlinks (called a `symlinkJoin`). Without this
+patch, the auto-discover traverses the symlinks into the wrong layer, and so it
+uses an "unwrapped" `dart` command instead of a "wrapped" dart that sets some
+important envs/flags (like `$FLUTTER_ROOT`).
+
+Using the "unwrapped" dart then manifests in this error when compiling, since
+it doesn't see the ios build-support artifacts:
+
+```
+$ flutter run -d iphone
+Running Xcode build...
+Xcode build done.                                            6.4s
+Failed to build iOS app
+Error (Xcode): Target debug_unpack_ios failed: Error: Flutter failed to create a directory at "/<nix-store>/XXXX-flutter-3.24.1-unwrapped/bin/cache/artifacts".
+```
+---
+ packages/flutter_tools/bin/xcode_backend.sh | 25 ++++-----------------
+ 1 file changed, 4 insertions(+), 21 deletions(-)
+
+diff --git a/packages/flutter_tools/bin/xcode_backend.sh b/packages/flutter_tools/bin/xcode_backend.sh
+index 2889d7c8e4..48b9d06c6e 100755
+--- a/packages/flutter_tools/bin/xcode_backend.sh
++++ b/packages/flutter_tools/bin/xcode_backend.sh
+@@ -13,24 +13,7 @@
+ # exit on error, or usage of unset var
+ set -euo pipefail
+
+-# Needed because if it is set, cd may print the path it changed to.
+-unset CDPATH
+-
+-function follow_links() (
+-  cd -P "$(dirname -- "$1")"
+-  file="$PWD/$(basename -- "$1")"
+-  while [[ -h "$file" ]]; do
+-    cd -P "$(dirname -- "$file")"
+-    file="$(readlink -- "$file")"
+-    cd -P "$(dirname -- "$file")"
+-    file="$PWD/$(basename -- "$file")"
+-  done
+-  echo "$file"
+-)
+-
+-PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")"
+-BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
+-FLUTTER_ROOT="$BIN_DIR/../../.."
+-DART="$FLUTTER_ROOT/bin/dart"
+-
+-"$DART" "$BIN_DIR/xcode_backend.dart" "$@" "ios"
++# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT.
++dart="${FLUTTER_ROOT}/bin/dart"
++xcode_backend_dart="${BASH_SOURCE[0]%.sh}.dart"
++exec "${dart}" "${xcode_backend_dart}" "$@" "ios"
+-- 
+2.46.0
diff --git a/pkgs/development/compilers/flutter/versions/3_38/patches/fix-macos-build-macos-assemble-sh.patch b/pkgs/development/compilers/flutter/versions/3_38/patches/fix-macos-build-macos-assemble-sh.patch
new file mode 100644
index 000000000000..312ec3a5c1ba
--- /dev/null
+++ b/pkgs/development/compilers/flutter/versions/3_38/patches/fix-macos-build-macos-assemble-sh.patch
@@ -0,0 +1,59 @@
+Fix for macOS build issue in Flutter >= 3.35
+
+Since version 3.35, the behavior of macos_assemble.sh and xcode_backend.sh
+is almost identical. This caused the same error for macOS that previously
+occurred for iOS.
+
+Derived from the iOS patch: ./fix-ios-build-xcode-backend-sh.patch
+
+Example error:
+```
+$ flutter run -d macos
+Launching lib/main.dart on macOS in debug mode...
+Target debug_unpack_macos failed: Error: Flutter failed to create a directory at "/<nix-store>/XXXX-flutter-3.35.1-unwrapped/bin/cache/artifacts".
+Please ensure that the SDK and/or project is installed in a location that has read/write permissions for the current user.
+Failed to copy Flutter framework.
+** BUILD FAILED **
+```
+
+---
+
+diff --git a/packages/flutter_tools/bin/macos_assemble.sh b/packages/flutter_tools/bin/macos_assemble.sh
+index 28acf8842..d0f2923df 100644
+--- a/packages/flutter_tools/bin/macos_assemble.sh
++++ b/packages/flutter_tools/bin/macos_assemble.sh
+@@ -13,29 +13,13 @@
+ # exit on error, or usage of unset var
+ set -euo pipefail
+ 
+-# Needed because if it is set, cd may print the path it changed to.
+-unset CDPATH
+-
+-function follow_links() (
+-  cd -P "$(dirname -- "$1")"
+-  file="$PWD/$(basename -- "$1")"
+-  while [[ -h "$file" ]]; do
+-    cd -P "$(dirname -- "$file")"
+-    file="$(readlink -- "$file")"
+-    cd -P "$(dirname -- "$file")"
+-    file="$PWD/$(basename -- "$file")"
+-  done
+-  echo "$file"
+-)
+-
+-PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")"
+-BIN_DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
+-FLUTTER_ROOT="$BIN_DIR/../../.."
+-DART="$FLUTTER_ROOT/bin/dart"
++# Run `dart ./xcode_backend.dart` with the dart from $FLUTTER_ROOT.
++dart="${FLUTTER_ROOT}/bin/dart"
++xcode_backend_dart="$(dirname "${BASH_SOURCE[0]}")/xcode_backend.dart"
+ 
+ # Main entry point.
+ if [[ $# == 0 ]]; then
+-  "$DART" "$BIN_DIR/xcode_backend.dart" "build" "macos"
++  exec "${dart}" "${xcode_backend_dart}" "build" "macos"
+ else
+-  "$DART" "$BIN_DIR/xcode_backend.dart" "$@" "macos"
++  exec "${dart}" "${xcode_backend_dart}" "$@" "macos"
+ fi
diff --git a/pkgs/development/compilers/flutter/versions/3_38/patches/gradle-flutter-tools-wrapper.patch b/pkgs/development/compilers/flutter/versions/3_38/patches/gradle-flutter-tools-wrapper.patch
new file mode 100644
index 000000000000..4c5b258be373
--- /dev/null
+++ b/pkgs/development/compilers/flutter/versions/3_38/patches/gradle-flutter-tools-wrapper.patch
@@ -0,0 +1,220 @@
+This patch introduces an intermediate Gradle build step to alter the behavior
+of flutter_tools' Gradle project, specifically moving the creation of `build`
+and `.gradle` directories from within the Nix Store to somewhere in `$HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev`.
+
+Without this patch, flutter_tools' Gradle project tries to generate `build` and `.gradle`
+directories within the Nix Store. Resulting in read-only errors when trying to build a
+Flutter Android app at runtime.
+
+This patch takes advantage of the fact settings.gradle takes priority over settings.gradle.kts to build the intermediate Gradle project
+when a Flutter app runs `includeBuild("${settings.ext.flutterSdkPath}/packages/flutter_tools/gradle")`
+
+`rootProject.buildFileName = "/dev/null"` so that the intermediate project doesn't use `build.gradle.kts` that's in the same directory.
+
+The intermediate project makes a `settings.gradle` file in `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/` and `includeBuild`s it.
+This Gradle project will build the actual `packages/flutter_tools/gradle` project by setting
+`rootProject.projectDir = new File("$settingsDir")` and `apply from: new File("$settingsDir/settings.gradle.kts")`.
+
+To move `build` to `$HOME/.cache/flutter/nix-flutter-tools-gradle/<short engine rev>/`, we need to set `buildDirectory`.
+To move `.gradle` as well, the `--project-cache-dir` argument must be passed to the Gradle wrapper.
+Changing the `GradleUtils.getExecutable` function signature is a delibarate choice, to ensure that no new unpatched usages slip in.
+--- /dev/null
++++ b/packages/flutter_tools/gradle/settings.gradle
+@@ -0,0 +1,19 @@
++rootProject.buildFileName = "/dev/null"
++
++def engineShortRev = (new File("$settingsDir/../../../bin/internal/engine.version")).text.take(10)
++def dir = new File("$System.env.HOME/.cache/flutter/nix-flutter-tools-gradle/$engineShortRev")
++dir.mkdirs()
++def file = new File(dir, "settings.gradle")
++
++file.text = """
++rootProject.projectDir = new File("$settingsDir")
++apply from: new File("$settingsDir/settings.gradle.kts")
++
++gradle.allprojects { project ->
++  project.beforeEvaluate {
++    project.layout.buildDirectory = new File("$dir/build")
++  }
++}
++"""
++
++includeBuild(dir)
+--- a/packages/flutter_tools/gradle/build.gradle.kts
++++ b/packages/flutter_tools/gradle/build.gradle.kts
+@@ -4,6 +4,11 @@
+ 
+ import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+ 
++// While flutter_tools runs Gradle with a --project-cache-dir, this startParameter
++// is not passed correctly to the Kotlin Gradle plugin for some reason, and so
++// must be set here as well.
++gradle.startParameter.projectCacheDir = layout.buildDirectory.dir("cache").get().asFile
++
+ plugins {
+     `java-gradle-plugin`
+     groovy
+--- a/packages/flutter_tools/lib/src/android/gradle.dart
++++ b/packages/flutter_tools/lib/src/android/gradle.dart
+@@ -474,9 +474,9 @@ class AndroidGradleBuilder implements AndroidBuilder {
+     // from the local.properties file.
+     updateLocalProperties(project: project, buildInfo: androidBuildInfo.buildInfo);
+ 
+-    final options = <String>[];
+-
+-    final String gradleExecutablePath = _gradleUtils.getExecutable(project);
++    final [String gradleExecutablePath, ...List<String> options] = _gradleUtils.getExecutable(
++      project,
++    );
+ 
+     // All automatically created files should exist.
+     if (configOnly) {
+@@ -797,7 +797,7 @@ class AndroidGradleBuilder implements AndroidBuilder {
+       'aar_init_script.gradle',
+     );
+     final command = <String>[
+-      _gradleUtils.getExecutable(project),
++      ..._gradleUtils.getExecutable(project),
+       '-I=$initScript',
+       '-Pflutter-root=$flutterRoot',
+       '-Poutput-dir=${outputDirectory.path}',
+@@ -912,6 +912,10 @@ class AndroidGradleBuilder implements AndroidBuilder {
+     final results = <String>[];
+ 
+     try {
++      final [String gradleExecutablePath, ...List<String> options] = _gradleUtils.getExecutable(
++        project,
++      );
++
+       exitCode = await _runGradleTask(
+         _kBuildVariantTaskName,
+         preRunTask: () {
+@@ -927,10 +931,10 @@ class AndroidGradleBuilder implements AndroidBuilder {
+             ),
+           );
+         },
+-        options: const <String>['-q'],
++        options: <String>[...options, '-q'],
+         project: project,
+         localGradleErrors: gradleErrors,
+-        gradleExecutablePath: _gradleUtils.getExecutable(project),
++        gradleExecutablePath: gradleExecutablePath,
+         outputParser: (String line) {
+           if (_kBuildVariantRegex.firstMatch(line) case final RegExpMatch match) {
+             results.add(match.namedGroup(_kBuildVariantRegexGroupName)!);
+@@ -964,6 +968,10 @@ class AndroidGradleBuilder implements AndroidBuilder {
+     late Stopwatch sw;
+     var exitCode = 1;
+     try {
++      final [String gradleExecutablePath, ...List<String> options] = _gradleUtils.getExecutable(
++        project,
++      );
++
+       exitCode = await _runGradleTask(
+         taskName,
+         preRunTask: () {
+@@ -979,10 +987,10 @@ class AndroidGradleBuilder implements AndroidBuilder {
+             ),
+           );
+         },
+-        options: <String>['-q', '-PoutputPath=$outputPath'],
++        options: <String>[...options, '-q', '-PoutputPath=$outputPath'],
+         project: project,
+         localGradleErrors: gradleErrors,
+-        gradleExecutablePath: _gradleUtils.getExecutable(project),
++        gradleExecutablePath: gradleExecutablePath,
+       );
+     } on Error catch (error) {
+       _logger.printError(error.toString());
+--- a/packages/flutter_tools/lib/src/android/gradle_errors.dart
++++ b/packages/flutter_tools/lib/src/android/gradle_errors.dart
+@@ -228,7 +228,12 @@ final flavorUndefinedHandler = GradleHandledError(
+   },
+   handler: ({required String line, required FlutterProject project, required bool usesAndroidX}) async {
+     final RunResult tasksRunResult = await globals.processUtils.run(
+-      <String>[globals.gradleUtils!.getExecutable(project), 'app:tasks', '--all', '--console=auto'],
++      <String>[
++        ...globals.gradleUtils!.getExecutable(project),
++        'app:tasks',
++        '--all',
++        '--console=auto',
++      ],
+       throwOnError: true,
+       workingDirectory: project.android.hostAppGradleRoot.path,
+       environment: globals.java?.environment,
+--- a/packages/flutter_tools/lib/src/android/gradle_utils.dart
++++ b/packages/flutter_tools/lib/src/android/gradle_utils.dart
+@@ -3,6 +3,7 @@
+ // found in the LICENSE file.
+ 
+ import 'package:meta/meta.dart';
++import 'package:path/path.dart';
+ import 'package:process/process.dart';
+ import 'package:unified_analytics/unified_analytics.dart';
+ 
+@@ -197,9 +198,29 @@ class GradleUtils {
+   final Logger _logger;
+   final OperatingSystemUtils _operatingSystemUtils;
+ 
++  List<String> get _requiredArguments {
++    final String cacheDir = join(
++      switch (globals.platform.environment['XDG_CACHE_HOME']) {
++        final String cacheHome => cacheHome,
++        _ => join(
++          globals.fsUtils.homeDirPath ?? throwToolExit('No cache directory has been specified.'),
++          '.cache',
++        ),
++      },
++      'flutter',
++      'nix-flutter-tools-gradle',
++      globals.flutterVersion.engineRevision.substring(0, 10),
++    );
++
++    return <String>[
++      '--project-cache-dir=${join(cacheDir, 'cache')}',
++      '-Pkotlin.project.persistent.dir=${join(cacheDir, 'kotlin')}',
++    ];
++  }
++
+   /// Gets the Gradle executable path and prepares the Gradle project.
+   /// This is the `gradlew` or `gradlew.bat` script in the `android/` directory.
+-  String getExecutable(FlutterProject project) {
++  List<String> getExecutable(FlutterProject project) {
+     final Directory androidDir = project.android.hostAppGradleRoot;
+     injectGradleWrapperIfNeeded(androidDir);
+ 
+@@ -210,7 +231,7 @@ class GradleUtils {
+       // If the Gradle executable doesn't have execute permission,
+       // then attempt to set it.
+       _operatingSystemUtils.makeExecutable(gradle);
+-      return gradle.absolute.path;
++      return <String>[gradle.absolute.path, ..._requiredArguments];
+     }
+     throwToolExit(
+       'Unable to locate gradlew script. Please check that ${gradle.path} '
+--- a/packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart
++++ b/packages/flutter_tools/test/general.shard/android/android_gradle_builder_test.dart
+@@ -2606,8 +2606,8 @@ Gradle Crashed
+ 
+ class FakeGradleUtils extends Fake implements GradleUtils {
+   @override
+-  String getExecutable(FlutterProject project) {
+-    return 'gradlew';
++  List<String> getExecutable(FlutterProject project) {
++    return const <String>['gradlew'];
+   }
+ }
+ 
+--- a/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart
++++ b/packages/flutter_tools/test/general.shard/android/gradle_errors_test.dart
+@@ -1633,8 +1633,8 @@ Platform fakePlatform(String name) {
+ 
+ class FakeGradleUtils extends Fake implements GradleUtils {
+   @override
+-  String getExecutable(FlutterProject project) {
+-    return 'gradlew';
++  List<String> getExecutable(FlutterProject project) {
++    return const <String>['gradlew'];
+   }
+ }
+ 
diff --git a/pkgs/development/compilers/flutter/wrapper.nix b/pkgs/development/compilers/flutter/wrapper.nix
index 703e280dc14b..5a79e9f7b118 100644
--- a/pkgs/development/compilers/flutter/wrapper.nix
+++ b/pkgs/development/compilers/flutter/wrapper.nix
@@ -24,7 +24,7 @@
   makeWrapper,
   writeShellScript,
   wrapGAppsHook3,
-  git,
+  gitMinimal,
   which,
   pkg-config,
   atk,
@@ -64,8 +64,8 @@ let
     name = "flutter-cache-dir";
     paths = builtins.attrValues flutterPlatformArtifacts;
     postBuild = ''
-      mkdir -p "$out/bin/cache"
-      ln -s '${flutter}/bin/cache/dart-sdk' "$out/bin/cache"
+      mkdir --parents "$out/bin/cache"
+      ln --symbolic '${flutter}/bin/cache/dart-sdk' "$out/bin/cache"
     '';
     passthru.flutterPlatform = flutterPlatformArtifacts;
   };
@@ -79,7 +79,7 @@ let
 
   # Tools that the Flutter tool depends on.
   tools = [
-    git
+    gitMinimal
     which
   ];
 
@@ -184,7 +184,7 @@ in
         addToSearchPath FLUTTER_PKG_CONFIG_PATH "$path"
       done
 
-      mkdir -p $out/bin
+      mkdir --parents $out/bin
       makeWrapper '${immutableFlutter}' $out/bin/flutter \
         --set-default ANDROID_EMULATOR_USE_SYSTEM_LIBS 1 \
     ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 0130772f5741..bd5137096958 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4485,6 +4485,7 @@ with pkgs;
   );
   flutterPackages = flutterPackages-bin;
   flutter = flutterPackages.stable;
+  flutter338 = flutterPackages.v3_38;
   flutter335 = flutterPackages.v3_35;
   flutter332 = flutterPackages.v3_32;
   flutter329 = flutterPackages.v3_29;

From 143040786bf299f7e04c2d276835d29f9f119309 Mon Sep 17 00:00:00 2001
From: Benedikt Hiemer <ben.email@posteo.de>
Date: Sun, 2 Nov 2025 13:57:45 +0100
Subject: [PATCH 4957/6226] nixos/journald-gateway: change default of user and
 system option to false

Until now, both options are set to true as default. But the systemd-journal-gatewayd
service defaults them to false. To match the origin behaviour, the defaults have been
changed.
---
 nixos/doc/manual/release-notes/rl-2511.section.md      | 2 ++
 nixos/modules/system/boot/systemd/journald-gateway.nix | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/nixos/doc/manual/release-notes/rl-2511.section.md b/nixos/doc/manual/release-notes/rl-2511.section.md
index 2e73fe06aa0e..852c4811c0fd 100644
--- a/nixos/doc/manual/release-notes/rl-2511.section.md
+++ b/nixos/doc/manual/release-notes/rl-2511.section.md
@@ -257,6 +257,8 @@
 
 - The `services.meilisearch` module now always defaults to the latest version of meilisearch, as the previous `meilisearch_1_11` package was removed. This is only an issue if you were using the old version.
 
+- `services.journald.gateway.user` and `services.journald.gateway.system` now defaults to `false`. This new behaviour matches the default behaviour of the [`systemd-journal-gatewayd`](https://www.freedesktop.org/software/systemd/man/latest/systemd-journal-gatewayd.service.html) service itself.
+
 - The `services.postgresql` module now sets up a systemd unit `postgresql.target`. Depending on `postgresql.target` guarantees that postgres is in read-write mode and initial/ensure scripts were executed. Depending on `postgresql.service` only guarantees a read-only connection.
 
 - The `services.mysql` module now restarts the database `on-abnormal`, which means that it now will be restarted in certain situations, it wasn't before. For example an OOM-kill.
diff --git a/nixos/modules/system/boot/systemd/journald-gateway.nix b/nixos/modules/system/boot/systemd/journald-gateway.nix
index 952177f85805..b8c0a1a25d6d 100644
--- a/nixos/modules/system/boot/systemd/journald-gateway.nix
+++ b/nixos/modules/system/boot/systemd/journald-gateway.nix
@@ -75,7 +75,7 @@ in
     };
 
     system = lib.mkOption {
-      default = true;
+      default = false;
       type = lib.types.bool;
       description = ''
         Serve entries from system services and the kernel.
@@ -85,7 +85,7 @@ in
     };
 
     user = lib.mkOption {
-      default = true;
+      default = false;
       type = lib.types.bool;
       description = ''
         Serve entries from services for the current user.

From 1e165a64478291adef80f22113df3e6e8958a1c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Markus=20Partheym=C3=BCller?=
 <markus.partheymueller@cyberus-technology.de>
Date: Mon, 3 Nov 2025 08:43:47 +0100
Subject: [PATCH 4958/6226] virtualboxKvm: 20250903 -> 20251103

---
 pkgs/applications/virtualization/virtualbox/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix
index e14bb5b95d0b..3694ae88d1e5 100644
--- a/pkgs/applications/virtualization/virtualbox/default.nix
+++ b/pkgs/applications/virtualization/virtualbox/default.nix
@@ -76,9 +76,9 @@ let
   virtualboxSubVersion = "";
   virtualboxSha256 = "d281ec981b5f580211a0cedd1b75a1adcb0fbfcbb768d8c2bf4429f4763e8bbd";
 
-  kvmPatchVboxVersion = "7.2.0";
-  kvmPatchVersion = "20250903";
-  kvmPatchHash = "sha256-JTE9Kr+nJ6HLeDrzL2EVyDQhxzn3UsoQVIQ6zNCwioY=";
+  kvmPatchVboxVersion = "7.2.4";
+  kvmPatchVersion = "20251103";
+  kvmPatchHash = "sha256-VhSuRYiZLg8hIGatf27u/nBBBtB1zz4ePxtiRYy84Hw=";
 
   # The KVM build is not compatible to VirtualBox's kernel modules. So don't export
   # modsrc at all.
@@ -425,7 +425,5 @@ stdenv.mkDerivation (finalAttrs: {
     ];
     platforms = [ "x86_64-linux" ];
     mainProgram = "VirtualBox";
-    # Patch is not compatible with the current version of Virtualbox
-    broken = enableKvm;
   };
 })

From 65063ce78b66098131dd5218189d95d990f38562 Mon Sep 17 00:00:00 2001
From: Sav Tripodi <42227195+savtrip@users.noreply.github.com>
Date: Wed, 22 Oct 2025 18:26:05 +1030
Subject: [PATCH 4959/6226] maintainers/README.md: change name to handle

As per the CONTRIBUTING.md docs the standard is to use the handle not
the name, per refer to:
https://github.com/NixOS/nixpkgs/blob/master/CONTRIBUTING.md#commit-conventions

Updated to ensure the documentation aligns.
---
 maintainers/README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/README.md b/maintainers/README.md
index 1bcaaea1a5c3..3264e57d9f2b 100644
--- a/maintainers/README.md
+++ b/maintainers/README.md
@@ -32,7 +32,7 @@ Commit access to the Nixpkgs repository is not required for that.
 In order to do so, add yourself to the [`maintainer-list.nix`](./maintainer-list.nix), and then to the desired package's `meta.maintainers` list, and send a PR with the changes.
 
 If you're adding yourself as a maintainer as part of another PR (in which you become a maintainer of a package, for example), make your change to
-`maintainer-list.nix` in a separate commit titled `maintainers: add <name>`.
+`maintainer-list.nix` in a separate commit titled `maintainers: add <handle>`.
 
 ### Losing maintainer status
 

From 3f58f05fbcc7d45b600aac623f26c8c6caa28de8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 07:51:39 +0000
Subject: [PATCH 4960/6226] lsh: 1.4.7 -> 1.5.0

---
 pkgs/by-name/ls/lsh/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ls/lsh/package.nix b/pkgs/by-name/ls/lsh/package.nix
index caaadf616045..93d435ecd272 100644
--- a/pkgs/by-name/ls/lsh/package.nix
+++ b/pkgs/by-name/ls/lsh/package.nix
@@ -5,14 +5,14 @@
 }:
 buildGoModule rec {
   pname = "lsh";
-  version = "1.4.7";
+  version = "1.5.0";
   src = fetchFromGitHub {
     owner = "latitudesh";
     repo = "lsh";
     rev = "v${version}";
-    sha256 = "sha256-vPxxMQuui5kCoJ2+6UsyoUjzWbUioUXGN3ixhYdJyPY=";
+    sha256 = "sha256-VsOahtc2KFTBjkbE1Raq1ho/fMifALBHVhoJyY85MJ8=";
   };
-  vendorHash = "sha256-ePq891qK4rmGSXQHDcvr4K8tEfoP+LBC8UfO/EP5DZk=";
+  vendorHash = "sha256-kOGHLrnpVQe8gy827CeP+1f2fy4WpUfWDfaNq/JmXpU=";
   subPackages = [ "." ];
   meta = {
     changelog = "https://github.com/latitudesh/lsh/releases/tag/v${version}";

From c207686ff862d79caa8ad62926ab60837bc6df04 Mon Sep 17 00:00:00 2001
From: wrvsrx <wrvsrx@outlook.com>
Date: Mon, 3 Nov 2025 13:15:34 +0800
Subject: [PATCH 4961/6226] wemeet: 3.19.2.400 -> 3.26.10.400

---
 pkgs/by-name/we/wemeet/package.nix | 26 +++++++++++++++++++++-----
 1 file changed, 21 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/we/wemeet/package.nix b/pkgs/by-name/we/wemeet/package.nix
index 6fbf70d6335d..e7122a299b35 100644
--- a/pkgs/by-name/we/wemeet/package.nix
+++ b/pkgs/by-name/we/wemeet/package.nix
@@ -133,16 +133,16 @@ let
 in
 stdenv.mkDerivation {
   pname = "wemeet";
-  version = "3.19.2.400";
+  version = "3.26.10.400";
 
   src = selectSystem {
     x86_64-linux = fetchurl {
-      url = "https://updatecdn.meeting.qq.com/cos/fb7464ffb18b94a06868265bed984007/TencentMeeting_0300000000_3.19.2.400_x86_64_default.publish.officialwebsite.deb";
-      hash = "sha256-PSGc4urZnoBxtk1cwwz/oeXMwnI02Mv1pN2e9eEf5kE=";
+      url = "https://updatecdn.meeting.qq.com/cos/9cfd93b10ee81b2fc3ad26357f27ed13/TencentMeeting_0300000000_3.26.10.400_x86_64_default.publish.officialwebsite.deb";
+      hash = "sha256-7gN40mkAD/0/k0E+bBNfiMcY+YtIaLWycFoI+hhrjgc=";
     };
     aarch64-linux = fetchurl {
-      url = "https://updatecdn.meeting.qq.com/cos/867a8a2e99a215dcd4f60fe049dbe6cf/TencentMeeting_0300000000_3.19.2.400_arm64_default.publish.officialwebsite.deb";
-      hash = "sha256-avN+PHKKC58lMC5wd0yVLD0Ct7sbb4BtXjovish0ULU=";
+      url = "https://updatecdn.meeting.qq.com/cos/e5f447f30343e27c49438db8d035ae23/TencentMeeting_0300000000_3.26.10.400_arm64_default.publish.officialwebsite.deb";
+      hash = "sha256-ShxcDwwBThwe2YKNy/5+HmYcnnodPhrMaOwkw3gTq0E=";
     };
   };
 
@@ -206,6 +206,21 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
+  postInstall = selectSystem {
+    x86_64-linux = ''
+      # According to @mnixry:
+      #   The thing is, it's a coroutine library that involves a series of low-level operations like stack and register restoration and saving, so there's quite a bit of code that looks like hand-written assembly.
+      #   Then they apparently changed the usage of co_jump_to_link, but the registers used in the assembly weren't updated accordingly.
+      #   And then under certain versions of libc/libcpp implementations, that original register happens to have a value, so the tests also pass.
+
+      # cmp rdi, 0 -> cmp r12, 0, at co_jump_to_link to address coroutine context resume issue
+      echo -ne '\x49\x83\xfc\x00' | dd of=$out/app/wemeet/lib/libwemeet_base.so bs=1 seek=$((0x94c833)) conv=notrunc
+    '';
+    aarch64-linux = ''
+      # I don't know if aarch64-linux version needs similar patch, I don't have aarch64 device.
+    '';
+  };
+
   # set LP_NUM_THREADS limit the number of cores used by rendering
   # set XDG_SESSION_TYPE; unset WAYLAND_DISPLAY getting border shadows to work
   # set QT_STYLE_OVERRIDE solve the color of the font is not visible when using the included Qt
@@ -227,6 +242,7 @@ stdenv.mkDerivation {
       ];
       xwaylandWrapperArgs = baseWrapperArgs ++ [
         "--set XDG_SESSION_TYPE x11"
+        "--set QT_QPA_PLATFORM xcb"
         "--unset WAYLAND_DISPLAY"
         "--prefix LD_PRELOAD : ${libwemeetwrap}/lib/libwemeetwrap.so:${wemeet-wayland-screenshare}/lib/wemeet/libhook.so"
       ];

From f07da9d078333744e40219642bce946bb517ce86 Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Sun, 2 Nov 2025 23:29:50 -0800
Subject: [PATCH 4962/6226] release-cuda: add freecad, krita,
 python3Packages.opencv4Full

---
 pkgs/top-level/release-cuda.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix
index a008444caa58..37b2dd807036 100644
--- a/pkgs/top-level/release-cuda.nix
+++ b/pkgs/top-level/release-cuda.nix
@@ -92,12 +92,14 @@ let
       firefox-beta-unwrapped = linux;
       firefox-devedition = linux;
       firefox-devedition-unwrapped = linux;
+      freecad = linux;
       gimp = linux;
       gimp3 = linux;
       gpu-screen-recorder = linux;
       gst_all_1.gst-plugins-bad = linux;
       jellyfin-ffmpeg = linux;
       kdePackages.kdenlive = linux;
+      krita = linux;
       lightgbm = linux;
       llama-cpp = linux;
       meshlab = linux;
@@ -146,6 +148,7 @@ let
         triton = linux;
         openai-whisper = linux;
         opencv4 = linux;
+        opencv4Full = linux;
         opensfm = linux;
         pycuda = linux;
         pymc = linux;

From f4e76cdf46f54d493bfe58944114e38c43fdd657 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 08:29:19 +0000
Subject: [PATCH 4963/6226] tinygltf: 2.9.6 -> 2.9.7

---
 pkgs/by-name/ti/tinygltf/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ti/tinygltf/package.nix b/pkgs/by-name/ti/tinygltf/package.nix
index c9bf9ad7ec82..6ea3a0ba875e 100644
--- a/pkgs/by-name/ti/tinygltf/package.nix
+++ b/pkgs/by-name/ti/tinygltf/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tinygltf";
-  version = "2.9.6";
+  version = "2.9.7";
 
   src = fetchFromGitHub {
     owner = "syoyo";
     repo = "tinygltf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3dBxfdXeTbzeQAXaBXFaflLgXYeuOfESdq6V3+0iCXY=";
+    hash = "sha256-tG9hrR2rsfgS8zCBNdcplig2vyiIcNspSVKop03Zx9A=";
   };
 
   nativeBuildInputs = [

From 283ef353d9c9f8c260bfe66bb6f8ee707e332a1d Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 3 Nov 2025 08:29:30 +0000
Subject: [PATCH 4964/6226] jellyfin-web: 10.11.1 -> 10.11.2

---
 pkgs/by-name/je/jellyfin-web/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/je/jellyfin-web/package.nix b/pkgs/by-name/je/jellyfin-web/package.nix
index 1fd996138e24..180f8504ab23 100644
--- a/pkgs/by-name/je/jellyfin-web/package.nix
+++ b/pkgs/by-name/je/jellyfin-web/package.nix
@@ -13,7 +13,7 @@
 }:
 buildNpmPackage rec {
   pname = "jellyfin-web";
-  version = "10.11.1";
+  version = "10.11.2";
 
   src =
     assert version == jellyfin.version;
@@ -21,7 +21,7 @@ buildNpmPackage rec {
       owner = "jellyfin";
       repo = "jellyfin-web";
       rev = "v${version}";
-      hash = "sha256-1T2+9o/K8w7Roflb/LWOYabuol14fHK4fnMxkrf2L88=";
+      hash = "sha256-xgZ2fh2dMpcvXXUWcZSvcARm4Qy8qgi8T5nFyk+sOgs=";
     };
 
   nodejs = nodejs_20; # does not build with 22
@@ -31,7 +31,7 @@ buildNpmPackage rec {
       --replace-fail "git describe --always --dirty" "echo ${src.rev}" \
   '';
 
-  npmDepsHash = "sha256-5vNlT9RhY/I+nHVjMfJAsBqPT8ndOJe4KO0Ysl2t1tY=";
+  npmDepsHash = "sha256-Uikude8cNBA79KNPf6D0McwR/AoaaWJVMw2Q08AiK3U=";
 
   preBuild = ''
     # using sass-embedded fails at executing node_modules/sass-embedded-linux-x64/dart-sass/src/dart

From a563ddee940a08599b5401e5415479fcd5a1ce7f Mon Sep 17 00:00:00 2001
From: nyanloutre <paul@nyanlout.re>
Date: Mon, 3 Nov 2025 08:29:38 +0000
Subject: [PATCH 4965/6226] jellyfin: 10.11.1 -> 10.11.2

---
 pkgs/by-name/je/jellyfin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix
index b1bf8c3edadb..b5e51ed0eef0 100644
--- a/pkgs/by-name/je/jellyfin/package.nix
+++ b/pkgs/by-name/je/jellyfin/package.nix
@@ -13,13 +13,13 @@
 
 buildDotnetModule rec {
   pname = "jellyfin";
-  version = "10.11.1"; # ensure that jellyfin-web has matching version
+  version = "10.11.2"; # ensure that jellyfin-web has matching version
 
   src = fetchFromGitHub {
     owner = "jellyfin";
     repo = "jellyfin";
     rev = "v${version}";
-    hash = "sha256-8D8cwAqu+cfTR1SwwHTtPnMG2iaLTWSYoAig6g2jsTA=";
+    hash = "sha256-cq45OP7xNfQ09ZfrKxnmHo68Y7SkfSVArH6PlhewPaM=";
   };
 
   propagatedBuildInputs = [ sqlite ];

From 120d749506b49d91e3f307d5099bb60c5d585982 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 08:32:30 +0000
Subject: [PATCH 4966/6226] python3Packages.owslib: 0.34.1 -> 0.35.0

---
 pkgs/development/python-modules/owslib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/owslib/default.nix b/pkgs/development/python-modules/owslib/default.nix
index 6e8fd74abaab..a59de97573a7 100644
--- a/pkgs/development/python-modules/owslib/default.nix
+++ b/pkgs/development/python-modules/owslib/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "owslib";
-  version = "0.34.1";
+  version = "0.35.0";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "geopython";
     repo = "OWSLib";
     tag = version;
-    hash = "sha256-eLSODYal9rcualQrM03/hwLBngty+9fIlPIJh1EZduA=";
+    hash = "sha256-/5FJai6ad4ZQAK/IhiIuGv4yiBcT/iXFYcbZ+jeCoyI=";
   };
 
   postPatch = ''

From 4b960e289716623f1c202c0934d90a4f35ecaa39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 08:42:00 +0000
Subject: [PATCH 4967/6226] clouddrive2: 0.9.11 -> 0.9.13

---
 pkgs/by-name/cl/clouddrive2/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix
index 549f05163c0a..1f039361ddbb 100644
--- a/pkgs/by-name/cl/clouddrive2/package.nix
+++ b/pkgs/by-name/cl/clouddrive2/package.nix
@@ -11,16 +11,16 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "clouddrive2";
-  version = "0.9.11";
+  version = "0.9.13";
 
   src = fetchurl {
     url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz";
     hash =
       {
-        x86_64-linux = "sha256-mj/GuC7au36ku+obmSBU6w8mj0lNHBYVHYQoljwIsY4=";
-        aarch64-linux = "sha256-stYjbqYb4aKEdxvcRS1r96B43V5ZBWsOlXnMueqqRz4=";
-        x86_64-darwin = "sha256-nWLhMgBaR4LdUiN6hoL/ZIYAAaQaPsyV44lAg0Femis=";
-        aarch64-darwin = "sha256-Ihe5XoAlDLWTjSD99mhZVz3PkLfgUKkxP6As3isX32U=";
+        x86_64-linux = "sha256-jSmPbx7t4hJiUgPeKz6iugEMJ5RZ27+sJQFHx5YtEGs=";
+        aarch64-linux = "sha256-UWdVDTj1a+knGNMpXRZvxFlaX6y76Tx631Z0xMnRTjQ=";
+        x86_64-darwin = "sha256-iNUwjiTRwq4VszBw7qdhtinsxf8zMkTnEb66V/MSB48=";
+        aarch64-darwin = "sha256-HvNoiHlCzYW+A3QilpqukcCsBVLn18QfXyVPopgJe/0=";
       }
       .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");
   };

From f6773834f325c83443bda42094fe888a12b9983b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 08:44:53 +0000
Subject: [PATCH 4968/6226] xpra: 6.3.4 -> 6.3.5

---
 pkgs/by-name/xp/xpra/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xp/xpra/package.nix b/pkgs/by-name/xp/xpra/package.nix
index e8fa28a857d8..f093f2fe3021 100644
--- a/pkgs/by-name/xp/xpra/package.nix
+++ b/pkgs/by-name/xp/xpra/package.nix
@@ -89,7 +89,7 @@ let
 in
 buildPythonApplication rec {
   pname = "xpra";
-  version = "6.3.4";
+  version = "6.3.5";
   format = "setuptools";
 
   stdenv = if withNvenc then cudaPackages.backendStdenv else args.stdenv;
@@ -98,7 +98,7 @@ buildPythonApplication rec {
     owner = "Xpra-org";
     repo = "xpra";
     tag = "v${version}";
-    hash = "sha256-Wx8s1e0nhFyNrwHYD2aVutudjNSc8ukTLPqaiYHp8n8=";
+    hash = "sha256-f4neqEqln7F3tUR1ZF5lyl5HkcPAJWFCdx2qOKLHd74=";
   };
 
   patches = [

From 5efbfb6b02107937765cc264c6494e9a22499d85 Mon Sep 17 00:00:00 2001
From: isabel <isabel@isabelroses.com>
Date: Mon, 3 Nov 2025 08:46:22 +0000
Subject: [PATCH 4969/6226] cocoon: init at 0.5.0

---
 pkgs/by-name/co/cocoon/package.nix | 36 ++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)
 create mode 100644 pkgs/by-name/co/cocoon/package.nix

diff --git a/pkgs/by-name/co/cocoon/package.nix b/pkgs/by-name/co/cocoon/package.nix
new file mode 100644
index 000000000000..35948e1380cb
--- /dev/null
+++ b/pkgs/by-name/co/cocoon/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+buildGoModule (finalAttrs: {
+  pname = "cocoon";
+  version = "0.5.0";
+
+  src = fetchFromGitHub {
+    owner = "haileyok";
+    repo = "cocoon";
+    tag = finalAttrs.version;
+    hash = "sha256-9gJj+edTGkQsHH72F2f7A6EWDet+k38+8UZ1KN2UGT0=";
+  };
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X main.Version=${finalAttrs.version}"
+  ];
+
+  vendorHash = "sha256-5WnME+AVrXfvHX2yPbFoL6QgZoCMAJmBj47OM7miOfc=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "ATProtocol Personal Data Server written in Go with a SQLite block and blob store";
+    changelog = "https://github.com/haileyok/cocoon/releases/${finalAttrs.version}";
+    homepage = "https://github.com/haileyok/cocoon";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ isabelroses ];
+    mainProgram = "cocoon";
+  };
+})

From dcf6b5c8afbd5a928f069a26ceeee2021dbe7f4c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 08:56:43 +0000
Subject: [PATCH 4970/6226] moor: 2.6.1 -> 2.8.1

---
 pkgs/by-name/mo/moor/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mo/moor/package.nix b/pkgs/by-name/mo/moor/package.nix
index 15300c423454..b366352cd223 100644
--- a/pkgs/by-name/mo/moor/package.nix
+++ b/pkgs/by-name/mo/moor/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "moor";
-  version = "2.6.1";
+  version = "2.8.1";
 
   src = fetchFromGitHub {
     owner = "walles";
     repo = "moor";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5MiTxspdNTFfLnif5C3gcQ0suxRrjerlZl2+kPAjiBM=";
+    hash = "sha256-VipHPRxSre6U3VXNtP+NrlaVfgUkzIDLvg4UsZucAdY=";
   };
 
   vendorHash = "sha256-ve8QT2dIUZGTFYESt9vIllGTan22ciZr8SQzfqtqQfw=";

From 0c6c835e2cd7c0762efaa5648e56a6da5f242581 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 09:01:10 +0000
Subject: [PATCH 4971/6226] prometheus-redis-exporter: 1.79.0 -> 1.80.0

---
 pkgs/servers/monitoring/prometheus/redis-exporter.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/pkgs/servers/monitoring/prometheus/redis-exporter.nix
index 05fd38f19f8c..628171355276 100644
--- a/pkgs/servers/monitoring/prometheus/redis-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/redis-exporter.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "redis_exporter";
-  version = "1.79.0";
+  version = "1.80.0";
 
   src = fetchFromGitHub {
     owner = "oliver006";
     repo = "redis_exporter";
     rev = "v${version}";
-    sha256 = "sha256-ol2SbjP25h0BWKLTSIHQz2pZWUenXUf69Rq1SYhDgcI=";
+    sha256 = "sha256-52MOgevF5UtyP6c+lsStNeF7/Z1H2jcIYqSzq5mhdpA=";
   };
 
   vendorHash = "sha256-MkwkwfH7/hqJ89soHOGeR8iznXoNb/5Rbyg6tqcEhOg=";

From 4991fe06682f5653fe39816e11fec6e9295d2d2b Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Mon, 3 Nov 2025 10:02:59 +0100
Subject: [PATCH 4972/6226] pioneer: fix build

---
 pkgs/by-name/pi/pioneer/package.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pi/pioneer/package.nix b/pkgs/by-name/pi/pioneer/package.nix
index ea86c3c0c0e3..a5df5859db70 100644
--- a/pkgs/by-name/pi/pioneer/package.nix
+++ b/pkgs/by-name/pi/pioneer/package.nix
@@ -32,8 +32,10 @@ stdenv.mkDerivation rec {
   };
 
   postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace 'string(TIMESTAMP PROJECT_VERSION "%Y%m%d")' 'set(PROJECT_VERSION ${version})'
+    substituteInPlace contrib/lz4/CMakeLists.txt \
+      --replace-fail 'cmake_minimum_required(VERSION 3.4)' 'cmake_minimum_required(VERSION 3.13)'
+    substituteInPlace contrib/nanosockets/CMakeLists.txt \
+      --replace-fail 'cmake_minimum_required(VERSION 3.1)' 'cmake_minimum_required(VERSION 3.13)'
   '';
 
   nativeBuildInputs = [

From b958e709dfe70f1b95160e418c5fcb0b4851337b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 09:10:49 +0000
Subject: [PATCH 4973/6226] cirrus-cli: 0.155.1 -> 0.156.0

---
 pkgs/by-name/ci/cirrus-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ci/cirrus-cli/package.nix b/pkgs/by-name/ci/cirrus-cli/package.nix
index a66c2c8a0a39..75045a06a51f 100644
--- a/pkgs/by-name/ci/cirrus-cli/package.nix
+++ b/pkgs/by-name/ci/cirrus-cli/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "cirrus-cli";
-  version = "0.155.1";
+  version = "0.156.0";
 
   src = fetchFromGitHub {
     owner = "cirruslabs";
     repo = "cirrus-cli";
     rev = "v${version}";
-    hash = "sha256-ZjirC80wiW2iCflCWxCG4KpTxnZyLTeCXa6B/SJoiyI=";
+    hash = "sha256-9ha87R/TN0Tjl4VWoCEMKc+hnSTcFaeIURndrF2uMR0=";
   };
 
-  vendorHash = "sha256-ag1HzNrSqGTJGXxhdspxHsJRBu7tuB5nDFiEWh1VOsU=";
+  vendorHash = "sha256-czH0s9zxj6A8RMa4i6u3+2rIr8vfBe9ECTnAbQ7kK5E=";
 
   ldflags = [
     "-X github.com/cirruslabs/cirrus-cli/internal/version.Version=v${version}"

From 4b2261930392006525af0673d60746f8b76a9de7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 3 Nov 2025 09:14:50 +0000
Subject: [PATCH 4974/6226] python3Packages.torchrl: 0.10.0 -> 0.10.1

Diff: https://github.com/pytorch/rl/compare/v0.10.0...v0.10.1

Changelog: https://github.com/pytorch/rl/releases/tag/v0.10.1
---
 pkgs/development/python-modules/torchrl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/torchrl/default.nix b/pkgs/development/python-modules/torchrl/default.nix
index 891d98f35a3c..a5db6383c25e 100644
--- a/pkgs/development/python-modules/torchrl/default.nix
+++ b/pkgs/development/python-modules/torchrl/default.nix
@@ -73,14 +73,14 @@
 
 buildPythonPackage rec {
   pname = "torchrl";
-  version = "0.10.0";
+  version = "0.10.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytorch";
     repo = "rl";
     tag = "v${version}";
-    hash = "sha256-DqLB1JnQ96cxVEzcXra1hFVfrN7eXTlTwPtlPClnaBA=";
+    hash = "sha256-Vd/w11P4NVrx2xki+VYlXQaM8F+vpdokke8ZAHg6h0Q=";
   };
 
   postPatch = ''

From 498a7301c4db9f1634db30ba01796480ef228d48 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 09:30:47 +0000
Subject: [PATCH 4975/6226] xenia-canary: 0-unstable-2025-10-24 ->
 0-unstable-2025-11-01

---
 pkgs/by-name/xe/xenia-canary/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/xe/xenia-canary/package.nix b/pkgs/by-name/xe/xenia-canary/package.nix
index 0caea3fa85c1..b830d9fb3b78 100644
--- a/pkgs/by-name/xe/xenia-canary/package.nix
+++ b/pkgs/by-name/xe/xenia-canary/package.nix
@@ -19,14 +19,14 @@
 }:
 llvmPackages_20.stdenv.mkDerivation {
   pname = "xenia-canary";
-  version = "0-unstable-2025-10-24";
+  version = "0-unstable-2025-11-01";
 
   src = fetchFromGitHub {
     owner = "xenia-canary";
     repo = "xenia-canary";
     fetchSubmodules = true;
-    rev = "5d01ac0c45e04d99364888a6e391697bee5ab12d";
-    hash = "sha256-elbWtd1isE+B+JESWzSp5WhkjpsrHrIp1qGTZN5B0Yw=";
+    rev = "b800011265bf47ea6b3f4f2b234d25249823a9be";
+    hash = "sha256-XufXayBfpq8PUReAiNxAbt4gUhH+aYxMN10ZU7HVhJs=";
   };
 
   dontConfigure = true;

From 968be1d62f52977303ee9698d936577a05e31b67 Mon Sep 17 00:00:00 2001
From: Sigmanificient <edhyjox@gmail.com>
Date: Mon, 3 Nov 2025 10:34:15 +0100
Subject: [PATCH 4976/6226] pothos: fix build

---
 pkgs/applications/radio/pothos/default.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/applications/radio/pothos/default.nix b/pkgs/applications/radio/pothos/default.nix
index cf9b3be83409..3d49bd8229f9 100644
--- a/pkgs/applications/radio/pothos/default.nix
+++ b/pkgs/applications/radio/pothos/default.nix
@@ -46,6 +46,20 @@ mkDerivation rec {
     ./cstring.patch
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.9)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace spuce/{,spuce}/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+
+    substituteInPlace spuce/qt_{fir,iir,other,window}/CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+
+    substituteInPlace {audio,blocks,comms,flow,plotters,python,soapy,widgets}/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8.9)" "cmake_minimum_required(VERSION 3.10)"
+
+  '';
+
   # poco 1.14 requires c++17
   NIX_CFLAGS_COMPILE = [ "-std=gnu++17" ];
 

From e0c87dcad66fc17fbdae6b9f4c3428212d4534c3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 09:45:07 +0000
Subject: [PATCH 4977/6226] oci-cli: 3.68.1 -> 3.69.0

---
 pkgs/by-name/oc/oci-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/oc/oci-cli/package.nix b/pkgs/by-name/oc/oci-cli/package.nix
index 43d447569ad5..ce3535b5a0ed 100644
--- a/pkgs/by-name/oc/oci-cli/package.nix
+++ b/pkgs/by-name/oc/oci-cli/package.nix
@@ -25,14 +25,14 @@ in
 
 py.pkgs.buildPythonApplication rec {
   pname = "oci-cli";
-  version = "3.68.1";
+  version = "3.69.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "oracle";
     repo = "oci-cli";
     tag = "v${version}";
-    hash = "sha256-BvVVCK4vh3RT6ypvlhNk1oiY607cVFHaG/Ttu8ws5hA=";
+    hash = "sha256-mGwe3I8LobdoIQQrWLUDz0ARD8/WVIoNt80TatdtDKo=";
   };
 
   nativeBuildInputs = [ installShellFiles ];

From 767c7deffead94a0a60d0194c041e4ba7b2d1e97 Mon Sep 17 00:00:00 2001
From: Alexander Sieg <alex@xanderio.de>
Date: Fri, 31 Oct 2025 15:19:34 +0100
Subject: [PATCH 4978/6226] mealie: 3.2.1 -> 3.3.2

Changelog: https://github.com/mealie-recipes/mealie/releases/tag/refs/tags/v3.3.2
---
 pkgs/by-name/me/mealie/mealie-frontend.nix | 15 +++++++--------
 pkgs/by-name/me/mealie/package.nix         |  4 ++--
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/me/mealie/mealie-frontend.nix b/pkgs/by-name/me/mealie/mealie-frontend.nix
index e6781ce540fa..ab0071c564cb 100644
--- a/pkgs/by-name/me/mealie/mealie-frontend.nix
+++ b/pkgs/by-name/me/mealie/mealie-frontend.nix
@@ -20,7 +20,7 @@ stdenv.mkDerivation {
 
   yarnOfflineCache = fetchYarnDeps {
     yarnLock = "${src}/frontend/yarn.lock";
-    hash = "sha256-e+3LCoOzfjSG4CjzOLXTcXGkmzNwFTLCrN0l5odOBMs=";
+    hash = "sha256-vw7OtXRrASOac4J5j6X/U2kxZa9I9thecUUl6XOYz5w=";
   };
 
   nativeBuildInputs = [
@@ -28,6 +28,7 @@ stdenv.mkDerivation {
     nodejs
     (yarn.override { inherit nodejs; })
     writableTmpDirAsHomeHook
+    dart-sass
   ];
 
   configurePhase = ''
@@ -37,11 +38,11 @@ stdenv.mkDerivation {
 
     yarn config --offline set yarn-offline-mirror "$yarnOfflineCache"
     fixup-yarn-lock yarn.lock
-    yarn install --frozen-lockfile --offline --no-progress --non-interactive
-    patchShebangs node_modules/
+    yarn install --frozen-lockfile --offline --no-progress --non-interactive --ignore-scripts
+    patchShebangs node_modules
 
-    mkdir -p node_modules/sass-embedded/dist/lib/src/vendor/dart-sass
-    ln -s ${dart-sass}/bin/dart-sass node_modules/sass-embedded/dist/lib/src/vendor/dart-sass/sass
+    substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \
+      --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["dart-sass"];'
 
     runHook postConfigure
   '';
@@ -50,9 +51,7 @@ stdenv.mkDerivation {
     runHook preBuild
 
     export NUXT_TELEMETRY_DISABLED=1
-    yarn --offline build
-    yarn --offline generate
-
+    yarn --offline generate --env production
     runHook postBuild
   '';
 
diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix
index 7a141243ed9c..821f833b530b 100644
--- a/pkgs/by-name/me/mealie/package.nix
+++ b/pkgs/by-name/me/mealie/package.nix
@@ -11,12 +11,12 @@
 }:
 
 let
-  version = "3.2.1";
+  version = "3.3.2";
   src = fetchFromGitHub {
     owner = "mealie-recipes";
     repo = "mealie";
     tag = "v${version}";
-    hash = "sha256-LIWubw+iO17giSvGCl5LzI429725sisp5u4Z4usJOGA=";
+    hash = "sha256-iaddAIsrUH6g4KXuSTIulNVWOfy/IWg0Czs9JgDxXUk=";
   };
 
   frontend = callPackage (import ./mealie-frontend.nix src version) { };

From a235a7a6aa5a178f0b74ce9784f5fd6681300acc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 10:01:28 +0000
Subject: [PATCH 4979/6226] dracula-theme: 4.0.0-unstable-2025-10-15 ->
 4.0.0-unstable-2025-11-02

---
 pkgs/by-name/dr/dracula-theme/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dr/dracula-theme/package.nix b/pkgs/by-name/dr/dracula-theme/package.nix
index 5974293c8ed6..19040fc4048f 100644
--- a/pkgs/by-name/dr/dracula-theme/package.nix
+++ b/pkgs/by-name/dr/dracula-theme/package.nix
@@ -8,7 +8,7 @@
 
 let
   themeName = "Dracula";
-  version = "4.0.0-unstable-2025-10-15";
+  version = "4.0.0-unstable-2025-11-02";
 in
 stdenvNoCC.mkDerivation {
   pname = "dracula-theme";
@@ -17,8 +17,8 @@ stdenvNoCC.mkDerivation {
   src = fetchFromGitHub {
     owner = "dracula";
     repo = "gtk";
-    rev = "cd80d5ab1ab1904a367f34e33d7f672e44513bf8";
-    hash = "sha256-kAJicio2wONKVIK/whtoPe8uMErkbfbEoWWA85KMaBU=";
+    rev = "79095df59b255996611fdc84d75bf06253f152ce";
+    hash = "sha256-NMcm5fn4P5K5OueS3sdBXX6QMMqzVAOdPHNDMb+lqh8=";
   };
 
   propagatedUserEnvPkgs = [

From 90050b969151eacf667f5315a001dd1fa2bfc4ca Mon Sep 17 00:00:00 2001
From: Markus Kowalewski <markus.kowalewski@gmail.com>
Date: Fri, 24 Oct 2025 13:20:14 +0200
Subject: [PATCH 4980/6226] nixos/nfs-client: add dns_resolver entry to
 request-key.conf

* A dns_resolver entry is needed for a NFSv4 client to
  resolve hostnames of NFS referrals and replicas.

* Make request-key.conf customizable, by moving
  content from separate file into
  `environment.etc."request-key.conf".text`
---
 nixos/modules/tasks/filesystems/nfs.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix
index 3630b20f9ff3..d6a3fe29e0b4 100644
--- a/nixos/modules/tasks/filesystems/nfs.nix
+++ b/nixos/modules/tasks/filesystems/nfs.nix
@@ -60,10 +60,6 @@ let
     else
       pkgs.writeText "nfs.conf" nfsConfDeprecated;
 
-  requestKeyConfFile = pkgs.writeText "request-key.conf" ''
-    create id_resolver * * ${pkgs.nfs-utils}/bin/nfsidmap -t 600 %k %d
-  '';
-
   cfg = config.services.nfs;
 
 in
@@ -162,7 +158,10 @@ in
         environment.etc = {
           "idmapd.conf".source = idmapdConfFile;
           "nfs.conf".source = nfsConfFile;
-          "request-key.conf".source = requestKeyConfFile;
+          "request-key.conf".text = ''
+            create id_resolver * * ${pkgs.nfs-utils}/bin/nfsidmap -t 600 %k %d
+            create dns_resolver * * ${pkgs.keyutils}/bin/key.dns_resolver %k
+          '';
         };
 
         systemd.services.nfs-blkmap = {

From 514fd961830caca42abfe72da85636051d2f1ae3 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 3 Nov 2025 10:00:47 +0000
Subject: [PATCH 4981/6226] python3Packages.kserve-storage: init at 0.16.0

---
 .../python-modules/kserve-storage/default.nix | 67 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 69 insertions(+)
 create mode 100644 pkgs/development/python-modules/kserve-storage/default.nix

diff --git a/pkgs/development/python-modules/kserve-storage/default.nix b/pkgs/development/python-modules/kserve-storage/default.nix
new file mode 100644
index 000000000000..b56be1c1b275
--- /dev/null
+++ b/pkgs/development/python-modules/kserve-storage/default.nix
@@ -0,0 +1,67 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  azure-identity,
+  azure-storage-blob,
+  azure-storage-file-share,
+  boto3,
+  google-cloud-storage,
+  huggingface-hub,
+  requests,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "kserve-storage";
+  version = "0.16.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "kserve_storage";
+    inherit version;
+    hash = "sha256-xgLnWegsPF18RLxwxt0dfnrZwsX7AK3b8AdT594Bac4=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  pythonRelaxDeps = [
+    "google-cloud-storage"
+  ];
+  dependencies = [
+    azure-identity
+    azure-storage-blob
+    azure-storage-file-share
+    boto3
+    google-cloud-storage
+    huggingface-hub
+    requests
+  ];
+
+  pythonImportsCheck = [ "kserve_storage" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # RuntimeError: Failed to fetch model. No model found in file:///tmp.
+    "test_local_path_with_out_dir_exist"
+  ];
+
+  meta = {
+    description = "KServe Storage Handler. This module is responsible to download the models from the provided source";
+    homepage = "https://pypi.org/project/kserve-storage";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ab0840b733e0..9c957caf06f6 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7964,6 +7964,8 @@ self: super: with self; {
 
   kserve = callPackage ../development/python-modules/kserve { };
 
+  kserve-storage = callPackage ../development/python-modules/kserve-storage { };
+
   kubernetes = callPackage ../development/python-modules/kubernetes { };
 
   kubernetes-asyncio = callPackage ../development/python-modules/kubernetes-asyncio { };

From 020eb012db8e89a0f1cfefadaf28db10c24cc9cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 10:08:55 +0000
Subject: [PATCH 4982/6226] phoenixd: 0.6.3 -> 0.7.0

---
 pkgs/by-name/ph/phoenixd/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ph/phoenixd/package.nix b/pkgs/by-name/ph/phoenixd/package.nix
index 985dd32f2099..95c7cbe2a198 100644
--- a/pkgs/by-name/ph/phoenixd/package.nix
+++ b/pkgs/by-name/ph/phoenixd/package.nix
@@ -11,7 +11,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "phoenixd";
-  version = "0.6.3";
+  version = "0.7.0";
 
   src =
     let
@@ -28,10 +28,10 @@ stdenv.mkDerivation (finalAttrs: {
     fetchurl {
       url = "https://github.com/ACINQ/phoenixd/releases/download/v${finalAttrs.version}/phoenixd-${finalAttrs.version}-${suffix}.zip";
       hash = selectSystem {
-        aarch64-darwin = "sha256-6yZmvoVCCW3ulYB8khJ8khtk8o/AiN/0tbwGwpH8ekA=";
-        x86_64-darwin = "sha256-aZy984ttf1NaCo+5LU/03CTPmcpb2N2rfRd3H5Vc0hA=";
-        x86_64-linux = "sha256-2ir2mfjp+2ExdT6drrbrTJcJzauXD7wtE3oTJ+J0WpI=";
-        aarch64-linux = "sha256-zXJ4fihwM2a04Uv2LcctcmN2PiZLtjGQwpxUVP/Sn6Y=";
+        aarch64-darwin = "sha256-8j3fzT2KWlspp4+5vplbvO6nrd1G+Fox6B6+YB+NE1k=";
+        x86_64-darwin = "sha256-f7OwOr0PRkfX6rdddoW4GNvIv16wjAU0G7LiI+oS+xQ=";
+        x86_64-linux = "sha256-2oVnY/BjSC3HxfOMlqWyI/Yue3PT+vNWten4ty2DZVk=";
+        aarch64-linux = "sha256-oRUXFZwGShZzqNiY18gKm1ZNVJ/zfARhr9d7S4hN8XQ=";
       };
     };
 

From 35e5dd277f6167bde37011b2ee19f68d0fc9c950 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 10:09:26 +0000
Subject: [PATCH 4983/6226] matrix-authentication-service: 1.4.1 -> 1.5.0

---
 pkgs/by-name/ma/matrix-authentication-service/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix
index 4ea3f367a50b..a6e08d9b2f6c 100644
--- a/pkgs/by-name/ma/matrix-authentication-service/package.nix
+++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix
@@ -18,21 +18,21 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "matrix-authentication-service";
-  version = "1.4.1";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "element-hq";
     repo = "matrix-authentication-service";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-9mQXWpGy+oFK5cEWeW88CSZQqfpmOAUS1x9KkyEMg+0=";
+    hash = "sha256-MlOilH01OpiYHxhCceSXVw1zhyNQXYomTvSMkM9sUrk=";
   };
 
-  cargoHash = "sha256-3ODOJY8/hksbMak8SsQP87rOnCd7+1G0wD4m5daPrbk=";
+  cargoHash = "sha256-hvEr+cMjPJ4DLigAL9SQLUJqOVSOktsP8v4xTtOKvSg=";
 
   npmDeps = fetchNpmDeps {
     name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps";
     src = "${finalAttrs.src}/${finalAttrs.npmRoot}";
-    hash = "sha256-UgvT81DR4pWlQRfQgmecp+AOUSih4+/v7c1ApIDf3Ts=";
+    hash = "sha256-0YWguliIJjYh1IUUIX4/CHDYwvUk/M2Hz15tL558tws=";
   };
 
   npmRoot = "frontend";

From f8b42dea3451017289346cbd0b25fcc2a7c07174 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 3 Nov 2025 10:12:08 +0000
Subject: [PATCH 4984/6226] python3Packages.cloudevents: add missing dependency
 deprecation

---
 pkgs/development/python-modules/cloudevents/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/cloudevents/default.nix b/pkgs/development/python-modules/cloudevents/default.nix
index 5324f3ab5ee6..3b5b966475b1 100644
--- a/pkgs/development/python-modules/cloudevents/default.nix
+++ b/pkgs/development/python-modules/cloudevents/default.nix
@@ -28,10 +28,13 @@ buildPythonPackage rec {
     setuptools
   ];
 
+  dependencies = [
+    deprecation
+  ];
+
   pythonImportsCheck = [ "cloudevents" ];
 
   nativeCheckInputs = [
-    deprecation
     flask
     pydantic
     pytestCheckHook

From b3f102e52d16a602f91e3eb6d6abbcdce6861336 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 3 Nov 2025 09:35:37 +0000
Subject: [PATCH 4985/6226] python3Packages.kserve: 0.15.2 -> 0.16.0

Diff: https://github.com/kserve/kserve/compare/v0.15.2...v0.16.0

Changelog: https://github.com/kserve/kserve/releases/tag/v0.16.0
---
 .../python-modules/kserve/default.nix         | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/pkgs/development/python-modules/kserve/default.nix b/pkgs/development/python-modules/kserve/default.nix
index f73275866a44..c547a18e5cff 100644
--- a/pkgs/development/python-modules/kserve/default.nix
+++ b/pkgs/development/python-modules/kserve/default.nix
@@ -5,35 +5,21 @@
   fetchFromGitHub,
 
   # build-system
-  deprecation,
-  poetry-core,
+  setuptools,
 
   # dependencies
   cloudevents,
   fastapi,
   grpc-interceptor,
   grpcio,
+  grpcio-tools,
   httpx,
   kubernetes,
   numpy,
   orjson,
   pandas,
-  uvicorn,
-
-  # optional-dependencies
-  azure-identity,
-  azure-storage-blob,
-  azure-storage-file-share,
-  boto3,
-  google-cloud-storage,
-  huggingface-hub,
-  asgi-logger,
-  ray,
-  vllm,
-
   prometheus-client,
   protobuf,
-  requests,
   psutil,
   pydantic,
   python-dateutil,
@@ -41,11 +27,24 @@
   six,
   tabulate,
   timing-asgi,
+  uvicorn,
+
+  # optional-dependencies
+  # storage
+  kserve-storage,
+  # logging
+  asgi-logger,
+  # ray
+  ray,
+  # llm
+  vllm,
 
   # tests
   avro,
   grpcio-testing,
+  jinja2,
   pytest-asyncio,
+  pytest-cov-stub,
   pytest-httpx,
   pytest-xdist,
   pytestCheckHook,
@@ -54,14 +53,14 @@
 
 buildPythonPackage rec {
   pname = "kserve";
-  version = "0.15.2";
+  version = "0.16.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kserve";
     repo = "kserve";
     tag = "v${version}";
-    hash = "sha256-NklR2Aoa5UdWkqNOfX+xl3R158JDSQtStXv9DkklOwM=";
+    hash = "sha256-f6ILZMLxfckEpy7wSgCqUx89JWSnn0DbQiqRSHcQHms=";
   };
 
   sourceRoot = "${src.name}/python/kserve";
@@ -77,8 +76,7 @@ buildPythonPackage rec {
   ];
 
   build-system = [
-    deprecation
-    poetry-core
+    setuptools
   ];
 
   dependencies = [
@@ -86,6 +84,7 @@ buildPythonPackage rec {
     fastapi
     grpc-interceptor
     grpcio
+    grpcio-tools
     httpx
     kubernetes
     numpy
@@ -101,21 +100,20 @@ buildPythonPackage rec {
     tabulate
     timing-asgi
     uvicorn
-  ];
+  ]
+  ++ uvicorn.optional-dependencies.standard;
 
   optional-dependencies = {
     storage = [
-      azure-identity
-      azure-storage-blob
-      azure-storage-file-share
-      boto3
-      huggingface-hub
-      google-cloud-storage
-      requests
+      kserve-storage
+    ];
+    logging = [
+      asgi-logger
+    ];
+    ray = [
+      ray
     ]
-    ++ huggingface-hub.optional-dependencies.hf_transfer;
-    logging = [ asgi-logger ];
-    ray = [ ray ];
+    ++ ray.optional-dependencies.serve;
     llm = [
       vllm
     ];
@@ -124,7 +122,9 @@ buildPythonPackage rec {
   nativeCheckInputs = [
     avro
     grpcio-testing
+    jinja2
     pytest-asyncio
+    pytest-cov-stub
     pytest-httpx
     pytest-xdist
     pytestCheckHook

From d8d1b48c36ef2df648e38faf0e939b8871ac6c88 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 10:21:45 +0000
Subject: [PATCH 4986/6226] python3Packages.bentoml: 1.4.27 -> 1.4.28

---
 pkgs/development/python-modules/bentoml/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bentoml/default.nix b/pkgs/development/python-modules/bentoml/default.nix
index b17d9fcac1ae..8aad4cf469d3 100644
--- a/pkgs/development/python-modules/bentoml/default.nix
+++ b/pkgs/development/python-modules/bentoml/default.nix
@@ -80,7 +80,7 @@
 }:
 
 let
-  version = "1.4.27";
+  version = "1.4.28";
   aws = [ fs-s3fs ];
   grpc = [
     grpcio
@@ -130,7 +130,7 @@ let
     owner = "bentoml";
     repo = "BentoML";
     tag = "v${version}";
-    hash = "sha256-B1slcxNIqT6+xRQkTTCXFjUyFfiBv5En+gYY6lAJJuU=";
+    hash = "sha256-9hxAsTy3e9BDWhJCB5N2RaEFIO0Lc6FK2XKgJC78VUg=";
   };
 in
 buildPythonPackage {

From 3c19aa1412573c61075e0a8e148ecf5dc0842fa3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 10:25:18 +0000
Subject: [PATCH 4987/6226] nominatim: 5.1.0 -> 5.2.0

---
 pkgs/by-name/no/nominatim/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/no/nominatim/package.nix b/pkgs/by-name/no/nominatim/package.nix
index d6c272e0f2a9..2e7149995db8 100644
--- a/pkgs/by-name/no/nominatim/package.nix
+++ b/pkgs/by-name/no/nominatim/package.nix
@@ -21,14 +21,14 @@ let
 in
 python3Packages.buildPythonApplication rec {
   pname = "nominatim";
-  version = "5.1.0";
+  version = "5.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "osm-search";
     repo = "Nominatim";
     tag = "v${version}";
-    hash = "sha256-eMCXXPrUZvM4ju0mi1+f+LXhThCCCEH+HDz6lurw+Jo=";
+    hash = "sha256-ao4oEPz5rtRQtPC2UcIHH1M+o914JraASf+hcB2SDKA=";
   };
 
   postPatch = ''

From ee449a8453b82d0c480706744e0cd917f235e797 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 2 Nov 2025 15:28:07 +0000
Subject: [PATCH 4988/6226] python3Packages.torch-audiomentations: cleanup,
 skip failing tests

See https://github.com/iver56/torch-audiomentations/issues/184
---
 .../torch-audiomentations/default.nix         | 39 +++++++++++++------
 1 file changed, 27 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/torch-audiomentations/default.nix b/pkgs/development/python-modules/torch-audiomentations/default.nix
index cee42c5024a6..280b632821fc 100644
--- a/pkgs/development/python-modules/torch-audiomentations/default.nix
+++ b/pkgs/development/python-modules/torch-audiomentations/default.nix
@@ -2,15 +2,20 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   julius,
   librosa,
+  torch,
+  torch-pitch-shift,
+  torchaudio,
+
+  # tests
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
-  setuptools,
-  torch-pitch-shift,
-  torch,
-  torchaudio,
 }:
 
 buildPythonPackage rec {
@@ -18,8 +23,6 @@ buildPythonPackage rec {
   version = "0.12.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "asteroid-team";
     repo = "torch-audiomentations";
@@ -35,8 +38,8 @@ buildPythonPackage rec {
     julius
     librosa
     torch
-    torchaudio
     torch-pitch-shift
+    torchaudio
   ];
 
   nativeCheckInputs = [
@@ -54,13 +57,25 @@ buildPythonPackage rec {
     "tests/test_background_noise.py"
   ];
 
-  disabledTests = [ "test_transform_is_differentiable" ];
+  disabledTests = [
+    # AttributeError: module 'torchaudio' has no attribute 'info'
+    # Removed in torchaudio v2.9.0
+    # See https://github.com/pytorch/audio/issues/3902 for context
+    # Reported to torch-audiomentations: https://github.com/iver56/torch-audiomentations/issues/184
+    "test_background_noise_no_guarantee_with_empty_tensor"
+    "test_colored_noise_guaranteed_with_batched_tensor"
+    "test_colored_noise_guaranteed_with_single_tensor"
+    "test_colored_noise_guaranteed_with_zero_length_samples"
+    "test_colored_noise_no_guarantee_with_single_tensor"
+    "test_same_min_max_f_decay"
+    "test_transform_is_differentiable"
+  ];
 
-  meta = with lib; {
+  meta = {
     description = "Fast audio data augmentation in PyTorch";
     homepage = "https://github.com/asteroid-team/torch-audiomentations";
     changelog = "https://github.com/asteroid-team/torch-audiomentations/releases/tag/v${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ matthewcroughan ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ matthewcroughan ];
   };
 }

From 72a5ff819dc9d7e59e9aa2482bb5b830c3034c9f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 10:39:53 +0000
Subject: [PATCH 4989/6226] ranger: 1.9.3-unstable-2025-10-12 ->
 1.9.3-unstable-2025-11-01

---
 pkgs/by-name/ra/ranger/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ra/ranger/package.nix b/pkgs/by-name/ra/ranger/package.nix
index b05e99b77df0..5091f2e8bdd3 100644
--- a/pkgs/by-name/ra/ranger/package.nix
+++ b/pkgs/by-name/ra/ranger/package.nix
@@ -17,14 +17,14 @@
 
 python3Packages.buildPythonApplication {
   pname = "ranger";
-  version = "1.9.3-unstable-2025-10-12";
+  version = "1.9.3-unstable-2025-11-01";
   format = "setuptools";
 
   src = fetchFromGitHub {
     owner = "ranger";
     repo = "ranger";
-    rev = "6d5e0d8dc4cc5ddf53211e19f48c5b5e9ee47b18";
-    hash = "sha256-gGJPa2k90BF28EB5cPnY0yn0YblJkhn105V2JQQv+xA=";
+    rev = "6b646df44604fac6b7843119833a696789d6f3f3";
+    hash = "sha256-6zypE/i+lANPP8z7ILgPWgwCFXXhxi2s+RLgctsId5Q=";
   };
 
   LC_ALL = "en_US.UTF-8";

From 2f03402764e11a5e2394104f143d81b9fb612c6e Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 3 Nov 2025 11:44:35 +0100
Subject: [PATCH 4990/6226] rectangle: 0.91 -> 0.92

---
 pkgs/by-name/re/rectangle/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/re/rectangle/package.nix b/pkgs/by-name/re/rectangle/package.nix
index de29f20ec721..3a67dd7ee333 100644
--- a/pkgs/by-name/re/rectangle/package.nix
+++ b/pkgs/by-name/re/rectangle/package.nix
@@ -8,11 +8,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "rectangle";
-  version = "0.91";
+  version = "0.92";
 
   src = fetchurl {
     url = "https://github.com/rxhanson/Rectangle/releases/download/v${finalAttrs.version}/Rectangle${finalAttrs.version}.dmg";
-    hash = "sha256-MOpg8N2mMNB81dmtgQc7KRax+g4d1Xedh9dkC/zYhLw=";
+    hash = "sha256-0Yv2DroNvk2U17U5vzrhfEcr9xAVpV0ivFVIDviI11s=";
   };
 
   sourceRoot = ".";

From 4b4eb15b4b896b98073efe590506600ab6f298c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 10:58:35 +0000
Subject: [PATCH 4991/6226] dumpvdl2: 2.4.0 -> 2.5.0

---
 pkgs/by-name/du/dumpvdl2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/du/dumpvdl2/package.nix b/pkgs/by-name/du/dumpvdl2/package.nix
index fd9a276a845c..d2943e7e2407 100644
--- a/pkgs/by-name/du/dumpvdl2/package.nix
+++ b/pkgs/by-name/du/dumpvdl2/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dumpvdl2";
-  version = "2.4.0";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "szpajder";
     repo = "dumpvdl2";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kb8FLVuG9tSZta8nmaKRCRZinF1yy4+NNxD5s7X82Wk=";
+    hash = "sha256-g8WpKbkxG4EBBfKw4YY1XPCo4DQntVvqSCGeQREpTRk=";
   };
 
   buildInputs = [

From e0c0b2c54c6dd2c232366a4aed6d4b01fa7755f1 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 3 Nov 2025 08:57:02 +0100
Subject: [PATCH 4992/6226] ci/github-script/merge: improve feedback for
 by-name check

The by-name check would previously be green when the
`pkgs/by-name/README.md` file was changed. This would still not mean the
maintainer was able to merge the PR, because there'd be no maintainer
for that file, but the feedback was not 100% accurate.
---
 ci/README.md              | 2 +-
 ci/github-script/merge.js | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ci/README.md b/ci/README.md
index 4848805baf28..81ba0499bbc2 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -43,7 +43,7 @@ These issues effectively list PRs the merge bot has interacted with.
 To ensure security and a focused utility, the bot adheres to specific limitations:
 
 - The PR targets one of the [development branches](#branch-classification).
-- The PR only touches packages located under `pkgs/by-name/*`.
+- The PR only touches files of packages located under `pkgs/by-name/*`.
 - The PR is either:
   - approved by a [committer][@NixOS/nixpkgs-committers].
   - authored by a [committer][@NixOS/nixpkgs-committers].
diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index c738ecc950f5..779b5dffcab0 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -10,13 +10,15 @@ function runChecklist({
   user,
   userIsMaintainer,
 }) {
-  const allByName = files.every(({ filename }) =>
-    filename.startsWith('pkgs/by-name/'),
+  const allByName = files.every(
+    ({ filename }) =>
+      filename.startsWith('pkgs/by-name/') && filename.split('/').length > 4,
   )
 
   const packages = files
     .filter(({ filename }) => filename.startsWith('pkgs/by-name/'))
     .map(({ filename }) => filename.split('/')[3])
+    .filter(Boolean)
 
   const eligible = !packages.length
     ? new Set()
@@ -40,7 +42,7 @@ function runChecklist({
   const checklist = {
     'PR targets a [development branch](https://github.com/NixOS/nixpkgs/blob/-/ci/README.md#branch-classification).':
       classify(pull_request.base.ref).type.includes('development'),
-    'PR touches only packages in `pkgs/by-name/`.': allByName,
+    'PR touches only files of packages in `pkgs/by-name/`.': allByName,
     'PR is at least one of:': {
       'Approved by a committer.': committers.intersection(approvals).size > 0,
       'Authored by a committer.': committers.has(pull_request.user.id),

From 5407abeb7d4d92e1805c703f868ed4828b8167cb Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 3 Nov 2025 09:00:56 +0100
Subject: [PATCH 4993/6226] ci/github-script/merge: unify terms for authoring
 and creating PRs

I didn't like r-ryantm "authoring"; so I changed that to "created"
earlier. Arguably, using "opened" is more consistent with what is
actually checked and can consistently be used for both.
---
 ci/README.md              | 4 ++--
 ci/github-script/merge.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ci/README.md b/ci/README.md
index 81ba0499bbc2..df5b196c49a4 100644
--- a/ci/README.md
+++ b/ci/README.md
@@ -46,9 +46,9 @@ To ensure security and a focused utility, the bot adheres to specific limitation
 - The PR only touches files of packages located under `pkgs/by-name/*`.
 - The PR is either:
   - approved by a [committer][@NixOS/nixpkgs-committers].
-  - authored by a [committer][@NixOS/nixpkgs-committers].
   - backported via label.
-  - created by [@r-ryantm](https://nix-community.github.io/nixpkgs-update/r-ryantm/).
+  - opened by a [committer][@NixOS/nixpkgs-committers].
+  - opened by [@r-ryantm](https://nix-community.github.io/nixpkgs-update/r-ryantm/).
 - The user attempting to merge is a member of [@NixOS/nixpkgs-maintainers].
 - The user attempting to merge is a maintainer of all packages touched by the PR.
 
diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index 779b5dffcab0..2265c4d377a7 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -45,11 +45,11 @@ function runChecklist({
     'PR touches only files of packages in `pkgs/by-name/`.': allByName,
     'PR is at least one of:': {
       'Approved by a committer.': committers.intersection(approvals).size > 0,
-      'Authored by a committer.': committers.has(pull_request.user.id),
       'Backported via label.':
         pull_request.user.login === 'nixpkgs-ci[bot]' &&
         pull_request.head.ref.startsWith('backport-'),
-      'Created by r-ryantm.': pull_request.user.login === 'r-ryantm',
+      'Opened by a committer.': committers.has(pull_request.user.id),
+      'Opened by r-ryantm.': pull_request.user.login === 'r-ryantm',
     },
   }
 

From 17425ff327a9737335d9e1dfe5ce80ddaccc5316 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 3 Nov 2025 11:03:56 +0000
Subject: [PATCH 4994/6226] build(deps): bump cachix/install-nix-action from
 31.8.1 to 31.8.2

Bumps [cachix/install-nix-action](https://github.com/cachix/install-nix-action) from 31.8.1 to 31.8.2.
- [Release notes](https://github.com/cachix/install-nix-action/releases)
- [Changelog](https://github.com/cachix/install-nix-action/blob/master/RELEASE.md)
- [Commits](https://github.com/cachix/install-nix-action/compare/fd24c48048070c1be9acd18c9d369a83f0fe94d7...456688f15bc354bef6d396e4a35f4f89d40bf2b7)

---
updated-dependencies:
- dependency-name: cachix/install-nix-action
  dependency-version: 31.8.2
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/build.yml     | 2 +-
 .github/workflows/check.yml     | 2 +-
 .github/workflows/eval.yml      | 8 ++++----
 .github/workflows/lint.yml      | 6 +++---
 .github/workflows/reviewers.yml | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 69bbc48c9099..701ac0b80b92 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -56,7 +56,7 @@ jobs:
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
+      - uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31
         with:
           # Sandbox is disabled on MacOS by default.
           extra_nix_config: sandbox = true
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index d6b136204d9b..e317903c2f8d 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -82,7 +82,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
           target-as-trusted-at: ${{ inputs.targetSha }}
 
-      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
+      - uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml
index 7c218d60a0bc..ccd58fe1e9a9 100644
--- a/.github/workflows/eval.yml
+++ b/.github/workflows/eval.yml
@@ -52,7 +52,7 @@ jobs:
             ci/pinned.json
 
       - name: Install Nix
-        uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
+        uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31
 
       - name: Load supported versions
         id: versions
@@ -98,7 +98,7 @@ jobs:
           target-as-trusted-at: ${{ inputs.targetSha }}
 
       - name: Install Nix
-        uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
+        uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
@@ -186,7 +186,7 @@ jobs:
           merge-multiple: true
 
       - name: Install Nix
-        uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
+        uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31
 
       - name: Combine all output paths and eval stats
         run: |
@@ -349,7 +349,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
       - name: Install Nix
-        uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
+        uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31
 
       - name: Run misc eval tasks in parallel
         run: |
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
index 358e090a7b2b..486dac20207c 100644
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -33,7 +33,7 @@ jobs:
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
+      - uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31
 
       # TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well,
       # because the cache would be invalidated on every commit - treefmt checks every file.
@@ -68,7 +68,7 @@ jobs:
         with:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
 
-      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
+      - uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
@@ -97,7 +97,7 @@ jobs:
           merged-as-untrusted-at: ${{ inputs.mergedSha }}
           target-as-trusted-at: ${{ inputs.targetSha }}
 
-      - uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
+      - uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31
 
       - uses: cachix/cachix-action@0fc020193b5a1fa3ac4575aa3a7d3aa6a35435ad # v16
         with:
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
index 03d8caa2661b..060d82d84201 100644
--- a/.github/workflows/reviewers.yml
+++ b/.github/workflows/reviewers.yml
@@ -38,7 +38,7 @@ jobs:
           sparse-checkout: ci
 
       - name: Install Nix
-        uses: cachix/install-nix-action@fd24c48048070c1be9acd18c9d369a83f0fe94d7 # v31
+        uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31
 
       - name: Build the requestReviews derivation
         run: nix-build trusted/ci -A requestReviews

From 43f3fcc5550741d433fa720c5d7673f1c8fe8b44 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 3 Nov 2025 12:08:21 +0100
Subject: [PATCH 4995/6226] ci/github-script/merge: fix with deleted users

When a deleted user had approved a PR, this will cause the merge-bot to
fail.
---
 ci/github-script/merge.js | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index c738ecc950f5..d7ed249ce4c3 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -34,7 +34,9 @@ function runChecklist({
           // bad code between the approval and the merge.
           commit_id === pull_request.head.sha,
       )
-      .map(({ user }) => user.id),
+      .map(({ user }) => user?.id)
+      // Some users have been deleted, so filter these out.
+      .filter(Boolean),
   )
 
   const checklist = {
@@ -158,12 +160,14 @@ async function handleMerge({
   )
 
   const comments = events.slice(lastPush + 1).filter(
-    ({ event, body, node_id }) =>
+    ({ event, body, user, node_id }) =>
       ['commented', 'reviewed'].includes(event) &&
       hasMergeCommand(body) &&
+      // Ignore comments where the user has been deleted already.
+      user &&
       // Ignore comments which had already been responded to by the bot.
       !events.some(
-        ({ event, user, body }) =>
+        ({ event, body }) =>
           ['commented'].includes(event) &&
           // We're only testing this hidden reference, but not the author of the comment.
           // We'll just assume that nobody creates comments with this marker on purpose.

From 5cfe736140e69793d3127746d6e1e6ef3e39dedb Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 3 Nov 2025 12:09:34 +0100
Subject: [PATCH 4996/6226] workflows/bot: touch cron schedule

The last user to touch the schedule will be notified about errors in the
scheduled run. I used to be that, but somehow when renaming the workflow
this didn't happen anymore, so I didn't noticed the workflow failing for
quite some time.
---
 .github/workflows/bot.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
index 8e37cf2aabc9..beb79b82c941 100644
--- a/.github/workflows/bot.yml
+++ b/.github/workflows/bot.yml
@@ -7,7 +7,7 @@ name: Bot
 
 on:
   schedule:
-    - cron: '07,17,27,37,47,57 * * * *'
+    - cron: '05,15,25,35,45,55 * * * *'
   workflow_call:
     inputs:
       headBranch:

From 5ee90348fd90971a5705e0ef18b68d35c50f2859 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 08:35:22 -0300
Subject: [PATCH 4997/6226] opensurge: fix build with cmake4

---
 pkgs/by-name/op/opensurge/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/op/opensurge/package.nix b/pkgs/by-name/op/opensurge/package.nix
index f488d3dd7e4d..9b3294882af6 100644
--- a/pkgs/by-name/op/opensurge/package.nix
+++ b/pkgs/by-name/op/opensurge/package.nix
@@ -51,6 +51,11 @@ stdenv.mkDerivation (finalAttrs: {
 
   passthru.updateScript = nix-update-script { };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     mainProgram = "opensurge";
     description = "Fun 2D retro platformer inspired by Sonic games and a game creation system";

From a6c47b24c4730f87712aa7f7b440eeca5de8231a Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 08:37:48 -0300
Subject: [PATCH 4998/6226] opensurge: add maintainer iedame

---
 pkgs/by-name/op/opensurge/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/opensurge/package.nix b/pkgs/by-name/op/opensurge/package.nix
index 9b3294882af6..0088113e1d0c 100644
--- a/pkgs/by-name/op/opensurge/package.nix
+++ b/pkgs/by-name/op/opensurge/package.nix
@@ -64,6 +64,6 @@ stdenv.mkDerivation (finalAttrs: {
     changelog = "https://github.com/alemart/opensurge/blob/v${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.gpl3Only;
     platforms = lib.platforms.all;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ iedame ];
   };
 })

From 1fb263deddf4cc88f6d9eefc7353cbf4b8dae18a Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Mon, 29 Sep 2025 08:36:23 +0200
Subject: [PATCH 4999/6226] rocq-core: 9.0.0 -> 9.0.1

---
 pkgs/applications/science/logic/coq/default.nix       | 1 +
 pkgs/applications/science/logic/rocq-core/default.nix | 1 +
 pkgs/development/coq-modules/metacoq/default.nix      | 1 -
 pkgs/development/coq-modules/metarocq/default.nix     | 3 ++-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix
index c58c52007b21..a07a3bf556f9 100644
--- a/pkgs/applications/science/logic/coq/default.nix
+++ b/pkgs/applications/science/logic/coq/default.nix
@@ -70,6 +70,7 @@ let
     "8.20.0".sha256 = "sha256-WFpZlA6CzFVAruPhWcHQI7VOBVhrGLdFzWrHW0DTSl0=";
     "8.20.1".sha256 = "sha256-nRaLODPG4E3gUDzGrCK40vhl4+VhPyd+/fXFK/HC3Ig=";
     "9.0.0".sha256 = "sha256-GRwYSvrJGiPD+I82gLOgotb+8Ra5xHZUJGcNwxWqZkU=";
+    "9.0.1".sha256 = "sha256-gRgQhFiYvGR/Z46TmTl1bgN9O32nifxQGdrzfw0WHrk=";
     "9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE=";
   };
   releaseRev = v: "V${v}";
diff --git a/pkgs/applications/science/logic/rocq-core/default.nix b/pkgs/applications/science/logic/rocq-core/default.nix
index e4d6845360e0..1f0a8b063d6a 100644
--- a/pkgs/applications/science/logic/rocq-core/default.nix
+++ b/pkgs/applications/science/logic/rocq-core/default.nix
@@ -23,6 +23,7 @@ let
 
   release = {
     "9.0.0".sha256 = "sha256-GRwYSvrJGiPD+I82gLOgotb+8Ra5xHZUJGcNwxWqZkU=";
+    "9.0.1".sha256 = "sha256-gRgQhFiYvGR/Z46TmTl1bgN9O32nifxQGdrzfw0WHrk=";
     "9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE=";
   };
   releaseRev = v: "V${v}";
diff --git a/pkgs/development/coq-modules/metacoq/default.nix b/pkgs/development/coq-modules/metacoq/default.nix
index c62587e9d964..86898967dd71 100644
--- a/pkgs/development/coq-modules/metacoq/default.nix
+++ b/pkgs/development/coq-modules/metacoq/default.nix
@@ -26,7 +26,6 @@ let
       (case "8.18" "1.3.1-8.18")
       (case "8.19" "1.3.3-8.19")
       (case "8.20" "1.3.4-8.20")
-      (case "9.0" "1.3.4-9.0")
     ] null;
   release = {
     "1.0-beta2-8.11".sha256 = "sha256-I9YNk5Di6Udvq5/xpLSNflfjRyRH8fMnRzbo3uhpXNs=";
diff --git a/pkgs/development/coq-modules/metarocq/default.nix b/pkgs/development/coq-modules/metarocq/default.nix
index 6f7ac6b11b44..952ed86ddbf2 100644
--- a/pkgs/development/coq-modules/metarocq/default.nix
+++ b/pkgs/development/coq-modules/metarocq/default.nix
@@ -15,10 +15,11 @@ let
       case = case: out: { inherit case out; };
     in
     lib.switch coq.coq-version [
-      (case "9.0" "1.4-9.0")
+      (case "9.0" "1.4-9.0.1")
     ] null;
   release = {
     "1.4-9.0".sha256 = "sha256-5QecDAMkvgfDPZ7/jDfnOgcE+Eb1LTAozP7nz6nkuxg=";
+    "1.4-9.0.1".sha256 = "sha256-zMUd2A6EG0LYK3L9ABQvS/Et4MDpSmf3Pxd9+IPNYkI=";
   };
   releaseRev = v: "v${v}";
 

From 62368143335867732758547e6a917acf31e31c30 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 2 Nov 2025 17:28:56 +0000
Subject: [PATCH 5000/6226] pyannoteai-sdk: init at 0.3.0

---
 .../python-modules/pyannoteai-sdk/default.nix | 45 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 47 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyannoteai-sdk/default.nix

diff --git a/pkgs/development/python-modules/pyannoteai-sdk/default.nix b/pkgs/development/python-modules/pyannoteai-sdk/default.nix
new file mode 100644
index 000000000000..129e5c212f76
--- /dev/null
+++ b/pkgs/development/python-modules/pyannoteai-sdk/default.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchPypi,
+
+  # build-system
+  hatch-vcs,
+  hatchling,
+
+  # dependencies
+  requests,
+}:
+
+buildPythonPackage rec {
+  pname = "pyannoteai-sdk";
+  version = "0.3.0";
+  pyproject = true;
+
+  src = fetchPypi {
+    pname = "pyannoteai_sdk";
+    inherit version;
+    hash = "sha256-QOA1ABzi3rNR/aDFNXxZhNzBrYL+JEexpi1fTOZYCa0=";
+  };
+
+  build-system = [
+    hatch-vcs
+    hatchling
+  ];
+
+  dependencies = [
+    requests
+  ];
+
+  pythonImportsCheck = [ "pyannoteai.sdk" ];
+
+  # No tests (at least in the Pypi archive)
+  doCheck = false;
+
+  meta = {
+    description = "Official pyannoteAI Python SDK";
+    homepage = "https://pypi.org/project/pyannoteai-sdk";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ab0840b733e0..ac9daea64bee 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12665,6 +12665,8 @@ self: super: with self; {
 
   pyannote-pipeline = callPackage ../development/python-modules/pyannote-pipeline { };
 
+  pyannoteai-sdk = callPackage ../development/python-modules/pyannoteai-sdk { };
+
   pyaprilaire = callPackage ../development/python-modules/pyaprilaire { };
 
   pyarlo = callPackage ../development/python-modules/pyarlo { };

From fd4a14663e788c66b5a2e09577a47cbe2aa6ac5c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 3 Nov 2025 10:40:32 +0000
Subject: [PATCH 5001/6226] python3Packages.pyannote-core: 5.0.1 -> 6.0.1

Diff: https://github.com/pyannote/pyannote-core/compare/5.0.1...6.0.1

Changelog: https://github.com/pyannote/pyannote-core/releases/tag/6.0.1
---
 .../python-modules/pyannote-core/default.nix  | 36 +++++++++----------
 1 file changed, 16 insertions(+), 20 deletions(-)

diff --git a/pkgs/development/python-modules/pyannote-core/default.nix b/pkgs/development/python-modules/pyannote-core/default.nix
index 8dd3885a3742..6081244212fb 100644
--- a/pkgs/development/python-modules/pyannote-core/default.nix
+++ b/pkgs/development/python-modules/pyannote-core/default.nix
@@ -2,57 +2,53 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  hatch-vcs,
+  hatchling,
+
+  # dependencies
   numpy,
   pandas,
-  pytestCheckHook,
-  scipy,
-  setuptools,
   sortedcontainers,
-  typing-extensions,
-  versioneer,
+
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pyannote-core";
-  version = "5.0.1";
+  version = "6.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyannote";
     repo = "pyannote-core";
     tag = version;
-    hash = "sha256-28LVgI5bDFv71co/JsSrPrAcdugXiMRe6T1Jp0CO0XY=";
+    hash = "sha256-r5NkOAzrQGcb6LPi4/DA0uT9R0ELiYuwQkbT1l6R8Mw=";
   };
 
-  postPatch = ''
-    # Remove vendorized versioneer.py
-    rm versioneer.py
-  '';
-
   build-system = [
-    setuptools
-    versioneer
+    hatch-vcs
+    hatchling
   ];
 
   dependencies = [
-    sortedcontainers
     numpy
-    scipy
-    typing-extensions
+    pandas
+    sortedcontainers
   ];
 
   nativeCheckInputs = [
-    pandas
     pytestCheckHook
   ];
 
   pythonImportsCheck = [ "pyannote.core" ];
 
-  meta = with lib; {
+  meta = {
     description = "Advanced data structures for handling temporal segments with attached labels";
     homepage = "https://github.com/pyannote/pyannote-core";
     changelog = "https://github.com/pyannote/pyannote-core/releases/tag/${version}";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }

From fa53e34d5d87c7d8cd37cc72704c6f26851403eb Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 3 Nov 2025 10:46:10 +0000
Subject: [PATCH 5002/6226] python3Packages.pyannote-database: 5.0.1 -> 6.1.0

Diff: https://github.com/pyannote/pyannote-database/compare/5.0.1...6.1.0
---
 .../pyannote-database/default.nix             | 44 +++++++++++--------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/pyannote-database/default.nix b/pkgs/development/python-modules/pyannote-database/default.nix
index ddd3ec0ac1d1..8b060139d4a5 100644
--- a/pkgs/development/python-modules/pyannote-database/default.nix
+++ b/pkgs/development/python-modules/pyannote-database/default.nix
@@ -2,53 +2,61 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  hatch-vcs,
+  hatchling,
+
+  # dependencies
   pandas,
   pyannote-core,
-  pythonOlder,
   pyyaml,
-  setuptools,
   typer,
-  versioneer,
+
+  # tests
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pyannote-database";
-  version = "5.0.1";
+  version = "6.1.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "pyannote";
     repo = "pyannote-database";
     tag = version;
-    hash = "sha256-A7Xr24O8OvVAlURrR+SDCh8Uv9Yz3AUJSFDyDShVVjA=";
+    hash = "sha256-WDAkxoSI/IW2nIXCDoKa+p2ep1xcWW6WGNHCCZT51tY=";
   };
 
-  postPatch = ''
-    # Remove vendorized versioneer.py
-    rm versioneer.py
-  '';
-
   build-system = [
-    setuptools
-    versioneer
+    hatch-vcs
+    hatchling
   ];
 
   dependencies = [
+    pandas
     pyannote-core
     pyyaml
-    pandas
+    # Imported in pyannote/database/cli.py
     typer
   ];
 
   pythonImportsCheck = [ "pyannote.database" ];
 
-  meta = with lib; {
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    $out/bin/pyannote-database --help
+  '';
+
+  meta = {
     description = "Reproducible experimental protocols for multimedia (audio, video, text) database";
     homepage = "https://github.com/pyannote/pyannote-database";
-    license = licenses.mit;
-    maintainers = with maintainers; [ matthewcroughan ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ matthewcroughan ];
     mainProgram = "pyannote-database";
   };
 }

From e50d775b892a334401a76ff1f828458a1b7325e6 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 3 Nov 2025 10:53:59 +0000
Subject: [PATCH 5003/6226] python3Packages.pyannote-metrics: 3.3.0 -> 4.0.0

Diff: https://github.com/pyannote/pyannote-metrics/compare/3.3.0...4.0.0

Changelog: http://pyannote.github.io/pyannote-metrics/changelog.html
---
 .../pyannote-metrics/default.nix              | 53 +++++++++++--------
 1 file changed, 32 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/pyannote-metrics/default.nix b/pkgs/development/python-modules/pyannote-metrics/default.nix
index ca463bb216cd..717811aa2a10 100644
--- a/pkgs/development/python-modules/pyannote-metrics/default.nix
+++ b/pkgs/development/python-modules/pyannote-metrics/default.nix
@@ -1,66 +1,77 @@
 {
   lib,
   buildPythonPackage,
-  docopt,
   fetchFromGitHub,
-  matplotlib,
+
+  # build-system
+  hatch-vcs,
+  hatchling,
+
+  # dependencies
   numpy,
   pandas,
   pyannote-core,
   pyannote-database,
-  pythonOlder,
   scikit-learn,
   scipy,
-  setuptools,
-  sympy,
+  # undeclared cli dependencies
+  docopt,
   tabulate,
-  versioneer,
+
+  # tests
+  pytestCheckHook,
+  versionCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pyannote-metrics";
-  version = "3.3.0";
+  version = "4.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "pyannote";
     repo = "pyannote-metrics";
     tag = version;
-    hash = "sha256-tinNdFiUISnzUDnzM8wT3+0W8Dlc9gbCiNoIMo9xNKY=";
+    hash = "sha256-Ga5oSRkVdeQkDnjFcFebdZnFljjyn/TrtV8Y6UJxT2c=";
   };
 
   postPatch = ''
-    # Remove vendorized versioneer.py
-    rm versioneer.py
+    substituteInPlace src/pyannote/metrics/cli.py \
+      --replace-fail \
+        'version="Evaluation"' \
+        'version="${version}"'
   '';
 
   build-system = [
-    setuptools
-    versioneer
+    hatch-vcs
+    hatchling
   ];
 
   dependencies = [
+    numpy
+    pandas
     pyannote-core
     pyannote-database
-    pandas
-    scipy
     scikit-learn
+    scipy
+    # Imported in pyannote/metrics/cli.py
     docopt
     tabulate
-    matplotlib
-    sympy
-    numpy
   ];
 
   pythonImportsCheck = [ "pyannote.metrics" ];
 
-  meta = with lib; {
+  nativeCheckInputs = [
+    pytestCheckHook
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+
+  meta = {
     description = "Toolkit for reproducible evaluation, diagnostic, and error analysis of speaker diarization systems";
     homepage = "https://github.com/pyannote/pyannote-metrics";
     changelog = "http://pyannote.github.io/pyannote-metrics/changelog.html";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "pyannote-metrics";
   };

From 4bc88436ba85d35fd23c7d854a8a11fe1d715197 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 3 Nov 2025 10:56:18 +0000
Subject: [PATCH 5004/6226] python3Packages.pyannote-pipeline: 3.1.2 -> 4.0.0

Diff: https://github.com/pyannote/pyannote-pipeline/compare/3.1.2...4.0.0
---
 .../pyannote-pipeline/default.nix             | 48 ++++++++++++-------
 1 file changed, 32 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/pyannote-pipeline/default.nix b/pkgs/development/python-modules/pyannote-pipeline/default.nix
index f4fef29d0d6a..ecd4c17af84e 100644
--- a/pkgs/development/python-modules/pyannote-pipeline/default.nix
+++ b/pkgs/development/python-modules/pyannote-pipeline/default.nix
@@ -1,58 +1,74 @@
 {
   lib,
   buildPythonPackage,
-  docopt,
   fetchFromGitHub,
+
+  # build-system
+  hatch-vcs,
+  hatchling,
+
+  # dependencies
+  docopt,
   filelock,
   optuna,
   pyannote-core,
   pyannote-database,
   pyyaml,
-  scikit-learn,
-  setuptools,
+  scipy,
   tqdm,
-  versioneer,
+
+  # tests
+  pytestCheckHook,
+  versionCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pyannote-pipeline";
-  version = "3.1.2";
+  version = "4.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyannote";
     repo = "pyannote-pipeline";
     tag = version;
-    hash = "sha256-MMMwZMxu8viUt2DgCgymbz2vEMM9TT0ySKL2KPzAPLA=";
+    hash = "sha256-H2yIeCKhZFUkZXww+eaRKMzJrbALdARady02fq/pJrU=";
   };
 
   postPatch = ''
-    # Remove vendorized versioeer.py
-    rm versioneer.py
+    substituteInPlace src/pyannote/pipeline/experiment.py \
+      --replace-fail \
+        'version="Tunable pipelines"' \
+        'version="${version}"'
   '';
 
   build-system = [
-    setuptools
-    versioneer
+    hatch-vcs
+    hatchling
   ];
 
   dependencies = [
+    docopt # imported in pyannote/pipeline/experiment.py
+    filelock
+    optuna
     pyannote-core
     pyannote-database
     pyyaml
-    optuna
+    scipy # imported in pyannote/pipeline/optimizer.py
     tqdm
-    docopt
-    filelock
-    scikit-learn
   ];
 
   pythonImportsCheck = [ "pyannote.pipeline" ];
 
-  meta = with lib; {
+  nativeCheckInputs = [
+    pytestCheckHook
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+
+  meta = {
     description = "Tunable pipelines";
     homepage = "https://github.com/pyannote/pyannote-pipeline";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "pyannote-pipeline";
   };

From 298c1dad1d827a0acc822e54dd72b6e3825d1f5a Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 2 Nov 2025 17:14:03 +0000
Subject: [PATCH 5005/6226] python3Packages.pyannote-audio: cleanup

---
 .../python-modules/pyannote-audio/default.nix | 48 ++++++++++---------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/pkgs/development/python-modules/pyannote-audio/default.nix b/pkgs/development/python-modules/pyannote-audio/default.nix
index cb84291abbc4..3d7f4c5ea2ec 100644
--- a/pkgs/development/python-modules/pyannote-audio/default.nix
+++ b/pkgs/development/python-modules/pyannote-audio/default.nix
@@ -1,31 +1,36 @@
 {
   lib,
-  asteroid-filterbanks,
   buildPythonPackage,
-  einops,
   fetchFromGitHub,
+
+  # build-system
+  pyscaffold,
+  setuptools,
+
+  # dependencies
+  asteroid-filterbanks,
+  einops,
   huggingface-hub,
-  hydra-core,
   numpy,
   omegaconf,
   pyannote-core,
   pyannote-database,
   pyannote-metrics,
   pyannote-pipeline,
-  pyscaffold,
-  pythonOlder,
   pytorch-lightning,
   pytorch-metric-learning,
   rich,
   semver,
-  setuptools,
   soundfile,
   speechbrain,
   tensorboardx,
-  torch-audiomentations,
   torch,
+  torch-audiomentations,
   torchaudio,
   torchmetrics,
+
+  # optional-dependencies
+  hydra-core,
   typer,
 }:
 
@@ -34,23 +39,14 @@ buildPythonPackage rec {
   version = "3.4.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "pyannote";
     repo = "pyannote-audio";
     tag = version;
-    hash = "sha256-NnwJJasObePBYWBnuVzOLFz2eqOHoOA6W5CzAEpkDV4=";
     fetchSubmodules = true;
+    hash = "sha256-NnwJJasObePBYWBnuVzOLFz2eqOHoOA6W5CzAEpkDV4=";
   };
 
-  pythonRelaxDeps = [ "torchaudio" ];
-
-  build-system = [
-    pyscaffold
-    setuptools
-  ];
-
   postPatch = ''
     substituteInPlace setup.cfg \
       --replace-fail "pyscaffold>=3.2a0,<3.3a0" "pyscaffold"
@@ -58,15 +54,25 @@ buildPythonPackage rec {
       --replace-fail "lightning" "pytorch-lightning"
   '';
 
+  build-system = [
+    pyscaffold
+    setuptools
+  ];
+
+  pythonRelaxDeps = [
+    "torchaudio"
+  ];
   dependencies = [
     asteroid-filterbanks
     einops
     huggingface-hub
+    numpy
     omegaconf
     pyannote-core
     pyannote-database
     pyannote-metrics
     pyannote-pipeline
+    pytorch-lightning
     pytorch-metric-learning
     rich
     semver
@@ -77,8 +83,6 @@ buildPythonPackage rec {
     torch-audiomentations
     torchaudio
     torchmetrics
-    numpy
-    pytorch-lightning
   ];
 
   optional-dependencies = {
@@ -90,11 +94,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pyannote.audio" ];
 
-  meta = with lib; {
+  meta = {
     description = "Neural building blocks for speaker diarization: speech activity detection, speaker change detection, overlapped speech detection, speaker embedding";
     homepage = "https://github.com/pyannote/pyannote-audio";
-    changelog = "https://github.com/pyannote/pyannote-audio/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.mit;
+    changelog = "https://github.com/pyannote/pyannote-audio/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.mit;
     maintainers = [ ];
   };
 }

From 2e6703683b83ff9a09c5993965a467c717ed16b7 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 2 Nov 2025 17:17:54 +0000
Subject: [PATCH 5006/6226] python3Packages.pyannote-audio: add GaetanLepage to
 maintainers

---
 pkgs/development/python-modules/pyannote-audio/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/pyannote-audio/default.nix b/pkgs/development/python-modules/pyannote-audio/default.nix
index 3d7f4c5ea2ec..49e58b4a2708 100644
--- a/pkgs/development/python-modules/pyannote-audio/default.nix
+++ b/pkgs/development/python-modules/pyannote-audio/default.nix
@@ -99,6 +99,8 @@ buildPythonPackage rec {
     homepage = "https://github.com/pyannote/pyannote-audio";
     changelog = "https://github.com/pyannote/pyannote-audio/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [
+      GaetanLepage
+    ];
   };
 }

From d75c5917ad87010771d907df609baf7b7d336346 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 2 Nov 2025 17:18:04 +0000
Subject: [PATCH 5007/6226] python3Packages.pyannote-audio: 3.4.0 -> 4.0.1

Diff: https://github.com/pyannote/pyannote-audio/compare/3.4.0...4.0.1

Changelog: https://github.com/pyannote/pyannote-audio/blob/4.0.1/CHANGELOG.md
---
 .../python-modules/pyannote-audio/default.nix | 81 +++++++++++++------
 1 file changed, 58 insertions(+), 23 deletions(-)

diff --git a/pkgs/development/python-modules/pyannote-audio/default.nix b/pkgs/development/python-modules/pyannote-audio/default.nix
index 49e58b4a2708..ea4a25888d37 100644
--- a/pkgs/development/python-modules/pyannote-audio/default.nix
+++ b/pkgs/development/python-modules/pyannote-audio/default.nix
@@ -1,42 +1,50 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
   # build-system
-  pyscaffold,
-  setuptools,
+  hatchling,
+  hatch-vcs,
 
   # dependencies
   asteroid-filterbanks,
   einops,
   huggingface-hub,
-  numpy,
-  omegaconf,
+  lightning,
+  matplotlib,
+  opentelemetry-api,
+  opentelemetry-exporter-otlp,
+  opentelemetry-sdk,
   pyannote-core,
   pyannote-database,
   pyannote-metrics,
   pyannote-pipeline,
-  pytorch-lightning,
+  pyannoteai-sdk,
   pytorch-metric-learning,
-  rich,
-  semver,
+  safetensors,
   soundfile,
   speechbrain,
   tensorboardx,
   torch,
   torch-audiomentations,
   torchaudio,
+  torchcodec,
   torchmetrics,
 
   # optional-dependencies
   hydra-core,
   typer,
+
+  # tests
+  papermill,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
   pname = "pyannote-audio";
-  version = "3.4.0";
+  version = "4.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -44,19 +52,12 @@ buildPythonPackage rec {
     repo = "pyannote-audio";
     tag = version;
     fetchSubmodules = true;
-    hash = "sha256-NnwJJasObePBYWBnuVzOLFz2eqOHoOA6W5CzAEpkDV4=";
+    hash = "sha256-hYrwpph+Powt+AuQjKo0kkBW+5jJGfzGTILzL9j22YI=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.cfg \
-      --replace-fail "pyscaffold>=3.2a0,<3.3a0" "pyscaffold"
-    substituteInPlace requirements.txt \
-      --replace-fail "lightning" "pytorch-lightning"
-  '';
-
   build-system = [
-    pyscaffold
-    setuptools
+    hatchling
+    hatch-vcs
   ];
 
   pythonRelaxDeps = [
@@ -66,22 +67,25 @@ buildPythonPackage rec {
     asteroid-filterbanks
     einops
     huggingface-hub
-    numpy
-    omegaconf
+    lightning
+    matplotlib
+    opentelemetry-api
+    opentelemetry-exporter-otlp
+    opentelemetry-sdk
     pyannote-core
     pyannote-database
     pyannote-metrics
     pyannote-pipeline
-    pytorch-lightning
+    pyannoteai-sdk
     pytorch-metric-learning
-    rich
-    semver
+    safetensors
     soundfile
     speechbrain
     tensorboardx
     torch
     torch-audiomentations
     torchaudio
+    torchcodec
     torchmetrics
   ];
 
@@ -94,6 +98,37 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "pyannote.audio" ];
 
+  nativeCheckInputs = [
+    papermill
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    $out/bin/pyannote-audio --help
+  '';
+
+  disabledTests = [
+    # Require internet access
+    "test_hf_download_inference"
+    "test_hf_download_model"
+    "test_import_speechbrain_encoder_classifier"
+    "test_skip_aggregation"
+    "test_unknown_specifications_error_raised_on_non_setup_model_task"
+
+    # AttributeError: module 'torchaudio' has no attribute 'info'
+    # Removed in torchaudio v2.9.0
+    # See https://github.com/pytorch/audio/issues/3902 for context
+    "test_audio_resample"
+  ];
+
+  disabledTestPaths = lib.optionals stdenv.hostPlatform.isDarwin [
+    # Crashes the interpreter
+    # - On aarch64-darwin: Trace/BPT trap: 5
+    # - On x86_64-darwin: Fatal Python error: Illegal instruction
+    "tests/inference_test.py"
+    "tests/test_train.py"
+  ];
+
   meta = {
     description = "Neural building blocks for speaker diarization: speech activity detection, speaker change detection, overlapped speech detection, speaker embedding";
     homepage = "https://github.com/pyannote/pyannote-audio";

From ea8dce45ea650564ca768c82d71009c7d2620314 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 3 Nov 2025 12:11:30 +0000
Subject: [PATCH 5008/6226] python3Packages.lightning: cleanup

---
 pkgs/development/python-modules/lightning/default.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/lightning/default.nix b/pkgs/development/python-modules/lightning/default.nix
index e3a096c9163b..7d2bf3cd046a 100644
--- a/pkgs/development/python-modules/lightning/default.nix
+++ b/pkgs/development/python-modules/lightning/default.nix
@@ -1,10 +1,5 @@
 {
-  lib,
   buildPythonPackage,
-  fetchFromGitHub,
-
-  # build-system
-  setuptools,
 
   # dependencies
   pytorch-lightning,
@@ -32,7 +27,7 @@ buildPythonPackage {
     pytestCheckHook
   ];
 
-  # Some packages are not in NixPkgs; other tests try to build distributed
+  # Some packages are not in nixpkgs; other tests try to build distributed
   # models, which doesn't work in the sandbox.
   doCheck = false;
 

From 59d0e803a2625446d3291f398e586123376f5eff Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 3 Nov 2025 12:24:56 +0000
Subject: [PATCH 5009/6226] python3Packages.whisperx: 3.4.3 -> 3.7.4

Diff: https://github.com/m-bain/whisperX/compare/v3.4.3...v3.7.4

Changelog: https://github.com/m-bain/whisperX/releases/tag/v3.7.4
---
 .../python-modules/whisperx/default.nix       | 48 +++++++++++--------
 1 file changed, 27 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/whisperx/default.nix b/pkgs/development/python-modules/whisperx/default.nix
index 335ad245075e..5d6455de1321 100644
--- a/pkgs/development/python-modules/whisperx/default.nix
+++ b/pkgs/development/python-modules/whisperx/default.nix
@@ -8,14 +8,17 @@
   setuptools,
 
   # dependencies
+  av,
   ctranslate2,
   faster-whisper,
   nltk,
+  numpy,
   pandas,
   pyannote-audio,
   torch,
   torchaudio,
   transformers,
+  triton,
 
   # native packages
   ffmpeg,
@@ -35,29 +38,16 @@ let
 in
 buildPythonPackage rec {
   pname = "whisperx";
-  version = "3.4.3";
+  version = "3.7.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "m-bain";
     repo = "whisperX";
     tag = "v${version}";
-    hash = "sha256-zx77Fx8KYTWCFcC6Uy6pbe8LJtXP3b6lkwuOSEEYJfU=";
+    hash = "sha256-wmCGHRx1JaOs5+7fp2jeh8PIR5dlmOl8hKrIw2550Bk=";
   };
 
-  build-system = [ setuptools ];
-
-  dependencies = [
-    ctranslate
-    faster-whisper
-    nltk
-    pandas
-    pyannote-audio # Missing from pyproject.toml, but used in `whisperx/vad.py`
-    torch
-    torchaudio
-    transformers
-  ];
-
   # As `makeWrapperArgs` does not apply to the module, and whisperx depends on `ffmpeg`,
   # we replace the `"ffmpeg"` string in `subprocess.run` with the full path to the binary.
   # This works for both the program and the module.
@@ -67,13 +57,29 @@ buildPythonPackage rec {
       '"ffmpeg"' '"${lib.getExe ffmpeg}"'
   '';
 
-  pythonRelaxDeps = [
-    # > Checking runtime dependencies for whisperx-3.3.2-py3-none-any.whl
-    # >   - faster-whisper==1.1.0 not satisfied by version 1.1.1
-    # This has been updated on main, so we expect this clause to be removed upon the next update.
-    "faster-whisper"
+  build-system = [ setuptools ];
 
-    "ctranslate2"
+  pythonRelaxDeps = [
+    "numpy"
+    "pandas"
+    "pyannote-audio"
+    "torch"
+    "torchaudio"
+  ];
+  dependencies = [
+    av
+    ctranslate
+    faster-whisper
+    nltk
+    numpy
+    pandas
+    pyannote-audio
+    torch
+    torchaudio
+    transformers
+  ]
+  ++ lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64) [
+    triton
   ];
 
   # Import check fails due on `aarch64-linux` ONLY in the sandbox due to onnxruntime

From c99035ccef66bf6d08e33cc6be6d6c87474b140a Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Mon, 3 Nov 2025 13:51:58 +0100
Subject: [PATCH 5010/6226] nixos/tests/nix-store-veritysetup: fix warnings

---
 nixos/tests/nix-store-veritysetup.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nixos/tests/nix-store-veritysetup.nix b/nixos/tests/nix-store-veritysetup.nix
index 3b6a5e6a734f..031e1260e947 100644
--- a/nixos/tests/nix-store-veritysetup.nix
+++ b/nixos/tests/nix-store-veritysetup.nix
@@ -18,7 +18,7 @@
         partitions = {
           "nix-store" = {
             storePaths = [ config.system.build.toplevel ];
-            stripNixStorePrefix = true;
+            nixStorePrefix = "/";
             repartConfig = {
               Type = "linux-generic";
               Label = "nix-store";
@@ -89,7 +89,7 @@
         "-f",
         "qcow2",
         "-b",
-        "${nodes.machine.system.build.image}/${nodes.machine.image.repart.imageFile}",
+        "${nodes.machine.system.build.image}/${nodes.machine.image.fileName}",
         "-F",
         "raw",
         tmp_disk_image.name,

From 51989ac4bafe4b76ef525f74544b5399340677fc Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Mon, 3 Nov 2025 13:52:20 +0100
Subject: [PATCH 5011/6226] nix-store-veritysetup-generator: 0.1.0 -> 1.0.0

---
 pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
index 729ede08f014..746f24097372 100644
--- a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
+++ b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
@@ -7,13 +7,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nix-store-veritysetup-generator";
-  version = "0.1.0";
+  version = "1.0.0";
 
   src = fetchFromGitHub {
     owner = "nikstur";
     repo = "nix-store-veritysetup-generator";
     rev = version;
-    hash = "sha256-kQ+mFBnvxmEH2+z1sDaehGInEsBpfZu8LMAseGjZ3/I=";
+    hash = "sha256-RTGdcLn4zuZAcC1Td4gJcywIerCYyaD0JYz8g5ybmho=";
   };
 
   sourceRoot = "${src.name}/rust";

From faa785b02291b95aceeab3c1e638c992a79189b0 Mon Sep 17 00:00:00 2001
From: nikstur <nikstur@outlook.com>
Date: Mon, 3 Nov 2025 13:59:44 +0100
Subject: [PATCH 5012/6226] nix-store-veritysetup-generator: add VM test to
 passthru

---
 pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
index 746f24097372..bff81aff6347 100644
--- a/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
+++ b/pkgs/by-name/ni/nix-store-veritysetup-generator/package.nix
@@ -3,6 +3,7 @@
   rustPlatform,
   fetchFromGitHub,
   systemd,
+  nixosTests,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -34,6 +35,10 @@ rustPlatform.buildRustPackage rec {
 
   stripAllList = [ "bin" ];
 
+  passthru.tests = {
+    inherit (nixosTests) nix-store-veritysetup;
+  };
+
   meta = with lib; {
     description = "Systemd unit generator for a verity protected Nix Store";
     homepage = "https://github.com/nikstur/nix-store-veritysetup-generator";

From 1d496c1fa65be0cd042337e63ca6accd79eb6938 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 13:18:39 +0000
Subject: [PATCH 5013/6226] cnspec: 12.7.0 -> 12.7.1

---
 pkgs/by-name/cn/cnspec/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix
index 29903eecd4c8..5210397c707c 100644
--- a/pkgs/by-name/cn/cnspec/package.nix
+++ b/pkgs/by-name/cn/cnspec/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnspec";
-  version = "12.7.0";
+  version = "12.7.1";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnspec";
     tag = "v${version}";
-    hash = "sha256-IQ+DwgWEVrMnkgAgHjFg/NDn2mkHggnlT3xgbSvN/pU=";
+    hash = "sha256-IriF6vr2Kw7h44zFd7hMhybseqtlYepjfQl+Z54fdbQ=";
   };
 
   proxyVendor = true;
 
-  vendorHash = "sha256-0VoGgBBgloUG6NppX1muNqAyZdzyrc9Tcs3wNaLRdVY=";
+  vendorHash = "sha256-P0spAsBp3jv0Nn4gVYTd+5WbWQgGZ83fyzxT3i0ncHs=";
 
   subPackages = [ "apps/cnspec" ];
 

From fc3665f74a7b9f8a8a241bc783d8817a826d452b Mon Sep 17 00:00:00 2001
From: WilliButz <willibutz@posteo.de>
Date: Mon, 3 Nov 2025 13:50:24 +0100
Subject: [PATCH 5014/6226] botan3: fix selection of stdenv variant for static
 builds

Apparently with the move to by-name broke stdenv selection in such a way
that the resulting library archive from `pkgsStatic.botan3` no longer
was suitable for static linking, resulting in linking errors:

```
/nix/store/<...>-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: cannot find -lbz2: No such file
/nix/store/<...>-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: have you installed the static ve
/nix/store/<...>-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: cannot find -ljitterentropy: No
/nix/store/<...>-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: have you installed the static ve
/nix/store/<...>-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: cannot find -lz: No such file or
/nix/store/<...>-x86_64-unknown-linux-musl-binutils-2.44/bin/x86_64-unknown-linux-musl-ld: have you installed the static ve
```

Co-authored-by: Maximilian Bosch <maximilian@mbosch.me>
---
 pkgs/by-name/bo/botan3/package.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/bo/botan3/package.nix b/pkgs/by-name/bo/botan3/package.nix
index 084eb1face8b..df822c92caa7 100644
--- a/pkgs/by-name/bo/botan3/package.nix
+++ b/pkgs/by-name/bo/botan3/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  buildPackages,
+  libcxxStdenv,
   fetchurl,
   pkgsStatic,
   python3,
@@ -9,7 +9,6 @@
   bzip2,
   zlib,
   jitterentropy,
-  darwin,
   esdm,
   tpm2-tss,
   static ? stdenv.hostPlatform.isStatic, # generates static libraries *only*
@@ -20,7 +19,7 @@
   # useful, but have to disable tests for now, as /dev/tpmrm0 is not accessible
   withTpm2 ? false,
   policy ? null,
-}:
+}@args:
 
 assert lib.assertOneOf "policy" policy [
   # no explicit policy is given. The defaults by the library are used
@@ -32,11 +31,10 @@ assert lib.assertOneOf "policy" policy [
   # only allow "modern" algorithms
   "modern"
 ];
-
 let
-  stdenv' = if static then buildPackages.libcxxStdenv else stdenv;
+  stdenv = if static then libcxxStdenv else args.stdenv;
 in
-stdenv'.mkDerivation (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   version = "3.9.0";
   pname = "botan";
 

From c8a230069b95520abc24a2c3daa51956e21411a8 Mon Sep 17 00:00:00 2001
From: WilliButz <willibutz@posteo.de>
Date: Mon, 3 Nov 2025 11:44:45 +0100
Subject: [PATCH 5015/6226] botan3: fix static cli build through
 empty-libgcc_eh workaround

Prior to this commit the build of `pkgsStatic.botan3.bin` produced a
dynamically linked binary, indenpendently of the move to
`pkgs/by-name`. Previous commit message and comments also suggest this
it was expected for the static build to only produce the static library,
not the statically linked cli.
---
 pkgs/by-name/bo/botan3/package.nix | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/bo/botan3/package.nix b/pkgs/by-name/bo/botan3/package.nix
index df822c92caa7..04fdafff9153 100644
--- a/pkgs/by-name/bo/botan3/package.nix
+++ b/pkgs/by-name/bo/botan3/package.nix
@@ -4,6 +4,8 @@
   libcxxStdenv,
   fetchurl,
   pkgsStatic,
+  runCommandLocal,
+  binutils,
   python3,
   docutils,
   bzip2,
@@ -11,7 +13,7 @@
   jitterentropy,
   esdm,
   tpm2-tss,
-  static ? stdenv.hostPlatform.isStatic, # generates static libraries *only*
+  static ? stdenv.hostPlatform.isStatic,
   windows,
 
   # build ESDM RNG plugin
@@ -33,6 +35,21 @@ assert lib.assertOneOf "policy" policy [
 ];
 let
   stdenv = if static then libcxxStdenv else args.stdenv;
+
+  # (based on same workaround from capnproto package)
+  #
+  # HACK: work around https://github.com/NixOS/nixpkgs/issues/177129
+  # Though this is an issue between Clang and GCC,
+  # so it may not get fixed anytime soon...
+  empty-libgcc_eh =
+    runCommandLocal "empty-libgcc_eh"
+      {
+        nativeBuildInputs = [ binutils ];
+      }
+      ''
+        mkdir -p "$out"/lib
+        ${stdenv.cc.targetPrefix}ar r "$out"/lib/libgcc_eh.a
+      '';
 in
 stdenv.mkDerivation (finalAttrs: {
   version = "3.9.0";
@@ -80,6 +97,8 @@ stdenv.mkDerivation (finalAttrs: {
     windows.pthreads
   ];
 
+  propagatedBuildInputs = lib.optional static empty-libgcc_eh;
+
   buildTargets = [
     "cli"
   ]

From 4ab091862ab9f03a867d7ad34c7dfbbcae31db27 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 29 Oct 2025 21:26:04 +0800
Subject: [PATCH 5016/6226] fetchurl: take derivationArgs

---
 pkgs/build-support/fetchurl/default.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 88e7bfaa7809..b9a640563e36 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -60,6 +60,9 @@ lib.extendMkDerivation {
     # Passed via passthru
     "url"
 
+    # Additional stdenv.mkDerivation arguments from derived fetchers.
+    "derivationArgs"
+
     # Hash attributes will be map to the corresponding outputHash*
     "hash"
     "sha1"
@@ -139,6 +142,11 @@ lib.extendMkDerivation {
 
       # Additional packages needed as part of a fetch
       nativeBuildInputs ? [ ],
+
+      # Additional stdenvNoCC.mkDerivation arguments.
+      # It is typically for derived fetchers to pass down additional arguments,
+      # and the specified arguments have lower precedence than other mkDerivation arguments.
+      derivationArgs ? { },
     }@args:
 
     let
@@ -228,7 +236,8 @@ lib.extendMkDerivation {
           "${lib.head mirrorList}${lib.elemAt mirrorSplit 1}";
     in
 
-    {
+    derivationArgs
+    // {
       name =
         if pname != null && version != null then
           "${finalAttrs.pname}-${finalAttrs.version}"

From b29af41b6e685738ac710000f51d4b56954413bf Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 29 Oct 2025 21:35:31 +0800
Subject: [PATCH 5017/6226] fetchzip: make overridable extension and stripRoot
 with derivationArgs

---
 pkgs/build-support/fetchzip/default.nix | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix
index 830f68085f76..d25f1f0e3943 100644
--- a/pkgs/build-support/fetchzip/default.nix
+++ b/pkgs/build-support/fetchzip/default.nix
@@ -20,7 +20,7 @@ lib.extendMkDerivation {
   excludeDrvArgNames = [
     "extraPostFetch"
 
-    # TODO(@ShamrockLee): Move these arguments to derivationArgs when available.
+    # Pass via derivationArgs
     "extension"
     "stripRoot"
   ];
@@ -48,8 +48,8 @@ lib.extendMkDerivation {
 
     let
       tmpFilename =
-        if extension != null then
-          "download.${extension}"
+        if finalAttrs.extension != null then
+          "download.${finalAttrs.extension}"
         else
           baseNameOf (if url != "" then url else builtins.head urls);
     in
@@ -81,7 +81,7 @@ lib.extendMkDerivation {
         chmod -R +w "$unpackDir"
       ''
       + (
-        if stripRoot then
+        if finalAttrs.stripRoot then
           ''
             if [ $(ls -A "$unpackDir" | wc -l) != 1 ]; then
               echo "error: zip file must contain a single file or directory."
@@ -109,5 +109,12 @@ lib.extendMkDerivation {
       '';
       # ^ Remove non-owner write permissions
       # Fixes https://github.com/NixOS/nixpkgs/issues/38649
+
+      derivationArgs = {
+        inherit
+          extension
+          stripRoot
+          ;
+      };
     };
 }

From 0fc9eec2e5d2cf8e69be5516752ffa657ab36336 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 29 Oct 2025 21:36:33 +0800
Subject: [PATCH 5018/6226] fetchzip: take derivationArgs

---
 pkgs/build-support/fetchzip/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix
index d25f1f0e3943..4376fef41085 100644
--- a/pkgs/build-support/fetchzip/default.nix
+++ b/pkgs/build-support/fetchzip/default.nix
@@ -42,6 +42,11 @@ lib.extendMkDerivation {
       # an appropriate unpacking tool.
       extension ? null,
 
+      # Additional stdenvNoCC.mkDerivation arguments.
+      # It is typically for derived fetchers to pass down additional arguments,
+      # and the specified arguments have lower precedence than other mkDerivation arguments.
+      derivationArgs ? { },
+
       # the rest are given to fetchurl as is
       ...
     }@args:
@@ -110,7 +115,7 @@ lib.extendMkDerivation {
       # ^ Remove non-owner write permissions
       # Fixes https://github.com/NixOS/nixpkgs/issues/38649
 
-      derivationArgs = {
+      derivationArgs = derivationArgs // {
         inherit
           extension
           stripRoot

From 38f61c3f10b92e92933a5e048a93618493527c35 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 29 Oct 2025 21:39:21 +0800
Subject: [PATCH 5019/6226] fetchgit: take derivationArgs

---
 pkgs/build-support/fetchgit/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 4ffb998ee205..e3566f5627ee 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -30,6 +30,9 @@ lib.makeOverridable (
       # Passed via `passthru`
       "tag"
 
+      # Additional stdenv.mkDerivation arguments from derived fetchers.
+      "derivationArgs"
+
       # Hashes, handled by `lib.fetchers.withNormalizedHash`
       # whose outputs contain outputHash* attributes.
       "hash"
@@ -84,6 +87,10 @@ lib.makeOverridable (
           rootDir ? "",
           # GIT_CONFIG_GLOBAL (as a file)
           gitConfigFile ? config.gitConfigFile,
+          # Additional stdenvNoCC.mkDerivation arguments.
+          # It is typically for derived fetchers to pass down additional arguments,
+          # and the specified arguments have lower precedence than other mkDerivation arguments.
+          derivationArgs ? { },
         }:
 
         /*
@@ -135,7 +142,8 @@ lib.makeOverridable (
           throw
             "Please provide directories/patterns for sparse checkout as a list of strings. Passing a (multi-line) string is not supported any more."
         else
-          {
+          derivationArgs
+          // {
             inherit name;
 
             builder = ./builder.sh;

From 076076e946319c40a9f787dc0a148c6025d73906 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 29 Oct 2025 21:52:38 +0800
Subject: [PATCH 5020/6226] fetchgit: abstract and simplify revWithTag

---
 pkgs/build-support/fetchgit/default.nix | 34 ++++++++++++-------------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index e3566f5627ee..80d56ff501ca 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -20,6 +20,21 @@ let
       appendShort = lib.optionalString ((builtins.match "[a-f0-9]*" rev) != null) "-${shortRev}";
     in
     "${lib.sources.urlToName url}${if append == "" then appendShort else append}";
+
+  getRevWithTag =
+    {
+      rev ? null,
+      tag ? null,
+    }:
+    if tag != null && rev != null then
+      throw "fetchgit requires one of either `rev` or `tag` to be provided (not both)."
+    else if tag != null then
+      "refs/tags/${tag}"
+    else if rev != null then
+      rev
+    else
+      # FIXME fetching HEAD if no rev or tag is provided is problematic at best
+      "HEAD";
 in
 
 lib.makeOverridable (
@@ -120,23 +135,6 @@ lib.makeOverridable (
         assert fetchTags -> leaveDotGit;
         assert rootDir != "" -> !leaveDotGit;
 
-        let
-          revWithTag =
-            let
-              warningMsg = "fetchgit requires one of either `rev` or `tag` to be provided (not both).";
-              otherIsNull = other: lib.assertMsg (other == null) warningMsg;
-            in
-            if tag != null then
-              assert (otherIsNull rev);
-              "refs/tags/${tag}"
-            else if rev != null then
-              assert (otherIsNull tag);
-              rev
-            else
-              # FIXME fetching HEAD if no rev or tag is provided is problematic at best
-              "HEAD";
-        in
-
         if builtins.isString sparseCheckout then
           # Changed to throw on 2023-06-04
           throw
@@ -178,7 +176,7 @@ lib.makeOverridable (
               rootDir
               gitConfigFile
               ;
-            rev = revWithTag;
+            rev = getRevWithTag { inherit tag rev; };
 
             postHook =
               if netrcPhase == null then

From dbf76b7c1befc9702c8ba81ef3f5448ba4642b1e Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 29 Oct 2025 21:55:50 +0800
Subject: [PATCH 5021/6226] fetchgit: pass tag directly and make overridable

---
 pkgs/build-support/fetchgit/default.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 80d56ff501ca..9b6085f1c7fd 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -42,9 +42,6 @@ lib.makeOverridable (
     constructDrv = stdenvNoCC.mkDerivation;
 
     excludeDrvArgNames = [
-      # Passed via `passthru`
-      "tag"
-
       # Additional stdenv.mkDerivation arguments from derived fetchers.
       "derivationArgs"
 
@@ -65,7 +62,7 @@ lib.makeOverridable (
           rev ? null,
           name ? urlToName {
             inherit url;
-            rev = lib.revOrTag rev tag;
+            rev = lib.revOrTag rev finalAttrs.tag;
             # when rootDir is specified, avoid invalidating the result when rev changes
             append = if rootDir != "" then "-${lib.strings.sanitizeDerivationName rootDir}" else "";
           },
@@ -176,7 +173,11 @@ lib.makeOverridable (
               rootDir
               gitConfigFile
               ;
-            rev = getRevWithTag { inherit tag rev; };
+            inherit tag;
+            rev = getRevWithTag {
+              inherit (finalAttrs) tag;
+              inherit rev;
+            };
 
             postHook =
               if netrcPhase == null then
@@ -216,7 +217,6 @@ lib.makeOverridable (
 
             passthru = {
               gitRepoUrl = url;
-              inherit tag;
             }
             // passthru;
           }

From 21677a6bd861ff4b15389dc909bae58201de86ec Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 29 Oct 2025 21:59:05 +0800
Subject: [PATCH 5022/6226] fetchgit: pass rev as revCustom and make
 overridable

---
 pkgs/build-support/fetchgit/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 9b6085f1c7fd..445b11347c63 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -62,7 +62,7 @@ lib.makeOverridable (
           rev ? null,
           name ? urlToName {
             inherit url;
-            rev = lib.revOrTag rev finalAttrs.tag;
+            rev = lib.revOrTag finalAttrs.revCustom finalAttrs.tag;
             # when rootDir is specified, avoid invalidating the result when rev changes
             append = if rootDir != "" then "-${lib.strings.sanitizeDerivationName rootDir}" else "";
           },
@@ -174,9 +174,10 @@ lib.makeOverridable (
               gitConfigFile
               ;
             inherit tag;
+            revCustom = rev;
             rev = getRevWithTag {
               inherit (finalAttrs) tag;
-              inherit rev;
+              rev = finalAttrs.revCustom;
             };
 
             postHook =

From 29465554113e2b7bb110c27ab436bf551acb239a Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 29 Oct 2025 22:01:21 +0800
Subject: [PATCH 5023/6226] fetchgit: expose getRevWithTag as
 fetchgit.getRevWithTag

---
 pkgs/build-support/fetchgit/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix
index 445b11347c63..5a8ea3cf0488 100644
--- a/pkgs/build-support/fetchgit/default.nix
+++ b/pkgs/build-support/fetchgit/default.nix
@@ -227,3 +227,6 @@ lib.makeOverridable (
     inheritFunctionArgs = false;
   }
 )
+// {
+  inherit getRevWithTag;
+}

From e0ba367c2bfc078426b746ec0c3d8275b7b40f68 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 29 Oct 2025 22:01:57 +0800
Subject: [PATCH 5024/6226] fetchFromGitHub: pass meta via fetcherArgs

---
 pkgs/build-support/fetchgithub/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix
index c25c86e6f772..e25ee6bc53ed 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/pkgs/build-support/fetchgithub/default.nix
@@ -158,12 +158,12 @@ lib.makeOverridable (
       // privateAttrs
       // {
         inherit name;
+        meta = newMeta;
       };
   in
 
   fetcher fetcherArgs
   // {
-    meta = newMeta;
     inherit owner repo tag;
     rev = revWithTag;
   }

From dd9af80094766dbbf27364b0cb81d53f21d383f0 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 29 Oct 2025 22:09:11 +0800
Subject: [PATCH 5025/6226] fetchFromGitHub: pass owner and repo via
 derivationArgs

---
 pkgs/build-support/fetchgithub/default.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix
index e25ee6bc53ed..481de15afa91 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/pkgs/build-support/fetchgithub/default.nix
@@ -113,6 +113,7 @@ lib.makeOverridable (
     revWithTag = if tag != null then "refs/tags/${tag}" else rev;
 
     fetcherArgs =
+      finalAttrs:
       passthruAttrs
       // (
         if useFetchGit then
@@ -127,6 +128,12 @@ lib.makeOverridable (
               ;
             url = gitRepoUrl;
             inherit passthru;
+            derivationArgs = {
+              inherit
+                owner
+                repo
+                ;
+            };
           }
           // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; }
         else
@@ -139,7 +146,7 @@ lib.makeOverridable (
             url =
               if private then
                 let
-                  endpoint = "/repos/${owner}/${repo}/tarball/${revWithTag}";
+                  endpoint = "/repos/${finalAttrs.owner}/${finalAttrs.repo}/tarball/${revWithTag}";
                 in
                 if githubBase == "github.com" then
                   "https://api.github.com${endpoint}"
@@ -148,7 +155,12 @@ lib.makeOverridable (
               else
                 "${baseUrl}/archive/${revWithTag}.tar.gz";
             extension = "tar.gz";
-
+            derivationArgs = {
+              inherit
+                owner
+                repo
+                ;
+            };
             passthru = {
               inherit gitRepoUrl;
             }

From 3754cf57cf224d5d6d4ac753cba052fe23451e34 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 29 Oct 2025 22:11:54 +0800
Subject: [PATCH 5026/6226] fetchFromGitHub: pass tag to mkDerivation uniformly

---
 pkgs/build-support/fetchgithub/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix
index 481de15afa91..ea40c6adbd55 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/pkgs/build-support/fetchgithub/default.nix
@@ -159,6 +159,7 @@ lib.makeOverridable (
               inherit
                 owner
                 repo
+                tag
                 ;
             };
             passthru = {
@@ -176,7 +177,6 @@ lib.makeOverridable (
 
   fetcher fetcherArgs
   // {
-    inherit owner repo tag;
     rev = revWithTag;
   }
 )

From aede4d203cdb2a3d2d0cecb1d56320538e123a70 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 29 Oct 2025 22:16:10 +0800
Subject: [PATCH 5027/6226] fetchFromGitHub: pass rev uniformly

---
 pkgs/build-support/fetchgithub/default.nix | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix
index ea40c6adbd55..4c3ea354fa68 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/pkgs/build-support/fetchgithub/default.nix
@@ -110,8 +110,6 @@ lib.makeOverridable (
 
     gitRepoUrl = "${baseUrl}.git";
 
-    revWithTag = if tag != null then "refs/tags/${tag}" else rev;
-
     fetcherArgs =
       finalAttrs:
       passthruAttrs
@@ -137,6 +135,9 @@ lib.makeOverridable (
           }
           // lib.optionalAttrs (leaveDotGit != null) { inherit leaveDotGit; }
         else
+          let
+            revWithTag = finalAttrs.rev;
+          in
           {
             # Use the API endpoint for private repos, as the archive URI doesn't
             # support access with GitHub's fine-grained access tokens.
@@ -161,6 +162,11 @@ lib.makeOverridable (
                 repo
                 tag
                 ;
+              rev = fetchgit.getRevWithTag {
+                inherit (finalAttrs) tag;
+                rev = finalAttrs.revCustom;
+              };
+              revCustom = rev;
             };
             passthru = {
               inherit gitRepoUrl;
@@ -176,7 +182,4 @@ lib.makeOverridable (
   in
 
   fetcher fetcherArgs
-  // {
-    rev = revWithTag;
-  }
 )

From 4e996b39209dbb39495e7d6b3b272101bba7ba95 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 29 Oct 2025 22:34:11 +0800
Subject: [PATCH 5028/6226] fetchFromGitHub: make name respect overridden
 arguments

---
 pkgs/build-support/fetchgithub/default.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix
index 4c3ea354fa68..ac8698caeb29 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/pkgs/build-support/fetchgithub/default.nix
@@ -11,7 +11,8 @@ lib.makeOverridable (
     repo,
     tag ? null,
     rev ? null,
-    name ? repoRevToNameMaybe repo (lib.revOrTag rev tag) "github",
+    # TODO(@ShamrockLee): Add back after reconstruction with lib.extendMkDerivation
+    # name ? repoRevToNameMaybe finalAttrs.repo (lib.revOrTag finalAttrs.revCustom finalAttrs.tag) "github",
     fetchSubmodules ? false,
     leaveDotGit ? null,
     deepClone ? false,
@@ -176,7 +177,10 @@ lib.makeOverridable (
       )
       // privateAttrs
       // {
-        inherit name;
+        # TODO(@ShamrockLee): Change back to `inherit name;` after reconstruction with lib.extendMkDerivation
+        name =
+          args.name
+            or (repoRevToNameMaybe finalAttrs.repo (lib.revOrTag finalAttrs.revCustom finalAttrs.tag) "github");
         meta = newMeta;
       };
   in

From 8bb3bbbf44c5af916de98e01829ca1e207df3679 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 30 Oct 2025 04:44:07 +0800
Subject: [PATCH 5029/6226] fetchFromGitHub: pass githubBase to mkDerivation
 via derivationArgs

Reduce future test rebuilds when making githubBase overridable.
---
 pkgs/build-support/fetchgithub/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix
index ac8698caeb29..ae5ff338264a 100644
--- a/pkgs/build-support/fetchgithub/default.nix
+++ b/pkgs/build-support/fetchgithub/default.nix
@@ -129,6 +129,7 @@ lib.makeOverridable (
             inherit passthru;
             derivationArgs = {
               inherit
+                githubBase
                 owner
                 repo
                 ;
@@ -159,6 +160,7 @@ lib.makeOverridable (
             extension = "tar.gz";
             derivationArgs = {
               inherit
+                githubBase
                 owner
                 repo
                 tag

From 5c1b1881ac7831fb69d75820b2fabd96ab1090dc Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 3 Nov 2025 08:43:01 -0500
Subject: [PATCH 5030/6226] hyperfine: add mdaniels5757 as maintainer

---
 pkgs/by-name/hy/hyperfine/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/hy/hyperfine/package.nix b/pkgs/by-name/hy/hyperfine/package.nix
index f8cd0c88aaa7..9fa0cddc0fb1 100644
--- a/pkgs/by-name/hy/hyperfine/package.nix
+++ b/pkgs/by-name/hy/hyperfine/package.nix
@@ -37,6 +37,7 @@ rustPlatform.buildRustPackage rec {
       mit
     ];
     maintainers = with lib.maintainers; [
+      mdaniels5757
       thoughtpolice
     ];
     mainProgram = "hyperfine";

From f6d87aa81ec3c1296dab4fb0bdce8a589f54ca61 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 3 Nov 2025 08:44:22 -0500
Subject: [PATCH 5031/6226] hyperfine: set updateScript

---
 pkgs/by-name/hy/hyperfine/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/hy/hyperfine/package.nix b/pkgs/by-name/hy/hyperfine/package.nix
index 9fa0cddc0fb1..e6e9d487dc0c 100644
--- a/pkgs/by-name/hy/hyperfine/package.nix
+++ b/pkgs/by-name/hy/hyperfine/package.nix
@@ -3,6 +3,7 @@
   rustPlatform,
   fetchFromGitHub,
   installShellFiles,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -28,6 +29,8 @@ rustPlatform.buildRustPackage rec {
       --zsh $releaseDir/build/hyperfine-*/out/_hyperfine
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Command-line benchmarking tool";
     homepage = "https://github.com/sharkdp/hyperfine";

From 60196255173026b2d1fa2618c1d3f8630903f84b Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Mon, 3 Nov 2025 13:44:59 +0000
Subject: [PATCH 5032/6226] openlist: 4.1.5 -> 4.1.6

---
 pkgs/by-name/op/openlist/frontend.nix | 8 ++++----
 pkgs/by-name/op/openlist/package.nix  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/op/openlist/frontend.nix b/pkgs/by-name/op/openlist/frontend.nix
index 4b3f85879b93..e2bb2ee73d16 100644
--- a/pkgs/by-name/op/openlist/frontend.nix
+++ b/pkgs/by-name/op/openlist/frontend.nix
@@ -10,18 +10,18 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "openlist-frontend";
-  version = "4.1.5";
+  version = "4.1.6";
 
   src = fetchFromGitHub {
     owner = "OpenListTeam";
     repo = "OpenList-Frontend";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-J/6ZebKn7z5oagXF8in4PX9kMbdzBtqiwOgQdznYNzM=";
+    hash = "sha256-XvlnsBq3LtOs7uOl505uXjADukgKOl7JYYtJHmbD1lY=";
   };
 
   i18n = fetchzip {
     url = "https://github.com/OpenListTeam/OpenList-Frontend/releases/download/v${finalAttrs.version}/i18n.tar.gz";
-    hash = "sha256-rpLHflA5EHxmc2ST0AhDnFOXbI5aE4jdedHOEFZ9+RY=";
+    hash = "sha256-oSWkOouUpWWM7d8TilFKHur5rbC+6AM0OUHxG/LZJRg=";
     stripRoot = false;
   };
 
@@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   pnpmDeps = pnpm_9.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-Ge+uwFGvEtRgYf5zkwYbNfBONXoVxlw4pmu25nY4HTc=";
+    hash = "sha256-1TCgJIBh3KEBTau5EG+oreCrFSZovmQgPpuZ3IcruCc=";
   };
 
   buildPhase = ''
diff --git a/pkgs/by-name/op/openlist/package.nix b/pkgs/by-name/op/openlist/package.nix
index eb6bb8ec2754..26b5b328a4a1 100644
--- a/pkgs/by-name/op/openlist/package.nix
+++ b/pkgs/by-name/op/openlist/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "openlist";
-  version = "4.1.5";
+  version = "4.1.6";
 
   src = fetchFromGitHub {
     owner = "OpenListTeam";
     repo = "OpenList";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-x4cuymUzfMe49R9PRyD14f6piP4iR8AoYkvEfdRBKcE=";
+    hash = "sha256-6GO8xcTw05OrKpfiRmVD75rbI2OtmXjpf3pWjGg3AdM=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;

From ddf53abd21a45a2f3ba3e909c8ef7125ae991198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 21 Oct 2025 17:05:14 +0200
Subject: [PATCH 5033/6226] nixos/facter: add virtualization and firmware
 support

This adds automatic virtualization detection (virtualisation.nix) and firmware management (firmware.nix).

Builds on PR #455151 (networking).
Part of incremental upstreaming from nixos-facter-modules.
---
 nixos/modules/hardware/facter/default.nix     |   2 +
 nixos/modules/hardware/facter/firmware.nix    |  24 ++++
 .../hardware/facter/virtualisation.nix        | 104 ++++++++++++++++++
 3 files changed, 130 insertions(+)
 create mode 100644 nixos/modules/hardware/facter/firmware.nix
 create mode 100644 nixos/modules/hardware/facter/virtualisation.nix

diff --git a/nixos/modules/hardware/facter/default.nix b/nixos/modules/hardware/facter/default.nix
index f2719b55b8ce..f3bd58443dc7 100644
--- a/nixos/modules/hardware/facter/default.nix
+++ b/nixos/modules/hardware/facter/default.nix
@@ -6,9 +6,11 @@
 {
   imports = [
     ./disk.nix
+    ./firmware.nix
     ./keyboard.nix
     ./networking
     ./system.nix
+    ./virtualisation.nix
   ];
 
   meta.maintainers = with lib.maintainers; [ mic92 ];
diff --git a/nixos/modules/hardware/facter/firmware.nix b/nixos/modules/hardware/facter/firmware.nix
new file mode 100644
index 000000000000..10962018890c
--- /dev/null
+++ b/nixos/modules/hardware/facter/firmware.nix
@@ -0,0 +1,24 @@
+{ lib, config, ... }:
+let
+  facterLib = import ./lib.nix lib;
+
+  inherit (config.hardware.facter) report;
+  isBaremetal = config.hardware.facter.detected.virtualisation.none.enable;
+  hasAmdCpu = facterLib.hasAmdCpu report;
+  hasIntelCpu = facterLib.hasIntelCpu report;
+in
+{
+  config = lib.mkIf isBaremetal {
+    # none (e.g. bare-metal)
+    # provide firmware for devices that might not have been detected by nixos-facter
+    hardware.enableRedistributableFirmware = lib.mkDefault true;
+
+    # update microcode
+    hardware.cpu.amd.updateMicrocode = lib.mkIf hasAmdCpu (
+      lib.mkDefault config.hardware.enableRedistributableFirmware
+    );
+    hardware.cpu.intel.updateMicrocode = lib.mkIf hasIntelCpu (
+      lib.mkDefault config.hardware.enableRedistributableFirmware
+    );
+  };
+}
diff --git a/nixos/modules/hardware/facter/virtualisation.nix b/nixos/modules/hardware/facter/virtualisation.nix
new file mode 100644
index 000000000000..15cf6bab5aee
--- /dev/null
+++ b/nixos/modules/hardware/facter/virtualisation.nix
@@ -0,0 +1,104 @@
+{
+  lib,
+  config,
+  options,
+  ...
+}:
+let
+  inherit (config.hardware.facter) report;
+  cfg = config.hardware.facter.detected.virtualisation;
+in
+{
+  options.hardware.facter.detected.virtualisation = {
+    virtio_scsi.enable = lib.mkEnableOption "Enable the Facter Virtualisation Virtio SCSI module" // {
+      default = lib.any (
+        { vendor, device, ... }:
+        # vendor (0x1af4) Red Hat, Inc.
+        (vendor.value or 0) == 6900
+        &&
+          # device (0x1004, 0x1048) Virtio SCSI
+          (lib.elem (device.value or 0) [
+            4100
+            4168
+          ])
+      ) (report.hardware.scsi or [ ]);
+      defaultText = "hardware dependent";
+    };
+    oracle.enable = lib.mkEnableOption "Enable the Facter Virtualisation Oracle module" // {
+      default = report.virtualisation or null == "oracle";
+      defaultText = "environment dependent";
+    };
+    parallels.enable = lib.mkEnableOption "Enable the Facter Virtualisation Parallels module" // {
+      default = report.virtualisation or null == "parallels";
+      defaultText = "environment dependent";
+    };
+    qemu.enable = lib.mkEnableOption "Enable the Facter Virtualisation Qemu module" // {
+      default = builtins.elem (report.virtualisation or null) [
+        "qemu"
+        "kvm"
+        "bochs"
+      ];
+      defaultText = "environment dependent";
+    };
+    hyperv.enable = lib.mkEnableOption "Enable the Facter Virtualisation Hyper-V module" // {
+      default = report.virtualisation or null == "microsoft";
+      defaultText = "environment dependent";
+    };
+    # no virtualisation detected
+    none.enable = lib.mkEnableOption "Enable the Facter Virtualisation None module" // {
+      default = report.virtualisation or null == "none";
+      defaultText = "environment dependent";
+    };
+  };
+
+  config = {
+
+    # KVM support
+    boot.kernelModules =
+      let
+        hasCPUFeature =
+          feature: lib.any ({ features, ... }: lib.elem feature features) (report.hardware.cpu or [ ]);
+      in
+      lib.mkMerge [
+        (lib.mkIf (hasCPUFeature "vmx") [ "kvm-intel" ])
+        (lib.mkIf (hasCPUFeature "svm") [ "kvm-amd" ])
+      ];
+
+    # virtio & qemu
+    boot.initrd = {
+      kernelModules = lib.optionals cfg.qemu.enable [
+        "virtio_balloon"
+        "virtio_console"
+        "virtio_rng"
+        "virtio_gpu"
+      ];
+
+      availableKernelModules = lib.mkMerge [
+        (lib.mkIf cfg.qemu.enable [
+          "virtio_net"
+          "virtio_pci"
+          "virtio_mmio"
+          "virtio_blk"
+          "9p"
+          "9pnet_virtio"
+        ])
+        (lib.mkIf cfg.virtio_scsi.enable [
+          "virtio_scsi"
+        ])
+      ];
+    };
+
+    virtualisation = {
+      # oracle
+      virtualbox.guest.enable = lib.mkIf cfg.oracle.enable (lib.mkDefault true);
+      # hyper-v
+      hypervGuest.enable = lib.mkIf cfg.hyperv.enable (lib.mkDefault true);
+    };
+
+    # parallels
+    hardware.parallels.enable = lib.mkIf cfg.parallels.enable (lib.mkDefault true);
+    nixpkgs.config = lib.mkIf (!options.nixpkgs.pkgs.isDefined && cfg.parallels.enable) {
+      allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [ "prl-tools" ];
+    };
+  };
+}

From 7ef13f718dc6299a8b5f92c42a5b4bd04f90b796 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 13:48:45 +0000
Subject: [PATCH 5034/6226] yara-x: 1.8.1 -> 1.9.0

---
 pkgs/by-name/ya/yara-x/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ya/yara-x/package.nix b/pkgs/by-name/ya/yara-x/package.nix
index dc46416df19d..43d596d448c4 100644
--- a/pkgs/by-name/ya/yara-x/package.nix
+++ b/pkgs/by-name/ya/yara-x/package.nix
@@ -12,16 +12,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "yara-x";
-  version = "1.8.1";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "VirusTotal";
     repo = "yara-x";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dl2uxMo81K2ZEAfZk2OP0FXTY4lKGmzqZe0QQo/YIsA=";
+    hash = "sha256-yoQoAtgXBgniNebU9HMxF1m0UHFD6iU095he9tCNNIo=";
   };
 
-  cargoHash = "sha256-+Bva1uch6fd6gl2MH2ss3S6Ea1QkvgVePhdUVUDuIE8=";
+  cargoHash = "sha256-/HMyNofKpeYaFfRcZ1LAb3vfW/TQy+DsILXRCpJFlCQ=";
 
   nativeBuildInputs = [
     installShellFiles

From 412119f47745bb5b52182515b7a51cc3f6bb090f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 13:48:54 +0000
Subject: [PATCH 5035/6226] neocmakelsp: 0.8.25 -> 0.8.26

---
 pkgs/by-name/ne/neocmakelsp/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ne/neocmakelsp/package.nix b/pkgs/by-name/ne/neocmakelsp/package.nix
index 23329c6dfa89..2639474d60a3 100644
--- a/pkgs/by-name/ne/neocmakelsp/package.nix
+++ b/pkgs/by-name/ne/neocmakelsp/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "neocmakelsp";
-  version = "0.8.25";
+  version = "0.8.26";
 
   src = fetchFromGitHub {
     owner = "Decodetalkers";
     repo = "neocmakelsp";
     rev = "v${version}";
-    hash = "sha256-6VGF2sbd/yhm+bxYDikfmXtg2iyKaVaidra2eo0ZP40=";
+    hash = "sha256-fJmkCi2xG0cJUxolhuT4Kuf0kK5tFLHcM9eFE1BDeFQ=";
   };
 
-  cargoHash = "sha256-khxTrAPeI7aaNHUE9jHuHoUpnkpcvfSlUyU/ShZpv0Q=";
+  cargoHash = "sha256-DEIQbnNDd1JQpeVLwvpQccZlIRb/e1JTQtYdi4UsJq8=";
 
   nativeBuildInputs = [
     installShellFiles

From 3afc17a9d4d30813f8d35a563e76b6583e15106a Mon Sep 17 00:00:00 2001
From: dawnofmidnight <dawnofmidnight@duck.com>
Date: Fri, 31 Oct 2025 19:23:41 -0400
Subject: [PATCH 5036/6226] vicinae: v0.15.5 -> v0.16.1

Release notes:
- v0.15.6: https://github.com/vicinaehq/vicinae/releases/tag/v0.15.6
- v0.15.7: https://github.com/vicinaehq/vicinae/releases/tag/v0.15.7
- v0.16.0: https://github.com/vicinaehq/vicinae/releases/tag/v0.16.0
- v0.16.1: https://github.com/vicinaehq/vicinae/releases/tag/v0.16.1
---
 pkgs/by-name/vi/vicinae/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/vi/vicinae/package.nix b/pkgs/by-name/vi/vicinae/package.nix
index 4d1821001131..ccdabb49d74e 100644
--- a/pkgs/by-name/vi/vicinae/package.nix
+++ b/pkgs/by-name/vi/vicinae/package.nix
@@ -20,23 +20,23 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vicinae";
-  version = "0.15.5";
+  version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "vicinaehq";
     repo = "vicinae";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-3pKexTUWfohL/S/yWsVMShmtMlBFI9zsd7NFzySKG0w=";
+    hash = "sha256-PWfgR7wyQINl0Xy/AJAaaUo1WtrkznGcaL1aCACqI7U=";
   };
 
   apiDeps = fetchNpmDeps {
     src = "${finalAttrs.src}/typescript/api";
-    hash = "sha256-dSHEzw15lSRRbldl9PljuWFf2htdG+HgSeKPAB88RBg=";
+    hash = "sha256-VrtxQG1wQGcRHbJWPPt6aS7x1hAHc4Z1+0l+cKv3YdI=";
   };
 
   extensionManagerDeps = fetchNpmDeps {
     src = "${finalAttrs.src}/typescript/extension-manager";
-    hash = "sha256-TCT7uZRZn4rsLA/z2yLeK5Bt4DJPmdSC4zkmuCxTtc8=";
+    hash = "sha256-krDFHTG8irgVk4a79LMz148drLgy2oxEoHCKRpur1R4=";
   };
 
   cmakeFlags = lib.mapAttrsToList lib.cmakeFeature {

From 5285abfb784cbcee59db51cb274031485dd2107e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 13:51:51 +0000
Subject: [PATCH 5037/6226] kubectl-gadget: 0.44.1 -> 0.46.0

---
 pkgs/by-name/ku/kubectl-gadget/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ku/kubectl-gadget/package.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix
index 0602263f0c12..fbf0d59eba9c 100644
--- a/pkgs/by-name/ku/kubectl-gadget/package.nix
+++ b/pkgs/by-name/ku/kubectl-gadget/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "kubectl-gadget";
-  version = "0.44.1";
+  version = "0.46.0";
 
   src = fetchFromGitHub {
     owner = "inspektor-gadget";
     repo = "inspektor-gadget";
     rev = "v${version}";
-    hash = "sha256-S3LF07KY8AwEU8xqgkl4XNNNdygmy0ILfQKVScponlk=";
+    hash = "sha256-y5eqkTt9CnEPOyFERWhBPqrgnMGaVuWN2FoDV0pDjdI=";
   };
 
-  vendorHash = "sha256-MSi8nTd9ZAdHq1xONww9qKkgKbXHe7H6oms8/WANuOg=";
+  vendorHash = "sha256-TBaMbIwR/7MzPn8rYgjqeMLma3arwr5W9HiTztd8z9E=";
 
   env.CGO_ENABLED = 0;
 

From 5b2d9e359d3ee181fc04e86ef88377863a2e0f55 Mon Sep 17 00:00:00 2001
From: provokateurin <kate@provokateurin.de>
Date: Mon, 3 Nov 2025 14:52:24 +0100
Subject: [PATCH 5038/6226] nextcloud-notify_push: 1.2.0 -> 1.2.1

---
 pkgs/servers/nextcloud/notify_push.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/nextcloud/notify_push.nix b/pkgs/servers/nextcloud/notify_push.nix
index bcd148dce727..55f39fe8aba3 100644
--- a/pkgs/servers/nextcloud/notify_push.nix
+++ b/pkgs/servers/nextcloud/notify_push.nix
@@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec {
   # in nixpkgs!
   # For that, check the `<dependencies>` section of `appinfo/info.xml`
   # in the app (https://github.com/nextcloud/notify_push/blob/main/appinfo/info.xml)
-  version = "1.2.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "nextcloud";
     repo = "notify_push";
     tag = "v${version}";
-    hash = "sha256-zefoazreNUc3agbdeQRusYWwGNDZnC375ZlLlG+SPeg=";
+    hash = "sha256-yEls1s7tD/fcqul/BmEsRf2g5mqD74M8TKG+Na3jlcM=";
   };
 
   cargoHash = "sha256-+z9XaAzToLZg6/PoRigkvPVpZ/bX/t0VBR5bg3dCUVw=";
@@ -28,7 +28,7 @@ rustPlatform.buildRustPackage rec {
     app = fetchNextcloudApp {
       appName = "notify_push";
       appVersion = version;
-      hash = "sha256-KIgXruwYPTLmpO3bMbEcm9jlRYjqX8JgTJt5hd7QugM=";
+      hash = "sha256-Yad1+kc0uCHRV4q7IDbQT8Ea2423YWGy9k42DHB0R1Q=";
       license = "agpl3Plus";
       homepage = "https://github.com/nextcloud/notify_push";
       url = "https://github.com/nextcloud-releases/notify_push/releases/download/v${version}/notify_push-v${version}.tar.gz";

From 4ab7e538507a1cac2bed0ac82fa195e68f1ebdc7 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 3 Nov 2025 08:53:53 -0500
Subject: [PATCH 5039/6226] dbip-asn-lite: 2025-10 -> 2025-11

---
 pkgs/by-name/db/dbip-asn-lite/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/db/dbip-asn-lite/package.nix b/pkgs/by-name/db/dbip-asn-lite/package.nix
index 3ad40692ed3e..2adaac5b209d 100644
--- a/pkgs/by-name/db/dbip-asn-lite/package.nix
+++ b/pkgs/by-name/db/dbip-asn-lite/package.nix
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-asn-lite";
-  version = "2025-10";
+  version = "2025-11";
 
   src = fetchurl {
     url = "https://download.db-ip.com/free/dbip-asn-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-jn3ogitAoSYSa4tQQFewQ7+wj1Z8/j/XJ9lvF4D+LSs=";
+    hash = "sha256-1Je/L9NFN83Suzl+qvbJE5gzUitx6Iin5O0VqqjgecI=";
   };
 
   dontUnpack = true;

From f62e4bdac3c99fa926dece12dec61e7aee1c10f6 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 3 Nov 2025 08:53:59 -0500
Subject: [PATCH 5040/6226] dbip-city-lite: 2025-10 -> 2025-11

---
 pkgs/by-name/db/dbip-city-lite/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/db/dbip-city-lite/package.nix b/pkgs/by-name/db/dbip-city-lite/package.nix
index 74955e0b5afb..5185ee6f7c34 100644
--- a/pkgs/by-name/db/dbip-city-lite/package.nix
+++ b/pkgs/by-name/db/dbip-city-lite/package.nix
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-city-lite";
-  version = "2025-10";
+  version = "2025-11";
 
   src = fetchurl {
     url = "https://download.db-ip.com/free/dbip-city-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-3DTgkx2UJ46Si6r30kNAbkQtgf9tT8ViDiW9b6u1YLU=";
+    hash = "sha256-CG29ARDYz1PU5JoIvybLUWuckufMk16/vzPj5H0h7V0=";
   };
 
   dontUnpack = true;

From 7a8a1943dd73207e1cbbb579d420fbdd5f21b0ee Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Mon, 3 Nov 2025 08:54:04 -0500
Subject: [PATCH 5041/6226] dbip-country-lite: 2025-10 -> 2025-11

---
 pkgs/by-name/db/dbip-country-lite/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/db/dbip-country-lite/package.nix b/pkgs/by-name/db/dbip-country-lite/package.nix
index e5a52d2b1d60..11232a1e7ff7 100644
--- a/pkgs/by-name/db/dbip-country-lite/package.nix
+++ b/pkgs/by-name/db/dbip-country-lite/package.nix
@@ -5,11 +5,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbip-country-lite";
-  version = "2025-10";
+  version = "2025-11";
 
   src = fetchurl {
     url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz";
-    hash = "sha256-pGhn+UAyzhLWG5k1O3MyJ6EEDeGt4v38bt73e6HoPz0=";
+    hash = "sha256-oOLvy3Le+ybHa3z2AGcmXdjUrfOxhguq8bRkyQh7MnI=";
   };
 
   dontUnpack = true;

From 24ca495c212073512824f8311eb23954be70da08 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Mon, 3 Nov 2025 12:22:07 +0000
Subject: [PATCH 5042/6226] python3Packages.plotnine: 0.15.0 -> 0.15.1

Diff: https://github.com/has2k1/plotnine/compare/v0.15.0...v0.15.1

Changelog: https://github.com/has2k1/plotnine/releases/tag/v0.15.1
---
 .../development/python-modules/plotnine/default.nix | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/plotnine/default.nix b/pkgs/development/python-modules/plotnine/default.nix
index d74db8313c2e..18111cc80ac7 100644
--- a/pkgs/development/python-modules/plotnine/default.nix
+++ b/pkgs/development/python-modules/plotnine/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch,
 
   # build-system
   setuptools-scm,
@@ -24,26 +23,18 @@
 
 buildPythonPackage rec {
   pname = "plotnine";
-  version = "0.15.0";
+  version = "0.15.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "has2k1";
     repo = "plotnine";
     tag = "v${version}";
-    hash = "sha256-HhsJE5XoQjkIVExsfikTBArh9uq8ob4g2O0byYOsOh8=";
+    hash = "sha256-vYrfA7x/64VHHbcgpvQZ1kyHM0jTS9Cx9a8NzVgs4og=";
   };
 
   build-system = [ setuptools-scm ];
 
-  patches = [
-    (fetchpatch {
-      name = "fix-composition-error-messages.patch";
-      url = "https://github.com/has2k1/plotnine/commit/097192de42d690c227b26ae7638accac0db14589.patch";
-      hash = "sha256-wxfJ36QH0PYdotgqrdE9sKAzKpcIYw7I8uNGhC6J0Gg=";
-    })
-  ];
-
   dependencies = [
     matplotlib
     mizani

From d03e33e7a4a320cd055f4274f7aceeb32e62d54a Mon Sep 17 00:00:00 2001
From: Emmanuel Rosa <emmanuelrosa@protonmail.com>
Date: Mon, 3 Nov 2025 09:02:26 -0500
Subject: [PATCH 5043/6226] sparrow: remove maintainer emmanuelrosa

---
 pkgs/by-name/sp/sparrow/package.nix | 1 -
 1 file changed, 1 deletion(-)

diff --git a/pkgs/by-name/sp/sparrow/package.nix b/pkgs/by-name/sp/sparrow/package.nix
index 10d0ad29f679..2533b628abe7 100644
--- a/pkgs/by-name/sp/sparrow/package.nix
+++ b/pkgs/by-name/sp/sparrow/package.nix
@@ -301,7 +301,6 @@ stdenvNoCC.mkDerivation rec {
     ];
     license = licenses.asl20;
     maintainers = with maintainers; [
-      emmanuelrosa
       msgilligan
       _1000101
     ];

From ab6baf216a0461f28216c7005843c6e0bae366ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 14:05:28 +0000
Subject: [PATCH 5044/6226] libprojectm: 4.1.4 -> 4.1.5

---
 pkgs/by-name/li/libprojectm/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libprojectm/package.nix b/pkgs/by-name/li/libprojectm/package.nix
index b67e2d525519..259dfb1dbcc2 100644
--- a/pkgs/by-name/li/libprojectm/package.nix
+++ b/pkgs/by-name/li/libprojectm/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libprojectm";
-  version = "4.1.4";
+  version = "4.1.5";
 
   src = fetchFromGitHub {
     owner = "projectM-visualizer";
     repo = "projectm";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gf1k9iSDARp6/M2/Po1wdOEY6y/QG2nq5uhSFU6bxAM=";
+    hash = "sha256-QkA0PprGWaHgN+BfOjEtfCeeQAdzZczjdzzIdSD4CKI=";
     fetchSubmodules = true;
   };
 

From 0a0059b4994e94646c578e88191aee02f4f68fe6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 14:07:19 +0000
Subject: [PATCH 5045/6226] mdfried: 0.12.9 -> 0.13.0

---
 pkgs/by-name/md/mdfried/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/md/mdfried/package.nix b/pkgs/by-name/md/mdfried/package.nix
index 25e62257ecc7..33c4019dabdf 100644
--- a/pkgs/by-name/md/mdfried/package.nix
+++ b/pkgs/by-name/md/mdfried/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdfried";
-  version = "0.12.9";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "benjajaja";
     repo = "mdfried";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0vAPUmG11Qvds3g2iaH7umZpo4b2/Dtvcm6I8WfM8jw=";
+    hash = "sha256-BMBV01VF0oubtFP6WHBiZqUAkxkhsxggPZ0255pONoA=";
   };
 
-  cargoHash = "sha256-3jx4sIXETEsgTBcTTbedEv0BXoSejLe4oEaudhQIN6s=";
+  cargoHash = "sha256-FJFdGhoV7Y9sy24DmqLiuwgOryodLjacobeT9jamEfk=";
 
   doCheck = true;
 

From 27fcac4e7e58f72108b00fa6884ac79f08f70a1e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 14:08:45 +0000
Subject: [PATCH 5046/6226] kdePackages.qodeassist-plugin: 0.7.1 -> 0.8.0

---
 pkgs/development/libraries/qodeassist-plugin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qodeassist-plugin/default.nix b/pkgs/development/libraries/qodeassist-plugin/default.nix
index 489716c2dcc9..e16285e940e5 100644
--- a/pkgs/development/libraries/qodeassist-plugin/default.nix
+++ b/pkgs/development/libraries/qodeassist-plugin/default.nix
@@ -17,13 +17,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "qodeassist-plugin";
-  version = "0.7.1";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "Palm1r";
     repo = "QodeAssist";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-QDs9li8WH27aITe48cxRWaqd0mFCmZcBeb34LadeGmk=";
+    hash = "sha256-7wsRgZEAOd8mGnTCGJM7LTde2ITKW7ibIB7ZGy25s+E=";
   };
 
   dontWrapQtApps = true;

From f861cd4d207f9f82d4f56c00713f18518ec64ed5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 14:09:15 +0000
Subject: [PATCH 5047/6226] fastcdr: 2.3.3 -> 2.3.4

---
 pkgs/by-name/fa/fastcdr/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fa/fastcdr/package.nix b/pkgs/by-name/fa/fastcdr/package.nix
index e62ca49c2666..fca49e3b30a8 100644
--- a/pkgs/by-name/fa/fastcdr/package.nix
+++ b/pkgs/by-name/fa/fastcdr/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fastcdr";
-  version = "2.3.3";
+  version = "2.3.4";
 
   src = fetchFromGitHub {
     owner = "eProsima";
     repo = "Fast-CDR";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-2xaiyF3dK4BfSa7u5kwYGYaXY0c9/MLiV34jmvTzI4k=";
+    hash = "sha256-KXQRQieyDPuSmLltf7iOVO4QdsHgaek+x1vneZyEg0E=";
   };
 
   patches = [

From 46b51d959a9cbf006f300784349c202b9c66cd44 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 14:10:54 +0000
Subject: [PATCH 5048/6226] python3Packages.dronecan: 1.0.26 -> 1.0.27

---
 pkgs/development/python-modules/dronecan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dronecan/default.nix b/pkgs/development/python-modules/dronecan/default.nix
index dc7fceebc45b..3f84bd653d9a 100644
--- a/pkgs/development/python-modules/dronecan/default.nix
+++ b/pkgs/development/python-modules/dronecan/default.nix
@@ -7,12 +7,12 @@
 
 buildPythonPackage rec {
   pname = "dronecan";
-  version = "1.0.26";
+  version = "1.0.27";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-D2odxa9ADswrg6rgKLTyQulHpGec1r0lWRUZDV5YvyE=";
+    hash = "sha256-m6xfk/2pKfzbr0fu2GUjJnRcicoZDWzhrGJ6DDs2rBw=";
   };
 
   nativeCheckInputs = [ pytestCheckHook ];

From 0099589ea143a8436ee9f7319de41a72521e5e12 Mon Sep 17 00:00:00 2001
From: "Adam C. Stephens" <adam@valkor.net>
Date: Mon, 3 Nov 2025 09:17:17 -0500
Subject: [PATCH 5049/6226] neovim[-unwrapped]: 0.11.4 -> 0.11.5

Changelog: https://github.com/neovim/neovim/releases/tag/v0.11.5
---
 pkgs/by-name/ne/neovim-unwrapped/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix
index 23ab00db9754..15efa3d48212 100644
--- a/pkgs/by-name/ne/neovim-unwrapped/package.nix
+++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix
@@ -95,7 +95,7 @@ stdenv.mkDerivation (
   in
   {
     pname = "neovim-unwrapped";
-    version = "0.11.4";
+    version = "0.11.5";
 
     __structuredAttrs = true;
 
@@ -103,7 +103,7 @@ stdenv.mkDerivation (
       owner = "neovim";
       repo = "neovim";
       tag = "v${finalAttrs.version}";
-      hash = "sha256-IpMHxIDpldg4FXiXPEY2E51DfO/Z5XieKdtesLna9Xw=";
+      hash = "sha256-OsvLB9kynCbQ8PDQ2VQ+L56iy7pZ0ZP69J2cEG8Ad8A=";
     };
 
     patches = [

From 74d7b6244723cbee61ecfd0490240f80d17b1137 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 14:42:30 +0000
Subject: [PATCH 5050/6226] compose2nix: 0.3.2 -> 0.3.3

---
 pkgs/by-name/co/compose2nix/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/compose2nix/package.nix b/pkgs/by-name/co/compose2nix/package.nix
index d6da37a19c5d..25fe02a5e476 100644
--- a/pkgs/by-name/co/compose2nix/package.nix
+++ b/pkgs/by-name/co/compose2nix/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "compose2nix";
-  version = "0.3.2";
+  version = "0.3.3";
 
   src = fetchFromGitHub {
     owner = "aksiksi";
     repo = "compose2nix";
     rev = "v${version}";
-    hash = "sha256-3i49IyYDwyVQffjHrHPmtPJl4ZkT1VpiFVDmX/dHcKw=";
+    hash = "sha256-0QCYgzxg0upnrVGDXbX9GgSHyzeMP3yqNor2t8DVwiU=";
   };
 
-  vendorHash = "sha256-ckN4nK2A0micl+iBtvxwf5iMchrcGdC0xzjQta6Jges=";
+  vendorHash = "sha256-8boWHIGvenGugKq+8ysPCsUib7QQ0ov+jbKFDKpls3g=";
 
   passthru.tests = {
     version = testers.testVersion {

From 74432d9de5fb1d1899500eaabaafad5aed2d87af Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 3 Nov 2025 08:46:29 -0600
Subject: [PATCH 5051/6226] _3llo: migrate to by-name

---
 pkgs/{tools/misc/3llo => by-name/_3/_3llo}/Gemfile              | 0
 pkgs/{tools/misc/3llo => by-name/_3/_3llo}/Gemfile.lock         | 0
 pkgs/{tools/misc/3llo => by-name/_3/_3llo}/gemset.nix           | 0
 .../misc/3llo/default.nix => by-name/_3/_3llo/package.nix}      | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 5 files changed, 2 deletions(-)
 rename pkgs/{tools/misc/3llo => by-name/_3/_3llo}/Gemfile (100%)
 rename pkgs/{tools/misc/3llo => by-name/_3/_3llo}/Gemfile.lock (100%)
 rename pkgs/{tools/misc/3llo => by-name/_3/_3llo}/gemset.nix (100%)
 rename pkgs/{tools/misc/3llo/default.nix => by-name/_3/_3llo/package.nix} (100%)

diff --git a/pkgs/tools/misc/3llo/Gemfile b/pkgs/by-name/_3/_3llo/Gemfile
similarity index 100%
rename from pkgs/tools/misc/3llo/Gemfile
rename to pkgs/by-name/_3/_3llo/Gemfile
diff --git a/pkgs/tools/misc/3llo/Gemfile.lock b/pkgs/by-name/_3/_3llo/Gemfile.lock
similarity index 100%
rename from pkgs/tools/misc/3llo/Gemfile.lock
rename to pkgs/by-name/_3/_3llo/Gemfile.lock
diff --git a/pkgs/tools/misc/3llo/gemset.nix b/pkgs/by-name/_3/_3llo/gemset.nix
similarity index 100%
rename from pkgs/tools/misc/3llo/gemset.nix
rename to pkgs/by-name/_3/_3llo/gemset.nix
diff --git a/pkgs/tools/misc/3llo/default.nix b/pkgs/by-name/_3/_3llo/package.nix
similarity index 100%
rename from pkgs/tools/misc/3llo/default.nix
rename to pkgs/by-name/_3/_3llo/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 10362b1780b1..643d53c839fc 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -966,8 +966,6 @@ with pkgs;
 
   ### TOOLS
 
-  _3llo = callPackage ../tools/misc/3llo { };
-
   _7zz-rar = _7zz.override { enableUnfree = true; };
 
   acquire = with python3Packages; toPythonApplication acquire;

From aaf821b4208b829d6a398cdd6b8db795daf4eb6d Mon Sep 17 00:00:00 2001
From: zapashcanon <leo@ndrs.fr>
Date: Sun, 21 Sep 2025 23:42:22 +0200
Subject: [PATCH 5052/6226] mdbook-plugins: init at 0.2.3

---
 pkgs/by-name/md/mdbook-plugins/package.nix | 58 ++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 pkgs/by-name/md/mdbook-plugins/package.nix

diff --git a/pkgs/by-name/md/mdbook-plugins/package.nix b/pkgs/by-name/md/mdbook-plugins/package.nix
new file mode 100644
index 000000000000..4ab03088820b
--- /dev/null
+++ b/pkgs/by-name/md/mdbook-plugins/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  curl,
+  openssl,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "mdbook-plugins";
+  version = "0.2.3";
+
+  src = fetchFromGitHub {
+    owner = "RustForWeb";
+    repo = "mdbook-plugins";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-IyIUJH5pbuvDarQf7yvrStMIb5HdimudYF+Tq/+OtvY=";
+  };
+
+  cargoHash = "sha256-/UM85Lhq52MFTjczPRuXENPJOQkjiHLWGPPW/VD9kBQ=";
+
+  nativeBuildInputs = [
+    pkg-config
+    rustPlatform.bindgenHook
+  ];
+
+  buildInputs = [
+    curl
+    openssl
+  ];
+
+  env.OPENSSL_NO_VENDOR = true;
+
+  cargoBuildFlags = [
+    "--bin=mdbook-tabs"
+    "--bin=mdbook-trunk"
+  ];
+
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Plugins for mdBook";
+    homepage = "https://mdbook-plugins.rustforweb.org/";
+    changelog = "https://github.com/RustForWeb/mdbook-plugins/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ redianthus ];
+    mainProgram = "mdbook-tabs";
+  };
+})

From 6f7a10cbff342be51ddf2ddd1553ff0d73befac4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 15:02:04 +0000
Subject: [PATCH 5053/6226] terraform-providers.kislerdm_neon: 0.10.0 -> 0.11.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 55dbaed3f1c9..81ff545fb0f0 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -805,13 +805,13 @@
     "vendorHash": "sha256-OZG8EA8xtskbLZgHzWm865wjnhRCsWdNepNMHfdtkyw="
   },
   "kislerdm_neon": {
-    "hash": "sha256-7/O+Brfvogpk9z5hX7hi4S7/YQAU3NPd9U6x0oHfQGU=",
+    "hash": "sha256-O7VYLD1qyH5oXv02OxrhQW+J1VysiHwbwW+Fzq4VKkE=",
     "homepage": "https://registry.terraform.io/providers/kislerdm/neon",
     "owner": "kislerdm",
     "repo": "terraform-provider-neon",
-    "rev": "v0.10.0",
+    "rev": "v0.11.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-q3tvE5WZb7UXe/srfXqQZVnsqG06PITzDwKYS7sRgzo="
+    "vendorHash": "sha256-7mJ+BX7laBKsr4DX1keMXnGi79CZp8M1jD0COQ1lcmU="
   },
   "kreuzwerker_docker": {
     "hash": "sha256-THMGfpRrPFReRdYusdrJGnUKEUtxy4Pu+HdcceK2FNc=",

From d28ff2232d117049ee99613eee7a72dec99f2bb7 Mon Sep 17 00:00:00 2001
From: Krzysztof Nazarewski <gpg@kdn.im>
Date: Mon, 3 Nov 2025 16:03:39 +0100
Subject: [PATCH 5054/6226] nixos/netbird: open up 0.59.0+ DNS forwarder port

---
 nixos/modules/services/networking/netbird.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/networking/netbird.nix b/nixos/modules/services/networking/netbird.nix
index a39e81a5a5ec..ba2c1be37c52 100644
--- a/nixos/modules/services/networking/netbird.nix
+++ b/nixos/modules/services/networking/netbird.nix
@@ -231,6 +231,14 @@ in
                 '';
               };
 
+              openInternalFirewall = mkOption {
+                type = bool;
+                default = true;
+                description = ''
+                  Opens up internal firewall ports for the NetBird's network interface.
+                '';
+              };
+
               hardened = mkOption {
                 type = bool;
                 default = true;
@@ -502,8 +510,11 @@ in
         interfaces = listToAttrs (
           toClientList (client: {
             name = client.interface;
-            value.allowedUDPPorts = optionals client.openFirewall [
-              5353 # required for the DNS forwarding/routing to work
+            value.allowedUDPPorts = optionals client.openInternalFirewall [
+              # note: those should be opened up by NetBird itself, but it needs additional
+              #  NixOS -specific debugging and tweaking before it works
+              5353 # <0.59.0 DNS forwarder port, kept for compatibility with those clients
+              22054 # >=0.59.0 DNS forwarder port
             ];
           })
         );

From 2102e1abf6e186474f1b59b521b6e2143accfbb9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 15:24:55 +0000
Subject: [PATCH 5055/6226] unrar: 7.1.10 -> 7.2.1

---
 pkgs/by-name/un/unrar/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/un/unrar/package.nix b/pkgs/by-name/un/unrar/package.nix
index 24e9dee0d0ad..5fc8a2ca57ec 100644
--- a/pkgs/by-name/un/unrar/package.nix
+++ b/pkgs/by-name/un/unrar/package.nix
@@ -6,12 +6,12 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "unrar";
-  version = "7.1.10";
+  version = "7.2.1";
 
   src = fetchzip {
     url = "https://www.rarlab.com/rar/unrarsrc-${finalAttrs.version}.tar.gz";
     stripRoot = false;
-    hash = "sha256-qUqUJ7NZyF+/skmdYMeE+u6KoHswcJvQSnRQ8rAKXp8=";
+    hash = "sha256-er4F+TUFZ7Iv48PbV5FT371CPQ93Zorc5fCxfqGmij0=";
   };
 
   sourceRoot = finalAttrs.src.name;

From f3eb29e4be6f195cdeb520999b71a3958d4c89a7 Mon Sep 17 00:00:00 2001
From: redianthus <l@ndrs.fr>
Date: Mon, 3 Nov 2025 14:44:45 +0100
Subject: [PATCH 5056/6226] ocamlPackages.directories: 0.6 -> 0.7

---
 .../ocaml-modules/directories/default.nix     | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/ocaml-modules/directories/default.nix b/pkgs/development/ocaml-modules/directories/default.nix
index 158c890aec42..a33e4c17d9c6 100644
--- a/pkgs/development/ocaml-modules/directories/default.nix
+++ b/pkgs/development/ocaml-modules/directories/default.nix
@@ -5,17 +5,17 @@
   fpath,
 }:
 
-buildDunePackage rec {
+buildDunePackage (finalAttrs: {
   pname = "directories";
-  version = "0.6";
+  version = "0.7";
 
   minimalOCamlVersion = "4.14";
 
   src = fetchFromGitHub {
     owner = "OCamlPro";
-    repo = pname;
-    tag = version;
-    hash = "sha256-c/9ChiSODD1K7YsMj65tjErAwXeWvEQ8BkAcUvsr19c=";
+    repo = "directories";
+    tag = finalAttrs.version;
+    hash = "sha256-6qPdHqkZ0xREOTFOe5sGfz2ysDX+9JZDrEmJvenBcqw=";
   };
 
   propagatedBuildInputs = [
@@ -35,8 +35,11 @@ buildDunePackage rec {
       xdg-user-dirs on Linux, Known Folders on Windows, Standard Directories on
       macOS.
     '';
-    changelog = "https://raw.githubusercontent.com/OCamlPro/directories/refs/tags/${src.tag}/CHANGES.md";
+    changelog = "https://raw.githubusercontent.com/OCamlPro/directories/${finalAttrs.version}/CHANGES.md";
     license = lib.licenses.isc;
-    maintainers = with lib.maintainers; [ bcc32 ];
+    maintainers = with lib.maintainers; [
+      bcc32
+      redianthus
+    ];
   };
-}
+})

From 4af54f44911da97ba156aca3d25f771ee48fe16e Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Mon, 3 Nov 2025 09:50:44 -0600
Subject: [PATCH 5057/6226] _3llo: fix formatting, qualify lib section

---
 pkgs/by-name/_3/_3llo/package.nix | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/_3/_3llo/package.nix b/pkgs/by-name/_3/_3llo/package.nix
index 45c1e633d050..42ea5c65b4b7 100644
--- a/pkgs/by-name/_3/_3llo/package.nix
+++ b/pkgs/by-name/_3/_3llo/package.nix
@@ -1,4 +1,7 @@
-{ lib, bundlerApp }:
+{
+  lib,
+  bundlerApp,
+}:
 
 bundlerApp {
   pname = "3llo";
@@ -7,9 +10,9 @@ bundlerApp {
 
   exes = [ "3llo" ];
 
-  meta = with lib; {
+  meta = {
     description = "Trello interactive CLI on terminal";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     homepage = "https://github.com/qcam/3llo";
     maintainers = [ ];
   };

From c7e1d27b58e53fff068b81eeb579f168f17d9e26 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Mon, 3 Nov 2025 23:13:50 +0800
Subject: [PATCH 5058/6226] pizauth: migrate to finalAttrs

---
 pkgs/by-name/pi/pizauth/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix
index fda6138a37b1..5cec7409b239 100644
--- a/pkgs/by-name/pi/pizauth/package.nix
+++ b/pkgs/by-name/pi/pizauth/package.nix
@@ -6,14 +6,14 @@
   nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pizauth";
   version = "1.0.7";
 
   src = fetchFromGitHub {
     owner = "ltratt";
     repo = "pizauth";
-    tag = "pizauth-${version}";
+    tag = "pizauth-${finalAttrs.version}";
     hash = "sha256-lvG50Ej0ius4gHEsyMKOXLD20700mc4iWJxHK5DvYJc=";
   };
 
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Command-line OAuth2 authentication daemon";
     homepage = "https://github.com/ltratt/pizauth";
-    changelog = "https://github.com/ltratt/pizauth/blob/${src.rev}/CHANGES.md";
+    changelog = "https://github.com/ltratt/pizauth/blob/${finalAttrs.src.rev}/CHANGES.md";
     license = with lib.licenses; [
       asl20
       mit
@@ -39,4 +39,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = with lib.maintainers; [ moraxyc ];
     mainProgram = "pizauth";
   };
-}
+})

From 2cc2688a9d50d46a9b52e940ef7c0fa59269d77c Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Mon, 3 Nov 2025 23:31:02 +0800
Subject: [PATCH 5059/6226] pizauth: 1.0.7 -> 1.0.8

---
 pkgs/by-name/pi/pizauth/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix
index 5cec7409b239..82863c702180 100644
--- a/pkgs/by-name/pi/pizauth/package.nix
+++ b/pkgs/by-name/pi/pizauth/package.nix
@@ -8,22 +8,23 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pizauth";
-  version = "1.0.7";
+  version = "1.0.8";
 
   src = fetchFromGitHub {
     owner = "ltratt";
     repo = "pizauth";
     tag = "pizauth-${finalAttrs.version}";
-    hash = "sha256-lvG50Ej0ius4gHEsyMKOXLD20700mc4iWJxHK5DvYJc=";
+    hash = "sha256-KLHccRCJ19CrGKePhUgW4GhQzn+ULE861cW2ykGoaZk=";
   };
 
-  cargoHash = "sha256-WyQIk74AKfsv0noafCGMRS6o+Lq6CeP99AFSdYq+QHg=";
+  cargoHash = "sha256-m1kOV0b/HCSAGfbEh4GdtrlphoELe7ebG+kgKKNYihY=";
 
   nativeBuildInputs = [ installShellFiles ];
 
   postInstall = ''
     installShellCompletion --cmd pizauth \
-      --bash share/bash/completion.bash
+      --bash share/bash/completion.bash \
+      --fish share/fish/pizauth.fish
   '';
 
   passthru.updateScript = nix-update-script { };

From cc2fca607c6bd91ca2fe6c11654ed23247bddb42 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Mon, 3 Nov 2025 23:37:36 +0800
Subject: [PATCH 5060/6226] pizauth: add manpage

---
 pkgs/by-name/pi/pizauth/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix
index 82863c702180..9d8ab68b89bd 100644
--- a/pkgs/by-name/pi/pizauth/package.nix
+++ b/pkgs/by-name/pi/pizauth/package.nix
@@ -25,6 +25,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     installShellCompletion --cmd pizauth \
       --bash share/bash/completion.bash \
       --fish share/fish/pizauth.fish
+
+    installManPage pizauth.1 pizauth.conf.5
   '';
 
   passthru.updateScript = nix-update-script { };

From 64441ef9c19bf500d039e674bd765a80fb4cd32a Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Mon, 3 Nov 2025 23:48:04 +0800
Subject: [PATCH 5061/6226] pizauth: add systemd user services

---
 pkgs/by-name/pi/pizauth/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/pi/pizauth/package.nix b/pkgs/by-name/pi/pizauth/package.nix
index 9d8ab68b89bd..1722b3c0872c 100644
--- a/pkgs/by-name/pi/pizauth/package.nix
+++ b/pkgs/by-name/pi/pizauth/package.nix
@@ -27,6 +27,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --fish share/fish/pizauth.fish
 
     installManPage pizauth.1 pizauth.conf.5
+
+    substituteInPlace lib/systemd/user/pizauth.service \
+      --replace-fail /usr/bin/pizauth "$out/bin/pizauth"
+    install -Dm444 lib/systemd/user/pizauth{,-*}.service -t $out/lib/systemd/user
   '';
 
   passthru.updateScript = nix-update-script { };

From 3623c661c1ddbf19dbdceee4877b801e91ef29af Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 15:55:39 +0000
Subject: [PATCH 5062/6226] terraform-providers.equinix_equinix: 4.4.0 -> 4.7.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 55dbaed3f1c9..18517db031cd 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -363,13 +363,13 @@
     "vendorHash": "sha256-Q3H/6mpkWn1Gw0NRMtKtkBRGHjPJZGBFdGwfalyQ4Z0="
   },
   "equinix_equinix": {
-    "hash": "sha256-QO0XcYXfRNRpyEMxS0c80e3lr0Zf4j+6feb8hu5NPq0=",
+    "hash": "sha256-WjJxZzrsyHHjsVK4pZf3ByTcFBXbIlw7JiMp9uMv19I=",
     "homepage": "https://registry.terraform.io/providers/equinix/equinix",
     "owner": "equinix",
     "repo": "terraform-provider-equinix",
-    "rev": "v4.4.0",
+    "rev": "v4.7.0",
     "spdx": "MIT",
-    "vendorHash": "sha256-LuOymPvWBQs29fghb7uDW6PSAibMmC9igdLMpuhf2vw="
+    "vendorHash": "sha256-GEdgHY2cIiXxeIYev7zbGd4c+IyZZfeZtSj9Z/gG6E4="
   },
   "exoscale_exoscale": {
     "hash": "sha256-w7OI4cieF5RtClKUrlnOTE0HSmI1lZ8X+hqMJpzQENo=",

From ea72770edbfe61c1f389f6d5d2e3d4267366185e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 16:11:12 +0000
Subject: [PATCH 5063/6226] nextcloud-talk-desktop: 2.0.2 -> 2.0.3

---
 pkgs/by-name/ne/nextcloud-talk-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
index 2bd7d150ba78..c17cbca9ef66 100644
--- a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
+++ b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "nextcloud-talk-desktop";
-  version = "2.0.2";
+  version = "2.0.3";
 
   # Building from source would require building also building Server and Talk components
   # See https://github.com/nextcloud/talk-desktop?tab=readme-ov-file#%EF%B8%8F-prerequisites
   src = fetchzip {
     url = "https://github.com/nextcloud-releases/talk-desktop/releases/download/v${finalAttrs.version}/Nextcloud.Talk-linux-x64.zip";
-    hash = "sha256-r/1YTGBv6fqd95TIRqLLssk30KeWkHlMY51cp7YQp9o=";
+    hash = "sha256-QKbg5vHLuxLpngrHom/odWw9RK43jhZsEg7Df5c7db0=";
     stripRoot = false;
   };
 

From 22d98fc9b5adc017d27062bb25be67a41033ddb8 Mon Sep 17 00:00:00 2001
From: RaHoni <honisuess@gmail.com>
Date: Sun, 2 Nov 2025 14:40:51 +0100
Subject: [PATCH 5064/6226] jameica: 2.10.5 -> 2.12.0

The releases get their own branch and aren't taged anymore so not using
the tag anymore.
And also the build version is no longer used.
---
 pkgs/by-name/ja/jameica/package.nix | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ja/jameica/package.nix b/pkgs/by-name/ja/jameica/package.nix
index a1a1c983726b..9c805d57fbb9 100644
--- a/pkgs/by-name/ja/jameica/package.nix
+++ b/pkgs/by-name/ja/jameica/package.nix
@@ -15,10 +15,6 @@
 }:
 
 let
-  _version = "2.10.5";
-  _build = "488";
-  version = "${_version}-${_build}";
-
   swtSystem =
     if stdenv.hostPlatform.system == "i686-linux" then
       "linux"
@@ -45,13 +41,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "jameica";
-  inherit version;
+  version = "2.12.0";
 
   src = fetchFromGitHub {
     owner = "willuhn";
     repo = "jameica";
-    rev = "V_${builtins.replaceStrings [ "." ] [ "_" ] _version}_BUILD_${_build}";
-    hash = "sha256-xzSyq5Cse/TCzyb/eQNZyQS/I3mcPsvzWk3VjZg95gE=";
+    # Releases currently happen on branches named like the version number. Rev of the "2.12.0" branch.
+    rev = "b74b160643b18171d2d185b80b60e82a02a75898";
+    hash = "sha256-7KpQas8ttL2DP+gFH87uLQyx4PMwVQ+FaqXpZBPWV5U=i";
   };
 
   nativeBuildInputs = [
@@ -88,7 +85,7 @@ stdenv.mkDerivation rec {
     # copy platform-specific SWT
     cp lib/swt/${swtSystem}/swt.jar $out/share/jameica-${version}/
 
-    install -Dm644 releases/${_version}-*/jameica/jameica.jar $out/share/java/
+    install -Dm644 releases/${version}/jameica/jameica.jar $out/share/java/
     install -Dm644 plugin.xml $out/share/java/
     install -Dm644 build/jameica-icon.png $out/share/pixmaps/jameica.png
     cp ${desktopItem}/share/applications/* $out/share/applications/
@@ -97,8 +94,8 @@ stdenv.mkDerivation rec {
 
     # Create .app bundle for macOS
     mkdir -p $out/Applications
-    chmod +x releases/${_version}-${_build}-${_build}/tmp/jameica.app/jameica*.sh
-    cp -r releases/${_version}-${_build}-${_build}/tmp/jameica.app $out/Applications/Jameica.app
+    chmod +x releases/${version}/tmp/jameica.app/jameica*.sh
+    cp -r releases/${version}/tmp/jameica.app $out/Applications/Jameica.app
   ''
   + ''
 

From 6d97f3cf4aa2cb955f5785ce2a6e2264022d25ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Nov 2025 08:32:56 -0800
Subject: [PATCH 5065/6226] python3Packages.python-open-router: 0.3.1 -> 0.3.2

Diff: https://github.com/joostlek/python-open-router/compare/v0.3.1...v0.3.2

Changelog: https://github.com/joostlek/python-open-router/releases/tag/v0.3.2
---
 .../development/python-modules/python-open-router/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-open-router/default.nix b/pkgs/development/python-modules/python-open-router/default.nix
index 76abdf1da097..72f389d779e3 100644
--- a/pkgs/development/python-modules/python-open-router/default.nix
+++ b/pkgs/development/python-modules/python-open-router/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "python-open-router";
-  version = "0.3.1";
+  version = "0.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "joostlek";
     repo = "python-open-router";
     tag = "v${version}";
-    hash = "sha256-EoLBlgXKrAo2DKOuLGvN3MbWIJIG+Ehtznegnq3VX44=";
+    hash = "sha256-SSpSoo82FD1KUwbZpeHpl9I4A50yuJmdTVaHDxLZXso=";
   };
 
   build-system = [ poetry-core ];

From 6b5c92e273b634220f828735366334ac6614ecdf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Nov 2025 08:36:45 -0800
Subject: [PATCH 5066/6226] python3Packages.reolink-aio: 0.16.2 -> 0.16.3

Diff: https://github.com/starkillerOG/reolink_aio/compare/0.16.2...0.16.3

Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.16.3
---
 pkgs/development/python-modules/reolink-aio/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index 710461a1ae02..2ed4e83d2da3 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -6,23 +6,20 @@
   fetchFromGitHub,
   orjson,
   pycryptodomex,
-  pythonOlder,
   setuptools,
   typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "reolink-aio";
-  version = "0.16.2";
+  version = "0.16.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "starkillerOG";
     repo = "reolink_aio";
     tag = version;
-    hash = "sha256-Vkjt+/dG9m3sf9sQM++I+IgWdsBe338VjqoVr2pD3C0=";
+    hash = "sha256-lfkQtVnaEge6Upvd73fqBtXf5NQIq7vhTP4IOwWjNBw=";
   };
 
   build-system = [ setuptools ];

From 6492632ea5f32e5ef5273be7b0ce1f8af220984d Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 13:38:57 -0300
Subject: [PATCH 5067/6226] mtpaint: 3.50.01 -> 3.50.12

---
 pkgs/by-name/mt/mtpaint/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mt/mtpaint/package.nix b/pkgs/by-name/mt/mtpaint/package.nix
index 0ff7f39b9b97..6a51b3d0044e 100644
--- a/pkgs/by-name/mt/mtpaint/package.nix
+++ b/pkgs/by-name/mt/mtpaint/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation {
   pname = "mtPaint";
-  version = "3.50.01";
+  version = "3.50.12";
 
   src = fetchFromGitHub {
     owner = "wjaguar";
     repo = "mtPaint";
-    rev = "a4675ff5cd9fcd57d291444cb9f332b48f11243f";
-    sha256 = "04wqxz8i655gz5rnz90cksy8v6m2jhcn1j8rzhqpp5xhawlmq24y";
+    rev = "7cae5d663ed835a365d89a535536c39e18862a83";
+    hash = "sha256-W/MQZ1WqoVMzyEd60rbvA8yieesDc/xfKqbYGZumi2U=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From d7fd0c4cf290364e6b227baedd45f89a715c593f Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 13:39:38 -0300
Subject: [PATCH 5068/6226] mtpaint: add maintainer iedame

---
 pkgs/by-name/mt/mtpaint/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/mt/mtpaint/package.nix b/pkgs/by-name/mt/mtpaint/package.nix
index 6a51b3d0044e..e1b3eb7323a3 100644
--- a/pkgs/by-name/mt/mtpaint/package.nix
+++ b/pkgs/by-name/mt/mtpaint/package.nix
@@ -58,7 +58,7 @@ stdenv.mkDerivation {
     homepage = "https://mtpaint.sourceforge.net/";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ iedame ];
     mainProgram = "mtpaint";
   };
 }

From 65de4fb0f9d910075e9458bbb0003729caaa657a Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 20:56:46 -0800
Subject: [PATCH 5069/6226] python3Packages.pyrate-limiter: disable tests that
 time out and/or fail under load

---
 .../python-modules/pyrate-limiter/default.nix | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pyrate-limiter/default.nix b/pkgs/development/python-modules/pyrate-limiter/default.nix
index c29fb157153e..95261eed47c2 100644
--- a/pkgs/development/python-modules/pyrate-limiter/default.nix
+++ b/pkgs/development/python-modules/pyrate-limiter/default.nix
@@ -47,6 +47,14 @@ buildPythonPackage rec {
     ];
   };
 
+  # Show each test name and track the slowest
+  # This helps with identifying bottlenecks in the test suite
+  # that are causing the build to time out on Hydra.
+  pytestFlags = [
+    "--durations=10"
+    "-vv"
+  ];
+
   nativeCheckInputs = [
     pytestCheckHook
     pytest-asyncio
@@ -55,9 +63,16 @@ buildPythonPackage rec {
   ]
   ++ lib.flatten (lib.attrValues optional-dependencies);
 
-  disabledTests = [
-    # hangs
-    "test_limiter_01"
+  disabledTestPaths = [
+    # Slow: > 1.5 seconds/test run standalone on a fast machine
+    # (Apple M3 Max with highest performance settings and 36GB RAM)
+    # and/or hang under load
+    # https://github.com/vutran1710/PyrateLimiter/issues/245
+    # https://github.com/vutran1710/PyrateLimiter/issues/247
+    "tests/test_bucket_all.py"
+    "tests/test_bucket_factory.py"
+    "tests/test_limiter.py"
+    "tests/test_multiprocessing.py"
   ];
 
   pythonImportsCheck = [ "pyrate_limiter" ];

From 1adcdc0b8268dfa5ed65e4260427e8f6edbd8cdf Mon Sep 17 00:00:00 2001
From: cinereal <cinereal@riseup.net>
Date: Mon, 3 Nov 2025 17:44:33 +0100
Subject: [PATCH 5070/6226] terraform-providers.topicusonderwijs_octodns: init
 at 1.1.2

add Terraform provider
[`octodns`](registry.terraform.io/providers/topicusonderwijs/octodns),
which allows interacting with `pkgs.octodns`, a DNS client supporting a
broad range of [DNS
providers](https://octodns.readthedocs.io/en/latest/#providers).

Signed-off-by: cinereal <cinereal@riseup.net>
---
 .../cluster/terraform-providers/providers.json           | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 3cbee60d213d..597befbdd261 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1371,6 +1371,15 @@
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-Bat/S4e5vzT0/XOhJ9zCWLa4IE4owLC6ec1yvEh+c0Y="
   },
+  "topicusonderwijs_octodns": {
+    "hash": "sha256-ji1XD2CoLpTf4slPJcADwpceWmr3a8l9v7043gKOl/s=",
+    "homepage": "https://registry.terraform.io/providers/topicusonderwijs/octodns",
+    "owner": "topicusonderwijs",
+    "repo": "terraform-provider-octodns",
+    "rev": "v1.1.2",
+    "spdx": "MPL-2.0",
+    "vendorHash": "sha256-Mn2K1xt2oB4F+3IuraKngB+3egGrxvzhthy1oLxGyCs="
+  },
   "trozz_pocketid": {
     "hash": "sha256-rUCjvJKLZE+cSsHZdntBF9WpZDtIkVkukmLGEvGVC8s=",
     "homepage": "https://registry.terraform.io/providers/Trozz/pocketid",

From af4104751eab2bdee7236ef0955656df6ef8af3a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 16:54:28 +0000
Subject: [PATCH 5071/6226] terraform-providers.hashicorp_google: 7.8.0 ->
 7.9.0

---
 .../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 55dbaed3f1c9..11f09bce48fe 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -561,11 +561,11 @@
     "vendorHash": "sha256-xIagZvWtlNpz5SQfxbA7r9ojAeS3CW2pwV337ObKOwU="
   },
   "hashicorp_google": {
-    "hash": "sha256-ozIqR6M7E6Y6Zvw7ymdVeW49v5a2jt9axacM/0TvXc8=",
+    "hash": "sha256-sGdKvVyQkYVM2zZ6fVgUr2ANgQVwJjvlcbSUAUagsqU=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google",
     "owner": "hashicorp",
     "repo": "terraform-provider-google",
-    "rev": "v7.8.0",
+    "rev": "v7.9.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-kSFeWcuoym3FJP/E/diWuafEv1sffYinAzCjZ6z7B84="
   },

From 306edf4c588bdbb11074fc030a0acf321c85b637 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 16:55:05 +0000
Subject: [PATCH 5072/6226] rare-regex: 0.4.4 -> 0.5.2

---
 pkgs/by-name/ra/rare-regex/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ra/rare-regex/package.nix b/pkgs/by-name/ra/rare-regex/package.nix
index 197158d8653f..cf234ea704e4 100644
--- a/pkgs/by-name/ra/rare-regex/package.nix
+++ b/pkgs/by-name/ra/rare-regex/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "rare";
-  version = "0.4.4";
+  version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "zix99";
     repo = "rare";
     rev = version;
-    hash = "sha256-hdOG7UGEi4MnFg0wbyDN4gDpQLb9sG3yUrQ/J0fwKkA=";
+    hash = "sha256-tzAbt9THSTYDvooU7yNQJhJaFM1bcKCabDNtiMpux3Q=";
   };
 
   vendorHash = "sha256-wUOtxNjL/4MosACCzPTWKWrnMZhxINfN1ppkRsqDh9M=";

From 04d40bd838dd8c191c4f95f93d92700e933604d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Nov 2025 08:55:06 -0800
Subject: [PATCH 5073/6226] immich: 2.2.1 -> 2.2.2

Diff: https://github.com/immich-app/immich/compare/v2.2.1...v2.2.2

Changelog: https://github.com/immich-app/immich/releases/tag/v2.2.2
---
 pkgs/by-name/im/immich-cli/package.nix | 2 +-
 pkgs/by-name/im/immich/package.nix     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/im/immich-cli/package.nix b/pkgs/by-name/im/immich-cli/package.nix
index 57c223e9e794..db841758850f 100644
--- a/pkgs/by-name/im/immich-cli/package.nix
+++ b/pkgs/by-name/im/immich-cli/package.nix
@@ -12,7 +12,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "immich-cli";
-  version = "2.2.99";
+  version = "2.2.100";
   inherit (immich) src pnpmDeps;
 
   postPatch = ''
diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index ec7dae1eb449..c12872da602d 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -34,7 +34,7 @@
 }:
 let
   pnpm = pnpm_10;
-  version = "2.2.1";
+  version = "2.2.2";
 
   esbuild' = buildPackages.esbuild.override {
     buildGoModule =
@@ -108,7 +108,7 @@ let
     owner = "immich-app";
     repo = "immich";
     tag = "v${version}";
-    hash = "sha256-PBhUTDnZtl7Ri9thSAXuazpcmpWEUNn7BXLix+AuaE8=";
+    hash = "sha256-0ibXs4c61CEp6s/gOCsIj2A7VTnA+72jTMXoo4kkt74=";
   };
 
   pnpmDeps = pnpm.fetchDeps {

From 3a48264a49fbf9f5b9b2f2715a6f15d3ab27d33f Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Mon, 3 Nov 2025 08:57:30 -0800
Subject: [PATCH 5074/6226] stylua: add LunNova to maintainers

---
 pkgs/by-name/st/stylua/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix
index 70f0035c86cc..09e5eee146f6 100644
--- a/pkgs/by-name/st/stylua/package.nix
+++ b/pkgs/by-name/st/stylua/package.nix
@@ -35,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/johnnymorganz/stylua";
     changelog = "https://github.com/johnnymorganz/stylua/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.LunNova ];
     mainProgram = "stylua";
   };
 }

From d1592595e2f61d00f4615719203f09ac35e37a26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Nov 2025 09:02:38 -0800
Subject: [PATCH 5075/6226] python3Packages.eheimdigital: 1.3.2 -> 1.4.0

Diff: https://codeberg.org/autinerd/eheimdigital/compare/1.3.2...1.4.0

Changelog: https://codeberg.org/autinerd/eheimdigital/releases/tag/1.4.0
---
 pkgs/development/python-modules/eheimdigital/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/eheimdigital/default.nix b/pkgs/development/python-modules/eheimdigital/default.nix
index 2267fd230aa4..da38c94c2b32 100644
--- a/pkgs/development/python-modules/eheimdigital/default.nix
+++ b/pkgs/development/python-modules/eheimdigital/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "eheimdigital";
-  version = "1.3.2";
+  version = "1.4.0";
   pyproject = true;
 
   src = fetchFromGitea {
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "autinerd";
     repo = "eheimdigital";
     tag = version;
-    hash = "sha256-wFKkfzZ4LLwWhVYigospWYBxTGAJGZWO6Wrj3bvUsc8=";
+    hash = "sha256-skr5KEUQp3fSfTgTHPIxVdT8v9WnPp2NrzA+zhtudlg=";
   };
 
   build-system = [ hatchling ];

From 1dafaee385d2350de8df4febaf54554802def69f Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Mon, 3 Nov 2025 09:02:46 -0800
Subject: [PATCH 5076/6226] stylua: migrate from rec to finalAttrs

---
 pkgs/by-name/st/stylua/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix
index 09e5eee146f6..dbdde434d6d2 100644
--- a/pkgs/by-name/st/stylua/package.nix
+++ b/pkgs/by-name/st/stylua/package.nix
@@ -10,14 +10,14 @@
   ],
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "stylua";
   version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "johnnymorganz";
     repo = "stylua";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     sha256 = "sha256-iyZ30Gc32TQsQyMLwArfIRtM0NkbXkqmca46nI0526M=";
   };
 
@@ -33,9 +33,9 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Opinionated Lua code formatter";
     homepage = "https://github.com/johnnymorganz/stylua";
-    changelog = "https://github.com/johnnymorganz/stylua/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/johnnymorganz/stylua/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
     maintainers = [ lib.maintainers.LunNova ];
     mainProgram = "stylua";
   };
-}
+})

From e94d1fe9f779392b2224e720d88b3dd1db656de2 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Mon, 3 Nov 2025 09:04:13 -0800
Subject: [PATCH 5077/6226] stylua: add version test

---
 pkgs/by-name/st/stylua/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix
index dbdde434d6d2..8a137195a30e 100644
--- a/pkgs/by-name/st/stylua/package.nix
+++ b/pkgs/by-name/st/stylua/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  testers,
   # lua54 implies lua52/lua53
   features ? [
     "lua54"
@@ -30,6 +31,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   buildFeatures = features;
 
+  passthru = {
+    tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
+  };
+
   meta = {
     description = "Opinionated Lua code formatter";
     homepage = "https://github.com/johnnymorganz/stylua";

From 2ad39f5e57560bf1d9839cf50861f733f9701bf6 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Mon, 3 Nov 2025 09:04:33 -0800
Subject: [PATCH 5078/6226] stylua: add updateScript

---
 pkgs/by-name/st/stylua/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix
index 8a137195a30e..643a87bd2fc1 100644
--- a/pkgs/by-name/st/stylua/package.nix
+++ b/pkgs/by-name/st/stylua/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  nix-update-script,
   testers,
   # lua54 implies lua52/lua53
   features ? [
@@ -33,6 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   passthru = {
     tests.version = testers.testVersion { package = finalAttrs.finalPackage; };
+    updateScript = nix-update-script { };
   };
 
   meta = {

From ce6168d85887a97a708abf4175e85ef3b9dfeb63 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 3 Nov 2025 18:10:25 +0100
Subject: [PATCH 5079/6226] python313Packages.typst: modernize

---
 pkgs/development/python-modules/typst/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/typst/default.nix b/pkgs/development/python-modules/typst/default.nix
index 8f820d103f02..88cf0d02f89f 100644
--- a/pkgs/development/python-modules/typst/default.nix
+++ b/pkgs/development/python-modules/typst/default.nix
@@ -6,7 +6,6 @@
   fetchFromGitHub,
   openssl,
   pkg-config,
-  pythonOlder,
   rustc,
   rustPlatform,
 }:
@@ -16,8 +15,6 @@ buildPythonPackage rec {
   version = "0.14.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "messense";
     repo = "typst-py";
@@ -52,7 +49,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python binding to typst";
     homepage = "https://github.com/messense/typst-py";
-    changelog = "https://github.com/messense/typst-py/releases/tag/v${version}";
+    changelog = "https://github.com/messense/typst-py/releases/tag/v${src.tag}";
     license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ fab ];
   };

From a6c0f2f94c6b7073eb5d3cee96cfe4a77b741155 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Mon, 3 Nov 2025 09:12:45 -0800
Subject: [PATCH 5080/6226] stylua: 2.3.0 -> 2.3.1

Diff: https://github.com/johnnymorganz/stylua/compare/v2.3.0...v2.3.1

Changelog: https://github.com/johnnymorganz/stylua/blob/v2.3.1/CHANGELOG.md
---
 pkgs/by-name/st/stylua/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/stylua/package.nix b/pkgs/by-name/st/stylua/package.nix
index 643a87bd2fc1..33f3265bfd5f 100644
--- a/pkgs/by-name/st/stylua/package.nix
+++ b/pkgs/by-name/st/stylua/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "stylua";
-  version = "2.3.0";
+  version = "2.3.1";
 
   src = fetchFromGitHub {
     owner = "johnnymorganz";
     repo = "stylua";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-iyZ30Gc32TQsQyMLwArfIRtM0NkbXkqmca46nI0526M=";
+    sha256 = "sha256-wpFp6K5O1Vb/yHq+Lm0235nbeOdOgBK0NrlVAthz12A=";
   };
 
-  cargoHash = "sha256-H50/e/XyFvXHhwrKUbKZFZwSHfwAkAtddEvFiOr5220=";
+  cargoHash = "sha256-+llL9WoKnrXJjlaPNqdN4jGPjSHz2EuI2V44fghF5aM=";
 
   # remove cargo config so it can find the linker on aarch64-unknown-linux-gnu
   postPatch = ''

From d26ef9a007c1e6179df7c4e20a95c206bddb29f9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 17:14:45 +0000
Subject: [PATCH 5081/6226] distro-info-data: 0.67 -> 0.68

---
 pkgs/by-name/di/distro-info-data/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/distro-info-data/package.nix b/pkgs/by-name/di/distro-info-data/package.nix
index bb8f4edc7747..da2d34ae2b71 100644
--- a/pkgs/by-name/di/distro-info-data/package.nix
+++ b/pkgs/by-name/di/distro-info-data/package.nix
@@ -6,14 +6,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "distro-info-data";
-  version = "0.67";
+  version = "0.68";
 
   src = fetchFromGitLab {
     domain = "salsa.debian.org";
     owner = "debian";
     repo = "distro-info-data";
     tag = "debian/${finalAttrs.version}";
-    hash = "sha256-xm/ajsPKtnmuyEkVxM1AxV7Tl0njkqjOmhE5rKRQ36Q=";
+    hash = "sha256-YmHC7DSRzQmuwG+R7+dsl8kdX1rbPFfG7DdNY02tyfY=";
   };
 
   makeFlags = [ "PREFIX=$(out)" ];

From 9a9014be38daab1e94226ea9d7065b53bf583c08 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 17:43:01 +0000
Subject: [PATCH 5082/6226] gh-copilot: 1.1.1 -> 1.2.0

---
 pkgs/by-name/gh/gh-copilot/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/gh/gh-copilot/package.nix b/pkgs/by-name/gh/gh-copilot/package.nix
index 1335469709e6..55b68840f5e4 100644
--- a/pkgs/by-name/gh/gh-copilot/package.nix
+++ b/pkgs/by-name/gh/gh-copilot/package.nix
@@ -10,26 +10,26 @@ let
   systemToPlatform = {
     "x86_64-linux" = {
       name = "linux-amd64";
-      hash = "sha256-bDAhFU18dliKlKY5WQVsVSMVyF4YeTaKO9pwheMcdcg=";
+      hash = "sha256-WVb32g9eqoeQgvPUGOQ7r3oD+PerKYQWEh/PoZwVqkI=";
     };
     "aarch64-linux" = {
       name = "linux-arm64";
-      hash = "sha256-uddWn2RxQyB9s7kx6FI/oH9L/7l/fMD/7HQXWDqvuyQ=";
+      hash = "sha256-nZg7u0BUIHOdu3dg28fydgm6ctr4jOOIZOA5ms3/E64=";
     };
     "x86_64-darwin" = {
       name = "darwin-amd64";
-      hash = "sha256-L+lCmI1ciYInCt5aTcSVRDW0IwecGZ2BZNKrpeEE4jo=";
+      hash = "sha256-A+FQ7AgjqS1/7LExhyKwXlCAwCveSgeyhbCNAjqQ770=";
     };
     "aarch64-darwin" = {
       name = "darwin-arm64";
-      hash = "sha256-9ldVRUhHM2OD+BaOCqVmaE+HFP5jj+hrfyB6wobjS+E=";
+      hash = "sha256-+Q1H9h1j1kusEu1HW3zHWQ8ReR50kwjj4kGC3g6Jzqc=";
     };
   };
   platform = systemToPlatform.${system} or throwSystem;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "gh-copilot";
-  version = "1.1.1";
+  version = "1.2.0";
 
   src = fetchurl {
     name = "gh-copilot";

From 26f6eea83ccc1e7c80132f44e2cf9ef8ca12aa7b Mon Sep 17 00:00:00 2001
From: TomaSajt <62384384+TomaSajt@users.noreply.github.com>
Date: Mon, 3 Nov 2025 18:57:54 +0100
Subject: [PATCH 5083/6226] inochi-{session,creator}: fix build

---
 pkgs/applications/misc/inochi2d/generic.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/applications/misc/inochi2d/generic.nix b/pkgs/applications/misc/inochi2d/generic.nix
index 5817acd8b1c1..30e521755fde 100644
--- a/pkgs/applications/misc/inochi2d/generic.nix
+++ b/pkgs/applications/misc/inochi2d/generic.nix
@@ -92,6 +92,10 @@ buildDubPackage (
       # We get around this by manually pre-fetching the submodule and copying it into the right place
       cp -r --no-preserve=all ${cimgui-src}/* "$cimgui_dir/deps/cimgui"
 
+      # bump cmake minimum version to a version supported by cmake 4
+      substituteInPlace "$cimgui_dir/deps/cimgui/CMakeLists.txt" \
+          --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+
       # Disable the original cmake fetcher script
       substituteInPlace "$cimgui_dir/deps/CMakeLists.txt" \
           --replace-fail "PullSubmodules(" "# PullSubmodules(" \

From ff56ea805a10288466dc5fc4e37747dada17f0b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Nov 2025 10:04:08 -0800
Subject: [PATCH 5084/6226] qutebrowser: 3.6.0 -> 3.6.1

Diff: https://github.com/qutebrowser/qutebrowser/compare/v3.6.0...v3.6.1

Changelog: https://github.com/qutebrowser/qutebrowser/blob/v3.6.1/doc/changelog.asciidoc
---
 pkgs/by-name/qu/qutebrowser/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qu/qutebrowser/package.nix b/pkgs/by-name/qu/qutebrowser/package.nix
index a6b143f65a2a..9d364f64eba3 100644
--- a/pkgs/by-name/qu/qutebrowser/package.nix
+++ b/pkgs/by-name/qu/qutebrowser/package.nix
@@ -34,7 +34,7 @@ let
       stripRoot = false;
     };
 
-  version = "3.6.0";
+  version = "3.6.1";
 in
 
 python3.pkgs.buildPythonApplication {
@@ -44,7 +44,7 @@ python3.pkgs.buildPythonApplication {
 
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz";
-    hash = "sha256-XBtRjAiBvSMRFwdW1RZK2ZQnxwhzdjfK5O6SZrHUZ7w=";
+    hash = "sha256-9b31UPJzmsGCXmCAIb+8XMEjKnvFIEO0MozWluHYbZA=";
   };
 
   # Needs tox

From e2b92a6460ea4a935b83027c14c1aa2c7d62c2eb Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@users.noreply.github.com>
Date: Mon, 3 Nov 2025 10:00:17 -0800
Subject: [PATCH 5085/6226] terraform-providers.hashicorp_aws: 6.18.0 -> 6.19.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 55dbaed3f1c9..4e2de9663473 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -489,13 +489,13 @@
     "vendorHash": "sha256-MYVkNvJ+rbwGw0htClIbmxk3YX2OK/ZO/QOTyMRFiug="
   },
   "hashicorp_aws": {
-    "hash": "sha256-5W5v4j4oBXIfqW75ClXkBtAahgEW6oMiTmILL6++fEc=",
+    "hash": "sha256-wavy4GE4VrXhDYqWAJsexxFPDM/Roo+YKp/DqVw8+jU=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/aws",
     "owner": "hashicorp",
     "repo": "terraform-provider-aws",
-    "rev": "v6.18.0",
+    "rev": "v6.19.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Nxw5C4li2kH6MAlyaqHAUL+XYyuVPZYSkQ6PnmL3sV8="
+    "vendorHash": "sha256-xMXyuGRsoyGJKJLCR6E5IpySkym34ShzrJtwbAMoCZw="
   },
   "hashicorp_awscc": {
     "hash": "sha256-36mL++CVhKitNxzvTyNzvTsmBscZyRlBVOOYZCceqDk=",

From c339ffe8e8f92905fa6de514e39a0709bb666a89 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Mon, 3 Nov 2025 18:14:43 +0100
Subject: [PATCH 5086/6226] notes: fix build with qt 6.10

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/no/notes/package.nix     |  5 +++++
 pkgs/by-name/no/notes/qt610-fix.patch | 16 ++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 pkgs/by-name/no/notes/qt610-fix.patch

diff --git a/pkgs/by-name/no/notes/package.nix b/pkgs/by-name/no/notes/package.nix
index f12ac0631b4b..d81d379e95f9 100644
--- a/pkgs/by-name/no/notes/package.nix
+++ b/pkgs/by-name/no/notes/package.nix
@@ -17,6 +17,11 @@ stdenv.mkDerivation (finalAttrs: {
     fetchSubmodules = true;
   };
 
+  patches = [
+    # Based on https://github.com/nuttyartist/notes/pull/758 which doesn't apply cleanly
+    ./qt610-fix.patch
+  ];
+
   cmakeFlags = [ "-DUPDATE_CHECKER=OFF" ];
 
   nativeBuildInputs = [
diff --git a/pkgs/by-name/no/notes/qt610-fix.patch b/pkgs/by-name/no/notes/qt610-fix.patch
new file mode 100644
index 000000000000..be466fbc41ee
--- /dev/null
+++ b/pkgs/by-name/no/notes/qt610-fix.patch
@@ -0,0 +1,16 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4380d39..1051cc5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -74,6 +74,11 @@ if(USE_QT_VERSION STREQUAL "")
+     endif()
+   endif()
+ 
++  # https://doc.qt.io/qt-6/whatsnew610.html#build-system-changes
++  if(QT_VERSION VERSION_GREATER_EQUAL 6.10)
++    list(APPEND QT_COMPONENTS CorePrivate GuiPrivate WidgetsPrivate)
++  endif()
++
+   find_package(Qt${QT_VERSION_MAJOR} REQUIRED COMPONENTS ${QT_COMPONENTS})
+ else()
+   if(NOT USE_QT_VERSION STREQUAL "5" AND NOT USE_QT_VERSION STREQUAL "6")

From 14e16c4163f4d75cd569aae9b6871995471b20f1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 18:10:44 +0000
Subject: [PATCH 5087/6226] python3Packages.pbs-installer: 2025.10.14 ->
 2025.10.31

---
 pkgs/development/python-modules/pbs-installer/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pbs-installer/default.nix b/pkgs/development/python-modules/pbs-installer/default.nix
index af6359e62365..e484b08a59e4 100644
--- a/pkgs/development/python-modules/pbs-installer/default.nix
+++ b/pkgs/development/python-modules/pbs-installer/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pbs-installer";
-  version = "2025.10.14";
+  version = "2025.10.31";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "frostming";
     repo = "pbs-installer";
     tag = version;
-    hash = "sha256-Af3H8DWnDhAyiOIOHV7WYXO9fUkQW3eWkkFiZMkgJFw=";
+    hash = "sha256-LVDrUUWxX7APjDJG+Nzij15aeDjDBpz8jj01DQLOL8U=";
   };
 
   build-system = [ pdm-backend ];

From 0074a2fc5a3200c382cfc2667369390ca040c5df Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 15:07:22 -0300
Subject: [PATCH 5088/6226] alure: fix build with cmake4

---
 pkgs/by-name/al/alure/package.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/al/alure/package.nix b/pkgs/by-name/al/alure/package.nix
index 67a36b9b1534..fa3260bf5d01 100644
--- a/pkgs/by-name/al/alure/package.nix
+++ b/pkgs/by-name/al/alure/package.nix
@@ -6,22 +6,27 @@
   openal,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "alure";
   version = "1.2";
 
   src = fetchurl {
-    url = "http://kcat.strangesoft.net/alure-releases/alure-${version}.tar.bz2";
-    sha256 = "0w8gsyqki21s1qb2s5ac1kj08i6nc937c0rr08xbw9w9wvd6lpj6";
+    url = "http://deb.debian.org/debian/pool/main/a/alure/alure_${finalAttrs.version}.orig.tar.bz2";
+    hash = "sha256-Rl5q2uaJJ746AjkDdkZi1kQE5AxMFS0WDjqIOLHXD3E=";
   };
 
   nativeBuildInputs = [ cmake ];
   buildInputs = [ openal ];
 
-  meta = with lib; {
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.4)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
+  meta = {
     description = "Utility library to help manage common tasks with OpenAL applications";
     homepage = "https://github.com/kcat/alure";
-    license = licenses.mit;
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
   };
-}
+})

From d090b2662e9ccebe657442b07330cd679841abaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Nov 2025 08:03:02 -0800
Subject: [PATCH 5089/6226] python3Packages.python-jsonpath: fix src fetching

---
 .../development/python-modules/python-jsonpath/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/python-modules/python-jsonpath/default.nix b/pkgs/development/python-modules/python-jsonpath/default.nix
index af58dc59b57a..fbc94587688a 100644
--- a/pkgs/development/python-modules/python-jsonpath/default.nix
+++ b/pkgs/development/python-modules/python-jsonpath/default.nix
@@ -17,6 +17,13 @@ buildPythonPackage rec {
     repo = "python-jsonpath";
     tag = "v${version}";
     fetchSubmodules = true;
+    preFetch = ''
+      # can't clone using ssh
+      # https://github.com/jg-rp/python-jsonpath/pull/122
+      export GIT_CONFIG_COUNT=1
+      export GIT_CONFIG_KEY_0=url.https://github.com/.insteadOf
+      export GIT_CONFIG_VALUE_0=git@github.com:
+    '';
     hash = "sha256-DiXBIo/I36rrn+RCQda+khfViCnzHwiGzK2X9ACF3io=";
   };
 

From 51b6a91ad4d753c054dffa42d22ca6479232671e Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 15:13:36 -0300
Subject: [PATCH 5090/6226] alure: add maintainer iedame

---
 pkgs/by-name/al/alure/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/al/alure/package.nix b/pkgs/by-name/al/alure/package.nix
index fa3260bf5d01..8dc838ea4ced 100644
--- a/pkgs/by-name/al/alure/package.nix
+++ b/pkgs/by-name/al/alure/package.nix
@@ -28,5 +28,6 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://github.com/kcat/alure";
     license = lib.licenses.mit;
     platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ iedame ];
   };
 })

From e646156ac1fe2b5cf428953c27873733bd6cc4ad Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 18:24:25 +0000
Subject: [PATCH 5091/6226] python3Packages.resend: 2.17.0 -> 2.19.0

---
 pkgs/development/python-modules/resend/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/resend/default.nix b/pkgs/development/python-modules/resend/default.nix
index 6da9d8eb5a74..d62e05e93b86 100644
--- a/pkgs/development/python-modules/resend/default.nix
+++ b/pkgs/development/python-modules/resend/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "resend";
-  version = "2.17.0";
+  version = "2.19.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "resend";
     repo = "resend-python";
     tag = "v${version}";
-    hash = "sha256-eR75CDYWBdPzCJ6lFANpxH6IdfZHBJf95RdnWLBfyX0=";
+    hash = "sha256-CqwyCTqLt16fTzN5s/X200AJKTR2Ei9Vfk2wCGdJ+I8=";
   };
 
   build-system = [ setuptools ];

From 22f1a366c63110c8afdd8a2b923ebcc8c6ecff45 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 15:18:15 -0300
Subject: [PATCH 5092/6226] mtpaint: modernize

Co-authored-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/mt/mtpaint/package.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/mt/mtpaint/package.nix b/pkgs/by-name/mt/mtpaint/package.nix
index e1b3eb7323a3..8bddf23e71db 100644
--- a/pkgs/by-name/mt/mtpaint/package.nix
+++ b/pkgs/by-name/mt/mtpaint/package.nix
@@ -12,6 +12,7 @@
   libtiff,
   openjpeg,
   gifsicle,
+  gettext,
 }:
 
 stdenv.mkDerivation {
@@ -25,7 +26,14 @@ stdenv.mkDerivation {
     hash = "sha256-W/MQZ1WqoVMzyEd60rbvA8yieesDc/xfKqbYGZumi2U=";
   };
 
-  nativeBuildInputs = [ pkg-config ];
+  strictDeps = true;
+  enableParallelBuilding = true;
+
+  nativeBuildInputs = [
+    pkg-config
+    gettext
+  ];
+
   buildInputs = [
     freetype
     giflib

From 872a0e5a1be234bc99a1e5303d872e0519fa4687 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Mon, 3 Nov 2025 19:22:50 +0100
Subject: [PATCH 5093/6226] warmux: drop

The package fails to build since July and the upstream repo was last
updated 6 years ago.

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/wa/warmux/package.nix | 83 ------------------------------
 pkgs/top-level/aliases.nix         |  1 +
 2 files changed, 1 insertion(+), 83 deletions(-)
 delete mode 100644 pkgs/by-name/wa/warmux/package.nix

diff --git a/pkgs/by-name/wa/warmux/package.nix b/pkgs/by-name/wa/warmux/package.nix
deleted file mode 100644
index c3115ad02d7e..000000000000
--- a/pkgs/by-name/wa/warmux/package.nix
+++ /dev/null
@@ -1,83 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  autoconf,
-  automake,
-  zlib,
-  curl,
-  gnutls,
-  fribidi,
-  libpng,
-  SDL,
-  SDL_gfx,
-  SDL_image,
-  SDL_mixer,
-  SDL_net,
-  SDL_ttf,
-  libunwind,
-  libX11,
-  xorgproto,
-  libxml2,
-  pkg-config,
-  gettext,
-  intltool,
-  libtool,
-  perl,
-}:
-
-stdenv.mkDerivation {
-  pname = "warmux";
-  version = "unstable-2017-10-20";
-
-  src = fetchFromGitHub {
-    owner = "fluxer";
-    repo = "warmux";
-    rev = "8f81d4fc309a548ae89a068c2dde27b7e7ef8851";
-    sha256 = "1hvzglsmp75xiqqb0k75qjz4jwi8kl3fhn8zfsz53hhhqmbw6wkr";
-  };
-
-  __structuredAttrs = true;
-
-  preConfigure = "patchShebangs autogen.sh && ./autogen.sh";
-  configureFlags = [ "CFLAGS=-include ${zlib.dev}/include/zlib.h" ];
-
-  nativeBuildInputs = [
-    autoconf
-    automake
-    gettext
-    intltool
-    libtool
-    pkg-config
-  ];
-  buildInputs = [
-    zlib
-    curl
-    gnutls
-    fribidi
-    libpng
-    SDL
-    SDL_gfx
-    SDL_image
-    SDL_mixer
-    SDL_net
-    SDL_ttf
-    libunwind
-    libX11
-    xorgproto
-    libxml2
-    perl
-  ];
-  enableParallelBuilding = true;
-
-  meta = with lib; {
-    description = "Ballistics turn-based battle game between teams - unofficial copy";
-    maintainers = with maintainers; [ raskin ];
-    platforms = platforms.linux;
-    license = with licenses; [
-      gpl2Plus
-      ufl
-    ];
-    homepage = "https://github.com/fluxer/warmux";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ba2b7755c455..4a3fb6287a49 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1564,6 +1564,7 @@ mapAliases {
   waitron = throw "'waitron' has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-01
   wakatime = throw "'wakatime' has been renamed to/replaced by 'wakatime-cli'"; # Converted to throw 2025-10-27
   wapp = throw "'wapp' has been renamed to/replaced by 'tclPackages.wapp'"; # Converted to throw 2025-10-27
+  warmux = throw "'warmux' has been removed as it is unmaintained and broken"; # Added 2025-11-03
   warsow = throw "'warsow' has been removed as it is unmaintained and is broken"; # Added 2025-10-09
   warsow-engine = throw "'warsow-engine' has been removed as it is unmaintained and is broken"; # Added 2025-10-09
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_104;

From e1f3d9e0aecf1603e87592d7dddc988b1b9fce81 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Tue, 4 Nov 2025 02:24:09 +0800
Subject: [PATCH 5094/6226] androidenv: fix name overriding

Use `overrideAttrs` to specify the FOD name we want,
instead of specifying `pname` and `version`
and expect a broken overrideAttrs that won't update `name`.
---
 .../androidenv/compose-android-packages.nix       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix
index 6222b629f8df..413759a5f88e 100644
--- a/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -190,18 +190,21 @@ let
             map (
               archive:
               (fetchurl {
+                pname = packageInfo.name;
+                version = packageInfo.revision;
                 inherit (archive) url sha1;
                 inherit meta;
                 passthru = {
                   info = packageInfo;
                 };
               }).overrideAttrs
-                (prev: {
-                  # fetchurl won't generate the correct filename if we specify pname and version,
-                  # and we still want the version attribute to show up in search, so specify these in an override
-                  pname = packageInfo.name;
-                  version = packageInfo.revision;
-                })
+                (
+                  finalAttrs: previousAttrs: {
+                    # fetchurl prioritize `pname` and `version` over the specified `name`,
+                    # so specify custom `name` in an override.
+                    name = baseNameOf (lib.head (finalAttrs.urls));
+                  }
+                )
             ) validArchives
           )
         )

From c768b4243eacf2a965338fe7f4fbdaf7f83d931d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Mon, 3 Nov 2025 19:28:43 +0100
Subject: [PATCH 5095/6226] ci/github-script/bot: fix infinite labeling cycle

When we recently refactored the code to use the maintainer map for
related labels, we made a mistake: When a PR has no packages with
maintainers returned from eval, the label would internally be set to `0`
instead of `false`.

The code would then go on compare the before and after labels with
strict equality - and assume a difference, because `0 !== false`. Thus,
it seemed like new labels needed to be set, so the PUT request was
actually sent. Of course, the labels were actually the same - when
filtering the labels to be set, the `0` would also be treated as falsy,
so the label would not be set. This would result in no visible change in
the PR, but internall GitHub would replace the `updated_at` timestamp
for that PR - after all we replaced all labels.

Repeatedly updating *all* PRs we're looking at quickly causes problems,
because we are going to look at the same PRs *again* in the next cycle -
essentially causing infinite recursion. The bot became slower and slower
over time, because it had to process more and more PRs each run.

Simply casting this to a proper Boolean, should get us out of the mess
soon.
---
 ci/github-script/bot.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index a40b3b227957..fb5e79e54239 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -322,7 +322,7 @@ module.exports = async ({ github, context, core, dry }) => {
 
       Object.assign(prLabels, evalLabels, {
         '11.by: package-maintainer':
-          packages.length &&
+          Boolean(packages.length) &&
           packages.every((pkg) =>
             maintainers[pkg]?.includes(pull_request.user.id),
           ),

From 3481c6a3b41e9a7d66c56d78e9ff936364547226 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 15:37:10 -0300
Subject: [PATCH 5096/6226] alure2: fix build with cmake4

---
 pkgs/by-name/al/alure2/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/al/alure2/package.nix b/pkgs/by-name/al/alure2/package.nix
index e9c5af6d9df4..b3183af7a0ac 100644
--- a/pkgs/by-name/al/alure2/package.nix
+++ b/pkgs/by-name/al/alure2/package.nix
@@ -28,6 +28,11 @@ stdenv.mkDerivation {
     libsndfile
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     description = "Utility library for OpenAL, providing a C++ API and managing common tasks that include file loading, caching, and streaming";
     homepage = "https://github.com/kcat/alure";

From 6bb25d00463436d2d121db927c37327ea33d2e1d Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Mon, 3 Nov 2025 19:41:00 +0100
Subject: [PATCH 5097/6226] kitty: 0.43.1 -> 0.44.0

Changelog:
https://sw.kovidgoyal.net/kitty/changelog/#detailed-list-of-changes
Diff: https://github.com/kovidgoyal/kitty/compare/v0.43.1...v0.44.0
---
 pkgs/by-name/ki/kitty/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix
index 3e8338697784..62e5b0e9f53d 100644
--- a/pkgs/by-name/ki/kitty/package.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@@ -45,27 +45,26 @@
   makeBinaryWrapper,
   autoSignDarwinBinariesHook,
   cairo,
-  fetchpatch,
 }:
 
 with python3Packages;
 buildPythonApplication rec {
   pname = "kitty";
-  version = "0.43.1";
+  version = "0.44.0";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "kovidgoyal";
     repo = "kitty";
     tag = "v${version}";
-    hash = "sha256-Wd61Q1sG55oDxPuHJpmvSWuptwJIuzgn2sB/dzNRc1c=";
+    hash = "sha256-5MBYj1d/KhTFcijLMLXpmHPeuSAXuOjzjganUpWnVF4=";
   };
 
   goModules =
     (buildGo124Module {
       pname = "kitty-go-modules";
       inherit src version;
-      vendorHash = "sha256-bjtzvEQmpsrwD0BArw9N6/HqMB3T5xeqxpx89FV7p2A=";
+      vendorHash = "sha256-Afk/I/+4KHcFJ4r3/RSs+G5V6aTa+muwERoMD0wi6Io=";
     }).goModules;
 
   buildInputs = [

From 5fc8325608cb6972236d514066d5978f18f7bbaf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 18:49:32 +0000
Subject: [PATCH 5098/6226] sigsum: 0.11.2 -> 0.12.0

---
 pkgs/by-name/si/sigsum/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/si/sigsum/package.nix b/pkgs/by-name/si/sigsum/package.nix
index 03bf0d55345b..acf609234b0b 100644
--- a/pkgs/by-name/si/sigsum/package.nix
+++ b/pkgs/by-name/si/sigsum/package.nix
@@ -8,7 +8,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "sigsum";
-  version = "0.11.2";
+  version = "0.12.0";
 
   src = fetchFromGitLab {
     domain = "git.glasklar.is";
@@ -16,7 +16,7 @@ buildGoModule (finalAttrs: {
     owner = "core";
     repo = "sigsum-go";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-oaYquy0N8yHfKLoNEv8Vte3dpp/UQFZ74mZHin8dDzw=";
+    hash = "sha256-SFEKbPOAU2cpsc9oLiX3Lhv/AvYNPNiLjjjGteHOtpg=";
   };
 
   postPatch = ''
@@ -24,7 +24,7 @@ buildGoModule (finalAttrs: {
       --replace-fail "info.Main.Version" '"${finalAttrs.version}"'
   '';
 
-  vendorHash = "sha256-8Tyhd13PRTO2dGOdhkgYmwsVzWfqwOpZ9XSsAtiCcyM=";
+  vendorHash = "sha256-2v9NShhmHr0O5FH49tDSPUK1lT2tmhJkrZaVTwrL3cY=";
 
   ldflags = [
     "-s"

From 47344cd5ef3439c060e5b888f06569ce2fb2523c Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Mon, 3 Nov 2025 19:48:06 +0100
Subject: [PATCH 5099/6226] tinyemu: fix build

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/ti/tinyemu/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ti/tinyemu/package.nix b/pkgs/by-name/ti/tinyemu/package.nix
index 2a769cb68f22..bfef099f21ea 100644
--- a/pkgs/by-name/ti/tinyemu/package.nix
+++ b/pkgs/by-name/ti/tinyemu/package.nix
@@ -16,6 +16,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-voNR8hIYGbMXL87c5csYJvoSyH2ht+2Y8mnT6AKgVVU=";
   };
 
+  postPatch = ''
+    substituteInPlace fs_wget.c \
+      --replace-fail '#include <curl/multi.h>' '#include <curl/curl.h>'
+  '';
+
   nativeBuildInputs = [ SDL ];
 
   buildInputs = [

From ec380bf2fb47b047736adf7c85c9e9090328084f Mon Sep 17 00:00:00 2001
From: MartiniMoe <martini.moe@cheex.de>
Date: Mon, 3 Nov 2025 19:39:17 +0100
Subject: [PATCH 5100/6226] sointu: 0.4.1-unstable-2025-08-13 -> 0.5.0

---
 pkgs/by-name/so/sointu/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/so/sointu/package.nix b/pkgs/by-name/so/sointu/package.nix
index 123dd1f43b53..0d54cdda4cff 100644
--- a/pkgs/by-name/so/sointu/package.nix
+++ b/pkgs/by-name/so/sointu/package.nix
@@ -6,21 +6,22 @@
   nix-update-script,
   alsa-lib,
   libGL,
+  libxcb,
   libxkbcommon,
   vulkan-headers,
   wayland,
   xorg,
 }:
 
-buildGoModule {
+buildGoModule rec {
   pname = "sointu";
-  version = "0.4.1-unstable-2025-08-13";
+  version = "0.5.0";
 
   src = fetchFromGitHub {
     owner = "vsariola";
     repo = "sointu";
-    rev = "74fea4138fd788eddeb726440c872937de56fd1c";
-    hash = "sha256-kHK35Bt/+ucPCsFE3p72J3jSHzhOK9QKtJPG+3grBvs=";
+    tag = "v${version}";
+    hash = "sha256-xHKD+zArsdQVffwbbSOOdzC6o5sxpez8VLAwIzV5X4E=";
   };
 
   nativeBuildInputs = [
@@ -30,6 +31,7 @@ buildGoModule {
   buildInputs = [
     alsa-lib
     libGL
+    libxcb
     libxkbcommon
     vulkan-headers
     wayland
@@ -47,9 +49,7 @@ buildGoModule {
     "cmd/sointu-play"
   ];
 
-  passthru.updateScript = nix-update-script {
-    extraArgs = [ "--version=branch" ];
-  };
+  passthru.updateScript = nix-update-script { };
 
   meta = {
     description = "Fork of 4klang that can target 386, amd64 and WebAssembly";

From 5e45374ae5868e14059d21bf36208302e3f2a634 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 18:54:23 +0000
Subject: [PATCH 5101/6226] zashboard: 1.107.0 -> 1.108.0

---
 pkgs/by-name/za/zashboard/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/za/zashboard/package.nix b/pkgs/by-name/za/zashboard/package.nix
index bb5cde3b09f1..ee7901d6c84c 100644
--- a/pkgs/by-name/za/zashboard/package.nix
+++ b/pkgs/by-name/za/zashboard/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "zashboard";
-  version = "1.107.0";
+  version = "1.108.0";
 
   src = fetchFromGitHub {
     owner = "Zephyruso";
     repo = "zashboard";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VcRMy05vgdJC1eCfHFyxlLB1yR/gRmZv7gvlhC62KjE=";
+    hash = "sha256-+CSih7AoP9rOkxVBtX+GkEWrpo6mpPy6d/zF5iyVCt4=";
   };
 
   nativeBuildInputs = [

From 34facc87d8e4ad0f5217620fc8f7cc1df3291a15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 18:58:46 +0000
Subject: [PATCH 5102/6226] rsign2: 0.6.4 -> 0.6.5

---
 pkgs/by-name/rs/rsign2/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/rs/rsign2/package.nix b/pkgs/by-name/rs/rsign2/package.nix
index 833e5a8ae93e..20c8ec331bf4 100644
--- a/pkgs/by-name/rs/rsign2/package.nix
+++ b/pkgs/by-name/rs/rsign2/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rsign2";
-  version = "0.6.4";
+  version = "0.6.5";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-SmrTMMHnB5r0K6zL9B2qJwyywFxUTidQDejnFsOTT4E=";
+    hash = "sha256-cjucecEg5ERPsiaDuGESf2u9RTYHpQmHwWPnx1ask0I=";
   };
 
-  cargoHash = "sha256-eWPZROftFA0pTgFDl4AuUP5yO863ar+HAcjCRk5c+cA=";
+  cargoHash = "sha256-pVEv7FST/jm4YNoU8T48/an2MsqboHXc+PMPYf13pKQ=";
 
   meta = with lib; {
     description = "Command-line tool to sign files and verify signatures";

From ceaf58465f081d0b90dbfa51929be09acb2355af Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 15:59:32 -0300
Subject: [PATCH 5103/6226] arguments: fix build with cmake4

---
 pkgs/by-name/ar/arguments/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ar/arguments/package.nix b/pkgs/by-name/ar/arguments/package.nix
index 39ce653de6a5..eb23f0d13cca 100644
--- a/pkgs/by-name/ar/arguments/package.nix
+++ b/pkgs/by-name/ar/arguments/package.nix
@@ -25,6 +25,11 @@ stdenv.mkDerivation rec {
   doCheck = false;
   # internal_volume_io.h: No such file or directory
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/${owner}/arguments";
     description = "Library for argument handling for MINC programs";

From d50e394d60f3f1b17b5260c5e22878092893ea11 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 19:01:16 +0000
Subject: [PATCH 5104/6226] home-assistant-custom-components.sun2: 3.4.2b1 ->
 3.4.2

---
 .../servers/home-assistant/custom-components/sun2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/sun2/package.nix b/pkgs/servers/home-assistant/custom-components/sun2/package.nix
index 86f62b43fc90..e5d8b685b0ad 100644
--- a/pkgs/servers/home-assistant/custom-components/sun2/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/sun2/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "pnbruckner";
   domain = "sun2";
-  version = "3.4.2b1";
+  version = "3.4.2";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "ha-sun2";
     tag = version;
-    hash = "sha256-UjJWJX8Upkhu85QNj89ozLDuTFXbrXsFWo/6uRkIFjM=";
+    hash = "sha256-gorjykAEQGglH7nyAHMZDeSEERPuZINHTN3IiH3RKsQ=";
   };
 
   meta = rec {

From 9a86751bdf2b784b5424b5bb7a4b185cb89c7473 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 16:08:24 -0300
Subject: [PATCH 5105/6226] python312Packages.palace: fix build with cmake4

---
 pkgs/development/python-modules/palace/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/palace/default.nix b/pkgs/development/python-modules/palace/default.nix
index 17a4955eccb3..b6937f9258da 100644
--- a/pkgs/development/python-modules/palace/default.nix
+++ b/pkgs/development/python-modules/palace/default.nix
@@ -26,7 +26,8 @@ buildPythonPackage rec {
   # Nix uses Release CMake configuration instead of what is assumed by palace.
   postPatch = ''
     substituteInPlace CMakeLists.txt \
-      --replace IMPORTED_LOCATION_NOCONFIG IMPORTED_LOCATION_RELEASE
+      --replace-fail IMPORTED_LOCATION_NOCONFIG IMPORTED_LOCATION_RELEASE \
+      --replace-fail "cmake_minimum_required(VERSION 2.6.0)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   build-system = [

From 93e6f0be7a661ef751aff7b38157356d3d55e47a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 19:11:25 +0000
Subject: [PATCH 5106/6226] jx: 3.16.25 -> 3.16.26

---
 pkgs/by-name/jx/jx/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/jx/jx/package.nix b/pkgs/by-name/jx/jx/package.nix
index e59ce7be1715..c60e7927c2da 100644
--- a/pkgs/by-name/jx/jx/package.nix
+++ b/pkgs/by-name/jx/jx/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "jx";
-  version = "3.16.25";
+  version = "3.16.26";
 
   src = fetchFromGitHub {
     owner = "jenkins-x";
     repo = "jx";
     rev = "v${version}";
-    sha256 = "sha256-K6cKomQczoqOAsIQqesMEfqYqB/15XzKwnOTU8vDoYQ=";
+    sha256 = "sha256-KydLlc2FaOVdnz3ZP6obR7KbdWK0I5WXTziKAH3/UtY=";
   };
 
   vendorHash = "sha256-YUFpTL4BXm1iZJAQcbJSXEUKT99IulxT6qz4mrbBDN0=";

From 0588e4dba1104f3437c8c36269efe69da79d2607 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 19:11:33 +0000
Subject: [PATCH 5107/6226] nirius: 0.5.4 -> 0.6.1

---
 pkgs/by-name/ni/nirius/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ni/nirius/package.nix b/pkgs/by-name/ni/nirius/package.nix
index d33717ea6a73..cf5be31c1f10 100644
--- a/pkgs/by-name/ni/nirius/package.nix
+++ b/pkgs/by-name/ni/nirius/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nirius";
-  version = "0.5.4";
+  version = "0.6.1";
 
   src = fetchFromSourcehut {
     owner = "~tsdh";
     repo = "nirius";
     rev = "nirius-${version}";
-    hash = "sha256-UZUat/BmMIvkAphLaU5jaiRCrtsXvUXXGOgPrjgpPaU=";
+    hash = "sha256-KAh45AcNB9Y4ahxamtI6/z3l1xg6yf17h4rnZl3w89I=";
   };
 
-  cargoHash = "sha256-eLQf3cC95y4UdPI/gJWN4Fdwa3DqXT+QvIV+2w34ul0=";
+  cargoHash = "sha256-p123QvlB/j0b5kFjICcTI/5ZKL8pzGfIvH80doAhqFA=";
 
   meta = {
     description = "Utility commands for the niri wayland compositor";

From eb57af1c259fb81d7a10014749c99656cebcd919 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Mon, 3 Nov 2025 20:13:19 +0100
Subject: [PATCH 5108/6226] forgejo-runner: mark broken on darwin

The tests currently fail to execute on darwin, which may indicate a
sandboxing issue. Likely needs someone to care for forgejo ci/cd on
darwin.
---
 pkgs/by-name/fo/forgejo-runner/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix
index e1e7f11d8e47..3fe8cc8d9787 100644
--- a/pkgs/by-name/fo/forgejo-runner/package.nix
+++ b/pkgs/by-name/fo/forgejo-runner/package.nix
@@ -92,6 +92,8 @@ buildGoModule rec {
   };
 
   meta = with lib; {
+    # Cannot process container options: '--pid=host --device=/dev/sda': 'unknown server OS: darwin'
+    broken = stdenv.hostPlatform.isDarwin;
     description = "Runner for Forgejo based on act";
     homepage = "https://code.forgejo.org/forgejo/runner";
     changelog = "https://code.forgejo.org/forgejo/runner/releases/tag/${src.rev}";

From 234e599393fe7bbb174fe7651c4fb7bc76971d1b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Nov 2025 11:12:26 -0800
Subject: [PATCH 5109/6226] perlPackages.Test2Harness: 1.000155 -> 1.000161

---
 pkgs/top-level/perl-packages.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 4e2c27d5b210..838eaac8d43d 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -33293,12 +33293,12 @@ with self;
     };
   };
 
-  Test2Harness = buildPerlPackage {
+  Test2Harness = buildPerlPackage rec {
     pname = "Test2-Harness";
-    version = "1.000155";
+    version = "1.000161";
     src = fetchurl {
-      url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Harness-1.000155.tar.gz";
-      hash = "sha256-Hvi/euDKALaHu24RXzq4yVBI5ICsmuUylzabxpSkc4s=";
+      url = "mirror://cpan/authors/id/E/EX/EXODIST/Test2-Harness-${version}.tar.gz";
+      hash = "sha256-SXO3mx7tUwVxXuc9itySNtp5XH1AkNg7FQ6hMc1ltBQ=";
     };
 
     checkPhase = ''

From 5982578942254a15fea87ac63a24e0622287b24a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 19:30:29 +0000
Subject: [PATCH 5110/6226] codebuff: 1.0.506 -> 1.0.508

---
 pkgs/by-name/co/codebuff/package-lock.json | 8 ++++----
 pkgs/by-name/co/codebuff/package.nix       | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/co/codebuff/package-lock.json b/pkgs/by-name/co/codebuff/package-lock.json
index 513b3e924bd2..cdab79a2c6d4 100644
--- a/pkgs/by-name/co/codebuff/package-lock.json
+++ b/pkgs/by-name/co/codebuff/package-lock.json
@@ -5,7 +5,7 @@
   "packages": {
     "": {
       "dependencies": {
-        "codebuff": "^1.0.506"
+        "codebuff": "^1.0.508"
       }
     },
     "node_modules/chownr": {
@@ -18,9 +18,9 @@
       }
     },
     "node_modules/codebuff": {
-      "version": "1.0.506",
-      "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.506.tgz",
-      "integrity": "sha512-9iviqvCGCd6JB3POccbRkaW05NlhTrh1mHDC9UX5nkGDhge9DRUMpjwycg/IX4OsWPdSvR6dkW4p5cLvy1/8OQ==",
+      "version": "1.0.508",
+      "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.508.tgz",
+      "integrity": "sha512-iNxa+WYeJpr+zhOwyk/F+tpptKwdWTmj0Fo8H7w+KII/ydtufnqNYGoSMJ0tGHhHaL1l0T+alO+FAr7RyjuM/Q==",
       "cpu": [
         "x64",
         "arm64"
diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix
index 51872f011859..a6ed2da84ebe 100644
--- a/pkgs/by-name/co/codebuff/package.nix
+++ b/pkgs/by-name/co/codebuff/package.nix
@@ -6,14 +6,14 @@
 
 buildNpmPackage rec {
   pname = "codebuff";
-  version = "1.0.506";
+  version = "1.0.508";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/codebuff/-/codebuff-${version}.tgz";
-    hash = "sha256-T+cevGbgTvZGdy8l2C5m3By9WhHIEZ1n2MOhxWzN1Hg=";
+    hash = "sha256-hLDW/WZXXo9bYNF5uU0+Mmf//phLSPXU3yKXNBNACz0=";
   };
 
-  npmDepsHash = "sha256-hGMhkbVpG8ed0VS1gm8VPPGaEq7LapjF/MXS7mUO0HU=";
+  npmDepsHash = "sha256-G8nFBQaAro325jpxI115Jpdl6n3yyrG9sASyZdQ/aLI=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 2d31be2d3326d02289c9dd771ce7728bc56b7e88 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Tue, 4 Nov 2025 00:35:32 +0530
Subject: [PATCH 5111/6226] libfprint-focaltech-2808-a658: drop

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 .../libfprint-focaltech-2808-a658/package.nix | 105 ------------------
 pkgs/top-level/aliases.nix                    |   1 +
 2 files changed, 1 insertion(+), 105 deletions(-)
 delete mode 100644 pkgs/by-name/li/libfprint-focaltech-2808-a658/package.nix

diff --git a/pkgs/by-name/li/libfprint-focaltech-2808-a658/package.nix b/pkgs/by-name/li/libfprint-focaltech-2808-a658/package.nix
deleted file mode 100644
index f112bc9e5b90..000000000000
--- a/pkgs/by-name/li/libfprint-focaltech-2808-a658/package.nix
+++ /dev/null
@@ -1,105 +0,0 @@
-{
-  stdenv,
-  lib,
-  fetchurl,
-  rpm,
-  cpio,
-  glib,
-  gusb,
-  pixman,
-  libgudev,
-  nss,
-  libfprint,
-  cairo,
-  pkg-config,
-  autoPatchelfHook,
-  makePkgconfigItem,
-  copyPkgconfigItems,
-}:
-
-# https://discourse.nixos.org/t/request-for-libfprint-port-for-2808-a658/55474
-let
-  # The provided `.so`'s name in the binary package we fetch and unpack
-  libso = "libfprint-2.so.2.0.0";
-in
-stdenv.mkDerivation rec {
-  pname = "libfprint-focaltech-2808-a658";
-  version = "1.94.4";
-  # https://gitlab.freedesktop.org/libfprint/libfprint/-/merge_requests/413#note_2476573
-  src = fetchurl {
-    url = "https://github.com/ftfpteams/RTS5811-FT9366-fingerprint-linux-driver-with-VID-2808-and-PID-a658/raw/b040ccd953c27e26c1285c456b4264e70b36bc3f/libfprint-2-2-${version}+tod1-FT9366_20240627.x86_64.rpm";
-    hash = "sha256-MRWHwBievAfTfQqjs1WGKBnht9cIDj9aYiT3YJ0/CUM=";
-  };
-
-  nativeBuildInputs = [
-    rpm
-    cpio
-    pkg-config
-    autoPatchelfHook
-    copyPkgconfigItems
-  ];
-
-  buildInputs = [
-    stdenv.cc.cc
-    glib
-    gusb
-    pixman
-    nss
-    libgudev
-    libfprint
-    cairo
-  ];
-
-  unpackPhase = ''
-    runHook preUnpack
-
-    rpm2cpio $src | cpio -idmv
-
-    runHook postUnpack
-  '';
-
-  # custom pkg-config based on libfprint's pkg-config
-  pkgconfigItems = [
-    (makePkgconfigItem rec {
-      name = "libfprint-2";
-      inherit version;
-      inherit (meta) description;
-      cflags = [ "-I${variables.includedir}/libfprint-2" ];
-      libs = [
-        "-L${variables.libdir}"
-        "-lfprint-2"
-      ];
-      variables = rec {
-        prefix = "${placeholder "out"}";
-        includedir = "${prefix}/include";
-        libdir = "${prefix}/lib";
-      };
-    })
-  ];
-
-  installPhase = ''
-    runHook preInstall
-
-    install -Dm444 usr/lib64/${libso} -t $out/lib
-
-    # create this symlink as it was there in libfprint
-    ln -s -T $out/lib/${libso} $out/lib/libfprint-2.so
-    ln -s -T $out/lib/${libso} $out/lib/libfprint-2.so.2
-
-    # get files from libfprint required to build the package
-    cp -r ${libfprint}/lib/girepository-1.0 $out/lib
-    cp -r ${libfprint}/include $out
-
-    runHook postInstall
-  '';
-
-  meta = {
-    description = "Focaltech Fingerprint driver for focaltech 0x2808:0xa658";
-    homepage = "https://github.com/ftfpteams/RTS5811-FT9366-fingerprint-linux-driver-with-VID-2808-and-PID-a658";
-    license = lib.licenses.unfree;
-    maintainers = [ lib.maintainers.imsick ];
-    platforms = [ "x86_64-linux" ];
-    sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
-    broken = true; # needs older version of fprintd (v1.94.4)
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index ba2b7755c455..8f2dc6b40857 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -782,6 +782,7 @@ mapAliases {
   libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
   libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
   libdwarf-lite = throw "`libdwarf-lite` has been replaced by `libdwarf` as it's mostly a mirror"; # Added 2025-06-16
+  libfprint-focaltech-2808-a658 = throw "'libfprint-focaltech-2808-a658' has been removed as it was broken and upstream was taken down"; # Added 2025-11-04
   libfpx = throw "libfpx has been removed as it was unmaintained in Nixpkgs and had known vulnerabilities"; # Added 2025-05-20
   libgadu = throw "'libgadu' has been removed as upstream is unmaintained and has no dependents or maintainers in Nixpkgs"; # Added 2025-05-17
   libgda = throw "'libgda' has been renamed to/replaced by 'libgda5'"; # Converted to throw 2025-10-27

From 9e188622e51fd0ebb9ae765190b50fa97900efa9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 19:36:29 +0000
Subject: [PATCH 5112/6226] namespace-cli: 0.0.443 -> 0.0.447

---
 pkgs/by-name/na/namespace-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix
index a1366cd36737..4cc28e2f5bae 100644
--- a/pkgs/by-name/na/namespace-cli/package.nix
+++ b/pkgs/by-name/na/namespace-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "namespace-cli";
-  version = "0.0.443";
+  version = "0.0.447";
 
   src = fetchFromGitHub {
     owner = "namespacelabs";
     repo = "foundation";
     rev = "v${version}";
-    hash = "sha256-LprQhUIh5wcxiR3sf2+cT3fg458KDDv9f7Sytcs1NC8=";
+    hash = "sha256-edof/vP/v1IpqMHT6iw75KLucti6vMbE6VH6HI0KJFE=";
   };
 
-  vendorHash = "sha256-913vffq86pju2UKW0UkTm8qE7bylR9n0SgacELIRhVY=";
+  vendorHash = "sha256-bUKtHQcD8wq1VH5plbP8KXt+HXb/FoFKeqw6Ud15ZNw=";
 
   subPackages = [
     "cmd/nsc"

From 4562cd72bf7e59f543b1271fa97e67565ed2f456 Mon Sep 17 00:00:00 2001
From: Ivan Tarasov <Ivan.Tarasov@gmail.com>
Date: Mon, 3 Nov 2025 11:36:38 -0800
Subject: [PATCH 5113/6226] julia-bin: fix julia-bin.withPackages

---
 pkgs/development/julia-modules/resolve_packages.jl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/julia-modules/resolve_packages.jl b/pkgs/development/julia-modules/resolve_packages.jl
index c53763827aab..845bfe7b7b3b 100644
--- a/pkgs/development/julia-modules/resolve_packages.jl
+++ b/pkgs/development/julia-modules/resolve_packages.jl
@@ -36,7 +36,7 @@ assert_can_add(ctx, pkgs)
 for (i, pkg) in pairs(pkgs)
     entry = Pkg.Types.manifest_info(ctx.env.manifest, pkg.uuid)
     is_dep = any(uuid -> uuid == pkg.uuid, [uuid for (name, uuid) in ctx.env.project.deps])
-    if VERSION >= VersionNumber("1.11")
+    if VERSION >= VersionNumber("1.11") && VERSION < VersionNumber("1.12")
         pkgs[i] = update_package_add(ctx, pkg, entry, nothing, nothing, is_dep)
     else
         pkgs[i] = update_package_add(ctx, pkg, entry, is_dep)

From ee594b06f7a55a616195d33f89ca56b051434f83 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 19:38:04 +0000
Subject: [PATCH 5114/6226] mani: 0.31.0 -> 0.31.1

---
 pkgs/by-name/ma/mani/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/mani/package.nix b/pkgs/by-name/ma/mani/package.nix
index d86c18087c2f..273d01bf1f8e 100644
--- a/pkgs/by-name/ma/mani/package.nix
+++ b/pkgs/by-name/ma/mani/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "mani";
-  version = "0.31.0";
+  version = "0.31.1";
 
   src = fetchFromGitHub {
     owner = "alajmo";
     repo = "mani";
     tag = "v${finalAttrs.version}";
-    sha256 = "sha256-sV3yxtLlOTtCCj0kNstJ07cvI+B+rL4QNPQKGo98V6A=";
+    sha256 = "sha256-GB9BlicNiExDUi9s4PdvsqFHqwvekme/Usqp6I/k5kc=";
   };
 
   vendorHash = "sha256-PnQocOtnIBl0+5mDG7irEqGjAnzJ9Wk/fA4NW/nU+zw=";

From a8e1e4867f9db842f2bef2810d32efd784ae2854 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 19:55:35 +0000
Subject: [PATCH 5115/6226] lgogdownloader: 3.17 -> 3.18

---
 pkgs/by-name/lg/lgogdownloader/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lg/lgogdownloader/package.nix b/pkgs/by-name/lg/lgogdownloader/package.nix
index fadb4f0bff61..ee4303e2a6a0 100644
--- a/pkgs/by-name/lg/lgogdownloader/package.nix
+++ b/pkgs/by-name/lg/lgogdownloader/package.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lgogdownloader";
-  version = "3.17";
+  version = "3.18";
 
   src = fetchFromGitHub {
     owner = "Sude-";
     repo = "lgogdownloader";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-rERcwPVuioZT4lqw4SUaM0TQIks6ggA5x8fuI+1GAsk=";
+    hash = "sha256-dVEV2smZxB6+Utm9FApiFydAS3hLm4y9YZja1B/PiEk=";
   };
 
   nativeBuildInputs = [

From 841e8f923163436422e4f6bdac67aaf20dc6e438 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Tue, 4 Nov 2025 01:25:53 +0530
Subject: [PATCH 5116/6226] fx: add phanirithvij as maintainer

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/fx/fx/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/fx/fx/package.nix b/pkgs/by-name/fx/fx/package.nix
index 8dcc65af790c..a94c58e97caa 100644
--- a/pkgs/by-name/fx/fx/package.nix
+++ b/pkgs/by-name/fx/fx/package.nix
@@ -36,6 +36,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/antonmedv/fx";
     license = lib.licenses.mit;
     mainProgram = "fx";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ phanirithvij ];
   };
 })

From ae803875fa0c82970b1c8c54aaecd84f246e1445 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Tue, 4 Nov 2025 01:10:03 +0530
Subject: [PATCH 5117/6226] fx: add versionCheckHook

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/fx/fx/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/fx/fx/package.nix b/pkgs/by-name/fx/fx/package.nix
index a94c58e97caa..fce5491fa6ac 100644
--- a/pkgs/by-name/fx/fx/package.nix
+++ b/pkgs/by-name/fx/fx/package.nix
@@ -4,6 +4,8 @@
   buildGoModule,
   fetchFromGitHub,
   installShellFiles,
+  versionCheckHook,
+  writableTmpDirAsHomeHook,
 }:
 
 buildGoModule (finalAttrs: {
@@ -30,6 +32,15 @@ buildGoModule (finalAttrs: {
       --zsh <($out/bin/fx --comp zsh)
   '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+    writableTmpDirAsHomeHook
+  ];
+
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+  versionCheckKeepEnvironment = [ "HOME" ];
+
   meta = {
     changelog = "https://github.com/antonmedv/fx/releases/tag/${finalAttrs.src.tag}";
     description = "Terminal JSON viewer";

From e82748cb41862dbc292b4ab1a22e92afdb247d6a Mon Sep 17 00:00:00 2001
From: Ellie Ford <me@ellie.fm>
Date: Mon, 3 Nov 2025 11:59:13 -0800
Subject: [PATCH 5118/6226] step-kms-plugin: fix broken status on darwin

---
 pkgs/by-name/st/step-kms-plugin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/step-kms-plugin/package.nix b/pkgs/by-name/st/step-kms-plugin/package.nix
index 8683bafe7c72..fecf9a3fb954 100644
--- a/pkgs/by-name/st/step-kms-plugin/package.nix
+++ b/pkgs/by-name/st/step-kms-plugin/package.nix
@@ -42,13 +42,13 @@ buildGoModule rec {
     "-X github.com/smallstep/step-kms-plugin/cmd.Version=${version}"
   ];
 
+  CGO_CFLAGS = "-I${lib.getDev pcsclite}/include/PCSC/";
+
   meta = with lib; {
     description = "Step plugin to manage keys and certificates on cloud KMSs and HSMs";
     homepage = "https://smallstep.com/cli/";
     license = licenses.asl20;
     maintainers = with maintainers; [ qbit ];
     mainProgram = "step-kms-plugin";
-    # can't find pcsclite header files
-    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From c6e47d62c73a804ea8b824f6bf4d1ca8d76e79d9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 20:00:27 +0000
Subject: [PATCH 5119/6226] ponyc: 0.60.3 -> 0.60.4

---
 pkgs/by-name/po/ponyc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/ponyc/package.nix b/pkgs/by-name/po/ponyc/package.nix
index 2068b56ed7da..bee369fbb2cb 100644
--- a/pkgs/by-name/po/ponyc/package.nix
+++ b/pkgs/by-name/po/ponyc/package.nix
@@ -25,13 +25,13 @@
 
 stdenv.mkDerivation rec {
   pname = "ponyc";
-  version = "0.60.3";
+  version = "0.60.4";
 
   src = fetchFromGitHub {
     owner = "ponylang";
     repo = "ponyc";
     tag = version;
-    hash = "sha256-VlmIy2i7BZ8jK96KVnTzdjyXWTyOuWE5M3yNp7gcVCA=";
+    hash = "sha256-L5qqAu0OozsN6zxC3iwdYTLdd1ux4Dl3bFx6XDD3ZbY=";
     fetchSubmodules = true;
   };
 

From b6a5b915270525a58ff7a4825bc26949801daff6 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Mon, 3 Nov 2025 20:00:49 +0000
Subject: [PATCH 5120/6226] linux_xanmod: 6.12.56 -> 6.12.57

- Changelog: https://dl.xanmod.org/changelog/6.12/ChangeLog-6.12.57-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/6.12.56-xanmod1..6.12.57-xanmod1?from_project_id=51590166
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index d928f71c757d..4f54d409ef74 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -15,8 +15,8 @@ let
   variants = {
     # ./update-xanmod.sh lts
     lts = {
-      version = "6.12.56";
-      hash = "sha256-+uMzNrX97n16vuMJU2J4l9gNwge46LQDVrPxSftpvyA=";
+      version = "6.12.57";
+      hash = "sha256-4TEz29I/GEvDXJd8WEMZAiPyKYbVl7gB8OCYr+bJm0Q=";
       isLTS = true;
     };
     # ./update-xanmod.sh main

From df09fd8e795a5ddf143dbaedb79074a7af2a3b77 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 17:00:55 -0300
Subject: [PATCH 5121/6226] _1password-gui-beta: 8.11.14-20.BETA ->
 8.11.18-30.BETA

---
 pkgs/by-name/_1/_1password-gui/sources.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json
index f0da36a7578b..c9dab6f3bf8a 100644
--- a/pkgs/by-name/_1/_1password-gui/sources.json
+++ b/pkgs/by-name/_1/_1password-gui/sources.json
@@ -29,28 +29,28 @@
   },
   "beta": {
     "linux": {
-      "version": "8.11.14-20.BETA",
+      "version": "8.11.18-30.BETA",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.14-20.BETA.x64.tar.gz",
-          "hash": "sha256-/B06ghBsr7xgEWgXo+jkz5PUJVS51WfzyBZFxwu3XBM="
+          "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.18-30.BETA.x64.tar.gz",
+          "hash": "sha256-rCb54NhczM5Us6DRd1DgA7xGem4Ri4GIcJ0FFCiNAvo="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.14-20.BETA.arm64.tar.gz",
-          "hash": "sha256-gSdlXULW7q7uRWm5CncA/ya+LA4k4y8g+Lj79h5V2kc="
+          "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.18-30.BETA.arm64.tar.gz",
+          "hash": "sha256-qL6Xa8g2qgyl+UfDThH18rbaXxkt+bN0y2TcQ8C214Y="
         }
       }
     },
     "darwin": {
-      "version": "8.11.14-20.BETA",
+      "version": "8.11.18-30.BETA",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.14-20.BETA-x86_64.zip",
-          "hash": "sha256-1ZPekYyHLVbIop2Yw3sj1XsWCG5SgoI0MFVK44HJfCs="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.18-30.BETA-x86_64.zip",
+          "hash": "sha256-xkCTyFxZhCKsCTTyWz3SPA9XKhR5p7GT3hwBwXQVb40="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.14-20.BETA-aarch64.zip",
-          "hash": "sha256-Ca3jpcfxaINKSR0JjF7fT+6rfrbK//f22RT7UhEhDaM="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.18-30.BETA-aarch64.zip",
+          "hash": "sha256-Ou3GSMTNmaz+sbYCYqmxH9qrQMDmUBfTUPVcvdNDt6k="
         }
       }
     }

From e7c06ffb3e99f450bebe6045303f31f03dc6f427 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Tue, 4 Nov 2025 01:32:52 +0530
Subject: [PATCH 5122/6226] tui-journal: add phanirithvij as maintainer

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/tu/tui-journal/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix
index 2b7fc3d46765..cc9c946c469b 100644
--- a/pkgs/by-name/tu/tui-journal/package.nix
+++ b/pkgs/by-name/tu/tui-journal/package.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/AmmarAbouZor/tui-journal";
     changelog = "https://github.com/AmmarAbouZor/tui-journal/blob/${src.rev}/CHANGELOG.ron";
     license = licenses.mit;
-    maintainers = [ ];
     mainProgram = "tjournal";
+    maintainers = with lib.maintainers; [ phanirithvij ];
   };
 }

From 335d354e71a5f82ecc22fd5ea87b9c5b01a24a6b Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Mon, 3 Nov 2025 20:04:39 +0000
Subject: [PATCH 5123/6226] linux_xanmod_latest: 6.17.6 -> 6.17.7

- Changelog: https://dl.xanmod.org/changelog/6.17/ChangeLog-6.17.7-xanmod1.gz
- Diff: https://gitlab.com/xanmod/linux/-/compare/6.17.6-xanmod1..6.17.7-xanmod1?from_project_id=51590166
---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 4f54d409ef74..31efe591f324 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -21,8 +21,8 @@ let
     };
     # ./update-xanmod.sh main
     main = {
-      version = "6.17.6";
-      hash = "sha256-SGaM42dN+pl0GAQRDmCR6QB0ET1loqfFwC7kUxTXEjw=";
+      version = "6.17.7";
+      hash = "sha256-MEAKPUcUmWJCvEf5DNG8JA4jJfQtitMVv/Fc/KNEz2Y=";
     };
   };
 

From 5dc201edc230978752a795cb21c5a634a01da57e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 20:05:42 +0000
Subject: [PATCH 5124/6226] moosefs: 4.58.1 -> 4.58.2

---
 pkgs/by-name/mo/moosefs/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mo/moosefs/package.nix b/pkgs/by-name/mo/moosefs/package.nix
index 8c39d5368a32..5a684078c050 100644
--- a/pkgs/by-name/mo/moosefs/package.nix
+++ b/pkgs/by-name/mo/moosefs/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "moosefs";
-  version = "4.58.1";
+  version = "4.58.2";
 
   src = fetchFromGitHub {
     owner = "moosefs";
     repo = "moosefs";
     rev = "v${version}";
-    sha256 = "sha256-l3tF3y41nRy5AB/+9p/XJK5NKmPlod9td2n0RSRnYAQ=";
+    sha256 = "sha256-eywJ7MmCrwxqlbTDYEEPs6ego9Ivn+ziXCBNhcDfcmY=";
   };
 
   nativeBuildInputs = [

From a8be21417bfeee3509736ac8de6f505782f61948 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 20:13:16 +0000
Subject: [PATCH 5125/6226] livekit: 1.9.2 -> 1.9.3

---
 pkgs/by-name/li/livekit/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix
index 182dc31997ef..85a103157e1a 100644
--- a/pkgs/by-name/li/livekit/package.nix
+++ b/pkgs/by-name/li/livekit/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "livekit";
-  version = "1.9.2";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner = "livekit";
     repo = "livekit";
     rev = "v${version}";
-    hash = "sha256-a0WaF9myP0xjTjfum+K7Wk86HOZP00kvjOYLmeEQdxk=";
+    hash = "sha256-saqxH7SyDpdfwC+69oBXQGSXowqpSnbQXsPgPGeVvHI=";
   };
 
-  vendorHash = "sha256-hYetTszLS/zYQ39wOv+sP8HlIiyBoKI3Z7XpOrffHa8=";
+  vendorHash = "sha256-U+epe3zEq28UNJkcABlOg9URfxl1hlRWrcqwYnn78uE=";
 
   subPackages = [ "cmd/server" ];
 

From 39ec4feeb7127155da2a12701b7b9ed2094ee65f Mon Sep 17 00:00:00 2001
From: Jeremy Schlatter <jeremy@jeremyschlatter.com>
Date: Mon, 3 Nov 2025 12:26:14 -0800
Subject: [PATCH 5126/6226] sha1collisiondetection: set meta.mainProgram

Sets `meta.mainProgram = "sha1dcsum"`.

This lets `nix run nixpkgs#sha1collisiondetection` do something useful,
namely run `sha1dcsum`.
---
 pkgs/by-name/sh/sha1collisiondetection/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/sh/sha1collisiondetection/package.nix b/pkgs/by-name/sh/sha1collisiondetection/package.nix
index 4f65e3034f16..eed1b14d274b 100644
--- a/pkgs/by-name/sh/sha1collisiondetection/package.nix
+++ b/pkgs/by-name/sh/sha1collisiondetection/package.nix
@@ -39,5 +39,6 @@ stdenv.mkDerivation rec {
     platforms = platforms.all;
     maintainers = with maintainers; [ leenaars ];
     license = licenses.mit;
+    mainProgram = "sha1dcsum";
   };
 }

From 9018e6f9d9d854267fdffe815ed1e4ca7f958460 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Tue, 4 Nov 2025 01:33:09 +0530
Subject: [PATCH 5127/6226] tui-journal: refactor

remove with lib
rev -> tag
rec -> finalAttrs

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/tu/tui-journal/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix
index cc9c946c469b..222361ba6588 100644
--- a/pkgs/by-name/tu/tui-journal/package.nix
+++ b/pkgs/by-name/tu/tui-journal/package.nix
@@ -7,14 +7,14 @@
   zlib,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tui-journal";
   version = "0.16.1";
 
   src = fetchFromGitHub {
     owner = "AmmarAbouZor";
     repo = "tui-journal";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-crrh7lV5ZMKaxsrFmhXsUgBMbN5nmbf8wQ6croTqUKI=";
   };
 
@@ -29,12 +29,12 @@ rustPlatform.buildRustPackage rec {
     zlib
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Your journal app if you live in a terminal";
     homepage = "https://github.com/AmmarAbouZor/tui-journal";
-    changelog = "https://github.com/AmmarAbouZor/tui-journal/blob/${src.rev}/CHANGELOG.ron";
-    license = licenses.mit;
+    changelog = "https://github.com/AmmarAbouZor/tui-journal/blob/${finalAttrs.src.rev}/CHANGELOG.ron";
+    license = lib.licenses.mit;
     mainProgram = "tjournal";
     maintainers = with lib.maintainers; [ phanirithvij ];
   };
-}
+})

From 3a5a23e618fd594bd6824e3c3c091a7e98fbd464 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Tue, 4 Nov 2025 01:56:52 +0530
Subject: [PATCH 5128/6226] tui-journal: add versionCheckHook

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/tu/tui-journal/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/tu/tui-journal/package.nix b/pkgs/by-name/tu/tui-journal/package.nix
index 222361ba6588..5c377cc73405 100644
--- a/pkgs/by-name/tu/tui-journal/package.nix
+++ b/pkgs/by-name/tu/tui-journal/package.nix
@@ -5,6 +5,7 @@
   pkg-config,
   libgit2,
   zlib,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -29,6 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     zlib
   ];
 
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
   meta = {
     description = "Your journal app if you live in a terminal";
     homepage = "https://github.com/AmmarAbouZor/tui-journal";

From ac14766fca20f06a535bc6d581e7e2951683a1e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 20:28:51 +0000
Subject: [PATCH 5129/6226] renode-dts2repl: 0-unstable-2025-10-24 ->
 0-unstable-2025-10-31

---
 pkgs/by-name/re/renode-dts2repl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/renode-dts2repl/package.nix b/pkgs/by-name/re/renode-dts2repl/package.nix
index e21c24425717..5c32d6d8d4a1 100644
--- a/pkgs/by-name/re/renode-dts2repl/package.nix
+++ b/pkgs/by-name/re/renode-dts2repl/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication {
   pname = "renode-dts2repl";
-  version = "0-unstable-2025-10-24";
+  version = "0-unstable-2025-10-31";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "antmicro";
     repo = "dts2repl";
-    rev = "84e0ab4e3eaebfde0debffd15c925c9c4d06d9f6";
-    hash = "sha256-1pOAeXaFna5rBCn2R+nVBUdZdpwAl4/1G+kE9tuXqII=";
+    rev = "fc98e35232d4698f4947037c5b17a6bb9966a43c";
+    hash = "sha256-4Mbm+Oc3qkdUXPbqPmnKzuSBS0BtRk3Yw56lDTCZeik=";
   };
 
   nativeBuildInputs = [

From 27df018c93b09ada3ca39d628478c575b866558c Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Mon, 3 Nov 2025 21:32:26 +0100
Subject: [PATCH 5130/6226] ungoogled-chromium: 142.0.7444.59-1 ->
 142.0.7444.59-2

https://github.com/ungoogled-software/ungoogled-chromium/releases/tag/142.0.7444.59-2
---
 pkgs/applications/networking/browsers/chromium/info.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index b33c225dde59..1725526143ae 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -825,8 +825,8 @@
         "hash": "sha256-sm5GWbkm3ua7EkCWTuY4TG6EXKe3asXTrH1APnNARJQ="
       },
       "ungoogled-patches": {
-        "rev": "142.0.7444.59-1",
-        "hash": "sha256-WlrUSUcV1kN2xWbOJO+VshELAgGhXInIDvZswrWYfsQ="
+        "rev": "142.0.7444.59-2",
+        "hash": "sha256-Cjcy6ohVNt2eAD+m4ZTbeoHH9i4znkdgN0ZaysU8Whk="
       },
       "npmHash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE="
     },

From 732447565da6f0d5fe38e8dea72eeaef3406f3d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Nov 2025 12:33:33 -0800
Subject: [PATCH 5131/6226] perlPackages.Test2Harness: add meta.changelog

---
 pkgs/top-level/perl-packages.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 838eaac8d43d..beba321f8b99 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -33324,6 +33324,7 @@ with self;
       gotofile
     ];
     meta = {
+      changelog = "https://github.com/Test-More/Test2-Harness/blob/v${version}/Changes";
       description = "New and improved test harness with better Test2 integration";
       license = with lib.licenses; [
         artistic1

From c7c92aa29d0fa34031e6a3d978d87a8b4f27b90b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 20:34:56 +0000
Subject: [PATCH 5132/6226] terraform-providers.baidubce_baiducloud: 1.22.12 ->
 1.22.13

---
 .../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 55dbaed3f1c9..d153e107c072 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -91,11 +91,11 @@
     "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM="
   },
   "baidubce_baiducloud": {
-    "hash": "sha256-2SXMBb/Ho7OOhqYzQHw2Seg3oi1B5aIa1Q606TVZQvY=",
+    "hash": "sha256-1iOsY90WvcR6ZL9ZgkDr4ctKUZLgVsN0kzw5vg6O2Wc=",
     "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud",
     "owner": "baidubce",
     "repo": "terraform-provider-baiducloud",
-    "rev": "v1.22.12",
+    "rev": "v1.22.13",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 491cc4277ee3d74c8d6cf124506252136a091b4f Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 17:41:05 -0300
Subject: [PATCH 5133/6226] ringracers: 2.3 -> 2.4

---
 pkgs/by-name/ri/ringracers/package.nix | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/by-name/ri/ringracers/package.nix b/pkgs/by-name/ri/ringracers/package.nix
index 91c0c367050d..2a6998269793 100644
--- a/pkgs/by-name/ri/ringracers/package.nix
+++ b/pkgs/by-name/ri/ringracers/package.nix
@@ -16,31 +16,36 @@
   makeWrapper,
   makeDesktopItem,
   copyDesktopItems,
+  pkg-config,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ringracers";
-  version = "2.3";
+  version = "2.4";
 
   src = fetchFromGitHub {
     owner = "KartKrewDev";
     repo = "RingRacers";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-X2rSwZOEHtnSJBpu+Xf2vkxGUAZSNSXi6GCuGlM6jhY=";
+    hash = "sha256-iMbrbZCarMebP+ruu1JH4kwks6rR9A9CMquDUnMCUhU=";
   };
 
   assets = fetchzip {
     name = "${finalAttrs.pname}-${finalAttrs.version}-assets";
     url = "https://github.com/KartKrewDev/RingRacers/releases/download/v${finalAttrs.version}/Dr.Robotnik.s-Ring-Racers-v${finalAttrs.version}-Assets.zip";
-    hash = "sha256-sHeI1E6uNF0gBNd1e1AU/JT9wyZdkCQgYLiMPZqXAVc=";
+    hash = "sha256-vL3Ceu6/tIOl/+TJFjntCksDdjpgLc1aNHvSx6x8/90=";
     stripRoot = false;
   };
 
+  strictDeps = true;
+  enableParallelBuilding = true;
+
   nativeBuildInputs = [
     cmake
     nasm
     makeWrapper
     copyDesktopItems
+    pkg-config
   ];
 
   buildInputs = [
@@ -85,17 +90,12 @@ stdenv.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
-  postPatch = ''
-    substituteInPlace src/acs/vm/CMakeLists.txt \
-      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
-  '';
-
-  meta = with lib; {
+  meta = {
     description = "Kart racing video game based on Sonic Robo Blast 2 (SRB2), itself based on a modified version of Doom Legacy";
     homepage = "https://kartkrew.org";
-    platforms = platforms.linux;
-    license = licenses.gpl2Plus;
-    maintainers = with maintainers; [
+    platforms = lib.platforms.linux;
+    license = lib.licenses.gpl2Plus;
+    maintainers = with lib.maintainers; [
       donovanglover
       thehans255
       iedame

From 6e6301d53e15eadf299ea22fbcbfd0bf61b39ad6 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 18:03:16 -0300
Subject: [PATCH 5134/6226] maintainers: drop thehans255

---
 maintainers/maintainer-list.nix        | 6 ------
 pkgs/by-name/ri/ringracers/package.nix | 1 -
 2 files changed, 7 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3d52144b7468..22aaf1a37061 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -25844,12 +25844,6 @@
     github = "thegu5";
     githubId = 58223632;
   };
-  thehans255 = {
-    name = "Hans Jorgensen";
-    email = "foss-contact@thehans255.com";
-    github = "thehans255";
-    githubId = 15896573;
-  };
   thekostins = {
     name = "Konstantin";
     email = "anisimovkosta19@gmail.com";
diff --git a/pkgs/by-name/ri/ringracers/package.nix b/pkgs/by-name/ri/ringracers/package.nix
index 91c0c367050d..eee0aa753c8f 100644
--- a/pkgs/by-name/ri/ringracers/package.nix
+++ b/pkgs/by-name/ri/ringracers/package.nix
@@ -97,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = licenses.gpl2Plus;
     maintainers = with maintainers; [
       donovanglover
-      thehans255
       iedame
     ];
     mainProgram = "ringracers";

From 2dfb772337203f9d9502cb82e59306ad467c9a38 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 3 Nov 2025 21:02:00 +0100
Subject: [PATCH 5135/6226] python3Packages.bidsschematools: 1.1.1 -> 1.1.2

---
 .../python-modules/bidsschematools/default.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/python-modules/bidsschematools/default.nix b/pkgs/development/python-modules/bidsschematools/default.nix
index cd6747b1a71c..b9135a7e0e9d 100644
--- a/pkgs/development/python-modules/bidsschematools/default.nix
+++ b/pkgs/development/python-modules/bidsschematools/default.nix
@@ -1,8 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
-  fetchPypi,
+  fetchFromGitHub,
   pdm-backend,
   acres,
   click,
@@ -11,17 +10,18 @@
 
 buildPythonPackage rec {
   pname = "bidsschematools";
-  version = "1.1.1";
+  version = "1.1.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
-  src = fetchPypi {
-    pname = "bidsschematools";
-    inherit version;
-    hash = "sha256-cuc73ly01vHdBI3G+pTU13jMDiluj0wULT74WjwW5us=";
+  src = fetchFromGitHub {
+    owner = "bids-standard";
+    repo = "bids-specification";
+    tag = "schema-${version}";
+    hash = "sha256-b4dRGXkRkV+vmQ91fM8FMQv8iOt35dyf5unOEKNbNPc=";
   };
 
+  sourceRoot = "${src.name}/tools/schemacode";
+
   build-system = [
     pdm-backend
   ];

From 486baa8affbd7d64d89669a31e94f7e50912f7cd Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 3 Nov 2025 22:10:07 +0100
Subject: [PATCH 5136/6226] libks: 2.0.7 -> 2.0.8

---
 ...ly-request-shutdown-of-test2-threads.patch | 31 -------------------
 pkgs/by-name/li/libks/package.nix             | 10 ++----
 2 files changed, 3 insertions(+), 38 deletions(-)
 delete mode 100644 pkgs/by-name/li/libks/1001-tests-testhash.c-Properly-request-shutdown-of-test2-threads.patch

diff --git a/pkgs/by-name/li/libks/1001-tests-testhash.c-Properly-request-shutdown-of-test2-threads.patch b/pkgs/by-name/li/libks/1001-tests-testhash.c-Properly-request-shutdown-of-test2-threads.patch
deleted file mode 100644
index 5e59b385b4f8..000000000000
--- a/pkgs/by-name/li/libks/1001-tests-testhash.c-Properly-request-shutdown-of-test2-threads.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 61f2d2f7e308c42cce652db4a172cfa4b0ff6bf1 Mon Sep 17 00:00:00 2001
-From: OPNA2608 <opna2608@protonmail.com>
-Date: Sat, 18 Oct 2025 22:45:37 +0200
-Subject: [PATCH] tests/testhash.c: Properly request shutdown of test2 threads
-
-So they can be destroyed properly. Fixes sometimes-occuring SIGSEGVs.
----
- tests/testhash.c | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/tests/testhash.c b/tests/testhash.c
-index 0769aa6..cb6ed24 100644
---- a/tests/testhash.c
-+++ b/tests/testhash.c
-@@ -134,7 +134,12 @@ int test2(void)
- 	}
- 
- 	for (i = 0; i < ttl; i++) {
--		ks_thread_destroy(&threads[i]);
-+		ks_thread_request_stop(threads[i]);
-+	}
-+
-+	for (i = 0; i < ttl; i++) {
-+		ks_thread_join(threads[i]);
-+		if (ks_thread_destroy(&threads[i]) != KS_STATUS_SUCCESS) return 0;
- 	}
- 
- 
--- 
-2.51.0
-
diff --git a/pkgs/by-name/li/libks/package.nix b/pkgs/by-name/li/libks/package.nix
index 811b7097c7ef..4b6943d650d5 100644
--- a/pkgs/by-name/li/libks/package.nix
+++ b/pkgs/by-name/li/libks/package.nix
@@ -15,13 +15,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libks";
-  version = "2.0.7";
+  version = "2.0.8";
 
   src = fetchFromGitHub {
     owner = "signalwire";
     repo = "libks";
-    rev = "v${version}";
-    sha256 = "sha256-fiBemt71UJgN0RryGmGiK7sob1xbdmSOArEGt5Pg5YM=";
+    tag = "v${version}";
+    hash = "sha256-cBNNCOm+NcIvozN4Z4XnZWBBqq0LVELVqXubQB4JMTU=";
   };
 
   patches = [
@@ -29,9 +29,6 @@ stdenv.mkDerivation rec {
       url = "https://raw.githubusercontent.com/openwrt/telephony/5ced7ea4fc9bd746273d564bf3c102f253d2182e/libs/libks/patches/01-find-libm.patch";
       sha256 = "1hyrsdxg69d08qzvf3mbrx2363lw52jcybw8i3ynzqcl228gcg8a";
     })
-
-    # Remove when https://github.com/signalwire/libks/pull/246 merged & in release
-    ./1001-tests-testhash.c-Properly-request-shutdown-of-test2-threads.patch
   ];
 
   dontUseCmakeBuildDir = true;
@@ -72,7 +69,6 @@ stdenv.mkDerivation rec {
   };
 
   meta = with lib; {
-    broken = stdenv.hostPlatform.isDarwin;
     description = "Foundational support for signalwire C products";
     homepage = "https://github.com/signalwire/libks";
     maintainers = with lib.maintainers; [ misuzu ];

From 82afaae81e475efe013f8369f9faf287a2bb1f94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Nov 2025 12:59:12 -0800
Subject: [PATCH 5137/6226] python3Packages.marisa-trie: 1.2.1 -> 1.3.1

Diff: https://github.com/pytries/marisa-trie/compare/1.2.1...1.3.1

Changelog: https://github.com/pytries/marisa-trie/blob/1.3.1/CHANGES.rst
---
 .../python-modules/marisa-trie/default.nix    |  8 ++---
 .../marisa-trie/unvendor-marisa.patch         | 34 ++++++++-----------
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/pkgs/development/python-modules/marisa-trie/default.nix b/pkgs/development/python-modules/marisa-trie/default.nix
index c7a9c123b044..d7d9fb0a63e1 100644
--- a/pkgs/development/python-modules/marisa-trie/default.nix
+++ b/pkgs/development/python-modules/marisa-trie/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "marisa-trie";
-  version = "1.2.1";
+  version = "1.3.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pytries";
     repo = "marisa-trie";
     tag = version;
-    hash = "sha256-aWfm13nrASAaD+bcMpv85emXnCFyVtZTdhl79yJuOss=";
+    hash = "sha256-7T0V5levh9xjWmjJdFix0p8L3lZhfurikSWMI7Hotbs=";
   };
 
   patches = [
@@ -42,10 +42,6 @@ buildPythonPackage rec {
     hypothesis
   ];
 
-  preBuild = ''
-    ./update_cpp.sh
-  '';
-
   disabledTestPaths = [
     # Don't test packaging
     "tests/test_packaging.py"
diff --git a/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch b/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch
index 26ac8156a06b..69c0ee46678b 100644
--- a/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch
+++ b/pkgs/development/python-modules/marisa-trie/unvendor-marisa.patch
@@ -1,30 +1,26 @@
 diff --git a/setup.py b/setup.py
-index c0c5c03..6373a2a 100755
+index 133ba37..1026947 100755
 --- a/setup.py
 +++ b/setup.py
-@@ -71,15 +71,6 @@ setup(
-     license=LICENSE,
-     url="https://github.com/pytries/marisa-trie",
-     classifiers=CLASSIFIERS,
+@@ -26,19 +26,11 @@ extensions = [
+         "marisa_trie",
+         sources=["src/*.pyx"],
+         language="c++",
+-        include_dirs=[str(MARISA_INCLUDE_DIR)],
++        include_dirs=["@marisa@/include"],
++        libraries=["marisa"],
+     ),
+ ]
+ 
+ setup(
 -    libraries=[
 -        (
 -            "libmarisa-trie",
 -            {
 -                "sources": MARISA_FILES,
--                "include_dirs": [MARISA_SOURCE_DIR, MARISA_INCLUDE_DIR],
+-                "include_dirs": [str(MARISA_SOURCE_DIR), str(MARISA_INCLUDE_DIR)],
 -            },
 -        )
 -    ],
-     ext_modules=[
-         Extension(
-             "marisa_trie",
-@@ -94,7 +85,8 @@ setup(
-                 "src/std_iostream.cpp",
-                 "src/trie.cpp",
-             ],
--            include_dirs=[MARISA_INCLUDE_DIR],
-+            include_dirs=["@marisa@/include"],
-+            libraries=["marisa"],
-         )
-     ],
-     python_requires=">=3.8",
+     ext_modules=cythonize(extensions, language_level="3"),
+ )

From 420f5869495342b43ff91d144151481fa6c9c2f9 Mon Sep 17 00:00:00 2001
From: Robert James Hernandez <rob@sarcasticadmin.com>
Date: Mon, 3 Nov 2025 21:07:55 +0000
Subject: [PATCH 5138/6226] frr: localstatedir=/var so frr_libstatedir is
 properly set

When localstatedir=/run/frr it results in frr_libstatedir=/lib/frr. This is
due to truncating of localstatedir given the following case:

  https://github.com/FRRouting/frr/blob/ce66553bafc1806d745ea0724caca362d7335851/configure.ac#L59

And then localstatedir="" is later used to set
frr_libstatedir="\${localstatedir}/lib/frr":
  https://github.com/FRRouting/frr/blob/ce66553bafc1806d745ea0724caca362d7335851/configure.ac#L94

Setting localstatedir=/var (the recommended value) from the warning:

  https://github.com/FRRouting/frr/blob/ce66553bafc1806d745ea0724caca362d7335851/configure.ac#L61

This correctly set frr_libstatedir to /var/lib/frr and fixes the errors
during frr startup.
---
 pkgs/by-name/fr/frr/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix
index 40055508f80e..b2cda103219a 100644
--- a/pkgs/by-name/fr/frr/package.nix
+++ b/pkgs/by-name/fr/frr/package.nix
@@ -158,7 +158,7 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-multipath=${toString numMultipath}"
     "--enable-user=frr"
     "--enable-vty-group=frrvty"
-    "--localstatedir=/run/frr"
+    "--localstatedir=/var"
     "--sbindir=${placeholder "out"}/libexec/frr"
     "--sysconfdir=/etc/frr"
     "--with-clippy=${finalAttrs.clippy-helper}/bin/clippy"

From f425a4300a1715a860c3306dc01a4a35c46cc4b9 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 3 Nov 2025 22:30:19 +0100
Subject: [PATCH 5139/6226] blint: 3.0.4 -> 3.0.5

---
 pkgs/by-name/bl/blint/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bl/blint/package.nix b/pkgs/by-name/bl/blint/package.nix
index d8a975996666..d5cb89843651 100644
--- a/pkgs/by-name/bl/blint/package.nix
+++ b/pkgs/by-name/bl/blint/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "blint";
-  version = "3.0.4";
+  version = "3.0.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "owasp-dep-scan";
     repo = "blint";
     tag = "v${version}";
-    hash = "sha256-6dBNzBjhcBMX+PQ4NbjM18APqFuURH9/MYxHFZ/x7J8=";
+    hash = "sha256-RloxQlnhl4zCto6QO09UZs+29QRCpL0/PJCzYrVi8ng=";
   };
 
   build-system = [

From 4fa1fa56f3b27b419726477494e8671ba8809fb9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Nov 2025 13:30:28 -0800
Subject: [PATCH 5140/6226] libdeltachat: 2.23.0 -> 2.24.0

Diff: https://github.com/chatmail/core/compare/v2.23.0...v2.24.0

Changelog: https://github.com/chatmail/core/blob/v2.24.0/CHANGELOG.md
---
 pkgs/by-name/li/libdeltachat/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix
index 129725fca9a6..1a117efebfc6 100644
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdeltachat";
-  version = "2.23.0";
+  version = "2.24.0";
 
   src = fetchFromGitHub {
     owner = "chatmail";
     repo = "core";
     tag = "v${version}";
-    hash = "sha256-abSLSXD1bZ4Md2cs9pm7wlielLQicyl+/11TeShIsYI=";
+    hash = "sha256-OCC1qHeDSJJcbTmsyVKiwzXiIQAmofu/EhF56cRJ3kE=";
   };
 
   patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   cargoDeps = rustPlatform.fetchCargoVendor {
     pname = "chatmail-core";
     inherit version src;
-    hash = "sha256-dLcJV2WUwQJ1YdfqrsGp3nkMyilDhmtYA304jeSjxVQ=";
+    hash = "sha256-/PRIVdW2pnioqaYoIX/87cBbPezRaSbX5RWN6yuwpe8=";
   };
 
   nativeBuildInputs = [

From 0bd1d6d7c033bca25b1d7be2e1fc66692564bee4 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 4 Nov 2025 00:34:15 +0300
Subject: [PATCH 5141/6226] opencloud.web: 4.1.0 -> 4.2.0

---
 pkgs/by-name/op/opencloud/web.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opencloud/web.nix b/pkgs/by-name/op/opencloud/web.nix
index b25847a1f2d2..8626c6b1cd4c 100644
--- a/pkgs/by-name/op/opencloud/web.nix
+++ b/pkgs/by-name/op/opencloud/web.nix
@@ -9,19 +9,19 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencloud-web";
-  version = "4.1.0";
+  version = "4.2.0";
 
   src = fetchFromGitHub {
     owner = "opencloud-eu";
     repo = "web";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-m02qZS2au6gH0D009Mt8H2qKp2VdVxSIT0q3RKRkh8U=";
+    hash = "sha256-0OrdRqA/8sSZOMISLpZn3VmdlqO/i3u9zPdkOKGsYDY=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-wHrVBb/um7+6prBTzc30MXMCtERgGFV0mGvfS19tyTI=";
+    hash = "sha256-S5Xxlm6jWpxyg069g0un47EpIDiRSIMeP2qHyxCMWTs=";
   };
 
   nativeBuildInputs = [

From 5f5cefce23db98053ddc776576dcbbc83b9b4bb7 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 3 Nov 2025 22:35:49 +0100
Subject: [PATCH 5142/6226] python3Packages.pyvista: 0.46.3 -> 0.46.4

---
 pkgs/development/python-modules/pyvista/default.nix | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/pyvista/default.nix b/pkgs/development/python-modules/pyvista/default.nix
index af6f7942ea0c..e9368b223391 100644
--- a/pkgs/development/python-modules/pyvista/default.nix
+++ b/pkgs/development/python-modules/pyvista/default.nix
@@ -6,7 +6,6 @@
   numpy,
   pillow,
   pooch,
-  pythonAtLeast,
   scooby,
   setuptools,
   typing-extensions,
@@ -15,19 +14,16 @@
 
 buildPythonPackage rec {
   pname = "pyvista";
-  version = "0.46.3";
+  version = "0.46.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyvista";
     repo = "pyvista";
     tag = "v${version}";
-    hash = "sha256-RpgrsNMZmIfx3bb7W9xU6u4gJoAuDQ8Xx9C25TLp6PI=";
+    hash = "sha256-FFrnLiGiP6LSwaoEHx4tih6XPdKCZ/9tjvz00NQDU0Q=";
   };
 
-  # remove this line once pyvista 0.46 is released
-  pythonRelaxDeps = [ "vtk" ];
-
   build-system = [ setuptools ];
 
   dependencies = [

From 7781c7dfae4aa7bd59db7349562053d22ef15f14 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Tue, 4 Nov 2025 00:35:58 +0300
Subject: [PATCH 5143/6226] opencloud: 3.6.0 -> 3.7.0

---
 pkgs/by-name/op/opencloud/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/opencloud/package.nix b/pkgs/by-name/op/opencloud/package.nix
index f592b11447de..efb29b0847ec 100644
--- a/pkgs/by-name/op/opencloud/package.nix
+++ b/pkgs/by-name/op/opencloud/package.nix
@@ -28,13 +28,13 @@ let
 in
 buildGoModule rec {
   pname = "opencloud";
-  version = "3.6.0";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "opencloud-eu";
     repo = "opencloud";
     tag = "v${version}";
-    hash = "sha256-D9bqTsRMOgaeAj8k1H2Jz1zhagnaq1SCSzN8HHy4A3k=";
+    hash = "sha256-EseQbzQ/YRdv4b7cMl+563aQN5IcRMIZZtVqf9C4XCw=";
   };
 
   postPatch = ''

From 45ac6c0e313dbcc9ad88dea1caf6b72670fcc891 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 21:36:12 +0000
Subject: [PATCH 5144/6226] mopac: 23.2.1 -> 23.2.2

---
 pkgs/by-name/mo/mopac/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mo/mopac/package.nix b/pkgs/by-name/mo/mopac/package.nix
index 24406e3a619a..e2191b1330f4 100644
--- a/pkgs/by-name/mo/mopac/package.nix
+++ b/pkgs/by-name/mo/mopac/package.nix
@@ -13,13 +13,13 @@ assert blas.isILP64 == lapack.isILP64;
 
 stdenv.mkDerivation rec {
   pname = "mopac";
-  version = "23.2.1";
+  version = "23.2.2";
 
   src = fetchFromGitHub {
     owner = "openmopac";
     repo = "mopac";
     rev = "v${version}";
-    hash = "sha256-2+6mIxawYOqgsKRWDBLXMhP53VJTTGFN4AKunq4YD4o=";
+    hash = "sha256-VBbW0N67ZbTymYfLrT625rkWeeYbFrEdTxPOCanFT0c=";
   };
 
   nativeBuildInputs = [

From 04e90c5d8d5c6bd645ec830f44b749bcef4316c6 Mon Sep 17 00:00:00 2001
From: SandaruKasa <sandarukasa@ya.ru>
Date: Mon, 8 Sep 2025 20:58:51 +0300
Subject: [PATCH 5145/6226] openobserve: 0.14.7 -> 0.15.3

Diff: https://github.com/openobserve/openobserve/compare/v0.14.7...v0.15.3

Changelog: https://github.com/openobserve/openobserve/releases/tag/v0.15.3
---
 pkgs/by-name/op/openobserve/package.nix | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/op/openobserve/package.nix b/pkgs/by-name/op/openobserve/package.nix
index 3b65726b5611..41eb24d79708 100644
--- a/pkgs/by-name/op/openobserve/package.nix
+++ b/pkgs/by-name/op/openobserve/package.nix
@@ -15,12 +15,12 @@
 }:
 
 let
-  version = "0.14.7";
+  version = "0.15.3";
   src = fetchFromGitHub {
     owner = "openobserve";
     repo = "openobserve";
     tag = "v${version}";
-    hash = "sha256-+YcVTn/jcEbaqTycMCYn6B0z2HsvgrCY1gHnkRajwSs=";
+    hash = "sha256-GHyfIVUSX7evP3LaHZClD1RjZ6somYcMNBFdkaZL7lg=";
   };
   web = buildNpmPackage {
     inherit src version;
@@ -28,7 +28,7 @@ let
 
     sourceRoot = "${src.name}/web";
 
-    npmDepsHash = "sha256-1MUmAWkeYUEL6WZGq1Jg5W2uKa2xj0oZbGlIbvZWT1E=";
+    npmDepsHash = "sha256-5bXEC48m3FbtmLwVYYvEdMV3qWA7KNEKVxkMZ94qEpA=";
 
     preBuild = ''
       # Patch vite config to not open the browser to visualize plugin composition
@@ -63,7 +63,7 @@ rustPlatform.buildRustPackage {
     cp -r ${web}/share/openobserve-ui web/dist
   '';
 
-  cargoHash = "sha256-vfc6B+Uc8RXQD8vGC1yV9w5YAefkYJMpCH2frqjrSWk=";
+  cargoHash = "sha256-j/bx4qoWcSh2/yJ9evnzSfyUd0tLAk4M310A89k4wy8=";
 
   nativeBuildInputs = [
     pkg-config
@@ -95,10 +95,13 @@ rustPlatform.buildRustPackage {
   checkFlags = [
     "--skip=handler::http::router::tests::test_get_proxy_routes"
     "--skip=tests::e2e_test"
-    # test_export_operator unit test panics when run on the 0.14.7 release
-    # see this issue for more details : https://github.com/NixOS/nixpkgs/issues/447106
-    "--skip=tests::test_export_operator"
-    "--skip=service::organization::tests::test_organization"
+    "--skip=tests::test_setup_logs"
+    "--skip=handler::http::router::middlewares::compress::Compress"
+    # Tests are not threadsafe. Most likely can only run one test at a time,
+    # due to altering shared database state.
+    # This option already in upstream code: https://github.com/openobserve/openobserve/pull/7084
+    # Also see: https://github.com/NixOS/nixpkgs/pull/457421
+    "--test-threads=1"
   ];
 
   passthru.updateScript = gitUpdater {

From 2519e4eb7ee05661e70a4e45135ed8c982029bbf Mon Sep 17 00:00:00 2001
From: Vidhan Bhatt <me@vidhan.io>
Date: Mon, 3 Nov 2025 14:12:06 -0500
Subject: [PATCH 5146/6226] nixos/_1password-gui: apply polkit override to
 package option

---
 nixos/modules/programs/_1password-gui.nix | 43 ++++++++++++-----------
 1 file changed, 22 insertions(+), 21 deletions(-)

diff --git a/nixos/modules/programs/_1password-gui.nix b/nixos/modules/programs/_1password-gui.nix
index f840dbbe8a73..32b6f998c0b7 100644
--- a/nixos/modules/programs/_1password-gui.nix
+++ b/nixos/modules/programs/_1password-gui.nix
@@ -30,31 +30,32 @@ in
         '';
       };
 
-      package = lib.mkPackageOption pkgs "1Password GUI" {
-        default = [ "_1password-gui" ];
-      };
+      package =
+        lib.mkPackageOption pkgs "1Password GUI" {
+          default = [ "_1password-gui" ];
+        }
+        // {
+          apply =
+            pkg:
+            pkg.override {
+              inherit (cfg) polkitPolicyOwners;
+            };
+        };
     };
   };
 
-  config =
-    let
-      package = cfg.package.override {
-        polkitPolicyOwners = cfg.polkitPolicyOwners;
-      };
-    in
-    lib.mkIf cfg.enable {
-      environment.systemPackages = [ package ];
-      users.groups.onepassword.gid = config.ids.gids.onepassword;
+  config = lib.mkIf cfg.enable {
+    environment.systemPackages = [ cfg.package ];
+    users.groups.onepassword.gid = config.ids.gids.onepassword;
 
-      security.wrappers = {
-        "1Password-BrowserSupport" = {
-          source = "${package}/share/1password/1Password-BrowserSupport";
-          owner = "root";
-          group = "onepassword";
-          setuid = false;
-          setgid = true;
-        };
+    security.wrappers = {
+      "1Password-BrowserSupport" = {
+        source = "${cfg.package}/share/1password/1Password-BrowserSupport";
+        owner = "root";
+        group = "onepassword";
+        setuid = false;
+        setgid = true;
       };
-
     };
+  };
 }

From 07f6f2dcf523f80fe095ab87e5607bbf5b224dbe Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 1 Nov 2025 19:17:34 +0100
Subject: [PATCH 5147/6226] sse2neon: fix description and homepage

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/ss/sse2neon/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ss/sse2neon/package.nix b/pkgs/by-name/ss/sse2neon/package.nix
index fc5ec88908dc..da6664d70869 100644
--- a/pkgs/by-name/ss/sse2neon/package.nix
+++ b/pkgs/by-name/ss/sse2neon/package.nix
@@ -32,8 +32,8 @@ stdenv.mkDerivation (finalAttrs: {
   '';
 
   meta = {
-    description = "Mono library that provides a GDI+-compatible API on non-Windows operating systems";
-    homepage = "https://www.mono-project.com/docs/gui/libgdiplus/";
+    description = "C/C++ header file that converts Intel SSE intrinsics to Arm/Aarch64 NEON intrinsics";
+    homepage = "https://github.com/DLTcollab/sse2neon";
     platforms = lib.platforms.unix;
     license = lib.licenses.mit;
     maintainers = [ lib.maintainers.gador ];

From e3df16395a0621655f2f88a45e0265dde985e2d0 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Sat, 1 Nov 2025 19:17:34 +0100
Subject: [PATCH 5148/6226] sse2neon: modernize

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/bl/blender/package.nix  |  2 +-
 pkgs/by-name/ss/sse2neon/package.nix | 18 ++++++------------
 2 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix
index 25d6eb947682..8645982537e9 100644
--- a/pkgs/by-name/bl/blender/package.nix
+++ b/pkgs/by-name/bl/blender/package.nix
@@ -207,7 +207,7 @@ stdenv'.mkDerivation (finalAttrs: {
   ++ lib.optional stdenv.cc.isClang "-DPYTHON_LINKFLAGS=" # Clang doesn't support "-export-dynamic"
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     "-DLIBDIR=/does-not-exist"
-    "-DSSE2NEON_INCLUDE_DIR=${sse2neon}/lib"
+    "-DSSE2NEON_INCLUDE_DIR=${sse2neon}/include"
   ];
 
   preConfigure = ''
diff --git a/pkgs/by-name/ss/sse2neon/package.nix b/pkgs/by-name/ss/sse2neon/package.nix
index da6664d70869..7b4420e62f82 100644
--- a/pkgs/by-name/ss/sse2neon/package.nix
+++ b/pkgs/by-name/ss/sse2neon/package.nix
@@ -1,7 +1,6 @@
 {
   lib,
   fetchFromGitHub,
-  pkg-config,
   stdenv,
 }:
 
@@ -16,19 +15,14 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-vb9k+KjiGodVngza0R18LjfPTlsqFbzqXZqefm6KHj0=";
   };
 
-  postPatch = ''
-    # remove warning about gcc < 10
-    substituteInPlace sse2neon.h --replace-fail "#warning \"GCC versions" "// "
-  '';
+  doCheck = true;
 
-  nativeBuildInputs = [ pkg-config ];
+  installPhase = ''
+    runHook preInstall
 
-  dontInstall = true;
-  # use postBuild instead of installPhase, because the build
-  # in itself doesn't produce any ($out) output
-  postBuild = ''
-    mkdir -p $out/lib
-    install -m444 sse2neon.h $out/lib/
+    install -Dm644 sse2neon.h $out/include/sse2neon.h
+
+    runHook postInstall
   '';
 
   meta = {

From 5765b2b4f2bde1f1acfd49785cf705cb131e4da9 Mon Sep 17 00:00:00 2001
From: Winter M <winter@antithesis.com>
Date: Mon, 3 Nov 2025 16:41:17 -0500
Subject: [PATCH 5149/6226] nixos/_1password-gui: remove extraneous whitespace

---
 nixos/modules/programs/_1password-gui.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/nixos/modules/programs/_1password-gui.nix b/nixos/modules/programs/_1password-gui.nix
index 32b6f998c0b7..cc27e46fcc7d 100644
--- a/nixos/modules/programs/_1password-gui.nix
+++ b/nixos/modules/programs/_1password-gui.nix
@@ -6,9 +6,7 @@
 }:
 
 let
-
   cfg = config.programs._1password-gui;
-
 in
 {
   imports = [

From 31b3ab59a4e4337069ed19ac27d178420ed71765 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Mon, 3 Nov 2025 22:42:18 +0100
Subject: [PATCH 5150/6226] gnunet: 0.25.1 -> 0.25.2

---
 pkgs/by-name/gn/gnunet/package.nix | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/gn/gnunet/package.nix b/pkgs/by-name/gn/gnunet/package.nix
index 2c5d643a1c5b..b9e3204ca23a 100644
--- a/pkgs/by-name/gn/gnunet/package.nix
+++ b/pkgs/by-name/gn/gnunet/package.nix
@@ -39,11 +39,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gnunet";
-  version = "0.25.1";
+  version = "0.25.2";
 
   src = fetchurl {
     url = "mirror://gnu/gnunet/gnunet-${finalAttrs.version}.tar.gz";
-    hash = "sha256-ITNsFs1X+R+dX9U1lILZFRp83w1jlvi2GCjBfMxmj1w=";
+    hash = "sha256-6rdvw105OrFfrbY0T4Q1JcFlYZQAc1qm3eCWb2omwuY=";
   };
 
   enableParallelBuilding = true;
@@ -94,12 +94,6 @@ stdenv.mkDerivation (finalAttrs: {
     # builds.
     find . \( -iname \*test\*.c -or -name \*.conf \) | \
       xargs sed -i -e "s|/tmp|$TMPDIR|g"
-
-    # fix error: conflicting types for `GNUNET_TESTING_cmd_{exec,finish}`
-    for name in exec finish; do
-      substituteInPlace src/lib/testing/testing_api_cmd_$name.c \
-        --replace-fail 'const struct GNUNET_TESTING_Command' 'struct GNUNET_TESTING_Command'
-    done
   '';
 
   # unfortunately, there's still a few failures with impure tests

From a66dfe40da38ac5e52597f1af99578e395191bab Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 21:49:09 +0000
Subject: [PATCH 5151/6226] prometheus-alertmanager: 0.28.1 -> 0.29.0

---
 pkgs/servers/monitoring/prometheus/alertmanager.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/alertmanager.nix b/pkgs/servers/monitoring/prometheus/alertmanager.nix
index 23eeb36baadf..18b4dc52e323 100644
--- a/pkgs/servers/monitoring/prometheus/alertmanager.nix
+++ b/pkgs/servers/monitoring/prometheus/alertmanager.nix
@@ -9,17 +9,17 @@
 
 buildGoModule rec {
   pname = "alertmanager";
-  version = "0.28.1";
+  version = "0.29.0";
   rev = "v${version}";
 
   src = fetchFromGitHub {
     inherit rev;
     owner = "prometheus";
     repo = "alertmanager";
-    hash = "sha256-2HHQ7S1J/X4PVFnPbi8Oapsqf1MyNnsqfMMBJRItWf0=";
+    hash = "sha256-2uP4JCbQEe7/en5sBq/k73kqK6YVmuLvfiUy1fqPitw=";
   };
 
-  vendorHash = "sha256-4XWHe32UZ+1HOQzQdZX4leoPD6pfJZwyjDQV3dv164s=";
+  vendorHash = "sha256-bN1iV2JrrjwiiIXr5lp389HvEoQGteJQD94cug0/048=";
 
   subPackages = [
     "cmd/alertmanager"

From a543db31e85862d3b8b9193cf4ad9cda728d432c Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Mon, 3 Nov 2025 22:31:28 +0100
Subject: [PATCH 5152/6226] etterna: add aarch64-linux support

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 .../0001-Add-aarch64-linux-support.patch      | 61 +++++++++++++++++++
 pkgs/by-name/et/etterna/package.nix           |  7 ++-
 2 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/et/etterna/0001-Add-aarch64-linux-support.patch

diff --git a/pkgs/by-name/et/etterna/0001-Add-aarch64-linux-support.patch b/pkgs/by-name/et/etterna/0001-Add-aarch64-linux-support.patch
new file mode 100644
index 000000000000..33b94e5a6977
--- /dev/null
+++ b/pkgs/by-name/et/etterna/0001-Add-aarch64-linux-support.patch
@@ -0,0 +1,61 @@
+From 778cb2ed0d56614fd06d2129398799e46ff51720 Mon Sep 17 00:00:00 2001
+From: Marcin Serwin <marcin@serwin.dev>
+Date: Mon, 3 Nov 2025 22:25:10 +0100
+Subject: [PATCH] Add aarch64-linux support
+
+Signed-off-by: Marcin Serwin <marcin@serwin.dev>
+---
+ src/Etterna/Models/Misc/StageStats.cpp | 23 +++++++++++++++++++++--
+ 1 file changed, 21 insertions(+), 2 deletions(-)
+
+diff --git a/src/Etterna/Models/Misc/StageStats.cpp b/src/Etterna/Models/Misc/StageStats.cpp
+index 0c70cf25ae..671717505d 100644
+--- a/src/Etterna/Models/Misc/StageStats.cpp
++++ b/src/Etterna/Models/Misc/StageStats.cpp
+@@ -19,8 +19,9 @@
+ #include "Etterna/Singletons/GameManager.h"
+ #include "Etterna/Models/NoteData/NoteDataUtil.h"
+ 
+-#if !( defined(_WIN32) || defined(__APPLE__))
+-	#include <cpuid.h> //We only use cpuid.h on Linux :)
++#if !( defined(_WIN32) || defined(__APPLE__)) \
++    && (defined(__x86_64__) || defined(__i386__))
++	#include <cpuid.h> //We only use cpuid.h on x86 Linux :)
+ #endif
+ 
+ #ifdef _WIN32
+@@ -236,6 +237,8 @@ getCpuHash()
+ 
+ #else  // !DARWIN
+ 
++#if defined(__x86_64__) || defined(__i386__)
++
+ uint16_t
+ getCpuHash()
+ {
+@@ -248,6 +251,22 @@ getCpuHash()
+ 
+ 	return hash;
+ }
++
++#else // !x86
++
++uint16_t
++getCpuHash()
++{
++	// https://www.kernel.org/doc/html/v6.17/arch/arm64/cpu-feature-registers.html
++	uint64_t midr = 0;
++	asm("mrs %0, MIDR_EL1" : "=r"(midr));
++
++	// Only leave implementer, variant, and architecture bits.
++	// See https://developer.arm.com/documentation/ddi0601/2025-09/AArch64-Registers/MIDR-EL1--Main-ID-Register?lang=en
++	return midr >> 16;
++}
++
++#endif // !x86
+ #endif // !DARWIN
+ 
+ std::string
+-- 
+2.51.0
+
diff --git a/pkgs/by-name/et/etterna/package.nix b/pkgs/by-name/et/etterna/package.nix
index dff72cd5b51a..c4e6f97a8086 100644
--- a/pkgs/by-name/et/etterna/package.nix
+++ b/pkgs/by-name/et/etterna/package.nix
@@ -27,7 +27,12 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-ZCQt99Qcov/7jGfrSmX9WftaP2U2B1d1APK1mxrUDBs=";
   };
 
-  patches = [ ./fix-download-manager.patch ];
+  patches = [
+    ./fix-download-manager.patch
+
+    # https://github.com/etternagame/etterna/pull/1396
+    ./0001-Add-aarch64-linux-support.patch
+  ];
 
   nativeBuildInputs = [
     cmake

From 55a1fd504b990d5efacf9f9ed788d938fc913d18 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Mon, 3 Nov 2025 22:47:31 +0100
Subject: [PATCH 5153/6226] etterna: specify meta.platforms

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/et/etterna/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/et/etterna/package.nix b/pkgs/by-name/et/etterna/package.nix
index c4e6f97a8086..593b66bd10a1 100644
--- a/pkgs/by-name/et/etterna/package.nix
+++ b/pkgs/by-name/et/etterna/package.nix
@@ -110,5 +110,9 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ alikindsys ];
     mainProgram = "etterna";
+    platforms = [
+      "x86_64-linux"
+      "aarch64-linux"
+    ];
   };
 })

From c8ad12df2ac5e54955dd174646c5c06f3881f12b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 21:51:41 +0000
Subject: [PATCH 5154/6226] nova: 3.11.8 -> 3.11.9

---
 pkgs/by-name/no/nova/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/no/nova/package.nix b/pkgs/by-name/no/nova/package.nix
index ccc56a7a1cc2..20ceb28d574c 100644
--- a/pkgs/by-name/no/nova/package.nix
+++ b/pkgs/by-name/no/nova/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "nova";
-  version = "3.11.8";
+  version = "3.11.9";
 
   src = fetchFromGitHub {
     owner = "FairwindsOps";
     repo = "nova";
     rev = "v${version}";
-    hash = "sha256-2iFDTCjBnMf0FglHTZq9v+yyzCqvrT1vhDkpAL6yG6Y=";
+    hash = "sha256-5ZZbuWHvPgdpJstYXbDWo3KQkbzMd+a7ttzCg2bJ67o=";
   };
 
-  vendorHash = "sha256-+cw2NclPLT9S1iakK2S5uc+nFE84MIl6QOH/L0kgoHE=";
+  vendorHash = "sha256-Q8mYIX5lIFtEOQPaUL0zCEzKAHoCiyt1bRaSb2o+vpI=";
 
   ldflags = [
     "-X main.version=${version}"

From 8ea573926b3ad5af08ce617261b91350cc935955 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 3 Nov 2025 21:55:21 +0100
Subject: [PATCH 5155/6226] licenses: add gnuplot

---
 lib/licenses.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index b3d4a82b87c8..81be54b5934c 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -665,6 +665,11 @@ lib.mapAttrs mkLicense (
       url = "https://www.gust.org.pl/projects/e-foundry/licenses/GUST-FONT-SOURCE-LICENSE.txt";
     };
 
+    gnuplot = {
+      spdxId = "gnuplot";
+      fullName = "gnuplot License";
+    };
+
     gpl1Only = {
       spdxId = "GPL-1.0-only";
       fullName = "GNU General Public License v1.0 only";

From f36f23fed02b1b0d28d38c1630e12cd5b76604f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 3 Nov 2025 21:55:28 +0100
Subject: [PATCH 5156/6226] gnuplot: use gnuplot license

---
 pkgs/tools/graphics/gnuplot/default.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/tools/graphics/gnuplot/default.nix b/pkgs/tools/graphics/gnuplot/default.nix
index 368991fa39e2..8397e5ea71fc 100644
--- a/pkgs/tools/graphics/gnuplot/default.nix
+++ b/pkgs/tools/graphics/gnuplot/default.nix
@@ -123,15 +123,7 @@ in
     homepage = "http://www.gnuplot.info/";
     description = "Portable command-line driven graphing utility for many platforms";
     platforms = platforms.linux ++ platforms.darwin;
-    license = {
-      # Essentially a BSD license with one modification:
-      # Permission to modify the software is granted, but not the right to
-      # distribute the complete modified source code.  Modifications are to
-      # be distributed as patches to the released version.  Permission to
-      # distribute binaries produced by compiling modified sources is granted,
-      # provided you: ...
-      url = "https://sourceforge.net/p/gnuplot/gnuplot-main/ci/master/tree/Copyright";
-    };
+    license = lib.licenses.gnuplot;
     maintainers = with maintainers; [ lovek323 ];
     mainProgram = "gnuplot";
   };

From 882b9d6733ba34cc121a7fe13fcce6d08575a76c Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 18:58:10 -0300
Subject: [PATCH 5157/6226] aranym: mark as broken on darwin and aarch64 linux

---
 pkgs/by-name/ar/aranym/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ar/aranym/package.nix b/pkgs/by-name/ar/aranym/package.nix
index 435edc7d3274..627790626b4d 100644
--- a/pkgs/by-name/ar/aranym/package.nix
+++ b/pkgs/by-name/ar/aranym/package.nix
@@ -56,5 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "aranym";
     maintainers = [ ];
     platforms = lib.platforms.unix;
+    # never successfully built on Hydra for darwin or aarch64 linux
+    broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;
   };
 })

From cbaefb220b0ae3d79c95a4d2bd6435d53cba339e Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 18:58:48 -0300
Subject: [PATCH 5158/6226] aranym: add maintainer iedame

---
 pkgs/by-name/ar/aranym/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ar/aranym/package.nix b/pkgs/by-name/ar/aranym/package.nix
index 627790626b4d..23a8155b79bb 100644
--- a/pkgs/by-name/ar/aranym/package.nix
+++ b/pkgs/by-name/ar/aranym/package.nix
@@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: {
     '';
     license = with lib.licenses; [ gpl2Plus ];
     mainProgram = "aranym";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ iedame ];
     platforms = lib.platforms.unix;
     # never successfully built on Hydra for darwin or aarch64 linux
     broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64;

From a4d9d9eb1560509bb06b3afc3173f39c64c577ce Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 19:40:51 -0300
Subject: [PATCH 5159/6226] qscreenshot: mark as broken on darwin

---
 pkgs/by-name/qs/qscreenshot/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/qs/qscreenshot/package.nix b/pkgs/by-name/qs/qscreenshot/package.nix
index c6356a75b665..41d0c52cd6c5 100644
--- a/pkgs/by-name/qs/qscreenshot/package.nix
+++ b/pkgs/by-name/qs/qscreenshot/package.nix
@@ -40,5 +40,7 @@ stdenv.mkDerivation {
     license = licenses.gpl2;
     platforms = platforms.all;
     maintainers = [ maintainers.bjornfor ];
+    # last successful hydra build on darwin was in 2019
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From b5885d755231542108c7471f4e4e068a49ee8fec Mon Sep 17 00:00:00 2001
From: Karolis Stasaitis <contact@carlossless.io>
Date: Tue, 21 Oct 2025 13:09:57 +0200
Subject: [PATCH 5160/6226] scopehal-apps: build fix

---
 pkgs/by-name/sc/scopehal-apps/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/sc/scopehal-apps/package.nix b/pkgs/by-name/sc/scopehal-apps/package.nix
index e64f9557db16..57ab8162b3dd 100644
--- a/pkgs/by-name/sc/scopehal-apps/package.nix
+++ b/pkgs/by-name/sc/scopehal-apps/package.nix
@@ -88,6 +88,11 @@ stdenv.mkDerivation {
     "-DNGSCOPECLIENT_VERSION=${version}"
   ];
 
+  env.NIX_CFLAGS_COMPILE = toString [
+    # error: variable 'empty_string' is uninitialized when passed as a const pointer argument here [-Werror,-Wuninitialized-const-pointer]
+    "-Wno-error=uninitialized"
+  ];
+
   patches = [
     ./remove-git-derived-version.patch
   ]

From 1f4d088ef1258df8c309073f6b98d710bec5c819 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 22:56:54 +0000
Subject: [PATCH 5161/6226] python3Packages.snakemake-interface-report-plugins:
 1.2.0 -> 1.3.0

---
 .../snakemake-interface-report-plugins/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix
index 6e6be26ae102..ea74d2b18d18 100644
--- a/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix
+++ b/pkgs/development/python-modules/snakemake-interface-report-plugins/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "snakemake-interface-report-plugins";
-  version = "1.2.0";
+  version = "1.3.0";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-interface-report-plugins";
     tag = "v${version}";
-    hash = "sha256-wyDJa8Pahe+ANSNqZ1BZRmljpabyXhLodMJhupjd3pY=";
+    hash = "sha256-3ugEmdO1dcusKXXBZBRszlZXX5fhJyYSSF5Uj5CKJkQ=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From a7296a340ba76655e554e298388777398dc52748 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 23:18:08 +0000
Subject: [PATCH 5162/6226] dinish: 4.006 -> 4.007

---
 pkgs/by-name/di/dinish/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/di/dinish/package.nix b/pkgs/by-name/di/dinish/package.nix
index 93ecb7c364bc..15d04fb41e95 100644
--- a/pkgs/by-name/di/dinish/package.nix
+++ b/pkgs/by-name/di/dinish/package.nix
@@ -7,12 +7,12 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "dinish";
-  version = "4.006";
+  version = "4.007";
 
   src = fetchzip {
     url = "https://github.com/playbeing/dinish/releases/download/v${version}/dinish-ttf.zip";
     stripRoot = false;
-    hash = "sha256-IWguCiDSeQ+f/saNoyk2pUF/k0pEiFweXinoqOEVWEI=";
+    hash = "sha256-u/AYA9/8piZ6hz4XD3uSruOM0deeXQ5Gb0N/8rlDiP0=";
   };
 
   installPhase = ''

From 44b2a98a25fce208c208852d8ef36c8dafef2913 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 20:26:25 -0300
Subject: [PATCH 5163/6226] itk_5_2: fix build with cmake4

---
 pkgs/development/libraries/itk/generic.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/itk/generic.nix b/pkgs/development/libraries/itk/generic.nix
index ede33338a811..c55c362c6d4f 100644
--- a/pkgs/development/libraries/itk/generic.nix
+++ b/pkgs/development/libraries/itk/generic.nix
@@ -124,7 +124,8 @@ stdenv.mkDerivation {
     "-DITK_USE_SYSTEM_SWIG=ON"
     "-DPY_SITE_PACKAGES_PATH=${placeholder "out"}/${python.sitePackages}"
   ]
-  ++ lib.optionals withVtk [ "-DModule_ITKVtkGlue=ON" ];
+  ++ lib.optionals withVtk [ "-DModule_ITKVtkGlue=ON" ]
+  ++ lib.optionals (lib.versionOlder version "5.4") [ "-DCMAKE_POLICY_VERSION_MINIMUM=3.5" ];
 
   nativeBuildInputs = [
     cmake

From adcdd30fe25a69c572f2d89876a728cce3b3ba18 Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Mon, 3 Nov 2025 15:17:51 -0800
Subject: [PATCH 5164/6226] phytool: init at 2-unstable-2024-07-14

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 pkgs/by-name/ph/phytool/package.nix | 35 +++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 pkgs/by-name/ph/phytool/package.nix

diff --git a/pkgs/by-name/ph/phytool/package.nix b/pkgs/by-name/ph/phytool/package.nix
new file mode 100644
index 000000000000..9a19b0fa398c
--- /dev/null
+++ b/pkgs/by-name/ph/phytool/package.nix
@@ -0,0 +1,35 @@
+{
+  fetchFromGitHub,
+  lib,
+  stdenv,
+}:
+stdenv.mkDerivation {
+  __structuredAttrs = true;
+  strictDeps = true;
+
+  pname = "phytool";
+  version = "2-unstable-2024-07-14";
+
+  src = fetchFromGitHub {
+    owner = "wkz";
+    repo = "phytool";
+    rev = "bcf23b0261aa9f352ee4b944e30e3482158640a4";
+    hash = "sha256-8e2DVjG/2CtJ/+FLzMa1VKajJZfFqjD54XQAMY+0q3U=";
+  };
+
+  makeFlags = [
+    "PREFIX=$(out)"
+  ];
+
+  preInstall = ''
+    mkdir -p "$out/bin"
+  '';
+
+  meta = {
+    description = "Linux MDIO register access";
+    homepage = "https://github.com/wkz/phytool";
+    changelog = "https://github.com/wkz/phytool/releases";
+    license = lib.licenses.gpl2;
+    maintainers = [ lib.maintainers.connorbaker ];
+  };
+}

From c6bd6c9c4d92c3d878a2adc08f79d869d8e3a983 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 23:35:09 +0000
Subject: [PATCH 5165/6226] vimPlugins.avante-nvim: 0.0.27-unstable-2025-10-22
 -> 0.0.27-unstable-2025-10-31

---
 .../vim/plugins/non-generated/avante-nvim/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
index a2d0940a2056..f79b73dc93db 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/avante-nvim/default.nix
@@ -12,12 +12,12 @@
   pkgs,
 }:
 let
-  version = "0.0.27-unstable-2025-10-22";
+  version = "0.0.27-unstable-2025-10-31";
   src = fetchFromGitHub {
     owner = "yetone";
     repo = "avante.nvim";
-    rev = "164a86db6e5da78bc42310691a26b22d0763ceca";
-    hash = "sha256-hNKkb0PdKPC2m1a0stgCkAxk2P4uL8WiqiGpOY79Efo=";
+    rev = "7f48770e66684e9a7d4d5b9c47505a23e0167a6e";
+    hash = "sha256-U8RnTBGW+dR26JATQ10JbM8R03qX/ovPjvelHw2J7fc=";
   };
   avante-nvim-lib = rustPlatform.buildRustPackage {
     pname = "avante-nvim-lib";

From 8e4e580dbf28fe19af84334dab1f15ffa913ac79 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 3 Nov 2025 23:58:58 +0000
Subject: [PATCH 5166/6226] ramalama: 0.13.0 -> 0.14.0

---
 pkgs/by-name/ra/ramalama/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ra/ramalama/package.nix b/pkgs/by-name/ra/ramalama/package.nix
index 07f493703910..8cf3a2ef07c9 100644
--- a/pkgs/by-name/ra/ramalama/package.nix
+++ b/pkgs/by-name/ra/ramalama/package.nix
@@ -14,14 +14,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ramalama";
-  version = "0.13.0";
+  version = "0.14.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "containers";
     repo = "ramalama";
     tag = "v${version}";
-    hash = "sha256-S4TZN+vExZ/5KJOgkhwlX0p+xPDI6tjmS2WDWgXzDOI=";
+    hash = "sha256-4RoZX8CzMGNGsh8TawPYYMi2ZZXDIGfD/p94SS+326Y=";
   };
 
   build-system = with python3Packages; [

From f979e4cd63ed01405331a94b6d27ffff3f16c7b6 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 20:59:25 -0300
Subject: [PATCH 5167/6226] bicgl: fix build with cmake4

---
 pkgs/by-name/bi/bicgl/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/bi/bicgl/package.nix b/pkgs/by-name/bi/bicgl/package.nix
index 7c7327b31c5e..76231816053c 100644
--- a/pkgs/by-name/bi/bicgl/package.nix
+++ b/pkgs/by-name/bi/bicgl/package.nix
@@ -35,6 +35,11 @@ stdenv.mkDerivation rec {
     "-DBICPL_DIR=${bicpl}/lib"
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "https://github.com/${owner}/bicgl";
     description = "Brain Imaging Centre graphics library";

From bf654e42bb635b6ceb605f6c9465d02aae08bf16 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 20:59:41 -0300
Subject: [PATCH 5168/6226] conglomerate: fix build with cmake4

---
 pkgs/by-name/co/conglomerate/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/co/conglomerate/package.nix b/pkgs/by-name/co/conglomerate/package.nix
index 5c4fc39a8ddc..a200d9fe49c9 100644
--- a/pkgs/by-name/co/conglomerate/package.nix
+++ b/pkgs/by-name/co/conglomerate/package.nix
@@ -47,6 +47,11 @@ stdenv.mkDerivation {
     "-DBICPL_DIR=${bicpl}/lib"
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   postFixup = ''
     for p in $out/bin/*; do
       wrapProgram $p --prefix PERL5LIB : $PERL5LIB --set PATH "${

From 5b8fd344821875e897d0367ddd59a3e09bcddfab Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 3 Nov 2025 18:59:44 -0500
Subject: [PATCH 5169/6226] nixpkgs-review: add mdaniels5757 as maintainer

---
 pkgs/by-name/ni/nixpkgs-review/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ni/nixpkgs-review/package.nix b/pkgs/by-name/ni/nixpkgs-review/package.nix
index ef6966de0d62..4759c8248966 100644
--- a/pkgs/by-name/ni/nixpkgs-review/package.nix
+++ b/pkgs/by-name/ni/nixpkgs-review/package.nix
@@ -86,6 +86,7 @@ python3Packages.buildPythonApplication rec {
     license = lib.licenses.mit;
     mainProgram = "nixpkgs-review";
     maintainers = with lib.maintainers; [
+      mdaniels5757
       mic92
     ];
   };

From 622bfea52b3ae979351233907a0548c8dc449236 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 3 Nov 2025 19:00:36 -0500
Subject: [PATCH 5170/6226] nix-update: add mdaniels5757 as maintainer

---
 pkgs/by-name/ni/nix-update/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix
index 0f266bb8c1a3..d005fd639f5c 100644
--- a/pkgs/by-name/ni/nix-update/package.nix
+++ b/pkgs/by-name/ni/nix-update/package.nix
@@ -52,6 +52,7 @@ python3Packages.buildPythonApplication rec {
     changelog = "https://github.com/Mic92/nix-update/releases/tag/${version}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
+      mdaniels5757
       mic92
     ];
     mainProgram = "nix-update";

From d7896d5ebde38399e9822cd3f4cb170c8246e904 Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Mon, 3 Nov 2025 19:24:01 -0500
Subject: [PATCH 5171/6226] regex-cli: adopt, add updateScript

---
 pkgs/by-name/re/regex-cli/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/re/regex-cli/package.nix b/pkgs/by-name/re/regex-cli/package.nix
index a9c7cb48e967..69f421f491a7 100644
--- a/pkgs/by-name/re/regex-cli/package.nix
+++ b/pkgs/by-name/re/regex-cli/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchCrate,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage rec {
@@ -15,6 +16,8 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-7fPoH6I8Okz8Oby45MIDdKBkbPgUPsaXd6XS3r3cRO8=";
 
+  passthru.updateScript = nix-update-script { };
+
   meta = with lib; {
     description = "Command line tool for debugging, ad hoc benchmarking and generating regular expressions";
     mainProgram = "regex-cli";
@@ -23,6 +26,6 @@ rustPlatform.buildRustPackage rec {
       asl20
       mit
     ];
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ mdaniels5757 ];
   };
 }

From 4fe1707ed4120a31a9a40c61ec7c58d2905f1f12 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 00:28:44 +0000
Subject: [PATCH 5172/6226] yamlfix: 1.18.0 -> 1.19.0

---
 pkgs/development/python-modules/yamlfix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/yamlfix/default.nix b/pkgs/development/python-modules/yamlfix/default.nix
index 2c1524627516..fca0c12f9ad0 100644
--- a/pkgs/development/python-modules/yamlfix/default.nix
+++ b/pkgs/development/python-modules/yamlfix/default.nix
@@ -23,14 +23,14 @@
 
 buildPythonPackage rec {
   pname = "yamlfix";
-  version = "1.18.0";
+  version = "1.19.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lyz-code";
     repo = "yamlfix";
     tag = version;
-    hash = "sha256-g2X9fBUS5wbQJbP29V5pWwrQ1+P/Y8euK4Rv7C6r3WM=";
+    hash = "sha256-c8vspcouS3r0S/4S210QGYT2XdU3aR0FvUoKaC2WLUM=";
   };
 
   build-system = [

From ba7902c0c595bd35d274af13989a133416a2e343 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 00:30:01 +0000
Subject: [PATCH 5173/6226] jack-link: 0.2.4 -> 0.2.5

---
 pkgs/by-name/ja/jack-link/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ja/jack-link/package.nix b/pkgs/by-name/ja/jack-link/package.nix
index 7a5bae52f8a4..2b1d32a5fbbb 100644
--- a/pkgs/by-name/ja/jack-link/package.nix
+++ b/pkgs/by-name/ja/jack-link/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "jack-link";
-  version = "0.2.4";
+  version = "0.2.5";
 
   src = fetchFromGitHub {
     owner = "rncbc";
     repo = "jack_link";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-bIB3lxKKaI8DLtmnkRTTHXDopCZ3FAv15cAYcyJcBYA=";
+    hash = "sha256-UYyVGc9/NOLzFD/31zB9lhUJW8G/PGt7VkSBjntpymw=";
     fetchSubmodules = true;
   };
 

From 7ed8bcf3c7604149971ff32cb4e5a2cd2a23732e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 00:30:28 +0000
Subject: [PATCH 5174/6226] libsForQt5.qtpbfimageplugin: 5.1 -> 5.2

---
 pkgs/development/libraries/qtpbfimageplugin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qtpbfimageplugin/default.nix b/pkgs/development/libraries/qtpbfimageplugin/default.nix
index 8f7c53a7ca80..4abcdb8d83cb 100644
--- a/pkgs/development/libraries/qtpbfimageplugin/default.nix
+++ b/pkgs/development/libraries/qtpbfimageplugin/default.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qtpbfimageplugin";
-  version = "5.1";
+  version = "5.2";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "QtPBFImagePlugin";
     tag = version;
-    hash = "sha256-3Tfh92ozitvL9EiGJy8Q20C8zDx5eNNJFa7KDXDuS6Y=";
+    hash = "sha256-IU9sA8yipGsqD9HadGlQce4ud0RyfMMh83cdVuSTGjs=";
   };
 
   nativeBuildInputs = [

From 1f3d351419d56c5cb4f18f88f93e677b868003b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 00:36:43 +0000
Subject: [PATCH 5175/6226] tokio-console: 0.1.13 -> 0.1.14

---
 pkgs/by-name/to/tokio-console/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/to/tokio-console/package.nix b/pkgs/by-name/to/tokio-console/package.nix
index eddaf47fa17a..0a2ffe98f742 100644
--- a/pkgs/by-name/to/tokio-console/package.nix
+++ b/pkgs/by-name/to/tokio-console/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tokio-console";
-  version = "0.1.13";
+  version = "0.1.14";
 
   src = fetchFromGitHub {
     owner = "tokio-rs";
     repo = "console";
     rev = "tokio-console-v${version}";
-    hash = "sha256-KqX+s1oQIRyqAP+0iGrZiT8lB+cGviY1vtHaXy5Q6TA=";
+    hash = "sha256-mZCYdz0AQhCBqbvcjXNp2bXSKf7tJ/01fz2W4wpjVX8=";
   };
 
-  cargoHash = "sha256-9jnBgrfB0nWOq2+hfDq3/2Wo4z7WSfBKxoGrQ888lKw=";
+  cargoHash = "sha256-aF9bylDYeTZOldAK9rl+19xTv0y9AdxCjRfaVRNfR3E=";
 
   buildAndTestSubdir = "tokio-console";
 

From 29bde800c284199c70b0e9575dbf2bbc4d705c65 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 00:41:14 +0000
Subject: [PATCH 5176/6226] grml-zsh-config: 0.19.24 -> 0.19.25

---
 pkgs/by-name/gr/grml-zsh-config/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gr/grml-zsh-config/package.nix b/pkgs/by-name/gr/grml-zsh-config/package.nix
index a0b24a86b2fa..007f8d564c82 100644
--- a/pkgs/by-name/gr/grml-zsh-config/package.nix
+++ b/pkgs/by-name/gr/grml-zsh-config/package.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation rec {
   pname = "grml-zsh-config";
-  version = "0.19.24";
+  version = "0.19.25";
 
   src = fetchFromGitHub {
     owner = "grml";
     repo = "grml-etc-core";
     rev = "v${version}";
-    sha256 = "sha256-DUkj/5LD85h3J+PIVAfsGY0fkktAgWn93Y3hnRrn/wk=";
+    sha256 = "sha256-jUdgigqK6j7Tn/Gl737iNSitUyp7uWrXfRyCBxUSD/0=";
   };
 
   strictDeps = true;

From 985bbb4c705386edf07e65dff54f0cb91a455c9a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 00:42:11 +0000
Subject: [PATCH 5177/6226] rns: 1.0.0 -> 1.0.1

---
 pkgs/development/python-modules/rns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix
index 9e41698053a2..c0bea018a117 100644
--- a/pkgs/development/python-modules/rns/default.nix
+++ b/pkgs/development/python-modules/rns/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "rns";
-  version = "1.0.0";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "Reticulum";
     tag = version;
-    hash = "sha256-d227mAVJKcm3Dx2HS7CvVsyWyLl7GoPSA/YrWjs7jm0=";
+    hash = "sha256-fbUoZSJtg5RFyZOC4I0d7wbPNcZ1RwmrD/1lHUoNos8=";
   };
 
   patches = [

From 6dad5c337acc96226d893a824da83505fb8ead6a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 00:53:39 +0000
Subject: [PATCH 5178/6226] python3Packages.knx-frontend: 2025.10.26.81530 ->
 2025.10.31.195356

---
 pkgs/development/python-modules/knx-frontend/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/knx-frontend/default.nix b/pkgs/development/python-modules/knx-frontend/default.nix
index bb97a632251b..4f02d0a710d1 100644
--- a/pkgs/development/python-modules/knx-frontend/default.nix
+++ b/pkgs/development/python-modules/knx-frontend/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "knx-frontend";
-  version = "2025.10.26.81530";
+  version = "2025.10.31.195356";
   pyproject = true;
 
   # TODO: source build, uses yarn.lock
   src = fetchPypi {
     pname = "knx_frontend";
     inherit version;
-    hash = "sha256-8JRiKgltnY8aPlcVP4yr1/z9mJYG0Axr1KnXPK9XgLI=";
+    hash = "sha256-m490gincBGm5qN1ndVfw8HZYnIh9RNLHQkW6w4duTTE=";
   };
 
   build-system = [ setuptools ];

From 81ff7c0634fa0762d5a19cb38e39befaa0793d1e Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 4 Nov 2025 00:53:44 +0000
Subject: [PATCH 5179/6226] caneda: fix build with cmake 4

---
 pkgs/applications/science/electronics/caneda/default.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix
index b99c2201ec09..757314931a2c 100644
--- a/pkgs/applications/science/electronics/caneda/default.nix
+++ b/pkgs/applications/science/electronics/caneda/default.nix
@@ -2,6 +2,7 @@
   mkDerivation,
   lib,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   qtbase,
   qttools,
@@ -20,6 +21,13 @@ mkDerivation rec {
     sha256 = "sha256-oE0cdOwufc7CHEFr3YU8stjg1hBGs4bemhXpNTCTpDQ=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://sources.debian.org/data/main/c/caneda/0.4.0-2/debian/patches/fix_cmake_minimum_version.patch";
+      hash = "sha256-MRkCA0GWcI6yEo4Ej+F67k0iNG1JHeLNhH0Rbz1QWoA=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
   buildInputs = [
     qtbase

From ad39d44f248a724705956a059f45eeb10433ce40 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 4 Nov 2025 00:55:21 +0000
Subject: [PATCH 5180/6226] caneda: adopt orphaned package

---
 pkgs/applications/science/electronics/caneda/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/applications/science/electronics/caneda/default.nix
index 757314931a2c..d7ed930cc88b 100644
--- a/pkgs/applications/science/electronics/caneda/default.nix
+++ b/pkgs/applications/science/electronics/caneda/default.nix
@@ -41,7 +41,7 @@ mkDerivation rec {
     mainProgram = "caneda";
     homepage = "http://caneda.org";
     license = lib.licenses.gpl2Plus;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ magicquark ];
     platforms = with lib.platforms; linux;
   };
 }

From 8f57530b0b43dd38fcb2e5f0b24d983d3df8d92d Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 4 Nov 2025 01:01:19 +0000
Subject: [PATCH 5181/6226] caneda: migrate to pkgs/by-name

---
 .../ca/caneda/package.nix}                    | 23 ++++++++++---------
 pkgs/top-level/all-packages.nix               |  2 --
 2 files changed, 12 insertions(+), 13 deletions(-)
 rename pkgs/{applications/science/electronics/caneda/default.nix => by-name/ca/caneda/package.nix} (79%)

diff --git a/pkgs/applications/science/electronics/caneda/default.nix b/pkgs/by-name/ca/caneda/package.nix
similarity index 79%
rename from pkgs/applications/science/electronics/caneda/default.nix
rename to pkgs/by-name/ca/caneda/package.nix
index d7ed930cc88b..284dd6e72fe8 100644
--- a/pkgs/applications/science/electronics/caneda/default.nix
+++ b/pkgs/by-name/ca/caneda/package.nix
@@ -1,16 +1,13 @@
 {
-  mkDerivation,
+  stdenv,
   lib,
   fetchFromGitHub,
   fetchpatch,
   cmake,
-  qtbase,
-  qttools,
-  qtsvg,
-  qwt6_1,
+  libsForQt5,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation rec {
   pname = "caneda";
   version = "0.4.0";
 
@@ -28,12 +25,16 @@ mkDerivation rec {
     })
   ];
 
-  nativeBuildInputs = [ cmake ];
+  nativeBuildInputs = [
+    cmake
+    libsForQt5.qt5.wrapQtAppsHook
+  ];
+
   buildInputs = [
-    qtbase
-    qttools
-    qtsvg
-    qwt6_1
+    libsForQt5.qtbase
+    libsForQt5.qttools
+    libsForQt5.qtsvg
+    libsForQt5.qwt6_1
   ];
 
   meta = {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9c55ef11199c..0966d484e378 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13800,8 +13800,6 @@ with pkgs;
 
   eagle = libsForQt5.callPackage ../applications/science/electronics/eagle/eagle.nix { };
 
-  caneda = libsForQt5.callPackage ../applications/science/electronics/caneda { };
-
   degate = libsForQt5.callPackage ../applications/science/electronics/degate { };
 
   geda = callPackage ../applications/science/electronics/geda {

From 5bf4fe545840c98b8ff6e5bd3151cc443d43ac01 Mon Sep 17 00:00:00 2001
From: Konstantin Bogdanov <konstantin@clickhouse.com>
Date: Tue, 4 Nov 2025 01:05:25 +0100
Subject: [PATCH 5182/6226] clickhouse, clickhouse-lts: fix versioning

---
 pkgs/by-name/cl/clickhouse/generic.nix | 41 ++++++++++++--
 pkgs/by-name/cl/clickhouse/lts.nix     |  7 +--
 pkgs/by-name/cl/clickhouse/package.nix |  7 +--
 pkgs/by-name/cl/clickhouse/update.sh   | 78 ++++++++++++++++++++++++++
 4 files changed, 117 insertions(+), 16 deletions(-)
 create mode 100755 pkgs/by-name/cl/clickhouse/update.sh

diff --git a/pkgs/by-name/cl/clickhouse/generic.nix b/pkgs/by-name/cl/clickhouse/generic.nix
index 53ad8758f507..99967c1cab15 100644
--- a/pkgs/by-name/cl/clickhouse/generic.nix
+++ b/pkgs/by-name/cl/clickhouse/generic.nix
@@ -1,8 +1,8 @@
 {
   lts ? false,
   version,
+  rev,
   hash,
-  nixUpdateExtraArgs ? [ ],
 }:
 
 {
@@ -34,6 +34,7 @@ in
 llvmStdenv.mkDerivation (finalAttrs: {
   pname = "clickhouse";
   inherit version;
+  inherit rev;
 
   src = fetchFromGitHub rec {
     owner = "ClickHouse";
@@ -127,6 +128,36 @@ llvmStdenv.mkDerivation (finalAttrs: {
     cargoSetupPostPatchHook() { true; }
   '';
 
+  # Set the version the same way as ClickHouse CI does.
+  #
+  # https://github.com/clickhouse/clickhouse/blob/31127f21f8bb7ff21f737c4822de10ef5859c702/ci/jobs/scripts/clickhouse_version.py#L11-L20
+  # https://github.com/clickhouse/clickhouse/blob/31127f21f8bb7ff21f737c4822de10ef5859c702/ci/jobs/build_clickhouse.py#L179
+  preConfigure =
+    let
+      gitTagName = finalAttrs.version;
+      versionStr = builtins.elemAt (lib.splitString "-" gitTagName) 0;
+
+      parts = lib.splitVersion versionStr;
+
+      major = builtins.elemAt parts 0;
+      minor = builtins.elemAt parts 1;
+      patch = builtins.elemAt parts 2;
+
+      # The full commit hash is already available here:
+      gitHash = rev;
+    in
+    ''
+      cat <<'EOF' > cmake/autogenerated_versions.txt
+      SET(VERSION_REVISION 0)
+      SET(VERSION_MAJOR ${major})
+      SET(VERSION_MINOR ${minor})
+      SET(VERSION_PATCH ${patch})
+      SET(VERSION_GITHASH ${gitHash})
+      SET(VERSION_DESCRIBE ${gitTagName})
+      SET(VERSION_STRING ${versionStr})
+      EOF
+    '';
+
   cmakeFlags = [
     "-DENABLE_CHDIG=OFF"
     "-DENABLE_TESTS=OFF"
@@ -176,9 +207,11 @@ llvmStdenv.mkDerivation (finalAttrs: {
   passthru = {
     tests = if lts then nixosTests.clickhouse-lts else nixosTests.clickhouse;
 
-    updateScript = nix-update-script {
-      extraArgs = nixUpdateExtraArgs;
-    };
+    updateScript = [
+      ./update.sh
+
+      (if lts then ./lts.nix else ./package.nix)
+    ];
   };
 
   meta = with lib; {
diff --git a/pkgs/by-name/cl/clickhouse/lts.nix b/pkgs/by-name/cl/clickhouse/lts.nix
index 01b70a91dda8..ed949f77f551 100644
--- a/pkgs/by-name/cl/clickhouse/lts.nix
+++ b/pkgs/by-name/cl/clickhouse/lts.nix
@@ -1,11 +1,6 @@
 import ./generic.nix {
   version = "25.8.10.7-lts";
+  rev = "02ec3a1ea1e08fb18d2d9638f00b2b557fa1cc1c";
   hash = "sha256-EOZ2AfeBeXAWQqa25eQX3loE+xegt03lsCU1aQt/Ebs=";
   lts = true;
-  nixUpdateExtraArgs = [
-    "--version-regex"
-    "^v?(.*-lts)$"
-    "--override-filename"
-    "pkgs/by-name/cl/clickhouse/lts.nix"
-  ];
 }
diff --git a/pkgs/by-name/cl/clickhouse/package.nix b/pkgs/by-name/cl/clickhouse/package.nix
index 50f05896dd39..6752d05e2f9f 100644
--- a/pkgs/by-name/cl/clickhouse/package.nix
+++ b/pkgs/by-name/cl/clickhouse/package.nix
@@ -1,11 +1,6 @@
 import ./generic.nix {
   version = "25.9.4.58-stable";
+  rev = "08afb4f28eefe01513442c3647a2e00b703d5922";
   hash = "sha256-HRbqVSyDuvhkv0+PSgps9AXKdLlukrLA65OLx5gZ3c0=";
   lts = false;
-  nixUpdateExtraArgs = [
-    "--version-regex"
-    "^v?(.*-stable|.*-lts)$"
-    "--override-filename"
-    "pkgs/by-name/cl/clickhouse/package.nix"
-  ];
 }
diff --git a/pkgs/by-name/cl/clickhouse/update.sh b/pkgs/by-name/cl/clickhouse/update.sh
new file mode 100755
index 000000000000..7ca2b419d322
--- /dev/null
+++ b/pkgs/by-name/cl/clickhouse/update.sh
@@ -0,0 +1,78 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p jq nix
+
+set -euo pipefail
+echoerr() { echo "$@" 1>&2; }
+
+fetchgithub() {
+    set +eo pipefail
+    nix-build -A "$1" 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g'
+    set -eo pipefail
+}
+
+fname="$1"
+echoerr "Working on $fname"
+shift
+
+# Fetch latest tags from the repo, leave only stable and lts, use version sort in reverse order.
+all_tags=$(curl -L -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} https://api.github.com/repos/ClickHouse/ClickHouse/tags \
+           | jq -r '.[].name | select(test("-(stable|lts)$"))' \
+           | sort -Vr)
+
+# Fail if no tags found
+if [[ -z "$all_tags" ]]; then
+    echoerr "Error: no suitable tag found in ClickHouse repo"
+    exit 1
+fi
+
+pname="clickhouse"
+if [[ "$fname" == *lts.nix ]]; then
+    all_tags=$(echo "$all_tags" | grep -- "-lts$")
+    pname="clickhouse-lts"
+fi
+
+latest_tag=$(echo "$all_tags" | head -n1)
+version=${latest_tag##v}
+
+# Do nothing if latest version is already there.
+if grep -q "version = \"$version\"" "$fname"; then
+    echoerr "Version $version is already the latest in $fname"
+    exit 0
+fi
+
+echoerr "Latest tag for $fname: $latest_tag (version $version)"
+
+# Get the annotated tag commit SHA.
+rev=$(curl -L -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} "https://api.github.com/repos/clickhouse/clickhouse/git/ref/tags/$latest_tag" \
+      | jq -r '.object.sha')
+rev=$(curl -L -s ${GITHUB_TOKEN:+-u ":${GITHUB_TOKEN}"} "https://api.github.com/repos/clickhouse/clickhouse/git/tags/$rev" \
+      | jq -r '.object.sha')
+echoerr "Resolved commit hash for tag $latest_tag: $rev"
+
+# Update version.
+sed -i -E "s@(version = \").*(\";)@\1$version\2@" "$fname"
+grep -q "$version" "$fname"
+
+# Update Git hash.
+sed -i -E "s@(rev = \").*(\";)@\1$rev\2@" "$fname"
+grep -q "$rev" "$fname"
+
+# Update source hash.
+# First, put lib.fakeHash value.
+tmp_src_hash="sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA="
+sed -i -E "s@(hash = \").*(\";)@\1$tmp_src_hash\2@" "$fname"
+grep -q "$tmp_src_hash" "$fname"
+
+# Next, we need to run actual build due to presence of postFetch script.
+echoerr "Running fetchFromGitHub on $pname to get new sources hash"
+
+src_hash=$(fetchgithub "$pname.src")
+if [[ -z "$src_hash" ]]; then
+    echoerr "Error: failed to get source hash from nix-build"
+    exit 1
+fi
+
+# Finally, update the source hash.
+echoerr "New src hash: $src_hash"
+sed -i -E "s@(hash = \").*(\";)@\1$src_hash\2@" "$fname"
+grep -q "$src_hash" "$fname"

From 607074e8e83c496c341f989a3f44c2e1e314e646 Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 4 Nov 2025 01:03:58 +0000
Subject: [PATCH 5183/6226] caneda: modernise

---
 pkgs/by-name/ca/caneda/package.nix | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/caneda/package.nix b/pkgs/by-name/ca/caneda/package.nix
index 284dd6e72fe8..4e157aa9ee5d 100644
--- a/pkgs/by-name/ca/caneda/package.nix
+++ b/pkgs/by-name/ca/caneda/package.nix
@@ -7,14 +7,14 @@
   libsForQt5,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "caneda";
   version = "0.4.0";
 
   src = fetchFromGitHub {
     owner = "Caneda";
     repo = "Caneda";
-    rev = version;
+    rev = finalAttrs.version;
     sha256 = "sha256-oE0cdOwufc7CHEFr3YU8stjg1hBGs4bemhXpNTCTpDQ=";
   };
 
@@ -39,10 +39,11 @@ stdenv.mkDerivation rec {
 
   meta = {
     description = "Open source EDA software focused on easy of use and portability";
+    changelog = "https://github.com/Caneda/Caneda/releases/tag/${finalAttrs.version}";
     mainProgram = "caneda";
     homepage = "http://caneda.org";
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ magicquark ];
     platforms = with lib.platforms; linux;
   };
-}
+})

From 69c65cb99ee52ef2f7cd9454cf8728a957c73c64 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 01:12:18 +0000
Subject: [PATCH 5184/6226] svtplay-dl: 4.151 -> 4.163

---
 pkgs/by-name/sv/svtplay-dl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sv/svtplay-dl/package.nix b/pkgs/by-name/sv/svtplay-dl/package.nix
index 5cc621dcb9df..ff0671cada78 100644
--- a/pkgs/by-name/sv/svtplay-dl/package.nix
+++ b/pkgs/by-name/sv/svtplay-dl/package.nix
@@ -22,7 +22,7 @@ let
     requests-mock
     ;
 
-  version = "4.151";
+  version = "4.163";
 
 in
 
@@ -35,7 +35,7 @@ buildPythonApplication {
     owner = "spaam";
     repo = "svtplay-dl";
     rev = version;
-    hash = "sha256-MqV49Xi0pwP8kVXPPmOOYvZpQ6ZtWbeWZc+Qo0i30/g=";
+    hash = "sha256-2Qge6jmmymIBPWVwaY43h/njlqGzQWPD718gsaIAYx0=";
   };
 
   build-system = [ setuptools ];

From 16c1982f9a17dabd24211f0a9175fc7490d01b7e Mon Sep 17 00:00:00 2001
From: Konstantin Bogdanov <konstantin@clickhouse.com>
Date: Tue, 4 Nov 2025 02:20:46 +0100
Subject: [PATCH 5185/6226] clickhouse, clickhouse-lts: remove inactive
 maintainers

---
 pkgs/by-name/cl/clickhouse/generic.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/by-name/cl/clickhouse/generic.nix b/pkgs/by-name/cl/clickhouse/generic.nix
index 53ad8758f507..50268dd4be0f 100644
--- a/pkgs/by-name/cl/clickhouse/generic.nix
+++ b/pkgs/by-name/cl/clickhouse/generic.nix
@@ -186,8 +186,6 @@ llvmStdenv.mkDerivation (finalAttrs: {
     description = "Column-oriented database management system";
     license = licenses.asl20;
     maintainers = with maintainers; [
-      orivej
-      mbalatsko
       thevar1able
     ];
 

From 93009eb401378d2b4a31cbdeeab0f7c63965b415 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 01:21:54 +0000
Subject: [PATCH 5186/6226] 
 home-assistant-custom-lovelace-modules.hourly-weather: 6.7.1 -> 6.8.0

---
 .../custom-lovelace-modules/hourly-weather/package.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix
index 21ce5b746df2..f1ce637f5048 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/hourly-weather/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "hourly-weather";
-  version = "6.7.1";
+  version = "6.8.0";
 
   src = fetchFromGitHub {
     owner = "decompil3d";
     repo = "lovelace-hourly-weather";
     rev = version;
-    hash = "sha256-o2whcxLcPQcSvv9aMpZxAk7iqGez2yqhwdB+zU7OwMY=";
+    hash = "sha256-vpV4BQVSaHm06fjSMzsN2IGeaK9ygV3/E0QvCko0Drc=";
   };
 
-  npmDepsHash = "sha256-C4ca6bTXzNmmzA5yK825JwdOYa3KKtGK+eYuKxgspUY=";
+  npmDepsHash = "sha256-J089Schvtdv1xJTY0XAwe2QU/SeM/yoWplKq799xFMg=";
 
   env.CYPRESS_INSTALL_BINARY = "0";
 

From c2f8ffe8d19355dd3e0e2ea6de6f3e0242c2b698 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 01:32:40 +0000
Subject: [PATCH 5187/6226] terraform-providers.hashicorp_helm: 3.0.2 -> 3.1.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 ae7e68b1b845..2cbfa3c16e2f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -579,13 +579,13 @@
     "vendorHash": "sha256-tc7PInjXPEAI/sYtrYZsQxQV3Gk04ov/4SBQ1fHqkIQ="
   },
   "hashicorp_helm": {
-    "hash": "sha256-i4ceWiEXJYL1x9DmqAfcUidiW5+x/sRCxevDz4MnzHs=",
+    "hash": "sha256-XU5AxXYvZtHnxGotOvGOojybcusVX9DRK2sazfytkAw=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/helm",
     "owner": "hashicorp",
     "repo": "terraform-provider-helm",
-    "rev": "v3.0.2",
+    "rev": "v3.1.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-sPvX69R2BmlY/KhXZgxCunzseoOkz1h2b8yqekBBn0k="
+    "vendorHash": "sha256-qzwm0R51jvElo+T8ypkHrlQy/MH8c/o+NWIS+YrQ4uw="
   },
   "hashicorp_http": {
     "hash": "sha256-IXqKZ9RQP0kZVxc9OfaWglF8GeycSAl5DATdqc8n35g=",

From b3bdf5d99b6d3e3d1590ebfb667d04a680bb34bb Mon Sep 17 00:00:00 2001
From: magicquark <198001825+magicquark@users.noreply.github.com>
Date: Tue, 4 Nov 2025 01:33:21 +0000
Subject: [PATCH 5188/6226] inspectrum: fix build on cmake 4

---
 pkgs/by-name/in/inspectrum/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/in/inspectrum/package.nix b/pkgs/by-name/in/inspectrum/package.nix
index 2e6a8cb81eea..0920670493dd 100644
--- a/pkgs/by-name/in/inspectrum/package.nix
+++ b/pkgs/by-name/in/inspectrum/package.nix
@@ -21,11 +21,17 @@ gnuradioMinimal.pkgs.mkDerivation rec {
     sha256 = "sha256-yY2W2hQpj8TIxiQBSbQHq0J16n74OfIwMDxFt3mLZYc=";
   };
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.1)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   nativeBuildInputs = [
     cmake
     qt5.wrapQtAppsHook
     pkg-config
   ];
+
   buildInputs = [
     fftwFloat
     liquid-dsp

From 5760911f509a77c0cf8d7140527cbe425c1fa389 Mon Sep 17 00:00:00 2001
From: Yiyu Zhou <yiyuzhou19@gmail.com>
Date: Mon, 3 Nov 2025 17:33:21 -0800
Subject: [PATCH 5189/6226] miro: 0.6.2 -> 0.7.0

---
 pkgs/by-name/mi/miro/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mi/miro/package.nix b/pkgs/by-name/mi/miro/package.nix
index 5324949a7278..2b54d70c09a3 100644
--- a/pkgs/by-name/mi/miro/package.nix
+++ b/pkgs/by-name/mi/miro/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "miro";
-  version = "0.6.2";
+  version = "0.7.0";
 
   src = fetchFromGitHub {
     owner = "vincent-uden";
     repo = "miro";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-znrbAufYM+YIPm0oSZ8i4vHHrhlgSQWMzKfqdF8qaow=";
+    hash = "sha256-tkZSyxdcHeumBMlinwA3DT2Y/FgLzbeuVbsFbTfvINg=";
   };
 
-  cargoHash = "sha256-VP2RUKTQM2AkXY/KgN0tjWXF7SQ24geAvxEQJitH23I=";
+  cargoHash = "sha256-4NE9nMmOTQpWvMsGexW6GpBGao4yQoofrzGaaM4+rWE=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook

From 75d174cef1182c4ec4c75d7d916370f74035bc75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 01:38:19 +0000
Subject: [PATCH 5190/6226] hgrep: 0.3.8 -> 0.3.9

---
 pkgs/by-name/hg/hgrep/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hg/hgrep/package.nix b/pkgs/by-name/hg/hgrep/package.nix
index c110c9814d37..2fb66a2f19b5 100644
--- a/pkgs/by-name/hg/hgrep/package.nix
+++ b/pkgs/by-name/hg/hgrep/package.nix
@@ -7,7 +7,7 @@
 }:
 
 let
-  version = "0.3.8";
+  version = "0.3.9";
 in
 rustPlatform.buildRustPackage {
   pname = "hgrep";
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
     owner = "rhysd";
     repo = "hgrep";
     tag = "v${version}";
-    hash = "sha256-GcV6tZLhAtBE0/husOqZ3Gib9nXXg7kcxrNp9IK0eTo=";
+    hash = "sha256-xBLpEs0PvYb7sIca9yb3vhi2Bsr1BFqB0jlD+bZT2EI=";
   };
 
-  cargoHash = "sha256-NxfWY9OoMNASlWE48njuAdTI11JAV+rzjD0OU2cHLsc=";
+  cargoHash = "sha256-TP+PClv7FX3kRBwJ0RAKbKoTKpi7hTZgw/Z/ktFKbwQ=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 7a9aefbb71a0fcc8432f20c2fba19bf46a978722 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 02:06:52 +0000
Subject: [PATCH 5191/6226] dprint-plugins.dprint-plugin-typescript: 0.95.11 ->
 0.95.12

---
 pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
index 734b48ba4b81..2d4f4de53829 100644
--- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
+++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-typescript.nix
@@ -1,7 +1,7 @@
 { mkDprintPlugin }:
 mkDprintPlugin {
   description = "TypeScript/JavaScript code formatter";
-  hash = "sha256-azXAPEwle+VeKFWeWooNn7dPv0DD6zaKer0mdr1K9II=";
+  hash = "sha256-gBYx23MC6Biz8FIIZLBW3d7SOxtpmCml4N6554Wh0Pc=";
   initConfig = {
     configExcludes = [ "**/node_modules" ];
     configKey = "typescript";
@@ -16,6 +16,6 @@ mkDprintPlugin {
   };
   pname = "dprint-plugin-typescript";
   updateUrl = "https://plugins.dprint.dev/dprint/typescript/latest.json";
-  url = "https://plugins.dprint.dev/typescript-0.95.11.wasm";
-  version = "0.95.11";
+  url = "https://plugins.dprint.dev/typescript-0.95.12.wasm";
+  version = "0.95.12";
 }

From b57f7c5f41ba23d0adaa0413a54ec38627e4d565 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 02:09:45 +0000
Subject: [PATCH 5192/6226] sidplayfp: 2.15.1 -> 2.15.2

---
 pkgs/by-name/si/sidplayfp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/sidplayfp/package.nix b/pkgs/by-name/si/sidplayfp/package.nix
index 09e2b32ec66e..b35bd76e1cce 100644
--- a/pkgs/by-name/si/sidplayfp/package.nix
+++ b/pkgs/by-name/si/sidplayfp/package.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "sidplayfp";
-  version = "2.15.1";
+  version = "2.15.2";
 
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "sidplayfp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-IUyXkHs8QfWhuTVYrPbmMU/mhfGwGminypLmGYimcLg=";
+    hash = "sha256-XUf4lqWwNC0bYSb1AdX2zZ46+0Ki1001XAjFOh7EAJ0=";
   };
 
   strictDeps = true;

From 3d989ea666f09aa9db1fd513f575982e17efde45 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Fri, 31 Oct 2025 17:41:34 +0800
Subject: [PATCH 5193/6226] feather-tk: mark darwin as bad platform

---
 pkgs/by-name/fe/feather-tk/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/fe/feather-tk/package.nix b/pkgs/by-name/fe/feather-tk/package.nix
index 18dca96dc0b2..8f1890ed47cf 100644
--- a/pkgs/by-name/fe/feather-tk/package.nix
+++ b/pkgs/by-name/fe/feather-tk/package.nix
@@ -94,5 +94,9 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ liberodark ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    badPlatforms = [
+      # Broken on darwin with latest SDK, see https://github.com/darbyjohnston/feather-tk/issues/1
+      lib.systems.inspect.patterns.isDarwin
+    ];
   };
 })

From bb904b06eea3d3ff4d4fe5657822ea9110c64735 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 02:37:45 +0000
Subject: [PATCH 5194/6226] webdav: 5.8.1 -> 5.9.0

---
 pkgs/by-name/we/webdav/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/we/webdav/package.nix b/pkgs/by-name/we/webdav/package.nix
index 282d07125868..896e588ed300 100644
--- a/pkgs/by-name/we/webdav/package.nix
+++ b/pkgs/by-name/we/webdav/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "webdav";
-  version = "5.8.1";
+  version = "5.9.0";
 
   src = fetchFromGitHub {
     owner = "hacdias";
     repo = "webdav";
     tag = "v${version}";
-    hash = "sha256-byAfcJTzbt2o0vwxKHks6FgrBBlIZY1iKeaWFir5hMU=";
+    hash = "sha256-W0l9VVgZJujJpxK97wsdMKAp3zAX5GJVwEaOA/SYRW4=";
   };
 
   vendorHash = "sha256-BHSkSGgL6Ns4kjQV5OaiViIVhnOg1qpdvv4LPhkeAnw=";

From 3802a32ec20f771b985099642dfe8201f4b9d52c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 02:59:19 +0000
Subject: [PATCH 5195/6226] bash-pinyin-completion-rs: 1.0.0 -> 1.0.1

---
 pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix b/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix
index 5a6efefcef0a..d68235a1105e 100644
--- a/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix
+++ b/pkgs/by-name/ba/bash-pinyin-completion-rs/package.nix
@@ -7,13 +7,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "bash-pinyin-completion-rs";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "AOSC-Dev";
     repo = "bash-pinyin-completion-rs";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VXIIG+ZGb4fS3LSIkGW744ui4AKTdQCjrNlObH/YZVY=";
+    hash = "sha256-XmxJYzDnA/7v/U3fFzNd2BQu43q6zYGSk/tJ0I6aKBo=";
   };
 
   strictDeps = true;

From a65982d29e9fafcab69de0106ebcf8a1399975db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 03:23:30 +0000
Subject: [PATCH 5196/6226] plasma-panel-spacer-extended: 1.11.2 -> 1.11.3

---
 pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix
index 47b177d49265..45799ab80eba 100644
--- a/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix
+++ b/pkgs/by-name/pl/plasma-panel-spacer-extended/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "plasma-panel-spacer-extended";
-  version = "1.11.2";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner = "luisbocanegra";
     repo = "plasma-panel-spacer-extended";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sSor6ZjYgjVzrC0leqpj+GZuj8ybpPb4lcBPhcXG+Nc=";
+    hash = "sha256-FJbRKL/jALKxS97uVftyKwjSUhADtHv/hgOJA5VvGNQ=";
   };
 
   nativeBuildInputs = [

From d5c914183d3c57af13c9622f50133c6cb874049b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 03:32:06 +0000
Subject: [PATCH 5197/6226] spaceship-prompt: 4.19.0 -> 4.19.1

---
 pkgs/by-name/sp/spaceship-prompt/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sp/spaceship-prompt/package.nix b/pkgs/by-name/sp/spaceship-prompt/package.nix
index aa6c7cde6224..f2e2e3b689fc 100644
--- a/pkgs/by-name/sp/spaceship-prompt/package.nix
+++ b/pkgs/by-name/sp/spaceship-prompt/package.nix
@@ -6,13 +6,13 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "spaceship-prompt";
-  version = "4.19.0";
+  version = "4.19.1";
 
   src = fetchFromGitHub {
     owner = "denysdovhan";
     repo = "spaceship-prompt";
     rev = "v${version}";
-    sha256 = "sha256-g0hiUyGVaUA9Jg5UHFEyf1ioUnMb2cp7tOrtTFLMtvc=";
+    sha256 = "sha256-zMazuPTwvbmtd6BIjD7oDJ3V4TGlUnxJT25Pe1TI3UY=";
   };
 
   strictDeps = true;

From 35959258844ef8124f4dcda4da9012ae47e366ba Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 4 Nov 2025 03:33:38 +0000
Subject: [PATCH 5198/6226] models-dev: 0-unstable-2025-10-31 ->
 0-unstable-2025-11-03

---
 pkgs/by-name/mo/models-dev/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index b412839c20ee..984e77fe6d98 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -8,12 +8,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "models-dev";
-  version = "0-unstable-2025-10-31";
+  version = "0-unstable-2025-11-03";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "91a03818a6eb45508d042c91cb4cf21a331296f1";
-    hash = "sha256-cjyGeTLfv8CpW8OuyPDG3KKYJ6N7u2EUhMFTGTGOIPM=";
+    rev = "0e56ea3ccab064118f42687772368bc66f03f85e";
+    hash = "sha256-D7W0HSiHk5LpZ+y1pZCrEsfYEQPVD9qrrbu+3MhjEYo=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From 5cbc4dbc3b913ed8d7db7d1a8a2f6872bbaf774e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 03:37:20 +0000
Subject: [PATCH 5199/6226] kcc: 9.1.0 -> 9.2.1

---
 pkgs/by-name/kc/kcc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/kc/kcc/package.nix b/pkgs/by-name/kc/kcc/package.nix
index 1c86d62b41ef..9e0fbd1c89bb 100644
--- a/pkgs/by-name/kc/kcc/package.nix
+++ b/pkgs/by-name/kc/kcc/package.nix
@@ -15,14 +15,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "kcc";
-  version = "9.1.0";
+  version = "9.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ciromattia";
     repo = "kcc";
     tag = "v${version}";
-    hash = "sha256-FGRd2JVcz45KVjQCTEKIjKlkLJS/AsSsopeW9tXHWwk=";
+    hash = "sha256-zzPgBAmICeDpCHvBek2DsM4aEYvC8VHPDY4Ek6nJW9w=";
   };
 
   nativeBuildInputs = [

From 32bc0e6d1bfefeb2959efe540c9f6d0f68fb09d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 03:47:23 +0000
Subject: [PATCH 5200/6226] vscode-extensions.tabnine.tabnine-vscode: 3.320.4
 -> 3.321.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c942f4b79abc..b549923c6821 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4514,8 +4514,8 @@ let
         mktplcRef = {
           name = "tabnine-vscode";
           publisher = "tabnine";
-          version = "3.320.4";
-          hash = "sha256-ZuJX2ybmBDya0eCvIYx90JcGweHLiWanr72xItQpSXY=";
+          version = "3.321.0";
+          hash = "sha256-GIszVwrS0brC+3jT+48zUa0E2Q+DUau/WuoOfRDobb8=";
         };
         meta = {
           license = lib.licenses.mit;

From 10686efb3c2b397b02db3db7ad03c4452378039e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 03:50:20 +0000
Subject: [PATCH 5201/6226] tfswitch: 1.8.0 -> 1.9.0

---
 pkgs/by-name/tf/tfswitch/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tf/tfswitch/package.nix b/pkgs/by-name/tf/tfswitch/package.nix
index dcb3dbd95972..b721c1d26e2a 100644
--- a/pkgs/by-name/tf/tfswitch/package.nix
+++ b/pkgs/by-name/tf/tfswitch/package.nix
@@ -5,13 +5,13 @@
 }:
 buildGoModule rec {
   pname = "tfswitch";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "warrensbox";
     repo = "terraform-switcher";
     rev = "v${version}";
-    sha256 = "sha256-9N6C2y+lGyWSJgDiPsMKo03ji6lhq+0OI1idi1VcrAA=";
+    sha256 = "sha256-0yK4/eQ2WNnNopA2dMbvMr5mv3w9vQhfQuJExQM2gvc=";
   };
 
   vendorHash = "sha256-4qZ5egtNN0O+ESkvavprNd6Xtxh/eyD5INolqKXo674=";

From dca7209c8238ab47321dcab7bc3ef2b612d874f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 04:04:19 +0000
Subject: [PATCH 5202/6226] stu: 0.7.4 -> 0.7.5

---
 pkgs/by-name/st/stu/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/stu/package.nix b/pkgs/by-name/st/stu/package.nix
index ef95636772c7..7d10d60e8120 100644
--- a/pkgs/by-name/st/stu/package.nix
+++ b/pkgs/by-name/st/stu/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "stu";
-  version = "0.7.4";
+  version = "0.7.5";
 
   src = fetchFromGitHub {
     owner = "lusingander";
     repo = "stu";
     rev = "v${version}";
-    hash = "sha256-To1x65UuYSdkjIghy0UOA70LULGZZcC5waxYh99qXbs=";
+    hash = "sha256-zjfIBYFlEG6OQ+vWOJhVuek30uG1R28wJpUhRIMcYks=";
   };
 
-  cargoHash = "sha256-YmEzjbGIvgpPlMJln42Q9m/v3HhfsjLMHvES/4S1928=";
+  cargoHash = "sha256-CrliGsShW6wDkCpOVlK9m24BXr3lyxtU12GAdD/2dWE=";
 
   passthru.tests.version = testers.testVersion { package = stu; };
 

From 0239ba3d7379f841718efb2dd87e575359614545 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 04:12:33 +0000
Subject: [PATCH 5203/6226] astal.source: 0-unstable-2025-10-23 ->
 0-unstable-2025-11-03

---
 pkgs/development/libraries/astal/source.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/astal/source.nix b/pkgs/development/libraries/astal/source.nix
index 3a962db76812..06800f8c8038 100644
--- a/pkgs/development/libraries/astal/source.nix
+++ b/pkgs/development/libraries/astal/source.nix
@@ -7,15 +7,15 @@ let
   originalDrv = fetchFromGitHub {
     owner = "Aylur";
     repo = "astal";
-    rev = "189bf73016c26d7d32729a913d6436cd7b1a0885";
-    hash = "sha256-U2r3/DKgr9Fq1yqWLCbKMSqRf8a1JctD0kj/ftBClsg=";
+    rev = "6976faba892be4c79d2b8b42710203b319278d7f";
+    hash = "sha256-aPoaaiZ8VCJhmeeuxrkrfNEWk9Ued7qPYjZFpmnRT3k=";
   };
 in
 originalDrv.overrideAttrs (
   final: prev: {
     name = "${final.pname}-${final.version}"; # fetchFromGitHub already defines name
     pname = "astal-source";
-    version = "0-unstable-2025-10-23";
+    version = "0-unstable-2025-11-03";
 
     meta = prev.meta // {
       description = "Building blocks for creating custom desktop shells (source)";

From 9a488556f39a398ad36118068dc04921d37fff45 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 04:47:44 +0000
Subject: [PATCH 5204/6226] python3Packages.cwcwidth: 0.1.10 -> 0.1.12

---
 pkgs/development/python-modules/cwcwidth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/cwcwidth/default.nix b/pkgs/development/python-modules/cwcwidth/default.nix
index c75afbef5cfa..769f80d5dd41 100644
--- a/pkgs/development/python-modules/cwcwidth/default.nix
+++ b/pkgs/development/python-modules/cwcwidth/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "cwcwidth";
-  version = "0.1.10";
+  version = "0.1.12";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "sebastinas";
     repo = "cwcwidth";
     tag = "v${version}";
-    hash = "sha256-JrzItV+nCpQCz9MM1pcq5FtGZOsWNbgAra6i5WT4Mcg=";
+    hash = "sha256-mkyBtqAFqu7dxpb46qMOnXmXpUV3qtpknfIgVQQt5nY=";
   };
 
   build-system = [

From 20d11505de5f295d5f14c288854f760a44b0edf4 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 4 Nov 2025 11:39:24 +0800
Subject: [PATCH 5205/6226] wechat-uos: fix build and 4.0.1.12 -> 4.1.0.12

---
 pkgs/by-name/we/wechat-uos/package.nix | 43 ++++++--------------------
 pkgs/by-name/we/wechat-uos/sources.nix | 22 ++++++-------
 pkgs/by-name/we/wechat-uos/update.sh   |  8 ++---
 3 files changed, 24 insertions(+), 49 deletions(-)
 mode change 100644 => 100755 pkgs/by-name/we/wechat-uos/update.sh

diff --git a/pkgs/by-name/we/wechat-uos/package.nix b/pkgs/by-name/we/wechat-uos/package.nix
index 9b6f1f2a905c..4d4bc0ea199d 100644
--- a/pkgs/by-name/we/wechat-uos/package.nix
+++ b/pkgs/by-name/we/wechat-uos/package.nix
@@ -43,12 +43,9 @@
   libva,
   libGL,
   libnotify,
+  krb5,
   buildFHSEnv,
   writeShellScript,
-  runCommandLocal,
-  cacert,
-  coreutils,
-  curl,
 }:
 let
   wechat-uos-env = stdenvNoCC.mkDerivation {
@@ -125,6 +122,7 @@ let
     pulseaudio
     qt6.qt5compat
     bzip2
+    krb5
   ];
 
   wechat =
@@ -133,37 +131,14 @@ let
 
       pname = "wechat-uos";
       version = sources.version;
-      fetch =
+      src = fetchurl (
         {
-          url,
-          hash,
-        }:
-        runCommandLocal "wechat-uos-${version}-src"
-          {
-            outputHashAlgo = "sha256";
-            outputHash = hash;
-
-            nativeBuildInputs = [
-              curl
-              coreutils
-            ];
-
-            impureEnvVars = lib.fetchers.proxyImpureEnvVars;
-            SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";
-          }
-          ''
-            curl -A "debian APT-HTTP/1.3 (1.6.11)" --retry 3 --retry-delay 3 -L "${url}" > $out
-          '';
-
-      srcs = {
-        x86_64-linux = fetch sources.amd64;
-        aarch64-linux = fetch sources.arm64;
-        loongarch64-linux = fetch sources.loongarch64;
-      };
-
-      src =
-        srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
-
+          curlOpts = "-A apt";
+        }
+        // (sources.${stdenv.hostPlatform.system}
+          or (throw "Unsupported system: ${stdenv.hostPlatform.system}")
+        )
+      );
     in
     stdenvNoCC.mkDerivation {
       inherit pname src version;
diff --git a/pkgs/by-name/we/wechat-uos/sources.nix b/pkgs/by-name/we/wechat-uos/sources.nix
index 20506a002dbe..519edc3a8a2a 100644
--- a/pkgs/by-name/we/wechat-uos/sources.nix
+++ b/pkgs/by-name/we/wechat-uos/sources.nix
@@ -1,17 +1,17 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2025-09-25
+# Last updated: 2025-11-04
 {
-  version = "4.0.1.12";
-  amd64 = {
-    url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_amd64.deb";
-    hash = "sha256-u0NbuB06my+v8yUxQ9CKSHp4nxHAcMEhVzbAozM9nQU=";
+  version = "4.1.0.12";
+  x86_64-linux = {
+    url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.1.0.12_amd64.deb";
+    hash = "sha256-qnu7ZPJ/xSuF8QV87y3MNkpf8FIfFR8OuPzpE2pn0LA=";
   };
-  arm64 = {
-    url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_arm64.deb";
-    hash = "sha256-GZnIMikYS+TGvTrEl+PT7KyjmXOXXOc0PMxp3Xfpqo8=";
+  aarch64-linux = {
+    url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.1.0.12_arm64.deb";
+    hash = "sha256-+XEVzVBlKZoPfTWgHjjKDLvzkGsH2Ul8m64H9Y1u7bE=";
   };
-  loongarch64 = {
-    url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.0.1.12_loongarch64.deb";
-    hash = "sha256-dON2EW1+2aiiCTuBdc+IwRAmC/x2bEcQcZcar7WOfZo=";
+  loongarch64-linux = {
+    url = "https://pro-store-packages.uniontech.com/appstore/pool/appstore/c/com.tencent.wechat/com.tencent.wechat_4.1.0.12_loongarch64.deb";
+    hash = "sha256-A+k/xfwWwMaDR8FT02b+TZSKn9HL6b5WC/Jkaeu6mTc=";
   };
 }
diff --git a/pkgs/by-name/we/wechat-uos/update.sh b/pkgs/by-name/we/wechat-uos/update.sh
old mode 100644
new mode 100755
index ecf2deafa75c..00a0abb9f5f2
--- a/pkgs/by-name/we/wechat-uos/update.sh
+++ b/pkgs/by-name/we/wechat-uos/update.sh
@@ -13,7 +13,7 @@ hash=()
 for i in amd64 arm64 loongarch64
 do
     current_url=$base_url_suffix$i$base_url_appendix
-    curl -A "debian APT-HTTP/1.3 (1.6.11)" -v -L -O $current_url
+    curl -A "apt" -v -L -O $current_url
     current_version=$(zgrep -A 20 "Package: $target_package" "$packages_file" | awk -v pkg="$target_package" '
     BEGIN { found = 0 }
     {
@@ -48,15 +48,15 @@ cat >sources.nix <<EOF
 # Last updated: $(date +%F)
 {
   version = "${version[0]}";
-  amd64 = {
+  x86_64-linux = {
     url = "${url[0]}";
     hash = "${hash[0]}";
   };
-  arm64 = {
+  aarch64-linux = {
     url = "${url[1]}";
     hash = "${hash[1]}";
   };
-  loongarch64 = {
+  loongarch64-linux = {
     url = "${url[2]}";
     hash = "${hash[2]}";
   };

From 8e5de42030fb08b71079581516971460be896260 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 05:24:20 +0000
Subject: [PATCH 5206/6226] python3Packages.scipy-stubs: 1.16.2.4 -> 1.16.3.0

---
 pkgs/development/python-modules/scipy-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scipy-stubs/default.nix b/pkgs/development/python-modules/scipy-stubs/default.nix
index 20f5438df541..9c5d7f197456 100644
--- a/pkgs/development/python-modules/scipy-stubs/default.nix
+++ b/pkgs/development/python-modules/scipy-stubs/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "scipy-stubs";
-  version = "1.16.2.4";
+  version = "1.16.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "scipy";
     repo = "scipy-stubs";
     tag = "v${version}";
-    hash = "sha256-cmX9uS055kHvmCmsILEyTxW0p9C8xfD3N7HPBVCmIVI=";
+    hash = "sha256-TLqLJirbOGIm718cLhWcEi4VHms9imIJZadGfYphXBk=";
   };
 
   postPatch = ''

From ccd2fd4b2701d0888486f59b11b7a2bf8885f138 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 05:25:45 +0000
Subject: [PATCH 5207/6226] terraform-providers.aiven_aiven: 4.46.0 -> 4.46.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 ae7e68b1b845..05fb1c3e17ac 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -27,11 +27,11 @@
     "vendorHash": null
   },
   "aiven_aiven": {
-    "hash": "sha256-WRG+mbvwP95jwW/lMHiTp6WPzk0dYqYLdcz3CXGjcFY=",
+    "hash": "sha256-+51Roeyn0+vNo3dCLMD8kyiOXf6ATVAQlEZ4O7B7zCw=",
     "homepage": "https://registry.terraform.io/providers/aiven/aiven",
     "owner": "aiven",
     "repo": "terraform-provider-aiven",
-    "rev": "v4.46.0",
+    "rev": "v4.46.1",
     "spdx": "MIT",
     "vendorHash": "sha256-8cChWCS8yV69djpoeElLgaorpbHY2Jg04WKY3e+pvsg="
   },

From 83e6c2a7a506137477f564c4e15f632c933f49ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 05:36:17 +0000
Subject: [PATCH 5208/6226] terraform-providers.hashicorp_google-beta: 7.8.0 ->
 7.9.0

---
 .../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 ae7e68b1b845..9e38a53d95e3 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -570,11 +570,11 @@
     "vendorHash": "sha256-kSFeWcuoym3FJP/E/diWuafEv1sffYinAzCjZ6z7B84="
   },
   "hashicorp_google-beta": {
-    "hash": "sha256-ejjyVzNQY8w1kvZyvuIMGSDhu5jea1/6TFiIG5bvrSw=",
+    "hash": "sha256-j8CDyKV43rmxA6wyF1luO95AJCY5jpz9suUVLKWUVQo=",
     "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
     "owner": "hashicorp",
     "repo": "terraform-provider-google-beta",
-    "rev": "v7.8.0",
+    "rev": "v7.9.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-tc7PInjXPEAI/sYtrYZsQxQV3Gk04ov/4SBQ1fHqkIQ="
   },

From c2a2795a183b820c0ec0f6ebe053c8e7fccf0f24 Mon Sep 17 00:00:00 2001
From: Ryan Omasta <git@ryand.ca>
Date: Mon, 3 Nov 2025 22:49:08 -0700
Subject: [PATCH 5209/6226] ollama: 0.12.6 -> 0.12.9

https://github.com/ollama/ollama/releases/tag/v0.12.9
Diff: https://github.com/ollama/ollama/compare/v0.12.6...v0.12.9
---
 pkgs/by-name/ol/ollama/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix
index ddea0bfafb76..da1c19d15004 100644
--- a/pkgs/by-name/ol/ollama/package.nix
+++ b/pkgs/by-name/ol/ollama/package.nix
@@ -118,13 +118,13 @@ in
 goBuild (finalAttrs: {
   pname = "ollama";
   # don't forget to invalidate all hashes each update
-  version = "0.12.6";
+  version = "0.12.9";
 
   src = fetchFromGitHub {
     owner = "ollama";
     repo = "ollama";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ttwcpg2bgz7D8IqPRTNeZUQFA/HsGc8gCOiXRs7onBg=";
+    hash = "sha256-D61jCyOUYXyPgztgEAFHd2oL5IXsO5TnE2AGEHOnows=";
   };
 
   vendorHash = "sha256-SlaDsu001TUW+t9WRp7LqxUSQSGDF1Lqu9M1bgILoX4=";

From 80362c7d019176da303e2d2eedee2144586ae5bc Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 4 Nov 2025 14:15:22 +0800
Subject: [PATCH 5210/6226] wechat: 4.1.2.16-30516 -> 4.1.4.12-31227 for darwin

---
 pkgs/by-name/we/wechat/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix
index 8caaf5591dc7..106a00ad2054 100644
--- a/pkgs/by-name/we/wechat/package.nix
+++ b/pkgs/by-name/we/wechat/package.nix
@@ -30,14 +30,14 @@ let
       # https://dldir1.qq.com/weixin/mac/mac-release.xml
       any-darwin =
         let
-          version = "4.1.2.16-30516";
+          version = "4.1.4.12-31227";
           version' = lib.replaceString "-" "_" version;
         in
         {
           inherit version;
           src = fetchurl {
             url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg";
-            hash = "sha256-aMInN9sEOfEKXrRYTcHu69hzN9iO3hJ5jLvK9D0QKwU=";
+            hash = "sha256-xVWEABH3dzQkQpmhJ3gKXJd9lQ4fqN7ptkWLTpJ4vaY=";
           };
         };
     in

From 1cbde519555635aa3a082b26ed718e96fbf0d132 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Mon, 3 Nov 2025 21:35:31 +0000
Subject: [PATCH 5211/6226] diskscan: fix `cmake-4` build failure

Without the change the https://hydra.nixos.org/build/310538459:

    CMake Error at CMakeLists.txt:1 (cmake_minimum_required):
      Compatibility with CMake < 3.5 has been removed from CMake.

ZHF: #457852
Co-authored-by: dotlambda <github@dotlambda.de>
---
 pkgs/by-name/di/diskscan/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/di/diskscan/package.nix b/pkgs/by-name/di/diskscan/package.nix
index bbb737a7d498..ba2129763486 100644
--- a/pkgs/by-name/di/diskscan/package.nix
+++ b/pkgs/by-name/di/diskscan/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   ncurses,
   zlib,
@@ -18,6 +19,16 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-2y1ncPg9OKxqImBN5O5kXrTsuwZ/Cg/8exS7lWyZY1c=";
   };
 
+  patches = [
+    # cmake-4 support:
+    #   https://github.com/baruch/diskscan/pull/77
+    (fetchpatch {
+      name = "cmake-4.patch";
+      url = "https://github.com/baruch/diskscan/commit/6e342469dcab32be7a33109a4d394141d5c905b5.patch";
+      hash = "sha256-05ctYPmGWTJRUc4aN35fvb0ITwIZlQdIweH7tSQ0RjA=";
+    })
+  ];
+
   buildInputs = [
     ncurses
     zlib

From 0117f57128e6cd8a176e5e80646ab97832c1919f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 06:33:23 +0000
Subject: [PATCH 5212/6226] opa-envoy-plugin: 1.9.0-envoy -> 1.10.0-envoy

---
 pkgs/by-name/op/opa-envoy-plugin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opa-envoy-plugin/package.nix b/pkgs/by-name/op/opa-envoy-plugin/package.nix
index 2710fd3f7482..b63bca544378 100644
--- a/pkgs/by-name/op/opa-envoy-plugin/package.nix
+++ b/pkgs/by-name/op/opa-envoy-plugin/package.nix
@@ -14,16 +14,16 @@ assert
 
 buildGoModule rec {
   pname = "opa-envoy-plugin";
-  version = "1.9.0-envoy";
+  version = "1.10.0-envoy";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "opa-envoy-plugin";
     tag = "v${version}";
-    hash = "sha256-Arc0aVDcGZqCrrUrAB9yVXSXzdtOlXEFGZ8pJ578oKk=";
+    hash = "sha256-qKLeSpVy/ImeJ2WPLa3uQSHA/6Y4Visb9lgC4PkURkI=";
   };
 
-  vendorHash = null;
+  vendorHash = "sha256-l/0IaHz1wTNqX/Im8g0fjTqVOtMHSdqSpl0Oo1ByyxA=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From aef812c6e38fffa548d3f5821713b6b1efbd74b6 Mon Sep 17 00:00:00 2001
From: Ben Siraphob <bensiraphob@gmail.com>
Date: Sun, 2 Nov 2025 22:19:44 -0800
Subject: [PATCH 5213/6226] borgbackup: fix non-deterministic builds on darwin

---
 pkgs/by-name/bo/borgbackup/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/bo/borgbackup/package.nix b/pkgs/by-name/bo/borgbackup/package.nix
index f17b4f0859aa..be12bcedeedd 100644
--- a/pkgs/by-name/bo/borgbackup/package.nix
+++ b/pkgs/by-name/bo/borgbackup/package.nix
@@ -120,6 +120,11 @@ python.pkgs.buildPythonApplication rec {
     "test_get_keys_dir"
     "test_get_security_dir"
     "test_get_config_dir"
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    # Tests create files with append-only flags that cause cleanup issues on macOS
+    "test_extract_restores_append_flag"
+    "test_file_status_excluded"
   ];
 
   preCheck = ''

From d084bda5ca9fb8c1a9c64713861ad3ddbf649732 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 06:37:48 +0000
Subject: [PATCH 5214/6226] codecrafters-cli: 43 -> 44

---
 pkgs/by-name/co/codecrafters-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/codecrafters-cli/package.nix b/pkgs/by-name/co/codecrafters-cli/package.nix
index b81deb83009f..8c62003995aa 100644
--- a/pkgs/by-name/co/codecrafters-cli/package.nix
+++ b/pkgs/by-name/co/codecrafters-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "codecrafters-cli";
-  version = "43";
+  version = "44";
 
   src = fetchFromGitHub {
     owner = "codecrafters-io";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-B7vxBl4y2gS4iEmER4Cq1D7yDGFW3Q4DRL+aJESMOMs=";
+    hash = "sha256-eyKQMMF9EEF55r+Q1QcqiswctXCqetgnAKQJTwaC60s=";
     # A shortened git commit hash is part of the version output, and is
     # needed at build time. Use the `.git` directory to retrieve the
     # commit SHA, and remove the directory afterwards since it is not needed

From 2de8846492c0b6bdf4c97de1def07e2f21e3ebc3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 06:53:51 +0000
Subject: [PATCH 5215/6226] dotenvx: 1.51.0 -> 1.51.1

---
 pkgs/by-name/do/dotenvx/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix
index f6f0c720a8ff..5e77de59c0b9 100644
--- a/pkgs/by-name/do/dotenvx/package.nix
+++ b/pkgs/by-name/do/dotenvx/package.nix
@@ -8,16 +8,16 @@
 
 buildNpmPackage rec {
   pname = "dotenvx";
-  version = "1.51.0";
+  version = "1.51.1";
 
   src = fetchFromGitHub {
     owner = "dotenvx";
     repo = "dotenvx";
     tag = "v${version}";
-    hash = "sha256-vRvcsh4b/QlU+f7646t8O5F8VT/K6zBxbUpos+hh0fw=";
+    hash = "sha256-oXq3OfMPmfbBr5wfumiql8uX+tkCtJJ5W0CT6M3cBp8=";
   };
 
-  npmDepsHash = "sha256-AT9ZE7ip63t6vK/GBVM9JCmir68jrxMN54RoREmjSIk=";
+  npmDepsHash = "sha256-scRpNiBwZBtaYTpepNw+OsMS6Dy1uUq/hkH++cr2qRQ=";
 
   dontNpmBuild = true;
 

From c74efd2ba0acb274264a107d2872340f3c0f13fd Mon Sep 17 00:00:00 2001
From: Tatu Argillander <tatu.argillander@kouralabs.com>
Date: Mon, 3 Nov 2025 22:26:13 +0200
Subject: [PATCH 5216/6226] rusty-path-of-building: add X11 support

---
 pkgs/by-name/ru/rusty-path-of-building/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ru/rusty-path-of-building/package.nix b/pkgs/by-name/ru/rusty-path-of-building/package.nix
index 4812537786fb..10b0184b3670 100644
--- a/pkgs/by-name/ru/rusty-path-of-building/package.nix
+++ b/pkgs/by-name/ru/rusty-path-of-building/package.nix
@@ -13,8 +13,8 @@
   libxkbcommon,
   vulkan-loader,
   wayland,
+  xorg,
 }:
-
 rustPlatform.buildRustPackage rec {
   pname = "rusty-path-of-building";
   version = "0.2.7";
@@ -66,6 +66,9 @@ rustPlatform.buildRustPackage rec {
           libxkbcommon
           vulkan-loader
           wayland
+          xorg.libX11
+          xorg.libXcursor
+          xorg.libXi
         ]
       }
 

From 9c863da7c175516243a045b71fe028cd95f1f3c2 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Tue, 4 Nov 2025 08:02:10 +0100
Subject: [PATCH 5217/6226] claude-code: 2.0.31 -> 2.0.32

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
---
 pkgs/by-name/cl/claude-code/package-lock.json | 4 ++--
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index ca2b3582880a..0691f4804eeb 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.0.31",
+  "version": "2.0.32",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.0.31",
+      "version": "2.0.32",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 11d98c002e6d..09a3293e0d39 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,14 +7,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.0.31";
+  version = "2.0.32";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-KQRc9h2DG1bwWvMR1EnMWi9qygPF0Fsr97+TyKef3NI=";
+    hash = "sha256-w8auh/tivUF4ZxbZ5BRJcym0wPYDaYhCP33mHbjPo/c=";
   };
 
-  npmDepsHash = "sha256-lv596UikbuAuiJ1Wl5xMJvSNITfGOnDvI1dLtaJagCY=";
+  npmDepsHash = "sha256-Nw/TnZ7ZaxXaQolT/e7XuF1c41E848TW3n+1Y+U9Be8=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 7e212bfdd58e19200c88da85a6e57448b050cb73 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Tue, 4 Nov 2025 01:08:27 +0800
Subject: [PATCH 5218/6226] fetchurl: fix pname and version overriding

---
 pkgs/build-support/fetchurl/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index 88e7bfaa7809..53b03e91dc1e 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -230,7 +230,7 @@ lib.extendMkDerivation {
 
     {
       name =
-        if pname != null && version != null then
+        if finalAttrs.pname or null != null && finalAttrs.version or null != null then
           "${finalAttrs.pname}-${finalAttrs.version}"
         else if showURLs then
           "urls"

From 6e036ab2d13999d2764d4297b0d84d1c22735456 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Tue, 4 Nov 2025 12:21:37 +0530
Subject: [PATCH 5219/6226] asciicam: add phanirithvij as maintainer

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/as/asciicam/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/as/asciicam/package.nix b/pkgs/by-name/as/asciicam/package.nix
index 34eba22b97d1..8ece0bd7585d 100644
--- a/pkgs/by-name/as/asciicam/package.nix
+++ b/pkgs/by-name/as/asciicam/package.nix
@@ -26,7 +26,7 @@ buildGoModule {
     description = "Displays your webcam on the terminal";
     homepage = "https://github.com/muesli/asciicam";
     license = licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ phanirithvij ];
     mainProgram = "asciicam";
   };
 }

From dd9c28dcf0ed1f2f460d0e67fb8523f83b5f6b08 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 07:27:25 +0000
Subject: [PATCH 5220/6226] teamviewer: 15.70.6 -> 15.71.4

---
 pkgs/applications/networking/remote/teamviewer/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix
index 4531ae3d7f36..ea7e86b4295e 100644
--- a/pkgs/applications/networking/remote/teamviewer/default.nix
+++ b/pkgs/applications/networking/remote/teamviewer/default.nix
@@ -30,7 +30,7 @@ mkDerivation rec {
     "out"
     "dev"
   ];
-  version = "15.70.6";
+  version = "15.71.4";
 
   src =
     let
@@ -39,11 +39,11 @@ mkDerivation rec {
     {
       x86_64-linux = fetchurl {
         url = "${base_url}/teamviewer_${version}_amd64.deb";
-        hash = "sha256-39hJPR9rS5EAaNc0jaBndwYAkSE7r2dz0H1vQDfUhK8=";
+        hash = "sha256-DztZRVBIFdLkZX1a89tVwJvJicgsm5YTux0ezyWL1+w=";
       };
       aarch64-linux = fetchurl {
         url = "${base_url}/teamviewer_${version}_arm64.deb";
-        hash = "sha256-mXJObC8KFjRkw6IbSOpL1MxL58Bk4QovA8zDalPi56g=";
+        hash = "sha256-lKEAuMsScbnEkgR6VFykEyar55u/Fdt5VcCWnKPwJLU=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

From 756aaeed238c31c6e0a1f6632faf2abe35494afb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 07:29:36 +0000
Subject: [PATCH 5221/6226] cockpit: 349 -> 350

---
 pkgs/by-name/co/cockpit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix
index add9765fa17e..4744288b360e 100644
--- a/pkgs/by-name/co/cockpit/package.nix
+++ b/pkgs/by-name/co/cockpit/package.nix
@@ -44,13 +44,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cockpit";
-  version = "349";
+  version = "350";
 
   src = fetchFromGitHub {
     owner = "cockpit-project";
     repo = "cockpit";
     tag = finalAttrs.version;
-    hash = "sha256-MfZPT0gY3G4Tkp2TQN7HZVgy1oiJU9zrIzaLU8r9FjU=";
+    hash = "sha256-DOMX3msM5Ko7TDMRS+GcAf+gmyogjSExNEM9sjK0cCY=";
     fetchSubmodules = true;
   };
 

From 17aabeb9aa52721c27c06ebbb888559a72aeec33 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Nov 2025 08:31:48 +0100
Subject: [PATCH 5222/6226] python313Packages.botocore-stubs: 1.40.64 ->
 1.40.65

---
 pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index b219273da754..0edeee6056a7 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.40.64";
+  version = "1.40.65";
   pyproject = true;
 
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-m6tH000Oxxg+BKM1bj+i3/wRru+oRFs3qzV8cJg4/xQ=";
+    hash = "sha256-MfO51dsNHcZknRHBg8thOs8rXTKXnBYIUtSvtVRC7bo=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 289e17a88d2aaacbbdd62c6746d3eb1c008f5eb9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 4 Nov 2025 08:33:42 +0100
Subject: [PATCH 5223/6226] python313Packages.iamdata: 0.1.202511021 ->
 0.1.202511041

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202511021...v0.1.202511041

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202511041
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 7ce9c2a95abc..87cb745ee6ec 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202511021";
+  version = "0.1.202511041";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-iB5ke9vOdW/OHemITGC7t1i8iQKm5TjytVxRyUjb0Gk=";
+    hash = "sha256-AHiQzGC+++C60EfP1RRAecHYlmJuziub09kOtIxSQoU=";
   };
 
   __darwinAllowLocalNetworking = true;

From 507887f38fd087cf6d5cf1ce5b8fe327bcc4ca19 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 07:51:53 +0000
Subject: [PATCH 5224/6226] misconfig-mapper: 1.14.9 -> 1.14.14

---
 pkgs/by-name/mi/misconfig-mapper/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mi/misconfig-mapper/package.nix b/pkgs/by-name/mi/misconfig-mapper/package.nix
index b1f6d2d8e615..04b15ca9bdb6 100644
--- a/pkgs/by-name/mi/misconfig-mapper/package.nix
+++ b/pkgs/by-name/mi/misconfig-mapper/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "misconfig-mapper";
-  version = "1.14.9";
+  version = "1.14.14";
 
   src = fetchFromGitHub {
     owner = "intigriti";
     repo = "misconfig-mapper";
     tag = "v${version}";
-    hash = "sha256-4d7/RxL8+ZJXnoU2zOl6W6f5/KsuqrS95IYttC81zVA=";
+    hash = "sha256-5tugmwr1TyBa89a/yrch+cshyoiJ3uj4EoweltN5d/0=";
   };
 
-  vendorHash = "sha256-2DlhNr1P6NEeV5IIum19LWufFlOcXxfLH93k3jkwnDA=";
+  vendorHash = "sha256-pLhc3Lc8Mp5ZRmNvac3qdQcw1rPQs7bbn4K0UHp04Qs=";
 
   ldflags = [
     "-s"

From 242296771aab63e3ccc442162b8a49afede30662 Mon Sep 17 00:00:00 2001
From: Grimmauld <Grimmauld@grimmauld.de>
Date: Tue, 4 Nov 2025 08:55:54 +0100
Subject: [PATCH 5225/6226] doxygen_gui: build against qt6

qt5 is on the way out. Upstream doxygen defaults to qt6 since 1.15.0 [1].
We should adjust our nix packaging accordingly.
This does break the override interface sability.
However, we never really guaranteed override stability,
so this should be fine even during freeze month.

[1] https://www.doxygen.nl/manual/changelog.html
---
 .../tools/documentation/doxygen/default.nix    | 18 ++++++++----------
 pkgs/top-level/all-packages.nix                |  4 ++--
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix
index 801e6592d030..c0a65e96495a 100644
--- a/pkgs/development/tools/documentation/doxygen/default.nix
+++ b/pkgs/development/tools/documentation/doxygen/default.nix
@@ -6,7 +6,7 @@
   python3,
   flex,
   bison,
-  qt5,
+  qt6,
   libiconv,
   spdlog,
   fmt,
@@ -45,20 +45,18 @@ stdenv.mkDerivation (finalAttrs: {
     fmt
     sqlite
   ]
-  ++ lib.optionals (qt5 != null) (
-    with qt5;
-    [
-      qtbase
-      wrapQtAppsHook
-    ]
-  );
+  ++ lib.optionals (qt6 != null) [
+    qt6.qtbase
+    qt6.wrapQtAppsHook
+    qt6.qtsvg
+  ];
 
   cmakeFlags = [
     "-Duse_sys_spdlog=ON"
     "-Duse_sys_fmt=ON"
     "-Duse_sys_sqlite3=ON"
   ]
-  ++ lib.optional (qt5 != null) "-Dbuild_wizard=YES";
+  ++ lib.optional (qt6 != null) "-Dbuild_wizard=YES";
 
   # put examples in an output so people/tools can test against them
   outputs = [
@@ -85,6 +83,6 @@ stdenv.mkDerivation (finalAttrs: {
       off-line reference manual (in LaTeX) from a set of documented source
       files.
     '';
-    platforms = if qt5 != null then lib.platforms.linux else lib.platforms.unix;
+    platforms = if qt6 != null then lib.platforms.linux else lib.platforms.unix;
   };
 })
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fe5ec8f968c8..ec60a1c848c7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6495,10 +6495,10 @@ with pkgs;
   dot2tex = with python3.pkgs; toPythonApplication dot2tex;
 
   doxygen = callPackage ../development/tools/documentation/doxygen {
-    qt5 = null;
+    qt6 = null;
   };
 
-  doxygen_gui = lowPrio (doxygen.override { inherit qt5; });
+  doxygen_gui = lowPrio (doxygen.override { inherit qt6; });
 
   drake = callPackage ../development/tools/build-managers/drake { };
 

From cf2f6646698894537664079c9a5d0b8616f52a60 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 08:10:44 +0000
Subject: [PATCH 5226/6226] stevenblack-blocklist: 3.16.26 -> 3.16.29

---
 pkgs/by-name/st/stevenblack-blocklist/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/stevenblack-blocklist/package.nix b/pkgs/by-name/st/stevenblack-blocklist/package.nix
index 54391a206bc9..920059c2e686 100644
--- a/pkgs/by-name/st/stevenblack-blocklist/package.nix
+++ b/pkgs/by-name/st/stevenblack-blocklist/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "stevenblack-blocklist";
-  version = "3.16.26";
+  version = "3.16.29";
 
   src = fetchFromGitHub {
     owner = "StevenBlack";
     repo = "hosts";
     tag = finalAttrs.version;
-    hash = "sha256-KQx4CWPfKBJwuBONYSE7AIKa7UBXBvtNVcrOmkPrjkY=";
+    hash = "sha256-y4JK99EDlDdRgOJj6NkiafVDab6umWJCjupKm9Leekk=";
   };
 
   outputs = [

From 21c0436106518aff38c5b1aec584cfb1178c86dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 08:10:47 +0000
Subject: [PATCH 5227/6226] python3Packages.sagemaker: 2.253.1 -> 2.254.1

---
 pkgs/development/python-modules/sagemaker/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix
index 50fdd32cb72d..6776c46246d9 100644
--- a/pkgs/development/python-modules/sagemaker/default.nix
+++ b/pkgs/development/python-modules/sagemaker/default.nix
@@ -41,14 +41,14 @@
 
 buildPythonPackage rec {
   pname = "sagemaker";
-  version = "2.253.1";
+  version = "2.254.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-python-sdk";
     tag = "v${version}";
-    hash = "sha256-1zN+gj1t0eYpa2mZFSAMs9oInF2XxKNhK8399e6xb68=";
+    hash = "sha256-tE8AD/nVrlP96ihVjzpos1IUGPR2T47HAMczCGP3S9M=";
   };
 
   build-system = [

From 5d09bd3b71150d79651a6927ebe7eac02a414d58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Tue, 28 Oct 2025 12:37:45 +0100
Subject: [PATCH 5228/6226] python3Packages.django-postgres-extra: init at
 2.0.9

---
 .../django-postgres-extra/default.nix         | 107 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 2 files changed, 109 insertions(+)
 create mode 100644 pkgs/development/python-modules/django-postgres-extra/default.nix

diff --git a/pkgs/development/python-modules/django-postgres-extra/default.nix b/pkgs/development/python-modules/django-postgres-extra/default.nix
new file mode 100644
index 000000000000..2dd99612fe02
--- /dev/null
+++ b/pkgs/development/python-modules/django-postgres-extra/default.nix
@@ -0,0 +1,107 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  django,
+  python-dateutil,
+  # test dependencies
+  coverage,
+  dj-database-url,
+  freezegun,
+  postgresql,
+  psycopg2,
+  pytest,
+  pytest-benchmark,
+  pytest-cov,
+  pytest-django,
+  pytest-freezegun,
+  pytest-lazy-fixture,
+  pytestCheckHook,
+  syrupy,
+  tox,
+  types-psycopg2,
+}:
+buildPythonPackage rec {
+  pname = "django-postgres-extra";
+  version = "2.0.9";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "SectorLabs";
+    repo = "django-postgres-extra";
+    rev = "v${version}";
+    hash = "sha256-/2qoXZ2f3un2cgJFAGMnQWBraJ7urkb0kHtcKKJsh6w=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    django
+    python-dateutil
+  ];
+
+  nativeCheckInputs = [
+    coverage
+    dj-database-url
+    freezegun
+    postgresql
+    psycopg2
+    pytest
+    pytest-benchmark
+    pytest-cov
+    pytest-django
+    pytest-freezegun
+    pytest-lazy-fixture
+    pytestCheckHook
+    syrupy
+    tox
+    types-psycopg2
+  ];
+
+  preCheck = ''
+    # Start Postgres.
+    export PGDATA="$NIX_BUILD_TOP/.postgres"
+    export PGHOST="$PGDATA/run"
+    export DATABASE_URL=postgresql://''${PGHOST//\//%2F}/psqlextra
+    initdb -E UTF8
+    mkdir -p "$PGDATA/run"
+    cat <<EOF >> "$PGDATA/postgresql.conf"
+    unix_socket_directories = '$PGDATA/run'
+    EOF
+    echo "CREATE DATABASE psqlextra" | postgres --single -E postgres
+    echo "Starting Postgres at $PGDATA" >&2
+    pg_ctl start -w
+  '';
+
+  postCheck = ''
+    echo "Stopping Postgres at $PGDATA" >&2
+    pg_ctl stop -w
+  '';
+
+  disabledTests = [
+    "test_management_command_partition_auto_confirm"
+    "test_management_command_partition_confirm_no"
+    "test_management_command_partition_confirm_yes"
+    "test_management_command_partition_dry_run"
+  ]
+  # tests incompatible with django>=5
+  ++ lib.optionals (lib.versionAtLeast django.version "5") [
+    "test_schema_editor_clone_model_to_schema"
+    "test_schema_editor_clone_model_to_schema_custom_constraint_names"
+  ]
+  # tests incompatible with django>=5.2
+  ++ lib.optionals (lib.versionAtLeast django.version "5.2") [
+    "test_query_annotate_rename_chain"
+  ];
+
+  pythonImportsCheck = [ "psqlextra" ];
+
+  meta = with lib; {
+    description = "Bringing all of PostgreSQL's awesomeness to Django";
+    homepage = "https://github.com/SectorLabs/django-postgres-extra";
+    changelog = "https://github.com/SectorLabs/django-postgres-extra/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ b4dm4n ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 41059f238981..bc27f3326078 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4096,6 +4096,8 @@ self: super: with self; {
 
   django-polymorphic = callPackage ../development/python-modules/django-polymorphic { };
 
+  django-postgres-extra = callPackage ../development/python-modules/django-postgres-extra { };
+
   django-postgres-partition = callPackage ../development/python-modules/django-postgres-partition { };
 
   django-postgresql-netfields =

From 7b85dc3633eb9bd2bfecf436d4a86f44c35a35d4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 08:29:41 +0000
Subject: [PATCH 5229/6226] git-spice: 0.19.0 -> 0.20.0

---
 pkgs/by-name/gi/git-spice/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix
index ec428011fdc7..18c66b955409 100644
--- a/pkgs/by-name/gi/git-spice/package.nix
+++ b/pkgs/by-name/gi/git-spice/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "git-spice";
-  version = "0.19.0";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "abhinav";
     repo = "git-spice";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-LFzu7EeH6veambFHou7leJgrJU4L/iYyl5H6IaM3afs=";
+    hash = "sha256-G4GnqasZkvwHviR+Bj81dRp/oOT4dxPDmIvJA9I5tCg=";
   };
 
-  vendorHash = "sha256-hr4t3VseLxV3xFWFtpTTiG+2XK7kFxxYrfzCwCU/zx8=";
+  vendorHash = "sha256-JtgXF4Qd4+zknl3DAQihe11dPFLiz8pQRa+apPSYb18=";
 
   subPackages = [ "." ];
 

From 1baa12bcdad1b67373271f7d955d720314a98ba8 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Mon, 3 Nov 2025 15:48:41 -0300
Subject: [PATCH 5230/6226] antimony: 2022-11-23 -> 0.9.3-unstable-2025-10-12

---
 pkgs/by-name/an/antimony/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/antimony/package.nix b/pkgs/by-name/an/antimony/package.nix
index 05c29ae9e698..2e9a10ff08d8 100644
--- a/pkgs/by-name/an/antimony/package.nix
+++ b/pkgs/by-name/an/antimony/package.nix
@@ -16,19 +16,19 @@
 }:
 
 let
-  gitRev = "8b805c674adad536f9dd552b4be75fadcb3c7db6";
+  gitRev = "b4b000937376a0ecf7ca1a2e708fb243624e7bdd";
   gitBranch = "develop";
   gitTag = "0.9.3";
 in
 stdenv.mkDerivation {
   pname = "antimony";
-  version = "2022-11-23";
+  version = "0.9.3-unstable-2025-10-12";
 
   src = fetchFromGitHub {
     owner = "mkeeter";
     repo = "antimony";
     rev = gitRev;
-    sha256 = "NmOuBewfHqtAim2cNP62LXgRjVWuVUGweV46sY1qjGk=";
+    hash = "sha256-O+nzL9XMCbtQiJx4xRs9w8a7uVqroZgxGnY0cydeqmw=";
   };
 
   patches = [ ./paths-fix.patch ];

From 20b17c1a5f1c6d3a3b7e5b0a0180c9784af69457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Tue, 4 Nov 2025 09:39:55 +0100
Subject: [PATCH 5231/6226] authentik: 2025.8.4 -> 2025.10.1

---
 pkgs/by-name/au/authentik/package.nix | 82 +++++++++++++++++----------
 1 file changed, 53 insertions(+), 29 deletions(-)

diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix
index d9a8783ab369..f03d6b67f963 100644
--- a/pkgs/by-name/au/authentik/package.nix
+++ b/pkgs/by-name/au/authentik/package.nix
@@ -15,13 +15,13 @@
 let
   nodejs = nodejs_24;
 
-  version = "2025.8.4";
+  version = "2025.10.1";
 
   src = fetchFromGitHub {
     owner = "goauthentik";
     repo = "authentik";
     rev = "version/${version}";
-    hash = "sha256-pIzDaoDWc58cY/XhsyweCwc4dfRvkaT/zqsV1gDSnCI=";
+    hash = "sha256-HowB6DTGCqz770fKYbnE+rQ11XRV0WSNkLD+HSWZwz8=";
   };
 
   meta = {
@@ -48,8 +48,8 @@ let
 
     outputHash =
       {
-        "aarch64-linux" = "sha256-fa/WGRb4lWSXMqBmGhCd+N2fZr1YZKsskr3Oowp8gRE=";
-        "x86_64-linux" = "sha256-jVi+pgcz96Dj25T4e/s+SHqsZfonzXs1WZYe0lCI48Q=";
+        "aarch64-linux" = "sha256-aXXlzTsZp5mOrsxy9oHNzcc+1cFSnbC9RmtawBohmLI=";
+        "x86_64-linux" = "sha256-Hi0HXzwTLuer0v4IKF3aim0tVe7AVLi67DiMimrIq5s=";
       }
       .${stdenvNoCC.hostPlatform.system} or (throw "authentik-website-deps: unsupported host platform");
 
@@ -119,8 +119,8 @@ let
 
     outputHash =
       {
-        "aarch64-linux" = "sha256-4JkNwQACS3tiiLuj41cGRWNspljVQxlsJvCM9KE2JrQ=";
-        "x86_64-linux" = "sha256-LD+zXc8neRbEwq1mx9y7b+08p8hxvo/RW6QzsFQgaUs=";
+        "aarch64-linux" = "sha256-t/jyzG3ibTW3fu8Gl1tWkSjMG6Lek/7JDccDrZX6sD0=";
+        "x86_64-linux" = "sha256-8I1YAKvgWjM3p9O1mCetZvhZelrfB31w0ZwkZBUEoh4=";
       }
       .${stdenvNoCC.hostPlatform.system} or (throw "authentik-webui-deps: unsupported host platform");
     outputHashMode = "recursive";
@@ -205,10 +205,32 @@ let
   python = python312.override {
     self = python;
     packageOverrides = final: prev: {
-      # https://github.com/goauthentik/authentik/pull/14709
-      django = final.django_5_1;
+      # https://github.com/goauthentik/authentik/pull/16324
+      django = final.django_5_2;
 
-      django-dramatiq-postgres = prev.buildPythonPackage {
+      django-channels-postgres = final.buildPythonPackage {
+        pname = "django-channels-postgres";
+        inherit version src meta;
+        pyproject = true;
+
+        sourceRoot = "${src.name}/packages/django-channels-postgres";
+
+        build-system = with final; [ hatchling ];
+
+        propagatedBuildInputs =
+          with final;
+          [
+            channels
+            django
+            django-pgtrigger
+            msgpack
+            psycopg
+            structlog
+          ]
+          ++ psycopg.optional-dependencies.pool;
+      };
+
+      django-dramatiq-postgres = final.buildPythonPackage {
         pname = "django-dramatiq-postgres";
         inherit version src meta;
         pyproject = true;
@@ -222,6 +244,7 @@ let
           [
             cron-converter
             django
+            django-pglock
             django-pgtrigger
             dramatiq
             structlog
@@ -230,10 +253,25 @@ let
           ++ dramatiq.optional-dependencies.watch;
       };
 
+      django-postgres-cache = final.buildPythonPackage {
+        pname = "django-postgres-cache";
+        inherit version src meta;
+        pyproject = true;
+
+        sourceRoot = "${src.name}/packages/django-postgres-cache";
+
+        build-system = with final; [ hatchling ];
+
+        propagatedBuildInputs = with final; [
+          django
+          django-postgres-extra
+        ];
+      };
+
       # Running authentik currently requires a custom version.
       # Look in `pyproject.toml` for changes to the rev in the `[tool.uv.sources]` section.
       # See https://github.com/goauthentik/authentik/pull/14057 for latest version bump.
-      djangorestframework = prev.buildPythonPackage {
+      djangorestframework = final.buildPythonPackage {
         pname = "djangorestframework";
         version = "3.16.0";
         format = "setuptools";
@@ -286,18 +324,7 @@ let
         };
       });
 
-      tenant-schemas-celery = prev.tenant-schemas-celery.overrideAttrs (_: rec {
-        version = "3.0.0";
-
-        src = fetchFromGitHub {
-          owner = "maciej-gol";
-          repo = "tenant-schemas-celery";
-          tag = version;
-          hash = "sha256-3ZUXSAOBMtj72sk/VwPV24ysQK+E4l1HdwKa78xrDtg=";
-        };
-      });
-
-      authentik-django = prev.buildPythonPackage {
+      authentik-django = final.buildPythonPackage {
         pname = "authentik-django";
         inherit version src meta;
         pyproject = true;
@@ -326,14 +353,13 @@ let
           with final;
           [
             argon2-cffi
-            celery
             channels
-            channels-redis
             cryptography
             dacite
             deepmerge
             defusedxml
             django
+            django-channels-postgres
             django-countries
             django-cte
             django-dramatiq-postgres
@@ -342,8 +368,9 @@ let
             django-model-utils
             django-pglock
             django-pgtrigger
+            django-postgres-cache
+            django-postgres-extra
             django-prometheus
-            django-redis
             django-storages
             django-tenants
             djangoql
@@ -354,7 +381,6 @@ let
             drf-spectacular
             duo-client
             fido2
-            flower
             geoip2
             geopy
             google-api-python-client
@@ -383,7 +409,6 @@ let
             setproctitle
             structlog
             swagger-spec-validator
-            tenant-schemas-celery
             twilio
             ua-parser
             unidecode
@@ -396,7 +421,6 @@ let
             zxcvbn
           ]
           ++ django-storages.optional-dependencies.s3
-          ++ opencontainers.optional-dependencies.reggie
           ++ psycopg.optional-dependencies.c
           ++ psycopg.optional-dependencies.pool
           ++ uvicorn.optional-dependencies.standard;
@@ -431,7 +455,7 @@ let
 
     env.CGO_ENABLED = 0;
 
-    vendorHash = "sha256-wTTEDBRYCW1UFaeX49ufLT0c17sacJzcCaW/8cPNYR4=";
+    vendorHash = "sha256-m2shrCwoVdbtr8B83ZcAyG+J6dEys2xdjtlfFFF4CDo=";
 
     postInstall = ''
       mv $out/bin/server $out/bin/authentik

From 0d3edca0783efceee72574bb15c1ef1ea2ddc4cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 08:51:38 +0000
Subject: [PATCH 5232/6226] cyclonedx-python: 7.2.0 -> 7.2.1

---
 pkgs/by-name/cy/cyclonedx-python/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cy/cyclonedx-python/package.nix b/pkgs/by-name/cy/cyclonedx-python/package.nix
index 6d1c1df42727..0c7041c6f0b0 100644
--- a/pkgs/by-name/cy/cyclonedx-python/package.nix
+++ b/pkgs/by-name/cy/cyclonedx-python/package.nix
@@ -6,14 +6,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "cyclonedx-python";
-  version = "7.2.0";
+  version = "7.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CycloneDX";
     repo = "cyclonedx-python";
     tag = "v${version}";
-    hash = "sha256-4Mvt8l6kDT7GR4ufIelQd9rTt5ljdpMVWwRGZV5jIc8=";
+    hash = "sha256-JhPrVNzuoUTOmFBaPiq+UuUBRCHG2mqz8z1/24OcZAI=";
   };
 
   build-system = with python3Packages; [ poetry-core ];

From 6d015ef7f230d3e74f0f11ff32fc053366137e8a Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 11 Oct 2025 10:03:30 -0300
Subject: [PATCH 5233/6226] gl-gsync-demo: move to by-name, modernize

---
 .../gl/gl-gsync-demo/package.nix}                | 16 ++++++++++------
 pkgs/top-level/all-packages.nix                  |  4 ----
 2 files changed, 10 insertions(+), 10 deletions(-)
 rename pkgs/{games/gl-gsync-demo/default.nix => by-name/gl/gl-gsync-demo/package.nix} (78%)

diff --git a/pkgs/games/gl-gsync-demo/default.nix b/pkgs/by-name/gl/gl-gsync-demo/package.nix
similarity index 78%
rename from pkgs/games/gl-gsync-demo/default.nix
rename to pkgs/by-name/gl/gl-gsync-demo/package.nix
index fcfb9fb53144..b8ce7e582627 100644
--- a/pkgs/games/gl-gsync-demo/default.nix
+++ b/pkgs/by-name/gl/gl-gsync-demo/package.nix
@@ -4,11 +4,15 @@
   libX11,
   libglut,
   glew,
-  libXNVCtrl,
   libXext,
+  linuxPackages,
   lib,
 }:
 
+let
+  inherit (linuxPackages.nvidia_x11.settings) libXNVCtrl;
+in
+
 stdenv.mkDerivation {
   pname = "gl-gsync-demo";
   version = "unstable-2020-12-27";
@@ -17,7 +21,7 @@ stdenv.mkDerivation {
     owner = "dahenry";
     repo = "gl-gsync-demo";
     rev = "4fd963a8ad880dc2d846394c8c80b2091a119591";
-    sha256 = "1innsmpsd9n9ih80v16rhj2ijrl28jd7x6a4jmxdirba7mjibm8d";
+    hash = "sha256-DdUVZT1q5dh6lUSZfppEgmYZhYTZhA0QjMmmpm/V1sY=";
   };
 
   buildInputs = [
@@ -36,10 +40,10 @@ stdenv.mkDerivation {
     runHook postInstall
   '';
 
-  meta = with lib; {
-    license = with licenses; mit;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ atemu ];
+  meta = {
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ atemu ];
     description = "Very basic OpenGL demo for testing NVIDIA's G-SYNC technology on Linux";
     mainProgram = "gl-gsync-demo";
     longDescription = ''
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9e61510636ce..28b150cc3d05 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13193,10 +13193,6 @@ with pkgs;
 
   freeciv_gtk = freeciv;
 
-  gl-gsync-demo = callPackage ../games/gl-gsync-demo {
-    libXNVCtrl = linuxPackages.nvidia_x11.settings.libXNVCtrl;
-  };
-
   gscrabble = python3Packages.callPackage ../games/gscrabble { };
 
   qtads = qt5.callPackage ../games/qtads { };

From cc5898f804b7bc4f5a283d80932d6fcfa6c692cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 08:59:25 +0000
Subject: [PATCH 5234/6226] python3Packages.lib4sbom: 0.8.8 -> 0.9.0

---
 pkgs/development/python-modules/lib4sbom/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lib4sbom/default.nix b/pkgs/development/python-modules/lib4sbom/default.nix
index da2e50226b23..eba8b9ef9904 100644
--- a/pkgs/development/python-modules/lib4sbom/default.nix
+++ b/pkgs/development/python-modules/lib4sbom/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "lib4sbom";
-  version = "0.8.8";
+  version = "0.9.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "anthonyharrison";
     repo = "lib4sbom";
     tag = "v${version}";
-    hash = "sha256-JfY47bskOnQeh5ueQfBtQz8Hmi9mPjCMoaFrzpxQMhU=";
+    hash = "sha256-AtsoCC/p9onzM2BebFtz2Hwf4bnAYd1tNU+acslqCsM=";
   };
 
   build-system = [ setuptools ];

From 5f62e07e7889bbf72c2cbec43dec2e9c4a2c669e Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Tue, 4 Nov 2025 08:59:38 +0000
Subject: [PATCH 5235/6226] vscode-extensions.augment.vscode-augment: 0.613.0
 -> 0.627.0

---
 .../vscode/extensions/augment.vscode-augment/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix b/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix
index b29a3f0d039c..043d6a9853d6 100644
--- a/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/augment.vscode-augment/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "vscode-augment";
     publisher = "augment";
-    version = "0.613.0";
-    hash = "sha256-2HvDCfNX+snwnqd9XI6rHBkGBydxnf5OYYfBnAAxjZk=";
+    version = "0.627.0";
+    hash = "sha256-ceaGN7xhVLcMFC+5jYijpqeTJa1zsgCsvQs5mf1ueYM=";
   };
 
   meta = {

From bf8375d2a91f2088e85cad9a35d9dc874b0b80dd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 09:02:36 +0000
Subject: [PATCH 5236/6226] magika: 0.6.2 -> 1.0.1

---
 pkgs/development/python-modules/magika/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/magika/default.nix b/pkgs/development/python-modules/magika/default.nix
index d8de9bfa92b9..769b9ceaa20c 100644
--- a/pkgs/development/python-modules/magika/default.nix
+++ b/pkgs/development/python-modules/magika/default.nix
@@ -17,13 +17,13 @@
 
 buildPythonPackage rec {
   pname = "magika";
-  version = "0.6.2";
+  version = "1.0.1";
   pyproject = true;
   disabled = pythonOlder "3.9";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-N+tq6AIPbmjyMbwGBSwKDL6Ob6J0kts0Xo3IZ9vOsGc=";
+    hash = "sha256-MT+Mv83Jp+VcJChicyMKJzK4mCXlipPeK1dlMTk7g5g=";
   };
 
   nativeBuildInputs = [ hatchling ];

From f70620e23f847e214bcb13321e54d4377cd0c6c1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 09:04:36 +0000
Subject: [PATCH 5237/6226] mdns-scanner: 0.24.0 -> 0.25.0

---
 pkgs/by-name/md/mdns-scanner/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/md/mdns-scanner/package.nix b/pkgs/by-name/md/mdns-scanner/package.nix
index 7b8af54e3148..14a0477cf157 100644
--- a/pkgs/by-name/md/mdns-scanner/package.nix
+++ b/pkgs/by-name/md/mdns-scanner/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdns-scanner";
-  version = "0.24.0";
+  version = "0.25.0";
 
   src = fetchFromGitHub {
     owner = "CramBL";
     repo = "mdns-scanner";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0MHt/kSR6JvfCk08WIDPz6R9YYzDJ9RRTM6MU6sEwHk=";
+    hash = "sha256-twEzu9GpyhmFFA1vo7fufROku0ZJE+K8g5lHOJn7/VA=";
   };
 
-  cargoHash = "sha256-oJSsuU1vkisDISnp+/jFs1cWEVxr586l8yHbG6fkPjQ=";
+  cargoHash = "sha256-bqAhhdy4ekgYc5PCrfQtr3PirMxY44BnIP/JVsNW1S0=";
 
   meta = {
     homepage = "https://github.com/CramBL/mdns-scanner";

From 747d9e2d348b154162b76b4fc24f10f02ad9e55e Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 4 Nov 2025 10:06:36 +0100
Subject: [PATCH 5238/6226] ci/github-script/merge: switch order of merge
 operations

We previously used auto-merge first and then enqueued explicitly on the
assumption that auto-merge would fail if the PR was actually in
mergeable state already. This turned out to be false.

Instead, we currently face the problem of auto-merge sometimes getting
stuck. This seems to happen when, at the time of enabling auto-merge,
the required status checks already passed and the PR would be ready to
go - but sometimes GitHub doesn't do it. This *can* be unblocked by
approving the PR again, which seems to run the internal "let's check
whether we can merge this" procedures on the GitHub side again.

However, we can probably also solve this by just explicitly trying to
enqueue the PR first - and only if that fails, fall back to auto-merge.
I previously argued against that, based on a potential race condition,
in which a PR could become ready to merge between these two requests -
at which point the auto-merge operation would fail, if the original
assumption was true. But since we don't observe this, we might as well
switch.
---
 ci/github-script/merge.js | 48 ++++++++++++++++++---------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index 5f536579f22c..3ebc86d616c2 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -184,32 +184,9 @@ async function handleMerge({
       return 'Merge completed (dry)'
     }
 
-    // Using GraphQL's enablePullRequestAutoMerge mutation instead of the REST
-    // /merge endpoint, because the latter doesn't work with Merge Queues.
-    // This mutation works both with and without Merge Queues.
-    // It doesn't work when there are no required status checks for the target branch.
-    // All development branches have these enabled, so this is a non-issue.
-    try {
-      await github.graphql(
-        `mutation($node_id: ID!, $sha: GitObjectID) {
-          enablePullRequestAutoMerge(input: {
-            expectedHeadOid: $sha,
-            pullRequestId: $node_id
-          })
-          { clientMutationId }
-        }`,
-        { node_id: pull_request.node_id, sha: pull_request.head.sha },
-      )
-      return 'Enabled Auto Merge'
-    } catch (e) {
-      log('Auto Merge failed', e.response.errors[0].message)
-    }
-
-    // TODO: Observe whether the below is true and whether manual enqueue is actually needed.
-    // Auto-merge doesn't work if the target branch has already run all CI, in which
-    // case the PR must be enqueued explicitly.
-    // We now have merge queues enabled on all development branches, thus don't need a
-    // fallback after this.
+    // Using GraphQL mutations instead of the REST /merge endpoint, because the latter
+    // doesn't work with Merge Queues. We now have merge queues enabled on all development
+    // branches, so we don't need a fallback for regular merges.
     try {
       const resp = await github.graphql(
         `mutation($node_id: ID!, $sha: GitObjectID) {
@@ -227,6 +204,25 @@ async function handleMerge({
       return `[Queued](${resp.enqueuePullRequest.mergeQueueEntry.mergeQueue.url}) for merge`
     } catch (e) {
       log('Enqueing failed', e.response.errors[0].message)
+    }
+
+    // If required status checks are not satisfied, yet, the above will fail. In this case
+    // we can enable auto-merge. We could also only use auto-merge, but this often gets
+    // stuck for no apparent reason.
+    try {
+      await github.graphql(
+        `mutation($node_id: ID!, $sha: GitObjectID) {
+          enablePullRequestAutoMerge(input: {
+            expectedHeadOid: $sha,
+            pullRequestId: $node_id
+          })
+          { clientMutationId }
+        }`,
+        { node_id: pull_request.node_id, sha: pull_request.head.sha },
+      )
+      return 'Enabled Auto Merge'
+    } catch (e) {
+      log('Auto Merge failed', e.response.errors[0].message)
       throw new Error(e.response.errors[0].message)
     }
   }

From 01c95078d95d7a0cd49d337d83d26d5f4c6741ed Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sat, 25 Oct 2025 20:05:07 +0800
Subject: [PATCH 5239/6226] tlrender: init at 0.10.0

---
 pkgs/by-name/tl/tlrender/minizip-ng-4.patch |  95 ++++++++++++
 pkgs/by-name/tl/tlrender/package.nix        | 155 ++++++++++++++++++++
 2 files changed, 250 insertions(+)
 create mode 100644 pkgs/by-name/tl/tlrender/minizip-ng-4.patch
 create mode 100644 pkgs/by-name/tl/tlrender/package.nix

diff --git a/pkgs/by-name/tl/tlrender/minizip-ng-4.patch b/pkgs/by-name/tl/tlrender/minizip-ng-4.patch
new file mode 100644
index 000000000000..2df1ed4d460f
--- /dev/null
+++ b/pkgs/by-name/tl/tlrender/minizip-ng-4.patch
@@ -0,0 +1,95 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 95a03bbd..9ce32264 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -123,7 +123,7 @@ set_property(GLOBAL PROPERTY USE_FOLDERS ON)
+ find_package(Imath REQUIRED)
+ find_package(nlohmann_json REQUIRED)
+ find_package(ZLIB REQUIRED)
+-find_package(minizip REQUIRED)
++find_package(minizip-ng REQUIRED)
+ find_package(OpenTimelineIO REQUIRED)
+ 
+ # OpenColorIO dependencies
+diff --git a/etc/SuperBuild/tests/OpenColorIOTest/CMakeLists.txt b/etc/SuperBuild/tests/OpenColorIOTest/CMakeLists.txt
+index 513e7351..2db48491 100644
+--- a/etc/SuperBuild/tests/OpenColorIOTest/CMakeLists.txt
++++ b/etc/SuperBuild/tests/OpenColorIOTest/CMakeLists.txt
+@@ -1,10 +1,10 @@
+ find_package(ZLIB REQUIRED)
+-find_package(minizip REQUIRED)
++find_package(minizip-ng REQUIRED)
+ find_package(OpenColorIO REQUIRED)
+ 
+ set(source main.cpp)
+ 
+ add_executable(OpenColorIOTest ${header} ${source})
+-target_link_libraries(OpenColorIOTest OpenColorIO::OpenColorIO MINIZIP::minizip ZLIB::ZLIB)
++target_link_libraries(OpenColorIOTest OpenColorIO::OpenColorIO MINIZIP::minizip-ng ZLIB::ZLIB)
+ 
+ add_test(OpenColorIOTest OpenColorIOTest)
+diff --git a/lib/tlCore/CMakeLists.txt b/lib/tlCore/CMakeLists.txt
+index d02fa96a..877c8462 100644
+--- a/lib/tlCore/CMakeLists.txt
++++ b/lib/tlCore/CMakeLists.txt
+@@ -40,7 +40,7 @@ else()
+ endif()
+ 
+ set(LIBRARIES tlResource feather-tk::feather-tk-core OTIO::opentimelineio Imath::Imath nlohmann_json::nlohmann_json)
+-set(LIBRARIES_PRIVATE Freetype::Freetype MINIZIP::minizip ZLIB::ZLIB)
++set(LIBRARIES_PRIVATE Freetype::Freetype MINIZIP::minizip-ng ZLIB::ZLIB)
+ if(TLRENDER_OCIO)
+     list(APPEND LIBRARIES OpenColorIO::OpenColorIO)
+ endif()
+diff --git a/lib/tlTimeline/CMakeLists.txt b/lib/tlTimeline/CMakeLists.txt
+index ad384749..82a6aacb 100644
+--- a/lib/tlTimeline/CMakeLists.txt
++++ b/lib/tlTimeline/CMakeLists.txt
+@@ -49,7 +49,7 @@ set(SOURCE
+     Video.cpp)
+ 
+ add_library(tlTimeline ${HEADERS} ${PRIVATE_HEADERS} ${SOURCE})
+-target_link_libraries(tlTimeline tlIO)
++target_link_libraries(tlTimeline tlIO MINIZIP::minizip-ng)
+ set_target_properties(tlTimeline PROPERTIES FOLDER lib)
+ set_target_properties(tlTimeline PROPERTIES PUBLIC_HEADER "${HEADERS}")
+ 
+diff --git a/lib/tlTimeline/TimelineCreate.cpp b/lib/tlTimeline/TimelineCreate.cpp
+index 9596ab21..c8884435 100644
+--- a/lib/tlTimeline/TimelineCreate.cpp
++++ b/lib/tlTimeline/TimelineCreate.cpp
+@@ -99,7 +99,7 @@ namespace tl
+         public:
+             ZipReader(const std::string& fileName)
+             {
+-                mz_zip_reader_create(&reader);
++                reader = mz_zip_reader_create();
+                 if (!reader)
+                 {
+                     throw std::runtime_error(feather_tk::Format(
+diff --git a/lib/tlTimeline/Util.cpp b/lib/tlTimeline/Util.cpp
+index 611f02ad..338df840 100644
+--- a/lib/tlTimeline/Util.cpp
++++ b/lib/tlTimeline/Util.cpp
+@@ -662,7 +662,7 @@ namespace tl
+                 }
+ 
+                 // Open the output file.
+-                mz_zip_writer_create(&_writer);
++                _writer = mz_zip_writer_create();
+                 if (!_writer)
+                 {
+                     throw std::runtime_error(feather_tk::Format("Cannot create writer: \"{0}\"").arg(fileName));
+diff --git a/tlRenderConfig.cmake.in b/tlRenderConfig.cmake.in
+index 11312d32..e6ec1184 100644
+--- a/tlRenderConfig.cmake.in
++++ b/tlRenderConfig.cmake.in
+@@ -9,7 +9,7 @@ include(CMakeFindDependencyMacro)
+ find_package(Imath REQUIRED)
+ find_package(nlohmann_json REQUIRED)
+ find_package(ZLIB REQUIRED)
+-find_package(minizip REQUIRED)
++find_package(minizip-ng REQUIRED)
+ find_package(OpenTimelineIO REQUIRED)
+ 
+ # OpenColorIO dependencies
diff --git a/pkgs/by-name/tl/tlrender/package.nix b/pkgs/by-name/tl/tlrender/package.nix
new file mode 100644
index 000000000000..81893619f5af
--- /dev/null
+++ b/pkgs/by-name/tl/tlrender/package.nix
@@ -0,0 +1,155 @@
+{
+  lib,
+  stdenv,
+  cmake,
+  fetchFromGitHub,
+  pkg-config,
+
+  bzip2,
+  feather-tk,
+  ffmpeg,
+  freetype,
+  glfw,
+  imath,
+  libGL,
+  libjpeg,
+  libtiff,
+  libpng,
+  lunasvg,
+  minizip-ng,
+  nasm,
+  nativefiledialog-extended,
+  nlohmann_json,
+  opencolorio,
+  openexr,
+  openssl,
+  opentimelineio,
+  openusd,
+  plutovg,
+  SDL2,
+  sdl3,
+  xz,
+  zlib,
+  zstd,
+
+  # optional dependencies
+  enableNet ? false,
+  enableOcio ? true,
+  enableSdl2 ? true,
+  enableSdl3 ? false,
+  enableJpeg ? true,
+  enableTiff ? true,
+  enableStb ? true,
+  enablePng ? true,
+  enableOpenexr ? true,
+  enableFfmpeg ? true,
+  enableUsd ? false,
+
+  # build options
+  enableShared ? !stdenv.hostPlatform.isStatic,
+  enableProgram ? true,
+  enableExamples ? false,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "tlrender";
+  version = "0.10.0";
+
+  src = fetchFromGitHub {
+    owner = "darbyjohnston";
+    repo = "tlRender";
+    tag = finalAttrs.version;
+    hash = "sha256-TxiDZtMvNmrV1FKXZnekCZHnr/eCWZlsP6VJRnaoWg4=";
+  };
+
+  patches = [
+    # Minizip-ng 4 support: https://github.com/darbyjohnston/tlRender/pull/145
+    ./minizip-ng-4.patch
+  ];
+
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "include(Package)" ""
+
+    substituteInPlace lib/tlCore/CMakeLists.txt \
+      --replace-fail "SDL2::SDL2-static" "SDL2::SDL2" \
+      --replace-fail "SDL3::SDL3-static" "SDL3::SDL3" \
+
+    substituteInPlace lib/tlIO/CMakeLists.txt \
+      --replace-fail \
+        "list(APPEND LIBRARIES_PRIVATE libjpeg-turbo::turbojpeg-static)" \
+        "list(APPEND LIBRARIES_PRIVATE libjpeg-turbo::jpeg libjpeg-turbo::turbojpeg)"
+  '';
+
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    bzip2 # required by minizip-ng
+    feather-tk
+    freetype # required by feather-tk
+    glfw
+    libGL
+    lunasvg # required by feather-tk
+    imath
+    minizip-ng
+    nativefiledialog-extended
+    nlohmann_json
+    openssl # required by minizip-ng
+    opentimelineio
+    plutovg # required by feather-tk -> lunasvg
+    xz # libLZMA, required by minizip-ng
+    zlib # required by minizip-ng
+    zstd # required by minizip-ng
+  ]
+  ++ lib.optionals enableNet [ nasm ]
+  ++ lib.optionals enableOcio [ opencolorio ]
+  ++ lib.optionals enableSdl2 [ SDL2 ]
+  ++ lib.optionals enableSdl3 [ sdl3 ]
+  ++ lib.optionals enableJpeg [ libjpeg ]
+  ++ lib.optionals enableTiff [ libtiff ]
+  ++ lib.optionals enablePng [ libpng ]
+  ++ lib.optionals enableOpenexr [ openexr ]
+  ++ lib.optionals enableFfmpeg [ ffmpeg ]
+  ++ lib.optionals enableUsd [ openusd ];
+
+  cmakeFlags = [
+    (lib.cmakeBool "TLRENDER_NET" enableNet)
+    (lib.cmakeBool "TLRENDER_OCIO" enableOcio)
+    (lib.cmakeBool "TLRENDER_SDL2" enableSdl2)
+    (lib.cmakeBool "TLRENDER_SDL3" enableSdl3)
+    (lib.cmakeBool "TLRENDER_JPEG" enableJpeg)
+    (lib.cmakeBool "TLRENDER_TIFF" enableTiff)
+    (lib.cmakeBool "TLRENDER_STB" enableStb)
+    (lib.cmakeBool "TLRENDER_PNG" enablePng)
+    (lib.cmakeBool "TLRENDER_EXR" enableOpenexr)
+    (lib.cmakeBool "TLRENDER_FFMPEG" enableFfmpeg)
+    (lib.cmakeBool "TLRENDER_USD" enableUsd)
+
+    (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared)
+    (lib.cmakeBool "TLRENDER_PROGRAMS" enableProgram)
+    (lib.cmakeBool "TLRENDER_EXAMPLES" enableExamples)
+    (lib.cmakeBool "TLRENDER_TESTS" finalAttrs.finalPackage.doCheck)
+  ];
+
+  # GLFW requires a working X11 session.
+  doCheck = false;
+
+  meta = {
+    description = "Open source library for building playback and review applications";
+    longDescription = ''
+      An open source library for building playback and review applications for
+      visual effects, film, and animation.
+
+      The library can render and playback timelines with multiple video clips,
+      image sequences, audio clips, and transitions. Examples are provided for
+      integrating the library with Qt and OpenGL applications.
+    '';
+    homepage = "https://github.com/darbyjohnston/tlRender";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ yzx9 ];
+    platforms = with lib.platforms; linux ++ darwin;
+  };
+})

From 99103b09851fdc252c7d9fcd2518e95665832c89 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Sat, 25 Oct 2025 21:35:53 +0800
Subject: [PATCH 5240/6226] djv: 2.0.8-unstable-2021-07-31 -> 3.1.1

---
 pkgs/by-name/dj/djv/package.nix | 241 ++++++++++----------------------
 1 file changed, 74 insertions(+), 167 deletions(-)

diff --git a/pkgs/by-name/dj/djv/package.nix b/pkgs/by-name/dj/djv/package.nix
index 0af65284066e..9cc1ae9d1317 100644
--- a/pkgs/by-name/dj/djv/package.nix
+++ b/pkgs/by-name/dj/djv/package.nix
@@ -1,187 +1,94 @@
 {
-  stdenv,
-  cmake,
-  fetchFromGitHub,
-  fetchpatch,
   lib,
-  alsa-lib,
-  libGL,
-  libX11,
-  libXinerama,
-  libXi,
-  zlib,
-  rtaudio,
-  rapidjson,
-  ilmbase,
-  glm,
-  glfw3,
-  libpng,
-  opencolorio_1,
+  stdenv,
+  fetchFromGitHub,
+  cmake,
+  pkg-config,
+  bzip2,
+  feather-tk,
+  ffmpeg,
   freetype,
+  glfw,
+  imath,
+  libGL,
+  libjpeg,
+  libtiff,
+  libpng,
+  lunasvg,
+  minizip-ng,
+  nativefiledialog-extended,
+  nlohmann_json,
+  opencolorio,
   openexr,
+  openssl,
+  opentimelineio,
+  plutovg,
+  SDL2,
+  tlrender,
+  xz,
+  zlib,
+  zstd,
 }:
 
-let
+stdenv.mkDerivation (finalAttrs: {
+  pname = "djv";
+  version = "3.1.1";
 
-  # The way third-party dependencies are packaged has changed
-  # significantly from the 2.0.8 release. This means any packaging
-  # effort for the 2.0.8 release would have to be redone for the next
-  # release. Hence we package the git version for now and can easily
-  # jump onto the next release once it's available.
-  djvVersion = "2.0.8-unstable-2021-07-31";
-
-  djvSrc = fetchFromGitHub {
+  src = fetchFromGitHub {
     owner = "darbyjohnston";
     repo = "djv";
-    rev = "ae31712c4f2802a874217ac194bde26287993934";
-    sha256 = "1qgia6vqb6fhyfj8w925xl6k6zidrp2gj5f32bpi94lwwhi6p9pd";
+    tag = finalAttrs.version;
+    hash = "sha256-/SakJ23mi/dz8eUt2UtcgfLtFZiCHy1ME+jWdNS8+Fw=";
   };
 
-  # DJV's build system tries to automatically pull in FSeq, another
-  # library by the DJV author.
-  #
-  # When updating, check the following file in the DJV source:
-  # etc/SuperBuild/cmake/Modules/BuildFSeq.cmake
-  #
-  # If there is revision or tag specified, DJV wants to use the most
-  # recent master version
-  fseqSrc = fetchFromGitHub {
-    owner = "darbyjohnston";
-    repo = "fseq";
-    rev = "545fac6018100f7fca474b8ee4f1efa7cbf6bf45";
-    sha256 = "0qfhbrzji05hh5kwgd1wvq2lbf81ylbi7v7aqk28aws27f8d2hk0";
-  };
-
-  djv-deps = stdenv.mkDerivation rec {
-    pname = "djv-dependencies";
-    version = djvVersion;
-
-    src = djvSrc;
-
-    sourceRoot = "${src.name}/etc/SuperBuild";
-
-    nativeBuildInputs = [ cmake ];
-    buildInputs = [
-      libGL
-    ];
-
-    postPatch = ''
-      chmod -R +w .
-
-      sed -i 's,GIT_REPOSITORY https://github.com/darbyjohnston/FSeq.git,SOURCE_DIR ${fseqSrc},' \
-          cmake/Modules/BuildFSeq.cmake
-
-      # We pull these projects in as normal Nix dependencies. No need
-      # to build them again here.
-
-      sed -i CMakeLists.txt \
-          -e '/list(APPEND DJV_THIRD_PARTY_DEPS RapidJSON)/d' \
-          -e '/list(APPEND DJV_THIRD_PARTY_DEPS RtAudio)/d' \
-          -e '/list(APPEND DJV_THIRD_PARTY_DEPS IlmBase)/d' \
-          -e '/list(APPEND DJV_THIRD_PARTY_DEPS GLM)/d' \
-          -e '/list(APPEND DJV_THIRD_PARTY_DEPS GLFW)/d' \
-          -e '/list(APPEND DJV_THIRD_PARTY_DEPS ZLIB)/d' \
-          -e '/list(APPEND DJV_THIRD_PARTY_DEPS PNG)/d' \
-          -e '/list(APPEND DJV_THIRD_PARTY_DEPS FreeType)/d' \
-          -e '/list(APPEND DJV_THIRD_PARTY_DEPS OCIO)/d'
-
-      # The "SuperBuild" wants to build DJV right here. This is
-      # inconvenient, because then the `make install` target is not generated
-      # by CMake. We build DJV in its own derivation below. This also makes
-      # the build a bit more modular.
-
-      sed -i '/include(BuildDJV)/d' \
-          CMakeLists.txt
-    '';
-
-    cmakeFlags = [
-      "-DDJV_THIRD_PARTY_OpenEXR:BOOL=False"
-      "-DDJV_THIRD_PARTY_JPEG:BOOL=False"
-      "-DDJV_THIRD_PARTY_TIFF:BOOL=False"
-    ];
-
-    dontInstall = true;
-    doCheck = true;
-  };
-
-in
-stdenv.mkDerivation {
-  pname = "djv";
-  version = djvVersion;
-
-  src = djvSrc;
-  patches = [
-    # Pull fix ending upstream inclusion for gcc-12+ support:
-    #   https://github.com/darbyjohnston/DJV/pull/477
-    (fetchpatch {
-      name = "gcc-13-cstdint-include.patch";
-      url = "https://github.com/darbyjohnston/DJV/commit/be0dd90c256f30c0305ff7b180fd932a311e66e5.patch";
-      hash = "sha256-x8GAfakhgjBiCKHbfgCukT5iFNad+zqURDJkQr092uk=";
-    })
-    (fetchpatch {
-      name = "gcc-11-limits.patch";
-      url = "https://github.com/darbyjohnston/DJV/commit/0544ffa1a263a6b8e8518b47277de7601b21b4f4.patch";
-      hash = "sha256-x6ye0xMwTlKyNW4cVFb64RvAayvo71kuOooPj3ROn0g=";
-    })
-    (fetchpatch {
-      name = "gcc-11-IO.patch";
-      url = "https://github.com/darbyjohnston/DJV/commit/ce79f2d2cb35d03322648323858834bff942c792.patch";
-      hash = "sha256-oPbXOnN5Y5QL+bs/bL5eJALu45YHnyTBLQcC8XcJi0c=";
-    })
-    (fetchpatch {
-      name = "gcc-11-sleep_for.patch";
-      url = "https://github.com/darbyjohnston/DJV/commit/6989f43db27f66a7691f6048a2eb3299ef43a92e.patch";
-      hash = "sha256-1kiF3VrZiO+FSoR7NHCbduQ8tMq/Uuu6Z+sQII4xBAw=";
-    })
-  ];
-
-  nativeBuildInputs = [ cmake ];
-  buildInputs = [
-    alsa-lib
-    libGL
-    libX11
-    libXinerama
-    libXi
-    rapidjson
-    rtaudio
-    ilmbase
-    glm
-    glfw3
-    zlib
-    libpng
-    freetype
-    opencolorio_1
-    djv-deps
-    openexr
-  ];
-
   postPatch = ''
-    chmod -R +w .
-
-    # When linking opencolorio statically this results in failing to
-    # pull in opencolorio's dependencies (tixml and yaml libraries). Avoid
-    # this by linking it statically instead.
-
-    sed -i cmake/Modules/FindOCIO.cmake \
-        -e 's/PATH_SUFFIXES static//' \
-        -e '/OpenColorIO_STATIC/d'
-
-    # When searching for OpenEXR this looks for Iex.h, which exists in ilmbase,
-    # since it's a secondary inport, to find the correct OpenEXR lib, we search
-    # for something specifically in OpenEXR.
-
-    sed -i cmake/Modules/FindOpenEXR.cmake \
-        -e 's/find_path(OpenEXR_INCLUDE_DIR NAMES Iex.h PATH_SUFFIXES OpenEXR)/find_path(OpenEXR_INCLUDE_DIR NAMES ImfImage.h PATH_SUFFIXES OpenEXR)/'
+    substituteInPlace cmake/Modules/djvPackage.cmake \
+      --replace-fail \
+        ' ''${CMAKE_INSTALL_PREFIX}/etc/tlRender/LICENSE_' \
+        " ${tlrender}/etc/tlRender/LICENSE_"
   '';
 
+  nativeBuildInputs = [
+    cmake
+    pkg-config
+  ];
+
+  buildInputs = [
+    bzip2
+    feather-tk
+    ffmpeg
+    freetype
+    glfw
+    imath
+    tlrender
+    libjpeg
+    libGL
+    libpng
+    libtiff
+    lunasvg
+    minizip-ng
+    nativefiledialog-extended
+    nlohmann_json
+    opencolorio
+    openexr
+    openssl
+    opentimelineio
+    plutovg
+    SDL2
+    xz
+    zlib
+    zstd
+  ];
+
   # GLFW requires a working X11 session.
   doCheck = false;
 
-  meta = with lib; {
+  meta = {
     description = "Professional review software for VFX, animation, and film production";
     homepage = "https://darbyjohnston.github.io/DJV/";
-    platforms = platforms.linux;
-    maintainers = [ maintainers.blitz ];
-    license = licenses.bsd3;
+    platforms = with lib.platforms; linux ++ darwin;
+    maintainers = with lib.maintainers; [ blitz ];
+    license = lib.licenses.bsd3;
+    mainProgram = "djv";
   };
-}
+})

From aa4991f5d28a2fec259aec10a49e414c7462463a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 09:28:24 +0000
Subject: [PATCH 5241/6226] terraform-providers.wgebis_mailgun: 0.7.7 -> 0.8.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 ae7e68b1b845..102a34d83a09 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1489,13 +1489,13 @@
     "vendorHash": "sha256-OoIlSsR8vbS15TfZvPP+RBDjPvD7Jzr2CpgMk76s6R8="
   },
   "wgebis_mailgun": {
-    "hash": "sha256-fuJnzloJa0S1r3/22Wecbq1oF8oRQP2nrrmwCONHITA=",
+    "hash": "sha256-/AYzQgMWo2cPjEMlrOSZLn4IVq4At09KFXkIpc7L5p0=",
     "homepage": "https://registry.terraform.io/providers/wgebis/mailgun",
     "owner": "wgebis",
     "repo": "terraform-provider-mailgun",
-    "rev": "v0.7.7",
+    "rev": "v0.8.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-Y6zsbhLNehO3i/BRjKggVhcM15Qesbd6HbARFH/arM8="
+    "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc="
   },
   "yandex-cloud_yandex": {
     "hash": "sha256-jzACS+vNAiUp7GJt3jO8lTbQZpSj5vUhB1aD0iRi6Gk=",

From fef26c52e94184f64bd746181cf757d370ecc1bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 09:42:28 +0000
Subject: [PATCH 5242/6226] labymod-launcher: 2.1.12 -> 2.1.13

---
 pkgs/by-name/la/labymod-launcher/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/la/labymod-launcher/package.nix b/pkgs/by-name/la/labymod-launcher/package.nix
index 6c6134dbd57a..04de4423d6d8 100644
--- a/pkgs/by-name/la/labymod-launcher/package.nix
+++ b/pkgs/by-name/la/labymod-launcher/package.nix
@@ -6,12 +6,12 @@
 
 let
   pname = "labymod-launcher";
-  version = "2.1.12";
+  version = "2.1.13";
 
   src = fetchurl {
     name = "labymod-launcher";
     url = "https://releases.r2.labymod.net/launcher/linux/x64/LabyMod%20Launcher-${version}.AppImage";
-    hash = "sha256-n0ipNxtmVSG/Do5UcFpWhGH+4SO3ZljsUXPW4hYzkZU=";
+    hash = "sha256-MntANnDKN4JZwQdixqxR7SbXd5pxQzC5R+RzJYel2oM=";
   };
 
   appimageContents = appimageTools.extract { inherit pname version src; };

From 47f4249891ce0975d8e70d8440d9d8276b361229 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 4 Nov 2025 10:45:55 +0100
Subject: [PATCH 5243/6226] rundeck: 5.16.0 -> 5.17.0

---
 pkgs/by-name/ru/rundeck/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ru/rundeck/package.nix b/pkgs/by-name/ru/rundeck/package.nix
index a48dce995f98..ff338d4480df 100644
--- a/pkgs/by-name/ru/rundeck/package.nix
+++ b/pkgs/by-name/ru/rundeck/package.nix
@@ -12,11 +12,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "rundeck";
-  version = "5.16.0-20251006";
+  version = "5.17.0-20251103";
 
   src = fetchurl {
     url = "https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/rundeck-${finalAttrs.version}.war/artifacts/rundeck-${finalAttrs.version}.war/download?distro_version_id=167";
-    hash = "sha256-ws84HDqowYz2ouvN7E3SlouGZdZUDVDK4LUmzKXOyec=";
+    hash = "sha256-Bw/aLsJ65BSr1NDmOWanOm6lsClaYpKdmeGpYiO0KNc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 15d3f4663ef37aa1ba2244eb3f5c232d77b0faa9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 09:46:17 +0000
Subject: [PATCH 5244/6226] gogup: 0.27.9 -> 0.28.0

---
 pkgs/by-name/go/gogup/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/gogup/package.nix b/pkgs/by-name/go/gogup/package.nix
index 5c47e22875c8..91f18fb8f08d 100644
--- a/pkgs/by-name/go/gogup/package.nix
+++ b/pkgs/by-name/go/gogup/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "gogup";
-  version = "0.27.9";
+  version = "0.28.0";
 
   src = fetchFromGitHub {
     owner = "nao1215";
     repo = "gup";
     rev = "v${version}";
-    hash = "sha256-8pBJcTv3f5ovbtuXuGVmF8m/6CQd19zpoJDs7PtsGcs=";
+    hash = "sha256-VhkmBTU+Zov7w6t/StgQFM9iB36e114pR3Zo4QO3v7k=";
   };
 
-  vendorHash = "sha256-sLf0Yhc495rOi0/Ww2/1BD5WXGTFyf6SzfTV9TtGzZk=";
+  vendorHash = "sha256-jFeP/0cwAWECuuqLwvMas4Nr7gjyB3BPPfD825yglwE=";
   doCheck = false;
 
   ldflags = [

From e5b84fbba34587bd1225a4f07359feb47789fa95 Mon Sep 17 00:00:00 2001
From: Letgamer <alexstephan005@gmail.com>
Date: Tue, 4 Nov 2025 10:57:28 +0100
Subject: [PATCH 5245/6226] maintainers: add letgamer

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index f918b5c8eddf..b762a72a9a2e 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -14442,6 +14442,12 @@
     githubId = 737767;
     name = "Thomas Gerbet";
   };
+  letgamer = {
+    github = "Letgamer";
+    githubId = 62446107;
+    matrix = "@letgamer:tchncs.de";
+    name = "Alex Stephan";
+  };
   lethalman = {
     email = "lucabru@src.gnome.org";
     github = "lucabrunox";

From 05f9254430d14635733fa991c00a4d1a25073c4d Mon Sep 17 00:00:00 2001
From: ProxyVT <tikit.us@outlook.com>
Date: Wed, 10 Sep 2025 22:19:14 +0300
Subject: [PATCH 5246/6226] qmplay2: 25.06.27 -> 25.09.11

https://github.com/zaps166/QMPlay2/compare/25.06.27...25.09.11
---
 pkgs/by-name/qm/qmplay2/sources.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/qm/qmplay2/sources.nix b/pkgs/by-name/qm/qmplay2/sources.nix
index 58ab4a6cb99d..e1b3dbbbd857 100644
--- a/pkgs/by-name/qm/qmplay2/sources.nix
+++ b/pkgs/by-name/qm/qmplay2/sources.nix
@@ -5,13 +5,13 @@
     let
       self = {
         pname = "qmplay2";
-        version = "25.06.27";
+        version = "25.09.11";
 
         src = fetchFromGitHub {
           owner = "zaps166";
           repo = "QMPlay2";
           tag = self.version;
-          hash = "sha256-+kDaRKwXOHnHje1RntC9y9xiTaMzs8SGMLVoJ+6IDNk=";
+          hash = "sha256-1F6VOTMJZ64PlIVSWoYzNz4LVmn5pEcUq+IfstYDwYo=";
         };
       };
     in
@@ -21,13 +21,13 @@
     let
       self = {
         pname = "vulkan-headers";
-        version = "1.3.300";
+        version = "1.4.317";
 
         src = fetchFromGitHub {
           owner = "KhronosGroup";
           repo = "Vulkan-Headers";
           tag = "v${self.version}";
-          hash = "sha256-6J+6yvbEQXLY+Wkf1pWKtUAZGbe5Tc01uVh3Wqmk2+8=";
+          hash = "sha256-ezNthwKsnXehQfrQh0zTk6Zrz3JgdqjYu68abYUWIik=";
         };
       };
     in
@@ -35,13 +35,13 @@
 
   qmvk = {
     pname = "qmvk";
-    version = "0-unstable-2025-06-05";
+    version = "0-unstable-2025-09-02";
 
     src = fetchFromGitHub {
       owner = "zaps166";
       repo = "QmVk";
-      rev = "754e6ca4b65433cb500a797e86d48d899d5a41c2";
-      hash = "sha256-t4fGIfZhZE8ShQGa1zMJLpnvCEfCdCeAWOKwF4+nFSw=";
+      rev = "0225dc851afaf39be2b92f91d4316e866f4b6133";
+      hash = "sha256-W2102+X+gE/9ghdAwWBeWYmSkSdp6lLPx4IKaQpLANI=";
     };
   };
 }

From 911944aa5e05ed9e3765d9a620f10eef61a86987 Mon Sep 17 00:00:00 2001
From: ProxyVT <tikit.us@outlook.com>
Date: Tue, 4 Nov 2025 13:03:17 +0300
Subject: [PATCH 5247/6226] qmplay2: add ProxyVT as maintainer

As a long-time user of this player who actively tracks its updates, I can help maintain this package.
---
 pkgs/by-name/qm/qmplay2/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/qm/qmplay2/package.nix b/pkgs/by-name/qm/qmplay2/package.nix
index 5ce404e93cbc..383cd0c4a0ff 100644
--- a/pkgs/by-name/qm/qmplay2/package.nix
+++ b/pkgs/by-name/qm/qmplay2/package.nix
@@ -110,6 +110,7 @@ stdenv.mkDerivation (finalAttrs: {
     mainProgram = "qmplay2";
     maintainers = with lib.maintainers; [
       kashw2
+      ProxyVT
     ];
     platforms = lib.platforms.linux;
   };

From ac1360117bda08a8a6afba8e718a13df2ffdfaea Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 4 Nov 2025 11:00:11 +0100
Subject: [PATCH 5248/6226] archi: 5.6.0 -> 5.7.0

---
 pkgs/by-name/ar/archi/package.nix | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/ar/archi/package.nix b/pkgs/by-name/ar/archi/package.nix
index bb28256d053e..fc055a1c11b7 100644
--- a/pkgs/by-name/ar/archi/package.nix
+++ b/pkgs/by-name/ar/archi/package.nix
@@ -15,23 +15,23 @@
   makeDesktopItem,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "Archi";
-  version = "5.6.0";
+  version = "5.7.0";
 
   src =
     {
       "x86_64-linux" = fetchurl {
-        url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Linux64-${version}.tgz";
-        hash = "sha256-zPgsRfbhN22Sph/5AvP7y2uHdgy1cZRcsm+O1dVLNHc=";
+        url = "https://github.com/archimatetool/archi.io/releases/download/57/Archi-Linux64-${finalAttrs.version}.tgz";
+        hash = "sha256-MIUlWt3GP/1oQAeq4W2xnhG63a2zhGldgyoyZ9lNOiI=";
       };
       "x86_64-darwin" = fetchurl {
-        url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Mac-${version}.dmg";
-        hash = "sha256-NZWMQzLsPcJ7cZoYFUxXxLIu7yCIHE5pw9+UqjtG7Cc=";
+        url = "https://github.com/archimatetool/archi.io/releases/download/57/Archi-Mac-${finalAttrs.version}.dmg";
+        hash = "sha256-wIlhJ6XmhL5rMb5zwHJYwamCwV13PK53wi9uEXIga5I=";
       };
       "aarch64-darwin" = fetchurl {
-        url = "https://www.archimatetool.com/downloads/archi/${version}/Archi-Mac-Silicon-${version}.dmg";
-        hash = "sha256-a80QyJT+mizT4bxhJ/1rXnQGbq0Zxwmqb74n2QH4H3I=";
+        url = "https://github.com/archimatetool/archi.io/releases/download/57/Archi-Mac-Silicon-${finalAttrs.version}.dmg";
+        hash = "sha256-2/w4+aKfjfTGLjjl/nOouFtnv7/kjmfezkrmSa4ablc=";
       };
     }
     .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
@@ -95,7 +95,7 @@ stdenv.mkDerivation rec {
       desktopName = "Archi";
       exec = "Archi";
       type = "Application";
-      comment = meta.description;
+      comment = finalAttrs.meta.description;
       icon = "archi";
       categories = [
         "Development"
@@ -107,20 +107,20 @@ stdenv.mkDerivation rec {
 
   passthru.tests = { inherit (nixosTests) archi; };
 
-  meta = with lib; {
+  meta = {
     description = "ArchiMate modelling toolkit";
     longDescription = ''
       Archi is an open source modelling toolkit to create ArchiMate
       models and sketches.
     '';
     homepage = "https://www.archimatetool.com/";
-    sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-    license = licenses.mit;
-    platforms = platforms.linux ++ platforms.darwin;
-    maintainers = with maintainers; [
+    sourceProvenance = [ lib.sourceTypes.binaryBytecode ];
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    maintainers = with lib.maintainers; [
       earldouglas
       paumr
     ];
     mainProgram = "Archi";
   };
-}
+})

From 5111eb966432b3a7b5f596eeb7b4384f591bfc7d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 10:10:59 +0000
Subject: [PATCH 5249/6226] c-periphery: 2.4.3 -> 2.5.0

---
 pkgs/by-name/c-/c-periphery/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/c-/c-periphery/package.nix b/pkgs/by-name/c-/c-periphery/package.nix
index 944b87401682..b18ae01f640a 100644
--- a/pkgs/by-name/c-/c-periphery/package.nix
+++ b/pkgs/by-name/c-/c-periphery/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "c-periphery";
-  version = "2.4.3";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "vsergeev";
     repo = "c-periphery";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-azqGw7KW6/UrQ4eUPkeH8d6l6sSbotNMAAbn5pNMOB8=";
+    hash = "sha256-lGBDf10kolwPrURwUEtiSCJYdyxZqJN/B1SnY08Ytns=";
   };
 
   outputs = [

From 961175b5568216875cc4782c655fbfd0c378e8e5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 10:12:24 +0000
Subject: [PATCH 5250/6226] fn-cli: 0.6.44 -> 0.6.45

---
 pkgs/by-name/fn/fn-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fn/fn-cli/package.nix b/pkgs/by-name/fn/fn-cli/package.nix
index 114470ea490b..ed0e0eb80b57 100644
--- a/pkgs/by-name/fn/fn-cli/package.nix
+++ b/pkgs/by-name/fn/fn-cli/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "fn";
-  version = "0.6.44";
+  version = "0.6.45";
 
   src = fetchFromGitHub {
     owner = "fnproject";
     repo = "cli";
     rev = version;
-    hash = "sha256-UfvBkUZ09mKM+84e89VFE+KZr0ora8eUWiJlYO11USQ=";
+    hash = "sha256-iW59tennUgDfYhMGbzdLizo3u+bROWOGbeAl319lsHk=";
   };
 
   vendorHash = null;

From 142cfdce6feb15e9d1de28cb1425392e1bc88b22 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 10:18:51 +0000
Subject: [PATCH 5251/6226] smpmgr: 0.14.0 -> 0.14.1

---
 pkgs/by-name/sm/smpmgr/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sm/smpmgr/package.nix b/pkgs/by-name/sm/smpmgr/package.nix
index d5f5cd9df9df..629b14eac6e2 100644
--- a/pkgs/by-name/sm/smpmgr/package.nix
+++ b/pkgs/by-name/sm/smpmgr/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "smpmgr";
-  version = "0.14.0";
+  version = "0.14.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "intercreate";
     repo = "smpmgr";
     tag = version;
-    hash = "sha256-u69gREyOjQEh5C9XncEXZHvt/wU+WKeGA9/kC0hw4Q0=";
+    hash = "sha256-PhsJa0Z1EnpFyoI6fEN5opG23xB+JTI1uB2sstuOcTw=";
   };
 
   build-system = with python3Packages; [

From 580fe141b00c8deecec5d55ef8587c2d7a6ff353 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Tue, 4 Nov 2025 10:23:14 +0000
Subject: [PATCH 5252/6226] opencode: 1.0.10 -> 1.0.20

---
 pkgs/by-name/op/opencode/package.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index ff700c2444ed..4ce430571766 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -13,7 +13,7 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.0.10";
+  version = "1.0.20";
 
   src =
     finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
@@ -29,6 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
   dontConfigure = true;
   dontBuild = true;
+  dontStrip = true;
 
   installPhase = ''
     runHook preInstall
@@ -42,19 +43,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sources = {
       "aarch64-darwin" = fetchurl {
         url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-darwin-arm64.zip";
-        hash = "sha256-D34OcJgIXVkqDOf5Vyce30v5/avDKKYbOAcMWD8HmXM=";
+        hash = "sha256-F4LHy3jtseebBx3bRZy+YM8J18M63QXdHbp7LcuZ9Wg=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-linux-arm64.zip";
-        hash = "sha256-v3j0oL2WL4DezOxdEKgOq4f8BkdR01zlYHUzbUUjgtE=";
+        hash = "sha256-pL5NtpeNFz0iBmbTSWYFYdcvHrPWEGpjEo0uF41UkTo=";
       };
       "x86_64-darwin" = fetchurl {
         url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-darwin-x64.zip";
-        hash = "sha256-+kycX2mbCy7p6VOKO9HequCoJi/5nT8Pf09obZEuj1E=";
+        hash = "sha256-ah/tzVobv/IgIOajU5onSoSmm/cfzS+b7rLirRCB5Tk=";
       };
       "x86_64-linux" = fetchurl {
         url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-linux-x64.zip";
-        hash = "sha256-MO8IeCnrTUyNroY7T7XY4WCXP8wgI3r4PxhfGwprh9I=";
+        hash = "sha256-4DIcSzKSGAWt52m6LmOJhYCDhztVhRE6Ui/Fqs1CcO4=";
       };
     };
     tests.version = testers.testVersion {

From 22b7044d146160c8d8f55e18328772bb73182509 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Thu, 23 Oct 2025 23:32:25 +0200
Subject: [PATCH 5253/6226] nixos/synapse: add extraArgs option

Co-authored-by: Maximilian Bosch <maximilian@mbosch.me>
---
 nixos/modules/services/matrix/synapse.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/nixos/modules/services/matrix/synapse.nix b/nixos/modules/services/matrix/synapse.nix
index a940d5a866b9..ec5cf8aee8dd 100644
--- a/nixos/modules/services/matrix/synapse.nix
+++ b/nixos/modules/services/matrix/synapse.nix
@@ -3,6 +3,7 @@
   lib,
   options,
   pkgs,
+  utils,
   ...
 }:
 
@@ -1297,6 +1298,15 @@ in
           '';
         };
 
+        extraArgs = mkOption {
+          type = types.listOf types.str;
+          default = [ ];
+          example = [ "--no-secrets-in-config" ];
+          description = ''
+            Extra command lines argument that are passed to synapse and workers.
+          '';
+        };
+
         extraConfigFiles = mkOption {
           type = types.listOf types.path;
           default = [ ];
@@ -1541,7 +1551,8 @@ in
                         ]
                         ++ cfg.extraConfigFiles
                       )}
-                      --keys-directory ${cfg.dataDir}
+                      --keys-directory ${cfg.dataDir} \
+                      ${utils.escapeSystemdExecArgs cfg.extraArgs}
                   '';
                 };
               }
@@ -1574,7 +1585,8 @@ in
                   ${concatMapStringsSep "\n  " (x: "--config-path ${x} \\") (
                     [ configFile ] ++ cfg.extraConfigFiles
                   )}
-                  --keys-directory ${cfg.dataDir}
+                  --keys-directory ${cfg.dataDir} \
+                  ${utils.escapeSystemdExecArgs cfg.extraArgs}
               '';
             };
           }

From 82847f91caf6136ce2a1a90e366003e6a945f27a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 10:32:48 +0000
Subject: [PATCH 5254/6226] phrase-cli: 2.49.0 -> 2.50.0

---
 pkgs/by-name/ph/phrase-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ph/phrase-cli/package.nix b/pkgs/by-name/ph/phrase-cli/package.nix
index 3f98171435bf..69d22ea9e841 100644
--- a/pkgs/by-name/ph/phrase-cli/package.nix
+++ b/pkgs/by-name/ph/phrase-cli/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "phrase-cli";
-  version = "2.49.0";
+  version = "2.50.0";
 
   src = fetchFromGitHub {
     owner = "phrase";
     repo = "phrase-cli";
     rev = version;
-    sha256 = "sha256-P3tCYmqLnskuBJBgeEvdjkNAqVCFtDUes1CTHoj/k5M=";
+    sha256 = "sha256-FXoejKKbykNKcWN+4hf3PRdhyZaiZef6c2NsMQK/saQ=";
   };
 
-  vendorHash = "sha256-VFJfpMVMHUkfH04hBpeoH5lUeW+5eG8V03W0DgcVpDM=";
+  vendorHash = "sha256-uJR5RjBjSZmoYJNsbbvAabYfRhd9APNHwR8SP+44fC0=";
 
   ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ];
 

From 6a3480b06be224cc4ac561b04c0bb36a93eaf085 Mon Sep 17 00:00:00 2001
From: Ngoc Nguyen <baongoc124@gmail.com>
Date: Tue, 4 Nov 2025 19:36:13 +0900
Subject: [PATCH 5255/6226] docker-language-server: fix build failure

---
 pkgs/by-name/do/docker-language-server/package.nix | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/do/docker-language-server/package.nix b/pkgs/by-name/do/docker-language-server/package.nix
index 06d64fb121dd..6c88af2649f5 100644
--- a/pkgs/by-name/do/docker-language-server/package.nix
+++ b/pkgs/by-name/do/docker-language-server/package.nix
@@ -26,8 +26,13 @@ buildGoModule rec {
 
   checkPhase = ''
     runHook preCheck
-    gotestsum -- $(go list ./... | grep -vE "e2e-tests|/buildkit$|/scout$") -timeout 30s -skip "TestCollectDiagnostics"
-    go test $(go list ./... | grep e2e-tests) -timeout 120s -skip "TestPublishDiagnostics|TestHover"
+
+    # disable some tests because of sandbox
+    excludedPackages="e2e-tests|/buildkit$|/scout$"
+    packages=$(go list ./... | grep -vE "$excludedPackages")
+    gotestsum -- $packages -timeout 30s -skip "TestCollectDiagnostics|TestCompletion_ImageTags|TestInlayHint"
+    go test ./e2e-tests/... -timeout 120s -skip "TestPublishDiagnostics|TestHover"
+
     runHook postCheck
   '';
 

From 9fe1174d8f128296545cca4b1888f4b307043870 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 4 Nov 2025 11:37:04 +0100
Subject: [PATCH 5256/6226] sx: add liberodark to maintainers

---
 pkgs/by-name/sx/sx/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/sx/sx/package.nix b/pkgs/by-name/sx/sx/package.nix
index e9dc2bebe1b5..2ba36a610c82 100644
--- a/pkgs/by-name/sx/sx/package.nix
+++ b/pkgs/by-name/sx/sx/package.nix
@@ -57,6 +57,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     mainProgram = "sx";
     maintainers = with lib.maintainers; [
       thiagokokada
+      liberodark
     ];
     platforms = lib.platforms.linux;
   };

From 08fcd6deeea9a7f08b2c3931d909db46986df5bc Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 4 Nov 2025 11:40:31 +0100
Subject: [PATCH 5257/6226] rust-motd: add liberodark to maintainers

---
 pkgs/by-name/ru/rust-motd/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ru/rust-motd/package.nix b/pkgs/by-name/ru/rust-motd/package.nix
index e043af16e495..9f7f172fec33 100644
--- a/pkgs/by-name/ru/rust-motd/package.nix
+++ b/pkgs/by-name/ru/rust-motd/package.nix
@@ -34,7 +34,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/rust-motd/rust-motd";
     changelog = "https://github.com/rust-motd/rust-motd/releases/tag/v${version}";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ liberodark ];
     mainProgram = "rust-motd";
   };
 }

From 19328430aa759d19e7460a873189c0cd5a598b9b Mon Sep 17 00:00:00 2001
From: Maximilian Bosch <maximilian@mbosch.me>
Date: Tue, 4 Nov 2025 11:42:08 +0100
Subject: [PATCH 5258/6226] CONTRIBUTING: fix anchor to staging-nixos section

Closes #457786
---
 CONTRIBUTING.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d7a59925f5b0..d86cafd010fb 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -430,7 +430,7 @@ gitGraph
 
 Here's an overview of the different branches:
 
-| branch | `master` | `staging-next` | `staging` | [`staging-nixos`](#test-driver-rebuild) |
+| branch | `master` | `staging-next` | `staging` | [`staging-nixos`][test-driver-rebuild] |
 | --- | --- | --- | --- | --- |
 | Used for development | ✔️ | ❌ | ✔️ | ✔️ |
 | Built by Hydra | ✔️ | ✔️ | ❌ | ❌ |
@@ -501,7 +501,7 @@ Please note that changes to the Linux kernel are an exception to this rule.
 These PRs go to `staging-nixos`, see [the next section for more context](#changes-rebuilding-all-tests).
 
 ### Changes rebuilding all NixOS tests
-[test-driver-rebuild]: #changes-rebuilding-all-tests
+[test-driver-rebuild]: #changes-rebuilding-all-nixos-tests
 
 Changes causing a rebuild of all NixOS tests get a special [`10.rebuild-nixos-tests`](https://github.com/NixOS/nixpkgs/issues?q=state%3Aopen%20label%3A10.rebuild-nixos-tests) label.
 These changes pose a significant impact on the build infrastructure.

From 9aeb1359701b0e904de7a29511610aa12de169b1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 10:43:21 +0000
Subject: [PATCH 5259/6226] ananicy-rules-cachyos: 0-unstable-2025-10-17 ->
 0-unstable-2025-11-03

---
 pkgs/by-name/an/ananicy-rules-cachyos/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
index 515a4190aab6..bfd5a058b881 100644
--- a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
+++ b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "ananicy-rules-cachyos";
-  version = "0-unstable-2025-10-17";
+  version = "0-unstable-2025-11-03";
 
   src = fetchFromGitHub {
     owner = "CachyOS";
     repo = "ananicy-rules";
-    rev = "53b0c689faaa4bb7edcb9dae799602c417634351";
-    hash = "sha256-awGCaVl0m1IqADeQW53wFSEAeUYR6677oc0Z2ZfZ898=";
+    rev = "aa23ab23e6847c77a39fe9e8ebc274ab87c391d7";
+    hash = "sha256-cSpqwzTT4Nx7PK7mLUF13w/JgPlfvRdqZW0EsuY1b8M=";
   };
 
   dontConfigure = true;

From 48c9505ba112dfadd227bb1cec59125d1be9cf2e Mon Sep 17 00:00:00 2001
From: Lucas Hoffmann <luc@artsoftandmore.com>
Date: Mon, 3 Nov 2025 17:05:00 +0100
Subject: [PATCH 5260/6226] build-support/php: fix variable substitution in
 bash

The build environment sets the bash option NOUNSET which fails the
script for any substitution of uninitialized variables.  The ${VAR-}
construct circumvents this.

This was tested by building the following derivations:

- phpPackages.box{,.composerVendor}
- phpPackages.cyclonedx-php-composer
- phpPackages.phing{,.composerVendor}
- phpPackages.php-parallel-lint{,.composerVendor}
- phpPackages.castor{,.composerVendor}
- phpPackages.phive{,.composerVendor}
- phpPackages.php-cs-fixer{,.composerVendor}
- phpPackages.phpspy
- phpPackages.composer
- phpPackages.grumphp{,.composerVendor}
- phpPackages.phpinsights{,.composerVendor}
- phpPackages.phpstan{,.composerVendor}
- phpPackages.composer-local-repo-plugin
- phpPackages.phan
- phpPackages.php-codesniffer{,.composerVendor}
- phpPackages.phpmd{,.composerVendor}
- phpPackages.psalm{,.composerVendor}
- psysh{,.composerVendor}
- deployer{,.composerVendor}
---
 .../php/builders/v2/hooks/composer-vendor-hook.sh           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh
index 53503194cfa4..83dda99f33cd 100644
--- a/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh
+++ b/pkgs/build-support/php/builders/v2/hooks/composer-vendor-hook.sh
@@ -10,9 +10,9 @@ declare -g composerNoPlugins
 declare -g composerNoScripts
 
 declare -ga composerFlags=()
-[[ -n "$composerNoDev" ]] && composerFlags+=(--no-dev)
-[[ -n "$composerNoPlugins" ]] && composerFlags+=(--no-plugins)
-[[ -n "$composerNoScripts" ]] && composerFlags+=(--no-scripts)
+[[ -n "${composerNoDev-}" ]] && composerFlags+=(--no-dev)
+[[ -n "${composerNoPlugins-}" ]] && composerFlags+=(--no-plugins)
+[[ -n "${composerNoScripts-}" ]] && composerFlags+=(--no-scripts)
 
 preConfigureHooks+=(composerVendorConfigureHook)
 preBuildHooks+=(composerVendorBuildHook)

From 0e4d8de4579b1718be0a735132e4b118c9713938 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 4 Nov 2025 07:43:26 -0300
Subject: [PATCH 5261/6226] typioca: modernize

---
 pkgs/by-name/ty/typioca/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ty/typioca/package.nix b/pkgs/by-name/ty/typioca/package.nix
index d24a3db91b32..538929d68616 100644
--- a/pkgs/by-name/ty/typioca/package.nix
+++ b/pkgs/by-name/ty/typioca/package.nix
@@ -6,14 +6,14 @@
   typioca,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "typioca";
   version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "bloznelis";
     repo = "typioca";
-    rev = version;
+    tag = "${finalAttrs.version}";
     hash = "sha256-fViYwewzhJUJjMupCYk1UsnnPAhByYZqYkuKD6MJNnE=";
   };
 
@@ -22,7 +22,7 @@ buildGoModule rec {
   ldflags = [
     "-s"
     "-w"
-    "-X=github.com/bloznelis/typioca/cmd.Version=${version}"
+    "-X=github.com/bloznelis/typioca/cmd.Version=${finalAttrs.version}"
   ];
 
   passthru.tests = {
@@ -31,12 +31,12 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Cozy typing speed tester in terminal";
     homepage = "https://github.com/bloznelis/typioca";
-    changelog = "https://github.com/bloznelis/typioca/releases/tag/${src.rev}";
-    license = licenses.mit;
+    changelog = "https://github.com/bloznelis/typioca/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "typioca";
   };
-}
+})

From 1d826a35225bde82e71e2632436a7ccf8f6d51c4 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 4 Nov 2025 07:44:23 -0300
Subject: [PATCH 5262/6226] typioca: add maintainer iedame

---
 pkgs/by-name/ty/typioca/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ty/typioca/package.nix b/pkgs/by-name/ty/typioca/package.nix
index 538929d68616..192109c75a9f 100644
--- a/pkgs/by-name/ty/typioca/package.nix
+++ b/pkgs/by-name/ty/typioca/package.nix
@@ -36,7 +36,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/bloznelis/typioca";
     changelog = "https://github.com/bloznelis/typioca/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ iedame ];
     mainProgram = "typioca";
   };
 })

From 5efa5790dc6e1cc2ec684c61ca1fffd6a3f0ca71 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexandru=20Scvor=C8=9Bov?= <code@scvalex.net>
Date: Tue, 28 Oct 2025 09:55:09 +0000
Subject: [PATCH 5263/6226] matrix-tuwunel: 1.4.2->1.4.5

---
 pkgs/by-name/ma/matrix-tuwunel/package.nix | 27 +++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-tuwunel/package.nix b/pkgs/by-name/ma/matrix-tuwunel/package.nix
index b7fe6422f9c8..e1f6f403077f 100644
--- a/pkgs/by-name/ma/matrix-tuwunel/package.nix
+++ b/pkgs/by-name/ma/matrix-tuwunel/package.nix
@@ -3,6 +3,7 @@
   rustPlatform,
   fetchFromGitHub,
   pkg-config,
+  libredirect,
   bzip2,
   zstd,
   stdenv,
@@ -17,6 +18,7 @@
   enableLiburing ? stdenv.hostPlatform.isLinux,
   liburing,
   nixosTests,
+  writeTextFile,
 }:
 let
   rust-jemalloc-sys' = rust-jemalloc-sys.override {
@@ -85,16 +87,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "matrix-tuwunel";
-  version = "1.4.2";
+  version = "1.4.5";
 
   src = fetchFromGitHub {
     owner = "matrix-construct";
     repo = "tuwunel";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-h7a8nbKZ6cK6SoAGwORc6+D+jJxQOut7y5KzHfBbqDE=";
+    hash = "sha256-tZKq8ypDU1MkWORHFQhieDSUOqOzBcfqIQ40amyc1ls=";
   };
 
-  cargoHash = "sha256-RjoO5eiAXYhC8Tg5UNqCpBsFVN1I+0UhchslAmhm0Qo=";
+  cargoHash = "sha256-x+LhpwDytwH/NzKWqAuRRbX77OZ2JGaYSaQxqinf81Q=";
 
   nativeBuildInputs = [
     pkg-config
@@ -137,6 +139,25 @@ rustPlatform.buildRustPackage (finalAttrs: {
   ]
   ++ lib.optional enableLiburing "io_uring";
 
+  nativeCheckInputs = [
+    libredirect.hook
+  ];
+
+  preCheck =
+    let
+      fakeResolvConf = writeTextFile {
+        name = "resolv.conf";
+        text = ''
+          nameserver 0.0.0.0
+        '';
+      };
+    in
+    ''
+      export NIX_REDIRECTS="/etc/resolv.conf=${fakeResolvConf}"
+      export TUWUNEL_DATABASE_PATH="$(mktemp -d)/smoketest.db"
+    '';
+  doCheck = true;
+
   passthru = {
     rocksdb = rocksdb'; # make used rocksdb version available (e.g., for backup scripts)
     updateScript = nix-update-script { };

From b55c7d14affc6b7858fe2adc673132602aea695a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 10:56:08 +0000
Subject: [PATCH 5264/6226] home-manager: 0-unstable-2025-10-25 ->
 0-unstable-2025-11-03

---
 pkgs/by-name/ho/home-manager/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ho/home-manager/package.nix b/pkgs/by-name/ho/home-manager/package.nix
index 1af40524d040..d3ba7e38295e 100644
--- a/pkgs/by-name/ho/home-manager/package.nix
+++ b/pkgs/by-name/ho/home-manager/package.nix
@@ -19,14 +19,14 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "home-manager";
-  version = "0-unstable-2025-10-25";
+  version = "0-unstable-2025-11-03";
 
   src = fetchFromGitHub {
     name = "home-manager-source";
     owner = "nix-community";
     repo = "home-manager";
-    rev = "c644cb018f9fdec55f5ac2afb4713a8c7beb757c";
-    hash = "sha256-6LNSptFYhiAd0M/maJoixJw7V0Kp5BSoMRtIahcfu3M=";
+    rev = "aa6936bb637e46a49cf1292486200ba41dd4bcf7";
+    hash = "sha256-Y5950vzoyJ8+u4U6dlI/2VEbf3JQnIJsmRWWWcsgpRg=";
   };
 
   nativeBuildInputs = [

From e19484f06d9babd0e11f3132ad1c92f7550dda67 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 11:02:26 +0000
Subject: [PATCH 5265/6226] n8n: 1.116.2 -> 1.117.3

---
 pkgs/by-name/n8/n8n/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix
index ad76b10d9ed7..bdeed4d7195c 100644
--- a/pkgs/by-name/n8/n8n/package.nix
+++ b/pkgs/by-name/n8/n8n/package.nix
@@ -17,19 +17,19 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "n8n";
-  version = "1.116.2";
+  version = "1.117.3";
 
   src = fetchFromGitHub {
     owner = "n8n-io";
     repo = "n8n";
     tag = "n8n@${finalAttrs.version}";
-    hash = "sha256-pHrJ/l3L+asf0ZXcWVvOzzdoDYnAUvaR9GxB/m/jvzU=";
+    hash = "sha256-zCwQ+f0BklDBKQrdxZqE7mlG3gzZ78rQeHUKpDrd8EU=";
   };
 
   pnpmDeps = pnpm_10.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 2;
-    hash = "sha256-uBnb781B84Rm9gbco7p5iDp18sfjbULbedaRIk7kaLE=";
+    hash = "sha256-GJ8lKqfsVoA/znPU7r4AsDZdnP+VqmzJpFVLV8RvBps=";
   };
 
   nativeBuildInputs = [

From 5c7bde8dfd74ab78da4df3d2fa930ef932c56814 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 11:32:26 +0000
Subject: [PATCH 5266/6226] svlint: 0.9.4 -> 0.9.5

---
 pkgs/by-name/sv/svlint/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sv/svlint/package.nix b/pkgs/by-name/sv/svlint/package.nix
index 10f0c8c68cde..3b8e4a2a246a 100644
--- a/pkgs/by-name/sv/svlint/package.nix
+++ b/pkgs/by-name/sv/svlint/package.nix
@@ -6,14 +6,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "svlint";
-  version = "0.9.4";
+  version = "0.9.5";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-YtBI2AnwSyeirHAXRavRKayfAmgXyyCMNhfEbUMXPgk=";
+    hash = "sha256-RjdhXp9Dm6ZrRfJKsjnzAFgXTIQB3DJmDMwwtQD4Uzw=";
   };
 
-  cargoHash = "sha256-78v28MEW06AIMZa2lNmql3/3t6bI+HCW48vKzRTDjFQ=";
+  cargoHash = "sha256-in8DObo5QENl1N36lI16DpEXepFU3Y0BYkJOXinmUjE=";
 
   cargoBuildFlags = [
     "--bin"

From da1422e080a4611b9074236f89ccfedd89d89419 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 11:33:11 +0000
Subject: [PATCH 5267/6226] terraform-providers.spotinst_spotinst: 1.229.0 ->
 1.230.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 ae7e68b1b845..2ce854d1f5a8 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1246,13 +1246,13 @@
     "vendorHash": "sha256-epwHFW1lGk/HUtv5bS0Dyi59POjICsoJln2xgmH5320="
   },
   "spotinst_spotinst": {
-    "hash": "sha256-h1GtNFwf5zVM3/0AJHpyF9GpMm1pbPbNkEconmrthpk=",
+    "hash": "sha256-IcphMRvrv762wF1GxPAOyv/z6M+Cor9BEL0llKdr5n8=",
     "homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
     "owner": "spotinst",
     "repo": "terraform-provider-spotinst",
-    "rev": "v1.229.0",
+    "rev": "v1.230.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-45cgtu5LzP3ydkHl3RpB0tw0Lz101bL1TpTKl0pnyKc="
+    "vendorHash": "sha256-mcsiXXueAETbv3KIJiAw7xtGAWiaXAXPo1JTNhLao5s="
   },
   "statuscakedev_statuscake": {
     "hash": "sha256-zXBZZA+2uRN2FeGrayq0a4EBk7T+PvlBIwbuxwM7yBc=",

From 7e90063954b757eeb994dbd2b07d93832aab9320 Mon Sep 17 00:00:00 2001
From: Bart Brouns <bart@magnetophon.nl>
Date: Tue, 4 Nov 2025 12:33:44 +0100
Subject: [PATCH 5268/6226] lsp-plugins: 1.2.24 -> 1.2.25

---
 pkgs/by-name/ls/lsp-plugins/package.nix | 35 ++++++++++++++++++++-----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ls/lsp-plugins/package.nix b/pkgs/by-name/ls/lsp-plugins/package.nix
index 5c5e0ecbd65b..006ca5f0e8e5 100644
--- a/pkgs/by-name/ls/lsp-plugins/package.nix
+++ b/pkgs/by-name/ls/lsp-plugins/package.nix
@@ -21,7 +21,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lsp-plugins";
-  version = "1.2.24";
+  version = "1.2.25";
 
   outputs = [
     "out"
@@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   src = fetchurl {
     url = "https://github.com/lsp-plugins/lsp-plugins/releases/download/${finalAttrs.version}/lsp-plugins-src-${finalAttrs.version}.tar.gz";
-    hash = "sha256-rDKf3PqRa+lLZcHGQNRXBGkcnhkMNdE9Jok4n3/btGM=";
+    hash = "sha256-qCm3DfRF7LR6wk5TtC/r1GIA2ZI7YrrZTKNHjLDjJnM=";
   };
 
   # By default, GStreamer plugins are installed right alongside GStreamer itself
@@ -93,49 +93,70 @@ stdenv.mkDerivation (finalAttrs: {
       Contains the following plugins (https://lsp-plug.in/?page=plugins)
 
       Equalizers:
-      - Fliter
+      - Filter
       - Graphic Equalizer
       - Parametric Equalizer
+
       Dynamic Processing:
+      - Beat Breather
+      - Clipper
       - Compressor
-      - Dynamic Processor
+      - Dynamics Processor
       - Expander
       - Gate
       - Limiter
+
       Multiband Dynamic Processing:
       - GOTT Compressor
+      - Multiband Clipper
       - Multiband Compressor
       - Multiband Dynamics Processor
       - Multiband Expander
       - Multiband Gate
       - Multiband Limiter
-      Convolution / Reverb processing:
+
+      Convolution / Reverb Processing:
       - Impulse Responses
       - Impulse Reverb
       - Room Builder
+
       Delay Effects:
       - Artistic Delay
       - Compensation Delay
       - Slap-back Delay
+
+      Modulation Effects:
+      - Chorus
+      - Flanger
+      - Phaser
+
       Analyzers:
       - Oscilloscope
       - Phase Detector
       - Spectrum Analyzer
+
       Multiband Processing:
       - Crossover
+
       Samplers:
       - Multisampler
       - Sampler
+
       Generators / Oscillators:
       - Noise Generator
       - Oscillator
-      Utilitary Plugins:
+
+      Utility Plugins:
       - A/B Test Plugin
-      - Flanger
+      - Automatic Gain Control
       - Latency Meter
       - Loudness Compensator
       - Mixer
       - Profiler
+      - Referencer
+      - Return
+      - Ring Modulated Sidechain
+      - Send
       - Surge Filter
       - Trigger
     '';

From e5b247a92dba05b70c34f84ce2c4d297e1a1ff9e Mon Sep 17 00:00:00 2001
From: Leon Klingele <git@leonklingele.de>
Date: Tue, 4 Nov 2025 12:39:11 +0100
Subject: [PATCH 5269/6226] golangci-lint: 2.6.0 -> 2.6.1

---
 pkgs/by-name/go/golangci-lint/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/go/golangci-lint/package.nix b/pkgs/by-name/go/golangci-lint/package.nix
index 2c82d32881fc..e94de8dafb24 100644
--- a/pkgs/by-name/go/golangci-lint/package.nix
+++ b/pkgs/by-name/go/golangci-lint/package.nix
@@ -14,16 +14,16 @@
 
 buildGo125Module (finalAttrs: {
   pname = "golangci-lint";
-  version = "2.6.0";
+  version = "2.6.1";
 
   src = fetchFromGitHub {
     owner = "golangci";
     repo = "golangci-lint";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lSOtFG760zkN0YYaSms42sv7OYMGymNHDVfstVau8iY=";
+    hash = "sha256-LpYg7zkbLlvOe9u0TyDXkd9VIPyTNGhoZIrRhdmndH4=";
   };
 
-  vendorHash = "sha256-h0rAqxUJlPlCPGi0eNl8oMXicpauZZmCQzAsTDGwHc4=";
+  vendorHash = "sha256-8nwTMjn5OhFDK1Izv/yIIf14X5SijOYiXcXltIKNPJI=";
 
   subPackages = [ "cmd/golangci-lint" ];
 

From 2cd0e6b36f9ee158c06d87c99cb62fd92ed71e6e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 11:41:40 +0000
Subject: [PATCH 5270/6226] terraform-providers.sumologic_sumologic: 3.1.6 ->
 3.1.7

---
 .../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 ae7e68b1b845..8ce4abaebf34 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1264,11 +1264,11 @@
     "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs="
   },
   "sumologic_sumologic": {
-    "hash": "sha256-0vWAKROcci1v9QRnBEyN5o9kD3c3YYAKimixRbC3mpk=",
+    "hash": "sha256-5b+hCWXyafLeCA7F5RlUj2GpO7Ipy8UVAQxjQaoYnJA=",
     "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic",
     "owner": "SumoLogic",
     "repo": "terraform-provider-sumologic",
-    "rev": "v3.1.6",
+    "rev": "v3.1.7",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-IR6KjFW5GbsOIm3EEFyx3ctwhbifZlcNaZeGhbeK/Wo="
   },

From 616a960184d541be446e05e881edba62eb00f062 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 11:34:21 +0000
Subject: [PATCH 5271/6226] chhoto-url: 6.5.0 -> 6.5.1

Changelog: https://github.com/SinTan1729/chhoto-url/releases/tag/6.5.1
Diff: https://github.com/SinTan1729/chhoto-url/compare/6.5.0...6.5.1
---
 pkgs/by-name/ch/chhoto-url/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix
index a50ad7940424..835331ebcd98 100644
--- a/pkgs/by-name/ch/chhoto-url/package.nix
+++ b/pkgs/by-name/ch/chhoto-url/package.nix
@@ -8,13 +8,13 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "chhoto-url";
-  version = "6.5.0";
+  version = "6.5.1";
 
   src = fetchFromGitHub {
     owner = "SinTan1729";
     repo = "chhoto-url";
     tag = finalAttrs.version;
-    hash = "sha256-/aOy2kurZRHbNlanQVobLpu/R9k/2iuNDqzD0TXLx8M=";
+    hash = "sha256-gDD/1NKqPH84nr+EjTFfMGZkZfskQujn+uRGrnGs/fg=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/actix";
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/"
   '';
 
-  cargoHash = "sha256-IxWA/mID3P6e16IoBb8qiFxOXQRdeAhlCcSEOIPz7UU=";
+  cargoHash = "sha256-jSdUKkZBgpMN05FmZUXHqBszuDAByf6bzIaaRNfymGY=";
 
   postInstall = ''
     mkdir -p $out/share/chhoto-url

From 5f11da137a8ea1674afb81109d8fef1302c23776 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 12:04:35 +0000
Subject: [PATCH 5272/6226] suitesparse-graphblas: 10.1.1 -> 10.2.0

---
 pkgs/by-name/su/suitesparse-graphblas/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/su/suitesparse-graphblas/package.nix b/pkgs/by-name/su/suitesparse-graphblas/package.nix
index 767d7b45b720..497bb4c37840 100644
--- a/pkgs/by-name/su/suitesparse-graphblas/package.nix
+++ b/pkgs/by-name/su/suitesparse-graphblas/package.nix
@@ -8,7 +8,7 @@
 
 stdenv.mkDerivation rec {
   pname = "suitesparse-graphblas";
-  version = "10.1.1";
+  version = "10.2.0";
 
   outputs = [
     "out"
@@ -19,7 +19,7 @@ stdenv.mkDerivation rec {
     owner = "DrTimothyAldenDavis";
     repo = "GraphBLAS";
     rev = "v${version}";
-    hash = "sha256-De2ZDP4Lsik3+Wz6yvm+ro4Q7Q8L5ZDdBaYXHg4LO20=";
+    hash = "sha256-iZe5zHDaJtH1N6zXir38U2VJOD9fPChhwB7c3uCvjYc=";
   };
 
   nativeBuildInputs = [

From 7c1ce1c246e343007f3f5c5b0da3cec77d192b7d Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 4 Nov 2025 13:07:42 +0100
Subject: [PATCH 5273/6226] taizen: 0-unstable-2023-06-05 ->
 0-unstable-2024-11-16

---
 pkgs/by-name/ta/taizen/package.nix | 23 +++++++----------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ta/taizen/package.nix b/pkgs/by-name/ta/taizen/package.nix
index 313371f41073..620ad52f3167 100644
--- a/pkgs/by-name/ta/taizen/package.nix
+++ b/pkgs/by-name/ta/taizen/package.nix
@@ -8,26 +8,17 @@
   openssl,
 }:
 
-rustPlatform.buildRustPackage {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "taizen";
-  version = "0-unstable-2023-06-05";
+  version = "0-unstable-2024-11-16";
 
   src = fetchFromGitHub {
     owner = "oppiliappan";
     repo = "taizen";
-    rev = "5486cd4f4c5aa4e0abbcee180ad2ec22839abd31";
-    hash = "sha256-pGcD3+3Ds3U8NuNySaDnz0zzAvZlSDte1jRPdM5qrZA=";
+    rev = "e57f10845d32d51e78c5bbadf9c40780a0fa2481";
+    hash = "sha256-5XLRANBRtT8LyyS4EhKgZS+Hc3xFg/+N3rZJTVvVrpo=";
   };
 
-  cargoPatches = [
-    # update cargo dependencies upstreamed: https://github.com/oppiliappan/taizen/pull/27
-    (fetchpatch2 {
-      name = "update-cargo-lock.patch";
-      url = "https://github.com/oppiliappan/taizen/commit/104a1663268623e9ded45afaf2fe98c9c42b7b21.patch";
-      hash = "sha256-ujsr7MjZWEu+2mijVH1aqtTJXKZC4m5vl73Jre9XHbU=";
-    })
-  ];
-
   cargoHash = "sha256-kK9na2Pk3Hl4TYYVVUfeBv6DDDkrD7mIv7eVHXkS5QY=";
 
   nativeBuildInputs = [ pkg-config ];
@@ -37,11 +28,11 @@ rustPlatform.buildRustPackage {
     openssl
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Curses-based mediawiki browser";
     homepage = "https://github.com/oppiliappan/taizen";
-    license = licenses.mit;
     maintainers = [ ];
+    license = lib.licenses.mit;
     mainProgram = "taizen";
   };
-}
+})

From ac0757e6932df06ccb20ff17d6b310d7f1518235 Mon Sep 17 00:00:00 2001
From: David Wronek <david.wronek@mainlining.org>
Date: Thu, 9 Oct 2025 17:02:37 +0200
Subject: [PATCH 5274/6226] pyrefly: build against system jemalloc

Fixes: https://github.com/NixOS/nixpkgs/issues/450180
Signed-off-by: David Wronek <david.wronek@mainlining.org>
---
 pkgs/by-name/py/pyrefly/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/py/pyrefly/package.nix b/pkgs/by-name/py/pyrefly/package.nix
index fc2c6d6110a4..f4e731a685f0 100644
--- a/pkgs/by-name/py/pyrefly/package.nix
+++ b/pkgs/by-name/py/pyrefly/package.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
   versionCheckHook,
   nix-update-script,
+  rust-jemalloc-sys,
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "pyrefly";
@@ -19,6 +20,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   buildAndTestSubdir = "pyrefly";
   cargoHash = "sha256-46kcoBG/PWwf8VdlvLNzEhfYRTmmKi/uTjwFkl7Wozg=";
 
+  buildInputs = [ rust-jemalloc-sys ];
+
   nativeInstallCheckInputs = [ versionCheckHook ];
   doInstallCheck = true;
 

From e395b01772b093438a62fbab3bcbfb27ad5213de Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 4 Nov 2025 13:08:56 +0100
Subject: [PATCH 5275/6226] taizen: add liberodark to maintainers

---
 pkgs/by-name/ta/taizen/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ta/taizen/package.nix b/pkgs/by-name/ta/taizen/package.nix
index 620ad52f3167..cee2f858b382 100644
--- a/pkgs/by-name/ta/taizen/package.nix
+++ b/pkgs/by-name/ta/taizen/package.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Curses-based mediawiki browser";
     homepage = "https://github.com/oppiliappan/taizen";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ liberodark ];
     license = lib.licenses.mit;
     mainProgram = "taizen";
   };

From 90d42598f5cdbd5ed1dec569ab3009dc1a67bd3d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 12:26:00 +0000
Subject: [PATCH 5276/6226] osmo-bsc: 1.13.2 -> 1.13.3

---
 pkgs/by-name/os/osmo-bsc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/os/osmo-bsc/package.nix b/pkgs/by-name/os/osmo-bsc/package.nix
index 5a25b604eda8..82f8a239f51f 100644
--- a/pkgs/by-name/os/osmo-bsc/package.nix
+++ b/pkgs/by-name/os/osmo-bsc/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "osmo-bsc";
-  version = "1.13.2";
+  version = "1.13.3";
 
   src = fetchFromGitHub {
     owner = "osmocom";
     repo = "osmo-bsc";
     rev = version;
-    hash = "sha256-YSCbVqELh/id9sK4G5xF8riYXhwFtXU/lXMlH6XxvXY=";
+    hash = "sha256-2Go+93h1Z4FV9sESfjwCaee1m4jUq2eO8fxlZAwZVfM=";
   };
 
   postPatch = ''

From 3ffa107eee8566bf428de02c833e395669532d21 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 12:31:04 +0000
Subject: [PATCH 5277/6226] sherpa: 3.0.1 -> 3.0.2

---
 pkgs/by-name/sh/sherpa/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sh/sherpa/package.nix b/pkgs/by-name/sh/sherpa/package.nix
index 21d69093ec48..3367c42ec113 100644
--- a/pkgs/by-name/sh/sherpa/package.nix
+++ b/pkgs/by-name/sh/sherpa/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sherpa";
-  version = "3.0.1";
+  version = "3.0.2";
 
   src = fetchFromGitLab {
     owner = "sherpa-team";
     repo = "sherpa";
     tag = "v${version}";
-    hash = "sha256-zrtu4LJIzNdUGmnQlvZytYgzESo8eYQIdfxBABgUbzs=";
+    hash = "sha256-VlC5MnbrXp2fdO2EtBjtw45Gx6PhF/hcLy0ajlKp10E=";
   };
 
   postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''

From 17050398fb656c63490c028d7c3ea7317967b123 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 12:36:15 +0000
Subject: [PATCH 5278/6226] linuxPackages.tt-kmd: 2.4.1 -> 2.5.0

---
 pkgs/os-specific/linux/tt-kmd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/tt-kmd/default.nix b/pkgs/os-specific/linux/tt-kmd/default.nix
index b04d64ed63f7..68381cf302d7 100644
--- a/pkgs/os-specific/linux/tt-kmd/default.nix
+++ b/pkgs/os-specific/linux/tt-kmd/default.nix
@@ -7,13 +7,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "tt-kmd";
-  version = "2.4.1";
+  version = "2.5.0";
 
   src = fetchFromGitHub {
     owner = "tenstorrent";
     repo = "tt-kmd";
     tag = "ttkmd-${finalAttrs.version}";
-    hash = "sha256-m4XZdgOHQOWNoZlV2VqN6yhLcQuZxam22JKpOGXbjwI=";
+    hash = "sha256-edpBUXhWAtcmHAgNPMAomexXfuIIqRvGipnr30VvsPE=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;

From 77ebd34afd045b5764d64f817907edc674333738 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 12:44:13 +0000
Subject: [PATCH 5279/6226] vuls: 0.35.1 -> 0.36.2

---
 pkgs/by-name/vu/vuls/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vu/vuls/package.nix b/pkgs/by-name/vu/vuls/package.nix
index 04f5b615b985..dc3c5e323b53 100644
--- a/pkgs/by-name/vu/vuls/package.nix
+++ b/pkgs/by-name/vu/vuls/package.nix
@@ -6,17 +6,17 @@
 
 buildGo124Module rec {
   pname = "vuls";
-  version = "0.35.1";
+  version = "0.36.2";
 
   src = fetchFromGitHub {
     owner = "future-architect";
     repo = "vuls";
     tag = "v${version}";
-    hash = "sha256-bgeg5y1wFYDXr2M4yNNWbgKJhtdoUZJRPxpniAXCyRU=";
+    hash = "sha256-z6hNC8VDsz5gzzA6VP9PFAJAE7dzrZnxHD/TlBu/uxI=";
     fetchSubmodules = true;
   };
 
-  vendorHash = "sha256-DUkF1iqofgO9o34owkvQRkV+e7fA0VmeUz1VOPMiZIs=";
+  vendorHash = "sha256-JO3W8VUQiypQ8AGXTtCIHTNu6PO0kJCPp7LDu+xDqOk=";
 
   ldflags = [
     "-s"

From 6ae3df31464615ee0d4d39bcebc9a443d2e270d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 12:47:17 +0000
Subject: [PATCH 5280/6226] tomat: 2.3.0 -> 2.4.0

---
 pkgs/by-name/to/tomat/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/to/tomat/package.nix b/pkgs/by-name/to/tomat/package.nix
index b08eed1802e9..e2f842e5ebc3 100644
--- a/pkgs/by-name/to/tomat/package.nix
+++ b/pkgs/by-name/to/tomat/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "tomat";
-  version = "2.3.0";
+  version = "2.4.0";
 
   src = fetchFromGitHub {
     owner = "jolars";
     repo = "tomat";
     tag = "v${version}";
-    hash = "sha256-lkNBcTn7uXWifIVNoXmggPy+UjozL5YqVYorH9XAejo=";
+    hash = "sha256-xIIkyPcW/gIOS28efGR8ausBdnIj0/OkWLEM0MMTJLI=";
   };
 
-  cargoHash = "sha256-jBpZyNfsJKchJnKwWJQeVavj0Yog83QrCM8kOJFVugg=";
+  cargoHash = "sha256-Ij91tU31fPUapxwCjpP0ASw96OGs/D/RzmDA1pKmrgQ=";
 
   nativeBuildInputs = [
     pkg-config

From 72732dc794bcd98baed9ad0bc2a4091b5d60f667 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 13:07:00 +0100
Subject: [PATCH 5281/6226] ulid: remove `with lib;`

---
 pkgs/by-name/ul/ulid/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ul/ulid/package.nix b/pkgs/by-name/ul/ulid/package.nix
index cc333c120aec..975688ddfd93 100644
--- a/pkgs/by-name/ul/ulid/package.nix
+++ b/pkgs/by-name/ul/ulid/package.nix
@@ -27,11 +27,11 @@ buildGoModule rec {
     "-skip=TestMonotonicSafe"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Universally Unique Lexicographically Sortable Identifier (ULID) in Go";
     homepage = "https://github.com/oklog/ulid";
     changelog = "https://github.com/oklog/ulid/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     maintainers = [ ];
     mainProgram = "ulid";
   };

From c0d3a3a4e0f538b791df0a4f765825c48470ebd3 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 13:37:58 +0100
Subject: [PATCH 5282/6226] ulid: use finalAttrs pattern

---
 pkgs/by-name/ul/ulid/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ul/ulid/package.nix b/pkgs/by-name/ul/ulid/package.nix
index 975688ddfd93..db4b0ca24729 100644
--- a/pkgs/by-name/ul/ulid/package.nix
+++ b/pkgs/by-name/ul/ulid/package.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "ulid";
   version = "2.1.1";
 
   src = fetchFromGitHub {
     owner = "oklog";
     repo = "ulid";
-    rev = "v${version}";
+    rev = "v${finalAttrs.version}";
     hash = "sha256-kPNLaZMGwGc7ngPCivf/n4Bis219yOkGAaa6mt7+yTY=";
   };
 
@@ -30,9 +30,9 @@ buildGoModule rec {
   meta = {
     description = "Universally Unique Lexicographically Sortable Identifier (ULID) in Go";
     homepage = "https://github.com/oklog/ulid";
-    changelog = "https://github.com/oklog/ulid/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/oklog/ulid/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = [ ];
     mainProgram = "ulid";
   };
-}
+})

From fc88a12c962104f49c8d326df888269ddba403ba Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 13:38:15 +0100
Subject: [PATCH 5283/6226] ulid: use tag in fetchFromGitHub

---
 pkgs/by-name/ul/ulid/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ul/ulid/package.nix b/pkgs/by-name/ul/ulid/package.nix
index db4b0ca24729..858dd99b2a29 100644
--- a/pkgs/by-name/ul/ulid/package.nix
+++ b/pkgs/by-name/ul/ulid/package.nix
@@ -11,7 +11,7 @@ buildGoModule (finalAttrs: {
   src = fetchFromGitHub {
     owner = "oklog";
     repo = "ulid";
-    rev = "v${finalAttrs.version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-kPNLaZMGwGc7ngPCivf/n4Bis219yOkGAaa6mt7+yTY=";
   };
 

From 9d1116af2509319ec55fc5a741d0893a86dc6330 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 13:38:50 +0100
Subject: [PATCH 5284/6226] ulid: don't use src.rev in meta.changelog

---
 pkgs/by-name/ul/ulid/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ul/ulid/package.nix b/pkgs/by-name/ul/ulid/package.nix
index 858dd99b2a29..c866990eb3f3 100644
--- a/pkgs/by-name/ul/ulid/package.nix
+++ b/pkgs/by-name/ul/ulid/package.nix
@@ -30,7 +30,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Universally Unique Lexicographically Sortable Identifier (ULID) in Go";
     homepage = "https://github.com/oklog/ulid";
-    changelog = "https://github.com/oklog/ulid/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/oklog/ulid/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = [ ];
     mainProgram = "ulid";

From f0a8acccb4e74f5f0e088906a1109710f5f2845c Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 13:39:22 +0100
Subject: [PATCH 5285/6226] ulid: add updateScript

---
 pkgs/by-name/ul/ulid/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ul/ulid/package.nix b/pkgs/by-name/ul/ulid/package.nix
index c866990eb3f3..7351050329f0 100644
--- a/pkgs/by-name/ul/ulid/package.nix
+++ b/pkgs/by-name/ul/ulid/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nix-update-script,
 }:
 
 buildGoModule (finalAttrs: {
@@ -27,6 +28,8 @@ buildGoModule (finalAttrs: {
     "-skip=TestMonotonicSafe"
   ];
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Universally Unique Lexicographically Sortable Identifier (ULID) in Go";
     homepage = "https://github.com/oklog/ulid";

From c282c8728c1477fdcf3535c31c798e6ce45959d8 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 13:07:00 +0100
Subject: [PATCH 5286/6226] ulid: add defelo to maintainers

---
 pkgs/by-name/ul/ulid/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ul/ulid/package.nix b/pkgs/by-name/ul/ulid/package.nix
index 7351050329f0..dce41f939ec0 100644
--- a/pkgs/by-name/ul/ulid/package.nix
+++ b/pkgs/by-name/ul/ulid/package.nix
@@ -35,7 +35,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/oklog/ulid";
     changelog = "https://github.com/oklog/ulid/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ defelo ];
     mainProgram = "ulid";
   };
 })

From 403b09dc7e68b449d9c33dd79f353d232ade3054 Mon Sep 17 00:00:00 2001
From: LinuxWhatA <68576488+LinuxWhatA@users.noreply.github.com>
Date: Tue, 4 Nov 2025 21:10:07 +0800
Subject: [PATCH 5287/6226] linuxPackages.nvidiaPackages.legacy_(390,470}:
 patch for linux 6.17

---
 pkgs/os-specific/linux/nvidia-x11/default.nix | 62 ++++++++++++-------
 .../linux/nvidia-x11/follow_pfn.patch         | 61 ------------------
 2 files changed, 40 insertions(+), 83 deletions(-)
 delete mode 100644 pkgs/os-specific/linux/nvidia-x11/follow_pfn.patch

diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix
index 7c58fb9fee8a..c34102f0b486 100644
--- a/pkgs/os-specific/linux/nvidia-x11/default.nix
+++ b/pkgs/os-specific/linux/nvidia-x11/default.nix
@@ -50,8 +50,8 @@ let
   # Source corresponding to https://aur.archlinux.org/packages/nvidia-390xx-dkms
   aurPatches = fetchgit {
     url = "https://aur.archlinux.org/nvidia-390xx-utils.git";
-    rev = "94dffc01e23a93c354a765ea7ac64484a3ef96c1";
-    hash = "sha256-c94qXNZyMrSf7Dik7jvz2ECaGELqN7WEYNpnbUkzeeU=";
+    rev = "cf1a1c571c425b4b66d12e468fc4ce45a397c583";
+    hash = "sha256-SERB5ihOroagJn7apAiqjUckbrfP2FZPCuTLWcBccoM=";
   };
 
   # https://github.com/NVIDIA/open-gpu-kernel-modules/issues/840
@@ -166,26 +166,39 @@ rec {
   };
 
   # Last one supporting Kepler architecture
-  legacy_470 = generic {
-    version = "470.256.02";
-    sha256_64bit = "sha256-1kUYYt62lbsER/O3zWJo9z6BFowQ4sEFl/8/oBNJsd4=";
-    sha256_aarch64 = "sha256-e+QvE+S3Fv3JRqC9ZyxTSiCu8gJdZXSz10gF/EN6DY0=";
-    settingsSha256 = "sha256-kftQ4JB0iSlE8r/Ze/+UMnwLzn0nfQtqYXBj+t6Aguk=";
-    persistencedSha256 = "sha256-iYoSib9VEdwjOPBP1+Hx5wCIMhW8q8cCHu9PULWfnyQ=";
+  legacy_470 =
+    let
+      # Source corresponding to https://aur.archlinux.org/packages/nvidia-470xx-dkms
+      aurPatches = fetchgit {
+        url = "https://aur.archlinux.org/nvidia-470xx-utils.git";
+        rev = "7c1c2c124147d960a6c7114eb26a4eadae9b9f3d";
+        hash = "sha256-sNW+I4dkPSudfORLEp1RNGHyQKWBYnBEeGrfJU7SYTs=";
+      };
+    in
+    generic {
+      version = "470.256.02";
+      sha256_64bit = "sha256-1kUYYt62lbsER/O3zWJo9z6BFowQ4sEFl/8/oBNJsd4=";
+      sha256_aarch64 = "sha256-e+QvE+S3Fv3JRqC9ZyxTSiCu8gJdZXSz10gF/EN6DY0=";
+      settingsSha256 = "sha256-kftQ4JB0iSlE8r/Ze/+UMnwLzn0nfQtqYXBj+t6Aguk=";
+      persistencedSha256 = "sha256-iYoSib9VEdwjOPBP1+Hx5wCIMhW8q8cCHu9PULWfnyQ=";
 
-    patches = [
-      "${aurPatches}/gcc-14.patch"
-      # fixes 6.10 follow_pfn
-      ./follow_pfn.patch
-      # https://gist.github.com/joanbm/a6d3f7f873a60dec0aa4a734c0f1d64e
-      (fetchpatch {
-        url = "https://gist.github.com/joanbm/a6d3f7f873a60dec0aa4a734c0f1d64e/raw/6bae5606c033b6c6c08233523091992370e357b7/nvidia-470xx-fix-linux-6.12.patch";
-        hash = "sha256-6nbzcRTRCxW8GDAhB8Zwx9rVcCzwPtVYlqoUhL9gxlY=";
-        stripLen = 1;
-        extraPrefix = "kernel/";
-      })
-    ];
-  };
+      patches = map (patch: "${aurPatches}/${patch}") [
+        "0001-Fix-conftest-to-ignore-implicit-function-declaration.patch"
+        "0002-Fix-conftest-to-use-a-short-wchar_t.patch"
+        "0003-Fix-conftest-to-use-nv_drm_gem_vmap-which-has-the-se.patch"
+        "nvidia-470xx-fix-gcc-15.patch"
+        "kernel-6.10.patch"
+        "kernel-6.12.patch"
+        "nvidia-470xx-fix-linux-6.13.patch"
+        "nvidia-470xx-fix-linux-6.14.patch"
+        "nvidia-470xx-fix-linux-6.15.patch"
+        "nvidia-470xx-fix-linux-6.17.patch"
+      ];
+      patchFlags = [
+        "-p1"
+        "--directory=kernel"
+      ];
+    };
 
   # Last one supporting x86
   legacy_390 = generic {
@@ -206,8 +219,13 @@ rec {
       "gcc-14.patch"
       "kernel-6.10.patch"
       "kernel-6.12.patch"
+      "kernel-6.13.patch"
+      "kernel-6.14.patch"
+      "gcc-15.patch"
+      "kernel-6.15.patch"
+      "kernel-6.17.patch"
     ];
-    broken = kernel.kernelAtLeast "6.13";
+    broken = kernel.kernelAtLeast "6.18";
 
     # fixes the bug described in https://bbs.archlinux.org/viewtopic.php?pid=2083439#p2083439
     # see https://bbs.archlinux.org/viewtopic.php?pid=2083651#p2083651
diff --git a/pkgs/os-specific/linux/nvidia-x11/follow_pfn.patch b/pkgs/os-specific/linux/nvidia-x11/follow_pfn.patch
deleted file mode 100644
index 19026229bd1d..000000000000
--- a/pkgs/os-specific/linux/nvidia-x11/follow_pfn.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-diff -ruNb a/kernel/conftest.sh b/kernel/conftest.sh
---- a/kernel/conftest.sh        2024-07-19 04:36:26.183701185 -0500
-+++ b/kernel/conftest.sh        2024-07-19 04:36:26.230366381 -0500
-@@ -4464,20 +4464,22 @@
-             compile_check_conftest "$CODE" "NV_DRM_GEM_OBJECT_VMAP_HAS_MAP_ARG" "" "types"
-         ;;
-
--        unsafe_follow_pfn)
-+        follow_pfn)
-             #
--            # Determine if unsafe_follow_pfn() is present.
-+            # Determine if follow_pfn() is present.
-             #
--            # unsafe_follow_pfn() was added by commit 69bacee7f9ad
--            # ("mm: Add unsafe_follow_pfn") in v5.13-rc1.
-+            # follow_pfn() was added by commit 3b6748e2dd69
-+            # ("mm: introduce follow_pfn()") in v2.6.31-rc1, and removed
-+            # by commit 233eb0bf3b94 ("mm: remove follow_pfn")
-+            # from linux-next 233eb0bf3b94.
-             #
-             CODE="
-             #include <linux/mm.h>
--            void conftest_unsafe_follow_pfn(void) {
--                unsafe_follow_pfn();
-+            void conftest_follow_pfn(void) {
-+                follow_pfn();
-             }"
-
--            compile_check_conftest "$CODE" "NV_UNSAFE_FOLLOW_PFN_PRESENT" "" "functions"
-+            compile_check_conftest "$CODE" "NV_FOLLOW_PFN_PRESENT" "" "functions"
-         ;;
-
-         drm_plane_atomic_check_has_atomic_state_arg)
-diff -ruNb a/kernel/nvidia/nvidia.Kbuild b/kernel/nvidia/nvidia.Kbuild
---- a/kernel/nvidia/nvidia.Kbuild       2022-10-12 04:29:57.000000000 -0500
-+++ b/kernel/nvidia/nvidia.Kbuild       2024-07-19 05:17:39.148448922 -0500
-@@ -164,7 +164,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += cc
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += iterate_fd
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += seq_read_iter
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += sg_page_iter_page
--NV_CONFTEST_FUNCTION_COMPILE_TESTS += unsafe_follow_pfn
-+NV_CONFTEST_FUNCTION_COMPILE_TESTS += follow_pfn
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_get
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += drm_gem_object_put_unlocked
- NV_CONFTEST_FUNCTION_COMPILE_TESTS += set_close_on_exec
-diff -ruNb a/kernel/nvidia/os-mlock.c b/kernel/nvidia/os-mlock.c
---- a/kernel/nvidia/os-mlock.c  2022-10-12 04:30:26.000000000 -0500
-+++ b/kernel/nvidia/os-mlock.c  2024-07-19 04:36:26.230366381 -0500
-@@ -18,10 +18,10 @@
-                                 unsigned long address,
-                                 unsigned long *pfn)
- {
--#if defined(NV_UNSAFE_FOLLOW_PFN_PRESENT)
--    return unsafe_follow_pfn(vma, address, pfn);
--#else
-+#if defined(NV_FOLLOW_PFN_PRESENT)
-     return follow_pfn(vma, address, pfn);
-+#else
-+    return -1;
- #endif
- }
\ No newline at end of file

From 749bc347f18243a998bf20f91ccaa84cb51359dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 4 Nov 2025 08:14:31 -0500
Subject: [PATCH 5288/6226] maintainers: add eclairevoyant

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index a472f1c904eb..7cab3affd4a3 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -7259,6 +7259,11 @@
     githubId = 8146736;
     name = "Florentin Eckl";
   };
+  eclairevoyant = {
+    githubId = 848000;
+    github = "eclairevoyant";
+    name = "éclairevoyant";
+  };
   edanaher = {
     email = "nixos@edanaher.net";
     github = "edanaher";

From be8a886683d4ca3277b97e47a4ece98b5cb0b9de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=A9clairevoyant?=
 <848000+eclairevoyant@users.noreply.github.com>
Date: Tue, 4 Nov 2025 08:15:29 -0500
Subject: [PATCH 5289/6226] nix-init: adopt by eclairevoyant

---
 pkgs/by-name/ni/nix-init/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ni/nix-init/package.nix b/pkgs/by-name/ni/nix-init/package.nix
index 345dfc53d98f..5504e02a8ddc 100644
--- a/pkgs/by-name/ni/nix-init/package.nix
+++ b/pkgs/by-name/ni/nix-init/package.nix
@@ -96,6 +96,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/nix-community/nix-init";
     changelog = "https://github.com/nix-community/nix-init/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = [ ];
+    maintainers = [ lib.maintainers.eclairevoyant ];
   };
 })

From 6d3b460ed262500aff5140a6eb9f7247c657dddc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 13:22:49 +0000
Subject: [PATCH 5290/6226] simple-binary-encoding: 1.36.0 -> 1.36.1

---
 .../si/simple-binary-encoding/deps.json       | 88 ++++++++++---------
 .../si/simple-binary-encoding/package.nix     |  4 +-
 2 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/pkgs/by-name/si/simple-binary-encoding/deps.json b/pkgs/by-name/si/simple-binary-encoding/deps.json
index a5d6de6710ac..490af168c51d 100644
--- a/pkgs/by-name/si/simple-binary-encoding/deps.json
+++ b/pkgs/by-name/si/simple-binary-encoding/deps.json
@@ -259,9 +259,9 @@
    "jar": "sha256-hNOhUFGEhfgUDqmbiphWVnSWKfZDPJK4DHWzaro7CZs=",
    "pom": "sha256-FFcIOFAANPwbR8ggXOHJ1rJVwczdLRr9zcv3XomySjM="
   },
-  "com/puppycrawl/tools#checkstyle/11.1.0": {
-   "jar": "sha256-AdLE4WAjVbKjTd4UCI5lqv9OvhZ4FciGmQi1u/Cn88k=",
-   "pom": "sha256-CtCVc7hBSEy0ade4xc7J4onVgk2cv8WzlhhefWkK5A4="
+  "com/puppycrawl/tools#checkstyle/12.1.1": {
+   "jar": "sha256-bFeVVVOsrx+n0vuZZogE8b37aN6ROLM5nqN/NGlPEOw=",
+   "pom": "sha256-G7+5ywT3BF9vCW03d7IFICtYfbxgqF1UUKKooJWTXlY="
   },
   "commons-beanutils#commons-beanutils/1.11.0": {
    "jar": "sha256-nkS6aOyaPyEob6Kou7ADtzXA9pEBu0MUS3n0+KqnRwk=",
@@ -323,10 +323,10 @@
    "jar": "sha256-jzqSFqU3NnEyKT6su6nfBi6s6PixahhK9Z4uSDnUzUE=",
    "pom": "sha256-+IDp0dQAyZwYkvWWTl/JIN0d7wViI1m5sFjzK1tCaXU="
   },
-  "org/agrona#agrona/2.3.0": {
-   "jar": "sha256-8mIblkMT6G6sRqvz6CL3VyFYO0bjssgDuS5HZaoD8+k=",
-   "module": "sha256-2wb7uwExy7cFsAgm6itku9binI/bGC7Zcejo4kBU+D0=",
-   "pom": "sha256-7KN5DcPZVKrXneWuqueAkKE5xrRNs0vCaLAhxwke+VY="
+  "org/agrona#agrona/2.3.1": {
+   "jar": "sha256-1c6VoTOazhPd0tAxVUMsalMonoN4E/aTIVpsq/AeZvg=",
+   "module": "sha256-d72z4nnWH8K9nGf46cf0HB6+sAeQNZL7wZlizuQmDro=",
+   "pom": "sha256-4kiqvmvUW54FQjK8jRMrV94UTxGFw65oFv84HYzF7bk="
   },
   "org/antlr#antlr4-master/4.13.2": {
    "pom": "sha256-Ct2gJmhYc/ZRNgF4v/xEbO7kgzCBc5466dbo8H6NkCo="
@@ -443,10 +443,10 @@
    "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=",
    "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA="
   },
-  "org/checkerframework#checker-qual/3.51.0": {
-   "jar": "sha256-jpFnbckWgEvRL3kJ5/XcB2RsyYIgFHqLX+p/9CvW/0o=",
-   "module": "sha256-MNCupC4IPfcNa/P5WAA0Mhj4nPn6G8MkN6XqcHrvg+w=",
-   "pom": "sha256-VyZA+ycbWVVBeR7+2+Ch8reFA3M8t1/BglkO3QcbxMs="
+  "org/checkerframework#checker-qual/3.51.1": {
+   "jar": "sha256-FTrv/lbKJPOpuLbG/4E+rOliDM81rfq5HUkWguVs1c4=",
+   "module": "sha256-sU5zwFoeM/ddSLfYBDH5QqpLIQ/Pc/YKQkXMP91p/yI=",
+   "pom": "sha256-dQgGzZygmZ5L8vel1lfSNqNrtzYm7mpI8p9VXiB0UVA="
   },
   "org/codehaus/plexus#plexus-classworlds/2.6.0": {
    "jar": "sha256-Uvd8XsSfeHycQX6+1dbv2ZIvRKIC8hc3bk+UwNdPNUk=",
@@ -492,44 +492,48 @@
    "module": "sha256-3nCsXZGlJlbYiQptI7ngTZm5mxoEAlMN7K1xvzGyc14=",
    "pom": "sha256-zvgP7IZFT2gGv7DfJGabXG8y4styhTnqhZ9H39ybvBc="
   },
-  "org/junit#junit-bom/5.13.4": {
-   "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=",
-   "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI="
+  "org/junit#junit-bom/6.0.0": {
+   "module": "sha256-R98chw1F2mEXtKYNzAYhRmrD332s6I2aL5TXhAYkbkU=",
+   "pom": "sha256-s9mDL1wRu7aw5ihRuTqinSeMOfsadR63cbRtAEohYhk="
   },
-  "org/junit/jupiter#junit-jupiter-api/5.13.4": {
-   "jar": "sha256-0buBq/2eA0GDBrTmozkMjbUsWDcudJwpgKwp8MCCePE=",
-   "module": "sha256-/kZNN/XIEKgF/zGRmBZcrDPCVY4iYQIdjzEqglpIZx8=",
-   "pom": "sha256-xWBTV9MRgTZCxABEHgR7ynF8rcFXs/5+GJhbxv8jLls="
+  "org/junit#junit-bom/6.0.1": {
+   "module": "sha256-xI2Y9e3P2cVeefrLugEB98G6CIY0ib6EqRYrmaGG0cI=",
+   "pom": "sha256-4xXFzLsIchbc4ErnDDK/F2K+KguKQ++B47p4MXpM1cg="
   },
-  "org/junit/jupiter#junit-jupiter-engine/5.13.4": {
-   "jar": "sha256-AnQEqS/mGLckZXkqJXlRSVxQOn1XUeJ5Hg9RyH9n9bw=",
-   "module": "sha256-zu7m0ANKc4E1vZ84IM/gicZWkWPGI7qOPptE9yCP0ho=",
-   "pom": "sha256-E4Nt6C2Xf/JSCPXgypvfEzFV3C7+0Wr2Dfrojp3KzUc="
+  "org/junit/jupiter#junit-jupiter-api/6.0.1": {
+   "jar": "sha256-o8qMflZ0Ngk+SmcD1dSqwC2+o2EG6jL9E2e1beINTgI=",
+   "module": "sha256-zK14mBan6wSIQ0ad+9pkHonhhJ5juCSS8kvGCzBQu5s=",
+   "pom": "sha256-NjNXApnLjlv8KBYedmHSEfODqx4QndQNBWbGr6FDlxo="
   },
-  "org/junit/jupiter#junit-jupiter-params/5.13.4": {
-   "jar": "sha256-OoxjZXFtu2mMDUmgVFbB4a0FxAZhPFUPndUAN4cu/EE=",
-   "module": "sha256-/DZvvmB5ma/IzwK53KldHgKgawzocqRWBanZaMJG9LQ=",
-   "pom": "sha256-wPNik+IEJzLWJu4HWMrlLDeMKklXnUW9CBUojyDdTGw="
+  "org/junit/jupiter#junit-jupiter-engine/6.0.1": {
+   "jar": "sha256-dHalb0qqtX/C9FmEfNa/txKzvQSprAuJ7ZVz963CxVA=",
+   "module": "sha256-DNBLxyt1p94NOMErkbE3PcQ3OgP+Iv/3oV6MvRyfXfk=",
+   "pom": "sha256-w0n6QNgPtJ/b+0TyYlR2zSa4vpWQQP+or4in/bHiSPY="
   },
-  "org/junit/jupiter#junit-jupiter/5.13.4": {
-   "jar": "sha256-uWD3khfdAchjAxtnjwffRzC78erGUMdK1rDGH6rXg3k=",
-   "module": "sha256-RpRiJ8KWfRZZ6VX1PTTshzGBHUr0AcKsfWRveTx44fk=",
-   "pom": "sha256-q3sscJnzXPorMVmhpaQLlO414hKyWo172XwSJ7+u5Y4="
+  "org/junit/jupiter#junit-jupiter-params/6.0.1": {
+   "jar": "sha256-lWbiSbTUx9U6bIkI9XeIXOLUxjE8kWvfv3/7xSa4o28=",
+   "module": "sha256-p9p+0ICwGl76I7bWB/qxxmMhEYc0EXoaVkde/DU7HMA=",
+   "pom": "sha256-sfUTKYkKt1oPR+kBQNZOJf6z57dM5KEHRZg9YViQbnM="
   },
-  "org/junit/platform#junit-platform-commons/1.13.4": {
-   "jar": "sha256-HCXKZB66rkT/OtIcobLvaNDdhL/rB8SAW6eECJm3dAg=",
-   "module": "sha256-Gnot58eYmV+5eyRNbvnpnDpXmbV6D7rNaElrp+6BWdc=",
-   "pom": "sha256-RKWQ1nrsTSdskMUVj+EEePITPwoj7DLPqzqlXUK4aIM="
+  "org/junit/jupiter#junit-jupiter/6.0.1": {
+   "jar": "sha256-vXrygd/vjcwdCKUDzpMEWXtl4YUKDbgsmattjLEDGxQ=",
+   "module": "sha256-iuvBy0oYWd7uRjDJq3S2/KKMAdpl0h6Z7XgEp7ibGMo=",
+   "pom": "sha256-VICrz2YRG4YweP/+OFMKTcrtJoK9gCtO2VBdrzVleTM="
   },
-  "org/junit/platform#junit-platform-engine/1.13.4": {
-   "jar": "sha256-OQxfd7hCg6ZLZE+IJRs5fgsN67gL3MUPiZiBrs/0Olo=",
-   "module": "sha256-NeT9aOvzFOYmYBSJNkNrOa4QXTVb6qwapU65HCBmync=",
-   "pom": "sha256-lYOVQk9rRhK9edgWXte9+vWmWU9GmbjviTmVyljDwKU="
+  "org/junit/platform#junit-platform-commons/6.0.1": {
+   "jar": "sha256-+IU/RcEPOA3bFXz0KrupsHNHTwXMQDNbWFBV+FU43K0=",
+   "module": "sha256-mS8uNl3Y24i+YC+eXFwI+B/USwxbj6HPFzTzb8fh8f0=",
+   "pom": "sha256-E6l3Y7CJ0P0kyrrGE/d5pyEmm+5VHz5cHbr+mhzQ6tI="
   },
-  "org/junit/platform#junit-platform-launcher/1.13.4": {
-   "jar": "sha256-Cwvq62iAoxFJZB0thIuGNxKIVGlnDBIJlYbX95hSJWQ=",
-   "module": "sha256-EV93RVdA4MPFOYvN2EHIqmmcLYACsRAPKuemQ9lAWSg=",
-   "pom": "sha256-OuOHauC4fbi96hJ5ryuXjaKfE4selfYFoD2aUtE529I="
+  "org/junit/platform#junit-platform-engine/6.0.1": {
+   "jar": "sha256-9JV3Bzp64YTHGNm0OuDY7cuKv8Wsc4c17jM51GUukr8=",
+   "module": "sha256-2aXeq5puUhW79Aw5/+2pCwZXdPjNAY5Xuyod7OI0VKQ=",
+   "pom": "sha256-oiRe8nBlLAfVls5x2NZw0KipklHNzvRU85ZRmaycTpo="
+  },
+  "org/junit/platform#junit-platform-launcher/6.0.1": {
+   "jar": "sha256-7nWN2wb6sf0aiQwLrkqs+NwATE82fhONv/yxE80J66w=",
+   "module": "sha256-QGPjXSBE9xraiSUfrtFB8KWvnOwm1uO3znI889Vz29c=",
+   "pom": "sha256-TNsMG5Lxon57UucN6Buik1shlBgC2MqoiOnZ4V+s/ho="
   },
   "org/mockito#mockito-core/5.20.0": {
    "jar": "sha256-0altJSEo06QkfP2KLnZBLvo8wQOXe+F5M8lCEXok83Q=",
diff --git a/pkgs/by-name/si/simple-binary-encoding/package.nix b/pkgs/by-name/si/simple-binary-encoding/package.nix
index b463e3926b1d..07a577fd5191 100644
--- a/pkgs/by-name/si/simple-binary-encoding/package.nix
+++ b/pkgs/by-name/si/simple-binary-encoding/package.nix
@@ -13,13 +13,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "simple-binary-encoding";
-  version = "1.36.0";
+  version = "1.36.1";
 
   src = fetchFromGitHub {
     owner = "aeron-io";
     repo = "simple-binary-encoding";
     tag = finalAttrs.version;
-    hash = "sha256-xqfsJq86qIFBG1542GDWNP0ayGaOzfIZ1KR0s0m8vf0=";
+    hash = "sha256-BP4JsxW1kTmS7yoqe1FdBDKy5bEzr3VYdfoNy9jTDEA=";
   };
 
   nativeBuildInputs = [

From fd2c2645e2c50b74be72069735335356156e36ef Mon Sep 17 00:00:00 2001
From: kuflierl <41301536+kuflierl@users.noreply.github.com>
Date: Tue, 4 Nov 2025 14:30:26 +0100
Subject: [PATCH 5291/6226] shh: 2025.10.22 -> 2025.11.3

Changelog: https://github.com/desbma/shh/blob/v2025.11.3/CHANGELOG.md
---
 pkgs/by-name/sh/shh/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sh/shh/package.nix b/pkgs/by-name/sh/shh/package.nix
index bb3337716b20..deedf68e8599 100644
--- a/pkgs/by-name/sh/shh/package.nix
+++ b/pkgs/by-name/sh/shh/package.nix
@@ -18,16 +18,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "shh";
-  version = "2025.10.22";
+  version = "2025.11.3";
 
   src = fetchFromGitHub {
     owner = "desbma";
     repo = "shh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OxiQOwoWytZvPVVurSckPSWcb88pyDHRdUV/87Dbb9Q=";
+    hash = "sha256-oXTrKUs6J3Us2m1hFbVa+G03q3oV3pqppQ+QfPXVrFA=";
   };
 
-  cargoHash = "sha256-KRRBqRm6/TedzjGRTcbj0q4R9xOgj0PmKEm9rY2f4PM=";
+  cargoHash = "sha256-GGu/oy4bfsnJNbquDeu9bDJWY9HEWS3hwsOj3nhcUNQ=";
 
   patches = [
     ./fix_run_checks.patch

From 37766b5db9cbc3f3c595b689f869f7b291288017 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 13:34:41 +0000
Subject: [PATCH 5292/6226] signalbackup-tools: 20251028 -> 20251102

---
 pkgs/by-name/si/signalbackup-tools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/signalbackup-tools/package.nix b/pkgs/by-name/si/signalbackup-tools/package.nix
index fcefdda07a17..5a24c0f73b9a 100644
--- a/pkgs/by-name/si/signalbackup-tools/package.nix
+++ b/pkgs/by-name/si/signalbackup-tools/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "signalbackup-tools";
-  version = "20251028";
+  version = "20251102";
 
   src = fetchFromGitHub {
     owner = "bepaald";
     repo = "signalbackup-tools";
     tag = version;
-    hash = "sha256-tTg2I6h5WjcUXPQB7yBTBc3e2osEYRQ2e5ptsya4MTk=";
+    hash = "sha256-UlBFXn9l4eKLWCEIhLtQmYRuMK179e9PDfANDUMfVcs=";
   };
 
   nativeBuildInputs = [

From 75d0f2f221e0ef6257ee97e3406f7b2c67580746 Mon Sep 17 00:00:00 2001
From: Letgamer <alexstephan005@gmail.com>
Date: Tue, 4 Nov 2025 11:28:52 +0100
Subject: [PATCH 5293/6226] ligolo-ng: refactor

---
 pkgs/by-name/li/ligolo-ng/package.nix | 49 +++++++++++++++++++++------
 1 file changed, 39 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/li/ligolo-ng/package.nix b/pkgs/by-name/li/ligolo-ng/package.nix
index 85f863763255..d7571b1435ce 100644
--- a/pkgs/by-name/li/ligolo-ng/package.nix
+++ b/pkgs/by-name/li/ligolo-ng/package.nix
@@ -2,38 +2,67 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  nix-update-script,
+  pkgsCross ? { },
+  versionCheckHook,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "ligolo-ng";
   version = "0.8.2";
 
   src = fetchFromGitHub {
-    owner = "tnpitsecurity";
+    owner = "nicocha30";
     repo = "ligolo-ng";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-ND0SFB0xj4WK6okNzChZWfK5bhNc4PTWuZoq/PodTW0=";
   };
 
   vendorHash = "sha256-oc85xNPMFeaPC7TMcSh3i3Msd8sCJ5QGFmi2fKjcyvk=";
 
-  postConfigure = ''
-    export CGO_ENABLED=0
-  '';
+  env.CGO_ENABLED = 0;
+
+  subPackages = [
+    "cmd/agent"
+    "cmd/proxy"
+  ];
 
   ldflags = [
     "-s"
     "-w"
     "-extldflags '-static'"
+    "-X main.version=${finalAttrs.version}"
   ];
 
+  # This will prefix all the binaries with ligolo-
+  postInstall = ''
+    for f in $out/bin/*; do
+      mv "$f" "$(dirname "$f")/ligolo-$(basename "$f")"
+    done
+  '';
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgram = "${placeholder "out"}/bin/ligolo-agent";
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru = {
+    tests = {
+      win = pkgsCross.mingwW64.ligolo-ng or null;
+      linux64 = pkgsCross.gnu64.ligolo-ng or null;
+    };
+    updateScript = nix-update-script { };
+  };
+
   # Tests require network access
   doCheck = false;
 
   meta = {
-    description = "Tunneling/pivoting tool that uses a TUN interface";
-    homepage = "https://github.com/tnpitsecurity/ligolo-ng";
-    changelog = "https://github.com/nicocha30/ligolo-ng/releases/tag/v${version}";
+    description = "Advanced TUN-based tunneling/pivoting tool";
+    homepage = "https://github.com/nicocha30/ligolo-ng";
+    changelog = "https://github.com/nicocha30/ligolo-ng/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ letgamer ];
+    platforms = lib.platforms.linux ++ lib.platforms.windows;
   };
-}
+})

From 4d8d63b5d5900e003b9af2b5aa4ebcd28a7c4b3e Mon Sep 17 00:00:00 2001
From: Leona Maroni <lm@flyingcircus.io>
Date: Tue, 4 Nov 2025 14:49:28 +0100
Subject: [PATCH 5294/6226] python3Packages.pyslurm: 24.11.0 -> 25.5.0

https://github.com/PySlurm/pyslurm/releases/tag/v25.5.0

Currently, pyslurm is incompatible with the slurm version we ship.
---
 pkgs/development/python-modules/pyslurm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyslurm/default.nix b/pkgs/development/python-modules/pyslurm/default.nix
index 4361c2fbc223..552548c0840c 100644
--- a/pkgs/development/python-modules/pyslurm/default.nix
+++ b/pkgs/development/python-modules/pyslurm/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pyslurm";
-  version = "24.11.0";
+  version = "25.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.6";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     repo = "pyslurm";
     owner = "PySlurm";
     tag = "v${version}";
-    hash = "sha256-Uko4fgi080XWSseOBijzvzi0YtjuRIvH8qSKEWrpFG0=";
+    hash = "sha256-2FEBOKMN3IhJZu+QQ3nWQfxom6wpZUuQouF7TRYndTs=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 0b8c358841c58b6ff2bc0d28a94b8a84be7a766c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 13:56:28 +0000
Subject: [PATCH 5295/6226] reth: 1.8.2 -> 1.8.3

---
 pkgs/by-name/re/reth/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/reth/package.nix b/pkgs/by-name/re/reth/package.nix
index 04c5650d3dca..739df02ab46d 100644
--- a/pkgs/by-name/re/reth/package.nix
+++ b/pkgs/by-name/re/reth/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "reth";
-  version = "1.8.2";
+  version = "1.8.3";
 
   src = fetchFromGitHub {
     owner = "paradigmxyz";
     repo = "reth";
     rev = "v${version}";
-    hash = "sha256-Z84zCt/v6e++Et6a2hBcHfrzQvtzBEn+Zx1bBRJfiqM=";
+    hash = "sha256-jyStSIVTQeBJGwNelxHItIjHPQyvg3luGRj0qziZ8u0=";
   };
 
-  cargoHash = "sha256-KxUiiOTlMNlPw4pHjEcqXsMF3RCA0KVO66WKpz1YoT0=";
+  cargoHash = "sha256-v7B2W9SSQvUlJQzP/AAffsJq+fP4Ghxr4C5+gB1LE9k=";
 
   nativeBuildInputs = [
     rustPlatform.bindgenHook

From 15d849e26e55b34c3b4a1a18853c304786857b22 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 13:56:36 +0100
Subject: [PATCH 5296/6226] taplo: use finalAttrs pattern

---
 pkgs/by-name/ta/taplo/package.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix
index 6594a78872ae..e93c892d6cbd 100644
--- a/pkgs/by-name/ta/taplo/package.nix
+++ b/pkgs/by-name/ta/taplo/package.nix
@@ -9,12 +9,12 @@
   installShellFiles,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "taplo";
   version = "0.10.0";
 
   src = fetchCrate {
-    inherit version;
+    inherit (finalAttrs) version;
     pname = "taplo-cli";
     hash = "sha256-iKc4Nu7AZE1LSuqXffi3XERbOqZMOkI3PV+6HaJzh4c=";
   };
@@ -26,9 +26,7 @@ rustPlatform.buildRustPackage rec {
     pkg-config
   ];
 
-  buildInputs = [
-    openssl
-  ];
+  buildInputs = [ openssl ];
 
   buildFeatures = lib.optional withLsp "lsp";
 
@@ -54,4 +52,4 @@ rustPlatform.buildRustPackage rec {
     maintainers = [ ];
     mainProgram = "taplo";
   };
-}
+})

From 92671b275b4d3f369abc1838856954dbb80cfdad Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 14:47:34 +0100
Subject: [PATCH 5297/6226] taplo: remove `with lib;`

---
 pkgs/by-name/ta/taplo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix
index e93c892d6cbd..5380ba690547 100644
--- a/pkgs/by-name/ta/taplo/package.nix
+++ b/pkgs/by-name/ta/taplo/package.nix
@@ -45,10 +45,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
           --zsh <($out/bin/taplo completions zsh)
       '';
 
-  meta = with lib; {
+  meta = {
     description = "TOML toolkit written in Rust";
     homepage = "https://taplo.tamasfe.dev";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "taplo";
   };

From 9437f10f613d32eae8dff0f9c76adaadf7ca6185 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 14:48:15 +0100
Subject: [PATCH 5298/6226] taplo: add versionCheckHook

---
 pkgs/by-name/ta/taplo/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix
index 5380ba690547..7ef4800ba1c3 100644
--- a/pkgs/by-name/ta/taplo/package.nix
+++ b/pkgs/by-name/ta/taplo/package.nix
@@ -7,6 +7,7 @@
   openssl,
   withLsp ? true,
   installShellFiles,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -45,6 +46,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
           --zsh <($out/bin/taplo completions zsh)
       '';
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   meta = {
     description = "TOML toolkit written in Rust";
     homepage = "https://taplo.tamasfe.dev";

From 533e31e26b1fac6f751996476b41dd28f3d68b8a Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 14:48:48 +0100
Subject: [PATCH 5299/6226] taplo: add updateScript

---
 pkgs/by-name/ta/taplo/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix
index 7ef4800ba1c3..b0d1e2a22329 100644
--- a/pkgs/by-name/ta/taplo/package.nix
+++ b/pkgs/by-name/ta/taplo/package.nix
@@ -8,6 +8,7 @@
   withLsp ? true,
   installShellFiles,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -50,6 +51,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "TOML toolkit written in Rust";
     homepage = "https://taplo.tamasfe.dev";

From c8b6a04378e7634daa2307f93daf246697cda870 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 13:07:00 +0100
Subject: [PATCH 5300/6226] taplo: add defelo to maintainers

---
 pkgs/by-name/ta/taplo/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix
index b0d1e2a22329..c50de7ee18ca 100644
--- a/pkgs/by-name/ta/taplo/package.nix
+++ b/pkgs/by-name/ta/taplo/package.nix
@@ -57,7 +57,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "TOML toolkit written in Rust";
     homepage = "https://taplo.tamasfe.dev";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ defelo ];
     mainProgram = "taplo";
   };
 })

From 5f62afdbc265ea7ef31c49a82cbba7309c17bbb9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 14:04:43 +0000
Subject: [PATCH 5301/6226] gotlsaflare: 2.7.4 -> 2.8.0

---
 pkgs/by-name/go/gotlsaflare/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/gotlsaflare/package.nix b/pkgs/by-name/go/gotlsaflare/package.nix
index 789593ea0d84..4061de8a3808 100644
--- a/pkgs/by-name/go/gotlsaflare/package.nix
+++ b/pkgs/by-name/go/gotlsaflare/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "gotlsaflare";
-  version = "2.7.4";
+  version = "2.8.0";
 
   src = fetchFromGitHub {
     owner = "Stenstromen";
     repo = "gotlsaflare";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Yf3Z+qO3nF1XgDC0ocbNpUJUvwfhw60F5Y5yG55LsJs=";
+    hash = "sha256-1CvPQdaJJbh+Dsibgwan9T7yLiH+fTfAYtv1Rkuo8E4=";
   };
 
   vendorHash = "sha256-d+79m6K1+fy3vyXLKvwNx6mFiO3UO9lHJ07364jVJYM=";

From 583db869be08689b4356ac0d3cefca57a7ce8fa4 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 4 Nov 2025 10:52:00 -0300
Subject: [PATCH 5302/6226] telepathy-haze: drop

---
 pkgs/by-name/te/telepathy-haze/package.nix | 42 ----------------------
 pkgs/top-level/aliases.nix                 |  1 +
 2 files changed, 1 insertion(+), 42 deletions(-)
 delete mode 100644 pkgs/by-name/te/telepathy-haze/package.nix

diff --git a/pkgs/by-name/te/telepathy-haze/package.nix b/pkgs/by-name/te/telepathy-haze/package.nix
deleted file mode 100644
index 56ff4ef9c293..000000000000
--- a/pkgs/by-name/te/telepathy-haze/package.nix
+++ /dev/null
@@ -1,42 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchurl,
-  pidgin,
-  telepathy-glib,
-  python3,
-  glib,
-  dbus-glib,
-  pkg-config,
-  libxslt,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "telepathy-haze";
-  version = "0.8.1";
-
-  src = fetchurl {
-    url = "https://telepathy.freedesktop.org/releases/telepathy-haze/telepathy-haze-${version}.tar.gz";
-    hash = "sha256-cEvvpC7sIXPspLrAH/0AQBRmXyutRtyJSOVCM2TN4wo=";
-  };
-
-  buildInputs = [
-    glib
-    telepathy-glib
-    dbus-glib
-    pidgin
-  ];
-
-  nativeBuildInputs = [
-    pkg-config
-    libxslt
-    python3
-  ];
-
-  meta = {
-    description = "Telepathy connection manager based on libpurple";
-    homepage = "https://telepathy.freedesktop.org/components/telepathy-haze/";
-    license = lib.licenses.gpl2Plus;
-    platforms = lib.platforms.unix;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8e4071c5bcc9..9a0291c32612 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1467,6 +1467,7 @@ mapAliases {
   teamspeak5_client = throw "'teamspeak5_client' has been renamed to/replaced by 'teamspeak6-client'"; # Converted to throw 2025-10-27
   teamspeak_client = throw "'teamspeak_client' has been renamed to/replaced by 'teamspeak3'"; # Converted to throw 2025-10-27
   tegaki-zinnia-japanese = throw "'tegaki-zinnia-japanese' has been removed due to lack of maintenance"; # Added 2025-09-10
+  telepathy-haze = throw "'telepathy-haze' has been removed due to being unmaintained and broken since 2023"; # Added 2025-11-04
   temporalite = throw "'temporalite' has been removed as it is obsolete and unmaintained, please use 'temporal-cli' instead (with `temporal server start-dev`)"; # Added 2025-06-26
   temurin-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04
   temurin-jre-bin-24 = throw "Temurin 24 has been removed as it has reached its end of life"; # Added 2025-10-04

From 31224ed929267d80d9722be7dc87ad3ac82e0d48 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 15:09:17 +0100
Subject: [PATCH 5303/6226] cargo-hack: use finalAttrs pattern

---
 pkgs/by-name/ca/cargo-hack/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-hack/package.nix b/pkgs/by-name/ca/cargo-hack/package.nix
index d77072ad3783..d691a8664c9e 100644
--- a/pkgs/by-name/ca/cargo-hack/package.nix
+++ b/pkgs/by-name/ca/cargo-hack/package.nix
@@ -4,12 +4,12 @@
   fetchCrate,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-hack";
   version = "0.6.39";
 
   src = fetchCrate {
-    inherit pname version;
+    inherit (finalAttrs) pname version;
     hash = "sha256-0+2bgjCgkZA8oYo5jkykB2US+LVVNo1tVk4smxYB6f4=";
   };
 
@@ -22,11 +22,11 @@ rustPlatform.buildRustPackage rec {
     description = "Cargo subcommand to provide various options useful for testing and continuous integration";
     mainProgram = "cargo-hack";
     homepage = "https://github.com/taiki-e/cargo-hack";
-    changelog = "https://github.com/taiki-e/cargo-hack/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/taiki-e/cargo-hack/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = with lib.licenses; [
       asl20 # or
       mit
     ];
     maintainers = [ ];
   };
-}
+})

From 4cbf62c0577de50be0a51eed5e9269eef1520fc2 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 15:19:57 +0100
Subject: [PATCH 5304/6226] cargo-hack: add version check

---
 pkgs/by-name/ca/cargo-hack/package.nix | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pkgs/by-name/ca/cargo-hack/package.nix b/pkgs/by-name/ca/cargo-hack/package.nix
index d691a8664c9e..906e756ffca8 100644
--- a/pkgs/by-name/ca/cargo-hack/package.nix
+++ b/pkgs/by-name/ca/cargo-hack/package.nix
@@ -18,6 +18,14 @@ rustPlatform.buildRustPackage (finalAttrs: {
   # some necessary files are absent in the crate version
   doCheck = false;
 
+  # versionCheckHook doesn't support multiple arguments yet
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+    $out/bin/cargo-hack hack --version | grep -F 'cargo-hack ${finalAttrs.version}'
+    runHook postInstallCheck
+  '';
+
   meta = {
     description = "Cargo subcommand to provide various options useful for testing and continuous integration";
     mainProgram = "cargo-hack";

From 12bd34dd7fb8e5dbe3a7e756c80bba49ff073145 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 15:21:09 +0100
Subject: [PATCH 5305/6226] cargo-hack: add updateScript

---
 pkgs/by-name/ca/cargo-hack/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ca/cargo-hack/package.nix b/pkgs/by-name/ca/cargo-hack/package.nix
index 906e756ffca8..166a5ccddd59 100644
--- a/pkgs/by-name/ca/cargo-hack/package.nix
+++ b/pkgs/by-name/ca/cargo-hack/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchCrate,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -26,6 +27,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     runHook postInstallCheck
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Cargo subcommand to provide various options useful for testing and continuous integration";
     mainProgram = "cargo-hack";

From 197bffa8b82a562ddb916c7f933baf2bb71bd752 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 13:07:00 +0100
Subject: [PATCH 5306/6226] cargo-hack: add defelo to maintainers

---
 pkgs/by-name/ca/cargo-hack/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/cargo-hack/package.nix b/pkgs/by-name/ca/cargo-hack/package.nix
index 166a5ccddd59..9f823bb9f775 100644
--- a/pkgs/by-name/ca/cargo-hack/package.nix
+++ b/pkgs/by-name/ca/cargo-hack/package.nix
@@ -38,6 +38,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
       asl20 # or
       mit
     ];
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ defelo ];
   };
 })

From 72e01e413e80806e92d7732e9c7437f8a7a32f84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 29 Oct 2025 17:14:28 +0100
Subject: [PATCH 5307/6226] intel-graphics-compiler: 2.18.5 -> 2.20.3

Changelog: https://github.com/intel/intel-graphics-compiler/releases/tag/v2.20.3
(cherry picked from commit 0ced5e4f5481f0f4c7478cb76ba35358e6b56b4d)
---
 .../intel-graphics-compiler/bump-cmake.patch  | 14 ----------
 .../in/intel-graphics-compiler/package.nix    | 28 +++++++++++--------
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch b/pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch
index 518accce964e..1227b9c0a2f9 100644
--- a/pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch
+++ b/pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch
@@ -8,25 +8,11 @@ are no uses of COMPILE_DEFINITIONS_<CONFIG>.
 
 Signed-off-by: Chris Mayo <aklhfex@gmail.com>
 ---
- IGC/MDAutogen/CMakeLists.txt                    | 2 +-
  external/SPIRV-Tools/CMakeLists.txt             | 2 +-
  visa/CMakeLists.txt                             | 7 +------
  visa/iga/GEDLibrary/GED_external/CMakeLists.txt | 6 +-----
  4 files changed, 4 insertions(+), 13 deletions(-)
 
-diff --git a/IGC/MDAutogen/CMakeLists.txt b/IGC/MDAutogen/CMakeLists.txt
-index c9522feea29d..0a79b3c8e32b 100644
---- a/igc/IGC/MDAutogen/CMakeLists.txt
-+++ b/igc/IGC/MDAutogen/CMakeLists.txt
-@@ -6,7 +6,7 @@
- #
- #============================ end_copyright_notice =============================
- 
--cmake_minimum_required(VERSION 2.8.12)
-+cmake_minimum_required(VERSION 3.5)
- 
- set(_autogenScript "${IGC_SOURCE_DIR}/common/autogen.py")
- set(_autogenSource "${IGC_SOURCE_DIR}/common/MDFrameWork.h")
 diff --git a/external/SPIRV-Tools/CMakeLists.txt b/external/SPIRV-Tools/CMakeLists.txt
 index d2e3f63fb0d3..75f013409990 100644
 --- a/igc/external/SPIRV-Tools/CMakeLists.txt
diff --git a/pkgs/by-name/in/intel-graphics-compiler/package.nix b/pkgs/by-name/in/intel-graphics-compiler/package.nix
index 2c3e65dcf9fe..a2e01d067c74 100644
--- a/pkgs/by-name/in/intel-graphics-compiler/package.nix
+++ b/pkgs/by-name/in/intel-graphics-compiler/package.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   ninja,
   git,
@@ -15,9 +14,12 @@
   spirv-headers,
 }:
 
+let
+  llvmVersion = "16.0.6";
+in
 stdenv.mkDerivation rec {
   pname = "intel-graphics-compiler";
-  version = "2.18.5";
+  version = "2.20.3";
 
   # See the repository for expected versions:
   # <https://github.com/intel/intel-graphics-compiler/blob/v2.16.0/documentation/build_ubuntu.md#revision-table>
@@ -27,35 +29,35 @@ stdenv.mkDerivation rec {
       owner = "intel";
       repo = "intel-graphics-compiler";
       tag = "v${version}";
-      hash = "sha256-AvEeK3rySEu89br4JgeZlXVQ6IXEzStVZYvehzdWq7g=";
+      hash = "sha256-OCou4yhx9rY1JznrzGMLhsjj/3CvqQXfXWFAPDxA8Ds=";
     })
     (fetchFromGitHub {
       name = "llvm-project";
       owner = "llvm";
       repo = "llvm-project";
-      tag = "llvmorg-15.0.7";
-      hash = "sha256-wjuZQyXQ/jsmvy6y1aksCcEDXGBjuhpgngF3XQJ/T4s=";
+      tag = "llvmorg-${llvmVersion}";
+      hash = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs=";
     })
     (fetchFromGitHub {
       name = "vc-intrinsics";
       owner = "intel";
       repo = "vc-intrinsics";
-      tag = "v0.23.1";
-      hash = "sha256-7coQegLcgIKiqnonZmgrKlw6FCB3ltSh6oMMvdopeQc=";
+      tag = "v0.23.4";
+      hash = "sha256-zorhOhBTcymnAlShJxJecXD+HIfScGouhSea/A3tBXE=";
     })
     (fetchFromGitHub {
       name = "opencl-clang";
       owner = "intel";
       repo = "opencl-clang";
-      tag = "v15.0.3";
-      hash = "sha256-JkYFmnDh7Ot3Br/818aLN33COEG7+xyOf8OhdoJX9Cw==";
+      tag = "v16.0.5";
+      hash = "sha256-JfynEsCXltVdVY/LqWvZwzWfzEFUz6nI9Zub+bze1zE=";
     })
     (fetchFromGitHub {
       name = "llvm-spirv";
       owner = "KhronosGroup";
       repo = "SPIRV-LLVM-Translator";
-      tag = "v15.0.15";
-      hash = "sha256-kFVDS+qwoG1AXrZ8LytoiLVbZkTGR9sO+Wrq3VGgWNQ=";
+      tag = "v16.0.17";
+      hash = "sha256-ta5QbVady9/cwBbAwF1r4ft/ESMnLgcmGMrFhv1PCH0=";
     })
   ];
 
@@ -90,6 +92,10 @@ stdenv.mkDerivation rec {
     substituteInPlace llvm-project/llvm/projects/opencl-clang/cmake/modules/CMakeFunctions.cmake \
       --replace-fail 'COMMAND ''${GIT_EXECUTABLE} am --3way --ignore-whitespace -C0 ' \
                      'COMMAND patch -p1 --ignore-whitespace -i '
+
+    # match default LLVM version with our provided version to apply correct patches
+    substituteInPlace igc/external/llvm/llvm_preferred_version.cmake \
+      --replace-fail "15.0.7" "${llvmVersion}"
   '';
 
   nativeBuildInputs = [

From 007c38f4fc89b23bb4f2addfed1175b5278b9d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Wed, 29 Oct 2025 16:57:14 +0100
Subject: [PATCH 5308/6226] intel-compute-runtime: 25.35.35096.9 ->
 25.40.35563.4

Diff: https://github.com/intel/compute-runtime/compare/25.35.35096.9...25.40.35563.4

Changelog: https://github.com/intel/compute-runtime/releases/tag/25.40.35563.4
---
 pkgs/by-name/in/intel-compute-runtime/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix
index 7d00ee756764..658f8986dac9 100644
--- a/pkgs/by-name/in/intel-compute-runtime/package.nix
+++ b/pkgs/by-name/in/intel-compute-runtime/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "intel-compute-runtime";
-  version = "25.35.35096.9";
+  version = "25.40.35563.4";
 
   src = fetchFromGitHub {
     owner = "intel";
     repo = "compute-runtime";
     tag = version;
-    hash = "sha256-GAFbpf5ZUpq+jpVECa5buauCYdpPBOBrREkgrGyhxPA=";
+    hash = "sha256-V2zmS3CFLxhyFYvGOdkix9g3E6JkeVa/pDLPC5NYivo=";
   };
 
   nativeBuildInputs = [

From 4a781922b3a1231c49203a92470410030837e0a3 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Tue, 4 Nov 2025 15:26:29 +0100
Subject: [PATCH 5309/6226] electron-source.electron_36: remove

---
 pkgs/development/tools/electron/common.nix |   76 +-
 pkgs/development/tools/electron/info.json  | 1324 --------------------
 pkgs/top-level/all-packages.nix            |    6 +-
 3 files changed, 13 insertions(+), 1393 deletions(-)

diff --git a/pkgs/development/tools/electron/common.nix b/pkgs/development/tools/electron/common.nix
index c28c0690bb79..dbfe917ed23d 100644
--- a/pkgs/development/tools/electron/common.nix
+++ b/pkgs/development/tools/electron/common.nix
@@ -65,73 +65,23 @@ in
   unpackPhase = null; # prevent chromium's unpackPhase from being used
   sourceRoot = "src";
 
-  env =
-    base.env
-    // {
-      # Hydra can fail to build electron due to clang spamming deprecation
-      # warnings mid-build, causing the build log to grow beyond the limit
-      # of 64mb and then getting killed by Hydra.
-      # For some reason, the log size limit appears to only be enforced on
-      # aarch64-linux. x86_64-linux happily succeeds to build with ~180mb. To
-      # unbreak the build on h.n.o, we simply disable those warnings for now.
-      # https://hydra.nixos.org/build/283952243
-      NIX_CFLAGS_COMPILE = base.env.NIX_CFLAGS_COMPILE + " -Wno-deprecated";
-    }
-    // lib.optionalAttrs (lib.versionAtLeast info.version "35") {
-      # Needed for header generation in electron 35 and above
-      ELECTRON_OUT_DIR = "Release";
-    };
+  env = base.env // {
+    # Hydra can fail to build electron due to clang spamming deprecation
+    # warnings mid-build, causing the build log to grow beyond the limit
+    # of 64mb and then getting killed by Hydra.
+    # For some reason, the log size limit appears to only be enforced on
+    # aarch64-linux. x86_64-linux happily succeeds to build with ~180mb. To
+    # unbreak the build on h.n.o, we simply disable those warnings for now.
+    # https://hydra.nixos.org/build/283952243
+    NIX_CFLAGS_COMPILE = base.env.NIX_CFLAGS_COMPILE + " -Wno-deprecated";
+    # Needed for header generation in electron 35 and above
+    ELECTRON_OUT_DIR = "Release";
+  };
 
   src = null;
 
   patches =
     base.patches
-    # Fix building with Rust 1.87+
-    # https://issues.chromium.org/issues/407024458
-    ++ lib.optionals (lib.versionOlder info.version "37") [
-      # https://chromium-review.googlesource.com/c/chromium/src/+/6432410
-      # Not using fetchpatch here because it ignores file renames: https://github.com/nixos/nixpkgs/issues/32084
-      ./Reland-Use-global_allocator-to-provide-Rust-allocator-implementation.patch
-
-      # https://chromium-review.googlesource.com/c/chromium/src/+/6434355
-      (fetchpatch {
-        name = "Call-Rust-default-allocator-directly-from-Rust.patch";
-        url = "https://github.com/chromium/chromium/commit/73eef8797a8138f5c26f52a1372644b20613f5ee.patch";
-        hash = "sha256-IcSjPv21xT+l9BwJuzeW2AfwBdKI0dQb3nskk6yeKHU=";
-      })
-
-      # https://chromium-review.googlesource.com/c/chromium/src/+/6439711
-      (fetchpatch {
-        name = "Roll-rust.patch";
-        url = "https://github.com/chromium/chromium/commit/a6c30520486be844735dc646cd5b9b434afa0c6b.patch";
-        includes = [ "build/rust/allocator/*" ];
-        hash = "sha256-MFdR75oSAdFW6telEZt/s0qdUvq/BiYFEHW0vk+RgDk=";
-      })
-
-      # https://chromium-review.googlesource.com/c/chromium/src/+/6456604
-      (fetchpatch {
-        name = "Drop-remap_alloc-dep.patch";
-        url = "https://github.com/chromium/chromium/commit/87d5ad2f621e0d5c81849dde24f3a5347efcb167.patch";
-        hash = "sha256-bEoR6jxEyw6Fzm4Zv4US54Cxa0li/0UTZTU2WUf0Rgo=";
-      })
-
-      # https://chromium-review.googlesource.com/c/chromium/src/+/6454872
-      (fetchpatch {
-        name = "rust-Clean-up-build-rust-allocator-after-a-Rust-tool.patch";
-        url = "https://github.com/chromium/chromium/commit/5c74fcf6fd14491f33dd820022a9ca045f492f68.patch";
-        hash = "sha256-vcD0Zfo4Io/FVpupWOdgurFEqwFCv+oDOtSmHbm+ons=";
-      })
-    ]
-    # Fix building with gperf 3.2+
-    # https://issues.chromium.org/issues/40209959
-    ++ lib.optionals (lib.versionOlder info.version "37") [
-      # https://chromium-review.googlesource.com/c/chromium/src/+/6445471
-      (fetchpatch {
-        name = "Dont-apply-FALLTHROUGH-edit-to-gperf-3-2-output.patch";
-        url = "https://github.com/chromium/chromium/commit/f8f21fb4aa01f75acbb12abf5ea8c263c6817141.patch";
-        hash = "sha256-z/aQ1oQjFZnkUeRnrD6P/WDZiYAI1ncGhOUM+HmjMZA=";
-      })
-    ]
     # Fix build with Rust 1.89.0
     ++ lib.optionals (lib.versionOlder info.version "38") [
       # https://chromium-review.googlesource.com/c/chromium/src/+/6624733
@@ -233,8 +183,6 @@ in
         done
       done
     )
-  ''
-  + lib.optionalString (lib.versionAtLeast info.version "36") ''
     echo 'checkout_glic_e2e_tests = false' >> build/config/gclient_args.gni
     echo 'checkout_mutter = false' >> build/config/gclient_args.gni
   ''
diff --git a/pkgs/development/tools/electron/info.json b/pkgs/development/tools/electron/info.json
index e3376fa7121c..e14995245470 100644
--- a/pkgs/development/tools/electron/info.json
+++ b/pkgs/development/tools/electron/info.json
@@ -1,1328 +1,4 @@
 {
-    "36": {
-        "chrome": "136.0.7103.177",
-        "chromium": {
-            "deps": {
-                "gn": {
-                    "hash": "sha256-MnGl+D9ahQibUHCtyOUf1snvmeupUn4D2yrDj55JTe4=",
-                    "rev": "6e8e0d6d4a151ab2ed9b4a35366e630c55888444",
-                    "version": "0-unstable-2025-03-24"
-                }
-            },
-            "version": "136.0.7103.177"
-        },
-        "chromium_npm_hash": "sha256-QRjk9X4rJW3ofizK33R4T1qym1riqcnpBhDF+FfNZLo=",
-        "deps": {
-            "src": {
-                "args": {
-                    "hash": "sha256-KrRUazCSb+X51EeffwoZ4Iniok1CMpAu2hP7IzgwX7U=",
-                    "postFetch": "rm -r $out/third_party/blink/web_tests; rm -r $out/content/test/data; rm -rf $out/courgette/testdata; rm -r $out/extensions/test/data; rm -r $out/media/test/data; ",
-                    "tag": "136.0.7103.177",
-                    "url": "https://chromium.googlesource.com/chromium/src.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/chrome/test/data/perf/canvas_bench": {
-                "args": {
-                    "hash": "sha256-svOuyBGKloBLM11xLlWCDsB4PpRjdKTBdW2UEW4JQjM=",
-                    "rev": "a7b40ea5ae0239517d78845a5fc9b12976bfc732",
-                    "url": "https://chromium.googlesource.com/chromium/canvas_bench.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/chrome/test/data/perf/frame_rate/content": {
-                "args": {
-                    "hash": "sha256-t4kcuvH0rkPBkcdiMsoNQaRwU09eU+oSvyHDiAHrKXo=",
-                    "rev": "c10272c88463efeef6bb19c9ec07c42bc8fe22b9",
-                    "url": "https://chromium.googlesource.com/chromium/frame_rate/content.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/chrome/test/data/xr/webvr_info": {
-                "args": {
-                    "hash": "sha256-BsAPwc4oEWri0TlqhyxqFNqKdfgVSrB0vQyISmYY4eg=",
-                    "rev": "c58ae99b9ff9e2aa4c524633519570bf33536248",
-                    "url": "https://chromium.googlesource.com/external/github.com/toji/webvr.info.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/docs/website": {
-                "args": {
-                    "hash": "sha256-lY4P2f90/9JwCpxuBFjim7KygczM8zMDQVUaEYaQjnA=",
-                    "rev": "929dd3e6d02aac1f46653d03b2a644e2873a3bbb",
-                    "url": "https://chromium.googlesource.com/website.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/electron": {
-                "args": {
-                    "hash": "sha256-2oJRD32zDb26fieeW+q+n/8xlF9V7GgePYhRn6QSuKs=",
-                    "owner": "electron",
-                    "repo": "electron",
-                    "tag": "v36.9.5"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/media/cdm/api": {
-                "args": {
-                    "hash": "sha256-FgeuOsxToA4qx3H76czCPeO/WVtprRkllDMPancw3Ik=",
-                    "rev": "5a1675c86821a48f8983842d07f774df28dfb43c",
-                    "url": "https://chromium.googlesource.com/chromium/cdm.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/net/third_party/quiche/src": {
-                "args": {
-                    "hash": "sha256-CLvZTBvtTdOpC8eWUTWkb0ITJ5EViPmc6d5O8cTaKY8=",
-                    "rev": "5077431b183c43f10890b865fc9f02a4dcf1dd85",
-                    "url": "https://quiche.googlesource.com/quiche.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/testing/libfuzzer/fuzzers/wasm_corpus": {
-                "args": {
-                    "hash": "sha256-gItDOfNqm1tHlmelz3l2GGdiKi9adu1EpPP6U7+8EQY=",
-                    "rev": "1df5e50a45db9518a56ebb42cb020a94a090258b",
-                    "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/accessibility_test_framework/src": {
-                "args": {
-                    "hash": "sha256-mzVgoxxBWebesG6okyMxxmO6oH+TITA4o9ucHHMMzkQ=",
-                    "rev": "4a764c690353ea136c82f1a696a70bf38d1ef5fe",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/Accessibility-Test-Framework-for-Android.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/angle": {
-                "args": {
-                    "hash": "sha256-bIpN9lehrKpJYBKLeo8Szz0/aVe7NU2Eo2NIO5dAZ9w=",
-                    "rev": "fa40b7c586fd2da9fd7e5c4d893ecb1334553b9e",
-                    "url": "https://chromium.googlesource.com/angle/angle.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/angle/third_party/VK-GL-CTS/src": {
-                "args": {
-                    "hash": "sha256-L2ewIW6C+PTftbbXf+nlWcFD0y4naBNg7FLXMMxiWac=",
-                    "rev": "b6bb4bab7b4a36bc95566e00cb8f01051089afc3",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/angle/third_party/glmark2/src": {
-                "args": {
-                    "hash": "sha256-VebUALLFKwEa4+oE+jF8mBSzhJd6aflphPmcK1Em8bw=",
-                    "rev": "6edcf02205fd1e8979dc3f3964257a81959b80c8",
-                    "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/angle/third_party/rapidjson/src": {
-                "args": {
-                    "hash": "sha256-btUl1a/B0sXwf/+hyvCvVJjWqIkXfVYCpHm3TeBuOxk=",
-                    "rev": "781a4e667d84aeedbeb8184b7b62425ea66ec59f",
-                    "url": "https://chromium.googlesource.com/external/github.com/Tencent/rapidjson"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/anonymous_tokens/src": {
-                "args": {
-                    "hash": "sha256-GaRtZmYqajLUpt7ToRfMLBlyMiJB5yT9BaaT9pHH7OM=",
-                    "rev": "d708a2602a5947ee068f784daa1594a673d47c4a",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/beto-core/src": {
-                "args": {
-                    "hash": "sha256-QPFGjtu/I0r4+dTQ2eSlWIEYwJ43B3yW0q4QtVFTVGY=",
-                    "rev": "89563fec14c756482afa08b016eeba9087c8d1e3",
-                    "url": "https://beto-core.googlesource.com/beto-core.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/boringssl/src": {
-                "args": {
-                    "hash": "sha256-fUPl9E2b7RfanH0pZNArIkJ4lnnmCtyk7sCaTArCB70=",
-                    "rev": "a9993612faac4866bc33ca8ff37bfd0659af1c48",
-                    "url": "https://boringssl.googlesource.com/boringssl.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/breakpad/breakpad": {
-                "args": {
-                    "hash": "sha256-9MePkv10fwyJ0VDWRtvRcbLMAcJzZlziGTPzXJYjVJE=",
-                    "rev": "657a441e5c1a818d4c10b7bafd431454e6614901",
-                    "url": "https://chromium.googlesource.com/breakpad/breakpad.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cast_core/public/src": {
-                "args": {
-                    "hash": "sha256-yQxm1GMMne80bLl1P7OAN3bJLz1qRNAvou2/5MKp2ig=",
-                    "rev": "f5ee589bdaea60418f670fa176be15ccb9a34942",
-                    "url": "https://chromium.googlesource.com/cast_core/public"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/catapult": {
-                "args": {
-                    "hash": "sha256-xwR9gGE8uU8qFr7GgS3/1JiuTmj1tvcM5CoCfPMdW2M=",
-                    "rev": "5bda0fdab9d93ec9963e2cd858c7b49ad7fec7d4",
-                    "url": "https://chromium.googlesource.com/catapult.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ced/src": {
-                "args": {
-                    "hash": "sha256-ySG74Rj2i2c/PltEgHVEDq+N8yd9gZmxNktc56zIUiY=",
-                    "rev": "ba412eaaacd3186085babcd901679a48863c7dd5",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/clang-format/script": {
-                "args": {
-                    "hash": "sha256-d9uweklBffiuCWEb03ti1eFLnMac2qRtvggzXY1n/RU=",
-                    "rev": "37f6e68a107df43b7d7e044fd36a13cbae3413f2",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cld_3/src": {
-                "args": {
-                    "hash": "sha256-C3MOMBUy9jgkT9BAi/Fgm2UH4cxRuwSBEcRl3hzM2Ss=",
-                    "rev": "b48dc46512566f5a2d41118c8c1116c4f96dc661",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/cld_3.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/colorama/src": {
-                "args": {
-                    "hash": "sha256-6ZTdPYSHdQOLYMSnE+Tp7PgsVTs3U2awGu9Qb4Rg/tk=",
-                    "rev": "3de9f013df4b470069d03d250224062e8cf15c49",
-                    "url": "https://chromium.googlesource.com/external/colorama.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/compiler-rt/src": {
-                "args": {
-                    "hash": "sha256-bfDMglQaiExTFwaVBroia+6G+9AHEVy5cQGocaEVOgA=",
-                    "rev": "bc2b30185219a2defe3c8a3b45f95a11386a7f6f",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/content_analysis_sdk/src": {
-                "args": {
-                    "hash": "sha256-f5Jmk1MiGjaRdLun+v/GKVl8Yv9hOZMTQUSxgiJalcY=",
-                    "rev": "9a408736204513e0e95dd2ab3c08de0d95963efc",
-                    "url": "https://chromium.googlesource.com/external/github.com/chromium/content_analysis_sdk.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cpu_features/src": {
-                "args": {
-                    "hash": "sha256-E8LoVzhe+TAmARWZTSuINlsVhzpUJMxPPCGe/dHZcyA=",
-                    "rev": "936b9ab5515dead115606559502e3864958f7f6e",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cpuinfo/src": {
-                "args": {
-                    "hash": "sha256-JNLaK105qDk9DxTqCFyXFfYn46dF+nZIaF5urSVRa0U=",
-                    "rev": "b73ae6ce38d5dd0b7fe46dbe0a4b5f4bab91c7ea",
-                    "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/crabbyavif/src": {
-                "args": {
-                    "hash": "sha256-T9ibgp0glfY5EhwMiwlvXKZat0InDu7PoqE1H8/lS5A=",
-                    "rev": "02d0fad2c512380b7270d6e704c86521075d7d54",
-                    "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/crc32c/src": {
-                "args": {
-                    "hash": "sha256-KBraGaO5LmmPP+p8RuDogGldbTWdNDK+WzF4Q09keuE=",
-                    "rev": "d3d60ac6e0f16780bcfcc825385e1d338801a558",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cros-components/src": {
-                "args": {
-                    "hash": "sha256-CT9c4LqTwhldsxoEny8MesULwQC4k95F4tfCtRZErGM=",
-                    "rev": "97dc8c7a1df880206cc54d9913a7e9d73677072a",
-                    "url": "https://chromium.googlesource.com/external/google3/cros_components.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/cros_system_api": {
-                "args": {
-                    "hash": "sha256-pZi6GRu7OGL7jbN4FM2qDsLCsT6cM+RM0a7XtFZVSVE=",
-                    "rev": "62ab80355a8194e051bd1d93a5c09093c7645a32",
-                    "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/crossbench": {
-                "args": {
-                    "hash": "sha256-Q0kdJdEmh+wbO5oeTp98OHKh9luz8u6PDztGToldZjk=",
-                    "rev": "ce46be2573328fa7b0fd1d23c04b63389f298122",
-                    "url": "https://chromium.googlesource.com/crossbench.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dav1d/libdav1d": {
-                "args": {
-                    "hash": "sha256-+DY4p41VuAlx7NvOfXjWzgEhvtpebjkjbFwSYOzSjv4=",
-                    "rev": "8d956180934f16244bdb58b39175824775125e55",
-                    "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn": {
-                "args": {
-                    "hash": "sha256-VK+5saAJlZOluMAYKTKwNcnZALsCYkzgVfQHylt3584=",
-                    "rev": "1cffe7ec763900d104e4df62bc96d93f572157cb",
-                    "url": "https://dawn.googlesource.com/dawn.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/dxc": {
-                "args": {
-                    "hash": "sha256-WXgiOlqtczrUkXp46Q/GTaYk0LDqebQSFbyWpD299Xw=",
-                    "rev": "206b77577d15fc5798eb7ad52290388539b7146d",
-                    "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/dxheaders": {
-                "args": {
-                    "hash": "sha256-0Miw1Cy/jmOo7bLFBOHuTRDV04cSeyvUEyPkpVsX9DA=",
-                    "rev": "980971e835876dc0cde415e8f9bc646e64667bf7",
-                    "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/glfw": {
-                "args": {
-                    "hash": "sha256-E1zXIDiw87badrLOZTvV+Wh9NZHu51nb70ZK9vlAlqE=",
-                    "rev": "b35641f4a3c62aa86a0b3c983d163bc0fe36026d",
-                    "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/khronos/EGL-Registry": {
-                "args": {
-                    "hash": "sha256-Z6DwLfgQ1wsJXz0KKJyVieOatnDmx3cs0qJ6IEgSq1A=",
-                    "rev": "7dea2ed79187cd13f76183c4b9100159b9e3e071",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/khronos/OpenGL-Registry": {
-                "args": {
-                    "hash": "sha256-K3PcRIiD3AmnbiSm5TwaLs4Gu9hxaN8Y91WMKK8pOXE=",
-                    "rev": "5bae8738b23d06968e7c3a41308568120943ae77",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dawn/third_party/webgpu-cts": {
-                "args": {
-                    "hash": "sha256-WTVOc2EVB/DJ4aDeB8XIF/ff6LSeEUMt2Xkvj5Hu4aU=",
-                    "rev": "5fbd82847521cb2d584773facd56c2eb6a4df180",
-                    "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/depot_tools": {
-                "args": {
-                    "hash": "sha256-O9vVbrCqHD4w39Q8ZAxl1RwzJxbH/thjqacMtCnOPdg=",
-                    "rev": "f40ddcd8d51626fb7be3ab3c418b3f3be801623f",
-                    "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/devtools-frontend/src": {
-                "args": {
-                    "hash": "sha256-5gbDmUfJI6kGKGxcbDp0CbmLr8ppvz63Nk5HV0XmMBo=",
-                    "rev": "cb82c1525a5b3d277d427b908a21a87489bec532",
-                    "url": "https://chromium.googlesource.com/devtools/devtools-frontend"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/dom_distiller_js/dist": {
-                "args": {
-                    "hash": "sha256-yuEBD2XQlV3FGI/i7lTmJbCqzeBiuG1Qow8wvsppGJw=",
-                    "rev": "199de96b345ada7c6e7e6ba3d2fa7a6911b8767d",
-                    "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/domato/src": {
-                "args": {
-                    "hash": "sha256-fYxoA0fxKe9U23j+Jp0MWj4m7RfsRpM0XjF6/yOhX1I=",
-                    "rev": "053714bccbda79cf76dac3fee48ab2b27f21925e",
-                    "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/eigen3/src": {
-                "args": {
-                    "hash": "sha256-OJyfUyiR8PFSaWltx6Ig0RCB+LxPxrPtc0GUfu2dKrk=",
-                    "rev": "464c1d097891a1462ab28bf8bb763c1683883892",
-                    "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/electron_node": {
-                "args": {
-                    "hash": "sha256-UiyMCw/ci9btcROpq6pJd5ur92hJzfRLjn6Bl2k7mcY=",
-                    "owner": "nodejs",
-                    "repo": "node",
-                    "tag": "v22.19.0"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/emoji-segmenter/src": {
-                "args": {
-                    "hash": "sha256-KdQdKBBipEBRT8UmNGao6yCB4m2CU8/SrMVvcXlb5qE=",
-                    "rev": "955936be8b391e00835257059607d7c5b72ce744",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/emoji-segmenter.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/engflow-reclient-configs": {
-                "args": {
-                    "hash": "sha256-aZXYPj9KYBiZnljqOLlWJWS396Fg3EhjiQLZmkwCBsY=",
-                    "owner": "EngFlow",
-                    "repo": "reclient-configs",
-                    "rev": "955335c30a752e9ef7bff375baab5e0819b6c00d"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/expat/src": {
-                "args": {
-                    "hash": "sha256-Iwu9+i/0vsPyu6pOWFxjNNblVxMl6bTPW5eWyaju4Mg=",
-                    "rev": "624da0f593bb8d7e146b9f42b06d8e6c80d032a3",
-                    "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/farmhash/src": {
-                "args": {
-                    "hash": "sha256-5n58VEUxa/K//jAfZqG4cXyfxrp50ogWDNYcgiXVHdc=",
-                    "rev": "816a4ae622e964763ca0862d9dbd19324a1eaf45",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/fast_float/src": {
-                "args": {
-                    "hash": "sha256-CG5je117WYyemTe5PTqznDP0bvY5TeXn8Vu1Xh5yUzQ=",
-                    "rev": "cb1d42aaa1e14b09e1452cfdef373d051b8c02a4",
-                    "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ffmpeg": {
-                "args": {
-                    "hash": "sha256-bGa0BCvzNxEKu9VZEwJ1NLt+b2KKWUxshpKSN2FHNEM=",
-                    "rev": "fbce2a76c00cd2e5aeffe3c2e71d44c284ec52d6",
-                    "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/flac": {
-                "args": {
-                    "hash": "sha256-gvTFPNOlBfozptaH7lTb9iD/09AmpdT3kCl9ClszjEs=",
-                    "rev": "689da3a7ed50af7448c3f1961d1791c7c1d9c85c",
-                    "url": "https://chromium.googlesource.com/chromium/deps/flac.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/flatbuffers/src": {
-                "args": {
-                    "hash": "sha256-tbc45o0MbMvK5XqRUJt5Eg8BU6+TJqlmwFgQhHq6wRM=",
-                    "rev": "8db59321d9f02cdffa30126654059c7d02f70c32",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/flatbuffers.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/fontconfig/src": {
-                "args": {
-                    "hash": "sha256-W5WIgC6A52kY4fNkbsDEa0o+dfd97Rl5NKfgnIRpI00=",
-                    "rev": "14d466b30a8ab4a9d789977ed94f2c30e7209267",
-                    "url": "https://chromium.googlesource.com/external/fontconfig.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/fp16/src": {
-                "args": {
-                    "hash": "sha256-m2d9bqZoGWzuUPGkd29MsrdscnJRtuIkLIMp3fMmtRY=",
-                    "rev": "0a92994d729ff76a58f692d3028ca1b64b145d91",
-                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FP16.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/freetype-testing/src": {
-                "args": {
-                    "hash": "sha256-cpzz5QDeAT3UgAZzwW7c0SgLDQsBwy/1Q+5hz2XW4lE=",
-                    "rev": "04fa94191645af39750f5eff0a66c49c5cb2c2cc",
-                    "url": "https://chromium.googlesource.com/external/github.com/freetype/freetype2-testing.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/freetype/src": {
-                "args": {
-                    "hash": "sha256-LhSIX7X0+dmLADYGNclg73kIrXmjTMM++tJ92MKzanA=",
-                    "rev": "82090e67c24259c343c83fd9cefe6ff0be7a7eca",
-                    "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/fuzztest/src": {
-                "args": {
-                    "hash": "sha256-Dz7DqucOxr5HzLNOdGNOG4iMw66bkOj64qOvqeADTic=",
-                    "rev": "c31f0c0e6df5725c6b03124b579c9cf815fd10f4",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/fxdiv/src": {
-                "args": {
-                    "hash": "sha256-LjX5kivfHbqCIA5pF9qUvswG1gjOFo3CMpX0VR+Cn38=",
-                    "rev": "63058eff77e11aa15bf531df5dd34395ec3017c8",
-                    "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/gemmlowp/src": {
-                "args": {
-                    "hash": "sha256-O5wD8wxgis0qYMaY+xZ21GBDVQFphMRvInCOswS6inA=",
-                    "rev": "13d57703abca3005d97b19df1f2db731607a7dc2",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/gemmlowp.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/glslang/src": {
-                "args": {
-                    "hash": "sha256-nr7pGPNPMbmL/XnL27M4m5in8qnCDcpNtVsxBAc7zms=",
-                    "rev": "e57f993cff981c8c3ffd38967e030f04d13781a9",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/google_benchmark/src": {
-                "args": {
-                    "hash": "sha256-cH8s1gP6kCcojAAfTt5iQCVqiAaSooNk4BdaILujM3w=",
-                    "rev": "761305ec3b33abf30e08d50eb829e19a802581cc",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/benchmark.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/googletest/src": {
-                "args": {
-                    "hash": "sha256-8keF4E6ag/rikv5ROaWUB7oganjViupEAdxW1NJVgmE=",
-                    "rev": "52204f78f94d7512df1f0f3bea1d47437a2c3a58",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/harfbuzz-ng/src": {
-                "args": {
-                    "hash": "sha256-/WNGrvyvJ+FGqoIoHapaux1iu63zjID0yR30HYPpxaw=",
-                    "rev": "8efd2d85c78fbba6ca09a3e454f77525f3b296ce",
-                    "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/highway/src": {
-                "args": {
-                    "hash": "sha256-IS7m1wBwpPBUNhx2GttY1fzvmLIeAp3o2gXfrFpRdvY=",
-                    "rev": "00fe003dac355b979f36157f9407c7c46448958e",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/highway.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/hunspell_dictionaries": {
-                "args": {
-                    "hash": "sha256-67mvpJRFFa9eMfyqFMURlbxOaTJBICnk+gl0b0mEHl8=",
-                    "rev": "41cdffd71c9948f63c7ad36e1fb0ff519aa7a37e",
-                    "url": "https://chromium.googlesource.com/chromium/deps/hunspell_dictionaries.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/icu": {
-                "args": {
-                    "hash": "sha256-Omv4sp9z44eINXtaE0+1TzIU1q2hWviANA79fmkF78U=",
-                    "rev": "c9fb4b3a6fb54aa8c20a03bbcaa0a4a985ffd34b",
-                    "url": "https://chromium.googlesource.com/chromium/deps/icu.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ink/src": {
-                "args": {
-                    "hash": "sha256-sMqSHYs3lvuHXEov1K9xWRd8tUPG00QBJl6an0zrxwA=",
-                    "rev": "c542d619a8959415beda5a76fe89ffa2f83df886",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/ink.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ink_stroke_modeler/src": {
-                "args": {
-                    "hash": "sha256-XMLW/m+Qx+RVgo1DeYggBLjUYg/M+2eHwgjVWrA/Erw=",
-                    "rev": "f61f28792a00c9bdcb3489fec81d8fd0ca1cbaba",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/ink-stroke-modeler.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/instrumented_libs": {
-                "args": {
-                    "hash": "sha256-8kokdsnn5jD9KgM/6g0NuITBbKkGXWEM4BMr1nCrfdU=",
-                    "rev": "69015643b3f68dbd438c010439c59adc52cac808",
-                    "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/jetstream/main": {
-                "args": {
-                    "hash": "sha256-DbRup4tOAYv27plzB2JKi2DBX2FVMDtFR7AzuovXUDU=",
-                    "rev": "0260caf74b5c115507ee0adb6d9cdf6aefb0965f",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/jetstream/v2.2": {
-                "args": {
-                    "hash": "sha256-zucA2tqNOsvjhwYQKZ5bFUC73ZF/Fu7KpBflSelvixw=",
-                    "rev": "2145cedef4ca2777b792cb0059d3400ee2a6153c",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/jsoncpp/source": {
-                "args": {
-                    "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=",
-                    "rev": "42e892d96e47b1f6e29844cc705e148ec4856448",
-                    "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/leveldatabase/src": {
-                "args": {
-                    "hash": "sha256-ANtMVRZmW6iOjDVn2y15ak2fTagFTTaz1Se6flUHL8w=",
-                    "rev": "4ee78d7ea98330f7d7599c42576ca99e3c6ff9c5",
-                    "url": "https://chromium.googlesource.com/external/leveldb.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libFuzzer/src": {
-                "args": {
-                    "hash": "sha256-Lb+HczYax0T7qvC0/Nwhc5l2szQTUYDouWRMD/Qz7sA=",
-                    "rev": "e31b99917861f891308269c36a32363b120126bb",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt/lib/fuzzer.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libaddressinput/src": {
-                "args": {
-                    "hash": "sha256-6h4/DQUBoBtuGfbaTL5Te1Z+24qjTaBuIydcTV18j80=",
-                    "rev": "2610f7b1043d6784ada41392fc9392d1ea09ea07",
-                    "url": "https://chromium.googlesource.com/external/libaddressinput.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libaom/source/libaom": {
-                "args": {
-                    "hash": "sha256-nfnt5JXyKR9JR3BflpGEkwzDo0lYa/oeCDm2bKH/j1g=",
-                    "rev": "9680f2b1781fb33b9eeb52409b75c679c8a954be",
-                    "url": "https://aomedia.googlesource.com/aom.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libc++/src": {
-                "args": {
-                    "hash": "sha256-Ypi5fmWdoNA1IZDoKITlkNRITmho8HzVlgjlmtx0Y84=",
-                    "rev": "449310fe2e37834a7e62972d2a690cade2ef596b",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libc++abi/src": {
-                "args": {
-                    "hash": "sha256-wMMfj3E2AQJxovoSEIuT2uTyrcGBurS1HrHZOmP36+g=",
-                    "rev": "94c5d7a8edc09f0680aee57548c0b5d400c2840d",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libdrm/src": {
-                "args": {
-                    "hash": "sha256-woSYEDUfcEBpYOYnli13wLMt754A7KnUbmTEcFQdFGw=",
-                    "rev": "ad78bb591d02162d3b90890aa4d0a238b2a37cde",
-                    "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libgav1/src": {
-                "args": {
-                    "hash": "sha256-BgTfWmbcMvJB1KewJpRcMtbOd2FVuJ+fi1zAXBXfkrg=",
-                    "rev": "c05bf9be660cf170d7c26bd06bb42b3322180e58",
-                    "url": "https://chromium.googlesource.com/codecs/libgav1.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libipp/libipp": {
-                "args": {
-                    "hash": "sha256-gxU92lHLd6uxO8T3QWhZIK0hGy97cki705DV0VimCPY=",
-                    "rev": "2209bb84a8e122dab7c02fe66cc61a7b42873d7f",
-                    "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libjpeg_turbo": {
-                "args": {
-                    "hash": "sha256-Ig+tmprZDvlf/M72/DTar2pbxat9ZElgSqdXdoM0lPs=",
-                    "rev": "e14cbfaa85529d47f9f55b0f104a579c1061f9ad",
-                    "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/liblouis/src": {
-                "args": {
-                    "hash": "sha256-EI/uaHXe0NlqdEw764q0SjerThYEVLRogUlmrsZwXnY=",
-                    "rev": "9700847afb92cb35969bdfcbbfbbb74b9c7b3376",
-                    "url": "https://chromium.googlesource.com/external/liblouis-github.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libphonenumber/dist": {
-                "args": {
-                    "hash": "sha256-ZbuDrZEUVp/ekjUP8WO/FsjAomRjeDBptT4nQZvTVi4=",
-                    "rev": "9d46308f313f2bf8dbce1dfd4f364633ca869ca7",
-                    "url": "https://chromium.googlesource.com/external/libphonenumber.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libprotobuf-mutator/src": {
-                "args": {
-                    "hash": "sha256-EaEC6R7SzqLw4QjEcWXFXhZc84lNBp6RSa9izjGnWKE=",
-                    "rev": "7bf98f78a30b067e22420ff699348f084f802e12",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libsrtp": {
-                "args": {
-                    "hash": "sha256-bkG1+ss+1a2rCHGwZjhvf5UaNVbPPZJt9HZSIPBKGwM=",
-                    "rev": "a52756acb1c5e133089c798736dd171567df11f5",
-                    "url": "https://chromium.googlesource.com/chromium/deps/libsrtp.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libsync/src": {
-                "args": {
-                    "hash": "sha256-Mkl6C1LxF3RYLwYbxiSfoQPt8QKFwQWj/Ati2sNJ32E=",
-                    "rev": "f4f4387b6bf2387efbcfd1453af4892e8982faf6",
-                    "url": "https://chromium.googlesource.com/aosp/platform/system/core/libsync.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libunwind/src": {
-                "args": {
-                    "hash": "sha256-LdRaxPo2i7uMeFxpR7R4o3V+1ycBcygT/D+gklsD0tA=",
-                    "rev": "e2e6f2a67e9420e770b014ce9bba476fa2ab9874",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libva-fake-driver/src": {
-                "args": {
-                    "hash": "sha256-em/8rNqwv6szlxyji7mnYr3nObSW/x3OzEEnkiLuqpI=",
-                    "rev": "a9bcab9cd6b15d4e3634ca44d5e5f7652c612194",
-                    "url": "https://chromium.googlesource.com/chromiumos/platform/libva-fake-driver.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libvpx/source/libvpx": {
-                "args": {
-                    "hash": "sha256-+4I6B1aTa+txhey6LMeflU0pe39V6TJ+lNIJPh6yFGM=",
-                    "rev": "027bbee30a0103b99d86327b48d29567fed11688",
-                    "url": "https://chromium.googlesource.com/webm/libvpx.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libwebm/source": {
-                "args": {
-                    "hash": "sha256-t7An0vYzukel0poLaU4t2k78k3tTR5didbcV47cGWxQ=",
-                    "rev": "e79a98159fdf6d1aa37b3500e32c6410a2cbe268",
-                    "url": "https://chromium.googlesource.com/webm/libwebm.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libwebp/src": {
-                "args": {
-                    "hash": "sha256-0sKGhXr6Rrpq0eoitAdLQ4l4fgNOzMWIEICrPyzwNz4=",
-                    "rev": "2af6c034ac871c967e04c8c9f8bf2dbc2e271b18",
-                    "url": "https://chromium.googlesource.com/webm/libwebp.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/libyuv": {
-                "args": {
-                    "hash": "sha256-8sH11psWPXLMy3Q0tAizCZ/woUWvTCCUf44jcr2C4Xs=",
-                    "rev": "ccdf870348764e4b77fa3b56accb2a896a901bad",
-                    "url": "https://chromium.googlesource.com/libyuv/libyuv.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/llvm-libc/src": {
-                "args": {
-                    "hash": "sha256-9Ieaxe0PFIIP4RttODd8pTw/zVjQZGZtaYSybwnzTz0=",
-                    "rev": "97989c1bfa112c81f6499487fedc661dcf6d3b2e",
-                    "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/lss": {
-                "args": {
-                    "hash": "sha256-rhp4EcZYdgSfu9cqn+zxxGx6v2IW8uX8V+iA0UfZhFY=",
-                    "rev": "ed31caa60f20a4f6569883b2d752ef7522de51e0",
-                    "url": "https://chromium.googlesource.com/linux-syscall-support.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/material_color_utilities/src": {
-                "args": {
-                    "hash": "sha256-Y85XU+z9W6tvmDNHJ/dXQnUKXvvDkO3nH/kUJRLqbc4=",
-                    "rev": "13434b50dcb64a482cc91191f8cf6151d90f5465",
-                    "url": "https://chromium.googlesource.com/external/github.com/material-foundation/material-color-utilities.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/minigbm/src": {
-                "args": {
-                    "hash": "sha256-9HwvjTETerbQ7YKXH9kUB2eWa8PxGWMAJfx1jAluhrs=",
-                    "rev": "3018207f4d89395cc271278fb9a6558b660885f5",
-                    "url": "https://chromium.googlesource.com/chromiumos/platform/minigbm.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/nan": {
-                "args": {
-                    "hash": "sha256-cwti+BWmF/l/dqa/cN0C587EK4WwRWcWy6gjFVkaMTg=",
-                    "owner": "nodejs",
-                    "repo": "nan",
-                    "rev": "e14bdcd1f72d62bca1d541b66da43130384ec213"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/nasm": {
-                "args": {
-                    "hash": "sha256-yg4qwhS68B/sWfcJeXUqPC69ppE8FaIyRc+IkUQXSnU=",
-                    "rev": "767a169c8811b090df222a458b25dfa137fc637e",
-                    "url": "https://chromium.googlesource.com/chromium/deps/nasm.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/nearby/src": {
-                "args": {
-                    "hash": "sha256-qIIyCHay3vkE14GVCq77psm1OyuEYs4guAaQDlEwiMg=",
-                    "rev": "8acf9249344ea9ff9806d0d7f46e07640fddf550",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/neon_2_sse/src": {
-                "args": {
-                    "hash": "sha256-AkDAHOPO5NdXXk0hETS5D67mzw0RVXwPDDKqM0XXo5g=",
-                    "rev": "eb8b80b28f956275e291ea04a7beb5ed8289e872",
-                    "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/openh264/src": {
-                "args": {
-                    "hash": "sha256-tf0lnxATCkoq+xRti6gK6J47HwioAYWnpEsLGSA5Xdg=",
-                    "rev": "652bdb7719f30b52b08e506645a7322ff1b2cc6f",
-                    "url": "https://chromium.googlesource.com/external/github.com/cisco/openh264"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/openscreen/src": {
-                "args": {
-                    "hash": "sha256-K/frmCf3JMvPVZc6ZKPFAQrq4Pz4io3XBvADS0O5u78=",
-                    "rev": "db9e1ea566813606ca055868be13f6ff4a760ab8",
-                    "url": "https://chromium.googlesource.com/openscreen"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/openscreen/src/buildtools": {
-                "args": {
-                    "hash": "sha256-QXGJRGyyuN0EPDAF7CAzcTSbjHkz8FRjhqd1JEFF/1o=",
-                    "rev": "00459762409cb29cecf398a23cdb0cae918b7515",
-                    "url": "https://chromium.googlesource.com/chromium/src/buildtools"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/openscreen/src/third_party/tinycbor/src": {
-                "args": {
-                    "hash": "sha256-fMKBFUSKmODQyg4hKIa1hwnEKIV6WBbY1Gb8DOSnaHA=",
-                    "rev": "d393c16f3eb30d0c47e6f9d92db62272f0ec4dc7",
-                    "url": "https://chromium.googlesource.com/external/github.com/intel/tinycbor.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ots/src": {
-                "args": {
-                    "hash": "sha256-kiUXrXsaGOzPkKh0dVmU1I13WHt0Stzj7QLMqHN9FbU=",
-                    "rev": "46bea9879127d0ff1c6601b078e2ce98e83fcd33",
-                    "url": "https://chromium.googlesource.com/external/github.com/khaledhosny/ots.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/pdfium": {
-                "args": {
-                    "hash": "sha256-6gsur+fx546YJn/PUOOthuj+XrSIruVUeAYl4nRI6xM=",
-                    "rev": "ca83e69429af8f0bfa34b22dc54f538b9eebf5c5",
-                    "url": "https://pdfium.googlesource.com/pdfium.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/perfetto": {
-                "args": {
-                    "hash": "sha256-2jKRhHLitR0m2a4/asvVvTqAOhUlyLsBBSjpQAer4GA=",
-                    "rev": "054635b91453895720951f7329619d003a98b3e4",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/protobuf-javascript/src": {
-                "args": {
-                    "hash": "sha256-zq86SrDASl6aYPFPijRZp03hJqXUFz2Al/KkiNq7i0M=",
-                    "rev": "eb785a9363664a402b6336dfe96aad27fb33ffa8",
-                    "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/pthreadpool/src": {
-                "args": {
-                    "hash": "sha256-mB1QaAuY8vfv8FasPyio1AF75iYH+dM8t1GIr0Ty/+g=",
-                    "rev": "4e1831c02c74334a35ead03362f3342b6cea2a86",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/pyelftools": {
-                "args": {
-                    "hash": "sha256-I/7p3IEvfP/gkes4kx18PvWwhAKilQKb67GXoW4zFB4=",
-                    "rev": "19b3e610c86fcadb837d252c794cb5e8008826ae",
-                    "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/pywebsocket3/src": {
-                "args": {
-                    "hash": "sha256-WEqqu2/7fLqcf/2/IcD7/FewRSZ6jTgVlVBvnihthYQ=",
-                    "rev": "50602a14f1b6da17e0b619833a13addc6ea78bc2",
-                    "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/pywebsocket3.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/quic_trace/src": {
-                "args": {
-                    "hash": "sha256-vbXqddDgwqetU0bDYn3qo7OBqT5eG926/MbA1hKkCT0=",
-                    "rev": "ed3deb8a056b260c59f2fd42af6dfa3db48a8cad",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/quic-trace.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/re2/src": {
-                "args": {
-                    "hash": "sha256-f/k2rloV2Nwb0KuJGUX4SijFxAx69EXcsXOG4vo+Kis=",
-                    "rev": "c84a140c93352cdabbfb547c531be34515b12228",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/re2.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ruy/src": {
-                "args": {
-                    "hash": "sha256-O3JEtXchCdIHdGvjD6kGMJzj7TWVczQCW2YUHK3cABA=",
-                    "rev": "83fd40d730feb0804fafbc2d8814bcc19a17b2e5",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/ruy.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/search_engines_data/resources": {
-                "args": {
-                    "hash": "sha256-DTz351NpoygQLESm/z+fzFc/KGJyQelLnWpzNMmNT9o=",
-                    "rev": "07834ba1e5ebfb333d0b73556b7c4d62a53cb455",
-                    "url": "https://chromium.googlesource.com/external/search_engines_data.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/securemessage/src": {
-                "args": {
-                    "hash": "sha256-GS4ccnuiqxMs/LVYAtvSlVAYFp4a5GoZsxcriTX3k78=",
-                    "rev": "fa07beb12babc3b25e0c5b1f38c16aa8cb6b8f84",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/securemessage.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/skia": {
-                "args": {
-                    "hash": "sha256-ei95CJRfNPrsYt8XcDi7Pnl5dGiJu3qs7R4rAcZ24Uc=",
-                    "rev": "bcce46ca33b67cc302dd53927a63013b8f53bf73",
-                    "url": "https://skia.googlesource.com/skia.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/smhasher/src": {
-                "args": {
-                    "hash": "sha256-OgZQwkQcVgRMf62ROGuY+3zQhBoWuUSP4naTmSKdq8s=",
-                    "rev": "0ff96f7835817a27d0487325b6c16033e2992eb5",
-                    "url": "https://chromium.googlesource.com/external/smhasher.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/snappy/src": {
-                "args": {
-                    "hash": "sha256-jUwnjbaqXz7fgI2TPRK7SlUPQUVzcpjp4ZlFbEzwA+o=",
-                    "rev": "32ded457c0b1fe78ceb8397632c416568d6714a0",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/snappy.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/speedometer/main": {
-                "args": {
-                    "hash": "sha256-/nAK2uLjpPem37XCHHx3LGZEpvL/7w4Uw5bVpQ4C6ms=",
-                    "rev": "c760d160caa05792d3ed7650e85861c9f9462506",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/speedometer/v2.0": {
-                "args": {
-                    "hash": "sha256-p7WUS8gZUaS+LOm7pNmRkwgxjx+V8R6yy7bbaEHaIs4=",
-                    "rev": "732af0dfe867f8815e662ac637357e55f285dbbb",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/speedometer/v2.1": {
-                "args": {
-                    "hash": "sha256-0z5tZlz32fYh9I1ALqfLm2WWO8HiRBwt0hcmgKQhaeM=",
-                    "rev": "8bf7946e39e47c875c00767177197aea5727e84a",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/speedometer/v3.0": {
-                "args": {
-                    "hash": "sha256-qMQ4naX+4uUu3vtzzinjkhxX9/dNoTwj6vWCu4FdQmU=",
-                    "rev": "8d67f28d0281ac4330f283495b7f48286654ad7d",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/speedometer/v3.1": {
-                "args": {
-                    "hash": "sha256-G89mrrgRaANT1vqzhKPQKemHbz56YwR+oku7rlRoCHw=",
-                    "rev": "1386415be8fef2f6b6bbdbe1828872471c5d802a",
-                    "url": "https://chromium.googlesource.com/external/github.com/WebKit/Speedometer.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/spirv-cross/src": {
-                "args": {
-                    "hash": "sha256-H43M9DXfEuyKuvo6rjb5k0KEbYOSFodbPJh8ZKY4PQg=",
-                    "rev": "b8fcf307f1f347089e3c46eb4451d27f32ebc8d3",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/spirv-headers/src": {
-                "args": {
-                    "hash": "sha256-s0Pe7kg5syKhK8qEZH8b7UCDa87Xk32Lh95cQbpLdAc=",
-                    "rev": "8c88e0c4c94a21de825efccba5f99a862b049825",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/spirv-tools/src": {
-                "args": {
-                    "hash": "sha256-u4WDbWywua71yWB1cVIt1IDZRe4NnT5bUq3yHLKBgPo=",
-                    "rev": "2e83ad7e6f2cc51f7eaff3ffeb10e34351b3c157",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/sqlite/src": {
-                "args": {
-                    "hash": "sha256-1vAGAF3idxgHGaqb5gT5k3KIGC2H3gqC3RTVU2ZRf4A=",
-                    "rev": "8a22b25ad7244abaf07e372cc6dc97e041d663a9",
-                    "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/squirrel.mac": {
-                "args": {
-                    "hash": "sha256-4GfKQg0u3c9GI+jl3ixESNqWXQJKRMi+00QT0s2Shqw=",
-                    "owner": "Squirrel",
-                    "repo": "Squirrel.Mac",
-                    "rev": "0e5d146ba13101a1302d59ea6e6e0b3cace4ae38"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/squirrel.mac/vendor/Mantle": {
-                "args": {
-                    "hash": "sha256-ogFkMJybf2Ue606ojXJu6Gy5aXSi1bSKm60qcTAIaPk=",
-                    "owner": "Mantle",
-                    "repo": "Mantle",
-                    "rev": "78d3966b3c331292ea29ec38661b25df0a245948"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/squirrel.mac/vendor/ReactiveObjC": {
-                "args": {
-                    "hash": "sha256-/MCqC1oFe3N9TsmfVLgl+deR6qHU6ZFQQjudb9zB5Mo=",
-                    "owner": "ReactiveCocoa",
-                    "repo": "ReactiveObjC",
-                    "rev": "74ab5baccc6f7202c8ac69a8d1e152c29dc1ea76"
-                },
-                "fetcher": "fetchFromGitHub"
-            },
-            "src/third_party/swiftshader": {
-                "args": {
-                    "hash": "sha256-QTGU9Dgc6rgMeFZvhZyYeYj5W+ClJO8Yfa4+K7TmEec=",
-                    "rev": "4982425ff1bdcb2ce52a360edde58a379119bfde",
-                    "url": "https://swiftshader.googlesource.com/SwiftShader.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/text-fragments-polyfill/src": {
-                "args": {
-                    "hash": "sha256-4rW2u1cQAF4iPWHAt1FvVXIpz2pmI901rEPks/w/iFA=",
-                    "rev": "c036420683f672d685e27415de0a5f5e85bdc23f",
-                    "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/tflite/src": {
-                "args": {
-                    "hash": "sha256-S5zkpQZdhRdnZRUrUfi5FCrF2XFe3y/adAWwfh1OQYE=",
-                    "rev": "c8ed430d092acd485f00e7a9d7a888a0857d0430",
-                    "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/ukey2/src": {
-                "args": {
-                    "hash": "sha256-aaLs6ZS+CdBlCJ6ZhsmdAPFxiBIij6oufsDcNeRSV1E=",
-                    "rev": "0275885d8e6038c39b8a8ca55e75d1d4d1727f47",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/ukey2.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-deps": {
-                "args": {
-                    "hash": "sha256-CI0X6zbRV/snGcQZOUKQFn8Zo6D6Out6nN027HGZaa8=",
-                    "rev": "1648e664337ca19a4f8679cbb9547a5b4b926995",
-                    "url": "https://chromium.googlesource.com/vulkan-deps"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-headers/src": {
-                "args": {
-                    "hash": "sha256-VqKQeJd81feSgYnYLqb2sYirCmnHN9Rr19/4cPZ2TzE=",
-                    "rev": "78c359741d855213e8685278eb81bb62599f8e56",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-loader/src": {
-                "args": {
-                    "hash": "sha256-tDW5ed6gsDKlCKf4gT8MNi1yaafocUTohL1upGKB+Cc=",
-                    "rev": "723d6b4aa35853315c6e021ec86388b3a2559fae",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-tools/src": {
-                "args": {
-                    "hash": "sha256-Cw7LWBPRbDVlfmeMM4CYEC9xbfqT1wV7yuUcpGMLahs=",
-                    "rev": "289efccc7560f2b970e2b4e0f50349da87669311",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-utility-libraries/src": {
-                "args": {
-                    "hash": "sha256-NdvjtdCrNVKY23B4YDL33KB+/9HsSWTVolZJOto8+pc=",
-                    "rev": "0d5b49b80f17bca25e7f9321ad4e671a56f70887",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan-validation-layers/src": {
-                "args": {
-                    "hash": "sha256-2GII+RBRzPZTTib82srUEFDG+CbtPTZ6lX3oDJBC2gU=",
-                    "rev": "73d7d74bc979c8a16c823c4eae4ee881153e000a",
-                    "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/vulkan_memory_allocator": {
-                "args": {
-                    "hash": "sha256-YzxHZagz/M8Y54UnI4h1wu5jSTuaOgv0ifC9d3fJZlQ=",
-                    "rev": "56300b29fbfcc693ee6609ddad3fdd5b7a449a21",
-                    "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wasm_tts_engine/src": {
-                "args": {
-                    "hash": "sha256-t5eeehwspRLaowEMPLa8/lV5AHamXQBfH/un0DHLVAM=",
-                    "rev": "53d2aba6f0cf7db57e17edfc3ff6471871b0c125",
-                    "url": "https://chromium.googlesource.com/chromium/wasm-tts-engine"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wayland-protocols/gtk": {
-                "args": {
-                    "hash": "sha256-75XNnLkF5Lt1LMRGT+T61k0/mLa3kkynfN+QWvZ0LiQ=",
-                    "rev": "40ebed3a03aef096addc0af09fec4ec529d882a0",
-                    "url": "https://chromium.googlesource.com/external/github.com/GNOME/gtk.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wayland-protocols/kde": {
-                "args": {
-                    "hash": "sha256-Dmcp/2ms/k7NxPPmPkp0YNfM9z2Es1ZO0uX10bc7N2Y=",
-                    "rev": "0b07950714b3a36c9b9f71fc025fc7783e82926e",
-                    "url": "https://chromium.googlesource.com/external/github.com/KDE/plasma-wayland-protocols.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wayland-protocols/src": {
-                "args": {
-                    "hash": "sha256-o/adWEXYSqWib6KoK7XMCWbojapcS4O/CEPxv7iFCw8=",
-                    "rev": "7d5a3a8b494ae44cd9651f9505e88a250082765e",
-                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland-protocols.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wayland/src": {
-                "args": {
-                    "hash": "sha256-oK0Z8xO2ILuySGZS0m37ZF0MOyle2l8AXb0/6wai0/w=",
-                    "rev": "a156431ea66fe67d69c9fbba8a8ad34dabbab81c",
-                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/webdriver/pylib": {
-                "args": {
-                    "hash": "sha256-WIqWXIKVgElgg8P8laLAlUrgwodGdeVcwohZxnPKedw=",
-                    "rev": "fc5e7e70c098bfb189a9a74746809ad3c5c34e04",
-                    "url": "https://chromium.googlesource.com/external/github.com/SeleniumHQ/selenium/py.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/webgl/src": {
-                "args": {
-                    "hash": "sha256-mSketnpcDtz3NnhPkXMpMpq8MWcFiSviJbK6h06fcnw=",
-                    "rev": "c01b768bce4a143e152c1870b6ba99ea6267d2b0",
-                    "url": "https://chromium.googlesource.com/external/khronosgroup/webgl.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/webgpu-cts/src": {
-                "args": {
-                    "hash": "sha256-vXyp0+6eyKOzzQbkRa8f8dO+B9cyUCY2hCZEFc7+7lU=",
-                    "rev": "92f4eb4dae0f5439f2cdc7ce467d66b10e165f42",
-                    "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/webpagereplay": {
-                "args": {
-                    "hash": "sha256-lMqCZ27TJ4aXKWDuN22VtceXh0jNH4Ll1234xCbEOro=",
-                    "rev": "2c5049abfc2cf36ece82f7f84ebdcb786659eaf7",
-                    "url": "https://chromium.googlesource.com/webpagereplay.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/webrtc": {
-                "args": {
-                    "hash": "sha256-cNONf88oSbsdYuSdPiLxgTI973qOP6fb1OKb2WMQMMg=",
-                    "rev": "2c8f5be6924d507ee74191b1aeadcec07f747f21",
-                    "url": "https://webrtc.googlesource.com/src.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/weston/src": {
-                "args": {
-                    "hash": "sha256-y2srFaPUOoB2umzpo4+hFfhNlqXM2AoMGOpUy/ZSacg=",
-                    "rev": "ccf29cb237c3ed09c5f370f35239c93d07abfdd7",
-                    "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/weston.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/wuffs/src": {
-                "args": {
-                    "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=",
-                    "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8",
-                    "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/xdg-utils": {
-                "args": {
-                    "hash": "sha256-WuQ9uDq+QD17Y20ACFGres4nbkeOiTE2y+tY1avAT5U=",
-                    "rev": "cb54d9db2e535ee4ef13cc91b65a1e2741a94a44",
-                    "url": "https://chromium.googlesource.com/chromium/deps/xdg-utils.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/xnnpack/src": {
-                "args": {
-                    "hash": "sha256-p5DjGNH9IR0KPWSFmbsdt2PU+kHgWRAnBw7J9sLV/S8=",
-                    "rev": "d6fc3be20b0d3e3742157fa26c5359babaa8bc8b",
-                    "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/third_party/zstd/src": {
-                "args": {
-                    "hash": "sha256-hDDNrUXGxG/o1oZnypAnuLyIeM16Hy6x1KacGu9Hhmw=",
-                    "rev": "ef2bf5781112a4cd6b62ac1817f7842bbdc7ea8f",
-                    "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            },
-            "src/v8": {
-                "args": {
-                    "hash": "sha256-lvrFWpivbaiuv6VKCX0ZGw/PurFcZjKelcnHVNS4FsQ=",
-                    "rev": "b0a55a7dad7f536cce1f9aaddba89894c8533946",
-                    "url": "https://chromium.googlesource.com/v8/v8.git"
-                },
-                "fetcher": "fetchFromGitiles"
-            }
-        },
-        "electron_yarn_hash": "0hm126bl9cscs2mjb3yx2yr4b22agqp9r0c5kv25r3lvc020r9pk",
-        "modules": "135",
-        "node": "22.19.0",
-        "version": "36.9.5"
-    },
     "37": {
         "chrome": "138.0.7204.251",
         "chromium": {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fde10b631cc0..23ace9a0a66b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6157,11 +6157,7 @@ with pkgs;
     ;
 
   electron_35 = electron_35-bin;
-  electron_36 =
-    if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_36 then
-      electron-source.electron_36
-    else
-      electron_36-bin;
+  electron_36 = electron_36-bin;
   electron_37 =
     if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_37 then
       electron-source.electron_37

From 8ecc467b2a492499b403924467cea6b7bc2a02a0 Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Tue, 4 Nov 2025 15:26:48 +0100
Subject: [PATCH 5310/6226] electron_36-bin: mark as insecure

---
 pkgs/development/tools/electron/binary/generic.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/tools/electron/binary/generic.nix b/pkgs/development/tools/electron/binary/generic.nix
index 18d912514c4e..72c6fdc6f4ab 100644
--- a/pkgs/development/tools/electron/binary/generic.nix
+++ b/pkgs/development/tools/electron/binary/generic.nix
@@ -54,7 +54,7 @@ let
     ];
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     # https://www.electronjs.org/docs/latest/tutorial/electron-timelines
-    knownVulnerabilities = optional (versionOlder version "36.0.0") "Electron version ${version} is EOL";
+    knownVulnerabilities = optional (versionOlder version "37.0.0") "Electron version ${version} is EOL";
   };
 
   fetcher =

From 1c68856fbcb0a67e77935e1c90e8ec0ddcd69b0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Galder=20Zamarre=C3=B1o?= <galder@zamarreno.com>
Date: Thu, 1 May 2025 10:37:55 +0200
Subject: [PATCH 5311/6226] temurin-{,jre-}bin-23: drop

Co-Authored-By: Leona Maroni <dev@leona.is>
---
 .../development/compilers/openjdk/generic.nix |   2 -
 .../compilers/temurin-bin/generate-sources.py |   2 +-
 .../compilers/temurin-bin/jdk-darwin.nix      |   3 -
 .../compilers/temurin-bin/jdk-linux.nix       |   3 -
 .../compilers/temurin-bin/sources.json        | 120 ------------------
 pkgs/top-level/aliases.nix                    |   2 +
 pkgs/top-level/all-packages.nix               |   3 -
 7 files changed, 3 insertions(+), 132 deletions(-)

diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix
index 6196350c32c8..f40ef90c6cf3 100644
--- a/pkgs/development/compilers/openjdk/generic.nix
+++ b/pkgs/development/compilers/openjdk/generic.nix
@@ -78,7 +78,6 @@
   temurin-bin-11,
   temurin-bin-17,
   temurin-bin-21,
-  temurin-bin-23,
   temurin-bin-25,
   jdk-bootstrap ?
     {
@@ -86,7 +85,6 @@
       "11" = temurin-bin-11.__spliced.buildBuild or temurin-bin-11;
       "17" = temurin-bin-17.__spliced.buildBuild or temurin-bin-17;
       "21" = temurin-bin-21.__spliced.buildBuild or temurin-bin-21;
-      "23" = temurin-bin-23.__spliced.buildBuild or temurin-bin-23;
       "25" = temurin-bin-25.__spliced.buildBuild or temurin-bin-25;
     }
     .${featureVersion},
diff --git a/pkgs/development/compilers/temurin-bin/generate-sources.py b/pkgs/development/compilers/temurin-bin/generate-sources.py
index d2f840632a89..0ebf923b1078 100755
--- a/pkgs/development/compilers/temurin-bin/generate-sources.py
+++ b/pkgs/development/compilers/temurin-bin/generate-sources.py
@@ -6,7 +6,7 @@ import re
 import requests
 import sys
 
-feature_versions = (8, 11, 17, 21, 23, 25)
+feature_versions = (8, 11, 17, 21, 25)
 oses = ("mac", "linux", "alpine-linux")
 types = ("jre", "jdk")
 impls = ("hotspot",)
diff --git a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix
index 6a97a46675dc..037f0811f3f0 100644
--- a/pkgs/development/compilers/temurin-bin/jdk-darwin.nix
+++ b/pkgs/development/compilers/temurin-bin/jdk-darwin.nix
@@ -19,9 +19,6 @@ in
   jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; };
   jre-21 = common { sourcePerArch = sources.jre.openjdk21; };
 
-  jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; };
-  jre-23 = common { sourcePerArch = sources.jre.openjdk23; };
-
   jdk-25 = common { sourcePerArch = sources.jdk.openjdk25; };
   jre-25 = common { sourcePerArch = sources.jre.openjdk25; };
 }
diff --git a/pkgs/development/compilers/temurin-bin/jdk-linux.nix b/pkgs/development/compilers/temurin-bin/jdk-linux.nix
index 2ec2e35a80fc..9e40a4722ce3 100644
--- a/pkgs/development/compilers/temurin-bin/jdk-linux.nix
+++ b/pkgs/development/compilers/temurin-bin/jdk-linux.nix
@@ -24,9 +24,6 @@ in
   jdk-21 = common { sourcePerArch = sources.jdk.openjdk21; };
   jre-21 = common { sourcePerArch = sources.jre.openjdk21; };
 
-  jdk-23 = common { sourcePerArch = sources.jdk.openjdk23; };
-  jre-23 = common { sourcePerArch = sources.jre.openjdk23; };
-
   jdk-25 = common { sourcePerArch = sources.jdk.openjdk25; };
   jre-25 = common { sourcePerArch = sources.jre.openjdk25; };
 }
diff --git a/pkgs/development/compilers/temurin-bin/sources.json b/pkgs/development/compilers/temurin-bin/sources.json
index ba71e263bef1..88b3850ba249 100644
--- a/pkgs/development/compilers/temurin-bin/sources.json
+++ b/pkgs/development/compilers/temurin-bin/sources.json
@@ -38,22 +38,6 @@
             "version": "21.0.8"
           }
         },
-        "openjdk23": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "b55c5c881a2fed17ec5a59feaa33d9263703b399d1bfae3a5eaed3f140aa4570",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_alpine-linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          },
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "2c05c6dfea23a83fdbfaf5b03cc3cfd8d998c8069e930e0e585a39d4a99f3d99",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_alpine-linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          }
-        },
         "openjdk25": {
           "aarch64": {
             "build": "36",
@@ -118,22 +102,6 @@
             "version": "21.0.8"
           }
         },
-        "openjdk23": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "248a2ffb3abcb0cee7841ce648af7af415c96ee88cba4f8bf676c0115d38de5e",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_alpine-linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          },
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "4513750bd10cc6c38f0c19d335dac7dcc112bba64e52010f81ba29e7a71e2a76",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_alpine-linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          }
-        },
         "openjdk25": {
           "aarch64": {
             "build": "36",
@@ -266,34 +234,6 @@
             "version": "21.0.8"
           }
         },
-        "openjdk23": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "fb43ae1202402842559cb6223886ec1663b90ffbec48479abbcb92c92c9012eb",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          },
-          "packageType": "jdk",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "548fd82af4eb0802fe20b0b61a4664a69c7f03cd963540908f30dbf73636dafe",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_ppc64le_linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          },
-          "riscv64": {
-            "build": "7",
-            "sha256": "1e102e1e6653f8810ef6c275b0d38ea7036abd4a8709f0f916b339f65e76bb56",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_riscv64_linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "870ac8c05c6fe563e7a3878a47d0234b83c050e83651d2c47e8b822ec74512dd",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          }
-        },
         "openjdk25": {
           "aarch64": {
             "build": "36",
@@ -460,34 +400,6 @@
             "version": "21.0.8"
           }
         },
-        "openjdk23": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "b2a8a287ebd2d2a1d5d32eb6b79768cf2b5e02f1b4d6d4791297feb8636b9e2f",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          },
-          "packageType": "jre",
-          "powerpc64le": {
-            "build": "7",
-            "sha256": "a21355923fdcdcc49fcf6359f2763f49f001bd4caeb970f7313f18aeaa61b588",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_ppc64le_linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          },
-          "riscv64": {
-            "build": "7",
-            "sha256": "c2c8f8add6af6518cfc565ec0a7410e031301b91f2d8bd594303d7f04680da4e",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_riscv64_linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          },
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "1a16c654e67a72dadfa632969a457404ad1cc30c6375857fdcb393e0592ce3ba",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_linux_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          }
-        },
         "openjdk25": {
           "aarch64": {
             "build": "36",
@@ -602,22 +514,6 @@
             "version": "21.0.8"
           }
         },
-        "openjdk23": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "749993e751f085c7ae713140066a90800075e4aeedfac50a5ed0c5457131c5a0",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_aarch64_mac_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          },
-          "packageType": "jdk",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "97fca2e90668351f248f149d4e96e16875094eba6716a8dd1dcf163be9e19085",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jdk_x64_mac_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          }
-        },
         "openjdk25": {
           "aarch64": {
             "build": "36",
@@ -694,22 +590,6 @@
             "version": "21.0.8"
           }
         },
-        "openjdk23": {
-          "aarch64": {
-            "build": "7",
-            "sha256": "56b86d4f5745ba44894310c3417755e4b4aaa62d4a17a5cb4dab6200c14c56fe",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_aarch64_mac_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          },
-          "packageType": "jre",
-          "vmType": "hotspot",
-          "x86_64": {
-            "build": "7",
-            "sha256": "2c5b81ce3234d6bef0ec352734aa2de19c0950020c55a1cbfc21ae5fda7690b8",
-            "url": "https://github.com/adoptium/temurin23-binaries/releases/download/jdk-23.0.2%2B7/OpenJDK23U-jre_x64_mac_hotspot_23.0.2_7.tar.gz",
-            "version": "23.0.2"
-          }
-        },
         "openjdk25": {
           "aarch64": {
             "build": "36",
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8e4071c5bcc9..f0a4542964c8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1468,7 +1468,9 @@ mapAliases {
   teamspeak_client = throw "'teamspeak_client' has been renamed to/replaced by 'teamspeak3'"; # Converted to throw 2025-10-27
   tegaki-zinnia-japanese = throw "'tegaki-zinnia-japanese' has been removed due to lack of maintenance"; # Added 2025-09-10
   temporalite = throw "'temporalite' has been removed as it is obsolete and unmaintained, please use 'temporal-cli' instead (with `temporal server start-dev`)"; # Added 2025-06-26
+  temurin-bin-23 = throw "Temurin 23 has been removed as it has reached its end of life"; # Added 2025-11-04
   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
   tepl = throw "'tepl' has been renamed to/replaced by 'libgedit-tepl'"; # Converted to throw 2025-10-27
   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 fde10b631cc0..4d26dfce6ce5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4322,9 +4322,6 @@ with pkgs;
   temurin-bin-25 = javaPackages.compiler.temurin-bin.jdk-25;
   temurin-jre-bin-25 = javaPackages.compiler.temurin-bin.jre-25;
 
-  temurin-bin-23 = javaPackages.compiler.temurin-bin.jdk-23;
-  temurin-jre-bin-23 = javaPackages.compiler.temurin-bin.jre-23;
-
   temurin-bin-21 = javaPackages.compiler.temurin-bin.jdk-21;
   temurin-jre-bin-21 = javaPackages.compiler.temurin-bin.jre-21;
 

From aa31910413f3466a2660e7f0412ba55998adf08a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Galder=20Zamarre=C3=B1o?= <galder@zamarreno.com>
Date: Wed, 14 May 2025 09:37:12 +0200
Subject: [PATCH 5312/6226] treewide: migrate openjdk-23 -> openjdk-25

Co-Authored-By: Leona Maroni <dev@leona.is>
---
 pkgs/by-name/cr/cratedb/package.nix        | 4 ++--
 pkgs/by-name/cr/cryptomator/package.nix    | 4 ++--
 pkgs/by-name/je/jextract/package.nix       | 6 +++---
 pkgs/by-name/ko/komga/package.nix          | 6 +++---
 pkgs/by-name/mo/moneydance/package.nix     | 4 ++--
 pkgs/by-name/op/openjfx/package.nix        | 2 --
 pkgs/by-name/re/recaf-launcher/package.nix | 2 +-
 7 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/pkgs/by-name/cr/cratedb/package.nix b/pkgs/by-name/cr/cratedb/package.nix
index 77158519c689..8119c0d7f7fd 100644
--- a/pkgs/by-name/cr/cratedb/package.nix
+++ b/pkgs/by-name/cr/cratedb/package.nix
@@ -4,13 +4,13 @@
   maven,
   fetchFromGitHub,
   replaceVars,
-  openjdk23,
+  openjdk25,
   libarchive,
   makeWrapper,
 }:
 let
   # Wants at least Java 22
-  jdk = openjdk23;
+  jdk = openjdk25;
   version = "5.9.6";
 in
 maven.buildMavenPackage {
diff --git a/pkgs/by-name/cr/cryptomator/package.nix b/pkgs/by-name/cr/cryptomator/package.nix
index 51d690c54019..616ed7a5208a 100644
--- a/pkgs/by-name/cr/cryptomator/package.nix
+++ b/pkgs/by-name/cr/cryptomator/package.nix
@@ -3,7 +3,7 @@
   fetchFromGitHub,
   fuse3,
   glib,
-  jdk23,
+  jdk25,
   lib,
   libayatana-appindicator,
   makeShellWrapper,
@@ -13,7 +13,7 @@
 }:
 
 let
-  jdk = jdk23.override { enableJavaFX = true; };
+  jdk = jdk25.override { enableJavaFX = true; };
 in
 maven.buildMavenPackage rec {
   pname = "cryptomator";
diff --git a/pkgs/by-name/je/jextract/package.nix b/pkgs/by-name/je/jextract/package.nix
index 46ddcad2cf1c..65d264787b83 100644
--- a/pkgs/by-name/je/jextract/package.nix
+++ b/pkgs/by-name/je/jextract/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
   makeBinaryWrapper,
   gradle,
-  jdk23,
+  jdk25,
   llvmPackages,
 }:
 
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
 
   gradleFlags = [
     "-Pllvm_home=${lib.getLib llvmPackages.libclang}"
-    "-Pjdk_home=${jdk23}"
+    "-Pjdk_home=${jdk25}"
   ];
 
   patches = [
@@ -51,7 +51,7 @@ stdenv.mkDerivation {
     description = "Tool which mechanically generates Java bindings from a native library headers";
     mainProgram = "jextract";
     homepage = "https://github.com/openjdk/jextract";
-    platforms = jdk23.meta.platforms;
+    platforms = jdk25.meta.platforms;
     license = licenses.gpl2Only;
     maintainers = with maintainers; [
       jlesquembre
diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix
index 3cde789aeab0..3572acb97885 100644
--- a/pkgs/by-name/ko/komga/package.nix
+++ b/pkgs/by-name/ko/komga/package.nix
@@ -3,7 +3,7 @@
   stdenvNoCC,
   fetchurl,
   makeWrapper,
-  jdk23_headless,
+  jdk25_headless,
   libwebp, # Fixes https://github.com/gotson/komga/issues/1294
   nixosTests,
 }:
@@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec {
   ];
 
   buildCommand = ''
-    makeWrapper ${jdk23_headless}/bin/java $out/bin/komga --add-flags "-jar $src" \
+    makeWrapper ${jdk25_headless}/bin/java $out/bin/komga --add-flags "-jar $src" \
       --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libwebp ]}
   '';
 
@@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation rec {
     description = "Free and open source comics/mangas server";
     homepage = "https://komga.org/";
     license = lib.licenses.mit;
-    platforms = jdk23_headless.meta.platforms;
+    platforms = jdk25_headless.meta.platforms;
     maintainers = with lib.maintainers; [
       tebriel
       govanify
diff --git a/pkgs/by-name/mo/moneydance/package.nix b/pkgs/by-name/mo/moneydance/package.nix
index b020ace87177..396dc7d007a4 100644
--- a/pkgs/by-name/mo/moneydance/package.nix
+++ b/pkgs/by-name/mo/moneydance/package.nix
@@ -4,12 +4,12 @@
   buildPackages,
   fetchzip,
   makeWrapper,
-  openjdk23,
+  openjdk25,
   wrapGAppsHook3,
   jvmFlags ? [ ],
 }:
 let
-  jdk = openjdk23.override {
+  jdk = openjdk25.override {
     enableJavaFX = true;
   };
 in
diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix
index 0b15ba7706c6..02c313c74425 100644
--- a/pkgs/by-name/op/openjfx/package.nix
+++ b/pkgs/by-name/op/openjfx/package.nix
@@ -35,13 +35,11 @@
 
   jdk17_headless,
   jdk21_headless,
-  jdk23_headless,
   jdk25_headless,
   jdk-bootstrap ?
     {
       "17" = jdk17_headless;
       "21" = jdk21_headless;
-      "23" = jdk23_headless;
       "25" = jdk25_headless;
     }
     .${featureVersion},
diff --git a/pkgs/by-name/re/recaf-launcher/package.nix b/pkgs/by-name/re/recaf-launcher/package.nix
index 1c869bf20cba..c828c98e2dd2 100644
--- a/pkgs/by-name/re/recaf-launcher/package.nix
+++ b/pkgs/by-name/re/recaf-launcher/package.nix
@@ -19,7 +19,7 @@ buildFHSEnv {
     p: with p; [
       jar
 
-      openjdk23
+      openjdk25
       xorg.libX11
       at-spi2-atk
       cairo

From 058600cf06f7246e4021911fe3e459f2b72ee295 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Galder=20Zamarre=C3=B1o?= <galder@zamarreno.com>
Date: Wed, 14 May 2025 09:37:12 +0200
Subject: [PATCH 5313/6226] openjdk23{,_headless}: drop

Co-Authored-By: Leona Maroni <dev@leona.is>
---
 pkgs/development/compilers/openjdk/23/source.json | 6 ------
 pkgs/top-level/aliases.nix                        | 4 ++++
 pkgs/top-level/all-packages.nix                   | 5 -----
 pkgs/top-level/java-packages.nix                  | 1 -
 4 files changed, 4 insertions(+), 12 deletions(-)
 delete mode 100644 pkgs/development/compilers/openjdk/23/source.json

diff --git a/pkgs/development/compilers/openjdk/23/source.json b/pkgs/development/compilers/openjdk/23/source.json
deleted file mode 100644
index e6d7076744b6..000000000000
--- a/pkgs/development/compilers/openjdk/23/source.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "hash": "sha256-zlL2DV6iOfV3hgq/Ci95gTwVrhcvz5MWsg4/+O2ntE8=",
-  "owner": "openjdk",
-  "repo": "jdk23u",
-  "rev": "refs/tags/jdk-23.0.2+7"
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f0a4542964c8..3a03a55792c6 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -723,6 +723,8 @@ mapAliases {
   jami-client = throw "'jami-client' has been renamed to/replaced by 'jami'"; # Converted to throw 2025-10-27
   jami-client-qt = throw "'jami-client-qt' has been renamed to/replaced by 'jami-client'"; # Converted to throw 2025-10-27
   jami-daemon = throw "'jami-daemon' has been renamed to/replaced by 'jami.daemon'"; # Converted to throw 2025-10-27
+  jdk23 = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04
+  jdk23_headless = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04
   jdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
   jdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
   jikespg = throw "'jikespg' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
@@ -1143,6 +1145,8 @@ mapAliases {
   openconnect_gnutls = throw "'openconnect_gnutls' has been renamed to/replaced by 'openconnect'"; # Converted to throw 2025-10-27
   openexr_3 = throw "'openexr_3' has been renamed to/replaced by 'openexr'"; # Converted to throw 2025-10-27
   openimageio2 = throw "'openimageio2' has been renamed to/replaced by 'openimageio'"; # Converted to throw 2025-10-27
+  openjdk23 = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04
+  openjdk23_headless = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04
   openjdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
   openjdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
   openjfx24 = throw "OpenJFX 24 was removed as it has reached its end of life"; # Added 2025-10-04
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4d26dfce6ce5..b4612fc90845 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5016,11 +5016,6 @@ with pkgs;
   jdk21 = openjdk21;
   jdk21_headless = openjdk21_headless;
 
-  openjdk23 = javaPackages.compiler.openjdk23;
-  openjdk23_headless = javaPackages.compiler.openjdk23.headless;
-  jdk23 = openjdk23;
-  jdk23_headless = openjdk23_headless;
-
   openjdk25 = javaPackages.compiler.openjdk25;
   openjdk25_headless = javaPackages.compiler.openjdk25.headless;
   jdk25 = openjdk25;
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index a890010cd152..873599d0e9c4 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -52,7 +52,6 @@ in
       openjdk11 = mkOpenjdk "11";
       openjdk17 = mkOpenjdk "17";
       openjdk21 = mkOpenjdk "21";
-      openjdk23 = mkOpenjdk "23";
       openjdk25 = mkOpenjdk "25";
 
       # Legacy aliases

From 3af1b1461b36c47e8a19ff80844ca64381868a0f Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Tue, 20 May 2025 06:15:32 +0200
Subject: [PATCH 5314/6226] treewide: migrate openjfx23 -> openjfx25
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

While pdfsam-basic maintainer said that they require OpenJFX 23,
OpenJFX 25 works fine too. As version 23 is EOL, migrate to 25.

Co-Authored-By: Galder Zamarreño <galder@zamarreno.com>
---
 pkgs/applications/misc/pdfsam-basic/default.nix | 2 +-
 pkgs/by-name/ja/jabref/package.nix              | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/pdfsam-basic/default.nix b/pkgs/applications/misc/pdfsam-basic/default.nix
index b5c131015efb..f6b12b600ba7 100644
--- a/pkgs/applications/misc/pdfsam-basic/default.nix
+++ b/pkgs/applications/misc/pdfsam-basic/default.nix
@@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
          --set PDFSAM_JAVA_PATH ${temurin-jre-bin-21} \
          --prefix LD_LIBRARY_PATH : ${
            lib.makeLibraryPath [
-             javaPackages.openjfx23 # PDFSam Basic requires JDK 21 and JavaFX 23 https://github.com/torakiki/pdfsam/issues/785#issuecomment-3446564717
+             javaPackages.openjfx25 # PDFSam Basic requires JDK 21 and JavaFX 23 https://github.com/torakiki/pdfsam/issues/785#issuecomment-3446564717
              xorg.libXxf86vm
              xorg.libXtst
              gtk3
diff --git a/pkgs/by-name/ja/jabref/package.nix b/pkgs/by-name/ja/jabref/package.nix
index e94423ed57d1..e35decacd0e8 100644
--- a/pkgs/by-name/ja/jabref/package.nix
+++ b/pkgs/by-name/ja/jabref/package.nix
@@ -9,14 +9,14 @@
   xdg-utils,
   gtk3,
   jdk21,
-  openjfx23,
+  openjfx25,
   gradle_8,
   python3,
 }:
 let
   jdk = jdk21.override {
     enableJavaFX = true;
-    openjfx_jdk = openjfx23;
+    openjfx_jdk = openjfx25;
   };
   # "Deprecated Gradle features were used in this build, making it incompatible with Gradle 9.0."
   gradle = gradle_8;

From cfafc746eaf51deb50f13b9ae9a0214e4d090d85 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Galder=20Zamarre=C3=B1o?= <galder@zamarreno.com>
Date: Tue, 20 May 2025 06:15:32 +0200
Subject: [PATCH 5315/6226] openjfx23: drop

---
 doc/languages-frameworks/gradle.section.md     | 2 +-
 doc/languages-frameworks/index.md              | 2 +-
 pkgs/development/compilers/openjdk/generic.nix | 2 --
 pkgs/top-level/aliases.nix                     | 1 +
 pkgs/top-level/all-packages.nix                | 1 -
 pkgs/top-level/java-packages.nix               | 2 +-
 6 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/doc/languages-frameworks/gradle.section.md b/doc/languages-frameworks/gradle.section.md
index d99fe9337ecc..37e840935689 100644
--- a/doc/languages-frameworks/gradle.section.md
+++ b/doc/languages-frameworks/gradle.section.md
@@ -129,7 +129,7 @@ The update script does the following:
 `fetchDeps` takes the following arguments:
 
 - `attrPath` - the path to the package in nixpkgs (for example,
-  `"javaPackages.openjfx22"`). Used for update script metadata.
+  `"javaPackages.openjfx25"`). Used for update script metadata.
 - `pname` - an alias for `attrPath` for convenience. This is what you
   will generally use instead of `pkg` or `attrPath`.
 - `pkg` - the package to be used for fetching the dependencies. Defaults
diff --git a/doc/languages-frameworks/index.md b/doc/languages-frameworks/index.md
index 71269aa6c030..3f4b6c48e764 100644
--- a/doc/languages-frameworks/index.md
+++ b/doc/languages-frameworks/index.md
@@ -20,7 +20,7 @@ Each supported language or software ecosystem has its own package set named `<la
   $ nix repl '<nixpkgs>' -I nixpkgs=channel:nixpkgs-unstable
   nix-repl> javaPackages.<tab>
   javaPackages.compiler               javaPackages.openjfx15              javaPackages.openjfx21              javaPackages.recurseForDerivations
-  javaPackages.jogl_2_4_0             javaPackages.openjfx17              javaPackages.openjfx22
+  javaPackages.jogl_2_4_0             javaPackages.openjfx17              javaPackages.openjfx25
   javaPackages.mavenfod               javaPackages.openjfx19              javaPackages.override
   javaPackages.openjfx11              javaPackages.openjfx20              javaPackages.overrideDerivation
   ```
diff --git a/pkgs/development/compilers/openjdk/generic.nix b/pkgs/development/compilers/openjdk/generic.nix
index f40ef90c6cf3..b783cd7fbf0d 100644
--- a/pkgs/development/compilers/openjdk/generic.nix
+++ b/pkgs/development/compilers/openjdk/generic.nix
@@ -58,13 +58,11 @@
   enableJavaFX ? false,
   openjfx17,
   openjfx21,
-  openjfx23,
   openjfx25,
   openjfx_jdk ?
     {
       "17" = openjfx17;
       "21" = openjfx21;
-      "23" = openjfx23;
       "25" = openjfx25;
     }
     .${featureVersion} or (throw "JavaFX is not supported on OpenJDK ${featureVersion}"),
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 3a03a55792c6..0b203744c259 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1149,6 +1149,7 @@ mapAliases {
   openjdk23_headless = throw "OpenJDK 23 was removed as it has reached its end of life"; # Added 2025-11-04
   openjdk24 = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
   openjdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
+  openjfx23 = throw "OpenJFX 23 was removed as it has reached its end of life"; # Added 2025-11-04
   openjfx24 = throw "OpenJFX 24 was removed as it has reached its end of life"; # Added 2025-10-04
   openmw-tes3mp = throw "'openmw-tes3mp' has been removed due to lack of maintenance upstream"; # Added 2025-08-30
   openssl_3_0 = throw "'openssl_3_0' has been renamed to/replaced by 'openssl_3'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4612fc90845..7079a84207ca 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4988,7 +4988,6 @@ with pkgs;
 
   openjfx17 = openjfx;
   openjfx21 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "21"; };
-  openjfx23 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "23"; };
   openjfx25 = callPackage ../by-name/op/openjfx/package.nix { featureVersion = "25"; };
 
   openjdk8-bootstrap = javaPackages.compiler.openjdk8-bootstrap;
diff --git a/pkgs/top-level/java-packages.nix b/pkgs/top-level/java-packages.nix
index 873599d0e9c4..974c4d59611d 100644
--- a/pkgs/top-level/java-packages.nix
+++ b/pkgs/top-level/java-packages.nix
@@ -8,7 +8,7 @@ let
     ;
 in
 {
-  inherit (pkgs) openjfx17 openjfx21 openjfx23;
+  inherit (pkgs) openjfx17 openjfx21 openjfx25;
   compiler = lib.recurseIntoAttrs (
     let
       # merge meta.platforms of both packages so that dependent packages and hydra build them

From b519c92933805d1265de43bdcbed52f79ae27fad Mon Sep 17 00:00:00 2001
From: Andrew Marshall <andrew@johnandrewmarshall.com>
Date: Tue, 4 Nov 2025 09:41:14 -0500
Subject: [PATCH 5316/6226] bitwarden-desktop: backport electron_37 update

As electron_36 is EOL and will soon be marked insecure.
---
 pkgs/by-name/bi/bitwarden-desktop/package.nix | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bi/bitwarden-desktop/package.nix b/pkgs/by-name/bi/bitwarden-desktop/package.nix
index cd47ee912a7a..288fb4747ae7 100644
--- a/pkgs/by-name/bi/bitwarden-desktop/package.nix
+++ b/pkgs/by-name/bi/bitwarden-desktop/package.nix
@@ -5,8 +5,9 @@
   cargo,
   copyDesktopItems,
   darwin,
-  electron_36,
+  electron_37,
   fetchFromGitHub,
+  fetchpatch2,
   gnome-keyring,
   jq,
   llvmPackages_18,
@@ -25,7 +26,7 @@
 let
   description = "Secure and free password manager for all of your devices";
   icon = "bitwarden";
-  electron = electron_36;
+  electron = electron_37;
 
   # argon2 npm dependency is using `std::basic_string<uint8_t>`, which is no longer allowed in LLVM 19
   buildNpmPackage' = buildNpmPackage.override {
@@ -55,6 +56,11 @@ buildNpmPackage' rec {
     ./skip-afterpack-and-aftersign.patch
     # since out arch doesn't match upstream, we'll generate and use desktop_napi.node instead of desktop_napi.${platform}-${arch}.node
     ./dont-use-platform-triple.patch
+
+    (fetchpatch2 {
+      url = "https://github.com/bitwarden/clients/commit/cd56d01894c38cf046a7e44dcacc7e0ff2aa2a37.patch?full_index=1";
+      hash = "sha256-NRZiM+Y/ifh77vS+8mldbiwv/vPDr1JUOJzSu2tFMS8=";
+    })
   ];
 
   postPatch = ''
@@ -87,7 +93,7 @@ buildNpmPackage' rec {
     "--ignore-scripts"
   ];
   npmWorkspace = "apps/desktop";
-  npmDepsHash = "sha256-EPYUGxXhJSwLF1fW5rWMlF6+RNjiVYxZvnT3zg7KW3A=";
+  npmDepsHash = "sha256-Qhj8Lh25vNnJzbUm/M+mKIc6Fa5plSCiy53vjevs7Tc=";
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit

From 2d6602908bdf3824b189bad0f8408e42ba3a3cad Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 4 Nov 2025 15:38:21 +0100
Subject: [PATCH 5317/6226] ci/github-script/merge: improve testability

By only ignoring already-handled comments when running non-dry, it's
much easier to look at existing PRs, for which the merge bot already
commented, and iterate on them locally.

It's dry mode anyway, so it won't hurt to get a few more merge comments
in the console output.
---
 ci/github-script/merge.js | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index 3ebc86d616c2..02854dbd5ea3 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -168,14 +168,15 @@ async function handleMerge({
       // Ignore comments where the user has been deleted already.
       user &&
       // Ignore comments which had already been responded to by the bot.
-      !events.some(
-        ({ event, body }) =>
-          ['commented'].includes(event) &&
-          // We're only testing this hidden reference, but not the author of the comment.
-          // We'll just assume that nobody creates comments with this marker on purpose.
-          // Additionally checking the author is quite annoying for local debugging.
-          body.match(new RegExp(`^<!-- comment: ${node_id} -->$`, 'm')),
-      ),
+      (dry ||
+        !events.some(
+          ({ event, body }) =>
+            ['commented'].includes(event) &&
+            // We're only testing this hidden reference, but not the author of the comment.
+            // We'll just assume that nobody creates comments with this marker on purpose.
+            // Additionally checking the author is quite annoying for local debugging.
+            body.match(new RegExp(`^<!-- comment: ${node_id} -->$`, 'm')),
+        )),
   )
 
   async function merge() {

From f1d61d9f309249fd1cab4cf029276d38aeff80cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 14:47:37 +0000
Subject: [PATCH 5318/6226] cocoon: 0.5.0 -> 0.5.1

---
 pkgs/by-name/co/cocoon/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cocoon/package.nix b/pkgs/by-name/co/cocoon/package.nix
index 35948e1380cb..4bc273b76ee9 100644
--- a/pkgs/by-name/co/cocoon/package.nix
+++ b/pkgs/by-name/co/cocoon/package.nix
@@ -6,13 +6,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "cocoon";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "haileyok";
     repo = "cocoon";
     tag = finalAttrs.version;
-    hash = "sha256-9gJj+edTGkQsHH72F2f7A6EWDet+k38+8UZ1KN2UGT0=";
+    hash = "sha256-2zvbPhvYoKlQTZDjpo6LRr9DLKzSmcH0qnU1oJ+7k04=";
   };
 
   ldflags = [

From 1b2b5808e8fa29fb698443df961c7465ab4a5db5 Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 4 Nov 2025 08:50:30 -0600
Subject: [PATCH 5319/6226] gemstash: migrate to by-name

---
 pkgs/{development/tools => by-name/ge}/gemstash/Gemfile         | 0
 pkgs/{development/tools => by-name/ge}/gemstash/Gemfile.lock    | 0
 pkgs/{development/tools => by-name/ge}/gemstash/gemset.nix      | 0
 .../gemstash/default.nix => by-name/ge/gemstash/package.nix}    | 0
 pkgs/top-level/all-packages.nix                                 | 2 --
 5 files changed, 2 deletions(-)
 rename pkgs/{development/tools => by-name/ge}/gemstash/Gemfile (100%)
 rename pkgs/{development/tools => by-name/ge}/gemstash/Gemfile.lock (100%)
 rename pkgs/{development/tools => by-name/ge}/gemstash/gemset.nix (100%)
 rename pkgs/{development/tools/gemstash/default.nix => by-name/ge/gemstash/package.nix} (100%)

diff --git a/pkgs/development/tools/gemstash/Gemfile b/pkgs/by-name/ge/gemstash/Gemfile
similarity index 100%
rename from pkgs/development/tools/gemstash/Gemfile
rename to pkgs/by-name/ge/gemstash/Gemfile
diff --git a/pkgs/development/tools/gemstash/Gemfile.lock b/pkgs/by-name/ge/gemstash/Gemfile.lock
similarity index 100%
rename from pkgs/development/tools/gemstash/Gemfile.lock
rename to pkgs/by-name/ge/gemstash/Gemfile.lock
diff --git a/pkgs/development/tools/gemstash/gemset.nix b/pkgs/by-name/ge/gemstash/gemset.nix
similarity index 100%
rename from pkgs/development/tools/gemstash/gemset.nix
rename to pkgs/by-name/ge/gemstash/gemset.nix
diff --git a/pkgs/development/tools/gemstash/default.nix b/pkgs/by-name/ge/gemstash/package.nix
similarity index 100%
rename from pkgs/development/tools/gemstash/default.nix
rename to pkgs/by-name/ge/gemstash/package.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index fde10b631cc0..c7b657a874fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2736,8 +2736,6 @@ with pkgs;
 
   fluentd = callPackage ../tools/misc/fluentd { };
 
-  gemstash = callPackage ../development/tools/gemstash { };
-
   lp_solve = callPackage ../applications/science/math/lp_solve {
     inherit (darwin) autoSignDarwinBinariesHook;
   };

From 04a1492dd0694cf9cd26ab3a46e6d3717b778e5b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 14:50:42 +0000
Subject: [PATCH 5320/6226] cargo-xwin: 0.20.1 -> 0.20.2

---
 pkgs/by-name/ca/cargo-xwin/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix
index 7a20ab396ca6..1fc98aaabd9b 100644
--- a/pkgs/by-name/ca/cargo-xwin/package.nix
+++ b/pkgs/by-name/ca/cargo-xwin/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-xwin";
-  version = "0.20.1";
+  version = "0.20.2";
 
   src = fetchFromGitHub {
     owner = "rust-cross";
     repo = "cargo-xwin";
     rev = "v${version}";
-    hash = "sha256-RfXX6LZrxQmWtjnMVIpCj9KVn5fnvQRGgEeH+gTR0Vk=";
+    hash = "sha256-M7OO2yO5BvNTqJLI50g25M5aupdOxmlZ3eealmP51Kc=";
   };
 
-  cargoHash = "sha256-0N2JLENHG6QUcEtw237Oe/fwdgo87DVJ+Gx6wtpP9BU=";
+  cargoHash = "sha256-DwQGmdSzEjzqfsvqczAMJfi9gJjK2b9FAGmMi7rGKuw=";
 
   meta = with lib; {
     description = "Cross compile Cargo project to Windows MSVC target with ease";

From 02e7276eeeb54e2d9968c2373da6cfb3ac3945bf Mon Sep 17 00:00:00 2001
From: Guy Chronister <guychronister@outlook.com>
Date: Tue, 4 Nov 2025 08:53:41 -0600
Subject: [PATCH 5321/6226] gemstash: qualify lib attributes, hardcode pname

---
 pkgs/by-name/ge/gemstash/package.nix | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ge/gemstash/package.nix b/pkgs/by-name/ge/gemstash/package.nix
index 8256c82baa28..9d71a784750a 100644
--- a/pkgs/by-name/ge/gemstash/package.nix
+++ b/pkgs/by-name/ge/gemstash/package.nix
@@ -5,20 +5,22 @@
   nixosTests,
 }:
 
-bundlerApp rec {
+bundlerApp {
   pname = "gemstash";
   gemdir = ./.;
-  exes = [ pname ];
+  exes = [ "gemstash" ];
 
   passthru = {
-    updateScript = bundlerUpdateScript pname;
+    updateScript = bundlerUpdateScript "gemstash";
     tests = { inherit (nixosTests) gemstash; };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Cache for RubyGems.org and a private gem server";
     homepage = "https://github.com/rubygems/gemstash";
-    license = licenses.mit;
-    maintainers = [ maintainers.viraptor ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      viraptor
+    ];
   };
 }

From 69295e32f8cb571aaff9466842a4dc5c55397eb0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 15:02:09 +0000
Subject: [PATCH 5322/6226] olympus-unwrapped: 25.10.25.02 -> 25.11.02.03

---
 pkgs/by-name/ol/olympus-unwrapped/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ol/olympus-unwrapped/package.nix b/pkgs/by-name/ol/olympus-unwrapped/package.nix
index 4845f0abbc9e..b49bc930d789 100644
--- a/pkgs/by-name/ol/olympus-unwrapped/package.nix
+++ b/pkgs/by-name/ol/olympus-unwrapped/package.nix
@@ -31,9 +31,9 @@ let
 
   phome = "$out/lib/olympus";
   # The following variables are to be updated by the update script.
-  version = "25.10.25.02";
-  buildId = "5257"; # IMPORTANT: This line is matched with regex in update.sh.
-  rev = "026231884815cdda170157b8006852a10c2bd361";
+  version = "25.11.02.03";
+  buildId = "5271"; # IMPORTANT: This line is matched with regex in update.sh.
+  rev = "79673980d47003d9756b373001a9f57c267acbfb";
 in
 buildDotnetModule {
   pname = "olympus-unwrapped";
@@ -44,7 +44,7 @@ buildDotnetModule {
     owner = "EverestAPI";
     repo = "Olympus";
     fetchSubmodules = true; # Required. See upstream's README.
-    hash = "sha256-YfFRi8vWGLJcXrVvYRfokgdFXSys3lRZDK6ggAxxllA=";
+    hash = "sha256-KMGSAIYNlzWK9jvn7QTmxUQRNjn0VQU5kLVzTc9mzf8=";
   };
 
   nativeBuildInputs = [

From a8d4474ae16fb2a8d562f0b718e9a43ac8b8622e Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 4 Nov 2025 16:04:03 +0100
Subject: [PATCH 5323/6226] music-assistant: add emilylange as maintainer

---
 pkgs/by-name/mu/music-assistant/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix
index c9a6459a3346..9f6589ba03cf 100644
--- a/pkgs/by-name/mu/music-assistant/package.nix
+++ b/pkgs/by-name/mu/music-assistant/package.nix
@@ -193,7 +193,10 @@ python.pkgs.buildPythonApplication rec {
     '';
     homepage = "https://github.com/music-assistant/server";
     license = lib.licenses.asl20;
-    maintainers = with lib.maintainers; [ hexa ];
+    maintainers = with lib.maintainers; [
+      hexa
+      emilylange
+    ];
     mainProgram = "mass";
   };
 }

From 2ae599d7863e5793a44388957c0a63addfb823a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Nov 2025 07:09:30 -0800
Subject: [PATCH 5324/6226] python3Packages.aiohomematic: 2025.10.5 ->
 2025.11.5

Diff: https://github.com/SukramJ/aiohomematic/compare/2025.10.5...2025.11.5

Changelog: https://github.com/SukramJ/aiohomematic/blob/2025.11.5/changelog.md
---
 .../python-modules/aiohomematic/default.nix        | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/aiohomematic/default.nix b/pkgs/development/python-modules/aiohomematic/default.nix
index 363dbf4fc3ce..b5c0f4bf18fb 100644
--- a/pkgs/development/python-modules/aiohomematic/default.nix
+++ b/pkgs/development/python-modules/aiohomematic/default.nix
@@ -16,21 +16,16 @@
 
 buildPythonPackage rec {
   pname = "aiohomematic";
-  version = "2025.10.5";
+  version = "2025.11.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SukramJ";
     repo = "aiohomematic";
     tag = version;
-    hash = "sha256-DgLeshxPo2ZwQXe8pSg81kFLviEWKakOY8DtdQH/H58=";
+    hash = "sha256-bqhuh+9rcqKreZCc3WJPFR1i3Y8mjtLER/bLlbMp6xc=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "setuptools==80.9.0" "setuptools"
-  '';
-
   build-system = [ setuptools ];
 
   dependencies = [
@@ -50,11 +45,6 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aiohomematic" ];
 
-  disabledTests = [
-    # AssertionError: assert 548 == 555
-    "test_central_full"
-  ];
-
   meta = {
     description = "Module to interact with HomeMatic devices";
     homepage = "https://github.com/SukramJ/aiohomematic";

From 2d8969c8c1c1adee2de15b507beef834cf99b93d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Nov 2025 07:09:51 -0800
Subject: [PATCH 5325/6226] home-assistant-custom-components.homematicip_local:
 1.89.1 -> 1.90.0

Diff: https://github.com/SukramJ/custom_homematic/compare/1.89.1...1.90.0

Changelog: https://github.com/SukramJ/custom_homematic/blob/1.90.0/changelog.md
---
 .../custom-components/homematicip_local/package.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
index 27863dcaf353..c0d5320eb45b 100644
--- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
@@ -9,13 +9,13 @@
 buildHomeAssistantComponent rec {
   owner = "SukramJ";
   domain = "homematicip_local";
-  version = "1.89.1";
+  version = "1.90.0";
 
   src = fetchFromGitHub {
     owner = "SukramJ";
     repo = "custom_homematic";
     tag = version;
-    hash = "sha256-40t64RAJy/isLfcP71pKiqh3cFXy/s1Mv35NosPnh48=";
+    hash = "sha256-tdOxZWofsb2loN1ItQNeEwjIR4divLidyiyAgze6hqw=";
   };
 
   postPatch = ''

From 810b9ba51da5c95f1adde03f8b96be140c017d48 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 4 Nov 2025 10:59:03 +0100
Subject: [PATCH 5326/6226] ci/github-script/bot: improve parallelism

We used to employ the worst strategy for parallelism possibly: The rate
limiter capped us at one concurrent request per second, while 100+ items
were handled in parallel. This lead to every item taking the full
duration of the job to proceed, making the data fetched at the beginning
of the job stale at the end. This leads to smaller hiccups when
labeling, or to the merge-bot posting comments after the PR has already
been closed.

GitHub allows 100 concurrent requests, but considers it a best practice
to serialize them. Since serializing all of them causes problems for us,
we should try to go higher.

Since other jobs are running in parallel, we use a conservative value of
20 concurrent requests here. We also introduce the same number of
workers going through the list of items, to make sure that each item is
handled in the shortest time possible from start to finish, before
proceeding to the next. This gives us roughly 2.5 seconds per individual
item - but speeds up the overall execution of the scheduled job to 20-30
seconds from 3-4 minutes before.
---
 ci/github-script/bot.js           | 28 ++++++++++++++++++++++------
 ci/github-script/withRateLimit.js |  4 ++--
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index fb5e79e54239..fd5d4fa6df31 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -496,7 +496,11 @@ module.exports = async ({ github, context, core, dry }) => {
     }
   }
 
-  await withRateLimit({ github, core }, async (stats) => {
+  // Controls level of parallelism. Applies to both the number of concurrent requests
+  // as well as the number of concurrent workers going through the list of PRs.
+  const maxConcurrent = 20
+
+  await withRateLimit({ github, core, maxConcurrent }, async (stats) => {
     if (context.payload.pull_request) {
       await handle({ item: context.payload.pull_request, stats })
     } else {
@@ -625,11 +629,23 @@ module.exports = async ({ github, context, core, dry }) => {
             arr.findIndex((firstItem) => firstItem.number === thisItem.number),
         )
 
-      ;(await Promise.allSettled(items.map((item) => handle({ item, stats }))))
-        .filter(({ status }) => status === 'rejected')
-        .map(({ reason }) =>
-          core.setFailed(`${reason.message}\n${reason.cause.stack}`),
-        )
+      // Instead of handling all items in parallel we set up some workers to handle the queue
+      // with more controlled parallelism. This avoids problems with `pull_request` fetched at
+      // the beginning getting out of date towards the end, because it took the whole job 20
+      // minutes or more to go through 100's of PRs.
+      await Promise.all(
+        Array.from({ length: maxConcurrent }, async () => {
+          while (true) {
+            const item = items.pop()
+            if (!item) break
+            try {
+              await handle({ item, stats })
+            } catch (e) {
+              core.setFailed(`${e.message}\n${e.cause.stack}`)
+            }
+          }
+        }),
+      )
     }
   })
 }
diff --git a/ci/github-script/withRateLimit.js b/ci/github-script/withRateLimit.js
index efc63057beb7..d1b1c756ea09 100644
--- a/ci/github-script/withRateLimit.js
+++ b/ci/github-script/withRateLimit.js
@@ -1,4 +1,4 @@
-module.exports = async ({ github, core }, callback) => {
+module.exports = async ({ github, core, maxConcurrent = 1 }, callback) => {
   const Bottleneck = require('bottleneck')
 
   const stats = {
@@ -13,7 +13,7 @@ module.exports = async ({ github, core }, callback) => {
   //   https://docs.github.com/en/rest/using-the-rest-api/best-practices-for-using-the-rest-api
   const allLimits = new Bottleneck({
     // Avoid concurrent requests
-    maxConcurrent: 1,
+    maxConcurrent,
     // Will be updated with first `updateReservoir()` call below.
     reservoir: 0,
   })

From 1197fe48da1d45506a3e95702ce5fb6437368598 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 4 Nov 2025 11:02:32 +0100
Subject: [PATCH 5327/6226] wprkflows/bot: increase frequency to every 5
 minutes

This makes reactions to merge comments and all the labeling a bit
quicker. Lower the number of backlog items to process per run
accordingly, so that we don't really need more API requests for it.
---
 .github/workflows/bot.yml | 4 +++-
 ci/github-script/bot.js   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
index beb79b82c941..b60e9d5c2ed6 100644
--- a/.github/workflows/bot.yml
+++ b/.github/workflows/bot.yml
@@ -7,7 +7,9 @@ name: Bot
 
 on:
   schedule:
-    - cron: '05,15,25,35,45,55 * * * *'
+    # Run every 5m
+    # i.e., at each of the listed minutes, every hour
+    - cron: '02,07,12,17,22,27,32,37,42,47,52,57 * * * *'
   workflow_call:
     inputs:
       headBranch:
diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index fd5d4fa6df31..783d59ab51f4 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -587,7 +587,7 @@ module.exports = async ({ github, context, core, dry }) => {
         state: 'open',
         sort: 'created',
         direction: 'asc',
-        per_page: 100,
+        per_page: 50,
         after: cursor,
       })
 

From 5f2b97539d1ce581d6b3eb92a711ca5d6a1865e7 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 4 Nov 2025 12:14:37 -0300
Subject: [PATCH 5328/6226] niftyseg: fix build with cmake4

---
 pkgs/by-name/ni/niftyseg/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/ni/niftyseg/package.nix b/pkgs/by-name/ni/niftyseg/package.nix
index 1c7d59328a45..f2b415277c3f 100644
--- a/pkgs/by-name/ni/niftyseg/package.nix
+++ b/pkgs/by-name/ni/niftyseg/package.nix
@@ -24,6 +24,13 @@ stdenv.mkDerivation rec {
     zlib
   ];
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_minimum_required(VERSION 3.0.2)" "cmake_minimum_required(VERSION 3.10)" \
+      --replace-fail "cmake_policy(VERSION 2.8)" "cmake_policy(VERSION 3.10)"
+  '';
+
   meta = with lib; {
     homepage = "http://cmictig.cs.ucl.ac.uk/research/software/software-nifty/niftyseg";
     description = "Software for medical image segmentation, bias field correction, and cortical thickness calculation";

From 7163a78890fed8cf9c09cf48d0fe6d1b2acab30d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fabian=20M=C3=B6ller?= <fabianm88@gmail.com>
Date: Tue, 4 Nov 2025 16:20:06 +0100
Subject: [PATCH 5329/6226] breitbandmessung: update to electron_38

---
 pkgs/by-name/br/breitbandmessung/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/br/breitbandmessung/package.nix b/pkgs/by-name/br/breitbandmessung/package.nix
index f85c107c54db..f52dfb233f9b 100644
--- a/pkgs/by-name/br/breitbandmessung/package.nix
+++ b/pkgs/by-name/br/breitbandmessung/package.nix
@@ -4,7 +4,7 @@
   fetchurl,
   asar,
   dpkg,
-  electron_36,
+  electron_38,
   makeWrapper,
   nixosTests,
   undmg,
@@ -13,7 +13,7 @@
 let
   inherit (stdenv.hostPlatform) system;
 
-  electron = electron_36;
+  electron = electron_38;
 
   sources = import ./sources.nix;
 

From 8b6ab55e0ad0e5c664f29202935ceddce47e10c2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 15:21:17 +0000
Subject: [PATCH 5330/6226] checkov: 3.2.489 -> 3.2.490

---
 pkgs/by-name/ch/checkov/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix
index 80d267e35b8b..bd243df7ba47 100644
--- a/pkgs/by-name/ch/checkov/package.nix
+++ b/pkgs/by-name/ch/checkov/package.nix
@@ -37,14 +37,14 @@ with py.pkgs;
 
 python3.pkgs.buildPythonApplication rec {
   pname = "checkov";
-  version = "3.2.489";
+  version = "3.2.490";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "bridgecrewio";
     repo = "checkov";
     tag = version;
-    hash = "sha256-uh6yp3hPRv9+EtJbsN6cnOQeDNzlJNJOHeJeGmKP8rQ=";
+    hash = "sha256-QK4dPF+3F53chmN2WSDkVkrnB+XFSAKWuxqQe1M8nu8=";
   };
 
   pythonRelaxDeps = [

From 6bce32090175b19164da284d78255f6a4ca11ec0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 4 Nov 2025 16:22:05 +0100
Subject: [PATCH 5331/6226] level-zero: 1.24.3 -> 1.25.1

Changelog: https://github.com/oneapi-src/level-zero/blob/v1.25.2/CHANGELOG.md
---
 pkgs/by-name/le/level-zero/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/le/level-zero/package.nix b/pkgs/by-name/le/level-zero/package.nix
index 83b4419136cf..c4b278362ff8 100644
--- a/pkgs/by-name/le/level-zero/package.nix
+++ b/pkgs/by-name/le/level-zero/package.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "level-zero";
-  version = "1.24.3";
+  version = "1.25.2";
 
   src = fetchFromGitHub {
     owner = "oneapi-src";
     repo = "level-zero";
     tag = "v${version}";
-    hash = "sha256-1UwcH+7q2elpqlqafpytC+K0jTHYdyjRtUX9hpBq+EQ=";
+    hash = "sha256-qB88S5k+HLBSOxNo6JBSGihJnY1jUdIpJTdLwgAP6bA=";
   };
 
   nativeBuildInputs = [

From a46a61e39caa9736fbff66cf9f2437028b6217f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Nov 2025 07:27:58 -0800
Subject: [PATCH 5332/6226] python3Packages.aiohomematic-test-support: init at
 2025.11.5

---
 .../aiohomematic-test-support/default.nix     | 28 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 30 insertions(+)
 create mode 100644 pkgs/development/python-modules/aiohomematic-test-support/default.nix

diff --git a/pkgs/development/python-modules/aiohomematic-test-support/default.nix b/pkgs/development/python-modules/aiohomematic-test-support/default.nix
new file mode 100644
index 000000000000..4121f93725a2
--- /dev/null
+++ b/pkgs/development/python-modules/aiohomematic-test-support/default.nix
@@ -0,0 +1,28 @@
+{
+  aiohomematic,
+  buildPythonPackage,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "aiohomematic-test-support";
+  inherit (aiohomematic) version src;
+  pyproject = true;
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
+  '';
+
+  sourceRoot = "${src.name}/aiohomematic_test_support";
+
+  build-system = [ setuptools ];
+
+  pythonImportsCheck = [ "aiohomematic_test_support" ];
+
+  meta = {
+    description = "Support-only package for AioHomematic (tests/dev)";
+    homepage = "https://github.com/SukramJ/aiohomematic/tree/devel/aiohomematic_test_support";
+    inherit (aiohomematic.meta) license maintainers;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 41059f238981..f22805eed7cc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -296,6 +296,8 @@ self: super: with self; {
 
   aiohomematic = callPackage ../development/python-modules/aiohomematic { };
 
+  aiohomematic-test-support = callPackage ../development/python-modules/aiohomematic-test-support { };
+
   aiohttp = callPackage ../development/python-modules/aiohttp { };
 
   aiohttp-apispec = callPackage ../development/python-modules/aiohttp-apispec { };

From b28cdd538cd588986d0762a0dad61f881537308d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 15:28:30 +0000
Subject: [PATCH 5333/6226] linuxPackages.tuxedo-drivers: 4.16.0 -> 4.18.0

---
 pkgs/os-specific/linux/tuxedo-drivers/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/tuxedo-drivers/default.nix b/pkgs/os-specific/linux/tuxedo-drivers/default.nix
index db9efc0dc13a..e8ce6ff5198e 100644
--- a/pkgs/os-specific/linux/tuxedo-drivers/default.nix
+++ b/pkgs/os-specific/linux/tuxedo-drivers/default.nix
@@ -13,14 +13,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "tuxedo-drivers-${kernel.version}";
-  version = "4.16.0";
+  version = "4.18.0";
 
   src = fetchFromGitLab {
     group = "tuxedocomputers";
     owner = "development/packages";
     repo = "tuxedo-drivers";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-NjKhr8wsnoKSFx5kEXVaQ2SQzAX8XG8ENpYKOSMB2yc=";
+    hash = "sha256-9XtogovzAWaMkJI5CxszY5qO3q6NOACZ7pnejyobJlY=";
   };
 
   patches = [ ./no-cp-usr.patch ];

From 0727d46778dad622a807e5fa98047ed10542cf52 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Tue, 4 Nov 2025 12:28:51 -0300
Subject: [PATCH 5334/6226] niftyseg: mark as broken on darwin

---
 pkgs/by-name/ni/niftyseg/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/ni/niftyseg/package.nix b/pkgs/by-name/ni/niftyseg/package.nix
index f2b415277c3f..4be9dd5fe895 100644
--- a/pkgs/by-name/ni/niftyseg/package.nix
+++ b/pkgs/by-name/ni/niftyseg/package.nix
@@ -37,6 +37,8 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ bcdarwin ];
     platforms = platforms.unix;
     license = licenses.bsd3;
+    # last successful hydra build on darwin was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 
 }

From 6b21cd238dba101d156803226e4ea31c310ec946 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Nov 2025 07:31:40 -0800
Subject: [PATCH 5335/6226] home-assistant-custom-components.homematicip_local:
 run tests

---
 .../homematicip_local/package.nix                | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
index c0d5320eb45b..f0a178c08d2b 100644
--- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
@@ -1,9 +1,13 @@
 {
   lib,
+  async-upnp-client,
   buildHomeAssistantComponent,
   fetchFromGitHub,
   aiohomematic,
+  aiohomematic-test-support,
   home-assistant,
+  pytest-homeassistant-custom-component,
+  pytestCheckHook,
 }:
 
 buildHomeAssistantComponent rec {
@@ -29,6 +33,18 @@ buildHomeAssistantComponent rec {
     aiohomematic
   ];
 
+  nativeCheckInputs = [
+    aiohomematic-test-support
+    async-upnp-client
+    pytest-homeassistant-custom-component
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # custom_components.homematicip_local.support.InvalidConfig: C
+    "test_async_validate_config_and_get_system_information"
+  ];
+
   meta = {
     changelog = "https://github.com/SukramJ/custom_homematic/blob/${src.tag}/changelog.md";
     description = "Custom Home Assistant Component for HomeMatic";

From 58a1fe4761b55e98d6652e04fa628d81d3e75a1d Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 4 Nov 2025 12:14:13 +0100
Subject: [PATCH 5336/6226] ci/github-script/bot: move getTeamMembers cache
 into main file

This allows re-using this elsewhere with a shared cache.
---
 ci/github-script/bot.js   | 24 ++++++++++++++++++++++++
 ci/github-script/merge.js | 30 ++++--------------------------
 2 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index fb5e79e54239..2c3bd45f69e5 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -96,6 +96,29 @@ module.exports = async ({ github, context, core, dry }) => {
     return maintainerMaps[branch]
   }
 
+  // Caching the list of team members saves API requests when running the bot on the schedule and
+  // processing many PRs at once.
+  const members = {}
+  function getTeamMembers(team_slug) {
+    if (context.eventName === 'pull_request') {
+      // We have no chance of getting a token in the pull_request context with the right
+      // permissions to access the members endpoint below. Thus, we're pretending to have
+      // no members. This is OK; because this is only for the Test workflow, not for
+      // real use.
+      return []
+    }
+
+    if (!members[team_slug]) {
+      members[team_slug] = github.paginate(github.rest.teams.listMembersInOrg, {
+        org: context.repo.owner,
+        team_slug,
+        per_page: 100,
+      })
+    }
+
+    return members[team_slug]
+  }
+
   async function handlePullRequest({ item, stats, events }) {
     const log = (k, v) => core.info(`PR #${item.number} - ${k}: ${v}`)
 
@@ -121,6 +144,7 @@ module.exports = async ({ github, context, core, dry }) => {
       pull_request,
       events,
       maintainers,
+      getTeamMembers,
     })
 
     // When the same change has already been merged to the target branch, a PR will still be
diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index 02854dbd5ea3..8a6789a30544 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -109,10 +109,6 @@ async function handleMergeComment({ github, body, node_id, reaction }) {
   )
 }
 
-// Caching the list of team members saves API requests when running the bot on the schedule and
-// processing many PRs at once.
-const members = {}
-
 async function handleMerge({
   github,
   context,
@@ -122,31 +118,13 @@ async function handleMerge({
   pull_request,
   events,
   maintainers,
+  getTeamMembers,
 }) {
   const pull_number = pull_request.number
 
-  function getTeamMembers(team_slug) {
-    if (context.eventName === 'pull_request') {
-      // We have no chance of getting a token in the pull_request context with the right
-      // permissions to access the members endpoint below. Thus, we're pretending to have
-      // no members. This is OK; because this is only for the Test workflow, not for
-      // real use.
-      return new Set()
-    }
-
-    if (!members[team_slug]) {
-      members[team_slug] = github
-        .paginate(github.rest.teams.listMembersInOrg, {
-          org: context.repo.owner,
-          team_slug,
-          per_page: 100,
-        })
-        .then((members) => new Set(members.map(({ id }) => id)))
-    }
-
-    return members[team_slug]
-  }
-  const committers = await getTeamMembers('nixpkgs-committers')
+  const committers = new Set(
+    (await getTeamMembers('nixpkgs-committers')).map(({ id }) => id),
+  )
 
   const files = await github.paginate(github.rest.pulls.listFiles, {
     ...context.repo,

From a0fbb8805d231c73a25170966958dd33d9663396 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 15:44:47 +0000
Subject: [PATCH 5337/6226] vscode-extensions.signageos.signageos-vscode-sops:
 0.9.2 -> 0.9.3

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index c942f4b79abc..69bedeaef989 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4217,8 +4217,8 @@ let
         mktplcRef = {
           name = "signageos-vscode-sops";
           publisher = "signageos";
-          version = "0.9.2";
-          hash = "sha256-qlFD8sMvdKpLkXiYT9UybgCvxUJrbXpAcnmPxk91Tbs=";
+          version = "0.9.3";
+          hash = "sha256-fOSLlszr6yLkRC9gy+MCnL+Y/1TXrmVWAWavpvXHj4U=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/signageos.signageos-vscode-sops/changelog";

From d64d5f8aff14bb66279ca45a6bf99d9b1148b229 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 16:05:54 +0100
Subject: [PATCH 5338/6226] hurl: use finalAttrs pattern

---
 pkgs/by-name/hu/hurl/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/hu/hurl/package.nix b/pkgs/by-name/hu/hurl/package.nix
index 107a5a22de31..a4e4f73b97a9 100644
--- a/pkgs/by-name/hu/hurl/package.nix
+++ b/pkgs/by-name/hu/hurl/package.nix
@@ -10,14 +10,14 @@
   versionCheckHook,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hurl";
   version = "7.0.0";
 
   src = fetchFromGitHub {
     owner = "Orange-OpenSource";
     repo = "hurl";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-dmPXI2RHEi/wcdVVwBRtBgNXyBXFnm44236pqYjxgBs=";
   };
 
@@ -55,11 +55,11 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Command line tool that performs HTTP requests defined in a simple plain text format";
     homepage = "https://hurl.dev/";
-    changelog = "https://github.com/Orange-OpenSource/hurl/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/Orange-OpenSource/hurl/blob/${finalAttrs.version}/CHANGELOG.md";
     maintainers = with lib.maintainers; [
       eonpatapon
     ];
     license = lib.licenses.asl20;
     mainProgram = "hurl";
   };
-}
+})

From 07dae33bbda0339e0c08b6c80cd2ffd1a8e8a3f4 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 16:08:59 +0100
Subject: [PATCH 5339/6226] hurl: add updateScript

---
 pkgs/by-name/hu/hurl/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/hu/hurl/package.nix b/pkgs/by-name/hu/hurl/package.nix
index a4e4f73b97a9..9c3c9a701f9d 100644
--- a/pkgs/by-name/hu/hurl/package.nix
+++ b/pkgs/by-name/hu/hurl/package.nix
@@ -8,6 +8,7 @@
   openssl,
   curl,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -52,6 +53,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --zsh completions/_hurlfmt
   '';
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Command line tool that performs HTTP requests defined in a simple plain text format";
     homepage = "https://hurl.dev/";

From 7eb110755b69ae6abe0dafdd81c275e25af2ce10 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 13:07:00 +0100
Subject: [PATCH 5340/6226] hurl: add defelo to maintainers

---
 pkgs/by-name/hu/hurl/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/hu/hurl/package.nix b/pkgs/by-name/hu/hurl/package.nix
index 9c3c9a701f9d..cd2a3c0c6de4 100644
--- a/pkgs/by-name/hu/hurl/package.nix
+++ b/pkgs/by-name/hu/hurl/package.nix
@@ -61,6 +61,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     changelog = "https://github.com/Orange-OpenSource/hurl/blob/${finalAttrs.version}/CHANGELOG.md";
     maintainers = with lib.maintainers; [
       eonpatapon
+      defelo
     ];
     license = lib.licenses.asl20;
     mainProgram = "hurl";

From 78ab67015fbabca7df37ea588a45e93f00041d42 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 17:07:28 +0100
Subject: [PATCH 5341/6226] cargo-expand: use finalAttrs pattern

---
 pkgs/by-name/ca/cargo-expand/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix
index 4df4374750de..42a236deb93a 100644
--- a/pkgs/by-name/ca/cargo-expand/package.nix
+++ b/pkgs/by-name/ca/cargo-expand/package.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cargo-expand";
   version = "1.0.118";
 
   src = fetchFromGitHub {
     owner = "dtolnay";
     repo = "cargo-expand";
-    tag = version;
+    tag = finalAttrs.version;
     hash = "sha256-+n4eiwcToXtWMPmvE41kOcZHzgugjekxQkodDagDjhI=";
   };
 
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Cargo subcommand to show result of macro expansion";
     homepage = "https://github.com/dtolnay/cargo-expand";
-    changelog = "https://github.com/dtolnay/cargo-expand/releases/tag/${version}";
+    changelog = "https://github.com/dtolnay/cargo-expand/releases/tag/${finalAttrs.version}";
     license = with lib.licenses; [
       mit
       asl20
@@ -30,4 +30,4 @@ rustPlatform.buildRustPackage rec {
     ];
     mainProgram = "cargo-expand";
   };
-}
+})

From 03580a4bca9617ae4a5575acbb95088888256001 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 17:08:26 +0100
Subject: [PATCH 5342/6226] cargo-expand: add versionCheckHook

---
 pkgs/by-name/ca/cargo-expand/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix
index 42a236deb93a..7dac06d39b22 100644
--- a/pkgs/by-name/ca/cargo-expand/package.nix
+++ b/pkgs/by-name/ca/cargo-expand/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -17,6 +18,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-Di7Nnp8qYqpTkKmmUYoKxSkntepG80vVF2AkaN5yW+U=";
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   meta = {
     description = "Cargo subcommand to show result of macro expansion";
     homepage = "https://github.com/dtolnay/cargo-expand";

From b23f0366964cb59d743d048a7bd0b097cdb0b548 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 17:08:26 +0100
Subject: [PATCH 5343/6226] cargo-expand: add updateScript

---
 pkgs/by-name/ca/cargo-expand/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix
index 7dac06d39b22..5eb7042ae5ec 100644
--- a/pkgs/by-name/ca/cargo-expand/package.nix
+++ b/pkgs/by-name/ca/cargo-expand/package.nix
@@ -3,6 +3,7 @@
   rustPlatform,
   fetchFromGitHub,
   versionCheckHook,
+  nix-update-script,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -22,6 +23,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "Cargo subcommand to show result of macro expansion";
     homepage = "https://github.com/dtolnay/cargo-expand";

From 1cb07de49a06615a1ecb33c18a3cb6726ffa6566 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Tue, 4 Nov 2025 13:07:00 +0100
Subject: [PATCH 5344/6226] cargo-expand: add defelo to maintainers

---
 pkgs/by-name/ca/cargo-expand/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix
index 5eb7042ae5ec..5aca7c581568 100644
--- a/pkgs/by-name/ca/cargo-expand/package.nix
+++ b/pkgs/by-name/ca/cargo-expand/package.nix
@@ -35,6 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     ];
     maintainers = with lib.maintainers; [
       xrelkd
+      defelo
     ];
     mainProgram = "cargo-expand";
   };

From 5a4feee1826a89ea169ec34af480607650ea9d4e Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Fri, 6 Jun 2025 13:11:27 -0400
Subject: [PATCH 5345/6226] wild: init at 0.7.0

---
 pkgs/by-name/wi/wild/adapterTest.nix | 99 ++++++++++++++++++++++++++++
 pkgs/by-name/wi/wild/package.nix     | 60 +++++++++++++++++
 2 files changed, 159 insertions(+)
 create mode 100644 pkgs/by-name/wi/wild/adapterTest.nix
 create mode 100644 pkgs/by-name/wi/wild/package.nix

diff --git a/pkgs/by-name/wi/wild/adapterTest.nix b/pkgs/by-name/wi/wild/adapterTest.nix
new file mode 100644
index 000000000000..db334485cd80
--- /dev/null
+++ b/pkgs/by-name/wi/wild/adapterTest.nix
@@ -0,0 +1,99 @@
+{
+  lib,
+  stdenv,
+  makeBinaryWrapper,
+  gcc,
+  wild,
+  binutils-unwrapped-all-targets,
+  clang,
+  lld,
+  clang-tools,
+}:
+let
+  # These wrappers are REQUIRED for the Wild test suite to pass
+  #
+  # Write a wrapper for GCC that passes -B to *unwrapped* binutils.
+  # This ensures that if -fuse-ld=bfd is used, gcc picks up unwrapped ld.bfd
+  # instead of the hardcoded wrapper search directory.
+  # We pass it last because apparently gcc likes picking ld from the *first* -B,
+  # which we want our wild target directory to be if passed.
+  gccWrapper = stdenv.mkDerivation {
+    inherit (gcc) name;
+    dontUnpack = true;
+    dontConfigure = true;
+    dontInstall = true;
+
+    buildInputs = [ makeBinaryWrapper ];
+    buildPhase = ''
+      runHook preBuild
+
+      makeWrapper ${lib.getExe gcc} $out/bin/gcc \
+        --append-flag -B${binutils-unwrapped-all-targets}/bin
+
+      runHook postBuild
+    '';
+
+  };
+
+  gppWrapper = stdenv.mkDerivation {
+    dontUnpack = true;
+    dontConfigure = true;
+    dontInstall = true;
+
+    name = "g++-wrapped";
+    buildInputs = [ makeBinaryWrapper ];
+    buildPhase = ''
+      runHook preBuild
+
+      makeWrapper ${lib.getExe' gcc "g++"} $out/bin/g++ \
+        --append-flag -B${binutils-unwrapped-all-targets}/bin
+
+      runHook postBuild
+    '';
+  };
+in
+{
+  testWild = wild.overrideAttrs {
+    pname = "wild-tests";
+    doCheck = true;
+    doInstallCheck = false;
+    dontBuild = true;
+    buildType = "debug";
+
+    checkInputs = [
+      stdenv.cc.libc.out
+      stdenv.cc.libc.static
+    ];
+
+    # https://github.com/davidlattimore/wild/discussions/832#discussioncomment-14482948
+    checkFlags = lib.optionals stdenv.hostPlatform.isAarch64 [
+      "--skip=integration_test::program_name_71___unresolved_symbols_object_c__"
+    ];
+
+    # wild's tests compare the outputs of several different linkers. nixpkgs's
+    # patching and wrappers change the output behavior, so we must make sure
+    # that their behavior is compatible.
+    #
+    # Does not work if they are put in nativeCheckInputs or checkInputs
+    preCheck = ''
+      export LD_LIBRARY_PATH=${
+        lib.makeLibraryPath [
+          stdenv.cc.cc.lib
+        ]
+      }:$LD_LIBRARY_PATH
+
+      export PATH=${
+        lib.makeBinPath [
+          binutils-unwrapped-all-targets
+          clang
+          gccWrapper
+          gppWrapper
+          lld
+          clang-tools
+        ]
+      }:$PATH
+    '';
+
+    installPhase = "touch $out";
+  };
+}
diff --git a/pkgs/by-name/wi/wild/package.nix b/pkgs/by-name/wi/wild/package.nix
new file mode 100644
index 000000000000..544a56eebabf
--- /dev/null
+++ b/pkgs/by-name/wi/wild/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  fetchFromGitHub,
+  callPackage,
+  versionCheckHook,
+  rustPlatform,
+  pkg-config,
+  zstd,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "wild";
+  version = "0.7.0";
+
+  src = fetchFromGitHub {
+    owner = "davidlattimore";
+    repo = "wild";
+    tag = finalAttrs.version;
+    hash = "sha256-x0IZuWjj0LRMj4pu2FVaD8SENm/UVtE1e4rl0EOZZZM=";
+  };
+
+  cargoHash = "sha256-5s0qS8y0+EH+R1tgN2W5/+t+GdjbQdRVLlcA2KjpHsE=";
+
+  cargoBuildFlags = [ "-p wild-linker" ];
+
+  strictDeps = true;
+  nativeBuildInputs = [
+    pkg-config
+  ];
+  buildInputs = [
+    zstd
+  ];
+
+  env.ZSTD_SYS_USE_PKG_CONFIG = true;
+
+  doCheck = false; # Tests are ran in passthru tests
+
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
+  passthru = {
+    updateScript = nix-update-script { };
+
+    tests = callPackage ./adapterTest.nix { wild = finalAttrs.finalPackage; };
+  };
+
+  meta = {
+    description = "Very fast linker for Linux";
+    homepage = "https://github.com/davidlattimore/wild";
+    changelog = "https://github.com/davidlattimore/wild/blob/${finalAttrs.version}/CHANGELOG.md";
+    license = [
+      lib.licenses.asl20 # or
+      lib.licenses.mit
+    ];
+    mainProgram = "wild";
+    maintainers = with lib.maintainers; [ RossSmyth ];
+    platforms = lib.platforms.linux;
+  };
+})

From ef981af9a9a3c5a5f6185d9c274a948cc6f8fd07 Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Tue, 4 Nov 2025 11:40:58 -0500
Subject: [PATCH 5346/6226] cargo-auditable: RossSmyth adopts

---
 pkgs/development/compilers/rust/cargo-auditable.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/rust/cargo-auditable.nix b/pkgs/development/compilers/rust/cargo-auditable.nix
index 4e253946a456..ea637477cc76 100644
--- a/pkgs/development/compilers/rust/cargo-auditable.nix
+++ b/pkgs/development/compilers/rust/cargo-auditable.nix
@@ -38,7 +38,7 @@ let
         mit # or
         asl20
       ];
-      maintainers = [ ];
+      maintainers = with maintainers; [ RossSmyth ];
       broken = stdenv.hostPlatform != stdenv.buildPlatform;
     };
   };

From e9f7190afddeb45688bc151f148fd396d0ca3cbf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 16:53:21 +0000
Subject: [PATCH 5347/6226] monkeysAudio: 11.65 -> 11.80

---
 pkgs/by-name/mo/monkeysAudio/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/mo/monkeysAudio/package.nix b/pkgs/by-name/mo/monkeysAudio/package.nix
index 09069839e705..a9874a5aab18 100644
--- a/pkgs/by-name/mo/monkeysAudio/package.nix
+++ b/pkgs/by-name/mo/monkeysAudio/package.nix
@@ -6,12 +6,12 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "11.65";
+  version = "11.80";
   pname = "monkeys-audio";
 
   src = fetchzip {
     url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip";
-    hash = "sha256-XMvSab5ekbFyYptTqe0bfSkbptuTvbbRPc1r3IZL+Jk=";
+    hash = "sha256-Y1Zeuelx4fAWYm9dCETM47t80b4w2biTBrLujkgH1oA=";
     stripRoot = false;
   };
 

From f5b41cf146ccf544cfe169eaed96cc5de0638076 Mon Sep 17 00:00:00 2001
From: Stefan Frijters <sfrijters@gmail.com>
Date: Tue, 4 Nov 2025 17:54:50 +0100
Subject: [PATCH 5348/6226] libreoffice: remove deprecated dll

Use of this dll was removed in 2020:
https://git.libreoffice.org/core/+/01241113947fc7bd7f7b765dd897bb023c8ca99c
---
 pkgs/applications/office/libreoffice/default.nix | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix
index 1ef286791917..f569aa5267cc 100644
--- a/pkgs/applications/office/libreoffice/default.nix
+++ b/pkgs/applications/office/libreoffice/default.nix
@@ -222,16 +222,7 @@ let
     main = importVariant "main.nix";
     help = importVariant "help.nix";
     translations = importVariant "translations.nix";
-    deps = (importVariant "deps.nix") ++ [
-      # TODO: Why is this needed?
-      rec {
-        name = "unowinreg.dll";
-        url = "https://dev-www.libreoffice.org/extern/${md5name}";
-        sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga";
-        md5 = "185d60944ea767075d27247c3162b3bc";
-        md5name = "${md5}-${name}";
-      }
-    ];
+    deps = importVariant "deps.nix";
   };
   srcs = {
     third_party = map (

From b02faa01c831d50ca550169d565f7c62af59c59a Mon Sep 17 00:00:00 2001
From: Ulysses Zhan <UlyssesZhan@gmail.com>
Date: Tue, 4 Nov 2025 09:05:11 -0800
Subject: [PATCH 5349/6226] ahk_x11: 1.0.6 -> 1.0.7

---
 pkgs/by-name/ah/ahk_x11/package.nix |  4 ++--
 pkgs/by-name/ah/ahk_x11/shards.nix  | 28 ++++++++++++++--------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/pkgs/by-name/ah/ahk_x11/package.nix b/pkgs/by-name/ah/ahk_x11/package.nix
index c1cb30dd4c1b..d426783ec477 100644
--- a/pkgs/by-name/ah/ahk_x11/package.nix
+++ b/pkgs/by-name/ah/ahk_x11/package.nix
@@ -20,7 +20,7 @@
 # NOTICE: AHK_X11 from this package does not support compiling scripts into portable executables.
 let
   pname = "ahk_x11";
-  version = "1.0.6";
+  version = "1.0.7";
 
   inherit (xorg)
     libXinerama
@@ -37,7 +37,7 @@ crystal.buildCrystalPackage {
     owner = "phil294";
     repo = "AHK_X11";
     tag = version;
-    hash = "sha256-t2fGUIG3T8azx22lFhFAkABHwkePv9uThhlH+fwDj8E=";
+    hash = "sha256-VuqLlRgNyF6/4aVq1sNlVjOMih0TdHXbr0CqhA4QT6Y=";
     fetchSubmodules = true;
   };
 
diff --git a/pkgs/by-name/ah/ahk_x11/shards.nix b/pkgs/by-name/ah/ahk_x11/shards.nix
index 2961987c9413..a33b1c0d874c 100644
--- a/pkgs/by-name/ah/ahk_x11/shards.nix
+++ b/pkgs/by-name/ah/ahk_x11/shards.nix
@@ -1,60 +1,60 @@
 {
-  atspi = {
+  "atspi" = {
     url = "https://github.com/phil294/atspi.cr.git";
     rev = "7aec8d3604313da415e54e654c1dc6b33ae05d8d";
     sha256 = "1r6k9f00a2y406hqsgq0r58zlfmg3xbzqjmfh93nwqs4m6h0shml";
   };
-  cron_parser = {
+  "cron_parser" = {
     url = "https://github.com/kostya/cron_parser.git";
     rev = "v0.4.0";
     sha256 = "17fgg2nvyx99v05l10h6cnxfr7swz8yaxhmnk4l47kg2spi8w90a";
   };
-  future = {
+  "future" = {
     url = "https://github.com/crystal-community/future.cr.git";
     rev = "v1.0.0";
     sha256 = "1mji2djkrf4vxgs432kgkzxx54ybzk636789k2vsws3sf14l74i8";
   };
-  gi-crystal = {
+  "gi-crystal" = {
     url = "https://github.com/hugopl/gi-crystal.git";
     rev = "v0.23.0";
     sha256 = "0ykb7sy62036brix12sj416h6gx85liq2kivwkh2cmf71lk02cqr";
   };
-  gtk3 = {
+  "gtk3" = {
     url = "https://github.com/phil294/gtk3.cr.git";
     rev = "3e6cdc45c1c39d82c215b4cdf0bbb9b5598460e1";
     sha256 = "0x25p85kp2f6gbsi36nyddhji7mmmqa7v4xs18bddf3kbgh72nw3";
   };
-  harfbuzz = {
+  "harfbuzz" = {
     url = "https://github.com/hugopl/harfbuzz.cr.git";
-    rev = "v0.2.0";
-    sha256 = "06wgqxwyib5416yp53j2iwcbr3bl4jjxb1flm7z103l365par694";
+    rev = "v0.2.1";
+    sha256 = "08zx5q1mm1h4lzfr38dk8nk7mx1y955zdjl6n48rl619bc1ywdpg";
   };
-  notify = {
+  "notify" = {
     url = "https://github.com/phil294/notify.cr.git";
     rev = "0c9880e6169e09f0db1cb40432e0b76651d15ad3";
     sha256 = "1waasvhx4n817d8gqk3fza4ac4a9d71f80cfii5dbh2aqzhqf070";
   };
-  pango = {
+  "pango" = {
     url = "https://github.com/hugopl/pango.cr.git";
     rev = "v0.3.1";
     sha256 = "0xlf127flimnll875mcq92q7xsi975rrgdpcpmnrwllhdhfx9qmv";
   };
-  tasker = {
+  "tasker" = {
     url = "https://github.com/spider-gazelle/tasker.git";
     rev = "v2.1.4";
     sha256 = "0254sl279nrw5nz43dz5gm89ah1zrw5bvxfma81navpx5gfg9pyb";
   };
-  x11 = {
+  "x11" = {
     url = "https://github.com/phil294/x11-cr.git";
     rev = "5a937d647d8eac29106602fcdeb161a78eb3d59d";
     sha256 = "11rflkxrg1dl5c80llwan4qs47ir7w7lgqdmhy2z907kxbrfkznr";
   };
-  x_do = {
+  "x_do" = {
     url = "https://github.com/phil294/x_do.cr.git";
     rev = "94f755a4f18a9a9820e9738b371cbe6b49731926";
     sha256 = "099mrhyb8kly6isk7xr1mzxbxfm4xizmyyw2ylmlx4ywynz9iyl6";
   };
-  xtst = {
+  "xtst" = {
     url = "https://github.com/phil294/xtst-cr.git";
     rev = "f731b708e1789d039258ecd62f7b0d1107a00b78";
     sha256 = "1vhzn1ck7ifkvhw5f9kpljsa278va039wa6f3hhd8w6gr2zqvzk8";

From 5ffd35a7064449f2aabd5aef0d681b06b3022187 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Wed, 5 Nov 2025 01:05:25 +0800
Subject: [PATCH 5350/6226] check-meta: defaultCPEParts: accomodate null pname

---
 pkgs/stdenv/generic/check-meta.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix
index 1a3e65ea650d..6caed4b8bb24 100644
--- a/pkgs/stdenv/generic/check-meta.nix
+++ b/pkgs/stdenv/generic/check-meta.nix
@@ -677,7 +677,7 @@ let
           defaultCPEParts = {
             part = "a";
             #vendor = null;
-            ${if attrs ? pname then "product" else null} = attrs.pname;
+            ${if attrs.pname or null != null then "product" else null} = attrs.pname;
             #version = null;
             #update = null;
             edition = "*";

From 7aea7e1aa97286f674c13cd98a1c1ee046da376e Mon Sep 17 00:00:00 2001
From: DSeeLP <46624152+DSeeLP@users.noreply.github.com>
Date: Tue, 21 Oct 2025 19:51:40 +0200
Subject: [PATCH 5351/6226] dart.flutter_discord_rpc: add 1.1.0

---
 .../dart/package-source-builders/flutter_discord_rpc/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/default.nix b/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/default.nix
index b4aec34f897c..513c0a44cbdf 100644
--- a/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/default.nix
+++ b/pkgs/development/compilers/dart/package-source-builders/flutter_discord_rpc/default.nix
@@ -17,6 +17,7 @@ let
     cargoHash =
       {
         _1_0_0 = "sha256-C9WDE9+6V59yNCNVeMUY5lRpMJ+8XWpHpxzdTmz+/Yw=";
+        _1_1_0 = "sha256-Kztnt30EcqjXUNEAJW65P6yLjdnyW4Q+lHe6qlCe3xM=";
       }
       .${"_" + (lib.replaceStrings [ "." ] [ "_" ] version)} or (throw ''
         Unsupported version of pub 'flutter_discord_rpc': '${version}'

From 3f62752e6681bcf7a6e82b947f10bcc7287d70f4 Mon Sep 17 00:00:00 2001
From: DSeeLP <46624152+DSeeLP@users.noreply.github.com>
Date: Tue, 21 Oct 2025 19:51:40 +0200
Subject: [PATCH 5352/6226] finamp: 0.9.19-beta -> 0.9.20-beta
 https://github.com/jmshrv/finamp/releases/tag/0.9.20-beta

---
 pkgs/by-name/fi/finamp/package.nix       |   9 +-
 pkgs/by-name/fi/finamp/pubspec.lock.json | 279 ++++++++++++-----------
 2 files changed, 150 insertions(+), 138 deletions(-)

diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix
index 059501278184..1c99ea9ed046 100644
--- a/pkgs/by-name/fi/finamp/package.nix
+++ b/pkgs/by-name/fi/finamp/package.nix
@@ -1,7 +1,7 @@
 {
   lib,
   stdenv,
-  flutter332,
+  flutter335,
   mpv-unwrapped,
   patchelf,
   fetchFromGitHub,
@@ -9,16 +9,16 @@
   makeDesktopItem,
 }:
 let
-  version = "0.9.19-beta";
+  version = "0.9.20-beta";
 in
-flutter332.buildFlutterApplication {
+flutter335.buildFlutterApplication {
   inherit version;
   pname = "finamp";
   src = fetchFromGitHub {
     owner = "jmshrv";
     repo = "finamp";
     rev = version;
-    hash = "sha256-gvVKiaQ6qqMcE90B8T2FJKoViRxmIGsABmcXq+fO5hs=";
+    hash = "sha256-YuqYuUse6xugvc2hckZBc9kx+ryBmRQhoZzjwkpoNfo=";
   };
   pubspecLock = lib.importJSON ./pubspec.lock.json;
 
@@ -36,6 +36,7 @@ flutter332.buildFlutterApplication {
     palette_generator = "sha256-mnRJf3asu1mm9HYU8U0di+qRk3SpNFwN3S5QxChpIA0=";
     split_view = "sha256-unTJQDXUUPVDudlk0ReOPNYrsyEpbd/UMg1tHZsmg+k=";
     flutter_user_certificates_android = "sha256-HL1Qd0D3CLYJysWLX2jqWt1FJRGm/BE8EjVFPztOIPo=";
+    smtc_windows = "sha256-ESR6qw8ciJvo1YG3wNK7Uy/N0zzl6OX6q40Dmgsvx6A=";
   };
 
   postFixup = ''
diff --git a/pkgs/by-name/fi/finamp/pubspec.lock.json b/pkgs/by-name/fi/finamp/pubspec.lock.json
index e5bf7270afc9..41652ff39fa4 100644
--- a/pkgs/by-name/fi/finamp/pubspec.lock.json
+++ b/pkgs/by-name/fi/finamp/pubspec.lock.json
@@ -34,11 +34,11 @@
       "dependency": "direct main",
       "description": {
         "name": "app_links",
-        "sha256": "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba",
+        "sha256": "5f88447519add627fe1cbcab4fd1da3d4fed15b9baf29f28b22535c95ecee3e8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.4.0"
+      "version": "6.4.1"
     },
     "app_links_linux": {
       "dependency": "transitive",
@@ -174,18 +174,18 @@
       "dependency": "direct main",
       "description": {
         "name": "background_downloader",
-        "sha256": "c59bff0b66a6704bed8bfb09c67571df88167906e0f5543a722373b3d180a743",
+        "sha256": "a22acfa37aa06ba5cfe6eb7b1aa700c78af64770ff450c73dd3d279d7c37d4ac",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "9.2.3"
+      "version": "9.2.6"
     },
     "balanced_text": {
       "dependency": "direct main",
       "description": {
         "path": ".",
-        "ref": "e387fcaef4fabf7a24e8c7d9dbb9c967ab1582f4",
-        "resolved-ref": "e387fcaef4fabf7a24e8c7d9dbb9c967ab1582f4",
+        "ref": "8f3603a639be6a7d5b0008ec54b0e90df7cd8323",
+        "resolved-ref": "8f3603a639be6a7d5b0008ec54b0e90df7cd8323",
         "url": "https://github.com/Komodo5197/flutter-balanced-text.git"
       },
       "source": "git",
@@ -195,11 +195,11 @@
       "dependency": "direct main",
       "description": {
         "name": "battery_plus",
-        "sha256": "fb794c34cee2e4ea31005fb17ff15e1d904951ec7f15eedead741021870ee834",
+        "sha256": "ad16fcb55b7384be6b4bbc763d5e2031ac7ea62b2d9b6b661490c7b9741155bf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.2.2"
+      "version": "7.0.0"
     },
     "battery_plus_platform_interface": {
       "dependency": "transitive",
@@ -235,11 +235,11 @@
       "dependency": "transitive",
       "description": {
         "name": "build_cli_annotations",
-        "sha256": "b59d2769769efd6c9ff6d4c4cede0be115a566afc591705c2040b707534b1172",
+        "sha256": "e563c2e01de8974566a1998410d3f6f03521788160a02503b0b1f1a46c7b3d95",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.0"
+      "version": "2.1.1"
     },
     "build_config": {
       "dependency": "transitive",
@@ -305,11 +305,11 @@
       "dependency": "transitive",
       "description": {
         "name": "built_value",
-        "sha256": "0b1b12a0a549605e5f04476031cd0bc91ead1d7c8e830773a18ee54179b3cb62",
+        "sha256": "a30f0a0e38671e89a492c44d005b5545b830a961575bbd8336d42869ff71066d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.11.0"
+      "version": "8.12.0"
     },
     "characters": {
       "dependency": "transitive",
@@ -335,11 +335,11 @@
       "dependency": "direct main",
       "description": {
         "name": "chopper",
-        "sha256": "f366529b450d0fd91931b08339c7c1d09c746d0d20e5ffb8c8641a79b6114dc2",
+        "sha256": "fb6106cd29553e34c811874efd8e8ee051ad7b9546e0d8c79394d2b6c9621b45",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.2.0"
+      "version": "8.4.0"
     },
     "chopper_generator": {
       "dependency": "direct dev",
@@ -375,11 +375,11 @@
       "dependency": "direct main",
       "description": {
         "name": "clipboard",
-        "sha256": "2ec38f0e59878008ceca0ab122e4bfde98847f88ef0f83331362ba4521f565a9",
+        "sha256": "1920c0337f8808be4166c5f1b236301ff381ef69633b0757c502d97f1f740102",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.1.3"
+      "version": "2.0.2"
     },
     "clock": {
       "dependency": "transitive",
@@ -395,11 +395,11 @@
       "dependency": "transitive",
       "description": {
         "name": "code_builder",
-        "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e",
+        "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.10.1"
+      "version": "4.11.0"
     },
     "collection": {
       "dependency": "direct main",
@@ -425,11 +425,11 @@
       "dependency": "direct main",
       "description": {
         "name": "connectivity_plus",
-        "sha256": "051849e2bd7c7b3bc5844ea0d096609ddc3a859890ec3a9ac4a65a2620cc1f99",
+        "sha256": "33bae12a398f841c6cda09d1064212957265869104c478e5ad51e2fb26c3973c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.4"
+      "version": "7.0.0"
     },
     "connectivity_plus_platform_interface": {
       "dependency": "transitive",
@@ -555,11 +555,11 @@
       "dependency": "direct main",
       "description": {
         "name": "device_info_plus",
-        "sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a",
+        "sha256": "49413c8ca514dea7633e8def233b25efdf83ec8522955cc2c0e3ad802927e7c6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "11.5.0"
+      "version": "12.1.0"
     },
     "device_info_plus_platform_interface": {
       "dependency": "transitive",
@@ -612,7 +612,7 @@
       "version": "2.1.4"
     },
     "file": {
-      "dependency": "transitive",
+      "dependency": "direct main",
       "description": {
         "name": "file",
         "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4",
@@ -625,11 +625,11 @@
       "dependency": "direct main",
       "description": {
         "name": "file_picker",
-        "sha256": "ef9908739bdd9c476353d6adff72e88fd00c625f5b959ae23f7567bd5137db0a",
+        "sha256": "f2d9f173c2c14635cc0e9b14c143c49ef30b4934e8d1d274d6206fcb0086a06f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.2.0"
+      "version": "10.3.3"
     },
     "file_sizes": {
       "dependency": "direct main",
@@ -651,6 +651,26 @@
       "source": "hosted",
       "version": "1.1.1"
     },
+    "flex_color_picker": {
+      "dependency": "direct main",
+      "description": {
+        "name": "flex_color_picker",
+        "sha256": "8f753a1a026a13ea5cc5eddbae3ceb886f2537569ab2e5208efb1e3bb5af72ff",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.7.1"
+    },
+    "flex_seed_scheme": {
+      "dependency": "transitive",
+      "description": {
+        "name": "flex_seed_scheme",
+        "sha256": "b06d8b367b84cbf7ca5c5603c858fa5edae88486c4e4da79ac1044d73b6c62ec",
+        "url": "https://pub.dev"
+      },
+      "source": "hosted",
+      "version": "3.5.1"
+    },
     "flutter": {
       "dependency": "direct main",
       "description": "flutter",
@@ -681,31 +701,31 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_discord_rpc",
-        "sha256": "9363a803863d56fd89c0a21639c70b126245fcbafaeb0a3d091e7ac06951d03f",
+        "sha256": "7ee12a3ff928e85e5e0a60c7c23417a2f1f4e604e4983fc0789ff6562fb15f2b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.1.0"
     },
     "flutter_gen_core": {
       "dependency": "transitive",
       "description": {
         "name": "flutter_gen_core",
-        "sha256": "eda54fdc5de08e7eeea663eb8442aafc8660b5a13fda4e0c9e572c64e50195fb",
+        "sha256": "b6bafbbd981da2f964eb45bcb8b8a7676a281084f8922c0c75de4cfbaa849311",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.11.0"
+      "version": "5.12.0"
     },
     "flutter_gen_runner": {
       "dependency": "direct dev",
       "description": {
         "name": "flutter_gen_runner",
-        "sha256": "669bf8b7a9b4acbdcb7fcc5e12bf638aca19acedf43341714cbca3bf3a219521",
+        "sha256": "c99b10af9d404e3f46fd1927e7d90099779e935e86022674c4c2a9e6c2a93b29",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.11.0"
+      "version": "5.12.0"
     },
     "flutter_launcher_icons": {
       "dependency": "direct dev",
@@ -721,11 +741,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "flutter_lints",
-        "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1",
+        "sha256": "3105dc8492f6183fb076ccf1f351ac3d60564bff92e20bfc4af9cc1651f4e7e1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.0"
+      "version": "6.0.0"
     },
     "flutter_localizations": {
       "dependency": "direct main",
@@ -737,11 +757,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_plugin_android_lifecycle",
-        "sha256": "f948e346c12f8d5480d2825e03de228d0eb8c3a737e4cdaa122267b89c022b5e",
+        "sha256": "b0694b7fb1689b0e6cc193b3f1fcac6423c4f93c74fb20b806c6b6f196db0c31",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.28"
+      "version": "2.0.30"
     },
     "flutter_riverpod": {
       "dependency": "direct main",
@@ -757,11 +777,11 @@
       "dependency": "transitive",
       "description": {
         "name": "flutter_rust_bridge",
-        "sha256": "0ad5079de35d317650fec59b26cb4d0c116ebc2ce703a29f9367513b8a91c287",
+        "sha256": "37ef40bc6f863652e865f0b2563ea07f0d3c58d8efad803cc01933a4b2ee067e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.0"
+      "version": "2.11.1"
     },
     "flutter_staggered_grid_view": {
       "dependency": "transitive",
@@ -787,11 +807,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_svg",
-        "sha256": "cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845",
+        "sha256": "b9c2ad5872518a27507ab432d1fb97e8813b05f0fc693f9d40fad06d073e0678",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.0"
+      "version": "2.2.1"
     },
     "flutter_tabler_icons": {
       "dependency": "direct main",
@@ -813,11 +833,11 @@
       "dependency": "direct main",
       "description": {
         "name": "flutter_to_airplay",
-        "sha256": "702408986b652dfaef5ad68c6f3c3008941ae8d8ef5db526792239c8d490a16d",
+        "sha256": "e71e7cbdf363c3f9686625f68b14e57497b507ef72d54016c14ccdffd3e4305d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.5"
+      "version": "2.1.0"
     },
     "flutter_user_certificates_android": {
       "dependency": "direct main",
@@ -880,11 +900,11 @@
       "dependency": "direct main",
       "description": {
         "name": "get_it",
-        "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1",
+        "sha256": "a4292e7cf67193f8e7c1258203104eb2a51ec8b3a04baa14695f4064c144297b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.7.0"
+      "version": "8.2.0"
     },
     "glob": {
       "dependency": "transitive",
@@ -930,21 +950,21 @@
       "dependency": "direct main",
       "description": {
         "name": "hive_ce",
-        "sha256": "708bb39050998707c5d422752159f91944d3c81ab42d80e1bd0ee37d8e130658",
+        "sha256": "89746b555109029a30780e0a601978460b8065643592667f6e43a238faccb8a4",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.11.3"
+      "version": "2.13.2"
     },
     "hive_ce_flutter": {
       "dependency": "direct main",
       "description": {
         "name": "hive_ce_flutter",
-        "sha256": "a0989670652eab097b47544f1e5a4456e861b1b01b050098ea0b80a5fabe9909",
+        "sha256": "f5bd57fda84402bca7557fedb8c629c96c8ea10fab4a542968d7b60864ca02cc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.3.1"
+      "version": "2.3.2"
     },
     "hive_ce_generator": {
       "dependency": "direct dev",
@@ -970,11 +990,11 @@
       "dependency": "direct main",
       "description": {
         "name": "http",
-        "sha256": "2c11f3f94c687ee9bad77c171151672986360b2b001d109814ee7140b2cf261b",
+        "sha256": "bb2ce4590bc2667c96f318d68cac1b5a7987ec819351d32b1c987239a815e007",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.4.0"
+      "version": "1.5.0"
     },
     "http_multi_server": {
       "dependency": "transitive",
@@ -1010,11 +1030,11 @@
       "dependency": "transitive",
       "description": {
         "name": "image_size_getter",
-        "sha256": "9a299e3af2ebbcfd1baf21456c3c884037ff524316c97d8e56035ea8fdf35653",
+        "sha256": "7c26937e0ae341ca558b7556591fd0cc456fcc454583b7cb665d2f03e93e590f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.0"
+      "version": "2.4.1"
     },
     "infinite_scroll_pagination": {
       "dependency": "direct main",
@@ -1142,11 +1162,11 @@
       "dependency": "transitive",
       "description": {
         "name": "just_audio_platform_interface",
-        "sha256": "4cd94536af0219fa306205a58e78d67e02b0555283c1c094ee41e402a14a5c4a",
+        "sha256": "2532c8d6702528824445921c5ff10548b518b13f808c2e34c2fd54793b999a6a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.5.0"
+      "version": "4.6.0"
     },
     "just_audio_web": {
       "dependency": "transitive",
@@ -1162,41 +1182,41 @@
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker",
-        "sha256": "6bb818ecbdffe216e81182c2f0714a2e62b593f4a4f13098713ff1685dfb6ab0",
+        "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.0.9"
+      "version": "11.0.2"
     },
     "leak_tracker_flutter_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_flutter_testing",
-        "sha256": "f8b613e7e6a13ec79cfdc0e97638fddb3ab848452eff057653abd3edba760573",
+        "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.9"
+      "version": "3.0.10"
     },
     "leak_tracker_testing": {
       "dependency": "transitive",
       "description": {
         "name": "leak_tracker_testing",
-        "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3",
+        "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.1"
+      "version": "3.0.2"
     },
     "lints": {
       "dependency": "transitive",
       "description": {
         "name": "lints",
-        "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7",
+        "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.1.1"
+      "version": "6.0.0"
     },
     "locale_names": {
       "dependency": "direct main",
@@ -1272,8 +1292,8 @@
       "dependency": "direct main",
       "description": {
         "path": "libs/windows/media_kit_libs_windows_audio",
-        "ref": "475a08cc97b94702f774bc906e1472b5bddc932b",
-        "resolved-ref": "475a08cc97b94702f774bc906e1472b5bddc932b",
+        "ref": "bfbcea1976093311d6b0ab6bc004a0cc7cd25811",
+        "resolved-ref": "bfbcea1976093311d6b0ab6bc004a0cc7cd25811",
         "url": "https://github.com/Komodo5197/media-kit.git"
       },
       "source": "git",
@@ -1303,11 +1323,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "msix",
-        "sha256": "edde648a8133bf301883c869d19d127049683037c65ff64173ba526ac7a8af2f",
+        "sha256": "f88033fcb9e0dd8de5b18897cbebbd28ea30596810f4a7c86b12b0c03ace87e5",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.16.9"
+      "version": "3.16.12"
     },
     "nested": {
       "dependency": "transitive",
@@ -1353,21 +1373,21 @@
       "dependency": "direct main",
       "description": {
         "name": "package_info_plus",
-        "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191",
+        "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.3.0"
+      "version": "9.0.0"
     },
     "package_info_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "package_info_plus_platform_interface",
-        "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c",
+        "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.0"
+      "version": "3.2.1"
     },
     "palette_generator": {
       "dependency": "direct main",
@@ -1414,21 +1434,21 @@
       "dependency": "transitive",
       "description": {
         "name": "path_provider_android",
-        "sha256": "d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9",
+        "sha256": "993381400e94d18469750e5b9dcb8206f15bc09f9da86b9e44a9b0092a0066db",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.2.17"
+      "version": "2.2.18"
     },
     "path_provider_foundation": {
       "dependency": "transitive",
       "description": {
         "name": "path_provider_foundation",
-        "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942",
+        "sha256": "16eef174aacb07e09c351502740fa6254c165757638eba1e9116b0a781201bbd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2"
     },
     "path_provider_linux": {
       "dependency": "transitive",
@@ -1524,11 +1544,11 @@
       "dependency": "transitive",
       "description": {
         "name": "petitparser",
-        "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646",
+        "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.0"
+      "version": "7.0.1"
     },
     "platform": {
       "dependency": "transitive",
@@ -1554,11 +1574,11 @@
       "dependency": "transitive",
       "description": {
         "name": "pool",
-        "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a",
+        "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.5.1"
+      "version": "1.5.2"
     },
     "posix": {
       "dependency": "transitive",
@@ -1584,11 +1604,11 @@
       "dependency": "direct main",
       "description": {
         "name": "provider",
-        "sha256": "4abbd070a04e9ddc287673bf5a030c7ca8b685ff70218720abab8b092f53dd84",
+        "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.1.5"
+      "version": "6.1.5+1"
     },
     "pub_semver": {
       "dependency": "transitive",
@@ -1614,21 +1634,11 @@
       "dependency": "transitive",
       "description": {
         "name": "qs_dart",
-        "sha256": "42a7ca80f965786d8d0730633b7cf05c132ebcb9558e04dbc8752f2865caa705",
+        "sha256": "23e435223d985630e3880fd667128f520237059ca3af0cc2dc029d5365ce9ec1",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.9"
-    },
-    "recursive_regex": {
-      "dependency": "transitive",
-      "description": {
-        "name": "recursive_regex",
-        "sha256": "f7252e3d3dfd1665e594d9fe035eca6bc54139b1f2fee38256fa427ea41adc60",
-        "url": "https://pub.dev"
-      },
-      "source": "hosted",
-      "version": "1.0.0"
+      "version": "1.5.6"
     },
     "riverpod": {
       "dependency": "transitive",
@@ -1764,21 +1774,21 @@
       "dependency": "direct main",
       "description": {
         "name": "share_plus",
-        "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da",
+        "sha256": "3424e9d5c22fd7f7590254ba09465febd6f8827c8b19a44350de4ac31d92d3a6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "10.1.4"
+      "version": "12.0.0"
     },
     "share_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "share_plus_platform_interface",
-        "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b",
+        "sha256": "88023e53a13429bd65d8e85e11a9b484f49d4c190abbd96c7932b74d6927cc9a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "5.0.2"
+      "version": "6.1.0"
     },
     "shared_preferences": {
       "dependency": "direct main",
@@ -1794,11 +1804,11 @@
       "dependency": "transitive",
       "description": {
         "name": "shared_preferences_android",
-        "sha256": "20cbd561f743a342c76c151d6ddb93a9ce6005751e7aa458baad3858bfbfb6ac",
+        "sha256": "bd14436108211b0d4ee5038689a56d4ae3620fd72fd6036e113bf1345bc74d9e",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.10"
+      "version": "2.4.13"
     },
     "shared_preferences_foundation": {
       "dependency": "transitive",
@@ -1899,12 +1909,13 @@
     "smtc_windows": {
       "dependency": "direct main",
       "description": {
-        "name": "smtc_windows",
-        "sha256": "80f7c10867da485ffdf87f842bf27e6763589933c18c11af5dc1cd1e158c3154",
-        "url": "https://pub.dev"
+        "path": "packages/smtc_windows",
+        "ref": "7ece49cc16a459aaa0718ed23458802533daef37",
+        "resolved-ref": "7ece49cc16a459aaa0718ed23458802533daef37",
+        "url": "https://github.com/Komodo5197/frb_plugins.git"
       },
-      "source": "hosted",
-      "version": "1.0.0"
+      "source": "git",
+      "version": "1.1.0"
     },
     "source_gen": {
       "dependency": "direct main",
@@ -1920,11 +1931,11 @@
       "dependency": "transitive",
       "description": {
         "name": "source_helper",
-        "sha256": "4f81479fe5194a622cdd1713fe1ecb683a6e6c85cd8cec8e2e35ee5ab3fdf2a1",
+        "sha256": "a447acb083d3a5ef17f983dd36201aeea33fedadb3228fa831f2f0c92f0f3aca",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.6"
+      "version": "1.3.7"
     },
     "source_span": {
       "dependency": "transitive",
@@ -1971,21 +1982,21 @@
       "dependency": "transitive",
       "description": {
         "name": "sqflite_android",
-        "sha256": "2b3070c5fa881839f8b402ee4a39c1b4d561704d4ebbbcfb808a119bc2a1701b",
+        "sha256": "ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.4.1"
+      "version": "2.4.2+2"
     },
     "sqflite_common": {
       "dependency": "transitive",
       "description": {
         "name": "sqflite_common",
-        "sha256": "84731e8bfd8303a3389903e01fb2141b6e59b5973cacbb0929021df08dddbe8b",
+        "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.5.5"
+      "version": "2.5.6"
     },
     "sqflite_darwin": {
       "dependency": "transitive",
@@ -2081,11 +2092,11 @@
       "dependency": "transitive",
       "description": {
         "name": "test_api",
-        "sha256": "fb31f383e2ee25fbbfe06b40fe21e1e458d14080e3c67e7ba0acfde4df4e0bbd",
+        "sha256": "522f00f556e73044315fa4585ec3270f1808a4b186c936e612cab0b565ff1e00",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.7.4"
+      "version": "0.7.6"
     },
     "time": {
       "dependency": "transitive",
@@ -2171,21 +2182,21 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_android",
-        "sha256": "8582d7f6fe14d2652b4c45c9b6c14c0b678c2af2d083a11b604caeba51930d79",
+        "sha256": "199bc33e746088546a39cc5f36bac5a278c5e53b40cb3196f99e7345fdcfae6b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.16"
+      "version": "6.3.22"
     },
     "url_launcher_ios": {
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_ios",
-        "sha256": "7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb",
+        "sha256": "d80b3f567a617cb923546034cc94bfe44eb15f989fe670b37f26abdb9d939cb7",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.3.3"
+      "version": "6.3.4"
     },
     "url_launcher_linux": {
       "dependency": "transitive",
@@ -2201,11 +2212,11 @@
       "dependency": "transitive",
       "description": {
         "name": "url_launcher_macos",
-        "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2",
+        "sha256": "c043a77d6600ac9c38300567f33ef12b0ef4f4783a2c1f00231d2b1941fea13f",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.2.2"
+      "version": "3.2.3"
     },
     "url_launcher_platform_interface": {
       "dependency": "transitive",
@@ -2281,21 +2292,21 @@
       "dependency": "transitive",
       "description": {
         "name": "vector_graphics_compiler",
-        "sha256": "557a315b7d2a6dbb0aaaff84d857967ce6bdc96a63dc6ee2a57ce5a6ee5d3331",
+        "sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.17"
+      "version": "1.1.19"
     },
     "vector_math": {
       "dependency": "transitive",
       "description": {
         "name": "vector_math",
-        "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803",
+        "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.1.4"
+      "version": "2.2.0"
     },
     "visibility_detector": {
       "dependency": "direct main",
@@ -2311,41 +2322,41 @@
       "dependency": "transitive",
       "description": {
         "name": "vm_service",
-        "sha256": "ddfa8d30d89985b96407efce8acbdd124701f96741f2d981ca860662f1c0dc02",
+        "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "15.0.0"
+      "version": "15.0.2"
     },
     "wakelock_plus": {
       "dependency": "direct main",
       "description": {
         "name": "wakelock_plus",
-        "sha256": "a474e314c3e8fb5adef1f9ae2d247e57467ad557fa7483a2b895bc1b421c5678",
+        "sha256": "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.3.2"
+      "version": "1.4.0"
     },
     "wakelock_plus_platform_interface": {
       "dependency": "transitive",
       "description": {
         "name": "wakelock_plus_platform_interface",
-        "sha256": "e10444072e50dbc4999d7316fd303f7ea53d31c824aa5eb05d7ccbdd98985207",
+        "sha256": "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.2.3"
+      "version": "1.3.0"
     },
     "watcher": {
       "dependency": "transitive",
       "description": {
         "name": "watcher",
-        "sha256": "0b7fd4a0bbc4b92641dbf20adfd7e3fd1398fe17102d94b674234563e110088a",
+        "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.2"
+      "version": "1.1.3"
     },
     "weak_map": {
       "dependency": "transitive",
@@ -2411,11 +2422,11 @@
       "dependency": "direct main",
       "description": {
         "name": "window_manager",
-        "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059",
+        "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "0.4.3"
+      "version": "0.5.1"
     },
     "xdg_directories": {
       "dependency": "transitive",
@@ -2431,11 +2442,11 @@
       "dependency": "transitive",
       "description": {
         "name": "xml",
-        "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226",
+        "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "6.5.0"
+      "version": "6.6.1"
     },
     "xxh3": {
       "dependency": "transitive",
@@ -2469,7 +2480,7 @@
     }
   },
   "sdks": {
-    "dart": ">=3.8.0 <4.0.0",
-    "flutter": ">=3.32.0"
+    "dart": ">=3.9.0 <4.0.0",
+    "flutter": ">=3.35.0"
   }
 }

From 66638eace9d09abbef1d5359b25d15dfd9bfd981 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 17:10:54 +0000
Subject: [PATCH 5353/6226] ddns-go: 6.13.0 -> 6.13.2

---
 pkgs/by-name/dd/ddns-go/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dd/ddns-go/package.nix b/pkgs/by-name/dd/ddns-go/package.nix
index 74e9cba939ec..2c659c4cfe88 100644
--- a/pkgs/by-name/dd/ddns-go/package.nix
+++ b/pkgs/by-name/dd/ddns-go/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "ddns-go";
-  version = "6.13.0";
+  version = "6.13.2";
 
   src = fetchFromGitHub {
     owner = "jeessy2";
     repo = "ddns-go";
     rev = "v${version}";
-    hash = "sha256-JGwTYvV0ZyT6gKAaoVPxyIPQzfFBWKkzTdwtMk/bSPc=";
+    hash = "sha256-Jko5cVcCMrBsfcOOSh6ETlk1jdTCbSj1zOgTwhXnxzQ=";
   };
 
   vendorHash = "sha256-URPCqItQ/xg8p0EdkMS6z8vuSJ1YaCicsvyb+Jvj2CU=";

From 80b8c01a78fa155c97ef238261350eb5b6dac0f9 Mon Sep 17 00:00:00 2001
From: Daniel Fullmer <danielrf12@gmail.com>
Date: Sat, 4 Oct 2025 19:33:33 -0700
Subject: [PATCH 5354/6226] zerotierone: 1.14.2 -> 1.16.0

---
 ...arwin-disable-link-time-optimization.patch | 12 ++---
 ...m-remove-unsupported-lints.workspace.patch | 24 ---------
 ...-Support-single-arch-builds-on-macOS.patch | 52 +++++++++++++++++++
 pkgs/by-name/ze/zerotierone/package.nix       | 31 +++++------
 4 files changed, 71 insertions(+), 48 deletions(-)
 delete mode 100644 pkgs/by-name/ze/zerotierone/0001-rustfsm-remove-unsupported-lints.workspace.patch
 create mode 100644 pkgs/by-name/ze/zerotierone/0002-Support-single-arch-builds-on-macOS.patch

diff --git a/pkgs/by-name/ze/zerotierone/0001-darwin-disable-link-time-optimization.patch b/pkgs/by-name/ze/zerotierone/0001-darwin-disable-link-time-optimization.patch
index 475655f94a56..bb4bb976df25 100644
--- a/pkgs/by-name/ze/zerotierone/0001-darwin-disable-link-time-optimization.patch
+++ b/pkgs/by-name/ze/zerotierone/0001-darwin-disable-link-time-optimization.patch
@@ -1,7 +1,7 @@
-From f71d88a15f537cbc5ea80ad2922c013553a5caab Mon Sep 17 00:00:00 2001
+From 1bc576196d82b801df4e52548808068c4cb9ab9e Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
 Date: Fri, 21 Jun 2024 14:43:03 +0200
-Subject: [PATCH 2/2] darwin: disable link-time optimization
+Subject: [PATCH 1/2] darwin: disable link-time optimization
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
@@ -15,18 +15,18 @@ Signed-off-by: Jörg Thalheim <joerg@thalheim.io>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/make-mac.mk b/make-mac.mk
-index 7af200ad..b388c05a 100644
+index e63fb7f88..3cf0be175 100644
 --- a/make-mac.mk
 +++ b/make-mac.mk
-@@ -84,7 +84,7 @@ ifeq ($(ZT_DEBUG),1)
+@@ -89,7 +89,7 @@ ifeq ($(ZT_DEBUG),1)
  node/Salsa20.o node/SHA512.o node/C25519.o node/Poly1305.o: CFLAGS = -Wall -O2 -g $(INCLUDES) $(DEFS)
  else
- 	CFLAGS?=-Ofast -fstack-protector-strong
+ 	CFLAGS?=-O3 -fstack-protector-strong
 -	CFLAGS+=$(ARCH_FLAGS) -Wall -flto -fPIE -mmacosx-version-min=$(MACOS_VERSION_MIN) -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS)
 +	CFLAGS+=$(ARCH_FLAGS) -Wall -fPIE -mmacosx-version-min=$(MACOS_VERSION_MIN) -DNDEBUG -Wno-unused-private-field $(INCLUDES) $(DEFS)
  	STRIP=strip
  	EXTRA_CARGO_FLAGS=--release
  	RUST_VARIANT=release
 -- 
-2.44.1
+2.51.0
 
diff --git a/pkgs/by-name/ze/zerotierone/0001-rustfsm-remove-unsupported-lints.workspace.patch b/pkgs/by-name/ze/zerotierone/0001-rustfsm-remove-unsupported-lints.workspace.patch
deleted file mode 100644
index 0db2b4d26fa2..000000000000
--- a/pkgs/by-name/ze/zerotierone/0001-rustfsm-remove-unsupported-lints.workspace.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From b83e6354de099860bcb1ca3876c222c57de89f0c Mon Sep 17 00:00:00 2001
-From: Michael Hoang <enzime@users.noreply.github.com>
-Date: Mon, 10 Feb 2025 18:03:12 +0700
-Subject: [PATCH] rustfsm: remove unsupported `lints.workspace`
-
-This patch will no longer be necessary when
-https://github.com/NixOS/nixpkgs/pull/300532 is merged
----
- fsm/Cargo.toml | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/fsm/Cargo.toml b/fsm/Cargo.toml
-index 5e9e1c9..3fda704 100644
---- a/fsm/Cargo.toml
-+++ b/fsm/Cargo.toml
-@@ -17,5 +17,3 @@ rustfsm_trait = { version = "0.1", path = "rustfsm_trait" }
- [package.metadata.workspaces]
- independent = true
- 
--[lints]
--workspace = true
--- 
-2.46.0
-
diff --git a/pkgs/by-name/ze/zerotierone/0002-Support-single-arch-builds-on-macOS.patch b/pkgs/by-name/ze/zerotierone/0002-Support-single-arch-builds-on-macOS.patch
new file mode 100644
index 000000000000..2b2c67023b25
--- /dev/null
+++ b/pkgs/by-name/ze/zerotierone/0002-Support-single-arch-builds-on-macOS.patch
@@ -0,0 +1,52 @@
+From 5c6f3e6c8c33e23b8bb3fe39b9ce26495724af09 Mon Sep 17 00:00:00 2001
+From: Daniel Fullmer <danielrf12@gmail.com>
+Date: Sat, 4 Oct 2025 19:27:19 -0700
+Subject: [PATCH 2/2] Support single arch builds on macOS
+
+Co-Authored-By: Michael Hoang <enzime@users.noreply.github.com>
+---
+ make-mac.mk | 12 +++++++-----
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/make-mac.mk b/make-mac.mk
+index 3cf0be175..8da630e90 100644
+--- a/make-mac.mk
++++ b/make-mac.mk
+@@ -5,7 +5,8 @@ TOPDIR=$(shell pwd)
+ INCLUDES=-I$(shell pwd)/rustybits/target -isystem $(TOPDIR)/ext  -I$(TOPDIR)/ext/prometheus-cpp-lite-1.0/core/include -I$(TOPDIR)/ext-prometheus-cpp-lite-1.0/3rdparty/http-client-lite/include -I$(TOPDIR)/ext/prometheus-cpp-lite-1.0/simpleapi/include
+ DEFS=
+ LIBS=
+-ARCH_FLAGS=-arch x86_64 -arch arm64
++ARCH := x86_64 arm64
++ARCH_FLAGS=$(addprefix -arch ,$(ARCH))
+ 
+ CODESIGN=echo
+ PRODUCTSIGN=echo
+@@ -79,6 +80,7 @@ endif
+ # Debug mode -- dump trace output, build binary with -g
+ ifeq ($(ZT_DEBUG),1)
+ 	ZT_TRACE=1
++	ARCH=
+ 	ARCH_FLAGS=
+ 	CFLAGS+=-Wall -g $(INCLUDES) $(DEFS) $(ARCH_FLAGS)
+ 	STRIP=echo
+@@ -156,12 +158,12 @@ rustybits/target/libsmeeclient.a:	FORCE
+ endif
+ 
+ rustybits/target/libzeroidc.a:	FORCE
+-	cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p zeroidc --target=x86_64-apple-darwin $(EXTRA_CARGO_FLAGS)
+-	cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p zeroidc --target=aarch64-apple-darwin $(EXTRA_CARGO_FLAGS)
+-	cd rustybits && lipo -create target/x86_64-apple-darwin/$(RUST_VARIANT)/libzeroidc.a target/aarch64-apple-darwin/$(RUST_VARIANT)/libzeroidc.a -output target/libzeroidc.a
++	if [[ "$(ARCH)" == *"x86_64"* ]]; then cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p zeroidc --target=x86_64-apple-darwin $(EXTRA_CARGO_FLAGS); fi
++	if [[ "$(ARCH)" == *"arm64"* ]]; then cd rustybits && MACOSX_DEPLOYMENT_TARGET=$(MACOS_VERSION_MIN) cargo build -p zeroidc --target=aarch64-apple-darwin $(EXTRA_CARGO_FLAGS); fi
++	cd rustybits && lipo -create target/*/$(RUST_VARIANT)/libzeroidc.a -output target/libzeroidc.a
+ 
+ central-controller:
+-	make ARCH_FLAGS="-arch x86_64" ZT_CONTROLLER=1 one
++	make ARCH=x86_64 ZT_CONTROLLER=1 one
+ 
+ zerotier-idtool: one
+ 
+-- 
+2.51.0
+
diff --git a/pkgs/by-name/ze/zerotierone/package.nix b/pkgs/by-name/ze/zerotierone/package.nix
index 6b258b96a046..1969a933aef6 100644
--- a/pkgs/by-name/ze/zerotierone/package.nix
+++ b/pkgs/by-name/ze/zerotierone/package.nix
@@ -12,18 +12,20 @@
   rustc,
   zlib,
   libiconv,
-  fetchpatch,
+  # enableUnfree enables building the zerotier controller, which is subject to
+  # a source-available license that permits non-commercial use
+  enableUnfree ? false,
 }:
 
 let
   pname = "zerotierone";
-  version = "1.14.2";
+  version = "1.16.0";
 
   src = fetchFromGitHub {
     owner = "zerotier";
     repo = "ZeroTierOne";
     tag = version;
-    hash = "sha256-D+7/ja5uYzH1iNd+Ti3k+dWOf5GvN4U+GuVBA9gxtTc=";
+    hash = "sha256-bFfRz695sbdZJd5DIfF7j8lbEqWHSaIqHq/AfXZgZ4s=";
   };
 
 in
@@ -33,23 +35,13 @@ stdenv.mkDerivation {
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit src;
     sourceRoot = "${src.name}/rustybits";
-    hash = "sha256-CSpm4zBWKhcrM/KXGU6/51NSQ6hzpT44D2J+QETBtpQ=";
-
-    # REMOVEME when https://github.com/NixOS/nixpkgs/pull/300532 is merged
-    postBuild = ''
-      pushd $out/git/730aadcc02767ae630e88f8f8c788a85d6bc81e6
-      patch --verbose -p1 <${./0001-rustfsm-remove-unsupported-lints.workspace.patch}
-      popd
-    '';
+    hash = "sha256-u3gqETbn4I+mtUeSkSym4s+qhA3eDb4Qaq7bl58M+AY=";
   };
 
   patches = [
     ./0001-darwin-disable-link-time-optimization.patch
     # https://github.com/zerotier/ZeroTierOne/pull/2435
-    (fetchpatch {
-      url = "https://github.com/zerotier/ZeroTierOne/commit/8f56d484b681ea30cd28e19cab34499acfa6e64d.patch";
-      hash = "sha256-UplkX2O4o8XKKTlR3ZsSG9E0y5gVhAagyepqwyGEYmA=";
-    })
+    ./0002-Support-single-arch-builds-on-macOS.patch
   ];
 
   postPatch = ''
@@ -112,9 +104,12 @@ stdenv.mkDerivation {
   buildFlags = [
     "all"
     "selftest"
-  ];
+  ]
+  ++ lib.optional enableUnfree "ZT_NONFREE=1";
+
+  # darwin: disabled due to a test which fails to bind to 127.0.0.1 in a sandbox.
+  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform && !stdenv.hostPlatform.isDarwin;
 
-  doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform;
   checkPhase = ''
     runHook preCheck
     ./zerotier-selftest
@@ -147,7 +142,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "Create flat virtual Ethernet networks of almost unlimited size";
     homepage = "https://www.zerotier.com";
-    license = licenses.bsl11;
+    license = if enableUnfree then licenses.unfree else licenses.mpl20;
     maintainers = with maintainers; [
       sjmackenzie
       zimbatm

From 08856e9f579f65c46a7a63588fd22482bda91902 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Tue, 4 Nov 2025 18:25:57 +0100
Subject: [PATCH 5355/6226] python3Packages.nominatim-api: 5.1.0 -> 5.2.0

---
 pkgs/by-name/no/nominatim/nominatim-api.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/no/nominatim/nominatim-api.nix b/pkgs/by-name/no/nominatim/nominatim-api.nix
index 6cda6ae63662..57fad6142d1b 100644
--- a/pkgs/by-name/no/nominatim/nominatim-api.nix
+++ b/pkgs/by-name/no/nominatim/nominatim-api.nix
@@ -4,6 +4,7 @@
   fetchFromGitHub,
 
   hatchling,
+  async-timeout,
   psycopg,
   pyicu,
   python-dotenv,
@@ -13,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "nominatim";
-  version = "5.1.0";
+  version = "5.2.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "osm-search";
     repo = "Nominatim";
     tag = "v${version}";
-    hash = "sha256-eMCXXPrUZvM4ju0mi1+f+LXhThCCCEH+HDz6lurw+Jo=";
+    hash = "sha256-ao4oEPz5rtRQtPC2UcIHH1M+o914JraASf+hcB2SDKA=";
   };
 
   postPatch = ''
@@ -38,6 +39,7 @@ buildPythonPackage rec {
   ];
 
   dependencies = [
+    async-timeout
     psycopg
     pyicu
     python-dotenv

From 685e3a6176136693758d0aa9d8ae5203618cf50f Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sat, 1 Nov 2025 16:28:27 -0400
Subject: [PATCH 5356/6226] uppy-companion: migrate from nodePackages

This has internal API breaking changes, but has no breaking changes for
users of the standalone server, which is what this package ships.
Therefore we do not have breaking changes, despite bumping the major
version.
---
 .../up/uppy-companion/missing-hashes.json     |  355 ++++
 pkgs/by-name/up/uppy-companion/package.nix    |   76 +
 pkgs/by-name/up/uppy-companion/update.sh      |   28 +
 pkgs/development/node-packages/aliases.nix    |    2 +
 .../node-packages/main-programs.nix           |    1 -
 .../node-packages/node-packages.json          |    1 -
 .../node-packages/node-packages.nix           | 1556 -----------------
 pkgs/development/node-packages/overrides.nix  |    4 -
 pkgs/top-level/all-packages.nix               |    2 -
 9 files changed, 461 insertions(+), 1564 deletions(-)
 create mode 100644 pkgs/by-name/up/uppy-companion/missing-hashes.json
 create mode 100644 pkgs/by-name/up/uppy-companion/package.nix
 create mode 100755 pkgs/by-name/up/uppy-companion/update.sh

diff --git a/pkgs/by-name/up/uppy-companion/missing-hashes.json b/pkgs/by-name/up/uppy-companion/missing-hashes.json
new file mode 100644
index 000000000000..b95352dbd3c1
--- /dev/null
+++ b/pkgs/by-name/up/uppy-companion/missing-hashes.json
@@ -0,0 +1,355 @@
+{
+  "@biomejs/cli-darwin-arm64@npm:2.0.5": "a15bc3bd3ceaaaa65adf6afd29538be7ecaacfa2d7fa798154241de8f38a087b2c1a5fc103f43d3e49381a2b7f13501d829776213263984f580b8599af9b3259",
+  "@biomejs/cli-darwin-x64@npm:2.0.5": "10d3bf203a16de1d91b45419c97146552e07f47654073fc1dfff3cc0bb761561a61ff44b4943e3b46f3beff8a14497e87f33ab18c0a52734cd7ec15691f054e3",
+  "@biomejs/cli-linux-arm64-musl@npm:2.0.5": "d3f9067e186fefcd154325c06d40d52a06b80347024825eba5eb03432d1ad7287d9dced6dc3dc085a82a5f46e8490b39826f77ce847a27d3e2e7a413149e410f",
+  "@biomejs/cli-linux-arm64@npm:2.0.5": "bd2121689d4dab98ad3a7cd01542ec1556feed795e7326f33c1c54dcb0d3043f6a22b5f9a3b1d897c781a2b096cc1b71b7c00cd60e45af6ef486b3c6d4d41c09",
+  "@biomejs/cli-linux-x64-musl@npm:2.0.5": "88e9d8dce4b5240ed85197cdd44af13f2685527af68359f1eccb050f737e29bcd4ea6fa453561b08fea91f6d216c5fafaebf8c33611d1e597cc2cdd18118c55d",
+  "@biomejs/cli-linux-x64@npm:2.0.5": "f5df56a3296bdde562f89b3b637b3238d15ae40701d29a18603686f231f2c3def9ec82ac47c86f290f0504eb0634065e053e268466b99787e622e80b864e850b",
+  "@biomejs/cli-win32-arm64@npm:2.0.5": "5a93662a6e5ce3eded50f4ba8bb3fb38be5df630ac6cbb3a61e6086a05e3d554aaaccc9b709b8f75b573b42d48015a1318efa3b4cce8f82fa261bf09b17dcf32",
+  "@biomejs/cli-win32-x64@npm:2.0.5": "5fbb511151b6d642a7c34a207fb3985eda16a8f11f748e4217336ec99f6bcb99a85eae737ae1dd74ddacc00a60b998bd43cd5701295b2af613ffc2b54e7eeaae",
+  "@esbuild/aix-ppc64@npm:0.25.0": "f9a1263789c799c54255f102aa7e5eb92ff2938e5f1e28d7270ae9388d7f0b07a89c6928201089e9917da3531c3370675cbdf3ee213dbb46c219168826dcbf07",
+  "@esbuild/aix-ppc64@npm:0.25.1": "b7b13c0ba1ad3251586c094b8a62620f3d47ff5b7037ece162a6be0b6219ef7e7af54dd723172f997188433ab767f375ad213cad3d515ea41ab09390d84e726c",
+  "@esbuild/aix-ppc64@npm:0.25.4": "c3d5aaf00899940960a27f93a63d9169efc4ff317f10bc3608291678ce71255d657129061dbfa016a0d16fd7b6bfbeb9d37558e9113432f8ff5d04b8b8e54b2f",
+  "@esbuild/aix-ppc64@npm:0.25.9": "3a1a51a11958a1899d83530f381bc4d8ffc62fd3a2d500392f28dd701650c738a994bdc8df862f6b8666b267f5f91adffcb909be1673bae1277040b6a34b92ea",
+  "@esbuild/android-arm64@npm:0.25.0": "b935e4909cfecaf6166268edb337ac481eb79760230efe9893d09dfffc242915307edc890220ff1fe6378f9a6dc88043971a8282929e21ee92d5bb32d1ff33ad",
+  "@esbuild/android-arm64@npm:0.25.1": "88003e0f79cf75f4d034b3bdf2c0e9e44ad90aa10b6b75b7241e468fb751f5de5610afd4ed9fdc2febf1ddbad16b20bd376cd5aaef694f46a62763ba164e5ea3",
+  "@esbuild/android-arm64@npm:0.25.4": "aa5285109d86607c973ee8d20b582cb444bae31457982dbd3b004feaa4776d145d48a6692537defd8477f2bd0bdf06ff8c7e688dd07fe30b5d031c6dd434c580",
+  "@esbuild/android-arm64@npm:0.25.9": "cd20fb34e2223d404a1710715e3fc259e901e61cf594a4bb0c692525d5bbf91d52a906b9c9e7d7f0292fddffb4d76ec31989fb1cfaf732e6b779d06e728aab8b",
+  "@esbuild/android-arm@npm:0.25.0": "109a800ac79c78770cbc5f76c6ba8d2c3a3324c408748016429b5c8aad211463e33d8c0ed7a740f55d8df7a1bac4e78bc5029521f07e740731b7564c688c2206",
+  "@esbuild/android-arm@npm:0.25.1": "ef86951b4b247fc530180607da8d67671586f02859cd8b6ba922658c34c48135a1729df352308051efb4fd7856e01f60a90f921f4159a56fe9ae9d422ed948fc",
+  "@esbuild/android-arm@npm:0.25.4": "8c5c306e03044527fb2f4eaaeda255d7f40d6a3d02aa9abd1334d67a9ea1a5ab2ab654df77eb7e17e64947c5893e1ba53fc9d3bbefa15f0692e6b56823c47abc",
+  "@esbuild/android-arm@npm:0.25.9": "2b4e144cd6817407d748800548183b7bfee9feac7b77e70d22438c0ee51970d600865f9757f21c2e7adc7289fedf28a7805aa9456ef0a262b606f2fe0f8f5649",
+  "@esbuild/android-x64@npm:0.25.0": "033e21f87df0b0a50b6f54de5ba2dc20c232f008fc62c377c8a359dc27c6d96eaaf57fab8c87c829e36fb49249811bcb0dfb0df958fc2cd1a2311fe443db7a2c",
+  "@esbuild/android-x64@npm:0.25.1": "eb6e9285ea5e629983b065d6cc2bfe882337861fd4491cf497291cb9628b95d498e86bd0ea440e2e3aa9cd0bcb913cdfce6bd75c947b6d0e22bc0ae549ca6d89",
+  "@esbuild/android-x64@npm:0.25.4": "aa8665b302b65ca62e15a34e72e43d1ce7a253a354d8684cbe5ea1a04a79d1323416b46c727d6ab73a76a4ec047fb2859b054f8f80fe9ac1d286a4d00ed754e6",
+  "@esbuild/android-x64@npm:0.25.9": "d9c522016432d1aba5fe248c373f6cc0479685ef08cdb1b002b910393b9a7b178e52a6efede98dff8836ea7595557a2b289090a907ed5346d2643a7554d59703",
+  "@esbuild/darwin-arm64@npm:0.25.0": "d82d5f8b724a77ee7d65b7d47159930015135c7fb0fc7dc3ad056203bb97a1a933f516fd91f0213420a80c0a9ddfec954c952c554edf00629d9bc964313a3836",
+  "@esbuild/darwin-arm64@npm:0.25.1": "34c125754c2103eb497937df842eadf32acd2bc074de0918db43f51913688651003457e8d837cb2aea371db47aefa162a73bcbed7529efb3fce41e162236ea9c",
+  "@esbuild/darwin-arm64@npm:0.25.4": "81b4d0482813ccff8c783035317d78220a4ec3eee3798e50b804a781a071f5790c7903c2f9216a25f5c167becd4c3d78fcf0a13e454b3973eb7d82b7ce1d4688",
+  "@esbuild/darwin-arm64@npm:0.25.9": "61f3de9f8bb8fb67515365ea320d26bb1f1a7e497dc1cd22e2a9ffb1f04cf9b71017ca60b6ff979ec7a854abdda2b58b281bd3070aef3a0fe13bf5831af121b4",
+  "@esbuild/darwin-x64@npm:0.25.0": "ae029503666bfa48c6cbcbc991ac9d841e1f03f056f71782b78e57ac4083022eb505deab330651ee05deab76688cf3139bdbea84caea6491fcaf5caa2b912946",
+  "@esbuild/darwin-x64@npm:0.25.1": "0920b1622909f001028fa9c8978edd53ee3ec3cb6321a50f0b20ce67d5d82ed55a4acdb459800a4fe374bd70b953b51366026756d169a26982bbc3f1a7131f16",
+  "@esbuild/darwin-x64@npm:0.25.4": "633d97f18c299c8da3730ae04831895779b5f1271020cc924e06c6a5f0c5aac9f0653d60cca7d6ac23926797368301cd6ce2059b25f432aa2f1f378fcb34530d",
+  "@esbuild/darwin-x64@npm:0.25.9": "6e7dd258a63eabc10ea93c79b0d33867b19f40d74d8279f81ed67554e39a845d1c4688cbe661f4ef0b7600995537cd7279d0c5e681fe6a71245bd53648eeaf3c",
+  "@esbuild/freebsd-arm64@npm:0.25.0": "9f72aaa0c1845f3ada5a6a1cffa43c7683c25313455aa997ca8b233316a87d163722d8c26a0e86663c5ebbdca6ab91cf1975f0c0e7fbe062087cbef92c666b04",
+  "@esbuild/freebsd-arm64@npm:0.25.1": "5f30c81b55eb9586778e4f832616b2f66d8aaade864ac46e605d33c2b7daa83ef04485830e96cd138375b5b79bd9b765386c3d8abe7d88c2bbecc0ca19a628a7",
+  "@esbuild/freebsd-arm64@npm:0.25.4": "4d52cf4e18e1f4ab2fd80c4c4a9ab9c20658c77d832d33603b5d19b3ed4565ad7186b86e30a92b78aa11694d884201d0914dba649d6277737574896a897a2af7",
+  "@esbuild/freebsd-arm64@npm:0.25.9": "31cea93710c6835c6eaf8db5a6b90295bc6cd570b450773e14afdb06d7eaafa65a85d5687d0e742201c0e1791c6c8d7ad44be8589519d9c2e84cd2995de5eb8e",
+  "@esbuild/freebsd-x64@npm:0.25.0": "b96749a6d7da71fff98309655eb85b09de84416ae5c09a02e803342bba25c81e0ac181212bac49fa8d8cc28bfa5e1fbb8d349f2b4722e2ca2df2e4a383d17935",
+  "@esbuild/freebsd-x64@npm:0.25.1": "9b5086c0ba8a1c8bd19eeb4536f3efdee186dfbc954821e5d8e041d38e4698c2eed46ac95d72018a9914b994f1de12be9f5dbe054994a0a72e4f0dabf9f1a6f7",
+  "@esbuild/freebsd-x64@npm:0.25.4": "af75d6724969c4d831bb09209f4ddb46532516932db98a3e4c5c5dcc7f3cd0fe0930f2875fa901b8bb9c0ecfe0a65313da6127ea9387c63859e5d58cff975e68",
+  "@esbuild/freebsd-x64@npm:0.25.9": "b257a2a3f4bc4de4bb82e630856eb43bfeea858efcf89e585680c385b048df06c05cc320fe3417af80a142c392764af2e21c2c106453a0c9519bd0130885d378",
+  "@esbuild/linux-arm64@npm:0.25.0": "1dbf78595fed87287eccde8fb9a5e35d448ab3b7cd84c03fdfa47c250701a62160d7aa45b4de9ca5e11039975680829644529636bbe254e1627836c5227efca2",
+  "@esbuild/linux-arm64@npm:0.25.1": "202515560459ecb05044e0ae6079c0fbecbe863f35dfa5d2adc2f9e830a543ed6412aa277a79fd1e94d33c499ca5b5984bdc25124268950d8f95375f76999810",
+  "@esbuild/linux-arm64@npm:0.25.4": "72b7e3b8fe3bd27206577f8eceea1e0c289dc01fa2f5b03fe22f4ea27931ca664a9b93b35f9ae424e78552caec76330383fe7dc5afeeaffa0e00645ec143a49b",
+  "@esbuild/linux-arm64@npm:0.25.9": "773aa296a2bdab2274de049ae4d1daf4f556914231a9de06e96e9e9808e5428853aef9271aa3a866a075204b4c71590a5ba5bf3e6183ac4806c59b70ae2c6443",
+  "@esbuild/linux-arm@npm:0.25.0": "b1a165678166d006b32f965cb51719403fdea18c9ec2e498807f0b273b46a3a555b214d5d5f832393471180e1d39ca9f06e7bfe3c2c97c0cbc30314a38b422c0",
+  "@esbuild/linux-arm@npm:0.25.1": "c6fe6372e4870ad2d232c4bfe926c41be76cbd67143df8377320ae38971bc1cea50f342f88a31e54a43c4ca0a84e2c3a1accf780ba630b356b87eb51dc5ee5a2",
+  "@esbuild/linux-arm@npm:0.25.4": "407dcf9e8fc4ebc75689b6257be576047c03285067b5b22db74dd07ae067f8dd9126936dedfeb27934e09d0d700ecb3f8d70876fe61b90d92355f35c2a5d6540",
+  "@esbuild/linux-arm@npm:0.25.9": "564067cc9f949805834bf9a3dd071fc9d4ed77ffa1dda188106fb5b86383a9ff0be567610642f8b778cce90d575a28593db68589f4d9c6b69b7d3feab7a343c2",
+  "@esbuild/linux-ia32@npm:0.25.0": "21a136d8301fac7f23724061832426efddc2f9769b29b37e88443245ed0406f0b1f9bc05a02b6d0cf7b3e2e8ec2c8e1e8d99b3178a01ace6974369930f0020f6",
+  "@esbuild/linux-ia32@npm:0.25.1": "2719e82d4d6718ad034856e1588e9946e7390d8c4e2dbe61cfb6feec15464a999ebee477fa5189fef31517b27816b312fb68f0a496c6e8895989db2c0cbcd96b",
+  "@esbuild/linux-ia32@npm:0.25.4": "47b13c9952c893e749380551dfa3580eb562a0394911a9ced68b23c0cafe116614b30ffd6744dc71ec312fab8bc7115f856f078fe29f1253a1dd99d3215a1424",
+  "@esbuild/linux-ia32@npm:0.25.9": "a29cfea7fe73ad910e40971c82824f7df766c790967cad99aaa459be87333e7d964ff09741af4a52465b26e6a606f54686b394f73dc736ee78b769b43166886a",
+  "@esbuild/linux-loong64@npm:0.25.0": "f87baa1534a52b24198d9d845821f37bec9c4afb08307ee66c3f1d223d3c684151749f4a0eeb96f3905d365bea9f6256787256ff35b9f80fdd51ed7d4f8356b6",
+  "@esbuild/linux-loong64@npm:0.25.1": "ae79c5760e03418100376dbbd89ba21b85b31b5959035ac127c927c09acc097e3f24747e56496ce63f5b4a94a2d5e0aa538ad74060c2a21f4b5d6dfc69bbd7ae",
+  "@esbuild/linux-loong64@npm:0.25.4": "75222fb808060b3f2507aee40c6ee877a1ed768c593dd8f192e1ea640bddf3b414080407ddaccac6d0cde35750a7f92c434e04af2c142075dc810c5b7a7ce5eb",
+  "@esbuild/linux-loong64@npm:0.25.9": "16c020192d6bb3aadc208b5ed84e3e06d79c27f889af1c7be0ec2b876f59b5e868e77e976fe89bd8bb4261eea7fc53a38b9d67a5879773d11b5cba18d3a9f33d",
+  "@esbuild/linux-mips64el@npm:0.25.0": "2bfdec2d2730879795f6884d8f8a38a0297f0cd46bc3357c568fc59432d49d7e26c723d9b8111c799517628cafb469e30fa968387105079aa4b4b4d4192638bf",
+  "@esbuild/linux-mips64el@npm:0.25.1": "00bfc596edb4e20d0c267f6c8874a0e99960ecc24a8f1755ddfa31f472a35dd58de835982e0721a7641ce494b6947cfd271cf933580674c6e4451a371d0723ba",
+  "@esbuild/linux-mips64el@npm:0.25.4": "3f129931a6973a4fa470ddc46e3e3fa150aca64029951fe7a8d9616f41ddf8422d3744a30b0c5f36a35bff19b32b25c85bf1e5760537b329f18558e289213eea",
+  "@esbuild/linux-mips64el@npm:0.25.9": "3c58927449a856c92895591d797224135327cb97cc115dc794fef98b65b7d1fec98f7fedbf71374bc31f045921cb851bcc103f12358047c22be67f7d3ea9c103",
+  "@esbuild/linux-ppc64@npm:0.25.0": "bca7b660b91939b5d9f4942b4f2e404efad88fa166c51ba49474b3b5ba200213e1c44499c419d2b13c5afe01b560f361b46d201acc146d76515b953be497bd4f",
+  "@esbuild/linux-ppc64@npm:0.25.1": "cfab66cdb8ad5fe15ea74ce19b945ef7a9291f252f7f063095e0d718d3be36abcc85f9cac26463865dfa03970c28e7e4e6a93fc75adb405cea492ca6f22ead4e",
+  "@esbuild/linux-ppc64@npm:0.25.4": "6f84018eda99c3f06d519abbdbdf15700707236b8643ba24150d5168062ba310ee3c972645554b05d4b768438697a9a04014bc884a1beb15bf05bbe1b29e34ca",
+  "@esbuild/linux-ppc64@npm:0.25.9": "8479e472067788a0942c662c47a107190284cb1dcb08006c4b548430b99f88eb144447a5a67165443c0816284eb458f2c1344ed887bc00a875614fd6e0719449",
+  "@esbuild/linux-riscv64@npm:0.25.0": "dfb00cd66f717315b9afab667a484c67a69a7a3f6bb9e4662cd3dd0b7465da3feb5182bca414ce0ad0f7a95d0a1fd248c792561c63008d483146eff8af6e678c",
+  "@esbuild/linux-riscv64@npm:0.25.1": "ef46ca2ef7ae0f3f96a795317297ceac2a08d4a4052a133d30722666de8bbae20029ad1ef79c63adce5f66b7afc017bd4611c71ae22d8db34b60170c2b45c637",
+  "@esbuild/linux-riscv64@npm:0.25.4": "c5b674c2f48c5292f594141a4739f9f266ce8a1a2514eaefacc6fac761f1fa6c208981ca4c9e774c383ca33a46cad539b1fa46af6827cf89db721f33c36093c8",
+  "@esbuild/linux-riscv64@npm:0.25.9": "4f65b7e6a7967df2e5608719bf232ef1d39da8015f5b0c090b108469426859739ce96fd0c90c97e3ee49965931a4558765145e8362ba34b7b3cd9993eb971956",
+  "@esbuild/linux-s390x@npm:0.25.0": "4c5872f244ade04c71f1d0f14bd0d3ef0cd24c5404e55e33964fa5ce7b6f2e1283e9d9adb5356db76468cd85724f6cfdb1cd9674ad630344a7d01ca614bf59e3",
+  "@esbuild/linux-s390x@npm:0.25.1": "cd9a4641369c3df48da83895a2dfa66e02170ecee190fa817f03b659732f6b20dceb02dc281cfdfb145a4407e3aea98eb2c0587ff6d161d16de8d7a502112a5c",
+  "@esbuild/linux-s390x@npm:0.25.4": "a54c0972230a2264714371f6545ff0d9b20d349b08e4837e7063378886f88c08ade0ed5b2c7ba744c4679deb2f60e8485ef475f92cdbadca9d34f462a2724cc1",
+  "@esbuild/linux-s390x@npm:0.25.9": "e5f93356bc568aaae6de618428be09dfae4e837ce9a6ef5071972181cce761d10b9c7d3a42cfa8eb3b39e5981333a8a11cf5d1d95e20e193d61d7e15b8c9e268",
+  "@esbuild/linux-x64@npm:0.25.0": "22f6bfbb856653ee8cff0a93ce63947fd3bd4565c8bc7e9d437845fc4b44a2b3954b5e412b4aa4b63e62977beca12e0214b2607c7bc8c4ce359bd10118755df4",
+  "@esbuild/linux-x64@npm:0.25.1": "c73b51929e1dc770b8eb25c93551c6f6808858623647266b49a9aacbbf0b68ecffa6cb54bebd5b8c14c498a42a7631081033de6be4a35ff049dfda37e52fda3f",
+  "@esbuild/linux-x64@npm:0.25.4": "1ba32d40895c826e6990157a141e23d68fdf00b46d60ef3572a89781f177df75e023d38b130087b167a6e38410c3af0a6bec7b2d3b1af2a37a21c1ed70dcba45",
+  "@esbuild/linux-x64@npm:0.25.9": "68f9b2a672b1dfb552b360826a6c3cf174169456f5c1d7dbd6a8aa94c9b9c286feffbe8edb5cd1e970783d58d094fbffa132f0a9d639032acfed2528e6d3a4c3",
+  "@esbuild/netbsd-arm64@npm:0.25.0": "a8286e8b687857779047d005d4a540a693a2e173893a34273773d0272e9908006e10085a52788f54775ca231ad231e8a7af9270dbd8203b9182dbe2c7fee68b6",
+  "@esbuild/netbsd-arm64@npm:0.25.1": "a094af97cb886c65034445492d0679588e66daf0317c3567da2b529816154a581944e18888d2515cf543be4c4b7a1509ebcc7871d01c2ac66b9f53f56af5ea8d",
+  "@esbuild/netbsd-arm64@npm:0.25.4": "37bc10864f14c60f995e2ef13bb53102d0ce0eab1d32dfe5f48254aafe6d791d7129cbb00c6acf9e32b561db5420c5558b84800cf6958d40d3d55a7e3f456ebb",
+  "@esbuild/netbsd-arm64@npm:0.25.9": "825f875bd799219eef2bb130cc1c70c387225851f17331143ab46834818a5331cae2d29dbab14ed7183e027c57f1472220a8a1becf27813c87b50442598e4ee9",
+  "@esbuild/netbsd-x64@npm:0.25.0": "e618540e5e086cabc260010e62110a8afb5b0dfc445e5cd6db843d8a7541403decee971265c5cf59e6f1268b03e8fb50e27b65f709faf647c4e20e0916f19621",
+  "@esbuild/netbsd-x64@npm:0.25.1": "7461fd218fc88ae4b6534573bc84af995be0faa5b5dbd8be2635c12bb0d74c7c860487fbc07fd0487d4231fc3272f02f5db180d6c79e632f6e8f33138b626462",
+  "@esbuild/netbsd-x64@npm:0.25.4": "6875cc83961e613dd28f1c1d5c3b7404dc7cd4b54071596712c56574b1a24517424483c7c363c0aefa8259cf2d621e080b8270c0c242010ad04ce367aa87e897",
+  "@esbuild/netbsd-x64@npm:0.25.9": "333f27d61b99fb2388ee9d0317089069bdc890f0a91092fcfd7012766b2ef3c0ba499057a097657fc77707e9491d647cc8f07e6b93d31f2856b09fcbd0d78fc6",
+  "@esbuild/openbsd-arm64@npm:0.25.0": "60cc4ce058e03389155dd34f777d4d5cae1fb62f9bb9659c615ce5d70e8093a58aa89a9ebb8fde4d2dba56e5771c6aaf4442db45f4a1c9d54d6c36a149b857d0",
+  "@esbuild/openbsd-arm64@npm:0.25.1": "014da561c510c2f80a2917560a0d24af8a951cbb60fc54fb8b03361ce1fb2e9c8baa361e970509db4f4690fb039a564fa5393c781042ba94a76681871e787f75",
+  "@esbuild/openbsd-arm64@npm:0.25.4": "a7981586bbfea74746aa87113089020c73677209b71fadab43e6693c141b9415c342df01694e70aa607a1e80e9e37ccf4682dc2f095cae1ffb60c740e63e7d32",
+  "@esbuild/openbsd-arm64@npm:0.25.9": "ae8ca7bed39cd8d9788e9d4c3f066ec11a51bfba534be975d24b8c64d3daf9af95c134b80143d3bfcc9ae7a0967f1ab3f06850f76ad8ea1e85c531d5b241528a",
+  "@esbuild/openbsd-x64@npm:0.25.0": "7ba16accc220c711d1bcbb17ada40de4503f9ed54b8a42957345a8a9b9a7c55eac550b234c6a5a812acf50386f2972fb6a5b0381b38f76cff4b3c44ba38ae1ac",
+  "@esbuild/openbsd-x64@npm:0.25.1": "bc500e5610f6584c2c8412e9b9f2df827b83a91f0d3c04a91b6d031a2c7f0ee45b37984b4a7d2299c54e6188e6dab551f71bb38331e7fbb91009a8bc9852ff57",
+  "@esbuild/openbsd-x64@npm:0.25.4": "7b1bf4a5032e32ed3ce33bf9373964bdf29e49b0e16179e179d7c7dd0a36dbc6ee98ba67e0ef637ed7823b3ac094e21ccde848a066deb091bacc6ea4726a2ede",
+  "@esbuild/openbsd-x64@npm:0.25.9": "e6f601057b127cc2f168248071fc5cce3663b0ade4d8603f75e7e9660e5a2aeb307d786593fcd9572e7577211ab3e7b839e7e572b7cc55d41cd5dd8d46d86942",
+  "@esbuild/openharmony-arm64@npm:0.25.9": "c75a51c729b67314c6ea9b7388b1bc510d1a8353da965c5703669accb4718017202ca8695a1583f42a6761c873ee04f986e038cca54d9ce57e49bd7118b959b8",
+  "@esbuild/sunos-x64@npm:0.25.0": "e6cbfb0a93b9f78ef991ff43af2ab33faacf382d9b8db44bf53a80b3fc27a9d0f598061b9a77de1db9481d69fd43a3fd4b20a40a2938923fa52cabdcac84e972",
+  "@esbuild/sunos-x64@npm:0.25.1": "d915f595373916b96c6f531a45bfb04297ce199d4c8d86e1c980e6508af157b25e5e6d19a7b4bc05a657d08bdfbac099457bccd624c6da574e8f5dbbff9f0ce6",
+  "@esbuild/sunos-x64@npm:0.25.4": "e1807f6dbd3bdf2f1ff9dc404fe0b667dea3bb03825344728de264c4f15323e99e3f1d8125b5c39e2aae94d2c1cad344e3b8a77b5e8c8e0004f09aa12daa82d9",
+  "@esbuild/sunos-x64@npm:0.25.9": "22216cfed4d97193531a44b8db408081c210ce8366fda7c087f5c2f353b00236e9404ec6beac76685d422a6e971310c7185f8c8ab704414849f902ef32c1e426",
+  "@esbuild/win32-arm64@npm:0.25.0": "47bd8e32c90da8472515ddc625e6284cf745b1b9eeecf16e2e699b94b3d11c2d773b16944c8de33d857a8e59426601063a3df04433cb670ed3e8421def07d96b",
+  "@esbuild/win32-arm64@npm:0.25.1": "be20428d1e4bdd2a3e77e30127f8fb24fe073f7317b9aa3474d8a59a6e832bb93c323128a8f10841ba2d3838d7d8f8bb2bebf90ef196087f766d5a32f81c642d",
+  "@esbuild/win32-arm64@npm:0.25.4": "0422de25c136f407bc223e1a9a65a6f528e64201a1b06b7ddcf3190045914c6d68f550a8190d18e58c4e22231acc4c7982d45bd5ceab6a739e2c539d135376fe",
+  "@esbuild/win32-arm64@npm:0.25.9": "bb6e3e9c5acb2a2e5136c9af730f9171c83ca322add74aba54f960b0def02413f3f61d40d4cc86fa5cf867ebed7d9e9517eb50e5d7d7d407c5bcf213546d66ab",
+  "@esbuild/win32-ia32@npm:0.25.0": "072874686fe049446bba0ec18285414275ac74e8232307a856966ede8a822e72ab9f6119f7352f8feb51c629a20065dbc88f4412120480fe5bcc039dd439d0a7",
+  "@esbuild/win32-ia32@npm:0.25.1": "7f3fa011cc38ba05c31d07e89eb19aa1587720d8dc44df727e5d14b02d5b2a238297e88597cbcbba4fa2b8c9d4f2f96124020114b4981e533fedd8a8e2fe27bb",
+  "@esbuild/win32-ia32@npm:0.25.4": "5a8738ba94c72bc07bd17952cb5ba7f7f13593687cfe57792d36fcd9809082ac95ceb54b7739da68044de01f6d5d6826a2587ea2bce48b0de1c70f8de9b5257e",
+  "@esbuild/win32-ia32@npm:0.25.9": "807108b8615459830afe5a57656806641292e22ad53fbecded0d9b4113c5e6ab697f57553601defee1fec6acca0a1d0671e193ec5e396fb268e672ca6127a2f9",
+  "@esbuild/win32-x64@npm:0.25.0": "ce021c1bb895345ee30f363d89e1f3631040fb44d2e27e614b65dc697090c30c5b66b80aa9d6e5e3b3153010b37e523d6ef34c7b4f2248192b1b4bdd30701b3f",
+  "@esbuild/win32-x64@npm:0.25.1": "51a470813dd92d7ca58bfd30a2d94d7ce7a363f750df8164f359ffe28caa270d36ffae3aa8407eddfa5b214d173ada1a121ccf19c5d21fc36092634b9e5fea17",
+  "@esbuild/win32-x64@npm:0.25.4": "0bc72a7dc50b20d2cb7cd38a0d85ab3ff0c6467ba7d817a74da8c671703f97c7c7f7a7375d0069c3f0a76571dc04a1072852e711131cf4d1a62a70e7a38449db",
+  "@esbuild/win32-x64@npm:0.25.9": "8da054c6f1c7e3a0b59fc953a893b37aa32b9be22d47ef781cfc07006a8deb7c2435582608ce1a87c643c08c740f15565a9550b96a23f6c755775e9cb74cf8ed",
+  "@img/sharp-darwin-arm64@npm:0.34.3": "952e9e9c34291502e7c21258d2874539a3953a5da8df52c8e2c459f673a76179eddd48c3b7563773db7bb36b2b241d781b98a667fac4b30c1f49c1cc9fdf9b7f",
+  "@img/sharp-darwin-x64@npm:0.34.3": "57ccfecf25b6e21b3df16694a959200ee6d00ac150bf4c5e3787bedfa8f944cbc95c7130fb6d66b207a0bd987e30f302b67de35a7481909b9bc175581da1be6f",
+  "@img/sharp-libvips-darwin-arm64@npm:1.2.0": "77a6a47fe9cbc1e6d1c66fd3f617bc64a8b710ed7cb44eee64409d49456dba054495e5ef8de3442e655ad11263ed19df554e9c33c2976e3226c121d826188587",
+  "@img/sharp-libvips-darwin-x64@npm:1.2.0": "334c823aa129365e7f71b3467fb3c37e7a0065d7cf192b08b2bf85d400a568da42cb236dd238ff35670f296ec5b81f08415e11c257e1c8b8df680923c3acd72a",
+  "@img/sharp-libvips-linux-arm64@npm:1.2.0": "c8e7d5641ed6d1a406d08b45536fa6a9e221024bad1b3b6e7e16942500c5ca3f5ae444ac141a61ed9b43f6f7e73ee66bf973e24a90fd94dfcf83d4617492c085",
+  "@img/sharp-libvips-linux-arm@npm:1.2.0": "9a854fff624303ed4bfdc7e936af47b3c6b07e486d0b366c8881306d49766b8e972c5a26fa53288b00f4b92a019b374bb66106c9d34f6fb23489cde5b861d2e3",
+  "@img/sharp-libvips-linux-ppc64@npm:1.2.0": "bd4e956d5f01efc158e992047460be6b8cddb9f89cdd02f4e377a178da1703ed12125f161ec2eeb99de9d11232333bf501bf5e70b85e0e6f94f1cddf7d5fc954",
+  "@img/sharp-libvips-linux-s390x@npm:1.2.0": "6ed6d891c2ddae07fff09290b24c1ee3531264dcdb0d0d461279fa2168c196490874f84d5b5fa045a3063e76957fee0bfa765860db486779e3acb68ab743400d",
+  "@img/sharp-libvips-linux-x64@npm:1.2.0": "2a80a045237e56c5f4ec2b5c4febe9d95066beadff06bd936439f34bdd615205346dbbf996b5b4d1e43af6a128cdfd4b1a76d6fb36d9eb62f61a7248fb242728",
+  "@img/sharp-libvips-linuxmusl-arm64@npm:1.2.0": "4225b0af93ec3a600f81930bb0ac70671cb76917a033f5ac6033252a79dd04c54b1d1bf602f79877efd07d9382106d8b2058b7c9a2bfcb7beabb6861eab0879a",
+  "@img/sharp-libvips-linuxmusl-x64@npm:1.2.0": "d2a47388c6d1ff90bd85fa0a93f8bf9c5855c2834736bdd78d47d12689e3bcd41c695788c6bef9a8e1c5156951a675e22dc51a0ddf35a7d56c96cae3e9f55688",
+  "@img/sharp-linux-arm64@npm:0.34.3": "a4ec64134484037e6a1583b11e39a16afb95eff963bf9c52deb17557b0a35dbc509325368040b04939e859f3b9531d64e6405fe54d13b3633628a4f77bfd8672",
+  "@img/sharp-linux-arm@npm:0.34.3": "fe4106211c93c566d3712302c081391435caaeb6ecd41e88e94e3e9780d0f27934a02a871d6280625944f625350c4f81871d92210ff6ae5511318248a4ba3ebe",
+  "@img/sharp-linux-ppc64@npm:0.34.3": "0671ccb3a25e53a665d50b2b52cd779b57a07f642686bbb7311c288c44b2d861cd1eacf6bd6883421c73cc5efc8fa8536280dd48fde9a6de8d287e4a99c9ab69",
+  "@img/sharp-linux-s390x@npm:0.34.3": "a5e2c3c14faa997616caf0a9296302c58b9565bb24f156dae7ad1770f5f984919fb34a0d1f59f0112205db060e8bc665842fd27621147786893619c51b81af45",
+  "@img/sharp-linux-x64@npm:0.34.3": "83a82d1a97b975b64be0ed6fd35fe87609ffcbfb7a068a7ea0e67dba7ecd71f32382b86a024bcfda8aceb4ed1628f4ee4a567c4e157e9cd3c9fafa0b225fe6c2",
+  "@img/sharp-linuxmusl-arm64@npm:0.34.3": "53f9f3f673441b21ea0a8d6d95b7ba8f051d4c2d2d4c4cb0fd83bb7593a56f854b255a1b706ddd376f8003adc6431b602afbb8a1ffe0850896147b24912a9504",
+  "@img/sharp-linuxmusl-x64@npm:0.34.3": "ebd702f0f88121b31e87db93a87839085605a02826aba5207e9ad4fed89471daf0e32276ef3e13dc289e53042baaa8244bd43c0768c0733e3a4fce02fdf30dab",
+  "@img/sharp-wasm32@npm:0.34.3": "3a64ba7dec1883eaae60925d77b04322a81d9c2d39359fa021677252df7da3be72f469a298cf2470f7350553eb30ee84e874d7032b06fa91ce27a81e1ec5f6c7",
+  "@img/sharp-win32-arm64@npm:0.34.3": "9328ef81ef6df02a8f83123f59c0addea7dd12681af3068e677ac274ed238321dd5522f2e4157b1a53ee0bc27ea22733263dddf5d4b65d2c5a2533ffb724f81e",
+  "@img/sharp-win32-ia32@npm:0.34.3": "cf08bf95ff895c831bd74c7c4567d6c4ac20100e0d1badd0a9f7100486f3f416022222e29fcbae79b379defd1f0bc13adccc16c119fd4705d00c11c35ca9988a",
+  "@img/sharp-win32-x64@npm:0.34.3": "07078e460f2749ad6422135193bacdfea1f223fab9f8442b5c0cbecb6d3e92070dd0a968219ff386a03930ec4104162627ffcad5b362ec8dc0247848deb52bbc",
+  "@lmdb/lmdb-darwin-arm64@npm:3.2.6": "24aa52f4ec93c28e0c42b4409308f04c641103e7d5378640290093c886f0d7f661b6bd0fce865898f4c81c0eec1b84dcb55151cef037ed5a003dcb821b637da1",
+  "@lmdb/lmdb-darwin-x64@npm:3.2.6": "c10346c9c46f5cbc20e37bbad94c13a152483e2252ed9c066f9cdab9fb94c3e2461cb483271bc423f538a79fff9b31053952be99ca6429c2d2f9fe61adf6ac31",
+  "@lmdb/lmdb-linux-arm64@npm:3.2.6": "1d8a8d6a3723a4337c42dbc8b331fd010bcc8ee440d5cba9ead1cd733a0fe445f30440774b0c01ac3210407fa0dbadbbbb0648ff567369161a353a129fe09598",
+  "@lmdb/lmdb-linux-arm@npm:3.2.6": "c0099392b863e0f079e0fb3cce6cbba93506531d998ace175566dfb8e828ac6938bfd84a7f076b842f1e033b1f3069a4f627391962f845f88604631d30519c70",
+  "@lmdb/lmdb-linux-x64@npm:3.2.6": "498a9c325ebb9678852b6165a5bc7ef14c399b078a390212fd90c37ae2dbfe8475c79b6e364b013dd9725391e5912a421d2fd8f035c5cf6a83c831ca6c9e7010",
+  "@lmdb/lmdb-win32-x64@npm:3.2.6": "825c811162a90f6f74ef5b66f6db256fe3ba25163594c4b4ec59e30ff5eedb2c1d993b043674984b03f46259baf364b32af8f2c3c2b12ed399cefb033549693d",
+  "@msgpackr-extract/msgpackr-extract-darwin-arm64@npm:3.0.3": "ce4bfbfa35187ff8ec3c89a1cd0ee4563b811e8990d2dc2b90da7607de6a653482c780b9f7b670716850cf58834d106c1be11802a7aed45f23e80f4ec61901ad",
+  "@msgpackr-extract/msgpackr-extract-darwin-x64@npm:3.0.3": "43cbd79892d9974070243ef89205eac56893fa5de06b6c6a6ac31692d59e53091b7b500bed7cb68920eceb4091318b2528e676de5264d1de86500da97216e82a",
+  "@msgpackr-extract/msgpackr-extract-linux-arm64@npm:3.0.3": "d1261cc5bad94ae873f4b0b963d9025f738d04691dce542f9caa9848248ef8fca483d11dbd8a9cd318b2c41bf8dd74e63ad12dc7d187b88f912f61be3fbe3b51",
+  "@msgpackr-extract/msgpackr-extract-linux-arm@npm:3.0.3": "5f94c97a3fb9d8a69edbd36588a4b24b11048e156489fe1160cd15d61e283759c068f510f0bde8ba5f9dffeecb2cc5e77211b8a3237fce99dfa4a5e288c0d583",
+  "@msgpackr-extract/msgpackr-extract-linux-x64@npm:3.0.3": "f950a67e371e80de9cc2b19efbe191b027340314aa19d2384b12036cfb393de4a703845a36b27e8eb01b2eaae4d974c16dbf16d44b977f1dbb528896c555b6df",
+  "@msgpackr-extract/msgpackr-extract-win32-x64@npm:3.0.3": "edb796b289b77f286cb3b59b794e13b67f963c04f1c1f60199365f1ab763a6fbee26d33d4bbfefdc4d6ea6bd5ed0ffb51d49e5d624b6f8233ba4fa1060d4b38a",
+  "@napi-rs/nice-android-arm-eabi@npm:1.0.1": "ad03e9ad3e47dc38be026d83fb0538f8ab5156cb0b47c2e88b029aef1d65c8b83fcdae5c8ca612ba5852bae333c379ef3f195ffe86a8e84d48696f716eda7364",
+  "@napi-rs/nice-android-arm64@npm:1.0.1": "d9283d174af5c076f13f8b08ba012b7d1e5404e681b2da5c6e51d73130a723b9dcf9de601b41524bf4ccc0e554929c9d159d92c26b5343e25b419b4c1ffec6df",
+  "@napi-rs/nice-darwin-arm64@npm:1.0.1": "d2c013a1d8d7bba15bff8554a0dd5c5cb3718ef9a9dfb7e8219e739422f1c6ea32689a17525d529bc3316217c26f16f2ac9ad8fb22eaa502b1dcd03276492e8f",
+  "@napi-rs/nice-darwin-x64@npm:1.0.1": "7bff05ac82335364cc6f0711cdb80c3e802dfc879e0aff091a2e6c8ac6d62d1b80f77daa67a0a493c9df7f239c598bdda307e1636bbf6d81d2c9bdec2632b9a7",
+  "@napi-rs/nice-freebsd-x64@npm:1.0.1": "f3c00d7dcef69b874f7e155cec696c05c481a019b8a40aa57da0ee67cf33433b30dfa2a1ec8d17d89b90992fe29b23692c0dcbfbded5a7ff6de8fbf970b1320e",
+  "@napi-rs/nice-linux-arm-gnueabihf@npm:1.0.1": "e6491e589bb5be58d8f0e2114156036fe92c34dffac9297076bec031d6738a53657b87ab8072595c36659798de57207359cdb3903703af8358934088bcf3e61c",
+  "@napi-rs/nice-linux-arm64-gnu@npm:1.0.1": "1fd7d01c10ff497d7d37749f2de8c602ed28a9145c693bb3676fa57d1789fe145fb5acefbbb46c5e386dbdc33d5f66e448a1ac4d7fcc80c46c5e2778d0119224",
+  "@napi-rs/nice-linux-arm64-musl@npm:1.0.1": "bfd1b4b02da0c5e4d71e8fd0bc8be0d1af344fabc63565d5ac6b8212cc91cc69bd980199ebf4e5ca9794bee7cf6444b9352463423cf428f2f8f4cde23a2ac319",
+  "@napi-rs/nice-linux-ppc64-gnu@npm:1.0.1": "e3ba80bb29fff1405ef925937b9c45bacc378e5a2813e983534a6f75ba495d27de4be8156ef7856179a4f65c9908b967b0af79f9a9267987a9d3f4180e132acb",
+  "@napi-rs/nice-linux-riscv64-gnu@npm:1.0.1": "5793c5a406daa97f19a0621d266a6b536ee22a797af4771d442bd9c9d90f56c875f27cbdf654d3445a5a577494e5f79bd81732a5c164079f6d5ede4bc36c4d3f",
+  "@napi-rs/nice-linux-s390x-gnu@npm:1.0.1": "7f568ac1686c2cda9bc264ee29ebd140d1d0800c9f0094675761e8043472d2c9cf53259e2e0cc39bb0f03e8c3eabf594f0462e6c2e2071bfdd999955fb611840",
+  "@napi-rs/nice-linux-x64-gnu@npm:1.0.1": "7d7f34e151c4051e72e86dd3ea58b146fabe7857c3346bceec27d312792f050b5de26f2d2b5b82435fd47ca699b28614fdf0d5bfc369da9199870a23cd6d14f3",
+  "@napi-rs/nice-linux-x64-musl@npm:1.0.1": "83cf4650e7b388dddaac728adacdc693d688712bc53b84efc1517c916e56eeaf92c5d75bdc19e7c4115533ce4a83bcae7881e437ad87f013dacac072dfcec5f1",
+  "@napi-rs/nice-win32-arm64-msvc@npm:1.0.1": "022aad4fd8f6b065f6e0516f6f99e88b9d533e86903eedeb9ce077938fb39267c7fc14fd05c43d805769259c2e293df6dffa1b585f7843a18659fe49866a6b3d",
+  "@napi-rs/nice-win32-ia32-msvc@npm:1.0.1": "d6e191dc3420c68901d5bffce332b37b6e506604a4bf21d1ebe7713950e1491ff156e9bba0be16673da293ceff3be075f975fe526b749fed82514446b5aa7662",
+  "@napi-rs/nice-win32-x64-msvc@npm:1.0.1": "bd0b5bd57fcfe879e677d9bc204582cc3896e84c2b021da52f397488aed672373bc6bd6958217744a3357ea89d62d8145fdf86953e0c75559b639c53b8f48266",
+  "@next/swc-darwin-arm64@npm:15.5.2": "46b3738c0ef12d99bfedcda6782e2a75e05606089d0d7d59e9752c56db914b932dc54ee38f821fd64dc6d0f71b72402d21d11327e83418fb9444fff03a1e7280",
+  "@next/swc-darwin-x64@npm:15.5.2": "f26625805731858319df090dae1eb8612b328846513149987bbe1e8c4bc8bb86172da89bd7684a8b055ba449ff164577d72d5245727758bda565de99ea4fd855",
+  "@next/swc-linux-arm64-gnu@npm:15.5.2": "a6c40e59d1cbc8c8ed74b1dabc8ec28a30407aaf478f05e435456b9f6a90e3b6cb045318f50b8b9e79a43f43447af2042264b4562ae2525cf5e82fe377f4059c",
+  "@next/swc-linux-arm64-musl@npm:15.5.2": "7f6ff8850667a341720a7a355bb1d838145bebf1a6f8e4dafe33a68acf0a8b0d8b53d9ba214a6020f19deeed9a95267bfe1f42cb978684626f5e3a86ac090c7e",
+  "@next/swc-linux-x64-gnu@npm:15.5.2": "6158ead4481b995b5d466ee0e3b653585ab4a077f988dcc6b1f61dc67fb230ec86c51b6b35b86e17436191387c51eca3365af98c14fa2800e25816a56f2673f8",
+  "@next/swc-linux-x64-musl@npm:15.5.2": "2c93d6cce2fba7a8a8fbd3e135638aed29d1c371a1eb35038bcac1241a9dc0e4878bde7750bfeb5e7d48680a22da17c2ede9573e68e64a355dd4a4d7cd7ff289",
+  "@next/swc-win32-arm64-msvc@npm:15.5.2": "593dc1760fcd73846b1d75aa9f8298fc170820db8191f548de9dbe8a877915cf37a49836b789060aab66c34bfbe86ef6e433f92ef6135971a7fa482da4acfbc4",
+  "@next/swc-win32-x64-msvc@npm:15.5.2": "b16645a21e6b8a8d738748636ea2b7132c96e0d2bcc77ef55baf9aa27bf167c32a9e658b17a3d9a0eaa44679fa9a62e62b65d592df2abadcc86515c7693eb958",
+  "@parcel/watcher-android-arm64@npm:2.5.1": "e9c94ede3bd5c5d999d117d22ac8032a17f8ebc72db3eff04ccb2b4e6718db19f24bf29a66a610e03f4ee95e2cd7b2d30c15b1845eb897b971fec75dbdd76141",
+  "@parcel/watcher-darwin-arm64@npm:2.5.1": "0cab55a55c128ac5742388fc8dbfeb9877018509943801ce8a52b57bb6dca24189d025d38684b1e482cb7816368a52c6434dfe45d3997e2fd2509276f48774ea",
+  "@parcel/watcher-darwin-x64@npm:2.5.1": "bf07b8ca9a435fb885fb0ca6565204d2f2098d7f632faf26a6478bb39f538c73b50afca17c193dc189a80a864d85e40f924ec7f21a0e7ad7d0de6f97f7154134",
+  "@parcel/watcher-freebsd-x64@npm:2.5.1": "9f62b9da08e98bffb7cf91b557af209586e1d7dd654c56c5a58fc4b0bb61a9bb318116ed0048416d3341d3434b1fb3089bf6cfbfcd08e61333917bc59e691c1d",
+  "@parcel/watcher-linux-arm-glibc@npm:2.5.1": "07a55a0050e913c9781d009a05b3a0a49c77c2679ae9f98b2374a7e17c5401e2076a776c7bec88de58c71fef040c89aa97176dfa28a03abf8754e18e8d1109b4",
+  "@parcel/watcher-linux-arm-musl@npm:2.5.1": "f9cab0efa652276fb4bcb58845c9606f7aead1ec81f7c4ce2d237eec754bbd3101682c735b6a371dccf93f16fcfe0ea1beef5d43eb39e4505df7f29b73ea0004",
+  "@parcel/watcher-linux-arm64-glibc@npm:2.5.1": "ce22f303187aa03fa9d1f9609d2cd56cce6b62f0a60f14a65449adc25b7072d06118d956eb7ebb548210cf2d120cf5e987abe34e6515a5bfbd35b15643f40142",
+  "@parcel/watcher-linux-arm64-musl@npm:2.5.1": "7a0b32b7b784fe3e594452b6642adc3bb4ad78eae526f5e4c7cf061f428eef2e05e827334806cd230bc873903abb1f70886716a0353e653b3b784f09d2237956",
+  "@parcel/watcher-linux-x64-glibc@npm:2.5.1": "a6241bb57c409ab56ef944e8d64e057817f41a9335047d1e252aab4e4b10f64d8bc2620ae5c761b71551f3c4b494edd687a08c274a46ca2eb84ad34f6f4de9c0",
+  "@parcel/watcher-linux-x64-musl@npm:2.5.1": "a68cfcd10a50906ab228d7b906eced68faf6a42a29da5506d24d0dd91b9593a61605b91749d9b1e3ed9f257b845f48ba3df62572e40b4ff1f724d879865b225a",
+  "@parcel/watcher-win32-arm64@npm:2.5.1": "0f467a731cf9403b8bc7d35418d991596cf5e7898029796b4c769bcbb38cd07ae6ec05ef0f19298e5f11e73ec5198bc474d79b056bdfbaea513525725103d7dd",
+  "@parcel/watcher-win32-ia32@npm:2.5.1": "9ab5f3e9849a6077c8c2aba7bdf9030dea38f0ab9180792ecd30094520cddf16f3b68006f666845b86c5ef0e05c648364475c9ba151e0269561891ca3e276667",
+  "@parcel/watcher-win32-x64@npm:2.5.1": "e588d87d5b892484d252ac8e1ec3f4bf7a664d91f0d03dd93764be8db2c35f81879275908dcbec42b0e43bc99c7afdfd29fe687ec022bb2c8c4bc7edd29eaa15",
+  "@rollup/rollup-android-arm-eabi@npm:4.34.8": "52c8fa00eff53e8840e017388303a7613286068133027f734000c84893dfdf1e1dd72bc005ab1d7c52a82fd1b4fe6b7cd1e73242be032ba6d680482e63ea1f70",
+  "@rollup/rollup-android-arm-eabi@npm:4.39.0": "67fa54fadd0bb5a6e9d7df15ecf8971b799cc36ebeca027fc6edb4801a3b809fbbaa127b34243dbeb95eeb4d9331f5b04827abc0b358f900fecd4696f49ac48e",
+  "@rollup/rollup-android-arm-eabi@npm:4.40.0": "4d507765ccac7532b9638121cbd01259c4e76ca2c1188fb1a44b0c454023d69548d9a8f16872bfa98053b71c90c7eb035ba1febf6cc10eefbce238573ec19bf4",
+  "@rollup/rollup-android-arm-eabi@npm:4.44.2": "d44ff495052b0185518d1c07648b3759ab520b3b6e34c052160b4e9e46d35ed9cd70e3fc6088e1f343e60d8d3d0cd28dec09cee2e25d26cca17d0e15ffb6636c",
+  "@rollup/rollup-android-arm-eabi@npm:4.50.1": "90ccd8a9ff348a7d0962dda730d3663daec1cf20798fc6011cc0c937572826c98a0baf16299206644738719cea9478396a3746ded1c9f16d426c150b6b99ec53",
+  "@rollup/rollup-android-arm64@npm:4.34.8": "49d1e177871892244abf4bf6ed5d5b3f5217ecd9de56e684b917e43f2942264d3d296a381fdd8847034065d1662a6d414087239d334fead73ea259160f8625e5",
+  "@rollup/rollup-android-arm64@npm:4.39.0": "d9a55e94274cddc4b9a52cee24cb723426632a1b759381f6f3b51ca48b90616a74642c5e0d6343176c48c8287cc2464f7b58cf225e14dac08a80da87a6cae3ae",
+  "@rollup/rollup-android-arm64@npm:4.40.0": "0b8b77ad8aa62a4a7c349dd2352ad3c7d6767a993607db28ccf8126e755257c70a356481947129995fec0974f8b92afa82890271ff459f9226dd9f166a9716aa",
+  "@rollup/rollup-android-arm64@npm:4.44.2": "f00d7f1f99fad636fdaebe38bd3fe467fb4e8c9f06793e2b02fc56b1466fbdd652413fa613e856e8c266ab87bbf374fbb30fd43d8cf3786e5efbdb8582e8441a",
+  "@rollup/rollup-android-arm64@npm:4.50.1": "7cc9a4a1b8553163cf3e94ee3afe1c8c3b036802274988741c9269ba4fceeb0b88ef70b6d5b845e1aaf570aebd0f2ecdedff668f76fcd00a635d530f2b2fa3d7",
+  "@rollup/rollup-darwin-arm64@npm:4.34.8": "a95e59580ff3e195d340dff31cbf47dfefa624295708186b7865c2d5a001f18c4b54ed849fb618d966716714a053864361d3c08c4444210b8a350617ad2a4f73",
+  "@rollup/rollup-darwin-arm64@npm:4.39.0": "e13a44b2cbd92e4bf4d4dfe44c9e3bed44f6a437c63979099942a6c6423881a707eedf0934e9c893b6a338d9f375ee2449230c33cc9c561ff39ea4c579d659eb",
+  "@rollup/rollup-darwin-arm64@npm:4.40.0": "b0a0e66b07286c50f754220951743f0db3fc7b95a5cd5abd69c7c26b89ea470ab3699698729498bd031167f1a79943be2c3d93bc696c10a4c29832ba525b0204",
+  "@rollup/rollup-darwin-arm64@npm:4.44.2": "96ce8e3cba9364f21b07389dae47ab5532ca14be4075d43c5642d337d13acc5b5e60ec721e5070b99fc6d657864988b642ddc859118112cf017b952bd3e71824",
+  "@rollup/rollup-darwin-arm64@npm:4.50.1": "746b48a675b0f93cc1a4646053d266f81b39a824859c9ecfaf042364358d9e0785a16b6044c8337a8e87c7590e5439582624ade23218a68058f1dc75274ef9f3",
+  "@rollup/rollup-darwin-x64@npm:4.34.8": "dc622672dc2778ecd4c1bd2d3b433a41da3cda161958ecce561b1cc29b1d56f21f819bc7f6403ae001ee0f2ec093cf6f064ee0733eab38888b9461f932e80093",
+  "@rollup/rollup-darwin-x64@npm:4.39.0": "ecda22160d9562330f31a68c445f8613bd2e306cdacb966574cbcb11344f1e77dce068307c9ae2da1bcf3c1353fcabdfda7f5f720e6f4247bc4c92a2ddbb9882",
+  "@rollup/rollup-darwin-x64@npm:4.40.0": "021b2ad6de640c3a2a16282bd8bed11101430690bb42e00284d4e3ce34c4ef607d5352be851d790add523136cc510cc0062a79229f39dae528521469a49014a6",
+  "@rollup/rollup-darwin-x64@npm:4.44.2": "3f610c390c05b2c2d6e4060e7e005beb3d3737323a8b4fb7879ee8b576eeabca4345bd1f7d6a29efa7fab0459a8d911c60c02222a9cafc30656f12a817a230ea",
+  "@rollup/rollup-darwin-x64@npm:4.50.1": "b6ecf737c66e6e876e84c6bdf819c20346f2f3734fb54a6c3fafbe458014c6dc750c339f19efdc88e7e340053bad57a2adf248dba489ac5935832450cf7d1022",
+  "@rollup/rollup-freebsd-arm64@npm:4.34.8": "4307691354fd6080a1092331bbeb68232c0ce0ea60619dec72edcd140c1eb9bd4620482ac7d4c38bb4aab9e3e7106eb2758f82686308b23cb17d0b5495040b72",
+  "@rollup/rollup-freebsd-arm64@npm:4.39.0": "08d734630bd862caef29713262fa9f1b913c991b269387dacb096193b6190bafd683d5fd3180f55f8d7d12cf18134871c02a62c8a2491d3cc57fdad48f2fb7c4",
+  "@rollup/rollup-freebsd-arm64@npm:4.40.0": "fce9a10a8a688257fdd365421a45d35a3fa557c100674cee6a52e90d0125785a52fe476efe58afaa3aa230bfd45e8aadc66188ad5480e4bcaa9de31dc02d58e7",
+  "@rollup/rollup-freebsd-arm64@npm:4.44.2": "1f0f7957ed02e8a758096ec03198142bca77992f0d43744fa41ebe5d7a58205d70ad3615b8d0b22b612f671a920119d0069743e596024cace0706a6fac87b013",
+  "@rollup/rollup-freebsd-arm64@npm:4.50.1": "4c37734cd74bcc6d9902be6e58a65a33e2364831b2f54a9279f71dc86fe03471b7e24e247381d28aad90c7932531777213564f2f9d5413adb0eca93b1005e253",
+  "@rollup/rollup-freebsd-x64@npm:4.34.8": "9b1c96b307040cecf29c39b914558c26f2f2f52dac4e9c4cc215a658436fa97043a606d68733180e05e0ad66d5c6632c5ffe2be32a1da97b92fb61c729486cbb",
+  "@rollup/rollup-freebsd-x64@npm:4.39.0": "1fd1945fdd39a220f4176fec68a10fac4e395290f836b43ec9ebc272d87e2aa3c917db1a813abe6c7930b3574fec6c97c0014bcb6e7e24778effec2fffcf0926",
+  "@rollup/rollup-freebsd-x64@npm:4.40.0": "38ddb05c107f622563b96f18493bc0f1ca41ffa2b7e80deb28d4735ddbb8780e2d8374b9cc740a7d9a316d8eafdf49f98f548cc993f44f03e2c400e9d750665c",
+  "@rollup/rollup-freebsd-x64@npm:4.44.2": "81c91e10d1d34372bf81bdae15653956fc8d76c6081c5aae9e37d68f0b8aa1f83a96a12081a7eb656b30f2b9474d6c36b12801ff4ca86868f84f05a4cd9c6a58",
+  "@rollup/rollup-freebsd-x64@npm:4.50.1": "985a27ce38b6544e56cf0a93b4efc378c44635958180b91ff242adc68cd9e22a312e1ecd9ca5be9aab6e5f22ab8065e7d268011d1a80b19e12f3bd53ce5bc29f",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.34.8": "0d616bdbee859b081b87f6ce3faabd9580dd914e84710e6f05bbd89b1fcbeb24a756839851e0889551554e3a6f93c3579d917fb3e166b85f3f672091c0497ade",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.39.0": "7d41df315c2041dd79b2a115e26ed25c0910ee9d80c5156604a8130bf7585a09cca88cfabbd632c6f6194a472126ff57d556c89685097c5c94d5b3e7a7f221fe",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.0": "f489082b9ba893656692362e9b1972da5f12258ed12c81fbdd910dee822cb475f7ddf754659c3331b8f754692ac33b3c530cfbb178803794339eaaa3de7f4a64",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.44.2": "d4f7b0db7e325f2b2a7af9b2d7ce95de1670299d8e6675db35a48e9e27e8e95e60187b85b710ec6e58383f726ac52785152c7261710ea2726dae27dbb44c9efa",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.50.1": "8be28c7acbca9d6948823b1b292426afb2a6ef24ec16532c2beb394b44fa225b252a19a3d570e7a8445720bfc84c0ca1e5574c9c852a9784c30f758e307f0334",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.34.8": "11439a3909996147719ec4b061b7fb3b3fe77a15a2582a83b095b88f3dc428de3bb3e34a10e618b8c57aeec06c4c19a14632e36ac08dfc3c9ade3e6c55352be6",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.39.0": "8f037dd06639394c0b27f1803d32f3b27434206a401ef587af283e5a8b86b9b2e2c1f1c2cda186f6f887717558b26c1dad4cac7e9f5b5e7dd9dceaf918ab44e2",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.40.0": "e98e12c8392ab38c76ce04d19ba5105abdc99e968a8cea8c98e16827b74d133899dd5fe4ab1c109719a0a32376cea86acf76840434b96fd9b8d7641eaeed2087",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.44.2": "11c2f1f56cbd7bee75ee8ee70f4b68e1cca334d314aeac421834b18a8b13657bd0a3a10489a1785a51b00f359a38cd5bd481a75058f44f7c4bcf2a07b07020df",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.50.1": "10f3caa27339af674c8dea27dc3a6ef3dcecf43f5f976d245559c3e7268dc77dde406cfa35e0f759dd66b54cc744f6925039ddb4a467f0f638d441c560b6de4a",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.34.8": "c19cafa18d2a461e77f65e0a1142f362244df1cefa9bff0934514b2a55eaa0e4e64b776d30b72d3b84847be20dc14bd52d19ef189e103bd464f982d8b33c75ba",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.39.0": "94b4544f904a4321389507ecc42cd865fbe5aa83fdb8bf13bdb1c58b3a62fc0679f6c2ad10bdf8774ef17eff375f246b013e4201d3e3e458d7e21e5fb3ebdc05",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.40.0": "6b78d3c657aca2331158654bf26f7b33a50f5ee69df9c40aa7ab3861cbd9f558d6fd56b538fe7f070300f81513f2f1d4f466aba3040d19f4ace35b3d274469a6",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.44.2": "31731dce4972b67e689b97d2ab695e77c2134c8adaf13e3363ce589af702c5f6e4acbcded6d302dddd2bd3abaae1686264bc8d921edb40d8fcfe811bd887ca7e",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.50.1": "7b83b6bb5e8b8634d880b273b0a62d589745b44e82ad887fb854c2544af4091a14115e13f911a29111366bb978da894418260b310fb79e04bc83f93e0601e680",
+  "@rollup/rollup-linux-arm64-musl@npm:4.34.8": "54743996070942d7ee54928ad5b4b4f00a3bad840b0886435695c0a4bcabccab42e221a33f0d17a37ecd2ee5577903585e544212d9e218aa1a5a19c77b5df5b8",
+  "@rollup/rollup-linux-arm64-musl@npm:4.39.0": "24566428c40ad7a62f11ab7917546c5b11efc7735b757895cb8930446d9ee255521b389476b4d33b3da7ea82a1f1639167698af1e845c1e63ab7f7c5f452da43",
+  "@rollup/rollup-linux-arm64-musl@npm:4.40.0": "ad51f17187757817454520e7cf89458cfd8e062319e3fdf89f8d9d466c5df3e7e80623543cd34fd89273e9daf67b17759cc18b31d1ec9270815ffc6907357bf6",
+  "@rollup/rollup-linux-arm64-musl@npm:4.44.2": "e7c93738b807ba618d2f77edbd2e242e41a4bff20dde0d07bc498ee9a05f5aab8a1a656a2f3c6e70357a4aea5b424f0666b98424aabb99f6fd3e63c41aa687a5",
+  "@rollup/rollup-linux-arm64-musl@npm:4.50.1": "69051b3fb5615e2f99527e6d6fe5cd8375c76e8e17ae979d608f3e0e62b2c7e6b9c372132c72a3a0840febe5064ece956b8101054f300ec3e016800fa68360e1",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.34.8": "ff0423d7ee90a314d75ddb4fddfe48d2b19e48ec4b99b61f7ae764c79a789ac298b20383a247a20c720fac5ce610e22c7bb567b27182e85f75f99952ae8613e7",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.39.0": "72a844cc8bd7d7ac91baa23a14fa7eb838a3335e6aa3429b08ad0beaeb73f57be4a04f033c278536f9a0c6ea8d7ef2b21e4a573ee5b9aaab84121d97a228903d",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.0": "962e93930087e9a8cdee3db404edaaefa3353f2065b9d45700e60e475ec0a99ade169704847c0d34b2ab61568bd9f734629a3913d828c503ac17869ba01a33c7",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.44.2": "e0039176ddbe0e4b17e81a3112719ad18ca6dfb95b044f5e225f7fcb76fbd2aff8ea8dd5a20e8af7582d89b0b32ef1a36a27e43d87c3fb3f8091b5704b9f642a",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.50.1": "fb7765bc241f5456a045c61046aadc5be94cd62021a51b081f3b8819aeaa1fce12352f2b89399388fbc14cccd3f5e66baea5b9ea20a8e60f02a32a04a744ef1c",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.34.8": "ffed15556313e1076465ba19db95574e794237fa385beb4fe5242ae86c4cdddf84adaa46c7459a3a22c88636334167b488f971f7fd2aabc4405edea6326d573a",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.39.0": "b758097e4a1f66f3d5e840736d69be0f2733c769832766076a9414b80d8ac2cf2dfa1c709ee1650a9424ea135fc94349c0ea35e647d88a65641e4d516eb73b1d",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.0": "9a3b1e7765cc1de3900f0e1ed4c12d841376b28d5c364efea7c63947b6bda4b05e4569d83e73912d6890130484b9e046e9dd4e91c4632d0c74efa02187abe042",
+  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.44.2": "2ba3325590a423e8aaad5a056a373413abffaa40898fd795794428659ff747d03c0ea8cac979e7524f9a3898faf05da783eca86b63204d3a1a4ce9eac3a2ed1a",
+  "@rollup/rollup-linux-ppc64-gnu@npm:4.50.1": "666b5634e294725f7eb6620d2f94cc2d1a116cff11d92be7ca032811c9e5a6367ce546b7a7b7affc8794fc8cbddbaa8c302efc128855a3560b8ea1553bbbe789",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.34.8": "beff08ebcb7ce824a97cbb202c780e7e991c61041ee8f8ce7334f74a9f7f2b18d3901235e09a527068f3c1e8fe63e9b2e3c5e446e0f773a11714b9eaa7a835b8",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.39.0": "9136d3172cb5acba4ff416b064ef31e6fc94a112ee7f428626f6cf62e5944f02a0a2b0d355db90e7f94b3ad1e8ee9d6b862637b5ef0db601440a7b27a131b890",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.40.0": "1a96bd4aaa4c9fe11d2b870542ded1758328408dd71f4dea2bbf1776d10f20970445de7ad464682d01bed3b8788de1b7f8f3b3b4fe62e88f311361e936a1fa62",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.44.2": "3090ffd9d6460c5ddf769b055bba221cc508b4f0c56b043c4453354e9a9e234ac56c4756f4d724dea9d23db59f0cc288acd0fbe276ed8b201484a83868b66454",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.50.1": "817248ae38f4ef3cab1f305ae870d0ddad8d7fc1531ada95aedcf123836d573f29cd002e9f84a2458e82b0686ccf86f762ada155258365151e304ce5166aecf6",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.39.0": "5351c41030f68324324c0a6437d2bc0b89637a5c74892a65da6d156217cb6a2b8d9c466a5c2e2e0f04fd77dbfafd0c44e6d39a2a95b20abe9bf8bba5be922fa2",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.40.0": "5ffc7589905a89a69384b53bca8a25203ef208c30fbdf83739cb8277473b7567c96376898d940a871917d960fd267f878f1b35c71802139a2fbb54252b9098ad",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.44.2": "d648965919b496f5c32f74c89e0764c50cc193675445e106baa29e9cffb63f569298b923157d40d9590c4175b3640b1686c4ef9ae7a01bf9168dd3bb6d7ff89c",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.50.1": "9b10eeb7b71aed8fbe54cefe9f1fe38caf401d2f64439b26f03b15dbd95570f8a9d2154340be7c50cef5df3256eb062fe0c5ca1eb98105c2d7257fe0fc73fc81",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.34.8": "ba4eb8884458a0e4a530fa2af951541c5cee1da32759bea3288a185d6a88a2cb4ba8cb79db1442cee76372cd30dbe0e84b08367832781541866a56a16af6e6d2",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.39.0": "9adf9794d4fe42bae92b247d2656528736c0df334c102a82f63bdf416667ddfb7ba1b5aa9fbf45d55771599d21453208fe9c128adee11cc799040d821fd065d7",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.40.0": "0342c5f2986150d7420fc16f29105f29affe36d38422d3b2b4b821da34f65b07557ddaed4d36e0aa6599c1c6156a4489b3fe885b089c12b26bdbd002771b5e53",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.44.2": "cc1568916f1609da502e762355b835c98b383a3426a1850c762e65067a7d877a573ef11a3160a826d85c6bcbdcb8685d60c91be51cd80b0cc97412a95df0ad54",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.50.1": "84f8df6cb43001c2b22d681b08a557177aa3c62ea006ed0b2ecc69ce21727e078670d83e31b6067e639df1cc0eefb78222562bc81f128779c50c3e0b58efc3ee",
+  "@rollup/rollup-linux-x64-gnu@npm:4.34.8": "f7cd20a88c3142337fdfee312031f82970edd18579c4116a316e23f81429e73c16ee1b5f255050580cc9557790650642d26f69bd4b4b22e8703bfe4497f50c1f",
+  "@rollup/rollup-linux-x64-gnu@npm:4.39.0": "4dda8acaa1c91c715f403c5e356c71f6418f7901ce641b3854e4fc6beddde4a6d54aff1a784350e9380d2d1656dfbe1c0179187227f9aaff330323e23d148566",
+  "@rollup/rollup-linux-x64-gnu@npm:4.40.0": "9219541d8835d2cf04688ad40b3cac0f35c6e4ca2157a651b20228e241b1749c43b65f6bccdcbbcead54aae598327f9d508a74e0465957fff12ef3024a81ae7a",
+  "@rollup/rollup-linux-x64-gnu@npm:4.44.2": "16c564a95c61ba8a36dfcf83957eb2bf59eb89a90f7de145eaf985b46aa223fe27d752f83da304ef0f7fcdbf24e5b34c95b94fd37b6cff6fba0532e2e69d3dbc",
+  "@rollup/rollup-linux-x64-gnu@npm:4.50.1": "17826a16e94636f9e8a5524a13bd52cfbc47e2dfffb5cc6744cc182fbcc76f0351850418093daf314f80d5965b09d0157d3b503a4e80ff36d040373c1b95ec7e",
+  "@rollup/rollup-linux-x64-musl@npm:4.34.8": "2c72840440062d011bcd5c1e78d693dd92270c790a59905641fdd414eadb15c7381d3def36c5b9be7f49f2fe6281bdb4461c32d792ab31020bb26138e5c38b5d",
+  "@rollup/rollup-linux-x64-musl@npm:4.39.0": "910644f9be269b1bfbe995444bf99d1123f0e78f2db2babf91cc1fd415a9f7d9052ac42e3092842ed6888544e5f788ae863d2e67b073a3494ae34ac52aaab598",
+  "@rollup/rollup-linux-x64-musl@npm:4.40.0": "d75772c17644d8522d847014b5e6284b7b7703df5564f61fc74eee4fae9d5516203f9ca5f05d6c8d64cc3d88f86ab25d4233d0b5003fd48069b8520491f4d7dd",
+  "@rollup/rollup-linux-x64-musl@npm:4.44.2": "e371bab526e48d5f7c1eb988dbf8274f0f1bd47b3da99b06e96fd078ec05ac2b66bb4484f276eeab52c6f070e1e92283b8d10b10b2c7d0ce95c1c0542d159c05",
+  "@rollup/rollup-linux-x64-musl@npm:4.50.1": "a621eec14e6bcd39dac234da8e6adf2563d41271737c20f8f6f1898f619e5ae9be65f98228e3fdfa1b88f5579214a97feca0b5221ef09f114e6797cd4eaf6d50",
+  "@rollup/rollup-openharmony-arm64@npm:4.50.1": "900bb0962ad7e5e753a03efa59e1562f0942d40fa216e741bbbf7b4cc736cdddd217aad01b0f1a3a955b182e4039d83ad90e1eccf176e9f9c439efd85dc5b384",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.34.8": "5ac8e7b0ebb441b2f35d3dbfec3f4def4083a33681f57dfff12b4ad5c57b54855d48f7ebf3cf719c815cf25f51af53396840896a977693b70b40f373d61684b4",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.39.0": "c15dc877c35f43d6b16b3776bc0f4fffe1c761f60ccd937593ced8e7a5b73e9ffd156f078f6e820fea9d88bcbc5b15467b9afd687a686e94e28fffff1507971a",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.40.0": "71fd6af68890af51653646602b23403937fd8b0bd622feb619c0f4cbee7de859af7bcc5c68771500e8e1d3f85fbf8d85a2083ffe65f9f32c1179296343e68bde",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.44.2": "f635fd978f5af0b1b594722adbca16b2c67bb3d8a5874ca13030a9d1f58f093e3d20f8cde3b8aab037fe0abb7cab3d2501496e4a90d0d014ccb8f24e36d81ef4",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.50.1": "41664cb2bc8c56eb5103112988ddf4b6f73b01c0949fc9692e5998e395591d4813bdc400a736f8dea321ad1f1847ca7c096f4cd19836f43acfcfab36b00a2058",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.34.8": "f21126d2b06e4c46d894c910dedcf4e10afc44b842e3c62a31c9a88c2788bc39a1cbdfc83d9747dfc769d3f1a1bb46a137e8b9e1bf4dcef47323093ca152861e",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.39.0": "ff5eff135c9a4a2f70b1c496a0f73069c17c945dbc6b0293f212f3d84b5b9f81a50628de972bb1d788521e0462af1067701e5420bfd8efe37c6f990c34b98a41",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.40.0": "0c846c2a985470f85f473ca32f0757c6c5f6bc885d295770d18d56dcc56d33100ab63e2ce7d2ffb4ef8d0726fe40d3d9fa79ba05ae787f7a532b0933622c6e1e",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.44.2": "02b84dc3940ef53cee39149fc718a865d32932ac3d4ff7e29e3b9ea3355aaef25572087ed75c6b8490c42e58eb0c605d5c51c567aaf89e7a8f6b7c65fa9d2c4f",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.50.1": "fee9fd6ce9e95168949a41d24b51aabdc1f1548dd58cdaf3418f91c6e0be0718ca08905f445036a7f2c5b9487472f4870a116234456f1af5df71dfe58b1bb908",
+  "@rollup/rollup-win32-x64-msvc@npm:4.34.8": "b457c1787514e146ef8cf48ff0a142406fcee484d2e63d6b479aa9611a5fede53eaaa32b1565c2a95776aa4738832534933003304e02eb89a9fa9bbc83cb0a01",
+  "@rollup/rollup-win32-x64-msvc@npm:4.39.0": "aa6fad14d5e48286bc7f47049f1a59a58df288c5cda78883542901c3421cc2d9133a0974d49f6a46fb0129dc0c2ba21b414e084dae2f6dcaad650f63b8ef6e94",
+  "@rollup/rollup-win32-x64-msvc@npm:4.40.0": "b725fda501efb1b7d6a2af1723a778dd46c24dee30693987a60495739766cef902d6bb106c391074445471854e55bb6317c44d2434ae24deebc2e4ef72f31e68",
+  "@rollup/rollup-win32-x64-msvc@npm:4.44.2": "5ef55ed9a502399af6c60cd3c1b0e57c19d71baec335edc6de1fe1a3c330d67ddd88881f22fab2186ef1723e83841d23027491efa432f23b5406a62a7f2e748b",
+  "@rollup/rollup-win32-x64-msvc@npm:4.50.1": "a595a1a593fad015bb6a1cd521b40c506f55efd59f195621c55d5b272bdfcdd936b8152c33fa4ba06bcdacf1c5117888c24e61cd95f8176c0f4e609b3026c4b9",
+  "@tailwindcss/oxide-android-arm64@npm:4.1.1": "c600ada269526e164380d41354c4cdc523bfb2a899ec66812f6564fd0ef9116a03fa44f90f5a6e05fd7605c3731e047dd4cfed9aed767236c4300bc1f39571d3",
+  "@tailwindcss/oxide-android-arm64@npm:4.1.11": "a4a57a2e0afea1546c6d863d91bf704fbedaee9c0431621b60dfc52cf5afff460c7655c412165e0a1ccc66ba3dbb1de841cfe1c14d7f44d145fbaad21f59d03e",
+  "@tailwindcss/oxide-android-arm64@npm:4.1.12": "3c9d4e93ab9ba651d60cda3accd7a5b26485b6bfa39c1d4023142023fc68dd7c13ca7cbc7796679c74aa0847312d9487067402d4ea497141753d495ca2833d62",
+  "@tailwindcss/oxide-android-arm64@npm:4.1.4": "fdb096ee5386b3157a3112432afe23cc133a443422939489d41416a2a3bcb18d1df3bc8ad8a719914320ed3f3fb7ea82c98a819774ff612d085bca0361589b4b",
+  "@tailwindcss/oxide-darwin-arm64@npm:4.1.1": "f956535627ae4a70e863ed708a015e793555782b4cf7d8b0621229178bffa728d06084540702e94648a9a6aadab4bff359dfe8db2ba9604d52cea78df936b7cf",
+  "@tailwindcss/oxide-darwin-arm64@npm:4.1.11": "98579827cd4ece72884303248746fcd921fc97ab254e3ea3f8a02687fd1ff1caee7d722c9f596cc97376979b383a135615a411498d6767812c1f5147eefef040",
+  "@tailwindcss/oxide-darwin-arm64@npm:4.1.12": "d748a602c0b8685e5ce4295d64b1e37f7c1ffb936fd89c2459c52954d35adce42d76e6b1c48bc3db8347303b62c1d2314557a3fb8bd830ba3b812e99945fe3e5",
+  "@tailwindcss/oxide-darwin-arm64@npm:4.1.4": "c76c2a8a50f1412da67bb3d0b53d9c41897503b209421254cb76a3262e8f4cf4b8ecea2b8c472d9283ec8eb8a7331f1e2a5f4d79af2345c601ca154814f7291c",
+  "@tailwindcss/oxide-darwin-x64@npm:4.1.1": "902714a58cb83cb7adc958b81168dc4971e167029ef9c9be6ed6977fa9003de52b94aa110b5cbdf6295c9ba3afcb60bd7412a3d5e9efabf03879b16cb0d23a9d",
+  "@tailwindcss/oxide-darwin-x64@npm:4.1.11": "d116ed080005a09829480cff79d40ff18fbae1f15299da2a7b51e68a349cbcb18c7bc8b46cb98d963f67f39a4b2acfcb20a7d5265310aefaa3f0832fac54aa4f",
+  "@tailwindcss/oxide-darwin-x64@npm:4.1.12": "89f244bfd2929e5d2633c9f54a6beca6697337fc6f91035af3ba27563a2a98185f240ebb016a2292d6c386190fd5097276a1da3b376041277af2dcc8d09412ac",
+  "@tailwindcss/oxide-darwin-x64@npm:4.1.4": "156947b3611839e09a4db6845a798150940e08df5d87cde711d2b80ddf2edef5bcd33d389191652f3f12b54fad8506faf82e50dd0e8ae4d7fb7edbff7532817c",
+  "@tailwindcss/oxide-freebsd-x64@npm:4.1.1": "4f83bebf99926b709b7af37ffae49c39135cc74a4213fd66860712433a280b024589663ee988e1e16ef4cefd20146f5178bd2248a96b8e40f60ad4bf0d67aa5f",
+  "@tailwindcss/oxide-freebsd-x64@npm:4.1.11": "0c1bbb535a21b0df012c6a4c4bfb5538e44f161cca5bf2f14a1defbb4d87f2a8ea45cd5661888c88085105258cdaf34b099e7d48e0d7b32fda3897025722d751",
+  "@tailwindcss/oxide-freebsd-x64@npm:4.1.12": "5f416f1f097a062f9c1fae383c752344d7b9da05074c6070ee1ddb0ce1380b1ebbf603712438e75bd8fb1801c7cec0a04ae83b520c63865b1fef9ac3b322fb83",
+  "@tailwindcss/oxide-freebsd-x64@npm:4.1.4": "959278204b530122ec6223d1a83b50409462dfb18777bcfdb555b12e0f004acb6a42253323c8a3f7d449121edacb071f52d0d9ac661d91d4ea8f174bd1bdb337",
+  "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.1.1": "bd678c19a7d55ba8e4ab6886d45b60fb09991be4a471f27cf07c7d62cfc15fd4c85d699646e2d6cbabefa00cb0fb7ca37112876696872cefbb687b3a4000ed6f",
+  "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.1.11": "047dc5dc59a577ffaa1ec21eafc377223a04b3f9b883fa6990ccc008846eea2bb68f04012af81d32bbd83b66861910c2c54b78adaf158cb721580df7ba9f9370",
+  "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.1.12": "e47a443bc60cfb6029240b36c83fce63fd47064c62a787afd1471c7ac518f4499578b5eadd378582302da48388ba15d890dad4c33b1477720149a450e4a52720",
+  "@tailwindcss/oxide-linux-arm-gnueabihf@npm:4.1.4": "bd736762174c6b0c8f5b038fcf752928e17735c8f7e75060afe69cda7a4be9c87f4f901aa0e699df6a77167a55a62de7e71e6d8dba3eb84dd6e51c4ee7468d10",
+  "@tailwindcss/oxide-linux-arm64-gnu@npm:4.1.1": "e9c901fc2d182b39e1c3ef248f7da0d04110179912d2c12c3d3322b411ea9399e682784f75b4c4024e9e8859fc4e77bef8c9232be6a602393fc5c9bd16d8a5b2",
+  "@tailwindcss/oxide-linux-arm64-gnu@npm:4.1.11": "ed882ffcb6356e271ae708a61e5af3b1b0306819411fdd364283488138d2e8e222deff1ae935059fffed48f9f3e2b42aca616ff2e019de1133f693eb6b75ab96",
+  "@tailwindcss/oxide-linux-arm64-gnu@npm:4.1.12": "ef15ebb5e515b1a032769e2eca28086933106d0c0a835f4dc3af25ee2426277e1cc40ff4cbcaf1e174719a9af7c600becdce38fb98b825117751551e1bb2605e",
+  "@tailwindcss/oxide-linux-arm64-gnu@npm:4.1.4": "376e5fb2b08e8b3cb393cbdea5b79df82514812d9f583675b257062b22b0ba197b945dbc4ff17015720455ba039432a978111ce961623d47de57991c153b1847",
+  "@tailwindcss/oxide-linux-arm64-musl@npm:4.1.1": "9efec82697d9940a691f00f49ead52d42b65e6d34e395f6856267af945a35f8024468473c6a2065ba989f4d581744140c3d8f928cf9b4f6da0d31abf0b9436ec",
+  "@tailwindcss/oxide-linux-arm64-musl@npm:4.1.11": "4705892615540b131e96256bbbffaca9f89eebcf65c76fe2d2f5e17718770b1629065828b427c1044a71c063765cbe0fbc84491494fc1dc7d6672688f365ab0c",
+  "@tailwindcss/oxide-linux-arm64-musl@npm:4.1.12": "c36cd60bbb5b78f9ac02c151fdd319f9d7c592338e0d8ad8998b6bb4dc2b02dc28222cc00b41bdf4cf90dcb7fcb47a1b28d43e6ce6ded86be7b099ff33034cf3",
+  "@tailwindcss/oxide-linux-arm64-musl@npm:4.1.4": "7854762a01232135fef7bca426fcb08c08b99049a2f65714a72480c01aaa73c573e6e5f0711ad9ee6d6b56e9596edee311f0ed9df216ba42d6933f9acd11e252",
+  "@tailwindcss/oxide-linux-x64-gnu@npm:4.1.1": "61a1e8b639111ce9036933b0ffa7b6fdb7242a3cb482a7009add05449d718716f1a7879ab23eae6fc6759940c64d6a1c441245c93ab2472d42e54d5b0c1f11cd",
+  "@tailwindcss/oxide-linux-x64-gnu@npm:4.1.11": "cc08b2ce1dfd5ad67f746ecde41bdc3d01375a97acbe15d58bc23441832fcf844a2f1cddf227132cabcefac2d6036c41875221684722eaef5b1b1e9c4cfa066e",
+  "@tailwindcss/oxide-linux-x64-gnu@npm:4.1.12": "fc50a9a1f4f2b663f40340efa5f5335ed1c942e21f0c22d6cfb4170e48159d39952f6a3f38de4ffa8b724f341f662d4dd2457c93f50fb93ffcc026fce14be76d",
+  "@tailwindcss/oxide-linux-x64-gnu@npm:4.1.4": "0efe0a9b4fdfa336f79e54deec18829b9c6c9219be23c7e790c1435fa472bedf80184faae96a1d26e0db920077ed7144cdac3512f02284dcfdfcd6ee330d8b16",
+  "@tailwindcss/oxide-linux-x64-musl@npm:4.1.1": "697de321dd0d3d0224b566660c41e723434eb1fa27d0bc16f77e46441f9703f51f682b3e6baf124d64badd374af4b1862a28096eb21865e24f250fc33e4bd69a",
+  "@tailwindcss/oxide-linux-x64-musl@npm:4.1.11": "489d40af4c33d56ec9bdaa7965f8ae2e1311033214cd8418e3f977cc333c923591e39e0ba82d55f1179de442fb61aad09d5318685bd7020a4bd6fb15d9fad1f7",
+  "@tailwindcss/oxide-linux-x64-musl@npm:4.1.12": "11067a2ae532adaa9db819b5a94462acd1750771582a66d89bf437264fc95cf53b960d2e395105a6efa238e159b98b463ecc88103e848515af5a4ea45c5e57a0",
+  "@tailwindcss/oxide-linux-x64-musl@npm:4.1.4": "2e7f54494f0292687172d2468212aaacc314f91b3feaebcaf9541ad061711976e933014e1e26e1e408241256e28faf6e4a4d7f4eee39b2f40476e98ab7e30db9",
+  "@tailwindcss/oxide-wasm32-wasi@npm:4.1.11": "b5c0ad4260e24f77cd339204ab228a0faf309d3cf24e4aacb4398d694587326ea7c0d40b0530f602a561384857194afb48356d370acb6af19aae6438702d30c3",
+  "@tailwindcss/oxide-wasm32-wasi@npm:4.1.12": "4a2a57b9aeb093c1db94953489e7e1fb22e2855db01f982f4a06481484112e0152cbb883098ba56bd3d51f3bc7c71899759edc871b3218d73c8c610ee47793ce",
+  "@tailwindcss/oxide-wasm32-wasi@npm:4.1.4": "330fb7dec1bd50439bed83a05a601b4b8a10979b92105b96b63dc2a6ac4e7b8f68391473c20d11431901ab5d7d68d43dcac0856747d052401614ca72dbf03409",
+  "@tailwindcss/oxide-win32-arm64-msvc@npm:4.1.1": "60103d9f02b44c5b7862535407491770b59bcd7665a306adae9475a162725e2aeacdd9431c536a2f096ca0e31f69767512cf26ec43445bed88f421300400b48d",
+  "@tailwindcss/oxide-win32-arm64-msvc@npm:4.1.11": "0d1b1ba3355e371e06fe253e1664e4fbf15f4080a1ab151e6c4dacf0b8fd16af2cd88cfda4a2ee717bba4fcd8c22ea2a709fcaf60ac2e1675bc5e7c9133a8d67",
+  "@tailwindcss/oxide-win32-arm64-msvc@npm:4.1.12": "137b19bdec1f9e501e58c48e89265dde88d52fe15b93d51046f1640cdce9920bbd63c266f313b3c08f494c5a403ae448e9699e7dca13612269de8e4286836bb8",
+  "@tailwindcss/oxide-win32-arm64-msvc@npm:4.1.4": "de06c73d566f5dcd06979b7c73a08bc82660757b7d0c4b6d4a44aecf59b5aef57b4ee0bed4283936046d47366e63660e2aabd8e3caa2cc9b1c56305244670a81",
+  "@tailwindcss/oxide-win32-x64-msvc@npm:4.1.1": "39bfb14b5060e90e653174a5c6213b2d3cfe870defd1a9ea22d56c141b99ed6dca036c815c33e7ba46bbb966263b7bb54f43099b07e9779b34ceb1e3ad52ead3",
+  "@tailwindcss/oxide-win32-x64-msvc@npm:4.1.11": "e81e9a44e2e87e2a1e2c9687e0279b2fedc41cb1355b3211829f6da29a19a0eacca135eebb8eaac92cce80f1e4f1093491203e5a855d7e57ea657b34a59dd5fc",
+  "@tailwindcss/oxide-win32-x64-msvc@npm:4.1.12": "c33748d2b58fe86b1e47564dc33a1efe0daa5408a837f673a1c985f92b78158c2fcd2a1bc2941ed1d53cef2071f2396007271f1a14e9076c641c10b181d52e5d",
+  "@tailwindcss/oxide-win32-x64-msvc@npm:4.1.4": "416c4460d463105d6a57d523ac07aeec37d0e4afe59175a86d7621957bbe266e0b8d318f9092a585ef25d402c76f8f2d119bc340c6c4ac2fddf7673337959ef4",
+  "lightningcss-darwin-arm64@npm:1.29.2": "ecba3cfba59d1abf2e487f020c02a6a73635e717c490ca489476958876a44893f393d92b84e844f312b560fc53b940c7086409e1b17ea0a98bc290fb1fd914ff",
+  "lightningcss-darwin-arm64@npm:1.30.1": "e539855e1c1975a942ea63c641a10b14dbfe7751657ea091aa40d414d8dca83ab008c79ba59ca215cd4e32018b67545842469d6e947911d80ce9008875ee90d5",
+  "lightningcss-darwin-x64@npm:1.29.2": "2d190974ddda8dd943aa61586a2d0fb90b8fb87b4ceefa7bf947acbd6f930b474f8d13a4f3cb4de62d507e27ec29f9e3977f7f52c8bfe9d6aee95a49b45a7ae1",
+  "lightningcss-darwin-x64@npm:1.30.1": "89d59789a53dfe2ddff3f9ee7dd825339b8044ed2fffebe6f77139e52857c5c88ab9e026adf76d72d77789c111f304a7dece5782c8ab7b03b1b732b389caec56",
+  "lightningcss-freebsd-x64@npm:1.29.2": "c14a65c022db9fb806412061dd458d4eeced41fba7853b59b42bd23e0cddd3e9bf82d80b742f6e3075c358f7f41149043ab79afbf588b7a4f9e9a51826cf00bc",
+  "lightningcss-freebsd-x64@npm:1.30.1": "175b4126fcfa789061bc980cb887d1b63465168e6b551f672dce100e00dc82023071f4c83daab1a1c9d8321fbc064c7470832a1b71d24a700494b8c116242054",
+  "lightningcss-linux-arm-gnueabihf@npm:1.29.2": "ba5501475726fb193964a378ee2f88d9afcfaf6c35b22a72ecd427cc3d5a0a28824d246168c21f4d8ac1caa9b2b8e6c835bb75f1638ab2eda13c8e8888246617",
+  "lightningcss-linux-arm-gnueabihf@npm:1.30.1": "7000b866497ff4650bb6cee0d890d1951ab6e2b3d76cd375a93a688b745d2503f6f95a59e5a34fbf780ee5a59412ba59f36e73ed32b3c572a45b4b4c33fd48c3",
+  "lightningcss-linux-arm64-gnu@npm:1.29.2": "17d22114fcdb98990b7a9527eff1995a56f5c7fa196ec58595600a374385cf724f4648e59ed2410d62c2e3ebc2fd872e925b11d548fd88f3b291582203acad5f",
+  "lightningcss-linux-arm64-gnu@npm:1.30.1": "b96fd4bb9dd2d507769fbbf83376386027174b08bf088f8f662c0d5da73d1c047b9a0eb2f5bab426cc9e0888f841bd2ee7f4c2386154380d405b1ddf198eb519",
+  "lightningcss-linux-arm64-musl@npm:1.29.2": "ee99aea9d6425fbf937bdd99945208cefc4376fe162d181a68542164c4920c1cd7c63869050de12c44dcd367cc67dc08f63b522e81147d05444ad4f93afb126f",
+  "lightningcss-linux-arm64-musl@npm:1.30.1": "28af49fd88bb0f6f673c2a0b69fd21c3f42a48dccd5ba78afea10c5f3ef274bea0034dc36adf747f2a19af77704d72b417c0d6cf57bcf834d11e343ca5d98b13",
+  "lightningcss-linux-x64-gnu@npm:1.29.2": "17002e82ad3fae9ebf5ce8e1eb66464ca4f256604cb0db4c745f78bc85730f2d4d4f847ebc939327176d3e7dbed771b02f487d58960a62fa4c32b86a915d0a8e",
+  "lightningcss-linux-x64-gnu@npm:1.30.1": "35aaa0f2fa21561b4a45b1fff3f2e00452562c6839afa646f8b94f5ac247e5bfbce32802557f93c90813f0f27c39f54b2443de84a41a1c44db5f16f01705c5ed",
+  "lightningcss-linux-x64-musl@npm:1.29.2": "6a2f54a992d53522852ae37dea730831bb2e434206a58363d0c34a67a4368edcc471e209b022bd525c33ac5886ab0cdd584afe606b92e4e03e18ddd57e667ceb",
+  "lightningcss-linux-x64-musl@npm:1.30.1": "d5feaf9c72ebbfbd4da504102ebe08106f6b9c3e2f03b0ce6f8ee5e2ced7e9364bbeb6cdaa51b9e7361dba8b15bd3a6ed39cb9898c842f1c0fab62e5f2c43cdc",
+  "lightningcss-win32-arm64-msvc@npm:1.29.2": "707e80205917f654db00d0a83e853d198ad74a200bb9d45d8d822158d942866c575fed398f4edf51fc8bbf1ad42b2eeeddfce5fffdb232024b10114475c8f7ea",
+  "lightningcss-win32-arm64-msvc@npm:1.30.1": "cb840e2f4eadd758ad96d8226b84ecb3127edaee44f053aa83c837900c237fa2e4c3b956663a55b6d4364f7b29830b8021a0a1e9bae03d1f7930bcf37c433bff",
+  "lightningcss-win32-x64-msvc@npm:1.29.2": "059cfe0875d086630df9df682728fad52daf1c925dfe6a8280d3adfcadd4f64a301365cb3bf751fc755b08d786a51c4e0be4ec5b9981b2547ab73d038da4eb3f",
+  "lightningcss-win32-x64-msvc@npm:1.30.1": "a99e857773ac3f245eca561b79ffcf7ddf0e4a54cc00a86e96c7cda65a8e7acf75dcffbe02814836b3425cf984cf07c5bc4cf234877616074be00cbe932a3812",
+  "turbo-darwin-64@npm:2.5.4": "49ea24cf702baa0fc1e8a6acfbe75e425b52cd654f654c9da7aa7095fb65a02590de8a9ec85a22b268f3ce558e3fc40b7512634699b090d43c8def450e75ff7e",
+  "turbo-darwin-arm64@npm:2.5.4": "7a8f17ee644c5a4d07fad3b734d2f557267360783de2f70de7c265ed13e6b7281a2c5620f89732f3f9868fd432ad1ec7ea6a93bf95fde01626d16e782df22d2c",
+  "turbo-linux-64@npm:2.5.4": "c219ee1dc8144d874aff9f411c3a84066b66c4c4fd3ccbdf8111ded326f2846f0a17ae943dee2f4a7597f276d9c039be5b770af798b69bb258c60f3000618fb3",
+  "turbo-linux-arm64@npm:2.5.4": "e786417fdb7955badf18ab590bd264cbd300f6ce1976a4c059a30fcc1a1c3ca5e7917f15d97214f172f57d24e54bfb05b2f844c0b364f29a12c8f2b2d08ffa2c",
+  "turbo-windows-64@npm:2.5.4": "ec8b9487214645340840f53162ab848ae59b5ec0a8673de7ce0ad89301c6751faaea637534d461562028a7933aba124d25557b74316d5fe10bf7842661859b70",
+  "turbo-windows-arm64@npm:2.5.4": "2b9227498ada4f341f20c40d637b550ee8572eecc983be4e74d0f06f852e418b880238c5ab7f027aada53566331bd4804a4eafce860645d467948587f2fcae1a"
+}
diff --git a/pkgs/by-name/up/uppy-companion/package.nix b/pkgs/by-name/up/uppy-companion/package.nix
new file mode 100644
index 000000000000..94f986904b14
--- /dev/null
+++ b/pkgs/by-name/up/uppy-companion/package.nix
@@ -0,0 +1,76 @@
+{
+  lib,
+  stdenv,
+  nodejs,
+  fetchFromGitHub,
+  yarn-berry_4,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "uppy-companion";
+  version = "6.1.1";
+
+  src = fetchFromGitHub {
+    owner = "transloadit";
+    repo = "uppy";
+    tag = "@uppy/companion@${finalAttrs.version}";
+    hash = "sha256-Z7u0Wrkg1/jZtOF86hUbwRVWWGHuv4ktcXx+gEcLYlQ=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    yarn-berry_4.yarnBerryConfigHook
+    yarn-berry_4
+  ];
+
+  buildInputs = [
+    nodejs
+  ];
+
+  missingHashes = ./missing-hashes.json;
+
+  offlineCache = yarn-berry_4.fetchYarnBerryDeps {
+    inherit (finalAttrs) src missingHashes;
+    hash = "sha256-5XLOyz1QowX08C0IBcg9Um1eY+1qwtPyqIFb83FPFz8=";
+  };
+
+  buildPhase = ''
+    runHook preBuild
+
+    yarn workspace '@uppy/companion' run build
+    yarn workspace '@uppy/companion' run test
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/packages/@uppy
+    mkdir $out/bin
+    mv packages/@uppy/companion $out/lib/packages/@uppy/companion
+    # Remove extra files
+    rm -rf $out/lib/packages/@uppy/companion/{*.md,LICENSE,Makefile,.*ignore,infra/,output/,test/,__mocks__/,*/json}
+    # Remove dev dependencies
+    rm -rf $out/lib/packages/@uppy/companion/node_modules/{.bin,webpack*,update*,tyepscript,jest*,eslint*,{@,}esbuild,{@,}rollup,terser,@types,execa,http-proxy,nock,supertest,vite*}
+
+    # Link final binary
+    ln -s $out/lib/packages/@uppy/companion/bin/companion $out/bin/companion
+
+    patchShebangs $out/bin/companion
+
+    runHook postInstall
+  '';
+
+  updateScript = ./update.sh;
+
+  meta = {
+    broken = stdenv.hostPlatform.isDarwin;
+    changelog = "https://github.com/transloadit/uppy/releases/tag/%2540uppy%252Fcompanion%2540${finalAttrs.version}";
+    description = "Server integration for Uppy file uploader";
+    homepage = "https://uppy.io/";
+    license = lib.licenses.mit;
+    mainProgram = "companion";
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/up/uppy-companion/update.sh b/pkgs/by-name/up/uppy-companion/update.sh
new file mode 100755
index 000000000000..9280c873158f
--- /dev/null
+++ b/pkgs/by-name/up/uppy-companion/update.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nodejs curl gnused jq nix bash coreutils nix-update yarn-berry_4.yarn-berry-fetcher
+
+set -eou pipefail
+
+PACKAGE_DIR=$(realpath "$(dirname "$0")")
+NEW_VERSION=$(npm view '@uppy/companion' version)
+
+if [[ "$UPDATE_NIX_OLD_VERSION" == "$NEW_VERSION" ]]; then
+  echo "package is up-to-date: $UPDATE_NIX_OLD_VERSION"
+  exit 0
+fi
+
+nix-update "$UPDATE_NIX_PNAME" --version "$NEW_VERSION" || true
+
+HOME=$(mktemp -d)
+export HOME
+
+src=$(nix-build --no-link "$PWD" -A "$UPDATE_NIX_PNAME.src")
+WORKDIR=$(mktemp -d)
+
+cp --recursive --no-preserve=mode "$src/*" "$WORKDIR"
+pushd "$WORKDIR"
+yarn-berry-fetcher missing-hashes yarn.lock >"$PACKAGE_DIR/missing-hashes.json"
+popd
+rm -rf "$WORKDIR"
+
+nix-update "$UPDATE_NIX_PNAME" --version skip || true
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 2db1f0c61a26..ede344e09c7d 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -50,6 +50,7 @@ mapAliases {
   "@prisma/language-server" = throw "@prisma/language-server has been removed because it was broken"; # added 2025-03-23
   "@shopify/cli" = throw "@shopify/cli has been removed because it was broken"; # added 2025-03-12
   "@tailwindcss/language-server" = pkgs.tailwindcss-language-server; # added 2024-01-22
+  "@uppy/companion" = pkgs.uppy-companion; # Added 2025-11-01
   "@volar/vue-language-server" = pkgs.vue-language-server; # added 2024-06-15
   "@vue/language-server" = pkgs.vue-language-server; # added 2024-06-15
   "@withgraphite/graphite-cli" = pkgs.graphite-cli; # added 2024-01-25
@@ -283,6 +284,7 @@ mapAliases {
   inherit (pkgs) undollar; # added 2024-06-29
   inherit (pkgs) ungit; # added 2023-08-20
   unified-language-server = throw "unified-language-server was removed as it is a library that should be imported within a Javascript project, not an end-user tool"; # added 2025-10-02
+  inherit (pkgs) uppy-companion; # Added 2025-11-01
   inherit (pkgs) vim-language-server; # added 2024-06-25
   vls = throw "vls has been deprecated by upstream as vetur is also deprecated. Upstream suggests migrating to Volar for Vue LSP tooling instead."; # added 2024-12-09
   inherit (pkgs) vsc-leetcode-cli; # Added 2023-08-30
diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix
index 15b30b90747d..d0eae0605793 100644
--- a/pkgs/development/node-packages/main-programs.nix
+++ b/pkgs/development/node-packages/main-programs.nix
@@ -10,7 +10,6 @@
   "@angular/cli" = "ng";
   "@babel/cli" = "babel";
   "@commitlint/cli" = "commitlint";
-  "@uppy/companion" = "companion";
   "@webassemblyjs/repl-1.11.1" = "wasm";
   "@webassemblyjs/wasm-strip" = "wasm-strip";
   "@webassemblyjs/wasm-text-gen-1.11.1" = "wasmgen";
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 636c48917790..a4d4d435c3e1 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -8,7 +8,6 @@
 , "@tailwindcss/forms"
 , "@tailwindcss/line-clamp"
 , "@tailwindcss/typography"
-, "@uppy/companion"
 , {"@webassemblyjs/cli": "1.11.1"}
 , {"@webassemblyjs/repl": "1.11.1"}
 , "@webassemblyjs/wasm-strip"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 68919b112fb7..75848eff0811 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -129,15 +129,6 @@ let
         sha512 = "IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==";
       };
     };
-    "@aws-crypto/crc32-5.2.0" = {
-      name = "_at_aws-crypto_slash_crc32";
-      packageName = "@aws-crypto/crc32";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz";
-        sha512 = "nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==";
-      };
-    };
     "@aws-crypto/crc32c-3.0.0" = {
       name = "_at_aws-crypto_slash_crc32c";
       packageName = "@aws-crypto/crc32c";
@@ -147,15 +138,6 @@ let
         sha512 = "ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w==";
       };
     };
-    "@aws-crypto/crc32c-5.2.0" = {
-      name = "_at_aws-crypto_slash_crc32c";
-      packageName = "@aws-crypto/crc32c";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-5.2.0.tgz";
-        sha512 = "+iWb8qaHLYKrNvGRbiYRHSdKRWhto5XlZUEBwDjYNf+ly5SVYG6zEoYIdxvf5R3zyeP16w4PLBn3rH1xc74Rag==";
-      };
-    };
     "@aws-crypto/ie11-detection-3.0.0" = {
       name = "_at_aws-crypto_slash_ie11-detection";
       packageName = "@aws-crypto/ie11-detection";
@@ -174,15 +156,6 @@ let
         sha512 = "NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw==";
       };
     };
-    "@aws-crypto/sha1-browser-5.2.0" = {
-      name = "_at_aws-crypto_slash_sha1-browser";
-      packageName = "@aws-crypto/sha1-browser";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-5.2.0.tgz";
-        sha512 = "OH6lveCFfcDjX4dbAvCFSYUjJZjDr/3XJ3xHtjn3Oj5b9RjojQo8npoLeA/bNwkOkrSQ0wgrHzXk4tDRxGKJeg==";
-      };
-    };
     "@aws-crypto/sha256-browser-3.0.0" = {
       name = "_at_aws-crypto_slash_sha256-browser";
       packageName = "@aws-crypto/sha256-browser";
@@ -192,15 +165,6 @@ let
         sha512 = "8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==";
       };
     };
-    "@aws-crypto/sha256-browser-5.2.0" = {
-      name = "_at_aws-crypto_slash_sha256-browser";
-      packageName = "@aws-crypto/sha256-browser";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz";
-        sha512 = "AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==";
-      };
-    };
     "@aws-crypto/sha256-js-3.0.0" = {
       name = "_at_aws-crypto_slash_sha256-js";
       packageName = "@aws-crypto/sha256-js";
@@ -210,15 +174,6 @@ let
         sha512 = "PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==";
       };
     };
-    "@aws-crypto/sha256-js-5.2.0" = {
-      name = "_at_aws-crypto_slash_sha256-js";
-      packageName = "@aws-crypto/sha256-js";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz";
-        sha512 = "FFQQyu7edu4ufvIZ+OadFpHHOt+eSTBaYaki44c+akjg7qZg9oOQeLlk77F6tSYqjDAFClrHJk9tMf0HdVyOvA==";
-      };
-    };
     "@aws-crypto/supports-web-crypto-3.0.0" = {
       name = "_at_aws-crypto_slash_supports-web-crypto";
       packageName = "@aws-crypto/supports-web-crypto";
@@ -228,15 +183,6 @@ let
         sha512 = "06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==";
       };
     };
-    "@aws-crypto/supports-web-crypto-5.2.0" = {
-      name = "_at_aws-crypto_slash_supports-web-crypto";
-      packageName = "@aws-crypto/supports-web-crypto";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-5.2.0.tgz";
-        sha512 = "iAvUotm021kM33eCdNfwIN//F77/IADDSs58i+MDaOqFrVjZo9bAal0NK7HurRuWLLpF1iLX7gbWrjHjeo+YFg==";
-      };
-    };
     "@aws-crypto/util-3.0.0" = {
       name = "_at_aws-crypto_slash_util";
       packageName = "@aws-crypto/util";
@@ -246,15 +192,6 @@ let
         sha512 = "2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==";
       };
     };
-    "@aws-crypto/util-5.2.0" = {
-      name = "_at_aws-crypto_slash_util";
-      packageName = "@aws-crypto/util";
-      version = "5.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz";
-        sha512 = "4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==";
-      };
-    };
     "@aws-sdk/abort-controller-3.296.0" = {
       name = "_at_aws-sdk_slash_abort-controller";
       packageName = "@aws-sdk/abort-controller";
@@ -291,15 +228,6 @@ let
         sha512 = "PI6mjM0fmcV2fqkkRoivF3DYex4lnbEz7WIsOFAwpHJBbA9ykClQpiutCKcgl0x/yEWAeTNdQtrCVeAwbxYfvw==";
       };
     };
-    "@aws-sdk/client-s3-3.758.0" = {
-      name = "_at_aws-sdk_slash_client-s3";
-      packageName = "@aws-sdk/client-s3";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.758.0.tgz";
-        sha512 = "f8SlhU9/93OC/WEI6xVJf/x/GoQFj9a/xXK6QCtr5fvCjfSLgMVFmKTiIl/tgtDRzxUDc8YS6EGtbHjJ3Y/atg==";
-      };
-    };
     "@aws-sdk/client-sso-3.296.0" = {
       name = "_at_aws-sdk_slash_client-sso";
       packageName = "@aws-sdk/client-sso";
@@ -309,15 +237,6 @@ let
         sha512 = "0P0x++jhlmhzViFPOHvTb7+Z6tSV9aONwB8CchIseg2enSPBbGfml7y5gQu1jdOTDS6pBUmrPZ+9sOI4/GvAfA==";
       };
     };
-    "@aws-sdk/client-sso-3.758.0" = {
-      name = "_at_aws-sdk_slash_client-sso";
-      packageName = "@aws-sdk/client-sso";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.758.0.tgz";
-        sha512 = "BoGO6IIWrLyLxQG6txJw6RT2urmbtlwfggapNCrNPyYjlXpzTSJhBYjndg7TpDATFd0SXL0zm8y/tXsUXNkdYQ==";
-      };
-    };
     "@aws-sdk/client-sso-oidc-3.296.0" = {
       name = "_at_aws-sdk_slash_client-sso-oidc";
       packageName = "@aws-sdk/client-sso-oidc";
@@ -336,15 +255,6 @@ let
         sha512 = "ew7hSVNpitnLCIRVhnI2L1HZB/yYpRQFReR62fOqCUnpKqm6WGga37bnvgYbY5y0Rv23C0VHARovwunVg1gabA==";
       };
     };
-    "@aws-sdk/client-sts-3.758.0" = {
-      name = "_at_aws-sdk_slash_client-sts";
-      packageName = "@aws-sdk/client-sts";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.758.0.tgz";
-        sha512 = "ue9hbzjWNQmmyoSeWDRPwnYddsD3BVao5mSFA1kXFNVqWPEenjpkZ1xAlBVzHMMNoEz7LvGI+onXIHntNyiOLQ==";
-      };
-    };
     "@aws-sdk/config-resolver-3.296.0" = {
       name = "_at_aws-sdk_slash_config-resolver";
       packageName = "@aws-sdk/config-resolver";
@@ -372,24 +282,6 @@ let
         sha512 = "eDWSU3p04gytkkVXnYn05YzrP5SEaj/DQiafd4y+iBl8IFfF3zM6982rs6qFhvpwrHeSbLqHNfKR1HDWVwfG5g==";
       };
     };
-    "@aws-sdk/credential-provider-env-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-env";
-      packageName = "@aws-sdk/credential-provider-env";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.758.0.tgz";
-        sha512 = "N27eFoRrO6MeUNumtNHDW9WOiwfd59LPXPqDrIa3kWL/s+fOKFHb9xIcF++bAwtcZnAxKkgpDCUP+INNZskE+w==";
-      };
-    };
-    "@aws-sdk/credential-provider-http-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-http";
-      packageName = "@aws-sdk/credential-provider-http";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.758.0.tgz";
-        sha512 = "Xt9/U8qUCiw1hihztWkNeIR+arg6P+yda10OuCHX6kFVx3auTlU7+hCqs3UxqniGU4dguHuftf3mRpi5/GJ33Q==";
-      };
-    };
     "@aws-sdk/credential-provider-imds-3.296.0" = {
       name = "_at_aws-sdk_slash_credential-provider-imds";
       packageName = "@aws-sdk/credential-provider-imds";
@@ -408,15 +300,6 @@ let
         sha512 = "U0ecY0GX2jeDAgmTzaVO9YgjlLUfb8wgZSu1OwbOxCJscL/5eFkhcF0/xJQXDbRgcj4H4dlquqeSWsBVl/PgvQ==";
       };
     };
-    "@aws-sdk/credential-provider-ini-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-ini";
-      packageName = "@aws-sdk/credential-provider-ini";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.758.0.tgz";
-        sha512 = "cymSKMcP5d+OsgetoIZ5QCe1wnp2Q/tq+uIxVdh9MbfdBBEnl9Ecq6dH6VlYS89sp4QKuxHxkWXVnbXU3Q19Aw==";
-      };
-    };
     "@aws-sdk/credential-provider-node-3.296.0" = {
       name = "_at_aws-sdk_slash_credential-provider-node";
       packageName = "@aws-sdk/credential-provider-node";
@@ -426,15 +309,6 @@ let
         sha512 = "oCkmh2b1DQhHkhd/qA9jiSIOkrBBK7cMg1/PVIgLw8e15NkzUHBObLJ/ZQw6ZzCxZzjlMYaFv9oCB8hyO8txmA==";
       };
     };
-    "@aws-sdk/credential-provider-node-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-node";
-      packageName = "@aws-sdk/credential-provider-node";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.758.0.tgz";
-        sha512 = "+DaMv63wiq7pJrhIQzZYMn4hSarKiizDoJRvyR7WGhnn0oQ/getX9Z0VNCV3i7lIFoLNTb7WMmQ9k7+z/uD5EQ==";
-      };
-    };
     "@aws-sdk/credential-provider-process-3.296.0" = {
       name = "_at_aws-sdk_slash_credential-provider-process";
       packageName = "@aws-sdk/credential-provider-process";
@@ -444,15 +318,6 @@ let
         sha512 = "AY7sTX2dGi8ripuCpcJLYHOZB2wJ6NnseyK/kK5TfJn/pgboKwuGtz0hkJCVprNWomKa6IpHksm7vLQ4O2E+UA==";
       };
     };
-    "@aws-sdk/credential-provider-process-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-process";
-      packageName = "@aws-sdk/credential-provider-process";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.758.0.tgz";
-        sha512 = "AzcY74QTPqcbXWVgjpPZ3HOmxQZYPROIBz2YINF0OQk0MhezDWV/O7Xec+K1+MPGQO3qS6EDrUUlnPLjsqieHA==";
-      };
-    };
     "@aws-sdk/credential-provider-sso-3.296.0" = {
       name = "_at_aws-sdk_slash_credential-provider-sso";
       packageName = "@aws-sdk/credential-provider-sso";
@@ -462,15 +327,6 @@ let
         sha512 = "zPFHDX/niXfcQrKQhmBv1XPYEe4b7im4vRKrzjYXgDRpG2M3LP0KaWIwN6Ap+GRYBNBthen86vhTlmKGzyU5YA==";
       };
     };
-    "@aws-sdk/credential-provider-sso-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-sso";
-      packageName = "@aws-sdk/credential-provider-sso";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.758.0.tgz";
-        sha512 = "x0FYJqcOLUCv8GLLFDYMXRAQKGjoM+L0BG4BiHYZRDf24yQWFCAZsCQAYKo6XZYh2qznbsW6f//qpyJ5b0QVKQ==";
-      };
-    };
     "@aws-sdk/credential-provider-web-identity-3.296.0" = {
       name = "_at_aws-sdk_slash_credential-provider-web-identity";
       packageName = "@aws-sdk/credential-provider-web-identity";
@@ -480,15 +336,6 @@ let
         sha512 = "Rl6Ohoekxe+pccA55XXQDW5wApbg3rGWr6FkmPRcg7Ld6Vfe+HL8OtfsFf83/0eoFerevbif+00BdknXWT05LA==";
       };
     };
-    "@aws-sdk/credential-provider-web-identity-3.758.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-web-identity";
-      packageName = "@aws-sdk/credential-provider-web-identity";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.758.0.tgz";
-        sha512 = "XGguXhBqiCXMXRxcfCAVPlMbm3VyJTou79r/3mxWddHWF0XbhaQiBIbUz6vobVTD25YQRbWSmSch7VA8kI5Lrw==";
-      };
-    };
     "@aws-sdk/crt-loader-3.758.0" = {
       name = "_at_aws-sdk_slash_crt-loader";
       packageName = "@aws-sdk/crt-loader";
@@ -597,15 +444,6 @@ let
         sha512 = "SCIt10cr5dud7hvwveU4wkLjvkGssJ3GrcbHCds2NwI+JHmpcaaNYLAqi305JAuT29T36U5ssTFDSmrrEOcfag==";
       };
     };
-    "@aws-sdk/lib-storage-3.758.0" = {
-      name = "_at_aws-sdk_slash_lib-storage";
-      packageName = "@aws-sdk/lib-storage";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/lib-storage/-/lib-storage-3.758.0.tgz";
-        sha512 = "g07y7rA505zaTJNPTmvW4zYJA3gThFDE1be7kBUKhTKAdwv8jVSbOiAy2AhClXs2evSUoQiFFtD1xWxLRXPPRQ==";
-      };
-    };
     "@aws-sdk/md5-js-3.296.0" = {
       name = "_at_aws-sdk_slash_md5-js";
       packageName = "@aws-sdk/md5-js";
@@ -624,15 +462,6 @@ let
         sha512 = "Xhzucs5psscjXJW7V6vMrjJWGmej8Xtw8XIKd91RLmbxdmecMy85/mQC3bIqxgTGhC/e3pKqWSp8z/YjV6iPZg==";
       };
     };
-    "@aws-sdk/middleware-bucket-endpoint-3.734.0" = {
-      name = "_at_aws-sdk_slash_middleware-bucket-endpoint";
-      packageName = "@aws-sdk/middleware-bucket-endpoint";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.734.0.tgz";
-        sha512 = "etC7G18aF7KdZguW27GE/wpbrNmYLVT755EsFc8kXpZj8D6AFKxc7OuveinJmiy0bYXAMspJUWsF6CrGpOw6CQ==";
-      };
-    };
     "@aws-sdk/middleware-content-length-3.296.0" = {
       name = "_at_aws-sdk_slash_middleware-content-length";
       packageName = "@aws-sdk/middleware-content-length";
@@ -660,15 +489,6 @@ let
         sha512 = "aVCv9CdAVWt9AlZKQZRweIywkAszRrZUCo8K5bBUJNdD4061DoDqLK/6jmqXmObas0j1wQr/eNzjYbv99MZBCg==";
       };
     };
-    "@aws-sdk/middleware-expect-continue-3.734.0" = {
-      name = "_at_aws-sdk_slash_middleware-expect-continue";
-      packageName = "@aws-sdk/middleware-expect-continue";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.734.0.tgz";
-        sha512 = "P38/v1l6HjuB2aFUewt7ueAW5IvKkFcv5dalPtbMGRhLeyivBOHwbCyuRKgVs7z7ClTpu9EaViEGki2jEQqEsQ==";
-      };
-    };
     "@aws-sdk/middleware-flexible-checksums-3.296.0" = {
       name = "_at_aws-sdk_slash_middleware-flexible-checksums";
       packageName = "@aws-sdk/middleware-flexible-checksums";
@@ -678,15 +498,6 @@ let
         sha512 = "F5wVMhLIgA86PKsK/Az7LGIiNVDdZjoSn0+boe6fYW/AIAmgJhPf//500Md0GsKsLOCcPcxiQC43a0hVT2zbew==";
       };
     };
-    "@aws-sdk/middleware-flexible-checksums-3.758.0" = {
-      name = "_at_aws-sdk_slash_middleware-flexible-checksums";
-      packageName = "@aws-sdk/middleware-flexible-checksums";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.758.0.tgz";
-        sha512 = "o8Rk71S08YTKLoSobucjnbj97OCGaXgpEDNKXpXaavUM5xLNoHCLSUPRCiEN86Ivqxg1n17Y2nSRhfbsveOXXA==";
-      };
-    };
     "@aws-sdk/middleware-host-header-3.296.0" = {
       name = "_at_aws-sdk_slash_middleware-host-header";
       packageName = "@aws-sdk/middleware-host-header";
@@ -696,15 +507,6 @@ let
         sha512 = "V47dFtfkX5lXWv9GDp71gZVCRws4fEdQ9QF9BQ/2UMSNrYjQLg6mFe7NibH+IJoNOid2FIwWIl94Eos636VGYQ==";
       };
     };
-    "@aws-sdk/middleware-host-header-3.734.0" = {
-      name = "_at_aws-sdk_slash_middleware-host-header";
-      packageName = "@aws-sdk/middleware-host-header";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.734.0.tgz";
-        sha512 = "LW7RRgSOHHBzWZnigNsDIzu3AiwtjeI2X66v+Wn1P1u+eXssy1+up4ZY/h+t2sU4LU36UvEf+jrZti9c6vRnFw==";
-      };
-    };
     "@aws-sdk/middleware-location-constraint-3.296.0" = {
       name = "_at_aws-sdk_slash_middleware-location-constraint";
       packageName = "@aws-sdk/middleware-location-constraint";
@@ -714,15 +516,6 @@ let
         sha512 = "KHkWaIrZOtJmV1/WO9KOf7kSK41ngfqts3YIun956NYglKTDKyrBIOPCgmXTT/03odnYsKVT/UfbEIh/v4RxGA==";
       };
     };
-    "@aws-sdk/middleware-location-constraint-3.734.0" = {
-      name = "_at_aws-sdk_slash_middleware-location-constraint";
-      packageName = "@aws-sdk/middleware-location-constraint";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.734.0.tgz";
-        sha512 = "EJEIXwCQhto/cBfHdm3ZOeLxd2NlJD+X2F+ZTOxzokuhBtY0IONfC/91hOo5tWQweerojwshSMHRCKzRv1tlwg==";
-      };
-    };
     "@aws-sdk/middleware-logger-3.296.0" = {
       name = "_at_aws-sdk_slash_middleware-logger";
       packageName = "@aws-sdk/middleware-logger";
@@ -732,15 +525,6 @@ let
         sha512 = "LzfEEFyBR9LXdWwLdtBrmi1vLdzgdJNntEgzqktVF8LwaCyY+9xIE6TGu/2V+9fJHAwECxjOC1eQbNQdAZ0Tmw==";
       };
     };
-    "@aws-sdk/middleware-logger-3.734.0" = {
-      name = "_at_aws-sdk_slash_middleware-logger";
-      packageName = "@aws-sdk/middleware-logger";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.734.0.tgz";
-        sha512 = "mUMFITpJUW3LcKvFok176eI5zXAUomVtahb9IQBwLzkqFYOrMJvWAvoV4yuxrJ8TlQBG8gyEnkb9SnhZvjg67w==";
-      };
-    };
     "@aws-sdk/middleware-recursion-detection-3.296.0" = {
       name = "_at_aws-sdk_slash_middleware-recursion-detection";
       packageName = "@aws-sdk/middleware-recursion-detection";
@@ -750,15 +534,6 @@ let
         sha512 = "UG7TLDPz9ImQG0uVklHTxE9Us7rTImwN+6el6qZCpoTBuGeXgOkfb0/p8izJyFgY/hMUR4cZqs7IdCDUkxQF3w==";
       };
     };
-    "@aws-sdk/middleware-recursion-detection-3.734.0" = {
-      name = "_at_aws-sdk_slash_middleware-recursion-detection";
-      packageName = "@aws-sdk/middleware-recursion-detection";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.734.0.tgz";
-        sha512 = "CUat2d9ITsFc2XsmeiRQO96iWpxSKYFjxvj27Hc7vo87YUHRnfMfnc8jw1EpxEwMcvBD7LsRa6vDNky6AjcrFA==";
-      };
-    };
     "@aws-sdk/middleware-retry-3.296.0" = {
       name = "_at_aws-sdk_slash_middleware-retry";
       packageName = "@aws-sdk/middleware-retry";
@@ -1029,15 +804,6 @@ let
         sha512 = "yC1ku7A5S+o/CLlgbgDB2bx8+Wq43qj8xfohmTuIhpiP2m/NyUiRVv6S6ARONLI6bVeo1T2/BFk5Q9DfE2xzAQ==";
       };
     };
-    "@aws-sdk/token-providers-3.758.0" = {
-      name = "_at_aws-sdk_slash_token-providers";
-      packageName = "@aws-sdk/token-providers";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.758.0.tgz";
-        sha512 = "ckptN1tNrIfQUaGWm/ayW1ddG+imbKN7HHhjFdS4VfItsP0QQOB0+Ov+tpgb4MoNR4JaUghMIVStjIeHN2ks1w==";
-      };
-    };
     "@aws-sdk/types-3.296.0" = {
       name = "_at_aws-sdk_slash_types";
       packageName = "@aws-sdk/types";
@@ -1182,15 +948,6 @@ let
         sha512 = "CcYECzkUAnHL5q3uyPicafn2OY0GiklIYfuOUHPZ/4FMxIesd1BnCDDRjTlFxLWjuNuiihIdwB7Qb1pDzxc3Iw==";
       };
     };
-    "@aws-sdk/util-format-url-3.734.0" = {
-      name = "_at_aws-sdk_slash_util-format-url";
-      packageName = "@aws-sdk/util-format-url";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.734.0.tgz";
-        sha512 = "TxZMVm8V4aR/QkW9/NhujvYpPZjUYqzLwSge5imKZbWFR806NP7RMwc5ilVuHF/bMOln/cVHkl42kATElWBvNw==";
-      };
-    };
     "@aws-sdk/util-hex-encoding-3.295.0" = {
       name = "_at_aws-sdk_slash_util-hex-encoding";
       packageName = "@aws-sdk/util-hex-encoding";
@@ -1263,15 +1020,6 @@ let
         sha512 = "MGGG+09VkF0N+8KEht8NNE6Q7bqmddgqLkUbvzSky0y18UPEZyq9LTC4JZtzDDOzf/swgbq2IQ/5wtB81iouog==";
       };
     };
-    "@aws-sdk/util-user-agent-browser-3.734.0" = {
-      name = "_at_aws-sdk_slash_util-user-agent-browser";
-      packageName = "@aws-sdk/util-user-agent-browser";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.734.0.tgz";
-        sha512 = "xQTCus6Q9LwUuALW+S76OL0jcWtMOVu14q+GoLnWPUM7QeUw963oQcLhF7oq0CtaLLKyl4GOUfcwc773Zmwwng==";
-      };
-    };
     "@aws-sdk/util-user-agent-node-3.296.0" = {
       name = "_at_aws-sdk_slash_util-user-agent-node";
       packageName = "@aws-sdk/util-user-agent-node";
@@ -1326,15 +1074,6 @@ let
         sha512 = "7VX3Due7Ip73yfYErFDHZvhgBohC4IyMTfW49DI4C/LFKFCcAoB888MdevUkB87GoiNaRLeT3ZMZ86IWlSEaow==";
       };
     };
-    "@aws-sdk/xml-builder-3.734.0" = {
-      name = "_at_aws-sdk_slash_xml-builder";
-      packageName = "@aws-sdk/xml-builder";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.734.0.tgz";
-        sha512 = "Zrjxi5qwGEcUsJ0ru7fRtW74WcTS0rbLcehoFB+rN1GRi2hbLcFaYs4PwVA5diLeAJH0gszv3x4Hr/S87MfbKQ==";
-      };
-    };
     "@azure/abort-controller-2.1.2" = {
       name = "_at_azure_slash_abort-controller";
       packageName = "@azure/abort-controller";
@@ -1767,15 +1506,6 @@ let
         sha512 = "wMue2Sy4GAVTk6Ic4tJVcnfdau+gx2EnG7S+uAEe+TWJFqE4YoWN4/H8MSLj4eYJKxGg26lZwboEniNiNwZQ6Q==";
       };
     };
-    "@buttercup/fetch-0.2.1" = {
-      name = "_at_buttercup_slash_fetch";
-      packageName = "@buttercup/fetch";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@buttercup/fetch/-/fetch-0.2.1.tgz";
-        sha512 = "sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==";
-      };
-    };
     "@cdktf/cli-core-0.20.11" = {
       name = "_at_cdktf_slash_cli-core";
       packageName = "@cdktf/cli-core";
@@ -2867,15 +2597,6 @@ let
         sha512 = "ZJpeIYYueOz/i/ONzrfof8g89kNdO2hjGuvULROo3O8rlB2CRtSseE5KeirnyE4t/thAn/EwvS/vuQeJCn+NZg==";
       };
     };
-    "@ioredis/commands-1.2.0" = {
-      name = "_at_ioredis_slash_commands";
-      packageName = "@ioredis/commands";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@ioredis/commands/-/commands-1.2.0.tgz";
-        sha512 = "Sx1pU8EM64o2BrqNpEO1CNLtKQwyhuXuqyfH7oGKCk+1a33d2r5saW8zNwm3j6BTExtjrv2BxTgzzkMwts6vGg==";
-      };
-    };
     "@isaacs/cliui-8.0.2" = {
       name = "_at_isaacs_slash_cliui";
       packageName = "@isaacs/cliui";
@@ -3785,15 +3506,6 @@ let
         sha512 = "XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==";
       };
     };
-    "@opentelemetry/api-1.9.0" = {
-      name = "_at_opentelemetry_slash_api";
-      packageName = "@opentelemetry/api";
-      version = "1.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz";
-        sha512 = "3giAOQvZiH5F9bMlMiv8+GSPMeqg0dbaeo58/0SlA9sxSqZhnUtxzX9/2FzyhS9sWQf5S0GJE0AKBrFqjpeYcg==";
-      };
-    };
     "@orval/angular-7.7.0" = {
       name = "_at_orval_slash_angular";
       packageName = "@orval/angular";
@@ -4685,33 +4397,6 @@ let
         sha512 = "fiUIYgIgRjMWznk6iLJz35K2YxSLHzLBA/RC6lBrKfQ8fHbPfvk7Pk9UvpKoHgJjI18MnbPuEju53zcVy6KF1g==";
       };
     };
-    "@smithy/chunked-blob-reader-5.0.0" = {
-      name = "_at_smithy_slash_chunked-blob-reader";
-      packageName = "@smithy/chunked-blob-reader";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/chunked-blob-reader/-/chunked-blob-reader-5.0.0.tgz";
-        sha512 = "+sKqDBQqb036hh4NPaUiEkYFkTUGYzRsn3EuFhyfQfMy6oGHEUJDurLP9Ufb5dasr/XiAmPNMr6wa9afjQB+Gw==";
-      };
-    };
-    "@smithy/chunked-blob-reader-native-4.0.0" = {
-      name = "_at_smithy_slash_chunked-blob-reader-native";
-      packageName = "@smithy/chunked-blob-reader-native";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/chunked-blob-reader-native/-/chunked-blob-reader-native-4.0.0.tgz";
-        sha512 = "R9wM2yPmfEMsUmlMlIgSzOyICs0x9uu7UTHoccMyt7BWw8shcGM8HqB355+BZCPBcySvbTYMs62EgEQkNxz2ig==";
-      };
-    };
-    "@smithy/config-resolver-4.0.1" = {
-      name = "_at_smithy_slash_config-resolver";
-      packageName = "@smithy/config-resolver";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.0.1.tgz";
-        sha512 = "Igfg8lKu3dRVkTSEm98QpZUvKEOa71jDX4vKRcvJVyRc3UgN3j7vFMf0s7xLQhYmKa8kyJGQgUJDOV5V3neVlQ==";
-      };
-    };
     "@smithy/core-3.1.5" = {
       name = "_at_smithy_slash_core";
       packageName = "@smithy/core";
@@ -4721,60 +4406,6 @@ let
         sha512 = "HLclGWPkCsekQgsyzxLhCQLa8THWXtB5PxyYN+2O6nkyLt550KQKTlbV2D1/j5dNIQapAZM1+qFnpBFxZQkgCA==";
       };
     };
-    "@smithy/credential-provider-imds-4.0.1" = {
-      name = "_at_smithy_slash_credential-provider-imds";
-      packageName = "@smithy/credential-provider-imds";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.0.1.tgz";
-        sha512 = "l/qdInaDq1Zpznpmev/+52QomsJNZ3JkTl5yrTl02V6NBgJOQ4LY0SFw/8zsMwj3tLe8vqiIuwF6nxaEwgf6mg==";
-      };
-    };
-    "@smithy/eventstream-codec-4.0.1" = {
-      name = "_at_smithy_slash_eventstream-codec";
-      packageName = "@smithy/eventstream-codec";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/eventstream-codec/-/eventstream-codec-4.0.1.tgz";
-        sha512 = "Q2bCAAR6zXNVtJgifsU16ZjKGqdw/DyecKNgIgi7dlqw04fqDu0mnq+JmGphqheypVc64CYq3azSuCpAdFk2+A==";
-      };
-    };
-    "@smithy/eventstream-serde-browser-4.0.1" = {
-      name = "_at_smithy_slash_eventstream-serde-browser";
-      packageName = "@smithy/eventstream-serde-browser";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/eventstream-serde-browser/-/eventstream-serde-browser-4.0.1.tgz";
-        sha512 = "HbIybmz5rhNg+zxKiyVAnvdM3vkzjE6ccrJ620iPL8IXcJEntd3hnBl+ktMwIy12Te/kyrSbUb8UCdnUT4QEdA==";
-      };
-    };
-    "@smithy/eventstream-serde-config-resolver-4.0.1" = {
-      name = "_at_smithy_slash_eventstream-serde-config-resolver";
-      packageName = "@smithy/eventstream-serde-config-resolver";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-4.0.1.tgz";
-        sha512 = "lSipaiq3rmHguHa3QFF4YcCM3VJOrY9oq2sow3qlhFY+nBSTF/nrO82MUQRPrxHQXA58J5G1UnU2WuJfi465BA==";
-      };
-    };
-    "@smithy/eventstream-serde-node-4.0.1" = {
-      name = "_at_smithy_slash_eventstream-serde-node";
-      packageName = "@smithy/eventstream-serde-node";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/eventstream-serde-node/-/eventstream-serde-node-4.0.1.tgz";
-        sha512 = "o4CoOI6oYGYJ4zXo34U8X9szDe3oGjmHgsMGiZM0j4vtNoT+h80TLnkUcrLZR3+E6HIxqW+G+9WHAVfl0GXK0Q==";
-      };
-    };
-    "@smithy/eventstream-serde-universal-4.0.1" = {
-      name = "_at_smithy_slash_eventstream-serde-universal";
-      packageName = "@smithy/eventstream-serde-universal";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/eventstream-serde-universal/-/eventstream-serde-universal-4.0.1.tgz";
-        sha512 = "Z94uZp0tGJuxds3iEAZBqGU2QiaBHP4YytLUjwZWx+oUeohCsLyUm33yp4MMBmhkuPqSbQCXq5hDet6JGUgHWA==";
-      };
-    };
     "@smithy/fetch-http-handler-5.0.1" = {
       name = "_at_smithy_slash_fetch-http-handler";
       packageName = "@smithy/fetch-http-handler";
@@ -4784,51 +4415,6 @@ let
         sha512 = "3aS+fP28urrMW2KTjb6z9iFow6jO8n3MFfineGbndvzGZit3taZhKWtTorf+Gp5RpFDDafeHlhfsGlDCXvUnJA==";
       };
     };
-    "@smithy/hash-blob-browser-4.0.1" = {
-      name = "_at_smithy_slash_hash-blob-browser";
-      packageName = "@smithy/hash-blob-browser";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/hash-blob-browser/-/hash-blob-browser-4.0.1.tgz";
-        sha512 = "rkFIrQOKZGS6i1D3gKJ8skJ0RlXqDvb1IyAphksaFOMzkn3v3I1eJ8m7OkLj0jf1McP63rcCEoLlkAn/HjcTRw==";
-      };
-    };
-    "@smithy/hash-node-4.0.1" = {
-      name = "_at_smithy_slash_hash-node";
-      packageName = "@smithy/hash-node";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.0.1.tgz";
-        sha512 = "TJ6oZS+3r2Xu4emVse1YPB3Dq3d8RkZDKcPr71Nj/lJsdAP1c7oFzYqEn1IBc915TsgLl2xIJNuxCz+gLbLE0w==";
-      };
-    };
-    "@smithy/hash-stream-node-4.0.1" = {
-      name = "_at_smithy_slash_hash-stream-node";
-      packageName = "@smithy/hash-stream-node";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/hash-stream-node/-/hash-stream-node-4.0.1.tgz";
-        sha512 = "U1rAE1fxmReCIr6D2o/4ROqAQX+GffZpyMt3d7njtGDr2pUNmAKRWa49gsNVhCh2vVAuf3wXzWwNr2YN8PAXIw==";
-      };
-    };
-    "@smithy/invalid-dependency-4.0.1" = {
-      name = "_at_smithy_slash_invalid-dependency";
-      packageName = "@smithy/invalid-dependency";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.0.1.tgz";
-        sha512 = "gdudFPf4QRQ5pzj7HEnu6FhKRi61BfH/Gk5Yf6O0KiSbr1LlVhgjThcvjdu658VE6Nve8vaIWB8/fodmS1rBPQ==";
-      };
-    };
-    "@smithy/is-array-buffer-2.2.0" = {
-      name = "_at_smithy_slash_is-array-buffer";
-      packageName = "@smithy/is-array-buffer";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz";
-        sha512 = "GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==";
-      };
-    };
     "@smithy/is-array-buffer-4.0.0" = {
       name = "_at_smithy_slash_is-array-buffer";
       packageName = "@smithy/is-array-buffer";
@@ -4838,24 +4424,6 @@ let
         sha512 = "saYhF8ZZNoJDTvJBEWgeBccCg+yvp1CX+ed12yORU3NilJScfc6gfch2oVb4QgxZrGUx3/ZJlb+c/dJbyupxlw==";
       };
     };
-    "@smithy/md5-js-4.0.1" = {
-      name = "_at_smithy_slash_md5-js";
-      packageName = "@smithy/md5-js";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/md5-js/-/md5-js-4.0.1.tgz";
-        sha512 = "HLZ647L27APi6zXkZlzSFZIjpo8po45YiyjMGJZM3gyDY8n7dPGdmxIIljLm4gPt/7rRvutLTTkYJpZVfG5r+A==";
-      };
-    };
-    "@smithy/middleware-content-length-4.0.1" = {
-      name = "_at_smithy_slash_middleware-content-length";
-      packageName = "@smithy/middleware-content-length";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.0.1.tgz";
-        sha512 = "OGXo7w5EkB5pPiac7KNzVtfCW2vKBTZNuCctn++TTSOMpe6RZO/n6WEC1AxJINn3+vWLKW49uad3lo/u0WJ9oQ==";
-      };
-    };
     "@smithy/middleware-endpoint-4.0.6" = {
       name = "_at_smithy_slash_middleware-endpoint";
       packageName = "@smithy/middleware-endpoint";
@@ -4865,15 +4433,6 @@ let
         sha512 = "ftpmkTHIFqgaFugcjzLZv3kzPEFsBFSnq1JsIkr2mwFzCraZVhQk2gqN51OOeRxqhbPTkRFj39Qd2V91E/mQxg==";
       };
     };
-    "@smithy/middleware-retry-4.0.7" = {
-      name = "_at_smithy_slash_middleware-retry";
-      packageName = "@smithy/middleware-retry";
-      version = "4.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.0.7.tgz";
-        sha512 = "58j9XbUPLkqAcV1kHzVX/kAR16GT+j7DUZJqwzsxh1jtz7G82caZiGyyFgUvogVfNTg3TeAOIJepGc8TXF4AVQ==";
-      };
-    };
     "@smithy/middleware-serde-4.0.2" = {
       name = "_at_smithy_slash_middleware-serde";
       packageName = "@smithy/middleware-serde";
@@ -4946,15 +4505,6 @@ let
         sha512 = "Ma2XC7VS9aV77+clSFylVUnPZRindhB7BbmYiNOdr+CHt/kZNJoPP0cd3QxCnCFyPXC4eybmyE98phEHkqZ5Jw==";
       };
     };
-    "@smithy/service-error-classification-4.0.1" = {
-      name = "_at_smithy_slash_service-error-classification";
-      packageName = "@smithy/service-error-classification";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.0.1.tgz";
-        sha512 = "3JNjBfOWpj/mYfjXJHB4Txc/7E4LVq32bwzE7m28GN79+M1f76XHflUaSUkhOriprPDzev9cX/M+dEB80DNDKA==";
-      };
-    };
     "@smithy/shared-ini-file-loader-4.0.1" = {
       name = "_at_smithy_slash_shared-ini-file-loader";
       packageName = "@smithy/shared-ini-file-loader";
@@ -5018,24 +4568,6 @@ let
         sha512 = "sNi3DL0/k64/LO3A256M+m3CDdG6V7WKWHdAiBBMUN8S3hK3aMPhwnPik2A/a2ONN+9doY9UxaLfgqsIRg69QA==";
       };
     };
-    "@smithy/util-body-length-node-4.0.0" = {
-      name = "_at_smithy_slash_util-body-length-node";
-      packageName = "@smithy/util-body-length-node";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.0.0.tgz";
-        sha512 = "q0iDP3VsZzqJyje8xJWEJCNIu3lktUGVoSy1KB0UWym2CL1siV3artm+u1DFYTLejpsrdGyCSWBdGNjJzfDPjg==";
-      };
-    };
-    "@smithy/util-buffer-from-2.2.0" = {
-      name = "_at_smithy_slash_util-buffer-from";
-      packageName = "@smithy/util-buffer-from";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz";
-        sha512 = "IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==";
-      };
-    };
     "@smithy/util-buffer-from-4.0.0" = {
       name = "_at_smithy_slash_util-buffer-from";
       packageName = "@smithy/util-buffer-from";
@@ -5054,24 +4586,6 @@ let
         sha512 = "L1RBVzLyfE8OXH+1hsJ8p+acNUSirQnWQ6/EgpchV88G6zGBTDPdXiiExei6Z1wR2RxYvxY/XLw6AMNCCt8H3w==";
       };
     };
-    "@smithy/util-defaults-mode-browser-4.0.7" = {
-      name = "_at_smithy_slash_util-defaults-mode-browser";
-      packageName = "@smithy/util-defaults-mode-browser";
-      version = "4.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.7.tgz";
-        sha512 = "CZgDDrYHLv0RUElOsmZtAnp1pIjwDVCSuZWOPhIOBvG36RDfX1Q9+6lS61xBf+qqvHoqRjHxgINeQz47cYFC2Q==";
-      };
-    };
-    "@smithy/util-defaults-mode-node-4.0.7" = {
-      name = "_at_smithy_slash_util-defaults-mode-node";
-      packageName = "@smithy/util-defaults-mode-node";
-      version = "4.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.7.tgz";
-        sha512 = "79fQW3hnfCdrfIi1soPbK3zmooRFnLpSx3Vxi6nUlqaaQeC5dm8plt4OTNDNqEEEDkvKghZSaoti684dQFVrGQ==";
-      };
-    };
     "@smithy/util-endpoints-3.0.1" = {
       name = "_at_smithy_slash_util-endpoints";
       packageName = "@smithy/util-endpoints";
@@ -5099,15 +4613,6 @@ let
         sha512 = "HiLAvlcqhbzhuiOa0Lyct5IIlyIz0PQO5dnMlmQ/ubYM46dPInB+3yQGkfxsk6Q24Y0n3/JmcA1v5iEhmOF5mA==";
       };
     };
-    "@smithy/util-retry-4.0.1" = {
-      name = "_at_smithy_slash_util-retry";
-      packageName = "@smithy/util-retry";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.0.1.tgz";
-        sha512 = "WmRHqNVwn3kI3rKk1LsKcVgPBG6iLTBGC1iYOV3GQegwJ3E8yjzHytPt26VNzOWr1qu0xE03nK0Ug8S7T7oufw==";
-      };
-    };
     "@smithy/util-stream-4.1.2" = {
       name = "_at_smithy_slash_util-stream";
       packageName = "@smithy/util-stream";
@@ -5126,15 +4631,6 @@ let
         sha512 = "77yfbCbQMtgtTylO9itEAdpPXSog3ZxMe09AEhm0dU0NLTalV70ghDZFR+Nfi1C60jnJoh/Re4090/DuZh2Omg==";
       };
     };
-    "@smithy/util-utf8-2.3.0" = {
-      name = "_at_smithy_slash_util-utf8";
-      packageName = "@smithy/util-utf8";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz";
-        sha512 = "R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==";
-      };
-    };
     "@smithy/util-utf8-4.0.0" = {
       name = "_at_smithy_slash_util-utf8";
       packageName = "@smithy/util-utf8";
@@ -5144,15 +4640,6 @@ let
         sha512 = "b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow==";
       };
     };
-    "@smithy/util-waiter-4.0.2" = {
-      name = "_at_smithy_slash_util-waiter";
-      packageName = "@smithy/util-waiter";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-waiter/-/util-waiter-4.0.2.tgz";
-        sha512 = "piUTHyp2Axx3p/kc2CIJkYSv0BAaheBQmbACZgQSSfWUumWNW+R1lL+H9PDBxKJkvOeEX+hKYEFiwO8xagL8AQ==";
-      };
-    };
     "@socket.io/component-emitter-3.1.2" = {
       name = "_at_socket.io_slash_component-emitter";
       packageName = "@socket.io/component-emitter";
@@ -5747,15 +5234,6 @@ let
         sha512 = "FisOhG87cCFqzCgq6FUtSYsTMOHCB/p28zJbSN1QBo4ZGJfg9PEhMjdIV++NDeOnloUUe0Gz6jwBV+L1Ac00Mw==";
       };
     };
-    "@types/body-parser-1.19.5" = {
-      name = "_at_types_slash_body-parser";
-      packageName = "@types/body-parser";
-      version = "1.19.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz";
-        sha512 = "fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==";
-      };
-    };
     "@types/cacheable-request-6.0.3" = {
       name = "_at_types_slash_cacheable-request";
       packageName = "@types/cacheable-request";
@@ -5801,15 +5279,6 @@ let
         sha512 = "3qe4oQAPNwVNwK4C9c8u+VJqv9kez+2MR4qJpoPFfXtgxxif1QbFusvXzK0/Wra2VX07smostI2VMmJNSpZjuQ==";
       };
     };
-    "@types/connect-3.4.38" = {
-      name = "_at_types_slash_connect";
-      packageName = "@types/connect";
-      version = "3.4.38";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz";
-        sha512 = "K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==";
-      };
-    };
     "@types/conventional-commits-parser-5.0.1" = {
       name = "_at_types_slash_conventional-commits-parser";
       packageName = "@types/conventional-commits-parser";
@@ -5900,24 +5369,6 @@ let
         sha512 = "52CcUVNFyfb1A2ALocQw/Dd1BQFNmSdkuC3BkZ6iqhdMfQz7JWOFRuJFloOzjk+6WijU56m9oKXFAXc7o3Towg==";
       };
     };
-    "@types/express-4.17.21" = {
-      name = "_at_types_slash_express";
-      packageName = "@types/express";
-      version = "4.17.21";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz";
-        sha512 = "ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==";
-      };
-    };
-    "@types/express-serve-static-core-4.19.6" = {
-      name = "_at_types_slash_express-serve-static-core";
-      packageName = "@types/express-serve-static-core";
-      version = "4.19.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz";
-        sha512 = "N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==";
-      };
-    };
     "@types/geojson-7946.0.4" = {
       name = "_at_types_slash_geojson";
       packageName = "@types/geojson";
@@ -5963,15 +5414,6 @@ let
         sha512 = "1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==";
       };
     };
-    "@types/http-errors-2.0.4" = {
-      name = "_at_types_slash_http-errors";
-      packageName = "@types/http-errors";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz";
-        sha512 = "D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA==";
-      };
-    };
     "@types/inquirer-6.5.0" = {
       name = "_at_types_slash_inquirer";
       packageName = "@types/inquirer";
@@ -6071,15 +5513,6 @@ let
         sha512 = "RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==";
       };
     };
-    "@types/mime-1.3.5" = {
-      name = "_at_types_slash_mime";
-      packageName = "@types/mime";
-      version = "1.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz";
-        sha512 = "/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w==";
-      };
-    };
     "@types/minimatch-3.0.5" = {
       name = "_at_types_slash_minimatch";
       packageName = "@types/minimatch";
@@ -6242,24 +5675,6 @@ let
         sha512 = "dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==";
       };
     };
-    "@types/qs-6.9.18" = {
-      name = "_at_types_slash_qs";
-      packageName = "@types/qs";
-      version = "6.9.18";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz";
-        sha512 = "kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA==";
-      };
-    };
-    "@types/range-parser-1.2.7" = {
-      name = "_at_types_slash_range-parser";
-      packageName = "@types/range-parser";
-      version = "1.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz";
-        sha512 = "hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ==";
-      };
-    };
     "@types/react-19.0.10" = {
       name = "_at_types_slash_react";
       packageName = "@types/react";
@@ -6287,24 +5702,6 @@ let
         sha512 = "I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==";
       };
     };
-    "@types/send-0.17.4" = {
-      name = "_at_types_slash_send";
-      packageName = "@types/send";
-      version = "0.17.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz";
-        sha512 = "x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==";
-      };
-    };
-    "@types/serve-static-1.15.7" = {
-      name = "_at_types_slash_serve-static";
-      packageName = "@types/serve-static";
-      version = "1.15.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz";
-        sha512 = "W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==";
-      };
-    };
     "@types/supports-color-8.1.3" = {
       name = "_at_types_slash_supports-color";
       packageName = "@types/supports-color";
@@ -9554,15 +8951,6 @@ let
         sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==";
       };
     };
-    "buffer-5.6.0" = {
-      name = "buffer";
-      packageName = "buffer";
-      version = "5.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz";
-        sha512 = "/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw==";
-      };
-    };
     "buffer-5.7.1" = {
       name = "buffer";
       packageName = "buffer";
@@ -11012,15 +10400,6 @@ let
         sha512 = "eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==";
       };
     };
-    "cluster-key-slot-1.1.2" = {
-      name = "cluster-key-slot";
-      packageName = "cluster-key-slot";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cluster-key-slot/-/cluster-key-slot-1.1.2.tgz";
-        sha512 = "RMr0FhtfXemyinomL4hrWcYJxmX6deFdCxpJzhDttxgO1+bcCnkk+9drydLVDmAMG7NE6aN/fl4F7ucU/90gAA==";
-      };
-    };
     "cmd-extension-1.0.2" = {
       name = "cmd-extension";
       packageName = "cmd-extension";
@@ -11696,15 +11075,6 @@ let
         sha512 = "a1gSWQBQD73krFXdUEYJom2RTFrWUL3YvXDCRkyv//GVXc79cdW9MngtRuN9ih4FDKBtfJAJId+BbDuX+1rh2w==";
       };
     };
-    "connect-redis-7.1.1" = {
-      name = "connect-redis";
-      packageName = "connect-redis";
-      version = "7.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/connect-redis/-/connect-redis-7.1.1.tgz";
-        sha512 = "M+z7alnCJiuzKa8/1qAYdGUXHYfDnLolOGAUjOioB07pP39qxjG+X9ibsud7qUBc4jMV5Mcy3ugGv8eFcgamJQ==";
-      };
-    };
     "consola-3.4.0" = {
       name = "consola";
       packageName = "consola";
@@ -12030,15 +11400,6 @@ let
         sha512 = "rcQ1bsQO9799wq24uE5AM2tAILy4gXGIK/njFWcVQkGNZ96edlpY+A7bjwvzjYvLDyzmG1MmMLZhpcsb+klNMQ==";
       };
     };
-    "cookie-0.4.1" = {
-      name = "cookie";
-      packageName = "cookie";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie/-/cookie-0.4.1.tgz";
-        sha512 = "ZwrFkGJxUR3EIoXtO+yVE69Eb7KlixbaeAWfBQB9vVsNn/o+Yw69gBWSSDK825hQNdN+wF8zELf3dFNl/kxkUA==";
-      };
-    };
     "cookie-0.4.2" = {
       name = "cookie";
       packageName = "cookie";
@@ -12066,15 +11427,6 @@ let
         sha512 = "yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==";
       };
     };
-    "cookie-parser-1.4.6" = {
-      name = "cookie-parser";
-      packageName = "cookie-parser";
-      version = "1.4.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.4.6.tgz";
-        sha512 = "z3IzaNjdwUC2olLIB5/ITd0/setiaFMLYiZJle7xg5Fe9KWAceil7xszYfHHBtDFYLSgJduS2Ty0P1uJdPDJeA==";
-      };
-    };
     "cookie-signature-1.0.6" = {
       name = "cookie-signature";
       packageName = "cookie-signature";
@@ -12084,15 +11436,6 @@ let
         sha512 = "QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==";
       };
     };
-    "cookie-signature-1.0.7" = {
-      name = "cookie-signature";
-      packageName = "cookie-signature";
-      version = "1.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz";
-        sha512 = "NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==";
-      };
-    };
     "cookiejar-2.1.4" = {
       name = "cookiejar";
       packageName = "cookiejar";
@@ -12300,15 +11643,6 @@ let
         sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==";
       };
     };
-    "cron-parser-4.9.0" = {
-      name = "cron-parser";
-      packageName = "cron-parser";
-      version = "4.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cron-parser/-/cron-parser-4.9.0.tgz";
-        sha512 = "p0SaNjrHOnQeR8/VnfGbmg9te2kfyYSQ7Sc/j/6DtPL3JQvKxmjO9TSjNFpujqV3vEYYBvNNvXSxzyksBWAx1Q==";
-      };
-    };
     "cross-dirname-0.1.0" = {
       name = "cross-dirname";
       packageName = "cross-dirname";
@@ -13380,15 +12714,6 @@ let
         sha512 = "bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==";
       };
     };
-    "denque-2.1.0" = {
-      name = "denque";
-      packageName = "denque";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/denque/-/denque-2.1.0.tgz";
-        sha512 = "HVQE3AAb/pxF8fQAoiqpvg9i3evqug3hoiwakOyZAwJm+6vZehbkYXZ0l4JxS+I3QxM97v5aaRNhj8v5oBhekw==";
-      };
-    };
     "depcheck-1.4.7" = {
       name = "depcheck";
       packageName = "depcheck";
@@ -14505,15 +13830,6 @@ let
         sha512 = "V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==";
       };
     };
-    "entities-5.0.0" = {
-      name = "entities";
-      packageName = "entities";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/entities/-/entities-5.0.0.tgz";
-        sha512 = "BeJFvFRJddxobhvEdm5GqHzRV/X+ACeuw0/BuuxsCh1EUZcAIz8+kYmBp/LrQuloy6K1f3a0M7+IhmZ7QnkISA==";
-      };
-    };
     "env-paths-2.2.1" = {
       name = "env-paths";
       packageName = "env-paths";
@@ -14991,15 +14307,6 @@ let
         sha512 = "8/uIhbG12Csjy2JEW7D9pHbreaVaS/OpN3ycnyvElTdwM5n6GY6W6e2IPemfvGZeUMqZ9A/3GqIZMgKnBhAw/Q==";
       };
     };
-    "escape-goat-3.0.0" = {
-      name = "escape-goat";
-      packageName = "escape-goat";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escape-goat/-/escape-goat-3.0.0.tgz";
-        sha512 = "w3PwNZJwRxlp47QGzhuEBldEqVHHhh8/tIPcl6ecf2Bou99cdAt0knihBV0Ecc7CGxYduXVBDheH1K2oADRlvw==";
-      };
-    };
     "escape-goat-4.0.0" = {
       name = "escape-goat";
       packageName = "escape-goat";
@@ -15603,33 +14910,6 @@ let
         sha512 = "7QlaXnSREMmN5P2o4gmpUZDfJlLtfBka9d6r7/ccXaU7rPp76odw9YYtwZYdIiha2JqwiaG6o2Wu6NZJQ0u7Fg==";
       };
     };
-    "express-interceptor-1.2.0" = {
-      name = "express-interceptor";
-      packageName = "express-interceptor";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express-interceptor/-/express-interceptor-1.2.0.tgz";
-        sha512 = "fCbcJv8ZwabDg0M/3PmHUxfr/WKHGMpAicR9TfGdhANV4M1GBDSrBTenHIK3aegyRN5S6eDwlvyNFiLynnc19w==";
-      };
-    };
-    "express-prom-bundle-7.0.0" = {
-      name = "express-prom-bundle";
-      packageName = "express-prom-bundle";
-      version = "7.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express-prom-bundle/-/express-prom-bundle-7.0.0.tgz";
-        sha512 = "VwVaCyGBGHkHdecpTqRdW1Jm2fXK8weCUKjGjNWorc9g4M+cZ3xoj+N9uQzfRWfIPXJG5QOaiAziOIalQzMwgA==";
-      };
-    };
-    "express-session-1.18.1" = {
-      name = "express-session";
-      packageName = "express-session";
-      version = "1.18.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/express-session/-/express-session-1.18.1.tgz";
-        sha512 = "a5mtTqEaZvBCL9A9aqkrtfz+3SMDhOVUnjafjo+s7A9Txkq+SVX2DLvSp1Zrv4uCXa3lMSK3viWnh9Gg07PBUA==";
-      };
-    };
     "ext-1.7.0" = {
       name = "ext";
       packageName = "ext";
@@ -17844,15 +17124,6 @@ let
         sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==";
       };
     };
-    "grant-5.4.22" = {
-      name = "grant";
-      packageName = "grant";
-      version = "5.4.22";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/grant/-/grant-5.4.22.tgz";
-        sha512 = "DEi+/JjXT84mmFYhSmv+SX14v+3Z7vuCIYAMwtdPCTXHMSLhWqSYqWAMXDUQZuV7yaJv2d84AYnkCFNooLKBsA==";
-      };
-    };
     "graphlib-2.1.8" = {
       name = "graphlib";
       packageName = "graphlib";
@@ -18384,15 +17655,6 @@ let
         sha512 = "n8aSFscI9r3gfhOcAECAtXFaQ1uy4QSke6bnaL+iymYZ/dWs9cqDqHM+rALfsHUwukUbxsdlECZ0pKmJdQ/4OA==";
       };
     };
-    "helmet-7.2.0" = {
-      name = "helmet";
-      packageName = "helmet";
-      version = "7.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/helmet/-/helmet-7.2.0.tgz";
-        sha512 = "ZRiwvN089JfMXokizgqEPXsl2Guk094yExfoDXR0cBYWxtBbaSww/w+vT4WEJsBW2iTUi1GgZ6swmoug3Oy4Xw==";
-      };
-    };
     "help-me-3.0.0" = {
       name = "help-me";
       packageName = "help-me";
@@ -18519,15 +17781,6 @@ let
         sha512 = "sYKnA7eGln5ov8T8gnYlkSOxFJvywzEx9BueN6xo/GKO8PGiI6uK6xx+DIGe45T3bdVjLAQDQW1aicT8z8JwQg==";
       };
     };
-    "hot-patcher-2.0.1" = {
-      name = "hot-patcher";
-      packageName = "hot-patcher";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hot-patcher/-/hot-patcher-2.0.1.tgz";
-        sha512 = "ECg1JFG0YzehicQaogenlcs2qg6WsXQsxtnbr1i696u5tLUjtJdQAh0u2g0Q5YV45f263Ta1GnUJsc8WIfJf4Q==";
-      };
-    };
     "hot-shots-6.8.7" = {
       name = "hot-shots";
       packageName = "hot-shots";
@@ -19680,15 +18933,6 @@ let
         sha512 = "xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==";
       };
     };
-    "ioredis-5.6.0" = {
-      name = "ioredis";
-      packageName = "ioredis";
-      version = "5.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ioredis/-/ioredis-5.6.0.tgz";
-        sha512 = "tBZlIIWbndeWBWCXWZiqtOF/yxf6yZX3tAlTJ7nfo5jhd6dctNxF7QnYlZLZ1a0o0pDoen7CgZqO+zjNaFbJAg==";
-      };
-    };
     "iota-array-1.0.0" = {
       name = "iota-array";
       packageName = "iota-array";
@@ -21174,15 +20418,6 @@ let
         sha512 = "WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==";
       };
     };
-    "js-base64-3.7.7" = {
-      name = "js-base64";
-      packageName = "js-base64";
-      version = "3.7.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-base64/-/js-base64-3.7.7.tgz";
-        sha512 = "7rCnleh0z2CkXhH67J8K1Ytz0b2Y+yxTPL+/KOJoa20hfnVQ/3/T6W/KflYI4bRHRagNeXeU2bkNGI3v1oS/lw==";
-      };
-    };
     "js-cookie-3.0.5" = {
       name = "js-cookie";
       packageName = "js-cookie";
@@ -22092,15 +21327,6 @@ let
         sha512 = "7W0vV3rqv5tokqkBAFV1LbR7HPOWzXQDpDgEuib/aJ1jsZZx6x3c2mBI+TJhJzOhkGeaLbCKEHXEXLfirtG2JA==";
       };
     };
-    "layerr-3.0.0" = {
-      name = "layerr";
-      packageName = "layerr";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/layerr/-/layerr-3.0.0.tgz";
-        sha512 = "tv754Ki2dXpPVApOrjTyRo4/QegVb9eVFq4mjqp4+NM5NaX7syQvN5BBNfV/ZpAHCEHV24XdUVrBAoka4jt3pA==";
-      };
-    };
     "lazy-1.0.11" = {
       name = "lazy";
       packageName = "lazy";
@@ -23280,15 +22506,6 @@ let
         sha512 = "ka87Jz3gcx/I7Hal94xaN2tZEOPoUOEVftkQqZx2EeQRN7LGdfLlI3FvZ+7WDplm+vK2Urx9ULrvSowtdCieng==";
       };
     };
-    "long-timeout-0.1.1" = {
-      name = "long-timeout";
-      packageName = "long-timeout";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/long-timeout/-/long-timeout-0.1.1.tgz";
-        sha512 = "BFRuQUqc7x2NWxfJBCyUrN8iYUYznzL9JROmRz1gZ6KlOIgmoD+njPVbb+VNn2nGMKggMsK79iUNErillsrx7w==";
-      };
-    };
     "longest-streak-2.0.4" = {
       name = "longest-streak";
       packageName = "longest-streak";
@@ -25540,15 +24757,6 @@ let
         sha512 = "uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==";
       };
     };
-    "moment-timezone-0.5.47" = {
-      name = "moment-timezone";
-      packageName = "moment-timezone";
-      version = "0.5.47";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/moment-timezone/-/moment-timezone-0.5.47.tgz";
-        sha512 = "UbNt/JAWS0m/NJOebR0QMRHBk0hu03r5dx9GK8Cs0AS3I81yDcOc9k+DytPItgVvBP7J6Mf6U2n3BPAacAV9oA==";
-      };
-    };
     "morgan-1.10.0" = {
       name = "morgan";
       packageName = "morgan";
@@ -25991,15 +25199,6 @@ let
         sha512 = "9iN1ka/9zmX1ZvLV9ewJYEk9h7RyRRtqdK0woXcqohu8EWIerfPUjYJPg0ULy0UqP7cslmdGc8xKDJcojlKiaw==";
       };
     };
-    "nested-property-4.0.0" = {
-      name = "nested-property";
-      packageName = "nested-property";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nested-property/-/nested-property-4.0.0.tgz";
-        sha512 = "yFehXNWRs4cM0+dz7QxCd06hTbWbSkV0ISsqBfkntU6TOY4Qm3Q88fRRLOddkGh2Qq6dZvnKVAahfhjcUvLnyA==";
-      };
-    };
     "netmask-2.0.2" = {
       name = "netmask";
       packageName = "netmask";
@@ -26369,15 +25568,6 @@ let
         sha512 = "Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw==";
       };
     };
-    "node-schedule-2.1.1" = {
-      name = "node-schedule";
-      packageName = "node-schedule";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-schedule/-/node-schedule-2.1.1.tgz";
-        sha512 = "OXdegQq03OmXEjt2hZP33W2YPs/E5BcFQks46+G2gAxs4gHOIVD1u7EqlYLYSKsaIpyKCK9Gbk0ta1/gjRSMRQ==";
-      };
-    };
     "node-static-0.7.11" = {
       name = "node-static";
       packageName = "node-static";
@@ -28367,15 +27557,6 @@ let
         sha512 = "Y30dB6rab1A/nfEKsZxmr01nUotHX0c/ZiIAsCTatEe1CmS5Pm5He7fZ195bPT7RdquoaL8lLxFCMQi/bS7IJg==";
       };
     };
-    "path-posix-1.0.0" = {
-      name = "path-posix";
-      packageName = "path-posix";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-posix/-/path-posix-1.0.0.tgz";
-        sha512 = "1gJ0WpNIiYcQydgg3Ed8KzvIqTsDpNwq+cjBCssvBtuTWjEqY1AW+i+OepiEMqDCzyro9B2sLAe4RBPajMYFiA==";
-      };
-    };
     "path-root-0.1.1" = {
       name = "path-root";
       packageName = "path-root";
@@ -29294,15 +28475,6 @@ let
         sha512 = "iz22FmTbtkyL2vt0MdDFY+kWof+S9UB/NACxSn2aJcewtw+EERsen0urSkZ2WrHseNdydsvcxCTAnPcSMZZv4Q==";
       };
     };
-    "prom-client-15.1.2" = {
-      name = "prom-client";
-      packageName = "prom-client";
-      version = "15.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prom-client/-/prom-client-15.1.2.tgz";
-        sha512 = "on3h1iXb04QFLLThrmVYg1SChBQ9N1c+nKAjebBjokBqipddH3uxmOUcEkTnzmJ8Jh/5TSUnUqS40i2QB2dJHQ==";
-      };
-    };
     "promise-8.3.0" = {
       name = "promise";
       packageName = "promise";
@@ -30320,24 +29492,6 @@ let
         sha512 = "FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ==";
       };
     };
-    "redis-errors-1.2.0" = {
-      name = "redis-errors";
-      packageName = "redis-errors";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/redis-errors/-/redis-errors-1.2.0.tgz";
-        sha512 = "1qny3OExCf0UvUV/5wpYKf2YwPcOqXzkwKKSmKHiE6ZMQs5heeE/c8eXK+PNllPvmjgAbfnsbpkGZWy8cBpn9w==";
-      };
-    };
-    "redis-parser-3.0.0" = {
-      name = "redis-parser";
-      packageName = "redis-parser";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/redis-parser/-/redis-parser-3.0.0.tgz";
-        sha512 = "DJnGAeenTdpMEH6uAJRK/uiyEIH9WVsUmoLwzudwGJUwZPp80PDBWPHXSAGNPwNvIXAbe7MSUB1zQFugFml66A==";
-      };
-    };
     "reduce-flatten-1.0.1" = {
       name = "reduce-flatten";
       packageName = "reduce-flatten";
@@ -31202,15 +30356,6 @@ let
         sha512 = "MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==";
       };
     };
-    "request-compose-2.1.7" = {
-      name = "request-compose";
-      packageName = "request-compose";
-      version = "2.1.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request-compose/-/request-compose-2.1.7.tgz";
-        sha512 = "27amNkWTK4Qq25XEwdmrhb4VLMiQzRSKuDfsy1o1griykcyXk5MxMHmJG+OKTRdO9PgsO7Kkn7GrEkq0UAIIMQ==";
-      };
-    };
     "request-light-0.4.0" = {
       name = "request-light";
       packageName = "request-light";
@@ -31220,15 +30365,6 @@ let
         sha512 = "fimzjIVw506FBZLspTAXHdpvgvQebyjpNyLRd0e6drPPRq7gcrROeGWRyF81wLqFg5ijPgnOQbmfck5wdTqpSA==";
       };
     };
-    "request-oauth-1.0.1" = {
-      name = "request-oauth";
-      packageName = "request-oauth";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request-oauth/-/request-oauth-1.0.1.tgz";
-        sha512 = "85THTg1RgOYtqQw42JON6AqvHLptlj1biw265Tsq4fD4cPdUvhDB2Qh9NTv17yCD322ROuO9aOmpc4GyayGVBA==";
-      };
-    };
     "request-promise-4.2.6" = {
       name = "request-promise";
       packageName = "request-promise";
@@ -32264,15 +31400,6 @@ let
         sha512 = "v67WcEouB5GxbTWL/4NeToqcZiAWEq90N888fczVArY8A79J0L4FD7vj5hm3eUMua5EpoQ59wa/oovY6TLvRUA==";
       };
     };
-    "serialize-error-11.0.3" = {
-      name = "serialize-error";
-      packageName = "serialize-error";
-      version = "11.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serialize-error/-/serialize-error-11.0.3.tgz";
-        sha512 = "2G2y++21dhj2R7iHAdd0FIzjGwuKZld+7Pl/bTU6YIkrC2ZMbVUjm+luj6A6V34Rv9XfKJDKpTWu9W4Gse1D9g==";
-      };
-    };
     "serialize-javascript-6.0.2" = {
       name = "serialize-javascript";
       packageName = "serialize-javascript";
@@ -33164,15 +32291,6 @@ let
         sha512 = "WTECP0nYNWO1n2g5bpsV0yZN9cBmZsF8ThHFbOqVN0HBFRoaQZLLEMvMmJlKHNPYQeVngeI5+jJzIfFqOIo1OA==";
       };
     };
-    "sorted-array-functions-1.3.0" = {
-      name = "sorted-array-functions";
-      packageName = "sorted-array-functions";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sorted-array-functions/-/sorted-array-functions-1.3.0.tgz";
-        sha512 = "2sqgzeFlid6N4Z2fUQ1cvFmTOLRi/sEDzSQ0OKYchqgoPmQBVyM3959qYx3fpS6Esef80KjmpgPeEr028dP3OA==";
-      };
-    };
     "source-map-0.5.7" = {
       name = "source-map";
       packageName = "source-map";
@@ -33596,15 +32714,6 @@ let
         sha512 = "oeVtt7eWQS+Na6F//S4kJ2K2VbRlS9D43mAlMyVpVWovy9o+jfgH8O9agzANzaiLjclA0oYzUXEM4PurhSUChw==";
       };
     };
-    "standard-as-callback-2.1.0" = {
-      name = "standard-as-callback";
-      packageName = "standard-as-callback";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/standard-as-callback/-/standard-as-callback-2.1.0.tgz";
-        sha512 = "qoRRSyROncaz1z0mvYqIE4lCd9p2R90i6GxW3uZv5ucSu8tU7B5HXUP1gG8pVZsYNVaXjk8ClXHPttLyxAL48A==";
-      };
-    };
     "stat-mode-0.3.0" = {
       name = "stat-mode";
       packageName = "stat-mode";
@@ -35477,15 +34586,6 @@ let
         sha512 = "McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==";
       };
     };
-    "tus-js-client-4.3.1" = {
-      name = "tus-js-client";
-      packageName = "tus-js-client";
-      version = "4.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tus-js-client/-/tus-js-client-4.3.1.tgz";
-        sha512 = "ZLeYmjrkaU1fUsKbIi8JML52uAocjEZtBx4DKjRrqzrZa0O4MYwT6db+oqePlspV+FxXJAyFBc/L5gwUi2OFsg==";
-      };
-    };
     "tweetnacl-0.14.5" = {
       name = "tweetnacl";
       packageName = "tweetnacl";
@@ -36746,15 +35846,6 @@ let
         sha512 = "oCwdVC7mTuWiPyjLUz/COz5TLk6wgp0RCsN+wHZ2Ekneac9w8uuV0njcbbie2ME+Vs+d6duwmYuR3HgQXs1fOg==";
       };
     };
-    "url-join-5.0.0" = {
-      name = "url-join";
-      packageName = "url-join";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/url-join/-/url-join-5.0.0.tgz";
-        sha512 = "n2huDr9h9yzd6exQVnH/jU5mr+Pfx08LRXXZhkLLetAMESRj+anQsTAh940iMrIetKAmry9coFuZQ2jY8/p3WA==";
-      };
-    };
     "url-parse-1.5.10" = {
       name = "url-parse";
       packageName = "url-parse";
@@ -36791,15 +35882,6 @@ let
         sha512 = "0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A==";
       };
     };
-    "url-value-parser-2.2.0" = {
-      name = "url-value-parser";
-      packageName = "url-value-parser";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/url-value-parser/-/url-value-parser-2.2.0.tgz";
-        sha512 = "yIQdxJpgkPamPPAPuGdS7Q548rLhny42tg8d4vyTNzFqvOnwqrgHXvgehT09U7fwrzxi3RxCiXjoNUNnNOlQ8A==";
-      };
-    };
     "urlpattern-polyfill-10.0.0" = {
       name = "urlpattern-polyfill";
       packageName = "urlpattern-polyfill";
@@ -37097,15 +36179,6 @@ let
         sha512 = "d7KLgL1LD3U3fgnvWEY1cQXoO/q6EQ1BSz48Sa149V/5zVTAbgmZIpyI8TRi6U9/JNyeYLlTKsEMPtLC27RFUg==";
       };
     };
-    "validator-13.12.0" = {
-      name = "validator";
-      packageName = "validator";
-      version = "13.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/validator/-/validator-13.12.0.tgz";
-        sha512 = "c1Q0mCiPlgdTVVVIJIrBuxNicYE+t/7oKeI9MWLj3fh/uq2Pxh/3eeWbVZ4OcGW1TUf53At0njHw5SMdA3tmMg==";
-      };
-    };
     "value-or-function-4.0.0" = {
       name = "value-or-function";
       packageName = "value-or-function";
@@ -37997,15 +37070,6 @@ let
         sha512 = "WkwV9qJLZZm1ygrryt4+6hAKbk4jLSVCpE92RYk/MOtLSpxq/2S1U0JFyKgsASXhYU5hqHQRiXvFBoNQhfCHyg==";
       };
     };
-    "webdav-5.7.1" = {
-      name = "webdav";
-      packageName = "webdav";
-      version = "5.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webdav/-/webdav-5.7.1.tgz";
-        sha512 = "JVPn3nLxXJfHSRvennHsOrDYjFLkilZ1Qlw8Ff6hpqp6AvkgF7a//aOh5wA4rMp+sLZ1Km0V+iv0LyO1FIwtXg==";
-      };
-    };
     "webidl-conversions-3.0.1" = {
       name = "webidl-conversions";
       packageName = "webidl-conversions";
@@ -40910,626 +39974,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  "@uppy/companion" = nodeEnv.buildNodePackage {
-    name = "_at_uppy_slash_companion";
-    packageName = "@uppy/companion";
-    version = "5.5.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/@uppy/companion/-/companion-5.5.2.tgz";
-      sha512 = "5izGN8U64tdXMdZewoDn+12vtKddzp9X1F7q6yi3vFoWcSO4oTsCQYmpKrU8A1V/5iAsn3g+NALwA9SUpzb7Aw==";
-    };
-    dependencies = [
-      sources."@aws-crypto/crc32-5.2.0"
-      sources."@aws-crypto/crc32c-5.2.0"
-      (
-        sources."@aws-crypto/sha1-browser-5.2.0"
-        // {
-          dependencies = [
-            sources."@smithy/util-utf8-2.3.0"
-          ];
-        }
-      )
-      (
-        sources."@aws-crypto/sha256-browser-5.2.0"
-        // {
-          dependencies = [
-            sources."@smithy/util-utf8-2.3.0"
-          ];
-        }
-      )
-      sources."@aws-crypto/sha256-js-5.2.0"
-      sources."@aws-crypto/supports-web-crypto-5.2.0"
-      (
-        sources."@aws-crypto/util-5.2.0"
-        // {
-          dependencies = [
-            sources."@smithy/util-utf8-2.3.0"
-          ];
-        }
-      )
-      sources."@aws-sdk/client-s3-3.758.0"
-      sources."@aws-sdk/client-sso-3.758.0"
-      sources."@aws-sdk/client-sts-3.758.0"
-      sources."@aws-sdk/core-3.758.0"
-      sources."@aws-sdk/credential-provider-env-3.758.0"
-      sources."@aws-sdk/credential-provider-http-3.758.0"
-      sources."@aws-sdk/credential-provider-ini-3.758.0"
-      sources."@aws-sdk/credential-provider-node-3.758.0"
-      sources."@aws-sdk/credential-provider-process-3.758.0"
-      sources."@aws-sdk/credential-provider-sso-3.758.0"
-      sources."@aws-sdk/credential-provider-web-identity-3.758.0"
-      (
-        sources."@aws-sdk/lib-storage-3.758.0"
-        // {
-          dependencies = [
-            sources."buffer-5.6.0"
-          ];
-        }
-      )
-      sources."@aws-sdk/middleware-bucket-endpoint-3.734.0"
-      sources."@aws-sdk/middleware-expect-continue-3.734.0"
-      (
-        sources."@aws-sdk/middleware-flexible-checksums-3.758.0"
-        // {
-          dependencies = [
-            sources."@smithy/is-array-buffer-4.0.0"
-          ];
-        }
-      )
-      sources."@aws-sdk/middleware-host-header-3.734.0"
-      sources."@aws-sdk/middleware-location-constraint-3.734.0"
-      sources."@aws-sdk/middleware-logger-3.734.0"
-      sources."@aws-sdk/middleware-recursion-detection-3.734.0"
-      sources."@aws-sdk/middleware-sdk-s3-3.758.0"
-      sources."@aws-sdk/middleware-ssec-3.734.0"
-      sources."@aws-sdk/middleware-user-agent-3.758.0"
-      sources."@aws-sdk/nested-clients-3.758.0"
-      sources."@aws-sdk/region-config-resolver-3.734.0"
-      sources."@aws-sdk/s3-presigned-post-3.758.0"
-      sources."@aws-sdk/s3-request-presigner-3.758.0"
-      sources."@aws-sdk/signature-v4-multi-region-3.758.0"
-      sources."@aws-sdk/token-providers-3.758.0"
-      sources."@aws-sdk/types-3.734.0"
-      sources."@aws-sdk/util-arn-parser-3.723.0"
-      sources."@aws-sdk/util-endpoints-3.743.0"
-      sources."@aws-sdk/util-format-url-3.734.0"
-      sources."@aws-sdk/util-locate-window-3.723.0"
-      sources."@aws-sdk/util-user-agent-browser-3.734.0"
-      sources."@aws-sdk/util-user-agent-node-3.758.0"
-      sources."@aws-sdk/util-utf8-browser-3.259.0"
-      sources."@aws-sdk/xml-builder-3.734.0"
-      sources."@buttercup/fetch-0.2.1"
-      sources."@httptoolkit/websocket-stream-6.0.1"
-      sources."@ioredis/commands-1.2.0"
-      sources."@opentelemetry/api-1.9.0"
-      sources."@sindresorhus/is-5.6.0"
-      sources."@smithy/abort-controller-4.0.1"
-      sources."@smithy/chunked-blob-reader-5.0.0"
-      sources."@smithy/chunked-blob-reader-native-4.0.0"
-      sources."@smithy/config-resolver-4.0.1"
-      sources."@smithy/core-3.1.5"
-      sources."@smithy/credential-provider-imds-4.0.1"
-      sources."@smithy/eventstream-codec-4.0.1"
-      sources."@smithy/eventstream-serde-browser-4.0.1"
-      sources."@smithy/eventstream-serde-config-resolver-4.0.1"
-      sources."@smithy/eventstream-serde-node-4.0.1"
-      sources."@smithy/eventstream-serde-universal-4.0.1"
-      sources."@smithy/fetch-http-handler-5.0.1"
-      sources."@smithy/hash-blob-browser-4.0.1"
-      (
-        sources."@smithy/hash-node-4.0.1"
-        // {
-          dependencies = [
-            sources."@smithy/is-array-buffer-4.0.0"
-            sources."@smithy/util-buffer-from-4.0.0"
-          ];
-        }
-      )
-      sources."@smithy/hash-stream-node-4.0.1"
-      sources."@smithy/invalid-dependency-4.0.1"
-      sources."@smithy/is-array-buffer-2.2.0"
-      sources."@smithy/md5-js-4.0.1"
-      sources."@smithy/middleware-content-length-4.0.1"
-      sources."@smithy/middleware-endpoint-4.0.6"
-      sources."@smithy/middleware-retry-4.0.7"
-      sources."@smithy/middleware-serde-4.0.2"
-      sources."@smithy/middleware-stack-4.0.1"
-      sources."@smithy/node-config-provider-4.0.1"
-      sources."@smithy/node-http-handler-4.0.3"
-      sources."@smithy/property-provider-4.0.1"
-      sources."@smithy/protocol-http-5.0.1"
-      sources."@smithy/querystring-builder-4.0.1"
-      sources."@smithy/querystring-parser-4.0.1"
-      sources."@smithy/service-error-classification-4.0.1"
-      sources."@smithy/shared-ini-file-loader-4.0.1"
-      (
-        sources."@smithy/signature-v4-5.0.1"
-        // {
-          dependencies = [
-            sources."@smithy/is-array-buffer-4.0.0"
-          ];
-        }
-      )
-      sources."@smithy/smithy-client-4.1.6"
-      sources."@smithy/types-4.1.0"
-      sources."@smithy/url-parser-4.0.1"
-      (
-        sources."@smithy/util-base64-4.0.0"
-        // {
-          dependencies = [
-            sources."@smithy/is-array-buffer-4.0.0"
-            sources."@smithy/util-buffer-from-4.0.0"
-          ];
-        }
-      )
-      sources."@smithy/util-body-length-browser-4.0.0"
-      sources."@smithy/util-body-length-node-4.0.0"
-      sources."@smithy/util-buffer-from-2.2.0"
-      sources."@smithy/util-config-provider-4.0.0"
-      sources."@smithy/util-defaults-mode-browser-4.0.7"
-      sources."@smithy/util-defaults-mode-node-4.0.7"
-      sources."@smithy/util-endpoints-3.0.1"
-      sources."@smithy/util-hex-encoding-4.0.0"
-      sources."@smithy/util-middleware-4.0.1"
-      sources."@smithy/util-retry-4.0.1"
-      (
-        sources."@smithy/util-stream-4.1.2"
-        // {
-          dependencies = [
-            sources."@smithy/is-array-buffer-4.0.0"
-            sources."@smithy/util-buffer-from-4.0.0"
-          ];
-        }
-      )
-      sources."@smithy/util-uri-escape-4.0.0"
-      (
-        sources."@smithy/util-utf8-4.0.0"
-        // {
-          dependencies = [
-            sources."@smithy/is-array-buffer-4.0.0"
-            sources."@smithy/util-buffer-from-4.0.0"
-          ];
-        }
-      )
-      sources."@smithy/util-waiter-4.0.2"
-      sources."@szmarczak/http-timer-5.0.1"
-      sources."@types/body-parser-1.19.5"
-      sources."@types/connect-3.4.38"
-      sources."@types/express-4.17.21"
-      sources."@types/express-serve-static-core-4.19.6"
-      sources."@types/http-cache-semantics-4.0.4"
-      sources."@types/http-errors-2.0.4"
-      sources."@types/mime-1.3.5"
-      sources."@types/node-22.13.10"
-      sources."@types/qs-6.9.18"
-      sources."@types/range-parser-1.2.7"
-      sources."@types/send-0.17.4"
-      sources."@types/serve-static-1.15.7"
-      sources."@types/ws-8.18.0"
-      sources."accepts-1.3.8"
-      sources."array-flatten-1.1.1"
-      sources."asynckit-0.4.0"
-      sources."aws-crt-1.26.2"
-      sources."axios-1.8.3"
-      sources."balanced-match-1.0.2"
-      sources."base-64-1.0.0"
-      sources."base64-js-1.5.1"
-      (
-        sources."basic-auth-2.0.1"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      sources."bintrees-1.0.2"
-      (
-        sources."bl-4.1.0"
-        // {
-          dependencies = [
-            sources."buffer-5.7.1"
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      (
-        sources."body-parser-1.20.3"
-        // {
-          dependencies = [
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      sources."bowser-2.11.0"
-      sources."brace-expansion-1.1.11"
-      sources."buffer-6.0.3"
-      sources."buffer-equal-constant-time-1.0.1"
-      sources."buffer-from-1.1.2"
-      sources."bufferutil-4.0.9"
-      sources."byte-length-1.0.2"
-      sources."bytes-3.1.2"
-      sources."cacheable-lookup-7.0.0"
-      sources."cacheable-request-10.2.14"
-      sources."call-bind-apply-helpers-1.0.2"
-      sources."call-bound-1.0.4"
-      sources."charenc-0.0.2"
-      sources."cluster-key-slot-1.1.2"
-      sources."combine-errors-3.0.3"
-      sources."combined-stream-1.0.8"
-      sources."commist-1.1.0"
-      sources."common-tags-1.8.2"
-      sources."concat-map-0.0.1"
-      (
-        sources."concat-stream-2.0.0"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."connect-redis-7.1.1"
-      sources."content-disposition-0.5.4"
-      sources."content-type-1.0.5"
-      sources."cookie-0.4.1"
-      sources."cookie-parser-1.4.6"
-      sources."cookie-signature-1.0.6"
-      sources."core-util-is-1.0.3"
-      sources."cors-2.8.5"
-      sources."cron-parser-4.9.0"
-      sources."crypt-0.0.2"
-      sources."crypto-js-4.2.0"
-      sources."custom-error-instance-2.1.1"
-      sources."data-uri-to-buffer-4.0.1"
-      sources."debug-4.4.0"
-      (
-        sources."decompress-response-6.0.0"
-        // {
-          dependencies = [
-            sources."mimic-response-3.1.0"
-          ];
-        }
-      )
-      sources."defer-to-connect-2.0.1"
-      sources."delayed-stream-1.0.0"
-      sources."denque-2.1.0"
-      sources."depd-2.0.0"
-      sources."destroy-1.2.0"
-      sources."dunder-proto-1.0.1"
-      sources."duplexify-3.7.1"
-      sources."ecdsa-sig-formatter-1.0.11"
-      sources."ee-first-1.1.1"
-      sources."encodeurl-2.0.0"
-      sources."end-of-stream-1.4.4"
-      sources."entities-5.0.0"
-      sources."es-define-property-1.0.1"
-      sources."es-errors-1.3.0"
-      sources."es-object-atoms-1.1.1"
-      sources."es-set-tostringtag-2.1.0"
-      sources."escape-goat-3.0.0"
-      sources."escape-html-1.0.3"
-      sources."escape-string-regexp-4.0.0"
-      sources."etag-1.8.1"
-      sources."events-3.3.0"
-      (
-        sources."express-4.21.2"
-        // {
-          dependencies = [
-            sources."cookie-0.7.1"
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      (
-        sources."express-interceptor-1.2.0"
-        // {
-          dependencies = [
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      sources."express-prom-bundle-7.0.0"
-      (
-        sources."express-session-1.18.1"
-        // {
-          dependencies = [
-            sources."cookie-0.7.2"
-            sources."cookie-signature-1.0.7"
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      sources."fast-safe-stringify-2.1.1"
-      sources."fast-xml-parser-4.4.1"
-      sources."fetch-blob-3.2.0"
-      (
-        sources."finalhandler-1.3.1"
-        // {
-          dependencies = [
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-          ];
-        }
-      )
-      sources."follow-redirects-1.15.9"
-      sources."form-data-4.0.2"
-      sources."form-data-encoder-2.1.4"
-      sources."formdata-polyfill-4.0.10"
-      sources."forwarded-0.2.0"
-      sources."fresh-0.5.2"
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.2"
-      sources."get-intrinsic-1.3.0"
-      sources."get-proto-1.0.1"
-      sources."get-stream-6.0.1"
-      sources."glob-7.2.3"
-      sources."gopd-1.2.0"
-      sources."got-13.0.0"
-      sources."graceful-fs-4.2.11"
-      sources."grant-5.4.22"
-      sources."has-flag-4.0.0"
-      sources."has-symbols-1.1.0"
-      sources."has-tostringtag-1.0.2"
-      sources."hasown-2.0.2"
-      sources."helmet-7.2.0"
-      (
-        sources."help-me-3.0.0"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."hot-patcher-2.0.1"
-      sources."http-cache-semantics-4.1.1"
-      sources."http-errors-2.0.0"
-      sources."http2-wrapper-2.2.1"
-      sources."iconv-lite-0.4.24"
-      sources."ieee754-1.2.1"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ioredis-5.6.0"
-      sources."ipaddr.js-2.2.0"
-      sources."is-buffer-1.1.6"
-      sources."is-stream-2.0.1"
-      sources."isarray-1.0.0"
-      sources."isomorphic-ws-4.0.1"
-      sources."js-base64-3.7.7"
-      sources."js-sdsl-4.3.0"
-      sources."json-buffer-3.0.1"
-      sources."jsonwebtoken-9.0.2"
-      sources."jwa-1.4.1"
-      sources."jws-3.2.2"
-      sources."keyv-4.5.4"
-      sources."layerr-3.0.0"
-      sources."leven-2.1.0"
-      sources."lodash-4.17.21"
-      sources."lodash._baseiteratee-4.7.0"
-      sources."lodash._basetostring-4.12.0"
-      sources."lodash._baseuniq-4.6.0"
-      sources."lodash._createset-4.0.3"
-      sources."lodash._root-3.0.1"
-      sources."lodash._stringtopath-4.8.0"
-      sources."lodash.defaults-4.2.0"
-      sources."lodash.includes-4.3.0"
-      sources."lodash.isarguments-3.1.0"
-      sources."lodash.isboolean-3.0.3"
-      sources."lodash.isinteger-4.0.4"
-      sources."lodash.isnumber-3.0.3"
-      sources."lodash.isplainobject-4.0.6"
-      sources."lodash.isstring-4.0.1"
-      sources."lodash.once-4.1.1"
-      sources."lodash.throttle-4.1.1"
-      sources."lodash.uniqby-4.5.0"
-      sources."long-timeout-0.1.1"
-      sources."lowercase-keys-3.0.0"
-      sources."lru-cache-6.0.0"
-      sources."luxon-3.5.0"
-      sources."math-intrinsics-1.1.0"
-      sources."md5-2.3.0"
-      sources."media-typer-0.3.0"
-      sources."merge-descriptors-1.0.3"
-      sources."methods-1.1.2"
-      sources."mime-1.6.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."mimic-response-4.0.0"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."moment-2.30.1"
-      sources."moment-timezone-0.5.47"
-      (
-        sources."morgan-1.10.0"
-        // {
-          dependencies = [
-            sources."debug-2.6.9"
-            sources."ms-2.0.0"
-            sources."on-finished-2.3.0"
-          ];
-        }
-      )
-      (
-        sources."mqtt-4.3.8"
-        // {
-          dependencies = [
-            sources."duplexify-4.1.3"
-            sources."readable-stream-3.6.2"
-            sources."ws-7.5.10"
-          ];
-        }
-      )
-      sources."mqtt-packet-6.10.0"
-      sources."ms-2.1.3"
-      sources."negotiator-0.6.3"
-      sources."nested-property-4.0.0"
-      sources."node-domexception-1.0.0"
-      sources."node-fetch-3.3.2"
-      sources."node-gyp-build-4.8.4"
-      sources."node-schedule-2.1.1"
-      sources."normalize-url-8.0.1"
-      sources."number-allocator-1.0.14"
-      sources."oauth-sign-0.9.0"
-      sources."object-assign-4.1.1"
-      sources."object-inspect-1.13.4"
-      sources."on-finished-2.4.1"
-      sources."on-headers-1.0.2"
-      sources."once-1.4.0"
-      sources."p-cancelable-3.0.0"
-      sources."parseurl-1.3.3"
-      sources."path-is-absolute-1.0.1"
-      sources."path-posix-1.0.0"
-      sources."path-to-regexp-0.1.12"
-      sources."process-0.11.10"
-      sources."process-nextick-args-2.0.1"
-      sources."prom-client-15.1.2"
-      sources."proper-lockfile-4.1.2"
-      (
-        sources."proxy-addr-2.0.7"
-        // {
-          dependencies = [
-            sources."ipaddr.js-1.9.1"
-          ];
-        }
-      )
-      sources."proxy-from-env-1.1.0"
-      sources."pump-3.0.2"
-      sources."qs-6.13.0"
-      sources."querystringify-2.2.0"
-      sources."quick-lru-5.1.1"
-      sources."random-bytes-1.0.0"
-      sources."randombytes-2.1.0"
-      sources."range-parser-1.2.1"
-      sources."raw-body-2.5.2"
-      (
-        sources."readable-stream-2.3.8"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      sources."redis-errors-1.2.0"
-      sources."redis-parser-3.0.0"
-      sources."reinterval-1.1.0"
-      sources."request-compose-2.1.7"
-      (
-        sources."request-oauth-1.0.1"
-        // {
-          dependencies = [
-            sources."uuid-8.3.2"
-          ];
-        }
-      )
-      sources."requires-port-1.0.0"
-      sources."resolve-alpn-1.2.1"
-      sources."responselike-3.0.0"
-      sources."retry-0.12.0"
-      sources."rfdc-1.4.1"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."semver-7.7.1"
-      (
-        sources."send-0.19.0"
-        // {
-          dependencies = [
-            (
-              sources."debug-2.6.9"
-              // {
-                dependencies = [
-                  sources."ms-2.0.0"
-                ];
-              }
-            )
-            sources."encodeurl-1.0.2"
-          ];
-        }
-      )
-      sources."serialize-error-11.0.3"
-      sources."serialize-javascript-6.0.2"
-      sources."serve-static-1.16.2"
-      sources."setprototypeof-1.2.0"
-      sources."side-channel-1.1.0"
-      sources."side-channel-list-1.0.0"
-      sources."side-channel-map-1.0.1"
-      sources."side-channel-weakmap-1.0.2"
-      sources."signal-exit-3.0.7"
-      sources."sorted-array-functions-1.3.0"
-      (
-        sources."split2-3.2.2"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."standard-as-callback-2.1.0"
-      sources."statuses-2.0.1"
-      (
-        sources."stream-browserify-3.0.0"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."stream-shift-1.0.3"
-      (
-        sources."string_decoder-1.1.1"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      sources."strnum-1.1.2"
-      sources."supports-color-8.1.1"
-      sources."tdigest-0.1.2"
-      sources."toidentifier-1.0.1"
-      sources."tslib-2.8.1"
-      sources."tus-js-client-4.3.1"
-      sources."type-fest-2.19.0"
-      sources."type-is-1.6.18"
-      sources."typedarray-0.0.6"
-      sources."uid-safe-2.1.5"
-      sources."undici-types-6.20.0"
-      sources."unpipe-1.0.0"
-      sources."url-join-5.0.0"
-      sources."url-parse-1.5.10"
-      sources."url-value-parser-2.2.0"
-      sources."utf-8-validate-5.0.10"
-      sources."util-deprecate-1.0.2"
-      sources."utils-merge-1.0.1"
-      sources."uuid-9.0.1"
-      sources."validator-13.12.0"
-      sources."vary-1.1.2"
-      sources."web-streams-polyfill-3.3.3"
-      (
-        sources."webdav-5.7.1"
-        // {
-          dependencies = [
-            sources."brace-expansion-2.0.1"
-            sources."minimatch-9.0.5"
-          ];
-        }
-      )
-      sources."wrappy-1.0.2"
-      sources."ws-8.17.1"
-      sources."xtend-4.0.2"
-      sources."yallist-4.0.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "OAuth helper and remote fetcher for Uppy's (https://uppy.io) extensible file upload widget with support for drag&drop, resumable uploads, previews, restrictions, file processing/encoding, remote providers like Dropbox and Google Drive, S3 and more :dog:";
-      homepage = "https://github.com/transloadit/uppy#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   "@webassemblyjs/cli-1.11.1" = nodeEnv.buildNodePackage {
     name = "_at_webassemblyjs_slash_cli";
     packageName = "@webassemblyjs/cli";
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index 805f464bd465..afdcd913b076 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -191,10 +191,6 @@ final: prev: {
     '';
   };
 
-  uppy-companion = prev."@uppy/companion".override {
-    name = "uppy-companion";
-  };
-
   vega-cli = prev.vega-cli.override {
     nativeBuildInputs = [ pkgs.pkg-config ];
     buildInputs = with pkgs; [
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 2f82ca15311b..207202790f36 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2393,8 +2393,6 @@ with pkgs;
 
   unify = with python3Packages; toPythonApplication unify;
 
-  inherit (nodePackages) uppy-companion;
-
   usb-modeswitch-data = callPackage ../by-name/us/usb-modeswitch/data.nix { };
 
   persistent-evdev = python3Packages.callPackage ../servers/persistent-evdev { };

From df88f4baacc88de547e60ea400301b87b586cffd Mon Sep 17 00:00:00 2001
From: Oskar <115482671+oskarwires@users.noreply.github.com>
Date: Tue, 4 Nov 2025 14:15:06 +0000
Subject: [PATCH 5357/6226] maintainers: add oskarwires

---
 maintainers/maintainer-list.nix                        | 6 ++++++
 pkgs/development/python-modules/cocotb-bus/default.nix | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 3d52144b7468..3763d7df1b4f 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -19554,6 +19554,12 @@
     githubId = 52569953;
     name = "Oskar Manhart";
   };
+  oskarwires = {
+    email = "me@usbcable.io";
+    github = "oskarwires";
+    githubId = 115482671;
+    name = "Oskar";
+  };
   osnyx = {
     email = "os@flyingcircus.io";
     github = "osnyx";
diff --git a/pkgs/development/python-modules/cocotb-bus/default.nix b/pkgs/development/python-modules/cocotb-bus/default.nix
index 6e10559b3510..cfd90eb089b6 100644
--- a/pkgs/development/python-modules/cocotb-bus/default.nix
+++ b/pkgs/development/python-modules/cocotb-bus/default.nix
@@ -31,6 +31,6 @@ buildPythonPackage rec {
     description = "Pre-packaged testbenching tools and reusable bus interfaces for cocotb";
     homepage = "https://github.com/cocotb/cocotb-bus";
     license = licenses.bsd3;
-    maintainers = with maintainers; [ prusnak ];
+    maintainers = with maintainers; [ oskarwires ];
   };
 }

From 0c1da552f30d2a8640febfa1a31f7f6ed9b7147e Mon Sep 17 00:00:00 2001
From: Oskar <115482671+oskarwires@users.noreply.github.com>
Date: Mon, 3 Nov 2025 13:16:55 +0000
Subject: [PATCH 5358/6226] python3Packages.cocotb-bus: 0.2.1 ->
 unstable-2025-11-03

---
 .../python-modules/cocotb-bus/default.nix     | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/cocotb-bus/default.nix b/pkgs/development/python-modules/cocotb-bus/default.nix
index cfd90eb089b6..c817ebc5a3f2 100644
--- a/pkgs/development/python-modules/cocotb-bus/default.nix
+++ b/pkgs/development/python-modules/cocotb-bus/default.nix
@@ -1,24 +1,21 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "cocotb-bus";
-  version = "0.2.1";
+  version = "unstable-2025-11-03";
   format = "setuptools";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "a197aa4b0e0ad28469c8877b41b3fb2ec0206da9f491b9276d1578ce6dd8aa8d";
+  src = fetchFromGitHub {
+    owner = "cocotb";
+    repo = "cocotb-bus";
+    rev = "f72b989bde036e677d5e9ebab3a6a21bdfe43d09";
+    hash = "sha256-4j63kOjBd+iLA2EYqLTM0oKzKksOjH2UqNgDNFvWgYw=";
   };
 
-  postPatch = ''
-    # remove circular dependency cocotb from setup.py
-    substituteInPlace setup.py --replace '"cocotb>=1.5.0.dev,<2.0"' ""
-  '';
-
   # tests require cocotb, disable for now to avoid circular dependency
   doCheck = false;
 

From 5664a353a596bf8fab1064918a2b527b40ebd73f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 17:28:02 +0000
Subject: [PATCH 5359/6226] isle-portable: 0-unstable-2025-10-18 ->
 0-unstable-2025-11-03

---
 pkgs/by-name/is/isle-portable/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/is/isle-portable/package.nix b/pkgs/by-name/is/isle-portable/package.nix
index 82349c4ab717..390eb09089a1 100644
--- a/pkgs/by-name/is/isle-portable/package.nix
+++ b/pkgs/by-name/is/isle-portable/package.nix
@@ -29,13 +29,13 @@
 stdenv.mkDerivation (finalAttrs: {
   strictDeps = true;
   name = "isle-portable";
-  version = "0-unstable-2025-10-18";
+  version = "0-unstable-2025-11-03";
 
   src = fetchFromGitHub {
     owner = "isledecomp";
     repo = "isle-portable";
-    rev = "b06f05ccf908e208bf8d139ac8adee0e6905803d";
-    hash = "sha256-VOfUK2kiTEQdkhO2cVyec3nJ5V3dbqFG0HPr6dOTVMs=";
+    rev = "d6aaa6b9daf3dd2a858ec127bbb14099bb3886b4";
+    hash = "sha256-azNB3oVQl4yxr4LG0NUY8XomWphlizpf6bqmfcrMqsw=";
     fetchSubmodules = true;
   };
 

From 408f16c791dcd754b2b093d5bd066602ba1f05dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 17:28:13 +0000
Subject: [PATCH 5360/6226] grafanaPlugins.grafana-metricsdrilldown-app: 1.0.19
 -> 1.0.20

---
 .../grafana/plugins/grafana-metricsdrilldown-app/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
index f421be271d8a..6cc805a77800 100644
--- a/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/grafana-metricsdrilldown-app/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "grafana-metricsdrilldown-app";
-  version = "1.0.19";
-  zipHash = "sha256-rnBT10qZCeWdCMNHCFN2yLfIJUCkneIo0IIhj6xxKew=";
+  version = "1.0.20";
+  zipHash = "sha256-dRIUWFmQ3r39nMHJ9pnCgjrOENQhuoKKSoZeFKNW0YM=";
   meta = with lib; {
     description = "Queryless experience for browsing Prometheus-compatible metrics. Quickly find related metrics without writing PromQL queries";
     license = licenses.agpl3Only;

From 883a2a6f790f97fe9df92045f20f609dc6fe32e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 17:31:16 +0000
Subject: [PATCH 5361/6226] vscode-extensions.detachhead.basedpyright: 1.32.0
 -> 1.32.1

---
 .../vscode/extensions/detachhead.basedpyright/default.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
index 073dfde6be65..5b6bdc7566e4 100644
--- a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix
@@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "basedpyright";
     publisher = "detachhead";
-    version = "1.32.0";
-    hash = "sha256-Lf7sg67i0FFvHSZ9Cw6RT+ECzFF+lNYH2hxzrss1+fg=";
+    version = "1.32.1";
+    hash = "sha256-nipb8ilZ43V/7WnDO0Lo7ctFdjAmHtH0WUkupFUSlMQ=";
   };
   meta = {
     changelog = "https://github.com/detachhead/basedpyright/releases";

From fc70de6505fc12e2a3faf9e2f7564199d4dd71c4 Mon Sep 17 00:00:00 2001
From: Leona Maroni <dev@leona.is>
Date: Tue, 4 Nov 2025 18:27:23 +0100
Subject: [PATCH 5362/6226] openjfx21: use gradle_8 instead of gradle_7 to fix
 build

gradle_7 is marked as insecure, but openjfx21 still builds fine.
openjfx17 still requires gradle_7.
---
 pkgs/by-name/op/openjfx/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/openjfx/package.nix b/pkgs/by-name/op/openjfx/package.nix
index 0b15ba7706c6..54bb72f34520 100644
--- a/pkgs/by-name/op/openjfx/package.nix
+++ b/pkgs/by-name/op/openjfx/package.nix
@@ -57,7 +57,7 @@ let
   atLeast21 = lib.versionAtLeast featureVersion "21";
   atLeast23 = lib.versionAtLeast featureVersion "23";
 
-  gradle_openjfx = if atLeast23 then gradle_8 else gradle_7;
+  gradle_openjfx = if atLeast21 then gradle_8 else gradle_7;
 in
 
 assert lib.assertMsg (lib.pathExists sourceFile)

From 8297f360bbc7566454029ccbf05fe0649a8e75cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 17:40:57 +0000
Subject: [PATCH 5363/6226] python3Packages.types-aiobotocore: 2.25.0 -> 2.25.1

---
 pkgs/development/python-modules/types-aiobotocore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/types-aiobotocore/default.nix b/pkgs/development/python-modules/types-aiobotocore/default.nix
index 82b27593cd0a..25eab703270c 100644
--- a/pkgs/development/python-modules/types-aiobotocore/default.nix
+++ b/pkgs/development/python-modules/types-aiobotocore/default.nix
@@ -364,13 +364,13 @@
 
 buildPythonPackage rec {
   pname = "types-aiobotocore";
-  version = "2.25.0";
+  version = "2.25.1";
   pyproject = true;
 
   src = fetchPypi {
     pname = "types_aiobotocore";
     inherit version;
-    hash = "sha256-fl6WVok11SVQlbX4qu3AwbJldwomCiq27X1Mfqf+gig=";
+    hash = "sha256-Ez09uRNW5T5LIs33RaOS2MBSc4MnPwTUxr0LCkQyDMo=";
   };
 
   build-system = [ setuptools ];

From a4a7cda37126fe9d981fe44968fc8d4e719ffb86 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 17:42:06 +0000
Subject: [PATCH 5364/6226] librewolf-unwrapped: 144.0 -> 144.0.2

---
 .../networking/browsers/librewolf/src.json             | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/networking/browsers/librewolf/src.json b/pkgs/applications/networking/browsers/librewolf/src.json
index f6708469edda..ce0d83ce9482 100644
--- a/pkgs/applications/networking/browsers/librewolf/src.json
+++ b/pkgs/applications/networking/browsers/librewolf/src.json
@@ -1,11 +1,11 @@
 {
-  "packageVersion": "144.0-1",
+  "packageVersion": "144.0.2-1",
   "source": {
-    "rev": "144.0-1",
-    "hash": "sha256-5LE8VUKQUua8l/mZN8a7MQCr3uPWJuFZ2WfhJyt14bE="
+    "rev": "144.0.2-1",
+    "hash": "sha256-cSuLUia4hlpSKrl+smWiDg1MUKOwymhizkAwc9ReEXs="
   },
   "firefox": {
-    "version": "144.0",
-    "hash": "sha512-4fkk7QBqMfUzPqavIZwfuQ1IZuWImsY0wySj6AsEKn4LK5rreYZy6hpDT7+Bf8C4KhLsD7QFpI46LKIcw5REXg=="
+    "version": "144.0.2",
+    "hash": "sha512-h+66urLIXrMrLRFh5SD1bicaSJPIzU2CJfx7SYqYg0ljFYVKdYR4+07dBhZ0qffAUD6bnw60UDsfiSA3dNAvlw=="
   }
 }

From 5c644ee904683c3ef96d56dbc448720e0f876540 Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Tue, 4 Nov 2025 18:42:46 +0100
Subject: [PATCH 5365/6226] ocamlPackages.mopsa: fix propagated inputs

---
 pkgs/development/ocaml-modules/mopsa/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/ocaml-modules/mopsa/default.nix b/pkgs/development/ocaml-modules/mopsa/default.nix
index bccc33e7085a..3975ee9ec968 100644
--- a/pkgs/development/ocaml-modules/mopsa/default.nix
+++ b/pkgs/development/ocaml-modules/mopsa/default.nix
@@ -39,14 +39,14 @@ buildDunePackage rec {
   buildInputs = [
     arg-complete
     camlidl
-    flint
-    libclang
     mpfr
-    pplite
   ];
 
   propagatedBuildInputs = [
     apron
+    flint
+    libclang
+    pplite
     yojson
     zarith
   ];

From 8ead407530bda38afb818341e9f27f08841d9de7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 17:43:59 +0000
Subject: [PATCH 5366/6226] bkcrack: 1.8.0 -> 1.8.1

---
 pkgs/by-name/bk/bkcrack/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bk/bkcrack/package.nix b/pkgs/by-name/bk/bkcrack/package.nix
index 75c7ae1fb3bb..9e11a3a4e776 100644
--- a/pkgs/by-name/bk/bkcrack/package.nix
+++ b/pkgs/by-name/bk/bkcrack/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bkcrack";
-  version = "1.8.0";
+  version = "1.8.1";
 
   src = fetchFromGitHub {
     owner = "kimci86";
     repo = "bkcrack";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-MFY+YBw9cpmUHrL7fpop63ty0ZdESlAgrWRYwK0IowY=";
+    hash = "sha256-VZOHQzTsA/yfVhmrr4ISWnFif0o5an9w4gpRWS85ySU=";
   };
 
   passthru.updateScript = nix-update-script { };

From c540f5dd7b3d51c493312406f23ed8052ae7313e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 17:51:04 +0000
Subject: [PATCH 5367/6226] is-fast: 0.17.2 -> 0.17.7

---
 pkgs/by-name/is/is-fast/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/is/is-fast/package.nix b/pkgs/by-name/is/is-fast/package.nix
index 5e079a59b829..9eaeb5284714 100644
--- a/pkgs/by-name/is/is-fast/package.nix
+++ b/pkgs/by-name/is/is-fast/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "is-fast";
-  version = "0.17.2";
+  version = "0.17.7";
 
   src = fetchFromGitHub {
     owner = "Magic-JD";
     repo = "is-fast";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Wy5twHlCAlf/W12Y9a/IVFbsLuc8hkhH+5pBoL6Av0Y=";
+    hash = "sha256-9uq/MEa3t44pKBv8GaHDA8cZk8pI4ruFebVUWrPUxgc=";
   };
 
-  cargoHash = "sha256-EsB/Z8HwhYBQ8HDia0IJU3U0k9ZnR558Yrv1sYLUAZ0=";
+  cargoHash = "sha256-RMGrBLgFvJ8YBblWsPC41Eva7wPRM400jAM137waWUI=";
 
   nativeBuildInputs = [ pkg-config ];
 

From be1289081cc45ca9e3cee9585587a5da607342ac Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Tue, 4 Nov 2025 12:51:29 +0530
Subject: [PATCH 5368/6226] asciicam: refactor

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/as/asciicam/package.nix | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/as/asciicam/package.nix b/pkgs/by-name/as/asciicam/package.nix
index 8ece0bd7585d..414d2d811d3e 100644
--- a/pkgs/by-name/as/asciicam/package.nix
+++ b/pkgs/by-name/as/asciicam/package.nix
@@ -17,16 +17,14 @@ buildGoModule {
 
   vendorHash = "sha256-Qnt1wo/yKC3Ce4JoZBIWtXyzlkh4bWz9vyE349iRsjk=";
 
-  ldflags = [
-    "-s"
-    "-w"
-  ];
+  ldflags = [ "-s" ];
 
-  meta = with lib; {
+  meta = {
     description = "Displays your webcam on the terminal";
     homepage = "https://github.com/muesli/asciicam";
-    license = licenses.mit;
+    license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ phanirithvij ];
     mainProgram = "asciicam";
+    platforms = lib.platforms.linux;
   };
 }

From f4bb850669eca7acf02365fc3944d8c3c29baa55 Mon Sep 17 00:00:00 2001
From: Shawn8901 <shawn8901@googlemail.com>
Date: Tue, 4 Nov 2025 17:53:06 +0000
Subject: [PATCH 5369/6226] victoriametrics: 1.128.0 -> 1.129.1

---
 pkgs/by-name/vi/victoriametrics/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix
index 86ed9eb77f8f..43a9ddc37869 100644
--- a/pkgs/by-name/vi/victoriametrics/package.nix
+++ b/pkgs/by-name/vi/victoriametrics/package.nix
@@ -13,13 +13,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "VictoriaMetrics";
-  version = "1.128.0";
+  version = "1.129.1";
 
   src = fetchFromGitHub {
     owner = "VictoriaMetrics";
     repo = "VictoriaMetrics";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-X1TkE0lJNu68iETf8M8U5IZvRadtIPR6LqP61uzhD3Y=";
+    hash = "sha256-LLiiA+A3s3WcJcwyqRYKFn+VwaEbbufiawZsyG+ibGU=";
   };
 
   vendorHash = null;

From 260935802aeaeb81d6165e9a7ef282b5c4c686d4 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Tue, 21 Oct 2025 20:18:13 +0200
Subject: [PATCH 5370/6226] hwinfo: 23.5 -> 25.0

This upgrades hwinfo from 23.5 to 25.0. This includes a change to
Makefile which introduces INSTALL_PREFIX, which defaults to /usr.
Instead of replacing /usr we can now use an empty INSTALL_PREFIX.
---
 pkgs/by-name/hw/hwinfo/package.nix       | 12 +++++++-----
 pkgs/by-name/ni/nixos-facter/package.nix |  4 ++--
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/hw/hwinfo/package.nix b/pkgs/by-name/hw/hwinfo/package.nix
index 2a72312211fe..cbce9883b497 100644
--- a/pkgs/by-name/hw/hwinfo/package.nix
+++ b/pkgs/by-name/hw/hwinfo/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "hwinfo";
-  version = "23.5";
+  version = "25.0";
 
   src = fetchFromGitHub {
     owner = "opensuse";
     repo = "hwinfo";
     rev = finalAttrs.version;
-    hash = "sha256-OweEFxNxQpD7blHywhmHTA66vsYG+Qvsufm3huyUhi0=";
+    hash = "sha256-8C+FM4UAn219ZQzPxk2IfK6ZKmTZNweo4oCoSYeZJ6A=";
   };
 
   nativeBuildInputs = [
@@ -49,8 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     # Replace /usr paths with Nix store paths
     substituteInPlace Makefile \
-      --replace-fail "/sbin" "/bin" \
-      --replace-fail "/usr/" "/"
+      --replace-fail "/sbin" "/bin"
     substituteInPlace src/isdn/cdb/Makefile \
       --replace-fail "lex isdn_cdb.lex" "flex isdn_cdb.lex"
     substituteInPlace hwinfo.pc.in \
@@ -99,7 +98,10 @@ stdenv.mkDerivation (finalAttrs: {
     "CC=${stdenv.cc.targetPrefix}cc"
     "ARCH=${stdenv.hostPlatform.uname.processor}"
   ];
-  installFlags = [ "DESTDIR=$(out)" ];
+  installFlags = [
+    "INSTALL_PREFIX="
+    "DESTDIR=$(out)"
+  ];
 
   enableParallelBuilding = false; # broken parallel dependencies
 
diff --git a/pkgs/by-name/ni/nixos-facter/package.nix b/pkgs/by-name/ni/nixos-facter/package.nix
index 6b75db216fc4..92e4edc377c7 100644
--- a/pkgs/by-name/ni/nixos-facter/package.nix
+++ b/pkgs/by-name/ni/nixos-facter/package.nix
@@ -17,8 +17,8 @@ let
     src = fetchFromGitHub {
       owner = "numtide";
       repo = "hwinfo";
-      rev = "c2259845d10694c099fb306a8cfc5a403e71c708";
-      hash = "sha256-RGIoJkYiNMRHwUclzdRMELxCgBU9Pfvaghvt3op0zM0=";
+      rev = "bfeab0b4e38b200c7a62a44d4d01601a86fe1091";
+      hash = "sha256-GL3fNCSaU45fNihEksgtPtbuLkc+tVGXtPH05wbrHwI=";
     };
   };
 in

From 9a2098346146f4b7a2d8effd21237a99eec7b781 Mon Sep 17 00:00:00 2001
From: OPNA2608 <opna2608@protonmail.com>
Date: Tue, 4 Nov 2025 19:01:17 +0100
Subject: [PATCH 5371/6226] fire: Exclude from nixpkgs-update for now

---
 pkgs/by-name/fi/fire/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/fi/fire/package.nix b/pkgs/by-name/fi/fire/package.nix
index 4d250aa84026..67ea01bc1c43 100644
--- a/pkgs/by-name/fi/fire/package.nix
+++ b/pkgs/by-name/fi/fire/package.nix
@@ -78,6 +78,9 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "fire";
+  # 1.5.0b is considered a beta release of 1.5.0, but gitUpdater identifies 1.5.0b as the newer version
+  # Sanity checked manually. Drop this once running the updateScript doesn't produce a downgrade.
+  # nixpkgs-update: no auto update
   version = "1.5.0";
 
   src = fetchFromGitHub {

From 302d90822d2425accd025dfe001a6b4cfc67fa70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 18:10:44 +0000
Subject: [PATCH 5372/6226] spider: 2.37.159 -> 2.37.165

---
 pkgs/by-name/sp/spider/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sp/spider/package.nix b/pkgs/by-name/sp/spider/package.nix
index a93cd5a902ae..cd8e094daf05 100644
--- a/pkgs/by-name/sp/spider/package.nix
+++ b/pkgs/by-name/sp/spider/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "spider";
-  version = "2.37.159";
+  version = "2.37.165";
 
   src = fetchFromGitHub {
     owner = "spider-rs";
     repo = "spider";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5e6PK+PQnIEm7qpJGW8kmO6GugQMU3phWIsqFSGIj48=";
+    hash = "sha256-gwLm4bruiT7JXqS3bvYRVMHO5TLw1wvFWIfbewsnEGY=";
   };
 
-  cargoHash = "sha256-ffT8SQh6CjIqxMSGahGSiUha1e8wwUbbC3eTEUMx14s=";
+  cargoHash = "sha256-teZzDOsIDoUcGwCdY5P+/wdbI1hkfKkwNO+9VrIqdCA=";
 
   nativeBuildInputs = [
     pkg-config

From e6d383dcdef577fd3e9cd05767c45878c216c69c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Janne=20He=C3=9F?= <janne@hess.ooo>
Date: Tue, 4 Nov 2025 19:11:43 +0100
Subject: [PATCH 5373/6226] nixos/netbird-dashboard: Sync env with upstream

From here: https://github.com/netbirdio/dashboard/blob/main/docker/init_react_envs.sh#L69C1-L69C416
---
 nixos/modules/services/networking/netbird/dashboard.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/networking/netbird/dashboard.nix b/nixos/modules/services/networking/netbird/dashboard.nix
index bee3aeadd55e..3cddb34a8ac0 100644
--- a/nixos/modules/services/networking/netbird/dashboard.nix
+++ b/nixos/modules/services/networking/netbird/dashboard.nix
@@ -135,10 +135,12 @@ in
                 "$AUTH_SUPPORTED_SCOPES"
                 "$NETBIRD_DRAG_QUERY_PARAMS"
                 "$NETBIRD_GOOGLE_ANALYTICS_ID"
+                "$NETBIRD_GOOGLE_TAG_MANAGER_ID"
                 "$NETBIRD_HOTJAR_TRACK_ID"
                 "$NETBIRD_MGMT_API_ENDPOINT"
                 "$NETBIRD_MGMT_GRPC_API_ENDPOINT"
                 "$NETBIRD_TOKEN_SOURCE"
+                "$NETBIRD_WASM_PATH"
                 "$USE_AUTH0"
               ];
             }

From 99fccc2055cf4b938a6aabb13b3b4ef8e66a2be6 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sat, 25 Oct 2025 14:54:28 -0300
Subject: [PATCH 5374/6226] nanotts: fix build with cmake4, unbreak

---
 pkgs/by-name/na/nanotts/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/na/nanotts/package.nix b/pkgs/by-name/na/nanotts/package.nix
index c1a246a67262..bb6422750d1d 100644
--- a/pkgs/by-name/na/nanotts/package.nix
+++ b/pkgs/by-name/na/nanotts/package.nix
@@ -35,6 +35,10 @@ stdenv.mkDerivation {
   ];
 
   patchPhase = ''
+    # fix 64-bit compilation error in picoapi.c: picoos_uint32 vs picoos_objsize_t
+    substituteInPlace svoxpico/picoapi.c \
+      --replace-fail 'picoos_uint32 rest_mem_size;' 'picoos_objsize_t rest_mem_size;'
+
     substituteInPlace "src/main.cpp" --replace "/usr/share/pico/lang" "$out/share/lang"
     echo "" > update_build_version.sh
   '';
@@ -46,6 +50,11 @@ stdenv.mkDerivation {
       --set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib
   '';
 
+  postPatch = ''
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 3.3)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   meta = {
     description = "Speech synthesizer commandline utility that improves pico2wave, included with SVOX PicoTTS";
     homepage = "https://github.com/gmn/nanotts";

From 827fe1128aee3c6d7563f102b7c956e1e6d340b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Th=C3=A9o=20Bori?= <theo1.bori@epitech.eu>
Date: Tue, 4 Nov 2025 18:14:55 +0100
Subject: [PATCH 5375/6226] maintainers: update theobori

---
 maintainers/maintainer-list.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 62eae8512913..b955f0b08460 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -25895,10 +25895,10 @@
   };
   theobori = {
     name = "Théo Bori";
-    email = "theo1.bori@epitech.eu";
+    email = "theobori@disroot.org";
     github = "theobori";
     githubId = 71843723;
-    keys = [ { fingerprint = "EEFB CC3A C529 CFD1 943D  A75C BDD5 7BE9 9D55 5965"; } ];
+    keys = [ { fingerprint = "0636 56A5 6E31 5FFD BE46  8522 6D22 B068 2CCF 9294"; } ];
   };
   theonlymrcat = {
     name = "Max Guppy";

From 94ff260caa44d6f1c2a44219b84390643de06916 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 18:36:37 +0000
Subject: [PATCH 5376/6226] python3Packages.ucsmsdk: 0.9.23 -> 0.9.24

---
 pkgs/development/python-modules/ucsmsdk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ucsmsdk/default.nix b/pkgs/development/python-modules/ucsmsdk/default.nix
index a0ec0df2277b..3e983d5dacfb 100644
--- a/pkgs/development/python-modules/ucsmsdk/default.nix
+++ b/pkgs/development/python-modules/ucsmsdk/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "ucsmsdk";
-  version = "0.9.23";
+  version = "0.9.24";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CiscoUcs";
     repo = "ucsmsdk";
     tag = "v${version}";
-    hash = "sha256-UVOEJl+oSjf6gaVaa6QWBfEViUPmhgUiSm6rerkZ+EM=";
+    hash = "sha256-c2Tvm4xMyda9PoL7VWMCo7/RjSVcHBJQMh4GeTzgz5I=";
   };
 
   build-system = [ setuptools ];

From a42a3d6da3375a61e6e42c24f6454f55a4d7fffb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 18:43:42 +0000
Subject: [PATCH 5377/6226] usort: 1.0.8 -> 1.1.0

---
 pkgs/development/python-modules/usort/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/usort/default.nix b/pkgs/development/python-modules/usort/default.nix
index 3c522d4f7f8f..1e3dcaea1b3d 100644
--- a/pkgs/development/python-modules/usort/default.nix
+++ b/pkgs/development/python-modules/usort/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "usort";
-  version = "1.0.8";
+  version = "1.1.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "facebook";
     repo = "usort";
     tag = "v${version}";
-    hash = "sha256-iezq2K+Rw0djyOoFm7tguw/vkkDSyrPZIfZPmaZvFpM=";
+    hash = "sha256-QnhpnuEt6j/QPmX29A0523QDh4o2QfaCoDI0YJpTc8Y=";
   };
 
   nativeBuildInputs = [

From aeda960a06dca1e7139c590ff352da13d634f2aa Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Wed, 5 Nov 2025 00:12:36 +0530
Subject: [PATCH 5378/6226] asciinema-agg: add phanirithvij as maintainer

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/as/asciinema-agg/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/as/asciinema-agg/package.nix b/pkgs/by-name/as/asciinema-agg/package.nix
index 70a9fa8cb661..9ef7f7513b36 100644
--- a/pkgs/by-name/as/asciinema-agg/package.nix
+++ b/pkgs/by-name/as/asciinema-agg/package.nix
@@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/asciinema/agg";
     changelog = "https://github.com/asciinema/agg/releases/tag/${src.rev}";
     license = licenses.asl20;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ phanirithvij ];
     mainProgram = "agg";
   };
 }

From d412e7fa62f8945c98b59518f3b1cbf84c801e36 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Wed, 5 Nov 2025 00:12:56 +0530
Subject: [PATCH 5379/6226] asciinema-agg: refactor to finalAttrs

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/as/asciinema-agg/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/as/asciinema-agg/package.nix b/pkgs/by-name/as/asciinema-agg/package.nix
index 9ef7f7513b36..12d80c24ed45 100644
--- a/pkgs/by-name/as/asciinema-agg/package.nix
+++ b/pkgs/by-name/as/asciinema-agg/package.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "agg";
   version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "asciinema";
     repo = "agg";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-6UenPE6mmmvliaIuGdQj/FrlmoJvmBJgfo0hW+uRaxM=";
   };
 
@@ -19,12 +19,12 @@ rustPlatform.buildRustPackage rec {
 
   cargoHash = "sha256-VpbjvrMhzS1zrcMNWBjTLda6o3ea2cwpnEDUouwyp8w=";
 
-  meta = with lib; {
+  meta = {
     description = "Command-line tool for generating animated GIF files from asciicast v2 files produced by asciinema terminal recorder";
     homepage = "https://github.com/asciinema/agg";
-    changelog = "https://github.com/asciinema/agg/releases/tag/${src.rev}";
-    license = licenses.asl20;
+    changelog = "https://github.com/asciinema/agg/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
     maintainers = with lib.maintainers; [ phanirithvij ];
     mainProgram = "agg";
   };
-}
+})

From 0e83a63fe1857cba450587c4af5b5148aebd2907 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Wed, 5 Nov 2025 00:12:59 +0530
Subject: [PATCH 5380/6226] asciinema-agg: add versionCheckHook

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/as/asciinema-agg/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/as/asciinema-agg/package.nix b/pkgs/by-name/as/asciinema-agg/package.nix
index 12d80c24ed45..722988ea6fd6 100644
--- a/pkgs/by-name/as/asciinema-agg/package.nix
+++ b/pkgs/by-name/as/asciinema-agg/package.nix
@@ -2,6 +2,7 @@
   lib,
   rustPlatform,
   fetchFromGitHub,
+  versionCheckHook,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -19,6 +20,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-VpbjvrMhzS1zrcMNWBjTLda6o3ea2cwpnEDUouwyp8w=";
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
   meta = {
     description = "Command-line tool for generating animated GIF files from asciicast v2 files produced by asciinema terminal recorder";
     homepage = "https://github.com/asciinema/agg";

From a2d25c29f3a72d783ac1a31bafa0845213caaf7b Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Tue, 4 Nov 2025 13:46:19 -0500
Subject: [PATCH 5381/6226] nodePackages.webpack: drop

Not an end-user tool, also unused in nixpkgs, so drop it. Users should
use `webpack-cli` which is exposed in search if they want the cli
instead.
---
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 382 ------------------
 3 files changed, 1 insertion(+), 383 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index ede344e09c7d..9985c4d5271c 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -296,6 +296,7 @@ mapAliases {
   vue-language-server = self.vls; # added 2023-08-20
   vue-cli = throw "vue-cli has been removed since upstream no longer recommends using it; consider using create-vue and the new Vite-based tooling instead."; # added 2024-07-12
   inherit (pkgs) web-ext; # added 2023-08-20
+  webpack = throw "'webpack' has been removed because it is a library that should be imported within a Javascript project, not an end-user tool."; # Added 2025-11-04
   inherit (pkgs) webpack-cli; # added 2024-12-03
   webpack-dev-server = throw "webpack-dev-server has been removed. You should install it in your JS project instead."; # added 2024-12-05
   webtorrent-cli = throw "webtorrent-cli has been removed because it was broken"; # added 2025-03-12
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index a4d4d435c3e1..3a4374975da3 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -136,7 +136,6 @@
 , "vega-lite"
 , "vercel"
 , "wavedrom-cli"
-, "webpack"
 , "wring"
 , "@yaegassy/coc-nginx"
 ]
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 75848eff0811..ce62216d9777 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -3011,15 +3011,6 @@ let
         sha512 = "R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==";
       };
     };
-    "@jridgewell/source-map-0.3.6" = {
-      name = "_at_jridgewell_slash_source-map";
-      packageName = "@jridgewell/source-map";
-      version = "0.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz";
-        sha512 = "1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==";
-      };
-    };
     "@jridgewell/sourcemap-codec-1.5.0" = {
       name = "_at_jridgewell_slash_sourcemap-codec";
       packageName = "@jridgewell/sourcemap-codec";
@@ -5333,24 +5324,6 @@ let
         sha512 = "03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==";
       };
     };
-    "@types/eslint-9.6.1" = {
-      name = "_at_types_slash_eslint";
-      packageName = "@types/eslint";
-      version = "9.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz";
-        sha512 = "FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==";
-      };
-    };
-    "@types/eslint-scope-3.7.7" = {
-      name = "_at_types_slash_eslint-scope";
-      packageName = "@types/eslint-scope";
-      version = "3.7.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz";
-        sha512 = "MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==";
-      };
-    };
     "@types/estree-1.0.6" = {
       name = "_at_types_slash_estree";
       packageName = "@types/estree";
@@ -5999,15 +5972,6 @@ let
         sha512 = "ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==";
       };
     };
-    "@webassemblyjs/ast-1.14.1" = {
-      name = "_at_webassemblyjs_slash_ast";
-      packageName = "@webassemblyjs/ast";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz";
-        sha512 = "nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==";
-      };
-    };
     "@webassemblyjs/ast-1.8.1" = {
       name = "_at_webassemblyjs_slash_ast";
       packageName = "@webassemblyjs/ast";
@@ -6026,15 +5990,6 @@ let
         sha512 = "iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==";
       };
     };
-    "@webassemblyjs/floating-point-hex-parser-1.13.2" = {
-      name = "_at_webassemblyjs_slash_floating-point-hex-parser";
-      packageName = "@webassemblyjs/floating-point-hex-parser";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz";
-        sha512 = "6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==";
-      };
-    };
     "@webassemblyjs/floating-point-hex-parser-1.8.1" = {
       name = "_at_webassemblyjs_slash_floating-point-hex-parser";
       packageName = "@webassemblyjs/floating-point-hex-parser";
@@ -6053,15 +6008,6 @@ let
         sha512 = "RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==";
       };
     };
-    "@webassemblyjs/helper-api-error-1.13.2" = {
-      name = "_at_webassemblyjs_slash_helper-api-error";
-      packageName = "@webassemblyjs/helper-api-error";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz";
-        sha512 = "U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==";
-      };
-    };
     "@webassemblyjs/helper-api-error-1.8.1" = {
       name = "_at_webassemblyjs_slash_helper-api-error";
       packageName = "@webassemblyjs/helper-api-error";
@@ -6071,15 +6017,6 @@ let
         sha512 = "79RidFwQOl8vG+Wv1uQWfCw4JQO5XR8iQcNGKLum3oPsSG8jkuEK5ILT6NxT3MNOa+xwSd3d+YqVFB1V0/W7/w==";
       };
     };
-    "@webassemblyjs/helper-buffer-1.14.1" = {
-      name = "_at_webassemblyjs_slash_helper-buffer";
-      packageName = "@webassemblyjs/helper-buffer";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz";
-        sha512 = "jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==";
-      };
-    };
     "@webassemblyjs/helper-buffer-1.8.1" = {
       name = "_at_webassemblyjs_slash_helper-buffer";
       packageName = "@webassemblyjs/helper-buffer";
@@ -6161,15 +6098,6 @@ let
         sha512 = "vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==";
       };
     };
-    "@webassemblyjs/helper-numbers-1.13.2" = {
-      name = "_at_webassemblyjs_slash_helper-numbers";
-      packageName = "@webassemblyjs/helper-numbers";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz";
-        sha512 = "FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==";
-      };
-    };
     "@webassemblyjs/helper-wasm-bytecode-1.11.1" = {
       name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
       packageName = "@webassemblyjs/helper-wasm-bytecode";
@@ -6179,15 +6107,6 @@ let
         sha512 = "PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==";
       };
     };
-    "@webassemblyjs/helper-wasm-bytecode-1.13.2" = {
-      name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
-      packageName = "@webassemblyjs/helper-wasm-bytecode";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz";
-        sha512 = "3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==";
-      };
-    };
     "@webassemblyjs/helper-wasm-bytecode-1.8.1" = {
       name = "_at_webassemblyjs_slash_helper-wasm-bytecode";
       packageName = "@webassemblyjs/helper-wasm-bytecode";
@@ -6197,15 +6116,6 @@ let
         sha512 = "MDdqmxj6ea1qfHBLKVHaF2+IyWLQtw8+bvRaeZc4MtcO7dNBz/2cZZ/GCFN9kGTJVvhe37tkeCi2JAB3evoU2w==";
       };
     };
-    "@webassemblyjs/helper-wasm-section-1.14.1" = {
-      name = "_at_webassemblyjs_slash_helper-wasm-section";
-      packageName = "@webassemblyjs/helper-wasm-section";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz";
-        sha512 = "ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==";
-      };
-    };
     "@webassemblyjs/helper-wasm-section-1.8.1" = {
       name = "_at_webassemblyjs_slash_helper-wasm-section";
       packageName = "@webassemblyjs/helper-wasm-section";
@@ -6224,15 +6134,6 @@ let
         sha512 = "hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==";
       };
     };
-    "@webassemblyjs/ieee754-1.13.2" = {
-      name = "_at_webassemblyjs_slash_ieee754";
-      packageName = "@webassemblyjs/ieee754";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz";
-        sha512 = "4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==";
-      };
-    };
     "@webassemblyjs/ieee754-1.8.1" = {
       name = "_at_webassemblyjs_slash_ieee754";
       packageName = "@webassemblyjs/ieee754";
@@ -6251,15 +6152,6 @@ let
         sha512 = "BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==";
       };
     };
-    "@webassemblyjs/leb128-1.13.2" = {
-      name = "_at_webassemblyjs_slash_leb128";
-      packageName = "@webassemblyjs/leb128";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz";
-        sha512 = "Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==";
-      };
-    };
     "@webassemblyjs/leb128-1.8.1" = {
       name = "_at_webassemblyjs_slash_leb128";
       packageName = "@webassemblyjs/leb128";
@@ -6278,15 +6170,6 @@ let
         sha512 = "9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==";
       };
     };
-    "@webassemblyjs/utf8-1.13.2" = {
-      name = "_at_webassemblyjs_slash_utf8";
-      packageName = "@webassemblyjs/utf8";
-      version = "1.13.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz";
-        sha512 = "3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==";
-      };
-    };
     "@webassemblyjs/utf8-1.8.1" = {
       name = "_at_webassemblyjs_slash_utf8";
       packageName = "@webassemblyjs/utf8";
@@ -6305,24 +6188,6 @@ let
         sha512 = "qNByLv/qST8x4CshQ8vUuX/+OebI9gK+FHkGPMnLnwALKFJOG0jIxG8TXaf2L+fVHNyd96qhsZ/GL54G3KTjpg==";
       };
     };
-    "@webassemblyjs/wasm-edit-1.14.1" = {
-      name = "_at_webassemblyjs_slash_wasm-edit";
-      packageName = "@webassemblyjs/wasm-edit";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz";
-        sha512 = "RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==";
-      };
-    };
-    "@webassemblyjs/wasm-gen-1.14.1" = {
-      name = "_at_webassemblyjs_slash_wasm-gen";
-      packageName = "@webassemblyjs/wasm-gen";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz";
-        sha512 = "AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==";
-      };
-    };
     "@webassemblyjs/wasm-gen-1.8.1" = {
       name = "_at_webassemblyjs_slash_wasm-gen";
       packageName = "@webassemblyjs/wasm-gen";
@@ -6332,15 +6197,6 @@ let
         sha512 = "xOgoGf6rR6gHlhlNlU0EfMIgDAjbLCO2cNdEIKdGfKj2/fc02pbAyS3gYJ6EWAzSnL/XpAOf3Q/trp/EUeikug==";
       };
     };
-    "@webassemblyjs/wasm-opt-1.14.1" = {
-      name = "_at_webassemblyjs_slash_wasm-opt";
-      packageName = "@webassemblyjs/wasm-opt";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz";
-        sha512 = "PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==";
-      };
-    };
     "@webassemblyjs/wasm-parser-1.11.1" = {
       name = "_at_webassemblyjs_slash_wasm-parser";
       packageName = "@webassemblyjs/wasm-parser";
@@ -6350,15 +6206,6 @@ let
         sha512 = "rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==";
       };
     };
-    "@webassemblyjs/wasm-parser-1.14.1" = {
-      name = "_at_webassemblyjs_slash_wasm-parser";
-      packageName = "@webassemblyjs/wasm-parser";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz";
-        sha512 = "JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==";
-      };
-    };
     "@webassemblyjs/wasm-parser-1.8.1" = {
       name = "_at_webassemblyjs_slash_wasm-parser";
       packageName = "@webassemblyjs/wasm-parser";
@@ -6395,15 +6242,6 @@ let
         sha512 = "IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==";
       };
     };
-    "@webassemblyjs/wast-printer-1.14.1" = {
-      name = "_at_webassemblyjs_slash_wast-printer";
-      packageName = "@webassemblyjs/wast-printer";
-      version = "1.14.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz";
-        sha512 = "kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==";
-      };
-    };
     "@webassemblyjs/wast-printer-1.8.1" = {
       name = "_at_webassemblyjs_slash_wast-printer";
       packageName = "@webassemblyjs/wast-printer";
@@ -6926,15 +6764,6 @@ let
         sha512 = "vuBv+fm2s6cqUyey2A7qYcvsik+GMDJsw8BARP2sDE76cqmaZVarsvHf7Vx6VJ0Xk8gLl+u3MoAPf6gKzJefeA==";
       };
     };
-    "ajv-keywords-5.1.0" = {
-      name = "ajv-keywords";
-      packageName = "ajv-keywords";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz";
-        sha512 = "YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==";
-      };
-    };
     "amdefine-1.0.1" = {
       name = "amdefine";
       packageName = "amdefine";
@@ -13776,15 +13605,6 @@ let
         sha512 = "n6e4bsCpzsP0OB76X+vEWhySUQI8GHPVFVK+3QkX35tbryy2WoeGeK5kQ+oxzgDVHjIZyz5fyS60Mi3EpQLc0Q==";
       };
     };
-    "enhanced-resolve-5.18.1" = {
-      name = "enhanced-resolve";
-      packageName = "enhanced-resolve";
-      version = "5.18.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz";
-        sha512 = "ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==";
-      };
-    };
     "entities-1.0.0" = {
       name = "entities";
       packageName = "entities";
@@ -13956,15 +13776,6 @@ let
         sha512 = "cXLGjP0c4T3flZJKQSuziYoq7MlT+rnvfZjfp7h+I7K9BNX54kP9nyWvdbwjQ4u1iWbOL4u96fgeZLToQlZC7w==";
       };
     };
-    "es-module-lexer-1.6.0" = {
-      name = "es-module-lexer";
-      packageName = "es-module-lexer";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz";
-        sha512 = "qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==";
-      };
-    };
     "es-object-atoms-1.1.1" = {
       name = "es-object-atoms";
       packageName = "es-object-atoms";
@@ -14424,15 +14235,6 @@ let
         sha512 = "+TQ+x4JdTnDoFEXXb3fDvfGOwnyNV7duH8fXWTPD1ieaBmB8omj7Gw/pMBBu4uI2uJCCU8APDaQJzWuXnTsH4A==";
       };
     };
-    "eslint-scope-5.1.1" = {
-      name = "eslint-scope";
-      packageName = "eslint-scope";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz";
-        sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==";
-      };
-    };
     "eslint-scope-8.3.0" = {
       name = "eslint-scope";
       packageName = "eslint-scope";
@@ -16845,15 +16647,6 @@ let
         sha512 = "R8z6eTB55t3QeZMmU1C+Gv+t5UnNRkA55c5yo67fAVfxODxieTwsjNG7utxS/73NdP1NbDgCrhVEg2h00y4fFw==";
       };
     };
-    "glob-to-regexp-0.4.1" = {
-      name = "glob-to-regexp";
-      packageName = "glob-to-regexp";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz";
-        sha512 = "lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==";
-      };
-    };
     "glob-watcher-6.0.0" = {
       name = "glob-watcher";
       packageName = "glob-watcher";
@@ -20319,15 +20112,6 @@ let
         sha512 = "2P4SQ0HrLQ+fw6llpLnOaGAvN2Zu6778SJMrCUwns4fOoG9ayrTiZk3VV8sCPkVZF8ab0zksVpS8FDY5pRCNBA==";
       };
     };
-    "jest-worker-27.5.1" = {
-      name = "jest-worker";
-      packageName = "jest-worker";
-      version = "27.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz";
-        sha512 = "7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==";
-      };
-    };
     "jimp-0.16.13" = {
       name = "jimp";
       packageName = "jimp";
@@ -21660,15 +21444,6 @@ let
         sha512 = "OfCBkGEw4nN6JLtgRidPX6QxjBQGQf72q3si2uvqyFEMbycSFFHwAZeXx6cJgFM9wmLrf9zBwCP3Ivqa+LLZPw==";
       };
     };
-    "loader-runner-4.3.0" = {
-      name = "loader-runner";
-      packageName = "loader-runner";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz";
-        sha512 = "3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==";
-      };
-    };
     "loady-0.0.5" = {
       name = "loady";
       packageName = "loady";
@@ -31220,15 +30995,6 @@ let
         sha512 = "UOShsPwz7NrMUqhR6t0hWjFduvOzbtv7toDH1/hIrfRNIDBnnBWd0CwJTGvTpngVlmwGCdP9/Zl/tVrDqcuYzQ==";
       };
     };
-    "schema-utils-4.3.0" = {
-      name = "schema-utils";
-      packageName = "schema-utils";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.0.tgz";
-        sha512 = "Gf9qqc58SpCA/xdziiHz35F4GNIWYWZrEshUc/G/r5BnLph6xpKuLeoJoQuj5WfBIx/eQLf+hmVPYHaxJu7V2g==";
-      };
-    };
     "scoped-regex-3.0.0" = {
       name = "scoped-regex";
       packageName = "scoped-regex";
@@ -33884,24 +33650,6 @@ let
         sha512 = "flFL3m4wuixmf6IfhFJd1YPiLiMuxEc8uHRM1buzIeZPm22Au2pDqBJQgdo7n1WfPU1ONFGv7YDwpFBmHGF6lg==";
       };
     };
-    "terser-5.39.0" = {
-      name = "terser";
-      packageName = "terser";
-      version = "5.39.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/terser/-/terser-5.39.0.tgz";
-        sha512 = "LBAhFyLho16harJoWMg/nZsQYgTrg5jXOn2nCYjRUcZZEdE3qa2zb8QEDRUGVZBW4rlazf2fxkg8tztybTaqWw==";
-      };
-    };
-    "terser-webpack-plugin-5.3.14" = {
-      name = "terser-webpack-plugin";
-      packageName = "terser-webpack-plugin";
-      version = "5.3.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.14.tgz";
-        sha512 = "vkZjpUjb6OMS7dhV+tILUW6BhpDR7P2L/aQSAv+Uwk+m8KATX9EccViHTJR2qDtACKPIYndLGCyl3FMo+r2LMw==";
-      };
-    };
     "text-decoder-1.2.3" = {
       name = "text-decoder";
       packageName = "text-decoder";
@@ -36989,15 +36737,6 @@ let
         sha512 = "9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==";
       };
     };
-    "watchpack-2.4.2" = {
-      name = "watchpack";
-      packageName = "watchpack";
-      version = "2.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz";
-        sha512 = "TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==";
-      };
-    };
     "wavedrom-3.5.0" = {
       name = "wavedrom";
       packageName = "wavedrom";
@@ -37088,24 +36827,6 @@ let
         sha512 = "VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==";
       };
     };
-    "webpack-5.98.0" = {
-      name = "webpack";
-      packageName = "webpack";
-      version = "5.98.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz";
-        sha512 = "UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==";
-      };
-    };
-    "webpack-sources-3.2.3" = {
-      name = "webpack-sources";
-      packageName = "webpack-sources";
-      version = "3.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz";
-        sha512 = "/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==";
-      };
-    };
     "websocket-driver-0.7.4" = {
       name = "websocket-driver";
       packageName = "websocket-driver";
@@ -55610,109 +55331,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  webpack = nodeEnv.buildNodePackage {
-    name = "webpack";
-    packageName = "webpack";
-    version = "5.98.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz";
-      sha512 = "UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==";
-    };
-    dependencies = [
-      sources."@jridgewell/gen-mapping-0.3.8"
-      sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/source-map-0.3.6"
-      sources."@jridgewell/sourcemap-codec-1.5.0"
-      sources."@jridgewell/trace-mapping-0.3.25"
-      sources."@types/eslint-9.6.1"
-      sources."@types/eslint-scope-3.7.7"
-      sources."@types/estree-1.0.6"
-      sources."@types/json-schema-7.0.15"
-      sources."@types/node-22.13.10"
-      sources."@webassemblyjs/ast-1.14.1"
-      sources."@webassemblyjs/floating-point-hex-parser-1.13.2"
-      sources."@webassemblyjs/helper-api-error-1.13.2"
-      sources."@webassemblyjs/helper-buffer-1.14.1"
-      sources."@webassemblyjs/helper-numbers-1.13.2"
-      sources."@webassemblyjs/helper-wasm-bytecode-1.13.2"
-      sources."@webassemblyjs/helper-wasm-section-1.14.1"
-      sources."@webassemblyjs/ieee754-1.13.2"
-      sources."@webassemblyjs/leb128-1.13.2"
-      sources."@webassemblyjs/utf8-1.13.2"
-      sources."@webassemblyjs/wasm-edit-1.14.1"
-      sources."@webassemblyjs/wasm-gen-1.14.1"
-      sources."@webassemblyjs/wasm-opt-1.14.1"
-      sources."@webassemblyjs/wasm-parser-1.14.1"
-      sources."@webassemblyjs/wast-printer-1.14.1"
-      sources."@xtuc/ieee754-1.2.0"
-      sources."@xtuc/long-4.2.2"
-      sources."acorn-8.14.1"
-      sources."ajv-8.17.1"
-      sources."ajv-formats-2.1.1"
-      sources."ajv-keywords-5.1.0"
-      sources."browserslist-4.24.4"
-      sources."buffer-from-1.1.2"
-      sources."caniuse-lite-1.0.30001704"
-      sources."chrome-trace-event-1.0.4"
-      sources."commander-2.20.3"
-      sources."electron-to-chromium-1.5.118"
-      sources."enhanced-resolve-5.18.1"
-      sources."es-module-lexer-1.6.0"
-      sources."escalade-3.2.0"
-      sources."eslint-scope-5.1.1"
-      (
-        sources."esrecurse-4.3.0"
-        // {
-          dependencies = [
-            sources."estraverse-5.3.0"
-          ];
-        }
-      )
-      sources."estraverse-4.3.0"
-      sources."events-3.3.0"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-uri-3.0.6"
-      sources."glob-to-regexp-0.4.1"
-      sources."graceful-fs-4.2.11"
-      sources."has-flag-4.0.0"
-      sources."jest-worker-27.5.1"
-      sources."json-parse-even-better-errors-2.3.1"
-      sources."json-schema-traverse-1.0.0"
-      sources."loader-runner-4.3.0"
-      sources."merge-stream-2.0.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."neo-async-2.6.2"
-      sources."node-releases-2.0.19"
-      sources."picocolors-1.1.1"
-      sources."randombytes-2.1.0"
-      sources."require-from-string-2.0.2"
-      sources."safe-buffer-5.2.1"
-      sources."schema-utils-4.3.0"
-      sources."serialize-javascript-6.0.2"
-      sources."source-map-0.6.1"
-      sources."source-map-support-0.5.21"
-      sources."supports-color-8.1.1"
-      sources."tapable-2.2.1"
-      sources."terser-5.39.0"
-      sources."terser-webpack-plugin-5.3.14"
-      sources."undici-types-6.20.0"
-      sources."update-browserslist-db-1.1.3"
-      sources."watchpack-2.4.2"
-      sources."webpack-5.98.0"
-      sources."webpack-sources-3.2.3"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Packs ECMAScript/CommonJs/AMD modules for the browser. Allows you to split your codebase into multiple bundles, which can be loaded on demand. Supports loaders to preprocess files, i.e. json, jsx, es7, css, less, ... and your custom stuff";
-      homepage = "https://github.com/webpack/webpack";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   wring = nodeEnv.buildNodePackage {
     name = "wring";
     packageName = "wring";

From 551b0cbdfadde6df4654e69a34cbc0e7e4d1377e Mon Sep 17 00:00:00 2001
From: Robert Scott <code@humanleg.org.uk>
Date: Tue, 4 Nov 2025 18:47:00 +0000
Subject: [PATCH 5382/6226] nix-heuristic-gc: 0.6.2 -> 0.7.0

---
 pkgs/by-name/ni/nix-heuristic-gc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ni/nix-heuristic-gc/package.nix b/pkgs/by-name/ni/nix-heuristic-gc/package.nix
index daa817849c9d..4e1db4155390 100644
--- a/pkgs/by-name/ni/nix-heuristic-gc/package.nix
+++ b/pkgs/by-name/ni/nix-heuristic-gc/package.nix
@@ -9,13 +9,13 @@
 }:
 python3Packages.buildPythonPackage rec {
   pname = "nix-heuristic-gc";
-  version = "0.6.2";
+  version = "0.7.0";
   format = "setuptools";
   src = fetchFromGitHub {
     owner = "risicle";
     repo = "nix-heuristic-gc";
     tag = "v${version}";
-    hash = "sha256-FHA1/zlBUr81wSWL0Cd5DVsxUDuUpD3UuLde8UgxOzQ=";
+    hash = "sha256-xyenFPMwlDbkWohw+BX84gdLLR3A1/T7E9aH4MwBwXQ=";
   };
 
   # NIX_SYSTEM suggested at

From 114da65b1b0f6fa0ff43ec373e18d4badff22576 Mon Sep 17 00:00:00 2001
From: teutat3s <10206665+teutat3s@users.noreply.github.com>
Date: Tue, 4 Nov 2025 19:48:41 +0100
Subject: [PATCH 5383/6226] element-desktop: 1.12.2 -> 1.12.3

Release notes: https://github.com/element-hq/element-desktop/releases/tag/v1.12.3
Full changelog: https://github.com/element-hq/element-desktop/compare/v1.12.2...v1.12.3
---
 pkgs/by-name/el/element-desktop/element-desktop-pin.nix   | 6 +++---
 pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
index c3c1b7005e3c..a5034a0f1ae1 100644
--- a/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
+++ b/pkgs/by-name/el/element-desktop/element-desktop-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.12.2";
+  "version" = "1.12.3";
   "hashes" = {
-    "desktopSrcHash" = "sha256-P/pQpI3kyWGGZo1CK0nnkcg52jlVMrhGh8EFWWn0Euc=";
-    "desktopYarnHash" = "sha256-M6vz2u7MQuMW1ag3aJW6s2RI6rU6RC2aFEvVvKwtwaA=";
+    "desktopSrcHash" = "sha256-4pv6KxcTocguJo7DlBO+/pi+n8JbTHWukMtagaGaDy8=";
+    "desktopYarnHash" = "sha256-lQn5dAiC15O/2eaWfWJedFjBgmnglAlmAEOhz+in0DM=";
   };
 }
diff --git a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
index 0230c5e0b02b..f3f416350178 100644
--- a/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
+++ b/pkgs/by-name/el/element-web-unwrapped/element-web-pin.nix
@@ -1,7 +1,7 @@
 {
-  "version" = "1.12.2";
+  "version" = "1.12.3";
   "hashes" = {
-    "webSrcHash" = "sha256-f81axhmX3KRSzlvi7cST/QfmOySkLhTcDTlnpTETQ6c=";
-    "webYarnHash" = "sha256-NvFpyopXQ/ZI96f2kFN6tud4JkdBONgobkr9u9Rk4z4=";
+    "webSrcHash" = "sha256-a/RrUzJU/pjyD36WmNIqjSTBn5cfUOGNSe/l6iGp/0A=";
+    "webYarnHash" = "sha256-TXOehZRw5UIhGTnpR0KzvEizSW9Qk2VTr+cG/XstB+k=";
   };
 }

From 74d6ba3ab43c939a33965fbb7a59892b1c81bdce Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 4 Nov 2025 19:45:02 +0100
Subject: [PATCH 5384/6226] Revert "wprkflows/bot: increase frequency to every
 5 minutes"

This partially reverts commit 1197fe48da1d45506a3e95702ce5fb6437368598.

GitHub just doesn't schedule these narrow intervals. 10 minutes is
alright in practice.
---
 .github/workflows/bot.yml | 4 ++--
 ci/github-script/bot.js   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
index b60e9d5c2ed6..6366f666de13 100644
--- a/.github/workflows/bot.yml
+++ b/.github/workflows/bot.yml
@@ -7,9 +7,9 @@ name: Bot
 
 on:
   schedule:
-    # Run every 5m
+    # Run every 10m
     # i.e., at each of the listed minutes, every hour
-    - cron: '02,07,12,17,22,27,32,37,42,47,52,57 * * * *'
+    - cron: '05,15,25,35,45,55 * * * *'
   workflow_call:
     inputs:
       headBranch:
diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index 783d59ab51f4..fd5d4fa6df31 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -587,7 +587,7 @@ module.exports = async ({ github, context, core, dry }) => {
         state: 'open',
         sort: 'created',
         direction: 'asc',
-        per_page: 50,
+        per_page: 100,
         after: cursor,
       })
 

From 75911f6f8e0c66f7171e269cb6963aa6595fbf41 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 19:03:36 +0000
Subject: [PATCH 5385/6226] sniffnet: 1.4.1 -> 1.4.2

---
 pkgs/by-name/sn/sniffnet/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sn/sniffnet/package.nix b/pkgs/by-name/sn/sniffnet/package.nix
index 30f173f23310..6da62da38bc4 100644
--- a/pkgs/by-name/sn/sniffnet/package.nix
+++ b/pkgs/by-name/sn/sniffnet/package.nix
@@ -26,16 +26,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "sniffnet";
-  version = "1.4.1";
+  version = "1.4.2";
 
   src = fetchFromGitHub {
     owner = "gyulyvgc";
     repo = "sniffnet";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-EgnFDF+K8qGjunWB20VA8bXLzNvyGzcIaim+smhW5fU=";
+    hash = "sha256-LqEEh+YqFJkseLdFRfCTIK7Q3Xs0M1u+vVcxpNJntCA=";
   };
 
-  cargoHash = "sha256-22P1EeZ2FqwIHjr23oJCKvg3ggT1Me93goELwZ/B9S4=";
+  cargoHash = "sha256-iSQZxZTuSCNIB/725TO9UcvzKyA49DARoYcZh87y1Xs=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 3cce15be80763a115acb475ecd337831bbe658ae Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 26 Oct 2025 11:23:09 -0300
Subject: [PATCH 5386/6226] lzham: 1.0 -> 1.0-unstable-2023-05-14

---
 pkgs/by-name/lz/lzham/package.nix | 31 ++++++++++++++++++++-----------
 1 file changed, 20 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/lz/lzham/package.nix b/pkgs/by-name/lz/lzham/package.nix
index 025ac6ab6144..3daa1a6307ec 100644
--- a/pkgs/by-name/lz/lzham/package.nix
+++ b/pkgs/by-name/lz/lzham/package.nix
@@ -5,29 +5,38 @@
   cmake,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
   pname = "lzham";
-  version = "1.0";
+  version = "1.0-unstable-2023-05-14";
 
   src = fetchFromGitHub {
     owner = "richgel999";
-    repo = "lzham_codec";
-    rev = "v${lib.replaceStrings [ "." ] [ "_" ] version}_release";
-    sha256 = "14c1zvzmp1ylp4pgayfdfk1kqjb23xj4f7ll1ra7b18wjxc9ja1v";
+    repo = "lzham_codec_devel";
+    rev = "d09fc6676a0313c3814457fbc76351a68f653092";
+    hash = "sha256-zKzz4gEB2dkIIAuDhKGWeV1hn8tCMVILsiQ/gu6aAEE=";
   };
 
   nativeBuildInputs = [ cmake ];
 
-  installPhase = ''
-    mkdir -p $out/bin
-    cp ../bin_linux/lzhamtest $out/bin
+  cmakeFlags = [
+    "-DCMAKE_SKIP_RPATH=ON"
+  ];
+
+  postPatch = ''
+    substituteInPlace {./,lzhamcomp/,lzhamdecomp/,lzhamdll/,lzhamtest/}CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
-  meta = with lib; {
+  postInstall = ''
+    mkdir -p $out/bin
+    cp lzhamtest/lzhamtest $out/bin/
+  '';
+
+  meta = {
     description = "Lossless data compression codec with LZMA-like ratios but 1.5x-8x faster decompression speed";
     mainProgram = "lzhamtest";
     homepage = "https://github.com/richgel999/lzham_codec";
-    license = with licenses; [ mit ];
-    platforms = platforms.linux;
+    license = lib.licenses.mit;
+    platforms = lib.platforms.linux;
   };
 }

From 084cc106361001fc0afb625a362e71e10befc6d2 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Tue, 4 Nov 2025 14:14:16 -0500
Subject: [PATCH 5387/6226] react-static: drop

In "maintainance mode", but hasn't seen patches for 3 years and does not
appear to be maintained anymore.
---
 pkgs/by-name/re/react-static/package.json  | 154 ---------------------
 pkgs/by-name/re/react-static/package.nix   |  56 --------
 pkgs/development/node-packages/aliases.nix |   2 +-
 pkgs/top-level/aliases.nix                 |   1 +
 4 files changed, 2 insertions(+), 211 deletions(-)
 delete mode 100644 pkgs/by-name/re/react-static/package.json
 delete mode 100644 pkgs/by-name/re/react-static/package.nix

diff --git a/pkgs/by-name/re/react-static/package.json b/pkgs/by-name/re/react-static/package.json
deleted file mode 100644
index 70b873277fd2..000000000000
--- a/pkgs/by-name/re/react-static/package.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-  "name": "react-static",
-  "description": "A progressive static site generator for React",
-  "version": "7.6.2",
-  "license": "MIT",
-  "repository": "https://github.com/react-static/react-static",
-  "main": "lib/index.js",
-  "types": "src/index.d.ts",
-  "engines": {
-    "node": ">=8.9.0"
-  },
-  "bin": {
-    "react-static": "./bin/react-static"
-  },
-  "scripts": {
-    "prebuild": "rimraf lib",
-    "build": "cross-env REACT_STATIC_INTERNAL=true babel src --out-dir lib --ignore \"**/__tests__/*\" --ignore \"**/__mocks__/*\"  --source-maps inline",
-    "watch": "yarn build --watch",
-    "watch:link": "onchange './lib/**/*' -- yalc push --changed",
-    "start": "yarn watch",
-    "test": "yarn format && yarn lint && yarn unitTest",
-    "lint": "eslint src",
-    "format": "prettier README.md {src,templates/*/src}/**/*.js --write",
-    "unitTest": "cross-env NODE_ENV=test yarn jest ./src",
-    "unitTestWatch": "cross-env NODE_ENV=test yarn jest src --watch",
-    "preversion": "yarn build && yarn test",
-    "publishLink": "echo '{{event}} to {{changed}}' && yalc publish"
-  },
-  "peerDependencies": {
-    "react": "^16.9.0",
-    "react-dom": "^16.9.0",
-    "react-hot-loader": "^4.12.11"
-  },
-  "dependencies": {
-    "@babel/cli": "^7.5.5",
-    "@babel/core": "^7.5.5",
-    "@babel/plugin-proposal-class-properties": "^7.5.5",
-    "@babel/plugin-proposal-export-default-from": "^7.5.2",
-    "@babel/plugin-proposal-optional-chaining": "^7.2.0",
-    "@babel/plugin-syntax-dynamic-import": "^7.2.0",
-    "@babel/plugin-transform-destructuring": "^7.5.0",
-    "@babel/plugin-transform-modules-commonjs": "^7.5.0",
-    "@babel/plugin-transform-runtime": "^7.5.5",
-    "@babel/preset-env": "^7.5.5",
-    "@babel/preset-react": "^7.0.0",
-    "@babel/preset-stage-0": "^7.0.0",
-    "@babel/register": "^7.5.5",
-    "@babel/runtime": "^7.5.5",
-    "@reach/router": "^1.3.1",
-    "autoprefixer": "^9.7.4",
-    "axios": "^0.21.1",
-    "babel-core": "7.0.0-bridge.0",
-    "babel-loader": "^8.0.6",
-    "babel-plugin-macros": "^2.6.1",
-    "babel-plugin-transform-react-remove-prop-types": "^0.4.24",
-    "babel-plugin-universal-import": "^4.0.0",
-    "case-sensitive-paths-webpack-plugin": "^2.2.0",
-    "chalk": "^2.4.2",
-    "chokidar": "^3.0.2",
-    "circular-dependency-plugin": "^5.2.0",
-    "cors": "^2.8.5",
-    "css-loader": "^2.1.1",
-    "download-git-repo": "^2.0.0",
-    "extract-css-chunks-webpack-plugin": "^4.6.0",
-    "file-loader": "3.0.1",
-    "fs-extra": "^7.0.1",
-    "git-promise": "^1.0.0",
-    "glob": "^7.1.4",
-    "gunzip-maybe": "^1.4.1",
-    "html-webpack-plugin": "^3.2.0",
-    "inquirer": "^6.5.1",
-    "inquirer-autocomplete-prompt": "^1.0.1",
-    "intersection-observer": "^0.7.0",
-    "jsesc": "^2.5.2",
-    "match-sorter": "^3.1.1",
-    "minimist": "^1.2.0",
-    "mutation-observer": "^1.0.3",
-    "optimize-css-assets-webpack-plugin": "^5.0.3",
-    "portfinder": "^1.0.21",
-    "postcss-flexbugs-fixes": "^4.1.0",
-    "postcss-loader": "^3.0.0",
-    "pretty-error": "^2.1.1",
-    "progress": "^2.0.3",
-    "prop-types": "^15.7.2",
-    "raf": "^3.4.1",
-    "raw-loader": "^3.1.0",
-    "react-helmet": "^6.1.0",
-    "react-universal-component": "^4.0.0",
-    "resolve-from": "^5.0.0",
-    "serve": "^11.1.0",
-    "shorthash": "^0.0.2",
-    "slash": "^2.0.0",
-    "socket.io": "^2.2.0",
-    "socket.io-client": "^2.2.0",
-    "style-loader": "0.23.1",
-    "swimmer": "^1.4.0",
-    "tar-fs": "^2.0.0",
-    "terser-webpack-plugin": "^1.4.1",
-    "upath": "^1.1.2",
-    "url-loader": "^2.1.0",
-    "webpack": "^4.39.2",
-    "webpack-bundle-analyzer": "^3.4.1",
-    "webpack-dev-server": "^3.8.0",
-    "webpack-flush-chunks": "^2.0.3",
-    "webpack-node-externals": "^1.7.2"
-  },
-  "devDependencies": {
-    "@types/react": "^16.9.1",
-    "@types/react-helmet": "^6.1.0",
-    "babel-jest": "^24.8.0",
-    "cors": "^2.8.5",
-    "cross-env": "^5.2.0",
-    "enzyme": "^3.10.0",
-    "enzyme-adapter-react-16": "^1.14.0",
-    "enzyme-to-json": "^3.4.0",
-    "eslint": "^6.1.0",
-    "eslint-config-prettier": "^6.0.0",
-    "eslint-config-react-tools": "^1.1.7",
-    "eslint-plugin-babel": "^5.3.0",
-    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-react": "^7.14.3",
-    "express": "^4.17.1",
-    "husky": "^3.0.3",
-    "jest": "^24.8.0",
-    "lerna": "^3.16.4",
-    "onchange": "^6.0.0",
-    "prettier": "1.18.2",
-    "react": "^16.9.0",
-    "react-dev-utils": "^9.0.3",
-    "react-dom": "^16.9.0",
-    "react-hot-loader": "^4.12.11",
-    "rimraf": "^2.7.0",
-    "webpack-hot-middleware": "^2.25.0"
-  },
-  "jest": {
-    "verbose": true,
-    "moduleDirectories": [
-      "node_modules",
-      "src"
-    ],
-    "testRegex": "(/__tests__/.*\\.(test))\\.jsx?$",
-    "moduleNameMapper": {
-      "static.config.js$": "<rootDir>/src/static/__mocks__/static.config.js.mock.js"
-    },
-    "setupFiles": [
-      "<rootDir>/setupTests.js"
-    ],
-    "snapshotSerializers": [
-      "enzyme-to-json/serializer"
-    ]
-  },
-  "gitHead": "875004e6e75d36043382b8ec8bba27a766c1a83a"
-}
diff --git a/pkgs/by-name/re/react-static/package.nix b/pkgs/by-name/re/react-static/package.nix
deleted file mode 100644
index bf10eeb9494f..000000000000
--- a/pkgs/by-name/re/react-static/package.nix
+++ /dev/null
@@ -1,56 +0,0 @@
-{
-  lib,
-  mkYarnPackage,
-  fetchFromGitHub,
-  fetchYarnDeps,
-}:
-
-mkYarnPackage rec {
-  pname = "react-static";
-  version = "7.6.2";
-
-  src = fetchFromGitHub {
-    owner = "react-static";
-    repo = "react-static";
-    rev = "v${version}";
-    hash = "sha256-dlYmD0vgEqWxYf7E0VYstZMAuNDGvQP7xDgHo/wmlUs=";
-  };
-
-  packageJSON = ./package.json;
-
-  offlineCache = fetchYarnDeps {
-    yarnLock = "${src}/yarn.lock";
-    hash = "sha256-SNnJPUzv+l2HXfA6NKYpJvn/DCX3a42JQ3N0+XYKbd8=";
-  };
-
-  buildPhase = ''
-    runHook preBuild
-
-    yarn --cwd deps/react-static/packages/react-static --offline build
-
-    runHook postBuild
-  '';
-
-  doDist = false;
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p "$out/lib/node_modules"
-    mv deps/react-static/packages/react-static "$out/lib/node_modules"
-    mv node_modules "$out/lib/node_modules/react-static"
-
-    ln -s "$out/lib/node_modules/react-static/bin" "$out"
-
-    runHook postInstall
-  '';
-
-  meta = {
-    changelog = "https://github.com/react-static/react-static/blob/${src.rev}/CHANGELOG.md";
-    description = "Progressive static site generator for React";
-    homepage = "https://github.com/react-static/react-static";
-    license = lib.licenses.mit;
-    mainProgram = "react-static";
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index ede344e09c7d..e51f5a22c7a5 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -192,7 +192,7 @@ mapAliases {
   inherit (pkgs) pxder; # added 2023-09-26
   inherit (pkgs) quicktype; # added 2023-09-09
   react-native-cli = throw "react-native-cli was removed because it was deprecated"; # added 2023-09-25
-  inherit (pkgs) react-static; # added 2023-08-21
+  react-static = throw "'react-static has been removed because of a lack of upstream maintainance"; # Converted to throw 2025-11-04
   react-tools = throw "react-tools was removed because it was deprecated"; # added 2023-09-25
   readability-cli = pkgs.readability-cli; # Added 2023-06-12
   inherit (pkgs) redoc-cli; # added 2023-09-12
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 111f184b70b1..6aba9955548b 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1302,6 +1302,7 @@ mapAliases {
   railway-travel = throw "'railway-travel' has been renamed to/replaced by 'diebahn'"; # Converted to throw 2025-10-27
   rambox-pro = throw "'rambox-pro' has been renamed to/replaced by 'rambox'"; # Converted to throw 2025-10-27
   rapidjson-unstable = throw "'rapidjson-unstable' has been renamed to/replaced by 'rapidjson'"; # Converted to throw 2025-10-27
+  react-static = throw "'react-static' has been removed due to lack of maintainance upstream"; # Added 2025-11-04
   recurseIntoAttrs = warnAlias "'recurseIntoAttrs' has been removed from pkgs, use `lib.recurseIntoAttrs` instead" lib.recurseIntoAttrs; # Added 2025-10-30
   redict = throw "'redict' has been removed due to lack of nixpkgs maintenance and a slow upstream development pace. Consider using 'valkey'."; # Added 2025-10-16
   redoc-cli = throw "'redoc-cli' been removed because it has been marked as broken since at least November 2024. Consider using 'redocly' instead."; # Added 2025-10-01

From e2b7e2fe0eb19af29d868d70a4e7166a9f4784e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 19:17:05 +0000
Subject: [PATCH 5388/6226] aks-mcp-server: 0.0.10 -> 0.0.11

---
 pkgs/by-name/ak/aks-mcp-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ak/aks-mcp-server/package.nix b/pkgs/by-name/ak/aks-mcp-server/package.nix
index 42bca9f7bb98..91a4425ffda5 100644
--- a/pkgs/by-name/ak/aks-mcp-server/package.nix
+++ b/pkgs/by-name/ak/aks-mcp-server/package.nix
@@ -11,16 +11,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "aks-mcp-server";
-  version = "0.0.10";
+  version = "0.0.11";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "aks-mcp";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-RWBZevNiWbG4luw70gXIvyk+IQkH6xIDBd7uD8eq3r8=";
+    hash = "sha256-VkX9zqR10h5bvFAfnNpei3f89dv7RQoZysjSRvxkdHQ=";
   };
 
-  vendorHash = "sha256-8EV8cqta0DVrRFtig+Rx8SWxgAl6qu9wVVLWRhtl6N4=";
+  vendorHash = "sha256-qN7qqzMnl3l3Z40Mfv9jNWP7Ux7bgDCxKm+QocoruRk=";
 
   subPackages = [ "cmd/aks-mcp" ];
 

From 8d84c9659f08cdf5762ef6525d1c7107eb6c4d44 Mon Sep 17 00:00:00 2001
From: adam <me@adamperkowski.dev>
Date: Tue, 4 Nov 2025 20:39:10 +0100
Subject: [PATCH 5389/6226] maintainers: update adamperkowski

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index c1732d3de9e5..4aa1225debb9 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -587,7 +587,7 @@
   };
   adamperkowski = {
     name = "Adam Perkowski";
-    email = "adas1per@protonmail.com";
+    email = "me@adamperkowski.dev";
     matrix = "@xx0a_q:matrix.org";
     github = "adamperkowski";
     githubId = 75480869;

From 1e6124a504ea2d4ba01039968b00ae670fde3b07 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 4 Nov 2025 11:21:14 +0100
Subject: [PATCH 5390/6226] ci/github-script/merge: list eligible users in
 comment

When a user tries to merge a PR, but is not allowed to, it is helpful to
explicitly list the users who *are* allowed. This helps explaining *why*
the merge-eligible label was set.

I objected to this proposal before, because it would incur too many API
requests. But after we have restructured the checklist, this is not
actually true anymore - we can now sensibly run this only when a comment
is posted and not whenever we check a PR for eligibility.
---
 ci/github-script/bot.js   | 19 +++++++++++++++++++
 ci/github-script/merge.js | 16 +++++++++++++++-
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index 2c3bd45f69e5..133a6881d235 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -119,6 +119,24 @@ module.exports = async ({ github, context, core, dry }) => {
     return members[team_slug]
   }
 
+  // Caching users saves API requests when running the bot on the schedule and processing
+  // many PRs at once. It also helps to encapsulate the special logic we need, because
+  // actions/github doesn't support that endpoint fully, yet.
+  const users = {}
+  function getUser(id) {
+    if (!users[id]) {
+      users[id] = github
+        .request({
+          method: 'GET',
+          url: '/user/{id}',
+          id,
+        })
+        .then((resp) => resp.data)
+    }
+
+    return users[id]
+  }
+
   async function handlePullRequest({ item, stats, events }) {
     const log = (k, v) => core.info(`PR #${item.number} - ${k}: ${v}`)
 
@@ -145,6 +163,7 @@ module.exports = async ({ github, context, core, dry }) => {
       events,
       maintainers,
       getTeamMembers,
+      getUser,
     })
 
     // When the same change has already been merged to the target branch, a PR will still be
diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index 8a6789a30544..688a7928fe97 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -80,6 +80,7 @@ function runChecklist({
 
   return {
     checklist,
+    eligible,
     result,
   }
 }
@@ -119,6 +120,7 @@ async function handleMerge({
   events,
   maintainers,
   getTeamMembers,
+  getUser,
 }) {
   const pull_number = pull_request.number
 
@@ -240,7 +242,7 @@ async function handleMerge({
       }
     }
 
-    const { result, checklist } = runChecklist({
+    const { result, eligible, checklist } = runChecklist({
       committers,
       events,
       files,
@@ -270,6 +272,18 @@ async function handleMerge({
       '',
     ]
 
+    if (eligible.size > 0 && !eligible.has(comment.user.id)) {
+      const users = await Promise.all(
+        Array.from(eligible, async (id) => (await getUser(id)).login),
+      )
+      body.push(
+        '> [!TIP]',
+        '> Maintainers eligible to merge are:',
+        ...users.map((login) => `> - ${login}`),
+        '',
+      )
+    }
+
     if (result) {
       await react('ROCKET')
       try {

From 445fa1e7d70d723f9064597a3bd9f661a97bdfcb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 19:50:45 +0000
Subject: [PATCH 5391/6226] grafanaPlugins.marcusolsson-calendar-panel: 4.1.0
 -> 4.2.0

---
 .../grafana/plugins/marcusolsson-calendar-panel/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix
index e18ded79c605..48b6ab5607f8 100644
--- a/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/marcusolsson-calendar-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "marcusolsson-calendar-panel";
-  version = "4.1.0";
-  zipHash = "sha256-SQIzKCfBo0UDqwrl7ZkbHq2F+ddwviLYVQbgi+zsT20=";
+  version = "4.2.0";
+  zipHash = "sha256-GQcLaeTvbHTdbH5NWa0SL5rUP9WTQOqy38ndZb4/rA8=";
   meta = with lib; {
     description = "Calendar Panel is a Grafana plugin that displays events from various data sources";
     license = licenses.asl20;

From 77da231087a87bb47aa93256d55190018ad6ff53 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 19:59:12 +0000
Subject: [PATCH 5392/6226] rainfrog: 0.3.8 -> 0.3.9

---
 pkgs/by-name/ra/rainfrog/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ra/rainfrog/package.nix b/pkgs/by-name/ra/rainfrog/package.nix
index 1f2f2b32f230..ef4b1402fd24 100644
--- a/pkgs/by-name/ra/rainfrog/package.nix
+++ b/pkgs/by-name/ra/rainfrog/package.nix
@@ -7,7 +7,7 @@
   rainfrog,
 }:
 let
-  version = "0.3.8";
+  version = "0.3.9";
 in
 rustPlatform.buildRustPackage {
   inherit version;
@@ -17,10 +17,10 @@ rustPlatform.buildRustPackage {
     owner = "achristmascarl";
     repo = "rainfrog";
     tag = "v${version}";
-    hash = "sha256-VdfzNBPl32aUBQFHNFdjbZoTKhraOMlTw+tSlGSZ+yk=";
+    hash = "sha256-gfg73cvt0CJb80WOUlYZFWCuumFs4/nMZepmOPvYloY=";
   };
 
-  cargoHash = "sha256-4Hom/93JU0YL4F/XL3zwWqWjfW5sW6HBeI/IpVbRoVs=";
+  cargoHash = "sha256-P1HJTYNROuoU1E4hmmpROMuudgYlRlWsRuUmJAEdY94=";
 
   passthru = {
     tests.version = testers.testVersion {

From ff7cfe7b996da4c397d50f9ce57723996fcf340f Mon Sep 17 00:00:00 2001
From: Felix Singer <felixsinger@posteo.net>
Date: Tue, 4 Nov 2025 21:09:37 +0100
Subject: [PATCH 5393/6226] gerrit: 3.12.2 -> 3.12.3

Signed-off-by: Felix Singer <felixsinger@posteo.net>
---
 pkgs/by-name/ge/gerrit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ge/gerrit/package.nix b/pkgs/by-name/ge/gerrit/package.nix
index 58c52b04b66c..7aeadaa219a4 100644
--- a/pkgs/by-name/ge/gerrit/package.nix
+++ b/pkgs/by-name/ge/gerrit/package.nix
@@ -8,11 +8,11 @@
 
 stdenv.mkDerivation rec {
   pname = "gerrit";
-  version = "3.12.2";
+  version = "3.12.3";
 
   src = fetchurl {
     url = "https://gerrit-releases.storage.googleapis.com/gerrit-${version}.war";
-    hash = "sha256-jQydsKixNKY0PYXysPckcxrpFhDBLQmfN+x/tlfGdEk=";
+    hash = "sha256-egPuxGfRk8uB+7hzdrrEOT9wfBxlkaSjRpw2z9RYXAI=";
   };
 
   buildCommand = ''

From 5d1597fb5a041a8f3a25a6bf41e7c151b5f0e27b Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 4 Nov 2025 20:31:18 +0100
Subject: [PATCH 5394/6226] buildMozillaMach: fix build for firefox 145 or
 later

---
 pkgs/build-support/build-mozilla-mach/default.nix | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix
index 610bd353568a..8b00b6211c0e 100644
--- a/pkgs/build-support/build-mozilla-mach/default.nix
+++ b/pkgs/build-support/build-mozilla-mach/default.nix
@@ -98,6 +98,7 @@ in
   # Darwin
   apple-sdk_14,
   apple-sdk_15,
+  apple-sdk_26,
   cups,
   rsync, # used when preparing .app directory
 
@@ -330,7 +331,7 @@ buildStdenv.mkDerivation {
     ++
       lib.optionals
         (
-          lib.versionAtLeast version "141.0.2"
+          (lib.versionAtLeast version "141.0.2" && lib.versionOlder version "145.0")
           || (lib.versionAtLeast version "140.2.0" && lib.versionOlder version "141.0")
         )
         [
@@ -466,6 +467,7 @@ buildStdenv.mkDerivation {
       (
         stdenv.hostPlatform.isDarwin
         && lib.versionAtLeast version "143"
+        && lib.versionOlder version "145"
         && lib.versionOlder apple-sdk_15.version "15.4"
       )
       ''
@@ -556,7 +558,14 @@ buildStdenv.mkDerivation {
     zip
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    (if lib.versionAtLeast version "138" then apple-sdk_15 else apple-sdk_14)
+    (
+      if lib.versionAtLeast version "145" then
+        apple-sdk_26
+      else if lib.versionAtLeast version "138" then
+        apple-sdk_15
+      else
+        apple-sdk_14
+    )
     cups
   ]
   ++ (lib.optionals (!stdenv.hostPlatform.isDarwin) (

From 02affb31581f17f93b96529577df0deeaea7cf9d Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 4 Nov 2025 19:20:43 +0000
Subject: [PATCH 5395/6226] firefox-devedition-unwrapped: 144.0b9 -> 145.0b9

---
 .../browsers/firefox/packages/firefox-devedition.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
index 5a5bf633bd9a..c65b04e5ac36 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix
@@ -10,13 +10,13 @@
 buildMozillaMach rec {
   pname = "firefox-devedition";
   binaryName = "firefox-devedition";
-  version = "144.0b9";
+  version = "145.0b9";
   applicationName = "Firefox Developer Edition";
   requireSigning = false;
   branding = "browser/branding/aurora";
   src = fetchurl {
     url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "b6b09383cfd846cd6c592f2348bd72dd790ce2565b45cbc2614b030af6302beafc9df17ecc07f4b6f369c31078719b39cc3e0a4ea08dd83c9c9180d455c37247";
+    sha512 = "36000021b8f30eb5e80ce3b2e4ae05499e8b8cbdec93ba97dfb9c8f107cbe80202a13c4923491c01c8c245fc1810bb6fc82a46a06817ab7e70a47c04385b306e";
   };
 
   # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but

From 21ae3a47de0f15745c757abc8dfe3602214567a9 Mon Sep 17 00:00:00 2001
From: jopejoe1 <jopejoe1@missing.ninja>
Date: Tue, 4 Nov 2025 19:21:04 +0000
Subject: [PATCH 5396/6226] firefox-beta-unwrapped: 144.0b9 -> 145.0b9

---
 .../networking/browsers/firefox/packages/firefox-beta.nix     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
index 86b09c0b85a4..3bfbca592ae1 100644
--- a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
+++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix
@@ -10,11 +10,11 @@
 buildMozillaMach rec {
   pname = "firefox-beta";
   binaryName = "firefox-beta";
-  version = "144.0b9";
+  version = "145.0b9";
   applicationName = "Firefox Beta";
   src = fetchurl {
     url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
-    sha512 = "75a177be0b462ec0e668bbfd7182341499f3eb7b5a7a067ab207ff8e8f551672d0cec3c6a918bac0b9675d8315bfb59169c1ae4110f49a017417c287106366c7";
+    sha512 = "5dee0ec8bb66153d1a5905692c3e9b48e91a1d55728f9e173dfb08f9d0e781fcc8ba978a9e6a8948e56d26cb064bda7c0311260a8828752a1390fdb0e18ce769";
   };
 
   meta = {

From 9d31862825b732352830289b467f59a22ce8df4c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 20:16:30 +0000
Subject: [PATCH 5397/6226] python3Packages.minify-html: 0.16.4 -> 0.18.1

---
 pkgs/development/python-modules/minify-html/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/minify-html/default.nix b/pkgs/development/python-modules/minify-html/default.nix
index e5c1073ebc82..61f81813dc83 100644
--- a/pkgs/development/python-modules/minify-html/default.nix
+++ b/pkgs/development/python-modules/minify-html/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "minify-html";
-  version = "0.16.4";
+  version = "0.18.1";
 
   pyproject = true;
 
@@ -15,12 +15,12 @@ buildPythonPackage rec {
   src = fetchPypi {
     inherit version;
     pname = "minify_html";
-    hash = "sha256-3UjI/5ZhoQNHYkAqdBGzFohnqXP4/Hiwn2foGCC2TSI=";
+    hash = "sha256-Q5mFMO9TdwHwA6jpCLdW147/MDyGsEGpWFXikFGLp5w=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-NLPei6ajR55mLyFhsjzUpXB/TsqqeDvP8yKE74t0ufk=";
+    hash = "sha256-K0m+rM0dcosAOl5jYdh9CSRrL/Vuk1ATWHPQJbLxvRw=";
   };
 
   nativeBuildInputs = with rustPlatform; [

From f30fbcdb2475243e1fdc8e5c963fcb0e8f8d6c88 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 4 Nov 2025 20:23:17 +0000
Subject: [PATCH 5398/6226] python3Packages.gymnasium: 1.2.1 -> 1.2.2

Diff: https://github.com/Farama-Foundation/gymnasium/compare/v1.2.1...v1.2.2

Changelog: https://github.com/Farama-Foundation/Gymnasium/releases/tag/v1.2.2
---
 pkgs/development/python-modules/gymnasium/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gymnasium/default.nix b/pkgs/development/python-modules/gymnasium/default.nix
index 79fbf315b7e6..8f1e182d4347 100644
--- a/pkgs/development/python-modules/gymnasium/default.nix
+++ b/pkgs/development/python-modules/gymnasium/default.nix
@@ -38,7 +38,7 @@
 
 buildPythonPackage rec {
   pname = "gymnasium";
-  version = "1.2.1";
+  version = "1.2.2";
 
   pyproject = true;
 
@@ -46,7 +46,7 @@ buildPythonPackage rec {
     owner = "Farama-Foundation";
     repo = "gymnasium";
     tag = "v${version}";
-    hash = "sha256-KevA7AW73ppN6KuE0jAE3xfm/1ZWZxHtHbeNM6RC9yI=";
+    hash = "sha256-GD/ZC6BRcsIiVrvTz3j2hg10tbJMfCou/ydUFbC2fc4=";
   };
 
   build-system = [ setuptools ];

From 4d63ecabd35c4e2fbcc1f7b9d89917e22f2ea45b Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Tue, 4 Nov 2025 17:42:44 +0100
Subject: [PATCH 5399/6226] linuxPackages.shufflecake: use wrapped gcc compiler

---
 pkgs/os-specific/linux/shufflecake/default.nix | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/shufflecake/default.nix b/pkgs/os-specific/linux/shufflecake/default.nix
index 6871364183b5..f8bda2bcfd5b 100644
--- a/pkgs/os-specific/linux/shufflecake/default.nix
+++ b/pkgs/os-specific/linux/shufflecake/default.nix
@@ -23,12 +23,16 @@ stdenv.mkDerivation (finalAttrs: {
     libgcrypt
     lvm2
   ];
-  makeFlags = kernelModuleMakeFlags ++ [
-    "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
-  ];
-
-  # GCC 14 makes this an error by default, remove when fixed upstream
-  env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types";
+  makeFlags =
+    kernelModuleMakeFlags
+    ++ [
+      "KERNEL_DIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+    ]
+    # Use wrapped gcc compiler since the unwrapped one fails to find the
+    # headers.
+    ++ lib.optionals stdenv.cc.isGNU [
+      "CC=${stdenv.cc.targetPrefix}cc"
+    ];
 
   outputs = [
     "out"

From 27ba246c77a9184ff2410c0dc54323058cf34b07 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 20:26:25 +0000
Subject: [PATCH 5400/6226] python3Packages.pymitsubishi: 0.4.0 -> 0.4.1

---
 pkgs/development/python-modules/pymitsubishi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymitsubishi/default.nix b/pkgs/development/python-modules/pymitsubishi/default.nix
index dfc4b6ff41e4..25e4253730c1 100644
--- a/pkgs/development/python-modules/pymitsubishi/default.nix
+++ b/pkgs/development/python-modules/pymitsubishi/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pymitsubishi";
-  version = "0.4.0";
+  version = "0.4.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pymitsubishi";
     repo = "pymitsubishi";
     tag = "v${version}";
-    hash = "sha256-oMv+GKdl1H1S5mYUYfTUHuLM5yvkvD44dy9DEsQVAyg=";
+    hash = "sha256-Uh3hlgXYgGDZDpEJInLX323fftVciwh9fLEKF2Kozq0=";
   };
 
   build-system = [ setuptools ];

From 6237a00cbf591a89312b3470122019edf12debcc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 20:30:14 +0000
Subject: [PATCH 5401/6226] luau: 0.695 -> 0.698

---
 pkgs/by-name/lu/luau/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix
index 64cfe16c4a20..987c86616ac5 100644
--- a/pkgs/by-name/lu/luau/package.nix
+++ b/pkgs/by-name/lu/luau/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "luau";
-  version = "0.695";
+  version = "0.698";
 
   src = fetchFromGitHub {
     owner = "luau-lang";
     repo = "luau";
     tag = finalAttrs.version;
-    hash = "sha256-7ByLeKSUvaKVGJUwDb1tkxfScw8B9K6abTNk0gD2CqI=";
+    hash = "sha256-OfOBbO1FHLEvqeCo8cojVpMPZl6pjWF5z+BL2uffwIU=";
   };
 
   nativeBuildInputs = [ cmake ];

From 889671f2bd204d3727032089fc0931bdc7dc70ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 20:36:01 +0000
Subject: [PATCH 5402/6226] process-compose: 1.75.2 -> 1.76.0

---
 pkgs/by-name/pr/process-compose/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix
index 9e0cf2aeba9c..f3594c4de5d6 100644
--- a/pkgs/by-name/pr/process-compose/package.nix
+++ b/pkgs/by-name/pr/process-compose/package.nix
@@ -10,13 +10,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "process-compose";
-  version = "1.75.2";
+  version = "1.76.0";
 
   src = fetchFromGitHub {
     owner = "F1bonacc1";
     repo = "process-compose";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BKf8FrgpGhYzuukAFP+OCjvp5bMCQL6BmZ+Tk/E8RIY=";
+    hash = "sha256-DYWMtW2JLUbt2Bk/dSBjRc4GHpav0dr8sQOYeBkL/3c=";
 
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.

From 225d8fe878284e4c2c9b61d7c7d813fc579be11b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 20:38:35 +0000
Subject: [PATCH 5403/6226] terraform-providers.vancluever_acme: 2.37.0 ->
 2.38.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 d4479da25c77..b2a5b568952f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1417,13 +1417,13 @@
     "vendorHash": null
   },
   "vancluever_acme": {
-    "hash": "sha256-99pSx2zKOJDQwSlmPevekEtqIadjHcOfG6txvAiXKWc=",
+    "hash": "sha256-I3x6oiyM29xAvvsrDF8WfZLvgA5bmdta8yDAxeNjTvM=",
     "homepage": "https://registry.terraform.io/providers/vancluever/acme",
     "owner": "vancluever",
     "repo": "terraform-provider-acme",
-    "rev": "v2.37.0",
+    "rev": "v2.38.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-l+tyBusD3aN1bHNSlHbBZtxr+lA0HAqAXYg/fT0z0iE="
+    "vendorHash": "sha256-6kRbFB8KCvh8kbSy557AJn5BvYs2e0iBqbWvtVFXPrI="
   },
   "venafi_venafi": {
     "hash": "sha256-wpAckNRqZjSDt7KpCRpLSYkn6Gm+QPzn5sIJ90wRXjI=",

From da79d2ee96650bc2e82ac450edc192b51c0b63ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 20:44:24 +0000
Subject: [PATCH 5404/6226] prometheus-frr-exporter: 1.8.1 -> 1.9.0

---
 pkgs/by-name/pr/prometheus-frr-exporter/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix
index 69204357a12f..36aff18483fe 100644
--- a/pkgs/by-name/pr/prometheus-frr-exporter/package.nix
+++ b/pkgs/by-name/pr/prometheus-frr-exporter/package.nix
@@ -5,12 +5,12 @@
 }:
 
 let
-  version = "1.8.1";
+  version = "1.9.0";
   src = fetchFromGitHub {
     owner = "tynany";
     repo = "frr_exporter";
     rev = "v${version}";
-    hash = "sha256-RURuJXAX1U1KPX0IJXs3OE1Rr7MV5xrhrew7mKfaeNM=";
+    hash = "sha256-oW+i1xSvBWXBMoml0/hk0rlaDEHazb8mcurgifpR5m4=";
   };
 in
 buildGoModule {

From 17e3df0a609a4e4b8aeb136008e85d1bdc6f0ec9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 20:45:33 +0000
Subject: [PATCH 5405/6226] python3Packages.vt-py: 0.21.0 -> 0.22.0

---
 pkgs/development/python-modules/vt-py/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/vt-py/default.nix b/pkgs/development/python-modules/vt-py/default.nix
index a7556309236e..431813221fe8 100644
--- a/pkgs/development/python-modules/vt-py/default.nix
+++ b/pkgs/development/python-modules/vt-py/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "vt-py";
-  version = "0.21.0";
+  version = "0.22.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "VirusTotal";
     repo = "vt-py";
     tag = version;
-    hash = "sha256-hp9MjFSakFezlT/rTHa70KrL3VShhpayXaK88LxY7I4=";
+    hash = "sha256-CReFwX/7UCyFWVG/3hXwTVt92x+n+eu3FhvrKtDrgNU=";
   };
 
   postPatch = ''

From 116ef35d542bc5665bfa8aeeac6a1d4fcd122423 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Sun, 26 Oct 2025 22:29:56 +0000
Subject: [PATCH 5406/6226] uiua-unstable: 0.17.3 -> 0.18.0-dev.2

Changelog: https://github.com/uiua-lang/uiua/blob/refs/tags/0.18.0-dev.2/changelog.md
Diff: https://github.com/uiua-lang/uiua/compare/0.17.3...0.18.0-dev.2
---
 pkgs/by-name/ui/uiua/package.nix  | 4 ++--
 pkgs/by-name/ui/uiua/unstable.nix | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ui/uiua/package.nix b/pkgs/by-name/ui/uiua/package.nix
index 1c40d2b0e89a..dfc61152edf7 100644
--- a/pkgs/by-name/ui/uiua/package.nix
+++ b/pkgs/by-name/ui/uiua/package.nix
@@ -80,8 +80,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
   passthru.tests.run =
     runCommand "uiua-test-run" { nativeBuildInputs = [ finalAttrs.finalPackage ]; }
       ''
-        uiua init
-        diff -U3 --color=auto <(uiua run main.ua 2>&1) <(echo '"Hello, World!"')
+        echo '&p "Hello, World!"' > test.ua
+        diff -U3 --color=auto <(uiua run test.ua) <(echo 'Hello, World!')
         touch $out
       '';
 
diff --git a/pkgs/by-name/ui/uiua/unstable.nix b/pkgs/by-name/ui/uiua/unstable.nix
index a9a37051bd47..a8d2084b76c0 100644
--- a/pkgs/by-name/ui/uiua/unstable.nix
+++ b/pkgs/by-name/ui/uiua/unstable.nix
@@ -1,7 +1,7 @@
 rec {
-  version = "0.17.3";
+  version = "0.18.0-dev.2";
   tag = version;
-  hash = "sha256-TiJAj+wBVb8Z9pnoscF65tB7flbk/XWW+7XrHlvIHeo=";
-  cargoHash = "sha256-smonKftOpGXy0WxI8Qqr0rTeI/pW6f+G4TxzoaEMsuc=";
+  hash = "sha256-coa+jE83EAIJDHrSdLMG/zDXxRYx6/uivTbNNufz17Q=";
+  cargoHash = "sha256-i8YFLkV2T9Cx/shRTbeYrNlccCzCO8w2zoa5ZuEuLSM=";
   updateScript = ./update-unstable.sh;
 }

From e03ed37f02ac2c78a151dac42d4b917cdf09b0c7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 20:49:11 +0000
Subject: [PATCH 5407/6226] openfga: 1.10.3 -> 1.10.4

---
 pkgs/by-name/op/openfga/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openfga/package.nix b/pkgs/by-name/op/openfga/package.nix
index 7a986ab99229..2f1ab6fca927 100644
--- a/pkgs/by-name/op/openfga/package.nix
+++ b/pkgs/by-name/op/openfga/package.nix
@@ -7,7 +7,7 @@
 
 let
   pname = "openfga";
-  version = "1.10.3";
+  version = "1.10.4";
 in
 
 buildGoModule {
@@ -17,10 +17,10 @@ buildGoModule {
     owner = "openfga";
     repo = "openfga";
     rev = "v${version}";
-    hash = "sha256-iP4VzQDScLAiRArVKh9n0AcPXZHPs+xRi4K9S0Z7n48=";
+    hash = "sha256-4Mi+fjOBwzL3iq57iz4SAESNRCm75gKnZCIsOwTQeAc=";
   };
 
-  vendorHash = "sha256-421jf8XSCBteKQ7cr7ln/oBJgWxFsIqY+ccwW2R4/ro=";
+  vendorHash = "sha256-KK/6CNq824PBgAHnPoGza0yvLQ/paa1hznfp5p2GKyY=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 1376730c663089c3f62071fd666f61362da183e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Tue, 4 Nov 2025 21:48:57 +0100
Subject: [PATCH 5408/6226] akkuPackages: do not define
 meta.{description,homepage} to empty strings

---
 .../tools/package-management/akku/default.nix | 98 ++++++++++---------
 1 file changed, 52 insertions(+), 46 deletions(-)

diff --git a/pkgs/tools/package-management/akku/default.nix b/pkgs/tools/package-management/akku/default.nix
index 882db169d2bf..724d1dfd92a9 100644
--- a/pkgs/tools/package-management/akku/default.nix
+++ b/pkgs/tools/package-management/akku/default.nix
@@ -20,8 +20,8 @@ lib.makeScope newScope (self: rec {
           url,
           sha256,
           source,
-          synopsis ? "",
-          homepage ? "",
+          synopsis ? null,
+          homepage ? null,
           ...
         }:
         (akkuDerivation {
@@ -35,50 +35,56 @@ lib.makeScope newScope (self: rec {
           nativeBuildInputs = map (x: akkuself.${x}) dev-dependencies;
           unpackPhase = "tar xf $src";
 
-          meta.homepage = homepage;
-          meta.description = synopsis;
-          meta.license =
-            let
-              stringToLicense =
-                s:
-                (
-                  lib.licenses
-                  // (with lib.licenses; {
-                    "0bsd" = bsd0;
-                    "agpl" = agpl3Only;
-                    "apache-2.0" = asl20;
-                    "artistic" = artistic2;
-                    "bsd" = bsd3;
-                    "bsd-1-clause" = bsd1;
-                    "bsd-2-clause" = bsd2;
-                    "bsd-3-clause" = bsd3;
-                    "cc0-1.0" = cc0;
-                    "gpl" = gpl3Only;
-                    "gpl-2" = gpl2Only;
-                    "gpl-2.0-or-later" = gpl2Plus;
-                    "gplv2" = gpl2Only;
-                    "gpl-3" = gpl3Only;
-                    "gpl-3.0" = gpl3Only;
-                    "gpl-3.0-or-later" = gpl3Plus;
-                    "gplv3" = gpl3Only;
-                    "lgpl" = lgpl3Only;
-                    "lgpl-2" = lgpl2Only;
-                    "lgpl-2.0+" = lgpl2Plus;
-                    "lgpl-2.1" = lgpl21Only;
-                    "lgpl-2.1-or-later" = lgpl21Plus;
-                    "lgpl-3.0-or-later" = lgpl3Plus;
-                    "lgpl-3" = lgpl3Only;
-                    "lgplv3" = lgpl3Only;
-                    "public-domain" = publicDomain;
-                    "srfi" = bsd3;
-                    "unicode" = ucd;
-                    "xerox" = xerox;
-                    "zlib-acknowledgement" = zlib;
-                    "noassertion" = free;
-                  })
-                ).${s} or s;
-            in
-            if builtins.isList license then map stringToLicense license else stringToLicense license;
+          meta = {
+            license =
+              let
+                stringToLicense =
+                  s:
+                  (
+                    lib.licenses
+                    // (with lib.licenses; {
+                      "0bsd" = bsd0;
+                      "agpl" = agpl3Only;
+                      "apache-2.0" = asl20;
+                      "artistic" = artistic2;
+                      "bsd" = bsd3;
+                      "bsd-1-clause" = bsd1;
+                      "bsd-2-clause" = bsd2;
+                      "bsd-3-clause" = bsd3;
+                      "cc0-1.0" = cc0;
+                      "gpl" = gpl3Only;
+                      "gpl-2" = gpl2Only;
+                      "gpl-2.0-or-later" = gpl2Plus;
+                      "gplv2" = gpl2Only;
+                      "gpl-3" = gpl3Only;
+                      "gpl-3.0" = gpl3Only;
+                      "gpl-3.0-or-later" = gpl3Plus;
+                      "gplv3" = gpl3Only;
+                      "lgpl" = lgpl3Only;
+                      "lgpl-2" = lgpl2Only;
+                      "lgpl-2.0+" = lgpl2Plus;
+                      "lgpl-2.1" = lgpl21Only;
+                      "lgpl-2.1-or-later" = lgpl21Plus;
+                      "lgpl-3.0-or-later" = lgpl3Plus;
+                      "lgpl-3" = lgpl3Only;
+                      "lgplv3" = lgpl3Only;
+                      "public-domain" = publicDomain;
+                      "srfi" = bsd3;
+                      "unicode" = ucd;
+                      "xerox" = xerox;
+                      "zlib-acknowledgement" = zlib;
+                      "noassertion" = free;
+                    })
+                  ).${s} or s;
+              in
+              if builtins.isList license then map stringToLicense license else stringToLicense license;
+          }
+          // lib.optionalAttrs (homepage != null) {
+            inherit homepage;
+          }
+          // lib.optionalAttrs (synopsis != null) {
+            description = synopsis;
+          };
         }).overrideAttrs
           ({ "${pname}" = lib.id; } // overrides)."${pname}";
       deps = lib.importTOML ./deps.toml;

From 303e0aa77dc2dd7a8c2646436a37616f42c25dac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 20:58:06 +0000
Subject: [PATCH 5409/6226] nixos-facter: 0.4.1 -> 0.4.2

---
 pkgs/by-name/ni/nixos-facter/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ni/nixos-facter/package.nix b/pkgs/by-name/ni/nixos-facter/package.nix
index 92e4edc377c7..bf5e2b4ecca6 100644
--- a/pkgs/by-name/ni/nixos-facter/package.nix
+++ b/pkgs/by-name/ni/nixos-facter/package.nix
@@ -24,16 +24,16 @@ let
 in
 buildGoModule rec {
   pname = "nixos-facter";
-  version = "0.4.1";
+  version = "0.4.2";
 
   src = fetchFromGitHub {
     owner = "numtide";
     repo = "nixos-facter";
     tag = "v${version}";
-    hash = "sha256-4kER7CyFvMKVpKxCYHuf9fkkYVzVK9AWpF55cBNzPc0=";
+    hash = "sha256-oMOiZhppyUwyhLMtTofmeQINi8rHwsuQ1cD8Kr1/KwM=";
   };
 
-  vendorHash = "sha256-A7ZuY8Gc/a0Y8O6UG2WHWxptHstJOxi4n9F8TY6zqiw=";
+  vendorHash = "sha256-5duwAxAgbPZIbbgzZE2m574TF/0+jF/TvTKI4YBH6jM=";
 
   env.CGO_ENABLED = 1;
 

From c163ecf4b86684287d2aae8855e341f39fe93ae2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 21:05:12 +0000
Subject: [PATCH 5410/6226] automatic-timezoned: 2.0.96 -> 2.0.101

---
 pkgs/by-name/au/automatic-timezoned/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix
index 86feba867250..5be8284b0124 100644
--- a/pkgs/by-name/au/automatic-timezoned/package.nix
+++ b/pkgs/by-name/au/automatic-timezoned/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "automatic-timezoned";
-  version = "2.0.96";
+  version = "2.0.101";
 
   src = fetchFromGitHub {
     owner = "maxbrunet";
     repo = "automatic-timezoned";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-Y2dx0Y5wfYXewJkf7W2YgupdTfwsJg7MTPsFpLmJ9k8=";
+    sha256 = "sha256-OiBFFXdaBYBSToEzWafxNLBC12J1f3mO7DMzKESRxSY=";
   };
 
-  cargoHash = "sha256-c5KDy767GxZwTwrcjsnfEQVlFiYxmjSdpFx07ymMtBE=";
+  cargoHash = "sha256-vX7QGLPuU08KhAJUujgqtPmzW3Ji38W1YiEZ4KbI2mE=";
 
   nativeInstallCheckInputs = [ versionCheckHook ];
 

From 9789c64827c8eb5fd25b6ebe0fa9471a48789ebb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 21:09:20 +0000
Subject: [PATCH 5411/6226] vscode-extensions.mvllow.rose-pine: 2.14.0 ->
 2.15.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 69bedeaef989..de246461cc4e 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3511,8 +3511,8 @@ let
         mktplcRef = {
           publisher = "mvllow";
           name = "rose-pine";
-          version = "2.14.0";
-          hash = "sha256-bjYumipeZM5tNl/cTHLcm/EyX4FU1AzQU3W53e0cGfc=";
+          version = "2.15.0";
+          hash = "sha256-4l4KzxrLU34dIHI7ycypyN0yi2jzRs8voAD5HE4fgII=";
         };
         meta = {
           license = lib.licenses.mit;

From fff8ea8330bdd5bf580a12bdebc6c45daad6a4ca Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 4 Nov 2025 21:17:20 +0000
Subject: [PATCH 5412/6226] python3Packages.imageio: 2.37.1 -> 2.37.2

Diff: https://github.com/imageio/imageio/compare/v2.37.1...v2.37.2

Changelog: https://github.com/imageio/imageio/blob/v2.37.2/CHANGELOG.md
---
 pkgs/development/python-modules/imageio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/imageio/default.nix b/pkgs/development/python-modules/imageio/default.nix
index 8811e6c7ce27..40e134e303f1 100644
--- a/pkgs/development/python-modules/imageio/default.nix
+++ b/pkgs/development/python-modules/imageio/default.nix
@@ -43,14 +43,14 @@ in
 
 buildPythonPackage rec {
   pname = "imageio";
-  version = "2.37.1";
+  version = "2.37.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "imageio";
     repo = "imageio";
     tag = "v${version}";
-    hash = "sha256-eNS++8pD+m51IxRR23E98K0f3rwNez/UiByA+PSfUH8=";
+    hash = "sha256-8wKTcmnep67zBMYgd6Gpr3wRCIrzYaqfytL1o7iBNAk=";
   };
 
   postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) ''

From dcb0423368ae41922a6555d08892520d5b0f3864 Mon Sep 17 00:00:00 2001
From: Winter M <winter@antithesis.com>
Date: Wed, 29 Oct 2025 16:59:14 -0400
Subject: [PATCH 5413/6226] nixos/installer/cd-dvd/iso-image: include
 memtest86+ in grub menu

We previously only did this for Syslinux, which we don't use on UEFI machines.

Co-authored-by: Lee Bousfield <ljbousfield@gmail.com>
---
 nixos/modules/installer/cd-dvd/iso-image.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix
index 76a1517d9dae..60ba783b0466 100644
--- a/nixos/modules/installer/cd-dvd/iso-image.nix
+++ b/nixos/modules/installer/cd-dvd/iso-image.nix
@@ -459,6 +459,11 @@ let
             }
           fi
         ''}
+        ${lib.optionalString config.boot.loader.grub.memtest86.enable ''
+          menuentry 'Memtest86+' --class debug {
+            linux (\$root)/boot/memtest.bin ${toString config.boot.loader.grub.memtest86.params}
+          }
+        ''}
         menuentry 'Firmware Setup' --class settings {
           fwsetup
           clear

From d2a1ac01c9bf33447087b8f7d2b6de0c7aa8d394 Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Wed, 5 Nov 2025 00:21:18 +0300
Subject: [PATCH 5414/6226] kdePackages: Plasma 6.5.1 -> 6.5.2

---
 pkgs/kde/generated/sources/plasma.json | 420 ++++++++++++-------------
 1 file changed, 210 insertions(+), 210 deletions(-)

diff --git a/pkgs/kde/generated/sources/plasma.json b/pkgs/kde/generated/sources/plasma.json
index 789639040d18..582b4288f10b 100644
--- a/pkgs/kde/generated/sources/plasma.json
+++ b/pkgs/kde/generated/sources/plasma.json
@@ -1,352 +1,352 @@
 {
   "aurorae": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/aurorae-6.5.1.tar.xz",
-    "hash": "sha256-nDDvI4iVQ19V93RNHlQYwQqO7xt52XNBQmJ+VZeKG+w="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/aurorae-6.5.2.tar.xz",
+    "hash": "sha256-841YVc/6nXop+oA5NLunyKaEckPvdztV8iPoZLedmNM="
   },
   "bluedevil": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/bluedevil-6.5.1.tar.xz",
-    "hash": "sha256-MJXnrL4UCeni/hgN1ZFWiPwqJGqvIf/WiL55E+rPug8="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/bluedevil-6.5.2.tar.xz",
+    "hash": "sha256-SMO0a3mQpM+F+p0HAx5uZkIZA4hml3ki7khkt+fcQ7A="
   },
   "breeze": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/breeze-6.5.1.tar.xz",
-    "hash": "sha256-ibmXbCrjdnezbJyIaG7pXsUOpPbtm1d8R7WnEixqUvM="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/breeze-6.5.2.tar.xz",
+    "hash": "sha256-kHtfBYrKkT7INTeZ332c4MiNzaLRvLv0pTn4iGzweos="
   },
   "breeze-grub": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/breeze-grub-6.5.1.tar.xz",
-    "hash": "sha256-3u4ntMB5fL5i2lgcg0yc/Ec7mTuv2bUeLLJNhEVKAvI="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/breeze-grub-6.5.2.tar.xz",
+    "hash": "sha256-cPqZ3+g1S8xo9Jdy/Yp2HEU8L444vocqSrxc0IQM6GA="
   },
   "breeze-gtk": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/breeze-gtk-6.5.1.tar.xz",
-    "hash": "sha256-Gx3ok+uS4cnA/x3WFp1Vw8BipJvSy6spNsFv6PoGAJY="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/breeze-gtk-6.5.2.tar.xz",
+    "hash": "sha256-xoLa9fYW0D24VleXiSeKocNjLy1U+xCPBOLMgamu/bk="
   },
   "breeze-plymouth": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/breeze-plymouth-6.5.1.tar.xz",
-    "hash": "sha256-WSKhstRDkYOMlI84ckkUUI5nUHTksY0BozemblJYHbk="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/breeze-plymouth-6.5.2.tar.xz",
+    "hash": "sha256-l8x40alOENpET+Ne04RBucOIdER6RNy5z1NbQveJo3A="
   },
   "discover": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/discover-6.5.1.tar.xz",
-    "hash": "sha256-euUVqa013W21aOwj3F7GwkwcVV3fQS8EHt5L6dzz88w="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/discover-6.5.2.tar.xz",
+    "hash": "sha256-GYgdD1yXUdlZ8uzvS09opwswSmyXy1V5+kqsl8uvJEo="
   },
   "drkonqi": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/drkonqi-6.5.1.tar.xz",
-    "hash": "sha256-pSYFVQEOV2KB0wQXZCctUSX110+N8/cX/CzRmaH2nH0="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/drkonqi-6.5.2.tar.xz",
+    "hash": "sha256-G5Gd4KutbzSMKCB6qfpGy6WZL1Gx00lNke6WukdVT+g="
   },
   "flatpak-kcm": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/flatpak-kcm-6.5.1.tar.xz",
-    "hash": "sha256-o6y3kVVzyUJb+qdcENrroNxMgU2ecY7XVq1D12ZtlbY="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/flatpak-kcm-6.5.2.tar.xz",
+    "hash": "sha256-HwsfFZ0kD1Cq+hs3xnZ4ukSrMI1gJAhKUEswyGIMrIU="
   },
   "kactivitymanagerd": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/kactivitymanagerd-6.5.1.tar.xz",
-    "hash": "sha256-Skge3EiRK1XeNk8WirpbXNICJjpMn9aOYz5QADaleCk="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kactivitymanagerd-6.5.2.tar.xz",
+    "hash": "sha256-kzK18PyG+AakgLtFESaTqD35BtuOrdwkF0Wemm18320="
   },
   "kde-cli-tools": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/kde-cli-tools-6.5.1.tar.xz",
-    "hash": "sha256-dGYdjccaNFuQZRd1mAsK06+yiBlK8GqjOrxpjgGD4sM="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kde-cli-tools-6.5.2.tar.xz",
+    "hash": "sha256-g08dpx7G+estBWAhgICg8CoAzWYJye1UZAEXAMKKChw="
   },
   "kde-gtk-config": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/kde-gtk-config-6.5.1.tar.xz",
-    "hash": "sha256-dqJ+aMXb0z8XavtJ21DwnBElIf0lqAUx9EdZUz4I2U0="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kde-gtk-config-6.5.2.tar.xz",
+    "hash": "sha256-zDfNNAG+DOZ2ZjyLohQT96P7Msc7aE8i0XKmKt5OjSk="
   },
   "kdecoration": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/kdecoration-6.5.1.tar.xz",
-    "hash": "sha256-tZQC0jv8mWpXWvU/aTl3hGyX9sGpyTSvqVrCzv01jCQ="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kdecoration-6.5.2.tar.xz",
+    "hash": "sha256-KWPcRP8rHMfqRMuzgA01xNC86teDcoF5r9pQTMBhFXY="
   },
   "kdeplasma-addons": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/kdeplasma-addons-6.5.1.tar.xz",
-    "hash": "sha256-pLGc1rKKulcxWOh4yUm6qSfrp3/raZH0N9R9Q5KQ/58="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kdeplasma-addons-6.5.2.tar.xz",
+    "hash": "sha256-k1scookMqwPvm/DKzI+1pgRPpohIfUtg+XqyOaO5VoQ="
   },
   "kgamma": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/kgamma-6.5.1.tar.xz",
-    "hash": "sha256-A90ydZsEziJamA8GB4+ze5WDivDLiDplFC+nUxpKcOw="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kgamma-6.5.2.tar.xz",
+    "hash": "sha256-U4NT/837fm1m4WsaP6//pHiyk8fVdlbKcQFvKut4Lu4="
   },
   "kglobalacceld": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/kglobalacceld-6.5.1.tar.xz",
-    "hash": "sha256-X3pmjbrldu7w0WBYGDsAiadiO+wAg8XKWjcJrJe6yeM="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kglobalacceld-6.5.2.tar.xz",
+    "hash": "sha256-iVTHt1TiKv/X9570Bh9a4McXmPe8VTHqyMd4k2uk9fY="
   },
   "kinfocenter": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/kinfocenter-6.5.1.tar.xz",
-    "hash": "sha256-GcL1WJrBF+B9Kdz6PaBlcXdKYHdEhy7WNcgius9Itiw="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kinfocenter-6.5.2.tar.xz",
+    "hash": "sha256-/+CaFpx2x5zlUe8rTu6XpuHYcm0LGi/CR/eNoYhgRkk="
   },
   "kmenuedit": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/kmenuedit-6.5.1.tar.xz",
-    "hash": "sha256-buDijgNUeHpyAplToypkwLYDngDBArk4RxF4qNt8zKA="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kmenuedit-6.5.2.tar.xz",
+    "hash": "sha256-jmHvx08nPw2UwejXgN/kqi9Qpr6a3qaJpDZ+DyLMy1U="
   },
   "knighttime": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/knighttime-6.5.1.tar.xz",
-    "hash": "sha256-Xlzj5SWZRSDm8Hni2m3wBNnk1yu1GcYAMTUF7+Q4Qgw="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/knighttime-6.5.2.tar.xz",
+    "hash": "sha256-z/zPpFuzAU5eAn3aqflUnIhAhHoGU5Qs7EIRS8XPnw0="
   },
   "kpipewire": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/kpipewire-6.5.1.tar.xz",
-    "hash": "sha256-Tm4RImeWUA6P2bc5J06WCQ6HT43rKUxXDPMJkQd42a0="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kpipewire-6.5.2.tar.xz",
+    "hash": "sha256-Wq9FfQj8Ut6iVOqlt+Bc8OkVABQR9P3W8vSqCxKQ/ok="
   },
   "krdp": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/krdp-6.5.1.tar.xz",
-    "hash": "sha256-mO/GHKT8GAevIsqcUlEEd0PCe+hHDEPJZROsXi8LtDw="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/krdp-6.5.2.tar.xz",
+    "hash": "sha256-IKsnIvIpcQZpIAw9/DWIjOxuKzw43OEguwW5nKN9WP8="
   },
   "kscreen": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/kscreen-6.5.1.tar.xz",
-    "hash": "sha256-2dMEroOMQEyHKkL7/ahyikXvQyPX4QcU0VcEZqk1OEs="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kscreen-6.5.2.tar.xz",
+    "hash": "sha256-nIFP1C+XMBlvwMnmIwqFv8gATA5XMrBIedNdtNe5xGg="
   },
   "kscreenlocker": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/kscreenlocker-6.5.1.tar.xz",
-    "hash": "sha256-N9+IanbW/wlKQk5YJ1/okxQDjW7CHGilunPar1fM8sc="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kscreenlocker-6.5.2.tar.xz",
+    "hash": "sha256-0AmJSoiWSgxENw3dWoO3qV5k9qrS9Hsm/vfMiB0NBLY="
   },
   "ksshaskpass": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/ksshaskpass-6.5.1.tar.xz",
-    "hash": "sha256-aobW64ouchh1cAv+cmT936e973HRJavYoPzRYXQIdM4="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/ksshaskpass-6.5.2.tar.xz",
+    "hash": "sha256-4c2svd5GS3crwpvVIN3iUDtU9+JPasnKPv1+ycqdjGI="
   },
   "ksystemstats": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/ksystemstats-6.5.1.tar.xz",
-    "hash": "sha256-KJX6eX/mTBrlhvoe/R9uLuEQIG5Kc6bdreadHL0BMjQ="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/ksystemstats-6.5.2.tar.xz",
+    "hash": "sha256-2MJyoyQv5dCTe54wUbMCM1sw68MijoLWVJwSpOWIb8o="
   },
   "kwallet-pam": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/kwallet-pam-6.5.1.tar.xz",
-    "hash": "sha256-NGCI2FVg/rhxSmxmyOeuXjC1gJYMv8aIEvJ9gFKoj7w="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kwallet-pam-6.5.2.tar.xz",
+    "hash": "sha256-X8P6pZQR7tdCg9aqVMLev8fmorMIjXBRrmL99iaK6HY="
   },
   "kwayland": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/kwayland-6.5.1.tar.xz",
-    "hash": "sha256-ViLuJRfsgOncYCA+BLWtur0M6t380oLES4VCZEuAh2c="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kwayland-6.5.2.tar.xz",
+    "hash": "sha256-qmPjdT4kHzlV64Bq6Rrx85Y+QuxzHyuKIzARm2XLVXo="
   },
   "kwayland-integration": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/kwayland-integration-6.5.1.tar.xz",
-    "hash": "sha256-XOSNwGHrx5r/P0WBZcat7NNFFxFnkWv9Nf4Rn5klYro="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kwayland-integration-6.5.2.tar.xz",
+    "hash": "sha256-TRCULpmoY3aEoT4b5HIeIFdEgrUr8b6yXRf99QG9XQY="
   },
   "kwin": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/kwin-6.5.1.tar.xz",
-    "hash": "sha256-xDagByiELpL2W+tlWOBXdUhF9GNOW+wpFKLRsbOLyvs="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kwin-6.5.2.tar.xz",
+    "hash": "sha256-O+DVaf40La3e6Fm6tq79oy1wVrYB6EA46K+SWT8UB3Q="
   },
   "kwin-x11": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/kwin-x11-6.5.1.tar.xz",
-    "hash": "sha256-8X78YWnPFB99DG+ocb1j+mn+PunXDxxRVFDwol3OShI="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kwin-x11-6.5.2.tar.xz",
+    "hash": "sha256-Yy5rFMfTArbv7GKrCEJqkkynIMtvsgfw+SLln39oklY="
   },
   "kwrited": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/kwrited-6.5.1.tar.xz",
-    "hash": "sha256-CuPbsbWjuk4EkOrv1OJOZbcDvQv9cn5hNSgOXqTOSBY="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/kwrited-6.5.2.tar.xz",
+    "hash": "sha256-AJVfKaxwbM6qYDhz80NHQ5VtrERNHJDYUnqj87MrCYk="
   },
   "layer-shell-qt": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/layer-shell-qt-6.5.1.tar.xz",
-    "hash": "sha256-9zZ9afjRMy3X3GMpUhQl/ru4E/qn8Jp6bhA9Qb+3CsI="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/layer-shell-qt-6.5.2.tar.xz",
+    "hash": "sha256-RTC7iOP7K2NYuoFpoMg5ItnbwzIQ+NjSt9BHndRJYz0="
   },
   "libkscreen": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/libkscreen-6.5.1.tar.xz",
-    "hash": "sha256-k4wPRsM3OGc/drZKb3Unh3eGkfpOHRTHAh5uTO+Cbco="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/libkscreen-6.5.2.tar.xz",
+    "hash": "sha256-KAmXVDSKfTr3TXm0Q9f96OaisyxuVJG1IBgNZdHhumE="
   },
   "libksysguard": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/libksysguard-6.5.1.tar.xz",
-    "hash": "sha256-xO4fo0qS1TIUAUE5hBbV9yUmfIrutg+7mWmJbMzIHC8="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/libksysguard-6.5.2.tar.xz",
+    "hash": "sha256-TSOiKHHKlHz2/Loh47xNGr0WqrsvchGZ36NP0z+JRfs="
   },
   "libplasma": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/libplasma-6.5.1.tar.xz",
-    "hash": "sha256-UvIXUqOUfPVCvsO30+WXnXzcFSt7R/5kk7itsFHVihg="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/libplasma-6.5.2.tar.xz",
+    "hash": "sha256-GU/P2XK3wIguiFKGA9iu9pqgpe8ZlzC/Wx4zAi8h5uE="
   },
   "milou": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/milou-6.5.1.tar.xz",
-    "hash": "sha256-vtlXntxcvjcCqNZkGSD07ANgXx6NTyPHixg18HzncTQ="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/milou-6.5.2.tar.xz",
+    "hash": "sha256-hLN5xBoVTqJMAiPEbLf5HqVBDyejz/AStK7cOEHnm70="
   },
   "ocean-sound-theme": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/ocean-sound-theme-6.5.1.tar.xz",
-    "hash": "sha256-vncLjtOad9ZES6XwpkA3IDOOiu5DjRGnDMfwh73Ixqg="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/ocean-sound-theme-6.5.2.tar.xz",
+    "hash": "sha256-fju1kwnlT4qj5jA6cNrA66kWYuCgcJ0EH9Bzci8G7pE="
   },
   "oxygen": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/oxygen-6.5.1.tar.xz",
-    "hash": "sha256-vxV5odEM/ncTMS5f8hvK6fk5i5CFIolmrGqmlmq+rwo="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/oxygen-6.5.2.tar.xz",
+    "hash": "sha256-00nHko8GiYIze7RUgewZ2UKmj0fg8KJeuDnqL/NYVWo="
   },
   "oxygen-sounds": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/oxygen-sounds-6.5.1.tar.xz",
-    "hash": "sha256-pkqkMjSSrgn+le8TSjtKrXKg68RD7L5uI5W6q/awmK8="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/oxygen-sounds-6.5.2.tar.xz",
+    "hash": "sha256-EPWqgfxNIUhCKu6OBpKI1SJnISPjEId90hBUN7ai5hc="
   },
   "plasma-activities": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plasma-activities-6.5.1.tar.xz",
-    "hash": "sha256-Hz46eBr0UQAVTIT7jIuv8FVo5ApMFGvyDSwAoW/iQdE="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-activities-6.5.2.tar.xz",
+    "hash": "sha256-OXg9Mk88A0BFIbSSZNNBNXVtALzq1GF3pLmJ+L6nRJo="
   },
   "plasma-activities-stats": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plasma-activities-stats-6.5.1.tar.xz",
-    "hash": "sha256-H2vfj9mXTAq4aM42fk9rm/EO1IzWak5bgusJ2xKQcBc="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-activities-stats-6.5.2.tar.xz",
+    "hash": "sha256-uaZbFk7XowEhGOCJFnDKXoKHssuPQvVi3H9kmFL0kAA="
   },
   "plasma-browser-integration": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plasma-browser-integration-6.5.1.tar.xz",
-    "hash": "sha256-bjrq5mwWJ9SSHPBtpNs7/b6F+hq/wgx7xTg20M6uIi4="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-browser-integration-6.5.2.tar.xz",
+    "hash": "sha256-gVtIMUrwSqvnghJe+eut59UIedqe471+2yOEnNpmAqs="
   },
   "plasma-desktop": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plasma-desktop-6.5.1.tar.xz",
-    "hash": "sha256-VU3r3ENWYUUNIrv+EqlBwL/4IjqmYpIL9fAb4MKvPx8="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-desktop-6.5.2.tar.xz",
+    "hash": "sha256-sLKzNR/I5vU/BnPnu04HctnfYg6dPeZeZR09cDBselg="
   },
   "plasma-dialer": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plasma-dialer-6.5.1.tar.xz",
-    "hash": "sha256-ohwRgQIIxSw9iCW1cr1xPWaXsctP6xQG/LkNOBR/jhQ="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-dialer-6.5.2.tar.xz",
+    "hash": "sha256-Sr/LxXutBI5pAv6s2uDtCGnLBr6fkgTQ89Mq4TrWeHg="
   },
   "plasma-disks": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plasma-disks-6.5.1.tar.xz",
-    "hash": "sha256-/g6LsGG+wiXYs0gNFsnYvunwYG8HT6UWV1f0jnIOQUM="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-disks-6.5.2.tar.xz",
+    "hash": "sha256-msmFPznZ1Npyt/sP2FimSvmSuWprwl6BtVEZiN31HXs="
   },
   "plasma-firewall": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plasma-firewall-6.5.1.tar.xz",
-    "hash": "sha256-61e9xjoyYWfJohxfM8yyXrB+1Kd0ODU+7zpfCC+EKoY="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-firewall-6.5.2.tar.xz",
+    "hash": "sha256-2hMkTe+ntKtu+1kHIQmo0zJ6fshR0V5Ho7wauhVaQd8="
   },
   "plasma-integration": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plasma-integration-6.5.1.tar.xz",
-    "hash": "sha256-YnEY51CVNdtBYN1LCUcA+V3PI5ILGPDVFOW0YwMzVDM="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-integration-6.5.2.tar.xz",
+    "hash": "sha256-ihP8/Vphz5/2g3VP5wE+JPIoW4859nmbod97ye5ffuQ="
   },
   "plasma-mobile": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plasma-mobile-6.5.1.tar.xz",
-    "hash": "sha256-BC7NnyvgMr1b+Ui4QYu0D0w9ysaN78Kvq+iHGnj7TI4="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-mobile-6.5.2.tar.xz",
+    "hash": "sha256-bspdBG7Uas2u3GShUIwG6BzJogWgyhYJ6IqU6QeLgGc="
   },
   "plasma-nano": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plasma-nano-6.5.1.tar.xz",
-    "hash": "sha256-KCeNaa09wjkpZTbej+5CJTHvan8emzZwsAAqWAZEyYg="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-nano-6.5.2.tar.xz",
+    "hash": "sha256-wjzWhBCqU7CAmWhPDCg4RH24FhX79o2pN95uW4VUsgM="
   },
   "plasma-nm": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plasma-nm-6.5.1.tar.xz",
-    "hash": "sha256-xPZUtUc62W8xGeylc6Gk7F7eCl9hKbLIt+sCMP3rPpw="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-nm-6.5.2.tar.xz",
+    "hash": "sha256-58Ppw4m45tjerF2eOhA74JIRH8/o3sVxg1agf7p4f9w="
   },
   "plasma-pa": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plasma-pa-6.5.1.tar.xz",
-    "hash": "sha256-oNip/KNERP6jRqHcIWYjNf+CrLn9Ba9FfeBun6bUB80="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-pa-6.5.2.tar.xz",
+    "hash": "sha256-hReGSd+zf2XYON5UFRsT8KFFxBesyHm1P2L0ptLwQaE="
   },
   "plasma-sdk": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plasma-sdk-6.5.1.tar.xz",
-    "hash": "sha256-MImo+N0mvSI7zRxj9GNPLr9lVH1M7QIxYTeodUxWQ4c="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-sdk-6.5.2.tar.xz",
+    "hash": "sha256-EgWo57nBxQ7LKjBWLEU6Mge9e/rmhufrzyCrkZOvIj0="
   },
   "plasma-systemmonitor": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plasma-systemmonitor-6.5.1.tar.xz",
-    "hash": "sha256-ZwiX9A8NxkcL6Hya3zbnFPpTavMy28Rmzax9+ce0Yp8="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-systemmonitor-6.5.2.tar.xz",
+    "hash": "sha256-CjMpu9ex9MunQ000eJXH7hgUuwZD0SALv+D/HPi8yiE="
   },
   "plasma-thunderbolt": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plasma-thunderbolt-6.5.1.tar.xz",
-    "hash": "sha256-pdfEjdQ5b4rnp89BCLs7GB6RD60hHIQogjMzOBTJtlY="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-thunderbolt-6.5.2.tar.xz",
+    "hash": "sha256-V23b746OP6RNCQwj3DvT5eclgkr5Ih/dU1rUj6J/l7A="
   },
   "plasma-vault": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plasma-vault-6.5.1.tar.xz",
-    "hash": "sha256-k08VPD0hieSjU4YqWXF4Zszw/fOsvkdWyEruCGEuhUg="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-vault-6.5.2.tar.xz",
+    "hash": "sha256-wFX4WGh+tvYibTjPhFW99VEG6e+mvbPXsDuQqf+mzmk="
   },
   "plasma-welcome": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plasma-welcome-6.5.1.tar.xz",
-    "hash": "sha256-KgG52Y2NBPnFqOcDT+Tuq+FRuvrZP3Eym2psD4hwLnM="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-welcome-6.5.2.tar.xz",
+    "hash": "sha256-gJhnSo+0yycl3DwHDol9hHBHaVk2FZsASNXV0aA2lWM="
   },
   "plasma-workspace": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plasma-workspace-6.5.1.tar.xz",
-    "hash": "sha256-e+2icLSptdmoAWvw43MimvD+4CQkIxiuL5RcwyuAfKI="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-workspace-6.5.2.tar.xz",
+    "hash": "sha256-i/f6U7M+J0SOKxUfX8CGzsxdf1FjxKnY8Th15WduC6Y="
   },
   "plasma-workspace-wallpapers": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plasma-workspace-wallpapers-6.5.1.tar.xz",
-    "hash": "sha256-AlkQ+7dpRilxTxfgfc4niA2dozqPPQHAuq5mPpQVals="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma-workspace-wallpapers-6.5.2.tar.xz",
+    "hash": "sha256-BawdOsYHVjvxjeXOxJ9sClv1HILmuL9EZohuDRnTWTs="
   },
   "plasma5support": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plasma5support-6.5.1.tar.xz",
-    "hash": "sha256-cLn5YSLxnO+kyl77aZC5aJ4onphq9snj7KTnTPVZ0nk="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plasma5support-6.5.2.tar.xz",
+    "hash": "sha256-gRVRyYxL8EK3keJjWpAP52qvKw3HG1TeyA+cOH90uO8="
   },
   "plymouth-kcm": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/plymouth-kcm-6.5.1.tar.xz",
-    "hash": "sha256-LN0hfUkMIzLHXdhS3+WnZ+JNXc4Ot55HsDsp+kjYpmM="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/plymouth-kcm-6.5.2.tar.xz",
+    "hash": "sha256-CdRfq03ykcO/58b8FC4uomReON/UWZZ1zRpOzBRmOPA="
   },
   "polkit-kde-agent-1": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/polkit-kde-agent-1-6.5.1.tar.xz",
-    "hash": "sha256-D+hTTQ/yazWUlIM3Qi3yAavAhwSD3bEOifatuZJMbWI="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/polkit-kde-agent-1-6.5.2.tar.xz",
+    "hash": "sha256-NRzNYj/uhzwdenD0DgoFv5hOrRR5HNkleyt73S3cBMw="
   },
   "powerdevil": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/powerdevil-6.5.1.tar.xz",
-    "hash": "sha256-UZnkM1StUkGaH1PmoVsWcjuPf3N2ouR2bjqSC337dD8="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/powerdevil-6.5.2.tar.xz",
+    "hash": "sha256-fP6wi+s8xErGrlJWE830CFXdETcIOwUNxeZdN2TL9Ms="
   },
   "print-manager": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/print-manager-6.5.1.tar.xz",
-    "hash": "sha256-anMpNCJBDNqHE/sIQQJrJxjY0pWHAKW+WtK8zHaGQRI="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/print-manager-6.5.2.tar.xz",
+    "hash": "sha256-Ti90yOpXgYRlJqQOwyE0UvRq+S0vsrL1vYel0OR/Eu0="
   },
   "qqc2-breeze-style": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/qqc2-breeze-style-6.5.1.tar.xz",
-    "hash": "sha256-jKOgmWpNzgbJphmYr+FAIB9gwBGaA3rrvAf8PXoo0KA="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/qqc2-breeze-style-6.5.2.tar.xz",
+    "hash": "sha256-1Ug9q2fFeCMMfnjJ+lS7kA2eGTVvkVBY5IKoTZGVbIE="
   },
   "sddm-kcm": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/sddm-kcm-6.5.1.tar.xz",
-    "hash": "sha256-HYgzqCLhg7vq2Z7HaECsLU7RMZ6CNeiocZ8xxwNEk9E="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/sddm-kcm-6.5.2.tar.xz",
+    "hash": "sha256-w5E/2Z+vRLwdKKDmQxbHvfwBmzjNfrgIABRuDH811yk="
   },
   "spacebar": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/spacebar-6.5.1.tar.xz",
-    "hash": "sha256-rBx6xeWY24v1IESCv7osWY+p4jxhSLJVjdqfHeZHCbw="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/spacebar-6.5.2.tar.xz",
+    "hash": "sha256-IxRtwvvg2AVzsVilWZOKiObVpEBdOVgrM2V6guMnUso="
   },
   "spectacle": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/spectacle-6.5.1.tar.xz",
-    "hash": "sha256-pG0uZ/ujsSnCUScbxsJGMyOAHKVWajyFRVMH0fP78Lo="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/spectacle-6.5.2.tar.xz",
+    "hash": "sha256-RkH7Fk3bPP3vd1l9jbdSGODIt6tjwL38IMoMeiQgmS4="
   },
   "systemsettings": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/systemsettings-6.5.1.tar.xz",
-    "hash": "sha256-SPlwgXloDwJ08RlFedkUsWXcIcM7BY3h0hAkCgdhxjY="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/systemsettings-6.5.2.tar.xz",
+    "hash": "sha256-9vOyGSFg8IyCnAD+TAMV+cBiiNTE2vKHFB4R6D2KS84="
   },
   "wacomtablet": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/wacomtablet-6.5.1.tar.xz",
-    "hash": "sha256-lCG21PeqOcwosg0Rh+w9mN4ChfhYHo4VwQfHIjSCaIs="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/wacomtablet-6.5.2.tar.xz",
+    "hash": "sha256-wA1Zo3rYbWim9fESCwm02Ub6HNjEjFddZnH4VmR5vGM="
   },
   "xdg-desktop-portal-kde": {
-    "version": "6.5.1",
-    "url": "mirror://kde/stable/plasma/6.5.1/xdg-desktop-portal-kde-6.5.1.tar.xz",
-    "hash": "sha256-+qFye0L1+XGNz+3C+5lgaG+NkznZlXXABnkymP2Zrlo="
+    "version": "6.5.2",
+    "url": "mirror://kde/stable/plasma/6.5.2/xdg-desktop-portal-kde-6.5.2.tar.xz",
+    "hash": "sha256-ai6dwu0QV9+DaAI+o2mKzzCS5N7jHf/zC5X6gb16skk="
   }
 }
\ No newline at end of file

From f38f11b9388ccef700c996f9c531c1930f541aba Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 4 Nov 2025 21:18:32 +0000
Subject: [PATCH 5415/6226] direwolf-unstable: drop `cmake-4` (fix build)

Without the change the build fails as https://hydra.nixos.org/build/310538394:

    applying patch /nix/store/m9bm8k97zc0yn514psfnf53x8v1ws49q-c499496bbc237d0efdcacec5786607f5e17c1c7e.patch
    patching file CMakeLists.txt
    Reversed (or previously applied) patch detected!  Assume -R? [n]
    Apply anyway? [n]
    Skipping patch.
    1 out of 1 hunk ignored -- saving rejects to file CMakeLists.txt.rej
---
 pkgs/by-name/di/direwolf-unstable/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/di/direwolf-unstable/package.nix b/pkgs/by-name/di/direwolf-unstable/package.nix
index 7a9352f7ffb4..88a621623bcf 100644
--- a/pkgs/by-name/di/direwolf-unstable/package.nix
+++ b/pkgs/by-name/di/direwolf-unstable/package.nix
@@ -21,6 +21,9 @@
       hash = "sha256-VFBkOWHGZP7GjekHL3GY3BGkVXQbtyD1YPmu0xaQ1ME=";
     };
 
+    # drop upstreamed cmake-4 patch
+    patches = [ ];
+
     postPatch =
       builtins.replaceStrings
         [

From 5be3ff47f516b48bbf93262d2820f34c4f7dc2e3 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Tue, 4 Nov 2025 21:30:46 +0000
Subject: [PATCH 5416/6226] dmsdos: fix `cmake-4` fix

Without the change the build fails on `master` as
https://hydra.nixos.org/build/310538691:

    CMake Error at CMakeLists.txt:2 (cmake_minimum_required):
      Compatibility with CMake < 3.5 has been removed from CMake.

ZHF: #457852
---
 pkgs/by-name/dm/dmsdos/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/dm/dmsdos/package.nix b/pkgs/by-name/dm/dmsdos/package.nix
index 44b7bb9bdad5..0b6fa637d30e 100644
--- a/pkgs/by-name/dm/dmsdos/package.nix
+++ b/pkgs/by-name/dm/dmsdos/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
 }:
 
@@ -16,6 +17,16 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-oGVkDf1gFaSMRpvHq4GNLN8htBm/sYawZeVwiqQxjL8=";
   };
 
+  patches = [
+    # cmake-4 support:
+    #   https://github.com/sandsmark/dmsdos/pull/1
+    (fetchpatch {
+      name = "cmake-4.patch";
+      url = "https://github.com/sandsmark/dmsdos/commit/94076ab27800e9cba41ab05e6bb2edbb421154d9.patch";
+      hash = "sha256-olpnzPg/kbveUl0muwHKwI+DMGqXzxLrruFomf/SXjE=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
   ];

From 0a7a4c43a61389935a0a12902e398bf819434fd7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 21:32:08 +0000
Subject: [PATCH 5417/6226] gh: 2.82.1 -> 2.83.0

---
 pkgs/by-name/gh/gh/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix
index 9f3881dfdcca..0565b0c2b251 100644
--- a/pkgs/by-name/gh/gh/package.nix
+++ b/pkgs/by-name/gh/gh/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "gh";
-  version = "2.82.1";
+  version = "2.83.0";
 
   src = fetchFromGitHub {
     owner = "cli";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-WoxPqrh8SLptoG3qRvJbNRSYJE3GMJE7KufwSLGSvtA=";
+    hash = "sha256-WcD2q7Lnqmz8frFjZKAgN55Khgc1uVMzEbVBGoQc3Mc=";
   };
 
-  vendorHash = "sha256-vO/r74h4GJB1q3u429Gto9B621EHZ9rhzHJWtWK6Xh0=";
+  vendorHash = "sha256-sLCqUqo/0qsLpHjH81tJ/M2LD0X/kr8hToDFgZ8/wP8=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From c083f0e3eb2a32c8463bdcca36c592db68cf700e Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Tue, 4 Nov 2025 22:38:56 +0100
Subject: [PATCH 5418/6226] linuxPackages.linux-gpib: 4.3.6 -> 4.3.7

---
 pkgs/applications/science/electronics/linux-gpib/common.nix | 4 ++--
 pkgs/applications/science/electronics/linux-gpib/kernel.nix | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/science/electronics/linux-gpib/common.nix b/pkgs/applications/science/electronics/linux-gpib/common.nix
index e121c6c005f0..1e47424cce1f 100644
--- a/pkgs/applications/science/electronics/linux-gpib/common.nix
+++ b/pkgs/applications/science/electronics/linux-gpib/common.nix
@@ -4,12 +4,12 @@
   lib,
 }:
 rec {
-  version = "4.3.6";
+  version = "4.3.7";
   inherit pname;
 
   src = fetchurl {
     url = "mirror://sourceforge/project/linux-gpib/linux-gpib%20for%203.x.x%20and%202.6.x%20kernels/${version}/linux-gpib-${version}.tar.gz";
-    hash = "sha256-Gze4xrvkhEgn+J5Jhrycezjp2uhlD1v6aX0WGv4J2Jg=";
+    hash = "sha256-s/+BJgaGXIW1iwEqQhim/juC0XfIwKvHlcsi20HzrWg=";
   };
 
   unpackPhase = ''
diff --git a/pkgs/applications/science/electronics/linux-gpib/kernel.nix b/pkgs/applications/science/electronics/linux-gpib/kernel.nix
index 49d280757d14..9529f2ee1713 100644
--- a/pkgs/applications/science/electronics/linux-gpib/kernel.nix
+++ b/pkgs/applications/science/electronics/linux-gpib/kernel.nix
@@ -21,6 +21,7 @@ stdenv.mkDerivation (
 
     makeFlags = [
       "LINUX_SRCDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"
+      "LINUX_SSRCDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/source"
     ];
 
     installFlags = [

From 93eafa80f84aa2c17d90a00352e59479824e269d Mon Sep 17 00:00:00 2001
From: Connor Baker <ConnorBaker01@gmail.com>
Date: Tue, 4 Nov 2025 13:39:49 -0800
Subject: [PATCH 5419/6226] cudaPackages.nccl-tests: 2.14.1 -> 2.17.6

Signed-off-by: Connor Baker <ConnorBaker01@gmail.com>
---
 .../cuda-modules/packages/nccl-tests.nix      | 25 ++++++++-----------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/nccl-tests.nix b/pkgs/development/cuda-modules/packages/nccl-tests.nix
index 4a7528a10356..e94c03e658d0 100644
--- a/pkgs/development/cuda-modules/packages/nccl-tests.nix
+++ b/pkgs/development/cuda-modules/packages/nccl-tests.nix
@@ -20,7 +20,7 @@
 let
   inherit (_cuda.lib) _mkMetaBroken;
   inherit (lib) licenses maintainers teams;
-  inherit (lib.attrsets) getBin;
+  inherit (lib.attrsets) getBin getInclude getLib;
   inherit (lib.lists) optionals;
 in
 backendStdenv.mkDerivation (finalAttrs: {
@@ -30,27 +30,21 @@ backendStdenv.mkDerivation (finalAttrs: {
   # NOTE: Depends on the CUDA package set, so use cudaNamePrefix.
   name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
   pname = "nccl-tests";
-  version = "2.14.1";
+  version = "2.17.6";
 
   src = fetchFromGitHub {
     owner = "NVIDIA";
     repo = "nccl-tests";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-OgffbW9Vx/sm1I1tpaPGdAhIpV4jbB4hJa9UcEAWkdE=";
+    hash = "sha256-F7F8UcBCX7nsuCNCzWHNY12QFtmYV10Jf785P39SHkM=";
   };
 
   postPatch = ''
-    nixLog "patching $PWD/src/Makefile to remove NVIDIA's ccbin declaration"
-    substituteInPlace ./src/Makefile \
+    nixLog "patching $PWD/src/common.mk to remove NVIDIA's ccbin declaration"
+    substituteInPlace ./src/common.mk \
       --replace-fail \
         '-ccbin $(CXX)' \
         ""
-
-    nixLog "patching $PWD/src/Makefile to replace -std=c++11 with -std=c++14"
-    substituteInPlace ./src/Makefile \
-      --replace-fail \
-        '-std=c++11' \
-        '-std=c++14'
   '';
 
   nativeBuildInputs = [
@@ -65,12 +59,15 @@ backendStdenv.mkDerivation (finalAttrs: {
   ]
   ++ optionals mpiSupport [ mpi ];
 
+  # NOTE: CUDA_HOME is expected to have the bin directory
+  # TODO: This won't work with cross-compilation since cuda_nvcc will come from hostPackages by default (aka pkgs).
   makeFlags = [
-    # NOTE: CUDA_HOME is expected to have the bin directory
-    # TODO: This won't work with cross-compilation since cuda_nvcc will come from hostPackages by default (aka pkgs).
+    "CXXSTD=-std=c++17"
     "CUDA_HOME=${getBin cuda_nvcc}"
-    "NCCL_HOME=${nccl}"
+    "CUDA_INC=${getInclude cuda_cudart}/include"
+    "CUDA_LIB=${getLib cuda_cudart}/lib"
     "NVCC_GENCODE=${flags.gencodeString}"
+    "PREFIX=$(out)"
   ]
   ++ optionals mpiSupport [ "MPI=1" ];
 

From d73879457c73b6f51193f1d96903c6a34cf161a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 21:44:55 +0000
Subject: [PATCH 5420/6226] gemini-cli-bin: 0.10.0 -> 0.11.3

---
 pkgs/by-name/ge/gemini-cli-bin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ge/gemini-cli-bin/package.nix b/pkgs/by-name/ge/gemini-cli-bin/package.nix
index 5ed70043cd35..7258c5a2cc05 100644
--- a/pkgs/by-name/ge/gemini-cli-bin/package.nix
+++ b/pkgs/by-name/ge/gemini-cli-bin/package.nix
@@ -8,11 +8,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "gemini-cli-bin";
-  version = "0.10.0";
+  version = "0.11.3";
 
   src = fetchurl {
     url = "https://github.com/google-gemini/gemini-cli/releases/download/v${finalAttrs.version}/gemini.js";
-    hash = "sha256-jwyx5HWjPi2S5GQFxV+VeuwrmjmLi+F1nzw4YMfNSiA=";
+    hash = "sha256-JReB8+4+Pnbo8XsLGmcZ0xKjuFHeRC3e5uuhGOM/06I=";
   };
 
   dontUnpack = true;

From 91cb66d6984ca6566fd6482ae4fb2dcfa42b7be2 Mon Sep 17 00:00:00 2001
From: Nick Cao <nickcao@nichi.co>
Date: Tue, 4 Nov 2025 08:50:47 -0500
Subject: [PATCH 5421/6226] dbip-country-lite: add Guanran928 to maintainers

---
 pkgs/by-name/db/dbip-country-lite/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/db/dbip-country-lite/package.nix b/pkgs/by-name/db/dbip-country-lite/package.nix
index 11232a1e7ff7..1c484c2f8224 100644
--- a/pkgs/by-name/db/dbip-country-lite/package.nix
+++ b/pkgs/by-name/db/dbip-country-lite/package.nix
@@ -29,7 +29,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     description = "Free IP to Country Lite database by DB-IP";
     homepage = "https://db-ip.com/db/download/ip-to-country-lite";
     license = lib.licenses.cc-by-40;
-    maintainers = with lib.maintainers; [ nickcao ];
+    maintainers = with lib.maintainers; [
+      nickcao
+      Guanran928
+    ];
     platforms = lib.platforms.all;
   };
 })

From 2467e9335635a8efa0ffad47f58e3939028a6128 Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Tue, 4 Nov 2025 22:53:08 +0100
Subject: [PATCH 5422/6226] linuxPackages.shufflecake: 0.5.2 -> 0.5.5

---
 pkgs/os-specific/linux/shufflecake/default.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/os-specific/linux/shufflecake/default.nix b/pkgs/os-specific/linux/shufflecake/default.nix
index f8bda2bcfd5b..c087b0c55382 100644
--- a/pkgs/os-specific/linux/shufflecake/default.nix
+++ b/pkgs/os-specific/linux/shufflecake/default.nix
@@ -9,13 +9,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   name = "shufflecake";
-  version = "0.5.2";
+  version = "0.5.5";
+
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "shufflecake";
     repo = "shufflecake-c";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-EF9VKaqcNJt3hd/CUT+QeW17tc5ByStDanGGwi4uL4s=";
+    hash = "sha256-xVuI7tRARPFuETCCKYt507WpvZVZLaj9dhBkhJ03zc8=";
   };
 
   nativeBuildInputs = kernel.moduleBuildDependencies;
@@ -44,13 +45,13 @@ stdenv.mkDerivation (finalAttrs: {
     install -Dm555 shufflecake $bin/shufflecake
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Plausible deniability (hidden storage) layer for Linux";
     homepage = "https://shufflecake.net";
-    license = licenses.gpl2Only;
-    maintainers = with maintainers; [ oluceps ];
+    license = lib.licenses.gpl2Only;
+    maintainers = with lib.maintainers; [ oluceps ];
     outputsToInstall = [ "bin" ];
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
     broken = kernel.kernelOlder "6.1" || kernel.meta.name == "linux-lqx-6.12.1";
   };
 })

From 3106949fd710b35d3e89e3def45913f1441394a1 Mon Sep 17 00:00:00 2001
From: Felix Buehler <account@buehler.rocks>
Date: Wed, 1 Oct 2025 22:45:49 +0200
Subject: [PATCH 5423/6226] lib/types: add externalPath

---
 lib/tests/modules.sh                              |  9 +++++++++
 lib/tests/modules/types.nix                       |  8 ++++++++
 lib/types.nix                                     |  5 +++++
 .../manual/development/option-types.section.md    | 15 +++++++++++++++
 4 files changed, 37 insertions(+)

diff --git a/lib/tests/modules.sh b/lib/tests/modules.sh
index 093196da16c5..505c1c5a5fe4 100755
--- a/lib/tests/modules.sh
+++ b/lib/tests/modules.sh
@@ -223,6 +223,15 @@ checkConfigError 'A definition for option .* is not of type .path in the Nix sto
 checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: ".*/store/.links"' config.pathInStore.bad4 ./types.nix
 checkConfigError 'A definition for option .* is not of type .path in the Nix store.. Definition values:\n\s*- In .*: "/foo/bar"' config.pathInStore.bad5 ./types.nix
 
+# types.externalPath
+checkConfigOutput '".*/foo/bar"' config.externalPath.ok1 ./types.nix
+checkConfigOutput '".*/"' config.externalPath.ok2 ./types.nix
+checkConfigError 'A definition for option .* is not of type .absolute path not in the Nix store.' config.externalPath.bad1 ./types.nix
+checkConfigError 'A definition for option .* is not of type .absolute path not in the Nix store.' config.externalPath.bad2 ./types.nix
+checkConfigError 'A definition for option .* is not of type .absolute path not in the Nix store.' config.externalPath.bad3 ./types.nix
+checkConfigError 'A definition for option .* is not of type .absolute path not in the Nix store.' config.externalPath.bad4 ./types.nix
+checkConfigError 'A definition for option .* is not of type .absolute path not in the Nix store.' config.externalPath.bad5 ./types.nix
+
 # types.fileset
 checkConfigOutput '^0$' config.filesetCardinal.ok1 ./fileset.nix
 checkConfigOutput '^1$' config.filesetCardinal.ok2 ./fileset.nix
diff --git a/lib/tests/modules/types.nix b/lib/tests/modules/types.nix
index 3127ece89e49..0a566ea960c4 100644
--- a/lib/tests/modules/types.nix
+++ b/lib/tests/modules/types.nix
@@ -15,6 +15,7 @@ in
 {
   options = {
     pathInStore = mkOption { type = types.lazyAttrsOf types.pathInStore; };
+    externalPath = mkOption { type = types.lazyAttrsOf types.externalPath; };
     assertions = mkOption { };
   };
   config = {
@@ -26,6 +27,13 @@ in
     pathInStore.bad3 = "${storeDir}/";
     pathInStore.bad4 = "${storeDir}/.links"; # technically true, but not reasonable
     pathInStore.bad5 = "/foo/bar";
+    externalPath.bad1 = "${storeDir}/0lz9p8xhf89kb1c1kk6jxrzskaiygnlh-bash-5.2-p15.drv";
+    externalPath.bad2 = "${storeDir}/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15";
+    externalPath.bad3 = "${storeDir}/0fb3ykw9r5hpayd05sr0cizwadzq1d8q-bash-5.2-p15/bin/bash";
+    externalPath.bad4 = "";
+    externalPath.bad5 = "./foo/bar";
+    externalPath.ok1 = "/foo/bar";
+    externalPath.ok2 = "/";
 
     assertions =
       with lib.types;
diff --git a/lib/types.nix b/lib/types.nix
index cb41fb5c85aa..e57ceafcbaa4 100644
--- a/lib/types.nix
+++ b/lib/types.nix
@@ -676,6 +676,11 @@ let
         inStore = true;
       };
 
+      externalPath = pathWith {
+        absolute = true;
+        inStore = false;
+      };
+
       pathWith =
         {
           inStore ? null,
diff --git a/nixos/doc/manual/development/option-types.section.md b/nixos/doc/manual/development/option-types.section.md
index d2e0c7299415..707e2e3d1345 100644
--- a/nixos/doc/manual/development/option-types.section.md
+++ b/nixos/doc/manual/development/option-types.section.md
@@ -31,6 +31,21 @@ merging is handled.
 :   A path that is contained in the Nix store. This can be a top-level store
     path like `pkgs.hello` or a descendant like `"${pkgs.hello}/bin/hello"`.
 
+`types.externalPath`
+
+:   A path that is not contained in the Nix store. Typical use cases are:
+    secrets, password or any other external file.
+
+::: {.warning}
+This type only validates that the path is not *currently* in the Nix store.
+It does NOT prevent the value from being copied to the store later when:
+- Referenced in a derivation
+- Used in certain path operations (e.g., `${path}` interpolation)
+- Passed to functions that copy to the store
+
+Users must still be careful about how they reference these paths.
+:::
+
 `types.pathWith` { *`inStore`* ? `null`, *`absolute`* ? `null` }
 
 :   A filesystem path. Either a string or something that can be coerced

From 6f2d3bf396091e4577c43bcd884eccb284f81f2d Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Tue, 4 Nov 2025 00:39:04 +0000
Subject: [PATCH 5424/6226] =?UTF-8?q?clickhouse:=2025.9.4.58=20=E2=86=92?=
 =?UTF-8?q?=2025.10.1.3832?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/cl/clickhouse/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/clickhouse/package.nix b/pkgs/by-name/cl/clickhouse/package.nix
index 6752d05e2f9f..c787f82df7aa 100644
--- a/pkgs/by-name/cl/clickhouse/package.nix
+++ b/pkgs/by-name/cl/clickhouse/package.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "25.9.4.58-stable";
-  rev = "08afb4f28eefe01513442c3647a2e00b703d5922";
-  hash = "sha256-HRbqVSyDuvhkv0+PSgps9AXKdLlukrLA65OLx5gZ3c0=";
+  version = "25.10.1.3832-stable";
+  rev = "f95c1af632a1c4fb9c69a501d05ae04a393b8f81";
+  hash = "sha256-UqdwZRJWMo2KTlZ1W3MnbXg1EhK/ifjQRciPcWiFYTk=";
   lts = false;
 }

From 80b85c3efa7815bfa356d464adf5d1dd5fb18746 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Tue, 4 Nov 2025 00:39:52 +0000
Subject: [PATCH 5425/6226] =?UTF-8?q?clickhouse-lts:=2025.8.10.7=20?=
 =?UTF-8?q?=E2=86=92=2025.8.11.66?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/cl/clickhouse/lts.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/clickhouse/lts.nix b/pkgs/by-name/cl/clickhouse/lts.nix
index ed949f77f551..e7818bfc885d 100644
--- a/pkgs/by-name/cl/clickhouse/lts.nix
+++ b/pkgs/by-name/cl/clickhouse/lts.nix
@@ -1,6 +1,6 @@
 import ./generic.nix {
-  version = "25.8.10.7-lts";
-  rev = "02ec3a1ea1e08fb18d2d9638f00b2b557fa1cc1c";
-  hash = "sha256-EOZ2AfeBeXAWQqa25eQX3loE+xegt03lsCU1aQt/Ebs=";
+  version = "25.8.11.66-lts";
+  rev = "fa393206741c830da77b8f1bcf18c753161932c8";
+  hash = "sha256-VUdT5STQqcWevYJjtuLdTeDGZHNl3JkkDSgcckjSZbw=";
   lts = true;
 }

From 29ee881651bcb348c11281d66bdba2a3709cdd69 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 22:00:23 +0000
Subject: [PATCH 5426/6226] eiquadprog: 1.3.0 -> 1.3.1

---
 pkgs/by-name/ei/eiquadprog/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ei/eiquadprog/package.nix b/pkgs/by-name/ei/eiquadprog/package.nix
index 068c0cf73c70..3528b88e5cae 100644
--- a/pkgs/by-name/ei/eiquadprog/package.nix
+++ b/pkgs/by-name/ei/eiquadprog/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "eiquadprog";
-  version = "1.3.0";
+  version = "1.3.1";
 
   src = fetchFromGitHub {
     owner = "stack-of-tasks";
     repo = "eiquadprog";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-8CwyTREHzTtgXTnzAIcRAlKm3fBEUEeMxNwzzEMADqk=";
+    hash = "sha256-FV6A3cMaY7+eDip9YjuX0cYz0X6tdpDRV57eXOb9bKQ=";
   };
 
   outputs = [

From 5ae95e168782674529c13f3519d67f4df9b80a9e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 22:02:46 +0000
Subject: [PATCH 5427/6226] ecs-agent: 1.100.0 -> 1.100.1

---
 pkgs/by-name/ec/ecs-agent/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ec/ecs-agent/package.nix b/pkgs/by-name/ec/ecs-agent/package.nix
index e55c09fbf067..57f8ecbe0cd6 100644
--- a/pkgs/by-name/ec/ecs-agent/package.nix
+++ b/pkgs/by-name/ec/ecs-agent/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "amazon-ecs-agent";
-  version = "1.100.0";
+  version = "1.100.1";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "aws";
     repo = "amazon-ecs-agent";
-    hash = "sha256-U5Rvo1m3JuJTF+gvkbgyS+PDouR3Z0WcO4YQ95GUTic=";
+    hash = "sha256-APkYhq4HGxgCNUWaaj5/xK6AwwUZAW4aom48ADd4R7g=";
   };
 
   vendorHash = null;

From 76a698a87cd73d874c0e17f4b110a1f3137dd80e Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Tue, 4 Nov 2025 22:59:59 +0100
Subject: [PATCH 5428/6226] fwts: 24.09.00 -> 25.09.00; fix kernel module

---
 pkgs/os-specific/linux/fwts/default.nix | 12 +++++++-----
 pkgs/os-specific/linux/fwts/module.nix  |  6 +++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix
index 6fd7dc8e99d1..13560cd6a965 100644
--- a/pkgs/os-specific/linux/fwts/default.nix
+++ b/pkgs/os-specific/linux/fwts/default.nix
@@ -16,16 +16,18 @@
   libbsd,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "fwts";
-  version = "24.09.00";
+  version = "25.09.00";
 
   src = fetchzip {
-    url = "https://fwts.ubuntu.com/release/fwts-V${version}.tar.gz";
-    hash = "sha256-ZJSlx8O38e7bJYTgZacayslr28TLHHJsISXq9Uzsnyc=";
+    url = "https://fwts.ubuntu.com/release/fwts-V${finalAttrs.version}.tar.gz";
+    hash = "sha256-OJI2O9MptckmGj4rTrh9haIGaXJOO3er59yIorbgSVw=";
     stripRoot = false;
   };
 
+  sourceRoot = "${finalAttrs.src.name}/fwts-${finalAttrs.version}";
+
   nativeBuildInputs = [
     autoreconfHook
     pkg-config
@@ -64,4 +66,4 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [ tadfisher ];
   };
-}
+})
diff --git a/pkgs/os-specific/linux/fwts/module.nix b/pkgs/os-specific/linux/fwts/module.nix
index 76326198b8be..922abd9019ec 100644
--- a/pkgs/os-specific/linux/fwts/module.nix
+++ b/pkgs/os-specific/linux/fwts/module.nix
@@ -6,13 +6,13 @@
   kernelModuleMakeFlags,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "fwts-efi-runtime";
   version = "${fwts.version}-${kernel.version}";
 
   inherit (fwts) src;
 
-  sourceRoot = "${src.name}/efi_runtime";
+  sourceRoot = "${fwts.sourceRoot}/efi_runtime";
 
   postPatch = ''
     substituteInPlace Makefile --replace \
@@ -34,4 +34,4 @@ stdenv.mkDerivation rec {
     maintainers = with maintainers; [ dtzWill ];
     platforms = platforms.linux;
   };
-}
+})

From 2854b7e0d9cee45d470e964f679629585ce5cc87 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 22:14:59 +0000
Subject: [PATCH 5429/6226] python3Packages.snakemake-storage-plugin-fs: 1.1.2
 -> 1.1.3

---
 .../python-modules/snakemake-storage-plugin-fs/default.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix b/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix
index 2bc8ba095c2b..97c0bf3576ab 100644
--- a/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix
+++ b/pkgs/development/python-modules/snakemake-storage-plugin-fs/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "snakemake-storage-plugin-fs";
-  version = "1.1.2";
+  version = "1.1.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "snakemake";
     repo = "snakemake-storage-plugin-fs";
     tag = "v${version}";
-    hash = "sha256-bTkT1D2GJGS+zWvK/BUGLGE8ArZQikHHcdQjREJhldg=";
+    hash = "sha256-UdK0yhl7ljLh57CXAvH/OYiVyw+BjhPwGjSBXX8sbZk=";
   };
 
   build-system = [ poetry-core ];

From 241331d987faa1aa85aa60029e00a92a38395e64 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 22:15:16 +0000
Subject: [PATCH 5430/6226] clusterctl: 1.11.2 -> 1.11.3

---
 pkgs/by-name/cl/clusterctl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/clusterctl/package.nix b/pkgs/by-name/cl/clusterctl/package.nix
index 1bb8543c735d..18821557d659 100644
--- a/pkgs/by-name/cl/clusterctl/package.nix
+++ b/pkgs/by-name/cl/clusterctl/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "clusterctl";
-  version = "1.11.2";
+  version = "1.11.3";
 
   src = fetchFromGitHub {
     owner = "kubernetes-sigs";
     repo = "cluster-api";
     rev = "v${version}";
-    hash = "sha256-2l9Mk9CWmmzTflyC+ZWr2A7NyT78rf0bXQETvCYlLuM=";
+    hash = "sha256-qORhusO2YrjrM4TP+WmAdhXdP9y5IWJcFQy69HhixNc=";
   };
 
-  vendorHash = "sha256-hnyw2n82nFBN+6Km9usIKSMSTxucdY497J957mP2eEo=";
+  vendorHash = "sha256-vRY7/SrhsLzh6sM1zaOLVUUn4DxoatScyRlHjVOPJlY=";
 
   subPackages = [ "cmd/clusterctl" ];
 

From b59865765faec6101c8b9d20d9f69494e606177d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 22:18:20 +0000
Subject: [PATCH 5431/6226] python3Packages.mozjpeg_lossless_optimization:
 1.3.1 -> 1.3.2

---
 .../python-modules/mozjpeg_lossless_optimization/default.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix b/pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix
index 51353639a647..e635d760c203 100644
--- a/pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix
+++ b/pkgs/development/python-modules/mozjpeg_lossless_optimization/default.nix
@@ -12,7 +12,7 @@
 }:
 buildPythonPackage rec {
   pname = "mozjpeg_lossless_optimization";
-  version = "1.3.1";
+  version = "1.3.2";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     repo = "mozjpeg-lossless-optimization";
     # https://github.com/NixOS/nixpkgs/issues/26302
     tag = "v${version}";
-    hash = "sha256-HAOmD87oazwlGx1O+tAV5qzSn4EHbzeYQ5e8kmegwbo=";
+    hash = "sha256-0w0e7QbYi3W6MahY8fnI+dYkQHqheOXQn3mJN/UfHlk=";
     fetchSubmodules = true;
   };
 

From fefa07a30dd04535cbf30edb2d2fb7c65f2563b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 22:21:52 +0000
Subject: [PATCH 5432/6226] avalanche-cli: 1.9.2 -> 1.9.3

---
 pkgs/by-name/av/avalanche-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/av/avalanche-cli/package.nix b/pkgs/by-name/av/avalanche-cli/package.nix
index ab6433678b3f..02bb6c87346b 100644
--- a/pkgs/by-name/av/avalanche-cli/package.nix
+++ b/pkgs/by-name/av/avalanche-cli/package.nix
@@ -14,17 +14,17 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "avalanche-cli";
-  version = "1.9.2";
+  version = "1.9.3";
 
   src = fetchFromGitHub {
     owner = "ava-labs";
     repo = "avalanche-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-/HwZUsggBeuSZLYQDWUU4rfktnvwVolE5mKiZW4IXXs=";
+    hash = "sha256-1sQdQTWlUNWM8F/9/DZjn/WS3F0RTG4hglmoN2jjOyc=";
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-JQEWEqseg5q0b8rPlO/19V1BLbWBdXldoWgUiqI9Qh4=";
+  vendorHash = "sha256-bId5FDdpgI8DTtY44cgATf41qLu8udLR00XioZOAh/Y=";
 
   # Fix error: 'Caught SIGILL in blst_cgo_init'
   # https://github.com/bnb-chain/bsc/issues/1521

From e574d0ecc9e7ebf766b14b82ddbc1905fb5a5f9e Mon Sep 17 00:00:00 2001
From: Michael Daniels <mdaniels5757@gmail.com>
Date: Tue, 4 Nov 2025 17:24:25 -0500
Subject: [PATCH 5433/6226] gh: add mdaniels5757 as co-maintainer

---
 pkgs/by-name/gh/gh/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix
index 9f3881dfdcca..56827f79df69 100644
--- a/pkgs/by-name/gh/gh/package.nix
+++ b/pkgs/by-name/gh/gh/package.nix
@@ -60,6 +60,9 @@ buildGoModule rec {
     changelog = "https://github.com/cli/cli/releases/tag/v${version}";
     license = lib.licenses.mit;
     mainProgram = "gh";
-    maintainers = with lib.maintainers; [ zowoq ];
+    maintainers = with lib.maintainers; [
+      mdaniels5757
+      zowoq
+    ];
   };
 }

From 013ca8b934b4bbd380f9c7e73af18b8e5fc82328 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 22:46:35 +0000
Subject: [PATCH 5434/6226] terraform-providers.heroku_heroku: 5.3.1 -> 5.3.2

---
 .../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 d4479da25c77..0245e490822a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -687,11 +687,11 @@
     "vendorHash": "sha256-47xWjlzpQ/EYzjbuuMKQiu5cfYAXdYkXRl+AOEP+sA4="
   },
   "heroku_heroku": {
-    "hash": "sha256-VGx2J7huF05HU/59Hyo2rxwV3SR+kVJWtrfWoRmln2o=",
+    "hash": "sha256-hR4DvSneqG/5P4tYljcuFxQ34AnDIjIt+JMn1BhloeU=",
     "homepage": "https://registry.terraform.io/providers/heroku/heroku",
     "owner": "heroku",
     "repo": "terraform-provider-heroku",
-    "rev": "v5.3.1",
+    "rev": "v5.3.2",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 7e8a4ced85b5860c580e21c28779af9e1f8d7d3e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 22:48:58 +0000
Subject: [PATCH 5435/6226] crawley: 1.7.14 -> 1.7.15

---
 pkgs/by-name/cr/crawley/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cr/crawley/package.nix b/pkgs/by-name/cr/crawley/package.nix
index 41eb38b66268..2e34363cd4f7 100644
--- a/pkgs/by-name/cr/crawley/package.nix
+++ b/pkgs/by-name/cr/crawley/package.nix
@@ -7,18 +7,18 @@
 
 buildGoModule rec {
   pname = "crawley";
-  version = "1.7.14";
+  version = "1.7.15";
 
   src = fetchFromGitHub {
     owner = "s0rg";
     repo = "crawley";
     rev = "v${version}";
-    hash = "sha256-2TE7WbW8wm0PSJSLRVIvHd7f8pzJghO40l4LVAtuO0g=";
+    hash = "sha256-fVS7/W2M97IeVpoayqYImkgiQC5A96qklt53GDsIxfc=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
-  vendorHash = "sha256-igLEQT08Yeq0WCdK0I8Bsn9NewKM9Dj/Nfh6lsGk+KM=";
+  vendorHash = "sha256-SaemEPcXc73G1wwxQ9/LbQV5fRd55pfd504F4PpAWVM=";
 
   ldflags = [
     "-w"

From d15f5bde87ea8805e1786d4c4268c56486bb6503 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 22:50:46 +0000
Subject: [PATCH 5436/6226] home-assistant-custom-components.solax_modbus:
 2025.10.6 -> 2025.11.1

---
 .../home-assistant/custom-components/solax_modbus/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
index 96316e9241e5..9fae6a33098b 100644
--- a/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/solax_modbus/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "wills106";
   domain = "solax_modbus";
-  version = "2025.10.6";
+  version = "2025.11.1";
 
   src = fetchFromGitHub {
     owner = "wills106";
     repo = "homeassistant-solax-modbus";
     tag = version;
-    hash = "sha256-BZ/UcBTZyaLAuJ34blC3KdFRIGRR4Qe1tkJqJAP21IA=";
+    hash = "sha256-uzwXJ9GJuzp7IVpdM6r7+ZU2KF7jORpqIwqKTc8Iuok=";
   };
 
   dependencies = [ pymodbus ];

From 4ad8189fcb339a092f2d644a19da3574f219f935 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 22:51:24 +0000
Subject: [PATCH 5437/6226] wgo: 0.5.14 -> 0.6.2

---
 pkgs/by-name/wg/wgo/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wg/wgo/package.nix b/pkgs/by-name/wg/wgo/package.nix
index 3d5af80a5bef..f56afa8fa09f 100644
--- a/pkgs/by-name/wg/wgo/package.nix
+++ b/pkgs/by-name/wg/wgo/package.nix
@@ -6,7 +6,7 @@
 
 let
   pname = "wgo";
-  version = "0.5.14";
+  version = "0.6.2";
 in
 buildGoModule {
   inherit pname version;
@@ -15,10 +15,10 @@ buildGoModule {
     owner = "bokwoon95";
     repo = "wgo";
     rev = "v${version}";
-    hash = "sha256-zqRcGUfqvn0NX1rL/+jMVE/LCIT2IrqUUPDGThSueAY=";
+    hash = "sha256-Z3adi1PQ5v0BxcjkOJZWeUxwLlLXpNuJxrQztV2pCiA=";
   };
 
-  vendorHash = "sha256-w6UJxZToHbbQmuXkyqFzyssFcE+7uVNqOuIF/XKdEsU=";
+  vendorHash = "sha256-6ZJNXw/ahaIziQGVNgjbTbm53JiO3dYCqJtdB///cmo=";
 
   ldflags = [
     "-s"

From 3bfe755d732d9776edffbf0e843c50b547333685 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Nov 2025 14:52:02 -0800
Subject: [PATCH 5438/6226] python3Packages.reolink-aio: 0.16.3 -> 0.16.4

Diff: https://github.com/starkillerOG/reolink_aio/compare/0.16.3...0.16.4

Changelog: https://github.com/starkillerOG/reolink_aio/releases/tag/0.16.4
---
 pkgs/development/python-modules/reolink-aio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/reolink-aio/default.nix b/pkgs/development/python-modules/reolink-aio/default.nix
index 2ed4e83d2da3..672408051747 100644
--- a/pkgs/development/python-modules/reolink-aio/default.nix
+++ b/pkgs/development/python-modules/reolink-aio/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "reolink-aio";
-  version = "0.16.3";
+  version = "0.16.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "starkillerOG";
     repo = "reolink_aio";
     tag = version;
-    hash = "sha256-lfkQtVnaEge6Upvd73fqBtXf5NQIq7vhTP4IOwWjNBw=";
+    hash = "sha256-YRawVisHVDW4hm/oqxVNscC/99v02+mTqvmBwLC4l40=";
   };
 
   build-system = [ setuptools ];

From 3f77aa0c65589706a590da3a2aa425b5adc5eb8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Nov 2025 14:49:23 -0800
Subject: [PATCH 5439/6226] python3Packages.tesla-fleet-api: 1.2.4 -> 1.2.5

Diff: https://github.com/Teslemetry/python-tesla-fleet-api/compare/v1.2.4...v1.2.5

Changelog: https://github.com/Teslemetry/python-tesla-fleet-api/releases/tag/v1.2.5
---
 .../development/python-modules/tesla-fleet-api/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/tesla-fleet-api/default.nix b/pkgs/development/python-modules/tesla-fleet-api/default.nix
index 202e9a2f2917..bc1bddb0e021 100644
--- a/pkgs/development/python-modules/tesla-fleet-api/default.nix
+++ b/pkgs/development/python-modules/tesla-fleet-api/default.nix
@@ -9,22 +9,19 @@
   cryptography,
   fetchFromGitHub,
   protobuf,
-  pythonOlder,
   setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "tesla-fleet-api";
-  version = "1.2.4";
+  version = "1.2.5";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "Teslemetry";
     repo = "python-tesla-fleet-api";
     tag = "v${version}";
-    hash = "sha256-h6MGYzDNzEss5FIf+2J5oROQw/7OVLpkXuheYKd4BrQ=";
+    hash = "sha256-7Diq7xT8tPO4fXp7qsFXWtWExqm2vctoOtPvlCuWOKg=";
   };
 
   build-system = [ setuptools ];

From fae74c8dd5471a829d330bd676d7c857ea07887a Mon Sep 17 00:00:00 2001
From: eljamm <fedi.jamoussi@protonmail.ch>
Date: Tue, 4 Nov 2025 23:51:08 +0100
Subject: [PATCH 5440/6226] linuxPackages.apfs: 0.3.15 -> 0.3.16

---
 pkgs/os-specific/linux/apfs/default.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix
index e973e5ebcbc6..19cfc7938799 100644
--- a/pkgs/os-specific/linux/apfs/default.nix
+++ b/pkgs/os-specific/linux/apfs/default.nix
@@ -8,7 +8,7 @@
 }:
 
 let
-  tag = "0.3.15";
+  tag = "0.3.16";
 in
 stdenv.mkDerivation {
   pname = "apfs";
@@ -17,8 +17,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "linux-apfs";
     repo = "linux-apfs-rw";
-    rev = "v${tag}";
-    hash = "sha256-/qJ8QvnVhVXvuxeZ/UYLTXGMPPVnC7fHOSWI1B15r/M=";
+    tag = "v${tag}";
+    hash = "sha256-11ypevJwxNKAmJbl2t+nGXq40hjWbLIdltLqSeTVdHc=";
   };
 
   hardeningDisable = [ "pic" ];
@@ -37,7 +37,7 @@ stdenv.mkDerivation {
     updateScript = ./update.sh;
   };
 
-  meta = with lib; {
+  meta = {
     description = "APFS module for linux";
     longDescription = ''
       The Apple File System (APFS) is the copy-on-write filesystem currently
@@ -49,8 +49,8 @@ stdenv.mkDerivation {
       Encryption is still not in the works though.
     '';
     homepage = "https://github.com/linux-apfs/linux-apfs-rw";
-    license = licenses.gpl2Only;
-    platforms = platforms.linux;
-    maintainers = with maintainers; [ Luflosi ];
+    license = lib.licenses.gpl2Only;
+    platforms = lib.platforms.linux;
+    maintainers = with lib.maintainers; [ Luflosi ];
   };
 }

From b844a9e444d38910693a4c7dd394948771b0fa78 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 4 Nov 2025 23:03:19 +0000
Subject: [PATCH 5441/6226] dysk: 3.1.0 -> 3.3.0

---
 pkgs/by-name/dy/dysk/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dy/dysk/package.nix b/pkgs/by-name/dy/dysk/package.nix
index 49af7bfc4ed4..f2631156f4b5 100644
--- a/pkgs/by-name/dy/dysk/package.nix
+++ b/pkgs/by-name/dy/dysk/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "dysk";
-  version = "3.1.0";
+  version = "3.3.0";
 
   src = fetchFromGitHub {
     owner = "Canop";
     repo = "dysk";
     rev = "v${version}";
-    hash = "sha256-2YqKKgNOx5+DLzIEkJTYqTAuxmKMhpCb79w7qLabvOk=";
+    hash = "sha256-trqHMlBA2s5l0ay3/e6hzMZTtKndrHRTy1LhuLwrJb4=";
   };
 
-  cargoHash = "sha256-2raAjpHh49ifZQfG2/WK94gR0lQzF/5cgmUzd69Kh3o=";
+  cargoHash = "sha256-uloX/Mk4m7jEU5z5cb/gSuCLEGhG9qHTCQwjy+FCUsk=";
 
   nativeBuildInputs = [
     installShellFiles

From b41eb2c4b0baf81dec8aa27156f74245234da498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Nov 2025 15:07:12 -0800
Subject: [PATCH 5442/6226] python3Packages.python-smarttub: 0.0.44 -> 0.0.45

Diff: https://github.com/mdz/python-smarttub/compare/v0.0.44...v0.0.45

Changelog: https://github.com/mdz/python-smarttub/releases/tag/v0.0.45
---
 pkgs/development/python-modules/python-smarttub/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-smarttub/default.nix b/pkgs/development/python-modules/python-smarttub/default.nix
index ec3f38b0638d..f865d3d28184 100644
--- a/pkgs/development/python-modules/python-smarttub/default.nix
+++ b/pkgs/development/python-modules/python-smarttub/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "python-smarttub";
-  version = "0.0.44";
+  version = "0.0.45";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mdz";
     repo = "python-smarttub";
     tag = "v${version}";
-    hash = "sha256-ozOnCJXv99gne59HQEdQfCKZe8HhK2q9vShMuBlSWE8=";
+    hash = "sha256-r9Ww3isCbgKSWkQPKWzLagPK8+OFeb+zr8Wydft0jJU=";
   };
 
   build-system = [

From 4a807ebfd7f4ece79b5dac8ca02bde7e94490608 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 2 Nov 2025 11:38:24 +0000
Subject: [PATCH 5443/6226] cudaPackages.nccl: remove reference to nvcc in
 binary

---
 pkgs/development/cuda-modules/packages/nccl.nix | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/pkgs/development/cuda-modules/packages/nccl.nix b/pkgs/development/cuda-modules/packages/nccl.nix
index ea3d1f3d2cb0..ea5fa5e589a7 100644
--- a/pkgs/development/cuda-modules/packages/nccl.nix
+++ b/pkgs/development/cuda-modules/packages/nccl.nix
@@ -10,6 +10,7 @@
   flags,
   lib,
   python3,
+  removeReferencesTo,
   which,
   # passthru.updateScript
   gitUpdater,
@@ -72,6 +73,7 @@ backendStdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cuda_nvcc
     python3
+    removeReferencesTo
     which
   ];
 
@@ -117,8 +119,22 @@ backendStdenv.mkDerivation (finalAttrs: {
   postFixup = ''
     _overrideFirst outputStatic "static" "lib" "out"
     moveToOutput lib/libnccl_static.a "''${!outputStatic:?}"
+  ''
+  # Since CUDA 12.8, the cuda_nvcc path leaks in:
+  # - libnccl.so's .nv_fatbin section
+  # - libnccl_static.a
+  # &devrt -L /nix/store/00000000000000000000000000000000-...nvcc-.../bin/...
+  # This string makes cuda_nvcc a runtime dependency of nccl.
+  # See https://github.com/NixOS/nixpkgs/pull/457803
+  + ''
+    remove-references-to -t "${lib.getBin cuda_nvcc}" \
+      ''${!outputLib}/lib/libnccl.so.* \
+      ''${!outputStatic}/lib/*.a
   '';
 
+  # C.f. remove-references-to above. Ensure *all* references to cuda_nvcc are removed
+  disallowedRequisites = [ (lib.getBin cuda_nvcc) ];
+
   passthru = {
     platformAssertions = [
       {

From 1eb39d0ea75b8e0646bc62bbe345aa6af146f3da Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Sun, 2 Nov 2025 16:38:01 +0000
Subject: [PATCH 5444/6226] onnxruntime: remove reference to nvcc in
 libonnxruntime_providers_cuda.so

---
 pkgs/by-name/on/onnxruntime/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix
index bd91c2d2584f..7325b481285f 100644
--- a/pkgs/by-name/on/onnxruntime/package.nix
+++ b/pkgs/by-name/on/onnxruntime/package.nix
@@ -17,6 +17,7 @@
   perl,
   pkg-config,
   python3Packages,
+  removeReferencesTo,
   re2,
   zlib,
   protobuf,
@@ -44,6 +45,7 @@ let
 
   stdenv = throw "Use effectiveStdenv instead";
   effectiveStdenv = if cudaSupport then cudaPackages.backendStdenv else inputs.stdenv;
+  inherit (cudaPackages) cuda_nvcc;
 
   cudaArchitecturesString = cudaPackages.flags.cmakeCudaArchitecturesString;
 
@@ -121,6 +123,7 @@ effectiveStdenv.mkDerivation rec {
   ++ lib.optionals cudaSupport [
     cudaPackages.cuda_nvcc
     cudaPackages.cudnn-frontend
+    removeReferencesTo
   ]
   ++ lib.optionals isCudaJetson [
     cudaPackages.autoAddCudaCompatRunpath
@@ -318,6 +321,12 @@ effectiveStdenv.mkDerivation rec {
       ../include/onnxruntime/core/session/onnxruntime_*.h
   '';
 
+  # See comments in `cudaPackages.nccl`
+  postFixup = lib.optionalString cudaSupport ''
+    remove-references-to -t "${lib.getBin cuda_nvcc}" ''${!outputLib}/lib/libonnxruntime_providers_cuda.so
+  '';
+  disallowedRequisites = [ (lib.getBin cuda_nvcc) ];
+
   passthru = {
     inherit cudaSupport cudaPackages ncclSupport; # for the python module
     inherit protobuf;

From a7a7d5922949f926e065546b247757a83615bf83 Mon Sep 17 00:00:00 2001
From: Kylie McClain <kylie@somas.is>
Date: Tue, 4 Nov 2025 18:19:09 -0500
Subject: [PATCH 5445/6226] tageditor: 3.9.7 -> 3.9.8

<https://github.com/Martchus/tageditor/compare/v3.9.7...v3.9.8>
---
 pkgs/by-name/ta/tageditor/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ta/tageditor/package.nix b/pkgs/by-name/ta/tageditor/package.nix
index 49ba340dbb2e..d8758809f685 100644
--- a/pkgs/by-name/ta/tageditor/package.nix
+++ b/pkgs/by-name/ta/tageditor/package.nix
@@ -14,13 +14,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tageditor";
-  version = "3.9.7";
+  version = "3.9.8";
 
   src = fetchFromGitHub {
     owner = "martchus";
     repo = "tageditor";
     tag = "v${version}";
-    hash = "sha256-ETRlyAOCWIz8tioCsGXnmnuTnzWiUOb64vKsPm1hIt0=";
+    hash = "sha256-D4O02QQNoyY61w/9OB4lY3QkiwJ6q1KdX9GNKgW5ZY0=";
   };
 
   nativeBuildInputs = [

From 66260cc8c48f38529c559ce9529d9398bc8d4837 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Wed, 5 Nov 2025 00:11:26 +0000
Subject: [PATCH 5446/6226] ci/treefmt: disable biome for now

Disable biome due to a hash mismatch with validation for the
`settings.formatter.biome.options` option.

See https://github.com/numtide/treefmt-nix/pull/430
---
 ci/default.nix | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ci/default.nix b/ci/default.nix
index 972c679a1492..3aa463095cde 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -48,7 +48,8 @@ let
         programs.actionlint.enable = true;
 
         programs.biome = {
-          enable = true;
+          # FIXME: Disabled temporarily due to https://github.com/numtide/treefmt-nix/pull/430
+          enable = false;
           settings.formatter = {
             useEditorconfig = true;
           };
@@ -58,10 +59,10 @@ let
           };
           settings.json.formatter.enabled = false;
         };
-        settings.formatter.biome.excludes = [
-          "*.min.js"
-          "pkgs/*"
-        ];
+        # settings.formatter.biome.excludes = [
+        #   "*.min.js"
+        #   "pkgs/*"
+        # ];
 
         programs.keep-sorted.enable = true;
 

From 9c7ca028dbebfe0f4c10e84ae9ad900af496201f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 00:38:58 +0000
Subject: [PATCH 5447/6226] cpp-utilities: 5.31.0 -> 5.31.1

---
 pkgs/by-name/cp/cpp-utilities/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cp/cpp-utilities/package.nix b/pkgs/by-name/cp/cpp-utilities/package.nix
index 92aaba102610..99fe58138ad9 100644
--- a/pkgs/by-name/cp/cpp-utilities/package.nix
+++ b/pkgs/by-name/cp/cpp-utilities/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "cpp-utilities";
-  version = "5.31.0";
+  version = "5.31.1";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "cpp-utilities";
     rev = "v${finalAttrs.version}";
-    sha256 = "sha256-UjF1b1LCPwrUzqVZNbtX+5eFAzc6NgLyBzTcNHNlkvs=";
+    sha256 = "sha256-HpzcGHDudVFmkVfkn5YpAATKfZ3FpIKXfqhpjpehK1M=";
   };
 
   nativeBuildInputs = [ cmake ];

From 508f5dccb84139463e5d235f84ab9d1975d63c7a Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Tue, 4 Nov 2025 19:43:39 -0500
Subject: [PATCH 5448/6226] nodePackages.gulp: drop

It's the same as gulp-cli for the end-user tool perspective. Just alised
it to gulp-cli so we don't have to worry about issues
---
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 409 ------------------
 3 files changed, 1 insertion(+), 410 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 9985c4d5271c..062322e28570 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -128,6 +128,7 @@ mapAliases {
   inherit (pkgs) graphql-language-service-cli; # added 2025-03-17
   inherit (pkgs) graphqurl; # added 2023-08-19
   gtop = pkgs.gtop; # added 2023-07-31
+  gulp = self.gulp-cli; # Added 2025-11-04
   hs-client = pkgs.hsd; # added 2023-08-20
   inherit (pkgs) hsd; # added 2023-08-19
   inherit (pkgs) html-minifier; # added 2023-08-19
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 3a4374975da3..8059bb62337b 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -76,7 +76,6 @@
 , "gatsby-cli"
 , "grunt-cli"
 , "makam"
-, "gulp"
 , "gulp-cli"
 , "he"
 , "hs-airdrop"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index ce62216d9777..cb4cec8ba97e 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -2246,15 +2246,6 @@ let
         sha512 = "Ys9sazDatyTgZVb4xPlDufLweJ/Os2uHWOv+Caxvy2O85JcnT4M3vc73bi8pdLWlv3fdWQz3pdI9tVwo8rQQSg==";
       };
     };
-    "@gulpjs/to-absolute-glob-4.0.0" = {
-      name = "_at_gulpjs_slash_to-absolute-glob";
-      packageName = "@gulpjs/to-absolute-glob";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@gulpjs/to-absolute-glob/-/to-absolute-glob-4.0.0.tgz";
-        sha512 = "kjotm7XJrJ6v+7knhPaRgaT6q8F8K2jiafwYdNHLzmV0uGLuZY43FK6smNSHUPrhq5kX2slCUy+RGG/xGqmIKA==";
-      };
-    };
     "@hapi/hoek-9.3.0" = {
       name = "_at_hapi_slash_hoek";
       packageName = "@hapi/hoek";
@@ -7673,15 +7664,6 @@ let
         sha512 = "htCUDlxyyCLMgaM3xXg0C0LW2xqfuQ6p05pCEIsXuyQ+a1koYKTuBMzRNwmybfLgvJDMd0r1LTn4+E0Ti6C2AA==";
       };
     };
-    "async-done-2.0.0" = {
-      name = "async-done";
-      packageName = "async-done";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async-done/-/async-done-2.0.0.tgz";
-        sha512 = "j0s3bzYq9yKIVLKGE/tWlCpa3PfFLcrDZLTSVdnnCTGagXuXBJO4SsY9Xdk/fQBirCkH4evW5xOeJXqlAQFdsw==";
-      };
-    };
     "async-each-1.0.6" = {
       name = "async-each";
       packageName = "async-each";
@@ -7745,15 +7727,6 @@ let
         sha512 = "tLRNUXati5MFePdAk8dw7Qt7DpxPB60ofAgn8WRhW6a2rcimZnYBP9oxHiv0OHy+Wz7kPMG+t4LGdt31+4EmGg==";
       };
     };
-    "async-settle-2.0.0" = {
-      name = "async-settle";
-      packageName = "async-settle";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async-settle/-/async-settle-2.0.0.tgz";
-        sha512 = "Obu/KE8FurfQRN6ODdHN9LuXqwC+JFIM9NRyZqJJ4ZfLJmIYN9Rg0/kb+wF70VV5+fJusTMQlJ1t5rF7J/ETdg==";
-      };
-    };
     "asynckit-0.4.0" = {
       name = "asynckit";
       packageName = "asynckit";
@@ -7943,15 +7916,6 @@ let
         sha512 = "1Niw1j7GKl8L3vyKBKbzKeJ//uPoQpr5RCr5/GV2Fto+U8OqcTWXJH/Ats2lOMYP4sVjRHwSIH+HUPdLkORZ9w==";
       };
     };
-    "bach-2.0.1" = {
-      name = "bach";
-      packageName = "bach";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bach/-/bach-2.0.1.tgz";
-        sha512 = "A7bvGMGiTOxGMpNupYl9HQTf0FFDNF4VCmks4PJpFyN1AX2pdKuxuwdvUz2Hu388wcgp+OvGFNsumBfFNkR7eg==";
-      };
-    };
     "backo2-1.0.2" = {
       name = "backo2";
       packageName = "backo2";
@@ -10211,15 +10175,6 @@ let
         sha512 = "dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA==";
       };
     };
-    "clone-stats-1.0.0" = {
-      name = "clone-stats";
-      packageName = "clone-stats";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clone-stats/-/clone-stats-1.0.0.tgz";
-        sha512 = "au6ydSpg6nsrigcZ4m8Bc9hxjeW+GJ8xh5G3BJCMt4WXe1H10UNaVOamqQTmrx1kjVuxAHIQSNU6hY4Nsn9/ag==";
-      };
-    };
     "clsx-2.1.1" = {
       name = "clsx";
       packageName = "clsx";
@@ -15963,15 +15918,6 @@ let
         sha512 = "XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==";
       };
     };
-    "fs-mkdirp-stream-2.0.1" = {
-      name = "fs-mkdirp-stream";
-      packageName = "fs-mkdirp-stream";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-mkdirp-stream/-/fs-mkdirp-stream-2.0.1.tgz";
-        sha512 = "UTOY+59K6IA94tec8Wjqm0FSh5OVudGNB0NL/P6fB3HiE3bYOY3VYBGijsnOHNkQSwC1FKkU77pmq7xp9CskLw==";
-      };
-    };
     "fs-readdir-recursive-1.1.0" = {
       name = "fs-readdir-recursive";
       packageName = "fs-readdir-recursive";
@@ -16638,24 +16584,6 @@ let
         sha512 = "XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==";
       };
     };
-    "glob-stream-8.0.2" = {
-      name = "glob-stream";
-      packageName = "glob-stream";
-      version = "8.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob-stream/-/glob-stream-8.0.2.tgz";
-        sha512 = "R8z6eTB55t3QeZMmU1C+Gv+t5UnNRkA55c5yo67fAVfxODxieTwsjNG7utxS/73NdP1NbDgCrhVEg2h00y4fFw==";
-      };
-    };
-    "glob-watcher-6.0.0" = {
-      name = "glob-watcher";
-      packageName = "glob-watcher";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glob-watcher/-/glob-watcher-6.0.0.tgz";
-        sha512 = "wGM28Ehmcnk2NqRORXFOTOR064L4imSw3EeOqU5bIwUf62eXGwg89WivH6VMahL8zlQHeodzvHpXplrqzrz3Nw==";
-      };
-    };
     "global-4.4.0" = {
       name = "global";
       packageName = "global";
@@ -16962,15 +16890,6 @@ let
         sha512 = "GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==";
       };
     };
-    "gulp-cli-3.0.0" = {
-      name = "gulp-cli";
-      packageName = "gulp-cli";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gulp-cli/-/gulp-cli-3.0.0.tgz";
-        sha512 = "RtMIitkT8DEMZZygHK2vEuLPqLPAFB4sntSxg4NoDta7ciwGZ18l7JuhCTiS5deOJi2IoK0btE+hs6R4sfj7AA==";
-      };
-    };
     "gulp-eslint-3.0.1" = {
       name = "gulp-eslint";
       packageName = "gulp-eslint";
@@ -19374,15 +19293,6 @@ let
         sha512 = "Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ==";
       };
     };
-    "is-negated-glob-1.0.0" = {
-      name = "is-negated-glob";
-      packageName = "is-negated-glob";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-negated-glob/-/is-negated-glob-1.0.0.tgz";
-        sha512 = "czXVVn/QEmgvej1f50BZ648vUI+em0xqMq2Sn+QncCLN4zj1UAxlT+kw/6ggQTOaZPd1HqKQGEqbpQVtJucWug==";
-      };
-    };
     "is-npm-1.0.0" = {
       name = "is-npm";
       packageName = "is-npm";
@@ -19869,15 +19779,6 @@ let
         sha512 = "rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==";
       };
     };
-    "is-valid-glob-1.0.0" = {
-      name = "is-valid-glob";
-      packageName = "is-valid-glob";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-valid-glob/-/is-valid-glob-1.0.0.tgz";
-        sha512 = "AhiROmoEFDSsjx8hW+5sGwgKVIORcXnrlAx/R0ZSeaPw70Vw0CqkGBBhHGL58Uox2eXnU1AnvXJl1XlyedO5bA==";
-      };
-    };
     "is-valid-path-0.1.1" = {
       name = "is-valid-path";
       packageName = "is-valid-path";
@@ -21066,15 +20967,6 @@ let
         sha512 = "Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==";
       };
     };
-    "last-run-2.0.0" = {
-      name = "last-run";
-      packageName = "last-run";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/last-run/-/last-run-2.0.0.tgz";
-        sha512 = "j+y6WhTLN4Itnf9j5ZQos1BGPCS8DAwmgMroR3OzfxAsBxam0hMw7J8M3KqZl0pLQJ1jNnwIexg5DYpC/ctwEQ==";
-      };
-    };
     "latest-version-2.0.0" = {
       name = "latest-version";
       packageName = "latest-version";
@@ -21156,15 +21048,6 @@ let
         sha512 = "YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==";
       };
     };
-    "lead-4.0.0" = {
-      name = "lead";
-      packageName = "lead";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lead/-/lead-4.0.0.tgz";
-        sha512 = "DpMa59o5uGUWWjruMp71e6knmwKU3jRBBn1kjuLWN9EeIOxNeSAwvHf03WIl8g/ZMR2oSQC9ej3yeLBwdDc/pg==";
-      };
-    };
     "leven-2.1.0" = {
       name = "leven";
       packageName = "leven";
@@ -25550,15 +25433,6 @@ let
         sha512 = "IO9QvjUMWxPQQhs60oOu10CRkWCiZzSUkzbXGGV9pviYl1fXYcvkzQ5jV9z8Y6un8ARoVRl4EtC6v6jNqbaJ/w==";
       };
     };
-    "now-and-later-3.0.0" = {
-      name = "now-and-later";
-      packageName = "now-and-later";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/now-and-later/-/now-and-later-3.0.0.tgz";
-        sha512 = "pGO4pzSdaxhWTGkfSfHx3hVzJVslFPwBp2Myq9MYN/ChfJZF87ochMAXnvz6/58RJSf5ik2q9tXprBBrk2cpcg==";
-      };
-    };
     "npm-bundled-1.1.2" = {
       name = "npm-bundled";
       packageName = "npm-bundled";
@@ -30095,15 +29969,6 @@ let
         sha512 = "AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ==";
       };
     };
-    "replace-ext-2.0.0" = {
-      name = "replace-ext";
-      packageName = "replace-ext";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/replace-ext/-/replace-ext-2.0.0.tgz";
-        sha512 = "UszKE5KVK6JvyD92nzMn9cDapSk6w/CaFZ96CnmDMUqH9oowfxF/ZjRITD25H4DnOQClLA4/j7jLGXXLVKxAug==";
-      };
-    };
     "replace-homedir-2.0.0" = {
       name = "replace-homedir";
       packageName = "replace-homedir";
@@ -30347,15 +30212,6 @@ let
         sha512 = "qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==";
       };
     };
-    "resolve-options-2.0.0" = {
-      name = "resolve-options";
-      packageName = "resolve-options";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve-options/-/resolve-options-2.0.0.tgz";
-        sha512 = "/FopbmmFOQCfsCx77BRFdKOniglTiHumLgwvd6IDPihy1GKkadZbgQJBcTb2lMzSR1pndzd96b1nZrreZ7+9/A==";
-      };
-    };
     "resolve-pkg-maps-1.0.0" = {
       name = "resolve-pkg-maps";
       packageName = "resolve-pkg-maps";
@@ -32651,24 +32507,6 @@ let
         sha512 = "3PnJbYgS56AeWgtKF5jtJRT6uFJe56Z0Hc5Ngg/6sI6rIt8iiMBTa9cvdyFfpMQjaVHr8dusbNeFGIIonxOvKw==";
       };
     };
-    "stream-composer-1.0.2" = {
-      name = "stream-composer";
-      packageName = "stream-composer";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-composer/-/stream-composer-1.0.2.tgz";
-        sha512 = "bnBselmwfX5K10AH6L4c8+S5lgZMWI7ZYrz2rvYjCPB2DIMC4Ig8OpxGpNJSxRZ58oti7y1IcNvjBAz9vW5m4w==";
-      };
-    };
-    "stream-exhaust-1.0.2" = {
-      name = "stream-exhaust";
-      packageName = "stream-exhaust";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stream-exhaust/-/stream-exhaust-1.0.2.tgz";
-        sha512 = "b/qaq/GlBK5xaq1yrK9/zFcyRSTNxmcZwFLGSTG0mXgZl/4Z6GgiyYOXOvY7N3eEvFRAG1bkDRz5EPGSvPYQlw==";
-      };
-    };
     "stream-http-3.2.0" = {
       name = "stream-http";
       packageName = "stream-http";
@@ -33569,15 +33407,6 @@ let
         sha512 = "+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA==";
       };
     };
-    "teex-1.0.1" = {
-      name = "teex";
-      packageName = "teex";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz";
-        sha512 = "eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==";
-      };
-    };
     "temp-0.8.4" = {
       name = "temp";
       packageName = "temp";
@@ -33956,15 +33785,6 @@ let
         sha512 = "65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==";
       };
     };
-    "to-through-3.0.0" = {
-      name = "to-through";
-      packageName = "to-through";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/to-through/-/to-through-3.0.0.tgz";
-        sha512 = "y8MN937s/HVhEoBU1SxfHC+wxCHkV1a9gW8eAdTadYh/bGyesZIVcbjI+mSpFbSVwQici/XjBjuUyri1dnXwBw==";
-      };
-    };
     "to-vfile-7.2.4" = {
       name = "to-vfile";
       packageName = "to-vfile";
@@ -34748,24 +34568,6 @@ let
         sha512 = "/Arq1q7vh5kzmw4brlCZQw3jxc3KEGHqaNXCYEvMAg5ZK0iVwK9WsejPuC6YjcF2jpm8PTUtaLUjbziS+ku5sA==";
       };
     };
-    "undertaker-2.0.0" = {
-      name = "undertaker";
-      packageName = "undertaker";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/undertaker/-/undertaker-2.0.0.tgz";
-        sha512 = "tO/bf30wBbTsJ7go80j0RzA2rcwX6o7XPBpeFcb+jzoeb4pfMM2zUeSDIkY1AWqeZabWxaQZ/h8N9t35QKDLPQ==";
-      };
-    };
-    "undertaker-registry-2.0.0" = {
-      name = "undertaker-registry";
-      packageName = "undertaker-registry";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/undertaker-registry/-/undertaker-registry-2.0.0.tgz";
-        sha512 = "+hhVICbnp+rlzZMgxXenpvTxpuvA67Bfgtt+O9WOE5jo7w/dyiF1VmoZVIHvP2EkUjsyKyTwYKlLhA+j47m1Ew==";
-      };
-    };
     "undici-5.28.2" = {
       name = "undici";
       packageName = "undici";
@@ -35927,15 +35729,6 @@ let
         sha512 = "d7KLgL1LD3U3fgnvWEY1cQXoO/q6EQ1BSz48Sa149V/5zVTAbgmZIpyI8TRi6U9/JNyeYLlTKsEMPtLC27RFUg==";
       };
     };
-    "value-or-function-4.0.0" = {
-      name = "value-or-function";
-      packageName = "value-or-function";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/value-or-function/-/value-or-function-4.0.0.tgz";
-        sha512 = "aeVK81SIuT6aMJfNo9Vte8Dw0/FZINGBV8BfCraGtqVxIeLAEhJyoWs8SmvRVmXfGss2PmmOwZCuBPbZR+IYWg==";
-      };
-    };
     "vary-1.1.2" = {
       name = "vary";
       packageName = "vary";
@@ -36440,42 +36233,6 @@ let
         sha512 = "P5zdf3WB9uzr7IFoVQ2wZTmUwHL8cMZWJGzLBNCHNZ3NB6HTMsYABtt7z8tAGIINLXyAob9B9a1yzVGMFOYKEA==";
       };
     };
-    "vinyl-3.0.0" = {
-      name = "vinyl";
-      packageName = "vinyl";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vinyl/-/vinyl-3.0.0.tgz";
-        sha512 = "rC2VRfAVVCGEgjnxHUnpIVh3AGuk62rP3tqVrn+yab0YH7UULisC085+NYH+mnqf3Wx4SpSi1RQMwudL89N03g==";
-      };
-    };
-    "vinyl-contents-2.0.0" = {
-      name = "vinyl-contents";
-      packageName = "vinyl-contents";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vinyl-contents/-/vinyl-contents-2.0.0.tgz";
-        sha512 = "cHq6NnGyi2pZ7xwdHSW1v4Jfnho4TEGtxZHw01cmnc8+i7jgR6bRnED/LbrKan/Q7CvVLbnvA5OepnhbpjBZ5Q==";
-      };
-    };
-    "vinyl-fs-4.0.0" = {
-      name = "vinyl-fs";
-      packageName = "vinyl-fs";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vinyl-fs/-/vinyl-fs-4.0.0.tgz";
-        sha512 = "7GbgBnYfaquMk3Qu9g22x000vbYkOex32930rBnc3qByw6HfMEAoELjCjoJv4HuEQxHAurT+nvMHm6MnJllFLw==";
-      };
-    };
-    "vinyl-sourcemap-2.0.0" = {
-      name = "vinyl-sourcemap";
-      packageName = "vinyl-sourcemap";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vinyl-sourcemap/-/vinyl-sourcemap-2.0.0.tgz";
-        sha512 = "BAEvWxbBUXvlNoFQVFVHpybBbjW1r03WhohJzJDSfgrrK5xVYIDTan6xN14DlyImShgDRv2gl9qhM6irVMsV0Q==";
-      };
-    };
     "vm-browserify-1.1.2" = {
       name = "vm-browserify";
       packageName = "vm-browserify";
@@ -46581,172 +46338,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  gulp = nodeEnv.buildNodePackage {
-    name = "gulp";
-    packageName = "gulp";
-    version = "5.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/gulp/-/gulp-5.0.0.tgz";
-      sha512 = "S8Z8066SSileaYw1S2N1I64IUc/myI2bqe2ihOBzO6+nKpvNSg7ZcWJt/AwF8LC/NVN+/QZ560Cb/5OPsyhkhg==";
-    };
-    dependencies = [
-      sources."@gulpjs/messages-1.1.0"
-      sources."@gulpjs/to-absolute-glob-4.0.0"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."anymatch-3.1.3"
-      sources."array-each-1.0.1"
-      sources."array-slice-1.1.0"
-      sources."async-done-2.0.0"
-      sources."async-settle-2.0.0"
-      sources."b4a-1.6.7"
-      sources."bach-2.0.1"
-      sources."base64-js-1.5.1"
-      sources."binary-extensions-2.3.0"
-      sources."bl-5.1.0"
-      sources."braces-3.0.3"
-      sources."buffer-6.0.3"
-      sources."chalk-4.1.2"
-      (
-        sources."chokidar-3.6.0"
-        // {
-          dependencies = [
-            sources."glob-parent-5.1.2"
-          ];
-        }
-      )
-      sources."cliui-7.0.4"
-      sources."clone-2.1.2"
-      sources."clone-stats-1.0.0"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."convert-source-map-2.0.0"
-      sources."copy-props-4.0.0"
-      sources."detect-file-1.0.0"
-      sources."each-props-3.0.0"
-      sources."emoji-regex-8.0.0"
-      sources."end-of-stream-1.4.4"
-      sources."escalade-3.2.0"
-      sources."expand-tilde-2.0.2"
-      sources."extend-3.0.2"
-      sources."fast-fifo-1.3.2"
-      sources."fast-levenshtein-3.0.0"
-      sources."fastest-levenshtein-1.0.16"
-      sources."fastq-1.19.1"
-      sources."fill-range-7.1.1"
-      sources."findup-sync-5.0.0"
-      sources."fined-2.0.0"
-      sources."flagged-respawn-2.0.0"
-      sources."for-in-1.0.2"
-      sources."for-own-1.0.0"
-      sources."fs-mkdirp-stream-2.0.1"
-      sources."function-bind-1.1.2"
-      sources."get-caller-file-2.0.5"
-      sources."glob-parent-6.0.2"
-      sources."glob-stream-8.0.2"
-      sources."glob-watcher-6.0.0"
-      sources."global-modules-1.0.0"
-      sources."global-prefix-1.0.2"
-      sources."glogg-2.2.0"
-      sources."graceful-fs-4.2.11"
-      sources."gulp-cli-3.0.0"
-      sources."gulplog-2.2.0"
-      sources."has-flag-4.0.0"
-      sources."hasown-2.0.2"
-      sources."homedir-polyfill-1.0.3"
-      sources."iconv-lite-0.6.3"
-      sources."ieee754-1.2.1"
-      sources."inherits-2.0.4"
-      sources."ini-1.3.8"
-      sources."interpret-3.1.1"
-      sources."is-absolute-1.0.0"
-      sources."is-binary-path-2.1.0"
-      sources."is-core-module-2.16.1"
-      sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-glob-4.0.3"
-      sources."is-negated-glob-1.0.0"
-      sources."is-number-7.0.0"
-      sources."is-plain-object-5.0.0"
-      sources."is-relative-1.0.0"
-      sources."is-unc-path-1.0.0"
-      sources."is-valid-glob-1.0.0"
-      sources."is-windows-1.0.2"
-      sources."isexe-2.0.0"
-      sources."isobject-3.0.1"
-      sources."last-run-2.0.0"
-      sources."lead-4.0.0"
-      sources."liftoff-5.0.0"
-      sources."map-cache-0.2.2"
-      sources."micromatch-4.0.8"
-      sources."mute-stdout-2.0.0"
-      sources."normalize-path-3.0.0"
-      sources."now-and-later-3.0.0"
-      sources."object.defaults-1.1.0"
-      sources."object.pick-1.3.0"
-      sources."once-1.4.0"
-      sources."parse-filepath-1.0.2"
-      sources."parse-passwd-1.0.0"
-      sources."path-parse-1.0.7"
-      sources."path-root-0.1.1"
-      sources."path-root-regex-0.1.2"
-      sources."picomatch-2.3.1"
-      sources."readable-stream-3.6.2"
-      sources."readdirp-3.6.0"
-      sources."rechoir-0.8.0"
-      sources."remove-trailing-separator-1.1.0"
-      sources."replace-ext-2.0.0"
-      sources."replace-homedir-2.0.0"
-      sources."require-directory-2.1.1"
-      sources."resolve-1.22.10"
-      sources."resolve-dir-1.0.1"
-      sources."resolve-options-2.0.0"
-      sources."reusify-1.1.0"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."semver-6.3.1"
-      sources."semver-greatest-satisfied-range-2.0.0"
-      sources."sparkles-2.1.0"
-      sources."stream-composer-1.0.2"
-      sources."stream-exhaust-1.0.2"
-      sources."streamx-2.22.0"
-      sources."string-width-4.2.3"
-      sources."string_decoder-1.3.0"
-      sources."strip-ansi-6.0.1"
-      sources."supports-color-7.2.0"
-      sources."supports-preserve-symlinks-flag-1.0.0"
-      sources."sver-1.8.4"
-      sources."teex-1.0.1"
-      sources."text-decoder-1.2.3"
-      sources."to-regex-range-5.0.1"
-      sources."to-through-3.0.0"
-      sources."unc-path-regex-0.1.2"
-      sources."undertaker-2.0.0"
-      sources."undertaker-registry-2.0.0"
-      sources."util-deprecate-1.0.2"
-      sources."v8flags-4.0.1"
-      sources."value-or-function-4.0.0"
-      sources."vinyl-3.0.0"
-      sources."vinyl-contents-2.0.0"
-      sources."vinyl-fs-4.0.0"
-      sources."vinyl-sourcemap-2.0.0"
-      sources."which-1.3.1"
-      sources."wrap-ansi-7.0.0"
-      sources."wrappy-1.0.2"
-      sources."y18n-5.0.8"
-      sources."yargs-16.2.0"
-      sources."yargs-parser-20.2.9"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Streaming build system for JavaScript";
-      homepage = "https://gulpjs.com";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   gulp-cli = nodeEnv.buildNodePackage {
     name = "gulp-cli";
     packageName = "gulp-cli";

From 60dcd1aad2025f41a3f7f1981576b1c6db997e8e Mon Sep 17 00:00:00 2001
From: Chris Moultrie <821688+tebriel@users.noreply.github.com>
Date: Tue, 4 Nov 2025 19:52:25 -0500
Subject: [PATCH 5449/6226] forgejo-runner: 11.2.0 -> 11.3.0

changelog: https://code.forgejo.org/forgejo/runner/releases/tag/v11.3.0
---
 pkgs/by-name/fo/forgejo-runner/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix
index 3fe8cc8d9787..ac198f9ccb1f 100644
--- a/pkgs/by-name/fo/forgejo-runner/package.nix
+++ b/pkgs/by-name/fo/forgejo-runner/package.nix
@@ -42,14 +42,14 @@ let
 in
 buildGoModule rec {
   pname = "forgejo-runner";
-  version = "11.2.0";
+  version = "11.3.0";
 
   src = fetchFromGitea {
     domain = "code.forgejo.org";
     owner = "forgejo";
     repo = "runner";
     rev = "v${version}";
-    hash = "sha256-hjrn36Fm2kIKqn16DOPcrMF38dhsGOZVHCTrhkS99QQ=";
+    hash = "sha256-tbP6S4suHT8eEIg+Gd2d7Su2cgwWNALcHnue9UpDnKU=";
   };
 
   vendorHash = "sha256-QokVTTfMGAJG4Jqfs7mfGXrC4QSZfOXesfF2OeN0L9M=";

From 62c23ac5db317b16b737d431867817f905e93b38 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Wed, 5 Nov 2025 01:01:45 +0000
Subject: [PATCH 5450/6226] cargo-pgrx_0_16_1: init

---
 pkgs/development/tools/rust/cargo-pgrx/pinned.nix | 6 ++++++
 pkgs/top-level/all-packages.nix                   | 1 +
 2 files changed, 7 insertions(+)

diff --git a/pkgs/development/tools/rust/cargo-pgrx/pinned.nix b/pkgs/development/tools/rust/cargo-pgrx/pinned.nix
index 5a7594dd6fec..8e33f655528c 100644
--- a/pkgs/development/tools/rust/cargo-pgrx/pinned.nix
+++ b/pkgs/development/tools/rust/cargo-pgrx/pinned.nix
@@ -17,4 +17,10 @@
     hash = "sha256-emNR7fXNVD9sY/Mdno7mwpH6l/7AD28cBUsFRn9je50=";
     cargoHash = "sha256-3eyBDWDoCzSU0tbab8qbjSnBkkN0oOgd7YbuyHLEHYw=";
   };
+
+  cargo-pgrx_0_16_1 = {
+    version = "0.16.1";
+    hash = "sha256-AjoBr+/sEPdzbD0wLUNVm2syCySkGaFOFQ70TST1U9w=";
+    cargoHash = "sha256-95DHq5GLnAqb3bbKwwaeBeKEmkfRh81ZTRaJ7L59DAg=";
+  };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 207202790f36..5713d2620a4f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5335,6 +5335,7 @@ with pkgs;
     cargo-pgrx_0_12_0_alpha_1
     cargo-pgrx_0_12_6
     cargo-pgrx_0_16_0
+    cargo-pgrx_0_16_1
     cargo-pgrx
     ;
 

From ffa2fa10c7e8e0677d8a3b67efa3e8e26fb72a5f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 01:07:25 +0000
Subject: [PATCH 5451/6226] typescript-go: 0-unstable-2025-10-29 ->
 0-unstable-2025-11-04

---
 pkgs/by-name/ty/typescript-go/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/typescript-go/package.nix b/pkgs/by-name/ty/typescript-go/package.nix
index 9835f8f89062..b1134aa2d169 100644
--- a/pkgs/by-name/ty/typescript-go/package.nix
+++ b/pkgs/by-name/ty/typescript-go/package.nix
@@ -10,13 +10,13 @@ let
 in
 buildGoModule {
   pname = "typescript-go";
-  version = "0-unstable-2025-10-29";
+  version = "0-unstable-2025-11-04";
 
   src = fetchFromGitHub {
     owner = "microsoft";
     repo = "typescript-go";
-    rev = "6642b0a33b7fbea3594e8c243d9323a1ad945202";
-    hash = "sha256-kvG21V9prb+Brg2wPaXwzd4eEfNE6VfYn8st3hsCsco=";
+    rev = "3d247ef578b7291790fe059fc06a1ae9eaad9187";
+    hash = "sha256-pfWeztSI41TTJ/oQwi6QX9Ow9nU3cXzv8Lq5TNn8Av0=";
     fetchSubmodules = false;
   };
 

From 125f9bad8ca753fd027f2a3ef8acfadcc217fa7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 01:09:19 +0000
Subject: [PATCH 5452/6226] fscryptctl: 1.2.0 -> 1.3.0

---
 pkgs/by-name/fs/fscryptctl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fs/fscryptctl/package.nix b/pkgs/by-name/fs/fscryptctl/package.nix
index 7dc4aaf033bc..153f343f3094 100644
--- a/pkgs/by-name/fs/fscryptctl/package.nix
+++ b/pkgs/by-name/fs/fscryptctl/package.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "fscryptctl";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "fscryptctl";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-5suEdSpX8alDkSnSnyiIjUmZq98eK0ZPVAtDKhOs65c=";
+    hash = "sha256-MScjiuKHmep2CrVnDXbSOZ7MQzcGrD0kP1xkF+Z5tK0=";
   };
 
   nativeBuildInputs = [ pandoc ];

From 1c6f95acd748893cef7abb11cdd96df4ece9cef8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 01:09:40 +0000
Subject: [PATCH 5453/6226] fscrypt-experimental: 0.3.5 -> 0.3.6

---
 pkgs/by-name/fs/fscrypt-experimental/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fs/fscrypt-experimental/package.nix b/pkgs/by-name/fs/fscrypt-experimental/package.nix
index 1aa974b60e8f..7d3515ca146c 100644
--- a/pkgs/by-name/fs/fscrypt-experimental/package.nix
+++ b/pkgs/by-name/fs/fscrypt-experimental/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule rec {
   pname = "fscrypt";
-  version = "0.3.5";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "fscrypt";
     rev = "v${version}";
-    hash = "sha256-US1jw0XK1BcP037XPhttzBloDU62m4BVSIbsGs9LaJU=";
+    hash = "sha256-iz/lkLDHJkyAHqSlzr8vbcbZv9N/c1evNufeAFNdcag=";
   };
 
   postPatch = ''
@@ -26,7 +26,7 @@ buildGoModule rec {
       --replace "/usr/local" "$out"
   '';
 
-  vendorHash = "sha256-FuVWV3Rimhd+Pm9wrKGLWQWtbP1hWvoWa22pQT+m2go=";
+  vendorHash = "sha256-0bCpmwWWTLWsa3P5ERwOCJ1we1sofqqPXy5JlZsqJpk=";
 
   doCheck = false;
 

From 71bda90ee9425ad74c7e3bf2a8784b6d8524317d Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Tue, 28 Oct 2025 23:48:08 +0100
Subject: [PATCH 5454/6226] maintainers: retire pbogdan

No active contributions since 2020.
---
 maintainers/maintainer-list.nix               | 6 ------
 pkgs/applications/audio/quodlibet/default.nix | 4 +---
 pkgs/by-name/gn/gnome-feeds/package.nix       | 1 -
 3 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index e1872cc3e4b3..cfc9a9407c29 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -20018,12 +20018,6 @@
     githubId = 6498458;
     name = "pebble kite";
   };
-  pbogdan = {
-    email = "ppbogdan@gmail.com";
-    github = "pbogdan";
-    githubId = 157610;
-    name = "Piotr Bogdan";
-  };
   pborzenkov = {
     email = "pavel@borzenkov.net";
     github = "pborzenkov";
diff --git a/pkgs/applications/audio/quodlibet/default.nix b/pkgs/applications/audio/quodlibet/default.nix
index 01159d75be44..d1740db71df6 100644
--- a/pkgs/applications/audio/quodlibet/default.nix
+++ b/pkgs/applications/audio/quodlibet/default.nix
@@ -193,8 +193,6 @@ python3.pkgs.buildPythonApplication rec {
     '';
     homepage = "https://quodlibet.readthedocs.io/en/latest";
     license = lib.licenses.gpl2Plus;
-    maintainers = with lib.maintainers; [
-      pbogdan
-    ];
+    maintainers = [ ];
   };
 }
diff --git a/pkgs/by-name/gn/gnome-feeds/package.nix b/pkgs/by-name/gn/gnome-feeds/package.nix
index e502a17bdbed..7e4765a50dea 100644
--- a/pkgs/by-name/gn/gnome-feeds/package.nix
+++ b/pkgs/by-name/gn/gnome-feeds/package.nix
@@ -87,7 +87,6 @@ python3.pkgs.buildPythonApplication rec {
     homepage = "https://gitlab.gnome.org/World/gfeeds";
     license = lib.licenses.gpl3Plus;
     maintainers = with lib.maintainers; [
-      pbogdan
       aleksana
     ];
     platforms = lib.platforms.linux;

From 30e982f4f5002a8abdb4be8c0249d8ba36511370 Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Wed, 5 Nov 2025 01:02:28 +0000
Subject: [PATCH 5455/6226] postgresqlPackages.pgvectorscale: 0.7.0 -> 0.9.0

---
 .../ext/pgvectorscale/add-Cargo.lock.patch    | 1271 ++++++++---------
 .../postgresql/ext/pgvectorscale/package.nix  |   17 +-
 2 files changed, 622 insertions(+), 666 deletions(-)

diff --git a/pkgs/servers/sql/postgresql/ext/pgvectorscale/add-Cargo.lock.patch b/pkgs/servers/sql/postgresql/ext/pgvectorscale/add-Cargo.lock.patch
index e022abb63205..82d7b83680bc 100644
--- a/pkgs/servers/sql/postgresql/ext/pgvectorscale/add-Cargo.lock.patch
+++ b/pkgs/servers/sql/postgresql/ext/pgvectorscale/add-Cargo.lock.patch
@@ -1,27 +1,12 @@
 diff --git a/Cargo.lock b/Cargo.lock
 new file mode 100644
-index 0000000..f654689
+index 0000000..09ad763
 --- /dev/null
 +++ b/Cargo.lock
-@@ -0,0 +1,2806 @@
+@@ -0,0 +1,2765 @@
 +# This file is automatically @generated by Cargo.
 +# It is not intended for manual editing.
-+version = 3
-+
-+[[package]]
-+name = "addr2line"
-+version = "0.24.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
-+dependencies = [
-+ "gimli",
-+]
-+
-+[[package]]
-+name = "adler2"
-+version = "2.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
++version = 4
 +
 +[[package]]
 +name = "ahash"
@@ -29,21 +14,27 @@ index 0000000..f654689
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 +dependencies = [
-+ "getrandom 0.2.15",
++ "getrandom 0.2.16",
 + "once_cell",
 + "version_check",
 +]
 +
 +[[package]]
 +name = "aho-corasick"
-+version = "1.1.3"
++version = "1.1.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
++checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
 +dependencies = [
 + "memchr",
 +]
 +
 +[[package]]
++name = "allocator-api2"
++version = "0.2.21"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
++
++[[package]]
 +name = "anes"
 +version = "0.1.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -51,67 +42,42 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "annotate-snippets"
-+version = "0.9.2"
++version = "0.11.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ccaf7e9dfbb6ab22c82e473cd1a8a7bd313c19a5b7e40970f3d89ef5a5c9e81e"
++checksum = "710e8eae58854cdc1790fcb56cca04d712a17be849eeb81da2a724bf4bae2bc4"
 +dependencies = [
++ "anstyle",
 + "unicode-width",
-+ "yansi-term",
 +]
 +
 +[[package]]
 +name = "anstyle"
-+version = "1.0.10"
++version = "1.0.13"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "55cc3b69f167a1ef2e161439aa98aed94e6028e5f9a59be9a6ffb47aef1651f9"
++checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
 +
 +[[package]]
 +name = "anyhow"
-+version = "1.0.97"
++version = "1.0.100"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "dcfed56ad506cb2c684a14971b8861fdc3baaaae314b9e5f9bb532cbe3ba7a4f"
++checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
 +
 +[[package]]
 +name = "async-trait"
-+version = "0.1.88"
++version = "0.1.89"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e539d3fca749fcee5236ab05e93a52867dd549cc157c8cb7f99595f3cedffdb5"
++checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
-+]
-+
-+[[package]]
-+name = "atomic-traits"
-+version = "0.3.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b29ec3788e96fb4fdb275ccb9d62811f2fa903d76c5eb4dd6fe7d09a7ed5871f"
-+dependencies = [
-+ "cfg-if 1.0.0",
-+ "rustc_version",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
 +name = "autocfg"
-+version = "1.4.0"
++version = "1.5.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
-+
-+[[package]]
-+name = "backtrace"
-+version = "0.3.74"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
-+dependencies = [
-+ "addr2line",
-+ "cfg-if 1.0.0",
-+ "libc",
-+ "miniz_oxide",
-+ "object",
-+ "rustc-demangle",
-+ "windows-targets",
-+]
++checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 +
 +[[package]]
 +name = "base64"
@@ -121,9 +87,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "bindgen"
-+version = "0.70.1"
++version = "0.71.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f49d8fed880d473ea71efb9bf597651e77201bdd4893efe54c9e5d65ae04ce6f"
++checksum = "5f58bf3d7db68cfbac37cfc485a8d711e87e064c3d0fe0435b92f7a407f9d6b3"
 +dependencies = [
 + "annotate-snippets",
 + "bitflags",
@@ -135,7 +101,7 @@ index 0000000..f654689
 + "regex",
 + "rustc-hash",
 + "shlex",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
@@ -155,9 +121,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "bitflags"
-+version = "2.9.0"
++version = "2.10.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
++checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 +
 +[[package]]
 +name = "bitvec"
@@ -182,9 +148,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "bumpalo"
-+version = "3.17.0"
++version = "3.19.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
++checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 +
 +[[package]]
 +name = "bytecheck"
@@ -222,11 +188,11 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "camino"
-+version = "1.1.9"
++version = "1.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
++checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609"
 +dependencies = [
-+ "serde",
++ "serde_core",
 +]
 +
 +[[package]]
@@ -246,7 +212,7 @@ index 0000000..f654689
 +dependencies = [
 + "camino",
 + "cargo-platform",
-+ "semver 1.0.26",
++ "semver",
 + "serde",
 + "serde_json",
 + "thiserror 1.0.69",
@@ -254,9 +220,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "cargo_toml"
-+version = "0.19.2"
++version = "0.22.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a98356df42a2eb1bd8f1793ae4ee4de48e384dd974ce5eac8eee802edb7492be"
++checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77"
 +dependencies = [
 + "serde",
 + "toml",
@@ -270,10 +236,11 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "cc"
-+version = "1.2.17"
++version = "1.2.44"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1fcb57c740ae1daf453ae85f16e37396f672b039e00d9d866e07ddb24e328e3a"
++checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3"
 +dependencies = [
++ "find-msvc-tools",
 + "shlex",
 +]
 +
@@ -304,9 +271,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "cfg-if"
-+version = "1.0.0"
++version = "1.0.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
++checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 +
 +[[package]]
 +name = "ciborium"
@@ -332,7 +299,7 @@ index 0000000..f654689
 +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9"
 +dependencies = [
 + "ciborium-io",
-+ "half 2.5.0",
++ "half 2.7.1",
 +]
 +
 +[[package]]
@@ -348,9 +315,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "clap"
-+version = "4.5.32"
++version = "4.5.51"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6088f3ae8c3608d19260cd7445411865a485688711b78b5be70d78cd96136f83"
++checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5"
 +dependencies = [
 + "clap_builder",
 + "clap_derive",
@@ -369,9 +336,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "clap_builder"
-+version = "4.5.32"
++version = "4.5.51"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "22a7ef7f676155edfb82daa97f99441f3ebf4a58d5e32f295a56259f1b6facc8"
++checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a"
 +dependencies = [
 + "anstyle",
 + "clap_lex",
@@ -379,36 +346,39 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "clap_derive"
-+version = "4.5.32"
++version = "4.5.49"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "09176aae279615badda0765c0c0b3f6ed53f4709118af73cf4655d85d1530cd7"
++checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671"
 +dependencies = [
 + "heck",
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
 +name = "clap_lex"
-+version = "0.7.4"
++version = "0.7.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f46ad14479a25103f283c0f10005961cf086d8dc42205bb44c46ac563475dca6"
++checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d"
 +
 +[[package]]
-+name = "convert_case"
-+version = "0.6.0"
++name = "codepage"
++version = "0.1.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca"
++checksum = "48f68d061bc2828ae826206326e61251aca94c1e4a5305cf52d9138639c918b4"
 +dependencies = [
-+ "unicode-segmentation",
++ "encoding_rs",
 +]
 +
 +[[package]]
-+name = "core-foundation-sys"
-+version = "0.8.7"
++name = "convert_case"
++version = "0.8.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
++checksum = "baaaa0ecca5b51987b9423ccdc971514dd8b0bb7b4060b983d3664dad3f1f89f"
++dependencies = [
++ "unicode-segmentation",
++]
 +
 +[[package]]
 +name = "cpufeatures"
@@ -482,9 +452,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "crunchy"
-+version = "0.2.3"
++version = "0.2.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "43da5946c66ffcc7745f48db692ffbb10a83bfe0afd96235c5c2a4fb23994929"
++checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
 +
 +[[package]]
 +name = "crypto-common"
@@ -515,7 +485,7 @@ index 0000000..f654689
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
@@ -525,6 +495,15 @@ index 0000000..f654689
 +checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
 +
 +[[package]]
++name = "encoding_rs"
++version = "0.8.35"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3"
++dependencies = [
++ "cfg-if 1.0.4",
++]
++
++[[package]]
 +name = "enum-map"
 +version = "2.7.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -541,7 +520,7 @@ index 0000000..f654689
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
@@ -552,12 +531,12 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "errno"
-+version = "0.3.10"
++version = "0.3.14"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "33d852cb9b869c2a9b3df2f71a3074817f01e1844f839a144f5fcef059a4eb5d"
++checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
 +dependencies = [
 + "libc",
-+ "windows-sys 0.59.0",
++ "windows-sys 0.61.2",
 +]
 +
 +[[package]]
@@ -583,10 +562,16 @@ index 0000000..f654689
 +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
 +
 +[[package]]
-+name = "fixedbitset"
-+version = "0.4.2"
++name = "find-msvc-tools"
++version = "0.1.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
++checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
++
++[[package]]
++name = "fixedbitset"
++version = "0.5.7"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1d674e81391d1e1ab681a28d99df07927c6d4aa5b027d7da16ba32d1d21ecd99"
 +
 +[[package]]
 +name = "fnv"
@@ -595,10 +580,16 @@ index 0000000..f654689
 +checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 +
 +[[package]]
-+name = "form_urlencoded"
-+version = "1.2.1"
++name = "foldhash"
++version = "0.1.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
++checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
++
++[[package]]
++name = "form_urlencoded"
++version = "1.2.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
 +dependencies = [
 + "percent-encoding",
 +]
@@ -658,17 +649,6 @@ index 0000000..f654689
 +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
 +
 +[[package]]
-+name = "futures-macro"
-+version = "0.3.31"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.100",
-+]
-+
-+[[package]]
 +name = "futures-sink"
 +version = "0.3.31"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -689,7 +669,6 @@ index 0000000..f654689
 + "futures-channel",
 + "futures-core",
 + "futures-io",
-+ "futures-macro",
 + "futures-sink",
 + "futures-task",
 + "memchr",
@@ -700,9 +679,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "generic-array"
-+version = "0.14.7"
++version = "0.14.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
++checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
 +dependencies = [
 + "typenum",
 + "version_check",
@@ -710,38 +689,32 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "getrandom"
-+version = "0.2.15"
++version = "0.2.16"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
++checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
 +dependencies = [
-+ "cfg-if 1.0.0",
++ "cfg-if 1.0.4",
 + "libc",
-+ "wasi 0.11.0+wasi-snapshot-preview1",
++ "wasi",
 +]
 +
 +[[package]]
 +name = "getrandom"
-+version = "0.3.2"
++version = "0.3.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "73fea8450eea4bac3940448fb7ae50d91f034f941199fcd9d909a5a07aa455f0"
++checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 +dependencies = [
-+ "cfg-if 1.0.0",
++ "cfg-if 1.0.4",
 + "libc",
 + "r-efi",
-+ "wasi 0.14.2+wasi-0.2.4",
++ "wasip2",
 +]
 +
 +[[package]]
-+name = "gimli"
-+version = "0.31.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
-+
-+[[package]]
 +name = "glob"
-+version = "0.3.2"
++version = "0.3.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2"
++checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
 +
 +[[package]]
 +name = "half"
@@ -751,21 +724,13 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "half"
-+version = "2.5.0"
++version = "2.7.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7db2ff139bba50379da6aa0766b52fdcb62cb5b263009b09ed58ba604e14bbd1"
++checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b"
 +dependencies = [
-+ "cfg-if 1.0.0",
++ "cfg-if 1.0.4",
 + "crunchy",
-+]
-+
-+[[package]]
-+name = "hash32"
-+version = "0.3.1"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "47d60b12902ba28e2730cd37e95b8c9223af2808df9e902d4df49588d1470606"
-+dependencies = [
-+ "byteorder",
++ "zerocopy",
 +]
 +
 +[[package]]
@@ -779,19 +744,20 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "hashbrown"
-+version = "0.15.2"
++version = "0.15.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"
++checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1"
++dependencies = [
++ "allocator-api2",
++ "equivalent",
++ "foldhash",
++]
 +
 +[[package]]
-+name = "heapless"
-+version = "0.8.0"
++name = "hashbrown"
++version = "0.16.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0bfb9eb618601c89945a70e254898da93b13be0388091d42117462b265bb3fad"
-+dependencies = [
-+ "hash32",
-+ "stable_deref_trait",
-+]
++checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
 +
 +[[package]]
 +name = "heck"
@@ -801,9 +767,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "hermit-abi"
-+version = "0.5.0"
++version = "0.5.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e"
++checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
 +
 +[[package]]
 +name = "hmac"
@@ -815,31 +781,23 @@ index 0000000..f654689
 +]
 +
 +[[package]]
-+name = "home"
-+version = "0.5.11"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
-+dependencies = [
-+ "windows-sys 0.59.0",
-+]
-+
-+[[package]]
 +name = "icu_collections"
-+version = "1.5.0"
++version = "2.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
++checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
 +dependencies = [
 + "displaydoc",
++ "potential_utf",
 + "yoke",
 + "zerofrom",
 + "zerovec",
 +]
 +
 +[[package]]
-+name = "icu_locid"
-+version = "1.5.0"
++name = "icu_locale_core"
++version = "2.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
++checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
 +dependencies = [
 + "displaydoc",
 + "litemap",
@@ -849,103 +807,65 @@ index 0000000..f654689
 +]
 +
 +[[package]]
-+name = "icu_locid_transform"
-+version = "1.5.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-+dependencies = [
-+ "displaydoc",
-+ "icu_locid",
-+ "icu_locid_transform_data",
-+ "icu_provider",
-+ "tinystr",
-+ "zerovec",
-+]
-+
-+[[package]]
-+name = "icu_locid_transform_data"
-+version = "1.5.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
-+
-+[[package]]
 +name = "icu_normalizer"
-+version = "1.5.0"
++version = "2.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
++checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
 +dependencies = [
-+ "displaydoc",
 + "icu_collections",
 + "icu_normalizer_data",
 + "icu_properties",
 + "icu_provider",
 + "smallvec",
-+ "utf16_iter",
-+ "utf8_iter",
-+ "write16",
 + "zerovec",
 +]
 +
 +[[package]]
 +name = "icu_normalizer_data"
-+version = "1.5.0"
++version = "2.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
++checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
 +
 +[[package]]
 +name = "icu_properties"
-+version = "1.5.1"
++version = "2.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "93d6020766cfc6302c15dbbc9c8778c37e62c14427cb7f6e601d849e092aeef5"
++checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99"
 +dependencies = [
-+ "displaydoc",
 + "icu_collections",
-+ "icu_locid_transform",
++ "icu_locale_core",
 + "icu_properties_data",
 + "icu_provider",
-+ "tinystr",
++ "zerotrie",
 + "zerovec",
 +]
 +
 +[[package]]
 +name = "icu_properties_data"
-+version = "1.5.0"
++version = "2.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
++checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899"
 +
 +[[package]]
 +name = "icu_provider"
-+version = "1.5.0"
++version = "2.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
++checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
 +dependencies = [
 + "displaydoc",
-+ "icu_locid",
-+ "icu_provider_macros",
-+ "stable_deref_trait",
-+ "tinystr",
++ "icu_locale_core",
 + "writeable",
 + "yoke",
 + "zerofrom",
++ "zerotrie",
 + "zerovec",
 +]
 +
 +[[package]]
-+name = "icu_provider_macros"
-+version = "1.5.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-+dependencies = [
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.100",
-+]
-+
-+[[package]]
 +name = "idna"
-+version = "1.0.3"
++version = "1.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
++checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
 +dependencies = [
 + "idna_adapter",
 + "smallvec",
@@ -954,9 +874,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "idna_adapter"
-+version = "1.2.0"
++version = "1.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "daca1df1c957320b2cf139ac61e7bd64fed304c5040df000a745aa1de3b4ef71"
++checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
 +dependencies = [
 + "icu_normalizer",
 + "icu_properties",
@@ -964,29 +884,29 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "indenter"
-+version = "0.3.3"
++version = "0.3.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ce23b50ad8242c51a442f3ff322d56b02f08852c77e4c0b4d3fd684abc89c683"
++checksum = "964de6e86d545b246d84badc0fef527924ace5134f30641c203ef52ba83f58d5"
 +
 +[[package]]
 +name = "indexmap"
-+version = "2.8.0"
++version = "2.12.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3954d50fe15b02142bf25d3b8bdadb634ec3948f103d04ffe3031bc8fe9d7058"
++checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
 +dependencies = [
 + "equivalent",
-+ "hashbrown 0.15.2",
++ "hashbrown 0.16.0",
 +]
 +
 +[[package]]
 +name = "is-terminal"
-+version = "0.4.16"
++version = "0.4.17"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
++checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46"
 +dependencies = [
 + "hermit-abi",
 + "libc",
-+ "windows-sys 0.59.0",
++ "windows-sys 0.61.2",
 +]
 +
 +[[package]]
@@ -1021,63 +941,76 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "js-sys"
-+version = "0.3.77"
++version = "0.3.82"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
++checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
 +dependencies = [
 + "once_cell",
 + "wasm-bindgen",
 +]
 +
 +[[package]]
-+name = "lazy_static"
-+version = "1.5.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
-+
-+[[package]]
 +name = "libc"
-+version = "0.2.171"
++version = "0.2.177"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c19937216e9d3aa9956d9bb8dfc0b0c8beb6058fc4f7a4dc4d850edf86a237d6"
++checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 +
 +[[package]]
 +name = "libloading"
-+version = "0.8.6"
++version = "0.8.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fc2f4eb4bc735547cfed7c0a4922cbd04a4655978c09b54f1f7b228750664c34"
++checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
 +dependencies = [
-+ "cfg-if 1.0.0",
-+ "windows-targets",
++ "cfg-if 1.0.4",
++ "windows-link",
++]
++
++[[package]]
++name = "libredox"
++version = "0.1.10"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
++dependencies = [
++ "bitflags",
++ "libc",
++ "redox_syscall",
 +]
 +
 +[[package]]
 +name = "linux-raw-sys"
-+version = "0.9.3"
++version = "0.11.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fe7db12097d22ec582439daf8618b8fdd1a7bef6270e9af3b1ebcd30893cf413"
++checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
 +
 +[[package]]
 +name = "litemap"
-+version = "0.7.5"
++version = "0.8.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "23fb14cb19457329c82206317a5663005a4d404783dc74f4252769b0d5f42856"
++checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
 +
 +[[package]]
 +name = "lock_api"
-+version = "0.4.12"
++version = "0.4.14"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
++checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
 +dependencies = [
-+ "autocfg",
 + "scopeguard",
 +]
 +
 +[[package]]
 +name = "log"
-+version = "0.4.27"
++version = "0.4.28"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
++checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
++
++[[package]]
++name = "lru"
++version = "0.14.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9f8cc7106155f10bdf99a6f379688f543ad6596a415375b36a59a054ceda1198"
++dependencies = [
++ "hashbrown 0.15.5",
++]
 +
 +[[package]]
 +name = "md-5"
@@ -1085,15 +1018,15 @@ index 0000000..f654689
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
 +dependencies = [
-+ "cfg-if 1.0.0",
++ "cfg-if 1.0.4",
 + "digest",
 +]
 +
 +[[package]]
 +name = "memchr"
-+version = "2.7.4"
++version = "2.7.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
++checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 +
 +[[package]]
 +name = "memoffset"
@@ -1111,23 +1044,14 @@ index 0000000..f654689
 +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 +
 +[[package]]
-+name = "miniz_oxide"
-+version = "0.8.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8e3e04debbb59698c15bacbb6d93584a8c0ca9cc3213cb423d31f760d8843ce5"
-+dependencies = [
-+ "adler2",
-+]
-+
-+[[package]]
 +name = "mio"
-+version = "1.0.3"
++version = "1.1.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2886843bf800fba2e3377cff24abf6379b4c4d5c6681eaf9ea5b0d15090450bd"
++checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
 +dependencies = [
 + "libc",
-+ "wasi 0.11.0+wasi-snapshot-preview1",
-+ "windows-sys 0.52.0",
++ "wasi",
++ "windows-sys 0.61.2",
 +]
 +
 +[[package]]
@@ -1159,19 +1083,19 @@ index 0000000..f654689
 +]
 +
 +[[package]]
-+name = "object"
-+version = "0.36.7"
++name = "objc2-core-foundation"
++version = "0.3.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
++checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
 +dependencies = [
-+ "memchr",
++ "bitflags",
 +]
 +
 +[[package]]
 +name = "once_cell"
-+version = "1.21.1"
++version = "1.21.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d75b0bedcc4fe52caa0e03d9f1151a323e4aa5e2d78ba3580400cd3c9e2bc4bc"
++checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 +
 +[[package]]
 +name = "oorandom"
@@ -1181,19 +1105,18 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "owo-colors"
-+version = "4.2.0"
++version = "4.2.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1036865bb9422d3300cf723f657c2851d0e9ab12567854b1f4eba3d77decf564"
++checksum = "9c6901729fa79e91a0913333229e9ca5dc725089d1c363b2f4b4760709dc4a52"
 +dependencies = [
-+ "supports-color 2.1.0",
-+ "supports-color 3.0.2",
++ "supports-color",
 +]
 +
 +[[package]]
 +name = "parking_lot"
-+version = "0.12.3"
++version = "0.12.5"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
++checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
 +dependencies = [
 + "lock_api",
 + "parking_lot_core",
@@ -1201,15 +1124,15 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "parking_lot_core"
-+version = "0.9.10"
++version = "0.9.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
++checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 +dependencies = [
-+ "cfg-if 1.0.0",
++ "cfg-if 1.0.4",
 + "libc",
 + "redox_syscall",
 + "smallvec",
-+ "windows-targets",
++ "windows-link",
 +]
 +
 +[[package]]
@@ -1249,44 +1172,32 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "percent-encoding"
-+version = "2.3.1"
++version = "2.3.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
-+
-+[[package]]
-+name = "pest"
-+version = "2.8.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "198db74531d58c70a361c42201efde7e2591e976d518caf7662a47dc5720e7b6"
-+dependencies = [
-+ "memchr",
-+ "thiserror 2.0.12",
-+ "ucd-trie",
-+]
++checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 +
 +[[package]]
 +name = "petgraph"
-+version = "0.6.5"
++version = "0.8.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
++checksum = "8701b58ea97060d5e5b155d383a69952a60943f0e6dfe30b04c287beb0b27455"
 +dependencies = [
 + "fixedbitset",
++ "hashbrown 0.15.5",
 + "indexmap",
++ "serde",
 +]
 +
 +[[package]]
 +name = "pgrx"
-+version = "0.12.9"
++version = "0.16.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "227bf7e162ce710994306a97bc56bb3fe305f21120ab6692e2151c48416f5c0d"
++checksum = "fdcfb88f7fa9ba42b4ea9d1f85a1d968bbb407cc30308b35f73bdfe6c966f64b"
 +dependencies = [
-+ "atomic-traits",
 + "bitflags",
 + "bitvec",
 + "enum-map",
-+ "heapless",
 + "libc",
-+ "once_cell",
 + "pgrx-macros",
 + "pgrx-pg-sys",
 + "pgrx-sql-entity-graph",
@@ -1294,15 +1205,15 @@ index 0000000..f654689
 + "serde",
 + "serde_cbor",
 + "serde_json",
-+ "thiserror 1.0.69",
++ "thiserror 2.0.17",
 + "uuid",
 +]
 +
 +[[package]]
 +name = "pgrx-bindgen"
-+version = "0.12.9"
++version = "0.16.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "81cbcd956c2da35baaf0a116e6f6a49a6c2fbc8f6b332f66d6fd060bfd00615f"
++checksum = "00e35193b7e71e2f612d336cecd00db0f049f4cc609f2b1c9a34755b5ec559d7"
 +dependencies = [
 + "bindgen",
 + "cc",
@@ -1311,46 +1222,49 @@ index 0000000..f654689
 + "pgrx-pg-config",
 + "proc-macro2",
 + "quote",
++ "regex",
 + "shlex",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 + "walkdir",
 +]
 +
 +[[package]]
 +name = "pgrx-macros"
-+version = "0.12.9"
++version = "0.16.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e2f4291450d65e4deb770ce57ea93e22353d97950566222429cd166ebdf6f938"
++checksum = "dab542dd4041773874f90cd8e3448195749548dc3fb1daf501e7e11ebfb1dd22"
 +dependencies = [
 + "pgrx-sql-entity-graph",
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
 +name = "pgrx-pg-config"
-+version = "0.12.9"
++version = "0.16.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "86a64a4c6e4e43e73cf8d3379d9533df98ded45c920e1ba8131c979633d74132"
++checksum = "eff9b29df94c3f9fcb0cde220f92eea6975ed05962784a98fb557754ad663501"
 +dependencies = [
 + "cargo_toml",
++ "codepage",
++ "encoding_rs",
 + "eyre",
-+ "home",
 + "owo-colors",
 + "pathsearch",
 + "serde",
 + "serde_json",
-+ "thiserror 1.0.69",
++ "thiserror 2.0.17",
 + "toml",
 + "url",
++ "winapi",
 +]
 +
 +[[package]]
 +name = "pgrx-pg-sys"
-+version = "0.12.9"
++version = "0.16.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "63a5dc64f2a8226434118aa2c4700450fa42b04f29488ad98268848b21c1a4ec"
++checksum = "934f2536953ccb6722bef2cfdfb1f8d6d3cd4a4f2c508d56ec85b649c5680c2b"
 +dependencies = [
 + "cee-scape",
 + "libc",
@@ -1358,30 +1272,29 @@ index 0000000..f654689
 + "pgrx-macros",
 + "pgrx-sql-entity-graph",
 + "serde",
-+ "sptr",
 +]
 +
 +[[package]]
 +name = "pgrx-sql-entity-graph"
-+version = "0.12.9"
++version = "0.16.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d81cc2e851c7e36b2f47c03e22d64d56c1d0e762fbde0039ba2cd490cfef3615"
++checksum = "07a767cb9faa612f1ba7f13718136d4006950d6f253b414ef487a03e85c47a94"
 +dependencies = [
 + "convert_case",
 + "eyre",
 + "petgraph",
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
-+ "thiserror 1.0.69",
++ "syn 2.0.108",
++ "thiserror 2.0.17",
 + "unescape",
 +]
 +
 +[[package]]
 +name = "pgrx-tests"
-+version = "0.12.9"
++version = "0.16.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0c2dd5d674cb7d92024709543da06d26723a2f7450c02083116b232587160929"
++checksum = "e0d5d5f614a32310af2cc1b9587c69e041d97e8ab812d8d31fdcd3d33d27325c"
 +dependencies = [
 + "clap-cargo",
 + "eyre",
@@ -1393,12 +1306,15 @@ index 0000000..f654689
 + "pgrx-pg-config",
 + "postgres",
 + "proptest",
-+ "rand 0.8.5",
++ "rand 0.9.2",
 + "regex",
 + "serde",
 + "serde_json",
++ "shlex",
 + "sysinfo",
-+ "thiserror 1.0.69",
++ "tempfile",
++ "thiserror 2.0.17",
++ "winapi",
 +]
 +
 +[[package]]
@@ -1411,18 +1327,19 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "phf"
-+version = "0.11.3"
++version = "0.13.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1fd6780a80ae0c52cc120a26a1a42c1ae51b247a253e4e06113d23d2c2edd078"
++checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
 +dependencies = [
 + "phf_shared",
++ "serde",
 +]
 +
 +[[package]]
 +name = "phf_shared"
-+version = "0.11.3"
++version = "0.13.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "67eabc2ef2a60eb7faa00097bd1ffdb5bd28e62bf39990626a582201b7a754e5"
++checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
 +dependencies = [
 + "siphasher",
 +]
@@ -1469,9 +1386,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "postgres"
-+version = "0.19.10"
++version = "0.19.12"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "363e6dfbdd780d3aa3597b6eb430db76bb315fa9bad7fae595bb8def808b8470"
++checksum = "e7c48ece1c6cda0db61b058c1721378da76855140e9214339fa1317decacb176"
 +dependencies = [
 + "bytes",
 + "fallible-iterator",
@@ -1483,9 +1400,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "postgres-protocol"
-+version = "0.6.8"
++version = "0.6.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "76ff0abab4a9b844b93ef7b81f1efc0a366062aaef2cd702c76256b5dc075c54"
++checksum = "fbef655056b916eb868048276cfd5d6a7dea4f81560dfd047f97c8c6fe3fcfd4"
 +dependencies = [
 + "base64",
 + "byteorder",
@@ -1494,16 +1411,16 @@ index 0000000..f654689
 + "hmac",
 + "md-5",
 + "memchr",
-+ "rand 0.9.0",
++ "rand 0.9.2",
 + "sha2",
 + "stringprep",
 +]
 +
 +[[package]]
 +name = "postgres-types"
-+version = "0.2.9"
++version = "0.2.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "613283563cd90e1dfc3518d548caee47e0e725455ed619881f5cf21f36de4b48"
++checksum = "ef4605b7c057056dd35baeb6ac0c0338e4975b1f2bef0f65da953285eb007095"
 +dependencies = [
 + "bytes",
 + "fallible-iterator",
@@ -1511,6 +1428,15 @@ index 0000000..f654689
 +]
 +
 +[[package]]
++name = "potential_utf"
++version = "0.1.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
++dependencies = [
++ "zerovec",
++]
++
++[[package]]
 +name = "ppv-lite86"
 +version = "0.2.21"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1527,26 +1453,25 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "proc-macro2"
-+version = "1.0.94"
++version = "1.0.103"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
++checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 +dependencies = [
 + "unicode-ident",
 +]
 +
 +[[package]]
 +name = "proptest"
-+version = "1.6.0"
++version = "1.9.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "14cae93065090804185d3b75f0bf93b8eeda30c7a9b4a33d3bdb3988d6229e50"
++checksum = "bee689443a2bd0a16ab0348b52ee43e3b2d1b1f931c8aa5c9f8de4c86fbe8c40"
 +dependencies = [
 + "bit-set",
 + "bit-vec",
 + "bitflags",
-+ "lazy_static",
 + "num-traits",
-+ "rand 0.8.5",
-+ "rand_chacha 0.3.1",
++ "rand 0.9.2",
++ "rand_chacha 0.9.0",
 + "rand_xorshift",
 + "regex-syntax",
 + "rusty-fork",
@@ -1582,18 +1507,18 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "quote"
-+version = "1.0.40"
++version = "1.0.41"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
++checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
 +dependencies = [
 + "proc-macro2",
 +]
 +
 +[[package]]
 +name = "r-efi"
-+version = "5.2.0"
++version = "5.3.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "74765f6d916ee2faa39bc8e68e4f3ed8949b48cccdac59983d287a7cb71ce9c5"
++checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
 +
 +[[package]]
 +name = "radium"
@@ -1614,13 +1539,12 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "rand"
-+version = "0.9.0"
++version = "0.9.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3779b94aeb87e8bd4e834cee3650289ee9e0d5677f976ecdb6d219e5f4f6cd94"
++checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
 +dependencies = [
 + "rand_chacha 0.9.0",
 + "rand_core 0.9.3",
-+ "zerocopy",
 +]
 +
 +[[package]]
@@ -1649,7 +1573,7 @@ index 0000000..f654689
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 +dependencies = [
-+ "getrandom 0.2.15",
++ "getrandom 0.2.16",
 +]
 +
 +[[package]]
@@ -1658,23 +1582,23 @@ index 0000000..f654689
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 +dependencies = [
-+ "getrandom 0.3.2",
++ "getrandom 0.3.4",
 +]
 +
 +[[package]]
 +name = "rand_xorshift"
-+version = "0.3.0"
++version = "0.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f"
++checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a"
 +dependencies = [
-+ "rand_core 0.6.4",
++ "rand_core 0.9.3",
 +]
 +
 +[[package]]
 +name = "rayon"
-+version = "1.10.0"
++version = "1.11.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
++checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
 +dependencies = [
 + "either",
 + "rayon-core",
@@ -1682,9 +1606,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "rayon-core"
-+version = "1.12.1"
++version = "1.13.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
++checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
 +dependencies = [
 + "crossbeam-deque",
 + "crossbeam-utils",
@@ -1692,18 +1616,18 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "redox_syscall"
-+version = "0.5.10"
++version = "0.5.18"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0b8c0c260b63a8219631167be35e6a988e9554dbd323f8bd08439c8ed1302bd1"
++checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 +dependencies = [
 + "bitflags",
 +]
 +
 +[[package]]
 +name = "regex"
-+version = "1.11.1"
++version = "1.12.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
++checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
 +dependencies = [
 + "aho-corasick",
 + "memchr",
@@ -1713,9 +1637,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "regex-automata"
-+version = "0.4.9"
++version = "0.4.13"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
++checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
 +dependencies = [
 + "aho-corasick",
 + "memchr",
@@ -1724,9 +1648,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "regex-syntax"
-+version = "0.8.5"
++version = "0.8.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
++checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
 +
 +[[package]]
 +name = "rend"
@@ -1767,50 +1691,35 @@ index 0000000..f654689
 +]
 +
 +[[package]]
-+name = "rustc-demangle"
-+version = "0.1.24"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
-+
-+[[package]]
 +name = "rustc-hash"
-+version = "1.1.0"
++version = "2.1.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
-+
-+[[package]]
-+name = "rustc_version"
-+version = "0.3.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee"
-+dependencies = [
-+ "semver 0.11.0",
-+]
++checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 +
 +[[package]]
 +name = "rustix"
-+version = "1.0.3"
++version = "1.1.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e56a18552996ac8d29ecc3b190b4fdbb2d91ca4ec396de7bbffaf43f3d637e96"
++checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
 +dependencies = [
 + "bitflags",
 + "errno",
 + "libc",
 + "linux-raw-sys",
-+ "windows-sys 0.59.0",
++ "windows-sys 0.61.2",
 +]
 +
 +[[package]]
 +name = "rustversion"
-+version = "1.0.20"
++version = "1.0.22"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "eded382c5f5f786b989652c49544c4877d9f015cc22e145a5ea8ea66c2921cd2"
++checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 +
 +[[package]]
 +name = "rusty-fork"
-+version = "0.3.0"
++version = "0.3.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cb3dcc6e454c328bb824492db107ab7c0ae8fcffe4ad210136ef014458c1bc4f"
++checksum = "cc6bf79ff24e648f6da1f8d1f011e9cac26491b619e6b9280f2b47f1774e6ee2"
 +dependencies = [
 + "fnv",
 + "quick-error",
@@ -1835,9 +1744,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "scc"
-+version = "2.3.3"
++version = "2.4.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "ea091f6cac2595aa38993f04f4ee692ed43757035c36e67c180b6828356385b1"
++checksum = "46e6f046b7fef48e2660c57ed794263155d713de679057f2d0c169bfc6e756cc"
 +dependencies = [
 + "sdd",
 +]
@@ -1850,9 +1759,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "sdd"
-+version = "3.0.8"
++version = "3.0.10"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "584e070911c7017da6cb2eb0788d09f43d789029b5877d3e5ecc8acf86ceee21"
++checksum = "490dcfcbfef26be6800d11870ff2df8774fa6e86d047e3e8c8a76b25655e41ca"
 +
 +[[package]]
 +name = "seahash"
@@ -1862,37 +1771,21 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "semver"
-+version = "0.11.0"
++version = "1.0.27"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
-+dependencies = [
-+ "semver-parser",
-+]
-+
-+[[package]]
-+name = "semver"
-+version = "1.0.26"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
++checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
 +dependencies = [
 + "serde",
-+]
-+
-+[[package]]
-+name = "semver-parser"
-+version = "0.10.3"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9900206b54a3527fdc7b8a938bffd94a568bac4f4aa8113b209df75a09c0dec2"
-+dependencies = [
-+ "pest",
++ "serde_core",
 +]
 +
 +[[package]]
 +name = "serde"
-+version = "1.0.219"
++version = "1.0.228"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
++checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
 +dependencies = [
++ "serde_core",
 + "serde_derive",
 +]
 +
@@ -1907,35 +1800,45 @@ index 0000000..f654689
 +]
 +
 +[[package]]
-+name = "serde_derive"
-+version = "1.0.219"
++name = "serde_core"
++version = "1.0.228"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
++checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
++dependencies = [
++ "serde_derive",
++]
++
++[[package]]
++name = "serde_derive"
++version = "1.0.228"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
 +name = "serde_json"
-+version = "1.0.140"
++version = "1.0.145"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373"
++checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 +dependencies = [
 + "itoa",
 + "memchr",
 + "ryu",
 + "serde",
++ "serde_core",
 +]
 +
 +[[package]]
 +name = "serde_spanned"
-+version = "0.6.8"
++version = "1.0.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
++checksum = "e24345aa0fe688594e73770a5f6d1b216508b4f93484c0026d521acd30134392"
 +dependencies = [
-+ "serde",
++ "serde_core",
 +]
 +
 +[[package]]
@@ -1960,16 +1863,16 @@ index 0000000..f654689
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
 +name = "sha2"
-+version = "0.10.8"
++version = "0.10.9"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8"
++checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
 +dependencies = [
-+ "cfg-if 1.0.0",
++ "cfg-if 1.0.4",
 + "cpufeatures",
 + "digest",
 +]
@@ -2004,40 +1907,31 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "slab"
-+version = "0.4.9"
++version = "0.4.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
-+dependencies = [
-+ "autocfg",
-+]
++checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 +
 +[[package]]
 +name = "smallvec"
-+version = "1.14.0"
++version = "1.15.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7fcf8323ef1faaee30a44a340193b1ac6814fd9b7b4e88e9d4519a3e4abe1cfd"
++checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 +
 +[[package]]
 +name = "socket2"
-+version = "0.5.8"
++version = "0.6.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c970269d99b64e60ec3bd6ad27270092a5394c4e309314b18ae3fe575695fbe8"
++checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
 +dependencies = [
 + "libc",
-+ "windows-sys 0.52.0",
++ "windows-sys 0.60.2",
 +]
 +
 +[[package]]
-+name = "sptr"
-+version = "0.3.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "3b9b39299b249ad65f3b7e96443bad61c02ca5cd3589f46cb6d610a0fd6c0d6a"
-+
-+[[package]]
 +name = "stable_deref_trait"
-+version = "1.2.0"
++version = "1.2.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
++checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 +
 +[[package]]
 +name = "stringprep"
@@ -2058,16 +1952,6 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "supports-color"
-+version = "2.1.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d6398cde53adc3c4557306a96ce67b302968513830a77a95b2b17305d9719a89"
-+dependencies = [
-+ "is-terminal",
-+ "is_ci",
-+]
-+
-+[[package]]
-+name = "supports-color"
 +version = "3.0.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "c64fc7232dd8d2e4ac5ce4ef302b1d81e0b80d055b9d77c7c4f51f6aa4c867d6"
@@ -2088,9 +1972,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "syn"
-+version = "2.0.100"
++version = "2.0.108"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "b09a44accad81e1ba1cd74a32461ba89dee89095ba17b32f5d03683b1b1fc2a0"
++checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"
 +dependencies = [
 + "proc-macro2",
 + "quote",
@@ -2099,27 +1983,25 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "synstructure"
-+version = "0.13.1"
++version = "0.13.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
++checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
 +name = "sysinfo"
-+version = "0.30.13"
++version = "0.34.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0a5b4ddaee55fb2bea2bf0e5000747e5f5c0de765e5a5ff87f4cd106439f4bb3"
++checksum = "a4b93974b3d3aeaa036504b8eefd4c039dced109171c1ae973f1dc63b2c7e4b2"
 +dependencies = [
-+ "cfg-if 1.0.0",
-+ "core-foundation-sys",
 + "libc",
++ "memchr",
 + "ntapi",
-+ "once_cell",
-+ "rayon",
++ "objc2-core-foundation",
 + "windows",
 +]
 +
@@ -2131,15 +2013,15 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "tempfile"
-+version = "3.19.1"
++version = "3.23.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7437ac7763b9b123ccf33c338a5cc1bac6f69b45a136c19bdd8a65e3916435bf"
++checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
 +dependencies = [
 + "fastrand",
-+ "getrandom 0.3.2",
++ "getrandom 0.3.4",
 + "once_cell",
 + "rustix",
-+ "windows-sys 0.59.0",
++ "windows-sys 0.61.2",
 +]
 +
 +[[package]]
@@ -2153,11 +2035,11 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "thiserror"
-+version = "2.0.12"
++version = "2.0.17"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
++checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
 +dependencies = [
-+ "thiserror-impl 2.0.12",
++ "thiserror-impl 2.0.17",
 +]
 +
 +[[package]]
@@ -2168,25 +2050,25 @@ index 0000000..f654689
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
 +name = "thiserror-impl"
-+version = "2.0.12"
++version = "2.0.17"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
++checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
 +name = "tinystr"
-+version = "0.7.6"
++version = "0.8.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
++checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
 +dependencies = [
 + "displaydoc",
 + "zerovec",
@@ -2204,9 +2086,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "tinyvec"
-+version = "1.9.0"
++version = "1.10.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
++checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
 +dependencies = [
 + "tinyvec_macros",
 +]
@@ -2219,24 +2101,23 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "tokio"
-+version = "1.44.1"
++version = "1.48.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "f382da615b842244d4b8738c82ed1275e6c5dd90c459a30941cd07080b06c91a"
++checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
 +dependencies = [
-+ "backtrace",
 + "bytes",
 + "libc",
 + "mio",
 + "pin-project-lite",
 + "socket2",
-+ "windows-sys 0.52.0",
++ "windows-sys 0.61.2",
 +]
 +
 +[[package]]
 +name = "tokio-postgres"
-+version = "0.7.13"
++version = "0.7.15"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6c95d533c83082bb6490e0189acaa0bbeef9084e60471b696ca6988cd0541fb0"
++checksum = "2b40d66d9b2cfe04b628173409368e58247e8eddbbd3b0e6c6ba1d09f20f6c9e"
 +dependencies = [
 + "async-trait",
 + "byteorder",
@@ -2251,7 +2132,7 @@ index 0000000..f654689
 + "pin-project-lite",
 + "postgres-protocol",
 + "postgres-types",
-+ "rand 0.9.0",
++ "rand 0.9.2",
 + "socket2",
 + "tokio",
 + "tokio-util",
@@ -2260,9 +2141,9 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "tokio-util"
-+version = "0.7.14"
++version = "0.7.17"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6b9590b93e6fcc1739458317cccd391ad3955e2bde8913edf6f95f9e65a8f034"
++checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594"
 +dependencies = [
 + "bytes",
 + "futures-core",
@@ -2273,49 +2154,48 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "toml"
-+version = "0.8.20"
++version = "0.9.8"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
-+dependencies = [
-+ "serde",
-+ "serde_spanned",
-+ "toml_datetime",
-+ "toml_edit",
-+]
-+
-+[[package]]
-+name = "toml_datetime"
-+version = "0.6.8"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
-+dependencies = [
-+ "serde",
-+]
-+
-+[[package]]
-+name = "toml_edit"
-+version = "0.22.24"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
++checksum = "f0dc8b1fb61449e27716ec0e1bdf0f6b8f3e8f6b05391e8497b8b6d7804ea6d8"
 +dependencies = [
 + "indexmap",
-+ "serde",
++ "serde_core",
 + "serde_spanned",
 + "toml_datetime",
++ "toml_parser",
++ "toml_writer",
 + "winnow",
 +]
 +
 +[[package]]
-+name = "typenum"
-+version = "1.18.0"
++name = "toml_datetime"
++version = "0.7.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1dccffe3ce07af9386bfd29e80c0ab1a8205a2fc34e4bcd40364df902cfa8f3f"
++checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
++dependencies = [
++ "serde_core",
++]
 +
 +[[package]]
-+name = "ucd-trie"
-+version = "0.1.7"
++name = "toml_parser"
++version = "1.0.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
++checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
++dependencies = [
++ "winnow",
++]
++
++[[package]]
++name = "toml_writer"
++version = "1.0.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "df8b2b54733674ad286d16267dcfc7a71ed5c776e4ac7aa3c3e2561f7c637bf2"
++
++[[package]]
++name = "typenum"
++version = "1.19.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
 +
 +[[package]]
 +name = "unarray"
@@ -2337,24 +2217,24 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "unicode-ident"
-+version = "1.0.18"
++version = "1.0.22"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
++checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 +
 +[[package]]
 +name = "unicode-normalization"
-+version = "0.1.24"
++version = "0.1.25"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956"
++checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8"
 +dependencies = [
 + "tinyvec",
 +]
 +
 +[[package]]
 +name = "unicode-properties"
-+version = "0.1.3"
++version = "0.1.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e70f2a8b45122e719eb623c01822704c4e0907e7e426a05927e1a1cfff5b75d0"
++checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d"
 +
 +[[package]]
 +name = "unicode-segmentation"
@@ -2364,28 +2244,23 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "unicode-width"
-+version = "0.1.14"
++version = "0.2.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
++checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254"
 +
 +[[package]]
 +name = "url"
-+version = "2.5.4"
++version = "2.5.7"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
++checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
 +dependencies = [
 + "form_urlencoded",
 + "idna",
 + "percent-encoding",
++ "serde",
 +]
 +
 +[[package]]
-+name = "utf16_iter"
-+version = "1.0.5"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-+
-+[[package]]
 +name = "utf8_iter"
 +version = "1.0.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -2393,18 +2268,21 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "uuid"
-+version = "1.16.0"
++version = "1.18.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "458f7a779bf54acc9f347480ac654f68407d3aab21269a6e3c9f922acd9e2da9"
++checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
 +dependencies = [
-+ "getrandom 0.3.2",
++ "getrandom 0.3.4",
++ "js-sys",
++ "wasm-bindgen",
 +]
 +
 +[[package]]
 +name = "vectorscale"
-+version = "0.7.0"
++version = "0.9.0"
 +dependencies = [
 + "criterion",
++ "lru",
 + "memoffset",
 + "once_cell",
 + "pgrx",
@@ -2413,7 +2291,7 @@ index 0000000..f654689
 + "pgvectorscale_derive",
 + "rand 0.8.5",
 + "rkyv",
-+ "semver 1.0.26",
++ "semver",
 + "serial_test",
 + "simdeez",
 + "tempfile",
@@ -2446,17 +2324,17 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "wasi"
-+version = "0.11.0+wasi-snapshot-preview1"
++version = "0.11.1+wasi-snapshot-preview1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
++checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 +
 +[[package]]
-+name = "wasi"
-+version = "0.14.2+wasi-0.2.4"
++name = "wasip2"
++version = "1.0.1+wasi-0.2.4"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
++checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
 +dependencies = [
-+ "wit-bindgen-rt",
++ "wit-bindgen",
 +]
 +
 +[[package]]
@@ -2467,35 +2345,22 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "wasm-bindgen"
-+version = "0.2.100"
++version = "0.2.105"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
++checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
 +dependencies = [
-+ "cfg-if 1.0.0",
++ "cfg-if 1.0.4",
 + "once_cell",
 + "rustversion",
 + "wasm-bindgen-macro",
-+]
-+
-+[[package]]
-+name = "wasm-bindgen-backend"
-+version = "0.2.100"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-+dependencies = [
-+ "bumpalo",
-+ "log",
-+ "proc-macro2",
-+ "quote",
-+ "syn 2.0.100",
 + "wasm-bindgen-shared",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-macro"
-+version = "0.2.100"
++version = "0.2.105"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
++checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
 +dependencies = [
 + "quote",
 + "wasm-bindgen-macro-support",
@@ -2503,31 +2368,31 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "wasm-bindgen-macro-support"
-+version = "0.2.100"
++version = "0.2.105"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
++checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
 +dependencies = [
++ "bumpalo",
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
-+ "wasm-bindgen-backend",
++ "syn 2.0.108",
 + "wasm-bindgen-shared",
 +]
 +
 +[[package]]
 +name = "wasm-bindgen-shared"
-+version = "0.2.100"
++version = "0.2.105"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
++checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
 +dependencies = [
 + "unicode-ident",
 +]
 +
 +[[package]]
 +name = "web-sys"
-+version = "0.3.77"
++version = "0.3.82"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
++checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1"
 +dependencies = [
 + "js-sys",
 + "wasm-bindgen",
@@ -2535,11 +2400,11 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "whoami"
-+version = "1.6.0"
++version = "1.6.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6994d13118ab492c3c80c1f81928718159254c53c472bf9ce36f8dae4add02a7"
++checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d"
 +dependencies = [
-+ "redox_syscall",
++ "libredox",
 + "wasite",
 + "web-sys",
 +]
@@ -2562,11 +2427,11 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "winapi-util"
-+version = "0.1.9"
++version = "0.1.11"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
++checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
 +dependencies = [
-+ "windows-sys 0.59.0",
++ "windows-sys 0.61.2",
 +]
 +
 +[[package]]
@@ -2577,39 +2442,79 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "windows"
-+version = "0.52.0"
++version = "0.57.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
++checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
 +dependencies = [
 + "windows-core",
-+ "windows-targets",
++ "windows-targets 0.52.6",
 +]
 +
 +[[package]]
 +name = "windows-core"
-+version = "0.52.0"
++version = "0.57.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
++checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
 +dependencies = [
-+ "windows-targets",
++ "windows-implement",
++ "windows-interface",
++ "windows-result",
++ "windows-targets 0.52.6",
++]
++
++[[package]]
++name = "windows-implement"
++version = "0.57.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.108",
++]
++
++[[package]]
++name = "windows-interface"
++version = "0.57.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.108",
++]
++
++[[package]]
++name = "windows-link"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
++
++[[package]]
++name = "windows-result"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
++dependencies = [
++ "windows-targets 0.52.6",
 +]
 +
 +[[package]]
 +name = "windows-sys"
-+version = "0.52.0"
++version = "0.60.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
++checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 +dependencies = [
-+ "windows-targets",
++ "windows-targets 0.53.5",
 +]
 +
 +[[package]]
 +name = "windows-sys"
-+version = "0.59.0"
++version = "0.61.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
++checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
 +dependencies = [
-+ "windows-targets",
++ "windows-link",
 +]
 +
 +[[package]]
@@ -2618,14 +2523,31 @@ index 0000000..f654689
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 +dependencies = [
-+ "windows_aarch64_gnullvm",
-+ "windows_aarch64_msvc",
-+ "windows_i686_gnu",
-+ "windows_i686_gnullvm",
-+ "windows_i686_msvc",
-+ "windows_x86_64_gnu",
-+ "windows_x86_64_gnullvm",
-+ "windows_x86_64_msvc",
++ "windows_aarch64_gnullvm 0.52.6",
++ "windows_aarch64_msvc 0.52.6",
++ "windows_i686_gnu 0.52.6",
++ "windows_i686_gnullvm 0.52.6",
++ "windows_i686_msvc 0.52.6",
++ "windows_x86_64_gnu 0.52.6",
++ "windows_x86_64_gnullvm 0.52.6",
++ "windows_x86_64_msvc 0.52.6",
++]
++
++[[package]]
++name = "windows-targets"
++version = "0.53.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
++dependencies = [
++ "windows-link",
++ "windows_aarch64_gnullvm 0.53.1",
++ "windows_aarch64_msvc 0.53.1",
++ "windows_i686_gnu 0.53.1",
++ "windows_i686_gnullvm 0.53.1",
++ "windows_i686_msvc 0.53.1",
++ "windows_x86_64_gnu 0.53.1",
++ "windows_x86_64_gnullvm 0.53.1",
++ "windows_x86_64_msvc 0.53.1",
 +]
 +
 +[[package]]
@@ -2635,76 +2557,112 @@ index 0000000..f654689
 +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 +
 +[[package]]
++name = "windows_aarch64_gnullvm"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
++
++[[package]]
 +name = "windows_aarch64_msvc"
 +version = "0.52.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 +
 +[[package]]
++name = "windows_aarch64_msvc"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
++
++[[package]]
 +name = "windows_i686_gnu"
 +version = "0.52.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 +
 +[[package]]
++name = "windows_i686_gnu"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
++
++[[package]]
 +name = "windows_i686_gnullvm"
 +version = "0.52.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 +
 +[[package]]
++name = "windows_i686_gnullvm"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
++
++[[package]]
 +name = "windows_i686_msvc"
 +version = "0.52.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 +
 +[[package]]
++name = "windows_i686_msvc"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
++
++[[package]]
 +name = "windows_x86_64_gnu"
 +version = "0.52.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 +
 +[[package]]
++name = "windows_x86_64_gnu"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
++
++[[package]]
 +name = "windows_x86_64_gnullvm"
 +version = "0.52.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 +
 +[[package]]
++name = "windows_x86_64_gnullvm"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
++
++[[package]]
 +name = "windows_x86_64_msvc"
 +version = "0.52.6"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
 +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 +
 +[[package]]
++name = "windows_x86_64_msvc"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
++
++[[package]]
 +name = "winnow"
-+version = "0.7.4"
++version = "0.7.13"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "0e97b544156e9bebe1a0ffbc03484fc1ffe3100cbce3ffb17eac35f7cdd7ab36"
-+dependencies = [
-+ "memchr",
-+]
++checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
 +
 +[[package]]
-+name = "wit-bindgen-rt"
-+version = "0.39.0"
++name = "wit-bindgen"
++version = "0.46.0"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-+dependencies = [
-+ "bitflags",
-+]
-+
-+[[package]]
-+name = "write16"
-+version = "1.0.0"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
++checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 +
 +[[package]]
 +name = "writeable"
-+version = "0.5.5"
++version = "0.6.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
++checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 +
 +[[package]]
 +name = "wyz"
@@ -2716,21 +2674,11 @@ index 0000000..f654689
 +]
 +
 +[[package]]
-+name = "yansi-term"
-+version = "0.1.2"
-+source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "fe5c30ade05e61656247b2e334a031dfd0cc466fadef865bdcdea8d537951bf1"
-+dependencies = [
-+ "winapi",
-+]
-+
-+[[package]]
 +name = "yoke"
-+version = "0.7.5"
++version = "0.8.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "120e6aef9aa629e3d4f52dc8cc43a015c7724194c97dfaf45180d2daf2b77f40"
++checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
 +dependencies = [
-+ "serde",
 + "stable_deref_trait",
 + "yoke-derive",
 + "zerofrom",
@@ -2738,34 +2686,34 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "yoke-derive"
-+version = "0.7.5"
++version = "0.8.1"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2380878cad4ac9aac1e2435f3eb4020e8374b5f13c296cb75b4620ff8e229154"
++checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 + "synstructure",
 +]
 +
 +[[package]]
 +name = "zerocopy"
-+version = "0.8.24"
++version = "0.8.27"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "2586fea28e186957ef732a5f8b3be2da217d65c5969d4b1e17f973ebbe876879"
++checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
 +dependencies = [
 + "zerocopy-derive",
 +]
 +
 +[[package]]
 +name = "zerocopy-derive"
-+version = "0.8.24"
++version = "0.8.27"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "a996a8f63c5c4448cd959ac1bab0aaa3306ccfd060472f85943ee0750f0169be"
++checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
 +
 +[[package]]
@@ -2785,15 +2733,26 @@ index 0000000..f654689
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 + "synstructure",
 +]
 +
 +[[package]]
-+name = "zerovec"
-+version = "0.10.4"
++name = "zerotrie"
++version = "0.2.3"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "aa2b893d79df23bfb12d5461018d408ea19dfafe76c2c7ef6d4eba614f8ff079"
++checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
++dependencies = [
++ "displaydoc",
++ "yoke",
++ "zerofrom",
++]
++
++[[package]]
++name = "zerovec"
++version = "0.11.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
 +dependencies = [
 + "yoke",
 + "zerofrom",
@@ -2802,11 +2761,11 @@ index 0000000..f654689
 +
 +[[package]]
 +name = "zerovec-derive"
-+version = "0.10.3"
++version = "0.11.2"
 +source = "registry+https://github.com/rust-lang/crates.io-index"
-+checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
++checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 +dependencies = [
 + "proc-macro2",
 + "quote",
-+ "syn 2.0.100",
++ "syn 2.0.108",
 +]
diff --git a/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix b/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix
index 8da7420f3bea..a5411e49746e 100644
--- a/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix
+++ b/pkgs/servers/sql/postgresql/ext/pgvectorscale/package.nix
@@ -1,6 +1,6 @@
 {
   buildPgrxExtension,
-  cargo-pgrx_0_12_6,
+  cargo-pgrx_0_16_1,
   postgresql,
   fetchFromGitHub,
   lib,
@@ -9,18 +9,18 @@
 
 buildPgrxExtension (finalAttrs: {
   pname = "pgvectorscale";
-  version = "0.7.0";
+  version = "0.9.0";
 
   src = fetchFromGitHub {
     owner = "timescale";
     repo = "pgvectorscale";
     tag = finalAttrs.version;
-    hash = "sha256-dy481k2SvyYXwwcsyLZSl3XlhSk9C5+4LfEfciB1DK4=";
+    hash = "sha256-whGTJI73wifYkleC+aAbDV4nhwls3uFs1xKcB0zLDRo=";
   };
 
   doCheck = false;
 
-  cargoHash = "sha256-CeRyDn9VhxfjWFJ1/Z/XvOUQOSnDoHHZAqgfYTeKU0o=";
+  cargoHash = "sha256-uaRKUtsUdZPcrQLAixCiEphXQqdsRhi8nSfh9b3w0ao=";
   cargoPatches = [
     ./add-Cargo.lock.patch
   ];
@@ -31,7 +31,7 @@ buildPgrxExtension (finalAttrs: {
   ];
 
   inherit postgresql;
-  cargo-pgrx = cargo-pgrx_0_12_6;
+  cargo-pgrx = cargo-pgrx_0_16_1;
 
   passthru.tests.extension = postgresqlTestExtension {
     inherit (finalAttrs) finalPackage;
@@ -65,11 +65,8 @@ buildPgrxExtension (finalAttrs: {
   };
 
   meta = {
-    # PostgreSQL 18 support issue upstream: https://github.com/timescale/pgvectorscale/issues/249
-    # Check after next package update.
-    broken =
-      lib.warnIf (finalAttrs.version != "0.7.0") "Is postgresql18Packages.pgvectorscale still broken?"
-        (lib.versionAtLeast postgresql.version "18");
+    # Upstream removed support for PostgreSQL 13 on 0.9.0: https://github.com/timescale/pgvectorscale/releases/tag/0.9.0
+    broken = lib.versionOlder postgresql.version "14";
     homepage = "https://github.com/timescale/pgvectorscale";
     teams = [ lib.teams.flyingcircus ];
     description = "Complement to pgvector for high performance, cost efficient vector search on large workloads";

From 79e7714b9cb72368f167f4c35e2215edfea16633 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 01:25:37 +0000
Subject: [PATCH 5456/6226] xemu: 0.8.110 -> 0.8.111

---
 pkgs/by-name/xe/xemu/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xe/xemu/package.nix b/pkgs/by-name/xe/xemu/package.nix
index 714b539f42cb..2977e8026f4a 100644
--- a/pkgs/by-name/xe/xemu/package.nix
+++ b/pkgs/by-name/xe/xemu/package.nix
@@ -35,13 +35,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xemu";
-  version = "0.8.110";
+  version = "0.8.111";
 
   src = fetchFromGitHub {
     owner = "xemu-project";
     repo = "xemu";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kb8sAaqPHbVXeddMD/BoUnxph4lLTmRctY+yjhgu4gw=";
+    hash = "sha256-73dFFdhX36G1GeBVdbJ7ST4s98PtPsfnBBDeL8h+h04=";
 
     nativeBuildInputs = [
       git

From 45c4fe3da0107ebd6d8c3a492f1ce471670b0fd0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 01:32:59 +0000
Subject: [PATCH 5457/6226] firefly-iii: 6.4.2 -> 6.4.4

---
 pkgs/by-name/fi/firefly-iii/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix
index cc0d673ec4a6..878ba077a170 100644
--- a/pkgs/by-name/fi/firefly-iii/package.nix
+++ b/pkgs/by-name/fi/firefly-iii/package.nix
@@ -13,13 +13,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii";
-  version = "6.4.2";
+  version = "6.4.4";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "firefly-iii";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nGXFFGVw0TCXSBwMExk6wn0Es0HwCnY4P+nbJki+R6A=";
+    hash = "sha256-RRjTl3lZv/hoM6Jy3lB9/IFRq+w9ZKikOMqRRyV7MBw=";
   };
 
   buildInputs = [ php84 ];
@@ -38,13 +38,13 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     composerNoScripts = true;
     composerStrictValidation = true;
     strictDeps = true;
-    vendorHash = "sha256-siLLtF/B2eNsRaazq5zOXnFeFPlEeoSAIXYKEsrHv28=";
+    vendorHash = "sha256-lR900I79H5y+nDEXTvCUbHP4VpPsmNCIixUK1NtEiOQ=";
   };
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-WV1MsCbYxEHUEw0yYqD8b9jracyLVbpndWuHY0ZbaEM=";
+    hash = "sha256-d3x8Yw8ruIneaKCLsb1M9lwW2mtNmSkzVe8/4ia5GW0=";
   };
 
   preInstall = ''

From 5f88e8201d8273462ce1ebf98d3bcf1ee6ba2db3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 01:34:17 +0000
Subject: [PATCH 5458/6226] libsForQt5.qtutilities: 6.18.2 -> 6.18.3

---
 pkgs/development/libraries/qtutilities/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix
index c33658cc59b7..08702ee573d8 100644
--- a/pkgs/development/libraries/qtutilities/default.nix
+++ b/pkgs/development/libraries/qtutilities/default.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qtutilities";
-  version = "6.18.2";
+  version = "6.18.3";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "qtutilities";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-SwKXON16a9qmI+FrTA1OH0zIqf5rfAWbGOhCpCIHgr4=";
+    hash = "sha256-x9el1oUyl2xrpehhR9uuexVBErSWudPB56ZpU91zZew=";
   };
 
   nativeBuildInputs = [

From 988d4becb04f7ac3659b92c75891ed880a58c974 Mon Sep 17 00:00:00 2001
From: Alexandre Esteves <alexfmpe@proton.me>
Date: Tue, 4 Nov 2025 23:51:47 +0000
Subject: [PATCH 5459/6226] androidenv.composeAndroidPackages: fix eval when
 minor versions are specified

---
 .../mobile/androidenv/compose-android-packages.nix   | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/mobile/androidenv/compose-android-packages.nix b/pkgs/development/mobile/androidenv/compose-android-packages.nix
index 413759a5f88e..33332ea8386d 100644
--- a/pkgs/development/mobile/androidenv/compose-android-packages.nix
+++ b/pkgs/development/mobile/androidenv/compose-android-packages.nix
@@ -14,6 +14,8 @@ let
   # Coerces a string to an int.
   coerceInt = val: if lib.isInt val then val else lib.toIntBase10 val;
 
+  coerceIntVersion = v: coerceInt (lib.versions.major v);
+
   # Parses a single version, substituting "latest" with the latest version.
   parseVersion =
     repo: key: version:
@@ -97,8 +99,8 @@ in
   platformVersions ?
     if minPlatformVersion != null && maxPlatformVersion != null then
       let
-        minPlatformVersionInt = coerceInt (parseVersion repo "platforms" minPlatformVersion);
-        maxPlatformVersionInt = coerceInt (parseVersion repo "platforms" maxPlatformVersion);
+        minPlatformVersionInt = coerceIntVersion (parseVersion repo "platforms" minPlatformVersion);
+        maxPlatformVersionInt = coerceIntVersion (parseVersion repo "platforms" maxPlatformVersion);
       in
       lib.range (lib.min minPlatformVersionInt maxPlatformVersionInt) (
         lib.max minPlatformVersionInt maxPlatformVersionInt
@@ -109,10 +111,8 @@ in
           if minPlatformVersion == null then
             1
           else
-            coerceInt (parseVersion repo "platforms" minPlatformVersion);
-        latestPlatformVersionInt = lib.max minPlatformVersionInt (
-          coerceInt (lib.versions.major repo.latest.platforms)
-        );
+            coerceIntVersion (parseVersion repo "platforms" minPlatformVersion);
+        latestPlatformVersionInt = lib.max minPlatformVersionInt (coerceIntVersion repo.latest.platforms);
         firstPlatformVersionInt = lib.max minPlatformVersionInt (
           latestPlatformVersionInt - (lib.max 1 numLatestPlatformVersions) + 1
         );

From fd752c0e957521eb59e77710d3bf659a1769d609 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Tue, 4 Nov 2025 20:42:48 -0500
Subject: [PATCH 5460/6226] kodi: 21.2 -> 21.3

---
 pkgs/applications/video/kodi/unwrapped.nix | 20 ++------------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix
index 22719bf31bb4..6d1275a055f3 100644
--- a/pkgs/applications/video/kodi/unwrapped.nix
+++ b/pkgs/applications/video/kodi/unwrapped.nix
@@ -3,7 +3,6 @@
   lib,
   fetchFromGitHub,
   fetchzip,
-  fetchpatch,
   autoconf,
   automake,
   libtool,
@@ -245,31 +244,16 @@ stdenv.mkDerivation (
   in
   {
     pname = "kodi";
-    version = "21.2";
+    version = "21.3";
     kodiReleaseName = "Omega";
 
     src = fetchFromGitHub {
       owner = "xbmc";
       repo = "xbmc";
       rev = "${finalAttrs.version}-${finalAttrs.kodiReleaseName}";
-      hash = "sha256-RdTJcq6FPerQx05dU3r8iyaorT4L7162hg5RdywsA88=";
+      hash = "sha256-36wBAqGEDCRZ4t1ygTg03Pyk7Gg9quUTUGD3SBp6nCk=";
     };
 
-    patches = [
-      # Backport to fix build with Pipewire 1.4
-      # FIXME: remove in the next update
-      (fetchpatch {
-        url = "https://github.com/xbmc/xbmc/commit/269053ebbfd3cc4a3156a511f54ab7f08a09a730.patch";
-        hash = "sha256-JzzrMJvAufrxTxtWnzknUS9JLJEed+qdtVnIYYe9LCw=";
-      })
-      # Backport to fix build with cURL 8.16
-      # FIXME: remove in the next update
-      (fetchpatch {
-        url = "https://github.com/xbmc/xbmc/commit/957b4faa0b765bc91e64c6d33f07e853decae0d0.patch";
-        hash = "sha256-zsqcZSjsApcgs/oEdFFlcwldGCVZxCsDG02ogs+q2uw=";
-      })
-    ];
-
     # make  derivations declared in the let binding available here, so
     # they can be overridden
     inherit

From ee1aa6f556f431800eb145b20e902a840c8c79b5 Mon Sep 17 00:00:00 2001
From: botnk <github-botnk@korz.dev>
Date: Wed, 5 Nov 2025 01:43:37 +0000
Subject: [PATCH 5461/6226] shader-slang: 2025.21 -> 2025.21.1

Changelog: https://github.com/shader-slang/slang/releases/tag/v2025.21.1
---
 pkgs/by-name/sh/shader-slang/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sh/shader-slang/package.nix b/pkgs/by-name/sh/shader-slang/package.nix
index 4f509f8a22e8..368c9ae48397 100644
--- a/pkgs/by-name/sh/shader-slang/package.nix
+++ b/pkgs/by-name/sh/shader-slang/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "shader-slang";
-  version = "2025.21";
+  version = "2025.21.1";
 
   src = fetchFromGitHub {
     owner = "shader-slang";
     repo = "slang";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-BObV2Yj84i2AE9L929yRjz68nxzGKDNUcFLySjVpc1U=";
+    hash = "sha256-Z6nTgVQaXFKmFeTZTltrlv46IdptwaOssh0PQIBUv+U=";
     fetchSubmodules = true;
   };
 

From 85cd1ddde33b5bd65b49fb25a7e2faa0da02161d Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Tue, 4 Nov 2025 21:20:09 +0800
Subject: [PATCH 5462/6226] taplo: add yzx9 to maintainers

---
 pkgs/by-name/ta/taplo/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix
index c50de7ee18ca..9bd4a899fb35 100644
--- a/pkgs/by-name/ta/taplo/package.nix
+++ b/pkgs/by-name/ta/taplo/package.nix
@@ -57,7 +57,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
     description = "TOML toolkit written in Rust";
     homepage = "https://taplo.tamasfe.dev";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ defelo ];
+    maintainers = with lib.maintainers; [
+      defelo
+      yzx9
+    ];
     mainProgram = "taplo";
   };
 })

From c850869e00447456e55bf3dfa6fbb5947516bd3a Mon Sep 17 00:00:00 2001
From: Shogo Takata <shogo-takata@st.go.tuat.ac.jp>
Date: Tue, 4 Nov 2025 17:52:56 -0800
Subject: [PATCH 5463/6226] super-productivity: 15.2.2 -> 16.2.1

---
 pkgs/by-name/su/super-productivity/package.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/su/super-productivity/package.nix b/pkgs/by-name/su/super-productivity/package.nix
index db78c39f1121..0c9a7cf2a8c1 100644
--- a/pkgs/by-name/su/super-productivity/package.nix
+++ b/pkgs/by-name/su/super-productivity/package.nix
@@ -14,13 +14,13 @@
 
 buildNpmPackage rec {
   pname = "super-productivity";
-  version = "15.2.2";
+  version = "16.2.1";
 
   src = fetchFromGitHub {
     owner = "johannesjo";
     repo = "super-productivity";
     tag = "v${version}";
-    hash = "sha256-jnHPlKA2I/HIUoxDn+h4F9BDTr5G0mLcq6pAlFgxTv8=";
+    hash = "sha256-R+GZE7hxPUOF5eny0vxH7H1Ja82AbXx4xcL4tszaDQc=";
 
     postFetch = ''
       find $out -name package-lock.json -exec ${lib.getExe npm-lockfile-fix} -r {} \;
@@ -63,7 +63,7 @@ buildNpmPackage rec {
       dontInstall = true;
 
       outputHashMode = "recursive";
-      hash = "sha256-0HQ0+/1gxlODdHeLxgj0y5RtWUOizB+9SULtOmi0DFk=";
+      hash = "sha256-MPTLx/5+0qP7PcxcsIyJEZVUPsoA5J+NG+g92n6vNEk=";
     }
   );
 
@@ -101,7 +101,8 @@ buildNpmPackage rec {
     npm run build
     npm exec electron-builder -- --dir \
       -c.electronDist=electron-dist \
-      -c.electronVersion=${electron.version}
+      -c.electronVersion=${electron.version} \
+      -c.mac.identity=null
 
     runHook postBuild
   '';

From e0335fb85ca29a816ee1992e07247e12f4802103 Mon Sep 17 00:00:00 2001
From: mrtnvgr <martynovegorOF@yandex.ru>
Date: Wed, 5 Nov 2025 08:53:45 +0700
Subject: [PATCH 5464/6226] lsp-plugins: mention vst3 support in
 longDescription

---
 pkgs/by-name/ls/lsp-plugins/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ls/lsp-plugins/package.nix b/pkgs/by-name/ls/lsp-plugins/package.nix
index 006ca5f0e8e5..071c3b9b0534 100644
--- a/pkgs/by-name/ls/lsp-plugins/package.nix
+++ b/pkgs/by-name/ls/lsp-plugins/package.nix
@@ -88,6 +88,7 @@ stdenv.mkDerivation (finalAttrs: {
       - LADSPA - set of plugins for Linux Audio Developer's Simple Plugin API
       - LV2 - set of plugins and UIs for Linux Audio Developer's Simple Plugin API (LADSPA) version 2
       - LinuxVST - set of plugins and UIs for Steinberg's VST 2.4 format ported on GNU/Linux Platform
+      - VST3 - set of plugins and UIs for Steinberg's VST 3 format
       - JACK - Standalone versions for JACK Audio connection Kit with UI
 
       Contains the following plugins (https://lsp-plug.in/?page=plugins)

From 305d1bd17bab98f141cea27d6de0fc33021ed72b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 01:55:39 +0000
Subject: [PATCH 5465/6226] libretro.play: 0-unstable-2025-10-01 ->
 0-unstable-2025-11-03

---
 pkgs/applications/emulators/libretro/cores/play.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix
index e9f83de8e6fa..b79d1979bc1d 100644
--- a/pkgs/applications/emulators/libretro/cores/play.nix
+++ b/pkgs/applications/emulators/libretro/cores/play.nix
@@ -14,13 +14,13 @@
 }:
 mkLibretroCore {
   core = "play";
-  version = "0-unstable-2025-10-01";
+  version = "0-unstable-2025-11-03";
 
   src = fetchFromGitHub {
     owner = "jpd002";
     repo = "Play-";
-    rev = "2180be50f804952f94ce848fab8d3f8b6d76d027";
-    hash = "sha256-Fikcp2Bik4PNOFfu9FoEWJid/OoLYPJ6cZG4aA9jgEo=";
+    rev = "77c62d3a942e219bc9d072b4800fa0881208ce2a";
+    hash = "sha256-ROrANubftSJwGl9THdAIRhSFOy1uHZ6v2kAmYWLDhN0=";
     fetchSubmodules = true;
   };
 

From 42d3f3c1a4e6759f3f201a8c146b89f2cf1174ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 02:08:53 +0000
Subject: [PATCH 5466/6226] q: 0.19.9 -> 0.19.10

---
 pkgs/by-name/q/q/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/q/q/package.nix b/pkgs/by-name/q/q/package.nix
index cc1c1e92ace8..31748a51c2ee 100644
--- a/pkgs/by-name/q/q/package.nix
+++ b/pkgs/by-name/q/q/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "q";
-  version = "0.19.9";
+  version = "0.19.10";
 
   src = fetchFromGitHub {
     owner = "natesales";
     repo = "q";
     tag = "v${version}";
-    hash = "sha256-QYSy2RaEWNkitehsmcfGYTCvpHtu1aVRuwBVNMjOHZ0=";
+    hash = "sha256-bP4aFoGv7VlzCXkMYzDHp3VzgA3MpqugmNE3Vyta4iM=";
   };
 
-  vendorHash = "sha256-g5ZrzkPqkvoz0Q0ERXYlNk7lDf+6V27yKa+5NLVZHCI=";
+  vendorHash = "sha256-4W0lS7qh3CCSbAtohc/1EbwdiO75tELTp1aBMyPeh/o=";
 
   ldflags = [
     "-s"

From 45d15ae900bedb9eacbd1e166c505abfa6bcc3aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 02:23:08 +0000
Subject: [PATCH 5467/6226] syncthingtray: 2.0.2 -> 2.0.3

---
 pkgs/applications/misc/syncthingtray/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix
index 64b4b4563509..b85b0f0bd903 100644
--- a/pkgs/applications/misc/syncthingtray/default.nix
+++ b/pkgs/applications/misc/syncthingtray/default.nix
@@ -38,14 +38,14 @@
 }:
 
 stdenv.mkDerivation (finalAttrs: {
-  version = "2.0.2";
+  version = "2.0.3";
   pname = "syncthingtray";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "syncthingtray";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-FZruyQ3ckWp9nUmCet4uTeU7TKukmW1D73Rx8EUUsVI=";
+    hash = "sha256-vvbzXwujOIk3g/SvNM3JGkt956RN9VR0Pcx5nzg1IU0=";
   };
 
   buildInputs = [

From 8c56576b9a6a078e7c4f61bab491f20c6cf42b7e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 02:24:18 +0000
Subject: [PATCH 5468/6226] tagparser: 12.5.1 -> 12.5.2

---
 pkgs/by-name/ta/tagparser/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ta/tagparser/package.nix b/pkgs/by-name/ta/tagparser/package.nix
index d834998f22f6..5b92b2fd9774 100644
--- a/pkgs/by-name/ta/tagparser/package.nix
+++ b/pkgs/by-name/ta/tagparser/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "tagparser";
-  version = "12.5.1";
+  version = "12.5.2";
 
   src = fetchFromGitHub {
     owner = "Martchus";
     repo = "tagparser";
     rev = "v${version}";
-    hash = "sha256-i9WJcdMvPg6Hg6auyPa9dwgtd7Ihte2oPLUImRelO50=";
+    hash = "sha256-QVeEwQFXr2xYKFtrrWumMoo3sVRtCWCVZvwK71BgoSg=";
   };
 
   nativeBuildInputs = [ cmake ];

From aec01c579886dd3a810ba551717524c30ed675b0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 02:29:03 +0000
Subject: [PATCH 5469/6226] python3Packages.json-stream: 2.3.3 -> 2.4.0

---
 pkgs/development/python-modules/json-stream/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/json-stream/default.nix b/pkgs/development/python-modules/json-stream/default.nix
index c791112357d0..890a29940f39 100644
--- a/pkgs/development/python-modules/json-stream/default.nix
+++ b/pkgs/development/python-modules/json-stream/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "json-stream";
-  version = "2.3.3";
+  version = "2.4.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "daggaz";
     repo = "json-stream";
     tag = "v${version}";
-    hash = "sha256-/GDEC/Poy84TGuXM34OW4+K/qMJELFfO+lNQ5M5VsdI=";
+    hash = "sha256-bhyoTvILap0/dKpmob6P1l9st7JwuHaLp7Y8FGfgLZA=";
   };
 
   build-system = [ setuptools ];

From 118b6b6778f664b2768cdf9fd7e97077240294a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 02:40:31 +0000
Subject: [PATCH 5470/6226] mongosh: 2.5.8 -> 2.5.9

---
 pkgs/by-name/mo/mongosh/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/mongosh/package.nix b/pkgs/by-name/mo/mongosh/package.nix
index 98cd5ead45e2..7fb9820a7f1c 100644
--- a/pkgs/by-name/mo/mongosh/package.nix
+++ b/pkgs/by-name/mo/mongosh/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "mongosh";
-  version = "2.5.8";
+  version = "2.5.9";
 
   src = fetchFromGitHub {
     owner = "mongodb-js";
     repo = "mongosh";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VQJkhaPXy2Mg9uoV6qKFzACtJ6TMDWZj52wUvP/7SLg=";
+    hash = "sha256-lZ2JnFIZvfxRyYXMUbjnazgggRm4ZBdEStn91bPSzkY=";
   };
 
-  npmDepsHash = "sha256-BnuzrIS/RtKReTPrSY/yQ5LRmA3PIGkv80rS+6IJZxQ=";
+  npmDepsHash = "sha256-tLgfhg940PJYPQ9myT+mi7+nubcGHU1C1/Az8gF6spQ=";
 
   patches = [
     ./disable-telemetry.patch

From 32bcc4e87e879f74d219be6252d51b7d361e245f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 03:03:45 +0000
Subject: [PATCH 5471/6226] terraform-providers.datadog_datadog: 3.77.0 ->
 3.79.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 d1fc79a3f23b..1f751d3bb1d9 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -264,13 +264,13 @@
     "vendorHash": "sha256-3o6YRDrq4rQhNAFyqiGJrAoxuAykWw85OExRGSE3kGI="
   },
   "datadog_datadog": {
-    "hash": "sha256-6TWsoB6v7mqln4qcq1Dhk8GnkNVUFGyZhR9sJ1Ri/yU=",
+    "hash": "sha256-bl9hs1mjzmh8ePH94/PZTXt4yGz5+Ma0YFpxI+it6eg=",
     "homepage": "https://registry.terraform.io/providers/DataDog/datadog",
     "owner": "DataDog",
     "repo": "terraform-provider-datadog",
-    "rev": "v3.77.0",
+    "rev": "v3.79.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-9Xl32qeUvpvID4+REuQZlCFarz8cEdtOzROU4jrordw="
+    "vendorHash": "sha256-l+eOOc+Mi3z0VQDX+7+JrNNTRKDAOr3JKFw1WJt8OIE="
   },
   "datadrivers_nexus": {
     "hash": "sha256-Lm5CZ+eBDUNIL2KuK/iKc5dTif7P+E9II714vwvYuyU=",

From cb33838bff5251919ced1839bf4938945107e1e1 Mon Sep 17 00:00:00 2001
From: HHR2020 <76608828+HHR2020@users.noreply.github.com>
Date: Wed, 5 Nov 2025 11:07:03 +0800
Subject: [PATCH 5472/6226] linyaps: 1.9.13 -> 1.10.0

Changelog: https://github.com/OpenAtom-Linyaps/linyaps/releases/tag/1.10.0
---
 pkgs/by-name/li/linyaps/package.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/li/linyaps/package.nix b/pkgs/by-name/li/linyaps/package.nix
index b1fdeae4014d..252c6725db7a 100644
--- a/pkgs/by-name/li/linyaps/package.nix
+++ b/pkgs/by-name/li/linyaps/package.nix
@@ -39,22 +39,17 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "linyaps";
-  version = "1.9.13";
+  version = "1.10.0";
 
   src = fetchFromGitHub {
     owner = "OpenAtom-Linyaps";
     repo = finalAttrs.pname;
     tag = finalAttrs.version;
-    hash = "sha256-sAxHDvhRz7okElk8vdISJt/yrNnCdu95hW3ImHOjiyw=";
+    hash = "sha256-C5rP6r3V+hxTjM+kmXjS4MnuL6P5wxSVP9nNmlQbcB8=";
   };
 
   patches = [
     ./fix-host-path.patch
-    # Fix for Qt 6.10
-    (fetchpatch {
-      url = "https://github.com/OpenAtom-Linyaps/linyaps/commit/c49e6cfab304ffa2b5b1657da247a6eda6f46c3a.patch";
-      hash = "sha256-lFyPb8YiaXJl2yzPElUR1jYwdOxA0h+db4sv/N70N4E=";
-    })
   ];
 
   postPatch = ''

From 642d5d3c173d01ab118100599982ffa92852b1f8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 03:08:21 +0000
Subject: [PATCH 5473/6226] airwindows: 0-unstable-2025-10-18 ->
 0-unstable-2025-11-02

---
 pkgs/by-name/ai/airwindows/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ai/airwindows/package.nix b/pkgs/by-name/ai/airwindows/package.nix
index 9cc03af3642f..968e9111e87a 100644
--- a/pkgs/by-name/ai/airwindows/package.nix
+++ b/pkgs/by-name/ai/airwindows/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenv.mkDerivation {
   pname = "airwindows";
-  version = "0-unstable-2025-10-18";
+  version = "0-unstable-2025-11-02";
 
   src = fetchFromGitHub {
     owner = "airwindows";
     repo = "airwindows";
-    rev = "1b0b4d56623e464db038e88cb87d1703b5aa0c63";
-    hash = "sha256-u83unbD3qf3OudMeOq20Iw2K3SOsKrGLekYCiVZTzF8=";
+    rev = "d27f470c0796a32d8241a0be25f74a0fc63e7f8d";
+    hash = "sha256-tSbGn7t4EeH5xtvjRRQQneaLP4VEf8ix+0m/v6eosXw=";
   };
 
   # we patch helpers because honestly im spooked out by where those variables

From 19b6d6b4f27dd754b3f545dd2a5cda799bbc7032 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 03:34:17 +0000
Subject: [PATCH 5474/6226] python3Packages.python-arango: 8.2.2 -> 8.2.3

---
 pkgs/development/python-modules/python-arango/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-arango/default.nix b/pkgs/development/python-modules/python-arango/default.nix
index 5a859674e62d..e707b6c4ee18 100644
--- a/pkgs/development/python-modules/python-arango/default.nix
+++ b/pkgs/development/python-modules/python-arango/default.nix
@@ -32,7 +32,7 @@ in
 
 buildPythonPackage rec {
   pname = "python-arango";
-  version = "8.2.2";
+  version = "8.2.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -41,7 +41,7 @@ buildPythonPackage rec {
     owner = "arangodb";
     repo = "python-arango";
     tag = version;
-    hash = "sha256-qcG1q85q3hhkcYSGcWp5I1spwvf+yPg6TZbAnc0/iYw=";
+    hash = "sha256-cc8VxaNVOydsuhnNa8Qo8xfhIUIkuNZUWBZNqu6xEwg=";
   };
 
   nativeBuildInputs = [

From 0d4e684eb4e0426b47edb9fe6151cb6a112041a2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 03:40:54 +0000
Subject: [PATCH 5475/6226] zapzap: 6.2.1 -> 6.2.2

---
 pkgs/by-name/za/zapzap/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/za/zapzap/package.nix b/pkgs/by-name/za/zapzap/package.nix
index 423776fe2a66..7b1ed9aa1a51 100644
--- a/pkgs/by-name/za/zapzap/package.nix
+++ b/pkgs/by-name/za/zapzap/package.nix
@@ -7,14 +7,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "zapzap";
-  version = "6.2.1";
+  version = "6.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "rafatosta";
     repo = "zapzap";
     tag = version;
-    hash = "sha256-DvQuhoO7jxnkX7uW+fltEjKu2Ugg8cgLKe+5pkln6g4=";
+    hash = "sha256-pbRq+gYKGEezKkjkn8wbYtgaChfiEczWy0e/Dp5gTF8=";
   };
 
   nativeBuildInputs = [

From 00207e62b289f1d47acdeb58535650b07139c852 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Tue, 4 Nov 2025 19:41:04 -0800
Subject: [PATCH 5476/6226] rocmPackages.rocblas: remove reference to tensile
 in librocblas

rocblas's closure-size was bloated by around 400MB by a ref to
tensile in an error message string. tensile is used at build time
to build and link kernels, but is not needed at runtime.

Before:
/nix/store/zggwlwji0jca2cvhgl4ick7l3fwlwsfb-rocblas-gfx1030-6.4.3          1.3G

After:
/nix/store/71rz9qm323rzmzgkx31llcsnhd0gkvl3-rocblas-gfx1030-6.4.3        904.5M
---
 pkgs/development/rocm-modules/6/rocblas/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix
index 0c9c2ee5c424..ffaac106de35 100644
--- a/pkgs/development/rocm-modules/6/rocblas/default.nix
+++ b/pkgs/development/rocm-modules/6/rocblas/default.nix
@@ -24,6 +24,7 @@
   python3Packages,
   rocm-smi,
   pkg-config,
+  removeReferencesTo,
   buildTensile ? true,
   buildTests ? false,
   buildBenchmarks ? false,
@@ -54,6 +55,7 @@ stdenv.mkDerivation (finalAttrs: {
     clr
     gitMinimal
     pkg-config
+    removeReferencesTo
   ]
   ++ lib.optionals buildTensile [
     tensile
@@ -148,6 +150,13 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail '0.10' '1.0'
   '';
 
+  postInstall =
+    # tensile isn't needed at runtime and pulls in ~400MB of python deps
+    ''
+      remove-references-to -t ${tensile} \
+        "$out/lib/librocblas.so."*
+    '';
+
   passthru = {
     amdgpu_targets = gpuTargets';
     tests.rocblas-tests = finalAttrs.finalPackage.override {

From f9864971a4c6b7fc1638db60cc02dcd928ff2209 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Tue, 4 Nov 2025 19:55:21 -0800
Subject: [PATCH 5477/6226] rocmPackages: don't set
 build{Tests,Benchmarks}=false in scope

---
 pkgs/development/rocm-modules/6/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/default.nix b/pkgs/development/rocm-modules/6/default.nix
index 6654bafef12d..44454b36958a 100644
--- a/pkgs/development/rocm-modules/6/default.nix
+++ b/pkgs/development/rocm-modules/6/default.nix
@@ -26,8 +26,6 @@ let
     {
       inherit rocmClangStdenv;
       stdenv = rocmClangStdenv;
-      buildTests = false;
-      buildBenchmarks = false;
 
       rocmUpdateScript = self.callPackage ./update.nix { };
 

From 8e2ce3a081a1fe48b77c6931340d1b8a85e78423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Nov 2025 20:13:18 -0800
Subject: [PATCH 5478/6226] python3Packages.compit-inext-api: init at 0.3.1

---
 .../compit-inext-api/default.nix              | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/compit-inext-api/default.nix

diff --git a/pkgs/development/python-modules/compit-inext-api/default.nix b/pkgs/development/python-modules/compit-inext-api/default.nix
new file mode 100644
index 000000000000..0263ecd56fe4
--- /dev/null
+++ b/pkgs/development/python-modules/compit-inext-api/default.nix
@@ -0,0 +1,40 @@
+{
+  aiofiles,
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "compit-inext-api";
+  version = "0.3.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Przemko92";
+    repo = "compit-inext-api";
+    tag = version;
+    hash = "sha256-Wx3V0AdxNGLdCIl4G7FlfzeDSirRPnxgQ9Fbp5cRjFw=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiofiles
+    aiohttp
+  ];
+
+  pythonImportsCheck = [ "compit_inext_api" ];
+
+  # upstream has no tests
+  doCheck = false;
+
+  meta = {
+    description = "Python client for the Compit iNext API";
+    homepage = "https://github.com/Przemko92/compit-inext-api";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f22805eed7cc..c9edc5cbe55d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2929,6 +2929,8 @@ self: super: with self; {
 
   commonregex = callPackage ../development/python-modules/commonregex { };
 
+  compit-inext-api = callPackage ../development/python-modules/compit-inext-api { };
+
   compliance-trestle = callPackage ../development/python-modules/compliance-trestle { };
 
   complycube = callPackage ../development/python-modules/complycube { };

From a4c18e1e57e2eb30591bf765f279a6450cabc2d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Nov 2025 20:14:13 -0800
Subject: [PATCH 5479/6226] home-assistant: support compit component

---
 pkgs/servers/home-assistant/component-packages.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index d8b05c3a638c..dbc10044b499 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -986,7 +986,8 @@
       ];
     "compit" =
       ps: with ps; [
-      ]; # missing inputs: compit-inext-api
+        compit-inext-api
+      ];
     "concord232" =
       ps: with ps; [
         concord232
@@ -7131,6 +7132,7 @@
     "comfoconnect"
     "command_line"
     "compensation"
+    "compit"
     "config"
     "configurator"
     "control4"

From 47242ea767512c55f4528c64c53097dcbb48e111 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 04:26:23 +0000
Subject: [PATCH 5480/6226] terraform-providers.aminueza_minio: 3.8.0 -> 3.11.3

---
 .../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 d1fc79a3f23b..9c140803d93e 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -54,11 +54,11 @@
     "vendorHash": "sha256-f+Btkbc6e90W1VgYAMDq2CG4XhpKmJhKm/mv1r9DYpA="
   },
   "aminueza_minio": {
-    "hash": "sha256-A730CkOsaQArSLYdiUQg3pmrGA8gvYokqiwcL2tDqao=",
+    "hash": "sha256-snQZbGdHTY41aA6iK0PFO5SJ958xnsWPPLGv+H9uV2Y=",
     "homepage": "https://registry.terraform.io/providers/aminueza/minio",
     "owner": "aminueza",
     "repo": "terraform-provider-minio",
-    "rev": "v3.8.0",
+    "rev": "v3.11.3",
     "spdx": "AGPL-3.0",
     "vendorHash": "sha256-QWBzQXx/dzWZr9dn3LHy8RIvZL1EA9xYqi7Ppzvju7g="
   },

From 2b1f0eb6a60bfdee0e9bd70110d01355c1ea42f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 04:27:17 +0000
Subject: [PATCH 5481/6226] python3Packages.google-cloud-pubsub: 2.32.0 ->
 2.33.0

---
 .../python-modules/google-cloud-pubsub/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index 65b55da32464..5851550c7153 100644
--- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-pubsub";
-  version = "2.32.0";
+  version = "2.33.0";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
   src = fetchPypi {
     pname = "google_cloud_pubsub";
     inherit version;
-    hash = "sha256-PG24WT6ncsoGX7Iu5Pre5DhlLrW0z0x4s/28Ah9FKDY=";
+    hash = "sha256-g7xQxU9mnvuSStIThbxwkvoR91duq+89C016qO+pCqY=";
   };
 
   build-system = [ setuptools ];

From f60d1dc508e3e2bb9caef25a63f166c7069035dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 05:00:38 +0000
Subject: [PATCH 5482/6226] dumphfdl: 1.6.1 -> 1.7.0

---
 pkgs/by-name/du/dumphfdl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/du/dumphfdl/package.nix b/pkgs/by-name/du/dumphfdl/package.nix
index 74d605a9e3eb..8366f9b5d363 100644
--- a/pkgs/by-name/du/dumphfdl/package.nix
+++ b/pkgs/by-name/du/dumphfdl/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "dumphfdl";
-  version = "1.6.1";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "szpajder";
     repo = "dumphfdl";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-M4WjcGA15Kp+Hpp+I2Ndcx+oBqaGxEeQLTPcSlugLwQ=";
+    hash = "sha256-kbUCHddhkM3Cj39ac5GQM3hCihRERnzWdELtnHjaIgg=";
   };
 
   buildInputs = [

From c2e260382e6d5189eaada21e9d2b74e5fdcb6371 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 05:13:22 +0000
Subject: [PATCH 5483/6226] theme-obsidian2: 2.24 -> 2.25

---
 pkgs/by-name/th/theme-obsidian2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/th/theme-obsidian2/package.nix b/pkgs/by-name/th/theme-obsidian2/package.nix
index 25bd7ccbb554..7813f74ec001 100644
--- a/pkgs/by-name/th/theme-obsidian2/package.nix
+++ b/pkgs/by-name/th/theme-obsidian2/package.nix
@@ -9,11 +9,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "theme-obsidian2";
-  version = "2.24";
+  version = "2.25";
 
   src = fetchurl {
     url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz";
-    sha256 = "sha256-P+62cdYiCk8419S+u1w6EmzJL0rgHAh7G5eTuBOrAGY=";
+    sha256 = "sha256-Hajz2bFcsi+9kSjxuZ6Jav8t7S6trDUF5yJivw+Vypw=";
   };
 
   sourceRoot = ".";

From 15624d777b78b84976938eae42f67d7f7e9e3f5c Mon Sep 17 00:00:00 2001
From: Konstantin Bogdanov <konstantin@clickhouse.com>
Date: Wed, 5 Nov 2025 06:11:15 +0100
Subject: [PATCH 5484/6226] clickhouse, clickhouse-lts: add versionCheckHook

---
 pkgs/by-name/cl/clickhouse/generic.nix | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cl/clickhouse/generic.nix b/pkgs/by-name/cl/clickhouse/generic.nix
index 57dcb3ee9407..6399e1fecb17 100644
--- a/pkgs/by-name/cl/clickhouse/generic.nix
+++ b/pkgs/by-name/cl/clickhouse/generic.nix
@@ -27,6 +27,7 @@
   cargo,
   rustPlatform,
   nix-update-script,
+  versionCheckHook,
 }:
 let
   llvmStdenv = llvmPackages_19.stdenv;
@@ -183,6 +184,12 @@ llvmStdenv.mkDerivation (finalAttrs: {
   # https://github.com/ClickHouse/ClickHouse/issues/49988
   hardeningDisable = [ "fortify" ];
 
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  doInstallCheck = true;
+  preVersionCheck = ''
+    version=${builtins.head (lib.splitString "-" version)}
+  '';
+
   postInstall = ''
     sed -i -e '\!<log>/var/log/clickhouse-server/clickhouse-server\.log</log>!d' \
       $out/etc/clickhouse-server/config.xml
@@ -218,12 +225,16 @@ llvmStdenv.mkDerivation (finalAttrs: {
     homepage = "https://clickhouse.com";
     description = "Column-oriented database management system";
     license = licenses.asl20;
-    maintainers = with maintainers; [
-      thevar1able
-    ];
+    changelog = "https://github.com/ClickHouse/ClickHouse/blob/v${version}/CHANGELOG.md";
+
+    mainProgram = "clickhouse";
 
     # not supposed to work on 32-bit https://github.com/ClickHouse/ClickHouse/pull/23959#issuecomment-835343685
     platforms = lib.filter (x: (lib.systems.elaborate x).is64bit) (platforms.linux ++ platforms.darwin);
     broken = stdenv.buildPlatform != stdenv.hostPlatform;
+
+    maintainers = with maintainers; [
+      thevar1able
+    ];
   };
 })

From ddac798a5a8cf52f820e0da180f870452714f075 Mon Sep 17 00:00:00 2001
From: Konstantin Bogdanov <konstantin@clickhouse.com>
Date: Tue, 4 Nov 2025 21:25:45 +0100
Subject: [PATCH 5485/6226] nixos/clickhouse: allow configuring with Nix
 attribute set

---
 doc/release-notes/rl-2511.section.md          |   1 +
 .../modules/services/databases/clickhouse.nix | 112 +++++++++++++++++-
 2 files changed, 108 insertions(+), 5 deletions(-)

diff --git a/doc/release-notes/rl-2511.section.md b/doc/release-notes/rl-2511.section.md
index ddb0f3a36b34..21a9b41636e5 100644
--- a/doc/release-notes/rl-2511.section.md
+++ b/doc/release-notes/rl-2511.section.md
@@ -279,6 +279,7 @@
 
 - `cloudflare-ddns`: Added package cloudflare-ddns.
 
+- `clickhouse`: Added `serverConfig`, `usersConfig` configuration options accepting Nix attribute sets. Also added `extraServerConfig` and `extraUsersConfig` options accepting plain text (expecting XML configuration).
 
 - [`homebox` 0.20.0](https://github.com/sysadminsmedia/homebox/releases/tag/v0.20.0) changed how assets are stored and hashed. It is recommended to back up your database before this update. In particular, `--storage-data` was replaced with `--storage-conn-string` and `--storage-prefix-path`. If your configuration set `HBOX_STORAGE_DATA` manually, you must migrate it to `HBOX_STORAGE_CONN_STRING` and `HBOX_STORAGE_PREFIX_PATH`.
 
diff --git a/nixos/modules/services/databases/clickhouse.nix b/nixos/modules/services/databases/clickhouse.nix
index 18251d2e4d77..de9371de513a 100644
--- a/nixos/modules/services/databases/clickhouse.nix
+++ b/nixos/modules/services/databases/clickhouse.nix
@@ -6,9 +6,15 @@
 }:
 let
   cfg = config.services.clickhouse;
+  format = pkgs.formats.yaml { };
+
+  serverConfigFile = format.generate "config.yaml" cfg.serverConfig;
+  usersConfigFile = format.generate "users.yaml" cfg.usersConfig;
 in
 {
 
+  meta.maintainers = [ "thevar1able" ];
+
   ###### interface
 
   options = {
@@ -17,7 +23,86 @@ in
 
       enable = lib.mkEnableOption "ClickHouse database server";
 
-      package = lib.mkPackageOption pkgs "clickhouse" { };
+      package = lib.mkPackageOption pkgs "clickhouse" {
+        example = "pkgs.clickhouse-lts";
+      };
+
+      serverConfig = lib.mkOption {
+        type = format.type;
+        default = { };
+        example = lib.literalExpression ''
+          {
+            http_port = 8123;
+            tcp_port = 9000;
+
+            remote_servers = {
+              default = {
+                shard = {
+                  replica = [
+                    { host = "::"; port = "9000"; }
+                    { host = "::"; port = "9001"; }
+                    { host = "::"; port = "9002"; }
+                  ];
+                };
+              };
+            };
+          }
+        '';
+        description = ''
+          Your {file}`config.yaml` as a Nix attribute set.
+          Check the [documentation](https://clickhouse.com/docs/operations/configuration-files)
+          for possible options.
+        '';
+      };
+
+      usersConfig = lib.mkOption {
+        type = format.type;
+        default = { };
+        example = lib.literalExpression ''
+          {
+            profiles = {};
+
+            users = {
+              default = {
+                profile = "default";
+                password_sha256_hex = "36dd292533174299fb0c34665df468bb881756ca9eaf9757d0cfde38f9ededa1";  # `echo -n verysecret | sha256sum`
+              };
+            };
+          }
+        '';
+        description = ''
+          Your {file}`users.yaml` as a Nix attribute set.
+          Check the [documentation](https://clickhouse.com/docs/operations/configuration-files#user-settings)
+          for possible options.
+        '';
+      };
+
+      extraServerConfig = lib.mkOption {
+        type = lib.types.lines;
+        default = "";
+        example = ''
+          <clickhouse>
+            <max_connections>500</max_connections>
+            <keep_alive_timeout>3</keep_alive_timeout>
+          </clickhouse>
+        '';
+        description = "Additional raw XML configuration for ClickHouse server.";
+      };
+
+      extraUsersConfig = lib.mkOption {
+        type = lib.types.lines;
+        default = "";
+        example = ''
+          <clickhouse>
+            <users>
+              <readonly>
+                <profile>readonly</profile>
+              </readonly>
+            </users>
+          </clickhouse>
+        '';
+        description = "Additional raw XML configuration for ClickHouse server.";
+      };
 
     };
 
@@ -40,18 +125,15 @@ in
       description = "ClickHouse server";
 
       wantedBy = [ "multi-user.target" ];
-
       after = [ "network.target" ];
 
       serviceConfig = {
         Type = "notify";
         User = "clickhouse";
         Group = "clickhouse";
-        ConfigurationDirectory = "clickhouse-server";
         AmbientCapabilities = "CAP_SYS_NICE";
         StateDirectory = "clickhouse";
-        LogsDirectory = "clickhouse";
-        ExecStart = "${cfg.package}/bin/clickhouse-server --config-file=/etc/clickhouse-server/config.xml";
+        ExecStart = "${cfg.package}/bin/clickhouse-server --config=/etc/clickhouse-server/config.xml";
         TimeoutStartSec = "infinity";
       };
 
@@ -69,6 +151,26 @@ in
       "clickhouse-server/users.xml" = {
         source = "${cfg.package}/etc/clickhouse-server/users.xml";
       };
+
+      "clickhouse-server/config.d/100-nixos-module-config.yaml" = lib.mkIf (cfg.serverConfig != { }) {
+        source = serverConfigFile;
+      };
+
+      "clickhouse-server/users.d/100-nixos-module-config.yaml" = lib.mkIf (cfg.usersConfig != { }) {
+        source = usersConfigFile;
+      };
+
+      "clickhouse-server/config.d/200-nixos-module-extra-config.xml" =
+        lib.mkIf (cfg.extraServerConfig != "")
+          {
+            text = cfg.extraServerConfig;
+          };
+
+      "clickhouse-server/users.d/200-nixos-module-extra-config.xml" =
+        lib.mkIf (cfg.extraUsersConfig != "")
+          {
+            text = cfg.extraUsersConfig;
+          };
     };
 
     environment.systemPackages = [ cfg.package ];

From 5015e4b4468e63846ac14e9938f866d6c34c58e4 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Tue, 4 Nov 2025 19:54:45 -0800
Subject: [PATCH 5486/6226] rocmPackages.rocblas: split benchmark and test
 outputs

---
 .../rocm-modules/6/rocblas/default.nix        | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix
index ffaac106de35..37c303eca46f 100644
--- a/pkgs/development/rocm-modules/6/rocblas/default.nix
+++ b/pkgs/development/rocm-modules/6/rocblas/default.nix
@@ -26,8 +26,8 @@
   pkg-config,
   removeReferencesTo,
   buildTensile ? true,
-  buildTests ? false,
-  buildBenchmarks ? false,
+  buildTests ? true,
+  buildBenchmarks ? true,
   tensileSepArch ? true,
   tensileLazyLib ? true,
   withHipBlasLt ? true,
@@ -48,6 +48,8 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-FCzo/BOk4xLEFkdOdqcCXh4a9t3/OIIBEy8oz6oOMWg=";
   };
 
+  outputs = [ "out" ] ++ lib.optional buildBenchmarks "benchmark" ++ lib.optional buildTests "test";
+
   nativeBuildInputs = [
     cmake
     # no ninja, it buffers console output and nix times out long periods of no output
@@ -78,10 +80,8 @@ stdenv.mkDerivation (finalAttrs: {
     python3Packages.msgpack
     python3Packages.zstandard
   ]
-  ++ lib.optionals buildTests [
-    gtest
-  ]
   ++ lib.optionals (buildTests || buildBenchmarks) [
+    gtest
     gfortran
     rocm-smi
   ]
@@ -155,14 +155,26 @@ stdenv.mkDerivation (finalAttrs: {
     ''
       remove-references-to -t ${tensile} \
         "$out/lib/librocblas.so."*
+    ''
+    + lib.optionalString buildBenchmarks ''
+      moveToOutput "bin/*-tune" "$benchmark"
+      moveToOutput "bin/*-bench" "$benchmark"
+      moveToOutput "bin/*example*" "$benchmark"
+      cp "$out/bin/"*.{yaml,txt} "$benchmark/bin"
+    ''
+    + lib.optionalString buildTests ''
+      moveToOutput "bin/*test*" "$test"
+      cp "$out/bin/"*.{yaml,txt} "$test/bin"
+    ''
+    + ''
+      if [ -d $out/bin ]; then
+        rm $out/bin/*.{yaml,txt} || true
+        rmdir $out/bin
+      fi
     '';
 
   passthru = {
     amdgpu_targets = gpuTargets';
-    tests.rocblas-tests = finalAttrs.finalPackage.override {
-      buildBenchmarks = true;
-      buildTests = true;
-    };
     updateScript = rocmUpdateScript {
       name = finalAttrs.pname;
       inherit (finalAttrs.src) owner;

From 8da01c959af8085a999b56e9f6103da48456503a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 05:33:11 +0000
Subject: [PATCH 5487/6226] lidarr: 2.14.5.4836 -> 3.0.1.4866

---
 pkgs/by-name/li/lidarr/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/li/lidarr/package.nix b/pkgs/by-name/li/lidarr/package.nix
index 3bb13bab8f18..dd88ded5e6d8 100644
--- a/pkgs/by-name/li/lidarr/package.nix
+++ b/pkgs/by-name/li/lidarr/package.nix
@@ -25,16 +25,16 @@ let
     ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
   hash =
     {
-      x64-linux_hash = "sha256-LeJBed6Zo2+r6ZdgBTkcg+3ORoohvDpx37gOOorg9wY=";
-      arm64-linux_hash = "sha256-eS4MccKhISJBc68lhrYwbESV0FcqtAI/b4ojfQO/9m8=";
-      x64-osx_hash = "sha256-l3hi+X91DQNmGZKNJ4Y/DkB7ohu0/HTTnhSInIBiPlo=";
-      arm64-osx_hash = "sha256-ehZJZKxEiupLyBZCgz2subtD7BICXjAqIdnOnh+OMe4=";
+      x64-linux_hash = "sha256-Cji5hYEDvatOU0ExpggDWJEWSEXZTSpMGKm7Z5d44kc=";
+      arm64-linux_hash = "sha256-RWVlTnOENQ+/H6Mmkcim+Lu5tJvMBB26v/to4q61P40=";
+      x64-osx_hash = "sha256-rXUqzv6L0WJAoiQVm9UcG1OwCU8B2HmkiTOerZL19W4=";
+      arm64-osx_hash = "sha256-S23cPgEiqkeNW/J1kvI1QXZeYfrzb1GrD6YVFBKwm6M=";
     }
     ."${arch}-${os}_hash";
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "lidarr";
-  version = "2.14.5.4836";
+  version = "3.0.1.4866";
 
   src = fetchurl {
     inherit hash;

From fa1f225de999158b219411dc569c2a7eead82893 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 4 Nov 2025 23:59:06 +0100
Subject: [PATCH 5488/6226] lurk: use finalAttrs

---
 pkgs/by-name/lu/lurk/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/lu/lurk/package.nix b/pkgs/by-name/lu/lurk/package.nix
index 6ac06d27e492..52263c45ab24 100644
--- a/pkgs/by-name/lu/lurk/package.nix
+++ b/pkgs/by-name/lu/lurk/package.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lurk";
   version = "0.3.10";
 
   src = fetchFromGitHub {
     owner = "jakwai01";
     repo = "lurk";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-5riwosaT7QjRFnIFRAcyLul7i1g8OpHyUuuJNOROTF0=";
   };
 
@@ -23,7 +23,7 @@ rustPlatform.buildRustPackage rec {
   '';
 
   meta = {
-    changelog = "https://github.com/jakwai01/lurk/releases/tag/v${version}";
+    changelog = "https://github.com/jakwai01/lurk/releases/tag/v${finalAttrs.version}";
     description = "Simple and pretty alternative to strace";
     homepage = "https://github.com/jakwai01/lurk";
     license = lib.licenses.agpl3Only;
@@ -36,4 +36,4 @@ rustPlatform.buildRustPackage rec {
       "aarch64-linux"
     ];
   };
-}
+})

From 84c43cee12fdce502a5db209ae41f4a96dc2e34b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Tue, 4 Nov 2025 23:59:51 +0100
Subject: [PATCH 5489/6226] lurk: add maintainer gepbird

---
 pkgs/by-name/lu/lurk/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/lu/lurk/package.nix b/pkgs/by-name/lu/lurk/package.nix
index 52263c45ab24..f6ff6aee0e48 100644
--- a/pkgs/by-name/lu/lurk/package.nix
+++ b/pkgs/by-name/lu/lurk/package.nix
@@ -28,7 +28,8 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/jakwai01/lurk";
     license = lib.licenses.agpl3Only;
     mainProgram = "lurk";
-    maintainers = [
+    maintainers = with lib.maintainers; [
+      gepbird
     ];
     platforms = [
       "i686-linux"

From 9a22a291a158dfbe3c24fc1b2a8bf5392d931b44 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Tue, 4 Nov 2025 21:42:35 -0800
Subject: [PATCH 5490/6226] rocmPackages.rocblas: fix FHS diff path in rocblas
 test

---
 pkgs/development/rocm-modules/6/rocblas/default.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/rocm-modules/6/rocblas/default.nix b/pkgs/development/rocm-modules/6/rocblas/default.nix
index 37c303eca46f..c6bce658f6cc 100644
--- a/pkgs/development/rocm-modules/6/rocblas/default.nix
+++ b/pkgs/development/rocm-modules/6/rocblas/default.nix
@@ -7,6 +7,7 @@
   cmake,
   rocm-cmake,
   clr,
+  diffutils,
   python3,
   tensile,
   boost,
@@ -148,6 +149,12 @@ stdenv.mkDerivation (finalAttrs: {
     substituteInPlace CMakeLists.txt \
       --replace-fail "4.43.0" "4.44.0" \
       --replace-fail '0.10' '1.0'
+  ''
+  # Fixes sh: line 1: /usr/bin/diff: No such file or directory
+  # /build/source/clients/gtest/../include/testing_logging.hpp:1117: Failure
+  + lib.optionals buildTests ''
+    substituteInPlace clients/include/testing_logging.hpp \
+      --replace-fail "/usr/bin/diff" "${lib.getExe' diffutils "diff"}"
   '';
 
   postInstall =

From 00c8984a42070b0523d5d48daa35be639e6f65ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 05:47:55 +0000
Subject: [PATCH 5491/6226] python3Packages.deepl: 1.23.0 -> 1.24.0

---
 pkgs/development/python-modules/deepl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/deepl/default.nix b/pkgs/development/python-modules/deepl/default.nix
index 13cf85e85ead..d9486df7d5ec 100644
--- a/pkgs/development/python-modules/deepl/default.nix
+++ b/pkgs/development/python-modules/deepl/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "deepl";
-  version = "1.23.0";
+  version = "1.24.0";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-T1TfU014I91osL6sdPyvYDWiJjLkrJSeasryT9riDuM=";
+    hash = "sha256-oPyCqgnSpqY5H1QrorkDS0FfqjhsCaKXwxclNor3ePs=";
   };
 
   nativeBuildInputs = [ poetry-core ];

From 5b6735adf914be8d84ba4af5a35ef3a6ba481840 Mon Sep 17 00:00:00 2001
From: qzylinra <225773816+qzylinra@users.noreply.github.com>
Date: Wed, 5 Nov 2025 12:10:46 +0800
Subject: [PATCH 5492/6226] flutter: remove unused code

---
 .../flutter/artifacts/fetch-artifacts.nix     |  4 ---
 .../compilers/flutter/engine/package.nix      |  2 +-
 .../compilers/flutter/engine/source.nix       | 19 +++-----------
 .../development/compilers/flutter/flutter.nix |  6 +----
 .../flutter/update/get-artifact-hashes.nix.in |  5 ++--
 .../flutter/update/get-engine-hashes.nix.in   |  2 +-
 .../flutter/update/get-pubspec-lock.nix.in    | 25 +++++++++++++------
 7 files changed, 26 insertions(+), 37 deletions(-)

diff --git a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
index e7a9cfc9be13..c26fa0a73d2d 100644
--- a/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
+++ b/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix
@@ -73,8 +73,6 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}"
       lndir -silent '${flutter'}' "$FLUTTER_ROOT"
       rm --recursive --force "$FLUTTER_ROOT/bin/cache"
       mkdir "$FLUTTER_ROOT/bin/cache"
-    ''
-    + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") ''
       mkdir "$FLUTTER_ROOT/bin/cache/dart-sdk"
       lndir -silent '${flutter'}/bin/cache/dart-sdk' "$FLUTTER_ROOT/bin/cache/dart-sdk"
     ''
@@ -94,8 +92,6 @@ runCommand "flutter-artifacts-${flutterPlatform}-${systemPlatform}"
         }
 
       rm --recursive --force "$FLUTTER_ROOT/bin/cache/lockfile"
-    ''
-    + lib.optionalString (lib.versionAtLeast flutter'.version "3.26") ''
       rm --recursive --force "$FLUTTER_ROOT/bin/cache/dart-sdk"
     ''
     + ''
diff --git a/pkgs/development/compilers/flutter/engine/package.nix b/pkgs/development/compilers/flutter/engine/package.nix
index a1e5e73f0338..5814d29084a2 100644
--- a/pkgs/development/compilers/flutter/engine/package.nix
+++ b/pkgs/development/compilers/flutter/engine/package.nix
@@ -306,7 +306,7 @@ stdenv.mkDerivation (finalAttrs: {
     export TERM=dumb
   ''
   # ValueError: ZIP does not support timestamps before 1980
-  + lib.optionalString (lib.versionAtLeast flutterVersion "3.29") ''
+  + ''
     substituteInPlace src/flutter/build/zip.py \
       --replace-fail "zipfile.ZipFile(args.output, 'w', zipfile.ZIP_DEFLATED)" "zipfile.ZipFile(args.output, 'w', zipfile.ZIP_DEFLATED, strict_timestamps=False)"
   ''
diff --git a/pkgs/development/compilers/flutter/engine/source.nix b/pkgs/development/compilers/flutter/engine/source.nix
index acaa5b8be747..1d90f21c89c0 100644
--- a/pkgs/development/compilers/flutter/engine/source.nix
+++ b/pkgs/development/compilers/flutter/engine/source.nix
@@ -91,22 +91,9 @@ runCommand "flutter-engine-source-${version}-${buildPlatform.system}-${targetPla
       export -f clean_git
       export -f make_deterministic_repo
 
-    ''
-    + (
-      if lib.versionAtLeast flutterVersion "3.29" then
-        ''
-          mkdir --parents source
-          cp ${gclient} source/.gclient
-          cd source
-        ''
-      else
-        ''
-          mkdir --parents $out
-          cp ${gclient} $out/.gclient
-          cd $out
-        ''
-    )
-    + ''
+      mkdir --parents source
+      cp ${gclient} source/.gclient
+      cd source
       export PATH=$PATH:${tools.depot_tools}
       python3 ${tools.depot_tools}/gclient.py sync --no-history --shallow --nohooks -j $NIX_BUILD_CORES
     ''
diff --git a/pkgs/development/compilers/flutter/flutter.nix b/pkgs/development/compilers/flutter/flutter.nix
index 3a5dc51d4fb8..40ad7183b9f8 100644
--- a/pkgs/development/compilers/flutter/flutter.nix
+++ b/pkgs/development/compilers/flutter/flutter.nix
@@ -3,11 +3,7 @@
   version,
   engineVersion,
   engineHashes ? { },
-  engineUrl ?
-    if lib.versionAtLeast version "3.29" then
-      "https://github.com/flutter/flutter.git@${engineVersion}"
-    else
-      "https://github.com/flutter/engine.git@${engineVersion}",
+  engineUrl ? "https://github.com/flutter/flutter.git@${engineVersion}",
   enginePatches ? [ ],
   engineRuntimeModes ? [
     "release"
diff --git a/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in
index 33693b2bae1b..8edff6a2e876 100644
--- a/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in
+++ b/pkgs/development/compilers/flutter/update/get-artifact-hashes.nix.in
@@ -32,9 +32,8 @@ let
       systemPlatform:
       callPackage "${nixpkgsRoot}/pkgs/development/compilers/flutter/artifacts/fetch-artifacts.nix" {
         flutter = flutterPackages."v${flutterCompactVersion}";
-        inherit flutterPlatform;
-        inherit systemPlatform;
-        hash = lib.fakeSha256;
+        inherit flutterPlatform systemPlatform;
+        hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
       }
     ) systemPlatforms)
   ) [ ] flutterPlatforms;
diff --git a/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in b/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in
index 2e33ae5cd2d1..c96a7b9adad2 100644
--- a/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in
+++ b/pkgs/development/compilers/flutter/update/get-engine-hashes.nix.in
@@ -25,7 +25,7 @@ let
         flutterVersion = version;
         version = engineVersion;
         url = "https://github.com/flutter/flutter.git@${engineVersion}";
-        hashes."${buildPlatform}"."${targetPlatform}" = lib.fakeSha256;
+        hashes."${buildPlatform}"."${targetPlatform}" = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";
       }
     ) systemPlatforms)
   ) [ ] systemPlatforms;
diff --git a/pkgs/development/compilers/flutter/update/get-pubspec-lock.nix.in b/pkgs/development/compilers/flutter/update/get-pubspec-lock.nix.in
index 0060b81c98c6..e4894dffeff3 100644
--- a/pkgs/development/compilers/flutter/update/get-pubspec-lock.nix.in
+++ b/pkgs/development/compilers/flutter/update/get-pubspec-lock.nix.in
@@ -2,29 +2,40 @@
   flutterPackages,
   stdenv,
   cacert,
+  writableTmpDirAsHomeHook,
 }:
 let
   flutterCompactVersion = "@flutter_compact_version@";
   inherit (flutterPackages."v${flutterCompactVersion}") dart;
 in
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   name = "pubspec-lock";
   src = @flutter_src@;
 
-  nativeBuildInputs = [ dart ];
+  sourceRoot = "${finalAttrs.src.name}/packages/flutter_tools";
+
+  nativeBuildInputs = [
+    dart
+    writableTmpDirAsHomeHook
+  ];
 
   outputHashAlgo = "sha256";
   outputHashMode = "recursive";
   outputHash = "@hash@";
 
   buildPhase = ''
-    cd ./packages/flutter_tools
+    runHook preBuild
 
-    export HOME="$(mktemp -d)"
-    dart --root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt pub get -v
+    dart --root-certs-file=${cacert}/etc/ssl/certs/ca-bundle.crt pub get -verbose
+
+    runHook postBuild
   '';
 
   installPhase = ''
-    cp -r ./pubspec.lock $out
+    runHook preInstall
+
+    cp pubspec.lock $out
+
+    runHook postInstall
   '';
-}
+})

From ec70543b618bfe854415e72f6c7dee5976aec386 Mon Sep 17 00:00:00 2001
From: "Yang, Bo" <yang-bo@yang-bo.com>
Date: Wed, 5 Nov 2025 06:10:34 +0000
Subject: [PATCH 5493/6226] nixos/zoom-us: fix compatibility issue with
 pipewire

---
 nixos/modules/programs/zoom-us.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/zoom-us.nix b/nixos/modules/programs/zoom-us.nix
index 9d31c8e3086a..f1626849215b 100644
--- a/nixos/modules/programs/zoom-us.nix
+++ b/nixos/modules/programs/zoom-us.nix
@@ -17,7 +17,11 @@
       # configuration elsewhere.
       config.programs.zoom-us.package.override (prev: {
         # Support pulseaudio if it's enabled on the system.
-        pulseaudioSupport = prev.pulseaudioSupport or config.services.pulseaudio.enable;
+        pulseaudioSupport =
+          prev.pulseaudioSupport or (
+            config.services.pulseaudio.enable
+            || (config.services.pipewire.enable && config.services.pipewire.pulse.enable)
+          );
 
         # Support Plasma 6 desktop environment if it's enabled on the system.
         plasma6XdgDesktopPortalSupport =

From 5450cd9fa814cb9add0f203eb796584bef8b7708 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 06:24:53 +0000
Subject: [PATCH 5494/6226] avbroot: 3.23.1 -> 3.23.2

---
 pkgs/by-name/av/avbroot/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/av/avbroot/package.nix b/pkgs/by-name/av/avbroot/package.nix
index dd569261f2d9..5dab013d0db8 100644
--- a/pkgs/by-name/av/avbroot/package.nix
+++ b/pkgs/by-name/av/avbroot/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "avbroot";
-  version = "3.23.1";
+  version = "3.23.2";
 
   src = fetchFromGitHub {
     owner = "chenxiaolong";
     repo = "avbroot";
     tag = "v${version}";
-    hash = "sha256-ExP1ifZBiAQO0JntUsVPCVtItnX3JTv2QhbOcdbw8zo=";
+    hash = "sha256-rS3V+D7dBt/px0UNC8ZZyQ4FzNsjTykMSeXbjFF6iis=";
   };
 
-  cargoHash = "sha256-sLW8sHb9rdE9IGfHTFPnH3JmqqKQK7CMIWohHwgss2c=";
+  cargoHash = "sha256-XX2u281qTwI6/GwujseIiAmlsYPgxkA7cxyIljv29tk=";
 
   nativeBuildInputs = [
     pkg-config

From 407e611ff60e81dc8764ba77eb7569bb09481720 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 06:28:16 +0000
Subject: [PATCH 5495/6226] borgmatic: 2.0.9 -> 2.0.11

---
 pkgs/by-name/bo/borgmatic/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix
index 26a9b78ba809..3f3d27ddaff1 100644
--- a/pkgs/by-name/bo/borgmatic/package.nix
+++ b/pkgs/by-name/bo/borgmatic/package.nix
@@ -15,12 +15,12 @@
 }:
 python3Packages.buildPythonApplication rec {
   pname = "borgmatic";
-  version = "2.0.9";
+  version = "2.0.11";
   format = "pyproject";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-St4ZaZOgJhdMWr75V5OJAt/4JgOkvkCMmpYpn2mbxh0=";
+    hash = "sha256-X8IrLAH0rwUOGWMx9tDHIL8DeII35YCOeZyD979x/gk=";
   };
 
   passthru.updateScript = nix-update-script { };

From acbe2538b4d4cdbd47f1b8479649fb0b9bd30f89 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 06:33:14 +0000
Subject: [PATCH 5496/6226] clightning: 25.09.1 -> 25.09.2

---
 pkgs/by-name/cl/clightning/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/clightning/package.nix b/pkgs/by-name/cl/clightning/package.nix
index 59cd5fcd1516..4c7893ac66f0 100644
--- a/pkgs/by-name/cl/clightning/package.nix
+++ b/pkgs/by-name/cl/clightning/package.nix
@@ -29,11 +29,11 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "clightning";
-  version = "25.09.1";
+  version = "25.09.2";
 
   src = fetchurl {
     url = "https://github.com/ElementsProject/lightning/releases/download/v${version}/clightning-v${version}.zip";
-    hash = "sha256-maH+SSMunXH43Hl9FFvk5L6n4e06vgsL3T8W3ydy+hQ=";
+    hash = "sha256-iLzVDWTdKkpAjmuyCnSnqyWiv6CgdzQwNTmWZH/x7gM=";
   };
 
   # when building on darwin we need cctools to provide the correct libtool

From 1d29e417ff7517ebacef4c5851b6cabb31158417 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 07:01:16 +0000
Subject: [PATCH 5497/6226] gpu-screen-recorder: 5.8.0 -> 5.8.1

---
 pkgs/by-name/gp/gpu-screen-recorder/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gp/gpu-screen-recorder/package.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
index eb80840fe718..b329ec7ef61d 100644
--- a/pkgs/by-name/gp/gpu-screen-recorder/package.nix
+++ b/pkgs/by-name/gp/gpu-screen-recorder/package.nix
@@ -28,12 +28,12 @@
 
 stdenv.mkDerivation rec {
   pname = "gpu-screen-recorder";
-  version = "5.8.0";
+  version = "5.8.1";
 
   src = fetchgit {
     url = "https://repo.dec05eba.com/${pname}";
     tag = version;
-    hash = "sha256-H9aJ0JglYckd/+6E7dfRzoAUpsTBX8XmI2TR1907sPI=";
+    hash = "sha256-VAb7YAPZVe23qqoGgY8wPR+PwPHuWUmlcixoLOW/H5A=";
   };
 
   nativeBuildInputs = [

From e82187c76226a14c813294d88400b76dc32c64b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 07:10:31 +0000
Subject: [PATCH 5498/6226] tbls: 1.91.1 -> 1.91.2

---
 pkgs/by-name/tb/tbls/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tb/tbls/package.nix b/pkgs/by-name/tb/tbls/package.nix
index 24daf0ce3d22..abfe58d17510 100644
--- a/pkgs/by-name/tb/tbls/package.nix
+++ b/pkgs/by-name/tb/tbls/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "tbls";
-  version = "1.91.1";
+  version = "1.91.2";
 
   src = fetchFromGitHub {
     owner = "k1LoW";
     repo = "tbls";
     tag = "v${version}";
-    hash = "sha256-H0gL8EDJLIUhW5zV57zmWs2VU21GmqyKNTqB6AiXrKk=";
+    hash = "sha256-iL8d8fvc0zawe5UyeOwp5cfnE1K58IY39RSzq/jCc4c=";
   };
 
   vendorHash = "sha256-HE3/h77APsNRitAAo4R/5tWrX36IPcJRAUFv6M6P6x4=";

From a2d0e4737aae27d04ef12d5a4a63855d2763bdc9 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Wed, 5 Nov 2025 08:23:02 +0100
Subject: [PATCH 5499/6226] claude-code: 2.0.32 -> 2.0.33

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
---
 pkgs/by-name/cl/claude-code/package-lock.json | 4 ++--
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 0691f4804eeb..22e0322b6924 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.0.32",
+  "version": "2.0.33",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.0.32",
+      "version": "2.0.33",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 09a3293e0d39..8de765ca83d8 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,14 +7,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.0.32";
+  version = "2.0.33";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-w8auh/tivUF4ZxbZ5BRJcym0wPYDaYhCP33mHbjPo/c=";
+    hash = "sha256-Ng9uJj4STRCKk2ndk7zH3fF/OLZ/cvZSGKH2QRyOFcM=";
   };
 
-  npmDepsHash = "sha256-Nw/TnZ7ZaxXaQolT/e7XuF1c41E848TW3n+1Y+U9Be8=";
+  npmDepsHash = "sha256-89+DrE8rG5WPw6J+iw4t1t+1yJKdbaKLDodfP/CsViU=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From 0098db31de105067f5d29523299c8470073df941 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 07:53:58 +0000
Subject: [PATCH 5500/6226] openfga-cli: 0.7.5 -> 0.7.7

---
 pkgs/by-name/op/openfga-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/openfga-cli/package.nix b/pkgs/by-name/op/openfga-cli/package.nix
index 5b527de47bde..ce1a8ef81be3 100644
--- a/pkgs/by-name/op/openfga-cli/package.nix
+++ b/pkgs/by-name/op/openfga-cli/package.nix
@@ -7,7 +7,7 @@
 
 let
   pname = "openfga-cli";
-  version = "0.7.5";
+  version = "0.7.7";
 in
 
 buildGoModule {
@@ -17,10 +17,10 @@ buildGoModule {
     owner = "openfga";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-/6X42OoIAOXKBi3PSqpzNMfHCJy/HNfiU7lCmmiWi8k=";
+    hash = "sha256-066/cQBjs8+smMQDc/AaP0thjxb3p0nOzIaKE58cc6M=";
   };
 
-  vendorHash = "sha256-KZbtIjDHCuMo4mmTKq8nA0Yc/HIFu22CS8ei8afT33Y=";
+  vendorHash = "sha256-5G8bSliEQ302yWPOl245nFFEybOGowineFODcCm9Osw=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From a45da2728e88367386130cf42404dc409fd44361 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 08:15:57 +0000
Subject: [PATCH 5501/6226] terraform-providers.tencentcloudstack_tencentcloud:
 1.82.32 -> 1.82.34

---
 .../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 6dcb45deab78..e053bf49ef27 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1309,11 +1309,11 @@
     "vendorHash": "sha256-9GjhP/Oh2HlVuMcuXFhS7MUmF3eS4qlUsW5XhugaK14="
   },
   "tencentcloudstack_tencentcloud": {
-    "hash": "sha256-e9Mr5QK0MFtk2IRakLCy2smkwKBau5sAH8BE/IIfp3A=",
+    "hash": "sha256-aBZukPo+T1GItIQLJhCRMcSMZxV71gw+HIjBN6pxtmA=",
     "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud",
     "owner": "tencentcloudstack",
     "repo": "terraform-provider-tencentcloud",
-    "rev": "v1.82.32",
+    "rev": "v1.82.34",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 5dda1f2714d506be454ff796a5a650459de72c46 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 08:21:40 +0000
Subject: [PATCH 5502/6226] mattermost: 10.11.5 -> 10.11.6

---
 pkgs/by-name/ma/mattermost/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix
index d8b8b35c498c..57c35fb360fb 100644
--- a/pkgs/by-name/ma/mattermost/package.nix
+++ b/pkgs/by-name/ma/mattermost/package.nix
@@ -19,8 +19,8 @@
     #
     # Ensure you also check ../mattermostLatest/package.nix.
     regex = "^v(10\\.11\\.[0-9]+)$";
-    version = "10.11.5";
-    srcHash = "sha256-X0YjyRrFSYI7A+VINLV3NwAmsxgTkdUdHChyl1L+iWY=";
+    version = "10.11.6";
+    srcHash = "sha256-JBZAFyjZOteDaCVktxXtdbimNrvCpUpgK45OuFCI5xQ=";
     vendorHash = "sha256-Lsw/cvl98JdVmzWr85lAv/JMcTmZZZ4ALLunFLNcrro=";
     npmDepsHash = "sha256-p9dq31qw0EZDQIl2ysKE38JgDyLA6XvSv+VtHuRh+8A=";
     lockfileOverlay = ''

From 124e5df77f16d970553e830ef08e0d9e0f488f6d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 08:34:14 +0000
Subject: [PATCH 5503/6226] lunar-client: 3.5.2 -> 3.5.3

---
 pkgs/by-name/lu/lunar-client/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix
index 6f1e5d6aab04..729a4690d4e0 100644
--- a/pkgs/by-name/lu/lunar-client/package.nix
+++ b/pkgs/by-name/lu/lunar-client/package.nix
@@ -7,11 +7,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "lunarclient";
-  version = "3.5.2";
+  version = "3.5.3";
 
   src = fetchurl {
     url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage";
-    hash = "sha512-AGubOjYDv7+Lep6XJl+ybsKClrwY6TyTuYyoqWtYgmfY7QZtyV+1ATQOx6/fVpA3YTW8oCj65tuI6ZcZXUayDQ==";
+    hash = "sha512-rJl0EZ48bXmC24KGZIAuXUw9VLTzAwgLpOU1Ck5OYX3ZgDu5NQd26WAFoGwQqu8HpksPjv3Ylqhl9MEpWGXyLw==";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 1701d4b756545542d70452cacd014e6d3340466c Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 5 Nov 2025 05:35:51 -0300
Subject: [PATCH 5504/6226] clblas: fix build with cmake4

---
 pkgs/by-name/cl/clblas/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/cl/clblas/package.nix b/pkgs/by-name/cl/clblas/package.nix
index e284e350b80f..27e32115e82d 100644
--- a/pkgs/by-name/cl/clblas/package.nix
+++ b/pkgs/by-name/cl/clblas/package.nix
@@ -33,6 +33,11 @@ stdenv.mkDerivation rec {
 
   postPatch = ''
     sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt
+
+    substituteInPlace src/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.8)" "cmake_minimum_required(VERSION 3.10)"
+    substituteInPlace src/library/tools/tplgen/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6)" "cmake_minimum_required(VERSION 3.10)"
   '';
 
   preConfigure = ''

From 5dcea27f9c798948673d6fabf4255a46ecfbeabd Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 5 Nov 2025 08:36:58 +0000
Subject: [PATCH 5505/6226] python3Packages.markitdown: relax magika dependency

---
 pkgs/development/python-modules/markitdown/default.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/development/python-modules/markitdown/default.nix b/pkgs/development/python-modules/markitdown/default.nix
index 90b62a28ba0c..38fb386fb8af 100644
--- a/pkgs/development/python-modules/markitdown/default.nix
+++ b/pkgs/development/python-modules/markitdown/default.nix
@@ -44,6 +44,9 @@ buildPythonPackage rec {
 
   build-system = [ hatchling ];
 
+  pythonRelaxDeps = [
+    "magika"
+  ];
   dependencies = [
     beautifulsoup4
     defusedxml
@@ -85,6 +88,7 @@ buildPythonPackage rec {
   meta = {
     description = "Python tool for converting files and office documents to Markdown";
     homepage = "https://github.com/microsoft/markitdown";
+    changelog = "https://github.com/microsoft/markitdown/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = [ ];
   };

From 8ac30023ea1926d93d7fa3969c8b55dec44fbdfe Mon Sep 17 00:00:00 2001
From: Marie Ramlow <me@nycode.dev>
Date: Tue, 4 Nov 2025 20:47:47 +0100
Subject: [PATCH 5506/6226] appium-inspector: bump to electron_38

---
 pkgs/by-name/ap/appium-inspector/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ap/appium-inspector/package.nix b/pkgs/by-name/ap/appium-inspector/package.nix
index e3353ebd71b8..473216d965f1 100644
--- a/pkgs/by-name/ap/appium-inspector/package.nix
+++ b/pkgs/by-name/ap/appium-inspector/package.nix
@@ -2,7 +2,7 @@
   lib,
   buildNpmPackage,
   copyDesktopItems,
-  electron_36,
+  electron_38,
   fetchFromGitHub,
   makeDesktopItem,
   makeWrapper,
@@ -10,7 +10,7 @@
 }:
 
 let
-  electron = electron_36;
+  electron = electron_38;
   version = "2025.8.2";
 in
 

From fc47b35d0525380cc8d6ccc2f18a47f44c6f4c2f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 08:50:20 +0000
Subject: [PATCH 5507/6226] python3Packages.django-debug-toolbar: 6.0.0 ->
 6.1.0

---
 .../python-modules/django-debug-toolbar/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-debug-toolbar/default.nix b/pkgs/development/python-modules/django-debug-toolbar/default.nix
index 84c68dda3a03..d8e2c79568b7 100644
--- a/pkgs/development/python-modules/django-debug-toolbar/default.nix
+++ b/pkgs/development/python-modules/django-debug-toolbar/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "django-debug-toolbar";
-  version = "6.0.0";
+  version = "6.1.0";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "jazzband";
     repo = "django-debug-toolbar";
     tag = version;
-    hash = "sha256-ZNevSqEpTdk0cZeMzOpbtatEiV9SAsVUlRb9YddcAGY=";
+    hash = "sha256-gDBir6xf4BBo3KwfVGEUo+Ve5vsmuB12cQqy9sdXSUg=";
   };
 
   postPatch = ''

From a8ad34a9419004997c4eb41578df812238ad4fd0 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 5 Nov 2025 08:56:41 +0000
Subject: [PATCH 5508/6226] python3Packages.timm: 1.0.21 -> 1.0.22

Diff: https://github.com/huggingface/pytorch-image-models/compare/v1.0.21...v1.0.22

Changelog: https://github.com/huggingface/pytorch-image-models/blob/v1.0.22/README.md#whats-new
---
 pkgs/development/python-modules/timm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/timm/default.nix b/pkgs/development/python-modules/timm/default.nix
index 12aa93b3c876..a820c4871d02 100644
--- a/pkgs/development/python-modules/timm/default.nix
+++ b/pkgs/development/python-modules/timm/default.nix
@@ -22,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "timm";
-  version = "1.0.21";
+  version = "1.0.22";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "huggingface";
     repo = "pytorch-image-models";
     tag = "v${version}";
-    hash = "sha256-8TYK6bTaCBFpnIwiOWTzz4Rk9P37tu0XzvRIVlH+b1Q=";
+    hash = "sha256-ilOnC1tqSb4TuSGRafMNl8hi9P2qdsBWbv3G9azy6Gs=";
   };
 
   build-system = [ pdm-backend ];

From 4771490e8ed242ae297989ff84dc53d4f2a2302f Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 4 Nov 2025 18:04:03 +0100
Subject: [PATCH 5509/6226] tailer: cleanup

---
 pkgs/by-name/ta/tailer/package.nix | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/ta/tailer/package.nix b/pkgs/by-name/ta/tailer/package.nix
index fd39be43ddf0..7f2ddec8ede4 100644
--- a/pkgs/by-name/ta/tailer/package.nix
+++ b/pkgs/by-name/ta/tailer/package.nix
@@ -6,14 +6,14 @@
   tailer,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "tailer";
   version = "0.1.1";
 
   src = fetchFromGitHub {
     owner = "hionay";
     repo = "tailer";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-gPezz2ksqdCffgdAHwU2NMTar2glp5YGfA5C+tMYPtE=";
   };
 
@@ -21,8 +21,7 @@ buildGoModule rec {
 
   ldflags = [
     "-s"
-    "-w"
-    "-X=main.version=${version}"
+    "-X=main.version=${finalAttrs.version}"
   ];
 
   passthru.tests = {
@@ -31,11 +30,11 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "CLI tool to insert lines when command output stops";
     homepage = "https://github.com/hionay/tailer";
-    license = licenses.mit;
     maintainers = [ ];
+    license = lib.licenses.mit;
     mainProgram = "tailer";
   };
-}
+})

From 4c41bd8fcb8aebc71c460cae159a93505be2bed4 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 5 Nov 2025 10:04:18 +0100
Subject: [PATCH 5510/6226] tailer: add liberodark to maintainers

---
 pkgs/by-name/ta/tailer/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ta/tailer/package.nix b/pkgs/by-name/ta/tailer/package.nix
index 7f2ddec8ede4..06567867ac9f 100644
--- a/pkgs/by-name/ta/tailer/package.nix
+++ b/pkgs/by-name/ta/tailer/package.nix
@@ -33,7 +33,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "CLI tool to insert lines when command output stops";
     homepage = "https://github.com/hionay/tailer";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ liberodark ];
     license = lib.licenses.mit;
     mainProgram = "tailer";
   };

From 6c0ef9eb87c986e7ea949a6d84f9817484209dd0 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 4 Nov 2025 13:14:23 +0100
Subject: [PATCH 5511/6226] selene: cleanup

---
 pkgs/by-name/se/selene/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/se/selene/package.nix b/pkgs/by-name/se/selene/package.nix
index 7168212e465a..d69ae7997798 100644
--- a/pkgs/by-name/se/selene/package.nix
+++ b/pkgs/by-name/se/selene/package.nix
@@ -7,15 +7,15 @@
   openssl,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "selene";
   version = "0.29.0";
 
   src = fetchFromGitHub {
     owner = "kampfkarren";
     repo = "selene";
-    rev = version;
-    sha256 = "sha256-/KMLOZtCdvv76BDGj1oM6Q93cX6yPE4E5ZM+Xy6yRxA=";
+    tag = finalAttrs.version;
+    hash = "sha256-/KMLOZtCdvv76BDGj1oM6Q93cX6yPE4E5ZM+Xy6yRxA=";
   };
 
   cargoHash = "sha256-RlD4CbLJpmOSQJCMaXFC7/83qlPpnzd2wBn3xNu1yQ0=";
@@ -34,8 +34,8 @@ rustPlatform.buildRustPackage rec {
     description = "Blazing-fast modern Lua linter written in Rust";
     mainProgram = "selene";
     homepage = "https://github.com/kampfkarren/selene";
-    changelog = "https://github.com/kampfkarren/selene/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/kampfkarren/selene/blob/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
     maintainers = [ ];
   };
-}
+})

From 0adfda877415057e8c3e9cbfbca04176586b9c8e Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 5 Nov 2025 10:06:43 +0100
Subject: [PATCH 5512/6226] selene: add liberodark to maintainers

---
 pkgs/by-name/se/selene/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/se/selene/package.nix b/pkgs/by-name/se/selene/package.nix
index d69ae7997798..681172b3f11f 100644
--- a/pkgs/by-name/se/selene/package.nix
+++ b/pkgs/by-name/se/selene/package.nix
@@ -36,6 +36,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
     homepage = "https://github.com/kampfkarren/selene";
     changelog = "https://github.com/kampfkarren/selene/blob/${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mpl20;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ liberodark ];
   };
 })

From 556d9fc8f7fdb7c58cf22414deec4be72c8b83a5 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 4 Nov 2025 12:59:50 +0100
Subject: [PATCH 5513/6226] wazero: cleanup

---
 pkgs/by-name/wa/wazero/package.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/by-name/wa/wazero/package.nix b/pkgs/by-name/wa/wazero/package.nix
index e35664ed0f31..d88248f9a166 100644
--- a/pkgs/by-name/wa/wazero/package.nix
+++ b/pkgs/by-name/wa/wazero/package.nix
@@ -6,14 +6,14 @@
   wazero,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "wazero";
   version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "tetratelabs";
     repo = "wazero";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-yxnHLc0PFxh8NRBgK2hvhKaxRM1w3IZ9TnfJM0+uadg=";
   };
 
@@ -25,8 +25,7 @@ buildGoModule rec {
 
   ldflags = [
     "-s"
-    "-w"
-    "-X=github.com/tetratelabs/wazero/internal/version.version=${version}"
+    "-X=github.com/tetratelabs/wazero/internal/version.version=${finalAttrs.version}"
   ];
 
   checkFlags = [
@@ -41,12 +40,12 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Zero dependency WebAssembly runtime for Go developers";
     homepage = "https://github.com/tetratelabs/wazero";
-    changelog = "https://github.com/tetratelabs/wazero/releases/tag/${src.rev}";
-    license = licenses.asl20;
     maintainers = [ ];
+    changelog = "https://github.com/tetratelabs/wazero/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.asl20;
     mainProgram = "wazero";
   };
-}
+})

From c4cfadd80d2744c5df3b58b584282b2a999028e4 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 5 Nov 2025 10:10:10 +0100
Subject: [PATCH 5514/6226] wazero: add liberodark to maintainers

---
 pkgs/by-name/wa/wazero/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/wa/wazero/package.nix b/pkgs/by-name/wa/wazero/package.nix
index d88248f9a166..ed311b5740ec 100644
--- a/pkgs/by-name/wa/wazero/package.nix
+++ b/pkgs/by-name/wa/wazero/package.nix
@@ -43,7 +43,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Zero dependency WebAssembly runtime for Go developers";
     homepage = "https://github.com/tetratelabs/wazero";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ liberodark ];
     changelog = "https://github.com/tetratelabs/wazero/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.asl20;
     mainProgram = "wazero";

From 98813fb623724e9b1402f71ca2ebf95d4aac69dc Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 4 Nov 2025 11:54:30 +0100
Subject: [PATCH 5515/6226] lwc: cleanup

---
 pkgs/by-name/lw/lwc/package.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/lw/lwc/package.nix b/pkgs/by-name/lw/lwc/package.nix
index 486f92e29fcf..9018058a0e60 100644
--- a/pkgs/by-name/lw/lwc/package.nix
+++ b/pkgs/by-name/lw/lwc/package.nix
@@ -4,7 +4,7 @@
   fetchFromGitHub,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "lwc";
   version = "unstable-2022-07-26";
 
@@ -19,15 +19,14 @@ buildGoModule rec {
 
   ldflags = [
     "-s"
-    "-w"
-    "-X=main.version=${src.rev}"
+    "-X=main.version=${finalAttrs.src.rev}"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Live-updating version of the UNIX wc command";
     homepage = "https://github.com/timdp/lwc";
-    license = licenses.mit;
     maintainers = [ ];
+    license = lib.licenses.mit;
     mainProgram = "lwc";
   };
-}
+})

From 1cba181c01d27e96c31c5c7437956f81e7c568ea Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 5 Nov 2025 10:12:17 +0100
Subject: [PATCH 5516/6226] lwc: add liberodark to maintainers

---
 pkgs/by-name/lw/lwc/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/lw/lwc/package.nix b/pkgs/by-name/lw/lwc/package.nix
index 9018058a0e60..454060ef61f1 100644
--- a/pkgs/by-name/lw/lwc/package.nix
+++ b/pkgs/by-name/lw/lwc/package.nix
@@ -25,7 +25,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Live-updating version of the UNIX wc command";
     homepage = "https://github.com/timdp/lwc";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ liberodark ];
     license = lib.licenses.mit;
     mainProgram = "lwc";
   };

From 4e24853df60d56f45a3900dd25dfac145bb9245d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 09:13:48 +0000
Subject: [PATCH 5517/6226] proton-ge-bin: GE-Proton10-24 -> GE-Proton10-25

---
 pkgs/by-name/pr/proton-ge-bin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/proton-ge-bin/package.nix b/pkgs/by-name/pr/proton-ge-bin/package.nix
index 82da233a89bd..7c9edd97cee6 100644
--- a/pkgs/by-name/pr/proton-ge-bin/package.nix
+++ b/pkgs/by-name/pr/proton-ge-bin/package.nix
@@ -9,11 +9,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "proton-ge-bin";
-  version = "GE-Proton10-24";
+  version = "GE-Proton10-25";
 
   src = fetchzip {
     url = "https://github.com/GloriousEggroll/proton-ge-custom/releases/download/${finalAttrs.version}/${finalAttrs.version}.tar.gz";
-    hash = "sha256-QZBu2C4JrsETY+EV0zs4e921qOxYT9lk0EYXXpOCKLs=";
+    hash = "sha256-RKko4QMxtnuC1SAHTSEQGBzVyl3ywnirFSYJ1WKSY0k=";
   };
 
   dontUnpack = true;

From c94424796e997bcb56bf5065cdbef3d3aa81bb8b Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 4 Nov 2025 12:35:06 +0100
Subject: [PATCH 5518/6226] {topfew, topfew-rs}: cleanup

---
 pkgs/by-name/to/topfew-rs/package.nix | 10 +++++-----
 pkgs/by-name/to/topfew/package.nix    | 11 +++++------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/to/topfew-rs/package.nix b/pkgs/by-name/to/topfew-rs/package.nix
index 53d726e1e18e..8a8488fc4076 100644
--- a/pkgs/by-name/to/topfew-rs/package.nix
+++ b/pkgs/by-name/to/topfew-rs/package.nix
@@ -4,24 +4,24 @@
   fetchFromGitHub,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "topfew-rs";
   version = "0.2.3";
 
   src = fetchFromGitHub {
     owner = "djc";
     repo = "topfew-rs";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-VlSLPcKw3LYGnmKk5YOkcGIizw1tqtKF2BykY+1MtvY=";
   };
 
   cargoHash = "sha256-NAM/s3m+ZqgHoX6GESgJOxr88sy4+JieWB8u8aKbW7Y=";
 
-  meta = with lib; {
+  meta = {
     description = "Rust implementation of Tim Bray's topfew tool";
     homepage = "https://github.com/djc/topfew-rs";
-    license = licenses.gpl3Only;
     maintainers = [ ];
+    license = lib.licenses.gpl3Only;
     mainProgram = "tf";
   };
-}
+})
diff --git a/pkgs/by-name/to/topfew/package.nix b/pkgs/by-name/to/topfew/package.nix
index 8e88803fe238..34a5da824c9b 100644
--- a/pkgs/by-name/to/topfew/package.nix
+++ b/pkgs/by-name/to/topfew/package.nix
@@ -5,14 +5,14 @@
   installShellFiles,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "topfew";
   version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "timbray";
     repo = "topfew";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-P3K3IhgYkrxmEG2l7EQDVWQ+P7fOjUMUFrlAnY+8NmI=";
   };
 
@@ -24,18 +24,17 @@ buildGoModule rec {
 
   ldflags = [
     "-s"
-    "-w"
   ];
 
   postInstall = ''
     installManPage doc/tf.1
   '';
 
-  meta = with lib; {
+  meta = {
     description = "Finds the fields (or combinations of fields) which appear most often in a stream of records";
     homepage = "https://github.com/timbray/topfew";
-    license = licenses.gpl3Only;
     maintainers = [ ];
+    license = lib.licenses.gpl3Only;
     mainProgram = "tf";
   };
-}
+})

From d2b2bd34a43b552ed05a0d93e931db1778f978ff Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 5 Nov 2025 10:18:34 +0100
Subject: [PATCH 5519/6226] {topfew, topfew-rs}: add liberodark to maintainers

---
 pkgs/by-name/to/topfew-rs/package.nix | 2 +-
 pkgs/by-name/to/topfew/package.nix    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/to/topfew-rs/package.nix b/pkgs/by-name/to/topfew-rs/package.nix
index 8a8488fc4076..9c6e3cb1e2e6 100644
--- a/pkgs/by-name/to/topfew-rs/package.nix
+++ b/pkgs/by-name/to/topfew-rs/package.nix
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
   meta = {
     description = "Rust implementation of Tim Bray's topfew tool";
     homepage = "https://github.com/djc/topfew-rs";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ liberodark ];
     license = lib.licenses.gpl3Only;
     mainProgram = "tf";
   };
diff --git a/pkgs/by-name/to/topfew/package.nix b/pkgs/by-name/to/topfew/package.nix
index 34a5da824c9b..906bd91cfaa2 100644
--- a/pkgs/by-name/to/topfew/package.nix
+++ b/pkgs/by-name/to/topfew/package.nix
@@ -33,7 +33,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Finds the fields (or combinations of fields) which appear most often in a stream of records";
     homepage = "https://github.com/timbray/topfew";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ liberodark ];
     license = lib.licenses.gpl3Only;
     mainProgram = "tf";
   };

From 41fbabea29bc3cf57afd4e9a0802abbeb7e61994 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 5 Nov 2025 06:32:03 -0300
Subject: [PATCH 5520/6226] clblas: fix build on darwin

---
 pkgs/by-name/cl/clblas/package.nix | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/cl/clblas/package.nix b/pkgs/by-name/cl/clblas/package.nix
index 27e32115e82d..f77834528d23 100644
--- a/pkgs/by-name/cl/clblas/package.nix
+++ b/pkgs/by-name/cl/clblas/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  llvmPackages_19,
   fetchFromGitHub,
   fetchpatch,
   cmake,
@@ -12,15 +13,19 @@
   opencl-headers,
 }:
 
-stdenv.mkDerivation rec {
+let
+  stdenv' = if stdenv.hostPlatform.isDarwin then llvmPackages_19.stdenv else stdenv;
+in
+
+stdenv'.mkDerivation (finalAttrs: {
   pname = "clblas";
   version = "2.12";
 
   src = fetchFromGitHub {
     owner = "clMathLibraries";
     repo = "clBLAS";
-    rev = "v${version}";
-    sha256 = "154mz52r5hm0jrp5fqrirzzbki14c1jkacj75flplnykbl36ibjs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Wq5oBl3TW3qpK0cyNWVgJMS5/s8xY1dulqDCkkX5lZQ=";
   };
 
   patches = [
@@ -64,15 +69,15 @@ stdenv.mkDerivation rec {
 
   strictDeps = true;
 
-  meta = with lib; {
+  meta = {
     homepage = "https://github.com/clMathLibraries/clBLAS";
     description = "Software library containing BLAS functions written in OpenCL";
     longDescription = ''
       This package contains a library of BLAS functions on top of OpenCL.
     '';
-    license = licenses.asl20;
+    license = lib.licenses.asl20;
     maintainers = [ ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 
-}
+})

From e687c0a5027967b74e07f8da6a9f57a9ca46561a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 09:32:31 +0000
Subject: [PATCH 5521/6226] maestro: 2.0.8 -> 2.0.9

---
 pkgs/by-name/ma/maestro/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/maestro/package.nix b/pkgs/by-name/ma/maestro/package.nix
index 3eb5260d0b42..169dedbf9eb8 100644
--- a/pkgs/by-name/ma/maestro/package.nix
+++ b/pkgs/by-name/ma/maestro/package.nix
@@ -10,11 +10,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "maestro";
-  version = "2.0.8";
+  version = "2.0.9";
 
   src = fetchurl {
     url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${finalAttrs.version}/maestro.zip";
-    hash = "sha256-VBXpbEdGWY5v9E0GT+2Q9hko8lZoVmE1T7FzrQL/cs4=";
+    hash = "sha256-b1p50qqNvwqku3pv3dylkRgsZnZwExwx95RQ6zV5pQM=";
   };
 
   dontUnpack = true;

From 5de6e6c770a985e16b40df57a87c61d7d0caf226 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Tue, 4 Nov 2025 11:44:59 +0100
Subject: [PATCH 5522/6226] rare-regex: cleanup

---
 pkgs/by-name/ra/rare-regex/package.nix | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/ra/rare-regex/package.nix b/pkgs/by-name/ra/rare-regex/package.nix
index cf234ea704e4..64926044ed24 100644
--- a/pkgs/by-name/ra/rare-regex/package.nix
+++ b/pkgs/by-name/ra/rare-regex/package.nix
@@ -9,14 +9,14 @@
   rare-regex,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "rare";
   version = "0.5.2";
 
   src = fetchFromGitHub {
     owner = "zix99";
     repo = "rare";
-    rev = version;
+    tag = finalAttrs.version;
     hash = "sha256-tzAbt9THSTYDvooU7yNQJhJaFM1bcKCabDNtiMpux3Q=";
   };
 
@@ -28,9 +28,13 @@ buildGoModule rec {
 
   ldflags = [
     "-s"
-    "-w"
-    "-X=main.version=${version}"
-    "-X=main.buildSha=${src.rev}"
+    "-X=main.version=${finalAttrs.version}"
+    "-X=main.buildSha=${finalAttrs.src.tag}"
+  ];
+
+  # Skip tests try /dev.
+  checkFlags = [
+    "-skip=TestNoMountTraverseWithSymlink"
   ];
 
   tags = lib.optionals withPcre2 [
@@ -43,11 +47,12 @@ buildGoModule rec {
     };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Fast text scanner/regex extractor and realtime summarizer";
     homepage = "https://rare.zdyn.net";
-    changelog = "https://github.com/zix99/rare/releases/tag/${src.rev}";
-    license = licenses.gpl3Plus;
     maintainers = [ ];
+    changelog = "https://github.com/zix99/rare/releases/tag/${finalAttrs.src.tag}";
+    license = lib.licenses.gpl3Plus;
+    mainProgram = "rare";
   };
-}
+})

From 7bd3c7c0b62a12bb589f9b133c550083ee8101c7 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Wed, 5 Nov 2025 10:34:51 +0100
Subject: [PATCH 5523/6226] rare-regex: add liberodark to maintainers

---
 pkgs/by-name/ra/rare-regex/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ra/rare-regex/package.nix b/pkgs/by-name/ra/rare-regex/package.nix
index 64926044ed24..fa73b413b681 100644
--- a/pkgs/by-name/ra/rare-regex/package.nix
+++ b/pkgs/by-name/ra/rare-regex/package.nix
@@ -50,7 +50,7 @@ buildGoModule (finalAttrs: {
   meta = {
     description = "Fast text scanner/regex extractor and realtime summarizer";
     homepage = "https://rare.zdyn.net";
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ liberodark ];
     changelog = "https://github.com/zix99/rare/releases/tag/${finalAttrs.src.tag}";
     license = lib.licenses.gpl3Plus;
     mainProgram = "rare";

From 191d006b9c3032ad628266a884f4e85a374b1342 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 10:08:21 +0000
Subject: [PATCH 5524/6226] vimPlugins.fff-nvim: e8850c3-unstable-2025-10-20 ->
 65aeacf-unstable-2025-11-03

---
 .../editors/vim/plugins/non-generated/fff-nvim/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
index ca3e0231ecd3..8f2f04b5ce86 100644
--- a/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
+++ b/pkgs/applications/editors/vim/plugins/non-generated/fff-nvim/default.nix
@@ -9,12 +9,12 @@
   nix-update-script,
 }:
 let
-  version = "e8850c3-unstable-2025-10-20";
+  version = "65aeacf-unstable-2025-11-03";
   src = fetchFromGitHub {
     owner = "dmtrKovalenko";
     repo = "fff.nvim";
-    rev = "e8850c3c62a13e92f71233350962e842fcabf01b";
-    hash = "sha256-qyzM45FaXqLipnBW2zTao2SvY21qiFsdsX+Mn2Tu3xI=";
+    rev = "65aeacf9e2c663c9af2b1003727aa25acac96db4";
+    hash = "sha256-rGfV/BxSwvcNZXmVUk54gni8fKFyoTsQl+gBtYci4jE=";
   };
   fff-nvim-lib = rustPlatform.buildRustPackage {
     pname = "fff-nvim-lib";

From 206ef38a8da7bafda984ea4b5999fa5988a8c4ec Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:43:10 +0530
Subject: [PATCH 5525/6226] cosmic-applets: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-applets/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix
index a772dbdb9f47..42ce68adc96a 100644
--- a/pkgs/by-name/co/cosmic-applets/package.nix
+++ b/pkgs/by-name/co/cosmic-applets/package.nix
@@ -20,14 +20,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-applets";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-applets";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-hBqsFiH2zKwGN9tWEf4iDoVcwssj7YN+7+2ooVNKszs=";
+    hash = "sha256-GYn8qz1rpfKxC493Us6XMge+V9nUCEBKPkKNCHy8Bik=";
   };
 
   cargoHash = "sha256-HLbcTDwS5IvolEMb0bZr4CPjtEjZI8G+AggXifIDiKM=";

From 921cef2909c1eaa6d591ae7a566fadaefd878aa5 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:43:22 +0530
Subject: [PATCH 5526/6226] cosmic-applibrary: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-applibrary/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-applibrary/package.nix
index db0b6eb60f54..c9c69719c081 100644
--- a/pkgs/by-name/co/cosmic-applibrary/package.nix
+++ b/pkgs/by-name/co/cosmic-applibrary/package.nix
@@ -11,14 +11,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-applibrary";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-applibrary";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-KmLRXQMpJ7kO5gTguLgtX5rztDyEqyRhaqlWzlfDth4=";
+    hash = "sha256-owvAwJR4spwQoHotgjMANWXsTRgPhwK7v8OgTuSaAHw=";
   };
 
   cargoHash = "sha256-CX1/6fXL63P1J6yjvFKd91WqSf4+mf+GOtX1O9fHfgg=";

From 2ab446521325d4188bbcb809dfb22cd0fe09530f Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:43:32 +0530
Subject: [PATCH 5527/6226] cosmic-bg: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-bg/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix
index 142c5f88f86f..5f41f96275b4 100644
--- a/pkgs/by-name/co/cosmic-bg/package.nix
+++ b/pkgs/by-name/co/cosmic-bg/package.nix
@@ -13,14 +13,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-bg";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-bg";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-mF6W/RND9cNfS27lQNZRcXY4OUMS+UUMMcEalBQ59Yg=";
+    hash = "sha256-RPVPiMEwMh4DRixaC8A4oK9KzGIbi2CFlVAthICalt0=";
   };
 
   postPatch = ''

From 7adaf70f22c78af17d52a6dab42ef2c319e46a48 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:43:43 +0530
Subject: [PATCH 5528/6226] cosmic-comp: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-comp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix
index e16419039aaa..a609badc97a3 100644
--- a/pkgs/by-name/co/cosmic-comp/package.nix
+++ b/pkgs/by-name/co/cosmic-comp/package.nix
@@ -20,14 +20,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-comp";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-comp";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-vdpKxXkC6Z8ySa21jZ5zF2aqwLY7dt2FpQbfbZkgu+c=";
+    hash = "sha256-jy1xjdihkd+RvXQVOwaTVNoQfbH6mlthStHpEMjkuGs=";
   };
 
   cargoHash = "sha256-Gk2vXmVMcDWg3VnI0176eKF65tAfPwVZ74oQtD0UBO8=";

From 4eec07e67d7e11c751f63686b5ecbd5f9540eb5e Mon Sep 17 00:00:00 2001
From: chillcicada <2210227279@qq.com>
Date: Wed, 5 Nov 2025 18:13:49 +0800
Subject: [PATCH 5529/6226] typstfmt: drop

---
 pkgs/by-name/ty/typstfmt/package.nix | 30 ----------------------------
 pkgs/top-level/aliases.nix           |  1 +
 2 files changed, 1 insertion(+), 30 deletions(-)
 delete mode 100644 pkgs/by-name/ty/typstfmt/package.nix

diff --git a/pkgs/by-name/ty/typstfmt/package.nix b/pkgs/by-name/ty/typstfmt/package.nix
deleted file mode 100644
index 022ca537797c..000000000000
--- a/pkgs/by-name/ty/typstfmt/package.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-  lib,
-  rustPlatform,
-  fetchFromGitHub,
-}:
-
-rustPlatform.buildRustPackage rec {
-  pname = "typstfmt";
-  version = "0.2.10";
-
-  src = fetchFromGitHub {
-    owner = "astrale-sharp";
-    repo = "typstfmt";
-    rev = version;
-    hash = "sha256-JsNaHeFYr92VdruE87dLj2kPGc9M+ww7AGiGO4Gbbr0=";
-  };
-
-  cargoHash = "sha256-sY2LLBsyRt7Zc84//WZWNq6e7Vx/TtPC/zoDF2Ug7yQ=";
-
-  meta = {
-    changelog = "https://github.com/astrale-sharp/typstfmt/blob/${src.rev}/CHANGELOG.md";
-    description = "Formatter for the Typst language";
-    homepage = "https://github.com/astrale-sharp/typstfmt";
-    license = lib.licenses.mit;
-    mainProgram = "typstfmt";
-    maintainers = with lib.maintainers; [
-      geri1701
-    ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8e4071c5bcc9..a98d9f97a0af 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1522,6 +1522,7 @@ mapAliases {
   tt-rss-plugin-freshapi = throw "'tt-rss-plugin-freshapi' has been removed, as tt-rss was discontinued and removed"; # Added 2025-10-03
   tvbrowser-bin = throw "'tvbrowser-bin' has been renamed to/replaced by 'tvbrowser'"; # Converted to throw 2025-10-27
   typst-fmt = throw "'typst-fmt' has been renamed to/replaced by 'typstfmt'"; # Converted to throw 2025-10-27
+  typstfmt = throw "'typstfmt' has been removed due to lack of upstream maintenance, consider using 'typstyle' instead"; # Added 2025-10-26
   uade123 = throw "'uade123' has been renamed to/replaced by 'uade'"; # Converted to throw 2025-10-27
   uae = throw "'uae' has been removed due to lack of upstream maintenance. Consider using 'fsuae' instead."; # Added 2025-06-11
   ubuntu_font_family = throw "'ubuntu_font_family' has been renamed to/replaced by 'ubuntu-classic'"; # Converted to throw 2025-10-27

From 71fb6e8503ed9bb1581b2a8dd677b33a041a53f8 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:43:53 +0530
Subject: [PATCH 5530/6226] cosmic-edit: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-edit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix
index 4a9a8d9c86f3..cb99f4c34e3c 100644
--- a/pkgs/by-name/co/cosmic-edit/package.nix
+++ b/pkgs/by-name/co/cosmic-edit/package.nix
@@ -16,14 +16,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-edit";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-edit";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-xlw4lLfg5d9lyl3+efv6GBLtBvuFex4Zbnos2HbKp20=";
+    hash = "sha256-ARGZ4yRbh2FJHeVSwXcQm5WjnJL16PDC9bjLmlHW8ig=";
   };
 
   cargoHash = "sha256-Ot69WdCvdT8xg3/LPMb8C5Rdq04Mvmr5VLS+adnvuvY=";

From 1e18d5572abcb9dfce70e37f50277e0daefc7a10 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:44:05 +0530
Subject: [PATCH 5531/6226] cosmic-files: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-files/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix
index 13252ffdf9de..38fa2358ad07 100644
--- a/pkgs/by-name/co/cosmic-files/package.nix
+++ b/pkgs/by-name/co/cosmic-files/package.nix
@@ -12,17 +12,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-files";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-files";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-DbxA2lAPVNdel02NeuACucCyGcsNjT0MxJMzeGF3JzY=";
+    hash = "sha256-nb/2ax+W/cc7o5UfdAXgDdDvQIFBCqIfIDR3COcxC3A=";
   };
 
-  cargoHash = "sha256-TovOJVe16VJZ9Ul2JQc/No8f0WzaYfWI1LmzhHxdKsM=";
+  cargoHash = "sha256-3rOWm9nwsTBNoE2rR2E2wiql+JQnd2Jv4apt6tPuIqs=";
 
   nativeBuildInputs = [
     just

From 862535bb0500f5f9711f70ab0e7d8fe52ce73740 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:44:17 +0530
Subject: [PATCH 5532/6226] cosmic-greeter: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-greeter/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix
index 749bfe2a1164..1033a24245dd 100644
--- a/pkgs/by-name/co/cosmic-greeter/package.nix
+++ b/pkgs/by-name/co/cosmic-greeter/package.nix
@@ -19,20 +19,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-greeter";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-greeter";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-kp5DSr/RxWhv35VKAc8xSAprM1Hbo84/oB8h0XBSmTE=";
+    hash = "sha256-E0oQ4oinx6tdZ13jCWOJ5vtebocRbnaQbBk61UcRfD8=";
   };
 
   cargoHash = "sha256-4yRBgFrH4RBpuvChTED+ynx+PyFumoT2Z+R1gXxF4Xc=";
 
   env = {
-    VERGEN_GIT_COMMIT_DATE = "2025-10-14";
+    VERGEN_GIT_COMMIT_DATE = "2025-11-04";
     VERGEN_GIT_SHA = finalAttrs.src.tag;
   };
 

From 6c0e020df48174a72286fb29617c4a282c77d47f Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:44:38 +0530
Subject: [PATCH 5533/6226] cosmic-icons: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-icons/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix
index a2cb92b79d64..9f4af0957ca0 100644
--- a/pkgs/by-name/co/cosmic-icons/package.nix
+++ b/pkgs/by-name/co/cosmic-icons/package.nix
@@ -9,7 +9,7 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cosmic-icons";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 5a2424e0db16939fde3688813c6dbdbba8778cd2 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:44:50 +0530
Subject: [PATCH 5534/6226] cosmic-idle: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-idle/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix
index b8b755639230..fd92cf7b5658 100644
--- a/pkgs/by-name/co/cosmic-idle/package.nix
+++ b/pkgs/by-name/co/cosmic-idle/package.nix
@@ -16,7 +16,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-idle";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From e25b70506a15d84acbd85c81f85370093e304364 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:45:02 +0530
Subject: [PATCH 5535/6226] cosmic-initial-setup: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-initial-setup/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-initial-setup/package.nix b/pkgs/by-name/co/cosmic-initial-setup/package.nix
index a08c70737f5a..9eb2a90ba0fb 100644
--- a/pkgs/by-name/co/cosmic-initial-setup/package.nix
+++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix
@@ -14,17 +14,17 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-initial-setup";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-initial-setup";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-sgtZioUvBDSqlBVWbqGc2iVpZKF0fn/Mr1qo1qlzdlA=";
+    hash = "sha256-SDLdVTY7Fj8ZLHpZLaTlGy7sAqs/4eAVSjwBugownFM=";
   };
 
-  cargoHash = "sha256-orwK9gcFXK4/+sfwRubcz0PP6YAFqsENRHnlSLttLxM=";
+  cargoHash = "sha256-jOPJiKPE3UUD/QHmb+6s6l2RVhtUFls3QRGQ6DmEFSE=";
 
   buildFeatures = [ "nixos" ];
 

From 72d8da474d1f78858eece25c9d6f3d7357616031 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:45:15 +0530
Subject: [PATCH 5536/6226] cosmic-launcher: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-launcher/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix
index 3da71420e66c..728aa16fd143 100644
--- a/pkgs/by-name/co/cosmic-launcher/package.nix
+++ b/pkgs/by-name/co/cosmic-launcher/package.nix
@@ -11,14 +11,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-launcher";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-launcher";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-xhK80oKZFFvz+dPKBm1hcVXk9G7GofqEmwAdyzhOJqI=";
+    hash = "sha256-WLvntcBgzG1iTDN5zPAa9gYaUb1yxyQPbqXZPDaycfo=";
   };
 
   cargoHash = "sha256-2kkKPU4iEsInLwJyEyJ15/T1pVfDsKD69DISGilNWws=";

From efd55155164b60251e53ea80b404d4b577858d0f Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:45:27 +0530
Subject: [PATCH 5537/6226] cosmic-notifications: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-notifications/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix
index 8f6e2bf57bc9..f798679d0a3e 100644
--- a/pkgs/by-name/co/cosmic-notifications/package.nix
+++ b/pkgs/by-name/co/cosmic-notifications/package.nix
@@ -12,14 +12,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-notifications";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-notifications";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-cr8nG9Mj2CZNj+SgOYFScPVAvj71z3jTxCfbQoTJjqs=";
+    hash = "sha256-OK+6qSQuu44t1uMt9ESg2L9h47wQmiCh1iZfXkO1vE0=";
   };
 
   cargoHash = "sha256-kLvfZBHJbVSceqKuB9XFshTH4Sl54hKfm8H90RUszKk=";

From 2fd5d3879e145b8454a5ddb1ba775c2601b6d092 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:45:40 +0530
Subject: [PATCH 5538/6226] cosmic-osd: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-osd/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix
index cea55d37be18..a135749164f4 100644
--- a/pkgs/by-name/co/cosmic-osd/package.nix
+++ b/pkgs/by-name/co/cosmic-osd/package.nix
@@ -13,14 +13,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-osd";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-osd";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-xGVB1RGbraTUORcEE5I70wxwnUpe/itMQyNaxCh1bfY=";
+    hash = "sha256-JClwgNfTiGrXVMheRmHuiDBwvUQJqgF4GCe4IWUk87E=";
   };
 
   cargoHash = "sha256-v6/lWqGG3uFSFgw77M0kGM+cK9wSiuaGaciPqz/wFIQ=";

From 4cba284228ae119ba02c4af6582111ae6ff29733 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:45:56 +0530
Subject: [PATCH 5539/6226] cosmic-panel: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-panel/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix
index 55b27b92e7d1..cee1d116df00 100644
--- a/pkgs/by-name/co/cosmic-panel/package.nix
+++ b/pkgs/by-name/co/cosmic-panel/package.nix
@@ -11,14 +11,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-panel";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-panel";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-d21/ydBbT/lWudx9+hEDu7PlbIbORr3tqWcvMzenxr8=";
+    hash = "sha256-a23VexqsWz2e6/gTw6pbrTwRgU2c+y740zhn5g0u4nk=";
   };
 
   cargoHash = "sha256-8KOl581VmsfE7jiVFXy3ZDIfAqnaJuiDd7paqiFI/mk=";

From 31ea256cb177c3cc77776129f79915c5f2fd8d7a Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:46:05 +0530
Subject: [PATCH 5540/6226] cosmic-player: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-player/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix
index 0171b31bb22c..e6cb1c93dea2 100644
--- a/pkgs/by-name/co/cosmic-player/package.nix
+++ b/pkgs/by-name/co/cosmic-player/package.nix
@@ -18,14 +18,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-player";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-player";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-+LMXtiUxal4xSmtG9vHDSZxwzyjOhmS6ZZ7HppB7p7w=";
+    hash = "sha256-311CPeMEU/7yEXgdnW3woEaz0+35hP+lhy/Giek3ZBE=";
   };
 
   cargoHash = "sha256-fnX5BkzRAetKxHZ9XyWdmG6TSxFqGJsmg16zlpYG9Ag=";

From 59d5b6bc48594df5e75c0d817d66793d2055a2e1 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:46:16 +0530
Subject: [PATCH 5541/6226] cosmic-randr: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-randr/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix
index 518e295d8b9e..945e3df455f2 100644
--- a/pkgs/by-name/co/cosmic-randr/package.nix
+++ b/pkgs/by-name/co/cosmic-randr/package.nix
@@ -12,7 +12,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-randr";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 3e259b7127ee3dc03954a3be3b4c3a8e29b5efda Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:46:30 +0530
Subject: [PATCH 5542/6226] cosmic-screenshot: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-screenshot/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix
index baa1579bfaf3..f2ba977290ab 100644
--- a/pkgs/by-name/co/cosmic-screenshot/package.nix
+++ b/pkgs/by-name/co/cosmic-screenshot/package.nix
@@ -10,14 +10,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-screenshot";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-screenshot";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-ZvbYb3gkA5cLcIulUQID8lj9USu6EurPUUMEdaGnZak=";
+    hash = "sha256-LaKopOd7HuDvXfE9zudoudCxGYfMkpru/PISzIrEARo=";
   };
 
   cargoHash = "sha256-O8fFeg1TkKCg+QbTnNjsH52xln4+ophh/BW/b4zQs9o=";

From d8ab707ce0eb15268b80f5dd32cb6a6e2eaa87a5 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:46:39 +0530
Subject: [PATCH 5543/6226] cosmic-session: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-session/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix
index aad3864e1687..f58f710397b1 100644
--- a/pkgs/by-name/co/cosmic-session/package.nix
+++ b/pkgs/by-name/co/cosmic-session/package.nix
@@ -11,14 +11,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-session";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-session";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-vt6Tjo2N8eh4Js0mdXSdHjke/W+chl6YH5W7Xl1BUdo=";
+    hash = "sha256-ZmZxah5mRY14LeUTGBTljlUP7MaGxwguiwTzL1rhMHY=";
   };
 
   cargoHash = "sha256-bo46A7hS1U0cOsa/T4oMTKUTjxVCaGuFdN2qCjVHxhg=";

From f0f6bbeff4e9bc6ceb1a99343bafe018b9c8f760 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:46:52 +0530
Subject: [PATCH 5544/6226] cosmic-settings: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-settings/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix
index 4a23b3c29c3e..5d6644c21bfe 100644
--- a/pkgs/by-name/co/cosmic-settings/package.nix
+++ b/pkgs/by-name/co/cosmic-settings/package.nix
@@ -27,14 +27,14 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-settings";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-n7+8XKDCTyjpJff/0o5VY5NbcQe9i+pn3Mgf8IV12m0=";
+    hash = "sha256-iCwuURekZe9iPQVfHf4fPE31dGDEe25di2oFRhLLu6g=";
   };
 
   cargoHash = "sha256-mMfKY+ouszbN2rEf6zvv1Sc1FEZ/ZVuQ6RXGMBFDwIE=";

From 98f09e701195e41f3e4a1622b68d8deec2a1b3b7 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:47:03 +0530
Subject: [PATCH 5545/6226] cosmic-settings-daemon: 1.0.0-beta.4 ->
 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-settings-daemon/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
index 2f2d5b28bcdd..5f3bfed3ea63 100644
--- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix
+++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix
@@ -15,7 +15,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-settings-daemon";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From e77dce292a8df8932fdd85335cebb71332aa5b73 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:47:17 +0530
Subject: [PATCH 5546/6226] cosmic-store: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-store/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix
index b77e55c71c65..9a3962a50d1a 100644
--- a/pkgs/by-name/co/cosmic-store/package.nix
+++ b/pkgs/by-name/co/cosmic-store/package.nix
@@ -15,14 +15,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-store";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-store";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-D/P6abNqH++GWBfqZYqGjH3YV+jyyBo/8R3veLm1NRo=";
+    hash = "sha256-6qGfBgbmQVhX0nXH+HhA67MeFpTXQ9zlcdlZh0suF50=";
   };
 
   cargoHash = "sha256-nJLowAuWvj5JfmPyExQyfCJ9pqNJ0OdzPPku9z7RDWc=";

From dd78bd2aeacaf038be6ef1b060fb160cb021c604 Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:47:26 +0530
Subject: [PATCH 5547/6226] cosmic-term: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-term/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix
index fa0a00a1f319..9aecf681cb2f 100644
--- a/pkgs/by-name/co/cosmic-term/package.nix
+++ b/pkgs/by-name/co/cosmic-term/package.nix
@@ -15,17 +15,17 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-term";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "cosmic-term";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-U1/6IgnqNN9ccnh0IFuDkkurFN0JxmXJltns6Vv6/9A=";
+    hash = "sha256-qlU/XSfzAj4Y20wEzsJnzko4lMh/mw4qMKeBe5autZA=";
   };
 
-  cargoHash = "sha256-oiZjX53CQA53mMNfmmnyzWGAiZRA+4BxOxEvbEFd8q8=";
+  cargoHash = "sha256-tuZHCYfHp/jN/zn8SBLhBRBWJkuIGhndFLskFqQ+CJs=";
 
   nativeBuildInputs = [
     just

From ff2b40ae4110ca6bac168875972a57b1d7c2e2fc Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:47:37 +0530
Subject: [PATCH 5548/6226] cosmic-wallpapers: 1.0.0-beta.4 -> 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-wallpapers/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix
index 8e360bc330f9..2473a9823ea3 100644
--- a/pkgs/by-name/co/cosmic-wallpapers/package.nix
+++ b/pkgs/by-name/co/cosmic-wallpapers/package.nix
@@ -7,7 +7,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "cosmic-wallpapers";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From aa4a0ec0c36f732edfe28d27a3e850599cf4244f Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:47:50 +0530
Subject: [PATCH 5549/6226] cosmic-workspaces-epoch: 1.0.0-beta.4 ->
 1.0.0-beta.5

---
 pkgs/by-name/co/cosmic-workspaces-epoch/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
index 94ed619652a0..63840bde8bc5 100644
--- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
+++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
@@ -14,7 +14,7 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cosmic-workspaces-epoch";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {

From 687f7fcad6c772a13207acff8e98c0888a598b6a Mon Sep 17 00:00:00 2001
From: Pratham Patel <prathampatel@thefossguy.com>
Date: Wed, 5 Nov 2025 15:48:02 +0530
Subject: [PATCH 5550/6226] xdg-desktop-portal-cosmic: 1.0.0-beta.4 ->
 1.0.0-beta.5

---
 pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
index 579587a347fc..81fae7c36cfc 100644
--- a/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
+++ b/pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
@@ -16,14 +16,14 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "xdg-desktop-portal-cosmic";
-  version = "1.0.0-beta.4";
+  version = "1.0.0-beta.5";
 
   # nixpkgs-update: no auto update
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "xdg-desktop-portal-cosmic";
     tag = "epoch-${finalAttrs.version}";
-    hash = "sha256-Ea6V4lob7vKo+cf1GcNlzKqqSjO1bEqzvbRnYKLyshA=";
+    hash = "sha256-ONAj1yfTL6VdpK1iO89ika/HBFBADdaGQPZ1ml8vg1g=";
   };
 
   cargoHash = "sha256-V1tFOZa2f+Z0MMuIoHlbB7BrXfsUhmuhoqOu9fjteEA=";

From 2144661f06c794057adeb6a1d516b07f1791c1bc Mon Sep 17 00:00:00 2001
From: Christoph Jabs <contact@christophjabs.info>
Date: Wed, 5 Nov 2025 12:03:32 +0200
Subject: [PATCH 5551/6226] python3Packages.clingo: init at 5.8.0

---
 pkgs/by-name/cl/clingo/package.nix | 23 ++++++++++++++++++++++-
 pkgs/top-level/python-packages.nix |  7 +++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/cl/clingo/package.nix b/pkgs/by-name/cl/clingo/package.nix
index 28474d20c47f..af8d7f3372c8 100644
--- a/pkgs/by-name/cl/clingo/package.nix
+++ b/pkgs/by-name/cl/clingo/package.nix
@@ -3,6 +3,8 @@
   stdenv,
   fetchFromGitHub,
   cmake,
+  withPython ? false,
+  python ? null,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -18,7 +20,26 @@ stdenv.mkDerivation (finalAttrs: {
 
   nativeBuildInputs = [ cmake ];
 
-  cmakeFlags = [ "-DCLINGO_BUILD_WITH_PYTHON=OFF" ];
+  cmakeFlags =
+    if withPython then
+      [
+        "-DCLINGO_BUILD_WITH_PYTHON=ON"
+        "-DPYTHON_EXECUTABLE=${lib.getExe python.pythonOnBuildForHost}"
+      ]
+    else
+      [ "-DCLINGO_BUILD_WITH_PYTHON=OFF" ];
+
+  propagatedBuildInputs = lib.optionals withPython (
+    with python.pkgs;
+    [
+      python
+      cffi
+    ]
+  );
+
+  pythonImportsCheck = [
+    "clingo"
+  ];
 
   meta = {
     description = "ASP system to ground and solve logic programs";
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f22805eed7cc..cf71f63dfc80 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -2717,6 +2717,13 @@ self: super: with self; {
 
   clikit = callPackage ../development/python-modules/clikit { };
 
+  clingo = toPythonModule (
+    pkgs.clingo.override {
+      inherit python;
+      withPython = true;
+    }
+  );
+
   clint = callPackage ../development/python-modules/clint { };
 
   clintermission = callPackage ../development/python-modules/clintermission { };

From e62c3f9317c22f3560d5bb660140c55b856113f1 Mon Sep 17 00:00:00 2001
From: 7c6f434c <7c6f434c@mail.ru>
Date: Wed, 5 Nov 2025 11:44:13 +0100
Subject: [PATCH 5552/6226] libreoffice: disable tests that break after global
 Noto fonts bump

---
 .../libreoffice/skip-broken-tests.patch       | 37 +++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/pkgs/applications/office/libreoffice/skip-broken-tests.patch b/pkgs/applications/office/libreoffice/skip-broken-tests.patch
index 244935348161..fa66144a0cca 100644
--- a/pkgs/applications/office/libreoffice/skip-broken-tests.patch
+++ b/pkgs/applications/office/libreoffice/skip-broken-tests.patch
@@ -151,3 +151,40 @@ index e37df27fd817..937c12e8c4c5 100644
      createSwDoc();
      SwDoc* pDoc = getSwDoc();
      IDocumentMarkAccess* pMarkAccess = pDoc->getIDocumentMarkAccess();
+
+--- a/sw/qa/extras/layout/layout4.cxx	2025-11-05 10:23:47.982125220 +0100
++++ b/sw/qa/extras/layout/layout4.cxx	2025-11-05 10:24:21.813125756 +0100
+@@ -1647,6 +1647,7 @@
+ 
+ CPPUNIT_TEST_FIXTURE(SwLayoutWriter4, TestTdf162314)
+ {
++    return ; // Missing glyphs in the system font version
+     // Regression test for bidi portion line breaking where the portion layout ends with underflow,
+     // but the bidi portion should not be truncated.
+     createSwDoc("tdf162314.fodt");
+--- a/vcl/qa/cppunit/pdfexport/pdfexport2.cxx	2025-11-05 10:25:25.693126767 +0100
++++ b/vcl/qa/cppunit/pdfexport/pdfexport2.cxx	2025-11-05 10:27:38.216128865 +0100
+@@ -5127,6 +5127,7 @@
+ // tdf#134226 - Tests that shaping is not broken by invisible spans
+ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf134226)
+ {
++    return ; // flaky layout test; depends on system font versions?
+     saveAsPDF(u"tdf134226-shadda-in-hidden-span.fodt");
+     std::unique_ptr<vcl::pdf::PDFiumDocument> pPdfDocument = parsePDFExport();
+ 
+@@ -5605,6 +5606,7 @@
+ // tdf#151748 - Textboxes should validate kashida positions
+ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf151748KashidaSpace)
+ {
++    return ; // flaky layout test; depends on the system font versions?
+     saveAsPDF(u"tdf151748.fodt");
+ 
+     auto pPdfDocument = parsePDFExport();
+@@ -5665,6 +5667,7 @@
+ // tdf#163105 - Writer kashida justification should expand spaces
+ CPPUNIT_TEST_FIXTURE(PdfExportTest2, testTdf163105SwKashidaSpaceExpansion)
+ {
++    return ; // flaky layout test; depends on the system font versions?
+     saveAsPDF(u"tdf163105-kashida-spaces.fodt");
+ 
+     auto pPdfDocument = parsePDFExport();

From cea774d86156ba8a3a46975ee46b3bed56645271 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 10:52:33 +0000
Subject: [PATCH 5553/6226] auto-editor: 29.3.0 -> 29.3.1

---
 pkgs/by-name/au/auto-editor/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/au/auto-editor/package.nix b/pkgs/by-name/au/auto-editor/package.nix
index ab70b3430e0e..d633900da86c 100644
--- a/pkgs/by-name/au/auto-editor/package.nix
+++ b/pkgs/by-name/au/auto-editor/package.nix
@@ -25,13 +25,13 @@
 
 buildNimPackage rec {
   pname = "auto-editor";
-  version = "29.3.0";
+  version = "29.3.1";
 
   src = fetchFromGitHub {
     owner = "WyattBlue";
     repo = "auto-editor";
     tag = version;
-    hash = "sha256-xftXeUu1Weia4WHUVy7Q20w9TRvXSjEHVw4rZ7C2M0U=";
+    hash = "sha256-Nne6niGnhaEQNvvFURmF0N9oyuG1ZvJ4NzxddJdSQtY=";
   };
 
   lockFile = ./lock.json;

From 39114fe3d73f6ecfcb7dd407cb88f13c6f86c7e9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 11:14:17 +0000
Subject: [PATCH 5554/6226] terraform-providers.yandex-cloud_yandex: 0.168.0 ->
 0.169.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 6dcb45deab78..89cc4d164979 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1498,12 +1498,12 @@
     "vendorHash": "sha256-Z4DfoG4ApXbPNXZs9YvBWQj1bH7moLNI6P+nKDHt/Jc="
   },
   "yandex-cloud_yandex": {
-    "hash": "sha256-jzACS+vNAiUp7GJt3jO8lTbQZpSj5vUhB1aD0iRi6Gk=",
+    "hash": "sha256-uiNLW1Xis+14xksJ9OAItQX60HMyCC6b1ey/0nqlDro=",
     "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex",
     "owner": "yandex-cloud",
     "repo": "terraform-provider-yandex",
-    "rev": "v0.168.0",
+    "rev": "v0.169.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-NCUk8tBJnIKziowss/nm6pEgI2Yn/q6hnfvoMTTP8nQ="
+    "vendorHash": "sha256-MXDGI1s9dRwpbJ45ivPyy26jjTC552r3xqnLG6Sx3yY="
   }
 }

From e07f0ae083491a5094f7204ed0453ac08d3edb5c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 11:18:51 +0000
Subject: [PATCH 5555/6226] linuxKernel.kernels.linux_lqx: 6.17.5 -> 6.17.7

---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index d0f7d0a4e830..ab7002b0886c 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -23,9 +23,9 @@ let
     };
     # ./update-zen.py lqx
     lqx = {
-      version = "6.17.5"; # lqx
+      version = "6.17.7"; # lqx
       suffix = "lqx1"; # lqx
-      sha256 = "1jgwpxw1h27kphj0rrf1b9dbhj4jlycr6lnykv8dhf3m0p5vjn46"; # lqx
+      sha256 = "0cp625hcli2grmmkxfrja71slfl2j1pqds74a56sbx7irk82zwdh"; # lqx
       isLqx = true;
     };
   };

From 4fee05e273d65958e88fce001ebd0302d48cfb51 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 11:19:17 +0000
Subject: [PATCH 5556/6226] oh-my-zsh: 2025-10-27 -> 2025-11-03

---
 pkgs/by-name/oh/oh-my-zsh/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/oh/oh-my-zsh/package.nix b/pkgs/by-name/oh/oh-my-zsh/package.nix
index 1aa961d3e26c..59a81074bce0 100644
--- a/pkgs/by-name/oh/oh-my-zsh/package.nix
+++ b/pkgs/by-name/oh/oh-my-zsh/package.nix
@@ -19,14 +19,14 @@
 }:
 
 stdenv.mkDerivation rec {
-  version = "2025-10-27";
+  version = "2025-11-03";
   pname = "oh-my-zsh";
 
   src = fetchFromGitHub {
     owner = "ohmyzsh";
     repo = "ohmyzsh";
-    rev = "136298e11073c7b34e5a977595c7ba5345ca910e";
-    sha256 = "sha256-4yF9gqC1TJdLAOASp8nP1GTnA2OQVNXrjBlHyyYXDW0=";
+    rev = "90a22b61e66dbd83928be7b9739de554a5f1c09d";
+    sha256 = "sha256-ODtuQ/jqo0caw4l/8tUe/1TizAaAA/bSqZhIEjSuVi8=";
   };
 
   strictDeps = true;

From 80f024cbd771b5a622027015f6f1a71d9caa93f4 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 5 Nov 2025 08:21:25 -0300
Subject: [PATCH 5557/6226] treewide: mark as broken on darwin (last successful
 Hydra build in 2023)

---
 pkgs/by-name/cc/cccc/package.nix                 | 2 ++
 pkgs/by-name/cp/cpp-ipfs-http-client/package.nix | 2 ++
 pkgs/by-name/do/doomseeker/package.nix           | 2 ++
 pkgs/by-name/gf/gforth/package.nix               | 4 +++-
 pkgs/by-name/gl/glicol-cli/package.nix           | 2 ++
 pkgs/by-name/gl/gloox/package.nix                | 2 ++
 pkgs/by-name/gt/gtkgnutella/package.nix          | 2 ++
 pkgs/by-name/pm/pmenu/package.nix                | 2 ++
 pkgs/by-name/xc/xchainkeys/package.nix           | 2 ++
 pkgs/by-name/ya/yaegi/package.nix                | 3 +++
 pkgs/development/libraries/glew/1.10.nix         | 2 ++
 pkgs/development/libraries/irrlicht/default.nix  | 2 ++
 pkgs/development/libraries/l-smash/default.nix   | 2 ++
 13 files changed, 28 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/cc/cccc/package.nix b/pkgs/by-name/cc/cccc/package.nix
index e6b65fc32799..437a93ea8e5b 100644
--- a/pkgs/by-name/cc/cccc/package.nix
+++ b/pkgs/by-name/cc/cccc/package.nix
@@ -38,5 +38,7 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl2;
     platforms = lib.platforms.unix;
     maintainers = [ ];
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix b/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix
index 322f911d3026..736481da41b9 100644
--- a/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix
+++ b/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix
@@ -43,5 +43,7 @@ stdenv.mkDerivation {
       "x86_64-linux"
       "x86_64-darwin"
     ];
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/do/doomseeker/package.nix b/pkgs/by-name/do/doomseeker/package.nix
index 476c522b4a87..ff1a248d5a5c 100644
--- a/pkgs/by-name/do/doomseeker/package.nix
+++ b/pkgs/by-name/do/doomseeker/package.nix
@@ -56,5 +56,7 @@ stdenv.mkDerivation {
     license = lib.licenses.gpl2Plus;
     platforms = lib.platforms.unix;
     maintainers = [ ];
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/gf/gforth/package.nix b/pkgs/by-name/gf/gforth/package.nix
index 81d57c1b3ff6..6259606c5cce 100644
--- a/pkgs/by-name/gf/gforth/package.nix
+++ b/pkgs/by-name/gf/gforth/package.nix
@@ -60,7 +60,9 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "https://www.gnu.org/software/gforth";
     downloadPage = "https://github.com/forthy42/gforth";
     license = lib.licenses.gpl3Plus;
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64; # segfault when running ./gforthmi
+    # segfault when running ./gforthmi on aarch64 darwin
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
     platforms = lib.platforms.all;
     mainProgram = "gforth";
   };
diff --git a/pkgs/by-name/gl/glicol-cli/package.nix b/pkgs/by-name/gl/glicol-cli/package.nix
index 9cfbbc9b691b..fea22fd02b22 100644
--- a/pkgs/by-name/gl/glicol-cli/package.nix
+++ b/pkgs/by-name/gl/glicol-cli/package.nix
@@ -36,5 +36,7 @@ rustPlatform.buildRustPackage rec {
     license = licenses.mit;
     maintainers = [ ];
     mainProgram = "glicol-cli";
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/gl/gloox/package.nix b/pkgs/by-name/gl/gloox/package.nix
index 71fe57dbeafe..b4d490c2176a 100644
--- a/pkgs/by-name/gl/gloox/package.nix
+++ b/pkgs/by-name/gl/gloox/package.nix
@@ -39,5 +39,7 @@ stdenv.mkDerivation rec {
     license = licenses.gpl3;
     maintainers = [ ];
     platforms = platforms.unix;
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/gt/gtkgnutella/package.nix b/pkgs/by-name/gt/gtkgnutella/package.nix
index c27d79e5be10..eaaf9a136916 100644
--- a/pkgs/by-name/gt/gtkgnutella/package.nix
+++ b/pkgs/by-name/gt/gtkgnutella/package.nix
@@ -67,5 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = [ maintainers.doronbehar ];
     license = licenses.gpl2Plus;
     platforms = platforms.unix;
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })
diff --git a/pkgs/by-name/pm/pmenu/package.nix b/pkgs/by-name/pm/pmenu/package.nix
index 5905b02197bc..71319a7a532a 100644
--- a/pkgs/by-name/pm/pmenu/package.nix
+++ b/pkgs/by-name/pm/pmenu/package.nix
@@ -59,5 +59,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = [ ];
     platforms = lib.platforms.unix;
     mainProgram = "pmenu";
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })
diff --git a/pkgs/by-name/xc/xchainkeys/package.nix b/pkgs/by-name/xc/xchainkeys/package.nix
index dfe0c036e4b2..ac6ec9aa0d47 100644
--- a/pkgs/by-name/xc/xchainkeys/package.nix
+++ b/pkgs/by-name/xc/xchainkeys/package.nix
@@ -22,5 +22,7 @@ stdenv.mkDerivation rec {
     license = lib.licenses.gpl3;
     platforms = lib.platforms.unix;
     mainProgram = "xchainkeys";
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/ya/yaegi/package.nix b/pkgs/by-name/ya/yaegi/package.nix
index 2727ab51586a..030b296e7a92 100644
--- a/pkgs/by-name/ya/yaegi/package.nix
+++ b/pkgs/by-name/ya/yaegi/package.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   lib,
   buildGoModule,
   fetchFromGitHub,
@@ -43,5 +44,7 @@ buildGoModule rec {
     changelog = "https://github.com/traefik/yaegi/releases/tag/${src.rev}";
     license = licenses.asl20;
     maintainers = [ ];
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix
index 30dd8e2a0401..fb53da723d1a 100644
--- a/pkgs/development/libraries/glew/1.10.nix
+++ b/pkgs/development/libraries/glew/1.10.nix
@@ -67,5 +67,7 @@ stdenv.mkDerivation (finalAttrs: {
     #["BSD" "GLX" "SGI-B" "GPL2"]
     pkgConfigModules = [ "glew" ];
     inherit (mesa.meta) platforms;
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })
diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix
index 0995fb7563a0..5215d7d78947 100644
--- a/pkgs/development/libraries/irrlicht/default.nix
+++ b/pkgs/development/libraries/irrlicht/default.nix
@@ -57,5 +57,7 @@ stdenv.mkDerivation {
     license = lib.licenses.zlib;
     description = "Open source high performance realtime 3D engine written in C++";
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/development/libraries/l-smash/default.nix b/pkgs/development/libraries/l-smash/default.nix
index 455223596877..c8e33ae7f07f 100644
--- a/pkgs/development/libraries/l-smash/default.nix
+++ b/pkgs/development/libraries/l-smash/default.nix
@@ -29,5 +29,7 @@ stdenv.mkDerivation rec {
     license = licenses.isc;
     maintainers = [ ];
     platforms = platforms.all;
+    # The last successful Darwin Hydra build was in 2023
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From d1a1a0a1b1d779fb075097f6a7e38a6bbb54074d Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Mon, 20 Oct 2025 14:59:07 +0200
Subject: [PATCH 5558/6226] boringssl: add updateScript

---
 pkgs/by-name/bo/boringssl/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix
index 9efc590eaaa2..54c2c9507013 100644
--- a/pkgs/by-name/bo/boringssl/package.nix
+++ b/pkgs/by-name/bo/boringssl/package.nix
@@ -6,6 +6,7 @@
   ninja,
   perl,
   buildGoModule,
+  gitUpdater,
 }:
 
 # reference: https://boringssl.googlesource.com/boringssl/+/refs/tags/0.20250818.0/BUILDING.md
@@ -81,6 +82,8 @@ buildGoModule (finalAttrs: {
     "dev"
   ];
 
+  passthru.updateScript = gitUpdater { };
+
   meta = {
     description = "Free TLS/SSL implementation";
     mainProgram = "bssl";

From 100a688336398a0e59c08655942b7d1c218f95bf Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Mon, 20 Oct 2025 15:16:14 +0200
Subject: [PATCH 5559/6226] boringssl: fix license

BoringSSL has been relicensed to Apache 2.0 as of February 2025
---
 pkgs/by-name/bo/boringssl/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix
index 54c2c9507013..ec0d2186b3c4 100644
--- a/pkgs/by-name/bo/boringssl/package.nix
+++ b/pkgs/by-name/bo/boringssl/package.nix
@@ -90,7 +90,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://boringssl.googlesource.com";
     maintainers = [ lib.maintainers.thoughtpolice ];
     license = with lib.licenses; [
-      openssl
+      asl20
       isc
       mit
       bsd3

From c95158747779baf6c2cfcb596de37c63fe20f8dc Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Mon, 20 Oct 2025 15:17:50 +0200
Subject: [PATCH 5560/6226] boringssl: refactor build

Co-Authored-By: Theo Paris <theo@tinted.dev>
---
 pkgs/by-name/bo/boringssl/package.nix | 38 +--------------------------
 1 file changed, 1 insertion(+), 37 deletions(-)

diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix
index ec0d2186b3c4..71f09d807713 100644
--- a/pkgs/by-name/bo/boringssl/package.nix
+++ b/pkgs/by-name/bo/boringssl/package.nix
@@ -5,12 +5,11 @@
   cmake,
   ninja,
   perl,
-  buildGoModule,
   gitUpdater,
 }:
 
 # reference: https://boringssl.googlesource.com/boringssl/+/refs/tags/0.20250818.0/BUILDING.md
-buildGoModule (finalAttrs: {
+stdenv.mkDerivation (finalAttrs: {
   pname = "boringssl";
   version = "0.20251002.0";
 
@@ -31,18 +30,6 @@ buildGoModule (finalAttrs: {
     perl
   ];
 
-  vendorHash = "sha256-IXmnoCYLoiQ/XL2wjksRFv5Kwsje0VNkcupgGxG6rSY=";
-  proxyVendor = true;
-
-  # hack to get both go and cmake configure phase
-  # (if we use postConfigure then cmake will loop runHook postConfigure)
-  preBuild = ''
-    cmakeConfigurePhase
-  ''
-  + lib.optionalString (stdenv.buildPlatform != stdenv.hostPlatform) ''
-    export GOARCH=$(go env GOHOSTARCH)
-  '';
-
   env.NIX_CFLAGS_COMPILE = toString (
     lib.optionals stdenv.cc.isGNU [
       # Needed with GCC 12 but breaks on darwin (with clang)
@@ -53,29 +40,6 @@ buildGoModule (finalAttrs: {
     ]
   );
 
-  buildPhase = ''
-    ninjaBuildPhase
-  '';
-
-  # CMAKE_OSX_ARCHITECTURES is set to x86_64 by Nix, but it confuses boringssl on aarch64-linux.
-  cmakeFlags = [
-    "-GNinja"
-  ]
-  ++ lib.optionals (stdenv.hostPlatform.isLinux) [ "-DCMAKE_OSX_ARCHITECTURES=" ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $bin/bin $dev $out/lib
-
-    install -Dm755 bssl -t $bin/bin
-    install -Dm644 {libcrypto,libdecrepit,libpki,libssl}.a -t $out/lib
-
-    cp -r ../include $dev
-
-    runHook postInstall
-  '';
-
   outputs = [
     "out"
     "bin"

From 905b80d01a8a97b10c9bbd8098803b915e4b0d40 Mon Sep 17 00:00:00 2001
From: Niklas Korz <niklas@niklaskorz.de>
Date: Mon, 20 Oct 2025 17:39:46 +0200
Subject: [PATCH 5561/6226] boringssl: add maintainers theoparis and niklaskorz

---
 pkgs/by-name/bo/boringssl/package.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/bo/boringssl/package.nix b/pkgs/by-name/bo/boringssl/package.nix
index 71f09d807713..ea8695903891 100644
--- a/pkgs/by-name/bo/boringssl/package.nix
+++ b/pkgs/by-name/bo/boringssl/package.nix
@@ -52,7 +52,11 @@ stdenv.mkDerivation (finalAttrs: {
     description = "Free TLS/SSL implementation";
     mainProgram = "bssl";
     homepage = "https://boringssl.googlesource.com";
-    maintainers = [ lib.maintainers.thoughtpolice ];
+    maintainers = with lib.maintainers; [
+      thoughtpolice
+      theoparis
+      niklaskorz
+    ];
     license = with lib.licenses; [
       asl20
       isc

From 95862bd07c10bb920cb623edba91c093e79fe1e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 12:19:15 +0000
Subject: [PATCH 5562/6226] mongodb-compass: 1.48.0 -> 1.48.1

---
 pkgs/by-name/mo/mongodb-compass/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix
index d8f1dab7baea..bc99ca9b235b 100644
--- a/pkgs/by-name/mo/mongodb-compass/package.nix
+++ b/pkgs/by-name/mo/mongodb-compass/package.nix
@@ -40,7 +40,7 @@
 
 let
   pname = "mongodb-compass";
-  version = "1.48.0";
+  version = "1.48.1";
 
   selectSystem =
     attrs:
@@ -55,9 +55,9 @@ let
       }
     }";
     hash = selectSystem {
-      x86_64-linux = "sha256-lmg+zfUUT4dAObJzEmGzBCmnHkc6rkPKk1XIfmZ6uJc=";
-      x86_64-darwin = "sha256-T7MF1TYBPbTg2VBWImA38xN+eCs1ZKT2e5TzHYi08KE=";
-      aarch64-darwin = "sha256-zKSmhU0p87+2SFzA7ZdMy/p/cw8K5JtYfC5np6HnjBg=";
+      x86_64-linux = "sha256-C+0IezU2kAQzju3Ev2xl82ybQeB8B8ViXDHoRXPHIus=";
+      x86_64-darwin = "sha256-LtiXq1chSRUj/hgVRvHwS1KvJKiQW838K8EVSdmNSQk=";
+      aarch64-darwin = "sha256-P0VfIRmBgF65BcxoRNIh6e6ccqztO/BG7qtYP528YDI=";
     };
   };
 

From 79dbe83fce77b6d16e5d0b8fec4079fce638c8ca Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Fri, 3 Oct 2025 22:12:16 +0000
Subject: [PATCH 5563/6226] scip: 0.5.1 -> 0.6.0

Diff: https://github.com/sourcegraph/scip/compare/v0.5.1...v0.6.0

Changelog: https://github.com/sourcegraph/scip/blob/v0.6.0/CHANGELOG.md
---
 pkgs/by-name/sc/scip/package.nix | 58 +++++++++++++++++++-------------
 1 file changed, 35 insertions(+), 23 deletions(-)

diff --git a/pkgs/by-name/sc/scip/package.nix b/pkgs/by-name/sc/scip/package.nix
index d9cfa6444b3b..7ba2d321cc1e 100644
--- a/pkgs/by-name/sc/scip/package.nix
+++ b/pkgs/by-name/sc/scip/package.nix
@@ -1,23 +1,25 @@
 {
   lib,
-  buildGoModule,
+  stdenv,
+  buildGo124Module,
   fetchFromGitHub,
-  testers,
-  scip,
+  libredirect,
+  iana-etc,
+  versionCheckHook,
 }:
 
-buildGoModule rec {
+buildGo124Module (finalAttrs: {
   pname = "scip";
-  version = "0.5.1";
+  version = "0.6.0";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "scip";
-    rev = "v${version}";
-    hash = "sha256-UXa5lMFenynHRIvA4MOXkjMVd705LBWs372s3MFAc+8=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-ZyU1CmDBVDNP6zCXpvqEoQ3ttWNPGLCIjkj4mezUcKc=";
   };
 
-  vendorHash = "sha256-6vx3Dt0ZNR0rY5bEUF5X1hHj/gv21920bhfd+JJ9bYk=";
+  vendorHash = "sha256-RwBlzBqGd/xEaTL6m3sm6e/tcNUc7Mfdf213qzuMPug=";
 
   ldflags = [
     "-s"
@@ -25,25 +27,35 @@ buildGoModule rec {
     "-X=main.Reproducible=true"
   ];
 
-  # update documentation to fix broken test
-  postPatch = ''
-    substituteInPlace docs/CLI.md \
-      --replace 0.3.0 0.3.1
+  nativeCheckInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libredirect.hook ];
+
+  checkFlags =
+    let
+      skippedTests = [
+        "TestParseCompat" # could not locate sample indexes directory starting from parents of working directory
+        "TestParseSymbol_ZeroAllocationsIfMemoryAvailable"
+      ];
+    in
+    [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];
+
+  __darwinAllowLocalNetworking = true;
+
+  preCheck = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    export NIX_REDIRECTS=/etc/protocols=${iana-etc}/etc/protocols:/etc/services=${iana-etc}/etc/services
   '';
 
-  passthru.tests = {
-    version = testers.testVersion {
-      package = scip;
-      version = "v${version}";
-    };
-  };
+  doInstallCheck = stdenv.hostPlatform.isLinux;
 
-  meta = with lib; {
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  versionCheckProgramArg = "--version";
+
+  meta = {
     description = "SCIP Code Intelligence Protocol CLI";
     mainProgram = "scip";
     homepage = "https://github.com/sourcegraph/scip";
-    changelog = "https://github.com/sourcegraph/scip/blob/${src.rev}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = [ ];
+    changelog = "https://github.com/sourcegraph/scip/blob/${finalAttrs.src.rev}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = [  ];
   };
-}
+})

From 7923bb46763136fa52bb422db604fe8a60ca8657 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 12:25:35 +0000
Subject: [PATCH 5564/6226] gpxsee: 15.0 -> 15.1

---
 pkgs/by-name/gp/gpxsee/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gp/gpxsee/package.nix b/pkgs/by-name/gp/gpxsee/package.nix
index a6369b371030..d75593ba9f25 100644
--- a/pkgs/by-name/gp/gpxsee/package.nix
+++ b/pkgs/by-name/gp/gpxsee/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "gpxsee";
-  version = "15.0";
+  version = "15.1";
 
   src = fetchFromGitHub {
     owner = "tumic0";
     repo = "GPXSee";
     tag = finalAttrs.version;
-    hash = "sha256-eGLCjOFtEydnEu2QfabGiSlOrXJH2kF9cl8Jyz5a7J4=";
+    hash = "sha256-KH3FZAvcDMRfUwx8I8GOx4tSpIv8kzgYo0NV5Tq5qYo=";
   };
 
   buildInputs = [

From 9933262251aad9528ecd326e177881220f44571f Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Wed, 5 Nov 2025 13:27:03 +0100
Subject: [PATCH 5565/6226] vimPlugins.nvim-treesitter.tests: fix

---
 .../editors/vim/plugins/nvim-treesitter/overrides.nix  | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
index 9b5592b99b98..fbb3619e0622 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
@@ -113,11 +113,11 @@ in
           pluginsToCheck =
             map (grammar: grammarToPlugin grammar)
               # true is here because there is `recurseForDerivations = true`
-              (lib.remove true (lib.attrValues tree-sitter-grammars));
+              (lib.filter lib.isDerivation (lib.attrValues tree-sitter-grammars));
         in
         runCommand "nvim-treesitter-test-queries-are-present-for-custom-grammars" { CI = true; } ''
           function check_grammar {
-            EXPECTED_FILES="$2/parser/$1.so `ls $2/queries/$1/*.scm`"
+            EXPECTED_FILES="$2/parser/$1.so `find -L "$2/queries/$1" -name '*.scm'`"
 
             echo
             echo expected files for $1:
@@ -125,7 +125,7 @@ in
 
             # the derivation has only symlinks, and `find` doesn't count them as files
             # so we cannot use `-type f`
-            for file in `find $2 -not -type d`; do
+            for file in `find -L $2 -not -type d`; do
               echo checking $file
               # see https://stackoverflow.com/a/8063284
               if ! echo "$EXPECTED_FILES" | grep -wqF "$file"; then
@@ -141,9 +141,7 @@ in
 
       no-queries-for-official-grammars =
         let
-          pluginsToCheck =
-            # true is here because there is `recurseForDerivations = true`
-            (lib.remove true (lib.attrValues vimPlugins.nvim-treesitter-parsers));
+          pluginsToCheck = lib.filter lib.isDerivation (lib.attrValues vimPlugins.nvim-treesitter-parsers);
         in
         runCommand "nvim-treesitter-test-no-queries-for-official-grammars" { CI = true; } ''
           touch $out

From a8ff0638e5a050f0feabf409df179ac85e137e4c Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Wed, 5 Nov 2025 13:44:02 +0100
Subject: [PATCH 5566/6226] vimPlugins.rust-tools-nvim: recommend switching to
 rustaceanvim

The project is archived, but still functions, so no need to remove it
yet
---
 pkgs/applications/editors/vim/plugins/aliases.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix
index d3099a3b5b51..7dad6f4e806e 100644
--- a/pkgs/applications/editors/vim/plugins/aliases.nix
+++ b/pkgs/applications/editors/vim/plugins/aliases.nix
@@ -42,7 +42,7 @@ mapAliases (
     blueballs-neovim = throw "`blueballs-neovim` has been removed"; # added 2025-06-17
     BufOnly = BufOnly-vim;
     calendar = calendar-vim;
-    coc-rls = throw "coc-rls has been removed, as rls has been archived since 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # addedd 2025-10-01
+    coc-rls = throw "coc-rls has been removed, as rls has been archived since 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01
     coc-vetur = throw "coc-vetur was removed, as vetur is unmaintained by Vue. You should switch to Volar, which supports Vue 3"; # added 2025-10-01
     coffee-script = vim-coffee-script;
     coffeeScript = vim-coffee-script; # backwards compat, added 2014-10-18
@@ -120,6 +120,7 @@ mapAliases (
     repeat = vim-repeat;
     riv = riv-vim;
     rhubarb = vim-rhubarb;
+    rust-tools-nvim = lib.warnOnInstantiate "rust-tools-nvim is abandoned by upstream; you should use rustaceanvim" rust-tools-nvim;
     sensible = vim-sensible;
     signature = vim-signature;
     snipmate = vim-snipmate;

From d6baefd543080a3271c49bf6f56dd6bbf6cc6ffd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 12:57:52 +0000
Subject: [PATCH 5567/6226] cinny: 4.10.1 -> 4.10.2

---
 pkgs/by-name/ci/cinny-unwrapped/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix
index 3b2220d8588b..42a1e2e9e47d 100644
--- a/pkgs/by-name/ci/cinny-unwrapped/package.nix
+++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix
@@ -13,16 +13,16 @@
 
 buildNpmPackage rec {
   pname = "cinny-unwrapped";
-  version = "4.10.1";
+  version = "4.10.2";
 
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny";
     tag = "v${version}";
-    hash = "sha256-Hn49a+nGtF5kJ1ZM+rOXWH+dFG1nMSI/rIDF+9qlQk4=";
+    hash = "sha256-RPFEquxMRnNW+L6azcDmrIKXG27DAF2PxDmSB3ErOHk=";
   };
 
-  npmDepsHash = "sha256-896W5XbAGUcUa8gxeR72hg9fwTaUOR5a5hex8vS33gU=";
+  npmDepsHash = "sha256-h4Ipmmo0Jf6/rzCAKtLLCYrUi1anVKZSgy/kcEKDQJg=";
 
   nativeBuildInputs = [
     python3

From dab7117a3b88aaacb4ab8d1643949bea87e5de0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 12:58:28 +0000
Subject: [PATCH 5568/6226] kube-bench: 0.13.0 -> 0.14.0

---
 pkgs/by-name/ku/kube-bench/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ku/kube-bench/package.nix b/pkgs/by-name/ku/kube-bench/package.nix
index 6b3bd12cbb70..d9d1aeff0645 100644
--- a/pkgs/by-name/ku/kube-bench/package.nix
+++ b/pkgs/by-name/ku/kube-bench/package.nix
@@ -10,7 +10,7 @@
 
 buildGoModule (finalAttrs: {
   pname = "kube-bench";
-  version = "0.13.0";
+  version = "0.14.0";
 
   __darwinAllowLocalNetworking = true; # required for tests
 
@@ -18,10 +18,10 @@ buildGoModule (finalAttrs: {
     owner = "aquasecurity";
     repo = "kube-bench";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-5P8kF8k25E7dezhQ7oKKlu/6y9Ofq3nAeenAI7IOBwE=";
+    hash = "sha256-zu1ckblQnn3Df71myPIYebIQHjMi7S3LoSbsY8RAiVQ=";
   };
 
-  vendorHash = "sha256-vueIQbsF34lkmIFpH8DiOSjxEBevxxiJLd0L/sQwJBE=";
+  vendorHash = "sha256-qRtEkYL+OgcfdYS+u2vRynr+6w6ZEEURxOXE/vCt2fM=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From ff9436873188ad5274ec003e78e8af856b94ad47 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 12:59:25 +0000
Subject: [PATCH 5569/6226] terraform: 1.13.4 -> 1.13.5

---
 pkgs/applications/networking/cluster/terraform/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix
index 373a717d69c5..a1e73f5b8030 100644
--- a/pkgs/applications/networking/cluster/terraform/default.nix
+++ b/pkgs/applications/networking/cluster/terraform/default.nix
@@ -194,9 +194,9 @@ rec {
   mkTerraform = attrs: pluggable (generic attrs);
 
   terraform_1 = mkTerraform {
-    version = "1.13.4";
-    hash = "sha256-i+oXt5Olu0OC6rshQJUsjdEVQLeEoIt+Zrmbs3k3mWU=";
-    vendorHash = "sha256-UcsB5cTae55meJ945fvgowch4EBdaTET2+t5KWvpPQ8=";
+    version = "1.13.5";
+    hash = "sha256-F8fpTI6kPrjOM+4N67uBCpsxMLQUR6sXzTr1SYFI9Ww=";
+    vendorHash = "sha256-3skDvOcDlTOv8okiGmaB0bvkoMrQjutGdvpxcradqUk=";
     patches = [ ./provider-path-0_15.patch ];
     passthru = {
       inherit plugins;

From 9cbc2d1d637c1f2f8dd81aee823b668ff7ab7cf4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 5 Nov 2025 14:02:47 +0100
Subject: [PATCH 5570/6226] evcc: 0.209.6 -> 0.209.7

https://github.com/evcc-io/evcc/releases/tag/0.209.7
---
 pkgs/by-name/ev/evcc/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix
index 31534c0271de..c0d45f536689 100644
--- a/pkgs/by-name/ev/evcc/package.nix
+++ b/pkgs/by-name/ev/evcc/package.nix
@@ -17,16 +17,16 @@
 }:
 
 let
-  version = "0.209.6";
+  version = "0.209.7";
 
   src = fetchFromGitHub {
     owner = "evcc-io";
     repo = "evcc";
     tag = version;
-    hash = "sha256-WTfLnd2w9maCrCVHkJUZrry4LloiimNWZxRYVgHRyT8=";
+    hash = "sha256-sBngxb4NoKXkVyBRlK3ZaF2ZDIIv0hG9+jkyQGZR6Ts=";
   };
 
-  vendorHash = "sha256-SVdoeioBtUa+V2n717ckYCQBFmYSXdi7ryRVfb9xKnY=";
+  vendorHash = "sha256-UriOVwZerNTtrqHNS9rW3PIEHbCkIrkiKLnA4lGuIN0=";
 
   commonMeta = with lib; {
     license = licenses.mit;

From 5be63ef46e71e4c4fa8f586116051dafa904d63e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 13:03:49 +0000
Subject: [PATCH 5571/6226] vscode-extensions.vscjava.vscode-java-dependency:
 0.26.2 -> 0.26.3

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 1a5b850fe551..2eaefaa41c30 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5050,8 +5050,8 @@ let
         mktplcRef = {
           publisher = "vscjava";
           name = "vscode-java-dependency";
-          version = "0.26.2";
-          hash = "sha256-msRaLNS1a5BXY3GN1MmOi9jBbNj6aqJDbZkFc1pLG3I=";
+          version = "0.26.3";
+          hash = "sha256-o7FWpesuG6qS1UFVaSQ97X3sWc/6vOOZPy/iid3nNJs=";
         };
         meta = {
           license = lib.licenses.mit;

From 9dfb2ba974a3ad5eda9083fc41f04da7d6c052e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 13:15:09 +0000
Subject: [PATCH 5572/6226] beeper: 4.1.289 -> 4.1.311

---
 pkgs/by-name/be/beeper/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix
index 733cb48a0fc4..ee8fcd7d7123 100644
--- a/pkgs/by-name/be/beeper/package.nix
+++ b/pkgs/by-name/be/beeper/package.nix
@@ -9,10 +9,10 @@
 }:
 let
   pname = "beeper";
-  version = "4.1.289";
+  version = "4.1.311";
   src = fetchurl {
     url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage";
-    hash = "sha256-35fPd3bwbUwhdEtMrq/P+vPeh9Kdv9vwCP6LC7p4N9I=";
+    hash = "sha256-r7WPuxPlqcUQ937TcBBG93Uo9WCY1wnH3Jm2PWI9siU=";
   };
   appimageContents = appimageTools.extract {
     inherit pname version src;

From 723eebde85711dc21e3b52160416776514256185 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 13:20:46 +0000
Subject: [PATCH 5573/6226] home-assistant-custom-components.octopus_energy:
 17.1.0 -> 17.1.1

---
 .../custom-components/octopus_energy/package.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix
index b4c68e0d81bb..83ac738cb0c4 100644
--- a/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/octopus_energy/package.nix
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
   owner = "BottlecapDave";
   domain = "octopus_energy";
-  version = "17.1.0";
+  version = "17.1.1";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "HomeAssistant-OctopusEnergy";
     tag = "v${version}";
-    hash = "sha256-2xfchJUFi8c+DK84p8bdersb/BSTclSz0JU7P9uYatM=";
+    hash = "sha256-L1LqH9QMasVCZdsnHpKdxYGpsc/2vaIPAbiYc6vVshM=";
   };
 
   dependencies = [ pydantic ];

From ba205aa3c40f197034221925325f1af938bd181e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 13:22:09 +0000
Subject: [PATCH 5574/6226] python3Packages.json-stream-rs-tokenizer: 0.4.30 ->
 0.4.31

---
 .../python-modules/json-stream-rs-tokenizer/default.nix     | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix
index d09ead373c51..0f08c6891bee 100644
--- a/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix
+++ b/pkgs/development/python-modules/json-stream-rs-tokenizer/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "json-stream-rs-tokenizer";
-  version = "0.4.30";
+  version = "0.4.31";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -26,12 +26,12 @@ buildPythonPackage rec {
     owner = "smheidrich";
     repo = "py-json-stream-rs-tokenizer";
     tag = "v${version}";
-    hash = "sha256-kzeEG42KcmczIC69aJe1dkqeBpMYn5uBBj1Ni+/+sTM=";
+    hash = "sha256-n+ZPB1BGUHEanpLpe4ZO6LjbxTALJ4Ns9/Hn7nE3mpc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-Zvtu7pH50hPPuLKVn7itcuO+BeSJKRQmZCWtQkMIZI8=";
+    hash = "sha256-IPQrqayhyQ/gmT6nK+TgDcUQ4mPrG9yiJJk6enBzybA=";
   };
 
   nativeBuildInputs = [

From e53443455a1dea3a4a1f7325ff9b3df9eb413314 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 13:27:09 +0000
Subject: [PATCH 5575/6226] temporal-cli: 1.5.0 -> 1.5.1

---
 pkgs/by-name/te/temporal-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/temporal-cli/package.nix b/pkgs/by-name/te/temporal-cli/package.nix
index a8b9aa69f393..cfd4ce4208b6 100644
--- a/pkgs/by-name/te/temporal-cli/package.nix
+++ b/pkgs/by-name/te/temporal-cli/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "temporal-cli";
-  version = "1.5.0";
+  version = "1.5.1";
 
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = "cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-V0ob6Y7ns0ZEH1nZUIDFXxw8JFSzqbMoS4x2KT8pV+k=";
+    hash = "sha256-Y/hTD31WUcVn/OBuNwdhbjDZd36EKbOJRr9PFDKHifg=";
   };
 
-  vendorHash = "sha256-ZftQ1jt4y6HUF4aI2x3i7hnqNO4GKgblzjS1Zzb9sWo=";
+  vendorHash = "sha256-dZhrozZc3SeZQQ7lGeeICrptL2I0DH0EpsjCt4CjCJU=";
 
   overrideModAttrs = old: {
     # https://gitlab.com/cznic/libc/-/merge_requests/10

From 8f3553e20789ac24a05188b9508726dac3779903 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 5 Nov 2025 14:39:27 +0100
Subject: [PATCH 5576/6226] esphome: 2025.10.3 -> 2025.10.4

https://github.com/esphome/esphome/releases/tag/2025.10.4
---
 pkgs/by-name/es/esphome/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix
index c8cbf161b47e..1036009f77e5 100644
--- a/pkgs/by-name/es/esphome/package.nix
+++ b/pkgs/by-name/es/esphome/package.nix
@@ -34,14 +34,14 @@ let
 in
 python.pkgs.buildPythonApplication rec {
   pname = "esphome";
-  version = "2025.10.3";
+  version = "2025.10.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "esphome";
     tag = version;
-    hash = "sha256-k/wqS5koXQ/hGhDNhxuv/t496+f0YPHZibkUjRyCjwo=";
+    hash = "sha256-+j3x/9wmPk9HEHkQEfdgYnpUojGc89dU4pvRNaT5czk=";
   };
 
   patches = [

From ad4450ca527b6080f55d5bec7979c94ed5832abf Mon Sep 17 00:00:00 2001
From: chillcicada <2210227279@qq.com>
Date: Wed, 5 Nov 2025 21:49:17 +0800
Subject: [PATCH 5577/6226] qq: 3.2.20-2025-10-23 -> 3.2.21-2025-11-05

---
 pkgs/by-name/qq/qq/sources.nix | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/qq/qq/sources.nix b/pkgs/by-name/qq/qq/sources.nix
index 04c0bf153bd8..5197817bb9cc 100644
--- a/pkgs/by-name/qq/qq/sources.nix
+++ b/pkgs/by-name/qq/qq/sources.nix
@@ -1,12 +1,12 @@
 # Generated by ./update.sh - do not update manually!
-# Last updated: 2025-10-24
+# Last updated: 2025-11-05
 { fetchurl }:
 let
   any-darwin = {
-    version = "6.9.82-2025-10-23";
+    version = "6.9.83-2025-11-05";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.82_251023_01.dmg";
-      hash = "sha256-oBhThy9NC0W6gyztHQCL88NDdQrYHzZ27RAzTGcyyRY=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Mac/QQ_6.9.83_251105_01.dmg";
+      hash = "sha256-/tXuL9WszgWSIFpBSQnmAhRnhNNrK4qCf4uVgBC/DBk=";
     };
   };
 in
@@ -14,17 +14,17 @@ in
   aarch64-darwin = any-darwin;
   x86_64-darwin = any-darwin;
   aarch64-linux = {
-    version = "3.2.20-2025-10-23";
+    version = "3.2.21-2025-11-05";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.20_251023_arm64_01.deb";
-      hash = "sha256-m90k4S0BAA3R4alRl+1ZfLK3q35LnCVBMUOcJpALIYU=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.21_251105_arm64_01.deb";
+      hash = "sha256-THK5bjq3fGJiGndvIwq+o7t0gKGtthd9JNXf0A0RwCs=";
     };
   };
   x86_64-linux = {
-    version = "3.2.20-2025-10-23";
+    version = "3.2.21-2025-11-05";
     src = fetchurl {
-      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.20_251023_amd64_01.deb";
-      hash = "sha256-PIq2FPB+LpnyfzE51o9eulw93/BofPrlU+PqUyYlh2M=";
+      url = "https://dldir1v6.qq.com/qqfile/qq/QQNT/Linux/QQ_3.2.21_251105_amd64_01.deb";
+      hash = "sha256-ERQB+fuf0HBR0TOOGauA+38Qz0QaeoH0EdyICeDe7eY=";
     };
   };
 }

From 6484f0bbd03376d57804bfef5db9cf8da2f1c45c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 13:49:38 +0000
Subject: [PATCH 5578/6226] necesse-server: 1.0.2-20563267 -> 1.0.2-20664049

---
 pkgs/by-name/ne/necesse-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ne/necesse-server/package.nix b/pkgs/by-name/ne/necesse-server/package.nix
index 53eb6208fbec..754c14f64de4 100644
--- a/pkgs/by-name/ne/necesse-server/package.nix
+++ b/pkgs/by-name/ne/necesse-server/package.nix
@@ -6,7 +6,7 @@
 }:
 
 let
-  version = "1.0.2-20563267";
+  version = "1.0.2-20664049";
   urlVersion = lib.replaceStrings [ "." ] [ "-" ] version;
 
 in
@@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation {
 
   src = fetchzip {
     url = "https://necessegame.com/content/server/${urlVersion}/necesse-server-linux64-${urlVersion}.zip";
-    hash = "sha256-oDd9ZRCEKHQDaCqrRFiNj8AhNZ+2ZRVdzlooE99Y+VA=";
+    hash = "sha256-VgTAFxdI4YnTG1oOwrQpqIfKO6cf7o3NmGjcp7QZFK4=";
   };
 
   # removing packaged jre since we use our own

From 28eef4c1fe2a61c3bf6c4baee7ec69b4439a91a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Wed, 5 Nov 2025 13:55:21 +0000
Subject: [PATCH 5579/6226] codex: 0.53.0 -> 0.55.0

---
 pkgs/by-name/co/codex/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix
index 32896d0b6a1b..d00b2d09dc18 100644
--- a/pkgs/by-name/co/codex/package.nix
+++ b/pkgs/by-name/co/codex/package.nix
@@ -14,18 +14,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "codex";
-  version = "0.53.0";
+  version = "0.55.0";
 
   src = fetchFromGitHub {
     owner = "openai";
     repo = "codex";
     tag = "rust-v${finalAttrs.version}";
-    hash = "sha256-sDL7gpq73RyyTgi97sxWDq6mhqQiYLyvSN76H8Pp3Uk=";
+    hash = "sha256-gtYLMqQ3szUJMN1Jdcy2BPrJN8bxvrt0nVShcC2/JAA=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/codex-rs";
 
-  cargoHash = "sha256-EXDvcCY1l2C/IVJLQtou11Lmcsrn8SBGCo8DexEjpbg=";
+  cargoHash = "sha256-1Wj6+CY9PwsOQ39dywepnaQvycg0jqq6iYYXnLgH1dw=";
 
   nativeBuildInputs = [
     installShellFiles

From f47a3a395693956fe84e0e5610e8c7360743dfaf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 13:59:14 +0000
Subject: [PATCH 5580/6226] python3Packages.sagemaker-core: 1.0.61 -> 1.0.62

---
 pkgs/development/python-modules/sagemaker-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sagemaker-core/default.nix b/pkgs/development/python-modules/sagemaker-core/default.nix
index b7c084fcd143..2b40a66c31bc 100644
--- a/pkgs/development/python-modules/sagemaker-core/default.nix
+++ b/pkgs/development/python-modules/sagemaker-core/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "sagemaker-core";
-  version = "1.0.61";
+  version = "1.0.62";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "sagemaker-core";
     tag = "v${version}";
-    hash = "sha256-RTobN/YZm9YC/wFw1990ZHm8XUqO54LYFG4H++qqSxI=";
+    hash = "sha256-1fFgR7BeMmt3SYYiHQ3yR2pK1eTKtosH3vTwna9mOCs=";
   };
 
   build-system = [

From ba143987f5636b504e5c5addea7d5099b7f26a12 Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Wed, 5 Nov 2025 22:24:25 +0800
Subject: [PATCH 5581/6226] nezha-theme-user: add missing
 node_modules/@esbuild/*

---
 .../ne/nezha-theme-user/package-lock.json     | 2211 ++++++++++++-----
 pkgs/by-name/ne/nezha-theme-user/package.nix  |    2 +-
 2 files changed, 1651 insertions(+), 562 deletions(-)

diff --git a/pkgs/by-name/ne/nezha-theme-user/package-lock.json b/pkgs/by-name/ne/nezha-theme-user/package-lock.json
index 9a742fa2bdec..39c7a1d66af0 100644
--- a/pkgs/by-name/ne/nezha-theme-user/package-lock.json
+++ b/pkgs/by-name/ne/nezha-theme-user/package-lock.json
@@ -72,6 +72,7 @@
       "version": "5.2.0",
       "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz",
       "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==",
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -80,55 +81,69 @@
       }
     },
     "node_modules/@babel/code-frame": {
-      "version": "7.26.2",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.26.2.tgz",
-      "integrity": "sha512-RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz",
+      "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-validator-identifier": "^7.25.9",
+        "@babel/helper-validator-identifier": "^7.27.1",
         "js-tokens": "^4.0.0",
-        "picocolors": "^1.0.0"
+        "picocolors": "^1.1.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/generator": {
-      "version": "7.26.5",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.26.5.tgz",
-      "integrity": "sha512-2caSP6fN9I7HOe6nqhtft7V4g7/V/gfDsC3Ag4W7kEzzvRGKqiv0pu0HogPiZ3KaVSoNDhUws6IJjDjpfmYIXw==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz",
+      "integrity": "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/parser": "^7.26.5",
-        "@babel/types": "^7.26.5",
-        "@jridgewell/gen-mapping": "^0.3.5",
-        "@jridgewell/trace-mapping": "^0.3.25",
+        "@babel/parser": "^7.28.5",
+        "@babel/types": "^7.28.5",
+        "@jridgewell/gen-mapping": "^0.3.12",
+        "@jridgewell/trace-mapping": "^0.3.28",
         "jsesc": "^3.0.2"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@babel/helper-globals": {
+      "version": "7.28.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz",
+      "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/helper-string-parser": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.25.9.tgz",
-      "integrity": "sha512-4A/SCr/2KLd5jrtOMFzaKjVtAei3+2r/NChoBNoZ3EyP/+GlhoaEGoWOZUmFmoITP7zOJyHIMm+DYRd8o3PvHA==",
+      "version": "7.27.1",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz",
+      "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/helper-validator-identifier": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.25.9.tgz",
-      "integrity": "sha512-Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz",
+      "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.26.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.7.tgz",
-      "integrity": "sha512-kEvgGGgEjRUutvdVvZhbn/BxVt+5VSpwXz1j3WYXQbXDo8KzFOPNG2GQbdAiNq8g6wn1yKk7C/qrke03a84V+w==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz",
+      "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/types": "^7.26.7"
+        "@babel/types": "^7.28.5"
       },
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -138,92 +153,331 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.26.0",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.0.tgz",
-      "integrity": "sha512-FDSOghenHTiToteC/QRlv2q3DhPZ/oOXTBoirfWNx1Cx3TMVcGWQtMMmQcSvb/JjpNeGzx8Pq/b4fKEJuWm1sw==",
-      "dependencies": {
-        "regenerator-runtime": "^0.14.0"
-      },
+      "version": "7.28.4",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.4.tgz",
+      "integrity": "sha512-Q/N6JNWvIvPnLDvjlE1OUBLPQHH6l3CltCEsHIujp45zQUSSh8K+gHnaEX45yAT1nyngnINhvWtzN+Nb9D8RAQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/template": {
-      "version": "7.25.9",
-      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.9.tgz",
-      "integrity": "sha512-9DGttpmPvIxBb/2uwpVo3dqJ+O6RooAFOS+lB+xDqoE2PVCE8nfoHMdZLpfCQRLwvohzXISPZcgxt80xLfsuwg==",
+      "version": "7.27.2",
+      "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz",
+      "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.25.9",
-        "@babel/parser": "^7.25.9",
-        "@babel/types": "^7.25.9"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/@babel/template/node_modules/@babel/parser": {
-      "version": "7.26.3",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.26.3.tgz",
-      "integrity": "sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==",
-      "dependencies": {
-        "@babel/types": "^7.26.3"
-      },
-      "bin": {
-        "parser": "bin/babel-parser.js"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@babel/template/node_modules/@babel/types": {
-      "version": "7.26.3",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.3.tgz",
-      "integrity": "sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==",
-      "dependencies": {
-        "@babel/helper-string-parser": "^7.25.9",
-        "@babel/helper-validator-identifier": "^7.25.9"
+        "@babel/code-frame": "^7.27.1",
+        "@babel/parser": "^7.27.2",
+        "@babel/types": "^7.27.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
     "node_modules/@babel/traverse": {
-      "version": "7.26.7",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.26.7.tgz",
-      "integrity": "sha512-1x1sgeyRLC3r5fQOM0/xtQKsYjyxmFjaOrLJNtZ81inNjyJHGIolTULPiSc/2qe1/qfpFLisLQYFnnZl7QoedA==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.5.tgz",
+      "integrity": "sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/code-frame": "^7.26.2",
-        "@babel/generator": "^7.26.5",
-        "@babel/parser": "^7.26.7",
-        "@babel/template": "^7.25.9",
-        "@babel/types": "^7.26.7",
-        "debug": "^4.3.1",
-        "globals": "^11.1.0"
+        "@babel/code-frame": "^7.27.1",
+        "@babel/generator": "^7.28.5",
+        "@babel/helper-globals": "^7.28.0",
+        "@babel/parser": "^7.28.5",
+        "@babel/template": "^7.27.2",
+        "@babel/types": "^7.28.5",
+        "debug": "^4.3.1"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
-    "node_modules/@babel/traverse/node_modules/globals": {
-      "version": "11.12.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz",
-      "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
     "node_modules/@babel/types": {
-      "version": "7.26.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.7.tgz",
-      "integrity": "sha512-t8kDRGrKXyp6+tjUh7hw2RLyclsW4TRoRvRHtSyAX9Bb5ldlFh+90YAYY6awRXrlB4G5G2izNeGySpATlFzmOg==",
+      "version": "7.28.5",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz",
+      "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/helper-string-parser": "^7.25.9",
-        "@babel/helper-validator-identifier": "^7.25.9"
+        "@babel/helper-string-parser": "^7.27.1",
+        "@babel/helper-validator-identifier": "^7.28.5"
       },
       "engines": {
         "node": ">=6.9.0"
       }
     },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.24.2.tgz",
+      "integrity": "sha512-thpVCb/rhxE/BnMLQ7GReQLLN8q9qbHmI55F4489/ByVg2aQaQ6kbcLb6FHkocZzQhxc4gx0sCk0tJkKBFzDhA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.24.2.tgz",
+      "integrity": "sha512-tmwl4hJkCfNHwFB3nBa8z1Uy3ypZpxqxfTQOcHX+xRByyYgunVbZ9MzUUfb0RxaHIMnbHagwAxuTL+tnNM+1/Q==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.24.2.tgz",
+      "integrity": "sha512-cNLgeqCqV8WxfcTIOeL4OAtSmL8JjcN6m09XIgro1Wi7cF4t/THaWEa7eL5CMoMBdjoHOTh/vwTO/o2TRXIyzg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.24.2.tgz",
+      "integrity": "sha512-B6Q0YQDqMx9D7rvIcsXfmJfvUYLoP722bgfBlO5cGvNVb5V/+Y7nhBE3mHV9OpxBf4eAS2S68KZztiPaWq4XYw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.24.2.tgz",
+      "integrity": "sha512-kj3AnYWc+CekmZnS5IPu9D+HWtUI49hbnyqk0FLEJDbzCIQt7hg7ucF1SQAilhtYpIujfaHr6O0UHlzzSPdOeA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.24.2.tgz",
+      "integrity": "sha512-WeSrmwwHaPkNR5H3yYfowhZcbriGqooyu3zI/3GGpF8AyUdsrrP0X6KumITGA9WOyiJavnGZUwPGvxvwfWPHIA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.24.2.tgz",
+      "integrity": "sha512-UN8HXjtJ0k/Mj6a9+5u6+2eZ2ERD7Edt1Q9IZiB5UZAIdPnVKDoG7mdTVGhHJIeEml60JteamR3qhsr1r8gXvg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.24.2.tgz",
+      "integrity": "sha512-TvW7wE/89PYW+IevEJXZ5sF6gJRDY/14hyIGFXdIucxCsbRmLUcjseQu1SyTko+2idmCw94TgyaEZi9HUSOe3Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.24.2.tgz",
+      "integrity": "sha512-n0WRM/gWIdU29J57hJyUdIsk0WarGd6To0s+Y+LwvlC55wt+GT/OgkwoXCXvIue1i1sSNWblHEig00GBWiJgfA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.24.2.tgz",
+      "integrity": "sha512-7HnAD6074BW43YvvUmE/35Id9/NB7BeX5EoNkK9obndmZBUk8xmJJeU7DwmUeN7tkysslb2eSl6CTrYz6oEMQg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.24.2.tgz",
+      "integrity": "sha512-sfv0tGPQhcZOgTKO3oBE9xpHuUqguHvSo4jl+wjnKwFpapx+vUDcawbwPNuBIAYdRAvIDBfZVvXprIj3HA+Ugw==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.24.2.tgz",
+      "integrity": "sha512-CN9AZr8kEndGooS35ntToZLTQLHEjtVB5n7dl8ZcTZMonJ7CCfStrYhrzF97eAecqVbVJ7APOEe18RPI4KLhwQ==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.24.2.tgz",
+      "integrity": "sha512-iMkk7qr/wl3exJATwkISxI7kTcmHKE+BlymIAbHO8xanq/TjHaaVThFF6ipWzPHryoFsesNQJPE/3wFJw4+huw==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.24.2.tgz",
+      "integrity": "sha512-shsVrgCZ57Vr2L8mm39kO5PPIb+843FStGt7sGGoqiiWYconSxwTiuswC1VJZLCjNiMLAMh34jg4VSEQb+iEbw==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.24.2.tgz",
+      "integrity": "sha512-4eSFWnU9Hhd68fW16GD0TINewo1L6dRrB+oLNNbYyMUAeOD2yCK5KXGK1GH4qD/kT+bTEXjsyTCiJGHPZ3eM9Q==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.24.2.tgz",
+      "integrity": "sha512-S0Bh0A53b0YHL2XEXC20bHLuGMOhFDO6GN4b3YjRLK//Ep3ql3erpNcPlEFed93hsQAjAQDNsvcK+hV90FubSw==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/linux-x64": {
       "version": "0.24.2",
       "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.24.2.tgz",
@@ -232,6 +486,7 @@
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
@@ -240,17 +495,157 @@
         "node": ">=18"
       }
     },
-    "node_modules/@eslint-community/eslint-utils": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz",
-      "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==",
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.24.2.tgz",
+      "integrity": "sha512-wuLK/VztRRpMt9zyHSazyCVdCXlpHkKm34WUyinD2lzK07FAHTq0KQvZZlXikNWkDGoT6x3TD51jKQ7gMVpopw==",
+      "cpu": [
+        "arm64"
+      ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.24.2.tgz",
+      "integrity": "sha512-VefFaQUc4FMmJuAxmIHgUmfNiLXY438XrL4GDNV1Y1H/RW3qow68xTwjZKfj/+Plp9NANmzbH5R40Meudu8mmw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.24.2.tgz",
+      "integrity": "sha512-YQbi46SBct6iKnszhSvdluqDmxCJA+Pu280Av9WICNwQmMxV7nLRHZfjQzwbPs3jeWnuAhE9Jy0NrnJ12Oz+0A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.24.2.tgz",
+      "integrity": "sha512-+iDS6zpNM6EnJyWv0bMGLWSWeXGN/HTaF/LXHXHwejGsVi+ooqDfMCCTerNFxEkM3wYVcExkeGXNqshc9iMaOA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.24.2.tgz",
+      "integrity": "sha512-hTdsW27jcktEvpwNHJU4ZwWFGkz2zRJUz8pvddmXPtXDzVKTTINmlmga3ZzwcuMpUvLw7JkLy9QLKyGpD2Yxig==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.24.2.tgz",
+      "integrity": "sha512-LihEQ2BBKVFLOC9ZItT9iFprsE9tqjDjnbulhHoFxYQtQfai7qfluVODIYxt1PgdoyQkz23+01rzwNwYfutxUQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.24.2.tgz",
+      "integrity": "sha512-q+iGUwfs8tncmFC9pcnD5IvRHAzmbwQ3GPS5/ceCyHdjXubwQWI12MKWSNSMYLJMq23/IUCvJMS76PDqXe1fxA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.24.2",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.24.2.tgz",
+      "integrity": "sha512-7VTgWzgMGvup6aSqDPLiW5zHaxYJGTO4OokMjIlrCtf+VpEL+cXKtCvg723iguPYI5oaUNdS+/V7OU2gvXVWEg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@eslint-community/eslint-utils": {
+      "version": "4.9.0",
+      "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz",
+      "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "eslint-visitor-keys": "^3.3.0"
+        "eslint-visitor-keys": "^3.4.3"
       },
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      },
       "peerDependencies": {
         "eslint": "^6.0.0 || ^7.0.0 || >=8.0.0"
       }
@@ -260,6 +655,7 @@
       "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz",
       "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
       },
@@ -268,10 +664,11 @@
       }
     },
     "node_modules/@eslint-community/regexpp": {
-      "version": "4.12.1",
-      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.1.tgz",
-      "integrity": "sha512-CCZCDJuduB9OUkFkY2IgppNZMi2lBQgD2qzwXkEia16cge2pijY/aXi96CJMquDMn3nJdlPV1A5KrJEXwfLNzQ==",
+      "version": "4.12.2",
+      "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz",
+      "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^12.0.0 || ^14.0.0 || >=16.0.0"
       }
@@ -281,6 +678,7 @@
       "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.19.2.tgz",
       "integrity": "sha512-GNKqxfHG2ySmJOBSHg7LxeUx4xpuCoFjacmlCoYWEbaPXLwvfIjixRI12xCQZeULksQb23uiA8F40w5TojpV7w==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@eslint/object-schema": "^2.1.6",
         "debug": "^4.3.1",
@@ -295,6 +693,7 @@
       "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.11.0.tgz",
       "integrity": "sha512-DWUB2pksgNEb6Bz2fggIy1wh6fGgZP4Xyy/Mt0QZPiloKKXerbqq9D3SBQTlCRYOrcRPu4vuz+CGjwdfqxnoWA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@types/json-schema": "^7.0.15"
       },
@@ -303,10 +702,11 @@
       }
     },
     "node_modules/@eslint/eslintrc": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.0.tgz",
-      "integrity": "sha512-yaVPAiNAalnCZedKLdR21GOGILMLKPyqSLWaAjQFvYA2i/ciDi8ArYVr69Anohb6cH2Ukhqti4aFnYyPm8wdwQ==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz",
+      "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ajv": "^6.12.4",
         "debug": "^4.3.2",
@@ -330,6 +730,7 @@
       "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz",
       "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -342,26 +743,29 @@
       "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.20.0.tgz",
       "integrity": "sha512-iZA07H9io9Wn836aVTytRaNqh00Sad+EamwOVJT12GTLw1VGMFV/4JaME+JjLtr9fiGaoWgYnS54wrfWsSs4oQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
     "node_modules/@eslint/object-schema": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.6.tgz",
-      "integrity": "sha512-RBMg5FRL0I0gs51M/guSAj5/e14VQ4tpZnQNWwuDT66P14I43ItmPfIZRhO9fUVIPOAQXU47atlywZ/czoqFPA==",
+      "version": "2.1.7",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz",
+      "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       }
     },
     "node_modules/@eslint/plugin-kit": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.7.tgz",
-      "integrity": "sha512-JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==",
+      "version": "0.2.8",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.2.8.tgz",
+      "integrity": "sha512-ZAoA40rNMPwSm+AeHpCq8STiNAwzWLJuP8Xv4CHIc9wv/PSuExjMrmjfYNj682vW0OOiZ1HKxzvjQr9XZIisQA==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
-        "@eslint/core": "^0.12.0",
+        "@eslint/core": "^0.13.0",
         "levn": "^0.4.1"
       },
       "engines": {
@@ -369,10 +773,11 @@
       }
     },
     "node_modules/@eslint/plugin-kit/node_modules/@eslint/core": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.12.0.tgz",
-      "integrity": "sha512-cmrR6pytBuSMTaBweKoGMwu3EiHiEC+DoyupPmlZ0HxBJBtIxwe+j/E4XPIKNx+Q74c8lXKPwYawBf5glsTkHg==",
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.13.0.tgz",
+      "integrity": "sha512-yfkgDw1KR66rkT5A8ci4irzDysN7FRpq3ttJolR88OqQikAWqwA8j5VZyas+vjyBNFIJ7MfybJ9plMILI2UrCw==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@types/json-schema": "^7.0.15"
       },
@@ -381,28 +786,31 @@
       }
     },
     "node_modules/@floating-ui/core": {
-      "version": "1.6.8",
-      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.6.8.tgz",
-      "integrity": "sha512-7XJ9cPU+yI2QeLS+FCSlqNFZJq8arvswefkZrYI1yQBbftw6FyrZOxYSh+9S7z7TpeWlRt9zJ5IhM1WIL334jA==",
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.3.tgz",
+      "integrity": "sha512-sGnvb5dmrJaKEZ+LDIpguvdX3bDlEllmv4/ClQ9awcmCZrlx5jQyyMWFM5kBI+EyNOCDDiKk8il0zeuX3Zlg/w==",
+      "license": "MIT",
       "dependencies": {
-        "@floating-ui/utils": "^0.2.8"
+        "@floating-ui/utils": "^0.2.10"
       }
     },
     "node_modules/@floating-ui/dom": {
-      "version": "1.6.11",
-      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.6.11.tgz",
-      "integrity": "sha512-qkMCxSR24v2vGkhYDo/UzxfJN3D4syqSjyuTFz6C7XcpU1pASPRieNI0Kj5VP3/503mOfYiGY891ugBX1GlABQ==",
+      "version": "1.7.4",
+      "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.4.tgz",
+      "integrity": "sha512-OOchDgh4F2CchOX94cRVqhvy7b3AFb+/rQXyswmzmGakRfkMgoWVjfnLWkRirfLEfuD4ysVW16eXzwt3jHIzKA==",
+      "license": "MIT",
       "dependencies": {
-        "@floating-ui/core": "^1.6.0",
-        "@floating-ui/utils": "^0.2.8"
+        "@floating-ui/core": "^1.7.3",
+        "@floating-ui/utils": "^0.2.10"
       }
     },
     "node_modules/@floating-ui/react-dom": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.2.tgz",
-      "integrity": "sha512-06okr5cgPzMNBy+Ycse2A6udMi4bqwW/zgBF/rwjcNqWkyr82Mcg8b0vjX8OJpZFy/FKjJmw6wV7t44kK6kW7A==",
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.6.tgz",
+      "integrity": "sha512-4JX6rEatQEvlmgU80wZyq9RT96HZJa88q8hp0pBd+LrczeDI4o6uA2M+uvxngVHo4Ihr8uibXxH6+70zhAFrVw==",
+      "license": "MIT",
       "dependencies": {
-        "@floating-ui/dom": "^1.0.0"
+        "@floating-ui/dom": "^1.7.4"
       },
       "peerDependencies": {
         "react": ">=16.8.0",
@@ -410,19 +818,22 @@
       }
     },
     "node_modules/@floating-ui/utils": {
-      "version": "0.2.8",
-      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.8.tgz",
-      "integrity": "sha512-kym7SodPp8/wloecOpcmSnWJsK7M0E5Wg8UcFA+uO4B9s5d0ywXOEro/8HM9x0rW+TljRzul/14UYz3TleT3ig=="
+      "version": "0.2.10",
+      "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.10.tgz",
+      "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==",
+      "license": "MIT"
     },
     "node_modules/@fontsource/inter": {
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/@fontsource/inter/-/inter-5.1.1.tgz",
-      "integrity": "sha512-weN3E+rq0Xb3Z93VHJ+Rc7WOQX9ETJPTAJ+gDcaMHtjft67L58sfS65rAjC5tZUXQ2FdZ/V1/sSzCwZ6v05kJw=="
+      "integrity": "sha512-weN3E+rq0Xb3Z93VHJ+Rc7WOQX9ETJPTAJ+gDcaMHtjft67L58sfS65rAjC5tZUXQ2FdZ/V1/sSzCwZ6v05kJw==",
+      "license": "OFL-1.1"
     },
     "node_modules/@heroicons/react": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/@heroicons/react/-/react-2.2.0.tgz",
       "integrity": "sha512-LMcepvRaS9LYHJGsF0zzmgKCUim/X3N/DQKc4jepAXJ7l8QxJ1PmxJzqplF2Z3FE4PqBAIGyJAQ/w4B5dsqbtQ==",
+      "license": "MIT",
       "peerDependencies": {
         "react": ">= 16 || ^19.0.0-rc"
       }
@@ -432,41 +843,31 @@
       "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
       "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=18.18.0"
       }
     },
     "node_modules/@humanfs/node": {
-      "version": "0.16.6",
-      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.6.tgz",
-      "integrity": "sha512-YuI2ZHQL78Q5HbhDiBA1X4LmYdXCKCMQIfw0pw7piHJwyREFebJUvrQN4cMssyES6x+vfUbx1CIpaQUKYdQZOw==",
+      "version": "0.16.7",
+      "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz",
+      "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@humanfs/core": "^0.19.1",
-        "@humanwhocodes/retry": "^0.3.0"
+        "@humanwhocodes/retry": "^0.4.0"
       },
       "engines": {
         "node": ">=18.18.0"
       }
     },
-    "node_modules/@humanfs/node/node_modules/@humanwhocodes/retry": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.3.1.tgz",
-      "integrity": "sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==",
-      "dev": true,
-      "engines": {
-        "node": ">=18.18"
-      },
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/nzakas"
-      }
-    },
     "node_modules/@humanwhocodes/module-importer": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz",
       "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=12.22"
       },
@@ -476,10 +877,11 @@
       }
     },
     "node_modules/@humanwhocodes/retry": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.2.tgz",
-      "integrity": "sha512-xeO57FpIu4p1Ri3Jq/EXq4ClRm86dVF2z/+kvFnyqVYRavTZmaFaUBbWCOuuTh0o/g7DSsk6kc2vrS4Vl5oPOQ==",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz",
+      "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": ">=18.18"
       },
@@ -492,6 +894,7 @@
       "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",
@@ -504,59 +907,36 @@
         "node": ">=12"
       }
     },
-    "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
-      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
+    "node_modules/@jridgewell/gen-mapping": {
+      "version": "0.3.13",
+      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz",
+      "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==",
       "license": "MIT",
       "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
-    "node_modules/@jridgewell/gen-mapping": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz",
-      "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==",
-      "dependencies": {
-        "@jridgewell/set-array": "^1.2.1",
-        "@jridgewell/sourcemap-codec": "^1.4.10",
+        "@jridgewell/sourcemap-codec": "^1.5.0",
         "@jridgewell/trace-mapping": "^0.3.24"
-      },
-      "engines": {
-        "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/resolve-uri": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz",
       "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==",
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/@jridgewell/set-array": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz",
-      "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz",
-      "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ=="
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz",
+      "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==",
+      "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
-      "version": "0.3.25",
-      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz",
-      "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==",
+      "version": "0.3.31",
+      "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz",
+      "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==",
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
         "@jridgewell/sourcemap-codec": "^1.4.14"
@@ -566,6 +946,7 @@
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
       "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "2.0.5",
         "run-parallel": "^1.1.9"
@@ -578,6 +959,7 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
       "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -586,6 +968,7 @@
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
       "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.scandir": "2.1.5",
         "fastq": "^1.6.0"
@@ -598,6 +981,7 @@
       "version": "0.5.5",
       "resolved": "https://registry.npmjs.org/@number-flow/react/-/react-0.5.5.tgz",
       "integrity": "sha512-Zdju5n0osxrb+7jbcpUJ9L2VJ2+9ptwjz5+A+2wq9Q32hs3PW/noPJjHtLTrtGINM9mEw76DcDg0ac/dx6j1aA==",
+      "license": "MIT",
       "dependencies": {
         "esm-env": "^1.1.4",
         "number-flow": "0.5.3"
@@ -611,6 +995,7 @@
       "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"
@@ -619,17 +1004,20 @@
     "node_modules/@radix-ui/number": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.0.tgz",
-      "integrity": "sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ=="
+      "integrity": "sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ==",
+      "license": "MIT"
     },
     "node_modules/@radix-ui/primitive": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.1.tgz",
-      "integrity": "sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA=="
+      "integrity": "sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA==",
+      "license": "MIT"
     },
     "node_modules/@radix-ui/react-accordion": {
       "version": "1.2.3",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-accordion/-/react-accordion-1.2.3.tgz",
       "integrity": "sha512-RIQ15mrcvqIkDARJeERSuXSry2N8uYnxkdDetpfmalT/+0ntOXLkFOsh9iwlAsCv+qcmhZjbdJogIm6WBa6c4A==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-collapsible": "1.1.3",
@@ -660,6 +1048,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.2.tgz",
       "integrity": "sha512-G+KcpzXHq24iH0uGG/pF8LyzpFJYGD4RfLjCIBfGdSLXvjLHST31RUiRVrupIBMvIppMgSzQ6l66iAxl03tdlg==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-primitive": "2.0.2"
       },
@@ -682,6 +1071,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.1.4.tgz",
       "integrity": "sha512-wP0CPAHq+P5I4INKe3hJrIa1WoNqqrejzW+zoU0rOvo1b9gDEJJFl2rYfO1PYJUQCc2H1WZxIJmyv9BS8i5fLw==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
@@ -711,6 +1101,7 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.3.tgz",
       "integrity": "sha512-jFSerheto1X03MUC0g6R7LedNW9EEGWdg9W1+MlpkMLwGkgkbUXLPBH/KIuWKXUoeYRVY11llqbTBDzuLg7qrw==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
@@ -740,6 +1131,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.2.tgz",
       "integrity": "sha512-9z54IEKRxIa9VityapoEYMuByaG42iSy1ZXlY2KcuLSEtq8x4987/N6m15ppoMffgZX72gER2uHe1D9Y6Unlcw==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-context": "1.1.1",
@@ -765,6 +1157,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.1.tgz",
       "integrity": "sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==",
+      "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
         "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
@@ -779,6 +1172,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.1.tgz",
       "integrity": "sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==",
+      "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
         "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
@@ -793,6 +1187,7 @@
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.6.tgz",
       "integrity": "sha512-/IVhJV5AceX620DUJ4uYVMymzsipdKBzo3edo+omeskCKGm9FRHM0ebIdbPnlQVJqyuHbuBltQUOG2mOTq2IYw==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
@@ -828,6 +1223,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.0.tgz",
       "integrity": "sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==",
+      "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
         "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
@@ -842,6 +1238,7 @@
       "version": "1.1.5",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.5.tgz",
       "integrity": "sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
@@ -868,6 +1265,7 @@
       "version": "2.1.6",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.6.tgz",
       "integrity": "sha512-no3X7V5fD487wab/ZYSHXq3H37u4NVeLDKI/Ks724X/eEFSSEFYZxWgsIlr1UBeEyDaM29HM5x9p1Nv8DuTYPA==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
@@ -896,6 +1294,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.1.tgz",
       "integrity": "sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==",
+      "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
         "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
@@ -910,6 +1309,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.2.tgz",
       "integrity": "sha512-zxwE80FCU7lcXUGWkdt6XpTTCKPitG1XKOwViTxHVKIJhZl9MvIl2dVHeZENCWD9+EdWv05wlaEkRXUykU27RA==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-primitive": "2.0.2",
@@ -934,6 +1334,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.0.tgz",
       "integrity": "sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-use-layout-effect": "1.1.0"
       },
@@ -951,6 +1352,7 @@
       "version": "2.1.2",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.2.tgz",
       "integrity": "sha512-zo1uGMTaNlHehDyFQcDZXRJhUPDuukcnHz0/jnrup0JA6qL+AFpAnty+7VKa9esuU5xTblAZzTGYJKSKaBxBhw==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-primitive": "2.0.2"
       },
@@ -973,6 +1375,7 @@
       "version": "2.1.6",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.6.tgz",
       "integrity": "sha512-tBBb5CXDJW3t2mo9WlO7r6GTmWV0F0uzHZVFmlRmYpiSK1CDU5IKojP1pm7oknpBOrFZx/YgBRW9oorPO2S/Lg==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-collection": "1.1.2",
@@ -1012,6 +1415,7 @@
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.6.tgz",
       "integrity": "sha512-NQouW0x4/GnkFJ/pRqsIS3rM/k97VzKnVb2jB7Gq7VEGPy5g7uNV1ykySFt7eWSp3i2uSGFwaJcvIRJBAHmmFg==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
@@ -1048,6 +1452,7 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.2.tgz",
       "integrity": "sha512-Rvqc3nOpwseCyj/rgjlJDYAgyfw7OC1tTkKn2ivhaMGcYt8FSBlahHOZak2i3QwkRXUXgGgzeEe2RuqeEHuHgA==",
+      "license": "MIT",
       "dependencies": {
         "@floating-ui/react-dom": "^2.0.0",
         "@radix-ui/react-arrow": "1.1.2",
@@ -1079,6 +1484,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.4.tgz",
       "integrity": "sha512-sn2O9k1rPFYVyKd5LAJfo96JlSGVFpa1fS6UuBJfrZadudiw5tAmru+n1x7aMRQ84qDM71Zh1+SzK5QwU0tJfA==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-primitive": "2.0.2",
         "@radix-ui/react-use-layout-effect": "1.1.0"
@@ -1102,6 +1508,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.2.tgz",
       "integrity": "sha512-18TFr80t5EVgL9x1SwF/YGtfG+l0BS0PRAlCWBDoBEiDQjeKgnNZRVJp/oVBl24sr3Gbfwc/Qpj4OcWTQMsAEg==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-compose-refs": "1.1.1",
         "@radix-ui/react-use-layout-effect": "1.1.0"
@@ -1125,6 +1532,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.2.tgz",
       "integrity": "sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-slot": "1.1.2"
       },
@@ -1147,6 +1555,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-progress/-/react-progress-1.1.2.tgz",
       "integrity": "sha512-u1IgJFQ4zNAUTjGdDL5dcl/U8ntOR6jsnhxKb5RKp5Ozwl88xKR9EqRZOe/Mk8tnx0x5tNUe2F+MzsyjqMg0MA==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-context": "1.1.1",
         "@radix-ui/react-primitive": "2.0.2"
@@ -1170,6 +1579,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.2.tgz",
       "integrity": "sha512-zgMQWkNO169GtGqRvYrzb0Zf8NhMHS2DuEB/TiEmVnpr5OqPU3i8lfbxaAmC2J/KYuIQxyoQQ6DxepyXp61/xw==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-collection": "1.1.2",
@@ -1200,6 +1610,7 @@
       "version": "2.1.6",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.1.6.tgz",
       "integrity": "sha512-T6ajELxRvTuAMWH0YmRJ1qez+x4/7Nq7QIx7zJ0VK3qaEWdnWpNbEDnmWldG1zBDwqrLy5aLMUWcoGirVj5kMg==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/number": "1.1.0",
         "@radix-ui/primitive": "1.1.1",
@@ -1242,6 +1653,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.2.tgz",
       "integrity": "sha512-oZfHcaAp2Y6KFBX6I5P1u7CQoy4lheCGiYj+pGFrHy8E/VNRb5E39TkTr3JrV520csPBTZjkuKFdEsjS5EUNKQ==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-primitive": "2.0.2"
       },
@@ -1264,6 +1676,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.2.tgz",
       "integrity": "sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-compose-refs": "1.1.1"
       },
@@ -1281,6 +1694,7 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.1.3.tgz",
       "integrity": "sha512-1nc+vjEOQkJVsJtWPSiISGT6OKm4SiOdjMo+/icLxo2G4vxz1GntC5MzfL4v8ey9OEfw787QCD1y3mUv0NiFEQ==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
@@ -1309,6 +1723,7 @@
       "version": "1.1.8",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-tooltip/-/react-tooltip-1.1.8.tgz",
       "integrity": "sha512-YAA2cu48EkJZdAMHC0dqo9kialOcRStbtiY4nJPaht7Ptrhcvpo+eDChaM6BIs8kL6a8Z5l5poiqLnXcNduOkA==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/primitive": "1.1.1",
         "@radix-ui/react-compose-refs": "1.1.1",
@@ -1342,6 +1757,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz",
       "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==",
+      "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
         "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
@@ -1356,6 +1772,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz",
       "integrity": "sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-use-callback-ref": "1.1.0"
       },
@@ -1373,6 +1790,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz",
       "integrity": "sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-use-callback-ref": "1.1.0"
       },
@@ -1390,6 +1808,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz",
       "integrity": "sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==",
+      "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
         "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
@@ -1404,6 +1823,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.0.tgz",
       "integrity": "sha512-Z/e78qg2YFnnXcW88A4JmTtm4ADckLno6F7OXotmkQfeuCVaKuYzqAATPhVzl3delXE7CxIV8shofPn3jPc5Og==",
+      "license": "MIT",
       "peerDependencies": {
         "@types/react": "*",
         "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc"
@@ -1418,6 +1838,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.0.tgz",
       "integrity": "sha512-0Fmkebhr6PiseyZlYAOtLS+nb7jLmpqTrJyv61Pe68MKYW6OWdRE2kI70TaYY27u7H0lajqM3hSMMLFq18Z7nQ==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/rect": "1.1.0"
       },
@@ -1435,6 +1856,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.0.tgz",
       "integrity": "sha512-XW3/vWuIXHa+2Uwcc2ABSfcCledmXhhQPlGbfcRXbiUQI5Icjcg19BGCZVKKInYbvUCut/ufbbLLPFC5cbb1hw==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-use-layout-effect": "1.1.0"
       },
@@ -1452,6 +1874,7 @@
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.2.tgz",
       "integrity": "sha512-1SzA4ns2M1aRlvxErqhLHsBHoS5eI5UUcI2awAMgGUp4LoaoWOKYmvqDY2s/tltuPkh3Yk77YF/r3IRj+Amx4Q==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-primitive": "2.0.2"
       },
@@ -1473,43 +1896,327 @@
     "node_modules/@radix-ui/rect": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.0.tgz",
-      "integrity": "sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg=="
+      "integrity": "sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==",
+      "license": "MIT"
     },
-    "node_modules/@rollup/rollup-linux-x64-gnu": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.34.6.tgz",
-      "integrity": "sha512-Sht4aFvmA4ToHd2vFzwMFaQCiYm2lDFho5rPcvPBT5pCdC+GwHG6CMch4GQfmWTQ1SwRKS0dhDYb54khSrjDWw==",
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.52.5.tgz",
+      "integrity": "sha512-8c1vW4ocv3UOMp9K+gToY5zL2XiiVw3k7f1ksf4yO1FlDFQ1C2u72iACFnSOceJFsWskc2WZNqeRhFRPzv+wtQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.52.5.tgz",
+      "integrity": "sha512-mQGfsIEFcu21mvqkEKKu2dYmtuSZOBMmAl5CFlPGLY94Vlcm+zWApK7F/eocsNzp8tKmbeBP8yXyAbx0XHsFNA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.52.5.tgz",
+      "integrity": "sha512-takF3CR71mCAGA+v794QUZ0b6ZSrgJkArC+gUiG6LB6TQty9T0Mqh3m2ImRBOxS2IeYBo4lKWIieSvnEk2OQWA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.52.5.tgz",
+      "integrity": "sha512-W901Pla8Ya95WpxDn//VF9K9u2JbocwV/v75TE0YIHNTbhqUTv9w4VuQ9MaWlNOkkEfFwkdNhXgcLqPSmHy0fA==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.52.5.tgz",
+      "integrity": "sha512-QofO7i7JycsYOWxe0GFqhLmF6l1TqBswJMvICnRUjqCx8b47MTo46W8AoeQwiokAx3zVryVnxtBMcGcnX12LvA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.52.5.tgz",
+      "integrity": "sha512-jr21b/99ew8ujZubPo9skbrItHEIE50WdV86cdSoRkKtmWa+DDr6fu2c/xyRT0F/WazZpam6kk7IHBerSL7LDQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.52.5.tgz",
+      "integrity": "sha512-PsNAbcyv9CcecAUagQefwX8fQn9LQ4nZkpDboBOttmyffnInRy8R8dSg6hxxl2Re5QhHBf6FYIDhIj5v982ATQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.52.5.tgz",
+      "integrity": "sha512-Fw4tysRutyQc/wwkmcyoqFtJhh0u31K+Q6jYjeicsGJJ7bbEq8LwPWV/w0cnzOqR2m694/Af6hpFayLJZkG2VQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.52.5.tgz",
+      "integrity": "sha512-a+3wVnAYdQClOTlyapKmyI6BLPAFYs0JM8HRpgYZQO02rMR09ZcV9LbQB+NL6sljzG38869YqThrRnfPMCDtZg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.52.5.tgz",
+      "integrity": "sha512-AvttBOMwO9Pcuuf7m9PkC1PUIKsfaAJ4AYhy944qeTJgQOqJYJ9oVl2nYgY7Rk0mkbsuOpCAYSs6wLYB2Xiw0Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.52.5.tgz",
+      "integrity": "sha512-DkDk8pmXQV2wVrF6oq5tONK6UHLz/XcEVow4JTTerdeV1uqPeHxwcg7aFsfnSm9L+OO8WJsWotKM2JJPMWrQtA==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.52.5.tgz",
+      "integrity": "sha512-W/b9ZN/U9+hPQVvlGwjzi+Wy4xdoH2I8EjaCkMvzpI7wJUs8sWJ03Rq96jRnHkSrcHTpQe8h5Tg3ZzUPGauvAw==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.52.5.tgz",
+      "integrity": "sha512-sjQLr9BW7R/ZiXnQiWPkErNfLMkkWIoCz7YMn27HldKsADEKa5WYdobaa1hmN6slu9oWQbB6/jFpJ+P2IkVrmw==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.52.5.tgz",
+      "integrity": "sha512-hq3jU/kGyjXWTvAh2awn8oHroCbrPm8JqM7RUpKjalIRWWXE01CQOf/tUNWNHjmbMHg/hmNCwc/Pz3k1T/j/Lg==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.52.5.tgz",
+      "integrity": "sha512-gn8kHOrku8D4NGHMK1Y7NA7INQTRdVOntt1OCYypZPRt6skGbddska44K8iocdpxHTMMNui5oH4elPH4QOLrFQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-x64-gnu": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.52.5.tgz",
+      "integrity": "sha512-hXGLYpdhiNElzN770+H2nlx+jRog8TyynpTVzdlc6bndktjKWyZyiCsuDAlpd+j+W+WNqfcyAWz9HxxIGfZm1Q==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
     "node_modules/@rollup/rollup-linux-x64-musl": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.34.6.tgz",
-      "integrity": "sha512-zmmpOQh8vXc2QITsnCiODCDGXFC8LMi64+/oPpPx5qz3pqv0s6x46ps4xoycfUiVZps5PFn1gksZzo4RGTKT+A==",
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.52.5.tgz",
+      "integrity": "sha512-arCGIcuNKjBoKAXD+y7XomR9gY6Mw7HnFBv5Rw7wQRvwYLR7gBAgV7Mb2QTyjXfTveBNFAtPt46/36vV9STLNg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.52.5.tgz",
+      "integrity": "sha512-QoFqB6+/9Rly/RiPjaomPLmR/13cgkIGfA40LHly9zcH1S0bN2HVFYk3a1eAyHQyjs3ZJYlXvIGtcCs5tko9Cw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.52.5.tgz",
+      "integrity": "sha512-w0cDWVR6MlTstla1cIfOGyl8+qb93FlAVutcor14Gf5Md5ap5ySfQ7R9S/NjNaMLSFdUnKGEasmVnu3lCMqB7w==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.52.5.tgz",
+      "integrity": "sha512-Aufdpzp7DpOTULJCuvzqcItSGDH73pF3ko/f+ckJhxQyHtp67rHw3HMNxoIdDMUITJESNE6a8uh4Lo4SLouOUg==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.52.5.tgz",
+      "integrity": "sha512-UGBUGPFp1vkj6p8wCRraqNhqwX/4kNQPS57BCFc8wYh0g94iVIW33wJtQAx3G7vrjjNtRaxiMUylM0ktp/TRSQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.52.5.tgz",
+      "integrity": "sha512-TAcgQh2sSkykPRWLrdyy2AiceMckNf5loITqXxFI5VuQjS5tSuw3WlwdN8qv8vzjLAUTvYaH/mVjSFpbkFbpTg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@swc/core": {
-      "version": "1.10.15",
-      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.10.15.tgz",
-      "integrity": "sha512-/iFeQuNaGdK7mfJbQcObhAhsMqLT7qgMYl7jX2GEIO+VDTejESpzAyKwaMeYXExN8D6e5BRHBCe7M5YlsuzjDA==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.15.0.tgz",
+      "integrity": "sha512-8SnJV+JV0rYbfSiEiUvYOmf62E7QwsEG+aZueqSlKoxFt0pw333+bgZSQXGUV6etXU88nxur0afVMaINujBMSw==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@swc/counter": "^0.1.3",
-        "@swc/types": "^0.1.17"
+        "@swc/types": "^0.1.25"
       },
       "engines": {
         "node": ">=10"
@@ -1519,19 +2226,19 @@
         "url": "https://opencollective.com/swc"
       },
       "optionalDependencies": {
-        "@swc/core-darwin-arm64": "1.10.15",
-        "@swc/core-darwin-x64": "1.10.15",
-        "@swc/core-linux-arm-gnueabihf": "1.10.15",
-        "@swc/core-linux-arm64-gnu": "1.10.15",
-        "@swc/core-linux-arm64-musl": "1.10.15",
-        "@swc/core-linux-x64-gnu": "1.10.15",
-        "@swc/core-linux-x64-musl": "1.10.15",
-        "@swc/core-win32-arm64-msvc": "1.10.15",
-        "@swc/core-win32-ia32-msvc": "1.10.15",
-        "@swc/core-win32-x64-msvc": "1.10.15"
+        "@swc/core-darwin-arm64": "1.15.0",
+        "@swc/core-darwin-x64": "1.15.0",
+        "@swc/core-linux-arm-gnueabihf": "1.15.0",
+        "@swc/core-linux-arm64-gnu": "1.15.0",
+        "@swc/core-linux-arm64-musl": "1.15.0",
+        "@swc/core-linux-x64-gnu": "1.15.0",
+        "@swc/core-linux-x64-musl": "1.15.0",
+        "@swc/core-win32-arm64-msvc": "1.15.0",
+        "@swc/core-win32-ia32-msvc": "1.15.0",
+        "@swc/core-win32-x64-msvc": "1.15.0"
       },
       "peerDependencies": {
-        "@swc/helpers": "*"
+        "@swc/helpers": ">=0.5.17"
       },
       "peerDependenciesMeta": {
         "@swc/helpers": {
@@ -1539,14 +2246,100 @@
         }
       }
     },
-    "node_modules/@swc/core-linux-x64-gnu": {
-      "version": "1.10.15",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.10.15.tgz",
-      "integrity": "sha512-S1+ZEEn3+a/MiMeQqQypbwTGoBG8/sPoCvpNbk+uValyygT+jSn3U0xVr45FbukpmMB+NhBMqfedMLqKA0QnJA==",
+    "node_modules/@swc/core-darwin-arm64": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.0.tgz",
+      "integrity": "sha512-TBKWkbnShnEjlIbO4/gfsrIgAqHBVqgPWLbWmPdZ80bF393yJcLgkrb7bZEnJs6FCbSSuGwZv2rx1jDR2zo6YA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-darwin-x64": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.15.0.tgz",
+      "integrity": "sha512-f5JKL1v1H56CIZc1pVn4RGPOfnWqPwmuHdpf4wesvXunF1Bx85YgcspW5YxwqG5J9g3nPU610UFuExJXVUzOiQ==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm-gnueabihf": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.0.tgz",
+      "integrity": "sha512-duK6nG+WyuunnfsfiTUQdzC9Fk8cyDLqT9zyXvY2i2YgDu5+BH5W6wM5O4mDNCU5MocyB/SuF5YDF7XySnowiQ==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "Apache-2.0",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm64-gnu": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.0.tgz",
+      "integrity": "sha512-ITe9iDtTRXM98B91rvyPP6qDVbhUBnmA/j4UxrHlMQ0RlwpqTjfZYZkD0uclOxSZ6qIrOj/X5CaoJlDUuQ0+Cw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-arm64-musl": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.0.tgz",
+      "integrity": "sha512-Q5ldc2bzriuzYEoAuqJ9Vr3FyZhakk5hiwDbniZ8tlEXpbjBhbOleGf9/gkhLaouDnkNUEazFW9mtqwUTRdh7Q==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-linux-x64-gnu": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.0.tgz",
+      "integrity": "sha512-pY4is+jEpOxlYCSnI+7N8Oxbap9TmTz5YT84tUvRTlOlTBwFAUlWFCX0FRwWJlsfP0TxbqhIe8dNNzlsEmJbXQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
       "optional": true,
       "os": [
         "linux"
@@ -1556,13 +2349,14 @@
       }
     },
     "node_modules/@swc/core-linux-x64-musl": {
-      "version": "1.10.15",
-      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.10.15.tgz",
-      "integrity": "sha512-qW+H9g/2zTJ4jP7NDw4VAALY0ZlNEKzYsEoSj/HKi7k3tYEHjMzsxjfsY9I8WZCft23bBdV3RTCPoxCshaj1CQ==",
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.0.tgz",
+      "integrity": "sha512-zYEt5eT8y8RUpoe7t5pjpoOdGu+/gSTExj8PV86efhj6ugB3bPlj3Y85ogdW3WMVXr4NvwqvzdaYGCZfXzSyVg==",
       "cpu": [
         "x64"
       ],
       "dev": true,
+      "license": "Apache-2.0 AND MIT",
       "optional": true,
       "os": [
         "linux"
@@ -1571,17 +2365,70 @@
         "node": ">=10"
       }
     },
+    "node_modules/@swc/core-win32-arm64-msvc": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.0.tgz",
+      "integrity": "sha512-zC1rmOgFH5v2BCbByOazEqs0aRNpTdLRchDExfcCfgKgeaD+IdpUOqp7i3VG1YzkcnbuZjMlXfM0ugpt+CddoA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-ia32-msvc": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.0.tgz",
+      "integrity": "sha512-7t9U9KwMwQblkdJIH+zX1V4q1o3o41i0HNO+VlnAHT5o+5qHJ963PHKJ/pX3P2UlZnBCY465orJuflAN4rAP9A==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@swc/core-win32-x64-msvc": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.0.tgz",
+      "integrity": "sha512-VE0Zod5vcs8iMLT64m5QS1DlTMXJFI/qSgtMDRx8rtZrnjt6/9NW8XUaiPJuRu8GluEO1hmHoyf1qlbY19gGSQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "Apache-2.0 AND MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@swc/counter": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz",
       "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==",
-      "dev": true
+      "dev": true,
+      "license": "Apache-2.0"
     },
     "node_modules/@swc/types": {
-      "version": "0.1.17",
-      "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.17.tgz",
-      "integrity": "sha512-V5gRru+aD8YVyCOMAjMpWR1Ui577DD5KSJsHP8RAxopAH22jFz6GZd/qxqjO6MJHQhcsjvjOFXyDhyLQUnMveQ==",
+      "version": "0.1.25",
+      "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.25.tgz",
+      "integrity": "sha512-iAoY/qRhNH8a/hBvm3zKj9qQ4oc2+3w1unPJa2XvTK3XjeLXtzcCingVPw/9e5mn1+0yPqxcBGp9Jf0pkfMb1g==",
       "dev": true,
+      "license": "Apache-2.0",
       "dependencies": {
         "@swc/counter": "^0.1.3"
       }
@@ -1590,6 +2437,7 @@
       "version": "5.66.4",
       "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.66.4.tgz",
       "integrity": "sha512-skM/gzNX4shPkqmdTCSoHtJAPMTtmIJNS0hE+xwTTUVYwezArCT34NMermABmBVUg5Ls5aiUXEDXfqwR1oVkcA==",
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
@@ -1599,6 +2447,7 @@
       "version": "5.65.0",
       "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.65.0.tgz",
       "integrity": "sha512-g5y7zc07U9D3esMdqUfTEVu9kMHoIaVBsD0+M3LPdAdD710RpTcLiNvJY1JkYXqkq9+NV+CQoemVNpQPBXVsJg==",
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/tannerlinsley"
@@ -1608,6 +2457,7 @@
       "version": "5.66.7",
       "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.66.7.tgz",
       "integrity": "sha512-qd3q/tUpF2K1xItfPZddk1k/8pSXnovg41XyCqJgPoyYEirMBtB0sVEVVQ/CsAOngzgWtBPXimVf4q4kM9uO6A==",
+      "license": "MIT",
       "dependencies": {
         "@tanstack/query-core": "5.66.4"
       },
@@ -1623,6 +2473,7 @@
       "version": "5.66.7",
       "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.66.7.tgz",
       "integrity": "sha512-40z4PPkz06tYIF0vwLZZIZfZxKUH4OAaBOR14blCFyYm6hlU6qc+M82mkZ+D00HcEMhV7P4XeJiEuDhFq0q9Qw==",
+      "license": "MIT",
       "dependencies": {
         "@tanstack/query-devtools": "5.65.0"
       },
@@ -1639,6 +2490,7 @@
       "version": "8.21.2",
       "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.21.2.tgz",
       "integrity": "sha512-11tNlEDTdIhMJba2RBH+ecJ9l1zgS2kjmexDPAraulc8jeNA4xocSNeyzextT0XJyASil4XsCYlJmf5jEWAtYg==",
+      "license": "MIT",
       "dependencies": {
         "@tanstack/table-core": "8.21.2"
       },
@@ -1658,6 +2510,7 @@
       "version": "8.21.2",
       "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.21.2.tgz",
       "integrity": "sha512-uvXk/U4cBiFMxt+p9/G7yUWI/UbHYbyghLCjlpWZ3mLeIZiUBSKcUnw9UnKkdRz7Z/N4UBuFLWQdJCjUe7HjvA==",
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       },
@@ -1670,6 +2523,7 @@
       "version": "5.2.2",
       "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-5.2.2.tgz",
       "integrity": "sha512-fYDQA9e6yTNmA13TLVSA+WMQRc5Bn/c0EUBditUHNfMMxN7M82c38b1kEggVE3pLpZ0FwkwJkUEKMiOi52JXFA==",
+      "license": "Apache-2.0",
       "dependencies": {
         "@babel/generator": "^7.26.5",
         "@babel/parser": "^7.26.7",
@@ -1702,27 +2556,32 @@
     "node_modules/@types/cookie": {
       "version": "0.6.0",
       "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA=="
+      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
+      "license": "MIT"
     },
     "node_modules/@types/d3-array": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.1.tgz",
-      "integrity": "sha512-Y2Jn2idRrLzUfAKV2LyRImR+y4oa2AntrgID95SHJxuMUrkNXmanDSed71sRNZysveJVt1hLLemQZIady0FpEg=="
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.2.tgz",
+      "integrity": "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==",
+      "license": "MIT"
     },
     "node_modules/@types/d3-color": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz",
-      "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A=="
+      "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==",
+      "license": "MIT"
     },
     "node_modules/@types/d3-ease": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz",
-      "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA=="
+      "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==",
+      "license": "MIT"
     },
     "node_modules/@types/d3-geo": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz",
       "integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==",
+      "license": "MIT",
       "dependencies": {
         "@types/geojson": "*"
       }
@@ -1731,68 +2590,79 @@
       "version": "3.0.4",
       "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz",
       "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==",
+      "license": "MIT",
       "dependencies": {
         "@types/d3-color": "*"
       }
     },
     "node_modules/@types/d3-path": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.0.tgz",
-      "integrity": "sha512-P2dlU/q51fkOc/Gfl3Ul9kicV7l+ra934qBFXCFhrZMOL6du1TM0pm1ThYvENukyOn5h9v+yMJ9Fn5JK4QozrQ=="
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz",
+      "integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==",
+      "license": "MIT"
     },
     "node_modules/@types/d3-scale": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.8.tgz",
-      "integrity": "sha512-gkK1VVTr5iNiYJ7vWDI+yUFFlszhNMtVeneJ6lUTKPjprsvLLI9/tgEGiXJOnlINJA8FyA88gfnQsHbybVZrYQ==",
+      "version": "4.0.9",
+      "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz",
+      "integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==",
+      "license": "MIT",
       "dependencies": {
         "@types/d3-time": "*"
       }
     },
     "node_modules/@types/d3-shape": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.6.tgz",
-      "integrity": "sha512-5KKk5aKGu2I+O6SONMYSNflgiP0WfZIQvVUMan50wHsLG1G94JlxEVnCpQARfTtzytuY0p/9PXXZb3I7giofIA==",
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.7.tgz",
+      "integrity": "sha512-VLvUQ33C+3J+8p+Daf+nYSOsjB4GXp19/S/aGo60m9h1v6XaxjiT82lKVWJCfzhtuZ3yD7i/TPeC/fuKLLOSmg==",
+      "license": "MIT",
       "dependencies": {
         "@types/d3-path": "*"
       }
     },
     "node_modules/@types/d3-time": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.3.tgz",
-      "integrity": "sha512-2p6olUZ4w3s+07q3Tm2dbiMZy5pCDfYwtLXXHUnVzXgQlZ/OyPtUz6OL382BkOuGlLXqfT+wqv8Fw2v8/0geBw=="
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz",
+      "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==",
+      "license": "MIT"
     },
     "node_modules/@types/d3-timer": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz",
-      "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw=="
+      "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==",
+      "license": "MIT"
     },
     "node_modules/@types/estree": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
-      "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw==",
-      "dev": true
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz",
+      "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==",
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/geojson": {
-      "version": "7946.0.14",
-      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.14.tgz",
-      "integrity": "sha512-WCfD5Ht3ZesJUsONdhvm84dmzWOiOzOAqOncN0++w0lBw1o8OuDNJF2McvvCef/yBqb/HYRahp1BYtODFQ8bRg=="
+      "version": "7946.0.16",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
+      "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
+      "license": "MIT"
     },
     "node_modules/@types/json-schema": {
       "version": "7.0.15",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
       "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/@types/luxon": {
       "version": "3.4.2",
       "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.4.2.tgz",
-      "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA=="
+      "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==",
+      "license": "MIT"
     },
     "node_modules/@types/node": {
       "version": "22.13.4",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.4.tgz",
       "integrity": "sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "undici-types": "~6.20.0"
       }
@@ -1802,6 +2672,7 @@
       "resolved": "https://registry.npmjs.org/@types/react/-/react-19.0.10.tgz",
       "integrity": "sha512-JuRQ9KXLEjaUNjTWpzuR231Z2WpIwczOkBEIvbHNCzQefFIT0L8IqE6NV6ULLyC1SI/i234JnDoMkfg+RjQj2g==",
       "devOptional": true,
+      "license": "MIT",
       "dependencies": {
         "csstype": "^3.0.2"
       }
@@ -1811,6 +2682,7 @@
       "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.0.4.tgz",
       "integrity": "sha512-4fSQ8vWFkg+TGhePfUzVmat3eC14TXYSsiiDSLI0dVLsrm9gZFABjPy/Qu6TKgl1tq1Bu1yDsuQgY3A3DOjCcg==",
       "devOptional": true,
+      "license": "MIT",
       "peerDependencies": {
         "@types/react": "^19.0.0"
       }
@@ -1820,6 +2692,7 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.24.1.tgz",
       "integrity": "sha512-ll1StnKtBigWIGqvYDVuDmXJHVH4zLVot1yQ4fJtLpL7qacwkxJc1T0bptqw+miBQ/QfUbhl1TcQ4accW5KUyA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/regexpp": "^4.10.0",
         "@typescript-eslint/scope-manager": "8.24.1",
@@ -1849,6 +2722,7 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.24.1.tgz",
       "integrity": "sha512-Tqoa05bu+t5s8CTZFaGpCH2ub3QeT9YDkXbPd3uQ4SfsLoh1/vv2GEYAioPoxCWJJNsenXlC88tRjwoHNts1oQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/scope-manager": "8.24.1",
         "@typescript-eslint/types": "8.24.1",
@@ -1873,6 +2747,7 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.24.1.tgz",
       "integrity": "sha512-OdQr6BNBzwRjNEXMQyaGyZzgg7wzjYKfX2ZBV3E04hUCBDv3GQCHiz9RpqdUIiVrMgJGkXm3tcEh4vFSHreS2Q==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/types": "8.24.1",
         "@typescript-eslint/visitor-keys": "8.24.1"
@@ -1890,6 +2765,7 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.24.1.tgz",
       "integrity": "sha512-/Do9fmNgCsQ+K4rCz0STI7lYB4phTtEXqqCAs3gZW0pnK7lWNkvWd5iW545GSmApm4AzmQXmSqXPO565B4WVrw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/typescript-estree": "8.24.1",
         "@typescript-eslint/utils": "8.24.1",
@@ -1913,6 +2789,7 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.24.1.tgz",
       "integrity": "sha512-9kqJ+2DkUXiuhoiYIUvIYjGcwle8pcPpdlfkemGvTObzgmYfJ5d0Qm6jwb4NBXP9W1I5tss0VIAnWFumz3mC5A==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -1926,6 +2803,7 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.24.1.tgz",
       "integrity": "sha512-UPyy4MJ/0RE648DSKQe9g0VDSehPINiejjA6ElqnFaFIhI6ZEiZAkUI0D5MCk0bQcTf/LVqZStvQ6K4lPn/BRg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/types": "8.24.1",
         "@typescript-eslint/visitor-keys": "8.24.1",
@@ -1947,11 +2825,22 @@
         "typescript": ">=4.8.4 <5.8.0"
       }
     },
+    "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
       "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -1962,20 +2851,12 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dev": true,
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
     "node_modules/@typescript-eslint/utils": {
       "version": "8.24.1",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.24.1.tgz",
       "integrity": "sha512-OOcg3PMMQx9EXspId5iktsI3eMaXVwlhC8BvNnX6B5w9a4dVgpkQZuU8Hy67TolKcl+iFWq0XX+jbDGN4xWxjQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.4.0",
         "@typescript-eslint/scope-manager": "8.24.1",
@@ -1999,6 +2880,7 @@
       "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.24.1.tgz",
       "integrity": "sha512-EwVHlp5l+2vp8CoqJm9KikPZgi3gbdZAtabKT9KPShGeOcJhsv4Zdo3oc8T8I0uKEmYoU4ItyxbptjF08enaxg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/types": "8.24.1",
         "eslint-visitor-keys": "^4.2.0"
@@ -2016,6 +2898,7 @@
       "resolved": "https://registry.npmjs.org/@vitejs/plugin-react-swc/-/plugin-react-swc-3.8.0.tgz",
       "integrity": "sha512-T4sHPvS+DIqDP51ifPqa9XIRAz/kIvIi8oXcnOZZgHmMotgmmdxe/DD5tMFlt5nuIRzT0/QuiwmKlH0503Aapw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@swc/core": "^1.10.15"
       },
@@ -2024,10 +2907,11 @@
       }
     },
     "node_modules/acorn": {
-      "version": "8.14.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.14.0.tgz",
-      "integrity": "sha512-cl669nCJTZBsL97OF4kUQm5g5hC2uihk0NxY3WENAC0TYdILVkAyHymAntgxGkl7K+t0cXIrH5siy5S4XkFycA==",
+      "version": "8.15.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz",
+      "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==",
       "dev": true,
+      "license": "MIT",
       "bin": {
         "acorn": "bin/acorn"
       },
@@ -2040,6 +2924,7 @@
       "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz",
       "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0"
       }
@@ -2049,6 +2934,7 @@
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -2061,9 +2947,10 @@
       }
     },
     "node_modules/ansi-regex": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz",
-      "integrity": "sha512-7HSX4QQb4CspciLpVFwyRe79O3xsIZDDLER21kERQ71oaPodF8jL725AgJMFAYbooIqolJoRLuM81SpeUkpkvA==",
+      "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"
       },
@@ -2075,6 +2962,7 @@
       "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"
       },
@@ -2088,12 +2976,14 @@
     "node_modules/any-promise": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz",
-      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A=="
+      "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==",
+      "license": "MIT"
     },
     "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"
@@ -2105,18 +2995,21 @@
     "node_modules/arg": {
       "version": "5.0.2",
       "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz",
-      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg=="
+      "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==",
+      "license": "MIT"
     },
     "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==",
-      "dev": true
+      "dev": true,
+      "license": "Python-2.0"
     },
     "node_modules/aria-hidden": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.4.tgz",
-      "integrity": "sha512-y+CcFFwelSXpLZk/7fMB2mUbGtX9lKycf1MWJ7CaTIERyitVlyQx6C+sxcROU2BAJ24OiZyK+8wj2i8AlBoS3A==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.6.tgz",
+      "integrity": "sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -2143,6 +3036,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "browserslist": "^4.23.3",
         "caniuse-lite": "^1.0.30001646",
@@ -2164,12 +3058,24 @@
     "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=="
+      "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
+      "license": "MIT"
+    },
+    "node_modules/baseline-browser-mapping": {
+      "version": "2.8.25",
+      "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.25.tgz",
+      "integrity": "sha512-2NovHVesVF5TXefsGX1yzx1xgr7+m9JQenvz6FQY3qd+YXkKkYiv+vTCc7OriP9mcDZpTC5mAOYN4ocd29+erA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "bin": {
+        "baseline-browser-mapping": "dist/cli.js"
+      }
     },
     "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"
       },
@@ -2178,10 +3084,11 @@
       }
     },
     "node_modules/brace-expansion": {
-      "version": "1.1.11",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
-      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "version": "1.1.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
+      "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "balanced-match": "^1.0.0",
         "concat-map": "0.0.1"
@@ -2191,6 +3098,7 @@
       "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"
       },
@@ -2199,9 +3107,9 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.24.4",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
-      "integrity": "sha512-KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==",
+      "version": "4.27.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.27.0.tgz",
+      "integrity": "sha512-AXVQwdhot1eqLihwasPElhX2tAZiBjWdJ9i/Zcj2S6QYIjkx62OKSfnobkriB81C3l4w0rVy3Nt4jaTBltYEpw==",
       "dev": true,
       "funding": [
         {
@@ -2217,11 +3125,13 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
-        "caniuse-lite": "^1.0.30001688",
-        "electron-to-chromium": "^1.5.73",
-        "node-releases": "^2.0.19",
-        "update-browserslist-db": "^1.1.1"
+        "baseline-browser-mapping": "^2.8.19",
+        "caniuse-lite": "^1.0.30001751",
+        "electron-to-chromium": "^1.5.238",
+        "node-releases": "^2.0.26",
+        "update-browserslist-db": "^1.1.4"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -2235,6 +3145,7 @@
       "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
       "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -2243,14 +3154,15 @@
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz",
       "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001703",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001703.tgz",
-      "integrity": "sha512-kRlAGTRWgPsOj7oARC9m1okJEXdL/8fekFVcxA8Hl7GH4r/sN4OJn/i6Flde373T50KS7Y37oFbMwlE8+F42kQ==",
+      "version": "1.0.30001753",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001753.tgz",
+      "integrity": "sha512-Bj5H35MD/ebaOV4iDLqPEtiliTN29qkGtEHCwawWn4cYm+bPJM2NsaP30vtZcnERClMzp52J4+aw2UNbK4o+zw==",
       "dev": true,
       "funding": [
         {
@@ -2265,13 +3177,15 @@
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
-      ]
+      ],
+      "license": "CC-BY-4.0"
     },
     "node_modules/chalk": {
       "version": "4.1.2",
       "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
       "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "ansi-styles": "^4.1.0",
         "supports-color": "^7.1.0"
@@ -2287,6 +3201,7 @@
       "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",
@@ -2310,6 +3225,7 @@
       "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"
       },
@@ -2321,6 +3237,7 @@
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/class-variance-authority/-/class-variance-authority-0.7.1.tgz",
       "integrity": "sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==",
+      "license": "Apache-2.0",
       "dependencies": {
         "clsx": "^2.1.1"
       },
@@ -2332,6 +3249,7 @@
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz",
       "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -2340,6 +3258,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/cmdk/-/cmdk-1.1.1.tgz",
       "integrity": "sha512-Vsv7kFaXm+ptHDMZ7izaRsP70GgrW9NBNGswt9OZaVBLlE0SNpDq8eu/VGXyF9r7M0azK3Wy7OlYXsuyYLFzHg==",
+      "license": "MIT",
       "dependencies": {
         "@radix-ui/react-compose-refs": "^1.1.1",
         "@radix-ui/react-dialog": "^1.1.6",
@@ -2355,6 +3274,7 @@
       "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"
       },
@@ -2365,12 +3285,14 @@
     "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=="
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+      "license": "MIT"
     },
     "node_modules/commander": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
       "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -2379,12 +3301,14 @@
       "version": "0.0.1",
       "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
       "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/cookie": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.0.2.tgz",
       "integrity": "sha512-9Kr/j4O16ISv8zBBhJoi4bXOYNTkFLOqSL3UDB0njXxCXNezjeyVrJyGOWtgfs/q2km1gwBcfH8q1yEGoMYunA==",
+      "license": "MIT",
       "engines": {
         "node": ">=18"
       }
@@ -2392,13 +3316,14 @@
     "node_modules/country-flag-icons": {
       "version": "1.5.18",
       "resolved": "https://registry.npmjs.org/country-flag-icons/-/country-flag-icons-1.5.18.tgz",
-      "integrity": "sha512-z+Uzesi8u8IdkViqqbzzbkf3+a7WJpcET5B7sPwTg7GXqPYpVEgNlZ/FC3l8KO4mEf+mNkmzKLppKTN4PlCJEQ=="
+      "integrity": "sha512-z+Uzesi8u8IdkViqqbzzbkf3+a7WJpcET5B7sPwTg7GXqPYpVEgNlZ/FC3l8KO4mEf+mNkmzKLppKTN4PlCJEQ==",
+      "license": "MIT"
     },
     "node_modules/cross-spawn": {
       "version": "7.0.6",
       "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
       "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
-      "dev": true,
+      "license": "MIT",
       "dependencies": {
         "path-key": "^3.1.0",
         "shebang-command": "^2.0.0",
@@ -2412,6 +3337,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
       "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "license": "MIT",
       "bin": {
         "cssesc": "bin/cssesc"
       },
@@ -2422,12 +3348,14 @@
     "node_modules/csstype": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw=="
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+      "license": "MIT"
     },
     "node_modules/d3-array": {
       "version": "3.2.4",
       "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz",
       "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==",
+      "license": "ISC",
       "dependencies": {
         "internmap": "1 - 2"
       },
@@ -2439,6 +3367,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz",
       "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -2447,6 +3376,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz",
       "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=12"
       }
@@ -2455,6 +3385,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.0.tgz",
       "integrity": "sha512-YyUI6AEuY/Wpt8KWLgZHsIU86atmikuoOmCfommt0LYHiQSPjvX2AcFc38PX0CBpr2RCyZhjex+NS/LPOv6YqA==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -2463,6 +3394,7 @@
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz",
       "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "2.5.0 - 3"
       },
@@ -2474,6 +3406,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz",
       "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==",
+      "license": "ISC",
       "dependencies": {
         "d3-color": "1 - 3"
       },
@@ -2485,6 +3418,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz",
       "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -2493,6 +3427,7 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz",
       "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "2.10.0 - 3",
         "d3-format": "1 - 3",
@@ -2508,6 +3443,7 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz",
       "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==",
+      "license": "ISC",
       "dependencies": {
         "d3-path": "^3.1.0"
       },
@@ -2519,6 +3455,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz",
       "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==",
+      "license": "ISC",
       "dependencies": {
         "d3-array": "2 - 3"
       },
@@ -2530,6 +3467,7 @@
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz",
       "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==",
+      "license": "ISC",
       "dependencies": {
         "d3-time": "1 - 3"
       },
@@ -2541,6 +3479,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz",
       "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -2548,12 +3487,14 @@
     "node_modules/dayjs": {
       "version": "1.11.13",
       "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz",
-      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg=="
+      "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==",
+      "license": "MIT"
     },
     "node_modules/debug": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
-      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "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"
       },
@@ -2569,38 +3510,45 @@
     "node_modules/decimal.js-light": {
       "version": "2.5.1",
       "resolved": "https://registry.npmjs.org/decimal.js-light/-/decimal.js-light-2.5.1.tgz",
-      "integrity": "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg=="
+      "integrity": "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==",
+      "license": "MIT"
     },
     "node_modules/deep-is": {
       "version": "0.1.4",
       "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
       "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/detect-node-es": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz",
-      "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ=="
+      "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==",
+      "license": "MIT"
     },
     "node_modules/diacritics": {
       "version": "1.3.0",
       "resolved": "https://registry.npmjs.org/diacritics/-/diacritics-1.3.0.tgz",
-      "integrity": "sha512-wlwEkqcsaxvPJML+rDh/2iS824jbREk6DUMUKkEaSlxdYHeS43cClJtsWglvw2RfeXGm6ohKDqsXteJ5sP5enA=="
+      "integrity": "sha512-wlwEkqcsaxvPJML+rDh/2iS824jbREk6DUMUKkEaSlxdYHeS43cClJtsWglvw2RfeXGm6ohKDqsXteJ5sP5enA==",
+      "license": "MIT"
     },
     "node_modules/didyoumean": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
-      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="
+      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==",
+      "license": "Apache-2.0"
     },
     "node_modules/dlv": {
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
-      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
+      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==",
+      "license": "MIT"
     },
     "node_modules/dom-helpers": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz",
       "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.8.7",
         "csstype": "^3.0.2"
@@ -2609,18 +3557,21 @@
     "node_modules/eastasianwidth": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+      "license": "MIT"
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.5.114",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.114.tgz",
-      "integrity": "sha512-DFptFef3iktoKlFQK/afbo274/XNWD00Am0xa7M8FZUepHlHT8PEuiNBoRfFHbH1okqN58AlhbJ4QTkcnXorjA==",
-      "dev": true
+      "version": "1.5.245",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.245.tgz",
+      "integrity": "sha512-rdmGfW47ZhL/oWEJAY4qxRtdly2B98ooTJ0pdEI4jhVLZ6tNf8fPtov2wS1IRKwFJT92le3x4Knxiwzl7cPPpQ==",
+      "dev": true,
+      "license": "ISC"
     },
     "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=="
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==",
+      "license": "MIT"
     },
     "node_modules/esbuild": {
       "version": "0.24.2",
@@ -2628,6 +3579,7 @@
       "integrity": "sha512-+9egpBW8I3CD5XPe0n6BfT5fxLzxrlDzqydF3aviG+9ni1lDC/OvMHcxqEFV0+LANZG5R1bFMWfUrjVsdwxJvA==",
       "dev": true,
       "hasInstallScript": true,
+      "license": "MIT",
       "bin": {
         "esbuild": "bin/esbuild"
       },
@@ -2667,6 +3619,7 @@
       "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
       "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -2676,6 +3629,7 @@
       "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
       "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -2688,6 +3642,7 @@
       "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.20.1.tgz",
       "integrity": "sha512-m1mM33o6dBUjxl2qb6wv6nGNwCAsns1eKtaQ4l/NPHeTvhiUPbtdfMyktxN4B3fgHIgsYh1VT3V9txblpQHq+g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.12.1",
@@ -2747,6 +3702,7 @@
       "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-5.1.0.tgz",
       "integrity": "sha512-mpJRtPgHN2tNAvZ35AMfqeB3Xqeo273QxrHJsbBEPWODRM4r0yB6jfoROqKEYrOn27UtRPpcpHc2UqyBSuUNTw==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
@@ -2759,15 +3715,17 @@
       "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.19.tgz",
       "integrity": "sha512-eyy8pcr/YxSYjBoqIFSrlbn9i/xvxUFa8CjzAYo9cFjgGXqq1hyjihcpZvxRLalpaWmueWR81xn7vuKmAFijDQ==",
       "dev": true,
+      "license": "MIT",
       "peerDependencies": {
         "eslint": ">=8.40"
       }
     },
     "node_modules/eslint-scope": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.3.0.tgz",
-      "integrity": "sha512-pUNxi75F8MJ/GdeKtVLSbYg4ZI34J6C0C7sbL4YOp2exGwen7ZsuBqKzUhXd0qMQ362yET3z+uPwKeg/0C2XCQ==",
+      "version": "8.4.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz",
+      "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^5.2.0"
@@ -2780,10 +3738,11 @@
       }
     },
     "node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz",
+      "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==",
       "dev": true,
+      "license": "Apache-2.0",
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
@@ -2794,17 +3753,19 @@
     "node_modules/esm-env": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/esm-env/-/esm-env-1.2.2.tgz",
-      "integrity": "sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA=="
+      "integrity": "sha512-Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==",
+      "license": "MIT"
     },
     "node_modules/espree": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
-      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+      "version": "10.4.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz",
+      "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
-        "acorn": "^8.14.0",
+        "acorn": "^8.15.0",
         "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.2.0"
+        "eslint-visitor-keys": "^4.2.1"
       },
       "engines": {
         "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
@@ -2818,6 +3779,7 @@
       "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
       "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
       "dev": true,
+      "license": "BSD-3-Clause",
       "dependencies": {
         "estraverse": "^5.1.0"
       },
@@ -2830,6 +3792,7 @@
       "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
       "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "estraverse": "^5.2.0"
       },
@@ -2842,6 +3805,7 @@
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
       "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=4.0"
       }
@@ -2851,6 +3815,7 @@
       "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
       "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -2858,32 +3823,36 @@
     "node_modules/eventemitter3": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==",
+      "license": "MIT"
     },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
       "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-equals": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-5.0.1.tgz",
-      "integrity": "sha512-WF1Wi8PwwSY7/6Kx0vKXtw8RwuSGoM1bvDaJbu7MxDlR1vovZjIAKrnzyrThgAjm6JDTu0fVgWXDlMGspodfoQ==",
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-5.3.2.tgz",
+      "integrity": "sha512-6rxyATwPCkaFIL3JLqw8qXqMpIZ942pTX/tbQFkRsDGblS8tNGtlUauA/+mt6RUfqn/4MoEr+WDkYoIQbibWuQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/fast-glob": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.2.tgz",
-      "integrity": "sha512-oX2ruAFQwf/Orj8m737Y5adxDQO0LAB7/S5MnxCdTNDd4p6BsyIVsv9JQsATbTSq8KHRpLwIHbVlUNatxd+1Ow==",
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+      "license": "MIT",
       "dependencies": {
         "@nodelib/fs.stat": "^2.0.2",
         "@nodelib/fs.walk": "^1.2.3",
         "glob-parent": "^5.1.2",
         "merge2": "^1.3.0",
-        "micromatch": "^4.0.4"
+        "micromatch": "^4.0.8"
       },
       "engines": {
         "node": ">=8.6.0"
@@ -2893,6 +3862,7 @@
       "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"
       },
@@ -2904,18 +3874,21 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
       "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fast-levenshtein": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
       "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/fastq": {
-      "version": "1.17.1",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz",
-      "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==",
+      "version": "1.19.1",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz",
+      "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==",
+      "license": "ISC",
       "dependencies": {
         "reusify": "^1.0.4"
       }
@@ -2925,6 +3898,7 @@
       "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
       "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "flat-cache": "^4.0.0"
       },
@@ -2936,6 +3910,7 @@
       "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"
       },
@@ -2948,6 +3923,7 @@
       "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
       "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "locate-path": "^6.0.0",
         "path-exists": "^4.0.0"
@@ -2964,6 +3940,7 @@
       "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
       "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "flatted": "^3.2.9",
         "keyv": "^4.5.4"
@@ -2973,17 +3950,19 @@
       }
     },
     "node_modules/flatted": {
-      "version": "3.3.1",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz",
-      "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==",
-      "dev": true
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+      "dev": true,
+      "license": "ISC"
     },
     "node_modules/foreground-child": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
-      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+      "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.0",
+        "cross-spawn": "^7.0.6",
         "signal-exit": "^4.0.1"
       },
       "engines": {
@@ -2993,24 +3972,12 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/foreground-child/node_modules/cross-spawn": {
-      "version": "7.0.3",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
-      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
-      "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
-      },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
     "node_modules/fraction.js": {
       "version": "4.3.7",
       "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.3.7.tgz",
       "integrity": "sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": "*"
       },
@@ -3023,6 +3990,7 @@
       "version": "12.4.5",
       "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.4.5.tgz",
       "integrity": "sha512-9+8wglyIJFeUpVg4U8Ohvoo5x7zmvRqawWXhEUThcYdwL/5A1/OkLvQo68Zz5taUE11HKG/Ex+LPaN2+fMkRdA==",
+      "license": "MIT",
       "dependencies": {
         "motion-dom": "^12.4.5",
         "motion-utils": "^12.0.0",
@@ -3045,10 +4013,25 @@
         }
       }
     },
+    "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/function-bind": {
       "version": "1.1.2",
       "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
       "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -3057,6 +4040,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz",
       "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==",
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -3065,6 +4049,7 @@
       "version": "10.4.5",
       "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
       "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+      "license": "ISC",
       "dependencies": {
         "foreground-child": "^3.1.0",
         "jackspeak": "^3.1.2",
@@ -3084,6 +4069,7 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "license": "ISC",
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -3091,10 +4077,20 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/glob/node_modules/brace-expansion": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz",
+      "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==",
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
+      }
+    },
     "node_modules/glob/node_modules/minimatch": {
       "version": "9.0.5",
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
       "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^2.0.1"
       },
@@ -3105,19 +4101,12 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/glob/node_modules/minimatch/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
-    },
     "node_modules/globals": {
       "version": "15.15.0",
       "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz",
       "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=18"
       },
@@ -3129,13 +4118,15 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
       "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/has-flag": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
       "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -3144,6 +4135,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
       "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "license": "MIT",
       "dependencies": {
         "function-bind": "^1.1.2"
       },
@@ -3155,6 +4147,7 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz",
       "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==",
+      "license": "MIT",
       "dependencies": {
         "void-elements": "3.1.0"
       }
@@ -3163,6 +4156,7 @@
       "version": "7.14.0",
       "resolved": "https://registry.npmjs.org/i18n-iso-countries/-/i18n-iso-countries-7.14.0.tgz",
       "integrity": "sha512-nXHJZYtNrfsi1UQbyRqm3Gou431elgLjKl//CYlnBGt5aTWdRPH1PiS2T/p/n8Q8LnqYqzQJik3Q7mkwvLokeg==",
+      "license": "MIT",
       "dependencies": {
         "diacritics": "1.3.0"
       },
@@ -3188,6 +4182,7 @@
           "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.23.2"
       },
@@ -3205,15 +4200,17 @@
       "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
       "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 4"
       }
     },
     "node_modules/import-fresh": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz",
-      "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==",
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz",
+      "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "parent-module": "^1.0.0",
         "resolve-from": "^4.0.0"
@@ -3230,6 +4227,7 @@
       "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
       "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.8.19"
       }
@@ -3238,6 +4236,7 @@
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz",
       "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==",
+      "license": "ISC",
       "engines": {
         "node": ">=12"
       }
@@ -3246,6 +4245,7 @@
       "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"
       },
@@ -3254,9 +4254,10 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.15.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.1.tgz",
-      "integrity": "sha512-z0vtXSwucUJtANQWldhbtbt7BnL0vxiFjIdDLAatwhDYty2bad6s+rijD6Ri4YuYJubLzIJLUidCh09e1djEVQ==",
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "license": "MIT",
       "dependencies": {
         "hasown": "^2.0.2"
       },
@@ -3271,6 +4272,7 @@
       "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"
       }
@@ -3279,6 +4281,7 @@
       "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"
       }
@@ -3287,6 +4290,7 @@
       "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"
       },
@@ -3298,6 +4302,7 @@
       "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"
       }
@@ -3305,12 +4310,14 @@
     "node_modules/isexe": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+      "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"
       },
@@ -3324,12 +4331,14 @@
     "node_modules/javascript-natural-sort": {
       "version": "0.7.1",
       "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
-      "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw=="
+      "integrity": "sha512-nO6jcEfZWQXDhOiBtG2KvKyEptz7RVbpGP4vTD2hLBdmNQSsCiicO2Ioinv6UI4y9ukqnBpy+XZ9H6uLNgJTlw==",
+      "license": "MIT"
     },
     "node_modules/jiti": {
-      "version": "1.21.6",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.6.tgz",
-      "integrity": "sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==",
+      "version": "1.21.7",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
+      "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
+      "license": "MIT",
       "bin": {
         "jiti": "bin/jiti.js"
       }
@@ -3337,13 +4346,15 @@
     "node_modules/js-tokens": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==",
+      "license": "MIT"
     },
     "node_modules/js-yaml": {
       "version": "4.1.0",
       "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
       "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "argparse": "^2.0.1"
       },
@@ -3355,6 +4366,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
       "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+      "license": "MIT",
       "bin": {
         "jsesc": "bin/jsesc"
       },
@@ -3366,25 +4378,29 @@
       "version": "3.0.1",
       "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
       "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-schema-traverse": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
       "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/json-stable-stringify-without-jsonify": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
       "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/keyv": {
       "version": "4.5.4",
       "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
       "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "json-buffer": "3.0.1"
       }
@@ -3394,6 +4410,7 @@
       "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
       "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1",
         "type-check": "~0.4.0"
@@ -3406,6 +4423,7 @@
       "version": "3.1.3",
       "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
       "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
+      "license": "MIT",
       "engines": {
         "node": ">=14"
       },
@@ -3416,13 +4434,15 @@
     "node_modules/lines-and-columns": {
       "version": "1.2.4",
       "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==",
+      "license": "MIT"
     },
     "node_modules/locate-path": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
       "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-locate": "^5.0.0"
       },
@@ -3436,18 +4456,21 @@
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
+      "license": "MIT"
     },
     "node_modules/lodash.merge": {
       "version": "4.6.2",
       "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
       "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/loose-envify": {
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
       "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "license": "MIT",
       "dependencies": {
         "js-tokens": "^3.0.0 || ^4.0.0"
       },
@@ -3458,12 +4481,14 @@
     "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=="
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==",
+      "license": "ISC"
     },
     "node_modules/lucide-react": {
       "version": "0.460.0",
       "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.460.0.tgz",
       "integrity": "sha512-BVtq/DykVeIvRTJvRAgCsOwaGL8Un3Bxh8MbDxMhEWlZay3T4IpEKDEpwt5KZ0KJMHzgm6jrltxlT5eXOWXDHg==",
+      "license": "ISC",
       "peerDependencies": {
         "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc"
       }
@@ -3472,6 +4497,7 @@
       "version": "3.5.0",
       "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz",
       "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=12"
       }
@@ -3480,6 +4506,7 @@
       "version": "1.4.1",
       "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
       "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "license": "MIT",
       "engines": {
         "node": ">= 8"
       }
@@ -3488,6 +4515,7 @@
       "version": "4.0.8",
       "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
       "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+      "license": "MIT",
       "dependencies": {
         "braces": "^3.0.3",
         "picomatch": "^2.3.1"
@@ -3501,6 +4529,7 @@
       "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
       "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dev": true,
+      "license": "ISC",
       "dependencies": {
         "brace-expansion": "^1.1.7"
       },
@@ -3512,6 +4541,7 @@
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
       "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "license": "ISC",
       "engines": {
         "node": ">=16 || 14 >=14.17"
       }
@@ -3520,6 +4550,7 @@
       "version": "12.5.0",
       "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.5.0.tgz",
       "integrity": "sha512-uH2PETDh7m+Hjd1UQQ56yHqwn83SAwNjimNPE/kC+Kds0t4Yh7+29rfo5wezVFpPOv57U4IuWved5d1x0kNhbQ==",
+      "license": "MIT",
       "dependencies": {
         "motion-utils": "^12.5.0"
       }
@@ -3527,17 +4558,20 @@
     "node_modules/motion-utils": {
       "version": "12.5.0",
       "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.5.0.tgz",
-      "integrity": "sha512-+hFFzvimn0sBMP9iPxBa9OtRX35ZQ3py0UHnb8U29VD+d8lQ8zH3dTygJWqK7av2v6yhg7scj9iZuvTS0f4+SA=="
+      "integrity": "sha512-+hFFzvimn0sBMP9iPxBa9OtRX35ZQ3py0UHnb8U29VD+d8lQ8zH3dTygJWqK7av2v6yhg7scj9iZuvTS0f4+SA==",
+      "license": "MIT"
     },
     "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=="
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==",
+      "license": "MIT"
     },
     "node_modules/mz": {
       "version": "2.7.0",
       "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
       "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "license": "MIT",
       "dependencies": {
         "any-promise": "^1.0.0",
         "object-assign": "^4.0.1",
@@ -3545,15 +4579,16 @@
       }
     },
     "node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
+      "version": "3.3.11",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz",
+      "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==",
       "funding": [
         {
           "type": "github",
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "bin": {
         "nanoid": "bin/nanoid.cjs"
       },
@@ -3565,18 +4600,21 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
       "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/node-releases": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
-      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==",
-      "dev": true
+      "version": "2.0.27",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz",
+      "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==",
+      "dev": true,
+      "license": "MIT"
     },
     "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"
       }
@@ -3586,6 +4624,7 @@
       "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz",
       "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3594,6 +4633,7 @@
       "version": "0.5.3",
       "resolved": "https://registry.npmjs.org/number-flow/-/number-flow-0.5.3.tgz",
       "integrity": "sha512-iLKyssImNWQmJ41rza9K7P5lHRZTyishi/9FarWPLQHYY2Ydtl6eiXINEjZ1fa8dHeY0O7+YOD+Py3ZsJddYkg==",
+      "license": "MIT",
       "dependencies": {
         "esm-env": "^1.1.4"
       }
@@ -3602,6 +4642,7 @@
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
       "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -3610,6 +4651,7 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
       "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -3619,6 +4661,7 @@
       "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
       "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "deep-is": "^0.1.3",
         "fast-levenshtein": "^2.0.6",
@@ -3636,6 +4679,7 @@
       "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
       "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "yocto-queue": "^0.1.0"
       },
@@ -3651,6 +4695,7 @@
       "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
       "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "p-limit": "^3.0.2"
       },
@@ -3664,13 +4709,15 @@
     "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=="
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==",
+      "license": "BlueOak-1.0.0"
     },
     "node_modules/parent-module": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "callsites": "^3.0.0"
       },
@@ -3683,6 +4730,7 @@
       "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
       "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       }
@@ -3691,6 +4739,7 @@
       "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"
       }
@@ -3698,12 +4747,14 @@
     "node_modules/path-parse": {
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==",
+      "license": "MIT"
     },
     "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"
@@ -3718,12 +4769,14 @@
     "node_modules/picocolors": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==",
+      "license": "ISC"
     },
     "node_modules/picomatch": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
       "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "license": "MIT",
       "engines": {
         "node": ">=8.6"
       },
@@ -3735,14 +4788,16 @@
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
       "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
     "node_modules/pirates": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
-      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz",
+      "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==",
+      "license": "MIT",
       "engines": {
         "node": ">= 6"
       }
@@ -3765,6 +4820,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "nanoid": "^3.3.8",
         "picocolors": "^1.1.1",
@@ -3778,6 +4834,7 @@
       "version": "15.1.0",
       "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
       "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
+      "license": "MIT",
       "dependencies": {
         "postcss-value-parser": "^4.0.0",
         "read-cache": "^1.0.0",
@@ -3791,19 +4848,26 @@
       }
     },
     "node_modules/postcss-js": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
-      "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.1.0.tgz",
+      "integrity": "sha512-oIAOTqgIo7q2EOwbhb8UalYePMvYoIeRY2YKntdpFQXNosSu3vLrniGgmH9OKs/qAkfoj5oB3le/7mINW1LCfw==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "license": "MIT",
       "dependencies": {
         "camelcase-css": "^2.0.1"
       },
       "engines": {
         "node": "^12 || ^14 || >= 16"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
       "peerDependencies": {
         "postcss": "^8.4.21"
       }
@@ -3822,6 +4886,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "lilconfig": "^3.0.0",
         "yaml": "^2.3.4"
@@ -3842,17 +4907,6 @@
         }
       }
     },
-    "node_modules/postcss-load-config/node_modules/lilconfig": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.2.tgz",
-      "integrity": "sha512-eop+wDAvpItUys0FWkHIKeC9ybYrTGbU41U5K7+bttZZeohvnY7M9dZ5kB21GNWiFT2q1OoPTvncPCgSOVO5ow==",
-      "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antonk52"
-      }
-    },
     "node_modules/postcss-nested": {
       "version": "6.2.0",
       "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
@@ -3867,6 +4921,7 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "postcss-selector-parser": "^6.1.1"
       },
@@ -3881,6 +4936,7 @@
       "version": "6.1.2",
       "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz",
       "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==",
+      "license": "MIT",
       "dependencies": {
         "cssesc": "^3.0.0",
         "util-deprecate": "^1.0.2"
@@ -3892,21 +4948,24 @@
     "node_modules/postcss-value-parser": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
-      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ=="
+      "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==",
+      "license": "MIT"
     },
     "node_modules/prelude-ls": {
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz",
       "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">= 0.8.0"
       }
     },
     "node_modules/prettier": {
-      "version": "3.4.2",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.4.2.tgz",
-      "integrity": "sha512-e9MewbtFo+Fevyuxn/4rrcDAaq0IYxPGLvObpQjiZBMAzB9IGmzlnG9RZy3FFas+eBMu2vA0CszMeduow5dIuQ==",
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.6.2.tgz",
+      "integrity": "sha512-I7AIg5boAr5R0FFtJ6rCfD+LFsWHp81dolrFD8S79U9tb8Az2nGrJncnMSnys+bpQJfRUzqs9hnA81OAA3hCuQ==",
+      "license": "MIT",
       "peer": true,
       "bin": {
         "prettier": "bin/prettier.cjs"
@@ -3922,6 +4981,7 @@
       "version": "0.6.11",
       "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.11.tgz",
       "integrity": "sha512-YxaYSIvZPAqhrrEpRtonnrXdghZg1irNg4qrjboCXrpybLWVs55cW2N3juhspVJiO0JBvYJT8SYsJpc8OQSnsA==",
+      "license": "MIT",
       "engines": {
         "node": ">=14.21.3"
       },
@@ -3999,6 +5059,7 @@
       "version": "15.8.1",
       "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz",
       "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==",
+      "license": "MIT",
       "dependencies": {
         "loose-envify": "^1.4.0",
         "object-assign": "^4.1.1",
@@ -4008,13 +5069,15 @@
     "node_modules/prop-types/node_modules/react-is": {
       "version": "16.13.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "license": "MIT"
     },
     "node_modules/punycode": {
       "version": "2.3.1",
       "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz",
       "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=6"
       }
@@ -4036,12 +5099,14 @@
           "type": "consulting",
           "url": "https://feross.org/support"
         }
-      ]
+      ],
+      "license": "MIT"
     },
     "node_modules/react": {
       "version": "19.0.0",
       "resolved": "https://registry.npmjs.org/react/-/react-19.0.0.tgz",
       "integrity": "sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4050,6 +5115,7 @@
       "version": "19.0.0",
       "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0.tgz",
       "integrity": "sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==",
+      "license": "MIT",
       "dependencies": {
         "scheduler": "^0.25.0"
       },
@@ -4061,6 +5127,7 @@
       "version": "15.4.1",
       "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.4.1.tgz",
       "integrity": "sha512-ahGab+IaSgZmNPYXdV1n+OYky95TGpFwnKRflX/16dY04DsYYKHtVLjeny7sBSCREEcoMbAgSkFiGLF5g5Oofw==",
+      "license": "MIT",
       "dependencies": {
         "@babel/runtime": "^7.25.0",
         "html-parse-stringify": "^3.0.1"
@@ -4081,12 +5148,14 @@
     "node_modules/react-is": {
       "version": "18.3.1",
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz",
-      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg=="
+      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
+      "license": "MIT"
     },
     "node_modules/react-remove-scroll": {
-      "version": "2.6.3",
-      "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.6.3.tgz",
-      "integrity": "sha512-pnAi91oOk8g8ABQKGF5/M9qxmmOPxaAnopyTHYfqYEwJhyFrbbBtHuSgtKEoH0jpcxx5o3hXqH1mNd9/Oi+8iQ==",
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.7.1.tgz",
+      "integrity": "sha512-HpMh8+oahmIdOuS5aFKKY6Pyog+FNaZV/XyJOq7b4YFwsFHe5yYfdbIalI4k3vU2nSDql7YskmUseHsRrJqIPA==",
+      "license": "MIT",
       "dependencies": {
         "react-remove-scroll-bar": "^2.3.7",
         "react-style-singleton": "^2.2.3",
@@ -4111,6 +5180,7 @@
       "version": "2.3.8",
       "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.8.tgz",
       "integrity": "sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==",
+      "license": "MIT",
       "dependencies": {
         "react-style-singleton": "^2.2.2",
         "tslib": "^2.0.0"
@@ -4132,6 +5202,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.2.0.tgz",
       "integrity": "sha512-fXyqzPgCPZbqhrk7k3hPcCpYIlQ2ugIXDboHUzhJISFVy2DEPsmHgN588MyGmkIOv3jDgNfUE3kJi83L28s/LQ==",
+      "license": "MIT",
       "dependencies": {
         "@types/cookie": "^0.6.0",
         "cookie": "^1.0.1",
@@ -4155,6 +5226,7 @@
       "version": "7.2.0",
       "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.2.0.tgz",
       "integrity": "sha512-cU7lTxETGtQRQbafJubvZKHEn5izNABxZhBY0Jlzdv0gqQhCPQt2J8aN5ZPjS6mQOXn5NnirWNh+FpE8TTYN0Q==",
+      "license": "MIT",
       "dependencies": {
         "react-router": "7.2.0"
       },
@@ -4170,6 +5242,7 @@
       "version": "4.0.4",
       "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-4.0.4.tgz",
       "integrity": "sha512-gnGKTpYwqL0Iii09gHobNolvX4Kiq4PKx6eWBCYYix+8cdw+cGo3do906l1NBPKkSWx1DghC1dlWG9L2uGd61Q==",
+      "license": "MIT",
       "dependencies": {
         "fast-equals": "^5.0.1",
         "prop-types": "^15.8.1",
@@ -4184,6 +5257,7 @@
       "version": "2.2.3",
       "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.3.tgz",
       "integrity": "sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==",
+      "license": "MIT",
       "dependencies": {
         "get-nonce": "^1.0.0",
         "tslib": "^2.0.0"
@@ -4205,6 +5279,7 @@
       "version": "4.4.5",
       "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz",
       "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==",
+      "license": "BSD-3-Clause",
       "dependencies": {
         "@babel/runtime": "^7.5.5",
         "dom-helpers": "^5.0.1",
@@ -4220,6 +5295,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
       "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==",
+      "license": "MIT",
       "dependencies": {
         "pify": "^2.3.0"
       }
@@ -4228,6 +5304,7 @@
       "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"
       },
@@ -4239,6 +5316,7 @@
       "version": "2.15.1",
       "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.15.1.tgz",
       "integrity": "sha512-v8PUTUlyiDe56qUj82w/EDVuzEFXwEHp9/xOowGAZwfLjB9uAy3GllQVIYMWF6nU+qibx85WF75zD7AjqoT54Q==",
+      "license": "MIT",
       "dependencies": {
         "clsx": "^2.0.0",
         "eventemitter3": "^4.0.1",
@@ -4261,27 +5339,27 @@
       "version": "0.4.5",
       "resolved": "https://registry.npmjs.org/recharts-scale/-/recharts-scale-0.4.5.tgz",
       "integrity": "sha512-kivNFO+0OcUNu7jQquLXAxz1FIwZj8nrj+YkOKc5694NbjCvcT6aSZiIzNzd2Kul4o4rTto8QVR9lMNtxD4G1w==",
+      "license": "MIT",
       "dependencies": {
         "decimal.js-light": "^2.4.1"
       }
     },
-    "node_modules/regenerator-runtime": {
-      "version": "0.14.1",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.14.1.tgz",
-      "integrity": "sha512-dYnhHh0nJoMfnkZs6GmmhFknAGRrLznOu5nc9ML+EJxGvrx6H7teuevqVqCuPcPK//3eDrrjQhehXVx9cnkGdw=="
-    },
     "node_modules/resolve": {
-      "version": "1.22.8",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz",
-      "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==",
+      "version": "1.22.11",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz",
+      "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==",
+      "license": "MIT",
       "dependencies": {
-        "is-core-module": "^2.13.0",
+        "is-core-module": "^2.16.1",
         "path-parse": "^1.0.7",
         "supports-preserve-symlinks-flag": "^1.0.0"
       },
       "bin": {
         "resolve": "bin/resolve"
       },
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
@@ -4291,26 +5369,29 @@
       "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
       "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=4"
       }
     },
     "node_modules/reusify": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
-      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz",
+      "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==",
+      "license": "MIT",
       "engines": {
         "iojs": ">=1.0.0",
         "node": ">=0.10.0"
       }
     },
     "node_modules/rollup": {
-      "version": "4.34.6",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.34.6.tgz",
-      "integrity": "sha512-wc2cBWqJgkU3Iz5oztRkQbfVkbxoz5EhnCGOrnJvnLnQ7O0WhQUYyv18qQI79O8L7DdHrrlJNeCHd4VGpnaXKQ==",
+      "version": "4.52.5",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.52.5.tgz",
+      "integrity": "sha512-3GuObel8h7Kqdjt0gxkEzaifHTqLVW56Y/bjN7PSQtkKr0w3V/QYSdt6QWYtd7A1xUtYQigtdUfgj1RvWVtorw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@types/estree": "1.0.6"
+        "@types/estree": "1.0.8"
       },
       "bin": {
         "rollup": "dist/bin/rollup"
@@ -4320,25 +5401,28 @@
         "npm": ">=8.0.0"
       },
       "optionalDependencies": {
-        "@rollup/rollup-android-arm-eabi": "4.34.6",
-        "@rollup/rollup-android-arm64": "4.34.6",
-        "@rollup/rollup-darwin-arm64": "4.34.6",
-        "@rollup/rollup-darwin-x64": "4.34.6",
-        "@rollup/rollup-freebsd-arm64": "4.34.6",
-        "@rollup/rollup-freebsd-x64": "4.34.6",
-        "@rollup/rollup-linux-arm-gnueabihf": "4.34.6",
-        "@rollup/rollup-linux-arm-musleabihf": "4.34.6",
-        "@rollup/rollup-linux-arm64-gnu": "4.34.6",
-        "@rollup/rollup-linux-arm64-musl": "4.34.6",
-        "@rollup/rollup-linux-loongarch64-gnu": "4.34.6",
-        "@rollup/rollup-linux-powerpc64le-gnu": "4.34.6",
-        "@rollup/rollup-linux-riscv64-gnu": "4.34.6",
-        "@rollup/rollup-linux-s390x-gnu": "4.34.6",
-        "@rollup/rollup-linux-x64-gnu": "4.34.6",
-        "@rollup/rollup-linux-x64-musl": "4.34.6",
-        "@rollup/rollup-win32-arm64-msvc": "4.34.6",
-        "@rollup/rollup-win32-ia32-msvc": "4.34.6",
-        "@rollup/rollup-win32-x64-msvc": "4.34.6",
+        "@rollup/rollup-android-arm-eabi": "4.52.5",
+        "@rollup/rollup-android-arm64": "4.52.5",
+        "@rollup/rollup-darwin-arm64": "4.52.5",
+        "@rollup/rollup-darwin-x64": "4.52.5",
+        "@rollup/rollup-freebsd-arm64": "4.52.5",
+        "@rollup/rollup-freebsd-x64": "4.52.5",
+        "@rollup/rollup-linux-arm-gnueabihf": "4.52.5",
+        "@rollup/rollup-linux-arm-musleabihf": "4.52.5",
+        "@rollup/rollup-linux-arm64-gnu": "4.52.5",
+        "@rollup/rollup-linux-arm64-musl": "4.52.5",
+        "@rollup/rollup-linux-loong64-gnu": "4.52.5",
+        "@rollup/rollup-linux-ppc64-gnu": "4.52.5",
+        "@rollup/rollup-linux-riscv64-gnu": "4.52.5",
+        "@rollup/rollup-linux-riscv64-musl": "4.52.5",
+        "@rollup/rollup-linux-s390x-gnu": "4.52.5",
+        "@rollup/rollup-linux-x64-gnu": "4.52.5",
+        "@rollup/rollup-linux-x64-musl": "4.52.5",
+        "@rollup/rollup-openharmony-arm64": "4.52.5",
+        "@rollup/rollup-win32-arm64-msvc": "4.52.5",
+        "@rollup/rollup-win32-ia32-msvc": "4.52.5",
+        "@rollup/rollup-win32-x64-gnu": "4.52.5",
+        "@rollup/rollup-win32-x64-msvc": "4.52.5",
         "fsevents": "~2.3.2"
       }
     },
@@ -4360,6 +5444,7 @@
           "url": "https://feross.org/support"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "queue-microtask": "^1.2.2"
       }
@@ -4367,13 +5452,15 @@
     "node_modules/scheduler": {
       "version": "0.25.0",
       "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0.tgz",
-      "integrity": "sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA=="
+      "integrity": "sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==",
+      "license": "MIT"
     },
     "node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "version": "7.7.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz",
+      "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==",
       "dev": true,
+      "license": "ISC",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -4382,14 +5469,16 @@
       }
     },
     "node_modules/set-cookie-parser": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
-      "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ=="
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz",
+      "integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==",
+      "license": "MIT"
     },
     "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"
       },
@@ -4401,6 +5490,7 @@
       "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"
       }
@@ -4409,6 +5499,7 @@
       "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"
       },
@@ -4420,6 +5511,7 @@
       "version": "1.7.4",
       "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.7.4.tgz",
       "integrity": "sha512-DIS8z4PfJRbIyfVFDVnK9rO3eYDtse4Omcm6bt0oEr5/jtLgysmjuBl1frJ9E/EQZrFmKx2A8m/s5s9CRXIzhw==",
+      "license": "MIT",
       "peerDependencies": {
         "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc",
         "react-dom": "^18.0.0 || ^19.0.0 || ^19.0.0-rc"
@@ -4429,6 +5521,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz",
       "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==",
+      "license": "BSD-3-Clause",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4465,13 +5558,34 @@
         "node": ">=8"
       }
     },
+    "node_modules/string-width-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/string-width-cjs/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
       "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==",
       "license": "MIT"
     },
-    "node_modules/string-width/node_modules/strip-ansi": {
+    "node_modules/string-width-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/strip-ansi": {
       "version": "7.1.2",
       "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
       "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
@@ -4486,17 +5600,6 @@
         "url": "https://github.com/chalk/strip-ansi?sponsor=1"
       }
     },
-    "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==",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/strip-ansi-cjs": {
       "name": "strip-ansi",
       "version": "6.0.1",
@@ -4519,19 +5622,12 @@
         "node": ">=8"
       }
     },
-    "node_modules/strip-ansi/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==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/strip-json-comments": {
       "version": "3.1.1",
       "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
       "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=8"
       },
@@ -4543,6 +5639,7 @@
       "version": "3.35.0",
       "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",
       "integrity": "sha512-8EbVDiu9iN/nESwxeSxDKe0dunta1GOlHufmSSXxMD2z2/tMZpDMpvXQGsc+ajGo8y2uYUmixaSRUc/QPoQ0GA==",
+      "license": "MIT",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.2",
         "commander": "^4.0.0",
@@ -4565,6 +5662,7 @@
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
       "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -4576,6 +5674,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz",
       "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==",
+      "license": "MIT",
       "engines": {
         "node": ">= 0.4"
       },
@@ -4587,6 +5686,7 @@
       "version": "2.6.0",
       "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz",
       "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==",
+      "license": "MIT",
       "funding": {
         "type": "github",
         "url": "https://github.com/sponsors/dcastil"
@@ -4596,6 +5696,7 @@
       "version": "3.4.17",
       "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.17.tgz",
       "integrity": "sha512-w33E2aCvSDP0tW9RZuNXadXlkHXqFzSkQew/aIa2i/Sj8fThxwovwlXHSPXTbAHwEIhBFXAedUhP2tueAKP8Og==",
+      "license": "MIT",
       "dependencies": {
         "@alloc/quick-lru": "^5.2.0",
         "arg": "^5.0.2",
@@ -4632,58 +5733,16 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/tailwindcss-animate/-/tailwindcss-animate-1.0.7.tgz",
       "integrity": "sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==",
+      "license": "MIT",
       "peerDependencies": {
         "tailwindcss": ">=3.0.0 || insiders"
       }
     },
-    "node_modules/tailwindcss/node_modules/postcss": {
-      "version": "8.4.49",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
-      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/tailwindcss/node_modules/postcss/node_modules/nanoid": {
-      "version": "3.3.7",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz",
-      "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
-      "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
-      }
-    },
     "node_modules/thenify": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
       "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==",
+      "license": "MIT",
       "dependencies": {
         "any-promise": "^1.0.0"
       }
@@ -4692,6 +5751,7 @@
       "version": "1.6.0",
       "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz",
       "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==",
+      "license": "MIT",
       "dependencies": {
         "thenify": ">= 3.1.0 < 4"
       },
@@ -4702,12 +5762,14 @@
     "node_modules/tiny-invariant": {
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz",
-      "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg=="
+      "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==",
+      "license": "MIT"
     },
     "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"
       },
@@ -4716,10 +5778,11 @@
       }
     },
     "node_modules/ts-api-utils": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.1.tgz",
-      "integrity": "sha512-dnlgjFSVetynI8nzgJ+qF62efpglpWRk8isUEWZGWlJYySCTD6aKvbUDu+zbPeDakk3bg5H4XpitHukgfL1m9w==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.1.0.tgz",
+      "integrity": "sha512-CUgTZL1irw8u29bzrOD/nH85jqyc74D6SshFgujOIA7osm2Rz7dYH77agkx7H4FBNxDq7Cjf+IjaX/8zwFW+ZQ==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=18.12"
       },
@@ -4730,23 +5793,27 @@
     "node_modules/ts-interface-checker": {
       "version": "0.1.13",
       "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz",
-      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA=="
+      "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==",
+      "license": "Apache-2.0"
     },
     "node_modules/tslib": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.0.tgz",
-      "integrity": "sha512-jWVzBLplnCmoaTr13V9dYbiQ99wvZRd0vNWaDRg+aVYRcjDF3nDksxFDE/+fkXnKhpnUUkmx5pK/v8mCtLVqZA=="
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
+      "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==",
+      "license": "0BSD"
     },
     "node_modules/turbo-stream": {
       "version": "2.4.0",
       "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz",
-      "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g=="
+      "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==",
+      "license": "ISC"
     },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
       "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "prelude-ls": "^1.2.1"
       },
@@ -4759,6 +5826,7 @@
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz",
       "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==",
       "devOptional": true,
+      "license": "Apache-2.0",
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -4772,6 +5840,7 @@
       "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.24.1.tgz",
       "integrity": "sha512-cw3rEdzDqBs70TIcb0Gdzbt6h11BSs2pS0yaq7hDWDBtCCSei1pPSUXE9qUdQ/Wm9NgFg8mKtMt1b8fTHIl1jA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "@typescript-eslint/eslint-plugin": "8.24.1",
         "@typescript-eslint/parser": "8.24.1",
@@ -4793,12 +5862,13 @@
       "version": "6.20.0",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz",
       "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==",
-      "dev": true
+      "dev": true,
+      "license": "MIT"
     },
     "node_modules/update-browserslist-db": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.1.tgz",
-      "integrity": "sha512-R8UzCaa9Az+38REPiJ1tXlImTJXlVfgHZsglwBD/k6nj76ctsH1E3q4doGrukiLQd3sGQYu56r5+lo5r94l29A==",
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.4.tgz",
+      "integrity": "sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==",
       "dev": true,
       "funding": [
         {
@@ -4814,9 +5884,10 @@
           "url": "https://github.com/sponsors/ai"
         }
       ],
+      "license": "MIT",
       "dependencies": {
         "escalade": "^3.2.0",
-        "picocolors": "^1.1.0"
+        "picocolors": "^1.1.1"
       },
       "bin": {
         "update-browserslist-db": "cli.js"
@@ -4830,6 +5901,7 @@
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
       "dev": true,
+      "license": "BSD-2-Clause",
       "dependencies": {
         "punycode": "^2.1.0"
       }
@@ -4838,6 +5910,7 @@
       "version": "1.3.3",
       "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.3.tgz",
       "integrity": "sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==",
+      "license": "MIT",
       "dependencies": {
         "tslib": "^2.0.0"
       },
@@ -4858,6 +5931,7 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.3.tgz",
       "integrity": "sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==",
+      "license": "MIT",
       "dependencies": {
         "detect-node-es": "^1.1.0",
         "tslib": "^2.0.0"
@@ -4878,12 +5952,14 @@
     "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=="
+      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==",
+      "license": "MIT"
     },
     "node_modules/victory-vendor": {
       "version": "36.9.2",
       "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.9.2.tgz",
       "integrity": "sha512-PnpQQMuxlwYdocC8fIJqVXvkeViHYzotI+NJrCuav0ZYFoq912ZHBk3mCeuj+5/VpodOjPe1z0Fk2ihgzlXqjQ==",
+      "license": "MIT AND ISC",
       "dependencies": {
         "@types/d3-array": "^3.0.3",
         "@types/d3-ease": "^3.0.0",
@@ -4906,6 +5982,7 @@
       "resolved": "https://registry.npmjs.org/vite/-/vite-6.1.1.tgz",
       "integrity": "sha512-4GgM54XrwRfrOp297aIYspIti66k56v16ZnqHvrIM7mG+HjDlAwS7p+Srr7J6fGvEdOJ5JcQ/D9T7HhtdXDTzA==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
         "esbuild": "^0.24.2",
         "postcss": "^8.5.2",
@@ -4976,6 +6053,7 @@
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz",
       "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -4984,6 +6062,7 @@
       "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"
       },
@@ -4999,6 +6078,7 @@
       "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz",
       "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
@@ -5038,6 +6118,15 @@
         "url": "https://github.com/chalk/wrap-ansi?sponsor=1"
       }
     },
+    "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
+      "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==",
+      "license": "MIT",
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/wrap-ansi-cjs/node_modules/emoji-regex": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz",
@@ -5058,10 +6147,23 @@
         "node": ">=8"
       }
     },
+    "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "license": "MIT",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/wrap-ansi/node_modules/ansi-styles": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
-      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+      "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"
       },
@@ -5069,30 +6171,16 @@
         "url": "https://github.com/chalk/ansi-styles?sponsor=1"
       }
     },
-    "node_modules/wrap-ansi/node_modules/strip-ansi": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz",
-      "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==",
-      "license": "MIT",
-      "dependencies": {
-        "ansi-regex": "^6.0.1"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/strip-ansi?sponsor=1"
-      }
-    },
     "node_modules/yaml": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.6.0.tgz",
-      "integrity": "sha512-a6ae//JvKDEra2kdi1qzCyrJW/WZCgFi8ydDV+eXExl95t+5R+ijnqHJbz9tmMh8FUjx3iv2fCQ4dclAQlO2UQ==",
+      "version": "2.8.1",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.1.tgz",
+      "integrity": "sha512-lcYcMxX2PO9XMGvAJkJ3OsNMw+/7FKes7/hgerGUYWIoWu5j/+YQqcZr5JnPZWzOsEBgMbSbiSTn/dv/69Mkpw==",
+      "license": "ISC",
       "bin": {
         "yaml": "bin.mjs"
       },
       "engines": {
-        "node": ">= 14"
+        "node": ">= 14.6"
       }
     },
     "node_modules/yocto-queue": {
@@ -5100,6 +6188,7 @@
       "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz",
       "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==",
       "dev": true,
+      "license": "MIT",
       "engines": {
         "node": ">=10"
       },
diff --git a/pkgs/by-name/ne/nezha-theme-user/package.nix b/pkgs/by-name/ne/nezha-theme-user/package.nix
index 83e311d551c8..5204944764dd 100644
--- a/pkgs/by-name/ne/nezha-theme-user/package.nix
+++ b/pkgs/by-name/ne/nezha-theme-user/package.nix
@@ -27,7 +27,7 @@ buildNpmPackage rec {
       --replace-fail '/commit/' '/tree/'
   '';
 
-  npmDepsHash = "sha256-hlCZqeMkqLgtRpN1+zKhcNK4ECSC4q8XPxzL6jVziqQ=";
+  npmDepsHash = "sha256-nILKXXFOp+Ix6gYpCgcKpAPiLAV9sgMqZ+oTfWZhSIs=";
 
   npmPackFlags = [ "--ignore-scripts" ];
 

From cebe312dcfefde35f93532584701cc5fa9c1f236 Mon Sep 17 00:00:00 2001
From: Marcel <34819524+MarcelCoding@users.noreply.github.com>
Date: Wed, 5 Nov 2025 15:24:37 +0100
Subject: [PATCH 5582/6226] typstPackages.esotefy: fix homepage to be a valid
 url

search.nixos.org currently renders this as
https://search.nixos.org/git@github.com:Thumuss/brainfuck.git
---
 pkgs/by-name/ty/typst/typst-packages-from-universe.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ty/typst/typst-packages-from-universe.toml b/pkgs/by-name/ty/typst/typst-packages-from-universe.toml
index 15b73161ad77..94db47726ccd 100644
--- a/pkgs/by-name/ty/typst/typst-packages-from-universe.toml
+++ b/pkgs/by-name/ty/typst/typst-packages-from-universe.toml
@@ -7076,7 +7076,7 @@ description = "A brainfuck implementation in pure Typst"
 license = [
     "MIT",
 ]
-homepage = "git@github.com:Thumuss/brainfuck.git"
+homepage = "https://github.com/Thumuss/brainfuck"
 
 [etykett."0.1.1"]
 url = "https://packages.typst.org/preview/etykett-0.1.1.tar.gz"

From 1f965eb529750460018706efe51bf592d6310a04 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 5 Nov 2025 14:32:01 +0000
Subject: [PATCH 5583/6226] onnxruntime: only add cuda_nvcc to
 disallowedRequisites when cudaSupport is enabled

---
 pkgs/by-name/on/onnxruntime/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/on/onnxruntime/package.nix b/pkgs/by-name/on/onnxruntime/package.nix
index 7325b481285f..52610ed7ca2a 100644
--- a/pkgs/by-name/on/onnxruntime/package.nix
+++ b/pkgs/by-name/on/onnxruntime/package.nix
@@ -325,7 +325,7 @@ effectiveStdenv.mkDerivation rec {
   postFixup = lib.optionalString cudaSupport ''
     remove-references-to -t "${lib.getBin cuda_nvcc}" ''${!outputLib}/lib/libonnxruntime_providers_cuda.so
   '';
-  disallowedRequisites = [ (lib.getBin cuda_nvcc) ];
+  disallowedRequisites = lib.optionals cudaSupport [ (lib.getBin cuda_nvcc) ];
 
   passthru = {
     inherit cudaSupport cudaPackages ncclSupport; # for the python module

From 1d209567ab3f0edeae9612d05371e7d04a49de9a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 14:32:10 +0000
Subject: [PATCH 5584/6226] python3Packages.amaranth: 0.5.7 -> 0.5.8

---
 pkgs/development/python-modules/amaranth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/amaranth/default.nix b/pkgs/development/python-modules/amaranth/default.nix
index e10b9c306d17..6ba46d5f90b2 100644
--- a/pkgs/development/python-modules/amaranth/default.nix
+++ b/pkgs/development/python-modules/amaranth/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "amaranth";
-  version = "0.5.7";
+  version = "0.5.8";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "amaranth-lang";
     repo = "amaranth";
     tag = "v${version}";
-    hash = "sha256-E/PJrvBmlS39KgzDz9sArq4BXwk/JmIMtdxL7MdrWlc=";
+    hash = "sha256-hqMgyQJRz1/5C9KB3nAI2RKPZXZUl3zhfZbk9M1hTxs=";
   };
 
   postPatch = ''

From 69c4b00c5d93211744b46311d37ae60fa82b0009 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Wed, 5 Nov 2025 14:37:33 +0000
Subject: [PATCH 5585/6226] =?UTF-8?q?vector:=200.50.0=20=E2=86=92=200.51.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkgs/by-name/ve/vector/package.nix | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix
index 545d0c9238f3..d90276d5bc1e 100644
--- a/pkgs/by-name/ve/vector/package.nix
+++ b/pkgs/by-name/ve/vector/package.nix
@@ -2,7 +2,6 @@
   stdenv,
   lib,
   fetchFromGitHub,
-  fetchpatch,
   rustPlatform,
   pkg-config,
   openssl,
@@ -26,16 +25,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "vector";
-  version = "0.50.0";
+  version = "0.51.0";
 
   src = fetchFromGitHub {
     owner = "vectordotdev";
     repo = "vector";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-vyRvBCpWOKeI7Y+RbxCdVCAF45vWjC7ZD4PCS0QloPg=";
+    hash = "sha256-aIe+s1Zw6J2Indh0+QmvvykRHx4S2sWqHJxodtQoAQY=";
   };
 
-  cargoHash = "sha256-4Nsq5Ta08wlHuevOfrr1mPi+qY+49q9S+AtbY35sfEM=";
+  cargoHash = "sha256-LqvXWIsSDzGznyIr1kyNU5e8rUSyoAiRn/4Nc9rzvM0=";
 
   nativeBuildInputs = [
     pkg-config

From d1ddfe6600998ab5e981b044cc2f85c8052d02e0 Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Wed, 5 Nov 2025 14:38:37 +0000
Subject: [PATCH 5586/6226] vector: Add versionCheckHook

---
 pkgs/by-name/ve/vector/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/ve/vector/package.nix b/pkgs/by-name/ve/vector/package.nix
index d90276d5bc1e..bec3504bbdb9 100644
--- a/pkgs/by-name/ve/vector/package.nix
+++ b/pkgs/by-name/ve/vector/package.nix
@@ -20,6 +20,7 @@
   nixosTests,
   nix-update-script,
   darwin,
+  versionCheckHook,
   zlib,
 }:
 
@@ -111,6 +112,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
       --replace-fail "#[tokio::test]" ""
   '';
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   passthru = {
     tests = {
       inherit (nixosTests) vector;

From 5ce2183606dd25e7d021327af93c3dfde6bea0cf Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 5 Nov 2025 15:38:01 +0100
Subject: [PATCH 5587/6226] nixos/tests/radicle: update seed nid

---
 nixos/tests/radicle.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/radicle.nix b/nixos/tests/radicle.nix
index 0c7c93359dae..21fc208d8255 100644
--- a/nixos/tests/radicle.nix
+++ b/nixos/tests/radicle.nix
@@ -6,7 +6,7 @@
 
 let
   # The Node ID depends on nodes.seed.services.radicle.privateKeyFile
-  seed-nid = "z6Mkg52RcwDrPKRzzHaYgBkHH3Gi5p4694fvPstVE9HTyMB6";
+  seed-nid = "z6MkhwX7wBkHQvcLazu2KDFK6UifGkLcoxNm2iA38fPH9LwU";
   seed-ssh-keys = import ./ssh-keys.nix pkgs;
   seed-tls-certs = import common/acme/server/snakeoil-certs.nix;
 

From ab707a84f2ae57d7c572dc38bc6e12b8e0cc5b34 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Wed, 5 Nov 2025 15:41:08 +0100
Subject: [PATCH 5588/6226] nixos/tests/radicle-ci-broker: update seed nid

---
 nixos/tests/radicle-ci-broker.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/nixos/tests/radicle-ci-broker.nix b/nixos/tests/radicle-ci-broker.nix
index 849192664571..6fb0953daac8 100644
--- a/nixos/tests/radicle-ci-broker.nix
+++ b/nixos/tests/radicle-ci-broker.nix
@@ -1,7 +1,7 @@
 { lib, pkgs, ... }:
 
 let
-  seed-nid = "z6Mkg52RcwDrPKRzzHaYgBkHH3Gi5p4694fvPstVE9HTyMB6";
+  seed-nid = "z6MkhwX7wBkHQvcLazu2KDFK6UifGkLcoxNm2iA38fPH9LwU";
   seed-ssh-keys = import ./ssh-keys.nix pkgs;
 
   radicleConfig =

From fc8515e4df51a0b7fabf92eafdb0dad2d5f60a55 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 14:43:45 +0000
Subject: [PATCH 5589/6226] cargo-show-asm: 0.2.53 -> 0.2.54

---
 pkgs/by-name/ca/cargo-show-asm/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-show-asm/package.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix
index 3d7fe28b45f0..9e6f15f78155 100644
--- a/pkgs/by-name/ca/cargo-show-asm/package.nix
+++ b/pkgs/by-name/ca/cargo-show-asm/package.nix
@@ -10,14 +10,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-show-asm";
-  version = "0.2.53";
+  version = "0.2.54";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-t6HvflVpYa23xRn0Z9bD3RjrFDiBnkhx+0FUtBjTTtg=";
+    hash = "sha256-AF8fFPdiSZ/odPg3Kp72+LlJ+ox0PU+dH1fhPSt61n8=";
   };
 
-  cargoHash = "sha256-Y3BIQmQ2eH/QnEdv+skl9ppwEmuJ8JMg8mLgUDGRP+8=";
+  cargoHash = "sha256-cSlM0Ci0fXhAw7vfTxdkL9a4L9r76XdaR5URYYGAdd0=";
 
   nativeBuildInputs = [
     installShellFiles

From 6e6f134701b18132960eb4839bccc341b5bd9fdf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 14:58:09 +0000
Subject: [PATCH 5590/6226] python3Packages.docling-core: 2.49.0 -> 2.50.1

---
 pkgs/development/python-modules/docling-core/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/docling-core/default.nix b/pkgs/development/python-modules/docling-core/default.nix
index e50704fd8598..9c5cac247c5f 100644
--- a/pkgs/development/python-modules/docling-core/default.nix
+++ b/pkgs/development/python-modules/docling-core/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "docling-core";
-  version = "2.49.0";
+  version = "2.50.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "docling-project";
     repo = "docling-core";
     tag = "v${version}";
-    hash = "sha256-c/uU5qeoCXNuMJwsG/Z2+M4N+M8j66fuiSr461on8Aw=";
+    hash = "sha256-pLIWskl5nXdOC5UwvfJ3Yhl8qV6jg42P89gLj7ASpTA=";
   };
 
   build-system = [

From 6c9fbdf5f21516f0a72ed1b668aaf49e2822f1b4 Mon Sep 17 00:00:00 2001
From: polyfloyd <floyd@polyfloyd.net>
Date: Tue, 28 Oct 2025 22:13:31 +0100
Subject: [PATCH 5591/6226] platformio: fix missing pyparsing

---
 pkgs/by-name/pl/platformio-core/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/pl/platformio-core/package.nix b/pkgs/by-name/pl/platformio-core/package.nix
index f0afbb6b5642..9edb8ce9c8a3 100644
--- a/pkgs/by-name/pl/platformio-core/package.nix
+++ b/pkgs/by-name/pl/platformio-core/package.nix
@@ -79,6 +79,7 @@ buildPythonApplication rec {
     marshmallow
     pip
     pyelftools
+    pyparsing
     pyserial
     pyyaml
     requests

From cec023ad5eb4d66567961e9216992a2f7e5c3b1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 15:10:41 +0000
Subject: [PATCH 5592/6226] prisma-language-server: 6.18.0 -> 6.19.0

---
 pkgs/by-name/pr/prisma-language-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pr/prisma-language-server/package.nix b/pkgs/by-name/pr/prisma-language-server/package.nix
index 9e5412b94327..29094642be14 100644
--- a/pkgs/by-name/pr/prisma-language-server/package.nix
+++ b/pkgs/by-name/pr/prisma-language-server/package.nix
@@ -6,17 +6,17 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "prisma-language-server";
-  version = "6.18.0";
+  version = "6.19.0";
 
   src = fetchFromGitHub {
     owner = "prisma";
     repo = "language-tools";
     tag = "${finalAttrs.version}";
-    hash = "sha256-o6v7IcpSXDBd/R5XmSMklc3GsWWLKAvvzmi7bTTDlpU=";
+    hash = "sha256-v+gCxUuwrLdl2rlvB2HGZvXZEdSxmdUrY1YE58iBKRQ=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/packages/language-server";
-  npmDepsHash = "sha256-XcJ5ky9MLa2Ta7Xuwf57Zs6SzpUR5h5J640TH39Ukbg=";
+  npmDepsHash = "sha256-4NQO48a2f4k6CSWmIc/7UavNPNkAVIg0OyYArt/+vxI=";
 
   meta = {
     description = "Language server for Prisma";

From 4b69f5f993512ff48a0cd5ed43cf30cbbcb4225b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 15:48:32 +0000
Subject: [PATCH 5593/6226] terraform-providers.ovh_ovh: 2.8.0 -> 2.9.0

---
 .../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 7f5952b7bba0..a2cee857b3af 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1057,11 +1057,11 @@
     "vendorHash": null
   },
   "ovh_ovh": {
-    "hash": "sha256-G6pLpThqKuCDx4QdTYvJYpba56ZWaxPML/3H1oslw34=",
+    "hash": "sha256-PNVbGn+MTb1139uDVSLBCKVMtDmY/c8uJCiTSBtbZAE=",
     "homepage": "https://registry.terraform.io/providers/ovh/ovh",
     "owner": "ovh",
     "repo": "terraform-provider-ovh",
-    "rev": "v2.8.0",
+    "rev": "v2.9.0",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From 396e01f9fb9c6c0ae6eb95bad4f4dfe37735a2e1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 15:50:16 +0000
Subject: [PATCH 5594/6226] terraform-providers.terraform-routeros_routeros:
 1.89.0 -> 1.90.0

---
 .../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 7f5952b7bba0..56ea2baf2ac1 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1354,11 +1354,11 @@
     "vendorHash": "sha256-AlB9tC3KejgUAjjT2pY7Q2mTS/AV4QRusSnyPiOheXE="
   },
   "terraform-routeros_routeros": {
-    "hash": "sha256-ixqTSPKaLyzIRjdBDkq/4XmWEYEP5ZnaV54SR++Dl70=",
+    "hash": "sha256-X7HyHSVYNTOM1gPc9MEfs50o2pquKT8SbFXtVfQ44eQ=",
     "homepage": "https://registry.terraform.io/providers/terraform-routeros/routeros",
     "owner": "terraform-routeros",
     "repo": "terraform-provider-routeros",
-    "rev": "v1.89.0",
+    "rev": "v1.90.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-AHl0rUuAASk+3qH0C1bRl8IgKWKY+g5rMhzf5/IHQIA="
   },

From d85b5d6e571d1033c52f141266987b16a315bdc9 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 5 Nov 2025 16:50:10 +0100
Subject: [PATCH 5595/6226] python3Packages.django_5_2: 5.2.7 -> 5.2.8

https://docs.djangoproject.com/en/5.2/releases/5.2.8/
https://www.djangoproject.com/weblog/2025/nov/05/security-releases/

Fixes: CVE-2025-64458, CVE-2025-64459
---
 pkgs/development/python-modules/django/5_2.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/5_2.nix b/pkgs/development/python-modules/django/5_2.nix
index bc2e730f56a4..52a828a21e09 100644
--- a/pkgs/development/python-modules/django/5_2.nix
+++ b/pkgs/development/python-modules/django/5_2.nix
@@ -43,7 +43,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "5.2.7";
+  version = "5.2.8";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -52,7 +52,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-rvnKa2+QabRtRfj0sauUsoxp0LJLUCmWrFs6ruVrz4k=";
+    hash = "sha256-ruzQ3CUNqHa0RmxCDBVXbtetkMvz+G/D4/LB/2aBc8I=";
   };
 
   patches = [

From cdc8050f8e0cac215457b27869ff039c76f5b540 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Wed, 5 Nov 2025 12:45:59 -0300
Subject: [PATCH 5596/6226] treewide: mark as broken on darwin (last successful
 Hydra build in 2024)

---
 pkgs/applications/science/misc/tulip/default.nix      | 2 ++
 pkgs/by-name/av/avfs/package.nix                      | 2 ++
 pkgs/by-name/co/coan/package.nix                      | 2 ++
 pkgs/by-name/em/emboss/package.nix                    | 2 ++
 pkgs/by-name/eu/eureka-ideas/package.nix              | 3 +++
 pkgs/by-name/fi/finalfrontier/package.nix             | 2 ++
 pkgs/by-name/ga/garmintools/package.nix               | 3 ++-
 pkgs/by-name/jo/jose/package.nix                      | 2 ++
 pkgs/by-name/li/libinfinity/package.nix               | 2 ++
 pkgs/by-name/pa/packet-sd/package.nix                 | 3 +++
 pkgs/by-name/si/sic-image-cli/package.nix             | 3 +++
 pkgs/by-name/te/telepathy-mission-control/package.nix | 2 ++
 pkgs/development/compilers/chicken/5/overrides.nix    | 3 ++-
 pkgs/development/compilers/polyml/5.7.nix             | 3 ++-
 pkgs/os-specific/linux/firmware/ath9k/default.nix     | 2 ++
 pkgs/tools/filesystems/encfs/default.nix              | 2 ++
 16 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix
index 1fa111378329..39a7b666e042 100644
--- a/pkgs/applications/science/misc/tulip/default.nix
+++ b/pkgs/applications/science/misc/tulip/default.nix
@@ -77,5 +77,7 @@ stdenv.mkDerivation rec {
 
     maintainers = [ ];
     platforms = lib.platforms.all;
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/av/avfs/package.nix b/pkgs/by-name/av/avfs/package.nix
index 4effeb22b398..d2c21467567c 100644
--- a/pkgs/by-name/av/avfs/package.nix
+++ b/pkgs/by-name/av/avfs/package.nix
@@ -32,5 +32,7 @@ stdenv.mkDerivation rec {
     description = "Virtual filesystem that allows browsing of compressed files";
     platforms = lib.platforms.unix;
     license = lib.licenses.gpl2Only;
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/co/coan/package.nix b/pkgs/by-name/co/coan/package.nix
index 4d8b95642712..4c29315ea0c2 100644
--- a/pkgs/by-name/co/coan/package.nix
+++ b/pkgs/by-name/co/coan/package.nix
@@ -46,5 +46,7 @@ stdenv.mkDerivation rec {
     homepage = "https://coan2.sourceforge.net/";
     license = licenses.bsd3;
     platforms = platforms.all;
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/em/emboss/package.nix b/pkgs/by-name/em/emboss/package.nix
index fd0d2cac3192..128aab262e39 100644
--- a/pkgs/by-name/em/emboss/package.nix
+++ b/pkgs/by-name/em/emboss/package.nix
@@ -50,5 +50,7 @@ stdenv.mkDerivation rec {
     '';
     license = lib.licenses.gpl2;
     homepage = "https://emboss.sourceforge.net/";
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/eu/eureka-ideas/package.nix b/pkgs/by-name/eu/eureka-ideas/package.nix
index 36f0fa92b93a..4f52ec1aab42 100644
--- a/pkgs/by-name/eu/eureka-ideas/package.nix
+++ b/pkgs/by-name/eu/eureka-ideas/package.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   lib,
   rustPlatform,
   fetchFromGitHub,
@@ -36,5 +37,7 @@ rustPlatform.buildRustPackage rec {
     license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "eureka";
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/fi/finalfrontier/package.nix b/pkgs/by-name/fi/finalfrontier/package.nix
index a35b50c2eb31..cd092e77cc99 100644
--- a/pkgs/by-name/fi/finalfrontier/package.nix
+++ b/pkgs/by-name/fi/finalfrontier/package.nix
@@ -50,5 +50,7 @@ rustPlatform.buildRustPackage {
     homepage = "https://github.com/finalfusion/finalfrontier/";
     license = licenses.asl20;
     maintainers = [ ];
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/ga/garmintools/package.nix b/pkgs/by-name/ga/garmintools/package.nix
index 34dddd4a60c3..ee0de59d75aa 100644
--- a/pkgs/by-name/ga/garmintools/package.nix
+++ b/pkgs/by-name/ga/garmintools/package.nix
@@ -19,6 +19,7 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     platforms = lib.platforms.unix;
     # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/jo/jose/package.nix b/pkgs/by-name/jo/jose/package.nix
index 921334d07910..000bcba502b1 100644
--- a/pkgs/by-name/jo/jose/package.nix
+++ b/pkgs/by-name/jo/jose/package.nix
@@ -48,5 +48,7 @@ stdenv.mkDerivation rec {
     maintainers = [ ];
     license = lib.licenses.asl20;
     platforms = lib.platforms.all;
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/li/libinfinity/package.nix b/pkgs/by-name/li/libinfinity/package.nix
index f2fe5897e98f..a61ff397ba9d 100644
--- a/pkgs/by-name/li/libinfinity/package.nix
+++ b/pkgs/by-name/li/libinfinity/package.nix
@@ -83,6 +83,8 @@ let
       license = lib.licenses.lgpl2Plus;
       maintainers = [ ];
       platforms = with lib.platforms; linux ++ darwin;
+      # The last successful Darwin Hydra build was in 2024
+      broken = stdenv.hostPlatform.isDarwin;
     };
   };
 in
diff --git a/pkgs/by-name/pa/packet-sd/package.nix b/pkgs/by-name/pa/packet-sd/package.nix
index 053aceffa748..c8b98687cf2b 100644
--- a/pkgs/by-name/pa/packet-sd/package.nix
+++ b/pkgs/by-name/pa/packet-sd/package.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   buildGoModule,
   fetchFromGitHub,
   fetchpatch2,
@@ -45,5 +46,7 @@ buildGoModule rec {
     license = licenses.asl20;
     maintainers = [ ];
     mainProgram = "prometheus-packet-sd";
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/by-name/si/sic-image-cli/package.nix b/pkgs/by-name/si/sic-image-cli/package.nix
index 9511263d55b6..f9dc473ef60a 100644
--- a/pkgs/by-name/si/sic-image-cli/package.nix
+++ b/pkgs/by-name/si/sic-image-cli/package.nix
@@ -1,4 +1,5 @@
 {
+  stdenv,
   lib,
   rustPlatform,
   fetchFromGitHub,
@@ -43,5 +44,7 @@ rustPlatform.buildRustPackage rec {
     ];
     maintainers = [ ];
     mainProgram = "sic";
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
   };
 }
diff --git a/pkgs/by-name/te/telepathy-mission-control/package.nix b/pkgs/by-name/te/telepathy-mission-control/package.nix
index e09780096df0..0e460038debe 100644
--- a/pkgs/by-name/te/telepathy-mission-control/package.nix
+++ b/pkgs/by-name/te/telepathy-mission-control/package.nix
@@ -61,5 +61,7 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl21Only;
     maintainers = [ ];
     platforms = platforms.unix;
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64;
   };
 }
diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix
index 5ea7a8bd71e6..44e306b83f41 100644
--- a/pkgs/development/compilers/chicken/5/overrides.nix
+++ b/pkgs/development/compilers/chicken/5/overrides.nix
@@ -98,7 +98,6 @@ in
       ] old
     )
     // (addToBuildInputs pkgs.libglut old);
-  iconv = addToBuildInputs (lib.optional stdenv.hostPlatform.isDarwin pkgs.libiconv);
   icu = addToBuildInputsWithPkgConfig pkgs.icu;
   imlib2 = addToBuildInputsWithPkgConfig pkgs.imlib2;
   inotify =
@@ -306,6 +305,8 @@ in
 
   # mark broken darwin
 
+  # The last successful Darwin Hydra build was in 2024
+  iconv = brokenOnDarwin;
   # fatal error: 'mqueue.h' file not found
   posix-mq = brokenOnDarwin;
   # Undefined symbols for architecture arm64: "_pthread_setschedprio"
diff --git a/pkgs/development/compilers/polyml/5.7.nix b/pkgs/development/compilers/polyml/5.7.nix
index b9f280fbeac0..3444b08ae241 100644
--- a/pkgs/development/compilers/polyml/5.7.nix
+++ b/pkgs/development/compilers/polyml/5.7.nix
@@ -62,6 +62,7 @@ stdenv.mkDerivation rec {
     license = licenses.lgpl21;
     platforms = with platforms; (linux ++ darwin);
     # never built on aarch64-darwin since first introduction in nixpkgs
-    broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64;
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }
diff --git a/pkgs/os-specific/linux/firmware/ath9k/default.nix b/pkgs/os-specific/linux/firmware/ath9k/default.nix
index 5c9660968579..2111b2403d21 100644
--- a/pkgs/os-specific/linux/firmware/ath9k/default.nix
+++ b/pkgs/os-specific/linux/firmware/ath9k/default.nix
@@ -186,5 +186,7 @@ stdenv.mkDerivation (finalAttrs: {
     homepage = "http://lists.infradead.org/mailman/listinfo/ath9k_htc_fw";
     downloadPage = "https://github.com/qca/open-ath9k-htc-firmware";
     changelog = "https://github.com/qca/open-ath9k-htc-firmware/tags";
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 })
diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix
index 08e14c7624d6..abd5279b69d6 100644
--- a/pkgs/tools/filesystems/encfs/default.nix
+++ b/pkgs/tools/filesystems/encfs/default.nix
@@ -67,5 +67,7 @@ stdenv.mkDerivation rec {
       lgpl3Plus
     ];
     platforms = platforms.unix;
+    # The last successful Darwin Hydra build was in 2024
+    broken = stdenv.hostPlatform.isDarwin;
   };
 }

From 8acc954e72324149241cce9b1b9140d4721078ef Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Tue, 4 Nov 2025 19:18:32 -0500
Subject: [PATCH 5597/6226] jsonplaceholder: migrate from nodePackages

---
 pkgs/by-name/js/jsonplaceholder/package.nix   |   41 +
 pkgs/development/node-packages/aliases.nix    |    1 +
 .../node-packages/node-packages.json          |    1 -
 .../node-packages/node-packages.nix           | 1055 -----------------
 pkgs/development/node-packages/overrides.nix  |   13 -
 5 files changed, 42 insertions(+), 1069 deletions(-)
 create mode 100644 pkgs/by-name/js/jsonplaceholder/package.nix

diff --git a/pkgs/by-name/js/jsonplaceholder/package.nix b/pkgs/by-name/js/jsonplaceholder/package.nix
new file mode 100644
index 000000000000..5036c9006bd9
--- /dev/null
+++ b/pkgs/by-name/js/jsonplaceholder/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  makeBinaryWrapper,
+  nodejs,
+  nix-update-script,
+}:
+
+buildNpmPackage {
+  pname = "jsonplaceholder";
+  version = "0-unstable-2021-06-14";
+
+  src = fetchFromGitHub {
+    owner = "typicode";
+    repo = "jsonplaceholder";
+    rev = "7ae4432ac3f60e7226a899c25e04826207d07098";
+    hash = "sha256-b+p1bByq0oRj3zqVsFFoXFR2ydrbZqWwJdVIaXEmQwQ";
+  };
+
+  npmDepsHash = "sha256-x+EN33CQE4ga9T0V4oJRPkELT8x4WbNIsQmvyW+hHi8=";
+
+  nativeBuildInputs = [ makeBinaryWrapper ];
+
+  postInstall = ''
+    rm -rf $out/lib/node_modules/jsonplaceholder/node_modules/.bin
+
+    makeWrapper ${nodejs}/bin/node $out/bin/jsonplaceholder \
+      --add-flags $out/lib/node_modules/jsonplaceholder/index.js \
+      --set NODE_PATH "$out/lib/node_modules"
+  '';
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "Simple online fake REST API server";
+    homepage = "https://jsonplaceholder.typicode.com/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+}
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 062322e28570..f7c7746d4d27 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -145,6 +145,7 @@ mapAliases {
   ionic = throw "ionic was replaced by @ionic/cli"; # added 2023-08-19
   inherit (pkgs) jake; # added 2023-08-19
   inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
+  inherit (pkgs) jsonplaceholder; # Added 2025-11-04
   inherit (pkgs) kaput-cli; # added 2024-12-03
   karma = pkgs.karma-runner; # added 2023-07-29
   keyoxide = pkgs.keyoxide-cli; # Added 2025-10-20
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 8059bb62337b..3df957c3bbe1 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -90,7 +90,6 @@
 , "json-refs"
 , "json-server"
 , "jsonlint"
-, "jsonplaceholder"
 , "katex"
 , "lcov-result-merger"
 , "live-server"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index cb4cec8ba97e..9183848ef1bc 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -6773,15 +6773,6 @@ let
         sha512 = "iFY7JCgHbepc0b82yLaw4IMortylNb6wG4kL+4R0C3iv6i+RHGHux/yUX5BTiRvSX/shMnngjR1YyNMnXEFh5A==";
       };
     };
-    "ansi-align-1.1.0" = {
-      name = "ansi-align";
-      packageName = "ansi-align";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-align/-/ansi-align-1.1.0.tgz";
-        sha512 = "ncgIO/ZeFcsh3cye0NgGPb5h/3vCiKJxp6HvPtqsFvEL/4b/G2tNgrr8EOYN5RSVnGx69k8dFYSBG/w1yKX58Q==";
-      };
-    };
     "ansi-align-3.0.1" = {
       name = "ansi-align";
       packageName = "ansi-align";
@@ -8402,15 +8393,6 @@ let
         sha512 = "AlcaJBi/pqqJBIQ8U9Mcpc9i8Aqxn88Skv5d+xBX006BY5u8N3mGLHa5Lgppa7L/HfwgwLgZ6NYs+Ag6uUmJRA==";
       };
     };
-    "boxen-0.6.0" = {
-      name = "boxen";
-      packageName = "boxen";
-      version = "0.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boxen/-/boxen-0.6.0.tgz";
-        sha512 = "yL8sYzt0avlYGOY6LqtECkGrJOY3cCLAbFPaNfgE+4fD45ZrdYqLdY8yF4bqyTkpfW9e6W0YqBkN7dIn/PrZoA==";
-      };
-    };
     "boxen-5.1.2" = {
       name = "boxen";
       packageName = "boxen";
@@ -9230,15 +9212,6 @@ let
         sha512 = "DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw==";
       };
     };
-    "camelcase-3.0.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz";
-        sha512 = "4nhGqUkc4BqbBBB4Q6zLuD7lzzrHYrjKGeYaEji/3tFR5VdJu9v+LilhGIVe8wxEJPPOeWo7eg8dwY13TZ1BNg==";
-      };
-    };
     "camelcase-4.1.0" = {
       name = "camelcase";
       packageName = "camelcase";
@@ -9851,15 +9824,6 @@ let
         sha512 = "41U72MB56TfUMGndAKK8vJ78eooOD4Z5NOL4xEfjc0c23s+6EYKXlXsmACBVclLP1yOfWCgEganVzddVrSNoTg==";
       };
     };
-    "cli-boxes-1.0.0" = {
-      name = "cli-boxes";
-      packageName = "cli-boxes";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cli-boxes/-/cli-boxes-1.0.0.tgz";
-        sha512 = "3Fo5wu8Ytle8q9iCzS4D2MWVL2X7JVWRiS1BnXbTFDhS9c/REkM9vd1AmabsoZoY5/dGi5TT9iKL8Kb6DeBRQg==";
-      };
-    };
     "cli-boxes-2.2.1" = {
       name = "cli-boxes";
       packageName = "cli-boxes";
@@ -10058,15 +10022,6 @@ let
         sha512 = "6rj9pgdukjT994Md13JCUAgTk91abAKrygL9sAvmHY4F6AKMOV8ccGaxhUUfcBuyg3sundWnn3JE0Mc9W6ZYqw==";
       };
     };
-    "cliui-3.2.0" = {
-      name = "cliui";
-      packageName = "cliui";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz";
-        sha512 = "0yayqDxWQbqk3ojkYqUKqaAQ6AfNKeKWRNA8kR0WXzAsdHpP4BIaOmMAG87JGuO6qcobyW4GjxHd9PmhEd+T9w==";
-      };
-    };
     "cliui-5.0.0" = {
       name = "cliui";
       packageName = "cliui";
@@ -10760,15 +10715,6 @@ let
         sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==";
       };
     };
-    "configstore-2.1.0" = {
-      name = "configstore";
-      packageName = "configstore";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/configstore/-/configstore-2.1.0.tgz";
-        sha512 = "BOCxwwxF5WPspp1OBq9j0JLyL5JgJOTssz9PdOHr8VWjFijaC3PpjU48vFEX3uxx8sTusnVQckLbNzBq6fmkGw==";
-      };
-    };
     "configstore-4.0.0" = {
       name = "configstore";
       packageName = "configstore";
@@ -10850,15 +10796,6 @@ let
         sha512 = "zKcpA7cuXGEhuw9Pz7JmVCFmp85jzGLGm/iiagXTwyEAJp4ypLPtRS/V4IGuGb9KjjrgHBs6P/gDCpZHnFzksA==";
       };
     };
-    "connect-pause-0.1.1" = {
-      name = "connect-pause";
-      packageName = "connect-pause";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/connect-pause/-/connect-pause-0.1.1.tgz";
-        sha512 = "a1gSWQBQD73krFXdUEYJom2RTFrWUL3YvXDCRkyv//GVXc79cdW9MngtRuN9ih4FDKBtfJAJId+BbDuX+1rh2w==";
-      };
-    };
     "consola-3.4.0" = {
       name = "consola";
       packageName = "consola";
@@ -13038,15 +12975,6 @@ let
         sha512 = "Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==";
       };
     };
-    "dot-prop-3.0.0" = {
-      name = "dot-prop";
-      packageName = "dot-prop";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dot-prop/-/dot-prop-3.0.0.tgz";
-        sha512 = "k4ELWeEU3uCcwub7+dWydqQBRjAjkV9L33HjVRG5Xo2QybI6ja/v+4W73SRi8ubCqJz0l9XsTP1NbewfyqaSlw==";
-      };
-    };
     "dot-prop-4.2.1" = {
       name = "dot-prop";
       packageName = "dot-prop";
@@ -13668,15 +13596,6 @@ let
         sha512 = "7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==";
       };
     };
-    "errorhandler-1.5.1" = {
-      name = "errorhandler";
-      packageName = "errorhandler";
-      version = "1.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.1.tgz";
-        sha512 = "rcOwbfvP1WTViVoUjcfZicVzjhjTuhSMntHh6mW3IrEiyE6mJyXvsToJUJGlGlw/2xU9P5whlWNGlIDVeCiT4A==";
-      };
-    };
     "es-aggregate-error-1.0.13" = {
       name = "es-aggregate-error";
       packageName = "es-aggregate-error";
@@ -15270,15 +15189,6 @@ let
         sha512 = "YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==";
       };
     };
-    "filled-array-1.1.0" = {
-      name = "filled-array";
-      packageName = "filled-array";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/filled-array/-/filled-array-1.1.0.tgz";
-        sha512 = "4XwZ1k4rgoF3Yap59MyXFmiUh2zu9fht32NYPSRYwLv4o8BWHxi60I1VH5kHje14qGMoS3qyfHQUsN16ROOugQ==";
-      };
-    };
     "filter-obj-1.1.0" = {
       name = "filter-obj";
       packageName = "filter-obj";
@@ -16125,15 +16035,6 @@ let
         sha512 = "MghbMJ61EJrRsDe7w1Bvqt3ZsBuqhce5nrn/XAwgwOXhcsz53/ltdxOse1h/8eKXj5slzxdsz56g5rzOFSGwfQ==";
       };
     };
-    "get-caller-file-1.0.3" = {
-      name = "get-caller-file";
-      packageName = "get-caller-file";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.3.tgz";
-        sha512 = "3t6rVToeoZfYSGd8YoLFR2DJkiQrIiUrGcjvFX2mDw3bn6k2OtwHN0TNCLbBO+w8qTvimhDkv+LSscbJY1vE6w==";
-      };
-    };
     "get-caller-file-2.0.5" = {
       name = "get-caller-file";
       packageName = "get-caller-file";
@@ -16791,15 +16692,6 @@ let
         sha512 = "XfBk1CxOOScDcMr9O1yKkNaQyy865NbYs+F7dr4H0LZMVgCj2Le59k6PqbNHoL5ToeaEQUYh6c6yMfVcc6SJxA==";
       };
     };
-    "got-5.7.1" = {
-      name = "got";
-      packageName = "got";
-      version = "5.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-5.7.1.tgz";
-        sha512 = "1qd54GLxvVgzuidFmw9ze9umxS3rzhdBH6Wt6BTYrTQUXTN01vGGYXwzLzYLowNx8HBH3/c7kRyvx90fh13i7Q==";
-      };
-    };
     "got-6.7.1" = {
       name = "got";
       packageName = "got";
@@ -18636,15 +18528,6 @@ let
         sha512 = "j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ==";
       };
     };
-    "invert-kv-1.0.0" = {
-      name = "invert-kv";
-      packageName = "invert-kv";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz";
-        sha512 = "xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ==";
-      };
-    };
     "iota-array-1.0.0" = {
       name = "iota-array";
       packageName = "iota-array";
@@ -19293,15 +19176,6 @@ let
         sha512 = "Y4LTamMe0DDQIIAlaer9eKebAlDSV6huy+TWhJVPlzZh2o4tRP5SQWFlLn5N0To4mDD22/qdOq+veo1cSISLgQ==";
       };
     };
-    "is-npm-1.0.0" = {
-      name = "is-npm";
-      packageName = "is-npm";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz";
-        sha512 = "9r39FIr3d+KD9SbX0sfMsHzb5PP3uimOiwr3YupUaUFG4W0l1U57Rx3utpttV7qz5U3jmrO5auUa04LU9pyHsg==";
-      };
-    };
     "is-npm-5.0.0" = {
       name = "is-npm";
       packageName = "is-npm";
@@ -20364,15 +20238,6 @@ let
         sha512 = "lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA==";
       };
     };
-    "json-parse-helpfulerror-1.0.3" = {
-      name = "json-parse-helpfulerror";
-      packageName = "json-parse-helpfulerror";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-parse-helpfulerror/-/json-parse-helpfulerror-1.0.3.tgz";
-        sha512 = "XgP0FGR77+QhUxjXkwOMkC94k3WtqEBfcnjWqhRd82qTat4SWKRE+9kUnynz/shm3I4ea2+qISvTIeGTNU7kJg==";
-      };
-    };
     "json-refs-3.0.15" = {
       name = "json-refs";
       packageName = "json-refs";
@@ -20436,15 +20301,6 @@ let
         sha512 = "XQmWYj2Sm4kn4WeTYvmpKEbyPsL7nBsb647c7pMe6l02/yx2+Jfc4dT6UZkEXnIUb5LhD55r2HPsJ1milQ4rDg==";
       };
     };
-    "json-server-0.8.23" = {
-      name = "json-server";
-      packageName = "json-server";
-      version = "0.8.23";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-server/-/json-server-0.8.23.tgz";
-        sha512 = "a59VWZTCr2IF40Tmr7JC49C76c+3rVpM03G/rT+Srm2a83nIkiqw0rafrstzpK1xxZeUz5gbi6E2Q8y0gUDHNQ==";
-      };
-    };
     "json-stable-stringify-0.0.1" = {
       name = "json-stable-stringify";
       packageName = "json-stable-stringify";
@@ -20967,15 +20823,6 @@ let
         sha512 = "Ca4LSXFFZUjPScRaqOcFxneA0VpKZr4MMYCljyQr4LIewTLb3Y0IUTIsnBBsVubIeEfxeSZpSjSsRM8APEQaAw==";
       };
     };
-    "latest-version-2.0.0" = {
-      name = "latest-version";
-      packageName = "latest-version";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/latest-version/-/latest-version-2.0.0.tgz";
-        sha512 = "8925wFYLfWBciewimt0VmDyYw0GFCRcbFSTrZGt4JgQ7lh5jb/kodMlUt0uMaxXdRKVi+7F3ib30N7fTv83ikw==";
-      };
-    };
     "latest-version-5.1.0" = {
       name = "latest-version";
       packageName = "latest-version";
@@ -21012,15 +20859,6 @@ let
         sha512 = "Y+CjUfLmIpoUCCRl0ub4smrYtGGr5AOa2AKOaWelGHOGz33X/Y/KizefGqbkwfz44+cnq/+9habclf8vOmu2LA==";
       };
     };
-    "lazy-req-1.1.0" = {
-      name = "lazy-req";
-      packageName = "lazy-req";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lazy-req/-/lazy-req-1.1.0.tgz";
-        sha512 = "Vn/JuGaYykbelAVNAhfVJxuwHQCOSNE6mqMtD+gnd+QORlAHwWVmVFqQga3yWt84G5vAwEwpT6sAsZ+tgJ88/Q==";
-      };
-    };
     "lazyness-1.2.0" = {
       name = "lazyness";
       packageName = "lazyness";
@@ -21039,15 +20877,6 @@ let
         sha512 = "b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==";
       };
     };
-    "lcid-1.0.0" = {
-      name = "lcid";
-      packageName = "lcid";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz";
-        sha512 = "YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw==";
-      };
-    };
     "leven-2.1.0" = {
       name = "leven";
       packageName = "leven";
@@ -21552,15 +21381,6 @@ let
         sha512 = "SXL66C731p0xPDC5LZg4wI5H+dJo/EO4KTqOMwLYCH3+FmmfAKJEZCm6ohGpI+T1xwsDsJCfL4OnhorllvlTPQ==";
       };
     };
-    "lodash.assign-4.2.0" = {
-      name = "lodash.assign";
-      packageName = "lodash.assign";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz";
-        sha512 = "hFuH8TY+Yji7Eja3mGiuAxBqLagejScbG8GbG0j6o9vzn0YL14My+ktnqtZgFTosKymC9/44wP6s7xyuLfnClw==";
-      };
-    };
     "lodash.camelcase-4.3.0" = {
       name = "lodash.camelcase";
       packageName = "lodash.camelcase";
@@ -22209,15 +22029,6 @@ let
         sha512 = "RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ==";
       };
     };
-    "lowdb-0.13.1" = {
-      name = "lowdb";
-      packageName = "lowdb";
-      version = "0.13.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lowdb/-/lowdb-0.13.1.tgz";
-        sha512 = "UFdqQF3jrmFgSx7JEPwbEbHh6T/LNBiJGjqrMtG0XN2UtFjCb6eVFOI2GMJO5PApowakhZlMUjWXuR9vWQcnkw==";
-      };
-    };
     "lowdb-7.0.1" = {
       name = "lowdb";
       packageName = "lowdb";
@@ -23290,15 +23101,6 @@ let
         sha512 = "tmj4CKZJVQd/ZuN9hnYD8HBAs/3RdDdqUeJG9RbVYlEZLuPYK4EW+EekMqLsCV4w1HastX+Pk2Ov87OQmeo01A==";
       };
     };
-    "method-override-2.3.10" = {
-      name = "method-override";
-      packageName = "method-override";
-      version = "2.3.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/method-override/-/method-override-2.3.10.tgz";
-        sha512 = "Ks2/7e+3JuwQcpLybc6wTHyqg13HDjOhLcE+YaAEub9DbSxF+ieMvxUlybmWW9luRMh9Cd0rO9aNtzUT51xfNQ==";
-      };
-    };
     "methods-1.1.2" = {
       name = "methods";
       packageName = "methods";
@@ -25235,15 +25037,6 @@ let
         sha512 = "zfWC/gICcqb74D9ndyvxZWaI1jzcoHmf4UTHWQchBNuNMxdBLJMDiUgZ1tjGLEIe/BMhj2DxKD8HOuc2062pDQ==";
       };
     };
-    "node-status-codes-1.0.0" = {
-      name = "node-status-codes";
-      packageName = "node-status-codes";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-status-codes/-/node-status-codes-1.0.0.tgz";
-        sha512 = "1cBMgRxdMWE8KeWCqk2RIOrvUb0XCwYfEsY5/y2NlXyq4Y/RumnOZvTj4Nbr77+Vb2C+kyBoRTdkNOS8L3d/aQ==";
-      };
-    };
     "node-uuid-1.4.8" = {
       name = "node-uuid";
       packageName = "node-uuid";
@@ -26315,15 +26108,6 @@ let
         sha512 = "B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==";
       };
     };
-    "os-locale-1.4.0" = {
-      name = "os-locale";
-      packageName = "os-locale";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz";
-        sha512 = "PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g==";
-      };
-    };
     "os-paths-4.4.0" = {
       name = "os-paths";
       packageName = "os-paths";
@@ -26639,15 +26423,6 @@ let
         sha512 = "ua1L4OgXSBdsu1FPb7F3tYH0F48a6kxvod4pLUlGY9COeJAJQNX/sNH2IiEmsxw7lqYiAwrdHMjz1FctOsyDQg==";
       };
     };
-    "package-json-2.4.0" = {
-      name = "package-json";
-      packageName = "package-json";
-      version = "2.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/package-json/-/package-json-2.4.0.tgz";
-        sha512 = "PRg65iXMTt/uK8Rfh5zvzkUbfAPitF17YaCY+IbHsYgksiLvtzWWTUildHth3mVaZ7871OJ7gtP4LBRBlmAdXg==";
-      };
-    };
     "package-json-6.5.0" = {
       name = "package-json";
       packageName = "package-json";
@@ -27629,15 +27404,6 @@ let
         sha512 = "TH+BeeL6Ct98C7as35JbZLf8lgsRzlNJb5gklRIGHKaPkGl1esOKBc5ALUMd+q08Sr6tiEKM+Icbsxg5vuhMKQ==";
       };
     };
-    "pluralize-3.1.0" = {
-      name = "pluralize";
-      packageName = "pluralize";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pluralize/-/pluralize-3.1.0.tgz";
-        sha512 = "2wcybwjwXOzGI1rlxWtlcs0/nSYK0OzNPqsg35TKxJFQlGhFu3cZ1x7EHS4r4bubQlhzyF4YxxlJqQnIhkUQCw==";
-      };
-    };
     "pluralize-8.0.0" = {
       name = "pluralize";
       packageName = "pluralize";
@@ -28763,15 +28529,6 @@ let
         sha512 = "rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==";
       };
     };
-    "read-all-stream-3.1.0" = {
-      name = "read-all-stream";
-      packageName = "read-all-stream";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-all-stream/-/read-all-stream-3.1.0.tgz";
-        sha512 = "DI1drPHbmBcUDWrJ7ull/F2Qb8HkwBncVx8/RpKYFSIACYaVRQReISYPdZz/mt1y1+qMCOrfReTopERmaxtP6w==";
-      };
-    };
     "read-binary-file-arch-1.0.6" = {
       name = "read-binary-file-arch";
       packageName = "read-binary-file-arch";
@@ -29267,15 +29024,6 @@ let
         sha512 = "JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==";
       };
     };
-    "registry-auth-token-3.4.0" = {
-      name = "registry-auth-token";
-      packageName = "registry-auth-token";
-      version = "3.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.4.0.tgz";
-        sha512 = "4LM6Fw8eBQdwMYcES4yTnn2TqIasbXuwDx3um+QRs7S55aMKCBKBxvPXl2RiUjHwuJLTyYfxSpmfSAjQpcuP+A==";
-      };
-    };
     "registry-auth-token-4.2.2" = {
       name = "registry-auth-token";
       packageName = "registry-auth-token";
@@ -29294,15 +29042,6 @@ let
         sha512 = "GdekYuwLXLxMuFTwAPg5UKGLW/UXzQrZvH/Zj791BQif5T05T0RsaLfHc9q3ZOKi7n+BoprPD9mJ0O0k4xzUlw==";
       };
     };
-    "registry-url-3.1.0" = {
-      name = "registry-url";
-      packageName = "registry-url";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz";
-        sha512 = "ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA==";
-      };
-    };
     "registry-url-5.1.0" = {
       name = "registry-url";
       packageName = "registry-url";
@@ -30050,15 +29789,6 @@ let
         sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==";
       };
     };
-    "require-main-filename-1.0.1" = {
-      name = "require-main-filename";
-      packageName = "require-main-filename";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz";
-        sha512 = "IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug==";
-      };
-    };
     "require-main-filename-2.0.0" = {
       name = "require-main-filename";
       packageName = "require-main-filename";
@@ -30950,15 +30680,6 @@ let
         sha512 = "YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==";
       };
     };
-    "semver-diff-2.1.0" = {
-      name = "semver-diff";
-      packageName = "semver-diff";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/semver-diff/-/semver-diff-2.1.0.tgz";
-        sha512 = "gL8F8L4ORwsS0+iQ34yCYv///jsOq0ZL7WP55d1HnJ32o7tyFYEFQZQA22mrLIacZdU6xecaBBZ+uEiffGNyXw==";
-      };
-    };
     "semver-diff-3.1.1" = {
       name = "semver-diff";
       packageName = "semver-diff";
@@ -32408,15 +32129,6 @@ let
         sha512 = "ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==";
       };
     };
-    "steno-0.4.4" = {
-      name = "steno";
-      packageName = "steno";
-      version = "0.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/steno/-/steno-0.4.4.tgz";
-        sha512 = "EEHMVYHNXFHfGtgjNITnka0aHhiAlo93F7z2/Pwd+g0teG9CnM3JIINM7hVVB5/rhw9voufD7Wukwgtw2uqh6w==";
-      };
-    };
     "steno-4.0.2" = {
       name = "steno";
       packageName = "steno";
@@ -33641,15 +33353,6 @@ let
         sha512 = "gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==";
       };
     };
-    "timed-out-3.1.3" = {
-      name = "timed-out";
-      packageName = "timed-out";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/timed-out/-/timed-out-3.1.3.tgz";
-        sha512 = "3RB4qgvPkxF/FGPnrzaWLhW1rxNK2sdH0mFjbhxkfTR6QXvcM3EtYm9L44UrhODZrZ+yhDXeMncLqi8QXn2MJg==";
-      };
-    };
     "timed-out-4.0.1" = {
       name = "timed-out";
       packageName = "timed-out";
@@ -34559,15 +34262,6 @@ let
         sha512 = "5WsVTFcH1ut/kkhAaHf4PVgI8c7++GiVcpCGxPouI6ZVjsqPnSDf8h/8HtVqc0t4fzRXwnMK70EcZeAs3PIddg==";
       };
     };
-    "underscore-db-0.10.0" = {
-      name = "underscore-db";
-      packageName = "underscore-db";
-      version = "0.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore-db/-/underscore-db-0.10.0.tgz";
-        sha512 = "/Arq1q7vh5kzmw4brlCZQw3jxc3KEGHqaNXCYEvMAg5ZK0iVwK9WsejPuC6YjcF2jpm8PTUtaLUjbziS+ku5sA==";
-      };
-    };
     "undici-5.28.2" = {
       name = "undici";
       packageName = "undici";
@@ -35261,15 +34955,6 @@ let
         sha512 = "KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==";
       };
     };
-    "unzip-response-1.0.2" = {
-      name = "unzip-response";
-      packageName = "unzip-response";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unzip-response/-/unzip-response-1.0.2.tgz";
-        sha512 = "pwCcjjhEcpW45JZIySExBHYv5Y9EeL2OIGEfrSKp2dMUFGFv4CpvZkwJbVge8OvGH2BNNtJBx67DuKuJhf+N5Q==";
-      };
-    };
     "unzip-response-2.0.1" = {
       name = "unzip-response";
       packageName = "unzip-response";
@@ -35306,15 +34991,6 @@ let
         sha512 = "5YHsflzHP4t1G+8WGPlvKbJEbAJGCgw+Em+dGR1KmBUbr1J36SJBqlHLjR7oob7sco5hWHGQVcr9B2poIVDDTQ==";
       };
     };
-    "update-notifier-1.0.3" = {
-      name = "update-notifier";
-      packageName = "update-notifier";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/update-notifier/-/update-notifier-1.0.3.tgz";
-        sha512 = "iQSLFuxB2ZFAxXGN28DTxk/GNGlBmtqawvguYDtChAHI9Xjy0z7c7hpw6ywutK34SEDYTpLEsAM1ATMq5pcQsw==";
-      };
-    };
     "update-notifier-5.1.0" = {
       name = "update-notifier";
       packageName = "update-notifier";
@@ -35594,15 +35270,6 @@ let
         sha512 = "8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==";
       };
     };
-    "uuid-2.0.3" = {
-      name = "uuid";
-      packageName = "uuid";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz";
-        sha512 = "FULf7fayPdpASncVy4DLh3xydlXEJJpvIELjYjNeQWYUZ9pclcpvCZSr2gkmN2FrrGcI7G/cJsIEwk5/8vfXpg==";
-      };
-    };
     "uuid-3.3.2" = {
       name = "uuid";
       packageName = "uuid";
@@ -36701,15 +36368,6 @@ let
         sha512 = "K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==";
       };
     };
-    "which-module-1.0.0" = {
-      name = "which-module";
-      packageName = "which-module";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz";
-        sha512 = "F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ==";
-      };
-    };
     "which-module-2.0.1" = {
       name = "which-module";
       packageName = "which-module";
@@ -36746,15 +36404,6 @@ let
         sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==";
       };
     };
-    "widest-line-1.0.0" = {
-      name = "widest-line";
-      packageName = "widest-line";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/widest-line/-/widest-line-1.0.0.tgz";
-        sha512 = "r5vvGtqsHUHn98V0jURY4Ts86xJf6+SzK9rpWdV8/73nURB3WFPIHd67aOvPw2fSuunIyHjAUqiJ2TY0x4E5gw==";
-      };
-    };
     "widest-line-3.1.0" = {
       name = "widest-line";
       packageName = "widest-line";
@@ -36809,15 +36458,6 @@ let
         sha512 = "b3Ni/3kKzoHfqL8OdbwHELvEdFt3jyZfjgNXzz0pDvAu7++DdaKE9iCceyzHS2lOdAidyREcUVRY4F9kWwd/Lg==";
       };
     };
-    "window-size-0.2.0" = {
-      name = "window-size";
-      packageName = "window-size";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/window-size/-/window-size-0.2.0.tgz";
-        sha512 = "UD7d8HFA2+PZsbKyaOCEy8gMh1oDtHgJh1LfgjQ4zVXmYjAT/kvz3PueITKuqDiIXQe7yzpPnxX3lNc+AhQMyw==";
-      };
-    };
     "winreg-1.2.4" = {
       name = "winreg";
       packageName = "winreg";
@@ -36926,15 +36566,6 @@ let
         sha512 = "Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==";
       };
     };
-    "wrap-ansi-2.1.0" = {
-      name = "wrap-ansi";
-      packageName = "wrap-ansi";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz";
-        sha512 = "vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw==";
-      };
-    };
     "wrap-ansi-3.0.1" = {
       name = "wrap-ansi";
       packageName = "wrap-ansi";
@@ -37025,15 +36656,6 @@ let
         sha512 = "CJ17OoULEKXpA5pef3qLj5AxTJ6mSt7g84he2WIskKwqFO4T97d5V7Tadl0DYDk7qyUOQD5WlUlOMChaYrhxeA==";
       };
     };
-    "write-file-atomic-1.3.4" = {
-      name = "write-file-atomic";
-      packageName = "write-file-atomic";
-      version = "1.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-1.3.4.tgz";
-        sha512 = "SdrHoC/yVBPpV0Xq/mUZQIpW2sWXAShb/V4pomcJXh92RuaO+f3UTWItiR3Px+pLnV2PvC2/bfn5cwr5X6Vfxw==";
-      };
-    };
     "write-file-atomic-2.4.3" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
@@ -37115,15 +36737,6 @@ let
         sha512 = "RAQ3WkPf4KTU1A8RtFx3gWywzVKe00tfOPFfl2NDGqbIFENQO4kqAJp7mhQjNj/33W5x5hiWWUdyfPq/5SU3QA==";
       };
     };
-    "xdg-basedir-2.0.0" = {
-      name = "xdg-basedir";
-      packageName = "xdg-basedir";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-2.0.0.tgz";
-        sha512 = "NF1pPn594TaRSUO/HARoB4jK8I+rWgcpVlpQCK6/6o5PHyLUt2CSiDrpUZbQ6rROck+W2EwF8mBJcTs+W98J9w==";
-      };
-    };
     "xdg-basedir-3.0.0" = {
       name = "xdg-basedir";
       packageName = "xdg-basedir";
@@ -37340,15 +36953,6 @@ let
         sha512 = "LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==";
       };
     };
-    "y18n-3.2.2" = {
-      name = "y18n";
-      packageName = "y18n";
-      version = "3.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/y18n/-/y18n-3.2.2.tgz";
-        sha512 = "uGZHXkHnhF0XeeAPgnKfPv1bgKAYyVvmNL1xlKsPYZPaIHxGti2hHqvOCQv71XMsLxu1QjergkqogUnms5D3YQ==";
-      };
-    };
     "y18n-4.0.3" = {
       name = "y18n";
       packageName = "y18n";
@@ -37475,15 +37079,6 @@ let
         sha512 = "7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==";
       };
     };
-    "yargs-4.8.1" = {
-      name = "yargs";
-      packageName = "yargs";
-      version = "4.8.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs/-/yargs-4.8.1.tgz";
-        sha512 = "LqodLrnIDM3IFT+Hf/5sxBnEGECrfdC1uIbgZeJmESCSo4HoCAaKEus8MylXHAkdacGc0ye+Qa+dpkuom8uVYA==";
-      };
-    };
     "yargs-parser-13.1.2" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -37511,15 +37106,6 @@ let
         sha512 = "o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==";
       };
     };
-    "yargs-parser-2.4.1" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "2.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-2.4.1.tgz";
-        sha512 = "9pIKIJhnI5tonzG6OnCFlz/yln8xHYcGl+pn3xR0Vzff0vzN1PbNRaelgfgRUwZ3s4i3jvxT9WhmUGL4whnasA==";
-      };
-    };
     "yargs-parser-20.2.9" = {
       name = "yargs-parser";
       packageName = "yargs-parser";
@@ -48276,647 +47862,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  jsonplaceholder = nodeEnv.buildNodePackage {
-    name = "jsonplaceholder";
-    packageName = "jsonplaceholder";
-    version = "0.3.3";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/jsonplaceholder/-/jsonplaceholder-0.3.3.tgz";
-      sha512 = "CLM2ccU+FdJPwGpkWv/jgVGNWwJS7iK1gKxNeS6okse4gwWH7+Fz5BzFRJ6G/+6vq+xDklXD+O/xqUTnczil1Q==";
-    };
-    dependencies = [
-      sources."accepts-1.3.8"
-      sources."ajv-6.12.6"
-      sources."ansi-align-1.1.0"
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-2.2.1"
-      sources."anymatch-1.3.2"
-      sources."arr-diff-2.0.0"
-      sources."arr-flatten-1.1.0"
-      sources."arr-union-3.1.0"
-      sources."array-flatten-1.1.1"
-      sources."array-unique-0.2.1"
-      sources."asn1-0.2.6"
-      sources."assert-plus-1.0.0"
-      sources."assign-symbols-1.0.0"
-      sources."async-each-1.0.6"
-      sources."asynckit-0.4.0"
-      sources."atob-2.1.2"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.13.2"
-      (
-        sources."base-0.11.2"
-        // {
-          dependencies = [
-            sources."define-property-1.0.0"
-            sources."isobject-3.0.1"
-          ];
-        }
-      )
-      sources."basic-auth-2.0.1"
-      sources."bcrypt-pbkdf-1.0.2"
-      sources."binary-extensions-1.13.1"
-      sources."bindings-1.5.0"
-      (
-        sources."body-parser-1.20.3"
-        // {
-          dependencies = [
-            sources."on-finished-2.4.1"
-          ];
-        }
-      )
-      (
-        sources."boxen-0.6.0"
-        // {
-          dependencies = [
-            sources."camelcase-2.1.1"
-          ];
-        }
-      )
-      sources."braces-1.8.5"
-      sources."bytes-3.1.2"
-      (
-        sources."cache-base-1.0.1"
-        // {
-          dependencies = [
-            sources."isobject-3.0.1"
-          ];
-        }
-      )
-      sources."call-bind-apply-helpers-1.0.2"
-      sources."call-bound-1.0.4"
-      sources."camelcase-3.0.0"
-      sources."capture-stack-trace-1.0.2"
-      sources."caseless-0.12.0"
-      sources."chalk-1.1.3"
-      sources."chokidar-1.7.0"
-      (
-        sources."class-utils-0.3.6"
-        // {
-          dependencies = [
-            sources."define-property-0.2.5"
-            sources."is-descriptor-0.1.7"
-            sources."isobject-3.0.1"
-          ];
-        }
-      )
-      sources."cli-boxes-1.0.0"
-      sources."cliui-3.2.0"
-      sources."clone-1.0.4"
-      sources."code-point-at-1.1.0"
-      sources."collection-visit-1.0.0"
-      sources."combined-stream-1.0.8"
-      sources."component-emitter-1.3.1"
-      sources."compressible-2.0.18"
-      (
-        sources."compression-1.8.0"
-        // {
-          dependencies = [
-            sources."negotiator-0.6.4"
-            sources."safe-buffer-5.2.1"
-          ];
-        }
-      )
-      (
-        sources."configstore-2.1.0"
-        // {
-          dependencies = [
-            sources."uuid-2.0.3"
-          ];
-        }
-      )
-      sources."connect-pause-0.1.1"
-      (
-        sources."content-disposition-0.5.4"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.2.1"
-          ];
-        }
-      )
-      sources."content-type-1.0.5"
-      sources."cookie-0.7.1"
-      sources."cookie-signature-1.0.6"
-      sources."copy-descriptor-0.1.1"
-      sources."core-util-is-1.0.2"
-      sources."cors-2.8.5"
-      sources."create-error-class-3.0.2"
-      sources."dashdash-1.14.1"
-      sources."debug-2.6.9"
-      sources."decamelize-1.2.0"
-      sources."decode-uri-component-0.2.2"
-      sources."deep-extend-0.6.0"
-      (
-        sources."define-property-2.0.2"
-        // {
-          dependencies = [
-            sources."isobject-3.0.1"
-          ];
-        }
-      )
-      sources."delayed-stream-1.0.0"
-      sources."depd-2.0.0"
-      sources."destroy-1.2.0"
-      sources."dot-prop-3.0.0"
-      sources."dunder-proto-1.0.1"
-      sources."duplexer2-0.1.4"
-      sources."ecc-jsbn-0.1.2"
-      sources."ee-first-1.1.1"
-      sources."encodeurl-2.0.0"
-      sources."error-ex-1.3.2"
-      sources."errorhandler-1.5.1"
-      sources."es-define-property-1.0.1"
-      sources."es-errors-1.3.0"
-      sources."es-object-atoms-1.1.1"
-      sources."escape-html-1.0.3"
-      sources."escape-string-regexp-1.0.5"
-      sources."etag-1.8.1"
-      sources."expand-brackets-0.1.5"
-      sources."expand-range-1.8.2"
-      (
-        sources."express-4.21.2"
-        // {
-          dependencies = [
-            sources."on-finished-2.4.1"
-            sources."safe-buffer-5.2.1"
-          ];
-        }
-      )
-      sources."extend-3.0.2"
-      (
-        sources."extend-shallow-3.0.2"
-        // {
-          dependencies = [
-            sources."is-extendable-1.0.1"
-          ];
-        }
-      )
-      sources."extglob-0.3.2"
-      sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-json-stable-stringify-2.1.0"
-      sources."file-uri-to-path-1.0.0"
-      sources."filename-regex-2.0.1"
-      sources."fill-range-2.2.4"
-      sources."filled-array-1.1.0"
-      (
-        sources."finalhandler-1.3.1"
-        // {
-          dependencies = [
-            sources."on-finished-2.4.1"
-          ];
-        }
-      )
-      sources."find-up-1.1.2"
-      sources."for-in-1.0.2"
-      sources."for-own-0.1.5"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.3"
-      sources."forwarded-0.2.0"
-      sources."fragment-cache-0.2.1"
-      sources."fresh-0.5.2"
-      sources."fsevents-1.2.13"
-      sources."function-bind-1.1.2"
-      sources."get-caller-file-1.0.3"
-      sources."get-intrinsic-1.3.0"
-      sources."get-proto-1.0.1"
-      sources."get-value-2.0.6"
-      sources."getpass-0.1.7"
-      sources."glob-base-0.3.0"
-      sources."glob-parent-2.0.0"
-      sources."gopd-1.2.0"
-      sources."got-5.7.1"
-      sources."graceful-fs-4.2.11"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.5"
-      sources."has-ansi-2.0.0"
-      sources."has-symbols-1.1.0"
-      (
-        sources."has-value-1.0.0"
-        // {
-          dependencies = [
-            sources."isobject-3.0.1"
-          ];
-        }
-      )
-      (
-        sources."has-values-1.0.0"
-        // {
-          dependencies = [
-            (
-              sources."is-number-3.0.0"
-              // {
-                dependencies = [
-                  sources."kind-of-3.2.2"
-                ];
-              }
-            )
-            sources."kind-of-4.0.0"
-          ];
-        }
-      )
-      sources."hasown-2.0.2"
-      sources."hosted-git-info-2.8.9"
-      sources."http-errors-2.0.0"
-      sources."http-signature-1.2.0"
-      sources."iconv-lite-0.4.24"
-      sources."imurmurhash-0.1.4"
-      sources."inherits-2.0.4"
-      sources."ini-1.3.8"
-      sources."invert-kv-1.0.0"
-      sources."ipaddr.js-1.9.1"
-      sources."is-accessor-descriptor-1.0.1"
-      sources."is-arrayish-0.2.1"
-      sources."is-binary-path-1.0.1"
-      sources."is-buffer-1.1.6"
-      sources."is-core-module-2.16.1"
-      sources."is-data-descriptor-1.0.1"
-      sources."is-descriptor-1.0.3"
-      sources."is-dotfile-1.0.3"
-      sources."is-equal-shallow-0.1.3"
-      sources."is-extendable-0.1.1"
-      sources."is-extglob-1.0.0"
-      sources."is-finite-1.1.0"
-      sources."is-fullwidth-code-point-1.0.0"
-      sources."is-glob-2.0.1"
-      sources."is-npm-1.0.0"
-      sources."is-number-2.1.0"
-      sources."is-obj-1.0.1"
-      (
-        sources."is-plain-object-2.0.4"
-        // {
-          dependencies = [
-            sources."isobject-3.0.1"
-          ];
-        }
-      )
-      sources."is-posix-bracket-0.1.1"
-      sources."is-primitive-2.0.0"
-      sources."is-promise-2.2.2"
-      sources."is-redirect-1.0.0"
-      sources."is-retry-allowed-1.2.0"
-      sources."is-stream-1.1.0"
-      sources."is-typedarray-1.0.0"
-      sources."is-utf8-0.2.1"
-      sources."is-windows-1.0.2"
-      sources."isarray-1.0.0"
-      sources."isobject-2.1.0"
-      sources."isstream-0.1.2"
-      sources."jju-1.4.0"
-      sources."jsbn-0.1.1"
-      sources."json-parse-helpfulerror-1.0.3"
-      sources."json-schema-0.4.0"
-      sources."json-schema-traverse-0.4.1"
-      sources."json-server-0.8.23"
-      sources."json-stringify-safe-5.0.1"
-      sources."jsprim-1.4.2"
-      sources."kind-of-3.2.2"
-      sources."latest-version-2.0.0"
-      sources."lazy-req-1.1.0"
-      sources."lcid-1.0.0"
-      sources."load-json-file-1.1.0"
-      sources."lodash-4.17.21"
-      sources."lodash.assign-4.2.0"
-      sources."lowdb-0.13.1"
-      sources."lowercase-keys-1.0.1"
-      sources."map-cache-0.2.2"
-      sources."map-visit-1.0.0"
-      sources."math-intrinsics-1.1.0"
-      sources."math-random-1.0.4"
-      sources."media-typer-0.3.0"
-      sources."merge-descriptors-1.0.3"
-      sources."method-override-2.3.10"
-      sources."methods-1.1.2"
-      sources."micromatch-2.3.11"
-      sources."mime-1.6.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."minimist-1.2.8"
-      (
-        sources."mixin-deep-1.3.2"
-        // {
-          dependencies = [
-            sources."is-extendable-1.0.1"
-          ];
-        }
-      )
-      sources."mkdirp-0.5.6"
-      sources."morgan-1.10.0"
-      sources."ms-2.0.0"
-      sources."nan-2.22.2"
-      (
-        sources."nanomatch-1.2.13"
-        // {
-          dependencies = [
-            sources."arr-diff-4.0.0"
-            sources."array-unique-0.3.2"
-            sources."kind-of-6.0.3"
-          ];
-        }
-      )
-      sources."negotiator-0.6.3"
-      sources."node-status-codes-1.0.0"
-      sources."node-uuid-1.4.8"
-      sources."normalize-package-data-2.5.0"
-      sources."normalize-path-2.1.1"
-      sources."number-is-nan-1.0.1"
-      sources."oauth-sign-0.9.0"
-      sources."object-assign-4.1.1"
-      (
-        sources."object-copy-0.1.0"
-        // {
-          dependencies = [
-            sources."define-property-0.2.5"
-            sources."is-descriptor-0.1.7"
-          ];
-        }
-      )
-      sources."object-inspect-1.13.4"
-      (
-        sources."object-visit-1.0.1"
-        // {
-          dependencies = [
-            sources."isobject-3.0.1"
-          ];
-        }
-      )
-      sources."object.omit-2.0.1"
-      (
-        sources."object.pick-1.3.0"
-        // {
-          dependencies = [
-            sources."isobject-3.0.1"
-          ];
-        }
-      )
-      sources."on-finished-2.3.0"
-      sources."on-headers-1.0.2"
-      sources."os-homedir-1.0.2"
-      sources."os-locale-1.4.0"
-      sources."os-tmpdir-1.0.2"
-      sources."osenv-0.1.5"
-      sources."package-json-2.4.0"
-      sources."parse-glob-3.0.4"
-      sources."parse-json-2.2.0"
-      sources."parseurl-1.3.3"
-      sources."pascalcase-0.1.1"
-      sources."path-exists-2.1.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-parse-1.0.7"
-      sources."path-to-regexp-0.1.12"
-      sources."path-type-1.1.0"
-      sources."performance-now-2.1.0"
-      sources."pify-2.3.0"
-      sources."pinkie-2.0.4"
-      sources."pinkie-promise-2.0.1"
-      sources."pluralize-3.1.0"
-      sources."posix-character-classes-0.1.1"
-      sources."prepend-http-1.0.4"
-      sources."preserve-0.2.0"
-      sources."process-nextick-args-2.0.1"
-      sources."proxy-addr-2.0.7"
-      sources."psl-1.15.0"
-      sources."punycode-2.3.1"
-      sources."qs-6.13.0"
-      (
-        sources."randomatic-3.1.1"
-        // {
-          dependencies = [
-            sources."is-number-4.0.0"
-            sources."kind-of-6.0.3"
-          ];
-        }
-      )
-      sources."range-parser-1.2.1"
-      sources."raw-body-2.5.2"
-      sources."rc-1.2.8"
-      sources."read-all-stream-3.1.0"
-      sources."read-pkg-1.1.0"
-      sources."read-pkg-up-1.0.1"
-      sources."readable-stream-2.3.8"
-      (
-        sources."readdirp-2.2.1"
-        // {
-          dependencies = [
-            sources."arr-diff-4.0.0"
-            sources."array-unique-0.3.2"
-            (
-              sources."braces-2.3.2"
-              // {
-                dependencies = [
-                  sources."extend-shallow-2.0.1"
-                ];
-              }
-            )
-            (
-              sources."expand-brackets-2.1.4"
-              // {
-                dependencies = [
-                  sources."define-property-0.2.5"
-                  sources."extend-shallow-2.0.1"
-                ];
-              }
-            )
-            (
-              sources."extglob-2.0.4"
-              // {
-                dependencies = [
-                  sources."define-property-1.0.0"
-                  sources."extend-shallow-2.0.1"
-                ];
-              }
-            )
-            (
-              sources."fill-range-4.0.0"
-              // {
-                dependencies = [
-                  sources."extend-shallow-2.0.1"
-                ];
-              }
-            )
-            sources."is-descriptor-0.1.7"
-            (
-              sources."is-number-3.0.0"
-              // {
-                dependencies = [
-                  sources."kind-of-3.2.2"
-                ];
-              }
-            )
-            sources."isobject-3.0.1"
-            sources."kind-of-6.0.3"
-            sources."micromatch-3.1.10"
-          ];
-        }
-      )
-      sources."regex-cache-0.4.4"
-      sources."regex-not-1.0.2"
-      sources."registry-auth-token-3.4.0"
-      sources."registry-url-3.1.0"
-      sources."remove-trailing-separator-1.1.0"
-      sources."repeat-element-1.1.4"
-      sources."repeat-string-1.6.1"
-      sources."repeating-2.0.1"
-      (
-        sources."request-2.88.2"
-        // {
-          dependencies = [
-            sources."qs-6.5.3"
-          ];
-        }
-      )
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-1.0.1"
-      sources."resolve-1.22.10"
-      sources."resolve-url-0.2.1"
-      sources."ret-0.1.15"
-      sources."safe-buffer-5.1.2"
-      sources."safe-regex-1.1.0"
-      sources."safer-buffer-2.1.2"
-      sources."semver-5.7.2"
-      sources."semver-diff-2.1.0"
-      (
-        sources."send-0.19.0"
-        // {
-          dependencies = [
-            sources."encodeurl-1.0.2"
-            sources."ms-2.1.3"
-            sources."on-finished-2.4.1"
-          ];
-        }
-      )
-      sources."serve-static-1.16.2"
-      sources."server-destroy-1.0.1"
-      sources."set-blocking-2.0.0"
-      (
-        sources."set-value-2.0.1"
-        // {
-          dependencies = [
-            sources."extend-shallow-2.0.1"
-          ];
-        }
-      )
-      sources."setprototypeof-1.2.0"
-      sources."side-channel-1.1.0"
-      sources."side-channel-list-1.0.0"
-      sources."side-channel-map-1.0.1"
-      sources."side-channel-weakmap-1.0.2"
-      sources."slide-1.1.6"
-      (
-        sources."snapdragon-0.8.2"
-        // {
-          dependencies = [
-            sources."define-property-0.2.5"
-            sources."extend-shallow-2.0.1"
-            sources."is-descriptor-0.1.7"
-          ];
-        }
-      )
-      (
-        sources."snapdragon-node-2.1.1"
-        // {
-          dependencies = [
-            sources."define-property-1.0.0"
-            sources."isobject-3.0.1"
-          ];
-        }
-      )
-      sources."snapdragon-util-3.0.1"
-      sources."source-map-0.5.7"
-      sources."source-map-resolve-0.5.3"
-      sources."source-map-url-0.4.1"
-      sources."spdx-correct-3.2.0"
-      sources."spdx-exceptions-2.5.0"
-      sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.21"
-      sources."split-string-3.1.0"
-      sources."sshpk-1.18.0"
-      (
-        sources."static-extend-0.1.2"
-        // {
-          dependencies = [
-            sources."define-property-0.2.5"
-            sources."is-descriptor-0.1.7"
-          ];
-        }
-      )
-      sources."statuses-2.0.1"
-      sources."steno-0.4.4"
-      sources."string-width-1.0.2"
-      sources."string_decoder-1.1.1"
-      sources."strip-ansi-3.0.1"
-      sources."strip-bom-2.0.0"
-      sources."strip-json-comments-2.0.1"
-      sources."supports-color-2.0.0"
-      sources."supports-preserve-symlinks-flag-1.0.0"
-      sources."timed-out-3.1.3"
-      sources."to-object-path-0.3.0"
-      sources."to-regex-3.0.2"
-      (
-        sources."to-regex-range-2.1.1"
-        // {
-          dependencies = [
-            sources."is-number-3.0.0"
-          ];
-        }
-      )
-      sources."toidentifier-1.0.1"
-      sources."tough-cookie-2.5.0"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
-      sources."type-is-1.6.18"
-      sources."underscore-db-0.10.0"
-      sources."union-value-1.0.1"
-      sources."unpipe-1.0.0"
-      (
-        sources."unset-value-1.0.0"
-        // {
-          dependencies = [
-            (
-              sources."has-value-0.3.1"
-              // {
-                dependencies = [
-                  sources."isobject-2.1.0"
-                ];
-              }
-            )
-            sources."has-values-0.1.4"
-            sources."isobject-3.0.1"
-          ];
-        }
-      )
-      sources."unzip-response-1.0.2"
-      sources."update-notifier-1.0.3"
-      sources."uri-js-4.4.1"
-      sources."urix-0.1.0"
-      sources."url-parse-lax-1.0.0"
-      sources."use-3.1.1"
-      sources."util-deprecate-1.0.2"
-      sources."utils-merge-1.0.1"
-      sources."uuid-3.4.0"
-      sources."validate-npm-package-license-3.0.4"
-      sources."vary-1.1.2"
-      sources."verror-1.10.0"
-      sources."which-module-1.0.0"
-      sources."widest-line-1.0.0"
-      sources."window-size-0.2.0"
-      sources."wrap-ansi-2.1.0"
-      sources."write-file-atomic-1.3.4"
-      sources."xdg-basedir-2.0.0"
-      sources."y18n-3.2.2"
-      sources."yargs-4.8.1"
-      sources."yargs-parser-2.4.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Simple fake REST API server for testing and prototyping";
-      homepage = "http://jsonplaceholder.typicode.com";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   katex = nodeEnv.buildNodePackage {
     name = "katex";
     packageName = "katex";
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index afdcd913b076..ca6a30449003 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -98,19 +98,6 @@ final: prev: {
     };
   });
 
-  jsonplaceholder = prev.jsonplaceholder.override {
-    buildInputs = [ nodejs ];
-    postInstall = ''
-      exe=$out/bin/jsonplaceholder
-      mkdir -p $out/bin
-      cat >$exe <<EOF
-      #!${pkgs.runtimeShell}
-      exec -a jsonplaceholder ${nodejs}/bin/node $out/lib/node_modules/jsonplaceholder/index.js
-      EOF
-      chmod a+x $exe
-    '';
-  };
-
   makam = prev.makam.override {
     nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
     postFixup = ''

From 8fb3f175168d9f3d54bd5b151208f1f85e32a16f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 5 Nov 2025 17:04:08 +0100
Subject: [PATCH 5598/6226] python313Packages.iamdata: 0.1.202511041 ->
 0.1.202511051

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202511041...v0.1.202511051

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202511051
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 87cb745ee6ec..32245d3c6f11 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202511041";
+  version = "0.1.202511051";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-AHiQzGC+++C60EfP1RRAecHYlmJuziub09kOtIxSQoU=";
+    hash = "sha256-v70VJUU6ggC4N5qiZ6r90p1jg9uaQWJCnRrvkylCDjU=";
   };
 
   __darwinAllowLocalNetworking = true;

From de33b86b68708b0278b7f26cb5dbbf3f13738fba Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Wed, 5 Nov 2025 16:57:45 +0100
Subject: [PATCH 5599/6226] python3Packages.django_5_1: 5.1.13 -> 5.1.14

https://docs.djangoproject.com/en/5.1/releases/5.1.14/
https://www.djangoproject.com/weblog/2025/nov/05/security-releases/

Fixes: CVE-2025-64458, CVE-2025-64459
---
 pkgs/development/python-modules/django/5_1.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django/5_1.nix b/pkgs/development/python-modules/django/5_1.nix
index a5e7d9751df5..39f2df19b603 100644
--- a/pkgs/development/python-modules/django/5_1.nix
+++ b/pkgs/development/python-modules/django/5_1.nix
@@ -44,7 +44,7 @@
 
 buildPythonPackage rec {
   pname = "django";
-  version = "5.1.13";
+  version = "5.1.14";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -53,7 +53,7 @@ buildPythonPackage rec {
     owner = "django";
     repo = "django";
     rev = "refs/tags/${version}";
-    hash = "sha256-y6wBMQ2BA6UUOJDWGhidCFwthtXZU2r0oGOUUSwKvQE=";
+    hash = "sha256-zRyI1aSRTyOjRogRj2Kgtr1jMPUTvoGHKypK2vQumhw=";
   };
 
   patches = [

From 233755a3d0468db70a6d48078cc410bdbf17cfe3 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Tue, 4 Nov 2025 15:22:50 -0500
Subject: [PATCH 5600/6226] vega-lite: migrate from nodePackages

---
 pkgs/by-name/ve/vega-lite/package.nix         |  44 +++++
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 155 ------------------
 pkgs/development/node-packages/overrides.nix  |  16 --
 .../node-packages/package-tests/vega-lite.nix |  23 ---
 6 files changed, 45 insertions(+), 195 deletions(-)
 create mode 100644 pkgs/by-name/ve/vega-lite/package.nix
 delete mode 100644 pkgs/development/node-packages/package-tests/vega-lite.nix

diff --git a/pkgs/by-name/ve/vega-lite/package.nix b/pkgs/by-name/ve/vega-lite/package.nix
new file mode 100644
index 000000000000..0cba997f3f78
--- /dev/null
+++ b/pkgs/by-name/ve/vega-lite/package.nix
@@ -0,0 +1,44 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  pkg-config,
+  pixman,
+  cairo,
+  pango,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "vega-lite";
+  version = "6.4.1";
+
+  src = fetchFromGitHub {
+    owner = "vega";
+    repo = "vega-lite";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-X6O7ZehY3tS7dFBaKnBuDokCfG+zWmSDHl1d+ifyc/o=";
+  };
+
+  npmDepsHash = "sha256-YjZdh5R7hawgf8EAGlKEAkqchcFuN1j2yMJo9Ptnjyk=";
+
+  nativeBuildInputs = [
+    pkg-config
+  ];
+
+  buildInputs = [
+    cairo
+    pixman
+    pango
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    changelog = "https://github.com/vega/vega-lite/releases/tag/v${finalAttrs.version}";
+    description = "Concise grammar of interactive graphics, built on Vega";
+    homepage = "https://vega.github.io/vega-lite/";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 062322e28570..82292d291cd5 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -286,6 +286,7 @@ mapAliases {
   inherit (pkgs) ungit; # added 2023-08-20
   unified-language-server = throw "unified-language-server was removed as it is a library that should be imported within a Javascript project, not an end-user tool"; # added 2025-10-02
   inherit (pkgs) uppy-companion; # Added 2025-11-01
+  inherit (pkgs) vega-lite; # Added 2025-11-04
   inherit (pkgs) vim-language-server; # added 2024-06-25
   vls = throw "vls has been deprecated by upstream as vetur is also deprecated. Upstream suggests migrating to Volar for Vue LSP tooling instead."; # added 2024-12-09
   inherit (pkgs) vsc-leetcode-cli; # Added 2023-08-30
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 8059bb62337b..7ee550bcb01f 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -132,7 +132,6 @@
 , "ts-node"
 , "ttf2eot"
 , "vega-cli"
-, "vega-lite"
 , "vercel"
 , "wavedrom-cli"
 , "wring"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index cb4cec8ba97e..473b77662598 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -20472,15 +20472,6 @@ let
         sha512 = "Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==";
       };
     };
-    "json-stringify-pretty-compact-4.0.0" = {
-      name = "json-stringify-pretty-compact";
-      packageName = "json-stringify-pretty-compact";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-stringify-pretty-compact/-/json-stringify-pretty-compact-4.0.0.tgz";
-        sha512 = "3CNZ2DnrpByG9Nqj6Xo8vqbjT4F6N+tb4Gb28ESAZjYZ5yqvmc56J+/kuIwkaAMOyblTQhUW7PxMkUb8Q36N3Q==";
-      };
-    };
     "json-stringify-safe-5.0.1" = {
       name = "json-stringify-safe";
       packageName = "json-stringify-safe";
@@ -35819,15 +35810,6 @@ let
         sha512 = "K5zd7s5tjr1LiOOkjGpcVls8GsH/f2CWCrWcpKy74gTCp+llCdwz0Enqo013ZlGaRNjfgD/o1caJRt3GSaec4A==";
       };
     };
-    "vega-expression-5.1.2" = {
-      name = "vega-expression";
-      packageName = "vega-expression";
-      version = "5.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vega-expression/-/vega-expression-5.1.2.tgz";
-        sha512 = "fFeDTh4UtOxlZWL54jf1ZqJHinyerWq/ROiqrQxqLkNJRJ86RmxYTgXwt65UoZ/l4VUv9eAd2qoJeDEf610Umw==";
-      };
-    };
     "vega-expression-5.2.0" = {
       name = "vega-expression";
       packageName = "vega-expression";
@@ -54242,143 +54224,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  vega-lite = nodeEnv.buildNodePackage {
-    name = "vega-lite";
-    packageName = "vega-lite";
-    version = "5.23.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/vega-lite/-/vega-lite-5.23.0.tgz";
-      sha512 = "l4J6+AWE3DIjvovEoHl2LdtCUkfm4zs8Xxx7INwZEAv+XVb6kR6vIN1gt3t2gN2gs/y4DYTs/RPoTeYAuEg6mA==";
-    };
-    dependencies = [
-      sources."@types/estree-1.0.6"
-      sources."@types/geojson-7946.0.4"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."cliui-8.0.1"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."commander-7.2.0"
-      sources."d3-array-3.2.4"
-      sources."d3-color-3.1.0"
-      sources."d3-delaunay-6.0.4"
-      sources."d3-dispatch-3.0.1"
-      sources."d3-dsv-3.0.1"
-      sources."d3-force-3.0.0"
-      sources."d3-format-3.1.0"
-      sources."d3-geo-3.1.1"
-      sources."d3-geo-projection-4.0.0"
-      sources."d3-hierarchy-3.1.2"
-      sources."d3-interpolate-3.0.1"
-      sources."d3-path-3.1.0"
-      sources."d3-quadtree-3.0.1"
-      sources."d3-scale-4.0.2"
-      sources."d3-scale-chromatic-3.1.0"
-      sources."d3-shape-3.2.0"
-      sources."d3-time-3.1.0"
-      sources."d3-time-format-4.1.0"
-      sources."d3-timer-3.0.1"
-      sources."delaunator-5.0.1"
-      sources."emoji-regex-8.0.0"
-      sources."encoding-0.1.13"
-      sources."escalade-3.2.0"
-      sources."get-caller-file-2.0.5"
-      sources."iconv-lite-0.6.3"
-      sources."internmap-2.0.3"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."json-stringify-pretty-compact-4.0.0"
-      sources."node-fetch-2.7.0"
-      sources."require-directory-2.1.1"
-      sources."robust-predicates-3.0.2"
-      sources."rw-1.3.3"
-      sources."safer-buffer-2.1.2"
-      sources."string-width-4.2.3"
-      sources."strip-ansi-6.0.1"
-      (
-        sources."topojson-client-3.1.0"
-        // {
-          dependencies = [
-            sources."commander-2.20.3"
-          ];
-        }
-      )
-      sources."tr46-0.0.3"
-      sources."tslib-2.8.1"
-      (
-        sources."vega-5.32.0"
-        // {
-          dependencies = [
-            sources."vega-expression-5.2.0"
-          ];
-        }
-      )
-      sources."vega-canvas-1.2.7"
-      sources."vega-crossfilter-4.1.3"
-      sources."vega-dataflow-5.7.7"
-      sources."vega-encode-4.10.2"
-      sources."vega-event-selector-3.0.1"
-      sources."vega-expression-5.1.2"
-      sources."vega-force-4.2.2"
-      sources."vega-format-1.1.3"
-      (
-        sources."vega-functions-5.17.0"
-        // {
-          dependencies = [
-            sources."vega-expression-5.2.0"
-          ];
-        }
-      )
-      sources."vega-geo-4.4.3"
-      sources."vega-hierarchy-4.1.3"
-      sources."vega-label-1.3.1"
-      sources."vega-loader-4.5.3"
-      sources."vega-parser-6.5.0"
-      sources."vega-projection-1.6.2"
-      sources."vega-regression-1.3.1"
-      sources."vega-runtime-6.2.1"
-      sources."vega-scale-7.4.2"
-      sources."vega-scenegraph-4.13.1"
-      (
-        sources."vega-selections-5.6.0"
-        // {
-          dependencies = [
-            sources."vega-expression-5.2.0"
-          ];
-        }
-      )
-      sources."vega-statistics-1.9.0"
-      sources."vega-time-2.1.3"
-      sources."vega-transforms-4.12.1"
-      (
-        sources."vega-typings-1.5.0"
-        // {
-          dependencies = [
-            sources."vega-expression-5.2.0"
-          ];
-        }
-      )
-      sources."vega-util-1.17.3"
-      sources."vega-view-5.15.0"
-      sources."vega-view-transforms-4.6.1"
-      sources."vega-voronoi-4.2.4"
-      sources."vega-wordcloud-4.1.6"
-      sources."webidl-conversions-3.0.1"
-      sources."whatwg-url-5.0.0"
-      sources."wrap-ansi-7.0.0"
-      sources."y18n-5.0.8"
-      sources."yargs-17.7.2"
-      sources."yargs-parser-21.1.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Vega-Lite is a concise high-level language for interactive visualization";
-      homepage = "https://vega.github.io/vega-lite/";
-      license = "BSD-3-Clause";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   vercel = nodeEnv.buildNodePackage {
     name = "vercel";
     packageName = "vercel";
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index afdcd913b076..478d6ec76073 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -202,22 +202,6 @@ final: prev: {
     ];
   };
 
-  vega-lite = prev.vega-lite.override {
-    postInstall = ''
-      cd node_modules
-      for dep in ${final.vega-cli}/lib/node_modules/vega-cli/node_modules/*; do
-        if [[ ! -d ''${dep##*/} ]]; then
-          ln -s "${final.vega-cli}/lib/node_modules/vega-cli/node_modules/''${dep##*/}"
-        fi
-      done
-    '';
-    passthru.tests = {
-      simple-execution = callPackage ./package-tests/vega-lite.nix {
-        inherit (final) vega-lite;
-      };
-    };
-  };
-
   wavedrom-cli = prev.wavedrom-cli.override {
     nativeBuildInputs = [
       pkgs.pkg-config
diff --git a/pkgs/development/node-packages/package-tests/vega-lite.nix b/pkgs/development/node-packages/package-tests/vega-lite.nix
deleted file mode 100644
index 6326053ef0a9..000000000000
--- a/pkgs/development/node-packages/package-tests/vega-lite.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ runCommand, vega-lite }:
-
-let
-  inherit (vega-lite) packageName version;
-in
-
-runCommand "${packageName}-tests" { meta.timeout = 60; } ''
-  # get version of installed program and compare with package version
-  claimed_version="$(${vega-lite}/bin/vl2vg --version)"
-  if [[ "$claimed_version" != "${version}" ]]; then
-    echo "Error: program version does not match package version ($claimed_version != ${version})"
-    exit 1
-  fi
-
-  # run dummy commands
-  ${vega-lite}/bin/vl2vg --help > /dev/null
-  ${vega-lite}/bin/vl2svg --help > /dev/null
-  ${vega-lite}/bin/vl2png --help > /dev/null
-  ${vega-lite}/bin/vl2pdf --help > /dev/null
-
-  # needed for Nix to register the command as successful
-  touch $out
-''

From 3806c68cef1f3022426fc6afb0d3c25d9c72cb79 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 16:10:12 +0000
Subject: [PATCH 5601/6226] opencode: 1.0.20 -> 1.0.25

---
 pkgs/by-name/op/opencode/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 4ce430571766..0e847d5b5306 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -13,7 +13,7 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.0.20";
+  version = "1.0.25";
 
   src =
     finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
@@ -43,19 +43,19 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     sources = {
       "aarch64-darwin" = fetchurl {
         url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-darwin-arm64.zip";
-        hash = "sha256-F4LHy3jtseebBx3bRZy+YM8J18M63QXdHbp7LcuZ9Wg=";
+        hash = "sha256-z/TMgr1OVQi69lcrhV8sxPzlZp3t2dHA2b0C2JXeMFg=";
       };
       "aarch64-linux" = fetchurl {
         url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-linux-arm64.zip";
-        hash = "sha256-pL5NtpeNFz0iBmbTSWYFYdcvHrPWEGpjEo0uF41UkTo=";
+        hash = "sha256-C7bjxmzLetc2Y0vN8P3mhvzaa5ZBZxTBtfRYiv5q8Zg=";
       };
       "x86_64-darwin" = fetchurl {
         url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-darwin-x64.zip";
-        hash = "sha256-ah/tzVobv/IgIOajU5onSoSmm/cfzS+b7rLirRCB5Tk=";
+        hash = "sha256-Xv4TJbrn86v/BBPCZu2DdrTP+WLkroizNvLtNSOrxvk=";
       };
       "x86_64-linux" = fetchurl {
         url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-linux-x64.zip";
-        hash = "sha256-4DIcSzKSGAWt52m6LmOJhYCDhztVhRE6Ui/Fqs1CcO4=";
+        hash = "sha256-ESsmlnFvmEPggRYOiacg3tGifWw8UQQP+ZGDcDCsCq4=";
       };
     };
     tests.version = testers.testVersion {

From 47c254258d1e006365dacf89e262fac1d821925d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 16:12:34 +0000
Subject: [PATCH 5602/6226] python3Packages.kestra: 0.23.0 -> 1.1.0

---
 pkgs/development/python-modules/kestra/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/kestra/default.nix b/pkgs/development/python-modules/kestra/default.nix
index 73df35cd2b36..d0e007c4b698 100644
--- a/pkgs/development/python-modules/kestra/default.nix
+++ b/pkgs/development/python-modules/kestra/default.nix
@@ -12,14 +12,14 @@
 }:
 buildPythonPackage rec {
   pname = "kestra";
-  version = "0.23.0";
+  version = "1.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kestra-io";
     repo = "libs";
     tag = "v${version}";
-    hash = "sha256-WtwvOSgAcN+ly0CnkL0Y7lrO4UhSSiXmoAyGXP/hFtE=";
+    hash = "sha256-cDJ5c4HgwmBnRtAFp8gxCqpo8AYJcuI2tthQOXaSOmU=";
   };
 
   sourceRoot = "${src.name}/python";

From f09a4f1094fdca107d3b3417a9dfc8cd55a442f6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 16:29:33 +0000
Subject: [PATCH 5603/6226] home-assistant-custom-components.systemair: 1.0.14
 -> 1.0.17

---
 .../home-assistant/custom-components/systemair/package.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/systemair/package.nix b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
index f03e5f99e903..9fd91c02a641 100644
--- a/pkgs/servers/home-assistant/custom-components/systemair/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/systemair/package.nix
@@ -10,13 +10,13 @@
 buildHomeAssistantComponent rec {
   owner = "AN3Orik";
   domain = "systemair";
-  version = "1.0.14";
+  version = "1.0.17";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "systemair";
     tag = "v${version}";
-    hash = "sha256-csciuUBetlUSh9KousKN1O08J/c/gviWSzB2c+morU8=";
+    hash = "sha256-R5Q6BbvcAqFNldOqfG1TDoM1gbsYrS3OClHlAdfQG6o=";
   };
 
   postPatch = ''

From 4f2c8f225774f1dcfe8d4f42e969fdb7406de8cb Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Sun, 2 Nov 2025 21:06:43 -0500
Subject: [PATCH 5604/6226] joplin-cli: migrate from nodePackages

---
 .../by-name/jo/joplin-cli/missing-hashes.json |  112 +
 pkgs/by-name/jo/joplin-cli/package.nix        |  108 +
 pkgs/by-name/jo/joplin-cli/update.sh          |   28 +
 pkgs/development/node-packages/aliases.nix    |    1 +
 .../node-packages/node-packages.json          |    1 -
 .../node-packages/node-packages.nix           | 4181 -----------------
 pkgs/development/node-packages/overrides.nix  |   43 -
 pkgs/top-level/aliases.nix                    |    1 +
 pkgs/top-level/all-packages.nix               |    2 -
 9 files changed, 250 insertions(+), 4227 deletions(-)
 create mode 100644 pkgs/by-name/jo/joplin-cli/missing-hashes.json
 create mode 100644 pkgs/by-name/jo/joplin-cli/package.nix
 create mode 100755 pkgs/by-name/jo/joplin-cli/update.sh

diff --git a/pkgs/by-name/jo/joplin-cli/missing-hashes.json b/pkgs/by-name/jo/joplin-cli/missing-hashes.json
new file mode 100644
index 000000000000..7c3f79d470e0
--- /dev/null
+++ b/pkgs/by-name/jo/joplin-cli/missing-hashes.json
@@ -0,0 +1,112 @@
+{
+  "@esbuild/aix-ppc64@npm:0.25.4": "c3d5aaf00899940960a27f93a63d9169efc4ff317f10bc3608291678ce71255d657129061dbfa016a0d16fd7b6bfbeb9d37558e9113432f8ff5d04b8b8e54b2f",
+  "@esbuild/aix-ppc64@npm:0.25.8": "451dc5fd41cf67ccc24b8d1da6f95b1082552b6908f0cb0c78fba3da39a4b6c3669ce37dc3c2c383cc18266ea35c0fcec6696fb24f8a0aaf097b94def035c129",
+  "@esbuild/android-arm64@npm:0.25.4": "aa5285109d86607c973ee8d20b582cb444bae31457982dbd3b004feaa4776d145d48a6692537defd8477f2bd0bdf06ff8c7e688dd07fe30b5d031c6dd434c580",
+  "@esbuild/android-arm64@npm:0.25.8": "ef542eda68837bd16cdae4ed99c312405673da95ec3fba1d2f0f102cbd983fdd7357acd1504b5a5ef517b952c9978a0c4baa65211626db6cf862e2bf9ebebe49",
+  "@esbuild/android-arm@npm:0.25.4": "8c5c306e03044527fb2f4eaaeda255d7f40d6a3d02aa9abd1334d67a9ea1a5ab2ab654df77eb7e17e64947c5893e1ba53fc9d3bbefa15f0692e6b56823c47abc",
+  "@esbuild/android-arm@npm:0.25.8": "a0a5995ed8ff2c9775e8395d3da0b7d7b9246040db680aedeb8df9ca980891fe322a6b833cf0bc554852de351aa1351b37aff0213113d4d4afd28c638edc74f1",
+  "@esbuild/android-x64@npm:0.25.4": "aa8665b302b65ca62e15a34e72e43d1ce7a253a354d8684cbe5ea1a04a79d1323416b46c727d6ab73a76a4ec047fb2859b054f8f80fe9ac1d286a4d00ed754e6",
+  "@esbuild/android-x64@npm:0.25.8": "afb24505bf544e53c71707456a85dc21bcc26106c1863aad85733eb5d5bd2e334cb58a2fe31973b4311cc08802493c8d920f41c91f88884baf4c6700a04182ec",
+  "@esbuild/darwin-arm64@npm:0.25.4": "81b4d0482813ccff8c783035317d78220a4ec3eee3798e50b804a781a071f5790c7903c2f9216a25f5c167becd4c3d78fcf0a13e454b3973eb7d82b7ce1d4688",
+  "@esbuild/darwin-arm64@npm:0.25.8": "c5bcf68dce1ba9fa111c2da068c50ade5fd74f724bab93058542619a67554b598ef0c47593f4d5cc382f0ac53507e2bc0ac3111824df9d5776c7cd8fe2c28001",
+  "@esbuild/darwin-x64@npm:0.25.4": "633d97f18c299c8da3730ae04831895779b5f1271020cc924e06c6a5f0c5aac9f0653d60cca7d6ac23926797368301cd6ce2059b25f432aa2f1f378fcb34530d",
+  "@esbuild/darwin-x64@npm:0.25.8": "db948746f087aace173b52d08b7085514755cbc5bab7f1e64ff7e075489fb8596c7490038bea9e54337586ba02ca3c9f56365029660e711a380bb30f1dccb41a",
+  "@esbuild/freebsd-arm64@npm:0.25.4": "4d52cf4e18e1f4ab2fd80c4c4a9ab9c20658c77d832d33603b5d19b3ed4565ad7186b86e30a92b78aa11694d884201d0914dba649d6277737574896a897a2af7",
+  "@esbuild/freebsd-arm64@npm:0.25.8": "faa5a23e4f2e8d1fae84ea0ae424b3b89e8c425e15427e749d0ca9f5a8ca77c6b237886914ce61495ce1f01cb5430b0e55ea61d21a2dc4930be09dffec56059f",
+  "@esbuild/freebsd-x64@npm:0.25.4": "af75d6724969c4d831bb09209f4ddb46532516932db98a3e4c5c5dcc7f3cd0fe0930f2875fa901b8bb9c0ecfe0a65313da6127ea9387c63859e5d58cff975e68",
+  "@esbuild/freebsd-x64@npm:0.25.8": "e5a93cef5e2c6b191f178aa73137d2c44cee60a7a6be8806d630ec82ff1dfc72ccd30297c6b607d2ad715ef20b88068e93abb0fa8e187c8fe2547920eef9b4e7",
+  "@esbuild/linux-arm64@npm:0.25.4": "72b7e3b8fe3bd27206577f8eceea1e0c289dc01fa2f5b03fe22f4ea27931ca664a9b93b35f9ae424e78552caec76330383fe7dc5afeeaffa0e00645ec143a49b",
+  "@esbuild/linux-arm64@npm:0.25.8": "deb61aafe7a2cb32d9f43b5030fb070856f45210d2ac8ac9ce527fec4016bb4a58ffea93536834cd386786cd6ec40327e057853b0348b45d7a06e6eeec71a63c",
+  "@esbuild/linux-arm@npm:0.25.4": "407dcf9e8fc4ebc75689b6257be576047c03285067b5b22db74dd07ae067f8dd9126936dedfeb27934e09d0d700ecb3f8d70876fe61b90d92355f35c2a5d6540",
+  "@esbuild/linux-arm@npm:0.25.8": "3382c6f8e7b3bb479c5b4a01b0baa78054efdf002241eea1d606c8727b9d2168f0ee1798b5627de6b92285b85904e358c9531a1c0f07ef585845fd7d88696db4",
+  "@esbuild/linux-ia32@npm:0.25.4": "47b13c9952c893e749380551dfa3580eb562a0394911a9ced68b23c0cafe116614b30ffd6744dc71ec312fab8bc7115f856f078fe29f1253a1dd99d3215a1424",
+  "@esbuild/linux-ia32@npm:0.25.8": "e32f2fa63c74d6723c876cec9b42c04e6aa5e6d0cd9a7447d0b4b00d7615a484da55ef95b4fcf871492019a007c40defb497ef6075ad94da46b6121828fcf83a",
+  "@esbuild/linux-loong64@npm:0.25.4": "75222fb808060b3f2507aee40c6ee877a1ed768c593dd8f192e1ea640bddf3b414080407ddaccac6d0cde35750a7f92c434e04af2c142075dc810c5b7a7ce5eb",
+  "@esbuild/linux-loong64@npm:0.25.8": "a55894549cd7e64c2062863eaf697175a1d6f86def565555614ad335b462afbfebf403ec0f1d83bf8dff145d57c4046815b26c70e98f068a9f99317fc37d71e8",
+  "@esbuild/linux-mips64el@npm:0.25.4": "3f129931a6973a4fa470ddc46e3e3fa150aca64029951fe7a8d9616f41ddf8422d3744a30b0c5f36a35bff19b32b25c85bf1e5760537b329f18558e289213eea",
+  "@esbuild/linux-mips64el@npm:0.25.8": "5c1ef406e07fbb766417be11b859baa3e905587c8bf3465f0f6ffd6cfd54b658ceffc616bfbea0340473deaebd430db6aea33468876796bcad83f05bf1910d9d",
+  "@esbuild/linux-ppc64@npm:0.25.4": "6f84018eda99c3f06d519abbdbdf15700707236b8643ba24150d5168062ba310ee3c972645554b05d4b768438697a9a04014bc884a1beb15bf05bbe1b29e34ca",
+  "@esbuild/linux-ppc64@npm:0.25.8": "a5f386bd5b18eb3eb7f240b112595182f450382ca93a7d6cad4c57b82e13830aff22250ff02728dd5b8d65f3b9908ef291f223a6e83d78d64f497d3117a567a1",
+  "@esbuild/linux-riscv64@npm:0.25.4": "c5b674c2f48c5292f594141a4739f9f266ce8a1a2514eaefacc6fac761f1fa6c208981ca4c9e774c383ca33a46cad539b1fa46af6827cf89db721f33c36093c8",
+  "@esbuild/linux-riscv64@npm:0.25.8": "6b624062871ac3bb93af3b560a97fb489eef06cb12f4716c0c7d54fb31d4047fec570bbc9cc2bc9f98e8a4fbd07db6fa542115c02ec3bb66922e8b1988304cc1",
+  "@esbuild/linux-s390x@npm:0.25.4": "a54c0972230a2264714371f6545ff0d9b20d349b08e4837e7063378886f88c08ade0ed5b2c7ba744c4679deb2f60e8485ef475f92cdbadca9d34f462a2724cc1",
+  "@esbuild/linux-s390x@npm:0.25.8": "c13f82778a07b14fa50d52322f4b347bea6540a207e0468b060588922fae2278ae1b18a88bbd1cf3656b5d7eb8a84dcf8a237c91e7e0629fa6e56be41db46055",
+  "@esbuild/linux-x64@npm:0.25.4": "1ba32d40895c826e6990157a141e23d68fdf00b46d60ef3572a89781f177df75e023d38b130087b167a6e38410c3af0a6bec7b2d3b1af2a37a21c1ed70dcba45",
+  "@esbuild/linux-x64@npm:0.25.8": "e6483e5c367e7c35899c98bc378e8a37f5617a741297d9b91c59c1d29b9b00f26f9c315a736b41af33f21d9d74a8c648715ce13ac520b3fa7604978a05dedd99",
+  "@esbuild/netbsd-arm64@npm:0.25.4": "37bc10864f14c60f995e2ef13bb53102d0ce0eab1d32dfe5f48254aafe6d791d7129cbb00c6acf9e32b561db5420c5558b84800cf6958d40d3d55a7e3f456ebb",
+  "@esbuild/netbsd-arm64@npm:0.25.8": "02afba2e5fbf8e8cc4c375edfce673b38015213744f1df05a74ab9de99f5860e50dc26af97b4f0b4f804c461ab45cfa773603ce0e1b0528bd93e7a979eca7682",
+  "@esbuild/netbsd-x64@npm:0.25.4": "6875cc83961e613dd28f1c1d5c3b7404dc7cd4b54071596712c56574b1a24517424483c7c363c0aefa8259cf2d621e080b8270c0c242010ad04ce367aa87e897",
+  "@esbuild/netbsd-x64@npm:0.25.8": "76c43cc94f9b287a6a0d277d51f17e650d168e26008741e86035f2e054b8216d61855feddc2c0b48f989b46c58913168148a30b30fff5b87a1bc08fd78cbd0e7",
+  "@esbuild/openbsd-arm64@npm:0.25.4": "a7981586bbfea74746aa87113089020c73677209b71fadab43e6693c141b9415c342df01694e70aa607a1e80e9e37ccf4682dc2f095cae1ffb60c740e63e7d32",
+  "@esbuild/openbsd-arm64@npm:0.25.8": "9c0fbf35b6cefcc46c1c545520c50c65e89d620c65c97a55d47f1440e908cbbe6535073cb78ae69c1e2ba76621f09f3ab0f4bf9d5567660b8726c198a0ebdb0f",
+  "@esbuild/openbsd-x64@npm:0.25.4": "7b1bf4a5032e32ed3ce33bf9373964bdf29e49b0e16179e179d7c7dd0a36dbc6ee98ba67e0ef637ed7823b3ac094e21ccde848a066deb091bacc6ea4726a2ede",
+  "@esbuild/openbsd-x64@npm:0.25.8": "cd45098a84bcc86d4b1a809cf6e5f9548aa69cdff3a0f63a9bb039d05fdfd0daa2e166e1e30b8fbb71ede895dfc9c371e8368e3d51e7bf0484083f9bb112945a",
+  "@esbuild/openharmony-arm64@npm:0.25.8": "769c3e589d62648c67cd36306aaee683429e42e7d02608a52929f245c3a42d8036156fe90d59aff7695c2e75712be89ae4d4f06f4249f15a06bdc091ff42908d",
+  "@esbuild/sunos-x64@npm:0.25.4": "e1807f6dbd3bdf2f1ff9dc404fe0b667dea3bb03825344728de264c4f15323e99e3f1d8125b5c39e2aae94d2c1cad344e3b8a77b5e8c8e0004f09aa12daa82d9",
+  "@esbuild/sunos-x64@npm:0.25.8": "8b3c79794775dce54d8d2c2c87cf876e8708ba2d7ca0ccda41d96c9bf3193237909f148195a20b7fa876c8e07def6db22510948a795156beeace160e9830ab62",
+  "@esbuild/win32-arm64@npm:0.25.4": "0422de25c136f407bc223e1a9a65a6f528e64201a1b06b7ddcf3190045914c6d68f550a8190d18e58c4e22231acc4c7982d45bd5ceab6a739e2c539d135376fe",
+  "@esbuild/win32-arm64@npm:0.25.8": "80f13cf66b45a32892f9b433689897362b69042173bc1e47ff333d8dd9df746be27bee031197653ee4e034a1563f61ae34efc44c61160a104dfda6500f6b4936",
+  "@esbuild/win32-ia32@npm:0.25.4": "5a8738ba94c72bc07bd17952cb5ba7f7f13593687cfe57792d36fcd9809082ac95ceb54b7739da68044de01f6d5d6826a2587ea2bce48b0de1c70f8de9b5257e",
+  "@esbuild/win32-ia32@npm:0.25.8": "e4f0595306b2acbf19b62305c7acf97aa18954acf04f194c3cfd7a5782fab145ec6a551eaf657c3f0d2774cf19bc1fcb7ba76fb10cac32a4c2f48825c955690e",
+  "@esbuild/win32-x64@npm:0.25.4": "0bc72a7dc50b20d2cb7cd38a0d85ab3ff0c6467ba7d817a74da8c671703f97c7c7f7a7375d0069c3f0a76571dc04a1072852e711131cf4d1a62a70e7a38449db",
+  "@esbuild/win32-x64@npm:0.25.8": "4bf57733c5c4c1409cfceaf19bf5b8ce3c9b9a29705bc8a24fc72652846afd0bd478b14a17db326ae27896574ee346ffb96b2fa043f0716d1a7f30b89f8b3855",
+  "@img/sharp-darwin-arm64@npm:0.34.2": "891e401a14429d293c1cdd1a9dd47b81f3fafd1b14a57f884307727662af1541dcd802a31488c394113a4ab25ebcbab1246c5ab3c90beba42f7e8afaf56f073e",
+  "@img/sharp-darwin-x64@npm:0.34.2": "8d5e11f3430fa61966cb600cd23e2217f1666d481bbf754bdd731e60d4a6c34c78ff0169f7ec3463252d6542b0a3bafc0686473650b0e6b8a45fddbc49a8b52a",
+  "@img/sharp-libvips-darwin-arm64@npm:1.1.0": "f6bcbe44fa9bc0c4c87af8c655c7ecdc704b684da1169841921ff7c61692167ee3ab6a4a3a8131f206f0aa7245987be1c07a483111eadd3a684b1547ca2acf02",
+  "@img/sharp-libvips-darwin-x64@npm:1.1.0": "af6cd4ca1ccc96dcd5cb20ac45941180117baad387331a699a05e588fa843b85d327651356940d9e3e2c1fe17f0ce183043bebf882086d3cb0785bb4bc8bca05",
+  "@img/sharp-libvips-linux-arm64@npm:1.1.0": "1d62f454f599580d64ecf72da24a08cb9347f1319e31678594f432e71762053c60c7bca5d70be720285b0754d8ed842efb160bef02abe36f5f57d735db0c012b",
+  "@img/sharp-libvips-linux-arm@npm:1.1.0": "5028a1ad8e247dc1624baaa084e981f2f152c7ee5f567ee253720b4553d06a969bd6285f1795b374532f99e63b44b4d39494cc3d5dd8f438dab67d4c018f3520",
+  "@img/sharp-libvips-linux-ppc64@npm:1.1.0": "d7c39d636083be25c71966e992803d652f5260c8fa0ece49348705c739042851c83057ec1f2d1cad8419afd3132311a6a0fcade343e69c9fbe8cbd8a12a54056",
+  "@img/sharp-libvips-linux-s390x@npm:1.1.0": "612a7a967192a2bb31d757305a0abac4bdd17f4e41fed4fccee673961fd3743d1f435e9869efe324fa726d39286bcb4bfc9d5b7ceaebb2700483a3d6e2be0eb5",
+  "@img/sharp-libvips-linux-x64@npm:1.1.0": "73cea31f06110740998a44cb27387d59ab5878fdb4080213a46bf312fee1e8a3b69b8d97a78611fe951fc113d7aa732d0a7d8acadf6bc77322e73b6d5228f5f2",
+  "@img/sharp-libvips-linuxmusl-arm64@npm:1.1.0": "21d8124bccdc98817fc69022826a18a2630fbc1a3b16bfaf1d7f7c3df95d834cd75ef79e54c2edd0be44481d26e0f98ebcadc7b5e30bd73bf9afa66224cc4f8c",
+  "@img/sharp-libvips-linuxmusl-x64@npm:1.1.0": "6671bcdb165a7958b0478c64a5acd7eb279ebea446b91e938888a1d6e2e7c58699c55bf4a856047847e6cc56a6cdc60c9a13e2a002f081c923331585a0db2c73",
+  "@img/sharp-linux-arm64@npm:0.34.2": "4e314f4ea4182c6b67d03eaa8600afd78fa298f17e6f71e7d78fc3e2b91d65c3eca0474979cc9ab48eea7573d1150609326955a2b4ed168cbcfb881ca8632bb3",
+  "@img/sharp-linux-arm@npm:0.34.2": "3ec11f1c8312d4313623f20a09f60e53c07770c64dac50264f9da2e60688d992abb8a55ba4c665c88204db611cecf6e16d6397e57aac92390bddc2d7ee6a9ac2",
+  "@img/sharp-linux-s390x@npm:0.34.2": "1fc3ae6eeb2af800567d26582ae97465ce5bf3aee4b4125f3b11899c8aec9b6b9e538bfc1176c257788c20e67d6f57cb1e67e9fe6c96c900d2b43127ef6a3f45",
+  "@img/sharp-linux-x64@npm:0.34.2": "8bad1ee5e9a23520da830090e29e2c8fc62c6dcf9255e490cfb664483423126b6a5417b1beb0e5433f678bd91996ebbc925c6a5f2cf477966ca4a5ebeee3fdf5",
+  "@img/sharp-linuxmusl-arm64@npm:0.34.2": "f4189234d072002934a77ea9131514fa4922c3d6acdec9768e9ca88cb088d67f1001a07fe19a920abcdbd7888b0a408128ec5561849829f8c99c4814dc04315a",
+  "@img/sharp-linuxmusl-x64@npm:0.34.2": "884532e80b772891d9452a1e6ad070e4668cd4aceb91935b7352d96f0813f1a6a3fafa3550e63f6f93dbcfdaafe8e8dcee7d6df6e12ebe3b66ca69d947ef0572",
+  "@img/sharp-wasm32@npm:0.34.2": "ca383f6c9a8d7afc00c446b175cbc8b7827d5e02c602aeb6e889f641e3eac4b3969bbed62be8c5e595f4774b378f39d67b8f3558b1ce4ff361298e8fe3efd5ec",
+  "@img/sharp-win32-arm64@npm:0.34.2": "b7ce72e2861be11dd9ba8a0f00da57d97d4c93e88abf5f276dee516bde07527931908913cc576acc77c1f3cc61567e557cb927afcc88c5abee5d255f70f124a3",
+  "@img/sharp-win32-ia32@npm:0.34.2": "edf6719745e473a4cd13745cd3543c885dc076bee38b8f8b7ee42967670e6403d54d060c22288c3118c3872acdbfa27042df6b941e62d61e81294ed309828c77",
+  "@img/sharp-win32-x64@npm:0.34.2": "bb153458a2b1b4d794e1267b53626d7ec9080fddf38df2321b8e9d71da0eeea4669df7d88365e22c51f445595e5f281d7986dd5678cf8c331ad724f0dc29d06c",
+  "@parcel/watcher-android-arm64@npm:2.5.1": "e9c94ede3bd5c5d999d117d22ac8032a17f8ebc72db3eff04ccb2b4e6718db19f24bf29a66a610e03f4ee95e2cd7b2d30c15b1845eb897b971fec75dbdd76141",
+  "@parcel/watcher-darwin-arm64@npm:2.5.1": "0cab55a55c128ac5742388fc8dbfeb9877018509943801ce8a52b57bb6dca24189d025d38684b1e482cb7816368a52c6434dfe45d3997e2fd2509276f48774ea",
+  "@parcel/watcher-darwin-x64@npm:2.5.1": "bf07b8ca9a435fb885fb0ca6565204d2f2098d7f632faf26a6478bb39f538c73b50afca17c193dc189a80a864d85e40f924ec7f21a0e7ad7d0de6f97f7154134",
+  "@parcel/watcher-freebsd-x64@npm:2.5.1": "9f62b9da08e98bffb7cf91b557af209586e1d7dd654c56c5a58fc4b0bb61a9bb318116ed0048416d3341d3434b1fb3089bf6cfbfcd08e61333917bc59e691c1d",
+  "@parcel/watcher-linux-arm-glibc@npm:2.5.1": "07a55a0050e913c9781d009a05b3a0a49c77c2679ae9f98b2374a7e17c5401e2076a776c7bec88de58c71fef040c89aa97176dfa28a03abf8754e18e8d1109b4",
+  "@parcel/watcher-linux-arm-musl@npm:2.5.1": "f9cab0efa652276fb4bcb58845c9606f7aead1ec81f7c4ce2d237eec754bbd3101682c735b6a371dccf93f16fcfe0ea1beef5d43eb39e4505df7f29b73ea0004",
+  "@parcel/watcher-linux-arm64-glibc@npm:2.5.1": "ce22f303187aa03fa9d1f9609d2cd56cce6b62f0a60f14a65449adc25b7072d06118d956eb7ebb548210cf2d120cf5e987abe34e6515a5bfbd35b15643f40142",
+  "@parcel/watcher-linux-arm64-musl@npm:2.5.1": "7a0b32b7b784fe3e594452b6642adc3bb4ad78eae526f5e4c7cf061f428eef2e05e827334806cd230bc873903abb1f70886716a0353e653b3b784f09d2237956",
+  "@parcel/watcher-linux-x64-glibc@npm:2.5.1": "a6241bb57c409ab56ef944e8d64e057817f41a9335047d1e252aab4e4b10f64d8bc2620ae5c761b71551f3c4b494edd687a08c274a46ca2eb84ad34f6f4de9c0",
+  "@parcel/watcher-linux-x64-musl@npm:2.5.1": "a68cfcd10a50906ab228d7b906eced68faf6a42a29da5506d24d0dd91b9593a61605b91749d9b1e3ed9f257b845f48ba3df62572e40b4ff1f724d879865b225a",
+  "@parcel/watcher-win32-arm64@npm:2.5.1": "0f467a731cf9403b8bc7d35418d991596cf5e7898029796b4c769bcbb38cd07ae6ec05ef0f19298e5f11e73ec5198bc474d79b056bdfbaea513525725103d7dd",
+  "@parcel/watcher-win32-ia32@npm:2.5.1": "9ab5f3e9849a6077c8c2aba7bdf9030dea38f0ab9180792ecd30094520cddf16f3b68006f666845b86c5ef0e05c648364475c9ba151e0269561891ca3e276667",
+  "@parcel/watcher-win32-x64@npm:2.5.1": "e588d87d5b892484d252ac8e1ec3f4bf7a664d91f0d03dd93764be8db2c35f81879275908dcbec42b0e43bc99c7afdfd29fe687ec022bb2c8c4bc7edd29eaa15",
+  "@rollup/rollup-android-arm-eabi@npm:4.2.0": "3d7a9f1608daa7f3c092512b7b8ecf3b86788b66f5e60f5190c8e08b2cecd684f884dfda54dfaf94fd3d6e59bab548675ae3b1732fbd62ab5875aeb4c4ce9147",
+  "@rollup/rollup-android-arm64@npm:4.2.0": "d918632813eea005fc502c39dba795eb318544821e69a0fe4e0b37cb7a8ae71d55b1dcf3a6a342a0d8fedc309c2b3d2ca5868db0af211ae4bc7e15620aac89e2",
+  "@rollup/rollup-darwin-arm64@npm:4.2.0": "8e8c94c0b852f4fcbf7aaa673d3a5822619654080629137baedad02423b882b11b4b1aa96b22c1a3eb9cff45dc0db0c316378dcaf79104a2ed7273174617cd2e",
+  "@rollup/rollup-darwin-x64@npm:4.2.0": "dac71cc39b9629814466ce81c346a0ba2b9f05d0944be625acde9c22e23bc4634f80cdb95030641d39e8ebf2e9194d50070d077c4a7b3cd5b5726f1a7f5e78e5",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.2.0": "05be8070bc2f45865e8471206d922150116aae10b0aa24d226d09af3cb571722194df83cb1380576d2583a0f5334edbe05bb0f8f5dbc6c07172982b7c83ad465",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.2.0": "d16bc317c7adb1b9faebc700dafc6d5d11a1e969dcd149053529635946a9c39b88f910cf62bcbcfcaedce216b2938d23b6983257527d1b1595a7e9a78336e37c",
+  "@rollup/rollup-linux-arm64-musl@npm:4.2.0": "81f30ba83d9568e8f19c52121702f90423d5cabbfd4267a977a86c67fc38381bcb284f05ccc1d4e27769322b0575ce3263385b32d262cb918930087c35dcdb44",
+  "@rollup/rollup-linux-x64-gnu@npm:4.2.0": "e3be010ac1fa035591e49657681b265be5c4bd0ee588cbc6d894a4e0d283e1f9914d42817d7bf573b61bd8bd35030eed409cd8337f5e9e2be5d7573bf9d47396",
+  "@rollup/rollup-linux-x64-musl@npm:4.2.0": "d9b156b8beecb52fce7afb8185cfaabbac4d8ae3fe33acd123606dfe4d209cfc504a9885b49325609fcdcb844bf2427f6a934900b440c93e5b3e31636a1d99f4",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.2.0": "ff71a301051b237a32e14cb2b18117c72c5ab4524120184500e098fea028385806567fa55e4879c19f80d747774e3b8d913e0b4560abc8fe4881b392fda6ed79",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.2.0": "dd65d454384b6020b87f5f943121dd9d02e5bfbae2ec124a23f0a2034df02549c0ae4fb27558efda6668bab94b121c5463c4845431f2c1c9416a719176e1dd82",
+  "@rollup/rollup-win32-x64-msvc@npm:4.2.0": "13cba2a14f7864986f3331c327a137ad95cf366411c0b6d3f66593bb6ea04d0058e12bd0a09fde72bbfb8660a554f0b66d90754e21add3c99d899e2bd7dfe1d1",
+  "dmg-license@npm:1.0.11": "36c0a7b030801b91216affa9b2bb00caa345b2327f298accb2263a80a0320ca305f90b99da68007d187c830c543410d58a0a2bbc229e8d169b0e1d1652ff42aa",
+  "iconv-corefoundation@npm:1.1.7": "0189733ef51a9f481379202cb1919f2677efc44aa014ba662a6fd99e47993e350eab0ff724ed18cda8011c9b78c4702b2d374f732955f1def3fd2a14a29d25c0",
+  "lightningcss-darwin-arm64@npm:1.27.0": "c27ba2fc3014cf2a5133ff6dd822ec80545223fd8878fc61a8b20b523c5b608fb2efab7ee2c2af4503a0c597691a0f162355e3fc017417779f7d7a878161f679",
+  "lightningcss-darwin-x64@npm:1.27.0": "8bbf7233a9cb347dde7a68d4322dfebafaa9d410f749cd55d2306988a095b915d6e272cc5a0bc5bb97c9680d6b7e31e6c8fa188449e34fce85889e0a245a4bfa",
+  "lightningcss-freebsd-x64@npm:1.27.0": "eec3c171d92838720707ccd894af1f503f3be7fae679b735f4a54070f8c8b5bc4cea4c119b578994a9c9a70ce138445a807d0af8ad37e54959bb4998753dbd17",
+  "lightningcss-linux-arm-gnueabihf@npm:1.27.0": "ade725375521f2689f8b372c1d9cae71581eb66f35df6edcf39ed0869f6662c77fe2a91b5392c0a516f00fd60725ce03ad0f9d47574db8d74a841f0906b8090f",
+  "lightningcss-linux-arm64-gnu@npm:1.27.0": "96eadcb0863534f5951e37916b64364fda21592a32d93252503ac8839f0d00eeea7d7bdd8bd4b686b8108550c23e32a8a1bb3738e63c1a7b01406c349da0676c",
+  "lightningcss-linux-arm64-musl@npm:1.27.0": "f0426dffc5c1943781673177f3340e85a7de2a193244cb877d33e7ec262c019bb7b862b33ffeb14b10494306f7c48885ee93068e88b9260fff2668e98a97a4ab",
+  "lightningcss-linux-x64-gnu@npm:1.27.0": "bb1b5713ddc9d8d711b527bcce47ce3e7fd91f2058c317ad5df09cded4142a85362ee71c353dd3b332497fc32a431a22f7762ce01464ff008b2a7cf2607d3dd3",
+  "lightningcss-linux-x64-musl@npm:1.27.0": "ec9b11bb0d70b929335f735486f8dd8fa6fc22eb95b71545b735b480b9e2b5287a24976735c2c5f4c9c50af07fb5cfdc02b65eceb6ec10256e7c9c637dedee9a",
+  "lightningcss-win32-arm64-msvc@npm:1.27.0": "1814c0d0464c21e808a2909ebbee7e12c42fd81ecd480e7c4e31769c555f238c720087af4383fff14862764f52bf4250cd566c6c45c3d6633bee126ef3355bc3",
+  "lightningcss-win32-x64-msvc@npm:1.27.0": "be733309737e4c4ed3dff33ec9e80bbc2d269d07bfa3742dd30d9055adfdc2e22be4d484475a7ea7cb7940c17f001cdf64856e157ef9b7c1d2c9342041e9eae4",
+  "systeminformation@npm:5.21.15": "349877eb556ef2de51d4986f30ff3a2fad89eba356cf4d14ccad290599b2e565959952c95e64488932214572dd206c54792ceb8e24bd967409a8fee40b9882f3"
+}
diff --git a/pkgs/by-name/jo/joplin-cli/package.nix b/pkgs/by-name/jo/joplin-cli/package.nix
new file mode 100644
index 000000000000..17e9942be237
--- /dev/null
+++ b/pkgs/by-name/jo/joplin-cli/package.nix
@@ -0,0 +1,108 @@
+{
+  lib,
+  stdenv,
+  nodejs,
+  fetchFromGitHub,
+  yarn-berry_4,
+  python3,
+  pkg-config,
+  libsecret,
+  rsync,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "joplin-cli";
+  version = "3.4.12";
+
+  src = fetchFromGitHub {
+    owner = "laurent22";
+    repo = "joplin";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-nWQa+/UJIjCsK0a5IimqcBnD2hrjUHTVdrzb5QKBevw=";
+  };
+
+  missingHashes = ./missing-hashes.json;
+
+  offlineCache = yarn-berry_4.fetchYarnBerryDeps {
+    inherit (finalAttrs) src missingHashes postPatch;
+    hash = "sha256-7sZX39OtNNPq5RE7+Oj58QqHhcrTY8FOdncKp3b40jQ=";
+  };
+
+  nativeBuildInputs = [
+    nodejs
+    yarn-berry_4.yarn-berry-offline
+    yarn-berry_4.yarnBerryConfigHook
+    (python3.withPackages (ps: with ps; [ distutils ]))
+    pkg-config
+    libsecret
+    rsync
+  ];
+
+  buildInputs = [
+    nodejs
+  ];
+
+  env = {
+    # Disable scripts so that yarn doesn't immediately run them
+    # We want to patch them first
+    YARN_ENABLE_SCRIPTS = 0;
+  };
+
+  postPatch = ''
+    # Don't immediately build everything
+    sed -i '/postinstall/d' package.json
+    # Don't install onenote-converter subpackage deps
+    sed -i '/onenote-converter/d' packages/{lib,app-cli}/package.json
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+
+    unset YARN_ENABLE_SCRIPTS
+
+    yarn config set enableInlineBuilds true
+
+    for node_modules in packages/*/node_modules; do
+      patchShebangs $node_modules
+    done
+
+    yarn workspaces focus root joplin
+    yarn workspaces foreach -Rptvi --from joplin run tsc
+    yarn workspaces foreach -Rtvi --from joplin run build
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    # Remove dev dependencies
+    yarn workspaces focus --production root joplin
+
+    mkdir -p $out/lib/packages
+    mkdir $out/bin
+    mv packages/{app-cli,renderer,tools,utils,lib,htmlpack,turndown{,-plugin-gfm},fork-*} $out/lib/packages/
+    rm -rf $out/lib/packages/lib/node_modules/canvas
+
+    # Remove extra files
+    rm -rf $out/lib/packages/app-cli/{app/*.test.ts,*.md,.*ignore,tests/,tools/,*.js,*.json,*.sh}
+
+    # Link final binary
+    chmod +x $out/lib/packages/app-cli/app/main.js
+    ln -s $out/lib/packages/app-cli/app/main.js $out/bin/joplin
+    patchShebangs $out/bin/joplin
+
+    runHook postInstall
+  '';
+
+  updateScript = ./update.sh;
+
+  meta = {
+    changelog = "https://github.com/laurent22/joplin/releases/v${finalAttrs.version}";
+    description = "CLI client for Joplin";
+    homepage = "https://joplinapp.org/";
+    license = lib.licenses.agpl3Plus;
+    mainProgram = "joplin";
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/jo/joplin-cli/update.sh b/pkgs/by-name/jo/joplin-cli/update.sh
new file mode 100755
index 000000000000..1776cc2fdbaa
--- /dev/null
+++ b/pkgs/by-name/jo/joplin-cli/update.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p nodejs curl gnused jq nix bash coreutils nix-update yarn-berry_4.yarn-berry-fetcher
+
+set -eou pipefail
+
+PACKAGE_DIR=$(realpath "$(dirname "$0")")
+NEW_VERSION=$(npm view 'joplin' version)
+
+if [[ "$UPDATE_NIX_OLD_VERSION" == "$NEW_VERSION" ]]; then
+  echo "package is up-to-date: $UPDATE_NIX_OLD_VERSION"
+  exit 0
+fi
+
+nix-update "$UPDATE_NIX_PNAME" --version "$NEW_VERSION" || true
+
+HOME=$(mktemp -d)
+export HOME
+
+src=$(nix-build --no-link "$PWD" -A "$UPDATE_NIX_PNAME.src")
+WORKDIR=$(mktemp -d)
+
+cp --recursive --no-preserve=mode "$src/*" "$WORKDIR"
+pushd "$WORKDIR"
+yarn-berry-fetcher missing-hashes yarn.lock >"$PACKAGE_DIR/missing-hashes.json"
+popd
+rm -rf "$WORKDIR"
+
+nix-update "$UPDATE_NIX_PNAME" --version skip || true
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index f7c7746d4d27..2b2fc1f1642c 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -146,6 +146,7 @@ mapAliases {
   inherit (pkgs) jake; # added 2023-08-19
   inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
   inherit (pkgs) jsonplaceholder; # Added 2025-11-04
+  joplin = pkgs.joplin-cli; # Added 2025-11-02
   inherit (pkgs) kaput-cli; # added 2024-12-03
   karma = pkgs.karma-runner; # added 2023-07-29
   keyoxide = pkgs.keyoxide-cli; # Added 2025-10-20
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 3df957c3bbe1..afc436de50ca 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -80,7 +80,6 @@
 , "he"
 , "hs-airdrop"
 , "imapnotify"
-, "joplin"
 , "js-beautify"
 , "js-yaml"
 , "jsdoc"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 9183848ef1bc..b173db568421 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -12,15 +12,6 @@
 
 let
   sources = {
-    "@adobe/css-tools-4.4.0" = {
-      name = "_at_adobe_slash_css-tools";
-      packageName = "@adobe/css-tools";
-      version = "4.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.0.tgz";
-        sha512 = "Ff9+ksdQQB3rMncgqDK78uLznstjyfIf2Arnh22pW8kBpLs6rpKDwgnZT46hin5Hl1WzazzK64DOrhSwYpS7bQ==";
-      };
-    };
     "@alcalzone/ansi-tokenize-0.1.3" = {
       name = "_at_alcalzone_slash_ansi-tokenize";
       packageName = "@alcalzone/ansi-tokenize";
@@ -102,15 +93,6 @@ let
         sha512 = "u/kozRnsPO/x8QtKYJOqoGtC4kH6yg1lfYkB9Au0WhYB0FNLpyFusttQtvhlwjtG3rOwiRz4D8DnnXa8iEpIKA==";
       };
     };
-    "@asamuzakjp/css-color-3.1.1" = {
-      name = "_at_asamuzakjp_slash_css-color";
-      packageName = "@asamuzakjp/css-color";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-3.1.1.tgz";
-        sha512 = "hpRD68SV2OMcZCsrbdkccTw5FXjNDLo5OuqSHyHZfwweGsDWZwDJ2+gONyNAbazZclobMirACLw0lk8WVxIqxA==";
-      };
-    };
     "@asyncapi/specs-6.8.1" = {
       name = "_at_asyncapi_slash_specs";
       packageName = "@asyncapi/specs";
@@ -120,960 +102,6 @@ let
         sha512 = "czHoAk3PeXTLR+X8IUaD+IpT+g+zUvkcgMDJVothBsan+oHN3jfcFcFUNdOPAAFoUCQN1hXF1dWuphWy05THlA==";
       };
     };
-    "@aws-crypto/crc32-3.0.0" = {
-      name = "_at_aws-crypto_slash_crc32";
-      packageName = "@aws-crypto/crc32";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-3.0.0.tgz";
-        sha512 = "IzSgsrxUcsrejQbPVilIKy16kAT52EwB6zSaI+M3xxIhKh5+aldEyvI+z6erM7TCLB2BJsFrtHjp6/4/sr+3dA==";
-      };
-    };
-    "@aws-crypto/crc32c-3.0.0" = {
-      name = "_at_aws-crypto_slash_crc32c";
-      packageName = "@aws-crypto/crc32c";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/crc32c/-/crc32c-3.0.0.tgz";
-        sha512 = "ENNPPManmnVJ4BTXlOjAgD7URidbAznURqD0KvfREyc4o20DPYdEldU1f5cQ7Jbj0CJJSPaMIk/9ZshdB3210w==";
-      };
-    };
-    "@aws-crypto/ie11-detection-3.0.0" = {
-      name = "_at_aws-crypto_slash_ie11-detection";
-      packageName = "@aws-crypto/ie11-detection";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/ie11-detection/-/ie11-detection-3.0.0.tgz";
-        sha512 = "341lBBkiY1DfDNKai/wXM3aujNBkXR7tq1URPQDL9wi3AUbI80NR74uF1TXHMm7po1AcnFk8iu2S2IeU/+/A+Q==";
-      };
-    };
-    "@aws-crypto/sha1-browser-3.0.0" = {
-      name = "_at_aws-crypto_slash_sha1-browser";
-      packageName = "@aws-crypto/sha1-browser";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/sha1-browser/-/sha1-browser-3.0.0.tgz";
-        sha512 = "NJth5c997GLHs6nOYTzFKTbYdMNA6/1XlKVgnZoaZcQ7z7UJlOgj2JdbHE8tiYLS3fzXNCguct77SPGat2raSw==";
-      };
-    };
-    "@aws-crypto/sha256-browser-3.0.0" = {
-      name = "_at_aws-crypto_slash_sha256-browser";
-      packageName = "@aws-crypto/sha256-browser";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-3.0.0.tgz";
-        sha512 = "8VLmW2B+gjFbU5uMeqtQM6Nj0/F1bro80xQXCW6CQBWgosFWXTx77aeOF5CAIAmbOK64SdMBJdNr6J41yP5mvQ==";
-      };
-    };
-    "@aws-crypto/sha256-js-3.0.0" = {
-      name = "_at_aws-crypto_slash_sha256-js";
-      packageName = "@aws-crypto/sha256-js";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-3.0.0.tgz";
-        sha512 = "PnNN7os0+yd1XvXAy23CFOmTbMaDxgxXtTKHybrJ39Y8kGzBATgBFibWJKH6BhytLI/Zyszs87xCOBNyBig6vQ==";
-      };
-    };
-    "@aws-crypto/supports-web-crypto-3.0.0" = {
-      name = "_at_aws-crypto_slash_supports-web-crypto";
-      packageName = "@aws-crypto/supports-web-crypto";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/supports-web-crypto/-/supports-web-crypto-3.0.0.tgz";
-        sha512 = "06hBdMwUAb2WFTuGG73LSC0wfPu93xWwo5vL2et9eymgmu3Id5vFAHBbajVWiGhPO37qcsdCap/FqXvJGJWPIg==";
-      };
-    };
-    "@aws-crypto/util-3.0.0" = {
-      name = "_at_aws-crypto_slash_util";
-      packageName = "@aws-crypto/util";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-crypto/util/-/util-3.0.0.tgz";
-        sha512 = "2OJlpeJpCR48CC8r+uKVChzs9Iungj9wkZrl8Z041DWEWvyIHILYKCPNzJghKsivj+S3mLo6BVc7mBNzdxA46w==";
-      };
-    };
-    "@aws-sdk/abort-controller-3.296.0" = {
-      name = "_at_aws-sdk_slash_abort-controller";
-      packageName = "@aws-sdk/abort-controller";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/abort-controller/-/abort-controller-3.296.0.tgz";
-        sha512 = "gNUFBlBw6+sEMfDjPVa83iscpQwXBS4uoiZXnfeQ6s6tnaxqQpJDrBBmNvYqDEXNdaAJX4FhayEwkSvtir/f3A==";
-      };
-    };
-    "@aws-sdk/chunked-blob-reader-3.295.0" = {
-      name = "_at_aws-sdk_slash_chunked-blob-reader";
-      packageName = "@aws-sdk/chunked-blob-reader";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader/-/chunked-blob-reader-3.295.0.tgz";
-        sha512 = "oWWcEKyrx4sNFxfvOgkMai1jJtOuERmND8fAp8vRA6i38HBU80q8jjkoAitFGPHUz57EhI2ewYYNnf7vkGteOQ==";
-      };
-    };
-    "@aws-sdk/chunked-blob-reader-native-3.295.0" = {
-      name = "_at_aws-sdk_slash_chunked-blob-reader-native";
-      packageName = "@aws-sdk/chunked-blob-reader-native";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/chunked-blob-reader-native/-/chunked-blob-reader-native-3.295.0.tgz";
-        sha512 = "9Sp4vXjoG99qI6sFe09MfgIzsKwiOR0atqxmAcJJLn6fUNXhJEoW04n3w/YcRlk7P4gC9cOMsEyvb8xu+fDEOQ==";
-      };
-    };
-    "@aws-sdk/client-s3-3.296.0" = {
-      name = "_at_aws-sdk_slash_client-s3";
-      packageName = "@aws-sdk/client-s3";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-s3/-/client-s3-3.296.0.tgz";
-        sha512 = "PI6mjM0fmcV2fqkkRoivF3DYex4lnbEz7WIsOFAwpHJBbA9ykClQpiutCKcgl0x/yEWAeTNdQtrCVeAwbxYfvw==";
-      };
-    };
-    "@aws-sdk/client-sso-3.296.0" = {
-      name = "_at_aws-sdk_slash_client-sso";
-      packageName = "@aws-sdk/client-sso";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-sso/-/client-sso-3.296.0.tgz";
-        sha512 = "0P0x++jhlmhzViFPOHvTb7+Z6tSV9aONwB8CchIseg2enSPBbGfml7y5gQu1jdOTDS6pBUmrPZ+9sOI4/GvAfA==";
-      };
-    };
-    "@aws-sdk/client-sso-oidc-3.296.0" = {
-      name = "_at_aws-sdk_slash_client-sso-oidc";
-      packageName = "@aws-sdk/client-sso-oidc";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-sso-oidc/-/client-sso-oidc-3.296.0.tgz";
-        sha512 = "GRycCVdlFICvWwv9z6Mc/2BvSBOvchWO7UTklvbKXeDn6D05C+02PfxeoocMTc4r8/eFoEQWs67h5u/lPpyHDw==";
-      };
-    };
-    "@aws-sdk/client-sts-3.296.0" = {
-      name = "_at_aws-sdk_slash_client-sts";
-      packageName = "@aws-sdk/client-sts";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/client-sts/-/client-sts-3.296.0.tgz";
-        sha512 = "ew7hSVNpitnLCIRVhnI2L1HZB/yYpRQFReR62fOqCUnpKqm6WGga37bnvgYbY5y0Rv23C0VHARovwunVg1gabA==";
-      };
-    };
-    "@aws-sdk/config-resolver-3.296.0" = {
-      name = "_at_aws-sdk_slash_config-resolver";
-      packageName = "@aws-sdk/config-resolver";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/config-resolver/-/config-resolver-3.296.0.tgz";
-        sha512 = "Ecdp7fmIitHo49NRCyIEHb9xlI43J7qkvhcwaKGGqN5jvoh0YhR2vNr195wWG8Ip/9PwsD4QV4g/XT5EY7XkMA==";
-      };
-    };
-    "@aws-sdk/core-3.758.0" = {
-      name = "_at_aws-sdk_slash_core";
-      packageName = "@aws-sdk/core";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/core/-/core-3.758.0.tgz";
-        sha512 = "0RswbdR9jt/XKemaLNuxi2gGr4xGlHyGxkTdhSQzCyUe9A9OPCoLl3rIESRguQEech+oJnbHk/wuiwHqTuP9sg==";
-      };
-    };
-    "@aws-sdk/credential-provider-env-3.296.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-env";
-      packageName = "@aws-sdk/credential-provider-env";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.296.0.tgz";
-        sha512 = "eDWSU3p04gytkkVXnYn05YzrP5SEaj/DQiafd4y+iBl8IFfF3zM6982rs6qFhvpwrHeSbLqHNfKR1HDWVwfG5g==";
-      };
-    };
-    "@aws-sdk/credential-provider-imds-3.296.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-imds";
-      packageName = "@aws-sdk/credential-provider-imds";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-imds/-/credential-provider-imds-3.296.0.tgz";
-        sha512 = "DXqksHyT/GVVYbPGknMARKi6Rk6cqCHJUAejePIx5cz1SCKlDrV704hykafHIjaDoy/Zeoj1wzjfwy83sJfDCg==";
-      };
-    };
-    "@aws-sdk/credential-provider-ini-3.296.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-ini";
-      packageName = "@aws-sdk/credential-provider-ini";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.296.0.tgz";
-        sha512 = "U0ecY0GX2jeDAgmTzaVO9YgjlLUfb8wgZSu1OwbOxCJscL/5eFkhcF0/xJQXDbRgcj4H4dlquqeSWsBVl/PgvQ==";
-      };
-    };
-    "@aws-sdk/credential-provider-node-3.296.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-node";
-      packageName = "@aws-sdk/credential-provider-node";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.296.0.tgz";
-        sha512 = "oCkmh2b1DQhHkhd/qA9jiSIOkrBBK7cMg1/PVIgLw8e15NkzUHBObLJ/ZQw6ZzCxZzjlMYaFv9oCB8hyO8txmA==";
-      };
-    };
-    "@aws-sdk/credential-provider-process-3.296.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-process";
-      packageName = "@aws-sdk/credential-provider-process";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.296.0.tgz";
-        sha512 = "AY7sTX2dGi8ripuCpcJLYHOZB2wJ6NnseyK/kK5TfJn/pgboKwuGtz0hkJCVprNWomKa6IpHksm7vLQ4O2E+UA==";
-      };
-    };
-    "@aws-sdk/credential-provider-sso-3.296.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-sso";
-      packageName = "@aws-sdk/credential-provider-sso";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.296.0.tgz";
-        sha512 = "zPFHDX/niXfcQrKQhmBv1XPYEe4b7im4vRKrzjYXgDRpG2M3LP0KaWIwN6Ap+GRYBNBthen86vhTlmKGzyU5YA==";
-      };
-    };
-    "@aws-sdk/credential-provider-web-identity-3.296.0" = {
-      name = "_at_aws-sdk_slash_credential-provider-web-identity";
-      packageName = "@aws-sdk/credential-provider-web-identity";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.296.0.tgz";
-        sha512 = "Rl6Ohoekxe+pccA55XXQDW5wApbg3rGWr6FkmPRcg7Ld6Vfe+HL8OtfsFf83/0eoFerevbif+00BdknXWT05LA==";
-      };
-    };
-    "@aws-sdk/crt-loader-3.758.0" = {
-      name = "_at_aws-sdk_slash_crt-loader";
-      packageName = "@aws-sdk/crt-loader";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/crt-loader/-/crt-loader-3.758.0.tgz";
-        sha512 = "FnLhsDNK3il4rm6Egv7IEuOf8Oiyte5AVeoYkuqgmkCll58tRZCJXYNG/VE+Tket0s3joueVt7rwvHXnMxG0rg==";
-      };
-    };
-    "@aws-sdk/eventstream-codec-3.296.0" = {
-      name = "_at_aws-sdk_slash_eventstream-codec";
-      packageName = "@aws-sdk/eventstream-codec";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/eventstream-codec/-/eventstream-codec-3.296.0.tgz";
-        sha512 = "BtmUc1f4vmYykfpYwbez+SV9CnnnUlzjsvoBu88dOYJwYh+47+84bY+t8yDOGtPR5+CGeTsXLITVxAAQB+MD8Q==";
-      };
-    };
-    "@aws-sdk/eventstream-serde-browser-3.296.0" = {
-      name = "_at_aws-sdk_slash_eventstream-serde-browser";
-      packageName = "@aws-sdk/eventstream-serde-browser";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-browser/-/eventstream-serde-browser-3.296.0.tgz";
-        sha512 = "/8+CK0xlrCPwNj+Y+dOS51n+TJYS9GqWbZbA14tkRJvjEpRWhke69UsON9TA0aW2LsO+Lz+5P9Gjv+1hNqCKGg==";
-      };
-    };
-    "@aws-sdk/eventstream-serde-config-resolver-3.296.0" = {
-      name = "_at_aws-sdk_slash_eventstream-serde-config-resolver";
-      packageName = "@aws-sdk/eventstream-serde-config-resolver";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-config-resolver/-/eventstream-serde-config-resolver-3.296.0.tgz";
-        sha512 = "wJXfJg6z05WcHYWyWtzDKQL8mRYQu8ZCZogLGGu7SZuVBqSVTCLwyPt4JpKkQ6Aw7CqP7LHR77EGCpRHLs2xDQ==";
-      };
-    };
-    "@aws-sdk/eventstream-serde-node-3.296.0" = {
-      name = "_at_aws-sdk_slash_eventstream-serde-node";
-      packageName = "@aws-sdk/eventstream-serde-node";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-node/-/eventstream-serde-node-3.296.0.tgz";
-        sha512 = "Y/2xhce3R3MrPR1sEv6WwpkuHvqj/Tz6EuCExJsPB4kOG8hsMPPKNfTyKEkXVGI+C3JgobAZXj7KzbFe2/HigA==";
-      };
-    };
-    "@aws-sdk/eventstream-serde-universal-3.296.0" = {
-      name = "_at_aws-sdk_slash_eventstream-serde-universal";
-      packageName = "@aws-sdk/eventstream-serde-universal";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/eventstream-serde-universal/-/eventstream-serde-universal-3.296.0.tgz";
-        sha512 = "TbHDJN79UORGVUKBPfEVMOJHj8yQyb9ru41dw3aFy7KxeGQxWH4OL07cEJyjTTq8mgQXPIdPjav7PTvOIuE59g==";
-      };
-    };
-    "@aws-sdk/fetch-http-handler-3.296.0" = {
-      name = "_at_aws-sdk_slash_fetch-http-handler";
-      packageName = "@aws-sdk/fetch-http-handler";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/fetch-http-handler/-/fetch-http-handler-3.296.0.tgz";
-        sha512 = "wHuKQ+PGKQkYGVuIGscbcbbASl8yIVOSC+QTrZQ4PNsMDvQd9ey2npsmxZk1Z2ULaxY+qYtZCmByyGc8k51TtQ==";
-      };
-    };
-    "@aws-sdk/hash-blob-browser-3.296.0" = {
-      name = "_at_aws-sdk_slash_hash-blob-browser";
-      packageName = "@aws-sdk/hash-blob-browser";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/hash-blob-browser/-/hash-blob-browser-3.296.0.tgz";
-        sha512 = "kJJsO9kNDNQIYzIIAB/vHFRfVrc1KUYcPMtCLVprHQhPkSxxnOlHF5wBTJ98IRKi/eGYxD5QrCzrMKLI95BPKw==";
-      };
-    };
-    "@aws-sdk/hash-node-3.296.0" = {
-      name = "_at_aws-sdk_slash_hash-node";
-      packageName = "@aws-sdk/hash-node";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/hash-node/-/hash-node-3.296.0.tgz";
-        sha512 = "01Sgxm0NE3rtEznLY8vx1bfNsIeM5Sk5SjY9RXqnvCf9EyaKH9x5FMS/DX/SgDdIYi3aXbTwiwScNVCNBzOIQA==";
-      };
-    };
-    "@aws-sdk/hash-stream-node-3.296.0" = {
-      name = "_at_aws-sdk_slash_hash-stream-node";
-      packageName = "@aws-sdk/hash-stream-node";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/hash-stream-node/-/hash-stream-node-3.296.0.tgz";
-        sha512 = "EO3nNQiTq5/AQj55E9T10RC7QRnExCIYsvTiKzQPfJEdKiTy8Xga6oQEAGttRABBlP0wTjG4HVnHEEFZ6HbcoQ==";
-      };
-    };
-    "@aws-sdk/invalid-dependency-3.296.0" = {
-      name = "_at_aws-sdk_slash_invalid-dependency";
-      packageName = "@aws-sdk/invalid-dependency";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/invalid-dependency/-/invalid-dependency-3.296.0.tgz";
-        sha512 = "dmy4fUds0woHGjxwziaSYCLtb/SOfoEeQjW0GFvHj+YGFyY5hJzna4C759Tt8X5obh1evUXlQcH+FL7TS+7tRQ==";
-      };
-    };
-    "@aws-sdk/is-array-buffer-3.295.0" = {
-      name = "_at_aws-sdk_slash_is-array-buffer";
-      packageName = "@aws-sdk/is-array-buffer";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/is-array-buffer/-/is-array-buffer-3.295.0.tgz";
-        sha512 = "SCIt10cr5dud7hvwveU4wkLjvkGssJ3GrcbHCds2NwI+JHmpcaaNYLAqi305JAuT29T36U5ssTFDSmrrEOcfag==";
-      };
-    };
-    "@aws-sdk/md5-js-3.296.0" = {
-      name = "_at_aws-sdk_slash_md5-js";
-      packageName = "@aws-sdk/md5-js";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/md5-js/-/md5-js-3.296.0.tgz";
-        sha512 = "TvDafbHFcplnf0QqRlkjZ/Dz+dLWBmzBEclRk+h34r4XaIWxvmQ9EtQRo6+6sfAVRtAj2l+i1fm9EjwPMVkb9A==";
-      };
-    };
-    "@aws-sdk/middleware-bucket-endpoint-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-bucket-endpoint";
-      packageName = "@aws-sdk/middleware-bucket-endpoint";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-bucket-endpoint/-/middleware-bucket-endpoint-3.296.0.tgz";
-        sha512 = "Xhzucs5psscjXJW7V6vMrjJWGmej8Xtw8XIKd91RLmbxdmecMy85/mQC3bIqxgTGhC/e3pKqWSp8z/YjV6iPZg==";
-      };
-    };
-    "@aws-sdk/middleware-content-length-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-content-length";
-      packageName = "@aws-sdk/middleware-content-length";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-content-length/-/middleware-content-length-3.296.0.tgz";
-        sha512 = "e7lJm3kkC2pWZdIw23gpMUk1GrpRTBRqhdFfVwyduXw6Wo4nBYv8Z5MOYy3/SlpjE1BDCaPBoZ3O19cO3arHxg==";
-      };
-    };
-    "@aws-sdk/middleware-endpoint-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-endpoint";
-      packageName = "@aws-sdk/middleware-endpoint";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-endpoint/-/middleware-endpoint-3.296.0.tgz";
-        sha512 = "t8gc7FHr6KkFD35eSzv3VEYl2vNqzAHbux5Bn0su6TJbaTxXiQKcf2jZDTAh7LzUyrB1LH39mNN+at7r3Qm/3g==";
-      };
-    };
-    "@aws-sdk/middleware-expect-continue-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-expect-continue";
-      packageName = "@aws-sdk/middleware-expect-continue";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-expect-continue/-/middleware-expect-continue-3.296.0.tgz";
-        sha512 = "aVCv9CdAVWt9AlZKQZRweIywkAszRrZUCo8K5bBUJNdD4061DoDqLK/6jmqXmObas0j1wQr/eNzjYbv99MZBCg==";
-      };
-    };
-    "@aws-sdk/middleware-flexible-checksums-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-flexible-checksums";
-      packageName = "@aws-sdk/middleware-flexible-checksums";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-flexible-checksums/-/middleware-flexible-checksums-3.296.0.tgz";
-        sha512 = "F5wVMhLIgA86PKsK/Az7LGIiNVDdZjoSn0+boe6fYW/AIAmgJhPf//500Md0GsKsLOCcPcxiQC43a0hVT2zbew==";
-      };
-    };
-    "@aws-sdk/middleware-host-header-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-host-header";
-      packageName = "@aws-sdk/middleware-host-header";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.296.0.tgz";
-        sha512 = "V47dFtfkX5lXWv9GDp71gZVCRws4fEdQ9QF9BQ/2UMSNrYjQLg6mFe7NibH+IJoNOid2FIwWIl94Eos636VGYQ==";
-      };
-    };
-    "@aws-sdk/middleware-location-constraint-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-location-constraint";
-      packageName = "@aws-sdk/middleware-location-constraint";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-location-constraint/-/middleware-location-constraint-3.296.0.tgz";
-        sha512 = "KHkWaIrZOtJmV1/WO9KOf7kSK41ngfqts3YIun956NYglKTDKyrBIOPCgmXTT/03odnYsKVT/UfbEIh/v4RxGA==";
-      };
-    };
-    "@aws-sdk/middleware-logger-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-logger";
-      packageName = "@aws-sdk/middleware-logger";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.296.0.tgz";
-        sha512 = "LzfEEFyBR9LXdWwLdtBrmi1vLdzgdJNntEgzqktVF8LwaCyY+9xIE6TGu/2V+9fJHAwECxjOC1eQbNQdAZ0Tmw==";
-      };
-    };
-    "@aws-sdk/middleware-recursion-detection-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-recursion-detection";
-      packageName = "@aws-sdk/middleware-recursion-detection";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.296.0.tgz";
-        sha512 = "UG7TLDPz9ImQG0uVklHTxE9Us7rTImwN+6el6qZCpoTBuGeXgOkfb0/p8izJyFgY/hMUR4cZqs7IdCDUkxQF3w==";
-      };
-    };
-    "@aws-sdk/middleware-retry-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-retry";
-      packageName = "@aws-sdk/middleware-retry";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-retry/-/middleware-retry-3.296.0.tgz";
-        sha512 = "Tz3gDZm5viQg7BG5bF9Cg0qbm4+Ur3a7wcGkj1XHQdzGDYR76gxvU0bfnSNUmWRz3kaVNyISyXSOUygG0cbhbw==";
-      };
-    };
-    "@aws-sdk/middleware-sdk-s3-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-sdk-s3";
-      packageName = "@aws-sdk/middleware-sdk-s3";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.296.0.tgz";
-        sha512 = "zH4uZKEqumo01wn+dTwrYnvOui9GjDiuBHdECnSjnA0Mkxo/tfMPYzYD7mE8kUlBz7HfQcXeXlyaApj9fPkxvg==";
-      };
-    };
-    "@aws-sdk/middleware-sdk-s3-3.758.0" = {
-      name = "_at_aws-sdk_slash_middleware-sdk-s3";
-      packageName = "@aws-sdk/middleware-sdk-s3";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.758.0.tgz";
-        sha512 = "6mJ2zyyHPYSV6bAcaFpsdoXZJeQlR1QgBnZZ6juY/+dcYiuyWCdyLUbGzSZSE7GTfx6i+9+QWFeoIMlWKgU63A==";
-      };
-    };
-    "@aws-sdk/middleware-sdk-sts-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-sdk-sts";
-      packageName = "@aws-sdk/middleware-sdk-sts";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-sdk-sts/-/middleware-sdk-sts-3.296.0.tgz";
-        sha512 = "0EnHtiRzcRcXaF6zEgcRGUtVgX0RqczwlGXjtryHcxiqU/+adqbRuckC7bdMF4Zva6GVPS25XppvGF4M+UzAEw==";
-      };
-    };
-    "@aws-sdk/middleware-serde-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-serde";
-      packageName = "@aws-sdk/middleware-serde";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-serde/-/middleware-serde-3.296.0.tgz";
-        sha512 = "xk2PpWAAX758oUTGkGBAncpOr7ddIXisjD2Y2r9DDXuE4JMho2x6zcrVSiYsGIQ6MHZ9XNJKBVDiK9PA4iQWGQ==";
-      };
-    };
-    "@aws-sdk/middleware-signing-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-signing";
-      packageName = "@aws-sdk/middleware-signing";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-signing/-/middleware-signing-3.296.0.tgz";
-        sha512 = "wyiG+WPDvugGTIPpKchGOdvvpcMZEN2IfP6iK//QAqGXsC6rDm5+SNZ3+elvduZjPUdVA06W0CcFYBAkVz8D7Q==";
-      };
-    };
-    "@aws-sdk/middleware-ssec-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-ssec";
-      packageName = "@aws-sdk/middleware-ssec";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.296.0.tgz";
-        sha512 = "vcSyXxEXAC9rWzUd7rq2/JxPdt87DKiA+wfiBrpGvFV+bacocIV0TFcpJncgZqMOoP8b6Osd+mW4BjlkwBamtA==";
-      };
-    };
-    "@aws-sdk/middleware-ssec-3.734.0" = {
-      name = "_at_aws-sdk_slash_middleware-ssec";
-      packageName = "@aws-sdk/middleware-ssec";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-ssec/-/middleware-ssec-3.734.0.tgz";
-        sha512 = "d4yd1RrPW/sspEXizq2NSOUivnheac6LPeLSLnaeTbBG9g1KqIqvCzP1TfXEqv2CrWfHEsWtJpX7oyjySSPvDQ==";
-      };
-    };
-    "@aws-sdk/middleware-stack-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-stack";
-      packageName = "@aws-sdk/middleware-stack";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-stack/-/middleware-stack-3.296.0.tgz";
-        sha512 = "Rgo7/mdk9tt4qa9+pzG3AoGNhuj7NmnF5H+3DoPm75h58BYP8hKbKobdPGgI2rZLPtO3PGgmyw/4K4tQJPIZ8g==";
-      };
-    };
-    "@aws-sdk/middleware-user-agent-3.296.0" = {
-      name = "_at_aws-sdk_slash_middleware-user-agent";
-      packageName = "@aws-sdk/middleware-user-agent";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.296.0.tgz";
-        sha512 = "L7jacxSt6gxX1gD3tQtfwHqBDk5rT2wWD3rxBa6rs7f81b9ObgY/sPT2IgRT7JNCVzvKLYFxJaTklDj65mY1SQ==";
-      };
-    };
-    "@aws-sdk/middleware-user-agent-3.758.0" = {
-      name = "_at_aws-sdk_slash_middleware-user-agent";
-      packageName = "@aws-sdk/middleware-user-agent";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.758.0.tgz";
-        sha512 = "iNyehQXtQlj69JCgfaOssgZD4HeYGOwxcaKeG6F+40cwBjTAi0+Ph1yfDwqk2qiBPIRWJ/9l2LodZbxiBqgrwg==";
-      };
-    };
-    "@aws-sdk/nested-clients-3.758.0" = {
-      name = "_at_aws-sdk_slash_nested-clients";
-      packageName = "@aws-sdk/nested-clients";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.758.0.tgz";
-        sha512 = "YZ5s7PSvyF3Mt2h1EQulCG93uybprNGbBkPmVuy/HMMfbFTt4iL3SbKjxqvOZelm86epFfj7pvK7FliI2WOEcg==";
-      };
-    };
-    "@aws-sdk/node-config-provider-3.296.0" = {
-      name = "_at_aws-sdk_slash_node-config-provider";
-      packageName = "@aws-sdk/node-config-provider";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/node-config-provider/-/node-config-provider-3.296.0.tgz";
-        sha512 = "S/tYcuw9ACOWRmRe5oUkmutQ+TApjVs0yDl504DKs74f3p4kRgI/MGWkBiR3mcfThHaxu81z0gkRL2qfW2SDwg==";
-      };
-    };
-    "@aws-sdk/node-http-handler-3.296.0" = {
-      name = "_at_aws-sdk_slash_node-http-handler";
-      packageName = "@aws-sdk/node-http-handler";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/node-http-handler/-/node-http-handler-3.296.0.tgz";
-        sha512 = "D15jjPqYSNhEq58BwkmIpD3VwqG4bL5acAaNu5wWAI4S4236JlG+nmpi3gEeE25z1KCwtBl7G30fVRgXYJ2CWA==";
-      };
-    };
-    "@aws-sdk/property-provider-3.296.0" = {
-      name = "_at_aws-sdk_slash_property-provider";
-      packageName = "@aws-sdk/property-provider";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/property-provider/-/property-provider-3.296.0.tgz";
-        sha512 = "kjczxE9Od5LoAKQOmxVWISJ9oPG3aCsB+2+NdI+k9EJFDXUUdMcVV3Skei5uHGgKLMsI6CZy8ezZx6YxOSLSew==";
-      };
-    };
-    "@aws-sdk/protocol-http-3.296.0" = {
-      name = "_at_aws-sdk_slash_protocol-http";
-      packageName = "@aws-sdk/protocol-http";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/protocol-http/-/protocol-http-3.296.0.tgz";
-        sha512 = "0U1Z/+tpwdRiSToWo1bpdkbTzjbLugTnd02ATjvK4B7zi363SUGlKfoWgV+v7FU/22CIUI1ZIe7XzXvq5rJfjA==";
-      };
-    };
-    "@aws-sdk/querystring-builder-3.296.0" = {
-      name = "_at_aws-sdk_slash_querystring-builder";
-      packageName = "@aws-sdk/querystring-builder";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/querystring-builder/-/querystring-builder-3.296.0.tgz";
-        sha512 = "+ZrZdTRaVI1R1xKQNrTwuiRoPateUaJ/DNw/myJpTPt+ZRg0H7LKBGaJYwL4pl5l/z1UM/E1fOttSfSW7GHxfw==";
-      };
-    };
-    "@aws-sdk/querystring-parser-3.296.0" = {
-      name = "_at_aws-sdk_slash_querystring-parser";
-      packageName = "@aws-sdk/querystring-parser";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/querystring-parser/-/querystring-parser-3.296.0.tgz";
-        sha512 = "nLNZKVQfK42euv7101cE5qfg17YCtGcfccx3B5XSAzvyTROR46kwYqbEvYSsWisbZoRhbQc905gB/5E0U5HDIw==";
-      };
-    };
-    "@aws-sdk/region-config-resolver-3.734.0" = {
-      name = "_at_aws-sdk_slash_region-config-resolver";
-      packageName = "@aws-sdk/region-config-resolver";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.734.0.tgz";
-        sha512 = "Lvj1kPRC5IuJBr9DyJ9T9/plkh+EfKLy+12s/mykOy1JaKHDpvj+XGy2YO6YgYVOb8JFtaqloid+5COtje4JTQ==";
-      };
-    };
-    "@aws-sdk/s3-presigned-post-3.758.0" = {
-      name = "_at_aws-sdk_slash_s3-presigned-post";
-      packageName = "@aws-sdk/s3-presigned-post";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/s3-presigned-post/-/s3-presigned-post-3.758.0.tgz";
-        sha512 = "x+TWQ6xYD+/i3IlIM0nn1HGAKCmkG12VslKyJSrZAjwWQeVerj6LPVIJvYFcZbNU5lEPWCnlVqKw3S3NgG+N4Q==";
-      };
-    };
-    "@aws-sdk/s3-request-presigner-3.296.0" = {
-      name = "_at_aws-sdk_slash_s3-request-presigner";
-      packageName = "@aws-sdk/s3-request-presigner";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.296.0.tgz";
-        sha512 = "BQv+oNA5EzJymrfh7cnMun/ougmTX3eo6bGCWn/bQdL1LyxodeVdRZacD5tN+lAUYtjhQ7yS23ozYh0lvWNEXw==";
-      };
-    };
-    "@aws-sdk/s3-request-presigner-3.758.0" = {
-      name = "_at_aws-sdk_slash_s3-request-presigner";
-      packageName = "@aws-sdk/s3-request-presigner";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/s3-request-presigner/-/s3-request-presigner-3.758.0.tgz";
-        sha512 = "dVyItwu/J1InfJBbCPpHRV9jrsBfI7L0RlDGyS3x/xqBwnm5qpvgNZQasQiyqIl+WJB4f5rZRZHgHuwftqINbA==";
-      };
-    };
-    "@aws-sdk/service-error-classification-3.296.0" = {
-      name = "_at_aws-sdk_slash_service-error-classification";
-      packageName = "@aws-sdk/service-error-classification";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/service-error-classification/-/service-error-classification-3.296.0.tgz";
-        sha512 = "YIsWSQ38e1+FqXz3CMrkKS0JD8OLlHf6I72PJhbfegePpQQFqi9R8OREjP5V7UR9Z972yruv4i96ROH6SCtmoA==";
-      };
-    };
-    "@aws-sdk/shared-ini-file-loader-3.296.0" = {
-      name = "_at_aws-sdk_slash_shared-ini-file-loader";
-      packageName = "@aws-sdk/shared-ini-file-loader";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/shared-ini-file-loader/-/shared-ini-file-loader-3.296.0.tgz";
-        sha512 = "S31VfdiruN2trayoeB7HifsEB+WXhtfECosj90K903rzfyX+Eo+uUoK9O07UotxJ2gB3MBQ7R8pNnZio3Lb66w==";
-      };
-    };
-    "@aws-sdk/signature-v4-3.296.0" = {
-      name = "_at_aws-sdk_slash_signature-v4";
-      packageName = "@aws-sdk/signature-v4";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/signature-v4/-/signature-v4-3.296.0.tgz";
-        sha512 = "NQyJ/FClty4VmF1WoV4rOkbN0Unn0zevzy8iJrYhqxE3Sc7lySM4Btnsd4Iqelm2dR6l+jNRApGgD8NvoGjGig==";
-      };
-    };
-    "@aws-sdk/signature-v4-crt-3.758.0" = {
-      name = "_at_aws-sdk_slash_signature-v4-crt";
-      packageName = "@aws-sdk/signature-v4-crt";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/signature-v4-crt/-/signature-v4-crt-3.758.0.tgz";
-        sha512 = "DioxfJ8+KenOwydElJvWwMxw0IN8rTD3lbV3AbURwIp+5FBDz8F5ykMO1o1YUQvrGuUNtala8lX3ScE2L7tw9w==";
-      };
-    };
-    "@aws-sdk/signature-v4-multi-region-3.296.0" = {
-      name = "_at_aws-sdk_slash_signature-v4-multi-region";
-      packageName = "@aws-sdk/signature-v4-multi-region";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.296.0.tgz";
-        sha512 = "BNMXS0YJEgflPhO2KxXG4f0iTMOGdyxslDMNGmMWGGQm6bbwtqZ7Y9ZyMQYKfzk3GUPpfGQcaaSNiGfURPOCOg==";
-      };
-    };
-    "@aws-sdk/signature-v4-multi-region-3.758.0" = {
-      name = "_at_aws-sdk_slash_signature-v4-multi-region";
-      packageName = "@aws-sdk/signature-v4-multi-region";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.758.0.tgz";
-        sha512 = "0RPCo8fYJcrenJ6bRtiUbFOSgQ1CX/GpvwtLU2Fam1tS9h2klKK8d74caeV6A1mIUvBU7bhyQ0wMGlwMtn3EYw==";
-      };
-    };
-    "@aws-sdk/smithy-client-3.296.0" = {
-      name = "_at_aws-sdk_slash_smithy-client";
-      packageName = "@aws-sdk/smithy-client";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/smithy-client/-/smithy-client-3.296.0.tgz";
-        sha512 = "HEpsLNozGe9XOWouq5A1TFw5KhFodi8tZqYVNEbSpLoRR+EQKf6OCRvKIRkOn7FnnaOasOR1n7S0D51UG6/irw==";
-      };
-    };
-    "@aws-sdk/token-providers-3.296.0" = {
-      name = "_at_aws-sdk_slash_token-providers";
-      packageName = "@aws-sdk/token-providers";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.296.0.tgz";
-        sha512 = "yC1ku7A5S+o/CLlgbgDB2bx8+Wq43qj8xfohmTuIhpiP2m/NyUiRVv6S6ARONLI6bVeo1T2/BFk5Q9DfE2xzAQ==";
-      };
-    };
-    "@aws-sdk/types-3.296.0" = {
-      name = "_at_aws-sdk_slash_types";
-      packageName = "@aws-sdk/types";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.296.0.tgz";
-        sha512 = "s0wIac64rrMEo2ioUxP9IarGiiCGmelCspNcoNTPSjGl25QqjhyfQqTeGgS58qJ4fHoQb07qra39930xp1IzJg==";
-      };
-    };
-    "@aws-sdk/types-3.734.0" = {
-      name = "_at_aws-sdk_slash_types";
-      packageName = "@aws-sdk/types";
-      version = "3.734.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/types/-/types-3.734.0.tgz";
-        sha512 = "o11tSPTT70nAkGV1fN9wm/hAIiLPyWX6SuGf+9JyTp7S/rC2cFWhR26MvA69nplcjNaXVzB0f+QFrLXXjOqCrg==";
-      };
-    };
-    "@aws-sdk/url-parser-3.296.0" = {
-      name = "_at_aws-sdk_slash_url-parser";
-      packageName = "@aws-sdk/url-parser";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/url-parser/-/url-parser-3.296.0.tgz";
-        sha512 = "nBgeGF+ziuDSLz+y8UAl6zL2tXxDwh3wqeXFe9ZcR4YW71BWuh+vEqEsaEMutOrfnJacCrYKTs9TkIOW41cEGg==";
-      };
-    };
-    "@aws-sdk/util-arn-parser-3.295.0" = {
-      name = "_at_aws-sdk_slash_util-arn-parser";
-      packageName = "@aws-sdk/util-arn-parser";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.295.0.tgz";
-        sha512 = "kSSVymcbjyQQHvCZaTt1teKKW4MSSMPRdPNxSNO1aLsVwxrWdnAggDrpHwFjvPCRUcKtpThepATOz75PfUm9Bg==";
-      };
-    };
-    "@aws-sdk/util-arn-parser-3.723.0" = {
-      name = "_at_aws-sdk_slash_util-arn-parser";
-      packageName = "@aws-sdk/util-arn-parser";
-      version = "3.723.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.723.0.tgz";
-        sha512 = "ZhEfvUwNliOQROcAk34WJWVYTlTa4694kSVhDSjW6lE1bMataPnIN8A0ycukEzBXmd8ZSoBcQLn6lKGl7XIJ5w==";
-      };
-    };
-    "@aws-sdk/util-base64-3.295.0" = {
-      name = "_at_aws-sdk_slash_util-base64";
-      packageName = "@aws-sdk/util-base64";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-base64/-/util-base64-3.295.0.tgz";
-        sha512 = "z1r40BsBiOTALnzASvLb4qutGwPpL+jH2UKTCV5WJLXZFMzRnpZaRfeZGE8lMJ/i0+jv9H9G1FmVzE8UgB4rhw==";
-      };
-    };
-    "@aws-sdk/util-body-length-browser-3.295.0" = {
-      name = "_at_aws-sdk_slash_util-body-length-browser";
-      packageName = "@aws-sdk/util-body-length-browser";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-body-length-browser/-/util-body-length-browser-3.295.0.tgz";
-        sha512 = "NbG4/RSHV1VueStPRclSo5zRjNUmcDlNAs29sniZF+YaN0+Ad7hEdu/YgJw39shBfUaurz2Wv0pufU3cxE5Tng==";
-      };
-    };
-    "@aws-sdk/util-body-length-node-3.295.0" = {
-      name = "_at_aws-sdk_slash_util-body-length-node";
-      packageName = "@aws-sdk/util-body-length-node";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-body-length-node/-/util-body-length-node-3.295.0.tgz";
-        sha512 = "dvGf8VBmrT66lM0n6P/h7wnlHS4Atafyivyl8f4TUCMvRdpqryvvrtnX6yYcq3T7VKQmas/2SOlgDvcrhGXaiw==";
-      };
-    };
-    "@aws-sdk/util-buffer-from-3.295.0" = {
-      name = "_at_aws-sdk_slash_util-buffer-from";
-      packageName = "@aws-sdk/util-buffer-from";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-buffer-from/-/util-buffer-from-3.295.0.tgz";
-        sha512 = "5ezVEITQnrQKn+CU9qfZHgRp2nrrbX0Clmlm9aiNjAEQEPHY33tWl0t6n8h8yU+IpGiNRMWBVC4aSJaE5NA1mA==";
-      };
-    };
-    "@aws-sdk/util-config-provider-3.295.0" = {
-      name = "_at_aws-sdk_slash_util-config-provider";
-      packageName = "@aws-sdk/util-config-provider";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-config-provider/-/util-config-provider-3.295.0.tgz";
-        sha512 = "/5Dl1aV2yI8YQjqwmg4RTnl/E9NmNsx7HIwBZt+dTcOrM0LMUwczQBFFcLyqCj/qv5y+VsvLoAAA/OiBT7hb3w==";
-      };
-    };
-    "@aws-sdk/util-create-request-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-create-request";
-      packageName = "@aws-sdk/util-create-request";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-create-request/-/util-create-request-3.296.0.tgz";
-        sha512 = "rLiDG18mvuqTiwcd3dhBNSH+82jPBoEpGC4hgWHQlQlOC6ctitkBTUo4Di2OPfrYNxegbU5gj4uy2GT0F69TSw==";
-      };
-    };
-    "@aws-sdk/util-defaults-mode-browser-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-defaults-mode-browser";
-      packageName = "@aws-sdk/util-defaults-mode-browser";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-browser/-/util-defaults-mode-browser-3.296.0.tgz";
-        sha512 = "R+nzc0PuTMaOG3LV4FoS5W7oMAqqr8G1IyI+A4Q5iem6YDMF157qV5h6wpIt3A8n9YfjyssLsAT/WPfyv/M79w==";
-      };
-    };
-    "@aws-sdk/util-defaults-mode-node-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-defaults-mode-node";
-      packageName = "@aws-sdk/util-defaults-mode-node";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-defaults-mode-node/-/util-defaults-mode-node-3.296.0.tgz";
-        sha512 = "zsIYynqjBE2xlzpJsT3lb5gy06undSgYq9ziId7QaHFagqtrecHI2ZMcu2tBFcONpu9NPj3nqJB+kJUAnBc8sQ==";
-      };
-    };
-    "@aws-sdk/util-endpoints-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-endpoints";
-      packageName = "@aws-sdk/util-endpoints";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.296.0.tgz";
-        sha512 = "YraGGLJepXM6HCTaqEGTFf8RFRBdJ0C6uG5k0kVhiXmYxBkeupn8J07CVp9jfWqcPYWElAnMGVEZKU1OjRo4HQ==";
-      };
-    };
-    "@aws-sdk/util-endpoints-3.743.0" = {
-      name = "_at_aws-sdk_slash_util-endpoints";
-      packageName = "@aws-sdk/util-endpoints";
-      version = "3.743.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.743.0.tgz";
-        sha512 = "sN1l559zrixeh5x+pttrnd0A3+r34r0tmPkJ/eaaMaAzXqsmKU/xYre9K3FNnsSS1J1k4PEfk/nHDTVUgFYjnw==";
-      };
-    };
-    "@aws-sdk/util-format-url-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-format-url";
-      packageName = "@aws-sdk/util-format-url";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-format-url/-/util-format-url-3.296.0.tgz";
-        sha512 = "CcYECzkUAnHL5q3uyPicafn2OY0GiklIYfuOUHPZ/4FMxIesd1BnCDDRjTlFxLWjuNuiihIdwB7Qb1pDzxc3Iw==";
-      };
-    };
-    "@aws-sdk/util-hex-encoding-3.295.0" = {
-      name = "_at_aws-sdk_slash_util-hex-encoding";
-      packageName = "@aws-sdk/util-hex-encoding";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-hex-encoding/-/util-hex-encoding-3.295.0.tgz";
-        sha512 = "XJcoVo41kHzhe28PBm/rqt5mdCp8R6abwiW9ug1dA6FOoPUO8kBUxDv6xaOmA2hfRvd2ocFfBXaUCBqUowkGcQ==";
-      };
-    };
-    "@aws-sdk/util-locate-window-3.723.0" = {
-      name = "_at_aws-sdk_slash_util-locate-window";
-      packageName = "@aws-sdk/util-locate-window";
-      version = "3.723.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.723.0.tgz";
-        sha512 = "Yf2CS10BqK688DRsrKI/EO6B8ff5J86NXe4C+VCysK7UOgN0l1zOTeTukZ3H8Q9tYYX3oaF1961o8vRkFm7Nmw==";
-      };
-    };
-    "@aws-sdk/util-middleware-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-middleware";
-      packageName = "@aws-sdk/util-middleware";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-middleware/-/util-middleware-3.296.0.tgz";
-        sha512 = "MNWU+doVuX+mIehEManP6OP+f08T33qQpHoBqKIeKpn3TjZjMHG7ujACTkJiEOHUrnwTov7h0Sm+3OZwk3kh9w==";
-      };
-    };
-    "@aws-sdk/util-retry-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-retry";
-      packageName = "@aws-sdk/util-retry";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-retry/-/util-retry-3.296.0.tgz";
-        sha512 = "0mh7SqOMjuJ4vE423SzA/AfCLM68jykbfpEBkTmfqkpjkeQSW+UXHAUdXsMmfzIneiq7go5Z548F868C3cZnwQ==";
-      };
-    };
-    "@aws-sdk/util-stream-browser-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-stream-browser";
-      packageName = "@aws-sdk/util-stream-browser";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-stream-browser/-/util-stream-browser-3.296.0.tgz";
-        sha512 = "6L72tvxIImTDtZ0ckUfpPA2cGE2XhawNsjdngWySkwYev5Unqm/ywmfZm1wa52/4bmJwX35hcGPFQ8qgrPVeNQ==";
-      };
-    };
-    "@aws-sdk/util-stream-node-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-stream-node";
-      packageName = "@aws-sdk/util-stream-node";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-stream-node/-/util-stream-node-3.296.0.tgz";
-        sha512 = "Gva28bJVlkR10Wy1IGB9ZaQo6wCP8tDacrxwSWP/cPBegFf8yUX53LUqIWxI6Fo4GcSI/+Blri51Sni7oldYhg==";
-      };
-    };
-    "@aws-sdk/util-uri-escape-3.295.0" = {
-      name = "_at_aws-sdk_slash_util-uri-escape";
-      packageName = "@aws-sdk/util-uri-escape";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-uri-escape/-/util-uri-escape-3.295.0.tgz";
-        sha512 = "1H5DcyIoXF8XcPBWf7wzHt0l+TW2EoR8Oq4gsVrPTQkHMTVclC2Yn8EF3gc4arwVBzwLulI9LMBE2L8fexGfTQ==";
-      };
-    };
-    "@aws-sdk/util-user-agent-browser-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-user-agent-browser";
-      packageName = "@aws-sdk/util-user-agent-browser";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.296.0.tgz";
-        sha512 = "MGGG+09VkF0N+8KEht8NNE6Q7bqmddgqLkUbvzSky0y18UPEZyq9LTC4JZtzDDOzf/swgbq2IQ/5wtB81iouog==";
-      };
-    };
-    "@aws-sdk/util-user-agent-node-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-user-agent-node";
-      packageName = "@aws-sdk/util-user-agent-node";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.296.0.tgz";
-        sha512 = "AMWac8aIBnaa9nxAEpZ752j29a/UQTViRfR5gnCX38ECBKGfOQMpgYnee5HdlMr4GHJj0WkOzQxBtInW4pV58g==";
-      };
-    };
-    "@aws-sdk/util-user-agent-node-3.758.0" = {
-      name = "_at_aws-sdk_slash_util-user-agent-node";
-      packageName = "@aws-sdk/util-user-agent-node";
-      version = "3.758.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.758.0.tgz";
-        sha512 = "A5EZw85V6WhoKMV2hbuFRvb9NPlxEErb4HPO6/SPXYY4QrjprIzScHxikqcWv1w4J3apB1wto9LPU3IMsYtfrw==";
-      };
-    };
-    "@aws-sdk/util-utf8-3.295.0" = {
-      name = "_at_aws-sdk_slash_util-utf8";
-      packageName = "@aws-sdk/util-utf8";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-utf8/-/util-utf8-3.295.0.tgz";
-        sha512 = "ITN8v3F63ZkA4sdmCtSbS/mhav4F0MEAiXDAUXtMJLNqVtaVcyQST4i9vNmPpIVthAPAtP0QjyF2tq/Di8bxtQ==";
-      };
-    };
-    "@aws-sdk/util-utf8-browser-3.259.0" = {
-      name = "_at_aws-sdk_slash_util-utf8-browser";
-      packageName = "@aws-sdk/util-utf8-browser";
-      version = "3.259.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-utf8-browser/-/util-utf8-browser-3.259.0.tgz";
-        sha512 = "UvFa/vR+e19XookZF8RzFZBrw2EUkQWxiBW0yYQAhvk3C+QVGl0H3ouca8LDBlBfQKXwmW3huo/59H8rwb1wJw==";
-      };
-    };
-    "@aws-sdk/util-waiter-3.296.0" = {
-      name = "_at_aws-sdk_slash_util-waiter";
-      packageName = "@aws-sdk/util-waiter";
-      version = "3.296.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/util-waiter/-/util-waiter-3.296.0.tgz";
-        sha512 = "L57uIC74VyTjAdCH0wQqtvJtwK4+gIT/51K/BJHEqVg6C1pOwgrdT6dHC3q8b+gdOrZ6Ff/vTEfh7FZmVcPPjg==";
-      };
-    };
-    "@aws-sdk/xml-builder-3.295.0" = {
-      name = "_at_aws-sdk_slash_xml-builder";
-      packageName = "@aws-sdk/xml-builder";
-      version = "3.295.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.295.0.tgz";
-        sha512 = "7VX3Due7Ip73yfYErFDHZvhgBohC4IyMTfW49DI4C/LFKFCcAoB888MdevUkB87GoiNaRLeT3ZMZ86IWlSEaow==";
-      };
-    };
     "@azure/abort-controller-2.1.2" = {
       name = "_at_azure_slash_abort-controller";
       packageName = "@azure/abort-controller";
@@ -1731,15 +759,6 @@ let
         sha512 = "PJEqBwAleffCMETaVm/fUgHldzBE35JFk3/9LL6NUA5EXa3qednu+UT6M7E5iBu3zIQZCULYIiZ90fBYHt6xUw==";
       };
     };
-    "@cronvel/get-pixels-3.4.1" = {
-      name = "_at_cronvel_slash_get-pixels";
-      packageName = "@cronvel/get-pixels";
-      version = "3.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@cronvel/get-pixels/-/get-pixels-3.4.1.tgz";
-        sha512 = "gB5C5nDIacLUdsMuW8YsM9SzK3vaFANe4J11CVXpovpy7bZUGrcJKmc6m/0gWG789pKr6XSZY2aEetjFvSRw5g==";
-      };
-    };
     "@cspotcode/source-map-support-0.8.1" = {
       name = "_at_cspotcode_slash_source-map-support";
       packageName = "@cspotcode/source-map-support";
@@ -1749,51 +768,6 @@ let
         sha512 = "IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==";
       };
     };
-    "@csstools/color-helpers-5.0.2" = {
-      name = "_at_csstools_slash_color-helpers";
-      packageName = "@csstools/color-helpers";
-      version = "5.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-5.0.2.tgz";
-        sha512 = "JqWH1vsgdGcw2RR6VliXXdA0/59LttzlU8UlRT/iUUsEeWfYq8I+K0yhihEUTTHLRm1EXvpsCx3083EU15ecsA==";
-      };
-    };
-    "@csstools/css-calc-2.1.2" = {
-      name = "_at_csstools_slash_css-calc";
-      packageName = "@csstools/css-calc";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-2.1.2.tgz";
-        sha512 = "TklMyb3uBB28b5uQdxjReG4L80NxAqgrECqLZFQbyLekwwlcDDS8r3f07DKqeo8C4926Br0gf/ZDe17Zv4wIuw==";
-      };
-    };
-    "@csstools/css-color-parser-3.0.8" = {
-      name = "_at_csstools_slash_css-color-parser";
-      packageName = "@csstools/css-color-parser";
-      version = "3.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-3.0.8.tgz";
-        sha512 = "pdwotQjCCnRPuNi06jFuP68cykU1f3ZWExLe/8MQ1LOs8Xq+fTkYgd+2V8mWUWMrOn9iS2HftPVaMZDaXzGbhQ==";
-      };
-    };
-    "@csstools/css-parser-algorithms-3.0.4" = {
-      name = "_at_csstools_slash_css-parser-algorithms";
-      packageName = "@csstools/css-parser-algorithms";
-      version = "3.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-3.0.4.tgz";
-        sha512 = "Up7rBoV77rv29d3uKHUIVubz1BTcgyUK72IvCQAbfbMv584xHcGKCKbWh7i8hPrRJ7qU4Y8IO3IY9m+iTB7P3A==";
-      };
-    };
-    "@csstools/css-tokenizer-3.0.3" = {
-      name = "_at_csstools_slash_css-tokenizer";
-      packageName = "@csstools/css-tokenizer";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-3.0.3.tgz";
-        sha512 = "UJnjoFsmxfKUdNYdWgOB0mWUypuLvAfQPH1+pyvRJs6euowbFkFC6P13w1l8mJyi3vxYMxc9kld5jZEGRQs6bw==";
-      };
-    };
     "@dabh/diagnostics-2.0.3" = {
       name = "_at_dabh_slash_diagnostics";
       packageName = "@dabh/diagnostics";
@@ -2885,96 +1859,6 @@ let
         sha512 = "VyCpkZzFTHXtKgVO35iKN0sYR10psGpV6SkcSeV4oF7eSYlR8Bl6aQLCzVeFjvESF7mxTmIiI3/XrMobVrtxDA==";
       };
     };
-    "@joplin/fork-htmlparser2-4.1.57" = {
-      name = "_at_joplin_slash_fork-htmlparser2";
-      packageName = "@joplin/fork-htmlparser2";
-      version = "4.1.57";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/fork-htmlparser2/-/fork-htmlparser2-4.1.57.tgz";
-        sha512 = "lB92mcQ13i0n1YXEQQqeNACK9qnrh8uMCTgc80MfvV7R9kh9jSDZ78V4phTw+91v26YhtpMNJB/RwtVyB3VxXw==";
-      };
-    };
-    "@joplin/fork-sax-1.2.61" = {
-      name = "_at_joplin_slash_fork-sax";
-      packageName = "@joplin/fork-sax";
-      version = "1.2.61";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/fork-sax/-/fork-sax-1.2.61.tgz";
-        sha512 = "IH6ZslEsS7ykIuQQ7Mv+bC8AY1me/HSBooZN+s7Ru54B3ahzG1MJwgFMCNJqeG5ZGOM9mJCy25sZR8Xt73fKoQ==";
-      };
-    };
-    "@joplin/fork-uslug-1.0.22" = {
-      name = "_at_joplin_slash_fork-uslug";
-      packageName = "@joplin/fork-uslug";
-      version = "1.0.22";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/fork-uslug/-/fork-uslug-1.0.22.tgz";
-        sha512 = "xS9/sYsQGXMeLGebyeYux4t/0HlFgsjvHes9gF9DpBBhKDdBm2f4nKvc7sGA0J6ZuwVc9Z7oKthsHMbOdoXC4A==";
-      };
-    };
-    "@joplin/htmlpack-3.2.5" = {
-      name = "_at_joplin_slash_htmlpack";
-      packageName = "@joplin/htmlpack";
-      version = "3.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/htmlpack/-/htmlpack-3.2.5.tgz";
-        sha512 = "6pxv89x8Vw0e3KHj/irX1eCTdDIQsuPfdLQPd6TlNZ2b/Jd4OVP9e+YjN8pWckqTxSMwcjR2tIZIF4XNqIsnxw==";
-      };
-    };
-    "@joplin/lib-3.2.5" = {
-      name = "_at_joplin_slash_lib";
-      packageName = "@joplin/lib";
-      version = "3.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/lib/-/lib-3.2.5.tgz";
-        sha512 = "QI+1ltWGg2q8HJ60EHRzB5OJMGCyuoDIFYazpjbDhqQMsDa2ZsW7Monk9OpIIHxesmePKnI/iEvj9gp+1ZH16A==";
-      };
-    };
-    "@joplin/onenote-converter-3.2.5" = {
-      name = "_at_joplin_slash_onenote-converter";
-      packageName = "@joplin/onenote-converter";
-      version = "3.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/onenote-converter/-/onenote-converter-3.2.5.tgz";
-        sha512 = "/Wu93pRt0iJmUY60zesOEjOBqoWjF/SpGmB/9n6mtePzZ7WuanDNIjuT9ToWlsqIzXPcU+mAiO5Hud9CyobNtg==";
-      };
-    };
-    "@joplin/renderer-3.2.5" = {
-      name = "_at_joplin_slash_renderer";
-      packageName = "@joplin/renderer";
-      version = "3.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/renderer/-/renderer-3.2.5.tgz";
-        sha512 = "C0iFp3jtc59p/fqtgcIg1LMAy8f8UpWdGMjCOp0LD0J4Bn3GPHu+phdQljc246pK69ZlnF8BXHF7DINYISdkXQ==";
-      };
-    };
-    "@joplin/turndown-4.0.79" = {
-      name = "_at_joplin_slash_turndown";
-      packageName = "@joplin/turndown";
-      version = "4.0.79";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/turndown/-/turndown-4.0.79.tgz";
-        sha512 = "doFRDn3PgUA6jpVCHFQhvNYlukuralFfV34hOOZ/JxpIhkp7V7VomtVn1Ct0RrFKuqUM5fVle8wG/J/QWPt2iw==";
-      };
-    };
-    "@joplin/turndown-plugin-gfm-1.0.61" = {
-      name = "_at_joplin_slash_turndown-plugin-gfm";
-      packageName = "@joplin/turndown-plugin-gfm";
-      version = "1.0.61";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/turndown-plugin-gfm/-/turndown-plugin-gfm-1.0.61.tgz";
-        sha512 = "m5PNP1OkktlGgmFI7r/HWON/vQA56GCiM1oTWYkY2JFc28Uc8yHj0nT46pahDyU8uRYPj4TXnxLjQzDDJ11i7w==";
-      };
-    };
-    "@joplin/utils-3.2.5" = {
-      name = "_at_joplin_slash_utils";
-      packageName = "@joplin/utils";
-      version = "3.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@joplin/utils/-/utils-3.2.5.tgz";
-        sha512 = "oXIGzaQR6sUv7UxtvT/Bdutz2ET986NYcAn+7FutojI1e3ki7nXuCcNnflZdW9BR/bK5Nby1zuIBk0sBENICsg==";
-      };
-    };
     "@jridgewell/gen-mapping-0.3.8" = {
       name = "_at_jridgewell_slash_gen-mapping";
       packageName = "@jridgewell/gen-mapping";
@@ -3281,15 +2165,6 @@ let
         sha512 = "uSz+elSGzjCMANWa5IlbGczLYPkNI/LeR+cHrgaTqTrTSh9RHhOFA4daD2eRUz6lMtOW+Fnsb+qv7V2Zz8ML0g==";
       };
     };
-    "@npmcli/fs-1.1.1" = {
-      name = "_at_npmcli_slash_fs";
-      packageName = "@npmcli/fs";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz";
-        sha512 = "8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==";
-      };
-    };
     "@npmcli/fs-2.1.2" = {
       name = "_at_npmcli_slash_fs";
       packageName = "@npmcli/fs";
@@ -3335,15 +2210,6 @@ let
         sha512 = "tkYs0OYnzQm6iIRdfy+LcLBjcKuQCeE5YLb8KnrIlutJfheNaPvPpgoFEyEFgbjzl5PLZ3IA/BWAwRU0eHuQDA==";
       };
     };
-    "@npmcli/move-file-1.1.2" = {
-      name = "_at_npmcli_slash_move-file";
-      packageName = "@npmcli/move-file";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz";
-        sha512 = "1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==";
-      };
-    };
     "@npmcli/move-file-2.0.1" = {
       name = "_at_npmcli_slash_move-file";
       packageName = "@npmcli/move-file";
@@ -4370,258 +3236,6 @@ let
         sha512 = "tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==";
       };
     };
-    "@smithy/abort-controller-4.0.1" = {
-      name = "_at_smithy_slash_abort-controller";
-      packageName = "@smithy/abort-controller";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/abort-controller/-/abort-controller-4.0.1.tgz";
-        sha512 = "fiUIYgIgRjMWznk6iLJz35K2YxSLHzLBA/RC6lBrKfQ8fHbPfvk7Pk9UvpKoHgJjI18MnbPuEju53zcVy6KF1g==";
-      };
-    };
-    "@smithy/core-3.1.5" = {
-      name = "_at_smithy_slash_core";
-      packageName = "@smithy/core";
-      version = "3.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/core/-/core-3.1.5.tgz";
-        sha512 = "HLclGWPkCsekQgsyzxLhCQLa8THWXtB5PxyYN+2O6nkyLt550KQKTlbV2D1/j5dNIQapAZM1+qFnpBFxZQkgCA==";
-      };
-    };
-    "@smithy/fetch-http-handler-5.0.1" = {
-      name = "_at_smithy_slash_fetch-http-handler";
-      packageName = "@smithy/fetch-http-handler";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.0.1.tgz";
-        sha512 = "3aS+fP28urrMW2KTjb6z9iFow6jO8n3MFfineGbndvzGZit3taZhKWtTorf+Gp5RpFDDafeHlhfsGlDCXvUnJA==";
-      };
-    };
-    "@smithy/is-array-buffer-4.0.0" = {
-      name = "_at_smithy_slash_is-array-buffer";
-      packageName = "@smithy/is-array-buffer";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.0.0.tgz";
-        sha512 = "saYhF8ZZNoJDTvJBEWgeBccCg+yvp1CX+ed12yORU3NilJScfc6gfch2oVb4QgxZrGUx3/ZJlb+c/dJbyupxlw==";
-      };
-    };
-    "@smithy/middleware-endpoint-4.0.6" = {
-      name = "_at_smithy_slash_middleware-endpoint";
-      packageName = "@smithy/middleware-endpoint";
-      version = "4.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.0.6.tgz";
-        sha512 = "ftpmkTHIFqgaFugcjzLZv3kzPEFsBFSnq1JsIkr2mwFzCraZVhQk2gqN51OOeRxqhbPTkRFj39Qd2V91E/mQxg==";
-      };
-    };
-    "@smithy/middleware-serde-4.0.2" = {
-      name = "_at_smithy_slash_middleware-serde";
-      packageName = "@smithy/middleware-serde";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.0.2.tgz";
-        sha512 = "Sdr5lOagCn5tt+zKsaW+U2/iwr6bI9p08wOkCp6/eL6iMbgdtc2R5Ety66rf87PeohR0ExI84Txz9GYv5ou3iQ==";
-      };
-    };
-    "@smithy/middleware-stack-4.0.1" = {
-      name = "_at_smithy_slash_middleware-stack";
-      packageName = "@smithy/middleware-stack";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.0.1.tgz";
-        sha512 = "dHwDmrtR/ln8UTHpaIavRSzeIk5+YZTBtLnKwDW3G2t6nAupCiQUvNzNoHBpik63fwUaJPtlnMzXbQrNFWssIA==";
-      };
-    };
-    "@smithy/node-config-provider-4.0.1" = {
-      name = "_at_smithy_slash_node-config-provider";
-      packageName = "@smithy/node-config-provider";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.0.1.tgz";
-        sha512 = "8mRTjvCtVET8+rxvmzRNRR0hH2JjV0DFOmwXPrISmTIJEfnCBugpYYGAsCj8t41qd+RB5gbheSQ/6aKZCQvFLQ==";
-      };
-    };
-    "@smithy/node-http-handler-4.0.3" = {
-      name = "_at_smithy_slash_node-http-handler";
-      packageName = "@smithy/node-http-handler";
-      version = "4.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.0.3.tgz";
-        sha512 = "dYCLeINNbYdvmMLtW0VdhW1biXt+PPCGazzT5ZjKw46mOtdgToQEwjqZSS9/EN8+tNs/RO0cEWG044+YZs97aA==";
-      };
-    };
-    "@smithy/property-provider-4.0.1" = {
-      name = "_at_smithy_slash_property-provider";
-      packageName = "@smithy/property-provider";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.0.1.tgz";
-        sha512 = "o+VRiwC2cgmk/WFV0jaETGOtX16VNPp2bSQEzu0whbReqE1BMqsP2ami2Vi3cbGVdKu1kq9gQkDAGKbt0WOHAQ==";
-      };
-    };
-    "@smithy/protocol-http-5.0.1" = {
-      name = "_at_smithy_slash_protocol-http";
-      packageName = "@smithy/protocol-http";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.0.1.tgz";
-        sha512 = "TE4cpj49jJNB/oHyh/cRVEgNZaoPaxd4vteJNB0yGidOCVR0jCw/hjPVsT8Q8FRmj8Bd3bFZt8Dh7xGCT+xMBQ==";
-      };
-    };
-    "@smithy/querystring-builder-4.0.1" = {
-      name = "_at_smithy_slash_querystring-builder";
-      packageName = "@smithy/querystring-builder";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.0.1.tgz";
-        sha512 = "wU87iWZoCbcqrwszsOewEIuq+SU2mSoBE2CcsLwE0I19m0B2gOJr1MVjxWcDQYOzHbR1xCk7AcOBbGFUYOKvdg==";
-      };
-    };
-    "@smithy/querystring-parser-4.0.1" = {
-      name = "_at_smithy_slash_querystring-parser";
-      packageName = "@smithy/querystring-parser";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.0.1.tgz";
-        sha512 = "Ma2XC7VS9aV77+clSFylVUnPZRindhB7BbmYiNOdr+CHt/kZNJoPP0cd3QxCnCFyPXC4eybmyE98phEHkqZ5Jw==";
-      };
-    };
-    "@smithy/shared-ini-file-loader-4.0.1" = {
-      name = "_at_smithy_slash_shared-ini-file-loader";
-      packageName = "@smithy/shared-ini-file-loader";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.0.1.tgz";
-        sha512 = "hC8F6qTBbuHRI/uqDgqqi6J0R4GtEZcgrZPhFQnMhfJs3MnUTGSnR1NSJCJs5VWlMydu0kJz15M640fJlRsIOw==";
-      };
-    };
-    "@smithy/signature-v4-5.0.1" = {
-      name = "_at_smithy_slash_signature-v4";
-      packageName = "@smithy/signature-v4";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.0.1.tgz";
-        sha512 = "nCe6fQ+ppm1bQuw5iKoeJ0MJfz2os7Ic3GBjOkLOPtavbD1ONoyE3ygjBfz2ythFWm4YnRm6OxW+8p/m9uCoIA==";
-      };
-    };
-    "@smithy/smithy-client-4.1.6" = {
-      name = "_at_smithy_slash_smithy-client";
-      packageName = "@smithy/smithy-client";
-      version = "4.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.1.6.tgz";
-        sha512 = "UYDolNg6h2O0L+cJjtgSyKKvEKCOa/8FHYJnBobyeoeWDmNpXjwOAtw16ezyeu1ETuuLEOZbrynK0ZY1Lx9Jbw==";
-      };
-    };
-    "@smithy/types-4.1.0" = {
-      name = "_at_smithy_slash_types";
-      packageName = "@smithy/types";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/types/-/types-4.1.0.tgz";
-        sha512 = "enhjdwp4D7CXmwLtD6zbcDMbo6/T6WtuuKCY49Xxc6OMOmUWlBEBDREsxxgV2LIdeQPW756+f97GzcgAwp3iLw==";
-      };
-    };
-    "@smithy/url-parser-4.0.1" = {
-      name = "_at_smithy_slash_url-parser";
-      packageName = "@smithy/url-parser";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.0.1.tgz";
-        sha512 = "gPXcIEUtw7VlK8f/QcruNXm7q+T5hhvGu9tl63LsJPZ27exB6dtNwvh2HIi0v7JcXJ5emBxB+CJxwaLEdJfA+g==";
-      };
-    };
-    "@smithy/util-base64-4.0.0" = {
-      name = "_at_smithy_slash_util-base64";
-      packageName = "@smithy/util-base64";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.0.0.tgz";
-        sha512 = "CvHfCmO2mchox9kjrtzoHkWHxjHZzaFojLc8quxXY7WAAMAg43nuxwv95tATVgQFNDwd4M9S1qFzj40Ul41Kmg==";
-      };
-    };
-    "@smithy/util-body-length-browser-4.0.0" = {
-      name = "_at_smithy_slash_util-body-length-browser";
-      packageName = "@smithy/util-body-length-browser";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.0.0.tgz";
-        sha512 = "sNi3DL0/k64/LO3A256M+m3CDdG6V7WKWHdAiBBMUN8S3hK3aMPhwnPik2A/a2ONN+9doY9UxaLfgqsIRg69QA==";
-      };
-    };
-    "@smithy/util-buffer-from-4.0.0" = {
-      name = "_at_smithy_slash_util-buffer-from";
-      packageName = "@smithy/util-buffer-from";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.0.0.tgz";
-        sha512 = "9TOQ7781sZvddgO8nxueKi3+yGvkY35kotA0Y6BWRajAv8jjmigQ1sBwz0UX47pQMYXJPahSKEKYFgt+rXdcug==";
-      };
-    };
-    "@smithy/util-config-provider-4.0.0" = {
-      name = "_at_smithy_slash_util-config-provider";
-      packageName = "@smithy/util-config-provider";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.0.0.tgz";
-        sha512 = "L1RBVzLyfE8OXH+1hsJ8p+acNUSirQnWQ6/EgpchV88G6zGBTDPdXiiExei6Z1wR2RxYvxY/XLw6AMNCCt8H3w==";
-      };
-    };
-    "@smithy/util-endpoints-3.0.1" = {
-      name = "_at_smithy_slash_util-endpoints";
-      packageName = "@smithy/util-endpoints";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.0.1.tgz";
-        sha512 = "zVdUENQpdtn9jbpD9SCFK4+aSiavRb9BxEtw9ZGUR1TYo6bBHbIoi7VkrFQ0/RwZlzx0wRBaRmPclj8iAoJCLA==";
-      };
-    };
-    "@smithy/util-hex-encoding-4.0.0" = {
-      name = "_at_smithy_slash_util-hex-encoding";
-      packageName = "@smithy/util-hex-encoding";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.0.0.tgz";
-        sha512 = "Yk5mLhHtfIgW2W2WQZWSg5kuMZCVbvhFmC7rV4IO2QqnZdbEFPmQnCcGMAX2z/8Qj3B9hYYNjZOhWym+RwhePw==";
-      };
-    };
-    "@smithy/util-middleware-4.0.1" = {
-      name = "_at_smithy_slash_util-middleware";
-      packageName = "@smithy/util-middleware";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.0.1.tgz";
-        sha512 = "HiLAvlcqhbzhuiOa0Lyct5IIlyIz0PQO5dnMlmQ/ubYM46dPInB+3yQGkfxsk6Q24Y0n3/JmcA1v5iEhmOF5mA==";
-      };
-    };
-    "@smithy/util-stream-4.1.2" = {
-      name = "_at_smithy_slash_util-stream";
-      packageName = "@smithy/util-stream";
-      version = "4.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.1.2.tgz";
-        sha512 = "44PKEqQ303d3rlQuiDpcCcu//hV8sn+u2JBo84dWCE0rvgeiVl0IlLMagbU++o0jCWhYCsHaAt9wZuZqNe05Hw==";
-      };
-    };
-    "@smithy/util-uri-escape-4.0.0" = {
-      name = "_at_smithy_slash_util-uri-escape";
-      packageName = "@smithy/util-uri-escape";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.0.0.tgz";
-        sha512 = "77yfbCbQMtgtTylO9itEAdpPXSog3ZxMe09AEhm0dU0NLTalV70ghDZFR+Nfi1C60jnJoh/Re4090/DuZh2Omg==";
-      };
-    };
-    "@smithy/util-utf8-4.0.0" = {
-      name = "_at_smithy_slash_util-utf8";
-      packageName = "@smithy/util-utf8";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.0.0.tgz";
-        sha512 = "b+zebfKCfRdgNJDknHCob3O7FpeYQN6ZG6YLExMcasDHsCXlsXCEuiPZeLnJLpwa5dvPetGlnGCiMHuLwGvFow==";
-      };
-    };
     "@socket.io/component-emitter-3.1.2" = {
       name = "_at_socket.io_slash_component-emitter";
       packageName = "@socket.io/component-emitter";
@@ -5090,15 +3704,6 @@ let
         sha512 = "OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==";
       };
     };
-    "@tootallnate/once-1.1.2" = {
-      name = "_at_tootallnate_slash_once";
-      packageName = "@tootallnate/once";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tootallnate/once/-/once-1.1.2.tgz";
-        sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw==";
-      };
-    };
     "@tootallnate/once-2.0.0" = {
       name = "_at_tootallnate_slash_once";
       packageName = "@tootallnate/once";
@@ -5522,15 +4127,6 @@ let
         sha512 = "CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow==";
       };
     };
-    "@types/nanoid-3.0.0" = {
-      name = "_at_types_slash_nanoid";
-      packageName = "@types/nanoid";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/nanoid/-/nanoid-3.0.0.tgz";
-        sha512 = "UXitWSmXCwhDmAKe7D3hNQtQaHeHt5L8LO1CB8GF8jlYVzOv5cBWDNqiJ+oPEWrWei3i3dkZtHY/bUtd0R/uOQ==";
-      };
-    };
     "@types/nlcst-1.0.4" = {
       name = "_at_types_slash_nlcst";
       packageName = "@types/nlcst";
@@ -6557,15 +5153,6 @@ let
         sha512 = "4B/qKCfeE/ODUaAUpSwfzazo5x29WD4r3vXiWsB7I2mSDAihwEqKO+g8GELZUQSSAo5e1XTYh3ZVfLyxBc12nA==";
       };
     };
-    "adm-zip-0.5.16" = {
-      name = "adm-zip";
-      packageName = "adm-zip";
-      version = "0.5.16";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.16.tgz";
-        sha512 = "TGw5yVi4saajsSEgz25grObGHEUaDrniwvA2qwSC060KfqGPdglhvPMA2lPIoxs3PQIItj2iag35fONcQqgUaQ==";
-      };
-    };
     "after-0.8.2" = {
       name = "after";
       packageName = "after";
@@ -6791,15 +5378,6 @@ let
         sha512 = "/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==";
       };
     };
-    "ansi-escape-sequences-4.1.0" = {
-      name = "ansi-escape-sequences";
-      packageName = "ansi-escape-sequences";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-4.1.0.tgz";
-        sha512 = "dzW9kHxH011uBsidTXd14JXgzye/YLb2LzeKZ4bsgl/Knwx8AtbSFkkGxagdNOoh0DlqHCmfiEjWKBaqjOanVw==";
-      };
-    };
     "ansi-escapes-1.4.0" = {
       name = "ansi-escapes";
       packageName = "ansi-escapes";
@@ -7151,15 +5729,6 @@ let
         sha512 = "Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==";
       };
     };
-    "are-we-there-yet-3.0.1" = {
-      name = "are-we-there-yet";
-      packageName = "are-we-there-yet";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/are-we-there-yet/-/are-we-there-yet-3.0.1.tgz";
-        sha512 = "QZW4EDmGwlYur0Yyf/b2uGucHQMa8aFUP7eu9ddR73vvhFyt4V0Vl3QHPcTNJ8l6qYOBdxgXdnBXQrHilfRQBg==";
-      };
-    };
     "arg-4.1.0" = {
       name = "arg";
       packageName = "arg";
@@ -7259,24 +5828,6 @@ let
         sha512 = "sKpyeERZ02v1FeCZT8lrfJq5u6goHCtpTAzPwJYe7c8SPFOboNjNg1vz2L4VTn9T4PQxEx13TbXLmYUcS6Ug7Q==";
       };
     };
-    "array-back-2.0.0" = {
-      name = "array-back";
-      packageName = "array-back";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-back/-/array-back-2.0.0.tgz";
-        sha512 = "eJv4pLLufP3g5kcZry0j6WXpIbzYw9GUB4mVJZno9wfwiBxbizTnHCw3VJb07cBihbFX48Y7oSrW9y+gt4glyw==";
-      };
-    };
-    "array-back-3.1.0" = {
-      name = "array-back";
-      packageName = "array-back";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-back/-/array-back-3.1.0.tgz";
-        sha512 = "TkuxA4UCOvxuDK6NZYXCalszEzj+TLszyASooky+i742l9TqsOdYCMJJupxRic61hwquNtppB3hgcuq9SVSH1Q==";
-      };
-    };
     "array-buffer-byte-length-1.0.2" = {
       name = "array-buffer-byte-length";
       packageName = "array-buffer-byte-length";
@@ -7700,15 +6251,6 @@ let
         sha512 = "cWMaNwUJnf37C/S5TfCkk/15MwbPRwVYALA2jtjkbHjCmAPiDXyNJy2q3p1KAZzDLHAWyarUWSujUoHR4pEgrA==";
       };
     };
-    "async-mutex-0.5.0" = {
-      name = "async-mutex";
-      packageName = "async-mutex";
-      version = "0.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.5.0.tgz";
-        sha512 = "1A94B18jkJ3DYq284ohPxoXbfTA5HsQ7/Mf4DEhcyLx3Bz27Rh59iScbB6EPiP+B+joue6YCxcMXSbFC1tZKwA==";
-      };
-    };
     "async-sema-3.1.1" = {
       name = "async-sema";
       packageName = "async-sema";
@@ -7817,15 +6359,6 @@ let
         sha512 = "XyzCoWMQ693g6iLFqgeVl6DTMKZIIc0zlzwLvP47az7nRgob8JLiqJDbx1ljKqBxKesRqq9igjTMzOKh3JkvUA==";
       };
     };
-    "aws-sdk-2.1340.0" = {
-      name = "aws-sdk";
-      packageName = "aws-sdk";
-      version = "2.1340.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1340.0.tgz";
-        sha512 = "5amtFHWmJz+x0mKcwKJUBm2nKOJjO0MzzuVhrHFnmDWsUqP1VUsTxENoRdGitwoCH/o+MttLmf1/+lvgkYzbiw==";
-      };
-    };
     "aws-sdk-2.1472.0" = {
       name = "aws-sdk";
       packageName = "aws-sdk";
@@ -8006,15 +6539,6 @@ let
         sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==";
       };
     };
-    "base64-stream-1.0.0" = {
-      name = "base64-stream";
-      packageName = "base64-stream";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/base64-stream/-/base64-stream-1.0.0.tgz";
-        sha512 = "BQQZftaO48FcE1Kof9CmXMFaAdqkcNorgc8CxesZv9nMbbTF1EFyQe89UOuh//QMmdtfUDXyO8rgUalemL5ODA==";
-      };
-    };
     "base64id-2.0.0" = {
       name = "base64id";
       packageName = "base64id";
@@ -8879,15 +7403,6 @@ let
         sha512 = "k0KL0aWZuBt2lrxrcASWDfwOLMnodeQjodT/1SxEQAXsHANgo6ZC/VEaSEHCXt7aSTZ4/4H5LKa+tBXmW7Vtvw==";
       };
     };
-    "builtin-modules-3.3.0" = {
-      name = "builtin-modules";
-      packageName = "builtin-modules";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-3.3.0.tgz";
-        sha512 = "zhaCDicdLuWN5UbN5IMnFqNMhNfo919sH85y2/ea+5Yg9TsTkeZxpL+JLbp6cgYFS4sRLp3YV4S6yDuqVWHYOw==";
-      };
-    };
     "builtin-status-codes-3.0.0" = {
       name = "builtin-status-codes";
       packageName = "builtin-status-codes";
@@ -9005,15 +7520,6 @@ let
         sha512 = "b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==";
       };
     };
-    "cacache-15.3.0" = {
-      name = "cacache";
-      packageName = "cacache";
-      version = "15.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz";
-        sha512 = "VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==";
-      };
-    };
     "cacache-16.1.3" = {
       name = "cacache";
       packageName = "cacache";
@@ -9185,15 +7691,6 @@ let
         sha512 = "P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==";
       };
     };
-    "camel-case-3.0.0" = {
-      name = "camel-case";
-      packageName = "camel-case";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camel-case/-/camel-case-3.0.0.tgz";
-        sha512 = "+MbKztAYHXPr1jNTSKQF52VpcFjwY5RkR7fxksV8Doo4KAYc5Fl4UJRgthBbTmEx8C54DqahhbLJkDwjI3PI/w==";
-      };
-    };
     "camel-case-4.1.2" = {
       name = "camel-case";
       packageName = "camel-case";
@@ -9212,15 +7709,6 @@ let
         sha512 = "DLIsRzJVBQu72meAKPkWQOLcujdXT32hwdfnkI1frSiSRMK1MofjKHf+MEx0SB6fjEFXL8fBDv1dKymBlOp4Qw==";
       };
     };
-    "camelcase-4.1.0" = {
-      name = "camelcase";
-      packageName = "camelcase";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz";
-        sha512 = "FxAv7HpHrXbh3aPo4o2qxHay2lkLY3x5Mw3KeE4KQE8ysVfziWeRZDwcjauvwBSGEC/nXUPzZy8zeh4HokqOnw==";
-      };
-    };
     "camelcase-5.3.1" = {
       name = "camelcase";
       packageName = "camelcase";
@@ -9644,15 +8132,6 @@ let
         sha512 = "+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==";
       };
     };
-    "chroma-js-2.6.0" = {
-      name = "chroma-js";
-      packageName = "chroma-js";
-      version = "2.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chroma-js/-/chroma-js-2.6.0.tgz";
-        sha512 = "BLHvCB9s8Z1EV4ethr6xnkl/P2YRFOGqfgvuMG/MyCbZPrTA+NeiByY6XvgF0zP4/2deU2CXnWyMa3zu1LqQ3A==";
-      };
-    };
     "chrome-dgram-3.0.6" = {
       name = "chrome-dgram";
       packageName = "chrome-dgram";
@@ -9770,15 +8249,6 @@ let
         sha512 = "qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==";
       };
     };
-    "clean-css-4.2.4" = {
-      name = "clean-css";
-      packageName = "clean-css";
-      version = "4.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clean-css/-/clean-css-4.2.4.tgz";
-        sha512 = "EJUDT7nDVFDvaQgAo2G/PJvxmp1o/c6iXLbswsBbUFXi1Nr+AjA2cKmfbKDMjMvzEe75g3P6JkaDDAKk96A85A==";
-      };
-    };
     "clean-stack-2.2.0" = {
       name = "clean-stack";
       packageName = "clean-stack";
@@ -10013,15 +8483,6 @@ let
         sha512 = "5mOlNS0mhX0707P2I0aZ2V/cmHUEO/fL7VFLqszkhUsxt7RwnmrInf/eEQKlf5GzvYeHIjT+Ov1HRfNmymlG0w==";
       };
     };
-    "cliss-0.0.2" = {
-      name = "cliss";
-      packageName = "cliss";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cliss/-/cliss-0.0.2.tgz";
-        sha512 = "6rj9pgdukjT994Md13JCUAgTk91abAKrygL9sAvmHY4F6AKMOV8ccGaxhUUfcBuyg3sundWnn3JE0Mc9W6ZYqw==";
-      };
-    };
     "cliui-5.0.0" = {
       name = "cliui";
       packageName = "cliui";
@@ -10265,15 +8726,6 @@ let
         sha512 = "aBl7dZI9ENN6fUGC7mWpMTPNHmWUSNan9tuWN6ahh5ZLNk9baLJOnSMlrQkHcrfFgz2/RigjUVAjdx36VcemKA==";
       };
     };
-    "color-4.2.3" = {
-      name = "color";
-      packageName = "color";
-      version = "4.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/color/-/color-4.2.3.tgz";
-        sha512 = "1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==";
-      };
-    };
     "color-convert-1.9.3" = {
       name = "color-convert";
       packageName = "color-convert";
@@ -10418,15 +8870,6 @@ let
         sha512 = "LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==";
       };
     };
-    "command-line-usage-4.1.0" = {
-      name = "command-line-usage";
-      packageName = "command-line-usage";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/command-line-usage/-/command-line-usage-4.1.0.tgz";
-        sha512 = "MxS8Ad995KpdAC0Jopo/ovGIroV/m0KHwzKfXxKag6FHOkGsH8/lv5yjgablcRxCJJC0oJeUMuO/gmaq+Wq46g==";
-      };
-    };
     "commander-10.0.1" = {
       name = "commander";
       packageName = "commander";
@@ -10580,15 +9023,6 @@ let
         sha512 = "pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==";
       };
     };
-    "compare-versions-6.1.1" = {
-      name = "compare-versions";
-      packageName = "compare-versions";
-      version = "6.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/compare-versions/-/compare-versions-6.1.1.tgz";
-        sha512 = "4hm4VPpIecmlg59CHXnRDnqGplJFrbLG4aFEl5vl6cK1u76ws3LLvX7ikFnTDl5vo39sjWD6AaDPYodJp/NNHg==";
-      };
-    };
     "component-bind-1.0.0" = {
       name = "component-bind";
       packageName = "component-bind";
@@ -11526,15 +9960,6 @@ let
         sha512 = "0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==";
       };
     };
-    "cssstyle-4.3.0" = {
-      name = "cssstyle";
-      packageName = "cssstyle";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cssstyle/-/cssstyle-4.3.0.tgz";
-        sha512 = "6r0NiY0xizYqfBvWp1G7WXJ06/bZyrk7Dc6PHql82C/pKGUTKu4yAX4Y8JPamb1ob9nBKuxWzCGTRuGwU3yxJQ==";
-      };
-    };
     "csstype-3.1.3" = {
       name = "csstype";
       packageName = "csstype";
@@ -11616,15 +10041,6 @@ let
         sha512 = "p6JFxJc3M4OTD2li2qaHkDCw9SfMw82Ldr6OC9Je1aXiGfhx2W8p3GaoeaGrPJTUN9NirTM/KTxHWMUdR1rsUg==";
       };
     };
-    "cwise-compiler-1.1.3" = {
-      name = "cwise-compiler";
-      packageName = "cwise-compiler";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cwise-compiler/-/cwise-compiler-1.1.3.tgz";
-        sha512 = "WXlK/m+Di8DMMcCjcWr4i+XzcQra9eCdXIJrgh4TUgh0pIS/yJduLxS9JgefsHJ/YVLdgPtXm9r62W92MvanEQ==";
-      };
-    };
     "cycle-1.0.3" = {
       name = "cycle";
       packageName = "cycle";
@@ -11886,24 +10302,6 @@ let
         sha512 = "7hvf7/GW8e86rW0ptuwS3OcBGDjIi6SZva7hCyWC0yYry2cOPmLIjXAUHI6DK2HsnwJd9ifmt57i8eV2n4YNpw==";
       };
     };
-    "data-urls-5.0.0" = {
-      name = "data-urls";
-      packageName = "data-urls";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/data-urls/-/data-urls-5.0.0.tgz";
-        sha512 = "ZYP5VBHshaDAiVZxjbRVcFJpc+4xGgT0bK3vzy1HLN8jTO975HEbuYzZJcHoQEY5K1a0z8YayJkyVETa08eNTg==";
-      };
-    };
-    "datauri-4.1.0" = {
-      name = "datauri";
-      packageName = "datauri";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/datauri/-/datauri-4.1.0.tgz";
-        sha512 = "y17kh32+I82G+ED9MNWFkZiP/Cq/vO1hN9+tSZsT9C9qn3NrvcBnh7crSepg0AQPge1hXx2Ca44s1FRdv0gFWA==";
-      };
-    };
     "date-fns-1.30.1" = {
       name = "date-fns";
       packageName = "date-fns";
@@ -11940,15 +10338,6 @@ let
         sha512 = "GODcnWq3YGoTnygPfi02ygEiRxqUxpJwuRHjdhJYuxpcZmDq4rjBiXYmbCCzStxo176ixfLT6i4NPwQooRySnw==";
       };
     };
-    "dayjs-1.11.12" = {
-      name = "dayjs";
-      packageName = "dayjs";
-      version = "1.11.12";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.12.tgz";
-        sha512 = "Rt2g+nTbLlDWZTwwrIXjy9MeiZmSDI375FvZs72ngxx8PDC6YXOeR3q5LAuPzjZQxhiWdRKac7RKV+YyQYfYIg==";
-      };
-    };
     "dayjs-1.11.13" = {
       name = "dayjs";
       packageName = "dayjs";
@@ -12003,15 +10392,6 @@ let
         sha512 = "pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==";
       };
     };
-    "debug-4.3.1" = {
-      name = "debug";
-      packageName = "debug";
-      version = "4.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz";
-        sha512 = "doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==";
-      };
-    };
     "debug-4.3.2" = {
       name = "debug";
       packageName = "debug";
@@ -12102,15 +10482,6 @@ let
         sha512 = "WiPxgEirIV0/eIOMcnFBA3/IJZAZqKnwAwWyvvdi4lsr1WCN22nhdf/3db3DoZcUjTV2SqfzIwNyp6y2xs3nmg==";
       };
     };
-    "decimal.js-10.5.0" = {
-      name = "decimal.js";
-      packageName = "decimal.js";
-      version = "10.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz";
-        sha512 = "8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw==";
-      };
-    };
     "decode-named-character-reference-1.1.0" = {
       name = "decode-named-character-reference";
       packageName = "decode-named-character-reference";
@@ -12246,15 +10617,6 @@ let
         sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==";
       };
     };
-    "deepmerge-2.2.1" = {
-      name = "deepmerge";
-      packageName = "deepmerge";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz";
-        sha512 = "R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==";
-      };
-    };
     "deepmerge-4.3.1" = {
       name = "deepmerge";
       packageName = "deepmerge";
@@ -12669,15 +11031,6 @@ let
         sha512 = "PJWHUb1RFevKCwaFA9RlG5tCd+FO5iRh9A8HEtkmBH2Li03iJriB6m6JIN4rGz3K3JLawI7/veA1xzRKP6ISBw==";
       };
     };
-    "diff-match-patch-1.0.5" = {
-      name = "diff-match-patch";
-      packageName = "diff-match-patch";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/diff-match-patch/-/diff-match-patch-1.0.5.tgz";
-        sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw==";
-      };
-    };
     "diff2html-3.4.51" = {
       name = "diff2html";
       packageName = "diff2html";
@@ -12822,15 +11175,6 @@ let
         sha512 = "VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==";
       };
     };
-    "dom-serializer-2.0.0" = {
-      name = "dom-serializer";
-      packageName = "dom-serializer";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz";
-        sha512 = "wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==";
-      };
-    };
     "dom-storage-2.1.0" = {
       name = "dom-storage";
       packageName = "dom-storage";
@@ -12903,15 +11247,6 @@ let
         sha512 = "GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==";
       };
     };
-    "domhandler-5.0.3" = {
-      name = "domhandler";
-      packageName = "domhandler";
-      version = "5.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz";
-        sha512 = "cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==";
-      };
-    };
     "domino-2.1.6" = {
       name = "domino";
       packageName = "domino";
@@ -12948,15 +11283,6 @@ let
         sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==";
       };
     };
-    "domutils-3.1.0" = {
-      name = "domutils";
-      packageName = "domutils";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz";
-        sha512 = "H78uMmQtI2AhgDJjWeQmHwJJ2bLPD3GMmO7Zja/ZZh84wkm+4ut+IUnUdRa8uCGX88DiVx1j6FRe1XfxEgjEZA==";
-      };
-    };
     "domutils-3.2.2" = {
       name = "domutils";
       packageName = "domutils";
@@ -13344,15 +11670,6 @@ let
         sha512 = "b52zmWqBwv9juk6lKaTdYxRQSnpsnT58Sj/x6fE8fZWcsNd43gAPXUbtjLKJvVlPS9FFNCN6nB9Vh1xipnCzXw==";
       };
     };
-    "emphasize-1.5.0" = {
-      name = "emphasize";
-      packageName = "emphasize";
-      version = "1.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/emphasize/-/emphasize-1.5.0.tgz";
-        sha512 = "7iCAsVoMYjRo+3DziH6szDxEL3h10dbuhD/aDKlcH0nzStbn4Yb3zWVaHivGtH5TsqZsTIl94Dr80OqRYcAlAQ==";
-      };
-    };
     "enabled-2.0.0" = {
       name = "enabled";
       packageName = "enabled";
@@ -14829,15 +13146,6 @@ let
         sha512 = "Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==";
       };
     };
-    "fast-xml-parser-3.21.1" = {
-      name = "fast-xml-parser";
-      packageName = "fast-xml-parser";
-      version = "3.21.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-3.21.1.tgz";
-        sha512 = "FTFVjYoBOZTJekiUsawGsSYV9QL0A+zDYCRj7y34IO6Jg+2IMYEtQa+bbictpdpV8dHxXywqU7C0gRDEOFtBFg==";
-      };
-    };
     "fast-xml-parser-4.1.2" = {
       name = "fast-xml-parser";
       packageName = "fast-xml-parser";
@@ -14883,15 +13191,6 @@ let
         sha512 = "GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==";
       };
     };
-    "fault-1.0.4" = {
-      name = "fault";
-      packageName = "fault";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fault/-/fault-1.0.4.tgz";
-        sha512 = "CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA==";
-      };
-    };
     "fault-2.0.1" = {
       name = "fault";
       packageName = "fault";
@@ -15189,15 +13488,6 @@ let
         sha512 = "YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==";
       };
     };
-    "filter-obj-1.1.0" = {
-      name = "filter-obj";
-      packageName = "filter-obj";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz";
-        sha512 = "8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==";
-      };
-    };
     "finalhandler-1.1.0" = {
       name = "finalhandler";
       packageName = "finalhandler";
@@ -15477,15 +13767,6 @@ let
         sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw==";
       };
     };
-    "follow-redirects-1.15.6" = {
-      name = "follow-redirects";
-      packageName = "follow-redirects";
-      version = "1.15.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.6.tgz";
-        sha512 = "wWN62YITEaOpSK584EZXJafH1AGpO8RVgElfkuXbTOrPX4fIfOyEpW/CsiNd8JdYrAoOvafRTOEnvsO++qCqFA==";
-      };
-    };
     "follow-redirects-1.15.9" = {
       name = "follow-redirects";
       packageName = "follow-redirects";
@@ -15495,15 +13776,6 @@ let
         sha512 = "gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==";
       };
     };
-    "font-awesome-filetypes-2.1.0" = {
-      name = "font-awesome-filetypes";
-      packageName = "font-awesome-filetypes";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/font-awesome-filetypes/-/font-awesome-filetypes-2.1.0.tgz";
-        sha512 = "U6hi14GRjfZFIWsTNyVmCBuHyPhiizWEKVbaQqHipKQv3rA1l1PNvmKulzpqxonFnQMToty5ZhfWbc/0IjLDGA==";
-      };
-    };
     "for-each-0.3.5" = {
       name = "for-each";
       packageName = "for-each";
@@ -15513,24 +13785,6 @@ let
         sha512 = "dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==";
       };
     };
-    "for-each-property-0.0.4" = {
-      name = "for-each-property";
-      packageName = "for-each-property";
-      version = "0.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/for-each-property/-/for-each-property-0.0.4.tgz";
-        sha512 = "xYs28PM0CKXETFzuGC6ZooH0voZlsSDZwidJcy92flQJi3PK7i3gZx23xHXCPOaD4zmet3bDo+wS7E7SujrlCw==";
-      };
-    };
-    "for-each-property-deep-0.0.3" = {
-      name = "for-each-property-deep";
-      packageName = "for-each-property-deep";
-      version = "0.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/for-each-property-deep/-/for-each-property-deep-0.0.3.tgz";
-        sha512 = "qzP8QkODWVVRPpWiBZacSbBl67cTTWoBfxMG0wE46AsS1yl7qv05sGN+dHvD4s4tnvl/goe6Sp4qBI+rlVBgNg==";
-      };
-    };
     "for-in-1.0.2" = {
       name = "for-in";
       packageName = "for-in";
@@ -15603,15 +13857,6 @@ let
         sha512 = "1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==";
       };
     };
-    "form-data-4.0.0" = {
-      name = "form-data";
-      packageName = "form-data";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz";
-        sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==";
-      };
-    };
     "form-data-4.0.2" = {
       name = "form-data";
       packageName = "form-data";
@@ -15729,15 +13974,6 @@ let
         sha512 = "kSxoARUDn4F2RPXX48UXnaFKwVU7Ivd/6qpzZL29MCDmr9sTvybv4gFCp+qaI4fM9m0z9fgz/yJvi56GAz+BZg==";
       };
     };
-    "fs-extra-0.26.7" = {
-      name = "fs-extra";
-      packageName = "fs-extra";
-      version = "0.26.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-0.26.7.tgz";
-        sha512 = "waKu+1KumRhYv8D8gMRCKJGAMI9pRnPuEb1mvgYD0f7wBscg+h6bW4FDTmEZhB9VKxvoTtxW+Y7bnIlB7zja6Q==";
-      };
-    };
     "fs-extra-0.6.4" = {
       name = "fs-extra";
       packageName = "fs-extra";
@@ -15765,15 +14001,6 @@ let
         sha512 = "0rcTq621PD5jM/e0a3EJoGC/1TC5ZBCERW82LQuwfGnCa1V8w7dpYH1yNu+SLb6E5dkeCBzKEyLGlFrnr+dUyw==";
       };
     };
-    "fs-extra-11.2.0" = {
-      name = "fs-extra";
-      packageName = "fs-extra";
-      version = "11.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz";
-        sha512 = "PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==";
-      };
-    };
     "fs-extra-11.3.0" = {
       name = "fs-extra";
       packageName = "fs-extra";
@@ -15936,15 +14163,6 @@ let
         sha512 = "+5J6MS/5XksCuXq++uFRsnUd7Ovu1XenbeuIuNRJxYWjgQbPuFhT14lAvsWfqfAmnwluf1OwMjz39HjfLPci0Q==";
       };
     };
-    "gauge-4.0.4" = {
-      name = "gauge";
-      packageName = "gauge";
-      version = "4.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gauge/-/gauge-4.0.4.tgz";
-        sha512 = "f9m+BEN5jkg6a0fZjleidjN51VE1X+mPFQ2DJ0uv1V39oCLCbsGe6yjbBnp7eK7z/+GAon99a3nHuqbuuthyPg==";
-      };
-    };
     "gaze-1.1.3" = {
       name = "gaze";
       packageName = "gaze";
@@ -16089,15 +14307,6 @@ let
         sha512 = "sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==";
       };
     };
-    "get-prototype-chain-1.0.1" = {
-      name = "get-prototype-chain";
-      packageName = "get-prototype-chain";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-prototype-chain/-/get-prototype-chain-1.0.1.tgz";
-        sha512 = "2m7WZ0jveIg/dAbCbpUxEToaJ8Dmti5EkgDP8YM3UpHUT6SAORjE2odP8XQGNVGXMHi8q8cCCoy3HTByTaTVTw==";
-      };
-    };
     "get-proxy-2.1.0" = {
       name = "get-proxy";
       packageName = "get-proxy";
@@ -16764,15 +14973,6 @@ let
         sha512 = "tdcqOOpwArNjEr0gNQKCXwaNCWnQJrog14nJNQPeemcLnXQUUGrsCWpWkVKt46zLjcS6/KGoayeJfHHyPDlvwA==";
       };
     };
-    "growly-1.3.0" = {
-      name = "growly";
-      packageName = "growly";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz";
-        sha512 = "+xGQY0YyAWCnqy7Cd++hc2JqMYzlm0dG30Jd0beaA64sROr8C4nt8Yc9V5Ro3avlSUDTN0ulqP/VBKi1/lLygw==";
-      };
-    };
     "grunt-known-options-2.0.0" = {
       name = "grunt-known-options";
       packageName = "grunt-known-options";
@@ -17286,24 +15486,6 @@ let
         sha512 = "s/SIX6yp/5S1p8aC/NRDC1fwEb+myGIfp8/TzZz0rtAv8fzsdX7vGl3Q1TrXCsczFq8DI3CBFBCySPClfBSdbg==";
       };
     };
-    "highlight.js-11.10.0" = {
-      name = "highlight.js";
-      packageName = "highlight.js";
-      version = "11.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-11.10.0.tgz";
-        sha512 = "SYVnVFswQER+zu1laSya563s+F8VDGt7o35d4utbamowvUNLLMovFqwCLSocpZTz3MgaSRA1IbqRWZv97dtErQ==";
-      };
-    };
-    "highlight.js-9.12.0" = {
-      name = "highlight.js";
-      packageName = "highlight.js";
-      version = "9.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/highlight.js/-/highlight.js-9.12.0.tgz";
-        sha512 = "qNnYpBDO/FQwYVur1+sQBQw7v0cxso1nOYLklqWh6af8ROwwTVoII5+kf/BVa8354WL4ad6rURHYGUXCbD9mMg==";
-      };
-    };
     "hmac-drbg-1.0.1" = {
       name = "hmac-drbg";
       packageName = "hmac-drbg";
@@ -17394,24 +15576,6 @@ let
         sha512 = "XH8iezBSZgVw2jegu96pUfF1Zv0VZ/iXjb7L5yE3F7mn7/bdhf4qeniXjO0wQWeefe433rhOsazNKLxM+XMI9w==";
       };
     };
-    "hpagent-1.2.0" = {
-      name = "hpagent";
-      packageName = "hpagent";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hpagent/-/hpagent-1.2.0.tgz";
-        sha512 = "A91dYTeIB6NoXG+PxTQpCCDDnfHsW9kc06Lvpu1TEe9gnd6ZFeiBoRO9JvzEv6xK7EX97/dUE8g/vBMTqTS3CA==";
-      };
-    };
-    "html-encoding-sniffer-4.0.0" = {
-      name = "html-encoding-sniffer";
-      packageName = "html-encoding-sniffer";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-4.0.0.tgz";
-        sha512 = "Y22oTqIU4uuPgEemfz7NDJz6OeKf12Lsu+QC+s3BVpda64lTiMYCyGwg5ki4vFxkMwQdeZDl2adZoqUgdFuTgQ==";
-      };
-    };
     "html-entities-1.4.0" = {
       name = "html-entities";
       packageName = "html-entities";
@@ -17421,15 +15585,6 @@ let
         sha512 = "8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==";
       };
     };
-    "html-minifier-4.0.0" = {
-      name = "html-minifier";
-      packageName = "html-minifier";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/html-minifier/-/html-minifier-4.0.0.tgz";
-        sha512 = "aoGxanpFPLg7MkIl/DDFYtb0iWz7jMFGqFhvEDZga6/4QTjneiD8I/NXL1x5aaoCp7FSIT6h/OhykDdPsbtMig==";
-      };
-    };
     "html-tags-3.3.1" = {
       name = "html-tags";
       packageName = "html-tags";
@@ -17592,15 +15747,6 @@ let
         sha512 = "qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==";
       };
     };
-    "http-proxy-agent-4.0.1" = {
-      name = "http-proxy-agent";
-      packageName = "http-proxy-agent";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-4.0.1.tgz";
-        sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg==";
-      };
-    };
     "http-proxy-agent-5.0.0" = {
       name = "http-proxy-agent";
       packageName = "http-proxy-agent";
@@ -17889,15 +16035,6 @@ let
         sha512 = "T4gbf83A4NH95zvhVYZc+qWocBBGlpzUXLPGurJggw/WIOwicfXJChLDP/iBZnN5WqROSu5Bm3hhle4z8a8YGQ==";
       };
     };
-    "image-data-uri-2.0.1" = {
-      name = "image-data-uri";
-      packageName = "image-data-uri";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/image-data-uri/-/image-data-uri-2.0.1.tgz";
-        sha512 = "BZh721F2Q5TwBdwpiqrBrHEdj8daj8KuMZK/DOCyqQlz1CqFhhuZWbK5ZCUnAvFJr8LaKHTaWl9ja3/a3DC2Ew==";
-      };
-    };
     "image-q-4.0.0" = {
       name = "image-q";
       packageName = "image-q";
@@ -17907,15 +16044,6 @@ let
         sha512 = "PfJGVgIfKQJuq3s0tTDOKtztksibuUEbJQIYT3by6wctQo+Rdlh7ef4evJ5NCdxY4CfMbvFkocEwbl4BF8RlJw==";
       };
     };
-    "image-size-1.0.0" = {
-      name = "image-size";
-      packageName = "image-size";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/image-size/-/image-size-1.0.0.tgz";
-        sha512 = "JLJ6OwBfO1KcA+TvJT+v8gbE6iWbj24LyDNFgFEN0lzegn6cC6a/p3NIDaepMsJjQjlUWqIC7wJv8lBFxPNjcw==";
-      };
-    };
     "imap-0.8.19" = {
       name = "imap";
       packageName = "imap";
@@ -17943,15 +16071,6 @@ let
         sha512 = "0tQyTytUaIUskpv5j5L5ZeQuEjYDl9QIekwDUisdqpAM81OZjBaEIriW7hoiRLaLNxj1fXE8e1yx5JaCGrrE7A==";
       };
     };
-    "immer-7.0.15" = {
-      name = "immer";
-      packageName = "immer";
-      version = "7.0.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/immer/-/immer-7.0.15.tgz";
-        sha512 = "yM7jo9+hvYgvdCQdqvhCNRRio0SCXc8xDPzA25SvKWa7b1WVPjLwQs1VYU5JPXjcJPTqAa5NP5dqpORGYBQ2AA==";
-      };
-    };
     "immer-9.0.21" = {
       name = "immer";
       packageName = "immer";
@@ -18411,51 +16530,6 @@ let
         sha512 = "becs5gzcHwPrlHawscYkyQ/ShiOiosrXPhA5RVZ3qyWH4aWdD52RnMfXq/dwQXciHwiieD8aIPwdIWYv6eL+sQ==";
       };
     };
-    "inspect-function-0.3.4" = {
-      name = "inspect-function";
-      packageName = "inspect-function";
-      version = "0.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inspect-function/-/inspect-function-0.3.4.tgz";
-        sha512 = "s0RsbJqK/sNZ+U1mykGoTickog3ea1A9Qk4mXniogOBu4PgkkZ56elScO7QC/r8D94lhGmJ2NyDI1ipOA/uq/g==";
-      };
-    };
-    "inspect-parameters-declaration-0.0.10" = {
-      name = "inspect-parameters-declaration";
-      packageName = "inspect-parameters-declaration";
-      version = "0.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inspect-parameters-declaration/-/inspect-parameters-declaration-0.0.10.tgz";
-        sha512 = "L8/Bvt9iDXQTZ63xY5/MAyvzz+FagR/qGh1kIXvUpsno3AAE0Z95d6QO51zrcMGaEGpwh/57idfMxTxbvRmytg==";
-      };
-    };
-    "inspect-parameters-declaration-0.0.8" = {
-      name = "inspect-parameters-declaration";
-      packageName = "inspect-parameters-declaration";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inspect-parameters-declaration/-/inspect-parameters-declaration-0.0.8.tgz";
-        sha512 = "W4QzN1LgFmasKOM+NoLlDd2OAZM3enNZlVUOXoGQKmYBDFgxoPDOyebF55ALaf8avyM9TavNwibXxg347RrzCg==";
-      };
-    };
-    "inspect-parameters-declaration-0.0.9" = {
-      name = "inspect-parameters-declaration";
-      packageName = "inspect-parameters-declaration";
-      version = "0.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inspect-parameters-declaration/-/inspect-parameters-declaration-0.0.9.tgz";
-        sha512 = "c3jrKKA1rwwrsjdGMAo2hFWV0vNe3/RKHxpE/OBt41LP3ynOVI1qmgxpZYK5SQu3jtWCyaho8L7AZzCjJ4mEUw==";
-      };
-    };
-    "inspect-property-0.0.6" = {
-      name = "inspect-property";
-      packageName = "inspect-property";
-      version = "0.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inspect-property/-/inspect-property-0.0.6.tgz";
-        sha512 = "LgjHkRl9W6bj2n+kWrAOgvCYPTYt+LanE4rtd/vKNq6yEb+SvVV7UTLzoSPpDX6/U1cAz7VfqPr+lPAIz7wHaQ==";
-      };
-    };
     "inspect-with-kind-1.0.5" = {
       name = "inspect-with-kind";
       packageName = "inspect-with-kind";
@@ -18528,15 +16602,6 @@ let
         sha512 = "j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ==";
       };
     };
-    "iota-array-1.0.0" = {
-      name = "iota-array";
-      packageName = "iota-array";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/iota-array/-/iota-array-1.0.0.tgz";
-        sha512 = "pZ2xT+LOHckCatGQ3DcG/a+QuEqvoxqkiL7tvE8nn3uuu+f6i1TtpB5/FtWFbxUuVr5PZCx8KskuGatbJDXOWA==";
-      };
-    };
     "ip-1.1.9" = {
       name = "ip";
       packageName = "ip";
@@ -18564,15 +16629,6 @@ let
         sha512 = "zHtQzGojZXTwZTHQqra+ETKd4Sn3vgi7uBmlPoXVWZqYvuKmtI0l/VZTjqGmJY9x88GGOaZ9+G9ES8hC4T4X8g==";
       };
     };
-    "ip-regex-4.3.0" = {
-      name = "ip-regex";
-      packageName = "ip-regex";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz";
-        sha512 = "B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==";
-      };
-    };
     "ip-set-1.0.2" = {
       name = "ip-set";
       packageName = "ip-set";
@@ -19374,15 +17430,6 @@ let
         sha512 = "Yu68oeXJ7LeWNmZ3Zov/xg/oDBnBK2RNxwYY1ilNJX+tKKZqgPK+qOn/Gs9jEu66KDY9Netf5XLKNGzas/vPfQ==";
       };
     };
-    "is-potential-custom-element-name-1.0.1" = {
-      name = "is-potential-custom-element-name";
-      packageName = "is-potential-custom-element-name";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz";
-        sha512 = "bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==";
-      };
-    };
     "is-primitive-2.0.0" = {
       name = "is-primitive";
       packageName = "is-primitive";
@@ -19734,15 +17781,6 @@ let
         sha512 = "/kppl+R+LO5VmhYSEWARUFjodS25D68gvj8W7z0I7OWhUla5xWu8KL6CtB2V0R6yqhnRgbcaREMr4EEM6htLPQ==";
       };
     };
-    "is2-2.0.9" = {
-      name = "is2";
-      packageName = "is2";
-      version = "2.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is2/-/is2-2.0.9.tgz";
-        sha512 = "rZkHeBn9Zzq52sd9IUIV3a5mfwBY+o2HePMh0wkGBM4z4qjvy2GwVxQ6nNXSfw6MmVP6gf1QIlWjiOavhM3x5g==";
-      };
-    };
     "is64bit-2.0.0" = {
       name = "is64bit";
       packageName = "is64bit";
@@ -20076,15 +18114,6 @@ let
         sha512 = "4bYVV3aAMtDTTu4+xsDYa6sy9GyJ69/amsu9sYF2zqjiEoZA5xJi3BrfX3uY+/IekIu7MwdObdbDWpoZdBv3/A==";
       };
     };
-    "jsdom-24.1.1" = {
-      name = "jsdom";
-      packageName = "jsdom";
-      version = "24.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsdom/-/jsdom-24.1.1.tgz";
-        sha512 = "5O1wWV99Jhq4DV7rCLIoZ/UIhyQeDR7wHVyZAHAshbrvZsLs+Xzz7gtwnlJTJDjleiTKh54F4dXrX70vJQTyJQ==";
-      };
-    };
     "jsep-1.4.0" = {
       name = "jsep";
       packageName = "jsep";
@@ -20400,15 +18429,6 @@ let
         sha512 = "KbsDJNRfRPF5v49tMNf9sqyyGqGLBcz1v5kZT01kG5ns5mQSltwxCKVmUzVKtEinkUnTDtSrp6ngWpV7Xw0ZlA==";
       };
     };
-    "jsonfile-2.4.0" = {
-      name = "jsonfile";
-      packageName = "jsonfile";
-      version = "2.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz";
-        sha512 = "PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw==";
-      };
-    };
     "jsonfile-3.0.1" = {
       name = "jsonfile";
       packageName = "jsonfile";
@@ -20661,15 +18681,6 @@ let
         sha512 = "fwGvRXWjaSzMed8iQHkZH41wvaoq+3tIhuIbkqBBYFuuJtWoDWqgCYTADGPqLyaLX4Ct8aP5NtAxCaxk4cfcCg==";
       };
     };
-    "katex-0.16.11" = {
-      name = "katex";
-      packageName = "katex";
-      version = "0.16.11";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/katex/-/katex-0.16.11.tgz";
-        sha512 = "RQrI8rlHY92OLf3rho/Ts8i/XvjgguEjOkO1BEXcU3N8BqPpSzBNwV/G0Ukr+P/l3ivvJUE/Fa/CwbS6HesGNQ==";
-      };
-    };
     "keep-alive-agent-0.0.1" = {
       name = "keep-alive-agent";
       packageName = "keep-alive-agent";
@@ -20688,15 +18699,6 @@ let
         sha512 = "HjorDJFNhnM4SicvaUXac0X77NiskggxJdesG72+O5zBKpSqKFCrqmndKVqpu3pFqkla0St6uGk8Ju0sCurrmg==";
       };
     };
-    "keytar-7.9.0" = {
-      name = "keytar";
-      packageName = "keytar";
-      version = "7.9.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/keytar/-/keytar-7.9.0.tgz";
-        sha512 = "VPD8mtVtm5JNtA2AErl6Chp06JBfy7diFQ7TQQhdpWOl6MrCRB+eRbvAZUsbGQS9kiMq0coJsy0W0vHpDCkWsQ==";
-      };
-    };
     "keyv-3.1.0" = {
       name = "keyv";
       packageName = "keyv";
@@ -20742,15 +18744,6 @@ let
         sha512 = "dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==";
       };
     };
-    "klaw-1.3.1" = {
-      name = "klaw";
-      packageName = "klaw";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz";
-        sha512 = "TED5xi9gGQjGpNnvRWknrwAB1eL5GciPfVFOt3Vk1OJCVDQbzuSfrF3hkUQKlsgKrG1F+0t5W0m+Fje1jIt8rw==";
-      };
-    };
     "klaw-3.0.0" = {
       name = "klaw";
       packageName = "klaw";
@@ -20859,15 +18852,6 @@ let
         sha512 = "Y+CjUfLmIpoUCCRl0ub4smrYtGGr5AOa2AKOaWelGHOGz33X/Y/KizefGqbkwfz44+cnq/+9habclf8vOmu2LA==";
       };
     };
-    "lazyness-1.2.0" = {
-      name = "lazyness";
-      packageName = "lazyness";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lazyness/-/lazyness-1.2.0.tgz";
-        sha512 = "KenL6EFbwxBwRxG93t0gcUyi0Nw0Ub31FJKN1laA4UscdkL1K1AxUd0gYZdcLU3v+x+wcFi4uQKS5hL+fk500g==";
-      };
-    };
     "lazystream-1.0.1" = {
       name = "lazystream";
       packageName = "lazystream";
@@ -21012,15 +18996,6 @@ let
         sha512 = "GnAl/knGn+i1U/wjBz3akz2stz+HrHLsxMwHQGofCDfPvlf+gDKN58UtfmUquTY4/MXeE2x7k19KQmeoZi94Iw==";
       };
     };
-    "linkify-it-4.0.1" = {
-      name = "linkify-it";
-      packageName = "linkify-it";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/linkify-it/-/linkify-it-4.0.1.tgz";
-        sha512 = "C7bfi1UZmoj8+PQx22XyeXCuBlokoyWQL5pWSP+EI6nzRylyThouddufc2c1NDIcP9k5agmN9fLpA7VNJfIiqw==";
-      };
-    };
     "linkify-it-5.0.0" = {
       name = "linkify-it";
       packageName = "linkify-it";
@@ -21678,24 +19653,6 @@ let
         sha512 = "Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==";
       };
     };
-    "lodash.padend-4.6.1" = {
-      name = "lodash.padend";
-      packageName = "lodash.padend";
-      version = "4.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.padend/-/lodash.padend-4.6.1.tgz";
-        sha512 = "sOQs2aqGpbl27tmCS1QNZA09Uqp01ZzWfDUoD+xzTii0E7dSQfRKcRetFwa+uXaxaqL+TKm7CgD2JdKP7aZBSw==";
-      };
-    };
-    "lodash.repeat-4.1.0" = {
-      name = "lodash.repeat";
-      packageName = "lodash.repeat";
-      version = "4.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.repeat/-/lodash.repeat-4.1.0.tgz";
-        sha512 = "eWsgQW89IewS95ZOcr15HHCX6FVDxq3f2PNUIng3fyzsPev9imFQxIYdFZ6crl8L56UR6ZlGDLcEb3RZsCSSqw==";
-      };
-    };
     "lodash.restparam-3.6.1" = {
       name = "lodash.restparam";
       packageName = "lodash.restparam";
@@ -22038,15 +19995,6 @@ let
         sha512 = "neJAj8GwF0e8EpycYIDFqEPcx9Qz4GUho20jWFR7YiFeXzF1YMLdxB36PypcTSPMA+4+LvgyMacYhlr18Zlymw==";
       };
     };
-    "lower-case-1.1.4" = {
-      name = "lower-case";
-      packageName = "lower-case";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lower-case/-/lower-case-1.1.4.tgz";
-        sha512 = "2Fgx1Ycm599x+WGpIYwJOvsjmXFzTSc34IwDWALRA/8AopUKAVPwfJ+h5+f85BCp0PWmmJcWzEpxOpoXycMpdA==";
-      };
-    };
     "lower-case-2.0.2" = {
       name = "lower-case";
       packageName = "lower-case";
@@ -22083,15 +20031,6 @@ let
         sha512 = "ozCC6gdQ+glXOQsveKD0YsDy8DSQFjDTz4zyzEHNV5+JP5D62LmfDZ6o1cycFx9ouG940M5dE8C8CTewdj2YWQ==";
       };
     };
-    "lowlight-1.9.2" = {
-      name = "lowlight";
-      packageName = "lowlight";
-      version = "1.9.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lowlight/-/lowlight-1.9.2.tgz";
-        sha512 = "Ek18ElVCf/wF/jEm1b92gTnigh94CtBNWiZ2ad+vTgW7cTmQxUY3I98BjHK68gZAJEWmybGBZgx9qv3QxLQB/Q==";
-      };
-    };
     "lru-2.0.1" = {
       name = "lru";
       packageName = "lru";
@@ -22192,24 +20131,6 @@ let
         sha512 = "sNPKHvyjVf7gyjwS4xGTaW/mCnF8wnjtifKBEhxfZ7E/S8tQ0rssrwGNn6q8JH/ohItJfSQp9mBtQYuTlH5QnA==";
       };
     };
-    "magicli-0.0.5" = {
-      name = "magicli";
-      packageName = "magicli";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/magicli/-/magicli-0.0.5.tgz";
-        sha512 = "wZbMtnl2v1b+Jp3xlqA9FU/O4I6YhGXR8xSY/eU2+gDAvut/F+W3gl4qs61iL4LELC7jqSAE6aAD5668EbmQHA==";
-      };
-    };
-    "magicli-0.0.8" = {
-      name = "magicli";
-      packageName = "magicli";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/magicli/-/magicli-0.0.8.tgz";
-        sha512 = "x/eBenweAHF+DsYy172sK4doRxZl0yrJnfxhLJiN7H6hPM3Ya0PfI6uBZshZ3ScFFSQD7HXgBqMdbnXKEZsO1g==";
-      };
-    };
     "magnet-uri-2.0.1" = {
       name = "magnet-uri";
       packageName = "magnet-uri";
@@ -22291,15 +20212,6 @@ let
         sha512 = "QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ==";
       };
     };
-    "make-fetch-happen-9.1.0" = {
-      name = "make-fetch-happen";
-      packageName = "make-fetch-happen";
-      version = "9.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz";
-        sha512 = "+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==";
-      };
-    };
     "make-iterator-1.0.1" = {
       name = "make-iterator";
       packageName = "make-iterator";
@@ -22363,15 +20275,6 @@ let
         sha512 = "4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w==";
       };
     };
-    "markdown-it-13.0.2" = {
-      name = "markdown-it";
-      packageName = "markdown-it";
-      version = "13.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it/-/markdown-it-13.0.2.tgz";
-        sha512 = "FtwnEuuK+2yVU7goGn/MJ0WBZMM9ZPgU9spqlFs7/A/pDIUNSOQZhUgOqYCficIuR2QaFnrt8LHqBWsbTAoI5w==";
-      };
-    };
     "markdown-it-14.1.0" = {
       name = "markdown-it";
       packageName = "markdown-it";
@@ -22390,24 +20293,6 @@ let
         sha512 = "GcRz3AWTqSUphY3vsUqQSFMbgR38a4Lh3GWlHRh/7MRwz8mcu9n2IO7HOh+bXHrR9kOPDl5RNCaEsrneb+xhHQ==";
       };
     };
-    "markdown-it-abbr-1.0.4" = {
-      name = "markdown-it-abbr";
-      packageName = "markdown-it-abbr";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-abbr/-/markdown-it-abbr-1.0.4.tgz";
-        sha512 = "ZeA4Z4SaBbYysZap5iZcxKmlPL6bYA8grqhzJIHB1ikn7njnzaP8uwbtuXc4YXD5LicI4/2Xmc0VwmSiFV04gg==";
-      };
-    };
-    "markdown-it-anchor-5.3.0" = {
-      name = "markdown-it-anchor";
-      packageName = "markdown-it-anchor";
-      version = "5.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-5.3.0.tgz";
-        sha512 = "/V1MnLL/rgJ3jkMWo84UR+K+jF1cxNG1a+KwqeXqTIJ+jtA8aWSHuigx8lTzauiIjBDbwF3NcWQMotd0Dm39jA==";
-      };
-    };
     "markdown-it-anchor-8.6.7" = {
       name = "markdown-it-anchor";
       packageName = "markdown-it-anchor";
@@ -22417,15 +20302,6 @@ let
         sha512 = "FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==";
       };
     };
-    "markdown-it-deflist-2.1.0" = {
-      name = "markdown-it-deflist";
-      packageName = "markdown-it-deflist";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-deflist/-/markdown-it-deflist-2.1.0.tgz";
-        sha512 = "3OuqoRUlSxJiuQYu0cWTLHNhhq2xtoSFqsZK8plANg91+RJQU1ziQ6lA2LzmFAEes18uPBsHZpcX6We5l76Nzg==";
-      };
-    };
     "markdown-it-emoji-1.4.0" = {
       name = "markdown-it-emoji";
       packageName = "markdown-it-emoji";
@@ -22435,33 +20311,6 @@ let
         sha512 = "QCz3Hkd+r5gDYtS2xsFXmBYrgw6KuWcJZLCEkdfAuwzZbShCmCfta+hwAMq4NX/4xPzkSHduMKgMkkPUJxSXNg==";
       };
     };
-    "markdown-it-emoji-2.0.2" = {
-      name = "markdown-it-emoji";
-      packageName = "markdown-it-emoji";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-emoji/-/markdown-it-emoji-2.0.2.tgz";
-        sha512 = "zLftSaNrKuYl0kR5zm4gxXjHaOI3FAOEaloKmRA5hijmJZvSjmxcokOLlzycb/HXlUFWzXqpIEoyEMCE4i9MvQ==";
-      };
-    };
-    "markdown-it-expand-tabs-1.0.13" = {
-      name = "markdown-it-expand-tabs";
-      packageName = "markdown-it-expand-tabs";
-      version = "1.0.13";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-expand-tabs/-/markdown-it-expand-tabs-1.0.13.tgz";
-        sha512 = "ODpk98FWkGIq2vkwm2NOLt4G6TRgy3M9eTa9SFm06pUyOd0zjjYAwkhsjiCDU42pzKuz0ChiwBO0utuOj3LNOA==";
-      };
-    };
-    "markdown-it-footnote-3.0.3" = {
-      name = "markdown-it-footnote";
-      packageName = "markdown-it-footnote";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-footnote/-/markdown-it-footnote-3.0.3.tgz";
-        sha512 = "YZMSuCGVZAjzKMn+xqIco9d1cLGxbELHZ9do/TSYVzraooV8ypsppKNmUJ0fVH5ljkCInQAtFpm8Rb3eXSrt5w==";
-      };
-    };
     "markdown-it-github-headings-1.1.2" = {
       name = "markdown-it-github-headings";
       packageName = "markdown-it-github-headings";
@@ -22471,51 +20320,6 @@ let
         sha512 = "8haIwpAx87DQHcEtzkfsWv2hxg4jOvow6/nJKAMQ2wYRMZQTIfJm9VzrDkqw72Bb4YXBmI0u3GA/3MdXVL/x5g==";
       };
     };
-    "markdown-it-ins-4.0.0" = {
-      name = "markdown-it-ins";
-      packageName = "markdown-it-ins";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-ins/-/markdown-it-ins-4.0.0.tgz";
-        sha512 = "sWbjK2DprrkINE4oYDhHdCijGT+MIDhEupjSHLXe5UXeVr5qmVxs/nTUVtgi0Oh/qtF+QKV0tNWDhQBEPxiMew==";
-      };
-    };
-    "markdown-it-mark-3.0.1" = {
-      name = "markdown-it-mark";
-      packageName = "markdown-it-mark";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-mark/-/markdown-it-mark-3.0.1.tgz";
-        sha512 = "HyxjAu6BRsdt6Xcv6TKVQnkz/E70TdGXEFHRYBGLncRE9lBFwDNLVtFojKxjJWgJ+5XxUwLaHXy+2sGBbDn+4A==";
-      };
-    };
-    "markdown-it-multimd-table-4.2.3" = {
-      name = "markdown-it-multimd-table";
-      packageName = "markdown-it-multimd-table";
-      version = "4.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-multimd-table/-/markdown-it-multimd-table-4.2.3.tgz";
-        sha512 = "KepCr2OMJqm7IT6sOIbuqHGe+NERhgy66XMrc5lo6dHW7oaPzMDtYwR1EGwK16/blb6mCSg4jqityOe0o/H7HA==";
-      };
-    };
-    "markdown-it-sub-1.0.0" = {
-      name = "markdown-it-sub";
-      packageName = "markdown-it-sub";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-sub/-/markdown-it-sub-1.0.0.tgz";
-        sha512 = "z2Rm/LzEE1wzwTSDrI+FlPEveAAbgdAdPhdWarq/ZGJrGW/uCQbKAnhoCsE4hAbc3SEym26+W2z/VQB0cQiA9Q==";
-      };
-    };
-    "markdown-it-sup-2.0.0" = {
-      name = "markdown-it-sup";
-      packageName = "markdown-it-sup";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-sup/-/markdown-it-sup-2.0.0.tgz";
-        sha512 = "5VgmdKlkBd8sgXuoDoxMpiU+BiEt3I49GItBzzw7Mxq9CxvnhE/k09HFli09zgfFDRixDQDfDxi0mgBCXtaTvA==";
-      };
-    };
     "markdown-it-task-checkbox-1.0.6" = {
       name = "markdown-it-task-checkbox";
       packageName = "markdown-it-task-checkbox";
@@ -22525,15 +20329,6 @@ let
         sha512 = "7pxkHuvqTOu3iwVGmDPeYjQg+AIS9VQxzyLP9JCg9lBjgPAJXGEkChK6A2iFuj3tS0GV3HG2u5AMNhcQqwxpJw==";
       };
     };
-    "markdown-it-toc-done-right-4.2.0" = {
-      name = "markdown-it-toc-done-right";
-      packageName = "markdown-it-toc-done-right";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/markdown-it-toc-done-right/-/markdown-it-toc-done-right-4.2.0.tgz";
-        sha512 = "UB/IbzjWazwTlNAX0pvWNlJS8NKsOQ4syrXZQ/C72j+jirrsjVRT627lCaylrKJFBQWfRsPmIVQie8x38DEhAQ==";
-      };
-    };
     "markdown-table-3.0.4" = {
       name = "markdown-table";
       packageName = "markdown-table";
@@ -22597,15 +20392,6 @@ let
         sha512 = "T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==";
       };
     };
-    "md5-file-5.0.0" = {
-      name = "md5-file";
-      packageName = "md5-file";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/md5-file/-/md5-file-5.0.0.tgz";
-        sha512 = "xbEFXCYVWrSx/gEKS1VPlg84h/4L20znVIulKw6kMfmBUAZNAnF00eczz9ICMl+/hjQGo5KSXRxbL/47X3rmMw==";
-      };
-    };
     "md5.js-1.3.5" = {
       name = "md5.js";
       packageName = "md5.js";
@@ -23767,15 +21553,6 @@ let
         sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==";
       };
     };
-    "mimer-2.0.2" = {
-      name = "mimer";
-      packageName = "mimer";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mimer/-/mimer-2.0.2.tgz";
-        sha512 = "izxvjsB7Ur5HrTbPu6VKTrzxSMBFBqyZQc6dWlZNQ4/wAvf886fD4lrjtFd8IQ8/WmZKdxKjUtqFFNaj3hQ52g==";
-      };
-    };
     "mimic-fn-1.2.0" = {
       name = "mimic-fn";
       packageName = "mimic-fn";
@@ -24037,15 +21814,6 @@ let
         sha512 = "D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==";
       };
     };
-    "minipass-fetch-1.4.1" = {
-      name = "minipass-fetch";
-      packageName = "minipass-fetch";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-1.4.1.tgz";
-        sha512 = "CGH1eblLq26Y15+Azk7ey4xh0J/XfJfrCox5LDJiKqI2Q2iwOLOKrlmIaODiSQS8d18jalF6y2K2ePUm0CmShw==";
-      };
-    };
     "minipass-fetch-2.1.2" = {
       name = "minipass-fetch";
       packageName = "minipass-fetch";
@@ -24370,15 +22138,6 @@ let
         sha512 = "7ZxrUybYv9NonoXgwoOqtStIu18D1c3eFZj27hqgf5kBrBF8Q+tE8V0MW8dKM5QLkQPh1JhhbKgHLY9kifov4Q==";
       };
     };
-    "mustache-4.2.0" = {
-      name = "mustache";
-      packageName = "mustache";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mustache/-/mustache-4.2.0.tgz";
-        sha512 = "71ippSywq5Yb7/tVYyGbkBggbU8H3u5Rz56fH60jGFgr8uHwxs+aSKeqmluIVzM0m0kB7xQjKS6qPfd0b2ZoqQ==";
-      };
-    };
     "mute-stdout-2.0.0" = {
       name = "mute-stdout";
       packageName = "mute-stdout";
@@ -24469,15 +22228,6 @@ let
         sha512 = "DANghxFkS1plDdRsX0X9pm0Z6SJNN6gBdtXfanwoZ8hooC5gosGFSBGRYHUVPz1asKA/kMRqDRdHrluZ61SpBQ==";
       };
     };
-    "nanoid-3.3.7" = {
-      name = "nanoid";
-      packageName = "nanoid";
-      version = "3.3.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz";
-        sha512 = "eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==";
-      };
-    };
     "nanoid-3.3.9" = {
       name = "nanoid";
       packageName = "nanoid";
@@ -24559,24 +22309,6 @@ let
         sha512 = "zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==";
       };
     };
-    "ndarray-1.0.19" = {
-      name = "ndarray";
-      packageName = "ndarray";
-      version = "1.0.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ndarray/-/ndarray-1.0.19.tgz";
-        sha512 = "B4JHA4vdyZU30ELBw3g7/p9bZupyew5a7tX1Y/gGeF2hafrPaQZhgrGQfsvgfYbgdFZjYwuEcnaobeM/WMW+HQ==";
-      };
-    };
-    "ndarray-pack-1.2.1" = {
-      name = "ndarray-pack";
-      packageName = "ndarray-pack";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ndarray-pack/-/ndarray-pack-1.2.1.tgz";
-        sha512 = "51cECUJMT0rUZNQa09EoKsnFeDL4x2dHRT0VR5U2H5ZgEcm95ZDWcMA5JShroXjHOejmAD/fg8+H+OvUnVXz2g==";
-      };
-    };
     "nedb-1.8.0" = {
       name = "nedb";
       packageName = "nedb";
@@ -24704,15 +22436,6 @@ let
         sha512 = "CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==";
       };
     };
-    "nextgen-events-1.5.3" = {
-      name = "nextgen-events";
-      packageName = "nextgen-events";
-      version = "1.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.5.3.tgz";
-        sha512 = "P6qw6kenNXP+J9XlKJNi/MNHUQ+Lx5K8FEcSfX7/w8KJdZan5+BB5MKzuNgL2RTjHG1Svg8SehfseVEp8zAqwA==";
-      };
-    };
     "nice-try-1.0.5" = {
       name = "nice-try";
       packageName = "nice-try";
@@ -24785,15 +22508,6 @@ let
         sha512 = "63mVyqaqt0cmn2VcI2aH6kxe1rLAmSROqHMA0i4qqg1tidkfExgpb0FGMikMCn86mw5dFtBtEANfmSSK7TjNHw==";
       };
     };
-    "no-case-2.3.2" = {
-      name = "no-case";
-      packageName = "no-case";
-      version = "2.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz";
-        sha512 = "rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ==";
-      };
-    };
     "no-case-3.0.4" = {
       name = "no-case";
       packageName = "no-case";
@@ -24848,15 +22562,6 @@ let
         sha512 = "fthTTsi8CxaBXMaBAD7ST2uylwvsnYxh2PfaScwpMhos6KlSFajXQPcM4ogNE1q2s3Lbz9GCGqeIHC+C6OZnKg==";
       };
     };
-    "node-bitmap-0.0.1" = {
-      name = "node-bitmap";
-      packageName = "node-bitmap";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-bitmap/-/node-bitmap-0.0.1.tgz";
-        sha512 = "Jx5lPaaLdIaOsj2mVLWMWulXF6GQVdyLvNSxmiYCvZ8Ma2hfKX0POoR2kgKOqz+oFsRreq0yYZjQ2wjE9VNzCA==";
-      };
-    };
     "node-color-readline-1.0.1" = {
       name = "node-color-readline";
       packageName = "node-color-readline";
@@ -24947,15 +22652,6 @@ let
         sha512 = "/+7TuHKnBpnMvUQnsYEb0JOozDZqarQbfNuSGLXIjhStMT0fbw7IdSqWgopOP5xhRZE+lsbIvAHcekddruPZgQ==";
       };
     };
-    "node-gyp-8.4.1" = {
-      name = "node-gyp";
-      packageName = "node-gyp";
-      version = "8.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp/-/node-gyp-8.4.1.tgz";
-        sha512 = "olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==";
-      };
-    };
     "node-gyp-build-4.8.4" = {
       name = "node-gyp-build";
       packageName = "node-gyp-build";
@@ -24974,15 +22670,6 @@ let
         sha512 = "k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==";
       };
     };
-    "node-notifier-10.0.1" = {
-      name = "node-notifier";
-      packageName = "node-notifier";
-      version = "10.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-notifier/-/node-notifier-10.0.1.tgz";
-        sha512 = "YX7TSyDukOZ0g+gmzjB6abKu+hTGvO8+8+gIFDsRCU2t8fLV/P2unmt+LGFaIa4y64aX98Qksa97rgz4vMNeLQ==";
-      };
-    };
     "node-object-hash-2.3.10" = {
       name = "node-object-hash";
       packageName = "node-object-hash";
@@ -24992,15 +22679,6 @@ let
         sha512 = "jY5dPJzw6NHd/KPSfPKJ+IHoFS81/tJ43r34ZeNMXGzCOM8jwQDCD12HYayKIB6MuznrnqIYy2e891NA2g0ibA==";
       };
     };
-    "node-persist-3.1.3" = {
-      name = "node-persist";
-      packageName = "node-persist";
-      version = "3.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-persist/-/node-persist-3.1.3.tgz";
-        sha512 = "CaFv+kSZtsc+VeDRldK1yR47k1vPLBpzYB9re2z7LIwITxwBtljMq3s8VQnnr+x3E8pQfHbc5r2IyJsBLJhtXg==";
-      };
-    };
     "node-readfiles-0.2.0" = {
       name = "node-readfiles";
       packageName = "node-readfiles";
@@ -25019,15 +22697,6 @@ let
         sha512 = "xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==";
       };
     };
-    "node-rsa-1.1.1" = {
-      name = "node-rsa";
-      packageName = "node-rsa";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-rsa/-/node-rsa-1.1.1.tgz";
-        sha512 = "Jd4cvbJMryN21r5HgxQOpMEqv+ooke/korixNNK3mGqfGJmy0M77WDDzo/05969+OkMy3XW1UuZsSmW9KQm7Fw==";
-      };
-    };
     "node-static-0.7.11" = {
       name = "node-static";
       packageName = "node-static";
@@ -25433,15 +23102,6 @@ let
         sha512 = "AqZtDUWOMKs1G/8lwylVjrdYgqA4d9nu8hc+0gzRxlDb1I10+FHBGMXs6aiQHFdCUUlqH99MUMuLfzWDNDtfxw==";
       };
     };
-    "npmlog-6.0.2" = {
-      name = "npmlog";
-      packageName = "npmlog";
-      version = "6.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/npmlog/-/npmlog-6.0.2.tgz";
-        sha512 = "/vBvz5Jfr9dT/aFWd0FIRf+T/Q2WBsLENygUaFUqstqsycmZAP/t5BvFJTK0viFmSUxiUKTUplWy5vt+rvKIxg==";
-      };
-    };
     "nssocket-0.6.0" = {
       name = "nssocket";
       packageName = "nssocket";
@@ -25514,15 +23174,6 @@ let
         sha512 = "qaKRmtYPZ5qdw4jWJD6bxEf1FJEqllJrwxCLIm0sQU/A7v2/czigzOb+C2uSiFsa9lBUzeH7M1oK+Q+OLxL3kA==";
       };
     };
-    "nwsapi-2.2.18" = {
-      name = "nwsapi";
-      packageName = "nwsapi";
-      version = "2.2.18";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.18.tgz";
-        sha512 = "p1TRH/edngVEHVbwqWnxUViEmq5znDvyB+Sik5cmuLpGOIfDf/39zLiq3swPF8Vakqn+gvNiOQAZu8djYlQILA==";
-      };
-    };
     "oas-kit-common-1.0.8" = {
       name = "oas-kit-common";
       packageName = "oas-kit-common";
@@ -25658,15 +23309,6 @@ let
         sha512 = "NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==";
       };
     };
-    "object-to-arguments-0.0.8" = {
-      name = "object-to-arguments";
-      packageName = "object-to-arguments";
-      version = "0.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-to-arguments/-/object-to-arguments-0.0.8.tgz";
-        sha512 = "BfWfuAwuhdH1bhMG5EG90WE/eckkBhBvnke8eSEkCDXoLE9Jk5JwYGTbCx1ehGwV48HvBkn62VukPBdlMUOY9w==";
-      };
-    };
     "object-treeify-1.1.33" = {
       name = "object-treeify";
       packageName = "object-treeify";
@@ -26477,15 +24119,6 @@ let
         sha512 = "4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==";
       };
     };
-    "param-case-2.1.1" = {
-      name = "param-case";
-      packageName = "param-case";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/param-case/-/param-case-2.1.1.tgz";
-        sha512 = "eQE845L6ot89sk2N8liD8HAuH4ca6Vvr7VWAWwt7+kvvG5aBcPmmphQ68JsEG2qa9n1TykS2DLeMt363AAH8/w==";
-      };
-    };
     "parent-module-1.0.1" = {
       name = "parent-module";
       packageName = "parent-module";
@@ -26747,15 +24380,6 @@ let
         sha512 = "Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==";
       };
     };
-    "parse5-7.2.1" = {
-      name = "parse5";
-      packageName = "parse5";
-      version = "7.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz";
-        sha512 = "BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==";
-      };
-    };
     "parseqs-0.0.6" = {
       name = "parseqs";
       packageName = "parseqs";
@@ -27296,15 +24920,6 @@ let
         sha512 = "0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==";
       };
     };
-    "pipe-functions-1.3.0" = {
-      name = "pipe-functions";
-      packageName = "pipe-functions";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pipe-functions/-/pipe-functions-1.3.0.tgz";
-        sha512 = "6Rtbp7criZRwedlvWbUYxqlqJoAlMvYHo2UcRWq79xZ54vZcaNHpVBOcWkX3ErT2aUA69tv+uiv4zKJbhD/Wgg==";
-      };
-    };
     "pixelmatch-4.0.2" = {
       name = "pixelmatch";
       packageName = "pixelmatch";
@@ -27431,15 +25046,6 @@ let
         sha512 = "NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==";
       };
     };
-    "pngjs-6.0.0" = {
-      name = "pngjs";
-      packageName = "pngjs";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pngjs/-/pngjs-6.0.0.tgz";
-        sha512 = "TRzzuFRRmEoSW/p1KVAmiOgPco2Irlah+bGFCeNfJXxxYGwSw7YwAOAcd7X28K/m5bjBWKsC29KyoMfHbypayg==";
-      };
-    };
     "pnpm-sync-lib-0.2.9" = {
       name = "pnpm-sync-lib";
       packageName = "pnpm-sync-lib";
@@ -27638,15 +25244,6 @@ let
         sha512 = "b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A==";
       };
     };
-    "prebuild-install-7.1.3" = {
-      name = "prebuild-install";
-      packageName = "prebuild-install";
-      version = "7.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.3.tgz";
-        sha512 = "8Mf2cbV7x1cXPUILADGI3wuhfqWvtiLA1iclTDbFRZkgRQS0NqsPZphna9V+HyTEadheuPmjaJMsbzKQFOzLug==";
-      };
-    };
     "precond-0.2.3" = {
       name = "precond";
       packageName = "precond";
@@ -28214,15 +25811,6 @@ let
         sha512 = "qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==";
       };
     };
-    "query-string-7.1.3" = {
-      name = "query-string";
-      packageName = "query-string";
-      version = "7.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz";
-        sha512 = "hh2WYhq4fi8+b+/2Kg9CEge4fDPvHS534aOOvOZeQ3+Vf2mCFsaFBYj0i+iXcAq6I9Vzp5fjMFBlONvayDC1qg==";
-      };
-    };
     "querystring-0.2.0" = {
       name = "querystring";
       packageName = "querystring";
@@ -28259,15 +25847,6 @@ let
         sha512 = "FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==";
       };
     };
-    "queue-6.0.2" = {
-      name = "queue";
-      packageName = "queue";
-      version = "6.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz";
-        sha512 = "iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==";
-      };
-    };
     "queue-microtask-1.2.3" = {
       name = "queue-microtask";
       packageName = "queue-microtask";
@@ -28457,15 +26036,6 @@ let
         sha512 = "C0SIXdXDSus2yqqvV7qifnb4NoWP7mEBXJq3axci301mXHCZb8Djwm4hrEZo4UeXRaEnfjH98uQ8EBppk2oNWA==";
       };
     };
-    "re-reselect-4.0.1" = {
-      name = "re-reselect";
-      packageName = "re-reselect";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/re-reselect/-/re-reselect-4.0.1.tgz";
-        sha512 = "xVTNGQy/dAxOolunBLmVMGZ49VUUR1s8jZUiJQb+g1sI63GAv9+a5Jas9yHvdxeUgiZkU9r3gDExDorxHzOgRA==";
-      };
-    };
     "react-17.0.2" = {
       name = "react";
       packageName = "react";
@@ -28898,15 +26468,6 @@ let
         sha512 = "FNpGGo1DycYAdnrKFxCMmKYgo/mILAqtRYbkdQD8Ep/Hk2PQ5+aEAEx+IU713RTDmuBaH0c8P5ZozurNu5ObRQ==";
       };
     };
-    "reduce-flatten-1.0.1" = {
-      name = "reduce-flatten";
-      packageName = "reduce-flatten";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-1.0.1.tgz";
-        sha512 = "j5WfFJfc9CoXv/WbwVLHq74i/hdTUpy+iNC534LxczMRP67vJeK3V9JOdnL0N1cIRbn9mYhE2yVjvvKXDxvNXQ==";
-      };
-    };
     "redux-4.2.1" = {
       name = "redux";
       packageName = "redux";
@@ -29087,24 +26648,6 @@ let
         sha512 = "QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ==";
       };
     };
-    "relateurl-0.2.7" = {
-      name = "relateurl";
-      packageName = "relateurl";
-      version = "0.2.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz";
-        sha512 = "G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==";
-      };
-    };
-    "relative-3.0.2" = {
-      name = "relative";
-      packageName = "relative";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/relative/-/relative-3.0.2.tgz";
-        sha512 = "Q5W2qeYtY9GbiR8z1yHNZ1DGhyjb4AnLEjt8iE6XfcC1QIu+FAtj3HQaO0wH28H1mX6cqNLvAqWhP402dxJGyA==";
-      };
-    };
     "remark-13.0.0" = {
       name = "remark";
       packageName = "remark";
@@ -29852,15 +27395,6 @@ let
         sha512 = "oTeemxwoMuxxTYxXUwjkrOPfngTQehlv0/HoYFNkB4uzsP1Un1A9nI8JQKGOFkxpqkC7qkMs0lUsGrvUlbLNUA==";
       };
     };
-    "reselect-4.1.8" = {
-      name = "reselect";
-      packageName = "reselect";
-      version = "4.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz";
-        sha512 = "ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==";
-      };
-    };
     "reserved-words-0.1.2" = {
       name = "reserved-words";
       packageName = "reserved-words";
@@ -30248,24 +27782,6 @@ let
         sha512 = "jFvBgyRueGU0QVa7EqXZOkarkzrqEnF3VTCzATRcBkzxXJ4/+pzDf1iouqOqGsx6ZpnIIu5gvFDGnyzoX58ldQ==";
       };
     };
-    "rrweb-cssom-0.7.1" = {
-      name = "rrweb-cssom";
-      packageName = "rrweb-cssom";
-      version = "0.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.7.1.tgz";
-        sha512 = "TrEMa7JGdVm0UThDJSx7ddw5nVm3UJS9o9CCIZ72B1vSyEZoziDqBYP3XIoi/12lKrJR8rE3jeFHMok2F/Mnsg==";
-      };
-    };
-    "rrweb-cssom-0.8.0" = {
-      name = "rrweb-cssom";
-      packageName = "rrweb-cssom";
-      version = "0.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rrweb-cssom/-/rrweb-cssom-0.8.0.tgz";
-        sha512 = "guoltQEx+9aMf2gDZ0s62EcV8lsXR+0w8915TC3ITdn2YueuNjdAYh/levpU9nFaoChh9RUS5ZdQMrKfVEN9tw==";
-      };
-    };
     "rss-parser-3.7.1" = {
       name = "rss-parser";
       packageName = "rss-parser";
@@ -30554,15 +28070,6 @@ let
         sha512 = "+aWOz7yVScEGoKNd4PA10LZ8sk0A/z5+nXQG5giUO5rprX9jgYsTdov9qCchZiPIZezbZH+jRut8nPodFAX4Jg==";
       };
     };
-    "saxes-6.0.0" = {
-      name = "saxes";
-      packageName = "saxes";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz";
-        sha512 = "xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==";
-      };
-    };
     "scheduler-0.20.2" = {
       name = "scheduler";
       packageName = "scheduler";
@@ -30887,24 +28394,6 @@ let
         sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==";
       };
     };
-    "seventh-0.7.40" = {
-      name = "seventh";
-      packageName = "seventh";
-      version = "0.7.40";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/seventh/-/seventh-0.7.40.tgz";
-        sha512 = "7sxUydQx4iEh17uJUFjZDAwbffJirldZaNIJvVB/hk9mPEL3J4GpLGSL+mHFH2ydkye46DAsLGqzFJ+/Qj5foQ==";
-      };
-    };
-    "seventh-0.9.2" = {
-      name = "seventh";
-      packageName = "seventh";
-      version = "0.9.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/seventh/-/seventh-0.9.2.tgz";
-        sha512 = "C+dnbBXIEycnrN6/CpFt/Rt8ccMzAX3wbwJU61RTfC8lYPMzSkKkAVWnUEMTZDHdvtlrTupZeCUK4G+uP4TmRQ==";
-      };
-    };
     "sha.js-2.4.11" = {
       name = "sha.js";
       packageName = "sha.js";
@@ -30914,15 +28403,6 @@ let
         sha512 = "QMEp5B7cftE7APOjk5Y6xgrbWu+WkLVQwk8JNjZ8nKRciZaByEW6MubieAiToS7+dwvrjGhH8jRXz3MVd0AYqQ==";
       };
     };
-    "sharp-0.33.4" = {
-      name = "sharp";
-      packageName = "sharp";
-      version = "0.33.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sharp/-/sharp-0.33.4.tgz";
-        sha512 = "7i/dt5kGl7qR4gwPRD2biwD2/SvBn3O04J77XKFgL2OnZtQw+AG9wnuS/csmu80nPRHLYE9E41fyEiG8nhH6/Q==";
-      };
-    };
     "shasum-1.0.2" = {
       name = "shasum";
       packageName = "shasum";
@@ -31004,15 +28484,6 @@ let
         sha512 = "TiwcRcrkhHvbrZbnRcFYMLl30Dfov3HKqzp5tO5b4pt6G/SezKcYhmDg15zXVBswHmctSAQKznqNW2LO5tTDow==";
       };
     };
-    "shellwords-0.1.1" = {
-      name = "shellwords";
-      packageName = "shellwords";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz";
-        sha512 = "vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==";
-      };
-    };
     "shiki-1.29.2" = {
       name = "shiki";
       packageName = "shiki";
@@ -31337,15 +28808,6 @@ let
         sha512 = "up04hB2hR92PgjpyU3y/eg91yIBILyjVY26NvvciY3EVVPjybkMszMpXQ9QAkcS3I5rtJBDLoTxxg+qvW8c7rw==";
       };
     };
-    "slice-ansi-1.0.0" = {
-      name = "slice-ansi";
-      packageName = "slice-ansi";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/slice-ansi/-/slice-ansi-1.0.0.tgz";
-        sha512 = "POqxBK6Lb3q6s047D/XsDVNPnF9Dl8JSaqe9h9lURl0OdNqy/ujDrOiIHtsqXMGbWWTIomRzAMaTyawAU//Reg==";
-      };
-    };
     "slice-ansi-3.0.0" = {
       name = "slice-ansi";
       packageName = "slice-ansi";
@@ -31544,15 +29006,6 @@ let
         sha512 = "D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==";
       };
     };
-    "socks-proxy-agent-6.2.1" = {
-      name = "socks-proxy-agent";
-      packageName = "socks-proxy-agent";
-      version = "6.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-6.2.1.tgz";
-        sha512 = "a6KW9G+6B3nWZ1yB8G7pJwL3ggLy1uTzKAgCb7ttblwqdz9fMGJUuTy3uFzEP48FAs9FLILlmzDlE2JJhVQaXQ==";
-      };
-    };
     "socks-proxy-agent-7.0.0" = {
       name = "socks-proxy-agent";
       packageName = "socks-proxy-agent";
@@ -31850,33 +29303,6 @@ let
         sha512 = "Q5thBSxp5t8WPTTJQS59LrGqOZqOsrhDGDVm8azCqIBjSBd7nd9o2PM+mDulQQkh8h//4U6hFZnc/mul8t5pWQ==";
       };
     };
-    "split-on-first-1.1.0" = {
-      name = "split-on-first";
-      packageName = "split-on-first";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/split-on-first/-/split-on-first-1.1.0.tgz";
-        sha512 = "43ZssAJaMusuKWL8sKUBQXHWOpq8d6CfN/u1p4gUzfJkM05C8rxTmYrkIPTXapZpORA6LkkzcUulJ8FqA7Uudw==";
-      };
-    };
-    "split-skip-0.0.1" = {
-      name = "split-skip";
-      packageName = "split-skip";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/split-skip/-/split-skip-0.0.1.tgz";
-        sha512 = "7dkvq+gofI4M8zx4iZnEZ3O1s7FP4Y/iaIDHJh5RyWrs8idcPauFi2OZe3TBi36fLvR2j5z3kSzVtz6IhPdncQ==";
-      };
-    };
-    "split-skip-0.0.2" = {
-      name = "split-skip";
-      packageName = "split-skip";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/split-skip/-/split-skip-0.0.2.tgz";
-        sha512 = "weHOi8BolsDnGIwhhWHbA+wKSuSpvWwjRrdj8SdbIIis2vSwOE37CQP8x3EleuzxanUr3AK8BdUy4MkiOULPZg==";
-      };
-    };
     "split-string-3.1.0" = {
       name = "split-string";
       packageName = "split-string";
@@ -31940,15 +29366,6 @@ let
         sha512 = "Oo+0REFV59/rz3gfJNKQiBlwfHaSESl1pcGyABQsnnIfWOFt6JNj5gCog2U6MLZ//IGYD+nA8nI+mTShREReaA==";
       };
     };
-    "sqlite3-5.1.6" = {
-      name = "sqlite3";
-      packageName = "sqlite3";
-      version = "5.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sqlite3/-/sqlite3-5.1.6.tgz";
-        sha512 = "olYkWoKFVNSSSQNvxVUfjiVbz3YtBwTJj+mfV5zpHmqW3sELx2Cf4QCdirMelhM5Zh+KDVaKgQHqCxrqiWHybw==";
-      };
-    };
     "sscaff-1.2.274" = {
       name = "sscaff";
       packageName = "sscaff";
@@ -32336,42 +29753,6 @@ let
         sha512 = "aqD2Q0144Z+/RqG52NeHEkZauTAUWJO8c6yTftGJKO3Tja5tUgIfmIl6kExvhtxSDP7fXB6DvzkfMpCd/F3G+Q==";
       };
     };
-    "string-kit-0.11.10" = {
-      name = "string-kit";
-      packageName = "string-kit";
-      version = "0.11.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-kit/-/string-kit-0.11.10.tgz";
-        sha512 = "ATVmIpMrqxPFNiNQTnmEeXzt3743O6DubJWh2MiAQV1ifKd4PcCjBcybCdb0ENnPO1T6asORK9nOpygn1BATag==";
-      };
-    };
-    "string-kit-0.18.3" = {
-      name = "string-kit";
-      packageName = "string-kit";
-      version = "0.18.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-kit/-/string-kit-0.18.3.tgz";
-        sha512 = "G8cBS7wxxHhwQrKU0Y8SjZJRtCzZ61bMmMCO1bWm6N6y2obT0koGK8uWYloMOaVPPr8zk7Ic995uEd4Jw504AQ==";
-      };
-    };
-    "string-padding-1.0.2" = {
-      name = "string-padding";
-      packageName = "string-padding";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-padding/-/string-padding-1.0.2.tgz";
-        sha512 = "VrG4XqNiKiufIn/F2rivcnrrRazwOQs0o6pGDd8lKSx6pzsxwvi91D3uj00uQ+jh3LEEDvRmEPNbMzZe5L18Kg==";
-      };
-    };
-    "string-to-stream-3.0.1" = {
-      name = "string-to-stream";
-      packageName = "string-to-stream";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/string-to-stream/-/string-to-stream-3.0.1.tgz";
-        sha512 = "Hl092MV3USJuUCC6mfl9sPzGloA3K5VwdIeJjYIkXY/8K+mUvaeEabWJgArp+xXrsWxCajeT2pc4axbVhIZJyg==";
-      };
-    };
     "string-width-1.0.2" = {
       name = "string-width";
       packageName = "string-width";
@@ -32480,15 +29861,6 @@ let
         sha512 = "IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==";
       };
     };
-    "stringify-parameters-0.0.4" = {
-      name = "stringify-parameters";
-      packageName = "stringify-parameters";
-      version = "0.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stringify-parameters/-/stringify-parameters-0.0.4.tgz";
-        sha512 = "H3L90ERn5UPtkpO8eugnKcLgpIVlvTyUTrcLGm607AV5JDH6z0GymtNLr3gjGlP6I6NB/mxNX9QpY6jEQGLPdQ==";
-      };
-    };
     "strip-ansi-0.1.1" = {
       name = "strip-ansi";
       packageName = "strip-ansi";
@@ -32930,15 +30302,6 @@ let
         sha512 = "b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==";
       };
     };
-    "symbol-tree-3.2.4" = {
-      name = "symbol-tree";
-      packageName = "symbol-tree";
-      version = "3.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz";
-        sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==";
-      };
-    };
     "syntax-error-1.4.0" = {
       name = "syntax-error";
       packageName = "syntax-error";
@@ -32975,15 +30338,6 @@ let
         sha512 = "9kY+CygyYM6j02t5YFHbNz2FN5QmYGv9zAjVp4lCDjlCw7amdckXlEt/bjMhUIfj4ThGRE4gCUH5+yGnNuPo5A==";
       };
     };
-    "table-layout-0.4.5" = {
-      name = "table-layout";
-      packageName = "table-layout";
-      version = "0.4.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/table-layout/-/table-layout-0.4.5.tgz";
-        sha512 = "zTvf0mcggrGeTe/2jJ6ECkJHAQPIYEwDoqsiqBjI24mvRmQbInK5jq33fyypaCBxX08hMkfmdOqj6haT33EqWw==";
-      };
-    };
     "tailwindcss-4.0.14" = {
       name = "tailwindcss";
       packageName = "tailwindcss";
@@ -33101,15 +30455,6 @@ let
         sha512 = "+HRtZ40Vc+6YfCDWCeAsixwxJgMbPY4HHuTgzPYH3JXvqHWUlsCfy+ylXlAKhFNcuLp4xVeWeFBUhDk+7KYUvQ==";
       };
     };
-    "tcp-port-used-1.0.2" = {
-      name = "tcp-port-used";
-      packageName = "tcp-port-used";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-1.0.2.tgz";
-        sha512 = "l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA==";
-      };
-    };
     "tdigest-0.1.2" = {
       name = "tdigest";
       packageName = "tdigest";
@@ -33164,24 +30509,6 @@ let
         sha512 = "7jDLIdD2Zp0bDe5r3D2qtkd1QOCacylBuL7oa4udvN6v2pqr4+LcCr67C8DR1zkpaZ8XosF5m1yQSabKAW6f2g==";
       };
     };
-    "terminal-kit-1.49.4" = {
-      name = "terminal-kit";
-      packageName = "terminal-kit";
-      version = "1.49.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-1.49.4.tgz";
-        sha512 = "ehoNOk7xB/QBVX38P2kpoLip+s4Tlb6qYDBAoLg/rdRrrtRlDgs97a9MG0xU1IGq/Qpn47n1rwb5fWbM/Bprag==";
-      };
-    };
-    "terminal-kit-3.1.1" = {
-      name = "terminal-kit";
-      packageName = "terminal-kit";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/terminal-kit/-/terminal-kit-3.1.1.tgz";
-        sha512 = "R+R47zBQ14Ax2NZCLeuVl2GwonDwQN4iAsjQZICW8gMzaV+VIJMvL4qhUQtzDOhENADyNPQvY1Vz5G0bHHkLEA==";
-      };
-    };
     "terminal-link-3.0.0" = {
       name = "terminal-link";
       packageName = "terminal-link";
@@ -33398,15 +30725,6 @@ let
         sha512 = "KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==";
       };
     };
-    "tkwidgets-0.5.27" = {
-      name = "tkwidgets";
-      packageName = "tkwidgets";
-      version = "0.5.27";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tkwidgets/-/tkwidgets-0.5.27.tgz";
-        sha512 = "748OLoNS77xzyVNDst906EhIX/rRVb8IVM5Cb7hkO5nyrnngx70vHtmeWVUy+e3lz3I0CgRzYSUJIt7bDQ6PAQ==";
-      };
-    };
     "tmp-0.0.33" = {
       name = "tmp";
       packageName = "tmp";
@@ -33596,15 +30914,6 @@ let
         sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==";
       };
     };
-    "tough-cookie-4.1.4" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "4.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz";
-        sha512 = "Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==";
-      };
-    };
     "tr46-0.0.3" = {
       name = "tr46";
       packageName = "tr46";
@@ -33614,15 +30923,6 @@ let
         sha512 = "N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==";
       };
     };
-    "tr46-5.0.0" = {
-      name = "tr46";
-      packageName = "tr46";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tr46/-/tr46-5.0.0.tgz";
-        sha512 = "tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g==";
-      };
-    };
     "tree-kill-1.2.2" = {
       name = "tree-kill";
       packageName = "tree-kill";
@@ -33632,24 +30932,6 @@ let
         sha512 = "L0Orpi8qGpRG//Nd+H90vFB+3iHnue1zSSGmNOOCh1GLJ7rUKVwV2HvijphGQS2UmhUZewS9VgvxYIdgr+fG1A==";
       };
     };
-    "tree-kit-0.7.5" = {
-      name = "tree-kit";
-      packageName = "tree-kit";
-      version = "0.7.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.7.5.tgz";
-        sha512 = "CmyY7d0OYE5W6UCmvij+SaocG7z+q4roF+Oj7BtU8B+KlpdiRZRMUwNyqfmWYcpYgsOcY1/dfIx/VsLmbAOLGg==";
-      };
-    };
-    "tree-kit-0.8.8" = {
-      name = "tree-kit";
-      packageName = "tree-kit";
-      version = "0.8.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tree-kit/-/tree-kit-0.8.8.tgz";
-        sha512 = "L7zwpXp0/Nha6mljVcVOnhhxuCkFRWmt26wza3TKnyMBewid4F2vyiVdcSsw41ZoG1Wj+3lM48Er9lhttbxfLA==";
-      };
-    };
     "trim-lines-3.0.1" = {
       name = "trim-lines";
       packageName = "trim-lines";
@@ -34082,15 +31364,6 @@ let
         sha512 = "b9eLo5FjlR0BRMsYIxZYCrtTTUu97N1bh+DpQFCEm5OfRGzUg/Oc09fgct4jA4NF7R5Yg9oxWqVT90uto1TsvA==";
       };
     };
-    "typical-2.6.1" = {
-      name = "typical";
-      packageName = "typical";
-      version = "2.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/typical/-/typical-2.6.1.tgz";
-        sha512 = "ofhi8kjIje6npGozTip9Fr8iecmYfEbS06i0JnIg+rh51KakryWF4+jX8lLKZVhy6N+ID45WYSFCxPOdTWCzNg==";
-      };
-    };
     "ua-parser-js-1.0.40" = {
       name = "ua-parser-js";
       packageName = "ua-parser-js";
@@ -34127,15 +31400,6 @@ let
         sha512 = "v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==";
       };
     };
-    "uglifycss-0.0.29" = {
-      name = "uglifycss";
-      packageName = "uglifycss";
-      version = "0.0.29";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/uglifycss/-/uglifycss-0.0.29.tgz";
-        sha512 = "J2SQ2QLjiknNGbNdScaNZsXgmMGI0kYNrXaDlr4obnPW9ni1jljb1NeEVWAiTgZ8z+EBWP2ozfT9vpy03rjlMQ==";
-      };
-    };
     "uid-number-0.0.5" = {
       name = "uid-number";
       packageName = "uid-number";
@@ -34460,15 +31724,6 @@ let
         sha512 = "Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==";
       };
     };
-    "unique-filename-1.1.1" = {
-      name = "unique-filename";
-      packageName = "unique-filename";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz";
-        sha512 = "Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==";
-      };
-    };
     "unique-filename-2.0.1" = {
       name = "unique-filename";
       packageName = "unique-filename";
@@ -34487,15 +31742,6 @@ let
         sha512 = "XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ==";
       };
     };
-    "unique-slug-2.0.2" = {
-      name = "unique-slug";
-      packageName = "unique-slug";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz";
-        sha512 = "zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==";
-      };
-    };
     "unique-slug-3.0.0" = {
       name = "unique-slug";
       packageName = "unique-slug";
@@ -34874,15 +32120,6 @@ let
         sha512 = "rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==";
       };
     };
-    "universalify-0.2.0" = {
-      name = "universalify";
-      packageName = "universalify";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz";
-        sha512 = "CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==";
-      };
-    };
     "universalify-2.0.1" = {
       name = "universalify";
       packageName = "universalify";
@@ -34910,24 +32147,6 @@ let
         sha512 = "AURroAsb73BZ6CdAyMrTk/hYKNj3DuYYEuOaB8bYMOHGKupRNScw90Q5C71tWJc3uE7dIeXRyuwN0xLLq3vDTg==";
       };
     };
-    "unorm-1.6.0" = {
-      name = "unorm";
-      packageName = "unorm";
-      version = "1.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unorm/-/unorm-1.6.0.tgz";
-        sha512 = "b2/KCUlYZUeA7JFUuRJZPUtr4gZvBh7tavtv4fvk4+KV9pfGiR6CQAQAWl49ZpR3ts2dk4FYkP7EIgDJoiOLDA==";
-      };
-    };
-    "unpack-string-0.0.2" = {
-      name = "unpack-string";
-      packageName = "unpack-string";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unpack-string/-/unpack-string-0.0.2.tgz";
-        sha512 = "2ZFjp5aY7QwHE6HAp47RnKYfvgAQ5+NwbKq/ZVtty85RDb3/UaTeCfizo5L/fXzM7UkMP/zDtbV+kGW/iJiK6w==";
-      };
-    };
     "unpipe-1.0.0" = {
       name = "unpipe";
       packageName = "unpipe";
@@ -35018,15 +32237,6 @@ let
         sha512 = "+dwUY4L35XFYEzE+OAL3sarJdUioVovq+8f7lcIJ7wnmnYQV5UD1Y/lcwaMSyaQ6Bj3JMj1XSTjZbNLHn/19yA==";
       };
     };
-    "upper-case-1.1.3" = {
-      name = "upper-case";
-      packageName = "upper-case";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/upper-case/-/upper-case-1.1.3.tgz";
-        sha512 = "WRbjgmYzgXkCV7zNVpy5YgrHgbBv126rMALQQMrmzOVC4GM2waQ9x7xtm8VU+1yF2kWyPzI9zbZ48n4vSxwfSA==";
-      };
-    };
     "uri-js-4.4.1" = {
       name = "uri-js";
       packageName = "uri-js";
@@ -36134,15 +33344,6 @@ let
         sha512 = "/BpdSx+yCQGnCvecbyXdxHDkuk55/G3xwnC0GqY4gmQ3j+A+g8kzzgB4Nk/SINjqn6+waqw3EgbVF2QKExkRxQ==";
       };
     };
-    "w3c-xmlserializer-5.0.0" = {
-      name = "w3c-xmlserializer";
-      packageName = "w3c-xmlserializer";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz";
-        sha512 = "o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==";
-      };
-    };
     "walk-2.3.15" = {
       name = "walk";
       packageName = "walk";
@@ -36242,15 +33443,6 @@ let
         sha512 = "2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==";
       };
     };
-    "webidl-conversions-7.0.0" = {
-      name = "webidl-conversions";
-      packageName = "webidl-conversions";
-      version = "7.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz";
-        sha512 = "VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==";
-      };
-    };
     "websocket-driver-0.7.4" = {
       name = "websocket-driver";
       packageName = "websocket-driver";
@@ -36269,33 +33461,6 @@ let
         sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==";
       };
     };
-    "whatwg-encoding-3.1.1" = {
-      name = "whatwg-encoding";
-      packageName = "whatwg-encoding";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz";
-        sha512 = "6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==";
-      };
-    };
-    "whatwg-mimetype-4.0.0" = {
-      name = "whatwg-mimetype";
-      packageName = "whatwg-mimetype";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz";
-        sha512 = "QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==";
-      };
-    };
-    "whatwg-url-14.1.1" = {
-      name = "whatwg-url";
-      packageName = "whatwg-url";
-      version = "14.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-14.1.1.tgz";
-        sha512 = "mDGf9diDad/giZ/Sm9Xi2YcyzaFpbdLpJPr+E9fSkyQ7KpQD4SdFcugkRQYzhmfI4KeV4Qpnn2sKPdo+kmsgRQ==";
-      };
-    };
     "whatwg-url-5.0.0" = {
       name = "whatwg-url";
       packageName = "whatwg-url";
@@ -36539,15 +33704,6 @@ let
         sha512 = "gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==";
       };
     };
-    "wordwrapjs-3.0.0" = {
-      name = "wordwrapjs";
-      packageName = "wordwrapjs";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-3.0.0.tgz";
-        sha512 = "mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw==";
-      };
-    };
     "worker-farm-1.7.0" = {
       name = "worker-farm";
       packageName = "worker-farm";
@@ -36800,15 +33956,6 @@ let
         sha512 = "7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==";
       };
     };
-    "xml-name-validator-5.0.0" = {
-      name = "xml-name-validator";
-      packageName = "xml-name-validator";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz";
-        sha512 = "EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==";
-      };
-    };
     "xml-parse-from-string-1.0.1" = {
       name = "xml-parse-from-string";
       packageName = "xml-parse-from-string";
@@ -36818,15 +33965,6 @@ let
         sha512 = "ErcKwJTF54uRzzNMXq2X5sMIy88zJvfN2DmdoQvy7PAFJ+tPRU6ydWuOKNMyfmOjdyBQTFREi60s0Y0SyI0G0g==";
       };
     };
-    "xml2js-0.4.19" = {
-      name = "xml2js";
-      packageName = "xml2js";
-      version = "0.4.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.19.tgz";
-        sha512 = "esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==";
-      };
-    };
     "xml2js-0.4.23" = {
       name = "xml2js";
       packageName = "xml2js";
@@ -36872,24 +34010,6 @@ let
         sha512 = "wrG9gc6hCFDd5STt+6fsjP2aGSkjkNSewH+1K6s0KVOd94vXAUyTwlxWVnMFVtLdMf+q0QRZN1z9hTOKgoEdMg==";
       };
     };
-    "xmlbuilder-9.0.7" = {
-      name = "xmlbuilder";
-      packageName = "xmlbuilder";
-      version = "9.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-9.0.7.tgz";
-        sha512 = "7YXTQc3P2l9+0rjaUbLwMKRhtmwg1M1eDf6nag7urC7pIPYLD9W/jmzQ4ptRSUbodw5S0jfoGTflLemQibSpeQ==";
-      };
-    };
-    "xmlchars-2.2.0" = {
-      name = "xmlchars";
-      packageName = "xmlchars";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz";
-        sha512 = "JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==";
-      };
-    };
     "xmlcreate-2.0.4" = {
       name = "xmlcreate";
       packageName = "xmlcreate";
@@ -37124,15 +34244,6 @@ let
         sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==";
       };
     };
-    "yargs-parser-7.0.0" = {
-      name = "yargs-parser";
-      packageName = "yargs-parser";
-      version = "7.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-7.0.0.tgz";
-        sha512 = "WhzC+xgstid9MbVUktco/bf+KJG+Uu6vMX0LN1sLJvwmbCQVxb4D8LzogobonKycNasCZLdOzTAk1SK7+K7swg==";
-      };
-    };
     "yargs-unparser-2.0.0" = {
       name = "yargs-unparser";
       packageName = "yargs-unparser";
@@ -46134,1298 +43245,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  joplin = nodeEnv.buildNodePackage {
-    name = "joplin";
-    packageName = "joplin";
-    version = "3.2.3";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/joplin/-/joplin-3.2.3.tgz";
-      sha512 = "oLS5oJasAF7Q1fRBbHjucRlgmKis5RMln/a+vQJlAXjPfXdajN53EPz5Z28Iw+ahZArtMfiy4UKPvftVVqnjnQ==";
-    };
-    dependencies = [
-      sources."@adobe/css-tools-4.4.0"
-      (
-        sources."@asamuzakjp/css-color-3.1.1"
-        // {
-          dependencies = [
-            sources."lru-cache-10.4.3"
-          ];
-        }
-      )
-      (
-        sources."@aws-crypto/crc32-3.0.0"
-        // {
-          dependencies = [
-            sources."tslib-1.14.1"
-          ];
-        }
-      )
-      (
-        sources."@aws-crypto/crc32c-3.0.0"
-        // {
-          dependencies = [
-            sources."tslib-1.14.1"
-          ];
-        }
-      )
-      (
-        sources."@aws-crypto/ie11-detection-3.0.0"
-        // {
-          dependencies = [
-            sources."tslib-1.14.1"
-          ];
-        }
-      )
-      (
-        sources."@aws-crypto/sha1-browser-3.0.0"
-        // {
-          dependencies = [
-            sources."tslib-1.14.1"
-          ];
-        }
-      )
-      (
-        sources."@aws-crypto/sha256-browser-3.0.0"
-        // {
-          dependencies = [
-            sources."tslib-1.14.1"
-          ];
-        }
-      )
-      (
-        sources."@aws-crypto/sha256-js-3.0.0"
-        // {
-          dependencies = [
-            sources."tslib-1.14.1"
-          ];
-        }
-      )
-      (
-        sources."@aws-crypto/supports-web-crypto-3.0.0"
-        // {
-          dependencies = [
-            sources."tslib-1.14.1"
-          ];
-        }
-      )
-      (
-        sources."@aws-crypto/util-3.0.0"
-        // {
-          dependencies = [
-            sources."tslib-1.14.1"
-          ];
-        }
-      )
-      sources."@aws-sdk/abort-controller-3.296.0"
-      sources."@aws-sdk/chunked-blob-reader-3.295.0"
-      sources."@aws-sdk/chunked-blob-reader-native-3.295.0"
-      (
-        sources."@aws-sdk/client-s3-3.296.0"
-        // {
-          dependencies = [
-            sources."fast-xml-parser-4.1.2"
-          ];
-        }
-      )
-      sources."@aws-sdk/client-sso-3.296.0"
-      sources."@aws-sdk/client-sso-oidc-3.296.0"
-      (
-        sources."@aws-sdk/client-sts-3.296.0"
-        // {
-          dependencies = [
-            sources."fast-xml-parser-4.1.2"
-          ];
-        }
-      )
-      sources."@aws-sdk/config-resolver-3.296.0"
-      (
-        sources."@aws-sdk/core-3.758.0"
-        // {
-          dependencies = [
-            sources."@aws-sdk/types-3.734.0"
-            sources."fast-xml-parser-4.4.1"
-          ];
-        }
-      )
-      sources."@aws-sdk/credential-provider-env-3.296.0"
-      sources."@aws-sdk/credential-provider-imds-3.296.0"
-      sources."@aws-sdk/credential-provider-ini-3.296.0"
-      sources."@aws-sdk/credential-provider-node-3.296.0"
-      sources."@aws-sdk/credential-provider-process-3.296.0"
-      sources."@aws-sdk/credential-provider-sso-3.296.0"
-      sources."@aws-sdk/credential-provider-web-identity-3.296.0"
-      (
-        sources."@aws-sdk/crt-loader-3.758.0"
-        // {
-          dependencies = [
-            sources."@aws-sdk/middleware-user-agent-3.758.0"
-            sources."@aws-sdk/types-3.734.0"
-            sources."@aws-sdk/util-endpoints-3.743.0"
-            sources."@aws-sdk/util-user-agent-node-3.758.0"
-          ];
-        }
-      )
-      sources."@aws-sdk/eventstream-codec-3.296.0"
-      sources."@aws-sdk/eventstream-serde-browser-3.296.0"
-      sources."@aws-sdk/eventstream-serde-config-resolver-3.296.0"
-      sources."@aws-sdk/eventstream-serde-node-3.296.0"
-      sources."@aws-sdk/eventstream-serde-universal-3.296.0"
-      sources."@aws-sdk/fetch-http-handler-3.296.0"
-      sources."@aws-sdk/hash-blob-browser-3.296.0"
-      sources."@aws-sdk/hash-node-3.296.0"
-      sources."@aws-sdk/hash-stream-node-3.296.0"
-      sources."@aws-sdk/invalid-dependency-3.296.0"
-      sources."@aws-sdk/is-array-buffer-3.295.0"
-      sources."@aws-sdk/md5-js-3.296.0"
-      sources."@aws-sdk/middleware-bucket-endpoint-3.296.0"
-      sources."@aws-sdk/middleware-content-length-3.296.0"
-      sources."@aws-sdk/middleware-endpoint-3.296.0"
-      sources."@aws-sdk/middleware-expect-continue-3.296.0"
-      sources."@aws-sdk/middleware-flexible-checksums-3.296.0"
-      sources."@aws-sdk/middleware-host-header-3.296.0"
-      sources."@aws-sdk/middleware-location-constraint-3.296.0"
-      sources."@aws-sdk/middleware-logger-3.296.0"
-      sources."@aws-sdk/middleware-recursion-detection-3.296.0"
-      (
-        sources."@aws-sdk/middleware-retry-3.296.0"
-        // {
-          dependencies = [
-            sources."uuid-8.3.2"
-          ];
-        }
-      )
-      sources."@aws-sdk/middleware-sdk-s3-3.296.0"
-      sources."@aws-sdk/middleware-sdk-sts-3.296.0"
-      sources."@aws-sdk/middleware-serde-3.296.0"
-      sources."@aws-sdk/middleware-signing-3.296.0"
-      sources."@aws-sdk/middleware-ssec-3.296.0"
-      sources."@aws-sdk/middleware-stack-3.296.0"
-      sources."@aws-sdk/middleware-user-agent-3.296.0"
-      sources."@aws-sdk/node-config-provider-3.296.0"
-      sources."@aws-sdk/node-http-handler-3.296.0"
-      sources."@aws-sdk/property-provider-3.296.0"
-      sources."@aws-sdk/protocol-http-3.296.0"
-      sources."@aws-sdk/querystring-builder-3.296.0"
-      sources."@aws-sdk/querystring-parser-3.296.0"
-      sources."@aws-sdk/s3-request-presigner-3.296.0"
-      sources."@aws-sdk/service-error-classification-3.296.0"
-      sources."@aws-sdk/shared-ini-file-loader-3.296.0"
-      sources."@aws-sdk/signature-v4-3.296.0"
-      (
-        sources."@aws-sdk/signature-v4-crt-3.758.0"
-        // {
-          dependencies = [
-            sources."@aws-sdk/middleware-sdk-s3-3.758.0"
-            sources."@aws-sdk/signature-v4-multi-region-3.758.0"
-            sources."@aws-sdk/types-3.734.0"
-            sources."@aws-sdk/util-arn-parser-3.723.0"
-          ];
-        }
-      )
-      sources."@aws-sdk/signature-v4-multi-region-3.296.0"
-      sources."@aws-sdk/smithy-client-3.296.0"
-      sources."@aws-sdk/token-providers-3.296.0"
-      sources."@aws-sdk/types-3.296.0"
-      sources."@aws-sdk/url-parser-3.296.0"
-      sources."@aws-sdk/util-arn-parser-3.295.0"
-      sources."@aws-sdk/util-base64-3.295.0"
-      sources."@aws-sdk/util-body-length-browser-3.295.0"
-      sources."@aws-sdk/util-body-length-node-3.295.0"
-      sources."@aws-sdk/util-buffer-from-3.295.0"
-      sources."@aws-sdk/util-config-provider-3.295.0"
-      sources."@aws-sdk/util-create-request-3.296.0"
-      sources."@aws-sdk/util-defaults-mode-browser-3.296.0"
-      sources."@aws-sdk/util-defaults-mode-node-3.296.0"
-      sources."@aws-sdk/util-endpoints-3.296.0"
-      sources."@aws-sdk/util-format-url-3.296.0"
-      sources."@aws-sdk/util-hex-encoding-3.295.0"
-      sources."@aws-sdk/util-locate-window-3.723.0"
-      sources."@aws-sdk/util-middleware-3.296.0"
-      sources."@aws-sdk/util-retry-3.296.0"
-      sources."@aws-sdk/util-stream-browser-3.296.0"
-      sources."@aws-sdk/util-stream-node-3.296.0"
-      sources."@aws-sdk/util-uri-escape-3.295.0"
-      sources."@aws-sdk/util-user-agent-browser-3.296.0"
-      sources."@aws-sdk/util-user-agent-node-3.296.0"
-      sources."@aws-sdk/util-utf8-3.295.0"
-      sources."@aws-sdk/util-utf8-browser-3.259.0"
-      sources."@aws-sdk/util-waiter-3.296.0"
-      sources."@aws-sdk/xml-builder-3.295.0"
-      sources."@babel/runtime-7.26.10"
-      sources."@cronvel/get-pixels-3.4.1"
-      sources."@csstools/color-helpers-5.0.2"
-      sources."@csstools/css-calc-2.1.2"
-      sources."@csstools/css-color-parser-3.0.8"
-      sources."@csstools/css-parser-algorithms-3.0.4"
-      sources."@csstools/css-tokenizer-3.0.3"
-      sources."@gar/promisify-1.1.3"
-      sources."@httptoolkit/websocket-stream-6.0.1"
-      (
-        sources."@isaacs/cliui-8.0.2"
-        // {
-          dependencies = [
-            sources."ansi-regex-6.1.0"
-            sources."emoji-regex-9.2.2"
-            sources."string-width-5.1.2"
-            sources."strip-ansi-7.1.0"
-          ];
-        }
-      )
-      sources."@joplin/fork-htmlparser2-4.1.57"
-      sources."@joplin/fork-sax-1.2.61"
-      sources."@joplin/fork-uslug-1.0.22"
-      sources."@joplin/htmlpack-3.2.5"
-      sources."@joplin/lib-3.2.5"
-      sources."@joplin/onenote-converter-3.2.5"
-      sources."@joplin/renderer-3.2.5"
-      sources."@joplin/turndown-4.0.79"
-      sources."@joplin/turndown-plugin-gfm-1.0.61"
-      (
-        sources."@joplin/utils-3.2.5"
-        // {
-          dependencies = [
-            sources."brace-expansion-2.0.1"
-            sources."glob-10.4.5"
-            sources."minimatch-9.0.5"
-            sources."minipass-7.1.2"
-          ];
-        }
-      )
-      (
-        sources."@mapbox/node-pre-gyp-1.0.11"
-        // {
-          dependencies = [
-            sources."agent-base-6.0.2"
-            sources."https-proxy-agent-5.0.1"
-          ];
-        }
-      )
-      sources."@npmcli/fs-1.1.1"
-      sources."@npmcli/move-file-1.1.2"
-      sources."@smithy/abort-controller-4.0.1"
-      sources."@smithy/core-3.1.5"
-      sources."@smithy/fetch-http-handler-5.0.1"
-      sources."@smithy/is-array-buffer-4.0.0"
-      sources."@smithy/middleware-endpoint-4.0.6"
-      sources."@smithy/middleware-serde-4.0.2"
-      sources."@smithy/middleware-stack-4.0.1"
-      sources."@smithy/node-config-provider-4.0.1"
-      sources."@smithy/node-http-handler-4.0.3"
-      sources."@smithy/property-provider-4.0.1"
-      sources."@smithy/protocol-http-5.0.1"
-      sources."@smithy/querystring-builder-4.0.1"
-      sources."@smithy/querystring-parser-4.0.1"
-      sources."@smithy/shared-ini-file-loader-4.0.1"
-      sources."@smithy/signature-v4-5.0.1"
-      sources."@smithy/smithy-client-4.1.6"
-      sources."@smithy/types-4.1.0"
-      sources."@smithy/url-parser-4.0.1"
-      sources."@smithy/util-base64-4.0.0"
-      sources."@smithy/util-body-length-browser-4.0.0"
-      sources."@smithy/util-buffer-from-4.0.0"
-      sources."@smithy/util-config-provider-4.0.0"
-      sources."@smithy/util-endpoints-3.0.1"
-      sources."@smithy/util-hex-encoding-4.0.0"
-      sources."@smithy/util-middleware-4.0.1"
-      sources."@smithy/util-stream-4.1.2"
-      sources."@smithy/util-uri-escape-4.0.0"
-      sources."@smithy/util-utf8-4.0.0"
-      sources."@tokenizer/token-0.3.0"
-      sources."@tootallnate/once-1.1.2"
-      sources."@types/nanoid-3.0.0"
-      sources."@types/node-22.13.10"
-      sources."@types/ws-8.18.0"
-      sources."abbrev-1.1.1"
-      sources."abort-controller-3.0.0"
-      sources."adm-zip-0.5.16"
-      sources."agent-base-7.1.3"
-      sources."agentkeepalive-4.6.0"
-      sources."aggregate-error-3.1.0"
-      sources."ajv-6.12.6"
-      (
-        sources."ansi-escape-sequences-4.1.0"
-        // {
-          dependencies = [
-            sources."array-back-3.1.0"
-          ];
-        }
-      )
-      sources."ansi-regex-3.0.1"
-      sources."ansi-styles-6.2.1"
-      sources."anymatch-3.1.3"
-      sources."aproba-2.0.0"
-      (
-        sources."are-we-there-yet-2.0.0"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."argparse-2.0.1"
-      sources."array-back-2.0.0"
-      sources."asap-2.0.6"
-      sources."asn1-0.2.6"
-      sources."assert-plus-1.0.0"
-      sources."async-mutex-0.5.0"
-      sources."asynckit-0.4.0"
-      sources."available-typed-arrays-1.0.7"
-      sources."aws-crt-1.26.2"
-      (
-        sources."aws-sdk-2.1340.0"
-        // {
-          dependencies = [
-            sources."buffer-4.9.2"
-            sources."ieee754-1.1.13"
-            sources."sax-1.2.1"
-            sources."uuid-8.0.0"
-            sources."xml2js-0.4.19"
-            sources."xmlbuilder-9.0.7"
-          ];
-        }
-      )
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.13.2"
-      sources."axios-1.8.3"
-      sources."balanced-match-1.0.2"
-      sources."base-64-1.0.0"
-      sources."base64-js-1.5.1"
-      sources."base64-stream-1.0.0"
-      sources."bcrypt-pbkdf-1.0.2"
-      sources."binary-extensions-2.3.0"
-      (
-        sources."bl-4.1.0"
-        // {
-          dependencies = [
-            sources."buffer-5.7.1"
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."bowser-2.11.0"
-      sources."brace-expansion-1.1.11"
-      sources."braces-3.0.3"
-      sources."buffer-6.0.3"
-      sources."buffer-from-1.1.2"
-      sources."bufferutil-4.0.9"
-      sources."builtin-modules-3.3.0"
-      (
-        sources."cacache-15.3.0"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      sources."call-bind-1.0.8"
-      sources."call-bind-apply-helpers-1.0.2"
-      sources."call-bound-1.0.4"
-      sources."camel-case-3.0.0"
-      sources."camelcase-4.1.0"
-      sources."canvas-2.11.2"
-      sources."caseless-0.12.0"
-      (
-        sources."chalk-4.1.2"
-        // {
-          dependencies = [
-            sources."ansi-styles-4.3.0"
-            sources."color-convert-2.0.1"
-          ];
-        }
-      )
-      sources."charenc-0.0.2"
-      sources."chokidar-3.6.0"
-      sources."chownr-2.0.0"
-      sources."chroma-js-2.6.0"
-      sources."clean-css-4.2.4"
-      sources."clean-stack-2.2.0"
-      (
-        sources."cliss-0.0.2"
-        // {
-          dependencies = [
-            sources."strip-ansi-4.0.0"
-            sources."yargs-parser-7.0.0"
-          ];
-        }
-      )
-      sources."color-3.2.1"
-      (
-        sources."color-convert-1.9.3"
-        // {
-          dependencies = [
-            sources."color-name-1.1.3"
-          ];
-        }
-      )
-      sources."color-name-1.1.4"
-      sources."color-string-1.9.1"
-      sources."color-support-1.1.3"
-      sources."combined-stream-1.0.8"
-      sources."command-line-usage-4.1.0"
-      sources."commander-2.20.3"
-      sources."commist-1.1.0"
-      sources."compare-version-0.1.2"
-      sources."compare-versions-6.1.1"
-      sources."concat-map-0.0.1"
-      (
-        sources."concat-stream-2.0.0"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."console-control-strings-1.1.0"
-      sources."core-util-is-1.0.3"
-      sources."cross-spawn-7.0.6"
-      sources."crypt-0.0.2"
-      sources."crypto-js-4.2.0"
-      (
-        sources."cssstyle-4.3.0"
-        // {
-          dependencies = [
-            sources."rrweb-cssom-0.8.0"
-          ];
-        }
-      )
-      sources."cwise-compiler-1.1.3"
-      sources."dashdash-1.14.1"
-      sources."data-urls-5.0.0"
-      sources."datauri-4.1.0"
-      sources."dayjs-1.11.12"
-      sources."debug-4.4.0"
-      sources."decimal.js-10.5.0"
-      sources."decode-uri-component-0.2.2"
-      sources."decompress-response-4.2.1"
-      sources."deep-extend-0.6.0"
-      sources."deep-is-0.1.4"
-      sources."deepmerge-2.2.1"
-      sources."define-data-property-1.1.4"
-      sources."define-lazy-prop-2.0.0"
-      sources."delayed-stream-1.0.0"
-      sources."delegates-1.0.0"
-      sources."depd-1.1.2"
-      sources."detect-libc-2.0.3"
-      sources."diff-match-patch-1.0.5"
-      (
-        sources."dom-serializer-2.0.0"
-        // {
-          dependencies = [
-            sources."entities-4.5.0"
-          ];
-        }
-      )
-      sources."domelementtype-2.3.0"
-      sources."domhandler-5.0.3"
-      sources."domutils-3.1.0"
-      sources."dunder-proto-1.0.1"
-      sources."duplexify-3.7.1"
-      sources."eastasianwidth-0.2.0"
-      sources."ecc-jsbn-0.1.2"
-      sources."emoji-regex-8.0.0"
-      (
-        sources."emphasize-1.5.0"
-        // {
-          dependencies = [
-            sources."ansi-regex-2.1.1"
-            sources."ansi-styles-2.2.1"
-            sources."chalk-1.1.3"
-            sources."highlight.js-9.12.0"
-            sources."strip-ansi-3.0.1"
-            sources."supports-color-2.0.0"
-          ];
-        }
-      )
-      sources."encoding-0.1.13"
-      sources."end-of-stream-1.4.4"
-      sources."entities-2.2.0"
-      sources."env-paths-2.2.1"
-      sources."err-code-2.0.3"
-      sources."es-define-property-1.0.1"
-      sources."es-errors-1.3.0"
-      sources."es-object-atoms-1.1.1"
-      sources."escape-string-regexp-1.0.5"
-      sources."event-target-shim-5.0.1"
-      sources."events-1.1.1"
-      sources."execa-5.1.1"
-      sources."expand-template-2.0.3"
-      sources."extend-3.0.2"
-      sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-json-stable-stringify-2.1.0"
-      sources."fast-xml-parser-3.21.1"
-      sources."fault-1.0.4"
-      sources."file-type-16.5.4"
-      sources."fill-range-7.1.1"
-      sources."filter-obj-1.1.0"
-      sources."find-up-2.1.0"
-      sources."follow-redirects-1.15.6"
-      sources."font-awesome-filetypes-2.1.0"
-      sources."for-each-0.3.5"
-      sources."for-each-property-0.0.4"
-      sources."for-each-property-deep-0.0.3"
-      (
-        sources."foreground-child-3.3.1"
-        // {
-          dependencies = [
-            sources."signal-exit-4.1.0"
-          ];
-        }
-      )
-      sources."forever-agent-0.6.1"
-      sources."form-data-4.0.0"
-      sources."format-0.2.2"
-      sources."fs-constants-1.0.0"
-      (
-        sources."fs-extra-11.2.0"
-        // {
-          dependencies = [
-            sources."jsonfile-6.1.0"
-            sources."universalify-2.0.1"
-          ];
-        }
-      )
-      (
-        sources."fs-minipass-2.1.0"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.2"
-      sources."gauge-3.0.2"
-      sources."get-intrinsic-1.3.0"
-      sources."get-proto-1.0.1"
-      sources."get-prototype-chain-1.0.1"
-      sources."get-stdin-5.0.1"
-      sources."get-stream-6.0.1"
-      sources."getpass-0.1.7"
-      sources."github-from-package-0.0.0"
-      sources."glob-7.2.3"
-      sources."glob-parent-5.1.2"
-      sources."gopd-1.2.0"
-      sources."graceful-fs-4.2.11"
-      sources."growly-1.3.0"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.5"
-      (
-        sources."has-ansi-2.0.0"
-        // {
-          dependencies = [
-            sources."ansi-regex-2.1.1"
-          ];
-        }
-      )
-      sources."has-flag-4.0.0"
-      sources."has-property-descriptors-1.0.2"
-      sources."has-symbols-1.1.0"
-      sources."has-tostringtag-1.0.2"
-      sources."has-unicode-2.0.1"
-      sources."hasown-2.0.2"
-      sources."he-1.2.0"
-      (
-        sources."help-me-3.0.0"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."highlight.js-11.10.0"
-      sources."hpagent-1.2.0"
-      sources."html-encoding-sniffer-4.0.0"
-      sources."html-entities-1.4.0"
-      sources."html-minifier-4.0.0"
-      sources."http-cache-semantics-4.1.1"
-      sources."http-errors-1.8.1"
-      sources."http-proxy-agent-7.0.2"
-      sources."http-signature-1.2.0"
-      sources."https-proxy-agent-7.0.6"
-      sources."human-signals-2.1.0"
-      sources."humanize-ms-1.2.1"
-      sources."iconv-lite-0.6.3"
-      sources."ieee754-1.2.1"
-      (
-        sources."image-data-uri-2.0.1"
-        // {
-          dependencies = [
-            sources."fs-extra-0.26.7"
-            sources."rimraf-2.7.1"
-          ];
-        }
-      )
-      sources."image-size-1.0.0"
-      sources."immer-7.0.15"
-      sources."imurmurhash-0.1.4"
-      sources."indent-string-4.0.0"
-      sources."infer-owner-1.0.4"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ini-1.3.8"
-      (
-        sources."inspect-function-0.2.2"
-        // {
-          dependencies = [
-            sources."split-skip-0.0.1"
-          ];
-        }
-      )
-      (
-        sources."inspect-parameters-declaration-0.0.9"
-        // {
-          dependencies = [
-            sources."magicli-0.0.5"
-          ];
-        }
-      )
-      (
-        sources."inspect-property-0.0.6"
-        // {
-          dependencies = [
-            sources."inspect-function-0.3.4"
-            (
-              sources."inspect-parameters-declaration-0.0.8"
-              // {
-                dependencies = [
-                  sources."split-skip-0.0.2"
-                ];
-              }
-            )
-            (
-              sources."magicli-0.0.5"
-              // {
-                dependencies = [
-                  sources."inspect-function-0.2.2"
-                ];
-              }
-            )
-            sources."split-skip-0.0.1"
-          ];
-        }
-      )
-      sources."iota-array-1.0.0"
-      (
-        sources."ip-address-9.0.5"
-        // {
-          dependencies = [
-            sources."jsbn-1.1.0"
-          ];
-        }
-      )
-      sources."ip-regex-4.3.0"
-      sources."is-arguments-1.2.0"
-      sources."is-arrayish-0.3.2"
-      sources."is-binary-path-2.1.0"
-      sources."is-buffer-1.1.6"
-      sources."is-callable-1.2.7"
-      sources."is-docker-2.2.1"
-      sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-generator-function-1.1.0"
-      sources."is-glob-4.0.3"
-      sources."is-lambda-1.0.1"
-      sources."is-number-7.0.0"
-      sources."is-potential-custom-element-name-1.0.1"
-      sources."is-regex-1.2.1"
-      sources."is-stream-2.0.1"
-      sources."is-typed-array-1.1.15"
-      sources."is-typedarray-1.0.0"
-      sources."is-url-1.2.4"
-      sources."is-wsl-2.2.0"
-      sources."is2-2.0.9"
-      sources."isarray-1.0.0"
-      sources."isexe-2.0.0"
-      sources."isobject-2.1.0"
-      sources."isomorphic-ws-4.0.1"
-      sources."isstream-0.1.2"
-      sources."jackspeak-3.4.3"
-      sources."jmespath-0.16.0"
-      sources."jpeg-js-0.4.4"
-      sources."js-sdsl-4.3.0"
-      sources."js-yaml-4.1.0"
-      sources."jsbn-0.1.1"
-      sources."jsdom-24.1.1"
-      sources."json-schema-0.4.0"
-      sources."json-schema-traverse-0.4.1"
-      sources."json-stringify-safe-5.0.1"
-      sources."jsonfile-2.4.0"
-      sources."jsprim-1.4.2"
-      (
-        sources."katex-0.16.11"
-        // {
-          dependencies = [
-            sources."commander-8.3.0"
-          ];
-        }
-      )
-      sources."keytar-7.9.0"
-      sources."klaw-1.3.1"
-      sources."lazyness-1.2.0"
-      sources."leven-2.1.0"
-      sources."linkify-it-4.0.1"
-      sources."locate-path-2.0.0"
-      sources."lodash-4.17.21"
-      sources."lodash.padend-4.6.1"
-      sources."lodash.repeat-4.1.0"
-      sources."lower-case-1.1.4"
-      (
-        sources."lowlight-1.9.2"
-        // {
-          dependencies = [
-            sources."highlight.js-9.12.0"
-          ];
-        }
-      )
-      sources."lru-cache-6.0.0"
-      sources."magicli-0.0.8"
-      (
-        sources."make-dir-3.1.0"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      (
-        sources."make-fetch-happen-9.1.0"
-        // {
-          dependencies = [
-            sources."agent-base-6.0.2"
-            sources."http-proxy-agent-4.0.1"
-            sources."https-proxy-agent-5.0.1"
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      (
-        sources."markdown-it-13.0.2"
-        // {
-          dependencies = [
-            sources."entities-3.0.1"
-          ];
-        }
-      )
-      sources."markdown-it-abbr-1.0.4"
-      sources."markdown-it-anchor-5.3.0"
-      sources."markdown-it-deflist-2.1.0"
-      sources."markdown-it-emoji-2.0.2"
-      sources."markdown-it-expand-tabs-1.0.13"
-      sources."markdown-it-footnote-3.0.3"
-      sources."markdown-it-ins-4.0.0"
-      sources."markdown-it-mark-3.0.1"
-      sources."markdown-it-multimd-table-4.2.3"
-      sources."markdown-it-sub-1.0.0"
-      sources."markdown-it-sup-2.0.0"
-      sources."markdown-it-toc-done-right-4.2.0"
-      sources."math-intrinsics-1.1.0"
-      sources."md5-2.3.0"
-      sources."md5-file-5.0.0"
-      sources."mdurl-1.0.1"
-      sources."merge-stream-2.0.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."mimer-2.0.2"
-      sources."mimic-fn-2.1.0"
-      sources."mimic-response-2.1.0"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."minipass-5.0.0"
-      (
-        sources."minipass-collect-1.0.2"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      (
-        sources."minipass-fetch-1.4.1"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      (
-        sources."minipass-flush-1.0.5"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      (
-        sources."minipass-pipeline-1.2.4"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      (
-        sources."minipass-sized-1.0.3"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      (
-        sources."minizlib-2.1.2"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      sources."mkdirp-1.0.4"
-      sources."mkdirp-classic-0.5.3"
-      sources."moment-2.30.1"
-      (
-        sources."mqtt-4.3.8"
-        // {
-          dependencies = [
-            sources."duplexify-4.1.3"
-            sources."readable-stream-3.6.2"
-            sources."utf-8-validate-5.0.10"
-            sources."ws-7.5.10"
-          ];
-        }
-      )
-      sources."mqtt-packet-6.10.0"
-      sources."ms-2.1.3"
-      sources."multiparty-4.2.3"
-      sources."mustache-4.2.0"
-      sources."nan-2.22.2"
-      sources."nanoid-3.3.7"
-      sources."napi-build-utils-2.0.0"
-      sources."ndarray-1.0.19"
-      sources."ndarray-pack-1.2.1"
-      sources."negotiator-0.6.4"
-      sources."nextgen-events-1.5.3"
-      sources."no-case-2.3.2"
-      sources."node-abi-3.74.0"
-      sources."node-addon-api-4.3.0"
-      sources."node-bitmap-0.0.1"
-      sources."node-emoji-1.11.0"
-      (
-        sources."node-fetch-2.6.7"
-        // {
-          dependencies = [
-            sources."tr46-0.0.3"
-            sources."webidl-conversions-3.0.1"
-            sources."whatwg-url-5.0.0"
-          ];
-        }
-      )
-      (
-        sources."node-gyp-8.4.1"
-        // {
-          dependencies = [
-            sources."are-we-there-yet-3.0.1"
-            sources."gauge-4.0.4"
-            sources."npmlog-6.0.2"
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."node-gyp-build-4.8.4"
-      (
-        sources."node-notifier-10.0.1"
-        // {
-          dependencies = [
-            sources."uuid-8.3.2"
-          ];
-        }
-      )
-      sources."node-persist-3.1.3"
-      sources."node-rsa-1.1.1"
-      sources."nopt-5.0.0"
-      sources."normalize-path-3.0.0"
-      sources."npm-run-path-4.0.1"
-      sources."npmlog-5.0.1"
-      sources."number-allocator-1.0.14"
-      sources."nwsapi-2.2.18"
-      sources."oauth-sign-0.9.0"
-      sources."object-assign-4.1.1"
-      (
-        sources."object-to-arguments-0.0.8"
-        // {
-          dependencies = [
-            sources."inspect-parameters-declaration-0.0.10"
-            sources."magicli-0.0.5"
-          ];
-        }
-      )
-      sources."omggif-1.0.10"
-      sources."once-1.4.0"
-      sources."onetime-5.1.2"
-      sources."open-8.4.2"
-      sources."p-limit-1.3.0"
-      sources."p-locate-2.0.0"
-      sources."p-map-4.0.0"
-      sources."p-try-1.0.0"
-      sources."package-json-from-dist-1.0.1"
-      sources."param-case-2.1.1"
-      (
-        sources."parse5-7.2.1"
-        // {
-          dependencies = [
-            sources."entities-4.5.0"
-          ];
-        }
-      )
-      sources."path-exists-3.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-key-3.1.1"
-      (
-        sources."path-scurry-1.11.1"
-        // {
-          dependencies = [
-            sources."lru-cache-10.4.3"
-          ];
-        }
-      )
-      sources."peek-readable-4.1.0"
-      sources."performance-now-2.1.0"
-      sources."picomatch-2.3.1"
-      sources."pipe-functions-1.3.0"
-      sources."pngjs-6.0.0"
-      sources."possible-typed-array-names-1.1.0"
-      (
-        sources."prebuild-install-7.1.3"
-        // {
-          dependencies = [
-            sources."decompress-response-6.0.0"
-            sources."mimic-response-3.1.0"
-            sources."simple-get-4.0.1"
-          ];
-        }
-      )
-      sources."process-0.11.10"
-      sources."process-nextick-args-2.0.1"
-      sources."promise-8.3.0"
-      sources."promise-inflight-1.0.1"
-      sources."promise-retry-2.0.1"
-      sources."proper-lockfile-4.1.2"
-      sources."proxy-from-env-1.1.0"
-      sources."psl-1.15.0"
-      sources."pump-3.0.2"
-      sources."punycode-2.3.1"
-      sources."qs-6.5.3"
-      sources."query-string-7.1.3"
-      sources."querystring-0.2.0"
-      sources."querystringify-2.2.0"
-      sources."queue-6.0.2"
-      sources."random-bytes-1.0.0"
-      sources."rc-1.2.8"
-      sources."re-reselect-4.0.1"
-      (
-        sources."readable-stream-2.3.8"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      (
-        sources."readable-web-to-node-stream-3.0.4"
-        // {
-          dependencies = [
-            sources."events-3.3.0"
-            sources."readable-stream-4.7.0"
-            sources."string_decoder-1.3.0"
-          ];
-        }
-      )
-      sources."readdirp-3.6.0"
-      sources."reduce-flatten-1.0.1"
-      sources."redux-4.2.1"
-      sources."regenerator-runtime-0.14.1"
-      sources."reinterval-1.1.0"
-      sources."relateurl-0.2.7"
-      sources."relative-3.0.2"
-      (
-        sources."request-2.88.2"
-        // {
-          dependencies = [
-            sources."form-data-2.3.3"
-            sources."tough-cookie-2.5.0"
-            sources."uuid-3.4.0"
-          ];
-        }
-      )
-      sources."requires-port-1.0.0"
-      sources."reselect-4.1.8"
-      sources."retry-0.12.0"
-      sources."rfdc-1.4.1"
-      sources."rimraf-3.0.2"
-      sources."rrweb-cssom-0.7.1"
-      sources."safe-buffer-5.2.1"
-      sources."safe-regex-test-1.1.0"
-      sources."safer-buffer-2.1.2"
-      sources."sax-1.4.1"
-      sources."saxes-6.0.0"
-      sources."semver-7.7.1"
-      sources."server-destroy-1.0.1"
-      sources."set-blocking-2.0.0"
-      sources."set-function-length-1.2.2"
-      sources."setimmediate-1.0.5"
-      sources."setprototypeof-1.2.0"
-      sources."seventh-0.9.2"
-      (
-        sources."sharp-0.33.4"
-        // {
-          dependencies = [
-            sources."color-4.2.3"
-            sources."color-convert-2.0.1"
-          ];
-        }
-      )
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
-      sources."shellwords-0.1.1"
-      sources."signal-exit-3.0.7"
-      sources."simple-concat-1.0.1"
-      sources."simple-get-3.1.1"
-      sources."simple-swizzle-0.2.2"
-      (
-        sources."slice-ansi-1.0.0"
-        // {
-          dependencies = [
-            sources."is-fullwidth-code-point-2.0.0"
-          ];
-        }
-      )
-      sources."smart-buffer-4.2.0"
-      sources."socks-2.8.4"
-      (
-        sources."socks-proxy-agent-6.2.1"
-        // {
-          dependencies = [
-            sources."agent-base-6.0.2"
-          ];
-        }
-      )
-      sources."source-map-0.6.1"
-      sources."split-on-first-1.1.0"
-      sources."split-skip-0.0.2"
-      (
-        sources."split2-3.2.2"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."sprintf-js-1.1.3"
-      sources."sqlite3-5.1.6"
-      sources."sshpk-1.18.0"
-      (
-        sources."ssri-8.0.1"
-        // {
-          dependencies = [
-            sources."minipass-3.3.6"
-          ];
-        }
-      )
-      sources."statuses-1.5.0"
-      sources."stream-shift-1.0.3"
-      sources."strict-uri-encode-2.0.0"
-      sources."string-kit-0.18.3"
-      sources."string-padding-1.0.2"
-      (
-        sources."string-to-stream-3.0.1"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      sources."string-width-4.2.3"
-      sources."string-width-cjs-4.2.3"
-      (
-        sources."string_decoder-1.1.1"
-        // {
-          dependencies = [
-            sources."safe-buffer-5.1.2"
-          ];
-        }
-      )
-      (
-        sources."stringify-parameters-0.0.4"
-        // {
-          dependencies = [
-            sources."magicli-0.0.5"
-          ];
-        }
-      )
-      (
-        sources."strip-ansi-6.0.1"
-        // {
-          dependencies = [
-            sources."ansi-regex-5.0.1"
-          ];
-        }
-      )
-      (
-        sources."strip-ansi-cjs-6.0.1"
-        // {
-          dependencies = [
-            sources."ansi-regex-5.0.1"
-          ];
-        }
-      )
-      sources."strip-final-newline-2.0.0"
-      sources."strip-json-comments-2.0.1"
-      sources."strnum-1.1.2"
-      sources."strtok3-6.3.0"
-      sources."supports-color-7.2.0"
-      sources."symbol-tree-3.2.4"
-      sources."table-layout-0.4.5"
-      sources."tar-6.2.1"
-      (
-        sources."tar-fs-2.1.2"
-        // {
-          dependencies = [
-            sources."chownr-1.1.4"
-          ];
-        }
-      )
-      (
-        sources."tar-stream-2.2.0"
-        // {
-          dependencies = [
-            sources."readable-stream-3.6.2"
-          ];
-        }
-      )
-      (
-        sources."tcp-port-used-1.0.2"
-        // {
-          dependencies = [
-            sources."debug-4.3.1"
-            sources."ms-2.1.2"
-          ];
-        }
-      )
-      sources."terminal-kit-3.1.1"
-      (
-        sources."tkwidgets-0.5.27"
-        // {
-          dependencies = [
-            sources."ansi-styles-3.2.1"
-            sources."chalk-2.4.2"
-            sources."has-flag-3.0.0"
-            sources."is-fullwidth-code-point-2.0.0"
-            sources."seventh-0.7.40"
-            sources."string-kit-0.11.10"
-            sources."string-width-2.1.1"
-            sources."strip-ansi-4.0.0"
-            sources."supports-color-5.5.0"
-            sources."terminal-kit-1.49.4"
-            sources."tree-kit-0.7.5"
-            sources."wrap-ansi-3.0.1"
-          ];
-        }
-      )
-      sources."to-regex-range-5.0.1"
-      sources."toidentifier-1.0.1"
-      sources."token-types-4.2.1"
-      sources."tough-cookie-4.1.4"
-      sources."tr46-5.0.0"
-      sources."tree-kit-0.8.8"
-      sources."tslib-2.8.1"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
-      sources."typedarray-0.0.6"
-      sources."typical-2.6.1"
-      sources."uc.micro-1.0.6"
-      sources."uglify-js-3.19.3"
-      sources."uglifycss-0.0.29"
-      sources."uid-safe-2.1.5"
-      sources."undici-types-6.20.0"
-      sources."uniq-1.0.1"
-      sources."unique-filename-1.1.1"
-      sources."unique-slug-2.0.2"
-      sources."universalify-0.2.0"
-      sources."unorm-1.6.0"
-      sources."unpack-string-0.0.2"
-      sources."upper-case-1.1.3"
-      sources."uri-js-4.4.1"
-      (
-        sources."url-0.10.3"
-        // {
-          dependencies = [
-            sources."punycode-1.3.2"
-          ];
-        }
-      )
-      sources."url-parse-1.5.10"
-      sources."utf-8-validate-6.0.5"
-      sources."util-0.12.5"
-      sources."util-deprecate-1.0.2"
-      sources."uuid-9.0.1"
-      (
-        sources."verror-1.10.0"
-        // {
-          dependencies = [
-            sources."core-util-is-1.0.2"
-          ];
-        }
-      )
-      sources."w3c-xmlserializer-5.0.0"
-      sources."webidl-conversions-7.0.0"
-      sources."whatwg-encoding-3.1.1"
-      sources."whatwg-mimetype-4.0.0"
-      sources."whatwg-url-14.1.1"
-      sources."which-2.0.2"
-      sources."which-typed-array-1.1.19"
-      sources."wide-align-1.1.5"
-      sources."word-wrap-1.2.5"
-      sources."wordwrapjs-3.0.0"
-      (
-        sources."wrap-ansi-8.1.0"
-        // {
-          dependencies = [
-            sources."ansi-regex-6.1.0"
-            sources."emoji-regex-9.2.2"
-            sources."string-width-5.1.2"
-            sources."strip-ansi-7.1.0"
-          ];
-        }
-      )
-      (
-        sources."wrap-ansi-cjs-7.0.0"
-        // {
-          dependencies = [
-            sources."ansi-styles-4.3.0"
-            sources."color-convert-2.0.1"
-          ];
-        }
-      )
-      sources."wrappy-1.0.2"
-      sources."ws-8.18.1"
-      sources."xml-name-validator-5.0.0"
-      sources."xml2js-0.4.23"
-      sources."xmlbuilder-11.0.1"
-      sources."xmlchars-2.2.0"
-      sources."xtend-4.0.2"
-      sources."yallist-4.0.0"
-      sources."yargs-parser-21.1.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Joplin CLI Client";
-      homepage = "https://github.com/laurent22/joplin#readme";
-      license = "AGPL-3.0-or-later";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   js-beautify = nodeEnv.buildNodePackage {
     name = "js-beautify";
     packageName = "js-beautify";
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index ca6a30449003..106899c8edaf 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -55,49 +55,6 @@ final: prev: {
     '';
   };
 
-  joplin = prev.joplin.override (oldAttrs: {
-    nativeBuildInputs = [
-      pkgs.pkg-config
-      (pkgs.python3.withPackages (ps: [ ps.setuptools ]))
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      pkgs.xcbuild
-    ];
-    buildInputs = with pkgs; [
-      # required by sharp
-      # https://sharp.pixelplumbing.com/install
-      vips
-
-      libsecret
-      final.node-gyp-build
-      node-pre-gyp
-
-      pixman
-      cairo
-      pango
-    ];
-
-    # add newer node-addon-api to build sharp
-    # https://github.com/lovell/sharp/issues/3920
-    dependencies = [
-      {
-        name = "node-addon-api";
-        packageName = "node-addon-api";
-        version = "7.1.0";
-        src = fetchurl {
-          url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-7.1.0.tgz";
-          sha512 = "mNcltoe1R8o7STTegSOHdnJNN7s5EUvhoS7ShnTHDyOSd+8H+UdWODq6qSv67PjC8Zc5JRT8+oLAMCr0SIXw7g==";
-        };
-      }
-    ]
-    ++ oldAttrs.dependencies;
-
-    meta = oldAttrs.meta // {
-      # ModuleNotFoundError: No module named 'distutils'
-      broken = stdenv.hostPlatform.isDarwin; # still broken on darwin
-    };
-  });
-
   makam = prev.makam.override {
     nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
     postFixup = ''
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index d390660bf371..f7f758a78104 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -730,6 +730,7 @@ mapAliases {
   jdk24_headless = throw "OpenJDK 24 was removed as it has reached its end of life"; # Added 2025-10-04
   jikespg = throw "'jikespg' has been removed due to lack of maintenance upstream."; # Added 2025-06-10
   jing = jing-trang; # Added 2025-09-18
+  joplin = joplin-cli; # Added 2025-11-03
   jscoverage = throw "jscoverage has been removed, as it was broken"; # Added 2025-08-25
   k2pdfopt = throw "'k2pdfopt' has been removed from nixpkgs as it was broken"; # Added 2025-09-27
   k3s_1_30 = throw "'k3s_1_30' has been removed from nixpkgs as it has reached end of life"; # Added 2025-09-01
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index cbf01694873f..f18414b8b07c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3100,8 +3100,6 @@ with pkgs;
 
   jkqtplotter = libsForQt5.callPackage ../development/libraries/jkqtplotter { };
 
-  joplin = nodePackages.joplin;
-
   jpylyzer = with python3Packages; toPythonApplication jpylyzer;
 
   jsbeautifier = with python3Packages; toPythonApplication jsbeautifier;

From d38f06c3215d8a896e9e1e347d25f6600c5c32b5 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Tue, 4 Nov 2025 15:27:39 -0500
Subject: [PATCH 5605/6226] joplin-cli: fix build on darwin

Co-authored-by: Fugi <me@fugi.dev>
---
 pkgs/by-name/jo/joplin-cli/package.nix | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/jo/joplin-cli/package.nix b/pkgs/by-name/jo/joplin-cli/package.nix
index 17e9942be237..58bb0e5ad2f0 100644
--- a/pkgs/by-name/jo/joplin-cli/package.nix
+++ b/pkgs/by-name/jo/joplin-cli/package.nix
@@ -8,6 +8,9 @@
   pkg-config,
   libsecret,
   rsync,
+  xcbuild,
+  buildPackages,
+  clang_20,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -18,7 +21,11 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "laurent22";
     repo = "joplin";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nWQa+/UJIjCsK0a5IimqcBnD2hrjUHTVdrzb5QKBevw=";
+    postFetch = ''
+      # there's a file with a weird name that causes a hash mismatch on darwin
+      rm $out/packages/app-cli/tests/support/photo*
+    '';
+    hash = "sha256-p9MY7E0qa7LcXBpGs/DmX2A2jXQoOPYiRo/nEzkkQd0=";
   };
 
   missingHashes = ./missing-hashes.json;
@@ -36,6 +43,11 @@ stdenv.mkDerivation (finalAttrs: {
     pkg-config
     libsecret
     rsync
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    xcbuild
+    buildPackages.cctools
+    clang_20 # clang_21 breaks keytar, sqlite
   ];
 
   buildInputs = [

From d538006b4862c07d2a8c19bdcd73fb20ef7c16ae Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Wed, 5 Nov 2025 10:26:25 -0500
Subject: [PATCH 5606/6226] wild-wrapper: init at 0.7.0

---
 pkgs/top-level/all-packages.nix | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 643d53c839fc..1e31652ddc8d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6870,6 +6870,20 @@ with pkgs;
 
   vcpkg-tool-unwrapped = vcpkg-tool.override { doWrap = false; };
 
+  wild-wrapped =
+    let
+      ldWrapper = ../build-support/bintools-wrapper/ld-wrapper.sh;
+    in
+    wrapBintoolsWith {
+      bintools = wild;
+      extraBuildCommands = ''
+        wrap wild ${ldWrapper} ${lib.getExe buildPackages.wild}
+        wrap ld.wild ${ldWrapper} ${lib.getExe buildPackages.wild}
+        wrap ${stdenv.cc.bintools.targetPrefix}ld.wild ${ldWrapper} ${lib.getExe buildPackages.wild}
+        wrap ${stdenv.cc.bintools.targetPrefix}ld ${ldWrapper} ${lib.getExe buildPackages.wild}
+      '';
+    };
+
   whatstyle = callPackage ../development/tools/misc/whatstyle {
     inherit (llvmPackages) clang-unwrapped;
   };

From 57688dc89e15673c1ed8749f33d539a39e8a80cc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 16:47:22 +0000
Subject: [PATCH 5607/6226] python3Packages.toggl-cli: 4.0.0 -> 4.0.1

---
 pkgs/development/python-modules/toggl-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/toggl-cli/default.nix b/pkgs/development/python-modules/toggl-cli/default.nix
index 7d1b79bb12d5..47b4c3e35439 100644
--- a/pkgs/development/python-modules/toggl-cli/default.nix
+++ b/pkgs/development/python-modules/toggl-cli/default.nix
@@ -29,14 +29,14 @@
 
 buildPythonPackage rec {
   pname = "toggl-cli";
-  version = "4.0.0";
+  version = "4.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "AuHau";
     repo = "toggl-cli";
     tag = "v${version}";
-    hash = "sha256-d/0w6VCth1TszolqkaWxHs6SLNiRg3sZj3H4CY+yPdw=";
+    hash = "sha256-f3s0XlhQZH9xC5xyM+e2VG9j1GK0qqWFm4Xy08Iwj/Q=";
   };
 
   env.PBR_VERSION = version;

From e00aded22eca8b73bc46593b2e9ef7de040ebcb0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 16:49:33 +0000
Subject: [PATCH 5608/6226] certinfo: 1.0.38 -> 1.0.39

---
 pkgs/by-name/ce/certinfo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ce/certinfo/package.nix b/pkgs/by-name/ce/certinfo/package.nix
index 7d51f9738edd..a60a6e8da809 100644
--- a/pkgs/by-name/ce/certinfo/package.nix
+++ b/pkgs/by-name/ce/certinfo/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "certinfo";
-  version = "1.0.38";
+  version = "1.0.39";
 
   src = fetchFromGitHub {
     owner = "pete911";
     repo = "certinfo";
     rev = "v${version}";
-    sha256 = "sha256-3CAl/Kf20JMcq7aLOviwxpHkYXnOd2WXqC8o2TLEXGY=";
+    sha256 = "sha256-U3uVQiALtI7aWkIPQyHxSzMTD6AjAMoOEjkbPO07SdA=";
   };
 
   # clipboard functionality not working on Darwin

From a4bc70d4b43727c3e8df264a947c8cadd6ecc73f Mon Sep 17 00:00:00 2001
From: Ross Smyth <18294397+RossSmyth@users.noreply.github.com>
Date: Fri, 6 Jun 2025 13:11:27 -0400
Subject: [PATCH 5609/6226] adapters: Add useWildLinker

---
 pkgs/by-name/wi/wild/adapterTest.nix | 52 ++++++++++++++++++++++++++++
 pkgs/stdenv/adapters.nix             | 16 +++++++++
 2 files changed, 68 insertions(+)

diff --git a/pkgs/by-name/wi/wild/adapterTest.nix b/pkgs/by-name/wi/wild/adapterTest.nix
index db334485cd80..44f80e2634e9 100644
--- a/pkgs/by-name/wi/wild/adapterTest.nix
+++ b/pkgs/by-name/wi/wild/adapterTest.nix
@@ -1,6 +1,10 @@
 {
   lib,
   stdenv,
+  gccStdenv,
+  clangStdenv,
+  buildPackages,
+  runCommandCC,
   makeBinaryWrapper,
   gcc,
   wild,
@@ -8,6 +12,8 @@
   clang,
   lld,
   clang-tools,
+  useWildLinker,
+  hello,
 }:
 let
   # These wrappers are REQUIRED for the Wild test suite to pass
@@ -51,6 +57,38 @@ let
       runHook postBuild
     '';
   };
+
+  # Test helper that takes in a binary and checks that it runs
+  # and was built with Wild
+  helloTest =
+    name: helloWild:
+    let
+      command = "$READELF -p .comment ${lib.getExe helloWild}";
+      emulator = stdenv.hostPlatform.emulator buildPackages;
+    in
+    runCommandCC "wild-${name}-test" { passthru = { inherit helloWild; }; } ''
+      echo "Testing running the 'hello' binary which should be linked with 'wild'" >&2
+      ${emulator} ${lib.getExe helloWild}
+
+      echo "Checking for wild in the '.comment' section" >&2
+      if output=$(${command} 2>&1); then
+        if grep -Fw -- "Wild" - <<< "$output"; then
+          touch $out
+        else
+          echo "No mention of 'wild' detected in the '.comment' section" >&2
+          echo "The command was:" >&2
+          echo "${command}" >&2
+          echo "The output was:" >&2
+          echo "$output" >&2
+          exit 1
+        fi
+      else
+        echo -n "${command}" >&2
+        echo " returned a non-zero exit code." >&2
+        echo "$output" >&2
+        exit 1
+      fi
+    '';
 in
 {
   testWild = wild.overrideAttrs {
@@ -96,4 +134,18 @@ in
 
     installPhase = "touch $out";
   };
+
+  # Test that the adapter works with a gcc stdenv
+  adapterGcc = helloTest "adapter-gcc" (
+    hello.override (_: {
+      stdenv = useWildLinker gccStdenv;
+    })
+  );
+
+  # Test the adapter works with a clang stdenv
+  adapter-llvm = helloTest "adapter-llvm" (
+    hello.override (_: {
+      stdenv = useWildLinker clangStdenv;
+    })
+  );
 }
diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix
index 4ef0e31896df..d7360aa3360f 100644
--- a/pkgs/stdenv/adapters.nix
+++ b/pkgs/stdenv/adapters.nix
@@ -335,6 +335,22 @@ rec {
             }
       );
 
+  useWildLinker =
+    stdenv:
+    if !stdenv.targetPlatform.isLinux then
+      throw "Wild only supports building Linux ELF files from Linux hosts."
+    else
+      stdenv.override (prev: {
+        allowedRequisites = null;
+        cc = prev.cc.override {
+          bintools = prev.cc.bintools.override {
+            extraBuildCommands = ''
+              ln -fs ${pkgs.buildPackages.wild-wrapped}/bin/* "$out/bin"
+            '';
+          };
+        };
+      });
+
   /*
     Modify a stdenv so that it builds binaries optimized specifically
     for the machine they are built on.

From e49048e1f0e7106d301b4cb4d917e17839e8a895 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 16:54:39 +0000
Subject: [PATCH 5610/6226] buildkit: 0.25.1 -> 0.25.2

---
 pkgs/by-name/bu/buildkit/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bu/buildkit/package.nix b/pkgs/by-name/bu/buildkit/package.nix
index 42df5efb43ba..7e920fcc4b65 100644
--- a/pkgs/by-name/bu/buildkit/package.nix
+++ b/pkgs/by-name/bu/buildkit/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "buildkit";
-  version = "0.25.1";
+  version = "0.25.2";
 
   src = fetchFromGitHub {
     owner = "moby";
     repo = "buildkit";
     rev = "v${version}";
-    hash = "sha256-h9XkvgYa7m7LxeUuQ8aFFxNcTULfjQ5gR7vRN9Y89rI=";
+    hash = "sha256-yW75G96Ca27FB2EzAt77640aDVWYZEFA5NcAnZMPOLg=";
   };
 
   vendorHash = null;

From 3bf3043dd8212f55d66584f0e0025dd0f4d88131 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 16:55:47 +0000
Subject: [PATCH 5611/6226] taze: 19.8.1 -> 19.9.0

---
 pkgs/by-name/ta/taze/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ta/taze/package.nix b/pkgs/by-name/ta/taze/package.nix
index 65579ac321c4..6ad11e238957 100644
--- a/pkgs/by-name/ta/taze/package.nix
+++ b/pkgs/by-name/ta/taze/package.nix
@@ -13,19 +13,19 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "taze";
-  version = "19.8.1";
+  version = "19.9.0";
 
   src = fetchFromGitHub {
     owner = "antfu-collective";
     repo = "taze";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xIObsjuHXOr/oSaPI+WDax057IT5Wk4+MuDPHWb9dEU=";
+    hash = "sha256-Xpi5Wc8YP3hUSbEnfEM6uNvdlNiVMRz0oqZAJCBkLHQ=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-XhXqp0eBR5BKtHdJ1JNcZDCHtQA1AEw/aeHIZgA9raQ=";
+    hash = "sha256-g1LGiCb2NESywYN4tTVf8sXbuJla2whCm5amvPsdmRc=";
   };
 
   nativeBuildInputs = [

From b89dd43ab6060fea0f3336416519e0aba0b855ca Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 17:15:18 +0000
Subject: [PATCH 5612/6226] foxglove-cli: 1.0.27 -> 1.0.28

---
 pkgs/by-name/fo/foxglove-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fo/foxglove-cli/package.nix b/pkgs/by-name/fo/foxglove-cli/package.nix
index 7417fb6ed407..f07940be3f6d 100644
--- a/pkgs/by-name/fo/foxglove-cli/package.nix
+++ b/pkgs/by-name/fo/foxglove-cli/package.nix
@@ -11,13 +11,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "foxglove-cli";
-  version = "1.0.27";
+  version = "1.0.28";
 
   src = fetchFromGitHub {
     owner = "foxglove";
     repo = "foxglove-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-c1Kpy5lT1DCyCq4qcmv+crGgNJ3WSP8TO94NgixY2fQ=";
+    hash = "sha256-LfBcbScb+LxWr3+WJ5Y7Gbup+l3me9PHB/QdFu5tB60=";
   };
 
   vendorHash = "sha256-GjgDRFzW4zqVooHx9WEgWkcnZ+zQsr09OuZxtc9rZD4=";

From c067b4d83085db06d659f0ae4f65c8cb008426f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 5 Nov 2025 09:12:22 -0800
Subject: [PATCH 5613/6226] python3Packages.holidays: 0.83 -> 0.84

Diff: https://github.com/vacanza/python-holidays/compare/v0.83...v0.84

Changelog: https://github.com/vacanza/holidays/blob/v0.84/CHANGES.md
---
 pkgs/development/python-modules/holidays/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index fcf735dd999c..daab511cebc4 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "holidays";
-  version = "0.83";
+  version = "0.84";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "vacanza";
     repo = "python-holidays";
     tag = "v${version}";
-    hash = "sha256-GlOydhDSg03uZUxLXDoaT/Jq3DMk+HsSxBtPQE9DQ3U=";
+    hash = "sha256-sqeU9FsIeWy4dHmC3K2ChHhtfSsWGXGWUGV90g7kmvs=";
   };
 
   build-system = [
@@ -57,7 +57,7 @@ buildPythonPackage rec {
   meta = {
     description = "Generate and work with holidays in Python";
     homepage = "https://github.com/vacanza/python-holidays";
-    changelog = "https://github.com/vacanza/python-holidays/releases/tag/${src.tag}";
+    changelog = "https://github.com/vacanza/holidays/blob/${src.tag}/CHANGES.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [
       fab

From 0f69eb4a86760b27cbc1e1b178a28662992b718b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 5 Nov 2025 09:17:14 -0800
Subject: [PATCH 5614/6226] python312Packages.holidays: run tests

---
 pkgs/development/python-modules/holidays/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix
index daab511cebc4..fc76273c14c9 100644
--- a/pkgs/development/python-modules/holidays/default.nix
+++ b/pkgs/development/python-modules/holidays/default.nix
@@ -5,7 +5,9 @@
   fetchFromGitHub,
   importlib-metadata,
   lingva,
+  numpy,
   polib,
+  pytest-cov-stub,
   pytestCheckHook,
   python-dateutil,
   setuptools,
@@ -44,11 +46,11 @@ buildPythonPackage rec {
 
   dependencies = [ python-dateutil ];
 
-  doCheck = false;
-
   nativeCheckInputs = [
     importlib-metadata
+    numpy
     polib
+    pytest-cov-stub
     pytestCheckHook
   ];
 

From db9b20fe7409a598dba3d3381ab33e0731d26890 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 5 Nov 2025 09:19:39 -0800
Subject: [PATCH 5615/6226] python3Packages.libpyfoscamcgi: 0.0.8 -> 0.0.9

Diff: https://github.com/Foscam-wangzhengyu/libfoscamcgi/compare/v0.0.8...v0.0.9

Changelog: https://github.com/Foscam-wangzhengyu/libfoscamcgi/releases/tag/v0.0.9
---
 pkgs/development/python-modules/libpyfoscamcgi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/libpyfoscamcgi/default.nix b/pkgs/development/python-modules/libpyfoscamcgi/default.nix
index 83c137ad2471..b82df45abe45 100644
--- a/pkgs/development/python-modules/libpyfoscamcgi/default.nix
+++ b/pkgs/development/python-modules/libpyfoscamcgi/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "libpyfoscamcgi";
-  version = "0.0.8";
+  version = "0.0.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Foscam-wangzhengyu";
     repo = "libfoscamcgi";
     tag = "v${version}";
-    hash = "sha256-5sgCKlgtS3PWh9osY1X9UzG1DAi3/ipIf+5gf5jF0vQ=";
+    hash = "sha256-tKA2UnVHAUjDfvm+t/aCk+3YfWfwjfEWPRgieDAcr7k=";
   };
 
   build-system = [ setuptools ];

From 8fdfa024e270d54324c429cdf5bca9671c4c4603 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 5 Nov 2025 09:21:44 -0800
Subject: [PATCH 5616/6226] python3Packages.pylitterbot: 2024.2.7 -> 2025.0.0

Diff: https://github.com/natekspencer/pylitterbot/compare/v2024.2.7...v2025.0.0

Changelog: https://github.com/natekspencer/pylitterbot/releases/tag/v2025.0.0
---
 pkgs/development/python-modules/pylitterbot/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix
index 918ad759c9a7..db243048c9f7 100644
--- a/pkgs/development/python-modules/pylitterbot/default.nix
+++ b/pkgs/development/python-modules/pylitterbot/default.nix
@@ -16,18 +16,16 @@
 
 buildPythonPackage rec {
   pname = "pylitterbot";
-  version = "2024.2.7";
+  version = "2025.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "natekspencer";
     repo = "pylitterbot";
     tag = "v${version}";
-    hash = "sha256-gBY9+cd0DKqzHKyB86NzfKkULjVXn3oBSHxyRhmMAno=";
+    hash = "sha256-Rr7QseViy6i13QbZVb8BxMWDsE9meG4NqT5B1Z+TZbc=";
   };
 
-  pythonRelaxDeps = [ "deepdiff" ];
-
   build-system = [
     poetry-core
     poetry-dynamic-versioning

From 02876ddc2f4e390519087446348f01fae5b07504 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 5 Nov 2025 09:26:38 -0800
Subject: [PATCH 5617/6226] python3Packages.sensor-state-data: 2.19.0 -> 2.20.0

Diff: https://github.com/Bluetooth-Devices/sensor-state-data/compare/v2.19.0...v2.20.0

Changelog: https://github.com/Bluetooth-Devices/sensor-state-data/releases/tag/v2.20.0
---
 .../python-modules/sensor-state-data/default.nix      | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix
index 12a40c0af256..3576f71ef934 100644
--- a/pkgs/development/python-modules/sensor-state-data/default.nix
+++ b/pkgs/development/python-modules/sensor-state-data/default.nix
@@ -5,24 +5,21 @@
   poetry-core,
   pytestCheckHook,
   pytest-cov-stub,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "sensor-state-data";
-  version = "2.19.0";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.9";
+  version = "2.20.0";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "sensor-state-data";
     tag = "v${version}";
-    hash = "sha256-Jl+kyr9WhYEzvsnSdqfeDDWgcEU9Yi6Snd67YQ+1MqQ=";
+    hash = "sha256-ONAM1WxKnzRCJsuJa+4zDaOXPkTj+zcTH54SgktpMR8=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
   nativeCheckInputs = [
     pytestCheckHook

From 45c71da6205b6c2e8de301873c6e86c94c6aec37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 5 Nov 2025 09:24:41 -0800
Subject: [PATCH 5618/6226] python3Packages.ruuvitag-ble: 0.2.1 -> 0.3.0

Diff: https://github.com/Bluetooth-Devices/ruuvitag-ble/compare/v0.2.1...v0.3.0

Changelog: https://github.com/Bluetooth-Devices/ruuvitag-ble/releases/tag/v0.3.0
---
 .../python-modules/ruuvitag-ble/default.nix        | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/ruuvitag-ble/default.nix b/pkgs/development/python-modules/ruuvitag-ble/default.nix
index 12077d4878e7..22d199c71f94 100644
--- a/pkgs/development/python-modules/ruuvitag-ble/default.nix
+++ b/pkgs/development/python-modules/ruuvitag-ble/default.nix
@@ -8,22 +8,19 @@
   home-assistant-bluetooth,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   sensor-state-data,
 }:
 
 buildPythonPackage rec {
   pname = "ruuvitag-ble";
-  version = "0.2.1";
+  version = "0.3.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchFromGitHub {
     owner = "Bluetooth-Devices";
     repo = "ruuvitag-ble";
     tag = "v${version}";
-    hash = "sha256-9aaAKb5Av2OMDGaSM9+tT0s++YYE0g1D01Le6RrMoMk=";
+    hash = "sha256-5hlO2/YCTc65ImwjJVyWhFe2PTPlQ33aNdqEIxH/lms=";
   };
 
   build-system = [ hatchling ];
@@ -42,10 +39,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "ruuvitag_ble" ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/Bluetooth-Devices/ruuvitag-ble/releases/tag/${src.tag}";
     description = "Library for Ruuvitag BLE devices";
     homepage = "https://github.com/Bluetooth-Devices/ruuvitag-ble";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

From d86f79cee7425eea1987c20fc686d07334109d19 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 5 Nov 2025 09:42:08 -0800
Subject: [PATCH 5619/6226] immich: 2.2.2 -> 2.2.3

Diff: https://github.com/immich-app/immich/compare/v2.2.2...v2.2.3

Changelog: https://github.com/immich-app/immich/releases/tag/v2.2.3
---
 pkgs/by-name/im/immich-cli/package.nix | 2 +-
 pkgs/by-name/im/immich/package.nix     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/im/immich-cli/package.nix b/pkgs/by-name/im/immich-cli/package.nix
index db841758850f..8d65760c9002 100644
--- a/pkgs/by-name/im/immich-cli/package.nix
+++ b/pkgs/by-name/im/immich-cli/package.nix
@@ -12,7 +12,7 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "immich-cli";
-  version = "2.2.100";
+  version = "2.2.101";
   inherit (immich) src pnpmDeps;
 
   postPatch = ''
diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix
index c12872da602d..aa698cf0a012 100644
--- a/pkgs/by-name/im/immich/package.nix
+++ b/pkgs/by-name/im/immich/package.nix
@@ -34,7 +34,7 @@
 }:
 let
   pnpm = pnpm_10;
-  version = "2.2.2";
+  version = "2.2.3";
 
   esbuild' = buildPackages.esbuild.override {
     buildGoModule =
@@ -108,7 +108,7 @@ let
     owner = "immich-app";
     repo = "immich";
     tag = "v${version}";
-    hash = "sha256-0ibXs4c61CEp6s/gOCsIj2A7VTnA+72jTMXoo4kkt74=";
+    hash = "sha256-OoToTRDPXWOa7d1j1xvkZt+vKWBX4eHDiIsFs3bIlvw=";
   };
 
   pnpmDeps = pnpm.fetchDeps {

From 0c32e0215b3f4f41910e835058cb12d352c36f0d Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Wed, 5 Nov 2025 18:40:15 +0100
Subject: [PATCH 5620/6226] gfn-electron: remove as it's abandoned

---
 pkgs/by-name/gf/gfn-electron/package.nix | 88 ------------------------
 pkgs/top-level/aliases.nix               |  1 +
 2 files changed, 1 insertion(+), 88 deletions(-)
 delete mode 100644 pkgs/by-name/gf/gfn-electron/package.nix

diff --git a/pkgs/by-name/gf/gfn-electron/package.nix b/pkgs/by-name/gf/gfn-electron/package.nix
deleted file mode 100644
index ccddb1b12b05..000000000000
--- a/pkgs/by-name/gf/gfn-electron/package.nix
+++ /dev/null
@@ -1,88 +0,0 @@
-{
-  lib,
-  buildNpmPackage,
-  fetchFromGitHub,
-  electron_35,
-  nix-update-script,
-  makeBinaryWrapper,
-  python3,
-}:
-let
-  electron = electron_35;
-  version = "2.2.0";
-in
-buildNpmPackage {
-  pname = "gfn-electron";
-  inherit version;
-
-  src = fetchFromGitHub {
-    owner = "hmlendea";
-    repo = "gfn-electron";
-    tag = "v${version}";
-    hash = "sha256-DwrNCgBp0CD+HYXRMDsu0aKEKzG7k/tk7oATJc30DlE=";
-  };
-
-  npmDepsHash = "sha256-2v5qTTGhdG1EEK8v50LLYz5jE/36lBm1PKQl6HfqhCU=";
-
-  nativeBuildInputs = [
-    makeBinaryWrapper
-    # node_modules/node-gyp/gyp/pylib/gyp/input.py
-    #   from distutils.version import StrictVersion
-    # ModuleNotFoundError: No module named 'distutils'
-    (python3.withPackages (ps: with ps; [ setuptools ]))
-  ];
-
-  env.ELECTRON_SKIP_BINARY_DOWNLOAD = true;
-
-  # FIXME: Git dependency node_modules/register-scheme contains install scripts,
-  # but has no lockfile, which is something that will probably break.
-  forceGitDeps = true;
-
-  makeCacheWritable = true;
-
-  buildPhase = ''
-    runHook preBuild
-
-    # NOTE: Upstream explicitly opts to not build an ASAR as it would cause all
-    # text to disappear in the app.
-    npm exec electron-builder -- \
-      --dir \
-      -c.electronDist=${electron.dist} \
-      -c.electronVersion=${electron.version}
-
-    runHook postBuild
-  '';
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out
-    cp -r dist/*-unpacked $out/dist
-
-    install -Dm644 com.github.hmlendea.geforcenow-electron.desktop -t $out/share/applications
-    install -Dm644 icon.png $out/share/icons/hicolor/512x512/apps/geforcenow-electron.png
-
-    runHook postInstall
-  '';
-
-  postFixup = ''
-    makeWrapper $out/dist/geforcenow-electron $out/bin/geforcenow-electron \
-      --add-flags "--no-sandbox --disable-gpu-sandbox" \
-      --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}"
-
-    substituteInPlace $out/share/applications/com.github.hmlendea.geforcenow-electron.desktop \
-      --replace-fail "/opt/geforcenow-electron/geforcenow-electron" "geforcenow-electron" \
-      --replace-fail "Icon=nvidia" "Icon=geforcenow-electron"
-  '';
-
-  passthru.updateScript = nix-update-script { };
-
-  meta = {
-    description = "Linux Desktop client for Nvidia's GeForce NOW game streaming service";
-    homepage = "https://github.com/hmlendea/gfn-electron";
-    license = with lib.licenses; [ gpl3Only ];
-    platforms = lib.intersectLists lib.platforms.linux electron.meta.platforms;
-    maintainers = with lib.maintainers; [ pluiedev ];
-    mainProgram = "geforcenow-electron";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8e4071c5bcc9..b8bf405997b2 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -612,6 +612,7 @@ mapAliases {
   gdc = throw "gdc has been removed from Nixpkgs, as recent versions require complex bootstrapping"; # Added 2025-08-08
   gdmd = throw "gdmd has been removed from Nixpkgs, as it depends on GDC which was removed"; # Added 2025-08-08
   geos_3_9 = throw "geos_3_9 has been removed from nixpkgs. Please use a more recent 'geos' instead."; # Added 2025-09-21
+  gfn-electron = throw "gfn-electron has been removed from Nixpkgs as it's abandoned upstream"; # Added 2025-11-05
   gfortran9 = throw "gfortran9 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gfortran10 = throw "gfortran10 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08
   gfortran11 = throw "gfortran11 has been removed from Nixpkgs, as it is unmaintained and obsolete"; # Added 2025-08-08

From 933d435464d61189a5762785f0dc375b8402bdcf Mon Sep 17 00:00:00 2001
From: Yureka <yureka@cyberchaos.dev>
Date: Wed, 5 Nov 2025 18:44:45 +0100
Subject: [PATCH 5621/6226] electron_35-bin: remove

---
 pkgs/development/tools/electron/binary/info.json | 11 -----------
 pkgs/top-level/aliases.nix                       |  2 ++
 pkgs/top-level/all-packages.nix                  |  2 --
 3 files changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/development/tools/electron/binary/info.json b/pkgs/development/tools/electron/binary/info.json
index b79efa230aec..3a8bb1719453 100644
--- a/pkgs/development/tools/electron/binary/info.json
+++ b/pkgs/development/tools/electron/binary/info.json
@@ -1,15 +1,4 @@
 {
-    "35": {
-        "hashes": {
-            "aarch64-darwin": "2fe3a3cfad607a8c1627f6f2bb9834f959c665ef575b663206db11929634b92f",
-            "aarch64-linux": "35c4c30aed2639a38fafa6bd1a6a97b3af89a681afbd5c7a0f40673859040ea3",
-            "armv7l-linux": "350e80638b5ba8a1b56e2463fa55de25f8ee595c0496ef833b07fb4dc65e0c22",
-            "headers": "1w8qcgsbii6gizv31i1nkbhaipcr6r1x384wkwnxp60dk9a6cl59",
-            "x86_64-darwin": "48a426bb5df999dd46c0700261a1a7f572b17581c4c0d1c28afade5ae600cdc9",
-            "x86_64-linux": "368d155a2189e1056d111d334b712779e77066fce1f5ab935b22c4ef544eaa29"
-        },
-        "version": "35.7.5"
-    },
     "36": {
         "hashes": {
             "aarch64-darwin": "73eb08fd541e6105d448735f2f820a7e0f63ff07e836ca05462dc2c01028e7df",
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index b8bf405997b2..031702efa9ec 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -518,6 +518,8 @@ mapAliases {
   edid-decode = v4l-utils; # Added 2025-06-20
   eidolon = throw "eidolon was removed as it is unmaintained upstream."; # Added 2025-05-28
   eintopf = throw "'eintopf' has been renamed to/replaced by 'lauti'"; # Converted to throw 2025-10-27
+  electron_35 = throw "electron_35 has been removed in favor of newer versions"; # added 2025-11-06
+  electron_35-bin = throw "electron_35-bin has been removed in favor of newer versions"; # added 2025-11-06
   elementsd-simplicity = throw "'elementsd-simplicity' has been removed due to lack of maintenance, consider using 'elementsd' instead"; # Added 2025-06-04
   elixir_ls = throw "'elixir_ls' has been renamed to/replaced by 'elixir-ls'"; # Converted to throw 2025-10-27
   elm-github-install = throw "'elm-github-install' has been removed as it is abandoned upstream and only supports Elm 0.18.0"; # Added 2025-08-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 23ace9a0a66b..d0f3c4e7cac8 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6141,7 +6141,6 @@ with pkgs;
   electron-source = callPackage ../development/tools/electron { };
 
   inherit (callPackages ../development/tools/electron/binary { })
-    electron_35-bin
     electron_36-bin
     electron_37-bin
     electron_38-bin
@@ -6156,7 +6155,6 @@ with pkgs;
     electron-chromedriver_39
     ;
 
-  electron_35 = electron_35-bin;
   electron_36 = electron_36-bin;
   electron_37 =
     if lib.meta.availableOn stdenv.hostPlatform electron-source.electron_37 then

From 8bf0689e78ac4e44ec3c8fb4422c5293c210f74b Mon Sep 17 00:00:00 2001
From: Luflosi <luflosi@luflosi.de>
Date: Wed, 15 Oct 2025 21:53:15 +0200
Subject: [PATCH 5622/6226] uboot: expose some comments as longDescription

Some comments are useful to users, so let's allow them to read the comments without having to look in the source code.
---
 pkgs/misc/uboot/default.nix | 57 ++++++++++++++++++++++++++-----------
 1 file changed, 41 insertions(+), 16 deletions(-)

diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix
index 7d5d74f1c730..7a8811a5492c 100644
--- a/pkgs/misc/uboot/default.nix
+++ b/pkgs/misc/uboot/default.nix
@@ -313,9 +313,6 @@ in
     '';
   };
 
-  # Flashing instructions:
-  # dd if=u-boot.gxl.sd.bin of=<sdcard> conv=fsync,notrunc bs=512 skip=1 seek=1
-  # dd if=u-boot.gxl.sd.bin of=<sdcard> conv=fsync,notrunc bs=1 count=444
   ubootLibreTechCC =
     let
       firmwareImagePkg = fetchFromGitHub {
@@ -330,6 +327,15 @@ in
       defconfig = "libretech-cc_defconfig";
       extraMeta = {
         broken = stdenv.buildPlatform.system != "x86_64-linux"; # aml_encrypt_gxl is a x86_64 binary
+        longDescription = ''
+          Boot loader for the Libre Computer AML-S905X-CC.
+
+          Flashing instructions:
+          ```sh
+          dd if=u-boot.gxl.sd.bin of=<sdcard> conv=fsync,notrunc bs=512 skip=1 seek=1
+          dd if=u-boot.gxl.sd.bin of=<sdcard> conv=fsync,notrunc bs=1 count=444
+          ```
+        '';
         platforms = [ "aarch64-linux" ];
       };
       filesToInstall = [ "u-boot.bin" ];
@@ -415,10 +421,6 @@ in
     ];
   };
 
-  # Flashing instructions:
-  # dd if=bl1.bin.hardkernel of=<device> conv=fsync bs=1 count=442
-  # dd if=bl1.bin.hardkernel of=<device> conv=fsync bs=512 skip=1 seek=1
-  # dd if=u-boot.gxbb of=<device> conv=fsync bs=512 seek=97
   ubootOdroidC2 =
     let
       firmwareBlobs = fetchFromGitHub {
@@ -431,7 +433,19 @@ in
     in
     buildUBoot {
       defconfig = "odroid-c2_defconfig";
-      extraMeta.platforms = [ "aarch64-linux" ];
+      extraMeta = {
+        longDescription = ''
+          Boot loader for the Hardkernel ODROID-C2.
+
+          Flashing instructions:
+          ```sh
+          dd if=bl1.bin.hardkernel of=<device> conv=fsync bs=1 count=442
+          dd if=bl1.bin.hardkernel of=<device> conv=fsync bs=512 skip=1 seek=1
+          dd if=u-boot.gxbb of=<device> conv=fsync bs=512 seek=97
+          ```
+        '';
+        platforms = [ "aarch64-linux" ];
+      };
       filesToInstall = [
         "u-boot.bin"
         "u-boot.gxbb"
@@ -774,13 +788,17 @@ in
     ];
   };
 
-  # A special build with much lower memory frequency (666 vs 1600 MT/s) which
-  # makes ROCK64 V2 boards stable. This is necessary because the DDR3 routing
-  # on that revision is marginal and not unconditionally stable at the specified
-  # frequency. If your ROCK64 is unstable you can try this u-boot variant to
-  # see if it works better for you. The only disadvantage is lowered memory
-  # bandwidth.
   ubootRock64v2 = buildUBoot {
+    extraMeta.longDescription = ''
+      Boot loader for the Pine64 Rock64 V2.
+
+      A special build with much lower memory frequency (666 vs 1600 MT/s) which
+      makes ROCK64 V2 boards stable. This is necessary because the DDR3 routing
+      on that revision is marginal and not unconditionally stable at the specified
+      frequency. If your ROCK64 is unstable you can try this u-boot variant to
+      see if it works better for you. The only disadvantage is lowered memory
+      bandwidth.
+    '';
     prePatch = ''
       substituteInPlace arch/arm/dts/rk3328-rock64-u-boot.dtsi \
         --replace rk3328-sdram-lpddr3-1600.dtsi rk3328-sdram-lpddr3-666.dtsi
@@ -864,8 +882,15 @@ in
     extraConfig = ''
       CONFIG_CMD_SETEXPR=y
     '';
-    # sata init; load sata 0 $loadaddr u-boot-with-nand-spl.imx
-    # sf probe; sf update $loadaddr 0 80000
+    extraMeta.longDescription = ''
+      Boot loader for the CompuLab CM-FX6.
+
+      Flashing instructions:
+      ```
+      sata init; load sata 0 $loadaddr u-boot-with-nand-spl.imx
+      sf probe; sf update $loadaddr 0 80000
+      ```
+    '';
   };
 
   ubootVisionFive2 = buildUBoot {

From ae69e30d0b1bc93b321932fb3d0ebfaf358ef65e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Nov 2025 11:33:51 -0800
Subject: [PATCH 5623/6226] python3Packages.actron-neo-api: init at 0.1.84

---
 .../python-modules/actron-neo-api/default.nix | 58 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/development/python-modules/actron-neo-api/default.nix

diff --git a/pkgs/development/python-modules/actron-neo-api/default.nix b/pkgs/development/python-modules/actron-neo-api/default.nix
new file mode 100644
index 000000000000..bd64ad0e9547
--- /dev/null
+++ b/pkgs/development/python-modules/actron-neo-api/default.nix
@@ -0,0 +1,58 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pydantic,
+  pytest-asyncio,
+  pytestCheckHook,
+  setuptools,
+  setuptools-scm,
+}:
+
+buildPythonPackage rec {
+  pname = "actron-neo-api";
+  version = "0.1.84";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "kclif9";
+    repo = "actronneoapi";
+    tag = "v${version}";
+    hash = "sha256-ihIg264ZX0tCfRwVLkiq62ke2G125ObcrVabPCDrc4c=";
+  };
+
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
+
+  dependencies = [
+    aiohttp
+    pydantic
+  ];
+
+  pythonImportsCheck = [ "actron_neo_api" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # test hangs
+    "test_poll_for_token_pending"
+    # AttributeError: property 'authorization_header' of 'ActronAirOAuth2DeviceCodeAuth' object has no setter
+    "test_lazy_token_refres"
+    # ActronAirAuthError: Refresh token is required to refresh the access token
+    "test_get_user_info"
+  ];
+
+  meta = {
+    changelog = "https://github.com/kclif9/actronneoapi/releases/tag/${src.tag}";
+    description = "Communicate with Actron Air systems via the Actron Neo API";
+    homepage = "https://github.com/kclif9/actronneoapi";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f22805eed7cc..b672c25ca6b2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -59,6 +59,8 @@ self: super: with self; {
 
   actdiag = callPackage ../development/python-modules/actdiag { };
 
+  actron-neo-api = callPackage ../development/python-modules/actron-neo-api { };
+
   acunetix = callPackage ../development/python-modules/acunetix { };
 
   adafruit-board-toolkit = callPackage ../development/python-modules/adafruit-board-toolkit { };

From 44ee5388060ed5c939e9fd6b853d7446fe1c901d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 23:27:46 -0700
Subject: [PATCH 5624/6226] python3Packages.aio-ownet: init at 0.0.4

---
 .../python-modules/aio-ownet/default.nix      | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/python-modules/aio-ownet/default.nix

diff --git a/pkgs/development/python-modules/aio-ownet/default.nix b/pkgs/development/python-modules/aio-ownet/default.nix
new file mode 100644
index 000000000000..80b3fbbdab26
--- /dev/null
+++ b/pkgs/development/python-modules/aio-ownet/default.nix
@@ -0,0 +1,41 @@
+{
+  buildPythonPackage,
+  click,
+  fetchFromGitHub,
+  lib,
+  poetry-core,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "aio-ownet";
+  version = "0.0.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "hacf-fr";
+    repo = "aio-ownet";
+    tag = "v${version}";
+    hash = "sha256-XaulcBrFLu8YsfaYQsZfUBHnw0H5qX6itdgsiW89Ca4=";
+  };
+
+  build-system = [ poetry-core ];
+
+  optional-dependencies = {
+    cli = [ click ];
+  };
+
+  pythonImportsCheck = [ "aio_ownet" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/hacf-fr/aio-ownet/releases/tag/${src.tag}";
+    description = "Asynchronous OWFS (owserver network protocol) client library";
+    homepage = "https://github.com/hacf-fr/aio-ownet";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b672c25ca6b2..90055cc2154c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -180,6 +180,8 @@ self: super: with self; {
 
   aio-georss-gdacs = callPackage ../development/python-modules/aio-georss-gdacs { };
 
+  aio-ownet = callPackage ../development/python-modules/aio-ownet { };
+
   aio-pika = callPackage ../development/python-modules/aio-pika { };
 
   aioacaia = callPackage ../development/python-modules/aioacaia { };

From 19a04ace007ad11f58a519227805897afcfd170d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 30 Oct 2025 22:36:51 -0700
Subject: [PATCH 5625/6226] python3Packages.aioamazondevices: 6.4.6 -> 6.5.6

Diff: https://github.com/chemelli74/aioamazondevices/compare/v6.4.6...v6.5.6

Changelog: https://github.com/chemelli74/aioamazondevices/blob/v6.5.6/CHANGELOG.md
---
 .../python-modules/aioamazondevices/default.nix           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/aioamazondevices/default.nix b/pkgs/development/python-modules/aioamazondevices/default.nix
index b1153a351968..c6380fc0d7fe 100644
--- a/pkgs/development/python-modules/aioamazondevices/default.nix
+++ b/pkgs/development/python-modules/aioamazondevices/default.nix
@@ -10,19 +10,19 @@
   poetry-core,
   pytest-cov-stub,
   pytestCheckHook,
-  yarl,
+  python-dateutil,
 }:
 
 buildPythonPackage rec {
   pname = "aioamazondevices";
-  version = "6.4.6";
+  version = "6.5.6";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "chemelli74";
     repo = "aioamazondevices";
     tag = "v${version}";
-    hash = "sha256-EjgZ/zmUSCaLDUmijYMCXvwpl4dWfjmTdlO5VLuzIHg=";
+    hash = "sha256-OgcOsRKqSU3k4myfHmOYaXW259LDgYWj0gXPLwabVIM=";
   };
 
   build-system = [ poetry-core ];
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     colorlog
     langcodes
     orjson
-    yarl
+    python-dateutil
   ];
 
   pythonImportsCheck = [ "aioamazondevices" ];

From b25b7999472e7d1ef080eeda1ffeec2370b5cc45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 30 Oct 2025 22:40:42 -0700
Subject: [PATCH 5626/6226] python3Packages.aioautomower: 2.3.1 -> 2.7.0

Diff: https://github.com/Thomas55555/aioautomower/compare/v2.3.1...v2.7.0

Changelog: https://github.com/Thomas55555/aioautomower/releases/tag/v2.7.0
---
 .../python-modules/aioautomower/default.nix    | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/aioautomower/default.nix b/pkgs/development/python-modules/aioautomower/default.nix
index 693f150c9d22..63559a874bda 100644
--- a/pkgs/development/python-modules/aioautomower/default.nix
+++ b/pkgs/development/python-modules/aioautomower/default.nix
@@ -7,6 +7,7 @@
   freezegun,
   ical,
   mashumaro,
+  orjson,
   poetry-core,
   poetry-dynamic-versioning,
   pyjwt,
@@ -22,7 +23,7 @@
 
 buildPythonPackage rec {
   pname = "aioautomower";
-  version = "2.3.1";
+  version = "2.7.0";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -31,7 +32,7 @@ buildPythonPackage rec {
     owner = "Thomas55555";
     repo = "aioautomower";
     tag = "v${version}";
-    hash = "sha256-M0BAErX5S3BjP+YSv+j2m453T4+U4uHV6N0kWmc42ls=";
+    hash = "sha256-qhjfnneLJjdDDP4XrecSI/psqEqKGP5ziaPd/iRiZfM=";
   };
 
   postPatch = ''
@@ -49,6 +50,7 @@ buildPythonPackage rec {
     aiohttp
     ical
     mashumaro
+    orjson
     pyjwt
     python-dateutil
     tzlocal
@@ -67,23 +69,17 @@ buildPythonPackage rec {
   pythonImportsCheck = [ "aioautomower" ];
 
   disabledTests = [
-    # File is missing
-    "test_standard_mower"
-    # Call no found
-    "test_post_commands"
     # Timezone mismatches
-    "test_full_planner_event"
-    "test_sinlge_planner_event"
     "test_set_datetime"
     "test_message_event"
     "test_async_get_messages"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Module to communicate with the Automower Connect API";
     homepage = "https://github.com/Thomas55555/aioautomower";
     changelog = "https://github.com/Thomas55555/aioautomower/releases/tag/${src.tag}";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

From 404bf936dfc3277710c444572aa660d5626c0741 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 17 Oct 2025 18:35:17 +0200
Subject: [PATCH 5627/6226] python313Packages.aiomealie: 0.10.2 -> 1.0.1

Diff: https://github.com/joostlek/python-mealie/compare/v0.10.2...v1.0.1

Changelog: https://github.com/joostlek/python-mealie/releases/tag/v1.0.1
---
 pkgs/development/python-modules/aiomealie/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiomealie/default.nix b/pkgs/development/python-modules/aiomealie/default.nix
index 13792ccd42de..30ee6d4f2316 100644
--- a/pkgs/development/python-modules/aiomealie/default.nix
+++ b/pkgs/development/python-modules/aiomealie/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "aiomealie";
-  version = "0.10.2";
+  version = "1.0.1";
   pyproject = true;
 
   disabled = pythonOlder "3.11";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "joostlek";
     repo = "python-mealie";
     tag = "v${version}";
-    hash = "sha256-VOUtSHxixGpfeP4G0puB1RPgaqvell1SBO7akEnLzrg=";
+    hash = "sha256-J0G0vRFkYZDDVBYxd4Dc/tSZJ991H1F2Acsew0zf9Oo=";
   };
 
   build-system = [ poetry-core ];

From 4764f7a2ff15f496f4c5dcb44c60281added8ff2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 09:50:05 -0700
Subject: [PATCH 5628/6226] python3Packages.aiovodafone: 1.2.1 -> 3.0.0

Diff: https://github.com/chemelli74/aiovodafone/compare/v1.2.1...v3.0.0

Changelog: https://github.com/chemelli74/aiovodafone/blob/v3.0.0/CHANGELOG.md
---
 .../python-modules/aiovodafone/default.nix       | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/aiovodafone/default.nix b/pkgs/development/python-modules/aiovodafone/default.nix
index 58544c789d9d..1d804579bae1 100644
--- a/pkgs/development/python-modules/aiovodafone/default.nix
+++ b/pkgs/development/python-modules/aiovodafone/default.nix
@@ -2,9 +2,11 @@
   lib,
   aiohttp,
   beautifulsoup4,
-  colorlog,
   buildPythonPackage,
+  colorlog,
+  cryptography,
   fetchFromGitHub,
+  orjson,
   poetry-core,
   pytest-cov-stub,
   pytestCheckHook,
@@ -13,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "aiovodafone";
-  version = "1.2.1";
+  version = "3.0.0";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -22,7 +24,7 @@ buildPythonPackage rec {
     owner = "chemelli74";
     repo = "aiovodafone";
     tag = "v${version}";
-    hash = "sha256-i4zsOHauKPq2b9LfWd4HYe04oOambbibHfNrJLiSSYw=";
+    hash = "sha256-JeMB7K2NURvMPgCZRNAFt9ThIu4LDq3WlmAXsgm1CKs=";
   };
 
   build-system = [ poetry-core ];
@@ -30,7 +32,9 @@ buildPythonPackage rec {
   dependencies = [
     aiohttp
     beautifulsoup4
+    cryptography
     colorlog
+    orjson
   ];
 
   nativeCheckInputs = [
@@ -40,11 +44,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aiovodafone" ];
 
-  meta = with lib; {
+  meta = {
     description = "Library to control Vodafon Station";
     homepage = "https://github.com/chemelli74/aiovodafone";
     changelog = "https://github.com/chemelli74/aiovodafone/blob/${src.tag}/CHANGELOG.md";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

From cd0db1dcdb0b850a58d5ca2c293566f1b2612048 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 04:40:25 +0000
Subject: [PATCH 5629/6226] python3Packages.airos: 0.5.5 -> 0.6.0

---
 pkgs/development/python-modules/airos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/airos/default.nix b/pkgs/development/python-modules/airos/default.nix
index 9a6ccbf5d0fc..7c2ecfab20be 100644
--- a/pkgs/development/python-modules/airos/default.nix
+++ b/pkgs/development/python-modules/airos/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "airos";
-  version = "0.5.5";
+  version = "0.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "CoMPaTech";
     repo = "python-airos";
     tag = "v${version}";
-    hash = "sha256-AXzqm5UN+Z0nXqdhsmGuVfwGJuyZgR+imUzmiODnZqk=";
+    hash = "sha256-ako/4D1iKoKRcxxNV1CzUEqSwSEyo+Udf0z4j+mpVgA=";
   };
 
   build-system = [ setuptools ];

From 601628cb6821518adf86599cd93c9477dc49d8d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 09:56:54 -0700
Subject: [PATCH 5630/6226] python3Packages.bellows: 0.46.1 -> 0.47.2

Diff: https://github.com/zigpy/bellows/compare/0.46.1...0.47.2

Changelog: https://github.com/zigpy/bellows/releases/tag/0.47.0
           https://github.com/zigpy/bellows/releases/tag/0.47.1
           https://github.com/zigpy/bellows/releases/tag/0.47.2
---
 pkgs/development/python-modules/bellows/default.nix | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix
index 8c91381b52ac..0e405eb970be 100644
--- a/pkgs/development/python-modules/bellows/default.nix
+++ b/pkgs/development/python-modules/bellows/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  async-timeout,
   buildPythonPackage,
   click,
   click-log,
@@ -16,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "bellows";
-  version = "0.46.1";
+  version = "0.47.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "bellows";
     tag = version;
-    hash = "sha256-YQt9imL9poGLrkVj9LmR+XPUufRMOgVhAr+Bw+/VdI0=";
+    hash = "sha256-1gWmXrRCYmU0VemhW5TCn1/rnOmz07q8bQ6W3a2mXro=";
   };
 
   postPatch = ''
@@ -39,8 +38,7 @@ buildPythonPackage rec {
     click-log
     voluptuous
     zigpy
-  ]
-  ++ lib.optionals (pythonOlder "3.11") [ async-timeout ];
+  ];
 
   nativeCheckInputs = [
     pytestCheckHook

From 321f067abc42071b2bec9b9f6654ea2a7338bf0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 19 Oct 2025 21:13:16 -0700
Subject: [PATCH 5631/6226] python3Packages.blinkpy: 0.23.0 -> 0.24.1

Diff: https://github.com/fronzbot/blinkpy/compare/v0.23.0...v0.24.1

Changelog: https://github.com/fronzbot/blinkpy/releases/tag/v0.24.0
           https://github.com/fronzbot/blinkpy/releases/tag/v0.24.1
---
 .../python-modules/blinkpy/default.nix        | 25 ++++++-------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/blinkpy/default.nix b/pkgs/development/python-modules/blinkpy/default.nix
index 6f42ae55fbf9..f45638c7492f 100644
--- a/pkgs/development/python-modules/blinkpy/default.nix
+++ b/pkgs/development/python-modules/blinkpy/default.nix
@@ -2,7 +2,6 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  fetchpatch2,
   aiofiles,
   aiohttp,
   pytest-asyncio,
@@ -17,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "blinkpy";
-  version = "0.23.0";
+  version = "0.24.1";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -26,21 +25,13 @@ buildPythonPackage rec {
     owner = "fronzbot";
     repo = "blinkpy";
     tag = "v${version}";
-    hash = "sha256-MWXOxE0nxBFhkAWjy7qFPhv4AO6VjGf+fAiyaWXeiX8=";
+    hash = "sha256-UjkVpXqGOOwtpBslQB61osaQvkuvD4A+xeUrMpyWetg=";
   };
 
-  patches = [
-    (fetchpatch2 {
-      # Fix tests with aiohttp 3.10+
-      url = "https://github.com/fronzbot/blinkpy/commit/e2c747b5ad295424b08ff4fb03204129155666fc.patch";
-      hash = "sha256-FapgAZcKBWqtAPjRl2uOFgnYPoWq6UU88XGLO7oCmDI=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace ', "wheel~=0.40.0"' "" \
-      --replace "setuptools~=68.0" "setuptools"
+      --replace-fail "wheel~=0.40.0" wheel \
+      --replace-fail "setuptools>=68,<81" setuptools
   '';
 
   nativeBuildInputs = [ setuptools ];
@@ -69,11 +60,11 @@ buildPythonPackage rec {
     "blinkpy.sync_module"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Python library for the Blink Camera system";
     homepage = "https://github.com/fronzbot/blinkpy";
-    changelog = "https://github.com/fronzbot/blinkpy/blob/${src.rev}/CHANGES.rst";
-    license = licenses.mit;
-    maintainers = with maintainers; [ dotlambda ];
+    changelog = "https://github.com/fronzbot/blinkpy/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ dotlambda ];
   };
 }

From 9cfb67112216846b8b37d94a539dbbcdbdf8e872 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 30 Oct 2025 22:57:26 -0700
Subject: [PATCH 5632/6226] python3Packages.deebot-client: 15.1.0 -> 16.3.0

Diff: https://github.com/DeebotUniverse/client.py/compare/15.1.0...16.3.0

Changelog: https://github.com/DeebotUniverse/client.py/releases/tag/16.0.0
           https://github.com/DeebotUniverse/client.py/releases/tag/16.1.0
           https://github.com/DeebotUniverse/client.py/releases/tag/16.2.0
           https://github.com/DeebotUniverse/client.py/releases/tag/16.3.0
---
 pkgs/development/python-modules/deebot-client/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/deebot-client/default.nix b/pkgs/development/python-modules/deebot-client/default.nix
index 13bcf901bdca..72381b0567a4 100644
--- a/pkgs/development/python-modules/deebot-client/default.nix
+++ b/pkgs/development/python-modules/deebot-client/default.nix
@@ -15,13 +15,14 @@
   pytestCheckHook,
   pythonOlder,
   rustPlatform,
+  syrupy,
   testfixtures,
   xz,
 }:
 
 buildPythonPackage rec {
   pname = "deebot-client";
-  version = "15.1.0";
+  version = "16.3.0";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -30,12 +31,12 @@ buildPythonPackage rec {
     owner = "DeebotUniverse";
     repo = "client.py";
     tag = version;
-    hash = "sha256-ey7xr9ejDFwfSNwhNBmI2/oJ6zoeAmyTsByxLQ3MQe4=";
+    hash = "sha256-FjUHYG0AkZ/AS1jZhPc28f8rnjuWIyRpumnRnDaoRqY=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-28Rkm5doYRtrH+Rc64gYxzNwVjBaGzLTynej8OwBqVg=";
+    hash = "sha256-jAycxAxSSWwDNhtdvSCLujMsa7dMQ1lFLtMtVsKHdvk=";
   };
 
   pythonRelaxDeps = [
@@ -66,6 +67,7 @@ buildPythonPackage rec {
     pytest-asyncio
     pytest-codspeed
     pytestCheckHook
+    syrupy
     testfixtures
   ];
 

From e61951caaff58389eb678db193a55bfd82c45a2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 29 Oct 2025 16:48:36 -0700
Subject: [PATCH 5633/6226] python3Packages.hass-nabucasa: 1.1.1 -> 1.5.1

Diff: https://github.com/nabucasa/hass-nabucasa/compare/1.1.1...1.5.1

Changelog: https://github.com/NabuCasa/hass-nabucasa/releases/tag/1.1.2
           https://github.com/NabuCasa/hass-nabucasa/releases/tag/1.2.0
           https://github.com/NabuCasa/hass-nabucasa/releases/tag/1.3.0
           https://github.com/NabuCasa/hass-nabucasa/releases/tag/1.4.0
           https://github.com/NabuCasa/hass-nabucasa/releases/tag/1.5.0
           https://github.com/NabuCasa/hass-nabucasa/releases/tag/1.5.1
---
 .../python-modules/hass-nabucasa/default.nix      | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix
index e231e8ab6013..16b874cc9ce8 100644
--- a/pkgs/development/python-modules/hass-nabucasa/default.nix
+++ b/pkgs/development/python-modules/hass-nabucasa/default.nix
@@ -9,6 +9,7 @@
   cryptography,
   fetchFromGitHub,
   freezegun,
+  josepy,
   pycognito,
   pyjwt,
   pytest-aiohttp,
@@ -20,13 +21,15 @@
   setuptools,
   snitun,
   syrupy,
+  voluptuous,
   webrtc-models,
   xmltodict,
+  yarl,
 }:
 
 buildPythonPackage rec {
   pname = "hass-nabucasa";
-  version = "1.1.1";
+  version = "1.5.1";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
@@ -35,7 +38,7 @@ buildPythonPackage rec {
     owner = "nabucasa";
     repo = "hass-nabucasa";
     tag = version;
-    hash = "sha256-4wqlV3stqbraiDBp/g5XNMiUR8SsmGggqXlq6MXXgbM=";
+    hash = "sha256-BYRVr8YWYG+6vmCFCEJH0v2s+EpefDxmcBMHkXHRCrA=";
   };
 
   postPatch = ''
@@ -58,11 +61,14 @@ buildPythonPackage rec {
     attrs
     ciso8601
     cryptography
+    josepy
     pycognito
     pyjwt
     sentence-stream
     snitun
+    voluptuous
     webrtc-models
+    yarl
   ];
 
   nativeCheckInputs = [
@@ -75,11 +81,6 @@ buildPythonPackage rec {
     xmltodict
   ];
 
-  disabledTests = [
-    # mock time 10800s (3h) vs 43200s (12h)
-    "test_subscription_reconnection_handler_renews_and_starts"
-  ];
-
   pythonImportsCheck = [ "hass_nabucasa" ];
 
   meta = with lib; {

From 63bf16cfa7001d5a752aca57e38d8cdeb8e234fa Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 9 Oct 2025 00:59:42 +0200
Subject: [PATCH 5634/6226] python3Packages.hassil: 3.2.0 -> 3.4.0

https://github.com/home-assistant/hassil/blob/v3.4.0/CHANGELOG.md
---
 pkgs/development/python-modules/hassil/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hassil/default.nix b/pkgs/development/python-modules/hassil/default.nix
index 7400218e1504..0f20119deaa0 100644
--- a/pkgs/development/python-modules/hassil/default.nix
+++ b/pkgs/development/python-modules/hassil/default.nix
@@ -16,7 +16,7 @@
 
 let
   pname = "hassil";
-  version = "3.2.0";
+  version = "3.4.0";
 in
 buildPythonPackage rec {
   inherit pname version;
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "home-assistant";
     repo = "hassil";
     tag = "v${version}";
-    hash = "sha256-X+VOcgOFcdb29VfJCfD1xBEqY/1qbfwViS/N9PsT2y8=";
+    hash = "sha256-rroljEJ0xXW15iKmW6C64+h8epNB6XJzKtylA/wKyWQ=";
   };
 
   build-system = [ setuptools ];

From a8ab1e0d3ce6f51510217cca7aa14fadfa8ef558 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Nov 2025 15:25:27 -0800
Subject: [PATCH 5635/6226] python3Packages.librehardwaremonitor-api: 1.4.0 ->
 1.5.0

Diff: https://github.com/Sab44/librehardwaremonitor-api/compare/v1.4.0...v1.5.0
---
 .../python-modules/librehardwaremonitor-api/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/librehardwaremonitor-api/default.nix b/pkgs/development/python-modules/librehardwaremonitor-api/default.nix
index 8e41c7041328..fb3e23ac8e7d 100644
--- a/pkgs/development/python-modules/librehardwaremonitor-api/default.nix
+++ b/pkgs/development/python-modules/librehardwaremonitor-api/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "librehardwaremonitor-api";
-  version = "1.4.0";
+  version = "1.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Sab44";
     repo = "librehardwaremonitor-api";
     tag = "v${version}";
-    hash = "sha256-yYJOizO6blfwRBWD9oFnaein7DK1F8Kl744ErehXU0Q=";
+    hash = "sha256-LWh0kZp+8OUfBohQMLFXI/kkHsVuJt99YqwSGeq4EvA=";
   };
 
   build-system = [ setuptools ];

From 265b498a9a5d300586722529d865a2aef9ae557b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 14:30:12 -0700
Subject: [PATCH 5636/6226] python3Packages.pytest-aioresponses: init at 0.3.0

---
 .../pytest-aioresponses/default.nix           | 59 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 61 insertions(+)
 create mode 100644 pkgs/development/python-modules/pytest-aioresponses/default.nix

diff --git a/pkgs/development/python-modules/pytest-aioresponses/default.nix b/pkgs/development/python-modules/pytest-aioresponses/default.nix
new file mode 100644
index 000000000000..4f0a60fa3912
--- /dev/null
+++ b/pkgs/development/python-modules/pytest-aioresponses/default.nix
@@ -0,0 +1,59 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchpatch,
+  fetchPypi,
+  poetry-core,
+  aioresponses,
+  pytest,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "pytest-aioresponses";
+  version = "0.3.0";
+  pyproject = true;
+
+  # no tags on GitHub
+  src = fetchPypi {
+    pname = "pytest_aioresponses";
+    inherit version;
+    hash = "sha256-VnezLfoaNpCLNHUktYZ6qzWsHFzh1JcCRNb2YAm8p7Y=";
+  };
+
+  patches = [
+    # https://github.com/pheanex/pytest-aioresponses/pull/5
+    (fetchpatch {
+      name = "use-poetry-core.patch";
+      url = "https://github.com/pheanex/pytest-aioresponses/commit/05595c1b73a9d9b01179bd434fb7cc57230c9251.patch";
+      hash = "sha256-CejYyzAYwsueI0k9O4fcTGC0O8dz0vgE057IrvC5YRo=";
+    })
+  ];
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    aioresponses
+  ];
+
+  buildInputs = [
+    pytest
+  ];
+
+  pythonImportsCheck = [ "pytest_aioresponses" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  # test_pytest_aioresponses.py isn't distributed on PyPI
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/pheanex/pytest-aioresponses/blob/main/Changelog";
+    description = "Py.test integration for aioresponses";
+    homepage = "https://github.com/pheanex/pytest-aioresponses";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 90055cc2154c..d9287e3c6811 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14515,6 +14515,8 @@ self: super: with self; {
 
   pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { };
 
+  pytest-aioresponses = callPackage ../development/python-modules/pytest-aioresponses { };
+
   pytest-annotate = callPackage ../development/python-modules/pytest-annotate { };
 
   pytest-ansible = callPackage ../development/python-modules/pytest-ansible { };

From 30afac0b8a034fea3d763d0b31cedb10a8312b48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 14:23:10 -0700
Subject: [PATCH 5637/6226] python3Packages.lunatone-rest-api-client: init at
 0.5.3

---
 .../lunatone-rest-api-client/default.nix      | 47 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/python-modules/lunatone-rest-api-client/default.nix

diff --git a/pkgs/development/python-modules/lunatone-rest-api-client/default.nix b/pkgs/development/python-modules/lunatone-rest-api-client/default.nix
new file mode 100644
index 000000000000..f80d2d7a20a0
--- /dev/null
+++ b/pkgs/development/python-modules/lunatone-rest-api-client/default.nix
@@ -0,0 +1,47 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitLab,
+  hatchling,
+  lib,
+  pydantic,
+  pytest-aioresponses,
+  pytest-asyncio,
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "lunatone-rest-api-client";
+  version = "0.5.3";
+  pyproject = true;
+
+  src = fetchFromGitLab {
+    owner = "lunatone-public";
+    repo = "lunatone-rest-api-client";
+    tag = "v${version}";
+    hash = "sha256-pxoD4EAyBmNmTXrhXa+zpnkwrsC+9mervbXzgptSFVo=";
+  };
+
+  build-system = [ hatchling ];
+
+  dependencies = [
+    aiohttp
+    pydantic
+  ];
+
+  pythonImportsCheck = [ "lunatone_rest_api_client" ];
+
+  nativeCheckInputs = [
+    pytest-aioresponses
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://gitlab.com/lunatone-public/lunatone-rest-api-client/-/blob/${src.tag}/CHANGELOG.md";
+    description = "Client library for accessing the Lunatone REST API";
+    homepage = "https://gitlab.com/lunatone-public/lunatone-rest-api-client";
+    license = lib.licenses.gpl3Only;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d9287e3c6811..c19ebe93f949 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8926,6 +8926,8 @@ self: super: with self; {
 
   lunarcalendar = callPackage ../development/python-modules/lunarcalendar { };
 
+  lunatone-rest-api-client = callPackage ../development/python-modules/lunatone-rest-api-client { };
+
   lupa = callPackage ../development/python-modules/lupa { };
 
   lupupy = callPackage ../development/python-modules/lupupy { };

From b06c6a621243dce3c0d39a65c941bcec811f7047 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 14:17:14 -0700
Subject: [PATCH 5638/6226] python3Packages.meteo-lt-pkg: init at 0.2.4

---
 .../python-modules/meteo-lt-pkg/default.nix   | 49 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/development/python-modules/meteo-lt-pkg/default.nix

diff --git a/pkgs/development/python-modules/meteo-lt-pkg/default.nix b/pkgs/development/python-modules/meteo-lt-pkg/default.nix
new file mode 100644
index 000000000000..dd1639485fce
--- /dev/null
+++ b/pkgs/development/python-modules/meteo-lt-pkg/default.nix
@@ -0,0 +1,49 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytest-asyncio,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "meteo-lt-pkg";
+  version = "0.2.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Brunas";
+    repo = "meteo_lt-pkg";
+    tag = "v${version}";
+    hash = "sha256-OjIBgIOSJ65ryIF4D/UUUa1Oq0sPkKnaQEJeviimqhE=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+  ];
+
+  pythonImportsCheck = [ "meteo_lt" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  disabledTests = [
+    # tests contact api.meteo.lt
+    "test_get_forecast"
+    "test_get_nearest_place"
+  ];
+
+  meta = {
+    changelog = "https://github.com/Brunas/meteo_lt-pkg/blob/${src.tag}/CHANGELOG.md";
+    description = "Meteo.Lt weather forecast package";
+    homepage = "https://github.com/Brunas/meteo_lt-pkg";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c19ebe93f949..ec631830f08f 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9334,6 +9334,8 @@ self: super: with self; {
 
   metawear = callPackage ../development/python-modules/metawear { };
 
+  meteo-lt-pkg = callPackage ../development/python-modules/meteo-lt-pkg { };
+
   meteoalertapi = callPackage ../development/python-modules/meteoalertapi { };
 
   meteocalc = callPackage ../development/python-modules/meteocalc { };

From 065e6f3cd62adf5f990ac9b68fcc365393fbb821 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Nov 2025 08:22:35 -0800
Subject: [PATCH 5639/6226] python3Packages.opower: 0.15.8 -> 0.15.9

Diff: https://github.com/tronikos/opower/compare/v0.15.8...v0.15.9

Changelog: https://github.com/tronikos/opower/releases/tag/v0.15.9
---
 pkgs/development/python-modules/opower/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/opower/default.nix b/pkgs/development/python-modules/opower/default.nix
index 31cf3259a85c..e67ddad254fb 100644
--- a/pkgs/development/python-modules/opower/default.nix
+++ b/pkgs/development/python-modules/opower/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "opower";
-  version = "0.15.8";
+  version = "0.15.9";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tronikos";
     repo = "opower";
     tag = "v${version}";
-    hash = "sha256-JauglgXrzfznyst0UdG8KyAXyzjnUkK7TJVdGhp0PVk=";
+    hash = "sha256-Hqn43KFmte3/zn+f35cxNSLjQ3f7ySPQSVWwMCeQ2Go=";
   };
 
   build-system = [ setuptools ];

From b503f729739814c608c25ac6e7a7cf70f6e834ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 20:24:05 -0700
Subject: [PATCH 5640/6226] python3Packages.py-melissa-climate: 2.1.4 -> 3.0.2

Diff: https://github.com/kennedyshead/py-melissa-climate/compare/2.1.4...v3.0.2

Changelog: https://github.com/kennedyshead/py-melissa-climate/releases/tag/v3.0.0
           https://github.com/kennedyshead/py-melissa-climate/releases/tag/v3.0.1
           https://github.com/kennedyshead/py-melissa-climate/releases/tag/v3.0.2
---
 .../py-melissa-climate/default.nix            | 27 +++++--------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/python-modules/py-melissa-climate/default.nix b/pkgs/development/python-modules/py-melissa-climate/default.nix
index dc66538400e2..f1167d2b04a4 100644
--- a/pkgs/development/python-modules/py-melissa-climate/default.nix
+++ b/pkgs/development/python-modules/py-melissa-climate/default.nix
@@ -4,52 +4,37 @@
   fetchFromGitHub,
   setuptools,
   aiohttp,
-  requests,
-  requests-futures,
+  pytest-asyncio,
   pytestCheckHook,
-  mock,
 }:
 
 buildPythonPackage rec {
   pname = "py-melissa-climate";
-  version = "2.1.4";
+  version = "3.0.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "kennedyshead";
     repo = "py-melissa-climate";
-    tag = version;
-    hash = "sha256-zYr+nKdO+lCLLYGSvY16MUs8TxbWcyaoQk9cwNQ704Y=";
+    tag = "v${version}";
+    hash = "sha256-VSKSa7K2fF6NMLN39HzkqK7/9vGHmmmPFw6mIiJNZ84=";
   };
 
-  postPatch = ''
-    substituteInPlace setup.py \
-      --replace-fail "setup_requires=['setuptools-markdown']," ""
-  '';
-
   build-system = [ setuptools ];
 
   dependencies = [
     aiohttp
-    requests
-    requests-futures
   ];
 
   nativeCheckInputs = [
-    mock
+    pytest-asyncio
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # Disable failing tests due to upstream bugs
-    "test_have_connection"
-    "test_send"
-    "test_send_ok"
-  ];
-
   pythonImportsCheck = [ "melissa" ];
 
   meta = {
+    changelog = "https://github.com/kennedyshead/py-melissa-climate/releases/tag/${src.tag}";
     description = "API wrapper for Melissa Climate";
     homepage = "https://github.com/kennedyshead/py-melissa-climate";
     license = lib.licenses.mit;

From 8433b22126345a0d14ae1334c1c4d1dc490409f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 14:11:32 -0700
Subject: [PATCH 5641/6226] python3Packages.pyfirefly: init at 0.1.8

---
 .../python-modules/pyfirefly/default.nix      | 53 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 55 insertions(+)
 create mode 100644 pkgs/development/python-modules/pyfirefly/default.nix

diff --git a/pkgs/development/python-modules/pyfirefly/default.nix b/pkgs/development/python-modules/pyfirefly/default.nix
new file mode 100644
index 000000000000..241af69a8e9b
--- /dev/null
+++ b/pkgs/development/python-modules/pyfirefly/default.nix
@@ -0,0 +1,53 @@
+{
+  aiohttp,
+  aresponses,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  mashumaro,
+  orjson,
+  poetry-core,
+  pytest-cov-stub,
+  pytestCheckHook,
+  syrupy,
+  yarl,
+}:
+
+buildPythonPackage rec {
+  pname = "pyfirefly";
+  version = "0.1.8";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "erwindouna";
+    repo = "pyfirefly";
+    tag = "v${version}";
+    hash = "sha256-b4np7JlDCbrrMo6TGE5yL6Xg41ocGoJQY8BMH/hZ9Ls=";
+  };
+
+  build-system = [ poetry-core ];
+
+  dependencies = [
+    aiohttp
+    mashumaro
+    orjson
+    yarl
+  ];
+
+  pythonImportsCheck = [ "pyfirefly" ];
+
+  nativeCheckInputs = [
+    aresponses
+    pytest-cov-stub
+    pytestCheckHook
+    syrupy
+  ];
+
+  meta = {
+    changelog = "https://github.com/erwindouna/pyfirefly/releases/tag/${src.tag}";
+    description = "Asynchronous Python client for the Firefly III API";
+    homepage = "https://github.com/erwindouna/pyfirefly";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index ec631830f08f..b134bed6a474 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13123,6 +13123,8 @@ self: super: with self; {
 
   pyfiglet = callPackage ../development/python-modules/pyfiglet { };
 
+  pyfirefly = callPackage ../development/python-modules/pyfirefly { };
+
   pyfireservicerota = callPackage ../development/python-modules/pyfireservicerota { };
 
   pyflakes = callPackage ../development/python-modules/pyflakes { };

From 6795a283dd3aa1932d961f409b7086d4bf823a14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 15:24:25 -0700
Subject: [PATCH 5642/6226] python3Packages.pynintendoparental: init at 1.1.3

---
 .../pynintendoparental/default.nix            | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/pynintendoparental/default.nix

diff --git a/pkgs/development/python-modules/pynintendoparental/default.nix b/pkgs/development/python-modules/pynintendoparental/default.nix
new file mode 100644
index 000000000000..a3c81a46cfdf
--- /dev/null
+++ b/pkgs/development/python-modules/pynintendoparental/default.nix
@@ -0,0 +1,40 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  python-dotenv,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "pynintendoparental";
+  version = "1.1.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "pantherale0";
+    repo = "pynintendoparental";
+    tag = version;
+    hash = "sha256-mH34BcbK3qyB2sAmVyAQz6GhI+xWAdRHagZzLVI9gr8=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+  ];
+
+  pythonImportsCheck = [ "pynintendoparental" ];
+
+  # test.py connects to the actual API
+  doCheck = false;
+
+  meta = {
+    changelog = "https://github.com/pantherale0/pynintendoparental/releases/tag/${src.tag}";
+    description = "Python module to interact with Nintendo Parental Controls";
+    homepage = "https://github.com/pantherale0/pynintendoparental";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b134bed6a474..8710e040d5bd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13720,6 +13720,8 @@ self: super: with self; {
 
   pynina = callPackage ../development/python-modules/pynina { };
 
+  pynintendoparental = callPackage ../development/python-modules/pynintendoparental { };
+
   pynipap = callPackage ../development/python-modules/pynipap { };
 
   pynisher = callPackage ../development/python-modules/pynisher { };

From 90204eef86f99e4353feef92ca8a4f3be5e9ed5f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 09:10:52 -0700
Subject: [PATCH 5643/6226] python3Packages.pysma: 0.7.5 -> 1.0.3

Diff: https://github.com/kellerza/pysma/compare/0.7.5...v1.0.3

Changelog: https://github.com/kellerza/pysma/blob/v1.0.3/CHANGELOG.md
---
 .../python-modules/pysma/default.nix          | 46 +++++++++++++------
 1 file changed, 31 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/pysma/default.nix b/pkgs/development/python-modules/pysma/default.nix
index 17d120b65e74..45265af0fc3b 100644
--- a/pkgs/development/python-modules/pysma/default.nix
+++ b/pkgs/development/python-modules/pysma/default.nix
@@ -1,40 +1,56 @@
 {
   lib,
   aiohttp,
+  aioresponses,
   attrs,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   jmespath,
-  pythonOlder,
+  pytest-asyncio,
+  pytest-cov-stub,
+  pytestCheckHook,
+  uv-build,
 }:
 
 buildPythonPackage rec {
   pname = "pysma";
-  version = "0.7.5";
-  format = "setuptools";
+  version = "1.0.3";
+  pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-zlCGEcG5tmgEXhSMDLKj0/imT1iHBqlp1O1QhmPrJcA=";
+  src = fetchFromGitHub {
+    owner = "kellerza";
+    repo = "pysma";
+    tag = "v${version}";
+    hash = "sha256-T9QBIuKgbKmMUN2G+sZRW4DtgIk3H9rYMTxLtkXfEBI=";
   };
 
-  propagatedBuildInputs = [
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "uv-build>=0.9,<0.10" uv-build
+  '';
+
+  build-system = [ uv-build ];
+
+  dependencies = [
     aiohttp
     attrs
     jmespath
   ];
 
-  # pypi does not contain tests and GitHub archive not available
-  doCheck = false;
+  nativeCheckInputs = [
+    aioresponses
+    pytest-asyncio
+    pytest-cov-stub
+    pytestCheckHook
+  ];
 
   pythonImportsCheck = [ "pysma" ];
 
-  meta = with lib; {
+  meta = {
+    changelog = "https://github.com/kellerza/pysma/blob/${src.tag}/CHANGELOG.md";
     description = "Python library for interacting with SMA Solar's WebConnect";
     homepage = "https://github.com/kellerza/pysma";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

From 4519fa6c761cb4efb16bbbc384c863e887cf1175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Nov 2025 20:25:03 -0800
Subject: [PATCH 5644/6226] python3Packages.pysrdaligateway: init at 0.15.1

---
 .../pysrdaligateway/default.nix               | 48 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/python-modules/pysrdaligateway/default.nix

diff --git a/pkgs/development/python-modules/pysrdaligateway/default.nix b/pkgs/development/python-modules/pysrdaligateway/default.nix
new file mode 100644
index 000000000000..addd6a2cb38f
--- /dev/null
+++ b/pkgs/development/python-modules/pysrdaligateway/default.nix
@@ -0,0 +1,48 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  wheel,
+  cryptography,
+  paho-mqtt,
+  psutil,
+  pytestCheckHook,
+  pytest-asyncio,
+  pytest-cov,
+}:
+
+buildPythonPackage rec {
+  pname = "pysrdaligateway";
+  version = "0.15.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "maginawin";
+    repo = "PySrDaliGateway";
+    tag = "v${version}";
+    hash = "sha256-qPZxcGDSToFkkXBJKxo9OkcTBr4TZ9cFrcQwBTwKfy8=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    cryptography
+    paho-mqtt
+    psutil
+  ];
+
+  pythonImportsCheck = [ "PySrDaliGateway" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/maginawin/PySrDaliGateway/releases/tag/${src.tag}";
+    description = "Python library for Sunricher DALI Gateway (EDA)";
+    homepage = "https://github.com/maginawin/PySrDaliGateway";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 8710e040d5bd..f8f0fc200956 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14438,6 +14438,8 @@ self: super: with self; {
 
   pysqueezebox = callPackage ../development/python-modules/pysqueezebox { };
 
+  pysrdaligateway = callPackage ../development/python-modules/pysrdaligateway { };
+
   pysrim = callPackage ../development/python-modules/pysrim { };
 
   pysrt = callPackage ../development/python-modules/pysrt { };

From 235995c481b446d8db84f8b2fbd6d2153619b7aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 20 Sep 2025 02:57:10 +0000
Subject: [PATCH 5645/6226] python3Packages.python-bsblan: 2.2.5 -> 3.1.0

---
 pkgs/development/python-modules/python-bsblan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-bsblan/default.nix b/pkgs/development/python-modules/python-bsblan/default.nix
index fc09767f6dae..575c4be9b22a 100644
--- a/pkgs/development/python-modules/python-bsblan/default.nix
+++ b/pkgs/development/python-modules/python-bsblan/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "python-bsblan";
-  version = "2.2.5";
+  version = "3.1.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "liudger";
     repo = "python-bsblan";
     tag = "v${version}";
-    hash = "sha256-kPkKgjze3ohaIaDax3h66JWw5tY+3S0N+lPqXSFFcRY=";
+    hash = "sha256-OIaUfrQMdFvDnONjpLRigzbHw6ZS3MA05BGatv63td4=";
   };
 
   postPatch = ''

From 4328c8f8f5eec1eeda741a15dbdeb82928e911d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 23:34:51 -0700
Subject: [PATCH 5646/6226] python3Packages.python-citybikes: init at 0.3.3

---
 .../python-citybikes/default.nix              | 50 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/python-citybikes/default.nix

diff --git a/pkgs/development/python-modules/python-citybikes/default.nix b/pkgs/development/python-modules/python-citybikes/default.nix
new file mode 100644
index 000000000000..dcba98e7295f
--- /dev/null
+++ b/pkgs/development/python-modules/python-citybikes/default.nix
@@ -0,0 +1,50 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytest-aiohttp,
+  pytest-asyncio,
+  pytestCheckHook,
+  requests,
+  responses,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "python-citybikes";
+  version = "0.3.3";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "eskerda";
+    repo = "python-citybikes";
+    tag = version;
+    hash = "sha256-it/QCUwNc6g88IrtMTS8wr/t4Apb2ovSheufOnu4fCM=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  dependencies = [
+    aiohttp
+    requests
+  ];
+
+  pythonImportsCheck = [ "citybikes" ];
+
+  nativeCheckInputs = [
+    pytest-aiohttp
+    pytest-asyncio
+    pytestCheckHook
+    responses
+  ];
+
+  meta = {
+    description = "Client interface for the Citybikes API";
+    homepage = "https://github.com/eskerda/python-citybikes";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f8f0fc200956..89592daea8a9 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -14875,6 +14875,8 @@ self: super: with self; {
 
   python-cinderclient = callPackage ../development/python-modules/python-cinderclient { };
 
+  python-citybikes = callPackage ../development/python-modules/python-citybikes { };
+
   python-clementine-remote = callPackage ../development/python-modules/python-clementine-remote { };
 
   python-codon-tables = callPackage ../development/python-modules/python-codon-tables { };

From 9b120a628ef8026db01635bb40b81bad37a419a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 09:01:42 -0700
Subject: [PATCH 5647/6226] python3Packages.python-roborock: 2.50.2 -> 3.7.0

Diff: https://github.com/Python-roborock/python-roborock/compare/v2.50.2...v3.7.0

Changelog: https://github.com/Python-roborock/python-roborock/blob/v3.7.0/CHANGELOG.md
---
 .../python-roborock/default.nix               | 39 ++++---------------
 1 file changed, 7 insertions(+), 32 deletions(-)

diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix
index fd7e9c688a4c..075331cdd475 100644
--- a/pkgs/development/python-modules/python-roborock/default.nix
+++ b/pkgs/development/python-modules/python-roborock/default.nix
@@ -7,70 +7,45 @@
   buildPythonPackage,
   click,
   construct,
-  dacite,
   fetchFromGitHub,
-  fetchpatch,
   freezegun,
+  hatchling,
   paho-mqtt,
-  poetry-core,
   pycryptodome,
   pycryptodomex,
   pyrate-limiter,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   vacuum-map-parser-roborock,
-  pyshark,
-  pyyaml,
   click-shell,
   syrupy,
 }:
 
 buildPythonPackage rec {
   pname = "python-roborock";
-  version = "2.50.2";
+  version = "3.7.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.11";
-
   src = fetchFromGitHub {
     owner = "Python-roborock";
     repo = "python-roborock";
     tag = "v${version}";
-    hash = "sha256-66kSNkivq6BHnqIqx1INtdoysBJfCqV76yIAJiHmfxQ=";
+    hash = "sha256-KgrpfcGaq84VWlcGvKMjJfz4bEkC9l1waj1ZucQa7DA=";
   };
 
-  patches = [
-    # https://github.com/Python-roborock/python-roborock/pull/527
-    (fetchpatch {
-      name = "replace async-timeout with asyncio.timeout.patch";
-      url = "https://github.com/Python-roborock/python-roborock/commit/f376027f5933e163441cf1815b820056731a3632.patch";
-      excludes = [ "poetry.lock" ];
-      hash = "sha256-53xsQ3yxh9CilC9hNS31rDXZVFG+mMhe7ffOb4L6bUE=";
-    })
-  ];
-
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "poetry-core==1.8.0" "poetry-core"
-  '';
-
   pythonRelaxDeps = [ "pycryptodome" ];
 
-  build-system = [ poetry-core ];
+  build-system = [ hatchling ];
 
   dependencies = [
     aiohttp
     aiomqtt
     click
     construct
-    dacite
     paho-mqtt
     pycryptodome
     pyrate-limiter
     vacuum-map-parser-roborock
-    pyyaml
-    pyshark
     click-shell
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [ pycryptodomex ];
@@ -85,12 +60,12 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "roborock" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python library & console tool for controlling Roborock vacuum";
     homepage = "https://github.com/Python-roborock/python-roborock";
     changelog = "https://github.com/Python-roborock/python-roborock/blob/${src.tag}/CHANGELOG.md";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ fab ];
     mainProgram = "roborock";
   };
 }

From 4d2e7d21bb0064b22697e7945d3aea9eb0b31923 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 3 Nov 2025 08:39:12 -0800
Subject: [PATCH 5648/6226] python3Packages.pyvesync: 3.1.2 -> 3.1.4

Diff: https://github.com/webdjoe/pyvesync/compare/3.1.2...3.1.4

Changelog: https://github.com/webdjoe/pyvesync/releases/tag/3.1.4
---
 pkgs/development/python-modules/pyvesync/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyvesync/default.nix b/pkgs/development/python-modules/pyvesync/default.nix
index a51d9d831cf8..540d2ef158e3 100644
--- a/pkgs/development/python-modules/pyvesync/default.nix
+++ b/pkgs/development/python-modules/pyvesync/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pyvesync";
-  version = "3.1.2";
+  version = "3.1.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "webdjoe";
     repo = "pyvesync";
     tag = version;
-    hash = "sha256-SZ1ZL79f1FHTnNEU9oew8JcWA20NphIX4fXr3NS7THU=";
+    hash = "sha256-l+b53B8Bdd/WnM2Oe9srST2T2KXaQfXtfc5+BwNte90=";
   };
 
   build-system = [ setuptools ];

From 868567706107fb3f9e9253dcb0ab47fc79d6567b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 28 Oct 2025 18:39:02 +0000
Subject: [PATCH 5649/6226] python3Packages.renault-api: 0.4.1 -> 0.5.0

---
 pkgs/development/python-modules/renault-api/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix
index 3326317152b9..1aa56d1a50bf 100644
--- a/pkgs/development/python-modules/renault-api/default.nix
+++ b/pkgs/development/python-modules/renault-api/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "renault-api";
-  version = "0.4.1";
+  version = "0.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "hacf-fr";
     repo = "renault-api";
     tag = "v${version}";
-    hash = "sha256-jnmfCYFtlfnFRMrNHfoiXgL8bael7IKmhuZCj+AOuz8=";
+    hash = "sha256-0fV7nPerG2b37KmLaDlsBnmZSHBItQbx++nxobvLCRg=";
   };
 
   build-system = [ poetry-core ];

From 8d973ac433835e97b5959aa311fc0ed4cfac2289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 29 Oct 2025 16:46:51 -0700
Subject: [PATCH 5650/6226] python3Packages.sentence-stream: 1.2.0 -> 1.2.1

Diff: https://github.com/OHF-Voice/sentence-stream/compare/v1.2.0...v1.2.1

Changelog: https://github.com/OHF-Voice/sentence-stream/blob/v1.2.1/CHANGELOG.md
---
 .../python-modules/sentence-stream/default.nix         | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/sentence-stream/default.nix b/pkgs/development/python-modules/sentence-stream/default.nix
index 76d9d6bd2e49..0695dd4d9e6f 100644
--- a/pkgs/development/python-modules/sentence-stream/default.nix
+++ b/pkgs/development/python-modules/sentence-stream/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "sentence-stream";
-  version = "1.2.0";
+  version = "1.2.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "OHF-Voice";
     repo = "sentence-stream";
     tag = "v${version}";
-    hash = "sha256-xGxgGOl8PM5Nc7ApeiRKdaKeoxsc/a7oBF+Ld+vtYDo=";
+    hash = "sha256-KCKOiY2x+gj02PR0ps2e5Ei6o17tk5ujgCTr3/fkV0Y=";
   };
 
   build-system = [
@@ -28,10 +28,6 @@ buildPythonPackage rec {
     regex
   ];
 
-  pythonRelaxDeps = [
-    "regex"
-  ];
-
   nativeCheckInputs = [
     pytest-asyncio
     pytestCheckHook
@@ -42,7 +38,7 @@ buildPythonPackage rec {
   ];
 
   meta = {
-    description = "A small sentence splitter for text streams";
+    description = "Small sentence splitter for text streams";
     homepage = "https://github.com/OHF-Voice/sentence-stream";
     changelog = "https://github.com/OHF-Voice/sentence-stream/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.asl20;

From a4ccb68d0150f96ba4c850247513845102b6c9b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 23:22:58 -0700
Subject: [PATCH 5651/6226] python3Packages.solaredge-web: init at 0.0.1

---
 .../python-modules/solaredge-web/default.nix  | 41 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 43 insertions(+)
 create mode 100644 pkgs/development/python-modules/solaredge-web/default.nix

diff --git a/pkgs/development/python-modules/solaredge-web/default.nix b/pkgs/development/python-modules/solaredge-web/default.nix
new file mode 100644
index 000000000000..32be69fb465a
--- /dev/null
+++ b/pkgs/development/python-modules/solaredge-web/default.nix
@@ -0,0 +1,41 @@
+{
+  aiohttp,
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  pytestCheckHook,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "solaredge-web";
+  version = "0.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "Solarlibs";
+    repo = "solaredge-web";
+    tag = "v${version}";
+    hash = "sha256-Vf/f5NDmjsKY8F5//8uAk+dJEaku94yjNaD2XyX7Vuk=";
+  };
+
+  build-system = [ setuptools ];
+
+  dependencies = [
+    aiohttp
+  ];
+
+  pythonImportsCheck = [ "solaredge_web" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    changelog = "https://github.com/Solarlibs/solaredge-web/releases/tag/${src.tag}";
+    description = "Library for fetching SolarEdge energy data for each inverter/string/module via the web API";
+    homepage = "https://github.com/Solarlibs/solaredge-web";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 89592daea8a9..f19c80be8b30 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -17265,6 +17265,8 @@ self: super: with self; {
 
   solaredge-local = callPackage ../development/python-modules/solaredge-local { };
 
+  solaredge-web = callPackage ../development/python-modules/solaredge-web { };
+
   solarlog-cli = callPackage ../development/python-modules/solarlog-cli { };
 
   solax = callPackage ../development/python-modules/solax { };

From c7f902559448e7141244a787f4c8ed9e57a8d5fa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 09:56:10 -0700
Subject: [PATCH 5652/6226] python3Packages.zha: 0.0.73 -> 0.0.77

Diff: https://github.com/zigpy/zha/compare/0.0.73...0.0.77

Changelog: https://github.com/zigpy/zha/releases/tag/0.0.74
           https://github.com/zigpy/zha/releases/tag/0.0.75
           https://github.com/zigpy/zha/releases/tag/0.0.76
           https://github.com/zigpy/zha/releases/tag/0.0.77
---
 pkgs/development/python-modules/zha/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zha/default.nix b/pkgs/development/python-modules/zha/default.nix
index 9f81fac849cd..23a02f7dab2c 100644
--- a/pkgs/development/python-modules/zha/default.nix
+++ b/pkgs/development/python-modules/zha/default.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "zha";
-  version = "0.0.73";
+  version = "0.0.77";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -31,7 +31,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zha";
     tag = version;
-    hash = "sha256-ryriM4bVML81xJQYlL46rhlsc/WQh0T5LC+WB28T6AU=";
+    hash = "sha256-OtwfSt9KUs4oOCwnKygq/hDOXOhzhT3+KxxY/M9KAdU=";
   };
 
   postPatch = ''

From a1676f835fc7ec4523cce4b46929d7d95e975011 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 09:57:18 -0700
Subject: [PATCH 5653/6226] python3Packages.zha-quirks: 0.0.146 -> 0.0.148

Diff: https://github.com/zigpy/zha-device-handlers/compare/0.0.146...0.0.148

Changelog: https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.147
           https://github.com/zigpy/zha-device-handlers/releases/tag/0.0.148
---
 pkgs/development/python-modules/zha-quirks/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zha-quirks/default.nix b/pkgs/development/python-modules/zha-quirks/default.nix
index 51bc73a53586..f4a8808bc500 100644
--- a/pkgs/development/python-modules/zha-quirks/default.nix
+++ b/pkgs/development/python-modules/zha-quirks/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "zha-quirks";
-  version = "0.0.146";
+  version = "0.0.148";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "zha-device-handlers";
     tag = version;
-    hash = "sha256-eXT0intSWAYQ/DlIEIZDbv805aQCLXYXpvhWjnd3EVA=";
+    hash = "sha256-A2+pBLPexQLMDE/feQ7mQ1bbzGBAXs/5GktOVn2D2JM=";
   };
 
   postPatch = ''

From 814911e62210a07b23d3f0d785fd38f244e4493c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 09:56:47 -0700
Subject: [PATCH 5654/6226] python3Packages.zigpy: 0.83.0 -> 0.86.0

Diff: https://github.com/zigpy/zigpy/compare/0.83.0...0.86.0

Changelog: https://github.com/zigpy/zigpy/releases/tag/0.86.0
---
 pkgs/development/python-modules/zigpy/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/zigpy/default.nix b/pkgs/development/python-modules/zigpy/default.nix
index 6cbe00e62e68..c82046c81f4e 100644
--- a/pkgs/development/python-modules/zigpy/default.nix
+++ b/pkgs/development/python-modules/zigpy/default.nix
@@ -13,7 +13,7 @@
   freezegun,
   frozendict,
   jsonschema,
-  pyserial-asyncio,
+  pyserial-asyncio-fast,
   pytest-asyncio_0,
   pytest-timeout,
   pytestCheckHook,
@@ -25,14 +25,14 @@
 
 buildPythonPackage rec {
   pname = "zigpy";
-  version = "0.83.0";
+  version = "0.86.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy";
     tag = version;
-    hash = "sha256-rgri4aga8qTlcURypCHY1YjClz5lpQpwxd3cAG2VoOo=";
+    hash = "sha256-PROJKC8ZxAZ8zZR4if33553qtp7i9y58LPr1d1gCXVQ=";
   };
 
   postPatch = ''
@@ -51,7 +51,7 @@ buildPythonPackage rec {
     cryptography
     frozendict
     jsonschema
-    pyserial-asyncio
+    pyserial-asyncio-fast
     typing-extensions
     voluptuous
   ]

From 69eefaab6dd0611262ecc13c648638e218299075 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 09:57:09 -0700
Subject: [PATCH 5655/6226] python3Packages.zigpy-deconz: 0.25.2 -> 0.25.5

Diff: https://github.com/zigpy/zigpy-deconz/compare/0.25.2...0.25.5

Changelog: https://github.com/zigpy/zigpy-deconz/releases/tag/0.25.3
           https://github.com/zigpy/zigpy-deconz/releases/tag/0.25.4
           https://github.com/zigpy/zigpy-deconz/releases/tag/0.25.5
---
 .../python-modules/zigpy-deconz/default.nix        | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/zigpy-deconz/default.nix b/pkgs/development/python-modules/zigpy-deconz/default.nix
index e340705e0280..17adcdbee8a1 100644
--- a/pkgs/development/python-modules/zigpy-deconz/default.nix
+++ b/pkgs/development/python-modules/zigpy-deconz/default.nix
@@ -2,24 +2,23 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pyserial,
-  pyserial-asyncio,
   pytest-asyncio,
   pytestCheckHook,
   setuptools,
+  voluptuous,
   zigpy,
 }:
 
 buildPythonPackage rec {
   pname = "zigpy-deconz";
-  version = "0.25.2";
+  version = "0.25.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy-deconz";
     tag = version;
-    hash = "sha256-9wsdL2mtT6Q6+4Z6f+Aoae7d0x7EDqkZ5n2O3Ml4PbA=";
+    hash = "sha256-kwQF6RY6Fxba44wa3q4Hx4MRAbWl3Ho7WYvR7jRfrW8=";
   };
 
   postPatch = ''
@@ -28,11 +27,10 @@ buildPythonPackage rec {
       --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
-    pyserial
-    pyserial-asyncio
+  dependencies = [
+    voluptuous
     zigpy
   ];
 

From 24f794e55b3a05623e41a917410b0a7f55f28c8e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 10:25:49 -0700
Subject: [PATCH 5656/6226] python3Packages.zigpy-xbee: 0.21.0 -> 0.21.1

Diff: https://github.com/zigpy/zigpy-xbee/compare/0.21.0...0.21.1

Changelog: https://github.com/zigpy/zigpy-xbee/releases/tag/0.21.1
---
 .../python-modules/zigpy-xbee/default.nix     | 24 +++++--------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/python-modules/zigpy-xbee/default.nix b/pkgs/development/python-modules/zigpy-xbee/default.nix
index 409a9fa1bd11..a144dbc63a97 100644
--- a/pkgs/development/python-modules/zigpy-xbee/default.nix
+++ b/pkgs/development/python-modules/zigpy-xbee/default.nix
@@ -2,40 +2,33 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  pyserial,
-  pyserial-asyncio,
   pytest-asyncio,
   pytestCheckHook,
-  pythonOlder,
   setuptools,
   zigpy,
 }:
 
 buildPythonPackage rec {
   pname = "zigpy-xbee";
-  version = "0.21.0";
+  version = "0.21.1";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy-xbee";
     tag = version;
-    hash = "sha256-Ep7pP2vcH9YpSrGPVDi3nc+WkQgBVS+NLmoQU0o0aQQ=";
+    hash = "sha256-ALwhl9WUDkv0POufF/G/rZrn+ITbMdh6y86lShy6ZTg=";
   };
 
   postPatch = ''
     substituteInPlace pyproject.toml \
-      --replace ', "setuptools-git-versioning<2"' "" \
-      --replace 'dynamic = ["version"]' 'version = "${version}"'
+      --replace-fail ', "setuptools-git-versioning<2"' "" \
+      --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
   '';
 
-  nativeBuildInputs = [ setuptools ];
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
-    pyserial
-    pyserial-asyncio
+  dependencies = [
     zigpy
   ];
 
@@ -44,11 +37,6 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  disabledTests = [
-    # fixed in https://github.com/zigpy/zigpy-xbee/commit/f85233fc28ae01c08267965e99a29e43b00e1561
-    "test_shutdown"
-  ];
-
   meta = with lib; {
     changelog = "https://github.com/zigpy/zigpy-xbee/releases/tag/${version}";
     description = "Library which communicates with XBee radios for zigpy";

From 545c359642424e8778b397dc5e166435b2781f15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 18:07:59 +0000
Subject: [PATCH 5657/6226] foxglove-studio: 2.39.0 -> 2.39.1

---
 pkgs/by-name/fo/foxglove-studio/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/fo/foxglove-studio/package.nix b/pkgs/by-name/fo/foxglove-studio/package.nix
index 187e405004c0..0e724c6b9361 100644
--- a/pkgs/by-name/fo/foxglove-studio/package.nix
+++ b/pkgs/by-name/fo/foxglove-studio/package.nix
@@ -20,11 +20,11 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "foxglove-studio";
-  version = "2.39.0";
+  version = "2.39.1";
 
   src = fetchurl {
     url = "https://get.foxglove.dev/desktop/v${finalAttrs.version}/foxglove-studio-${finalAttrs.version}-linux-amd64.deb";
-    hash = "sha256-bEvlgFCDt1b/bZhqJeeMMIDq8qjga5pwRlo/fTa3QKs=";
+    hash = "sha256-7HVYzKphdpXuKL6e5zD540L5MPFKg0RNZSvW0FCD75k=";
   };
 
   nativeBuildInputs = [

From f4063031954b3e92f43ea2aee99fece83f4525fb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 18:14:50 +0000
Subject: [PATCH 5658/6226] android-studio: 2025.1.4.8 -> 2025.2.1.7

---
 pkgs/applications/editors/android-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index 7f3c0c447693..ce1c69460c0a 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -16,8 +16,8 @@ let
       inherit tiling_wm;
     };
   stableVersion = {
-    version = "2025.1.4.8"; # "Android Studio Narwhal 4 Feature Drop | 2025.1.4"
-    sha256Hash = "sha256-znRzVtUqNrLmpLYd9a96jFh85n+EgOsdteVLqxnMvfM=";
+    version = "2025.2.1.7"; # "Android Studio Otter | 2025.2.1"
+    sha256Hash = "sha256-Fq8foC10bkwYLYhS/zhZu6XBgnaO/qz6GKi4HWXnjLE=";
   };
   betaVersion = {
     version = "2025.2.1.6"; # "Android Studio Otter | 2025.2.1 RC 1"

From 576dae8c49a4e5e98a28f8324f8b827632064c05 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 18:16:08 +0000
Subject: [PATCH 5659/6226] langgraph-cli: 0.4.5 -> 0.4.7

---
 pkgs/development/python-modules/langgraph-cli/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langgraph-cli/default.nix b/pkgs/development/python-modules/langgraph-cli/default.nix
index 8fde1a853412..d3a285ec519a 100644
--- a/pkgs/development/python-modules/langgraph-cli/default.nix
+++ b/pkgs/development/python-modules/langgraph-cli/default.nix
@@ -24,14 +24,14 @@
 
 buildPythonPackage rec {
   pname = "langgraph-cli";
-  version = "0.4.5";
+  version = "0.4.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langgraph";
     tag = "cli==${version}";
-    hash = "sha256-YGO1eq1IEKkxuH/9ZsaeaWpQ2vD97du32iopdXFqZf8=";
+    hash = "sha256-VvxY5fXK/f1aCdIB0XPGTsWgEe/cA797kK6eLmb0vtg=";
   };
 
   sourceRoot = "${src.name}/libs/cli";

From c6cc00999d2d8229c38f7287887b38e5c2988c1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 5 Nov 2025 10:25:27 -0800
Subject: [PATCH 5660/6226] python3Packages.aiohomematic: 2025.11.5 ->
 2025.11.7

Diff: https://github.com/SukramJ/aiohomematic/compare/2025.11.5...2025.11.7

Changelog: https://github.com/SukramJ/aiohomematic/blob/2025.11.7/changelog.md
---
 pkgs/development/python-modules/aiohomematic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aiohomematic/default.nix b/pkgs/development/python-modules/aiohomematic/default.nix
index b5c0f4bf18fb..a66a6169b327 100644
--- a/pkgs/development/python-modules/aiohomematic/default.nix
+++ b/pkgs/development/python-modules/aiohomematic/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "aiohomematic";
-  version = "2025.11.5";
+  version = "2025.11.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "SukramJ";
     repo = "aiohomematic";
     tag = version;
-    hash = "sha256-bqhuh+9rcqKreZCc3WJPFR1i3Y8mjtLER/bLlbMp6xc=";
+    hash = "sha256-WKpcySWdw3yJeFgFR9JTv/MEaSGA/u2sENQH/ZXtds4=";
   };
 
   build-system = [ setuptools ];

From 6f0af2d8e6dc1e64ce4f9ee85f448a5719ec6df4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 5 Nov 2025 10:25:41 -0800
Subject: [PATCH 5661/6226] home-assistant-custom-components.homematicip_local:
 1.90.0 -> 1.90.2

Diff: https://github.com/SukramJ/custom_homematic/compare/1.90.0...1.90.2

Changelog: https://github.com/SukramJ/custom_homematic/blob/1.90.2/changelog.md
---
 .../custom-components/homematicip_local/package.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
index f0a178c08d2b..76568f9a7d73 100644
--- a/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/homematicip_local/package.nix
@@ -13,13 +13,13 @@
 buildHomeAssistantComponent rec {
   owner = "SukramJ";
   domain = "homematicip_local";
-  version = "1.90.0";
+  version = "1.90.2";
 
   src = fetchFromGitHub {
     owner = "SukramJ";
     repo = "custom_homematic";
     tag = version;
-    hash = "sha256-tdOxZWofsb2loN1ItQNeEwjIR4divLidyiyAgze6hqw=";
+    hash = "sha256-ARBCwwvGFODMBNf0Ds4DL65V8LKm9nfiKaPUn0c6kYE=";
   };
 
   postPatch = ''

From 2b819576cb4c6d217a9a972485a5742552fa569f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 5 Nov 2025 12:15:31 +0100
Subject: [PATCH 5662/6226] ci/pinned: update

This gives us a bugfix in treefmt-nix for biome.

From the nixpkgs-unstable channel:
https://hydra.nixos.org/build/312625570#tabs-buildinputs

Changes for treefmt-nix:
https://github.com/numtide/treefmt-nix/compare/f56b1934f5f8fcab8deb5d38d42fd692632b47c2...4ef3dfdbb5ddfb9e39999a2f2b0c2637277859d4
---
 ci/pinned.json             | 12 ++++++------
 doc/tests/manpage-urls.nix |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/ci/pinned.json b/ci/pinned.json
index 4451869289fd..fa58242b75ab 100644
--- a/ci/pinned.json
+++ b/ci/pinned.json
@@ -9,9 +9,9 @@
       },
       "branch": "nixpkgs-unstable",
       "submodules": false,
-      "revision": "d5faa84122bc0a1fd5d378492efce4e289f8eac1",
-      "url": "https://github.com/NixOS/nixpkgs/archive/d5faa84122bc0a1fd5d378492efce4e289f8eac1.tar.gz",
-      "hash": "0r2pkx7m1pb0fzfhb74jkr8y5qhs2b93sak5bd5rabvbm2zn36zs"
+      "revision": "12c1f0253aa9a54fdf8ec8aecaafada64a111e24",
+      "url": "https://github.com/NixOS/nixpkgs/archive/12c1f0253aa9a54fdf8ec8aecaafada64a111e24.tar.gz",
+      "hash": "0zr033ybqjc5spwh7xnzkhbqgc6gh8waw6z76rpvadxckyqlfgiq"
     },
     "treefmt-nix": {
       "type": "Git",
@@ -22,9 +22,9 @@
       },
       "branch": "main",
       "submodules": false,
-      "revision": "f56b1934f5f8fcab8deb5d38d42fd692632b47c2",
-      "url": "https://github.com/numtide/treefmt-nix/archive/f56b1934f5f8fcab8deb5d38d42fd692632b47c2.tar.gz",
-      "hash": "1klcfmqb4q4vvy9kdm5i9ddl26rhlyhf1mrd5aw1d4529bqnq5b5"
+      "revision": "4ef3dfdbb5ddfb9e39999a2f2b0c2637277859d4",
+      "url": "https://github.com/numtide/treefmt-nix/archive/4ef3dfdbb5ddfb9e39999a2f2b0c2637277859d4.tar.gz",
+      "hash": "0dhvpzcknsr2ybi3zz9mjggs93aqkfr24radvlw74y9620dziqw4"
     }
   },
   "version": 5
diff --git a/doc/tests/manpage-urls.nix b/doc/tests/manpage-urls.nix
index 913aebe4ebe8..74778c7f9847 100644
--- a/doc/tests/manpage-urls.nix
+++ b/doc/tests/manpage-urls.nix
@@ -2,12 +2,12 @@
 {
   lib,
   runCommand,
-  invalidateFetcherByDrvHash,
+  testers,
   cacert,
   python3,
 }:
 
-invalidateFetcherByDrvHash (
+testers.invalidateFetcherByDrvHash (
   {
     name ? "manual_check-manpage-urls",
     script ? ./manpage-urls.py,

From 7f7f879f921405c2fe48abaefbc98a7c318ddead Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Wed, 5 Nov 2025 15:26:17 +0000
Subject: [PATCH 5663/6226] Revert "ci/treefmt: disable biome for now"

This reverts commit 66260cc8c48f38529c559ce9529d9398bc8d4837.
---
 ci/default.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/ci/default.nix b/ci/default.nix
index 3aa463095cde..972c679a1492 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -48,8 +48,7 @@ let
         programs.actionlint.enable = true;
 
         programs.biome = {
-          # FIXME: Disabled temporarily due to https://github.com/numtide/treefmt-nix/pull/430
-          enable = false;
+          enable = true;
           settings.formatter = {
             useEditorconfig = true;
           };
@@ -59,10 +58,10 @@ let
           };
           settings.json.formatter.enabled = false;
         };
-        # settings.formatter.biome.excludes = [
-        #   "*.min.js"
-        #   "pkgs/*"
-        # ];
+        settings.formatter.biome.excludes = [
+          "*.min.js"
+          "pkgs/*"
+        ];
 
         programs.keep-sorted.enable = true;
 

From ef3dca70a6da8be42331291039043b5c84d3e438 Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Wed, 5 Nov 2025 15:28:57 +0000
Subject: [PATCH 5664/6226] ci/treefmt: disable biome settings validation

The treefmt-nix `biome.settings` validation uses inputs that are liable
to hash mismatch.

See https://github.com/numtide/treefmt-nix/pull/430
---
 ci/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ci/default.nix b/ci/default.nix
index 972c679a1492..5f22dc47ed60 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -49,6 +49,8 @@ let
 
         programs.biome = {
           enable = true;
+          # Disable settings validation because its inputs are liable to hash mismatch
+          validate.enable = false;
           settings.formatter = {
             useEditorconfig = true;
           };

From 5d3f02782f216ef4f3431c459b5c9c1aaa3f77e8 Mon Sep 17 00:00:00 2001
From: Duncan Steele <steeleduncan@hotmail.com>
Date: Wed, 5 Nov 2025 13:26:50 +0000
Subject: [PATCH 5665/6226] microhs: init at 0.14.21.0

---
 pkgs/by-name/mi/microhs/package.nix          | 43 ++++++++++++++++++++
 pkgs/by-name/mi/microhs/test-hello-world.nix | 34 ++++++++++++++++
 2 files changed, 77 insertions(+)
 create mode 100644 pkgs/by-name/mi/microhs/package.nix
 create mode 100644 pkgs/by-name/mi/microhs/test-hello-world.nix

diff --git a/pkgs/by-name/mi/microhs/package.nix b/pkgs/by-name/mi/microhs/package.nix
new file mode 100644
index 000000000000..509ca3cc99d5
--- /dev/null
+++ b/pkgs/by-name/mi/microhs/package.nix
@@ -0,0 +1,43 @@
+{
+  callPackage,
+  stdenv,
+  fetchFromGitHub,
+  lib,
+  writableTmpDirAsHomeHook,
+  writeTextDir,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "microhs";
+  version = "0.14.21.0";
+
+  src = fetchFromGitHub {
+    owner = "augustss";
+    repo = "MicroHs";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-Tq8fjI3LCP4NWrmbMP0xyhY2fjRmsMCEvgfDQ/SB5Bo=";
+  };
+
+  # mcabal doesn't seem to respect the make flag and fails with /homeless-shelter
+  # This works around the issue
+  nativeBuildInputs = [ writableTmpDirAsHomeHook ];
+
+  makeFlags = [ "MCABAL=$(out)" ];
+  buildFlags = [ "bootstrap" ];
+
+  # MicroCabal is a separate repository, which should be packaged separately
+  # The MicroCabal that is installed by `make install` is pregenerated, does not respect MCABAL above, and so is not useable
+  postInstall = "rm $out/bin/mcabal";
+
+  passthru.tests = {
+    hello-world = callPackage ./test-hello-world.nix { microhs = finalAttrs.finalPackage; };
+  };
+
+  meta = {
+    description = "Haskell implemented with combinators";
+    homepage = "https://github.com/augustss/MicroHs";
+    license = lib.licenses.asl20;
+    maintainers = [ lib.maintainers.steeleduncan ];
+    platforms = lib.platforms.all;
+  };
+})
diff --git a/pkgs/by-name/mi/microhs/test-hello-world.nix b/pkgs/by-name/mi/microhs/test-hello-world.nix
new file mode 100644
index 000000000000..8b1f1603cb79
--- /dev/null
+++ b/pkgs/by-name/mi/microhs/test-hello-world.nix
@@ -0,0 +1,34 @@
+{
+  stdenv,
+  microhs,
+  writeTextDir,
+}:
+
+stdenv.mkDerivation {
+  name = "microhs-hello-world";
+  buildInputs = [ microhs ];
+
+  src = writeTextDir "helloworld.hs" ''
+    main :: IO ()
+    main = putStrLn "Hello World"
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    mhs helloworld.hs -oExe
+    runHook postBuild
+  '';
+
+  checkPhase = ''
+    runHook preCheck
+    ./Exe | grep "Hello World"
+    runHook postCheck
+  '';
+  doCheck = true;
+
+  installPhase = ''
+    runHook preInstall
+    touch $out
+    runHook postInstall
+  '';
+}

From a13bd1f06428d4cd1b2e49bcc81c4bda40461db7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 18:56:00 +0000
Subject: [PATCH 5666/6226] grafanaPlugins.ventura-psychrometric-panel: 5.0.3
 -> 5.0.4

---
 .../grafana/plugins/ventura-psychrometric-panel/default.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix
index 0290ba43d438..650816940857 100644
--- a/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/ventura-psychrometric-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "ventura-psychrometric-panel";
-  version = "5.0.3";
-  zipHash = "sha256-uGrLxbGNQa82dDhImZHaPAv0GbgV1SwgCHq6q4BjTUs=";
+  version = "5.0.4";
+  zipHash = "sha256-bBPESByCux0X711UjmT5bQrJDz1BC9+9EGOOJ4jqcj0=";
   meta = with lib; {
     description = "Grafana plugin to display air conditions on a psychrometric chart";
     license = licenses.bsd3Lbnl;

From d803c09a7d1a465e10a39dff3f0a6706b1671c75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 19:09:21 +0000
Subject: [PATCH 5667/6226] promtail: 3.5.7 -> 3.5.8

---
 pkgs/by-name/gr/grafana-loki/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix
index 1cc40b5af48b..c7bfe7fbae66 100644
--- a/pkgs/by-name/gr/grafana-loki/package.nix
+++ b/pkgs/by-name/gr/grafana-loki/package.nix
@@ -12,14 +12,14 @@
 }:
 
 buildGoModule rec {
-  version = "3.5.7";
+  version = "3.5.8";
   pname = "grafana-loki";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "loki";
     rev = "v${version}";
-    hash = "sha256-9Aq4ZZuvhTSVTSk1l+DpEo+e5HffrRXJr1DfjJBmBng=";
+    hash = "sha256-BTAjlA8jk75tkgUpSJrEe4m9aVUav3eeTk7IjT2AYlY=";
   };
 
   vendorHash = null;

From 2ac6240d36cc51472f2aa0792f508db8bb5c6096 Mon Sep 17 00:00:00 2001
From: Marcin Serwin <marcin@serwin.dev>
Date: Wed, 5 Nov 2025 20:14:30 +0100
Subject: [PATCH 5668/6226] warzone2100: don't treat warning as errors

Fixes https://hydra.nixos.org/build/310775158/

ZHF: #457852

Signed-off-by: Marcin Serwin <marcin@serwin.dev>
---
 pkgs/by-name/wa/warzone2100/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/wa/warzone2100/package.nix b/pkgs/by-name/wa/warzone2100/package.nix
index 3b5f437983cd..6a30c62856ba 100644
--- a/pkgs/by-name/wa/warzone2100/package.nix
+++ b/pkgs/by-name/wa/warzone2100/package.nix
@@ -94,6 +94,8 @@ stdenv.mkDerivation (finalAttrs: {
                       --replace '"which "' '"${which}/bin/which "'
     substituteInPlace lib/exceptionhandler/exceptionhandler.cpp \
                       --replace "which %s" "${which}/bin/which %s"
+    substituteInPlace CMakeLists.txt \
+      --replace-fail "CONFIGURE_WZ_COMPILER_WARNINGS()" ""
   '';
 
   cmakeFlags = [

From 03805a22b4b869246deb6ccba0b85bf7c11926bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 19:23:37 +0000
Subject: [PATCH 5669/6226] okteto: 3.12.1 -> 3.13.0

---
 pkgs/by-name/ok/okteto/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ok/okteto/package.nix b/pkgs/by-name/ok/okteto/package.nix
index e4d05a1fc448..b03b5ec37c7d 100644
--- a/pkgs/by-name/ok/okteto/package.nix
+++ b/pkgs/by-name/ok/okteto/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "okteto";
-  version = "3.12.1";
+  version = "3.13.0";
 
   src = fetchFromGitHub {
     owner = "okteto";
     repo = "okteto";
     tag = finalAttrs.version;
-    hash = "sha256-TtRLTZ/CnhJZYFrMUYAvRksSbQywP5P0dlYhT74yju8=";
+    hash = "sha256-B5znl9MV9XAhgesq9jLYn6mLF0/o2eY0RXoA2mjNNwQ=";
   };
 
-  vendorHash = "sha256-wkuCUMzmYAWf8RjM6DkTTHaY7qEIjGNYiT4grtCbYs8=";
+  vendorHash = "sha256-/gB/7NCzoZhaKUIkPaABGrKNoruHuAwTIcH75SBBAMg=";
 
   postPatch = ''
     # Disable some tests that need file system & network access.

From d329a02f9f3c98ac96d5cff17a77d95f73a59434 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <sergei@zimmerman.foo>
Date: Wed, 5 Nov 2025 22:35:13 +0300
Subject: [PATCH 5670/6226] marshmallow: fix build on i686-linux

Nix has recently started using this package (transitively via
json-schema-for-humans) in the nix-manual, so it's prudent to fix it
on all supported systems.
---
 pkgs/development/python-modules/marshmallow/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/marshmallow/default.nix b/pkgs/development/python-modules/marshmallow/default.nix
index 4b67ac402089..0ab9cf7f5dab 100644
--- a/pkgs/development/python-modules/marshmallow/default.nix
+++ b/pkgs/development/python-modules/marshmallow/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
   flit-core,
@@ -29,6 +30,11 @@ buildPythonPackage rec {
     simplejson
   ];
 
+  disabledTests = lib.optionals stdenv.hostPlatform.isx86_32 [
+    # Raises a slightly different error than upstream expects: 'Timestamp is too large' instead of 'out of range'
+    "test_from_timestamp_with_overflow_value"
+  ];
+
   pythonImportsCheck = [ "marshmallow" ];
 
   meta = with lib; {

From fbfc410939a24701e21b31ac1106b0ac24ca4be1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 5 Nov 2025 20:37:21 +0100
Subject: [PATCH 5671/6226] python313Packages.tencentcloud-sdk-python: 3.0.1481
 -> 3.0.1482

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.0.1481...3.0.1482

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1482/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 7a90fa7d3d55..8e282138421e 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1481";
+  version = "3.0.1482";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-bqfF1Z1hrFT2HR5At5v9gKWdKY/OEHTCBgGPo4LnStE=";
+    hash = "sha256-dllmMdjI4osrtdTN5qo2k/KtEKDpF9G1Ul3JkegvMt0=";
   };
 
   build-system = [ setuptools ];

From a8f893a66d814a43dcf8ed7bb11c028ce90a2997 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 19:41:00 +0000
Subject: [PATCH 5672/6226] lintspec: 0.11.4 -> 0.12.0

---
 pkgs/by-name/li/lintspec/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/lintspec/package.nix b/pkgs/by-name/li/lintspec/package.nix
index 54381f2a14e9..3edb810dab7d 100644
--- a/pkgs/by-name/li/lintspec/package.nix
+++ b/pkgs/by-name/li/lintspec/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lintspec";
-  version = "0.11.4";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "beeb";
     repo = "lintspec";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dd9j4eGXhNyaTOMiKK0qi8BW1Zy1kZ6+ZVMB7rrq4gE=";
+    hash = "sha256-CxtzAtbjk7rS00EAvu6pMXN7VsF75tO79p7au5+4jGI=";
   };
 
-  cargoHash = "sha256-u83OgBEbZ4b2CLZv/M9Wv0tum3ZKZGOuba0leqfMDoo=";
+  cargoHash = "sha256-kmv62yq4JdNv2komTjnsH5kjbaxI30iph3pKa2+qqck=";
   cargoBuildFlags = [
     "--package"
     "lintspec"

From 5f2d5f20d801543129eb3f99cfc5360ef8bbd909 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 19:41:12 +0000
Subject: [PATCH 5673/6226] home-assistant-custom-components.oref_alert: 4.0.0
 -> 4.1.1

---
 .../home-assistant/custom-components/oref_alert/package.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix
index 7bd737681d52..909e5c4e1129 100644
--- a/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/oref_alert/package.nix
@@ -13,13 +13,13 @@
 buildHomeAssistantComponent rec {
   owner = "amitfin";
   domain = "oref_alert";
-  version = "4.0.0";
+  version = "4.1.1";
 
   src = fetchFromGitHub {
     owner = "amitfin";
     repo = "oref_alert";
     tag = "v${version}";
-    hash = "sha256-WMWt2QjwWDIfNbD6/YGc91GASmjNhzfLREMHvc2eOdE=";
+    hash = "sha256-nWp8cG0lFYUEO11lcZGkqx5QvOSfSVnqIqpHA8YAN30=";
   };
 
   dependencies = [

From 2d7df84a23c69eefab60ad0ab91f678a6e68a001 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 19:47:16 +0000
Subject: [PATCH 5674/6226] kubescape: 3.0.42 -> 3.0.43

---
 pkgs/by-name/ku/kubescape/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ku/kubescape/package.nix b/pkgs/by-name/ku/kubescape/package.nix
index 1e073db8e7c9..ee62226bdd88 100644
--- a/pkgs/by-name/ku/kubescape/package.nix
+++ b/pkgs/by-name/ku/kubescape/package.nix
@@ -10,18 +10,18 @@
 
 buildGoModule rec {
   pname = "kubescape";
-  version = "3.0.42";
+  version = "3.0.43";
 
   src = fetchFromGitHub {
     owner = "kubescape";
     repo = "kubescape";
     tag = "v${version}";
-    hash = "sha256-/+n0R7Lj2TReP+OUdhZh+te0XZT2Nd+8nKEFinEtlz0=";
+    hash = "sha256-pIw4joigLCJwHXFZR1qRYVouzvPNv7zHVCaMe8MUd3Q=";
     fetchSubmodules = true;
   };
 
   proxyVendor = true;
-  vendorHash = "sha256-nRS6Ytb/zMsqRWehiPX3E9dX3Rv1gANs3hCEEbu5leY=";
+  vendorHash = "sha256-SOkwLt9BaSnWBuljGBDXMhxw/8kqIrA3peWRLlT53vc=";
 
   subPackages = [ "." ];
 

From dfe6509e10bdaefec114bea19dd09649a795b9b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 19:54:09 +0000
Subject: [PATCH 5675/6226] istioctl: 1.27.3 -> 1.28.0

---
 pkgs/by-name/is/istioctl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix
index bee109171146..5ee989bdabda 100644
--- a/pkgs/by-name/is/istioctl/package.nix
+++ b/pkgs/by-name/is/istioctl/package.nix
@@ -7,15 +7,15 @@
 
 buildGoModule rec {
   pname = "istioctl";
-  version = "1.27.3";
+  version = "1.28.0";
 
   src = fetchFromGitHub {
     owner = "istio";
     repo = "istio";
     rev = version;
-    hash = "sha256-MgicdVRYHdp38lHY7VjAH+4xKD9sgEroEIwNkSmbfjU=";
+    hash = "sha256-NLARp5Gw04UosyLw3TkEmtvSLKa+tYp4s60UKvcJOgw=";
   };
-  vendorHash = "sha256-AJzEAFZZe4QtuYRcIJ8GwosbBi5gWn+DAOpVS8JnAdQ=";
+  vendorHash = "sha256-ge9aR3ZYOJaYp0D1UWzzg40nXlwM/Sl1Ep+u1CmdSV8=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From b84181e00bb1a1181587c24a7f92113dd47435c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 20:03:18 +0000
Subject: [PATCH 5676/6226] slade-unstable: 3.2.8-unstable-2025-10-28 ->
 3.2.8-unstable-2025-11-04

---
 pkgs/by-name/sl/slade-unstable/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sl/slade-unstable/package.nix b/pkgs/by-name/sl/slade-unstable/package.nix
index ac98cf9049a1..aae72ffaf2ff 100644
--- a/pkgs/by-name/sl/slade-unstable/package.nix
+++ b/pkgs/by-name/sl/slade-unstable/package.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation {
   pname = "slade";
-  version = "3.2.8-unstable-2025-10-28";
+  version = "3.2.8-unstable-2025-11-04";
 
   src = fetchFromGitHub {
     owner = "sirjuddington";
     repo = "SLADE";
-    rev = "3b82f41dea2bd67570af1479550653c20d192a6c";
-    hash = "sha256-utvsQVw20q1qkkOP11fBVo3IdMKijm8Ya5Ryr/BoNhU=";
+    rev = "2a5e2b25e31eb35ba73805c74f03c1bc56a66de0";
+    hash = "sha256-lLZ0L07u8PQhe8e2eCYGKrSnRp1EIYfME39JK/KXaj4=";
   };
 
   nativeBuildInputs = [

From c4dbc1bc6bf3c35aec9aa077edfae342857b3be8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 5 Nov 2025 21:03:38 +0100
Subject: [PATCH 5677/6226] python313Packages.rns: 1.0.0 -> 1.0.1

Diff: https://github.com/markqvist/Reticulum/compare/1.0.0...1.0.1

Changelog: https://github.com/markqvist/Reticulum/blob/1.0.1/Changelog.md
---
 pkgs/development/python-modules/rns/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rns/default.nix b/pkgs/development/python-modules/rns/default.nix
index 9e41698053a2..c0bea018a117 100644
--- a/pkgs/development/python-modules/rns/default.nix
+++ b/pkgs/development/python-modules/rns/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "rns";
-  version = "1.0.0";
+  version = "1.0.1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "markqvist";
     repo = "Reticulum";
     tag = version;
-    hash = "sha256-d227mAVJKcm3Dx2HS7CvVsyWyLl7GoPSA/YrWjs7jm0=";
+    hash = "sha256-fbUoZSJtg5RFyZOC4I0d7wbPNcZ1RwmrD/1lHUoNos8=";
   };
 
   patches = [

From e0ca3800016a14fa450fe8927aa921619ddc475b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 5 Nov 2025 21:03:45 +0100
Subject: [PATCH 5678/6226] python313Packages.lxmf: 0.8.0 -> 0.9.1

Changelog: https://github.com/markqvist/LXMF/releases/tag/0.9.1
---
 pkgs/development/python-modules/lxmf/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lxmf/default.nix b/pkgs/development/python-modules/lxmf/default.nix
index 5509557505d0..c795432c45bd 100644
--- a/pkgs/development/python-modules/lxmf/default.nix
+++ b/pkgs/development/python-modules/lxmf/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "lxmf";
-  version = "0.8.0";
+  version = "0.9.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "markqvist";
     repo = "lxmf";
     tag = version;
-    hash = "sha256-toxie5QdrgwyvC9v0G7mvGS6/ZEqA5gpRtEeaHgspD0=";
+    hash = "sha256-5sY6Sf4oRwSXQR0YAfqeSmW1aASTT2iZLd5+BFx+5Mw=";
   };
 
   build-system = [ setuptools ];

From ec330d1bb1a31a986fdaded76ca11ad1b79f16ee Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 5 Nov 2025 21:04:05 +0100
Subject: [PATCH 5679/6226] python313Packages.nomadnet: 0.8.0 -> 0.9.1

Changelog: https://github.com/markqvist/NomadNet/releases/tag/0.9.1
---
 pkgs/development/python-modules/nomadnet/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/nomadnet/default.nix b/pkgs/development/python-modules/nomadnet/default.nix
index 2959a1f81e38..24c774b8c0db 100644
--- a/pkgs/development/python-modules/nomadnet/default.nix
+++ b/pkgs/development/python-modules/nomadnet/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "nomadnet";
-  version = "0.8.0";
+  version = "0.9.1";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "markqvist";
     repo = "NomadNet";
     tag = version;
-    hash = "sha256-9XuwVz7p05jgFkDMuag07ibXxjM+MhkL4dLdRs/O3NI=";
+    hash = "sha256-Rqs0x5KF3Nb/VMNBr6IriDWX7th4OrBj3x5tQhUIU3U=";
   };
 
   build-system = [ setuptools ];

From c6badbf64d16aab8a1dab905928b8347626d1879 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 5 Nov 2025 21:00:18 +0100
Subject: [PATCH 5680/6226] python313Packages.frigidaire: 0.18.24 -> 0.18.28

Diff: https://github.com/bm1549/frigidaire/compare/0.18.24...0.18.28

Changelog: https://github.com/bm1549/frigidaire/releases/tag/0.18.28
---
 pkgs/development/python-modules/frigidaire/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix
index 5ea688a51cf3..6c98c458a9ca 100644
--- a/pkgs/development/python-modules/frigidaire/default.nix
+++ b/pkgs/development/python-modules/frigidaire/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "frigidaire";
-  version = "0.18.24";
+  version = "0.18.28";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = "bm1549";
     repo = "frigidaire";
     tag = version;
-    hash = "sha256-lpwzXeuFPvWV26AIAfzBHY3IiwEc8vThTXc/F0iyV1o=";
+    hash = "sha256-2VleZyisva2HQPDmPoZbxnYu3t1S/HTuaZtFWFiU1nU=";
   };
 
   postPatch = ''

From 69ade00a50d23b33c4ffdfdd0563dad5ccbe177f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 5 Nov 2025 21:15:35 +0100
Subject: [PATCH 5681/6226] python313Packages.frigidaire: modernize

---
 pkgs/development/python-modules/frigidaire/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/frigidaire/default.nix b/pkgs/development/python-modules/frigidaire/default.nix
index 6c98c458a9ca..841dc3932922 100644
--- a/pkgs/development/python-modules/frigidaire/default.nix
+++ b/pkgs/development/python-modules/frigidaire/default.nix
@@ -5,7 +5,6 @@
   chardet,
   fetchFromGitHub,
   idna,
-  pythonOlder,
   requests,
   setuptools,
   urllib3,
@@ -16,8 +15,6 @@ buildPythonPackage rec {
   version = "0.18.28";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "bm1549";
     repo = "frigidaire";
@@ -49,7 +46,7 @@ buildPythonPackage rec {
     description = "Python API for the Frigidaire devices";
     homepage = "https://github.com/bm1549/frigidaire";
     changelog = "https://github.com/bm1549/frigidaire/releases/tag/${src.tag}";
-    license = with licenses; [ mit ];
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
   };
 }

From 2b06a2226c01d39a9e24bf5a44c09ee514b3c26f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 5 Nov 2025 21:18:43 +0100
Subject: [PATCH 5682/6226] python313Packages.json-stream: remove disabled

---
 pkgs/development/python-modules/json-stream/default.nix | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pkgs/development/python-modules/json-stream/default.nix b/pkgs/development/python-modules/json-stream/default.nix
index 890a29940f39..a08869b01070 100644
--- a/pkgs/development/python-modules/json-stream/default.nix
+++ b/pkgs/development/python-modules/json-stream/default.nix
@@ -6,7 +6,6 @@
   httpx,
   iconv,
   pytestCheckHook,
-  pythonOlder,
   requests,
   json-stream-rs-tokenizer,
   setuptools,
@@ -17,8 +16,6 @@ buildPythonPackage rec {
   version = "2.4.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "daggaz";
     repo = "json-stream";

From b7087e47ab0d71a0b98aa719485ae2d788059eae Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 5 Nov 2025 21:20:32 +0100
Subject: [PATCH 5683/6226] python313Packages.usort: modernize

---
 pkgs/development/python-modules/usort/default.nix | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/usort/default.nix b/pkgs/development/python-modules/usort/default.nix
index 1e3dcaea1b3d..2420884befc2 100644
--- a/pkgs/development/python-modules/usort/default.nix
+++ b/pkgs/development/python-modules/usort/default.nix
@@ -8,7 +8,6 @@
   hatchling,
   libcst,
   moreorless,
-  pythonOlder,
   stdlibs,
   toml,
   trailrunner,
@@ -19,9 +18,7 @@
 buildPythonPackage rec {
   pname = "usort";
   version = "1.1.0";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "facebook";
@@ -30,12 +27,12 @@ buildPythonPackage rec {
     hash = "sha256-QnhpnuEt6j/QPmX29A0523QDh4o2QfaCoDI0YJpTc8Y=";
   };
 
-  nativeBuildInputs = [
+  build-system = [
     hatch-vcs
     hatchling
   ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     attrs
     click
     libcst
@@ -54,10 +51,10 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "Safe, minimal import sorting for Python projects";
-    mainProgram = "usort";
     homepage = "https://github.com/facebook/usort";
-    changelog = "https://github.com/facebook/usort/blob/${version}/CHANGELOG.md";
+    changelog = "https://github.com/facebook/usort/blob/${src.tag}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ fab ];
+    mainProgram = "usort";
   };
 }

From 6c6e04931176d70748540f6d177e25e343b9f44d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 20:22:52 +0000
Subject: [PATCH 5684/6226] vscode-extensions.redhat.java: 1.46.0 -> 1.47.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 1a5b850fe551..8ee66e48355b 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3846,8 +3846,8 @@ let
         mktplcRef = {
           publisher = "redhat";
           name = "java";
-          version = "1.46.0";
-          hash = "sha256-i7Nac47aJVdxxRgM8KCCI8zmwTCGxxy0PrejgjOCYXE=";
+          version = "1.47.0";
+          hash = "sha256-zxhNZJWi4mjENzHsO74FjOrztl5uZbVU3aMPO5DwGRo=";
         };
         buildInputs = [ jdk ];
         meta = {

From 7280078c9e9be94786356d3a80c1f96f912d768f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 5 Nov 2025 21:23:19 +0100
Subject: [PATCH 5685/6226] exploitdb: 2025-10-30 -> 2025-11-01

Diff: https://gitlab.com/exploit-database/exploitdb/-/compare/2025-10-30...2025-11-01
---
 pkgs/by-name/ex/exploitdb/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix
index 2b47cbd3b9d9..5865d889ab06 100644
--- a/pkgs/by-name/ex/exploitdb/package.nix
+++ b/pkgs/by-name/ex/exploitdb/package.nix
@@ -6,13 +6,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "exploitdb";
-  version = "2025-10-30";
+  version = "2025-11-01";
 
   src = fetchFromGitLab {
     owner = "exploit-database";
     repo = "exploitdb";
     tag = finalAttrs.version;
-    hash = "sha256-3e1NRjuLNgxKTEPTAhNp1rJNJ7ZQGnPZOXCCpuAYvLM=";
+    hash = "sha256-MXWP7YOv4JAIKerAGuSeiAiQ98sRU6mZ1ZQSJBPCZQs=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From fee9bdcd79273d322c178ccb7519cfbb8c745e83 Mon Sep 17 00:00:00 2001
From: leiserfg <leiserfg@gmail.com>
Date: Wed, 5 Nov 2025 21:24:01 +0100
Subject: [PATCH 5686/6226] kitty: exclude more tests on darwin to allow
 building

---
 pkgs/by-name/ki/kitty/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix
index 62e5b0e9f53d..95dcc43a47c9 100644
--- a/pkgs/by-name/ki/kitty/package.nix
+++ b/pkgs/by-name/ki/kitty/package.nix
@@ -218,9 +218,13 @@ buildPythonApplication rec {
 
     substituteInPlace kitty_tests/ssh.py \
       --replace test_ssh_connection_data no_test_ssh_connection_data \
+      --replace test_ssh_shell_integration no_test_ssh_shell_integration \
+      --replace test_ssh_copy no_test_ssh_copy \
+      --replace test_ssh_env_vars no_test_ssh_env_vars
 
     substituteInPlace kitty_tests/shell_integration.py \
-      --replace test_fish_integration no_test_fish_integration
+      --replace test_fish_integration no_test_fish_integration \
+      --replace test_zsh_integration no_test_zsh_integration
 
     substituteInPlace kitty_tests/fonts.py \
       --replace test_fallback_font_not_last_resort no_test_fallback_font_not_last_resort
@@ -236,7 +240,6 @@ buildPythonApplication rec {
 
     # Fontconfig error: Cannot load default config file: No such file: (null)
     export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf
-
     # Required for `test_ssh_shell_integration` to pass.
     export TERM=kitty
 

From cc61a46f2d184e1bdfd17b8e9414fff77c9bc136 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 5 Nov 2025 20:31:35 +0000
Subject: [PATCH 5687/6226] python3Packages.lerobot: skip unreliable tests
 (hanging forever)

---
 pkgs/development/python-modules/lerobot/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/python-modules/lerobot/default.nix b/pkgs/development/python-modules/lerobot/default.nix
index daec5bd39c0b..6111f49275a0 100644
--- a/pkgs/development/python-modules/lerobot/default.nix
+++ b/pkgs/development/python-modules/lerobot/default.nix
@@ -150,6 +150,11 @@ buildPythonPackage rec {
     "test_construction_rejects_step_without_call"
   ];
 
+  disabledTestPaths = [
+    # Sometimes hang forever on some CPU models
+    "tests/policies/test_sac_policy.py"
+  ];
+
   meta = {
     description = "Making AI for Robotics more accessible with end-to-end learning";
     homepage = "https://github.com/huggingface/lerobot";

From ece62dd6fb15e4a21293c4571427872f3c518fd7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 20:36:14 +0000
Subject: [PATCH 5688/6226] dnscontrol: 4.26.0 -> 4.27.1

---
 pkgs/by-name/dn/dnscontrol/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix
index 68610fd6ae18..fc267944ff65 100644
--- a/pkgs/by-name/dn/dnscontrol/package.nix
+++ b/pkgs/by-name/dn/dnscontrol/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "dnscontrol";
-  version = "4.26.0";
+  version = "4.27.1";
 
   src = fetchFromGitHub {
     owner = "StackExchange";
     repo = "dnscontrol";
     tag = "v${version}";
-    hash = "sha256-yDjxAQDqe9LIvzVy255rzKs7r7Xb4RAD1CFuKSrnQS8=";
+    hash = "sha256-OlXqX26aL08gft8sFPZrYBhf7U4DY46BYqli68xEPbg=";
   };
 
-  vendorHash = "sha256-Ee4RagjYDngsMbTLjyeVFYv9O5cJuc9J2XRUP0FAe+w=";
+  vendorHash = "sha256-3JlPT0nL/FzjxH6aWZBwYaNetSEzzEv00/F7bsj4h0Y=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 39871e695d0f51d91a7a0943158b5bf1d8343754 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 5 Nov 2025 20:38:28 +0000
Subject: [PATCH 5689/6226] python3Packages.torchcrepe: cleanup

---
 .../python-modules/torchcrepe/default.nix        | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/torchcrepe/default.nix b/pkgs/development/python-modules/torchcrepe/default.nix
index 86fb24eb3875..d9b188064e72 100644
--- a/pkgs/development/python-modules/torchcrepe/default.nix
+++ b/pkgs/development/python-modules/torchcrepe/default.nix
@@ -2,24 +2,26 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   librosa,
-  pytestCheckHook,
-  pythonOlder,
   resampy,
   scipy,
-  setuptools,
   torch,
   torchaudio,
   tqdm,
+
+  # tests
+  pytestCheckHook,
 }:
 
 buildPythonPackage {
   pname = "torchcrepe";
   version = "0.0.24";
   pyproject = true;
-  build-system = [ setuptools ];
-
-  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "maxrmorrison";
@@ -29,6 +31,8 @@ buildPythonPackage {
     hash = "sha256-w2T8D3ATCHVBCBhMdLSYdV0yb9vUYwZLz+B2X2gteEU=";
   };
 
+  build-system = [ setuptools ];
+
   dependencies = [
     librosa
     resampy

From 5e91f54bb763c4c09e73c81b0767e409025c9a52 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 20:40:04 +0000
Subject: [PATCH 5690/6226] terraform-providers.pagerduty_pagerduty: 3.30.4 ->
 3.30.5

---
 .../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 7f5952b7bba0..8918882c6efc 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1075,11 +1075,11 @@
     "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw="
   },
   "pagerduty_pagerduty": {
-    "hash": "sha256-ydLlwg7gnyp0tbDWUzYgigqycgTnfoJRswH61kD0P4k=",
+    "hash": "sha256-VcVvToBrmgLWiv7NpC6DEvXlq+bIydYat/g6E/8Uyhc=",
     "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty",
     "owner": "PagerDuty",
     "repo": "terraform-provider-pagerduty",
-    "rev": "v3.30.4",
+    "rev": "v3.30.5",
     "spdx": "MPL-2.0",
     "vendorHash": null
   },

From df6a9a739db569cb11f2a57aa15035067b95ba77 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Wed, 5 Nov 2025 09:03:28 +0100
Subject: [PATCH 5691/6226] ci/github-script/bot: disregard bot and ghost
 approvals

We technically counted bot approvals and approvals by deleted users for
the approval labels as well. The former don't exist, yet, but if they
were, I don't think we'd count them. The latter should arguably *not* be
counted, because we can't tell anymore *who* approved, so we can't put
any weight on it as reviewers.

This simplifies the logic, too.
---
 ci/github-script/bot.js | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index 654ca84d2367..438ed08d9a78 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -209,10 +209,16 @@ module.exports = async ({ github, context, core, dry }) => {
       }
     }
 
-    const reviews = await github.paginate(github.rest.pulls.listReviews, {
-      ...context.repo,
-      pull_number,
-    })
+    // Check for any human reviews other than GitHub actions and other GitHub apps.
+    // Accounts could be deleted as well, so don't count them.
+    const reviews = (
+      await github.paginate(github.rest.pulls.listReviews, {
+        ...context.repo,
+        pull_number,
+      })
+    ).filter(
+      (r) => r.user && !r.user.login.endsWith('[bot]') && r.user.type !== 'Bot',
+    )
 
     const approvals = new Set(
       reviews
@@ -282,13 +288,6 @@ module.exports = async ({ github, context, core, dry }) => {
     log('Last eval run', run_id ?? '<n/a>')
 
     if (conclusion === 'success') {
-      // Check for any human reviews other than GitHub actions and other GitHub apps.
-      // Accounts could be deleted as well, so don't count them.
-      const humanReviews = reviews.filter(
-        (r) =>
-          r.user && !r.user.login.endsWith('[bot]') && r.user.type !== 'Bot',
-      )
-
       Object.assign(prLabels, {
         // We only set this label if the latest eval run was successful, because if it was not, it
         // *could* have requested reviewers. We will let the PR author fix CI first, before "escalating"
@@ -301,7 +300,7 @@ module.exports = async ({ github, context, core, dry }) => {
         '9.needs: reviewer':
           !pull_request.draft &&
           pull_request.requested_reviewers.length === 0 &&
-          humanReviews.length === 0,
+          reviews.length === 0,
       })
     }
 

From 310cc0bc49c16fb05db001c1bc36d24f466675c4 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 5 Nov 2025 20:42:37 +0000
Subject: [PATCH 5692/6226] python3Packages.torchcrepe: add missing torchcodec
 dependency

---
 pkgs/development/python-modules/torchcrepe/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/torchcrepe/default.nix b/pkgs/development/python-modules/torchcrepe/default.nix
index d9b188064e72..7872ba143028 100644
--- a/pkgs/development/python-modules/torchcrepe/default.nix
+++ b/pkgs/development/python-modules/torchcrepe/default.nix
@@ -12,6 +12,7 @@
   scipy,
   torch,
   torchaudio,
+  torchcodec,
   tqdm,
 
   # tests
@@ -39,6 +40,7 @@ buildPythonPackage {
     scipy
     torch
     torchaudio
+    torchcodec
     tqdm
   ];
 

From 49c83c5eea8b390229c69919b4db9e5ef2c9186a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 20:50:47 +0000
Subject: [PATCH 5693/6226] aws-lambda-rie: 1.27 -> 1.28

---
 pkgs/by-name/aw/aws-lambda-rie/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/aw/aws-lambda-rie/package.nix b/pkgs/by-name/aw/aws-lambda-rie/package.nix
index a4c4b639a9f6..479a0aae9943 100644
--- a/pkgs/by-name/aw/aws-lambda-rie/package.nix
+++ b/pkgs/by-name/aw/aws-lambda-rie/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "aws-lambda-runtime-interface-emulator";
-  version = "1.27";
+  version = "1.28";
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-lambda-runtime-interface-emulator";
     rev = "v${version}";
-    sha256 = "sha256-moOCuAq6eliNutP5oZGC33VJZXkuGCEKLdMqIwC+Bo4=";
+    sha256 = "sha256-BEyztLEn2S3gkmb7WV+tZ6Cmjt3/h8mVToSQQ6qjmRo=";
   };
 
   vendorHash = "sha256-+tgB9Z39Oq43PZoF85DG1Z/CGeoXXTKAML7Z6DZ1XvM=";

From a23d0ab24c30131c3a9036f0a9d9c1903716aa88 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 4 Nov 2025 16:21:28 +0100
Subject: [PATCH 5694/6226] ci/github-script/bot: request reviewers

This migrates the bash code to request reviewers to github-script. This
will allow multiple nice improvements later on, but at this stage it's
mostly a reduction in code and complexity.
---
 .github/workflows/pull-request-target.yml |  12 --
 .github/workflows/reviewers.yml           | 157 ----------------------
 .github/workflows/test.yml                |   1 -
 ci/default.nix                            |   1 -
 ci/github-script/bot.js                   |  27 +++-
 ci/github-script/reviewers.js             | 120 +++++++++++++++++
 ci/request-reviews/default.nix            |  33 -----
 ci/request-reviews/request-reviewers.sh   | 120 -----------------
 8 files changed, 146 insertions(+), 325 deletions(-)
 delete mode 100644 .github/workflows/reviewers.yml
 create mode 100644 ci/github-script/reviewers.js
 delete mode 100644 ci/request-reviews/default.nix
 delete mode 100755 ci/request-reviews/request-reviewers.sh

diff --git a/.github/workflows/pull-request-target.yml b/.github/workflows/pull-request-target.yml
index 76a77c7942e5..a3774366bc9b 100644
--- a/.github/workflows/pull-request-target.yml
+++ b/.github/workflows/pull-request-target.yml
@@ -112,18 +112,6 @@ jobs:
     with:
       headBranch: ${{ needs.prepare.outputs.headBranch }}
 
-  reviewers:
-    name: Reviewers
-    needs: [prepare, eval]
-    if: |
-      needs.prepare.outputs.targetSha &&
-      !contains(fromJSON(needs.prepare.outputs.headBranch).type, 'development')
-    uses: ./.github/workflows/reviewers.yml
-    secrets:
-      OWNER_APP_PRIVATE_KEY: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
-    with:
-      artifact-prefix: ${{ inputs.artifact-prefix }}
-
   build:
     name: Build
     needs: [prepare]
diff --git a/.github/workflows/reviewers.yml b/.github/workflows/reviewers.yml
deleted file mode 100644
index 060d82d84201..000000000000
--- a/.github/workflows/reviewers.yml
+++ /dev/null
@@ -1,157 +0,0 @@
-# This workflow will request reviews from the maintainers of each package
-# listed in the PR's most recent eval comparison artifact.
-
-name: Reviewers
-
-on:
-  pull_request_target:
-    types: [ready_for_review]
-  workflow_call:
-    inputs:
-      artifact-prefix:
-        required: true
-        type: string
-    secrets:
-      OWNER_APP_PRIVATE_KEY:
-        required: true
-
-concurrency:
-  group: reviewers-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}
-  cancel-in-progress: true
-
-permissions: {}
-
-defaults:
-  run:
-    shell: bash
-
-jobs:
-  request:
-    runs-on: ubuntu-24.04-arm
-    timeout-minutes: 20
-    steps:
-      - name: Check out the PR at the base commit
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
-        with:
-          persist-credentials: false
-          path: trusted
-          sparse-checkout: ci
-
-      - name: Install Nix
-        uses: cachix/install-nix-action@456688f15bc354bef6d396e4a35f4f89d40bf2b7 # v31
-
-      - name: Build the requestReviews derivation
-        run: nix-build trusted/ci -A requestReviews
-
-      # For requesting reviewers, this job depends on a GitHub App with the following permissions:
-      # - Permissions:
-      #   - Repository > Administration: read-only
-      #   - Organization > Members: read-only
-      #   - Repository > Pull Requests: read-write
-      # - Install App on this repository, setting these variables:
-      #   - OWNER_APP_ID (variable)
-      #   - OWNER_APP_PRIVATE_KEY (secret)
-      #
-      # Can't use the token received from permissions above, because it can't get enough permissions.
-      - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
-        if: github.event_name == 'pull_request_target' && vars.OWNER_APP_ID
-        id: app-token
-        with:
-          app-id: ${{ vars.OWNER_APP_ID }}
-          private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
-          permission-administration: read
-          permission-members: read
-          permission-pull-requests: write
-
-      - name: Log current API rate limits (github.token)
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: gh api /rate_limit | jq
-
-      # In the regular case, this workflow is called via workflow_call from the eval workflow directly.
-      # In the more special case, when a PR is undrafted an eval run will have started already.
-      - name: Wait for comparison to be done
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
-        id: eval
-        env:
-          ARTIFACT: ${{ inputs.artifact-prefix }}comparison
-        with:
-          script: |
-            const run_id = (await github.rest.actions.listWorkflowRuns({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              workflow_id: context.eventName === 'pull_request' ? 'test.yml' : 'pull-request-target.yml',
-              event: context.eventName,
-              head_sha: context.payload.pull_request.head.sha
-            })).data.workflow_runs[0].id
-
-            core.setOutput('run-id', run_id)
-
-            // Waiting 120 * 5 sec = 10 min. max.
-            // The extreme case is an Eval run that just started when the PR is undrafted.
-            // Eval takes max 5-6 minutes, normally.
-            for (let i = 0; i < 120; i++) {
-              const result = await github.rest.actions.listWorkflowRunArtifacts({
-                owner: context.repo.owner,
-                repo: context.repo.repo,
-                run_id,
-                name: process.env.ARTIFACT,
-              })
-              if (result.data.total_count > 0) return
-              await new Promise(resolve => setTimeout(resolve, 5000))
-            }
-            throw new Error("No comparison artifact found.")
-
-      - name: Log current API rate limits (github.token)
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: gh api /rate_limit | jq
-
-      - name: Download the comparison results
-        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
-        with:
-          run-id: ${{ steps.eval.outputs.run-id }}
-          github-token: ${{ github.token }}
-          pattern: ${{ inputs.artifact-prefix }}comparison
-          path: comparison
-          merge-multiple: true
-
-      - name: Log current API rate limits (app-token)
-        if: ${{ steps.app-token.outputs.token }}
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh api /rate_limit | jq
-
-      - name: Log current API rate limits (github.token)
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: gh api /rate_limit | jq
-
-      - name: Requesting reviews
-        if: ${{ steps.app-token.outputs.token }}
-        env:
-          GH_TOKEN: ${{ github.token }}
-          APP_GH_TOKEN: ${{ steps.app-token.outputs.token }}
-          REPOSITORY: ${{ github.repository }}
-          NUMBER: ${{ github.event.number }}
-          AUTHOR: ${{ github.event.pull_request.user.login }}
-          # Don't request reviewers on draft PRs
-          DRY_MODE: ${{ github.event.pull_request.draft && '1' || '' }}
-        run: |
-          # maintainers.json contains GitHub IDs. Look up handles to request reviews from.
-          # There appears to be no API to request reviews based on GitHub IDs
-          jq -r 'keys[]' comparison/maintainers.json \
-            | while read -r id; do gh api /user/"$id" --jq .login; done \
-            | cat comparison/owners.txt - \
-            | GH_TOKEN="$APP_GH_TOKEN" result/bin/request-reviewers.sh "$REPOSITORY" "$NUMBER" "$AUTHOR"
-
-      - name: Log current API rate limits (app-token)
-        if: ${{ steps.app-token.outputs.token }}
-        env:
-          GH_TOKEN: ${{ steps.app-token.outputs.token }}
-        run: gh api /rate_limit | jq
-
-      - name: Log current API rate limits (github.token)
-        env:
-          GH_TOKEN: ${{ github.token }}
-        run: gh api /rate_limit | jq
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index b9369de2af3d..727a9f965845 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -69,7 +69,6 @@ jobs:
               '.github/workflows/eval.yml',
               '.github/workflows/lint.yml',
               '.github/workflows/pull-request-target.yml',
-              '.github/workflows/reviewers.yml',
               '.github/workflows/test.yml',
               'ci/github-script/bot.js',
               'ci/github-script/merge.js',
diff --git a/ci/default.nix b/ci/default.nix
index 5f22dc47ed60..8712a44e0584 100644
--- a/ci/default.nix
+++ b/ci/default.nix
@@ -156,7 +156,6 @@ let
 in
 rec {
   inherit pkgs fmt;
-  requestReviews = pkgs.callPackage ./request-reviews { };
   codeownersValidator = pkgs.callPackage ./codeowners-validator { };
 
   # FIXME(lf-): it might be useful to test other Nix implementations
diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index 438ed08d9a78..e249e9c8cdbe 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -5,6 +5,7 @@ module.exports = async ({ github, context, core, dry }) => {
   const withRateLimit = require('./withRateLimit.js')
   const { classify } = require('../supportedBranches.js')
   const { handleMerge } = require('./merge.js')
+  const { handleReviewers } = require('./reviewers.js')
 
   const artifactClient = new DefaultArtifactClient()
 
@@ -372,6 +373,30 @@ module.exports = async ({ github, context, core, dry }) => {
           maintainers[pkg]?.some((m) => approvals.has(m)),
         ),
       })
+
+      if (!pull_request.draft) {
+        await handleReviewers({
+          github,
+          context,
+          core,
+          log,
+          dry,
+          pull_request,
+          reviews,
+          // TODO: Use maintainer map instead of the artifact.
+          maintainers: Object.keys(
+            JSON.parse(
+              await readFile(`${pull_number}/maintainers.json`, 'utf-8'),
+            ),
+          ).map((id) => parseInt(id)),
+          // TODO: Create owner map similar to maintainer map.
+          owners: (await readFile(`${pull_number}/owners.txt`, 'utf-8')).split(
+            '\n',
+          ),
+          getTeamMembers,
+          getUser,
+        })
+      }
     }
 
     return prLabels
@@ -520,7 +545,7 @@ module.exports = async ({ github, context, core, dry }) => {
       const hasChanges = Object.keys(after).some(
         (name) => (before[name] ?? false) !== after[name],
       )
-      if (log('Has changes', hasChanges, !hasChanges)) return
+      if (log('Has label changes', hasChanges, !hasChanges)) return
 
       // Skipping labeling on a pull_request event, because we have no privileges.
       const labels = Object.entries(after)
diff --git a/ci/github-script/reviewers.js b/ci/github-script/reviewers.js
new file mode 100644
index 000000000000..56dc3ec8439a
--- /dev/null
+++ b/ci/github-script/reviewers.js
@@ -0,0 +1,120 @@
+async function handleReviewers({
+  github,
+  context,
+  core,
+  log,
+  dry,
+  pull_request,
+  reviews,
+  maintainers,
+  owners,
+  getTeamMembers,
+  getUser,
+}) {
+  const pull_number = pull_request.number
+
+  const users = new Set([
+    ...(await Promise.all(
+      maintainers.map(async (id) => (await getUser(id)).login),
+    )),
+    ...owners.filter((handle) => handle && !handle.includes('/')),
+  ])
+  log('reviewers - users', Array.from(users).join(', '))
+
+  const teams = new Set(
+    owners
+      .map((handle) => handle.split('/'))
+      .filter(([org, slug]) => org === context.repo.owner && slug)
+      .map(([, slug]) => slug),
+  )
+  log('reviewers - teams', Array.from(teams).join(', '))
+
+  const team_members = new Set(
+    (await Promise.all(Array.from(teams, getTeamMembers)))
+      .flat(1)
+      .map(({ login }) => login),
+  )
+  log('reviewers - team_members', Array.from(team_members).join(', '))
+
+  const new_reviewers = users
+    .union(team_members)
+    // We can't request a review from the author.
+    .difference(new Set([pull_request.user?.login]))
+  log('reviewers - new_reviewers', Array.from(new_reviewers).join(', '))
+
+  // Filter users to repository collaborators. If they're not, they can't be requested
+  // for review. In that case, they probably missed their invite to the maintainers team.
+  const reviewers = (
+    await Promise.all(
+      Array.from(new_reviewers, async (username) => {
+        try {
+          await github.rest.repos.checkCollaborator({
+            ...context.repo,
+            username,
+          })
+          return username
+        } catch (e) {
+          if (e.status !== 404) throw e
+          core.warn(
+            `PR #${pull_number}: User ${username} cannot be requested for review because they don't exist or are not a repository collaborator, ignoring. They probably missed the automated invite to the maintainers team (see <https://github.com/NixOS/nixpkgs/issues/234293>).`,
+          )
+        }
+      }),
+    )
+  ).filter(Boolean)
+  log('reviewers - reviewers', reviewers.join(', '))
+
+  if (reviewers.length > 15) {
+    log(
+      `Too many reviewers (${reviewers.join(', ')}), skipping review requests.`,
+    )
+    return
+  }
+
+  const requested_reviewers = new Set(
+    pull_request.requested_reviewers.map(({ login }) => login),
+  )
+  log(
+    'reviewers - requested_reviewers',
+    Array.from(requested_reviewers).join(', '),
+  )
+
+  const existing_reviewers = new Set(
+    reviews.map(({ user }) => user?.login).filter(Boolean),
+  )
+  log(
+    'reviewers - existing_reviewers',
+    Array.from(existing_reviewers).join(', '),
+  )
+
+  const non_requested_reviewers = new Set(reviewers)
+    .difference(requested_reviewers)
+    // We don't want to rerequest reviews from people who already reviewed.
+    .difference(existing_reviewers)
+  log(
+    'reviewers - non_requested_reviewers',
+    Array.from(non_requested_reviewers).join(', '),
+  )
+
+  if (non_requested_reviewers.size === 0) {
+    log('Has reviewer changes', 'false (skipped)')
+  } else if (dry) {
+    core.info(
+      `Requesting reviewers for #${pull_number}: ${Array.from(non_requested_reviewers).join(', ')} (dry)`,
+    )
+  } else {
+    // We had tried the "request all reviewers at once" thing in the past, but it didn't work out:
+    //   https://github.com/NixOS/nixpkgs/commit/034613f860fcd339bd2c20c8f6bc259a2f9dc034
+    // If we're hitting API errors here again, we'll need to investigate - and possibly reverse
+    // course.
+    await github.rest.pulls.requestReviewers({
+      ...context.repo,
+      pull_number,
+      reviewers,
+    })
+  }
+}
+
+module.exports = {
+  handleReviewers,
+}
diff --git a/ci/request-reviews/default.nix b/ci/request-reviews/default.nix
deleted file mode 100644
index 55a1889fe89f..000000000000
--- a/ci/request-reviews/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  stdenvNoCC,
-  makeWrapper,
-  coreutils,
-  jq,
-  github-cli,
-}:
-stdenvNoCC.mkDerivation {
-  name = "request-reviews";
-  src = lib.fileset.toSource {
-    root = ./.;
-    fileset = lib.fileset.unions [
-      ./request-reviewers.sh
-    ];
-  };
-  nativeBuildInputs = [ makeWrapper ];
-  dontBuild = true;
-  installPhase = ''
-    mkdir -p $out/bin
-    for bin in *.sh; do
-      mv "$bin" "$out/bin"
-      wrapProgram "$out/bin/$bin" \
-        --set PATH ${
-          lib.makeBinPath [
-            coreutils
-            jq
-            github-cli
-          ]
-        }
-    done
-  '';
-}
diff --git a/ci/request-reviews/request-reviewers.sh b/ci/request-reviews/request-reviewers.sh
deleted file mode 100755
index a7cde16eb97b..000000000000
--- a/ci/request-reviews/request-reviewers.sh
+++ /dev/null
@@ -1,120 +0,0 @@
-#!/usr/bin/env bash
-
-# Request reviewers for a PR, reading line-separated usernames on stdin,
-# filtering for valid reviewers before using the API endpoint to request reviews:
-# https://docs.github.com/en/rest/pulls/review-requests?apiVersion=2022-11-28#request-reviewers-for-a-pull-request
-
-set -euo pipefail
-
-tmp=$(mktemp -d)
-trap 'rm -rf "$tmp"' exit
-
-log() {
-    echo "$@" >&2
-}
-
-effect() {
-    if [[ -n "${DRY_MODE:-}" ]]; then
-        log "Skipping in dry mode:" "${@@Q}"
-    else
-        "$@"
-    fi
-}
-
-if (( "$#" < 3 )); then
-    log "Usage: $0 BASE_REPO PR_NUMBER PR_AUTHOR"
-    exit 1
-fi
-
-baseRepo=$1
-prNumber=$2
-prAuthor=$3
-
-tmp=$(mktemp -d)
-trap 'rm -rf "$tmp"' exit
-
-# Associative array with the user as the key for easy de-duplication
-# Make sure to always lowercase keys to avoid duplicates with different casings
-declare -A users=()
-while read -r handle && [[ -n "$handle" ]]; do
-    if [[ "$handle" =~ (.*)/(.*) ]]; then
-        # Teams look like $org/$team
-        org=${BASH_REMATCH[1]}
-        team=${BASH_REMATCH[2]}
-
-        # Instead of requesting a review from the team itself,
-        # we request reviews from the individual users.
-        # This is because once somebody from a team reviewed the PR,
-        # the API doesn't expose that the team was already requested for a review,
-        # so we wouldn't be able to avoid rerequesting reviews
-        # without saving some some extra state somewhere
-
-        # We could also consider implementing a more advanced heuristic
-        # in the future that e.g. only pings one team member,
-        # but escalates to somebody else if that member doesn't respond in time.
-        gh api \
-            --cache=1h \
-            -H "Accept: application/vnd.github+json" \
-            -H "X-GitHub-Api-Version: 2022-11-28" \
-            "/orgs/$org/teams/$team/members" \
-            --jq '.[].login' > "$tmp/team-members"
-        readarray -t members < "$tmp/team-members"
-        log "Team $handle has these members: ${members[*]}"
-
-        for user in "${members[@]}"; do
-            users[${user,,}]=
-        done
-    else
-        # Everything else is a user
-        users[${handle,,}]=
-    fi
-done
-
-# Cannot request a review from the author
-if [[ -v users[${prAuthor,,}] ]]; then
-    log "One or more files are owned by the PR author, ignoring"
-    unset 'users[${prAuthor,,}]'
-fi
-
-gh api \
-    -H "Accept: application/vnd.github+json" \
-    -H "X-GitHub-Api-Version: 2022-11-28" \
-    "/repos/$baseRepo/pulls/$prNumber/reviews" \
-    --jq '.[].user.login' > "$tmp/already-reviewed-by"
-
-# And we don't want to rerequest reviews from people who already reviewed
-while read -r user; do
-    if [[ -v users[${user,,}] ]]; then
-        log "User $user is a potential reviewer, but has already left a review, ignoring"
-        unset 'users[${user,,}]'
-    fi
-done < "$tmp/already-reviewed-by"
-
-for user in "${!users[@]}"; do
-    if ! gh api \
-        -H "Accept: application/vnd.github+json" \
-        -H "X-GitHub-Api-Version: 2022-11-28" \
-        "/repos/$baseRepo/collaborators/$user" >&2; then
-        log "User $user is not a repository collaborator, probably missed the automated invite to the maintainers team (see <https://github.com/NixOS/nixpkgs/issues/234293>), ignoring"
-        unset 'users[$user]'
-    fi
-done
-
-if [[ "${#users[@]}" -gt 15 ]]; then
-    log "Too many reviewers (${!users[*]}), skipping review requests"
-    exit 0
-fi
-
-for user in "${!users[@]}"; do
-    log "Requesting review from: $user"
-
-    if ! response=$(jq -n --arg user "$user" '{ reviewers: [ $user ] }' | \
-        effect gh api \
-            --method POST \
-            -H "Accept: application/vnd.github+json" \
-            -H "X-GitHub-Api-Version: 2022-11-28" \
-            "/repos/$baseRepo/pulls/$prNumber/requested_reviewers" \
-            --input -); then
-        log "Failed to request review from $user: $response"
-    fi
-done

From e68b0aef13a46e378255aa5a9eb22f13e9baf10c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Tue, 4 Nov 2025 18:29:12 +0100
Subject: [PATCH 5695/6226] ci/github-script/reviewers: improve "needs:
 reviewers" label

This should fix the bug where the "needs: reviewer" label was set too
early, just to be removed immediately, because reviewers were then
requested.
---
 ci/github-script/bot.js       |  5 ++++-
 ci/github-script/reviewers.js | 10 +++++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index e249e9c8cdbe..1b807b30ec7d 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -375,7 +375,10 @@ module.exports = async ({ github, context, core, dry }) => {
       })
 
       if (!pull_request.draft) {
-        await handleReviewers({
+        // We set this label earlier already, but the current PR state can be very different
+        // after handleReviewers has requested reviews, so update it in this case to prevent
+        // this label from flip-flopping.
+        prLabels['9.needs: reviewer'] = await handleReviewers({
           github,
           context,
           core,
diff --git a/ci/github-script/reviewers.js b/ci/github-script/reviewers.js
index 56dc3ec8439a..81ad151264a1 100644
--- a/ci/github-script/reviewers.js
+++ b/ci/github-script/reviewers.js
@@ -68,7 +68,8 @@ async function handleReviewers({
     log(
       `Too many reviewers (${reviewers.join(', ')}), skipping review requests.`,
     )
-    return
+    // false indicates, that we do have reviewers and don't need the "needs: reviewers" label.
+    return false
   }
 
   const requested_reviewers = new Set(
@@ -113,6 +114,13 @@ async function handleReviewers({
       reviewers,
     })
   }
+
+  // Return a boolean on whether the "needs: reviewers" label should be set.
+  return (
+    new_reviewers.size === 0 &&
+    existing_reviewers.size === 0 &&
+    requested_reviewers.size === 0
+  )
 }
 
 module.exports = {

From 3eb61d8a8ae141b0adf38fc287c325b2ef9dbb8f Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Fri, 17 Oct 2025 10:19:39 +0200
Subject: [PATCH 5696/6226] dl-librescore: Use patch instead of replacing
 package-lock.json

---
 pkgs/by-name/dl/dl-librescore/package.nix | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/dl/dl-librescore/package.nix b/pkgs/by-name/dl/dl-librescore/package.nix
index 2a6ac9b87131..d842fbc73bdd 100644
--- a/pkgs/by-name/dl/dl-librescore/package.nix
+++ b/pkgs/by-name/dl/dl-librescore/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   buildNpmPackage,
   fetchFromGitHub,
+  fetchpatch,
   python3,
   cctools,
 }:
@@ -18,14 +19,16 @@ buildNpmPackage rec {
     hash = "sha256-DwDlGTFdqAAsEWrhnieuaeYQ0N8COB/7b49xPJackJQ=";
   };
 
-  npmDepsHash = "sha256-5Uc83VdqMwQaTSmzwpBh7x4IKoVPd9MYDXkDvR1fz6Q=";
+  npmDepsHash = "sha256-JLB/+arhAzRj49m4kDCasDXEhVIBygSZ9kHI2npJf3s=";
 
-  # see https://github.com/LibreScore/dl-librescore/pull/32
-  # TODO can be removed with next update
-  postPatch = ''
-    substituteInPlace package-lock.json \
-      --replace 50c7a1508cd9358757c30794e14ba777e6faa8aa b4cb32eb1734a2f73ba2d92743647b1a91c0e2a8
-  '';
+  patches = [
+    # https://github.com/LibreScore/dl-librescore/pull/144
+    (fetchpatch {
+      name = "update-pdfkit.patch";
+      url = "https://github.com/LibreScore/dl-librescore/commit/3694697d2d3f3f59ca32ee962999b3dd22c81de7.patch";
+      hash = "sha256-ikEJNwKMDWpWBQnS3ur76vZqF+zRI6D5d0AyLDdreJY=";
+    })
+  ];
 
   makeCacheWritable = true;
 

From 15f7c3738e01c2cad700233f1a4b31e00c02975c Mon Sep 17 00:00:00 2001
From: Damien Cassou <damien@cassou.me>
Date: Fri, 17 Oct 2025 10:20:36 +0200
Subject: [PATCH 5697/6226] dl-librescore: 0.35.29 -> 0.35.32

Resolves #430574.
---
 pkgs/by-name/dl/dl-librescore/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/dl/dl-librescore/package.nix b/pkgs/by-name/dl/dl-librescore/package.nix
index d842fbc73bdd..1e8eec2e44a2 100644
--- a/pkgs/by-name/dl/dl-librescore/package.nix
+++ b/pkgs/by-name/dl/dl-librescore/package.nix
@@ -10,13 +10,13 @@
 
 buildNpmPackage rec {
   pname = "dl-librescore";
-  version = "0.35.29";
+  version = "0.35.32";
 
   src = fetchFromGitHub {
     owner = "LibreScore";
     repo = "dl-librescore";
     rev = "v${version}";
-    hash = "sha256-DwDlGTFdqAAsEWrhnieuaeYQ0N8COB/7b49xPJackJQ=";
+    hash = "sha256-qFAJlcyvH0lShaZKIAJkXqrY0DRaUvr8V9Ipch1A3kw=";
   };
 
   npmDepsHash = "sha256-JLB/+arhAzRj49m4kDCasDXEhVIBygSZ9kHI2npJf3s=";

From c29e218745bd9efa98db192100853fed69046b02 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 21:33:55 +0000
Subject: [PATCH 5698/6226] dbeaver-bin: 25.2.3 -> 25.2.4

---
 pkgs/by-name/db/dbeaver-bin/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix
index 6747d9a99b6a..7d4a5137d335 100644
--- a/pkgs/by-name/db/dbeaver-bin/package.nix
+++ b/pkgs/by-name/db/dbeaver-bin/package.nix
@@ -18,7 +18,7 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "dbeaver-bin";
-  version = "25.2.3";
+  version = "25.2.4";
 
   src =
     let
@@ -31,10 +31,10 @@ stdenvNoCC.mkDerivation (finalAttrs: {
         aarch64-darwin = "macos-aarch64.dmg";
       };
       hash = selectSystem {
-        x86_64-linux = "sha256-tOUOZP+A3vB73xvAj+OEvCR+APbwlKLwZN9iJYi/W7c=";
-        aarch64-linux = "sha256-yQ6+kZP22CtdaKQiRgWoYvUDMLz1mdlV3AWC+nKQVBI=";
-        x86_64-darwin = "sha256-tIkAkBcnF37sZV2ZHSgqe3PnAqSoU7iYRu8tNZ8fhfE=";
-        aarch64-darwin = "sha256-imkW4Dz8qWjIKLT6CvdjhIjWpEmfKk1MWVh5+NGujb4=";
+        x86_64-linux = "sha256-5mBk3HO5BqcydxDhancQ8YzfNjZ0bMAuNM9lf8fm4ks=";
+        aarch64-linux = "sha256-i9hQJ01G+Jy18bkYD9e6wAhufH87r/9qwxzzVd0K8LU=";
+        x86_64-darwin = "sha256-zSLLNOP+miG71/LCjNHanDbeRr986wwdb7x5q3gDUZs=";
+        aarch64-darwin = "sha256-njKjBXxv5tpaStiLHfL3Cs4FwtKBsLOCA4ASPggVhnY=";
       };
     in
     fetchurl {

From 5f8851fc0c499220183302568495851b500f0c2c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 21:35:34 +0000
Subject: [PATCH 5699/6226] vscode-extensions.vscjava.vscode-gradle: 3.17.0 ->
 3.17.1

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 1a5b850fe551..2325c5f06982 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -5020,8 +5020,8 @@ let
         mktplcRef = {
           name = "vscode-gradle";
           publisher = "vscjava";
-          version = "3.17.0";
-          hash = "sha256-SZRSSgi4/8cEHGvhoGf9J8hrSIQWn1sFTh4NSsJcMDg=";
+          version = "3.17.1";
+          hash = "sha256-3AGa1S6WN7zVaKxjHVba+CjXhEq8PjTD5HU5WY9pF4c=";
         };
 
         meta = {

From e9da816e8e9e5da81b2d950fa5f1048575265cac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 21:36:26 +0000
Subject: [PATCH 5700/6226] terraform-providers.cloudflare_cloudflare: 5.11.0
 -> 5.12.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 7f5952b7bba0..dc062a2dce20 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -190,13 +190,13 @@
     "vendorHash": "sha256-q942GCRd5czCdlpLYsXzj8Kt91GjCpyzhOkgWfkyHo8="
   },
   "cloudflare_cloudflare": {
-    "hash": "sha256-Lc9bC1dM4wNe+ZN2EYFRYfoZosocBEOI9SHvxJIOQCY=",
+    "hash": "sha256-Fx8Vh/2ALKIA3AlPEca+A0flVL7hHHNJM4Cfdklpq28=",
     "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare",
     "owner": "cloudflare",
     "repo": "terraform-provider-cloudflare",
-    "rev": "v5.11.0",
+    "rev": "v5.12.0",
     "spdx": "Apache-2.0",
-    "vendorHash": "sha256-N1vG3U7gxEbVbBax7g6AfHr2Aj1ypVefsEIuvZyLPYQ="
+    "vendorHash": "sha256-PZsYazLRmURTrtIq6KBUKPlzxewzbUzJTXN6YWbK288="
   },
   "cloudfoundry-community_cloudfoundry": {
     "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=",

From d1ec875fd0530f2f06fdc1665eb4f2506a19d57d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 21:38:00 +0000
Subject: [PATCH 5701/6226] vscode-extensions.anthropic.claude-code: 2.0.31 ->
 2.0.34

---
 .../vscode/extensions/anthropic.claude-code/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index b57f8587bffa..6a4f9c485d02 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "2.0.31";
-    hash = "sha256-ylcb5Ty9x9uj38OY0RXsS+YNKVKUzc1c5x6RJsZ3E2g=";
+    version = "2.0.34";
+    hash = "sha256-e+pjuGY0xrg43+pDDkQ4Svb1yBx2Fv+Z8WZoJv/k6D4=";
   };
 
   meta = {

From afa668c7550a7221fb02ba02ac02f367ed4eccdd Mon Sep 17 00:00:00 2001
From: PerchunPak <git@perchun.it>
Date: Wed, 5 Nov 2025 13:32:19 +0100
Subject: [PATCH 5702/6226] vimPlugins.nvim-treesitter.tests: use best
 practises for bash

---
 .../vim/plugins/nvim-treesitter/overrides.nix | 40 +++++++++++--------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
index fbb3619e0622..75623015e165 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix
@@ -112,31 +112,36 @@ in
         let
           pluginsToCheck =
             map (grammar: grammarToPlugin grammar)
-              # true is here because there is `recurseForDerivations = true`
+              # non-derivations are here because there is a `recurseForDerivations = true`
               (lib.filter lib.isDerivation (lib.attrValues tree-sitter-grammars));
         in
         runCommand "nvim-treesitter-test-queries-are-present-for-custom-grammars" { CI = true; } ''
-          function check_grammar {
-            EXPECTED_FILES="$2/parser/$1.so `find -L "$2/queries/$1" -name '*.scm'`"
+          touch "$out"
 
-            echo
-            echo expected files for $1:
-            echo $EXPECTED_FILES
+          function check_grammar {
+            local grammar_name="$1"
+            local grammar_path="$2"
+
+            local grammar_queries=$(find -L "$grammar_path/queries/$grammar_name" -name '*.scm')
+            local EXPECTED_FILES="$grammar_path/parser/$grammar_name.so $grammar_queries"
+
+            echo ""
+            echo "expected files for $grammar_name:"
+            echo "$EXPECTED_FILES"
 
             # the derivation has only symlinks, and `find` doesn't count them as files
-            # so we cannot use `-type f`
-            for file in `find -L $2 -not -type d`; do
-              echo checking $file
+            # so we cannot use `-type f`, thus we use `-not -type d`
+            for file in $(find -L $2 -not -type d); do
+              echo "checking $file"
               # see https://stackoverflow.com/a/8063284
               if ! echo "$EXPECTED_FILES" | grep -wqF "$file"; then
-                echo $file is unexpected, exiting
+                echo "$file is unexpected, exiting"
                 exit 1
               fi
             done
           }
 
           ${lib.concatLines (lib.forEach pluginsToCheck (g: "check_grammar \"${g.grammarName}\" \"${g}\""))}
-          touch $out
         '';
 
       no-queries-for-official-grammars =
@@ -144,13 +149,16 @@ in
           pluginsToCheck = lib.filter lib.isDerivation (lib.attrValues vimPlugins.nvim-treesitter-parsers);
         in
         runCommand "nvim-treesitter-test-no-queries-for-official-grammars" { CI = true; } ''
-          touch $out
+          touch "$out"
 
           function check_grammar {
-            echo checking $1...
-            if [ -d $2/queries ]; then
-              echo Queries dir exists in $1
-              echo This is unexpected, see https://github.com/NixOS/nixpkgs/pull/344849#issuecomment-2381447839
+            local grammar_name="$1"
+            local grammar_path="$2"
+
+            echo "checking $1..."
+            if [ -d "$grammar_path/queries" ]; then
+              echo "Queries directory exists in $grammar_name"
+              echo "This is unexpected, see https://github.com/NixOS/nixpkgs/pull/344849#issuecomment-2381447839"
               exit 1
             fi
           }

From 5445c5dfd24dbb8416c88169a8d77077bd21e737 Mon Sep 17 00:00:00 2001
From: Sergio Ribera <56278796+SergioRibera@users.noreply.github.com>
Date: Wed, 5 Nov 2025 17:50:40 -0400
Subject: [PATCH 5703/6226] vimPlugins.cmp-dotenv: init at 2024-06-05

---
 pkgs/applications/editors/vim/plugins/generated.nix | 13 +++++++++++++
 pkgs/applications/editors/vim/plugins/overrides.nix |  4 ++++
 .../editors/vim/plugins/vim-plugin-names            |  1 +
 3 files changed, 18 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index 6606a112481e..e4f4122c2e2c 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -2467,6 +2467,19 @@ final: prev: {
     meta.hydraPlatforms = [ ];
   };
 
+  cmp-dotenv = buildVimPlugin {
+    pname = "cmp-dotenv";
+    version = "2024-06-05";
+    src = fetchFromGitHub {
+      owner = "SergioRibera";
+      repo = "cmp-dotenv";
+      rev = "4dd53aab60982f1f75848aec5e6214986263325e";
+      sha256 = "0pkkxfwsmp2rn77x8jbsb1j0avjx813n5kp4q6f0v0rfmjxk538i";
+    };
+    meta.homepage = "https://github.com/SergioRibera/cmp-dotenv/";
+    meta.hydraPlatforms = [ ];
+  };
+
   cmp-emoji = buildVimPlugin {
     pname = "cmp-emoji";
     version = "2024-03-19";
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 2691a6020e82..73730fba3c33 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -503,6 +503,10 @@ assertNoAdditions {
     checkInputs = [ self.nvim-cmp ];
   };
 
+  cmp-dotenv = super.cmp-dotenv.overrideAttrs {
+    checkInputs = [ self.nvim-cmp ];
+  };
+
   cmp-fish = super.cmp-fish.overrideAttrs {
     checkInputs = [ self.nvim-cmp ];
   };
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 2ff811b56876..434460ee1101 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -188,6 +188,7 @@ https://github.com/delphinus/cmp-ctags/,HEAD,
 https://github.com/rcarriga/cmp-dap/,HEAD,
 https://github.com/uga-rosa/cmp-dictionary/,HEAD,
 https://github.com/dmitmel/cmp-digraphs/,HEAD,
+https://github.com/SergioRibera/cmp-dotenv/,HEAD,
 https://github.com/hrsh7th/cmp-emoji/,,
 https://github.com/mtoohey31/cmp-fish/,HEAD,
 https://github.com/tzachar/cmp-fuzzy-buffer/,HEAD,

From 885e216aea74df191d5f30e03dff12e03f78aa11 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 21:59:19 +0000
Subject: [PATCH 5704/6226] python3Packages.pystiebeleltron: 0.2.4 -> 0.2.5

---
 pkgs/development/python-modules/pystiebeleltron/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pystiebeleltron/default.nix b/pkgs/development/python-modules/pystiebeleltron/default.nix
index e8f5af98d316..de0c3d509770 100644
--- a/pkgs/development/python-modules/pystiebeleltron/default.nix
+++ b/pkgs/development/python-modules/pystiebeleltron/default.nix
@@ -11,14 +11,14 @@
 
 buildPythonPackage rec {
   pname = "pystiebeleltron";
-  version = "0.2.4";
+  version = "0.2.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "ThyMYthOS";
     repo = "python-stiebel-eltron";
     tag = "v${version}";
-    hash = "sha256-36KEE1GvdXUjF6V3V5d+0hvUb4/cVKNfTI6xyc4/aLM=";
+    hash = "sha256-irZmtsGcbmr5+aniBofDg0fhkP646h3mpRyTdWndOyY=";
   };
 
   build-system = [ hatchling ];

From af8ff991c2fa73642dee8e336ac08e44b06a7ef4 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Wed, 5 Nov 2025 23:03:19 +0100
Subject: [PATCH 5705/6226] teleport_16: 16.5.16 -> 16.5.18; teleport_17:
 17.7.5 -> 17.7.8; teleport_18: 18.2.2 -> 18.3.1

This makes one of the applied patches obsolete for all major versions.

Diffs:
https://github.com/gravitational/teleport/compare/v16.5.16...v16.5.18
https://github.com/gravitational/teleport/compare/v17.7.5...v17.7.8
https://github.com/gravitational/teleport/compare/v18.2.2...v18.3.1
---
 pkgs/build-support/teleport/default.nix |  1 -
 pkgs/build-support/teleport/tsh.patch   | 17 -----------------
 pkgs/by-name/te/teleport_16/package.nix |  6 +++---
 pkgs/by-name/te/teleport_17/package.nix |  8 ++++----
 pkgs/by-name/te/teleport_18/package.nix |  8 ++++----
 5 files changed, 11 insertions(+), 29 deletions(-)
 delete mode 100644 pkgs/build-support/teleport/tsh.patch

diff --git a/pkgs/build-support/teleport/default.nix b/pkgs/build-support/teleport/default.nix
index afe2af40f91a..90800cf62429 100644
--- a/pkgs/build-support/teleport/default.nix
+++ b/pkgs/build-support/teleport/default.nix
@@ -152,7 +152,6 @@ buildGoModule (finalAttrs: {
   patches = extPatches ++ [
     ./0001-fix-add-nix-path-to-exec-env.patch
     ./rdpclient.patch
-    ./tsh.patch
   ];
 
   # Reduce closure size for client machines
diff --git a/pkgs/build-support/teleport/tsh.patch b/pkgs/build-support/teleport/tsh.patch
deleted file mode 100644
index d35c7c99ccaa..000000000000
--- a/pkgs/build-support/teleport/tsh.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/tool/tsh/common/tsh.go b/tool/tsh/common/tsh.go
-index 5de21c69d0..3995c19e3c 100644
---- a/tool/tsh/common/tsh.go
-+++ b/tool/tsh/common/tsh.go
-@@ -1231,10 +1231,11 @@ func Run(ctx context.Context, args []string, opts ...CliOption) error {
- 	}
- 
- 	var err error
--	cf.executablePath, err = os.Executable()
-+	tempBinaryPath, err := os.Executable()
- 	if err != nil {
- 		return trace.Wrap(err)
- 	}
-+	cf.executablePath = filepath.Dir(tempBinaryPath) + "/tsh"
- 
- 	// configs
- 	setEnvFlags(&cf)
diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix
index 93acae7a492d..cfead2c1f55f 100644
--- a/pkgs/by-name/te/teleport_16/package.nix
+++ b/pkgs/by-name/te/teleport_16/package.nix
@@ -6,10 +6,10 @@
   extPatches ? [ ],
 }:
 buildTeleport {
-  version = "16.5.16";
-  hash = "sha256-b1jUr36KNgiZnA3QBo2blKxjK3Sy6S6Lrc/bzWsX20Q=";
+  version = "16.5.18";
+  hash = "sha256-Dikw4y62V7S62K+8EqltXM4RRYPgE2Ad/kZrSS2TEDo=";
   vendorHash = "sha256-mcDybNt7Mr0HJW272Ulj1oWlfsH2kEp7rNyeonoIjf8=";
-  pnpmHash = "sha256-+vZXacdGkLvjYN1s0Z+/JiVjxiaOGJ3326PvWtFaFaI=";
+  pnpmHash = "sha256-V0R/i+oENGxlmq2Q6iwnikgBFVMWXph9WMStp3HTW34=";
   cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix
index e07c972201b1..7e24679a93a9 100644
--- a/pkgs/by-name/te/teleport_17/package.nix
+++ b/pkgs/by-name/te/teleport_17/package.nix
@@ -7,11 +7,11 @@
 }:
 
 buildTeleport {
-  version = "17.7.5";
-  hash = "sha256-9Qtp/lTbG7xLk9mzHwwMAQkt08oPRM1FP+NLSXEr8Mo=";
-  vendorHash = "sha256-4n1N9yiC2ILd8X8ntSPd2JhqRHROKoYK/S0GphVo+bI=";
+  version = "17.7.8";
+  hash = "sha256-z520UT17nFLBwyVLjdfx9aTbkMv1fljsN88G6WRPvZE=";
+  vendorHash = "sha256-mtOCLAcVIxaEhGzdsVWxnKQ4FRTXZ5vVAF+NVMdFItk=";
   cargoHash = "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=";
-  pnpmHash = "sha256-ovtcJWeRFQUfzbanGXzOcZk/0KwKiZYrr3VmqMt+nfE=";
+  pnpmHash = "sha256-4xLbPQwmI0nAUNAgDHwkx1uSbjHPe8LNmEFQfoaj6bY=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
   inherit buildGoModule withRdpClient extPatches;
diff --git a/pkgs/by-name/te/teleport_18/package.nix b/pkgs/by-name/te/teleport_18/package.nix
index 54c759872c26..075b5ec0c782 100644
--- a/pkgs/by-name/te/teleport_18/package.nix
+++ b/pkgs/by-name/te/teleport_18/package.nix
@@ -7,10 +7,10 @@
 }:
 
 buildTeleport {
-  version = "18.2.2";
-  hash = "sha256-q7HE3FXX3uxTP+sesMbPH6FbfhI7VsoXgrKKxPtfEtQ=";
-  vendorHash = "sha256-w8RhvTKNhHKkwvsi6S3m0S9ZSxEO9bw/qhTHlB80lHc=";
-  pnpmHash = "sha256-cpkV+B50JdhcXdI/K7cqJI6TsvGOCRxkFTJcA4wE5iQ=";
+  version = "18.3.1";
+  hash = "sha256-HM0pu+3O7zoClH15YC0naxxmKJC9ngamnvraTosRqG0=";
+  vendorHash = "sha256-HyS0KKW7lyn3NzedxM4+UxFV9OnxgtFDMW5jkj3ir/8=";
+  pnpmHash = "sha256-/G6WYC3YGk8ma4hAI6sZhQ6KAh+u4CxQ7891fYj5bJg=";
   cargoHash = "sha256-ia4We4IfIkqz82aFMVvXdzjDXw0w+OJSPVdutfau6PA=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_99;

From e2e50e6f28a7afbbd1a9c808a55df86803a1e823 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 22:06:37 +0000
Subject: [PATCH 5706/6226] firefly-iii-data-importer: 1.9.0 -> 1.9.1

---
 pkgs/by-name/fi/firefly-iii-data-importer/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
index f11f9d768b89..8ad2f83af519 100644
--- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
+++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix
@@ -13,13 +13,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "firefly-iii-data-importer";
-  version = "1.9.0";
+  version = "1.9.1";
 
   src = fetchFromGitHub {
     owner = "firefly-iii";
     repo = "data-importer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-07i/78dF6yynSGAHc91899hLD1MKacBUJ5d455hn9mE=";
+    hash = "sha256-AjpzJfer1v7+FLIGEcBJrMxUlda5MwV2ThJuV5MNIxQ=";
   };
 
   buildInputs = [ php84 ];
@@ -38,12 +38,12 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   composerStrictValidation = true;
   strictDeps = true;
 
-  vendorHash = "sha256-i4DZ62J5v/tskoaQ1GaE7b1VJcFOFIJW8xC8R4h4tHk=";
+  vendorHash = "sha256-7nhoRnKcOnnBt0YxaMEXYHPqDjaCltDnSiCnMDCEq5M=";
 
   npmDeps = fetchNpmDeps {
     inherit (finalAttrs) src;
     name = "${finalAttrs.pname}-npm-deps";
-    hash = "sha256-KRMdcY9pkyXOPCwcNXOK1FJYWIcvDE6DRVX/aG8KzCs=";
+    hash = "sha256-as11uXE3qBGz7HIkTEeFLznwevcS+yChETo4ElyRVl8=";
   };
 
   composerRepository = php84.mkComposerRepository {

From 85ca7f0e532b88266e48696131d393cd88525631 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 4 Nov 2025 09:40:18 +0000
Subject: [PATCH 5707/6226] python3Packages.hive-metastore-client: init at
 1.0.9

---
 .../hive-metastore-client/default.nix         | 52 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 54 insertions(+)
 create mode 100644 pkgs/development/python-modules/hive-metastore-client/default.nix

diff --git a/pkgs/development/python-modules/hive-metastore-client/default.nix b/pkgs/development/python-modules/hive-metastore-client/default.nix
new file mode 100644
index 000000000000..14f89f05ef4a
--- /dev/null
+++ b/pkgs/development/python-modules/hive-metastore-client/default.nix
@@ -0,0 +1,52 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
+  thrift,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "hive-metastore-client";
+  version = "1.0.9";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "quintoandar";
+    repo = "hive-metastore-client";
+    tag = version;
+    hash = "sha256-IejsiC1eDNa6fjpQPhLNkMvZpyr9QsQdGBfhev1jEyg=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  pythonRelaxDeps = [
+    "thrift"
+  ];
+  dependencies = [
+    thrift
+  ];
+
+  pythonImportsCheck = [ "hive_metastore_client" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Client for connecting and running DDLs on hive metastore";
+    homepage = "https://github.com/quintoandar/hive-metastore-client";
+    changelog = "https://github.com/quintoandar/hive-metastore-client/blob/${src.tag}/CHANGELOG.md";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f22805eed7cc..5d607940e2e2 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6710,6 +6710,8 @@ self: super: with self; {
 
   histoprint = callPackage ../development/python-modules/histoprint { };
 
+  hive-metastore-client = callPackage ../development/python-modules/hive-metastore-client { };
+
   hiyapyco = callPackage ../development/python-modules/hiyapyco { };
 
   hjson = callPackage ../development/python-modules/hjson { };

From 25961a9e31c8ef7337773b7bde6eaf97e55ea6ae Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 4 Nov 2025 09:40:53 +0000
Subject: [PATCH 5708/6226] python3Packages.lance-namespace-urllib3-client:
 init at 0.0.20

---
 .../default.nix                               | 56 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  4 ++
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix

diff --git a/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix
new file mode 100644
index 000000000000..112793ef4722
--- /dev/null
+++ b/pkgs/development/python-modules/lance-namespace-urllib3-client/default.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  pydantic,
+  python-dateutil,
+  typing-extensions,
+  urllib3,
+
+  # tests
+  pytestCheckHook,
+}:
+
+buildPythonPackage rec {
+  pname = "lance-namespace";
+  version = "0.0.20";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "lancedb";
+    repo = "lance-namespace";
+    tag = "v${version}";
+    hash = "sha256-dacYNbWXlV6+/klb9/rgbG/2YJ5BAw5xeSZbPvDgRb4=";
+  };
+
+  sourceRoot = "${src.name}/python/lance_namespace_urllib3_client";
+
+  build-system = [
+    hatchling
+  ];
+
+  dependencies = [
+    pydantic
+    python-dateutil
+    typing-extensions
+    urllib3
+  ];
+
+  pythonImportsCheck = [ "lance_namespace_urllib3_client" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  meta = {
+    description = "Lance namespace OpenAPI specification";
+    homepage = "https://github.com/lancedb/lance-namespace/tree/main/python/lance_namespace_urllib3_client";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5d607940e2e2..a0909cc2a4fc 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8000,6 +8000,10 @@ self: super: with self; {
 
   lammps = callPackage ../development/python-modules/lammps { inherit (pkgs) lammps; };
 
+  lance-namespace-urllib3-client =
+    callPackage ../development/python-modules/lance-namespace-urllib3-client
+      { };
+
   lancedb = callPackage ../development/python-modules/lancedb { inherit (pkgs) protobuf; };
 
   langchain = callPackage ../development/python-modules/langchain { };

From 5f020222a0ef3d5361811715da14609aacc2b341 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 4 Nov 2025 10:19:42 +0000
Subject: [PATCH 5709/6226] python3Packages.opendal: init at 0.46.0

---
 .../python-modules/opendal/Cargo.lock         | 6324 +++++++++++++++++
 .../python-modules/opendal/default.nix        |   57 +
 pkgs/top-level/python-packages.nix            |    2 +
 3 files changed, 6383 insertions(+)
 create mode 100644 pkgs/development/python-modules/opendal/Cargo.lock
 create mode 100644 pkgs/development/python-modules/opendal/default.nix

diff --git a/pkgs/development/python-modules/opendal/Cargo.lock b/pkgs/development/python-modules/opendal/Cargo.lock
new file mode 100644
index 000000000000..afbc051f6e56
--- /dev/null
+++ b/pkgs/development/python-modules/opendal/Cargo.lock
@@ -0,0 +1,6324 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 3
+
+[[package]]
+name = "adler2"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
+
+[[package]]
+name = "aes"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
+dependencies = [
+ "cfg-if",
+ "cipher",
+ "cpufeatures",
+]
+
+[[package]]
+name = "ahash"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
+dependencies = [
+ "getrandom 0.2.16",
+ "once_cell",
+ "version_check",
+]
+
+[[package]]
+name = "ahash"
+version = "0.8.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75"
+dependencies = [
+ "cfg-if",
+ "getrandom 0.3.4",
+ "once_cell",
+ "version_check",
+ "zerocopy",
+]
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "allocator-api2"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
+
+[[package]]
+name = "android_system_properties"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "anyhow"
+version = "1.0.100"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a23eb6b1614318a8071c9b2521f36b424b2c83db5eb3a0fead4a6c0809af6e61"
+
+[[package]]
+name = "arc-swap"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69f7f8c3906b62b754cd5326047894316021dcfe5a194c8ea52bdd94934a3457"
+
+[[package]]
+name = "arrayvec"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
+
+[[package]]
+name = "async-channel"
+version = "1.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35"
+dependencies = [
+ "concurrent-queue",
+ "event-listener 2.5.3",
+ "futures-core",
+]
+
+[[package]]
+name = "async-channel"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "924ed96dd52d1b75e9c1a3e6275715fd320f5f9439fb5a4a11fa51f4221158d2"
+dependencies = [
+ "concurrent-queue",
+ "event-listener-strategy",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-executor"
+version = "1.13.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8"
+dependencies = [
+ "async-task",
+ "concurrent-queue",
+ "fastrand",
+ "futures-lite",
+ "pin-project-lite",
+ "slab",
+]
+
+[[package]]
+name = "async-global-executor"
+version = "2.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05b1b633a2115cd122d73b955eadd9916c18c8f510ec9cd1686404c60ad1c29c"
+dependencies = [
+ "async-channel 2.5.0",
+ "async-executor",
+ "async-io",
+ "async-lock",
+ "blocking",
+ "futures-lite",
+ "once_cell",
+]
+
+[[package]]
+name = "async-io"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "456b8a8feb6f42d237746d4b3e9a178494627745c3c56c6ea55d92ba50d026fc"
+dependencies = [
+ "autocfg",
+ "cfg-if",
+ "concurrent-queue",
+ "futures-io",
+ "futures-lite",
+ "parking",
+ "polling",
+ "rustix 1.1.2",
+ "slab",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "async-lock"
+version = "3.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fd03604047cee9b6ce9de9f70c6cd540a0520c813cbd49bae61f33ab80ed1dc"
+dependencies = [
+ "event-listener 5.4.1",
+ "event-listener-strategy",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-recursion"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "async-recursion"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "async-std"
+version = "1.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c8e079a4ab67ae52b7403632e4618815d6db36d2a010cfe41b02c1b1578f93b"
+dependencies = [
+ "async-channel 1.9.0",
+ "async-global-executor",
+ "async-io",
+ "async-lock",
+ "crossbeam-utils",
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-lite",
+ "gloo-timers",
+ "kv-log-macro",
+ "log",
+ "memchr",
+ "once_cell",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+ "wasm-bindgen-futures",
+]
+
+[[package]]
+name = "async-stream"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "async-task"
+version = "4.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
+
+[[package]]
+name = "async-tls"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2ae3c9eba89d472a0e4fe1dea433df78fbbe63d2b764addaf2ba3a6bde89a5e"
+dependencies = [
+ "futures-core",
+ "futures-io",
+ "rustls 0.21.12",
+ "rustls-pemfile",
+ "webpki-roots 0.22.6",
+]
+
+[[package]]
+name = "async-trait"
+version = "0.1.89"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9035ad2d096bed7955a320ee7e2230574d28fd3c3a0f186cbea1ff3c7eed5dbb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
+[[package]]
+name = "autocfg"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
+
+[[package]]
+name = "awaitable"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70af449c9a763cb655c6a1e5338b42d99c67190824ff90658c1e30be844c0775"
+dependencies = [
+ "awaitable-error",
+ "cfg-if",
+]
+
+[[package]]
+name = "awaitable-error"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5b3469636cdf8543cceab175efca534471f36eee12fb8374aba00eb5e7e7f8a"
+
+[[package]]
+name = "axum"
+version = "0.6.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b829e4e32b91e643de6eafe82b1d90675f5874230191a4ffbc1b336dec4d6bf"
+dependencies = [
+ "async-trait",
+ "axum-core",
+ "bitflags 1.3.2",
+ "bytes",
+ "futures-util",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.32",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustversion",
+ "serde",
+ "sync_wrapper 0.1.2",
+ "tower 0.4.13",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "759fa577a247914fd3f7f76d62972792636412fbfd634cd452f6a385a74d2d2c"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "futures-util",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "mime",
+ "rustversion",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "backon"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d67782c3f868daa71d3533538e98a8e13713231969def7536e8039606fc46bf0"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "pin-project",
+ "tokio",
+]
+
+[[package]]
+name = "base64"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
+
+[[package]]
+name = "base64"
+version = "0.21.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
+[[package]]
+name = "base64ct"
+version = "1.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55248b47b0caf0546f7988906588779981c43bb1bc9d0c44087278f80cdb44ba"
+
+[[package]]
+name = "bb8"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d89aabfae550a5c44b43ab941844ffcd2e993cb6900b342debf59e9ea74acdb8"
+dependencies = [
+ "async-trait",
+ "futures-util",
+ "parking_lot 0.12.5",
+ "tokio",
+]
+
+[[package]]
+name = "bb8-postgres"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56ac82c42eb30889b5c4ee4763a24b8c566518171ebea648cd7e3bc532c60680"
+dependencies = [
+ "async-trait",
+ "bb8",
+ "tokio",
+ "tokio-postgres",
+]
+
+[[package]]
+name = "bigdecimal"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a6773ddc0eafc0e509fb60e48dff7f450f8e674a0686ae8605e8d9901bd5eefa"
+dependencies = [
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "bindgen"
+version = "0.65.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5"
+dependencies = [
+ "bitflags 1.3.2",
+ "cexpr",
+ "clang-sys",
+ "lazy_static",
+ "lazycell",
+ "log",
+ "peeking_take_while",
+ "prettyplease",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash 1.1.0",
+ "shlex",
+ "syn 2.0.108",
+ "which",
+]
+
+[[package]]
+name = "bindgen"
+version = "0.72.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "993776b509cfb49c750f11b8f07a46fa23e0a1386ffc01fb1e7d343efc387895"
+dependencies = [
+ "bitflags 2.10.0",
+ "cexpr",
+ "clang-sys",
+ "itertools 0.13.0",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "rustc-hash 2.1.1",
+ "shlex",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "bitflags"
+version = "1.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+
+[[package]]
+name = "bitflags"
+version = "2.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
+
+[[package]]
+name = "bitvec"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
+dependencies = [
+ "funty",
+ "radium",
+ "tap",
+ "wyz",
+]
+
+[[package]]
+name = "block-buffer"
+version = "0.10.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "block-padding"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8894febbff9f758034a5b8e12d87918f56dfc64a8e1fe757d65e29041538d93"
+dependencies = [
+ "generic-array",
+]
+
+[[package]]
+name = "blocking"
+version = "1.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e83f8d02be6967315521be875afa792a316e28d57b5a2d401897e2a7921b7f21"
+dependencies = [
+ "async-channel 2.5.0",
+ "async-task",
+ "futures-io",
+ "futures-lite",
+ "piper",
+]
+
+[[package]]
+name = "borsh"
+version = "1.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad8646f98db542e39fc66e68a20b2144f6a732636df7c2354e74645faaa433ce"
+dependencies = [
+ "borsh-derive",
+ "cfg_aliases",
+]
+
+[[package]]
+name = "borsh-derive"
+version = "1.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdd1d3c0c2f5833f22386f252fe8ed005c7f59fdcddeef025c01b4c3b9fd9ac3"
+dependencies = [
+ "once_cell",
+ "proc-macro-crate 3.4.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "bson"
+version = "2.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969a9ba84b0ff843813e7249eed1678d9b6607ce5a3b8f0a47af3fcf7978e6e"
+dependencies = [
+ "ahash 0.8.12",
+ "base64 0.22.1",
+ "bitvec",
+ "getrandom 0.2.16",
+ "getrandom 0.3.4",
+ "hex",
+ "indexmap 2.12.0",
+ "js-sys",
+ "once_cell",
+ "rand 0.9.2",
+ "serde",
+ "serde_bytes",
+ "serde_json",
+ "time",
+ "uuid",
+]
+
+[[package]]
+name = "bumpalo"
+version = "3.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
+
+[[package]]
+name = "bytecheck"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23cdc57ce23ac53c931e88a43d06d070a6fd142f2617be5855eb75efc9beb1c2"
+dependencies = [
+ "bytecheck_derive",
+ "ptr_meta",
+ "simdutf8",
+]
+
+[[package]]
+name = "bytecheck_derive"
+version = "0.6.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3db406d29fbcd95542e92559bed4d8ad92636d1ca8b3b72ede10b4bcc010e659"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "bytecount"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "175812e0be2bccb6abe50bb8d566126198344f707e304f45c648fd8f2cc0365e"
+
+[[package]]
+name = "byteorder"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
+
+[[package]]
+name = "bytes"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+
+[[package]]
+name = "bzip2-sys"
+version = "0.1.13+1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "225bff33b2141874fe80d71e07d6eec4f85c5c216453dd96388240f96e1acc14"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
+
+[[package]]
+name = "cacache"
+version = "13.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c5063741c7b2e260bbede781cf4679632dd90e2718e99f7715e46824b65670b"
+dependencies = [
+ "digest",
+ "either",
+ "futures",
+ "hex",
+ "libc",
+ "memmap2",
+ "miette",
+ "reflink-copy",
+ "serde",
+ "serde_derive",
+ "serde_json",
+ "sha1",
+ "sha2",
+ "ssri",
+ "tempfile",
+ "thiserror 1.0.69",
+ "tokio",
+ "tokio-stream",
+ "walkdir",
+]
+
+[[package]]
+name = "camino"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "276a59bf2b2c967788139340c9f0c5b12d7fd6630315c15c217e559de85d2609"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "cargo-platform"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e35af189006b9c0f00a064685c727031e3ed2d8020f7ba284d78cc2671bd36ea"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "cargo_metadata"
+version = "0.14.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4acbb09d9ee8e23699b9634375c72795d095bf268439da88562cf9b501f181fa"
+dependencies = [
+ "camino",
+ "cargo-platform",
+ "semver 1.0.27",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "cbc"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26b52a9543ae338f279b96b0b9fed9c8093744685043739079ce85cd58f289a6"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "cc"
+version = "1.2.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3"
+dependencies = [
+ "find-msvc-tools",
+ "jobserver",
+ "libc",
+ "shlex",
+]
+
+[[package]]
+name = "cexpr"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
+dependencies = [
+ "nom",
+]
+
+[[package]]
+name = "cfg-if"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
+
+[[package]]
+name = "cfg_aliases"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
+
+[[package]]
+name = "chrono"
+version = "0.4.42"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
+dependencies = [
+ "iana-time-zone",
+ "js-sys",
+ "num-traits",
+ "wasm-bindgen",
+ "windows-link",
+]
+
+[[package]]
+name = "cipher"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773f3b9af64447d2ce9850330c473515014aa235e6a783b02db81ff39e4a3dad"
+dependencies = [
+ "crypto-common",
+ "inout",
+]
+
+[[package]]
+name = "clang-sys"
+version = "1.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
+dependencies = [
+ "glob",
+ "libc",
+ "libloading",
+]
+
+[[package]]
+name = "cmake"
+version = "0.1.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "combine"
+version = "4.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "memchr",
+ "pin-project-lite",
+ "tokio",
+ "tokio-util",
+]
+
+[[package]]
+name = "concurrent-queue"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "concurrent_arena"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a07f0a549fe58f8477a15f0f1c3aa8ced03a3cdeaa38a661530572f21ea963a0"
+dependencies = [
+ "arc-swap",
+ "parking_lot 0.12.5",
+ "triomphe",
+]
+
+[[package]]
+name = "const-oid"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8"
+
+[[package]]
+name = "const-random"
+version = "0.1.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359"
+dependencies = [
+ "const-random-macro",
+]
+
+[[package]]
+name = "const-random-macro"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
+dependencies = [
+ "getrandom 0.2.16",
+ "once_cell",
+ "tiny-keccak",
+]
+
+[[package]]
+name = "convert_case"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
+
+[[package]]
+name = "core-foundation"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "core-foundation-sys"
+version = "0.8.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
+
+[[package]]
+name = "cpufeatures"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "crc"
+version = "3.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9710d3b3739c2e349eb44fe848ad0b7c8cb1e42bd87ee49371df2f7acaf3e675"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
+
+[[package]]
+name = "crc16"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "338089f42c427b86394a5ee60ff321da23a5c89c9d89514c829687b26359fcff"
+
+[[package]]
+name = "crc32c"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a47af21622d091a8f0fb295b88bc886ac74efcc613efc19f5d0b21de5c89e47"
+dependencies = [
+ "rustc_version 0.4.1",
+]
+
+[[package]]
+name = "crc32fast"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "crossbeam"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-deque",
+ "crossbeam-epoch",
+ "crossbeam-queue",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-channel"
+version = "0.5.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-deque"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9dd111b7b7f7d55b72c0a6ae361660ee5853c9af73f70c3c2ef6858b950e2e51"
+dependencies = [
+ "crossbeam-epoch",
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-epoch"
+version = "0.9.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-queue"
+version = "0.3.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0f58bbc28f91df819d0aa2a2c00cd19754769c2fad90579b3592b1c9ba7a3115"
+dependencies = [
+ "crossbeam-utils",
+]
+
+[[package]]
+name = "crossbeam-utils"
+version = "0.8.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
+
+[[package]]
+name = "crunchy"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5"
+
+[[package]]
+name = "crypto-common"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3"
+dependencies = [
+ "generic-array",
+ "typenum",
+]
+
+[[package]]
+name = "darling"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a01d95850c592940db9b8194bc39f4bc0e89dee5c4265e4b1807c34a9aba453c"
+dependencies = [
+ "darling_core 0.13.4",
+ "darling_macro 0.13.4",
+]
+
+[[package]]
+name = "darling"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
+dependencies = [
+ "darling_core 0.20.11",
+ "darling_macro 0.20.11",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "859d65a907b6852c9361e3185c862aae7fafd2887876799fa55f5f99dc40d610"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim 0.10.0",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "darling_core"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e"
+dependencies = [
+ "fnv",
+ "ident_case",
+ "proc-macro2",
+ "quote",
+ "strsim 0.11.1",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c972679f83bdf9c42bd905396b6c3588a843a17f0f16dfcfa3e2c5d57441835"
+dependencies = [
+ "darling_core 0.13.4",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "darling_macro"
+version = "0.20.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
+dependencies = [
+ "darling_core 0.20.11",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "dashmap"
+version = "5.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
+dependencies = [
+ "cfg-if",
+ "hashbrown 0.14.5",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core 0.9.12",
+]
+
+[[package]]
+name = "data-encoding"
+version = "2.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476"
+
+[[package]]
+name = "der"
+version = "0.7.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7c1832837b905bbfb5101e07cc24c8deddf52f93225eee6ead5f4d63d53ddcb"
+dependencies = [
+ "const-oid",
+ "pem-rfc7468",
+ "zeroize",
+]
+
+[[package]]
+name = "deranged"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ececcb659e7ba858fb4f10388c250a7252eb0a27373f1a72b8748afdd248e587"
+dependencies = [
+ "powerfmt",
+]
+
+[[package]]
+name = "derivative"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "derive-new"
+version = "0.5.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "derive_destructure2"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "64b697ac90ff296f0fc031ee5a61c7ac31fb9fff50e3fb32873b09223613fc0c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "derive_more"
+version = "0.99.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6edb4b64a43d977b8e99788fe3a04d483834fba1215a7e02caa415b626497f7f"
+dependencies = [
+ "convert_case",
+ "proc-macro2",
+ "quote",
+ "rustc_version 0.4.1",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "digest"
+version = "0.10.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
+dependencies = [
+ "block-buffer",
+ "const-oid",
+ "crypto-common",
+ "subtle",
+]
+
+[[package]]
+name = "displaydoc"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "dlv-list"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f"
+dependencies = [
+ "const-random",
+]
+
+[[package]]
+name = "either"
+version = "1.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
+
+[[package]]
+name = "enum-as-inner"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21cdad81446a7f7dc43f6a77409efeb9733d2fa65553efef6018ef257c959b73"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "equivalent"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
+
+[[package]]
+name = "errno"
+version = "0.3.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb"
+dependencies = [
+ "libc",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "error-chain"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc"
+dependencies = [
+ "version_check",
+]
+
+[[package]]
+name = "etcd-client"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ae697f3928e8c89ae6f4dcf788059f49fd01a76dc53e63628f5a33881f5715e"
+dependencies = [
+ "http 0.2.12",
+ "prost 0.12.6",
+ "tokio",
+ "tokio-stream",
+ "tonic",
+ "tonic-build",
+ "tower 0.4.13",
+ "tower-service",
+]
+
+[[package]]
+name = "event-listener"
+version = "2.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
+
+[[package]]
+name = "event-listener"
+version = "5.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e13b66accf52311f30a0db42147dadea9850cb48cd070028831ae5f5d4b856ab"
+dependencies = [
+ "concurrent-queue",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "event-listener-strategy"
+version = "0.5.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8be9f3dfaaffdae2972880079a491a1a8bb7cbed0b8dd7a347f668b4150a3b93"
+dependencies = [
+ "event-listener 5.4.1",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "fail"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3be3c61c59fdc91f5dbc3ea31ee8623122ce80057058be560654c5d410d181a6"
+dependencies = [
+ "lazy_static",
+ "log",
+ "rand 0.7.3",
+]
+
+[[package]]
+name = "fallible-iterator"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
+
+[[package]]
+name = "fallible-streaming-iterator"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7360491ce676a36bf9bb3c56c1aa791658183a54d2744120f27285738d90465a"
+
+[[package]]
+name = "fastrand"
+version = "2.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+
+[[package]]
+name = "fixedbitset"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
+
+[[package]]
+name = "flagset"
+version = "0.4.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b7ac824320a75a52197e8f2d787f6a38b6718bb6897a35142d749af3c0e8f4fe"
+
+[[package]]
+name = "flate2"
+version = "1.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfe33edd8e85a12a67454e37f8c75e730830d83e313556ab9ebf9ee7fbeb3bfb"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
+[[package]]
+name = "fnv"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "form_urlencoded"
+version = "1.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
+dependencies = [
+ "percent-encoding",
+]
+
+[[package]]
+name = "foundationdb"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8696fd1be198f101eb58aeecf0f504fc02b28c7afcc008b4e4a998a91b305108"
+dependencies = [
+ "async-recursion 1.1.1",
+ "async-trait",
+ "foundationdb-gen",
+ "foundationdb-macros",
+ "foundationdb-sys",
+ "futures",
+ "memchr",
+ "rand 0.8.5",
+ "serde",
+ "serde_bytes",
+ "serde_json",
+ "static_assertions",
+ "uuid",
+]
+
+[[package]]
+name = "foundationdb-gen"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62239700f01b041b6372aaeb847c52f960e1a69fd2b1025dc995ea3dd90e3308"
+dependencies = [
+ "xml-rs",
+]
+
+[[package]]
+name = "foundationdb-macros"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83c8d52fe8b46ab822b4decdcc0d6d85aeedfc98f0d52ba2bd4aec4a97807516"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+ "try_map",
+]
+
+[[package]]
+name = "foundationdb-sys"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "98e49545f5393d276b7b888c77e3f9519fd33727435f8244344be72c3284256f"
+dependencies = [
+ "bindgen 0.65.1",
+]
+
+[[package]]
+name = "frunk"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28aef0f9aa070bce60767c12ba9cb41efeaf1a2bc6427f87b7d83f11239a16d7"
+dependencies = [
+ "frunk_core",
+ "frunk_derives",
+ "frunk_proc_macros",
+ "serde",
+]
+
+[[package]]
+name = "frunk_core"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "476eeaa382e3462b84da5d6ba3da97b5786823c2d0d3a0d04ef088d073da225c"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "frunk_derives"
+version = "0.4.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0b4095fc99e1d858e5b8c7125d2638372ec85aa0fe6c807105cf10b0265ca6c"
+dependencies = [
+ "frunk_proc_macro_helpers",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "frunk_proc_macro_helpers"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1952b802269f2db12ab7c0bd328d0ae8feaabf19f352a7b0af7bb0c5693abfce"
+dependencies = [
+ "frunk_core",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "frunk_proc_macros"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3462f590fa236005bd7ca4847f81438bd6fe0febd4d04e11968d4c2e96437e78"
+dependencies = [
+ "frunk_core",
+ "frunk_proc_macro_helpers",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "fs2"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9564fc758e15025b46aa6643b1b77d047d1a56a1aea6e01002ac0c7026876213"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "funty"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
+
+[[package]]
+name = "futures"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-lite"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f78e10609fe0e0b3f4157ffab1876319b5b0db102a2c60dc4626306dc46b44ad"
+dependencies = [
+ "fastrand",
+ "futures-core",
+ "futures-io",
+ "parking",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
+[[package]]
+name = "fxhash"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
+dependencies = [
+ "byteorder",
+]
+
+[[package]]
+name = "generic-array"
+version = "0.14.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4bb6743198531e02858aeaea5398fcc883e71851fcbcb5a2f773e2fb6cb1edf2"
+dependencies = [
+ "typenum",
+ "version_check",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.1.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "wasi 0.9.0+wasi-snapshot-preview1",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "335ff9f135e4384c8150d6f27c6daed433577f86b4750418338c01a1a2528592"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "getrandom"
+version = "0.3.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "libc",
+ "r-efi",
+ "wasip2",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "glob"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0cc23270f6e1808e30a928bdc84dea0b9b4136a8bc82338574f23baf47bbd280"
+
+[[package]]
+name = "gloo-timers"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb143cf96099802033e0d4f4963b19fd2e0b728bcf076cd9cf7f6634f092994"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "h2"
+version = "0.3.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0beca50380b1fc32983fc1cb4587bfa4bb9e78fc259aad4a0032d2080309222d"
+dependencies = [
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "http 0.2.12",
+ "indexmap 2.12.0",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+dependencies = [
+ "ahash 0.7.8",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e"
+dependencies = [
+ "ahash 0.8.12",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.14.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
+dependencies = [
+ "ahash 0.8.12",
+ "allocator-api2",
+]
+
+[[package]]
+name = "hashbrown"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
+
+[[package]]
+name = "hashlink"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
+dependencies = [
+ "hashbrown 0.14.5",
+]
+
+[[package]]
+name = "hdfs-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33e2d5cefba2d51a26b44d2a493f963a32725a0f6593c91be4a610ad449c49cb"
+dependencies = [
+ "cc",
+ "java-locator",
+]
+
+[[package]]
+name = "hdrs"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f7c42a693bfe5dc8fcad1f24044c5ec355c5f157b8ce63c7d62f51cecbc7878d"
+dependencies = [
+ "blocking",
+ "errno",
+ "futures",
+ "hdfs-sys",
+ "libc",
+ "log",
+]
+
+[[package]]
+name = "heck"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
+
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
+[[package]]
+name = "hermit-abi"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c"
+
+[[package]]
+name = "hex"
+version = "0.4.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+
+[[package]]
+name = "hmac"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "home"
+version = "0.5.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "hrana-client-proto"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f16b4e41e289da3fd60e64f245246a97e78fab7b3788c6d8147b3ae7d9f5e533"
+dependencies = [
+ "anyhow",
+ "base64 0.21.7",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "http"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+dependencies = [
+ "bytes",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+dependencies = [
+ "bytes",
+ "http 0.2.12",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+dependencies = [
+ "bytes",
+ "http 1.3.1",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "httparse"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+
+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
+[[package]]
+name = "hyper"
+version = "0.14.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41dfc780fdec9373c01bae43289ea34c972e40ee3c9f6b3c8801a35f35586ce7"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "h2",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "httparse",
+ "httpdate",
+ "itoa",
+ "pin-project-lite",
+ "socket2 0.5.10",
+ "tokio",
+ "tower-service",
+ "tracing",
+ "want",
+]
+
+[[package]]
+name = "hyper"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "httparse",
+ "itoa",
+ "pin-project-lite",
+ "pin-utils",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
+[[package]]
+name = "hyper-rustls"
+version = "0.27.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
+dependencies = [
+ "http 1.3.1",
+ "hyper 1.7.0",
+ "hyper-util",
+ "rustls 0.23.34",
+ "rustls-pki-types",
+ "tokio",
+ "tokio-rustls 0.26.4",
+ "tower-service",
+ "webpki-roots 1.0.4",
+]
+
+[[package]]
+name = "hyper-timeout"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbb958482e8c7be4bc3cf272a766a2b0bf1a6755e7a6ae777f017a31d11b13b1"
+dependencies = [
+ "hyper 0.14.32",
+ "pin-project-lite",
+ "tokio",
+ "tokio-io-timeout",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "futures-channel",
+ "futures-core",
+ "futures-util",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "hyper 1.7.0",
+ "ipnet",
+ "libc",
+ "percent-encoding",
+ "pin-project-lite",
+ "socket2 0.6.1",
+ "tokio",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "iana-time-zone"
+version = "0.1.64"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
+dependencies = [
+ "android_system_properties",
+ "core-foundation-sys",
+ "iana-time-zone-haiku",
+ "js-sys",
+ "log",
+ "wasm-bindgen",
+ "windows-core",
+]
+
+[[package]]
+name = "iana-time-zone-haiku"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "icu_collections"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
+dependencies = [
+ "displaydoc",
+ "potential_utf",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locale_core"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
+dependencies = [
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
+
+[[package]]
+name = "icu_properties"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99"
+dependencies = [
+ "icu_collections",
+ "icu_locale_core",
+ "icu_properties_data",
+ "icu_provider",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899"
+
+[[package]]
+name = "icu_provider"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
+dependencies = [
+ "displaydoc",
+ "icu_locale_core",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerotrie",
+ "zerovec",
+]
+
+[[package]]
+name = "ident_case"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
+
+[[package]]
+name = "idna"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
+dependencies = [
+ "matches",
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
+[[package]]
+name = "idna"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
+dependencies = [
+ "idna_adapter",
+ "smallvec",
+ "utf8_iter",
+]
+
+[[package]]
+name = "idna_adapter"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3acae9609540aa318d1bc588455225fb2085b9ed0c4f6bd0d9d5bcd86f1a0344"
+dependencies = [
+ "icu_normalizer",
+ "icu_properties",
+]
+
+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+]
+
+[[package]]
+name = "indexmap"
+version = "2.12.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
+dependencies = [
+ "equivalent",
+ "hashbrown 0.16.0",
+]
+
+[[package]]
+name = "indoc"
+version = "2.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
+dependencies = [
+ "rustversion",
+]
+
+[[package]]
+name = "inout"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "879f10e63c20629ecabbb64a8010319738c66a5cd0c29b02d63d272b03751d01"
+dependencies = [
+ "block-padding",
+ "generic-array",
+]
+
+[[package]]
+name = "instant"
+version = "0.1.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
+dependencies = [
+ "cfg-if",
+]
+
+[[package]]
+name = "ipconfig"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
+dependencies = [
+ "socket2 0.5.10",
+ "widestring",
+ "windows-sys 0.48.0",
+ "winreg",
+]
+
+[[package]]
+name = "ipnet"
+version = "2.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
+
+[[package]]
+name = "iri-string"
+version = "0.7.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
+[[package]]
+name = "itertools"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
+[[package]]
+name = "itoa"
+version = "1.0.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
+
+[[package]]
+name = "java-locator"
+version = "0.1.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09c46c1fe465c59b1474e665e85e1256c3893dd00927b8d55f63b09044c1e64f"
+dependencies = [
+ "glob",
+]
+
+[[package]]
+name = "jobserver"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
+dependencies = [
+ "getrandom 0.3.4",
+ "libc",
+]
+
+[[package]]
+name = "js-sys"
+version = "0.3.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
+dependencies = [
+ "once_cell",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "jsonwebtoken"
+version = "9.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a87cc7a48537badeae96744432de36f4be2b4a34a05a5ef32e9dd8a1c169dde"
+dependencies = [
+ "base64 0.22.1",
+ "js-sys",
+ "pem 3.0.6",
+ "ring 0.17.14",
+ "serde",
+ "serde_json",
+ "simple_asn1",
+]
+
+[[package]]
+name = "kv-log-macro"
+version = "1.0.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0de8b303297635ad57c9f5059fd9cee7a47f8e8daa09df0fcd07dd39fb22977f"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "lazy-regex"
+version = "3.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "191898e17ddee19e60bccb3945aa02339e81edd4a8c50e21fd4d48cdecda7b29"
+dependencies = [
+ "lazy-regex-proc_macros",
+ "once_cell",
+ "regex",
+]
+
+[[package]]
+name = "lazy-regex-proc_macros"
+version = "3.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c35dc8b0da83d1a9507e12122c80dea71a9c7c613014347392483a83ea593e04"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "regex",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "lazy_static"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
+dependencies = [
+ "spin 0.9.8",
+]
+
+[[package]]
+name = "lazycell"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+[[package]]
+name = "lexical"
+version = "6.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7aefb36fd43fef7003334742cbf77b243fcd36418a1d1bdd480d613a67968f6"
+dependencies = [
+ "lexical-core",
+]
+
+[[package]]
+name = "lexical-core"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2cde5de06e8d4c2faabc400238f9ae1c74d5412d03a7bd067645ccbc47070e46"
+dependencies = [
+ "lexical-parse-float",
+ "lexical-parse-integer",
+ "lexical-util",
+ "lexical-write-float",
+ "lexical-write-integer",
+]
+
+[[package]]
+name = "lexical-parse-float"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "683b3a5ebd0130b8fb52ba0bdc718cc56815b6a097e28ae5a6997d0ad17dc05f"
+dependencies = [
+ "lexical-parse-integer",
+ "lexical-util",
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-parse-integer"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d0994485ed0c312f6d965766754ea177d07f9c00c9b82a5ee62ed5b47945ee9"
+dependencies = [
+ "lexical-util",
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-util"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5255b9ff16ff898710eb9eb63cb39248ea8a5bb036bea8085b1a767ff6c4e3fc"
+dependencies = [
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-write-float"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accabaa1c4581f05a3923d1b4cfd124c329352288b7b9da09e766b0668116862"
+dependencies = [
+ "lexical-util",
+ "lexical-write-integer",
+ "static_assertions",
+]
+
+[[package]]
+name = "lexical-write-integer"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1b6f3d1f4422866b68192d62f77bc5c700bee84f3069f2469d7bc8c77852446"
+dependencies = [
+ "lexical-util",
+ "static_assertions",
+]
+
+[[package]]
+name = "libc"
+version = "0.2.177"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+
+[[package]]
+name = "libloading"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d7c4b02199fee7c5d21a5ae7d8cfa79a6ef5bb2fc834d6e9058e89c825efdc55"
+dependencies = [
+ "cfg-if",
+ "windows-link",
+]
+
+[[package]]
+name = "libm"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
+
+[[package]]
+name = "libredox"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "416f7e718bdb06000964960ffa43b4335ad4012ae8b99060261aa4a8088d5ccb"
+dependencies = [
+ "bitflags 2.10.0",
+ "libc",
+ "redox_syscall 0.5.18",
+]
+
+[[package]]
+name = "librocksdb-sys"
+version = "0.11.0+8.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e"
+dependencies = [
+ "bindgen 0.65.1",
+ "bzip2-sys",
+ "cc",
+ "glob",
+ "libc",
+ "libz-sys",
+]
+
+[[package]]
+name = "libsqlite3-sys"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afc22eff61b133b115c6e8c74e818c628d6d5e7a502afea6f64dee076dd94326"
+dependencies = [
+ "cc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "libz-sys"
+version = "1.1.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b70e7a7df205e92a1a4cd9aaae7898dac0aa555503cc0a649494d0d60e7651d"
+dependencies = [
+ "cc",
+ "pkg-config",
+ "vcpkg",
+]
+
+[[package]]
+name = "linked-hash-map"
+version = "0.5.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.4.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039"
+
+[[package]]
+name = "litemap"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
+
+[[package]]
+name = "lock_api"
+version = "0.4.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
+dependencies = [
+ "scopeguard",
+]
+
+[[package]]
+name = "log"
+version = "0.4.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+dependencies = [
+ "value-bag",
+]
+
+[[package]]
+name = "lru"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "718e8fae447df0c7e1ba7f5189829e63fd536945c8988d61444c19039f16b670"
+dependencies = [
+ "hashbrown 0.13.2",
+]
+
+[[package]]
+name = "lru-cache"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31e24f1ad8321ca0e8a1e0ac13f23cb668e6f5466c2c57319f6a5cf1cc8e3b1c"
+dependencies = [
+ "linked-hash-map",
+]
+
+[[package]]
+name = "lru-slab"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
+
+[[package]]
+name = "matches"
+version = "0.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
+
+[[package]]
+name = "matchit"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
+
+[[package]]
+name = "md-5"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d89e7ee0cfbedfc4da3340218492196241d89eefb6dab27de5df917a6d2e78cf"
+dependencies = [
+ "cfg-if",
+ "digest",
+]
+
+[[package]]
+name = "memchr"
+version = "2.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+
+[[package]]
+name = "memmap2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83faa42c0a078c393f6b29d5db232d8be22776a891f8f56e5284faee4a20b327"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "488016bfae457b036d996092f6cb448677611ce4449e970ceaf42695203f218a"
+dependencies = [
+ "autocfg",
+]
+
+[[package]]
+name = "miette"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e"
+dependencies = [
+ "miette-derive",
+ "once_cell",
+ "thiserror 1.0.69",
+ "unicode-width",
+]
+
+[[package]]
+name = "miette-derive"
+version = "5.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "mime"
+version = "0.3.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+
+[[package]]
+name = "mini-moka"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c325dfab65f261f386debee8b0969da215b3fa0037e74c8a1234db7ba986d803"
+dependencies = [
+ "crossbeam-channel",
+ "crossbeam-utils",
+ "dashmap",
+ "skeptic",
+ "smallvec",
+ "tagptr",
+ "triomphe",
+]
+
+[[package]]
+name = "minimal-lexical"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
+
+[[package]]
+name = "miniz_oxide"
+version = "0.8.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
+dependencies = [
+ "adler2",
+ "simd-adler32",
+]
+
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "log",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "mio"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
+dependencies = [
+ "libc",
+ "wasi 0.11.1+wasi-snapshot-preview1",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "moka"
+version = "0.12.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8261cd88c312e0004c1d51baad2980c66528dfdb2bee62003e643a4d8f86b077"
+dependencies = [
+ "async-lock",
+ "crossbeam-channel",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "equivalent",
+ "event-listener 5.4.1",
+ "futures-util",
+ "parking_lot 0.12.5",
+ "portable-atomic",
+ "rustc_version 0.4.1",
+ "smallvec",
+ "tagptr",
+ "uuid",
+]
+
+[[package]]
+name = "mongodb"
+version = "2.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef206acb1b72389b49bc9985efe7eb1f8a9bb18e5680d262fac26c07f44025f1"
+dependencies = [
+ "async-trait",
+ "base64 0.13.1",
+ "bitflags 1.3.2",
+ "bson",
+ "chrono",
+ "derivative",
+ "derive_more",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-util",
+ "hex",
+ "hmac",
+ "lazy_static",
+ "md-5",
+ "pbkdf2 0.11.0",
+ "percent-encoding",
+ "rand 0.8.5",
+ "rustc_version_runtime",
+ "rustls 0.21.12",
+ "rustls-pemfile",
+ "serde",
+ "serde_bytes",
+ "serde_with",
+ "sha-1",
+ "sha2",
+ "socket2 0.4.10",
+ "stringprep",
+ "strsim 0.10.0",
+ "take_mut",
+ "thiserror 1.0.69",
+ "tokio",
+ "tokio-rustls 0.24.1",
+ "tokio-util",
+ "trust-dns-proto",
+ "trust-dns-resolver",
+ "typed-builder",
+ "uuid",
+ "webpki-roots 0.25.4",
+]
+
+[[package]]
+name = "multimap"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d87ecb2933e8aeadb3e3a02b828fed80a7528047e68b4f424523a0981a3a084"
+
+[[package]]
+name = "mysql-common-derive"
+version = "0.30.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56b0d8a0db9bf6d2213e11f2c701cb91387b0614361625ab7b9743b41aa4938f"
+dependencies = [
+ "darling 0.20.11",
+ "heck 0.4.1",
+ "num-bigint",
+ "proc-macro-crate 1.3.1",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+ "termcolor",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "mysql_async"
+version = "0.32.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5272f59b5b1f93d65f7f826c1f025d6e410e89fb50a67e05aa20b35a55a8c0a"
+dependencies = [
+ "bytes",
+ "crossbeam",
+ "flate2",
+ "futures-core",
+ "futures-sink",
+ "futures-util",
+ "lazy_static",
+ "lru",
+ "mio 0.8.11",
+ "mysql_common",
+ "once_cell",
+ "pem 2.0.1",
+ "percent-encoding",
+ "pin-project",
+ "priority-queue",
+ "rustls 0.21.12",
+ "rustls-pemfile",
+ "serde",
+ "serde_json",
+ "socket2 0.5.10",
+ "thiserror 1.0.69",
+ "tokio",
+ "tokio-rustls 0.24.1",
+ "tokio-util",
+ "twox-hash",
+ "url",
+ "webpki",
+ "webpki-roots 0.23.1",
+]
+
+[[package]]
+name = "mysql_common"
+version = "0.30.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57349d5a326b437989b6ee4dc8f2f34b0cc131202748414712a8e7d98952fc8c"
+dependencies = [
+ "base64 0.21.7",
+ "bigdecimal",
+ "bindgen 0.72.1",
+ "bitflags 2.10.0",
+ "bitvec",
+ "byteorder",
+ "bytes",
+ "cc",
+ "cmake",
+ "crc32fast",
+ "flate2",
+ "frunk",
+ "lazy_static",
+ "lexical",
+ "mysql-common-derive",
+ "num-bigint",
+ "num-traits",
+ "rand 0.8.5",
+ "regex",
+ "rust_decimal",
+ "saturating",
+ "serde",
+ "serde_json",
+ "sha1",
+ "sha2",
+ "smallvec",
+ "subprocess",
+ "thiserror 1.0.69",
+ "time",
+ "uuid",
+]
+
+[[package]]
+name = "nom"
+version = "7.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a"
+dependencies = [
+ "memchr",
+ "minimal-lexical",
+]
+
+[[package]]
+name = "num-bigint"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
+dependencies = [
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-bigint-dig"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82c79c15c05d4bf82b6f5ef163104cc81a760d8e874d38ac50ab67c8877b647b"
+dependencies = [
+ "lazy_static",
+ "libm",
+ "num-integer",
+ "num-iter",
+ "num-traits",
+ "rand 0.8.5",
+ "smallvec",
+ "zeroize",
+]
+
+[[package]]
+name = "num-conv"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
+
+[[package]]
+name = "num-derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "num-integer"
+version = "0.1.46"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
+dependencies = [
+ "num-traits",
+]
+
+[[package]]
+name = "num-iter"
+version = "0.1.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
+dependencies = [
+ "autocfg",
+ "num-integer",
+ "num-traits",
+]
+
+[[package]]
+name = "num-traits"
+version = "0.2.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
+dependencies = [
+ "autocfg",
+ "libm",
+]
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "opendal"
+version = "0.46.0"
+dependencies = [
+ "anyhow",
+ "async-tls",
+ "async-trait",
+ "backon",
+ "base64 0.22.1",
+ "bb8",
+ "bb8-postgres",
+ "bytes",
+ "cacache",
+ "chrono",
+ "crc32c",
+ "dashmap",
+ "etcd-client",
+ "flagset",
+ "foundationdb",
+ "futures",
+ "getrandom 0.2.16",
+ "hdrs",
+ "hmac",
+ "hrana-client-proto",
+ "http 1.3.1",
+ "log",
+ "md-5",
+ "mini-moka",
+ "moka",
+ "mongodb",
+ "mysql_async",
+ "once_cell",
+ "openssh",
+ "openssh-sftp-client",
+ "percent-encoding",
+ "persy",
+ "prost 0.11.9",
+ "quick-xml",
+ "r2d2",
+ "redb",
+ "redis",
+ "reqsign",
+ "reqwest",
+ "rocksdb",
+ "rusqlite",
+ "serde",
+ "serde_json",
+ "sha1",
+ "sha2",
+ "sled",
+ "suppaftp",
+ "tikv-client",
+ "tokio",
+ "tokio-postgres",
+ "uuid",
+]
+
+[[package]]
+name = "opendal-python"
+version = "0.45.2"
+dependencies = [
+ "bytes",
+ "futures",
+ "opendal",
+ "pyo3",
+ "pyo3-asyncio",
+ "tokio",
+]
+
+[[package]]
+name = "openssh"
+version = "0.10.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "330f4b61092456dc0aaa0cf9a205d956cae07d8127a69ffeff6760a72549c77f"
+dependencies = [
+ "libc",
+ "once_cell",
+ "shell-escape",
+ "tempfile",
+ "thiserror 1.0.69",
+ "tokio",
+ "tokio-pipe",
+]
+
+[[package]]
+name = "openssh-sftp-client"
+version = "0.14.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f472c9c38ea60bc161f8b5df4d04c79057003cdc12572eaad7f6dcc74e6fca5"
+dependencies = [
+ "bytes",
+ "derive_destructure2",
+ "futures-core",
+ "once_cell",
+ "openssh",
+ "openssh-sftp-client-lowlevel",
+ "openssh-sftp-error",
+ "pin-project",
+ "scopeguard",
+ "tokio",
+ "tokio-io-utility",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "openssh-sftp-client-lowlevel"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4a84f1a52761901fcf5b10885544085348a872e57294531ec9188145d9a83042"
+dependencies = [
+ "awaitable",
+ "bytes",
+ "concurrent_arena",
+ "derive_destructure2",
+ "openssh-sftp-error",
+ "openssh-sftp-protocol",
+ "pin-project",
+ "tokio",
+ "tokio-io-utility",
+]
+
+[[package]]
+name = "openssh-sftp-error"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61a5aea093d714df10186f481a6003e3f906f6fc8360c026737a841f4f182996"
+dependencies = [
+ "awaitable-error",
+ "openssh",
+ "openssh-sftp-protocol-error",
+ "ssh_format_error",
+ "thiserror 1.0.69",
+ "tokio",
+]
+
+[[package]]
+name = "openssh-sftp-protocol"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9c862e0c56553146306507f55958c11ff554e02c46de287e6976e50d815b350"
+dependencies = [
+ "bitflags 2.10.0",
+ "num-derive",
+ "num-traits",
+ "openssh-sftp-protocol-error",
+ "serde",
+ "ssh_format",
+ "vec-strings",
+]
+
+[[package]]
+name = "openssh-sftp-protocol-error"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42b54df62ccfd9a7708a83a9d60c46293837e478f9f4c0829360dcfa60ede8d2"
+dependencies = [
+ "serde",
+ "thiserror 2.0.17",
+ "vec-strings",
+]
+
+[[package]]
+name = "openssl-probe"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
+
+[[package]]
+name = "ordered-multimap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49203cdcae0030493bad186b28da2fa25645fa276a51b6fec8010d281e02ef79"
+dependencies = [
+ "dlv-list",
+ "hashbrown 0.14.5",
+]
+
+[[package]]
+name = "parking"
+version = "2.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
+
+[[package]]
+name = "parking_lot"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99"
+dependencies = [
+ "instant",
+ "lock_api",
+ "parking_lot_core 0.8.6",
+]
+
+[[package]]
+name = "parking_lot"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
+dependencies = [
+ "lock_api",
+ "parking_lot_core 0.9.12",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc"
+dependencies = [
+ "cfg-if",
+ "instant",
+ "libc",
+ "redox_syscall 0.2.16",
+ "smallvec",
+ "winapi",
+]
+
+[[package]]
+name = "parking_lot_core"
+version = "0.9.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "redox_syscall 0.5.18",
+ "smallvec",
+ "windows-link",
+]
+
+[[package]]
+name = "pbkdf2"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
+dependencies = [
+ "digest",
+]
+
+[[package]]
+name = "pbkdf2"
+version = "0.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
+dependencies = [
+ "digest",
+ "hmac",
+]
+
+[[package]]
+name = "peeking_take_while"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
+
+[[package]]
+name = "pem"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b13fe415cdf3c8e44518e18a7c95a13431d9bdf6d15367d82b23c377fdd441a"
+dependencies = [
+ "base64 0.21.7",
+ "serde",
+]
+
+[[package]]
+name = "pem"
+version = "3.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be"
+dependencies = [
+ "base64 0.22.1",
+ "serde_core",
+]
+
+[[package]]
+name = "pem-rfc7468"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88b39c9bfcfc231068454382784bb460aae594343fb030d46e9f50a645418412"
+dependencies = [
+ "base64ct",
+]
+
+[[package]]
+name = "percent-encoding"
+version = "2.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
+
+[[package]]
+name = "persy"
+version = "1.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1bce6ad02b7ddcdd9978d99d17bb2c717c8e15b94801785a262641cbdf10c5a5"
+dependencies = [
+ "crc",
+ "data-encoding",
+ "fs2",
+ "linked-hash-map",
+ "rand 0.9.2",
+ "thiserror 2.0.17",
+ "unsigned-varint",
+ "zigzag",
+]
+
+[[package]]
+name = "petgraph"
+version = "0.6.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
+dependencies = [
+ "fixedbitset",
+ "indexmap 2.12.0",
+]
+
+[[package]]
+name = "phf"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf"
+dependencies = [
+ "phf_shared",
+ "serde",
+]
+
+[[package]]
+name = "phf_shared"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266"
+dependencies = [
+ "siphasher",
+]
+
+[[package]]
+name = "pin-project"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677f1add503faace112b9f1373e43e9e054bfdd22ff1a63c1bc485eaec6a6a8a"
+dependencies = [
+ "pin-project-internal",
+]
+
+[[package]]
+name = "pin-project-internal"
+version = "1.1.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e918e4ff8c4549eb882f14b3a4bc8c8bc93de829416eacf579f1207a8fbf861"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "pin-project-lite"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
+
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "piper"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "96c8c490f422ef9a4efd2cb5b42b76c8613d7e7dfc1caf667b8a3350a5acc066"
+dependencies = [
+ "atomic-waker",
+ "fastrand",
+ "futures-io",
+]
+
+[[package]]
+name = "pkcs1"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8ffb9f10fa047879315e6625af03c164b16962a5368d724ed16323b68ace47f"
+dependencies = [
+ "der",
+ "pkcs8",
+ "spki",
+]
+
+[[package]]
+name = "pkcs5"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e847e2c91a18bfa887dd028ec33f2fe6f25db77db3619024764914affe8b69a6"
+dependencies = [
+ "aes",
+ "cbc",
+ "der",
+ "pbkdf2 0.12.2",
+ "scrypt",
+ "sha2",
+ "spki",
+]
+
+[[package]]
+name = "pkcs8"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f950b2377845cebe5cf8b5165cb3cc1a5e0fa5cfa3e1f7f55707d8fd82e0a7b7"
+dependencies = [
+ "der",
+ "pkcs5",
+ "rand_core 0.6.4",
+ "spki",
+]
+
+[[package]]
+name = "pkg-config"
+version = "0.3.32"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
+
+[[package]]
+name = "polling"
+version = "3.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d0e4f59085d47d8241c88ead0f274e8a0cb551f3625263c05eb8dd897c34218"
+dependencies = [
+ "cfg-if",
+ "concurrent-queue",
+ "hermit-abi",
+ "pin-project-lite",
+ "rustix 1.1.2",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "portable-atomic"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
+
+[[package]]
+name = "postgres-protocol"
+version = "0.6.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbef655056b916eb868048276cfd5d6a7dea4f81560dfd047f97c8c6fe3fcfd4"
+dependencies = [
+ "base64 0.22.1",
+ "byteorder",
+ "bytes",
+ "fallible-iterator",
+ "hmac",
+ "md-5",
+ "memchr",
+ "rand 0.9.2",
+ "sha2",
+ "stringprep",
+]
+
+[[package]]
+name = "postgres-types"
+version = "0.2.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ef4605b7c057056dd35baeb6ac0c0338e4975b1f2bef0f65da953285eb007095"
+dependencies = [
+ "bytes",
+ "fallible-iterator",
+ "postgres-protocol",
+]
+
+[[package]]
+name = "potential_utf"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
+dependencies = [
+ "zerovec",
+]
+
+[[package]]
+name = "powerfmt"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
+
+[[package]]
+name = "ppv-lite86"
+version = "0.2.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
+dependencies = [
+ "zerocopy",
+]
+
+[[package]]
+name = "prettyplease"
+version = "0.2.37"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b"
+dependencies = [
+ "proc-macro2",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "priority-queue"
+version = "1.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a0bda9164fe05bc9225752d54aae413343c36f684380005398a6a8fde95fe785"
+dependencies = [
+ "autocfg",
+ "indexmap 1.9.3",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+dependencies = [
+ "once_cell",
+ "toml_edit 0.19.15",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "219cb19e96be00ab2e37d6e299658a0cfa83e52429179969b0f0121b4ac46983"
+dependencies = [
+ "toml_edit 0.23.7",
+]
+
+[[package]]
+name = "proc-macro-error"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c"
+dependencies = [
+ "proc-macro-error-attr",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro-error-attr"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "version_check",
+]
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "prometheus"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1"
+dependencies = [
+ "cfg-if",
+ "fnv",
+ "lazy_static",
+ "memchr",
+ "parking_lot 0.12.5",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "prost"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
+dependencies = [
+ "bytes",
+ "prost-derive 0.11.9",
+]
+
+[[package]]
+name = "prost"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
+dependencies = [
+ "bytes",
+ "prost-derive 0.12.6",
+]
+
+[[package]]
+name = "prost-build"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4"
+dependencies = [
+ "bytes",
+ "heck 0.5.0",
+ "itertools 0.12.1",
+ "log",
+ "multimap",
+ "once_cell",
+ "petgraph",
+ "prettyplease",
+ "prost 0.12.6",
+ "prost-types",
+ "regex",
+ "syn 2.0.108",
+ "tempfile",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5d2d8d10f3c6ded6da8b05b5fb3b8a5082514344d56c9f871412d29b4e075b4"
+dependencies = [
+ "anyhow",
+ "itertools 0.10.5",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
+dependencies = [
+ "anyhow",
+ "itertools 0.12.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0"
+dependencies = [
+ "prost 0.12.6",
+]
+
+[[package]]
+name = "ptr_meta"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1"
+dependencies = [
+ "ptr_meta_derive",
+]
+
+[[package]]
+name = "ptr_meta_derive"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "pulldown-cmark"
+version = "0.9.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57206b407293d2bcd3af849ce869d52068623f19e1b5ff8e8778e3309439682b"
+dependencies = [
+ "bitflags 2.10.0",
+ "memchr",
+ "unicase",
+]
+
+[[package]]
+name = "pyo3"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53bdbb96d49157e65d45cc287af5f32ffadd5f4761438b527b055fb0d4bb8233"
+dependencies = [
+ "cfg-if",
+ "indoc",
+ "libc",
+ "memoffset",
+ "parking_lot 0.12.5",
+ "portable-atomic",
+ "pyo3-build-config",
+ "pyo3-ffi",
+ "pyo3-macros",
+ "unindent",
+]
+
+[[package]]
+name = "pyo3-asyncio"
+version = "0.20.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea6b68e93db3622f3bb3bf363246cf948ed5375afe7abff98ccbdd50b184995"
+dependencies = [
+ "futures",
+ "once_cell",
+ "pin-project-lite",
+ "pyo3",
+ "tokio",
+]
+
+[[package]]
+name = "pyo3-build-config"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "deaa5745de3f5231ce10517a1f5dd97d53e5a2fd77aa6b5842292085831d48d7"
+dependencies = [
+ "once_cell",
+ "target-lexicon",
+]
+
+[[package]]
+name = "pyo3-ffi"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "62b42531d03e08d4ef1f6e85a2ed422eb678b8cd62b762e53891c05faf0d4afa"
+dependencies = [
+ "libc",
+ "pyo3-build-config",
+]
+
+[[package]]
+name = "pyo3-macros"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7305c720fa01b8055ec95e484a6eca7a83c841267f0dd5280f0c8b8551d2c158"
+dependencies = [
+ "proc-macro2",
+ "pyo3-macros-backend",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "pyo3-macros-backend"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c7e9b68bb9c3149c5b0cade5d07f953d6d125eb4337723c4ccdb665f1f96185"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "pyo3-build-config",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "quick-xml"
+version = "0.31.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1004a344b30a54e2ee58d66a71b32d2db2feb0a31f9a2d302bf0536f15de2a33"
+dependencies = [
+ "memchr",
+ "serde",
+]
+
+[[package]]
+name = "quinn"
+version = "0.11.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
+dependencies = [
+ "bytes",
+ "cfg_aliases",
+ "pin-project-lite",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash 2.1.1",
+ "rustls 0.23.34",
+ "socket2 0.6.1",
+ "thiserror 2.0.17",
+ "tokio",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-proto"
+version = "0.11.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
+dependencies = [
+ "bytes",
+ "getrandom 0.3.4",
+ "lru-slab",
+ "rand 0.9.2",
+ "ring 0.17.14",
+ "rustc-hash 2.1.1",
+ "rustls 0.23.34",
+ "rustls-pki-types",
+ "slab",
+ "thiserror 2.0.17",
+ "tinyvec",
+ "tracing",
+ "web-time",
+]
+
+[[package]]
+name = "quinn-udp"
+version = "0.5.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
+dependencies = [
+ "cfg_aliases",
+ "libc",
+ "once_cell",
+ "socket2 0.6.1",
+ "tracing",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "r-efi"
+version = "5.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
+
+[[package]]
+name = "r2d2"
+version = "0.8.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "51de85fb3fb6524929c8a2eb85e6b6d363de4e8c48f9e2c2eac4944abc181c93"
+dependencies = [
+ "log",
+ "parking_lot 0.12.5",
+ "scheduled-thread-pool",
+]
+
+[[package]]
+name = "radium"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
+
+[[package]]
+name = "rand"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
+dependencies = [
+ "getrandom 0.1.16",
+ "libc",
+ "rand_chacha 0.2.2",
+ "rand_core 0.5.1",
+ "rand_hc",
+]
+
+[[package]]
+name = "rand"
+version = "0.8.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404"
+dependencies = [
+ "libc",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
+dependencies = [
+ "rand_chacha 0.9.0",
+ "rand_core 0.9.3",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "rand_chacha"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
+dependencies = [
+ "ppv-lite86",
+ "rand_core 0.9.3",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19"
+dependencies = [
+ "getrandom 0.1.16",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
+dependencies = [
+ "getrandom 0.2.16",
+]
+
+[[package]]
+name = "rand_core"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
+dependencies = [
+ "getrandom 0.3.4",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core 0.5.1",
+]
+
+[[package]]
+name = "redb"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17a0b35b8077c954324cc3504bea8d35e27a2f5d07c0ba41052a35d92f020f84"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "redis"
+version = "0.23.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4f49cdc0bb3f412bf8e7d1bd90fe1d9eb10bc5c399ba90973c14662a27b3f8ba"
+dependencies = [
+ "arc-swap",
+ "async-trait",
+ "bytes",
+ "combine",
+ "crc16",
+ "futures",
+ "futures-util",
+ "itoa",
+ "log",
+ "percent-encoding",
+ "pin-project-lite",
+ "rand 0.8.5",
+ "rustls 0.21.12",
+ "rustls-native-certs",
+ "ryu",
+ "sha1_smol",
+ "socket2 0.4.10",
+ "tokio",
+ "tokio-retry",
+ "tokio-rustls 0.24.1",
+ "tokio-util",
+ "url",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.2.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+dependencies = [
+ "bitflags 1.3.2",
+]
+
+[[package]]
+name = "redox_syscall"
+version = "0.5.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
+dependencies = [
+ "bitflags 2.10.0",
+]
+
+[[package]]
+name = "reflink-copy"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23bbed272e39c47a095a5242218a67412a220006842558b03fe2935e8f3d7b92"
+dependencies = [
+ "cfg-if",
+ "libc",
+ "rustix 1.1.2",
+ "windows",
+]
+
+[[package]]
+name = "regex"
+version = "1.12.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58"
+
+[[package]]
+name = "rend"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "71fe3824f5629716b1589be05dacd749f6aa084c87e00e016714a8cdfccc997c"
+dependencies = [
+ "bytecheck",
+]
+
+[[package]]
+name = "reqsign"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70fe66d4cd0b5ed9b1abbfe639bf6baeaaf509f7da2d51b31111ba945be59286"
+dependencies = [
+ "anyhow",
+ "async-trait",
+ "base64 0.22.1",
+ "chrono",
+ "form_urlencoded",
+ "getrandom 0.2.16",
+ "hex",
+ "hmac",
+ "home",
+ "http 1.3.1",
+ "jsonwebtoken",
+ "log",
+ "once_cell",
+ "percent-encoding",
+ "quick-xml",
+ "rand 0.8.5",
+ "reqwest",
+ "rsa",
+ "rust-ini",
+ "serde",
+ "serde_json",
+ "sha1",
+ "sha2",
+]
+
+[[package]]
+name = "reqwest"
+version = "0.12.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f"
+dependencies = [
+ "base64 0.22.1",
+ "bytes",
+ "futures-core",
+ "futures-util",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "http-body-util",
+ "hyper 1.7.0",
+ "hyper-rustls",
+ "hyper-util",
+ "js-sys",
+ "log",
+ "percent-encoding",
+ "pin-project-lite",
+ "quinn",
+ "rustls 0.23.34",
+ "rustls-pki-types",
+ "serde",
+ "serde_json",
+ "serde_urlencoded",
+ "sync_wrapper 1.0.2",
+ "tokio",
+ "tokio-rustls 0.26.4",
+ "tokio-util",
+ "tower 0.5.2",
+ "tower-http",
+ "tower-service",
+ "url",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "wasm-streams",
+ "web-sys",
+ "webpki-roots 1.0.4",
+]
+
+[[package]]
+name = "resolv-conf"
+version = "0.7.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6b3789b30bd25ba102de4beabd95d21ac45b69b1be7d14522bab988c526d6799"
+
+[[package]]
+name = "ring"
+version = "0.16.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc"
+dependencies = [
+ "cc",
+ "libc",
+ "once_cell",
+ "spin 0.5.2",
+ "untrusted 0.7.1",
+ "web-sys",
+ "winapi",
+]
+
+[[package]]
+name = "ring"
+version = "0.17.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7"
+dependencies = [
+ "cc",
+ "cfg-if",
+ "getrandom 0.2.16",
+ "libc",
+ "untrusted 0.9.0",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "rkyv"
+version = "0.7.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9008cd6385b9e161d8229e1f6549dd23c3d022f132a2ea37ac3a10ac4935779b"
+dependencies = [
+ "bitvec",
+ "bytecheck",
+ "bytes",
+ "hashbrown 0.12.3",
+ "ptr_meta",
+ "rend",
+ "rkyv_derive",
+ "seahash",
+ "tinyvec",
+ "uuid",
+]
+
+[[package]]
+name = "rkyv_derive"
+version = "0.7.45"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "503d1d27590a2b0a3a4ca4c94755aa2875657196ecbf401a42eff41d7de532c0"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "rocksdb"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe"
+dependencies = [
+ "libc",
+ "librocksdb-sys",
+]
+
+[[package]]
+name = "rsa"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "78928ac1ed176a5ca1d17e578a1825f3d81ca54cf41053a592584b020cfd691b"
+dependencies = [
+ "const-oid",
+ "digest",
+ "num-bigint-dig",
+ "num-integer",
+ "num-traits",
+ "pkcs1",
+ "pkcs8",
+ "rand_core 0.6.4",
+ "sha2",
+ "signature",
+ "spki",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rusqlite"
+version = "0.29.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "549b9d036d571d42e6e85d1c1425e2ac83491075078ca9a15be021c56b1641f2"
+dependencies = [
+ "bitflags 2.10.0",
+ "fallible-iterator",
+ "fallible-streaming-iterator",
+ "hashlink",
+ "libsqlite3-sys",
+ "smallvec",
+]
+
+[[package]]
+name = "rust-ini"
+version = "0.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "796e8d2b6696392a43bea58116b667fb4c29727dc5abd27d6acf338bb4f688c7"
+dependencies = [
+ "cfg-if",
+ "ordered-multimap",
+]
+
+[[package]]
+name = "rust_decimal"
+version = "1.39.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "35affe401787a9bd846712274d97654355d21b2a2c092a3139aabe31e9022282"
+dependencies = [
+ "arrayvec",
+ "borsh",
+ "bytes",
+ "num-traits",
+ "rand 0.8.5",
+ "rkyv",
+ "serde",
+ "serde_json",
+]
+
+[[package]]
+name = "rustc-hash"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+
+[[package]]
+name = "rustc-hash"
+version = "2.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
+
+[[package]]
+name = "rustc_version"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
+dependencies = [
+ "semver 0.9.0",
+]
+
+[[package]]
+name = "rustc_version"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
+dependencies = [
+ "semver 1.0.27",
+]
+
+[[package]]
+name = "rustc_version_runtime"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d31b7153270ebf48bf91c65ae5b0c00e749c4cfad505f66530ac74950249582f"
+dependencies = [
+ "rustc_version 0.2.3",
+ "semver 0.9.0",
+]
+
+[[package]]
+name = "rustix"
+version = "0.38.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154"
+dependencies = [
+ "bitflags 2.10.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.4.15",
+ "windows-sys 0.59.0",
+]
+
+[[package]]
+name = "rustix"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd15f8a2c5551a84d56efdc1cd049089e409ac19a3072d5037a17fd70719ff3e"
+dependencies = [
+ "bitflags 2.10.0",
+ "errno",
+ "libc",
+ "linux-raw-sys 0.11.0",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "rustls"
+version = "0.21.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
+dependencies = [
+ "log",
+ "ring 0.17.14",
+ "rustls-webpki 0.101.7",
+ "sct",
+]
+
+[[package]]
+name = "rustls"
+version = "0.23.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7"
+dependencies = [
+ "once_cell",
+ "ring 0.17.14",
+ "rustls-pki-types",
+ "rustls-webpki 0.103.8",
+ "subtle",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-pemfile"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
+dependencies = [
+ "base64 0.21.7",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a"
+dependencies = [
+ "web-time",
+ "zeroize",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.100.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f6a5fc258f1c1276dfe3016516945546e2d5383911efc0fc4f1cdc5df3a4ae3"
+dependencies = [
+ "ring 0.16.20",
+ "untrusted 0.7.1",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.101.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
+dependencies = [
+ "ring 0.17.14",
+ "untrusted 0.9.0",
+]
+
+[[package]]
+name = "rustls-webpki"
+version = "0.103.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
+dependencies = [
+ "ring 0.17.14",
+ "rustls-pki-types",
+ "untrusted 0.9.0",
+]
+
+[[package]]
+name = "rustversion"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
+
+[[package]]
+name = "ryu"
+version = "1.0.20"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f"
+
+[[package]]
+name = "salsa20"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
+dependencies = [
+ "cipher",
+]
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "saturating"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ece8e78b2f38ec51c51f5d475df0a7187ba5111b2a28bdc761ee05b075d40a71"
+
+[[package]]
+name = "schannel"
+version = "0.1.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "891d81b926048e76efe18581bf793546b4c0eaf8448d72be8de2bbee5fd166e1"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "scheduled-thread-pool"
+version = "0.2.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3cbc66816425a074528352f5789333ecff06ca41b36b0b0efdfbb29edc391a19"
+dependencies = [
+ "parking_lot 0.12.5",
+]
+
+[[package]]
+name = "scopeguard"
+version = "1.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+
+[[package]]
+name = "scrypt"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f"
+dependencies = [
+ "pbkdf2 0.12.2",
+ "salsa20",
+ "sha2",
+]
+
+[[package]]
+name = "sct"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+dependencies = [
+ "ring 0.17.14",
+ "untrusted 0.9.0",
+]
+
+[[package]]
+name = "seahash"
+version = "4.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b"
+
+[[package]]
+name = "security-framework"
+version = "2.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
+dependencies = [
+ "bitflags 2.10.0",
+ "core-foundation",
+ "core-foundation-sys",
+ "libc",
+ "security-framework-sys",
+]
+
+[[package]]
+name = "security-framework-sys"
+version = "2.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cc1f0cbffaac4852523ce30d8bd3c5cdc873501d96ff467ca09b6767bb8cd5c0"
+dependencies = [
+ "core-foundation-sys",
+ "libc",
+]
+
+[[package]]
+name = "semver"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
+dependencies = [
+ "semver-parser",
+]
+
+[[package]]
+name = "semver"
+version = "1.0.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
+dependencies = [
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "semver-parser"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
+
+[[package]]
+name = "serde"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_bytes"
+version = "0.11.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5d440709e79d88e51ac01c4b72fc6cb7314017bb7da9eeff678aa94c10e3ea8"
+dependencies = [
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
+dependencies = [
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_derive"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "serde_json"
+version = "1.0.145"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
+dependencies = [
+ "indexmap 2.12.0",
+ "itoa",
+ "memchr",
+ "ryu",
+ "serde",
+ "serde_core",
+]
+
+[[package]]
+name = "serde_urlencoded"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd"
+dependencies = [
+ "form_urlencoded",
+ "itoa",
+ "ryu",
+ "serde",
+]
+
+[[package]]
+name = "serde_with"
+version = "1.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "678b5a069e50bf00ecd22d0cd8ddf7c236f68581b03db652061ed5eb13a312ff"
+dependencies = [
+ "serde",
+ "serde_with_macros",
+]
+
+[[package]]
+name = "serde_with_macros"
+version = "1.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e182d6ec6f05393cc0e5ed1bf81ad6db3a8feedf8ee515ecdd369809bcce8082"
+dependencies = [
+ "darling 0.13.4",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "sha-1"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "sha1_smol"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bbfa15b3dddfee50a0fff136974b3e1bde555604ba463834a7eb7deb6417705d"
+
+[[package]]
+name = "sha2"
+version = "0.10.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a7507d819769d01a365ab707794a4084392c824f54a7a6a7862f8c3d0892b283"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest",
+]
+
+[[package]]
+name = "shell-escape"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f"
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "signal-hook-registry"
+version = "1.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2a4719bff48cee6b39d12c020eeb490953ad2443b7055bd0b21fca26bd8c28b"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "signature"
+version = "2.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77549399552de45a898a580c1b41d445bf730df867cc44e6c0233bbc4b8329de"
+dependencies = [
+ "digest",
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "simd-adler32"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe"
+
+[[package]]
+name = "simdutf8"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e"
+
+[[package]]
+name = "simple_asn1"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "297f631f50729c8c99b84667867963997ec0b50f32b2a7dbcab828ef0541e8bb"
+dependencies = [
+ "num-bigint",
+ "num-traits",
+ "thiserror 2.0.17",
+ "time",
+]
+
+[[package]]
+name = "siphasher"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
+
+[[package]]
+name = "skeptic"
+version = "0.13.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "16d23b015676c90a0f01c197bfdc786c20342c73a0afdda9025adb0bc42940a8"
+dependencies = [
+ "bytecount",
+ "cargo_metadata",
+ "error-chain",
+ "glob",
+ "pulldown-cmark",
+ "tempfile",
+ "walkdir",
+]
+
+[[package]]
+name = "slab"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
+
+[[package]]
+name = "sled"
+version = "0.34.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935"
+dependencies = [
+ "crc32fast",
+ "crossbeam-epoch",
+ "crossbeam-utils",
+ "fs2",
+ "fxhash",
+ "libc",
+ "log",
+ "parking_lot 0.11.2",
+]
+
+[[package]]
+name = "smallvec"
+version = "1.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
+
+[[package]]
+name = "socket2"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "socket2"
+version = "0.5.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
+dependencies = [
+ "libc",
+ "windows-sys 0.52.0",
+]
+
+[[package]]
+name = "socket2"
+version = "0.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
+dependencies = [
+ "libc",
+ "windows-sys 0.60.2",
+]
+
+[[package]]
+name = "spin"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d"
+
+[[package]]
+name = "spin"
+version = "0.9.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67"
+
+[[package]]
+name = "spki"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d91ed6c858b01f942cd56b37a94b3e0a1798290327d1236e4d9cf4eaca44d29d"
+dependencies = [
+ "base64ct",
+ "der",
+]
+
+[[package]]
+name = "ssh_format"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24ab31081d1c9097c327ec23550858cb5ffb4af6b866c1ef4d728455f01f3304"
+dependencies = [
+ "bytes",
+ "serde",
+ "ssh_format_error",
+]
+
+[[package]]
+name = "ssh_format_error"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "be3c6519de7ca611f71ef7e8a56eb57aa1c818fecb5242d0a0f39c83776c210c"
+dependencies = [
+ "serde",
+]
+
+[[package]]
+name = "ssri"
+version = "9.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da7a2b3c2bc9693bcb40870c4e9b5bf0d79f9cb46273321bf855ec513e919082"
+dependencies = [
+ "base64 0.21.7",
+ "digest",
+ "hex",
+ "miette",
+ "serde",
+ "sha-1",
+ "sha2",
+ "thiserror 1.0.69",
+ "xxhash-rust",
+]
+
+[[package]]
+name = "stable_deref_trait"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
+
+[[package]]
+name = "static_assertions"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
+
+[[package]]
+name = "stringprep"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b4df3d392d81bd458a8a621b8bffbd2302a12ffe288a9d931670948749463b1"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+ "unicode-properties",
+]
+
+[[package]]
+name = "strsim"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
+[[package]]
+name = "subprocess"
+version = "0.2.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c2e86926081dda636c546d8c5e641661049d7562a68f5488be4a1f7f66f6086"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
+[[package]]
+name = "subtle"
+version = "2.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
+
+[[package]]
+name = "suppaftp"
+version = "5.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb79a5b76543d896dbec5c0fd9a28c0ca9a0d4e764c438c37f8463c96e4a8bf2"
+dependencies = [
+ "async-std",
+ "async-tls",
+ "async-trait",
+ "chrono",
+ "futures-lite",
+ "lazy-regex",
+ "log",
+ "pin-project",
+ "rustls 0.21.12",
+ "thiserror 1.0.69",
+]
+
+[[package]]
+name = "syn"
+version = "1.0.109"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "syn"
+version = "2.0.108"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
+[[package]]
+name = "sync_wrapper"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+dependencies = [
+ "futures-core",
+]
+
+[[package]]
+name = "synstructure"
+version = "0.13.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "tagptr"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417"
+
+[[package]]
+name = "take_mut"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f764005d11ee5f36500a149ace24e00e3da98b0158b3e2d53a7495660d3f4d60"
+
+[[package]]
+name = "tap"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
+
+[[package]]
+name = "target-lexicon"
+version = "0.12.16"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
+
+[[package]]
+name = "tempfile"
+version = "3.23.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d31c77bdf42a745371d260a26ca7163f1e0924b64afa0b688e61b5a9fa02f16"
+dependencies = [
+ "fastrand",
+ "getrandom 0.3.4",
+ "once_cell",
+ "rustix 1.1.2",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "termcolor"
+version = "1.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "thin-vec"
+version = "0.2.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "144f754d318415ac792f9d69fc87abbbfc043ce2ef041c60f16ad828f638717d"
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl 1.0.69",
+]
+
+[[package]]
+name = "thiserror"
+version = "2.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
+dependencies = [
+ "thiserror-impl 2.0.17",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "2.0.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "tikv-client"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "048968e4e3d04db472346770cc19914c6b5ae206fa44677f6a0874d54cd05940"
+dependencies = [
+ "async-recursion 0.3.2",
+ "async-trait",
+ "derive-new",
+ "either",
+ "fail",
+ "futures",
+ "lazy_static",
+ "log",
+ "pin-project",
+ "prometheus",
+ "prost 0.12.6",
+ "rand 0.8.5",
+ "regex",
+ "semver 1.0.27",
+ "serde",
+ "serde_derive",
+ "thiserror 1.0.69",
+ "tokio",
+ "tonic",
+]
+
+[[package]]
+name = "time"
+version = "0.3.44"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91e7d9e3bb61134e77bde20dd4825b97c010155709965fedf0f49bb138e52a9d"
+dependencies = [
+ "deranged",
+ "itoa",
+ "num-conv",
+ "powerfmt",
+ "serde",
+ "time-core",
+ "time-macros",
+]
+
+[[package]]
+name = "time-core"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "40868e7c1d2f0b8d73e4a8c7f0ff63af4f6d19be117e90bd73eb1d62cf831c6b"
+
+[[package]]
+name = "time-macros"
+version = "0.2.24"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "30cfb0125f12d9c277f35663a0a33f8c30190f4e4574868a330595412d34ebf3"
+dependencies = [
+ "num-conv",
+ "time-core",
+]
+
+[[package]]
+name = "tiny-keccak"
+version = "2.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+dependencies = [
+ "crunchy",
+]
+
+[[package]]
+name = "tinystr"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
+dependencies = [
+ "displaydoc",
+ "zerovec",
+]
+
+[[package]]
+name = "tinyvec"
+version = "1.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
+dependencies = [
+ "tinyvec_macros",
+]
+
+[[package]]
+name = "tinyvec_macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
+
+[[package]]
+name = "tokio"
+version = "1.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
+dependencies = [
+ "bytes",
+ "libc",
+ "mio 1.1.0",
+ "parking_lot 0.12.5",
+ "pin-project-lite",
+ "signal-hook-registry",
+ "socket2 0.6.1",
+ "tokio-macros",
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "tokio-io-timeout"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0bd86198d9ee903fedd2f9a2e72014287c0d9167e4ae43b5853007205dda1b76"
+dependencies = [
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-io-utility"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8d672654d175710e52c7c41f6aec77c62b3c0954e2a7ebce9049d1e94ed7c263"
+dependencies = [
+ "bytes",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-macros"
+version = "2.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "tokio-pipe"
+version = "0.2.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f213a84bffbd61b8fa0ba8a044b4bbe35d471d0b518867181e82bd5c15542784"
+dependencies = [
+ "libc",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-postgres"
+version = "0.7.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b40d66d9b2cfe04b628173409368e58247e8eddbbd3b0e6c6ba1d09f20f6c9e"
+dependencies = [
+ "async-trait",
+ "byteorder",
+ "bytes",
+ "fallible-iterator",
+ "futures-channel",
+ "futures-util",
+ "log",
+ "parking_lot 0.12.5",
+ "percent-encoding",
+ "phf",
+ "pin-project-lite",
+ "postgres-protocol",
+ "postgres-types",
+ "rand 0.9.2",
+ "socket2 0.6.1",
+ "tokio",
+ "tokio-util",
+ "whoami",
+]
+
+[[package]]
+name = "tokio-retry"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f"
+dependencies = [
+ "pin-project",
+ "rand 0.8.5",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.24.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
+dependencies = [
+ "rustls 0.21.12",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-rustls"
+version = "0.26.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
+dependencies = [
+ "rustls 0.23.34",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-util"
+version = "0.7.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2efa149fe76073d6e8fd97ef4f4eca7b67f599660115591483572e406e165594"
+dependencies = [
+ "bytes",
+ "futures-core",
+ "futures-io",
+ "futures-sink",
+ "pin-project-lite",
+ "tokio",
+]
+
+[[package]]
+name = "toml_datetime"
+version = "0.6.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22cddaf88f4fbc13c51aebbf5f8eceb5c7c5a9da2ac40a13519eb5b0a0e8f11c"
+
+[[package]]
+name = "toml_datetime"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2cdb639ebbc97961c51720f858597f7f24c4fc295327923af55b74c3c724533"
+dependencies = [
+ "serde_core",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.19.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+dependencies = [
+ "indexmap 2.12.0",
+ "toml_datetime 0.6.11",
+ "winnow 0.5.40",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.23.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6485ef6d0d9b5d0ec17244ff7eb05310113c3f316f2d14200d4de56b3cb98f8d"
+dependencies = [
+ "indexmap 2.12.0",
+ "toml_datetime 0.7.3",
+ "toml_parser",
+ "winnow 0.7.13",
+]
+
+[[package]]
+name = "toml_parser"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c0cbe268d35bdb4bb5a56a2de88d0ad0eb70af5384a99d648cd4b3d04039800e"
+dependencies = [
+ "winnow 0.7.13",
+]
+
+[[package]]
+name = "tonic"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d560933a0de61cf715926b9cac824d4c883c2c43142f787595e48280c40a1d0e"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "axum",
+ "base64 0.21.7",
+ "bytes",
+ "h2",
+ "http 0.2.12",
+ "http-body 0.4.6",
+ "hyper 0.14.32",
+ "hyper-timeout",
+ "percent-encoding",
+ "pin-project",
+ "prost 0.12.6",
+ "rustls 0.21.12",
+ "rustls-pemfile",
+ "tokio",
+ "tokio-rustls 0.24.1",
+ "tokio-stream",
+ "tower 0.4.13",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tonic-build"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9d021fc044c18582b9a2408cd0dd05b1596e3ecdb5c4df822bb0183545683889"
+dependencies = [
+ "prettyplease",
+ "proc-macro2",
+ "prost-build",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "indexmap 1.9.3",
+ "pin-project",
+ "pin-project-lite",
+ "rand 0.8.5",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper 1.0.2",
+ "tokio",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-http"
+version = "0.6.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
+dependencies = [
+ "bitflags 2.10.0",
+ "bytes",
+ "futures-util",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "iri-string",
+ "pin-project-lite",
+ "tower 0.5.2",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
+[[package]]
+name = "tower-service"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+
+[[package]]
+name = "tracing"
+version = "0.1.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "784e0ac535deb450455cbfa28a6f0df145ea1bb7ae51b821cf5e7927fdcfbdd0"
+dependencies = [
+ "pin-project-lite",
+ "tracing-attributes",
+ "tracing-core",
+]
+
+[[package]]
+name = "tracing-attributes"
+version = "0.1.30"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81383ab64e72a7a8b8e13130c49e3dab29def6d0c7d76a03087b3cf71c5c6903"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "tracing-core"
+version = "0.1.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d12581f227e93f094d3af2ae690a574abb8a2b9b7a96e7cfe9647b2b617678"
+dependencies = [
+ "once_cell",
+]
+
+[[package]]
+name = "triomphe"
+version = "0.1.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd69c5aa8f924c7519d6372789a74eac5b94fb0f8fcf0d4a97eb0bfc3e785f39"
+dependencies = [
+ "arc-swap",
+ "serde",
+ "stable_deref_trait",
+]
+
+[[package]]
+name = "trust-dns-proto"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c31f240f59877c3d4bb3b3ea0ec5a6a0cff07323580ff8c7a605cd7d08b255d"
+dependencies = [
+ "async-trait",
+ "cfg-if",
+ "data-encoding",
+ "enum-as-inner",
+ "futures-channel",
+ "futures-io",
+ "futures-util",
+ "idna 0.2.3",
+ "ipnet",
+ "lazy_static",
+ "log",
+ "rand 0.8.5",
+ "smallvec",
+ "thiserror 1.0.69",
+ "tinyvec",
+ "tokio",
+ "url",
+]
+
+[[package]]
+name = "trust-dns-resolver"
+version = "0.21.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e4ba72c2ea84515690c9fcef4c6c660bb9df3036ed1051686de84605b74fd558"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "ipconfig",
+ "lazy_static",
+ "log",
+ "lru-cache",
+ "parking_lot 0.12.5",
+ "resolv-conf",
+ "smallvec",
+ "thiserror 1.0.69",
+ "tokio",
+ "trust-dns-proto",
+]
+
+[[package]]
+name = "try-lock"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
+
+[[package]]
+name = "try_map"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb1626d07cb5c1bb2cf17d94c0be4852e8a7c02b041acec9a8c5bdda99f9d580"
+
+[[package]]
+name = "twox-hash"
+version = "1.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
+dependencies = [
+ "cfg-if",
+ "rand 0.8.5",
+ "static_assertions",
+]
+
+[[package]]
+name = "typed-builder"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89851716b67b937e393b3daa8423e67ddfc4bbbf1654bcf05488e95e0828db0c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
+[[package]]
+name = "typenum"
+version = "1.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb"
+
+[[package]]
+name = "unicase"
+version = "2.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75b844d17643ee918803943289730bec8aac480150456169e647ed0b576ba539"
+
+[[package]]
+name = "unicode-bidi"
+version = "0.3.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c1cb5db39152898a79168971543b1cb5020dff7fe43c8dc468b0885f5e29df5"
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.22"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
+
+[[package]]
+name = "unicode-normalization"
+version = "0.1.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5fd4f6878c9cb28d874b009da9e8d183b5abc80117c40bbd187a1fde336be6e8"
+dependencies = [
+ "tinyvec",
+]
+
+[[package]]
+name = "unicode-properties"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7df058c713841ad818f1dc5d3fd88063241cc61f49f5fbea4b951e8cf5a8d71d"
+
+[[package]]
+name = "unicode-width"
+version = "0.1.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
+
+[[package]]
+name = "unindent"
+version = "0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7264e107f553ccae879d21fbea1d6724ac785e8c3bfc762137959b5802826ef3"
+
+[[package]]
+name = "unsigned-varint"
+version = "0.8.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06"
+
+[[package]]
+name = "untrusted"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a"
+
+[[package]]
+name = "untrusted"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
+
+[[package]]
+name = "url"
+version = "2.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
+dependencies = [
+ "form_urlencoded",
+ "idna 1.1.0",
+ "percent-encoding",
+ "serde",
+]
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
+[[package]]
+name = "uuid"
+version = "1.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f87b8aa10b915a06587d0dec516c282ff295b475d94abf425d62b57710070a2"
+dependencies = [
+ "getrandom 0.3.4",
+ "js-sys",
+ "serde",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "value-bag"
+version = "1.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "943ce29a8a743eb10d6082545d861b24f9d1b160b7d741e0f2cdf726bec909c5"
+
+[[package]]
+name = "vcpkg"
+version = "0.2.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
+
+[[package]]
+name = "vec-strings"
+version = "0.4.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8509489e2a7ee219522238ad45fd370bec6808811ac15ac6b07453804e77659"
+dependencies = [
+ "serde",
+ "thin-vec",
+]
+
+[[package]]
+name = "version_check"
+version = "0.9.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "want"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e"
+dependencies = [
+ "try-lock",
+]
+
+[[package]]
+name = "wasi"
+version = "0.9.0+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
+
+[[package]]
+name = "wasi"
+version = "0.11.1+wasi-snapshot-preview1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
+
+[[package]]
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+dependencies = [
+ "wit-bindgen",
+]
+
+[[package]]
+name = "wasite"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8dad83b4f25e74f184f64c43b150b91efe7647395b42289f38e50566d82855b"
+
+[[package]]
+name = "wasm-bindgen"
+version = "0.2.105"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
+dependencies = [
+ "cfg-if",
+ "once_cell",
+ "rustversion",
+ "wasm-bindgen-macro",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-futures"
+version = "0.4.55"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0"
+dependencies = [
+ "cfg-if",
+ "js-sys",
+ "once_cell",
+ "wasm-bindgen",
+ "web-sys",
+]
+
+[[package]]
+name = "wasm-bindgen-macro"
+version = "0.2.105"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
+dependencies = [
+ "quote",
+ "wasm-bindgen-macro-support",
+]
+
+[[package]]
+name = "wasm-bindgen-macro-support"
+version = "0.2.105"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
+dependencies = [
+ "bumpalo",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+ "wasm-bindgen-shared",
+]
+
+[[package]]
+name = "wasm-bindgen-shared"
+version = "0.2.105"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "wasm-streams"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65"
+dependencies = [
+ "futures-util",
+ "js-sys",
+ "wasm-bindgen",
+ "wasm-bindgen-futures",
+ "web-sys",
+]
+
+[[package]]
+name = "web-sys"
+version = "0.3.82"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
+[[package]]
+name = "webpki"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53"
+dependencies = [
+ "ring 0.17.14",
+ "untrusted 0.9.0",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.22.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c71e40d7d2c34a5106301fb632274ca37242cd0c9d3e64dbece371a40a2d87"
+dependencies = [
+ "webpki",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.23.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338"
+dependencies = [
+ "rustls-webpki 0.100.3",
+]
+
+[[package]]
+name = "webpki-roots"
+version = "0.25.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
+
+[[package]]
+name = "webpki-roots"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e"
+dependencies = [
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "which"
+version = "4.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87ba24419a2078cd2b0f2ede2691b6c66d8e47836da3b6db8265ebad47afbfc7"
+dependencies = [
+ "either",
+ "home",
+ "once_cell",
+ "rustix 0.38.44",
+]
+
+[[package]]
+name = "whoami"
+version = "1.6.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5d4a4db5077702ca3015d3d02d74974948aba2ad9e12ab7df718ee64ccd7e97d"
+dependencies = [
+ "libredox",
+ "wasite",
+ "web-sys",
+]
+
+[[package]]
+name = "widestring"
+version = "1.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72069c3113ab32ab29e5584db3c6ec55d416895e60715417b5b883a357c3e471"
+
+[[package]]
+name = "winapi"
+version = "0.3.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419"
+dependencies = [
+ "winapi-i686-pc-windows-gnu",
+ "winapi-x86_64-pc-windows-gnu",
+]
+
+[[package]]
+name = "winapi-i686-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+[[package]]
+name = "winapi-util"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+dependencies = [
+ "windows-sys 0.61.2",
+]
+
+[[package]]
+name = "winapi-x86_64-pc-windows-gnu"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+[[package]]
+name = "windows"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
+dependencies = [
+ "windows-collections",
+ "windows-core",
+ "windows-future",
+ "windows-numerics",
+]
+
+[[package]]
+name = "windows-collections"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
+dependencies = [
+ "windows-core",
+]
+
+[[package]]
+name = "windows-core"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
+dependencies = [
+ "windows-implement",
+ "windows-interface",
+ "windows-link",
+ "windows-result",
+ "windows-strings",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
+dependencies = [
+ "windows-core",
+ "windows-link",
+ "windows-threading",
+]
+
+[[package]]
+name = "windows-implement"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "windows-interface"
+version = "0.59.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
+
+[[package]]
+name = "windows-numerics"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
+dependencies = [
+ "windows-core",
+ "windows-link",
+]
+
+[[package]]
+name = "windows-result"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-strings"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.60.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
+dependencies = [
+ "windows-targets 0.53.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
+dependencies = [
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
+]
+
+[[package]]
+name = "windows-threading"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+
+[[package]]
+name = "winnow"
+version = "0.5.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winnow"
+version = "0.7.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "winreg"
+version = "0.50.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "wit-bindgen"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+
+[[package]]
+name = "writeable"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
+
+[[package]]
+name = "wyz"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed"
+dependencies = [
+ "tap",
+]
+
+[[package]]
+name = "xml-rs"
+version = "0.8.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ae8337f8a065cfc972643663ea4279e04e7256de865aa66fe25cec5fb912d3f"
+
+[[package]]
+name = "xxhash-rust"
+version = "0.8.15"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdd20c5420375476fbd4394763288da7eb0cc0b8c11deed431a91562af7335d3"
+
+[[package]]
+name = "yoke"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
+dependencies = [
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+ "synstructure",
+]
+
+[[package]]
+name = "zerocopy"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.8.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50cc42e0333e05660c3587f3bf9d0478688e15d870fab3346451ce7f8c9fbea5"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71e5d6e06ab090c67b5e44993ec16b72dcbaabc526db883a360057678b48502"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+ "synstructure",
+]
+
+[[package]]
+name = "zeroize"
+version = "1.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+
+[[package]]
+name = "zerotrie"
+version = "0.2.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.11.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.11.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.108",
+]
+
+[[package]]
+name = "zigzag"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70b40401a28d86ce16a330b863b86fd7dbee4d7c940587ab09ab8c019f9e3fdf"
+dependencies = [
+ "num-traits",
+]
diff --git a/pkgs/development/python-modules/opendal/default.nix b/pkgs/development/python-modules/opendal/default.nix
new file mode 100644
index 000000000000..81ea8ccc691a
--- /dev/null
+++ b/pkgs/development/python-modules/opendal/default.nix
@@ -0,0 +1,57 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  rustPlatform,
+
+  # tests
+  pytest-asyncio,
+  pytestCheckHook,
+  python-dotenv,
+}:
+buildPythonPackage rec {
+  pname = "opendal";
+  version = "0.46.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "apache";
+    repo = "opendal";
+    tag = "v${version}";
+    hash = "sha256-OQGpz6o4R0Yp+1vAgFtik/l7wvHwJNcB1BhZLk+BFPg=";
+  };
+
+  sourceRoot = "${src.name}/bindings/python";
+
+  postPatch = ''
+    ln -s ${./Cargo.lock} Cargo.lock
+  '';
+
+  cargoDeps = rustPlatform.importCargoLock {
+    lockFile = ./Cargo.lock;
+  };
+
+  env = {
+    PYO3_USE_ABI3_FORWARD_COMPATIBILITY = 1;
+  };
+
+  build-system = [
+    rustPlatform.cargoSetupHook
+    rustPlatform.maturinBuildHook
+  ];
+
+  pythonImportsCheck = [ "opendal" ];
+
+  nativeCheckInputs = [
+    pytest-asyncio
+    pytestCheckHook
+    python-dotenv
+  ];
+
+  meta = {
+    description = "native Python binding for Apache OpenDAL";
+    homepage = "https://github.com/apache/opendal/blob/main/bindings/python";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a0909cc2a4fc..a271c4f89dac 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11070,6 +11070,8 @@ self: super: with self; {
     }
   );
 
+  opendal = callPackage ../development/python-modules/opendal { };
+
   openerz-api = callPackage ../development/python-modules/openerz-api { };
 
   openevsewifi = callPackage ../development/python-modules/openevsewifi { };

From c81e711d7f51c4ca5a67fdb86f1e75be0fd5efe6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 22:20:37 +0000
Subject: [PATCH 5710/6226] steel: 0-unstable-2025-10-24 ->
 0-unstable-2025-11-04

---
 pkgs/by-name/st/steel/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/st/steel/package.nix b/pkgs/by-name/st/steel/package.nix
index 22c890941c55..7f09db24af69 100644
--- a/pkgs/by-name/st/steel/package.nix
+++ b/pkgs/by-name/st/steel/package.nix
@@ -19,16 +19,16 @@
 }:
 rustPlatform.buildRustPackage {
   pname = "steel";
-  version = "0-unstable-2025-10-24";
+  version = "0-unstable-2025-11-04";
 
   src = fetchFromGitHub {
     owner = "mattwparas";
     repo = "steel";
-    rev = "0b89c955668a48e8aab4344d5f7d3a44360ec73e";
-    hash = "sha256-hbjCJeWJi71mY+2oW8KOIuYppYL2YIhwImm8GFxD9O4=";
+    rev = "ee5c58b83ff46738e3fb9990138b88abe5286b07";
+    hash = "sha256-eFa3R7G9GkanWMA6g7miu983tyXQVmt69tyhaftEJOU=";
   };
 
-  cargoHash = "sha256-CrmQhOfh7SQ5GvBywmYkfU6wMlgZq2x61+T+mIeQ7z4=";
+  cargoHash = "sha256-RCFLN0+59FV2fs0zGi1uuHt7B6DZUROFxisqoEQsT7U=";
 
   nativeBuildInputs = [
     curl

From 52e70679936f31b4db9e9f3eec531cafd36c0e48 Mon Sep 17 00:00:00 2001
From: qubitnano <146656568+qubitnano@users.noreply.github.com>
Date: Wed, 5 Nov 2025 17:24:57 -0500
Subject: [PATCH 5711/6226] shipwright: 9.1.0 -> 9.1.1

https://github.com/HarbourMasters/Shipwright/releases/tag/9.1.1
---
 pkgs/by-name/sh/shipwright/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sh/shipwright/package.nix b/pkgs/by-name/sh/shipwright/package.nix
index 8f97165fbc91..1d7398fa6832 100644
--- a/pkgs/by-name/sh/shipwright/package.nix
+++ b/pkgs/by-name/sh/shipwright/package.nix
@@ -118,12 +118,12 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "shipwright";
-  version = "9.1.0";
+  version = "9.1.1";
   src = fetchFromGitHub {
     owner = "harbourmasters";
     repo = "shipwright";
     tag = finalAttrs.version;
-    hash = "sha256-sRUg6wa0KOG+hoR+6QEVyPe/9O9yEefNB69BMO+H+iU=";
+    hash = "sha256-TEP2YNKUuAnvLg+aDOkMmYfPQIjUXWYOhprfqsr8EgQ=";
     fetchSubmodules = true;
     deepClone = true;
     postFetch = ''

From e7e1c05387647e83e4e08597504f1ee3ed213425 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:09:45 -0300
Subject: [PATCH 5712/6226] lxqt.libfm-qt: 2.2.0 -> 2.3.0

Diff: https://github.com/lxqt/libfm-qt/compare/2.2.0...2.3.0
---
 pkgs/desktops/lxqt/libfm-qt/default.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/lxqt/libfm-qt/default.nix b/pkgs/desktops/lxqt/libfm-qt/default.nix
index 1bbec0fcda3b..16c946f919be 100644
--- a/pkgs/desktops/lxqt/libfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/libfm-qt/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   libXdmcp,
   libexif,
@@ -16,7 +15,7 @@
   qttools,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "2.2.0",
+  version ? "2.3.0",
   qtx11extras ? null,
 }:
 
@@ -31,21 +30,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash =
       {
         "1.4.0" = "sha256-QxPYSA7537K+/dRTxIYyg+Q/kj75rZOdzlUsmSdQcn4=";
-        "2.2.0" = "sha256-xLXHwrcMJ8PObZ2qWVZTf9FREcjUi5qtcCJgNHj391Q=";
+        "2.3.0" = "sha256-A0kBwLiPvHIsJWQvg6lwb5lrojU8oDDQYHuC2pTXdPc=";
       }
       ."${finalAttrs.version}";
   };
 
-  patches = lib.optionals (finalAttrs.version == "2.2.0") [
-    # fix build against Qt >= 6.10 (https://github.com/lxqt/libfm-qt/pull/1060)
-    # TODO: drop when upgrading beyond version 2.2.0
-    (fetchpatch {
-      name = "cmake-fix-build-with-Qt-6.10.patch";
-      url = "https://github.com/lxqt/libfm-qt/commit/3bcbae5831f5ce3d2f06dc370f0c2ad0026ae82a.patch";
-      hash = "sha256-nTuPXlkP7AzC8R4OHfQx6/kxPsDjaw7tGzQGyiYqQSQ=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config

From 5076aba35cb86a055655d9d93db530e56d4c7515 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:09:50 -0300
Subject: [PATCH 5713/6226] lxqt.liblxqt: 2.2.0 -> 2.3.0

Diff: https://github.com/lxqt/liblxqt/compare/2.2.0...2.3.0
---
 pkgs/desktops/lxqt/liblxqt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/liblxqt/default.nix b/pkgs/desktops/lxqt/liblxqt/default.nix
index 77e9be0f687f..a859514c9b7d 100644
--- a/pkgs/desktops/lxqt/liblxqt/default.nix
+++ b/pkgs/desktops/lxqt/liblxqt/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "liblxqt";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "liblxqt";
     rev = version;
-    hash = "sha256-04t6wssTuSKlqSuUTmcDU66NVGikWh7p2irWBngN494=";
+    hash = "sha256-KAteTQRJ7xfh21tYcNoZjvLfWSiUYboasqL5D4YKARo=";
   };
 
   nativeBuildInputs = [

From 2d827c5ddf6783d251394061069499d54dfc3901 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:09:53 -0300
Subject: [PATCH 5714/6226] lxqt.libqtxdg: 4.2.0 -> 4.3.0

Diff: https://github.com/lxqt/libqtxdg/compare/4.2.0...4.3.0
---
 pkgs/desktops/lxqt/libqtxdg/default.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
index 891ab5149f5a..ab9038c110fb 100644
--- a/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -2,14 +2,13 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   qtbase,
   qtsvg,
   lxqt-build-tools,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "4.2.0",
+  version ? "4.3.0",
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -23,21 +22,11 @@ stdenv.mkDerivation (finalAttrs: {
     hash =
       {
         "3.12.0" = "sha256-y+3noaHubZnwUUs8vbMVvZPk+6Fhv37QXUb//reedCU=";
-        "4.2.0" = "sha256-TSyVYlWsmB/6gxJo+CjROBQaWsmYZAwkM8BwiWP+XBI=";
+        "4.3.0" = "sha256-aec+NjKkaH8dI0cFVxGehdRGO2aH6BD+aix+IvD+2LI=";
       }
       ."${finalAttrs.version}";
   };
 
-  patches = lib.optionals (finalAttrs.version == "4.2.0") [
-    # fix build against Qt >= 6.10 (https://github.com/lxqt/libqtxdg/pull/313)
-    # TODO: drop when upgrading beyond version 4.2.0
-    (fetchpatch {
-      name = "cmake-fix-build-with-Qt-6.10.patch";
-      url = "https://github.com/lxqt/libqtxdg/commit/b01a024921acdfd5b0e97d5fda2933c726826e99.patch";
-      hash = "sha256-njpn6pU9BHlfYfkw/jEwh8w3Wo1F8MlRU8iQB+Tz2zU=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     lxqt-build-tools

From 29bbbe8edb5122e20e024290fd940ef9c954efa0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:10:03 -0300
Subject: [PATCH 5715/6226] lxqt.lximage-qt: 2.2.0 -> 2.3.0

Diff: https://github.com/lxqt/lximage-qt/compare/2.2.0...2.3.0
---
 pkgs/desktops/lxqt/lximage-qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lximage-qt/default.nix b/pkgs/desktops/lxqt/lximage-qt/default.nix
index 3bd04943d3e0..ea2e137cdad0 100644
--- a/pkgs/desktops/lxqt/lximage-qt/default.nix
+++ b/pkgs/desktops/lxqt/lximage-qt/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lximage-qt";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lximage-qt";
     rev = version;
-    hash = "sha256-4j/5z+kePFXubYXAbIaWYVU+plJv1xEpHHI1IXqbQog=";
+    hash = "sha256-RJKXcaZJe5gyDubdglOmzmJ9XCH0gAW4fc7OR3anCoU=";
   };
 
   nativeBuildInputs = [

From 75315741d15c57a1ca7b0ccc20914a49e0b59e3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:10:07 -0300
Subject: [PATCH 5716/6226] lxqt.lxqt-about: 2.2.0 -> 2.3.0

Diff: https://github.com/lxqt/lxqt-about/compare/2.2.0...2.3.0
---
 pkgs/desktops/lxqt/lxqt-about/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-about/default.nix b/pkgs/desktops/lxqt/lxqt-about/default.nix
index 868b41f1033a..8f54b81c124d 100644
--- a/pkgs/desktops/lxqt/lxqt-about/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-about/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-about";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-about";
     rev = version;
-    hash = "sha256-StPepm6XWaK1kDAspnBJ4X1/QGqHmSj48RBobJ46Sao=";
+    hash = "sha256-EP0Sd/VvLufqtn/7ZQwdI/h+BJhkGks7jTlEoEqYWgk=";
   };
 
   nativeBuildInputs = [

From 319b7a4b711b026bda88bf88f3d9179831e6b46e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:10:12 -0300
Subject: [PATCH 5717/6226] lxqt.lxqt-admin: 2.2.0 -> 2.3.0

Diff: https://github.com/lxqt/lxqt-admin/compare/2.2.0...2.3.0
---
 pkgs/desktops/lxqt/lxqt-admin/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-admin/default.nix b/pkgs/desktops/lxqt/lxqt-admin/default.nix
index e3fd0d11679f..6aadcee69e73 100644
--- a/pkgs/desktops/lxqt/lxqt-admin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-admin/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-admin";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-admin";
     rev = version;
-    hash = "sha256-Yne4EWP/bgWXa4XNP8oyUtkOfxBRcT4iuV8CpSq2ooY=";
+    hash = "sha256-FzYKmqCd61jLfbyPknsWuf7KpdF+SoAMqeSEZPOYc8w=";
   };
 
   nativeBuildInputs = [

From 517f73ab8b6717b0ca3eb7d07f41a50685c36d11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:10:17 -0300
Subject: [PATCH 5718/6226] lxqt.lxqt-archiver: 1.2.0 -> 1.3.0

Diff: https://github.com/lxqt/lxqt-archiver/compare/1.2.0...1.3.0
---
 pkgs/desktops/lxqt/lxqt-archiver/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-archiver/default.nix b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
index a2c56c066b66..e3fbd1845239 100644
--- a/pkgs/desktops/lxqt/lxqt-archiver/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-archiver/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-archiver";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-archiver";
     rev = version;
-    hash = "sha256-4xGP/3ft29PFzJ3ty/9wJbv/hqcdTw9U+4xDneKHF8g=";
+    hash = "sha256-57ufvirD1YYEVoFtX/JY8EnMRWZ4ouhbxNm8przg5XA=";
   };
 
   nativeBuildInputs = [

From 8142ce46f499899cf61038399a18d329fff81d12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:10:22 -0300
Subject: [PATCH 5719/6226] lxqt.lxqt-build-tools: 2.2.1 -> 2.3.0

Diff: https://github.com/lxqt/lxqt-build-tools/compare/2.2.1...2.3.0
---
 pkgs/desktops/lxqt/lxqt-build-tools/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
index e08032f99160..32cf1a6aabd1 100644
--- a/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-build-tools/default.nix
@@ -9,7 +9,7 @@
   perl,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "2.2.1",
+  version ? "2.3.0",
 }:
 
 stdenv.mkDerivation rec {
@@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
     hash =
       {
         "0.13.0" = "sha256-4/hVlEdqqqd6CNitCRkIzsS1R941vPJdirIklp4acXA=";
-        "2.2.1" = "sha256-dewsmkma8QHgb3LzRGvfntI48bOaFFsrEDrOznaC8eg=";
+        "2.3.0" = "sha256-lbDcIOrOkGU/n0bPPAlZSsdBYMlBh3afXwwTkTWQLpo=";
       }
       ."${version}";
   };
@@ -34,7 +34,7 @@ stdenv.mkDerivation rec {
     substituteInPlace cmake/modules/LXQtCompilerSettings.cmake \
       --replace-fail AppleClang Clang
   ''
-  + lib.optionalString (lib.versionOlder version "2.2.1") ''
+  + lib.optionalString (lib.versionOlder version "2.3.0") ''
     substituteInPlace CMakeLists.txt \
       --replace-fail "cmake_minimum_required(VERSION 3.1.0 FATAL_ERROR)" "cmake_minimum_required(VERSION 3.10)"
   '';

From 49e413f4f073e04cfd97df626dd9fea31f83c85c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:10:29 -0300
Subject: [PATCH 5720/6226] lxqt.lxqt-config: 2.2.0 -> 2.3.0

Diff: https://github.com/lxqt/lxqt-config/compare/2.2.0...2.3.0
---
 pkgs/desktops/lxqt/lxqt-config/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-config/default.nix b/pkgs/desktops/lxqt/lxqt-config/default.nix
index e5fe0ca54639..60ffcdf745a9 100644
--- a/pkgs/desktops/lxqt/lxqt-config/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-config/default.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-config";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-config";
     rev = version;
-    hash = "sha256-iyAqdAWcg94a65lPjq412slvSKdP3W62LTyyvYdWipA=";
+    hash = "sha256-2CAQeX2X0DPmgOaAEJoCLtgjFT+Z6epc/dUCbaEIlB0=";
   };
 
   nativeBuildInputs = [

From 7c9b8753589d31c1224c4a0647d27cad59b4b9ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:10:32 -0300
Subject: [PATCH 5721/6226] lxqt.lxqt-globalkeys: 2.2.0 -> 2.3.0

Diff: https://github.com/lxqt/lxqt-globalkeys/compare/2.2.0...2.3.0
---
 pkgs/desktops/lxqt/lxqt-globalkeys/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
index c6b75a2f0ed4..4fffc7cfcacf 100644
--- a/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-globalkeys/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-globalkeys";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-globalkeys";
     rev = version;
-    hash = "sha256-xVirPi0UD4lzOA1+Gw7SgUvFRIc1KYFUJtljNA7xAWo=";
+    hash = "sha256-ahRKkWmr6BkSByE5Vm5oqkkgQQ0Hyh4Ka7PYI8Es7AY=";
   };
 
   nativeBuildInputs = [

From a108b6dc10e08686b677f5de61d507d94b847efb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:10:40 -0300
Subject: [PATCH 5722/6226] lxqt.lxqt-menu-data: 2.2.0 -> 2.3.0

Diff: https://github.com/lxqt/lxqt-menu-data/compare/2.2.0...2.3.0
---
 pkgs/desktops/lxqt/lxqt-menu-data/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
index 1a55737e7e44..9a01fd5dc1a4 100644
--- a/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-menu-data/default.nix
@@ -11,13 +11,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-menu-data";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-menu-data";
     rev = version;
-    hash = "sha256-kFgrR7BSl08REC9SgBvLYFhJ9H++FCDQdqQaoAm5Oyw=";
+    hash = "sha256-9TYW3VA4qGlrkUzgZGkxf8RkIW2cTLkY6H8JHGDnoLg=";
   };
 
   nativeBuildInputs = [

From ad4b56b3ff43f60abd65e1e31401a3178d4abe07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:10:45 -0300
Subject: [PATCH 5723/6226] lxqt.lxqt-notificationd: 2.2.0 -> 2.3.0

Diff: https://github.com/lxqt/lxqt-notificationd/compare/2.2.0...2.3.0
---
 pkgs/desktops/lxqt/lxqt-notificationd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
index 693e065083d2..dfa381ece604 100644
--- a/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-notificationd/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-notificationd";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-notificationd";
     rev = version;
-    hash = "sha256-pMBshwqfG/8tvpwuR3wCQ/N5IT1rXJl+nZfcSqxMjM0=";
+    hash = "sha256-VmPVGqCmkTkib2T5ysov1hUY3J74GTuXdJsn5Sivreo=";
   };
 
   nativeBuildInputs = [

From 7d7ec43ed5b541fe850024b8f57e77f0870dc69f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:10:51 -0300
Subject: [PATCH 5724/6226] lxqt.lxqt-openssh-askpass: 2.2.0 -> 2.3.0

Diff: https://github.com/lxqt/lxqt-openssh-askpass/compare/2.2.0...2.3.0
---
 pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
index 01d02e823405..9d4c22452038 100644
--- a/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-openssh-askpass/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-openssh-askpass";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-openssh-askpass";
     rev = version;
-    hash = "sha256-ktB8zlrK3ymnwoGSnWNHM6EGcwn4btdlyBQzBLQdqmY=";
+    hash = "sha256-f8v9HBuL78YOauipCnMRIEydudFilpFJz+KgMlnJWGU=";
   };
 
   nativeBuildInputs = [

From d89c86b0201492750c22eec74037eb78f803bfa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:11:02 -0300
Subject: [PATCH 5725/6226] lxqt.lxqt-panel: 2.2.2 -> 2.3.0

Diff: https://github.com/lxqt/lxqt-panel/compare/2.2.2...2.3.0
---
 pkgs/desktops/lxqt/lxqt-panel/default.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-panel/default.nix b/pkgs/desktops/lxqt/lxqt-panel/default.nix
index b5893196071a..74072939347d 100644
--- a/pkgs/desktops/lxqt/lxqt-panel/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-panel/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   pkg-config,
   alsa-lib,
@@ -36,25 +35,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lxqt-panel";
-  version = "2.2.2";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-panel";
     tag = finalAttrs.version;
-    hash = "sha256-ui+HD2igPiyIOgIKPbgfO4dnfm2rFP/R6oG2pH5g5VY=";
+    hash = "sha256-cwemHe092vNRDeseXkGoWAEXawNTVbSiB87owfaLeAo=";
   };
 
-  patches = [
-    # fix build against Qt >= 6.10 (https://github.com/lxqt/lxqt-panel/pull/2306)
-    # TODO: drop when upgrading beyond version 2.2.2
-    (fetchpatch {
-      name = "cmake-fix-build-with-Qt-6.10.patch";
-      url = "https://github.com/lxqt/lxqt-panel/commit/fce8cd99a1de0e637e8539c4d8ac68832a40fa6d.patch";
-      hash = "sha256-KXxV6SZqdpvZSn+zbBZ32Qs6XKfFXEej1F4qBt+MzxA=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     pkg-config

From b3f282bd701cb4aaf39a6bbaa1babcefa12849e2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:11:07 -0300
Subject: [PATCH 5726/6226] lxqt.lxqt-policykit: 2.2.0 -> 2.3.0

Diff: https://github.com/lxqt/lxqt-policykit/compare/2.2.0...2.3.0
---
 pkgs/desktops/lxqt/lxqt-policykit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
index 6866e0508b69..fda806a7b9ac 100644
--- a/pkgs/desktops/lxqt/lxqt-policykit/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-policykit/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-policykit";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-policykit";
     rev = version;
-    hash = "sha256-TVgrr+Qakkk0rr7qwQPQNO7p5Wx6eVW8lK2gJ/HysZY=";
+    hash = "sha256-Hk8ig9x1UIKpugbJ2x16DsbCmRT0I1AnX/Y5lvP5u4Q=";
   };
 
   nativeBuildInputs = [

From f1d6a2ac4bb58c2f5e6a4b8095e2339f1ba3addf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:11:11 -0300
Subject: [PATCH 5727/6226] lxqt.lxqt-powermanagement: 2.2.1 -> 2.3.0

Diff: https://github.com/lxqt/lxqt-powermanagement/compare/2.2.1...2.3.0
---
 pkgs/desktops/lxqt/lxqt-powermanagement/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
index f467a2f42158..f34466040617 100644
--- a/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-powermanagement/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-powermanagement";
-  version = "2.2.1";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-powermanagement";
     rev = version;
-    hash = "sha256-Awk/NlYd8HldmEL0G/LUgj101Y1BTQBrDJfG56Y/aX4=";
+    hash = "sha256-1TA9v2zrPoHiKUy6P4enmzvxWTD+/rGjrChE5WGMt3c=";
   };
 
   nativeBuildInputs = [

From 01e1f5e1d1c59dac14a292efedeecce09112f57e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:11:15 -0300
Subject: [PATCH 5728/6226] lxqt.lxqt-qtplugin: 2.2.0 -> 2.3.0

Diff: https://github.com/lxqt/lxqt-qtplugin/compare/2.2.0...2.3.0
---
 pkgs/desktops/lxqt/lxqt-qtplugin/default.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
index db6a8b2ae8bb..4765a792c437 100644
--- a/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-qtplugin/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   libdbusmenu-lxqt,
   libfm-qt,
@@ -17,25 +16,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "lxqt-qtplugin";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-qtplugin";
     tag = finalAttrs.version;
-    hash = "sha256-qXadz9JBk4TURAWj6ByP/lGV1u0Z6rNJ/VraBh5zY+Q=";
+    hash = "sha256-3rY9VpZKnl1E3ma1ioiKECpazeymQYVuXrLXhRL407o=";
   };
 
-  patches = [
-    # fix build against Qt >= 6.10 (https://github.com/lxqt/lxqt-qtplugin/pull/100)
-    # TODO: drop when upgrading beyond version 2.2.0
-    (fetchpatch {
-      name = "cmake-fix-build-with-Qt-6.10.patch";
-      url = "https://github.com/lxqt/lxqt-qtplugin/commit/90473945206dbf21816a00dfba27426a5b5a9e25.patch";
-      hash = "sha256-cCghOJHsveR5IYisEFv3h8WreRDi0kuyj/2YBD+ATsc=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     lxqt-build-tools

From c64220f167afc909e9074783408bc338c55e4e9c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:11:20 -0300
Subject: [PATCH 5729/6226] lxqt.lxqt-runner: 2.2.0 -> 2.3.0

Diff: https://github.com/lxqt/lxqt-runner/compare/2.2.0...2.3.0
---
 pkgs/desktops/lxqt/lxqt-runner/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-runner/default.nix b/pkgs/desktops/lxqt/lxqt-runner/default.nix
index 7135a93c32f9..4c53248cac49 100644
--- a/pkgs/desktops/lxqt/lxqt-runner/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-runner/default.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-runner";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-runner";
     rev = version;
-    hash = "sha256-lvJuqwBqR/OqDsk2XdjIakxIrnOZjgWrY5DtMUV5XEM=";
+    hash = "sha256-h+pZiSuCdQknsyfUb9Ve1yxVyOUqNgYhIpO7kD5z3pQ=";
   };
 
   nativeBuildInputs = [

From 0e6bfc23c276e10a76c397cf1e5c79a56fa4318f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:11:27 -0300
Subject: [PATCH 5730/6226] lxqt.lxqt-session: 2.2.0 -> 2.3.0

Diff: https://github.com/lxqt/lxqt-session/compare/2.2.0...2.3.0
---
 pkgs/desktops/lxqt/lxqt-session/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix
index eabe94b4b2bb..647d3889e166 100644
--- a/pkgs/desktops/lxqt/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-session/default.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-session";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-session";
     rev = version;
-    hash = "sha256-AwL7X8ygBkVINMCEcyImUrbwmk/T6/fwk0PEEu6iBb8=";
+    hash = "sha256-5VJxRho6qdPvBFr0RkYaajvVZRwhc1emzqpII+lUyOQ=";
   };
 
   nativeBuildInputs = [

From cfa02911722c412ab60de565cbe1703a066afd5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:11:32 -0300
Subject: [PATCH 5731/6226] lxqt.lxqt-sudo: 2.2.0 -> 2.3.0

Diff: https://github.com/lxqt/lxqt-sudo/compare/2.2.0...2.3.0
---
 pkgs/desktops/lxqt/lxqt-sudo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-sudo/default.nix b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
index f98f7c43fdc9..0f56e6889df8 100644
--- a/pkgs/desktops/lxqt/lxqt-sudo/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-sudo/default.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-sudo";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-sudo";
     rev = version;
-    hash = "sha256-H2uprArYfiX1KyoWx3RRHkLcA0z9LKGDeghD+085VC4=";
+    hash = "sha256-skxPI6KEHXJReadxQinBArkCx/FjpTYDFdEpRRiqx8E=";
   };
 
   nativeBuildInputs = [

From b26f17d7ef929e22d40bce5c391984a21eafd0ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:13:53 -0300
Subject: [PATCH 5732/6226] lxqt.lxqt-themes: 2.2.0 -> 2.3.0

Diff: https://github.com/lxqt/lxqt-themes/compare/2.2.0...2.3.0
---
 pkgs/desktops/lxqt/lxqt-themes/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-themes/default.nix b/pkgs/desktops/lxqt/lxqt-themes/default.nix
index f64395c948f9..d004f4d19d32 100644
--- a/pkgs/desktops/lxqt/lxqt-themes/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-themes/default.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-themes";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-themes";
     rev = version;
-    hash = "sha256-oarj+byRfe9xHvtw80kifA2AspXHfigbuDwvi5xqrMQ=";
+    hash = "sha256-sdfLwLYE29Qh0QCU6t5pKIyW2RYx32WRNvNV46nCaXo=";
   };
 
   nativeBuildInputs = [

From 44b7c55d5cc7d59d00ab8229a8a638e527c07038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:15:14 -0300
Subject: [PATCH 5733/6226] lxqt.lxqt-wayland-session: 0.2.0 -> 0.3.0

Diff: https://github.com/lxqt/lxqt-wayland-session/compare/0.2.0...0.3.0
---
 pkgs/desktops/lxqt/lxqt-wayland-session/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
index 1a4fe48c72e2..20ba7d6d4426 100644
--- a/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-wayland-session/default.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "lxqt-wayland-session";
-  version = "0.2.0";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "lxqt-wayland-session";
     rev = version;
-    hash = "sha256-VjOLw6ByS0se9jy1VY4xhBSs26yvoffFVAc1v0gMyYk=";
+    hash = "sha256-MmiYPclMW8Y9VMZsY8wx52S3fN3RzUVrhQAGs5qSTfI=";
   };
 
   nativeBuildInputs = [

From 35acc7b8d35644f10c1c27ec1a5a076645e6526e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:15:24 -0300
Subject: [PATCH 5734/6226] lxqt.pavucontrol-qt: 2.2.0 -> 2.3.0

Diff: https://github.com/lxqt/pavucontrol-qt/compare/2.2.0...2.3.0
---
 pkgs/desktops/lxqt/pavucontrol-qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
index 74937bcfb22d..35de208fb41c 100644
--- a/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
+++ b/pkgs/desktops/lxqt/pavucontrol-qt/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pavucontrol-qt";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "pavucontrol-qt";
     rev = version;
-    hash = "sha256-D8x3CqzttlNqQgy6k4hfjJkD/MjAG4eeCn68TQA8NSM=";
+    hash = "sha256-6t7nbuC/13S+Q9mINP1WuyaDqZUKp4s9LObcbSRuJ1c=";
   };
 
   nativeBuildInputs = [

From ac3dd39a3c223e18d7442fdced346efe77d7cb01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:15:32 -0300
Subject: [PATCH 5735/6226] lxqt.pcmanfm-qt: 2.2.0 -> 2.3.0

Diff: https://github.com/lxqt/pcmanfm-qt/compare/2.2.0...2.3.0
---
 pkgs/desktops/lxqt/pcmanfm-qt/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
index 2d6f3094be2c..0e64b9e10c79 100644
--- a/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
+++ b/pkgs/desktops/lxqt/pcmanfm-qt/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec {
   pname = "pcmanfm-qt";
-  version = "2.2.0";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "pcmanfm-qt";
     rev = version;
-    hash = "sha256-mYjbOb9c7Qc3qhVYt1EHy50YOVguLnwg0NJg2zBgwOM=";
+    hash = "sha256-Pv3N/JfUbLyCBpnmnEHL7i2du1q8vSKxTR1uIEsEe/U=";
   };
 
   nativeBuildInputs = [

From 3f06d90c6bb32ca29e7bca17a2192ee7d2fb14c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:16:12 -0300
Subject: [PATCH 5736/6226] lxqt.qps: 2.11.1 -> 2.12.0

Diff: https://github.com/lxqt/qps/compare/2.11.1...2.12.0
---
 pkgs/desktops/lxqt/qps/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/qps/default.nix b/pkgs/desktops/lxqt/qps/default.nix
index 7fa62fb0c3e5..bc21f9b95447 100644
--- a/pkgs/desktops/lxqt/qps/default.nix
+++ b/pkgs/desktops/lxqt/qps/default.nix
@@ -17,13 +17,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qps";
-  version = "2.11.1";
+  version = "2.12.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "qps";
     rev = version;
-    hash = "sha256-uWKTcFO5CoTU5jXB9x5tQ0goEvUpMaeUlMlTG2/xvYg=";
+    hash = "sha256-npTkPcjcxi/hAxUtyayEZeUnVx41iRJThKzhidC+4bQ=";
   };
 
   nativeBuildInputs = [

From 17d9feb8672b3408cf1a0a8e502632e3baf40cb0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:16:21 -0300
Subject: [PATCH 5737/6226] lxqt.qterminal: 2.2.1 -> 2.3.0

Diff: https://github.com/lxqt/qterminal/compare/2.2.1...2.3.0
---
 pkgs/desktops/lxqt/qterminal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/qterminal/default.nix b/pkgs/desktops/lxqt/qterminal/default.nix
index d3bdb38a5c04..502f13516799 100644
--- a/pkgs/desktops/lxqt/qterminal/default.nix
+++ b/pkgs/desktops/lxqt/qterminal/default.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qterminal";
-  version = "2.2.1";
+  version = "2.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "qterminal";
     rev = version;
-    hash = "sha256-H1UmPIZG8KiVNPW3GqgnSq39JsZeowiAVwwEKwCkWoM=";
+    hash = "sha256-HwWgVcO9swywei8Z3ifoGJjZ785gdF2A/kBHm4zgzFc=";
   };
 
   nativeBuildInputs = [

From 315f14d5dde4e68f83f971608e98e868ec906048 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:16:35 -0300
Subject: [PATCH 5738/6226] lxqt.qtermwidget: 2.2.0 -> 2.3.0

Diff: https://github.com/lxqt/qtermwidget/compare/2.2.0...2.3.0
---
 pkgs/desktops/lxqt/qtermwidget/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/qtermwidget/default.nix b/pkgs/desktops/lxqt/qtermwidget/default.nix
index 594665c1b20a..75aaee511936 100644
--- a/pkgs/desktops/lxqt/qtermwidget/default.nix
+++ b/pkgs/desktops/lxqt/qtermwidget/default.nix
@@ -8,7 +8,7 @@
   lxqt-build-tools,
   wrapQtAppsHook,
   gitUpdater,
-  version ? "2.2.0",
+  version ? "2.3.0",
 }:
 
 stdenv.mkDerivation rec {
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
     hash =
       {
         "1.4.0" = "sha256-wYUOqAiBjnupX1ITbFMw7sAk42V37yDz9SrjVhE4FgU=";
-        "2.2.0" = "sha256-tzgHNGB063rgFB15lHTKQplNhwJZtrRprUhMm5H62AA=";
+        "2.3.0" = "sha256-l+IFXiUst9PDNuD/KGzxYCUjymhWvcpMY9CF60gIfKg=";
       }
       ."${version}";
   };

From c12f1c63a6515895f79a42fcc52cbd80114f3454 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:16:40 -0300
Subject: [PATCH 5739/6226] lxqt.qtxdg-tools: 4.2.0 -> 4.3.0

Diff: https://github.com/lxqt/qtxdg-tools/compare/4.2.0...4.3.0
---
 pkgs/desktops/lxqt/qtxdg-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/qtxdg-tools/default.nix b/pkgs/desktops/lxqt/qtxdg-tools/default.nix
index ec94d18a1710..eb7c1261fa5a 100644
--- a/pkgs/desktops/lxqt/qtxdg-tools/default.nix
+++ b/pkgs/desktops/lxqt/qtxdg-tools/default.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qtxdg-tools";
-  version = "4.2.0";
+  version = "4.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "qtxdg-tools";
     rev = version;
-    hash = "sha256-hVX1UfPWa1KHMhjazSopAc1/Kk3tnUQzwtG4P7K32eE=";
+    hash = "sha256-v6mIpGuZ3YFb+P9FLlgNp5xf0ceAaVnMxRG+sQLP72Y=";
   };
 
   nativeBuildInputs = [

From c39bc84a30811d30aa56bc771d695383519ed7bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:16:58 -0300
Subject: [PATCH 5740/6226] lxqt.xdg-desktop-portal-lxqt: 1.2.0 -> 1.3.0

Diff: https://github.com/lxqt/xdg-desktop-portal-lxqt/compare/1.2.0...1.3.0
---
 .../lxqt/xdg-desktop-portal-lxqt/default.nix      | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
index 2836344f6ddc..9a45f570dbf7 100644
--- a/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
+++ b/pkgs/desktops/lxqt/xdg-desktop-portal-lxqt/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   kwindowsystem,
   libexif,
@@ -17,25 +16,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xdg-desktop-portal-lxqt";
-  version = "1.2.0";
+  version = "1.3.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "xdg-desktop-portal-lxqt";
     tag = finalAttrs.version;
-    hash = "sha256-y3VqDuFagKcG8O5m5qjRGtlUZXfIXV0tclvZLChhWkg=";
+    hash = "sha256-DNlvqZzTzZURuHTURBUXaLvMKy2HxVpgI9JwJq6A5Sw=";
   };
 
-  patches = [
-    # fix build against Qt >= 6.10 (https://github.com/lxqt/xdg-desktop-portal-lxqt/pull/50)
-    # TODO: drop when upgrading beyond version 1.2.0
-    (fetchpatch {
-      name = "cmake-fix-build-with-Qt-6.10.patch";
-      url = "https://github.com/lxqt/xdg-desktop-portal-lxqt/commit/15fae3c57a8e8149ef19a8c919f5728016390e3f.patch";
-      hash = "sha256-oReYMEr+tBDHtnFDZahBwTtzgtL/BABZO64yob9tem4=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     wrapQtAppsHook

From ed676ede30ed91f43c44cfcb6ee46e01f5a9819b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:17:50 -0300
Subject: [PATCH 5741/6226] lxqt.screengrab: 3.0.0 -> 3.1.0

Diff: https://github.com/lxqt/screengrab/compare/3.0.0...3.1.0
---
 pkgs/desktops/lxqt/screengrab/default.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/desktops/lxqt/screengrab/default.nix b/pkgs/desktops/lxqt/screengrab/default.nix
index e93d0afce933..292985ceb2db 100644
--- a/pkgs/desktops/lxqt/screengrab/default.nix
+++ b/pkgs/desktops/lxqt/screengrab/default.nix
@@ -2,7 +2,6 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   autoPatchelfHook,
   gitUpdater,
@@ -23,25 +22,15 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "screengrab";
-  version = "3.0.0";
+  version = "3.1.0";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = "screengrab";
     tag = finalAttrs.version;
-    hash = "sha256-6cGj3Ijv4DsAdJjcHKUg5et+yYc5miIHHZOTD2D9ASk=";
+    hash = "sha256-LORWv3qLgQF2feKodOg72g5DCfWZvB8vi0bw9jbr+tQ=";
   };
 
-  patches = [
-    # fix build against Qt >= 6.10 (https://github.com/lxqt/screengrab/pull/434)
-    # TODO: drop when upgrading beyond version 3.0.0
-    (fetchpatch {
-      name = "cmake-fix-build-with-Qt-6.10.patch";
-      url = "https://github.com/lxqt/screengrab/commit/1621ef5df9461cdd1dcef3faee36e9419f1ca08c.patch";
-      hash = "sha256-+rpCDLnHmgy/1PME3QaN+978W+jR6PDmiZ/5hAx8Djg=";
-    })
-  ];
-
   nativeBuildInputs = [
     cmake
     lxqt-build-tools

From 758557d74b60c09607984d8b190d6a5cf9de2993 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Wed, 5 Nov 2025 18:18:10 -0300
Subject: [PATCH 5742/6226] lxqt.qlipper: 5.1.2-unstable-2025-10-29 -> 5.1.2

Diff: https://github.com/pvanek/qlipper/compare/4e9fcfe6684c465944baa153aeb7603ec27728b1...4e9fcfe6684c465944baa153aeb7603ec27728b1
---
 pkgs/desktops/lxqt/qlipper/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/desktops/lxqt/qlipper/default.nix b/pkgs/desktops/lxqt/qlipper/default.nix
index 325864cd98df..ff55554a5335 100644
--- a/pkgs/desktops/lxqt/qlipper/default.nix
+++ b/pkgs/desktops/lxqt/qlipper/default.nix
@@ -12,7 +12,7 @@
 
 stdenv.mkDerivation {
   pname = "qlipper";
-  version = "5.1.2-unstable-2025-10-29";
+  version = "5.1.2";
 
   src = fetchFromGitHub {
     owner = "pvanek";

From bc905dffb221b5795f4dfe32cbf9278ba5154ddb Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Wed, 5 Nov 2025 22:22:11 +0000
Subject: [PATCH 5743/6226] doctest: disable tests on `isStatic` platforms

Without the change `doctest` can't be built as
https://hydra.nixos.org/build/311427996:

    [ 80%] Linking CXX shared library libimplementation.so
    ld: crtbeginT.o: relocation R_X86_64_32 against hidden symbol `__TMC_END__' can not be used when making a shared object
    ld: failed to set dynamic section sizes: bad value
    collect2: error: ld returned 1 exit status

Thus is fail `nixStatic` and `lixStatic` packages
in `master`. Let's disable tests that require
stared libraries.

ZHF: #457852
---
 pkgs/by-name/do/doctest/package.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/by-name/do/doctest/package.nix b/pkgs/by-name/do/doctest/package.nix
index 590252b0fdad..d9d8769f102b 100644
--- a/pkgs/by-name/do/doctest/package.nix
+++ b/pkgs/by-name/do/doctest/package.nix
@@ -29,6 +29,12 @@ stdenv.mkDerivation rec {
 
   nativeBuildInputs = [ cmake ];
 
+  cmakeFlags = lib.optionals stdenv.hostPlatform.isStatic [
+    # One of the examples tests shared library support
+    # and fails linking.
+    "-DDOCTEST_WITH_TESTS=OFF"
+  ];
+
   doCheck = true;
 
   # Fix the build with LLVM 21 / GCC 15.

From 6853b084fd09a4ccf8c726df779b3bebba07a1cd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 23:11:32 +0000
Subject: [PATCH 5744/6226] hledger-fmt: 0.3.5 -> 0.3.6

---
 pkgs/by-name/hl/hledger-fmt/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hl/hledger-fmt/package.nix b/pkgs/by-name/hl/hledger-fmt/package.nix
index 5f9315e3e493..2b7c4b31d4b1 100644
--- a/pkgs/by-name/hl/hledger-fmt/package.nix
+++ b/pkgs/by-name/hl/hledger-fmt/package.nix
@@ -9,20 +9,20 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "hledger-fmt";
-  version = "0.3.5";
+  version = "0.3.6";
 
   src = fetchFromGitHub {
     owner = "mondeja";
     repo = "hledger-fmt";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-VyDVdXxTge3ERTrkIIWgR75m7TaEbbPmFDNsoYOi9tM=";
+    hash = "sha256-xjBU8LgVIPjb758I57gDfz5q3sot8sV93gMAPXY2jOw=";
   };
 
   nativeBuildInputs = [
     installShellFiles
   ];
 
-  cargoHash = "sha256-jn4ptV0IVnnXR2oCxxUnGaoWG/LBlRkf25/8Nasm9qI=";
+  cargoHash = "sha256-LQxJWllRCD7moImQdDc8Xa0mrkCbbvYITg3pb204qVs=";
 
   # Tests try to invoke the binary from "target/debug/hledger-fmt"
   # https://github.com/mondeja/hledger-fmt/blob/783abdb32eefb20195c7e9562858552935bb9c8e/src/cli/tests.rs#L5

From d923ac4fdc432ccd98be1b6681128a1ec9f0a442 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 4 Nov 2025 09:41:26 +0000
Subject: [PATCH 5745/6226] python3Packages.lance-namespace: init at 0.0.20

---
 .../lance-namespace/default.nix               | 111 ++++++++++++++++++
 pkgs/top-level/python-packages.nix            |   2 +
 2 files changed, 113 insertions(+)
 create mode 100644 pkgs/development/python-modules/lance-namespace/default.nix

diff --git a/pkgs/development/python-modules/lance-namespace/default.nix b/pkgs/development/python-modules/lance-namespace/default.nix
new file mode 100644
index 000000000000..f19307f524a3
--- /dev/null
+++ b/pkgs/development/python-modules/lance-namespace/default.nix
@@ -0,0 +1,111 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  lance-namespace-urllib3-client,
+  pyarrow,
+  # pylance,
+  typing-extensions,
+
+  # optional-dependencies
+  # dir
+  opendal,
+  # glue
+  boto3,
+  botocore,
+  # hive2
+  hive-metastore-client,
+  thrift,
+
+  # tests
+  pylance,
+  pytestCheckHook,
+  lance-namespace,
+}:
+
+buildPythonPackage rec {
+  pname = "lance-namespace";
+  version = "0.0.20";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "lancedb";
+    repo = "lance-namespace";
+    tag = "v${version}";
+    hash = "sha256-dacYNbWXlV6+/klb9/rgbG/2YJ5BAw5xeSZbPvDgRb4=";
+  };
+
+  sourceRoot = "${src.name}/python/lance_namespace";
+
+  build-system = [
+    hatchling
+  ];
+
+  pythonRemoveDeps = [
+    "pylance"
+  ];
+  dependencies = [
+    lance-namespace-urllib3-client
+    typing-extensions
+    # pylance
+    pyarrow
+  ];
+
+  optional-dependencies = {
+    dir = [ opendal ];
+    glue = [
+      boto3
+      botocore
+    ];
+    hive2 = [
+      hive-metastore-client
+      thrift
+    ];
+  };
+
+  pythonImportsCheck = [ "lance_namespace" ];
+
+  nativeCheckInputs = [
+    pylance
+    pytestCheckHook
+  ]
+  ++ lib.flatten (lib.attrValues optional-dependencies);
+
+  # Tests require pylance, which is a circular dependency
+  doCheck = false;
+
+  passthru.tests.pytest = lance-namespace.overridePythonAttrs {
+    disabledTests = [
+      # AttributeError: 'function' object has no attribute 'write_dataset'
+      "test_create_table"
+      "test_describe_table"
+      "test_drop_table"
+      "test_list_tables"
+
+      # RuntimeError: Failed to list tables: Operator.list() got an unexpected keyword argument 'recursive'
+      "test_create_empty_table"
+      "test_empty_list_tables"
+
+      # lance_namespace.unity.LanceNamespaceException: Failed to drop namespace: BehaviorEnum
+      "test_drop_namespace"
+
+      # pydantic_core._pydantic_core.ValidationError: 1 validation error for ListNamespacesResponse namespaces
+      "test_list_namespaces_schemas"
+      "test_list_namespaces_top_level"
+    ];
+
+    doCheck = true;
+  };
+
+  meta = {
+    description = "Open specification on top of the storage-based Lance table and file format to standardize access to a collection of Lance tables";
+    homepage = "https://github.com/lancedb/lance-namespace/tree/main/python/lance_namespace";
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ GaetanLepage ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index a271c4f89dac..86cfe536f474 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8000,6 +8000,8 @@ self: super: with self; {
 
   lammps = callPackage ../development/python-modules/lammps { inherit (pkgs) lammps; };
 
+  lance-namespace = callPackage ../development/python-modules/lance-namespace { };
+
   lance-namespace-urllib3-client =
     callPackage ../development/python-modules/lance-namespace-urllib3-client
       { };

From c21883307f297d38469bd12c950a1c825df95228 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Tue, 4 Nov 2025 09:23:17 +0000
Subject: [PATCH 5746/6226] python3Packages.pylance: 0.38.3 -> 0.39.0

Diff: https://github.com/lancedb/lance/compare/v0.38.3...v0.39.0

Changelog: https://github.com/lancedb/lance/releases/tag/v0.39.0
---
 pkgs/development/python-modules/pylance/default.nix | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pylance/default.nix b/pkgs/development/python-modules/pylance/default.nix
index 8cb5cbefaa39..08d47fda0d57 100644
--- a/pkgs/development/python-modules/pylance/default.nix
+++ b/pkgs/development/python-modules/pylance/default.nix
@@ -13,6 +13,7 @@
   protobuf,
 
   # dependencies
+  lance-namespace,
   numpy,
   pyarrow,
 
@@ -32,14 +33,14 @@
 
 buildPythonPackage rec {
   pname = "pylance";
-  version = "0.38.3";
+  version = "0.39.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lancedb";
     repo = "lance";
     tag = "v${version}";
-    hash = "sha256-R/JO8Q/8g3jxnPgzq5KnvTNNzg46bODNHWmgonS7ChY=";
+    hash = "sha256-e0ZpuC0ezk+ZwmCrWkdD2MnCvnjHVVPsN01JWUNyPf4=";
   };
 
   sourceRoot = "${src.name}/python";
@@ -51,7 +52,7 @@ buildPythonPackage rec {
       src
       sourceRoot
       ;
-    hash = "sha256-F2HwWVXwmydQtyr02l/ydv1zhkvjVM5zEUenWKkMfyw=";
+    hash = "sha256-bvnmlUSnZolwesGtIrWve0a8yQXeYDuaP7mCh3KDd5U=";
   };
 
   nativeBuildInputs = [
@@ -73,6 +74,7 @@ buildPythonPackage rec {
   pythonRelaxDeps = [ "pyarrow" ];
 
   dependencies = [
+    lance-namespace
     numpy
     pyarrow
   ];

From 1f2f45f4b17fd360e5613527e6d4a6eca67fe0de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 23:21:14 +0000
Subject: [PATCH 5747/6226] copilot-language-server: 1.389.0 -> 1.392.0

---
 pkgs/by-name/co/copilot-language-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix
index 8f1970e33872..aca6ac5877c9 100644
--- a/pkgs/by-name/co/copilot-language-server/package.nix
+++ b/pkgs/by-name/co/copilot-language-server/package.nix
@@ -10,11 +10,11 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "copilot-language-server";
-  version = "1.389.0";
+  version = "1.392.0";
 
   src = fetchzip {
     url = "https://github.com/github/copilot-language-server-release/releases/download/${finalAttrs.version}/copilot-language-server-js-${finalAttrs.version}.zip";
-    hash = "sha256-QX3gSKV/FABXbeu1KzrSEyxFJU/xptSVvuxqTjTI9Go=";
+    hash = "sha256-+stenLWQWykBKHole0wW8w8jRzhjOio/VEcMPmklI/0=";
     stripRoot = false;
   };
 

From 0ccfc57fff2e3f1bd363c869cfb289afdb9e3aa1 Mon Sep 17 00:00:00 2001
From: Matteo Pacini <m+github@matteopacini.me>
Date: Wed, 5 Nov 2025 17:54:09 +0000
Subject: [PATCH 5748/6226] ringracers: darwin support

---
 pkgs/by-name/ri/ringracers/package.nix | 41 +++++++++++++++++++-------
 1 file changed, 30 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/ri/ringracers/package.nix b/pkgs/by-name/ri/ringracers/package.nix
index 6bfafd4e4fe4..a5d6ea698c7e 100644
--- a/pkgs/by-name/ri/ringracers/package.nix
+++ b/pkgs/by-name/ri/ringracers/package.nix
@@ -13,7 +13,7 @@
   libvpx,
   libyuv,
   zlib,
-  makeWrapper,
+  makeBinaryWrapper,
   makeDesktopItem,
   copyDesktopItems,
   pkg-config,
@@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: {
   nativeBuildInputs = [
     cmake
     nasm
-    makeWrapper
+    makeBinaryWrapper
     copyDesktopItems
     pkg-config
   ];
@@ -78,22 +78,41 @@ stdenv.mkDerivation (finalAttrs: {
     })
   ];
 
-  installPhase = ''
-    runHook preInstall
+  installPhase =
+    lib.optionalString stdenv.hostPlatform.isLinux ''
+      runHook preInstall
 
-    install -Dm644 ../srb2.png $out/share/icons/hicolor/256x256/apps/ringracers.png
-    install -Dm755 bin/ringracers $out/bin/ringracers
+      install -Dm644 ../srb2.png $out/share/icons/hicolor/256x256/apps/ringracers.png
+      install -Dm755 bin/ringracers $out/bin/ringracers
 
-    wrapProgram $out/bin/ringracers \
-      --set RINGRACERSWADDIR "${finalAttrs.assets}"
+      wrapProgram $out/bin/ringracers \
+        --set RINGRACERSWADDIR "${finalAttrs.assets}"
 
-    runHook postInstall
-  '';
+      runHook postInstall
+    ''
+    + lib.optionalString stdenv.hostPlatform.isDarwin ''
+      runHook preInstall
+
+      mkdir -p $out/Applications
+      cp -r bin/ringracers.app $out/Applications/
+
+      wrapProgram $out/Applications/ringracers.app/Contents/MacOS/ringracers \
+        --set RINGRACERSWADDIR "${finalAttrs.assets}"
+
+      mkdir -p $out/bin
+      cat << EOF > "$out/bin/ringracers"
+      #!${stdenv.shell}
+      open -na "$out/Applications/ringracers.app" --args "\$@"
+      EOF
+      chmod +x $out/bin/ringracers
+
+      runHook postInstall
+    '';
 
   meta = {
     description = "Kart racing video game based on Sonic Robo Blast 2 (SRB2), itself based on a modified version of Doom Legacy";
     homepage = "https://kartkrew.org";
-    platforms = lib.platforms.linux;
+    platforms = lib.platforms.linux ++ lib.platforms.darwin;
     license = lib.licenses.gpl2Plus;
     maintainers = with lib.maintainers; [
       donovanglover

From d487c96354c52164c90205f7cd1a89026014c819 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Wed, 5 Nov 2025 16:17:08 +0000
Subject: [PATCH 5749/6226] python3Packages.orbax-checkpoint: 0.11.26 ->
 0.11.27

Diff: https://github.com/google/orbax/compare/v0.11.26...v0.11.27

Changelog: https://github.com/google/orbax/blob/v0.11.27/checkpoint/CHANGELOG.md
---
 .../orbax-checkpoint/default.nix              | 29 +++++++++++++++++--
 1 file changed, 27 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix
index 897e31c8e350..3e4926d4570a 100644
--- a/pkgs/development/python-modules/orbax-checkpoint/default.nix
+++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix
@@ -37,14 +37,14 @@
 
 buildPythonPackage rec {
   pname = "orbax-checkpoint";
-  version = "0.11.26";
+  version = "0.11.27";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "orbax";
     tag = "v${version}";
-    hash = "sha256-CY5Bs/o8fU57QJETYnyJVkP7Y+cahpqZftyIJNU+GvU=";
+    hash = "sha256-KXEwUHJAFxeJTs3qKUXMCYO3t5hoPTjGay9GIOQIuCY=";
   };
 
   sourceRoot = "${src.name}/checkpoint";
@@ -94,6 +94,18 @@ buildPythonPackage rec {
     # AssertionError: 2 not greater than 2.0046136379241943
     "test_async_mkdir_parallel"
     "test_async_mkdir_sequential"
+
+    # AssertionError:
+    # "Handler type string "(?:__main__|orbax.checkpoint._src.handlers.handler_type_registry_test)\.TestHandler" not found in the registry."
+    # does not match
+    # "'Handler type string "handler_type_registry_test.TestHandler" not found in the registry.'"
+    "test_get_handler_type_not_found"
+    "test_no_typestr"
+    "test_register_duplicate_handler_type"
+
+    # AssertionError: False is not true
+    "test_register_and_get"
+    "test_register_different_modules"
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     # Probably failing because of a filesystem impurity
@@ -107,8 +119,20 @@ buildPythonPackage rec {
     # First from multiprocess_test, Second from orbax.checkpoint._src.testing.multiprocess_test.
     # Description from first occurrence: Number of processes to use.
     # https://github.com/google/orbax/issues/1580
+    "orbax/checkpoint/_src/testing/multiprocess_test.py"
     "orbax/checkpoint/experimental/emergency/"
 
+    # ValueError: Distributed system is not available; please initialize it via `jax.distributed.initialize()` at the start of your program.
+    "orbax/checkpoint/_src/handlers/array_checkpoint_handler_test.py"
+
+    # import file mismatch:
+    # imported module 'registry_test' has this __file__ attribute:
+    #   /build/source/checkpoint/orbax/checkpoint/experimental/v1/_src/layout/registry_test.py
+    # which is not the same as the test file we want to collect:
+    #   /build/source/checkpoint/orbax/checkpoint/experimental/v1/_src/serialization/registry_test.py
+    # HINT: remove __pycache__ / .pyc files and/or use a unique basename for your test file module
+    "orbax/checkpoint/experimental/v1/_src/serialization/registry_test.py"
+
     # E   FileNotFoundError: [Errno 2] No such file or directory:
     # '/build/absl_testing/DefaultSnapshotTest/runTest/root/path/to/source/data.txt'
     "orbax/checkpoint/_src/path/snapshot/snapshot_test.py"
@@ -121,6 +145,7 @@ buildPythonPackage rec {
     "orbax/checkpoint/_src/tree/parts_of_test.py"
     "orbax/checkpoint/_src/tree/structure_utils_test.py"
     "orbax/checkpoint/_src/tree/utils_test.py"
+    "orbax/checkpoint/checkpoint_manager_test.py"
     "orbax/checkpoint/single_host_test.py"
     "orbax/checkpoint/transform_utils_test.py"
   ];

From 938f6da79d6d28a2edd20f81506f2056b4204691 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 5 Nov 2025 23:43:11 +0000
Subject: [PATCH 5750/6226] v2ray-domain-list-community: 20251028154325 ->
 20251105132907

---
 pkgs/by-name/v2/v2ray-domain-list-community/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
index 38166cc31d10..d53309d6d1c4 100644
--- a/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
+++ b/pkgs/by-name/v2/v2ray-domain-list-community/package.nix
@@ -9,12 +9,12 @@
 let
   generator = pkgsBuildBuild.buildGoModule rec {
     pname = "v2ray-domain-list-community";
-    version = "20251028154325";
+    version = "20251105132907";
     src = fetchFromGitHub {
       owner = "v2fly";
       repo = "domain-list-community";
       rev = version;
-      hash = "sha256-ugNLlCfAhXvIPQTae3Z22rlpNG32RmIrIt/iilIj+iA=";
+      hash = "sha256-yH3vykMcxxlGXRUlZm6kKBkvsaQrTrnv+bYnZywu3go=";
     };
     vendorHash = "sha256-HmIXpF7P3J+lPXpmWWoFpSYAu5zbBQSDrj6S88LgWSU=";
     meta = with lib; {

From c42a041a7a0ed87653732832df35745908767769 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 00:00:53 +0000
Subject: [PATCH 5751/6226] python3Packages.environs: 14.4.0 -> 14.5.0

---
 pkgs/development/python-modules/environs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/environs/default.nix b/pkgs/development/python-modules/environs/default.nix
index 91ec68a0a511..22a6b0bb9735 100644
--- a/pkgs/development/python-modules/environs/default.nix
+++ b/pkgs/development/python-modules/environs/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "environs";
-  version = "14.4.0";
+  version = "14.5.0";
   pyproject = true;
 
   disabled = pythonOlder "3.8";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "sloria";
     repo = "environs";
     tag = version;
-    hash = "sha256-901TvjY5VzWLzQGBmTQ/K0giPt010+GH5eVWk58Pqng=";
+    hash = "sha256-g9n4GuVSHB2VourVYlzp3zKO7MnJK4IAakbYV5tM8Uc=";
   };
 
   nativeBuildInputs = [ flit-core ];

From 53515684057852f6b82275ed3db44aa03b6b5a4d Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 30 Oct 2025 06:33:33 +0800
Subject: [PATCH 5752/6226] tests.overriding: refactor and allow non-bool
 expected value

Co-authored-by: Matt Sturgeon <matt@sturgeon.me.uk>
---
 pkgs/test/overriding.nix | 35 ++++++++++++++++++++++++++++-------
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix
index 67ed3bd90f9a..494873211e9a 100644
--- a/pkgs/test/overriding.nix
+++ b/pkgs/test/overriding.nix
@@ -309,14 +309,35 @@ let
 
 in
 
-stdenvNoCC.mkDerivation {
+stdenvNoCC.mkDerivation (finalAttrs: {
+  __structuredAttrs = true;
   name = "test-overriding";
-  passthru = { inherit tests; };
+  passthru = {
+    inherit tests;
+    failures = lib.runTests (finalAttrs.passthru.tests // { tests = lib.attrNames tests; });
+  };
+  testResults = lib.mapAttrs (testName: test: test.expr == test.expected) finalAttrs.passthru.tests;
   buildCommand = ''
     touch $out
+    for testName in "''${!testResults[@]}"; do
+      if [[ -n "''${testResults[$testName]}" ]]; then
+        echo "$testName success"
+      else
+        echo "$testName fail"
+      fi
+    done
   ''
-  + lib.concatMapAttrsStringSep "\n" (
-    name: t:
-    "([[ ${lib.boolToString t.expr} == ${lib.boolToString t.expected} ]] && echo '${name} success') || (echo '${name} fail' && exit 1)"
-  ) tests;
-}
+  + lib.optionalString (lib.any (v: !v) (lib.attrValues finalAttrs.testResults)) ''
+    {
+      echo "ERROR: tests.overriding: Encountering failed tests."
+      for testName in "''${!testResults[@]}"; do
+        if [[ -z "''${testResults[$testName]}" ]]; then
+          echo "- $testName"
+        fi
+      done
+      echo "To inspect the expected and actual result, "
+      echo '  evaluate `tests.overriding.tests.''${testName}`.'
+    } >&2
+    exit 1
+  '';
+})

From ffca1c4197f52aa58e1c0e600b874bd0e00999df Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 30 Oct 2025 07:04:47 +0800
Subject: [PATCH 5753/6226] tests.overriding: restructure test cases utilizing
 non-boolean support

---
 pkgs/test/overriding.nix | 122 +++++++++++++++++++--------------------
 1 file changed, 59 insertions(+), 63 deletions(-)

diff --git a/pkgs/test/overriding.nix b/pkgs/test/overriding.nix
index 494873211e9a..a2221183a8a6 100644
--- a/pkgs/test/overriding.nix
+++ b/pkgs/test/overriding.nix
@@ -43,24 +43,24 @@ let
     in
     {
       repeatedOverrides-pname = {
-        expr = repeatedOverrides.pname == "a-better-hello-with-blackjack";
-        expected = true;
+        expr = repeatedOverrides.pname;
+        expected = "a-better-hello-with-blackjack";
       };
       repeatedOverrides-entangled-pname = {
-        expr = repeatedOverrides.entangled.pname == "a-better-figlet-with-blackjack";
-        expected = true;
+        expr = repeatedOverrides.entangled.pname;
+        expected = "a-better-figlet-with-blackjack";
       };
       overriding-using-only-attrset = {
-        expr = (pkgs.hello.overrideAttrs { pname = "hello-overriden"; }).pname == "hello-overriden";
-        expected = true;
+        expr = (pkgs.hello.overrideAttrs { pname = "hello-overriden"; }).pname;
+        expected = "hello-overriden";
       };
       overriding-using-only-attrset-no-final-attrs = {
         name = "overriding-using-only-attrset-no-final-attrs";
         expr =
           ((stdenvNoCC.mkDerivation { pname = "hello-no-final-attrs"; }).overrideAttrs {
             pname = "hello-no-final-attrs-overridden";
-          }).pname == "hello-no-final-attrs-overridden";
-        expected = true;
+          }).pname;
+        expected = "hello-no-final-attrs-overridden";
       };
     };
 
@@ -118,16 +118,16 @@ let
         expected = true;
       };
       extendMkDerivation-helloLocal-plain-equivalence = {
-        expr = helloLocal.drvPath == helloLocalPlain.drvPath;
-        expected = true;
+        expr = helloLocal.drvPath;
+        expected = helloLocalPlain.drvPath;
       };
       extendMkDerivation-helloLocal-finalAttrs = {
-        expr = helloLocal.bar == "ab";
-        expected = true;
+        expr = helloLocal.bar;
+        expected = "ab";
       };
       extendMkDerivation-helloLocal-specialArg = {
-        expr = hiLocal.greeting == "Hi!";
-        expected = true;
+        expr = hiLocal.greeting;
+        expected = "Hi!";
       };
     };
 
@@ -152,27 +152,35 @@ let
     in
     {
       hash-outputHash-equivalence = {
-        expr = ruamel_0_17_21-src.outputHash == ruamel_0_17_21-hash;
-        expected = true;
+        expr = ruamel_0_17_21-src.outputHash;
+        expected = ruamel_0_17_21-hash;
       };
 
       hash-overridability-outputHash = {
-        expr = ruamel_0_17_21-src-by-overriding.outputHash == ruamel_0_17_21-hash;
-        expected = true;
+        expr = ruamel_0_17_21-src-by-overriding.outputHash;
+        expected = ruamel_0_17_21-hash;
       };
 
       hash-overridability-drvPath = {
-        expr =
-          lib.isString ruamel_0_17_21-src-by-overriding.drvPath
-          && ruamel_0_17_21-src-by-overriding.drvPath == ruamel_0_17_21-src.drvPath;
-        expected = true;
+        expr = [
+          (lib.isString ruamel_0_17_21-src-by-overriding.drvPath)
+          ruamel_0_17_21-src-by-overriding.drvPath
+        ];
+        expected = [
+          true
+          ruamel_0_17_21-src.drvPath
+        ];
       };
 
       hash-overridability-outPath = {
-        expr =
-          lib.isString ruamel_0_17_21-src-by-overriding.outPath
-          && ruamel_0_17_21-src-by-overriding.outPath == ruamel_0_17_21-src.outPath;
-        expected = true;
+        expr = [
+          (lib.isString ruamel_0_17_21-src-by-overriding.outPath)
+          ruamel_0_17_21-src-by-overriding.outPath
+        ];
+        expected = [
+          true
+          ruamel_0_17_21-src.outPath
+        ];
       };
     };
 
@@ -249,44 +257,32 @@ let
       pet-vendored = pet-foo.overrideAttrs { vendorHash = null; };
     in
     {
-      buildGoModule-overrideAttrs = {
-        expr =
-          lib.all
-            (
-              attrPath:
-              let
-                attrPathPretty = lib.concatStringsSep "." attrPath;
-                valueNative = lib.getAttrFromPath attrPath pet_0_4_0;
-                valueOverridden = lib.getAttrFromPath attrPath pet_0_4_0-overridden;
-              in
-              lib.warnIfNot (valueNative == valueOverridden)
-                "pet_0_4_0.${attrPathPretty} (${valueNative}) does not equal pet_0_4_0-overridden.${attrPathPretty} (${valueOverridden})"
-                true
-            )
-            [
-              [ "drvPath" ]
-              [ "name" ]
-              [ "pname" ]
-              [ "version" ]
-              [ "vendorHash" ]
-              [
-                "goModules"
-                "drvPath"
-              ]
-              [
-                "goModules"
-                "name"
-              ]
-              [
-                "goModules"
-                "outputHash"
-              ]
-            ];
-        expected = true;
-      };
+      buildGoModule-overrideAttrs =
+        let
+          getComparingAttrs = p: {
+            inherit (p)
+              drvPath
+              name
+              pname
+              version
+              vendorHash
+              ;
+            goModules = {
+              inherit (p.goModules)
+                drvPath
+                name
+                outPath
+                ;
+            };
+          };
+        in
+        {
+          expr = getComparingAttrs pet_0_4_0-overridden;
+          expected = getComparingAttrs pet_0_4_0;
+        };
       buildGoModule-goModules-overrideAttrs = {
-        expr = pet-foo.goModules.FOO == "foo";
-        expected = true;
+        expr = pet-foo.goModules.FOO;
+        expected = "foo";
       };
       buildGoModule-goModules-overrideAttrs-vendored = {
         expr = lib.isString pet-vendored.drvPath;

From 315f634c9696e9d375a7aa356d5b87a4f4d7d947 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Tue, 3 Dec 2024 13:47:40 -0500
Subject: [PATCH 5754/6226] gatsby-cli: migrate from nodePackages

---
 pkgs/by-name/ga/gatsby-cli/package.nix        |  84 ++
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 986 ------------------
 4 files changed, 85 insertions(+), 987 deletions(-)
 create mode 100644 pkgs/by-name/ga/gatsby-cli/package.nix

diff --git a/pkgs/by-name/ga/gatsby-cli/package.nix b/pkgs/by-name/ga/gatsby-cli/package.nix
new file mode 100644
index 000000000000..c1d7a6bbe4ef
--- /dev/null
+++ b/pkgs/by-name/ga/gatsby-cli/package.nix
@@ -0,0 +1,84 @@
+{
+  lib,
+  stdenv,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  nodejs,
+  findutils,
+  makeBinaryWrapper,
+  nix-update-script,
+}:
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "gatsby-cli";
+  version = "5.15.0";
+
+  src = fetchFromGitHub {
+    owner = "gatsbyjs";
+    repo = "gatsby";
+    tag = "gatsby-cli@${finalAttrs.version}";
+    hash = "sha256-sNNbOV9UuCTYHp4cSK9ngCukUXDNV4iOIc9PPQVYymM=";
+  };
+
+  yarnKeepDevDeps = true;
+
+  yarnOfflineCache = fetchYarnDeps {
+    yarnLock = finalAttrs.src + "/yarn.lock";
+    hash = "sha256-wfg9Nj9Z8vyp2NdE+fOTuM+pXnfM/r46CbfuE5f3fGU=";
+  };
+
+  yarnBuildScript = "lerna";
+  yarnBuildFlags = [
+    "run"
+    "build"
+    "--scope"
+    "gatsby-cli"
+    "--include-dependencies"
+  ];
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    # Needed for executing package.json scripts
+    nodejs
+    findutils
+    makeBinaryWrapper
+  ];
+
+  preBuild = ''
+    patchShebangs packages/**/node_modules
+    yarn run lerna run prepare --scope gatsby-cli --include-dependencies
+  '';
+
+  installPhase = ''
+    runHook preInstall
+
+    mkdir -p $out/lib/node_modules/
+    mv packages/ $out/lib/packages/
+    mv node_modules/* $out/lib/node_modules/
+
+    makeWrapper ${lib.getExe nodejs} $out/bin/gatsby \
+      --add-flags $out/lib/packages/gatsby-cli/cli.js \
+      --set NODE_PATH $out/lib/node_modules
+
+    runHook postInstall
+  '';
+
+  passthru.updateScript = nix-update-script {
+    extraArgs = [
+      "--version-regex"
+      "'gatsby-cli@(.*)'"
+    ];
+  };
+
+  meta = {
+    changelog = "https://github.com/gatsbyjs/gatsby/releases/tag/gatsby%2540${finalAttrs.version}";
+    description = "The Gatsby command line interface";
+    homepage = "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-cli#readme";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+    mainProgram = "gatsby";
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 55af164d88ad..55848e3615de 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -114,6 +114,7 @@ mapAliases {
   inherit (pkgs) fixjson; # added 2024-06-26
   flood = pkgs.flood; # Added 2023-07-25
   ganache = throw "ganache was removed because it was deprecated upstream"; # added 2024-12-02
+  inherit (pkgs) gatsby-cli; # Added 2025-11-05
   generator-code = throw "generator-code was removed because it provides no executable"; # added 2023-09-24
   inherit (pkgs) git-run; # added 2024-06-26
   git-ssb = throw "git-ssb was removed because it was broken"; # added 2023-08-21
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 8e9df5d9245d..c4209c708ead 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -73,7 +73,6 @@
 , "fleek-cli"
 , "forever"
 , "fx"
-, "gatsby-cli"
 , "grunt-cli"
 , "makam"
 , "gulp-cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 35a90c0d8aac..1b7c6e92a8fb 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -291,15 +291,6 @@ let
         sha512 = "6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==";
       };
     };
-    "@babel/helper-annotate-as-pure-7.25.9" = {
-      name = "_at_babel_slash_helper-annotate-as-pure";
-      packageName = "@babel/helper-annotate-as-pure";
-      version = "7.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.25.9.tgz";
-        sha512 = "gv7320KBUFJz1RnylIg5WWYPRXKZ884AGkYpgpWW02TH66Dl+HaC1t1CKd0z3R4b6hdYEcmrNZHUmfCP+1u3/g==";
-      };
-    };
     "@babel/helper-compilation-targets-7.26.5" = {
       name = "_at_babel_slash_helper-compilation-targets";
       packageName = "@babel/helper-compilation-targets";
@@ -309,24 +300,6 @@ let
         sha512 = "IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==";
       };
     };
-    "@babel/helper-create-class-features-plugin-7.26.9" = {
-      name = "_at_babel_slash_helper-create-class-features-plugin";
-      packageName = "@babel/helper-create-class-features-plugin";
-      version = "7.26.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.26.9.tgz";
-        sha512 = "ubbUqCofvxPRurw5L8WTsCLSkQiVpov4Qx0WMA+jUN+nXBK8ADPlJO1grkFw5CWKC5+sZSOfuGMdX1aI1iT9Sg==";
-      };
-    };
-    "@babel/helper-member-expression-to-functions-7.25.9" = {
-      name = "_at_babel_slash_helper-member-expression-to-functions";
-      packageName = "@babel/helper-member-expression-to-functions";
-      version = "7.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz";
-        sha512 = "wbfdZ9w5vk0C0oyHqAJbc62+vet5prjj01jjJ8sKn3j9h3MQQlflEdXYvuqRWjHnM12coDEqiC1IRCi0U/EKwQ==";
-      };
-    };
     "@babel/helper-module-imports-7.25.9" = {
       name = "_at_babel_slash_helper-module-imports";
       packageName = "@babel/helper-module-imports";
@@ -345,42 +318,6 @@ let
         sha512 = "xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==";
       };
     };
-    "@babel/helper-optimise-call-expression-7.25.9" = {
-      name = "_at_babel_slash_helper-optimise-call-expression";
-      packageName = "@babel/helper-optimise-call-expression";
-      version = "7.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.25.9.tgz";
-        sha512 = "FIpuNaz5ow8VyrYcnXQTDRGvV6tTjkNtCK/RYNDXGSLlUD6cBuQTSw43CShGxjvfBTfcUA/r6UhUCbtYqkhcuQ==";
-      };
-    };
-    "@babel/helper-plugin-utils-7.26.5" = {
-      name = "_at_babel_slash_helper-plugin-utils";
-      packageName = "@babel/helper-plugin-utils";
-      version = "7.26.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.26.5.tgz";
-        sha512 = "RS+jZcRdZdRFzMyr+wcsaqOmld1/EqTghfaBGQQd/WnRdzdlvSZ//kF7U8VQTxf1ynZ4cjUcYgjVGx13ewNPMg==";
-      };
-    };
-    "@babel/helper-replace-supers-7.26.5" = {
-      name = "_at_babel_slash_helper-replace-supers";
-      packageName = "@babel/helper-replace-supers";
-      version = "7.26.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.26.5.tgz";
-        sha512 = "bJ6iIVdYX1YooY2X7w1q6VITt+LnUILtNk7zT78ykuwStx8BauCzxvFqFaHjOpW1bVnSUM1PN1f0p5P21wHxvg==";
-      };
-    };
-    "@babel/helper-skip-transparent-expression-wrappers-7.25.9" = {
-      name = "_at_babel_slash_helper-skip-transparent-expression-wrappers";
-      packageName = "@babel/helper-skip-transparent-expression-wrappers";
-      version = "7.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.25.9.tgz";
-        sha512 = "K4Du3BFa3gvyhzgPcntrkDgZzQaq6uozzcpGbOO1OEJaI+EJdqWIMTLgFgQf6lrfiDFo5FU+BxKepI9RmZqahA==";
-      };
-    };
     "@babel/helper-string-parser-7.25.9" = {
       name = "_at_babel_slash_helper-string-parser";
       packageName = "@babel/helper-string-parser";
@@ -426,51 +363,6 @@ let
         sha512 = "6aQR2zGE/QFi8JpDLjUZEPYOs7+mhKXm86VaKFiLP35JQwQb6bwUE+XbvkH0EptsYhbNBSUGaUBLKqxH1xSgsA==";
       };
     };
-    "@babel/plugin-syntax-jsx-7.25.9" = {
-      name = "_at_babel_slash_plugin-syntax-jsx";
-      packageName = "@babel/plugin-syntax-jsx";
-      version = "7.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.25.9.tgz";
-        sha512 = "ld6oezHQMZsZfp6pWtbjaNDF2tiiCYYDqQszHt5VV437lewP9aSi2Of99CK0D0XB21k7FLgnLcmQKyKzynfeAA==";
-      };
-    };
-    "@babel/plugin-syntax-typescript-7.25.9" = {
-      name = "_at_babel_slash_plugin-syntax-typescript";
-      packageName = "@babel/plugin-syntax-typescript";
-      version = "7.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.25.9.tgz";
-        sha512 = "hjMgRy5hb8uJJjUcdWunWVcoi9bGpJp8p5Ol1229PoN6aytsLwNMgmdftO23wnCLMfVmTwZDWMPNq/D1SY60JQ==";
-      };
-    };
-    "@babel/plugin-transform-modules-commonjs-7.26.3" = {
-      name = "_at_babel_slash_plugin-transform-modules-commonjs";
-      packageName = "@babel/plugin-transform-modules-commonjs";
-      version = "7.26.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.26.3.tgz";
-        sha512 = "MgR55l4q9KddUDITEzEFYn5ZsGDXMSsU9E+kh7fjRXTIC3RHqfCo8RPRbyReYJh44HQ/yomFkqbOFohXvDCiIQ==";
-      };
-    };
-    "@babel/plugin-transform-typescript-7.26.8" = {
-      name = "_at_babel_slash_plugin-transform-typescript";
-      packageName = "@babel/plugin-transform-typescript";
-      version = "7.26.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.26.8.tgz";
-        sha512 = "bME5J9AC8ChwA7aEPJ6zym3w7aObZULHhbNLU0bKUhKsAkylkzUdq+0kdymh9rzi8nlNFl2bmldFBCKNJBUpuw==";
-      };
-    };
-    "@babel/preset-typescript-7.26.0" = {
-      name = "_at_babel_slash_preset-typescript";
-      packageName = "@babel/preset-typescript";
-      version = "7.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.26.0.tgz";
-        sha512 = "NMk1IGZ5I/oHhoXEElcm+xUnL/szL6xflkFZmoEU9xj1qSJXpiS7rsspYo92B4DRCDvZn2erT5LdsCeXAKNCkg==";
-      };
-    };
     "@babel/runtime-7.26.10" = {
       name = "_at_babel_slash_runtime";
       packageName = "@babel/runtime";
@@ -1220,24 +1112,6 @@ let
         sha512 = "Ys9sazDatyTgZVb4xPlDufLweJ/Os2uHWOv+Caxvy2O85JcnT4M3vc73bi8pdLWlv3fdWQz3pdI9tVwo8rQQSg==";
       };
     };
-    "@hapi/hoek-9.3.0" = {
-      name = "_at_hapi_slash_hoek";
-      packageName = "@hapi/hoek";
-      version = "9.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz";
-        sha512 = "/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==";
-      };
-    };
-    "@hapi/topo-5.1.0" = {
-      name = "_at_hapi_slash_topo";
-      packageName = "@hapi/topo";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz";
-        sha512 = "foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==";
-      };
-    };
     "@httptoolkit/websocket-stream-6.0.1" = {
       name = "_at_httptoolkit_slash_websocket-stream";
       packageName = "@httptoolkit/websocket-stream";
@@ -2012,60 +1886,6 @@ let
         sha512 = "0hz44rAcrphyXcA8IS7EJ2SCoaBZD2u5goE8S/e+q/DL+dOGpqpcLidVOFeLG3VgML62SXmfRLAhWt0zL1oW4Q==";
       };
     };
-    "@lmdb/lmdb-darwin-arm64-2.5.3" = {
-      name = "_at_lmdb_slash_lmdb-darwin-arm64";
-      packageName = "@lmdb/lmdb-darwin-arm64";
-      version = "2.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@lmdb/lmdb-darwin-arm64/-/lmdb-darwin-arm64-2.5.3.tgz";
-        sha512 = "RXwGZ/0eCqtCY8FLTM/koR60w+MXyvBUpToXiIyjOcBnC81tAlTUHrRUavCEWPI9zc9VgvpK3+cbumPyR8BSuA==";
-      };
-    };
-    "@lmdb/lmdb-darwin-x64-2.5.3" = {
-      name = "_at_lmdb_slash_lmdb-darwin-x64";
-      packageName = "@lmdb/lmdb-darwin-x64";
-      version = "2.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@lmdb/lmdb-darwin-x64/-/lmdb-darwin-x64-2.5.3.tgz";
-        sha512 = "337dNzh5yCdNCTk8kPfoU7jR3otibSlPDGW0vKZT97rKnQMb9tNdto3RtWoGPsQ8hKmlRZpojOJtmwjncq1MoA==";
-      };
-    };
-    "@lmdb/lmdb-linux-arm-2.5.3" = {
-      name = "_at_lmdb_slash_lmdb-linux-arm";
-      packageName = "@lmdb/lmdb-linux-arm";
-      version = "2.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@lmdb/lmdb-linux-arm/-/lmdb-linux-arm-2.5.3.tgz";
-        sha512 = "mU2HFJDGwECkoD9dHQEfeTG5mp8hNS2BCfwoiOpVPMeapjYpQz9Uw3FkUjRZ4dGHWKbin40oWHuL0bk2bCx+Sg==";
-      };
-    };
-    "@lmdb/lmdb-linux-arm64-2.5.3" = {
-      name = "_at_lmdb_slash_lmdb-linux-arm64";
-      packageName = "@lmdb/lmdb-linux-arm64";
-      version = "2.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@lmdb/lmdb-linux-arm64/-/lmdb-linux-arm64-2.5.3.tgz";
-        sha512 = "VJw60Mdgb4n+L0fO1PqfB0C7TyEQolJAC8qpqvG3JoQwvyOv6LH7Ib/WE3wxEW9nuHmVz9jkK7lk5HfWWgoO1Q==";
-      };
-    };
-    "@lmdb/lmdb-linux-x64-2.5.3" = {
-      name = "_at_lmdb_slash_lmdb-linux-x64";
-      packageName = "@lmdb/lmdb-linux-x64";
-      version = "2.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@lmdb/lmdb-linux-x64/-/lmdb-linux-x64-2.5.3.tgz";
-        sha512 = "qaReO5aV8griBDsBr8uBF/faO3ieGjY1RY4p8JvTL6Mu1ylLrTVvOONqKFlNaCwrmUjWw5jnf7VafxDAeQHTow==";
-      };
-    };
-    "@lmdb/lmdb-win32-x64-2.5.3" = {
-      name = "_at_lmdb_slash_lmdb-win32-x64";
-      packageName = "@lmdb/lmdb-win32-x64";
-      version = "2.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@lmdb/lmdb-win32-x64/-/lmdb-win32-x64-2.5.3.tgz";
-        sha512 = "cK+Elf3RjEzrm3SerAhrFWL5oQAsZSJ/LmjL1joIpTfEP1etJJ9CTRvdaV6XLYAxaEkfdhk/9hOvHLbR9yIhCA==";
-      };
-    };
     "@malept/cross-spawn-promise-2.0.0" = {
       name = "_at_malept_slash_cross-spawn-promise";
       packageName = "@malept/cross-spawn-promise";
@@ -3101,33 +2921,6 @@ let
         sha512 = "zNPPB2cro7fr+gPsNPoEir6pzYfJngkik7EnsSD5uMqwzGB8qtMmausS5XO10KM5c1Hfw/hpe1oXf/UoHNZFlg==";
       };
     };
-    "@sideway/address-4.1.5" = {
-      name = "_at_sideway_slash_address";
-      packageName = "@sideway/address";
-      version = "4.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz";
-        sha512 = "IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==";
-      };
-    };
-    "@sideway/formula-3.0.1" = {
-      name = "_at_sideway_slash_formula";
-      packageName = "@sideway/formula";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz";
-        sha512 = "/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==";
-      };
-    };
-    "@sideway/pinpoint-2.0.0" = {
-      name = "_at_sideway_slash_pinpoint";
-      packageName = "@sideway/pinpoint";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz";
-        sha512 = "RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==";
-      };
-    };
     "@sigstore/bundle-3.1.0" = {
       name = "_at_sigstore_slash_bundle";
       packageName = "@sigstore/bundle";
@@ -3848,15 +3641,6 @@ let
         sha512 = "YXGZ/rz+s57VbzcvEV9fUoXeJlBt5HaKu5iUheiIWNsJs23bz6AnRuRiZBRVBLYyPnixNvVnuzM5pSaxr8Yp/g==";
       };
     };
-    "@types/common-tags-1.8.4" = {
-      name = "_at_types_slash_common-tags";
-      packageName = "@types/common-tags";
-      version = "1.8.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/common-tags/-/common-tags-1.8.4.tgz";
-        sha512 = "S+1hLDJPjWNDhcGxsxEbepzaxWqURP/o+3cP4aa2w7yBXgdcmKGQtZzP8JbyfOd0m+33nh+8+kvxYE2UJtBDkg==";
-      };
-    };
     "@types/concat-stream-2.0.3" = {
       name = "_at_types_slash_concat-stream";
       packageName = "@types/concat-stream";
@@ -4343,15 +4127,6 @@ let
         sha512 = "oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==";
       };
     };
-    "@types/yoga-layout-1.9.2" = {
-      name = "_at_types_slash_yoga-layout";
-      packageName = "@types/yoga-layout";
-      version = "1.9.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/yoga-layout/-/yoga-layout-1.9.2.tgz";
-        sha512 = "S9q47ByT2pPvD65IvrWp7qppVMpk9WGMbVq9wbWZOHg6tnXSD4vyhao6nOSBwwfDdV2p3Kx9evA9vI+XWTfDvw==";
-      };
-    };
     "@ungap/structured-clone-1.3.0" = {
       name = "_at_ungap_slash_structured-clone";
       packageName = "@ungap/structured-clone";
@@ -6647,15 +6422,6 @@ let
         sha512 = "ct6s33iiwRCUPp9KXnJ4QMWDgHIgaw36caK/5XEQ9L8dCzSQlJt1Vk6VmHh1VD4AlGCAI4C2zmtfItifBBPrhQ==";
       };
     };
-    "better-opn-2.1.1" = {
-      name = "better-opn";
-      packageName = "better-opn";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/better-opn/-/better-opn-2.1.1.tgz";
-        sha512 = "kIPXZS5qwyKiX/HcRvDYfmBQUa8XP17I0mYZZ0y4UhpYOSvtsLHDYqmomS+Mj20aDvD3knEiQ0ecQy2nhio3yA==";
-      };
-    };
     "better-path-resolve-1.0.0" = {
       name = "better-path-resolve";
       packageName = "better-path-resolve";
@@ -6899,15 +6665,6 @@ let
         sha512 = "RaVTblr+OnEli0r/ud8InrU7D+G0y6aJhlxaLa6Pwty4+xoxboF1BsUI45tujvRpbj9dQVoglChqonGAsjEBYg==";
       };
     };
-    "boolbase-1.0.0" = {
-      name = "boolbase";
-      packageName = "boolbase";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz";
-        sha512 = "JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==";
-      };
-    };
     "bowser-2.11.0" = {
       name = "bowser";
       packageName = "bowser";
@@ -8978,15 +8735,6 @@ let
         sha512 = "rraC8NXWOEjhADbZe9QBNzLAN5Q3fsTPQtBV+fEVj6xKIgDgNiEVE6ZNfHpZOqfQ21YUzfVNUXLOEZquYvQPPg==";
       };
     };
-    "common-tags-1.8.2" = {
-      name = "common-tags";
-      packageName = "common-tags";
-      version = "1.8.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/common-tags/-/common-tags-1.8.2.tgz";
-        sha512 = "gk/Z852D2Wtb//0I+kRFNKKE9dIIVirjoqPoA1wJU+XePVXZfGeBpk45+A1rKO4Q43prqWBNY/MiIeRLbPWUaA==";
-      };
-    };
     "commonmark-0.31.2" = {
       name = "commonmark";
       packageName = "commonmark";
@@ -9762,15 +9510,6 @@ let
         sha512 = "gYTKKexFO3kh200H1Nit76sRwRtOY32vQd3jpAQKpLtZqyNsSQNfI4N7o3eP2wUjV35pTWKRYqFUDBvUha/Pkw==";
       };
     };
-    "create-gatsby-3.14.0" = {
-      name = "create-gatsby";
-      packageName = "create-gatsby";
-      version = "3.14.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/create-gatsby/-/create-gatsby-3.14.0.tgz";
-        sha512 = "HR90NlcTIAeo7OwcFfGubKa35+/Aj7lEfgcV4n4IIPCMy3A+gYwOEQcLIGtmPCVIl1C9AhT3/0XaWbnhAcbyGQ==";
-      };
-    };
     "create-hash-1.2.0" = {
       name = "create-hash";
       packageName = "create-hash";
@@ -9897,15 +9636,6 @@ let
         sha512 = "x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==";
       };
     };
-    "css-select-4.3.0" = {
-      name = "css-select";
-      packageName = "css-select";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz";
-        sha512 = "wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==";
-      };
-    };
     "css-select-5.1.0" = {
       name = "css-select";
       packageName = "css-select";
@@ -9933,15 +9663,6 @@ let
         sha512 = "6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==";
       };
     };
-    "css-what-6.1.0" = {
-      name = "css-what";
-      packageName = "css-what";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz";
-        sha512 = "HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==";
-      };
-    };
     "cssesc-3.0.0" = {
       name = "cssesc";
       packageName = "cssesc";
@@ -11148,15 +10869,6 @@ let
         sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==";
       };
     };
-    "dom-converter-0.2.0" = {
-      name = "dom-converter";
-      packageName = "dom-converter";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz";
-        sha512 = "gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==";
-      };
-    };
     "dom-serializer-0.2.2" = {
       name = "dom-serializer";
       packageName = "dom-serializer";
@@ -11166,15 +10878,6 @@ let
         sha512 = "2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==";
       };
     };
-    "dom-serializer-1.4.1" = {
-      name = "dom-serializer";
-      packageName = "dom-serializer";
-      version = "1.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz";
-        sha512 = "VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==";
-      };
-    };
     "dom-storage-2.1.0" = {
       name = "dom-storage";
       packageName = "dom-storage";
@@ -11238,15 +10941,6 @@ let
         sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==";
       };
     };
-    "domhandler-4.3.1" = {
-      name = "domhandler";
-      packageName = "domhandler";
-      version = "4.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz";
-        sha512 = "GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==";
-      };
-    };
     "domino-2.1.6" = {
       name = "domino";
       packageName = "domino";
@@ -11274,15 +10968,6 @@ let
         sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==";
       };
     };
-    "domutils-2.8.0" = {
-      name = "domutils";
-      packageName = "domutils";
-      version = "2.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz";
-        sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==";
-      };
-    };
     "domutils-3.2.2" = {
       name = "domutils";
       packageName = "domutils";
@@ -11868,15 +11553,6 @@ let
         sha512 = "dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==";
       };
     };
-    "envinfo-7.14.0" = {
-      name = "envinfo";
-      packageName = "envinfo";
-      version = "7.14.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/envinfo/-/envinfo-7.14.0.tgz";
-        sha512 = "CO40UI41xDQzhLB1hWyqUKgFhs250pNcGbyGKe1l/e4FSaI/+YE4IMG76GDt0In67WLPACIITC+sOi08x4wIvg==";
-      };
-    };
     "environment-1.1.0" = {
       name = "environment";
       packageName = "environment";
@@ -13965,15 +13641,6 @@ let
         sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==";
       };
     };
-    "fs-exists-cached-1.0.0" = {
-      name = "fs-exists-cached";
-      packageName = "fs-exists-cached";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-exists-cached/-/fs-exists-cached-1.0.0.tgz";
-        sha512 = "kSxoARUDn4F2RPXX48UXnaFKwVU7Ivd/6qpzZL29MCDmr9sTvybv4gFCp+qaI4fM9m0z9fgz/yJvi56GAz+BZg==";
-      };
-    };
     "fs-extra-0.6.4" = {
       name = "fs-extra";
       packageName = "fs-extra";
@@ -14136,15 +13803,6 @@ let
         sha512 = "R1fam6D4CyKQGNlvJne4dkNF+PvUUl7TAJInvTGa9fti9qAv95quQz29GXapA4d8Ec266mJJxFVh82M4GIIGDQ==";
       };
     };
-    "gatsby-core-utils-4.14.0" = {
-      name = "gatsby-core-utils";
-      packageName = "gatsby-core-utils";
-      version = "4.14.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gatsby-core-utils/-/gatsby-core-utils-4.14.0.tgz";
-        sha512 = "h0v20gB213PmhKjioCJ93SrUb7Hihnqxd6X6Iur4u1eiWTUDsGeV9g1bkquiuDl2qovUnjj7mOoHdWiu/Ax/9Q==";
-      };
-    };
     "gauge-2.7.4" = {
       name = "gauge";
       packageName = "gauge";
@@ -15270,15 +14928,6 @@ let
         sha512 = "vXm0l45VbcHEVlTCzs8M+s0VeYsB2lnlAaThoLKGXr3bE/VWDOelNUnycUPEhKEaXARL2TEFjBOyUiM6+55KBg==";
       };
     };
-    "hash-wasm-4.12.0" = {
-      name = "hash-wasm";
-      packageName = "hash-wasm";
-      version = "4.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hash-wasm/-/hash-wasm-4.12.0.tgz";
-        sha512 = "+/2B2rYLb48I/evdOIhP+K/DD2ca2fgBjp6O+GBEnCDk2e4rpeXIK8GvIyRPjTezgmWn9gmKwkQjjx6BtqDHVQ==";
-      };
-    };
     "hash.js-1.1.7" = {
       name = "hash.js";
       packageName = "hash.js";
@@ -15522,15 +15171,6 @@ let
         sha512 = "mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==";
       };
     };
-    "hosted-git-info-3.0.8" = {
-      name = "hosted-git-info";
-      packageName = "hosted-git-info";
-      version = "3.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz";
-        sha512 = "aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==";
-      };
-    };
     "hosted-git-info-4.1.0" = {
       name = "hosted-git-info";
       packageName = "hosted-git-info";
@@ -15630,15 +15270,6 @@ let
         sha512 = "hBxEg3CYXe+rPIua8ETe7tmG3XDn9B0edOE/e9wH2nLczxzgdu0m0aNHY+5wFZiviLWLdANPJTssa92dMcXQ5Q==";
       };
     };
-    "htmlparser2-6.1.0" = {
-      name = "htmlparser2";
-      packageName = "htmlparser2";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz";
-        sha512 = "gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==";
-      };
-    };
     "http-auth-3.1.3" = {
       name = "http-auth";
       packageName = "http-auth";
@@ -16107,15 +15738,6 @@ let
         sha512 = "TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==";
       };
     };
-    "import-from-4.0.0" = {
-      name = "import-from";
-      packageName = "import-from";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/import-from/-/import-from-4.0.0.tgz";
-        sha512 = "P9J71vT5nLlDeV8FHs5nNxaLbrpfAV5cF5srvbZfpwpcJoM/xZR3hiv+q+SAnuSmuGbXMWud063iIMx/V/EWZQ==";
-      };
-    };
     "import-lazy-2.1.0" = {
       name = "import-lazy";
       packageName = "import-lazy";
@@ -17178,15 +16800,6 @@ let
         sha512 = "qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==";
       };
     };
-    "is-invalid-path-0.1.0" = {
-      name = "is-invalid-path";
-      packageName = "is-invalid-path";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-invalid-path/-/is-invalid-path-0.1.0.tgz";
-        sha512 = "aZMG0T3F34mTg4eTdszcGXx54oiZ4NtHSft3hWNJMGJXUUqdIj3cOZuHcU0nCWWcY3jd7yRe/3AEm3vSNTpBGQ==";
-      };
-    };
     "is-lambda-1.0.1" = {
       name = "is-lambda";
       packageName = "is-lambda";
@@ -17700,15 +17313,6 @@ let
         sha512 = "rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q==";
       };
     };
-    "is-valid-path-0.1.1" = {
-      name = "is-valid-path";
-      packageName = "is-valid-path";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-valid-path/-/is-valid-path-0.1.1.tgz";
-        sha512 = "+kwPrVDu9Ms03L90Qaml+79+6DZHqHyRoANI6IsZJ/g8frhnfchDOBCa0RbQ6/kdHt5CS5OeIEyrYznNuVN+8A==";
-      };
-    };
     "is-weakmap-2.0.2" = {
       name = "is-weakmap";
       packageName = "is-weakmap";
@@ -17979,15 +17583,6 @@ let
         sha512 = "b2Zna/wGIyTzi0Gemg27JYUaRyTyBETw5GnqyVQMr71uojOYMrgkD2+Px3bG2ZFi7/zTUXJSDoGoBOhMixq7tg==";
       };
     };
-    "joi-17.13.3" = {
-      name = "joi";
-      packageName = "joi";
-      version = "17.13.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/joi/-/joi-17.13.3.tgz";
-        sha512 = "otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==";
-      };
-    };
     "jose-5.9.6" = {
       name = "jose";
       packageName = "jose";
@@ -18744,15 +18339,6 @@ let
         sha512 = "0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==";
       };
     };
-    "kleur-3.0.3" = {
-      name = "kleur";
-      packageName = "kleur";
-      version = "3.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz";
-        sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==";
-      };
-    };
     "kleur-4.1.5" = {
       name = "kleur";
       packageName = "kleur";
@@ -19059,15 +18645,6 @@ let
         sha512 = "iyAZCeyD+c1gPyE9qpFu8af0Y+MRtmKOncdGoA2S5EY8iFq99dmmvkNnHiWo+pj0s7yH7l3KPIgee77tKpXPWQ==";
       };
     };
-    "lmdb-2.5.3" = {
-      name = "lmdb";
-      packageName = "lmdb";
-      version = "2.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lmdb/-/lmdb-2.5.3.tgz";
-        sha512 = "iBA0cb13CobBSoGJLfZgnrykLlfJipDAnvtf+YwIqqzBEsTeQYsXrHaSBkaHd5wCWeabwrNvhjZoFMUrlo+eLw==";
-      };
-    };
     "load-bmfont-1.4.2" = {
       name = "load-bmfont";
       packageName = "load-bmfont";
@@ -19194,15 +18771,6 @@ let
         sha512 = "gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==";
       };
     };
-    "lock-1.1.0" = {
-      name = "lock";
-      packageName = "lock";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lock/-/lock-1.1.0.tgz";
-        sha512 = "NZQIJJL5Rb9lMJ0Yl1JoVr9GSdo4HTPsUEWsSFzB8dE8DSoiLCVavWZPi7Rnlv/o73u6I24S/XYc/NmG4l8EKA==";
-      };
-    };
     "lodash-3.10.1" = {
       name = "lodash";
       packageName = "lodash";
@@ -22075,15 +21643,6 @@ let
         sha512 = "VoY2AaoowHZLLKyEb5FRzuhdSzXn5quGjcMKJOJHJPxp9baYZx5t6jiHUhp5aNRlqqlt+5GXQGovMLNKsrm1hg==";
       };
     };
-    "msgpackr-1.11.2" = {
-      name = "msgpackr";
-      packageName = "msgpackr";
-      version = "1.11.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/msgpackr/-/msgpackr-1.11.2.tgz";
-        sha512 = "F9UngXRlPyWCDEASDpTf6c9uNhGPTqnTeLVt7bN+bU1eajoR/8V9ys2BRaV5C/e5ihE6sJ9uPIKaYt6bFuO32g==";
-      };
-    };
     "multicast-dns-6.2.3" = {
       name = "multicast-dns";
       packageName = "multicast-dns";
@@ -22652,24 +22211,6 @@ let
         sha512 = "LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==";
       };
     };
-    "node-gyp-build-optional-packages-5.0.3" = {
-      name = "node-gyp-build-optional-packages";
-      packageName = "node-gyp-build-optional-packages";
-      version = "5.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-gyp-build-optional-packages/-/node-gyp-build-optional-packages-5.0.3.tgz";
-        sha512 = "k75jcVzk5wnnc/FMxsf4udAoTEUv2jY3ycfdSd3yWu6Cnd1oee6/CfZJApyscA4FJOmdoixWwiwOyf16RzD5JA==";
-      };
-    };
-    "node-object-hash-2.3.10" = {
-      name = "node-object-hash";
-      packageName = "node-object-hash";
-      version = "2.3.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-object-hash/-/node-object-hash-2.3.10.tgz";
-        sha512 = "jY5dPJzw6NHd/KPSfPKJ+IHoFS81/tJ43r34ZeNMXGzCOM8jwQDCD12HYayKIB6MuznrnqIYy2e891NA2g0ibA==";
-      };
-    };
     "node-readfiles-0.2.0" = {
       name = "node-readfiles";
       packageName = "node-readfiles";
@@ -23102,15 +22643,6 @@ let
         sha512 = "a9GSOIql5IqgWJR3F/JXG4KpJTA3Z53Cj0MeMvGpglytB1nxE4PdFNC0jINe27CS7cGivoynwc054EzCcT3M3w==";
       };
     };
-    "nth-check-2.1.1" = {
-      name = "nth-check";
-      packageName = "nth-check";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz";
-        sha512 = "lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==";
-      };
-    };
     "num-sort-3.0.0" = {
       name = "num-sort";
       packageName = "num-sort";
@@ -23579,15 +23111,6 @@ let
         sha512 = "9asTNB9IkKEzWMcHmVZE7Ts3kC9G7AFHfs8i7caD8HbI76gEjdkId4z/AkP83xdZsH7PLAnnbl47qZkXuxpArw==";
       };
     };
-    "opentracing-0.14.7" = {
-      name = "opentracing";
-      packageName = "opentracing";
-      version = "0.14.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/opentracing/-/opentracing-0.14.7.tgz";
-        sha512 = "vz9iS7MJ5+Bp1URw8Khvdyw1H/hGvzHWlKQ7eRrQojSCDL1/SrWfrY9QebLw97n2deyRtzHRC3MkQfVNUCo91Q==";
-      };
-    };
     "openurl-1.1.1" = {
       name = "openurl";
       packageName = "openurl";
@@ -23705,15 +23228,6 @@ let
         sha512 = "weP+BZ8MVNnlCm8c0Qdc1WSWq4Qn7I+9CJGm7Qali6g44e/PUzbjNqJX5NJ9ljlNMosfJvg1fKEGILklK9cwnw==";
       };
     };
-    "ordered-binary-1.5.3" = {
-      name = "ordered-binary";
-      packageName = "ordered-binary";
-      version = "1.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ordered-binary/-/ordered-binary-1.5.3.tgz";
-        sha512 = "oGFr3T+pYdTGJ+YFEILMpS3es+GiIbs9h/XQrclBXUtd44ey7XwfsMzM31f64I1SQOawDoDr/D823kNCADI8TA==";
-      };
-    };
     "org-regex-1.0.0" = {
       name = "org-regex";
       packageName = "org-regex";
@@ -25325,15 +24839,6 @@ let
         sha512 = "QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==";
       };
     };
-    "pretty-error-2.1.2" = {
-      name = "pretty-error";
-      packageName = "pretty-error";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pretty-error/-/pretty-error-2.1.2.tgz";
-        sha512 = "EY5oDzmsX5wvuynAByrmY0P0hcp+QpnAKbJng2A2MPjVKXCxrDSUkzghVJ4ZGPIv+JC4gX8fPUWscC0RtjsWGw==";
-      };
-    };
     "pretty-hrtime-1.0.3" = {
       name = "pretty-hrtime";
       packageName = "pretty-hrtime";
@@ -25523,15 +25028,6 @@ let
         sha512 = "jDK5yEbAakJmNm+260gZG1+PuzX3jT5Jy0VZAUGrrW9RQ1JEWEDEVNnhO70mL3+U5r6bSJo02xsE34wOS/LnrA==";
       };
     };
-    "prompts-2.4.2" = {
-      name = "prompts";
-      packageName = "prompts";
-      version = "2.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz";
-        sha512 = "NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==";
-      };
-    };
     "proper-lockfile-4.1.2" = {
       name = "proper-lockfile";
       packageName = "proper-lockfile";
@@ -27197,15 +26693,6 @@ let
         sha512 = "/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw==";
       };
     };
-    "renderkid-2.0.7" = {
-      name = "renderkid";
-      packageName = "renderkid";
-      version = "2.0.7";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/renderkid/-/renderkid-2.0.7.tgz";
-        sha512 = "oCcFyxaMrKsKcTY59qnCAtmDVSLfPbrv6A3tVbPdFMMrv5jaK10V6m40cKsoPNhAqN6rmHW9sswW4o3ruSrwUQ==";
-      };
-    };
     "repeat-element-1.1.4" = {
       name = "repeat-element";
       packageName = "repeat-element";
@@ -28727,15 +28214,6 @@ let
         sha512 = "94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==";
       };
     };
-    "sisteransi-1.0.5" = {
-      name = "sisteransi";
-      packageName = "sisteransi";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz";
-        sha512 = "bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==";
-      };
-    };
     "skin-tone-4.0.0" = {
       name = "skin-tone";
       packageName = "skin-tone";
@@ -30725,15 +30203,6 @@ let
         sha512 = "jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==";
       };
     };
-    "tmp-0.2.3" = {
-      name = "tmp";
-      packageName = "tmp";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tmp/-/tmp-0.2.3.tgz";
-        sha512 = "nZD7m9iCPC5g0pYmcaxogYKggSfLsdxl8of3Q/oIbqCqLLIO9IAF0GWjX1z9NZRHPiXv8Wex4yDCaZsgEw0Y8w==";
-      };
-    };
     "to-array-0.1.4" = {
       name = "to-array";
       packageName = "to-array";
@@ -32417,15 +31886,6 @@ let
         sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==";
       };
     };
-    "utila-0.4.0" = {
-      name = "utila";
-      packageName = "utila";
-      version = "0.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz";
-        sha512 = "Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA==";
-      };
-    };
     "utile-0.2.1" = {
       name = "utile";
       packageName = "utile";
@@ -33362,15 +32822,6 @@ let
         sha512 = "XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg==";
       };
     };
-    "weak-lru-cache-1.2.2" = {
-      name = "weak-lru-cache";
-      packageName = "weak-lru-cache";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/weak-lru-cache/-/weak-lru-cache-1.2.2.tgz";
-        sha512 = "DEAoo25RfSYMuTGc9vPJzZcZullwIqRDSI9LOy+fkCJPi6hykCnfKaXTuPBDuXAUcqHXyOgFtHNp/kB2FjYHbw==";
-      };
-    };
     "web-namespaces-2.0.1" = {
       name = "web-namespaces";
       packageName = "web-namespaces";
@@ -34325,24 +33776,6 @@ let
         sha512 = "0LPOt3AxKqMdFBZA3HBAt/t/8vIKq7VaQYbuA8WxCgung+p9TVyKRYdpvCb80HcdTN2NkbIKbhNwKUfm3tQywQ==";
       };
     };
-    "yoga-layout-prebuilt-1.10.0" = {
-      name = "yoga-layout-prebuilt";
-      packageName = "yoga-layout-prebuilt";
-      version = "1.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yoga-layout-prebuilt/-/yoga-layout-prebuilt-1.10.0.tgz";
-        sha512 = "YnOmtSbv4MTf7RGJMK0FvZ+KD8OEe/J5BNnR0GHhD8J/XcG/Qvxgszm0Un6FTHWW4uHlTgP0IztiXQnGyIR45g==";
-      };
-    };
-    "yurnalist-2.1.0" = {
-      name = "yurnalist";
-      packageName = "yurnalist";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yurnalist/-/yurnalist-2.1.0.tgz";
-        sha512 = "PgrBqosQLM3gN2xBFIMDLACRTV9c365VqityKKpSTWpwR+U4LAFR3rSVyEoscWlu3EzX9+Y0I86GXUKxpHFl6w==";
-      };
-    };
     "zeromq-5.3.1" = {
       name = "zeromq";
       packageName = "zeromq";
@@ -42505,425 +41938,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  gatsby-cli = nodeEnv.buildNodePackage {
-    name = "gatsby-cli";
-    packageName = "gatsby-cli";
-    version = "5.14.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/gatsby-cli/-/gatsby-cli-5.14.0.tgz";
-      sha512 = "NvsWsuZdpNRStmDsNZaYveifFrFqFNy4rnFCLAWWghyxUks8qhGwy6wrz2kcUK+Y2sRJJn1eIjgwzi1AyFn5fQ==";
-    };
-    dependencies = [
-      sources."@ampproject/remapping-2.3.0"
-      sources."@babel/code-frame-7.26.2"
-      sources."@babel/compat-data-7.26.8"
-      (
-        sources."@babel/core-7.26.10"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      sources."@babel/generator-7.26.10"
-      sources."@babel/helper-annotate-as-pure-7.25.9"
-      (
-        sources."@babel/helper-compilation-targets-7.26.5"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      (
-        sources."@babel/helper-create-class-features-plugin-7.26.9"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      sources."@babel/helper-member-expression-to-functions-7.25.9"
-      sources."@babel/helper-module-imports-7.25.9"
-      sources."@babel/helper-module-transforms-7.26.0"
-      sources."@babel/helper-optimise-call-expression-7.25.9"
-      sources."@babel/helper-plugin-utils-7.26.5"
-      sources."@babel/helper-replace-supers-7.26.5"
-      sources."@babel/helper-skip-transparent-expression-wrappers-7.25.9"
-      sources."@babel/helper-string-parser-7.25.9"
-      sources."@babel/helper-validator-identifier-7.25.9"
-      sources."@babel/helper-validator-option-7.25.9"
-      sources."@babel/helpers-7.26.10"
-      sources."@babel/parser-7.26.10"
-      sources."@babel/plugin-syntax-jsx-7.25.9"
-      sources."@babel/plugin-syntax-typescript-7.25.9"
-      sources."@babel/plugin-transform-modules-commonjs-7.26.3"
-      sources."@babel/plugin-transform-typescript-7.26.8"
-      sources."@babel/preset-typescript-7.26.0"
-      sources."@babel/runtime-7.26.10"
-      sources."@babel/template-7.26.9"
-      sources."@babel/traverse-7.26.10"
-      sources."@babel/types-7.26.10"
-      sources."@hapi/hoek-9.3.0"
-      sources."@hapi/topo-5.1.0"
-      sources."@jridgewell/gen-mapping-0.3.8"
-      sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.5.0"
-      sources."@jridgewell/trace-mapping-0.3.25"
-      sources."@lmdb/lmdb-darwin-arm64-2.5.3"
-      sources."@lmdb/lmdb-darwin-x64-2.5.3"
-      sources."@lmdb/lmdb-linux-arm-2.5.3"
-      sources."@lmdb/lmdb-linux-arm64-2.5.3"
-      sources."@lmdb/lmdb-linux-x64-2.5.3"
-      sources."@lmdb/lmdb-win32-x64-2.5.3"
-      sources."@sideway/address-4.1.5"
-      sources."@sideway/formula-3.0.1"
-      sources."@sideway/pinpoint-2.0.0"
-      sources."@sindresorhus/is-4.6.0"
-      sources."@szmarczak/http-timer-4.0.6"
-      sources."@tokenizer/token-0.3.0"
-      sources."@types/cacheable-request-6.0.3"
-      sources."@types/common-tags-1.8.4"
-      sources."@types/http-cache-semantics-4.0.4"
-      sources."@types/keyv-3.1.4"
-      sources."@types/node-22.13.10"
-      sources."@types/responselike-1.0.3"
-      sources."@types/yoga-layout-1.9.2"
-      sources."abort-controller-3.0.0"
-      sources."ansi-align-3.0.1"
-      (
-        sources."ansi-escapes-4.3.2"
-        // {
-          dependencies = [
-            sources."type-fest-0.21.3"
-          ];
-        }
-      )
-      sources."ansi-regex-4.1.1"
-      sources."ansi-styles-4.3.0"
-      sources."base64-js-1.5.1"
-      sources."better-opn-2.1.1"
-      sources."boolbase-1.0.0"
-      sources."boxen-5.1.2"
-      sources."browserslist-4.24.4"
-      sources."buffer-6.0.3"
-      sources."cacheable-lookup-5.0.4"
-      (
-        sources."cacheable-request-7.0.4"
-        // {
-          dependencies = [
-            sources."get-stream-5.2.0"
-          ];
-        }
-      )
-      sources."camelcase-6.3.0"
-      sources."caniuse-lite-1.0.30001704"
-      sources."chalk-4.1.2"
-      sources."chardet-0.7.0"
-      sources."ci-info-2.0.0"
-      sources."cli-boxes-2.2.1"
-      sources."cli-cursor-3.1.0"
-      sources."cli-width-3.0.0"
-      (
-        sources."clipboardy-4.0.0"
-        // {
-          dependencies = [
-            sources."execa-8.0.1"
-            sources."get-stream-8.0.1"
-            sources."human-signals-5.0.0"
-            sources."is-stream-3.0.0"
-            sources."is-wsl-3.1.0"
-            sources."mimic-fn-4.0.0"
-            sources."npm-run-path-5.3.0"
-            sources."onetime-6.0.0"
-            sources."path-key-4.0.0"
-            sources."signal-exit-4.1.0"
-            sources."strip-final-newline-3.0.0"
-          ];
-        }
-      )
-      (
-        sources."cliui-6.0.0"
-        // {
-          dependencies = [
-            sources."wrap-ansi-6.2.0"
-          ];
-        }
-      )
-      sources."clone-response-1.0.3"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."common-tags-1.8.2"
-      sources."configstore-5.0.1"
-      sources."convert-hrtime-3.0.0"
-      sources."convert-source-map-2.0.0"
-      sources."create-gatsby-3.14.0"
-      sources."cross-spawn-7.0.6"
-      sources."crypto-random-string-2.0.0"
-      sources."css-select-4.3.0"
-      sources."css-what-6.1.0"
-      sources."debug-4.4.0"
-      sources."decamelize-1.2.0"
-      (
-        sources."decompress-response-6.0.0"
-        // {
-          dependencies = [
-            sources."mimic-response-3.1.0"
-          ];
-        }
-      )
-      sources."defer-to-connect-2.0.1"
-      sources."dom-converter-0.2.0"
-      sources."dom-serializer-1.4.1"
-      sources."domelementtype-2.3.0"
-      sources."domhandler-4.3.1"
-      sources."domutils-2.8.0"
-      sources."dot-prop-5.3.0"
-      sources."electron-to-chromium-1.5.118"
-      sources."emoji-regex-8.0.0"
-      (
-        sources."encoding-0.1.13"
-        // {
-          dependencies = [
-            sources."iconv-lite-0.6.3"
-          ];
-        }
-      )
-      sources."end-of-stream-1.4.4"
-      sources."entities-2.2.0"
-      sources."envinfo-7.14.0"
-      sources."escalade-3.2.0"
-      sources."escape-string-regexp-1.0.5"
-      sources."event-target-shim-5.0.1"
-      sources."events-3.3.0"
-      sources."execa-5.1.1"
-      sources."external-editor-3.1.0"
-      sources."fastq-1.19.1"
-      sources."figures-3.2.0"
-      sources."file-type-16.5.4"
-      sources."find-up-4.1.0"
-      sources."fs-exists-cached-1.0.0"
-      sources."fs-extra-11.3.0"
-      (
-        sources."gatsby-core-utils-4.14.0"
-        // {
-          dependencies = [
-            sources."tmp-0.2.3"
-          ];
-        }
-      )
-      sources."gensync-1.0.0-beta.2"
-      sources."get-caller-file-2.0.5"
-      sources."get-stream-6.0.1"
-      sources."globals-11.12.0"
-      sources."got-11.8.6"
-      sources."graceful-fs-4.2.11"
-      sources."has-flag-4.0.0"
-      sources."hash-wasm-4.12.0"
-      (
-        sources."hosted-git-info-3.0.8"
-        // {
-          dependencies = [
-            sources."lru-cache-6.0.0"
-            sources."yallist-4.0.0"
-          ];
-        }
-      )
-      sources."htmlparser2-6.1.0"
-      sources."http-cache-semantics-4.1.1"
-      sources."http2-wrapper-1.0.3"
-      sources."human-signals-2.1.0"
-      sources."iconv-lite-0.4.24"
-      sources."ieee754-1.2.1"
-      sources."import-from-4.0.0"
-      sources."imurmurhash-0.1.4"
-      sources."inquirer-7.3.3"
-      sources."is-ci-2.0.0"
-      sources."is-docker-2.2.1"
-      sources."is-extglob-1.0.0"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-glob-2.0.1"
-      (
-        sources."is-inside-container-1.0.0"
-        // {
-          dependencies = [
-            sources."is-docker-3.0.0"
-          ];
-        }
-      )
-      sources."is-invalid-path-0.1.0"
-      sources."is-obj-2.0.0"
-      sources."is-stream-2.0.1"
-      sources."is-typedarray-1.0.0"
-      sources."is-valid-path-0.1.1"
-      sources."is-wsl-2.2.0"
-      sources."is64bit-2.0.0"
-      sources."isexe-2.0.0"
-      sources."joi-17.13.3"
-      sources."js-tokens-4.0.0"
-      sources."jsesc-3.1.0"
-      sources."json-buffer-3.0.1"
-      sources."json5-2.2.3"
-      sources."jsonfile-6.1.0"
-      sources."keyv-4.5.4"
-      sources."kleur-3.0.3"
-      sources."lmdb-2.5.3"
-      sources."locate-path-5.0.0"
-      sources."lock-1.1.0"
-      sources."lodash-4.17.21"
-      sources."lowercase-keys-2.0.0"
-      sources."lru-cache-5.1.1"
-      (
-        sources."make-dir-3.1.0"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      sources."merge-stream-2.0.0"
-      sources."mimic-fn-2.1.0"
-      sources."mimic-response-1.0.1"
-      sources."ms-2.1.3"
-      sources."msgpackr-1.11.2"
-      sources."mute-stream-0.0.8"
-      sources."node-addon-api-4.3.0"
-      sources."node-fetch-2.7.0"
-      sources."node-gyp-build-optional-packages-5.0.3"
-      sources."node-object-hash-2.3.10"
-      sources."node-releases-2.0.19"
-      sources."normalize-url-6.1.0"
-      sources."npm-run-path-4.0.1"
-      sources."nth-check-2.1.1"
-      sources."once-1.4.0"
-      sources."onetime-5.1.2"
-      sources."open-7.4.2"
-      sources."opentracing-0.14.7"
-      sources."ordered-binary-1.5.3"
-      sources."os-tmpdir-1.0.2"
-      sources."p-cancelable-2.1.1"
-      sources."p-limit-2.3.0"
-      sources."p-locate-4.1.0"
-      sources."p-try-2.2.0"
-      sources."path-exists-4.0.0"
-      sources."path-key-3.1.1"
-      sources."peek-readable-4.1.0"
-      sources."picocolors-1.1.1"
-      sources."pretty-error-2.1.2"
-      sources."process-0.11.10"
-      sources."progress-2.0.3"
-      sources."prompts-2.4.2"
-      sources."proper-lockfile-4.1.2"
-      sources."pump-3.0.2"
-      sources."quick-lru-5.1.1"
-      sources."read-1.0.7"
-      sources."readable-stream-4.7.0"
-      sources."readable-web-to-node-stream-3.0.4"
-      sources."redux-4.2.1"
-      sources."regenerator-runtime-0.14.1"
-      (
-        sources."renderkid-2.0.7"
-        // {
-          dependencies = [
-            sources."ansi-regex-2.1.1"
-            sources."strip-ansi-3.0.1"
-          ];
-        }
-      )
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-2.0.0"
-      sources."resolve-alpn-1.2.1"
-      sources."resolve-cwd-3.0.0"
-      sources."resolve-from-5.0.0"
-      sources."responselike-2.0.1"
-      sources."restore-cursor-3.1.0"
-      sources."retry-0.12.0"
-      sources."reusify-1.1.0"
-      sources."run-async-2.4.1"
-      sources."rxjs-6.6.7"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."semver-7.7.1"
-      sources."set-blocking-2.0.0"
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
-      sources."signal-exit-3.0.7"
-      sources."sisteransi-1.0.5"
-      sources."stack-trace-0.0.10"
-      sources."string-width-4.2.3"
-      sources."string_decoder-1.3.0"
-      (
-        sources."strip-ansi-6.0.1"
-        // {
-          dependencies = [
-            sources."ansi-regex-5.0.1"
-          ];
-        }
-      )
-      sources."strip-final-newline-2.0.0"
-      sources."strtok3-6.3.0"
-      sources."supports-color-7.2.0"
-      sources."system-architecture-0.1.0"
-      sources."through-2.3.8"
-      sources."tmp-0.0.33"
-      sources."token-types-4.2.1"
-      sources."tr46-0.0.3"
-      sources."tslib-1.14.1"
-      sources."type-fest-0.20.2"
-      sources."typedarray-to-buffer-3.1.5"
-      sources."undici-types-6.20.0"
-      sources."unique-string-2.0.0"
-      sources."universalify-2.0.1"
-      sources."update-browserslist-db-1.1.3"
-      sources."utila-0.4.0"
-      sources."weak-lru-cache-1.2.2"
-      sources."webidl-conversions-3.0.1"
-      sources."whatwg-url-5.0.0"
-      sources."which-2.0.2"
-      sources."which-module-2.0.1"
-      sources."widest-line-3.1.0"
-      sources."wrap-ansi-7.0.0"
-      sources."wrappy-1.0.2"
-      sources."write-file-atomic-3.0.3"
-      sources."xdg-basedir-4.0.0"
-      sources."y18n-4.0.3"
-      sources."yallist-3.1.1"
-      sources."yargs-15.4.1"
-      (
-        sources."yargs-parser-18.1.3"
-        // {
-          dependencies = [
-            sources."camelcase-5.3.1"
-          ];
-        }
-      )
-      sources."yoga-layout-prebuilt-1.10.0"
-      (
-        sources."yurnalist-2.1.0"
-        // {
-          dependencies = [
-            sources."ansi-styles-3.2.1"
-            sources."chalk-2.4.2"
-            sources."color-convert-1.9.3"
-            sources."color-name-1.1.3"
-            sources."has-flag-3.0.0"
-            sources."strip-ansi-5.2.0"
-            sources."supports-color-5.5.0"
-          ];
-        }
-      )
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Gatsby command-line interface for creating new sites and running Gatsby commands";
-      homepage = "https://github.com/gatsbyjs/gatsby/tree/master/packages/gatsby-cli#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   grunt-cli = nodeEnv.buildNodePackage {
     name = "grunt-cli";
     packageName = "grunt-cli";

From 2bb0ff7f6cd0d95f41a70690c8089c3d8833afb6 Mon Sep 17 00:00:00 2001
From: misilelab <misileminecord@gmail.com>
Date: Thu, 6 Nov 2025 09:19:21 +0900
Subject: [PATCH 5755/6226] process-compose: 1.76.0 -> 1.76.1

https://github.com/F1bonacc1/process-compose/releases/tag/v1.76.1
Signed-off-by: misilelab <misileminecord@gmail.com>
---
 pkgs/by-name/pr/process-compose/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pr/process-compose/package.nix b/pkgs/by-name/pr/process-compose/package.nix
index f3594c4de5d6..54d909645368 100644
--- a/pkgs/by-name/pr/process-compose/package.nix
+++ b/pkgs/by-name/pr/process-compose/package.nix
@@ -10,13 +10,13 @@ let
 in
 buildGoModule (finalAttrs: {
   pname = "process-compose";
-  version = "1.76.0";
+  version = "1.76.1";
 
   src = fetchFromGitHub {
     owner = "F1bonacc1";
     repo = "process-compose";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-DYWMtW2JLUbt2Bk/dSBjRc4GHpav0dr8sQOYeBkL/3c=";
+    hash = "sha256-WdTvOBp9UiuCMNdi80jEWwkAhS4zoli4tf8JERPN3Nk=";
 
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.

From 2d6d633943d831e76afa0fe5f5b127b59b213eb8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 00:19:50 +0000
Subject: [PATCH 5756/6226] dependabot-cli: 1.77.0 -> 1.78.1

---
 pkgs/by-name/de/dependabot-cli/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix
index 8ad2bfa76477..a2a2e53d88c4 100644
--- a/pkgs/by-name/de/dependabot-cli/package.nix
+++ b/pkgs/by-name/de/dependabot-cli/package.nix
@@ -12,7 +12,7 @@
 }:
 let
   pname = "dependabot-cli";
-  version = "1.77.0";
+  version = "1.78.1";
 
   # `tag` is what `dependabot` uses to find the relevant docker images.
   tag = "nixpkgs-dependabot-cli-${version}";
@@ -20,12 +20,12 @@ let
   # Get these hashes from
   # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag}
   updateJobProxy.imageDigest = "sha256:53f33581efa03f1ed691b44896b231923888ba24b0e12cdc440aac2333d532c5";
-  updateJobProxy.hash = "sha256-GcCci6YcbZb4DgP91KpdBzwmnk5ffUJSHLtDCPyysZ4=";
+  updateJobProxy.hash = "sha256-M7vf5YS4ORG0TY+iHXL6nNAJhwgtO4PZbO4EEBBT6qo=";
 
   # Get these hashes from
   # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag}
-  updaterGitHubActions.imageDigest = "sha256:c58d4bebdfcaf0664ad1025e509d4b77c35ba4999b4bfad2519b2d6e0d84603d";
-  updaterGitHubActions.hash = "sha256-P2kcpbYKj29iW3ma808LyVwhEYlcr+4JJuvOD6fGNoc=";
+  updaterGitHubActions.imageDigest = "sha256:a719a18ffb9aa87dba253be94e137ba7561fdf59f60d9a67c3ebc840ab2058a7";
+  updaterGitHubActions.hash = "sha256-nb8uX3pu+m7cu6Owi9EnWmUT4Epr4yXScSIFBR/Kb6Q=";
 in
 buildGoModule {
   inherit pname version;
@@ -34,7 +34,7 @@ buildGoModule {
     owner = "dependabot";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-Uo5QuYOEd74EiEIkf17WsjlR81x9VbOGtZcoeqegIsc=";
+    hash = "sha256-Q6WZ7FrcEGfUfG/3Zx8Z4Jd+CB6pEcw1fDo3AF8ML4M=";
   };
 
   vendorHash = "sha256-dD48OKpuGAJAro7qV4tqpf/uENV2X1VQ2kUvAuJLXc0=";

From 310161f7c2159b2a6f62a1269ac0f6fd3cb8936f Mon Sep 17 00:00:00 2001
From: Diogo Correia <me@diogotc.com>
Date: Thu, 6 Nov 2025 00:32:58 +0000
Subject: [PATCH 5757/6226] immich-go: skip pre-releases on update script

Uses the `--use-github-releases` which correctly filters out
pre-releases. [1]

[1]: https://github.com/Mic92/nix-update/pull/403
---
 pkgs/by-name/im/immich-go/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/im/immich-go/package.nix b/pkgs/by-name/im/immich-go/package.nix
index fdfb91acc17c..3bf6a481767a 100644
--- a/pkgs/by-name/im/immich-go/package.nix
+++ b/pkgs/by-name/im/immich-go/package.nix
@@ -55,7 +55,7 @@ buildGoModule rec {
   ];
 
   passthru = {
-    updateScript = nix-update-script { };
+    updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; };
     tests.versionTest = testers.testVersion {
       package = immich-go;
       command = "immich-go --version";

From 05ae92b78c0026831b36993e1319a5385ad6c60c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 00:37:06 +0000
Subject: [PATCH 5758/6226] cargo-udeps: 0.1.59 -> 0.1.60

---
 pkgs/by-name/ca/cargo-udeps/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-udeps/package.nix b/pkgs/by-name/ca/cargo-udeps/package.nix
index 0e872eb99b12..1f874a778725 100644
--- a/pkgs/by-name/ca/cargo-udeps/package.nix
+++ b/pkgs/by-name/ca/cargo-udeps/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-udeps";
-  version = "0.1.59";
+  version = "0.1.60";
 
   src = fetchFromGitHub {
     owner = "est31";
     repo = "cargo-udeps";
     rev = "v${version}";
-    sha256 = "sha256-oA/oWXTaQPY7bCBUP52b+PACZXV+32G3/STh+sec6AI=";
+    sha256 = "sha256-NW9yjFUV+o7vv5bYD8nxSWHOXOBnDEk36xze90wYuNg=";
   };
 
-  cargoHash = "sha256-X+Y2ialZnwusy3XVnXiTcGmSYsKsFOmEOL4Gc5SgXWU=";
+  cargoHash = "sha256-vQvtc/CwV1aHeREzmzO8k1FcebbEp3FKMAJb0v2aQig=";
 
   nativeBuildInputs = [ pkg-config ];
 

From d40336ac678729af86964112066a97ad6d9791bc Mon Sep 17 00:00:00 2001
From: thesn10 <38666407+thesn10@users.noreply.github.com>
Date: Sun, 13 Jul 2025 21:17:32 +0200
Subject: [PATCH 5759/6226] maintainers: add thesn

---
 maintainers/maintainer-list.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index abe14e72f668..eedff36b5640 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -25956,6 +25956,11 @@
     githubId = 91203390;
     name = "Felix Kimmel";
   };
+  thesn = {
+    github = "thesn10";
+    githubId = 38666407;
+    name = "TheSN";
+  };
   thesola10 = {
     email = "me@thesola.io";
     github = "Thesola10";

From 3761916b05b72c28074fd7471ea3b9809884bdcb Mon Sep 17 00:00:00 2001
From: thesn10 <38666407+thesn10@users.noreply.github.com>
Date: Sun, 13 Jul 2025 22:18:57 +0200
Subject: [PATCH 5760/6226] gpac: add ffmpeg support & refactor

---
 pkgs/by-name/gp/gpac/package.nix | 102 +++++++++++++++++++++++++------
 pkgs/top-level/all-packages.nix  |  13 ++++
 2 files changed, 96 insertions(+), 19 deletions(-)

diff --git a/pkgs/by-name/gp/gpac/package.nix b/pkgs/by-name/gp/gpac/package.nix
index 44da242fca32..3b86c7fe2043 100644
--- a/pkgs/by-name/gp/gpac/package.nix
+++ b/pkgs/by-name/gp/gpac/package.nix
@@ -5,35 +5,98 @@
   cctools,
   pkg-config,
   zlib,
+  ffmpeg,
+  freetype,
+  libjpeg,
+  libpng,
+  libmad,
+  faad2,
+  libogg,
+  libvorbis,
+  libtheora,
+  a52dec,
+  nghttp2,
+  openjpeg,
+  libcaca,
+  libXv,
+  mesa,
+  mesa_glu,
+  xvidcore,
+  openssl,
+  jack2,
+  alsa-lib,
+  pulseaudio,
+  SDL2,
+  curl,
+
+  withFullDeps ? false,
+  withFfmpeg ? withFullDeps,
+  releaseChannel ? "stable",
 }:
 
 stdenv.mkDerivation rec {
   pname = "gpac";
-  version = "2.4.0";
+  version = if releaseChannel == "nightly" then "2.4-unstable-2025-07-11" else "2.4.0";
 
-  src = fetchFromGitHub {
-    owner = "gpac";
-    repo = "gpac";
-    rev = "v${version}";
-    hash = "sha256-RADDqc5RxNV2EfRTzJP/yz66p0riyn81zvwU3r9xncM=";
-  };
+  src =
+    if releaseChannel == "nightly" then
+      fetchFromGitHub {
+        owner = "gpac";
+        repo = "gpac";
+        rev = "fe88c3545aadd597b250ccf23271d5d3de50ccc8";
+        hash = "sha256-c6B9Y19ZZ3PLz82GCcjkWzcUQSEK7ufVNEzqHQqOvrI=";
+      }
+    else
+      fetchFromGitHub {
+        owner = "gpac";
+        repo = "gpac";
+        rev = "v${version}";
+        hash = "sha256-RADDqc5RxNV2EfRTzJP/yz66p0riyn81zvwU3r9xncM=";
+      };
 
-  # this is the bare minimum configuration, as I'm only interested in MP4Box
-  # For most other functionality, this should probably be extended
-  nativeBuildInputs = [
-    pkg-config
-  ]
-  ++ lib.optionals stdenv.hostPlatform.isDarwin [
-    cctools
-  ];
+  nativeBuildInputs =
+    [
+      pkg-config
+    ]
+    ++ lib.optionals stdenv.hostPlatform.isDarwin [
+      cctools
+    ]
+    ++ lib.optionals withFfmpeg [
+      ffmpeg
+    ];
 
+  # ref: https://wiki.gpac.io/Build/build/GPAC-Build-Guide-for-Linux/#gpac-easy-build-recommended-for-most-users
   buildInputs = [
     zlib
+  ]
+  ++ lib.optionals withFullDeps [
+    freetype
+    libjpeg
+    libpng
+    libmad
+    faad2
+    libogg
+    libvorbis
+    libtheora
+    a52dec
+    nghttp2
+    openjpeg
+    libcaca
+    libXv
+    mesa
+    mesa_glu
+    xvidcore
+    openssl
+    jack2
+    alsa-lib
+    pulseaudio
+    SDL2
+    curl
   ];
 
   enableParallelBuilding = true;
 
-  meta = with lib; {
+  meta = {
     description = "Open Source multimedia framework for research and academic purposes";
     longDescription = ''
       GPAC is an Open Source multimedia framework for research and academic purposes.
@@ -48,10 +111,11 @@ stdenv.mkDerivation rec {
       And some server tools included in MP4Box and MP42TS applications.
     '';
     homepage = "https://gpac.wp.imt.fr";
-    license = licenses.lgpl21;
-    maintainers = with maintainers; [
+    license = lib.licenses.lgpl21;
+    maintainers = with lib.maintainers; [
       mgdelacroix
+      thesn
     ];
-    platforms = platforms.unix;
+    platforms = lib.platforms.unix;
   };
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dcd95dbaf55d..aaa4994a3284 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14539,4 +14539,17 @@ with pkgs;
   davis = callPackage ../by-name/da/davis/package.nix {
     php = php83; # https://github.com/tchapi/davis/issues/195
   };
+
+  gpac = callPackage ../by-name/gp/gpac/package.nix {
+    ffmpeg = ffmpeg.override {
+      version = "7.0.2";
+      hash = "sha256-6bcTxMt0rH/Nso3X7zhrFNkkmWYtxsbUqVQKh25R1Fs=";
+      ffmpegVariant = "headless";
+    };
+  };
+
+  gpac_nightly = callPackage ../by-name/gp/gpac/package.nix {
+    ffmpeg = ffmpeg-headless;
+    releaseChannel = "nightly";
+  };
 }

From 10bd45330a66da2a5d8af4c3c52175a23ab72e63 Mon Sep 17 00:00:00 2001
From: thesn10 <38666407+thesn10@users.noreply.github.com>
Date: Sun, 26 Oct 2025 15:16:13 +0100
Subject: [PATCH 5761/6226] gpac: 2.4-unstable-2025-07-11 ->
 2.4-unstable-2025-10-26

---
 pkgs/by-name/gp/gpac/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gp/gpac/package.nix b/pkgs/by-name/gp/gpac/package.nix
index 3b86c7fe2043..ea9f1df7280d 100644
--- a/pkgs/by-name/gp/gpac/package.nix
+++ b/pkgs/by-name/gp/gpac/package.nix
@@ -36,15 +36,15 @@
 
 stdenv.mkDerivation rec {
   pname = "gpac";
-  version = if releaseChannel == "nightly" then "2.4-unstable-2025-07-11" else "2.4.0";
+  version = if releaseChannel == "nightly" then "2.4-unstable-2025-10-26" else "2.4.0";
 
   src =
     if releaseChannel == "nightly" then
       fetchFromGitHub {
         owner = "gpac";
         repo = "gpac";
-        rev = "fe88c3545aadd597b250ccf23271d5d3de50ccc8";
-        hash = "sha256-c6B9Y19ZZ3PLz82GCcjkWzcUQSEK7ufVNEzqHQqOvrI=";
+        rev = "e1a54e81b3befba2b0bffd1d4c1cf50da516c5f3";
+        hash = "sha256-jSMBPuWPmTDCebImdmAcCZl0hEQpJK4QMNGcEXgs3A4=";
       }
     else
       fetchFromGitHub {

From aeb70eaff691d9c68429f3ece8b622dc5fcd768f Mon Sep 17 00:00:00 2001
From: Mio <mio@mio19.uk>
Date: Thu, 6 Nov 2025 11:47:32 +1100
Subject: [PATCH 5762/6226] linux/hardened/patches/6.12: v6.12.50-hardened1 ->
 v6.12.56-hardened1

---
 pkgs/os-specific/linux/kernel/hardened/patches.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json
index c8661d3a0fb0..cc9aa8113806 100644
--- a/pkgs/os-specific/linux/kernel/hardened/patches.json
+++ b/pkgs/os-specific/linux/kernel/hardened/patches.json
@@ -2,11 +2,11 @@
     "6.12": {
         "patch": {
             "extra": "-hardened1",
-            "name": "linux-hardened-v6.12.50-hardened1.patch",
-            "sha256": "0bzq364d6i7wis9sdljjkzmbvjnv45hmyqikmxagps2rdh57916p",
-            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.50-hardened1/linux-hardened-v6.12.50-hardened1.patch"
+            "name": "linux-hardened-v6.12.56-hardened1.patch",
+            "sha256": "1s6z7ypkrvd0da5k8wjyidbsi33mgsrj7813nsblrfcs50f65wi4",
+            "url": "https://github.com/anthraxx/linux-hardened/releases/download/v6.12.56-hardened1/linux-hardened-v6.12.56-hardened1.patch"
         },
-        "sha256": "19bjzhxasj4r6m1lhsa486a96axfigbm06kqa2lwa7y2s5sbsdf4",
-        "version": "6.12.50"
+        "sha256": "15pclwn3nbwccdfwcqd3lkmdxwpjkmadhj63acqbzxsjycm2nhsm",
+        "version": "6.12.56"
     }
 }

From ccf31c556a8c00416097c207092d5088a0e4786e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 00:48:59 +0000
Subject: [PATCH 5763/6226] sdl_gamecontrollerdb: 0-unstable-2025-10-26 ->
 0-unstable-2025-11-04

---
 pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix
index fcb51f9dcfcd..a23c318ca5b3 100644
--- a/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix
+++ b/pkgs/by-name/sd/sdl_gamecontrollerdb/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "sdl_gamecontrollerdb";
-  version = "0-unstable-2025-10-26";
+  version = "0-unstable-2025-11-04";
 
   src = fetchFromGitHub {
     owner = "mdqinc";
     repo = "SDL_GameControllerDB";
-    rev = "e40b8910f859cd988124def50dcdb63b2f2ff48b";
-    hash = "sha256-mSTRTtoFaYXS2ywe7g68dKuJD6FG3436HDip4cm8MeM=";
+    rev = "958e252520ece96cd1b03d5ff0d835db2f048991";
+    hash = "sha256-xM/hdwLsNLisXKXLP2Np5enmL/q27xsV4OHSsM5vsuw=";
   };
 
   dontBuild = true;

From 62d9589af359626a841841e8f991bf9bd57cc1bf Mon Sep 17 00:00:00 2001
From: thesn10 <38666407+thesn10@users.noreply.github.com>
Date: Thu, 6 Nov 2025 00:55:23 +0100
Subject: [PATCH 5764/6226] gpac: libjpegturbo, x11, updateScript & refactor

---
 pkgs/by-name/gp/gpac/package.nix | 98 +++++++++++++++++++++-----------
 pkgs/top-level/all-packages.nix  | 13 +----
 2 files changed, 66 insertions(+), 45 deletions(-)

diff --git a/pkgs/by-name/gp/gpac/package.nix b/pkgs/by-name/gp/gpac/package.nix
index ea9f1df7280d..5603ae754edf 100644
--- a/pkgs/by-name/gp/gpac/package.nix
+++ b/pkgs/by-name/gp/gpac/package.nix
@@ -2,12 +2,14 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  gitUpdater,
+  unstableGitUpdater,
   cctools,
   pkg-config,
   zlib,
-  ffmpeg,
+  ffmpeg-headless,
   freetype,
-  libjpeg,
+  libjpeg_turbo,
   libpng,
   libmad,
   faad2,
@@ -18,7 +20,6 @@
   nghttp2,
   openjpeg,
   libcaca,
-  libXv,
   mesa,
   mesa_glu,
   xvidcore,
@@ -28,42 +29,67 @@
   pulseaudio,
   SDL2,
   curl,
+  xorg,
 
   withFullDeps ? false,
   withFfmpeg ? withFullDeps,
   releaseChannel ? "stable",
 }:
 
-stdenv.mkDerivation rec {
+let
+  stable = rec {
+    version = "2.4.0"; # See below TODO.
+    src = fetchFromGitHub {
+      owner = "gpac";
+      repo = "gpac";
+      rev = "v${version}";
+      hash = "sha256-RADDqc5RxNV2EfRTzJP/yz66p0riyn81zvwU3r9xncM=";
+    };
+    updateScript = gitUpdater {
+      odd-unstable = true;
+      rev-prefix = "v";
+      ignoredVersions = "^(abi|test)";
+    };
+  }
+  // {
+    # ffmpeg 7.0.2 works, but 7.1.1 (which is packaged in nixpkgs) doesn't
+    # because v2.4.0 of this package relies on internal private ffmpeg fields.
+    # TODO: remove this, and switch to simply using ffmpeg-headless,
+    #       when updating stable to 2.6
+    ffmpeg-headless = ffmpeg-headless.override {
+      version = "7.0.2";
+      hash = "sha256-6bcTxMt0rH/Nso3X7zhrFNkkmWYtxsbUqVQKh25R1Fs=";
+    };
+  };
+  unstable = {
+    version = "2.4-unstable-2025-10-26";
+    src = fetchFromGitHub {
+      owner = "gpac";
+      repo = "gpac";
+      rev = "e1a54e81b3befba2b0bffd1d4c1cf50da516c5f3";
+      hash = "sha256-jSMBPuWPmTDCebImdmAcCZl0hEQpJK4QMNGcEXgs3A4=";
+    };
+    updateScript = unstableGitUpdater {
+      tagFormat = "v*";
+      tagPrefix = "v";
+    };
+    inherit ffmpeg-headless;
+  };
+  channelToUse = if releaseChannel == "unstable" then unstable else stable;
+in
+stdenv.mkDerivation (finalAttrs: {
   pname = "gpac";
-  version = if releaseChannel == "nightly" then "2.4-unstable-2025-10-26" else "2.4.0";
+  inherit (channelToUse) version src;
 
-  src =
-    if releaseChannel == "nightly" then
-      fetchFromGitHub {
-        owner = "gpac";
-        repo = "gpac";
-        rev = "e1a54e81b3befba2b0bffd1d4c1cf50da516c5f3";
-        hash = "sha256-jSMBPuWPmTDCebImdmAcCZl0hEQpJK4QMNGcEXgs3A4=";
-      }
-    else
-      fetchFromGitHub {
-        owner = "gpac";
-        repo = "gpac";
-        rev = "v${version}";
-        hash = "sha256-RADDqc5RxNV2EfRTzJP/yz66p0riyn81zvwU3r9xncM=";
-      };
-
-  nativeBuildInputs =
-    [
-      pkg-config
-    ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      cctools
-    ]
-    ++ lib.optionals withFfmpeg [
-      ffmpeg
-    ];
+  nativeBuildInputs = [
+    pkg-config
+  ]
+  ++ lib.optionals stdenv.hostPlatform.isDarwin [
+    cctools
+  ]
+  ++ lib.optionals withFfmpeg [
+    channelToUse.ffmpeg-headless
+  ];
 
   # ref: https://wiki.gpac.io/Build/build/GPAC-Build-Guide-for-Linux/#gpac-easy-build-recommended-for-most-users
   buildInputs = [
@@ -71,7 +97,7 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals withFullDeps [
     freetype
-    libjpeg
+    libjpeg_turbo
     libpng
     libmad
     faad2
@@ -82,7 +108,9 @@ stdenv.mkDerivation rec {
     nghttp2
     openjpeg
     libcaca
-    libXv
+    xorg.libX11
+    xorg.libXv
+    xorg.xorgproto
     mesa
     mesa_glu
     xvidcore
@@ -96,6 +124,8 @@ stdenv.mkDerivation rec {
 
   enableParallelBuilding = true;
 
+  passthru.updateScript = channelToUse.updateScript;
+
   meta = {
     description = "Open Source multimedia framework for research and academic purposes";
     longDescription = ''
@@ -118,4 +148,4 @@ stdenv.mkDerivation rec {
     ];
     platforms = lib.platforms.unix;
   };
-}
+})
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aaa4994a3284..1f983ac7f56a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -14540,16 +14540,7 @@ with pkgs;
     php = php83; # https://github.com/tchapi/davis/issues/195
   };
 
-  gpac = callPackage ../by-name/gp/gpac/package.nix {
-    ffmpeg = ffmpeg.override {
-      version = "7.0.2";
-      hash = "sha256-6bcTxMt0rH/Nso3X7zhrFNkkmWYtxsbUqVQKh25R1Fs=";
-      ffmpegVariant = "headless";
-    };
-  };
-
-  gpac_nightly = callPackage ../by-name/gp/gpac/package.nix {
-    ffmpeg = ffmpeg-headless;
-    releaseChannel = "nightly";
+  gpac-unstable = callPackage ../by-name/gp/gpac/package.nix {
+    releaseChannel = "unstable";
   };
 }

From 1efdfd67b43188b7638864756359dc6eb5a26cdb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 01:06:10 +0000
Subject: [PATCH 5765/6226] poliedros: 1.5.0 -> 1.5.2

---
 pkgs/by-name/po/poliedros/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/poliedros/package.nix b/pkgs/by-name/po/poliedros/package.nix
index 8ac5093b4f09..184f06e4cae0 100644
--- a/pkgs/by-name/po/poliedros/package.nix
+++ b/pkgs/by-name/po/poliedros/package.nix
@@ -14,7 +14,7 @@
   nix-update-script,
 }:
 let
-  version = "1.5.0";
+  version = "1.5.2";
 in
 python3Packages.buildPythonApplication {
   pname = "poliedros";
@@ -25,7 +25,7 @@ python3Packages.buildPythonApplication {
     owner = "kriptolix";
     repo = "Poliedros";
     tag = "v${version}";
-    hash = "sha256-1itBovF5xGB8zMedtKKcQ2FJeOd5gT1COrJtwEOgdbk=";
+    hash = "sha256-1xrXR0kY4zq2cafhVgPvWcJD7pEEiZX7tW1/T3Mfe+A=";
   };
 
   nativeBuildInputs = [

From 5da3cfa457421f14bd656e154715c1deada26f7b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 01:18:43 +0000
Subject: [PATCH 5766/6226] mirrord: 3.170.0 -> 3.171.0

---
 pkgs/by-name/mi/mirrord/manifest.json | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json
index 52c5c48ae386..ce4129d59089 100644
--- a/pkgs/by-name/mi/mirrord/manifest.json
+++ b/pkgs/by-name/mi/mirrord/manifest.json
@@ -1,21 +1,21 @@
 {
-  "version": "3.170.0",
+  "version": "3.171.0",
   "assets": {
     "x86_64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.170.0/mirrord_linux_x86_64",
-      "hash": "sha256-q5A4KELOl/rbWxrlBk2XjCOq4A/tFySx46FNhDanTsE="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.171.0/mirrord_linux_x86_64",
+      "hash": "sha256-Xzy8Qvsw/nVTa6PRRdsBbOZHfPGKzRimbOVDa6qqVXc="
     },
     "aarch64-linux": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.170.0/mirrord_linux_aarch64",
-      "hash": "sha256-G8xrksOIqJ//kXYY7tdL9GzKFrt4ttPnviRnCUuyvuk="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.171.0/mirrord_linux_aarch64",
+      "hash": "sha256-7h7eRqypiqv0Ri9Bc61+AkYVm12GPwsPQKYYtMoyLho="
     },
     "aarch64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.170.0/mirrord_mac_universal",
-      "hash": "sha256-N7PS2iNVTb9uuPavyfcMNPughGIJzt9PHeSbNSwST9Y="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.171.0/mirrord_mac_universal",
+      "hash": "sha256-rvlU8erkgb/Sdythejl02w76gaZXB8CmfiW0FMadcA4="
     },
     "x86_64-darwin": {
-      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.170.0/mirrord_mac_universal",
-      "hash": "sha256-N7PS2iNVTb9uuPavyfcMNPughGIJzt9PHeSbNSwST9Y="
+      "url": "https://github.com/metalbear-co/mirrord/releases/download/3.171.0/mirrord_mac_universal",
+      "hash": "sha256-rvlU8erkgb/Sdythejl02w76gaZXB8CmfiW0FMadcA4="
     }
   }
 }

From dc8bfca3e7b457d8cca4036f033f348ec01318de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 02:00:59 +0000
Subject: [PATCH 5767/6226] plantuml-server: 1.2025.8 -> 1.2025.10

---
 pkgs/by-name/pl/plantuml-server/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pl/plantuml-server/package.nix b/pkgs/by-name/pl/plantuml-server/package.nix
index e2fc1900f9c1..1036d73e1973 100644
--- a/pkgs/by-name/pl/plantuml-server/package.nix
+++ b/pkgs/by-name/pl/plantuml-server/package.nix
@@ -7,11 +7,11 @@
 
 stdenv.mkDerivation rec {
   pname = "plantuml-server";
-  version = "1.2025.8";
+  version = "1.2025.10";
 
   src = fetchurl {
     url = "https://github.com/plantuml/plantuml-server/releases/download/v${version}/plantuml-v${version}.war";
-    hash = "sha256-O0hH2cWf8V5RwcdUlzNO8HLSghhTbdC/1mAenxrXB6s=";
+    hash = "sha256-GbFbQRVTQsGstu61FKpAypvopP6peHHMzxFA8yGtRp4=";
   };
 
   dontUnpack = true;

From 29427a5c5ca1666d7d4f01f2c12ade6e07cb6b6e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 02:10:25 +0000
Subject: [PATCH 5768/6226] rsyncy: 2.1.0 -> 2.2.0

---
 pkgs/by-name/rs/rsyncy/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/rs/rsyncy/package.nix b/pkgs/by-name/rs/rsyncy/package.nix
index 131d894de0f5..a4e7f6807591 100644
--- a/pkgs/by-name/rs/rsyncy/package.nix
+++ b/pkgs/by-name/rs/rsyncy/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "rsyncy";
-  version = "2.1.0";
+  version = "2.2.0";
 
   src = fetchFromGitHub {
     owner = "laktak";
     repo = "rsyncy";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-sy0aMYT7xrBfXB3YxLGL49jKVnRpWo5k+3mjQNAOagU=";
+    hash = "sha256-ZWahPfAW6m86C0jdUB8Hfmx2A3i4NLsnAWI0HVoAbcE=";
   };
 
-  vendorHash = "sha256-vexWkbUQdkWrDJVvu2T4z4hbiCANuW0qLNFNSiTmYtY=";
+  vendorHash = "sha256-xEjLMp4hbRrSvHBsuFxYsyNB7s2P876dV1NyAXycGoo=";
 
   ldflags = [
     "-s"

From 77eb3eaf3589f7bf9096944e01865a45d4a5b637 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 02:11:34 +0000
Subject: [PATCH 5769/6226] rusty-psn: 0.5.9 -> 0.5.10

---
 pkgs/by-name/ru/rusty-psn/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ru/rusty-psn/package.nix b/pkgs/by-name/ru/rusty-psn/package.nix
index 3a3304f5f956..4ce2c02cd5ce 100644
--- a/pkgs/by-name/ru/rusty-psn/package.nix
+++ b/pkgs/by-name/ru/rusty-psn/package.nix
@@ -20,16 +20,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "rusty-psn";
-  version = "0.5.9";
+  version = "0.5.10";
 
   src = fetchFromGitHub {
     owner = "RainbowCookie32";
     repo = "rusty-psn";
     tag = "v${version}";
-    hash = "sha256-Al0cT4WaOX7gxOkD5ciRntbGLCCDFSjj83E4n8nXp6I=";
+    hash = "sha256-3sy3PBiV7ioRnYwI2vF6lGVj3Q/Ls6GmENyGePCgQ3k=";
   };
 
-  cargoHash = "sha256-FaKUQk/Q2hE0lZ11QSKA2P2BLlBNih47zzuwpMsblhw=";
+  cargoHash = "sha256-orsCExYx9ZGtda13mmFk7665WFwZ7E7rr5wEcDxc+vY=";
 
   # Tests require network access
   doCheck = false;

From 1a24b14b4fd3adfa79751a3445fb2e0e74eefaf1 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Tue, 28 Oct 2025 12:16:03 +0800
Subject: [PATCH 5770/6226] sing-box: 1.12.11 -> 1.12.12

---
 pkgs/by-name/si/sing-box/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/si/sing-box/package.nix b/pkgs/by-name/si/sing-box/package.nix
index d6762c1fae33..8a29e6815716 100644
--- a/pkgs/by-name/si/sing-box/package.nix
+++ b/pkgs/by-name/si/sing-box/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "sing-box";
-  version = "1.12.11";
+  version = "1.12.12";
 
   src = fetchFromGitHub {
     owner = "SagerNet";
     repo = "sing-box";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-K28Lf5WOd0RNpk7nRettrJLc5WrGgqki5Dj4zxfmZ+4=";
+    hash = "sha256-4TQLaDjZYcm8FVBo06c4rKuXEO2xRGm6cIzpkPwtL/g=";
   };
 
-  vendorHash = "sha256-+p2esP5sKNSPJ2ig9R58PflsMPlrGv+MJCwX0ESMmbc=";
+  vendorHash = "sha256-R9dN2/MmuAeYB9UkNDbhc48SelBMR80nMnptNKD0y9c=";
 
   tags = [
     "with_quic"

From 43d83cb9590d14eb3cddad9501c9b47014e4358a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 5 Nov 2025 17:24:38 -0800
Subject: [PATCH 5771/6226] python3Packages.zigpy-zboss: replace
 pyserial-asyncio with pyserial-asyncio-fast

---
 pkgs/development/python-modules/zigpy-zboss/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/zigpy-zboss/default.nix b/pkgs/development/python-modules/zigpy-zboss/default.nix
index 0a7684367172..0bb39d5ccc2e 100644
--- a/pkgs/development/python-modules/zigpy-zboss/default.nix
+++ b/pkgs/development/python-modules/zigpy-zboss/default.nix
@@ -33,6 +33,12 @@ buildPythonPackage rec {
       excludes = [ "setup.cfg" ];
       hash = "sha256-aC0+FbbtuHDW3ApJDnTG3TUeNWhzecEYVuiSOik03uU=";
     })
+    (fetchpatch {
+      # https://github.com/kardia-as/zigpy-zboss/pull/67
+      name = "replace-pyserial-asyncio-with-pyserial-asyncio-fast.patch";
+      url = "https://github.com/kardia-as/zigpy-zboss/commit/d44ceb537dc16ce020f8c60a0ff35e88672f3455.patch";
+      hash = "sha256-aXWRtBLDr9NLIMNK/xtsYuy/hEB2zHU3YYcRKbguTTo=";
+    })
   ];
 
   pythonRemoveDeps = [ "async_timeout" ];

From afc99bb45c663625c4b882ec6020a730ad661800 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 10:08:45 -0700
Subject: [PATCH 5772/6226] python3Packages.zigpy-zigate: 0.13.3 -> 0.13.4

Diff: https://github.com/zigpy/zigpy-zigate/compare/0.13.3...0.13.4

Changelog: https://github.com/zigpy/zigpy-zigate/releases/tag/0.13.4
---
 pkgs/development/python-modules/zigpy-zigate/default.nix | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/zigpy-zigate/default.nix b/pkgs/development/python-modules/zigpy-zigate/default.nix
index 1d44c28c4976..2651f7a1bc86 100644
--- a/pkgs/development/python-modules/zigpy-zigate/default.nix
+++ b/pkgs/development/python-modules/zigpy-zigate/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "zigpy-zigate";
-  version = "0.13.3";
+  version = "0.13.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy-zigate";
     tag = version;
-    hash = "sha256-reOt0bPPkKDKeu8CESJtLDEmpkOmgopXk65BqBlBIhY=";
+    hash = "sha256-pVDqb2/7Pe9zvhNNTVQfl5EphEjOPdJwvCIoTdZm7S0=";
   };
 
   postPatch = ''
@@ -46,11 +46,6 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "zigpy_zigate" ];
 
-  disabledTestPaths = [
-    # Fails in sandbox
-    "tests/test_application.py "
-  ];
-
   meta = with lib; {
     description = "Library which communicates with ZiGate radios for zigpy";
     homepage = "https://github.com/zigpy/zigpy-zigate";

From fadb4ec4c862b95f19ee34804f2b9f04ce8e576c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sat, 1 Nov 2025 10:26:31 -0700
Subject: [PATCH 5773/6226] python3Packages.zigpy-znp: 0.14.1 -> 0.14.2

Diff: https://github.com/zigpy/zigpy-znp/compare/v0.14.1...v0.14.2

Changelog: https://github.com/zigpy/zigpy-znp/releases/tag/v0.14.2
---
 pkgs/development/python-modules/zigpy-znp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/zigpy-znp/default.nix b/pkgs/development/python-modules/zigpy-znp/default.nix
index 7efb2dbcdce9..cbc45c200bab 100644
--- a/pkgs/development/python-modules/zigpy-znp/default.nix
+++ b/pkgs/development/python-modules/zigpy-znp/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "zigpy-znp";
-  version = "0.14.1";
+  version = "0.14.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "zigpy";
     repo = "zigpy-znp";
     tag = "v${version}";
-    hash = "sha256-V662zDUBMbr+cARxrwt8196Ml4zlGEAudR3BtvY96HM=";
+    hash = "sha256-B4AyCLuhKUdQ0nzwFy5xWXpzR31R50lcC5EJMIJfDKE=";
   };
 
   postPatch = ''

From 731531430df6668693eb639210287e40af5df605 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 5 Nov 2025 09:30:25 -0800
Subject: [PATCH 5774/6226] home-assistant.frontend: 20251001.4 -> 20251105.0

Changelog: https://github.com/home-assistant/frontend/releases/tag/20251105.0
---
 pkgs/servers/home-assistant/frontend.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index f125e084d147..b5b26971c652 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -8,7 +8,7 @@ buildPythonPackage rec {
   # the frontend version corresponding to a specific home-assistant version can be found here
   # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
   pname = "home-assistant-frontend";
-  version = "20251001.4";
+  version = "20251105.0";
   format = "wheel";
 
   src = fetchPypi {
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     pname = "home_assistant_frontend";
     dist = "py3";
     python = "py3";
-    hash = "sha256-yrGIgx8VgCi4G+xWFjy37lI4i1ohPV1bttJfejnkkXA=";
+    hash = "sha256-sQp23ibdVQHEuP016pA1E1xxXB275YNPvDqEFfI15nk=";
   };
 
   # there is nothing to strip in this package

From d6ce4b0376457e35a2c154c1d85d9e607fa34c02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 5 Nov 2025 09:30:38 -0800
Subject: [PATCH 5775/6226] home-assistant.intents: 2025.10.1 -> 2025.10.28

Diff: https://github.com/OHF-Voice/intents-package/compare/2025.10.1...2025.10.28

Changelog: https://github.com/OHF-Voice/intents-package/releases/tag/2025.10.28
---
 pkgs/servers/home-assistant/intents.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/intents.nix b/pkgs/servers/home-assistant/intents.nix
index 12be866ba2e5..9c13d0fa3359 100644
--- a/pkgs/servers/home-assistant/intents.nix
+++ b/pkgs/servers/home-assistant/intents.nix
@@ -22,7 +22,7 @@
 
 buildPythonPackage rec {
   pname = "home-assistant-intents";
-  version = "2025.10.1";
+  version = "2025.10.28";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -32,7 +32,7 @@ buildPythonPackage rec {
     repo = "intents-package";
     tag = version;
     fetchSubmodules = true;
-    hash = "sha256-xYmPbiDDnznm9fl8rtnkMAswGAX+3iWwticqaOzF9Jk=";
+    hash = "sha256-Svnw9Jd0E4pMFfa/Do7YsFzdXLzsGmhu8amo+zYDvus=";
   };
 
   build-system = [

From 6265100e4b312eec25026660a107f99606cecc63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 30 Oct 2025 22:35:11 -0700
Subject: [PATCH 5776/6226] home-assistant: 2025.10.4 -> 2025.11.0

Diff: https://github.com/home-assistant/core/compare/2025.10.4...2025.11.0

Changelog: https://www.home-assistant.io/blog/2025/11/05/release-202511/
---
 .../home-assistant/component-packages.nix     | 72 +++++++++++++++----
 pkgs/servers/home-assistant/default.nix       | 43 ++---------
 pkgs/servers/home-assistant/tests.nix         | 49 +------------
 3 files changed, 64 insertions(+), 100 deletions(-)

diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index d8b05c3a638c..cb2af1696bc5 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
 # Do not edit!
 
 {
-  version = "2025.10.4";
+  version = "2025.11.0";
   components = {
     "3_day_blinds" =
       ps: with ps; [
@@ -56,6 +56,10 @@
     "actiontec" =
       ps: with ps; [
       ];
+    "actron_air" =
+      ps: with ps; [
+        actron-neo-api
+      ];
     "adax" =
       ps: with ps; [
         adax
@@ -907,6 +911,7 @@
       ];
     "citybikes" =
       ps: with ps; [
+        python-citybikes
       ];
     "clementine" =
       ps: with ps; [
@@ -1463,6 +1468,7 @@
     "elevenlabs" =
       ps: with ps; [
         elevenlabs
+        sentence-stream
       ];
     "elgato" =
       ps: with ps; [
@@ -1542,9 +1548,6 @@
       ps: with ps; [
         openwebifpy
       ];
-    "enmax" =
-      ps: with ps; [
-      ];
     "enocean" =
       ps: with ps; [
         enocean
@@ -1758,6 +1761,9 @@
         psutil-home-assistant
         sqlalchemy
       ];
+    "fing" =
+      ps: with ps; [
+      ]; # missing inputs: fing_agent_api
     "fints" =
       ps: with ps; [
         fints
@@ -1765,6 +1771,10 @@
     "fire_tv" =
       ps: with ps; [
       ];
+    "firefly_iii" =
+      ps: with ps; [
+        pyfirefly
+      ];
     "fireservicerota" =
       ps: with ps; [
         pyfireservicerota
@@ -2375,14 +2385,18 @@
     "homeassistant_green" =
       ps: with ps; [
         aiohasupervisor
+        aiousbwatcher
         ha-silabs-firmware-client
         psutil-home-assistant
+        pyserial
         universal-silabs-flasher
       ];
     "homeassistant_hardware" =
       ps: with ps; [
         aiohasupervisor
+        aiousbwatcher
         ha-silabs-firmware-client
+        pyserial
         universal-silabs-flasher
       ];
     "homeassistant_sky_connect" =
@@ -2397,8 +2411,10 @@
     "homeassistant_yellow" =
       ps: with ps; [
         aiohasupervisor
+        aiousbwatcher
         ha-silabs-firmware-client
         psutil-home-assistant
+        pyserial
         universal-silabs-flasher
       ];
     "homee" =
@@ -2709,6 +2725,11 @@
     "indianamichiganpower" =
       ps: with ps; [
       ];
+    "inels" =
+      ps: with ps; [
+        aiohasupervisor
+        paho-mqtt
+      ]; # missing inputs: elkoep-aio-mqtt
     "influxdb" =
       ps: with ps; [
         influxdb
@@ -3426,6 +3447,10 @@
       ps: with ps; [
         luftdaten
       ];
+    "lunatone" =
+      ps: with ps; [
+        lunatone-rest-api-client
+      ];
     "lupusec" =
       ps: with ps; [
         lupupy
@@ -3620,6 +3645,10 @@
       ps: with ps; [
         meteofrance-api
       ];
+    "meteo_lt" =
+      ps: with ps; [
+        meteo-lt-pkg
+      ];
     "meteoalarm" =
       ps: with ps; [
         meteoalertapi
@@ -4052,6 +4081,10 @@
       ps: with ps; [
         pynina
       ];
+    "nintendo_parental_controls" =
+      ps: with ps; [
+        pynintendoparental
+      ];
     "nissan_leaf" =
       ps: with ps; [
         pycarwings2
@@ -4223,7 +4256,7 @@
       ];
     "onewire" =
       ps: with ps; [
-        pyownet
+        aio-ownet
       ];
     "onkyo" =
       ps: with ps; [
@@ -4287,6 +4320,10 @@
       ps: with ps; [
         openhomedevice
       ];
+    "openrgb" =
+      ps: with ps; [
+        openrgb-python
+      ];
     "opensensemap" =
       ps: with ps; [
         opensensemap-api
@@ -4582,7 +4619,6 @@
       ];
     "plum_lightpad" =
       ps: with ps; [
-        plumlightpad
       ];
     "pocketcasts" =
       ps: with ps; [
@@ -5632,6 +5668,10 @@
     "solaredge" =
       ps: with ps; [
         aiosolaredge
+        fnv-hash-fast
+        psutil-home-assistant
+        solaredge-web
+        sqlalchemy
         stringcase
       ];
     "solaredge_local" =
@@ -5798,6 +5838,10 @@
     "sun" =
       ps: with ps; [
       ];
+    "sunricher_dali" =
+      ps: with ps; [
+        pysrdaligateway
+      ];
     "sunweg" =
       ps: with ps; [
       ];
@@ -6583,10 +6627,6 @@
     "volvooncall" =
       ps: with ps; [
       ];
-    "vultr" =
-      ps: with ps; [
-        vultr
-      ];
     "w800rf32" =
       ps: with ps; [
         pyw800rf32
@@ -6617,10 +6657,6 @@
       ps: with ps; [
         watergate-local-api
       ];
-    "watson_iot" =
-      ps: with ps; [
-        ibmiotf
-      ];
     "watttime" =
       ps: with ps; [
         aiowatttime
@@ -7007,6 +7043,7 @@
     "acaia"
     "accuweather"
     "acmeda"
+    "actron_air"
     "adax"
     "adguard"
     "advantage_air"
@@ -7246,6 +7283,7 @@
     "filesize"
     "filter"
     "fints"
+    "firefly_iii"
     "fireservicerota"
     "firmata"
     "fitbit"
@@ -7475,6 +7513,7 @@
     "loqed"
     "lovelace"
     "luftdaten"
+    "lunatone"
     "lupusec"
     "lutron"
     "lutron_caseta"
@@ -7504,6 +7543,7 @@
     "met"
     "met_eireann"
     "meteo_france"
+    "meteo_lt"
     "meteoclimatic"
     "metoffice"
     "mfi"
@@ -7573,6 +7613,7 @@
     "nightscout"
     "niko_home_control"
     "nina"
+    "nintendo_parental_controls"
     "nmap_tracker"
     "nmbs"
     "no_ip"
@@ -7614,6 +7655,7 @@
     "opengarage"
     "openhardwaremonitor"
     "openhome"
+    "openrgb"
     "opensky"
     "opentherm_gw"
     "openuv"
@@ -7831,6 +7873,7 @@
     "subaru"
     "suez_water"
     "sun"
+    "sunricher_dali"
     "sunweg"
     "surepetcare"
     "swiss_public_transport"
@@ -7950,7 +7993,6 @@
     "volumio"
     "volvo"
     "volvooncall"
-    "vultr"
     "wake_on_lan"
     "wake_word"
     "wallbox"
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 575e174a89a1..51f5b443e56a 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -259,37 +259,6 @@ let
         doCheck = false;
       });
 
-      python-telegram-bot = super.python-telegram-bot.overridePythonAttrs (oldAttrs: rec {
-        version = "21.5";
-
-        src = fetchFromGitHub {
-          inherit (oldAttrs.src) owner repo;
-          tag = version;
-          hash = "sha256-i1YEcN615xeI4HcygXV9kzuXpT2yDSnlNU6bZqu1dPM=";
-        };
-      });
-
-      pytraccar = super.pytraccar.overridePythonAttrs (oldAttrs: rec {
-        version = "2.1.1";
-
-        src = fetchFromGitHub {
-          inherit (oldAttrs.src) owner repo;
-          tag = version;
-          hash = "sha256-WTRqYw66iD4bbb1aWJfBI67+DtE1FE4oiuUKpfVqypE=";
-        };
-      });
-
-      # Pinned due to API changes ~1.0
-      vultr = super.vultr.overridePythonAttrs (oldAttrs: rec {
-        version = "0.1.2";
-        src = fetchFromGitHub {
-          owner = "spry-group";
-          repo = "python-vultr";
-          rev = version;
-          hash = "sha256-sHCZ8Csxs5rwg1ZG++hP3MfK7ldeAdqm5ta9tEXeW+I=";
-        };
-      });
-
       wolf-comm = super.wolf-comm.overridePythonAttrs rec {
         version = "0.0.23";
         src = fetchFromGitHub {
@@ -330,7 +299,7 @@ let
   extraBuildInputs = extraPackages python.pkgs;
 
   # Don't forget to run update-component-packages.py after updating
-  hassVersion = "2025.10.4";
+  hassVersion = "2025.11.0";
 
 in
 python.pkgs.buildPythonApplication rec {
@@ -351,13 +320,13 @@ python.pkgs.buildPythonApplication rec {
     owner = "home-assistant";
     repo = "core";
     tag = version;
-    hash = "sha256-CaS/37Pastpoeb6fXLiChVcQXNqVJMaXV04HGnNFlL0=";
+    hash = "sha256-+syn/y2ukZKsnCniZxodRWVcCE3AcvUKt80L2XslKKI=";
   };
 
   # Secondary source is pypi sdist for translations
   sdist = fetchPypi {
     inherit pname version;
-    hash = "sha256-Ue1Aat8aSEXHUSIl2ji1cQaZEnVRgY7+PBHB9mQBJ6I=";
+    hash = "sha256-JSWr+yGvpXYc6Bw3B+xVLpYokVM11dsJZBWYy+W4bH4=";
   };
 
   build-system = with python.pkgs; [
@@ -471,7 +440,6 @@ python.pkgs.buildPythonApplication rec {
       pytest-asyncio
       pytest-aiohttp
       pytest-freezer
-      pytest-mock
       pytest-socket
       pytest-timeout
       pytest-unordered
@@ -480,11 +448,10 @@ python.pkgs.buildPythonApplication rec {
       requests-mock
       respx
       syrupy
-      tomli
-      # Sneakily imported in tests/conftest.py
-      paho-mqtt
       # Used in tests/non_packaged_scripts/test_alexa_locales.py
       beautifulsoup4
+      # Used in tests/scripts/test_check_config.py
+      colorlog
     ]
     ++ lib.concatMap (component: getPackages component python.pkgs) [
       # some components are needed even if tests in tests/components are disabled
diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix
index 9dcbdb0cfe95..19d31b0c774a 100644
--- a/pkgs/servers/home-assistant/tests.nix
+++ b/pkgs/servers/home-assistant/tests.nix
@@ -18,14 +18,9 @@ let
     homeassistant_hardware = getComponentDeps "otbr" ++ getComponentDeps "zha";
     homeassistant_sky_connect = getComponentDeps "zha";
     homeassistant_yellow = getComponentDeps "zha";
-    husqvarna_automower_ble = getComponentDeps "gardena_bluetooth";
     lovelace = [
       pychromecast
     ];
-    matrix = [
-      pydantic
-    ];
-    mopeka = getComponentDeps "switchbot";
     onboarding = [
       pymetno
       radios
@@ -44,7 +39,6 @@ let
     system_log = [
       isal
     ];
-    tesla_fleet = getComponentDeps "teslemetry";
     xiaomi_miio = [
       arrow
     ];
@@ -57,34 +51,12 @@ let
   };
 
   extraDisabledTestPaths = {
-    backup = [
-      # outdated snapshot
-      "tests/components/backup/test_sensors.py::test_sensors"
-    ];
-    bosch_alarm = [
-      # outdated snapshots
-      "tests/components/bosch_alarm/test_binary_sensor.py::test_binary_sensor[None-solution_3000]"
-      "tests/components/bosch_alarm/test_binary_sensor.py::test_binary_sensor[None-amax_3000]"
-      "tests/components/bosch_alarm/test_binary_sensor.py::test_binary_sensor[None-b5512]"
-    ];
-    bmw_connected_drive = [
-      # outdated snapshot
-      "tests/components/bmw_connected_drive/test_binary_sensor.py::test_entity_state_attrs"
-    ];
-    dnsip = [
-      # Tries to resolve DNS entries
-      "tests/components/dnsip/test_config_flow.py::test_options_flow"
-    ];
     jellyfin = [
       # AssertionError: assert 'audio/x-flac' == 'audio/flac'
       "tests/components/jellyfin/test_media_source.py::test_resolve"
       "tests/components/jellyfin/test_media_source.py::test_audio_codec_resolve"
       "tests/components/jellyfin/test_media_source.py::test_music_library"
     ];
-    matter = [
-      # outdated snapshot in eve_weather_sensor variant
-      "tests/components/matter/test_number.py::test_numbers"
-    ];
     minecraft_server = [
       # FileNotFoundError: [Errno 2] No such file or directory: '/etc/resolv.conf'
       "tests/components/minecraft_server/test_binary_sensor.py"
@@ -104,22 +76,17 @@ let
       "tests/components/nzbget/test_init.py::test_async_setup_raises_entry_not_ready"
     ];
     openai_conversation = [
-      # outdated snapshot
-      "tests/components/openai_conversation/test_conversation.py::test_function_call"
       # Pydantic validation error
       "tests/components/openai_conversation/test_conversation.py"
       "tests/components/openai_conversation/test_ai_task.py"
-      # TypeError: object ImagesResponse can't be used in 'await' expression
-      "tests/components/openai_conversation/test_init.py::test_generate_image_service"
-      "tests/components/openai_conversation/test_init.py::test_generate_image_service_error"
     ];
     overseerr = [
       # imports broken future module
       "tests/components/overseerr/test_event.py"
     ];
-    technove = [
+    youtube = [
       # outdated snapshot
-      "tests/components/technove/test_switch.py::test_switches"
+      "tests/components/youtube/test_sensor.py::test_sensor"
     ];
   };
 
@@ -128,10 +95,6 @@ let
       # intent fixture mismatch
       "test_error_no_device_on_floor"
     ];
-    forecast_solar = [
-      # language fixture mismatch
-      "test_enabling_disable_by_default"
-    ];
     sensor = [
       # Failed: Translation not found for sensor
       "test_validate_unit_change_convertible"
@@ -147,14 +110,6 @@ let
       # tries to retrieve file from github
       "test_non_text_stdout_capture"
     ];
-    smartthings = [
-      # outdated snapshots
-      "test_all_entities"
-    ];
-    websocket_api = [
-      # AssertionError: assert 'unknown_error' == 'template_error'
-      "test_render_template_with_timeout"
-    ];
     zeroconf = [
       # multicast socket bind, not possible in the sandbox
       "test_subscribe_discovery"

From dec182fa5da902e0377c2a95bc08609d06ee2623 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 5 Nov 2025 18:26:00 -0800
Subject: [PATCH 5777/6226] python3Packages.homeassistant-stubs: 2025.10.4 ->
 2025.11.0

Diff: https://github.com/KapJI/homeassistant-stubs/compare/2025.10.4...2025.11.0

Changelog: https://github.com/KapJI/homeassistant-stubs/releases/tag/2025.11.0
---
 pkgs/servers/home-assistant/stubs.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix
index 734b755fc961..ebeca4ab7b43 100644
--- a/pkgs/servers/home-assistant/stubs.nix
+++ b/pkgs/servers/home-assistant/stubs.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "homeassistant-stubs";
-  version = "2025.10.4";
+  version = "2025.11.0";
   pyproject = true;
 
   disabled = python.version != home-assistant.python.version;
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "KapJI";
     repo = "homeassistant-stubs";
     tag = version;
-    hash = "sha256-1ZV9lgueBKALUuvnHVGSb2C24auljdI07KkbLsaEe54=";
+    hash = "sha256-/A/25x0FMu4MXMHhOZ1MF9Qpw+UgA2OUc/HZaJm9bsQ=";
   };
 
   build-system = [

From 6bcfd28cbdd14d26a91884e53100b6316b5384af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Tue, 4 Nov 2025 20:35:56 -0800
Subject: [PATCH 5778/6226] python3Packages.plumlightpad: drop

---
 .../python-modules/plumlightpad/default.nix   | 41 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 pkgs/development/python-modules/plumlightpad/default.nix

diff --git a/pkgs/development/python-modules/plumlightpad/default.nix b/pkgs/development/python-modules/plumlightpad/default.nix
deleted file mode 100644
index b6d40f5f007b..000000000000
--- a/pkgs/development/python-modules/plumlightpad/default.nix
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-  setuptools,
-  requests,
-  standard-telnetlib,
-  pytestCheckHook,
-}:
-
-buildPythonPackage rec {
-  pname = "plumlightpad";
-  version = "0.0.11";
-  pyproject = true;
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-5J+kk/fn45v/1WIsBuq6o7hivXkCaJ1Of7BLRf10rCk=";
-  };
-
-  build-system = [ setuptools ];
-
-  dependencies = [
-    requests
-    standard-telnetlib
-  ];
-
-  nativeCheckInputs = [ pytestCheckHook ];
-
-  # Package has no tests
-  doCheck = false;
-
-  pythonImportsCheck = [ "plumlightpad" ];
-
-  meta = {
-    description = "A python package that interacts with the Plum Lightpad";
-    homepage = "https://github.com/heathbar/plum-lightpad-python";
-    license = lib.licenses.mit;
-    maintainers = [ lib.maintainers.jamiemagee ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 912f98d9518d..58ddb268b0c8 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -283,6 +283,7 @@ mapAliases {
   pdfminer = throw "'pdfminer' has been renamed to/replaced by 'pdfminer-six'"; # Converted to throw 2025-10-29
   pep257 = throw "'pep257' has been renamed to/replaced by 'pydocstyle'"; # Converted to throw 2025-10-29
   percol = throw "percol has been removed because it hasn't been updated since 2019"; # added 2025-05-25
+  plumlightpad = throw "plumlightpad has been removed because the API was shut down"; # added 2025-11-04
   Polygon3 = throw "'Polygon3' has been renamed to/replaced by 'polygon3'"; # Converted to throw 2025-10-29
   posix_ipc = throw "'posix_ipc' has been renamed to/replaced by 'posix-ipc'"; # Converted to throw 2025-10-29
   postgrest-py = postgrest; # added 2025-08-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f19c80be8b30..f774668b8c04 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -12070,8 +12070,6 @@ self: super: with self; {
 
   plumbum = callPackage ../development/python-modules/plumbum { };
 
-  plumlightpad = callPackage ../development/python-modules/plumlightpad { };
-
   pluthon = callPackage ../development/python-modules/pluthon { };
 
   plux = callPackage ../development/python-modules/plux { };

From 13fcf00cad569741297a62fea243dcd0d3d9353f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 31 Oct 2025 23:30:06 -0700
Subject: [PATCH 5779/6226] python3Packages.pyownet: drop

---
 .../python-modules/pyownet/default.nix        | 33 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 --
 3 files changed, 1 insertion(+), 35 deletions(-)
 delete mode 100644 pkgs/development/python-modules/pyownet/default.nix

diff --git a/pkgs/development/python-modules/pyownet/default.nix b/pkgs/development/python-modules/pyownet/default.nix
deleted file mode 100644
index 2542877ef0e5..000000000000
--- a/pkgs/development/python-modules/pyownet/default.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchPypi,
-}:
-
-buildPythonPackage rec {
-  pname = "pyownet";
-  version = "0.10.0.post1";
-
-  format = "setuptools";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "4f2fa4471c2f806b35090bdc6c092305c6eded3ff3736f8b586d35bdb157de62";
-  };
-
-  postPatch = ''
-    sed -i '/use_2to3/d' setup.py
-  '';
-
-  # tests access network
-  doCheck = false;
-
-  pythonImportsCheck = [ "pyownet.protocol" ];
-
-  meta = with lib; {
-    description = "Python OWFS client library (owserver protocol)";
-    homepage = "https://github.com/miccoli/pyownet";
-    license = licenses.lgpl3Plus;
-    maintainers = with maintainers; [ dotlambda ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 58ddb268b0c8..02685beb6740 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -320,6 +320,7 @@ mapAliases {
   pymelcloud = throw "'pymelcloud' has been renamed to/replaced by 'python-melcloud'"; # Converted to throw 2025-10-29
   PyMVGLive = throw "'PyMVGLive' has been renamed to/replaced by 'pymvglive'"; # Converted to throw 2025-10-29
   pymyq = throw "'pymyq' has been renamed to/replaced by 'python-myq'"; # Converted to throw 2025-10-29
+  pyownet = throw "pyownet was removed because Home Assistant switched to aio-ownet"; # added 2025-10-31
   pypcap = throw "pypcap has been removed because it is broken and unmaintained upstream."; # added 2025-06-18
   pyqldb = throw "pyqldb has been removed, because the underlying service is reaching end of support"; # added 2025-07-30
   pyqt5_sip = throw "'pyqt5_sip' has been renamed to/replaced by 'pyqt5-sip'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f774668b8c04..144a21d28d81 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -13842,8 +13842,6 @@ self: super: with self; {
 
   pyowm = callPackage ../development/python-modules/pyowm { };
 
-  pyownet = callPackage ../development/python-modules/pyownet { };
-
   pyoxigraph = callPackage ../development/python-modules/pyoxigraph { };
 
   pypager = callPackage ../development/python-modules/pypager { };

From 1f34c4856fb29fa535bd35f64e0ce0f483298954 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 6 Nov 2025 10:35:24 +0800
Subject: [PATCH 5780/6226] wechat: 4.1.4.12-31227 -> 4.1.4.15-31252 for darwin

---
 pkgs/by-name/we/wechat/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix
index 106a00ad2054..5fb0e58efb5a 100644
--- a/pkgs/by-name/we/wechat/package.nix
+++ b/pkgs/by-name/we/wechat/package.nix
@@ -30,14 +30,14 @@ let
       # https://dldir1.qq.com/weixin/mac/mac-release.xml
       any-darwin =
         let
-          version = "4.1.4.12-31227";
+          version = "4.1.4.15-31252";
           version' = lib.replaceString "-" "_" version;
         in
         {
           inherit version;
           src = fetchurl {
             url = "https://dldir1v6.qq.com/weixin/Universal/Mac/xWeChatMac_universal_${version'}.dmg";
-            hash = "sha256-xVWEABH3dzQkQpmhJ3gKXJd9lQ4fqN7ptkWLTpJ4vaY=";
+            hash = "sha256-nG9fYaQjeCwYFV7yKdlUxbXnFALc1VomQ/hnGQtJ17o=";
           };
         };
     in

From 708fd6dd0afb261a52f53edf713f781bfcb39f1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 02:41:49 +0000
Subject: [PATCH 5781/6226] vacuum-tube: 1.3.21 -> 1.3.23

---
 pkgs/by-name/va/vacuum-tube/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/va/vacuum-tube/package.nix b/pkgs/by-name/va/vacuum-tube/package.nix
index b3dcc291ae01..227f35f3d2d9 100644
--- a/pkgs/by-name/va/vacuum-tube/package.nix
+++ b/pkgs/by-name/va/vacuum-tube/package.nix
@@ -10,16 +10,16 @@
 
 buildNpmPackage rec {
   pname = "vacuum-tube";
-  version = "1.3.21";
+  version = "1.3.23";
 
   src = fetchFromGitHub {
     owner = "shy1132";
     repo = "VacuumTube";
     tag = "v${version}";
-    hash = "sha256-0PX9GJsG3jCiARO4ZmchrPo4s5mWodwbgNtKOa801O0=";
+    hash = "sha256-/gxMhUkGtImSdye/mEzUGG62Lv2mKXeWbOMlZ2sXOLE=";
   };
 
-  npmDepsHash = "sha256-jI+0vrxnOTjckhoF0l4cuv95Yu9HvL1g/HS65ktYxWk=";
+  npmDepsHash = "sha256-9D1vve10vuwakfSbthI/FUI4OVM0s96msjrEEFT49A8=";
 
   env = {
     ELECTRON_SKIP_BINARY_DOWNLOAD = true;

From 9d92c1d8a5737bddc2d2a953dc23e0d696152ee1 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Wed, 5 Nov 2025 18:44:48 -0800
Subject: [PATCH 5782/6226] frr: clean up config warnings

- sysconfdir should not have /frr at the end
- --disable-exampledir, --enable-rtadv, & --enable-rr-semantics are
  unsupported
---
 pkgs/by-name/fr/frr/package.nix | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix
index b2cda103219a..8094336da5bb 100644
--- a/pkgs/by-name/fr/frr/package.nix
+++ b/pkgs/by-name/fr/frr/package.nix
@@ -43,9 +43,7 @@
   numMultipath ? 64,
   watchfrrSupport ? true,
   cumulusSupport ? false,
-  rtadvSupport ? true,
   irdpSupport ? true,
-  routeReplacementSupport ? true,
   mgmtdSupport ? true,
   # Experimental as of 10.1, reconsider if upstream changes defaults
   grpcSupport ? false,
@@ -151,7 +149,6 @@ stdenv.mkDerivation (finalAttrs: {
 
   configureFlags = [
     "--disable-silent-rules"
-    "--disable-exampledir"
     "--enable-configfile-mask=0640"
     "--enable-group=frr"
     "--enable-logfile-mask=0640"
@@ -160,15 +157,13 @@ stdenv.mkDerivation (finalAttrs: {
     "--enable-vty-group=frrvty"
     "--localstatedir=/var"
     "--sbindir=${placeholder "out"}/libexec/frr"
-    "--sysconfdir=/etc/frr"
+    "--sysconfdir=/etc"
     "--with-clippy=${finalAttrs.clippy-helper}/bin/clippy"
     # general options
     (lib.strings.enableFeature snmpSupport "snmp")
     (lib.strings.enableFeature rpkiSupport "rpki")
     (lib.strings.enableFeature watchfrrSupport "watchfrr")
-    (lib.strings.enableFeature rtadvSupport "rtadv")
     (lib.strings.enableFeature irdpSupport "irdp")
-    (lib.strings.enableFeature routeReplacementSupport "rr-semantics")
     (lib.strings.enableFeature mgmtdSupport "mgmtd")
     (lib.strings.enableFeature grpcSupport "grpc")
 

From 8a926d5c81f217e8cfa51e0d94f19c9210bcfc72 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 03:30:22 +0100
Subject: [PATCH 5783/6226] home-assistant-custom-components.daikin_onecta:
 4.2.8 -> 4.2.9

https://github.com/jwillemsen/daikin_onecta/tag/v4.2.9
---
 .../custom-components/daikin_onecta/package.nix               | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix
index 6f0f97508687..7698754f5ac2 100644
--- a/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/daikin_onecta/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "jwillemsen";
   domain = "daikin_onecta";
-  version = "4.2.8";
+  version = "4.2.9";
 
   src = fetchFromGitHub {
     owner = "jwillemsen";
     repo = "daikin_onecta";
     tag = "v${version}";
-    hash = "sha256-ozOJQDoE/t2FhnsVCnP+WCrFr/l19+onr488JN2fSE0=";
+    hash = "sha256-bV+4nTRhtqSVBdaG3rCtIdTYhM4pqcQCtUQwsUhgcq0=";
   };
 
   meta = {

From 3e898b08978075a7d2afbaa359abd0d6fd6a0d3c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 03:30:26 +0100
Subject: [PATCH 5784/6226] home-assistant-custom-components.xiaomi_miot: 1.1.0
 -> 1.1.1

https://github.com/al-one/hass-xiaomi-miot/releases/tag/v1.1.1
---
 .../home-assistant/custom-components/xiaomi_miot/package.nix  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
index 3752430c2334..1bf1381bc89e 100644
--- a/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/xiaomi_miot/package.nix
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
   owner = "al-one";
   domain = "xiaomi_miot";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "al-one";
     repo = "hass-xiaomi-miot";
     rev = "v${version}";
-    hash = "sha256-nTxi8bKelHbhs1ivmr+LGHLMrnlRUQYfy+ARHdeVM0Q=";
+    hash = "sha256-0B+rG2h2OMb363t0529/XjqZ9ORaT7XXk4qVyEAfNx8=";
   };
 
   dependencies = [

From ae13afc6175762adb99a3cac8ba7023499aba6c4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 03:30:29 +0100
Subject: [PATCH 5785/6226] home-assistant-custom-components.frigidaire: 0.1.2
 -> 0.1.5

https://github.com/bm1549/home-assistant-frigidaire/compare/0.1.2...0.1.5
---
 .../home-assistant/custom-components/frigidaire/package.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix b/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix
index aa1d8c201d45..36639b8bdd23 100644
--- a/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/frigidaire/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "bm1549";
   domain = "frigidaire";
-  version = "0.1.2";
+  version = "0.1.5";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "home-assistant-frigidaire";
     tag = version;
-    hash = "sha256-7SyOsB16P0O0RHEUXy79cqil+QFO2PilyWWlpv428g0=";
+    hash = "sha256-b8/szaZGiM1/LZFJK0gi6oStCzXcH1BN5FqjRJBY7cA=";
   };
 
   dependencies = [ frigidaire ];

From 79713ffbad3b3d8ebfec8575f96f91f28233508c Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 03:30:48 +0100
Subject: [PATCH 5786/6226] home-assistant-custom-components.sun2: 3.4.2 ->
 3.4.3

https://github.com/pnbruckner/ha-sun2/releases/tag/3.4.3
---
 .../servers/home-assistant/custom-components/sun2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/sun2/package.nix b/pkgs/servers/home-assistant/custom-components/sun2/package.nix
index e5d8b685b0ad..a937e624407c 100644
--- a/pkgs/servers/home-assistant/custom-components/sun2/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/sun2/package.nix
@@ -7,13 +7,13 @@
 buildHomeAssistantComponent rec {
   owner = "pnbruckner";
   domain = "sun2";
-  version = "3.4.2";
+  version = "3.4.3";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "ha-sun2";
     tag = version;
-    hash = "sha256-gorjykAEQGglH7nyAHMZDeSEERPuZINHTN3IiH3RKsQ=";
+    hash = "sha256-UATxuKTusDkKLWwJq2CupPcF/TIKAmE5VPo3054cwKc=";
   };
 
   meta = rec {

From 0595f3d1c209d00ed2b55519b57a258ae4760b9a Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 03:30:54 +0100
Subject: [PATCH 5787/6226] home-assistant-custom-lovelace-modules.bubble-card:
 3.0.3 -> 3.0.4

https://github.com/Clooos/bubble-card/releases/tag/v3.0.4
---
 .../custom-lovelace-modules/bubble-card/package.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix
index 3b1780f31fcb..e2be1e62ee51 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/bubble-card/package.nix
@@ -6,13 +6,13 @@
 
 buildNpmPackage rec {
   pname = "bubble-card";
-  version = "3.0.3";
+  version = "3.0.4";
 
   src = fetchFromGitHub {
     owner = "Clooos";
     repo = "Bubble-Card";
     rev = "v${version}";
-    hash = "sha256-soLeHWDp72C5KzjnkdPVneJrShFVcOHvvVyLPMVpJM0=";
+    hash = "sha256-444QWl3i1kYkdkUrhDi+BxN9IB6JttHtX8fn23uPcBE=";
   };
 
   npmDepsHash = "sha256-NSHsw/+dmdc2+yo4/NgT0YMMrCuL8JjRR6MSJ5xQTiE=";

From cb077bd67ed47080867cf0ad4f0416b72255ded8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 03:30:59 +0100
Subject: [PATCH 5788/6226] 
 home-assistant-custom-lovelace-modules.versatile-thermostat-ui-card: 1.1.3 ->
 1.1.4

https://github.com/jmcollin78/versatile-thermostat-ui-card/releases/tag/1.1.4
---
 .../versatile-thermostat-ui-card/package.nix                  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix
index 9c8aae3b318a..36a77659ef08 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/versatile-thermostat-ui-card/package.nix
@@ -6,13 +6,13 @@
 
 buildNpmPackage rec {
   pname = "versatile-thermostat-ui-card";
-  version = "1.1.3";
+  version = "1.1.4";
 
   src = fetchFromGitHub {
     owner = "jmcollin78";
     repo = "versatile-thermostat-ui-card";
     rev = "${version}";
-    hash = "sha256-yPp478uXiRWDH4DP/d0Mloie7nPY1hWLt8X1vLhysvA=";
+    hash = "sha256-4v1Tl3GQagQd1H+CFBG+OuRl2zfz5vvyWRy7oBSpxfM=";
   };
 
   npmFlags = [ "--legacy-peer-deps" ];

From ca95c26ad100eae3ccc8a274d93d940052b0c7f1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 03:31:13 +0100
Subject: [PATCH 5789/6226] home-assistant-custom-components.frigate: 5.10.0 ->
 5.11.0

https://github.com/blakeblackshear/frigate-hass-integration/releases/tag/v5.11.0
---
 .../home-assistant/custom-components/frigate/package.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/frigate/package.nix b/pkgs/servers/home-assistant/custom-components/frigate/package.nix
index 4dba06a69378..9025606067e0 100644
--- a/pkgs/servers/home-assistant/custom-components/frigate/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/frigate/package.nix
@@ -18,13 +18,13 @@
 buildHomeAssistantComponent rec {
   owner = "blakeblackshear";
   domain = "frigate";
-  version = "5.10.0";
+  version = "5.11.0";
 
   src = fetchFromGitHub {
     owner = "blakeblackshear";
     repo = "frigate-hass-integration";
     tag = "v${version}";
-    hash = "sha256-rhYShAb251LfcrBjarcle041AWVSEi0wqc9/W1SlgUo=";
+    hash = "sha256-cXjf5e4gbkvRS43xnpmL1lSaSvhts4eMetEqTP/RCOo=";
   };
 
   dependencies = [ hass-web-proxy-lib ];

From 5458151e531759a9800d4487c1cc39bb4a149b75 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 03:31:17 +0100
Subject: [PATCH 5790/6226] 
 home-assistant-custom-lovelace-modules.swipe-navigation: 1.15.6 -> 1.15.7

https://github.com/zanna-37/hass-swipe-navigation/releases/tag/v1.15.7
---
 .../custom-lovelace-modules/swipe-navigation/package.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/swipe-navigation/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/swipe-navigation/package.nix
index 0dd65f13f9e4..a9b289c51094 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/swipe-navigation/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/swipe-navigation/package.nix
@@ -6,13 +6,13 @@
 
 buildNpmPackage rec {
   pname = "swipe-navigation";
-  version = "1.15.6";
+  version = "1.15.7";
 
   src = fetchFromGitHub {
     owner = "zanna-37";
     repo = "hass-swipe-navigation";
     tag = "v${version}";
-    hash = "sha256-4DiZ52YFgyddD299rAMzBbmFNyv0SHEFK5H7kWRdWlw=";
+    hash = "sha256-43Vns6RcN+QhJn5vFXtmtl0jkKqyFb0wuAZJbdg3VEo=";
   };
 
   npmDepsHash = "sha256-uRH3OcPK0iWru4ULZq2NwzbWNsGl8+wFP3ZxeFzr2BM=";

From ca4335f2442a5deab9803732d1d2340c01ba7de4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 03:31:22 +0100
Subject: [PATCH 5791/6226] 
 home-assistant-custom-lovelace-modules.custom-sidebar: 10.5.2 -> 10.7.0

https://github.com/elchininet/custom-sidebar/releases/tag/v10.7.0
---
 .../custom-lovelace-modules/custom-sidebar/package.nix      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
index e4c888ab6c60..91d365b514d5 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/custom-sidebar/package.nix
@@ -8,19 +8,19 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "custom-sidebar";
-  version = "10.5.2";
+  version = "10.7.0";
 
   src = fetchFromGitHub {
     owner = "elchininet";
     repo = "custom-sidebar";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-C3zjl4KP2l56Hn7MJjoB8D6KkJ3Ef6KpVZWWdDS5Hds=";
+    hash = "sha256-aV4dMt79t9ZZm+Z08odSONf/ghow4U+/aryk2+GJZvw=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-FOaR+B8UammcStvNFo7PR++VCPzY+aXvWeSRXnoPkWM=";
+    hash = "sha256-gfjRgq75hKxgfOn0wnWIzcFcdWVe7PZ4z8YHxLTCsjo=";
   };
 
   nativeBuildInputs = [

From 4983d6eb377b2edd5c9490290968ffeeb8d04286 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 03:31:54 +0100
Subject: [PATCH 5792/6226] 
 home-assistant-custom-lovelace-modules.clock-weather-card: 2.9.0 -> 2.9.1

https://github.com/pkissling/clock-weather-card/blob/v2.9.1/CHANGELOG.md
---
 .../custom-lovelace-modules/clock-weather-card/package.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix
index 226a91bcf4bc..fd34753ff48f 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/clock-weather-card/package.nix
@@ -9,18 +9,18 @@
 }:
 stdenvNoCC.mkDerivation rec {
   pname = "clock-weather-card";
-  version = "2.9.0";
+  version = "2.9.1";
 
   src = fetchFromGitHub {
     owner = "pkissling";
     repo = "clock-weather-card";
     tag = "v${version}";
-    hash = "sha256-cLqHVBjsSq3t7ft9Ap6kjNSgM87+ftqlF5ZfcJKAAzQ=";
+    hash = "sha256-5FHGFuvMYi40+6C9NDzrOsp2gIrIgtaA8qHM+oNIilg=";
   };
 
   offlineCache = fetchYarnDeps {
     yarnLock = src + "/yarn.lock";
-    hash = "sha256-zaKrvsT1Lgcyk4a9vO97j9yHkaD+5zbnsM5+GHxb4uk=";
+    hash = "sha256-DhOQG9+0YOOVv3Y1qnZPuR4ZQEdT9NLIcdiBnplSBvg=";
   };
 
   nativeBuildInputs = [

From 8cf89ea392cfcc6d6dcb9ed7ceb2983d56fe85d8 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 03:34:37 +0100
Subject: [PATCH 5793/6226] home-assistant-custom-components.elegoo_printer:
 2.3.5 -> 2.4.2

https://github.com/danielcherubini/elegoo-homeassistant/releases/tag/v2.4.0
https://github.com/danielcherubini/elegoo-homeassistant/releases/tag/v2.4.1
https://github.com/danielcherubini/elegoo-homeassistant/releases/tag/v2.4.2
---
 .../custom-components/elegoo_printer/package.nix            | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix b/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix
index 61489addccf4..cd074d391502 100644
--- a/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/elegoo_printer/package.nix
@@ -4,6 +4,7 @@
   buildHomeAssistantComponent,
 
   # dependencies
+  aiomqtt,
   colorlog,
   loguru,
   websocket-client,
@@ -18,16 +19,17 @@
 buildHomeAssistantComponent rec {
   owner = "danielcherubini";
   domain = "elegoo_printer";
-  version = "2.3.5";
+  version = "2.4.2";
 
   src = fetchFromGitHub {
     owner = "danielcherubini";
     repo = "elegoo-homeassistant";
     tag = "v${version}";
-    hash = "sha256-Ekt19lfn0DdedMFhJDDUkqsv7vjS96+lAhWveag6EeE=";
+    hash = "sha256-z55599eTJy5oQeE+BD0AYXtLTKoeKZzvNDurE0/oPYQ=";
   };
 
   dependencies = [
+    aiomqtt
     colorlog
     loguru
     websocket-client

From 2e2c887ffb9f08aa8ae175db7511af1b8b3fbbb7 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 03:35:39 +0100
Subject: [PATCH 5794/6226] python3Packages.garminconnect: 0.2.30 -> 0.2.31

https://github.com/cyberjunky/python-garminconnect/releases/tag/0.2.31
---
 pkgs/development/python-modules/garminconnect/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix
index c27da986a748..95a97adbf317 100644
--- a/pkgs/development/python-modules/garminconnect/default.nix
+++ b/pkgs/development/python-modules/garminconnect/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "garminconnect";
-  version = "0.2.30";
+  version = "0.2.31";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "cyberjunky";
     repo = "python-garminconnect";
     tag = version;
-    hash = "sha256-JCcQl7awYUnRWWVoKgirgn494HM9uXqT69f3XauTG5E=";
+    hash = "sha256-yK4p1zb3OLTpDrtVz0bA/jlhDV3AFpltN3CTDBcSTPU=";
   };
 
   pythonRelaxDeps = [

From d6e57f0541f22473b2d5165b564c2780224ea024 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 03:36:40 +0100
Subject: [PATCH 5795/6226] home-assistant-custom-components.garmin_connect:
 0.2.30 -> 0.2.37

https://github.com/cyberjunky/home-assistant-garmin_connect/releases/tag/0.2.37
---
 .../custom-components/garmin_connect/package.nix             | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix
index 6bcc8c0e76f1..df8f306173e5 100644
--- a/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/garmin_connect/package.nix
@@ -9,13 +9,13 @@
 buildHomeAssistantComponent rec {
   owner = "cyberjunky";
   domain = "garmin_connect";
-  version = "0.2.30";
+  version = "0.2.37";
 
   src = fetchFromGitHub {
     owner = "cyberjunky";
     repo = "home-assistant-garmin_connect";
     tag = version;
-    hash = "sha256-Gxz0mKVgs2o7IlhGJkz4JlKRb448IRFqK87Kn+Gebkk=";
+    hash = "sha256-d6RbDplrdqvFGSDcTgoYzYLSHDYdXG3/XvFxj8IfSbY=";
   };
 
   dependencies = [
@@ -24,6 +24,7 @@ buildHomeAssistantComponent rec {
   ];
 
   meta = with lib; {
+    changelog = "https://github.com/cyberjunky/home-assistant-garmin_connect/releases/tag/${src.tag}";
     description = "Garmin Connect integration allows you to expose data from Garmin Connect to Home Assistant";
     homepage = "https://github.com/cyberjunky/home-assistant-garmin_connect";
     maintainers = with maintainers; [

From 32a4cbdc7a326c5ad22d6a7d4581d948936526e4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 03:37:22 +0100
Subject: [PATCH 5796/6226] python3Packages.home-connect-async: 0.8.2 -> 0.8.3

---
 .../development/python-modules/home-connect-async/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/home-connect-async/default.nix b/pkgs/development/python-modules/home-connect-async/default.nix
index dec2083d0248..283eae7a23a4 100644
--- a/pkgs/development/python-modules/home-connect-async/default.nix
+++ b/pkgs/development/python-modules/home-connect-async/default.nix
@@ -13,13 +13,13 @@
 
 buildPythonPackage rec {
   pname = "home-connect-async";
-  version = "0.8.2";
+  version = "0.8.3";
   pyproject = true;
 
   src = fetchPypi {
     pname = "home_connect_async";
     inherit version;
-    hash = "sha256-npVMEiwclKr9HR2M03GNkyJULeLEE9BAnIw8Zoy98nQ=";
+    hash = "sha256-G+mHXNbqU0pgqpvGfKmn6CrwZOhRG76m57eHimgN17s=";
   };
 
   build-system = [

From f46f86ec8e226ebae27ec7e241bc527a9f6cdbc5 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 03:38:20 +0100
Subject: [PATCH 5797/6226] home-assistant-custom-components.home_connect_alt:
 1.3.0-b1 -> 1.3.2

https://github.com/ekutner/home-connect-hass/releases/tag/1.3.1
https://github.com/ekutner/home-connect-hass/releases/tag/1.3.2
---
 .../custom-components/home_connect_alt/package.nix           | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/home_connect_alt/package.nix b/pkgs/servers/home-assistant/custom-components/home_connect_alt/package.nix
index 437966685e95..ad47b44e5655 100644
--- a/pkgs/servers/home-assistant/custom-components/home_connect_alt/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/home_connect_alt/package.nix
@@ -8,18 +8,19 @@
 buildHomeAssistantComponent rec {
   owner = "ekutner";
   domain = "home_connect_alt";
-  version = "1.3.0-b1";
+  version = "1.3.2";
 
   src = fetchFromGitHub {
     owner = "ekutner";
     repo = "home-connect-hass";
     tag = version;
-    hash = "sha256-jWrVHwMdzjG0gHWl1NS6WAzdmlmS20BUmh6HzplsGgw=";
+    hash = "sha256-t5Af58HgYVMZki/93t63X2JPXDJm7PPt84yGj7MJKkE=";
   };
 
   dependencies = [ home-connect-async ];
 
   meta = with lib; {
+    changelog = "https://github.com/ekutner/home-connect-hass/releases/tag/${src.tag}";
     description = "Alternative (and improved) Home Connect integration for Home Assistant";
     homepage = "https://github.com/ekutner/home-connect-hass";
     maintainers = with maintainers; [ kranzes ];

From 048dff45a7a703eb0cade9e653bbd8f566c0cc00 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 03:40:47 +0100
Subject: [PATCH 5798/6226] python3Packages.midea-local: 6.4.0 -> 6.5.0

https://github.com/midea-lan/midea-local/releases/tag/v6.5.0
---
 pkgs/development/python-modules/midea-local/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/midea-local/default.nix b/pkgs/development/python-modules/midea-local/default.nix
index 3d438efcab5a..68bbab053129 100644
--- a/pkgs/development/python-modules/midea-local/default.nix
+++ b/pkgs/development/python-modules/midea-local/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "midea-local";
-  version = "6.4.0";
+  version = "6.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "midea-lan";
     repo = "midea-local";
     tag = "v${version}";
-    hash = "sha256-jeQ5PXkKxVz041VJ58lJVpqIoj1Y054VADFtnutddg4=";
+    hash = "sha256-l5wV6W0CR3Jlir1DEpuh7/I8hGnH5+yrq0JjKcFh4sk=";
   };
 
   build-system = [ setuptools ];

From d4607fd7b6093abaa63c2d65e5bdcc6aca1ecb39 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 03:41:09 +0100
Subject: [PATCH 5799/6226] home-assistant-custom-component.midea_ac_lan: 0.6.9
 -> 0.6.10

https://github.com/wuwentao/midea_ac_lan/releases/tag/v0.6.10
---
 .../home-assistant/custom-components/midea_ac_lan/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix
index d2fa3dc53326..c8ba6fe59fef 100644
--- a/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/midea_ac_lan/package.nix
@@ -8,13 +8,13 @@
 buildHomeAssistantComponent rec {
   owner = "wuwentao";
   domain = "midea_ac_lan";
-  version = "0.6.9";
+  version = "0.6.10";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = domain;
     tag = "v${version}";
-    hash = "sha256-pPPJFs4earRbh6ovR57k9xgZtrYN0L26eupOoFuBVz8=";
+    hash = "sha256-xpa5xxqVEWxO4xa7ppFig09nDGfOoXpS9DDmjGU/zbc=";
   };
 
   dependencies = [ midea-local ];

From 6d8e1b6d305f7dc64de4779ef5b0c2a9ab9af32e Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 03:46:12 +0100
Subject: [PATCH 5800/6226] 
 home-assistant-custom-components.sleep_as_android_mqtt: rename from
 sleep_as_android

and upgrade from 2.3.2 -> 3.0.2.

https://github.com/IATkachenko/HA-SleepAsAndroid/releases/tag/v3.0.0
https://github.com/IATkachenko/HA-SleepAsAndroid/releases/tag/v3.0.1
https://github.com/IATkachenko/HA-SleepAsAndroid/releases/tag/v3.0.2
---
 .../package.nix                                      | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)
 rename pkgs/servers/home-assistant/custom-components/{sleep_as_android => sleep_as_android_mqtt}/package.nix (83%)

diff --git a/pkgs/servers/home-assistant/custom-components/sleep_as_android/package.nix b/pkgs/servers/home-assistant/custom-components/sleep_as_android_mqtt/package.nix
similarity index 83%
rename from pkgs/servers/home-assistant/custom-components/sleep_as_android/package.nix
rename to pkgs/servers/home-assistant/custom-components/sleep_as_android_mqtt/package.nix
index 373923e17a3d..f461f86da1ee 100644
--- a/pkgs/servers/home-assistant/custom-components/sleep_as_android/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/sleep_as_android_mqtt/package.nix
@@ -11,20 +11,26 @@
   paho-mqtt,
 }:
 let
-  version = "2.3.2";
+  version = "3.0.2";
 in
 buildHomeAssistantComponent {
   owner = "IATkachenko";
-  domain = "sleep_as_android";
+  domain = "sleep_as_android_mqtt";
   inherit version;
 
   src = fetchFromGitHub {
     owner = "IATkachenko";
     repo = "HA-SleepAsAndroid";
     tag = "v${version}";
-    hash = "sha256-aJKjHZcRdmiXJdtWRY4fv5oxCHTDIVpvZEwhIE9ISv8=";
+    hash = "sha256-vJAi63RMF7jdmLUZNmnSqNxbiJi52/PgmTQm0KB3ZP8=";
   };
 
+  postPatch = ''
+    # Fix incomplete rename of package name
+    substituteInPlace tests/unit/test_instance.py \
+      --replace-fail "sleep_as_android." "sleep_as_android_mqtt."
+  '';
+
   dependencies = [
     pyhaversion
   ];

From c187c096e465d9b42e8f21ad816f7196deacdcc1 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 03:47:34 +0100
Subject: [PATCH 5801/6226] python3Packages.tinytuya: 1.17.2 -> 1.17.4

https://github.com/jasonacox/tinytuya/releases/tag/v1.17.4
---
 pkgs/development/python-modules/tinytuya/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tinytuya/default.nix b/pkgs/development/python-modules/tinytuya/default.nix
index d666ea8b71e9..32e7e4b6ede1 100644
--- a/pkgs/development/python-modules/tinytuya/default.nix
+++ b/pkgs/development/python-modules/tinytuya/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "tinytuya";
-  version = "1.17.2";
+  version = "1.17.4";
   pyproject = true;
 
   disabled = pythonOlder "3.10";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "jasonacox";
     repo = "tinytuya";
     tag = "v${version}";
-    hash = "sha256-x6ZfpT3ucby95uthHX4KLLZNLWxyh6+ERDd5jb7p09g=";
+    hash = "sha256-ojwopholSQPND246PJMmEFSdzyXEZjAIgzpIRfS3VBw=";
   };
 
   build-system = [ setuptools ];

From 75a5976cdc30ced9600937767933bb471eebde09 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 03:47:52 +0100
Subject: [PATCH 5802/6226] home-assistant-custom-components.tuya_local:
 2025.7.1 -> 2025.10.1

https://github.com/make-all/tuya-local/releases/tag/2025.10.1
---
 .../home-assistant/custom-components/tuya_local/package.nix   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix
index bdc71a79fbbc..a06fb92710f8 100644
--- a/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix
+++ b/pkgs/servers/home-assistant/custom-components/tuya_local/package.nix
@@ -11,13 +11,13 @@
 buildHomeAssistantComponent rec {
   owner = "make-all";
   domain = "tuya_local";
-  version = "2025.7.1";
+  version = "2025.10.1";
 
   src = fetchFromGitHub {
     inherit owner;
     repo = "tuya-local";
     tag = version;
-    hash = "sha256-RIvtz6f3Jj4INvL0JdL+EsFUoLoG9vQNn5iPq2nF26I=";
+    hash = "sha256-Sqk6FBaEDp9KdcpKzWMeF6baqk7atbCtSRKTsQogwfo=";
   };
 
   dependencies = [

From 0cc5e16a2dda10dc4b1f6bbd516fe35765202944 Mon Sep 17 00:00:00 2001
From: Bruno Bigras <24027+bbigras@users.noreply.github.com>
Date: Wed, 5 Nov 2025 22:11:49 -0500
Subject: [PATCH 5803/6226] jujutsu: 0.34.0 -> 0.35.0

---
 pkgs/by-name/ju/jujutsu/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix
index ac1bdb377641..62c50c0bb234 100644
--- a/pkgs/by-name/ju/jujutsu/package.nix
+++ b/pkgs/by-name/ju/jujutsu/package.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jujutsu";
-  version = "0.34.0";
+  version = "0.35.0";
 
   src = fetchFromGitHub {
     owner = "jj-vcs";
     repo = "jj";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-OW8kSDBBSZr0G3U27AAkZ3cH3TJmSARbg9Pc4qZ6tA0=";
+    hash = "sha256-YUrjP2tzABdy4eAV1hPmgYWU8ChcJ5B4IlmQUGm95ro=";
   };
 
-  cargoHash = "sha256-/zC2z0evYs8VKta0uClTtl4l3tbDRcsVedGF2jtfQGA=";
+  cargoHash = "sha256-9VCAmtY029+CFNFcYLdA/VyT5CIvJnuA3iwPOKZpYV0=";
 
   nativeBuildInputs = [
     installShellFiles

From ef40dbe1f72d10872efc37413a47b7322d5b7f03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 5 Nov 2025 19:14:33 -0800
Subject: [PATCH 5804/6226] python3Packages.clx-sdk-xms: fix version

---
 pkgs/development/python-modules/clx-sdk-xms/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/clx-sdk-xms/default.nix b/pkgs/development/python-modules/clx-sdk-xms/default.nix
index dd5a56dfbca0..b2dcaa54c0d0 100644
--- a/pkgs/development/python-modules/clx-sdk-xms/default.nix
+++ b/pkgs/development/python-modules/clx-sdk-xms/default.nix
@@ -10,12 +10,13 @@
 
 buildPythonPackage {
   pname = "clx-sdk-xms";
-  version = "0-unstable-2017-01-23";
+  version = "1.0.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "clxcommunications";
     repo = "sdk-xms-python";
+    # https://github.com/clxcommunications/sdk-xms-python/issues/4
     rev = "8d629cd7bcaf91eaafee265a825e3c52191f1425";
     hash = "sha256-qMR9OT+QAKZGwDuoZVAtfKD3PQB7rEU/iTRjgACVGBs=";
   };

From 02ce6e7cde39c8b534011c5d0889ef1e0e9c6d88 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 03:41:37 +0000
Subject: [PATCH 5805/6226] biome: 2.3.2 -> 2.3.4

---
 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 72b7912c4a25..caa43f611851 100644
--- a/pkgs/by-name/bi/biome/package.nix
+++ b/pkgs/by-name/bi/biome/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "biome";
-  version = "2.3.2";
+  version = "2.3.4";
 
   src = fetchFromGitHub {
     owner = "biomejs";
     repo = "biome";
     rev = "@biomejs/biome@${finalAttrs.version}";
-    hash = "sha256-SUihyk1tbSiF3uY19/T9ZgQsURVc81p8lFMN933p6f0=";
+    hash = "sha256-81eM8EK2ORtsEyOTTgNFZxK8pCPBKq7YSfUmIVL91VI=";
   };
 
-  cargoHash = "sha256-nzQb2GJFltktA10Rrl7tltHVjVYNPgLNpDzOXCHQeQA=";
+  cargoHash = "sha256-6F6UJJRETOr476h12OHcT1U4iTAkoVuomikIvlrWyqE=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 4b3545e8abb738ee1cb2bdd96c468cf4b4d3b10f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 03:43:34 +0000
Subject: [PATCH 5806/6226] python3Packages.pyairtable: 3.2.0 -> 3.3.0

---
 pkgs/development/python-modules/pyairtable/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyairtable/default.nix b/pkgs/development/python-modules/pyairtable/default.nix
index e3ece5ad3233..75a314bb50ed 100644
--- a/pkgs/development/python-modules/pyairtable/default.nix
+++ b/pkgs/development/python-modules/pyairtable/default.nix
@@ -19,12 +19,12 @@
 
 buildPythonPackage rec {
   pname = "pyairtable";
-  version = "3.2.0";
+  version = "3.3.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-9v0eOr3CgBTb7N6FkcgmVgxctaLTieUYZHwuXsuIR40=";
+    hash = "sha256-1tO3f2/regKoR3nCI103pGYF82AwzyDtmbCLq3MQiow=";
   };
 
   build-system = [

From b04921293d2d1b5ade239e1aeb1ed618d10f1988 Mon Sep 17 00:00:00 2001
From: iamanaws <78835633+Iamanaws@users.noreply.github.com>
Date: Wed, 5 Nov 2025 19:45:58 -0800
Subject: [PATCH 5807/6226] textcompare: 0.1.6 -> 0.1.7

---
 pkgs/by-name/te/textcompare/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/te/textcompare/package.nix b/pkgs/by-name/te/textcompare/package.nix
index 6d023297bc15..2a1612a6fb8c 100644
--- a/pkgs/by-name/te/textcompare/package.nix
+++ b/pkgs/by-name/te/textcompare/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "textcompare";
-  version = "0.1.6";
+  version = "0.1.7";
 
   src = fetchFromGitHub {
     owner = "josephmawa";
     repo = "TextCompare";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-KWW83866dZRpuJzzYwk2X1/6OoD4gPnm2LD6IlP3fps=";
+    hash = "sha256-d+P5Vf1WQCNCTXUl6yK2dYp8HhwTj1Wjf8puFKHuFtw=";
   };
 
   strictDeps = true;

From 002065db7965f66be1c7fa61101ac0ee3553cd9c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 03:51:28 +0000
Subject: [PATCH 5808/6226] python3Packages.torchio: 0.20.23 -> 0.21.0

---
 pkgs/development/python-modules/torchio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/torchio/default.nix b/pkgs/development/python-modules/torchio/default.nix
index fd08e25f76a1..8411f4438727 100644
--- a/pkgs/development/python-modules/torchio/default.nix
+++ b/pkgs/development/python-modules/torchio/default.nix
@@ -35,14 +35,14 @@
 
 buildPythonPackage rec {
   pname = "torchio";
-  version = "0.20.23";
+  version = "0.21.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TorchIO-project";
     repo = "torchio";
     tag = "v${version}";
-    hash = "sha256-OSqXV8aINqi7MstUy4RfIWLH4NxJB+r1tdzMrSgo7pg=";
+    hash = "sha256-y3p5LdBC/O82GVroA5B0PNC5qRwVjNbiNroJrV1iU/A=";
   };
 
   build-system = [

From 865a7c548b610d2f1b2cb04448c2e78f6e914b0d Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 6 Nov 2025 10:51:51 +0800
Subject: [PATCH 5809/6226] wechat: 4.1.0.10 -> 4.1.0.13 for
 {aarch64,x86_64}-linux

---
 pkgs/by-name/we/wechat/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/we/wechat/package.nix b/pkgs/by-name/we/wechat/package.nix
index 5fb0e58efb5a..5b748f1fac79 100644
--- a/pkgs/by-name/we/wechat/package.nix
+++ b/pkgs/by-name/we/wechat/package.nix
@@ -45,17 +45,17 @@ let
       aarch64-darwin = any-darwin;
       x86_64-darwin = any-darwin;
       aarch64-linux = {
-        version = "4.1.0.10";
+        version = "4.1.0.13";
         src = fetchurl {
-          url = "https://web.archive.org/web/20250930121708/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage";
-          hash = "sha256-qkNLA8nILsIi2ciIzr9pb3PejhbEvZ5fe4GlmjyjrEI=";
+          url = "https://web.archive.org/web/20251106024910/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_arm64.AppImage";
+          hash = "sha256-/d5crM6IGd0k0fSlBSQx4TpIVX/8iib+an0VMkWMNdw=";
         };
       };
       x86_64-linux = {
-        version = "4.1.0.10";
+        version = "4.1.0.13";
         src = fetchurl {
-          url = "https://web.archive.org/web/20250930121506/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage";
-          hash = "sha256-d/zdb69gmIcgAFCbWLKGfmD8ZFfuDlYdOy7vUJ7SiXc=";
+          url = "https://web.archive.org/web/20251106024907/https://dldir1v6.qq.com/weixin/Universal/Linux/WeChatLinux_x86_64.AppImage";
+          hash = "sha256-+r5Ebu40GVGG2m2lmCFQ/JkiDsN/u7XEtnLrB98602w=";
         };
       };
     };

From dc89f760bbc7d2269796aef303a2ec8882a19a15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 04:15:50 +0000
Subject: [PATCH 5810/6226] kibi: 0.3.0 -> 0.3.1

---
 pkgs/by-name/ki/kibi/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ki/kibi/package.nix b/pkgs/by-name/ki/kibi/package.nix
index 268ba30f54a7..8daf15c17682 100644
--- a/pkgs/by-name/ki/kibi/package.nix
+++ b/pkgs/by-name/ki/kibi/package.nix
@@ -7,15 +7,15 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "kibi";
-  version = "0.3.0";
+  version = "0.3.1";
 
-  cargoHash = "sha256-gXkwqmmFGNEJY7an3KWlRuLL5WuCH4P0n7BrLNsZ9/A=";
+  cargoHash = "sha256-IF7pcatGJDcwTmBziB8hVWJkleoV+pXXRQnbYfQtBJE=";
 
   src = fetchFromGitHub {
     owner = "ilai-deutel";
     repo = "kibi";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-6uDpTQ97eNgM1lCiYPWS5QPxMNcPF3Ix14VaGiTY4Kc=";
+    hash = "sha256-EXobpuVob4RD37LK0RlpCGXACfemm+e+JczYYPNDhrc=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 19be0948e1c0c1c1202d29a58c229f8e50f05aed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 04:17:57 +0000
Subject: [PATCH 5811/6226] xdg-ninja: 0.2.0.2-unstable-2025-08-07 ->
 0.2.0.2-unstable-2025-11-01

---
 pkgs/by-name/xd/xdg-ninja/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/xd/xdg-ninja/package.nix b/pkgs/by-name/xd/xdg-ninja/package.nix
index e1efbdea7299..6b7c410ce889 100644
--- a/pkgs/by-name/xd/xdg-ninja/package.nix
+++ b/pkgs/by-name/xd/xdg-ninja/package.nix
@@ -10,13 +10,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "xdg-ninja";
-  version = "0.2.0.2-unstable-2025-08-07";
+  version = "0.2.0.2-unstable-2025-11-01";
 
   src = fetchFromGitHub {
     owner = "b3nj5m1n";
     repo = "xdg-ninja";
-    rev = "854929e5413e8d2cf84e90c5cc3ccb0188ab5d22";
-    hash = "sha256-Kgu+LEU1SeB3ODyLihYG+IaQ2TMEFf3gxtjNM1FZz98=";
+    rev = "cb09ebd6479e276070a55fcffae9a5320bc52ed5";
+    hash = "sha256-VpMSMWwYD0GIPtAuSkdG417RxSx6XCRh09IMrLDOi6A=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From 24c4b5c451e2596fa3136254ab8dc36284dd49ea Mon Sep 17 00:00:00 2001
From: Vincent Laporte <Vincent.Laporte@gmail.com>
Date: Thu, 6 Nov 2025 05:19:36 +0100
Subject: [PATCH 5812/6226] coqPackages_9_1.equations: init at 1.3.1+9.1

---
 pkgs/development/coq-modules/equations/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/development/coq-modules/equations/default.nix b/pkgs/development/coq-modules/equations/default.nix
index 9c415098e663..8e96965d5996 100644
--- a/pkgs/development/coq-modules/equations/default.nix
+++ b/pkgs/development/coq-modules/equations/default.nix
@@ -17,6 +17,7 @@
       case = case: out: { inherit case out; };
     in
     lib.switch coq.coq-version [
+      (case "9.1" "1.3.1+9.1")
       (case "9.0" "1.3.1+9.0")
       (case "8.20" "1.3.1+8.20")
       (case "8.19" "1.3+8.19")
@@ -80,6 +81,8 @@
   release."1.3.1+8.20".sha256 = "sha256-u8LB1KiACM5zVaoL7dSdHYvZgX7pf30VuqtjLLGuTzc=";
   release."1.3.1+9.0".rev = "v1.3.1-9.0";
   release."1.3.1+9.0".sha256 = "sha256-186Z0/wCuGAjIvG1LoYBMPooaC6HmnKWowYXuR0y6bA=";
+  release."1.3.1+9.1".rev = "v1.3.1-9.1";
+  release."1.3.1+9.1".sha256 = "sha256-LtYbAR3jt+JbYcqP+m1n3AZhAWSMIeOZtmdSJwg7L1A=";
 
   mlPlugin = true;
 

From 01607ddca80ebdaa6a088efc8eeddbb1d62dad21 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 6 Nov 2025 09:17:08 +1000
Subject: [PATCH 5813/6226] go_1_24: 1.24.9 -> 1.24.10

Changelog: https://go.dev/doc/devel/release#go1.24
---
 pkgs/development/compilers/go/1.24.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/go/1.24.nix b/pkgs/development/compilers/go/1.24.nix
index 39d61674a21b..11e2e4ab294f 100644
--- a/pkgs/development/compilers/go/1.24.nix
+++ b/pkgs/development/compilers/go/1.24.nix
@@ -27,11 +27,11 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "go";
-  version = "1.24.9";
+  version = "1.24.10";
 
   src = fetchurl {
     url = "https://go.dev/dl/go${finalAttrs.version}.src.tar.gz";
-    hash = "sha256-xy+BulT+AO/n8+dJnUAJeSRogbE7d16am7hVQcEb5pU=";
+    hash = "sha256-NAANzEelF7ePzyZX7n0DMyilcHn+YMTti3uEJg0dGdM=";
   };
 
   strictDeps = true;

From 332b503c40306d772cbda7f7da6cfd81ad976a6e Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 6 Nov 2025 14:36:57 +1000
Subject: [PATCH 5814/6226] release-cuda: remove references to nix-community

cuda work has moved out of nix-community and the jobset on the community hydra will be disabled
---
 pkgs/top-level/release-cuda.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/top-level/release-cuda.nix b/pkgs/top-level/release-cuda.nix
index 37b2dd807036..9ca2ab7dc30f 100644
--- a/pkgs/top-level/release-cuda.nix
+++ b/pkgs/top-level/release-cuda.nix
@@ -2,10 +2,7 @@
     Test CUDA packages.
 
     This release file is currently not tested on hydra.nixos.org
-    because it requires unfree software, but it is tested by
-    https://hydra.nix-community.org/jobset/nixpkgs/cuda-nixos-unstable.
-
-    Cf. https://github.com/nix-community/infra/pull/1335
+    because it requires unfree software.
 
     Test for example like this:
 

From 639af2499d349abb2edca6dc96470a9e0bf29620 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 04:44:47 +0000
Subject: [PATCH 5815/6226] python3Packages.scikit-misc: 0.5.1 -> 0.5.2

---
 pkgs/development/python-modules/scikit-misc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/scikit-misc/default.nix b/pkgs/development/python-modules/scikit-misc/default.nix
index bb834dac7c77..fc400697a2d0 100644
--- a/pkgs/development/python-modules/scikit-misc/default.nix
+++ b/pkgs/development/python-modules/scikit-misc/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "scikit-misc";
-  version = "0.5.1";
+  version = "0.5.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "has2k1";
     repo = "scikit-misc";
     tag = "v${version}";
-    hash = "sha256-w6RHmVxJjLx9ov2LxXvicxmY8jixfkIRfbfVnV2yhOU=";
+    hash = "sha256-G0zK13upo0tPd8x87X8cTBKWK63E5JPmAr1IVEijtaw=";
   };
 
   postPatch = ''

From ad035ee4c44c2261c3d7b01f4e3d7590efbbc04e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 04:45:50 +0000
Subject: [PATCH 5816/6226] terraform-providers.rootlyhq_rootly: 4.3.5 -> 4.3.7

---
 .../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 a4fe71f3b327..c979937782d0 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1129,13 +1129,13 @@
     "vendorHash": "sha256-M2lJKmIR66lQKFkInjizn68ax2Gq4sim5Y3vZKyDhZ8="
   },
   "rootlyhq_rootly": {
-    "hash": "sha256-215PagKhONN483SGvYsLWQfKnSWmUKL1vCM4mr2xuGo=",
+    "hash": "sha256-8UlBt9gmQflO5sB++U4Ih40+6p+U6N8PE1npQYg9D8U=",
     "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly",
     "owner": "rootlyhq",
     "repo": "terraform-provider-rootly",
-    "rev": "v4.3.5",
+    "rev": "v4.3.7",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-MNddgnKFdrOCfpj84McqW/8lmU/t36x2Whsl9xkmrhM="
+    "vendorHash": "sha256-IpWN8hCZlXm9hbPr2VcjzU7wtqivUk2h+LOaaz4KyP4="
   },
   "rundeck_rundeck": {
     "hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=",

From 44095df8301d900594aab65673c9e2f89095dac3 Mon Sep 17 00:00:00 2001
From: Morgan Jones <me@numin.it>
Date: Thu, 6 Nov 2025 04:46:58 +0000
Subject: [PATCH 5817/6226] dwarf-fortress-packages: DF 52.05 -> DF 53.02

Performed the following automatic DF updates:

- DF 52.05 -> DF 53.02
---
 pkgs/games/dwarf-fortress/df.lock.json | 22 +++++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/pkgs/games/dwarf-fortress/df.lock.json b/pkgs/games/dwarf-fortress/df.lock.json
index f27b80fea6c5..a31c7c48efde 100644
--- a/pkgs/games/dwarf-fortress/df.lock.json
+++ b/pkgs/games/dwarf-fortress/df.lock.json
@@ -1,10 +1,30 @@
 {
   "game": {
     "latest": {
-      "linux": "52.05",
+      "linux": "53.02",
       "darwin": "0.47.05"
     },
     "versions": {
+      "53.02": {
+        "df": {
+          "version": "53.02",
+          "urls": {
+            "linux": {
+              "url": "https://www.bay12games.com/dwarves/df_53_02_linux.tar.bz2",
+              "outputHash": "sha256-SprD05MMynNCBr2oKnBYvimm+RmOoceEC2MF9IhCc5Q="
+            }
+          }
+        },
+        "hack": {
+          "version": "53.02-r1",
+          "git": {
+            "url": "https://github.com/DFHack/dfhack.git",
+            "revision": "53.02-r1",
+            "outputHash": "sha256-ybDaFYNVhNS1xJU/dD8KBzNu3ceetFbvX7xNp5DLzyU="
+          },
+          "xmlRev": "99cb51ac849a17652dbb74efa757df5b5716a9ba"
+        }
+      },
       "52.05": {
         "df": {
           "version": "52.05",

From 3657d17a5675959728d5547004980bd661a1ee40 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 04:52:51 +0000
Subject: [PATCH 5818/6226] s7: 11.7-unstable-2025-10-29 ->
 11.7-unstable-2025-11-05

---
 pkgs/by-name/s7/s7/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/s7/s7/package.nix b/pkgs/by-name/s7/s7/package.nix
index c35856dd68ad..88b0caf1c063 100644
--- a/pkgs/by-name/s7/s7/package.nix
+++ b/pkgs/by-name/s7/s7/package.nix
@@ -26,14 +26,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "s7";
-  version = "11.7-unstable-2025-10-29";
+  version = "11.7-unstable-2025-11-05";
 
   src = fetchFromGitLab {
     domain = "cm-gitlab.stanford.edu";
     owner = "bil";
     repo = "s7";
-    rev = "cb3da9a414401e447066c6f2ccd4476c2da886ec";
-    hash = "sha256-RHYALNWKxQ5mgU/mvQVsVW87Efd+kxgIBkw7vOgwVAo=";
+    rev = "fad53814de1ace0f9030e01f234ee4d139cfc514";
+    hash = "sha256-RLYZPy5mn1Uk1vCoUwAy7V0Lv8rUeb0iX50+A1TBw0U=";
   };
 
   buildInputs =

From 1aec18ceab2910e66331ccdc6cbf61780a89d46c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 05:02:19 +0000
Subject: [PATCH 5819/6226] python3Packages.great-tables: 0.19.0 -> 0.20.0

---
 pkgs/development/python-modules/great-tables/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/great-tables/default.nix b/pkgs/development/python-modules/great-tables/default.nix
index 73aae4900de8..224559694d4f 100644
--- a/pkgs/development/python-modules/great-tables/default.nix
+++ b/pkgs/development/python-modules/great-tables/default.nix
@@ -34,14 +34,14 @@
 
 buildPythonPackage rec {
   pname = "great-tables";
-  version = "0.19.0";
+  version = "0.20.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "posit-dev";
     repo = "great-tables";
     tag = "v${version}";
-    hash = "sha256-bxeVVBGLS1yUaEnySCu1Ty1+bmoygMwQzBHMmtzm/+U=";
+    hash = "sha256-3SyY3mI5fd0S5pi1vG+BQaWHv/qB2L6vlIXxjO4UO1E=";
   };
 
   build-system = [

From e8e59291230fccb1061ae32968ff2ab6889b7612 Mon Sep 17 00:00:00 2001
From: Quag <quaggy@gmail.com>
Date: Wed, 5 Nov 2025 21:25:45 -0800
Subject: [PATCH 5820/6226] python3Packages.segments: fix build (remove
 clldutils)

segments 2.3.0 removed dependency on clldutils (broken).
https://github.com/cldf/segments/commit/82bc9bde99fd9f5be468b9aaa4d46995cef9050b
---
 pkgs/development/python-modules/segments/default.nix | 2 --
 1 file changed, 2 deletions(-)

diff --git a/pkgs/development/python-modules/segments/default.nix b/pkgs/development/python-modules/segments/default.nix
index 94063cfdcaf9..58c6d711cbba 100644
--- a/pkgs/development/python-modules/segments/default.nix
+++ b/pkgs/development/python-modules/segments/default.nix
@@ -6,7 +6,6 @@
   setuptools,
   regex,
   csvw,
-  clldutils,
   pytestCheckHook,
   pytest-cov-stub,
   pytest-mock,
@@ -30,7 +29,6 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     regex
     csvw
-    clldutils
   ];
 
   nativeCheckInputs = [

From 61c9e6942f65c87623621c6a9511206209e50441 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 05:46:58 +0000
Subject: [PATCH 5821/6226] all-the-package-names: 2.0.2250 -> 2.0.2257

---
 pkgs/by-name/al/all-the-package-names/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/al/all-the-package-names/package.nix b/pkgs/by-name/al/all-the-package-names/package.nix
index cd619c8ef3a4..e698cc15e9e6 100644
--- a/pkgs/by-name/al/all-the-package-names/package.nix
+++ b/pkgs/by-name/al/all-the-package-names/package.nix
@@ -7,16 +7,16 @@
 
 buildNpmPackage rec {
   pname = "all-the-package-names";
-  version = "2.0.2250";
+  version = "2.0.2257";
 
   src = fetchFromGitHub {
     owner = "nice-registry";
     repo = "all-the-package-names";
     tag = "v${version}";
-    hash = "sha256-Txh+ijQwl2x2FBQp5oWtmGdDRvDnmQoQYc1QShsFEo8=";
+    hash = "sha256-CtNbv7PAUAdUuUQsEzOlg/oykGgWe+NPUWWeucTVajw=";
   };
 
-  npmDepsHash = "sha256-V3Zm1vy333WfarVVUbnpeEKkXW3HBwVDO3JltRLVNSk=";
+  npmDepsHash = "sha256-9rGaeLl4Mq5oo+XKBU54wNtK6F+2Bndr2EORITo1moo=";
 
   passthru.updateScript = nix-update-script { };
 

From 9f2260a0c2f53ba5b3bbd343071d2bbcd9e1e9f4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 06:12:06 +0000
Subject: [PATCH 5822/6226] python3Packages.libtmux: 0.46.2 -> 0.47.0

---
 pkgs/development/python-modules/libtmux/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/libtmux/default.nix b/pkgs/development/python-modules/libtmux/default.nix
index 588e6af5127d..836447ae1b4c 100644
--- a/pkgs/development/python-modules/libtmux/default.nix
+++ b/pkgs/development/python-modules/libtmux/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "libtmux";
-  version = "0.46.2";
+  version = "0.47.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "tmux-python";
     repo = "libtmux";
     tag = "v${version}";
-    hash = "sha256-M3su+bDFuvmNEDVK+poWfxwbpsw/0L1/R6Z4CL0mvZ4=";
+    hash = "sha256-yrz9fMr33yj/u0uGUNHYv0zOTvtfJ2u0TKToBO8ha6U=";
   };
 
   postPatch = ''

From 909ea46d37a483c80632a955abc20075dc500918 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 06:13:46 +0000
Subject: [PATCH 5823/6226] python3Packages.pycrdt: 0.12.42 -> 0.12.43

---
 pkgs/development/python-modules/pycrdt/Cargo.lock  | 6 +++---
 pkgs/development/python-modules/pycrdt/default.nix | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/pycrdt/Cargo.lock b/pkgs/development/python-modules/pycrdt/Cargo.lock
index 481c87c59d33..50cef0f46620 100644
--- a/pkgs/development/python-modules/pycrdt/Cargo.lock
+++ b/pkgs/development/python-modules/pycrdt/Cargo.lock
@@ -241,7 +241,7 @@ dependencies = [
 
 [[package]]
 name = "pycrdt"
-version = "0.12.42"
+version = "0.12.43"
 dependencies = [
  "pyo3",
  "serde_json",
@@ -405,9 +405,9 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "syn"
-version = "2.0.108"
+version = "2.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"
+checksum = "2f17c7e013e88258aa9543dcbe81aca68a667a9ac37cd69c9fbc07858bfe0e2f"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/pkgs/development/python-modules/pycrdt/default.nix b/pkgs/development/python-modules/pycrdt/default.nix
index 1a4c9dce6af4..dc805a7304f8 100644
--- a/pkgs/development/python-modules/pycrdt/default.nix
+++ b/pkgs/development/python-modules/pycrdt/default.nix
@@ -19,14 +19,14 @@
 
 buildPythonPackage rec {
   pname = "pycrdt";
-  version = "0.12.42";
+  version = "0.12.43";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "y-crdt";
     repo = "pycrdt";
     tag = version;
-    hash = "sha256-TEuP6mkd4phic2vJv0BYD50GvlrNj4Z4/jMknLfnYI8=";
+    hash = "sha256-yMl+bLnREvuyVhMvR0TM+IKTPpJlgBCgE4M4NJp9k/M=";
   };
 
   postPatch = ''

From 1548b7527ada1376f6bf400e0b644a2af7636c1c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 06:31:19 +0000
Subject: [PATCH 5824/6226] libsidplayfp: 2.15.1 -> 2.15.2

---
 pkgs/by-name/li/libsidplayfp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix
index 233d65da68de..e4d6d581d0b6 100644
--- a/pkgs/by-name/li/libsidplayfp/package.nix
+++ b/pkgs/by-name/li/libsidplayfp/package.nix
@@ -18,14 +18,14 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "libsidplayfp";
-  version = "2.15.1";
+  version = "2.15.2";
 
   src = fetchFromGitHub {
     owner = "libsidplayfp";
     repo = "libsidplayfp";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-wnbQy0PHHpkgNm3SC7GZyxSAUYd5eexVY9Dg1oiCjRo=";
+    hash = "sha256-/GXRqLt2wPCUiOKlaEq52APOOYWgbaejzJcppZgMgfA=";
   };
 
   outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ];

From f9f9399c63ec810a7527aed020a8f061a858375c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 06:48:37 +0000
Subject: [PATCH 5825/6226] tektoncd-cli-pac: 0.38.0 -> 0.39.0

---
 pkgs/by-name/te/tektoncd-cli-pac/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/te/tektoncd-cli-pac/package.nix b/pkgs/by-name/te/tektoncd-cli-pac/package.nix
index 718643366ae2..22ace41e9b2f 100644
--- a/pkgs/by-name/te/tektoncd-cli-pac/package.nix
+++ b/pkgs/by-name/te/tektoncd-cli-pac/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "tektoncd-cli-pac";
-  version = "0.38.0";
+  version = "0.39.0";
 
   src = fetchFromGitHub {
     owner = "openshift-pipelines";
     repo = "pipelines-as-code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ti2IVI6ECXOhSxeeW7ufD1XjsOtr1R2J5Beq/ADRHaA=";
+    hash = "sha256-39jVFnLEUQHakVcSkrjrTRANp6D8FAoy+kIGi/QL5gk=";
   };
 
   vendorHash = null;

From e5cd81a22edc0078a39d61d4f11d3bf1ad74c3da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 06:49:57 +0000
Subject: [PATCH 5826/6226] python3Packages.radish-bdd: 0.18.2 -> 0.18.3

---
 pkgs/development/python-modules/radish-bdd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/radish-bdd/default.nix b/pkgs/development/python-modules/radish-bdd/default.nix
index 8abe78c1ac54..c2635f27e993 100644
--- a/pkgs/development/python-modules/radish-bdd/default.nix
+++ b/pkgs/development/python-modules/radish-bdd/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "radish-bdd";
-  version = "0.18.2";
+  version = "0.18.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.10";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = "radish";
     tag = "v${version}";
-    hash = "sha256-SSrEKGs4q4rcnQM03/gc0/vEb7gmTmpfgeNp3e+Hyvg=";
+    hash = "sha256-UjJz9ysejz5DBewMwoVof1+JU8tbGbBa3z1quuN1TWg=";
   };
 
   propagatedBuildInputs = [

From 8f8fce52d44fa8298448c70f24bbd0565c6d6fa6 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Wed, 5 Nov 2025 20:02:13 +0100
Subject: [PATCH 5827/6226] python3Packages.pipenv-poetry-migrate: fix test

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 pkgs/by-name/pi/pipenv-poetry-migrate/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix b/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix
index 05a05d9ab39a..18635abe379b 100644
--- a/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix
+++ b/pkgs/by-name/pi/pipenv-poetry-migrate/package.nix
@@ -18,16 +18,16 @@ python3Packages.buildPythonApplication rec {
 
   build-system = [ python3Packages.poetry-core ];
 
-  pythonRelaxDeps = [
-    "typer"
-  ];
-
   dependencies = with python3Packages; [
     setuptools # for pkg_resources
     tomlkit
     typer
   ];
 
+  # typer for Click >= 8.2 removed "mix_stderr", upstream pins to 8.1.8
+  # https://typer.tiangolo.com/release-notes/#0160
+  disabledTestPaths = [ "tests/test_cli.py" ];
+
   nativeCheckInputs = [ python3Packages.pytestCheckHook ];
 
   meta = {

From 68818b7dd30fd5d74bf50fb1298bf216a85a7544 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 07:05:56 +0000
Subject: [PATCH 5828/6226] python3Packages.lsassy: 3.1.13 -> 3.1.15

---
 pkgs/development/python-modules/lsassy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix
index 12e1e6f8352d..aca4663df5ee 100644
--- a/pkgs/development/python-modules/lsassy/default.nix
+++ b/pkgs/development/python-modules/lsassy/default.nix
@@ -12,7 +12,7 @@
 
 buildPythonPackage rec {
   pname = "lsassy";
-  version = "3.1.13";
+  version = "3.1.15";
   pyproject = true;
 
   disabled = pythonOlder "3.7";
@@ -21,7 +21,7 @@ buildPythonPackage rec {
     owner = "Hackndo";
     repo = "lsassy";
     tag = "v${version}";
-    hash = "sha256-DdIEDseGLI+hUIaUNPBqpkGGe+F+Z+jZ0g/JzXB8pf8=";
+    hash = "sha256-cQfyRCZv0ZTaj7Ay7zTzFnU7PQluP3VweeFof8+W70M=";
   };
 
   pythonRelaxDeps = [

From aed9bd453bcf5a239c568f72bd5656b4f6ad2eef Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 07:14:02 +0000
Subject: [PATCH 5829/6226] capslock: 0.2.8 -> 0.3.0

---
 pkgs/by-name/ca/capslock/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/capslock/package.nix b/pkgs/by-name/ca/capslock/package.nix
index 2e22bd1fb448..374dc58ff5df 100644
--- a/pkgs/by-name/ca/capslock/package.nix
+++ b/pkgs/by-name/ca/capslock/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "capslock";
-  version = "0.2.8";
+  version = "0.3.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "capslock";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-7FMsW51LYEjEXcil6e64tAHaBeDAYRnBBX4E1PjSXtU=";
+    hash = "sha256-ls7+aXEelxKXhittK4orv9xgPKw1pE87yZdoSHBUgK8=";
   };
 
-  vendorHash = "sha256-UOpreQceWgwbQ+Qup4iEStQqJA77uiiupfTUFxNBIcM=";
+  vendorHash = "sha256-2nK+yxgLmrXjt41gYSXvkpZ2glu6PAtO18Nrt1tmup4=";
 
   subPackages = [ "cmd/capslock" ];
 

From ca6bb4761f248949c9e9d1c7d5d53168fc90f508 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Thu, 6 Nov 2025 12:59:14 +0530
Subject: [PATCH 5830/6226] tidy-viewer: add phanirithvij as maintainer

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/ti/tidy-viewer/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ti/tidy-viewer/package.nix b/pkgs/by-name/ti/tidy-viewer/package.nix
index 44d7f7e4aba2..3175210a15f3 100644
--- a/pkgs/by-name/ti/tidy-viewer/package.nix
+++ b/pkgs/by-name/ti/tidy-viewer/package.nix
@@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec {
     homepage = "https://github.com/alexhallam/tv";
     changelog = "https://github.com/alexhallam/tv/blob/${version}/CHANGELOG.md";
     license = lib.licenses.unlicense;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ phanirithvij ];
   };
 }

From a9fe3a48ca6fade79c30970e77e2028b1765525a Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Thu, 6 Nov 2025 13:00:02 +0530
Subject: [PATCH 5831/6226] tidy-viewer: refactor to use finalAttrs

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/ti/tidy-viewer/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ti/tidy-viewer/package.nix b/pkgs/by-name/ti/tidy-viewer/package.nix
index 3175210a15f3..653159bf8d12 100644
--- a/pkgs/by-name/ti/tidy-viewer/package.nix
+++ b/pkgs/by-name/ti/tidy-viewer/package.nix
@@ -4,14 +4,14 @@
   fetchFromGitHub,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "tidy-viewer";
   version = "1.8.93";
 
   src = fetchFromGitHub {
     owner = "alexhallam";
     repo = "tv";
-    rev = version;
+    tag = finalAttrs.version;
     sha256 = "sha256-wiVcdTnjEFh5kSyxmK+ab0LkEAbQaygmLdrFfM12DyM=";
   };
 
@@ -24,11 +24,11 @@ rustPlatform.buildRustPackage rec {
   ];
 
   meta = {
+    changelog = "https://github.com/alexhallam/tv/blob/${finalAttrs.version}/CHANGELOG.md";
     description = "Cross-platform CLI csv pretty printer that uses column styling to maximize viewer enjoyment";
-    mainProgram = "tidy-viewer";
     homepage = "https://github.com/alexhallam/tv";
-    changelog = "https://github.com/alexhallam/tv/blob/${version}/CHANGELOG.md";
     license = lib.licenses.unlicense;
+    mainProgram = "tidy-viewer";
     maintainers = with lib.maintainers; [ phanirithvij ];
   };
-}
+})

From 719cee4d9d1e7a2cb82dc996e1dc3b09b16580c5 Mon Sep 17 00:00:00 2001
From: phanirithvij <phanirithvij2000@gmail.com>
Date: Thu, 6 Nov 2025 13:00:37 +0530
Subject: [PATCH 5832/6226] tidy-viewer: enable skipped test

seems to work fine on x86_64-linux

Signed-off-by: phanirithvij <phanirithvij2000@gmail.com>
---
 pkgs/by-name/ti/tidy-viewer/package.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/by-name/ti/tidy-viewer/package.nix b/pkgs/by-name/ti/tidy-viewer/package.nix
index 653159bf8d12..c6e26ee7606a 100644
--- a/pkgs/by-name/ti/tidy-viewer/package.nix
+++ b/pkgs/by-name/ti/tidy-viewer/package.nix
@@ -17,12 +17,6 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   cargoHash = "sha256-HF7M4s2OHCAyVkbCIBxGButAxbxrhjmY3YE/do8et1s=";
 
-  # this test parses command line arguments
-  # error: Found argument '--test-threads' which wasn't expected, or isn't valid in this context
-  checkFlags = [
-    "--skip=build_reader_can_create_reader_without_file_specified"
-  ];
-
   meta = {
     changelog = "https://github.com/alexhallam/tv/blob/${finalAttrs.version}/CHANGELOG.md";
     description = "Cross-platform CLI csv pretty printer that uses column styling to maximize viewer enjoyment";

From 7d368a954b07dbfd82db98a50d22c5ed1789699a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 6 Nov 2025 08:49:10 +0100
Subject: [PATCH 5833/6226] python313Packages.lsassy: modernize

---
 pkgs/development/python-modules/lsassy/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/lsassy/default.nix b/pkgs/development/python-modules/lsassy/default.nix
index aca4663df5ee..00bdd5e17fdd 100644
--- a/pkgs/development/python-modules/lsassy/default.nix
+++ b/pkgs/development/python-modules/lsassy/default.nix
@@ -6,7 +6,6 @@
   netaddr,
   poetry-core,
   pypykatz,
-  pythonOlder,
   rich,
 }:
 
@@ -15,8 +14,6 @@ buildPythonPackage rec {
   version = "3.1.15";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "Hackndo";
     repo = "lsassy";
@@ -47,8 +44,8 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python module to extract data from Local Security Authority Subsystem Service (LSASS)";
     homepage = "https://github.com/Hackndo/lsassy";
-    changelog = "https://github.com/Hackndo/lsassy/releases/tag/v${version}";
-    license = with licenses; [ mit ];
+    changelog = "https://github.com/Hackndo/lsassy/releases/tag/${src.tag}";
+    license = licenses.mit;
     maintainers = with maintainers; [ fab ];
     mainProgram = "lsassy";
   };

From 43d582016a763837e0bd101f7b85093e554d0e05 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Wed, 5 Nov 2025 09:49:39 +0800
Subject: [PATCH 5834/6226] taplo: fix completion generation on darwin

---
 pkgs/by-name/ta/taplo/package.nix          |   41 +-
 pkgs/by-name/ta/taplo/update-reqwest.patch | 1291 ++++++++++++++++++++
 2 files changed, 1312 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/by-name/ta/taplo/update-reqwest.patch

diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix
index 9bd4a899fb35..aafc29f7a8a1 100644
--- a/pkgs/by-name/ta/taplo/package.nix
+++ b/pkgs/by-name/ta/taplo/package.nix
@@ -2,7 +2,7 @@
   stdenv,
   lib,
   rustPlatform,
-  fetchCrate,
+  fetchFromGitHub,
   pkg-config,
   openssl,
   withLsp ? true,
@@ -15,13 +15,22 @@ rustPlatform.buildRustPackage (finalAttrs: {
   pname = "taplo";
   version = "0.10.0";
 
-  src = fetchCrate {
-    inherit (finalAttrs) version;
-    pname = "taplo-cli";
-    hash = "sha256-iKc4Nu7AZE1LSuqXffi3XERbOqZMOkI3PV+6HaJzh4c=";
+  src = fetchFromGitHub {
+    owner = "tamasfe";
+    repo = "taplo";
+    tag = "release-taplo-cli-${finalAttrs.version}";
+    hash = "sha256-FW8OQ5TRUuQK8M2NDmp4c6p22jsHodxKqzOMrcdiqXU=";
   };
 
-  cargoHash = "sha256-tvijtB5fwOzQnnK/ClIvTbjCcMeqZpXcRdWWKZPIulM=";
+  cargoPatches = [
+    # Update reqwest to fix darwin sandboxing issues
+    # See also: https://github.com/tamasfe/taplo/pull/669
+    ./update-reqwest.patch
+  ];
+
+  cargoHash = "sha256-FMpGo+kRcNgDj4qwYvdQKGwGazUKKMIVq0HCYMrTql0=";
+
+  buildAndTestSubdir = "crates/taplo-cli";
 
   nativeBuildInputs = [
     installShellFiles
@@ -32,20 +41,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
 
   buildFeatures = lib.optional withLsp "lsp";
 
-  postInstall =
-    lib.optionalString
-      (
-        stdenv.buildPlatform.canExecute stdenv.hostPlatform
-        &&
-          # Creation of the completions fails on Darwin platforms.
-          !stdenv.hostPlatform.isDarwin
-      )
-      ''
-        installShellCompletion --cmd taplo \
-          --bash <($out/bin/taplo completions bash) \
-          --fish <($out/bin/taplo completions fish) \
-          --zsh <($out/bin/taplo completions zsh)
-      '';
+  postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
+    installShellCompletion --cmd taplo \
+      --bash <($out/bin/taplo completions bash) \
+      --fish <($out/bin/taplo completions fish) \
+      --zsh <($out/bin/taplo completions zsh)
+  '';
 
   nativeInstallCheckInputs = [ versionCheckHook ];
   versionCheckProgramArg = "--version";
diff --git a/pkgs/by-name/ta/taplo/update-reqwest.patch b/pkgs/by-name/ta/taplo/update-reqwest.patch
new file mode 100644
index 000000000000..078469baad12
--- /dev/null
+++ b/pkgs/by-name/ta/taplo/update-reqwest.patch
@@ -0,0 +1,1291 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index ea88fad..01ecbb1 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -24,11 +24,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
+ dependencies = [
+  "cfg-if",
+- "getrandom",
++ "getrandom 0.2.12",
+  "once_cell",
+  "serde",
+  "version_check",
+- "zerocopy",
++ "zerocopy 0.7.32",
+ ]
+ 
+ [[package]]
+@@ -168,7 +168,7 @@ checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -179,7 +179,7 @@ checksum = "c980ee35e870bd1a4d2c8294d4c04d0499e67bca1e4b5cefcc693c2fa00caea9"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -218,6 +218,12 @@ version = "0.21.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
+ 
++[[package]]
++name = "base64"
++version = "0.22.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
++
+ [[package]]
+ name = "beef"
+ version = "0.5.2"
+@@ -290,9 +296,9 @@ checksum = "a2ef034f05691a48569bd920a96c81b9d91bbad1ab5ac7c4616c1f6ef36cb79f"
+ 
+ [[package]]
+ name = "bytes"
+-version = "1.5.0"
++version = "1.10.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
++checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+ 
+ [[package]]
+ name = "cast"
+@@ -315,6 +321,12 @@ version = "1.0.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+ 
++[[package]]
++name = "cfg_aliases"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
++
+ [[package]]
+ name = "ciborium"
+ version = "0.2.2"
+@@ -382,7 +394,7 @@ dependencies = [
+  "heck",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -591,15 +603,6 @@ version = "1.10.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a"
+ 
+-[[package]]
+-name = "encoding_rs"
+-version = "0.8.34"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59"
+-dependencies = [
+- "cfg-if",
+-]
+-
+ [[package]]
+ name = "equator"
+ version = "0.2.2"
+@@ -617,7 +620,7 @@ checksum = "3bf679796c0322556351f287a51b49e48f7c4986e727b5dd78c972d30e2e16cc"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -773,7 +776,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -829,6 +832,20 @@ dependencies = [
+  "wasm-bindgen",
+ ]
+ 
++[[package]]
++name = "getrandom"
++version = "0.3.4"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
++dependencies = [
++ "cfg-if",
++ "js-sys",
++ "libc",
++ "r-efi",
++ "wasip2",
++ "wasm-bindgen",
++]
++
+ [[package]]
+ name = "gimli"
+ version = "0.28.1"
+@@ -854,25 +871,6 @@ dependencies = [
+  "regex-syntax 0.8.5",
+ ]
+ 
+-[[package]]
+-name = "h2"
+-version = "0.3.26"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8"
+-dependencies = [
+- "bytes",
+- "fnv",
+- "futures-core",
+- "futures-sink",
+- "futures-util",
+- "http",
+- "indexmap",
+- "slab",
+- "tokio",
+- "tokio-util",
+- "tracing",
+-]
+-
+ [[package]]
+ name = "half"
+ version = "2.4.1"
+@@ -913,9 +911,9 @@ checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
+ 
+ [[package]]
+ name = "http"
+-version = "0.2.12"
++version = "1.3.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1"
++checksum = "f4a85d31aea989eead29a3aaf9e1115a180df8282431156e533de47660892565"
+ dependencies = [
+  "bytes",
+  "fnv",
+@@ -924,76 +922,107 @@ dependencies = [
+ 
+ [[package]]
+ name = "http-body"
+-version = "0.4.6"
++version = "1.0.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
++checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184"
+ dependencies = [
+  "bytes",
+  "http",
+- "pin-project-lite",
+ ]
+ 
+ [[package]]
+-name = "httparse"
+-version = "1.8.0"
++name = "http-body-util"
++version = "0.1.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
++checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a"
++dependencies = [
++ "bytes",
++ "futures-core",
++ "http",
++ "http-body",
++ "pin-project-lite",
++]
+ 
+ [[package]]
+-name = "httpdate"
+-version = "1.0.3"
++name = "httparse"
++version = "1.10.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
++checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
+ 
+ [[package]]
+ name = "hyper"
+-version = "0.14.30"
++version = "1.6.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
++checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+ dependencies = [
+  "bytes",
+  "futures-channel",
+- "futures-core",
+  "futures-util",
+- "h2",
+  "http",
+  "http-body",
+  "httparse",
+- "httpdate",
+  "itoa",
+  "pin-project-lite",
+- "socket2",
++ "smallvec",
+  "tokio",
+- "tower-service",
+- "tracing",
+  "want",
+ ]
+ 
+ [[package]]
+ name = "hyper-rustls"
+-version = "0.24.2"
++version = "0.27.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
++checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58"
+ dependencies = [
+- "futures-util",
+  "http",
+  "hyper",
++ "hyper-util",
+  "rustls",
++ "rustls-pki-types",
+  "tokio",
+  "tokio-rustls",
++ "tower-service",
++ "webpki-roots",
+ ]
+ 
+ [[package]]
+ name = "hyper-tls"
+-version = "0.5.0"
++version = "0.6.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
++checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
+ dependencies = [
+  "bytes",
++ "http-body-util",
+  "hyper",
++ "hyper-util",
+  "native-tls",
+  "tokio",
+  "tokio-native-tls",
++ "tower-service",
++]
++
++[[package]]
++name = "hyper-util"
++version = "0.1.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8"
++dependencies = [
++ "base64 0.22.1",
++ "bytes",
++ "futures-channel",
++ "futures-core",
++ "futures-util",
++ "http",
++ "http-body",
++ "hyper",
++ "ipnet",
++ "libc",
++ "percent-encoding",
++ "pin-project-lite",
++ "socket2 0.6.1",
++ "tokio",
++ "tower-service",
++ "tracing",
+ ]
+ 
+ [[package]]
+@@ -1042,6 +1071,16 @@ version = "2.9.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+ 
++[[package]]
++name = "iri-string"
++version = "0.7.8"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
++dependencies = [
++ "memchr",
++ "serde",
++]
++
+ [[package]]
+ name = "is-terminal"
+ version = "0.4.12"
+@@ -1085,10 +1124,11 @@ checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c"
+ 
+ [[package]]
+ name = "js-sys"
+-version = "0.3.72"
++version = "0.3.82"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6a88f1bda2bd75b0452a14784937d796722fdebfe50df998aeb3f0b7603019a9"
++checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
+ dependencies = [
++ "once_cell",
+  "wasm-bindgen",
+ ]
+ 
+@@ -1109,11 +1149,11 @@ checksum = "2a071f4f7efc9a9118dfb627a0a94ef247986e1ab8606a4c806ae2b3aa3b6978"
+ dependencies = [
+  "ahash",
+  "anyhow",
+- "base64",
++ "base64 0.21.7",
+  "bytecount",
+  "fancy-regex",
+  "fraction",
+- "getrandom",
++ "getrandom 0.2.12",
+  "iso8601",
+  "itoa",
+  "memchr",
+@@ -1137,9 +1177,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+ 
+ [[package]]
+ name = "libc"
+-version = "0.2.161"
++version = "0.2.177"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1"
++checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
+ 
+ [[package]]
+ name = "linux-raw-sys"
+@@ -1195,6 +1235,12 @@ dependencies = [
+  "hashbrown",
+ ]
+ 
++[[package]]
++name = "lru-slab"
++version = "0.1.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154"
++
+ [[package]]
+ name = "lsp-async-stub"
+ version = "0.7.0"
+@@ -1202,7 +1248,7 @@ dependencies = [
+  "anyhow",
+  "async-trait",
+  "futures",
+- "getrandom",
++ "getrandom 0.2.12",
+  "lsp-types",
+  "rowan",
+  "serde",
+@@ -1257,12 +1303,6 @@ dependencies = [
+  "autocfg",
+ ]
+ 
+-[[package]]
+-name = "mime"
+-version = "0.3.17"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
+-
+ [[package]]
+ name = "minimal-lexical"
+ version = "0.2.1"
+@@ -1498,7 +1538,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -1635,7 +1675,16 @@ dependencies = [
+  "smallvec",
+  "symbolic-demangle",
+  "tempfile",
+- "thiserror",
++ "thiserror 1.0.57",
++]
++
++[[package]]
++name = "ppv-lite86"
++version = "0.2.21"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9"
++dependencies = [
++ "zerocopy 0.8.27",
+ ]
+ 
+ [[package]]
+@@ -1650,9 +1699,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "proc-macro2"
+-version = "1.0.78"
++version = "1.0.103"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae"
++checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
+ dependencies = [
+  "unicode-ident",
+ ]
+@@ -1666,6 +1715,61 @@ dependencies = [
+  "memchr",
+ ]
+ 
++[[package]]
++name = "quinn"
++version = "0.11.9"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
++dependencies = [
++ "bytes",
++ "cfg_aliases",
++ "pin-project-lite",
++ "quinn-proto",
++ "quinn-udp",
++ "rustc-hash 2.1.1",
++ "rustls",
++ "socket2 0.5.5",
++ "thiserror 2.0.17",
++ "tokio",
++ "tracing",
++ "web-time",
++]
++
++[[package]]
++name = "quinn-proto"
++version = "0.11.13"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
++dependencies = [
++ "bytes",
++ "getrandom 0.3.4",
++ "lru-slab",
++ "rand",
++ "ring",
++ "rustc-hash 2.1.1",
++ "rustls",
++ "rustls-pki-types",
++ "slab",
++ "thiserror 2.0.17",
++ "tinyvec",
++ "tracing",
++ "web-time",
++]
++
++[[package]]
++name = "quinn-udp"
++version = "0.5.14"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
++dependencies = [
++ "cfg_aliases",
++ "libc",
++ "once_cell",
++ "socket2 0.5.5",
++ "tracing",
++ "windows-sys 0.52.0",
++]
++
+ [[package]]
+ name = "quote"
+ version = "1.0.35"
+@@ -1675,6 +1779,41 @@ dependencies = [
+  "proc-macro2",
+ ]
+ 
++[[package]]
++name = "r-efi"
++version = "5.3.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f"
++
++[[package]]
++name = "rand"
++version = "0.9.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1"
++dependencies = [
++ "rand_chacha",
++ "rand_core",
++]
++
++[[package]]
++name = "rand_chacha"
++version = "0.9.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb"
++dependencies = [
++ "ppv-lite86",
++ "rand_core",
++]
++
++[[package]]
++name = "rand_core"
++version = "0.9.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
++dependencies = [
++ "getrandom 0.3.4",
++]
++
+ [[package]]
+ name = "rayon"
+ version = "1.8.1"
+@@ -1750,46 +1889,43 @@ checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
+ 
+ [[package]]
+ name = "reqwest"
+-version = "0.11.27"
++version = "0.12.24"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
++checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f"
+ dependencies = [
+- "base64",
++ "base64 0.22.1",
+  "bytes",
+- "encoding_rs",
+  "futures-core",
+- "futures-util",
+- "h2",
+  "http",
+  "http-body",
++ "http-body-util",
+  "hyper",
+  "hyper-rustls",
+  "hyper-tls",
+- "ipnet",
++ "hyper-util",
+  "js-sys",
+  "log",
+- "mime",
+  "native-tls",
+- "once_cell",
+  "percent-encoding",
+  "pin-project-lite",
++ "quinn",
+  "rustls",
+- "rustls-pemfile",
++ "rustls-pki-types",
+  "serde",
+  "serde_json",
+  "serde_urlencoded",
+  "sync_wrapper",
+- "system-configuration",
+  "tokio",
+  "tokio-native-tls",
+  "tokio-rustls",
++ "tower",
++ "tower-http",
+  "tower-service",
+  "url",
+  "wasm-bindgen",
+  "wasm-bindgen-futures",
+  "web-sys",
+  "webpki-roots",
+- "winreg",
+ ]
+ 
+ [[package]]
+@@ -1808,7 +1944,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74"
+ dependencies = [
+  "cc",
+- "getrandom",
++ "getrandom 0.2.12",
+  "libc",
+  "spin",
+  "untrusted",
+@@ -1824,7 +1960,7 @@ dependencies = [
+  "countme",
+  "hashbrown",
+  "memoffset",
+- "rustc-hash",
++ "rustc-hash 1.1.0",
+  "text-size",
+ ]
+ 
+@@ -1840,6 +1976,12 @@ version = "1.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
+ 
++[[package]]
++name = "rustc-hash"
++version = "2.1.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
++
+ [[package]]
+ name = "rustix"
+ version = "0.38.31"
+@@ -1855,32 +1997,36 @@ dependencies = [
+ 
+ [[package]]
+ name = "rustls"
+-version = "0.21.12"
++version = "0.23.34"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
++checksum = "6a9586e9ee2b4f8fab52a0048ca7334d7024eef48e2cb9407e3497bb7cab7fa7"
+ dependencies = [
+- "log",
++ "once_cell",
+  "ring",
++ "rustls-pki-types",
+  "rustls-webpki",
+- "sct",
++ "subtle",
++ "zeroize",
+ ]
+ 
+ [[package]]
+-name = "rustls-pemfile"
+-version = "1.0.4"
++name = "rustls-pki-types"
++version = "1.13.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
++checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a"
+ dependencies = [
+- "base64",
++ "web-time",
++ "zeroize",
+ ]
+ 
+ [[package]]
+ name = "rustls-webpki"
+-version = "0.101.7"
++version = "0.103.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8b6275d1ee7a1cd780b64aca7726599a1dbc893b1e64144529e55c3c2f745765"
++checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
+ dependencies = [
+  "ring",
++ "rustls-pki-types",
+  "untrusted",
+ ]
+ 
+@@ -1945,16 +2091,6 @@ version = "1.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
+ 
+-[[package]]
+-name = "sct"
+-version = "0.7.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+-dependencies = [
+- "ring",
+- "untrusted",
+-]
+-
+ [[package]]
+ name = "security-framework"
+ version = "2.9.2"
+@@ -2015,7 +2151,7 @@ checksum = "33c85360c95e7d137454dc81d9a4ed2b8efd8fbe19cee57357b32b9771fccb67"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -2049,7 +2185,7 @@ checksum = "0b2e6b945e9d3df726b65d6ee24060aff8e3533d431f677a9695db04eff9dfdb"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -2118,6 +2254,16 @@ dependencies = [
+  "windows-sys 0.48.0",
+ ]
+ 
++[[package]]
++name = "socket2"
++version = "0.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
++dependencies = [
++ "libc",
++ "windows-sys 0.60.2",
++]
++
+ [[package]]
+ name = "spin"
+ version = "0.9.8"
+@@ -2142,6 +2288,12 @@ version = "0.11.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+ 
++[[package]]
++name = "subtle"
++version = "2.6.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
++
+ [[package]]
+ name = "symbolic-common"
+ version = "12.10.0"
+@@ -2178,9 +2330,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "syn"
+-version = "2.0.48"
++version = "2.0.108"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "0f3531638e407dfc0814761abb7c00a5b54992b849452a0646b7f65c9f770f3f"
++checksum = "da58917d35242480a05c2897064da0a80589a2a0476c9a3f2fdc83b53502e917"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+@@ -2189,29 +2341,11 @@ dependencies = [
+ 
+ [[package]]
+ name = "sync_wrapper"
+-version = "0.1.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+-
+-[[package]]
+-name = "system-configuration"
+-version = "0.5.1"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7"
+-dependencies = [
+- "bitflags 1.3.2",
+- "core-foundation",
+- "system-configuration-sys",
+-]
+-
+-[[package]]
+-name = "system-configuration-sys"
+-version = "0.5.0"
++version = "1.0.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9"
++checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263"
+ dependencies = [
+- "core-foundation-sys",
+- "libc",
++ "futures-core",
+ ]
+ 
+ [[package]]
+@@ -2239,7 +2373,7 @@ dependencies = [
+  "schemars",
+  "serde",
+  "serde_json",
+- "thiserror",
++ "thiserror 1.0.57",
+  "time",
+  "toml",
+  "tracing",
+@@ -2307,7 +2441,7 @@ dependencies = [
+  "sha1",
+  "tap",
+  "taplo",
+- "thiserror",
++ "thiserror 1.0.57",
+  "time",
+  "tokio",
+  "tracing",
+@@ -2352,7 +2486,7 @@ dependencies = [
+  "clap",
+  "console_error_panic_hook",
+  "futures",
+- "getrandom",
++ "getrandom 0.2.12",
+  "indexmap",
+  "js-sys",
+  "lsp-async-stub",
+@@ -2404,7 +2538,16 @@ version = "1.0.57"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b"
+ dependencies = [
+- "thiserror-impl",
++ "thiserror-impl 1.0.57",
++]
++
++[[package]]
++name = "thiserror"
++version = "2.0.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
++dependencies = [
++ "thiserror-impl 2.0.17",
+ ]
+ 
+ [[package]]
+@@ -2415,7 +2558,18 @@ checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
++]
++
++[[package]]
++name = "thiserror-impl"
++version = "2.0.17"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -2497,7 +2651,7 @@ dependencies = [
+  "num_cpus",
+  "parking_lot",
+  "pin-project-lite",
+- "socket2",
++ "socket2 0.5.5",
+  "tokio-macros",
+  "windows-sys 0.48.0",
+ ]
+@@ -2510,7 +2664,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -2525,27 +2679,14 @@ dependencies = [
+ 
+ [[package]]
+ name = "tokio-rustls"
+-version = "0.24.1"
++version = "0.26.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
++checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
+ dependencies = [
+  "rustls",
+  "tokio",
+ ]
+ 
+-[[package]]
+-name = "tokio-util"
+-version = "0.7.11"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+-dependencies = [
+- "bytes",
+- "futures-core",
+- "futures-sink",
+- "pin-project-lite",
+- "tokio",
+-]
+-
+ [[package]]
+ name = "toml"
+ version = "0.7.8"
+@@ -2580,11 +2721,50 @@ dependencies = [
+  "winnow",
+ ]
+ 
++[[package]]
++name = "tower"
++version = "0.5.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9"
++dependencies = [
++ "futures-core",
++ "futures-util",
++ "pin-project-lite",
++ "sync_wrapper",
++ "tokio",
++ "tower-layer",
++ "tower-service",
++]
++
++[[package]]
++name = "tower-http"
++version = "0.6.6"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
++dependencies = [
++ "bitflags 2.4.2",
++ "bytes",
++ "futures-util",
++ "http",
++ "http-body",
++ "iri-string",
++ "pin-project-lite",
++ "tower",
++ "tower-layer",
++ "tower-service",
++]
++
++[[package]]
++name = "tower-layer"
++version = "0.3.3"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
++
+ [[package]]
+ name = "tower-service"
+-version = "0.3.2"
++version = "0.3.3"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
++checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
+ 
+ [[package]]
+ name = "tracing"
+@@ -2605,7 +2785,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
+ 
+ [[package]]
+@@ -2769,28 +2949,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
+ 
+ [[package]]
+-name = "wasm-bindgen"
+-version = "0.2.100"
++name = "wasip2"
++version = "1.0.1+wasi-0.2.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
++checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
+ dependencies = [
+- "cfg-if",
+- "once_cell",
+- "rustversion",
+- "wasm-bindgen-macro",
++ "wit-bindgen",
+ ]
+ 
+ [[package]]
+-name = "wasm-bindgen-backend"
+-version = "0.2.100"
++name = "wasm-bindgen"
++version = "0.2.105"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
++checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
+ dependencies = [
+- "bumpalo",
+- "log",
+- "proc-macro2",
+- "quote",
+- "syn 2.0.48",
++ "cfg-if",
++ "once_cell",
++ "rustversion",
++ "wasm-bindgen-macro",
+  "wasm-bindgen-shared",
+ ]
+ 
+@@ -2808,9 +2984,9 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasm-bindgen-macro"
+-version = "0.2.100"
++version = "0.2.105"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
++checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
+ dependencies = [
+  "quote",
+  "wasm-bindgen-macro-support",
+@@ -2818,22 +2994,22 @@ dependencies = [
+ 
+ [[package]]
+ name = "wasm-bindgen-macro-support"
+-version = "0.2.100"
++version = "0.2.105"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
++checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
+ dependencies = [
++ "bumpalo",
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
+- "wasm-bindgen-backend",
++ "syn 2.0.108",
+  "wasm-bindgen-shared",
+ ]
+ 
+ [[package]]
+ name = "wasm-bindgen-shared"
+-version = "0.2.100"
++version = "0.2.105"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
++checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
+ dependencies = [
+  "unicode-ident",
+ ]
+@@ -2848,11 +3024,24 @@ dependencies = [
+  "wasm-bindgen",
+ ]
+ 
++[[package]]
++name = "web-time"
++version = "1.1.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
++dependencies = [
++ "js-sys",
++ "wasm-bindgen",
++]
++
+ [[package]]
+ name = "webpki-roots"
+-version = "0.25.4"
++version = "1.0.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
++checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e"
++dependencies = [
++ "rustls-pki-types",
++]
+ 
+ [[package]]
+ name = "winapi"
+@@ -2885,6 +3074,12 @@ version = "0.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+ 
++[[package]]
++name = "windows-link"
++version = "0.2.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
++
+ [[package]]
+ name = "windows-sys"
+ version = "0.48.0"
+@@ -2903,6 +3098,15 @@ dependencies = [
+  "windows-targets 0.52.0",
+ ]
+ 
++[[package]]
++name = "windows-sys"
++version = "0.60.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
++dependencies = [
++ "windows-targets 0.53.5",
++]
++
+ [[package]]
+ name = "windows-targets"
+ version = "0.48.5"
+@@ -2933,6 +3137,23 @@ dependencies = [
+  "windows_x86_64_msvc 0.52.0",
+ ]
+ 
++[[package]]
++name = "windows-targets"
++version = "0.53.5"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
++dependencies = [
++ "windows-link",
++ "windows_aarch64_gnullvm 0.53.1",
++ "windows_aarch64_msvc 0.53.1",
++ "windows_i686_gnu 0.53.1",
++ "windows_i686_gnullvm",
++ "windows_i686_msvc 0.53.1",
++ "windows_x86_64_gnu 0.53.1",
++ "windows_x86_64_gnullvm 0.53.1",
++ "windows_x86_64_msvc 0.53.1",
++]
++
+ [[package]]
+ name = "windows_aarch64_gnullvm"
+ version = "0.48.5"
+@@ -2945,6 +3166,12 @@ version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
+ 
++[[package]]
++name = "windows_aarch64_gnullvm"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
++
+ [[package]]
+ name = "windows_aarch64_msvc"
+ version = "0.48.5"
+@@ -2957,6 +3184,12 @@ version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
+ 
++[[package]]
++name = "windows_aarch64_msvc"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
++
+ [[package]]
+ name = "windows_i686_gnu"
+ version = "0.48.5"
+@@ -2969,6 +3202,18 @@ version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
+ 
++[[package]]
++name = "windows_i686_gnu"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
++
++[[package]]
++name = "windows_i686_gnullvm"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
++
+ [[package]]
+ name = "windows_i686_msvc"
+ version = "0.48.5"
+@@ -2981,6 +3226,12 @@ version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
+ 
++[[package]]
++name = "windows_i686_msvc"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
++
+ [[package]]
+ name = "windows_x86_64_gnu"
+ version = "0.48.5"
+@@ -2993,6 +3244,12 @@ version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
+ 
++[[package]]
++name = "windows_x86_64_gnu"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
++
+ [[package]]
+ name = "windows_x86_64_gnullvm"
+ version = "0.48.5"
+@@ -3005,6 +3262,12 @@ version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
+ 
++[[package]]
++name = "windows_x86_64_gnullvm"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
++
+ [[package]]
+ name = "windows_x86_64_msvc"
+ version = "0.48.5"
+@@ -3017,6 +3280,12 @@ version = "0.52.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
+ 
++[[package]]
++name = "windows_x86_64_msvc"
++version = "0.53.1"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
++
+ [[package]]
+ name = "winnow"
+ version = "0.5.40"
+@@ -3027,14 +3296,10 @@ dependencies = [
+ ]
+ 
+ [[package]]
+-name = "winreg"
+-version = "0.50.0"
++name = "wit-bindgen"
++version = "0.46.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+-checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1"
+-dependencies = [
+- "cfg-if",
+- "windows-sys 0.48.0",
+-]
++checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
+ 
+ [[package]]
+ name = "zerocopy"
+@@ -3042,7 +3307,16 @@ version = "0.7.32"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
+ checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+ dependencies = [
+- "zerocopy-derive",
++ "zerocopy-derive 0.7.32",
++]
++
++[[package]]
++name = "zerocopy"
++version = "0.8.27"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
++dependencies = [
++ "zerocopy-derive 0.8.27",
+ ]
+ 
+ [[package]]
+@@ -3053,5 +3327,22 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+ dependencies = [
+  "proc-macro2",
+  "quote",
+- "syn 2.0.48",
++ "syn 2.0.108",
+ ]
++
++[[package]]
++name = "zerocopy-derive"
++version = "0.8.27"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
++dependencies = [
++ "proc-macro2",
++ "quote",
++ "syn 2.0.108",
++]
++
++[[package]]
++name = "zeroize"
++version = "1.8.2"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
+diff --git a/Cargo.toml b/Cargo.toml
+index d98197c..e1100e2 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -30,7 +30,7 @@ lsp-types          = { version = "0.93.0" }
+ once_cell          = { version = "1.4" }
+ parking_lot        = { version = "0.12.0" }
+ regex              = { version = "1.5" }
+-reqwest            = { version = "0.11.9", default-features = false }
++reqwest            = { version = "0.12.24", default-features = false }
+ rowan              = { version = "0.15.3" }
+ schemars           = { version = "0.8.3" }
+ serde              = { version = "1" }

From e110e409abbba6ff7dd76ed0115fb91fd42789a6 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Tue, 4 Nov 2025 21:43:24 +0800
Subject: [PATCH 5835/6226] toml-test: init at 1.6.0

---
 pkgs/by-name/to/toml-test/package.nix | 45 +++++++++++++++++++++++++++
 1 file changed, 45 insertions(+)
 create mode 100644 pkgs/by-name/to/toml-test/package.nix

diff --git a/pkgs/by-name/to/toml-test/package.nix b/pkgs/by-name/to/toml-test/package.nix
new file mode 100644
index 000000000000..14cbd6b129fe
--- /dev/null
+++ b/pkgs/by-name/to/toml-test/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  buildGoModule,
+  fetchFromGitHub,
+  versionCheckHook,
+  nix-update-script,
+}:
+
+buildGoModule (finalAttrs: {
+  pname = "toml-test";
+  version = "1.6.0";
+
+  src = fetchFromGitHub {
+    owner = "toml-lang";
+    repo = "toml-test";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-jOFkSEDNvvx8svgyYYpAbveQsclMsQRKJ2ocA6ty1Kw=";
+  };
+
+  vendorHash = "sha256-yt5rwpYzO38wEUhcyG4G367Byek20Uz3u+buAazq/5A=";
+
+  ldflags = [
+    "-s"
+    "-w"
+    "-X zgo.at/zli.version=${finalAttrs.version}"
+  ];
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Language agnostic test suite for TOML parsers";
+    homepage = "https://github.com/toml-lang/toml-test";
+    changelog = "https://github.com/toml-lang/toml-test/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [
+      yzx9
+      defelo
+    ];
+    mainProgram = "toml-test";
+  };
+})

From 74cfe4614562bff690aaf4ac5516bd552a00ed70 Mon Sep 17 00:00:00 2001
From: Zexin Yuan <git@yzx9.xyz>
Date: Wed, 5 Nov 2025 09:50:57 +0800
Subject: [PATCH 5836/6226] taplo: add toml-test

---
 pkgs/by-name/ta/taplo/package.nix | 41 +++++++++++++++++++++++++++++--
 1 file changed, 39 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ta/taplo/package.nix b/pkgs/by-name/ta/taplo/package.nix
index aafc29f7a8a1..c866d85ee39f 100644
--- a/pkgs/by-name/ta/taplo/package.nix
+++ b/pkgs/by-name/ta/taplo/package.nix
@@ -5,10 +5,16 @@
   fetchFromGitHub,
   pkg-config,
   openssl,
-  withLsp ? true,
   installShellFiles,
   versionCheckHook,
+
+  # passthru dependencies
   nix-update-script,
+  runCommand,
+  toml-test,
+
+  # Optional feature
+  withLsp ? true,
 }:
 
 rustPlatform.buildRustPackage (finalAttrs: {
@@ -52,7 +58,38 @@ rustPlatform.buildRustPackage (finalAttrs: {
   versionCheckProgramArg = "--version";
   doInstallCheck = true;
 
-  passthru.updateScript = nix-update-script { };
+  passthru = {
+    updateScript = nix-update-script { };
+
+    tests = {
+      toml-test =
+        let
+          # Unfortunately, taplo does not yet pass all toml-test v1.6.0 tests.
+          # Some of the failures are reported issues, others may not be.
+          # https://github.com/tamasfe/taplo/issues/486
+          skips = [
+            "valid/comment/nonascii"
+            "valid/datetime/edge"
+            "valid/key/quoted-unicode"
+            "valid/string/quoted-unicode"
+            "invalid/control/multi-cr"
+            "invalid/control/rawmulti-cr"
+            "invalid/table/super-twice"
+          ];
+        in
+        runCommand "taplo-toml-test"
+          {
+            nativeBuildInputs = [
+              finalAttrs.finalPackage
+              toml-test
+            ];
+          }
+          ''
+            toml-test taplo ${lib.concatMapStringsSep " " (a: "-skip ${a}") skips} -- toml-test
+            touch "$out"
+          '';
+    };
+  };
 
   meta = {
     description = "TOML toolkit written in Rust";

From bfc2a521bb04b019f281e29ccd755ae843bdc239 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 08:23:37 +0000
Subject: [PATCH 5837/6226] supabase-cli: 2.55.4 -> 2.58.1

---
 pkgs/by-name/su/supabase-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/su/supabase-cli/package.nix b/pkgs/by-name/su/supabase-cli/package.nix
index d2b09bc1f1d7..b8698cad5acc 100644
--- a/pkgs/by-name/su/supabase-cli/package.nix
+++ b/pkgs/by-name/su/supabase-cli/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "supabase-cli";
-  version = "2.55.4";
+  version = "2.58.1";
 
   src = fetchFromGitHub {
     owner = "supabase";
     repo = "cli";
     rev = "v${version}";
-    hash = "sha256-BJjNWZKqf59sl9+kVIRuBWF71X19wk8fbIJqlXDhM5Q=";
+    hash = "sha256-JvFfA8hgzVLs+DQqt5CWEdUkgQMrB3zaWaHZAx4d5rg=";
   };
 
-  vendorHash = "sha256-ASNo3T0ziPcMm/xXBnokyVWVTTq2ZEn4qg9yHjxinEA=";
+  vendorHash = "sha256-oogYnjcoSS+9BX6ybISpzbKuV9AJjxJ8mvuNY66vsQ4=";
 
   ldflags = [
     "-s"

From e2541851dcb324b850ecce89fce324f7e17d57f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 08:23:37 +0000
Subject: [PATCH 5838/6226] sendme: 0.30.0 -> 0.31.0

---
 pkgs/by-name/se/sendme/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/sendme/package.nix b/pkgs/by-name/se/sendme/package.nix
index 1a44281ae6b8..1c4775c0363b 100644
--- a/pkgs/by-name/se/sendme/package.nix
+++ b/pkgs/by-name/se/sendme/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sendme";
-  version = "0.30.0";
+  version = "0.31.0";
 
   src = fetchFromGitHub {
     owner = "n0-computer";
     repo = "sendme";
     rev = "v${version}";
-    hash = "sha256-LcSQuvNXSHqaiBE6GR3rNALAYPc9Xezf5cV8Im9qYMo=";
+    hash = "sha256-zh0YYJoljcOQz0ltAk+UBScSGZhsoSqIa+F0Qm4/3iw=";
   };
 
-  cargoHash = "sha256-/hgkMWEokcOh3ebZ2pIunktJmuq0YpI6IixO7XoNRCk=";
+  cargoHash = "sha256-G7b1BBlVMPtfEWfIXIMH4N+Avt9vtEcCG1ctrja5Ttc=";
 
   # The tests require contacting external servers.
   doCheck = false;

From 5217998f70092021bf7c8db706a0d71be0f4818b Mon Sep 17 00:00:00 2001
From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com>
Date: Thu, 6 Nov 2025 09:31:54 +0100
Subject: [PATCH 5839/6226] pcloud: 1.14.17 -> 1.14.18

Changelog: https://www.pcloud.com/release-notes/linux.html

- 1.14.18 (05/11/2025)
  - Performance improvements in synchronization.
  - Other bug fixes & stability improvements.
---
 pkgs/by-name/pc/pcloud/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix
index 12dcb5eb4d2f..0026c25d77ce 100644
--- a/pkgs/by-name/pc/pcloud/package.nix
+++ b/pkgs/by-name/pc/pcloud/package.nix
@@ -39,13 +39,13 @@
 
 let
   pname = "pcloud";
-  version = "1.14.17";
-  code = "XZNtR95ZctUIq8zYVD7eSKotwGMx7kDWVtzV";
+  version = "1.14.18";
+  code = "XZ2gJM5Z8pdJVlCT0s5FI1aTKxxgt48aEr8k";
 
   # Archive link's codes: https://www.pcloud.com/release-notes/linux.html
   src = fetchzip {
     url = "https://api.pcloud.com/getpubzip?code=${code}&filename=pcloud-${version}.zip";
-    hash = "sha256-Chh8obZHntkiG7IJAW96T9y3KcOwzI18/VALheLcxBA=";
+    hash = "sha256-YDXmna1SZaDLK1EEdHvWm9+PgYKjYUsa2lvdzFGmyIU=";
   };
 
   appimageContents = appimageTools.extractType2 {

From ccb79a925cceee939612830849ac0e7f70147ad2 Mon Sep 17 00:00:00 2001
From: Nadir Ishiguro <23151917+nadir-ishiguro@users.noreply.github.com>
Date: Thu, 6 Nov 2025 09:38:23 +0100
Subject: [PATCH 5840/6226] pcloud: add link to changelog

---
 pkgs/by-name/pc/pcloud/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/pc/pcloud/package.nix b/pkgs/by-name/pc/pcloud/package.nix
index 0026c25d77ce..69fb7076ceec 100644
--- a/pkgs/by-name/pc/pcloud/package.nix
+++ b/pkgs/by-name/pc/pcloud/package.nix
@@ -121,6 +121,7 @@ stdenv.mkDerivation {
   meta = with lib; {
     description = "Secure and simple to use cloud storage for your files; pCloud Drive, Electron Edition";
     homepage = "https://www.pcloud.com/";
+    changelog = "https://www.pcloud.com/release-notes/linux.html";
     sourceProvenance = with sourceTypes; [ binaryNativeCode ];
     license = licenses.unfree;
     maintainers = with maintainers; [ patryk27 ];

From c4548e58fb8fd76f6565734b11c74f73ea0c6b07 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 6 Nov 2025 09:53:24 +0100
Subject: [PATCH 5841/6226] ci/github-script/bot: fix scheduled bot with older
 artifacts

We only recently introduced the owners.txt file to the comparison
artifact, so once the bot runs on a schedule it will it older artifacts
very quickly - and then can't find the owners file.

We can fallback to an empty owners list in this case, because an older
artifact also means an older workflow run previously, so this will have
pinged owners already.
---
 ci/github-script/bot.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index 1b807b30ec7d..c66a91583140 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -375,6 +375,17 @@ module.exports = async ({ github, context, core, dry }) => {
       })
 
       if (!pull_request.draft) {
+        let owners = []
+        try {
+          // TODO: Create owner map similar to maintainer map.
+          owners = (await readFile(`${pull_number}/owners.txt`, 'utf-8')).split(
+            '\n',
+          )
+        } catch (e) {
+          // Older artifacts don't have the owners.txt, yet.
+          if (e.code !== 'ENOENT') throw e
+        }
+
         // We set this label earlier already, but the current PR state can be very different
         // after handleReviewers has requested reviews, so update it in this case to prevent
         // this label from flip-flopping.
@@ -392,10 +403,7 @@ module.exports = async ({ github, context, core, dry }) => {
               await readFile(`${pull_number}/maintainers.json`, 'utf-8'),
             ),
           ).map((id) => parseInt(id)),
-          // TODO: Create owner map similar to maintainer map.
-          owners: (await readFile(`${pull_number}/owners.txt`, 'utf-8')).split(
-            '\n',
-          ),
+          owners,
           getTeamMembers,
           getUser,
         })

From d6e517ffc334d1a219daeefe48dbc8c2fa339ecf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 08:56:44 +0000
Subject: [PATCH 5842/6226] esp-generate: 1.0.0 -> 1.0.1

---
 pkgs/by-name/es/esp-generate/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/es/esp-generate/package.nix b/pkgs/by-name/es/esp-generate/package.nix
index 11803d55ee99..6a8d52f44bf6 100644
--- a/pkgs/by-name/es/esp-generate/package.nix
+++ b/pkgs/by-name/es/esp-generate/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "esp-generate";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "esp-rs";
     repo = "esp-generate";
     rev = "v${version}";
-    hash = "sha256-lcxYsMeigXjwFdJQ4fJZnQL9PqVhgr7bOIsaTu2Oa88=";
+    hash = "sha256-OQUBX0hZNEgMpBttWZDXI/eoOlxVfY57oZqn3YKNZ0o=";
   };
 
-  cargoHash = "sha256-0p07C4OGHOkEivnokti0s9z+xXdcayUOkzTqksxUZ6o=";
+  cargoHash = "sha256-Sf37qp1TBCabgKIExs9biqvdN+KtIBPGeokLMovjM68=";
 
   meta = {
     description = "Template generation tool to create no_std applications targeting Espressif's chips";

From ae3159d475e2b2eb3a3f9d908a69a4fc145c5265 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 5 Nov 2025 20:56:45 +0100
Subject: [PATCH 5843/6226] python313Packages.beautysh: 6.2.1 -> 6.4.1

Changelog: https://github.com/lovesegfault/beautysh/releases/tag/v6.4.1
---
 .../python-modules/beautysh/default.nix       | 48 ++++++++-----------
 1 file changed, 19 insertions(+), 29 deletions(-)

diff --git a/pkgs/development/python-modules/beautysh/default.nix b/pkgs/development/python-modules/beautysh/default.nix
index 245615bd7ccd..199e6bab6ed5 100644
--- a/pkgs/development/python-modules/beautysh/default.nix
+++ b/pkgs/development/python-modules/beautysh/default.nix
@@ -2,58 +2,48 @@
   lib,
   buildPythonPackage,
   colorama,
+  editorconfig,
   fetchFromGitHub,
-  fetchpatch,
-  poetry-core,
-  pytest7CheckHook,
-  setuptools,
+  hatchling,
+  hypothesis,
+  pytestCheckHook,
+  pyyaml,
   types-colorama,
-  types-setuptools,
 }:
 
 buildPythonPackage rec {
   pname = "beautysh";
-  version = "6.2.1";
-  format = "pyproject";
+  version = "6.4.1";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "lovesegfault";
     repo = "beautysh";
-    rev = "v${version}";
-    hash = "sha256-rPeGRcyNK45Y7OvtzaIH93IIzexBf/jM1SzYP0phQ1o=";
+    tag = "v${version}";
+    hash = "sha256-B+1qwivb9MZ+W0u7hccDt3aTjDOcbEQ89Alc8mWd2Sg=";
   };
 
-  patches = [
-    # https://github.com/lovesegfault/beautysh/pull/247
-    (fetchpatch {
-      name = "poetry-to-poetry-core.patch";
-      url = "https://github.com/lovesegfault/beautysh/commit/5f4fcac083fa68568a50f3c2bcee3ead0f3ca7c5.patch";
-      hash = "sha256-H/kIJKww5ouWu8rmRkaMOXcsq2daZWDdwxBqbc99x0s=";
-    })
-  ];
+  build-system = [ hatchling ];
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace 'types-setuptools = "^57.4.0"' 'types-setuptools = "*"'
-  '';
-
-  nativeBuildInputs = [ poetry-core ];
-
-  propagatedBuildInputs = [
+  dependencies = [
     colorama
-    setuptools
+    editorconfig
     types-colorama
-    types-setuptools
   ];
 
-  nativeCheckInputs = [ pytest7CheckHook ];
+  nativeCheckInputs = [
+    hypothesis
+    pytestCheckHook
+    pyyaml
+  ];
 
   pythonImportsCheck = [ "beautysh" ];
 
   meta = with lib; {
     description = "Tool for beautifying Bash scripts";
     homepage = "https://github.com/lovesegfault/beautysh";
-    license = with licenses; [ asl20 ];
+    changelog = "https://github.com/lovesegfault/beautysh/releases/tag/${src.tag}";
+    license = licenses.asl20;
     maintainers = with maintainers; [ fab ];
     mainProgram = "beautysh";
   };

From 8e88d6a868aeb591bae3575aeeb0b7240e687e0e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 6 Nov 2025 09:59:56 +0100
Subject: [PATCH 5844/6226] python313Packages.mdformat-beautysh: 0.1.1 -> 1.0.0

Diff: https://github.com/hukkin/mdformat-beautysh/compare/0.1.1...1.0.0

Changelog: https://github.com/hukkin/mdformat-beautysh/releases/tag/1.0.0
---
 .../python-modules/mdformat-beautysh/default.nix     | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/pkgs/development/python-modules/mdformat-beautysh/default.nix b/pkgs/development/python-modules/mdformat-beautysh/default.nix
index 2b5d8fd23fab..015b26f27b87 100644
--- a/pkgs/development/python-modules/mdformat-beautysh/default.nix
+++ b/pkgs/development/python-modules/mdformat-beautysh/default.nix
@@ -8,26 +8,23 @@
   mdit-py-plugins,
   poetry-core,
   pytestCheckHook,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "mdformat-beautysh";
-  version = "0.1.1";
+  version = "1.0.0";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchFromGitHub {
     owner = "hukkin";
     repo = "mdformat-beautysh";
     tag = version;
-    hash = "sha256-mH9PN6QsPmnIzh/0vxa+5mYLzANUHRruXC0ql4h8myw=";
+    hash = "sha256-Wzwy2FSknohmgrZ/ACliBDD2lOaQKKHyacAL57Ci3SU=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     beautysh
     mdformat
     mdformat-gfm
@@ -41,6 +38,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Mdformat plugin to beautify Bash scripts";
     homepage = "https://github.com/hukkin/mdformat-beautysh";
+    changelog = "https://github.com/hukkin/mdformat-beautysh/releases/tag/${src.tag}";
     license = licenses.mit;
     maintainers = with maintainers; [ aldoborrero ];
   };

From 82051edbc075767f2a751ec7bce824a72369c5a3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 09:04:54 +0000
Subject: [PATCH 5845/6226] cdncheck: 1.2.7 -> 1.2.8

---
 pkgs/by-name/cd/cdncheck/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix
index 3adab037a612..902019cf6073 100644
--- a/pkgs/by-name/cd/cdncheck/package.nix
+++ b/pkgs/by-name/cd/cdncheck/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "cdncheck";
-  version = "1.2.7";
+  version = "1.2.8";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "cdncheck";
     tag = "v${version}";
-    hash = "sha256-Tit9AJ6V20vutd4veymlyi9thstcf6+sefHfhGeRQ68=";
+    hash = "sha256-nMKIvRV6lfJgpzPGQVOeFBjkjt3RcFHw8sXiFRP+Vok=";
   };
 
   vendorHash = "sha256-n0/9VLnB4y0YSbc6fu9SP0sWfGFSh7QgZfJkHMJB80U=";

From b4b61822fa6a5b72d4a657e57e0d189581d0a3f4 Mon Sep 17 00:00:00 2001
From: Sizhe Zhao <prc.zhao@outlook.com>
Date: Thu, 6 Nov 2025 17:10:30 +0800
Subject: [PATCH 5846/6226] capypdf: fix build on darwin

---
 pkgs/by-name/ca/capypdf/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/capypdf/package.nix b/pkgs/by-name/ca/capypdf/package.nix
index 51f3a492ae3a..3ddff2102dc8 100644
--- a/pkgs/by-name/ca/capypdf/package.nix
+++ b/pkgs/by-name/ca/capypdf/package.nix
@@ -11,6 +11,7 @@
   libpng,
   libtiff,
   zlib,
+  darwinMinVersionHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -42,7 +43,9 @@ stdenv.mkDerivation (finalAttrs: {
     libjpeg
     libtiff
     zlib
-  ];
+  ]
+  # error: 'to_chars' is unavailable: introduced in macOS 13.3
+  ++ lib.optional stdenv.hostPlatform.isDarwin (darwinMinVersionHook "13.3");
 
   meta = {
     description = "Fully color managed PDF generation library";

From d76ffa4136064a493b1d1541c8c5d2520409e9bb Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 6 Nov 2025 10:18:21 +0100
Subject: [PATCH 5847/6226] ci/github-script/bot: fix collaborator warning

This was introduced shortly before merge of the reviewers.js file, but
not actually tested - I thought it was not easy to find a PR triggering
this warning. However, the scheduled run told me otherwise: The
staging-next PR is the perfect candidate.
---
 ci/github-script/reviewers.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/github-script/reviewers.js b/ci/github-script/reviewers.js
index 81ad151264a1..2ac0d346f369 100644
--- a/ci/github-script/reviewers.js
+++ b/ci/github-script/reviewers.js
@@ -55,7 +55,7 @@ async function handleReviewers({
           return username
         } catch (e) {
           if (e.status !== 404) throw e
-          core.warn(
+          core.warning(
             `PR #${pull_number}: User ${username} cannot be requested for review because they don't exist or are not a repository collaborator, ignoring. They probably missed the automated invite to the maintainers team (see <https://github.com/NixOS/nixpkgs/issues/234293>).`,
           )
         }

From d0beb16463f732236e1ba31e134e8c20e7aac25c Mon Sep 17 00:00:00 2001
From: Kenichi Kamiya <kachick1@gmail.com>
Date: Thu, 6 Nov 2025 18:22:22 +0900
Subject: [PATCH 5848/6226] lima: 1.2.1 -> 1.2.2

Diff: https://github.com/lima-vm/lima/compare/v1.2.1...v1.2.2
---
 pkgs/by-name/li/lima/source.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/li/lima/source.nix b/pkgs/by-name/li/lima/source.nix
index aa1134c22f91..133ad36dd22d 100644
--- a/pkgs/by-name/li/lima/source.nix
+++ b/pkgs/by-name/li/lima/source.nix
@@ -3,7 +3,7 @@
 }:
 
 let
-  version = "1.2.1";
+  version = "1.2.2";
 in
 {
   inherit version;
@@ -12,7 +12,7 @@ in
     owner = "lima-vm";
     repo = "lima";
     tag = "v${version}";
-    hash = "sha256-90fFsS5jidaovE2iqXfe4T2SgZJz6ScOwPPYxCsCk/k=";
+    hash = "sha256-bIYF/bsOMuWTkjD6fe6by220/WQGL+VWEBXmUzyXU98=";
   };
 
   vendorHash = "sha256-8S5tAL7GY7dxNdyC+WOrOZ+GfTKTSX84sG8WcSec2Os=";

From 3cf884d2bd454f15c7c1e6ecdff8c615a7b9631f Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Thu, 6 Nov 2025 09:15:46 +0100
Subject: [PATCH 5849/6226] models-dev: 0-unstable-2025-11-03 ->
 0-unstable-2025-11-04

- remove `--linker=hoisted` and replace `installPhase` to copy workspace
specific `node_modules` folders
- add `--filter=.packages/web` filter which removes platform specific
packages and allows to only have one hash for all platforms
---
 pkgs/by-name/mo/models-dev/package.nix | 45 +++++++++-----------------
 1 file changed, 16 insertions(+), 29 deletions(-)

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index 984e77fe6d98..f7baee7d47eb 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -8,12 +8,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "models-dev";
-  version = "0-unstable-2025-11-03";
+  version = "0-unstable-2025-11-04";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "0e56ea3ccab064118f42687772368bc66f03f85e";
-    hash = "sha256-D7W0HSiHk5LpZ+y1pZCrEsfYEQPVD9qrrbu+3MhjEYo=";
+    rev = "234ba091f2d37ea925e4e38fecd7b3ed661b52a9";
+    hash = "sha256-7djp/VoAWK29tcwD9mDPCTZiGeJKB8puOnlbEMgOqKQ=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {
@@ -37,18 +37,11 @@ stdenvNoCC.mkDerivation (finalAttrs: {
 
        export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
 
-       # NOTE: Starting with Bun 1.3.0, isolated builds became the default
-       # behavior. In isolated builds, each package receives its own
-       # `.node_modules` subdirectory containing only the dependencies
-       # explicitly declared in that package's `package.json`. Since our build
-       # process copies only the root-level `.node_modules` directory, we must
-       # use `--linker=hoisted` to consolidate all dependencies there. Without
-       # this flag, we would need to copy every individual `.node_modules`
-       # subdirectory from each package.
        bun install \
+         --filter=./packages/web \
          --force \
          --frozen-lockfile \
-         --linker=hoisted \
+         --ignore-scripts \
          --no-progress \
          --production
 
@@ -58,23 +51,21 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     installPhase = ''
       runHook preInstall
 
-      mkdir -p $out/node_modules
-      cp -R ./node_modules $out
+      # Copy node_modules directories
+      while IFS= read -r dir; do
+        rel="''${dir#./}"
+        dest="$out/$rel"
+        mkdir -p "$(dirname "$dest")"
+        cp -R "$dir" "$dest"
+      done < <(find . -type d -name node_modules -prune)
 
       runHook postInstall
     '';
 
-    # Required else we get errors that our fixed-output derivation references store paths
+    # NOTE: Required else we get errors that our fixed-output derivation references store paths
     dontFixup = true;
 
-    outputHash =
-      {
-        x86_64-linux = "sha256-Uajwvce9EO1UwmpkGrViOrxlm2R/VnnMK8WAiOiQOhY=";
-        aarch64-linux = "sha256-brjdEEYBJ1R5pIkIHyOOmVieTJ0yUJEgxs7MtbzcKXo=";
-        x86_64-darwin = "sha256-aGUWZwySmo0ojOBF/PioZ2wp4NRwYyoaJuytzeGYjck=";
-        aarch64-darwin = "sha256-IM88XPfttZouN2DEtnWJmbdRxBs8wN7AZ1T28INJlBY=";
-      }
-      .${stdenvNoCC.hostPlatform.system};
+    outputHash = "sha256-otke/XlxVafkgtM3wDMU+/GBBgrbD32+3E+Wyue8+U8=";
     outputHashAlgo = "sha256";
     outputHashMode = "recursive";
   };
@@ -84,20 +75,16 @@ stdenvNoCC.mkDerivation (finalAttrs: {
   configurePhase = ''
     runHook preConfigure
 
-    cp -R ${finalAttrs.node_modules}/node_modules .
+    cp -R ${finalAttrs.node_modules}/. .
 
     runHook postConfigure
   '';
 
-  preBuild = ''
-    patchShebangs packages/web/script/build.ts
-  '';
-
   buildPhase = ''
     runHook preBuild
 
     cd packages/web
-    bun run build
+    bun run ./script/build.ts
 
     runHook postBuild
   '';

From b053a6c260f9119e2f66ca03c37a6dad668a8348 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 09:32:25 +0000
Subject: [PATCH 5850/6226] riffdiff: 3.5.1 -> 3.6.0

---
 pkgs/by-name/ri/riffdiff/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ri/riffdiff/package.nix b/pkgs/by-name/ri/riffdiff/package.nix
index 77763b38dc6e..c068a6b32b34 100644
--- a/pkgs/by-name/ri/riffdiff/package.nix
+++ b/pkgs/by-name/ri/riffdiff/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "riffdiff";
-  version = "3.5.1";
+  version = "3.6.0";
 
   src = fetchFromGitHub {
     owner = "walles";
     repo = "riff";
     tag = version;
-    hash = "sha256-SRr4yFv6fulBN/HNM3uCVLXS6pcspi5X5hXvQJg1sDI=";
+    hash = "sha256-WpVj/sgvvdNweZ+exxoSc4rtDmuRvaIdkwKk+eu46Ok=";
   };
 
-  cargoHash = "sha256-86nBxitdA8deJHRQqLM/JWcpSX/u6C4cofJAbYj5Ijs=";
+  cargoHash = "sha256-YJnqeuj4XvOnGJ9RcNBtfy1duYUu/u6ed47bAndLm30=";
 
   passthru = {
     tests.version = testers.testVersion { package = riffdiff; };

From 09f5e265f11876881d2f69ed0bcf08a6480d1daf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 09:48:06 +0000
Subject: [PATCH 5851/6226] waytrogen: 0.7.4 -> 0.8.0

---
 pkgs/by-name/wa/waytrogen/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/wa/waytrogen/package.nix b/pkgs/by-name/wa/waytrogen/package.nix
index 83d784d51d2e..93ea549ba19f 100644
--- a/pkgs/by-name/wa/waytrogen/package.nix
+++ b/pkgs/by-name/wa/waytrogen/package.nix
@@ -18,18 +18,18 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "waytrogen";
-  version = "0.7.4";
+  version = "0.8.0";
 
   src = fetchFromGitHub {
     owner = "nikolaizombie1";
     repo = "waytrogen";
     tag = finalAttrs.version;
-    hash = "sha256-I7juUTIN+ZhD9w2WXSU5YMBulxcGUYDdv6eiLZ1Byyw=";
+    hash = "sha256-zFRSWAVyTWvH6nxiacQbrrLRlu0Xac53XFaA6FcSf6M=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit (finalAttrs) pname version src;
-    hash = "sha256-k6n6aWEJ/8Dkbd68CJfJ7kbRTltCuQ4AtZ5dALFD3lU=";
+    hash = "sha256-/QCDxno0xZ9hLq0U6FNAZX7x+Kx5xaMtT/mR/GrNavs=";
   };
 
   nativeBuildInputs = [

From f4607d0da789b7dfb56c939fc520d12d82818d76 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 09:51:34 +0000
Subject: [PATCH 5852/6226] forecast: 0-unstable-2025-10-21 ->
 0-unstable-2025-11-06

---
 pkgs/by-name/fo/forecast/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix
index 23cd12fdb1c2..eb572dde9377 100644
--- a/pkgs/by-name/fo/forecast/package.nix
+++ b/pkgs/by-name/fo/forecast/package.nix
@@ -16,13 +16,13 @@
 
 rustPlatform.buildRustPackage {
   pname = "forecast";
-  version = "0-unstable-2025-10-21";
+  version = "0-unstable-2025-11-06";
 
   src = fetchFromGitHub {
     owner = "cosmic-utils";
     repo = "forecast";
-    rev = "8f04cafd809d58bdd46556b66f3aa4574e81fcbd";
-    hash = "sha256-DRShCI/tBh/a3IM/UH8yujlJyEeqGJ+kbnqSF8AibS0=";
+    rev = "51814ecac320185911743986e8ab0211140fa456";
+    hash = "sha256-XOqV9Z4l4aTgm2Abec7IE2bk8oX3RsAA8UxZuo6S5l8=";
   };
 
   cargoHash = "sha256-di7zjwI0/6NB2cAih3d7iqwSb+o/607jbgJN1MtbZX8=";

From 63691fc94d5bd8e1070f10793b781292e01800a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 09:54:54 +0000
Subject: [PATCH 5853/6226] sozu: 1.1.0 -> 1.1.1

---
 pkgs/by-name/so/sozu/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/so/sozu/package.nix b/pkgs/by-name/so/sozu/package.nix
index 2dc4b0b972da..5de6064251c7 100644
--- a/pkgs/by-name/so/sozu/package.nix
+++ b/pkgs/by-name/so/sozu/package.nix
@@ -11,16 +11,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "sozu";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "sozu-proxy";
     repo = "sozu";
     rev = version;
-    hash = "sha256-yODApjpcHl9wmf+6TEVzXTme8e68b3Ee1y64D/u7NW8=";
+    hash = "sha256-a/Pna2l1gRv4kxIyGUuUHlN+lIQemGjZXwM65Ccc24Y=";
   };
 
-  cargoHash = "sha256-HADNumewYIejVPHXknGayrK4hZ5hBCk0rTFQ/xeG3Mo=";
+  cargoHash = "sha256-9ZmlUUdtVAvri9v+EJb6vRQ7Yc3FjRwU5I5Xe8je9/c=";
 
   nativeBuildInputs = [ protobuf ];
 

From a58b5ed89d26970cddac5a83dcbfb43d01cb6ed6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 10:01:24 +0000
Subject: [PATCH 5854/6226] reindeer: 2025.10.27.00 -> 2025.11.03.00

---
 pkgs/by-name/re/reindeer/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/re/reindeer/package.nix b/pkgs/by-name/re/reindeer/package.nix
index 6908f925be6b..54b73c67821e 100644
--- a/pkgs/by-name/re/reindeer/package.nix
+++ b/pkgs/by-name/re/reindeer/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "reindeer";
-  version = "2025.10.27.00";
+  version = "2025.11.03.00";
 
   src = fetchFromGitHub {
     owner = "facebookincubator";
     repo = "reindeer";
     tag = "v${version}";
-    hash = "sha256-ykey6fdL9bjf+IfIAKzlIs5Pw/r2rAe6VB8BR1fUtz4=";
+    hash = "sha256-Kzxw0v/COISCoaZXu1Pi8/IB51YpZ5m3dZ/XTDfRQhg=";
   };
 
-  cargoHash = "sha256-aFDMVxWLeE8TtQCW5U2ULh9yJBc67vkXkPjgo+QPxYM=";
+  cargoHash = "sha256-KO8iAdE+9k5ka4Qcih6imxX/qSaY6giaF9BXtXumzV0=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 9a6df97e61facce429d0324f96b4694ec817fa34 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 10:10:10 +0000
Subject: [PATCH 5855/6226] python3Packages.pymiele: 0.5.6 -> 0.6.0

---
 pkgs/development/python-modules/pymiele/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pymiele/default.nix b/pkgs/development/python-modules/pymiele/default.nix
index 1712b7cb8025..03144e04bb96 100644
--- a/pkgs/development/python-modules/pymiele/default.nix
+++ b/pkgs/development/python-modules/pymiele/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pymiele";
-  version = "0.5.6";
+  version = "0.6.0";
   pyproject = true;
 
   disabled = pythonOlder "3.13";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-JRP7k5XbNBYCx9pdulL6UIv/E/OdbzxnEYsLXoI41sI=";
+    hash = "sha256-X2nATBOOq+N4ptF2NCNbZLi2KweoMzw0ixwP5mXm9SI=";
   };
 
   build-system = [ setuptools ];

From be3fdd6f3c3e82a1c819c1fd1009af6f41bb3bc3 Mon Sep 17 00:00:00 2001
From: Nina Fromm <nina.fromm@cyberus-technology.de>
Date: Thu, 6 Nov 2025 11:26:57 +0100
Subject: [PATCH 5856/6226] docuseal: 2.1.7 -> 2.2.0

- 2.1.8: Translation fixes
    - https://github.com/docusealco/docuseal/releases/tag/2.1.8
- 2.2.0: Auto-Detect form fields
    - https://github.com/docusealco/docuseal/releases/tag/2.2.0
---
 pkgs/by-name/do/docuseal/Gemfile      |  2 +
 pkgs/by-name/do/docuseal/Gemfile.lock | 45 ++++++++----
 pkgs/by-name/do/docuseal/gemset.nix   | 99 ++++++++++++++++++++-------
 pkgs/by-name/do/docuseal/package.nix  |  4 +-
 pkgs/by-name/do/docuseal/update.sh    |  1 +
 5 files changed, 111 insertions(+), 40 deletions(-)

diff --git a/pkgs/by-name/do/docuseal/Gemfile b/pkgs/by-name/do/docuseal/Gemfile
index 1cf7ca39e261..4ef1e77522b4 100644
--- a/pkgs/by-name/do/docuseal/Gemfile
+++ b/pkgs/by-name/do/docuseal/Gemfile
@@ -23,7 +23,9 @@ gem 'image_processing'
 gem 'jwt'
 gem 'lograge'
 gem 'mysql2', require: false
+gem 'numo-narray'
 gem 'oj'
+gem 'onnxruntime'
 gem 'pagy'
 gem 'pg', require: false
 gem 'premailer-rails'
diff --git a/pkgs/by-name/do/docuseal/Gemfile.lock b/pkgs/by-name/do/docuseal/Gemfile.lock
index d62126380cc8..ac58cc1d1bb0 100644
--- a/pkgs/by-name/do/docuseal/Gemfile.lock
+++ b/pkgs/by-name/do/docuseal/Gemfile.lock
@@ -76,7 +76,7 @@ GEM
       public_suffix (>= 2.0.2, < 7.0)
     annotaterb (4.14.0)
     arabic-letter-connector (0.1.1)
-    ast (2.4.2)
+    ast (2.4.3)
     aws-eventstream (1.3.0)
     aws-partitions (1.1027.0)
     aws-sdk-core (3.214.0)
@@ -289,10 +289,10 @@ GEM
       rdoc (>= 4.0.0)
       reline (>= 0.4.2)
     jmespath (1.6.2)
-    json (2.13.2)
+    json (2.15.0)
     jwt (2.9.3)
       base64
-    language_server-protocol (3.17.0.3)
+    language_server-protocol (3.17.0.5)
     launchy (3.0.1)
       addressable (~> 2.8)
       childprocess (~> 5.0)
@@ -303,6 +303,7 @@ GEM
       letter_opener (~> 1.9)
       railties (>= 6.1)
       rexml
+    lint_roller (1.1.0)
     logger (1.7.0)
     lograge (0.14.0)
       actionpack (>= 4)
@@ -350,17 +351,26 @@ GEM
       racc (~> 1.4)
     nokogiri (1.18.9-x86_64-linux-musl)
       racc (~> 1.4)
+    numo-narray (0.9.2.1)
     oj (3.16.11)
       bigdecimal (>= 3.0)
       ostruct (>= 0.2)
+    onnxruntime (0.10.1)
+      ffi
+    onnxruntime (0.10.1-aarch64-linux)
+      ffi
+    onnxruntime (0.10.1-arm64-darwin)
+      ffi
+    onnxruntime (0.10.1-x86_64-linux)
+      ffi
     openssl (3.3.0)
     orm_adapter (0.5.0)
     os (1.1.4)
     ostruct (0.6.3)
     package_json (0.1.0)
     pagy (9.3.3)
-    parallel (1.26.3)
-    parser (3.3.6.0)
+    parallel (1.27.0)
+    parser (3.3.9.0)
       ast (~> 2.4.1)
       racc
     pg (1.5.9)
@@ -377,6 +387,7 @@ GEM
     pretender (0.5.0)
       actionpack (>= 6.1)
     prettyprint (0.2.0)
+    prism (1.5.1)
     pry (0.15.0)
       coderay (~> 1.1)
       method_source (~> 1.0)
@@ -389,7 +400,7 @@ GEM
     puma (6.5.0)
       nio4r (~> 2.0)
     racc (1.8.1)
-    rack (3.2.0)
+    rack (3.2.3)
     rack-proxy (0.7.7)
       rack
     rack-session (2.1.1)
@@ -442,7 +453,7 @@ GEM
       psych (>= 4.0.0)
     redis-client (0.23.0)
       connection_pool
-    regexp_parser (2.9.3)
+    regexp_parser (2.11.3)
     reline (0.6.2)
       io-console (~> 0.5)
     representable (3.2.0)
@@ -479,18 +490,20 @@ GEM
       rspec-mocks (~> 3.13)
       rspec-support (~> 3.13)
     rspec-support (3.13.2)
-    rubocop (1.69.2)
+    rubocop (1.81.1)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 2.9.3, < 3.0)
-      rubocop-ast (>= 1.36.2, < 2.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.37.0)
-      parser (>= 3.3.1.0)
+    rubocop-ast (1.47.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
     rubocop-performance (1.23.0)
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
@@ -559,9 +572,9 @@ GEM
     tzinfo-data (1.2024.2)
       tzinfo (>= 1.0.0)
     uber (0.1.0)
-    unicode-display_width (3.1.2)
-      unicode-emoji (~> 4.0, >= 4.0.4)
-    unicode-emoji (4.0.4)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
     uniform_notifier (1.16.0)
     uri (1.0.3)
     useragent (0.16.11)
@@ -624,7 +637,9 @@ DEPENDENCIES
   letter_opener_web
   lograge
   mysql2
+  numo-narray
   oj
+  onnxruntime
   pagy
   pg
   premailer-rails
diff --git a/pkgs/by-name/do/docuseal/gemset.nix b/pkgs/by-name/do/docuseal/gemset.nix
index 79f90caa1cee..e53f3253f9a1 100644
--- a/pkgs/by-name/do/docuseal/gemset.nix
+++ b/pkgs/by-name/do/docuseal/gemset.nix
@@ -254,10 +254,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "04nc8x27hlzlrr5c2gn7mar4vdr0apw5xg22wp6m8dx3wqr04a0y";
+      sha256 = "10yknjyn0728gjn6b5syynvrvrwm66bhssbxq8mkhshxghaiailm";
       type = "gem";
     };
-    version = "2.4.2";
+    version = "2.4.3";
   };
   aws-eventstream = {
     groups = [ "default" ];
@@ -1427,10 +1427,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0s5vklcy2fgdxa9c6da34jbfrqq7xs6mryjglqqb5iilshcg3q82";
+      sha256 = "0p5dafxjp6kqkf3yx737gz9lwpaljlkc1raynkvcn6yql68d895w";
       type = "gem";
     };
-    version = "2.13.2";
+    version = "2.15.0";
   };
   jwt = {
     dependencies = [ "base64" ];
@@ -1452,10 +1452,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gvb1j8xsqxms9mww01rmdl78zkd72zgxaap56bhv8j45z05hp1x";
+      sha256 = "1k0311vah76kg5m6zr7wmkwyk5p2f9d9hyckjpn3xgr83ajkj7px";
       type = "gem";
     };
-    version = "3.17.0.3";
+    version = "3.17.0.5";
   };
   launchy = {
     dependencies = [
@@ -1504,6 +1504,20 @@
     };
     version = "3.0.0";
   };
+  lint_roller = {
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "11yc0d84hsnlvx8cpk4cbj6a4dz9pk0r1k29p0n1fz9acddq831c";
+      type = "gem";
+    };
+    version = "1.1.0";
+  };
   logger = {
     groups = [
       "default"
@@ -1808,6 +1822,16 @@
     };
     version = "1.18.9";
   };
+  numo-narray = {
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1syw9bhkk0bnacadcpdbwvc66j1gi3qqgcvqv3zqh4myxr3npmzf";
+      type = "gem";
+    };
+    version = "0.9.2.1";
+  };
   oj = {
     dependencies = [
       "bigdecimal"
@@ -1822,6 +1846,17 @@
     };
     version = "3.16.11";
   };
+  onnxruntime = {
+    dependencies = [ "ffi" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0c8l82qff7vd6whh0ks1f72734gmghzm0h2hvy2gnnp7y8j7amhq";
+      type = "gem";
+    };
+    version = "0.10.1";
+  };
   openssl = {
     groups = [ "default" ];
     platforms = [ ];
@@ -1891,10 +1926,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1vy7sjs2pgz4i96v5yk9b7aafbffnvq7nn419fgvw55qlavsnsyq";
+      sha256 = "0c719bfgcszqvk9z47w2p8j2wkz5y35k48ywwas5yxbbh3hm3haa";
       type = "gem";
     };
-    version = "1.26.3";
+    version = "1.27.0";
   };
   parser = {
     dependencies = [
@@ -1909,10 +1944,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fxw738al3qxa4s4ghqkxb908sav03i3h7xflawwmxzhqiyfdm15";
+      sha256 = "1wl7frfk68q6gsf6q6j32jl5m3yc0b9x8ycxz3hy79miaj9r5mll";
       type = "gem";
     };
-    version = "3.3.6.0";
+    version = "3.3.9.0";
   };
   pg = {
     groups = [ "default" ];
@@ -1994,6 +2029,20 @@
     };
     version = "0.2.0";
   };
+  prism = {
+    groups = [
+      "default"
+      "development"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0d3i31npmlhmigcs1zlb9lksg7z7lv6nffams71wrz5rriv1n35l";
+      type = "gem";
+    };
+    version = "1.5.1";
+  };
   pry = {
     dependencies = [
       "coderay"
@@ -2092,10 +2141,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "04inzfa1psgl8mywgzaks31am1zh00lyc0mf3zb5jv399m8j3kbr";
+      sha256 = "0h9xr8ivrfr0i5f2n7czg74r3ri1pba8wb84bzr78iaqlqykg6i3";
       type = "gem";
     };
-    version = "3.2.0";
+    version = "3.2.3";
   };
   rack-proxy = {
     dependencies = [ "rack" ];
@@ -2335,10 +2384,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0yb3iycaj3krvlnicijm99qxvfbrbi0pd81i2cpdhjc3xmbhcqjb";
+      sha256 = "192mzi0wgwl024pwpbfa6c2a2xlvbh3mjd75a0sakdvkl60z64ya";
       type = "gem";
     };
-    version = "2.9.3";
+    version = "2.11.3";
   };
   reline = {
     dependencies = [ "io-console" ];
@@ -2554,6 +2603,7 @@
     dependencies = [
       "json"
       "language_server-protocol"
+      "lint_roller"
       "parallel"
       "parser"
       "rainbow"
@@ -2569,13 +2619,16 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1f2bj93f60757xyk7h3v0s7xz8d22lc9zlw88l2zd6rp1brv0bvn";
+      sha256 = "0d8n87wx2r8vkva5qi4m3hi4s9b6qhmzgw85qgv14hsa65prlaim";
       type = "gem";
     };
-    version = "1.69.2";
+    version = "1.81.1";
   };
   rubocop-ast = {
-    dependencies = [ "parser" ];
+    dependencies = [
+      "parser"
+      "prism"
+    ];
     groups = [
       "default"
       "development"
@@ -2584,10 +2637,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "10604xc4bcji3ca43anlc89xwxb4wkzk69cia95x04zima4aq4wm";
+      sha256 = "1bh1kls2cs2j3cmj6f2j2zmfqfknj2a6i441d828nh2mg00q49jr";
       type = "gem";
     };
-    version = "1.37.0";
+    version = "1.47.1";
   };
   rubocop-performance = {
     dependencies = [
@@ -2992,10 +3045,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1lcmyip9rw4azsia1hb5srj2mgbdhrinc4113cs1w84qz1ndpm7x";
+      sha256 = "0hiwhnqpq271xqari6mg996fgjps42sffm9cpk6ljn8sd2srdp8c";
       type = "gem";
     };
-    version = "3.1.2";
+    version = "3.2.0";
   };
   unicode-emoji = {
     groups = [
@@ -3006,10 +3059,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ajk6rngypm3chvl6r0vwv36q1931fjqaqhjjya81rakygvlwb1c";
+      sha256 = "1995yfjbvjlwrslq48gzzc9j0blkdzlbda9h90pjbm0yvzax55s9";
       type = "gem";
     };
-    version = "4.0.4";
+    version = "4.1.0";
   };
   uniform_notifier = {
     groups = [
diff --git a/pkgs/by-name/do/docuseal/package.nix b/pkgs/by-name/do/docuseal/package.nix
index e161f5ea0708..c6869b24ed80 100644
--- a/pkgs/by-name/do/docuseal/package.nix
+++ b/pkgs/by-name/do/docuseal/package.nix
@@ -16,7 +16,7 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "docuseal";
-  version = "2.1.7";
+  version = "2.2.0";
 
   bundler = bundler.override { ruby = ruby_3_4; };
 
@@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "docusealco";
     repo = "docuseal";
     tag = finalAttrs.version;
-    hash = "sha256-zNfxQPJjobYrx/YPGRn5QKwUd1VXetFqtBeII0wlmk4=";
+    hash = "sha256-QKGIcLdyIeYcHXA3TRv7PS9V2mok3Y8UOuqCdnCpNfM=";
     # https://github.com/docusealco/docuseal/issues/505#issuecomment-3153802333
     postFetch = "rm $out/db/schema.rb";
   };
diff --git a/pkgs/by-name/do/docuseal/update.sh b/pkgs/by-name/do/docuseal/update.sh
index fbb4561bf0a0..fe351f5d55a3 100755
--- a/pkgs/by-name/do/docuseal/update.sh
+++ b/pkgs/by-name/do/docuseal/update.sh
@@ -2,6 +2,7 @@
 #!nix-shell -i bash -p curl jq bundix ruby_3_4 prefetch-yarn-deps nix-update nixfmt
 
 set -eu -o pipefail
+set -x
 dir="$(dirname "$(readlink -f "$0")")"
 
 current=$(nix --extra-experimental-features nix-command eval --raw -f . docuseal.src.tag)

From 602fdcff2574f640ab08394b35392c4e25cb739c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Thu, 6 Nov 2025 10:37:15 +0000
Subject: [PATCH 5857/6226] claude-code: 2.0.33 -> 2.0.34

---
 pkgs/by-name/cl/claude-code/package-lock.json | 4 ++--
 pkgs/by-name/cl/claude-code/package.nix       | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index 22e0322b6924..b86d4ca4ada2 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.0.33",
+  "version": "2.0.34",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.0.33",
+      "version": "2.0.34",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index 8de765ca83d8..da13768205ad 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,14 +7,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.0.33";
+  version = "2.0.34";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-Ng9uJj4STRCKk2ndk7zH3fF/OLZ/cvZSGKH2QRyOFcM=";
+    hash = "sha256-GYykbpvkFTsj7tlsAimDrNbN9kP1+8AtfG+Boch8eSk=";
   };
 
-  npmDepsHash = "sha256-89+DrE8rG5WPw6J+iw4t1t+1yJKdbaKLDodfP/CsViU=";
+  npmDepsHash = "sha256-D0sbwZ5eCzIobFGf5LY7u3/RWQ6bYpGFDlU/ClPTA7Y=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From c58139723adf1499014faf5ceb4e65ac236ee07c Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 6 Nov 2025 12:11:00 +0100
Subject: [PATCH 5858/6226] workflows/pull-request-target: remove leftover
 secret

This was used for reviewers.yml, which has been removed.
---
 .github/workflows/pull-request-target.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/pull-request-target.yml b/.github/workflows/pull-request-target.yml
index a3774366bc9b..f74ce93de354 100644
--- a/.github/workflows/pull-request-target.yml
+++ b/.github/workflows/pull-request-target.yml
@@ -12,9 +12,6 @@ on:
         required: true
       NIXPKGS_CI_APP_PRIVATE_KEY:
         required: true
-      OWNER_APP_PRIVATE_KEY:
-        # The Test workflow should not actually request reviews from owners.
-        required: false
 
 concurrency:
   group: pr-${{ github.workflow }}-${{ github.event_name }}-${{ github.event.pull_request.number || github.run_id }}

From 1742aef1e988b884b81d6b6060be33d1b8dd1a41 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 6 Nov 2025 12:11:34 +0100
Subject: [PATCH 5859/6226] workflows/teams: use single token in team sync

The nixpkgs-ci app now has all the privileges needed to see the member
lists anyway, so no need for two apps / tokens anymore.
---
 .github/workflows/teams.yml | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/.github/workflows/teams.yml b/.github/workflows/teams.yml
index 1cd54cd527e0..b848983b5aa2 100644
--- a/.github/workflows/teams.yml
+++ b/.github/workflows/teams.yml
@@ -16,13 +16,17 @@ jobs:
   sync:
     runs-on: ubuntu-24.04-arm
     steps:
+      # Use a GitHub App to create the PR so that CI gets triggered and to
+      # request team member lists.
       - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
-        id: team-token
+        id: app-token
         with:
-          app-id: ${{ vars.OWNER_APP_ID }}
-          private-key: ${{ secrets.OWNER_APP_PRIVATE_KEY }}
+          app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
+          private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
           permission-administration: read
+          permission-contents: write
           permission-members: read
+          permission-pull-requests: write
 
       - name: Fetch source
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
@@ -38,7 +42,7 @@ jobs:
       - name: Synchronise teams
         uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
         with:
-          github-token: ${{ steps.team-token.outputs.token }}
+          github-token: ${{ steps.app-token.outputs.token }}
           script: |
             require('./ci/github-script/get-teams.js')({
               github,
@@ -47,20 +51,11 @@ jobs:
               outFile: "maintainers/github-teams.json"
             })
 
-      # Use a GitHub App to create the PR so that CI gets triggered
-      - uses: actions/create-github-app-token@67018539274d69449ef7c02e8e71183d1719ab42 # v2.1.4
-        id: sync-token
-        with:
-          app-id: ${{ vars.NIXPKGS_CI_APP_ID }}
-          private-key: ${{ secrets.NIXPKGS_CI_APP_PRIVATE_KEY }}
-          permission-contents: write
-          permission-pull-requests: write
-
       - name: Get GitHub App User Git String
         id: user
         env:
-          GH_TOKEN: ${{ steps.sync-token.outputs.token }}
-          APP_SLUG: ${{ steps.sync-token.outputs.app-slug }}
+          GH_TOKEN: ${{ steps.app-token.outputs.token }}
+          APP_SLUG: ${{ steps.app-token.outputs.app-slug }}
         run: |
           name="${APP_SLUG}[bot]"
           userId=$(gh api "/users/$name" --jq .id)
@@ -70,7 +65,7 @@ jobs:
       - name: Create Pull Request
         uses: peter-evans/create-pull-request@271a8d0340265f705b14b6d32b9829c1cb33d45e # v7.0.8
         with:
-          token: ${{ steps.sync-token.outputs.token }}
+          token: ${{ steps.app-token.outputs.token }}
           add-paths: maintainers/github-teams.json
           author: ${{ steps.user.outputs.git-string }}
           committer: ${{ steps.user.outputs.git-string }}

From e505932e78fbb4c66d005eb1644f334c0f804ca5 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 28 Aug 2025 15:50:09 +0200
Subject: [PATCH 5860/6226] texpresso: 0-unstable-2025-01-29 -> 0.1

Diff:
https://github.com/let-def/texpresso/compare/c42a5912f501f180984840fa8adf9ffc09c5ac13...1f17765ddad7e1f7c0fafc100f7fca5472952dc7
---
 pkgs/by-name/te/texpresso/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/te/texpresso/package.nix b/pkgs/by-name/te/texpresso/package.nix
index 7e65525348fb..ddda76c43b6d 100644
--- a/pkgs/by-name/te/texpresso/package.nix
+++ b/pkgs/by-name/te/texpresso/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "texpresso";
-  version = "0-unstable-2025-01-29";
+  version = "0.1";
 
   src = fetchFromGitHub {
     owner = "let-def";
     repo = "texpresso";
-    rev = "c42a5912f501f180984840fa8adf9ffc09c5ac13";
-    hash = "sha256-T/vou7OcGtNoodCrznmjBLxg6ZAFDCjhpYgNyZaf44g=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-d+wNQIysn3hdTQnHN9MJbFOIhJQ0ml6PoeuwsryntTI=";
   };
 
   postPatch = ''
@@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
       #!nix-shell -i bash -p curl jq nix-update
 
       tectonic_version="$(curl -s "https://api.github.com/repos/let-def/texpresso/contents/tectonic" | jq -r '.sha')"
-      nix-update --version=branch texpresso
+      nix-update texpresso
       nix-update --version=branch=$tectonic_version texpresso.tectonic
     '';
   };

From fef66ce780e39d628fc7eddbfc98f9c60559ad11 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 11:28:40 +0000
Subject: [PATCH 5861/6226] 
 vscode-extensions.k--kato.intellij-idea-keybindings: 1.7.5 -> 1.7.6

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index 66641240934e..b47b6869df20 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -2643,8 +2643,8 @@ let
         mktplcRef = {
           name = "intellij-idea-keybindings";
           publisher = "k--kato";
-          version = "1.7.5";
-          hash = "sha256-DOSe0UhNMj6FRyHylnKYQsyhSLQQFvGfcmOBZSw+nVo=";
+          version = "1.7.6";
+          hash = "sha256-eSt4iT/o4mp17Dasr0gDr3SsQHX3R6jGmW4V/2KymnY=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/k--kato.intellij-idea-keybindings/changelog";

From 918e017d6436ce1683d92af1ee4949e606fb1933 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 6 Nov 2025 19:34:30 +0800
Subject: [PATCH 5862/6226] lib.extendMkDerivation: adjust default value
 documentation

---
 lib/customisation.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index 30747f7fde7e..55117f8289d0 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -763,11 +763,11 @@ rec {
     # Inputs
 
     `extendMkDerivation`-specific configurations
-    : `constructDrv`: Base build helper, the `mkDerivation`-like build helper to extend.
-    : `excludeDrvArgNames`: Argument names not to pass from the input fixed-point arguments to `constructDrv`. Note: It doesn't apply to the updating arguments returned by `extendDrvArgs`.
-    : `extendDrvArgs` : An extension (overlay) of the argument set, like the one taken by [overrideAttrs](#sec-pkg-overrideAttrs) but applied before passing to `constructDrv`.
-    : `inheritFunctionArgs`: Whether to inherit `__functionArgs` from the base build helper (default to `true`).
-    : `transformDrv`: Function to apply to the result derivation (default to `lib.id`).
+    : `constructDrv` (required): Base build helper, the `mkDerivation`-like build helper to extend.
+    : `excludeDrvArgNames` (default to `[ ]`): Argument names not to pass from the input fixed-point arguments to `constructDrv`. Note: It doesn't apply to the updating arguments returned by `extendDrvArgs`.
+    : `extendDrvArgs` (required): An extension (overlay) of the argument set, like the one taken by [overrideAttrs](#sec-pkg-overrideAttrs) but applied before passing to `constructDrv`.
+    : `inheritFunctionArgs` (default to `true`): Whether to inherit `__functionArgs` from the base build helper.
+    : `transformDrv` (default to `lib.id`): Function to apply to the result derivation.
 
     # Type
 

From 289ec9eb7bc5e7c927afc6052ddf531f17ee7820 Mon Sep 17 00:00:00 2001
From: "nixpkgs-ci[bot]" <190413589+nixpkgs-ci[bot]@users.noreply.github.com>
Date: Thu, 6 Nov 2025 11:37:24 +0000
Subject: [PATCH 5863/6226] maintainers/github-teams.json: Automated sync

---
 maintainers/github-teams.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json
index e67875efe6c5..289edd306687 100644
--- a/maintainers/github-teams.json
+++ b/maintainers/github-teams.json
@@ -724,7 +724,6 @@
     "description": "Provides leadership for and has authority over Nixpkgs.",
     "id": 14317027,
     "maintainers": {
-      "K900": 386765,
       "alyssais": 2768870,
       "emilazy": 18535642,
       "wolfgangwalther": 9132420

From b337d6e74d1414bf208cdec6520305aa5d8b6ea9 Mon Sep 17 00:00:00 2001
From: Dionysis Grigoropoulos <dgrig@erethon.com>
Date: Thu, 6 Nov 2025 13:35:32 +0200
Subject: [PATCH 5864/6226] python3Packages.files-to-prompt: Fix build

Disable a test that fails with latest Click version.
---
 pkgs/development/python-modules/files-to-prompt/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/python-modules/files-to-prompt/default.nix b/pkgs/development/python-modules/files-to-prompt/default.nix
index f4392672429a..29d6fc79c16d 100644
--- a/pkgs/development/python-modules/files-to-prompt/default.nix
+++ b/pkgs/development/python-modules/files-to-prompt/default.nix
@@ -29,6 +29,8 @@ buildPythonPackage rec {
     versionCheckHook
   ];
 
+  disabledTests = [ "test_binary_file_warning" ];
+
   versionCheckProgramArg = "--version";
 
   meta = {

From e410e51de7984f7f594935c32f29a1f726555652 Mon Sep 17 00:00:00 2001
From: Pierre Roux <pierre.roux@onera.fr>
Date: Thu, 6 Nov 2025 12:47:29 +0100
Subject: [PATCH 5865/6226] coqPackages.metarocq: 1.'-9.0 -> 1.4-9.1

---
 pkgs/development/coq-modules/metarocq/default.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/development/coq-modules/metarocq/default.nix b/pkgs/development/coq-modules/metarocq/default.nix
index 952ed86ddbf2..ba2a7ba8c40a 100644
--- a/pkgs/development/coq-modules/metarocq/default.nix
+++ b/pkgs/development/coq-modules/metarocq/default.nix
@@ -15,11 +15,13 @@ let
       case = case: out: { inherit case out; };
     in
     lib.switch coq.coq-version [
+      (case "9.1" "1.4-9.1")
       (case "9.0" "1.4-9.0.1")
     ] null;
   release = {
     "1.4-9.0".sha256 = "sha256-5QecDAMkvgfDPZ7/jDfnOgcE+Eb1LTAozP7nz6nkuxg=";
     "1.4-9.0.1".sha256 = "sha256-zMUd2A6EG0LYK3L9ABQvS/Et4MDpSmf3Pxd9+IPNYkI=";
+    "1.4-9.1".sha256 = "sha256-v6jFvUavIzyb/e6ytAaZjxQLFM9uW9TDUB77yRO74eE=";
   };
   releaseRev = v: "v${v}";
 

From 3d70e7f1af76d87403edf921173d9c7f481ade78 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 11:49:10 +0000
Subject: [PATCH 5866/6226] linuxKernel.kernels.linux_zen: 6.17.6 -> 6.17.7

---
 pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix
index ab7002b0886c..1c0435d1306f 100644
--- a/pkgs/os-specific/linux/kernel/zen-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix
@@ -16,9 +16,9 @@ let
   variants = {
     # ./update-zen.py zen
     zen = {
-      version = "6.17.6"; # zen
+      version = "6.17.7"; # zen
       suffix = "zen1"; # zen
-      sha256 = "0kkrfmxj1q7il7njc1s8fnn459rcgviyy5q2kbynasrqij5kdciy"; # zen
+      sha256 = "01dh7cdqa4rx0fmr22yyn8d6qb8ns7v0x53k2ij3vrp9pz6p5cs4"; # zen
       isLqx = false;
     };
     # ./update-zen.py lqx

From 92d617e1a9aa603e4de1284dffe6e10f707b66e0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 11:50:26 +0000
Subject: [PATCH 5867/6226] json-repair: 0.52.2 -> 0.52.4

---
 pkgs/development/python-modules/json-repair/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/json-repair/default.nix b/pkgs/development/python-modules/json-repair/default.nix
index 4ad9515baf2b..3b1828f75e73 100644
--- a/pkgs/development/python-modules/json-repair/default.nix
+++ b/pkgs/development/python-modules/json-repair/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "json-repair";
-  version = "0.52.2";
+  version = "0.52.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mangiucugna";
     repo = "json_repair";
     tag = "v${version}";
-    hash = "sha256-NYW2PJ329c8EYfQrRl1mi+leUR7Afz2J0N9HVD1xyT0=";
+    hash = "sha256-eO9F2c3hIHhxLC5j2+ZtPaj+zD7Mby44N7ULsxfAQxg=";
   };
 
   build-system = [ setuptools ];

From e356805995fdc3779bd6d02e0508ba7b12156159 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 12:18:29 +0000
Subject: [PATCH 5868/6226] emacsPackages.ebuild-mode: 1.78 -> 1.79

---
 .../elisp-packages/manual-packages/ebuild-mode/package.nix    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix
index 8fd622b2cb08..cf2ffff8d4ff 100644
--- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix
+++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix
@@ -6,11 +6,11 @@
 
 melpaBuild rec {
   pname = "ebuild-mode";
-  version = "1.78";
+  version = "1.79";
 
   src = fetchzip {
     url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${version}.tar.bz2";
-    hash = "sha256-vpNjhW3U/b+A4O78vYKoMN0Gutd6fRcB4wb3dz1z2Cc=";
+    hash = "sha256-FV9e6QF85yPnowfmseo53/Q36W3wlOgTG0/X4r7OHiI=";
   };
 
   meta = {

From 1048da6e0a8606295dac111cf8de7465726f1011 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 12:27:16 +0000
Subject: [PATCH 5869/6226] werf: 2.51.1 -> 2.51.3

---
 pkgs/by-name/we/werf/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/we/werf/package.nix b/pkgs/by-name/we/werf/package.nix
index e907e3f79c11..cad94a2edf39 100644
--- a/pkgs/by-name/we/werf/package.nix
+++ b/pkgs/by-name/we/werf/package.nix
@@ -10,13 +10,13 @@
 }:
 buildGoModule (finalAttrs: {
   pname = "werf";
-  version = "2.51.1";
+  version = "2.51.3";
 
   src = fetchFromGitHub {
     owner = "werf";
     repo = "werf";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8tmBzwvuYv3FvSNFpu51fYZP1nqQHtfKioY6eycf7W8=";
+    hash = "sha256-xka8poabuG1Bwmo+Q+VeWLZIkKSY9+k5JHYTO2ecz2I=";
   };
 
   proxyVendor = true;

From bc14d5bd6e563391bb7c3339d18be1e7513f4932 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 12:27:44 +0000
Subject: [PATCH 5870/6226] goodvibes: 0.8.2 -> 0.8.3

---
 pkgs/by-name/go/goodvibes/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/goodvibes/package.nix b/pkgs/by-name/go/goodvibes/package.nix
index 02944b66b646..cc7e123d8bec 100644
--- a/pkgs/by-name/go/goodvibes/package.nix
+++ b/pkgs/by-name/go/goodvibes/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "goodvibes";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitLab {
     owner = "goodvibes";
     repo = "goodvibes";
     rev = "v${version}";
-    hash = "sha256-AHw8KlU1lmgH837GOpxGBgngwRIs5XV3+TvH4MuCx54=";
+    hash = "sha256-Lh4FPH0Bdxg2J4IxsZPs8Zjc7Tcobb4bTpvJzVNIy0Y=";
   };
 
   nativeBuildInputs = [

From bc5ac1823cb66a8696e3c6c38d5ab4c15dff0d63 Mon Sep 17 00:00:00 2001
From: Florian Brandes <florian.brandes@posteo.de>
Date: Thu, 6 Nov 2025 06:43:38 +0100
Subject: [PATCH 5871/6226] qtconnectivity: fix build on darwin

pcsclite is provided by Apple framework

Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
---
 pkgs/development/libraries/qt-6/modules/qtconnectivity.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix
index 7fc3c4ca3c5d..c96ebd0e0f32 100644
--- a/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix
+++ b/pkgs/development/libraries/qt-6/modules/qtconnectivity.nix
@@ -12,7 +12,10 @@
 qtModule {
   pname = "qtconnectivity";
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ pcsclite ] ++ lib.optionals stdenv.hostPlatform.isLinux [ bluez ];
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [
+    pcsclite
+    bluez
+  ];
   propagatedBuildInputs = [
     qtbase
     qtdeclarative

From 2c12d231fd5a6a3ac7f1991cf0f28c3849f7e1f5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 12:37:06 +0000
Subject: [PATCH 5872/6226] jsonplaceholder: 0-unstable-2021-06-14 ->
 0.3.3-unstable-2021-06-14

---
 pkgs/by-name/js/jsonplaceholder/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/js/jsonplaceholder/package.nix b/pkgs/by-name/js/jsonplaceholder/package.nix
index 5036c9006bd9..63b034436f34 100644
--- a/pkgs/by-name/js/jsonplaceholder/package.nix
+++ b/pkgs/by-name/js/jsonplaceholder/package.nix
@@ -9,13 +9,13 @@
 
 buildNpmPackage {
   pname = "jsonplaceholder";
-  version = "0-unstable-2021-06-14";
+  version = "0.3.3-unstable-2021-06-14";
 
   src = fetchFromGitHub {
     owner = "typicode";
     repo = "jsonplaceholder";
     rev = "7ae4432ac3f60e7226a899c25e04826207d07098";
-    hash = "sha256-b+p1bByq0oRj3zqVsFFoXFR2ydrbZqWwJdVIaXEmQwQ";
+    hash = "sha256-b+p1bByq0oRj3zqVsFFoXFR2ydrbZqWwJdVIaXEmQwQ=";
   };
 
   npmDepsHash = "sha256-x+EN33CQE4ga9T0V4oJRPkELT8x4WbNIsQmvyW+hHi8=";

From 980fc4645f0d5c5e437b884cd7ca69397604af7b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 12:39:29 +0000
Subject: [PATCH 5873/6226] sentry-cli: 2.57.0 -> 2.58.0

---
 pkgs/by-name/se/sentry-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/se/sentry-cli/package.nix b/pkgs/by-name/se/sentry-cli/package.nix
index 895249d29723..ac1c66aca115 100644
--- a/pkgs/by-name/se/sentry-cli/package.nix
+++ b/pkgs/by-name/se/sentry-cli/package.nix
@@ -12,13 +12,13 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "sentry-cli";
-  version = "2.57.0";
+  version = "2.58.0";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-cli";
     rev = version;
-    hash = "sha256-VcWIeWLWQpEDJhF0f95S9sQ0yC1NJqisOmEONINtKeA=";
+    hash = "sha256-8fz8bSQxqylTQ7mD/QbQ6gc8qlEdx/SDCjaB3uqFnGA=";
   };
   doCheck = false;
 
@@ -44,7 +44,7 @@ rustPlatform.buildRustPackage rec {
   # By default including `swiftpm` in `nativeBuildInputs` will take over `buildPhase`
   dontUseSwiftpmBuild = true;
 
-  cargoHash = "sha256-S+A6v4rva8c7QuWP/5dRzUtJDdWryb8Jmu2J4JurNMM=";
+  cargoHash = "sha256-3I0uKHpD4SpSeLSIAEjBxxAFfyS4WIvb76x7QAy53HM=";
 
   postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) ''
     installShellCompletion --cmd sentry-cli \

From affa1ee33b6b028be7a701d15bd7d41b99341f75 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 12:42:06 +0000
Subject: [PATCH 5874/6226] buffrs: 0.11.0 -> 0.12.0

---
 pkgs/by-name/bu/buffrs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bu/buffrs/package.nix b/pkgs/by-name/bu/buffrs/package.nix
index e66dbc9a3e0a..e5bf43638479 100644
--- a/pkgs/by-name/bu/buffrs/package.nix
+++ b/pkgs/by-name/bu/buffrs/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "buffrs";
-  version = "0.11.0";
+  version = "0.12.0";
 
   src = fetchFromGitHub {
     owner = "helsing-ai";
     repo = "buffrs";
     tag = "v${version}";
-    hash = "sha256-VHzPOFOkwz3QlDt25gBbishM4ujtEPFjA21WuiNVw00=";
+    hash = "sha256-c1QMPFVc9k3hTK7Y1aimXbJ4IKBNmAt9aYtiUIchG8E=";
   };
 
-  cargoHash = "sha256-/cdBt23VSmwN/C2XdHeeRjUSqLWiEheqVl+hfEDKIP0=";
+  cargoHash = "sha256-6592v/ednZDaKfMcaMCAmJOh4ZhZdBwIpEZiqsbF4hU=";
 
   # Disabling tests meant to work over the network, as they will fail
   # inside the builder.

From 0def4430e83356db9fec4b31952ba22492924675 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 12:44:07 +0000
Subject: [PATCH 5875/6226] awsbck: 1.0.0 -> 1.0.1

---
 pkgs/by-name/aw/awsbck/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/aw/awsbck/package.nix b/pkgs/by-name/aw/awsbck/package.nix
index 1c253b989b34..5fe548b6eef5 100644
--- a/pkgs/by-name/aw/awsbck/package.nix
+++ b/pkgs/by-name/aw/awsbck/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "awsbck";
-  version = "1.0.0";
+  version = "1.0.1";
 
   src = fetchFromGitHub {
     owner = "beeb";
     repo = "awsbck";
     rev = "v${version}";
-    hash = "sha256-IFdhfBri1k5u7NfC1HTSegKCtRDK2fz+WkjwHOtp1qk=";
+    hash = "sha256-WWYUMamMDtnvOR7vjoKd1Kn8vJBAAa9Jj8MFPRGQfEQ=";
   };
 
-  cargoHash = "sha256-9RKsnGjbP0iQsC2iCq6LTleILHvX0powQu15oopE2XY=";
+  cargoHash = "sha256-eo7NBGDPhu+v07dUUw/k1O62gxbeXh1PdPogTjg6l8I=";
 
   # tests run in CI on the source repo
   doCheck = false;

From 0dd045ea6f52ba0aef9cca4e7a146af9a0ce83be Mon Sep 17 00:00:00 2001
From: Jonathan Davies <jpds@protonmail.com>
Date: Thu, 6 Nov 2025 12:45:37 +0000
Subject: [PATCH 5876/6226] thanos: Add versionCheckHook

---
 pkgs/by-name/th/thanos/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/th/thanos/package.nix b/pkgs/by-name/th/thanos/package.nix
index 48e32cec0779..b56882f7d653 100644
--- a/pkgs/by-name/th/thanos/package.nix
+++ b/pkgs/by-name/th/thanos/package.nix
@@ -7,6 +7,7 @@
   nixosTests,
   testers,
   thanos,
+  versionCheckHook,
 }:
 
 buildGoModule rec {
@@ -45,6 +46,12 @@ buildGoModule rec {
 
   doCheck = true;
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
   passthru = {
     updateScript = nix-update-script { };
     tests = {

From 47b6f9110c95402f572802ae6c4ae98ed3078c4b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 12:50:38 +0000
Subject: [PATCH 5877/6226] swaylock: 1.8.3 -> 1.8.4

---
 pkgs/by-name/sw/swaylock/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sw/swaylock/package.nix b/pkgs/by-name/sw/swaylock/package.nix
index 674d84f83878..95c55943e525 100644
--- a/pkgs/by-name/sw/swaylock/package.nix
+++ b/pkgs/by-name/sw/swaylock/package.nix
@@ -19,13 +19,13 @@
 
 stdenv.mkDerivation rec {
   pname = "swaylock";
-  version = "1.8.3";
+  version = "1.8.4";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "swaylock";
     tag = "v${version}";
-    hash = "sha256-5JAA8mCY3vOsauvRK2zquBrzA2ROakEfahzp4a6j/Ac=";
+    hash = "sha256-l3fu04cw2Jin2F6UcDK0kWRJLKuwXpxuImUjoLk32Fc=";
   };
 
   strictDeps = true;

From 85e15f7cbf0dead359430e4dcafda48c90ec6a01 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 12:55:12 +0000
Subject: [PATCH 5878/6226] python3Packages.gvm-tools: 25.4.1 -> 25.4.2

---
 pkgs/development/python-modules/gvm-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix
index 9d91d6b518c0..ac4854c13f86 100644
--- a/pkgs/development/python-modules/gvm-tools/default.nix
+++ b/pkgs/development/python-modules/gvm-tools/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "gvm-tools";
-  version = "25.4.1";
+  version = "25.4.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "greenbone";
     repo = "gvm-tools";
     tag = "v${version}";
-    hash = "sha256-BYkpHUSw9MU9SpJiQf1ZgG1ZCfRxyAyX/K+53wgnKoQ=";
+    hash = "sha256-mhQX9yBH8mQ+ESZzqM2VC4bfktI677Y/dli/YWTYRhE=";
   };
 
   __darwinAllowLocalNetworking = true;

From 0a064e1cb30df71240a309e2dd3e13d5721d7a76 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 13:16:07 +0000
Subject: [PATCH 5879/6226] qmapshack: 1.18.1 -> 1.18.2

---
 pkgs/by-name/qm/qmapshack/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/qm/qmapshack/package.nix b/pkgs/by-name/qm/qmapshack/package.nix
index 6b1b3afff205..a045c8e329bb 100644
--- a/pkgs/by-name/qm/qmapshack/package.nix
+++ b/pkgs/by-name/qm/qmapshack/package.nix
@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "qmapshack";
-  version = "1.18.1";
+  version = "1.18.2";
 
   src = fetchFromGitHub {
     owner = "Maproom";
     repo = "qmapshack";
     tag = "V_${finalAttrs.version}";
-    hash = "sha256-uJO0WBA8/PAvO3yFE7O2Ncz801UBoL2Nf7Dv61yxQag=";
+    hash = "sha256-vvpDjGFzkbsM/QUiU9EURuU0babWYL1gLzWTqJbHu0c=";
   };
 
   nativeBuildInputs = [

From 3771940d07d6e120bc646e736eaea2e3c974fd41 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 13:18:54 +0000
Subject: [PATCH 5880/6226] talosctl: 1.11.3 -> 1.11.4

---
 pkgs/by-name/ta/talosctl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ta/talosctl/package.nix b/pkgs/by-name/ta/talosctl/package.nix
index 7ac6a74005ce..c95b764c42f5 100644
--- a/pkgs/by-name/ta/talosctl/package.nix
+++ b/pkgs/by-name/ta/talosctl/package.nix
@@ -9,16 +9,16 @@
 
 buildGoModule rec {
   pname = "talosctl";
-  version = "1.11.3";
+  version = "1.11.4";
 
   src = fetchFromGitHub {
     owner = "siderolabs";
     repo = "talos";
     tag = "v${version}";
-    hash = "sha256-6nm0KgENOHUdyJllvnhBNlxDGL3G8gg4KqhTkTRE32o=";
+    hash = "sha256-TA84RIn5ZRW9ZrsnEYB094n+H8MBBSyRjubcy4Qqmnw=";
   };
 
-  vendorHash = "sha256-NLyWzkagiP6zeeB4o6CI9UBPH6a5JGhPu1QGyiovBfM=";
+  vendorHash = "sha256-8yy0lLC+9Ubw9gHUOnq3ZgrjaOxSxtorSJxuxM9laKE=";
 
   ldflags = [
     "-s"

From fbcbb15299fa058736077a41757ff9836a3e946a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 13:34:02 +0000
Subject: [PATCH 5881/6226] cocogitto: 6.3.0 -> 6.5.0

---
 pkgs/by-name/co/cocogitto/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/cocogitto/package.nix b/pkgs/by-name/co/cocogitto/package.nix
index 6a6bc4982611..e8fcb71c6e19 100644
--- a/pkgs/by-name/co/cocogitto/package.nix
+++ b/pkgs/by-name/co/cocogitto/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cocogitto";
-  version = "6.3.0";
+  version = "6.5.0";
 
   src = fetchFromGitHub {
     owner = "oknozor";
     repo = "cocogitto";
     tag = version;
-    hash = "sha256-ij5vpIpqCYGNPNWPY47rWmMLEgBh+wtVmLRt11S14rE=";
+    hash = "sha256-aAVoPPeuJN6QPcuc3oBF93dP6U+74bAoSDw93XR01Vo=";
   };
 
-  cargoHash = "sha256-wfq1W9zjC0phPUr6SaLv8Ia5aQk/+1ujOTo0241X7AY=";
+  cargoHash = "sha256-yDpZHkRKsWXXHuSKnzhGrjsFLUFZEpC23tcU3FeUZK8=";
 
   # Test depend on git configuration that would likely exist in a normal user environment
   # and might be failing to create the test repository it works in.

From 0bdc7c415b27deff14ab884bfa6a90ce103dab8b Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Thu, 6 Nov 2025 14:43:10 +0100
Subject: [PATCH 5882/6226] chromium,chromedriver: 142.0.7444.59 ->
 142.0.7444.134

https://chromereleases.googleblog.com/2025/11/stable-channel-update-for-desktop.html

This update includes 5 security fixes.

CVEs:
CVE-2025-12725 CVE-2025-12726 CVE-2025-12727 CVE-2025-12728
CVE-2025-12729
---
 .../networking/browsers/chromium/info.json    | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 1725526143ae..1c0ee2a7a319 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -1,10 +1,10 @@
 {
   "chromium": {
-    "version": "142.0.7444.59",
+    "version": "142.0.7444.134",
     "chromedriver": {
-      "version": "142.0.7444.60",
-      "hash_darwin": "sha256-5Atr7h0jIneU4VbSF20j+3tcYVneYvqOsJ0GG8sD7r4=",
-      "hash_darwin_aarch64": "sha256-sh2BTEKJaAYbiuNYiSW6iChiCroo95EHoGqxVgX6Jw0="
+      "version": "142.0.7444.135",
+      "hash_darwin": "sha256-i34SR1pfHcAA4N4ppIioa7r33PnvY0OYA8/+U1bQFs8=",
+      "hash_darwin_aarch64": "sha256-dsbjEDkZ0AVghazgF5w9O3aUWZNSy8R9WiHn9m/Sa9g="
     },
     "deps": {
       "depot_tools": {
@@ -21,8 +21,8 @@
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "4b8153ab58d3c3f4c9f7e4baad9616ecf80db5fa",
-        "hash": "sha256-RZQD9aL/YglC8chM7tqtB1Y2u6DF+6kkgwklUohaBXc=",
+        "rev": "b6965f826881a60c51151cfc0a0175966a0a4e81",
+        "hash": "sha256-NTBQrGihsT7kuY/Mac5s4oH1xEn3CFEAR6eOEvZwmYs=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -132,8 +132,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "cee9cb0d67e749bf42f5e90cb3b8a6f525dbb920",
-        "hash": "sha256-loKRLJfTxBxlTbPVWZqGdx0DyPvEopbs2zIf4gaxoLo="
+        "rev": "95f9c2b375395cc82941babdf1e9f0cf60a32831",
+        "hash": "sha256-BFJsVt7hkSyyPQiX7QCN7Fu6CgTF/2xwAQbWCkJVq6M="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -257,8 +257,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "38cfe98a56a034da33ee62a5f1ea235fe47f58a7",
-        "hash": "sha256-bUJuFEDqgUFdMfmMyroX4s2ky/2n37PsTWaV+iQHCJg="
+        "rev": "f063edc91e3610a60fb9d486ae8694f2a11fcd17",
+        "hash": "sha256-qiucde85rKA7TefveIa++sOF+MzT56pe8pHUUCj9Zeo="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -807,8 +807,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "bb294624702efbb17691b642333f06bf5108e600",
-        "hash": "sha256-ovlKdiBYD9RAjA1XI0PLp/pt25LAvm3fn5AqWlJQfgs="
+        "rev": "4427aa4a9c14d3d542866c0ed2ae8a8554cfd68d",
+        "hash": "sha256-SL9YaplMFA1Ez11bIzAfl/F5qQob/PvCP1uknP1LiLs="
       }
     }
   },

From 7b234c74e082c457bfe1c62632dd1043c94da1fd Mon Sep 17 00:00:00 2001
From: Aliaksandr <grubian2@gmail.com>
Date: Thu, 6 Nov 2025 15:07:32 +0200
Subject: [PATCH 5883/6226] semiphemeral: drop

---
 pkgs/by-name/se/semiphemeral/package.nix | 38 ------------------------
 pkgs/top-level/aliases.nix               |  1 +
 2 files changed, 1 insertion(+), 38 deletions(-)
 delete mode 100644 pkgs/by-name/se/semiphemeral/package.nix

diff --git a/pkgs/by-name/se/semiphemeral/package.nix b/pkgs/by-name/se/semiphemeral/package.nix
deleted file mode 100644
index 90f419d35432..000000000000
--- a/pkgs/by-name/se/semiphemeral/package.nix
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  lib,
-  python3,
-  fetchPypi,
-}:
-
-python3.pkgs.buildPythonApplication rec {
-  pname = "semiphemeral";
-  version = "0.7";
-  pyproject = true;
-
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-KRi3zfRWGRZJjQ6KPqBI9wQ6yU8Ohx0TDtA5qoak35U=";
-  };
-
-  doCheck = false; # upstream has no tests
-
-  pythonImportsCheck = [ "semiphemeral" ];
-
-  build-system = with python3.pkgs; [ setuptools ];
-
-  dependencies = with python3.pkgs; [
-    click
-    sqlalchemy
-    flask
-    tweepy
-    colorama
-  ];
-
-  meta = with lib; {
-    description = "Automatically delete your old tweets, except for the ones you want to keep";
-    homepage = "https://github.com/micahflee/semiphemeral";
-    license = licenses.mit;
-    maintainers = with maintainers; [ amanjeev ];
-    mainProgram = "semiphemeral";
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f7f758a78104..a7d8ed11a8c8 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1351,6 +1351,7 @@ mapAliases {
   SDL2_classic_ttf = throw "'SDL2_classic_ttf' has been removed as part of the deprecation of 'SDL2_classic'. Consider upgrading to 'SDL2_ttf' built with 'sdl2-compat'."; # Added 2025-05-20
   seafile-server = throw "'seafile-server' has been removed as it is unmaintained"; # Added 2025-08-21
   seahub = throw "'seahub' has been removed as it is unmaintained"; # Added 2025-08-21
+  semiphemeral = throw "'semiphemeral' has been removed as it is archived upstream"; # Added 2025-11-06
   sequoia = throw "'sequoia' has been renamed to/replaced by 'sequoia-sq'"; # Converted to throw 2025-10-27
   session-desktop-appimage = throw "'session-desktop-appimage' has been renamed to/replaced by 'session-desktop'"; # Converted to throw 2025-10-27
   setserial = throw "'setserial' has been removed as it had been abandoned upstream"; # Added 2025-05-18

From 9dd3dd1d7b8c5daf39f00c8d3863a15da6b0c5ac Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 14:00:03 +0000
Subject: [PATCH 5884/6226] home-assistant-custom-lovelace-modules.card-mod:
 3.4.5 -> 3.4.6

---
 .../custom-lovelace-modules/card-mod/package.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix
index 2aa1a3ab3ab7..d11aa9a3adf9 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/card-mod/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "lovelace-card-mod";
-  version = "3.4.5";
+  version = "3.4.6";
 
   src = fetchFromGitHub {
     owner = "thomasloven";
     repo = "lovelace-card-mod";
     rev = "v${version}";
-    hash = "sha256-yd07C3/tpnoclrztWBAVwU6Ic2a4hY45xcjmgSp/uZA=";
+    hash = "sha256-eQwJOVpRy9MTILWrKSru90p+kKgRlIUBFhpeHrYX3X0=";
   };
 
-  npmDepsHash = "sha256-IjN0sBWa6y/j0x5XRvDU0F6kA9RTfKFlVsnqwBkgx2Q=";
+  npmDepsHash = "sha256-3KXu/RhDt0jzO9UJKRN3nOc/mm9tCOeQYGRGaCUv2wM=";
 
   installPhase = ''
     runHook preInstall

From 061ef6f35d31fedc67d28e5f93516f43ea3a0838 Mon Sep 17 00:00:00 2001
From: Thierry Delafontaine <delafthi@pm.me>
Date: Sun, 2 Nov 2025 14:37:05 +0000
Subject: [PATCH 5885/6226] opencode: 1.0.25 -> 1.0.35

---
 pkgs/by-name/op/opencode/hashes.json          |   8 +
 .../op/opencode/local-models-dev.patch        |  20 ++
 pkgs/by-name/op/opencode/package.nix          | 189 ++++++++++++------
 pkgs/by-name/op/opencode/skip-npm-pack.patch  |  24 +++
 4 files changed, 178 insertions(+), 63 deletions(-)
 create mode 100644 pkgs/by-name/op/opencode/hashes.json
 create mode 100644 pkgs/by-name/op/opencode/local-models-dev.patch
 create mode 100644 pkgs/by-name/op/opencode/skip-npm-pack.patch

diff --git a/pkgs/by-name/op/opencode/hashes.json b/pkgs/by-name/op/opencode/hashes.json
new file mode 100644
index 000000000000..ad76e9e5ed76
--- /dev/null
+++ b/pkgs/by-name/op/opencode/hashes.json
@@ -0,0 +1,8 @@
+{
+  "node_modules": {
+    "aarch64-linux": "sha256-nNzDvqsFLJdZYDjvuYAcohnGnqNiGiS1mI9zAeKPr/U=",
+    "x86_64-linux": "sha256-rrW97K4eNtW3gGxu49BdzL6p8/goHBi3IT6z0IcQY0A=",
+    "aarch64-darwin": "sha256-joKBnXYVtDiJeq7sdDZwseXdNIjXM6BO3RqLTvq8kTQ=",
+    "x86_64-darwin": "sha256-6hLqaOP6qxnkUPHsWvlD96SjXRrbqWLeExWwlRgrUdg="
+  }
+}
diff --git a/pkgs/by-name/op/opencode/local-models-dev.patch b/pkgs/by-name/op/opencode/local-models-dev.patch
new file mode 100644
index 000000000000..21ecd38fb0c8
--- /dev/null
+++ b/pkgs/by-name/op/opencode/local-models-dev.patch
@@ -0,0 +1,20 @@
+diff --git i/packages/opencode/src/provider/models-macro.ts w/packages/opencode/src/provider/models-macro.ts
+index 91a0348..4f60069 100644
+--- i/packages/opencode/src/provider/models-macro.ts
++++ w/packages/opencode/src/provider/models-macro.ts
+@@ -1,4 +1,15 @@
+ export async function data() {
++  const localApiJsonPath = process.env.MODELS_DEV_API_JSON
++  
++  // Try to read from local file if path is provided
++  if (localApiJsonPath) {
++    const localFile = Bun.file(localApiJsonPath)
++    if (await localFile.exists()) {
++      return await localFile.text()
++    }
++  }
++  
++  // Fallback to fetching from remote URL
+   const json = await fetch("https://models.dev/api.json").then((x) => x.text())
+   return json
+ }
diff --git a/pkgs/by-name/op/opencode/package.nix b/pkgs/by-name/op/opencode/package.nix
index 0e847d5b5306..1eb440b9b922 100644
--- a/pkgs/by-name/op/opencode/package.nix
+++ b/pkgs/by-name/op/opencode/package.nix
@@ -1,91 +1,158 @@
 {
   lib,
   stdenvNoCC,
-  fetchurl,
-  autoPatchelfHook,
-  common-updater-scripts,
-  curl,
-  installShellFiles,
-  jq,
-  unzip,
+  bun,
+  fetchFromGitHub,
+  fzf,
+  makeBinaryWrapper,
+  models-dev,
+  nix-update-script,
+  ripgrep,
   testers,
-  writeShellScript,
+  writableTmpDirAsHomeHook,
 }:
+
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "opencode";
-  version = "1.0.25";
+  version = "1.0.35";
+  src = fetchFromGitHub {
+    owner = "sst";
+    repo = "opencode";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-0IFlFWMPu9ynrpu/bYJK2xOgZc+lCSQOSV2WfD0KY3w=";
+  };
 
-  src =
-    finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}
-      or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}");
-  sourceRoot = ".";
+  node_modules = stdenvNoCC.mkDerivation {
+    pname = "opencode-node_modules";
+    inherit (finalAttrs) version src;
+
+    impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [
+      "GIT_PROXY_COMMAND"
+      "SOCKS_SERVER"
+    ];
+
+    nativeBuildInputs = [
+      bun
+      writableTmpDirAsHomeHook
+    ];
+
+    dontConfigure = true;
+
+    buildPhase = ''
+      runHook preBuild
+
+      export BUN_INSTALL_CACHE_DIR=$(mktemp -d)
+
+      # NOTE: Without `--linker=hoisted` the necessary platform specific packages are not created, i.e. `@parcel/watcher-<os>-<arch>` and `@opentui/core-<os>-<arch>`
+      bun install \
+        --filter=./packages/opencode \
+        --force \
+        --frozen-lockfile \
+        --ignore-scripts \
+        --linker=hoisted \
+        --no-progress \
+        --production
+
+      runHook postBuild
+    '';
+
+    installPhase = ''
+      runHook preInstall
+
+      mkdir -p $out/node_modules
+      cp -R ./node_modules $out
+
+      runHook postInstall
+    '';
+
+    # NOTE: Required else we get errors that our fixed-output derivation references store paths
+    dontFixup = true;
+
+    outputHash = (lib.importJSON ./hashes.json).node_modules.${stdenvNoCC.hostPlatform.system};
+    outputHashAlgo = "sha256";
+    outputHashMode = "recursive";
+  };
 
-  strictDeps = true;
   nativeBuildInputs = [
-    unzip
-    installShellFiles
-  ]
-  ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ autoPatchelfHook ];
+    bun
+    makeBinaryWrapper
+    models-dev
+  ];
+
+  patches = [
+    # NOTE: Patch `packages/opencode/src/provider/models-macro.ts` to get contents of
+    # `_api.json` from the file bundled with `bun build`.
+    ./local-models-dev.patch
+    # NOTE: Skip npm pack commands in build.ts since packages are already in node_modules
+    ./skip-npm-pack.patch
+  ];
+
+  configurePhase = ''
+    runHook preConfigure
+
+    cd packages/opencode
+    cp -R ${finalAttrs.node_modules}/. .
+
+    chmod -R u+w ./node_modules
+    # Make symlinks absolute to avoid issues with bun build
+    rm ./node_modules/@opencode-ai/script
+    ln -s $(pwd)/../../packages/script ./node_modules/@opencode-ai/script
+    rm -f ./node_modules/@opencode-ai/sdk
+    ln -s $(pwd)/../../packages/sdk/js ./node_modules/@opencode-ai/sdk
+    rm -f ./node_modules/@opencode-ai/plugin
+    ln -s $(pwd)/../../packages/plugin ./node_modules/@opencode-ai/plugin
+
+    runHook postConfigure
+  '';
+
+  env.MODELS_DEV_API_JSON = "${models-dev}/dist/_api.json";
+  env.OPENCODE_VERSION = finalAttrs.version;
+  env.OPENCODE_CHANNEL = "stable";
+
+  buildPhase = ''
+    runHook preBuild
+
+    bun run ./script/build.ts --single
+
+    runHook postBuild
+  '';
 
-  dontConfigure = true;
-  dontBuild = true;
   dontStrip = true;
 
   installPhase = ''
     runHook preInstall
 
-    install -Dm 755 ./opencode $out/bin/opencode
+    install -Dm755 dist/opencode-*/bin/opencode $out/bin/opencode
 
     runHook postInstall
   '';
 
+  postInstall = ''
+    wrapProgram $out/bin/opencode \
+      --prefix PATH : ${
+        lib.makeBinPath [
+          fzf
+          ripgrep
+        ]
+      }
+  '';
+
   passthru = {
-    sources = {
-      "aarch64-darwin" = fetchurl {
-        url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-darwin-arm64.zip";
-        hash = "sha256-z/TMgr1OVQi69lcrhV8sxPzlZp3t2dHA2b0C2JXeMFg=";
-      };
-      "aarch64-linux" = fetchurl {
-        url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-linux-arm64.zip";
-        hash = "sha256-C7bjxmzLetc2Y0vN8P3mhvzaa5ZBZxTBtfRYiv5q8Zg=";
-      };
-      "x86_64-darwin" = fetchurl {
-        url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-darwin-x64.zip";
-        hash = "sha256-Xv4TJbrn86v/BBPCZu2DdrTP+WLkroizNvLtNSOrxvk=";
-      };
-      "x86_64-linux" = fetchurl {
-        url = "https://github.com/sst/opencode/releases/download/v${finalAttrs.version}/opencode-linux-x64.zip";
-        hash = "sha256-ESsmlnFvmEPggRYOiacg3tGifWw8UQQP+ZGDcDCsCq4=";
-      };
-    };
     tests.version = testers.testVersion {
       package = finalAttrs.finalPackage;
       command = "HOME=$(mktemp -d) opencode --version";
       inherit (finalAttrs) version;
     };
-    updateScript = writeShellScript "update-opencode" ''
-      set -o errexit
-      export PATH="${
-        lib.makeBinPath [
-          curl
-          jq
-          common-updater-scripts
-        ]
-      }"
-      NEW_VERSION=$(curl --silent https://api.github.com/repos/sst/opencode/releases/latest | jq '.tag_name | ltrimstr("v")' --raw-output)
-      if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then
-          echo "No update available."
-          exit 0
-      fi
-      for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do
-        update-source-version "opencode" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform"
-      done
-    '';
+    updateScript = nix-update-script {
+      extraArgs = [
+        "--subpackage"
+        "node_modules"
+      ];
+    };
   };
 
   meta = {
     description = "AI coding agent built for the terminal";
-    changelog = "https://github.com/sst/opencode/releases/tag/v${finalAttrs.version}";
     longDescription = ''
       OpenCode is a terminal-based agent that can build anything.
       It combines a TypeScript/JavaScript core with a Go-based TUI
@@ -93,11 +160,7 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     '';
     homepage = "https://github.com/sst/opencode";
     license = lib.licenses.mit;
-    platforms = builtins.attrNames finalAttrs.passthru.sources;
-    maintainers = with lib.maintainers; [
-      zestsystem
-      delafthi
-    ];
+    platforms = lib.platforms.unix;
     mainProgram = "opencode";
   };
 })
diff --git a/pkgs/by-name/op/opencode/skip-npm-pack.patch b/pkgs/by-name/op/opencode/skip-npm-pack.patch
new file mode 100644
index 000000000000..cdb93c3f82fa
--- /dev/null
+++ b/pkgs/by-name/op/opencode/skip-npm-pack.patch
@@ -0,0 +1,24 @@
+diff --git i/packages/opencode/script/build.ts w/packages/opencode/script/build.ts
+index 4ce8bfba..5b3da591 100755
+--- i/packages/opencode/script/build.ts
++++ w/packages/opencode/script/build.ts
+@@ -39,17 +39,9 @@ for (const [os, arch] of targets) {
+   const name = `${pkg.name}-${os}-${arch}`
+   await $`mkdir -p dist/${name}/bin`
+ 
+-  const opentui = `@opentui/core-${os === "windows" ? "win32" : os}-${arch.replace("-baseline", "")}`
+-  await $`mkdir -p ../../node_modules/${opentui}`
+-  await $`npm pack ${opentui}@${pkg.dependencies["@opentui/core"]}`.cwd(
+-    path.join(dir, "../../node_modules"),
+-  )
+-  await $`tar -xf ../../node_modules/${opentui.replace("@opentui/", "opentui-")}-*.tgz -C ../../node_modules/${opentui} --strip-components=1`
++  // Skip npm pack - packages already installed in node_modules by Nix
+ 
+-  const watcher = `@parcel/watcher-${os === "windows" ? "win32" : os}-${arch.replace("-baseline", "")}${os === "linux" ? "-glibc" : ""}`
+-  await $`mkdir -p ../../node_modules/${watcher}`
+-  await $`npm pack ${watcher}`.cwd(path.join(dir, "../../node_modules")).quiet()
+-  await $`tar -xf ../../node_modules/${watcher.replace("@parcel/", "parcel-")}-*.tgz -C ../../node_modules/${watcher} --strip-components=1`
++  // Skip npm pack - packages already installed in node_modules by Nix
+ 
+   const parserWorker = fs.realpathSync(
+     path.resolve(dir, "./node_modules/@opentui/core/parser.worker.js"),

From 4658d0d5a3affe8457c74351bf012fc9e17fa417 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 6 Nov 2025 11:15:48 +0100
Subject: [PATCH 5886/6226] ci/github-script/bot: fix needs reviewer label

The recent change to use the result of requesting reviewers for setting
the `needs: reviewer` label caused a regression: It would not set the
label for PRs where no reviewers were requested, because *too many were
eligible*. Still - these PRs don't have reviewers, so they need
attention otherwise - via the label.
---
 ci/github-script/reviewers.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/ci/github-script/reviewers.js b/ci/github-script/reviewers.js
index 2ac0d346f369..c5f79c11d992 100644
--- a/ci/github-script/reviewers.js
+++ b/ci/github-script/reviewers.js
@@ -64,14 +64,6 @@ async function handleReviewers({
   ).filter(Boolean)
   log('reviewers - reviewers', reviewers.join(', '))
 
-  if (reviewers.length > 15) {
-    log(
-      `Too many reviewers (${reviewers.join(', ')}), skipping review requests.`,
-    )
-    // false indicates, that we do have reviewers and don't need the "needs: reviewers" label.
-    return false
-  }
-
   const requested_reviewers = new Set(
     pull_request.requested_reviewers.map(({ login }) => login),
   )
@@ -88,6 +80,14 @@ async function handleReviewers({
     Array.from(existing_reviewers).join(', '),
   )
 
+  if (reviewers.length > 15) {
+    log(
+      `Too many reviewers (${reviewers.join(', ')}), skipping review requests.`,
+    )
+    // Return a boolean on whether the "needs: reviewers" label should be set.
+    return existing_reviewers.size === 0 && requested_reviewers.size === 0
+  }
+
   const non_requested_reviewers = new Set(reviewers)
     .difference(requested_reviewers)
     // We don't want to rerequest reviews from people who already reviewed.
@@ -117,7 +117,7 @@ async function handleReviewers({
 
   // Return a boolean on whether the "needs: reviewers" label should be set.
   return (
-    new_reviewers.size === 0 &&
+    non_requested_reviewers.size === 0 &&
     existing_reviewers.size === 0 &&
     requested_reviewers.size === 0
   )

From d086c6c6b3f8b2661596f1d424871601e7c5a96f Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 6 Nov 2025 12:51:46 +0100
Subject: [PATCH 5887/6226] ci/github-script/merge: add hint about stuck GitHub

Unfortunately it still happens frequently that, after enabling
auto-merge, GitHub is stuck even though all checks have passed, and
doesn't merge the PR. Any contributor can trigger GitHub again with an
approval of the PR - this will then immediately queue the PR for merge.

Adding a hint to the posted comment, should help users through this
without my intervention.
---
 ci/github-script/merge.js | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index 688a7928fe97..deb2b5bdabba 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -182,7 +182,9 @@ async function handleMerge({
         }`,
         { node_id: pull_request.node_id, sha: pull_request.head.sha },
       )
-      return `[Queued](${resp.enqueuePullRequest.mergeQueueEntry.mergeQueue.url}) for merge`
+      return [
+        `:heavy_check_mark: [Queued](${resp.enqueuePullRequest.mergeQueueEntry.mergeQueue.url}) for merge (#306934)`,
+      ]
     } catch (e) {
       log('Enqueing failed', e.response.errors[0].message)
     }
@@ -201,7 +203,12 @@ async function handleMerge({
         }`,
         { node_id: pull_request.node_id, sha: pull_request.head.sha },
       )
-      return 'Enabled Auto Merge'
+      return [
+        `:heavy_check_mark: Enabled Auto Merge (#306934)`,
+        '',
+        '> [!TIP]',
+        '> Sometimes GitHub gets stuck after enabling Auto Merge. In this case, leaving another approval should trigger the merge.',
+      ]
     } catch (e) {
       log('Auto Merge failed', e.response.errors[0].message)
       throw new Error(e.response.errors[0].message)
@@ -287,7 +294,7 @@ async function handleMerge({
     if (result) {
       await react('ROCKET')
       try {
-        body.push(`:heavy_check_mark: ${await merge()} (#306934)`)
+        body.push(...(await merge()))
       } catch (e) {
         // Remove the HTML comment with node_id reference to allow retrying this merge on the next run.
         body.shift()

From 9769386e388f860b6aac078ec2a39944f892fb86 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 6 Nov 2025 22:22:54 +0800
Subject: [PATCH 5888/6226] pantheon.elementary-code: 8.1.1 -> 8.1.2

https://github.com/elementary/code/compare/8.1.1...8.1.2
---
 pkgs/desktops/pantheon/apps/elementary-code/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/pantheon/apps/elementary-code/default.nix b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
index 0dc979e18b85..faf3de7c06c5 100644
--- a/pkgs/desktops/pantheon/apps/elementary-code/default.nix
+++ b/pkgs/desktops/pantheon/apps/elementary-code/default.nix
@@ -26,13 +26,13 @@
 
 stdenv.mkDerivation rec {
   pname = "elementary-code";
-  version = "8.1.1";
+  version = "8.1.2";
 
   src = fetchFromGitHub {
     owner = "elementary";
     repo = "code";
-    rev = version;
-    hash = "sha256-4IGun7MnrMRmpXD0Kxm/ND4C3pFVhjHqDeP6jUmRg7k=";
+    tag = version;
+    hash = "sha256-DZ6smq339VgR33jQm0OFD9CM8sQ0Rz7aHKL1EWFSyBM=";
   };
 
   strictDeps = true;

From bd4649bdd3ec1c3721ab14636e99a5b7baa71af9 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 6 Nov 2025 11:25:21 -0300
Subject: [PATCH 5889/6226] maintainers: drop redbaron

---
 maintainers/maintainer-list.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index dd6c6b13881e..c0aef881becd 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -21762,12 +21762,6 @@
       { fingerprint = "01D7 5486 3A6D 64EA AC77 0D26 FBF1 9A98 2CCE 0048"; }
     ];
   };
-  redbaron = {
-    email = "ivanov.maxim@gmail.com";
-    github = "redbaron";
-    githubId = 16624;
-    name = "Maxim Ivanov";
-  };
   redfish64 = {
     email = "engler@gmail.com";
     github = "redfish64";

From 5652eea9258880d16612231a319d6b90111411ad Mon Sep 17 00:00:00 2001
From: Philip Taron <philip.taron@gmail.com>
Date: Thu, 6 Nov 2025 06:26:13 -0800
Subject: [PATCH 5890/6226] cinny-desktop: 4.10.1 -> 4.10.2

Diff: https://github.com/cinnyapp/cinny-desktop/compare/v4.10.1...v4.10.2

Changelog: https://github.com/cinnyapp/cinny/releases/tag/v4.10.2
---
 pkgs/by-name/ci/cinny-desktop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix
index 81d2b034dad9..d5c1082760ab 100644
--- a/pkgs/by-name/ci/cinny-desktop/package.nix
+++ b/pkgs/by-name/ci/cinny-desktop/package.nix
@@ -18,18 +18,18 @@
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "cinny-desktop";
   # We have to be using the same version as cinny-web or this isn't going to work.
-  version = "4.10.1";
+  version = "4.10.2";
 
   src = fetchFromGitHub {
     owner = "cinnyapp";
     repo = "cinny-desktop";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-SUbEanFIvjj2wyy/nuq+91F5on7wuLWcpVt1U8XWjRI=";
+    hash = "sha256-M1p8rwdNEsKvZ1ssxsFyfiIBS8tKrXhuz85CKM4dSRw=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/src-tauri";
 
-  cargoHash = "sha256-NL5vsuSNKduRW2TaXWFA0pjszVa8EYU5cRaTZHCooLU=";
+  cargoHash = "sha256-Ie6xq21JoJ37j/BjdVrsiJ3JULVEV5ZwN3hf9NhfXVA=";
 
   postPatch =
     let

From e408ece5b3636cdca413be82c717a343b08563d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 14:27:42 +0000
Subject: [PATCH 5891/6226] dart-sass: 1.93.2 -> 1.93.3

---
 pkgs/by-name/da/dart-sass/package.nix       |  4 +--
 pkgs/by-name/da/dart-sass/pubspec.lock.json | 38 ++++++++++-----------
 2 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix
index c925ed3be313..5f1408dd8477 100644
--- a/pkgs/by-name/da/dart-sass/package.nix
+++ b/pkgs/by-name/da/dart-sass/package.nix
@@ -23,13 +23,13 @@ let
 in
 buildDartApplication rec {
   pname = "dart-sass";
-  version = "1.93.2";
+  version = "1.93.3";
 
   src = fetchFromGitHub {
     owner = "sass";
     repo = "dart-sass";
     tag = version;
-    hash = "sha256-YE4s0um3WR6N0KsXgLjvoiqjr8dQg8WOyZRbfoZlbqE=";
+    hash = "sha256-I51wpm2HmeuXk0F9O1uTvFA5Hk8sAs+JsumW+N3EPXA=";
   };
 
   pubspecLock = lib.importJSON ./pubspec.lock.json;
diff --git a/pkgs/by-name/da/dart-sass/pubspec.lock.json b/pkgs/by-name/da/dart-sass/pubspec.lock.json
index 30e98a706e5a..c880ab758599 100644
--- a/pkgs/by-name/da/dart-sass/pubspec.lock.json
+++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json
@@ -4,21 +4,21 @@
       "dependency": "transitive",
       "description": {
         "name": "_fe_analyzer_shared",
-        "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f",
+        "sha256": "c209688d9f5a5f26b2fb47a188131a6fb9e876ae9e47af3737c0b4f58a93470d",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "85.0.0"
+      "version": "91.0.0"
     },
     "analyzer": {
       "dependency": "direct dev",
       "description": {
         "name": "analyzer",
-        "sha256": "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d",
+        "sha256": "f51c8499b35f9b26820cfe914828a6a98a94efd5cc78b37bb7d03debae3a1d08",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "7.7.1"
+      "version": "8.4.1"
     },
     "archive": {
       "dependency": "direct dev",
@@ -154,11 +154,11 @@
       "dependency": "direct dev",
       "description": {
         "name": "crypto",
-        "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855",
+        "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.0.6"
+      "version": "3.0.7"
     },
     "csslib": {
       "dependency": "transitive",
@@ -184,21 +184,21 @@
       "dependency": "transitive",
       "description": {
         "name": "dart_style",
-        "sha256": "8a0e5fba27e8ee025d2ffb4ee820b4e6e2cf5e4246a6b1a477eb66866947e0bb",
+        "sha256": "c87dfe3d56f183ffe9106a18aebc6db431fc7c98c31a54b952a77f3d54a85697",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "3.1.1"
+      "version": "3.1.2"
     },
     "dartdoc": {
       "dependency": "direct dev",
       "description": {
         "name": "dartdoc",
-        "sha256": "f978526530e42dbb831295af743c057d94533e89c27ce1f4023b252f3d85b8be",
+        "sha256": "73335ae67d2766ff753dc78b0f33ceb399ba5b94a5cfe8ce8d4128fb631717ee",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "8.3.4"
+      "version": "9.0.0"
     },
     "ffi": {
       "dependency": "transitive",
@@ -434,11 +434,11 @@
       "dependency": "transitive",
       "description": {
         "name": "oauth2",
-        "sha256": "c84470642cbb2bec450ccab2f8520c079cd1ca546a76ffd5c40589e07f4e8bf4",
+        "sha256": "890a032ba1b44fa8dcfeba500e613df0ecbe16aeace13bb0fe1d25eb42cda5b8",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "2.0.3"
+      "version": "2.0.5"
     },
     "package_config": {
       "dependency": "direct main",
@@ -484,21 +484,21 @@
       "dependency": "direct main",
       "description": {
         "name": "protobuf",
-        "sha256": "de9c9eb2c33f8e933a42932fe1dc504800ca45ebc3d673e6ed7f39754ee4053e",
+        "sha256": "2fcc8a202ca7ec17dab7c97d6b6d91cf03aa07fe6f65f8afbb6dfa52cc5bd902",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "4.2.0"
+      "version": "5.1.0"
     },
     "protoc_plugin": {
       "dependency": "direct dev",
       "description": {
         "name": "protoc_plugin",
-        "sha256": "5bf4289e0fa9eec4b0ee4e77111fa47fa2e6b54b2a7b9c2e83ec87a971542f01",
+        "sha256": "c3893590d5b81345dfd4daa25c1890092667983fd4374bb6671b2a9a481d8359",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "22.5.0"
+      "version": "23.0.0"
     },
     "pub_api_client": {
       "dependency": "direct dev",
@@ -744,11 +744,11 @@
       "dependency": "direct main",
       "description": {
         "name": "watcher",
-        "sha256": "5bf046f41320ac97a469d506261797f35254fa61c641741ef32dacda98b7d39c",
+        "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a",
         "url": "https://pub.dev"
       },
       "source": "hosted",
-      "version": "1.1.3"
+      "version": "1.1.4"
     },
     "web": {
       "dependency": "transitive",
@@ -812,6 +812,6 @@
     }
   },
   "sdks": {
-    "dart": ">=3.8.0 <4.0.0"
+    "dart": ">=3.9.0 <4.0.0"
   }
 }

From e5769557a2440e58e8cf6111273df81b59543ac0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 14:28:00 +0000
Subject: [PATCH 5892/6226] terraform-providers.aliyun_alicloud: 1.261.0 ->
 1.262.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 c979937782d0..379bfc68691a 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -45,13 +45,13 @@
     "vendorHash": "sha256-2dGMtSLIiBuhZt4XmcBGfkghU4kCsMsiRFWKMbdmSB8="
   },
   "aliyun_alicloud": {
-    "hash": "sha256-OTKcssJpAO/8AQ8LuVxZTWM2iVi0W0HriD77jc6u7Fs=",
+    "hash": "sha256-4dj49kVEPPFfd8N86L5czVOpdCkE4H7OKnIzZY8pMv4=",
     "homepage": "https://registry.terraform.io/providers/aliyun/alicloud",
     "owner": "aliyun",
     "repo": "terraform-provider-alicloud",
-    "rev": "v1.261.0",
+    "rev": "v1.262.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-f+Btkbc6e90W1VgYAMDq2CG4XhpKmJhKm/mv1r9DYpA="
+    "vendorHash": "sha256-GvnQrgczdnxpWCq8/vHcpcKeYf8v+GU/edx2CgPA/40="
   },
   "aminueza_minio": {
     "hash": "sha256-snQZbGdHTY41aA6iK0PFO5SJ958xnsWPPLGv+H9uV2Y=",

From a793425d9c10947653cdfe522e927a94ca764f01 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 14:56:27 +0000
Subject: [PATCH 5893/6226] cue: 0.14.2 -> 0.15.0

---
 pkgs/by-name/cu/cue/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix
index ded451de75f0..ee2c8a058abf 100644
--- a/pkgs/by-name/cu/cue/package.nix
+++ b/pkgs/by-name/cu/cue/package.nix
@@ -10,16 +10,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "cue";
-  version = "0.14.2";
+  version = "0.15.0";
 
   src = fetchFromGitHub {
     owner = "cue-lang";
     repo = "cue";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-RK06DHCR2ugz6WhythvVfb1WUn7QyHPK8vaUNWVAd+Q=";
+    hash = "sha256-yyvIjaOElEHR75o+DgVOG1EklXaWGdjvv15iMvfbkeA=";
   };
 
-  vendorHash = "sha256-wVeNMw6AZS1wT+KnaZBGOfBxrKzmfQSXeZWcYiLKMQ4=";
+  vendorHash = "sha256-ivFw62+pg503EEpRsdGSQrFNah87RTUrRXUSPZMFLG4=";
 
   subPackages = [ "cmd/*" ];
 

From 684545ccdafdcd88c11e3f7c3d0d1b5379f31688 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Thu, 6 Nov 2025 15:48:36 +0100
Subject: [PATCH 5894/6226] rocmPackages.meta.release-packagePlatforms:
 regenerate

The list should have been regenerated after adding ROCm support to
onnxruntime, but apparently we forgot.

This will make hydra build the ROCm-flavored Firefox package.

Fixes: #459100
---
 .../rocm-modules/6/release-attrPaths.json     | 152 +++++++++---------
 1 file changed, 77 insertions(+), 75 deletions(-)

diff --git a/pkgs/development/rocm-modules/6/release-attrPaths.json b/pkgs/development/rocm-modules/6/release-attrPaths.json
index 20e3a90e7450..82c540a1e17a 100644
--- a/pkgs/development/rocm-modules/6/release-attrPaths.json
+++ b/pkgs/development/rocm-modules/6/release-attrPaths.json
@@ -3,25 +3,20 @@
   "attrPaths": [
     "adaptivecpp",
     "adios2",
+    "adoptopenjdk-icedtea-web",
     "aider-chat-full",
     "aider-chat-with-help",
-    "aligator",
+    "aitrack",
     "alpaca",
     "ants",
     "appcsxcad",
     "arpack-mpi",
     "backgroundremover",
     "beets",
-    "beets-unstable",
-    "beetsPackages.beets",
-    "beetsPackages.beets-stable",
-    "beetsPackages.beets-unstable",
-    "bonmin",
     "btop",
     "btop-cuda",
     "c3d",
     "calibre",
-    "casadi",
     "catalyst",
     "chatd",
     "cloudcompare",
@@ -29,26 +24,32 @@
     "costa",
     "cp2k",
     "crewai",
-    "crocoddyl",
+    "crow-translate",
     "csxcad",
-    "dartsim",
     "dbcsr",
+    "deface",
     "dl-poly-classic-mpi",
-    "docling",
-    "docling-serve",
     "dolfinx",
     "dtcmp",
     "easyocr",
     "elastix",
     "elmerfem",
     "elpa",
+    "envision",
     "exhibit",
     "exo",
-    "expliot",
     "ezminc",
     "f3d",
     "ffmpeg_8-full",
     "fftwMpi",
+    "firefox",
+    "firefox-beta",
+    "firefox-beta-unwrapped",
+    "firefox-devedition",
+    "firefox-devedition-unwrapped",
+    "firefox-mobile",
+    "firefox-unwrapped",
+    "firefoxpwa",
     "freecad",
     "frigate",
     "galene-stt",
@@ -58,7 +59,6 @@
     "gromacsDoubleMpi",
     "gromacsMpi",
     "hashcat",
-    "haskellPackages.casadi-bindings-internal",
     "haskellPackages.mpi-hs",
     "haskellPackages.mpi-hs-binary",
     "haskellPackages.mpi-hs-cereal",
@@ -72,10 +72,9 @@
     "hpl",
     "hypre",
     "hyprpanel",
+    "ieda",
     "immich-machine-learning",
-    "intensity-normalization",
     "ior",
-    "ipopt",
     "itk",
     "itk_5",
     "itk_5_2",
@@ -87,43 +86,50 @@
     "libcircle",
     "libmbd",
     "libretranslate",
+    "librewolf",
+    "librewolf-unwrapped",
     "libsupermesh",
     "libvdwxc",
+    "livecaptions",
     "llama-cpp",
     "llama-cpp-vulkan",
     "lwgrp",
+    "maa-assistant-arknights",
+    "maa-cli",
+    "magika",
     "migrate",
-    "mim-solvers",
+    "minari",
     "mirtk",
     "mlflow-server",
     "mokuro",
+    "monado",
     "mpi",
     "mpifileutils",
     "mrtrix",
-    "mumps",
     "mumps-mpi",
-    "ndcurves",
     "nest-mpi",
     "netcdf-mpi",
     "netgen",
     "neuron-mpi",
     "newelle",
     "nwchem",
+    "obs-studio-plugins.obs-backgroundremoval",
     "octavePackages.dicom",
     "octopus",
     "ollama",
+    "onnxruntime",
     "openai-whisper",
     "openems",
     "openmpi",
+    "openseeface",
     "opensplat",
-    "openturns",
+    "opentrack",
     "otb",
     "owocr",
     "p4est",
     "p4est-dbg",
     "p4est-sc",
     "p4est-sc-dbg",
-    "pagmo2",
     "paraview",
     "parmmg",
     "pcl",
@@ -131,18 +137,16 @@
     "petsc",
     "pfft",
     "pianotrans",
-    "pinocchio",
+    "piper-phonemize",
     "piper-tts",
     "pitivi",
     "pnetcdf",
     "pnfft",
     "precice",
-    "proxsuite-nlp",
     "python3Packages.accelerate",
     "python3Packages.adios2",
-    "python3Packages.aerosandbox",
     "python3Packages.albumentations",
-    "python3Packages.aligator",
+    "python3Packages.ale-py",
     "python3Packages.anndata",
     "python3Packages.apptools",
     "python3Packages.apricot-select",
@@ -156,13 +160,15 @@
     "python3Packages.baselines",
     "python3Packages.beetcamp",
     "python3Packages.beets",
+    "python3Packages.beets-audible",
     "python3Packages.bitsandbytes",
     "python3Packages.blackjax",
     "python3Packages.blosc2",
     "python3Packages.botorch",
+    "python3Packages.brax",
     "python3Packages.captum",
-    "python3Packages.casadi",
     "python3Packages.catalyst",
+    "python3Packages.chromadb",
     "python3Packages.clean-fid",
     "python3Packages.cleanvision",
     "python3Packages.clip",
@@ -173,40 +179,31 @@
     "python3Packages.compressed-tensors",
     "python3Packages.conduit-mpi",
     "python3Packages.crewai",
-    "python3Packages.crocoddyl",
     "python3Packages.ctranslate2",
     "python3Packages.curated-transformers",
     "python3Packages.cut-cross-entropy",
     "python3Packages.cvxpy",
-    "python3Packages.cyipopt",
-    "python3Packages.dartsim",
+    "python3Packages.dalle-mini",
     "python3Packages.dask-mpi",
-    "python3Packages.dcmstack",
     "python3Packages.dctorch",
     "python3Packages.deepdish",
+    "python3Packages.deepface",
     "python3Packages.deepsearch-toolkit",
     "python3Packages.deepwave",
-    "python3Packages.deid",
     "python3Packages.depyf",
     "python3Packages.detectron2",
-    "python3Packages.dicom-numpy",
     "python3Packages.dicom2nifti",
-    "python3Packages.dicomweb-client",
     "python3Packages.diffusers",
-    "python3Packages.dipy",
-    "python3Packages.docling",
+    "python3Packages.dm-sonnet",
     "python3Packages.docling-core",
     "python3Packages.docling-ibm-models",
-    "python3Packages.docling-jobkit",
-    "python3Packages.docling-mcp",
-    "python3Packages.docling-parse",
-    "python3Packages.docling-serve",
     "python3Packages.easyocr",
+    "python3Packages.edward",
     "python3Packages.effdet",
     "python3Packages.einops",
     "python3Packages.encodec",
     "python3Packages.envisage",
-    "python3Packages.example-robot-data",
+    "python3Packages.evosax",
     "python3Packages.experiment-utilities",
     "python3Packages.ezyrb",
     "python3Packages.f3d",
@@ -214,6 +211,7 @@
     "python3Packages.fairscale",
     "python3Packages.fast-simplification",
     "python3Packages.fastai",
+    "python3Packages.fastembed",
     "python3Packages.faster-whisper",
     "python3Packages.fastmri",
     "python3Packages.fenics-dolfinx",
@@ -221,8 +219,8 @@
     "python3Packages.finetuning-scheduler",
     "python3Packages.firedrake",
     "python3Packages.flammkuchen",
+    "python3Packages.flax",
     "python3Packages.flyingsquid",
-    "python3Packages.fslpy",
     "python3Packages.funsor",
     "python3Packages.fvcore",
     "python3Packages.gdcm",
@@ -239,17 +237,15 @@
     "python3Packages.graphtage",
     "python3Packages.gstools",
     "python3Packages.guidance",
+    "python3Packages.gymnasium",
     "python3Packages.h5io",
     "python3Packages.h5py-mpi",
-    "python3Packages.heudiconv",
-    "python3Packages.highdicom",
     "python3Packages.holistic-trace-analysis",
     "python3Packages.hyper-connections",
     "python3Packages.ignite",
     "python3Packages.imagededup",
     "python3Packages.imgcat",
     "python3Packages.insightface",
-    "python3Packages.intensity-normalization",
     "python3Packages.invisible-watermark",
     "python3Packages.iopath",
     "python3Packages.itk",
@@ -257,14 +253,16 @@
     "python3Packages.julius",
     "python3Packages.k-diffusion",
     "python3Packages.kahip",
-    "python3Packages.kokoro",
+    "python3Packages.keras",
     "python3Packages.kornia",
     "python3Packages.kornia-rs",
     "python3Packages.kserve",
     "python3Packages.lacuscore",
     "python3Packages.lancedb",
+    "python3Packages.langchain-chroma",
     "python3Packages.langchain-huggingface",
     "python3Packages.layoutparser",
+    "python3Packages.lerobot",
     "python3Packages.libretranslate",
     "python3Packages.librosa",
     "python3Packages.libsupermesh",
@@ -291,7 +289,6 @@
     "python3Packages.llama-index-multi-modal-llms-openai",
     "python3Packages.llama-index-node-parser-docling",
     "python3Packages.llama-index-readers-database",
-    "python3Packages.llama-index-readers-docling",
     "python3Packages.llama-index-readers-file",
     "python3Packages.llama-index-readers-json",
     "python3Packages.llama-index-readers-llama-parse",
@@ -309,6 +306,7 @@
     "python3Packages.llm-sentence-transformers",
     "python3Packages.lm-eval",
     "python3Packages.local-attention",
+    "python3Packages.magika",
     "python3Packages.manga-ocr",
     "python3Packages.manifest-ml",
     "python3Packages.markitdown",
@@ -318,7 +316,9 @@
     "python3Packages.medvol",
     "python3Packages.meep",
     "python3Packages.meshtastic",
+    "python3Packages.mhcflurry",
     "python3Packages.mim-solvers",
+    "python3Packages.minari",
     "python3Packages.mlcroissant",
     "python3Packages.mlflow",
     "python3Packages.mmcv",
@@ -329,25 +329,18 @@
     "python3Packages.monty",
     "python3Packages.mpi-pytest",
     "python3Packages.mpi4py",
+    "python3Packages.mtcnn",
     "python3Packages.napari-nifti",
-    "python3Packages.ndcurves",
     "python3Packages.nest",
     "python3Packages.netgen-mesher",
-    "python3Packages.neuralfoil",
     "python3Packages.neuronpy",
     "python3Packages.nianet",
-    "python3Packages.nibabel",
     "python3Packages.nifty8",
-    "python3Packages.nilearn",
-    "python3Packages.nipy",
-    "python3Packages.nipype",
-    "python3Packages.nitime",
-    "python3Packages.nitransforms",
-    "python3Packages.niworkflows",
     "python3Packages.noisereduce",
+    "python3Packages.onnxruntime",
     "python3Packages.open-clip-torch",
     "python3Packages.openai-whisper",
-    "python3Packages.openturns",
+    "python3Packages.opencv4Full",
     "python3Packages.optimum",
     "python3Packages.optuna",
     "python3Packages.optuna-dashboard",
@@ -363,33 +356,27 @@
     "python3Packages.peft",
     "python3Packages.pepit",
     "python3Packages.petsc4py",
+    "python3Packages.petsctools",
+    "python3Packages.pettingzoo",
     "python3Packages.pgmpy",
     "python3Packages.piano-transcription-inference",
-    "python3Packages.pinocchio",
+    "python3Packages.piper-phonemize",
     "python3Packages.pomegranate",
-    "python3Packages.proxsuite-nlp",
     "python3Packages.pyannote-audio",
     "python3Packages.pyannote-pipeline",
-    "python3Packages.pybids",
-    "python3Packages.pydicom",
     "python3Packages.pydmd",
-    "python3Packages.pygmo",
     "python3Packages.pykrige",
     "python3Packages.pylance",
-    "python3Packages.pylibjpeg",
-    "python3Packages.pylibjpeg-openjpeg",
-    "python3Packages.pylibjpeg-rle",
     "python3Packages.pymanopt",
     "python3Packages.pymatgen",
     "python3Packages.pymedio",
-    "python3Packages.pynetdicom",
-    "python3Packages.pyorthanc",
     "python3Packages.pyotb",
     "python3Packages.pypasser",
     "python3Packages.pyprecice",
     "python3Packages.pyradiomics",
     "python3Packages.pyro-ppl",
     "python3Packages.pyseries",
+    "python3Packages.pysilero-vad",
     "python3Packages.python-csxcad",
     "python3Packages.python-openems",
     "python3Packages.pytorch-bench",
@@ -404,9 +391,13 @@
     "python3Packages.pyvista",
     "python3Packages.qpsolvers",
     "python3Packages.qutip",
+    "python3Packages.rapidocr",
+    "python3Packages.rapidocr-onnxruntime",
+    "python3Packages.rembg",
     "python3Packages.rerun-sdk",
     "python3Packages.resampy",
     "python3Packages.resize-right",
+    "python3Packages.retinaface",
     "python3Packages.rlcard",
     "python3Packages.roma",
     "python3Packages.rotary-embedding-torch",
@@ -418,9 +409,11 @@
     "python3Packages.sentence-transformers",
     "python3Packages.sfepy",
     "python3Packages.shap",
+    "python3Packages.shimmy",
     "python3Packages.simpleitk",
     "python3Packages.sirius",
     "python3Packages.skorch",
+    "python3Packages.skrl",
     "python3Packages.slepc4py",
     "python3Packages.slicer",
     "python3Packages.smolagents",
@@ -432,7 +425,7 @@
     "python3Packages.spacy-transformers",
     "python3Packages.speechbrain",
     "python3Packages.speechrecognition",
-    "python3Packages.spyder-kernels",
+    "python3Packages.stable-baselines3",
     "python3Packages.stanza",
     "python3Packages.staticvectors",
     "python3Packages.stytra",
@@ -440,13 +433,14 @@
     "python3Packages.syne-tune",
     "python3Packages.tables",
     "python3Packages.tami4edgeapi",
-    "python3Packages.templateflow",
     "python3Packages.tensorboardx",
     "python3Packages.tensordict",
     "python3Packages.tensorflow-datasets",
     "python3Packages.test-tube",
     "python3Packages.textacy",
     "python3Packages.textnets",
+    "python3Packages.tf2onnx",
+    "python3Packages.tianshou",
     "python3Packages.timm",
     "python3Packages.tinygrad",
     "python3Packages.torch",
@@ -460,14 +454,15 @@
     "python3Packages.torchao",
     "python3Packages.torchaudio",
     "python3Packages.torchbench",
+    "python3Packages.torchcodec",
     "python3Packages.torchcrepe",
     "python3Packages.torchdiffeq",
-    "python3Packages.torcheval",
     "python3Packages.torchinfo",
     "python3Packages.torchio",
     "python3Packages.torchlibrosa",
     "python3Packages.torchmetrics",
     "python3Packages.torchprofile",
+    "python3Packages.torchrl",
     "python3Packages.torchsde",
     "python3Packages.torchsnapshot",
     "python3Packages.torchsummary",
@@ -479,40 +474,41 @@
     "python3Packages.translatehtml",
     "python3Packages.treescope",
     "python3Packages.trl",
-    "python3Packages.trx-python",
-    "python3Packages.tsid",
     "python3Packages.ttach",
     "python3Packages.txtai",
+    "python3Packages.tyro",
     "python3Packages.ultralytics",
     "python3Packages.ultralytics-thop",
+    "python3Packages.unsloth",
+    "python3Packages.unsloth-zoo",
     "python3Packages.unstructured-inference",
     "python3Packages.vllm",
     "python3Packages.vtk",
     "python3Packages.wandb",
+    "python3Packages.waymax",
     "python3Packages.webdataset",
     "python3Packages.whisperx",
     "python3Packages.x-transformers",
     "python3Packages.xarray-einstats",
     "python3Packages.xformers",
     "python3Packages.xgrammar",
-    "python3Packages.xnatpy",
     "qcsxcad",
     "quantum-espresso",
     "ramalama",
+    "rapidraw",
     "raxml-mpi",
     "rclip",
     "rembg",
     "rlama",
     "rtabmap",
     "scalapack",
-    "scipopt-gcg",
-    "scipopt-scip",
     "scipopt-ug",
-    "scotch",
+    "seagoat",
     "siesta",
     "siesta-mpi",
     "simpleitk",
     "sirius",
+    "sitespeed-io",
     "slepc",
     "spfft",
     "spla",
@@ -528,10 +524,15 @@
     "tests.testers.hasCmakeConfigModules.boost-has-boost_mpi",
     "tests.testers.hasCmakeConfigModules.boost_mpi-does-not-have-mpi",
     "therion",
+    "thunderbird",
+    "thunderbird-latest",
+    "thunderbird-latest-unwrapped",
+    "thunderbird-unwrapped",
+    "thunderbirdPackages.thunderbird",
+    "thunderbirdPackages.thunderbird-latest",
     "tmpi",
     "tocpdf",
     "trilinos-mpi",
-    "tsid",
     "tt-metal",
     "tts",
     "ucc",
@@ -553,6 +554,7 @@
     "whisperx",
     "wifite2",
     "witnessme",
+    "wivrn",
     "wyoming-faster-whisper",
     "wyoming-piper",
     "xyce-parallel"

From 27cd4f14aca556a05f136afbe586b3417620bd7f Mon Sep 17 00:00:00 2001
From: Matt Sturgeon <matt@sturgeon.me.uk>
Date: Thu, 6 Nov 2025 15:07:08 +0000
Subject: [PATCH 5895/6226] =?UTF-8?q?nexusmods-app:=200.19.4=20=E2=86=92?=
 =?UTF-8?q?=200.20.2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://github.com/Nexus-Mods/NexusMods.App/releases/tag/v0.20.2
---
 pkgs/by-name/ne/nexusmods-app/package.nix     | 18 +--------
 .../ne/nexusmods-app/vendored/games.json      | 40 +++++++++----------
 2 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix
index 5b993929fc93..5041b96063fa 100644
--- a/pkgs/by-name/ne/nexusmods-app/package.nix
+++ b/pkgs/by-name/ne/nexusmods-app/package.nix
@@ -5,7 +5,6 @@
   desktop-file-utils,
   dotnetCorePackages,
   fetchFromGitHub,
-  fetchpatch2,
   imagemagick,
   lib,
   xdg-utils,
@@ -23,13 +22,13 @@ let
 in
 buildDotnetModule (finalAttrs: {
   inherit pname;
-  version = "0.19.4";
+  version = "0.20.2";
 
   src = fetchFromGitHub {
     owner = "Nexus-Mods";
     repo = "NexusMods.App";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-WKfv5y6UmO3dmzkXrqZ+VtIbXf0FszRdsa5Rmp95rYg=";
+    hash = "sha256-hpsrHHh0Bk+9Z4Qp5aTqH5i8KnqCLQdseYGrbr4sh1k=";
     fetchSubmodules = true;
   };
 
@@ -57,14 +56,6 @@ buildDotnetModule (finalAttrs: {
   dotnet-sdk = dotnetCorePackages.sdk_9_0;
   dotnet-runtime = dotnetCorePackages.runtime_9_0;
 
-  patches = [
-    (fetchpatch2 {
-      name = "Fix-SMAPI-installation.patch";
-      url = "https://github.com/Nexus-Mods/NexusMods.App/pull/4026.patch?full_index=1";
-      hash = "sha256-1LgFTi63fVhGUZXZtS6iD2yqd0RxhdpiXKtWMFNEoD4=";
-    })
-  ];
-
   postPatch = ''
     # Specify a fixed date to improve build reproducibility
     echo "1970-01-01T00:00:00Z" >buildDate.txt
@@ -82,11 +73,6 @@ buildDotnetModule (finalAttrs: {
     ${lib.optionalString finalAttrs.doCheck ''
       # For some reason these tests fail (intermittently?) with a zero timestamp
       touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png
-
-      # Fix expected version number in text fixture
-      # https://github.com/Nexus-Mods/NexusMods.App/issues/4030
-      substituteInPlace tests/NexusMods.Backend.Tests/EventTrackerTests.Test_PrepareRequest.verified.txt \
-        --replace-fail 0.0.1 ${finalAttrs.version}
     ''}
   '';
 
diff --git a/pkgs/by-name/ne/nexusmods-app/vendored/games.json b/pkgs/by-name/ne/nexusmods-app/vendored/games.json
index 478145604579..00e9d035c0dd 100644
--- a/pkgs/by-name/ne/nexusmods-app/vendored/games.json
+++ b/pkgs/by-name/ne/nexusmods-app/vendored/games.json
@@ -6,12 +6,12 @@
     "forum_url": "https://forums.nexusmods.com/games/19-stardew-valley/",
     "nexusmods_url": "https://www.nexusmods.com/stardewvalley",
     "genre": "Simulation",
-    "file_count": 143212,
-    "downloads": 627187655,
+    "file_count": 144372,
+    "downloads": 635510946,
     "domain_name": "stardewvalley",
     "approved_date": 1457432329,
-    "mods": 25945,
-    "collections": 2020
+    "mods": 26187,
+    "collections": 1990
   },
   {
     "id": 1704,
@@ -20,12 +20,12 @@
     "forum_url": "https://forums.nexusmods.com/games/6-skyrim/",
     "nexusmods_url": "https://www.nexusmods.com/skyrimspecialedition",
     "genre": "RPG",
-    "file_count": 661698,
-    "downloads": 9193533035,
+    "file_count": 667120,
+    "downloads": 9346275237,
     "domain_name": "skyrimspecialedition",
     "approved_date": 1477480498,
-    "mods": 118807,
-    "collections": 4852
+    "mods": 119859,
+    "collections": 4876
   },
   {
     "id": 3174,
@@ -34,12 +34,12 @@
     "forum_url": "https://forums.nexusmods.com/games/9-mount-blade-ii-bannerlord/",
     "nexusmods_url": "https://www.nexusmods.com/mountandblade2bannerlord",
     "genre": "Strategy",
-    "file_count": 50603,
-    "downloads": 116400189,
+    "file_count": 50960,
+    "downloads": 117558949,
     "domain_name": "mountandblade2bannerlord",
     "approved_date": 1582898627,
-    "mods": 6341,
-    "collections": 293
+    "mods": 6397,
+    "collections": 294
   },
   {
     "id": 3333,
@@ -48,12 +48,12 @@
     "forum_url": "https://forums.nexusmods.com/games/1-cyberpunk-2077/",
     "nexusmods_url": "https://www.nexusmods.com/cyberpunk2077",
     "genre": "Action",
-    "file_count": 125224,
-    "downloads": 930909718,
+    "file_count": 126752,
+    "downloads": 958960285,
     "domain_name": "cyberpunk2077",
     "approved_date": 1607433331,
-    "mods": 18032,
-    "collections": 1588
+    "mods": 18283,
+    "collections": 1597
   },
   {
     "id": 3474,
@@ -62,11 +62,11 @@
     "forum_url": "https://forums.nexusmods.com/games/2-baldurs-gate-3/",
     "nexusmods_url": "https://www.nexusmods.com/baldursgate3",
     "genre": "RPG",
-    "file_count": 105632,
-    "downloads": 351591575,
+    "file_count": 106755,
+    "downloads": 359737700,
     "domain_name": "baldursgate3",
     "approved_date": 1602863114,
-    "mods": 15020,
-    "collections": 1752
+    "mods": 15196,
+    "collections": 1740
   }
 ]

From 9f5cc0bdcdfb665e814e2b40d77991de2de34e71 Mon Sep 17 00:00:00 2001
From: Tony Wasserka <neobrain@users.noreply.github.com>
Date: Thu, 6 Nov 2025 15:56:00 +0100
Subject: [PATCH 5896/6226] fex: 2510 -> 2511

---
 pkgs/by-name/fe/fex/package.nix | 15 ++-------------
 1 file changed, 2 insertions(+), 13 deletions(-)

diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix
index 25858a8a4a05..62da7dd5f4b8 100644
--- a/pkgs/by-name/fe/fex/package.nix
+++ b/pkgs/by-name/fe/fex/package.nix
@@ -26,7 +26,6 @@
   xorg,
   withQt ? true,
   qt6,
-  fetchpatch,
 }:
 
 let
@@ -96,13 +95,13 @@ let
 in
 llvmPackages.stdenv.mkDerivation (finalAttrs: {
   pname = "fex";
-  version = "2510";
+  version = "2511";
 
   src = fetchFromGitHub {
     owner = "FEX-Emu";
     repo = "FEX";
     tag = "FEX-${finalAttrs.version}";
-    hash = "sha256-C6Yeqo+KqA6OezxnpBAncTekOrPTgIq0vikQOmxaORA=";
+    hash = "sha256-CulENHssPkCXI+oyVKwf3GN5bjxUok2+AHsoOQ+Mchc=";
 
     leaveDotGit = true;
     postFetch = ''
@@ -128,16 +127,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: {
     '';
   };
 
-  patches = [
-    # Backported fix of unit test build with LLVM 21.
-    # TODO: drop after next release
-    (fetchpatch {
-      name = "unittests-thunklibs-fix-build-with-llvm-21.patch";
-      url = "https://github.com/FEX-Emu/FEX/commit/5af2477d005bb0ab8b11633a678ed5f6121f81b6.patch";
-      hash = "sha256-QdJaexzBSOVaKc3h2uwPbX4iysqvGBDmWH938ZeXcdE=";
-    })
-  ];
-
   postPatch = ''
     substituteInPlace ThunkLibs/GuestLibs/CMakeLists.txt ThunkLibs/HostLibs/CMakeLists.txt \
       --replace-fail "/usr/include/libdrm" "${devRootFS}/include/libdrm" \

From 51acc56dcb07fa099efc7f8ec921e4e2c67f3732 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 6 Nov 2025 16:07:31 +0100
Subject: [PATCH 5897/6226] ci/github-script/merge: ignore PRs with >= 100
 files

We use the files endpoint to get a list of all *names* of files touched
in the PR - but this endpoint will also actually download the files /
their diff, too. That's pointless and actually takes quite some time for
huge treewides.

We're just putting in a stop-gap for now, so that we're not burning more
than 1 API requests on this and don't spend so much time on it either. A
limit of 99 files will be more than enough for quite some time - we will
only need to raise this when we're able to represent package sets in
by-name properly and have "package set maintainers", who are not
committers.
---
 ci/github-script/merge.js | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js
index 688a7928fe97..674d8153a7e9 100644
--- a/ci/github-script/merge.js
+++ b/ci/github-script/merge.js
@@ -128,11 +128,20 @@ async function handleMerge({
     (await getTeamMembers('nixpkgs-committers')).map(({ id }) => id),
   )
 
-  const files = await github.paginate(github.rest.pulls.listFiles, {
-    ...context.repo,
-    pull_number,
-    per_page: 100,
-  })
+  const files = (
+    await github.rest.pulls.listFiles({
+      ...context.repo,
+      pull_number,
+      per_page: 100,
+    })
+  ).data
+
+  // Early exit to prevent treewides from using up a lot of API requests (and time!) to list
+  // all the files in the pull request. For now, the merge-bot will not work when 100 or more
+  // files are touched in a PR - which should be more than fine.
+  // TODO: Find a more efficient way of downloading all the *names* of the touched files,
+  // including an early exit when the first non-by-name file is found.
+  if (files.length >= 100) return false
 
   // Only look through comments *after* the latest (force) push.
   const lastPush = events.findLastIndex(

From 9efe926863c5d4e087057fe610ef9eb73fa942a7 Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 6 Nov 2025 16:11:01 +0100
Subject: [PATCH 5898/6226] ci/github-script/reviewers: exit early for
 treewides

When hitting a treewide, we would previously find the username for each
user and then check all of them for collaborator status - only to then
realize that this results in more than 15 reviewers and exit.

We can put a simple stop-gap in, even before de-duplicating the combined
lists of maintainers and owners as safe guard. We could still hit huge
numbers of code owners, but in practice we don't nearly as many as
maintainers, so this will be sufficient for now.
---
 ci/github-script/reviewers.js | 46 ++++++++++++++++++++++-------------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/ci/github-script/reviewers.js b/ci/github-script/reviewers.js
index c5f79c11d992..eefa87e36d65 100644
--- a/ci/github-script/reviewers.js
+++ b/ci/github-script/reviewers.js
@@ -13,6 +13,34 @@ async function handleReviewers({
 }) {
   const pull_number = pull_request.number
 
+  const requested_reviewers = new Set(
+    pull_request.requested_reviewers.map(({ login }) => login),
+  )
+  log(
+    'reviewers - requested_reviewers',
+    Array.from(requested_reviewers).join(', '),
+  )
+
+  const existing_reviewers = new Set(
+    reviews.map(({ user }) => user?.login).filter(Boolean),
+  )
+  log(
+    'reviewers - existing_reviewers',
+    Array.from(existing_reviewers).join(', '),
+  )
+
+  // Early sanity check, before we start making any API requests. The list of maintainers
+  // does not have duplicates so the only user to filter out from this list would be the
+  // PR author. Therefore, we check for a limit of 15+1, where 15 is the limit we check
+  // further down again.
+  // This is to protect against huge treewides consuming all our API requests for no
+  // reason.
+  if (maintainers.length > 16) {
+    core.warning('Too many potential reviewers, skipping review requests.')
+    // Return a boolean on whether the "needs: reviewers" label should be set.
+    return existing_reviewers.size === 0 && requested_reviewers.size === 0
+  }
+
   const users = new Set([
     ...(await Promise.all(
       maintainers.map(async (id) => (await getUser(id)).login),
@@ -64,24 +92,8 @@ async function handleReviewers({
   ).filter(Boolean)
   log('reviewers - reviewers', reviewers.join(', '))
 
-  const requested_reviewers = new Set(
-    pull_request.requested_reviewers.map(({ login }) => login),
-  )
-  log(
-    'reviewers - requested_reviewers',
-    Array.from(requested_reviewers).join(', '),
-  )
-
-  const existing_reviewers = new Set(
-    reviews.map(({ user }) => user?.login).filter(Boolean),
-  )
-  log(
-    'reviewers - existing_reviewers',
-    Array.from(existing_reviewers).join(', '),
-  )
-
   if (reviewers.length > 15) {
-    log(
+    core.warning(
       `Too many reviewers (${reviewers.join(', ')}), skipping review requests.`,
     )
     // Return a boolean on whether the "needs: reviewers" label should be set.

From 17199e5ff6d970c47338c22b07e5e39e305f2a8b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 6 Nov 2025 16:11:36 +0100
Subject: [PATCH 5899/6226] ci/github-script/reviewers: add TODO about future
 optimization

We still use a few too many API requests by checking team members for
collaborator status - we can improve on that in the future.
---
 ci/github-script/reviewers.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ci/github-script/reviewers.js b/ci/github-script/reviewers.js
index eefa87e36d65..07a77a5fec0d 100644
--- a/ci/github-script/reviewers.js
+++ b/ci/github-script/reviewers.js
@@ -75,6 +75,9 @@ async function handleReviewers({
   const reviewers = (
     await Promise.all(
       Array.from(new_reviewers, async (username) => {
+        // TODO: Restructure this file to only do the collaborator check for those users
+        // who were not already part of a team. Being a member of a team makes them
+        // collaborators by definition.
         try {
           await github.rest.repos.checkCollaborator({
             ...context.repo,

From cd7f83638e0e96f667ce904a3f0363967f654cef Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 6 Nov 2025 16:16:30 +0100
Subject: [PATCH 5900/6226] ci/github-script/bot: limit concurrency in PR runs

This lead to reaching secondary API limits in a treewide recently, so we
better limit it to where we actually need it.
---
 ci/github-script/bot.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index c66a91583140..34abe96941fb 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -576,7 +576,10 @@ module.exports = async ({ github, context, core, dry }) => {
 
   // Controls level of parallelism. Applies to both the number of concurrent requests
   // as well as the number of concurrent workers going through the list of PRs.
-  const maxConcurrent = 20
+  // We'll only boost concurrency when we're running many PRs in parallel on a schedule,
+  // but not for single PRs. This avoids things going wild, when we accidentally make
+  // too many API requests on treewides.
+  const maxConcurrent = context.eventName === 'pull_request' ? 1 : 20
 
   await withRateLimit({ github, core, maxConcurrent }, async (stats) => {
     if (context.payload.pull_request) {

From f8a2ee2c1f1aa98ac5d58f35a89612c1ae562ba6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 15:26:25 +0000
Subject: [PATCH 5901/6226] everest: 5935 -> 5961

---
 pkgs/by-name/ev/everest-bin/package.nix | 6 +++---
 pkgs/by-name/ev/everest/package.nix     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ev/everest-bin/package.nix b/pkgs/by-name/ev/everest-bin/package.nix
index 2f0076b4dfd2..048f564c3507 100644
--- a/pkgs/by-name/ev/everest-bin/package.nix
+++ b/pkgs/by-name/ev/everest-bin/package.nix
@@ -8,15 +8,15 @@
 
 let
   pname = "everest";
-  version = "5935";
+  version = "5961";
   phome = "$out/lib/Celeste";
 in
 stdenvNoCC.mkDerivation {
   inherit pname version;
   src = fetchzip {
-    url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.5935.0/main.zip";
+    url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.5961.0/main.zip";
     extension = "zip";
-    hash = "sha256-XYvXrfHSjSShAg3r2qikt1CPXldYvsU1EvRJNzJoGTU=";
+    hash = "sha256-zFGBzRbFJOnJ4d8396SoLEgnicDwEqvSbOZKqWSyR+w=";
   };
   buildInputs = [
     icu
diff --git a/pkgs/by-name/ev/everest/package.nix b/pkgs/by-name/ev/everest/package.nix
index a6f7bcf3f285..18e42f537766 100644
--- a/pkgs/by-name/ev/everest/package.nix
+++ b/pkgs/by-name/ev/everest/package.nix
@@ -11,7 +11,7 @@
 
 let
   pname = "everest";
-  version = "5935";
+  version = "5961";
   phome = "$out/lib/Celeste";
 in
 buildDotnetModule {
@@ -20,11 +20,11 @@ buildDotnetModule {
   src = fetchFromGitHub {
     owner = "EverestAPI";
     repo = "Everest";
-    rev = "6a6da718227b357f5b997499e454d5dc5c3e2788";
+    rev = "7972286159c1f4d1f219c1101273067d45cd1161";
     fetchSubmodules = true;
     # TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink
     # Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty.
-    hash = "sha256-qSDcwqjJeb2pNbyriZ/9Gk72DyR5KdIoncXol7JZvFg=";
+    hash = "sha256-GkWeOfatzw9uLWkzNzjSEM8p+HWuJPbycv/0YNxTdqk=";
   };
 
   nativeBuildInputs = [ autoPatchelfHook ];

From 7f6ce9097f3a37052c60493ec6746f1a8a3eebbe Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 6 Nov 2025 23:35:08 +0800
Subject: [PATCH 5902/6226] lib.extendMkDerivation: fix argument documentation
 layout

---
 lib/customisation.nix | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index 55117f8289d0..0422ea05b576 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -763,11 +763,21 @@ rec {
     # Inputs
 
     `extendMkDerivation`-specific configurations
-    : `constructDrv` (required): Base build helper, the `mkDerivation`-like build helper to extend.
-    : `excludeDrvArgNames` (default to `[ ]`): Argument names not to pass from the input fixed-point arguments to `constructDrv`. Note: It doesn't apply to the updating arguments returned by `extendDrvArgs`.
-    : `extendDrvArgs` (required): An extension (overlay) of the argument set, like the one taken by [overrideAttrs](#sec-pkg-overrideAttrs) but applied before passing to `constructDrv`.
-    : `inheritFunctionArgs` (default to `true`): Whether to inherit `__functionArgs` from the base build helper.
-    : `transformDrv` (default to `lib.id`): Function to apply to the result derivation.
+    : `constructDrv` (required)
+      : Base build helper, the `mkDerivation`-like build helper to extend.
+
+      `excludeDrvArgNames` (default to `[ ]`)
+      : Argument names not to pass from the input fixed-point arguments to `constructDrv`.
+        It doesn't apply to the updating arguments returned by `extendDrvArgs`.
+
+      `extendDrvArgs` (required)
+      : An extension (overlay) of the argument set, like the one taken by [overrideAttrs](#sec-pkg-overrideAttrs) but applied before passing to `constructDrv`.
+
+      `inheritFunctionArgs` (default to `true`)
+      : Whether to inherit `__functionArgs` from the base build helper.
+
+      `transformDrv` (default to `lib.id`)
+      : Function to apply to the result derivation.
 
     # Type
 

From d75b2035146827347f53918004d95fcba65be7a0 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 6 Nov 2025 19:37:08 +0800
Subject: [PATCH 5903/6226] lib.extendMkDerivation: document the typical usage
 of inheritFunctionArgs

---
 lib/customisation.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index 0422ea05b576..77875d91d38f 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -775,6 +775,7 @@ rec {
 
       `inheritFunctionArgs` (default to `true`)
       : Whether to inherit `__functionArgs` from the base build helper.
+        Set `inheritFunctionArgs` to `false` when `extendDrvArgs`'s `args` set pattern does not contain an ellipsis.
 
       `transformDrv` (default to `lib.id`)
       : Function to apply to the result derivation.

From d24ec930d54374f9b34c0de5c06e19c48c142d85 Mon Sep 17 00:00:00 2001
From: Acid Bong <acidbong@tilde.club>
Date: Thu, 6 Nov 2025 17:37:32 +0200
Subject: [PATCH 5904/6226] nixos/boot.tmp: fix description rendering

---
 nixos/modules/system/boot/tmp.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/nixos/modules/system/boot/tmp.nix b/nixos/modules/system/boot/tmp.nix
index f927ba1c9c90..c8286979ff41 100644
--- a/nixos/modules/system/boot/tmp.nix
+++ b/nixos/modules/system/boot/tmp.nix
@@ -41,10 +41,10 @@ in
         default = "never";
         example = "within_size";
         description = ''
-          never        - Do not allocate huge memory pages. This is the default.
-          always       - Attempt to allocate huge memory page every time a new page is needed.
-          within_size  - Only allocate huge memory pages if it will be fully within i_size. Also respect madvise(2) hints. Recommended.
-          advise       - Only allocate huge memory pages if requested with madvise(2).
+          - `never`        - Do not allocate huge memory pages. This is the default.
+          - `always`       - Attempt to allocate huge memory page every time a new page is needed.
+          - `within_size`  - Only allocate huge memory pages if it will be fully within i_size. Also respect madvise(2) hints. Recommended.
+          - `advise`       - Only allocate huge memory pages if requested with madvise(2).
         '';
       };
 

From 3026703280158319205fad19b9d69a4e1c693780 Mon Sep 17 00:00:00 2001
From: Yueh-Shun Li <shamrocklee@posteo.net>
Date: Thu, 6 Nov 2025 19:31:37 +0800
Subject: [PATCH 5905/6226] lib.extendMkDerivation: add argument
 excludeFunctionArgNames

---
 lib/customisation.nix | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/lib/customisation.nix b/lib/customisation.nix
index 77875d91d38f..6159ce8ea27a 100644
--- a/lib/customisation.nix
+++ b/lib/customisation.nix
@@ -770,6 +770,10 @@ rec {
       : Argument names not to pass from the input fixed-point arguments to `constructDrv`.
         It doesn't apply to the updating arguments returned by `extendDrvArgs`.
 
+      `excludeFunctionArgNames` (default to `[ ]`)
+      : `__functionArgs` attribute names to remove from the result build helper.
+        `excludeFunctionArgNames` is useful for argument deprecation while avoiding ellipses.
+
       `extendDrvArgs` (required)
       : An extension (overlay) of the argument set, like the one taken by [overrideAttrs](#sec-pkg-overrideAttrs) but applied before passing to `constructDrv`.
 
@@ -787,6 +791,7 @@ rec {
       {
         constructDrv :: ((FixedPointArgs | AttrSet) -> a)
         excludeDrvArgNames :: [ String ],
+        excludeFunctionArgNames :: [ String ]
         extendDrvArgs :: (AttrSet -> AttrSet -> AttrSet)
         inheritFunctionArgs :: Bool,
         transformDrv :: a -> a,
@@ -847,6 +852,7 @@ rec {
     {
       constructDrv,
       excludeDrvArgNames ? [ ],
+      excludeFunctionArgNames ? [ ],
       extendDrvArgs,
       inheritFunctionArgs ? true,
       transformDrv ? id,
@@ -861,10 +867,12 @@ rec {
       )
       # Add __functionArgs
       (
-        # Inherit the __functionArgs from the base build helper
-        optionalAttrs inheritFunctionArgs (removeAttrs (functionArgs constructDrv) excludeDrvArgNames)
-        # Recover the __functionArgs from the derived build helper
-        // functionArgs (extendDrvArgs { })
+        removeAttrs (
+          # Inherit the __functionArgs from the base build helper
+          optionalAttrs inheritFunctionArgs (removeAttrs (functionArgs constructDrv) excludeDrvArgNames)
+          # Recover the __functionArgs from the derived build helper
+          // functionArgs (extendDrvArgs { })
+        ) excludeFunctionArgNames
       )
     // {
       inherit

From 95756ab0f6ade456223162263d9e7ff0fcc03fd6 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Thu, 6 Nov 2025 23:50:31 +0800
Subject: [PATCH 5906/6226] xfce.xfce4-screenshooter: 1.11.2 -> 1.11.3

https://gitlab.xfce.org/apps/xfce4-screenshooter/-/compare/xfce4-screenshooter-1.11.2...xfce4-screenshooter-1.11.3

Imgur custom action has been dropped in 1.11.2.
---
 .../xfce4-screenshooter/default.nix           | 25 +++----------------
 1 file changed, 4 insertions(+), 21 deletions(-)

diff --git a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
index ac6d913e2590..9d1264a8ed1e 100644
--- a/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
+++ b/pkgs/desktops/xfce/applications/xfce4-screenshooter/default.nix
@@ -11,6 +11,7 @@
   wrapGAppsHook3,
   exo,
   gtk3,
+  gtk-layer-shell,
   libX11,
   libXext,
   libXfixes,
@@ -21,23 +22,19 @@
   wlr-protocols,
   xfce4-panel,
   xfconf,
-  curl,
-  zenity,
-  jq,
-  xclip,
   gitUpdater,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "xfce4-screenshooter";
-  version = "1.11.2";
+  version = "1.11.3";
 
   src = fetchFromGitLab {
     domain = "gitlab.xfce.org";
     owner = "apps";
     repo = "xfce4-screenshooter";
     tag = "xfce4-screenshooter-${finalAttrs.version}";
-    hash = "sha256-LELPY3SU25e3Dk9/OljWMLIbZYrDiQD1h6dMq+jRaH8=";
+    hash = "sha256-VN9j5Ieg3MZwhS4mE4LMRbQ5AM9F8O2n5lx/V0Qk0Po=";
   };
 
   strictDeps = true;
@@ -59,6 +56,7 @@ stdenv.mkDerivation (finalAttrs: {
   buildInputs = [
     exo
     gtk3
+    gtk-layer-shell
     libX11
     libXext
     libXfixes
@@ -71,21 +69,6 @@ stdenv.mkDerivation (finalAttrs: {
     xfconf
   ];
 
-  preFixup = ''
-    # For Imgur upload action
-    # https://gitlab.xfce.org/apps/xfce4-screenshooter/-/merge_requests/51
-    gappsWrapperArgs+=(
-      --prefix PATH : ${
-        lib.makeBinPath [
-          curl
-          zenity
-          jq
-          xclip
-        ]
-      }
-    )
-  '';
-
   passthru.updateScript = gitUpdater { rev-prefix = "xfce4-screenshooter-"; };
 
   meta = {

From 70285b8aaa8d307d835beb7ba12f91fa22949118 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Thu, 6 Nov 2025 16:51:32 +0100
Subject: [PATCH 5907/6226] python3Packages.chipwhisperer: minor cleanup

---
 pkgs/development/python-modules/chipwhisperer/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/development/python-modules/chipwhisperer/default.nix b/pkgs/development/python-modules/chipwhisperer/default.nix
index 1cc7fc8657bb..dcc446611b45 100644
--- a/pkgs/development/python-modules/chipwhisperer/default.nix
+++ b/pkgs/development/python-modules/chipwhisperer/default.nix
@@ -43,8 +43,6 @@ buildPythonPackage rec {
     hash = "sha256-C7QP044QEP7vmz1lMseLtMTYoKn5SoFV/q9URY7yQ6I=";
   };
 
-  # Build
-
   pyproject = true;
 
   build-system = [
@@ -70,8 +68,6 @@ buildPythonPackage rec {
     tqdm
   ];
 
-  # Install
-
   nativeInstallCheckInputs = [
     udevCheckHook
   ];
@@ -90,8 +86,6 @@ buildPythonPackage rec {
     EOF
   '';
 
-  # Check
-
   pythonImportsCheck = [ "chipwhisperer" ];
 
   nativeCheckInputs = [

From 02fa5ac8fee5565ccc0950e42953d38b1069550b Mon Sep 17 00:00:00 2001
From: Jost Alemann <alemann@posteo.com>
Date: Thu, 6 Nov 2025 17:06:19 +0100
Subject: [PATCH 5908/6226] termsvg: update meta

capitalize user name in repo owner and meta.homepage
---
 pkgs/by-name/te/termsvg/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/te/termsvg/package.nix b/pkgs/by-name/te/termsvg/package.nix
index 7a14d7112c58..be9e5a4ea63e 100644
--- a/pkgs/by-name/te/termsvg/package.nix
+++ b/pkgs/by-name/te/termsvg/package.nix
@@ -9,7 +9,7 @@ buildGoModule rec {
   version = "0.10.0";
 
   src = fetchFromGitHub {
-    owner = "mrmarble";
+    owner = "MrMarble";
     repo = "termsvg";
     rev = "v${version}";
     hash = "sha256-tNvr8ptMortP7iI6GwT4AGbqTvNFposca8I2JribGnk=";
@@ -27,7 +27,7 @@ buildGoModule rec {
 
   meta = with lib; {
     description = "Record, share and export your terminal as a animated SVG image";
-    homepage = "https://github.com/mrmarble/termsvg";
+    homepage = "https://github.com/MrMarble/termsvg";
     license = licenses.gpl3Only;
     maintainers = with maintainers; [ pbsds ];
     mainProgram = "termsvg";

From 275feea9d152623e24960179838eba1b46fba2de Mon Sep 17 00:00:00 2001
From: Gliczy <129636582+Gliczy@users.noreply.github.com>
Date: Thu, 6 Nov 2025 17:12:35 +0100
Subject: [PATCH 5909/6226] vencord: 1.13.4 -> 1.13.5

---
 pkgs/by-name/ve/vencord/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ve/vencord/package.nix b/pkgs/by-name/ve/vencord/package.nix
index 5379ce534490..b56682f189a4 100644
--- a/pkgs/by-name/ve/vencord/package.nix
+++ b/pkgs/by-name/ve/vencord/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "vencord";
-  version = "1.13.4";
+  version = "1.13.5";
 
   src = fetchFromGitHub {
     owner = "Vendicated";
     repo = "Vencord";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-NZuZ3WRHsM94PaGfikwB0Y7RRRPe+64FAfx80kRrQ1U=";
+    hash = "sha256-btbGURE3szy7qiC9W3N3+RdfnH+EUJv78m9tDZYeA1M=";
   };
 
   patches = [ ./fix-deps.patch ];

From d72ac2eb4b57e7afd38a893dc208c128093666a3 Mon Sep 17 00:00:00 2001
From: Sam <30577766+Samasaur1@users.noreply.github.com>
Date: Wed, 5 Nov 2025 22:38:03 -0700
Subject: [PATCH 5910/6226] zbar: patch out segfault from overoptimization on
 darwin

---
 ...egfault-optimized-pointer-assignment.patch | 47 +++++++++++++++++++
 pkgs/tools/graphics/zbar/default.nix          |  5 ++
 2 files changed, 52 insertions(+)
 create mode 100644 pkgs/tools/graphics/zbar/darwin-segfault-optimized-pointer-assignment.patch

diff --git a/pkgs/tools/graphics/zbar/darwin-segfault-optimized-pointer-assignment.patch b/pkgs/tools/graphics/zbar/darwin-segfault-optimized-pointer-assignment.patch
new file mode 100644
index 000000000000..ebf38552cbde
--- /dev/null
+++ b/pkgs/tools/graphics/zbar/darwin-segfault-optimized-pointer-assignment.patch
@@ -0,0 +1,47 @@
+From 3fa414aa82375648635281924904557cbe4d2d83 Mon Sep 17 00:00:00 2001
+From: sasdf <asdf79852@gmail.com>
+Date: Fri, 18 Oct 2024 00:22:36 +0800
+Subject: [PATCH] Fix pointer wrap around undefined behavior
+
+---
+ zbar/img_scanner.c | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/zbar/img_scanner.c b/zbar/img_scanner.c
+index d1bf8a3c..58436f16 100644
+--- a/zbar/img_scanner.c
++++ b/zbar/img_scanner.c
+@@ -33,6 +33,7 @@
+ #endif
+ 
+ #include <assert.h>
++#include <stddef.h>
+ #include <stdlib.h> /* malloc, free */
+ #include <string.h> /* memcmp, memset, memcpy */
+ 
+@@ -50,7 +51,7 @@
+ #include "svg.h"
+ 
+ #if 1
+-#define ASSERT_POS assert(p == data + x + y * (intptr_t)w)
++#define ASSERT_POS assert(p == data + x + y * (ptrdiff_t)w)
+ #else
+ #define ASSERT_POS
+ #endif
+@@ -858,11 +859,11 @@ static void zbar_send_code_via_dbus(zbar_image_scanner_t *iscn,
+ }
+ #endif
+ 
+-#define movedelta(dx, dy)                \
+-    do {                                 \
+-	x += (dx);                       \
+-	y += (dy);                       \
+-	p += (dx) + ((uintptr_t)(dy)*w); \
++#define movedelta(dx, dy)                  \
++    do {                                   \
++        x += (dx);                         \
++        y += (dy);                         \
++        p += (dx) + ((dy)*(ptrdiff_t)(w)); \
+     } while (0);
+ 
+ static void *_zbar_scan_image(zbar_image_scanner_t *iscn, zbar_image_t *img)
diff --git a/pkgs/tools/graphics/zbar/default.nix b/pkgs/tools/graphics/zbar/default.nix
index 8d77795366a2..58b64c4fd1a1 100644
--- a/pkgs/tools/graphics/zbar/default.nix
+++ b/pkgs/tools/graphics/zbar/default.nix
@@ -62,6 +62,11 @@ stdenv.mkDerivation rec {
       url = "https://github.com/mchehab/zbar/commit/a549566ea11eb03622bd4458a1728ffe3f589163.patch";
       hash = "sha256-NY3bAElwNvGP9IR6JxUf62vbjx3hONrqu9pMSqaZcLY=";
     })
+    # PR from fork not yet merged into upstream
+    # See PR: https://github.com/mchehab/zbar/pull/299
+    # Remove this patch if the PR is merged or if the issue is solved another way.
+    # See https://github.com/NixOS/nixpkgs/issues/456461 for discussion of the root issue
+    ./darwin-segfault-optimized-pointer-assignment.patch
   ];
 
   nativeBuildInputs = [

From 04a35bc5efea0e39ad732692ed9c5e93bdfaaa8b Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Fri, 7 Nov 2025 00:04:41 +0800
Subject: [PATCH 5911/6226] python313Packages.nonestorage: init at 0.1.0

---
 .../python-modules/nonestorage/default.nix    | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/nonestorage/default.nix

diff --git a/pkgs/development/python-modules/nonestorage/default.nix b/pkgs/development/python-modules/nonestorage/default.nix
new file mode 100644
index 000000000000..3919754935d6
--- /dev/null
+++ b/pkgs/development/python-modules/nonestorage/default.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  hatchling,
+}:
+
+buildPythonPackage rec {
+  pname = "nonestorage";
+  version = "0.1.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "nonebot";
+    repo = "nonestorage";
+    tag = "v${version}";
+    hash = "sha256-Y8Ywpp5/FRT8jIhSaMtuzMXs3UJROh5SrFdIZD7ysBA=";
+  };
+
+  build-system = [ hatchling ];
+
+  pythonImportsCheck = [ "nonestorage" ];
+
+  # no test
+  doCheck = false;
+
+  meta = {
+    description = "Simple library that provides local storage folder detect";
+    homepage = "https://github.com/nonebot/nonestorage";
+    changelog = "https://github.com/nonebot/nonestorage/releases/tag/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ moraxyc ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index e4334ca2a112..0128da654ac5 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10682,6 +10682,8 @@ self: super: with self; {
 
   noneprompt = callPackage ../development/python-modules/noneprompt { };
 
+  nonestorage = callPackage ../development/python-modules/nonestorage { };
+
   norfair = callPackage ../development/python-modules/norfair { };
 
   normality = callPackage ../development/python-modules/normality { };

From e25564b7227b9d8eb8ad964587a918110988ec1b Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Thu, 30 Oct 2025 09:23:24 +0000
Subject: [PATCH 5912/6226] nb-cli: 1.4.2 -> 1.5.0

---
 pkgs/by-name/nb/nb-cli/package.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/nb/nb-cli/package.nix b/pkgs/by-name/nb/nb-cli/package.nix
index 74d724b86842..b141d364fc70 100644
--- a/pkgs/by-name/nb/nb-cli/package.nix
+++ b/pkgs/by-name/nb/nb-cli/package.nix
@@ -8,17 +8,18 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "nb-cli";
-  version = "1.4.2";
+  version = "1.5.0";
   pyproject = true;
 
   src = fetchPypi {
     pname = "nb_cli";
     inherit version;
-    hash = "sha256-HZey1RVpx/fHNxdEue1LczYbwYUxEb3i3fHpkKHhn+8=";
+    hash = "sha256-vZxBjavim4xNp24s7hNsoZK7xoeRJST7NvSRbRTYSz8=";
   };
 
   pythonRelaxDeps = [
     "watchfiles"
+    "noneprompt"
   ];
 
   build-system = [
@@ -35,8 +36,10 @@ python3.pkgs.buildPythonApplication rec {
     importlib-metadata
     jinja2
     noneprompt
+    nonestorage
     pydantic
     pyfiglet
+    textual
     tomlkit
     typing-extensions
     virtualenv

From 1b6d87582cbb27da62982fcc3b7d41cd441a651b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 6 Nov 2025 17:14:20 +0100
Subject: [PATCH 5913/6226] python313Packages.iamdata: 0.1.202511051 ->
 0.1.202511061

Diff: https://github.com/cloud-copilot/iam-data-python/compare/v0.1.202511051...v0.1.202511061

Changelog: https://github.com/cloud-copilot/iam-data-python/releases/tag/v0.1.202511061
---
 pkgs/development/python-modules/iamdata/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/iamdata/default.nix b/pkgs/development/python-modules/iamdata/default.nix
index 32245d3c6f11..b553f1be0878 100644
--- a/pkgs/development/python-modules/iamdata/default.nix
+++ b/pkgs/development/python-modules/iamdata/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "iamdata";
-  version = "0.1.202511051";
+  version = "0.1.202511061";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "cloud-copilot";
     repo = "iam-data-python";
     tag = "v${version}";
-    hash = "sha256-v70VJUU6ggC4N5qiZ6r90p1jg9uaQWJCnRrvkylCDjU=";
+    hash = "sha256-SEbER6oe5BK/6HpvMh+UD7rvGyPNJ1zxLD9LNis8QJw=";
   };
 
   __darwinAllowLocalNetworking = true;

From 8d378ad407e714d1eb3891200ac0bd56f2e7170e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 16:15:57 +0000
Subject: [PATCH 5914/6226] terraform-providers.poseidon_ct: 0.13.0 -> 0.14.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 c979937782d0..dd310c3b295b 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1102,13 +1102,13 @@
     "vendorHash": "sha256-oVTanZpCWs05HwyIKW2ajiBPz1HXOFzBAt5Us+EtTRw="
   },
   "poseidon_ct": {
-    "hash": "sha256-c1cqTfMlZ5fXDNMYLsk4447X0p/qIQYvRTqVY8cSs+E=",
+    "hash": "sha256-Y0hBXxd9Ll5DY6hljZlI2QpTM/lWBZomQ47iAHbNuAs=",
     "homepage": "https://registry.terraform.io/providers/poseidon/ct",
     "owner": "poseidon",
     "repo": "terraform-provider-ct",
-    "rev": "v0.13.0",
+    "rev": "v0.14.0",
     "spdx": "Apache-2.0",
-    "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA="
+    "vendorHash": "sha256-blWCf8O0B7INdZnlhOup6oihFEMY3UTmC1CF+0DJqUU="
   },
   "poseidon_matchbox": {
     "hash": "sha256-B1PxdbqXrB1ioB5utI4LI6rkhwHmaAiYkSxRAcjJnAA=",

From feb904dec2df5f11bcc9e80a94a26901413fa60b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 5 Nov 2025 17:06:35 +0100
Subject: [PATCH 5915/6226] python313Packages.botocore-stubs: 1.40.65 ->
 1.40.66

---
 pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index 0edeee6056a7..bf1f30fa0f34 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.40.65";
+  version = "1.40.66";
   pyproject = true;
 
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-MfO51dsNHcZknRHBg8thOs8rXTKXnBYIUtSvtVRC7bo=";
+    hash = "sha256-ilKalmsJ/eGP/p5SaCoDOW96arm6WOX9c4203Gg4Bmo=";
   };
 
   nativeBuildInputs = [ setuptools ];

From 7ebc446a4a14f324ac8116dd30b8287484f70136 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 6 Nov 2025 17:19:05 +0100
Subject: [PATCH 5916/6226] python313Packages.botocore-stubs: 1.40.66 ->
 1.40.67

---
 pkgs/development/python-modules/botocore-stubs/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/botocore-stubs/default.nix b/pkgs/development/python-modules/botocore-stubs/default.nix
index bf1f30fa0f34..24206df5f31c 100644
--- a/pkgs/development/python-modules/botocore-stubs/default.nix
+++ b/pkgs/development/python-modules/botocore-stubs/default.nix
@@ -9,13 +9,13 @@
 
 buildPythonPackage rec {
   pname = "botocore-stubs";
-  version = "1.40.66";
+  version = "1.40.67";
   pyproject = true;
 
   src = fetchPypi {
     pname = "botocore_stubs";
     inherit version;
-    hash = "sha256-ilKalmsJ/eGP/p5SaCoDOW96arm6WOX9c4203Gg4Bmo=";
+    hash = "sha256-hk+f7UJy1+YrSlHaOxRe30J0AsH5l4YSpETtHo/fncc=";
   };
 
   nativeBuildInputs = [ setuptools ];

From da9a0d3fbfdd824722e3a8d73d0b9829dee64a4f Mon Sep 17 00:00:00 2001
From: Anton Mosich <anton@mosich.at>
Date: Thu, 6 Nov 2025 17:20:21 +0100
Subject: [PATCH 5917/6226] soju: 0.9.0 -> 0.10.0

Changelog: https://codeberg.org/emersion/soju/releases/tag/v0.10.0
---
 pkgs/by-name/so/soju/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/so/soju/package.nix b/pkgs/by-name/so/soju/package.nix
index 1b5af7fb121d..5b605e01541b 100644
--- a/pkgs/by-name/so/soju/package.nix
+++ b/pkgs/by-name/so/soju/package.nix
@@ -9,17 +9,17 @@
 
 buildGoModule rec {
   pname = "soju";
-  version = "0.9.0";
+  version = "0.10.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "emersion";
     repo = "soju";
     rev = "v${version}";
-    hash = "sha256-qbSTaE0qOeXVcEmOver8Tu+gwV4cP4gNzIxByLKApCU=";
+    hash = "sha256-1kdaLmgikRbk/B+HGTMKnhqbTho4KmvDTuizhEE3DAw=";
   };
 
-  vendorHash = "sha256-JhoAtBw4O6lOd27dIXBNvA9EfUH5AD3ZHuGcWgU/Xv0=";
+  vendorHash = "sha256-NP4njea0hcklxWFoxPQqrvyWExeRP/TOzUJcamRnx+s=";
 
   nativeBuildInputs = [
     installShellFiles

From bbf15c1160665d1d907371963e8c29613cc84d9f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 6 Nov 2025 17:20:58 +0100
Subject: [PATCH 5918/6226] python313Packages.tencentcloud-sdk-python: 3.0.1482
 -> 3.0.1483

Diff: https://github.com/TencentCloud/tencentcloud-sdk-python/compare/3.0.1482...3.0.1483

Changelog: https://github.com/TencentCloud/tencentcloud-sdk-python/blob/3.0.1483/CHANGELOG.md
---
 .../python-modules/tencentcloud-sdk-python/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
index 8e282138421e..e639430287ce 100644
--- a/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
+++ b/pkgs/development/python-modules/tencentcloud-sdk-python/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "tencentcloud-sdk-python";
-  version = "3.0.1482";
+  version = "3.0.1483";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "TencentCloud";
     repo = "tencentcloud-sdk-python";
     tag = version;
-    hash = "sha256-dllmMdjI4osrtdTN5qo2k/KtEKDpF9G1Ul3JkegvMt0=";
+    hash = "sha256-yidKh50qnikyhBeuMKxiVD4xdqRO2ReJp1SuD266lHM=";
   };
 
   build-system = [ setuptools ];

From 9bf1d7c6cf36fb093bd0c445489e389aaa4d6f92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= <gutyina.gergo.2@gmail.com>
Date: Thu, 6 Nov 2025 16:25:28 +0000
Subject: [PATCH 5919/6226] bottom: 0.11.2 -> 0.11.3

---
 pkgs/by-name/bo/bottom/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix
index db6d3d44fe1a..9afdac3ebfdf 100644
--- a/pkgs/by-name/bo/bottom/package.nix
+++ b/pkgs/by-name/bo/bottom/package.nix
@@ -10,16 +10,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "bottom";
-  version = "0.11.2";
+  version = "0.11.3";
 
   src = fetchFromGitHub {
     owner = "ClementTsang";
     repo = "bottom";
     tag = version;
-    hash = "sha256-xX7W137OCMbdOsuFSv7lvKn67jDUKuKmtTSRt5Bb3i0=";
+    hash = "sha256-7rVvKAqK8hqICnSr/Ax9ndsIZAdTaUyOAoVZ13W5BJs=";
   };
 
-  cargoHash = "sha256-IG+6UUQhFanWjNprjwlPsFHfzxU+TGeNR82xiy+4bWg=";
+  cargoHash = "sha256-OXprj84ixm5KFayWsHuxCB3p5Ob/oZgsk3u3lqkOiuk=";
 
   nativeBuildInputs = [
     autoAddDriverRunpath

From dbbdc29a847d8c888da5926e0dcccb704174ceac Mon Sep 17 00:00:00 2001
From: Moraxyc <i@qaq.li>
Date: Fri, 7 Nov 2025 00:32:47 +0800
Subject: [PATCH 5920/6226] zatackax: enable on darwin

---
 ...SDL_main-redefinition-issue-on-macOS.patch | 25 +++++++++++++++++++
 pkgs/by-name/za/zatackax/package.nix          | 13 +++++++++-
 2 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/za/zatackax/0001-Fix-SDL_main-redefinition-issue-on-macOS.patch

diff --git a/pkgs/by-name/za/zatackax/0001-Fix-SDL_main-redefinition-issue-on-macOS.patch b/pkgs/by-name/za/zatackax/0001-Fix-SDL_main-redefinition-issue-on-macOS.patch
new file mode 100644
index 000000000000..992a31664df6
--- /dev/null
+++ b/pkgs/by-name/za/zatackax/0001-Fix-SDL_main-redefinition-issue-on-macOS.patch
@@ -0,0 +1,25 @@
+From 9cf8d3f1025689f3765da2f0a27561a6bfe5c3cb Mon Sep 17 00:00:00 2001
+From: Moraxyc <i@qaq.li>
+Date: Fri, 7 Nov 2025 00:23:44 +0800
+Subject: [PATCH] Fix SDL_main redefinition issue on macOS
+
+---
+ src/zatackax.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/zatackax.c b/src/zatackax.c
+index dad2fa9..47a8bd7 100644
+--- a/src/zatackax.c
++++ b/src/zatackax.c
+@@ -16,6 +16,8 @@
+  */
+ 
+ #include "zatackax.h"
++// override SDL_main.h redefining main to SDL_main on darwin
++#define main main
+ 
+ static const unsigned int FPS_CAP = 100;
+ 
+-- 
+2.51.0
+
diff --git a/pkgs/by-name/za/zatackax/package.nix b/pkgs/by-name/za/zatackax/package.nix
index 8361f286d084..62385ebb299d 100644
--- a/pkgs/by-name/za/zatackax/package.nix
+++ b/pkgs/by-name/za/zatackax/package.nix
@@ -21,6 +21,17 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-1m99hi0kjpj5Yl1nAmwSMMdQWcP0rfLLPFJPkU4oVbM=";
   };
 
+  # src/zatackax.c:2069:5: error: conflicting types for 'SDL_main'
+  # Fix SDL_main redefinition issue on darwin
+  patches = lib.optional stdenv.hostPlatform.isDarwin ./0001-Fix-SDL_main-redefinition-issue-on-macOS.patch;
+
+  # malloc.h is not needed because stdlib.h is already included.
+  # On darwin, malloc.h does not even exist, resulting in an error.
+  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''
+    substituteInPlace src/zatackax.h \
+      --replace-fail '#include <malloc.h>' ""
+  '';
+
   strictDeps = true;
 
   nativeBuildInputs = [
@@ -45,6 +56,6 @@ stdenv.mkDerivation (finalAttrs: {
     license = lib.licenses.gpl3Plus;
     maintainers = [ lib.maintainers.alch-emi ];
     mainProgram = "zatackax";
-    platforms = lib.platforms.linux;
+    platforms = with lib.platforms; linux ++ darwin;
   };
 })

From 7e9d21f2ac18d37b670468b6c94ae6fa24f7d96e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 16:34:47 +0000
Subject: [PATCH 5921/6226] grafanaPlugins.volkovlabs-form-panel: 6.2.0 ->
 6.3.1

---
 .../grafana/plugins/volkovlabs-form-panel/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix
index 0e684bba8b5d..e514350b0431 100644
--- a/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix
+++ b/pkgs/servers/monitoring/grafana/plugins/volkovlabs-form-panel/default.nix
@@ -2,8 +2,8 @@
 
 grafanaPlugin {
   pname = "volkovlabs-form-panel";
-  version = "6.2.0";
-  zipHash = "sha256-o7P2hQBHsSd9qZh1QMlzkJtwo8ug+3E0aEofJf1wukk=";
+  version = "6.3.1";
+  zipHash = "sha256-HuzhTWey/6xLu6GPXGnN4/D3rs7yJ2sPGzO8PPuZmNA=";
   meta = with lib; {
     description = "Plugin that allows inserting and updating application data, as well as modifying configuration directly from your Grafana dashboard";
     license = licenses.asl20;

From 3df17d1cc1963d7f0588fb4f27c80fc31d54a8dc Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 6 Nov 2025 16:32:30 +0000
Subject: [PATCH 5922/6226] olivetin: 2025.10.30 -> 2025.11.06

Changelog: https://github.com/OliveTin/OliveTin/releases/tag/2025.11.06
Diff: https://github.com/OliveTin/OliveTin/compare/2025.10.30...2025.11.06
---
 pkgs/by-name/ol/olivetin/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ol/olivetin/package.nix b/pkgs/by-name/ol/olivetin/package.nix
index f963e1eea386..85bd6725b49d 100644
--- a/pkgs/by-name/ol/olivetin/package.nix
+++ b/pkgs/by-name/ol/olivetin/package.nix
@@ -86,13 +86,13 @@ buildGoModule (
 
   {
     pname = "olivetin";
-    version = "2025.10.30";
+    version = "2025.11.06";
 
     src = fetchFromGitHub {
       owner = "OliveTin";
       repo = "OliveTin";
       tag = finalAttrs.version;
-      hash = "sha256-yzgyv/YLHXCU8h+c53qZQoY9dNOJdF0/EBBZJkN8Urc=";
+      hash = "sha256-81AcegFKG5TacKAv9kZgbSOKcAx+ZmK3rqrk3ia/res=";
     };
 
     modRoot = "service";

From f7b7373a0db1361825251488ea0e57167e963062 Mon Sep 17 00:00:00 2001
From: Defelo <mail@defelo.de>
Date: Thu, 6 Nov 2025 16:30:24 +0000
Subject: [PATCH 5923/6226] bruijn: 0-unstable-2025-10-28 ->
 0-unstable-2025-11-01

Diff: https://github.com/marvinborner/bruijn/compare/9b7ff47f7c4d75093fcf6910b8d33aa44e0516ad...c37a9d27b9f654b1e0118d32269a1548800b062b
---
 pkgs/by-name/br/bruijn/generated.nix | 4 ++--
 pkgs/by-name/br/bruijn/version.txt   | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/br/bruijn/generated.nix b/pkgs/by-name/br/bruijn/generated.nix
index 58286f57abc8..573a0f78f0b3 100644
--- a/pkgs/by-name/br/bruijn/generated.nix
+++ b/pkgs/by-name/br/bruijn/generated.nix
@@ -24,8 +24,8 @@ mkDerivation {
   pname = "bruijn";
   version = "0.1.0.0";
   src = fetchzip {
-    url = "https://github.com/marvinborner/bruijn/archive/9b7ff47f7c4d75093fcf6910b8d33aa44e0516ad.tar.gz";
-    sha256 = "1zx2pcrd25gsq6qz0rixpsdwm0h05cjn5f1a2d2ivbmax88yvsjf";
+    url = "https://github.com/marvinborner/bruijn/archive/c37a9d27b9f654b1e0118d32269a1548800b062b.tar.gz";
+    sha256 = "1a667693agsc559yy4k04gxv1hlsgkn3aw64yvg876fbn5dr7sk3";
   };
   isLibrary = true;
   isExecutable = true;
diff --git a/pkgs/by-name/br/bruijn/version.txt b/pkgs/by-name/br/bruijn/version.txt
index 796b237cd580..7b5b0a92b554 100644
--- a/pkgs/by-name/br/bruijn/version.txt
+++ b/pkgs/by-name/br/bruijn/version.txt
@@ -1 +1 @@
-0-unstable-2025-10-28
+0-unstable-2025-11-01

From a146035a2b1295b2d349fc1762c04cb4fb1e1f0b Mon Sep 17 00:00:00 2001
From: Wolfgang Walther <walther@technowledgy.de>
Date: Thu, 6 Nov 2025 17:46:56 +0100
Subject: [PATCH 5924/6226] ci/github-script/bot: fix concurrency limit

This was introduced as part of the hotfix PR to avoid hitting API rate
limits - but the condition was wrong. It was supposed to trigger in all
PR contexts, not only for the Test workflow.
---
 ci/github-script/bot.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js
index 34abe96941fb..2b52955307ae 100644
--- a/ci/github-script/bot.js
+++ b/ci/github-script/bot.js
@@ -579,7 +579,7 @@ module.exports = async ({ github, context, core, dry }) => {
   // We'll only boost concurrency when we're running many PRs in parallel on a schedule,
   // but not for single PRs. This avoids things going wild, when we accidentally make
   // too many API requests on treewides.
-  const maxConcurrent = context.eventName === 'pull_request' ? 1 : 20
+  const maxConcurrent = context.payload.pull_request ? 1 : 20
 
   await withRateLimit({ github, core, maxConcurrent }, async (stats) => {
     if (context.payload.pull_request) {

From 02dad28fe83d67c2e63886766a8c259049bef1e7 Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss@proton.me>
Date: Thu, 6 Nov 2025 15:59:38 +0300
Subject: [PATCH 5925/6226] helix-db: init at 2.0.5

---
 .../by-name/he/helix-db/disable-updates.patch | 36 ++++++++++++
 pkgs/by-name/he/helix-db/package.nix          | 58 +++++++++++++++++++
 2 files changed, 94 insertions(+)
 create mode 100644 pkgs/by-name/he/helix-db/disable-updates.patch
 create mode 100644 pkgs/by-name/he/helix-db/package.nix

diff --git a/pkgs/by-name/he/helix-db/disable-updates.patch b/pkgs/by-name/he/helix-db/disable-updates.patch
new file mode 100644
index 000000000000..e4b26c3265d8
--- /dev/null
+++ b/pkgs/by-name/he/helix-db/disable-updates.patch
@@ -0,0 +1,36 @@
+diff --git a/helix-cli/src/main.rs b/helix-cli/src/main.rs
+index 18e279fd..a3ec271c 100644
+--- a/helix-cli/src/main.rs
++++ b/helix-cli/src/main.rs
+@@ -121,13 +121,6 @@ enum Commands {
+         action: MetricsAction,
+     },
+ 
+-    /// Update to the latest version
+-    Update {
+-        /// Force update even if already on latest version
+-        #[clap(long)]
+-        force: bool,
+-    },
+-
+     /// Migrate v1 project to v2 format
+     Migrate {
+         /// Project directory to migrate (defaults to current directory)
+@@ -253,9 +246,6 @@ async fn main() -> Result<()> {
+     // Send CLI install event (only first time)
+     metrics_sender.send_cli_install_event_if_first_time();
+ 
+-    // Check for updates before processing commands
+-    update::check_for_updates().await?;
+-
+     let cli = Cli::parse();
+ 
+     let result = match cli.command {
+@@ -280,7 +270,6 @@ async fn main() -> Result<()> {
+         Commands::Prune { instance, all } => commands::prune::run(instance, all).await,
+         Commands::Delete { instance } => commands::delete::run(instance).await,
+         Commands::Metrics { action } => commands::metrics::run(action).await,
+-        Commands::Update { force } => commands::update::run(force).await,
+         Commands::Migrate {
+             path,
+             queries_dir,
diff --git a/pkgs/by-name/he/helix-db/package.nix b/pkgs/by-name/he/helix-db/package.nix
new file mode 100644
index 000000000000..30ad67eed5e4
--- /dev/null
+++ b/pkgs/by-name/he/helix-db/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  stdenv,
+  rustPlatform,
+  fetchFromGitHub,
+  pkg-config,
+  openssl,
+  versionCheckHook,
+  nix-update-script,
+}:
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "helix-db";
+  version = "2.0.5";
+
+  src = fetchFromGitHub {
+    repo = "helix-db";
+    owner = "HelixDB";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-lNAaOpF6g2yunGP9bgsMVvVc7YMfZ44WfkumR+8Btlg=";
+  };
+
+  cargoHash = "sha256-YCBTSm252eUJeOyMIEcZ+0AyHoYM1QceYSHhp+qwf6Q=";
+
+  patches = [
+    #There are no feature yet
+    ./disable-updates.patch
+  ];
+
+  nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ];
+
+  buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ openssl ];
+
+  env.OPENSSL_NO_VENDOR = true;
+
+  cargoBuildFlags = [
+    "-p"
+    "helix-cli"
+  ];
+
+  #There are no tests
+  doCheck = false;
+
+  nativeInstallCheckInputs = [ versionCheckHook ];
+
+  doInstallCheck = true;
+  versionCheckProgramArg = "--version";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Open-source graph-vector database built from scratch in Rust";
+    homepage = "https://github.com/HelixDB/helix-db";
+    changelog = "https://github.com/HelixDB/helix-db/releases/tag/v${finalAttrs.version}";
+    license = lib.licenses.agpl3Only;
+    maintainers = with lib.maintainers; [ nartsiss ];
+    mainProgram = "helix";
+  };
+})

From 85a8de6fa3e5f109890cf0f99bf56b727c40b70d Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 6 Nov 2025 20:00:20 +0300
Subject: [PATCH 5926/6226] kdePackages.libquotient: 0.9.1 -> 0.9.5, fix build
 with Qt 6.10

---
 pkgs/development/libraries/libquotient/default.nix | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libquotient/default.nix b/pkgs/development/libraries/libquotient/default.nix
index 850d0c1caa70..9441dfa4aeea 100644
--- a/pkgs/development/libraries/libquotient/default.nix
+++ b/pkgs/development/libraries/libquotient/default.nix
@@ -2,6 +2,7 @@
   stdenv,
   lib,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   olm,
   openssl,
@@ -12,7 +13,7 @@
 
 stdenv.mkDerivation rec {
   pname = "libquotient";
-  version = "0.9.1";
+  version = "0.9.5";
 
   outputs = [
     "out"
@@ -23,9 +24,18 @@ stdenv.mkDerivation rec {
     owner = "quotient-im";
     repo = "libQuotient";
     rev = version;
-    hash = "sha256-R9ms3sYGdHaYKUMnZyBjw5KCik05k93vlvXMRtAXh5Y=";
+    hash = "sha256-wdIE5LI4l3WUvpGfoJBL8sjBl2k8NfZTh9CjfJc9FIA=";
   };
 
+  patches = [
+    # Qt 6.10 compat
+    # FIXME: remove in next update
+    (fetchpatch {
+      url = "https://github.com/quotient-im/libQuotient/commit/ea83157eed37ff97ab275a5d14c971f0a5a70595.diff";
+      hash = "sha256-JMdcywGgZ0Gev/Nce4oPiMJQxTBJYPoq+WoT3WLWWNQ=";
+    })
+  ];
+
   nativeBuildInputs = [ cmake ];
 
   propagatedBuildInputs = [

From b7a6c33d1afe332de0c6735de52db5aa0ef0bb48 Mon Sep 17 00:00:00 2001
From: Simon Engmann <simon.engmann@sovity.de>
Date: Thu, 6 Nov 2025 18:13:23 +0100
Subject: [PATCH 5927/6226] wireshark: set Darwin minimum SDK version to 12.0

Required by Qt 6. CMake will error without this.
---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index 1d74c153494f..aafea4cae0e4 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -9,6 +9,7 @@
   buildPackages,
   c-ares,
   cmake,
+  darwinMinVersionHook,
   fixDarwinDylibNames,
   flex,
   gettext,
@@ -147,6 +148,8 @@ stdenv.mkDerivation rec {
   ]
   ++ lib.optionals stdenv.hostPlatform.isDarwin [
     gmp
+    # Required by Qt 6
+    (darwinMinVersionHook "12.0")
   ];
 
   strictDeps = true;

From d7e8af6a10e29a38fe999f5fdc8fc0b463aab1de Mon Sep 17 00:00:00 2001
From: Simon Engmann <simon.engmann@sovity.de>
Date: Thu, 6 Nov 2025 18:14:55 +0100
Subject: [PATCH 5928/6226] wireshark: fix extcap directory

Starting with Wireshark 4.6.0, the extcap binaries are placed under
`libexec` instead of `lib`.
---
 pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix
index aafea4cae0e4..a80ee39d368d 100644
--- a/pkgs/applications/networking/sniffers/wireshark/default.nix
+++ b/pkgs/applications/networking/sniffers/wireshark/default.nix
@@ -195,7 +195,7 @@ stdenv.mkDerivation rec {
       flags+=(-change @rpath/"$(basename "$file")" "$file")
     done
 
-    for file in $out/lib/wireshark/extcap/*; do
+    for file in $out/libexec/wireshark/extcap/*; do
       if [ -L "$file" ]; then continue; fi
       echo "$file: fixing dylib references"
       # note that -id does nothing on binaries
@@ -213,7 +213,7 @@ stdenv.mkDerivation rec {
     rm -rf $out/Applications/Wireshark.app/Contents/MacOS/extcap $out/Applications/Wireshark.app/Contents/PlugIns
     mkdir -p $out/Applications/Wireshark.app/Contents/PlugIns
     cp -r $out/lib/wireshark/plugins $out/Applications/Wireshark.app/Contents/PlugIns/wireshark
-    cp -r $out/lib/wireshark/extcap $out/Applications/Wireshark.app/Contents/MacOS/extcap
+    cp -r $out/libexec/wireshark/extcap $out/Applications/Wireshark.app/Contents/MacOS/extcap
   '';
 
   meta = {

From 7581a63bed2694cf17f57fc55822d25a2484e557 Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Mon, 27 Oct 2025 09:41:33 +0800
Subject: [PATCH 5929/6226] v2rayn: 7.14.4 -> 7.15.6

---
 pkgs/by-name/v2/v2rayn/deps.json   | 135 ++++++++++++++++++-----------
 pkgs/by-name/v2/v2rayn/package.nix |  11 +--
 2 files changed, 89 insertions(+), 57 deletions(-)

diff --git a/pkgs/by-name/v2/v2rayn/deps.json b/pkgs/by-name/v2/v2rayn/deps.json
index d44298118198..3aca1d055f16 100644
--- a/pkgs/by-name/v2/v2rayn/deps.json
+++ b/pkgs/by-name/v2/v2rayn/deps.json
@@ -1,4 +1,9 @@
 [
+  {
+    "pname": "Avalonia",
+    "version": "11.0.0",
+    "hash": "sha256-7QE0MtD1QDiG3gRx5xW33E33BXyEtASQSw+Wi3Lmy3E="
+  },
   {
     "pname": "Avalonia",
     "version": "11.1.3",
@@ -6,19 +11,29 @@
   },
   {
     "pname": "Avalonia",
-    "version": "11.2.1",
-    "hash": "sha256-KdjhwDKlii12v7HNI3NsYAM1qYoXKRsVN2scQJbYMTc="
+    "version": "11.3.7",
+    "hash": "sha256-FsBz3mwSn+JZvSACEFZGzYBdX+4rFHSFQfl9RYT7BAM="
   },
   {
     "pname": "Avalonia",
-    "version": "11.3.4",
-    "hash": "sha256-3ojATZlOAUEZ6Io3fUwtaJaD2h9vWMw/X/mGyZljRPU="
+    "version": "11.3.8",
+    "hash": "sha256-0cM3VVudDUELNE/fWehuCplPKLITjw1hbg9IGtIm20g="
   },
   {
     "pname": "Avalonia.Angle.Windows.Natives",
     "version": "2.1.25547.20250602",
     "hash": "sha256-LE/lENAHptmz6t3T/AoJwnhpda+xs7PqriNGzdcfg8M="
   },
+  {
+    "pname": "Avalonia.AvaloniaEdit",
+    "version": "11.3.0",
+    "hash": "sha256-avrZ9um57Y3wTslyeBAXeCQrcb7a3kODFc0SSvthHF4="
+  },
+  {
+    "pname": "Avalonia.BuildServices",
+    "version": "0.0.28",
+    "hash": "sha256-7NQWQl3xrBDOXhGihCkt5DIrws48KyDGon/7+gPzMDU="
+  },
   {
     "pname": "Avalonia.BuildServices",
     "version": "0.0.29",
@@ -26,43 +41,48 @@
   },
   {
     "pname": "Avalonia.BuildServices",
-    "version": "0.0.31",
-    "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA="
+    "version": "11.3.1",
+    "hash": "sha256-JYcA/DgTHRJ02/FcURqtJnXYhhdzki8DGECLkZ4zONg="
   },
   {
     "pname": "Avalonia.Controls.ColorPicker",
-    "version": "11.3.4",
-    "hash": "sha256-/RbL/Yi5d/xmPVTG2pJFZ1K44iECajkUU8MfZStKxAM="
+    "version": "11.3.8",
+    "hash": "sha256-cB3mYR1X8Gzu1FQfWCJpfWosnpojIQhRSxrjYz4zD6g="
   },
   {
     "pname": "Avalonia.Controls.DataGrid",
-    "version": "11.3.4",
-    "hash": "sha256-x3EtbbdgJ/WNBpltO+ztmI6JSQ2p5Ey4LDDX8FI1rXQ="
+    "version": "11.3.8",
+    "hash": "sha256-5rB33sqLIoDIEjlGlJFRGf1lLwvnVh8o8/16GQzu15Q="
   },
   {
     "pname": "Avalonia.Desktop",
-    "version": "11.3.4",
-    "hash": "sha256-HTLnySk+navLLYE05m4HDpHwgp3RAk1OKYAjVaUirDk="
+    "version": "11.3.8",
+    "hash": "sha256-X/ggsRzsN7o3O4Iw4uvjgOdlW58Xbe8Jpv4llRuFcoA="
   },
   {
     "pname": "Avalonia.Diagnostics",
-    "version": "11.3.4",
-    "hash": "sha256-85N0jIcrFNThaDhvcPU8/g84ISWILx2cXHVTPW0kJbI="
+    "version": "11.3.8",
+    "hash": "sha256-eOLf2Id4Olbq/nMWERarked+vg5ZnVMCxMKOXBfqAqM="
   },
   {
     "pname": "Avalonia.FreeDesktop",
-    "version": "11.3.4",
-    "hash": "sha256-mH9d3yJbf10NqOI3PR1cCoGyyEQbnKRNDmxFN+2bS9c="
+    "version": "11.3.8",
+    "hash": "sha256-XJogaWo4ZNg/PvckA6D5EEuyQneYUKDePnT9snNwaHs="
   },
   {
     "pname": "Avalonia.Native",
-    "version": "11.3.4",
-    "hash": "sha256-49rMUvhG5Dsl9RqhtD0i6H9X1g5768VdrW5l8axkwNI="
+    "version": "11.3.8",
+    "hash": "sha256-Hm4uneEN3rQVmSp1Ai4cDSTJpixYDzYJzEkAesvwxPw="
   },
   {
     "pname": "Avalonia.ReactiveUI",
-    "version": "11.3.4",
-    "hash": "sha256-6AZrrX1S0SSB5GzqJx4nPI/nSyvlu/iXW99mO4v1jK0="
+    "version": "11.3.8",
+    "hash": "sha256-QwIPrfoxNw/u/deWc5C3ps0eQDBFOocMH74nlVahQuM="
+  },
+  {
+    "pname": "Avalonia.Remote.Protocol",
+    "version": "11.0.0",
+    "hash": "sha256-gkVpdbk/0RDM7Hhq0jwZwltDpTsGRmbX+ZFTjWYYoKw="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
@@ -71,33 +91,33 @@
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.2.1",
-    "hash": "sha256-RlO65QbExBdjEUY66CTlHefRdTZWzZbN4ksibVXxKv4="
+    "version": "11.3.7",
+    "hash": "sha256-A3FubRH8Li81pYhEUGQatM0etli5lSkDf2+iPxD95gs="
   },
   {
     "pname": "Avalonia.Remote.Protocol",
-    "version": "11.3.4",
-    "hash": "sha256-kVHhVHtwl1ssEf4STciY6OV0u2zyV8nOb2mSXnPH+nk="
+    "version": "11.3.8",
+    "hash": "sha256-pCIcQuTTcpik4xg5x8Y/QuXaW/GmNny/5ZBVr0bhmNU="
   },
   {
     "pname": "Avalonia.Skia",
-    "version": "11.3.4",
-    "hash": "sha256-CCjlniydh91cypVmnK88UvYZH1Arjbfr7L/kNJMjyTo="
+    "version": "11.3.8",
+    "hash": "sha256-FeJ6tdgeGKHkv0JKPOq2eHTxaDTT0t2yJ7wavBKnr68="
   },
   {
     "pname": "Avalonia.Themes.Simple",
-    "version": "11.3.4",
-    "hash": "sha256-lvjlqHU6X9ftLOXHAp0uzPfApIfte9YyIBJ+4CAp1/s="
+    "version": "11.3.8",
+    "hash": "sha256-GSD4yvyDKqBSGV/rwE/EO3CTp9dG4eR4B5H0Y/u9+hE="
   },
   {
     "pname": "Avalonia.Win32",
-    "version": "11.3.4",
-    "hash": "sha256-pBc4jtBOalc29D+4XzOATDjiyuK+sMMpQfhXn2m9XJo="
+    "version": "11.3.8",
+    "hash": "sha256-YwzyF4YJtCzcLpGxDe6U3Tpxjcqft8mcYjUNnL2Ockg="
   },
   {
     "pname": "Avalonia.X11",
-    "version": "11.3.4",
-    "hash": "sha256-POuDAvqpPYV6Ob0a4W6QIVL0s4/bQbRhshat9z5lvt0="
+    "version": "11.3.8",
+    "hash": "sha256-SlAWkiaGYc+Ynq4QcO3/xorz2EIWWyrZcHXIk7F68i0="
   },
   {
     "pname": "CliWrap",
@@ -174,15 +194,20 @@
     "version": "5.0.0",
     "hash": "sha256-9kylPGfKZc58yFqNKa77stomcoNnMeERXozWJzDcUIA="
   },
+  {
+    "pname": "Microsoft.Win32.SystemEvents",
+    "version": "6.0.0",
+    "hash": "sha256-N9EVZbl5w1VnMywGXyaVWzT9lh84iaJ3aD48hIBk1zA="
+  },
   {
     "pname": "NLog",
-    "version": "6.0.2",
-    "hash": "sha256-sToQRwukDjUo3ytSmHXT5p4j6fTv1utHkQKeF48EWnQ="
+    "version": "6.0.5",
+    "hash": "sha256-aP7PsAkzjlZF6m1Tr87dX+5X0YIGov7DrTrIdsqhLUY="
   },
   {
     "pname": "QRCoder",
-    "version": "1.6.0",
-    "hash": "sha256-2Ev/6d7PH6K4dVYQQHlZ+ZggkCnDtrlaGygs65mDo28="
+    "version": "1.7.0",
+    "hash": "sha256-sssSQBTHf1cUWNQYFEEJ8PRLs486ciDsXtrwL+ozZIU="
   },
   {
     "pname": "ReactiveUI",
@@ -196,13 +221,18 @@
   },
   {
     "pname": "Semi.Avalonia",
-    "version": "11.2.1.9",
-    "hash": "sha256-4NsQyk70xjD+V0X/0wuWhQshkadbBVs1iyRNEPmExkk="
+    "version": "11.3.7",
+    "hash": "sha256-iOf7KhTmHt0vqkRyloM+yueo/acHHwFQd/5UZ1r0SD8="
+  },
+  {
+    "pname": "Semi.Avalonia.AvaloniaEdit",
+    "version": "11.2.0.1",
+    "hash": "sha256-W0gAoDPlStqsznFS6eLDI4GFAlIDGyQq2L+DG/WKY1I="
   },
   {
     "pname": "Semi.Avalonia.DataGrid",
-    "version": "11.2.1.9",
-    "hash": "sha256-6V1agOI1KcTXQN1+uab7tSZH1ZdJEQrVfxZ5ha1cvGI="
+    "version": "11.3.7",
+    "hash": "sha256-XD7a6YY5L24peG24GaItZq7PZEdK1RP1eS0QxFbASJU="
   },
   {
     "pname": "SkiaSharp",
@@ -249,16 +279,6 @@
     "version": "15.3.1",
     "hash": "sha256-1MlkqywOtLr5TbQ+zAqzw0l92LK9+9h2+sJgmfV32RU="
   },
-  {
-    "pname": "Splat",
-    "version": "15.5.3",
-    "hash": "sha256-nG2Q8PYkGgasSCoK2dO1TK4drljqr+1D6K9letsOQ08="
-  },
-  {
-    "pname": "Splat.NLog",
-    "version": "15.5.3",
-    "hash": "sha256-8s6PBlwaqOQfOR3NsloIufdXQELVyzrItcIUjrwec6U="
-  },
   {
     "pname": "sqlite-net-pcl",
     "version": "1.9.172",
@@ -284,6 +304,11 @@
     "version": "2.1.2",
     "hash": "sha256-e56+FgxEHqV3SGQx0ZAqzlscPxNUPXJ8Ls9rtqET1S4="
   },
+  {
+    "pname": "System.ComponentModel.Annotations",
+    "version": "4.5.0",
+    "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
+  },
   {
     "pname": "System.ComponentModel.Annotations",
     "version": "5.0.0",
@@ -294,6 +319,11 @@
     "version": "6.0.0",
     "hash": "sha256-zUXIQtAFKbiUMKCrXzO4mOTD5EUphZzghBYKXprowSM="
   },
+  {
+    "pname": "System.Drawing.Common",
+    "version": "6.0.0",
+    "hash": "sha256-/9EaAbEeOjELRSMZaImS1O8FmUe8j4WuFUw1VOrPyAo="
+  },
   {
     "pname": "System.IO.Pipelines",
     "version": "8.0.0",
@@ -309,6 +339,11 @@
     "version": "6.0.1",
     "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="
   },
+  {
+    "pname": "System.Reactive",
+    "version": "6.1.0",
+    "hash": "sha256-zACYoZmKxHo0qKY8FOVa7jIsw7dN7WjdXdRRV95qY2Y="
+  },
   {
     "pname": "System.Security.AccessControl",
     "version": "6.0.1",
diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix
index 8aff827ea49a..0faa6c9c91a3 100644
--- a/pkgs/by-name/v2/v2rayn/package.nix
+++ b/pkgs/by-name/v2/v2rayn/package.nix
@@ -15,19 +15,18 @@
   krb5,
   bash,
   xorg,
-  xdg-utils,
   nix-update-script,
 }:
 
 buildDotnetModule (finalAttrs: {
   pname = "v2rayn";
-  version = "7.14.4";
+  version = "7.15.6";
 
   src = fetchFromGitHub {
     owner = "2dust";
     repo = "v2rayN";
     tag = finalAttrs.version;
-    hash = "sha256-zfQza07GhYFEHwl4w5hqqE9JP/0yY5KIj0zRRNmAECA=";
+    hash = "sha256-YBOfewVdFWjP47JIWJErqEqR8/vSJLaFkZ3uJblPK6Q=";
     fetchSubmodules = true;
   };
 
@@ -41,13 +40,11 @@ buildDotnetModule (finalAttrs: {
     chmod +x v2rayN/ServiceLib/Sample/kill_as_sudo_linux_sh
     patchShebangs v2rayN/ServiceLib/Sample/kill_as_sudo_linux_sh
     substituteInPlace v2rayN/ServiceLib/Global.cs \
-      --replace-fail "/bin/bash" "${bash}/bin/bash"
+      --replace-fail "/bin/bash" "${lib.getExe bash}"
     substituteInPlace v2rayN/ServiceLib/Manager/CoreAdminManager.cs \
-      --replace-fail "/bin/bash" "${bash}/bin/bash"
+      --replace-fail "/bin/bash" "${lib.getExe bash}"
     substituteInPlace v2rayN/ServiceLib/Handler/AutoStartupHandler.cs \
       --replace-fail "Utils.GetExePath())" '"v2rayN")'
-    substituteInPlace v2rayN/ServiceLib/ViewModels/MainWindowViewModel.cs \
-      --replace-fail "nautilus" "${xdg-utils}/bin/xdg-open"
     substituteInPlace v2rayN/ServiceLib/Manager/CoreManager.cs \
       --replace-fail 'Environment.GetEnvironmentVariable(Global.LocalAppData) == "1"' "false"
   '';

From 77addeb72da0f8763182b4811280f392da7e7f3f Mon Sep 17 00:00:00 2001
From: octvs <octvs@posteo.de>
Date: Thu, 6 Nov 2025 18:16:43 +0100
Subject: [PATCH 5930/6226] papis: fix build by upstream patch

---
 pkgs/development/python-modules/papis/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix
index 101f5fe21732..111bf954bef4 100644
--- a/pkgs/development/python-modules/papis/default.nix
+++ b/pkgs/development/python-modules/papis/default.nix
@@ -2,6 +2,7 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
+  fetchpatch2,
 
   # build-system
   hatchling,
@@ -123,6 +124,14 @@ buildPythonPackage rec {
     "test_yaml_unicode_dump"
   ];
 
+  patches = [
+    (fetchpatch2 {
+      name = "fix-support-new-click-in-papisrunner.patch";
+      url = "https://github.com/papis/papis/commit/0e3ffff4bd1b62cdf0a9fdc7f54d6a2e2ab90082.patch?full_index=1";
+      hash = "sha256-KUw5U5izTTWqXHzGWLibtqHWAsVxla6SA8x6SJ07/zU=";
+    })
+  ];
+
   meta = {
     description = "Powerful command-line document and bibliography manager";
     mainProgram = "papis";

From 65093c3eb52e860589a850044e9275af32f1114c Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 6 Nov 2025 20:21:18 +0300
Subject: [PATCH 5931/6226] kdePackages.angelfish: apply Qt 6.10 hack

---
 pkgs/kde/gear/angelfish/default.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/kde/gear/angelfish/default.nix b/pkgs/kde/gear/angelfish/default.nix
index 42fe1f1753c7..e59a1c956451 100644
--- a/pkgs/kde/gear/angelfish/default.nix
+++ b/pkgs/kde/gear/angelfish/default.nix
@@ -31,4 +31,7 @@ mkKdeDerivation rec {
     corrosion
     qcoro
   ];
+
+  # FIXME: work around Qt 6.10 cmake API changes
+  cmakeFlags = [ "-DQT_FIND_PRIVATE_MODULES=1" ];
 }

From 1f291f53d65f944c3c4c7a77c9f75e950ac03d5b Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Thu, 6 Nov 2025 20:00:39 +0300
Subject: [PATCH 5932/6226] kdePackages: Gear 25.08.2 -> 25.08.3

---
 pkgs/kde/generated/sources/gear.json | 1494 +++++++++++++-------------
 1 file changed, 747 insertions(+), 747 deletions(-)

diff --git a/pkgs/kde/generated/sources/gear.json b/pkgs/kde/generated/sources/gear.json
index 7c8a66002ab9..98fd3024c74e 100644
--- a/pkgs/kde/generated/sources/gear.json
+++ b/pkgs/kde/generated/sources/gear.json
@@ -1,1247 +1,1247 @@
 {
   "accessibility-inspector": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/accessibility-inspector-25.08.2.tar.xz",
-    "hash": "sha256-Z8RYiX+GK+aoQ0zI5x5By5974VtHT0t7a0TwC6+2UmE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/accessibility-inspector-25.08.3.tar.xz",
+    "hash": "sha256-qu5u3kDAOYIAffLouVLn/mxTFOFBhFCU4ox1U3NEeQA="
   },
   "akonadi": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-25.08.2.tar.xz",
-    "hash": "sha256-Qc/q3+h7Ao1yAGjAReuebLId+p7bJHpUiNmz/GExww4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-25.08.3.tar.xz",
+    "hash": "sha256-+Gf9HhbZ1jepLaszTcQXDyD1i+EzZzkglOxTnj7uAXo="
   },
   "akonadi-calendar": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-calendar-25.08.2.tar.xz",
-    "hash": "sha256-wnrtySzylXBjazodxARKvuKaajbTU23usy1VjXmzVGE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-calendar-25.08.3.tar.xz",
+    "hash": "sha256-vuMRKJCiHyq2AFholD0lbHnFGPwbWyR/AUy4vazdQMI="
   },
   "akonadi-calendar-tools": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-calendar-tools-25.08.2.tar.xz",
-    "hash": "sha256-nIS+nz+VDOV1oyjUrKia/3v8f5CijPRCNqgzUoTmOog="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-calendar-tools-25.08.3.tar.xz",
+    "hash": "sha256-jHkM7gF8fMMx97aQqCe9MsW0kmB5Z47CS7gA0mxPHqY="
   },
   "akonadi-contacts": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-contacts-25.08.2.tar.xz",
-    "hash": "sha256-ZQwDTN8qq15TqL5XnK1nep2PzDXttwTncgLpBbD44gI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-contacts-25.08.3.tar.xz",
+    "hash": "sha256-OEAOvm4cudm/U2vNwym9ZI0r2HviMn0EtJNhxmzz0k0="
   },
   "akonadi-import-wizard": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-import-wizard-25.08.2.tar.xz",
-    "hash": "sha256-ORQ1Jp8sBhoJ6KcnpbpuOdPFkItpF6EYRthEbkmgO9U="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-import-wizard-25.08.3.tar.xz",
+    "hash": "sha256-X9O1offbeIUoyXR/70tz8KjKfHvCzw41uC3ODK/tE5k="
   },
   "akonadi-mime": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-mime-25.08.2.tar.xz",
-    "hash": "sha256-AAdRMbRrwa/L6qP86IUvdr7W8FMVeY6GEY4PyuDE3ks="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-mime-25.08.3.tar.xz",
+    "hash": "sha256-ciKSy8ewUeaLC3wFo3H6VarzHqi8Z/LdHOcz4O2xImY="
   },
   "akonadi-search": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/akonadi-search-25.08.2.tar.xz",
-    "hash": "sha256-K+VinvzH8BNP22Gp+QYrxZsAq1XoG478dq8Yy11mpYg="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/akonadi-search-25.08.3.tar.xz",
+    "hash": "sha256-PI19LYADtJYBgxaA/BG6kNp5xRaYbMJscWALud5531E="
   },
   "akonadiconsole": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/akonadiconsole-25.08.2.tar.xz",
-    "hash": "sha256-OFPxGuQUZSF2SolzPnCJxmfpyntD/ckTsmTKWTdVIpE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/akonadiconsole-25.08.3.tar.xz",
+    "hash": "sha256-CJAdImBZ5k6kcUXw/g6XEEqf7no9SbHWnOeVxGnvRNo="
   },
   "akregator": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/akregator-25.08.2.tar.xz",
-    "hash": "sha256-0KZvccUVnLv+N+B2LRVXBRVpL4ZG+1WhkYDW1Sms/O4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/akregator-25.08.3.tar.xz",
+    "hash": "sha256-HGe7qUnvN2xwfUOV5qo3mNFy67cwOuNHIt/m1cCbD4M="
   },
   "alligator": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/alligator-25.08.2.tar.xz",
-    "hash": "sha256-QIZjRzpKuUJWnSeo1SfkroUrK8vDyhpHQcY+HX64P2Y="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/alligator-25.08.3.tar.xz",
+    "hash": "sha256-OAbXqoE/jrw061PPelDgaXObSbaR1Yt8kGOAXDTcuPo="
   },
   "analitza": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/analitza-25.08.2.tar.xz",
-    "hash": "sha256-124Mohk8mQPyBUYStMz2tPPU4VxeV37/M+9UV/arcGk="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/analitza-25.08.3.tar.xz",
+    "hash": "sha256-Gr50HD8Ymz2MuM80tRaJD9ZM8hunXQ9VizcRlWuD5NE="
   },
   "angelfish": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/angelfish-25.08.2.tar.xz",
-    "hash": "sha256-NWH87SN49oIUteK8qAEXpgosCPpdUiOoHwzIN4mr28Q="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/angelfish-25.08.3.tar.xz",
+    "hash": "sha256-ccSns9ZlDrW9mn0ILOA++s4LtegG2POZ561nW7BkN2w="
   },
   "arianna": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/arianna-25.08.2.tar.xz",
-    "hash": "sha256-DsL4hIjZhP+cy7pDEfffP7SI+L3HRIAJwctGrSbAdCg="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/arianna-25.08.3.tar.xz",
+    "hash": "sha256-Ou6H67yjIW6oZ2A2JmMSpeekrzQGwg3soS76n4tb2rQ="
   },
   "ark": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ark-25.08.2.tar.xz",
-    "hash": "sha256-dj6r7B6ABQ80Q7t6C8Ntd3soqwcgDvsWYwvzP32wy8o="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ark-25.08.3.tar.xz",
+    "hash": "sha256-yk+3KV8JAoDfAtJLZPET4QxvYYE4s4e8H9eixWHeVU8="
   },
   "artikulate": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/artikulate-25.08.2.tar.xz",
-    "hash": "sha256-y6ybg9tGEp5egY+CYTdRcyxuMuenWWd8S5F8cWSgX1M="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/artikulate-25.08.3.tar.xz",
+    "hash": "sha256-B8BF81lWTN5ri6U4xtDCq72pKDQekypFy0CBxMFdqOU="
   },
   "audex": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/audex-25.08.2.tar.xz",
-    "hash": "sha256-n4N+u12L0E8Jr5uyKIGfWl/ismllto5tcm5vJDJvPGM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/audex-25.08.3.tar.xz",
+    "hash": "sha256-eaECo9FOa12Sa+DQpmNF/VtYHDwCHlqbZSCBfugT7I4="
   },
   "audiocd-kio": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/audiocd-kio-25.08.2.tar.xz",
-    "hash": "sha256-rnWN3W+r6i2Af0qLcbmLGtLwtTCu6+O1eUtRhxYvkL8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/audiocd-kio-25.08.3.tar.xz",
+    "hash": "sha256-buOBRu17YVBH2wPhQgXqkiEknm64RyS9ZgmvmC9X7qw="
   },
   "audiotube": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/audiotube-25.08.2.tar.xz",
-    "hash": "sha256-PmPdKaJwsP95Xk9QeoMlYa5XKinYomjVubBV4B4PSlA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/audiotube-25.08.3.tar.xz",
+    "hash": "sha256-7g7PpDufa5qrtYPe4OIB8paScfp3ua28HauzSsFJte4="
   },
   "baloo-widgets": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/baloo-widgets-25.08.2.tar.xz",
-    "hash": "sha256-XGzTy29NC2ifxCNnxUGKxr8XiXhxQ5T/tbzV86c0G80="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/baloo-widgets-25.08.3.tar.xz",
+    "hash": "sha256-/AqOxTIbP0uw4fFlzY51dwGbkNV1UXCAJjSmjfw858s="
   },
   "blinken": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/blinken-25.08.2.tar.xz",
-    "hash": "sha256-AsermlIShX8/KOoR4BPs7kf6vYbQ3o9yCi8HTqNzq8w="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/blinken-25.08.3.tar.xz",
+    "hash": "sha256-dwWY8ifoy7abSw3eTjum3qEHTj4Kin8H5CQ6GL+HbW0="
   },
   "bomber": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/bomber-25.08.2.tar.xz",
-    "hash": "sha256-VOdFXk4nte9CtcFL1H0jmvZGP7z6eTrp7VlWT6xqibY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/bomber-25.08.3.tar.xz",
+    "hash": "sha256-eMHM10FRXCpUIJATB7hz/FLIb0xaHlGHBHIhX4zpzJs="
   },
   "bovo": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/bovo-25.08.2.tar.xz",
-    "hash": "sha256-dOqMcZHDqZtkkOxQmMqzrVFrxE7h59673zfK4a7t2/s="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/bovo-25.08.3.tar.xz",
+    "hash": "sha256-3+YkhXzh3seAlgygDr7mFe5rULouf6DBSF7NGFVxzeY="
   },
   "calendarsupport": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/calendarsupport-25.08.2.tar.xz",
-    "hash": "sha256-Lzw9pv9gDFccli4YyrfSpseA154oK5TextcKbwhNbUY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/calendarsupport-25.08.3.tar.xz",
+    "hash": "sha256-g0NzWYHoxBRm1w06SOcOHOIyipKO3QvtLa6QOaPPna0="
   },
   "calindori": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/calindori-25.08.2.tar.xz",
-    "hash": "sha256-9eH0pexsT220s+BRUgNKetlffanC4IvCsnrMjMI+aok="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/calindori-25.08.3.tar.xz",
+    "hash": "sha256-t7ylpu88XTa6qK6cVg+/V9mlPmkl1qJIYa7MKn3mzLw="
   },
   "calligra": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/calligra-25.08.2.tar.xz",
-    "hash": "sha256-319aPsI+evmPOAW0vYQmlH4AyNdeP0QU1dpYDgdwCUg="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/calligra-25.08.3.tar.xz",
+    "hash": "sha256-dPrHglPEKYU+mfrgC88rhDMtvDqPU4zPcGdCWSZrklE="
   },
   "cantor": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/cantor-25.08.2.tar.xz",
-    "hash": "sha256-JZxEFr/CtgzpSZodoP70jVNpsLY+/nW8sNDIkGovIAA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/cantor-25.08.3.tar.xz",
+    "hash": "sha256-VjUAf7nFDYLojez5Jk/0D7n07mWydHTFkwsbUZ6yS3I="
   },
   "colord-kde": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/colord-kde-25.08.2.tar.xz",
-    "hash": "sha256-Sks0OGQoIidW6TM+EobQA6+syy/szKkmhffRQruatgk="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/colord-kde-25.08.3.tar.xz",
+    "hash": "sha256-KaawondaAKO9WxsTjHc3LlOviARYDB5BK4edSOXQrt8="
   },
   "dolphin": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/dolphin-25.08.2.tar.xz",
-    "hash": "sha256-BvTxaY9kB/00uMmyED2RohzKtkZ0hbtfoj4jc26mZ5E="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/dolphin-25.08.3.tar.xz",
+    "hash": "sha256-Gr1jLr44N99WFiFvacPKn2JAFl+fhFAkIiAydeqo7gk="
   },
   "dolphin-plugins": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/dolphin-plugins-25.08.2.tar.xz",
-    "hash": "sha256-QxHdWblKASYl5/tlh9Tw7AENslccsrUIevAZCc8VD8g="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/dolphin-plugins-25.08.3.tar.xz",
+    "hash": "sha256-KESdFeCqzndWPztvE/R7oGhUFgoHXfQjh/wD9nCousU="
   },
   "dragon": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/dragon-25.08.2.tar.xz",
-    "hash": "sha256-AUNDWenG/kqX8fkgPlF7OCqpI3RrR85rJSs23wuBiug="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/dragon-25.08.3.tar.xz",
+    "hash": "sha256-nh0v6TAYFmQYy/yC/C+ThNHFyZvBtQDGkHLI/iz50Dg="
   },
   "elisa": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/elisa-25.08.2.tar.xz",
-    "hash": "sha256-4HUIsISk9d8bzqdYynBailPJDcAfb1Q1qe84eF0bEcE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/elisa-25.08.3.tar.xz",
+    "hash": "sha256-Y2dLvQWKUY10C9mIDWWpr2qBb8M/uQTMHwwMJIRH3RM="
   },
   "eventviews": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/eventviews-25.08.2.tar.xz",
-    "hash": "sha256-bcE4iCT+WrVtG+FbOX6IhKvo4dujel19PGsXQ8TXYjU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/eventviews-25.08.3.tar.xz",
+    "hash": "sha256-6hbNGZOcfU9bna+575N2PosvJsLfIsZw9qV4LdEOOD4="
   },
   "falkon": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/falkon-25.08.2.tar.xz",
-    "hash": "sha256-+39ozZTvJPdq86HkoHEZV+7nqVI5ubnEIjZ2maPMEVM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/falkon-25.08.3.tar.xz",
+    "hash": "sha256-FiUtikICi/VLiOHkpa+5WHUwneRPIDFWyZxKZDcg4Sk="
   },
   "ffmpegthumbs": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ffmpegthumbs-25.08.2.tar.xz",
-    "hash": "sha256-0vF4G82w8cov5qu83pPA2EUH8M7iNlDf2U64obfpTIw="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ffmpegthumbs-25.08.3.tar.xz",
+    "hash": "sha256-hOzRMaUHmYFfQUUi/BJwxW4O5Fu/r5b54dLJJ43ISWI="
   },
   "filelight": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/filelight-25.08.2.tar.xz",
-    "hash": "sha256-nKR/6/reraoRurzmXBngNaW8dmYA0JeM5JRNnkFmFVU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/filelight-25.08.3.tar.xz",
+    "hash": "sha256-ijqCXFocTzZi17eG91v4+u9qyfZyPI6M0p5s8VvagIA="
   },
   "francis": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/francis-25.08.2.tar.xz",
-    "hash": "sha256-PBqs9qoCAlgigzMMtuih1OHlfvyc/JpUkqoGBlePKxM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/francis-25.08.3.tar.xz",
+    "hash": "sha256-o71EolKHj7XhRRZYBqG6pxt+QL6T7ZTVvYd3GHWV/jE="
   },
   "ghostwriter": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ghostwriter-25.08.2.tar.xz",
-    "hash": "sha256-Xw0aUeB8pYZbM1I5qiDeV15M1XpJMpZtWpbY3/Pb1nY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ghostwriter-25.08.3.tar.xz",
+    "hash": "sha256-OZlp7wcHz0iD/OFy1qIt+vKSlKmw+tLnFq1oBFICsAY="
   },
   "granatier": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/granatier-25.08.2.tar.xz",
-    "hash": "sha256-UjN/T3EdDkojbKyL2njB4JUjTEZfQdQL+SaF9dMfl4Q="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/granatier-25.08.3.tar.xz",
+    "hash": "sha256-9JMa+NH6DVZaEsPsiANiSih1cWxalCsWzIgZOuEBYm8="
   },
   "grantlee-editor": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/grantlee-editor-25.08.2.tar.xz",
-    "hash": "sha256-+02OZHw2YaMGQ80yrUb1PJcuxvyAN2xNxRSx9lyj8M4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/grantlee-editor-25.08.3.tar.xz",
+    "hash": "sha256-atnws3Sd5VfsR8SdqRR1Q5JIWmZGHA1o9R/XcYhaVbU="
   },
   "grantleetheme": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/grantleetheme-25.08.2.tar.xz",
-    "hash": "sha256-xdtSGNuv2SXkaScoRYFBt6cbnpZ0usEchcho15LCTFQ="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/grantleetheme-25.08.3.tar.xz",
+    "hash": "sha256-ZJ3pmbthKI/JtK7T6+Ix5FIBzWz9TyR2Nqf9Jw74euA="
   },
   "gwenview": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/gwenview-25.08.2.tar.xz",
-    "hash": "sha256-wYmWeg4h8HU1YOjYc4HoiPPZQ3AdtMHyG+2LW7ivHlo="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/gwenview-25.08.3.tar.xz",
+    "hash": "sha256-IADELUDuPpLONV+C0v3dB9J/YT9xzy5laZz+eUp27KE="
   },
   "incidenceeditor": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/incidenceeditor-25.08.2.tar.xz",
-    "hash": "sha256-CWWB/XaMWwcaxK/mfJ6zdB4wm2AKcku6wSr2l0bGgJg="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/incidenceeditor-25.08.3.tar.xz",
+    "hash": "sha256-0MFcN1FyOrzxAaI6axYtMp4IkknpS9/UKD1o3s8hGpg="
   },
   "isoimagewriter": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/isoimagewriter-25.08.2.tar.xz",
-    "hash": "sha256-wfRRmrvrqtUlGa+V6Zr3jN4ZNv4Zl3BJWkY2hxpaLWA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/isoimagewriter-25.08.3.tar.xz",
+    "hash": "sha256-hhC0t4mo11DG9PKOHStfmE7/1+uCKDJeZzrU9CJRLi4="
   },
   "itinerary": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/itinerary-25.08.2.tar.xz",
-    "hash": "sha256-VXA9YIjiWgrbgiSYJYnUl4TpIL6MDnnl9QwTzDKu1z4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/itinerary-25.08.3.tar.xz",
+    "hash": "sha256-KPjO9H+UnOSDJvbSiC1YwceXpuMkxR9dNRDn2yIWH4c="
   },
   "juk": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/juk-25.08.2.tar.xz",
-    "hash": "sha256-KzlqgDeK5ygT0CmGtqNQLJdQZbSan+rzgkJsepZaSKA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/juk-25.08.3.tar.xz",
+    "hash": "sha256-uVwfu1rgZ0U7KrUrnA6MCNW7V+4+Xtyx0fsMcC+P/ok="
   },
   "k3b": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/k3b-25.08.2.tar.xz",
-    "hash": "sha256-tOsu4GmpaPfcPsSCU5Wvdea/tInZaiiUjyLuUaNq+jU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/k3b-25.08.3.tar.xz",
+    "hash": "sha256-Vx4fWYGeYwv/2pbJbGMm1fEoqkVW4oK+UZ9MhAkQXSU="
   },
   "kaccounts-integration": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kaccounts-integration-25.08.2.tar.xz",
-    "hash": "sha256-peBuAWaUm/LemVdTUX7bVT+iXu3Z7uWsMJ8vOsHZiO4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kaccounts-integration-25.08.3.tar.xz",
+    "hash": "sha256-f6A0Pww/WTdcSBfL0psP7X5Fy7MfSVbm0/YsCr4qHIs="
   },
   "kaccounts-providers": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kaccounts-providers-25.08.2.tar.xz",
-    "hash": "sha256-+XmuS9Ih7rybPEnNRmIE+R7xjBkVpNzoMgbzhK3Rr9M="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kaccounts-providers-25.08.3.tar.xz",
+    "hash": "sha256-EipO8htZau91+iu0HM2XxzMt/NYjSiYCrubBPFhFEG8="
   },
   "kaddressbook": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kaddressbook-25.08.2.tar.xz",
-    "hash": "sha256-RbP8niU57R/LvM1FzkXpw2t1AQiSZZmCCRVfvOcaWNU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kaddressbook-25.08.3.tar.xz",
+    "hash": "sha256-hTXzTM0UKGKQcq/V4uc5xZ4p5KDGfkRPCZF8pDAXqlc="
   },
   "kajongg": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kajongg-25.08.2.tar.xz",
-    "hash": "sha256-vYNzVfQl5SDcST64u8YpC134OIQPiCuLou9dHHucHBQ="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kajongg-25.08.3.tar.xz",
+    "hash": "sha256-R9WGyP0U6ZG/snih9ahTOH681PEhgdLVyc3rQ9+udXg="
   },
   "kalarm": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kalarm-25.08.2.tar.xz",
-    "hash": "sha256-f/WKJYoX31DqPaetfc3O4VBySBEU4+uxuFXrhcBl1nc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kalarm-25.08.3.tar.xz",
+    "hash": "sha256-NHufVkcecLTDNe6WvHan1cFIut/RRgzQDoi9s/9sZ1k="
   },
   "kalgebra": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kalgebra-25.08.2.tar.xz",
-    "hash": "sha256-Igi0+WWHbrSz9C6q4GxvNn/wc1skXZq6zy8sl1pxTxA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kalgebra-25.08.3.tar.xz",
+    "hash": "sha256-PcUwwsjUpIuhwtcRfS3hxH4GVCVfo8jUX2xtqs+bHUE="
   },
   "kalk": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kalk-25.08.2.tar.xz",
-    "hash": "sha256-9DlieqCYApCiu/eLYbGgPTi33hwaqnFwiGe7Xt190IM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kalk-25.08.3.tar.xz",
+    "hash": "sha256-8hip+c2oPhJECwgyxb7V18VNgLM1vHeFpjT4eSm53NA="
   },
   "kalm": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kalm-25.08.2.tar.xz",
-    "hash": "sha256-0u6i7yr7oRkUpb3WPOBfePV7bsE8ShfJpVbEIkilb64="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kalm-25.08.3.tar.xz",
+    "hash": "sha256-z9QK5UcuKGaN295py/dxCV6eKP/oDPMHxDl1MiSnT2k="
   },
   "kalzium": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kalzium-25.08.2.tar.xz",
-    "hash": "sha256-mfHaPrBK7jG0XZKLXdMKFnXcIEGUumQ/iXP0rm/bz+0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kalzium-25.08.3.tar.xz",
+    "hash": "sha256-NubE9G4aXaqs4U67Wx9trDQprV3z1PwfCt6uw+KOQgs="
   },
   "kamera": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kamera-25.08.2.tar.xz",
-    "hash": "sha256-/wOWIlPyoQjrDh9STSrPLZzJNFYUafuY9sgOkDKUoPQ="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kamera-25.08.3.tar.xz",
+    "hash": "sha256-Tca4sPtHkoi2V3tEbEVDF14hM2THkb1lC2HsevhV7RI="
   },
   "kamoso": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kamoso-25.08.2.tar.xz",
-    "hash": "sha256-Ry/NTfUXrzf5g+8RaJYcJzk8JeTFPwTkGibgfPRQTV8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kamoso-25.08.3.tar.xz",
+    "hash": "sha256-QhlpQxS3w15yyFAI++GFmuKLuAIHsdI/tHf5v8LzGLc="
   },
   "kanagram": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kanagram-25.08.2.tar.xz",
-    "hash": "sha256-57vmAV82DPVzR/pSaAa5QewDQ3AYGD1EizRk++34apc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kanagram-25.08.3.tar.xz",
+    "hash": "sha256-wVoqCywIzvdFUiDu3fzDCV027qFNaE/F+5/y8dCly7w="
   },
   "kapman": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kapman-25.08.2.tar.xz",
-    "hash": "sha256-uz9Imc5G1AScr2Kr0aEOQl7xVsdLFncVhFjlHFmz0pQ="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kapman-25.08.3.tar.xz",
+    "hash": "sha256-m2RJ6npbJ9Ih50cU3aLyd2Rcz0MJFVJGhD6lv/9FKXM="
   },
   "kapptemplate": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kapptemplate-25.08.2.tar.xz",
-    "hash": "sha256-qbfvgHc8d+nIHI9Rl5Cr2kD2rKF93sJA6cL0zcp8+UI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kapptemplate-25.08.3.tar.xz",
+    "hash": "sha256-NQbkTNMLdIgsoQgkqsUsXOJqs5axBSqOVSQcU20MXno="
   },
   "kasts": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kasts-25.08.2.tar.xz",
-    "hash": "sha256-sNpJl2/RJszypKty9VDIs079tYgwwMHvRDcaaFt9O5k="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kasts-25.08.3.tar.xz",
+    "hash": "sha256-zMyOMsnPIG8t/J2zYZaGQ5w+BbnTUr6KyVHJnJrYYnM="
   },
   "kate": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kate-25.08.2.tar.xz",
-    "hash": "sha256-te76UZaQmD75K+jMMOr6zh/IyfIl2dhRpcGBmlJjR3A="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kate-25.08.3.tar.xz",
+    "hash": "sha256-yS64tbgcm13JG1xG0gtPOuC3gREUd5/Y+S8VMjP8qQs="
   },
   "katomic": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/katomic-25.08.2.tar.xz",
-    "hash": "sha256-JborSTaM/p0tQTlvB9A3M0g57rZQLnHi+o+bpld9PWs="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/katomic-25.08.3.tar.xz",
+    "hash": "sha256-kCG+G+/Nog0lOCy1xiDNZsu/DqOqYhsKrkCpBVOrQsw="
   },
   "kbackup": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kbackup-25.08.2.tar.xz",
-    "hash": "sha256-VMeu3w0exMzduCL4MwM10Mv07ED2RJmRXwD+8MAwuLE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kbackup-25.08.3.tar.xz",
+    "hash": "sha256-/4keGs/pu0IApPaBZUAlWbsAzs2HkTQc1NQClpVf/CQ="
   },
   "kblackbox": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kblackbox-25.08.2.tar.xz",
-    "hash": "sha256-fh+GT6gzJpOlE3WiDvxX1Nk94rRLhj/vi2ApFChZNiQ="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kblackbox-25.08.3.tar.xz",
+    "hash": "sha256-7wCVZaokDWZI4FF7vp7Sh7wfWkpEBdbyHT7t4+2/oV8="
   },
   "kblocks": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kblocks-25.08.2.tar.xz",
-    "hash": "sha256-VGwjpKn5b7PLTGjFvZlosuDdwX37vRjeHDPvM2YOnv0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kblocks-25.08.3.tar.xz",
+    "hash": "sha256-CRr+lf/Wh/tIU1d1X3QbRKQYCZOhZpUvtbopUO7OBK0="
   },
   "kbounce": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kbounce-25.08.2.tar.xz",
-    "hash": "sha256-4PVacun5C/s3yq6n08UTxbj/U/c51P4D//X17As6rbg="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kbounce-25.08.3.tar.xz",
+    "hash": "sha256-8UGeSUSGMiO1ontayzIo61giS26vTwyUFkwEYaw9kBo="
   },
   "kbreakout": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kbreakout-25.08.2.tar.xz",
-    "hash": "sha256-R8dSNSna4mN2vizPmOteMW7oVqrFLjamurUepf0+7gA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kbreakout-25.08.3.tar.xz",
+    "hash": "sha256-BYvwHpN/rc0ykS6ARVh1ZulPfAXQrXE/TmXW01GwT0A="
   },
   "kbruch": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kbruch-25.08.2.tar.xz",
-    "hash": "sha256-sLTn/am2A7rMLGKau82RQGnGxkonQX+tIjzYMl2j0Sw="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kbruch-25.08.3.tar.xz",
+    "hash": "sha256-j9VTZXEbvtWe285Mg5fqPoMWyASGYnyiky095Eg7s1w="
   },
   "kcachegrind": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kcachegrind-25.08.2.tar.xz",
-    "hash": "sha256-jVDAcaI9tirOzfItbpQ5aqA+TV/5esx9K+hIY7NPv8g="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kcachegrind-25.08.3.tar.xz",
+    "hash": "sha256-rsg436gGtDjRmPW7ZqKpkl7NuG0J2obFk6ITAgUrC74="
   },
   "kcalc": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kcalc-25.08.2.tar.xz",
-    "hash": "sha256-kn1cs9Z+MS8UeAWYhvsXqH9iGKArOFlN8WQ/fFi/B4E="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kcalc-25.08.3.tar.xz",
+    "hash": "sha256-DoQslASW5H9avR7GCB9cbPKIvh3XPttQcdhPBOyhg4o="
   },
   "kcalutils": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kcalutils-25.08.2.tar.xz",
-    "hash": "sha256-t7YK2AjaF3f2+QWzPodNp3oG4L0jVb9XejDpTjDGCKM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kcalutils-25.08.3.tar.xz",
+    "hash": "sha256-zqA3tnpRC6TjwJE6kLor/3JAcLKSUSSN8jr1+wuxii0="
   },
   "kcharselect": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kcharselect-25.08.2.tar.xz",
-    "hash": "sha256-3RUCQnrobAS5PVPUwrqQaaYMtSZ21CAQtAMdGQghjlA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kcharselect-25.08.3.tar.xz",
+    "hash": "sha256-r+4jbl4Dda7gOO1CkqOhiPpRJR2Sq46HLNn+cTzeOuM="
   },
   "kclock": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kclock-25.08.2.tar.xz",
-    "hash": "sha256-4u4DWOAWgHim49h2bntnOyLFvHhkASoFt5Je3bnpGtw="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kclock-25.08.3.tar.xz",
+    "hash": "sha256-2Kz8qjb/jdQk3oKuFja63Zqi9QpsTj41eI7VzDliduI="
   },
   "kcolorchooser": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kcolorchooser-25.08.2.tar.xz",
-    "hash": "sha256-tj/Nphft9sIOA6Qqh8zKB+C5pSKslGBV4/mPVjlDcxU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kcolorchooser-25.08.3.tar.xz",
+    "hash": "sha256-as7OA7OASmEIItBY+7vNq+w/4a2mqL/+1tNpUmkwvmc="
   },
   "kcron": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kcron-25.08.2.tar.xz",
-    "hash": "sha256-8Ity7bspzLYaizfEPC8lMDovNo38HT+cZfdDTpzRloM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kcron-25.08.3.tar.xz",
+    "hash": "sha256-UqVAID6bKN6+UkBefDEpzia1OvHdwXFlt7UlVcx1e2c="
   },
   "kde-dev-scripts": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kde-dev-scripts-25.08.2.tar.xz",
-    "hash": "sha256-4dcrwyEPtWjy7/2xuz+aWMTad4rxuksAXhOOmqF6Nek="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kde-dev-scripts-25.08.3.tar.xz",
+    "hash": "sha256-8J52s97VzHa5nCa8sCdVONWQJn8IySG1JAwISjy75H0="
   },
   "kde-dev-utils": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kde-dev-utils-25.08.2.tar.xz",
-    "hash": "sha256-JobJjo+CfOM3Rjp0ZVQ1djK/6aXfo6hOXFX273stMkc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kde-dev-utils-25.08.3.tar.xz",
+    "hash": "sha256-6BlfM4lgpNXvJHxmDkYrntQFPGB40jrtN8AptiWBKkM="
   },
   "kde-inotify-survey": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kde-inotify-survey-25.08.2.tar.xz",
-    "hash": "sha256-R75EgYmcWinoSEm5/1ZLQyBBhvwGnekCXqCUiY+8n2w="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kde-inotify-survey-25.08.3.tar.xz",
+    "hash": "sha256-s5wSm5a4CQT0p7X4KOzZiJHDK2G5SW6NYxBYnakeuVs="
   },
   "kdebugsettings": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdebugsettings-25.08.2.tar.xz",
-    "hash": "sha256-Brt+QdxF28yKOBwxbSPw+yAKnMbH8Zrrm021dg4e8+0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdebugsettings-25.08.3.tar.xz",
+    "hash": "sha256-dpkOq4FsRfEWyCMdsz8Wr5VezHM8TrfIn+g5d/MpPaA="
   },
   "kdeconnect-kde": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdeconnect-kde-25.08.2.tar.xz",
-    "hash": "sha256-5CRbagY9bfDhI/1nwGX1wkmU4hs0lYnNplleSAuRawk="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdeconnect-kde-25.08.3.tar.xz",
+    "hash": "sha256-bkHx8i6F9ecKkt1so+aWg2SJbeN6/l2ut82lmfA+Xis="
   },
   "kdeedu-data": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdeedu-data-25.08.2.tar.xz",
-    "hash": "sha256-sTjppV2QE87JhoPVml0BD50xk9jOFj9Z1aYSa58B+m8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdeedu-data-25.08.3.tar.xz",
+    "hash": "sha256-cfhXK1fQ7bBzQp4vOUFFkRwINosgyqNoXPZMrbxvoqo="
   },
   "kdegraphics-mobipocket": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdegraphics-mobipocket-25.08.2.tar.xz",
-    "hash": "sha256-eZrzukGQMTOXOJMwZFw/oA9CkBf3M4QzyNSr7lWtZNI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdegraphics-mobipocket-25.08.3.tar.xz",
+    "hash": "sha256-pPj/FjInDBFpUJVzJmGZXZY5+DM8jWNzBlTXh9zDtVQ="
   },
   "kdegraphics-thumbnailers": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdegraphics-thumbnailers-25.08.2.tar.xz",
-    "hash": "sha256-AuH8XSp3rZxXFz3q4jM6Cj8ERG58z2gvH2awmQLwGt8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdegraphics-thumbnailers-25.08.3.tar.xz",
+    "hash": "sha256-FfwrsleMfFhGNTPr1tjU6j7D2er0fgT3TpMiwTXJfoQ="
   },
   "kdenetwork-filesharing": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdenetwork-filesharing-25.08.2.tar.xz",
-    "hash": "sha256-km5A7fwYnOWlBDwyO4NqzOoPXU+RFwj/QUWYQLmWYO4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdenetwork-filesharing-25.08.3.tar.xz",
+    "hash": "sha256-0s71ZEOEO4KlwhDsWm5MKh7RoqhtUX5Xc4VZU7qWpI8="
   },
   "kdenlive": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdenlive-25.08.2.tar.xz",
-    "hash": "sha256-RkUpuuXF++dHPb0DCPqMNYj2jye1yZZErRgynaVXuNk="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdenlive-25.08.3.tar.xz",
+    "hash": "sha256-gbpOkRFH1dvTO89GSy8K6fV7iCTb/H+rIfPBG7ZDN4M="
   },
   "kdepim-addons": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdepim-addons-25.08.2.tar.xz",
-    "hash": "sha256-0UWCSIgZZTZgMFE+DheJzTiqB62Zfua3vB18Y42Wz4c="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdepim-addons-25.08.3.tar.xz",
+    "hash": "sha256-uqhcF0fJ54ly0aVNe7ezAN2/VAc0UsM4g1a8V21HnNc="
   },
   "kdepim-runtime": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdepim-runtime-25.08.2.tar.xz",
-    "hash": "sha256-wDD5iFTjHZJwcc1LS7wtl3ktTO+6xUiqbNddsGAlEso="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdepim-runtime-25.08.3.tar.xz",
+    "hash": "sha256-mLes8HJxZY09kWmlEWdlE74GWbc/XLH7RjCutU+mX4U="
   },
   "kdesdk-kio": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdesdk-kio-25.08.2.tar.xz",
-    "hash": "sha256-C5y8kWb0mC4JsQmNvLEB0xl5/08HLQ1kqepj9SwmSXU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdesdk-kio-25.08.3.tar.xz",
+    "hash": "sha256-QKNbsC0nMV0BKbgYHnpvy47k9MDMa4T4GMEPo/i31nE="
   },
   "kdesdk-thumbnailers": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdesdk-thumbnailers-25.08.2.tar.xz",
-    "hash": "sha256-WL9S2IGmTuQosO6dAo7f8G6+h9kiWE4m13r86B7Aw7M="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdesdk-thumbnailers-25.08.3.tar.xz",
+    "hash": "sha256-QWKweV1VrfvJ98G6jpZaYYqleygFiPQ9CkrbRc4I6HQ="
   },
   "kdev-php": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdev-php-25.08.2.tar.xz",
-    "hash": "sha256-7m4IJU6vEeZ97LsY5sFyxQMELahAOAmTgryhJm47mQ0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdev-php-25.08.3.tar.xz",
+    "hash": "sha256-9S7yko0u+dyyHzGtKNuc5DCcatT0+8ap0J6gc3KG1MY="
   },
   "kdev-python": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdev-python-25.08.2.tar.xz",
-    "hash": "sha256-ESl9BcQX+ecQjtOh8gVDbnWbqUWcPG9PlHNZ1nZRQsU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdev-python-25.08.3.tar.xz",
+    "hash": "sha256-VroTp+FyGuF6AVE4ZJ7270lw6Z1/9HMi8pamnxc0+z4="
   },
   "kdevelop": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdevelop-25.08.2.tar.xz",
-    "hash": "sha256-uHkj1tN95TiPNsLprmbhsJa59CW/n6D7+WNo9q9GWyk="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdevelop-25.08.3.tar.xz",
+    "hash": "sha256-TSuSzzepozJN2RNwdcX1UgR72IpnNCCqFIT83nm6zpI="
   },
   "kdf": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdf-25.08.2.tar.xz",
-    "hash": "sha256-fFri8/WEG706a2XjBN+QUjAcY+Bj6dFeyf+oW34bAds="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdf-25.08.3.tar.xz",
+    "hash": "sha256-fldlaE/uQm/eytp6lJoXF/maikdnsv1mnJoDZrFF+mU="
   },
   "kdialog": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdialog-25.08.2.tar.xz",
-    "hash": "sha256-+cJGtN4tfkBqHJk2G41/qaOm1uzewuVVhmceq0zmQqY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdialog-25.08.3.tar.xz",
+    "hash": "sha256-0sn8M+y0ii0TVkO4PnALkhLR6A/WUZccA1v68yjfurQ="
   },
   "kdiamond": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kdiamond-25.08.2.tar.xz",
-    "hash": "sha256-ZpqXyFs43+4gmu2zWEP1oiDw8zPRZIp15mm7jLsb7e0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kdiamond-25.08.3.tar.xz",
+    "hash": "sha256-6iRNvZWgW+NJLqNH2wOFeAAuYCRa4EsJBt4MErgrN1U="
   },
   "keditbookmarks": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/keditbookmarks-25.08.2.tar.xz",
-    "hash": "sha256-wwkul/fh0cKxEUJvgT4frYjqc/zbn4vO/lRBj6LyLf8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/keditbookmarks-25.08.3.tar.xz",
+    "hash": "sha256-T1ehKu1z/OzDBZoGRZMdG4NrRCZxlClHY3QhMbIdOvo="
   },
   "keysmith": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/keysmith-25.08.2.tar.xz",
-    "hash": "sha256-ZiiqtMwrtCeLdNAeffv0KV113Ve10gqvPvCOWmDx4vM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/keysmith-25.08.3.tar.xz",
+    "hash": "sha256-wYi87L4GV7fNU6bcZKLyyvveFH58m9LJC1hFr9CMFSU="
   },
   "kfind": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kfind-25.08.2.tar.xz",
-    "hash": "sha256-HvgdtBOG/MaAXz/zf1AqY42kEJVNBQ+v40y3bCDu1QE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kfind-25.08.3.tar.xz",
+    "hash": "sha256-dW1PmJOSCGzSEVU9WGE9X+tBMQczuOo1xQxYaTgMlRg="
   },
   "kfourinline": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kfourinline-25.08.2.tar.xz",
-    "hash": "sha256-7I6wYJoswqS7FKz4MjTdNsRgYOHoi04VtfVnr/+VIss="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kfourinline-25.08.3.tar.xz",
+    "hash": "sha256-xVivDA8SiiV0wTNwsLIiWJ4tTKV4pUE6qDWmENyplxI="
   },
   "kgeography": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kgeography-25.08.2.tar.xz",
-    "hash": "sha256-V7sE53RPoB4rO5sqMy9DTHkgOUbg4yaNt5oC8intIj0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kgeography-25.08.3.tar.xz",
+    "hash": "sha256-jIBortFwkZanbey9t33GHyq/U5vzwrJgcCR1vy4sZ7I="
   },
   "kget": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kget-25.08.2.tar.xz",
-    "hash": "sha256-YhTVgBrOpaen8eh8JoxhdjchMpe9OqgXCKbpfDs3ch8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kget-25.08.3.tar.xz",
+    "hash": "sha256-veDkZTVSqOs5qNMiCs214QQsdv7XcbgWJ4lTPwOn440="
   },
   "kgoldrunner": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kgoldrunner-25.08.2.tar.xz",
-    "hash": "sha256-ePuHxhhHeX79SfLh0QeEu+ez/+TBiU6GXXwhjQcLERY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kgoldrunner-25.08.3.tar.xz",
+    "hash": "sha256-7l+twe+Oytb2acTGLnZ6NwrzQPDAkoL/m/V6gL+Jtcw="
   },
   "kgpg": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kgpg-25.08.2.tar.xz",
-    "hash": "sha256-OZTEwUaMAoaLWLImYLuqyEX9QgNIjWj2rJFcBKYWfEo="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kgpg-25.08.3.tar.xz",
+    "hash": "sha256-5B6fbhRohlNM2G8UnlgWyiz2bavHuCTw81AGkxhC+K8="
   },
   "kgraphviewer": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kgraphviewer-25.08.2.tar.xz",
-    "hash": "sha256-bqzj6xA9HmILLYMuU5CTIwHc/aKgwUSdWyw2oVY3Kyc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kgraphviewer-25.08.3.tar.xz",
+    "hash": "sha256-jyT6eUpePzAig6CHv2y81QqYxAI646ol4ve0lx6oZgU="
   },
   "khangman": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/khangman-25.08.2.tar.xz",
-    "hash": "sha256-rIodkzSHyWdcaQp5NW2/BXXIjTSmWzby5vzGqgIMF/0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/khangman-25.08.3.tar.xz",
+    "hash": "sha256-tF9Vxx+l4tBbyPmM/anQduONRlwyXLQ9OZQu62dBr3I="
   },
   "khealthcertificate": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/khealthcertificate-25.08.2.tar.xz",
-    "hash": "sha256-bngpKnIR2pcd/jazEd9RcwDRvibhavaehlCUA9UPJ6U="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/khealthcertificate-25.08.3.tar.xz",
+    "hash": "sha256-bO0XoVXevMHhn0DO4sccX0g882bUgx3rxewyI/slbdo="
   },
   "khelpcenter": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/khelpcenter-25.08.2.tar.xz",
-    "hash": "sha256-63nlRUk3t7r0REJKwCqXV5q4B1OQjbvrVR7dcfZ4sNo="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/khelpcenter-25.08.3.tar.xz",
+    "hash": "sha256-T7S7Qk2u8xUxtR0fr5NZTIdvMBwP0gsIzXiFwT1Jm6A="
   },
   "kidentitymanagement": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kidentitymanagement-25.08.2.tar.xz",
-    "hash": "sha256-15I5E6TYsNn+7L4th4Pd4PcRcLNRIzzkfdrL3bC965E="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kidentitymanagement-25.08.3.tar.xz",
+    "hash": "sha256-+7Ie/0TQAgZuOsSmkFrZFeetNVqn00+OYwcwizhP99s="
   },
   "kig": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kig-25.08.2.tar.xz",
-    "hash": "sha256-YNOAQBVvOwEmOI2UBegNRrUu/E+4lUMuTmGHnQuz+fM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kig-25.08.3.tar.xz",
+    "hash": "sha256-ETHgBXmdAOo0/q2zlMaPj7hrvbwBuYLNKjD3BsV1ToY="
   },
   "kigo": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kigo-25.08.2.tar.xz",
-    "hash": "sha256-lyv55XsYItZ2YmFl+/E7pBhidSe82VxgtbrI5M/3Jp8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kigo-25.08.3.tar.xz",
+    "hash": "sha256-BTrTCeGvGk9rQVOv7D/qqUhm+x6V08ag/FLH9jV/OTs="
   },
   "killbots": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/killbots-25.08.2.tar.xz",
-    "hash": "sha256-PhdZcV0F3Fz3OnJ646bEeqPZ0RI0fMehXk5ZelHgzPA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/killbots-25.08.3.tar.xz",
+    "hash": "sha256-yqVxIJ52AmiLaAS3o44ET9IkVhaOYdwXWFqBFWSqOqs="
   },
   "kimagemapeditor": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kimagemapeditor-25.08.2.tar.xz",
-    "hash": "sha256-+DnGsk2X0PDdqP4btWB9h+ya7kddRD8Fuj0e7J9dY1M="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kimagemapeditor-25.08.3.tar.xz",
+    "hash": "sha256-tmqzf7iiIBTjkxCY9fRU/TDJHHcr94sV1Hqm0BlMVpI="
   },
   "kimap": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kimap-25.08.2.tar.xz",
-    "hash": "sha256-/9Sud0FwN/NldnKqLKFBXQr1V64pwad6hJbmFqYw6Gc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kimap-25.08.3.tar.xz",
+    "hash": "sha256-1rgwfLK4gzqN9IW4d4PVgVGiiQW3tueQgnxSQzSJqz0="
   },
   "kio-admin": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kio-admin-25.08.2.tar.xz",
-    "hash": "sha256-tY42MP0RT5pEPXKcJjdAIT8QiAL2E2S5yVlZ0zi7n+c="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kio-admin-25.08.3.tar.xz",
+    "hash": "sha256-WrOsvyja0G9myC+mhqVaFKAT9cXFbsFgfKhHp/RtIU0="
   },
   "kio-extras": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kio-extras-25.08.2.tar.xz",
-    "hash": "sha256-ho+fLg9XJyU4fqMR8ZnS+gRKzANlbzdR58omQAhhN18="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kio-extras-25.08.3.tar.xz",
+    "hash": "sha256-mflm3MZjvoyzyQZ3jIKzLaSxeL0pbYzYW54/VujpwtI="
   },
   "kio-gdrive": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kio-gdrive-25.08.2.tar.xz",
-    "hash": "sha256-5sNxWCRU9TqbgH8ODDQMFV1h+so88aJHwY+g5PDRYyU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kio-gdrive-25.08.3.tar.xz",
+    "hash": "sha256-LA8ct2X1wA3B6f77GEnscJ4zTi9WGO3k3UqGzeLkS5M="
   },
   "kio-zeroconf": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kio-zeroconf-25.08.2.tar.xz",
-    "hash": "sha256-eD33N5dHimorDVSrxm27wZeKqKnaSCWxw8h+TYHrCrI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kio-zeroconf-25.08.3.tar.xz",
+    "hash": "sha256-3nuyMp3bkMBKjBt6t+EiXico7Yu3VUAp5LS0HkS1c+A="
   },
   "kirigami-gallery": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kirigami-gallery-25.08.2.tar.xz",
-    "hash": "sha256-t6orBu29tawT/o0ogVd4S0BlLEaResFP1ryMYosqEug="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kirigami-gallery-25.08.3.tar.xz",
+    "hash": "sha256-3+flmIXsSBpn6IeivvGgkSj8OoYuALRKTJYv2HJmFoY="
   },
   "kiriki": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kiriki-25.08.2.tar.xz",
-    "hash": "sha256-/F7pUItS+uwL8dzbRhcMCy7+erPzm3vfY3T7XOQIS0Y="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kiriki-25.08.3.tar.xz",
+    "hash": "sha256-gmEkYfdbe/aT9Vf5PbxsAncG+8Kv5mpcqSUWmWchYxU="
   },
   "kiten": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kiten-25.08.2.tar.xz",
-    "hash": "sha256-YeytqWt3xmvWJQBiIomo13Aaho73170w+mIIH7iDZXI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kiten-25.08.3.tar.xz",
+    "hash": "sha256-7pUwcbfbzCkMg32KHlF3ZCELpdWJim8VcAgTF28LvFQ="
   },
   "kitinerary": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kitinerary-25.08.2.tar.xz",
-    "hash": "sha256-4P2xwp88du5RlyeOVbasLB7AuB6Awmhb3TSzDLWSWG0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kitinerary-25.08.3.tar.xz",
+    "hash": "sha256-s3QG/balE1+8F8iMy38tCIjm1T4W9C2BlOphiRH0ciA="
   },
   "kjournald": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kjournald-25.08.2.tar.xz",
-    "hash": "sha256-JJU+F9pt+tjGN8ScimR7xim8aM9h8lDcEDbReJuXM50="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kjournald-25.08.3.tar.xz",
+    "hash": "sha256-Ce6AgQJxJgc/jP6/v7+Jh+PQsGEsHnxSXa3Tt8w6X24="
   },
   "kjumpingcube": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kjumpingcube-25.08.2.tar.xz",
-    "hash": "sha256-kf+2hyOpB2BJ2yyunbHBMBwSR/BMnfcPPdtNeoUI1aU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kjumpingcube-25.08.3.tar.xz",
+    "hash": "sha256-oAWb720t3hH0WNbd9NXqnoCfcyPC9nsEG9tByJr0QOM="
   },
   "kldap": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kldap-25.08.2.tar.xz",
-    "hash": "sha256-kgZ7nNBjw/2X9nBheHgZUbmmKGG/MWBK+/P9BMS35Uk="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kldap-25.08.3.tar.xz",
+    "hash": "sha256-YheAQ/cjuVme+G1EZmJ9VTeAd4LJzu/kq3lZGxr3wDI="
   },
   "kleopatra": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kleopatra-25.08.2.tar.xz",
-    "hash": "sha256-FoNYJnSLT/+cuube0YGbGMNCL/YNohxqat3Sff7rT8w="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kleopatra-25.08.3.tar.xz",
+    "hash": "sha256-PC9lIH7KzW9yYx6DKpM0KmxDJg6JevzChdGAO1HMZ2Y="
   },
   "klettres": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/klettres-25.08.2.tar.xz",
-    "hash": "sha256-p7VvRvkeAnJGQrkys1AgubxlL+ARJuHwEfz55sxEkMM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/klettres-25.08.3.tar.xz",
+    "hash": "sha256-cGUurM+AAXa6P1Ep/ROoKSuXF8MISYgBtV5VOk8XmHM="
   },
   "klickety": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/klickety-25.08.2.tar.xz",
-    "hash": "sha256-JmhLJpoHKmdssz6KwkkCcoCvBvaEyilYq4b/8Zzn0lo="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/klickety-25.08.3.tar.xz",
+    "hash": "sha256-/GWRi1rRBOVXLmG/xa+kbWi6MU0V8gjukGBEPJEv7Jg="
   },
   "klines": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/klines-25.08.2.tar.xz",
-    "hash": "sha256-CXCgFkpD0ydEF+IRKbqTQI29A8sizHeOEersrmeY7l0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/klines-25.08.3.tar.xz",
+    "hash": "sha256-CRE1uZF2YFpBpHI3L0umm8vqLzYFMTEEmu2ecYfJmnc="
   },
   "kmag": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmag-25.08.2.tar.xz",
-    "hash": "sha256-8zQ5mKa4hEU/yXOOek9WD3FuNKUyj58N8SXutTJ0wIE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmag-25.08.3.tar.xz",
+    "hash": "sha256-xDB5Dlk7g0ZXFyuUq9oP8MElv2rESUayR8c32yGqtGg="
   },
   "kmahjongg": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmahjongg-25.08.2.tar.xz",
-    "hash": "sha256-7ER5SNKpmgc5pjjpJIVi5FRQOXgFElXTMlCOnoTh3wY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmahjongg-25.08.3.tar.xz",
+    "hash": "sha256-KWpQulk5yUiDSoUU8u9rr7E3auUFpc+CmO7sMRnp8SM="
   },
   "kmail": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmail-25.08.2.tar.xz",
-    "hash": "sha256-I+Z9+IMbvLKh9SZA51CQBFW1FFl3VjwCFJWmL/MdH/8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmail-25.08.3.tar.xz",
+    "hash": "sha256-pUTofOL63026oJnAGKGeWTu7gC4KmTAWvD6RTt1qkfQ="
   },
   "kmail-account-wizard": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmail-account-wizard-25.08.2.tar.xz",
-    "hash": "sha256-dQeRJ0qN3JkUL0vd5lMixbmL7IY0puRxk5yVlI3lM7c="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmail-account-wizard-25.08.3.tar.xz",
+    "hash": "sha256-M2XxYVMgGinDF5mxCPwI4/aUwjOuFwQmiJ+BUcSYw0Q="
   },
   "kmailtransport": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmailtransport-25.08.2.tar.xz",
-    "hash": "sha256-9vnYr/JlTGqjE1gFlom5sQhGz+BeU0Rfy5WLKw/lt5Q="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmailtransport-25.08.3.tar.xz",
+    "hash": "sha256-IfuF62TtJcrtJx0plwDxBmqTQxKYZH9drDbotvMlN64="
   },
   "kmbox": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmbox-25.08.2.tar.xz",
-    "hash": "sha256-KImwM4BLm7vEzonJEmPx1mHmUZX9PnywKcza6vLhuSs="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmbox-25.08.3.tar.xz",
+    "hash": "sha256-MWGF+jh+OFYb3S4KC5hKP8AIMqYicdBtz+vOHcfwVYw="
   },
   "kmime": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmime-25.08.2.tar.xz",
-    "hash": "sha256-99K6VbOqEukEiSIJrZ/icc1aOljCnDiibdIQA6pVDq8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmime-25.08.3.tar.xz",
+    "hash": "sha256-H0/KO/+Zn9hNnPPYBz3308FpOthVS1YAF05KmqGDfwE="
   },
   "kmines": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmines-25.08.2.tar.xz",
-    "hash": "sha256-FWhc4f+cJOm+6U3rnDnTXyfnVh/LDdjN5W9xnqjw+sU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmines-25.08.3.tar.xz",
+    "hash": "sha256-mfDaPNivn6Y0qPfTTkM77bxL+9okiGzV4L3eSOCtSj8="
   },
   "kmix": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmix-25.08.2.tar.xz",
-    "hash": "sha256-YPjTZTDBdqImDq5nSqwuckFQjcrWKH/7v6r6V5QqZec="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmix-25.08.3.tar.xz",
+    "hash": "sha256-+EKMFgrbaM2foA026VQ65PRPNk/VmTJ+dpSrYzEI95w="
   },
   "kmousetool": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmousetool-25.08.2.tar.xz",
-    "hash": "sha256-5GBrMRCNh7v6c1oJ3P0AWEI3of+NcIxSN91mLQFK6r8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmousetool-25.08.3.tar.xz",
+    "hash": "sha256-edPgAyHPZPEONVe1MdELxYc11r6qI3JDv3mG43Ak4I8="
   },
   "kmouth": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmouth-25.08.2.tar.xz",
-    "hash": "sha256-FC72jT0PxfKA0geHYZVdBaa7tZ6yxZrX0wwAk/JTaw4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmouth-25.08.3.tar.xz",
+    "hash": "sha256-L+9tjvkyAqLaysO7l/AtN3kMxiFMxtlJY7G7M7Hu034="
   },
   "kmplot": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kmplot-25.08.2.tar.xz",
-    "hash": "sha256-Anyx9LAOPTpQYseR7pEIul6DcX/iMQ1vM9j87uoNkeI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kmplot-25.08.3.tar.xz",
+    "hash": "sha256-JCNo7aVqMy9SmVKvC2JYw67GpZuQNQzfb+/OoNpnuIM="
   },
   "knavalbattle": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/knavalbattle-25.08.2.tar.xz",
-    "hash": "sha256-An4NjaYLt44qC7j3tBAwtWxd6jxHtJOUyD6QTgtfdso="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/knavalbattle-25.08.3.tar.xz",
+    "hash": "sha256-DYbxF2HZhYrbqgFua+uGfibr+f9SsxLXnNIm/xi+1i8="
   },
   "knetwalk": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/knetwalk-25.08.2.tar.xz",
-    "hash": "sha256-v8GAwbqLVEzPC16JS9uyN5VAp3YxFrxWDiuaUgVBBPM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/knetwalk-25.08.3.tar.xz",
+    "hash": "sha256-z62yo0fxZqLOPpG2InFkXj7FSQb99tgCaS2aLhSjoW8="
   },
   "knights": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/knights-25.08.2.tar.xz",
-    "hash": "sha256-S3SYsOFeGYRiLK6tFiKZEbAyIVZawc35XCmWm5BK+g4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/knights-25.08.3.tar.xz",
+    "hash": "sha256-ygibJTDdrR6CVpWgVwnGi6pwO5lu61hjrSabY30RKD0="
   },
   "koko": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/koko-25.08.2.tar.xz",
-    "hash": "sha256-xhtQqEo94Iph7je7fmIER5X57EyGXrNXqFSSvRRSGn4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/koko-25.08.3.tar.xz",
+    "hash": "sha256-zWcEO5aclGnZ6cEGfPQsLqPiLgInq+86d2INj80ll1c="
   },
   "kolf": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kolf-25.08.2.tar.xz",
-    "hash": "sha256-0fLsgPZaEWVCtBECQfGdKT8Qhb+jV//OeglYp6TIx6s="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kolf-25.08.3.tar.xz",
+    "hash": "sha256-PZStjMm19A8cMJj7UPm1ZPbVlwhDaqo8G6ouXpR0UJ0="
   },
   "kollision": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kollision-25.08.2.tar.xz",
-    "hash": "sha256-WPQsUDkCUE5NhULz4i2dU7d/b4FEuVqlZxnG+E4/70o="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kollision-25.08.3.tar.xz",
+    "hash": "sha256-nfXBZsVK6K14Y8fxV06df7C2V8HfXNzuTk/1Dtyilzo="
   },
   "kolourpaint": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kolourpaint-25.08.2.tar.xz",
-    "hash": "sha256-Ltr6ld26OUX1TzTlxhgnLsrNTGDV9avnCBnM8Gz2Sc0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kolourpaint-25.08.3.tar.xz",
+    "hash": "sha256-7ffBmyNhxQ2VVknbE8/JOVIwi1mpQKCUWO2JjE6xtAw="
   },
   "kompare": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kompare-25.08.2.tar.xz",
-    "hash": "sha256-B46EKx+MKyfJwZUvoTRo4Luxa3cPy0KG6C/IkTlWk7I="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kompare-25.08.3.tar.xz",
+    "hash": "sha256-zkMG4+6PIQ0f64h+SZgVcCt9OMT9OioKp1BJWc1BT+I="
   },
   "kongress": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kongress-25.08.2.tar.xz",
-    "hash": "sha256-HCo0kD444lchYnb0vDhzL50Wvd0Lqk7G3vT5kEE1ttc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kongress-25.08.3.tar.xz",
+    "hash": "sha256-nX9eeJU1U6Z/GAPe57DG4xgmhtwXPHZU8j86wtxVVds="
   },
   "konqueror": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/konqueror-25.08.2.tar.xz",
-    "hash": "sha256-M29xFdQPIevLT/De9T6428ZRVEpbN9OE7F5xSuFfqKA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/konqueror-25.08.3.tar.xz",
+    "hash": "sha256-PPJVeXyJh2kuq+/pS4bibpSurJB/ZZMISOB/YQRMQmQ="
   },
   "konquest": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/konquest-25.08.2.tar.xz",
-    "hash": "sha256-0noUGcNQNv/pyzTzooafXo7PV40Bq7A9DVrRWiE93A8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/konquest-25.08.3.tar.xz",
+    "hash": "sha256-CpDVgw6MY22JJWByJS453CkPZ81ZC1yDv0W+RO/DXvk="
   },
   "konsole": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/konsole-25.08.2.tar.xz",
-    "hash": "sha256-Ig+0SgLl3TEQvH2KBPTXyRC8mbWxh3o2vv0G0eZf43c="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/konsole-25.08.3.tar.xz",
+    "hash": "sha256-CVp/8Q3zxwd5s1b7O1mEBiu8aYu+2WYjDj28z2rzZhU="
   },
   "kontact": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kontact-25.08.2.tar.xz",
-    "hash": "sha256-G31bfbQu2P8D3eWnpUm8/ni5o9t792zn7Tl+ZJrAeRI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kontact-25.08.3.tar.xz",
+    "hash": "sha256-qEEb6WO4KCFWcStbsgs93mo743dpg3VY5ZCm1e0Fsvo="
   },
   "kontactinterface": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kontactinterface-25.08.2.tar.xz",
-    "hash": "sha256-6l6yL+uHVMUO1KGn4WWYZ2wGtS15/mMln+/iHlLJcyk="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kontactinterface-25.08.3.tar.xz",
+    "hash": "sha256-e1nQOAevvoku0A58Im/Yft6Mp+Ond6EcIoaYs9gFl4g="
   },
   "kontrast": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kontrast-25.08.2.tar.xz",
-    "hash": "sha256-tuyd5u/iPFvgx9lFqeLgq4bgP3+WQPwe+YFc+FZOBa0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kontrast-25.08.3.tar.xz",
+    "hash": "sha256-UgvgiPpNWS34GYRybm5Ti3hvOx7MYoE/soArpzh1nGo="
   },
   "konversation": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/konversation-25.08.2.tar.xz",
-    "hash": "sha256-Sg5j1we9Of9uqRXXVMvKKvEcqNapO7atEGrFbiK086k="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/konversation-25.08.3.tar.xz",
+    "hash": "sha256-XkW3jDLY9ydczcUNl4DFrpA0GO2MeXTV2Ylo3DaFgI0="
   },
   "kopeninghours": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kopeninghours-25.08.2.tar.xz",
-    "hash": "sha256-D605x3tytxSpxbax4qsP2NI+8Uib/PvfG0ff6pmMcUM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kopeninghours-25.08.3.tar.xz",
+    "hash": "sha256-DmCIXSzbiP4L9C/jnwHJ4oTddVcnxYVxSDLrqYwRy3M="
   },
   "korganizer": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/korganizer-25.08.2.tar.xz",
-    "hash": "sha256-kGDTsN99L6BpkaPh6z+q6lYRj7kZ3L4wTFWh3zNNTEU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/korganizer-25.08.3.tar.xz",
+    "hash": "sha256-YqGg0VhbkthlL/GU/Mlrsog7zAGOy9T16u9ukPawuXU="
   },
   "kosmindoormap": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kosmindoormap-25.08.2.tar.xz",
-    "hash": "sha256-Oaf0CUc1Kj5EnO+ARfeAqU1a9NleGAD2pjGaZSkoMZs="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kosmindoormap-25.08.3.tar.xz",
+    "hash": "sha256-Giziw+UUv+Aeex/elDvwmRIcrYKoj0RL2sA7V1Cb498="
   },
   "kpat": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kpat-25.08.2.tar.xz",
-    "hash": "sha256-esAFdA2SXLEsrCrb/k8YwFLuE/V+C8y5gm7RijH2DZY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kpat-25.08.3.tar.xz",
+    "hash": "sha256-ZeAz17mquql1cBLUtQurzJG1wslBdMM05wQ7Z4WDJu4="
   },
   "kpimtextedit": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kpimtextedit-25.08.2.tar.xz",
-    "hash": "sha256-jZVgQsnSVZoOFpU6OAtD+QdqTAnueYofNcCL2h2lx7E="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kpimtextedit-25.08.3.tar.xz",
+    "hash": "sha256-Qpv/phStKz6nQkcCwcSBL4zC5C7iEM1av3yd1//kbUY="
   },
   "kpkpass": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kpkpass-25.08.2.tar.xz",
-    "hash": "sha256-RZnluLHbBHxHTMTPWiO/fUloCCdCmGJEoTh1q+hjQfM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kpkpass-25.08.3.tar.xz",
+    "hash": "sha256-OAKm8j7dkBvpdcA7PrY+R46ThDhtiDsiiftZjt8+dYs="
   },
   "kpmcore": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kpmcore-25.08.2.tar.xz",
-    "hash": "sha256-OQJDaeAQARGaX+ylwjD39y6ktiX08nZ8SPbjPAepVVU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kpmcore-25.08.3.tar.xz",
+    "hash": "sha256-QwIiSYs6DdS7YdryYfBkg4+NHoNzMGOk9je1knHtaOM="
   },
   "kpublictransport": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kpublictransport-25.08.2.tar.xz",
-    "hash": "sha256-st7J5F/WMcjW34HAjUufRwbuPUeBFlQxoEpLTAyMLtM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kpublictransport-25.08.3.tar.xz",
+    "hash": "sha256-7Yh98j0EoevRcbWcmd+uwm1iJU6aesT4pwhLowFYbBc="
   },
   "kqtquickcharts": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kqtquickcharts-25.08.2.tar.xz",
-    "hash": "sha256-hpkzB8squHs1bX51SuAvSuBJ8ekigMcrzOEoexJmthI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kqtquickcharts-25.08.3.tar.xz",
+    "hash": "sha256-jympyxr341HoW7d+ZtCC0wToWdJbtVDnTWX3WfARDBE="
   },
   "krdc": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/krdc-25.08.2.tar.xz",
-    "hash": "sha256-4y1lDpMyV1ZuDBuErgz87W3WpN/zOgR5Wk43W/hwXno="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/krdc-25.08.3.tar.xz",
+    "hash": "sha256-qjF7iiHANitt3WnxIsoX9ETt/uui9CK3XOUcZmlQkGo="
   },
   "krecorder": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/krecorder-25.08.2.tar.xz",
-    "hash": "sha256-BZWm2fMYmGn6sVtu3zyOlAL9oEA1hdXXfKO5zo6yCNE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/krecorder-25.08.3.tar.xz",
+    "hash": "sha256-Mnj73af7xEC2+SK2RKyNMtzGPU1EO3ecwssIMXomM2E="
   },
   "kreversi": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kreversi-25.08.2.tar.xz",
-    "hash": "sha256-NCj2A/q58mHBwbn5J5ZpB7Pkrx1fuz5002ecbiBiLSk="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kreversi-25.08.3.tar.xz",
+    "hash": "sha256-gf/rj2ABjRLqKCvgKhd0Xkv2ofFsBnWulyG9+cNSlSQ="
   },
   "krfb": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/krfb-25.08.2.tar.xz",
-    "hash": "sha256-iBuKQpM+LVfMGZ1jq59KuQ9WeqX6Kn9JzV4RQ64rKNo="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/krfb-25.08.3.tar.xz",
+    "hash": "sha256-4S+HkIm2qdS4/HK4IB5SIj6kUGZNKLo6Qxk6Yeud/0I="
   },
   "kruler": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kruler-25.08.2.tar.xz",
-    "hash": "sha256-m/X4uMG0zOER3PHys7I8EJUYcGuglewKAyoeHI7SSCE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kruler-25.08.3.tar.xz",
+    "hash": "sha256-lrIrTlkMtnaGcfEZlOENqUL4JS+sYvq57/0VYR0seaw="
   },
   "ksanecore": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ksanecore-25.08.2.tar.xz",
-    "hash": "sha256-i62zyKTV1GapIpvEbrH0+woW84IAjmOZkDQT2PoKmLE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ksanecore-25.08.3.tar.xz",
+    "hash": "sha256-4VZZmUGT7mDSn64J4n0uRT/DLkSfr4gIpXysip6rqZc="
   },
   "kshisen": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kshisen-25.08.2.tar.xz",
-    "hash": "sha256-pTDUxgJmT8AoSA/M+7zzzjACMWNS2r7SkAJUkRPoGqU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kshisen-25.08.3.tar.xz",
+    "hash": "sha256-0P9OhTLCd7Mptkd25Ye/dacIbX20RkL3cCve7GcIHqg="
   },
   "ksirk": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ksirk-25.08.2.tar.xz",
-    "hash": "sha256-ZxJoE+D01cb91gDyJxsPSJmfm9LQwj0Xpugtrd7VgZ8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ksirk-25.08.3.tar.xz",
+    "hash": "sha256-mSoRZ1ldy2px3lORdTFeQ0W3mSYu6Wa3UYv3c21N58Y="
   },
   "ksmtp": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ksmtp-25.08.2.tar.xz",
-    "hash": "sha256-iF+C0SgxTPThJouZd0bDXExHspJmMkbNjKP7+Eqm2fA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ksmtp-25.08.3.tar.xz",
+    "hash": "sha256-FQdBgHcj8c7ka8HoY5TXhf79ffgiUj1f5TgyouQVzOY="
   },
   "ksnakeduel": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ksnakeduel-25.08.2.tar.xz",
-    "hash": "sha256-LyFMQpXR5o+bufyNNaIjVzHPbAmUBBYr82xU1Ugsy1I="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ksnakeduel-25.08.3.tar.xz",
+    "hash": "sha256-G/5kAJ9iPfUDr1cZxzquUJNO31jBl3RjGGp8/8mjxsY="
   },
   "kspaceduel": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kspaceduel-25.08.2.tar.xz",
-    "hash": "sha256-9vEntOUi6jJ4v3r8WNYmmxSVWMowt8SZ2/sii97d8Ug="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kspaceduel-25.08.3.tar.xz",
+    "hash": "sha256-txLcpESv/zejpFdAwDcJSHwjaj+cjb4NiaezzFPz1P4="
   },
   "ksquares": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ksquares-25.08.2.tar.xz",
-    "hash": "sha256-l1VFaidEq1YNqI10vawKQa7QuDMJCDLyz7LklL2ojdE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ksquares-25.08.3.tar.xz",
+    "hash": "sha256-Wnc8jDtRj6LMXYzfvlBe6C1sDCvSeCiTeyKXcwrdtc8="
   },
   "ksudoku": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ksudoku-25.08.2.tar.xz",
-    "hash": "sha256-PTSj/+mLMgaieN/dz7QQw6pH18s9xLF3oT2/OtQixRc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ksudoku-25.08.3.tar.xz",
+    "hash": "sha256-1XexTOqFRtyLdIC1K5PT4LV+coySYjfVxoQQ7Ll9vdQ="
   },
   "ksystemlog": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ksystemlog-25.08.2.tar.xz",
-    "hash": "sha256-ou6JXgOweo/vK4iIaWo34nv9ItDZ1vQkj024B0ED7zw="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ksystemlog-25.08.3.tar.xz",
+    "hash": "sha256-41APVe04Ju1RhPzzd6R2ISHTbTBIso9DfVLeZZKzPnE="
   },
   "kteatime": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kteatime-25.08.2.tar.xz",
-    "hash": "sha256-sk+Wq6kwX/yEqt9BKsj4O5ehPMySTMrfc4srd6Dotjw="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kteatime-25.08.3.tar.xz",
+    "hash": "sha256-aKghjWcg/U4zlTJwdZbX0e7l7xizFE448nZW8Ntqp80="
   },
   "ktimer": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ktimer-25.08.2.tar.xz",
-    "hash": "sha256-stCkPaE7XECnso9xa/7wTC+hM9Vl1ng8d6dbAv39i68="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ktimer-25.08.3.tar.xz",
+    "hash": "sha256-pLQm1jQcE9i0yYO2JBjK2npmA8c4E1chOgPIXfmF4hg="
   },
   "ktnef": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ktnef-25.08.2.tar.xz",
-    "hash": "sha256-v+lFg1qWMJSghJJ9xkcO878j3dsbRJC+ZB2pwrAyeMc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ktnef-25.08.3.tar.xz",
+    "hash": "sha256-cBVHeVARnN252bTmuUMGsbaHb0YE9Jb+voJMpicF4hM="
   },
   "ktorrent": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ktorrent-25.08.2.tar.xz",
-    "hash": "sha256-m6Ku92a7EnBcHNEnHaK2NZpxslo396QxQHti+OsV4r0="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ktorrent-25.08.3.tar.xz",
+    "hash": "sha256-YsslNCYnT3YZYCgn0d4kaf/+2kN+9dlNyqTXyi3/TT4="
   },
   "ktouch": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ktouch-25.08.2.tar.xz",
-    "hash": "sha256-DgY7FX5goroYjH6oWB+zx6J85fqg2nxtZjPknke9p4U="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ktouch-25.08.3.tar.xz",
+    "hash": "sha256-RxvGm+NjhpVzekatA4FHHVLy/desOfZIaxgIChqZ+Bw="
   },
   "ktrip": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ktrip-25.08.2.tar.xz",
-    "hash": "sha256-DwQm3LD8tQa5BakTSzY6X1f9esKzscVNBB5YGYAclX4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ktrip-25.08.3.tar.xz",
+    "hash": "sha256-67XWgzjhKR80NFaRfB0nfelXJWRjv390MAXUUnUCIL8="
   },
   "ktuberling": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/ktuberling-25.08.2.tar.xz",
-    "hash": "sha256-54aMMBo2G8NG5wxpJUnYdFJFmU7ZNAl5CB9BvwtpLlE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/ktuberling-25.08.3.tar.xz",
+    "hash": "sha256-kn2uK63lPdEODGRlKSX34qr94ELSTuc8McfguntAYU0="
   },
   "kturtle": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kturtle-25.08.2.tar.xz",
-    "hash": "sha256-Ye/bDT78I8F8YlcSeNLc6LEANOMg/aKdTn9pmzN4u9k="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kturtle-25.08.3.tar.xz",
+    "hash": "sha256-niNZcCEncHPReW2prJ7ejD2G+huipyN+NyvBGuJrDgs="
   },
   "kubrick": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kubrick-25.08.2.tar.xz",
-    "hash": "sha256-SmMwjK7l9kxcpFe2vKi/8wnu5d8/MLoJ2hNqGNBNhUY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kubrick-25.08.3.tar.xz",
+    "hash": "sha256-wv90F0c7FKK17TONQ5AnsHGdM8CNnflPOa0SGfLsmRI="
   },
   "kunifiedpush": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kunifiedpush-25.08.2.tar.xz",
-    "hash": "sha256-KlxqGjB0dMqVAreaZf0c9GYhguCDGkfQOLBkDCBXiDI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kunifiedpush-25.08.3.tar.xz",
+    "hash": "sha256-6MkkQ41TWfD6CTCrNREQEgduOg/06VnWkpWVVxODMgo="
   },
   "kwalletmanager": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kwalletmanager-25.08.2.tar.xz",
-    "hash": "sha256-uqll+OnUbp5MKwzPqxn0KvAVaDJGNkrbstYzSffW+3I="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kwalletmanager-25.08.3.tar.xz",
+    "hash": "sha256-VLa2PrVf1VTTEhUxnCC7r9Lhv5SKtrT6TYS1YUttxS0="
   },
   "kwave": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kwave-25.08.2.tar.xz",
-    "hash": "sha256-4A4alB1WAj1QPt7G0nRozvLcF5T3IQKACiRJ3U8Mlwo="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kwave-25.08.3.tar.xz",
+    "hash": "sha256-SNx4aADdyclG/OxxJY8896Ot7pHBMEuF2gVtJs6MolQ="
   },
   "kweather": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kweather-25.08.2.tar.xz",
-    "hash": "sha256-aB1RpiWotF09h+QnYZpeGMteME6Ky/esKHcH2Rtyw+s="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kweather-25.08.3.tar.xz",
+    "hash": "sha256-KNoeLq1scm5iMiMOqo8eDluaa5C3VgMOx/kVHRkNcy0="
   },
   "kweathercore": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kweathercore-25.08.2.tar.xz",
-    "hash": "sha256-DRSR2AEa6T1iku6bjie5YTiVM7K+/cVIIZ9fQtHsDRU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kweathercore-25.08.3.tar.xz",
+    "hash": "sha256-aTVzoCRb9l2s6rEnrEXJrPuznmt8UW2BevVBzTElsls="
   },
   "kwordquiz": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/kwordquiz-25.08.2.tar.xz",
-    "hash": "sha256-vvWWexyIiySBx36rX1HxBiOEvIYiirtBmF9TnoUl0j8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/kwordquiz-25.08.3.tar.xz",
+    "hash": "sha256-FD3tCu6gIDbeeq29O2zoENAGanPcyC02excZYqgSFoQ="
   },
   "libgravatar": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libgravatar-25.08.2.tar.xz",
-    "hash": "sha256-K9uwLdAQIwdbkDJBFCTUFazYsiolpKLgSs51khJrweY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libgravatar-25.08.3.tar.xz",
+    "hash": "sha256-lMd3JgKzraqLTUSiJ2mdlDCXAFrr/u9WPK6tt15vI/s="
   },
   "libkcddb": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkcddb-25.08.2.tar.xz",
-    "hash": "sha256-lgI1UJaRwh39juHFSTru5YWRK98YBqa0tZuPafmVqnE="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkcddb-25.08.3.tar.xz",
+    "hash": "sha256-HYXr8890TjVv8g/fADgyeUT+pDN4Yo2jvYuZDmXTdpc="
   },
   "libkcompactdisc": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkcompactdisc-25.08.2.tar.xz",
-    "hash": "sha256-dq+OIjKMN5hFpLxS1csdH2Bllz8stTGDUwK8pSjMZyg="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkcompactdisc-25.08.3.tar.xz",
+    "hash": "sha256-PXqeirTcFJcIukWb7gumW+hU6ux4yX97p/j2YyrjhnA="
   },
   "libkdcraw": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkdcraw-25.08.2.tar.xz",
-    "hash": "sha256-CuQpKsI3YpMXGSUubaHgRDkNTwuJtOaBsSuH5q9EnSA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkdcraw-25.08.3.tar.xz",
+    "hash": "sha256-Uvp40BPhPHLGL7TWho7xCowR2JlIptJEFWR+kXqnLN8="
   },
   "libkdegames": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkdegames-25.08.2.tar.xz",
-    "hash": "sha256-Q/PP34LkbAdkrHeb/L48eHKOyfiA5x/PWH+zwFGV9Oc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkdegames-25.08.3.tar.xz",
+    "hash": "sha256-RvMFZ3+zeXjGtHvRerZVO1chUaYymbt7jccY03+0SKQ="
   },
   "libkdepim": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkdepim-25.08.2.tar.xz",
-    "hash": "sha256-k2tPCnF3aFQttGnj1Z/x5FB1XSTaNBWaPQFtu6JcvSg="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkdepim-25.08.3.tar.xz",
+    "hash": "sha256-OspVtxvjWrNpkwXy9/x2bUvQDETrt2Mb/WQcEkzQsek="
   },
   "libkeduvocdocument": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkeduvocdocument-25.08.2.tar.xz",
-    "hash": "sha256-1lHduat2IaOR2pW8YvnR1zVOIcbaVius51z20lJcCt4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkeduvocdocument-25.08.3.tar.xz",
+    "hash": "sha256-tNzEPB2PcR1bmsCinXji7HcQtbzYDx7GJTTosbDr3cU="
   },
   "libkexiv2": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkexiv2-25.08.2.tar.xz",
-    "hash": "sha256-G4rqeHNmYq8X1q4DkTRZM3VPmM/8oVNSBIE+sn7/YiI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkexiv2-25.08.3.tar.xz",
+    "hash": "sha256-CAaJhVS2Km+DTTO7SBkj2CvekbFpK6exRv7JS5pQPQM="
   },
   "libkgapi": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkgapi-25.08.2.tar.xz",
-    "hash": "sha256-hQrGcoBVEPy7aKg4SiEsOMP/7COOWIebxVt0keLpAac="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkgapi-25.08.3.tar.xz",
+    "hash": "sha256-WmWQ2gTPSgw7U/Kgx9fJfN9X9jhUoKSXjAhZJDv70V4="
   },
   "libkleo": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkleo-25.08.2.tar.xz",
-    "hash": "sha256-vGuWNkTUx8AAAtoN8UPIze2k0/EusUCbZyEvq93g17g="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkleo-25.08.3.tar.xz",
+    "hash": "sha256-BVOxiilctfv/X66ZA0p4KuTQfUPSwWN+r2ejHKZQuBY="
   },
   "libkmahjongg": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkmahjongg-25.08.2.tar.xz",
-    "hash": "sha256-yZl1Nl3DRkvO16RnBW3KQ9XxdHAXgz0/Vq0RXKGoBww="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkmahjongg-25.08.3.tar.xz",
+    "hash": "sha256-SC+c76Nbpi0ScbOpsvC+zPDpVOt/2ECmHeTMSxi9xlc="
   },
   "libkomparediff2": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libkomparediff2-25.08.2.tar.xz",
-    "hash": "sha256-TVM+fXS+K2EnvZBvpNff4ejrRZ6QhnfmQS6L0LShwac="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libkomparediff2-25.08.3.tar.xz",
+    "hash": "sha256-bpNvhmHzNsuaz/eeJG4d+yhPnNVmoBxlq1oliec2yew="
   },
   "libksane": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libksane-25.08.2.tar.xz",
-    "hash": "sha256-2mtzd2CfB4lgB9sF4zIykbsW/NLWzZwsG1jg+Zn/ujM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libksane-25.08.3.tar.xz",
+    "hash": "sha256-cwv078ybgjupjGgUkuQTk3mrDD5gLh5u/ynATxdtb2g="
   },
   "libksieve": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libksieve-25.08.2.tar.xz",
-    "hash": "sha256-nw7m3ljGe4FYhz6X6GmUojjLYrkeW5HQK0BB6WbOJHg="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libksieve-25.08.3.tar.xz",
+    "hash": "sha256-bgZj63oMQAfFZE+rg8Q2cTO7YbeuO3J4vINpcXdf/5k="
   },
   "libktorrent": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/libktorrent-25.08.2.tar.xz",
-    "hash": "sha256-RdgIjGzXU3iDZn4Ry/6Tf5ZMvYBw196l05vZOhG1WDY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/libktorrent-25.08.3.tar.xz",
+    "hash": "sha256-z6TZb062gnpK1mzAr3JNF3PLUW3uKYgjIEzEXgrRzWk="
   },
   "lokalize": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/lokalize-25.08.2.tar.xz",
-    "hash": "sha256-DjrFQUgDyJAe9KSOivqT4qWHNtX9OxTFEdbZ0gGNMNo="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/lokalize-25.08.3.tar.xz",
+    "hash": "sha256-B54/zaOnTvessbMGPu6xAjfnNkZr1JlTdipl0I7xFIM="
   },
   "lskat": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/lskat-25.08.2.tar.xz",
-    "hash": "sha256-8qz6IhIZWoZj+btqE1H9RTeQ9er+dOm0VnHrYfI8IoA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/lskat-25.08.3.tar.xz",
+    "hash": "sha256-lTKIRVfvJGj4K2WmzlT9y8DfPKGS/njKy44k97coKb0="
   },
   "mailcommon": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/mailcommon-25.08.2.tar.xz",
-    "hash": "sha256-6miyUOO6PjsiwhvEDOTtQBUC0eWejtz3DFsfydSzTcc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/mailcommon-25.08.3.tar.xz",
+    "hash": "sha256-PEaG+HOUDgC3UlmT+s1aU+LH8tlECMb2inaqE7EXQ/o="
   },
   "mailimporter": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/mailimporter-25.08.2.tar.xz",
-    "hash": "sha256-z++flxJoJFGItEFfjn0boPfvqPmSXHpNsIhzZ/IPuEg="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/mailimporter-25.08.3.tar.xz",
+    "hash": "sha256-8MsBq+JLOlMydW3tUZMSgT/w43lx1r+xk3wLe8xv2qk="
   },
   "marble": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/marble-25.08.2.tar.xz",
-    "hash": "sha256-ZV1wp2j/xn1dPy2CAAXepX/5r10Jg346urz/Evy3df8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/marble-25.08.3.tar.xz",
+    "hash": "sha256-ZcA02sx6LVu/U0/KZXQonosdvyvVDk9j/00atk/wcZg="
   },
   "markdownpart": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/markdownpart-25.08.2.tar.xz",
-    "hash": "sha256-8I1iQ2m+EP2VY6Ofatb88gDgmfD4Ov45AKhPeE7k50I="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/markdownpart-25.08.3.tar.xz",
+    "hash": "sha256-WVJLI3e+0JYjSotHHzwXVFU9HT8SI53rN3ycAtVDZT0="
   },
   "massif-visualizer": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/massif-visualizer-25.08.2.tar.xz",
-    "hash": "sha256-88nqICyX5ajDQ1pc0op5blDT9Fo7GNzJXwWQy8uSmhQ="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/massif-visualizer-25.08.3.tar.xz",
+    "hash": "sha256-Bx3Rj+LLsJIkmDpmByXVlvCbauZwM+7ATilZQbQAZ3U="
   },
   "mbox-importer": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/mbox-importer-25.08.2.tar.xz",
-    "hash": "sha256-J58Kp9PpK8qtVym/UP728LQ9WOMhwoJ96y/Lnm9vz2A="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/mbox-importer-25.08.3.tar.xz",
+    "hash": "sha256-vULK64dpOrPKzHxC2flA4iyHWvTU0wSyZWCT3kjZuCI="
   },
   "merkuro": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/merkuro-25.08.2.tar.xz",
-    "hash": "sha256-6n6ZhJO8a0bnNyMXO1882rOclclcrpA8sXz+KoeOs0U="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/merkuro-25.08.3.tar.xz",
+    "hash": "sha256-oCHLfVogUZN1pWv/hUH8Kzvd1evkhaub0l4wayETEq0="
   },
   "messagelib": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/messagelib-25.08.2.tar.xz",
-    "hash": "sha256-RkVrc9bN0QxdHduP5T/A/2HhzjjJXC/CEpnb6eSmR+4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/messagelib-25.08.3.tar.xz",
+    "hash": "sha256-p8h4gwpdeQdSyYs9lWPHbhowtqKM7FPL1Ka2ATL1Z/g="
   },
   "mimetreeparser": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/mimetreeparser-25.08.2.tar.xz",
-    "hash": "sha256-+jLUHCaEdMDkUk9WXEgyXl0dkIJ5bdZ2CKm+pRRr7bI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/mimetreeparser-25.08.3.tar.xz",
+    "hash": "sha256-6hbPP8h+HKlQpBSUvRbvoHBdAGG1W1RaiZeYQ8g1uXc="
   },
   "minuet": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/minuet-25.08.2.tar.xz",
-    "hash": "sha256-qV49m/Of++FJ5vy5pk5Cv1+7V/FyPriSGKDlaoB0iEo="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/minuet-25.08.3.tar.xz",
+    "hash": "sha256-ECs5JaDltDem8+Ezq8roZ2I4lyqdaMRmbBqnblG5ukQ="
   },
   "neochat": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/neochat-25.08.2.tar.xz",
-    "hash": "sha256-VDkkfJtnT2/U9yQOlJitwhlyxvw1BCrrs0K8/K84Q/U="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/neochat-25.08.3.tar.xz",
+    "hash": "sha256-X62WRyoLV3qfK9fMVe1/b0gcRIv3duPVlsoJV6/MjDU="
   },
   "okular": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/okular-25.08.2.tar.xz",
-    "hash": "sha256-3kAc00N21nihajYUc1FIRPeIALOY47Dba96FoJ5jU5I="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/okular-25.08.3.tar.xz",
+    "hash": "sha256-Ay496PxUZ5YUGFlpEYjm+ALG3kmLZczLzmCqYNhlcU8="
   },
   "palapeli": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/palapeli-25.08.2.tar.xz",
-    "hash": "sha256-EF2bCUncy3yN8hbvoyMgHlfLKfoY70sE5kjC6yZn1zk="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/palapeli-25.08.3.tar.xz",
+    "hash": "sha256-j8fuZ+QiXLEvFh4ePo3evMLuH1Bo/eEM/QbuWkFgiUU="
   },
   "parley": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/parley-25.08.2.tar.xz",
-    "hash": "sha256-WUmrWVoRgeYYheHfCkOIzpq5FrRh6a55w+cCjFIxjhQ="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/parley-25.08.3.tar.xz",
+    "hash": "sha256-BMtueE6ChA1sp3mvriE+baW/7k3Kgrl3Er+4/RrFBWQ="
   },
   "partitionmanager": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/partitionmanager-25.08.2.tar.xz",
-    "hash": "sha256-gRfiToA45dMk7pNCnxeslklg40aFTCYut4MNhWrZBHs="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/partitionmanager-25.08.3.tar.xz",
+    "hash": "sha256-19HbCJIZgzqVzt0yp3hZxziuzqh6smc6ym5oCaH3sXE="
   },
   "picmi": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/picmi-25.08.2.tar.xz",
-    "hash": "sha256-GIqd3LbO/COPRpafbTQiHOLXUJVb2oFynhsBITY+sh8="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/picmi-25.08.3.tar.xz",
+    "hash": "sha256-3VzAh7jTcPHiWpNvsKjqzupoel/UnzDQASNItedoqXA="
   },
   "pim-data-exporter": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/pim-data-exporter-25.08.2.tar.xz",
-    "hash": "sha256-m45H9SxFMmLJOaT6pKP4zEmd2RgFZMBHdRtsWp3wTyc="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/pim-data-exporter-25.08.3.tar.xz",
+    "hash": "sha256-dHbHp7hZT53QhllmCh7zBCDIDUiWFIkjDMhQVosjags="
   },
   "pim-sieve-editor": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/pim-sieve-editor-25.08.2.tar.xz",
-    "hash": "sha256-+6zJfq56Br9N8Rqc3rvJ+lainoz8zABylY6OJKN0YnU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/pim-sieve-editor-25.08.3.tar.xz",
+    "hash": "sha256-nqMohVofxgLs4gvODqLJ4zHzvkFsbmro+YUYsCkqJoQ="
   },
   "pimcommon": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/pimcommon-25.08.2.tar.xz",
-    "hash": "sha256-3jQUmUBvMX2v6fo+XutgC70Oxp804o6OC7j/2r6OlQs="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/pimcommon-25.08.3.tar.xz",
+    "hash": "sha256-/oIGtot4tVXO7YPPLmjlNIQGxZrBW8Qzkotlv56He4g="
   },
   "plasmatube": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/plasmatube-25.08.2.tar.xz",
-    "hash": "sha256-TE8PZNcu4YvsAzNvs5G9uX54AKKqgLcZXmjnsNYlAlQ="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/plasmatube-25.08.3.tar.xz",
+    "hash": "sha256-qJ4ZBtN7Fvp2+ACWQO69jj29hzp+tjly594Jhj6MO1g="
   },
   "poxml": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/poxml-25.08.2.tar.xz",
-    "hash": "sha256-tCJsUSeByP5roUMZHzS0lUeuXysB1ISBqrqYQpi3ftU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/poxml-25.08.3.tar.xz",
+    "hash": "sha256-EpZ7UxNgVADo3jzzlHgTb1tmFrK0V3TcGFu2tcuue30="
   },
   "qmlkonsole": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/qmlkonsole-25.08.2.tar.xz",
-    "hash": "sha256-vskxw9ASMG/BaH8BBjF+jrnl+d9TeLUGiJVYmqyGjbI="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/qmlkonsole-25.08.3.tar.xz",
+    "hash": "sha256-SFD6lJeC2zMctKqFz2fXJ+3YBrd3Gr6C1KfVag6+/E0="
   },
   "qrca": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/qrca-25.08.2.tar.xz",
-    "hash": "sha256-A2VLarfZSiSj9ysHaUwpHHjpguo49WNY1aSJ4dwuFwU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/qrca-25.08.3.tar.xz",
+    "hash": "sha256-6lwXkYjD2pI5o1Ayw2USltVXtT2r5RNNpMFNi+qCMtc="
   },
   "rocs": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/rocs-25.08.2.tar.xz",
-    "hash": "sha256-BL+zxhB4ZTvHiZTSNiK6Qt08sDUJoMIhhXg5UfH6blU="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/rocs-25.08.3.tar.xz",
+    "hash": "sha256-R6dDofPt1J2LZwKjXyoOBV0E4FB7/wCf/dteQmEySss="
   },
   "signon-kwallet-extension": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/signon-kwallet-extension-25.08.2.tar.xz",
-    "hash": "sha256-amAuEs3fuSZqOLVID6yo5LeJkrhASqLIspsGl5qm51w="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/signon-kwallet-extension-25.08.3.tar.xz",
+    "hash": "sha256-R+ee39uX2SQOIu2fpiTrrDzSGeSi7ncMaGm4abU7mv8="
   },
   "skanlite": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/skanlite-25.08.2.tar.xz",
-    "hash": "sha256-YIJ16zKwEcfdNAARieNLADr+iblM3d8Uq5m4Dw2ICKg="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/skanlite-25.08.3.tar.xz",
+    "hash": "sha256-ga/hMhLF7a7sSlfBChBdMdwg2jteCO9l+/P3Q8CPAnY="
   },
   "skanpage": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/skanpage-25.08.2.tar.xz",
-    "hash": "sha256-G93TK6+yj1zKatkBBFUrdCmnxN1DBI7IH7PPU/LyBHk="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/skanpage-25.08.3.tar.xz",
+    "hash": "sha256-6EMcc/YpAduT5HAM7LdieZq94Far+P2Ar4cH0SnG1Fg="
   },
   "skladnik": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/skladnik-25.08.2.tar.xz",
-    "hash": "sha256-AmxD4/iLvoz6Ue9wOHlbWwclocI0RAymqoqyBKrFJ6c="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/skladnik-25.08.3.tar.xz",
+    "hash": "sha256-5NjDXHJpOcnaeX4c1F1W0KDQSnnasfwtp6ztZqMPzo8="
   },
   "step": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/step-25.08.2.tar.xz",
-    "hash": "sha256-wA0k//FkXrJJamFejkc2VE7jX9OMwbhLc15aJRrILDM="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/step-25.08.3.tar.xz",
+    "hash": "sha256-sd3OT1Kgt1GIYWwGK+T6etXT13JcIR7AEXGamtJ+hvk="
   },
   "svgpart": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/svgpart-25.08.2.tar.xz",
-    "hash": "sha256-T8+uQ8Q/RfnUS2VSM550FI8sXAd6jUh9H/9Oo+9tvKY="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/svgpart-25.08.3.tar.xz",
+    "hash": "sha256-l/b9tP8xEOQdjfayXw0YT1I12InYx8FcfGu7Gi8G3hc="
   },
   "sweeper": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/sweeper-25.08.2.tar.xz",
-    "hash": "sha256-4KCSw/g0cVCHo4knw8J/Thz/xZYkBNjj/vacO6bto60="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/sweeper-25.08.3.tar.xz",
+    "hash": "sha256-brC3wxqfvh+Q5NRyVIj4KFStA4lPnp/rVvYdOdBFZZ0="
   },
   "telly-skout": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/telly-skout-25.08.2.tar.xz",
-    "hash": "sha256-nf76OvOoHAUrpFlTlKKgnKb/MYYCL8oBeqj4ATwFQMA="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/telly-skout-25.08.3.tar.xz",
+    "hash": "sha256-RP12+uGbvD+ApoylGFN7n3B7SIQDBWSmmGYYM7RvYXA="
   },
   "tokodon": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/tokodon-25.08.2.tar.xz",
-    "hash": "sha256-8yYWdcDGq0IbSwGk/1WesUw+40xsxx5uoj77EQY7ojQ="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/tokodon-25.08.3.tar.xz",
+    "hash": "sha256-MyaPh3sIWJ6QF2UwsVr6u9V6uuZodPSQc+3zcGreoiE="
   },
   "umbrello": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/umbrello-25.08.2.tar.xz",
-    "hash": "sha256-7BQbgzSFFKXxRZbtV9Kt5J9ze07a/Y6G8Cv1FU55TH4="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/umbrello-25.08.3.tar.xz",
+    "hash": "sha256-kEimFZyEhiSKlblW7QjBlUrCFwi4moH+ajsKp6Ugeiw="
   },
   "yakuake": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/yakuake-25.08.2.tar.xz",
-    "hash": "sha256-cL7+ptmgaPbc67q/HrBYR4+dAEgDHdT4DPjcCH8MRRw="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/yakuake-25.08.3.tar.xz",
+    "hash": "sha256-2NPw/+z9mPAMhhin3PXPhe90X3BHF9+BmPYyHYNFHuw="
   },
   "zanshin": {
-    "version": "25.08.2",
-    "url": "mirror://kde/stable/release-service/25.08.2/src/zanshin-25.08.2.tar.xz",
-    "hash": "sha256-S5Ind8wxaE/NsKD3+seQ8g7k3iKSe8GQn/7TpCqpE5A="
+    "version": "25.08.3",
+    "url": "mirror://kde/stable/release-service/25.08.3/src/zanshin-25.08.3.tar.xz",
+    "hash": "sha256-3A0QGC8qE1f+8jlbXo79rsTsTl9hZVEKNRKDjAspbYE="
   }
 }
\ No newline at end of file

From d48622de0a435bb2b470e06b2936e821b3aa5ccc Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Thu, 6 Nov 2025 17:25:43 +0000
Subject: [PATCH 5933/6226] v2rayn: 7.15.6 -> 7.15.7

---
 pkgs/by-name/v2/v2rayn/deps.json   | 42 ++++++++++++++++++------------
 pkgs/by-name/v2/v2rayn/package.nix |  4 +--
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/v2/v2rayn/deps.json b/pkgs/by-name/v2/v2rayn/deps.json
index 3aca1d055f16..03b57f5c569e 100644
--- a/pkgs/by-name/v2/v2rayn/deps.json
+++ b/pkgs/by-name/v2/v2rayn/deps.json
@@ -74,11 +74,6 @@
     "version": "11.3.8",
     "hash": "sha256-Hm4uneEN3rQVmSp1Ai4cDSTJpixYDzYJzEkAesvwxPw="
   },
-  {
-    "pname": "Avalonia.ReactiveUI",
-    "version": "11.3.8",
-    "hash": "sha256-QwIPrfoxNw/u/deWc5C3ps0eQDBFOocMH74nlVahQuM="
-  },
   {
     "pname": "Avalonia.Remote.Protocol",
     "version": "11.0.0",
@@ -211,8 +206,13 @@
   },
   {
     "pname": "ReactiveUI",
-    "version": "20.4.1",
-    "hash": "sha256-YXd4A5akZ/dMOo9IalKPoNMGlBGxk60o3u6pGB4BCXY="
+    "version": "22.2.1",
+    "hash": "sha256-MZNBNP2ajvfRU4OaG8JjbbaQ3xbE+FjE9RZK+TZdOCE="
+  },
+  {
+    "pname": "ReactiveUI.Avalonia",
+    "version": "11.3.8",
+    "hash": "sha256-ff2qlfJKaSZNGgnbWu53c2GwJKSD/oMrhkdi8OO3duo="
   },
   {
     "pname": "ReactiveUI.Fody",
@@ -276,8 +276,23 @@
   },
   {
     "pname": "Splat",
-    "version": "15.3.1",
-    "hash": "sha256-1MlkqywOtLr5TbQ+zAqzw0l92LK9+9h2+sJgmfV32RU="
+    "version": "17.1.1",
+    "hash": "sha256-BS+/7xJ990uV8WQynaWYDIJSLU1BAmsVFkU4b/axDHo="
+  },
+  {
+    "pname": "Splat.Builder",
+    "version": "17.1.1",
+    "hash": "sha256-73qopUapBpkR39GD6WD3dPNteUjEc1kt50qcLv2fIJI="
+  },
+  {
+    "pname": "Splat.Core",
+    "version": "17.1.1",
+    "hash": "sha256-M3E75Ncugew99VJB+zwDpOydLJ+G8j4RLoTvEKKmnV0="
+  },
+  {
+    "pname": "Splat.Logging",
+    "version": "17.1.1",
+    "hash": "sha256-LzuHFVeOWsdDpXhnXb7UVP0xPi3GipgjXrSOv1WqXVY="
   },
   {
     "pname": "sqlite-net-pcl",
@@ -309,11 +324,6 @@
     "version": "4.5.0",
     "hash": "sha256-15yE2NoT9vmL9oGCaxHClQR1jLW1j1ef5hHMg55xRso="
   },
-  {
-    "pname": "System.ComponentModel.Annotations",
-    "version": "5.0.0",
-    "hash": "sha256-0pST1UHgpeE6xJrYf5R+U7AwIlH3rVC3SpguilI/MAg="
-  },
   {
     "pname": "System.Diagnostics.EventLog",
     "version": "6.0.0",
@@ -336,8 +346,8 @@
   },
   {
     "pname": "System.Reactive",
-    "version": "6.0.1",
-    "hash": "sha256-Lo5UMqp8DsbVSUxa2UpClR1GoYzqQQcSxkfyFqB/d4Q="
+    "version": "6.0.2",
+    "hash": "sha256-4WwkPpfdIpbAjN5K0OSLXW6aelwvvMBgd8syCtf+qeE="
   },
   {
     "pname": "System.Reactive",
diff --git a/pkgs/by-name/v2/v2rayn/package.nix b/pkgs/by-name/v2/v2rayn/package.nix
index 0faa6c9c91a3..9bcf2f643d49 100644
--- a/pkgs/by-name/v2/v2rayn/package.nix
+++ b/pkgs/by-name/v2/v2rayn/package.nix
@@ -20,13 +20,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "v2rayn";
-  version = "7.15.6";
+  version = "7.15.7";
 
   src = fetchFromGitHub {
     owner = "2dust";
     repo = "v2rayN";
     tag = finalAttrs.version;
-    hash = "sha256-YBOfewVdFWjP47JIWJErqEqR8/vSJLaFkZ3uJblPK6Q=";
+    hash = "sha256-xTD1bdL/UUGqUxDmrguO6Oapv37clDD2b3YWCe7B+Bs=";
     fetchSubmodules = true;
   };
 

From 809179bd7e7d7cf07b6307f1e2cfa0e8b0a896c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 6 Nov 2025 09:43:24 -0800
Subject: [PATCH 5934/6226] radicale: 3.5.7 -> 3.5.8

Diff: https://github.com/Kozea/Radicale/compare/v3.5.7...v3.5.8

Changelog: https://github.com/Kozea/Radicale/blob/v3.5.8/CHANGELOG.md
---
 pkgs/by-name/ra/radicale/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix
index b820ceef3743..f95d46d1f528 100644
--- a/pkgs/by-name/ra/radicale/package.nix
+++ b/pkgs/by-name/ra/radicale/package.nix
@@ -7,14 +7,14 @@
 
 python3.pkgs.buildPythonApplication rec {
   pname = "radicale";
-  version = "3.5.7";
+  version = "3.5.8";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Kozea";
     repo = "Radicale";
     tag = "v${version}";
-    hash = "sha256-+vYLBd4psPxL2NkH8zriRpLUGK6cWrrkJyV230LePVE=";
+    hash = "sha256-kgtNk+MXanYB0RyNncfM3K/HJZlScat7RDuoclu5/i0=";
   };
 
   build-system = with python3.pkgs; [

From 81a676c92b0620f29fad0c0b46e6495d11341173 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Tue, 4 Nov 2025 16:55:57 -0500
Subject: [PATCH 5935/6226] mocha: migrate from nodePackages

---
 pkgs/by-name/mo/mocha/package.nix             |  33 +++
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 216 ------------------
 4 files changed, 34 insertions(+), 217 deletions(-)
 create mode 100644 pkgs/by-name/mo/mocha/package.nix

diff --git a/pkgs/by-name/mo/mocha/package.nix b/pkgs/by-name/mo/mocha/package.nix
new file mode 100644
index 000000000000..8b358c766a57
--- /dev/null
+++ b/pkgs/by-name/mo/mocha/package.nix
@@ -0,0 +1,33 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "mocha";
+  version = "11.7.4";
+
+  src = fetchFromGitHub {
+    owner = "mochajs";
+    repo = "mocha";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-mRXdAPKDNnQzr8oz6NrTeUFgT7aBbsTl4TxFvjcVqCs=";
+  };
+
+  npmDepsHash = "sha256-NTJ27KucQcrnpPVtEX3zr6qQZjaLzNHPhgJefntE8hg=";
+
+  postInstall = ''
+    # Installed only for backwards compat, but should just be removed.
+    rm $out/bin/_mocha
+  '';
+
+  meta = {
+    changelog = "https://github.com/mochajs/mocha/blob/v${finalAttrs.version}/CHANGELOG.md";
+    description = "Simple, flexible, fun Javascript test framework for Node.js & the browser";
+    homepage = "https://mochajs.org";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+    mainProgram = "mocha";
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 55848e3615de..830f5ba99fba 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -166,6 +166,7 @@ mapAliases {
   meat = throw "meat was removed because it was abandoned upstream."; # Added 2025-10-20
   inherit (pkgs) mermaid-cli; # added 2023-10-01
   meshcommander = throw "meshcommander was removed because it was abandoned upstream"; # added 2024-12-02
+  inherit (pkgs) mocha; # Added 2025-11-04
   musescore-downloader = pkgs.dl-librescore; # added 2023-08-19
   inherit (pkgs) near-cli; # added 2023-09-09
   neovim = pkgs.neovim-node-client; # added 2024-11-13
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index c4209c708ead..443b3e9768bd 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -97,7 +97,6 @@
 , "madoko"
 , "mastodon-bot"
 , "mathjax"
-, "mocha"
 , "multi-file-swagger"
 , "nijs"
 , "node-gyp-build"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 1b7c6e92a8fb..76cef919a441 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -5144,15 +5144,6 @@ let
         sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==";
       };
     };
-    "ansi-colors-4.1.3" = {
-      name = "ansi-colors";
-      packageName = "ansi-colors";
-      version = "4.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz";
-        sha512 = "/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==";
-      };
-    };
     "ansi-escapes-1.4.0" = {
       name = "ansi-escapes";
       packageName = "ansi-escapes";
@@ -6809,15 +6800,6 @@ let
         sha512 = "7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==";
       };
     };
-    "browser-stdout-1.3.1" = {
-      name = "browser-stdout";
-      packageName = "browser-stdout";
-      version = "1.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz";
-        sha512 = "qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==";
-      };
-    };
     "browser-sync-client-3.0.3" = {
       name = "browser-sync-client";
       packageName = "browser-sync-client";
@@ -10167,15 +10149,6 @@ let
         sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==";
       };
     };
-    "decamelize-4.0.0" = {
-      name = "decamelize";
-      packageName = "decamelize";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/decamelize/-/decamelize-4.0.0.tgz";
-        sha512 = "9iE1PgSik9HeIIw2JO94IidnE3eBoQrFJ3w7sFuzSX4DpmZ3v5sZpUiV5Swcf6mQEF+Y0ru8Neo+p+nyh2J+hQ==";
-      };
-    };
     "decamelize-5.0.1" = {
       name = "decamelize";
       packageName = "decamelize";
@@ -13344,15 +13317,6 @@ let
         sha512 = "Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA==";
       };
     };
-    "flat-5.0.2" = {
-      name = "flat";
-      packageName = "flat";
-      version = "5.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz";
-        sha512 = "b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==";
-      };
-    };
     "flat-cache-1.3.4" = {
       name = "flat-cache";
       packageName = "flat-cache";
@@ -27728,15 +27692,6 @@ let
         sha512 = "v67WcEouB5GxbTWL/4NeToqcZiAWEq90N888fczVArY8A79J0L4FD7vj5hm3eUMua5EpoQ59wa/oovY6TLvRUA==";
       };
     };
-    "serialize-javascript-6.0.2" = {
-      name = "serialize-javascript";
-      packageName = "serialize-javascript";
-      version = "6.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz";
-        sha512 = "Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==";
-      };
-    };
     "serve-favicon-2.5.0" = {
       name = "serve-favicon";
       packageName = "serve-favicon";
@@ -33677,15 +33632,6 @@ let
         sha512 = "tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==";
       };
     };
-    "yargs-unparser-2.0.0" = {
-      name = "yargs-unparser";
-      packageName = "yargs-unparser";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yargs-unparser/-/yargs-unparser-2.0.0.tgz";
-        sha512 = "7pRTIA9Qc1caZ0bZ6RYRGbHJthJWuakf+WmHK0rVeLkNrrGhfoabBNdue6kdINI6r4if7ocq9aD/n7xwKOdzOA==";
-      };
-    };
     "yauzl-2.10.0" = {
       name = "yauzl";
       packageName = "yauzl";
@@ -44190,168 +44136,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  mocha = nodeEnv.buildNodePackage {
-    name = "mocha";
-    packageName = "mocha";
-    version = "11.1.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/mocha/-/mocha-11.1.0.tgz";
-      sha512 = "8uJR5RTC2NgpY3GrYcgpZrsEd9zKbPDpob1RezyR2upGHRQtHWofmzTMzTMSV6dru3tj5Ukt0+Vnq1qhFEEwAg==";
-    };
-    dependencies = [
-      sources."@isaacs/cliui-8.0.2"
-      sources."ansi-colors-4.1.3"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-6.2.1"
-      sources."anymatch-3.1.3"
-      sources."argparse-2.0.1"
-      sources."balanced-match-1.0.2"
-      sources."binary-extensions-2.3.0"
-      sources."brace-expansion-2.0.1"
-      sources."braces-3.0.3"
-      sources."browser-stdout-1.3.1"
-      sources."camelcase-6.3.0"
-      (
-        sources."chalk-4.1.2"
-        // {
-          dependencies = [
-            sources."ansi-styles-4.3.0"
-            sources."supports-color-7.2.0"
-          ];
-        }
-      )
-      sources."chokidar-3.6.0"
-      (
-        sources."cliui-8.0.1"
-        // {
-          dependencies = [
-            sources."ansi-styles-4.3.0"
-            sources."emoji-regex-8.0.0"
-            sources."string-width-4.2.3"
-            sources."strip-ansi-6.0.1"
-            sources."wrap-ansi-7.0.0"
-          ];
-        }
-      )
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."cross-spawn-7.0.6"
-      sources."debug-4.4.0"
-      sources."decamelize-4.0.0"
-      sources."diff-5.2.0"
-      sources."eastasianwidth-0.2.0"
-      sources."emoji-regex-9.2.2"
-      sources."escalade-3.2.0"
-      sources."escape-string-regexp-4.0.0"
-      sources."fill-range-7.1.1"
-      sources."find-up-5.0.0"
-      sources."flat-5.0.2"
-      sources."foreground-child-3.3.1"
-      sources."get-caller-file-2.0.5"
-      (
-        sources."glob-10.4.5"
-        // {
-          dependencies = [
-            sources."minimatch-9.0.5"
-          ];
-        }
-      )
-      sources."glob-parent-5.1.2"
-      sources."has-flag-4.0.0"
-      sources."he-1.2.0"
-      sources."is-binary-path-2.1.0"
-      sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-glob-4.0.3"
-      sources."is-number-7.0.0"
-      sources."is-plain-obj-2.1.0"
-      sources."is-unicode-supported-0.1.0"
-      sources."isexe-2.0.0"
-      sources."jackspeak-3.4.3"
-      sources."js-yaml-4.1.0"
-      sources."locate-path-6.0.0"
-      sources."log-symbols-4.1.0"
-      sources."lru-cache-10.4.3"
-      sources."minimatch-5.1.6"
-      sources."minipass-7.1.2"
-      sources."ms-2.1.3"
-      sources."normalize-path-3.0.0"
-      sources."p-limit-3.1.0"
-      sources."p-locate-5.0.0"
-      sources."package-json-from-dist-1.0.1"
-      sources."path-exists-4.0.0"
-      sources."path-key-3.1.1"
-      sources."path-scurry-1.11.1"
-      sources."picomatch-2.3.1"
-      sources."randombytes-2.1.0"
-      sources."readdirp-3.6.0"
-      sources."require-directory-2.1.1"
-      sources."safe-buffer-5.2.1"
-      sources."serialize-javascript-6.0.2"
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
-      sources."signal-exit-4.1.0"
-      sources."string-width-5.1.2"
-      (
-        sources."string-width-cjs-4.2.3"
-        // {
-          dependencies = [
-            sources."emoji-regex-8.0.0"
-            sources."strip-ansi-6.0.1"
-          ];
-        }
-      )
-      (
-        sources."strip-ansi-7.1.0"
-        // {
-          dependencies = [
-            sources."ansi-regex-6.1.0"
-          ];
-        }
-      )
-      sources."strip-ansi-cjs-6.0.1"
-      sources."strip-json-comments-3.1.1"
-      sources."supports-color-8.1.1"
-      sources."to-regex-range-5.0.1"
-      sources."which-2.0.2"
-      sources."workerpool-6.5.1"
-      sources."wrap-ansi-8.1.0"
-      (
-        sources."wrap-ansi-cjs-7.0.0"
-        // {
-          dependencies = [
-            sources."ansi-styles-4.3.0"
-            sources."emoji-regex-8.0.0"
-            sources."string-width-4.2.3"
-            sources."strip-ansi-6.0.1"
-          ];
-        }
-      )
-      sources."y18n-5.0.8"
-      (
-        sources."yargs-17.7.2"
-        // {
-          dependencies = [
-            sources."emoji-regex-8.0.0"
-            sources."string-width-4.2.3"
-            sources."strip-ansi-6.0.1"
-          ];
-        }
-      )
-      sources."yargs-parser-21.1.1"
-      sources."yargs-unparser-2.0.0"
-      sources."yocto-queue-0.1.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "simple, flexible, fun test framework";
-      homepage = "https://mochajs.org/";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   multi-file-swagger = nodeEnv.buildNodePackage {
     name = "multi-file-swagger";
     packageName = "multi-file-swagger";

From e9d6401c5b86e054a60693f9ff5c9f8b2ec11854 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 6 Nov 2025 09:54:37 -0800
Subject: [PATCH 5936/6226] libdeltachat: 2.24.0 -> 2.25.0

Diff: https://github.com/chatmail/core/compare/v2.24.0...v2.25.0

Changelog: https://github.com/chatmail/core/blob/v2.25.0/CHANGELOG.md
---
 pkgs/by-name/li/libdeltachat/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix
index 1a117efebfc6..faa0400b20d8 100644
--- a/pkgs/by-name/li/libdeltachat/package.nix
+++ b/pkgs/by-name/li/libdeltachat/package.nix
@@ -20,13 +20,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libdeltachat";
-  version = "2.24.0";
+  version = "2.25.0";
 
   src = fetchFromGitHub {
     owner = "chatmail";
     repo = "core";
     tag = "v${version}";
-    hash = "sha256-OCC1qHeDSJJcbTmsyVKiwzXiIQAmofu/EhF56cRJ3kE=";
+    hash = "sha256-pW1+9aljtnYJmlJOj+m0aQekYO5IsL0fduR7kIAPdN8=";
   };
 
   patches = [
@@ -36,7 +36,7 @@ stdenv.mkDerivation rec {
   cargoDeps = rustPlatform.fetchCargoVendor {
     pname = "chatmail-core";
     inherit version src;
-    hash = "sha256-/PRIVdW2pnioqaYoIX/87cBbPezRaSbX5RWN6yuwpe8=";
+    hash = "sha256-iIC9wE7P2SKeCMtc/hFTRaOGXD2F7kh1TptOoes/Qi0=";
   };
 
   nativeBuildInputs = [

From 136e4c0286e4d52157e34048c9cbf8813d057403 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 6 Nov 2025 09:51:46 -0800
Subject: [PATCH 5937/6226] python3Packages.pyfireservicerota: 0.0.46 -> 0.0.47

Diff: https://github.com/cyberjunky/python-fireservicerota/compare/0.0.46...0.0.47

Changelog: https://github.com/cyberjunky/python-fireservicerota/releases/tag/0.0.47
---
 .../development/python-modules/pyfireservicerota/default.nix | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/pyfireservicerota/default.nix b/pkgs/development/python-modules/pyfireservicerota/default.nix
index 2fb94c1b28df..f9f19b7680ee 100644
--- a/pkgs/development/python-modules/pyfireservicerota/default.nix
+++ b/pkgs/development/python-modules/pyfireservicerota/default.nix
@@ -1,7 +1,6 @@
 {
   lib,
   buildPythonPackage,
-  pythonOlder,
   fetchFromGitHub,
   pdm-backend,
   pytz,
@@ -12,11 +11,9 @@
 
 buildPythonPackage rec {
   pname = "pyfireservicerota";
-  version = "0.0.46";
+  version = "0.0.47";
   pyproject = true;
 
-  disabled = pythonOlder "3.10";
-
   src = fetchFromGitHub {
     owner = "cyberjunky";
     repo = "python-fireservicerota";

From 5be113d1360a9a82d1cf16e8551835cf26d98958 Mon Sep 17 00:00:00 2001
From: Arsenii Zorin <me@wrb.bz>
Date: Thu, 6 Nov 2025 21:22:35 +0300
Subject: [PATCH 5938/6226] pulumi-bin: allows to use gh account for update
 instead of GITHUB_TOKEN

---
 pkgs/tools/admin/pulumi-bin/update.sh | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/pulumi-bin/update.sh b/pkgs/tools/admin/pulumi-bin/update.sh
index fb583e5ad18e..16385373a272 100755
--- a/pkgs/tools/admin/pulumi-bin/update.sh
+++ b/pkgs/tools/admin/pulumi-bin/update.sh
@@ -3,9 +3,12 @@
 # shellcheck shell=bash
 # Bash 3 compatible for Darwin
 
-if [ -z "${GITHUB_TOKEN}" ] || [ $# -ne 1 ]; then
-  echo >&2 "usage: GITHUB_TOKEN=… ./update.sh pulumi-version"
-  exit 1
+if ! gh auth status --hostname github.com >/dev/null 2>&1; then
+  if [ -z "${GITHUB_TOKEN}" ] || [ $# -ne 1 ]; then
+    echo >&2 "Login to github.com with gh or provide GITHUB_TOKEN env"
+    echo >&2 "usage: GITHUB_TOKEN=… ./update.sh pulumi-version"
+    exit 1
+  fi
 fi
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )

From 9eeca9569b5c1ccd87124767101dd9a25912ade8 Mon Sep 17 00:00:00 2001
From: Arsenii Zorin <me@wrb.bz>
Date: Thu, 6 Nov 2025 21:22:45 +0300
Subject: [PATCH 5939/6226] pulumi-bin: 3.205.0 -> 3.206.0

---
 pkgs/tools/admin/pulumi-bin/data.nix | 274 +++++++++++++--------------
 1 file changed, 137 insertions(+), 137 deletions(-)

diff --git a/pkgs/tools/admin/pulumi-bin/data.nix b/pkgs/tools/admin/pulumi-bin/data.nix
index 4963885fb804..3971df2f37c6 100644
--- a/pkgs/tools/admin/pulumi-bin/data.nix
+++ b/pkgs/tools/admin/pulumi-bin/data.nix
@@ -1,40 +1,40 @@
 # DO NOT EDIT! This file is generated automatically by update.sh
 { }:
 {
-  version = "3.205.0";
+  version = "3.206.0";
   pulumiPkgs = {
     x86_64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.205.0-linux-x64.tar.gz";
-        sha256 = "14pqc1qvkb8jp2wisld02qm6zf68i3i3iyymiwgg2ngr1ps40191";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.206.0-linux-x64.tar.gz";
+        sha256 = "1q6yrcq2cy81daknhqhx7kagg4wcrj057jgdnzssmhpazl5bnl79";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.0-linux-amd64.tar.gz";
-        sha256 = "0ch4bwh7vmgswkspcg3bdvvz5n72swgnfpq9hnr06ac40r7mw264";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.1-linux-amd64.tar.gz";
+        sha256 = "1q7lny807ns4i6wzx9zybsnnkjr5k9hb6igzf3cmw6cg48qf1nqy";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.0.0-linux-amd64.tar.gz";
-        sha256 = "0r7hc0vvf95a87pk6v4sm7m1i9li9ymhijvwsxzjdbpmjcp65ywg";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.1.0-linux-amd64.tar.gz";
+        sha256 = "02c2i4kbbv24i6a3srsgzaxly0f6kkij2d58k61frsljffjmvkb9";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.87.0-linux-amd64.tar.gz";
-        sha256 = "08s73nag5wb4i473krk87718p91q87xjp62riscffzv0xn68x343";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.88.0-linux-amd64.tar.gz";
+        sha256 = "0z6rzkqk55870mqjnn6dx0l1lbxzs7jyp726ilb6vgcpzbgsl81y";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-linux-amd64.tar.gz";
         sha256 = "02pgy8m9f32ky69vs7kw7fn8b41l0y4w2gg7s15nw5c069vvnpy4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.30.0-linux-amd64.tar.gz";
-        sha256 = "1nl1rzgxci67wj0l1gg89r8zxp284w0pjcqaxjmr8bv4whny5r01";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.31.0-linux-amd64.tar.gz";
+        sha256 = "0ck5gh2xjqm7dkjvvhcx58nrgd7ik9max9y1vv0kr6m7cr646p58";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.10.0-linux-amd64.tar.gz";
-        sha256 = "11sgjzwspiyjimaqaad4rv8zfri1gk3cpi18cbxqvl02qc45nl2c";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.11.0-linux-amd64.tar.gz";
+        sha256 = "0zc5rmi24k3h0xii26pxh76n9g3jljrnhav5hxhbxakw1819ww5m";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-linux-amd64.tar.gz";
-        sha256 = "1kvcw8163ghfnrdgc2rzvhfc9npfql7c2d6y6p32j6arwf7h2k4m";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.7.0-linux-amd64.tar.gz";
+        sha256 = "162a1c80f3a20naljsz7v57npv96gzx84p7xspvpl2cydgn14ac8";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.2-linux-amd64.tar.gz";
@@ -45,8 +45,8 @@
         sha256 = "0agh234zr757kx6b41k1q7p9rpzb3jv30nkyzs5xqhjnv44lky97";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.1-linux-amd64.tar.gz";
-        sha256 = "03r7s8g17gpp5zhckjmii67hlkpp49nwlx7jcr6bipd7g21isx1b";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.11.0-linux-amd64.tar.gz";
+        sha256 = "0wjn3qrpzr2irfz50vy9nh5jpn14rc6ddv1bx6byj5q14ldapw8w";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.2-linux-amd64.tar.gz";
@@ -69,16 +69,16 @@
         sha256 = "0hnardid0kbzy65dmn7vz8ddy5hq78nf2871zz6srf2hfyiv7qa4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.0.0-linux-amd64.tar.gz";
-        sha256 = "0sm8gqay51g12l20n08pih9vhpm2b95aj71zj6nmqiq5gym89v6z";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.1.0-linux-amd64.tar.gz";
+        sha256 = "1db5ji7dg3q2n5pmf0vaxj68p019q0j4whks827k6ph0q075r4xk";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.3.0-linux-amd64.tar.gz";
-        sha256 = "04m8b9d1dsfm3kw3n214g46i946fgn56j0k10dzfa2l023y491gc";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.4.0-linux-amd64.tar.gz";
+        sha256 = "1zw9qrx4byrxh12hpkyr2hjlg9q410h2s2c7yxdykxn0q29p3l1a";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.0-linux-amd64.tar.gz";
-        sha256 = "0f07prmwm0rgd5r2amd3fxm9cpnfrgj2282d6iczl7pnnl5jn7wp";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.1-linux-amd64.tar.gz";
+        sha256 = "19kw4m7nmwzs7722mb59hjis2mvrmzp8w64nf44l96n1vml4hcm2";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.4.0-linux-amd64.tar.gz";
@@ -89,20 +89,20 @@
         sha256 = "1zra1ck64gs4nwqf62ksfmpbx24lxw6vsgi47j4v8q051m89fgq3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.25.0-linux-amd64.tar.gz";
-        sha256 = "02dwixm2islad74jm7d3b7n1a9lsrm028np4j47s0959hmkqq7c1";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.26.0-linux-amd64.tar.gz";
+        sha256 = "0gwaaszwbpvfrk67xxd7jck3h3nmh7y89h4vgfpc4d94jb68s1cd";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-linux-amd64.tar.gz";
-        sha256 = "08i1k8m59dp56lafx8b0ggmgxl7dfqv8f4nljy4dh95h3bs7fdl2";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.24.0-linux-amd64.tar.gz";
+        sha256 = "12b143kpb54nc543gdazpbl4bnslamsvz60iby03g0fsxjwhswpr";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.4.0-linux-amd64.tar.gz";
         sha256 = "11zb5z8yzb87irf7sqc8b664wibicwk6vnmbshsrf41nv4lrys1r";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.12-linux-amd64.tar.gz";
-        sha256 = "1ysfm0iq2g2x8ml4dlisyf5g5lfdwjzf8spzc2670kk11vxsb0sy";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.6.1-linux-amd64.tar.gz";
+        sha256 = "123bfr7ydz560dzj49kjmrilc4n0r9ndq2lskx839m4vly8qwqzs";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.12-linux-amd64.tar.gz";
@@ -121,12 +121,12 @@
         sha256 = "12xw7fc5xsdbjlwbxwp0jdyv89l2af0hh6b2890fh1g83jp80rxs";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.8.0-linux-amd64.tar.gz";
-        sha256 = "0gphzxkpr7fk8jw5mqldqp1vk2l0xlrcjy7lycwc71921nid3knn";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.9.0-linux-amd64.tar.gz";
+        sha256 = "1shl25vl3q8myzjjxnvcsq7jyd1l7w6gqy7fj83gahxbc3nlhab3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.125.0-linux-amd64.tar.gz";
-        sha256 = "06znwpzjl5gxbsy55qvjz4g75ji90rljp5afmm5wsglcr2qi4ai6";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.126.0-linux-amd64.tar.gz";
+        sha256 = "05vxzsg0869rg0ap36pasxxwbslndns6jss9d0cydf8v0kna30hx";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-amd64.tar.gz";
@@ -141,8 +141,8 @@
         sha256 = "1vh28r2gk85a82c7jsa95n21my19hzavkyc9pjdpw517r63gvyjw";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.1-linux-amd64.tar.gz";
-        sha256 = "168a1hqpildnal3xnivpimlmfr9dgkcrc1fp03www96qvnwa5b0c";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.4.0-linux-amd64.tar.gz";
+        sha256 = "1wrsz1s727jhxwlympxqd0fdm93scl132lv8d5j0wd4z81lq67dx";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-linux-amd64.tar.gz";
@@ -163,36 +163,36 @@
     ];
     x86_64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.205.0-darwin-x64.tar.gz";
-        sha256 = "1vscn2idp2qjrmz9gzykb4jqcyyipkndyjk8r424qp95v6w6vrkb";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.206.0-darwin-x64.tar.gz";
+        sha256 = "057qfllfbwlga1g5w517rpl7nw6ngcsqn6azgy4r51vrfc01a9j8";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.0-darwin-amd64.tar.gz";
-        sha256 = "095n5p8i3cgjma90930dhfj9bxqsydci1qyjh9fnsd6lk3sdqx02";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.1-darwin-amd64.tar.gz";
+        sha256 = "155q33fcnafhqygr0big2rk52rlc9a4zx1whlrlfpw1g1l8jsbdg";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.0.0-darwin-amd64.tar.gz";
-        sha256 = "0mw37ncmm78j9gx7nw3400jrmzirqkwqhp957p36q193gnsd4747";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.1.0-darwin-amd64.tar.gz";
+        sha256 = "1xhsxzcjy689bg0zsbcv120j8a0bfn99vnfwid1y14yp5jc3f2gp";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.87.0-darwin-amd64.tar.gz";
-        sha256 = "0wd7gsghsbchb2gj6yv7lis8ni640dhrklgjipgbw61zhv6ib0ci";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.88.0-darwin-amd64.tar.gz";
+        sha256 = "0rcxnrwfyr38g9z611m4bpmdhbak1c82afarkax9yhyw20lbk6ma";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-darwin-amd64.tar.gz";
         sha256 = "09c2kdhad10c6g1j955dxkvvfapk6qqc8wdd69qcl85lkpgzn3cz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.30.0-darwin-amd64.tar.gz";
-        sha256 = "1nxfxi3gj92lqyqiagh31j5gd6s4ah24k96pgja50xvpsbsz3kbj";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.31.0-darwin-amd64.tar.gz";
+        sha256 = "0dwplcrwadwxslwl944nfaz52d6d5l9gw2vh6wnqh27m72d84bkx";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.10.0-darwin-amd64.tar.gz";
-        sha256 = "120cdkrw9rqj6p8pqh3g13khciqnzfr6w7lcg3q5k8fvbj8inyn1";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.11.0-darwin-amd64.tar.gz";
+        sha256 = "1q1xdm0qbcbksr8v6azs8kfa7hv3qni8391i23lmx0653vfwcqya";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-darwin-amd64.tar.gz";
-        sha256 = "1cdpx3540y3kp76ml1qi0awfzvm3172bzc76khdbsdcz9b8f3kb7";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.7.0-darwin-amd64.tar.gz";
+        sha256 = "0z6d8a71k5r6vka7f446ik1xj6nxg1ibx76i0wslzh5lwq2ybsmh";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.2-darwin-amd64.tar.gz";
@@ -203,8 +203,8 @@
         sha256 = "0b7ryynm4np70d4si2i9jwjjqd1nd3b6m23fgv9c2cwwnrg2xmiz";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.1-darwin-amd64.tar.gz";
-        sha256 = "019w76n8zksz62chnbdfhbjar2z1g3359pamahdcm415kdghhar2";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.11.0-darwin-amd64.tar.gz";
+        sha256 = "1m9mfb64b49q6a1z8dbyk8idd3zacnlrly8bsh4lpm0abjp2ms76";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.2-darwin-amd64.tar.gz";
@@ -227,16 +227,16 @@
         sha256 = "1m5lh59h7nck1flzxs9m4n0ag0klk3jmnpf7hc509vffxs89xnjq";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.0.0-darwin-amd64.tar.gz";
-        sha256 = "12yzgpz05pf1y401p94p063c2yj8i5mlmy5bxdd69n4537z17z02";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.1.0-darwin-amd64.tar.gz";
+        sha256 = "0l11xyy8ajxr8l7iyp2il3nahgidqydkg6qw20yqligppx75v59g";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.3.0-darwin-amd64.tar.gz";
-        sha256 = "1hphg8mhpgzmm9hz12fdpzjgrx35b4bhxinm74slw8fki3vpgqdl";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.4.0-darwin-amd64.tar.gz";
+        sha256 = "16af5bj7i8pkz8idjgw0q876k22834icn3p6565jv1gbvxipsk3q";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.0-darwin-amd64.tar.gz";
-        sha256 = "1d2chprn9xjdm9qrvdzma3r5f0v457ksfxbc98i753ncqr7cnzf3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.1-darwin-amd64.tar.gz";
+        sha256 = "0hykd3azxymnriv7vlz57ckhycn5j1xnv4g56813bqi027iys158";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.4.0-darwin-amd64.tar.gz";
@@ -247,20 +247,20 @@
         sha256 = "0ddd0pgpyywq291r9q8w6bn41r2px595017iihx4n2cnb1c4v6d5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.25.0-darwin-amd64.tar.gz";
-        sha256 = "1q3nhm48rdxh2br72l8lgdks5m869v2ia67gwchkzsjjrjiysbqh";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.26.0-darwin-amd64.tar.gz";
+        sha256 = "0fxii20q2hwgwpbwchws91hq75lhhq4rgymwy0ik0a0xirn8xqha";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-darwin-amd64.tar.gz";
-        sha256 = "1pdvqyfv4cn25h0hg830r2mv5d7g16032badf6f16azscdri81lv";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.24.0-darwin-amd64.tar.gz";
+        sha256 = "11ra4b2jd2gkd5fhfhaxkyxgg8hwlmzhh036fr8l69l93nawi8c7";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.4.0-darwin-amd64.tar.gz";
         sha256 = "1v309axkjh9gv8cy3y7wpdq7b88129b5p5q030qdrk2hzalxvvrh";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.12-darwin-amd64.tar.gz";
-        sha256 = "1yabhr80yvnwzvn0gd95kpicng99j8m06y6cdz9lwq63kycsnghc";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.6.1-darwin-amd64.tar.gz";
+        sha256 = "1lyz86zwhnhasxhccx229fppwgz1wrjmk7b24cx3mg92craazypc";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.12-darwin-amd64.tar.gz";
@@ -279,12 +279,12 @@
         sha256 = "0zbmrhh5f19r9rg3pcmry325l2lfpam9j6krqdbcwsals971qvw6";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.8.0-darwin-amd64.tar.gz";
-        sha256 = "1vafsy1ah61y3qwiv3cc8y8lx6c9pimr0hnknah22k6cxshm0bg9";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.9.0-darwin-amd64.tar.gz";
+        sha256 = "1m6gfvnfa0r5k777ccskgkdi6kic69jk74liklrh6mnn9isbp1by";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.125.0-darwin-amd64.tar.gz";
-        sha256 = "0h62401y99hhqs32y8blx1p0cd87ssd2zi6fzakv72ry4v2xhcnj";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.126.0-darwin-amd64.tar.gz";
+        sha256 = "0b62i9bmqdqjw0qk3m97x9274vn3ib8xwc6lxsshywkakf1zw0cg";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-amd64.tar.gz";
@@ -299,8 +299,8 @@
         sha256 = "1ji9zz1r7rj57w7spf6mwa9fxl1jgiy0qmxvlia21hpj60b536f5";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.1-darwin-amd64.tar.gz";
-        sha256 = "15hyg61id2r7b7l6279grabvfphhj22ffi4y0q20zzypx98xr599";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.4.0-darwin-amd64.tar.gz";
+        sha256 = "1zzqfx6qyah32lvj82jm31cbygpf1ss58jmig8ckn5scpjjifd7g";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-darwin-amd64.tar.gz";
@@ -321,36 +321,36 @@
     ];
     aarch64-linux = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.205.0-linux-arm64.tar.gz";
-        sha256 = "0i80py5r711k58yh14c5d8vhlsl5jd5f41gxfqq3gllhwy3q54db";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.206.0-linux-arm64.tar.gz";
+        sha256 = "11lwmmdwv5jag1n283hl4psvdg7766qx15pynpjfvhvdmwaviagj";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.0-linux-arm64.tar.gz";
-        sha256 = "071cy9b0n7h8x3m0lnw8yywpjj2q9pzp5svh0cfqz7c43ssamkqk";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.1-linux-arm64.tar.gz";
+        sha256 = "1b6sbhbbcymrs6g62pr7pbd6zx3zvwypzbl9xi5252f1y6ap2hqx";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.0.0-linux-arm64.tar.gz";
-        sha256 = "16jd9hrv60jy6qzl57h9fmk955ll05ng7cfmn4af1vjsyay6knjl";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.1.0-linux-arm64.tar.gz";
+        sha256 = "11cvffvjgwc1b1v30ivkmw7lva6qzhkm5r4m0y4lc9sh0mjfvgsb";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.87.0-linux-arm64.tar.gz";
-        sha256 = "0jy2za4z4f63i51a06nwy1pv4nma9rl46pl39gkkgq5kslhgah5h";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.88.0-linux-arm64.tar.gz";
+        sha256 = "1pj3hj3yqmpjsz4lsbvswymf4sv6ylrpx6c2lcgyvdvsg0l5nfxp";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-linux-arm64.tar.gz";
         sha256 = "03as3y5bflq1m8qfcx7h916vlxa7qn5xla2d1gi2q87gz4giki24";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.30.0-linux-arm64.tar.gz";
-        sha256 = "0mx7yx96xnalrpsqc4dp14gck7p8hciasgkkk89v3dsjmjlk1wwi";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.31.0-linux-arm64.tar.gz";
+        sha256 = "1qikx8r384r49c4b3wqhhzdglkdsji2z2zrakbk73ir006q1s6a4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.10.0-linux-arm64.tar.gz";
-        sha256 = "04sq78vzcyc8dm3cx0f5gizkdwy03j2fsw3vcjxpk75pkkhxh2gf";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.11.0-linux-arm64.tar.gz";
+        sha256 = "19gv23rqd94p9jhfcq7j44n2prlxm9k9y0s0gs2bfq89s2s7a9w3";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-linux-arm64.tar.gz";
-        sha256 = "17lndnmwmxshxz7n2zhgc07gr8cqfd06b1mgblyzbx8n2lc0x0sv";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.7.0-linux-arm64.tar.gz";
+        sha256 = "1zapqg7ggkz9q2sh1jkp9p5670hpa5nhvmjvq50pwx0i2xnfpvsl";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.2-linux-arm64.tar.gz";
@@ -361,8 +361,8 @@
         sha256 = "0hg628ik9vvadxs249v4z53y36nzrw3bgjdh1fgjahx875z23m06";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.1-linux-arm64.tar.gz";
-        sha256 = "1x5iqm07zjf637w14pzhhifgi7vs1imvqjqr2xmi1z5cqfjknm5j";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.11.0-linux-arm64.tar.gz";
+        sha256 = "1cdjz021bc1r5bqsnm114acmyc7ikmyxp08pmnndrmm9mmf5xr96";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.2-linux-arm64.tar.gz";
@@ -385,16 +385,16 @@
         sha256 = "111pia2f5xwkwaqs6p90ri29l5b3ivmahsa1bji4fwyyjyp22h4r";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.0.0-linux-arm64.tar.gz";
-        sha256 = "0f4bxwj7liyijbsqh0r43s823n02gvpkk0rdxwhg1li4d1mpsqxp";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.1.0-linux-arm64.tar.gz";
+        sha256 = "0pqkh6i3pigw5ab83bxnq5wccn8jmavj8g445ywd65rf3cgqnbns";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.3.0-linux-arm64.tar.gz";
-        sha256 = "111rblka8wz87pqd9v27gmv4lz5048kwdj9i252r7bnd1gw92i4x";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.4.0-linux-arm64.tar.gz";
+        sha256 = "1nlxqvicd266xvb2rwqspcmkm9z6fhjvm7vswy3c7a7sjhscvz3j";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.0-linux-arm64.tar.gz";
-        sha256 = "0nnap94wign1vydi56k29s0cp1xgdngm1yj3hwz5s02fkhkcvw6f";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.1-linux-arm64.tar.gz";
+        sha256 = "1xq1p9mwazy00c45g92if1hiy8iclsrh7x25fxs29zayp0lcf3s5";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.4.0-linux-arm64.tar.gz";
@@ -405,20 +405,20 @@
         sha256 = "0d8m2krbzxjhfm82dgf8p4vm3kk9gk98l798q4ayjrddqqb4mxq4";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.25.0-linux-arm64.tar.gz";
-        sha256 = "0lxxdqx9g9zd0m3zzpgfcwv3h51sigzldh5fzrn2m6pnqniamqbw";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.26.0-linux-arm64.tar.gz";
+        sha256 = "0arbz7simas9a4bg0mm00gw89z6dzjykbf198zf8k0vbx47h6m2h";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-linux-arm64.tar.gz";
-        sha256 = "0kqxz7y1n9zzpw3rv15kb55qvp14rvxh0vymddlrja7iqcvb8nd8";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.24.0-linux-arm64.tar.gz";
+        sha256 = "12xf6nbvv4r5q93495cddfbyj0rg5slpbcqaykk5jydr45arms2y";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.4.0-linux-arm64.tar.gz";
         sha256 = "0l33hzkgcm9lr39k7dndga36k3f0agbsj7q4wx0rwhfabz1fgcd1";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.12-linux-arm64.tar.gz";
-        sha256 = "0b2yrfxxrkwxsp76ihv06vibwg86lpyz2c92mi49bldrp767ibys";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.6.1-linux-arm64.tar.gz";
+        sha256 = "09jdr8pr7pb8ixjvlvggnxq7ccp94nx6mfq0m6rlkmsh3dk46v68";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.12-linux-arm64.tar.gz";
@@ -437,12 +437,12 @@
         sha256 = "0a5gl6fpl6w8bcy1bl1z7dynrpm42kg0hq45hzhs7h667bgaqkzs";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.8.0-linux-arm64.tar.gz";
-        sha256 = "02b1alm53isvmzs7crgjqbpyskr3l2nnzwkxvfkhpsa3rbpnf42f";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.9.0-linux-arm64.tar.gz";
+        sha256 = "10ix183lkl96n3iclvbnj09snz7h423fi1paja286fqgg7yv8p5w";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.125.0-linux-arm64.tar.gz";
-        sha256 = "07n3q2bm44acikvjnz7mgpg0mxycs1qwc1bxmr2gibnz9n9x1f5k";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.126.0-linux-arm64.tar.gz";
+        sha256 = "1f983sfqqab9zfn30ypzmzixh65fjgpqd4v8id3zrh74k5mjil50";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-linux-arm64.tar.gz";
@@ -457,8 +457,8 @@
         sha256 = "1zbm7ql3rqypqmckbmlzbiy4akmqjkbzfkl7788q6sm7xh6bm8q1";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.1-linux-arm64.tar.gz";
-        sha256 = "185rjhfcr8hh7vxyb91dfsmq7vc78z17qrvn0gn7bxf2sd0zfnap";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.4.0-linux-arm64.tar.gz";
+        sha256 = "07aai8ssmm3vvydmr6nwf32s64mz6xjqlb6cp3l0j13g34wpva4m";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-linux-arm64.tar.gz";
@@ -479,36 +479,36 @@
     ];
     aarch64-darwin = [
       {
-        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.205.0-darwin-arm64.tar.gz";
-        sha256 = "07bxw10xcm5s8c8zssqh461v9rj4c5l27nzxzg84q3vyzil02460";
+        url = "https://get.pulumi.com/releases/sdk/pulumi-v3.206.0-darwin-arm64.tar.gz";
+        sha256 = "0yizh6hy9xq2gmshbln21fq7az7k5j3fisyj12a2q2frh8fv03dx";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.0-darwin-arm64.tar.gz";
-        sha256 = "18j48pfmrr6m1qna8ac95l1i6pg4gf7g887yc68h0gxdx2q2xbr2";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v6.44.1-darwin-arm64.tar.gz";
+        sha256 = "0fcl1445yaywqbsl16ipydfg2z0j15bsdsppdr3vfzgiyimrn321";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.0.0-darwin-arm64.tar.gz";
-        sha256 = "1fig9bn080dbnibm0dp76ygyg1g2sv2295kyyknx3wlap0nrj2w3";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-akamai-v10.1.0-darwin-arm64.tar.gz";
+        sha256 = "09baqy0kl8p4ij3c7yhwq4dlgbh4fkp4dpq59xfmi90l4r4j6623";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.87.0-darwin-arm64.tar.gz";
-        sha256 = "0p87dqzhpra4s1hxnzc63xk1pvw2n6pa8nxisgbrlrf4bxy229wq";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-alicloud-v3.88.0-darwin-arm64.tar.gz";
+        sha256 = "0v6w6n85iaynsjv7hz7f1syvy8z473cfj62vhwidq4bivbiad0i1";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-artifactory-v8.9.1-darwin-arm64.tar.gz";
         sha256 = "0sqmpk1n98vs079qrs1nf9ifjmjz4s9s0f406c8r0cxpn3l08zvp";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.30.0-darwin-arm64.tar.gz";
-        sha256 = "1dz54wc5aw9rfhwx2hrmvdfl9xd3fd26jx00f5asb4gjlirasdhl";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v3.31.0-darwin-arm64.tar.gz";
+        sha256 = "1hl90018i53qx3mhy1acnq61nmbai2shv80pv5aigg1y7mg9p54b";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.10.0-darwin-arm64.tar.gz";
-        sha256 = "0jqpviykdsvb6zfk021wl27i2aa1v7mv08kalxn73r8zbj2hh1ls";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v7.11.0-darwin-arm64.tar.gz";
+        sha256 = "12w7kjk2a4vhn3kcn6mwdblflpagd3br06hk196k0pkj46l04rlk";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.6.0-darwin-arm64.tar.gz";
-        sha256 = "0b4srhyq2adbpzh74s0kcmfflayrk6c7jbq63s2l3zfq2zln4sbm";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v6.7.0-darwin-arm64.tar.gz";
+        sha256 = "061xs9y8wdaa61zzhaprwnmn78bcgycnhsfd19dihv94qnbzpn79";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v3.10.2-darwin-arm64.tar.gz";
@@ -519,8 +519,8 @@
         sha256 = "0jidnrvvk2d6jdfx795yrnkpwmw1843nfylchhynlidf279z21vm";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.10.1-darwin-arm64.tar.gz";
-        sha256 = "1kiq9771rqz935bfnrl06c561xw7g583a9hm1dn4yclssn02pshf";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v6.11.0-darwin-arm64.tar.gz";
+        sha256 = "1qmgsji9aa7plbv06k1l0a10fvazcjybrcr5l276wz650c412g6d";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.13.2-darwin-arm64.tar.gz";
@@ -543,16 +543,16 @@
         sha256 = "12bzicm43l7yvh02v5fx3z8v46l9i7a9f677735xi5rjbmd2an4c";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.0.0-darwin-arm64.tar.gz";
-        sha256 = "0a1fy15bf66gvy7jvimbnycxb51z85svrpa9flly1ch3g7276w60";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-fastly-v11.1.0-darwin-arm64.tar.gz";
+        sha256 = "0rfdmixsr8q93r25k736mr3gngf4xz5k88394frpywc0sbkmckzv";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.3.0-darwin-arm64.tar.gz";
-        sha256 = "0nd7hv0yf40xc566wg76k8h91ig88lvd6y0f0ffsjfyb40kgm7sc";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v9.4.0-darwin-arm64.tar.gz";
+        sha256 = "1y1mb41flv2f64wy5vmfcf9hxqskjcnmdwgh10mn6nb3nsq1l4b1";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.0-darwin-arm64.tar.gz";
-        sha256 = "17naiz9k71dc0ax1x7843slna1cycjgd9yvy5xhg5613rrl7h4nc";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v6.8.1-darwin-arm64.tar.gz";
+        sha256 = "092zvhh96cpgkfq14lp4pahd8nz6x5bd0dcvs5cx7xpdl745bzs9";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v9.4.0-darwin-arm64.tar.gz";
@@ -563,20 +563,20 @@
         sha256 = "0caz4kgnnrmdr7n571xc7yqscac9jnjwwpjzbnvx4ib6a91wvsdn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.25.0-darwin-arm64.tar.gz";
-        sha256 = "17dr3i20y5f120mq4b8j85jwb5xwid3bbpw2vdfc1qgs1ib17yav";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-hcloud-v1.26.0-darwin-arm64.tar.gz";
+        sha256 = "1r1wbw7fi3ivd225p6pyd8gsbycx0qjlicfaabjlg7lqlakv8cfp";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.23.0-darwin-arm64.tar.gz";
-        sha256 = "17fl8apnlz4ifjzp1sq0fi4y1knxh1x2fvhlrg8j568f3svp41f8";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-kubernetes-v4.24.0-darwin-arm64.tar.gz";
+        sha256 = "0z66mps5rm42ga6c9n59zahkj3pg78583p4cmf73fap3y8gpfmd2";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-linode-v5.4.0-darwin-arm64.tar.gz";
         sha256 = "0fjlp0afa5z6x85ldw8bwl4zgxz2rmwinihw1vbqa33pyjrk08xn";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.5.12-darwin-arm64.tar.gz";
-        sha256 = "02fpl2jrawswcyhiqfgjrhhxc153pdgij3f5kpjqdn1h6dyhv4iz";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mailgun-v3.6.1-darwin-arm64.tar.gz";
+        sha256 = "03rg7hgxxkkx10kba2kgr25kxs48wq2fcrsv7j9v5w6sddaqf7w3";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-mysql-v3.2.12-darwin-arm64.tar.gz";
@@ -595,12 +595,12 @@
         sha256 = "0vygxiqrx70i03d3p1mmc26zkai4cxzwjzjf6bszz6cmqvnc5pnr";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.8.0-darwin-arm64.tar.gz";
-        sha256 = "0hzrqqk78hgxrn3fxmnmy9y8l5011ifs6smbs2wrm9na9lag3frb";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-snowflake-v2.9.0-darwin-arm64.tar.gz";
+        sha256 = "16x1apq9chj090a9zwzk3247500fsbzz5gz3v2rz8cmiy4n0is46";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.125.0-darwin-arm64.tar.gz";
-        sha256 = "0mznjz1m1l6qcgb3x9h4q7r5msffla1s6x0j9k5jr5izm50z4wxb";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-spotinst-v3.126.0-darwin-arm64.tar.gz";
+        sha256 = "09xwsyjlrrci8gn0zg97jlx0fa9mnzbz0v42myzzdrq6vvidss9y";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-sumologic-v1.0.11-darwin-arm64.tar.gz";
@@ -615,8 +615,8 @@
         sha256 = "1qih4kprfaa82p7mg4zg8amy8vp4c76vqkmwf3df2x8bn69jdrc0";
       }
       {
-        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.3.1-darwin-arm64.tar.gz";
-        sha256 = "0r80rz0fs8w4iqnq1rsqxqvbs1plfr7hvlsr2dik4k8ngiwvbfps";
+        url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v7.4.0-darwin-arm64.tar.gz";
+        sha256 = "0mwc3z11zjx4sy9a1iclxj2ymabcbg2abzpk93khrqqsa7943h1r";
       }
       {
         url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.12.1-darwin-arm64.tar.gz";

From a97ad4bf5babed0da2d1625abd60177630c645b2 Mon Sep 17 00:00:00 2001
From: RaHoni <honisuess@gmail.com>
Date: Wed, 5 Nov 2025 15:11:19 +0100
Subject: [PATCH 5940/6226] jameica: jameica now has version 2.12.0 tagged

As discussed in PR #457801 since the tag was added we switch to the tag.
---
 pkgs/by-name/ja/jameica/package.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/by-name/ja/jameica/package.nix b/pkgs/by-name/ja/jameica/package.nix
index 9c805d57fbb9..88300186770b 100644
--- a/pkgs/by-name/ja/jameica/package.nix
+++ b/pkgs/by-name/ja/jameica/package.nix
@@ -46,8 +46,7 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = "willuhn";
     repo = "jameica";
-    # Releases currently happen on branches named like the version number. Rev of the "2.12.0" branch.
-    rev = "b74b160643b18171d2d185b80b60e82a02a75898";
+    tag = version;
     hash = "sha256-7KpQas8ttL2DP+gFH87uLQyx4PMwVQ+FaqXpZBPWV5U=i";
   };
 

From 9620d2b9b12f490b4cb82a3226057d909af9d103 Mon Sep 17 00:00:00 2001
From: PhiliPdB <phlpdbrn@gmail.com>
Date: Thu, 6 Nov 2025 19:42:58 +0100
Subject: [PATCH 5941/6226] onedrive: 2.5.7 -> 2.5.9

---
 pkgs/by-name/on/onedrive/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/on/onedrive/package.nix b/pkgs/by-name/on/onedrive/package.nix
index 5b0199afa241..829c58e104e8 100644
--- a/pkgs/by-name/on/onedrive/package.nix
+++ b/pkgs/by-name/on/onedrive/package.nix
@@ -24,13 +24,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "onedrive";
-  version = "2.5.7";
+  version = "2.5.9";
 
   src = fetchFromGitHub {
     owner = "abraunegg";
     repo = "onedrive";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-IllPh4YJvoAAyXDmSNwWDHN/EUtUuUqS7TOnBpr3Yts=";
+    hash = "sha256-Vrr7KR4yMH+IZ56IUTp9eAhxEtiXx+ppleUd7jSLzxc=";
   };
 
   outputs = [

From d87cf12725769045615b3dccca15df1143fea43c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 18:52:52 +0000
Subject: [PATCH 5942/6226] unciv: 4.18.11 -> 4.18.12

---
 pkgs/by-name/un/unciv/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/un/unciv/package.nix b/pkgs/by-name/un/unciv/package.nix
index b8eaa299e3bb..dee5c524f0fc 100644
--- a/pkgs/by-name/un/unciv/package.nix
+++ b/pkgs/by-name/un/unciv/package.nix
@@ -12,7 +12,7 @@
   nix-update-script,
 }:
 let
-  version = "4.18.11";
+  version = "4.18.12";
 
   desktopItem = makeDesktopItem {
     name = "unciv";
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://github.com/yairm210/Unciv/releases/download/${version}/Unciv.jar";
-    hash = "sha256-k6jIvJvEfLgcYexpzjg7GFGGw9HhFGnhdShEX6zUxiQ=";
+    hash = "sha256-h0Y7a/wvmYOwr+AhVjY+P7uQQQbofpqkX5/Nd8tL3Cg=";
   };
 
   dontUnpack = true;

From 10cf625fb9fe4bba3f844e39ec0ba0011399c1db Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 18:56:36 +0000
Subject: [PATCH 5943/6226] cloudflared: 2025.10.0 -> 2025.10.1

---
 pkgs/by-name/cl/cloudflared/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/cl/cloudflared/package.nix b/pkgs/by-name/cl/cloudflared/package.nix
index b6e17a5f80a7..f666fc411b1d 100644
--- a/pkgs/by-name/cl/cloudflared/package.nix
+++ b/pkgs/by-name/cl/cloudflared/package.nix
@@ -9,13 +9,13 @@
 
 buildGoModule rec {
   pname = "cloudflared";
-  version = "2025.10.0";
+  version = "2025.10.1";
 
   src = fetchFromGitHub {
     owner = "cloudflare";
     repo = "cloudflared";
     tag = version;
-    hash = "sha256-20w702JEdW+4gENvP5heleE09tJPeG4QiW5F4qcdVp0=";
+    hash = "sha256-5GEvmal1ZaUp1wOEsjngDSXj9AuAm1PyUw92xq/YT58=";
   };
 
   vendorHash = null;

From 1344e91ac98626f3a36ad03af63259892e8c11dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 19:01:07 +0000
Subject: [PATCH 5944/6226] soft-serve: 0.10.0 -> 0.11.0

---
 pkgs/by-name/so/soft-serve/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/so/soft-serve/package.nix b/pkgs/by-name/so/soft-serve/package.nix
index a51249a1e827..da94b27f8806 100644
--- a/pkgs/by-name/so/soft-serve/package.nix
+++ b/pkgs/by-name/so/soft-serve/package.nix
@@ -10,13 +10,13 @@
 
 buildGoModule rec {
   pname = "soft-serve";
-  version = "0.10.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "charmbracelet";
     repo = "soft-serve";
     rev = "v${version}";
-    hash = "sha256-Lg7cESGMbVCNx0KQBIAP/UsfvO3IO+DO9bYiQbg9Fls=";
+    hash = "sha256-qwUPRIOUFCsTuwRxFXSbGd3vwIwb8mEPlCX0em8OBBU=";
   };
 
   vendorHash = "sha256-DBgVcbt2kejtEJSajJh6vS4feT3Lwm+KqUOks55iWIc=";

From 93854af520229f92274d7a915025183c58af1ffb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 19:06:42 +0000
Subject: [PATCH 5945/6226] scooter: 0.8.2 -> 0.8.3

---
 pkgs/by-name/sc/scooter/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sc/scooter/package.nix b/pkgs/by-name/sc/scooter/package.nix
index cdb4399de160..62ef79c329f4 100644
--- a/pkgs/by-name/sc/scooter/package.nix
+++ b/pkgs/by-name/sc/scooter/package.nix
@@ -6,16 +6,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "scooter";
-  version = "0.8.2";
+  version = "0.8.3";
 
   src = fetchFromGitHub {
     owner = "thomasschafer";
     repo = "scooter";
     rev = "v${version}";
-    hash = "sha256-Fgq1FJIvgnbBGkFrFCzjIPjyTyCxxknRGtzBGUuZfIY=";
+    hash = "sha256-DgxyurJmhpTHdmLyRaZkfiPYdMYdqeQOC+ZncfW5GdQ=";
   };
 
-  cargoHash = "sha256-kPJvwZhpE8k4Kv+Jai/Fp+b/YI8F7cR8acM1sc2fkf4=";
+  cargoHash = "sha256-vq2d6UX4TbPO6Uya3m8uKff7+w1+VfV4Bec4Uyx/8pQ=";
 
   # Ensure that only the `scooter` package is built (excluding `xtask`)
   cargoBuildFlags = [

From 4ba16e4dfe2518aa61906cc91f44e1c0aa48caa9 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 6 Nov 2025 14:14:21 -0500
Subject: [PATCH 5946/6226] nodePackages.fx: alias to pkgs.fx

Literally the same package.
---
 pkgs/development/node-packages/aliases.nix     |  1 +
 .../node-packages/node-packages.json           |  1 -
 .../node-packages/node-packages.nix            | 18 ------------------
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 830f5ba99fba..5825fe0b683d 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -113,6 +113,7 @@ mapAliases {
   inherit (pkgs) firebase-tools; # added 2023-08-18
   inherit (pkgs) fixjson; # added 2024-06-26
   flood = pkgs.flood; # Added 2023-07-25
+  inherit (pkgs) fx; # Added 2025-11-06
   ganache = throw "ganache was removed because it was deprecated upstream"; # added 2024-12-02
   inherit (pkgs) gatsby-cli; # Added 2025-11-05
   generator-code = throw "generator-code was removed because it provides no executable"; # added 2023-09-24
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 443b3e9768bd..ccdb654c4503 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -72,7 +72,6 @@
 , "fkill-cli"
 , "fleek-cli"
 , "forever"
-, "fx"
 , "grunt-cli"
 , "makam"
 , "gulp-cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 76cef919a441..a5953db51ca9 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -41866,24 +41866,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  fx = nodeEnv.buildNodePackage {
-    name = "fx";
-    packageName = "fx";
-    version = "35.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/fx/-/fx-35.0.0.tgz";
-      sha512 = "O07q+Lknrom5RUX/u53tjo2KTTLUnL0K703JbqMYb19ORijfJNvijzFqqYXEjdk25T9R14S6t6wHD8fCWXCM0g==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Command-line JSON viewer";
-      homepage = "https://fx.wtf";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   grunt-cli = nodeEnv.buildNodePackage {
     name = "grunt-cli";
     packageName = "grunt-cli";

From 27becf6fea400696967de6adc526ff66fe541d36 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 19:23:39 +0000
Subject: [PATCH 5947/6226] opentofu: 1.10.6 -> 1.10.7

---
 pkgs/by-name/op/opentofu/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opentofu/package.nix b/pkgs/by-name/op/opentofu/package.nix
index 93007668e11d..f2f33b9301ff 100644
--- a/pkgs/by-name/op/opentofu/package.nix
+++ b/pkgs/by-name/op/opentofu/package.nix
@@ -15,16 +15,16 @@
 let
   package = buildGoModule rec {
     pname = "opentofu";
-    version = "1.10.6";
+    version = "1.10.7";
 
     src = fetchFromGitHub {
       owner = "opentofu";
       repo = "opentofu";
       tag = "v${version}";
-      hash = "sha256-IEdnESrhDT2rDha7TNgUnGnPioNPnKrUuOXSGRnUOBI=";
+      hash = "sha256-aCNXOEYA+6pKBrGLf/u6RkLw5YbKJHbVPltZko3aGgs=";
     };
 
-    vendorHash = "sha256-ZnQDRiLdg12Dx9RdK1xBWUrAm3QQLGhwH1vxh4ieVv0=";
+    vendorHash = "sha256-rOSl5WE1/WcgCVpcAOXVl8cBSxjrlG7fxzpRO/5i5GA=";
     ldflags = [
       "-s"
       "-w"

From b9c22a91106e84e5cd3839107ce9dc519eb9f6b6 Mon Sep 17 00:00:00 2001
From: FKouhai <frandres00@gmail.com>
Date: Sun, 26 Oct 2025 22:20:48 +0100
Subject: [PATCH 5948/6226] opencloud-desktop: fix client startup

---
 pkgs/by-name/op/opencloud-desktop/package.nix | 22 ++++++++++++++++++-
 1 file changed, 21 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/op/opencloud-desktop/package.nix b/pkgs/by-name/op/opencloud-desktop/package.nix
index 208765ebc128..64bef0d25e2b 100644
--- a/pkgs/by-name/op/opencloud-desktop/package.nix
+++ b/pkgs/by-name/op/opencloud-desktop/package.nix
@@ -3,6 +3,7 @@
   cmake,
   kdePackages,
   fetchFromGitHub,
+  fetchFromGitLab,
   libre-graph-api-cpp-qt-client,
   kdsingleapplication,
   nix-update-script,
@@ -10,6 +11,25 @@
   versionCheckHook,
   stdenv,
 }:
+let
+  # See issue https://github.com/NixOS/nixpkgs/issues/455981
+  # It was spotted upstream that ecm 6.19.0 caused this issue
+  # Therefore we pin ecm 6.18.0 which makes opencloud function correctly
+  ecm618 = kdePackages.extra-cmake-modules.overrideAttrs (
+    finalAttrs: prevAttrs: {
+      version = "6.18.0";
+      src = fetchFromGitLab {
+        domain = "invent.kde.org";
+        owner = "frameworks";
+        repo = "extra-cmake-modules";
+        tag = "v${finalAttrs.version}";
+        hash = "sha256-hpqczRaV32yyXXRWxR30tOBEUNWDkeSzVrv0SHMrz1Y=";
+      };
+      patches = [ ];
+    }
+  );
+
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "opencloud-desktop";
   version = "2.0.0";
@@ -21,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
   };
 
   buildInputs = [
-    kdePackages.extra-cmake-modules
+    ecm618
     qt6.qtbase
     qt6.qtdeclarative
     qt6.qttools

From 834bfc40437f50342a4c3da37fb0fda4c9f66b2c Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Thu, 6 Nov 2025 20:24:39 +0100
Subject: [PATCH 5949/6226] go-away: add meta.mainProgram

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 pkgs/by-name/go/go-away/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/go/go-away/package.nix b/pkgs/by-name/go/go-away/package.nix
index b9ca2a2dcec6..a7235a4a7268 100644
--- a/pkgs/by-name/go/go-away/package.nix
+++ b/pkgs/by-name/go/go-away/package.nix
@@ -72,5 +72,6 @@ buildGoModule (finalAttrs: {
     homepage = "https://git.gammaspectra.live/git/go-away";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ hexa ];
+    mainProgram = "go-away";
   };
 })

From e9c3642c327f5047c9ec22e5c5880bd63294fc8d Mon Sep 17 00:00:00 2001
From: Christoph Heiss <christoph@c8h4.io>
Date: Thu, 6 Nov 2025 20:25:08 +0100
Subject: [PATCH 5950/6226] go-away: add passthru.updateScript

Signed-off-by: Christoph Heiss <christoph@c8h4.io>
---
 pkgs/by-name/go/go-away/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/go/go-away/package.nix b/pkgs/by-name/go/go-away/package.nix
index a7235a4a7268..612fe330b962 100644
--- a/pkgs/by-name/go/go-away/package.nix
+++ b/pkgs/by-name/go/go-away/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitea,
+  nix-update-script,
 
   # asset compression
   brotli,
@@ -57,6 +58,12 @@ buildGoModule (finalAttrs: {
     cp -rv examples/snippets $out/lib/go-away/
   '';
 
+  passthru.updateScript = nix-update-script {
+    # the main repository does not have the releases feed enabled, so use the
+    # codeberg mirror
+    url = "https://codeberg.org/gone/go-away";
+  };
+
   meta = {
     changelog = "https://git.gammaspectra.live/git/go-away/releases/tag/${finalAttrs.src.tag}";
     description = "Self-hosted abuse detection and rule enforcement against low-effort mass AI scraping and bots";

From f56221596a841f4a5a319b2ca5d0bb874cb32fab Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 6 Nov 2025 14:33:26 -0500
Subject: [PATCH 5951/6226] js-beautify: migrate from nodePackages

---
 pkgs/by-name/js/js-beautify/package.nix       |  46 ++++++
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 138 ------------------
 4 files changed, 47 insertions(+), 139 deletions(-)
 create mode 100644 pkgs/by-name/js/js-beautify/package.nix

diff --git a/pkgs/by-name/js/js-beautify/package.nix b/pkgs/by-name/js/js-beautify/package.nix
new file mode 100644
index 000000000000..fd8dca953546
--- /dev/null
+++ b/pkgs/by-name/js/js-beautify/package.nix
@@ -0,0 +1,46 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nodejs,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "js-beautify";
+  version = "1.15.4";
+
+  src = fetchFromGitHub {
+    owner = "beautifier";
+    repo = "js-beautify";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-7heFAt8ArwBox0R2UFAYyzqyARPLnVtlWmPr0txuxOM=";
+  };
+
+  dontNpmBuild = true;
+
+  preBuild = ''
+    patchShebangs ./*
+
+    substituteInPlace Makefile \
+      --replace-fail "/bin/bash" "bash" \
+      --replace-fail "\$(SCRIPT_DIR)/node" "${nodejs}/bin/node" \
+      --replace-fail "\$(SCRIPT_DIR)/npm" "${nodejs}/bin/npm"
+  '';
+
+  buildPhase = ''
+    runHook preBuild
+    make js
+    runHook postBuild
+  '';
+
+  npmDepsHash = "sha256-Tr8kYawvPBt+jC7SW8dnKJVWynQyOpKbRD8yd+qbvIs=";
+
+  meta = {
+    changelog = "https://github.com/beautifier/js-beautify/blob/v${finalAttrs.version}/CHANGELOG.md";
+    description = "Beautifier for javascript";
+    homepage = "https://beautifier.io/";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+    mainProgram = "js-beautify";
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 830f5ba99fba..76ad3eaa942e 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -146,6 +146,7 @@ mapAliases {
   ionic = throw "ionic was replaced by @ionic/cli"; # added 2023-08-19
   inherit (pkgs) jake; # added 2023-08-19
   inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
+  inherit (pkgs) js-beautify; # Added 2025-11-06
   inherit (pkgs) jsonplaceholder; # Added 2025-11-04
   joplin = pkgs.joplin-cli; # Added 2025-11-02
   inherit (pkgs) kaput-cli; # added 2024-12-03
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 443b3e9768bd..5c0a0546ad15 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -79,7 +79,6 @@
 , "he"
 , "hs-airdrop"
 , "imapnotify"
-, "js-beautify"
 , "js-yaml"
 , "jsdoc"
 , "jshint"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 76cef919a441..d5bb1a068661 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -2165,15 +2165,6 @@ let
         sha512 = "yx6KAqlt3TAHBduS2fMQtJDL2ufIHnDRArrJEOoTTuizxqmjLT+psGYOHpmMl3gvQpFJ11Hs76guUUktzAF9Bg==";
       };
     };
-    "@one-ini/wasm-0.1.1" = {
-      name = "_at_one-ini_slash_wasm";
-      packageName = "@one-ini/wasm";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz";
-        sha512 = "XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==";
-      };
-    };
     "@orval/angular-7.7.0" = {
       name = "_at_orval_slash_angular";
       packageName = "@orval/angular";
@@ -8609,15 +8600,6 @@ let
         sha512 = "LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==";
       };
     };
-    "commander-10.0.1" = {
-      name = "commander";
-      packageName = "commander";
-      version = "10.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz";
-        sha512 = "y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==";
-      };
-    };
     "commander-11.1.0" = {
       name = "commander";
       packageName = "commander";
@@ -11220,15 +11202,6 @@ let
         sha512 = "pk+k0oK0PVXdlT4oRp4lwh+unuKB7Ng4iZ2HB+EZ7QCEQizX360Rp/F4aRpgpRgdP2ufB35N+1KppHmYjqIGSg==";
       };
     };
-    "editorconfig-1.0.4" = {
-      name = "editorconfig";
-      packageName = "editorconfig";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz";
-        sha512 = "L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==";
-      };
-    };
     "ee-first-1.1.1" = {
       name = "ee-first";
       packageName = "ee-first";
@@ -17574,15 +17547,6 @@ let
         sha512 = "WZzeDOEtTOBK4Mdsar0IqEU5sMr3vSV2RqkAIzUEV2BHnUfKGyswWFPFwK5EeDo93K3FohSHbLAjj0s1Wzd+dg==";
       };
     };
-    "js-cookie-3.0.5" = {
-      name = "js-cookie";
-      packageName = "js-cookie";
-      version = "3.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz";
-        sha512 = "cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==";
-      };
-    };
     "js-levenshtein-1.1.6" = {
       name = "js-levenshtein";
       packageName = "js-levenshtein";
@@ -21247,15 +21211,6 @@ let
         sha512 = "sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==";
       };
     };
-    "minimatch-9.0.1" = {
-      name = "minimatch";
-      packageName = "minimatch";
-      version = "9.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz";
-        sha512 = "0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==";
-      };
-    };
     "minimatch-9.0.5" = {
       name = "minimatch";
       packageName = "minimatch";
@@ -42187,99 +42142,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  js-beautify = nodeEnv.buildNodePackage {
-    name = "js-beautify";
-    packageName = "js-beautify";
-    version = "1.15.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/js-beautify/-/js-beautify-1.15.4.tgz";
-      sha512 = "9/KXeZUKKJwqCXUdBxFJ3vPh467OCckSBmYDwSK/EtV090K+iMJ7zx2S3HLVDIWFQdqMIsZWbnaGiba18aWhaA==";
-    };
-    dependencies = [
-      sources."@isaacs/cliui-8.0.2"
-      sources."@one-ini/wasm-0.1.1"
-      sources."abbrev-2.0.0"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-6.2.1"
-      sources."balanced-match-1.0.2"
-      sources."brace-expansion-2.0.1"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."commander-10.0.1"
-      sources."config-chain-1.1.13"
-      sources."cross-spawn-7.0.6"
-      sources."eastasianwidth-0.2.0"
-      sources."editorconfig-1.0.4"
-      sources."emoji-regex-9.2.2"
-      sources."foreground-child-3.3.1"
-      (
-        sources."glob-10.4.5"
-        // {
-          dependencies = [
-            sources."minimatch-9.0.5"
-          ];
-        }
-      )
-      sources."ini-1.3.8"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."isexe-2.0.0"
-      sources."jackspeak-3.4.3"
-      sources."js-cookie-3.0.5"
-      sources."lru-cache-10.4.3"
-      sources."minimatch-9.0.1"
-      sources."minipass-7.1.2"
-      sources."nopt-7.2.1"
-      sources."package-json-from-dist-1.0.1"
-      sources."path-key-3.1.1"
-      sources."path-scurry-1.11.1"
-      sources."proto-list-1.2.4"
-      sources."semver-7.7.1"
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
-      sources."signal-exit-4.1.0"
-      sources."string-width-5.1.2"
-      (
-        sources."string-width-cjs-4.2.3"
-        // {
-          dependencies = [
-            sources."emoji-regex-8.0.0"
-            sources."strip-ansi-6.0.1"
-          ];
-        }
-      )
-      (
-        sources."strip-ansi-7.1.0"
-        // {
-          dependencies = [
-            sources."ansi-regex-6.1.0"
-          ];
-        }
-      )
-      sources."strip-ansi-cjs-6.0.1"
-      sources."which-2.0.2"
-      sources."wrap-ansi-8.1.0"
-      (
-        sources."wrap-ansi-cjs-7.0.0"
-        // {
-          dependencies = [
-            sources."ansi-styles-4.3.0"
-            sources."emoji-regex-8.0.0"
-            sources."string-width-4.2.3"
-            sources."strip-ansi-6.0.1"
-          ];
-        }
-      )
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "beautifier.io for node";
-      homepage = "https://beautifier.io/";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   js-yaml = nodeEnv.buildNodePackage {
     name = "js-yaml";
     packageName = "js-yaml";

From 2df0be874e169725d5af8f6a87d5242aed0c4d61 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 19:35:21 +0000
Subject: [PATCH 5952/6226] python3Packages.django-webpack-loader: 3.2.1 ->
 3.2.2

---
 .../python-modules/django-webpack-loader/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-webpack-loader/default.nix b/pkgs/development/python-modules/django-webpack-loader/default.nix
index 1d9693514dca..201c5546a2aa 100644
--- a/pkgs/development/python-modules/django-webpack-loader/default.nix
+++ b/pkgs/development/python-modules/django-webpack-loader/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "django-webpack-loader";
-  version = "3.2.1";
+  version = "3.2.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django-webpack";
     repo = "django-webpack-loader";
     tag = version;
-    hash = "sha256-2CmIaVDSZlqfSJVPVBmOcT89znjxQhe7ZHhe7i6DCGY=";
+    hash = "sha256-ZT+c6oYpES+3idHO1Dty3r8DHGNtD44ljEbBVOlEmW0=";
   };
 
   build-system = [ setuptools-scm ];

From 4a540db6aa6535fc75933f9a04f8b2bd56804dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 3 Nov 2025 21:45:58 +0100
Subject: [PATCH 5953/6226] licenses: add mit-enna

---
 lib/licenses.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/licenses.nix b/lib/licenses.nix
index b3d4a82b87c8..dfdfbef9c16c 100644
--- a/lib/licenses.nix
+++ b/lib/licenses.nix
@@ -988,6 +988,11 @@ lib.mapAttrs mkLicense (
       fullName = "CMU License";
     };
 
+    mit-enna = {
+      spdxId = "MIT-enna";
+      fullName = "enna License";
+    };
+
     mit-feh = {
       spdxId = "MIT-feh";
       fullName = "feh License";

From 77b44c97c989f59f78328910eb6b234cc85825a0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Mon, 3 Nov 2025 21:46:31 +0100
Subject: [PATCH 5954/6226] epeg: replace license with mit-enna

Full match according to https://tools.spdx.org/app/check_license/
---
 pkgs/by-name/ep/epeg/package.nix | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/pkgs/by-name/ep/epeg/package.nix b/pkgs/by-name/ep/epeg/package.nix
index 6f02069ab731..0fb3be941948 100644
--- a/pkgs/by-name/ep/epeg/package.nix
+++ b/pkgs/by-name/ep/epeg/package.nix
@@ -43,9 +43,7 @@ stdenv.mkDerivation rec {
     homepage = "https://github.com/mattes/epeg";
     description = "Insanely fast JPEG/ JPG thumbnail scaling";
     platforms = platforms.linux ++ platforms.darwin;
-    license = {
-      url = "https://github.com/mattes/epeg#license";
-    };
+    license = lib.licenses.mit-enna;
     maintainers = with maintainers; [ nh2 ];
     mainProgram = "epeg";
   };

From 23bc5f181bd1ecb54fab28040c2b19fb091d1b1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Sun, 2 Nov 2025 16:35:51 -0800
Subject: [PATCH 5955/6226] deltatouch: 1.14.3 -> 2.22.0

Diff: https://codeberg.org/lk108/deltatouch/compare/v1.14.3...v2.22.0

Changelog: https://codeberg.org/lk108/deltatouch/src/tag/v2.22.0/CHANGELOG
---
 pkgs/by-name/de/deltatouch/package.nix | 75 ++++++++++++++------------
 1 file changed, 40 insertions(+), 35 deletions(-)

diff --git a/pkgs/by-name/de/deltatouch/package.nix b/pkgs/by-name/de/deltatouch/package.nix
index d2dfbb4ce306..273011a02a71 100644
--- a/pkgs/by-name/de/deltatouch/package.nix
+++ b/pkgs/by-name/de/deltatouch/package.nix
@@ -2,26 +2,56 @@
   lib,
   stdenv,
   fetchFromGitea,
+  fetchFromGitHub,
+  fetchpatch,
   cmake,
   intltool,
   libdeltachat,
   lomiri,
   qt5,
   quirc,
+  rustPlatform,
 }:
 
+let
+  libdeltachat' = libdeltachat.overrideAttrs rec {
+    version = "2.22.0";
+    src = fetchFromGitHub {
+      owner = "chatmail";
+      repo = "core";
+      tag = "v${version}";
+      hash = "sha256-DKqqdcG3C7/RF/wz2SqaiPUjZ/7vMFJTR5DIGTXjoTY=";
+    };
+    cargoDeps = rustPlatform.fetchCargoVendor {
+      pname = "chatmail-core";
+      inherit version src;
+      hash = "sha256-x71vytk9ytIhHlRR0lDhDcIaDNJGDdPwb6fkB1SI+NQ=";
+    };
+  };
+in
 stdenv.mkDerivation (finalAttrs: {
   pname = "deltatouch";
-  version = "1.14.3";
+  version = "2.22.0";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "lk108";
     repo = "deltatouch";
-    rev = "v${finalAttrs.version}";
-    hash = "sha256-vumMAMm9+dKlmi5a6ehIDePpQKkco/smYSM1K/QiXu4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-e8kS6kAjOZ2V33XJuJbvDZ9mfRknDh9un0dn5HtD3UY=";
   };
 
+  patches = [
+    (fetchpatch {
+      url = "https://codeberg.org/lk108/deltatouch/commit/b19c088ce95e8ca6ff1102c36d91b1db937e3a3a.patch";
+      hash = "sha256-58WPUSFaAUqVVU3iq05tae5Gvvr405zDA145V9DbJ54=";
+    })
+    (fetchpatch {
+      url = "https://codeberg.org/lk108/deltatouch/commit/139f3a4abd772b17142a7f61ef9b442200728f4a.patch";
+      hash = "sha256-bEX4g88CCt7AFok8kTeItzCripXFoG2ED7R9lGYoCAw=";
+    })
+  ];
+
   nativeBuildInputs = [
     qt5.wrapQtAppsHook
     intltool
@@ -32,50 +62,25 @@ stdenv.mkDerivation (finalAttrs: {
     qt5.qtbase
     qt5.qtwebengine
     qt5.qtquickcontrols2
+    libdeltachat'
     lomiri.lomiri-ui-toolkit
     lomiri.lomiri-ui-extras
     lomiri.lomiri-api
     lomiri.qqc2-suru-style
+    quirc
   ];
 
-  postPatch = ''
-    # Fix all sorts of install locations
-    substituteInPlace CMakeLists.txt \
-      --replace-fail 'set(DATA_DIR /)' 'set(DATA_DIR ''${CMAKE_INSTALL_DATAROOTDIR})' \
-      --replace-fail 'RUNTIME DESTINATION ''${CMAKE_INSTALL_PREFIX}' 'RUNTIME DESTINATION ''${CMAKE_INSTALL_BINDIR}' \
-      --replace-fail 'assets/logo.svg DESTINATION assets' 'assets/logo.svg DESTINATION ''${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps RENAME deltatouch.svg' \
-      --replace-fail "\''${DESKTOP_FILE_NAME} DESTINATION \''${DATA_DIR}" "\''${DESKTOP_FILE_NAME} DESTINATION \''${CMAKE_INSTALL_DATAROOTDIR}/applications"
-
-    substituteInPlace plugins/{DeltaHandler,HtmlMsgEngineProfile,WebxdcEngineProfile,XdcPickerEngineProfile}/CMakeLists.txt \
-      --replace-fail 'set(QT_IMPORTS_DIR "/lib/''${ARCH_TRIPLET}")' 'set(QT_IMPORTS_DIR "${placeholder "out"}/${qt5.qtbase.qtQmlPrefix}")'
-
-    # Fix import of library dependencies
-    substituteInPlace plugins/{DeltaHandler,HtmlMsgEngineProfile,WebxdcEngineProfile,XdcPickerEngineProfile}/CMakeLists.txt \
-      --replace-fail 'IMPORTED_LOCATION "''${CMAKE_CURRENT_BINARY_DIR}/libdeltachat.so"' 'IMPORTED_LOCATION "${lib.getLib libdeltachat}/lib/libdeltachat.so"'
-    substituteInPlace plugins/DeltaHandler/CMakeLists.txt \
-      --replace-fail 'IMPORTED_LOCATION "''${CMAKE_CURRENT_BINARY_DIR}/libquirc.so.1.2"' 'IMPORTED_LOCATION "${lib.getLib quirc}/lib/libquirc.so"'
-
-    # Fix icon reference in desktop file
-    substituteInPlace deltatouch.desktop.in \
-      --replace-fail 'Icon=assets/logo.svg' 'Icon=deltatouch'
-  '';
-
-  postInstall = ''
-    # Remove clickable metadata & helpers from out
-    rm $out/{manifest.json,share/push*}
-  '';
-
-  meta = with lib; {
-    changelog = "https://codeberg.org/lk108/deltatouch/src/tag/${finalAttrs.src.rev}/CHANGELOG";
+  meta = {
+    changelog = "https://codeberg.org/lk108/deltatouch/src/tag/${finalAttrs.src.tag}/CHANGELOG";
     description = "Messaging app for Ubuntu Touch, powered by Delta Chat core";
     longDescription = ''
       DeltaTouch is a messenger for Ubuntu Touch based on Delta Chat core.
       Delta Chat works over email.
     '';
     homepage = "https://codeberg.org/lk108/deltatouch";
-    license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ link2xt ];
+    license = lib.licenses.gpl3Plus;
+    maintainers = with lib.maintainers; [ link2xt ];
     mainProgram = "deltatouch";
-    platforms = platforms.linux;
+    platforms = lib.platforms.linux;
   };
 })

From 1abb1060755d67d69799197c80f32020b81f3a5e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 20:02:08 +0000
Subject: [PATCH 5956/6226] halo: 2.21.9 -> 2.21.10

---
 pkgs/by-name/ha/halo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix
index ee60138ce9f9..d2cba968efcb 100644
--- a/pkgs/by-name/ha/halo/package.nix
+++ b/pkgs/by-name/ha/halo/package.nix
@@ -8,10 +8,10 @@
 }:
 stdenv.mkDerivation rec {
   pname = "halo";
-  version = "2.21.9";
+  version = "2.21.10";
   src = fetchurl {
     url = "https://github.com/halo-dev/halo/releases/download/v${version}/halo-${version}.jar";
-    hash = "sha256-VSpLdYA0wGcgV9a8w/aRohRCGdBjXmvvRVTIszHUnIE=";
+    hash = "sha256-AvQbD+1mlAV73WJ3uM/vIwwv/aiEkovUkxatH54chNA=";
   };
 
   nativeBuildInputs = [

From 216eb4f1d3d4d93844b8eab441cc6b729bb21c58 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 20:05:15 +0000
Subject: [PATCH 5957/6226] sentry-native: 0.12.0 -> 0.12.1

---
 pkgs/by-name/se/sentry-native/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/se/sentry-native/package.nix b/pkgs/by-name/se/sentry-native/package.nix
index 09c04b2381d3..bd1675b7e8cd 100644
--- a/pkgs/by-name/se/sentry-native/package.nix
+++ b/pkgs/by-name/se/sentry-native/package.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "sentry-native";
-  version = "0.12.0";
+  version = "0.12.1";
 
   src = fetchFromGitHub {
     owner = "getsentry";
     repo = "sentry-native";
     tag = version;
-    hash = "sha256-f9G2sCh49ChFcLaDALpfgrOwHh2mxMaUEQTeYffjXks=";
+    hash = "sha256-zjg5WSa/zKIyFmkXsmtghHaPoexxqE7m9kAA5V9f5Nc=";
   };
 
   nativeBuildInputs = [

From 3512d725919d709278790e201896d33b242f5999 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 20:09:40 +0000
Subject: [PATCH 5958/6226] qwen-code: 0.1.1 -> 0.1.4

---
 pkgs/by-name/qw/qwen-code/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/qw/qwen-code/package.nix b/pkgs/by-name/qw/qwen-code/package.nix
index 78273cb98b48..9b8245cbf7c2 100644
--- a/pkgs/by-name/qw/qwen-code/package.nix
+++ b/pkgs/by-name/qw/qwen-code/package.nix
@@ -13,16 +13,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "qwen-code";
-  version = "0.1.1";
+  version = "0.1.4";
 
   src = fetchFromGitHub {
     owner = "QwenLM";
     repo = "qwen-code";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AciiXcSbRWZJ8+79h8Np2DphzUvxoJ1krsXw4rZxv/E=";
+    hash = "sha256-go5fjs5aSG6wqxw3y2/OrhPSWGawUjpq+ZxAnVW7Xe8=";
   };
 
-  npmDepsHash = "sha256-MKpfLzmWIATAPEf8USr2ZJR8ZGTWKkdlXuA4ByYW/jg=";
+  npmDepsHash = "sha256-UP1pV1CAwGspzUzhHw8yWxIBb7D5jHFdCn7DH4KjdO4=";
 
   nativeBuildInputs = [
     jq

From 89541d18dbaf7089994fb9a6587b231f53fe58dc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 20:16:10 +0000
Subject: [PATCH 5959/6226] openapi-python-client: 0.27.0 -> 0.27.1

---
 pkgs/by-name/op/openapi-python-client/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/op/openapi-python-client/package.nix b/pkgs/by-name/op/openapi-python-client/package.nix
index fc1e89340071..b7a23b4a0a88 100644
--- a/pkgs/by-name/op/openapi-python-client/package.nix
+++ b/pkgs/by-name/op/openapi-python-client/package.nix
@@ -11,7 +11,7 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "openapi-python-client";
-  version = "0.27.0";
+  version = "0.27.1";
   pyproject = true;
 
   src = fetchFromGitHub {
@@ -19,7 +19,7 @@ python3Packages.buildPythonApplication rec {
     owner = "openapi-generators";
     repo = "openapi-python-client";
     tag = "v${version}";
-    hash = "sha256-fQm6BlBqCztV3lqXTHwXece80TYJZ1bGoIJwGye3F2I=";
+    hash = "sha256-T8EC9wpkHVps7rNgwLx7VdIt1O7v021gUZHbVY6QT/Q=";
   };
 
   nativeBuildInputs = [

From be4d9c27325718e0d9530f12f7ea6eb86baa65e8 Mon Sep 17 00:00:00 2001
From: Tert0 <tert0byte@gmail.com>
Date: Thu, 6 Nov 2025 21:23:16 +0100
Subject: [PATCH 5960/6226] nixos/tests/restic-rest-server: fix setting time in
 tests

Use `date -s` instead of `timedatectl set-time` because it fails with
`Failed to set time: Requested to set the clock to time before build time, refusing.`
---
 nixos/tests/restic-rest-server.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/nixos/tests/restic-rest-server.nix b/nixos/tests/restic-rest-server.nix
index 9e6753d91b2a..c224515b586e 100644
--- a/nixos/tests/restic-rest-server.nix
+++ b/nixos/tests/restic-rest-server.nix
@@ -86,7 +86,7 @@ in
         "touch /opt/excluded_file_1 /opt/excluded_file_2",
 
         # test that remotebackup runs custom commands and produces a snapshot
-        "timedatectl set-time '2016-12-13 13:45'",
+        "date -s '2016-12-13 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
         'restic-remotebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"',
@@ -97,23 +97,23 @@ in
         "diff -ru ${testDir} /tmp/restore-1/opt",
 
         # test that we can create four snapshots in remotebackup and rclonebackup
-        "timedatectl set-time '2017-12-13 13:45'",
+        "date -s '2017-12-13 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
 
-        "timedatectl set-time '2018-12-13 13:45'",
+        "date -s '2018-12-13 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
 
-        "timedatectl set-time '2018-12-14 13:45'",
+        "date -s '2018-12-14 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
 
-        "timedatectl set-time '2018-12-15 13:45'",
+        "date -s '2018-12-15 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
 
-        "timedatectl set-time '2018-12-16 13:45'",
+        "date -s '2018-12-16 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
 

From 976c52f8d6c89cf8d222ce724e7a8d4e6c9e7f33 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 20:26:11 +0000
Subject: [PATCH 5961/6226] vue-language-server: 3.1.2 -> 3.1.3

---
 pkgs/by-name/vu/vue-language-server/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/vu/vue-language-server/package.nix b/pkgs/by-name/vu/vue-language-server/package.nix
index 2765c73bdb0c..a646b93cb859 100644
--- a/pkgs/by-name/vu/vue-language-server/package.nix
+++ b/pkgs/by-name/vu/vue-language-server/package.nix
@@ -9,19 +9,19 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "vue-language-server";
-  version = "3.1.2";
+  version = "3.1.3";
 
   src = fetchFromGitHub {
     owner = "vuejs";
     repo = "language-tools";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-IW7lNvUA2y85nl+xu7vZXtIYNrVdsz5/0o7r+S0kEig=";
+    hash = "sha256-bzVqlO6Q3pgw9Kor6agpAlqyp3nj96+7f8j2nOzyEZ0=";
   };
 
   pnpmDeps = pnpm.fetchDeps {
     inherit (finalAttrs) pname version src;
     fetcherVersion = 1;
-    hash = "sha256-BBhTx5pAM+7MlMig11fjodJ2YL1SP+zvdI0JSCLv5lo=";
+    hash = "sha256-VcQbzvPa5FL8OH4Sk0j64M9D4Si/N4rm9nvIAN/xODs=";
   };
 
   nativeBuildInputs = [

From 86cfef9c19dfec0bd096b4ecdc82f2539bd81f5a Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 6 Nov 2025 15:26:46 -0500
Subject: [PATCH 5962/6226] json-server: migrate from nodePackages

---
 pkgs/by-name/js/json-server/package.nix       |  29 ++
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 379 ------------------
 4 files changed, 30 insertions(+), 380 deletions(-)
 create mode 100644 pkgs/by-name/js/json-server/package.nix

diff --git a/pkgs/by-name/js/json-server/package.nix b/pkgs/by-name/js/json-server/package.nix
new file mode 100644
index 000000000000..1ae45a94041b
--- /dev/null
+++ b/pkgs/by-name/js/json-server/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "json-server";
+  version = "1.0.0-beta.3";
+
+  src = fetchFromGitHub {
+    owner = "typicode";
+    repo = "json-server";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-NDSmlW5SiA81Tf6kfkaaKUh05aGZEBajqkLZoxBv0Wc=";
+  };
+
+  npmDepsHash = "sha256-HZmCxMKgxJ+ZiRDXh/iVmytNMbPoYzSuI0F8YmkcfZI=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Get a full fake REST API with zero coding in less than 30 seconds";
+    homepage = "https://github.com/typicode/json-server";
+    license = lib.licenses.fairsource09;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 5825fe0b683d..b7953150a3ab 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -148,6 +148,7 @@ mapAliases {
   inherit (pkgs) jake; # added 2023-08-19
   inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
   inherit (pkgs) jsonplaceholder; # Added 2025-11-04
+  inherit (pkgs) json-server; # Added 2025-11-06
   joplin = pkgs.joplin-cli; # Added 2025-11-02
   inherit (pkgs) kaput-cli; # added 2024-12-03
   karma = pkgs.karma-runner; # added 2023-07-29
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index ccdb654c4503..2396c250711b 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -85,7 +85,6 @@
 , "json"
 , "json-diff"
 , "json-refs"
-, "json-server"
 , "jsonlint"
 , "katex"
 , "lcov-result-merger"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index a5953db51ca9..f57fbd568fde 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -2462,15 +2462,6 @@ let
         sha512 = "OLkDZSqkA1mkoPNPvLFXyI6fb0enCuFji6Zfditi/CLAo9kmIhQFmEUDu4krSB8i908EljG8YwL5Xjxzm5wsWA==";
       };
     };
-    "@polka/url-1.0.0-next.28" = {
-      name = "_at_polka_slash_url";
-      packageName = "@polka/url";
-      version = "1.0.0-next.28";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@polka/url/-/url-1.0.0-next.28.tgz";
-        sha512 = "8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==";
-      };
-    };
     "@prisma/config-6.5.0" = {
       name = "_at_prisma_slash_config";
       packageName = "@prisma/config";
@@ -3317,177 +3308,6 @@ let
         sha512 = "DV/Re3DPVY+BhBtLZ3dmP4mP6YMLSsgq9qGLXwOV38lvNF/fBlgvQswzlXmzCEefL/3q2eMoefZpOI/+GLuCNA==";
       };
     };
-    "@tinyhttp/accepts-2.2.3" = {
-      name = "_at_tinyhttp_slash_accepts";
-      packageName = "@tinyhttp/accepts";
-      version = "2.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/accepts/-/accepts-2.2.3.tgz";
-        sha512 = "9pQN6pJAJOU3McmdJWTcyq7LLFW8Lj5q+DadyKcvp+sxMkEpktKX5sbfJgJuOvjk6+1xWl7pe0YL1US1vaO/1w==";
-      };
-    };
-    "@tinyhttp/app-2.5.2" = {
-      name = "_at_tinyhttp_slash_app";
-      packageName = "@tinyhttp/app";
-      version = "2.5.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/app/-/app-2.5.2.tgz";
-        sha512 = "DcB3Y8GQppLQlO2VxRYF7LzTEAoZb+VRQXuIsErcu2fNaM1xdx6NQZDso5rlZUiaeg6KYYRfU34N4XkZbv6jSA==";
-      };
-    };
-    "@tinyhttp/content-disposition-2.2.2" = {
-      name = "_at_tinyhttp_slash_content-disposition";
-      packageName = "@tinyhttp/content-disposition";
-      version = "2.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/content-disposition/-/content-disposition-2.2.2.tgz";
-        sha512 = "crXw1txzrS36huQOyQGYFvhTeLeG0Si1xu+/l6kXUVYpE0TjFjEZRqTbuadQLfKGZ0jaI+jJoRyqaWwxOSHW2g==";
-      };
-    };
-    "@tinyhttp/content-type-0.1.4" = {
-      name = "_at_tinyhttp_slash_content-type";
-      packageName = "@tinyhttp/content-type";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/content-type/-/content-type-0.1.4.tgz";
-        sha512 = "dl6f3SHIJPYbhsW1oXdrqOmLSQF/Ctlv3JnNfXAE22kIP7FosqJHxkz/qj2gv465prG8ODKH5KEyhBkvwrueKQ==";
-      };
-    };
-    "@tinyhttp/cookie-2.1.1" = {
-      name = "_at_tinyhttp_slash_cookie";
-      packageName = "@tinyhttp/cookie";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/cookie/-/cookie-2.1.1.tgz";
-        sha512 = "h/kL9jY0e0Dvad+/QU3efKZww0aTvZJslaHj3JTPmIPC9Oan9+kYqmh3M6L5JUQRuTJYFK2nzgL2iJtH2S+6dA==";
-      };
-    };
-    "@tinyhttp/cookie-signature-2.1.1" = {
-      name = "_at_tinyhttp_slash_cookie-signature";
-      packageName = "@tinyhttp/cookie-signature";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/cookie-signature/-/cookie-signature-2.1.1.tgz";
-        sha512 = "VDsSMY5OJfQJIAtUgeQYhqMPSZptehFSfvEEtxr+4nldPA8IImlp3QVcOVuK985g4AFR4Hl1sCbWCXoqBnVWnw==";
-      };
-    };
-    "@tinyhttp/cors-2.0.1" = {
-      name = "_at_tinyhttp_slash_cors";
-      packageName = "@tinyhttp/cors";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/cors/-/cors-2.0.1.tgz";
-        sha512 = "qrmo6WJuaiCzKWagv2yA/kw6hIISfF/hOqPWwmI6w0o8apeTMmRN3DoCFvQ/wNVuWVdU5J4KU7OX8aaSOEq51A==";
-      };
-    };
-    "@tinyhttp/encode-url-2.1.1" = {
-      name = "_at_tinyhttp_slash_encode-url";
-      packageName = "@tinyhttp/encode-url";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/encode-url/-/encode-url-2.1.1.tgz";
-        sha512 = "AhY+JqdZ56qV77tzrBm0qThXORbsVjs/IOPgGCS7x/wWnsa/Bx30zDUU/jPAUcSzNOzt860x9fhdGpzdqbUeUw==";
-      };
-    };
-    "@tinyhttp/etag-2.1.2" = {
-      name = "_at_tinyhttp_slash_etag";
-      packageName = "@tinyhttp/etag";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/etag/-/etag-2.1.2.tgz";
-        sha512 = "j80fPKimGqdmMh6962y+BtQsnYPVCzZfJw0HXjyH70VaJBHLKGF+iYhcKqzI3yef6QBNa8DKIPsbEYpuwApXTw==";
-      };
-    };
-    "@tinyhttp/forwarded-2.1.2" = {
-      name = "_at_tinyhttp_slash_forwarded";
-      packageName = "@tinyhttp/forwarded";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/forwarded/-/forwarded-2.1.2.tgz";
-        sha512 = "9H/eulJ68ElY/+zYpTpNhZ7vxGV+cnwaR6+oQSm7bVgZMyuQfgROW/qvZuhmgDTIxnGMXst+Ba4ij6w6Krcs3w==";
-      };
-    };
-    "@tinyhttp/logger-2.1.0" = {
-      name = "_at_tinyhttp_slash_logger";
-      packageName = "@tinyhttp/logger";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/logger/-/logger-2.1.0.tgz";
-        sha512 = "Ma1fJ9CwUbn9r61/4HW6+nflsVoslpOnCrfQ6UeZq7GGIgwLzofms3HoSVG7M+AyRMJpxlfcDdbH5oFVroDMKA==";
-      };
-    };
-    "@tinyhttp/proxy-addr-2.2.1" = {
-      name = "_at_tinyhttp_slash_proxy-addr";
-      packageName = "@tinyhttp/proxy-addr";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/proxy-addr/-/proxy-addr-2.2.1.tgz";
-        sha512 = "BicqMqVI91hHq2BQmnqJUh0FQUnx7DncwSGgu2ghlh+JZG2rHK2ZN/rXkfhrx1rrUw6hnd0L36O8GPMh01+dDQ==";
-      };
-    };
-    "@tinyhttp/req-2.2.5" = {
-      name = "_at_tinyhttp_slash_req";
-      packageName = "@tinyhttp/req";
-      version = "2.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/req/-/req-2.2.5.tgz";
-        sha512 = "trfsXwtmsNjMcGKcLJ+45h912kLRqBQCQD06ams3Tq0kf4gHLxjHjoYOC1Z9yGjOn81XllRx8wqvnvr+Kbe3gw==";
-      };
-    };
-    "@tinyhttp/res-2.2.5" = {
-      name = "_at_tinyhttp_slash_res";
-      packageName = "@tinyhttp/res";
-      version = "2.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/res/-/res-2.2.5.tgz";
-        sha512 = "yBsqjWygpuKAVz4moWlP4hqzwiDDqfrn2mA0wviJAcgvGiyOErtlQwXY7aj3aPiCpURvxvEFO//Gdy6yV+xEpA==";
-      };
-    };
-    "@tinyhttp/router-2.2.3" = {
-      name = "_at_tinyhttp_slash_router";
-      packageName = "@tinyhttp/router";
-      version = "2.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/router/-/router-2.2.3.tgz";
-        sha512 = "O0MQqWV3Vpg/uXsMYg19XsIgOhwjyhTYWh51Qng7bxqXixxx2PEvZWnFjP7c84K7kU/nUX41KpkEBTLnznk9/Q==";
-      };
-    };
-    "@tinyhttp/send-2.2.3" = {
-      name = "_at_tinyhttp_slash_send";
-      packageName = "@tinyhttp/send";
-      version = "2.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/send/-/send-2.2.3.tgz";
-        sha512 = "o4cVHHGQ8WjVBS8UT0EE/2WnjoybrfXikHwsRoNlG1pfrC/Sd01u1N4Te8cOd/9aNGLr4mGxWb5qTm2RRtEi7g==";
-      };
-    };
-    "@tinyhttp/type-is-2.2.4" = {
-      name = "_at_tinyhttp_slash_type-is";
-      packageName = "@tinyhttp/type-is";
-      version = "2.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/type-is/-/type-is-2.2.4.tgz";
-        sha512 = "7F328NheridwjIfefBB2j1PEcKKABpADgv7aCJaE8x8EON77ZFrAkI3Rir7pGjopV7V9MBmW88xUQigBEX2rmQ==";
-      };
-    };
-    "@tinyhttp/url-2.1.1" = {
-      name = "_at_tinyhttp_slash_url";
-      packageName = "@tinyhttp/url";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/url/-/url-2.1.1.tgz";
-        sha512 = "POJeq2GQ5jI7Zrdmj22JqOijB5/GeX+LEX7DUdml1hUnGbJOTWDx7zf2b5cCERj7RoXL67zTgyzVblBJC+NJWg==";
-      };
-    };
-    "@tinyhttp/vary-0.1.3" = {
-      name = "_at_tinyhttp_slash_vary";
-      packageName = "@tinyhttp/vary";
-      version = "0.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@tinyhttp/vary/-/vary-0.1.3.tgz";
-        sha512 = "SoL83sQXAGiHN1jm2VwLUWQSQeDAAl1ywOm6T0b0Cg1CZhVsjoiZadmjhxF6FHCCY7OHHVaLnTgSMxTPIDLxMg==";
-      };
-    };
     "@tokenizer/token-0.3.0" = {
       name = "_at_tokenizer_slash_token";
       packageName = "@tokenizer/token";
@@ -10041,15 +9861,6 @@ let
         sha512 = "GODcnWq3YGoTnygPfi02ygEiRxqUxpJwuRHjdhJYuxpcZmDq4rjBiXYmbCCzStxo176ixfLT6i4NPwQooRySnw==";
       };
     };
-    "dayjs-1.11.13" = {
-      name = "dayjs";
-      packageName = "dayjs";
-      version = "1.11.13";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz";
-        sha512 = "oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==";
-      };
-    };
     "deasync-0.1.20" = {
       name = "deasync";
       packageName = "deasync";
@@ -11589,15 +11400,6 @@ let
         sha512 = "Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==";
       };
     };
-    "es-escape-html-0.1.1" = {
-      name = "es-escape-html";
-      packageName = "es-escape-html";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es-escape-html/-/es-escape-html-0.1.1.tgz";
-        sha512 = "yUx1o+8RsG7UlszmYPtks+dm6Lho2m8lgHMOsLJQsFI0R8XwUJwiMhM1M4E/S8QLeGyf6MkDV/pWgjQ0tdTSyQ==";
-      };
-    };
     "es-get-iterator-1.1.3" = {
       name = "es-get-iterator";
       packageName = "es-get-iterator";
@@ -12228,15 +12030,6 @@ let
         sha512 = "kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==";
       };
     };
-    "eta-3.5.0" = {
-      name = "eta";
-      packageName = "eta";
-      version = "3.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eta/-/eta-3.5.0.tgz";
-        sha512 = "e3x3FBvGzeCIHhF+zhK8FZA2vC5uFn6b4HJjegUbIWrDb4mJ7JjTGMJY9VGIbRVpmSwHopNiaJibhjIr+HfLug==";
-      };
-    };
     "etag-1.8.1" = {
       name = "etag";
       packageName = "etag";
@@ -15045,15 +14838,6 @@ let
         sha512 = "F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==";
       };
     };
-    "header-range-parser-1.1.3" = {
-      name = "header-range-parser";
-      packageName = "header-range-parser";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/header-range-parser/-/header-range-parser-1.1.3.tgz";
-        sha512 = "B9zCFt3jH8g09LR1vHL4pcAn8yMEtlSlOUdQemzHMRKMImNIhhszdeosYFfNW0WXKQtXIlWB+O4owHJKvEJYaA==";
-      };
-    };
     "heap-0.2.7" = {
       name = "heap";
       packageName = "heap";
@@ -15396,15 +15180,6 @@ let
         sha512 = "YQF7j8Qf/Rlby0IbRPiWfNZt6aeUv3K0Pi0x3crbMZN+7F8dPn5k4b3n897vpM1Vk8Mg2fhOYc9fktKEQWMy/Q==";
       };
     };
-    "http-status-emojis-2.2.0" = {
-      name = "http-status-emojis";
-      packageName = "http-status-emojis";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-status-emojis/-/http-status-emojis-2.2.0.tgz";
-        sha512 = "ompKtgwpx8ff0hsbpIB7oE4ax1LXoHmftsHHStMELX56ivG3GhofTX8ZHWlUaFKfGjcGjw6G3rPk7dJRXMmbbg==";
-      };
-    };
     "http2-client-1.3.5" = {
       name = "http2-client";
       packageName = "http2-client";
@@ -15828,15 +15603,6 @@ let
         sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==";
       };
     };
-    "inflection-3.0.2" = {
-      name = "inflection";
-      packageName = "inflection";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inflection/-/inflection-3.0.2.tgz";
-        sha512 = "+Bg3+kg+J6JUWn8J6bzFmOWkTQ6L/NHfDRSYU+EVvuKHDxUDHAXgqixHfVlzuBQaPOTac8hn43aPhMNk6rMe3g==";
-      };
-    };
     "inflight-1.0.6" = {
       name = "inflight";
       packageName = "inflight";
@@ -19509,15 +19275,6 @@ let
         sha512 = "RPNliZOFkqFumDhvYqOaNY4Uz9oJM2K9tC6JWsJJsNdhuONW4LQHRBpb0qf4pJApVffI5N39SwzWZJuEhfd7eQ==";
       };
     };
-    "lowdb-7.0.1" = {
-      name = "lowdb";
-      packageName = "lowdb";
-      version = "7.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lowdb/-/lowdb-7.0.1.tgz";
-        sha512 = "neJAj8GwF0e8EpycYIDFqEPcx9Qz4GUho20jWFR7YiFeXzF1YMLdxB36PypcTSPMA+4+LvgyMacYhlr18Zlymw==";
-      };
-    };
     "lower-case-2.0.2" = {
       name = "lower-case";
       packageName = "lower-case";
@@ -20995,15 +20752,6 @@ let
         sha512 = "115fLhvZVqWwHPbClyntxEVfVDfl9DLLTuJvq3g2O/Oxi8AiNouAHvDSzHS0viUJc+V5vm3eq91Xwqn9dp4jRA==";
       };
     };
-    "milliparsec-4.0.0" = {
-      name = "milliparsec";
-      packageName = "milliparsec";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/milliparsec/-/milliparsec-4.0.0.tgz";
-        sha512 = "/wk9d4Z6/9ZvoEH/6BI4TrTCgmkpZPuSRN/6fI9aUHOfXdNTuj/VhLS7d+NqG26bi6L9YmGXutVYvWC8zQ0qtA==";
-      };
-    };
     "mime-1.6.0" = {
       name = "mime";
       packageName = "mime";
@@ -21022,15 +20770,6 @@ let
         sha512 = "USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==";
       };
     };
-    "mime-4.0.4" = {
-      name = "mime";
-      packageName = "mime";
-      version = "4.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mime/-/mime-4.0.4.tgz";
-        sha512 = "v8yqInVjhXyqP6+Kw4fV3ZzeMRqEW6FotRsKXjRS5VMTNIuXsdRoAvklpoRgSqXm6o9VNH4/C0mgedko9DdLsQ==";
-      };
-    };
     "mime-db-1.33.0" = {
       name = "mime-db";
       packageName = "mime-db";
@@ -21544,15 +21283,6 @@ let
         sha512 = "tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==";
       };
     };
-    "mrmime-2.0.1" = {
-      name = "mrmime";
-      packageName = "mrmime";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mrmime/-/mrmime-2.0.1.tgz";
-        sha512 = "Y3wQdFg2Va6etvQ5I82yUhGdsKrcYox6p7FfL1LbK2J4V01F9TGlepTIhnK24t7koZibmg82KGglhA1XK5IsLQ==";
-      };
-    };
     "ms-0.7.3" = {
       name = "ms";
       packageName = "ms";
@@ -26018,15 +25748,6 @@ let
         sha512 = "dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==";
       };
     };
-    "regexparam-2.0.2" = {
-      name = "regexparam";
-      packageName = "regexparam";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/regexparam/-/regexparam-2.0.2.tgz";
-        sha512 = "A1PeDEYMrkLrfyOwv2jwihXbo9qxdGD3atBYQA9JJgreAx8/7rC6IUkWOw2NQlOxLp2wL0ifQbh1HuidDfYA6w==";
-      };
-    };
     "registry-auth-token-3.3.2" = {
       name = "registry-auth-token";
       packageName = "registry-auth-token";
@@ -28160,15 +27881,6 @@ let
         sha512 = "awzaaIPtYFdexLr6TBpcZSGPB6D1RInNO/qNetgaJloPDF/D0GkVtLvGEp8InfmLV7CyLyQ5fIRP+tVN/JmWQA==";
       };
     };
-    "sirv-2.0.4" = {
-      name = "sirv";
-      packageName = "sirv";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sirv/-/sirv-2.0.4.tgz";
-        sha512 = "94Bdh3cC2PKrbgSOUqTiGPWVZeSiXfKOVZNJniWoqrWrRkB1CJzBU3NEbiTsPcYy1lDsANA/THzS+9WBiy5nfQ==";
-      };
-    };
     "skin-tone-4.0.0" = {
       name = "skin-tone";
       packageName = "skin-tone";
@@ -28502,15 +28214,6 @@ let
         sha512 = "aUYIEU/UviqPgc8mHR6IW1EGxkAXpeRETYcrzg8cLAvUPZcpAlleSXHV2mY7G12GphSH6Gzv+4MMVSSkbdteHg==";
       };
     };
-    "sort-on-6.1.0" = {
-      name = "sort-on";
-      packageName = "sort-on";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sort-on/-/sort-on-6.1.0.tgz";
-        sha512 = "WTECP0nYNWO1n2g5bpsV0yZN9cBmZsF8ThHFbOqVN0HBFRoaQZLLEMvMmJlKHNPYQeVngeI5+jJzIfFqOIo1OA==";
-      };
-    };
     "source-map-0.5.7" = {
       name = "source-map";
       packageName = "source-map";
@@ -28970,15 +28673,6 @@ let
         sha512 = "ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==";
       };
     };
-    "steno-4.0.2" = {
-      name = "steno";
-      packageName = "steno";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/steno/-/steno-4.0.2.tgz";
-        sha512 = "yhPIQXjrlt1xv7dyPQg2P17URmXbuM5pdGkpiMB3RenprfiBlvK415Lctfe0eshk90oA7/tNq7WEiMK8RSP39A==";
-      };
-    };
     "stop-iteration-iterator-1.1.0" = {
       name = "stop-iteration-iterator";
       packageName = "stop-iteration-iterator";
@@ -30302,15 +29996,6 @@ let
         sha512 = "F+3tYmXnpO2gyhZQ7o8yakELJH3FtKISI/FU0iWvchOWFUXiFnjbEBoumSzfcK1P71Qxzx2az4lVK4Dkq4KSew==";
       };
     };
-    "totalist-3.0.1" = {
-      name = "totalist";
-      packageName = "totalist";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/totalist/-/totalist-3.0.1.tgz";
-        sha512 = "sf4i37nQ2LBx4m3wB74y+ubopq6W/dIzXg0FDGjsYnZHVa1Da8FH853wlL2gtUhg+xJXjfk3kUZS3BRoQeoQBQ==";
-      };
-    };
     "tough-cookie-2.4.3" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
@@ -42515,70 +42200,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  json-server = nodeEnv.buildNodePackage {
-    name = "json-server";
-    packageName = "json-server";
-    version = "1.0.0-beta.3";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/json-server/-/json-server-1.0.0-beta.3.tgz";
-      sha512 = "DwE69Ep5ccwIJZBUIWEENC30Yj8bwr4Ax9W9VoIWAYnB8Sj4ReptscO8/DRHv/nXwVlmb3Bk73Ls86+VZdYkkA==";
-    };
-    dependencies = [
-      sources."@polka/url-1.0.0-next.28"
-      sources."@tinyhttp/accepts-2.2.3"
-      sources."@tinyhttp/app-2.5.2"
-      sources."@tinyhttp/content-disposition-2.2.2"
-      sources."@tinyhttp/content-type-0.1.4"
-      sources."@tinyhttp/cookie-2.1.1"
-      sources."@tinyhttp/cookie-signature-2.1.1"
-      sources."@tinyhttp/cors-2.0.1"
-      sources."@tinyhttp/encode-url-2.1.1"
-      sources."@tinyhttp/etag-2.1.2"
-      sources."@tinyhttp/forwarded-2.1.2"
-      sources."@tinyhttp/logger-2.1.0"
-      sources."@tinyhttp/proxy-addr-2.2.1"
-      sources."@tinyhttp/req-2.2.5"
-      sources."@tinyhttp/res-2.2.5"
-      sources."@tinyhttp/router-2.2.3"
-      sources."@tinyhttp/send-2.2.3"
-      sources."@tinyhttp/type-is-2.2.4"
-      sources."@tinyhttp/url-2.1.1"
-      sources."@tinyhttp/vary-0.1.3"
-      sources."chalk-5.4.1"
-      sources."chokidar-4.0.3"
-      sources."colorette-2.0.20"
-      sources."dayjs-1.11.13"
-      sources."dot-prop-9.0.0"
-      sources."es-escape-html-0.1.1"
-      sources."eta-3.5.0"
-      sources."header-range-parser-1.1.3"
-      sources."http-status-emojis-2.2.0"
-      sources."inflection-3.0.2"
-      sources."ipaddr.js-2.2.0"
-      sources."json5-2.2.3"
-      sources."lowdb-7.0.1"
-      sources."milliparsec-4.0.0"
-      sources."mime-4.0.4"
-      sources."mrmime-2.0.1"
-      sources."negotiator-0.6.4"
-      sources."readdirp-4.1.2"
-      sources."regexparam-2.0.2"
-      sources."sirv-2.0.4"
-      sources."sort-on-6.1.0"
-      sources."steno-4.0.2"
-      sources."totalist-3.0.1"
-      sources."type-fest-4.37.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "[![Node.js CI](https://github.com/typicode/json-server/actions/workflows/node.js.yml/badge.svg)](https://github.com/typicode/json-server/actions/workflows/node.js.yml)";
-      homepage = "https://github.com/typicode/json-server#readme";
-      license = "SEE LICENSE IN ./LICENSE";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   jsonlint = nodeEnv.buildNodePackage {
     name = "jsonlint";
     packageName = "jsonlint";

From 8259d2c7928b9f83ae7b03a9e693f7a48c75792a Mon Sep 17 00:00:00 2001
From: ghpzin <ghpzin@gmail.com>
Date: Thu, 6 Nov 2025 23:18:05 +0300
Subject: [PATCH 5963/6226] olive-editor: cleanup

- replace `version` with correct format
---
 pkgs/by-name/ol/olive-editor/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ol/olive-editor/package.nix b/pkgs/by-name/ol/olive-editor/package.nix
index 6d98955eea6c..09d1b26ac1df 100644
--- a/pkgs/by-name/ol/olive-editor/package.nix
+++ b/pkgs/by-name/ol/olive-editor/package.nix
@@ -36,7 +36,7 @@ in
 
 stdenv.mkDerivation {
   pname = "olive-editor";
-  version = "unstable-2023-06-12";
+  version = "0.1.2-unstable-2023-06-12";
 
   src = fetchFromGitHub {
     fetchSubmodules = true;

From cdbbcc23f586faeef6439edeaebbf68bf7e0dddb Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 15:57:29 -0800
Subject: [PATCH 5964/6226] python3Packages.fickling: cleanup

---
 pkgs/development/python-modules/fickling/default.nix | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/fickling/default.nix b/pkgs/development/python-modules/fickling/default.nix
index e535f4e96912..bb657156768a 100644
--- a/pkgs/development/python-modules/fickling/default.nix
+++ b/pkgs/development/python-modules/fickling/default.nix
@@ -6,7 +6,6 @@
   fetchFromGitHub,
   flit-core,
   pytestCheckHook,
-  pythonOlder,
   torch,
   torchvision,
 }:
@@ -16,7 +15,6 @@ buildPythonPackage rec {
   version = "0.1.3";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
 
   src = fetchFromGitHub {
     owner = "trailofbits";
@@ -43,11 +41,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "fickling" ];
 
-  meta = with lib; {
+  meta = {
     description = "Python pickling decompiler and static analyzer";
     homepage = "https://github.com/trailofbits/fickling";
     changelog = "https://github.com/trailofbits/fickling/releases/tag/v${version}";
-    license = licenses.lgpl3Plus;
+    license = lib.licenses.lgpl3Plus;
     maintainers = [ ];
   };
 }

From eabba2c232f2b5fd3154bbce0223f27496ce678f Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 15:57:29 -0800
Subject: [PATCH 5965/6226] python3Packages.fickling: 0.1.3 -> 0.1.4

---
 .../python-modules/fickling/default.nix       | 23 +++++++++++++++----
 1 file changed, 18 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/fickling/default.nix b/pkgs/development/python-modules/fickling/default.nix
index bb657156768a..e4887b4a2836 100644
--- a/pkgs/development/python-modules/fickling/default.nix
+++ b/pkgs/development/python-modules/fickling/default.nix
@@ -5,22 +5,23 @@
   distutils,
   fetchFromGitHub,
   flit-core,
+  numpy,
   pytestCheckHook,
   torch,
   torchvision,
+  stdlib-list,
 }:
 
 buildPythonPackage rec {
   pname = "fickling";
-  version = "0.1.3";
+  version = "0.1.4";
   pyproject = true;
 
-
   src = fetchFromGitHub {
     owner = "trailofbits";
     repo = "fickling";
     tag = "v${version}";
-    hash = "sha256-/cV1XhJ8KMFby9nZ/qXEYxf+P6352Q2DZOLuvebyuHQ=";
+    hash = "sha256-EgVtMYPwSVBlw1bmX3qEeUKvEY7Awv6DOB5tgSLG+xQ=";
   };
 
   build-system = [
@@ -28,10 +29,16 @@ buildPythonPackage rec {
     flit-core
   ];
 
-  dependencies = [ astunparse ];
+  dependencies = [
+    astunparse
+    stdlib-list
+  ];
+
+  pythonRelaxDeps = [ "stdlib_list" ];
 
   optional-dependencies = {
     torch = [
+      numpy
       torch
       torchvision
     ];
@@ -39,12 +46,18 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
+  disabledTestPaths = [
+    # https://github.com/trailofbits/fickling/issues/162
+    # AttributeError: module 'numpy.lib.format' has no attribute...
+    "test/test_polyglot.py"
+  ];
+
   pythonImportsCheck = [ "fickling" ];
 
   meta = {
     description = "Python pickling decompiler and static analyzer";
     homepage = "https://github.com/trailofbits/fickling";
-    changelog = "https://github.com/trailofbits/fickling/releases/tag/v${version}";
+    changelog = "https://github.com/trailofbits/fickling/releases/tag/${src.tag}";
     license = lib.licenses.lgpl3Plus;
     maintainers = [ ];
   };

From 6f9fc9138c6daec085b4596150ee0446a000fb09 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 20:37:35 +0000
Subject: [PATCH 5966/6226] duc: 1.4.5 -> 1.4.6

---
 pkgs/by-name/du/duc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/du/duc/package.nix b/pkgs/by-name/du/duc/package.nix
index 7da393dae979..be1dead197cc 100644
--- a/pkgs/by-name/du/duc/package.nix
+++ b/pkgs/by-name/du/duc/package.nix
@@ -15,13 +15,13 @@ assert enableCairo -> cairo != null && pango != null;
 
 stdenv.mkDerivation rec {
   pname = "duc";
-  version = "1.4.5";
+  version = "1.4.6";
 
   src = fetchFromGitHub {
     owner = "zevv";
     repo = "duc";
     rev = version;
-    sha256 = "sha256-ZLNsyp82UnsveEfDKzH8WfRh/Y/PQlXq8Ma+jIZl9Gk=";
+    sha256 = "sha256-hZ8bhPXS/trt6ZePjfuwx8PEfv0xCBqSJxRonLB7Ui0=";
   };
 
   nativeBuildInputs = [

From 888865f645e67586e1da3cebb679f4aa7c506313 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 16:26:37 -0500
Subject: [PATCH 5967/6226] coc-cmake: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 +++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-cmake/package.nix         | 54 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 18 -------
 6 files changed, 61 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-cmake/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index 72f38d3e94d4..d9cc90058d09 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -2,6 +2,7 @@
   buildVimPlugin,
   coc-basedpyright,
   coc-clangd,
+  coc-cmake,
   coc-css,
   coc-diagnostic,
   coc-docker,
@@ -23,6 +24,11 @@ final: prev: {
     src = "${coc-clangd}/lib/node_modules/coc-clangd";
   };
 
+  coc-cmake = buildVimPlugin {
+    inherit (coc-cmake) pname version meta;
+    src = "${coc-cmake}/lib/node_modules/coc-cmake";
+  };
+
   coc-css = buildVimPlugin {
     inherit (coc-css) pname version meta;
     src = "${coc-css}/lib/node_modules/coc-css";
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index 3a24fa7562fe..d13078156e7b 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -6,7 +6,6 @@
 final: prev:
 let
   nodePackageNames = [
-    "coc-cmake"
     "coc-emmet"
     "coc-eslint"
     "coc-flutter"
diff --git a/pkgs/by-name/co/coc-cmake/package.nix b/pkgs/by-name/co/coc-cmake/package.nix
new file mode 100644
index 000000000000..74bbc83fc6f4
--- /dev/null
+++ b/pkgs/by-name/co/coc-cmake/package.nix
@@ -0,0 +1,54 @@
+{
+  lib,
+  stdenv,
+  nodejs,
+  pnpm_8,
+  fetchFromGitHub,
+  npmHooks,
+}:
+stdenv.mkDerivation (finalAttrs: {
+  pname = "coc-cmake";
+  version = "0-unstable-2024-10-21";
+
+  src = fetchFromGitHub {
+    owner = "voldikss";
+    repo = "coc-extensions";
+    rev = "69c81e04fd3350bb75b09232d8ccf26d20075111";
+    hash = "sha256-VZRHpy0OTmoQyOEa0vIJl/VkV52r0HEtTzY1fjr6yQ0=";
+  };
+
+  pnpmDeps = pnpm_8.fetchDeps {
+    inherit (finalAttrs)
+      pname
+      version
+      src
+      pnpmWorkspaces
+      ;
+    fetcherVersion = 2;
+    hash = "sha256-wQ9dcqY7BVXc7wpsHlYNpc7utL1+MkdTCu77Wh8+QWc=";
+  };
+
+  pnpmWorkspaces = [ "coc-cmake" ];
+
+  nativeBuildInputs = [
+    nodejs
+    pnpm_8.configHook
+  ];
+
+  buildPhase = ''
+    runHook preBuild
+
+    pnpm run build coc-cmake
+
+    runHook postBuild
+  '';
+
+  installPhase = ''
+    runHook preInstall
+    mkdir -p $out/lib/node_modules
+    mv packages/coc-cmake $out/lib/node_modules/coc-cmake
+    mv node_modules/.pnpm/ $out/lib/node_modules/.pnpm
+    runHook postInstall
+  '';
+
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 5825fe0b683d..713e3d8c64c5 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -72,6 +72,7 @@ mapAliases {
   inherit (pkgs) cdktf-cli; # added 2025-10-02
   inherit (pkgs) clean-css-cli; # added 2023-08-18
   inherit (pkgs) coc-clangd; # added 2024-06-29
+  inherit (pkgs) coc-cmake; # Added 2025-11-05
   inherit (pkgs) coc-css; # added 2024-06-29
   inherit (pkgs) coc-diagnostic; # added 2024-06-29
   inherit (pkgs) coc-docker; # added 2025-10-01
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index ccdb654c4503..6ef2af231cc8 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -21,7 +21,6 @@
 , "browser-sync"
 , "cdk8s-cli"
 , "clipboard-cli"
-, "coc-cmake"
 , "coc-emmet"
 , "coc-eslint"
 , "coc-flutter"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index a5953db51ca9..97c0d10608dc 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37670,24 +37670,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-cmake = nodeEnv.buildNodePackage {
-    name = "coc-cmake";
-    packageName = "coc-cmake";
-    version = "0.2.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-cmake/-/coc-cmake-0.2.2.tgz";
-      sha512 = "CfZzfacIlFZqG5fjXDHiAu3ucy5YkhuW3+pv5iIGakChSuWoNYenG1LPDG7DEtlLRtFjfAkUbE7StcpMTUiaDw==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "coc.nvim extension for cmake language";
-      homepage = "https://github.com/voldikss/coc-cmake#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-emmet = nodeEnv.buildNodePackage {
     name = "coc-emmet";
     packageName = "coc-emmet";

From f66077b5a85046bb7ed0f938e3be0981e3d7e8a2 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 16:28:31 -0500
Subject: [PATCH 5968/6226] coc-emmet: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 +++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-emmet/package.nix         | 45 +++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 50 -------------------
 6 files changed, 52 insertions(+), 52 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-emmet/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index d9cc90058d09..8fdc7d5fbb32 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -6,6 +6,7 @@
   coc-css,
   coc-diagnostic,
   coc-docker,
+  coc-emmet,
   coc-explorer,
   coc-git,
   coc-pyright,
@@ -44,6 +45,11 @@ final: prev: {
     src = "${coc-docker}/lib/node_modules/coc-docker";
   };
 
+  coc-emmet = buildVimPlugin {
+    inherit (coc-emmet) pname version meta;
+    src = "${coc-emmet}/lib/node_modules/coc-emmet";
+  };
+
   coc-explorer = buildVimPlugin {
     inherit (coc-explorer) pname version meta;
     src = "${coc-explorer}/lib/node_modules/coc-explorer";
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index d13078156e7b..355e0a6d30f2 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -6,7 +6,6 @@
 final: prev:
 let
   nodePackageNames = [
-    "coc-emmet"
     "coc-eslint"
     "coc-flutter"
     "coc-go"
diff --git a/pkgs/by-name/co/coc-emmet/package.nix b/pkgs/by-name/co/coc-emmet/package.nix
new file mode 100644
index 000000000000..78b43c0d3196
--- /dev/null
+++ b/pkgs/by-name/co/coc-emmet/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-emmet";
+  version = "1.1.6";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-emmet";
+    tag = finalAttrs.version;
+    hash = "sha256-0f9wSn7W+8Pxce7hbdfNpL33oykuVGNifNnSPPdhKb8=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-8oo/XG9WxgKIbhfBWiGry+SZJdQIFe/T5i9S0hgjmp0=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+  ];
+
+  NODE_OPTIONS = "--openssl-legacy-provider";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Emmet extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-emmet";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 713e3d8c64c5..a0bbb78b1c31 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -76,6 +76,7 @@ mapAliases {
   inherit (pkgs) coc-css; # added 2024-06-29
   inherit (pkgs) coc-diagnostic; # added 2024-06-29
   inherit (pkgs) coc-docker; # added 2025-10-01
+  inherit (pkgs) coc-emmet; # Added 2025-11-05
   inherit (pkgs) coc-explorer; # added 2025-10-01
   inherit (pkgs) coc-git; # added 2025-10-01
   coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 6ef2af231cc8..288f743b0067 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -21,7 +21,6 @@
 , "browser-sync"
 , "cdk8s-cli"
 , "clipboard-cli"
-, "coc-emmet"
 , "coc-eslint"
 , "coc-flutter"
 , "coc-go"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 97c0d10608dc..cb4a041ab17e 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -914,15 +914,6 @@ let
         sha512 = "YfASnrhJ+ve6Q43ZiDwmpBgYgi2u0bYjeAVi2tDfN7YWAKO8X9EEOuPGtqbJpPLM6TfAHimghICjWe2eaJ8BAg==";
       };
     };
-    "@emmetio/extract-abbreviation-0.1.6" = {
-      name = "_at_emmetio_slash_extract-abbreviation";
-      packageName = "@emmetio/extract-abbreviation";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@emmetio/extract-abbreviation/-/extract-abbreviation-0.1.6.tgz";
-        sha512 = "Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw==";
-      };
-    };
     "@eslint-community/eslint-utils-4.5.1" = {
       name = "_at_eslint-community_slash_eslint-utils";
       packageName = "@eslint-community/eslint-utils";
@@ -17943,15 +17934,6 @@ let
         sha512 = "XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==";
       };
     };
-    "jsonc-parser-1.0.3" = {
-      name = "jsonc-parser";
-      packageName = "jsonc-parser";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-1.0.3.tgz";
-        sha512 = "hk/69oAeaIzchq/v3lS50PXuzn5O2ynldopMC+SWBql7J2WtdptfB9dy8Y7+Og5rPkTCpn83zTiO8FMcqlXJ/g==";
-      };
-    };
     "jsonc-parser-2.2.1" = {
       name = "jsonc-parser";
       packageName = "jsonc-parser";
@@ -32516,15 +32498,6 @@ let
         sha512 = "2ham8XPWTONajOR0ohOKOHXkm3+gaBmGut3SRuu75xLd/RRaY6vqgh8NBYYk7+RW3u5AtzPQZG8F10LHkl0lAQ==";
       };
     };
-    "vscode-emmet-helper-1.2.17" = {
-      name = "vscode-emmet-helper";
-      packageName = "vscode-emmet-helper";
-      version = "1.2.17";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-1.2.17.tgz";
-        sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow==";
-      };
-    };
     "vscode-json-languageservice-4.2.1" = {
       name = "vscode-json-languageservice";
       packageName = "vscode-json-languageservice";
@@ -37670,29 +37643,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-emmet = nodeEnv.buildNodePackage {
-    name = "coc-emmet";
-    packageName = "coc-emmet";
-    version = "1.1.6";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-emmet/-/coc-emmet-1.1.6.tgz";
-      sha512 = "lvHA9iSgU/46Iw7E14tSP+Hh1e6STYUegqTBGDPQ/9L9JOicE2USqwuo2y5cbslc2RQqv3EdUIr9nQf0T725mQ==";
-    };
-    dependencies = [
-      sources."@emmetio/extract-abbreviation-0.1.6"
-      sources."jsonc-parser-1.0.3"
-      sources."vscode-emmet-helper-1.2.17"
-      sources."vscode-languageserver-types-3.17.5"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "emmet extension for coc";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-eslint = nodeEnv.buildNodePackage {
     name = "coc-eslint";
     packageName = "coc-eslint";

From 6667711e2c0c903f96064f16ba0c072809f75ec6 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 16:29:45 -0500
Subject: [PATCH 5969/6226] coc-eslint: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 ++++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-eslint/package.nix        | 29 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 18 ------------
 6 files changed, 36 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-eslint/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index 8fdc7d5fbb32..386ca166259c 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -7,6 +7,7 @@
   coc-diagnostic,
   coc-docker,
   coc-emmet,
+  coc-eslint,
   coc-explorer,
   coc-git,
   coc-pyright,
@@ -50,6 +51,11 @@ final: prev: {
     src = "${coc-emmet}/lib/node_modules/coc-emmet";
   };
 
+  coc-eslint = buildVimPlugin {
+    inherit (coc-eslint) pname version meta;
+    src = "${coc-eslint}/lib/node_modules/coc-eslint";
+  };
+
   coc-explorer = buildVimPlugin {
     inherit (coc-explorer) pname version meta;
     src = "${coc-explorer}/lib/node_modules/coc-explorer";
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index 355e0a6d30f2..2aa9373bf7be 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -6,7 +6,6 @@
 final: prev:
 let
   nodePackageNames = [
-    "coc-eslint"
     "coc-flutter"
     "coc-go"
     "coc-haxe"
diff --git a/pkgs/by-name/co/coc-eslint/package.nix b/pkgs/by-name/co/coc-eslint/package.nix
new file mode 100644
index 000000000000..c6380b7cf82e
--- /dev/null
+++ b/pkgs/by-name/co/coc-eslint/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "coc-eslint";
+  version = "3.0.15";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-eslint";
+    tag = finalAttrs.version;
+    hash = "sha256-41mUQpiFzBWMRoK7aQu0Gu4FBsYZdHbHPzrSMZR6RLQ=";
+  };
+
+  npmDepsHash = "sha256-g5gLAtBmwsHBCDHPfcVPETH7+djh0piJ6nJYSsy9GJQ=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Eslint extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-eslint";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index a0bbb78b1c31..fc4ddcf9e584 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -77,6 +77,7 @@ mapAliases {
   inherit (pkgs) coc-diagnostic; # added 2024-06-29
   inherit (pkgs) coc-docker; # added 2025-10-01
   inherit (pkgs) coc-emmet; # Added 2025-11-05
+  inherit (pkgs) coc-eslint; # Added 2025-11-05;
   inherit (pkgs) coc-explorer; # added 2025-10-01
   inherit (pkgs) coc-git; # added 2025-10-01
   coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 288f743b0067..a49371e2cbed 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -21,7 +21,6 @@
 , "browser-sync"
 , "cdk8s-cli"
 , "clipboard-cli"
-, "coc-eslint"
 , "coc-flutter"
 , "coc-go"
 , "coc-haxe"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index cb4a041ab17e..f58b8c1d4c14 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37643,24 +37643,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-eslint = nodeEnv.buildNodePackage {
-    name = "coc-eslint";
-    packageName = "coc-eslint";
-    version = "1.7.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-eslint/-/coc-eslint-1.7.0.tgz";
-      sha512 = "NCL4qXmj9CClh9E87BagmHx4wLmKL7OzK0eLBZMovXphG5woHKPLwMfDOfoNEthloE4G3bG3TzoMsQIwhKvayA==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Eslint extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-eslint#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-flutter = nodeEnv.buildNodePackage {
     name = "coc-flutter";
     packageName = "coc-flutter";

From 57a98fb2839429ba0330dd465395058e9ed81a68 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 16:30:59 -0500
Subject: [PATCH 5970/6226] coc-flutter: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 ++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-flutter/package.nix       | 72 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 17 -----
 6 files changed, 79 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-flutter/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index 386ca166259c..4d8d6d752d1b 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -9,6 +9,7 @@
   coc-emmet,
   coc-eslint,
   coc-explorer,
+  coc-flutter,
   coc-git,
   coc-pyright,
   coc-sh,
@@ -61,6 +62,11 @@ final: prev: {
     src = "${coc-explorer}/lib/node_modules/coc-explorer";
   };
 
+  coc-flutter = buildVimPlugin {
+    inherit (coc-flutter) pname version meta;
+    src = "${coc-flutter}/lib/node_modules/coc-flutter";
+  };
+
   coc-git = buildVimPlugin {
     inherit (coc-git) pname version meta;
     src = "${coc-git}/lib/node_modules/coc-git";
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index 2aa9373bf7be..be6d66429ff2 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -6,7 +6,6 @@
 final: prev:
 let
   nodePackageNames = [
-    "coc-flutter"
     "coc-go"
     "coc-haxe"
     "coc-highlight"
diff --git a/pkgs/by-name/co/coc-flutter/package.nix b/pkgs/by-name/co/coc-flutter/package.nix
new file mode 100644
index 000000000000..e720ed66bc48
--- /dev/null
+++ b/pkgs/by-name/co/coc-flutter/package.nix
@@ -0,0 +1,72 @@
+{
+  lib,
+  stdenv,
+  esbuild,
+  buildGoModule,
+  yarnBuildHook,
+  yarnInstallHook,
+  yarnConfigHook,
+  nodejs,
+  fetchYarnDeps,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+let
+  esbuild' =
+    let
+      version = "0.9.0";
+    in
+    esbuild.override {
+      buildGoModule =
+        args:
+        buildGoModule (
+          args
+          // {
+            inherit version;
+            src = fetchFromGitHub {
+              owner = "evanw";
+              repo = "esbuild";
+              rev = "v${version}";
+              hash = "sha256-+4oNM39cN7zCld4WwLVDHQFyvVhdsqKTLLiF2a9+KP0=";
+            };
+            vendorHash = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";
+          }
+        );
+    };
+in
+
+stdenv.mkDerivation (finalAttrs: {
+  pname = "coc-flutter";
+  version = "0-unstable-2023-03-22";
+
+  src = fetchFromGitHub {
+    owner = "iamcco";
+    repo = "coc-flutter";
+    rev = "883c269eaacbeddbd4fb08e32e6a05051933429d";
+    hash = "sha256-K3NvqZnAEj/qfsvomYl7dPtEo3ad7w1dCfZHjMRwbAA=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-aEjfhjkMlHSdISfG9baRfaUiTUbj8TPZi2edAFiqKlg=";
+  };
+
+  nativeBuildInputs = [
+    yarnBuildHook
+    yarnConfigHook
+    yarnInstallHook
+    nodejs
+    esbuild'
+  ];
+
+  env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "Flutter support for (Neo)vim";
+    homepage = "https://github.com/iamcco/coc-flutter";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index fc4ddcf9e584..03ec60b68424 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -79,6 +79,7 @@ mapAliases {
   inherit (pkgs) coc-emmet; # Added 2025-11-05
   inherit (pkgs) coc-eslint; # Added 2025-11-05;
   inherit (pkgs) coc-explorer; # added 2025-10-01
+  inherit (pkgs) coc-flutter; # Added 2025-11-05
   inherit (pkgs) coc-git; # added 2025-10-01
   coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
   inherit (pkgs) coc-pyright; # added 2024-07-14
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index a49371e2cbed..099817681e41 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -21,7 +21,6 @@
 , "browser-sync"
 , "cdk8s-cli"
 , "clipboard-cli"
-, "coc-flutter"
 , "coc-go"
 , "coc-haxe"
 , "coc-highlight"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index f58b8c1d4c14..745982865423 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37643,23 +37643,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-flutter = nodeEnv.buildNodePackage {
-    name = "coc-flutter";
-    packageName = "coc-flutter";
-    version = "1.9.10";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-flutter/-/coc-flutter-1.9.10.tgz";
-      sha512 = "Of3V4dn76ZdBp0ZjUq0c600Z1IMzT9k6574a7V/pnxMIb1gYP8+MgDqO1Mw/YzNTU/ovXQLb2zGJm6UnJhgQ3g==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "flutter support for (Neo)vim";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-go = nodeEnv.buildNodePackage {
     name = "coc-go";
     packageName = "coc-go";

From 9ec68a08a425c0a56de07bd711d41235ba44f4fc Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 16:32:07 -0500
Subject: [PATCH 5971/6226] coc-haxe: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 ++++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-haxe/package.nix          | 31 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 18 -----------
 6 files changed, 38 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-haxe/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index 4d8d6d752d1b..779c2f122198 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -11,6 +11,7 @@
   coc-explorer,
   coc-flutter,
   coc-git,
+  coc-haxe,
   coc-pyright,
   coc-sh,
   coc-spell-checker,
@@ -72,6 +73,11 @@ final: prev: {
     src = "${coc-git}/lib/node_modules/coc-git";
   };
 
+  coc-haxe = buildVimPlugin {
+    inherit (coc-haxe) pname version meta;
+    src = "${coc-haxe}/lib/node_modules/coc-haxe";
+  };
+
   coc-pyright = buildVimPlugin {
     pname = "coc-pyright";
     inherit (coc-pyright) version meta;
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index be6d66429ff2..ef789c87c9ee 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -7,7 +7,6 @@ final: prev:
 let
   nodePackageNames = [
     "coc-go"
-    "coc-haxe"
     "coc-highlight"
     "coc-html"
     "coc-java"
diff --git a/pkgs/by-name/co/coc-haxe/package.nix b/pkgs/by-name/co/coc-haxe/package.nix
new file mode 100644
index 000000000000..ba184cbf75fe
--- /dev/null
+++ b/pkgs/by-name/co/coc-haxe/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "coc-haxe";
+  version = "0.21.1";
+
+  src = fetchFromGitHub {
+    owner = "vantreeseba";
+    repo = "coc-haxe";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-iveWhxkrX8EaBfh8IwKrTLw1AiGBmNva9G0p3rMwOi8=";
+  };
+
+  npmDepsHash = "sha256-1RrhUyICnYDM9qC9dEZLDPQdsFqcu8Nn/enfm+PgM00=";
+
+  npmBuildScript = "prepare";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Haxe language server extension for coc.nvim";
+    homepage = "https://github.com/vantreeseba/coc-haxe";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 03ec60b68424..f58b18ef74cd 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -81,6 +81,7 @@ mapAliases {
   inherit (pkgs) coc-explorer; # added 2025-10-01
   inherit (pkgs) coc-flutter; # Added 2025-11-05
   inherit (pkgs) coc-git; # added 2025-10-01
+  inherit (pkgs) coc-haxe; # Added 2025-11-05
   coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
   inherit (pkgs) coc-pyright; # added 2024-07-14
   coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 099817681e41..d62643d581f3 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -22,7 +22,6 @@
 , "cdk8s-cli"
 , "clipboard-cli"
 , "coc-go"
-, "coc-haxe"
 , "coc-highlight"
 , "coc-html"
 , "coc-java"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 745982865423..f3018c07041c 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37668,24 +37668,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-haxe = nodeEnv.buildNodePackage {
-    name = "coc-haxe";
-    packageName = "coc-haxe";
-    version = "0.21.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-haxe/-/coc-haxe-0.21.1.tgz";
-      sha512 = "oz4kKSH/rw3pk/T3Ecro2qDpG4nt64BuyKyJkiETEIf2HMgbmYzFdz6e8TklobclQTbOic903+3azwze95BVsQ==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Haxe language server extension for coc.nvim";
-      homepage = "https://github.com/vantreeseba/coc-haxe#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-highlight = nodeEnv.buildNodePackage {
     name = "coc-highlight";
     packageName = "coc-highlight";

From 8c72d3555bfebe44fb482a0dad9b14c72e2ffd62 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 16:34:22 -0500
Subject: [PATCH 5972/6226] coc-highlight: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 +++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-highlight/package.nix     | 45 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 17 -------
 6 files changed, 52 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-highlight/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index 779c2f122198..ad047a6edec0 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -12,6 +12,7 @@
   coc-flutter,
   coc-git,
   coc-haxe,
+  coc-highlight,
   coc-pyright,
   coc-sh,
   coc-spell-checker,
@@ -78,6 +79,11 @@ final: prev: {
     src = "${coc-haxe}/lib/node_modules/coc-haxe";
   };
 
+  coc-highlight = buildVimPlugin {
+    inherit (coc-highlight) pname version meta;
+    src = "${coc-highlight}/lib/node_modules/coc-highlight";
+  };
+
   coc-pyright = buildVimPlugin {
     pname = "coc-pyright";
     inherit (coc-pyright) version meta;
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index ef789c87c9ee..5ea1f4f27b5d 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -7,7 +7,6 @@ final: prev:
 let
   nodePackageNames = [
     "coc-go"
-    "coc-highlight"
     "coc-html"
     "coc-java"
     "coc-jest"
diff --git a/pkgs/by-name/co/coc-highlight/package.nix b/pkgs/by-name/co/coc-highlight/package.nix
new file mode 100644
index 000000000000..1e013743718e
--- /dev/null
+++ b/pkgs/by-name/co/coc-highlight/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-highlight";
+  version = "2.0.4";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-highlight";
+    tag = finalAttrs.version;
+    hash = "sha256-VksCqyB8b3Bk2BsnYFr6cJINqUzVY+px3TCiWzqFTzE=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-z9pJXGdUXNU8Bfhp7PUPZk7rCCAhnQpcmXUoHUaFAIU=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+  ];
+
+  yarnBuildScript = "prepare";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Highlight extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-highlight";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index f58b18ef74cd..79a20cc46c01 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -82,6 +82,7 @@ mapAliases {
   inherit (pkgs) coc-flutter; # Added 2025-11-05
   inherit (pkgs) coc-git; # added 2025-10-01
   inherit (pkgs) coc-haxe; # Added 2025-11-05
+  inherit (pkgs) coc-highlight; # Added 2025-11-05
   coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
   inherit (pkgs) coc-pyright; # added 2024-07-14
   coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index d62643d581f3..e2c788b4009c 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -22,7 +22,6 @@
 , "cdk8s-cli"
 , "clipboard-cli"
 , "coc-go"
-, "coc-highlight"
 , "coc-html"
 , "coc-java"
 , "coc-jest"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index f3018c07041c..944468075c9b 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37668,23 +37668,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-highlight = nodeEnv.buildNodePackage {
-    name = "coc-highlight";
-    packageName = "coc-highlight";
-    version = "2.0.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-highlight/-/coc-highlight-2.0.4.tgz";
-      sha512 = "X6VGCqpDML0oRcyH77ANoQ0BAxEsQqVMB9OPbfXB/nSdN3xcO8+M1hNSJm4pBekvywxm6VQUsh/zFD4V55nxLw==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Highlight extension for coc.nvim";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-html = nodeEnv.buildNodePackage {
     name = "coc-html";
     packageName = "coc-html";

From 5028d9b6441991f24988e6439cf8f2f06b648ae3 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 16:35:32 -0500
Subject: [PATCH 5973/6226] coc-html: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 +++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-html/package.nix          | 43 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 21 ---------
 6 files changed, 50 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-html/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index ad047a6edec0..72041c1658a5 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -13,6 +13,7 @@
   coc-git,
   coc-haxe,
   coc-highlight,
+  coc-html,
   coc-pyright,
   coc-sh,
   coc-spell-checker,
@@ -84,6 +85,11 @@ final: prev: {
     src = "${coc-highlight}/lib/node_modules/coc-highlight";
   };
 
+  coc-html = buildVimPlugin {
+    inherit (coc-html) pname version meta;
+    src = "${coc-html}/lib/node_modules/coc-html";
+  };
+
   coc-pyright = buildVimPlugin {
     pname = "coc-pyright";
     inherit (coc-pyright) version meta;
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index 5ea1f4f27b5d..9c0072aadb14 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -7,7 +7,6 @@ final: prev:
 let
   nodePackageNames = [
     "coc-go"
-    "coc-html"
     "coc-java"
     "coc-jest"
     "coc-json"
diff --git a/pkgs/by-name/co/coc-html/package.nix b/pkgs/by-name/co/coc-html/package.nix
new file mode 100644
index 000000000000..b1cb3dc0b246
--- /dev/null
+++ b/pkgs/by-name/co/coc-html/package.nix
@@ -0,0 +1,43 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-html";
+  version = "1.8.0";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-html";
+    tag = finalAttrs.version;
+    hash = "sha256-dMjkG/djycRhRPIMCQ1PYvfXVxlWHtcNjouW+bCm59I=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-hb8H7tI4OouLBTwuSx3UVw7I52HTYxOFkAVJGaIKHzI=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Html language server extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-html";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 79a20cc46c01..f3e7213e750c 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -83,6 +83,7 @@ mapAliases {
   inherit (pkgs) coc-git; # added 2025-10-01
   inherit (pkgs) coc-haxe; # Added 2025-11-05
   inherit (pkgs) coc-highlight; # Added 2025-11-05
+  inherit (pkgs) coc-html; # Added 2025-11-05
   coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
   inherit (pkgs) coc-pyright; # added 2024-07-14
   coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index e2c788b4009c..23b4797648c1 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -22,7 +22,6 @@
 , "cdk8s-cli"
 , "clipboard-cli"
 , "coc-go"
-, "coc-html"
 , "coc-java"
 , "coc-jest"
 , "coc-json"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 944468075c9b..a17628a0d3b0 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37668,27 +37668,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-html = nodeEnv.buildNodePackage {
-    name = "coc-html";
-    packageName = "coc-html";
-    version = "1.8.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-html/-/coc-html-1.8.0.tgz";
-      sha512 = "NXmTfHF/TxysUeSstDyLUcfv6LlK08PnltVZCe1J7XpG/QHRRq0sjhkNqkHJVfFT/Vo2NC4lv5Bc9UIWdjGGuw==";
-    };
-    dependencies = [
-      sources."typescript-4.9.5"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Html extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-html#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-java = nodeEnv.buildNodePackage {
     name = "coc-java";
     packageName = "coc-java";

From 2e191e2b1a51fb55c816e01261b4460fbcbb749b Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 16:37:07 -0500
Subject: [PATCH 5974/6226] coc-java: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 ++++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-java/package.nix          | 29 ++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 34 -------------------
 6 files changed, 36 insertions(+), 36 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-java/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index 72041c1658a5..10e1e691cec4 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -14,6 +14,7 @@
   coc-haxe,
   coc-highlight,
   coc-html,
+  coc-java,
   coc-pyright,
   coc-sh,
   coc-spell-checker,
@@ -90,6 +91,11 @@ final: prev: {
     src = "${coc-html}/lib/node_modules/coc-html";
   };
 
+  coc-java = buildVimPlugin {
+    inherit (coc-java) pname version meta;
+    src = "${coc-java}/lib/node_modules/coc-java";
+  };
+
   coc-pyright = buildVimPlugin {
     pname = "coc-pyright";
     inherit (coc-pyright) version meta;
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index 9c0072aadb14..b1ec84635187 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -7,7 +7,6 @@ final: prev:
 let
   nodePackageNames = [
     "coc-go"
-    "coc-java"
     "coc-jest"
     "coc-json"
     "coc-lists"
diff --git a/pkgs/by-name/co/coc-java/package.nix b/pkgs/by-name/co/coc-java/package.nix
new file mode 100644
index 000000000000..ff4341114e2e
--- /dev/null
+++ b/pkgs/by-name/co/coc-java/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "coc-java";
+  version = "1.26.1";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-java";
+    tag = finalAttrs.version;
+    hash = "sha256-OKqZk1pt8qt6O+kHYdhAAha5S8YTJBFQPn7oIrjGZgI=";
+  };
+
+  npmDepsHash = "sha256-FF7EAf6SvO1sGMIE8FCS7MbnpVwVUwVg0SVUsX+i7zg=";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Java extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-java";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index f3e7213e750c..9d0b168ef9d7 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -85,6 +85,7 @@ mapAliases {
   inherit (pkgs) coc-highlight; # Added 2025-11-05
   inherit (pkgs) coc-html; # Added 2025-11-05
   coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
+  inherit (pkgs) coc-java; # Added 2025-11-05
   inherit (pkgs) coc-pyright; # added 2024-07-14
   coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16
   coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 23b4797648c1..a20a619a2d51 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -22,7 +22,6 @@
 , "cdk8s-cli"
 , "clipboard-cli"
 , "coc-go"
-, "coc-java"
 , "coc-jest"
 , "coc-json"
 , "coc-lists"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index a17628a0d3b0..7b2011931045 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37668,40 +37668,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-java = nodeEnv.buildNodePackage {
-    name = "coc-java";
-    packageName = "coc-java";
-    version = "1.26.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-java/-/coc-java-1.26.1.tgz";
-      sha512 = "1hKYhoTtfhVV+tEo/hdWnDMEMMZxSI++wzku/uVPkdqKa69RPUKpSbytFoNoAJYh+Ad2gPOGJWMF7NDJApbkUA==";
-    };
-    dependencies = [
-      sources."anymatch-3.1.3"
-      sources."binary-extensions-2.3.0"
-      sources."braces-3.0.3"
-      sources."chokidar-3.6.0"
-      sources."fill-range-7.1.1"
-      sources."glob-parent-5.1.2"
-      sources."is-binary-path-2.1.0"
-      sources."is-extglob-2.1.1"
-      sources."is-glob-4.0.3"
-      sources."is-number-7.0.0"
-      sources."normalize-path-3.0.0"
-      sources."picomatch-2.3.1"
-      sources."readdirp-3.6.0"
-      sources."to-regex-range-5.0.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Java language extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-java#readme";
-      license = "EPL-1.0";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-jest = nodeEnv.buildNodePackage {
     name = "coc-jest";
     packageName = "coc-jest";

From e1e09af914c0d2676cce14f780be55a4474b19d1 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 16:38:10 -0500
Subject: [PATCH 5975/6226] coc-jest: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 ++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 .../co/coc-jest/package-lock-fix.patch        | 61 +++++++++++++++++++
 pkgs/by-name/co/coc-jest/package.nix          | 34 +++++++++++
 pkgs/by-name/co/coc-jest/update.sh            | 20 ++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 18 ------
 8 files changed, 122 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-jest/package-lock-fix.patch
 create mode 100644 pkgs/by-name/co/coc-jest/package.nix
 create mode 100755 pkgs/by-name/co/coc-jest/update.sh

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index 10e1e691cec4..c6e9119d56aa 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -15,6 +15,7 @@
   coc-highlight,
   coc-html,
   coc-java,
+  coc-jest,
   coc-pyright,
   coc-sh,
   coc-spell-checker,
@@ -96,6 +97,11 @@ final: prev: {
     src = "${coc-java}/lib/node_modules/coc-java";
   };
 
+  coc-jest = buildVimPlugin {
+    inherit (coc-jest) pname version meta;
+    src = "${coc-jest}/lib/node_modules/coc-jest";
+  };
+
   coc-pyright = buildVimPlugin {
     pname = "coc-pyright";
     inherit (coc-pyright) version meta;
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index b1ec84635187..a3bddfcd4526 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -7,7 +7,6 @@ final: prev:
 let
   nodePackageNames = [
     "coc-go"
-    "coc-jest"
     "coc-json"
     "coc-lists"
     "coc-ltex"
diff --git a/pkgs/by-name/co/coc-jest/package-lock-fix.patch b/pkgs/by-name/co/coc-jest/package-lock-fix.patch
new file mode 100644
index 000000000000..2a00c3d4843f
--- /dev/null
+++ b/pkgs/by-name/co/coc-jest/package-lock-fix.patch
@@ -0,0 +1,61 @@
+diff --git i/package-lock.json w/package-lock.json
+index 9ffdc5f..1aac77b 100644
+--- i/package-lock.json
++++ w/package-lock.json
+@@ -23,6 +23,8 @@
+     },
+     "node_modules/@chemzqm/tsconfig": {
+       "version": "0.0.3",
++      "resolved": "https://registry.npmjs.org/@chemzqm/tsconfig/-/tsconfig-0.0.3.tgz",
++      "integrity": "sha512-MjF25vbqLYR+S+JJLgBi0vn4gZqv/C87H+yPSlVKEqlIJAJOGJOgFPUFvRS7pdRHqkv2flX/oRxzxhlu2V0X1w==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -453,16 +455,22 @@
+     },
+     "node_modules/@types/node": {
+       "version": "13.11.1",
++      "resolved": "https://registry.npmjs.org/@types/node/-/node-13.11.1.tgz",
++      "integrity": "sha512-eWQGP3qtxwL8FGneRrC5DwrJLGN4/dH1clNTuLfN81HCrxVtxRjygDTUoZJ5ASlDEeo0ppYFQjQIlXhtXpOn6g==",
+       "dev": true,
+       "license": "MIT"
+     },
+     "node_modules/@types/which": {
+       "version": "1.3.2",
++      "resolved": "https://registry.npmjs.org/@types/which/-/which-1.3.2.tgz",
++      "integrity": "sha512-8oDqyLC7eD4HM307boe2QWKyuzdzWBj56xI/imSl2cpL+U3tCMaTAkMJ4ee5JBZ/FsOJlvRGeIShiZDAl1qERA==",
+       "dev": true,
+       "license": "MIT"
+     },
+     "node_modules/coc.nvim": {
+       "version": "0.0.79-next.11",
++      "resolved": "https://registry.npmjs.org/coc.nvim/-/coc.nvim-0.0.79-next.11.tgz",
++      "integrity": "sha512-1AAP2N4dno8ee2Sn2EHcVhuyhz7GS+VosqBq1W18KGmN/Ht3ry1kNsX7rsTeM/qroadvjtsIC5kM2ke239AiJw==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -516,11 +524,15 @@
+     },
+     "node_modules/isexe": {
+       "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
++      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+       "dev": true,
+       "license": "ISC"
+     },
+     "node_modules/typescript": {
+       "version": "4.1.3",
++      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.1.3.tgz",
++      "integrity": "sha512-B3ZIOf1IKeH2ixgHhj6la6xdwR9QrLC5d1VKeCSY4tvkqhF2eqd9O7txNlS0PO3GrBAFIdr3L1ndNwteUbZLYg==",
+       "dev": true,
+       "license": "Apache-2.0",
+       "bin": {
+@@ -533,6 +545,8 @@
+     },
+     "node_modules/which": {
+       "version": "2.0.2",
++      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
++      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+       "dev": true,
+       "license": "ISC",
+       "dependencies": {
diff --git a/pkgs/by-name/co/coc-jest/package.nix b/pkgs/by-name/co/coc-jest/package.nix
new file mode 100644
index 000000000000..7880a4a69630
--- /dev/null
+++ b/pkgs/by-name/co/coc-jest/package.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage {
+  pname = "coc-jest";
+  version = "1.1.5-unstable-2025-04-19";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-jest";
+    rev = "0ce2cd21c535e0c6c86102bc4da95337cb29948b";
+    hash = "sha256-jEwQxZWyKh5tgdRD0f/jQ3q9B/fIGD9Pd8AYDsBj4LQ=";
+  };
+
+  patches = [
+    ./package-lock-fix.patch
+  ];
+
+  npmDepsHash = "sha256-4X6lmblZnAF+4ZmrWYwfigO90Ah7I+B4tbMpFrguxMU=";
+
+  npmBuildScript = "prepare";
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    description = "Jest extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-jest";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+}
diff --git a/pkgs/by-name/co/coc-jest/update.sh b/pkgs/by-name/co/coc-jest/update.sh
new file mode 100755
index 000000000000..22bf46d8400a
--- /dev/null
+++ b/pkgs/by-name/co/coc-jest/update.sh
@@ -0,0 +1,20 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash nodejs nix-update git
+
+WORKDIR=$(mktemp -d)
+PACKAGE_DIR="$(realpath "$(dirname "$0")")"
+
+# Clone source
+git clone "https://github.com/neoclide/coc-jest" "$WORKDIR/src"
+pushd "$WORKDIR/src"
+npx --yes npm-package-lock-add-resolved
+
+# Update package-lock patch
+git diff >"$PACKAGE_DIR/package-lock-fix.patch"
+popd
+
+# Run nix-update
+nix-update --version=branch "$UPDATE_NIX_PNAME"
+
+# Cleanup
+rm -rf "$WORKDIR"
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 9d0b168ef9d7..3b0c42cdd059 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -86,6 +86,7 @@ mapAliases {
   inherit (pkgs) coc-html; # Added 2025-11-05
   coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
   inherit (pkgs) coc-java; # Added 2025-11-05
+  inherit (pkgs) coc-jest; # Added 2025-11-05
   inherit (pkgs) coc-pyright; # added 2024-07-14
   coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16
   coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index a20a619a2d51..96d1bc4c23a7 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -22,7 +22,6 @@
 , "cdk8s-cli"
 , "clipboard-cli"
 , "coc-go"
-, "coc-jest"
 , "coc-json"
 , "coc-lists"
 , "coc-ltex"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 7b2011931045..f5262e7556af 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37668,24 +37668,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-jest = nodeEnv.buildNodePackage {
-    name = "coc-jest";
-    packageName = "coc-jest";
-    version = "1.1.5";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-jest/-/coc-jest-1.1.5.tgz";
-      sha512 = "H6j4hqmsF2b4hSfGQqaXeCahs3LnyYQc6vbtrSkuMQRdosh0gcZQx186kbxph8/5Mecw22Y9BGcsEaF2/RLEbw==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "jest extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-jest#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-json = nodeEnv.buildNodePackage {
     name = "coc-json";
     packageName = "coc-json";

From 63ff9dd0c3a786d77d155084c4c5d7d634d3e36d Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 16:39:27 -0500
Subject: [PATCH 5976/6226] coc-json: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 ++++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-json/package.nix          | 31 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 17 ----------
 6 files changed, 38 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-json/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index c6e9119d56aa..b0f88bbd7850 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -16,6 +16,7 @@
   coc-html,
   coc-java,
   coc-jest,
+  coc-json,
   coc-pyright,
   coc-sh,
   coc-spell-checker,
@@ -102,6 +103,11 @@ final: prev: {
     src = "${coc-jest}/lib/node_modules/coc-jest";
   };
 
+  coc-json = buildVimPlugin {
+    inherit (coc-json) pname version meta;
+    src = "${coc-json}/lib/node_modules/coc-json";
+  };
+
   coc-pyright = buildVimPlugin {
     pname = "coc-pyright";
     inherit (coc-pyright) version meta;
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index a3bddfcd4526..44e08184f477 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -7,7 +7,6 @@ final: prev:
 let
   nodePackageNames = [
     "coc-go"
-    "coc-json"
     "coc-lists"
     "coc-ltex"
     "coc-markdownlint"
diff --git a/pkgs/by-name/co/coc-json/package.nix b/pkgs/by-name/co/coc-json/package.nix
new file mode 100644
index 000000000000..bf70392609dc
--- /dev/null
+++ b/pkgs/by-name/co/coc-json/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "coc-json";
+  version = "1.9.3";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-json";
+    tag = finalAttrs.version;
+    hash = "sha256-iYGhjU9qaRh7Jlc/LLbZIvfPsJR+2FMy2L3weVn2rFA=";
+  };
+
+  npmDepsHash = "sha256-ois2uyIrF8dRgSGt5NhjYoWw8OqFPRmlG5y952boj1Y=";
+
+  npmBuildScript = "prepare";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "JSON language extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-json";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 3b0c42cdd059..4a680a70d5e1 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -87,6 +87,7 @@ mapAliases {
   coc-imselect = throw "coc-imselect was removed because it was broken"; # added 2023-08-21
   inherit (pkgs) coc-java; # Added 2025-11-05
   inherit (pkgs) coc-jest; # Added 2025-11-05
+  inherit (pkgs) coc-json; # Added 2025-11-05
   inherit (pkgs) coc-pyright; # added 2024-07-14
   coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16
   coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 96d1bc4c23a7..3682f594070e 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -22,7 +22,6 @@
 , "cdk8s-cli"
 , "clipboard-cli"
 , "coc-go"
-, "coc-json"
 , "coc-lists"
 , "coc-ltex"
 , "coc-markdownlint"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index f5262e7556af..93083935ccef 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37668,23 +37668,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-json = nodeEnv.buildNodePackage {
-    name = "coc-json";
-    packageName = "coc-json";
-    version = "1.9.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-json/-/coc-json-1.9.2.tgz";
-      sha512 = "6fflZTS2d8bJFKXGBIb9uGSkB8tRa+VIcSvX6GAxKRyiz4ft4116c6MGG9bPh+qe7Gwe/+FomBMW7gB08GEjTQ==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Json extension for coc.nvim";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-lists = nodeEnv.buildNodePackage {
     name = "coc-lists";
     packageName = "coc-lists";

From d43cfa79ee8eee752f83f9dfdf9901383a2f00b5 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 16:40:39 -0500
Subject: [PATCH 5977/6226] coc-lists: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 ++++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-lists/package.nix         | 31 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 18 -----------
 6 files changed, 38 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-lists/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index b0f88bbd7850..fa99da464469 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -17,6 +17,7 @@
   coc-java,
   coc-jest,
   coc-json,
+  coc-lists,
   coc-pyright,
   coc-sh,
   coc-spell-checker,
@@ -108,6 +109,11 @@ final: prev: {
     src = "${coc-json}/lib/node_modules/coc-json";
   };
 
+  coc-lists = buildVimPlugin {
+    inherit (coc-lists) pname version meta;
+    src = "${coc-lists}/lib/node_modules/coc-lists";
+  };
+
   coc-pyright = buildVimPlugin {
     pname = "coc-pyright";
     inherit (coc-pyright) version meta;
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index 44e08184f477..b3bb3da2a910 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -7,7 +7,6 @@ final: prev:
 let
   nodePackageNames = [
     "coc-go"
-    "coc-lists"
     "coc-ltex"
     "coc-markdownlint"
     "coc-pairs"
diff --git a/pkgs/by-name/co/coc-lists/package.nix b/pkgs/by-name/co/coc-lists/package.nix
new file mode 100644
index 000000000000..18ebcc1978be
--- /dev/null
+++ b/pkgs/by-name/co/coc-lists/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "coc-lists";
+  version = "1.5.4";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-lists";
+    tag = finalAttrs.version;
+    hash = "sha256-jt7JnGRXGgG+tbk0GySZeVAlOeTL/pX6+6WK3Qv6mYg=";
+  };
+
+  npmDepsHash = "sha256-9GndvIt7kQwT/wcS0qmeB0aIRNI/8UoW5b1JfoVAfn0=";
+
+  npmBuildScript = "prepare";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Common lists for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-lists";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 4a680a70d5e1..4231679060ba 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -88,6 +88,7 @@ mapAliases {
   inherit (pkgs) coc-java; # Added 2025-11-05
   inherit (pkgs) coc-jest; # Added 2025-11-05
   inherit (pkgs) coc-json; # Added 2025-11-05
+  inherit (pkgs) coc-lists; # Added 2025-11-05
   inherit (pkgs) coc-pyright; # added 2024-07-14
   coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16
   coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 3682f594070e..94d523381210 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -22,7 +22,6 @@
 , "cdk8s-cli"
 , "clipboard-cli"
 , "coc-go"
-, "coc-lists"
 , "coc-ltex"
 , "coc-markdownlint"
 , "coc-pairs"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 93083935ccef..a362d8cf60e1 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37668,24 +37668,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-lists = nodeEnv.buildNodePackage {
-    name = "coc-lists";
-    packageName = "coc-lists";
-    version = "1.5.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.5.4.tgz";
-      sha512 = "RROel79iUEzY3ICwqLIfWkftdA95mlluSa933CxfxvZxQiPcnlSd9XWGc770RZOEv6R5TCihht2LRt0Lj1PrGQ==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Basic list sources for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-lists#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-ltex = nodeEnv.buildNodePackage {
     name = "coc-ltex";
     packageName = "coc-ltex";

From 6c67d0ee2dc62806500de7a4582e423175342250 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 16:41:49 -0500
Subject: [PATCH 5978/6226] coc-markdownlint: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 ++++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-markdownlint/package.nix  | 29 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  3 +-
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 18 ------------
 6 files changed, 37 insertions(+), 21 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-markdownlint/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index fa99da464469..e0c47aebbed7 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -18,6 +18,7 @@
   coc-jest,
   coc-json,
   coc-lists,
+  coc-markdownlint,
   coc-pyright,
   coc-sh,
   coc-spell-checker,
@@ -114,6 +115,11 @@ final: prev: {
     src = "${coc-lists}/lib/node_modules/coc-lists";
   };
 
+  coc-markdownlint = buildVimPlugin {
+    inherit (coc-markdownlint) pname version meta;
+    src = "${coc-markdownlint}/lib/node_modules/coc-markdownlint";
+  };
+
   coc-pyright = buildVimPlugin {
     pname = "coc-pyright";
     inherit (coc-pyright) version meta;
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index b3bb3da2a910..24a47936201d 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -8,7 +8,6 @@ let
   nodePackageNames = [
     "coc-go"
     "coc-ltex"
-    "coc-markdownlint"
     "coc-pairs"
     "coc-prettier"
     "coc-r-lsp"
diff --git a/pkgs/by-name/co/coc-markdownlint/package.nix b/pkgs/by-name/co/coc-markdownlint/package.nix
new file mode 100644
index 000000000000..94ebe58feec0
--- /dev/null
+++ b/pkgs/by-name/co/coc-markdownlint/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage {
+  pname = "coc-markdownlint";
+  version = "0-unstable-2025-11-01";
+
+  src = fetchFromGitHub {
+    owner = "fannheyward";
+    repo = "coc-markdownlint";
+    rev = "4e507d516ccb0e0287c95d909db85676d786e9bd";
+    hash = "sha256-fNUmrwjCiMYZHXkI4RPn4BMRxiWW+BoVEvaSMIsEMeQ=";
+  };
+
+  npmDepsHash = "sha256-JMXeWQZMYkhUqE5DdYBRRhyHDAqr9VkKATRQE6eOGys=";
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "Markdownlint extension for coc.nvim";
+    homepage = "https://github.com/fannheyward/coc-markdownlint";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+}
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 4231679060ba..b9ad6ef8e292 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -89,8 +89,9 @@ mapAliases {
   inherit (pkgs) coc-jest; # Added 2025-11-05
   inherit (pkgs) coc-json; # Added 2025-11-05
   inherit (pkgs) coc-lists; # Added 2025-11-05
-  inherit (pkgs) coc-pyright; # added 2024-07-14
+  inherit (pkgs) coc-markdownlint; # Added 2025-11-05
   coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16
+  inherit (pkgs) coc-pyright; # added 2024-07-14
   coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15
   coc-rls = throw "coc-rls was removed because rls was deprecated in 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01
   inherit (pkgs) coc-sh; # added 2025-10-02
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 94d523381210..8e058c6ef2c1 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -23,7 +23,6 @@
 , "clipboard-cli"
 , "coc-go"
 , "coc-ltex"
-, "coc-markdownlint"
 , "coc-pairs"
 , "coc-prettier"
 , "coc-r-lsp"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index a362d8cf60e1..444e0518d246 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37686,24 +37686,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-markdownlint = nodeEnv.buildNodePackage {
-    name = "coc-markdownlint";
-    packageName = "coc-markdownlint";
-    version = "1.36.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-markdownlint/-/coc-markdownlint-1.36.0.tgz";
-      sha512 = "tVp32LukGXEFfz3y8H2Pq4fcpoxy9Xptw/jIAZAJz4S/725hCsWLCySwoVE7qhSLOeUHmVMQdoW7A11EHru+lg==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Markdownlint extension for coc.nvim";
-      homepage = "https://github.com/fannheyward/coc-markdownlint#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-pairs = nodeEnv.buildNodePackage {
     name = "coc-pairs";
     packageName = "coc-pairs";

From b96b2c33bb5a6209a453206efee1367badf30260 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 16:42:36 -0500
Subject: [PATCH 5979/6226] coc-pairs: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 ++++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 .../co/coc-pairs/package-lock-fix.patch       | 28 ++++++++++++++++
 pkgs/by-name/co/coc-pairs/package.nix         | 32 +++++++++++++++++++
 pkgs/by-name/co/coc-pairs/update.sh           | 28 ++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 18 -----------
 8 files changed, 95 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-pairs/package-lock-fix.patch
 create mode 100644 pkgs/by-name/co/coc-pairs/package.nix
 create mode 100755 pkgs/by-name/co/coc-pairs/update.sh

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index e0c47aebbed7..a0daa890a590 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -19,6 +19,7 @@
   coc-json,
   coc-lists,
   coc-markdownlint,
+  coc-pairs,
   coc-pyright,
   coc-sh,
   coc-spell-checker,
@@ -120,6 +121,11 @@ final: prev: {
     src = "${coc-markdownlint}/lib/node_modules/coc-markdownlint";
   };
 
+  coc-pairs = buildVimPlugin {
+    inherit (coc-pairs) pname version meta;
+    src = "${coc-pairs}/lib/node_modules/coc-pairs";
+  };
+
   coc-pyright = buildVimPlugin {
     pname = "coc-pyright";
     inherit (coc-pyright) version meta;
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index 24a47936201d..75c0b98e19cc 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -8,7 +8,6 @@ let
   nodePackageNames = [
     "coc-go"
     "coc-ltex"
-    "coc-pairs"
     "coc-prettier"
     "coc-r-lsp"
     "coc-rust-analyzer"
diff --git a/pkgs/by-name/co/coc-pairs/package-lock-fix.patch b/pkgs/by-name/co/coc-pairs/package-lock-fix.patch
new file mode 100644
index 000000000000..05f1a8c9970a
--- /dev/null
+++ b/pkgs/by-name/co/coc-pairs/package-lock-fix.patch
@@ -0,0 +1,28 @@
+diff --git c/package-lock.json i/package-lock.json
+index ee9b22f..4d693ab 100644
+--- c/package-lock.json
++++ i/package-lock.json
+@@ -1,12 +1,12 @@
+ {
+   "name": "coc-pairs",
+-  "version": "1.5.1",
++  "version": "1.5.2",
+   "lockfileVersion": 3,
+   "requires": true,
+   "packages": {
+     "": {
+       "name": "coc-pairs",
+-      "version": "1.5.1",
++      "version": "1.5.2",
+       "license": "MIT",
+       "devDependencies": {
+         "@chemzqm/tsconfig": "^0.0.3",
+@@ -20,6 +20,8 @@
+     },
+     "node_modules/@chemzqm/tsconfig": {
+       "version": "0.0.3",
++      "resolved": "https://registry.npmjs.org/@chemzqm/tsconfig/-/tsconfig-0.0.3.tgz",
++      "integrity": "sha512-MjF25vbqLYR+S+JJLgBi0vn4gZqv/C87H+yPSlVKEqlIJAJOGJOgFPUFvRS7pdRHqkv2flX/oRxzxhlu2V0X1w==",
+       "dev": true,
+       "license": "MIT"
+     },
diff --git a/pkgs/by-name/co/coc-pairs/package.nix b/pkgs/by-name/co/coc-pairs/package.nix
new file mode 100644
index 000000000000..7cd3e79d9533
--- /dev/null
+++ b/pkgs/by-name/co/coc-pairs/package.nix
@@ -0,0 +1,32 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "coc-pairs";
+  version = "1.5.2";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-pairs";
+    tag = finalAttrs.version;
+    hash = "sha256-CUNnNS8mRjyVyjFw4dLnFpskdZNn/+UjVwOcuZJkeNw=";
+  };
+
+  patches = [
+    ./package-lock-fix.patch
+  ];
+
+  npmDepsHash = "sha256-yIMed7x5EzJMMhsA/O08kLpVYMujyJq1qol/KilxxTs=";
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    description = "Basic auto pairs extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-pairs";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-pairs/update.sh b/pkgs/by-name/co/coc-pairs/update.sh
new file mode 100755
index 000000000000..cd854c58b701
--- /dev/null
+++ b/pkgs/by-name/co/coc-pairs/update.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash nodejs nix-update git curl jq
+
+WORKDIR=$(mktemp -d)
+PACKAGE_DIR="$(realpath "$(dirname "$0")")"
+
+# Get latest tag
+NEW_VERSION=$(curl "https://api.github.com/repos/neoclide/coc-pairs/tags" | jq -r '.[] | .name' | sort --version-sort | tail -1)
+
+if [[ "$UPDATE_NIX_OLD_VERSION" == "$NEW_VERSION" ]]; then
+  echo "package is up to date: $UPDATE_NIX_OLD_VERSION"
+  exit 0
+fi
+
+# Clone source
+git clone "https://github.com/neoclide/coc-pairs" -b "$NEW_VERSION" "$WORKDIR/src"
+pushd "$WORKDIR/src"
+npx --yes npm-package-lock-add-resolved
+
+# Update package-lock patch
+git diff >"$PACKAGE_DIR/package-lock-fix.patch"
+popd
+
+# Run nix-update
+nix-update "$UPDATE_NIX_PNAME"
+
+# Cleanup
+rm -rf "$WORKDIR"
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index b9ad6ef8e292..f41719a54684 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -91,6 +91,7 @@ mapAliases {
   inherit (pkgs) coc-lists; # Added 2025-11-05
   inherit (pkgs) coc-markdownlint; # Added 2025-11-05
   coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16
+  inherit (pkgs) coc-pairs; # added 2025-11-05
   inherit (pkgs) coc-pyright; # added 2024-07-14
   coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15
   coc-rls = throw "coc-rls was removed because rls was deprecated in 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 8e058c6ef2c1..7accc20a6cfd 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -23,7 +23,6 @@
 , "clipboard-cli"
 , "coc-go"
 , "coc-ltex"
-, "coc-pairs"
 , "coc-prettier"
 , "coc-r-lsp"
 , "coc-rust-analyzer"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 444e0518d246..a81ae174a66b 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37686,24 +37686,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-pairs = nodeEnv.buildNodePackage {
-    name = "coc-pairs";
-    packageName = "coc-pairs";
-    version = "1.5.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-pairs/-/coc-pairs-1.5.1.tgz";
-      sha512 = "/wQOKlptsj2KB4yoIBYN3xtTbCKSsGbRdkNAeYCKCQZX0J5uVMFNgo363+k1BVp9KrkWQDlvVluF3Xf1ei8PfA==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Auto pair extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-pairs#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-prettier = nodeEnv.buildNodePackage {
     name = "coc-prettier";
     packageName = "coc-prettier";

From 5b047f88c5eab03db5ffae1c97b894aacf83f1e7 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 16:43:23 -0500
Subject: [PATCH 5980/6226] coc-prettier: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 ++++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-prettier/package.nix      | 31 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 30 ------------------
 6 files changed, 38 insertions(+), 32 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-prettier/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index a0daa890a590..6f97d234a45e 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -20,6 +20,7 @@
   coc-lists,
   coc-markdownlint,
   coc-pairs,
+  coc-prettier,
   coc-pyright,
   coc-sh,
   coc-spell-checker,
@@ -126,6 +127,11 @@ final: prev: {
     src = "${coc-pairs}/lib/node_modules/coc-pairs";
   };
 
+  coc-prettier = buildVimPlugin {
+    inherit (coc-prettier) pname version meta;
+    src = "${coc-prettier}/lib/node_modules/coc-prettier";
+  };
+
   coc-pyright = buildVimPlugin {
     pname = "coc-pyright";
     inherit (coc-pyright) version meta;
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index 75c0b98e19cc..eaf61edc4852 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -8,7 +8,6 @@ let
   nodePackageNames = [
     "coc-go"
     "coc-ltex"
-    "coc-prettier"
     "coc-r-lsp"
     "coc-rust-analyzer"
     "coc-smartf"
diff --git a/pkgs/by-name/co/coc-prettier/package.nix b/pkgs/by-name/co/coc-prettier/package.nix
new file mode 100644
index 000000000000..d632e4ec547a
--- /dev/null
+++ b/pkgs/by-name/co/coc-prettier/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "coc-prettier";
+  version = "11.0.1";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-prettier";
+    tag = finalAttrs.version;
+    hash = "sha256-QD31kF7HIsh7C6ykt+x7utLEmN7msprGstoRa3PC7j8=";
+  };
+
+  npmDepsHash = "sha256-vKkW3PbeN3KtJHLvr0HBMiDx9XZgyBZD40gENDnoOSs=";
+
+  npmBuildScript = "prepare";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Prettier extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-prettier";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index f41719a54684..5912ce1b158d 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -92,6 +92,7 @@ mapAliases {
   inherit (pkgs) coc-markdownlint; # Added 2025-11-05
   coc-metals = throw "coc-metals was removed because it was deprecated upstream. vimPlugins.nvim-metals is its official replacement."; # Added 2024-10-16
   inherit (pkgs) coc-pairs; # added 2025-11-05
+  inherit (pkgs) coc-prettier; # added 2025-11-05
   inherit (pkgs) coc-pyright; # added 2024-07-14
   coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15
   coc-rls = throw "coc-rls was removed because rls was deprecated in 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 7accc20a6cfd..836422e69316 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -23,7 +23,6 @@
 , "clipboard-cli"
 , "coc-go"
 , "coc-ltex"
-, "coc-prettier"
 , "coc-r-lsp"
 , "coc-rust-analyzer"
 , "coc-smartf"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index a81ae174a66b..43d47b8e11c4 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -24776,15 +24776,6 @@ let
         sha512 = "tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==";
       };
     };
-    "prettier-3.5.3" = {
-      name = "prettier";
-      packageName = "prettier";
-      version = "3.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prettier/-/prettier-3.5.3.tgz";
-        sha512 = "QQtaxnoDJeAkDvDKWCLiwIXkTgRhwYDEQCghU9Z6q03iyek/rxRh/2lC3HB7P8sWT2xC/y5JDctPLBIGzHKbhw==";
-      };
-    };
     "pretty-hrtime-1.0.3" = {
       name = "pretty-hrtime";
       packageName = "pretty-hrtime";
@@ -37686,27 +37677,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-prettier = nodeEnv.buildNodePackage {
-    name = "coc-prettier";
-    packageName = "coc-prettier";
-    version = "11.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-11.0.0.tgz";
-      sha512 = "QksBbo3rpqNdVljuzhnjyJGb6J6O+Q7vKhIqyB7nt4Jz3s9eAPI1NAqMaVhptE+V95D2A6srMl+YiBObZu94Qg==";
-    };
-    dependencies = [
-      sources."prettier-3.5.3"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Prettier extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-prettier#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-r-lsp = nodeEnv.buildNodePackage {
     name = "coc-r-lsp";
     packageName = "coc-r-lsp";

From 8d8538bdc19c0c02104f1eb23410957b301d52b8 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 16:44:19 -0500
Subject: [PATCH 5981/6226] coc-r-lsp: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 +++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-r-lsp/package.nix         | 45 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 41 -----------------
 6 files changed, 52 insertions(+), 43 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-r-lsp/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index 6f97d234a45e..96a0d3668fda 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -22,6 +22,7 @@
   coc-pairs,
   coc-prettier,
   coc-pyright,
+  coc-r-lsp,
   coc-sh,
   coc-spell-checker,
   coc-toml,
@@ -138,6 +139,11 @@ final: prev: {
     src = "${coc-pyright}/lib/node_modules/coc-pyright";
   };
 
+  coc-r-lsp = buildVimPlugin {
+    inherit (coc-r-lsp) pname version meta;
+    src = "${coc-r-lsp}/lib/node_modules/coc-r-lsp";
+  };
+
   coc-sh = buildVimPlugin {
     pname = "coc-sh";
     inherit (coc-sh) version meta;
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index eaf61edc4852..0f06c534971b 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -8,7 +8,6 @@ let
   nodePackageNames = [
     "coc-go"
     "coc-ltex"
-    "coc-r-lsp"
     "coc-rust-analyzer"
     "coc-smartf"
     "coc-snippets"
diff --git a/pkgs/by-name/co/coc-r-lsp/package.nix b/pkgs/by-name/co/coc-r-lsp/package.nix
new file mode 100644
index 000000000000..af8c885ff0ac
--- /dev/null
+++ b/pkgs/by-name/co/coc-r-lsp/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-r-lsp";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-r-lsp";
+    tag = finalAttrs.version;
+    hash = "sha256-pjxnNzWOqlVWNNvEF9Yx1aQa4i3BpJoenuGQmY/k1QA=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-BUg1ZhJn3pF2cQB6b1Fe0jsd9gi2ZyMhCt7SXtjvY54=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+  ];
+
+  NODE_OPTIONS = "--openssl-legacy-provider";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "R LSP client for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-r-lsp";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 5912ce1b158d..443b606592bd 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -95,6 +95,7 @@ mapAliases {
   inherit (pkgs) coc-prettier; # added 2025-11-05
   inherit (pkgs) coc-pyright; # added 2024-07-14
   coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15
+  inherit (pkgs) coc-r-lsp; # added 2025-11-05
   coc-rls = throw "coc-rls was removed because rls was deprecated in 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01
   inherit (pkgs) coc-sh; # added 2025-10-02
   inherit (pkgs) coc-spell-checker; # added 2025-10-01
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 836422e69316..c5a7326a4943 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -23,7 +23,6 @@
 , "clipboard-cli"
 , "coc-go"
 , "coc-ltex"
-, "coc-r-lsp"
 , "coc-rust-analyzer"
 , "coc-smartf"
 , "coc-snippets"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 43d47b8e11c4..4c6316b03fdd 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -32525,15 +32525,6 @@ let
         sha512 = "6TDy/abTQk+zDGYazgbIPc+4JoXdwC8NHU9Pbn4UJP1fehUyZmM4RHp5IthX7A6L5KS30PRui+j+tbbMMMafdw==";
       };
     };
-    "vscode-jsonrpc-8.2.0" = {
-      name = "vscode-jsonrpc";
-      packageName = "vscode-jsonrpc";
-      version = "8.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-8.2.0.tgz";
-        sha512 = "C+r0eKJUIfiDIfwJhria30+TYWPtuHJXHtI7J0YlOmKAo7ogxP20T0zxB7HZQIFhIyvoBPwWskjxrvAtfjyZfA==";
-      };
-    };
     "vscode-jsonrpc-8.2.1" = {
       name = "vscode-jsonrpc";
       packageName = "vscode-jsonrpc";
@@ -32597,15 +32588,6 @@ let
         sha512 = "924/h0AqsMtA5yK22GgMtCYiMdCOtWTSGgUOkgEDX+wk2b0x4sAfLiO4NxBxqbiVtz7K7/1/RgVrVI0NClZwqA==";
       };
     };
-    "vscode-languageserver-protocol-3.17.5" = {
-      name = "vscode-languageserver-protocol";
-      packageName = "vscode-languageserver-protocol";
-      version = "3.17.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz";
-        sha512 = "mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==";
-      };
-    };
     "vscode-languageserver-textdocument-1.0.11" = {
       name = "vscode-languageserver-textdocument";
       packageName = "vscode-languageserver-textdocument";
@@ -37677,29 +37659,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-r-lsp = nodeEnv.buildNodePackage {
-    name = "coc-r-lsp";
-    packageName = "coc-r-lsp";
-    version = "1.2.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-r-lsp/-/coc-r-lsp-1.2.1.tgz";
-      sha512 = "SOsCwIuQeE4eiX/Scgs2nL1WnR0JwFZ2/Edh3dx5ijmZSlEPxdc0PnMUN0hT9y96jK5/ZHAByC3qEperpWqPUA==";
-    };
-    dependencies = [
-      sources."vscode-jsonrpc-8.2.0"
-      sources."vscode-languageserver-protocol-3.17.5"
-      sources."vscode-languageserver-textdocument-1.0.12"
-      sources."vscode-languageserver-types-3.17.5"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "R language server extension for coc.nvim";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-rust-analyzer = nodeEnv.buildNodePackage {
     name = "coc-rust-analyzer";
     packageName = "coc-rust-analyzer";

From 89aa372f0c05df5475a3dba675ca2fa682dfff31 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 16:45:05 -0500
Subject: [PATCH 5982/6226] coc-rust-analyzer: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 ++++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-rust-analyzer/package.nix | 29 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 18 ------------
 6 files changed, 36 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-rust-analyzer/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index 96a0d3668fda..9da56238a7bc 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -23,6 +23,7 @@
   coc-prettier,
   coc-pyright,
   coc-r-lsp,
+  coc-rust-analyzer,
   coc-sh,
   coc-spell-checker,
   coc-toml,
@@ -144,6 +145,11 @@ final: prev: {
     src = "${coc-r-lsp}/lib/node_modules/coc-r-lsp";
   };
 
+  coc-rust-analyzer = buildVimPlugin {
+    inherit (coc-rust-analyzer) pname version meta;
+    src = "${coc-rust-analyzer}/lib/node_modules/coc-rust-analyzer";
+  };
+
   coc-sh = buildVimPlugin {
     pname = "coc-sh";
     inherit (coc-sh) version meta;
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index 0f06c534971b..1d1d2ad11547 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -8,7 +8,6 @@ let
   nodePackageNames = [
     "coc-go"
     "coc-ltex"
-    "coc-rust-analyzer"
     "coc-smartf"
     "coc-snippets"
     "coc-solargraph"
diff --git a/pkgs/by-name/co/coc-rust-analyzer/package.nix b/pkgs/by-name/co/coc-rust-analyzer/package.nix
new file mode 100644
index 000000000000..278b29e6a592
--- /dev/null
+++ b/pkgs/by-name/co/coc-rust-analyzer/package.nix
@@ -0,0 +1,29 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage {
+  pname = "coc-rust-analyzer";
+  version = "0-unstable-2025-10-31";
+
+  src = fetchFromGitHub {
+    owner = "fannheyward";
+    repo = "coc-rust-analyzer";
+    rev = "6cc74fcaed6b011b98e9f8483fb608dff53147be";
+    hash = "sha256-2XSx4eR9GgMbWY+IOEKuhCAVesxoZbh/KsLr0It0Cks=";
+  };
+
+  npmDepsHash = "sha256-94kuqDNsCcPuvTVeprEdjNOPw8pdpDp3IOvuoKdSEgU=";
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "Rust-analyzer extension for coc.nvim";
+    homepage = "https://github.com/fannheyward/coc-rust-analyzer";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+}
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 443b606592bd..a403908e46d1 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -97,6 +97,7 @@ mapAliases {
   coc-python = throw "coc-python was removed because it was abandoned upstream on 2020-12-24. Upstream now recommends using coc-pyright or coc-jedi instead."; # added 2024-10-15
   inherit (pkgs) coc-r-lsp; # added 2025-11-05
   coc-rls = throw "coc-rls was removed because rls was deprecated in 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01
+  inherit (pkgs) coc-rust-analyzer; # added 2025-11-05
   inherit (pkgs) coc-sh; # added 2025-10-02
   inherit (pkgs) coc-spell-checker; # added 2025-10-01
   inherit (pkgs) coc-toml;
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index c5a7326a4943..045fd70e00ec 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -23,7 +23,6 @@
 , "clipboard-cli"
 , "coc-go"
 , "coc-ltex"
-, "coc-rust-analyzer"
 , "coc-smartf"
 , "coc-snippets"
 , "coc-solargraph"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 4c6316b03fdd..99cb7ddb44bb 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37659,24 +37659,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-rust-analyzer = nodeEnv.buildNodePackage {
-    name = "coc-rust-analyzer";
-    packageName = "coc-rust-analyzer";
-    version = "0.81.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.81.0.tgz";
-      sha512 = "skbRCe1Yjoa3r/a0dHviJxGMS8s+PFzl7lmimCUxxT3kKxairDeetNfRBw+wsDJmKBzXGhy1KH+6Cmt3WJYz5w==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "rust-analyzer for Vim/Neovim, works as an extension with coc.nvim";
-      homepage = "https://github.com/fannheyward/coc-rust-analyzer#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-smartf = nodeEnv.buildNodePackage {
     name = "coc-smartf";
     packageName = "coc-smartf";

From fe207f1a0949e268128d0b876ea6de89304b9f41 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 16:45:49 -0500
Subject: [PATCH 5983/6226] coc-smartf: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 ++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-smartf/package.nix        | 71 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 18 -----
 6 files changed, 78 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-smartf/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index 9da56238a7bc..f86ceb25dcf7 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -25,6 +25,7 @@
   coc-r-lsp,
   coc-rust-analyzer,
   coc-sh,
+  coc-smartf,
   coc-spell-checker,
   coc-toml,
 }:
@@ -156,6 +157,11 @@ final: prev: {
     src = "${coc-sh}/lib/node_modules/coc-sh";
   };
 
+  coc-smartf = buildVimPlugin {
+    inherit (coc-smartf) pname version meta;
+    src = "${coc-smartf}/lib/node_modules/coc-smartf";
+  };
+
   coc-spell-checker = buildVimPlugin {
     pname = "coc-spell-checker";
     inherit (coc-spell-checker) version meta;
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index 1d1d2ad11547..0156472f578a 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -8,7 +8,6 @@ let
   nodePackageNames = [
     "coc-go"
     "coc-ltex"
-    "coc-smartf"
     "coc-snippets"
     "coc-solargraph"
     "coc-sqlfluff"
diff --git a/pkgs/by-name/co/coc-smartf/package.nix b/pkgs/by-name/co/coc-smartf/package.nix
new file mode 100644
index 000000000000..debc471d419f
--- /dev/null
+++ b/pkgs/by-name/co/coc-smartf/package.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+  esbuild,
+  buildGoModule,
+}:
+let
+  esbuild' =
+    let
+      version = "0.12.22";
+    in
+    esbuild.override {
+      buildGoModule =
+        args:
+        buildGoModule (
+          args
+          // {
+            inherit version;
+            src = fetchFromGitHub {
+              owner = "evanw";
+              repo = "esbuild";
+              rev = "v${version}";
+              hash = "sha256-vZlrHfcXOz4QHTH9otpwtPIWHGxK4TAol5o/Tl0M98E=";
+            };
+            vendorHash = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";
+          }
+        );
+    };
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-smartf";
+  version = "1.2.1";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-smartf";
+    tag = finalAttrs.version;
+    hash = "sha256-CL0jWwMj6sFXEx+D1Orc4Fivbl33qE2P3yRJB0qqQFQ=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-s1TStKyDPydBxMLfszhKHGyQeFIC6bDPtssNm9hdZNs=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+    esbuild'
+  ];
+
+  env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Make jump to character easier";
+    homepage = "https://github.com/neoclide/coc-smartf";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index a403908e46d1..9aad98a54adb 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -99,6 +99,7 @@ mapAliases {
   coc-rls = throw "coc-rls was removed because rls was deprecated in 2022. You should use coc-rust-analyzer instead, as rust-analyzer is maintained."; # added 2025-10-01
   inherit (pkgs) coc-rust-analyzer; # added 2025-11-05
   inherit (pkgs) coc-sh; # added 2025-10-02
+  inherit (pkgs) coc-smartf; # Added 2025-11-05
   inherit (pkgs) coc-spell-checker; # added 2025-10-01
   inherit (pkgs) coc-toml;
   coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 045fd70e00ec..09b34386277e 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -23,7 +23,6 @@
 , "clipboard-cli"
 , "coc-go"
 , "coc-ltex"
-, "coc-smartf"
 , "coc-snippets"
 , "coc-solargraph"
 , "coc-stylelint"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 99cb7ddb44bb..05bfffb84e8c 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37659,24 +37659,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-smartf = nodeEnv.buildNodePackage {
-    name = "coc-smartf";
-    packageName = "coc-smartf";
-    version = "1.2.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-smartf/-/coc-smartf-1.2.1.tgz";
-      sha512 = "Zlm+lt03V1qmJVvQw81svaWE+jC9e42VTnHBh8qjlUJUMG1GDjuC8cwM1ulamdovSsKdlmtHwVpScdKBgg3/Fg==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Smart find extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-smartf#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-snippets = nodeEnv.buildNodePackage {
     name = "coc-snippets";
     packageName = "coc-snippets";

From 63bccd4eaba04ce8dbb51baf68c476f947f73c26 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 16:46:38 -0500
Subject: [PATCH 5984/6226] coc-snippets: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 ++++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-snippets/package.nix      | 31 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 18 -----------
 6 files changed, 38 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-snippets/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index f86ceb25dcf7..5b4c054f068f 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -26,6 +26,7 @@
   coc-rust-analyzer,
   coc-sh,
   coc-smartf,
+  coc-snippets,
   coc-spell-checker,
   coc-toml,
 }:
@@ -162,6 +163,11 @@ final: prev: {
     src = "${coc-smartf}/lib/node_modules/coc-smartf";
   };
 
+  coc-snippets = buildVimPlugin {
+    inherit (coc-snippets) pname version meta;
+    src = "${coc-snippets}/lib/node_modules/coc-snippets";
+  };
+
   coc-spell-checker = buildVimPlugin {
     pname = "coc-spell-checker";
     inherit (coc-spell-checker) version meta;
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index 0156472f578a..71ce5e823b7e 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -8,7 +8,6 @@ let
   nodePackageNames = [
     "coc-go"
     "coc-ltex"
-    "coc-snippets"
     "coc-solargraph"
     "coc-sqlfluff"
     "coc-stylelint"
diff --git a/pkgs/by-name/co/coc-snippets/package.nix b/pkgs/by-name/co/coc-snippets/package.nix
new file mode 100644
index 000000000000..68a13262d155
--- /dev/null
+++ b/pkgs/by-name/co/coc-snippets/package.nix
@@ -0,0 +1,31 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "coc-snippets";
+  version = "3.4.7";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-snippets";
+    tag = finalAttrs.version;
+    hash = "sha256-xaExEsNy6uuYUTeyXaon4DAoRIF6OpIZis59oetR36c=";
+  };
+
+  npmDepsHash = "sha256-tRyFtfL3Jc+uajELVdJoDteY3lnq0Bx8UQTaz2HtbW0=";
+
+  npmBuildScript = "prepare";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Snippets solution for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-snippets";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 9aad98a54adb..5b12e45fcd40 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -100,6 +100,7 @@ mapAliases {
   inherit (pkgs) coc-rust-analyzer; # added 2025-11-05
   inherit (pkgs) coc-sh; # added 2025-10-02
   inherit (pkgs) coc-smartf; # Added 2025-11-05
+  inherit (pkgs) coc-snippets; # Added 2025-11-05
   inherit (pkgs) coc-spell-checker; # added 2025-10-01
   inherit (pkgs) coc-toml;
   coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 09b34386277e..8c45daf5160e 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -23,7 +23,6 @@
 , "clipboard-cli"
 , "coc-go"
 , "coc-ltex"
-, "coc-snippets"
 , "coc-solargraph"
 , "coc-stylelint"
 , "coc-sumneko-lua"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 05bfffb84e8c..73da382cfc1d 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37659,24 +37659,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-snippets = nodeEnv.buildNodePackage {
-    name = "coc-snippets";
-    packageName = "coc-snippets";
-    version = "3.4.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-3.4.0.tgz";
-      sha512 = "p7nxP/ii+iRADnvFEuHz4iDhuspg3W08hj4J0IFz/OYrzJwEON3c+5i0DJEXyr8qrt0c2Vd+3rekRE8J2AhwGQ==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Snippets extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-snippets#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-solargraph = nodeEnv.buildNodePackage {
     name = "coc-solargraph";
     packageName = "coc-solargraph";

From 65dc92e99a6a3f7d35993e7aea8b72a3a8b7b7c6 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 16:47:36 -0500
Subject: [PATCH 5985/6226] coc-solargraph: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 ++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-solargraph/package.nix    | 73 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 17 -----
 6 files changed, 80 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-solargraph/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index 5b4c054f068f..ed66d9d73186 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -27,6 +27,7 @@
   coc-sh,
   coc-smartf,
   coc-snippets,
+  coc-solargraph,
   coc-spell-checker,
   coc-toml,
 }:
@@ -168,6 +169,11 @@ final: prev: {
     src = "${coc-snippets}/lib/node_modules/coc-snippets";
   };
 
+  coc-solargraph = buildVimPlugin {
+    inherit (coc-solargraph) pname version meta;
+    src = "${coc-solargraph}/lib/node_modules/coc-solargraph";
+  };
+
   coc-spell-checker = buildVimPlugin {
     pname = "coc-spell-checker";
     inherit (coc-spell-checker) version meta;
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index 71ce5e823b7e..1a6b0c4aeda7 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -8,7 +8,6 @@ let
   nodePackageNames = [
     "coc-go"
     "coc-ltex"
-    "coc-solargraph"
     "coc-sqlfluff"
     "coc-stylelint"
     "coc-sumneko-lua"
diff --git a/pkgs/by-name/co/coc-solargraph/package.nix b/pkgs/by-name/co/coc-solargraph/package.nix
new file mode 100644
index 000000000000..a21fb429acc1
--- /dev/null
+++ b/pkgs/by-name/co/coc-solargraph/package.nix
@@ -0,0 +1,73 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+  esbuild,
+  buildGoModule,
+}:
+let
+  esbuild' =
+    let
+      version = "0.8.29";
+    in
+    esbuild.override {
+      buildGoModule =
+        args:
+        buildGoModule (
+          args
+          // {
+            inherit version;
+            src = fetchFromGitHub {
+              owner = "evanw";
+              repo = "esbuild";
+              rev = "v${version}";
+              hash = "sha256-WpnWdx0Oi1KBWiS/CEd88hYU/3ka1x1AA71ipYJgT5A=";
+            };
+            vendorHash = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";
+          }
+        );
+    };
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-solargraph";
+  version = "1.2.4";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-solargraph";
+    tag = finalAttrs.version;
+    hash = "sha256-AUulj0tcgkXrQS9k1zhB0LKWJxvIlVtxSQK+nYGm73s=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-FPxvwqx7TfJBM+O8TY64swJVYlWIbCvVbzVJYthHjO0=";
+  };
+
+  yarnBuildScript = "prepare";
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+    esbuild'
+  ];
+
+  env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Solargraph extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-solargraph";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 5b12e45fcd40..19efdeff046e 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -101,6 +101,7 @@ mapAliases {
   inherit (pkgs) coc-sh; # added 2025-10-02
   inherit (pkgs) coc-smartf; # Added 2025-11-05
   inherit (pkgs) coc-snippets; # Added 2025-11-05
+  inherit (pkgs) coc-solargraph; # Added 2025-11-05
   inherit (pkgs) coc-spell-checker; # added 2025-10-01
   inherit (pkgs) coc-toml;
   coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 8c45daf5160e..d2b8bbd537c3 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -23,7 +23,6 @@
 , "clipboard-cli"
 , "coc-go"
 , "coc-ltex"
-, "coc-solargraph"
 , "coc-stylelint"
 , "coc-sumneko-lua"
 , "coc-sqlfluff"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 73da382cfc1d..96997488c015 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37659,23 +37659,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-solargraph = nodeEnv.buildNodePackage {
-    name = "coc-solargraph";
-    packageName = "coc-solargraph";
-    version = "1.2.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.2.4.tgz";
-      sha512 = "Z00v8HmgQyJgv/FKo7FkqWWTPNHeiOgEDqsI4RT9457rEQ8ZF/wLeq38DRihTfIra93GZ3EprVKYCOels6JHgQ==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Ruby languageserver extension for coc.nvim, using solargraph";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-stylelint = nodeEnv.buildNodePackage {
     name = "coc-stylelint";
     packageName = "coc-stylelint";

From 8d69b4a264e0e562c8fd28e13cd20d672e18934f Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 16:49:11 -0500
Subject: [PATCH 5986/6226] coc-sqlfluff: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 ++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-sqlfluff/package.nix      | 71 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 21 ------
 6 files changed, 78 insertions(+), 23 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-sqlfluff/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index ed66d9d73186..41db68a0832a 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -29,6 +29,7 @@
   coc-snippets,
   coc-solargraph,
   coc-spell-checker,
+  coc-sqlfluff,
   coc-toml,
 }:
 final: prev: {
@@ -180,6 +181,11 @@ final: prev: {
     src = "${coc-spell-checker}/lib/node_modules/coc-spell-checker";
   };
 
+  coc-sqlfluff = buildVimPlugin {
+    inherit (coc-sqlfluff) pname version meta;
+    src = "${coc-sqlfluff}/lib/node_modules/coc-sqlfluff";
+  };
+
   coc-toml = buildVimPlugin {
     pname = "coc-toml";
     inherit (coc-toml) version meta;
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index 1a6b0c4aeda7..6a44165b7e19 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -8,7 +8,6 @@ let
   nodePackageNames = [
     "coc-go"
     "coc-ltex"
-    "coc-sqlfluff"
     "coc-stylelint"
     "coc-sumneko-lua"
     "coc-tabnine"
diff --git a/pkgs/by-name/co/coc-sqlfluff/package.nix b/pkgs/by-name/co/coc-sqlfluff/package.nix
new file mode 100644
index 000000000000..278987f8446a
--- /dev/null
+++ b/pkgs/by-name/co/coc-sqlfluff/package.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+  esbuild,
+  buildGoModule,
+}:
+let
+  esbuild' =
+    let
+      version = "0.16.17";
+    in
+    esbuild.override {
+      buildGoModule =
+        args:
+        buildGoModule (
+          args
+          // {
+            inherit version;
+            src = fetchFromGitHub {
+              owner = "evanw";
+              repo = "esbuild";
+              rev = "v${version}";
+              hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ=";
+            };
+            vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+          }
+        );
+    };
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-sqlfluff";
+  version = "0.11.4";
+
+  src = fetchFromGitHub {
+    owner = "yaegassy";
+    repo = "coc-sqlfluff";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-hTe0rtjIKdlPSvwcHI2m0sRkVfmW8eQ/63WLmPsiovI=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-Pz7OCAiPIMVCAYe9OGWKMLfGSwK8ulA/JW55eB8xJqw=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+    esbuild'
+  ];
+
+  env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "SQLFluff extension for coc.nvim";
+    homepage = "https://github.com/yaegassy/coc-sqlfluff";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 19efdeff046e..68c260f53c48 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -103,6 +103,7 @@ mapAliases {
   inherit (pkgs) coc-snippets; # Added 2025-11-05
   inherit (pkgs) coc-solargraph; # Added 2025-11-05
   inherit (pkgs) coc-spell-checker; # added 2025-10-01
+  inherit (pkgs) coc-sqlfluff; # Added 2025-11-05
   inherit (pkgs) coc-toml;
   coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
   coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index d2b8bbd537c3..3195fe821144 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -25,7 +25,6 @@
 , "coc-ltex"
 , "coc-stylelint"
 , "coc-sumneko-lua"
-, "coc-sqlfluff"
 , "coc-tabnine"
 , "coc-texlab"
 , "coc-tsserver"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 96997488c015..f3e39411ada5 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -38047,27 +38047,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-sqlfluff = nodeEnv.buildNodePackage {
-    name = "coc-sqlfluff";
-    packageName = "coc-sqlfluff";
-    version = "0.11.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-sqlfluff/-/coc-sqlfluff-0.11.4.tgz";
-      sha512 = "0yKAPkIKoLJWksPefWXVvRcRQ+Ja3kc2Bx/tKL4tQwEOlAwc5qeUU+1FZRw+71Jp8HeC5Wo9YqtlgSIJlyic3g==";
-    };
-    dependencies = [
-      sources."semver-7.7.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "SQLFluff (A SQL linter and auto-formatter for Humans) extension for coc.nvim";
-      homepage = "https://github.com/yaegassy/coc-sqlfluff#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-tabnine = nodeEnv.buildNodePackage {
     name = "coc-tabnine";
     packageName = "coc-tabnine";

From 7e9c70a2e27c4385684cd266540145010192b2db Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 17:03:02 -0500
Subject: [PATCH 5987/6226] coc-stylelint: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |   6 +
 .../vim/plugins/nodePackagePlugins.nix        |   1 -
 pkgs/by-name/co/coc-stylelint/package.nix     |  51 +
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 988 ------------------
 6 files changed, 58 insertions(+), 990 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-stylelint/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index 41db68a0832a..26a8f659445e 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -29,6 +29,7 @@
   coc-snippets,
   coc-solargraph,
   coc-spell-checker,
+  coc-stylelint,
   coc-sqlfluff,
   coc-toml,
 }:
@@ -181,6 +182,11 @@ final: prev: {
     src = "${coc-spell-checker}/lib/node_modules/coc-spell-checker";
   };
 
+  coc-stylelint = buildVimPlugin {
+    inherit (coc-stylelint) pname version meta;
+    src = "${coc-stylelint}/lib/node_modules/coc-stylelint";
+  };
+
   coc-sqlfluff = buildVimPlugin {
     inherit (coc-sqlfluff) pname version meta;
     src = "${coc-sqlfluff}/lib/node_modules/coc-sqlfluff";
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index 6a44165b7e19..01e416d0c4d1 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -8,7 +8,6 @@ let
   nodePackageNames = [
     "coc-go"
     "coc-ltex"
-    "coc-stylelint"
     "coc-sumneko-lua"
     "coc-tabnine"
     "coc-texlab"
diff --git a/pkgs/by-name/co/coc-stylelint/package.nix b/pkgs/by-name/co/coc-stylelint/package.nix
new file mode 100644
index 000000000000..abd256ec6090
--- /dev/null
+++ b/pkgs/by-name/co/coc-stylelint/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-stylelint";
+  version = "1.2.0";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-stylelint";
+    tag = finalAttrs.version;
+    hash = "sha256-EurfiE1xeJhyH4Idb/hf/eItwmv75lan1csz0KJMBXs=";
+  };
+
+  # Fix yarn.lock file
+  postPatch = ''
+    substituteInPlace yarn.lock \
+      --replace-fail "http://registry.npmjs.org" "https://registry.yarnpkg.com"
+  '';
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src postPatch;
+    hash = "sha256-rcHjbiMDrgCHweRMDlfcMvAJT4VULks44fbpctPpZps=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+  ];
+
+  NODE_OPTIONS = "--openssl-legacy-provider";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Stylelint extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-stylelint";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 68c260f53c48..003bc439313f 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -104,6 +104,7 @@ mapAliases {
   inherit (pkgs) coc-solargraph; # Added 2025-11-05
   inherit (pkgs) coc-spell-checker; # added 2025-10-01
   inherit (pkgs) coc-sqlfluff; # Added 2025-11-05
+  inherit (pkgs) coc-stylelint; # Added 2025-11-05
   inherit (pkgs) coc-toml;
   coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
   coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 3195fe821144..51ae5514919b 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -23,7 +23,6 @@
 , "clipboard-cli"
 , "coc-go"
 , "coc-ltex"
-, "coc-stylelint"
 , "coc-sumneko-lua"
 , "coc-tabnine"
 , "coc-texlab"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index f3e39411ada5..26571f4af9e6 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -3191,24 +3191,6 @@ let
         sha512 = "Pb6M8TDO9DtSVla9yXSTAxmo9GVEouq5P40DWXdOie69bXogZTkgvopCq+yEvTMA0F6PEvdJmbtTV3ccIp11VQ==";
       };
     };
-    "@stylelint/postcss-css-in-js-0.37.3" = {
-      name = "_at_stylelint_slash_postcss-css-in-js";
-      packageName = "@stylelint/postcss-css-in-js";
-      version = "0.37.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@stylelint/postcss-css-in-js/-/postcss-css-in-js-0.37.3.tgz";
-        sha512 = "scLk3cSH1H9KggSniseb2KNAU5D9FWc3H7BxCSAIdtU9OWIyw0zkEZ9qEKHryRM+SExYXRKNb7tOOVNAsQ3iwg==";
-      };
-    };
-    "@stylelint/postcss-markdown-0.36.2" = {
-      name = "_at_stylelint_slash_postcss-markdown";
-      packageName = "@stylelint/postcss-markdown";
-      version = "0.36.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@stylelint/postcss-markdown/-/postcss-markdown-0.36.2.tgz";
-        sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ==";
-      };
-    };
     "@sveltejs/acorn-typescript-1.0.5" = {
       name = "_at_sveltejs_slash_acorn-typescript";
       packageName = "@sveltejs/acorn-typescript";
@@ -6080,15 +6062,6 @@ let
         sha512 = "ooviqdwwgfIfNmDwo94wlshcdzfO64XV0Cg6oDsDYBJfITDz1EngD2z7DkbvCWn+XIMsIqW27sEVF6qcpJrRcg==";
       };
     };
-    "autoprefixer-9.8.8" = {
-      name = "autoprefixer";
-      packageName = "autoprefixer";
-      version = "9.8.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.8.8.tgz";
-        sha512 = "eM9d/swFopRt5gdJ7jrpCwgvEMIayITpojhkkSMRsFHYuH5bkSQ4p/9qTEHtmNudUZh22Tehu7I6CxAW0IXTKA==";
-      };
-    };
     "available-typed-arrays-1.0.7" = {
       name = "available-typed-arrays";
       packageName = "available-typed-arrays";
@@ -6215,15 +6188,6 @@ let
         sha512 = "wC5ihrnUXmR2douXmXLCe5O3zg3GKIyvRi/hi58a/XyRxVI+3/yM0PYueQOZXPXQ9pxBislYkw+sF9b7C/RuMA==";
       };
     };
-    "bail-1.0.5" = {
-      name = "bail";
-      packageName = "bail";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bail/-/bail-1.0.5.tgz";
-        sha512 = "xFbRxM1tahm08yHBP16MMjVUAvDaBMD38zsM9EMAUN61omwLmKlOpB/Zku5QkjZ8TZ4vn53pj+t518cH0S03RQ==";
-      };
-    };
     "bail-2.0.2" = {
       name = "bail";
       packageName = "bail";
@@ -6242,15 +6206,6 @@ let
         sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==";
       };
     };
-    "balanced-match-2.0.0" = {
-      name = "balanced-match";
-      packageName = "balanced-match";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/balanced-match/-/balanced-match-2.0.0.tgz";
-        sha512 = "1ugUSr8BHXRnK23KfuYS+gVMC3LB8QGH9W1iGtDPsNWoQbgtXSExkBu2aDR4epiGWZOjZsj6lDl/N/AqqTC3UA==";
-      };
-    };
     "base-0.11.2" = {
       name = "base";
       packageName = "base";
@@ -7700,15 +7655,6 @@ let
         sha512 = "T2VJbcDuZQ0Tb2EWwSotMPJjgpy1/tGee1BTpUNsGZ/qgNjV2t7Mvu+d4600U564nbLesN1x2dPL+xii174Ekg==";
       };
     };
-    "character-entities-1.2.4" = {
-      name = "character-entities";
-      packageName = "character-entities";
-      version = "1.2.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/character-entities/-/character-entities-1.2.4.tgz";
-        sha512 = "iBMyeEHxfVnIakwOuDXpVkc54HijNgCyQB2w0VfGQThle6NXn50zU6V/u+LDhxHcDUPojn6Kpga3PTAD8W1bQw==";
-      };
-    };
     "character-entities-2.0.2" = {
       name = "character-entities";
       packageName = "character-entities";
@@ -7727,15 +7673,6 @@ let
         sha512 = "1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==";
       };
     };
-    "character-entities-legacy-1.1.4" = {
-      name = "character-entities-legacy";
-      packageName = "character-entities-legacy";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-1.1.4.tgz";
-        sha512 = "3Xnr+7ZFS1uxeiUDvV02wQ+QDbc55o97tIV5zHScSPJpcLm/r0DFPcoY3tYRp+VZukxuMeKgXYmsXQHO05zQeA==";
-      };
-    };
     "character-entities-legacy-3.0.0" = {
       name = "character-entities-legacy";
       packageName = "character-entities-legacy";
@@ -7745,15 +7682,6 @@ let
         sha512 = "RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==";
       };
     };
-    "character-reference-invalid-1.1.4" = {
-      name = "character-reference-invalid";
-      packageName = "character-reference-invalid";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/character-reference-invalid/-/character-reference-invalid-1.1.4.tgz";
-        sha512 = "mKKUkUbhPpQlCOfIuZkvSEgktjPFIsZKRRbC6KWVEMvlzblj3i3asQv5ODsrwt0N3pHAEvjP8KTQPHkp0+6jOg==";
-      };
-    };
     "character-reference-invalid-2.0.1" = {
       name = "character-reference-invalid";
       packageName = "character-reference-invalid";
@@ -8294,15 +8222,6 @@ let
         sha512 = "3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==";
       };
     };
-    "clone-regexp-2.2.0" = {
-      name = "clone-regexp";
-      packageName = "clone-regexp";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clone-regexp/-/clone-regexp-2.2.0.tgz";
-        sha512 = "beMpP7BOtTipFuW8hrJvREQ2DrRu3BE7by0ZpibtfBA+qfHYvMGTc2Yb1JMYPKg/JUw0CHYvpg796aNTSW9z7Q==";
-      };
-    };
     "clone-response-1.0.3" = {
       name = "clone-response";
       packageName = "clone-response";
@@ -10896,15 +10815,6 @@ let
         sha512 = "q9bUwjfp7Eif8jWxxxPSykdRZAb6GkguBGSgvvCrhI9wB71W2K/Kvv4E61CF/mcCfnVJDeDWx/Vb/uAqbDj6UQ==";
       };
     };
-    "domhandler-2.4.2" = {
-      name = "domhandler";
-      packageName = "domhandler";
-      version = "2.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz";
-        sha512 = "JiK04h0Ht5u/80fdLMCEmV4zkNh2BcoMFBmZ/91WtYZ8qVXSKjiw7fXMgFPnHcSZgOo3XdinHvmnDUeMf5R4wA==";
-      };
-    };
     "domino-2.1.6" = {
       name = "domino";
       packageName = "domino";
@@ -10923,15 +10833,6 @@ let
         sha512 = "gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==";
       };
     };
-    "domutils-1.7.0" = {
-      name = "domutils";
-      packageName = "domutils";
-      version = "1.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-1.7.0.tgz";
-        sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==";
-      };
-    };
     "domutils-3.2.2" = {
       name = "domutils";
       packageName = "domutils";
@@ -12426,15 +12327,6 @@ let
         sha512 = "EHlpxMCpHWSAh1dgS6bVeoLAXGnJNdR93aabr4QCGbzOM73o5XmRfM/e5FUqsw3aagP8S8XEWUWFAxnRBnAF0Q==";
       };
     };
-    "execall-2.0.0" = {
-      name = "execall";
-      packageName = "execall";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/execall/-/execall-2.0.0.tgz";
-        sha512 = "0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow==";
-      };
-    };
     "exif-parser-0.1.12" = {
       name = "exif-parser";
       packageName = "exif-parser";
@@ -12705,15 +12597,6 @@ let
         sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==";
       };
     };
-    "fast-diff-1.3.0" = {
-      name = "fast-diff";
-      packageName = "fast-diff";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz";
-        sha512 = "VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==";
-      };
-    };
     "fast-fifo-1.3.2" = {
       name = "fast-fifo";
       packageName = "fast-fifo";
@@ -12975,15 +12858,6 @@ let
         sha512 = "uXP/zGzxxFvFfcZGgBIwotm+Tdc55ddPAzF7iHshP4YGaXMww7rSF9peD9D1sui5ebONg5UobsZv+FfgEpGv/w==";
       };
     };
-    "file-entry-cache-6.0.1" = {
-      name = "file-entry-cache";
-      packageName = "file-entry-cache";
-      version = "6.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz";
-        sha512 = "7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==";
-      };
-    };
     "file-entry-cache-8.0.0" = {
       name = "file-entry-cache";
       packageName = "file-entry-cache";
@@ -13317,15 +13191,6 @@ let
         sha512 = "VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==";
       };
     };
-    "flat-cache-3.2.0" = {
-      name = "flat-cache";
-      packageName = "flat-cache";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz";
-        sha512 = "CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==";
-      };
-    };
     "flat-cache-4.0.1" = {
       name = "flat-cache";
       packageName = "flat-cache";
@@ -13956,15 +13821,6 @@ let
         sha512 = "jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==";
       };
     };
-    "get-stdin-8.0.0" = {
-      name = "get-stdin";
-      packageName = "get-stdin";
-      version = "8.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-stdin/-/get-stdin-8.0.0.tgz";
-        sha512 = "sY22aA6xchAzprjyqmSEQv4UbAAzRN0L2dQB0NlN5acTTK9Don6nhoc3eAbUnpZiCANAMfd/+40kVdKfFygohg==";
-      };
-    };
     "get-stdin-9.0.0" = {
       name = "get-stdin";
       packageName = "get-stdin";
@@ -14424,15 +14280,6 @@ let
         sha512 = "0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA==";
       };
     };
-    "globjoin-0.1.4" = {
-      name = "globjoin";
-      packageName = "globjoin";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/globjoin/-/globjoin-0.1.4.tgz";
-        sha512 = "xYfnw62CKG8nLkZBfWbhWwDw02CHty86jfPcc2cr3ZfeuK9ysoVPPEUxf21bAD/rWAgk52SuBrLJlefNy8mvFg==";
-      };
-    };
     "globule-1.3.4" = {
       name = "globule";
       packageName = "globule";
@@ -14460,15 +14307,6 @@ let
         sha512 = "eWv1ds/zAlz+M1ioHsyKJomfY7jbDDPpwSkv14KQj89bycx1nvK5/2Cj/T9g7kzJcX5Bc7Yv22FjfBZS/jl94A==";
       };
     };
-    "gonzales-pe-4.3.0" = {
-      name = "gonzales-pe";
-      packageName = "gonzales-pe";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gonzales-pe/-/gonzales-pe-4.3.0.tgz";
-        sha512 = "otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==";
-      };
-    };
     "goosig-0.10.0" = {
       name = "goosig";
       packageName = "goosig";
@@ -15180,15 +15018,6 @@ let
         sha512 = "8nxjcBcd8wovbeKx7h3wTji4e6+rhaVuPNpMqwWgnHh+N9ToqsCs6XztWRBPQ+UtzsoMAdKZtUENoVzU/EMtZA==";
       };
     };
-    "html-tags-3.3.1" = {
-      name = "html-tags";
-      packageName = "html-tags";
-      version = "3.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/html-tags/-/html-tags-3.3.1.tgz";
-        sha512 = "ztqyC3kLto0e9WbNp0aeP+M3kTt+nbaIveGmUxAtZa+8iFgKLUOD4YKM5j+f3QD89bra7UeumolZHKuOXnTmeQ==";
-      };
-    };
     "html-void-elements-3.0.0" = {
       name = "html-void-elements";
       packageName = "html-void-elements";
@@ -15207,15 +15036,6 @@ let
         sha512 = "eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg==";
       };
     };
-    "htmlparser2-3.10.1" = {
-      name = "htmlparser2";
-      packageName = "htmlparser2";
-      version = "3.10.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz";
-        sha512 = "IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==";
-      };
-    };
     "htmlparser2-3.8.3" = {
       name = "htmlparser2";
       packageName = "htmlparser2";
@@ -16260,15 +16080,6 @@ let
         sha512 = "YBUanLI8Yoihw923YeFUS5fs0fF2f5TSFTNiYAAzhhDscDa3lEqYuz1pDOEP5KvX94I9ey3vsqjJcLVFVU+3QA==";
       };
     };
-    "is-alphabetical-1.0.4" = {
-      name = "is-alphabetical";
-      packageName = "is-alphabetical";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-alphabetical/-/is-alphabetical-1.0.4.tgz";
-        sha512 = "DwzsA04LQ10FHTZuL0/grVDk4rFoVH1pjAToYwBrHSxcrBIGQuXrQMtD5U1b0U2XVgKZCTLLP8u2Qxqhy3l2Vg==";
-      };
-    };
     "is-alphabetical-2.0.1" = {
       name = "is-alphabetical";
       packageName = "is-alphabetical";
@@ -16278,15 +16089,6 @@ let
         sha512 = "FWyyY60MeTNyeSRpkM2Iry0G9hpr7/9kD40mD/cGQEuilcZYS4okz8SN2Q6rLCJ8gbCt6fN+rC+6tMGS99LaxQ==";
       };
     };
-    "is-alphanumerical-1.0.4" = {
-      name = "is-alphanumerical";
-      packageName = "is-alphanumerical";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-alphanumerical/-/is-alphanumerical-1.0.4.tgz";
-        sha512 = "UzoZUr+XfVz3t3v4KyGEniVL9BDRoQtY7tOyrRybkVNjDFWyo1yhXNGrrBTQxp3ib9BLAWs7k2YKBQsFRkZG9A==";
-      };
-    };
     "is-alphanumerical-2.0.1" = {
       name = "is-alphanumerical";
       packageName = "is-alphanumerical";
@@ -16440,15 +16242,6 @@ let
         sha512 = "PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==";
       };
     };
-    "is-decimal-1.0.4" = {
-      name = "is-decimal";
-      packageName = "is-decimal";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-decimal/-/is-decimal-1.0.4.tgz";
-        sha512 = "RGdriMmQQvZ2aqaQq3awNA6dCGtKpiDFcOzrTWrDAT2MiWrKQVPmxLGHl7Y2nNu6led0kEyoX0enY0qXYsv9zw==";
-      };
-    };
     "is-decimal-2.0.1" = {
       name = "is-decimal";
       packageName = "is-decimal";
@@ -16683,15 +16476,6 @@ let
         sha512 = "WvtOiug1VFrE9v1Cydwm+FnXd3+w9GaeVUss5W4v/SLy3UW00vP+6iNF2SdnfiBoLy4bTqVdkftNGTUeOFVsbA==";
       };
     };
-    "is-hexadecimal-1.0.4" = {
-      name = "is-hexadecimal";
-      packageName = "is-hexadecimal";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-hexadecimal/-/is-hexadecimal-1.0.4.tgz";
-        sha512 = "gyPJuv83bHMpocVYoqof5VDiZveEoGoFL8m3BXNb2VW8Xs+rz9kqO8LOQ5DH6EsuvilT1ApazU0pyl+ytbPtlw==";
-      };
-    };
     "is-hexadecimal-2.0.1" = {
       name = "is-hexadecimal";
       packageName = "is-hexadecimal";
@@ -17052,15 +16836,6 @@ let
         sha512 = "MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==";
       };
     };
-    "is-regexp-2.1.0" = {
-      name = "is-regexp";
-      packageName = "is-regexp";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-regexp/-/is-regexp-2.1.0.tgz";
-        sha512 = "OZ4IlER3zmRIoB9AqNhEggVxqIH4ofDns5nRrPS6yQxXE1TPCUpFznBfRQmQa8uC+pXqjMnukiJBxCisIxiLGA==";
-      };
-    };
     "is-relative-1.0.0" = {
       name = "is-relative";
       packageName = "is-relative";
@@ -18303,15 +18078,6 @@ let
         sha512 = "dhG34DXATL5hSxJbIexCft8FChFXtmskoZYnoPWjXQuebWYCNkVeV3KkGegCK9CP1oswI/vQibS2GY7Em/sJJA==";
       };
     };
-    "known-css-properties-0.21.0" = {
-      name = "known-css-properties";
-      packageName = "known-css-properties";
-      version = "0.21.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/known-css-properties/-/known-css-properties-0.21.0.tgz";
-        sha512 = "sZLUnTqimCkvkgRS+kbPlYW5o8q5w1cu+uIisKpEWkj31I8mx8kNG162DwRav8Zirkva6N5uoFsm9kzK4mUXjw==";
-      };
-    };
     "kuler-2.0.0" = {
       name = "kuler";
       packageName = "kuler";
@@ -19446,15 +19212,6 @@ let
         sha512 = "ka87Jz3gcx/I7Hal94xaN2tZEOPoUOEVftkQqZx2EeQRN7LGdfLlI3FvZ+7WDplm+vK2Urx9ULrvSowtdCieng==";
       };
     };
-    "longest-streak-2.0.4" = {
-      name = "longest-streak";
-      packageName = "longest-streak";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/longest-streak/-/longest-streak-2.0.4.tgz";
-        sha512 = "vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==";
-      };
-    };
     "longest-streak-3.1.0" = {
       name = "longest-streak";
       packageName = "longest-streak";
@@ -19879,15 +19636,6 @@ let
         sha512 = "rUxjysqif/BZQH2yhd5Aaq7vXMSx9NdEsQcyA07uEzIvxgI7zIr33gGsh+RU0/XjmQpCW7RsVof1vlkvQVCK5A==";
       };
     };
-    "mathml-tag-names-2.1.3" = {
-      name = "mathml-tag-names";
-      packageName = "mathml-tag-names";
-      version = "2.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mathml-tag-names/-/mathml-tag-names-2.1.3.tgz";
-        sha512 = "APMBEanjybaPzUrfqU0IMU5I0AswKMH7k8OTLs0vvV4KZpExkTkY87nR/zpbuTPj+gARop7aGUbl11pnDfW6xg==";
-      };
-    };
     "md5-2.3.0" = {
       name = "md5";
       packageName = "md5";
@@ -19942,15 +19690,6 @@ let
         sha512 = "MTtdFRz/eMDHXzeK6W3dO7mXUlF82Gom4y0oOgvHhh/HXZAGvIQDUvQ0SuUx+j2tv44b8xTHOm8K/9OoRFnXKw==";
       };
     };
-    "mdast-util-from-markdown-0.8.5" = {
-      name = "mdast-util-from-markdown";
-      packageName = "mdast-util-from-markdown";
-      version = "0.8.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mdast-util-from-markdown/-/mdast-util-from-markdown-0.8.5.tgz";
-        sha512 = "2hkTXtYYnr+NubD/g6KGBS/0mFmBcifAsI0yIWRiRo0PjVs6SSOSOdtzbp6kSGnShDN6G5aWZpKQ2lWRy27mWQ==";
-      };
-    };
     "mdast-util-from-markdown-1.3.1" = {
       name = "mdast-util-from-markdown";
       packageName = "mdast-util-from-markdown";
@@ -20140,15 +19879,6 @@ let
         sha512 = "QGYKEuUsYT9ykKBCMOEDLsU5JRObWQusAolFMeko/tYPufNkRffBAQjIE+99jbA87xv6FgmjLtwjh9wBWajwAA==";
       };
     };
-    "mdast-util-to-markdown-0.6.5" = {
-      name = "mdast-util-to-markdown";
-      packageName = "mdast-util-to-markdown";
-      version = "0.6.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mdast-util-to-markdown/-/mdast-util-to-markdown-0.6.5.tgz";
-        sha512 = "XeV9sDE7ZlOQvs45C9UKMtfTcctcaj/pGwH8YLbMHoMOXNNCn2LsqVQOqrF1+/NU8lKDAqozme9SCXWyo9oAcQ==";
-      };
-    };
     "mdast-util-to-markdown-1.5.0" = {
       name = "mdast-util-to-markdown";
       packageName = "mdast-util-to-markdown";
@@ -20185,15 +19915,6 @@ let
         sha512 = "jVU0Nr2B9X3MU4tSK7JP1CMkSvOj7X5l/GboG1tKRw52lLF1x2Ju92Ms9tNetCcbfX3hzlM73zYo2NKkWSfF/A==";
       };
     };
-    "mdast-util-to-string-2.0.0" = {
-      name = "mdast-util-to-string";
-      packageName = "mdast-util-to-string";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mdast-util-to-string/-/mdast-util-to-string-2.0.0.tgz";
-        sha512 = "AW4DRS3QbBayY/jJmD8437V1Gombjf8RSOUCMFBuo5iHi58AGEgVCKQ+ezHkZZDpAQS75hcBMpLqjpJTjtUL7w==";
-      };
-    };
     "mdast-util-to-string-3.2.0" = {
       name = "mdast-util-to-string";
       packageName = "mdast-util-to-string";
@@ -20419,15 +20140,6 @@ let
         sha512 = "/0LLxhzP0tfiR5hcQebtudP56gUurs2CLkGarnCiB/OqEyUFQ6U3paQi/tgLv0hBJYt2rnr9MNpxz4fiiugstg==";
       };
     };
-    "micromark-2.11.4" = {
-      name = "micromark";
-      packageName = "micromark";
-      version = "2.11.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/micromark/-/micromark-2.11.4.tgz";
-        sha512 = "+WoovN/ppKolQOFIAajxi7Lu9kInbPxFuTBVEavFcL8eAfVstoc5MocPmqBeAdBOJV00uaVjegzH4+MA0DN/uA==";
-      };
-    };
     "micromark-3.2.0" = {
       name = "micromark";
       packageName = "micromark";
@@ -22319,24 +22031,6 @@ let
         sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==";
       };
     };
-    "normalize-range-0.1.2" = {
-      name = "normalize-range";
-      packageName = "normalize-range";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz";
-        sha512 = "bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==";
-      };
-    };
-    "normalize-selector-0.2.0" = {
-      name = "normalize-selector";
-      packageName = "normalize-selector";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-selector/-/normalize-selector-0.2.0.tgz";
-        sha512 = "dxvWdI8gw6eAvk9BlPffgEoGfM7AdijoCwOEJge3e3ulT2XLgmU7KvvxprOaCu05Q1uGRHmOhHe1r6emZoKyFw==";
-      };
-    };
     "normalize-url-4.5.1" = {
       name = "normalize-url";
       packageName = "normalize-url";
@@ -22598,15 +22292,6 @@ let
         sha512 = "N5dLIfqCzlJm7M14KqmX/sl+6Zg5WH0E04HKfuVHbPj9jIaY1T2zuCS+xe0qeT/YN3UpYQ6lIIXcE/3Xbwg3Xw==";
       };
     };
-    "num2fraction-1.2.2" = {
-      name = "num2fraction";
-      packageName = "num2fraction";
-      version = "1.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/num2fraction/-/num2fraction-1.2.2.tgz";
-        sha512 = "Y1wZESM7VUThYY+4W+X4ySH2maqcA+p7UR+w8VWNWVAd6lwuXXWz/w/Cz43J/dI2I+PS6wD5N+bJUF+gjWvIqg==";
-      };
-    };
     "number-allocator-1.0.14" = {
       name = "number-allocator";
       packageName = "number-allocator";
@@ -23642,15 +23327,6 @@ let
         sha512 = "sMe/JmsY6g21aJCAm8KgCH90a9zCZ7aGSriSJ5B0CcGEsDN7YmiCk3+1iKPE1heDG6zYY4Xf++V8llWtCvNBSQ==";
       };
     };
-    "parse-entities-2.0.0" = {
-      name = "parse-entities";
-      packageName = "parse-entities";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse-entities/-/parse-entities-2.0.0.tgz";
-        sha512 = "kkywGpCcRYhqQIchaWqZ875wzpS/bMKhz5HnN3p7wveJTkTtyAB/AlnS0f8DFSqYW1T82t6yEAkEcB+A1I3MbQ==";
-      };
-    };
     "parse-entities-4.0.2" = {
       name = "parse-entities";
       packageName = "parse-entities";
@@ -24254,15 +23930,6 @@ let
         sha512 = "GEazpTWwTZaEQ9RhL7Nyz0WwqilbqgLahDM3D0hxWwmVDI52nXEybHqiN6/elwpkJBhcuj+WbBu+QfT0uhPGfQ==";
       };
     };
-    "picocolors-0.2.1" = {
-      name = "picocolors";
-      packageName = "picocolors";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz";
-        sha512 = "cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==";
-      };
-    };
     "picocolors-1.0.0" = {
       name = "picocolors";
       packageName = "picocolors";
@@ -24551,15 +24218,6 @@ let
         sha512 = "/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==";
       };
     };
-    "postcss-7.0.39" = {
-      name = "postcss";
-      packageName = "postcss";
-      version = "7.0.39";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz";
-        sha512 = "yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==";
-      };
-    };
     "postcss-8.5.3" = {
       name = "postcss";
       packageName = "postcss";
@@ -24569,24 +24227,6 @@ let
         sha512 = "dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==";
       };
     };
-    "postcss-html-0.36.0" = {
-      name = "postcss-html";
-      packageName = "postcss-html";
-      version = "0.36.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-html/-/postcss-html-0.36.0.tgz";
-        sha512 = "HeiOxGcuwID0AFsNAL0ox3mW6MHH5cstWN1Z3Y+n6H+g12ih7LHdYxWwEA/QmrebctLjo79xz9ouK3MroHwOJw==";
-      };
-    };
-    "postcss-less-3.1.4" = {
-      name = "postcss-less";
-      packageName = "postcss-less";
-      version = "3.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-less/-/postcss-less-3.1.4.tgz";
-        sha512 = "7TvleQWNM2QLcHqvudt3VYjULVB49uiW6XzEUFmvwHzvsOEF5MwBrIXZDJQvJNFGjJQTzSzZnDoCJ8h/ljyGXA==";
-      };
-    };
     "postcss-load-config-5.1.0" = {
       name = "postcss-load-config";
       packageName = "postcss-load-config";
@@ -24596,15 +24236,6 @@ let
         sha512 = "G5AJ+IX0aD0dygOE0yFZQ/huFFMSNneyfp0e3/bT05a8OfPC5FUoZRPfGijUdGOJNMewJiwzcHJXFafFzeKFVA==";
       };
     };
-    "postcss-media-query-parser-0.2.3" = {
-      name = "postcss-media-query-parser";
-      packageName = "postcss-media-query-parser";
-      version = "0.2.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-media-query-parser/-/postcss-media-query-parser-0.2.3.tgz";
-        sha512 = "3sOlxmbKcSHMjlUXQZKQ06jOswE7oVkXPxmZdoB1r5l0q6gTFTQSHxNxOrCccElbW7dxNytifNEo8qidX2Vsig==";
-      };
-    };
     "postcss-reporter-7.1.0" = {
       name = "postcss-reporter";
       packageName = "postcss-reporter";
@@ -24614,42 +24245,6 @@ let
         sha512 = "/eoEylGWyy6/DOiMP5lmFRdmDKThqgn7D6hP2dXKJI/0rJSO1ADFNngZfDzxL0YAxFvws+Rtpuji1YIHj4mySA==";
       };
     };
-    "postcss-resolve-nested-selector-0.1.6" = {
-      name = "postcss-resolve-nested-selector";
-      packageName = "postcss-resolve-nested-selector";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-resolve-nested-selector/-/postcss-resolve-nested-selector-0.1.6.tgz";
-        sha512 = "0sglIs9Wmkzbr8lQwEyIzlDOOC9bGmfVKcJTaxv3vMmd3uo4o4DerC3En0bnmgceeql9BfC8hRkp7cg0fjdVqw==";
-      };
-    };
-    "postcss-safe-parser-4.0.2" = {
-      name = "postcss-safe-parser";
-      packageName = "postcss-safe-parser";
-      version = "4.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-safe-parser/-/postcss-safe-parser-4.0.2.tgz";
-        sha512 = "Uw6ekxSWNLCPesSv/cmqf2bY/77z11O7jZGPax3ycZMFU/oi2DMH9i89AdHc1tRwFg/arFoEwX0IS3LCUxJh1g==";
-      };
-    };
-    "postcss-sass-0.4.4" = {
-      name = "postcss-sass";
-      packageName = "postcss-sass";
-      version = "0.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-sass/-/postcss-sass-0.4.4.tgz";
-        sha512 = "BYxnVYx4mQooOhr+zer0qWbSPYnarAy8ZT7hAQtbxtgVf8gy+LSLT/hHGe35h14/pZDTw1DsxdbrwxBN++H+fg==";
-      };
-    };
-    "postcss-scss-2.1.1" = {
-      name = "postcss-scss";
-      packageName = "postcss-scss";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-scss/-/postcss-scss-2.1.1.tgz";
-        sha512 = "jQmGnj0hSGLd9RscFw9LyuSVAa5Bl1/KBPqG1NQw9w8ND55nY4ZEsdlVuYJvLPpV+y0nwTV5v/4rHPzZRihQbA==";
-      };
-    };
     "postcss-selector-parser-6.0.10" = {
       name = "postcss-selector-parser";
       packageName = "postcss-selector-parser";
@@ -24659,33 +24254,6 @@ let
         sha512 = "IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==";
       };
     };
-    "postcss-selector-parser-6.1.2" = {
-      name = "postcss-selector-parser";
-      packageName = "postcss-selector-parser";
-      version = "6.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz";
-        sha512 = "Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==";
-      };
-    };
-    "postcss-syntax-0.36.2" = {
-      name = "postcss-syntax";
-      packageName = "postcss-syntax";
-      version = "0.36.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-syntax/-/postcss-syntax-0.36.2.tgz";
-        sha512 = "nBRg/i7E3SOHWxF3PpF5WnJM/jQ1YpY9000OaVXlAQj6Zp/kIqJxEDWIZ67tAd7NLuk7zqN4yqe9nc0oNAOs1w==";
-      };
-    };
-    "postcss-value-parser-4.2.0" = {
-      name = "postcss-value-parser";
-      packageName = "postcss-value-parser";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz";
-        sha512 = "1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==";
-      };
-    };
     "postject-1.0.0-alpha.6" = {
       name = "postject";
       packageName = "postject";
@@ -26072,15 +25640,6 @@ let
         sha512 = "QIRet3SYrGp0HUHO88jVskiG6seqUGC5iAG7AwI/BV4ypGcuqk9Du6YQBUOUqm9c8pw1eyLoIaONifRua1lsEQ==";
       };
     };
-    "remark-13.0.0" = {
-      name = "remark";
-      packageName = "remark";
-      version = "13.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/remark/-/remark-13.0.0.tgz";
-        sha512 = "HDz1+IKGtOyWN+QgBiAT0kn+2s6ovOxHyPAFGKVE81VSzJ+mq7RwHFledEvB5F1p4iJvOah/LOKdFuzvRnNLCA==";
-      };
-    };
     "remark-15.0.1" = {
       name = "remark";
       packageName = "remark";
@@ -26585,15 +26144,6 @@ let
         sha512 = "FCxlKLNGknS5ba/1lmpYijMUzX2esxW5xQqjWxw2eHFfS2MSdaHVINFmhjo+qN1WhZhNimq0dZATN9pH0IDrpA==";
       };
     };
-    "remark-parse-9.0.0" = {
-      name = "remark-parse";
-      packageName = "remark-parse";
-      version = "9.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/remark-parse/-/remark-parse-9.0.0.tgz";
-        sha512 = "geKatMwSzEXKHuzBNU1z676sGcDcFoChMK38TgdHJNAYfFtsfHDQG7MoJAjs6sgYMqyLduCYWDIWZIxiPeafEw==";
-      };
-    };
     "remark-retext-5.0.1" = {
       name = "remark-retext";
       packageName = "remark-retext";
@@ -26612,15 +26162,6 @@ let
         sha512 = "1OSmLd3awB/t8qdoEOMazZkNsfVTeY4fTsgzcQFdXNq8ToTN4ZGwrMnlda4K6smTFKD+GRV6O48i6Z4iKgPPpw==";
       };
     };
-    "remark-stringify-9.0.1" = {
-      name = "remark-stringify";
-      packageName = "remark-stringify";
-      version = "9.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/remark-stringify/-/remark-stringify-9.0.1.tgz";
-        sha512 = "mWmNg3ZtESvZS8fv5PTvaPckdL4iNlCHTt8/e/8oN08nArHRHjNZMKzA/YW3+p7/lYqIw4nx1XsjCBo/AxNChg==";
-      };
-    };
     "remove-trailing-separator-1.1.0" = {
       name = "remove-trailing-separator";
       packageName = "remove-trailing-separator";
@@ -28646,15 +28187,6 @@ let
         sha512 = "4bSLdgzl0xcMto0zPmhLRfy7y8ZWSjcv+znurjcUnzW5ZQhhDo+HKIRdAB+n/mTde+KEfoQKYzehc6pUHrRQYw==";
       };
     };
-    "specificity-0.4.1" = {
-      name = "specificity";
-      packageName = "specificity";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/specificity/-/specificity-0.4.1.tgz";
-        sha512 = "1klA3Gi5PD1Wv9Q0wUoOQN1IWAuPu0D1U03ThXTr0cJ20+/iq2tHSDnK7Kk/0LXJ1ztUB2/1Os0wKmfyNgUQfg==";
-      };
-    };
     "speedometer-0.1.4" = {
       name = "speedometer";
       packageName = "speedometer";
@@ -29501,24 +29033,6 @@ let
         sha512 = "H2N9c26eXjzL/S/K+i/RHHcFanE74dptvvjM8iwzwbVcWY/zjBbgRqF3K0DY4+OD+uTTASTBvDoxPDaPN02D7g==";
       };
     };
-    "style-search-0.1.0" = {
-      name = "style-search";
-      packageName = "style-search";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/style-search/-/style-search-0.1.0.tgz";
-        sha512 = "Dj1Okke1C3uKKwQcetra4jSuk0DqbzbYtXipzFlFMZtowbF1x7BKJwB9AayVMyFARvU8EDrZdcax4At/452cAg==";
-      };
-    };
-    "stylelint-13.13.1" = {
-      name = "stylelint";
-      packageName = "stylelint";
-      version = "13.13.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stylelint/-/stylelint-13.13.1.tgz";
-        sha512 = "Mv+BQr5XTUrKqAXmpqm6Ddli6Ief+AiPZkRsIrAoUKFuq/ElkUh9ZMYxXD0iQNZ5ADghZKLOWz1h7hTClB7zgQ==";
-      };
-    };
     "subarg-1.0.0" = {
       name = "subarg";
       packageName = "subarg";
@@ -29537,15 +29051,6 @@ let
         sha512 = "Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw==";
       };
     };
-    "sugarss-2.0.0" = {
-      name = "sugarss";
-      packageName = "sugarss";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sugarss/-/sugarss-2.0.0.tgz";
-        sha512 = "WfxjozUk0UVA4jm+U1d736AUpzSrNsQcIbyOkoE364GrtWmIrFdk5lksEupgWMD4VaT/0kVx1dobpiDumSgmJQ==";
-      };
-    };
     "sumchecker-3.0.1" = {
       name = "sumchecker";
       packageName = "sumchecker";
@@ -29645,15 +29150,6 @@ let
         sha512 = "71o1zfzyawLfIWBOmw8brleKyvnbn73oVHNCsu51uPMz/HWiKkkXsI31JjHW5zqXEqnPYkIiHd8ZmL7FCimLEA==";
       };
     };
-    "svg-tags-1.0.0" = {
-      name = "svg-tags";
-      packageName = "svg-tags";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/svg-tags/-/svg-tags-1.0.0.tgz";
-        sha512 = "ovssysQTa+luh7A5Weu3Rta6FJlFBBbInjOh722LIt6klpU2/HtdUbszju/G4devcvk8PGt7FCLv5wftu3THUA==";
-      };
-    };
     "svg2img-1.0.0-beta.2" = {
       name = "svg2img";
       packageName = "svg2img";
@@ -30374,15 +29870,6 @@ let
         sha512 = "aZbgViZrg1QNcG+LULa7nhZpJTZSLm/mXnHXnbAbjmN5aSa0y7V+wvv6+4WaBtpISJzThKy+PIPxc1Nq1EJ9mg==";
       };
     };
-    "trough-1.0.5" = {
-      name = "trough";
-      packageName = "trough";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/trough/-/trough-1.0.5.tgz";
-        sha512 = "rvuRbTarPXmMb79SmzEp8aqXNKcK+y0XaB298IXueQ8I2PsrATcPBCSPyK/dDNa2iWOhKlfNnOjdAOTBU/nkFA==";
-      };
-    };
     "trough-2.2.0" = {
       name = "trough";
       packageName = "trough";
@@ -31022,15 +30509,6 @@ let
         sha512 = "xKvGhPWw3k84Qjh8bI3ZeJjqnyadK+GEFtazSfZv/rKeTkTjOJho6mFqh2SM96iIcZokxiOpg78GazTSg8+KHA==";
       };
     };
-    "unified-9.2.2" = {
-      name = "unified";
-      packageName = "unified";
-      version = "9.2.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unified/-/unified-9.2.2.tgz";
-        sha512 = "Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==";
-      };
-    };
     "unified-diff-4.0.1" = {
       name = "unified-diff";
       packageName = "unified-diff";
@@ -31193,15 +30671,6 @@ let
         sha512 = "T7ZqS7immLjYyC4FCp2hDo3ksZ1v+qcbb+e5+iWxc2jONgHOLXPCpms1L8VV4hVxCXgWTxmBHDztuEZFVwC+Gg==";
       };
     };
-    "unist-util-find-all-after-3.0.2" = {
-      name = "unist-util-find-all-after";
-      packageName = "unist-util-find-all-after";
-      version = "3.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz";
-        sha512 = "xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ==";
-      };
-    };
     "unist-util-find-all-after-5.0.0" = {
       name = "unist-util-find-all-after";
       packageName = "unist-util-find-all-after";
@@ -31355,15 +30824,6 @@ let
         sha512 = "TkBb0HABNmxzAcfLf4qsIbFbaPDvMO6wa3b3j4VcEzFVaw1LBKwnW4/sRJ/atSLSzoIg41JWEdnE7N6DIhGDGQ==";
       };
     };
-    "unist-util-stringify-position-2.0.3" = {
-      name = "unist-util-stringify-position";
-      packageName = "unist-util-stringify-position";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-2.0.3.tgz";
-        sha512 = "3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==";
-      };
-    };
     "unist-util-stringify-position-3.0.3" = {
       name = "unist-util-stringify-position";
       packageName = "unist-util-stringify-position";
@@ -31913,15 +31373,6 @@ let
         sha512 = "+g8ENReyr8YsOc6fv/NVJs2vFdHBnBNdfE49rshrTzDWOlUx4Gq7KOS2GD8eqhy2j+Ejq29+SbKH8yjkAqXqoA==";
       };
     };
-    "v8-compile-cache-2.4.0" = {
-      name = "v8-compile-cache";
-      packageName = "v8-compile-cache";
-      version = "2.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.4.0.tgz";
-        sha512 = "ocyWc3bAHBB/guyqJQVI5o4BZkPhznPYUG2ea80Gond/BgNWpap8TOmLSeeQG7bnh2KMISxskdADG59j7zruhw==";
-      };
-    };
     "v8-compile-cache-lib-3.0.1" = {
       name = "v8-compile-cache-lib";
       packageName = "v8-compile-cache-lib";
@@ -32336,15 +31787,6 @@ let
         sha512 = "bIOaZx4+Bf6a7sIORfmYnyKLDLk/lhVym6rjYlq+vkitYKnhFmUpmPpDTCltWFrUTlGKs6sCeoDWfMA0oOOneA==";
       };
     };
-    "vfile-4.2.1" = {
-      name = "vfile";
-      packageName = "vfile";
-      version = "4.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vfile/-/vfile-4.2.1.tgz";
-        sha512 = "O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==";
-      };
-    };
     "vfile-5.3.7" = {
       name = "vfile";
       packageName = "vfile";
@@ -32390,15 +31832,6 @@ let
         sha512 = "5yXvWDEgqeiYiBe1lbxYF7UMAIm/IcopxMHrMQDq3nvKcjPKIhZklUKL+AE7J7uApI4kwe2snsK+eI6UTj9EHg==";
       };
     };
-    "vfile-message-2.0.4" = {
-      name = "vfile-message";
-      packageName = "vfile-message";
-      version = "2.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vfile-message/-/vfile-message-2.0.4.tgz";
-        sha512 = "DjssxRGkMvifUOJre00juHoP9DPWuzjxKuMDrhNbk2TdaYYBNMStsNhEOt3idrtI12VQYM/1+iM0KOzXi4pxwQ==";
-      };
-    };
     "vfile-message-3.1.4" = {
       name = "vfile-message";
       packageName = "vfile-message";
@@ -32498,15 +31931,6 @@ let
         sha512 = "xGmv9QIWs2H8obGbWg+sIPI/3/pFgj/5OWBhNzs00BkYQ9UaB2F6JJaGB/2/YOZJ3BvLXQTC4Q7muqU25QgAhA==";
       };
     };
-    "vscode-jsonrpc-5.1.0-next.1" = {
-      name = "vscode-jsonrpc";
-      packageName = "vscode-jsonrpc";
-      version = "5.1.0-next.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-5.1.0-next.1.tgz";
-        sha512 = "mwLDojZkbmpizSJSmp690oa9FB9jig18SIDGZeBCvFc2/LYSRvMm/WwWtMBJuJ1MfFh7rZXfQige4Uje5Z9NzA==";
-      };
-    };
     "vscode-jsonrpc-6.0.0" = {
       name = "vscode-jsonrpc";
       packageName = "vscode-jsonrpc";
@@ -32534,15 +31958,6 @@ let
         sha512 = "kdjOSJ2lLIn7r1rtrMbbNCHjyMPfRnowdKjBQ+mGq6NAW5QY2bEZC/khaC5OR8svbbjvLEaIXkOq45e2X9BIbQ==";
       };
     };
-    "vscode-languageserver-6.2.0-next.2" = {
-      name = "vscode-languageserver";
-      packageName = "vscode-languageserver";
-      version = "6.2.0-next.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-6.2.0-next.2.tgz";
-        sha512 = "UCXULa/RmT2zxcb6auNezl9ZIPwYHS15+a0XzybrpT2+xA0RbHEYQCsIQkTRYjGv8cm3yS9iPJMmxLilP+y1Xw==";
-      };
-    };
     "vscode-languageserver-7.0.0" = {
       name = "vscode-languageserver";
       packageName = "vscode-languageserver";
@@ -32570,15 +31985,6 @@ let
         sha512 = "sdeUoAawceQdgIfTI+sdcwkiK2KU+2cbEYA0agzM2uqaUy2UpnnGHtWTHVEtS0ES4zHU0eMFRGN+oQgDxlD66A==";
       };
     };
-    "vscode-languageserver-protocol-3.16.0-next.2" = {
-      name = "vscode-languageserver-protocol";
-      packageName = "vscode-languageserver-protocol";
-      version = "3.16.0-next.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.16.0-next.2.tgz";
-        sha512 = "atmkGT/W6tF0cx4SaWFYtFs2UeSeC28RPiap9myv2YZTaTCFvTBEPNWrU5QRKfkyM0tbgtGo6T3UCQ8tkDpjzA==";
-      };
-    };
     "vscode-languageserver-protocol-3.17.3" = {
       name = "vscode-languageserver-protocol";
       packageName = "vscode-languageserver-protocol";
@@ -32615,15 +32021,6 @@ let
         sha512 = "k8luDIWJWyenLc5ToFQQMaSrqCHiLwyKPHKPQZ5zz21vM+vIVUSvsRpcbiECH4WR88K2XZqc4ScRcZ7nk/jbeA==";
       };
     };
-    "vscode-languageserver-types-3.16.0-next.1" = {
-      name = "vscode-languageserver-types";
-      packageName = "vscode-languageserver-types";
-      version = "3.16.0-next.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.1.tgz";
-        sha512 = "tZFUSbyjUcrh+qQf13ALX4QDdOfDX0cVaBFgy7ktJ0VwS7AW/yRKgGPSxVqqP9OCMNPdqP57O5q47w2pEwfaUg==";
-      };
-    };
     "vscode-languageserver-types-3.17.0-next.3" = {
       name = "vscode-languageserver-types";
       packageName = "vscode-languageserver-types";
@@ -32642,15 +32039,6 @@ let
         sha512 = "SYU4z1dL0PyIMd4Vj8YOqFvHu7Hz/enbWtpfnVbJHU4Nd1YNYx8u0ennumc6h48GQNeOLxmwySmnADouT/AuZA==";
       };
     };
-    "vscode-languageserver-types-3.17.5" = {
-      name = "vscode-languageserver-types";
-      packageName = "vscode-languageserver-types";
-      version = "3.17.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz";
-        sha512 = "Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==";
-      };
-    };
     "vscode-nls-4.1.2" = {
       name = "vscode-nls";
       packageName = "vscode-nls";
@@ -33713,15 +33101,6 @@ let
         sha512 = "XBx9AXhXktjUqnepgTiE5flcKIYWi/rme0Eaj+5Y0lftuGBq+jyRu/md4WnuxqgP1ubdpNCsYEYPxrzVHD8d6g==";
       };
     };
-    "zwitch-1.0.5" = {
-      name = "zwitch";
-      packageName = "zwitch";
-      version = "1.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/zwitch/-/zwitch-1.0.5.tgz";
-        sha512 = "V50KMwwzqJV0NpZIZFwfOD5/lyny3WlSzRiXgA0G7VUnRlqttta1L6UQIHzd6EuBY/cHGfwTIck7w1yH6Q5zUw==";
-      };
-    };
     "zwitch-2.0.4" = {
       name = "zwitch";
       packageName = "zwitch";
@@ -37659,373 +37038,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-stylelint = nodeEnv.buildNodePackage {
-    name = "coc-stylelint";
-    packageName = "coc-stylelint";
-    version = "1.2.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-stylelint/-/coc-stylelint-1.2.0.tgz";
-      sha512 = "+GYR6KTvHQnqu0j1kXT30hRZMuCwG/G52wG/19LSPE+p9Q0i8XFH6582T0btTu39xz2TPsDOGjT1VgyRw2urug==";
-    };
-    dependencies = [
-      sources."@ampproject/remapping-2.3.0"
-      sources."@babel/code-frame-7.26.2"
-      sources."@babel/compat-data-7.26.8"
-      (
-        sources."@babel/core-7.26.10"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      sources."@babel/generator-7.26.10"
-      (
-        sources."@babel/helper-compilation-targets-7.26.5"
-        // {
-          dependencies = [
-            sources."lru-cache-5.1.1"
-            sources."semver-6.3.1"
-            sources."yallist-3.1.1"
-          ];
-        }
-      )
-      sources."@babel/helper-module-imports-7.25.9"
-      sources."@babel/helper-module-transforms-7.26.0"
-      sources."@babel/helper-string-parser-7.25.9"
-      sources."@babel/helper-validator-identifier-7.25.9"
-      sources."@babel/helper-validator-option-7.25.9"
-      sources."@babel/helpers-7.26.10"
-      sources."@babel/parser-7.26.10"
-      sources."@babel/template-7.26.9"
-      sources."@babel/traverse-7.26.10"
-      sources."@babel/types-7.26.10"
-      sources."@jridgewell/gen-mapping-0.3.8"
-      sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.5.0"
-      sources."@jridgewell/trace-mapping-0.3.25"
-      sources."@nodelib/fs.scandir-2.1.5"
-      sources."@nodelib/fs.stat-2.0.5"
-      sources."@nodelib/fs.walk-1.2.8"
-      sources."@stylelint/postcss-css-in-js-0.37.3"
-      sources."@stylelint/postcss-markdown-0.36.2"
-      sources."@types/mdast-3.0.15"
-      sources."@types/minimist-1.2.5"
-      sources."@types/normalize-package-data-2.4.4"
-      sources."@types/parse-json-4.0.2"
-      sources."@types/unist-2.0.11"
-      sources."ajv-8.17.1"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."array-union-2.1.0"
-      sources."arrify-1.0.1"
-      sources."astral-regex-2.0.0"
-      (
-        sources."autoprefixer-9.8.8"
-        // {
-          dependencies = [
-            sources."picocolors-0.2.1"
-          ];
-        }
-      )
-      sources."bail-1.0.5"
-      sources."balanced-match-2.0.0"
-      (
-        sources."brace-expansion-1.1.11"
-        // {
-          dependencies = [
-            sources."balanced-match-1.0.2"
-          ];
-        }
-      )
-      sources."braces-3.0.3"
-      sources."browserslist-4.24.4"
-      sources."callsites-3.1.0"
-      sources."camelcase-5.3.1"
-      sources."camelcase-keys-6.2.2"
-      sources."caniuse-lite-1.0.30001704"
-      sources."chalk-4.1.2"
-      sources."character-entities-1.2.4"
-      sources."character-entities-legacy-1.1.4"
-      sources."character-reference-invalid-1.1.4"
-      sources."clone-regexp-2.2.0"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."concat-map-0.0.1"
-      sources."convert-source-map-2.0.0"
-      sources."cosmiconfig-7.1.0"
-      sources."cssesc-3.0.0"
-      sources."debug-4.4.0"
-      sources."decamelize-1.2.0"
-      (
-        sources."decamelize-keys-1.1.1"
-        // {
-          dependencies = [
-            sources."map-obj-1.0.1"
-          ];
-        }
-      )
-      sources."dir-glob-3.0.1"
-      (
-        sources."dom-serializer-0.2.2"
-        // {
-          dependencies = [
-            sources."domelementtype-2.3.0"
-            sources."entities-2.2.0"
-          ];
-        }
-      )
-      sources."domelementtype-1.3.1"
-      sources."domhandler-2.4.2"
-      sources."domutils-1.7.0"
-      sources."electron-to-chromium-1.5.118"
-      sources."emoji-regex-8.0.0"
-      sources."entities-1.1.2"
-      sources."error-ex-1.3.2"
-      sources."escalade-3.2.0"
-      sources."execall-2.0.0"
-      sources."extend-3.0.2"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-diff-1.3.0"
-      sources."fast-glob-3.3.3"
-      sources."fast-uri-3.0.6"
-      sources."fastest-levenshtein-1.0.16"
-      sources."fastq-1.19.1"
-      sources."file-entry-cache-6.0.1"
-      sources."fill-range-7.1.1"
-      sources."find-up-4.1.0"
-      sources."flat-cache-3.2.0"
-      sources."flatted-3.3.3"
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.2"
-      sources."gensync-1.0.0-beta.2"
-      sources."get-stdin-8.0.0"
-      sources."glob-7.2.3"
-      sources."glob-parent-5.1.2"
-      sources."global-modules-2.0.0"
-      sources."global-prefix-3.0.0"
-      sources."globals-11.12.0"
-      sources."globby-11.1.0"
-      sources."globjoin-0.1.4"
-      sources."gonzales-pe-4.3.0"
-      sources."hard-rejection-2.1.0"
-      sources."has-flag-4.0.0"
-      sources."hasown-2.0.2"
-      sources."hosted-git-info-2.8.9"
-      sources."html-tags-3.3.1"
-      sources."htmlparser2-3.10.1"
-      sources."ignore-5.3.2"
-      (
-        sources."import-fresh-3.3.1"
-        // {
-          dependencies = [
-            sources."resolve-from-4.0.0"
-          ];
-        }
-      )
-      sources."import-lazy-4.0.0"
-      sources."imurmurhash-0.1.4"
-      sources."indent-string-4.0.0"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ini-1.3.8"
-      sources."is-alphabetical-1.0.4"
-      sources."is-alphanumerical-1.0.4"
-      sources."is-arrayish-0.2.1"
-      sources."is-buffer-2.0.5"
-      sources."is-core-module-2.16.1"
-      sources."is-decimal-1.0.4"
-      sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-glob-4.0.3"
-      sources."is-hexadecimal-1.0.4"
-      sources."is-number-7.0.0"
-      sources."is-plain-obj-1.1.0"
-      sources."is-regexp-2.1.0"
-      sources."is-typedarray-1.0.0"
-      sources."is-unicode-supported-0.1.0"
-      sources."isexe-2.0.0"
-      sources."js-tokens-4.0.0"
-      sources."jsesc-3.1.0"
-      sources."json-buffer-3.0.1"
-      sources."json-parse-even-better-errors-2.3.1"
-      sources."json-schema-traverse-1.0.0"
-      sources."json5-2.2.3"
-      sources."keyv-4.5.4"
-      sources."kind-of-6.0.3"
-      sources."known-css-properties-0.21.0"
-      sources."lines-and-columns-1.2.4"
-      sources."locate-path-5.0.0"
-      sources."lodash-4.17.21"
-      sources."lodash.truncate-4.4.2"
-      sources."log-symbols-4.1.0"
-      sources."longest-streak-2.0.4"
-      sources."lru-cache-6.0.0"
-      sources."map-obj-4.3.0"
-      sources."mathml-tag-names-2.1.3"
-      sources."mdast-util-from-markdown-0.8.5"
-      sources."mdast-util-to-markdown-0.6.5"
-      sources."mdast-util-to-string-2.0.0"
-      sources."meow-9.0.0"
-      sources."merge2-1.4.1"
-      sources."micromark-2.11.4"
-      sources."micromatch-4.0.8"
-      sources."min-indent-1.0.1"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."minimist-options-4.1.0"
-      sources."ms-2.1.3"
-      sources."node-releases-2.0.19"
-      (
-        sources."normalize-package-data-3.0.3"
-        // {
-          dependencies = [
-            sources."hosted-git-info-4.1.0"
-            sources."semver-7.7.1"
-          ];
-        }
-      )
-      sources."normalize-range-0.1.2"
-      sources."normalize-selector-0.2.0"
-      sources."num2fraction-1.2.2"
-      sources."once-1.4.0"
-      sources."p-limit-2.3.0"
-      sources."p-locate-4.1.0"
-      sources."p-try-2.2.0"
-      sources."parent-module-1.0.1"
-      sources."parse-entities-2.0.0"
-      sources."parse-json-5.2.0"
-      sources."path-exists-4.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-is-inside-1.0.2"
-      sources."path-parse-1.0.7"
-      sources."path-type-4.0.0"
-      sources."picocolors-1.1.1"
-      sources."picomatch-2.3.1"
-      (
-        sources."postcss-7.0.39"
-        // {
-          dependencies = [
-            sources."picocolors-0.2.1"
-          ];
-        }
-      )
-      sources."postcss-html-0.36.0"
-      sources."postcss-less-3.1.4"
-      sources."postcss-media-query-parser-0.2.3"
-      sources."postcss-resolve-nested-selector-0.1.6"
-      sources."postcss-safe-parser-4.0.2"
-      sources."postcss-sass-0.4.4"
-      sources."postcss-scss-2.1.1"
-      sources."postcss-selector-parser-6.1.2"
-      sources."postcss-syntax-0.36.2"
-      sources."postcss-value-parser-4.2.0"
-      sources."queue-microtask-1.2.3"
-      sources."quick-lru-4.0.1"
-      (
-        sources."read-pkg-5.2.0"
-        // {
-          dependencies = [
-            sources."normalize-package-data-2.5.0"
-            sources."type-fest-0.6.0"
-          ];
-        }
-      )
-      (
-        sources."read-pkg-up-7.0.1"
-        // {
-          dependencies = [
-            sources."type-fest-0.8.1"
-          ];
-        }
-      )
-      sources."readable-stream-3.6.2"
-      sources."redent-3.0.0"
-      sources."remark-13.0.0"
-      sources."remark-parse-9.0.0"
-      sources."remark-stringify-9.0.1"
-      sources."repeat-string-1.6.1"
-      sources."require-from-string-2.0.2"
-      sources."resolve-1.22.10"
-      sources."resolve-from-5.0.0"
-      sources."reusify-1.1.0"
-      sources."rimraf-3.0.2"
-      sources."run-parallel-1.2.0"
-      sources."safe-buffer-5.2.1"
-      sources."semver-5.7.2"
-      sources."signal-exit-3.0.7"
-      sources."slash-3.0.0"
-      sources."slice-ansi-4.0.0"
-      sources."source-map-0.6.1"
-      sources."spdx-correct-3.2.0"
-      sources."spdx-exceptions-2.5.0"
-      sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.21"
-      sources."specificity-0.4.1"
-      sources."string-width-4.2.3"
-      sources."string_decoder-1.3.0"
-      sources."strip-ansi-6.0.1"
-      sources."strip-indent-3.0.0"
-      sources."style-search-0.1.0"
-      sources."stylelint-13.13.1"
-      sources."sugarss-2.0.0"
-      sources."supports-color-7.2.0"
-      sources."supports-preserve-symlinks-flag-1.0.0"
-      sources."svg-tags-1.0.0"
-      sources."table-6.9.0"
-      sources."to-regex-range-5.0.1"
-      sources."trim-newlines-3.0.1"
-      sources."trough-1.0.5"
-      sources."type-fest-0.18.1"
-      sources."typedarray-to-buffer-3.1.5"
-      (
-        sources."unified-9.2.2"
-        // {
-          dependencies = [
-            sources."is-plain-obj-2.1.0"
-          ];
-        }
-      )
-      sources."unist-util-find-all-after-3.0.2"
-      sources."unist-util-is-4.1.0"
-      sources."unist-util-stringify-position-2.0.3"
-      sources."update-browserslist-db-1.1.3"
-      sources."util-deprecate-1.0.2"
-      sources."v8-compile-cache-2.4.0"
-      sources."validate-npm-package-license-3.0.4"
-      sources."vfile-4.2.1"
-      sources."vfile-message-2.0.4"
-      sources."vscode-jsonrpc-5.1.0-next.1"
-      sources."vscode-languageserver-6.2.0-next.2"
-      (
-        sources."vscode-languageserver-protocol-3.16.0-next.2"
-        // {
-          dependencies = [
-            sources."vscode-languageserver-types-3.16.0-next.1"
-          ];
-        }
-      )
-      sources."vscode-languageserver-textdocument-1.0.12"
-      sources."vscode-languageserver-types-3.17.5"
-      sources."vscode-uri-2.1.2"
-      sources."which-1.3.1"
-      sources."wrappy-1.0.2"
-      sources."write-file-atomic-3.0.3"
-      sources."yallist-4.0.0"
-      sources."yaml-1.10.2"
-      sources."yargs-parser-20.2.9"
-      sources."zwitch-1.0.5"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "stylelint extension for coc.nvim";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-sumneko-lua = nodeEnv.buildNodePackage {
     name = "coc-sumneko-lua";
     packageName = "coc-sumneko-lua";

From 4647cf35a0b3bdc54f25ae6ff3b28d8c8ce62a6e Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 17:04:24 -0500
Subject: [PATCH 5988/6226] coc-sumneko-lua: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |   14 +-
 .../vim/plugins/nodePackagePlugins.nix        |    1 -
 .../co/coc-sumneko-lua/package-lock-fix.patch | 1000 +++++++++++++++++
 pkgs/by-name/co/coc-sumneko-lua/package.nix   |   60 +
 pkgs/by-name/co/coc-sumneko-lua/update.sh     |   31 +
 pkgs/development/node-packages/aliases.nix    |    1 +
 .../node-packages/node-packages.json          |    1 -
 .../node-packages/node-packages.nix           |   21 -
 8 files changed, 1102 insertions(+), 27 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-sumneko-lua/package-lock-fix.patch
 create mode 100644 pkgs/by-name/co/coc-sumneko-lua/package.nix
 create mode 100755 pkgs/by-name/co/coc-sumneko-lua/update.sh

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index 26a8f659445e..8906d1c577ba 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -29,8 +29,9 @@
   coc-snippets,
   coc-solargraph,
   coc-spell-checker,
-  coc-stylelint,
   coc-sqlfluff,
+  coc-stylelint,
+  coc-sumneko-lua,
   coc-toml,
 }:
 final: prev: {
@@ -182,14 +183,19 @@ final: prev: {
     src = "${coc-spell-checker}/lib/node_modules/coc-spell-checker";
   };
 
+  coc-sqlfluff = buildVimPlugin {
+    inherit (coc-sqlfluff) pname version meta;
+    src = "${coc-sqlfluff}/lib/node_modules/coc-sqlfluff";
+  };
+
   coc-stylelint = buildVimPlugin {
     inherit (coc-stylelint) pname version meta;
     src = "${coc-stylelint}/lib/node_modules/coc-stylelint";
   };
 
-  coc-sqlfluff = buildVimPlugin {
-    inherit (coc-sqlfluff) pname version meta;
-    src = "${coc-sqlfluff}/lib/node_modules/coc-sqlfluff";
+  coc-sumneko-lua = buildVimPlugin {
+    inherit (coc-sumneko-lua) pname version meta;
+    src = "${coc-sumneko-lua}/lib/node_modules/coc-sumneko-lua";
   };
 
   coc-toml = buildVimPlugin {
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index 01e416d0c4d1..3cb9fc19a04f 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -8,7 +8,6 @@ let
   nodePackageNames = [
     "coc-go"
     "coc-ltex"
-    "coc-sumneko-lua"
     "coc-tabnine"
     "coc-texlab"
     "coc-tsserver"
diff --git a/pkgs/by-name/co/coc-sumneko-lua/package-lock-fix.patch b/pkgs/by-name/co/coc-sumneko-lua/package-lock-fix.patch
new file mode 100644
index 000000000000..b29492f48824
--- /dev/null
+++ b/pkgs/by-name/co/coc-sumneko-lua/package-lock-fix.patch
@@ -0,0 +1,1000 @@
+diff --git i/package-lock.json w/package-lock.json
+index 8ff8254..9ea50fc 100644
+--- i/package-lock.json
++++ w/package-lock.json
+@@ -227,6 +227,8 @@
+     },
+     "node_modules/@esbuild/win32-x64": {
+       "version": "0.20.2",
++      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.20.2.tgz",
++      "integrity": "sha512-N49X4lJX27+l9jbLKSqZ6bKNjzQvHaT8IIFUy+YIqmXQdjYCToGWwOItDrfby14c78aDd5NHQl29xingXfCdLQ==",
+       "cpu": [
+         "x64"
+       ],
+@@ -343,6 +345,8 @@
+     },
+     "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==",
+       "dev": true,
+       "license": "ISC",
+       "dependencies": {
+@@ -359,6 +363,8 @@
+     },
+     "node_modules/@isaacs/cliui/node_modules/ansi-regex": {
+       "version": "6.0.1",
++      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
++      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -370,11 +376,15 @@
+     },
+     "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==",
+       "dev": true,
+       "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==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -391,6 +401,8 @@
+     },
+     "node_modules/@isaacs/cliui/node_modules/strip-ansi": {
+       "version": "7.1.0",
++      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
++      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -427,6 +439,8 @@
+     },
+     "node_modules/@nodelib/fs.scandir": {
+       "version": "2.1.5",
++      "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
++      "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -439,6 +453,8 @@
+     },
+     "node_modules/@nodelib/fs.stat": {
+       "version": "2.0.5",
++      "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz",
++      "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -447,6 +463,8 @@
+     },
+     "node_modules/@nodelib/fs.walk": {
+       "version": "1.2.8",
++      "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz",
++      "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -459,6 +477,8 @@
+     },
+     "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==",
+       "dev": true,
+       "license": "MIT",
+       "optional": true,
+@@ -594,6 +614,8 @@
+     },
+     "node_modules/@types/fs-extra": {
+       "version": "11.0.4",
++      "resolved": "https://registry.npmjs.org/@types/fs-extra/-/fs-extra-11.0.4.tgz",
++      "integrity": "sha512-yTbItCNreRooED33qjunPthRcSjERP1r4MqCZc7wv0u2sUkzTFp45tgUfS5+r7FrZPdmCCNflLhVSP/o+SemsQ==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -609,6 +631,8 @@
+     },
+     "node_modules/@types/jsonfile": {
+       "version": "6.1.4",
++      "resolved": "https://registry.npmjs.org/@types/jsonfile/-/jsonfile-6.1.4.tgz",
++      "integrity": "sha512-D5qGUYwjvnNNextdU59/+fI+spnwtTFmyQP0h+PfIOSkNfpU6AOICUOkm4i0OnSk+NyjdPJrxCDro0sJsWlRpQ==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -632,6 +656,8 @@
+     },
+     "node_modules/@types/node-fetch": {
+       "version": "2.6.11",
++      "resolved": "https://registry.npmjs.org/@types/node-fetch/-/node-fetch-2.6.11.tgz",
++      "integrity": "sha512-24xFj9R5+rfQJLRyM56qh+wnVSYhyXC2tkoBndtY0U+vubqNsYXGjufB2nn8Q6gt0LrARwL6UBtMCSVCwl4B1g==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -659,6 +685,8 @@
+     },
+     "node_modules/@types/yauzl": {
+       "version": "2.10.0",
++      "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.0.tgz",
++      "integrity": "sha512-Cn6WYCm0tXv8p6k+A8PvbDG763EDpBoTzHdA+Q/MF6H3sapGjCm9NzoaJncJS9tUKSuCoDs9XHxYYsQDgxR6kw==",
+       "dev": true,
+       "license": "MIT",
+       "optional": true,
+@@ -1952,6 +1980,8 @@
+     },
+     "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==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -1960,6 +1990,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==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -2040,6 +2072,8 @@
+     },
+     "node_modules/array-union": {
+       "version": "2.1.0",
++      "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
++      "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -2157,6 +2191,8 @@
+     },
+     "node_modules/asynckit": {
+       "version": "0.4.0",
++      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
++      "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -2178,6 +2214,8 @@
+     },
+     "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==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -2211,6 +2249,8 @@
+     },
+     "node_modules/braces": {
+       "version": "3.0.2",
++      "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz",
++      "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -2254,6 +2294,8 @@
+     },
+     "node_modules/buffer-crc32": {
+       "version": "0.2.13",
++      "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz",
++      "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -2380,6 +2422,8 @@
+     },
+     "node_modules/chalk": {
+       "version": "4.1.2",
++      "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
++      "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -2550,6 +2594,8 @@
+     },
+     "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==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -2561,11 +2607,15 @@
+     },
+     "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==",
+       "dev": true,
+       "license": "MIT"
+     },
+     "node_modules/combined-stream": {
+       "version": "1.0.8",
++      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
++      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -2620,6 +2670,8 @@
+     },
+     "node_modules/cross-spawn": {
+       "version": "7.0.3",
++      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
++      "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -2699,6 +2751,8 @@
+     },
+     "node_modules/debug": {
+       "version": "4.3.4",
++      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz",
++      "integrity": "sha512-PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -2763,6 +2817,8 @@
+     },
+     "node_modules/delayed-stream": {
+       "version": "1.0.0",
++      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
++      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -2777,6 +2833,8 @@
+     },
+     "node_modules/dir-glob": {
+       "version": "3.0.1",
++      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
++      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -2812,6 +2870,8 @@
+     },
+     "node_modules/eastasianwidth": {
+       "version": "0.2.0",
++      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
++      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -2823,11 +2883,15 @@
+     },
+     "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==",
+       "dev": true,
+       "license": "MIT"
+     },
+     "node_modules/end-of-stream": {
+       "version": "1.4.4",
++      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
++      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -3037,6 +3101,8 @@
+     },
+     "node_modules/esbuild": {
+       "version": "0.20.2",
++      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.20.2.tgz",
++      "integrity": "sha512-WdOOppmUNU+IbZ0PaDiTst80zjnrOkyJNHoKupIcVyU8Lvla3Ugx94VzkQ32Ijqd7UhHJy75gNWDMUekcrSJ6g==",
+       "dev": true,
+       "hasInstallScript": true,
+       "license": "MIT",
+@@ -3083,6 +3149,8 @@
+     },
+     "node_modules/escape-string-regexp": {
+       "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
++      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -3473,6 +3541,8 @@
+     },
+     "node_modules/esrecurse": {
+       "version": "4.3.0",
++      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
++      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+       "dev": true,
+       "license": "BSD-2-Clause",
+       "dependencies": {
+@@ -3484,6 +3554,8 @@
+     },
+     "node_modules/estraverse": {
+       "version": "5.3.0",
++      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
++      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+       "dev": true,
+       "license": "BSD-2-Clause",
+       "engines": {
+@@ -3543,6 +3615,8 @@
+     },
+     "node_modules/executable": {
+       "version": "4.1.1",
++      "resolved": "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz",
++      "integrity": "sha512-8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -3554,6 +3628,8 @@
+     },
+     "node_modules/extract-zip": {
+       "version": "2.0.1",
++      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz",
++      "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==",
+       "dev": true,
+       "license": "BSD-2-Clause",
+       "dependencies": {
+@@ -3607,6 +3683,8 @@
+     },
+     "node_modules/fastq": {
+       "version": "1.13.0",
++      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.13.0.tgz",
++      "integrity": "sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==",
+       "dev": true,
+       "license": "ISC",
+       "dependencies": {
+@@ -3615,6 +3693,8 @@
+     },
+     "node_modules/fd-slicer": {
+       "version": "1.1.0",
++      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz",
++      "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -3635,6 +3715,8 @@
+     },
+     "node_modules/fill-range": {
+       "version": "7.0.1",
++      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz",
++      "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -3727,6 +3809,8 @@
+     },
+     "node_modules/foreground-child": {
+       "version": "3.1.1",
++      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.1.1.tgz",
++      "integrity": "sha512-TMKDUnIte6bfb5nWv7V/caI169OHgvwjb7V4WkeUvbQQdjr5rWKqHFiKWb/fcOwB+CzBT+qbWjvj+DVwRskpIg==",
+       "dev": true,
+       "license": "ISC",
+       "dependencies": {
+@@ -3742,6 +3826,8 @@
+     },
+     "node_modules/form-data": {
+       "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz",
++      "integrity": "sha512-ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -3755,6 +3841,8 @@
+     },
+     "node_modules/fs-extra": {
+       "version": "11.2.0",
++      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.2.0.tgz",
++      "integrity": "sha512-PmDi3uwK5nFuXh7XDTlVnS17xJS7vW36is2+w3xcv8SVxiB4NyATf4ctkVY5bkSjX0Y4nbvZCq1/EjtEyr9ktw==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -3879,6 +3967,8 @@
+     },
+     "node_modules/get-stream": {
+       "version": "5.2.0",
++      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz",
++      "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -3942,6 +4032,8 @@
+     },
+     "node_modules/glob": {
+       "version": "10.3.10",
++      "resolved": "https://registry.npmjs.org/glob/-/glob-10.3.10.tgz",
++      "integrity": "sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g==",
+       "dev": true,
+       "license": "ISC",
+       "dependencies": {
+@@ -3963,6 +4055,8 @@
+     },
+     "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==",
+       "dev": true,
+       "license": "ISC",
+       "dependencies": {
+@@ -3974,6 +4068,8 @@
+     },
+     "node_modules/glob/node_modules/brace-expansion": {
+       "version": "2.0.1",
++      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
++      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -3982,6 +4078,8 @@
+     },
+     "node_modules/glob/node_modules/minimatch": {
+       "version": "9.0.3",
++      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.3.tgz",
++      "integrity": "sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg==",
+       "dev": true,
+       "license": "ISC",
+       "dependencies": {
+@@ -4027,6 +4125,8 @@
+     },
+     "node_modules/globby": {
+       "version": "11.1.0",
++      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
++      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -4059,6 +4159,8 @@
+     },
+     "node_modules/graceful-fs": {
+       "version": "4.2.10",
++      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz",
++      "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==",
+       "dev": true,
+       "license": "ISC"
+     },
+@@ -4080,6 +4182,8 @@
+     },
+     "node_modules/has-flag": {
+       "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
++      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -4195,6 +4299,8 @@
+     },
+     "node_modules/imurmurhash": {
+       "version": "0.1.4",
++      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
++      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -4430,6 +4536,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==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -4451,6 +4559,8 @@
+     },
+     "node_modules/is-fullwidth-code-point": {
+       "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
++      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -4475,6 +4585,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==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -4522,6 +4634,8 @@
+     },
+     "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==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -4711,6 +4825,8 @@
+     },
+     "node_modules/isexe": {
+       "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
++      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
+       "dev": true,
+       "license": "ISC"
+     },
+@@ -4730,6 +4846,8 @@
+     },
+     "node_modules/jackspeak": {
+       "version": "2.3.6",
++      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-2.3.6.tgz",
++      "integrity": "sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ==",
+       "dev": true,
+       "license": "BlueOak-1.0.0",
+       "dependencies": {
+@@ -4813,6 +4931,8 @@
+     },
+     "node_modules/json-stable-stringify-without-jsonify": {
+       "version": "1.0.1",
++      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
++      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -4848,6 +4968,8 @@
+     },
+     "node_modules/jsonfile": {
+       "version": "6.1.0",
++      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
++      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -4949,6 +5071,8 @@
+     },
+     "node_modules/lodash.merge": {
+       "version": "4.6.2",
++      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
++      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -4967,6 +5091,8 @@
+     },
+     "node_modules/lru-cache": {
+       "version": "6.0.0",
++      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
++      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+       "dev": true,
+       "license": "ISC",
+       "dependencies": {
+@@ -5021,6 +5147,8 @@
+     },
+     "node_modules/merge2": {
+       "version": "1.4.1",
++      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
++      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -5049,6 +5177,8 @@
+     },
+     "node_modules/micromatch": {
+       "version": "4.0.5",
++      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz",
++      "integrity": "sha512-DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -5061,6 +5191,8 @@
+     },
+     "node_modules/mime-db": {
+       "version": "1.52.0",
++      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
++      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -5069,6 +5201,8 @@
+     },
+     "node_modules/mime-types": {
+       "version": "2.1.35",
++      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
++      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -5113,6 +5247,8 @@
+     },
+     "node_modules/minipass": {
+       "version": "7.0.4",
++      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.0.4.tgz",
++      "integrity": "sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ==",
+       "dev": true,
+       "license": "ISC",
+       "engines": {
+@@ -5170,6 +5306,8 @@
+     },
+     "node_modules/ms": {
+       "version": "2.1.2",
++      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
++      "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -5194,6 +5332,8 @@
+     },
+     "node_modules/natural-compare": {
+       "version": "1.4.0",
++      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
++      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -5205,6 +5345,8 @@
+     },
+     "node_modules/node-fetch": {
+       "version": "2.7.0",
++      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
++      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -5236,6 +5378,8 @@
+     },
+     "node_modules/node-version-compare": {
+       "version": "1.0.3",
++      "resolved": "https://registry.npmjs.org/node-version-compare/-/node-version-compare-1.0.3.tgz",
++      "integrity": "sha512-unO5GpBAh5YqeGULMLpmDT94oanSDMwtZB8KHTKCH/qrGv8bHN0mlDj9xQDAicCYXv2OLnzdi67lidCrcVotVw==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -5471,6 +5615,8 @@
+     },
+     "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==",
+       "dev": true,
+       "license": "ISC",
+       "dependencies": {
+@@ -5625,6 +5771,8 @@
+     },
+     "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==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -5639,6 +5787,8 @@
+     },
+     "node_modules/path-scurry": {
+       "version": "1.10.1",
++      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.10.1.tgz",
++      "integrity": "sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ==",
+       "dev": true,
+       "license": "BlueOak-1.0.0",
+       "dependencies": {
+@@ -5654,6 +5804,8 @@
+     },
+     "node_modules/path-scurry/node_modules/lru-cache": {
+       "version": "10.2.0",
++      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.2.0.tgz",
++      "integrity": "sha512-2bIM8x+VAf6JT4bKAljS1qUWgMsqZRPGJS6FSahIMPVvctcNhyVp7AJu7quxOW9jwkryBReKZY5tY5JYv2n/7Q==",
+       "dev": true,
+       "license": "ISC",
+       "engines": {
+@@ -5662,6 +5814,8 @@
+     },
+     "node_modules/path-type": {
+       "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
++      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -5676,6 +5830,8 @@
+     },
+     "node_modules/pend": {
+       "version": "1.2.0",
++      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
++      "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -5693,6 +5849,8 @@
+     },
+     "node_modules/picomatch": {
+       "version": "2.3.1",
++      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
++      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -5704,6 +5862,8 @@
+     },
+     "node_modules/pify": {
+       "version": "2.3.0",
++      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
++      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -5818,6 +5978,8 @@
+     },
+     "node_modules/pump": {
+       "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
++      "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -5836,6 +5998,8 @@
+     },
+     "node_modules/queue-microtask": {
+       "version": "1.2.3",
++      "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz",
++      "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==",
+       "dev": true,
+       "funding": [
+         {
+@@ -6102,6 +6266,8 @@
+     },
+     "node_modules/reusify": {
+       "version": "1.0.4",
++      "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
++      "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -6111,6 +6277,8 @@
+     },
+     "node_modules/rimraf": {
+       "version": "5.0.5",
++      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.5.tgz",
++      "integrity": "sha512-CqDakW+hMe/Bz202FPEymy68P+G50RfMQK+Qo5YUqc9SPipvbGjCGKd0RSKEelbsfQuw3g5NZDSrlZZAJurH1A==",
+       "dev": true,
+       "license": "ISC",
+       "dependencies": {
+@@ -6128,6 +6296,8 @@
+     },
+     "node_modules/run-parallel": {
+       "version": "1.2.0",
++      "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz",
++      "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==",
+       "dev": true,
+       "funding": [
+         {
+@@ -6236,6 +6406,8 @@
+     },
+     "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==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -6247,6 +6419,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==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -6274,6 +6448,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==",
+       "dev": true,
+       "license": "ISC",
+       "engines": {
+@@ -6291,6 +6467,8 @@
+     },
+     "node_modules/slash": {
+       "version": "3.0.0",
++      "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz",
++      "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -6360,6 +6538,8 @@
+     },
+     "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==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -6374,6 +6554,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==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -6466,6 +6648,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==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -6478,6 +6662,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==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -6525,6 +6711,8 @@
+     },
+     "node_modules/supports-color": {
+       "version": "7.2.0",
++      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
++      "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -6595,11 +6783,15 @@
+     },
+     "node_modules/text-table": {
+       "version": "0.2.0",
++      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
++      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+       "dev": true,
+       "license": "MIT"
+     },
+     "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==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -6638,6 +6830,8 @@
+     },
+     "node_modules/tr46": {
+       "version": "0.0.3",
++      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
++      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -6770,6 +6964,8 @@
+     },
+     "node_modules/typescript": {
+       "version": "4.9.5",
++      "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.9.5.tgz",
++      "integrity": "sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==",
+       "dev": true,
+       "license": "Apache-2.0",
+       "bin": {
+@@ -6829,6 +7025,8 @@
+     },
+     "node_modules/universalify": {
+       "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
++      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -6902,11 +7100,15 @@
+     },
+     "node_modules/webidl-conversions": {
+       "version": "3.0.1",
++      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz",
++      "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==",
+       "dev": true,
+       "license": "BSD-2-Clause"
+     },
+     "node_modules/whatwg-url": {
+       "version": "5.0.0",
++      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz",
++      "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -6916,6 +7118,8 @@
+     },
+     "node_modules/which": {
+       "version": "2.0.2",
++      "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
++      "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+       "dev": true,
+       "license": "ISC",
+       "dependencies": {
+@@ -7013,6 +7217,8 @@
+     },
+     "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==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -7030,6 +7236,8 @@
+     "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==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -7046,6 +7254,8 @@
+     },
+     "node_modules/wrap-ansi/node_modules/ansi-regex": {
+       "version": "6.0.1",
++      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.0.1.tgz",
++      "integrity": "sha512-n5M855fKb2SsfMIiFFoVrABHJC8QtHwVx+mHWP3QcEqBHYienj5dHSgjbxtC0WEZXYt4wcD6zrQElDPhFuZgfA==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -7057,6 +7267,8 @@
+     },
+     "node_modules/wrap-ansi/node_modules/ansi-styles": {
+       "version": "6.2.1",
++      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.1.tgz",
++      "integrity": "sha512-bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -7068,11 +7280,15 @@
+     },
+     "node_modules/wrap-ansi/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==",
+       "dev": true,
+       "license": "MIT"
+     },
+     "node_modules/wrap-ansi/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==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -7089,6 +7305,8 @@
+     },
+     "node_modules/wrap-ansi/node_modules/strip-ansi": {
+       "version": "7.1.0",
++      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.0.tgz",
++      "integrity": "sha512-iq6eVVI64nQQTRYq2KtEg2d2uU7LElhTJwsH4YzIHZshxlgZms/wIc4VoDQTlG/IvVIrBKG06CrZnp0qv7hkcQ==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -7103,6 +7321,8 @@
+     },
+     "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==",
+       "dev": true,
+       "license": "ISC"
+     },
+@@ -7126,6 +7346,8 @@
+     },
+     "node_modules/yallist": {
+       "version": "4.0.0",
++      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
++      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+       "dev": true,
+       "license": "ISC"
+     },
+@@ -7199,6 +7421,8 @@
+     },
+     "node_modules/yauzl": {
+       "version": "2.10.0",
++      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz",
++      "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
diff --git a/pkgs/by-name/co/coc-sumneko-lua/package.nix b/pkgs/by-name/co/coc-sumneko-lua/package.nix
new file mode 100644
index 000000000000..1de2513c650e
--- /dev/null
+++ b/pkgs/by-name/co/coc-sumneko-lua/package.nix
@@ -0,0 +1,60 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  esbuild,
+  buildGoModule,
+}:
+let
+  esbuild' =
+    let
+      version = "0.20.2";
+    in
+    esbuild.override {
+      buildGoModule =
+        args:
+        buildGoModule (
+          args
+          // {
+            inherit version;
+            src = fetchFromGitHub {
+              owner = "evanw";
+              repo = "esbuild";
+              rev = "v${version}";
+              hash = "sha256-h/Vqwax4B4nehRP9TaYbdixAZdb1hx373dNxNHvDrtY=";
+            };
+            vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+          }
+        );
+    };
+in
+buildNpmPackage (finalAttrs: {
+  pname = "coc-sumneko-lua";
+  version = "0.0.42";
+
+  src = fetchFromGitHub {
+    owner = "xiyaowong";
+    repo = "coc-sumneko-lua";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-B5XvhhBbVeBQI6nWVskaopx2pJYFBiFCfbPwwwloFig=";
+  };
+
+  patches = [
+    ./package-lock-fix.patch
+  ];
+
+  npmDepsHash = "sha256-NEUDQm4hzhGJyEdiBBrSWa8fMw3DcnnPJJo0m+HgZ5U=";
+
+  nativeBuildInputs = [ esbuild' ];
+
+  env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    description = "Lua extension using sumneko lua-language-server for coc.nvim";
+    homepage = "https://github.com/xiyaowong/coc-sumneko-lua";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-sumneko-lua/update.sh b/pkgs/by-name/co/coc-sumneko-lua/update.sh
new file mode 100755
index 000000000000..10b819ed9323
--- /dev/null
+++ b/pkgs/by-name/co/coc-sumneko-lua/update.sh
@@ -0,0 +1,31 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash nodejs nix-update git curl
+
+WORKDIR=$(mktemp -d)
+PACKAGE_DIR="$(realpath "$(dirname "$0")")"
+
+# Get latest tag
+NEW_VERSION=$(curl "https://api.github.com/repos/xiyaowong/coc-sumneko-lua/tags" | jq -r '.[] | .name' | sort --version-sort | tail -1)
+# Trim leading "v" for version comparisons
+NEW_VERSION=${NEW_VERSION:1}
+
+# exit early if no change
+if [[ "$UPDATE_NIX_OLD_VERSION" == "$NEW_VERSION" ]]; then
+  echo "package is up-to-date: $UPDATE_NIX_OLD_VERSION"
+  exit 0
+fi
+
+# Clone source
+git clone "https://github.com/xiyaowong/coc-sumneko-lua" -b "v$NEW_VERSION" "$WORKDIR/src"
+pushd "$WORKDIR/src"
+npx --yes npm-package-lock-add-resolved
+
+# Update package-lock patch
+git diff >"$PACKAGE_DIR/package-lock-fix.patch"
+popd
+
+# Run nix-update
+nix-update "$UPDATE_NIX_PNAME"
+
+# Cleanup
+rm -rf "$WORKDIR"
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 003bc439313f..823487f8703e 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -105,6 +105,7 @@ mapAliases {
   inherit (pkgs) coc-spell-checker; # added 2025-10-01
   inherit (pkgs) coc-sqlfluff; # Added 2025-11-05
   inherit (pkgs) coc-stylelint; # Added 2025-11-05
+  inherit (pkgs) coc-sumneko-lua; # Added 2025-11-05
   inherit (pkgs) coc-toml;
   coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
   coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 51ae5514919b..1df68c9ea892 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -23,7 +23,6 @@
 , "clipboard-cli"
 , "coc-go"
 , "coc-ltex"
-, "coc-sumneko-lua"
 , "coc-tabnine"
 , "coc-texlab"
 , "coc-tsserver"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 26571f4af9e6..2abbeea47c4b 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37038,27 +37038,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-sumneko-lua = nodeEnv.buildNodePackage {
-    name = "coc-sumneko-lua";
-    packageName = "coc-sumneko-lua";
-    version = "0.0.42";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-sumneko-lua/-/coc-sumneko-lua-0.0.42.tgz";
-      sha512 = "elUmSurb51E17VV/1W/qsAoD5qq6pFsnRK549WFMcG+AThli6nTj2Y6Ta0FA6+zh7QSjbraOlza8gk7C2w3Nfg==";
-    };
-    dependencies = [
-      sources."tslib-2.8.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Lua extension using sumneko lua-language-server for coc.nvim";
-      homepage = "https://github.com/xiyaowong/coc-sumneko-lua#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-tabnine = nodeEnv.buildNodePackage {
     name = "coc-tabnine";
     packageName = "coc-tabnine";

From ef2f4bdc396ce7126b0b1f7048655e54271400be Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 17:04:59 -0500
Subject: [PATCH 5989/6226] coc-tabnine: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 ++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-tabnine/package.nix       | 73 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 17 -----
 6 files changed, 80 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-tabnine/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index 8906d1c577ba..d630a1d62e87 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -32,6 +32,7 @@
   coc-sqlfluff,
   coc-stylelint,
   coc-sumneko-lua,
+  coc-tabnine,
   coc-toml,
 }:
 final: prev: {
@@ -198,6 +199,11 @@ final: prev: {
     src = "${coc-sumneko-lua}/lib/node_modules/coc-sumneko-lua";
   };
 
+  coc-tabnine = buildVimPlugin {
+    inherit (coc-tabnine) pname version meta;
+    src = "${coc-tabnine}/lib/node_modules/coc-tabnine";
+  };
+
   coc-toml = buildVimPlugin {
     pname = "coc-toml";
     inherit (coc-toml) version meta;
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index 3cb9fc19a04f..a9a5d509b32e 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -8,7 +8,6 @@ let
   nodePackageNames = [
     "coc-go"
     "coc-ltex"
-    "coc-tabnine"
     "coc-texlab"
     "coc-tsserver"
     "coc-ultisnips"
diff --git a/pkgs/by-name/co/coc-tabnine/package.nix b/pkgs/by-name/co/coc-tabnine/package.nix
new file mode 100644
index 000000000000..ea7d850dd90b
--- /dev/null
+++ b/pkgs/by-name/co/coc-tabnine/package.nix
@@ -0,0 +1,73 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+  esbuild,
+  buildGoModule,
+}:
+let
+  esbuild' =
+    let
+      version = "0.8.33";
+    in
+    esbuild.override {
+      buildGoModule =
+        args:
+        buildGoModule (
+          args
+          // {
+            inherit version;
+            src = fetchFromGitHub {
+              owner = "evanw";
+              repo = "esbuild";
+              rev = "v${version}";
+              hash = "sha256-u/3YHQZskgbkaXV7RF8G9kMMx1A25hHhHv+VQdZZ4EU=";
+            };
+            vendorHash = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg=";
+          }
+        );
+    };
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-tabnine";
+  version = "1.3.7";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-tabnine";
+    tag = finalAttrs.version;
+    hash = "sha256-7l4gCpArP1pp/SfYiyzjLc8VH7HVhwx2slorQcuA6k4=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-Pg/AQv9/VTUXTu6q71vQ+0AMNswHEoCOAWnWIeuy/lQ=";
+  };
+
+  yarnBuildScript = "prepare";
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+    esbuild'
+  ];
+
+  env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Tabnine extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-tabnine";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 823487f8703e..c532259e4be3 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -106,6 +106,7 @@ mapAliases {
   inherit (pkgs) coc-sqlfluff; # Added 2025-11-05
   inherit (pkgs) coc-stylelint; # Added 2025-11-05
   inherit (pkgs) coc-sumneko-lua; # Added 2025-11-05
+  inherit (pkgs) coc-tabnine; # Added 2025-11-05
   inherit (pkgs) coc-toml;
   coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
   coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 1df68c9ea892..038642848fbc 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -23,7 +23,6 @@
 , "clipboard-cli"
 , "coc-go"
 , "coc-ltex"
-, "coc-tabnine"
 , "coc-texlab"
 , "coc-tsserver"
 , "coc-ultisnips"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 2abbeea47c4b..4427f16a7a5c 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37038,23 +37038,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-tabnine = nodeEnv.buildNodePackage {
-    name = "coc-tabnine";
-    packageName = "coc-tabnine";
-    version = "1.3.7";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-tabnine/-/coc-tabnine-1.3.7.tgz";
-      sha512 = "aLh9A6/r1/1QZT/1lJnaLdShGHRrCCb3HA57UYeFR0cD1xjRY3YupfmsOwVSbpqv6AufEXeOdbA2enoVhRFY8g==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "tabnine extension for coc.nvim";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-texlab = nodeEnv.buildNodePackage {
     name = "coc-texlab";
     packageName = "coc-texlab";

From 012cccc12929b5119061236f9551c64cfe6d4764 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 17:05:40 -0500
Subject: [PATCH 5990/6226] coc-texlab: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 ++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-texlab/package.nix        | 71 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 18 -----
 6 files changed, 78 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-texlab/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index d630a1d62e87..9d5eaeda0c5a 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -33,6 +33,7 @@
   coc-stylelint,
   coc-sumneko-lua,
   coc-tabnine,
+  coc-texlab,
   coc-toml,
 }:
 final: prev: {
@@ -204,6 +205,11 @@ final: prev: {
     src = "${coc-tabnine}/lib/node_modules/coc-tabnine";
   };
 
+  coc-texlab = buildVimPlugin {
+    inherit (coc-texlab) pname version meta;
+    src = "${coc-texlab}/lib/node_modules/coc-texlab";
+  };
+
   coc-toml = buildVimPlugin {
     pname = "coc-toml";
     inherit (coc-toml) version meta;
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index a9a5d509b32e..ca4c0ca0e078 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -8,7 +8,6 @@ let
   nodePackageNames = [
     "coc-go"
     "coc-ltex"
-    "coc-texlab"
     "coc-tsserver"
     "coc-ultisnips"
     "coc-vimlsp"
diff --git a/pkgs/by-name/co/coc-texlab/package.nix b/pkgs/by-name/co/coc-texlab/package.nix
new file mode 100644
index 000000000000..c260c3059447
--- /dev/null
+++ b/pkgs/by-name/co/coc-texlab/package.nix
@@ -0,0 +1,71 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+  esbuild,
+  buildGoModule,
+}:
+let
+  esbuild' =
+    let
+      version = "0.25.0";
+    in
+    esbuild.override {
+      buildGoModule =
+        args:
+        buildGoModule (
+          args
+          // {
+            inherit version;
+            src = fetchFromGitHub {
+              owner = "evanw";
+              repo = "esbuild";
+              rev = "v${version}";
+              hash = "sha256-L9jm94Epb22hYsU3hoq1lZXb5aFVD4FC4x2qNt0DljA=";
+            };
+            vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+          }
+        );
+    };
+in
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-texlab";
+  version = "0-unstable-2025-07-22";
+
+  src = fetchFromGitHub {
+    owner = "fannheyward";
+    repo = "coc-texlab";
+    rev = "a4ad3f259d94086f4971b22b97833e8a72226782";
+    hash = "sha256-6W+L/LdF6g0Xwhv+9VtjjfzRjlbN7OaqHbSXtO3cfZ0=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-g2IwfO1IMktTtflR2m7c99wOYLJYmD2I7hBbCNy+XFA=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+    esbuild'
+  ];
+
+  env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "TexLab extension for coc.nvim";
+    homepage = "https://github.com/fannheyward/coc-texlab";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index c532259e4be3..a8836c6e736b 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -107,6 +107,7 @@ mapAliases {
   inherit (pkgs) coc-stylelint; # Added 2025-11-05
   inherit (pkgs) coc-sumneko-lua; # Added 2025-11-05
   inherit (pkgs) coc-tabnine; # Added 2025-11-05
+  inherit (pkgs) coc-texlab; # Added 2025-11-05
   inherit (pkgs) coc-toml;
   coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
   coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 038642848fbc..849d9940a8b0 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -23,7 +23,6 @@
 , "clipboard-cli"
 , "coc-go"
 , "coc-ltex"
-, "coc-texlab"
 , "coc-tsserver"
 , "coc-ultisnips"
 , "coc-vimlsp"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 4427f16a7a5c..c4263ac3e230 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37038,24 +37038,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-texlab = nodeEnv.buildNodePackage {
-    name = "coc-texlab";
-    packageName = "coc-texlab";
-    version = "3.3.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-texlab/-/coc-texlab-3.3.0.tgz";
-      sha512 = "MV/zLxI6jvu/IWS3/dyc8Dsgz9ypO86hSAHwjRbDGTc/V9t8jTPUnI4E1hzmsF8bfIjxnUU/oyITX9tLTOnCOQ==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "TexLab extension for coc.nvim";
-      homepage = "https://github.com/fannheyward/coc-texlab#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-tsserver = nodeEnv.buildNodePackage {
     name = "coc-tsserver";
     packageName = "coc-tsserver";

From 0e1e74d71dce62bd3f7a31d6e1f30351d45cecf6 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 17:06:24 -0500
Subject: [PATCH 5991/6226] coc-vimlsp: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 +++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-vimlsp/package.nix        | 45 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 18 --------
 6 files changed, 52 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-vimlsp/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index 9d5eaeda0c5a..c37cc5bd435b 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -35,6 +35,7 @@
   coc-tabnine,
   coc-texlab,
   coc-toml,
+  coc-vimlsp,
 }:
 final: prev: {
   coc-basedpyright = buildVimPlugin {
@@ -215,4 +216,9 @@ final: prev: {
     inherit (coc-toml) version meta;
     src = "${coc-toml}/lib/node_modules/coc-toml";
   };
+
+  coc-vimlsp = buildVimPlugin {
+    inherit (coc-vimlsp) pname version meta;
+    src = "${coc-vimlsp}/lib/node_modules/coc-vimlsp";
+  };
 }
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index ca4c0ca0e078..ed744c3574ef 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -10,7 +10,6 @@ let
     "coc-ltex"
     "coc-tsserver"
     "coc-ultisnips"
-    "coc-vimlsp"
     "coc-vimtex"
     "coc-wxml"
     "coc-yaml"
diff --git a/pkgs/by-name/co/coc-vimlsp/package.nix b/pkgs/by-name/co/coc-vimlsp/package.nix
new file mode 100644
index 000000000000..06ac152b85e4
--- /dev/null
+++ b/pkgs/by-name/co/coc-vimlsp/package.nix
@@ -0,0 +1,45 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-vimlsp";
+  version = "0-unstable-2023-06-26";
+
+  src = fetchFromGitHub {
+    owner = "iamcco";
+    repo = "coc-vimlsp";
+    rev = "9e88f053201b8b224a6849ce8f891f526e75a28b";
+    hash = "sha256-U5nJRn0UZsGfyDR4gZN2E+TSWk0A7RXJqMRQMK3QV00=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-K5hC3YrzSxULt0SiX7r+b8uNWdnvqGe+/GBvZiFzW0c=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+  ];
+
+  NODE_OPTIONS = "--openssl-legacy-provider";
+
+  passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
+
+  meta = {
+    description = "vim-language-server extension for coc.nvim";
+    homepage = "https://github.com/iamcco/coc-vimlsp";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index a8836c6e736b..79ce60f8b1ed 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -112,6 +112,7 @@ mapAliases {
   coc-tslint = throw "coc-tslint was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
   coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
   coc-vetur = throw "coc-vetur was removed because vetur was deprecated by Vue in favor of volar. Use coc-volar instead, which supports Vue 3"; # added 2025-10-01
+  inherit (pkgs) coc-vimlsp; # Added 2025-11-05
   coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19
   coffee-script = pkgs.coffeescript; # added 2023-08-18
   inherit (pkgs) concurrently; # added 2024-08-05
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 849d9940a8b0..bdd3d5d564f7 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -25,7 +25,6 @@
 , "coc-ltex"
 , "coc-tsserver"
 , "coc-ultisnips"
-, "coc-vimlsp"
 , "coc-vimtex"
 , "coc-wxml"
 , "coc-yaml"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index c4263ac3e230..4c8736b30dd8 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37077,24 +37077,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-vimlsp = nodeEnv.buildNodePackage {
-    name = "coc-vimlsp";
-    packageName = "coc-vimlsp";
-    version = "0.13.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-vimlsp/-/coc-vimlsp-0.13.1.tgz";
-      sha512 = "rUXjY022KJHLNrlru1zMvqhF+ikYIjlhULoq2fx8PbsA4uyuWLDXvLfeQxj8e5wVNyfPVtaAz54zChLV4OOHAA==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "vim language server extension for coc.nvim";
-      homepage = "https://github.com/iamcco/coc-vim#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-vimtex = nodeEnv.buildNodePackage {
     name = "coc-vimtex";
     packageName = "coc-vimtex";

From 8a33e287e5309a5c4806bb80b847e0344742ed63 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 17:07:00 -0500
Subject: [PATCH 5992/6226] coc-vimtex: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 +++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-vimtex/package.nix        | 41 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 18 --------
 6 files changed, 48 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-vimtex/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index c37cc5bd435b..9eb604983b05 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -36,6 +36,7 @@
   coc-texlab,
   coc-toml,
   coc-vimlsp,
+  coc-vimtex,
 }:
 final: prev: {
   coc-basedpyright = buildVimPlugin {
@@ -221,4 +222,9 @@ final: prev: {
     inherit (coc-vimlsp) pname version meta;
     src = "${coc-vimlsp}/lib/node_modules/coc-vimlsp";
   };
+
+  coc-vimtex = buildVimPlugin {
+    inherit (coc-vimtex) pname version meta;
+    src = "${coc-vimtex}/lib/node_modules/coc-vimtex";
+  };
 }
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index ed744c3574ef..83626979088c 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -10,7 +10,6 @@ let
     "coc-ltex"
     "coc-tsserver"
     "coc-ultisnips"
-    "coc-vimtex"
     "coc-wxml"
     "coc-yaml"
     "coc-yank"
diff --git a/pkgs/by-name/co/coc-vimtex/package.nix b/pkgs/by-name/co/coc-vimtex/package.nix
new file mode 100644
index 000000000000..e886d7c86f1d
--- /dev/null
+++ b/pkgs/by-name/co/coc-vimtex/package.nix
@@ -0,0 +1,41 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-vimtex";
+  version = "1.1.5";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-vimtex";
+    tag = finalAttrs.version;
+    hash = "sha256-Z0vhgpdzh3GY9o6qnYWkeaUtjtoJ6PdqtDpRQHQXCjI=";
+  };
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src;
+    hash = "sha256-XEDPfnEkUTVCpxBp/DAdrRDvxYrTo/e+PTQGmtSy58c=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnInstallHook
+    nodejs
+  ];
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "VimTeX extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-vimtex";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 79ce60f8b1ed..2228b84fc4eb 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -113,6 +113,7 @@ mapAliases {
   coc-tslint-plugin = throw "coc-tslint-plugin was removed because it was deprecated upstream; coc-eslint offers comparable features for eslint, which replaced tslint"; # Added 2024-10-18
   coc-vetur = throw "coc-vetur was removed because vetur was deprecated by Vue in favor of volar. Use coc-volar instead, which supports Vue 3"; # added 2025-10-01
   inherit (pkgs) coc-vimlsp; # Added 2025-11-05
+  inherit (pkgs) coc-vimtex; # Added 2025-11-05
   coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19
   coffee-script = pkgs.coffeescript; # added 2023-08-18
   inherit (pkgs) concurrently; # added 2024-08-05
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index bdd3d5d564f7..28d9555265ef 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -25,7 +25,6 @@
 , "coc-ltex"
 , "coc-tsserver"
 , "coc-ultisnips"
-, "coc-vimtex"
 , "coc-wxml"
 , "coc-yaml"
 , "coc-yank"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 4c8736b30dd8..98d41a763087 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37077,24 +37077,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-vimtex = nodeEnv.buildNodePackage {
-    name = "coc-vimtex";
-    packageName = "coc-vimtex";
-    version = "1.1.5";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-vimtex/-/coc-vimtex-1.1.5.tgz";
-      sha512 = "3SY6vFcmBO8u6/6zrBzqgwCbus8k7877UCNVEua8lgC+T4tKgB4w9VthikMEcoUDPK17/QbLITSB+yPDNebbHw==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "vimtex integration for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-vimtex#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-wxml = nodeEnv.buildNodePackage {
     name = "coc-wxml";
     packageName = "coc-wxml";

From ee22f9dea6d8def0942d53f01a7ec52b823ba6f4 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 17:07:40 -0500
Subject: [PATCH 5993/6226] coc-wxml: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 +++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-wxml/package.nix          | 51 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 17 -------
 6 files changed, 58 insertions(+), 19 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-wxml/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index 9eb604983b05..b0251e64be7a 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -37,6 +37,7 @@
   coc-toml,
   coc-vimlsp,
   coc-vimtex,
+  coc-wxml,
 }:
 final: prev: {
   coc-basedpyright = buildVimPlugin {
@@ -227,4 +228,9 @@ final: prev: {
     inherit (coc-vimtex) pname version meta;
     src = "${coc-vimtex}/lib/node_modules/coc-vimtex";
   };
+
+  coc-wxml = buildVimPlugin {
+    inherit (coc-wxml) pname version meta;
+    src = "${coc-wxml}/lib/node_modules/coc-wxml";
+  };
 }
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index 83626979088c..70913d977a9f 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -10,7 +10,6 @@ let
     "coc-ltex"
     "coc-tsserver"
     "coc-ultisnips"
-    "coc-wxml"
     "coc-yaml"
     "coc-yank"
     "coc-nginx"
diff --git a/pkgs/by-name/co/coc-wxml/package.nix b/pkgs/by-name/co/coc-wxml/package.nix
new file mode 100644
index 000000000000..1bcea339cc24
--- /dev/null
+++ b/pkgs/by-name/co/coc-wxml/package.nix
@@ -0,0 +1,51 @@
+{
+  lib,
+  stdenvNoCC,
+  fetchFromGitHub,
+  fetchYarnDeps,
+  yarnConfigHook,
+  yarnBuildHook,
+  yarnInstallHook,
+  nodejs,
+  nix-update-script,
+}:
+stdenvNoCC.mkDerivation (finalAttrs: {
+  pname = "coc-wxml";
+  version = "1.0.9";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-wxml";
+    tag = finalAttrs.version;
+    hash = "sha256-6tI+rIgoKGafBSxbPumCquAahJVR3rUzJB4VWQR+qw0=";
+  };
+
+  # Fix yarn.lock file
+  postPatch = ''
+    substituteInPlace yarn.lock \
+      --replace-fail "http://registry.npmjs.org" "https://registry.yarnpkg.com"
+  '';
+
+  yarnOfflineCache = fetchYarnDeps {
+    inherit (finalAttrs) src postPatch;
+    hash = "sha256-s2doN+DeVJPIWe/vOuAH7cYl/S/v8S4yeTG6KIWKphA=";
+  };
+
+  nativeBuildInputs = [
+    yarnConfigHook
+    yarnBuildHook
+    yarnInstallHook
+    nodejs
+  ];
+
+  NODE_OPTIONS = "--openssl-legacy-provider";
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Wxml extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-wxml";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 2228b84fc4eb..f69e51c467b1 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -114,6 +114,7 @@ mapAliases {
   coc-vetur = throw "coc-vetur was removed because vetur was deprecated by Vue in favor of volar. Use coc-volar instead, which supports Vue 3"; # added 2025-10-01
   inherit (pkgs) coc-vimlsp; # Added 2025-11-05
   inherit (pkgs) coc-vimtex; # Added 2025-11-05
+  inherit (pkgs) coc-wxml; # Added 2025-11-05
   coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19
   coffee-script = pkgs.coffeescript; # added 2023-08-18
   inherit (pkgs) concurrently; # added 2024-08-05
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 28d9555265ef..92369bd45f56 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -25,7 +25,6 @@
 , "coc-ltex"
 , "coc-tsserver"
 , "coc-ultisnips"
-, "coc-wxml"
 , "coc-yaml"
 , "coc-yank"
 , "code-theme-converter"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 98d41a763087..904e59a24b41 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37077,23 +37077,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-wxml = nodeEnv.buildNodePackage {
-    name = "coc-wxml";
-    packageName = "coc-wxml";
-    version = "1.0.9";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-wxml/-/coc-wxml-1.0.9.tgz";
-      sha512 = "ExbBjO4/7sbwHVawtK/sDzFwmUTwW9rHgm51sJxqQim+Zjn3vw1x0pNObonVb+r/kX9peLCyE6/nmT2ybfeBPg==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "wxml language server extension for coc.nvim";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-yaml = nodeEnv.buildNodePackage {
     name = "coc-yaml";
     packageName = "coc-yaml";

From a5d418f44312e4da4b3427fd3b1969e063429cd2 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 17:08:37 -0500
Subject: [PATCH 5994/6226] coc-yaml: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 ++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 .../co/coc-yaml/package-lock-fix.patch        | 89 +++++++++++++++++++
 pkgs/by-name/co/coc-yaml/package.nix          | 34 +++++++
 pkgs/by-name/co/coc-yaml/update.sh            | 28 ++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 30 -------
 8 files changed, 158 insertions(+), 32 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-yaml/package-lock-fix.patch
 create mode 100644 pkgs/by-name/co/coc-yaml/package.nix
 create mode 100755 pkgs/by-name/co/coc-yaml/update.sh

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index b0251e64be7a..bd12588c9f87 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -38,6 +38,7 @@
   coc-vimlsp,
   coc-vimtex,
   coc-wxml,
+  coc-yaml,
 }:
 final: prev: {
   coc-basedpyright = buildVimPlugin {
@@ -233,4 +234,9 @@ final: prev: {
     inherit (coc-wxml) pname version meta;
     src = "${coc-wxml}/lib/node_modules/coc-wxml";
   };
+
+  coc-yaml = buildVimPlugin {
+    inherit (coc-yaml) pname version meta;
+    src = "${coc-yaml}/lib/node_modules/coc-yaml";
+  };
 }
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index 70913d977a9f..bfcd0c253693 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -10,7 +10,6 @@ let
     "coc-ltex"
     "coc-tsserver"
     "coc-ultisnips"
-    "coc-yaml"
     "coc-yank"
     "coc-nginx"
   ];
diff --git a/pkgs/by-name/co/coc-yaml/package-lock-fix.patch b/pkgs/by-name/co/coc-yaml/package-lock-fix.patch
new file mode 100644
index 000000000000..9475bac1997f
--- /dev/null
+++ b/pkgs/by-name/co/coc-yaml/package-lock-fix.patch
@@ -0,0 +1,89 @@
+diff --git i/package-lock.json w/package-lock.json
+index 294a466..424d557 100644
+--- i/package-lock.json
++++ w/package-lock.json
+@@ -1,12 +1,12 @@
+ {
+   "name": "coc-yaml",
+-  "version": "1.9.0",
++  "version": "1.9.1",
+   "lockfileVersion": 3,
+   "requires": true,
+   "packages": {
+     "": {
+       "name": "coc-yaml",
+-      "version": "1.9.0",
++      "version": "1.9.1",
+       "license": "MIT",
+       "dependencies": {
+         "prettier": "2.0.5"
+@@ -27,6 +27,8 @@
+     },
+     "node_modules/@chemzqm/tsconfig": {
+       "version": "0.0.3",
++      "resolved": "https://registry.npmjs.org/@chemzqm/tsconfig/-/tsconfig-0.0.3.tgz",
++      "integrity": "sha512-MjF25vbqLYR+S+JJLgBi0vn4gZqv/C87H+yPSlVKEqlIJAJOGJOgFPUFvRS7pdRHqkv2flX/oRxzxhlu2V0X1w==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -464,6 +466,8 @@
+     },
+     "node_modules/ansi-styles": {
+       "version": "6.1.0",
++      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.1.0.tgz",
++      "integrity": "sha512-VbqNsoz55SYGczauuup0MFUyXNQviSpFTj1RQtFzmQLk18qbVSpTFFGMT293rmDaQuKCT6InmbuEyUne4mTuxQ==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
+@@ -533,6 +537,8 @@
+     },
+     "node_modules/fs-extra": {
+       "version": "10.0.0",
++      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-10.0.0.tgz",
++      "integrity": "sha512-C5owb14u9eJwizKGdchcDUQeFtlSHHthBk8pbX9Vc1PFZrLombudjDnNns88aYslCyF6IY5SUw3Roz6xShcEIQ==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -546,11 +552,15 @@
+     },
+     "node_modules/graceful-fs": {
+       "version": "4.2.9",
++      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz",
++      "integrity": "sha512-NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ==",
+       "dev": true,
+       "license": "ISC"
+     },
+     "node_modules/jsonfile": {
+       "version": "6.1.0",
++      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
++      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+       "dev": true,
+       "license": "MIT",
+       "dependencies": {
+@@ -562,6 +572,8 @@
+     },
+     "node_modules/prettier": {
+       "version": "2.0.5",
++      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
++      "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
+       "license": "MIT",
+       "bin": {
+         "prettier": "bin-prettier.js"
+@@ -572,6 +584,8 @@
+     },
+     "node_modules/request-light": {
+       "version": "0.5.7",
++      "resolved": "https://registry.npmjs.org/request-light/-/request-light-0.5.7.tgz",
++      "integrity": "sha512-i/wKzvcx7Er8tZnvqSxWuNO5ZGggu2UgZAqj/RyZ0si7lBTXL7kZiI/dWxzxnQjaY7s5HEy1qK21Do4Ncr6cVw==",
+       "dev": true,
+       "license": "MIT"
+     },
+@@ -591,6 +605,8 @@
+     },
+     "node_modules/universalify": {
+       "version": "2.0.0",
++      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz",
++      "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==",
+       "dev": true,
+       "license": "MIT",
+       "engines": {
diff --git a/pkgs/by-name/co/coc-yaml/package.nix b/pkgs/by-name/co/coc-yaml/package.nix
new file mode 100644
index 000000000000..623fa936ddc8
--- /dev/null
+++ b/pkgs/by-name/co/coc-yaml/package.nix
@@ -0,0 +1,34 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "coc-yaml";
+  version = "1.9.1";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-yaml";
+    tag = finalAttrs.version;
+    hash = "sha256-JzIajdgVOVJupxmHrw9GuGDZS863YaUa5FomT2tqBpc=";
+  };
+
+  patches = [
+    ./package-lock-fix.patch
+  ];
+
+  npmDepsHash = "sha256-2XFXeF2ork6cPrYU2avpXSoAvLa7If6AtYtBGoxL/2g=";
+
+  npmBuildScript = "prepare";
+
+  passthru.updateScript = ./update.sh;
+
+  meta = {
+    description = "Yaml language server extension for coc.nvim";
+    homepage = "https://github.com/neoclide/coc-yaml";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/by-name/co/coc-yaml/update.sh b/pkgs/by-name/co/coc-yaml/update.sh
new file mode 100755
index 000000000000..d3e958140a2d
--- /dev/null
+++ b/pkgs/by-name/co/coc-yaml/update.sh
@@ -0,0 +1,28 @@
+#!/usr/bin/env nix-shell
+#!nix-shell -i bash -p bash nodejs nix-update git curl jq
+
+WORKDIR=$(mktemp -d)
+PACKAGE_DIR="$(realpath "$(dirname "$0")")"
+
+# Get latest tag
+NEW_VERSION=$(curl "https://api.github.com/repos/neoclide/coc-yaml/tags" | jq -r '.[] | .name' | sort --version-sort | tail -1)
+
+# exit early if no change
+if [[ "$UPDATE_NIX_OLD_VERSION" == "$NEW_VERSION" ]]; then
+  echo "package is up-to-date: $UPDATE_NIX_OLD_VERSION"
+  exit 0
+fi
+# Clone source
+git clone "https://github.com/neoclide/coc-yaml" -b "$NEW_VERSION" "$WORKDIR/src"
+pushd "$WORKDIR/src"
+npx --yes npm-package-lock-add-resolved
+
+# Update package-lock patch
+git diff >"$PACKAGE_DIR/package-lock-fix.patch"
+popd
+
+# Run nix-update
+nix-update --version="$NEW_VERSION" "$UPDATE_NIX_PNAME"
+
+# Cleanup
+rm -rf "$WORKDIR"
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index f69e51c467b1..6550e5d3865e 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -115,6 +115,7 @@ mapAliases {
   inherit (pkgs) coc-vimlsp; # Added 2025-11-05
   inherit (pkgs) coc-vimtex; # Added 2025-11-05
   inherit (pkgs) coc-wxml; # Added 2025-11-05
+  inherit (pkgs) coc-yaml; # Added 2025-11-05
   coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19
   coffee-script = pkgs.coffeescript; # added 2023-08-18
   inherit (pkgs) concurrently; # added 2024-08-05
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 92369bd45f56..82e37e9f7bf2 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -25,7 +25,6 @@
 , "coc-ltex"
 , "coc-tsserver"
 , "coc-ultisnips"
-, "coc-yaml"
 , "coc-yank"
 , "code-theme-converter"
 , "conventional-changelog-cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 904e59a24b41..ed2b84d8683a 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -24326,15 +24326,6 @@ let
         sha512 = "s/46sYeylUfHNjI+sA/78FAHlmIuKqI9wNnzEOGehAlUUYeObv5C2mOinXBjyUyWmJ2SfcS2/ydApH4hTF4WXQ==";
       };
     };
-    "prettier-2.0.5" = {
-      name = "prettier";
-      packageName = "prettier";
-      version = "2.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz";
-        sha512 = "7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==";
-      };
-    };
     "prettier-2.8.8" = {
       name = "prettier";
       packageName = "prettier";
@@ -37077,27 +37068,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-yaml = nodeEnv.buildNodePackage {
-    name = "coc-yaml";
-    packageName = "coc-yaml";
-    version = "1.9.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-yaml/-/coc-yaml-1.9.1.tgz";
-      sha512 = "PKDIWjnTF1193m0a5srO8oOLrOv9nKwaqka+a+sdzDjlyPoFipEADFUQVdoHwe1GYlfYe7tmfWOUCbR6ddRLrw==";
-    };
-    dependencies = [
-      sources."prettier-2.0.5"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "yaml extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-yaml#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   coc-yank = nodeEnv.buildNodePackage {
     name = "coc-yank";
     packageName = "coc-yank";

From c3a23aaf853a4a3d8507ed8cfd0d1e73aa9bf3d8 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Wed, 5 Nov 2025 17:11:18 -0500
Subject: [PATCH 5995/6226] coc-yank: migrate from nodePackages

---
 .../editors/vim/plugins/cocPlugins.nix        |  6 ++
 .../vim/plugins/nodePackagePlugins.nix        |  1 -
 pkgs/by-name/co/coc-yank/package.nix          | 58 +++++++++++++++++++
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 18 ------
 6 files changed, 65 insertions(+), 20 deletions(-)
 create mode 100644 pkgs/by-name/co/coc-yank/package.nix

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index bd12588c9f87..51bfed6af45b 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -39,6 +39,7 @@
   coc-vimtex,
   coc-wxml,
   coc-yaml,
+  coc-yank,
 }:
 final: prev: {
   coc-basedpyright = buildVimPlugin {
@@ -239,4 +240,9 @@ final: prev: {
     inherit (coc-yaml) pname version meta;
     src = "${coc-yaml}/lib/node_modules/coc-yaml";
   };
+
+  coc-yank = buildVimPlugin {
+    inherit (coc-yank) pname version meta;
+    src = "${coc-yank}/lib/node_modules/coc-yank";
+  };
 }
diff --git a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
index bfcd0c253693..03fe172d2380 100644
--- a/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/nodePackagePlugins.nix
@@ -10,7 +10,6 @@ let
     "coc-ltex"
     "coc-tsserver"
     "coc-ultisnips"
-    "coc-yank"
     "coc-nginx"
   ];
 
diff --git a/pkgs/by-name/co/coc-yank/package.nix b/pkgs/by-name/co/coc-yank/package.nix
new file mode 100644
index 000000000000..e6e433f48e85
--- /dev/null
+++ b/pkgs/by-name/co/coc-yank/package.nix
@@ -0,0 +1,58 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+  esbuild,
+  buildGoModule,
+}:
+let
+  esbuild' =
+    let
+      version = "0.25.0";
+    in
+    esbuild.override {
+      buildGoModule =
+        args:
+        buildGoModule (
+          args
+          // {
+            inherit version;
+            src = fetchFromGitHub {
+              owner = "evanw";
+              repo = "esbuild";
+              rev = "v${version}";
+              hash = "sha256-L9jm94Epb22hYsU3hoq1lZXb5aFVD4FC4x2qNt0DljA=";
+            };
+            vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
+          }
+        );
+    };
+in
+
+buildNpmPackage (finalAttrs: {
+  pname = "coc-yank";
+  version = "1.2.5";
+
+  src = fetchFromGitHub {
+    owner = "neoclide";
+    repo = "coc-yank";
+    tag = finalAttrs.version;
+    hash = "sha256-AREGlb8YDRwma9QtLeoted5S0ordS8Hcd2umYQfKq9g=";
+  };
+
+  npmDepsHash = "sha256-ISHILT/FBy2Y0UWaQkjMm5ZsYacNt3M54IJ8ckYjq3A=";
+
+  nativeBuildInputs = [ esbuild' ];
+
+  env.ESBUILD_BINARY_PATH = lib.getExe esbuild';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Yank highlight and persist yank history support for vim";
+    homepage = "https://github.com/neoclide/coc-yank";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 6550e5d3865e..3c5dd23fe4db 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -116,6 +116,7 @@ mapAliases {
   inherit (pkgs) coc-vimtex; # Added 2025-11-05
   inherit (pkgs) coc-wxml; # Added 2025-11-05
   inherit (pkgs) coc-yaml; # Added 2025-11-05
+  inherit (pkgs) coc-yank; # Added 2025-11-05
   coinmon = throw "coinmon was removed since it was abandoned upstream"; # added 2024-03-19
   coffee-script = pkgs.coffeescript; # added 2023-08-18
   inherit (pkgs) concurrently; # added 2024-08-05
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 82e37e9f7bf2..cf169620b98d 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -25,7 +25,6 @@
 , "coc-ltex"
 , "coc-tsserver"
 , "coc-ultisnips"
-, "coc-yank"
 , "code-theme-converter"
 , "conventional-changelog-cli"
 , "cpy-cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index ed2b84d8683a..85e0694b1337 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -37068,24 +37068,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  coc-yank = nodeEnv.buildNodePackage {
-    name = "coc-yank";
-    packageName = "coc-yank";
-    version = "1.2.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/coc-yank/-/coc-yank-1.2.4.tgz";
-      sha512 = "tNCysSDUKNHAE/cBbfB9kbaSkDbeTleRwfho0vXuaxA6TLAbHqKPA81ecF4pHG4JJm9V156d7uhotYsm4InuyA==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Yank extension for coc.nvim";
-      homepage = "https://github.com/neoclide/coc-yank#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   code-theme-converter = nodeEnv.buildNodePackage {
     name = "code-theme-converter";
     packageName = "code-theme-converter";

From f95ad6a830824029d47f599bd200cd28031fe4f4 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 6 Nov 2025 12:42:14 -0500
Subject: [PATCH 5996/6226] vimPlugins.coc-*: make much smarter

based on the nodePackagePlugins set function, this is a lot simpler than
the previous function per derivation
---
 .../editors/vim/plugins/cocPlugins.nix        | 304 ++++--------------
 1 file changed, 59 insertions(+), 245 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/cocPlugins.nix b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
index 51bfed6af45b..c073c194ca1e 100644
--- a/pkgs/applications/editors/vim/plugins/cocPlugins.nix
+++ b/pkgs/applications/editors/vim/plugins/cocPlugins.nix
@@ -1,248 +1,62 @@
 {
+  lib,
   buildVimPlugin,
-  coc-basedpyright,
-  coc-clangd,
-  coc-cmake,
-  coc-css,
-  coc-diagnostic,
-  coc-docker,
-  coc-emmet,
-  coc-eslint,
-  coc-explorer,
-  coc-flutter,
-  coc-git,
-  coc-haxe,
-  coc-highlight,
-  coc-html,
-  coc-java,
-  coc-jest,
-  coc-json,
-  coc-lists,
-  coc-markdownlint,
-  coc-pairs,
-  coc-prettier,
-  coc-pyright,
-  coc-r-lsp,
-  coc-rust-analyzer,
-  coc-sh,
-  coc-smartf,
-  coc-snippets,
-  coc-solargraph,
-  coc-spell-checker,
-  coc-sqlfluff,
-  coc-stylelint,
-  coc-sumneko-lua,
-  coc-tabnine,
-  coc-texlab,
-  coc-toml,
-  coc-vimlsp,
-  coc-vimtex,
-  coc-wxml,
-  coc-yaml,
-  coc-yank,
+  pkgs,
 }:
-final: prev: {
-  coc-basedpyright = buildVimPlugin {
-    inherit (coc-basedpyright) pname version meta;
-    src = "${coc-basedpyright}/lib/node_modules/coc-basedpyright";
-  };
-
-  coc-clangd = buildVimPlugin {
-    inherit (coc-clangd) pname version meta;
-    src = "${coc-clangd}/lib/node_modules/coc-clangd";
-  };
-
-  coc-cmake = buildVimPlugin {
-    inherit (coc-cmake) pname version meta;
-    src = "${coc-cmake}/lib/node_modules/coc-cmake";
-  };
-
-  coc-css = buildVimPlugin {
-    inherit (coc-css) pname version meta;
-    src = "${coc-css}/lib/node_modules/coc-css";
-  };
-
-  coc-diagnostic = buildVimPlugin {
-    inherit (coc-diagnostic) pname version meta;
-    src = "${coc-diagnostic}/lib/node_modules/coc-diagnostic";
-  };
-
-  coc-docker = buildVimPlugin {
-    inherit (coc-docker) pname version meta;
-    src = "${coc-docker}/lib/node_modules/coc-docker";
-  };
-
-  coc-emmet = buildVimPlugin {
-    inherit (coc-emmet) pname version meta;
-    src = "${coc-emmet}/lib/node_modules/coc-emmet";
-  };
-
-  coc-eslint = buildVimPlugin {
-    inherit (coc-eslint) pname version meta;
-    src = "${coc-eslint}/lib/node_modules/coc-eslint";
-  };
-
-  coc-explorer = buildVimPlugin {
-    inherit (coc-explorer) pname version meta;
-    src = "${coc-explorer}/lib/node_modules/coc-explorer";
-  };
-
-  coc-flutter = buildVimPlugin {
-    inherit (coc-flutter) pname version meta;
-    src = "${coc-flutter}/lib/node_modules/coc-flutter";
-  };
-
-  coc-git = buildVimPlugin {
-    inherit (coc-git) pname version meta;
-    src = "${coc-git}/lib/node_modules/coc-git";
-  };
-
-  coc-haxe = buildVimPlugin {
-    inherit (coc-haxe) pname version meta;
-    src = "${coc-haxe}/lib/node_modules/coc-haxe";
-  };
-
-  coc-highlight = buildVimPlugin {
-    inherit (coc-highlight) pname version meta;
-    src = "${coc-highlight}/lib/node_modules/coc-highlight";
-  };
-
-  coc-html = buildVimPlugin {
-    inherit (coc-html) pname version meta;
-    src = "${coc-html}/lib/node_modules/coc-html";
-  };
-
-  coc-java = buildVimPlugin {
-    inherit (coc-java) pname version meta;
-    src = "${coc-java}/lib/node_modules/coc-java";
-  };
-
-  coc-jest = buildVimPlugin {
-    inherit (coc-jest) pname version meta;
-    src = "${coc-jest}/lib/node_modules/coc-jest";
-  };
-
-  coc-json = buildVimPlugin {
-    inherit (coc-json) pname version meta;
-    src = "${coc-json}/lib/node_modules/coc-json";
-  };
-
-  coc-lists = buildVimPlugin {
-    inherit (coc-lists) pname version meta;
-    src = "${coc-lists}/lib/node_modules/coc-lists";
-  };
-
-  coc-markdownlint = buildVimPlugin {
-    inherit (coc-markdownlint) pname version meta;
-    src = "${coc-markdownlint}/lib/node_modules/coc-markdownlint";
-  };
-
-  coc-pairs = buildVimPlugin {
-    inherit (coc-pairs) pname version meta;
-    src = "${coc-pairs}/lib/node_modules/coc-pairs";
-  };
-
-  coc-prettier = buildVimPlugin {
-    inherit (coc-prettier) pname version meta;
-    src = "${coc-prettier}/lib/node_modules/coc-prettier";
-  };
-
-  coc-pyright = buildVimPlugin {
-    pname = "coc-pyright";
-    inherit (coc-pyright) version meta;
-    src = "${coc-pyright}/lib/node_modules/coc-pyright";
-  };
-
-  coc-r-lsp = buildVimPlugin {
-    inherit (coc-r-lsp) pname version meta;
-    src = "${coc-r-lsp}/lib/node_modules/coc-r-lsp";
-  };
-
-  coc-rust-analyzer = buildVimPlugin {
-    inherit (coc-rust-analyzer) pname version meta;
-    src = "${coc-rust-analyzer}/lib/node_modules/coc-rust-analyzer";
-  };
-
-  coc-sh = buildVimPlugin {
-    pname = "coc-sh";
-    inherit (coc-sh) version meta;
-    src = "${coc-sh}/lib/node_modules/coc-sh";
-  };
-
-  coc-smartf = buildVimPlugin {
-    inherit (coc-smartf) pname version meta;
-    src = "${coc-smartf}/lib/node_modules/coc-smartf";
-  };
-
-  coc-snippets = buildVimPlugin {
-    inherit (coc-snippets) pname version meta;
-    src = "${coc-snippets}/lib/node_modules/coc-snippets";
-  };
-
-  coc-solargraph = buildVimPlugin {
-    inherit (coc-solargraph) pname version meta;
-    src = "${coc-solargraph}/lib/node_modules/coc-solargraph";
-  };
-
-  coc-spell-checker = buildVimPlugin {
-    pname = "coc-spell-checker";
-    inherit (coc-spell-checker) version meta;
-    src = "${coc-spell-checker}/lib/node_modules/coc-spell-checker";
-  };
-
-  coc-sqlfluff = buildVimPlugin {
-    inherit (coc-sqlfluff) pname version meta;
-    src = "${coc-sqlfluff}/lib/node_modules/coc-sqlfluff";
-  };
-
-  coc-stylelint = buildVimPlugin {
-    inherit (coc-stylelint) pname version meta;
-    src = "${coc-stylelint}/lib/node_modules/coc-stylelint";
-  };
-
-  coc-sumneko-lua = buildVimPlugin {
-    inherit (coc-sumneko-lua) pname version meta;
-    src = "${coc-sumneko-lua}/lib/node_modules/coc-sumneko-lua";
-  };
-
-  coc-tabnine = buildVimPlugin {
-    inherit (coc-tabnine) pname version meta;
-    src = "${coc-tabnine}/lib/node_modules/coc-tabnine";
-  };
-
-  coc-texlab = buildVimPlugin {
-    inherit (coc-texlab) pname version meta;
-    src = "${coc-texlab}/lib/node_modules/coc-texlab";
-  };
-
-  coc-toml = buildVimPlugin {
-    pname = "coc-toml";
-    inherit (coc-toml) version meta;
-    src = "${coc-toml}/lib/node_modules/coc-toml";
-  };
-
-  coc-vimlsp = buildVimPlugin {
-    inherit (coc-vimlsp) pname version meta;
-    src = "${coc-vimlsp}/lib/node_modules/coc-vimlsp";
-  };
-
-  coc-vimtex = buildVimPlugin {
-    inherit (coc-vimtex) pname version meta;
-    src = "${coc-vimtex}/lib/node_modules/coc-vimtex";
-  };
-
-  coc-wxml = buildVimPlugin {
-    inherit (coc-wxml) pname version meta;
-    src = "${coc-wxml}/lib/node_modules/coc-wxml";
-  };
-
-  coc-yaml = buildVimPlugin {
-    inherit (coc-yaml) pname version meta;
-    src = "${coc-yaml}/lib/node_modules/coc-yaml";
-  };
-
-  coc-yank = buildVimPlugin {
-    inherit (coc-yank) pname version meta;
-    src = "${coc-yank}/lib/node_modules/coc-yank";
-  };
-}
+final: prev:
+let
+  cocPackages = [
+    "coc-clangd"
+    "coc-cmake"
+    "coc-css"
+    "coc-diagnostic"
+    "coc-docker"
+    "coc-emmet"
+    "coc-eslint"
+    "coc-explorer"
+    "coc-flutter"
+    "coc-git"
+    "coc-haxe"
+    "coc-highlight"
+    "coc-html"
+    "coc-java"
+    "coc-jest"
+    "coc-json"
+    "coc-lists"
+    "coc-markdownlint"
+    "coc-pairs"
+    "coc-prettier"
+    "coc-pyright"
+    "coc-r-lsp"
+    "coc-rust-analyzer"
+    "coc-sh"
+    "coc-sh"
+    "coc-smartf"
+    "coc-snippets"
+    "coc-solargraph"
+    "coc-spell-checker"
+    "coc-sqlfluff"
+    "coc-stylelint"
+    "coc-sumneko-lua"
+    "coc-tabnine"
+    "coc-texlab"
+    "coc-toml"
+    "coc-toml"
+    "coc-vimlsp"
+    "coc-vimtex"
+    "coc-wxml"
+    "coc-basedpyright"
+    "coc-yaml"
+    "coc-yank"
+  ];
+in
+lib.genAttrs cocPackages (
+  pkg:
+  let
+    cocPkg = pkgs.${pkg};
+  in
+  buildVimPlugin {
+    inherit (cocPkg) pname version meta;
+    src = "${cocPkg}/lib/node_modules/${cocPkg.pname}";
+  }
+)

From fb32183cdf52be2f618128fd942f0bbc8b375f9c Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 6 Nov 2025 20:43:56 +0000
Subject: [PATCH 5997/6226] python3Packages.orbax-checkpoint: 0.11.27 ->
 0.11.28

Diff: https://github.com/google/orbax/compare/v0.11.27...v0.11.28

Changelog: https://github.com/google/orbax/blob/v0.11.28/checkpoint/CHANGELOG.md
---
 pkgs/development/python-modules/orbax-checkpoint/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/orbax-checkpoint/default.nix b/pkgs/development/python-modules/orbax-checkpoint/default.nix
index 3e4926d4570a..33baac38cd79 100644
--- a/pkgs/development/python-modules/orbax-checkpoint/default.nix
+++ b/pkgs/development/python-modules/orbax-checkpoint/default.nix
@@ -37,14 +37,14 @@
 
 buildPythonPackage rec {
   pname = "orbax-checkpoint";
-  version = "0.11.27";
+  version = "0.11.28";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "orbax";
     tag = "v${version}";
-    hash = "sha256-KXEwUHJAFxeJTs3qKUXMCYO3t5hoPTjGay9GIOQIuCY=";
+    hash = "sha256-a7E60fZRmEXTA220mwr7EDMUc+zYbW7wG40vY7NeAOM=";
   };
 
   sourceRoot = "${src.name}/checkpoint";

From 87ca02802d7529af9b20c0ffdcde742cf11cde12 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 20:45:30 +0000
Subject: [PATCH 5998/6226] coroot-node-agent: 1.26.4 -> 1.27.0

---
 pkgs/by-name/co/coroot-node-agent/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/co/coroot-node-agent/package.nix b/pkgs/by-name/co/coroot-node-agent/package.nix
index fb6e024caf26..b3939329e100 100644
--- a/pkgs/by-name/co/coroot-node-agent/package.nix
+++ b/pkgs/by-name/co/coroot-node-agent/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "coroot-node-agent";
-  version = "1.26.4";
+  version = "1.27.0";
 
   src = fetchFromGitHub {
     owner = "coroot";
     repo = "coroot-node-agent";
     rev = "v${version}";
-    hash = "sha256-bm3zMk44FNZ3vb9fP1Szbmi+0I1kOas0es8Cqu3yWeA=";
+    hash = "sha256-y8Uuz0lH49PTW9NjPzKjfxjquDar6uOc+GlI+KiqkOU=";
   };
 
-  vendorHash = "sha256-LJq45IGXgYNx0Hky2w+O5Enwc5EvD79/cJRQ/iCythk=";
+  vendorHash = "sha256-KK9VkcXwcSTzhdf/22Ft4DUUlvUERGAWE5zwdbOtrQo=";
 
   buildInputs = [ systemdLibs ];
 

From 1c15b96512066321da40584981c47cd749068489 Mon Sep 17 00:00:00 2001
From: JuliusFreudenberger <julius+git@jfreudenberger.de>
Date: Thu, 6 Nov 2025 21:48:40 +0100
Subject: [PATCH 5999/6226] teleport: Use pnpmDeps fetcherVersion 2

---
 pkgs/build-support/teleport/default.nix | 2 +-
 pkgs/by-name/te/teleport_16/package.nix | 2 +-
 pkgs/by-name/te/teleport_17/package.nix | 2 +-
 pkgs/by-name/te/teleport_18/package.nix | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/build-support/teleport/default.nix b/pkgs/build-support/teleport/default.nix
index 90800cf62429..3fc871d31203 100644
--- a/pkgs/build-support/teleport/default.nix
+++ b/pkgs/build-support/teleport/default.nix
@@ -75,7 +75,7 @@ let
 
     pnpmDeps = pnpm_10.fetchDeps {
       inherit src pname version;
-      fetcherVersion = 1;
+      fetcherVersion = 2;
       hash = pnpmHash;
     };
 
diff --git a/pkgs/by-name/te/teleport_16/package.nix b/pkgs/by-name/te/teleport_16/package.nix
index cfead2c1f55f..2599a4488b81 100644
--- a/pkgs/by-name/te/teleport_16/package.nix
+++ b/pkgs/by-name/te/teleport_16/package.nix
@@ -9,7 +9,7 @@ buildTeleport {
   version = "16.5.18";
   hash = "sha256-Dikw4y62V7S62K+8EqltXM4RRYPgE2Ad/kZrSS2TEDo=";
   vendorHash = "sha256-mcDybNt7Mr0HJW272Ulj1oWlfsH2kEp7rNyeonoIjf8=";
-  pnpmHash = "sha256-V0R/i+oENGxlmq2Q6iwnikgBFVMWXph9WMStp3HTW34=";
+  pnpmHash = "sha256-Sn3rM6l6pADG7GHenlL3NC0oLc4GFZLTzqDHgzInLbk=";
   cargoHash = "sha256-04zykCcVTptEPGy35MIWG+tROKFzEepLBmn04mSbt7I=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
diff --git a/pkgs/by-name/te/teleport_17/package.nix b/pkgs/by-name/te/teleport_17/package.nix
index 7e24679a93a9..7296c80c50a9 100644
--- a/pkgs/by-name/te/teleport_17/package.nix
+++ b/pkgs/by-name/te/teleport_17/package.nix
@@ -11,7 +11,7 @@ buildTeleport {
   hash = "sha256-z520UT17nFLBwyVLjdfx9aTbkMv1fljsN88G6WRPvZE=";
   vendorHash = "sha256-mtOCLAcVIxaEhGzdsVWxnKQ4FRTXZ5vVAF+NVMdFItk=";
   cargoHash = "sha256-qz8gkooQTuBlPWC4lHtvBQpKkd+nEZ0Hl7AVg9JkPqs=";
-  pnpmHash = "sha256-4xLbPQwmI0nAUNAgDHwkx1uSbjHPe8LNmEFQfoaj6bY=";
+  pnpmHash = "sha256-zTl7hSVPEdnFXx76QpApdY/qDKVNA3yrhaprSYp7YQo=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_95;
   inherit buildGoModule withRdpClient extPatches;
diff --git a/pkgs/by-name/te/teleport_18/package.nix b/pkgs/by-name/te/teleport_18/package.nix
index 075b5ec0c782..9312a428633c 100644
--- a/pkgs/by-name/te/teleport_18/package.nix
+++ b/pkgs/by-name/te/teleport_18/package.nix
@@ -10,7 +10,7 @@ buildTeleport {
   version = "18.3.1";
   hash = "sha256-HM0pu+3O7zoClH15YC0naxxmKJC9ngamnvraTosRqG0=";
   vendorHash = "sha256-HyS0KKW7lyn3NzedxM4+UxFV9OnxgtFDMW5jkj3ir/8=";
-  pnpmHash = "sha256-/G6WYC3YGk8ma4hAI6sZhQ6KAh+u4CxQ7891fYj5bJg=";
+  pnpmHash = "sha256-6sThtwACNEdV0fleaQf3iMmFxPsd0AshYeYZUatFMcg=";
   cargoHash = "sha256-ia4We4IfIkqz82aFMVvXdzjDXw0w+OJSPVdutfau6PA=";
 
   wasm-bindgen-cli = wasm-bindgen-cli_0_2_99;

From 836683ae5fbb7104a6925890490bfa0959e89424 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 20:50:44 +0000
Subject: [PATCH 6000/6226] candy-icons: 0-unstable-2025-09-09 ->
 0-unstable-2025-11-01

---
 pkgs/by-name/ca/candy-icons/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/candy-icons/package.nix b/pkgs/by-name/ca/candy-icons/package.nix
index 25ac7d8603a8..9ea760afb4e4 100644
--- a/pkgs/by-name/ca/candy-icons/package.nix
+++ b/pkgs/by-name/ca/candy-icons/package.nix
@@ -8,13 +8,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "candy-icons";
-  version = "0-unstable-2025-09-09";
+  version = "0-unstable-2025-11-01";
 
   src = fetchFromGitHub {
     owner = "EliverLara";
     repo = "candy-icons";
-    rev = "40cbbc8821db020e2668c309cd5a7bbfabd0be06";
-    hash = "sha256-wJ86TUjiVYT64QunDk85Jji5vo0Os+D9t/fsyKRM+P0=";
+    rev = "1be42f22a36813b8b992f37c1ce56d886a4f97cf";
+    hash = "sha256-suQ2yvKsMbm0a4Qg9D3THMa1gCpZSlOF0plD0H8vYy8=";
   };
 
   nativeBuildInputs = [ gtk3 ];

From 1553ab13f46ddcab156ef59c9a31ed382d7086f3 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Tue, 4 Nov 2025 16:04:38 +0100
Subject: [PATCH 6001/6226] music-assistant: 2.6.0 -> 2.6.2

https://github.com/music-assistant/server/releases/tag/2.6.2

https://github.com/music-assistant/server/releases/tag/2.6.1

diff: https://github.com/music-assistant/server/compare/2.6.0...2.6.2
---
 pkgs/by-name/mu/music-assistant/package.nix   | 4 ++--
 pkgs/by-name/mu/music-assistant/providers.nix | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix
index 9f6589ba03cf..d85831328d30 100644
--- a/pkgs/by-name/mu/music-assistant/package.nix
+++ b/pkgs/by-name/mu/music-assistant/package.nix
@@ -47,14 +47,14 @@ assert
 
 python.pkgs.buildPythonApplication rec {
   pname = "music-assistant";
-  version = "2.6.0";
+  version = "2.6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "server";
     tag = version;
-    hash = "sha256-e596gvj+ZZDQzyBVfI50nO0a0eZifrkQVhUNNP2Jj8A=";
+    hash = "sha256-mNSTXMQDG5LiP3Bv9GGy2AO1bQfpFLH8tSCOB/wAzOU=";
   };
 
   patches = [
diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix
index 611e3a2afeae..97344f585851 100644
--- a/pkgs/by-name/mu/music-assistant/providers.nix
+++ b/pkgs/by-name/mu/music-assistant/providers.nix
@@ -1,7 +1,7 @@
 # Do not edit manually, run ./update-providers.py
 
 {
-  version = "2.6.0";
+  version = "2.6.2";
   providers = {
     airplay = ps: [
     ];

From 47a8e5ff8b23725d80854320357a853232e59f4c Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Thu, 6 Nov 2025 22:05:44 +0100
Subject: [PATCH 6002/6226] librespot-ma: 0.6.0-unstable-2025-08-10 ->
 0.7.1-unstable-2025-11-06

diff: https://github.com/music-assistant/librespot/compare/accecb60a16334013c0c99a5ded553794ee871b7...2af61256649d6c1ed149791a53a20a595b617704
---
 pkgs/by-name/li/librespot-ma/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/li/librespot-ma/package.nix b/pkgs/by-name/li/librespot-ma/package.nix
index f5e86091c206..dd1f8160d429 100644
--- a/pkgs/by-name/li/librespot-ma/package.nix
+++ b/pkgs/by-name/li/librespot-ma/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage {
   pname = "librespot-ma";
-  version = "0.6.0-unstable-2025-08-10";
+  version = "0.7.1-unstable-2025-11-06";
 
   src = fetchFromGitHub {
     owner = "music-assistant";
     repo = "librespot";
-    rev = "accecb60a16334013c0c99a5ded553794ee871b7";
-    hash = "sha256-vPiI8llXB6+ahX+iad/Ut81D3iZcTSVmYGDXXwApk/w=";
+    rev = "2af61256649d6c1ed149791a53a20a595b617704";
+    hash = "sha256-sarxS6YArK5luX4TRXJUKhreMqhZbsS/3fCVWHxPNpY=";
   };
 
-  cargoHash = "sha256-Lujz2revTAok9B0hzdl8NVQ5XMRY9ACJzoQHIkIgKMg=";
+  cargoHash = "sha256-CI2BFmQNK1+J2qaKg6u6WM83jwBuWjeh9dROnrF3Kv0=";
 
   nativeBuildInputs = [
     pkg-config

From ecf72265ab93582917e5f160f2d8c5c1e8a0f1b2 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 6 Nov 2025 15:18:38 -0500
Subject: [PATCH 6003/6226] jshint: migrate from nodePackages

---
 pkgs/by-name/js/jshint/package.nix            |  36 +++++
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 143 ------------------
 4 files changed, 37 insertions(+), 144 deletions(-)
 create mode 100644 pkgs/by-name/js/jshint/package.nix

diff --git a/pkgs/by-name/js/jshint/package.nix b/pkgs/by-name/js/jshint/package.nix
new file mode 100644
index 000000000000..3d9dbeb5ed8f
--- /dev/null
+++ b/pkgs/by-name/js/jshint/package.nix
@@ -0,0 +1,36 @@
+{
+  lib,
+  buildNpmPackage,
+  fetchFromGitHub,
+  nix-update-script,
+}:
+
+buildNpmPackage (finalAttrs: {
+  pname = "jshint";
+  version = "2.13.6";
+
+  src = fetchFromGitHub {
+    owner = "jshint";
+    repo = "jshint";
+    tag = finalAttrs.version;
+    hash = "sha256-RANA+kL7gL5bGa5KywEH/G+mAsPEoNkfxlp/pHeW8iE=";
+  };
+
+  npmDepsHash = "sha256-4P1rQmNIENbJPFqpbgnrq4V2tZe4MWySIphwUtnNcuc=";
+
+  env.PUPPETEER_SKIP_CHROMIUM_DOWNLOAD = "1";
+
+  postBuild = ''
+    npm run test-node
+  '';
+
+  passthru.updateScript = nix-update-script { };
+
+  meta = {
+    description = "Tool that helps to detect errors and potential problems in your JavaScript code";
+    homepage = "https://jshint.com";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ pyrox0 ];
+    mainProgram = "jshint";
+  };
+})
diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index ad998d2dac12..f1ca449fb7b6 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -177,6 +177,7 @@ mapAliases {
   inherit (pkgs) jake; # added 2023-08-19
   inherit (pkgs) javascript-typescript-langserver; # added 2023-08-19
   inherit (pkgs) js-beautify; # Added 2025-11-06
+  inherit (pkgs) jshint; # Added 2025-11-06
   inherit (pkgs) jsonplaceholder; # Added 2025-11-04
   joplin = pkgs.joplin-cli; # Added 2025-11-02
   inherit (pkgs) kaput-cli; # added 2024-12-03
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 69cd6711e666..6fbe741cb611 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -51,7 +51,6 @@
 , "imapnotify"
 , "js-yaml"
 , "jsdoc"
-, "jshint"
 , "json"
 , "json-diff"
 , "json-refs"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 07c8eff605e3..4be801c40fab 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -7934,15 +7934,6 @@ let
         sha512 = "TyUIUJgdFnCISzG5zu3291TAsE77ddchd0bepon1VVQrKLGKFED4iXFEDQ24mIPdPBbyE16PK3F8MYE1CmcBEQ==";
       };
     };
-    "cli-1.0.1" = {
-      name = "cli";
-      packageName = "cli";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cli/-/cli-1.0.1.tgz";
-        sha512 = "41U72MB56TfUMGndAKK8vJ78eooOD4Z5NOL4xEfjc0c23s+6EYKXlXsmACBVclLP1yOfWCgEganVzddVrSNoTg==";
-      };
-    };
     "cli-boxes-2.2.1" = {
       name = "cli-boxes";
       packageName = "cli-boxes";
@@ -8861,15 +8852,6 @@ let
         sha512 = "EiPU8G6dQG0GFHNR8ljnZFki/8a+cQwEQ+7wpxdChl02Q8HXlwEZWD5lqAF8vC2sEC3Tehr8hy7vErz88LHyUA==";
       };
     };
-    "console-browserify-1.1.0" = {
-      name = "console-browserify";
-      packageName = "console-browserify";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/console-browserify/-/console-browserify-1.1.0.tgz";
-        sha512 = "duS7VP5pvfsNLDvL1O4VOEbw37AI3A4ZUQYemvDlnpGrNu9tprR7BYWpDYwC0Xia0Zxz5ZupdiIrUp0GH1aXfg==";
-      };
-    };
     "console-browserify-1.2.0" = {
       name = "console-browserify";
       packageName = "console-browserify";
@@ -9915,15 +9897,6 @@ let
         sha512 = "39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==";
       };
     };
-    "date-now-0.1.4" = {
-      name = "date-now";
-      packageName = "date-now";
-      version = "0.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/date-now/-/date-now-0.1.4.tgz";
-        sha512 = "AsElvov3LoNB7tf5k37H2jYSB+ZZPMT5sG2QjJCcdlV5chIv6htBUBUui2IKRjgtKAKtCBN7Zbwa+MtwLjSeNw==";
-      };
-    };
     "dateformat-2.2.0" = {
       name = "dateformat";
       packageName = "dateformat";
@@ -10788,15 +10761,6 @@ let
         sha512 = "OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==";
       };
     };
-    "domhandler-2.3.0" = {
-      name = "domhandler";
-      packageName = "domhandler";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz";
-        sha512 = "q9bUwjfp7Eif8jWxxxPSykdRZAb6GkguBGSgvvCrhI9wB71W2K/Kvv4E61CF/mcCfnVJDeDWx/Vb/uAqbDj6UQ==";
-      };
-    };
     "domino-2.1.6" = {
       name = "domino";
       packageName = "domino";
@@ -10806,15 +10770,6 @@ let
         sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ==";
       };
     };
-    "domutils-1.5.1" = {
-      name = "domutils";
-      packageName = "domutils";
-      version = "1.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz";
-        sha512 = "gSu5Oi/I+3wDENBsOWBiRK1eoGxcywYSqg3rR960/+EfY0CF4EX1VPkgHOZ3WiS/Jg2DtliF6BhWcHlfpYUcGw==";
-      };
-    };
     "domutils-3.2.2" = {
       name = "domutils";
       packageName = "domutils";
@@ -11328,15 +11283,6 @@ let
         sha512 = "n6e4bsCpzsP0OB76X+vEWhySUQI8GHPVFVK+3QkX35tbryy2WoeGeK5kQ+oxzgDVHjIZyz5fyS60Mi3EpQLc0Q==";
       };
     };
-    "entities-1.0.0" = {
-      name = "entities";
-      packageName = "entities";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/entities/-/entities-1.0.0.tgz";
-        sha512 = "LbLqfXgJMmy81t+7c14mnulFHJ170cM6E+0vMXR9k/ZiZwgX8i5pNgjTCX3SO4VeUsFLV+8InixoretwU+MjBQ==";
-      };
-    };
     "entities-1.1.2" = {
       name = "entities";
       packageName = "entities";
@@ -12309,15 +12255,6 @@ let
         sha512 = "c2bQfLNbMzLPmzQuOr8fy0csy84WmwnER81W88DzTp9CYNPJ6yzOj2EZAh9pywYpqHnshVLHQJ8WzldAyfY+Iw==";
       };
     };
-    "exit-0.1.2" = {
-      name = "exit";
-      packageName = "exit";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz";
-        sha512 = "Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==";
-      };
-    };
     "exit-hook-1.1.1" = {
       name = "exit-hook";
       packageName = "exit-hook";
@@ -15009,15 +14946,6 @@ let
         sha512 = "eVcrzgbR4tim7c7soKQKtxa/kQM4TzjnlU83rcZ9bHU6t31ehfV7SktN6McWgwPWg+JYMA/O3qpGxBvFq1z2Jg==";
       };
     };
-    "htmlparser2-3.8.3" = {
-      name = "htmlparser2";
-      packageName = "htmlparser2";
-      version = "3.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.8.3.tgz";
-        sha512 = "hBxEg3CYXe+rPIua8ETe7tmG3XDn9B0edOE/e9wH2nLczxzgdu0m0aNHY+5wFZiviLWLdANPJTssa92dMcXQ5Q==";
-      };
-    };
     "http-auth-3.1.3" = {
       name = "http-auth";
       packageName = "http-auth";
@@ -28907,15 +28835,6 @@ let
         sha512 = "mnVSV2l+Zv6BLpSD/8V87CW/y9EmmbYzGCIavsnsI6/nwn26DwffM/yztm30Z/I2DY9wdS3vXVCMnHDgZaVNoA==";
       };
     };
-    "strip-json-comments-1.0.4" = {
-      name = "strip-json-comments";
-      packageName = "strip-json-comments";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-1.0.4.tgz";
-        sha512 = "AOPG8EBc5wAikaG1/7uFCNFJwnKOuQwFTpYBdTW6OvWHeZBQBrAA/amefHGrEiOnCPcLFZK6FUPtWVKpQVIRgg==";
-      };
-    };
     "strip-json-comments-2.0.1" = {
       name = "strip-json-comments";
       packageName = "strip-json-comments";
@@ -40604,68 +40523,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  jshint = nodeEnv.buildNodePackage {
-    name = "jshint";
-    packageName = "jshint";
-    version = "2.13.6";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/jshint/-/jshint-2.13.6.tgz";
-      sha512 = "IVdB4G0NTTeQZrBoM8C5JFVLjV2KtZ9APgybDA1MK73xb09qFs0jCXyQLnCOp1cSZZZbvhq/6mfXHUTaDkffuQ==";
-    };
-    dependencies = [
-      sources."balanced-match-1.0.2"
-      sources."brace-expansion-1.1.11"
-      sources."cli-1.0.1"
-      sources."concat-map-0.0.1"
-      sources."console-browserify-1.1.0"
-      sources."core-util-is-1.0.3"
-      sources."date-now-0.1.4"
-      (
-        sources."dom-serializer-0.2.2"
-        // {
-          dependencies = [
-            sources."domelementtype-2.3.0"
-            sources."entities-2.2.0"
-          ];
-        }
-      )
-      sources."domelementtype-1.3.1"
-      sources."domhandler-2.3.0"
-      sources."domutils-1.5.1"
-      sources."entities-1.0.0"
-      sources."exit-0.1.2"
-      sources."fs.realpath-1.0.0"
-      (
-        sources."glob-7.2.3"
-        // {
-          dependencies = [
-            sources."minimatch-3.1.2"
-          ];
-        }
-      )
-      sources."htmlparser2-3.8.3"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."isarray-0.0.1"
-      sources."lodash-4.17.21"
-      sources."minimatch-3.0.8"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."readable-stream-1.1.14"
-      sources."string_decoder-0.10.31"
-      sources."strip-json-comments-1.0.4"
-      sources."wrappy-1.0.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Static analysis tool for JavaScript";
-      homepage = "http://jshint.com/";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   json = nodeEnv.buildNodePackage {
     name = "json";
     packageName = "json";

From 250233a10d0d0e63d7b1a1246d6b5c04a253ce03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 6 Nov 2025 13:12:35 -0800
Subject: [PATCH 6004/6226] home-assistant: re-enable previously failing tests

---
 pkgs/servers/home-assistant/default.nix | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 51f5b443e56a..af962a1d269f 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -488,12 +488,6 @@ python.pkgs.buildPythonApplication rec {
     "tests/test_bootstrap.py::test_setup_hass_takes_longer_than_log_slow_startup"
     "tests/test_test_fixtures.py::test_evict_faked_translations"
     "tests/helpers/test_backup.py::test_async_get_manager"
-    # (2025.9.0) Extra argument (demo platform) in list that is expected to be empty
-    "tests/scripts/test_check_config.py::test_config_platform_valid"
-    # (2025.9.0) Schema mismatch, diff shows a required field that needs to be removed
-    "tests/test_data_entry_flow.py::test_section_in_serializer"
-    # (2025.9.0) unique id collision in async_update_entry
-    "tests/test_config_entries.py::test_async_update_entry_unique_id_collision"
   ];
 
   preCheck = ''

From 1ec42ea2cd8d640993484b313284f968108cb5a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 21:13:20 +0000
Subject: [PATCH 6005/6226] cargo-dist: 0.30.1 -> 0.30.2

---
 pkgs/by-name/ca/cargo-dist/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ca/cargo-dist/package.nix b/pkgs/by-name/ca/cargo-dist/package.nix
index e4a0a9dc5d01..61bd4e6f3511 100644
--- a/pkgs/by-name/ca/cargo-dist/package.nix
+++ b/pkgs/by-name/ca/cargo-dist/package.nix
@@ -13,16 +13,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-dist";
-  version = "0.30.1";
+  version = "0.30.2";
 
   src = fetchFromGitHub {
     owner = "axodotdev";
     repo = "cargo-dist";
     rev = "v${version}";
-    hash = "sha256-kYmrV8GdtACtWPB3DckCriMqKeCn0Kz7HBDvXd9kr40=";
+    hash = "sha256-1stUmm7rtNB2z2srOzDvQ9QaGsS0CySBOHt118vmJoM=";
   };
 
-  cargoHash = "sha256-SShnaCaaB/mgQn8PtttXtvUjdPfrYRopvjl0uGJbvzE=";
+  cargoHash = "sha256-Il5PVJHoNdifqUcXxKR+j+Lgga0kIsl7IJp9oGanZ+c=";
 
   nativeBuildInputs = [
     pkg-config

From 0058ea9e747e1224379aee5c903c29e60b4c9137 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 21:14:52 +0000
Subject: [PATCH 6006/6226] python3Packages.click-odoo-contrib: 1.22 -> 1.23

---
 .../development/python-modules/click-odoo-contrib/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/click-odoo-contrib/default.nix b/pkgs/development/python-modules/click-odoo-contrib/default.nix
index 109fe65523b2..bcdbd26ace7d 100644
--- a/pkgs/development/python-modules/click-odoo-contrib/default.nix
+++ b/pkgs/development/python-modules/click-odoo-contrib/default.nix
@@ -12,13 +12,13 @@
 
 buildPythonPackage rec {
   pname = "click-odoo-contrib";
-  version = "1.22";
+  version = "1.23";
   format = "pyproject";
 
   src = fetchPypi {
     pname = "click_odoo_contrib";
     inherit version;
-    hash = "sha256-L0Slv0ExVsnlMH23FX06aAEYMqzQEAc4mrKb96TtjRY=";
+    hash = "sha256-ep4aBJpc94qLIBaGdD0F1fkQmPA4qtG0ql3W+wbPmkE=";
   };
 
   nativeBuildInputs = [ setuptools-scm ];

From 5120256615b09b2ef1dab1b08e33cd2a41a62bbe Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 6 Nov 2025 21:13:07 +0000
Subject: [PATCH 6007/6226] python3Packages.dask: 2025.10.0 -> 2025.11.0

Diff: https://github.com/dask/dask/compare/2025.10.0...2025.11.0

Changelog: https://docs.dask.org/en/latest/changelog.html
---
 .../python-modules/dask/default.nix           | 23 ++++++-------------
 1 file changed, 7 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/dask/default.nix b/pkgs/development/python-modules/dask/default.nix
index 9dee7a37aa21..af46945b5197 100644
--- a/pkgs/development/python-modules/dask/default.nix
+++ b/pkgs/development/python-modules/dask/default.nix
@@ -5,6 +5,7 @@
 
   # build-system
   setuptools,
+  setuptools-scm,
 
   # dependencies
   click,
@@ -38,30 +39,20 @@
 
 buildPythonPackage rec {
   pname = "dask";
-  version = "2025.10.0";
+  version = "2025.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dask";
     repo = "dask";
     tag = version;
-    hash = "sha256-xPgMhydsFmwg0kyl3Lst1N+CsbbnsWdPOtkZ8BMPDR8=";
+    hash = "sha256-cU4w4dqJQ3ew+fRyD7Lc4URNfW738kKqls6k6j65pIo=";
   };
 
-  postPatch = ''
-    # versioneer hack to set version of GitHub package
-    echo "def get_versions(): return {'dirty': False, 'error': None, 'full-revisionid': None, 'version': '${version}'}" > dask/_version.py
-
-    substituteInPlace setup.py \
-      --replace-fail "import versioneer" "" \
-      --replace-fail "version=versioneer.get_version()," "version='${version}'," \
-      --replace-fail "cmdclass=versioneer.get_cmdclass()," ""
-
-    substituteInPlace pyproject.toml \
-      --replace-fail ', "versioneer[toml]==0.29"' ""
-  '';
-
-  build-system = [ setuptools ];
+  build-system = [
+    setuptools
+    setuptools-scm
+  ];
 
   dependencies = [
     click

From 6a02c451da76ad38fd1e0fc40336884a4a8b5767 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 6 Nov 2025 21:15:05 +0000
Subject: [PATCH 6008/6226] python3Packages.distributed: 2025.10.0 -> 2025.11.0

Diff: https://github.com/dask/distributed/compare/2025.10.0...2025.11.0

Changelog: https://github.com/dask/distributed/releases/tag/2025.11.0
---
 .../python-modules/distributed/default.nix        | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix
index 8beeb848a05c..cb0bc96793e1 100644
--- a/pkgs/development/python-modules/distributed/default.nix
+++ b/pkgs/development/python-modules/distributed/default.nix
@@ -6,7 +6,6 @@
   # build-system
   setuptools,
   setuptools-scm,
-  versioneer,
 
   # dependencies
   click,
@@ -28,28 +27,20 @@
 
 buildPythonPackage rec {
   pname = "distributed";
-  version = "2025.10.0";
+  version = "2025.11.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dask";
     repo = "distributed";
     tag = version;
-    hash = "sha256-qO03jwZeOjDP/BQxK8OFma5BxGF9nBoXVFWFGa+EQ00=";
+    hash = "sha256-b6kVrRPGbPyss0Wl56qQFjZOznLH9Y3HQlEHo9d6X9I=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace-fail "versioneer[toml]==" "versioneer[toml]>=" \
-      --replace-fail 'dynamic = ["version"]' 'version = "${version}"'
-  '';
-
   build-system = [
     setuptools
     setuptools-scm
-    versioneer
-  ]
-  ++ versioneer.optional-dependencies.toml;
+  ];
 
   pythonRelaxDeps = [ "dask" ];
 

From 3e8b559da11dd92c37fe1eaedc02526f6ac10269 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 21:23:14 +0000
Subject: [PATCH 6009/6226] python3Packages.oelint-data: 1.2.1 -> 1.2.3

---
 pkgs/development/python-modules/oelint-data/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/oelint-data/default.nix b/pkgs/development/python-modules/oelint-data/default.nix
index 6c5294c91cda..bc380ff58a21 100644
--- a/pkgs/development/python-modules/oelint-data/default.nix
+++ b/pkgs/development/python-modules/oelint-data/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "oelint-data";
-  version = "1.2.1";
+  version = "1.2.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-data";
     tag = version;
-    hash = "sha256-RjjuzjmUbTfmX1W7p+7+pO8O8dh+WInxPgMSJsLMLyU=";
+    hash = "sha256-R8K0rJoIZz/+cAurb0623MdC3qkV9YBwT5RKiWHDrn0=";
   };
 
   build-system = [

From eb011f3f0fbab8335d00b68588a2b01f56741989 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 6 Nov 2025 18:32:14 -0300
Subject: [PATCH 6010/6226] curv: fix build with cmake4

---
 pkgs/by-name/cu/curv/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/cu/curv/package.nix b/pkgs/by-name/cu/curv/package.nix
index 2859522af3d2..2fd270b06787 100644
--- a/pkgs/by-name/cu/curv/package.nix
+++ b/pkgs/by-name/cu/curv/package.nix
@@ -70,6 +70,11 @@ stdenv.mkDerivation {
     runHook postInstallCheck
   '';
 
+  postPatch = ''
+    substituteInPlace extern/googletest/googletest/CMakeLists.txt \
+      --replace-fail "cmake_minimum_required(VERSION 2.6.2)" "cmake_minimum_required(VERSION 3.10)"
+  '';
+
   passthru.updateScript = unstableGitUpdater { };
 
   meta = with lib; {

From 4c813555a097e58e5a2eb0ab324bc0e40c547b6e Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 6 Nov 2025 16:38:55 -0500
Subject: [PATCH 6011/6226] nodePackages.@babel/cli: drop

Upstream(per https://babeljs.io/docs/babel-cli) suggests installing this
per-project and not globally, so to help users avoid this anti-pattern,
let's remove it
---
 pkgs/development/node-packages/aliases.nix    |   2 +
 .../node-packages/main-programs.nix           |   1 -
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 260 ------------------
 4 files changed, 2 insertions(+), 262 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index cce4f3533d86..8bbb5737d6cb 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -35,6 +35,8 @@ in
 mapAliases {
   "@antora/cli" = pkgs.antora; # Added 2023-05-06
   "@astrojs/language-server" = pkgs.astro-language-server; # Added 2024-02-12
+  "@babel/cli" =
+    throw "@babel/cli was removed because upstream highly suggests installing it in your project instead of globally."; # Added 2025-11-06
   "@bitwarden/cli" = pkgs.bitwarden-cli; # added 2023-07-25
   "@commitlint/config-conventional" =
     throw "@commitlint/config-conventional has been dropped, as it is a library and your JS project should lock it instead."; # added 2024-12-16
diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix
index d0eae0605793..0e9b9b20b976 100644
--- a/pkgs/development/node-packages/main-programs.nix
+++ b/pkgs/development/node-packages/main-programs.nix
@@ -8,7 +8,6 @@
 
   # Packages that provide a single executable.
   "@angular/cli" = "ng";
-  "@babel/cli" = "babel";
   "@commitlint/cli" = "commitlint";
   "@webassemblyjs/repl-1.11.1" = "wasm";
   "@webassemblyjs/wasm-strip" = "wasm-strip";
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 2e73cbc3b36a..a0a286fb5aca 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -1,7 +1,6 @@
 [
   "@angular/cli"
 , "@antfu/ni"
-, "@babel/cli"
 , "@commitlint/cli"
 , "@microsoft/rush"
 , "@tailwindcss/aspect-ratio"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 6cb3a179f25d..3fd8d6e32bea 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -255,24 +255,6 @@ let
         sha512 = "RJlIHRueQgwWitWgF8OdFYGZX328Ax5BCemNGlqHfplnRT9ESi8JkFlvaVYbS+UubVY6dpv87Fs2u5M29iNFVQ==";
       };
     };
-    "@babel/compat-data-7.26.8" = {
-      name = "_at_babel_slash_compat-data";
-      packageName = "@babel/compat-data";
-      version = "7.26.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.26.8.tgz";
-        sha512 = "oH5UPLMWR3L2wEFLnFJ1TZXqHufiTKAiLfqw5zkhS4dKXLJ10yVztfil/twG8EDTA4F/tvVNw9nOl4ZMslB8rQ==";
-      };
-    };
-    "@babel/core-7.26.10" = {
-      name = "_at_babel_slash_core";
-      packageName = "@babel/core";
-      version = "7.26.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/core/-/core-7.26.10.tgz";
-        sha512 = "vMqyb7XCDMPvJFFOaT9kxtiRh42GwlZEg1/uIgtZshS5a/8OaduUfCi7kynKgc3Tw/6Uo2D+db9qBttghhmxwQ==";
-      };
-    };
     "@babel/generator-7.26.10" = {
       name = "_at_babel_slash_generator";
       packageName = "@babel/generator";
@@ -291,33 +273,6 @@ let
         sha512 = "6FF/urZvD0sTeO7k6/B15pMLC4CHUv1426lzr3N01aHJTl046uCAh9LXW/fzeXXjPNCJ6iABW5XaWOsIZB93aQ==";
       };
     };
-    "@babel/helper-compilation-targets-7.26.5" = {
-      name = "_at_babel_slash_helper-compilation-targets";
-      packageName = "@babel/helper-compilation-targets";
-      version = "7.26.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.26.5.tgz";
-        sha512 = "IXuyn5EkouFJscIDuFF5EsiSolseme1s0CZB+QxVugqJLYmKdxI1VfIBOst0SUu4rnk2Z7kqTwmoO1lp3HIfnA==";
-      };
-    };
-    "@babel/helper-module-imports-7.25.9" = {
-      name = "_at_babel_slash_helper-module-imports";
-      packageName = "@babel/helper-module-imports";
-      version = "7.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.25.9.tgz";
-        sha512 = "tnUA4RsrmflIM6W6RFTLFSXITtl0wKjgpnLgXyowocVPrbYrLUXSBXDgTs8BlbmIzIdlBySRQjINYs2BAkiLtw==";
-      };
-    };
-    "@babel/helper-module-transforms-7.26.0" = {
-      name = "_at_babel_slash_helper-module-transforms";
-      packageName = "@babel/helper-module-transforms";
-      version = "7.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.26.0.tgz";
-        sha512 = "xO+xu6B5K2czEnQye6BHA7DolFFmS3LB7stHZFaOLb1pAwO1HWLS8fXA+eh0A2yIvltPVmx3eNNDBJA2SLHXFw==";
-      };
-    };
     "@babel/helper-string-parser-7.25.9" = {
       name = "_at_babel_slash_helper-string-parser";
       packageName = "@babel/helper-string-parser";
@@ -336,24 +291,6 @@ let
         sha512 = "Ed61U6XJc3CVRfkERJWDz4dJwKe7iLmmJsbOGu9wSloNSFttHV0I8g6UAgb7qnK5ly5bGLPd4oXZlxCdANBOWQ==";
       };
     };
-    "@babel/helper-validator-option-7.25.9" = {
-      name = "_at_babel_slash_helper-validator-option";
-      packageName = "@babel/helper-validator-option";
-      version = "7.25.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.25.9.tgz";
-        sha512 = "e/zv1co8pp55dNdEcCynfj9X7nyUKUXoUEwfXqaZt0omVOmDe9oOTdKStH4GmAw6zxMFs50ZayuMfHDKlO7Tfw==";
-      };
-    };
-    "@babel/helpers-7.26.10" = {
-      name = "_at_babel_slash_helpers";
-      packageName = "@babel/helpers";
-      version = "7.26.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.10.tgz";
-        sha512 = "UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==";
-      };
-    };
     "@babel/parser-7.26.10" = {
       name = "_at_babel_slash_parser";
       packageName = "@babel/parser";
@@ -6656,15 +6593,6 @@ let
         sha512 = "Z942RysHXmJrhqk88FmKBVq/v5tqmSkDz7p54G/MGyjMnCFFnC79XWNbg+Vta8W6Wb2qtSZTSxIGkJrRpCFEiA==";
       };
     };
-    "browserslist-4.24.4" = {
-      name = "browserslist";
-      packageName = "browserslist";
-      version = "4.24.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz";
-        sha512 = "KDi1Ny1gSePi1vm0q4oxSF8b4DR44GF4BbmS2YdhPLOEqd8pDviZOGH/GsmRwoWJ2+5Lr085X7naowMwKHDG1A==";
-      };
-    };
     "brq-0.1.10" = {
       name = "brq";
       packageName = "brq";
@@ -7277,15 +7205,6 @@ let
         sha512 = "qMKdlOfsjlezMqxkUGGMaWWs17i2HoL15tM+wtx8ld4nLrUwU58TFdvyGOz/piNP842KeO8yXvggVQSdQ828NA==";
       };
     };
-    "caniuse-lite-1.0.30001704" = {
-      name = "caniuse-lite";
-      packageName = "caniuse-lite";
-      version = "1.0.30001704";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001704.tgz";
-        sha512 = "+L2IgBbV6gXB4ETf0keSvLr7JUrRVbIaB/lrQ1+z8mRcQiisG5k+lG6O4n6Y5q6f5EuNfaYXKgymucphlEXQew==";
-      };
-    };
     "canvas-2.11.2" = {
       name = "canvas";
       packageName = "canvas";
@@ -8366,15 +8285,6 @@ let
         sha512 = "P0CysNDQ7rtVw4QIQtm+MRxV66vKFSvlsQvGYXZWR3qFU0jlMKHZZZgw8e+8DSah4UDKMqnknRDQz+xuQXQ/Zg==";
       };
     };
-    "commander-6.2.1" = {
-      name = "commander";
-      packageName = "commander";
-      version = "6.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-6.2.1.tgz";
-        sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA==";
-      };
-    };
     "commander-7.2.0" = {
       name = "commander";
       packageName = "commander";
@@ -8952,15 +8862,6 @@ let
         sha512 = "Y8L5rp6jo+g9VEPgvqNfEopjTR4OTYct8lXlS8iVQdmnjDvbdbzYe9rjtFCB9egC86JoNCU61WRY+ScjkZpnIg==";
       };
     };
-    "convert-source-map-2.0.0" = {
-      name = "convert-source-map";
-      packageName = "convert-source-map";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz";
-        sha512 = "Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==";
-      };
-    };
     "convert-to-spaces-1.0.2" = {
       name = "convert-to-spaces";
       packageName = "convert-to-spaces";
@@ -10878,15 +10779,6 @@ let
         sha512 = "UeJmFfOrAQS8OJWPZ4qtgHyWExa088/MtK5UEyoJGFH67cDEXkZSviOiKRCZ4Xij0zxI3JECgYs3oKx+AizQBA==";
       };
     };
-    "electron-to-chromium-1.5.118" = {
-      name = "electron-to-chromium";
-      packageName = "electron-to-chromium";
-      version = "1.5.118";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.118.tgz";
-        sha512 = "yNDUus0iultYyVoEFLnQeei7LOQkL8wg8GQpkPCRrOlJXlcCwa6eGKZkxQ9ciHsqZyYbj8Jd94X1CTPzGm+uIA==";
-      };
-    };
     "elegant-spinner-1.0.1" = {
       name = "elegant-spinner";
       packageName = "elegant-spinner";
@@ -13245,15 +13137,6 @@ let
         sha512 = "XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==";
       };
     };
-    "fs-readdir-recursive-1.1.0" = {
-      name = "fs-readdir-recursive";
-      packageName = "fs-readdir-recursive";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz";
-        sha512 = "GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA==";
-      };
-    };
     "fs.extra-1.3.2" = {
       name = "fs.extra";
       packageName = "fs.extra";
@@ -13407,15 +13290,6 @@ let
         sha512 = "H7cUpwCQSiJmAHM4c/aFu6fUfrhWXW1ncyh8ftxEPMu6AiYkHw9K8br720TGPZJbk5eOH2bynjZD1yPvdDAmag==";
       };
     };
-    "gensync-1.0.0-beta.2" = {
-      name = "gensync";
-      packageName = "gensync";
-      version = "1.0.0-beta.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz";
-        sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==";
-      };
-    };
     "get-assigned-identifiers-1.2.0" = {
       name = "get-assigned-identifiers";
       packageName = "get-assigned-identifiers";
@@ -18978,15 +18852,6 @@ let
         sha512 = "WpibWJ60c3AgAz8a2iYErDrcT2C7OmKnsWhIcHOjkUHFjkXncJhtLxNSqUmxRxRunpb5I8Vprd7aNSd2NtksJQ==";
       };
     };
-    "lru-cache-5.1.1" = {
-      name = "lru-cache";
-      packageName = "lru-cache";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz";
-        sha512 = "KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==";
-      };
-    };
     "lru-cache-6.0.0" = {
       name = "lru-cache";
       packageName = "lru-cache";
@@ -19078,15 +18943,6 @@ let
         sha512 = "2w31R7SJtieJJnQtGc7RVL2StM2vGYVfqUOvUDxH6bC6aJTxPxTF0GnIgCyu7tjockiUWAYQRbxa7vKn34s5sQ==";
       };
     };
-    "make-dir-2.1.0" = {
-      name = "make-dir";
-      packageName = "make-dir";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz";
-        sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==";
-      };
-    };
     "make-dir-3.1.0" = {
       name = "make-dir";
       packageName = "make-dir";
@@ -21491,15 +21347,6 @@ let
         sha512 = "SU00ZarexNlE4Rjdm83vglt5Y9yiQ+XI1XpflWlb7q7UTN1JUItm69xMeiQCTxtTfnzt+83T8Cx+vI2ED++VDA==";
       };
     };
-    "node-releases-2.0.19" = {
-      name = "node-releases";
-      packageName = "node-releases";
-      version = "2.0.19";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz";
-        sha512 = "xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw==";
-      };
-    };
     "node-static-0.7.11" = {
       name = "node-static";
       packageName = "node-static";
@@ -30590,15 +30437,6 @@ let
         sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==";
       };
     };
-    "update-browserslist-db-1.1.3" = {
-      name = "update-browserslist-db";
-      packageName = "update-browserslist-db";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.3.tgz";
-        sha512 = "UxhIZQ+QInVdunkDAaiazvvT/+fXL5Osr0JZlJulepYu6Jd7qJtDZjlur0emRlT71EN3ScPoE7gvsuIKKNavKw==";
-      };
-    };
     "update-check-1.5.4" = {
       name = "update-check";
       packageName = "update-check";
@@ -32363,15 +32201,6 @@ let
         sha512 = "0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==";
       };
     };
-    "yallist-3.1.1" = {
-      name = "yallist";
-      packageName = "yallist";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz";
-        sha512 = "a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==";
-      };
-    };
     "yallist-4.0.0" = {
       name = "yallist";
       packageName = "yallist";
@@ -33125,95 +32954,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  "@babel/cli" = nodeEnv.buildNodePackage {
-    name = "_at_babel_slash_cli";
-    packageName = "@babel/cli";
-    version = "7.26.4";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/@babel/cli/-/cli-7.26.4.tgz";
-      sha512 = "+mORf3ezU3p3qr+82WvJSnQNE1GAYeoCfEv4fik6B5/2cvKZ75AX8oawWQdXtM9MmndooQj15Jr9kelRFWsuRw==";
-    };
-    dependencies = [
-      sources."@ampproject/remapping-2.3.0"
-      sources."@babel/code-frame-7.26.2"
-      sources."@babel/compat-data-7.26.8"
-      (
-        sources."@babel/core-7.26.10"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      sources."@babel/generator-7.26.10"
-      (
-        sources."@babel/helper-compilation-targets-7.26.5"
-        // {
-          dependencies = [
-            sources."semver-6.3.1"
-          ];
-        }
-      )
-      sources."@babel/helper-module-imports-7.25.9"
-      sources."@babel/helper-module-transforms-7.26.0"
-      sources."@babel/helper-string-parser-7.25.9"
-      sources."@babel/helper-validator-identifier-7.25.9"
-      sources."@babel/helper-validator-option-7.25.9"
-      sources."@babel/helpers-7.26.10"
-      sources."@babel/parser-7.26.10"
-      sources."@babel/template-7.26.9"
-      sources."@babel/traverse-7.26.10"
-      sources."@babel/types-7.26.10"
-      sources."@jridgewell/gen-mapping-0.3.8"
-      sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/set-array-1.2.1"
-      sources."@jridgewell/sourcemap-codec-1.5.0"
-      sources."@jridgewell/trace-mapping-0.3.25"
-      sources."balanced-match-1.0.2"
-      sources."brace-expansion-1.1.11"
-      sources."browserslist-4.24.4"
-      sources."caniuse-lite-1.0.30001704"
-      sources."commander-6.2.1"
-      sources."concat-map-0.0.1"
-      sources."convert-source-map-2.0.0"
-      sources."debug-4.4.0"
-      sources."electron-to-chromium-1.5.118"
-      sources."escalade-3.2.0"
-      sources."fs-readdir-recursive-1.1.0"
-      sources."fs.realpath-1.0.0"
-      sources."gensync-1.0.0-beta.2"
-      sources."glob-7.2.3"
-      sources."globals-11.12.0"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."js-tokens-4.0.0"
-      sources."jsesc-3.1.0"
-      sources."json5-2.2.3"
-      sources."lru-cache-5.1.1"
-      sources."make-dir-2.1.0"
-      sources."minimatch-3.1.2"
-      sources."ms-2.1.3"
-      sources."node-releases-2.0.19"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."picocolors-1.1.1"
-      sources."pify-4.0.1"
-      sources."semver-5.7.2"
-      sources."slash-2.0.0"
-      sources."update-browserslist-db-1.1.3"
-      sources."wrappy-1.0.2"
-      sources."yallist-3.1.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Babel command line";
-      homepage = "https://babel.dev/docs/en/next/babel-cli";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   "@commitlint/cli" = nodeEnv.buildNodePackage {
     name = "_at_commitlint_slash_cli";
     packageName = "@commitlint/cli";

From ca2fa5a4ab91d03afac210360715fadb96521eb0 Mon Sep 17 00:00:00 2001
From: networkException <git@nwex.de>
Date: Thu, 6 Nov 2025 22:41:11 +0100
Subject: [PATCH 6012/6226] ungoogled-chromium: 142.0.7444.59-2 ->
 142.0.7444.134-1

https://chromereleases.googleblog.com/2025/11/stable-channel-update-for-desktop.html

This update includes 5 security fixes.

CVEs:
CVE-2025-12725 CVE-2025-12726 CVE-2025-12727 CVE-2025-12728
CVE-2025-12729
---
 .../networking/browsers/chromium/info.json    | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json
index 1c0ee2a7a319..be1a0ffd43f0 100644
--- a/pkgs/applications/networking/browsers/chromium/info.json
+++ b/pkgs/applications/networking/browsers/chromium/info.json
@@ -813,7 +813,7 @@
     }
   },
   "ungoogled-chromium": {
-    "version": "142.0.7444.59",
+    "version": "142.0.7444.134",
     "deps": {
       "depot_tools": {
         "rev": "675a3a9ccd7cf9367bb4caa58c30f08b56d45ef5",
@@ -825,16 +825,16 @@
         "hash": "sha256-sm5GWbkm3ua7EkCWTuY4TG6EXKe3asXTrH1APnNARJQ="
       },
       "ungoogled-patches": {
-        "rev": "142.0.7444.59-2",
-        "hash": "sha256-Cjcy6ohVNt2eAD+m4ZTbeoHH9i4znkdgN0ZaysU8Whk="
+        "rev": "142.0.7444.134-1",
+        "hash": "sha256-kwKzDTte0wPnx+tUmIaQ2EVf6HHacunmBbwLlUqYnOI="
       },
       "npmHash": "sha256-i1eQ4YlrWSgY522OlFtGDDPmxE2zd1hDM03AzR8RafE="
     },
     "DEPS": {
       "src": {
         "url": "https://chromium.googlesource.com/chromium/src.git",
-        "rev": "4b8153ab58d3c3f4c9f7e4baad9616ecf80db5fa",
-        "hash": "sha256-RZQD9aL/YglC8chM7tqtB1Y2u6DF+6kkgwklUohaBXc=",
+        "rev": "b6965f826881a60c51151cfc0a0175966a0a4e81",
+        "hash": "sha256-NTBQrGihsT7kuY/Mac5s4oH1xEn3CFEAR6eOEvZwmYs=",
         "recompress": true
       },
       "src/third_party/clang-format/script": {
@@ -944,8 +944,8 @@
       },
       "src/third_party/dawn": {
         "url": "https://dawn.googlesource.com/dawn.git",
-        "rev": "cee9cb0d67e749bf42f5e90cb3b8a6f525dbb920",
-        "hash": "sha256-loKRLJfTxBxlTbPVWZqGdx0DyPvEopbs2zIf4gaxoLo="
+        "rev": "95f9c2b375395cc82941babdf1e9f0cf60a32831",
+        "hash": "sha256-BFJsVt7hkSyyPQiX7QCN7Fu6CgTF/2xwAQbWCkJVq6M="
       },
       "src/third_party/dawn/third_party/glfw": {
         "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw",
@@ -1069,8 +1069,8 @@
       },
       "src/third_party/devtools-frontend/src": {
         "url": "https://chromium.googlesource.com/devtools/devtools-frontend",
-        "rev": "38cfe98a56a034da33ee62a5f1ea235fe47f58a7",
-        "hash": "sha256-bUJuFEDqgUFdMfmMyroX4s2ky/2n37PsTWaV+iQHCJg="
+        "rev": "f063edc91e3610a60fb9d486ae8694f2a11fcd17",
+        "hash": "sha256-qiucde85rKA7TefveIa++sOF+MzT56pe8pHUUCj9Zeo="
       },
       "src/third_party/dom_distiller_js/dist": {
         "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git",
@@ -1619,8 +1619,8 @@
       },
       "src/v8": {
         "url": "https://chromium.googlesource.com/v8/v8.git",
-        "rev": "bb294624702efbb17691b642333f06bf5108e600",
-        "hash": "sha256-ovlKdiBYD9RAjA1XI0PLp/pt25LAvm3fn5AqWlJQfgs="
+        "rev": "4427aa4a9c14d3d542866c0ed2ae8a8554cfd68d",
+        "hash": "sha256-SL9YaplMFA1Ez11bIzAfl/F5qQob/PvCP1uknP1LiLs="
       }
     }
   }

From ebfb662490928b407ade92af1a8801fe12465c9f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 21:56:04 +0000
Subject: [PATCH 6013/6226] python3Packages.django-crispy-forms: 2.4 -> 2.5

---
 .../python-modules/django-crispy-forms/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-crispy-forms/default.nix b/pkgs/development/python-modules/django-crispy-forms/default.nix
index 95a359023de2..b002566bfa33 100644
--- a/pkgs/development/python-modules/django-crispy-forms/default.nix
+++ b/pkgs/development/python-modules/django-crispy-forms/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "django-crispy-forms";
-  version = "2.4";
+  version = "2.5";
   format = "pyproject";
 
   src = fetchFromGitHub {
     owner = "django-crispy-forms";
     repo = "django-crispy-forms";
     tag = version;
-    hash = "sha256-YV7XUv5N2Xcf79/8EdI7XnVtpiX+yQBhQumSUbZmOfc=";
+    hash = "sha256-UZw860dOmQOAHcOPn5JO5OPe0kei4Mivy5FTh25Zo1s=";
   };
 
   propagatedBuildInputs = [

From c714caf0c8704ed6d4771eff4a5a33ef34e28982 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 21:56:29 +0000
Subject: [PATCH 6014/6226] mapnik: 4.1.3 -> 4.1.4

---
 pkgs/by-name/ma/mapnik/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/mapnik/package.nix b/pkgs/by-name/ma/mapnik/package.nix
index 1c96078be752..b6604b9a6c77 100644
--- a/pkgs/by-name/ma/mapnik/package.nix
+++ b/pkgs/by-name/ma/mapnik/package.nix
@@ -31,13 +31,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "mapnik";
-  version = "4.1.3";
+  version = "4.1.4";
 
   src = fetchFromGitHub {
     owner = "mapnik";
     repo = "mapnik";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-jbtVJHTAeKGpb6PtcK9Tt4qA6dsECwLSQG9JGsHJjvY=";
+    hash = "sha256-WwxQNMTDaImlDqBYo4p1aNvIzAc3egza6LkXH7gEqOA=";
     fetchSubmodules = true;
   };
 

From 0c35d4b4a9e4bc77d631a4aac01e927ea5b13007 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 22:01:10 +0000
Subject: [PATCH 6015/6226] safety-cli: 3.6.2 -> 3.7.0

---
 pkgs/development/python-modules/safety/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/safety/default.nix b/pkgs/development/python-modules/safety/default.nix
index 6a4d9e61249c..e28902e92a67 100644
--- a/pkgs/development/python-modules/safety/default.nix
+++ b/pkgs/development/python-modules/safety/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "safety";
-  version = "3.6.2";
+  version = "3.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pyupio";
     repo = "safety";
     tag = version;
-    hash = "sha256-oGz2ZHGYaHi4RusNbZ5iqxuz2JBbchP5ip+uHHV10U0=";
+    hash = "sha256-BPLK/V7YQBCGopfRFAWdra8ve8Ww5KN1+oZKyoEPiFc=";
   };
 
   patches = [

From 28faab5f8ebe54f02bf7c8104aac6e1555732e61 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 22:01:27 +0000
Subject: [PATCH 6016/6226] sesh: 2.18.2 -> 2.19.0

---
 pkgs/by-name/se/sesh/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/se/sesh/package.nix b/pkgs/by-name/se/sesh/package.nix
index 678189c7922f..5012c4a10705 100644
--- a/pkgs/by-name/se/sesh/package.nix
+++ b/pkgs/by-name/se/sesh/package.nix
@@ -7,7 +7,7 @@
 }:
 buildGoModule rec {
   pname = "sesh";
-  version = "2.18.2";
+  version = "2.19.0";
 
   nativeBuildInputs = [
     go-mockery
@@ -16,7 +16,7 @@ buildGoModule rec {
     owner = "joshmedeski";
     repo = "sesh";
     rev = "v${version}";
-    hash = "sha256-ZxO6hUE1/KzcZu0G9NaCgpqy1JfPdUxlAOkqm4bpfxE=";
+    hash = "sha256-mteypgCgFxgoPSh0H1kwNUm3p9F3wbRjhONdSm9Qeqs=";
   };
 
   preBuild = ''

From b66b421a9ab053a817937dad89909adf6d982117 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 6 Nov 2025 17:09:25 -0500
Subject: [PATCH 6017/6226] nodePackages.@electron-forge/cli: drop

Upstream(per https://www.electronforge.io/cli#installation) suggests
installing the CLI locally, instead of globally. Also per
https://github.com/electron/forge/issues/2190, nixpkgs' version of the
CLI has issues anyways.
---
 pkgs/development/node-packages/aliases.nix    |    2 +
 .../node-packages/main-programs.nix           |    1 -
 .../node-packages/node-packages.json          |    1 -
 .../node-packages/node-packages.nix           | 1314 -----------------
 pkgs/development/node-packages/overrides.nix  |    4 -
 5 files changed, 2 insertions(+), 1320 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index cce4f3533d86..bbc3d4e892e5 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -39,6 +39,8 @@ mapAliases {
   "@commitlint/config-conventional" =
     throw "@commitlint/config-conventional has been dropped, as it is a library and your JS project should lock it instead."; # added 2024-12-16
   "@emacs-eask/cli" = pkgs.eask; # added 2023-08-17
+  "@electron-forge/cli" =
+    throw "@electron-forge/cli was removed because upstream suggests that you install it locally in your project instead."; # Added 2025-11-06
   "@forge/cli" = throw "@forge/cli was removed because it was broken"; # added 2023-09-20
   "@gitbeaker/cli" = pkgs.gitbeaker-cli; # Added 2025-10-29
   "@google/clasp" = pkgs.google-clasp; # Added 2023-05-07
diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix
index d0eae0605793..afa01ba7fd63 100644
--- a/pkgs/development/node-packages/main-programs.nix
+++ b/pkgs/development/node-packages/main-programs.nix
@@ -2,7 +2,6 @@
 {
   # Packages that provide multiple executables where one is clearly the `mainProgram`.
   "@antfu/ni" = "ni";
-  "@electron-forge/cli" = "electron-forge";
   "@microsoft/rush" = "rush";
   "@webassemblyjs/cli-1.11.1" = "wasm2wast";
 
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 2e73cbc3b36a..368d5a30725a 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -33,7 +33,6 @@
 , "diff2html-cli"
 , "dotenv-vault"
 , "elasticdump"
-, "@electron-forge/cli"
 , "elm-oracle"
 , "emoj"
 , "emojione"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 6cb3a179f25d..27a095303874 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -723,197 +723,6 @@ let
         sha512 = "0dEVyRLM/lG4gp1R/Ik5bfPl/1wX00xFwd5KcNH602tzBa09oF7pbTKETEhR1GjZ75K6OJnYFu8II2dyMhONMw==";
       };
     };
-    "@electron-forge/core-7.7.0" = {
-      name = "_at_electron-forge_slash_core";
-      packageName = "@electron-forge/core";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/core/-/core-7.7.0.tgz";
-        sha512 = "BWhg1Zw1bhpDuZowGH3lXDiL9zZBsYFNjtqyMqmkjcEm5xf9Dzs8mpRpNjtkpf3jit3LB4PNGMLj3c8ix0h4vQ==";
-      };
-    };
-    "@electron-forge/core-utils-7.7.0" = {
-      name = "_at_electron-forge_slash_core-utils";
-      packageName = "@electron-forge/core-utils";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/core-utils/-/core-utils-7.7.0.tgz";
-        sha512 = "kgOkiLzqnySkcpt26rBg8AoZsI1ID3f6s/dQlzfRJisWZTKTu4ryiMcaC0F07DVjaYFnEl9SQ86IvkTcyS97mQ==";
-      };
-    };
-    "@electron-forge/maker-base-7.7.0" = {
-      name = "_at_electron-forge_slash_maker-base";
-      packageName = "@electron-forge/maker-base";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/maker-base/-/maker-base-7.7.0.tgz";
-        sha512 = "9u+mmBLBAUHuH0+IGw94EGVTDD4CPKX05h5pp5/PIaijy16ss5dymK4vEp3s2XJMFlza2PsCgLLYBgDcAE2Dqg==";
-      };
-    };
-    "@electron-forge/plugin-base-7.7.0" = {
-      name = "_at_electron-forge_slash_plugin-base";
-      packageName = "@electron-forge/plugin-base";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/plugin-base/-/plugin-base-7.7.0.tgz";
-        sha512 = "6wisQ4ZKOWey48wFF+JHzih7AuQuVma5KauwNEju2Dh2ibwDMJmPy0FWVolMSg7XUIMbGKLADGilxX6XRv8qNQ==";
-      };
-    };
-    "@electron-forge/publisher-base-7.7.0" = {
-      name = "_at_electron-forge_slash_publisher-base";
-      packageName = "@electron-forge/publisher-base";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/publisher-base/-/publisher-base-7.7.0.tgz";
-        sha512 = "jHKvUc1peBBSl2t5d1x6M3CNyCMyNB+NnTO9LmA1dWFQ3oRDFwromIH5KjRqPJj6l4AyH0/XJogdO7Nn4Eyn6Q==";
-      };
-    };
-    "@electron-forge/shared-types-7.7.0" = {
-      name = "_at_electron-forge_slash_shared-types";
-      packageName = "@electron-forge/shared-types";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/shared-types/-/shared-types-7.7.0.tgz";
-        sha512 = "1zQsmudkAuHv0HnJtSJY3pvTeuN3fnSa9BR6cbeUlcpOfrnG4OTG03FqerHfyIWaBRVy7jGgif0NhKKE9azKyg==";
-      };
-    };
-    "@electron-forge/template-base-7.7.0" = {
-      name = "_at_electron-forge_slash_template-base";
-      packageName = "@electron-forge/template-base";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/template-base/-/template-base-7.7.0.tgz";
-        sha512 = "jwnhEHNIyQfbwJ6R8SuZIJApHKBykDr/rSgUF3km9nr2qAUSoUUV7RaJa/uiQJMtvamXenuo5K84C2NzumzS3A==";
-      };
-    };
-    "@electron-forge/template-vite-7.7.0" = {
-      name = "_at_electron-forge_slash_template-vite";
-      packageName = "@electron-forge/template-vite";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/template-vite/-/template-vite-7.7.0.tgz";
-        sha512 = "6p+U6FDWrmF7XgSLkrO07OOgJcrrrArbnExSckGJdBnupxmIDf1Y+exwfHHKdxX6/FfkA6JST5nRGjgA5CFqcw==";
-      };
-    };
-    "@electron-forge/template-vite-typescript-7.7.0" = {
-      name = "_at_electron-forge_slash_template-vite-typescript";
-      packageName = "@electron-forge/template-vite-typescript";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/template-vite-typescript/-/template-vite-typescript-7.7.0.tgz";
-        sha512 = "32C/+PF+hIloTdbRx7OutvqnTkkC7BHeQxNw4/zG2TfQ3cjl7JUD6A2UvTUHtv5KHkK2hDw6ZdahPwpJO41YSA==";
-      };
-    };
-    "@electron-forge/template-webpack-7.7.0" = {
-      name = "_at_electron-forge_slash_template-webpack";
-      packageName = "@electron-forge/template-webpack";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/template-webpack/-/template-webpack-7.7.0.tgz";
-        sha512 = "7Hb1wejKqtvPXqhelubUNAh39FtClB/4JDtWzyAsL2iC3XeB5qh6pITz8+nW/rF2qW/JAepc/lnreqKn34P2ig==";
-      };
-    };
-    "@electron-forge/template-webpack-typescript-7.7.0" = {
-      name = "_at_electron-forge_slash_template-webpack-typescript";
-      packageName = "@electron-forge/template-webpack-typescript";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/template-webpack-typescript/-/template-webpack-typescript-7.7.0.tgz";
-        sha512 = "w1vRAjGy0MjjdEDYPpZcpkMo2e3z5uEwfJdwVOpBeha7p2WM/Y6go21K+7pSqGp8Xmq4zlE20hq5MEx8Bs8eZg==";
-      };
-    };
-    "@electron-forge/tracer-7.7.0" = {
-      name = "_at_electron-forge_slash_tracer";
-      packageName = "@electron-forge/tracer";
-      version = "7.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron-forge/tracer/-/tracer-7.7.0.tgz";
-        sha512 = "R/JiGFzWhwfVyc6ioT4l5FFChRLS4Z2tWPeQfPcyoemdpzKpI1rvMHti42gzWXFW8GdzkhG0G3ZWfKiF3y3x/Q==";
-      };
-    };
-    "@electron/asar-3.3.1" = {
-      name = "_at_electron_slash_asar";
-      packageName = "@electron/asar";
-      version = "3.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron/asar/-/asar-3.3.1.tgz";
-        sha512 = "WtpC/+34p0skWZiarRjLAyqaAX78DofhDxnREy/V5XHfu1XEXbFCSSMcDQ6hNCPJFaPy8/NnUgYuf9uiCkvKPg==";
-      };
-    };
-    "@electron/get-3.1.0" = {
-      name = "_at_electron_slash_get";
-      packageName = "@electron/get";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron/get/-/get-3.1.0.tgz";
-        sha512 = "F+nKc0xW+kVbBRhFzaMgPy3KwmuNTYX1fx6+FxxoSnNgwYX6LD7AKBTWkU0MQ6IBoe7dz069CNkR673sPAgkCQ==";
-      };
-    };
-    "@electron/node-gyp-git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2" =
-      {
-        name = "_at_electron_slash_node-gyp";
-        packageName = "@electron/node-gyp";
-        version = "10.2.0-electron.1";
-        src = fetchgit {
-          url = "https://github.com/electron/node-gyp.git";
-          rev = "06b29aafb7708acef8b3669835c8a7857ebc92d2";
-          sha256 = "033b279dda9d8576174438fafb804f2b27173433a5fe0359232330ffe5a3b155";
-        };
-      };
-    "@electron/notarize-2.5.0" = {
-      name = "_at_electron_slash_notarize";
-      packageName = "@electron/notarize";
-      version = "2.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron/notarize/-/notarize-2.5.0.tgz";
-        sha512 = "jNT8nwH1f9X5GEITXaQ8IF/KdskvIkOFfB2CvwumsveVidzpSc+mvhhTMdAGSYF3O+Nq49lJ7y+ssODRXu06+A==";
-      };
-    };
-    "@electron/osx-sign-1.3.3" = {
-      name = "_at_electron_slash_osx-sign";
-      packageName = "@electron/osx-sign";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron/osx-sign/-/osx-sign-1.3.3.tgz";
-        sha512 = "KZ8mhXvWv2rIEgMbWZ4y33bDHyUKMXnx4M0sTyPNK/vcB81ImdeY9Ggdqy0SWbMDgmbqyQ+phgejh6V3R2QuSg==";
-      };
-    };
-    "@electron/packager-18.3.6" = {
-      name = "_at_electron_slash_packager";
-      packageName = "@electron/packager";
-      version = "18.3.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron/packager/-/packager-18.3.6.tgz";
-        sha512 = "1eXHB5t+SQKvUiDpWGpvr90ZSSbXj+isrh3YbjCTjKT4bE4SQrKSBfukEAaBvp67+GXHFtCHjQgN9qSTFIge+Q==";
-      };
-    };
-    "@electron/rebuild-3.7.1" = {
-      name = "_at_electron_slash_rebuild";
-      packageName = "@electron/rebuild";
-      version = "3.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron/rebuild/-/rebuild-3.7.1.tgz";
-        sha512 = "sKGD+xav4Gh25+LcLY0rjIwcCFTw+f/HU1pB48UVbwxXXRGaXEqIH0AaYKN46dgd/7+6kuiDXzoyAEvx1zCsdw==";
-      };
-    };
-    "@electron/universal-2.0.2" = {
-      name = "_at_electron_slash_universal";
-      packageName = "@electron/universal";
-      version = "2.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron/universal/-/universal-2.0.2.tgz";
-        sha512 = "mqY1szx5/d5YLvfCDWWoJdkSIjIz+NdWN4pN0r78lYiE7De+slLpuF3lVxIT+hlJnwk5sH2wFRMl6/oUgUVO3A==";
-      };
-    };
-    "@electron/windows-sign-1.2.1" = {
-      name = "_at_electron_slash_windows-sign";
-      packageName = "@electron/windows-sign";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@electron/windows-sign/-/windows-sign-1.2.1.tgz";
-        sha512 = "YfASnrhJ+ve6Q43ZiDwmpBgYgi2u0bYjeAVi2tDfN7YWAKO8X9EEOuPGtqbJpPLM6TfAHimghICjWe2eaJ8BAg==";
-      };
-    };
     "@eslint-community/eslint-utils-4.5.1" = {
       name = "_at_eslint-community_slash_eslint-utils";
       packageName = "@eslint-community/eslint-utils";
@@ -1058,15 +867,6 @@ let
         sha512 = "vBZP4NlzfOlerQTnba4aqZoMhE/a9HY7HRqoOPaETQcSQuWEIyZMHGfVu6w9wGtGK5fED5qRs2DteVCjOH60sA==";
       };
     };
-    "@gar/promisify-1.1.3" = {
-      name = "_at_gar_slash_promisify";
-      packageName = "@gar/promisify";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz";
-        sha512 = "k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==";
-      };
-    };
     "@gerrit0/mini-shiki-1.27.2" = {
       name = "_at_gerrit0_slash_mini-shiki";
       packageName = "@gerrit0/mini-shiki";
@@ -1877,15 +1677,6 @@ let
         sha512 = "0hz44rAcrphyXcA8IS7EJ2SCoaBZD2u5goE8S/e+q/DL+dOGpqpcLidVOFeLG3VgML62SXmfRLAhWt0zL1oW4Q==";
       };
     };
-    "@malept/cross-spawn-promise-2.0.0" = {
-      name = "_at_malept_slash_cross-spawn-promise";
-      packageName = "@malept/cross-spawn-promise";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-2.0.0.tgz";
-        sha512 = "1DpKU0Z5ThltBwjNySMC14g0CkbyhCaz9FkhxqNsZI6uAPJXFS8cMXlBKo26FJ8ZuW6S9GCMcR9IO5k2X5/9Fg==";
-      };
-    };
     "@mapbox/node-pre-gyp-1.0.11" = {
       name = "_at_mapbox_slash_node-pre-gyp";
       packageName = "@mapbox/node-pre-gyp";
@@ -1976,15 +1767,6 @@ let
         sha512 = "uSz+elSGzjCMANWa5IlbGczLYPkNI/LeR+cHrgaTqTrTSh9RHhOFA4daD2eRUz6lMtOW+Fnsb+qv7V2Zz8ML0g==";
       };
     };
-    "@npmcli/fs-2.1.2" = {
-      name = "_at_npmcli_slash_fs";
-      packageName = "@npmcli/fs";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/fs/-/fs-2.1.2.tgz";
-        sha512 = "yOJKRvohFOaLqipNtwYB9WugyZKhC/DZC4VYPmpaCzDBrA8YpK3qHZ8/HGscMnE4GqbkLNuVcCnxkeQEdGt6LQ==";
-      };
-    };
     "@npmcli/fs-4.0.0" = {
       name = "_at_npmcli_slash_fs";
       packageName = "@npmcli/fs";
@@ -2021,15 +1803,6 @@ let
         sha512 = "tkYs0OYnzQm6iIRdfy+LcLBjcKuQCeE5YLb8KnrIlutJfheNaPvPpgoFEyEFgbjzl5PLZ3IA/BWAwRU0eHuQDA==";
       };
     };
-    "@npmcli/move-file-2.0.1" = {
-      name = "_at_npmcli_slash_move-file";
-      packageName = "@npmcli/move-file";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@npmcli/move-file/-/move-file-2.0.1.tgz";
-        sha512 = "mJd2Z5TjYWq/ttPLLGqArdtnC74J6bOzg4rMDnN+p1xTacZ2yPRCk2y0oSWQtygLR9YVQXgOcONrwtnk3JupxQ==";
-      };
-    };
     "@npmcli/name-from-folder-2.0.0" = {
       name = "_at_npmcli_slash_name-from-folder";
       packageName = "@npmcli/name-from-folder";
@@ -2966,15 +2739,6 @@ let
         sha512 = "9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==";
       };
     };
-    "@sindresorhus/is-4.6.0" = {
-      name = "_at_sindresorhus_slash_is";
-      packageName = "@sindresorhus/is";
-      version = "4.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@sindresorhus/is/-/is-4.6.0.tgz";
-        sha512 = "t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw==";
-      };
-    };
     "@sindresorhus/is-5.6.0" = {
       name = "_at_sindresorhus_slash_is";
       packageName = "@sindresorhus/is";
@@ -3236,15 +3000,6 @@ let
         sha512 = "XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==";
       };
     };
-    "@szmarczak/http-timer-4.0.6" = {
-      name = "_at_szmarczak_slash_http-timer";
-      packageName = "@szmarczak/http-timer";
-      version = "4.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.6.tgz";
-        sha512 = "4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==";
-      };
-    };
     "@szmarczak/http-timer-5.0.1" = {
       name = "_at_szmarczak_slash_http-timer";
       packageName = "@szmarczak/http-timer";
@@ -3398,15 +3153,6 @@ let
         sha512 = "FisOhG87cCFqzCgq6FUtSYsTMOHCB/p28zJbSN1QBo4ZGJfg9PEhMjdIV++NDeOnloUUe0Gz6jwBV+L1Ac00Mw==";
       };
     };
-    "@types/cacheable-request-6.0.3" = {
-      name = "_at_types_slash_cacheable-request";
-      packageName = "@types/cacheable-request";
-      version = "6.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.3.tgz";
-        sha512 = "IQ3EbTzGxIigb1I3qPZc1rWJnH0BmSKv5QYTalEwweFvyBDLSAe24zP0le/hyi7ecGfZVlIVAg4BZqb8WBwKqw==";
-      };
-    };
     "@types/cli-progress-3.11.6" = {
       name = "_at_types_slash_cli-progress";
       packageName = "@types/cli-progress";
@@ -3587,15 +3333,6 @@ let
         sha512 = "5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==";
       };
     };
-    "@types/keyv-3.1.4" = {
-      name = "_at_types_slash_keyv";
-      packageName = "@types/keyv";
-      version = "3.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.4.tgz";
-        sha512 = "BQ5aZNSCpj7D6K2ksrRCTmKRLEpnPvWDiLPfoGyhZ++8YtiK9d/3DBKPJgry359X/P1PfruyYwvnvwFjuEiEIg==";
-      };
-    };
     "@types/linkify-it-5.0.0" = {
       name = "_at_types_slash_linkify-it";
       packageName = "@types/linkify-it";
@@ -3812,15 +3549,6 @@ let
         sha512 = "JuRQ9KXLEjaUNjTWpzuR231Z2WpIwczOkBEIvbHNCzQefFIT0L8IqE6NV6ULLyC1SI/i234JnDoMkfg+RjQj2g==";
       };
     };
-    "@types/responselike-1.0.3" = {
-      name = "_at_types_slash_responselike";
-      packageName = "@types/responselike";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.3.tgz";
-        sha512 = "H/+L+UkTV33uf49PH5pCAUBVPNj2nDBXTN+qS1dOwyyg24l3CcicicCA7ca+HMvJBZcFgl5r8e+RR6elsb4Lyw==";
-      };
-    };
     "@types/semver-7.5.8" = {
       name = "_at_types_slash_semver";
       packageName = "@types/semver";
@@ -4748,15 +4476,6 @@ let
         sha512 = "jRR5wdylq8CkOe6hei19GGZnxM6rBGwFl3Bg0YItGDimvjGtAvdZk4Pu6Cl4u4Igsws4a1fd1Vq3ezrhn4KmFw==";
       };
     };
-    "agentkeepalive-4.6.0" = {
-      name = "agentkeepalive";
-      packageName = "agentkeepalive";
-      version = "4.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/agentkeepalive/-/agentkeepalive-4.6.0.tgz";
-        sha512 = "kja8j7PjmncONqaTsB8fQ+wE2mSU2DJ9D4XKoJ5PFWIdRMa6SLSN1ff4mOr4jCbfRSsxR4keIiySJU0N9T5hIQ==";
-      };
-    };
     "aggregate-error-3.1.0" = {
       name = "aggregate-error";
       packageName = "aggregate-error";
@@ -5846,15 +5565,6 @@ let
         sha512 = "kU6FmrwZ3Lx7/7y3hPS5QnbJfaohcIul5fGqf7ok+4KklIEk9tJ0C2IQPdacSbVUWv6zVHXEBWoWd6NrVMT7Cw==";
       };
     };
-    "author-regex-1.0.0" = {
-      name = "author-regex";
-      packageName = "author-regex";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/author-regex/-/author-regex-1.0.0.tgz";
-        sha512 = "KbWgR8wOYRAPekEmMXrYYdc7BRyhn2Ftk7KWfMUnQ43hFdojWEFRxhhRUm3/OFEdPa1r0KAvTTg9YQK57xTe0g==";
-      };
-    };
     "auto-bind-4.0.0" = {
       name = "auto-bind";
       packageName = "auto-bind";
@@ -7016,15 +6726,6 @@ let
         sha512 = "b6Ilus+c3RrdDk+JhLKUAQfzzgLEPy6wcXqS7f/xe1EETvsDP6GORG7SFuOs6cID5YkqchW/LXZbX5bc8j7ZcQ==";
       };
     };
-    "cacache-16.1.3" = {
-      name = "cacache";
-      packageName = "cacache";
-      version = "16.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cacache/-/cacache-16.1.3.tgz";
-        sha512 = "/+Emcj9DAXxX4cwlLmRI9c166RuL3w30zp4R7Joiv2cQTtTtA+jeuCAjH3ZlGnYS3tKENSrKhAzVVP9GVyzeYQ==";
-      };
-    };
     "cacache-19.0.1" = {
       name = "cacache";
       packageName = "cacache";
@@ -7043,15 +6744,6 @@ let
         sha512 = "AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==";
       };
     };
-    "cacheable-lookup-5.0.4" = {
-      name = "cacheable-lookup";
-      packageName = "cacheable-lookup";
-      version = "5.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.4.tgz";
-        sha512 = "2/kNscPhpcxrOigMZzbiWF7dz8ilhb/nIHU3EyZiXWXpeq/au8qJ8VhdftMkty3n7Gj6HIGalQG8oiBNB3AJgA==";
-      };
-    };
     "cacheable-lookup-7.0.0" = {
       name = "cacheable-lookup";
       packageName = "cacheable-lookup";
@@ -7079,15 +6771,6 @@ let
         sha512 = "Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==";
       };
     };
-    "cacheable-request-7.0.4" = {
-      name = "cacheable-request";
-      packageName = "cacheable-request";
-      version = "7.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.4.tgz";
-        sha512 = "v+p6ongsrp0yTGbJXjgxPow2+DL93DASP4kXCDKb8/bwRtt9OEF3whggkkDkGNzgcWy2XaF4a8nZglC7uElscg==";
-      };
-    };
     "cached-path-relative-1.1.0" = {
       name = "cached-path-relative";
       packageName = "cached-path-relative";
@@ -7628,15 +7311,6 @@ let
         sha512 = "Jzy2EnzmE+ligqIZUsmWnck9RBXLuUy6CaKyuNMtowFG3ZvLt8d+WBJCTPEludV0DHpIKjAOlwjFmTaEdfdWCw==";
       };
     };
-    "chrome-trace-event-1.0.4" = {
-      name = "chrome-trace-event";
-      packageName = "chrome-trace-event";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz";
-        sha512 = "rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==";
-      };
-    };
     "chromium-bidi-0.6.3" = {
       name = "chromium-bidi";
       packageName = "chromium-bidi";
@@ -7862,15 +7536,6 @@ let
         sha512 = "n8fOixwDD6b/ObinzTrp1ZKFzbgvKZvuz/TvejnLn1aQfC6r52XEx85FmuC+3HI+JM7coBRXUvNqEU2PHVrHpg==";
       };
     };
-    "cli-truncate-3.1.0" = {
-      name = "cli-truncate";
-      packageName = "cli-truncate";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cli-truncate/-/cli-truncate-3.1.0.tgz";
-        sha512 = "wfOBkjXteqSnI59oPcJkcPl/ZmwvMMOj340qUIY1SKZCv0B9Cf4D4fAucRkIKQmsIuYK3x1rrgU7MeGRruiuiA==";
-      };
-    };
     "cli-truncate-4.0.0" = {
       name = "cli-truncate";
       packageName = "cli-truncate";
@@ -8393,15 +8058,6 @@ let
         sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==";
       };
     };
-    "commander-9.5.0" = {
-      name = "commander";
-      packageName = "commander";
-      version = "9.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/commander/-/commander-9.5.0.tgz";
-        sha512 = "KRs7WVDKg86PWiuAqhDrAQnTXZKraVcCc6vFdL14qrZ/DcWwuRo7VoiYXalXO7S5GKpqYiVEwCbgFDfxNHKJBQ==";
-      };
-    };
     "comment-json-4.2.5" = {
       name = "comment-json";
       packageName = "comment-json";
@@ -8447,15 +8103,6 @@ let
         sha512 = "zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==";
       };
     };
-    "compare-version-0.1.2" = {
-      name = "compare-version";
-      packageName = "compare-version";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/compare-version/-/compare-version-0.1.2.tgz";
-        sha512 = "pJDh5/4wrEnXX/VWRZvruAGHkzKdr46z11OlTPN+VrATlWWhSKewNCJ1futCO5C7eJB3nPMFZA1LeYtcFboZ2A==";
-      };
-    };
     "component-bind-1.0.0" = {
       name = "component-bind";
       packageName = "component-bind";
@@ -9213,15 +8860,6 @@ let
         sha512 = "dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==";
       };
     };
-    "cross-dirname-0.1.0" = {
-      name = "cross-dirname";
-      packageName = "cross-dirname";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cross-dirname/-/cross-dirname-0.1.0.tgz";
-        sha512 = "+R08/oI0nl3vfPcqftZRpytksBXDzOUveBq/NBVx0sUp1axwzPQrKinNx5yd5sxPu8j1wIy8AfnVQ+5eFdha6Q==";
-      };
-    };
     "cross-fetch-3.1.8" = {
       name = "cross-fetch";
       packageName = "cross-fetch";
@@ -10419,15 +10057,6 @@ let
         sha512 = "kqag/Nl+f3GwyK25fhUMYj81BUOrZ9IuJsjIcDE5icNM9FJHAVm3VcUDxdLPoQtTuUylWm6ZIknYJwwaPxsUzg==";
       };
     };
-    "dir-compare-4.2.0" = {
-      name = "dir-compare";
-      packageName = "dir-compare";
-      version = "4.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dir-compare/-/dir-compare-4.2.0.tgz";
-        sha512 = "2xMCmOoMrdQIPHdsTawECdNPwlVFB9zGcz3kuhmBO6U3oU+UQjsue0i8ayLKpgBcm+hcXPMVSGUN9d+pvJ6+VQ==";
-      };
-    };
     "dir-glob-3.0.1" = {
       name = "dir-glob";
       packageName = "dir-glob";
@@ -12660,15 +12289,6 @@ let
         sha512 = "ICw7NTT6RsDp2rnYKVd8Fu4cr6ITzGy3+u4vUujPkabyaz+03F24NWEX7fs5fp+kBonlaqPH8fAO2NM+SXt/JA==";
       };
     };
-    "filenamify-4.3.0" = {
-      name = "filenamify";
-      packageName = "filenamify";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/filenamify/-/filenamify-4.3.0.tgz";
-        sha512 = "hcFKyUG57yWGAzu1CMt/dPzYZuv+jAJUT85bL8mrXvNe6hWj6yEHEc4EdcgiA6Z3oi1/9wXJdZPXF2dZNgwgOg==";
-      };
-    };
     "filesize-6.4.0" = {
       name = "filesize";
       packageName = "filesize";
@@ -12741,15 +12361,6 @@ let
         sha512 = "jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA==";
       };
     };
-    "find-up-2.1.0" = {
-      name = "find-up";
-      packageName = "find-up";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz";
-        sha512 = "NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ==";
-      };
-    };
     "find-up-3.0.0" = {
       name = "find-up";
       packageName = "find-up";
@@ -12930,15 +12541,6 @@ let
         sha512 = "pzNZh42/A2HmcRIpddSP0T+zBofd119o5rNB2u1YHv36CM2C/ietI2ZsjWZ2LSL7J0BNVkFn1a9Ad+cmO2lDQg==";
       };
     };
-    "flora-colossus-2.0.0" = {
-      name = "flora-colossus";
-      packageName = "flora-colossus";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/flora-colossus/-/flora-colossus-2.0.0.tgz";
-        sha512 = "dz4HxH6pOvbUzZpZ/yXhafjbR2I8cenK5xL0KtBFb7U2ADsR+OwXifnxZjij/pZWF775uSCMzWVd+jDik2H2IA==";
-      };
-    };
     "fluent-ffmpeg-2.1.3" = {
       name = "fluent-ffmpeg";
       packageName = "fluent-ffmpeg";
@@ -13317,15 +12919,6 @@ let
         sha512 = "Tt4kuxLXFKHy8KT40zwsUPUkg1CrsgY25FxA2U/j/0WgEDCk3ddc/zLTCCcbSHX9FcKtLuVaDGtGE/STWC+j3Q==";
       };
     };
-    "galactus-1.0.0" = {
-      name = "galactus";
-      packageName = "galactus";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/galactus/-/galactus-1.0.0.tgz";
-        sha512 = "R1fam6D4CyKQGNlvJne4dkNF+PvUUl7TAJInvTGa9fti9qAv95quQz29GXapA4d8Ec266mJJxFVh82M4GIIGDQ==";
-      };
-    };
     "gauge-2.7.4" = {
       name = "gauge";
       packageName = "gauge";
@@ -13461,15 +13054,6 @@ let
         sha512 = "9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==";
       };
     };
-    "get-package-info-1.0.0" = {
-      name = "get-package-info";
-      packageName = "get-package-info";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/get-package-info/-/get-package-info-1.0.0.tgz";
-        sha512 = "SCbprXGAPdIhKAXiG+Mk6yeoFH61JlYunqdFQFHDtLjJlDjFf6x07dsS8acO+xWt52jpdVo49AlVDnUVK1sDNw==";
-      };
-    };
     "get-package-type-0.1.0" = {
       name = "get-package-type";
       packageName = "get-package-type";
@@ -14028,15 +13612,6 @@ let
         sha512 = "ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==";
       };
     };
-    "got-11.8.6" = {
-      name = "got";
-      packageName = "got";
-      version = "11.8.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/got/-/got-11.8.6.tgz";
-        sha512 = "6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g==";
-      };
-    };
     "got-12.6.1" = {
       name = "got";
       packageName = "got";
@@ -14838,15 +14413,6 @@ let
         sha512 = "qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==";
       };
     };
-    "http-proxy-agent-5.0.0" = {
-      name = "http-proxy-agent";
-      packageName = "http-proxy-agent";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz";
-        sha512 = "n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==";
-      };
-    };
     "http-proxy-agent-7.0.2" = {
       name = "http-proxy-agent";
       packageName = "http-proxy-agent";
@@ -14901,15 +14467,6 @@ let
         sha512 = "EC2utToWl4RKfs5zd36Mxq7nzHHBuomZboI0yYL6Y0RmBgT7Sgkq4rQ0ezFTYoIsSs7Tm9SJe+o2FcAg6GBhGA==";
       };
     };
-    "http2-wrapper-1.0.3" = {
-      name = "http2-wrapper";
-      packageName = "http2-wrapper";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.3.tgz";
-        sha512 = "V+23sDMr12Wnz7iTcDeJr3O6AIxlnvT/bmaAAAP/Xda35C90p9599p0F1eHR/N1KILWSoWVAiOMFjBBXaXSMxg==";
-      };
-    };
     "http2-wrapper-2.2.1" = {
       name = "http2-wrapper";
       packageName = "http2-wrapper";
@@ -15000,15 +14557,6 @@ let
         sha512 = "/1/GPCpDUCCYwlERiYjxoczfP0zfvZMU/OWgQPMya9AbAE24vseigFdhAMObpc8Q4lc/kjutPfUddDYyAmejnA==";
       };
     };
-    "humanize-ms-1.2.1" = {
-      name = "humanize-ms";
-      packageName = "humanize-ms";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/humanize-ms/-/humanize-ms-1.2.1.tgz";
-        sha512 = "Fl70vYtsAFb/C06PTS9dZBo7ihau+Tu/DNCk/OyHhea07S+aeMWpFFkUaXRa8fI+ScZbEI8dfSxwY7gxZ9SAVQ==";
-      };
-    };
     "hyperlinker-1.0.0" = {
       name = "hyperlinker";
       packageName = "hyperlinker";
@@ -15306,15 +14854,6 @@ let
         sha512 = "i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg==";
       };
     };
-    "infer-owner-1.0.4" = {
-      name = "infer-owner";
-      packageName = "infer-owner";
-      version = "1.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz";
-        sha512 = "IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==";
-      };
-    };
     "inflight-1.0.6" = {
       name = "inflight";
       packageName = "inflight";
@@ -16206,15 +15745,6 @@ let
         sha512 = "qP1vozQRI+BMOPcjFzrjXuQvdak2pHNUMZoeG2eRbiSqyvbEf/wQtEOTOX1guk6E3t36RkaqiSt8A/6YElNxLQ==";
       };
     };
-    "is-lambda-1.0.1" = {
-      name = "is-lambda";
-      packageName = "is-lambda";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz";
-        sha512 = "z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==";
-      };
-    };
     "is-map-2.0.3" = {
       name = "is-map";
       packageName = "is-map";
@@ -16827,15 +16357,6 @@ let
         sha512 = "xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==";
       };
     };
-    "isbinaryfile-4.0.10" = {
-      name = "isbinaryfile";
-      packageName = "isbinaryfile";
-      version = "4.0.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-4.0.10.tgz";
-        sha512 = "iHrqe5shvBUcFbmZq9zOQHBoeOhZJu6RQGrDpBgenUm/Am+F3JM2MgQj+rK3Z601fzrL5gLZWtAPH2OBaSVcyw==";
-      };
-    };
     "isexe-2.0.0" = {
       name = "isexe";
       packageName = "isexe";
@@ -17520,15 +17041,6 @@ let
         sha512 = "cnpQrXvFSLdsR9KR5/x7zdf6c3m8IhZfZzSblFEHSqBaVwD2nvJ4CuCKLyvKvwBgZm08CgfSoiTBQLm5WW9hGw==";
       };
     };
-    "junk-3.1.0" = {
-      name = "junk";
-      packageName = "junk";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/junk/-/junk-3.1.0.tgz";
-        sha512 = "pBxcB3LFc8QVgdggvZWyeys+hnrNWg4OcZIU/1X59k5jQdLBlCsYGRQaz234SqoRLTCgMH00fY0xRJH+F9METQ==";
-      };
-    };
     "junk-4.0.1" = {
       name = "junk";
       packageName = "junk";
@@ -17997,15 +17509,6 @@ let
         sha512 = "04PDPqSlsqIOaaaGZ+41vq5FejI9auqTInicFRndCBgE3bXG8D6W1I+mWhk+1nqbHmyhla/6BUrd5OSiHwKRXw==";
       };
     };
-    "listr2-7.0.2" = {
-      name = "listr2";
-      packageName = "listr2";
-      version = "7.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/listr2/-/listr2-7.0.2.tgz";
-        sha512 = "rJysbR9GKIalhTbVL2tYbF2hVyDnrf7pFUZBwjPaMIdadYHmeT+EVi/Bu3qd7ETQPahTotg2WRCatXwRBW554g==";
-      };
-    };
     "listr2-8.2.5" = {
       name = "listr2";
       packageName = "listr2";
@@ -18033,15 +17536,6 @@ let
         sha512 = "cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A==";
       };
     };
-    "load-json-file-2.0.0" = {
-      name = "load-json-file";
-      packageName = "load-json-file";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz";
-        sha512 = "3p6ZOGNbiX4CdvEd1VcE6yi78UrGNpjHO33noGwHCnT/o2fyllJDepsm8+mFFv/DvtwFHht5HIHSyOy5a+ChVQ==";
-      };
-    };
     "load-json-file-6.2.0" = {
       name = "load-json-file";
       packageName = "load-json-file";
@@ -18096,15 +17590,6 @@ let
         sha512 = "SW13ws7BjaeJ6p7Q6CO2nchbYEc3X3J6WrmTTDto7yMPqVSZTUyY5Tjbid+Ab8gLnATtygYtiDIJGQRRn2ZOiA==";
       };
     };
-    "locate-path-2.0.0" = {
-      name = "locate-path";
-      packageName = "locate-path";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz";
-        sha512 = "NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA==";
-      };
-    };
     "locate-path-3.0.0" = {
       name = "locate-path";
       packageName = "locate-path";
@@ -18366,15 +17851,6 @@ let
         sha512 = "C5N2Z3DgnnKr0LOpv/hKCgKdb7ZZwafIrsesve6lmzvZIRZRGaZ/l6Q8+2W7NaT+ZwO3fFlSCzCzrDCFdJfZ4g==";
       };
     };
-    "lodash.get-4.4.2" = {
-      name = "lodash.get";
-      packageName = "lodash.get";
-      version = "4.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.get/-/lodash.get-4.4.2.tgz";
-        sha512 = "z+Uw/vLuy6gQe8cfaFWD7p0wVv8fJl3mbzXh33RS+0oW2wvUqiRXiQ69gLWSLpgB5/6sU+r6BlQR0MBILadqTQ==";
-      };
-    };
     "lodash.groupby-4.6.0" = {
       name = "lodash.groupby";
       packageName = "lodash.groupby";
@@ -19105,15 +18581,6 @@ let
         sha512 = "s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==";
       };
     };
-    "make-fetch-happen-10.2.1" = {
-      name = "make-fetch-happen";
-      packageName = "make-fetch-happen";
-      version = "10.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-10.2.1.tgz";
-        sha512 = "NgOPbRiaQM10DYXvN3/hhGVI2M5MtITFryzBGxHM5p4wnFxsVCbxkrBrDsk+EZ5OB4jEOT7AjDxtdF+KVEFT7w==";
-      };
-    };
     "make-fetch-happen-14.0.3" = {
       name = "make-fetch-happen";
       packageName = "make-fetch-happen";
@@ -19636,15 +19103,6 @@ let
         sha512 = "fPcI4r2yH02UUgMo308CVzIuXUaRUrBzMvjXX8J4XfcHgX9Y73iB0/VLp+S3TnxnTgIGrQ3BFb7kWGR7kkyS8g==";
       };
     };
-    "mem-4.3.0" = {
-      name = "mem";
-      packageName = "mem";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mem/-/mem-4.3.0.tgz";
-        sha512 = "qX2bG48pTqYRVmDB37rn/6PT7LcR8T7oAX3bf99u1Tt1nzxYfxkgqDwUwolPlXweM0XzBOBFzSx4kfp7KP1s/w==";
-      };
-    };
     "mem-8.1.1" = {
       name = "mem";
       packageName = "mem";
@@ -20635,15 +20093,6 @@ let
         sha512 = "qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==";
       };
     };
-    "minipass-collect-1.0.2" = {
-      name = "minipass-collect";
-      packageName = "minipass-collect";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz";
-        sha512 = "6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==";
-      };
-    };
     "minipass-collect-2.0.1" = {
       name = "minipass-collect";
       packageName = "minipass-collect";
@@ -20653,15 +20102,6 @@ let
         sha512 = "D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==";
       };
     };
-    "minipass-fetch-2.1.2" = {
-      name = "minipass-fetch";
-      packageName = "minipass-fetch";
-      version = "2.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-2.1.2.tgz";
-        sha512 = "LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==";
-      };
-    };
     "minipass-fetch-4.0.1" = {
       name = "minipass-fetch";
       packageName = "minipass-fetch";
@@ -21374,15 +20814,6 @@ let
         sha512 = "73sE9+3UaLYYFmDsFZnqCInzPyh3MqIwZO9cw58yIqAZhONrrabrYyYe3TuIqtIiOuTXVhsGau8hcrhhwSsDIQ==";
       };
     };
-    "node-api-version-0.2.0" = {
-      name = "node-api-version";
-      packageName = "node-api-version";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-api-version/-/node-api-version-0.2.0.tgz";
-        sha512 = "fthTTsi8CxaBXMaBAD7ST2uylwvsnYxh2PfaScwpMhos6KlSFajXQPcM4ogNE1q2s3Lbz9GCGqeIHC+C6OZnKg==";
-      };
-    };
     "node-color-readline-1.0.1" = {
       name = "node-color-readline";
       packageName = "node-color-readline";
@@ -21563,15 +20994,6 @@ let
         sha512 = "Tbj67rffqceeLpcRXrT7vKAN8CwfPeIBgM7E6iBkmKLV7bEMwpGgYLGv0jACUsECaa/vuxP0IjEont6umdMgtQ==";
       };
     };
-    "nopt-6.0.0" = {
-      name = "nopt";
-      packageName = "nopt";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nopt/-/nopt-6.0.0.tgz";
-        sha512 = "ZwLpbTgdhuZUnZzjd7nb1ZV+4DoiC6/sfiVKok72ym/4Tlf+DFdlHYmT2JPmcNNWV6Pi3SDf1kT+A4r9RTuT9g==";
-      };
-    };
     "nopt-7.2.1" = {
       name = "nopt";
       packageName = "nopt";
@@ -21662,15 +21084,6 @@ let
         sha512 = "K1c7+vaAP+Yh5bOGmA10PGPpp+6h7WZrl7GwqKhUflBc9flU9pzG27DDeB9+iuhZkE3BJZOcgN1P/2sS5pqrWw==";
       };
     };
-    "normalize-url-6.1.0" = {
-      name = "normalize-url";
-      packageName = "normalize-url";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz";
-        sha512 = "DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==";
-      };
-    };
     "normalize-url-8.0.1" = {
       name = "normalize-url";
       packageName = "normalize-url";
@@ -22535,15 +21948,6 @@ let
         sha512 = "s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==";
       };
     };
-    "p-cancelable-2.1.1" = {
-      name = "p-cancelable";
-      packageName = "p-cancelable";
-      version = "2.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.1.1.tgz";
-        sha512 = "BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==";
-      };
-    };
     "p-cancelable-3.0.0" = {
       name = "p-cancelable";
       packageName = "p-cancelable";
@@ -22589,24 +21993,6 @@ let
         sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==";
       };
     };
-    "p-is-promise-2.1.0" = {
-      name = "p-is-promise";
-      packageName = "p-is-promise";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-is-promise/-/p-is-promise-2.1.0.tgz";
-        sha512 = "Y3W0wlRPK8ZMRbNq97l4M5otioeA5lm1z7bkNkxCka8HSPjR0xRWmpCmc9utiaLP9Jb1eD8BgeIxTW4AIF45Pg==";
-      };
-    };
-    "p-limit-1.3.0" = {
-      name = "p-limit";
-      packageName = "p-limit";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz";
-        sha512 = "vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==";
-      };
-    };
     "p-limit-2.3.0" = {
       name = "p-limit";
       packageName = "p-limit";
@@ -22634,15 +22020,6 @@ let
         sha512 = "5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==";
       };
     };
-    "p-locate-2.0.0" = {
-      name = "p-locate";
-      packageName = "p-locate";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz";
-        sha512 = "nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg==";
-      };
-    };
     "p-locate-3.0.0" = {
       name = "p-locate";
       packageName = "p-locate";
@@ -22688,15 +22065,6 @@ let
         sha512 = "y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==";
       };
     };
-    "p-map-4.0.0" = {
-      name = "p-map";
-      packageName = "p-map";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz";
-        sha512 = "/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==";
-      };
-    };
     "p-map-5.5.0" = {
       name = "p-map";
       packageName = "p-map";
@@ -22769,15 +22137,6 @@ let
         sha512 = "MyIV3ZA/PmyBN/ud8vV9XzwTrNtR4jFrObymZYnZqMmW0zA8Z17vnT0rBgFE/TlohB+YCHqXMgZzb3Csp49vqg==";
       };
     };
-    "p-try-1.0.0" = {
-      name = "p-try";
-      packageName = "p-try";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz";
-        sha512 = "U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww==";
-      };
-    };
     "p-try-2.2.0" = {
       name = "p-try";
       packageName = "p-try";
@@ -22895,15 +22254,6 @@ let
         sha512 = "CTM5kuWR3sx9IFamcl5ErfPl6ea/N8IYwiJ+vpeB2g+1iknv7zBl5uPwbMbRVznRVbrNY6lGuDoE5b30grmbqg==";
       };
     };
-    "parse-author-2.0.0" = {
-      name = "parse-author";
-      packageName = "parse-author";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse-author/-/parse-author-2.0.0.tgz";
-        sha512 = "yx5DfvkN8JsHL2xk2Os9oTia467qnvRgey4ahSm2X8epehBLx/gWLcy5KI+Y36ful5DzGbCS6RazqZGgy1gHNw==";
-      };
-    };
     "parse-bmfont-ascii-1.0.6" = {
       name = "parse-bmfont-ascii";
       packageName = "parse-bmfont-ascii";
@@ -23426,15 +22776,6 @@ let
         sha512 = "S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg==";
       };
     };
-    "path-type-2.0.0" = {
-      name = "path-type";
-      packageName = "path-type";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz";
-        sha512 = "dUnb5dXUf+kzhC/W/F4e5/SkluXIFf5VUHolW1Eg1irn1hGWjPGdsRcvYJ1nD6lhk8Ir7VM0bHJKsYTx8Jx9OQ==";
-      };
-    };
     "path-type-4.0.0" = {
       name = "path-type";
       packageName = "path-type";
@@ -23471,15 +22812,6 @@ let
         sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA==";
       };
     };
-    "pe-library-1.0.1" = {
-      name = "pe-library";
-      packageName = "pe-library";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pe-library/-/pe-library-1.0.1.tgz";
-        sha512 = "nh39Mo1eGWmZS7y+mK/dQIqg7S1lp38DpRxkyoHf0ZcUs/HDc+yyTjuOtTvSMZHmfSLuSQaX945u05Y2Q6UWZg==";
-      };
-    };
     "peek-readable-4.1.0" = {
       name = "peek-readable";
       packageName = "peek-readable";
@@ -23867,15 +23199,6 @@ let
         sha512 = "IQ7TZdoaqbT+LCpShg46jnZVlhWD2w6iQYAcYXfHARZ7X1t/UGhhceQDs5X0cGqKvYlHNOuv7Oa1xmb0oQuA3w==";
       };
     };
-    "postject-1.0.0-alpha.6" = {
-      name = "postject";
-      packageName = "postject";
-      version = "1.0.0-alpha.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/postject/-/postject-1.0.0-alpha.6.tgz";
-        sha512 = "b9Eb8h2eVqNE8edvKdwqkrY6O7kAwmI8kcnBv1NScolYJbo59XUF0noFq+lxbC1yN20bmC0WBEbDC5H/7ASb0A==";
-      };
-    };
     "precond-0.2.3" = {
       name = "precond";
       packageName = "precond";
@@ -24002,15 +23325,6 @@ let
         sha512 = "XHV6WP6xUvy42gUxdNyPQKCC9j36VzpVQ8Ztoffq0D6+PugiNsZ0FqBladXXPFQWthDDCA9OvGIsjEigMtznOQ==";
       };
     };
-    "proc-log-2.0.1" = {
-      name = "proc-log";
-      packageName = "proc-log";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/proc-log/-/proc-log-2.0.1.tgz";
-        sha512 = "Kcmo2FhfDTXdcbfDH76N7uBYHINxc/8GW7UAVuVP9I+Va3uHSerrnKV6dLooga/gh7GlgzuCCr/eoldnL1muGw==";
-      };
-    };
     "proc-log-3.0.0" = {
       name = "proc-log";
       packageName = "proc-log";
@@ -24101,15 +23415,6 @@ let
         sha512 = "rZPNPKTOYVNEEKFaq1HqTgOwZD+4/YHS5ukLzQCypkj+OkYx7iv0mA91lJlpPPZ8vMau3IIGj5Qlwrx+8iiSmg==";
       };
     };
-    "promise-inflight-1.0.1" = {
-      name = "promise-inflight";
-      packageName = "promise-inflight";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz";
-        sha512 = "6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==";
-      };
-    };
     "promise-retry-2.0.1" = {
       name = "promise-retry";
       packageName = "promise-retry";
@@ -24695,15 +24000,6 @@ let
         sha512 = "rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ==";
       };
     };
-    "read-binary-file-arch-1.0.6" = {
-      name = "read-binary-file-arch";
-      packageName = "read-binary-file-arch";
-      version = "1.0.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-binary-file-arch/-/read-binary-file-arch-1.0.6.tgz";
-        sha512 = "BNg9EN3DD3GsDXX7Aa8O4p92sryjkmzYYgmgTAc6CA4uGLEDzFfxOxugu21akOxpcXHiEgsYkC6nPsQvLLLmEg==";
-      };
-    };
     "read-cache-1.0.0" = {
       name = "read-cache";
       packageName = "read-cache";
@@ -24767,15 +24063,6 @@ let
         sha512 = "7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ==";
       };
     };
-    "read-pkg-2.0.0" = {
-      name = "read-pkg";
-      packageName = "read-pkg";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz";
-        sha512 = "eFIBOPW7FGjzBuk3hdXEuNSiTZS/xEMlH49HxMyzb0hyPfu4EhVjT2DH32K1hSSmVq4sebAWnZuuY5auISUTGA==";
-      };
-    };
     "read-pkg-5.2.0" = {
       name = "read-pkg";
       packageName = "read-pkg";
@@ -24821,15 +24108,6 @@ let
         sha512 = "WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A==";
       };
     };
-    "read-pkg-up-2.0.0" = {
-      name = "read-pkg-up";
-      packageName = "read-pkg-up";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz";
-        sha512 = "1orxQfbWGUiTn9XsPlChs6rLie/AV9jwZTGmu2NZw/CUDJQchXJFYE0Fq5j7+n558T1JhDWLdhyd1Zj+wLY//w==";
-      };
-    };
     "read-pkg-up-7.0.1" = {
       name = "read-pkg-up";
       packageName = "read-pkg-up";
@@ -25937,15 +25215,6 @@ let
         sha512 = "JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==";
       };
     };
-    "resedit-2.0.3" = {
-      name = "resedit";
-      packageName = "resedit";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resedit/-/resedit-2.0.3.tgz";
-        sha512 = "oTeemxwoMuxxTYxXUwjkrOPfngTQehlv0/HoYFNkB4uzsP1Un1A9nI8JQKGOFkxpqkC7qkMs0lUsGrvUlbLNUA==";
-      };
-    };
     "reserved-words-0.1.2" = {
       name = "reserved-words";
       packageName = "reserved-words";
@@ -26063,15 +25332,6 @@ let
         sha512 = "/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ==";
       };
     };
-    "responselike-2.0.1" = {
-      name = "responselike";
-      packageName = "responselike";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/responselike/-/responselike-2.0.1.tgz";
-        sha512 = "4gl03wn3hj1HP3yzgdI7d3lCkF95F21Pz4BPGvKHinyQzALR5CapwC8yIi0Rh58DEMQ/SguC03wFj2k0M/mHhw==";
-      };
-    };
     "responselike-3.0.0" = {
       name = "responselike";
       packageName = "responselike";
@@ -27530,15 +26790,6 @@ let
         sha512 = "D3YaD0aRxR3mEcqnidIs7ReYJFVzWdd6fXJYUM8ixcQcJRGTka/b3saV0KflYhyVJXKhb947GndU35SxYNResQ==";
       };
     };
-    "socks-proxy-agent-7.0.0" = {
-      name = "socks-proxy-agent";
-      packageName = "socks-proxy-agent";
-      version = "7.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-7.0.0.tgz";
-        sha512 = "Fgl0YPZ902wEsAyiQ+idGd1A7rSFx/ayC1CQVMw5P+EQx2V0SgpGtf6OKFhVjPflPUl9YMmEOnmfjCdMUsygww==";
-      };
-    };
     "socks-proxy-agent-8.0.5" = {
       name = "socks-proxy-agent";
       packageName = "socks-proxy-agent";
@@ -27647,15 +26898,6 @@ let
         sha512 = "Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==";
       };
     };
-    "source-map-support-0.5.21" = {
-      name = "source-map-support";
-      packageName = "source-map-support";
-      version = "0.5.21";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz";
-        sha512 = "uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==";
-      };
-    };
     "source-map-url-0.4.1" = {
       name = "source-map-url";
       packageName = "source-map-url";
@@ -27944,15 +27186,6 @@ let
         sha512 = "97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==";
       };
     };
-    "ssri-9.0.1" = {
-      name = "ssri";
-      packageName = "ssri";
-      version = "9.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ssri/-/ssri-9.0.1.tgz";
-        sha512 = "o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==";
-      };
-    };
     "stack-trace-0.0.10" = {
       name = "stack-trace";
       packageName = "stack-trace";
@@ -28601,24 +27834,6 @@ let
         sha512 = "RIrIdRY0X1xojthNcVtgT9sjpOGagEUKpZdgBUi054OEPFo282yg+zE+t1Rj3+RqKq2xStL7uUHhY+AjbC4BXg==";
       };
     };
-    "sudo-prompt-9.2.1" = {
-      name = "sudo-prompt";
-      packageName = "sudo-prompt";
-      version = "9.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sudo-prompt/-/sudo-prompt-9.2.1.tgz";
-        sha512 = "Mu7R0g4ig9TUuGSxJavny5Rv0egCEtpZRNMrZaYS1vxkiIxGiGUwoezU3LazIQ+KE04hTrTfNPgxU5gzi7F5Pw==";
-      };
-    };
-    "sumchecker-3.0.1" = {
-      name = "sumchecker";
-      packageName = "sumchecker";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sumchecker/-/sumchecker-3.0.1.tgz";
-        sha512 = "MvjXzkz/BOfyVDkG0oFOtBxHX2u3gKbMHIF/dXblZsgD3BWOFLmHovIpZY7BykJdAjcqRCBi1WYBNdEC9yI7vg==";
-      };
-    };
     "superagent-7.1.6" = {
       name = "superagent";
       packageName = "superagent";
@@ -30140,15 +29355,6 @@ let
         sha512 = "Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA==";
       };
     };
-    "unique-filename-2.0.1" = {
-      name = "unique-filename";
-      packageName = "unique-filename";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unique-filename/-/unique-filename-2.0.1.tgz";
-        sha512 = "ODWHtkkdx3IAR+veKxFV+VBkUMcN+FaqzUUd7IZzt+0zhDZFPFxhlqwPF3YQvMHx1TD0tdgYl+kuPnJ8E6ql7A==";
-      };
-    };
     "unique-filename-4.0.0" = {
       name = "unique-filename";
       packageName = "unique-filename";
@@ -30158,15 +29364,6 @@ let
         sha512 = "XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ==";
       };
     };
-    "unique-slug-3.0.0" = {
-      name = "unique-slug";
-      packageName = "unique-slug";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/unique-slug/-/unique-slug-3.0.0.tgz";
-        sha512 = "8EyMynh679x/0gqE9fT9oilG+qEt+ibFyqjuVTsZn1+CMxH+XLlpvr2UZx4nVcCwTpx81nICr2JQFkM+HPLq4w==";
-      };
-    };
     "unique-slug-5.0.0" = {
       name = "unique-slug";
       packageName = "unique-slug";
@@ -30743,15 +29940,6 @@ let
         sha512 = "KMWqdlOcjCYdtIJpicDSFBQ8nFwS2i9sslAd6f4+CBGcU4gist2REnr2fxj2YocvJFxSF3ZOHLYLVZnUxv4BZQ==";
       };
     };
-    "username-5.1.0" = {
-      name = "username";
-      packageName = "username";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/username/-/username-5.1.0.tgz";
-        sha512 = "PCKbdWw85JsYMvmCv5GH3kXmM66rCd9m1hBEDutPNv94b/pqCMT4NtcKyeWYvLFiE8b+ha1Jdl8XAaUdPn5QTg==";
-      };
-    };
     "utf-8-validate-5.0.10" = {
       name = "utf-8-validate";
       packageName = "utf-8-validate";
@@ -37590,508 +36778,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  "@electron-forge/cli" = nodeEnv.buildNodePackage {
-    name = "_at_electron-forge_slash_cli";
-    packageName = "@electron-forge/cli";
-    version = "7.7.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/@electron-forge/cli/-/cli-7.7.0.tgz";
-      sha512 = "QfnjghmlHMb7dyArR5cbPA+MP9ff/ulWZi6R/a5MkHlKyhrysRfjzDtZDsmkEv9mGQgRwylssgXrZrKHGlxFkw==";
-    };
-    dependencies = [
-      sources."@electron-forge/core-7.7.0"
-      sources."@electron-forge/core-utils-7.7.0"
-      sources."@electron-forge/maker-base-7.7.0"
-      sources."@electron-forge/plugin-base-7.7.0"
-      sources."@electron-forge/publisher-base-7.7.0"
-      sources."@electron-forge/shared-types-7.7.0"
-      sources."@electron-forge/template-base-7.7.0"
-      sources."@electron-forge/template-vite-7.7.0"
-      sources."@electron-forge/template-vite-typescript-7.7.0"
-      sources."@electron-forge/template-webpack-7.7.0"
-      sources."@electron-forge/template-webpack-typescript-7.7.0"
-      sources."@electron-forge/tracer-7.7.0"
-      (
-        sources."@electron/asar-3.3.1"
-        // {
-          dependencies = [
-            sources."commander-5.1.0"
-          ];
-        }
-      )
-      (
-        sources."@electron/get-3.1.0"
-        // {
-          dependencies = [
-            sources."fs-extra-8.1.0"
-            sources."jsonfile-4.0.0"
-            sources."semver-6.3.1"
-            sources."universalify-0.1.2"
-          ];
-        }
-      )
-      (
-        sources."@electron/node-gyp-git+https://github.com/electron/node-gyp.git#06b29aafb7708acef8b3669835c8a7857ebc92d2"
-        // {
-          dependencies = [
-            sources."brace-expansion-2.0.1"
-            sources."glob-8.1.0"
-            sources."minimatch-5.1.6"
-          ];
-        }
-      )
-      (
-        sources."@electron/notarize-2.5.0"
-        // {
-          dependencies = [
-            sources."fs-extra-9.1.0"
-          ];
-        }
-      )
-      sources."@electron/osx-sign-1.3.3"
-      (
-        sources."@electron/packager-18.3.6"
-        // {
-          dependencies = [
-            sources."fs-extra-11.3.0"
-          ];
-        }
-      )
-      sources."@electron/rebuild-3.7.1"
-      (
-        sources."@electron/universal-2.0.2"
-        // {
-          dependencies = [
-            sources."brace-expansion-2.0.1"
-            sources."fs-extra-11.3.0"
-            sources."minimatch-9.0.5"
-          ];
-        }
-      )
-      (
-        sources."@electron/windows-sign-1.2.1"
-        // {
-          dependencies = [
-            sources."fs-extra-11.3.0"
-          ];
-        }
-      )
-      sources."@gar/promisify-1.1.3"
-      sources."@malept/cross-spawn-promise-2.0.0"
-      sources."@nodelib/fs.scandir-2.1.5"
-      sources."@nodelib/fs.stat-2.0.5"
-      sources."@nodelib/fs.walk-1.2.8"
-      sources."@npmcli/fs-2.1.2"
-      sources."@npmcli/move-file-2.0.1"
-      sources."@sindresorhus/is-4.6.0"
-      sources."@szmarczak/http-timer-4.0.6"
-      sources."@tootallnate/once-2.0.0"
-      sources."@types/cacheable-request-6.0.3"
-      sources."@types/http-cache-semantics-4.0.4"
-      sources."@types/keyv-3.1.4"
-      sources."@types/node-22.13.10"
-      sources."@types/responselike-1.0.3"
-      sources."@types/yauzl-2.10.3"
-      sources."@xmldom/xmldom-0.8.10"
-      sources."abbrev-1.1.1"
-      sources."agent-base-6.0.2"
-      sources."agentkeepalive-4.6.0"
-      sources."aggregate-error-3.1.0"
-      sources."ansi-escapes-5.0.0"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."at-least-node-1.0.0"
-      sources."author-regex-1.0.0"
-      sources."balanced-match-1.0.2"
-      sources."base64-js-1.5.1"
-      sources."bl-4.1.0"
-      sources."bluebird-3.7.2"
-      sources."brace-expansion-1.1.11"
-      sources."braces-3.0.3"
-      sources."buffer-5.7.1"
-      sources."buffer-crc32-0.2.13"
-      sources."buffer-from-1.1.2"
-      (
-        sources."cacache-16.1.3"
-        // {
-          dependencies = [
-            sources."brace-expansion-2.0.1"
-            sources."glob-8.1.0"
-            sources."minimatch-5.1.6"
-          ];
-        }
-      )
-      sources."cacheable-lookup-5.0.4"
-      sources."cacheable-request-7.0.4"
-      sources."chalk-4.1.2"
-      sources."chownr-2.0.0"
-      sources."chrome-trace-event-1.0.4"
-      sources."clean-stack-2.2.0"
-      sources."cli-cursor-3.1.0"
-      sources."cli-spinners-2.9.2"
-      (
-        sources."cli-truncate-3.1.0"
-        // {
-          dependencies = [
-            sources."ansi-regex-6.1.0"
-            sources."emoji-regex-9.2.2"
-            sources."string-width-5.1.2"
-            sources."strip-ansi-7.1.0"
-          ];
-        }
-      )
-      sources."cliui-8.0.1"
-      sources."clone-1.0.4"
-      sources."clone-response-1.0.3"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."colorette-2.0.20"
-      sources."commander-11.1.0"
-      sources."compare-version-0.1.2"
-      sources."concat-map-0.0.1"
-      sources."cross-dirname-0.1.0"
-      sources."cross-spawn-7.0.6"
-      (
-        sources."debug-4.4.0"
-        // {
-          dependencies = [
-            sources."ms-2.1.3"
-          ];
-        }
-      )
-      (
-        sources."decompress-response-6.0.0"
-        // {
-          dependencies = [
-            sources."mimic-response-3.1.0"
-          ];
-        }
-      )
-      sources."defaults-1.0.4"
-      sources."defer-to-connect-2.0.1"
-      sources."detect-libc-2.0.3"
-      sources."dir-compare-4.2.0"
-      sources."eastasianwidth-0.2.0"
-      sources."emoji-regex-8.0.0"
-      sources."encoding-0.1.13"
-      sources."end-of-stream-1.4.4"
-      sources."env-paths-2.2.1"
-      sources."err-code-2.0.3"
-      sources."error-ex-1.3.2"
-      sources."escalade-3.2.0"
-      sources."escape-string-regexp-1.0.5"
-      sources."eventemitter3-5.0.1"
-      (
-        sources."execa-1.0.0"
-        // {
-          dependencies = [
-            sources."cross-spawn-6.0.6"
-            sources."get-stream-4.1.0"
-            sources."path-key-2.0.1"
-            sources."semver-5.7.2"
-            sources."shebang-command-1.2.0"
-            sources."shebang-regex-1.0.0"
-            sources."which-1.3.1"
-          ];
-        }
-      )
-      sources."exponential-backoff-3.1.2"
-      sources."extract-zip-2.0.1"
-      sources."fast-glob-3.3.3"
-      sources."fastq-1.19.1"
-      sources."fd-slicer-1.1.0"
-      sources."filename-reserved-regex-2.0.0"
-      sources."filenamify-4.3.0"
-      sources."fill-range-7.1.1"
-      (
-        sources."find-up-5.0.0"
-        // {
-          dependencies = [
-            sources."locate-path-6.0.0"
-            sources."p-locate-5.0.0"
-            sources."path-exists-4.0.0"
-          ];
-        }
-      )
-      sources."flora-colossus-2.0.0"
-      sources."fs-extra-10.1.0"
-      sources."fs-minipass-2.1.0"
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.2"
-      sources."galactus-1.0.0"
-      sources."get-caller-file-2.0.5"
-      (
-        sources."get-package-info-1.0.0"
-        // {
-          dependencies = [
-            sources."debug-2.6.9"
-          ];
-        }
-      )
-      sources."get-stream-5.2.0"
-      sources."glob-7.2.3"
-      sources."glob-parent-5.1.2"
-      sources."global-dirs-3.0.1"
-      sources."got-11.8.6"
-      sources."graceful-fs-4.2.11"
-      sources."has-flag-4.0.0"
-      sources."hasown-2.0.2"
-      sources."hosted-git-info-2.8.9"
-      sources."http-cache-semantics-4.1.1"
-      sources."http-proxy-agent-5.0.0"
-      sources."http2-wrapper-1.0.3"
-      sources."https-proxy-agent-5.0.1"
-      sources."humanize-ms-1.2.1"
-      sources."iconv-lite-0.6.3"
-      sources."ieee754-1.2.1"
-      sources."imurmurhash-0.1.4"
-      sources."indent-string-4.0.0"
-      sources."infer-owner-1.0.4"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."ini-2.0.0"
-      sources."interpret-3.1.1"
-      sources."ip-address-9.0.5"
-      sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.16.1"
-      sources."is-extglob-2.1.1"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-glob-4.0.3"
-      sources."is-interactive-1.0.0"
-      sources."is-lambda-1.0.1"
-      sources."is-number-7.0.0"
-      sources."is-stream-1.1.0"
-      sources."is-unicode-supported-0.1.0"
-      sources."isbinaryfile-4.0.10"
-      sources."isexe-2.0.0"
-      sources."jsbn-1.1.0"
-      sources."json-buffer-3.0.1"
-      sources."jsonfile-6.1.0"
-      sources."junk-3.1.0"
-      sources."keyv-4.5.4"
-      (
-        sources."listr2-7.0.2"
-        // {
-          dependencies = [
-            sources."ansi-regex-6.1.0"
-            sources."ansi-styles-6.2.1"
-            sources."emoji-regex-9.2.2"
-            sources."string-width-5.1.2"
-            sources."strip-ansi-7.1.0"
-            sources."wrap-ansi-8.1.0"
-          ];
-        }
-      )
-      sources."load-json-file-2.0.0"
-      sources."locate-path-2.0.0"
-      sources."lodash-4.17.21"
-      sources."lodash.get-4.4.2"
-      sources."log-symbols-4.1.0"
-      (
-        sources."log-update-5.0.1"
-        // {
-          dependencies = [
-            sources."ansi-regex-6.1.0"
-            sources."ansi-styles-6.2.1"
-            sources."cli-cursor-4.0.0"
-            sources."emoji-regex-9.2.2"
-            sources."restore-cursor-4.0.0"
-            sources."string-width-5.1.2"
-            sources."strip-ansi-7.1.0"
-            sources."wrap-ansi-8.1.0"
-          ];
-        }
-      )
-      sources."lowercase-keys-2.0.0"
-      sources."lru-cache-7.18.3"
-      sources."make-fetch-happen-10.2.1"
-      sources."map-age-cleaner-0.1.3"
-      sources."mem-4.3.0"
-      sources."merge2-1.4.1"
-      sources."micromatch-4.0.8"
-      sources."mimic-fn-2.1.0"
-      sources."mimic-response-1.0.1"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."minipass-3.3.6"
-      sources."minipass-collect-1.0.2"
-      sources."minipass-fetch-2.1.2"
-      sources."minipass-flush-1.0.5"
-      sources."minipass-pipeline-1.2.4"
-      sources."minipass-sized-1.0.3"
-      sources."minizlib-2.1.2"
-      sources."mkdirp-1.0.4"
-      sources."ms-2.0.0"
-      sources."negotiator-0.6.4"
-      sources."nice-try-1.0.5"
-      sources."node-abi-3.74.0"
-      sources."node-api-version-0.2.0"
-      sources."node-fetch-2.7.0"
-      sources."nopt-6.0.0"
-      (
-        sources."normalize-package-data-2.5.0"
-        // {
-          dependencies = [
-            sources."semver-5.7.2"
-          ];
-        }
-      )
-      sources."normalize-url-6.1.0"
-      (
-        sources."npm-run-path-2.0.2"
-        // {
-          dependencies = [
-            sources."path-key-2.0.1"
-          ];
-        }
-      )
-      sources."once-1.4.0"
-      sources."onetime-5.1.2"
-      sources."ora-5.4.1"
-      sources."p-cancelable-2.1.1"
-      sources."p-defer-1.0.0"
-      sources."p-finally-1.0.0"
-      sources."p-is-promise-2.1.0"
-      sources."p-limit-3.1.0"
-      (
-        sources."p-locate-2.0.0"
-        // {
-          dependencies = [
-            sources."p-limit-1.3.0"
-          ];
-        }
-      )
-      sources."p-map-4.0.0"
-      sources."p-try-1.0.0"
-      sources."parse-author-2.0.0"
-      sources."parse-json-2.2.0"
-      sources."path-exists-3.0.0"
-      sources."path-is-absolute-1.0.1"
-      sources."path-key-3.1.1"
-      sources."path-parse-1.0.7"
-      sources."path-type-2.0.0"
-      sources."pe-library-1.0.1"
-      sources."pend-1.2.0"
-      sources."picomatch-2.3.1"
-      sources."pify-2.3.0"
-      sources."plist-3.1.0"
-      (
-        sources."postject-1.0.0-alpha.6"
-        // {
-          dependencies = [
-            sources."commander-9.5.0"
-          ];
-        }
-      )
-      sources."proc-log-2.0.1"
-      sources."progress-2.0.3"
-      sources."promise-inflight-1.0.1"
-      sources."promise-retry-2.0.1"
-      sources."pump-3.0.2"
-      sources."queue-microtask-1.2.3"
-      sources."quick-lru-5.1.1"
-      sources."read-binary-file-arch-1.0.6"
-      sources."read-pkg-2.0.0"
-      (
-        sources."read-pkg-up-2.0.0"
-        // {
-          dependencies = [
-            sources."find-up-2.1.0"
-          ];
-        }
-      )
-      sources."readable-stream-3.6.2"
-      sources."rechoir-0.8.0"
-      sources."require-directory-2.1.1"
-      sources."resedit-2.0.3"
-      sources."resolve-1.22.10"
-      sources."resolve-alpn-1.2.1"
-      sources."responselike-2.0.1"
-      sources."restore-cursor-3.1.0"
-      sources."retry-0.12.0"
-      sources."reusify-1.1.0"
-      sources."rfdc-1.4.1"
-      sources."rimraf-3.0.2"
-      sources."run-parallel-1.2.0"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."semver-7.7.1"
-      sources."shebang-command-2.0.0"
-      sources."shebang-regex-3.0.0"
-      sources."signal-exit-3.0.7"
-      (
-        sources."slice-ansi-5.0.0"
-        // {
-          dependencies = [
-            sources."ansi-styles-6.2.1"
-            sources."is-fullwidth-code-point-4.0.0"
-          ];
-        }
-      )
-      sources."smart-buffer-4.2.0"
-      sources."socks-2.8.4"
-      sources."socks-proxy-agent-7.0.0"
-      sources."source-map-0.6.1"
-      sources."source-map-support-0.5.21"
-      sources."spdx-correct-3.2.0"
-      sources."spdx-exceptions-2.5.0"
-      sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.21"
-      sources."sprintf-js-1.1.3"
-      sources."ssri-9.0.1"
-      sources."string-width-4.2.3"
-      sources."string_decoder-1.3.0"
-      sources."strip-ansi-6.0.1"
-      sources."strip-bom-3.0.0"
-      sources."strip-eof-1.0.0"
-      sources."strip-outer-1.0.1"
-      sources."sudo-prompt-9.2.1"
-      sources."sumchecker-3.0.1"
-      sources."supports-color-7.2.0"
-      sources."supports-preserve-symlinks-flag-1.0.0"
-      (
-        sources."tar-6.2.1"
-        // {
-          dependencies = [
-            sources."minipass-5.0.0"
-          ];
-        }
-      )
-      sources."to-regex-range-5.0.1"
-      sources."tr46-0.0.3"
-      sources."trim-repeated-1.0.0"
-      sources."type-fest-1.4.0"
-      sources."undici-types-6.20.0"
-      sources."unique-filename-2.0.1"
-      sources."unique-slug-3.0.0"
-      sources."universalify-2.0.1"
-      sources."username-5.1.0"
-      sources."util-deprecate-1.0.2"
-      sources."validate-npm-package-license-3.0.4"
-      sources."wcwidth-1.0.1"
-      sources."webidl-conversions-3.0.1"
-      sources."whatwg-url-5.0.0"
-      sources."which-2.0.2"
-      sources."wrap-ansi-7.0.0"
-      sources."wrappy-1.0.2"
-      sources."xmlbuilder-15.1.1"
-      sources."y18n-5.0.8"
-      sources."yallist-4.0.0"
-      sources."yargs-17.7.2"
-      sources."yargs-parser-21.1.1"
-      sources."yauzl-2.10.0"
-      sources."yocto-queue-0.1.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A complete tool for building modern Electron applications";
-      homepage = "https://github.com/electron/forge#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   elm-oracle = nodeEnv.buildNodePackage {
     name = "elm-oracle";
     packageName = "elm-oracle";
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index 0d6ae3a46b2d..501cf9c62b88 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -33,10 +33,6 @@ final: prev: {
     '';
   };
 
-  "@electron-forge/cli" = prev."@electron-forge/cli".override {
-    buildInputs = [ final.node-gyp-build ];
-  };
-
   fast-cli = prev.fast-cli.override {
     nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
     prePatch = ''

From 204d88bd0426ced49d567c9e7f0b04d1170343bb Mon Sep 17 00:00:00 2001
From: Sam Willcocks <sam@wlcx.cc>
Date: Thu, 6 Nov 2025 22:11:50 +0000
Subject: [PATCH 6018/6226] surfer: 0.3.0 -> 0.4.0

---
 pkgs/by-name/su/surfer/package.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/su/surfer/package.nix b/pkgs/by-name/su/surfer/package.nix
index 67e0a382bd4c..dc598907aa79 100644
--- a/pkgs/by-name/su/surfer/package.nix
+++ b/pkgs/by-name/su/surfer/package.nix
@@ -15,15 +15,15 @@
   makeWrapper,
   zenity,
 }:
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "surfer";
-  version = "0.3.0";
+  version = "0.4.0";
 
   src = fetchFromGitLab {
     owner = "surfer-project";
     repo = "surfer";
-    rev = "v${version}";
-    hash = "sha256-mvHyljAEVi1FMkEbKsPmCNx2Cg0/Ydw3ZQCZsowEKGc=";
+    rev = "v${finalAttrs.version}";
+    hash = "sha256-rNJIe6FlAQI2B3lsRYHKMIGgJ1Q5EFX7kWgml+sXxtc=";
     fetchSubmodules = true;
   };
 
@@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec {
     libXi
   ];
 
-  cargoHash = "sha256-89pkHS0YQ77PmQfT8epdu2tPRNAenYGgtoiJVuuVYiI=";
+  cargoHash = "sha256-Q4SyuBNR7FnBe3h1rUo48Sxk2COdQbECiXXrGpwXhPk=";
 
   # Avoid the network attempt from skia. See: https://github.com/cargo2nix/cargo2nix/issues/318
   doCheck = false;
@@ -61,10 +61,10 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Extensible and Snappy Waveform Viewer";
     homepage = "https://surfer-project.org/";
-    changelog = "https://gitlab.com/surfer-project/surfer/-/releases/v${version}";
+    changelog = "https://gitlab.com/surfer-project/surfer/-/releases/v${finalAttrs.version}";
     license = lib.licenses.eupl12;
     maintainers = with lib.maintainers; [ hakan-demirli ];
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
     mainProgram = "surfer";
   };
-}
+})

From 01b3a7438bcb91345ded02afbada764abe1e4bcf Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 6 Nov 2025 17:12:35 -0500
Subject: [PATCH 6019/6226] emojione: drop

Archived now at https://github.com/13rac1/emojione-color-font, so drop
it.
---
 pkgs/by-name/em/emojione/package.nix | 66 ----------------------------
 pkgs/top-level/aliases.nix           |  1 +
 2 files changed, 1 insertion(+), 66 deletions(-)
 delete mode 100644 pkgs/by-name/em/emojione/package.nix

diff --git a/pkgs/by-name/em/emojione/package.nix b/pkgs/by-name/em/emojione/package.nix
deleted file mode 100644
index 124561583440..000000000000
--- a/pkgs/by-name/em/emojione/package.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  fetchpatch,
-  inkscape,
-  imagemagick,
-  potrace,
-  svgo,
-  scfbuild,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "emojione";
-  version = "1.4";
-
-  src = fetchFromGitHub {
-    owner = "eosrei";
-    repo = "emojione-color-font";
-    rev = "v${version}";
-    sha256 = "1781kxfbhnvylypbkwxc3mx6hi0gcjisfjr9cf0jdz4d1zkf09b3";
-  };
-
-  patches = [
-    # Fix build with Inkscape 1.0
-    # https://github.com/eosrei/twemoji-color-font/pull/82
-    (fetchpatch {
-      url = "https://github.com/eosrei/twemoji-color-font/commit/208ad63c2ceb38c528b5237abeb2b85ceedc1d37.patch";
-      sha256 = "7tDWIkpcdir1V6skgXSM3r0FwHy0F6PyJ07OPRsSStA=";
-      postFetch = ''
-        substituteInPlace $out \
-          --replace "inkscape --without-gui" "inkscape --export-png" \
-          --replace TWEMOJI EMOJIONE \
-          --replace "the assets" "the emojione assets" \
-          --replace twemoji emojione
-      '';
-    })
-  ];
-
-  preBuild = ''
-    sed -i 's,SCFBUILD :=.*,SCFBUILD := scfbuild,' Makefile
-    # Shut up inkscape's warnings
-    export HOME="$NIX_BUILD_ROOT"
-  '';
-
-  nativeBuildInputs = [
-    inkscape
-    imagemagick
-    potrace
-    svgo
-    scfbuild
-  ];
-
-  enableParallelBuilding = true;
-
-  installPhase = ''
-    install -Dm755 build/EmojiOneColor-SVGinOT.ttf $out/share/fonts/truetype/EmojiOneColor-SVGinOT.ttf
-  '';
-
-  meta = with lib; {
-    description = "Open source emoji set";
-    homepage = "http://emojione.com/";
-    license = licenses.cc-by-40;
-    maintainers = [ ];
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 9feda21cbcd8..29c0472e26a9 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -527,6 +527,7 @@ mapAliases {
   emacsMacport = throw "'emacsMacport' has been renamed to/replaced by 'emacs-macport'"; # Converted to throw 2025-10-27
   emacsNativeComp = throw "'emacsNativeComp' has been renamed to/replaced by 'emacs'"; # Converted to throw 2025-10-27
   embree2 = throw "embree2 has been removed, as it is unmaintained upstream and depended on tbb_2020"; # Added 2025-09-14
+  emojione = throw "emojione has beem removed, as it has been archived upstream."; # Added 2025-11-06
   EmptyEpsilon = throw "'EmptyEpsilon' has been renamed to/replaced by 'empty-epsilon'"; # Converted to throw 2025-10-27
   emulationstation = throw "emulationstation was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23
   emulationstation-de = throw "emulationstation-de was removed due to numerous vulnerabilities in freeimage"; # Added 2025-10-23

From bb0a05aa740c0a75b6a0cb836fc00eeb026c190e Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Thu, 6 Nov 2025 17:10:56 -0500
Subject: [PATCH 6020/6226] nodePackages.emojione: drop

Archived per https://github.com/joypixels/emojione
---
 pkgs/development/node-packages/aliases.nix      |  1 +
 .../node-packages/node-packages.json            |  1 -
 .../development/node-packages/node-packages.nix | 17 -----------------
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index cce4f3533d86..9ca1d2dc356f 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -134,6 +134,7 @@ mapAliases {
   eask = pkgs.eask; # added 2023-08-17
   inherit (pkgs.elmPackages) elm-test;
   inherit (pkgs.elmPackages) elm-review;
+  emojione = throw "emojione was archived and abandoned upstream, so it has been removed"; # Added 2025-11-06
   escape-string-regexp = throw "escape-string-regexp was removed because it provides no executable"; # added 2025-03-12
   inherit (pkgs) eslint; # Added 2024-08-28
   inherit (pkgs) eslint_d; # Added 2023-05-26
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 2e73cbc3b36a..0354d7004ed7 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -36,7 +36,6 @@
 , "@electron-forge/cli"
 , "elm-oracle"
 , "emoj"
-, "emojione"
 , "esy"
 , "fast-cli"
 , "fauna-shell"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 6cb3a179f25d..48f1c22554d7 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -38272,23 +38272,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  emojione = nodeEnv.buildNodePackage {
-    name = "emojione";
-    packageName = "emojione";
-    version = "4.5.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/emojione/-/emojione-4.5.0.tgz";
-      sha512 = "Tq55Y3UgPOnayFDN+Qd6QMP0rpoH10a1nhSFN27s8gXW3qymgFIHiXys2ECYYAI134BafmI3qP9ni2rZOe9BjA==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Complete set of emojis designed for the web. It includes libraries to easily convert unicode characters to shortnames (:smile:) and shortnames to our custom emoji images. PNG formats provided for the emoji images";
-      homepage = "https://www.emojione.com";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   esy = nodeEnv.buildNodePackage {
     name = "esy";
     packageName = "esy";

From 38b0a1b2e6d7e08b75d0a892f9aa1cebca6a62e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 22:22:02 +0000
Subject: [PATCH 6021/6226] google-chrome: 142.0.7444.59 -> 142.0.7444.134

---
 pkgs/by-name/go/google-chrome/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix
index c298509da46c..7a2c9857463e 100644
--- a/pkgs/by-name/go/google-chrome/package.nix
+++ b/pkgs/by-name/go/google-chrome/package.nix
@@ -170,11 +170,11 @@ let
 
   linux = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "142.0.7444.59";
+    version = "142.0.7444.134";
 
     src = fetchurl {
       url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb";
-      hash = "sha256-j7WXeRIyuqwvwWGtds4g20kKM+wWkj0R7O/nw6kdsPo=";
+      hash = "sha256-exTjuvwv/W2nemvBHyliD74At7i6ZcKypT9xaVPzcAE=";
     };
 
     # With strictDeps on, some shebangs were not being patched correctly
@@ -272,11 +272,11 @@ let
 
   darwin = stdenvNoCC.mkDerivation (finalAttrs: {
     inherit pname meta passthru;
-    version = "142.0.7444.60";
+    version = "142.0.7444.135";
 
     src = fetchurl {
-      url = "http://dl.google.com/release2/chrome/pgkesp3xybyklm4wlxch42zlny_142.0.7444.60/GoogleChrome-142.0.7444.60.dmg";
-      hash = "sha256-OhtURSA1rH6j7Bxp0Mg3kGREd44lwVbqH2gEnG8wrFg=";
+      url = "http://dl.google.com/release2/chrome/e7ds3jjlib5cryamafm2t5wjce_142.0.7444.135/GoogleChrome-142.0.7444.135.dmg";
+      hash = "sha256-kU6DBUW/O/RzbQUNQiKfuu3+h4ys22mg5nF0oKBPNy8=";
     };
 
     dontPatch = true;

From 65f1282e80df2d96932538bdcc5489ce950c40cb Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Thu, 6 Nov 2025 13:59:53 +0000
Subject: [PATCH 6022/6226] docker-language-server: cleanup

---
 .../do/docker-language-server/package.nix     | 35 +++++++++++++------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/pkgs/by-name/do/docker-language-server/package.nix b/pkgs/by-name/do/docker-language-server/package.nix
index 6c88af2649f5..c0d8db509963 100644
--- a/pkgs/by-name/do/docker-language-server/package.nix
+++ b/pkgs/by-name/do/docker-language-server/package.nix
@@ -4,16 +4,17 @@
   buildGoModule,
   docker,
   gotestsum,
+  versionCheckHook,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "docker-language-server";
   version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "docker";
     repo = "docker-language-server";
-    tag = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-OSAySCTK2temrVxmkRnrl5YWVbmkp8DRlXFVxTzEW3Q=";
   };
 
@@ -30,23 +31,35 @@ buildGoModule rec {
     # disable some tests because of sandbox
     excludedPackages="e2e-tests|/buildkit$|/scout$"
     packages=$(go list ./... | grep -vE "$excludedPackages")
-    gotestsum -- $packages -timeout 30s -skip "TestCollectDiagnostics|TestCompletion_ImageTags|TestInlayHint"
-    go test ./e2e-tests/... -timeout 120s -skip "TestPublishDiagnostics|TestHover"
+
+    gotestsum -- $packages \
+      -timeout 30s \
+      -skip "TestCollectDiagnostics|TestCompletion_ImageTags|TestInlayHint"
+
+    go test ./e2e-tests/... \
+      -timeout 120s \
+      -skip "TestPublishDiagnostics|TestHover"
 
     runHook postCheck
   '';
 
   ldflags = [
     "-s"
-    "-w"
-    "-X 'github.com/docker/docker-language-server/internal/pkg/cli/metadata.Version=${version}'"
+    "-X 'github.com/docker/docker-language-server/internal/pkg/cli/metadata.Version=${finalAttrs.version}'"
   ];
 
-  meta = with lib; {
-    homepage = "https://github.com/docker/docker-language-server";
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  meta = {
     description = "Language server for providing language features for file types in the Docker ecosystem (Dockerfiles, Compose files, and Bake files)";
+    homepage = "https://github.com/docker/docker-language-server";
+    changelog = "https://github.com/docker/docker-language-server/blob/${finalAttrs.src.tag}/CHANGELOG.md";
     mainProgram = "docker-language-server";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ baongoc124 ];
+    license = lib.licenses.asl20;
+    maintainers = with lib.maintainers; [ baongoc124 ];
   };
-}
+})

From 2e3dc7f0afe33255c2b730403074a8550d8afad8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 22:25:22 +0000
Subject: [PATCH 6023/6226] oxide-rs: 0.13.0+20250730.0.0 ->
 0.14.0+20251008.0.0

---
 pkgs/by-name/ox/oxide-rs/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ox/oxide-rs/package.nix b/pkgs/by-name/ox/oxide-rs/package.nix
index 2c98ce80d8b7..4be1231203af 100644
--- a/pkgs/by-name/ox/oxide-rs/package.nix
+++ b/pkgs/by-name/ox/oxide-rs/package.nix
@@ -11,13 +11,13 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "oxide-rs";
-  version = "0.13.0+20250730.0.0";
+  version = "0.14.0+20251008.0.0";
 
   src = fetchFromGitHub {
     owner = "oxidecomputer";
     repo = "oxide.rs";
     rev = "v${version}";
-    hash = "sha256-baEXsDzM4y4HmUwjIqVBJm+8L+q+llq9g2o1kEZU3vI=";
+    hash = "sha256-/xFtANxapsPU99Lj8TN+ZFcLy0AOyq+lcqhqIt3ZWgs=";
   };
 
   patches = [
@@ -33,7 +33,7 @@ rustPlatform.buildRustPackage rec {
     "--skip=test_cmd_auth_debug_logging"
   ];
 
-  cargoHash = "sha256-radMOVLnHaV+5bUYanw5mswGM9A+xqNN/a4boe1jWDM=";
+  cargoHash = "sha256-D08NacxKZKVsqR7qQEce2lz8E4GahtSo7jwwmSPRvUc=";
 
   cargoBuildFlags = [
     "--package=oxide-cli"

From a12d2ad248e849bde151c68d2def430b916ef33a Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Thu, 6 Nov 2025 22:27:29 +0000
Subject: [PATCH 6024/6226] swayidle: 1.8.0 -> 1.9.0

Changes: https://github.com/swaywm/swayidle/releases/tag/v1.9.0
---
 pkgs/by-name/sw/swayidle/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sw/swayidle/package.nix b/pkgs/by-name/sw/swayidle/package.nix
index 47745212f78f..30fd4cbd0407 100644
--- a/pkgs/by-name/sw/swayidle/package.nix
+++ b/pkgs/by-name/sw/swayidle/package.nix
@@ -16,13 +16,13 @@
 
 stdenv.mkDerivation rec {
   pname = "swayidle";
-  version = "1.8.0";
+  version = "1.9.0";
 
   src = fetchFromGitHub {
     owner = "swaywm";
     repo = "swayidle";
-    rev = version;
-    hash = "sha256-/U6Y9H5ZqIJph3TZVcwr9+Qfd6NZNYComXuC1D9uGHg=";
+    rev = "v${version}";
+    hash = "sha256-fxDwRfAXb9D6epLlyWnXpy9g8V3ovJRpQ/f3M4jxY/s=";
   };
 
   strictDeps = true;

From 55fbf3418a2e2ba5b832b89c94699cff6c30c49e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 22:28:02 +0000
Subject: [PATCH 6025/6226] mpvScripts.occivink.blacklistExtensions:
 0-unstable-2025-03-09 -> 0-unstable-2025-11-01

---
 pkgs/applications/video/mpv/scripts/occivink.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/video/mpv/scripts/occivink.nix b/pkgs/applications/video/mpv/scripts/occivink.nix
index fabfefd3e03e..7501c9e5ee1b 100644
--- a/pkgs/applications/video/mpv/scripts/occivink.nix
+++ b/pkgs/applications/video/mpv/scripts/occivink.nix
@@ -19,12 +19,12 @@ let
     let
       self = rec {
         pname = camelToKebab name;
-        version = "0-unstable-2025-03-09";
+        version = "0-unstable-2025-11-01";
         src = fetchFromGitHub {
           owner = "occivink";
           repo = "mpv-scripts";
-          rev = "65aa1da29570e9c21b49292725ec5dd719ab6bb4";
-          hash = "sha256-pca24cZY2ZNxkY1XP2T2WKo1UbD8gsGn+EskGH+CggE=";
+          rev = "01f3e99558915bb715b614d7f4b052230360eb21";
+          hash = "sha256-v3TGsCzSg+a1vrOgI5NbTVf8Bh/iMRRgwMy194sNq1Y=";
         };
         passthru.updateScript = unstableGitUpdater { };
 

From d1740d0616459526a7ef4bb32d6436e3b77750b5 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 6 Nov 2025 19:30:10 -0300
Subject: [PATCH 6026/6226] flamerobin: 0.9.3.12 -> 0.9.14

---
 pkgs/by-name/fl/flamerobin/package.nix | 27 +++++++++-----------------
 1 file changed, 9 insertions(+), 18 deletions(-)

diff --git a/pkgs/by-name/fl/flamerobin/package.nix b/pkgs/by-name/fl/flamerobin/package.nix
index a49ed58d3859..22eab7204620 100644
--- a/pkgs/by-name/fl/flamerobin/package.nix
+++ b/pkgs/by-name/fl/flamerobin/package.nix
@@ -2,32 +2,23 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch,
   cmake,
   wxGTK32,
   boost,
   firebird,
 }:
 
-stdenv.mkDerivation rec {
-  version = "0.9.3.12";
+stdenv.mkDerivation (finalAttrs: {
+  version = "0.9.14";
   pname = "flamerobin";
 
   src = fetchFromGitHub {
     owner = "mariuz";
     repo = "flamerobin";
-    rev = version;
-    sha256 = "sha256-uWx3riRc79VKh7qniWFjxxc7v6l6cW0i31HxoN1BSdA=";
+    tag = "${finalAttrs.version}";
+    hash = "sha256-IwJEFF3vP0BC9PoMoY+XPLT+ygXnFXP/TWaqjdQWs8s=";
   };
 
-  patches = [
-    # rely on compiler command line for __int128 and std::decimal::decimal128
-    (fetchpatch {
-      url = "https://github.com/mariuz/flamerobin/commit/8e0ea6d42aa28a4baeaa8c8b8b57c56eb9ae3540.patch";
-      sha256 = "sha256-l6LWXA/sRQGQKi798bzl0iIJ2vdvXHOjG7wdFSXv+NM=";
-    })
-  ];
-
   enableParallelBuilding = true;
 
   nativeBuildInputs = [ cmake ];
@@ -38,12 +29,12 @@ stdenv.mkDerivation rec {
     firebird
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Database administration tool for Firebird RDBMS";
     homepage = "https://github.com/mariuz/flamerobin";
-    license = licenses.bsdOriginal;
-    maintainers = with maintainers; [ uralbash ];
-    platforms = platforms.unix;
+    license = lib.licenses.bsdOriginal;
+    maintainers = with lib.maintainers; [ uralbash ];
+    platforms = lib.platforms.unix;
     mainProgram = "flamerobin";
   };
-}
+})

From 19505f5cd1c2d38e322fb7b59540982a1a192d27 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Thu, 6 Nov 2025 19:46:04 -0300
Subject: [PATCH 6027/6226] gphotos-sync: drop

---
 pkgs/by-name/gp/gphotos-sync/package.nix      | 63 -------------------
 .../gp/gphotos-sync/skip-network-tests.patch  | 21 -------
 pkgs/top-level/aliases.nix                    |  1 +
 3 files changed, 1 insertion(+), 84 deletions(-)
 delete mode 100644 pkgs/by-name/gp/gphotos-sync/package.nix
 delete mode 100644 pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch

diff --git a/pkgs/by-name/gp/gphotos-sync/package.nix b/pkgs/by-name/gp/gphotos-sync/package.nix
deleted file mode 100644
index 9b89e9c53b5e..000000000000
--- a/pkgs/by-name/gp/gphotos-sync/package.nix
+++ /dev/null
@@ -1,63 +0,0 @@
-{
-  lib,
-  fetchFromGitHub,
-  python3,
-  ffmpeg,
-}:
-python3.pkgs.buildPythonApplication rec {
-  pname = "gphotos-sync";
-  version = "3.2.1";
-  format = "pyproject";
-
-  src = fetchFromGitHub {
-    owner = "gilesknap";
-    repo = "gphotos-sync";
-    rev = version;
-    hash = "sha256-iTqD/oUQqC7Fju8SEPkSZX7FC9tE4eRCewiJR8STmEw=";
-  };
-
-  patches = [
-    ./skip-network-tests.patch
-  ];
-
-  nativeBuildInputs = with python3.pkgs; [
-    setuptools
-    setuptools-scm
-    wheel
-  ];
-
-  propagatedBuildInputs = with python3.pkgs; [
-    appdirs
-    attrs
-    exif
-    google-auth-oauthlib
-    psutil
-    pyyaml
-    psutil
-    requests-oauthlib
-    types-pyyaml
-    types-requests
-  ];
-
-  buildInputs = [
-    ffmpeg
-  ];
-
-  nativeCheckInputs = with python3.pkgs; [
-    mock
-    pytestCheckHook
-  ];
-
-  preCheck = ''
-    export PY_IGNORE_IMPORTMISMATCH=1
-    export HOME=$(mktemp -d)
-  '';
-
-  meta = with lib; {
-    description = "Google Photos and Albums backup with Google Photos Library API";
-    mainProgram = "gphotos-sync";
-    homepage = "https://github.com/gilesknap/gphotos-sync";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ dnr ];
-  };
-}
diff --git a/pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch b/pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch
deleted file mode 100644
index 6f78ed7db3f2..000000000000
--- a/pkgs/by-name/gp/gphotos-sync/skip-network-tests.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/tests/test_setup.py b/tests/test_setup.py
-index 085b110..ea4a7d2 100644
---- a/tests/test_setup.py
-+++ b/tests/test_setup.py
-@@ -45,7 +45,8 @@ class SetupDbAndCredentials:
-         return self
- 
-     def __exit__(self, exc_type=None, exc_value=None, traceback=None):
--        self.gp.google_photos_down.close()
-+        if hasattr(self.gp, 'google_photos_down'):
-+            self.gp.google_photos_down.close()
- 
-     def test_setup(self, test_name, args=None, trash_db=False, trash_files=False):
-         self.root = Path("/tmp/gpTests/{}".format(test_name))
-@@ -76,3 +77,6 @@ class SetupDbAndCredentials:
- 
-     def test_done(self):
-         self.gp.data_store.store()
-+
-+import pytest, requests
-+requests.Session.__init__ = lambda *args, **kwargs: pytest.skip("no network access")
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f7f758a78104..3bbd458106dc 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -669,6 +669,7 @@ mapAliases {
   godot_4_3-export-templates = throw "'godot_4_3-export-templates' has been renamed to/replaced by 'godot_4_3-export-templates-bin'"; # Converted to throw 2025-10-27
   godot_4_4-export-templates = throw "'godot_4_4-export-templates' has been renamed to/replaced by 'godot_4_4-export-templates-bin'"; # Converted to throw 2025-10-27
   goldwarden = throw "'goldwarden' has been removed, as it no longer works with new Bitwarden versions and is abandoned upstream"; # Added 2025-09-16
+  gphotos-sync = throw "'gphotos-sync' has been removed, as it was archived upstream due to API changes that ceased its functions"; # Added 2025-11-06
   gprbuild-boot = throw "'gprbuild-boot' has been renamed to/replaced by 'gnatPackages.gprbuild-boot'"; # Converted to throw 2025-10-27
   gpxsee-qt5 = throw "gpxsee-qt5 was removed, use gpxsee instead"; # added 2025-09-09
   gpxsee-qt6 = gpxsee; # added 2025-09-09

From 847ba5672e3930a79aa1b8c0081b2956e90d79f0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 23:00:00 +0000
Subject: [PATCH 6028/6226] teams-for-linux: 2.6.7 -> 2.6.11

---
 pkgs/by-name/te/teams-for-linux/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/te/teams-for-linux/package.nix b/pkgs/by-name/te/teams-for-linux/package.nix
index bcb26588ce3e..f45f1ab39265 100644
--- a/pkgs/by-name/te/teams-for-linux/package.nix
+++ b/pkgs/by-name/te/teams-for-linux/package.nix
@@ -16,16 +16,16 @@
 
 buildNpmPackage rec {
   pname = "teams-for-linux";
-  version = "2.6.7";
+  version = "2.6.11";
 
   src = fetchFromGitHub {
     owner = "IsmaelMartinez";
     repo = "teams-for-linux";
     tag = "v${version}";
-    hash = "sha256-8jIQbeUhGBqVSz6tO48wTbwcJig+xnL8sIsROtEBsv4=";
+    hash = "sha256-jx58Bg/jMGqf9M/Ss4cYIHtuUmtkej67ScrcttSxNhg=";
   };
 
-  npmDepsHash = "sha256-DKHQwJb9y75jX+h2XNudyn6mYnT9GywwBhZZtkknKKE=";
+  npmDepsHash = "sha256-tgLO4EsD3j5mg3c9M+I8jkeytw2ZrgQsKs10aryaFhw=";
 
   nativeBuildInputs = [
     makeWrapper

From 1db9950cf1bfe70c3cdaefc9ee5910e9a2662499 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 10:53:09 -0800
Subject: [PATCH 6029/6226] rename python3Packages.minikerberos-bad ->
 python3Packages.kerbad

---
 pkgs/development/python-modules/asyauth-bad/default.nix   | 4 ++--
 pkgs/development/python-modules/bloodyad/default.nix      | 6 +++---
 .../{minikerberos-bad => kerbad}/default.nix              | 8 ++++----
 pkgs/development/python-modules/msldap-bad/default.nix    | 4 ++--
 pkgs/top-level/python-aliases.nix                         | 1 +
 pkgs/top-level/python-packages.nix                        | 4 ++--
 6 files changed, 14 insertions(+), 13 deletions(-)
 rename pkgs/development/python-modules/{minikerberos-bad => kerbad}/default.nix (78%)

diff --git a/pkgs/development/python-modules/asyauth-bad/default.nix b/pkgs/development/python-modules/asyauth-bad/default.nix
index dae4904fcf81..88492effe879 100644
--- a/pkgs/development/python-modules/asyauth-bad/default.nix
+++ b/pkgs/development/python-modules/asyauth-bad/default.nix
@@ -4,7 +4,7 @@
   asysocks,
   buildPythonPackage,
   fetchFromGitHub,
-  minikerberos-bad,
+  kerbad,
   setuptools,
   unicrypto,
 }:
@@ -26,7 +26,7 @@ buildPythonPackage rec {
   dependencies = [
     asn1crypto
     asysocks
-    minikerberos-bad
+    kerbad
     unicrypto
   ];
 
diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix
index 7cba2ac12efb..a993caa8e472 100644
--- a/pkgs/development/python-modules/bloodyad/default.nix
+++ b/pkgs/development/python-modules/bloodyad/default.nix
@@ -7,7 +7,7 @@
   dnspython,
   fetchFromGitHub,
   hatchling,
-  minikerberos-bad,
+  kerbad,
   msldap-bad,
   pyasn1,
   pytestCheckHook,
@@ -32,7 +32,7 @@ buildPythonPackage rec {
   pythonRelaxDeps = [ "cryptography" ];
 
   pythonRemoveDeps = [
-    "minikerberos-bad"
+    "kerbad"
     "msldap-bad"
   ];
 
@@ -42,7 +42,7 @@ buildPythonPackage rec {
     asn1crypto
     cryptography
     dnspython
-    minikerberos-bad
+    kerbad
     msldap-bad
     winacl
   ];
diff --git a/pkgs/development/python-modules/minikerberos-bad/default.nix b/pkgs/development/python-modules/kerbad/default.nix
similarity index 78%
rename from pkgs/development/python-modules/minikerberos-bad/default.nix
rename to pkgs/development/python-modules/kerbad/default.nix
index c018ff09a170..34e238f4d97e 100644
--- a/pkgs/development/python-modules/minikerberos-bad/default.nix
+++ b/pkgs/development/python-modules/kerbad/default.nix
@@ -15,13 +15,13 @@
 }:
 
 buildPythonPackage rec {
-  pname = "minikerberos-bad";
+  pname = "kerbad";
   version = "0.4.4";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CravateRouge";
-    repo = "minikerberos-bAD";
+    repo = "kerbad";
     tag = version;
     hash = "sha256-pnIn7UOpnCke6voFvOwcONXDd9i/di1lE/57vkg0/0w=";
   };
@@ -45,8 +45,8 @@ buildPythonPackage rec {
 
   meta = {
     description = "Kerberos manipulation library in pure Python";
-    homepage = "https://github.com/CravateRouge/minikerberos-bAD";
-    changelog = "https://github.com/CravateRouge/minikerberos-bAD/releases/tag/${src.tag}";
+    homepage = "https://github.com/CravateRouge/kerbad";
+    changelog = "https://github.com/CravateRouge/kerbad/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/msldap-bad/default.nix b/pkgs/development/python-modules/msldap-bad/default.nix
index cda5f09b3190..a976d27fe487 100644
--- a/pkgs/development/python-modules/msldap-bad/default.nix
+++ b/pkgs/development/python-modules/msldap-bad/default.nix
@@ -5,7 +5,7 @@
   asysocks,
   buildPythonPackage,
   fetchFromGitHub,
-  minikerberos-bad,
+  kerbad,
   prompt-toolkit,
   setuptools,
   tabulate,
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     asyauth-bad
     asn1crypto
     asysocks
-    minikerberos-bad
+    kerbad
     prompt-toolkit
     tabulate
     tqdm
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 02685beb6740..0f5cea7eb838 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -251,6 +251,7 @@ mapAliases {
   memcached = throw "'memcached' has been renamed to/replaced by 'python-memcached'"; # Converted to throw 2025-10-29
   memory_profiler = throw "'memory_profiler' has been renamed to/replaced by 'memory-profiler'"; # Converted to throw 2025-10-29
   mesa = throw "python3Packages.mesa has been removed because it has been marked as broken since at least November 2024."; # Added 2025-10-03
+  minikerberos-bad = throw "'minikerberos-bad' has been renamed to/replaced by 'kerbad'"; # added 2025-11-06
   mir_eval = throw "'mir_eval' has been renamed to/replaced by 'mir-eval'"; # Converted to throw 2025-10-29
   mistune_2_0 = throw "'mistune_2_0' has been renamed to/replaced by 'mistune'"; # Converted to throw 2025-10-29
   mkdocs-awesome-pages-plugin = throw "'mkdocs-awesome-pages-plugin' has been renamed to/replaced by 'mkdocs-awesome-nav'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index aba032811680..9b9474a67328 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7870,6 +7870,8 @@ self: super: with self; {
 
   keras = callPackage ../development/python-modules/keras { };
 
+  kerbad = callPackage ../development/python-modules/kerbad { };
+
   kerberos = callPackage ../development/python-modules/kerberos { };
 
   kernels = callPackage ../development/python-modules/kernels { };
@@ -9451,8 +9453,6 @@ self: super: with self; {
 
   minikerberos = callPackage ../development/python-modules/minikerberos { };
 
-  minikerberos-bad = callPackage ../development/python-modules/minikerberos-bad { };
-
   minimal-snowplow-tracker = callPackage ../development/python-modules/minimal-snowplow-tracker { };
 
   minimock = callPackage ../development/python-modules/minimock { };

From 686bd7dcd4d67830ef260b011762735a13af2db2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 23:01:46 +0000
Subject: [PATCH 6030/6226] python3Packages.sqlmap: 1.9.10 -> 1.9.11

---
 pkgs/development/python-modules/sqlmap/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/sqlmap/default.nix b/pkgs/development/python-modules/sqlmap/default.nix
index 91da430181fb..5ddbc22fd78d 100644
--- a/pkgs/development/python-modules/sqlmap/default.nix
+++ b/pkgs/development/python-modules/sqlmap/default.nix
@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "sqlmap";
-  version = "1.9.10";
+  version = "1.9.11";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-S5A/zjf5PpauzIU3BGiijgGEq7OrFoj13xkYAJgdnOA=";
+    hash = "sha256-On76bRCiC7GEh5sdtTQnmohzkn7lvr4f1o9C25y/VJM=";
   };
 
   postPatch = ''

From 851458951511f1d19736939460ce2d7d2b791ce6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 23:01:50 +0000
Subject: [PATCH 6031/6226] hermitcli: 0.46.1 -> 0.46.2

---
 pkgs/by-name/he/hermitcli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/he/hermitcli/package.nix b/pkgs/by-name/he/hermitcli/package.nix
index 1fe420cb2abe..fbe73c99450a 100644
--- a/pkgs/by-name/he/hermitcli/package.nix
+++ b/pkgs/by-name/he/hermitcli/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "hermit";
-  version = "0.46.1";
+  version = "0.46.2";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "cashapp";
     repo = "hermit";
-    hash = "sha256-snwqR9gtdUYmSNWcs+dur/6enuBG0HZ94cL6YoQFG1w=";
+    hash = "sha256-4SOwOO9ee7fKrby9sokWW/GPujT9/O+9emcaLIe+0C0=";
   };
 
   vendorHash = "sha256-bko9N3dbxe4K98BdG78lYYipAgAtGntrEAgoLeOY1NM=";

From 1dbbd6d5d149712459a0aff47b5ea18b7cd11ebd Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 11:10:02 -0800
Subject: [PATCH 6032/6226] python3Packages.kerbad: cleanup

---
 .../python-modules/kerbad/default.nix          | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/kerbad/default.nix b/pkgs/development/python-modules/kerbad/default.nix
index 34e238f4d97e..9d2f58b55d84 100644
--- a/pkgs/development/python-modules/kerbad/default.nix
+++ b/pkgs/development/python-modules/kerbad/default.nix
@@ -1,14 +1,18 @@
 {
   lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   asn1crypto,
   asysocks,
-  buildPythonPackage,
   cryptography,
-  fetchFromGitHub,
-  fetchPypi,
+  dnspython,
+  minikerberos,
   oscrypto,
-  pythonOlder,
-  setuptools,
   six,
   tqdm,
   unicrypto,
@@ -30,8 +34,10 @@ buildPythonPackage rec {
 
   dependencies = [
     asn1crypto
-    cryptography
     asysocks
+    cryptography
+    dnspython
+    minikerberos
     oscrypto
     six
     tqdm

From 6b8180b61235bd72209e6f289012bdb9588e3818 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 6 Nov 2025 15:04:02 -0800
Subject: [PATCH 6033/6226] python3Packages.kerbad: 0.4.4 ->
 0.5.6-unstable-2025-10-07

---
 pkgs/development/python-modules/kerbad/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/kerbad/default.nix b/pkgs/development/python-modules/kerbad/default.nix
index 9d2f58b55d84..68e87dcd6dff 100644
--- a/pkgs/development/python-modules/kerbad/default.nix
+++ b/pkgs/development/python-modules/kerbad/default.nix
@@ -18,16 +18,16 @@
   unicrypto,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "kerbad";
-  version = "0.4.4";
+  version = "0.5.6-unstable-2025-10-07";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CravateRouge";
     repo = "kerbad";
-    tag = version;
-    hash = "sha256-pnIn7UOpnCke6voFvOwcONXDd9i/di1lE/57vkg0/0w=";
+    rev = "3c2284de4d2390e22026b550705622ed39e5c05a"; # no tag available
+    hash = "sha256-V4KaF6lsECoLVpGZTZ4p7q9drHSsrsLPI/9zEQpqm3I=";
   };
 
   build-system = [ setuptools ];
@@ -52,7 +52,6 @@ buildPythonPackage rec {
   meta = {
     description = "Kerberos manipulation library in pure Python";
     homepage = "https://github.com/CravateRouge/kerbad";
-    changelog = "https://github.com/CravateRouge/kerbad/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };

From f83f8cad394e2bdd485f3b44c9947a45d8162056 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 11:40:39 -0800
Subject: [PATCH 6034/6226] python3Packages.asyauth-bad ->
 python3Packages.badauth

---
 .../{asyauth-bad => badauth}/default.nix               | 10 +++++-----
 pkgs/development/python-modules/msldap-bad/default.nix |  6 +++---
 pkgs/top-level/python-aliases.nix                      |  1 +
 pkgs/top-level/python-packages.nix                     |  4 ++--
 4 files changed, 11 insertions(+), 10 deletions(-)
 rename pkgs/development/python-modules/{asyauth-bad => badauth}/default.nix (73%)

diff --git a/pkgs/development/python-modules/asyauth-bad/default.nix b/pkgs/development/python-modules/badauth/default.nix
similarity index 73%
rename from pkgs/development/python-modules/asyauth-bad/default.nix
rename to pkgs/development/python-modules/badauth/default.nix
index 88492effe879..953aa624fbec 100644
--- a/pkgs/development/python-modules/asyauth-bad/default.nix
+++ b/pkgs/development/python-modules/badauth/default.nix
@@ -10,13 +10,13 @@
 }:
 
 buildPythonPackage rec {
-  pname = "asyauth-bad";
+  pname = "badauth";
   version = "0.0.20";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CravateRouge";
-    repo = "asyauth-bAD";
+    repo = "badauth";
     tag = version;
     hash = "sha256-NX6bvOxA4Y5KRPCIsI+o0cB4dFOXlV89iH7YqNDdaXE=";
   };
@@ -33,12 +33,12 @@ buildPythonPackage rec {
   # Module doesn't have tests
   doCheck = false;
 
-  pythonImportsCheck = [ "asyauth" ];
+  pythonImportsCheck = [ "badauth" ];
 
   meta = {
     description = "Unified authentication library";
-    homepage = "https://github.com/CravateRouge/asyauth-bAD";
-    changelog = "https://github.com/CravateRouge/asyauth-bAD/releases/tag/${src.tag}";
+    homepage = "https://github.com/CravateRouge/badauth";
+    changelog = "https://github.com/CravateRouge/badauth/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };
diff --git a/pkgs/development/python-modules/msldap-bad/default.nix b/pkgs/development/python-modules/msldap-bad/default.nix
index a976d27fe487..8f790f4c46db 100644
--- a/pkgs/development/python-modules/msldap-bad/default.nix
+++ b/pkgs/development/python-modules/msldap-bad/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   asn1crypto,
-  asyauth-bad,
+  badauth,
   asysocks,
   buildPythonPackage,
   fetchFromGitHub,
@@ -30,7 +30,7 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   dependencies = [
-    asyauth-bad
+    badauth
     asn1crypto
     asysocks
     kerbad
@@ -50,7 +50,7 @@ buildPythonPackage rec {
   meta = {
     description = "LDAP library for auditing MS AD";
     homepage = "https://github.com/CravateRouge/msldap-bAD";
-    changelog = "https://github.com/CravateRouge/asyauth-bAD/releases/tag/${src.tag}";
+    changelog = "https://github.com/CravateRouge/msldap-bAD/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 0f5cea7eb838..26ba300d01f1 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -65,6 +65,7 @@ mapAliases {
   APScheduler = throw "'APScheduler' has been renamed to/replaced by 'apscheduler'"; # Converted to throw 2025-10-29
   argon2_cffi = throw "'argon2_cffi' has been renamed to/replaced by 'argon2-cffi'"; # Converted to throw 2025-10-29
   astropy-extension-helpers = extension-helpers; # Added 2025-10-15
+  asyauth-bad = throw "'asyauth-bad' has been renamed to/replaced by 'badauth'"; # added 2025-11-06
   async_generator = throw "'async_generator' has been renamed to/replaced by 'async-generator'"; # Converted to throw 2025-10-29
   async_stagger = throw "'async_stagger' has been renamed to/replaced by 'async-stagger'"; # Converted to throw 2025-10-29
   asyncio-nats-client = throw "'asyncio-nats-client' has been renamed to/replaced by 'nats-py'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 9b9474a67328..921f4bff8b9a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1020,8 +1020,6 @@ self: super: with self; {
 
   asyauth = callPackage ../development/python-modules/asyauth { };
 
-  asyauth-bad = callPackage ../development/python-modules/asyauth-bad { };
-
   async-cache = callPackage ../development/python-modules/async-cache { };
 
   async-dns = callPackage ../development/python-modules/async-dns { };
@@ -1694,6 +1692,8 @@ self: super: with self; {
 
   bacpypes = callPackage ../development/python-modules/bacpypes { };
 
+  badauth = callPackage ../development/python-modules/badauth { };
+
   badsecrets = callPackage ../development/python-modules/badsecrets { };
 
   bagit = callPackage ../development/python-modules/bagit { };

From 906721f29d5eaff1a71f32959972377a3de40a9e Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 11:47:11 -0800
Subject: [PATCH 6035/6226] python3Packages.badauth: 0.0.20 ->
 0.1.4-unstable-2025-10-09

---
 pkgs/development/python-modules/badauth/default.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/badauth/default.nix b/pkgs/development/python-modules/badauth/default.nix
index 953aa624fbec..f0c426687f56 100644
--- a/pkgs/development/python-modules/badauth/default.nix
+++ b/pkgs/development/python-modules/badauth/default.nix
@@ -9,16 +9,16 @@
   unicrypto,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "badauth";
-  version = "0.0.20";
+  version = "0.1.4-unstable-2025-10-09";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CravateRouge";
     repo = "badauth";
-    tag = version;
-    hash = "sha256-NX6bvOxA4Y5KRPCIsI+o0cB4dFOXlV89iH7YqNDdaXE=";
+    rev = "86d6091470c98e1a5f6dc4b8749053189372bb53"; # no tag available
+    hash = "sha256-p7V5WkQ48b1IqCPwmJfbCiyqekfp9zW41J81JHyZNUQ=";
   };
 
   build-system = [ setuptools ];
@@ -38,7 +38,6 @@ buildPythonPackage rec {
   meta = {
     description = "Unified authentication library";
     homepage = "https://github.com/CravateRouge/badauth";
-    changelog = "https://github.com/CravateRouge/badauth/releases/tag/${src.tag}";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ fab ];
   };

From e859fbd5f11088f286c8cec181e8c74189366c26 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 12:07:52 -0800
Subject: [PATCH 6036/6226] python3Packages.unidns: init at 0.0.4

---
 .../python-modules/unidns/default.nix         | 47 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 49 insertions(+)
 create mode 100644 pkgs/development/python-modules/unidns/default.nix

diff --git a/pkgs/development/python-modules/unidns/default.nix b/pkgs/development/python-modules/unidns/default.nix
new file mode 100644
index 000000000000..4655b929538d
--- /dev/null
+++ b/pkgs/development/python-modules/unidns/default.nix
@@ -0,0 +1,47 @@
+{
+  lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+  setuptools,
+  asysocks,
+}:
+
+buildPythonPackage rec {
+  pname = "unidns";
+  version = "0.0.4";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "skelsec";
+    repo = "unidns";
+    tag = version;
+    hash = "sha256-uhTb27HeBaoI4yURpNf1+D6bWIXSsmYzUyk0RJmgbjQ=";
+  };
+
+  build-system = [
+    setuptools
+  ];
+
+  pythonRelaxDeps = [
+    "asysocks"
+  ];
+
+  dependencies = [
+    asysocks
+  ];
+
+  # No tests provided
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "unidns"
+  ];
+
+  meta = {
+    description = "Basic async DNS library";
+    homepage = "https://github.com/skelsec/unidns";
+    changelog = "https://github.com/skelsec/unidns/releases/${src.tag}";
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ sarahec ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 921f4bff8b9a..1adfc1cad9f4 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -19672,6 +19672,8 @@ self: super: with self; {
 
   unidiff = callPackage ../development/python-modules/unidiff { };
 
+  unidns = callPackage ../development/python-modules/unidns { };
+
   unifi-ap = callPackage ../development/python-modules/unifi-ap { };
 
   unifi-discovery = callPackage ../development/python-modules/unifi-discovery { };

From 00aad1290aa665b1bc3ccd90728773f934ad662f Mon Sep 17 00:00:00 2001
From: Tert0 <tert0byte@gmail.com>
Date: Fri, 7 Nov 2025 00:27:54 +0100
Subject: [PATCH 6037/6226] nixos/tests/restic: fix setting time in tests

Use `date -s` instead of `timedatectl set-time` because it fails with
`Failed to set time: Requested to set the clock to time before build time, refusing.`
---
 nixos/tests/restic.nix | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/nixos/tests/restic.nix b/nixos/tests/restic.nix
index 68777215c035..68ce843879b3 100644
--- a/nixos/tests/restic.nix
+++ b/nixos/tests/restic.nix
@@ -247,7 +247,7 @@ in
 
     restic.succeed(
         # test that remotebackup runs custom commands and produces a snapshot
-        "timedatectl set-time '2016-12-13 13:45'",
+        "date -s '2016-12-13 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
         'restic-remotebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"',
@@ -255,7 +255,7 @@ in
 
     restic.succeed(
         # test that remotebackup runs custom commands and produces a snapshot
-        "timedatectl set-time '2016-12-13 13:45'",
+        "date -s '2016-12-13 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
         'restic-remotebackup snapshots --json | ${pkgs.jq}/bin/jq "length | . == 1"',
@@ -297,27 +297,27 @@ in
         "grep 'check.* --some-check-option' /root/fake-restic.log",
 
         # test that we can create four snapshots in remotebackup and rclonebackup
-        "timedatectl set-time '2017-12-13 13:45'",
+        "date -s '2017-12-13 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
         "systemctl start restic-backups-rclonebackup.service",
 
-        "timedatectl set-time '2018-12-13 13:45'",
+        "date -s '2018-12-13 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
         "systemctl start restic-backups-rclonebackup.service",
 
-        "timedatectl set-time '2018-12-14 13:45'",
+        "date -s '2018-12-14 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
         "systemctl start restic-backups-rclonebackup.service",
 
-        "timedatectl set-time '2018-12-15 13:45'",
+        "date -s '2018-12-15 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
         "systemctl start restic-backups-rclonebackup.service",
 
-        "timedatectl set-time '2018-12-16 13:45'",
+        "date -s '2018-12-16 13:45'",
         "systemctl start restic-backups-remotebackup.service",
         "rm /root/backupCleanupCommand",
         "systemctl start restic-backups-rclonebackup.service",

From a090aa84b715396336ff5e565b29a51bb43a954a Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 10:24:41 -0800
Subject: [PATCH 6038/6226] rename python3Packages.msldap-bad ->
 python3Packages.badldap

---
 .../{msldap-bad => badldap}/default.nix             | 13 ++++++-------
 .../development/python-modules/bloodyad/default.nix |  6 +++---
 pkgs/top-level/python-aliases.nix                   |  1 +
 pkgs/top-level/python-packages.nix                  |  4 ++--
 4 files changed, 12 insertions(+), 12 deletions(-)
 rename pkgs/development/python-modules/{msldap-bad => badldap}/default.nix (76%)

diff --git a/pkgs/development/python-modules/msldap-bad/default.nix b/pkgs/development/python-modules/badldap/default.nix
similarity index 76%
rename from pkgs/development/python-modules/msldap-bad/default.nix
rename to pkgs/development/python-modules/badldap/default.nix
index 8f790f4c46db..9e57addb9161 100644
--- a/pkgs/development/python-modules/msldap-bad/default.nix
+++ b/pkgs/development/python-modules/badldap/default.nix
@@ -1,8 +1,8 @@
 {
   lib,
   asn1crypto,
-  badauth,
   asysocks,
+  badauth,
   buildPythonPackage,
   fetchFromGitHub,
   kerbad,
@@ -16,13 +16,13 @@
 }:
 
 buildPythonPackage rec {
-  pname = "msldap-bad";
+  pname = "badldap";
   version = "0.5.10";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CravateRouge";
-    repo = "msldap-bAD";
+    repo = "badldap";
     tag = version;
     hash = "sha256-CnHXEE1tdIXv+Qb3pS+cNxVtcTOVaq6mrQxu3wr1Xxo=";
   };
@@ -30,9 +30,9 @@ buildPythonPackage rec {
   build-system = [ setuptools ];
 
   dependencies = [
-    badauth
     asn1crypto
     asysocks
+    badauth
     kerbad
     prompt-toolkit
     tabulate
@@ -45,12 +45,11 @@ buildPythonPackage rec {
   # Module doesn't have tests
   doCheck = false;
 
-  pythonImportsCheck = [ "msldap" ];
+  pythonImportsCheck = [ "badldap" ];
 
   meta = {
     description = "LDAP library for auditing MS AD";
-    homepage = "https://github.com/CravateRouge/msldap-bAD";
-    changelog = "https://github.com/CravateRouge/msldap-bAD/releases/tag/${src.tag}";
+    homepage = "https://github.com/CravateRouge/badldap";
     license = lib.licenses.mit;
     maintainers = [ ];
   };
diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix
index a993caa8e472..ff63a21d90ca 100644
--- a/pkgs/development/python-modules/bloodyad/default.nix
+++ b/pkgs/development/python-modules/bloodyad/default.nix
@@ -8,7 +8,7 @@
   fetchFromGitHub,
   hatchling,
   kerbad,
-  msldap-bad,
+  badldap,
   pyasn1,
   pytestCheckHook,
   pythonOlder,
@@ -33,7 +33,7 @@ buildPythonPackage rec {
 
   pythonRemoveDeps = [
     "kerbad"
-    "msldap-bad"
+    "badldap"
   ];
 
   build-system = [ hatchling ];
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     cryptography
     dnspython
     kerbad
-    msldap-bad
+    badldap
     winacl
   ];
 
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 26ba300d01f1..22b3143b797d 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -259,6 +259,7 @@ mapAliases {
   mkdocs-macros = mkdocs-macros-plugin; # added 2025-09-02
   mkdocs-minify = throw "'mkdocs-minify' has been renamed to/replaced by 'mkdocs-minify-plugin'"; # Converted to throw 2025-10-29
   mne-python = throw "'mne-python' has been renamed to/replaced by 'mne'"; # Converted to throw 2025-10-29
+  msldap-bad = throw "'msldap-bad' has been renamed to/replaced by 'badldap'"; # added 2025-11-06
   multi_key_dict = throw "'multi_key_dict' has been renamed to/replaced by 'multi-key-dict'"; # Converted to throw 2025-10-29
   mutag = throw "mutag has been removed because it is unmaintained since 2018"; # added 2025-05-25
   net2grid = throw "'net2grid' has been renamed to/replaced by 'gridnet'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 1adfc1cad9f4..515ff03070b8 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1694,6 +1694,8 @@ self: super: with self; {
 
   badauth = callPackage ../development/python-modules/badauth { };
 
+  badldap = callPackage ../development/python-modules/badldap { };
+
   badsecrets = callPackage ../development/python-modules/badsecrets { };
 
   bagit = callPackage ../development/python-modules/bagit { };
@@ -9845,8 +9847,6 @@ self: super: with self; {
 
   msldap = callPackage ../development/python-modules/msldap { };
 
-  msldap-bad = callPackage ../development/python-modules/msldap-bad { };
-
   mslex = callPackage ../development/python-modules/mslex { };
 
   msmart-ng = callPackage ../development/python-modules/msmart-ng { };

From a33cde83015cb915779f392bd61d02eb5c0b8f72 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 11:33:12 -0800
Subject: [PATCH 6039/6226] python3Packages.badldap: cleanup

---
 pkgs/development/python-modules/badldap/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/badldap/default.nix b/pkgs/development/python-modules/badldap/default.nix
index 9e57addb9161..4010e0d781fd 100644
--- a/pkgs/development/python-modules/badldap/default.nix
+++ b/pkgs/development/python-modules/badldap/default.nix
@@ -1,13 +1,17 @@
 {
   lib,
+  buildPythonPackage,
+  fetchFromGitHub,
+
+  # build-system
+  setuptools,
+
+  # dependencies
   asn1crypto,
   asysocks,
   badauth,
-  buildPythonPackage,
-  fetchFromGitHub,
   kerbad,
   prompt-toolkit,
-  setuptools,
   tabulate,
   tqdm,
   unicrypto,

From ac88b6a3bec11eac627bd9dd978a1bbce9d1fde2 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 11:29:51 -0800
Subject: [PATCH 6040/6226] python3Packages.badldap: 0.5.10 ->
 0.7.1-unstable-2025-10-28

---
 pkgs/development/python-modules/badldap/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/badldap/default.nix b/pkgs/development/python-modules/badldap/default.nix
index 4010e0d781fd..290c57b6e9e1 100644
--- a/pkgs/development/python-modules/badldap/default.nix
+++ b/pkgs/development/python-modules/badldap/default.nix
@@ -15,20 +15,21 @@
   tabulate,
   tqdm,
   unicrypto,
+  unidns,
   wcwidth,
   winacl,
 }:
 
-buildPythonPackage rec {
+buildPythonPackage {
   pname = "badldap";
-  version = "0.5.10";
+  version = "0.7.1-unstable-2025-10-28";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CravateRouge";
     repo = "badldap";
-    tag = version;
-    hash = "sha256-CnHXEE1tdIXv+Qb3pS+cNxVtcTOVaq6mrQxu3wr1Xxo=";
+    rev = "65af61fd7daf7dc7bef9c6248553398e6f604d43"; # no tag available
+    hash = "sha256-14mV+EBrpoR9suPmOYdt2ro1Gcrpj3tuVx/meaVKC2c=";
   };
 
   build-system = [ setuptools ];
@@ -42,6 +43,7 @@ buildPythonPackage rec {
     tabulate
     tqdm
     unicrypto
+    unidns
     wcwidth
     winacl
   ];

From cc8fbf8b6a91426f542c761b155c9268ab5238cb Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 10:11:41 -0800
Subject: [PATCH 6041/6226] python3Packages.bloodyad: cleanup

---
 .../python-modules/bloodyad/default.nix       | 26 ++++++++++---------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix
index ff63a21d90ca..1b068439ba19 100644
--- a/pkgs/development/python-modules/bloodyad/default.nix
+++ b/pkgs/development/python-modules/bloodyad/default.nix
@@ -1,18 +1,22 @@
 {
   lib,
-  asn1crypto,
   buildPythonPackage,
-  certipy,
+  fetchFromGitHub,
+
+  # build-system
+  hatchling,
+
+  # dependencies
+  asn1crypto,
   cryptography,
   dnspython,
-  fetchFromGitHub,
-  hatchling,
   kerbad,
   badldap,
-  pyasn1,
-  pytestCheckHook,
-  pythonOlder,
   winacl,
+
+  # test
+  certipy,
+  pytestCheckHook,
 }:
 
 buildPythonPackage rec {
@@ -20,8 +24,6 @@ buildPythonPackage rec {
   version = "2.1.21";
   pyproject = true;
 
-  disabled = pythonOlder "3.8";
-
   src = fetchFromGitHub {
     owner = "CravateRouge";
     repo = "bloodyAD";
@@ -65,11 +67,11 @@ buildPythonPackage rec {
     "test_certificate_authentications"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Module for Active Directory Privilege Escalations";
     homepage = "https://github.com/CravateRouge/bloodyAD";
     changelog = "https://github.com/CravateRouge/bloodyAD/releases/tag/${src.tag}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ fab ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

From d7547e781eda44b6df82b5efc313c324ed3ebf59 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Sun, 2 Nov 2025 10:11:41 -0800
Subject: [PATCH 6042/6226] python3Packages.bloodyad: 2.1.21 -> 2.5.0

---
 .../python-modules/bloodyad/default.nix       | 25 ++++++++++++++++---
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/bloodyad/default.nix b/pkgs/development/python-modules/bloodyad/default.nix
index 1b068439ba19..9302f160aa8f 100644
--- a/pkgs/development/python-modules/bloodyad/default.nix
+++ b/pkgs/development/python-modules/bloodyad/default.nix
@@ -1,5 +1,6 @@
 {
   lib,
+  stdenv,
   buildPythonPackage,
   fetchFromGitHub,
 
@@ -8,10 +9,10 @@
 
   # dependencies
   asn1crypto,
+  badldap,
   cryptography,
   dnspython,
   kerbad,
-  badldap,
   winacl,
 
   # test
@@ -21,14 +22,14 @@
 
 buildPythonPackage rec {
   pname = "bloodyad";
-  version = "2.1.21";
+  version = "2.5.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "CravateRouge";
     repo = "bloodyAD";
     tag = "v${version}";
-    hash = "sha256-9yzKYSEmaPMv6AWhgr4UPPEx8s75Pg/hwqJnV29WocM=";
+    hash = "sha256-WKD8R1pH1dIAxMIM2SLPV+AoFi3z1O96U8XK2QyVYxQ=";
   };
 
   pythonRelaxDeps = [ "cryptography" ];
@@ -40,12 +41,21 @@ buildPythonPackage rec {
 
   build-system = [ hatchling ];
 
+  # Upstream provides two package scripts: bloodyad and bloodyAD,
+  # but this causes a FileAlreadyExists error during installation
+  # on Darwin (case-insensitive filesystem).
+  # https://github.com/CravateRouge/bloodyAD/issues/99
+  postPatch = lib.optionals stdenv.hostPlatform.isDarwin ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "bloodyAD = \"bloodyAD.main:main\"" ""
+  '';
+
   dependencies = [
     asn1crypto
+    badldap
     cryptography
     dnspython
     kerbad
-    badldap
     winacl
   ];
 
@@ -65,6 +75,13 @@ buildPythonPackage rec {
     "test_04ComputerRbcdGetSetAttribute"
     "test_06AddRemoveGetDnsRecord"
     "test_certificate_authentications"
+    "test_04ComputerRbcdRestoreGetSetAttribute"
+  ];
+
+  disabledTestPaths = [
+    # TypeError: applyFormatters() takes 1 positional argument but 2 were given
+    # https://github.com/CravateRouge/bloodyAD/issues/98
+    "tests/test_formatters.py"
   ];
 
   meta = {

From 4946ab87a695c344ea86b58e88feaae1b5d15bea Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 7 Nov 2025 00:39:48 +0100
Subject: [PATCH 6043/6226] python3Packages.css-inline: 0.17.0 -> 0.18.0

https://github.com/Stranger6667/css-inline/blob/python-v0.18.0/CHANGELOG.md
---
 .../python-modules/css-inline/Cargo.lock      | 681 +++++++++---------
 .../python-modules/css-inline/default.nix     |   6 +-
 2 files changed, 331 insertions(+), 356 deletions(-)

diff --git a/pkgs/development/python-modules/css-inline/Cargo.lock b/pkgs/development/python-modules/css-inline/Cargo.lock
index d3758752bdca..94af65d4e777 100644
--- a/pkgs/development/python-modules/css-inline/Cargo.lock
+++ b/pkgs/development/python-modules/css-inline/Cargo.lock
@@ -2,33 +2,12 @@
 # It is not intended for manual editing.
 version = 3
 
-[[package]]
-name = "addr2line"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
-dependencies = [
- "gimli",
-]
-
-[[package]]
-name = "adler2"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa"
-
 [[package]]
 name = "allocator-api2"
 version = "0.2.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
 
-[[package]]
-name = "android-tzdata"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
-
 [[package]]
 name = "android_system_properties"
 version = "0.1.5"
@@ -38,27 +17,18 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "atomic-waker"
+version = "1.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
+
 [[package]]
 name = "autocfg"
 version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
 
-[[package]]
-name = "backtrace"
-version = "0.3.75"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6806a6321ec58106fea15becdad98371e28d92ccbc7c8f1b3b6dd724fe8f1002"
-dependencies = [
- "addr2line",
- "cfg-if",
- "libc",
- "miniz_oxide",
- "object",
- "rustc-demangle",
- "windows-targets",
-]
-
 [[package]]
 name = "base64"
 version = "0.22.1"
@@ -67,9 +37,9 @@ checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
 
 [[package]]
 name = "bitflags"
-version = "2.9.1"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
+checksum = "812e12b5285cc515a9c72a5c1d3b6d46a19dac5acfef5265968c166106e31dd3"
 
 [[package]]
 name = "built"
@@ -87,12 +57,6 @@ version = "3.19.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "46c5e41b57b8bba42a04676d81cb89e9ee8e859a1a66f80a5a72e1cb76b34d43"
 
-[[package]]
-name = "byteorder"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
-
 [[package]]
 name = "bytes"
 version = "1.10.1"
@@ -113,18 +77,19 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.2.30"
+version = "1.2.44"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "deec109607ca693028562ed836a5f1c4b8bd77755c4e132fc5ce11b0b6211ae7"
+checksum = "37521ac7aabe3d13122dc382493e20c9416f299d2ccd5b3a5340a2570cdeb0f3"
 dependencies = [
+ "find-msvc-tools",
  "shlex",
 ]
 
 [[package]]
 name = "cfg-if"
-version = "1.0.1"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
+checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
 
 [[package]]
 name = "cfg_aliases"
@@ -134,11 +99,10 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
 [[package]]
 name = "chrono"
-version = "0.4.41"
+version = "0.4.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d"
+checksum = "145052bdd345b87320e369255277e3fb5152762ad123a901ef5c262dd38fe8d2"
 dependencies = [
- "android-tzdata",
  "iana-time-zone",
  "num-traits",
  "windows-link",
@@ -177,7 +141,7 @@ checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
 
 [[package]]
 name = "css-inline"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "cssparser",
  "html5ever",
@@ -193,7 +157,7 @@ dependencies = [
 
 [[package]]
 name = "css-inline-python"
-version = "0.17.0"
+version = "0.18.0"
 dependencies = [
  "built",
  "css-inline",
@@ -284,6 +248,12 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "877a4ace8713b0bcf2a4e7eec82529c029f1d0619886d18145fea96c3ffe5c0f"
 
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "52051878f80a721bb68ebfbc930e07b65ba72f2da88968ea5c06fd6ca3d3a127"
+
 [[package]]
 name = "fnv"
 version = "1.0.7"
@@ -292,15 +262,15 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "foldhash"
-version = "0.1.5"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
+checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb"
 
 [[package]]
 name = "form_urlencoded"
-version = "1.2.1"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456"
+checksum = "cb4cb245038516f5f85277875cdaa4f7d2c9a0fa0468de06ed190163b1581fcf"
 dependencies = [
  "percent-encoding",
 ]
@@ -365,15 +335,6 @@ dependencies = [
  "slab",
 ]
 
-[[package]]
-name = "fxhash"
-version = "0.2.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c"
-dependencies = [
- "byteorder",
-]
-
 [[package]]
 name = "getrandom"
 version = "0.2.16"
@@ -383,35 +344,29 @@ dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
+ "wasi",
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "getrandom"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26145e563e54f2cadc477553f1ec5ee650b00862f0a58bcd12cbdc5f0ea2d2f4"
+checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd"
 dependencies = [
  "cfg-if",
  "js-sys",
  "libc",
  "r-efi",
- "wasi 0.14.2+wasi-0.2.4",
+ "wasip2",
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "gimli"
-version = "0.31.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
-
 [[package]]
 name = "hashbrown"
-version = "0.15.4"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5971ac85611da7067dbfcabef3c70ebb5606018acd9e2a3903a0da507521e0d5"
+checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d"
 dependencies = [
  "allocator-api2",
  "equivalent",
@@ -477,18 +432,20 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
 
 [[package]]
 name = "hyper"
-version = "1.6.0"
+version = "1.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
+checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
 dependencies = [
+ "atomic-waker",
  "bytes",
  "futures-channel",
- "futures-util",
+ "futures-core",
  "http",
  "http-body",
  "httparse",
  "itoa",
  "pin-project-lite",
+ "pin-utils",
  "smallvec",
  "tokio",
  "want",
@@ -513,9 +470,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8d9b05277c7e8da2c93a568989bb6207bef0112e8d17df7a6eda4a3cf143bc5e"
+checksum = "3c6995591a8f1380fcb4ba966a252a4b29188d51d2b89e3a252f5305be65aea8"
 dependencies = [
  "base64",
  "bytes",
@@ -529,7 +486,7 @@ dependencies = [
  "libc",
  "percent-encoding",
  "pin-project-lite",
- "socket2 0.6.0",
+ "socket2",
  "tokio",
  "tower-service",
  "tracing",
@@ -537,9 +494,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.63"
+version = "0.1.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
+checksum = "33e57f83510bb73707521ebaffa789ec8caf86f9657cad665b092b581d40e9fb"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -561,9 +518,9 @@ dependencies = [
 
 [[package]]
 name = "icu_collections"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "200072f5d0e3614556f94a9930d5dc3e0662a652823904c3a75dc3b0af7fee47"
+checksum = "4c6b649701667bbe825c3b7e6388cb521c23d88644678e83c0c4d0a621a34b43"
 dependencies = [
  "displaydoc",
  "potential_utf",
@@ -574,9 +531,9 @@ dependencies = [
 
 [[package]]
 name = "icu_locale_core"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cde2700ccaed3872079a65fb1a78f6c0a36c91570f28755dda67bc8f7d9f00a"
+checksum = "edba7861004dd3714265b4db54a3c390e880ab658fec5f7db895fae2046b5bb6"
 dependencies = [
  "displaydoc",
  "litemap",
@@ -587,11 +544,10 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "436880e8e18df4d7bbc06d58432329d6458cc84531f7ac5f024e93deadb37979"
+checksum = "5f6c8828b67bf8908d82127b2054ea1b4427ff0230ee9141c54251934ab1b599"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_normalizer_data",
  "icu_properties",
@@ -602,42 +558,38 @@ dependencies = [
 
 [[package]]
 name = "icu_normalizer_data"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00210d6893afc98edb752b664b8890f0ef174c8adbb8d0be9710fa66fbbf72d3"
+checksum = "7aedcccd01fc5fe81e6b489c15b247b8b0690feb23304303a9e560f37efc560a"
 
 [[package]]
 name = "icu_properties"
-version = "2.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "016c619c1eeb94efb86809b015c58f479963de65bdb6253345c1a1276f22e32b"
+checksum = "e93fcd3157766c0c8da2f8cff6ce651a31f0810eaa1c51ec363ef790bbb5fb99"
 dependencies = [
- "displaydoc",
  "icu_collections",
  "icu_locale_core",
  "icu_properties_data",
  "icu_provider",
- "potential_utf",
  "zerotrie",
  "zerovec",
 ]
 
 [[package]]
 name = "icu_properties_data"
-version = "2.0.1"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "298459143998310acd25ffe6810ed544932242d3f07083eee1084d83a71bd632"
+checksum = "02845b3647bb045f1100ecd6480ff52f34c35f82d9880e029d329c21d1054899"
 
 [[package]]
 name = "icu_provider"
-version = "2.0.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03c80da27b5f4187909049ee2d72f276f0d9f99a42c306bd0131ecfe04d8e5af"
+checksum = "85962cf0ce02e1e0a629cc34e7ca3e373ce20dda4c4d7294bbd0bf1fdb59e614"
 dependencies = [
  "displaydoc",
  "icu_locale_core",
- "stable_deref_trait",
- "tinystr",
  "writeable",
  "yoke",
  "zerofrom",
@@ -647,9 +599,9 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "1.0.3"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "686f825264d630750a544639377bae737628043f20d38bbc029e8f29ea968a7e"
+checksum = "3b0875f23caa03898994f6ddc501886a45c7d3d62d04d2d90788d47be1b1e4de"
 dependencies = [
  "idna_adapter",
  "smallvec",
@@ -668,9 +620,9 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.10.0"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe4cd85333e22411419a0bcae1297d25e58c9443848b11dc6a86fefe8c78a661"
+checksum = "6717a8d2a5a929a1a2eb43a12812498ed141a0bcfb7e8f7844fbdbe4303bba9f"
 dependencies = [
  "equivalent",
  "hashbrown",
@@ -678,19 +630,11 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "2.0.6"
+version = "2.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
-
-[[package]]
-name = "io-uring"
-version = "0.7.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d93587f37623a1a17d94ef2bc9ada592f5465fe7732084ab7beefabe5c77c0c4"
+checksum = "79cf5c93f93228cf8efb3ba362535fb11199ac548a09ce117c9b1adc3030d706"
 dependencies = [
- "bitflags",
- "cfg-if",
- "libc",
+ "rustversion",
 ]
 
 [[package]]
@@ -701,9 +645,9 @@ checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130"
 
 [[package]]
 name = "iri-string"
-version = "0.7.8"
+version = "0.7.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbc5ebe9c3a1a7a5127f920a418f7585e9e758e911d0466ed004f393b0e380b2"
+checksum = "4f867b9d1d896b67beb18518eda36fdb77a32ea590de864f1325b294a6d14397"
 dependencies = [
  "memchr",
  "serde",
@@ -717,9 +661,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
 [[package]]
 name = "js-sys"
-version = "0.3.77"
+version = "0.3.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
+checksum = "b011eec8cc36da2aab2d5cff675ec18454fad408585853910a202391cf9f8e65"
 dependencies = [
  "once_cell",
  "wasm-bindgen",
@@ -727,37 +671,36 @@ dependencies = [
 
 [[package]]
 name = "libc"
-version = "0.2.174"
+version = "0.2.177"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
+checksum = "2874a2af47a2325c2001a6e6fad9b16a53b802102b528163885171cf92b15976"
 
 [[package]]
 name = "litemap"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "241eaef5fd12c88705a01fc1066c48c4b36e0dd4377dcdc7ec3942cea7a69956"
+checksum = "6373607a59f0be73a39b6fe456b8192fcc3585f602af20751600e974dd455e77"
 
 [[package]]
 name = "lock_api"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
+checksum = "224399e74b87b5f3557511d98dff8b14089b3dadafcab6bb93eab67d3aace965"
 dependencies = [
- "autocfg",
  "scopeguard",
 ]
 
 [[package]]
 name = "log"
-version = "0.4.27"
+version = "0.4.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
 
 [[package]]
 name = "lru"
-version = "0.16.0"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86ea4e65087ff52f3862caff188d489f1fab49a0cb09e01b2e3f1a617b10aaed"
+checksum = "96051b46fc183dc9cd4a223960ef37b9af631b55191852a8274bfef064cda20f"
 dependencies = [
  "hashbrown",
 ]
@@ -798,9 +741,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.5"
+version = "2.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
 
 [[package]]
 name = "memoffset"
@@ -811,24 +754,15 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "miniz_oxide"
-version = "0.8.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316"
-dependencies = [
- "adler2",
-]
-
 [[package]]
 name = "mio"
-version = "1.0.4"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78bed444cc8a2160f01cbcf811ef18cac863ad68ae8ca62092e8db51d51c761c"
+checksum = "69d83b0086dc8ecf3ce9ae2874b2d1290252e2a30720bea58a5c6639b0092873"
 dependencies = [
  "libc",
- "wasi 0.11.1+wasi-snapshot-preview1",
- "windows-sys 0.59.0",
+ "wasi",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
@@ -846,15 +780,6 @@ dependencies = [
  "autocfg",
 ]
 
-[[package]]
-name = "object"
-version = "0.36.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
-dependencies = [
- "memchr",
-]
-
 [[package]]
 name = "once_cell"
 version = "1.21.3"
@@ -863,9 +788,9 @@ checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
 
 [[package]]
 name = "parking_lot"
-version = "0.12.4"
+version = "0.12.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
+checksum = "93857453250e3077bd71ff98b6a65ea6621a19bb0f559a85248955ac12c45a1a"
 dependencies = [
  "lock_api",
  "parking_lot_core",
@@ -873,22 +798,22 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.11"
+version = "0.9.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
+checksum = "2621685985a2ebf1c516881c026032ac7deafcda1a2c9b7850dc81e3dfcb64c1"
 dependencies = [
  "cfg-if",
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets",
+ "windows-link",
 ]
 
 [[package]]
 name = "percent-encoding"
-version = "2.3.1"
+version = "2.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
+checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220"
 
 [[package]]
 name = "phf"
@@ -962,9 +887,9 @@ checksum = "f84267b20a16ea918e43c6a88433c2d54fa145c92a811b5b047ccbe153674483"
 
 [[package]]
 name = "potential_utf"
-version = "0.1.2"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5a7c30837279ca13e7c867e9e40053bc68740f988cb07f7ca6df43cc734b585"
+checksum = "b73949432f5e2a09657003c25bca5e19a0e9c84f8058ca374f49e0ebe605af77"
 dependencies = [
  "zerovec",
 ]
@@ -986,18 +911,18 @@ checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c"
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.95"
+version = "1.0.103"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
+checksum = "5ee95bc4ef87b8d5ba32e8b7714ccc834865276eab0aed5c9958d00ec45f49e8"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "pyo3"
-version = "0.25.1"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8970a78afe0628a3e3430376fc5fd76b6b45c4d43360ffd6cdd40bdde72b682a"
+checksum = "37a6df7eab65fc7bee654a421404947e10a0f7085b6951bf2ea395f4659fb0cf"
 dependencies = [
  "indoc",
  "libc",
@@ -1012,11 +937,10 @@ dependencies = [
 
 [[package]]
 name = "pyo3-build-config"
-version = "0.25.1"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "458eb0c55e7ece017adeba38f2248ff3ac615e53660d7c71a238d7d2a01c7598"
+checksum = "f77d387774f6f6eec64a004eac0ed525aab7fa1966d94b42f743797b3e395afb"
 dependencies = [
- "once_cell",
  "target-lexicon",
 ]
 
@@ -1028,9 +952,9 @@ checksum = "4bf83fcee540452241ba030140f50418b973e840a64727c967b9266660f0a690"
 
 [[package]]
 name = "pyo3-ffi"
-version = "0.25.1"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7114fe5457c61b276ab77c5055f206295b812608083644a5c5b2640c3102565c"
+checksum = "2dd13844a4242793e02df3e2ec093f540d948299a6a77ea9ce7afd8623f542be"
 dependencies = [
  "libc",
  "pyo3-build-config",
@@ -1038,9 +962,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros"
-version = "0.25.1"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8725c0a622b374d6cb051d11a0983786448f7785336139c3c94f5aa6bef7e50"
+checksum = "eaf8f9f1108270b90d3676b8679586385430e5c0bb78bb5f043f95499c821a71"
 dependencies = [
  "proc-macro2",
  "pyo3-macros-backend",
@@ -1050,9 +974,9 @@ dependencies = [
 
 [[package]]
 name = "pyo3-macros-backend"
-version = "0.25.1"
+version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4109984c22491085343c05b0dbc54ddc405c3cf7b4374fc533f5c3313a572ccc"
+checksum = "70a3b2274450ba5288bc9b8c1b69ff569d1d61189d4bff38f8d22e03d17f932b"
 dependencies = [
  "heck",
  "proc-macro2",
@@ -1063,9 +987,9 @@ dependencies = [
 
 [[package]]
 name = "quinn"
-version = "0.11.8"
+version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8"
+checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
 dependencies = [
  "bytes",
  "cfg_aliases",
@@ -1074,7 +998,7 @@ dependencies = [
  "quinn-udp",
  "rustc-hash",
  "rustls",
- "socket2 0.5.10",
+ "socket2",
  "thiserror",
  "tokio",
  "tracing",
@@ -1083,12 +1007,12 @@ dependencies = [
 
 [[package]]
 name = "quinn-proto"
-version = "0.11.12"
+version = "0.11.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e"
+checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
 dependencies = [
  "bytes",
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
  "lru-slab",
  "rand 0.9.2",
  "ring",
@@ -1104,23 +1028,23 @@ dependencies = [
 
 [[package]]
 name = "quinn-udp"
-version = "0.5.13"
+version = "0.5.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970"
+checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
 dependencies = [
  "cfg_aliases",
  "libc",
  "once_cell",
- "socket2 0.5.10",
+ "socket2",
  "tracing",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.40"
+version = "1.0.42"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
+checksum = "a338cc41d27e6cc6dce6cefc13a0729dfbb81c262b1f519331575dd80ef3067f"
 dependencies = [
  "proc-macro2",
 ]
@@ -1172,14 +1096,14 @@ version = "0.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "99d9a13982dcf210057a8a78572b2217b667c3beacbf3a0d8b454f6f82837d38"
 dependencies = [
- "getrandom 0.3.3",
+ "getrandom 0.3.4",
 ]
 
 [[package]]
 name = "rayon"
-version = "1.10.0"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa"
+checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f"
 dependencies = [
  "either",
  "rayon-core",
@@ -1187,9 +1111,9 @@ dependencies = [
 
 [[package]]
 name = "rayon-core"
-version = "1.12.1"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2"
+checksum = "22e18b0f0062d30d4230b2e85ff77fdfe4326feb054b9783a3460d8435c8ab91"
 dependencies = [
  "crossbeam-deque",
  "crossbeam-utils",
@@ -1197,18 +1121,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.16"
+version = "0.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7251471db004e509f4e75a62cca9435365b5ec7bcdff530d612ac7c87c44a792"
+checksum = "ed2bf2547551a7053d6fdfafda3f938979645c44812fbfcda098faae3f1a362d"
 dependencies = [
  "bitflags",
 ]
 
 [[package]]
 name = "reqwest"
-version = "0.12.22"
+version = "0.12.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531"
+checksum = "9d0946410b9f7b082a427e4ef5c8ff541a88b357bc6c637c40db3a68ac70a36f"
 dependencies = [
  "base64",
  "bytes",
@@ -1258,12 +1182,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "rustc-demangle"
-version = "0.1.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "989e6739f80c4ad5b13e0fd7fe89531180375b18520cc8c82080e4dc4035b84f"
-
 [[package]]
 name = "rustc-hash"
 version = "2.1.1"
@@ -1272,9 +1190,9 @@ checksum = "357703d41365b4b27c590e3ed91eabb1b663f07c4c084095e60cbed4362dff0d"
 
 [[package]]
 name = "rustls"
-version = "0.23.29"
+version = "0.23.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2491382039b29b9b11ff08b76ff6c97cf287671dbb74f0be44bda389fffe9bd1"
+checksum = "533f54bc6a7d4f647e46ad909549eda97bf5afc1585190ef692b4286b198bd8f"
 dependencies = [
  "once_cell",
  "ring",
@@ -1286,9 +1204,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-pki-types"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "229a4a4c221013e7e1f1a043678c5cc39fe5171437c88fb47151a21e6f5b5c79"
+checksum = "94182ad936a0c91c324cd46c6511b9510ed16af436d7b5bab34beab0afd55f7a"
 dependencies = [
  "web-time",
  "zeroize",
@@ -1296,9 +1214,9 @@ dependencies = [
 
 [[package]]
 name = "rustls-webpki"
-version = "0.103.4"
+version = "0.103.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a17884ae0c1b773f1ccd2bd4a8c72f16da897310a98b0e84bf349ad5ead92fc"
+checksum = "2ffdfa2f5286e2247234e03f680868ac2815974dc39e00ea15adc445d0aafe52"
 dependencies = [
  "ring",
  "rustls-pki-types",
@@ -1307,9 +1225,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.21"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d"
+checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d"
 
 [[package]]
 name = "ryu"
@@ -1325,46 +1243,57 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "selectors"
-version = "0.30.0"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3df44ba8a7ca7a4d28c589e04f526266ed76b6cc556e33fe69fa25de31939a65"
+checksum = "09975d3195f34dce9c7b381cb0f00c3c13381d4d3735c0f1a9c894b283b302ab"
 dependencies = [
  "bitflags",
  "cssparser",
  "derive_more",
- "fxhash",
  "log",
  "new_debug_unreachable",
  "phf",
  "phf_codegen",
  "precomputed-hash",
+ "rustc-hash",
  "servo_arc",
  "smallvec",
 ]
 
 [[package]]
 name = "semver"
-version = "1.0.26"
+version = "1.0.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6fa9c48d24d85fb3de5ad847117517440f6beceb7798af16b4a87d616b8d0"
+checksum = "d767eb0aabc880b29956c35734170f26ed551a859dbd361d140cdbeca61ab1e2"
 dependencies = [
  "serde",
+ "serde_core",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
+checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e"
+dependencies = [
+ "serde_core",
+ "serde_derive",
+]
+
+[[package]]
+name = "serde_core"
+version = "1.0.228"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "41d385c7d4ca58e59fc732af25c3983b67ac852c1a25000afe1175de458b67ad"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.219"
+version = "1.0.228"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
+checksum = "d540f220d3187173da220f885ab66608367b6574e925011a9353e4badda91d79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1373,14 +1302,15 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.141"
+version = "1.0.145"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30b9eff21ebe718216c6ec64e1d9ac57087aad11efc64e32002bce4a0d4c03d3"
+checksum = "402a6f66d8c709116cf22f558eab210f5a50187f702eb4d7e5ef38d9a7f1c79c"
 dependencies = [
  "itoa",
  "memchr",
  "ryu",
  "serde",
+ "serde_core",
 ]
 
 [[package]]
@@ -1427,9 +1357,9 @@ checksum = "56199f7ddabf13fe5074ce809e7d3f42b42ae711800501b5b16ea82ad029c39d"
 
 [[package]]
 name = "slab"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dc19736151f35336d325007ac991178d504a119863a2fcb3758cdb5e52c50d"
+checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589"
 
 [[package]]
 name = "smallvec"
@@ -1439,29 +1369,19 @@ checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
 
 [[package]]
 name = "socket2"
-version = "0.5.10"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
+checksum = "17129e116933cf371d018bb80ae557e889637989d8638274fb25622827b03881"
 dependencies = [
  "libc",
- "windows-sys 0.52.0",
-]
-
-[[package]]
-name = "socket2"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233504af464074f9d066d7b5416c5f9b894a5862a6506e306f7b816cdd6f1807"
-dependencies = [
- "libc",
- "windows-sys 0.59.0",
+ "windows-sys 0.60.2",
 ]
 
 [[package]]
 name = "stable_deref_trait"
-version = "1.2.0"
+version = "1.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
+checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
 [[package]]
 name = "string_cache"
@@ -1496,9 +1416,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
-version = "2.0.104"
+version = "2.0.109"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
+checksum = "2f17c7e013e88258aa9543dcbe81aca68a667a9ac37cd69c9fbc07858bfe0e2f"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1527,9 +1447,9 @@ dependencies = [
 
 [[package]]
 name = "target-lexicon"
-version = "0.13.2"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a"
+checksum = "df7f62577c25e07834649fc3b39fafdc597c0a3527dc1c60129201ccfcbaa50c"
 
 [[package]]
 name = "tendril"
@@ -1544,18 +1464,18 @@ dependencies = [
 
 [[package]]
 name = "thiserror"
-version = "2.0.12"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
+checksum = "f63587ca0f12b72a0600bcba1d40081f830876000bb46dd2337a3051618f4fc8"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "2.0.12"
+version = "2.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
+checksum = "3ff15c8ecd7de3849db632e14d18d2571fa09dfc5ed93479bc4485c7a517c913"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1564,9 +1484,9 @@ dependencies = [
 
 [[package]]
 name = "tinystr"
-version = "0.8.1"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d4f6d1145dcb577acf783d4e601bc1d76a13337bb54e6233add580b07344c8b"
+checksum = "42d3e9c45c09de15d06dd8acf5f4e0e399e85927b7f00711024eb7ae10fa4869"
 dependencies = [
  "displaydoc",
  "zerovec",
@@ -1574,9 +1494,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.9.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
+checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -1589,26 +1509,23 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.47.0"
+version = "1.48.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43864ed400b6043a4757a25c7a64a8efde741aed79a056a2fb348a406701bb35"
+checksum = "ff360e02eab121e0bc37a2d3b4d4dc622e6eda3a8e5253d5435ecf5bd4c68408"
 dependencies = [
- "backtrace",
  "bytes",
- "io-uring",
  "libc",
  "mio",
  "pin-project-lite",
- "slab",
- "socket2 0.6.0",
- "windows-sys 0.59.0",
+ "socket2",
+ "windows-sys 0.61.2",
 ]
 
 [[package]]
 name = "tokio-rustls"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8e727b36a1a0e8b74c376ac2211e40c2c8af09fb4013c60d910495810f008e9b"
+checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
  "rustls",
  "tokio",
@@ -1727,9 +1644,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.18"
+version = "1.0.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
+checksum = "9312f7c4f6ff9069b165498234ce8be658059c6728633667c526e27dc2cf1df5"
 
 [[package]]
 name = "unindent"
@@ -1745,13 +1662,14 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.4"
+version = "2.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "32f8b686cadd1473f4bd0117a5d28d36b1ade384ea9b5069a1c40aefed7fda60"
+checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
 dependencies = [
  "form_urlencoded",
  "idna",
  "percent-encoding",
+ "serde",
 ]
 
 [[package]]
@@ -1782,45 +1700,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b"
 
 [[package]]
-name = "wasi"
-version = "0.14.2+wasi-0.2.4"
+name = "wasip2"
+version = "1.0.1+wasi-0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9683f9a5a998d873c0d21fcbe3c083009670149a8fab228644b8bd36b2c48cb3"
+checksum = "0562428422c63773dad2c345a1882263bbf4d65cf3f42e90921f787ef5ad58e7"
 dependencies = [
- "wit-bindgen-rt",
+ "wit-bindgen",
 ]
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.100"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
+checksum = "da95793dfc411fbbd93f5be7715b0578ec61fe87cb1a42b12eb625caa5c5ea60"
 dependencies = [
  "cfg-if",
  "once_cell",
  "rustversion",
  "wasm-bindgen-macro",
-]
-
-[[package]]
-name = "wasm-bindgen-backend"
-version = "0.2.100"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
-dependencies = [
- "bumpalo",
- "log",
- "proc-macro2",
- "quote",
- "syn",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.50"
+version = "0.4.55"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "555d470ec0bc3bb57890405e5d4322cc9ea83cebb085523ced7be4144dac1e61"
+checksum = "551f88106c6d5e7ccc7cd9a16f312dd3b5d36ea8b4954304657d5dfba115d4a0"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -1831,9 +1736,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.100"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
+checksum = "04264334509e04a7bf8690f2384ef5265f05143a4bff3889ab7a3269adab59c2"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -1841,31 +1746,31 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.100"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
+checksum = "420bc339d9f322e562942d52e115d57e950d12d88983a14c79b86859ee6c7ebc"
 dependencies = [
+ "bumpalo",
  "proc-macro2",
  "quote",
  "syn",
- "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.100"
+version = "0.2.105"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
+checksum = "76f218a38c84bcb33c25ec7059b07847d465ce0e0a76b995e134a45adcb6af76"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "web-sys"
-version = "0.3.77"
+version = "0.3.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33b6dd2ef9186f1f2072e409e99cd22a975331a6b3591b12c764e0e55c60d5d2"
+checksum = "3a1f95c0d03a47f4ae1f7a64643a6bb97465d9b740f0fa8f90ea33915c99a9a1"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -1895,18 +1800,18 @@ dependencies = [
 
 [[package]]
 name = "webpki-roots"
-version = "1.0.2"
+version = "1.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e8983c3ab33d6fb807cfcdad2491c4ea8cbc8ed839181c7dfd9c67c83e261b2"
+checksum = "b2878ef029c47c6e8cf779119f20fcf52bde7ad42a731b2a304bc221df17571e"
 dependencies = [
  "rustls-pki-types",
 ]
 
 [[package]]
 name = "windows-core"
-version = "0.61.2"
+version = "0.62.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3"
+checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb"
 dependencies = [
  "windows-implement",
  "windows-interface",
@@ -1917,9 +1822,9 @@ dependencies = [
 
 [[package]]
 name = "windows-implement"
-version = "0.60.0"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
+checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1928,9 +1833,9 @@ dependencies = [
 
 [[package]]
 name = "windows-interface"
-version = "0.59.1"
+version = "0.59.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
+checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -1939,24 +1844,24 @@ dependencies = [
 
 [[package]]
 name = "windows-link"
-version = "0.1.3"
+version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6ad25900d524eaabdbbb96d20b4311e1e7ae1699af4fb28c17ae66c80d798a"
+checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5"
 
 [[package]]
 name = "windows-result"
-version = "0.3.4"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6"
+checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5"
 dependencies = [
  "windows-link",
 ]
 
 [[package]]
 name = "windows-strings"
-version = "0.4.2"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57"
+checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091"
 dependencies = [
  "windows-link",
 ]
@@ -1967,16 +1872,25 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
 name = "windows-sys"
-version = "0.59.0"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.53.5",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc"
+dependencies = [
+ "windows-link",
 ]
 
 [[package]]
@@ -1985,14 +1899,31 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc",
- "windows_i686_gnu",
- "windows_i686_gnullvm",
- "windows_i686_msvc",
- "windows_x86_64_gnu",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
+dependencies = [
+ "windows-link",
+ "windows_aarch64_gnullvm 0.53.1",
+ "windows_aarch64_msvc 0.53.1",
+ "windows_i686_gnu 0.53.1",
+ "windows_i686_gnullvm 0.53.1",
+ "windows_i686_msvc 0.53.1",
+ "windows_x86_64_gnu 0.53.1",
+ "windows_x86_64_gnullvm 0.53.1",
+ "windows_x86_64_msvc 0.53.1",
 ]
 
 [[package]]
@@ -2001,42 +1932,84 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
+
 [[package]]
 name = "windows_i686_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"
@@ -2044,36 +2017,38 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
-name = "winnow"
-version = "0.7.12"
+name = "windows_x86_64_msvc"
+version = "0.53.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95"
+checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
+
+[[package]]
+name = "winnow"
+version = "0.7.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21a0236b59786fed61e2a80582dd500fe61f18b5dca67a4a067d0bc9039339cf"
 dependencies = [
  "memchr",
 ]
 
 [[package]]
-name = "wit-bindgen-rt"
-version = "0.39.0"
+name = "wit-bindgen"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f42320e61fe2cfd34354ecb597f86f413484a798ba44a8ca1165c58d42da6c1"
-dependencies = [
- "bitflags",
-]
+checksum = "f17a85883d4e6d00e8a97c586de764dabcc06133f7f1d55dce5cdc070ad7fe59"
 
 [[package]]
 name = "writeable"
-version = "0.6.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea2f10b9bb0928dfb1b42b65e1f9e36f7f54dbdf08457afefb38afcdec4fa2bb"
+checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9"
 
 [[package]]
 name = "yoke"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f41bb01b8226ef4bfd589436a297c53d118f65921786300e427be8d487695cc"
+checksum = "72d6e5c6afb84d73944e5cedb052c4680d5657337201555f9f2a16b7406d4954"
 dependencies = [
- "serde",
  "stable_deref_trait",
  "yoke-derive",
  "zerofrom",
@@ -2081,9 +2056,9 @@ dependencies = [
 
 [[package]]
 name = "yoke-derive"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38da3c9736e16c5d3c8c597a9aaa5d1fa565d0532ae05e27c24aa62fb32c0ab6"
+checksum = "b659052874eb698efe5b9e8cf382204678a0086ebf46982b79d6ca3182927e5d"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2093,18 +2068,18 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.8.26"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1039dd0d3c310cf05de012d8a39ff557cb0d23087fd44cad61df08fc31907a2f"
+checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.8.26"
+version = "0.8.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ecf5b4cc5364572d7f4c329661bcc82724222973f2cab6f050a4e5c22f75181"
+checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2134,15 +2109,15 @@ dependencies = [
 
 [[package]]
 name = "zeroize"
-version = "1.8.1"
+version = "1.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
 
 [[package]]
 name = "zerotrie"
-version = "0.2.2"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f0bbd478583f79edad978b407914f61b2972f5af6fa089686016be8f9af595"
+checksum = "2a59c17a5562d507e4b54960e8569ebee33bee890c70aa3fe7b97e85a9fd7851"
 dependencies = [
  "displaydoc",
  "yoke",
@@ -2151,9 +2126,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec"
-version = "0.11.2"
+version = "0.11.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a05eb080e015ba39cc9e23bbe5e7fb04d5fb040350f99f34e338d5fdd294428"
+checksum = "6c28719294829477f525be0186d13efa9a3c602f7ec202ca9e353d310fb9a002"
 dependencies = [
  "yoke",
  "zerofrom",
@@ -2162,9 +2137,9 @@ dependencies = [
 
 [[package]]
 name = "zerovec-derive"
-version = "0.11.1"
+version = "0.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b96237efa0c878c64bd89c436f661be4e46b2f3eff1ebb976f7ef2321d2f58f"
+checksum = "eadce39539ca5cb3985590102671f2567e659fca9666581ad3411d59207951f3"
 dependencies = [
  "proc-macro2",
  "quote",
diff --git a/pkgs/development/python-modules/css-inline/default.nix b/pkgs/development/python-modules/css-inline/default.nix
index cb58bb88517a..50ca2b9ed9dc 100644
--- a/pkgs/development/python-modules/css-inline/default.nix
+++ b/pkgs/development/python-modules/css-inline/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "css-inline";
-  version = "0.17.0";
+  version = "0.18.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "Stranger6667";
     repo = "css-inline";
     rev = "python-v${version}";
-    hash = "sha256-RclMgVJpK2dOtuFKearRMK8rpa6vFTa8T3Z+A7mk7Zs=";
+    hash = "sha256-sJOt7CX02uoECdki0iUZin4sAIgLafBLb5kjXEgYcYg=";
   };
 
   postPatch = ''
@@ -43,7 +43,7 @@ buildPythonPackage rec {
       cd bindings/python
       ln -s ${./Cargo.lock} Cargo.lock
     '';
-    hash = "sha256-WvUlumpXVLiu9htY07wfGyibro2StWgYF7XVW411ePw=";
+    hash = "sha256-LpknrrsIZ38NlQDMGpiA7cftspvCo/mQ8KAwKRkdVEc=";
   };
 
   nativeBuildInputs = [

From 3e07bc512faa338abcf406c418354de4970676bf Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 6 Nov 2025 23:46:44 +0000
Subject: [PATCH 6044/6226] magic-vlsi: 8.3.570 -> 8.3.573

---
 pkgs/by-name/ma/magic-vlsi/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ma/magic-vlsi/package.nix b/pkgs/by-name/ma/magic-vlsi/package.nix
index a9e69721d3e1..5735194590b4 100644
--- a/pkgs/by-name/ma/magic-vlsi/package.nix
+++ b/pkgs/by-name/ma/magic-vlsi/package.nix
@@ -18,13 +18,13 @@
 
 stdenv.mkDerivation rec {
   pname = "magic-vlsi";
-  version = "8.3.570";
+  version = "8.3.573";
 
   src = fetchFromGitHub {
     owner = "RTimothyEdwards";
     repo = "magic";
     tag = "${version}";
-    sha256 = "sha256-ytITe6NtCqD1HTKry8O2famVkhB1+txIIa8UQlXa9qM=";
+    sha256 = "sha256-P5qfMsn3DGHjeF7zsZWeG9j38C6j5UEwUqGyjaEVO1E=";
     leaveDotGit = true;
   };
 

From 5d84757d867f3c000b8b24920536487fb4e70bb1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 00:06:12 +0000
Subject: [PATCH 6045/6226] python3Packages.wgpu-py: 0.26.0 -> 0.27.0

---
 pkgs/development/python-modules/wgpu-py/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/wgpu-py/default.nix b/pkgs/development/python-modules/wgpu-py/default.nix
index affdc5361208..93b55c8d8f69 100644
--- a/pkgs/development/python-modules/wgpu-py/default.nix
+++ b/pkgs/development/python-modules/wgpu-py/default.nix
@@ -39,14 +39,14 @@
 }:
 buildPythonPackage rec {
   pname = "wgpu-py";
-  version = "0.26.0";
+  version = "0.27.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pygfx";
     repo = "wgpu-py";
     tag = "v${version}";
-    hash = "sha256-TaWrodP1KtCLIKi+NOnq2U7CLGVEhnlJilD6Txt7vgo=";
+    hash = "sha256-PCZaPG2e6KpV6NDYrnsZIb/rO0/su/dA65s85+/V0HY=";
   };
 
   postPatch =

From 8f0acc6c2242011f3f9dbab2624ac3373fb72cb8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 00:12:28 +0000
Subject: [PATCH 6046/6226] doctl: 1.145.0 -> 1.147.0

---
 pkgs/by-name/do/doctl/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/do/doctl/package.nix b/pkgs/by-name/do/doctl/package.nix
index b7108cc4109f..869ce5f633a0 100644
--- a/pkgs/by-name/do/doctl/package.nix
+++ b/pkgs/by-name/do/doctl/package.nix
@@ -9,7 +9,7 @@
 
 buildGoModule rec {
   pname = "doctl";
-  version = "1.145.0";
+  version = "1.147.0";
 
   vendorHash = null;
 
@@ -42,7 +42,7 @@ buildGoModule rec {
     owner = "digitalocean";
     repo = "doctl";
     tag = "v${version}";
-    hash = "sha256-JeIpx+i1JDVfJqCKTZMTJ7rDMGO4yA/eR56C3qr08zg=";
+    hash = "sha256-Z7oI35JYM4kVYAu9rspOgj6Cec9R7toUoMxgogkkYzk=";
   };
 
   meta = {

From 3158a6bbf4f73e01f36758cadff5595e0f786cda Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 01:03:27 +0000
Subject: [PATCH 6047/6226] zed-editor: 0.210.4 -> 0.211.6

---
 pkgs/by-name/ze/zed-editor/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix
index bbd8b88a2f43..33ad77f07b85 100644
--- a/pkgs/by-name/ze/zed-editor/package.nix
+++ b/pkgs/by-name/ze/zed-editor/package.nix
@@ -101,7 +101,7 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "zed-editor";
-  version = "0.210.4";
+  version = "0.211.6";
 
   outputs = [
     "out"
@@ -114,7 +114,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     owner = "zed-industries";
     repo = "zed";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-xSADK/LAbcb47Hd66p+11GuylOFSsbNTVtJtiVOylNQ=";
+    hash = "sha256-JlRsiQHDsQ80/8aM0trCrfvEAAXQtkO75CAKotP1mFs=";
   };
 
   postPatch = ''
@@ -134,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
     rm -r $out/git/*/candle-book/
   '';
 
-  cargoHash = "sha256-bVRDOhjeRwS/j0Lul7JtnvXKUldOYH4dOJhUgMhfeuQ=";
+  cargoHash = "sha256-DHAERsHGDk7bjTi+nCTf75qt6+uGzHLojEzoDCFkVDc=";
 
   nativeBuildInputs = [
     cmake

From 8b4373d05b2db2779dfaac02ccba6d78d575df3b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 01:07:09 +0000
Subject: [PATCH 6048/6226] saga: 9.10.0 -> 9.10.1

---
 pkgs/by-name/sa/saga/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sa/saga/package.nix b/pkgs/by-name/sa/saga/package.nix
index 533797675ed8..cc06ef86f91c 100644
--- a/pkgs/by-name/sa/saga/package.nix
+++ b/pkgs/by-name/sa/saga/package.nix
@@ -43,11 +43,11 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "saga";
-  version = "9.10.0";
+  version = "9.10.1";
 
   src = fetchurl {
     url = "mirror://sourceforge/saga-gis/saga-${finalAttrs.version}.tar.gz";
-    hash = "sha256-xsXOB4WCzkZhH/mIYEUQNiQ9NnX+0CF2IcWkmwEJBUA=";
+    hash = "sha256-6V7KSdaU3TkdsGr6ll7Q8oSH7/rItgSrgN7Fjn+f9dM=";
   };
 
   sourceRoot = "saga-${finalAttrs.version}/saga-gis";

From e306746573ea1f4790f3618b76cf8f7fe325f224 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 01:18:11 +0000
Subject: [PATCH 6049/6226] asusctl: 6.1.16 -> 6.1.17

---
 pkgs/by-name/as/asusctl/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix
index db51d5237c31..aa025acb6583 100644
--- a/pkgs/by-name/as/asusctl/package.nix
+++ b/pkgs/by-name/as/asusctl/package.nix
@@ -18,16 +18,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "asusctl";
-  version = "6.1.16";
+  version = "6.1.17";
 
   src = fetchFromGitLab {
     owner = "asus-linux";
     repo = "asusctl";
     tag = version;
-    hash = "sha256-Ndwzy/2Rg5W1cF6YFjoUtgN1156VZW4Gs1DgJTrmu/w=";
+    hash = "sha256-rNLQYCE7NZAel2fr5VoAMlm7QkH1KrySKdEn2+WMPo8=";
   };
 
-  cargoHash = "sha256-+j682yZx54DXh+45b9GzSD29/aYALI/y1YbmlfQd09Q=";
+  cargoHash = "sha256-/vMVSGUO6Zu/8GSTq1jsXLWVP9sWsuD7fJty3NnKXf4=";
 
   postPatch = ''
     files="

From 86c0e22c9c6d8525950e9dff7b3fdec01b58f16c Mon Sep 17 00:00:00 2001
From: Jet Pham <jetthomaspham@gmail.com>
Date: Wed, 29 Oct 2025 19:32:10 -0700
Subject: [PATCH 6050/6226] code-cursor: 1.7.38 -> 2.0.64

Update code-cursor with new changes as listed in
https://cursor.com/changelog/2-0
---
 pkgs/by-name/co/code-cursor/package.nix | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix
index c0b420dc2d94..174f22f7b21d 100644
--- a/pkgs/by-name/co/code-cursor/package.nix
+++ b/pkgs/by-name/co/code-cursor/package.nix
@@ -16,20 +16,20 @@ let
 
   sources = {
     x86_64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/linux/x64/Cursor-1.7.52-x86_64.AppImage";
-      hash = "sha256-nhDDdXE5/m9uASiQUJ4GHfApkzkf9ju5b8s0h6BhpjQ=";
+      url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/linux/x64/Cursor-2.0.64-x86_64.AppImage";
+      hash = "sha256-zT9GhdwGDWZJQl+WpV2txbmp3/tJRtL6ds1UZQoKNzA=";
     };
     aarch64-linux = fetchurl {
-      url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/linux/arm64/Cursor-1.7.52-aarch64.AppImage";
-      hash = "sha256-96zL0pmcrEyDEy8oW2qWk6RM8XGE4Gd2Aa3Hhq0qvk0=";
+      url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/linux/arm64/Cursor-2.0.64-aarch64.AppImage";
+      hash = "sha256-1pN9LfnplKyVUxlICQ2KsxcAn++dZY9hGR4XubHxLUY=";
     };
     x86_64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/darwin/x64/Cursor-darwin-x64.dmg";
-      hash = "sha256-0//Sv57iEgRm/exnUnKVpdyk6fwxAnx0PDg2mVaB9J8=";
+      url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/darwin/x64/Cursor-darwin-x64.dmg";
+      hash = "sha256-lY5BJeauw5VtWuaAu8C9C2inmKFvv/OnCxOicE2Zs48=";
     };
     aarch64-darwin = fetchurl {
-      url = "https://downloads.cursor.com/production/9675251a06b1314d50ff34b0cbe5109b78f848cd/darwin/arm64/Cursor-darwin-arm64.dmg";
-      hash = "sha256-g8Fk9+MDwzLTNitxJMApypfiLWEjze0PR2OIPC774j8=";
+      url = "https://downloads.cursor.com/production/25412918da7e74b2686b25d62da1f01cfcd27683/darwin/arm64/Cursor-darwin-arm64.dmg";
+      hash = "sha256-IIJbuRdxTG7kSspspWk8GH9KZsKPyLJahz0iqSvP1B0=";
     };
   };
 
@@ -39,7 +39,7 @@ in
   inherit useVSCodeRipgrep;
   commandLineArgs = finalCommandLineArgs;
 
-  version = "1.7.52";
+  version = "2.0.64";
   pname = "cursor";
 
   # You can find the current VSCode version in the About dialog:

From c1ef5db4a36de5268dd95d7bc7d296bed85452aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 01:26:24 +0000
Subject: [PATCH 6051/6226] geographiclib: 2.6 -> 2.7

---
 pkgs/by-name/ge/geographiclib/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ge/geographiclib/package.nix b/pkgs/by-name/ge/geographiclib/package.nix
index c0095d4eb9f3..4d8ab6b869af 100644
--- a/pkgs/by-name/ge/geographiclib/package.nix
+++ b/pkgs/by-name/ge/geographiclib/package.nix
@@ -8,13 +8,13 @@
 
 stdenv.mkDerivation rec {
   pname = "geographiclib";
-  version = "2.6";
+  version = "2.7";
 
   src = fetchFromGitHub {
     owner = "geographiclib";
     repo = "geographiclib";
     tag = "v${version}";
-    hash = "sha256-G0D44iP3ApYlxNxF+hrB20v3X+4gp2p94gQLygqgB3E=";
+    hash = "sha256-xqrt7KeYyYB90kuvn2qmK8VI3RVQuIhNN8qCzV//yko=";
   };
 
   outputs = [

From 82c01dd4778f1ac8e62f55cfa831889bf1add216 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 02:04:11 +0000
Subject: [PATCH 6052/6226] python3Packages.oelint-parser: 8.6.1 -> 8.6.2

---
 pkgs/development/python-modules/oelint-parser/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix
index 237660e41a60..e9e56f98b705 100644
--- a/pkgs/development/python-modules/oelint-parser/default.nix
+++ b/pkgs/development/python-modules/oelint-parser/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "oelint-parser";
-  version = "8.6.1";
+  version = "8.6.2";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "priv-kweihmann";
     repo = "oelint-parser";
     tag = version;
-    hash = "sha256-lKHtKrR5bjBuqBvfsMAIR3K+ERhITBXzrxAvvYopDiM=";
+    hash = "sha256-NpaIOJ517L9k2evuM6/mQc6Da2c+veFOAlRyeUHseKY=";
   };
 
   pythonRelaxDeps = [ "regex" ];

From 80fb5c6710e2f31e7fa67fe2769fcafbacab6042 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 02:14:15 +0000
Subject: [PATCH 6053/6226] scope-tui: 0.3.3 -> 0.3.4

---
 pkgs/by-name/sc/scope-tui/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/sc/scope-tui/package.nix b/pkgs/by-name/sc/scope-tui/package.nix
index 4e45ef1c812c..f2d07b372736 100644
--- a/pkgs/by-name/sc/scope-tui/package.nix
+++ b/pkgs/by-name/sc/scope-tui/package.nix
@@ -9,16 +9,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "scope-tui";
-  version = "0.3.3";
+  version = "0.3.4";
 
   src = fetchFromGitHub {
     owner = "alemidev";
     repo = "scope-tui";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-bVe+Yyv+DcbEC15H968OhQhcFkAm7T5J6aQlKod5ocM=";
+    hash = "sha256-MU9avQt+qFIQzF7GYNNoGiyfBD7eLOMQaBH6lFhLlOY=";
   };
 
-  cargoHash = "sha256-o5pplwNtIe2z88ZwtCHree32kv16U/ryv8PmPIqxtPQ=";
+  cargoHash = "sha256-yAy3kk62HYe1/1EXGUhOg++sZua65iN3ZEmPoERcu0I=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 606a90ce300ed58ea8690c994e28ca0b1d9e678b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 02:15:46 +0000
Subject: [PATCH 6054/6226] grype: 0.102.0 -> 0.103.0

---
 pkgs/by-name/gr/grype/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix
index 552c4ecf8c24..48dff5c9d590 100644
--- a/pkgs/by-name/gr/grype/package.nix
+++ b/pkgs/by-name/gr/grype/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "grype";
-  version = "0.102.0";
+  version = "0.103.0";
 
   src = fetchFromGitHub {
     owner = "anchore";
     repo = "grype";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-aYY/AYHbPWs5Rtbfsvam0lE3WzcJHt6LHQ6us2dukFI=";
+    hash = "sha256-AXhpdEJ0T0GF9DamboT+V4ivadzR3+7HpLQs8O1QTAQ=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -32,7 +32,7 @@ buildGoModule (finalAttrs: {
 
   proxyVendor = true;
 
-  vendorHash = "sha256-N/J+Y3PohhnChOIEn4ZITaKEK62gwuApNf1XEZVL23k=";
+  vendorHash = "sha256-aoqjzF4CSzBZxvAz0vMR4ztUvpLewYi7sSCeSlSiLd0=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From b5b656932d559a5f10e0de0282b1ddb4c7a1e4a1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 02:53:10 +0000
Subject: [PATCH 6055/6226] vscode-extensions.prisma.prisma: 6.18.0 -> 6.19.0

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index b04d7fe3466f..5ab2de45f1b6 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -3768,8 +3768,8 @@ let
         mktplcRef = {
           name = "prisma";
           publisher = "Prisma";
-          version = "6.18.0";
-          hash = "sha256-wStFklnjX+UDykxLjl+vDYnvAgjrqFG4ahDuCX2glwI=";
+          version = "6.19.0";
+          hash = "sha256-IeeKk4gYFq+zTYpKHAOgEh3EC2g6bbb0Qcys2m5DeAo=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/Prisma.prisma/changelog";

From 8a45379dc54d70165f632b68d5c7a1a8ec251cde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 6 Nov 2025 19:15:36 -0800
Subject: [PATCH 6056/6226] python3Packages.ansible: 12.1.0 -> 12.2.0

Changelog: https://github.com/ansible-community/ansible-build-data/blob/12.2.0/12/CHANGELOG-v12.rst
---
 pkgs/development/python-modules/ansible/default.nix | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/ansible/default.nix b/pkgs/development/python-modules/ansible/default.nix
index a61d839246b5..11b07f8c2c19 100644
--- a/pkgs/development/python-modules/ansible/default.nix
+++ b/pkgs/development/python-modules/ansible/default.nix
@@ -1,6 +1,5 @@
 {
   lib,
-  pythonOlder,
   buildPythonPackage,
   fetchPypi,
   setuptools,
@@ -25,17 +24,15 @@
 
 let
   pname = "ansible";
-  version = "12.1.0";
+  version = "12.2.0";
 in
 buildPythonPackage {
   inherit pname version;
   pyproject = true;
 
-  disabled = pythonOlder "3.9";
-
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-It6hk41DP6UVswAc+tZcswjvl8mA8VIBdNBU3TjzLIM=";
+    hash = "sha256-BWPf0z69KMr2zNx6bSKn/a+9nJxC/vyuUXlhalOjUhE=";
   };
 
   # we make ansible-core depend on ansible, not the other way around,

From cf5dad027edd78ae01f248b6ada804892fd7eeff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 6 Nov 2025 19:10:01 -0800
Subject: [PATCH 6057/6226] python3Packages.ansible-core: use fetchFromGitHub

---
 pkgs/development/python-modules/ansible/core.nix | 11 ++++++-----
 pkgs/top-level/all-packages.nix                  |  9 ++++++---
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index d295105a6ef5..0b948d7236db 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   python,
   pythonOlder,
   installShellFiles,
@@ -39,10 +39,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.12";
 
-  src = fetchPypi {
-    pname = "ansible_core";
-    inherit version;
-    hash = "sha256-JDppZpoAe+B5Q2C8RHf3DgEozgCR3Dr0xcuBxqRm9XM=";
+  src = fetchFromGitHub {
+    owner = "ansible";
+    repo = "ansible";
+    tag = "v${version}";
+    hash = "sha256-/Eoq0ixAWoDvrHnxXgDth5TUKZzUDxDTzTDzjSUPugk=";
   };
 
   # ansible_connection is already wrapped, so don't pass it through
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index dcd95dbaf55d..3269a38657a6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6062,7 +6062,8 @@ with pkgs;
   ansible_2_18 = python3Packages.toPythonApplication (
     python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
       version = "2.18.8";
-      src = oldAttrs.src.override {
+      src = fetchPypi {
+        pname = "ansible_core";
         inherit version;
         hash = "sha256-sHZiFalqR845kz0n4emWyivrVM8bOQfHQtNckTsfeM0=";
       };
@@ -6071,7 +6072,8 @@ with pkgs;
   ansible_2_17 = python3Packages.toPythonApplication (
     python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
       version = "2.17.8";
-      src = oldAttrs.src.override {
+      src = fetchPypi {
+        pname = "ansible_core";
         inherit version;
         hash = "sha256-Ob6KeYaix9NgabDZciC8L2eDxl/qfG1+Di0A0ayK+Hc=";
       };
@@ -6080,7 +6082,8 @@ with pkgs;
   ansible_2_16 = python3Packages.toPythonApplication (
     python3Packages.ansible-core.overridePythonAttrs (oldAttrs: rec {
       version = "2.16.14";
-      src = oldAttrs.src.override {
+      src = fetchPypi {
+        pname = "ansible_core";
         inherit version;
         hash = "sha256-gCef/9mGhrrfqjLh7HhdmKbfGy/B5Al97AWXZA10ZBU=";
       };

From 74f658bd1b05dcd19b9828c428b636dc9dcc7b04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 6 Nov 2025 19:11:58 -0800
Subject: [PATCH 6058/6226] python3Packages.ansible-core: 2.19.3 -> 2.19.4

Diff: https://github.com/ansible/ansible/compare/v2.19.3...v2.19.4

Changelog: https://github.com/ansible/ansible/blob/v2.19.4/changelogs/CHANGELOG-v2.19.rst
---
 pkgs/development/python-modules/ansible/core.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/ansible/core.nix b/pkgs/development/python-modules/ansible/core.nix
index 0b948d7236db..fd96ee93aaa1 100644
--- a/pkgs/development/python-modules/ansible/core.nix
+++ b/pkgs/development/python-modules/ansible/core.nix
@@ -34,7 +34,7 @@ buildPythonPackage rec {
   pname = "ansible-core";
   # IMPORTANT: When bumping the minor version (2.XX.0 - the XX), please update pinned package in pkgs/top-level/all-packages.nix
   # There are pinned packages called ansible_2_XX, create a new one with the previous minor version and then update the version here
-  version = "2.19.3";
+  version = "2.19.4";
   pyproject = true;
 
   disabled = pythonOlder "3.12";
@@ -43,7 +43,7 @@ buildPythonPackage rec {
     owner = "ansible";
     repo = "ansible";
     tag = "v${version}";
-    hash = "sha256-/Eoq0ixAWoDvrHnxXgDth5TUKZzUDxDTzTDzjSUPugk=";
+    hash = "sha256-TjafUlPKuxpXrfREK65D88SoGThGBzpbfCHr0ZkviI0=";
   };
 
   # ansible_connection is already wrapped, so don't pass it through

From 7ed27198f4f98df237e266f810c6f84e8be266b4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 03:20:49 +0000
Subject: [PATCH 6059/6226] brave: 1.84.132 -> 1.84.135

---
 pkgs/by-name/br/brave/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix
index 2cbbacccb688..0d4a929b82d1 100644
--- a/pkgs/by-name/br/brave/package.nix
+++ b/pkgs/by-name/br/brave/package.nix
@@ -3,24 +3,24 @@
 
 let
   pname = "brave";
-  version = "1.84.132";
+  version = "1.84.135";
 
   allArchives = {
     aarch64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb";
-      hash = "sha256-/3LF5T/Y7eyjrDZMJ6UtBmjqxSZTsBcJJ6LtDG3Xnvc=";
+      hash = "sha256-DekkbvOpVn+NDSzltiafsS7cE2QbVn47mIaVvXUQUUM=";
     };
     x86_64-linux = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
-      hash = "sha256-UPV4krI4jnXNNL6RjvhO/ftxS53eWernG1YVVI2AXbg=";
+      hash = "sha256-mPZqszSPkMC77eUY+CpTzYbbDKMKt7LoM6lncgBqSFo=";
     };
     aarch64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip";
-      hash = "sha256-FzWiCVwscggFgjKLd4thp1j3A5xMn4AjCSE3PvaBYR0=";
+      hash = "sha256-yC1XS1NdJ6kTd16kK/MlVV5KYoMVgRAr8/JLOdr+r74=";
     };
     x86_64-darwin = {
       url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip";
-      hash = "sha256-CBjBfqy9n5/WH2NBc1GUz13n8KyqhryTx849gMUq+j8=";
+      hash = "sha256-Au42zUX21ZFvfNyrNRb3sWH+c+DGqqGUulbK02Xjrsg=";
     };
   };
 

From f9a2957d688f131ea888ad859a99f7e09da1a8ee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 6 Nov 2025 19:31:45 -0800
Subject: [PATCH 6060/6226] python3Packages.cucumber-expressions: init at
 18.0.1

---
 .../cucumber-expressions/default.nix          | 40 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/development/python-modules/cucumber-expressions/default.nix

diff --git a/pkgs/development/python-modules/cucumber-expressions/default.nix b/pkgs/development/python-modules/cucumber-expressions/default.nix
new file mode 100644
index 000000000000..dd0a28ebe6f2
--- /dev/null
+++ b/pkgs/development/python-modules/cucumber-expressions/default.nix
@@ -0,0 +1,40 @@
+{
+  buildPythonPackage,
+  fetchFromGitHub,
+  lib,
+  poetry-core,
+  pytestCheckHook,
+  pyyaml,
+}:
+
+buildPythonPackage rec {
+  pname = "cucumber-expressions";
+  version = "18.0.1";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "cucumber";
+    repo = "cucumber-expressions";
+    tag = "v${version}";
+    hash = "sha256-Mbf7bG7NvKFdv6kYPkd6UlPDJGjnK2GPl0qnLUhQ3es=";
+  };
+
+  sourceRoot = "${src.name}/python";
+
+  build-system = [ poetry-core ];
+
+  pythonImportsCheck = [ "cucumber_expressions" ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+    pyyaml
+  ];
+
+  meta = {
+    changelog = "https://github.com/cucumber/cucumber-expressions/blob/${src.tag}/CHANGELOG.md";
+    description = "Human friendly alternative to Regular Expressions";
+    homepage = "https://github.com/cucumber/cucumber-expressions/tree/main/python";
+    license = lib.licenses.mit;
+    maintainers = [ lib.maintainers.dotlambda ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3eef16dbee78..7d02dfb75aee 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3218,6 +3218,8 @@ self: super: with self; {
 
   cu2qu = callPackage ../development/python-modules/cu2qu { };
 
+  cucumber-expressions = callPackage ../development/python-modules/cucumber-expressions { };
+
   cucumber-tag-expressions = callPackage ../development/python-modules/cucumber-tag-expressions { };
 
   cupy = callPackage ../development/python-modules/cupy {

From 4bc74b146354ff989108c15de00bfcfd40321340 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 7 Nov 2025 03:33:52 +0000
Subject: [PATCH 6061/6226] models-dev: 0-unstable-2025-11-04 ->
 0-unstable-2025-11-06

---
 pkgs/by-name/mo/models-dev/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mo/models-dev/package.nix b/pkgs/by-name/mo/models-dev/package.nix
index f7baee7d47eb..ad448911bb9c 100644
--- a/pkgs/by-name/mo/models-dev/package.nix
+++ b/pkgs/by-name/mo/models-dev/package.nix
@@ -8,12 +8,12 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "models-dev";
-  version = "0-unstable-2025-11-04";
+  version = "0-unstable-2025-11-06";
   src = fetchFromGitHub {
     owner = "sst";
     repo = "models.dev";
-    rev = "234ba091f2d37ea925e4e38fecd7b3ed661b52a9";
-    hash = "sha256-7djp/VoAWK29tcwD9mDPCTZiGeJKB8puOnlbEMgOqKQ=";
+    rev = "db75a6d97efdd7a3f73cc2c0ebc3f362ebce608c";
+    hash = "sha256-pl6Ra7QPmM15ndl/skxE+XTqWP9oD2olcs+EQFW0U/0=";
   };
 
   node_modules = stdenvNoCC.mkDerivation {

From b39b1fdb234ca14ff4877c669a3b247943c1ab0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 6 Nov 2025 19:20:51 -0800
Subject: [PATCH 6062/6226] python3Packages.behave: 1.2.7.dev5 -> 1.3.3

Diff: https://github.com/behave/behave/compare/v1.2.7.dev5...v1.3.3

Changelog: https://github.com/behave/behave/blob/v1.3.3/CHANGES.rst
---
 .../python-modules/behave/default.nix         | 26 +++++++------------
 1 file changed, 10 insertions(+), 16 deletions(-)

diff --git a/pkgs/development/python-modules/behave/default.nix b/pkgs/development/python-modules/behave/default.nix
index 1600e3e0ed57..3e7ff095fe1c 100644
--- a/pkgs/development/python-modules/behave/default.nix
+++ b/pkgs/development/python-modules/behave/default.nix
@@ -2,17 +2,18 @@
   lib,
   stdenv,
   fetchFromGitHub,
-  fetchpatch2,
   buildPythonPackage,
   python,
-  pythonOlder,
   pytestCheckHook,
   assertpy,
+  chardet,
+  freezegun,
   mock,
   path,
   pyhamcrest,
   pytest-html,
   colorama,
+  cucumber-expressions,
   cucumber-tag-expressions,
   parse,
   parse-type,
@@ -22,41 +23,34 @@
 
 buildPythonPackage rec {
   pname = "behave";
-  version = "1.2.7.dev5";
+  version = "1.3.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "behave";
     repo = "behave";
-    rev = "v${version}";
-    hash = "sha256-G1o0a57MRczwjGLl/tEYC+yx3nxpk6+E58RvR9kVJpA=";
+    tag = "v${version}";
+    hash = "sha256-sHsnBeyl0UJ0f7WcTUc+FhUxATh84RPxVE3TqGYosrs=";
   };
 
-  patches = [
-    # fix tests: https://github.com/behave/behave/pull/1214
-    (fetchpatch2 {
-      url = "https://github.com/behave/behave/pull/1214/commits/98b63a2524eff50ce1dc7360a46462a6f673c5ea.patch?full_index=1";
-      hash = "sha256-MwODEm6vhg/H8ksp5XBBP5Uhu2dhB5B1T6Owkxpy3v0=";
-    })
-  ];
-
   build-system = [ setuptools ];
 
   nativeCheckInputs = [
     pytestCheckHook
     assertpy
+    chardet
+    freezegun
     mock
     path
     pyhamcrest
     pytest-html
   ];
 
-  doCheck = pythonOlder "3.12";
-
   pythonImportsCheck = [ "behave" ];
 
   dependencies = [
     colorama
+    cucumber-expressions
     cucumber-tag-expressions
     parse
     parse-type
@@ -80,7 +74,7 @@ buildPythonPackage rec {
   '';
 
   meta = with lib; {
-    changelog = "https://github.com/behave/behave/blob/${src.rev}/CHANGES.rst";
+    changelog = "https://github.com/behave/behave/blob/${src.tag}/CHANGES.rst";
     homepage = "https://github.com/behave/behave";
     description = "Behaviour-driven development, Python style";
     mainProgram = "behave";

From 29757fe4ac3a469e61954f53308da03d542144ce Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Fri, 7 Nov 2025 11:48:16 +0800
Subject: [PATCH 6063/6226] dopamine: 3.0.0-preview.40 -> 3.0.0

Diff: https://github.com/digimezzo/dopamine/compare/v3.0.0-preview.40...v3.0.0

Changelog: https://github.com/digimezzo/dopamine/blob/3.0.0/CHANGELOG.md
---
 pkgs/by-name/do/dopamine/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/do/dopamine/package.nix b/pkgs/by-name/do/dopamine/package.nix
index 181df75dfbb4..50a0011e28d2 100644
--- a/pkgs/by-name/do/dopamine/package.nix
+++ b/pkgs/by-name/do/dopamine/package.nix
@@ -6,11 +6,11 @@
 }:
 appimageTools.wrapType2 rec {
   pname = "dopamine";
-  version = "3.0.0-preview.40";
+  version = "3.0.0";
 
   src = fetchurl {
     url = "https://github.com/digimezzo/dopamine/releases/download/v${version}/Dopamine-${version}.AppImage";
-    hash = "sha256-Cd0qUNkUXup9l3/tzagswY/MUgx4cCnXcML7c5ZSo4k=";
+    hash = "sha256-kvXan5J+rxJ/ugcEz9xytq3eQG0saWrYZjF7O1d6rTA=";
   };
 
   extraInstallCommands =

From f8d747b52be09d4f83235d913de70dc248712b9b Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Fri, 7 Nov 2025 11:58:14 +0800
Subject: [PATCH 6064/6226] pocket-id: 1.14.2 -> 1.15.0

Diff: https://github.com/pocket-id/pocket-id/compare/v1.14.2...v1.15.0

Changelog: https://github.com/pocket-id/pocket-id/releases/tag/v1.15.0
---
 pkgs/by-name/po/pocket-id/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/po/pocket-id/package.nix b/pkgs/by-name/po/pocket-id/package.nix
index 6d4a3087ce73..f51345721410 100644
--- a/pkgs/by-name/po/pocket-id/package.nix
+++ b/pkgs/by-name/po/pocket-id/package.nix
@@ -11,13 +11,13 @@
 
 buildGo125Module (finalAttrs: {
   pname = "pocket-id";
-  version = "1.14.2";
+  version = "1.15.0";
 
   src = fetchFromGitHub {
     owner = "pocket-id";
     repo = "pocket-id";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-0x80oykzMTEsuGUBtXXdKgWJld8mrDPUssYpAznqKnc=";
+    hash = "sha256-mnmBwQ79sScTPM4Gh9g0x/QTmqm1TgxaOkww+bvs1b4=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/backend";

From ff3cc409508eb014149bfcf4e9808c37b21ecf07 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 03:59:18 +0000
Subject: [PATCH 6065/6226] weaver: 0.18.0 -> 0.19.0

---
 pkgs/by-name/we/weaver/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/we/weaver/package.nix b/pkgs/by-name/we/weaver/package.nix
index aa8a0bd7f52b..3adee4a722f6 100644
--- a/pkgs/by-name/we/weaver/package.nix
+++ b/pkgs/by-name/we/weaver/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "weaver";
-  version = "0.18.0";
+  version = "0.19.0";
 
   src = fetchFromGitHub {
     owner = "open-telemetry";
     repo = "weaver";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-kEGz6alm+P6zKR4vxzsyZ67R99tVBjEIK0OEx6SzdvQ=";
+    hash = "sha256-6rBgGU+6/EZaKkDdbRZPY+5ZS2mnUiPIPymhVpqVPX0=";
   };
 
-  cargoHash = "sha256-//nPXBUi7swKPusaamSJdsUTObnyh+wNc7i8CoyGWrU=";
+  cargoHash = "sha256-9i+6xqOUUSWBPeoqgO9TpS2AkVLRB1CCZfMrPsZj8JQ=";
 
   checkFlags = [
     # Skip tests requiring network

From 988431a27fc59498988952d1ab0a22d06ea22dc2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 04:03:51 +0000
Subject: [PATCH 6066/6226] luau-lsp: 1.55.0 -> 1.56.1

---
 pkgs/by-name/lu/luau-lsp/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix
index aed342c18c23..176a8c7532a2 100644
--- a/pkgs/by-name/lu/luau-lsp/package.nix
+++ b/pkgs/by-name/lu/luau-lsp/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "luau-lsp";
-  version = "1.55.0";
+  version = "1.56.1";
 
   src = fetchFromGitHub {
     owner = "JohnnyMorganz";
     repo = "luau-lsp";
     tag = finalAttrs.version;
-    hash = "sha256-ZrvPZi3ss83onsinyAl1AlQmV6jFctW8agYO9ieJtno=";
+    hash = "sha256-IRBVLLWycc4zkjR82jAEcTlmDgXSLbaAA7ejSIYm41U=";
     fetchSubmodules = true;
   };
 

From 7a9dca80dd65da4901ec7f0b3e8be7c0474a2f74 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 04:04:59 +0000
Subject: [PATCH 6067/6226] adminneo: 5.1.1 -> 5.2.0

---
 pkgs/by-name/ad/adminneo/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ad/adminneo/package.nix b/pkgs/by-name/ad/adminneo/package.nix
index 962d9c4ecb07..f2922edebaed 100644
--- a/pkgs/by-name/ad/adminneo/package.nix
+++ b/pkgs/by-name/ad/adminneo/package.nix
@@ -8,13 +8,13 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "adminneo";
-  version = "5.1.1";
+  version = "5.2.0";
 
   src = fetchFromGitHub {
     owner = "adminneo-org";
     repo = "adminneo";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ckz0LvKLY6xm3thPmY/ry8G5kkt29rmDsG/D6NNeRoY=";
+    hash = "sha256-x92APmqRbH9XxMJjQASwHAgD0SWTK63MMYwkbiEq7U8=";
   };
 
   nativeBuildInputs = [

From 3cd3fc55022bab92903f15080ac2927228095257 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 04:26:15 +0000
Subject: [PATCH 6068/6226] git-buildpackage: 0.9.38 -> 0.9.39

---
 pkgs/by-name/gi/git-buildpackage/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gi/git-buildpackage/package.nix b/pkgs/by-name/gi/git-buildpackage/package.nix
index 91d0e1488111..a91a9ca09cbf 100644
--- a/pkgs/by-name/gi/git-buildpackage/package.nix
+++ b/pkgs/by-name/gi/git-buildpackage/package.nix
@@ -17,14 +17,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "git-buildpackage";
-  version = "0.9.38";
+  version = "0.9.39";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "agx";
     repo = "git-buildpackage";
     tag = "debian/${version}";
-    hash = "sha256-dZ/uJLcDPkpwIz+Y6WInJ4XlSJ5zzDY65li/xghsJTQ=";
+    hash = "sha256-glj0WtlZb42wetD5sKHbWvgPOZ/lQofPYtChuk3rie0=";
     fetchSubmodules = true;
   };
 

From 5f65e4a88f9e72032f65c9c225e9fd88e713d67d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 04:27:29 +0000
Subject: [PATCH 6069/6226] python3Packages.txtai: 9.0.1 -> 9.1.0

---
 pkgs/development/python-modules/txtai/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix
index c79a1a6fc36f..0139a000f1ff 100644
--- a/pkgs/development/python-modules/txtai/default.nix
+++ b/pkgs/development/python-modules/txtai/default.nix
@@ -93,7 +93,7 @@
   pytestCheckHook,
 }:
 let
-  version = "9.0.1";
+  version = "9.1.0";
   agent = [
     mcpadapt
     smolagents
@@ -241,7 +241,7 @@ let
     owner = "neuml";
     repo = "txtai";
     tag = "v${version}";
-    hash = "sha256-ciQDKpqTdgYe4oIgd2uxY7491SMr9Snha9XyTpxgXyY=";
+    hash = "sha256-5wr9fTfLVwGksD/+wbw4CktSznDi/xI/WfZBG3+BNYc=";
   };
 in
 buildPythonPackage {

From fcacfd0484bbc9e7363c5c4d62fe6c13f42159c5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 04:30:23 +0000
Subject: [PATCH 6070/6226] yaneuraou: 8.60 -> 9.01

---
 pkgs/by-name/ya/yaneuraou/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ya/yaneuraou/package.nix b/pkgs/by-name/ya/yaneuraou/package.nix
index f0f8280db1be..644b503fad90 100644
--- a/pkgs/by-name/ya/yaneuraou/package.nix
+++ b/pkgs/by-name/ya/yaneuraou/package.nix
@@ -43,13 +43,13 @@
 #   with clangStdenv.
 clangStdenv.mkDerivation (finalAttrs: {
   pname = "yaneuraou";
-  version = "8.60";
+  version = "9.01";
 
   src = fetchFromGitHub {
     owner = "yaneurao";
     repo = "YaneuraOu";
     tag = "v${finalAttrs.version}git";
-    hash = "sha256-1awnGCGIdeMAqAd0TWgoJr5spJo2mFBWdR3iMc2i4OM=";
+    hash = "sha256-uhr3jS+ttN5pF1zZpHq2xWy3sdMV19eRUhuj2uPspak=";
   };
 
   sourceRoot = "${finalAttrs.src.name}/source";

From 163349185c6aa8e08434f13e296ba4e29512b99f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 04:36:51 +0000
Subject: [PATCH 6071/6226] libretro-shaders-slang: 0-unstable-2025-10-30 ->
 0-unstable-2025-11-06

---
 pkgs/by-name/li/libretro-shaders-slang/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix
index 4d294e14732f..239c3845eddb 100644
--- a/pkgs/by-name/li/libretro-shaders-slang/package.nix
+++ b/pkgs/by-name/li/libretro-shaders-slang/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "libretro-shaders-slang";
-  version = "0-unstable-2025-10-30";
+  version = "0-unstable-2025-11-06";
 
   src = fetchFromGitHub {
     owner = "libretro";
     repo = "slang-shaders";
-    rev = "bb15fc268529cad6132f288f90e87c07c37212e3";
-    hash = "sha256-EVthZs6zrqJYWpTPae8ZNxY9J69YauVxr45MQ0OXQc4=";
+    rev = "edfb56fe7b0951348b7253846dc7a5bd56a765a7";
+    hash = "sha256-xmSAz6iZJe7SAgfc290b326URdYdogDNm62YTiypqPg=";
   };
 
   dontConfigure = true;

From 92c20cac07ceac379d35ae77d43b1e908e8f73cb Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 04:58:13 +0000
Subject: [PATCH 6072/6226] vscode-extensions.danielsanmedium.dscodegpt:
 3.14.158 -> 3.14.172

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index b04d7fe3466f..a81a712af099 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -1154,8 +1154,8 @@ let
         mktplcRef = {
           publisher = "DanielSanMedium";
           name = "dscodegpt";
-          version = "3.14.158";
-          hash = "sha256-c+5CJqjn7dmwDgNcaaDBapi3T8OI+5UnPJj9+t8sWng=";
+          version = "3.14.172";
+          hash = "sha256-bJnGao3RrbjeMSkRkakM6UA9piYGEzwMInoBOev2YeM=";
         };
         meta = {
           changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog";

From e992ba914307ec078417f83d67cdf7a85c0c4829 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 04:58:36 +0000
Subject: [PATCH 6073/6226] mdserve: 0.5.0 -> 0.5.1

---
 pkgs/by-name/md/mdserve/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/md/mdserve/package.nix b/pkgs/by-name/md/mdserve/package.nix
index b87d34793030..3e6ddf1b91c1 100644
--- a/pkgs/by-name/md/mdserve/package.nix
+++ b/pkgs/by-name/md/mdserve/package.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "mdserve";
-  version = "0.5.0";
+  version = "0.5.1";
 
   src = fetchFromGitHub {
     owner = "jfernandez";
     repo = "mdserve";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-dYB49+vLcokCnJ8yH0ab+Ns/RPLzdxTN/PmkaKc+THs=";
+    hash = "sha256-tycFsE/jGh5OYD5ewv12vvOhhlbYtlvANk6BhDW38hw=";
   };
 
-  cargoHash = "sha256-KszPB5xpfLw7DA/yMl5o6yRn5lHLF+6EAXnEdhD0qFE=";
+  cargoHash = "sha256-otEa6+IdKHJAT+lPptXgnP5yggTkB3uYfbGhSKTXodo=";
 
   __darwinAllowLocalNetworking = true;
 

From e6befdcbbac2bfdc136d4bfab85cdd64db06849e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 05:30:32 +0000
Subject: [PATCH 6074/6226] python3Packages.django-import-export: 4.3.12 ->
 4.3.13

---
 .../python-modules/django-import-export/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/django-import-export/default.nix b/pkgs/development/python-modules/django-import-export/default.nix
index b0788bb9de88..1985e90bda49 100644
--- a/pkgs/development/python-modules/django-import-export/default.nix
+++ b/pkgs/development/python-modules/django-import-export/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "django-import-export";
-  version = "4.3.12";
+  version = "4.3.13";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "django-import-export";
     repo = "django-import-export";
     tag = version;
-    hash = "sha256-52nlqgKWh37Qr5UvCRBEPz2WHb2BU987+Ibt9yQyFVM=";
+    hash = "sha256-LE3eNHdPHFH4xVrMzQeOwRlJh4v7rmLTHdNGMQMgo6I=";
   };
 
   pythonRelaxDeps = [ "tablib" ];

From c751424de8f96df20625c56cc01f71c774c7c4a0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 05:37:36 +0000
Subject: [PATCH 6075/6226] plasma-panel-colorizer: 5.0.1 -> 5.2.1

---
 pkgs/by-name/pl/plasma-panel-colorizer/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
index f719ae5e3e41..7fbdf809b4f0 100644
--- a/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
+++ b/pkgs/by-name/pl/plasma-panel-colorizer/package.nix
@@ -9,13 +9,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "plasma-panel-colorizer";
-  version = "5.0.1";
+  version = "5.2.1";
 
   src = fetchFromGitHub {
     owner = "luisbocanegra";
     repo = "plasma-panel-colorizer";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-E6VX2naAS2xof5sdnuaSuKueIKecW0fi9SycgLVRQVU=";
+    hash = "sha256-QyW3F0PwTSE6wUNW3pwI/Xj9/7Rxl0GXJ6W02oZBeKU=";
   };
 
   nativeBuildInputs = [

From 3e8eab7a26d291b7c8756ffa3bdd35c9da129800 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 05:38:31 +0000
Subject: [PATCH 6076/6226] terraform-providers.splunk-terraform_signalfx:
 9.22.2 -> 9.22.3

---
 .../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 6b094731b9e2..150cbea2630d 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1237,11 +1237,11 @@
     "vendorHash": "sha256-cX5K221Jnq701Nb+2bC1LmXVL7YvkZ8dkc2wYjDNOSw="
   },
   "splunk-terraform_signalfx": {
-    "hash": "sha256-kErd5DLViYA9yHyBAHxntPRJET9QmpCMWcpbFx/Qwhk=",
+    "hash": "sha256-nhep3042bOUSQKCsS8gOIYLImgXnHmBNsDlXWOCixwI=",
     "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx",
     "owner": "splunk-terraform",
     "repo": "terraform-provider-signalfx",
-    "rev": "v9.22.2",
+    "rev": "v9.22.3",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-epwHFW1lGk/HUtv5bS0Dyi59POjICsoJln2xgmH5320="
   },

From 132e07e198e2aa85584896f995528b245523e62c Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 7 Nov 2025 02:40:18 -0300
Subject: [PATCH 6077/6226] heroic-unwrapped: bump electron version

---
 pkgs/by-name/he/heroic-unwrapped/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix
index 68cf15bb57b6..40ddf2d279fa 100644
--- a/pkgs/by-name/he/heroic-unwrapped/package.nix
+++ b/pkgs/by-name/he/heroic-unwrapped/package.nix
@@ -9,7 +9,7 @@
   python3,
   makeWrapper,
   # Electron updates frequently break Heroic, so pin same version as upstream, or newest non-EOL.
-  electron_36,
+  electron_37,
   vulkan-helper,
   gogdl,
   nile,
@@ -21,7 +21,7 @@ let
   legendary = callPackage ./legendary.nix { };
   epic-integration = callPackage ./epic-integration.nix { };
   comet-gog = comet-gog_heroic;
-  electron = electron_36;
+  electron = electron_37;
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "heroic-unwrapped";
@@ -119,12 +119,12 @@ stdenv.mkDerivation (finalAttrs: {
     inherit epic-integration legendary;
   };
 
-  meta = with lib; {
+  meta = {
     description = "Native GOG, Epic, and Amazon Games Launcher for Linux, Windows and Mac";
     homepage = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher";
     changelog = "https://github.com/Heroic-Games-Launcher/HeroicGamesLauncher/releases/tag/v${finalAttrs.version}";
-    license = licenses.gpl3Only;
-    maintainers = with maintainers; [ iedame ];
+    license = lib.licenses.gpl3Only;
+    maintainers = with lib.maintainers; [ iedame ];
     # Heroic may work on nix-darwin, but it needs a dedicated maintainer for the platform.
     # It may also work on other Linux targets, but all the game stores only
     # support x86 Linux, so it would require extra hacking to run games via QEMU

From 3113ec6fa27abcadae10033ecbf9f61fcf824d6e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 05:54:44 +0000
Subject: [PATCH 6078/6226] gcsfuse: 3.4.3 -> 3.4.4

---
 pkgs/by-name/gc/gcsfuse/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix
index 1f027aa60d47..7d0494036f68 100644
--- a/pkgs/by-name/gc/gcsfuse/package.nix
+++ b/pkgs/by-name/gc/gcsfuse/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule rec {
   pname = "gcsfuse";
-  version = "3.4.3";
+  version = "3.4.4";
 
   src = fetchFromGitHub {
     owner = "googlecloudplatform";
     repo = "gcsfuse";
     rev = "v${version}";
-    hash = "sha256-fjZdBf7tUMlAqumTz8b5LDqIcLstr56ugGmdsPb/FBI=";
+    hash = "sha256-UeYKgxBdxH7GQmPeO82CKR1RWzWCYCSUUc0nQX5VLjg=";
   };
 
   vendorHash = "sha256-BirzhmYwFSs2poA5tNOlK2bDO71mCkgSck7fE9la2wA=";

From e33f7789bb10e431dbc006ca813aea4a39ffa068 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 05:55:07 +0000
Subject: [PATCH 6079/6226] python3Packages.langsmith: 0.4.38 -> 0.4.41

---
 pkgs/development/python-modules/langsmith/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/langsmith/default.nix b/pkgs/development/python-modules/langsmith/default.nix
index 81eda030ba69..1607f4b261a9 100644
--- a/pkgs/development/python-modules/langsmith/default.nix
+++ b/pkgs/development/python-modules/langsmith/default.nix
@@ -31,14 +31,14 @@
 
 buildPythonPackage rec {
   pname = "langsmith";
-  version = "0.4.38";
+  version = "0.4.41";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "langchain-ai";
     repo = "langsmith-sdk";
     tag = "v${version}";
-    hash = "sha256-uBCR3rKcsbgPW/x1V7BVii+NhFigmMxaWesB+vzHAuo=";
+    hash = "sha256-hZRZ4IAPKxCtvDZfk9D5irkYk0KM6pG2l+HSq742KYw=";
   };
 
   sourceRoot = "${src.name}/python";

From 2b557810a05d1e5e87df5a73e66b3c8bfb6565da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 06:14:44 +0000
Subject: [PATCH 6080/6226] steam-lancache-prefill: 3.4.0 -> 3.4.1

---
 pkgs/by-name/st/steam-lancache-prefill/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/st/steam-lancache-prefill/package.nix b/pkgs/by-name/st/steam-lancache-prefill/package.nix
index 5afe8b4be93c..d7e5162c8b43 100644
--- a/pkgs/by-name/st/steam-lancache-prefill/package.nix
+++ b/pkgs/by-name/st/steam-lancache-prefill/package.nix
@@ -10,13 +10,13 @@
 
 buildDotnetModule (finalAttrs: {
   pname = "steam-lancache-prefill";
-  version = "3.4.0";
+  version = "3.4.1";
 
   src = fetchFromGitHub {
     owner = "tpill90";
     repo = "steam-lancache-prefill";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-8iYAg6Cpoehnnk/JXdBLkG0QSNnD9hpqizX0jCtp3PM=";
+    hash = "sha256-6XBe64hAe5mPakjcTAPdwnMKsVlvCeorItLVS5cf+cI=";
     fetchSubmodules = true;
   };
 

From a64cdc2243a10f292ab3844d47fc4dc4d05c4aed Mon Sep 17 00:00:00 2001
From: Sergey Volkov <taranarmo@gmail.com>
Date: Fri, 7 Nov 2025 07:16:53 +0100
Subject: [PATCH 6081/6226] gemini-cli: 0.11.3 -> 0.13.0

---
 pkgs/by-name/ge/gemini-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix
index 5f151e0010f9..23469817d376 100644
--- a/pkgs/by-name/ge/gemini-cli/package.nix
+++ b/pkgs/by-name/ge/gemini-cli/package.nix
@@ -13,16 +13,16 @@
 
 buildNpmPackage (finalAttrs: {
   pname = "gemini-cli";
-  version = "0.11.3";
+  version = "0.13.0";
 
   src = fetchFromGitHub {
     owner = "google-gemini";
     repo = "gemini-cli";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-43ohCUqdM0quxwoN3s/3vOq4IRc+sck+BkAfqMEDq8g=";
+    hash = "sha256-Y6RIFF65uzgeOKU03wibEeLtUub1iG52tljM+rHDZbg=";
   };
 
-  npmDepsHash = "sha256-wqzsHBFXo5NhsFHOErxVVG9Y08daEQs6YdRZHFeOq98=";
+  npmDepsHash = "sha256-6YhbPj+gbSi/OvyH+dFxkTD4qVj+/7TiMQuP7f1aZYE=";
 
   nativeBuildInputs = [
     jq

From 367d085b3e3ca5b8725ca4e385c5759846a31999 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 06:40:10 +0000
Subject: [PATCH 6082/6226] python3Packages.fastbencode: 0.3.6 -> 0.3.7

---
 pkgs/development/python-modules/fastbencode/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/fastbencode/default.nix b/pkgs/development/python-modules/fastbencode/default.nix
index 34e9c83e978c..b56aca8ff290 100644
--- a/pkgs/development/python-modules/fastbencode/default.nix
+++ b/pkgs/development/python-modules/fastbencode/default.nix
@@ -12,19 +12,19 @@
 
 buildPythonPackage rec {
   pname = "fastbencode";
-  version = "0.3.6";
+  version = "0.3.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "breezy-team";
     repo = "fastbencode";
     tag = "v${version}";
-    hash = "sha256-Vn9NcJQaSF+k2TyRTAA9yMWiV+kYrfw6RIbIe99CCsg=";
+    hash = "sha256-fNvxeAKCHjtD9nl7Jhkzecu2CbTfOyPjdYedCPpqYgc=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {
     inherit pname version src;
-    hash = "sha256-r229xfSrkbDEfm/nGFuQshyP4o04US0xJiRK4oXtaYE=";
+    hash = "sha256-e6TaJyHfrUHampTX42rPqdjQu7myj2+zahVJS+7SzIM=";
   };
 
   nativeBuildInputs = [

From 9d250a4ed10980816376727be5732ad9e97f7b11 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 06:41:35 +0000
Subject: [PATCH 6083/6226] lcrq: 0.3.0 -> 0.3.1

---
 pkgs/by-name/lc/lcrq/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lc/lcrq/package.nix b/pkgs/by-name/lc/lcrq/package.nix
index 521b713cee47..8ce9de456942 100644
--- a/pkgs/by-name/lc/lcrq/package.nix
+++ b/pkgs/by-name/lc/lcrq/package.nix
@@ -5,14 +5,14 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "lcrq";
-  version = "0.3.0";
+  version = "0.3.1";
 
   src = fetchFromGitea {
     domain = "codeberg.org";
     owner = "librecast";
     repo = "lcrq";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-l8/mgcckc90FjcbAjGGUnXAN/GyOTQjjGvsA++VSen4=";
+    hash = "sha256-hNH5SdvKhNPUJWs7vpPECcBsRyNdHQF+Ot3LmyX2V3c=";
   };
 
   installFlags = [ "PREFIX=$(out)" ];

From 6a2e323fb3d310f932e02935d3f2b04920c5a6fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 07:19:08 +0000
Subject: [PATCH 6084/6226] 
 home-assistant-custom-lovelace-modules.material-you-utilities: 2.0.21 ->
 2.0.22

---
 .../material-you-utilities/package.nix                      | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix
index 42bb7a201b75..bcd442717ed1 100644
--- a/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix
+++ b/pkgs/servers/home-assistant/custom-lovelace-modules/material-you-utilities/package.nix
@@ -6,16 +6,16 @@
 
 buildNpmPackage rec {
   pname = "material-you-utilities";
-  version = "2.0.21";
+  version = "2.0.22";
 
   src = fetchFromGitHub {
     owner = "Nerwyn";
     repo = "material-you-utilities";
     tag = version;
-    hash = "sha256-rGwa5vP0Wka9w1m4s6q8stqSe1QVu2US59/RnMOR8+A=";
+    hash = "sha256-wsNAW+0px4WhaMGSE4T0k5R4E+7c594AiwKYU+5V7rw=";
   };
 
-  npmDepsHash = "sha256-Coc8SOqc2tElx3HzzUsYxc+eKkdjkbROh8LvPB2Iro8=";
+  npmDepsHash = "sha256-Gnr5C2VsGUtcfsRo0w8TB/NUxCK5Y20qfvYSBzL4UQ8=";
 
   postPatch = ''
     # Remove git dependency from rspack config

From c500a1c06a82b3d782793eda68782d80a4494952 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 7 Nov 2025 04:17:56 -0300
Subject: [PATCH 6085/6226] tt-metal: fix build with cmake4

---
 pkgs/by-name/tt/tt-metal/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/tt/tt-metal/package.nix b/pkgs/by-name/tt/tt-metal/package.nix
index dc6d877f7a02..3733045c7d62 100644
--- a/pkgs/by-name/tt/tt-metal/package.nix
+++ b/pkgs/by-name/tt/tt-metal/package.nix
@@ -46,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: {
     (lib.cmakeBool "FETCHCONTENT_FULLY_DISCONNECTED" true)
     (lib.cmakeBool "CPM_USE_LOCAL_PACKAGES" true)
     (lib.cmakeFeature "VERSION_NUMERIC" finalAttrs.version)
+    (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.10")
   ];
 
   preConfigure = ''

From 2db14527806f4d7856ee57b398c52326e64da650 Mon Sep 17 00:00:00 2001
From: Markus Hauck <markus1189@gmail.com>
Date: Fri, 7 Nov 2025 08:36:54 +0100
Subject: [PATCH 6086/6226] claude-code: 2.0.34 -> 2.0.35

https://github.com/anthropics/claude-code/blob/main/CHANGELOG.md
---
 .../vscode/extensions/anthropic.claude-code/default.nix     | 4 ++--
 pkgs/by-name/cl/claude-code/package-lock.json               | 4 ++--
 pkgs/by-name/cl/claude-code/package.nix                     | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
index 6a4f9c485d02..d430a956728f 100644
--- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-code";
     publisher = "anthropic";
-    version = "2.0.34";
-    hash = "sha256-e+pjuGY0xrg43+pDDkQ4Svb1yBx2Fv+Z8WZoJv/k6D4=";
+    version = "2.0.35";
+    hash = "sha256-1wN82mZk3zCGGFQ8FNwLFm1793U8GEC8p46BJiPNaUo=";
   };
 
   meta = {
diff --git a/pkgs/by-name/cl/claude-code/package-lock.json b/pkgs/by-name/cl/claude-code/package-lock.json
index b86d4ca4ada2..eebf0b81eb5b 100644
--- a/pkgs/by-name/cl/claude-code/package-lock.json
+++ b/pkgs/by-name/cl/claude-code/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@anthropic-ai/claude-code",
-  "version": "2.0.34",
+  "version": "2.0.35",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@anthropic-ai/claude-code",
-      "version": "2.0.34",
+      "version": "2.0.35",
       "license": "SEE LICENSE IN README.md",
       "bin": {
         "claude": "cli.js"
diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix
index da13768205ad..370e33bc8d25 100644
--- a/pkgs/by-name/cl/claude-code/package.nix
+++ b/pkgs/by-name/cl/claude-code/package.nix
@@ -7,14 +7,14 @@
 }:
 buildNpmPackage (finalAttrs: {
   pname = "claude-code";
-  version = "2.0.34";
+  version = "2.0.35";
 
   src = fetchzip {
     url = "https://registry.npmjs.org/@anthropic-ai/claude-code/-/claude-code-${finalAttrs.version}.tgz";
-    hash = "sha256-GYykbpvkFTsj7tlsAimDrNbN9kP1+8AtfG+Boch8eSk=";
+    hash = "sha256-cPy2xudIH1OVVzDlq5YAg1uFu59h6zDOvXpKaJ+fuP8=";
   };
 
-  npmDepsHash = "sha256-D0sbwZ5eCzIobFGf5LY7u3/RWQ6bYpGFDlU/ClPTA7Y=";
+  npmDepsHash = "sha256-07MUZ8i6K/uLodyDM1kFnhGGkRB2uVf88CkbaAVw5jk=";
 
   postPatch = ''
     cp ${./package-lock.json} package-lock.json

From a673976393f99dd7d21e5ea6a5b099eaa143be0f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 07:38:06 +0000
Subject: [PATCH 6087/6226] lxgw-neoxihei: 1.226 -> 1.227

---
 pkgs/by-name/lx/lxgw-neoxihei/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix
index 65a60ef0dc19..8a261b6c1ab5 100644
--- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix
+++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix
@@ -6,11 +6,11 @@
 
 stdenvNoCC.mkDerivation rec {
   pname = "lxgw-neoxihei";
-  version = "1.226";
+  version = "1.227";
 
   src = fetchurl {
     url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf";
-    hash = "sha256-rKhEnNbqQRlTepZTPM9Naau74YWRU4K22jrHYTOXKOE=";
+    hash = "sha256-7EJlMgY++YrUQ9BKZLOft1isc8EHuOLVoORMLMPngTI=";
   };
 
   dontUnpack = true;

From 98474ee82121720c5b795a6bd6b515e2d72d41f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 07:42:41 +0000
Subject: [PATCH 6088/6226] pkarr: 4.0.0 -> 5.0.1

---
 pkgs/by-name/pk/pkarr/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pk/pkarr/package.nix b/pkgs/by-name/pk/pkarr/package.nix
index 45b2256e15f2..1cf10145d3e8 100644
--- a/pkgs/by-name/pk/pkarr/package.nix
+++ b/pkgs/by-name/pk/pkarr/package.nix
@@ -5,16 +5,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "pkarr";
-  version = "4.0.0";
+  version = "5.0.1";
 
   src = fetchFromGitHub {
     owner = "pubky";
     repo = "pkarr";
     rev = "v${version}";
-    hash = "sha256-9sTF5h2+vWcz5ohAoo95vldTJGQyz/ICkVpIgaxilwA=";
+    hash = "sha256-564JL7EG/RB2k2JdxAENpP5UZtKtaGlrZfeYOgsLBEY=";
   };
 
-  cargoHash = "sha256-26OlV/Xnl1+VFOaCWUjb8LxuJWrCsfY7QTlPZ7VMBCs=";
+  cargoHash = "sha256-HG4cmKQleiWdYBrOgv1Aj/erWjZX5PMwIZpQSQc+sFU=";
 
   meta = {
     description = "Public Key Addressable Resource Records (sovereign TLDs) ";

From 1941f1564e4af67fa4d21c003fbaebd8890a4544 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 6 Nov 2025 23:45:31 -0800
Subject: [PATCH 6089/6226] unit: fix build with OpenSSL 3.6

---
 pkgs/by-name/un/unit/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/un/unit/package.nix b/pkgs/by-name/un/unit/package.nix
index eb3841fbac71..7262caef8a9a 100644
--- a/pkgs/by-name/un/unit/package.nix
+++ b/pkgs/by-name/un/unit/package.nix
@@ -75,6 +75,11 @@ stdenv.mkDerivation rec {
     ${optionalString withPerl "./configure perl   --module=perl     --perl=${perl}/bin/perl"}
   '';
 
+  env.NIX_CFLAGS_COMPILE = toString [
+    # 'EVP_PKEY_asn1_find_str' is deprecated since OpenSSL 3.6
+    "-Wno-error=deprecated-declarations"
+  ];
+
   passthru.tests = {
     unit-perl = nixosTests.unit-perl;
     unit-php = nixosTests.unit-php;

From 02b55c129d4035f42ca4bc13aa1339c40d35877b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 07:52:12 +0000
Subject: [PATCH 6090/6226] polarity: latest-unstable-2025-10-30 ->
 latest-unstable-2025-11-06

---
 pkgs/by-name/po/polarity/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/po/polarity/package.nix b/pkgs/by-name/po/polarity/package.nix
index 6c7ed240c923..b52433049ac0 100644
--- a/pkgs/by-name/po/polarity/package.nix
+++ b/pkgs/by-name/po/polarity/package.nix
@@ -7,16 +7,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "polarity";
-  version = "latest-unstable-2025-10-30";
+  version = "latest-unstable-2025-11-06";
 
   src = fetchFromGitHub {
     owner = "polarity-lang";
     repo = "polarity";
-    rev = "309532f08f8bac21b52708ccce0cedad42f0ab39";
-    hash = "sha256-s/sDx9SWrsbNuidfDNQyXeJflvwvwwMH4IEiSQ6Fh24=";
+    rev = "52211970b601db2e449ea6bc0a2e785d39c489c0";
+    hash = "sha256-jDhkBrLbk9B9xeEZ4A7jp6at/Hp4q2A/egoFgY2xK8I=";
   };
 
-  cargoHash = "sha256-DyqK5cxdsZWMr79clw8oRHTAAlzGzP8i4Vu/UXH/ptE=";
+  cargoHash = "sha256-cH+cgYIUPQTHgGCZmP562VzCxz+i6LkymHtnHJXnd+A=";
 
   passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; };
 

From 216b8072dd9f9f7023ff4f8b5ef164cc05f9a616 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Fri, 7 Nov 2025 00:04:00 -0800
Subject: [PATCH 6091/6226] flet-client-flutter: fix build

---
 pkgs/by-name/fl/flet-client-flutter/package.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/pkgs/by-name/fl/flet-client-flutter/package.nix b/pkgs/by-name/fl/flet-client-flutter/package.nix
index cf2bbab86e8a..470a9185cad6 100644
--- a/pkgs/by-name/fl/flet-client-flutter/package.nix
+++ b/pkgs/by-name/fl/flet-client-flutter/package.nix
@@ -60,6 +60,10 @@ flutter329.buildFlutterApplication rec {
   ++ mpv-unwrapped.buildInputs
   ++ libplacebo.buildInputs;
 
+  env.NIX_CFLAGS_COMPILE = toString [
+    "-Wno-error=nontrivial-memcall"
+  ];
+
   passthru = {
     updateScript = _experimental-update-script-combinators.sequence [
       (gitUpdater { rev-prefix = "v"; })

From 39581a0fe6155ad6bdc5cc0818e1fdff3e62c2e1 Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss@proton.me>
Date: Sat, 18 Oct 2025 03:52:56 +0300
Subject: [PATCH 6092/6226] limbo: rename to turso

---
 pkgs/by-name/{li/limbo => tu/tursodb}/package.nix | 14 +++++++-------
 pkgs/top-level/aliases.nix                        |  1 +
 2 files changed, 8 insertions(+), 7 deletions(-)
 rename pkgs/by-name/{li/limbo => tu/tursodb}/package.nix (73%)

diff --git a/pkgs/by-name/li/limbo/package.nix b/pkgs/by-name/tu/tursodb/package.nix
similarity index 73%
rename from pkgs/by-name/li/limbo/package.nix
rename to pkgs/by-name/tu/tursodb/package.nix
index 306962ff40dc..f0d1e1394d63 100644
--- a/pkgs/by-name/li/limbo/package.nix
+++ b/pkgs/by-name/tu/tursodb/package.nix
@@ -6,12 +6,12 @@
   nix-update-script,
 }:
 rustPlatform.buildRustPackage rec {
-  pname = "limbo";
+  pname = "tursodb";
   version = "0.0.14";
 
   src = fetchFromGitHub {
     owner = "tursodatabase";
-    repo = "limbo";
+    repo = "turso";
     tag = "v${version}";
     hash = "sha256-t3bIW+HuuZzj3NOw2lnTZw9qxj7lGWtR8RbZF0rVbQ4=";
   };
@@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec {
 
   cargoBuildFlags = [
     "-p"
-    "limbo"
+    "turso_cli"
   ];
   cargoTestFlags = cargoBuildFlags;
 
@@ -31,11 +31,11 @@ rustPlatform.buildRustPackage rec {
   passthru.updateScript = nix-update-script { };
 
   meta = {
-    description = "Interactive SQL shell for Limbo";
-    homepage = "https://github.com/tursodatabase/limbo";
-    changelog = "https://github.com/tursodatabase/limbo/blob/v${version}/CHANGELOG.md";
+    description = "Interactive SQL shell for Turso";
+    homepage = "https://github.com/tursodatabase/turso";
+    changelog = "https://github.com/tursodatabase/turso/blob/v${version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ nartsiss ];
-    mainProgram = "limbo";
+    mainProgram = "tursodb";
   };
 }
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 8cf4433b21b4..af7b786208b3 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -839,6 +839,7 @@ mapAliases {
   lightly-qt = throw "'lightly-qt' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   ligo = throw "ligo has been removed from nixpkgs for lack of maintainance"; # Added 2025-06-03
   lima-bin = warnAlias "lima-bin has been replaced by lima" lima; # Added 2025-05-13
+  limbo = warnAlias "limbo has been renamed to turso" turso; # Added 2025-11-07
   lincity_ng = warnAlias "lincity_ng has been renamed to lincity-ng" lincity-ng; # Added 2025-10-09
   linphone = linphonePackages.linphone-desktop; # Added 2025-09-20
   linux-libre = throw "linux_libre has been removed due to lack of maintenance"; # Added 2025-10-01

From 785183dbc417d299c7ec2d44c46106d3c8ee5589 Mon Sep 17 00:00:00 2001
From: nartsisss <nartsiss@proton.me>
Date: Sat, 18 Oct 2025 03:58:57 +0300
Subject: [PATCH 6093/6226] turso: 0.0.14 -> 0.3.2

---
 .../by-name/tu/{tursodb => turso}/package.nix | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)
 rename pkgs/by-name/tu/{tursodb => turso}/package.nix (67%)

diff --git a/pkgs/by-name/tu/tursodb/package.nix b/pkgs/by-name/tu/turso/package.nix
similarity index 67%
rename from pkgs/by-name/tu/tursodb/package.nix
rename to pkgs/by-name/tu/turso/package.nix
index f0d1e1394d63..f2315e5499a8 100644
--- a/pkgs/by-name/tu/tursodb/package.nix
+++ b/pkgs/by-name/tu/turso/package.nix
@@ -5,26 +5,27 @@
   versionCheckHook,
   nix-update-script,
 }:
-rustPlatform.buildRustPackage rec {
-  pname = "tursodb";
-  version = "0.0.14";
+rustPlatform.buildRustPackage (finalAttrs: {
+  pname = "turso";
+  version = "0.3.2";
 
   src = fetchFromGitHub {
     owner = "tursodatabase";
     repo = "turso";
-    tag = "v${version}";
-    hash = "sha256-t3bIW+HuuZzj3NOw2lnTZw9qxj7lGWtR8RbZF0rVbQ4=";
+    tag = "v${finalAttrs.version}";
+    hash = "sha256-biElXD4d6h28Nq7LIjuL+at/y69TxnsJzvnEX8cOM9E=";
   };
 
-  cargoHash = "sha256-DDUl/jojhDmSQY7iI/Dn+Lg4eNuNhj8jyakPtgg4d2k=";
+  cargoHash = "sha256-G2VowcxnCRulQ4pJcpfJbH73vkG+KIteeUF1Hq8TEZg=";
 
   cargoBuildFlags = [
     "-p"
     "turso_cli"
   ];
-  cargoTestFlags = cargoBuildFlags;
+  cargoTestFlags = finalAttrs.cargoBuildFlags;
 
   nativeInstallCheckInputs = [ versionCheckHook ];
+
   doInstallCheck = true;
   versionCheckProgramArg = "--version";
 
@@ -33,9 +34,9 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Interactive SQL shell for Turso";
     homepage = "https://github.com/tursodatabase/turso";
-    changelog = "https://github.com/tursodatabase/turso/blob/v${version}/CHANGELOG.md";
+    changelog = "https://github.com/tursodatabase/turso/blob/v${finalAttrs.version}/CHANGELOG.md";
     license = lib.licenses.mit;
     maintainers = with lib.maintainers; [ nartsiss ];
     mainProgram = "tursodb";
   };
-}
+})

From a6c5eda96ca634901ee715f29107ec36d34769b7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 08:37:07 +0000
Subject: [PATCH 6094/6226] crosvm: 0-unstable-2025-10-30 ->
 0-unstable-2025-11-05

---
 pkgs/by-name/cr/crosvm/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix
index 4b82ac879d6d..e4efa7ff3062 100644
--- a/pkgs/by-name/cr/crosvm/package.nix
+++ b/pkgs/by-name/cr/crosvm/package.nix
@@ -21,12 +21,12 @@
 
 rustPlatform.buildRustPackage {
   pname = "crosvm";
-  version = "0-unstable-2025-10-30";
+  version = "0-unstable-2025-11-05";
 
   src = fetchgit {
     url = "https://chromium.googlesource.com/chromiumos/platform/crosvm";
-    rev = "7f9512777db72a1e89ba0880af7bc5467ee461bf";
-    hash = "sha256-ptx9JA/uyH05r/NvgtK4ppifOiW/zjl7Bsy7vgBYkjI=";
+    rev = "cc4086ef67b347624ae2dbe3e435824e1ecedffb";
+    hash = "sha256-wo0opn5oZT0jPno1lLxBkEOullERh0GB95tQSvCBSrs=";
     fetchSubmodules = true;
   };
 

From 4a2defed1c54656066f31d16e3bf48999d517acc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 08:40:24 +0000
Subject: [PATCH 6095/6226] tutanota-desktop: 310.251008.0 -> 314.251030.0

---
 pkgs/by-name/tu/tutanota-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/tu/tutanota-desktop/package.nix b/pkgs/by-name/tu/tutanota-desktop/package.nix
index 4aa4f6cc0020..66e0afc45c46 100644
--- a/pkgs/by-name/tu/tutanota-desktop/package.nix
+++ b/pkgs/by-name/tu/tutanota-desktop/package.nix
@@ -8,11 +8,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "tutanota-desktop";
-  version = "310.251008.0";
+  version = "314.251030.0";
 
   src = fetchurl {
     url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
-    hash = "sha256-HMwfSMEEP3+CWSiThiEGbCkLiKndmLyt4KIZ4fPHCxM=";
+    hash = "sha256-xGErTMDLJOQIRxFavo8lOZUjTyUvVOD10Df4EPNF+eo=";
   };
 
   extraPkgs = pkgs: [ pkgs.libsecret ];

From 15fdf4269cdbcd0297a727a1ded1cfb3e12b4644 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 08:49:35 +0000
Subject: [PATCH 6096/6226] velero: 1.17.0 -> 1.17.1

---
 pkgs/by-name/ve/velero/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ve/velero/package.nix b/pkgs/by-name/ve/velero/package.nix
index d6bc2e960d62..433196cdd82e 100644
--- a/pkgs/by-name/ve/velero/package.nix
+++ b/pkgs/by-name/ve/velero/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "velero";
-  version = "1.17.0";
+  version = "1.17.1";
 
   src = fetchFromGitHub {
     owner = "vmware-tanzu";
     repo = "velero";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-2hffuTcz6mBwrEjCMhZqrDvNbC5m6lK3vM9umgV4l+0=";
+    hash = "sha256-ZVnYHBcnYOCBFJ9wyvMDrRIf3NyDV1Zqqf7e6JbA+go=";
   };
 
   ldflags = [
@@ -26,7 +26,7 @@ buildGoModule (finalAttrs: {
     "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none"
   ];
 
-  vendorHash = "sha256-khG/6mSYOCKBjTY+JyakFD65bLWLXpcQKPlhPT31uxc=";
+  vendorHash = "sha256-AuvJmHRAmxKduP6q7k81GapGbGLS4x7cwccSnZWvPwI=";
 
   excludedPackages = [
     "issue-template-gen"

From 2a26bbf3e409acee762d92b8a7c34c278d840a55 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 08:53:22 +0000
Subject: [PATCH 6097/6226] python3Packages.elevenlabs: 2.21.0 -> 2.22.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 c42af62a6c95..962e47f0d702 100644
--- a/pkgs/development/python-modules/elevenlabs/default.nix
+++ b/pkgs/development/python-modules/elevenlabs/default.nix
@@ -13,7 +13,7 @@
 }:
 
 let
-  version = "2.21.0";
+  version = "2.22.0";
   tag = "v${version}";
 in
 buildPythonPackage {
@@ -25,7 +25,7 @@ buildPythonPackage {
     owner = "elevenlabs";
     repo = "elevenlabs-python";
     inherit tag;
-    hash = "sha256-jDpTCflRPfm13ZFA5OUsl1bsFZ8ftSbf23BtgcpL5pQ=";
+    hash = "sha256-tSPMHEvce4lRT2weyDl6EFONCT8dRGgLfGptNuTdAPc=";
   };
 
   build-system = [ poetry-core ];

From f5b2c296d509bb76f1a6fb99d775ff08d6cdf39c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 08:58:07 +0000
Subject: [PATCH 6098/6226] typos: 1.38.1 -> 1.39.0

---
 pkgs/by-name/ty/typos/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ty/typos/package.nix b/pkgs/by-name/ty/typos/package.nix
index 68e025f314c8..c81d03799e06 100644
--- a/pkgs/by-name/ty/typos/package.nix
+++ b/pkgs/by-name/ty/typos/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "typos";
-  version = "1.38.1";
+  version = "1.39.0";
 
   src = fetchFromGitHub {
     owner = "crate-ci";
     repo = "typos";
     tag = "v${version}";
-    hash = "sha256-xr3k3wx9EWKm00kt1GxE31Mw5wa3N3VJJCKaUbQa4ic=";
+    hash = "sha256-S4toajgpKtPfvr6hhXE59lt0HPDHK/hF5vJJtxR0lTM=";
   };
 
-  cargoHash = "sha256-2XgnCXYqBvx7LRWaPt4iXznIXIEzYBlWMXbwEVZyGA8=";
+  cargoHash = "sha256-DFbWFhj7ixO1kpgJNDIrtZ+FZfc4GEyw4AnwlTCXw4w=";
 
   passthru.updateScript = nix-update-script { };
 

From 00d3ea593e74a8187e8691383ec56a4a58c303d7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 09:12:37 +0000
Subject: [PATCH 6099/6226] plantuml: 1.2025.9 -> 1.2025.10

---
 pkgs/by-name/pl/plantuml/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pl/plantuml/package.nix b/pkgs/by-name/pl/plantuml/package.nix
index 129f45843867..fad0e753dba9 100644
--- a/pkgs/by-name/pl/plantuml/package.nix
+++ b/pkgs/by-name/pl/plantuml/package.nix
@@ -11,11 +11,11 @@
 
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "plantuml";
-  version = "1.2025.9";
+  version = "1.2025.10";
 
   src = fetchurl {
     url = "https://github.com/plantuml/plantuml/releases/download/v${finalAttrs.version}/plantuml-pdf-${finalAttrs.version}.jar";
-    hash = "sha256-sQeOboLmTsHeT5Gk/hSBs9IsMMqiYrjThv7OSAIvyNg=";
+    hash = "sha256-fUFZrW8LD6M1WV6I2pYigr9rJaDlo0OLY8NZdB+w2yk=";
   };
 
   nativeBuildInputs = [

From 2b0fb592f10efe58179119efcbe538bd94a64fc4 Mon Sep 17 00:00:00 2001
From: GueLaKais <koroyeldiores@gmail.com>
Date: Fri, 25 Apr 2025 13:22:20 +0200
Subject: [PATCH 6100/6226] python313Packages.rospkg: init at 1.6.0

---
 .../python-modules/rospkg/default.nix         | 49 +++++++++++++++++++
 .../python-modules/rospkg/setup-hook.sh       |  1 +
 pkgs/top-level/python-packages.nix            |  2 +
 3 files changed, 52 insertions(+)
 create mode 100644 pkgs/development/python-modules/rospkg/default.nix
 create mode 100644 pkgs/development/python-modules/rospkg/setup-hook.sh

diff --git a/pkgs/development/python-modules/rospkg/default.nix b/pkgs/development/python-modules/rospkg/default.nix
new file mode 100644
index 000000000000..5445aa1023dc
--- /dev/null
+++ b/pkgs/development/python-modules/rospkg/default.nix
@@ -0,0 +1,49 @@
+{
+  lib,
+  buildPythonPackage,
+  catkin-pkg,
+  distro,
+  distutils,
+  fetchFromGitHub,
+  pytestCheckHook,
+  pyyaml,
+  setuptools,
+}:
+
+buildPythonPackage rec {
+  pname = "rospkg";
+  version = "1.6.0";
+  pyproject = true;
+
+  src = fetchFromGitHub {
+    owner = "ros-infrastructure";
+    repo = "rospkg";
+    tag = version;
+    hash = "sha256-6nfdY+p3P3iGuj+7Lo7ybsZ+1x104m7WzGgxr8dDDuw=";
+  };
+
+  build-system = [ setuptools ];
+
+  setupHook = ./setup-hook.sh;
+
+  dependencies = [
+    catkin-pkg
+    distro
+    distutils
+    pyyaml
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportCheck = [ "rospkg" ];
+
+  meta = {
+    description = "ROS package library for Python";
+    homepage = "http://wiki.ros.org/rospkg";
+    changelog = "https://github.com/ros-infrastructure/rospkg/blob/${version}/CHANGELOG.rst";
+    license = lib.licenses.bsd3;
+    maintainers = with lib.maintainers; [ guelakais ];
+  };
+}
diff --git a/pkgs/development/python-modules/rospkg/setup-hook.sh b/pkgs/development/python-modules/rospkg/setup-hook.sh
new file mode 100644
index 000000000000..cb4a79899a71
--- /dev/null
+++ b/pkgs/development/python-modules/rospkg/setup-hook.sh
@@ -0,0 +1 @@
+export ROS_OS_OVERRIDE=nixos
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 71da13207798..2378512f6376 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -16212,6 +16212,8 @@ self: super: with self; {
 
   rosbags = callPackage ../development/python-modules/rosbags { };
 
+  rospkg = callPackage ../development/python-modules/rospkg { };
+
   rotary-embedding-torch = callPackage ../development/python-modules/rotary-embedding-torch { };
 
   rouge-score = callPackage ../development/python-modules/rouge-score { };

From 53c2098b345f7330ab75b7831e8dfdfdc8ec41d3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 09:49:26 +0000
Subject: [PATCH 6101/6226] nu_scripts: 0-unstable-2025-10-15 ->
 0-unstable-2025-11-02

---
 pkgs/by-name/nu/nu_scripts/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nu/nu_scripts/package.nix b/pkgs/by-name/nu/nu_scripts/package.nix
index bc12cbaf6c8d..41a510f961a1 100644
--- a/pkgs/by-name/nu/nu_scripts/package.nix
+++ b/pkgs/by-name/nu/nu_scripts/package.nix
@@ -7,13 +7,13 @@
 
 stdenvNoCC.mkDerivation {
   pname = "nu_scripts";
-  version = "0-unstable-2025-10-15";
+  version = "0-unstable-2025-11-02";
 
   src = fetchFromGitHub {
     owner = "nushell";
     repo = "nu_scripts";
-    rev = "0b97c5e1444b13db7c263bee646dea1e1ffe4ddb";
-    hash = "sha256-tKMLaSNniylbo9f0wdUzUZm059RPqyFQlxMtiTPIkWQ=";
+    rev = "449dd3d06598714c2ba0ee3fa3556e24d034c624";
+    hash = "sha256-4ibgz7y1fsBn2aDuptqpdLd4Wdfx2sKGs7wVRJxCWW0=";
   };
 
   installPhase = ''

From 51408cf1b1f6f12a79c9f3533315393f41765722 Mon Sep 17 00:00:00 2001
From: Klaus Frank <2544867+agowa@users.noreply.github.com>
Date: Sun, 31 Aug 2025 14:15:01 +0200
Subject: [PATCH 6102/6226] biglybt: Fix swt and add add platforms

---
 pkgs/by-name/bi/biglybt/package.nix | 19 ++++++++++++++++++-
 pkgs/by-name/sw/swt/package.nix     | 11 +++++++++++
 2 files changed, 29 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/bi/biglybt/package.nix b/pkgs/by-name/bi/biglybt/package.nix
index ef6fa1cd71e7..63619e92bbfe 100644
--- a/pkgs/by-name/bi/biglybt/package.nix
+++ b/pkgs/by-name/bi/biglybt/package.nix
@@ -1,6 +1,7 @@
 {
   lib,
   stdenv,
+  swt,
   fetchurl,
   jre,
   wrapGAppsHook3,
@@ -16,7 +17,18 @@ stdenv.mkDerivation rec {
     hash = "sha256-NBXEY5f2kVPoZit7Gy4rM61bwQSdXovg0gURukhxJJ4=";
   };
 
-  nativeBuildInputs = [ wrapGAppsHook3 ];
+  nativeBuildInputs = [
+    swt
+    wrapGAppsHook3
+  ];
+
+  buildInputs = [
+    swt
+  ];
+
+  runtimeDeps = [
+    swt
+  ];
 
   configurePhase = ''
     runHook preConfigure
@@ -34,6 +46,11 @@ stdenv.mkDerivation rec {
 
     cp -r ./* $out/share/biglybt/
 
+    ln -s ${swt}/lib/* $out/share/biglybt/
+    rm -rf $out/share/biglybt/swt/*.jar $out/share/biglybt/swt/J17/*.jar
+    ln -s ${swt}/jars/swt.jar $out/share/biglybt/swt/swt-$(uname -m).jar
+    ln -s ${swt}/jars/swt.jar $out/share/biglybt/swt/J17/swt-$(uname -m).jar
+
     ln -s $out/share/biglybt/biglybt.desktop $out/share/applications/
 
     ln -s $out/share/biglybt/biglybt.svg $out/share/icons/hicolor/scalable/apps/
diff --git a/pkgs/by-name/sw/swt/package.nix b/pkgs/by-name/sw/swt/package.nix
index 75b6c994da35..da7139ae86b1 100644
--- a/pkgs/by-name/sw/swt/package.nix
+++ b/pkgs/by-name/sw/swt/package.nix
@@ -17,10 +17,21 @@ stdenv.mkDerivation (finalAttrs: {
   hardeningDisable = [ "format" ];
 
   passthru.srcMetadataByPlatform = {
+    # Note: This may look like an error but the content of the src.zip is in fact
+    # equal on all linux systems as well as all darwin systems. Even though each
+    # of these zip archives themselves contains a different hash.
     x86_64-linux.platform = "gtk-linux-x86_64";
     x86_64-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk=";
+    aarch64-linux.platform = "gtk-linux-aarch64";
+    aarch64-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk=";
+    ppc64le-linux.platform = "gtk-linux-ppc64le";
+    ppc64le-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk=";
+    riscv64-linux.platform = "gtk-linux-riscv64";
+    riscv64-linux.hash = "sha256-lKAB2aCI3dZdt3pE7uSvSfxc8vc3oMSTCx5R+71Aqdk=";
     x86_64-darwin.platform = "cocoa-macosx-x86_64";
     x86_64-darwin.hash = "sha256-Uns3fMoetbZAIrL/N0eVd42/3uygXakDdxpaxf5SWDI=";
+    aarch64-darwin.platform = "cocoa-macosx-aarch64";
+    aarch64-darwin.hash = "sha256-Uns3fMoetbZAIrL/N0eVd42/3uygXakDdxpaxf5SWDI";
   };
   passthru.srcMetadata =
     finalAttrs.passthru.srcMetadataByPlatform.${stdenv.hostPlatform.system} or null;

From 8c96f6aec9c3d202e56cf46cacf7e0216edf54e8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 10:27:46 +0000
Subject: [PATCH 6103/6226] vscode-extensions.saoudrizwan.claude-dev: 3.35.0 ->
 3.36.1

---
 .../vscode/extensions/saoudrizwan.claude-dev/default.nix      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
index c241ce3317ce..bb2eba5d4764 100644
--- a/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/saoudrizwan.claude-dev/default.nix
@@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension {
   mktplcRef = {
     name = "claude-dev";
     publisher = "saoudrizwan";
-    version = "3.35.0";
-    hash = "sha256-fPoSrpWHfDEGLbawTVV65MAQAXWUy6WTb7ijhKaoLvc=";
+    version = "3.36.1";
+    hash = "sha256-8pkX3KYwLr/jIHtWVmt+cx8CionKGjgSz6yFApSHR3g=";
   };
 
   meta = {

From de5156391e0a8290bdd8b8d172e603f5dc8c0769 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 10:43:57 +0000
Subject: [PATCH 6104/6226] aliyun-cli: 3.1.0 -> 3.1.2

---
 pkgs/by-name/al/aliyun-cli/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix
index 2c518e3952c5..f111d93990d1 100644
--- a/pkgs/by-name/al/aliyun-cli/package.nix
+++ b/pkgs/by-name/al/aliyun-cli/package.nix
@@ -8,13 +8,13 @@
 
 buildGoModule rec {
   pname = "aliyun-cli";
-  version = "3.1.0";
+  version = "3.1.2";
 
   src = fetchFromGitHub {
     owner = "aliyun";
     repo = "aliyun-cli";
     tag = "v${version}";
-    hash = "sha256-5gwI2lhEMkKZZnYwzyegVm8EByox1XexHjW799vVeLE=";
+    hash = "sha256-8nwCVhUMQLXnWcrA9XSOM6R+Y7E+H+gwSYXDjk2WtAs=";
     fetchSubmodules = true;
   };
 

From 4b0777a6115177a8161b474bc37db096f7a30881 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 11:11:23 +0000
Subject: [PATCH 6105/6226] usacloud: 1.19.2 -> 1.19.3

---
 pkgs/by-name/us/usacloud/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/us/usacloud/package.nix b/pkgs/by-name/us/usacloud/package.nix
index 95b59318b802..6111d773cefe 100644
--- a/pkgs/by-name/us/usacloud/package.nix
+++ b/pkgs/by-name/us/usacloud/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "usacloud";
-  version = "1.19.2";
+  version = "1.19.3";
 
   src = fetchFromGitHub {
     owner = "sacloud";
     repo = "usacloud";
     tag = "v${version}";
-    hash = "sha256-Yci2mka92covvddDehT5PkEdmaUnS2rhPn7FT3oCvks=";
+    hash = "sha256-uHZJnhj36NEAZxWfwrm0Dsw42NgQp37SgOduEGA8SEU=";
   };
 
-  vendorHash = "sha256-sSM7ZdGknhVvccKJtkwPmzwXEPRzUmxGlGojasqpul8=";
+  vendorHash = "sha256-bJV/m3b6UC3j1/SGJ7riz0GRxoCQ6lVU5DiatQWnIVc=";
 
   ldflags = [
     "-s"

From 226f0ae3f3f6982dc051d800449a66424764fc25 Mon Sep 17 00:00:00 2001
From: Kerstin Humm <kerstin@erictapen.name>
Date: Thu, 16 Oct 2025 12:32:42 +0200
Subject: [PATCH 6106/6226] mastodon: 4.4.8 -> 4.5.0

Changelog: https://github.com/mastodon/mastodon/releases/tag/v4.5.0

Co-authored-by: Izorkin <izorkin@elven.pw>
---
 nixos/modules/services/web-apps/mastodon.nix |   6 +
 pkgs/servers/mastodon/default.nix            |   8 +-
 pkgs/servers/mastodon/gemset.nix             | 805 +++++++++----------
 pkgs/servers/mastodon/missing-hashes.json    |  74 +-
 pkgs/servers/mastodon/source.nix             |   6 +-
 5 files changed, 439 insertions(+), 460 deletions(-)

diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix
index c1582b3ee9ff..9d71b8112cf4 100644
--- a/nixos/modules/services/web-apps/mastodon.nix
+++ b/nixos/modules/services/web-apps/mastodon.nix
@@ -838,6 +838,12 @@ in
               ));
             message = "There must be exactly one Sidekiq queue in services.mastodon.sidekiqProcesses with jobClass \"scheduler\".";
           }
+          {
+            assertion =
+              databaseActuallyCreateLocally
+              -> lib.versionAtLeast config.services.postgresql.finalPackage.version "14";
+            message = "Mastodon requires at least PostgreSQL 14.";
+          }
         ];
 
         environment.systemPackages = [ mastodonTootctl ];
diff --git a/pkgs/servers/mastodon/default.nix b/pkgs/servers/mastodon/default.nix
index 7614aae7bc6c..48e0e7155f6f 100644
--- a/pkgs/servers/mastodon/default.nix
+++ b/pkgs/servers/mastodon/default.nix
@@ -80,9 +80,11 @@ stdenv.mkDerivation rec {
       find public/assets -type f -regextype posix-extended -iregex '.*\.(css|html|js|json|svg)' \
         -exec gzip --best --keep --force {} ';' \
         -exec brotli --best --keep {} ';'
-
+      find public/packs -type f -regextype posix-extended -iregex '.*\.(css|js|json|svg)' \
+        -exec brotli --best --keep {} ';'
+      find public/packs/emoji -maxdepth 1 -type f -name '*.json' \
+        -exec gzip --best --keep --force {} ';'
       gzip --best --keep public/packs/sw.js
-      brotli --best --keep public/packs/sw.js
 
       runHook postBuild
     '';
@@ -124,6 +126,8 @@ stdenv.mkDerivation rec {
     # Remove execute permissions
     find public/emoji -type f ! -perm 0555 \
       -exec chmod 0444 {} ';'
+    find public -maxdepth 1 -type f ! -perm 0555 \
+      -exec chmod 0444 {} ';'
 
     # Create missing static gzip and brotli files
     find public -maxdepth 1 -type f -regextype posix-extended -iregex '.*\.(js|txt)' \
diff --git a/pkgs/servers/mastodon/gemset.nix b/pkgs/servers/mastodon/gemset.nix
index 9760b1b16a54..a45fb51ba0bd 100644
--- a/pkgs/servers/mastodon/gemset.nix
+++ b/pkgs/servers/mastodon/gemset.nix
@@ -11,10 +11,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18nn95z23m7cpfsypfnlvpblj9rbnkddbs396nljiflznc6v473g";
+      sha256 = "14vlhzrgfgmz0fvrvd81j9xfw8ig091yiwq496firapgxffd7jpq";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   actionmailbox = {
     dependencies = [
@@ -29,10 +29,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bbc1a2m8zp0ci2js8wz00fgyamkflkjimn1dz0632a43viwda4f";
+      sha256 = "0bxxqqflmczwl4ivcqjwwsnrhljcalk1i2hj02qisr3wjgw4811a";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   actionmailer = {
     dependencies = [
@@ -50,10 +50,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "176vgl9rhy9xqi5i1qdgw4ny8sr6jw32zjsq109sn7jl0j6lvq8d";
+      sha256 = "08y7ihafq71879ncq963rwi541b0gafqx8h5ba26zab521qc7h3d";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   actionpack = {
     dependencies = [
@@ -77,10 +77,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "02ibk3ldqs1xk74b8lycqh1g6bm4vj5ph8bjlln1brfv64df3rv1";
+      sha256 = "1lsspr8nffzn8qpfmj654w1qja1915x6bnzzhpbjj1cy235j2g6n";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   actiontext = {
     dependencies = [
@@ -95,10 +95,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1f6n43v5r9d0nq09g66rfkqfmx6pv89v01bvd731bndrrysv7i0c";
+      sha256 = "1x4xd8h5sdwdm3rc8h2pxxmq4a0i0wa0gk6c56zq58pzc3xgsihw";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   actionview = {
     dependencies = [
@@ -118,10 +118,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0izkrdg7r7432mw99d7cwhsr5s9whl3aqh5946i88yqbrc6d59if";
+      sha256 = "0rnfn44g217n9hgvn4ga7l0hl149b91djnl07nzra7kxy1pr8wai";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   active_model_serializers = {
     dependencies = [
@@ -151,10 +151,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "129bldx70vahaargg0spx5sdqw378591gbrq7b0zm3pc0zdg5rfn";
+      sha256 = "1dm1vc5vvk5pwq4x7sfh3g6qzzwbyac37ggh1mm1rzraharxv7j6";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   activemodel = {
     dependencies = [ "activesupport" ];
@@ -166,10 +166,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1i3y0ynf16cgc9p28603pxva528a91jgh8nz2d0q8cb5p36vdfhp";
+      sha256 = "0z565q17fmhj4b9j689r0xx1s26w1xcw8z0qyb6h8v0wb8j0fsa0";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   activerecord = {
     dependencies = [
@@ -185,10 +185,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1wbdijshd3dqgzwhdpb32ig6rz8my5zkmanj32fqiwskvmxnwmd6";
+      sha256 = "1a6fng58lria02wlwiqjgqway0nx1wq31dsxn5xvbk7958xwd5cv";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   activestorage = {
     dependencies = [
@@ -202,10 +202,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1y3nmzzr17fzxxi9vwi1lc3vc58x1j0i6s56wq0y4wal26g3vfs3";
+      sha256 = "0plck0b57b9ni8n52hj5slv5n8i7w3nfwq6r47nkb2hjbpmsskjg";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   activesupport = {
     dependencies = [
@@ -232,10 +232,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1ik1sm5sizrsnr3di0klh7rvsy9r9mmd805fv5srk66as5psf184";
+      sha256 = "08vqq5y6vniz30p747xa8yfqb3cz8scqd8r65wij62v661gcw4d7";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   addressable = {
     dependencies = [ "public_suffix" ];
@@ -281,10 +281,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0g6ahzpdbybryzlfrbb18pybr4230hw1n6g475hh61mk4nlqgl1y";
+      sha256 = "1xwbz5zk37f7p3g6ypxzamisay06hidjmdsrvhxw4q0xin4jw6w7";
       type = "gem";
     };
-    version = "4.16.0";
+    version = "4.20.0";
   };
   ast = {
     groups = [
@@ -314,20 +314,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1mvjjn8vh1c3nhibmjj9qcwxagj6m9yy961wblfqdmvhr9aklb3y";
+      sha256 = "0fqqdqg15rgwgz3mn4pj91agd20csk9gbrhi103d20328dfghsqi";
       type = "gem";
     };
-    version = "1.3.2";
+    version = "1.4.0";
   };
   aws-partitions = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1y34xkflb4fd54k1cbrd9xw6ff2znwn1drbnvy9ywngiyynwff1i";
+      sha256 = "0ys6h3hhhv2w9j9d2ls8d3aaqywdcbipiqnqwr09c6gmqv6fgvv5";
       type = "gem";
     };
-    version = "1.1103.0";
+    version = "1.1168.0";
   };
   aws-sdk-core = {
     dependencies = [
@@ -380,10 +380,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nx1il781qg58nwjkkdn9fw741cjjnixfsh389234qm8j5lpka2h";
+      sha256 = "003ch8qzh3mppsxch83ns0jra8d222ahxs96p9cdrl0grfazywv9";
       type = "gem";
     };
-    version = "1.11.0";
+    version = "1.12.1";
   };
   azure-blob = {
     dependencies = [ "rexml" ];
@@ -391,10 +391,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1zfl00vwx28a8s38spfxinicic1nd7q1phd3cmjxj8mwlfswc3j4";
+      sha256 = "198ndg8m0w54csxb3fidzpjp491ak9jcrmjc8zmp7axi0ncvbsmx";
       type = "gem";
     };
-    version = "0.5.8";
+    version = "0.5.9.1";
   };
   base64 = {
     groups = [
@@ -446,10 +446,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1kicilpma5l0lwayqjb5577bm0hbjndj2gh150xz09xsgc1l1vyl";
+      sha256 = "0v1337j39w1z7x9zs4q7ag0nfv4vs4xlsjx2la0wpv8s6hig2pa6";
       type = "gem";
     };
-    version = "0.4.1";
+    version = "0.5.0";
   };
   better_errors = {
     dependencies = [
@@ -478,10 +478,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1p2szbr4jdvmwaaj2kxlbv1rp0m6ycbgfyp0kjkkkswmniv5y21r";
+      sha256 = "0612spks81fvpv2zrrv3371lbs6mwd7w6g5zafglyk75ici1x87a";
       type = "gem";
     };
-    version = "3.2.2";
+    version = "3.3.1";
   };
   bindata = {
     groups = [ "default" ];
@@ -531,10 +531,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11ip6dgi7147wp8jgwk9g95k07323zh83q699d6wxif6rqdxj0mn";
+      sha256 = "164l8dh3c22c8448hgd0zqhsffxvn4d9wad2zzipav29sssjd532";
       type = "gem";
     };
-    version = "7.0.2";
+    version = "7.1.1";
   };
   browser = {
     groups = [ "default" ];
@@ -603,10 +603,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "09jyhmyngwbw2apc77z80kw4d4kd0wdvn46xxks7vjlzgywilipg";
+      sha256 = "0hnjmbhyvfs543g96bc4sx94fdx2054ng12g925vwmkx0wl1jnl7";
       type = "gem";
     };
-    version = "0.5.6";
+    version = "0.5.7";
   };
   case_transform = {
     dependencies = [ "activesupport" ];
@@ -624,10 +624,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1dsf9gjc2cj79vrnz2vgq573biqjw7ad4b0idm05xg6rb3y9gq4y";
+      sha256 = "1w3d5dhx4vjd707ihkcmq7fy78p5fgawcjdqw2byxnfw32gzgkbr";
       type = "gem";
     };
-    version = "0.5.9.8";
+    version = "0.5.10.1";
   };
   cgi = {
     groups = [ "default" ];
@@ -746,10 +746,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0nrhsk7b3sjqbyl1cah6ibf1kvi3v93a7wf4637d355hp614mmyg";
+      sha256 = "02p7l47gvchbvnbag6kb4x2hg8n28r25ybslyvrr2q214wir5qg9";
       type = "gem";
     };
-    version = "2.5.3";
+    version = "2.5.4";
   };
   cose = {
     dependencies = [
@@ -777,10 +777,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jaa7is4fw1cxigm8vlyhg05bw4nqy4f91zjqxk7pp4c8bdyyfn8";
+      sha256 = "0zjcdl5i6lw508r01dym05ibhkc784cfn93m1d26c7fk1hwi0jpz";
       type = "gem";
     };
-    version = "1.0.0";
+    version = "1.0.1";
   };
   crass = {
     groups = [
@@ -828,10 +828,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1jxzgg3yccp3gjncl5ih0y13dcappmy0y8pq85wgjj0yx5fh0ixy";
+      sha256 = "1203q6zdw14vwmnr2hw0d6b1rdz4d07w3kjg1my1zhw862gnnac8";
       type = "gem";
     };
-    version = "2.2.1";
+    version = "2.2.2";
   };
   database_cleaner-core = {
     groups = [
@@ -923,10 +923,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "041c6zrwm3za1scr07kdgmnlxj7lnrr1jcb832grkavf1sh9wf4h";
+      sha256 = "19j0vs9y0zixzvp14i7xkvk907q60w7q6d0bi91lbzf6km8zax4a";
       type = "gem";
     };
-    version = "6.1.0";
+    version = "6.2.0";
   };
   devise_pam_authenticatable2 = {
     dependencies = [
@@ -1032,10 +1032,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0nyrgj4a0ppk0qfp8cny4wb3hsr2cw55ynh2w973brhf54xxz5wc";
+      sha256 = "113f4b01pf6igzmb7zkbcd3zgp118gfsqc35ggw9p3bzkmgp2jlq";
       type = "gem";
     };
-    version = "1.2.0";
+    version = "1.3.0";
   };
   elasticsearch = {
     dependencies = [
@@ -1124,10 +1124,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "08rc8pzri3g7c85c76x84j05hkk12jvalrm2m3n97k1n7f03j13n";
+      sha256 = "0rqfmrgp4ihwmnpi9ah0y6pah7rr7d3pid94z2cqd93bgc2m6vjn";
       type = "gem";
     };
-    version = "5.0.1";
+    version = "5.1.3";
   };
   erubi = {
     groups = [
@@ -1151,10 +1151,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0r6zylqjfv0xhdxvldr0kgmnglm57nm506pcm6085f0xqa68cvnj";
+      sha256 = "1g785lz4z2k7jrdl7bnnjllzfrwpv9pyki94ngizj8cqfy83qzkc";
       type = "gem";
     };
-    version = "1.2.11";
+    version = "1.4.0";
   };
   excon = {
     dependencies = [ "logger" ];
@@ -1162,10 +1162,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "17asr18vawi08g3wbif0wdi8bnyj01d125saydl9j1f03fv0n16a";
+      sha256 = "1gj6h2r9ylkmz9wjlf6p04d3hw99qfnf0wb081lzjx3alk13ngfq";
       type = "gem";
     };
-    version = "1.2.5";
+    version = "1.3.0";
   };
   fabrication = {
     groups = [
@@ -1189,10 +1189,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1z4vhl6lbd0la2j0ab05sz8wq5mqvpikzhjrc142z24x4zmgpl8s";
+      sha256 = "0wy4i4vl3h2v6scffx0zbp74vq1gfgq55m8x3n05kwp3na8h5a7r";
       type = "gem";
     };
-    version = "3.5.1";
+    version = "3.5.2";
   };
   faraday = {
     dependencies = [
@@ -1204,10 +1204,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0xbv450qj2bx0qz9l2pjrd3kc057y6bglc3na7a78zby8ssiwlyc";
+      sha256 = "1ka175ci0q9ylpcy651pjj580diplkaskycn4n7jcmbyv7jwz6c6";
       type = "gem";
     };
-    version = "2.13.1";
+    version = "2.14.0";
   };
   faraday-follow_redirects = {
     dependencies = [ "faraday" ];
@@ -1215,10 +1215,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1y87p3yk15bjbk0z9mf01r50lzxvp7agr56lbm9gxiz26mb9fbfr";
+      sha256 = "1nfmmnmqgbxci7dlca0qnwxn8j29yv7v8wm26m0f4l0kmcc13ynk";
       type = "gem";
     };
-    version = "0.3.0";
+    version = "0.4.0";
   };
   faraday-httpclient = {
     dependencies = [ "httpclient" ];
@@ -1237,10 +1237,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1";
+      sha256 = "0fxbckg468dabkkznv48ss8zv14d9cd8mh1rr3m98aw7wzx5fmq9";
       type = "gem";
     };
-    version = "3.4.0";
+    version = "3.4.1";
   };
   fast_blank = {
     groups = [ "default" ];
@@ -1362,14 +1362,15 @@
     version = "1.1.5";
   };
   formatador = {
+    dependencies = [ "reline" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1l06bv4avphbdmr1y4g0rqlczr38k6r65b3zghrbj2ynyhm3xqjl";
+      sha256 = "18jdg7y4746pfisvab6i3j1vl61bzhiap52dv8sf2i5g0kybian8";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.2.1";
   };
   forwardable = {
     groups = [ "default" ];
@@ -1390,10 +1391,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0s4qhq3mjl0gak5wl20w9d5jhq069mk1393dkj76s8i2pvkqb578";
+      sha256 = "00v5zy1s7cl4hbaaz2sqp02g6kaajn1yslvfpqcra55hndvdyg83";
       type = "gem";
     };
-    version = "1.11.1";
+    version = "1.12.0";
   };
   globalid = {
     dependencies = [ "activesupport" ];
@@ -1404,10 +1405,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1sbw6b66r7cwdx3jhs46s4lr991969hvigkjpbdl7y3i31qpdgvh";
+      sha256 = "04gzhqvsm4z4l12r9dkac9a75ah45w186ydhl0i4andldsnkkih5";
       type = "gem";
     };
-    version = "1.2.1";
+    version = "1.3.0";
   };
   google-protobuf = {
     dependencies = [
@@ -1421,10 +1422,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "14a8pv6npmv3ppp5097rladsynk8fs4w6chlcylkls6xj9ngxdjd";
+      sha256 = "1rqmj1sl0bs42jjxdfpcqs8sgq6zvhjdixbsciaj1043l993zv6r";
       type = "gem";
     };
-    version = "4.31.0";
+    version = "4.32.1";
   };
   googleapis-common-protos-types = {
     dependencies = [ "google-protobuf" ];
@@ -1435,10 +1436,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0zyh9pxsw4zwv3iissirwqnx98qzkywqf3bwdrai6zpwph34ndsy";
+      sha256 = "1iy4pxpsbxjdiyd03mslalbcvrrga57h1mb0r0c01nnngfvr4x7r";
       type = "gem";
     };
-    version = "1.20.0";
+    version = "1.22.0";
   };
   haml = {
     dependencies = [
@@ -1469,10 +1470,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1sjrdwc4azzfpsp2xk0365z031482gcrs0c54d5wx0igkqca0fr7";
+      sha256 = "0psqln0xs2hkcziag6m9fiwsaxyg3q7vazy8rbcj39awm2bf87q9";
       type = "gem";
     };
-    version = "2.1.0";
+    version = "3.0.0";
   };
   haml_lint = {
     dependencies = [
@@ -1486,10 +1487,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gvkhb18inkwkf9ja1i774975l259dzlvcvjii3zfyzmzylki5qb";
+      sha256 = "1v64nbbckmfgi7b5c5j609mpcdyhbf7gav3n99xjy5fpyca7hpab";
       type = "gem";
     };
-    version = "0.64.0";
+    version = "0.66.0";
   };
   hashdiff = {
     groups = [
@@ -1499,10 +1500,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0xqsnx25lm1wwgchvrl5xla5zzk3d6gbkdfj062cwggdsvgfwc1c";
+      sha256 = "1lbw8lqzjv17vnwb9vy5ki4jiyihybcc5h2rmcrqiz1xa6y9s1ww";
       type = "gem";
     };
-    version = "1.1.2";
+    version = "1.2.1";
   };
   hashie = {
     groups = [ "default" ];
@@ -1555,10 +1556,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "07sm9gp4l2khw8m259paw1xcy9yd1jabqnyjzsrgl3ndgqgrj6f8";
+      sha256 = "0nsw7h1hab5f4hy778kd21y8q4hfiy0j9yxa5pjp3g49a9jl9jh6";
       type = "gem";
     };
-    version = "0.24.0";
+    version = "0.26.1";
   };
   hkdf = {
     groups = [ "default" ];
@@ -1605,10 +1606,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19hsskzk5zpv14mnf07pq71hfk1fsjwfjcw616pgjjzjbi2f0kxi";
+      sha256 = "06dvmngd4hwrr6k774i1h6c50h2l8nww9f1id0wvrvi72l6yd99q";
       type = "gem";
     };
-    version = "1.0.8";
+    version = "1.1.0";
   };
   http-form_data = {
     groups = [ "default" ];
@@ -1650,10 +1651,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "098n4dfmiydbm9if52h17kxglbli9gihjgzhcghv274ni2c9ab49";
+      sha256 = "04d75idhzybfr1zn0n8c6mk3ssgl3vh6cqkgcwc5rr0csh0sf3gb";
       type = "gem";
     };
-    version = "1.7.0";
+    version = "1.7.3";
   };
   i18n = {
     dependencies = [ "concurrent-ruby" ];
@@ -1729,10 +1730,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18pgvl7lfjpichdfh1g50rpz0zpaqrpr52ybn9liv1v9pjn9ysnd";
+      sha256 = "1jszj95hazqqpnrjjzr326nn1j32xmsc9xvd97mbcrrgdc54858y";
       type = "gem";
     };
-    version = "0.8.0";
+    version = "0.8.1";
   };
   irb = {
     dependencies = [
@@ -1750,10 +1751,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1fpxa2m83rb7xlzs57daqwnzqjmz6j35xr7zb15s73975sak4br2";
+      sha256 = "1aja320qnimlnfc80wf2i2x8i99kl5sdzfacsfzzfzzs3vzysja3";
       type = "gem";
     };
-    version = "1.15.2";
+    version = "1.15.3";
   };
   jd-paperclip-azure = {
     dependencies = [
@@ -1784,14 +1785,15 @@
     groups = [
       "default"
       "development"
+      "test"
     ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1x5b8ipv6g0z44wgc45039k04smsyf95h2m5m67mqq35sa5a955s";
+      sha256 = "128bp3mihh175l9wm7hgg9sdisp6hd3kf36fw01iksqnq7kv5hdi";
       type = "gem";
     };
-    version = "2.12.2";
+    version = "2.15.1";
   };
   json-canonicalization = {
     groups = [ "default" ];
@@ -1816,10 +1818,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19bjs404inbydn40nampk5ij7vqkwpmqp3hp4dmjf50sdm6gzayc";
+      sha256 = "1k64mp59jlbqd5hyy46pf93s3yl1xdngfy8i8flq2hn5nhk91ybg";
       type = "gem";
     };
-    version = "1.16.7";
+    version = "1.17.0";
   };
   json-ld = {
     dependencies = [
@@ -1849,10 +1851,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0l32rjawsxhgi59y7lmjwgmnk32585gih1ylvy08m3vx7cdbzmdg";
+      sha256 = "1q8y2f9c9940sgqdb57zmlbhjx3rvmq2l8kpi3a9bgzkx8kl6aa6";
       type = "gem";
     };
-    version = "3.3.1";
+    version = "3.3.2";
   };
   json-schema = {
     dependencies = [
@@ -1863,10 +1865,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gzrf6q4d9kbixj6bpi2bp8dizmqxcmlq30ni86h3ifzpkcrm0mk";
+      sha256 = "0gv3b0nry1sn1n7imfs2drqyfp4g8b2zcrizjc98j04pl7xszv3r";
       type = "gem";
     };
-    version = "5.1.1";
+    version = "6.0.0";
   };
   jsonapi-renderer = {
     groups = [ "default" ];
@@ -1884,10 +1886,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1i8wmzgb5nfhvkx1f6bhdwfm7v772172imh439v3xxhkv3hllhp6";
+      sha256 = "1x64l31nkqjwfv51s2vsm0yqq4cwzrlnji12wvaq761myx3fxq9i";
       type = "gem";
     };
-    version = "2.10.1";
+    version = "2.10.2";
   };
   kaminari = {
     dependencies = [
@@ -2058,10 +2060,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0v2dxpc7g2b0b300mpx2janhzph3j8vrjxj5k42bidla7j74kbl7";
+      sha256 = "09rjxsmmnahxsaw0hc4f0ffw4rcncjxa01xd9v5z4q9radfidr5j";
       type = "gem";
     };
-    version = "0.7.3";
+    version = "0.7.7";
   };
   llhttp-ffi = {
     dependencies = [
@@ -2131,6 +2133,7 @@
   };
   mail = {
     dependencies = [
+      "logger"
       "mini_mime"
       "net-imap"
       "net-pop"
@@ -2144,10 +2147,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bf9pysw1jfgynv692hhaycfxa8ckay1gjw5hz3madrbrynryfzc";
+      sha256 = "0ha9sgkfqna62c1basc17dkx91yk7ppgjq32k4nhrikirlz6g9kg";
       type = "gem";
     };
-    version = "2.8.1";
+    version = "2.9.0";
   };
   marcel = {
     groups = [ "default" ];
@@ -2178,10 +2181,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1h2cgkpzkh3dd0flnnwfq6f3nl2b1zff9lvqz8xs853ssv5kq23i";
+      sha256 = "0nscas3a4mmrp1rc07cdjlbbpb2rydkindmbj3v3z5y1viyspmd0";
       type = "gem";
     };
-    version = "0.4.2";
+    version = "0.4.3";
   };
   memory_profiler = {
     groups = [
@@ -2221,10 +2224,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0lnkfxcayx682rjjxmkjaaxq605akfka90m5rliw897sli6nprcj";
+      sha256 = "0a27k4jcrx7pvb0p59fn1frh14iy087c2aygrdkmgwsrbshvqxpj";
       type = "gem";
     };
-    version = "3.2025.0514";
+    version = "3.2025.0924";
   };
   mini_mime = {
     groups = [
@@ -2267,10 +2270,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mn7q9yzrwinvfvkyjiz548a4rmcwbmz2fn9nyzh4j1snin6q6rr";
+      sha256 = "0c1c9lr7h0bnf48xj5sylg2cs2awrb0hfxwimiz4yfl6kz87m0gm";
       type = "gem";
     };
-    version = "5.25.5";
+    version = "5.26.0";
   };
   msgpack = {
     groups = [ "default" ];
@@ -2287,10 +2290,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z";
+      sha256 = "06sabsvnw0x1aqdcswc6bqrqz6705548bfd8z22jxgxfjrn1yn3n";
       type = "gem";
     };
-    version = "1.15.0";
+    version = "1.17.0";
   };
   mutex_m = {
     groups = [ "default" ];
@@ -2326,20 +2329,24 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "14zmzjy2sp87ac6iygkk3pz9snjvx4ks681vg4gxz8x8q7gmzajj";
+      sha256 = "0i24prs7yy1p1zdps2x1ksb7lmvbn2f0llxwdjdw3z2ksddx136b";
       type = "gem";
     };
-    version = "0.5.8";
+    version = "0.5.12";
   };
   net-ldap = {
+    dependencies = [
+      "base64"
+      "ostruct"
+    ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0g9gz39bs2iy4ky4fhjphimqd9m9wdsaz50anxgwg3yjrff3famy";
+      sha256 = "0wjkrvcwnxa6ggq0nfz004f1blm1c67fv7c6614sraak0wshn25j";
       type = "gem";
     };
-    version = "0.19.0";
+    version = "0.20.0";
   };
   net-pop = {
     dependencies = [ "net-protocol" ];
@@ -2411,10 +2418,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0czsh9d738kj0bmpkjnczq9j924hg103gc00i0wfyg0fzn9psnmc";
+      sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m";
       type = "gem";
     };
-    version = "1.18.9";
+    version = "1.18.10";
   };
   oj = {
     dependencies = [
@@ -2433,6 +2440,7 @@
   omniauth = {
     dependencies = [
       "hashie"
+      "logger"
       "rack"
       "rack-protection"
     ];
@@ -2440,10 +2448,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1hjnb5b5m549irs0h1455ipzsv82pikdagx9wjb6r4j1bkjy494d";
+      sha256 = "0g3n12k5npmmgai2cs3snimy6r7h0bvalhjxv0fjxlphjq25p822";
       type = "gem";
     };
-    version = "2.1.3";
+    version = "2.1.4";
   };
   omniauth-cas = {
     dependencies = [
@@ -2455,10 +2463,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1yynk95xhccvkb1j7rcb834ch80y85n2bhyimq946ib487z8wcx1";
+      sha256 = "03b034imgj5jwflc4db7hsp0n5ivqyqkmsfhc5drlidrcdfv2f0q";
       type = "gem";
     };
-    version = "3.0.1";
+    version = "3.0.2";
   };
   omniauth-rails_csrf_protection = {
     dependencies = [
@@ -2531,10 +2539,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0dzq3k5hmqlav2mwf7bc10mr1mlmlnpin498g7jhbhpdpa324s6n";
+      sha256 = "0v0grpg9gi59zr3imxy1745k9rp3dd095mkir8gvxi69blhh2kkz";
       type = "gem";
     };
-    version = "3.3.1";
+    version = "3.3.2";
   };
   openssl-signature_algorithm = {
     dependencies = [ "openssl" ];
@@ -2555,10 +2563,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "15x9bq13k53k14r3h5r0pn7cnl3g7pdy0p0662k1s2x7mgkk7k4d";
+      sha256 = "0kr1jyk67zn4axafcb2fji5b8xvr56hhfg2y33s5pnzjlr72dzfc";
       type = "gem";
     };
-    version = "1.5.0";
+    version = "1.7.0";
   };
   opentelemetry-common = {
     dependencies = [ "opentelemetry-api" ];
@@ -2569,10 +2577,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "13c7qnqai6djfd6rjwdwcwbz9f77vcmy0chx1avpxmiqz2h9cpnf";
+      sha256 = "0b5k7qc81ln96ayba90hm6ww7qpk8y7lc1r2mphblmwx8y812wns";
       type = "gem";
     };
-    version = "0.22.0";
+    version = "0.23.0";
   };
   opentelemetry-exporter-otlp = {
     dependencies = [
@@ -2587,10 +2595,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "15xssmviwsi7wqmrbx5khm2imvwsrzmxdli7rkvzqbbqpd309jq7";
+      sha256 = "0jj78y79mawj86v5g3kcz6k81izd0m0w47wyyk2br744swbvwn2k";
       type = "gem";
     };
-    version = "0.30.0";
+    version = "0.31.1";
   };
   opentelemetry-helpers-sql = {
     dependencies = [ "opentelemetry-api" ];
@@ -2601,10 +2609,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "13fvxvia6qxrdz06s5g4bs4fc1hdgkps7yz45s2n26wxqv163s0r";
+      sha256 = "0kc8pdlm2avyvahg40bfbrimxmvmra0i30m4ha3pzvn6r9xrf8wz";
       type = "gem";
     };
-    version = "0.1.1";
+    version = "0.2.0";
   };
   opentelemetry-helpers-sql-obfuscation = {
     dependencies = [ "opentelemetry-common" ];
@@ -2615,35 +2623,13 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0jwyx8jk1faszd20s0qrvgvxs9ddvnfrqixy099pn9lqizandn7m";
-      type = "gem";
-    };
-    version = "0.3.0";
-  };
-  opentelemetry-instrumentation-action_mailer = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-active_support"
-      "opentelemetry-instrumentation-base"
-    ];
-    groups = [
-      "default"
-      "opentelemetry"
-    ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "18p9dvq4mb8s5f1ndabjng07yabv5xgl5d80fcvc1383faarbdg8";
+      sha256 = "0h935j5ah9s2v9qm61ddp62kaffk1rn8assgljqap3fz2fgijlkj";
       type = "gem";
     };
     version = "0.4.0";
   };
-  opentelemetry-instrumentation-action_pack = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-      "opentelemetry-instrumentation-rack"
-    ];
+  opentelemetry-instrumentation-action_mailer = {
+    dependencies = [ "opentelemetry-instrumentation-active_support" ];
     groups = [
       "default"
       "opentelemetry"
@@ -2651,17 +2637,27 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1k09hr93fib38i6ajh0abkfvpvng6k2qsvds4jd08znfzyjs17jf";
+      sha256 = "0mqh8z6myff0j11zcnm34s1lc8qzmzzqdrhzk95y2sh6vdmqd143";
       type = "gem";
     };
-    version = "0.12.1";
+    version = "0.6.1";
+  };
+  opentelemetry-instrumentation-action_pack = {
+    dependencies = [ "opentelemetry-instrumentation-rack" ];
+    groups = [
+      "default"
+      "opentelemetry"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0wzj0xmivyx243slz526z54lqyhsiyzzrbha4szyxjl30xsdxyl4";
+      type = "gem";
+    };
+    version = "0.15.1";
   };
   opentelemetry-instrumentation-action_view = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-active_support"
-      "opentelemetry-instrumentation-base"
-    ];
+    dependencies = [ "opentelemetry-instrumentation-active_support" ];
     groups = [
       "default"
       "opentelemetry"
@@ -2669,45 +2665,35 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0qf5pklfyxrn2pskhmhd1gnp9i72yaqw114rmc5nrxhbcm24chsb";
+      sha256 = "16gmwl1v4jnz1x670qprkbc35phnbpbljsp2mcr71dq4fvfk8qa2";
       type = "gem";
     };
-    version = "0.9.0";
+    version = "0.11.1";
   };
   opentelemetry-instrumentation-active_job = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
+    dependencies = [ "opentelemetry-instrumentation-base" ];
     groups = [ "opentelemetry" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gb1snnd087nh8r5vvnl8ahg3k3bi2b9rb1m8r2aj7220m78hpcx";
+      sha256 = "129ajjrxigl4pag1nlzbdv1js5bij4ll92i1ix50c3f24h9338df";
       type = "gem";
     };
-    version = "0.8.0";
+    version = "0.10.1";
   };
   opentelemetry-instrumentation-active_model_serializers = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-active_support"
-      "opentelemetry-instrumentation-base"
-    ];
+    dependencies = [ "opentelemetry-instrumentation-active_support" ];
     groups = [ "opentelemetry" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gjbdkamj147vd1hcjyyqir8z4nwmd05a8ac3h94y3n9n6phzzgx";
+      sha256 = "05ff7yxy2v96kslsqn1y68669is00798i9fgk9fy85vx2r21xs4g";
       type = "gem";
     };
-    version = "0.22.0";
+    version = "0.24.0";
   };
   opentelemetry-instrumentation-active_record = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
+    dependencies = [ "opentelemetry-instrumentation-base" ];
     groups = [
       "default"
       "opentelemetry"
@@ -2715,17 +2701,13 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0h01lq8xjjdaprprqzj6alq7gw9lwdkkakjjyyxsg3ylpwnvkg4w";
+      sha256 = "14kwks0130mrggk3irg4qvx5fmwk9gxv6w23dy6ryi50xqs3y20v";
       type = "gem";
     };
-    version = "0.9.0";
+    version = "0.11.1";
   };
   opentelemetry-instrumentation-active_storage = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-active_support"
-      "opentelemetry-instrumentation-base"
-    ];
+    dependencies = [ "opentelemetry-instrumentation-active_support" ];
     groups = [
       "default"
       "opentelemetry"
@@ -2733,16 +2715,13 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "00x7yjzflxmqiywczlih6vi301b1xm6rwbwlzv0hx87cpdm94m56";
+      sha256 = "17p8zmfyigdqvgy3d1691ayzm6nj4q4nx2n3qk01f7wjakphz6zq";
       type = "gem";
     };
-    version = "0.1.1";
+    version = "0.3.1";
   };
   opentelemetry-instrumentation-active_support = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
+    dependencies = [ "opentelemetry-instrumentation-base" ];
     groups = [
       "default"
       "opentelemetry"
@@ -2750,10 +2729,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "16frcxhnb5vjihkff3wl6pnq0m4wkpii7la1d25d03j29qsh5qcv";
+      sha256 = "0zf5kg2h9zgmrwnq7v7by2nyhkxa20gmi5nyqqrpwyaqf4v9isl2";
       type = "gem";
     };
-    version = "0.8.0";
+    version = "0.10.1";
   };
   opentelemetry-instrumentation-base = {
     dependencies = [
@@ -2768,98 +2747,79 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0l0w7iya56y458mzws9q246whff2bf597553d5i3xkrcxb707qdk";
-      type = "gem";
-    };
-    version = "0.23.0";
-  };
-  opentelemetry-instrumentation-concurrent_ruby = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
-    groups = [ "opentelemetry" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "15v8khcyg9wz5v7kysagkbmdv895qahb0b6q7ajk2qznniaix9pv";
-      type = "gem";
-    };
-    version = "0.22.0";
-  };
-  opentelemetry-instrumentation-excon = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
-    groups = [ "opentelemetry" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "01rzi9d1hi402a8vdr439by4zy8x4rfq3vwnlzz3nzs50mxcbr9s";
-      type = "gem";
-    };
-    version = "0.23.0";
-  };
-  opentelemetry-instrumentation-faraday = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
-    groups = [ "opentelemetry" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0r25vvkxawngzm7an652npawjhir6zwics8635k5z7d60hfb2xi3";
-      type = "gem";
-    };
-    version = "0.27.0";
-  };
-  opentelemetry-instrumentation-http = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
-    groups = [ "opentelemetry" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0p9z9nwrf71inh7n84i37x156da1vm7mqnfp3jh6faqiar65icl1";
+      sha256 = "09ysfv2x25svwl4yxrbgmjkwrlkylr7plci3jjb6wkim11zklak4";
       type = "gem";
     };
     version = "0.25.0";
   };
-  opentelemetry-instrumentation-http_client = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
+  opentelemetry-instrumentation-concurrent_ruby = {
+    dependencies = [ "opentelemetry-instrumentation-base" ];
     groups = [ "opentelemetry" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1p4w5zd2b0ndzwwfc8np1xyp4kzd59k7hpcwpkk0ghlmbnsmbkwh";
+      sha256 = "1lniyy8yzmvz1mrh7az0yn94j4d9p0vvd6v0jgk9vi8042vxi6r2";
       type = "gem";
     };
-    version = "0.23.0";
+    version = "0.24.0";
+  };
+  opentelemetry-instrumentation-excon = {
+    dependencies = [ "opentelemetry-instrumentation-base" ];
+    groups = [ "opentelemetry" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "01rwnxml7h9vcwfdf2n1zr6kfxfcplr1i00aga8xd76wmbvld8fg";
+      type = "gem";
+    };
+    version = "0.26.0";
+  };
+  opentelemetry-instrumentation-faraday = {
+    dependencies = [ "opentelemetry-instrumentation-base" ];
+    groups = [ "opentelemetry" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0n32aqsqj9lf46mvm1pr5f2j386aq1jia00aajp4qpb9vgf0jnq1";
+      type = "gem";
+    };
+    version = "0.30.0";
+  };
+  opentelemetry-instrumentation-http = {
+    dependencies = [ "opentelemetry-instrumentation-base" ];
+    groups = [ "opentelemetry" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0ad0rrw0a74dzlhpcyccas54cl9zggfvdjxs6hdklhwkdla0vmr7";
+      type = "gem";
+    };
+    version = "0.27.0";
+  };
+  opentelemetry-instrumentation-http_client = {
+    dependencies = [ "opentelemetry-instrumentation-base" ];
+    groups = [ "opentelemetry" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "1mfa0ma9kl5yjzm1kph01y7cwk99nib4vibwz7d76rrk7qmiisx8";
+      type = "gem";
+    };
+    version = "0.26.0";
   };
   opentelemetry-instrumentation-net_http = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
+    dependencies = [ "opentelemetry-instrumentation-base" ];
     groups = [ "opentelemetry" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "100a3kzk8ckifxaw0n6xpg6hxxw0yrqmfwjp47khgy2831r3n4li";
+      sha256 = "14hx651frq9hncd14vi3yh5isrjsj2nalziy68k5j8afh4ydrhaf";
       type = "gem";
     };
-    version = "0.23.0";
+    version = "0.26.0";
   };
   opentelemetry-instrumentation-pg = {
     dependencies = [
-      "opentelemetry-api"
       "opentelemetry-helpers-sql"
       "opentelemetry-helpers-sql-obfuscation"
       "opentelemetry-instrumentation-base"
@@ -2868,28 +2828,24 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "09sgqwxavzgd7gsgr5w909p794g75602qsn6jvhs5qqj03bkldc5";
+      sha256 = "02pvkv1f374ibvpnha8y64zdjdyav7rk77rz9bkxnn61gcnvip56";
       type = "gem";
     };
-    version = "0.30.1";
+    version = "0.32.0";
   };
   opentelemetry-instrumentation-rack = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
+    dependencies = [ "opentelemetry-instrumentation-base" ];
     groups = [ "opentelemetry" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1bbvp2mnbcrldcp3hzm2fv52zdsqf0i9kz4r12msq24f6l5r2mca";
+      sha256 = "0xzk88iiiggx3kdfy5y75cb79cc5gn8jsl1vwg5n8w086s1vnb4y";
       type = "gem";
     };
-    version = "0.26.0";
+    version = "0.29.0";
   };
   opentelemetry-instrumentation-rails = {
     dependencies = [
-      "opentelemetry-api"
       "opentelemetry-instrumentation-action_mailer"
       "opentelemetry-instrumentation-action_pack"
       "opentelemetry-instrumentation-action_view"
@@ -2897,45 +2853,38 @@
       "opentelemetry-instrumentation-active_record"
       "opentelemetry-instrumentation-active_storage"
       "opentelemetry-instrumentation-active_support"
-      "opentelemetry-instrumentation-base"
       "opentelemetry-instrumentation-concurrent_ruby"
     ];
     groups = [ "opentelemetry" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05xpiq4j17vcjnrxxb0zkb67c4y2b7q1g4qvf6ln83b6svx2c7pj";
+      sha256 = "0vy93a3hpi8l8crljxwxzxwmvyf9gg1pff6dnpxl0c2ljmwdynbr";
       type = "gem";
     };
-    version = "0.36.0";
+    version = "0.39.1";
   };
   opentelemetry-instrumentation-redis = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
+    dependencies = [ "opentelemetry-instrumentation-base" ];
     groups = [ "opentelemetry" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "183v8q8a74fc9dnb6ny44dsgq6142smic6x4ivz3v50casjznpii";
+      sha256 = "001rd4ix10hja64y2arhpcd0hlmjilx7zlb4slmx4zaj3iyra8c7";
       type = "gem";
     };
-    version = "0.26.1";
+    version = "0.28.0";
   };
   opentelemetry-instrumentation-sidekiq = {
-    dependencies = [
-      "opentelemetry-api"
-      "opentelemetry-instrumentation-base"
-    ];
+    dependencies = [ "opentelemetry-instrumentation-base" ];
     groups = [ "opentelemetry" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1lpkc1ihifbjns2wf17kf9pmhx73j3i1in4fkar469k4i2fylfl5";
+      sha256 = "0vi2ac1l66vsflslxv6ay4ml95svcq53v8rdmwf2c3vl94f6b3bl";
       type = "gem";
     };
-    version = "0.26.1";
+    version = "0.28.0";
   };
   opentelemetry-registry = {
     dependencies = [ "opentelemetry-api" ];
@@ -2962,10 +2911,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1xqx6zxf6msrryz5hr2s3nwakin0nmxfgz9bkwpmpbf7lss7kngs";
+      sha256 = "06jjh25s94lv94ljgbq13baqgnkccdsvzsw6xg54vwldpr4rjwa3";
       type = "gem";
     };
-    version = "1.8.0";
+    version = "1.10.0";
   };
   opentelemetry-semantic_conventions = {
     dependencies = [ "opentelemetry-api" ];
@@ -2976,10 +2925,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1jzx18lmcv27pma1hbrccb9g6daadd6c4192r8w8x2nli3shkwl9";
+      sha256 = "05znn2iijg1qli52m09bgyq4b74nfs5nwgz2z73sllvqpiyn1cf1";
       type = "gem";
     };
-    version = "1.11.0";
+    version = "1.36.0";
   };
   orm_adapter = {
     groups = [
@@ -2999,10 +2948,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9";
+      sha256 = "04nrir9wdpc4izqwqbysxyly8y7hsfr4fsv69rw91lfi9d5fv8lm";
       type = "gem";
     };
-    version = "0.6.1";
+    version = "0.6.3";
   };
   ox = {
     dependencies = [ "bigdecimal" ];
@@ -3040,10 +2989,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0i9w8msil4snx5w11ix9b0wf52vjc3r49khy3ddgl1xk890kcxi4";
+      sha256 = "1wl7frfk68q6gsf6q6j32jl5m3yc0b9x8ycxz3hy79miaj9r5mll";
       type = "gem";
     };
-    version = "3.3.8.0";
+    version = "3.3.9.0";
   };
   parslet = {
     groups = [ "default" ];
@@ -3071,10 +3020,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1p2gqqrm895fzr9vi8d118zhql67bm8ydjvgqbq1crdnfggzn7kn";
+      sha256 = "0xf8i58shwvwlka4ld12nxcgqv0d5r1yizsvw74w5jaw83yllqaq";
       type = "gem";
     };
-    version = "1.5.9";
+    version = "1.6.2";
   };
   pghero = {
     dependencies = [ "activerecord" ];
@@ -3092,17 +3041,14 @@
       "concurrent-ruby"
       "mime-types"
     ];
-    groups = [
-      "default"
-      "test"
-    ];
+    groups = [ "test" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "114wkr2hj55c7n4xq30nb4g7kcm9a1mhsy0934jr9mzwfr0kyhaa";
+      sha256 = "02ivcflls7fy5axsqk602rqgfq9r6p8pmqkcxp9sdpgvvf8hflb0";
       type = "gem";
     };
-    version = "1.52.0";
+    version = "1.55.0";
   };
   pp = {
     dependencies = [ "prettyprint" ];
@@ -3116,10 +3062,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1zxnfxjni0r9l2x42fyq0sqpnaf5nakjbap8irgik4kg1h9c6zll";
+      sha256 = "1xlxmg86k5kifci1xvlmgw56x88dmqf04zfzn7zcr4qb8ladal99";
       type = "gem";
     };
-    version = "0.6.2";
+    version = "0.6.3";
   };
   premailer = {
     dependencies = [
@@ -3175,10 +3121,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gkhpdjib9zi9i27vd9djrxiwjia03cijmd6q8yj2q1ix403w3nw";
+      sha256 = "07fz0p6nlifm983cac3ayi7nwrpb5l4s3jl7p70imbsm79k429qr";
       type = "gem";
     };
-    version = "1.4.0";
+    version = "1.5.2";
   };
   prometheus_exporter = {
     dependencies = [ "webrick" ];
@@ -3186,26 +3132,25 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "15vl8fw8vjnaj9g129dzrwk9nlrdqgffaj3rys4ba9ns2bqim9rq";
+      sha256 = "0x98zrcd83dq1y9qhshx8hqvlvy81wlns6k15hq1xr3lrsdxvrdz";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.3.0";
   };
   propshaft = {
     dependencies = [
       "actionpack"
       "activesupport"
       "rack"
-      "railties"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0sqg0xf46xd47zdpm8d12kfnwl0y5jb2hj10imzb3bk6mwgkd2fk";
+      sha256 = "14n3fhz5hzpsczp4spqc26csfgk2qga7mgcm7px9z0byyr76dk4s";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.3.1";
   };
   psych = {
     dependencies = [
@@ -3247,10 +3192,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "11xd3207k5rl6bz0qxhcb3zcr941rhx7ig2f19gxxmdk7s3hcp7j";
+      sha256 = "1pa9zpr51kqnsq549p6apvnr95s9flx6bnwqii24s8jg2b5i0p74";
       type = "gem";
     };
-    version = "6.6.0";
+    version = "7.1.0";
   };
   pundit = {
     dependencies = [ "activesupport" ];
@@ -3258,10 +3203,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1nmy0nkgayjifi2j38fn55nb7z1xq3ma2wp19d7c7rmz7ynvidjg";
+      sha256 = "1gcb23749jwggmgic4607ky6hm2c9fpkya980iihpy94m8miax73";
       type = "gem";
     };
-    version = "2.5.0";
+    version = "2.5.2";
   };
   raabro = {
     groups = [ "default" ];
@@ -3300,10 +3245,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0i44156w3k6c88nv72wskizpyq3nwysisnj9qi9vkxwffrzp17b6";
+      sha256 = "1xmnrk076sqymilydqgyzhkma3hgqhcv8xhy7ks479l2a3vvcx2x";
       type = "gem";
     };
-    version = "3.1.18";
+    version = "3.2.4";
   };
   rack-attack = {
     dependencies = [ "rack" ];
@@ -3311,10 +3256,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0z6pj5vjgl6swq7a33gssf795k958mss8gpmdb4v4cydcs7px91w";
+      sha256 = "1wpcxspprm187k6mch9fxhaaq1a3s9bzybd2fdaw1g45pzg9yjgj";
       type = "gem";
     };
-    version = "6.7.0";
+    version = "6.8.0";
   };
   rack-cors = {
     dependencies = [
@@ -3447,10 +3392,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1b5k9608wxp8hksyvnc3vvdrairyv2qldcw48cv4xrv9amhrbaqk";
+      sha256 = "0igxnfy4xckvk2b6x17zrwa8xwnkxnpv36ca4wma7bhs5n1c10sx";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   rails-dom-testing = {
     dependencies = [
@@ -3468,10 +3413,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fx9dx1ag0s1lr6lfr34lbx5i1bvn3bhyf3w3mx6h7yz90p725g5";
+      sha256 = "07awj8bp7jib54d0khqw391ryw8nphvqgw4bb12cl4drlx9pkk4a";
       type = "gem";
     };
-    version = "2.2.0";
+    version = "2.3.0";
   };
   rails-html-sanitizer = {
     dependencies = [
@@ -3505,10 +3450,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "03dy8nmq2gxvkg8zqq6c0wwz98mdwp3i9krn0slcknhb8nak2c0m";
+      sha256 = "1brqyx0cn46lwgxni943ri9lcg12hskzw8d54j0d4pzqabv32kv2";
       type = "gem";
     };
-    version = "8.0.1";
+    version = "8.0.2";
   };
   railties = {
     dependencies = [
@@ -3518,6 +3463,7 @@
       "rackup"
       "rake"
       "thor"
+      "tsort"
       "zeitwerk"
     ];
     groups = [
@@ -3530,10 +3476,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0k0x630ipimzv6vzhwflsjl7n1fvrmvf196mfbspha7wf4bhxr2l";
+      sha256 = "1lpiazaaq8di4lz9iqjqdrsnha6kfq6k35kd9nk9jhhksz51vqxc";
       type = "gem";
     };
-    version = "8.0.2.1";
+    version = "8.0.3";
   };
   rainbow = {
     groups = [
@@ -3570,15 +3516,18 @@
       "bcp47_spec"
       "bigdecimal"
       "link_header"
+      "logger"
+      "ostruct"
+      "readline"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1mlalmbj1wkwvjha92f7v91v0pbjar9gdb2ddxdyqd24zcifn3ln";
+      sha256 = "1har1346p7jwrs89d5w1gv98jk2nh3cwkdyvkzm2nkjv3s1a0zx7";
       type = "gem";
     };
-    version = "3.3.2";
+    version = "3.3.4";
   };
   rdf-normalize = {
     dependencies = [ "rdf" ];
@@ -3595,6 +3544,7 @@
     dependencies = [
       "erb"
       "psych"
+      "tsort"
     ];
     groups = [
       "default"
@@ -3606,10 +3556,21 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ssi6b33bwr1b1qsssnyjkldwwy087z33yzl58jyz5njdiwzlplh";
+      sha256 = "06j83bdhsmq10083ahz3h125pnycx965cfpmg606l8lbrmrsrgr8";
       type = "gem";
     };
-    version = "6.14.1";
+    version = "6.15.1";
+  };
+  readline = {
+    dependencies = [ "reline" ];
+    groups = [ "default" ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "0shxkj3kbwl43rpg490k826ibdcwpxiymhvjnsc85fg2ggqywf31";
+      type = "gem";
+    };
+    version = "0.0.4";
   };
   redcarpet = {
     groups = [ "default" ];
@@ -3640,21 +3601,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1fsx10xg4n18w9sr1xa128y4yf0jv5zicrj5ff5n0f1crcwywrgf";
+      sha256 = "0wx0v68lh924x544mkpydcrkkbr7i386xvkpyxgsf5j55j3d4f8y";
       type = "gem";
     };
-    version = "0.24.0";
-  };
-  redlock = {
-    dependencies = [ "redis" ];
-    groups = [ "default" ];
-    platforms = [ ];
-    source = {
-      remotes = [ "https://rubygems.org" ];
-      sha256 = "0xvjwfzq7rqj4k311kidwmv5app3i7glz4miys6ixqy6c8yylz3c";
-      type = "gem";
-    };
-    version = "1.3.2";
+    version = "0.26.1";
   };
   regexp_parser = {
     groups = [
@@ -3665,10 +3615,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0qccah61pjvzyyg6mrp27w27dlv6vxlbznzipxjcswl7x3fhsvyb";
+      sha256 = "192mzi0wgwl024pwpbfa6c2a2xlvbh3mjd75a0sakdvkl60z64ya";
       type = "gem";
     };
-    version = "2.10.0";
+    version = "2.11.3";
   };
   reline = {
     dependencies = [ "io-console" ];
@@ -3682,10 +3632,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1yvm0svcdk6377ng6l00g39ldkjijbqg4whdg2zcsa8hrgbwkz0s";
+      sha256 = "0ii8l0q5zkang3lxqlsamzfz5ja7jc8ln905isfdawl802k2db8x";
       type = "gem";
     };
-    version = "0.6.1";
+    version = "0.6.2";
   };
   request_store = {
     dependencies = [ "rack" ];
@@ -3713,10 +3663,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "06ilkbbwvc8d0vppf8ywn1f79ypyymlb9krrhqv4g0q215zaiwlj";
+      sha256 = "0npm7nyld47f516idsmslfhypp7gm3jcl90ml5c68vz11anddhl9";
       type = "gem";
     };
-    version = "3.1.1";
+    version = "3.2.0";
   };
   rexml = {
     groups = [
@@ -3750,10 +3700,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "18v8if3jix029rr3j8iwisv73facw223353n0h7avl39ibxk6hh3";
+      sha256 = "1pkp5icgm7s10b2n6b2pzbdsfiv0l5sxqyizx55qdmlpaxnk8xah";
       type = "gem";
     };
-    version = "4.5.2";
+    version = "4.6.1";
   };
   rpam2 = {
     groups = [
@@ -3805,10 +3755,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "14xrp8vq6i9zx37vh0yp4h9m0anx9paw200l1r5ad9fmq559346l";
+      sha256 = "0h11wynaki22a40rfq3ahcs4r36jdpz9acbb3m5dkf0mm67sbydr";
       type = "gem";
     };
-    version = "3.13.0";
+    version = "3.13.1";
   };
   rspec-core = {
     dependencies = [ "rspec-support" ];
@@ -3820,10 +3770,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0n1rlagplpcgp41s3r68z01539aivwj0cn3v19hq4p3pgdmibnpr";
+      sha256 = "18sgga9zjrd5579m9rpb78l7yn9a0bjzwz51z5kiq4y6jwl6hgxb";
       type = "gem";
     };
-    version = "3.13.4";
+    version = "3.13.5";
   };
   rspec-expectations = {
     dependencies = [
@@ -3889,10 +3839,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "01b5d37i3igh11v5y801gxzb1df2v0il0mfdqi4cdmxn1aqh0dqc";
+      sha256 = "1kis8dfxlvi6gdzrv9nsn3ckw0c2z7armhni917qs1jx7yjkjc8i";
       type = "gem";
     };
-    version = "8.0.1";
+    version = "8.0.2";
   };
   rspec-sidekiq = {
     dependencies = [
@@ -3905,10 +3855,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0rr8229zd5ylwn78dxr4w43a07k58v4chr5lblws53llm7j1qrzd";
+      sha256 = "0rn2yzkn3ywryvrigmsr1902zd14kx5ya8n41jd1zc1szxkgbpvv";
       type = "gem";
     };
-    version = "5.1.0";
+    version = "5.2.0";
   };
   rspec-support = {
     groups = [
@@ -3919,10 +3869,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1xx3f4mgr84jz07fifd3r68hm6giqy91hqyzawmi0s59yqa1hjqq";
+      sha256 = "1cmgz34hwj5s3jwxhyl8mszs24nci12ffbrmr5jb1si74iqf739f";
       type = "gem";
     };
-    version = "3.13.4";
+    version = "3.13.6";
   };
   rubocop = {
     dependencies = [
@@ -3941,10 +3891,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1h48rhmp178ppzc4ybfj42a2savs4bxgy3bvw95i4ypgfm2hndhz";
+      sha256 = "0hpgpyzpzgmp28pirlyrif3albsk5kni2k67h5yvxfvr3g55w2d7";
       type = "gem";
     };
-    version = "1.77.0";
+    version = "1.81.6";
   };
   rubocop-ast = {
     dependencies = [
@@ -3958,10 +3908,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0gis8w51k5dsmzzlppvwwznqyfd73fa3zcrpl1xihzy1mm4jw14l";
+      sha256 = "1bh1kls2cs2j3cmj6f2j2zmfqfknj2a6i441d828nh2mg00q49jr";
       type = "gem";
     };
-    version = "1.45.1";
+    version = "1.47.1";
   };
   rubocop-capybara = {
     dependencies = [
@@ -4001,10 +3951,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1h9flnqk2f3llwf8g0mk0fvzzznfj7hsil3qg88m803pi9b06zbg";
+      sha256 = "0d0qyyw1332afi9glwfjkb4bd62gzlibar6j55cghv8rzwvbj6fd";
       type = "gem";
     };
-    version = "1.25.0";
+    version = "1.26.1";
   };
   rubocop-rails = {
     dependencies = [
@@ -4018,10 +3968,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1404nfa0gw3p0xzmv4b9zg9v1da0nwc4m7796pl73zi2hwy65k4z";
+      sha256 = "1danlfzfqx3x1kna248sm2b1br5ki369r51x90jc4vbh6xk8zv1l";
       type = "gem";
     };
-    version = "2.32.0";
+    version = "2.33.4";
   };
   rubocop-rspec = {
     dependencies = [
@@ -4032,10 +3982,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ya4815sp8g13w7a86sm0605fx7xyldck77f9pjjfrvpf5c21r60";
+      sha256 = "13q588yrqr195d4d4vkv1y3px12llc8xiwh0dnfdnd1027d19cmp";
       type = "gem";
     };
-    version = "3.6.0";
+    version = "3.7.0";
   };
   rubocop-rspec_rails = {
     dependencies = [
@@ -4102,20 +4052,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0j8wxbkl261nwg7jr6kdz0zlyim4zcnnb72ynky97grqid6d61d3";
+      sha256 = "0n3pgw1jkkivgkn08qpc4fb1kiivhbshkj0lhrms4sy3fahlgigk";
       type = "gem";
     };
-    version = "2.2.4";
+    version = "2.2.5";
   };
   rubyzip = {
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "05an0wz87vkmqwcwyh5rjiaavydfn5f4q1lixcsqkphzvj7chxw5";
+      sha256 = "0g2vx9bwl9lgn3w5zacl52ax57k4zqrsxg05ixf42986bww9kvf0";
       type = "gem";
     };
-    version = "2.4.1";
+    version = "3.2.2";
   };
   rufus-scheduler = {
     dependencies = [ "fugit" ];
@@ -4134,10 +4084,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1khq0y5w7lf2b9a220298hphf3pakd216jc9a4x4a9pdwxs2vgln";
+      sha256 = "1apjjd99bqsc22bfq66j27dp4im0amisy619hr9qbghdapfh3kf8";
       type = "gem";
     };
-    version = "0.4.0";
+    version = "0.5.0";
   };
   sanitize = {
     dependencies = [
@@ -4162,10 +4112,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0w0dafg0gz3snm30247wwai0cy3j235ynwx2karyh05ayfqhm4ii";
+      sha256 = "1nb3an8af7f08jnhhbn8bxvgfxqb43qc9d5hgrz16ams96h3mv3f";
       type = "gem";
     };
-    version = "1.8.0";
+    version = "1.9.0";
   };
   securerandom = {
     groups = [
@@ -4196,8 +4146,8 @@
   };
   sidekiq = {
     dependencies = [
-      "base64"
       "connection_pool"
+      "json"
       "logger"
       "rack"
       "redis-client"
@@ -4209,10 +4159,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "19xm4s49hq0kpfbmvhnjskzmfjjxw5d5sm7350mh12gg3lp7220i";
+      sha256 = "1vpj4jqcvnybc6h6hxpvgq36h311jqz3myax36z9ls8ilnw2y3ns";
       type = "gem";
     };
-    version = "7.3.9";
+    version = "8.0.9";
   };
   sidekiq-bulk = {
     dependencies = [ "sidekiq" ];
@@ -4229,16 +4179,15 @@
     dependencies = [
       "rufus-scheduler"
       "sidekiq"
-      "tilt"
     ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1gnm98hdw1ndw0sryjimp4a0805yhwhjxg6njhz8xmdh5ycgljda";
+      sha256 = "0qj0lfy0860lbdg92mmv4f4yy3vr7pq01ay6df4xkqm3a7l09z71";
       type = "gem";
     };
-    version = "5.0.6";
+    version = "6.0.1";
   };
   sidekiq-unique-jobs = {
     dependencies = [
@@ -4275,10 +4224,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0q3lwin7pk5rsxy2a663x6lph5arax9lqqk12fgwdy57i5ma749q";
+      sha256 = "1vhh91l7pjx7fpvs62kmz99ypsnkk93yq1ra5qgigbinxjqfa77b";
       type = "gem";
     };
-    version = "5.3.1";
+    version = "5.4.0";
   };
   simplecov = {
     dependencies = [
@@ -4303,20 +4252,20 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "02zi3rwihp7rlnp9x18c9idnkx7x68w6jmxdhyc0xrhjwrz0pasx";
+      sha256 = "0ikjfwydgs08nm3xzc4cn4b6z6rmcrj2imp84xcnimy2wxa8w2xx";
       type = "gem";
     };
-    version = "0.13.1";
+    version = "0.13.2";
   };
   simplecov-lcov = {
     groups = [ "test" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1h8kswnshgb9zidvc88f4zjy4gflgz3854sx9wrw8ppgnwfg6581";
+      sha256 = "1ka6cdwywd6a6pqjwggm0439437xdq2r7514n3a5wn8a40ga6xvs";
       type = "gem";
     };
-    version = "0.8.0";
+    version = "0.9.0";
   };
   simplecov_json_formatter = {
     groups = [
@@ -4356,15 +4305,15 @@
     version = "0.2.0";
   };
   stoplight = {
-    dependencies = [ "redlock" ];
+    dependencies = [ "zeitwerk" ];
     groups = [ "default" ];
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "16j5w162pv45gjm0jah9hhy8q5fjplbka913c0qwxx209lbmsizd";
+      sha256 = "1mxy9x9zpi1grx24lds1kkipmh0rgcwsi74c7pbm1dza39m6p7nh";
       type = "gem";
     };
-    version = "4.1.1";
+    version = "5.4.0";
   };
   stringio = {
     groups = [
@@ -4388,10 +4337,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0mg8z7ikc7rj53hy3c5n7pqdwd4m4h22k8ig36057nnchqa34d6v";
+      sha256 = "09llhlw9ddsjyv6c59z3yjwdhrxc2q60a60wjvqhrhhy96dkmjlb";
       type = "gem";
     };
-    version = "2.4.0";
+    version = "2.5.1";
   };
   swd = {
     dependencies = [
@@ -4430,10 +4379,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0fwia5hvc1xz9w7vprzjnsym3v9j5l9ggdvy70jixbvpcpz4acfz";
+      sha256 = "0b7pzx45f1vg6f53midy70ndlmb0k4k03zp4nsq8l0q9dx5yk8dp";
       type = "gem";
     };
-    version = "0.10.3";
+    version = "0.10.4";
   };
   terminal-table = {
     dependencies = [ "unicode-display_width" ];
@@ -4455,10 +4404,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1mkmbw5z2ma4hkrg3i697bx0j8w7ggpxyj1d7kv7fgya8cdr15lx";
+      sha256 = "0aakswgqk6cfamq3h6fxdls81ia7v3fi1v825i5pdrgzbh293blw";
       type = "gem";
     };
-    version = "1.1.0";
+    version = "1.1.1";
   };
   test-prof = {
     groups = [
@@ -4497,10 +4446,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0szpapi229v3scrvw1pgy0vpjm7z3qlf58m1198kxn70cs278g96";
+      sha256 = "0w27v04d7rnxjr3f65w1m7xyvr6ch6szjj2v5wv1wz6z5ax9pa9m";
       type = "gem";
     };
-    version = "2.6.0";
+    version = "2.6.1";
   };
   timeout = {
     groups = [
@@ -4531,6 +4480,22 @@
     };
     version = "0.14.1";
   };
+  tsort = {
+    groups = [
+      "default"
+      "development"
+      "pam_authentication"
+      "production"
+      "test"
+    ];
+    platforms = [ ];
+    source = {
+      remotes = [ "https://rubygems.org" ];
+      sha256 = "17q8h020dw73wjmql50lqw5ddsngg67jfw8ncjv476l5ys9sfl4n";
+      type = "gem";
+    };
+    version = "0.2.0";
+  };
   tty-color = {
     groups = [ "default" ];
     platforms = [ ];
@@ -4662,10 +4627,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1has87asspm6m9wgqas8ghhhwyf2i1yqrqgrkv47xw7jq3qjmbwc";
+      sha256 = "0hiwhnqpq271xqari6mg996fgjps42sffm9cpk6ljn8sd2srdp8c";
       type = "gem";
     };
-    version = "3.1.4";
+    version = "3.2.0";
   };
   unicode-emoji = {
     groups = [
@@ -4675,10 +4640,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "0ajk6rngypm3chvl6r0vwv36q1931fjqaqhjjya81rakygvlwb1c";
+      sha256 = "1995yfjbvjlwrslq48gzzc9j0blkdzlbda9h90pjbm0yvzax55s9";
       type = "gem";
     };
-    version = "4.0.4";
+    version = "4.1.0";
   };
   uri = {
     groups = [
@@ -4785,10 +4750,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "1sn399i804pg87b1j30x8lv2602qcndhvg0k0g4xqdfxg28zdipp";
+      sha256 = "1z710ndfr9yajywhji8mr5gc3j3wnr0alq754q15nh7k73wgbrlv";
       type = "gem";
     };
-    version = "3.4.1";
+    version = "3.4.3";
   };
   webfinger = {
     dependencies = [
@@ -4815,10 +4780,10 @@
     platforms = [ ];
     source = {
       remotes = [ "https://rubygems.org" ];
-      sha256 = "08v374yrqqhjj3xjzmvwnv3yz21r22kn071yr0i67gmwaf9mv7db";
+      sha256 = "0w1x1k3bkkvi1438kx9qa1b9hn6zff1ykh55278fjrax1nycsa6d";
       type = "gem";
     };
-    version = "3.25.1";
+    version = "3.26.0";
   };
   webpush = {
     dependencies = [
diff --git a/pkgs/servers/mastodon/missing-hashes.json b/pkgs/servers/mastodon/missing-hashes.json
index af1b796f0a53..a1e246d54bbe 100644
--- a/pkgs/servers/mastodon/missing-hashes.json
+++ b/pkgs/servers/mastodon/missing-hashes.json
@@ -37,39 +37,43 @@
   "@parcel/watcher-win32-arm64@npm:2.5.0": "cff6516b1dad597ca1ec8c385cf8251f5050b32ab46fc15360f2eff3a40b61b7107eee56df73764007d9bd6b826960d2f3589c8e0ce270bb5b2a292313bd7a1b",
   "@parcel/watcher-win32-ia32@npm:2.5.0": "ad9d2c9ae3a7031105fc90418050a910d4b679ead36e5fdcbb1b3e4afbaf56aec6566863e3a374c645c82f57073d8f643183f19c67c8c48b0aa62224c05fdb9d",
   "@parcel/watcher-win32-x64@npm:2.5.0": "aa9660bdb2fe70de5163f9f8419e263711fd30612244fb7feb58fce49a653b88ac0e1e29646fb1fc76b86fd8215e62eea5ded0616725987dfca5372041925bd2",
-  "@rollup/rollup-android-arm-eabi@npm:4.40.2": "cb502d6933de94860f9d49a4b4e849a206d10d9b1a424847cb2545667f8937ac891a37854e2934992b39521dc8b8daa2ec6b683da6bb47ef893ab24f9424c887",
-  "@rollup/rollup-android-arm64@npm:4.40.2": "42e04ae6605f8a31cc7daf484f9104e6d2174a99e39d829c24d77780cd257a6dab67f5c6a38e84e5a967ad4a64a042f1e6dfbe75444aa03517e83d8436179726",
-  "@rollup/rollup-darwin-arm64@npm:4.40.2": "8e641fd8a888504c516e76e525a7fcc099d363a82ce8569a1a5bb2fdcf632fa262e1a73b47932a922d132e0c46fab6ba04490053f63e6e4fb30c313a499b139f",
-  "@rollup/rollup-darwin-x64@npm:4.40.2": "9dca62986fa2afef8c5addcb1eb4ee08afbd3aa03ece3c5372a82a785af67ae441b9782dd542018fa5bb39a6de34ea53f10795d6f6f801a0469ce7979c52c729",
-  "@rollup/rollup-freebsd-arm64@npm:4.40.2": "f21c73712c4cb74a797998e8adfa83bb7ff0d6cc3e7353eae5b213b4bb3f9f481e025d37dd67aeee7488b9fc9ecd0bc8f85a61469cfa6592ed9292d14ba868d0",
-  "@rollup/rollup-freebsd-x64@npm:4.40.2": "9f8b6abb5be2527e6cffdaf0dd95a8bbb6f4aa5599be2bfe919e8252f57558f0a06b66748d29cb1e42d0b65e1d2ef0ec2d6a429d3c8a1a85352269d88ffbda17",
-  "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.2": "fc205b61c54ddaac7bb45768c3b4bbd79632df3f7bbe65532f5453d54e1a31c1d3f1e4508a00323cf0656d6c5a69f0793989d11fd0805dc2621053c8c6fbcaa3",
-  "@rollup/rollup-linux-arm-musleabihf@npm:4.40.2": "14fde6bac72d734462b9c2fa3594934454069d01422fe12e650ae6fc9e998daac3d43d1726a0aa040cac9d4de43cf75ca34d82932e0a2c3f564f49f0b6fba4af",
-  "@rollup/rollup-linux-arm64-gnu@npm:4.40.2": "1a7c361022d74025076d322cdeb741923f1d3e0d5e1a12fd4dcc678a7c3dc8a07002f6ec4d537b6f089c75b90273cd700580b9ac1b1d45fa68908eadb524f1c7",
-  "@rollup/rollup-linux-arm64-musl@npm:4.40.2": "2fbf7f6f28bfe5148b1a82b04569574bc865b65f6e8f874aa8b175ad3c3ee9197a9a22bc3693153f0d55ff2bd78938b15e162cafa4b77756d1933036b0520bf0",
-  "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.2": "ae77d9e7a797868fbd6887b8b4a8a26bcd96ea632022ddc47c570d90ad6e47b2ac0b3a933885c06a0af5ad57b5f818f4531ff6961b351e9705f5af6dd26b2427",
-  "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.2": "867b6bc576e07110181f41c588b1a7ee22a6571bf5a3ceff0527c1e7c4540b5122d34b99f0c56c00d5c33a2e517fbb16c3e269cc4c08110e69dc0f0e4b2fbf26",
-  "@rollup/rollup-linux-riscv64-gnu@npm:4.40.2": "52f07f3e5e008cd0d277d5290524682c8ec5c03e08659b07a800fddc00b450dbf8df08612921b9fe6e4e16d60d5e282027d9b260ff520c40bf3e7c5e1efabb60",
-  "@rollup/rollup-linux-riscv64-musl@npm:4.40.2": "6483ab13ac5626c5b94d72aad3ffafe63a3572899824b1d37e59bc071b147f3d498864a0e19942e013a4488aa9262a92817232ca6c38339e3de62c3c4aca87e3",
-  "@rollup/rollup-linux-s390x-gnu@npm:4.40.2": "842ad92a20ff994091d4ba4c16f87e2f8a57e1eb9e3004c20aaeeb692bc2061619dd43ba4dd246712f8904fe1480e6211b43e9fd2e11a5faebbeebea0c79da63",
-  "@rollup/rollup-linux-x64-gnu@npm:4.40.2": "c440df4beca32d238b0a0f0b1017fb30da52c0f705946177c01a08d7d214ae190b2070885d93e15ff5fb5741e0964e1370bdd45f8a94e9a4689816f06f18c5a0",
-  "@rollup/rollup-linux-x64-musl@npm:4.40.2": "9874b4cce42573d460634443ddb730d348360089bf93667309e660301e4e389d8ae80abe7f33fa9a20db5e67984e107e17d1479bdfee278d74bc60dde6ab5f83",
-  "@rollup/rollup-win32-arm64-msvc@npm:4.40.2": "b61552ab831efde1ca4823cab1982d3d681e1be269d67d60558cd2ac86fe3802f6d569300d9ada084acebae27257b00c68f9d858261a579b5d8686956aa92ba0",
-  "@rollup/rollup-win32-ia32-msvc@npm:4.40.2": "13ad059483b26bbf12af5108207d66a98ae2aef7599f27a506b998c781921b653dacc63ee0db57bb6f37c920163fd8bc40072e0be0ec6b1e5f52eb3f1455efeb",
-  "@rollup/rollup-win32-x64-msvc@npm:4.40.2": "98ab8600ecbeab358c53ed563a7b586da0c5cdf26c03456a982a016b2f8eff6e2ec07055d15fe039b982a18a970744390d85a05970c9a8b1533c54702026f8df",
-  "@unrs/resolver-binding-darwin-arm64@npm:1.3.2": "c8c61120e2bead2e0fec054399107e1ebd39455a2b7d59a5446cafad86cca376e0010e65644c41da0958a065869dcbe0509a29394b52a469a48990d32bf7a6e8",
-  "@unrs/resolver-binding-darwin-x64@npm:1.3.2": "ee67a4043d2e297cb1362b7aa25be3f5defef9eb13f4e80358c3f22ffdef043ef905ac661fc9e70359383bafed5837a52bd001b49a8ea4f70372051d89ee6eff",
-  "@unrs/resolver-binding-freebsd-x64@npm:1.3.2": "5f19ef3991435a96e682d427a8d9b28886b4afc9ea5b723e51c4bca51f25bb24add8819ed91c9f228bd39e139d51625cc127ddd35efd6c3f6e1d88106808fad1",
-  "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.3.2": "f77b2345c2b572b569089092fa6c08b5a55fdb08d26e1db3cdfa0d195511a0efbe109c558e77bfd78d7aed4ffe47b6542890c9cad032cc00bb0fcd5f373f5090",
-  "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.3.2": "8b7156d8c641994c39626522ba42e69eef8d868a69b319c9ea5f7584ef0c4ea98bc698c1a4417d209dd3a786630be404d459680cf5b5b2500d3c4b0eb1be894f",
-  "@unrs/resolver-binding-linux-arm64-gnu@npm:1.3.2": "93b28c2ea0dae2d452659e0afde6099107b70362043e19800e35b7ae86350856dfa0a4d6ba2be566c225965b458b5fba78a10219cf78e6fc0c581373cd2e2a52",
-  "@unrs/resolver-binding-linux-arm64-musl@npm:1.3.2": "49ed9f24838e876eb1bba9b5f3e283af0716ee23f7d11a799a6376a47fa59a2e28b724431ca165a3874d60b1ed5a6b6c7650fe207f0610a788c88baa7862688f",
-  "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.3.2": "9fad22ffbf7aadf471a6d054c833a9b4cea74e2c38be40d546e6ba71058a6be10fa4e28947425ef33d42dc77de1c81b631fbff5a96a637c3a7652910f3e27d76",
-  "@unrs/resolver-binding-linux-s390x-gnu@npm:1.3.2": "dd28e351f19268c4735da984e96301d8433603cf109b2b6880aab9bb8f448242699b7f84c36c536ca4a9443f944153098a3d3e78fce26d0c56fe3406d73d4b55",
-  "@unrs/resolver-binding-linux-x64-gnu@npm:1.3.2": "e1cc70d8e012bc61bf5af85c2e9905aa1953c06daaab9b3857d780424c62807ccd0c5a20acb919e3accec7152badee426b1514ab9a4256b77945c3e7c8df3496",
-  "@unrs/resolver-binding-linux-x64-musl@npm:1.3.2": "e97b95e53d029e4ccaf7cf32072e644c495d8e1f097b6fdeb417860db4db4b752d84f5fa6310b9f170a1fbf0562696f0145005dda4a95d658ea0857fac6c51dd",
-  "@unrs/resolver-binding-wasm32-wasi@npm:1.3.2": "d3f16f36ba5dd714ef3eaf7bc57597e9f9a1fab7c6b5fb5dc5bf688d81a1bd4a574da16bd3e2b383181032a71001583b6534c21e5ffde1ee43fcfa95bc292f3b",
-  "@unrs/resolver-binding-win32-arm64-msvc@npm:1.3.2": "de65010d133e99a062827f698a7e50c30db15d9f6b9011d351762cc8809497e97c4617b7d6ca3052583ca3f6b8c3cb1f2857fd0c9afd944c7ebb65d5e1da74f6",
-  "@unrs/resolver-binding-win32-ia32-msvc@npm:1.3.2": "f214a8950e823c60656d2d113584c3cd20c6e92668f43f73c13c3ddfe38a7063615e42537645e2aa52a0652ace9c82e8fd5d9411043a6985ccb49d8dc8bb2595",
-  "@unrs/resolver-binding-win32-x64-msvc@npm:1.3.2": "38ca5f5912d7cddd3f3e1983ad8e79d084ab3f5990189ce8cdfcfc3b58d97cc0dd7b543cc78ff43eb1769d15a8c235339a5942c688ab680192caa4c97116a511"
+  "@rollup/rollup-android-arm-eabi@npm:4.46.2": "d7d021a87cd3504c8d71b00a94199e13c4e07c14fe20ed7300cf1e6436a5f3fe8496c9e5f206e023b15f9b6f8991b2d95a48b47fa41d5c00b44f37fe5f4d5eb8",
+  "@rollup/rollup-android-arm64@npm:4.46.2": "ca901edbf95bbdd2505c979f777e2a01e2e885a597b6daeed5362dac523ea2a1eb9c0c0d22b9b436f3613c22abdd442bd2764491948890930333a9e40ade35be",
+  "@rollup/rollup-darwin-arm64@npm:4.46.2": "ed2b07c4803915d46ff642abd659e179fae524dcd3cb88c810a5b71290d16b498e0371dcb91fe98f6301b8c6600d579a099be1e9450278326281002df4a80019",
+  "@rollup/rollup-darwin-x64@npm:4.46.2": "c53e31df756cb8d44e179c167db1ec5d321225561a1aff2b320091c226c2dfafd080a98a1466f2dc697ff0173b52c41d89c60cae97f73b41fbd128d4c87fde66",
+  "@rollup/rollup-freebsd-arm64@npm:4.46.2": "9495d87e670bbea87e43d06df53ae83fcd46e2c82a80927556f3516ac76613b8b7739bbd4b43c3f264bbab57a50a3b6cd2dfa6c1b2741bd3acdeba8af7c47018",
+  "@rollup/rollup-freebsd-x64@npm:4.46.2": "890a965b45f4c4b9beb4696912ee30472180a040dafb24ce32f8811aed4d0d0ee90bf675d234abc6d8e66266d2966a72483fff7e6f1dbd116424b23e18fe38a9",
+  "@rollup/rollup-linux-arm-gnueabihf@npm:4.46.2": "ce9720f61b4f7d9a791ba78e13cbbea67ef5f46c465e054c08f009cd06de8c1e4518df8e8578366a27cc9ae4280d37528dd0762906a19e820ca1a95158b47090",
+  "@rollup/rollup-linux-arm-musleabihf@npm:4.46.2": "b884f568a681d8c13ffdfa77ad6183ed6f7f9fe5bc952b1c82dc21e36b4bc8eb7ee292168929a2575ff5ff14582060d7d73c583aef7edf04fd0bddd67140f4b0",
+  "@rollup/rollup-linux-arm64-gnu@npm:4.46.2": "519477372d8358a4d3f1f1245bc2b5b57b65960f9a7d02bc5795ba68aed471fe87b20391a63c334bf0abb94085ad8c89d8d3b2e4d79ca0fed702537e9a0949eb",
+  "@rollup/rollup-linux-arm64-musl@npm:4.46.2": "a5dec7799dd832b5374171a73a6b57cffef8be317482dd9ea4e6554db6fc8afb4bdb91ec725502f1b378aa9cb9a1333684056d55c9120262cb7744a33b961a76",
+  "@rollup/rollup-linux-loongarch64-gnu@npm:4.46.2": "76ebbf40535f68c6922edf7d866dad00608cd475c8436d199653341ea09124cb4478f67c12d32b5363634f3f811926acb14a086eb146a1fe6b310fdbde01f2c8",
+  "@rollup/rollup-linux-ppc64-gnu@npm:4.46.2": "31b62a51393e0f2608e1133701523e894ff5d04038e3d9af95abf595ab7fbe827167a651b200e9975d0e76904699cde3428aa1afbf46bf939f836f8ef90b1d88",
+  "@rollup/rollup-linux-riscv64-gnu@npm:4.46.2": "4f22bc5fe58730026085d1a5372b51d9ed933b314cde2d3dec1d73ad76106406915c313d331f094176ed917863c0041667e63184d9730da7107b11266dad477f",
+  "@rollup/rollup-linux-riscv64-musl@npm:4.46.2": "1bc37b77ac38d7e82e7d661b67fc043a1db01272a0566e5432c61e3c7a5e6c11b5ecb4a49547da2de33a8e0a7b0d685f3c7341572fa77c90e9b71e515f753e86",
+  "@rollup/rollup-linux-s390x-gnu@npm:4.46.2": "1b1821a848d8bf86fa5e01ae57f60ebe5566cbcb0c605b5d05050821e94b8b45a72515ef302a3021196018b289aaffade5c41a5f89b3f8324d509a25d28dcfc4",
+  "@rollup/rollup-linux-x64-gnu@npm:4.46.2": "66231802689c1ac1d6ecec6fd65d14c01c900537e588808e0a2c92ba34e322665bb6df3853500717cf600f40a93de4c490838290e21bb10eed4249f587a08109",
+  "@rollup/rollup-linux-x64-musl@npm:4.46.2": "064ed54e9ddb05eec1b5da5ac8366f3290b7b65e63959a76a26d6940ce44d741c30488e39ce94c51a2679b2c56217c2e0aaf74e123a1c0928503712c115d6047",
+  "@rollup/rollup-win32-arm64-msvc@npm:4.46.2": "b59089cddf652e3da278744f6b8b2105360d1219833e54791380322913d40073ed4197ccd06d6091e83e1e12a5290d7a2e4aeae7947ff20c45943d07d1f0af0c",
+  "@rollup/rollup-win32-ia32-msvc@npm:4.46.2": "d0aae1f80a64d9148426a7ff25b9df7f3abf7aca912c358a952f4b3bc541e030b5959f52e0b67abe01b9c8c8fb6567d1bbd30e31daabb7e2c4dc0488faf875f7",
+  "@rollup/rollup-win32-x64-msvc@npm:4.46.2": "740ca3c1d07f5af76fc9c2db917edbf6d0c1cf3eeee8330a0c571db4990ec44f0b272696a215ab118e8a32d7529f84bd47225e85dfab458a989b4b18d0bbea49",
+  "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "04dd38b694c1680bfec192b499e188700398a414886a08a8a7c72815db56ac147df03d88c73ff6fff7ac3e0a01dc41978054b3622b49463e0d684c5168557fcc",
+  "@unrs/resolver-binding-android-arm64@npm:1.11.1": "763626adc34dd2b4af677b5ced6493e7b2b1935351a5c9137f1c9561d11faf97b94015e6876e57e85c33ff563564314c92c0882a4780a57f2225cbbd779a695d",
+  "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "03b477fdfec55dbabe488fe0962417bddaa38b028d2670053469f1d24163907b097aac15b565f6974449bee398a38d5e3e1525f2b515ce57e243149021b7aa2f",
+  "@unrs/resolver-binding-darwin-x64@npm:1.11.1": "3aeff9aaf4ef6d786c517d9017b5c41b0af180cdbaf705d08e6e5b5ba9d5410d28ef6754c5f8a865f0bb5efd460dc1c4156b5e2201032c0a604a6c734ddbc848",
+  "@unrs/resolver-binding-freebsd-x64@npm:1.11.1": "b9f7a3e03db9edfc3480db056dd25229f901f21840ee768b69f349b66676a995a404e60617b3bcbd984f57f2199eb352dd6fad0f4420c3084ceef5e3293cdad5",
+  "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.1": "4d03b8bcef5a90586a846d6d332f39cee211f3d330b6e10036969894b6ecfb70b047265e985d572def93b84f38621dec30e4b4bb42699dd784adbae3ca5e7bea",
+  "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.1": "9f3a3c2e5e6418a5a78294fa042824f5c270e993c1a99e82dd6b0ee0d2869929bb62dd154a0acc1e4ef16273e8073e0e257901208c062e6bdd49d586d07bb419",
+  "@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.1": "05228d6fd669f404f0e3164ccf2430a52cc7b3bbd211367527b5d726b1220a1816bab70159bed55694d9b7543553f6002379e7e186c605d7055c5156977da022",
+  "@unrs/resolver-binding-linux-arm64-musl@npm:1.11.1": "8115802143396d4992bb2f6f0acb6e8bc141a57864c5fd84cbc70577c25784cb08dd163b753b1fc0decc02582cf4cb1e30d04faaf763048babbbe706bdfa26ea",
+  "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.1": "50f9f54b2eafb1ea023671cc3070692b2b15f6e49105b08b3f588033e65e8de4183f76e080b798de710f9c41df1bf5515c01868866a21cbd35db179b4ac9f23b",
+  "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.1": "8f8222f938cc2025ed3971e0e303f4ff5aa5df74474b835442830ebe942d050ba3f8bbb67095da64099e6fc69bb5bb73ca63db54e059c95e51aa8909880fb207",
+  "@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.1": "5c8987f7dcaf38ef27ec67dcf118141502d5ac75d28429da6d1b7037f3e5a5351f32f55094472fde11784e65d01f1da4dafd7c0fdca28423fbc8de2c2c51d16c",
+  "@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.1": "17aed6472880a82e5a05147a55efb6f0d968f5dcb584845addf89acec3824534ee741d4b162686124d17daf9131373c469c57843996a5ee2db4f1b1b55e1d11e",
+  "@unrs/resolver-binding-linux-x64-gnu@npm:1.11.1": "9495c08fc42f2d4a33e33c64adbcbf51588cd7ea07478eacb2e9143d955a760122440f4a3ac48b086cc2563ca2b2464d72ed0336fcc20c0a89ddc356f956eda8",
+  "@unrs/resolver-binding-linux-x64-musl@npm:1.11.1": "c84fadfee66eeebd16eb7cce7c4b5a1ec90260c724d0064111e9f43a1341ebfede61627cb68fd3a9735e4c10b25606fb472a4d13143cc569867b80d85c4a9824",
+  "@unrs/resolver-binding-wasm32-wasi@npm:1.11.1": "655a3990ed9b238e8f0c4858f87ca84bd3d81db300f7730c885162333055170e11207af7789ff38f619e261178718f6977729e42ce7978cc9e6ac7b6d93822d5",
+  "@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1": "983f800ff8b5181247a7d460ab5c9704cd425d0182e93290f69fb969d93efe17be6a27c22b97546d36e9a9d9aeda96d5f753bc938b3d9a00f32c10fc228ce5a9",
+  "@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1": "383d639e3b08fc9e4ba18127ef55610172d2d1d6adb83e1466fff2b223552384cdc6217051f749829e0c90a757ea5631e8c4ad2cfeb59bdee2bb033fbd526854",
+  "@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "c862561f6495c0dbffb94d421e5727b25c1b61d98e22383bff23e6719a6c0125bb0b7df3be7220f5480bf54f5a605ea572f10fff1cce14fda24d42e396559940"
 }
diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix
index 348bd973f3b8..a57f431d4789 100644
--- a/pkgs/servers/mastodon/source.nix
+++ b/pkgs/servers/mastodon/source.nix
@@ -5,17 +5,17 @@
   patches ? [ ],
 }:
 let
-  version = "4.4.8";
+  version = "4.5.0";
 in
 applyPatches {
   src = fetchFromGitHub {
     owner = "mastodon";
     repo = "mastodon";
     rev = "v${version}";
-    hash = "sha256-EE0A9EH+8ND9Whig2dhM27EONjJfdVtd9g+Mo0/2iHo=";
+    hash = "sha256-06OXK4lscmEX6qDy2GRnO2plZW2ngQoqS/9FiVgsgeM=";
     passthru = {
       inherit version;
-      yarnHash = "sha256-K1EqeLi4dWnaLIaUU5apxE5ZOM98XBn6KTHWTkPLWE0=";
+      yarnHash = "sha256-FxJe18DBfdEhbuWoFem/ozbbiUD9R/+BjHuwNGK+jRY=";
       yarnMissingHashes = ./missing-hashes.json;
     };
   };

From c140fd4f1bcc9afd375c77d54352f10eb2ae0707 Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 7 Nov 2025 08:35:14 -0300
Subject: [PATCH 6107/6226] bbedit: fix build

---
 pkgs/by-name/bb/bbedit/package.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/by-name/bb/bbedit/package.nix b/pkgs/by-name/bb/bbedit/package.nix
index 7537b198f9f9..2c39f1e6ca57 100644
--- a/pkgs/by-name/bb/bbedit/package.nix
+++ b/pkgs/by-name/bb/bbedit/package.nix
@@ -27,6 +27,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     runHook postInstall
   '';
 
+  # app bundle may be messed up by standard fixup
+  dontFixup = true;
+
   meta = {
     description = "Powerful and full-featured professional HTML and text editor for macOS";
     homepage = "https://www.barebones.com/products/bbedit/";

From 264a60c02589e38f31f1d134cd3fe4659ea5b29f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 11:57:15 +0000
Subject: [PATCH 6108/6226] ledger-live-desktop: 2.131.1 -> 2.132.0

---
 pkgs/by-name/le/ledger-live-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix
index c201fa010d2a..c191781aa357 100644
--- a/pkgs/by-name/le/ledger-live-desktop/package.nix
+++ b/pkgs/by-name/le/ledger-live-desktop/package.nix
@@ -8,11 +8,11 @@
 
 let
   pname = "ledger-live-desktop";
-  version = "2.131.1";
+  version = "2.132.0";
 
   src = fetchurl {
     url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage";
-    hash = "sha256-O5pdrnnAfDrgP8s4A0R/mf7Mx6U2VWPNqaky+rExzgc=";
+    hash = "sha256-wxOzx8Eo/AAbPor/nA3gjVC8vAfRTNjVmvxON5Ta5d0=";
   };
 
   appimageContents = appimageTools.extractType2 {

From d3122d7a9290b18f3e3dc86af7ac83654d659cb4 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 7 Nov 2025 13:00:49 +0100
Subject: [PATCH 6109/6226] projecteur: use `finalAttrs` pattern

---
 pkgs/os-specific/linux/projecteur/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix
index 1ee127f15b80..b4c55d9cb9a0 100644
--- a/pkgs/os-specific/linux/projecteur/default.nix
+++ b/pkgs/os-specific/linux/projecteur/default.nix
@@ -1,6 +1,6 @@
 {
   lib,
-  mkDerivation,
+  stdenv,
   fetchFromGitHub,
   cmake,
   pkg-config,
@@ -10,14 +10,14 @@
   udevCheckHook,
 }:
 
-mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "projecteur";
   version = "0.10";
 
   src = fetchFromGitHub {
     owner = "jahnf";
     repo = "Projecteur";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     fetchSubmodules = false;
     hash = "sha256-F7o93rBjrDTmArTIz8RB/uGBOYE6ny/U7ppk+jEhM5A=";
   };
@@ -56,4 +56,4 @@ mkDerivation rec {
     ];
     platforms = lib.platforms.linux;
   };
-}
+})

From 9d2630ce05d840c0a9c1d608539b1e0b87846444 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 12:03:10 +0000
Subject: [PATCH 6110/6226] terraform-providers.fastly_fastly: 8.3.2 -> 8.4.0

---
 .../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 6b094731b9e2..ab1380f9675c 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -390,11 +390,11 @@
     "vendorHash": null
   },
   "fastly_fastly": {
-    "hash": "sha256-b/lAUadx6vRzA5QfzEboqwZYO7vWxPV00XD81uXLK1k=",
+    "hash": "sha256-3jXm7uY93g2NE6HfaWKQqQr05AvnCKvzt3981thgV8Q=",
     "homepage": "https://registry.terraform.io/providers/fastly/fastly",
     "owner": "fastly",
     "repo": "terraform-provider-fastly",
-    "rev": "v8.3.2",
+    "rev": "v8.4.0",
     "spdx": "MPL-2.0",
     "vendorHash": "sha256-NBp18Ult6o1hQUEZX1r9I0ebfY9VnwVY4QhChIjsGSI="
   },

From 5007dc33a72e43d34937f9fd9226d89e2e0d8393 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 7 Nov 2025 13:03:04 +0100
Subject: [PATCH 6111/6226] projecteur: add `versionCheckHook`

---
 pkgs/os-specific/linux/projecteur/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix
index b4c55d9cb9a0..726728539586 100644
--- a/pkgs/os-specific/linux/projecteur/default.nix
+++ b/pkgs/os-specific/linux/projecteur/default.nix
@@ -8,6 +8,7 @@
   qtgraphicaleffects,
   wrapQtAppsHook,
   udevCheckHook,
+  versionCheckHook,
 }:
 
 stdenv.mkDerivation (finalAttrs: {
@@ -38,14 +39,16 @@ stdenv.mkDerivation (finalAttrs: {
     udevCheckHook
   ];
 
-  doInstallCheck = true;
-
   cmakeFlags = [
     "-DCMAKE_INSTALL_PREFIX:PATH=${placeholder "out"}"
     "-DPACKAGE_TARGETS=OFF"
     "-DCMAKE_INSTALL_UDEVRULESDIR=${placeholder "out"}/lib/udev/rules.d"
   ];
 
+  doInstallCheck = true;
+  nativeInstallCheckInputs = [ versionCheckHook ];
+  versionCheckProgramArg = "--version";
+
   meta = {
     description = "Linux/X11 application for the Logitech Spotlight device (and similar devices)";
     homepage = "https://github.com/jahnf/Projecteur";

From 38d6bdf45fd7d132e0ae5e006f5162fa008cf6a6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 12:04:31 +0000
Subject: [PATCH 6112/6226] stasis: 0.5.2 -> 0.6.1

---
 pkgs/by-name/st/stasis/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/st/stasis/package.nix b/pkgs/by-name/st/stasis/package.nix
index 63ebd8057440..e6a3029dc41c 100644
--- a/pkgs/by-name/st/stasis/package.nix
+++ b/pkgs/by-name/st/stasis/package.nix
@@ -14,16 +14,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "stasis";
-  version = "0.5.2";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "saltnpepper97";
     repo = "stasis";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-t8molNHV0FnJO9F2muME2JAfw6EtxDQZiQX3JFW8DTs=";
+    hash = "sha256-GES7mBWEEyute/ljl7JiwzbgFSk4+JR5YUia4+Wzs3I=";
   };
 
-  cargoHash = "sha256-nACVS4BAjtI+aRO8Tg0FdOQSXiZMX/iVh22w0s6NLpw=";
+  cargoHash = "sha256-+SGeuT0oAt5T15eZABGegiVhyV4GcHDp4LMMRpCl/U0=";
 
   nativeBuildInputs = [
     pkg-config

From 4bf7679772b243e4ab04b71788a27c4aa805634a Mon Sep 17 00:00:00 2001
From: kyehn <kyehn@users.noreply.github.com>
Date: Thu, 30 Oct 2025 10:29:50 +0000
Subject: [PATCH 6113/6226] scip: 0.6.0 -> 0.6.1

Diff: https://github.com/sourcegraph/scip/compare/v0.6.0...v0.6.1

Changelog: https://github.com/sourcegraph/scip/blob/refs/tags/v0.6.1/CHANGELOG.md
---
 pkgs/by-name/sc/scip/package.nix | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/sc/scip/package.nix b/pkgs/by-name/sc/scip/package.nix
index 7ba2d321cc1e..e7f552274ce8 100644
--- a/pkgs/by-name/sc/scip/package.nix
+++ b/pkgs/by-name/sc/scip/package.nix
@@ -10,20 +10,19 @@
 
 buildGo124Module (finalAttrs: {
   pname = "scip";
-  version = "0.6.0";
+  version = "0.6.1";
 
   src = fetchFromGitHub {
     owner = "sourcegraph";
     repo = "scip";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-ZyU1CmDBVDNP6zCXpvqEoQ3ttWNPGLCIjkj4mezUcKc=";
+    hash = "sha256-l68xhOMgwt+ySChk7BCyklcuC6r51GgobAg3lRLvOCU=";
   };
 
-  vendorHash = "sha256-RwBlzBqGd/xEaTL6m3sm6e/tcNUc7Mfdf213qzuMPug=";
+  vendorHash = "sha256-8HgeG/SXkM7ptOwKSi/PUH3VySxFqqoIpXI7bZtbO4A=";
 
   ldflags = [
     "-s"
-    "-w"
     "-X=main.Reproducible=true"
   ];
 
@@ -56,6 +55,6 @@ buildGo124Module (finalAttrs: {
     homepage = "https://github.com/sourcegraph/scip";
     changelog = "https://github.com/sourcegraph/scip/blob/${finalAttrs.src.rev}/CHANGELOG.md";
     license = lib.licenses.asl20;
-    maintainers = [  ];
+    maintainers = [ ];
   };
 })

From e44ebca0433ad57c10328184f2781dd00c07d3c8 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Fri, 7 Nov 2025 13:19:07 +0100
Subject: [PATCH 6114/6226] nixosTests.freshrss.extensions: replace lxml-stubs
 with types-lxml

lxml-stubs is broken, unmaintained upstream, and advertises types-lxml
as its successor [1].

Also don't skip type checking anymore as it now passes.

[1] https://github.com/lxml/lxml-stubs
---
 nixos/tests/freshrss/extensions.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/nixos/tests/freshrss/extensions.nix b/nixos/tests/freshrss/extensions.nix
index d956d4fe32fb..bf624a6041b6 100644
--- a/nixos/tests/freshrss/extensions.nix
+++ b/nixos/tests/freshrss/extensions.nix
@@ -16,9 +16,8 @@
     };
   extraPythonPackages = p: [
     p.lxml
-    p.lxml-stubs
+    p.types-lxml
   ];
-  skipTypeCheck = true;
 
   testScript = ''
     machine.wait_for_unit("multi-user.target")

From 4431e491067fdec79029ed10e153db7390738e3d Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Fri, 7 Nov 2025 13:21:44 +0100
Subject: [PATCH 6115/6226] python313Packages.lxml-stubs: drop

lxml-stubs is broken, unmaintained upstream, and advertises types-lxml
as its successor [1].

[1] https://github.com/lxml/lxml-stubs
---
 .../python-modules/lxml-stubs/default.nix     | 43 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 45 deletions(-)
 delete mode 100644 pkgs/development/python-modules/lxml-stubs/default.nix

diff --git a/pkgs/development/python-modules/lxml-stubs/default.nix b/pkgs/development/python-modules/lxml-stubs/default.nix
deleted file mode 100644
index 7562874daaa0..000000000000
--- a/pkgs/development/python-modules/lxml-stubs/default.nix
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-  lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  lxml,
-  pytest-mypy-plugins,
-  pytestCheckHook,
-  setuptools,
-}:
-
-buildPythonPackage rec {
-  pname = "lxml-stubs";
-  version = "0.5.1";
-  pyproject = true;
-
-  src = fetchFromGitHub {
-    owner = "lxml";
-    repo = "lxml-stubs";
-    tag = version;
-    hash = "sha256-OwaPnCr0vylhdAvMMUfGV6DjZEh7Q71pgMOt66urg5I=";
-  };
-
-  nativeBuildInputs = [ setuptools ];
-
-  propagatedBuildInputs = [ lxml ];
-
-  nativeCheckInputs = [
-    pytestCheckHook
-    pytest-mypy-plugins
-  ];
-
-  disabledTests = [
-    # Output difference, https://github.com/lxml/lxml-stubs/issues/101
-    "etree_element_iterchildren"
-  ];
-
-  meta = with lib; {
-    description = "Type stubs for the lxml package";
-    homepage = "https://github.com/lxml/lxml-stubs";
-    license = licenses.asl20;
-    maintainers = with maintainers; [ doronbehar ];
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 22b3143b797d..bd55bef928de 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -242,6 +242,7 @@ mapAliases {
   lmcloud = throw "'lmcloud' has been renamed to/replaced by 'pylamarzocco'"; # Converted to throw 2025-10-29
   logilab_common = throw "'logilab_common' has been renamed to/replaced by 'logilab-common'"; # Converted to throw 2025-10-29
   loo-py = throw "'loo-py' has been renamed to/replaced by 'loopy'"; # Converted to throw 2025-10-29
+  lxml-stubs = throw "'lxml-stubs' has been removed as it was broken and unmaintained upstream. Consider using 'types-lxml' instead."; # Converted to throw 2025-11-07
   mac_alias = throw "'mac_alias' has been renamed to/replaced by 'mac-alias'"; # Converted to throw 2025-10-29
   macropy = throw "macropy has been removed as it was broken since 2020"; # added 2025-10-04
   Mako = throw "'Mako' has been renamed to/replaced by 'mako'"; # Converted to throw 2025-10-29
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 451502c1d2ee..455b55c2d238 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -8967,8 +8967,6 @@ self: super: with self; {
 
   lxml-html-clean = callPackage ../development/python-modules/lxml-html-clean { };
 
-  lxml-stubs = callPackage ../development/python-modules/lxml-stubs { };
-
   lyricwikia = callPackage ../development/python-modules/lyricwikia { };
 
   lz4 = callPackage ../development/python-modules/lz4 { };

From b7bbae81a8fee5a1863d3f21d359bb9ea2d0a6d5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 12:49:50 +0000
Subject: [PATCH 6116/6226] coc-flutter: 0-unstable-2023-03-22 ->
 1.9.3-unstable-2023-03-22

---
 pkgs/by-name/co/coc-flutter/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/coc-flutter/package.nix b/pkgs/by-name/co/coc-flutter/package.nix
index e720ed66bc48..1451c935e879 100644
--- a/pkgs/by-name/co/coc-flutter/package.nix
+++ b/pkgs/by-name/co/coc-flutter/package.nix
@@ -37,7 +37,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "coc-flutter";
-  version = "0-unstable-2023-03-22";
+  version = "1.9.3-unstable-2023-03-22";
 
   src = fetchFromGitHub {
     owner = "iamcco";

From 2aba3c894e60218d2c6f9936ac134edaafa831da Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Fri, 7 Nov 2025 14:03:35 +0100
Subject: [PATCH 6117/6226] cjdns: fix build

---
 pkgs/by-name/cj/cjdns/package.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/by-name/cj/cjdns/package.nix b/pkgs/by-name/cj/cjdns/package.nix
index b52a910f59da..ce1bd7ad125d 100644
--- a/pkgs/by-name/cj/cjdns/package.nix
+++ b/pkgs/by-name/cj/cjdns/package.nix
@@ -37,6 +37,11 @@ rustPlatform.buildRustPackage rec {
       url = "https://github.com/cjdelisle/cjdns/commit/436d9a9784bae85734992c2561c778fbd2f5ac32.patch";
       hash = "sha256-THcYNGVbMx/xf3/5UIxEhz3OlODE0qiYgDBOlHunhj8=";
     })
+    # Fix build failure with Rust 1.89.0 (https://github.com/cjdelisle/cjdns/pull/1271)
+    (fetchpatch {
+      url = "https://github.com/cjdelisle/cjdns/commit/68b786aca5bfa427e5f58c029e4d9cc74969ef87.patch";
+      hash = "sha256-FmrooDzrIWUIAnzwZTVDXI+Cl8pMngPqxsJjUHVhry8=";
+    })
   ];
 
   cargoHash = "sha256-f96y6ZW0HxC+73ts5re8GIo2aigQgK3gXyF7fMrcJ0o=";

From ea6198b00e03eff35c6790ecb15625719d308336 Mon Sep 17 00:00:00 2001
From: Tom Hunze <dev@thunze.de>
Date: Fri, 7 Nov 2025 14:07:48 +0100
Subject: [PATCH 6118/6226] cjdns: add meta.changelog

---
 pkgs/by-name/cj/cjdns/package.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/cj/cjdns/package.nix b/pkgs/by-name/cj/cjdns/package.nix
index ce1bd7ad125d..f6f2ce3a71dc 100644
--- a/pkgs/by-name/cj/cjdns/package.nix
+++ b/pkgs/by-name/cj/cjdns/package.nix
@@ -86,8 +86,9 @@ rustPlatform.buildRustPackage rec {
   passthru.tests.basic = nixosTests.cjdns;
 
   meta = {
-    homepage = "https://github.com/cjdelisle/cjdns";
     description = "Encrypted networking for regular people";
+    homepage = "https://github.com/cjdelisle/cjdns";
+    changelog = "https://github.com/cjdelisle/cjdns/blob/${src.tag}/CHANGELOG.md";
     license = lib.licenses.gpl3Plus;
     platforms = lib.platforms.linux ++ lib.platforms.darwin;
   };

From a0e4d5fa7e8a0b92dc0235634aebd32a89cc0b66 Mon Sep 17 00:00:00 2001
From: Pol Dellaiera <pol.dellaiera@protonmail.com>
Date: Fri, 7 Nov 2025 14:08:42 +0100
Subject: [PATCH 6119/6226] projecteur: remove obsolete `postPatch` step

---
 pkgs/os-specific/linux/projecteur/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/os-specific/linux/projecteur/default.nix b/pkgs/os-specific/linux/projecteur/default.nix
index 726728539586..30ae0ba4543d 100644
--- a/pkgs/os-specific/linux/projecteur/default.nix
+++ b/pkgs/os-specific/linux/projecteur/default.nix
@@ -23,10 +23,6 @@ stdenv.mkDerivation (finalAttrs: {
     hash = "sha256-F7o93rBjrDTmArTIz8RB/uGBOYE6ny/U7ppk+jEhM5A=";
   };
 
-  postPatch = ''
-    sed '1i#include <array>' -i src/device.h # gcc12
-  '';
-
   buildInputs = [
     qtbase
     qtgraphicaleffects

From 42369a0ad0568bb496ba2598054cdc870d720e03 Mon Sep 17 00:00:00 2001
From: Gaetan Lepage <gaetan@glepage.com>
Date: Fri, 7 Nov 2025 13:03:46 +0000
Subject: [PATCH 6120/6226] todds: fix cuda build, cleanup

---
 pkgs/by-name/to/todds/package.nix | 40 ++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/to/todds/package.nix b/pkgs/by-name/to/todds/package.nix
index e77fec6f4e25..edf79a484893 100644
--- a/pkgs/by-name/to/todds/package.nix
+++ b/pkgs/by-name/to/todds/package.nix
@@ -1,16 +1,30 @@
 {
   lib,
+  config,
   stdenv,
+  fetchFromGitHub,
+
+  # nativeBuildInputs
   cmake,
+  ispc,
   ninja,
   pkg-config,
-  ispc,
+  cudaPackages,
+
+  # buildInputs
   boost,
   fmt,
   hyperscan,
-  opencv,
   onetbb,
-  fetchFromGitHub,
+  opencv,
+
+  # tests
+  versionCheckHook,
+
+  # passthru
+  nix-update-script,
+
+  cudaSupport ? config.cudaSupport,
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "todds";
@@ -22,30 +36,44 @@ stdenv.mkDerivation (finalAttrs: {
     owner = "todds-encoder";
     repo = "todds";
     tag = finalAttrs.version;
-    hash = "sha256-nyYFYym9ZZskkaTPV30+QavdqpvVopnIXXZC6zkeu7c=";
     fetchSubmodules = true;
+    hash = "sha256-nyYFYym9ZZskkaTPV30+QavdqpvVopnIXXZC6zkeu7c=";
   };
 
   nativeBuildInputs = [
     cmake
+    ispc
     ninja
     pkg-config
-    ispc
+  ]
+  ++ lib.optionals cudaSupport [
+    (lib.getBin cudaPackages.cuda_nvcc)
   ];
 
   buildInputs = [
     boost
     fmt
     hyperscan
-    opencv
     onetbb
+    opencv
+  ]
+  ++ lib.optionals cudaSupport [
+    cudaPackages.cuda_cudart
   ];
 
   strictDeps = true;
 
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  doInstallCheck = true;
+
+  passthru.updateScript = nix-update-script { };
+
   meta = {
     description = "CPU-based DDS encoder optimized for fast batch conversions with high encoding quality";
     homepage = "https://github.com/todds-encoder/todds";
+    changelog = "https://github.com/todds-encoder/todds/releases/tag/${finalAttrs.version}";
     license = lib.licenses.mpl20;
     maintainers = with lib.maintainers; [ weirdrock ];
     mainProgram = "todds";

From 0ef2e58999a3cb56f1f3f9ee7cb0dc9c9bfe09c4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 13:11:29 +0000
Subject: [PATCH 6121/6226] coc-rust-analyzer: 0-unstable-2025-10-31 ->
 0-unstable-2025-11-01

---
 pkgs/by-name/co/coc-rust-analyzer/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/coc-rust-analyzer/package.nix b/pkgs/by-name/co/coc-rust-analyzer/package.nix
index 278b29e6a592..e41f5bcd892d 100644
--- a/pkgs/by-name/co/coc-rust-analyzer/package.nix
+++ b/pkgs/by-name/co/coc-rust-analyzer/package.nix
@@ -7,7 +7,7 @@
 
 buildNpmPackage {
   pname = "coc-rust-analyzer";
-  version = "0-unstable-2025-10-31";
+  version = "0-unstable-2025-11-01";
 
   src = fetchFromGitHub {
     owner = "fannheyward";

From 86f27bc30435910a2273e7d4dc168fe67c226b87 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 13:21:47 +0000
Subject: [PATCH 6122/6226] gfal2: 2.23.2 -> 2.23.5

---
 pkgs/by-name/gf/gfal2/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gf/gfal2/package.nix b/pkgs/by-name/gf/gfal2/package.nix
index 62e9714929b6..7c8e2fbd55bb 100644
--- a/pkgs/by-name/gf/gfal2/package.nix
+++ b/pkgs/by-name/gf/gfal2/package.nix
@@ -23,13 +23,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "gfal2";
-  version = "2.23.2";
+  version = "2.23.5";
 
   src = fetchFromGitHub {
     owner = "cern-fts";
     repo = "gfal2";
     rev = "v${finalAttrs.version}";
-    hash = "sha256-gyEmz0sNHyxjvJA/3uSzLW42PQ3UVKx6nptNYl/3ExM=";
+    hash = "sha256-Dt6xA7U4aPKFZmO2iAiYM99w5ZIZNQJ+JXzuVItIlBM=";
   };
 
   passthru.enablePluginStatus = {

From dfa87a7f1621a1abca9f56b923f06d383bbf426f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 13:34:43 +0000
Subject: [PATCH 6123/6226] planify: 4.15.1 -> 4.15.2

---
 pkgs/by-name/pl/planify/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/pl/planify/package.nix b/pkgs/by-name/pl/planify/package.nix
index 55bc6548512a..5a89ecce1279 100644
--- a/pkgs/by-name/pl/planify/package.nix
+++ b/pkgs/by-name/pl/planify/package.nix
@@ -29,13 +29,13 @@
 
 stdenv.mkDerivation rec {
   pname = "planify";
-  version = "4.15.1";
+  version = "4.15.2";
 
   src = fetchFromGitHub {
     owner = "alainm23";
     repo = "planify";
     tag = "v${version}";
-    hash = "sha256-b0I6UXdE0EqRP9FrqRyf1CscYSlYjFPcmIgkMjCLWMc=";
+    hash = "sha256-i6yAObfSMZyHHK/1YUFppU9gcFJj7WL48Eqe6IQAh4M=";
   };
 
   nativeBuildInputs = [

From d0b482bc1755ffe5131c92111caaf61bbfa8f00c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 13:40:06 +0000
Subject: [PATCH 6124/6226] coc-vimlsp: 0-unstable-2023-06-26 ->
 0.8.0-unstable-2023-06-26

---
 pkgs/by-name/co/coc-vimlsp/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/co/coc-vimlsp/package.nix b/pkgs/by-name/co/coc-vimlsp/package.nix
index 06ac152b85e4..7090854bc472 100644
--- a/pkgs/by-name/co/coc-vimlsp/package.nix
+++ b/pkgs/by-name/co/coc-vimlsp/package.nix
@@ -11,7 +11,7 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "coc-vimlsp";
-  version = "0-unstable-2023-06-26";
+  version = "0.8.0-unstable-2023-06-26";
 
   src = fetchFromGitHub {
     owner = "iamcco";

From 35418f012f1c7dec2532a77ebfc896f768835b15 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 13:43:44 +0000
Subject: [PATCH 6125/6226] helix-db: 2.0.5 -> 2.1.0

---
 pkgs/by-name/he/helix-db/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/he/helix-db/package.nix b/pkgs/by-name/he/helix-db/package.nix
index 30ad67eed5e4..6175bd201978 100644
--- a/pkgs/by-name/he/helix-db/package.nix
+++ b/pkgs/by-name/he/helix-db/package.nix
@@ -10,16 +10,16 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "helix-db";
-  version = "2.0.5";
+  version = "2.1.0";
 
   src = fetchFromGitHub {
     repo = "helix-db";
     owner = "HelixDB";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-lNAaOpF6g2yunGP9bgsMVvVc7YMfZ44WfkumR+8Btlg=";
+    hash = "sha256-ucDo8jvVBM0KmCTSEbduBYHJSHAJljJQg1+HEQvJ7pU=";
   };
 
-  cargoHash = "sha256-YCBTSm252eUJeOyMIEcZ+0AyHoYM1QceYSHhp+qwf6Q=";
+  cargoHash = "sha256-LimHFXr7hacpBaULSbMz+q/j3R943HDz2fQir1FA2E0=";
 
   patches = [
     #There are no feature yet

From 85802e3c4ac522364440fa2820e8528893c89e33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Neumann?= <necoro@necoro.eu>
Date: Fri, 7 Nov 2025 15:08:31 +0100
Subject: [PATCH 6126/6226] adminneo: Replace Makefile hack by passing PHP flag

---
 pkgs/by-name/ad/adminneo/package.nix | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/ad/adminneo/package.nix b/pkgs/by-name/ad/adminneo/package.nix
index f2922edebaed..33cf4825cb9e 100644
--- a/pkgs/by-name/ad/adminneo/package.nix
+++ b/pkgs/by-name/ad/adminneo/package.nix
@@ -21,16 +21,9 @@ stdenvNoCC.mkDerivation (finalAttrs: {
     php
   ];
 
-  # Package provides a Makefile, which is currently broken
-  # https://github.com/adminneo-org/adminneo/issues/161
-  # As soon, as this is fixed, the buildPhase can be removed
-  buildPhase = ''
-    runHook preBuild
-
-    ${php}/bin/php bin/compile.php
-
-    runHook postBuild
-  '';
+  makeFlags = [
+    "PHP=${php}/bin/php"
+  ];
 
   installPhase = ''
     runHook preInstall

From cac9cac707de7d993f11439947247f430a3d4754 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 14:09:26 +0000
Subject: [PATCH 6127/6226] hcloud: 1.55.0 -> 1.56.0

---
 pkgs/by-name/hc/hcloud/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/hc/hcloud/package.nix b/pkgs/by-name/hc/hcloud/package.nix
index 72076d9a6e21..674b4c2fdbbb 100644
--- a/pkgs/by-name/hc/hcloud/package.nix
+++ b/pkgs/by-name/hc/hcloud/package.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "hcloud";
-  version = "1.55.0";
+  version = "1.56.0";
 
   src = fetchFromGitHub {
     owner = "hetznercloud";
     repo = "cli";
     tag = "v${version}";
-    hash = "sha256-4UPZ3SCKTjmSt6mm0zHwecVq3UtR+cSkQmNdbkq/dMY=";
+    hash = "sha256-mK4CF3Is+gfu7euU5drU3jZitAe7501lvpy6N6NXLCI=";
   };
 
-  vendorHash = "sha256-heCGRW8yT/aTrh4PKj62P8EPT7mXVDMo9Z8pIypOT6o=";
+  vendorHash = "sha256-geFjIYvVhbKpwGsEuSm3NbYt8kkBsLtJqCmnY4zhJL8=";
 
   ldflags = [
     "-s"

From 5d38a7995a1089a6c319be0e5bb919fad25236da Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 14:15:19 +0000
Subject: [PATCH 6128/6226] nnd: 0.57 -> 0.58

---
 pkgs/by-name/nn/nnd/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/nn/nnd/package.nix b/pkgs/by-name/nn/nnd/package.nix
index 3eee2f2ee8d8..b38f98afec73 100644
--- a/pkgs/by-name/nn/nnd/package.nix
+++ b/pkgs/by-name/nn/nnd/package.nix
@@ -8,16 +8,16 @@ let
 in
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "nnd";
-  version = "0.57";
+  version = "0.58";
 
   src = fetchFromGitHub {
     owner = "al13n321";
     repo = "nnd";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-olW1Sx29TPw9TFCKZcIbKZU1LHObVGD6/vpl4EY27BE=";
+    hash = "sha256-+6qIGs8O7EoziP03qJJ+tztxoubnnBwDijD84UZ0C4c=";
   };
 
-  cargoHash = "sha256-9y0CLBYFfasyJLWyD26B3ZdUkkNJV9Y8BHJGdMEVwKY=";
+  cargoHash = "sha256-pLGLMz7q63uEr9lGeq25q8fKWY+D75PRmS7bDO4ZyKM=";
 
   meta = {
     description = "Debugger for Linux";

From 4125339410d9e2ea2d3b3c9b308391fd9bb98cb1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 14:30:23 +0000
Subject: [PATCH 6129/6226] emmylua-check: 0.16.0 -> 0.17.0

---
 pkgs/by-name/em/emmylua-check/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/em/emmylua-check/package.nix b/pkgs/by-name/em/emmylua-check/package.nix
index 7dbf104870d6..a973b97fa508 100644
--- a/pkgs/by-name/em/emmylua-check/package.nix
+++ b/pkgs/by-name/em/emmylua-check/package.nix
@@ -7,18 +7,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "emmylua_check";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "EmmyLuaLs";
     repo = "emmylua-analyzer-rust";
     tag = finalAttrs.version;
-    hash = "sha256-6mcVIOKsC+1cboZ8e23J0m2ed/2ohR0F3LfrM9UlaR4=";
+    hash = "sha256-CAYSaRjpQwnPZojeX/VyV9/xz8SY8Lt+e1wc79qvGZg=";
   };
 
   buildAndTestSubdir = "crates/emmylua_check";
 
-  cargoHash = "sha256-d6dhrib4mz7KmHo3EbkUXBPpjEGu35GeYNkpIrJrKJI=";
+  cargoHash = "sha256-nGSN7LqvAwYg2Z+2tTAc+vIwrYmb+W0OLw9EeG7e/V8=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 2f46dc62dd3c7d525a42d8fabd957c2196243a43 Mon Sep 17 00:00:00 2001
From: Raphael Borun Das Gupta <git@raphael.dasgupta.ch>
Date: Fri, 7 Nov 2025 15:35:25 +0100
Subject: [PATCH 6130/6226] maintainers/scripts/get-maintainer-pings-between:
 drop documentation

The script was dropped
in commit 44e4c1ba9f7521ab1ffcd04691677c3a306897ef
as part of PR #452566,
but the corresponding README entry was left in place.

This change removes that README entry.
---
 maintainers/scripts/README.md | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/maintainers/scripts/README.md b/maintainers/scripts/README.md
index 6ae6cb851bc4..fd6e8bd21f64 100644
--- a/maintainers/scripts/README.md
+++ b/maintainers/scripts/README.md
@@ -52,17 +52,6 @@ The maintainer is designated by a `selector` which must be one of:
 
 [`maintainer-list.nix`]: ../maintainer-list.nix
 
-### `get-maintainer-pings-between.sh`
-
-Gets which maintainers would be pinged between two Nixpkgs revisions.
-Outputs a JSON object on stdout mapping GitHub usernames to the attributes that they would be getting pinged for.
-
-Example:
-
-```sh
-maintainers/scripts/get-maintainer-pings-between.sh HEAD^ HEAD
-```
-
 ## Conventions
 
 ### `sha-to-sri.py`

From afac8b5aa13ca0e6b94fbdd1e4580d870ee4ec70 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 14:37:52 +0000
Subject: [PATCH 6131/6226] emmylua-doc-cli: 0.16.0 -> 0.17.0

---
 pkgs/by-name/em/emmylua-doc-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/em/emmylua-doc-cli/package.nix b/pkgs/by-name/em/emmylua-doc-cli/package.nix
index cbd96a27de53..b0c4642ead5e 100644
--- a/pkgs/by-name/em/emmylua-doc-cli/package.nix
+++ b/pkgs/by-name/em/emmylua-doc-cli/package.nix
@@ -6,18 +6,18 @@
 }:
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "emmylua_doc_cli";
-  version = "0.16.0";
+  version = "0.17.0";
 
   src = fetchFromGitHub {
     owner = "EmmyLuaLs";
     repo = "emmylua-analyzer-rust";
     tag = finalAttrs.version;
-    hash = "sha256-6mcVIOKsC+1cboZ8e23J0m2ed/2ohR0F3LfrM9UlaR4=";
+    hash = "sha256-CAYSaRjpQwnPZojeX/VyV9/xz8SY8Lt+e1wc79qvGZg=";
   };
 
   buildAndTestSubdir = "crates/emmylua_doc_cli";
 
-  cargoHash = "sha256-d6dhrib4mz7KmHo3EbkUXBPpjEGu35GeYNkpIrJrKJI=";
+  cargoHash = "sha256-nGSN7LqvAwYg2Z+2tTAc+vIwrYmb+W0OLw9EeG7e/V8=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From 5a3298f644d7fd3c72be78f1ce206db42e76d85d Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Fri, 7 Nov 2025 15:46:07 +0100
Subject: [PATCH 6132/6226] jql: cleanup

---
 pkgs/by-name/jq/jql/package.nix | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/jq/jql/package.nix b/pkgs/by-name/jq/jql/package.nix
index 63c062a4ae02..bddd524cf6e0 100644
--- a/pkgs/by-name/jq/jql/package.nix
+++ b/pkgs/by-name/jq/jql/package.nix
@@ -2,32 +2,44 @@
   lib,
   fetchFromGitHub,
   rustPlatform,
+  versionCheckHook,
+  nix-update-script,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "jql";
   version = "8.0.9";
 
   src = fetchFromGitHub {
     owner = "yamafaktory";
     repo = "jql";
-    rev = "jql-v${version}";
+    tag = "jql-v${finalAttrs.version}";
     hash = "sha256-1gkKOOR2mIUKrbVb1BlFxVuskL6y7s6mrI99xTfjjTI=";
   };
 
   cargoHash = "sha256-7pSvHZqvPW9SXwU0AtQHIjgHQCSKPzrBhNxLY5ZAcMw=";
 
-  meta = with lib; {
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
+  };
+
+  meta = {
     description = "JSON Query Language CLI tool built with Rust";
     homepage = "https://github.com/yamafaktory/jql";
-    changelog = "https://github.com/yamafaktory/jql/releases/tag/${src.rev}";
-    license = with licenses; [
+    changelog = "https://github.com/yamafaktory/jql/releases/tag/${finalAttrs.src.tag}";
+    license = with lib.licenses; [
       asl20
       mit
     ];
-    maintainers = with maintainers; [
+    maintainers = with lib.maintainers; [
       akshgpt7
     ];
     mainProgram = "jql";
   };
-}
+})

From 651467f688ffa4946116fa3e4d68fe266681bf1a Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Fri, 7 Nov 2025 15:55:43 +0100
Subject: [PATCH 6133/6226] catnip: cleanup

---
 pkgs/by-name/ca/catnip/package.nix | 31 ++++++++++++++++--------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/pkgs/by-name/ca/catnip/package.nix b/pkgs/by-name/ca/catnip/package.nix
index 13275ec04617..9caff3b40356 100644
--- a/pkgs/by-name/ca/catnip/package.nix
+++ b/pkgs/by-name/ca/catnip/package.nix
@@ -4,18 +4,18 @@
   fetchFromGitHub,
   pkg-config,
   portaudio,
-  testers,
-  catnip,
+  versionCheckHook,
+  nix-update-script,
 }:
 
-buildGoModule rec {
+buildGoModule (finalAttrs: {
   pname = "catnip";
   version = "1.8.7";
 
   src = fetchFromGitHub {
     owner = "noriah";
     repo = "catnip";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-M9VGpDsBambe9kXyEgDg53pKOSL2zH1ugfSbRgAiaCo=";
   };
 
@@ -31,22 +31,25 @@ buildGoModule rec {
 
   ldflags = [
     "-s"
-    "-w"
-    "-X=main.version=${version}"
+    "-X=main.version=${finalAttrs.version}"
   ];
 
-  passthru.tests = {
-    version = testers.testVersion {
-      package = catnip;
-    };
+  nativeInstallCheckInputs = [
+    versionCheckHook
+  ];
+  versionCheckProgramArg = "--version";
+  doInstallCheck = true;
+
+  passthru = {
+    updateScript = nix-update-script { };
   };
 
-  meta = with lib; {
+  meta = {
     description = "Terminal audio visualizer for linux/unix/macOS/windows";
     homepage = "https://github.com/noriah/catnip";
-    changelog = "https://github.com/noriah/catnip/releases/tag/${src.rev}";
-    license = licenses.mit;
+    changelog = "https://github.com/noriah/catnip/releases/tag/${finalAttrs.src.rev}";
+    license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "catnip";
   };
-}
+})

From 30cb9857d8cd95384961761a8a887171f08f3fea Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Fri, 7 Nov 2025 15:57:04 +0100
Subject: [PATCH 6134/6226] catnip: add liberodark to maintainers

---
 pkgs/by-name/ca/catnip/package.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/by-name/ca/catnip/package.nix b/pkgs/by-name/ca/catnip/package.nix
index 9caff3b40356..84033d22dfe9 100644
--- a/pkgs/by-name/ca/catnip/package.nix
+++ b/pkgs/by-name/ca/catnip/package.nix
@@ -49,7 +49,7 @@ buildGoModule (finalAttrs: {
     homepage = "https://github.com/noriah/catnip";
     changelog = "https://github.com/noriah/catnip/releases/tag/${finalAttrs.src.rev}";
     license = lib.licenses.mit;
-    maintainers = [ ];
+    maintainers = with lib.maintainers; [ liberodark ];
     mainProgram = "catnip";
   };
 })

From 4a152c8c0fa477d22a911841b4ccc1b4a0d6cab8 Mon Sep 17 00:00:00 2001
From: liberodark <liberodark@gmail.com>
Date: Fri, 7 Nov 2025 16:22:08 +0100
Subject: [PATCH 6135/6226] glitter: cleanup

---
 pkgs/by-name/gl/glitter/package.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/gl/glitter/package.nix b/pkgs/by-name/gl/glitter/package.nix
index 1e22d686effe..c890a42e0ca3 100644
--- a/pkgs/by-name/gl/glitter/package.nix
+++ b/pkgs/by-name/gl/glitter/package.nix
@@ -5,14 +5,14 @@
   gitMinimal,
 }:
 
-rustPlatform.buildRustPackage rec {
+rustPlatform.buildRustPackage (finalAttrs: {
   pname = "glitter";
   version = "1.6.6";
 
   src = fetchFromGitHub {
     owner = "milo123459";
     repo = "glitter";
-    rev = "v${version}";
+    tag = "v${finalAttrs.version}";
     hash = "sha256-dImQLC7owPf2EB5COO5vjN3a6k7gJ88D2hMSUW2/wn4=";
   };
 
@@ -36,9 +36,9 @@ rustPlatform.buildRustPackage rec {
   meta = {
     description = "Git wrapper that allows you to compress multiple commands into one";
     homepage = "https://github.com/milo123459/glitter";
-    changelog = "https://github.com/Milo123459/glitter/releases/tag/v${version}";
+    changelog = "https://github.com/Milo123459/glitter/releases/tag/v${finalAttrs.version}";
     license = lib.licenses.mit;
     maintainers = [ ];
     mainProgram = "glitter";
   };
-}
+})

From 7da0a50a02472ef2404916792c99c4cc99ada4c2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 15:33:17 +0000
Subject: [PATCH 6136/6226] go-ecoflow-exporter: 1.4.0 -> 1.5.0

---
 pkgs/by-name/go/go-ecoflow-exporter/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/go/go-ecoflow-exporter/package.nix b/pkgs/by-name/go/go-ecoflow-exporter/package.nix
index 6ba9adfd6de1..06928a31c3be 100644
--- a/pkgs/by-name/go/go-ecoflow-exporter/package.nix
+++ b/pkgs/by-name/go/go-ecoflow-exporter/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "go-ecoflow-exporter";
-  version = "1.4.0";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "tess1o";
     repo = "go-ecoflow-exporter";
     tag = finalAttrs.version;
-    hash = "sha256-VCzMItYgnuDXDYdrk/ojzqUE2Fjr7KWGNnLhoQ+ZPYs=";
+    hash = "sha256-oh/i4LToGnI2TuforL36tIYrhq4VUNNYVtYgaU2sf8w=";
   };
 
   vendorHash = "sha256-UbV6V06zxXMTd0v+rDPGoMFn9X5mMCiX41g49IGnoT8=";

From df564736b4cd8508d30cadcb654895a1ccc01c57 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 16:13:31 +0000
Subject: [PATCH 6137/6226] mpls: 0.15.4 -> 0.16.0

---
 pkgs/by-name/mp/mpls/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/mp/mpls/package.nix b/pkgs/by-name/mp/mpls/package.nix
index 26bd3d5687f8..3cab390e3e83 100644
--- a/pkgs/by-name/mp/mpls/package.nix
+++ b/pkgs/by-name/mp/mpls/package.nix
@@ -7,16 +7,16 @@
 }:
 buildGoModule rec {
   pname = "mpls";
-  version = "0.15.4";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "mhersson";
     repo = "mpls";
     tag = "v${version}";
-    hash = "sha256-ChEZigLKzU/SILcJoyjKZI1qqrAi9qA6ugUeg5AL2Mw=";
+    hash = "sha256-xNgbtVyjhimvhZ1ua8NoTS3bV7ZSbX5j9VnFSYXuGpI=";
   };
 
-  vendorHash = "sha256-n3DG3sR7HOQPQJW1t1qC94EKkDBgXpdmjUWtLzAE7kY=";
+  vendorHash = "sha256-QtNQnJtYLmSTTLwKKQ8P6O6wyctgwN8OcGZkMXa+Ark=";
 
   ldflags = [
     "-s"

From c1a739cf2386e7e0f7f990c35216fbff99add3de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Neumann?= <necoro@necoro.eu>
Date: Fri, 7 Nov 2025 17:20:24 +0100
Subject: [PATCH 6138/6226] feed2imap-go: Add myself as additional maintainer

---
 pkgs/by-name/fe/feed2imap-go/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/fe/feed2imap-go/package.nix b/pkgs/by-name/fe/feed2imap-go/package.nix
index 1a889265cbfb..c8df95e713ac 100644
--- a/pkgs/by-name/fe/feed2imap-go/package.nix
+++ b/pkgs/by-name/fe/feed2imap-go/package.nix
@@ -34,6 +34,9 @@ buildGoModule rec {
     mainProgram = "feed2imap-go";
     homepage = "https://github.com/Necoro/feed2imap-go";
     license = licenses.gpl2;
-    maintainers = with maintainers; [ nomeata ];
+    maintainers = with maintainers; [
+      nomeata
+      Necoro
+    ];
   };
 }

From b053d853fa998335c9489c9b7d7bb6d4ed31a696 Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Fri, 7 Nov 2025 11:23:50 -0500
Subject: [PATCH 6139/6226] libevdevplus: drop

---
 .../0001-Add-cmake-install-directives.patch   | 41 -------------------
 pkgs/by-name/li/libevdevplus/package.nix      | 36 ----------------
 pkgs/top-level/aliases.nix                    |  1 +
 3 files changed, 1 insertion(+), 77 deletions(-)
 delete mode 100644 pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch
 delete mode 100644 pkgs/by-name/li/libevdevplus/package.nix

diff --git a/pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch b/pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch
deleted file mode 100644
index 2635d6ab829e..000000000000
--- a/pkgs/by-name/li/libevdevplus/0001-Add-cmake-install-directives.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 7f208aaf21aa468013fc41e67c32f6a6c8c08249 Mon Sep 17 00:00:00 2001
-From: Jappie Klooster <jappieklooster@hotmail.com>
-Date: Fri, 2 Apr 2021 16:01:05 -0400
-Subject: [PATCH] Add cmake install directives
-
-To make nix builds work, it expect a make install command to
-be available.
-Adding these directives seems to fix the build.
-
-If it's no trouble to you, please add them.
----
- CMakeLists.txt | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f9db618..425d391 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,10 +4,17 @@ project(libevdevPlus)
- set(SOURCE_FILES
-         evdevPlus.cpp evdevPlus.hpp CommonIncludes.hpp InputEvent.hpp Resource.cpp)
- 
-+include(GNUInstallDirs)
-+
- add_library(evdevPlus ${SOURCE_FILES})
- target_include_directories(evdevPlus PUBLIC .)
- 
- add_executable(evdevPlus_test test.cpp)
- target_link_libraries(evdevPlus_test evdevPlus)
- 
--configure_file(evdevPlus.pc.in evdevPlus.pc @ONLY)
-\ No newline at end of file
-+configure_file(evdevPlus.pc.in evdevPlus.pc @ONLY)
-+
-+install(TARGETS evdevPlus
-+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(FILES evdevPlus.hpp CommonIncludes.hpp InputEvent.hpp
-+        DESTINATION include/)
--- 
-2.29.2
-
diff --git a/pkgs/by-name/li/libevdevplus/package.nix b/pkgs/by-name/li/libevdevplus/package.nix
deleted file mode 100644
index c89d7faa7865..000000000000
--- a/pkgs/by-name/li/libevdevplus/package.nix
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-}:
-
-stdenv.mkDerivation rec {
-  pname = "libevdevplus";
-  version = "unstable-2021-04-02";
-
-  # adds missing cmake install directives
-  # https://github.com/YukiWorkshop/libevdevPlus/pull/10
-  patches = [ ./0001-Add-cmake-install-directives.patch ];
-
-  src = fetchFromGitHub {
-    owner = "YukiWorkshop";
-    repo = "libevdevPlus";
-    rev = "b4d4b3143056424a3da9f0516ca02a47209ef757";
-    sha256 = "09y65s16gch0w7fy1s9yjk9gz3bjzxix36h5wmwww6lkj2i1z3rj";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  meta = with lib; {
-    inherit (src.meta) homepage;
-    description = "Easy-to-use event device library in C++";
-    license = licenses.mit;
-    maintainers = [ ];
-    platforms = with platforms; linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index f7f758a78104..11fa2596113d 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -786,6 +786,7 @@ mapAliases {
   libdevil = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
   libdevil-nox = throw "libdevil has been removed, as it was unmaintained in Nixpkgs and upstream since 2017"; # Added 2025-09-16
   libdwarf-lite = throw "`libdwarf-lite` has been replaced by `libdwarf` as it's mostly a mirror"; # Added 2025-06-16
+  libevdevplus = throw "'libevdevplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02
   libfprint-focaltech-2808-a658 = throw "'libfprint-focaltech-2808-a658' has been removed as it was broken and upstream was taken down"; # Added 2025-11-04
   libfpx = throw "libfpx has been removed as it was unmaintained in Nixpkgs and had known vulnerabilities"; # Added 2025-05-20
   libgadu = throw "'libgadu' has been removed as upstream is unmaintained and has no dependents or maintainers in Nixpkgs"; # Added 2025-05-17

From 45bcb14f4b45ca94b6cde071186c5b5b2a0d5587 Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Sun, 2 Nov 2025 20:46:59 -0600
Subject: [PATCH 6140/6226] libuinputplus: drop

---
 .../0001-Add-cmake-install-directives.patch   | 40 -------------------
 pkgs/by-name/li/libuinputplus/package.nix     | 40 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 3 files changed, 1 insertion(+), 80 deletions(-)
 delete mode 100644 pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch
 delete mode 100644 pkgs/by-name/li/libuinputplus/package.nix

diff --git a/pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch b/pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch
deleted file mode 100644
index cd6f43d37705..000000000000
--- a/pkgs/by-name/li/libuinputplus/0001-Add-cmake-install-directives.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-From 265e406e254c8d84016b12b344d8df71d1765dd1 Mon Sep 17 00:00:00 2001
-From: Jappie Klooster <jappieklooster@hotmail.com>
-Date: Fri, 2 Apr 2021 16:33:18 -0400
-Subject: [PATCH] Add cmake install directives
-
-To make nix builds work, it expect a make install command to
-be available.
-Adding these directives seems to fix the build.
-
-If it's no trouble to you, please consider adding them.
----
- CMakeLists.txt | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index cbfc9c1..948c432 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -7,6 +7,8 @@ set(SOURCE_FILES
-         uInput.cpp uInputSetup.cpp uInputResource.cpp
-         uInput.hpp CommonIncludes.hpp uInputSetup.hpp)
- 
-+include(GNUInstallDirs)
-+
- add_library(uInputPlus ${SOURCE_FILES})
- target_include_directories(uInputPlus PUBLIC .)
- 
-@@ -15,3 +17,9 @@ target_link_libraries(uInputPlus_test uInputPlus)
- 
- configure_file(uInputPlus.pc.in uInputPlus.pc @ONLY)
- 
-+
-+install(TARGETS uInputPlus
-+        LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+install(FILES uInput.hpp CommonIncludes.hpp uInputSetup.hpp
-+        DESTINATION include/)
-+
--- 
-2.29.2
-
diff --git a/pkgs/by-name/li/libuinputplus/package.nix b/pkgs/by-name/li/libuinputplus/package.nix
deleted file mode 100644
index 1541a52b32a7..000000000000
--- a/pkgs/by-name/li/libuinputplus/package.nix
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-  lib,
-  stdenv,
-  fetchFromGitHub,
-  cmake,
-  pkg-config,
-}:
-stdenv.mkDerivation rec {
-  pname = "libuinputplus";
-  version = "2021-04-02";
-
-  # adds missing cmake install directives
-  # https://github.com/YukiWorkshop/libuInputPlus/pull/7
-  patches = [ ./0001-Add-cmake-install-directives.patch ];
-
-  src = fetchFromGitHub {
-    owner = "YukiWorkshop";
-    repo = "libuInputPlus";
-    rev = "f7f18eb339bba61a43f2cad481a9b1a453a66957";
-    sha256 = "0sind2ghhy4h9kfkr5hsmhcq0di4ifwqyv4gac96rgj5mwvs33lp";
-  };
-
-  nativeBuildInputs = [
-    cmake
-    pkg-config
-  ];
-
-  postPatch = ''
-    substituteInPlace CMakeLists.txt \
-      --replace-fail "cmake_minimum_required(VERSION 3.0)" "cmake_minimum_required(VERSION 3.10)"
-  '';
-
-  meta = with lib; {
-    inherit (src.meta) homepage;
-    description = "Easy-to-use uinput library in C++";
-    license = licenses.mit;
-    maintainers = [ ];
-    platforms = with platforms; linux;
-  };
-}
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 11fa2596113d..530ab4fe1483 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -827,6 +827,7 @@ mapAliases {
   libtorrent = throw "'libtorrent' has been renamed to 'libtorrent-rakshasa' for clearer distinction from 'libtorrent-rasterbar'"; # Added 2025-09-10
   libtransmission = throw "libtransmission_3 has been removed in favour of libtransmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26
   libtransmission_3 = throw "libtransmission_3 has been removed in favour of libtransmission_4. Note that upgrade caused data loss for some users so backup is recommended (see NixOS 24.11 release notes for details)"; # Converted to throw 2025-10-26
+  libuinputplus = throw "'libuinputplus' has been removed, as it was unmaintained upstream since 2021, no longer builds, and is no longer used by anything"; # Added 2025-11-02
   libviper = throw "'libviper' was removed as it is broken and not maintained upstream"; # Added 2025-05-17
   libwnck3 = throw "'libwnck3' has been renamed to/replaced by 'libwnck'"; # Converted to throw 2025-10-27
   lightdm_gtk_greeter = throw "'lightdm_gtk_greeter' has been renamed to/replaced by 'lightdm-gtk-greeter'"; # Converted to throw 2025-10-27

From 3482b8410da6e9775b402c7b97a1707a5779da26 Mon Sep 17 00:00:00 2001
From: Jiatao Liang <jtliang24@gmail.com>
Date: Fri, 7 Nov 2025 11:35:01 -0500
Subject: [PATCH 6141/6226] artix-games-launcher: fix .desktop file to align
 with pname

.desktop file now uses pname properly
---
 pkgs/by-name/ar/artix-games-launcher/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ar/artix-games-launcher/package.nix b/pkgs/by-name/ar/artix-games-launcher/package.nix
index 35fc2f7218a4..9ee50a47a602 100644
--- a/pkgs/by-name/ar/artix-games-launcher/package.nix
+++ b/pkgs/by-name/ar/artix-games-launcher/package.nix
@@ -22,6 +22,7 @@ appimageTools.wrapType2 {
     mkdir -p $out/share/applications
     install -m 444 -D ${appimageContents}/ArtixGamesLauncher.desktop $out/share/applications/ArtixGamesLauncher.desktop
     install -m 444 -D ${appimageContents}/ArtixLogo.png $out/share/icons/ArtixLogo.png
+    substituteInPlace $out/share/applications/ArtixGamesLauncher.desktop --replace-fail 'Exec=ArtixGameLauncher %u' 'Exec=artix-games-launcher %u'
   '';
 
   meta = {

From 1ad365df9d3cc865361777f38089d1bfefc129ea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 16:36:23 +0000
Subject: [PATCH 6142/6226] melonDS: 1.0-unstable-2025-10-30 ->
 1.0-unstable-2025-11-06

---
 pkgs/by-name/me/melonDS/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/me/melonDS/package.nix b/pkgs/by-name/me/melonDS/package.nix
index 987d7c0b9f53..794f0ba0bab4 100644
--- a/pkgs/by-name/me/melonDS/package.nix
+++ b/pkgs/by-name/me/melonDS/package.nix
@@ -29,13 +29,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "melonDS";
-  version = "1.0-unstable-2025-10-30";
+  version = "1.0-unstable-2025-11-06";
 
   src = fetchFromGitHub {
     owner = "melonDS-emu";
     repo = "melonDS";
-    rev = "8a1ef8e30d6c1c2f2b0c9151b74e427dcf112a7a";
-    hash = "sha256-yf5xSXxWeIBDJ1UHJSY2grAQr6by/KU6Lj61nFR9E9Y=";
+    rev = "220b238ec06692ee144bb1f50867a2edb8795de1";
+    hash = "sha256-Vnrg+6fSnzQKy+3ZU6LKSkkgc04H9KPsE/M2Iu9Wudw=";
   };
 
   patches = [ ./fix-build-qt-6.10.patch ];

From 6eebc476094cc72b816fb7b5ecae3796df88900b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 16:40:27 +0000
Subject: [PATCH 6143/6226] python3Packages.python-toolbox: 1.2.9 -> 1.2.10

---
 pkgs/development/python-modules/python-toolbox/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-toolbox/default.nix b/pkgs/development/python-modules/python-toolbox/default.nix
index af5ffe828be8..d9c9f9ec2b66 100644
--- a/pkgs/development/python-modules/python-toolbox/default.nix
+++ b/pkgs/development/python-modules/python-toolbox/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "python-toolbox";
-  version = "1.2.9";
+  version = "1.2.10";
   pyproject = true;
 
   disabled = pythonOlder "3.9";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "cool-RR";
     repo = "python_toolbox";
     tag = version;
-    hash = "sha256-qzzFgP5dTw4qSxovnmrSgGkW0AQw/tNOy2TbE/7wqxI=";
+    hash = "sha256-+Q7r4nbubp2xzkBgEyTuA0EeIvpT4bW+2NnckVkEKcY=";
   };
 
   build-system = [ setuptools ];

From a5e50875ca62379a5c2b0c1d868008afdbe55830 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Wed, 5 Nov 2025 11:41:34 -0800
Subject: [PATCH 6144/6226] python3Packages.slack-sdk: disable tests that
 require network access

---
 pkgs/development/python-modules/slack-sdk/default.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix
index 60809522f772..e9b4f14bfbe2 100644
--- a/pkgs/development/python-modules/slack-sdk/default.nix
+++ b/pkgs/development/python-modules/slack-sdk/default.nix
@@ -13,7 +13,6 @@
   sqlalchemy,
   websocket-client,
   websockets,
-  writableTmpDirAsHomeHook,
 }:
 
 buildPythonPackage rec {
@@ -54,6 +53,14 @@ buildPythonPackage rec {
     "test_start_raises_an_error_if_rtm_ws_url_is_not_returned"
     # Requires network access: [Errno 111] Connection refused
     "test_send_message_while_disconnection"
+    # [Errno 61] Connection refused
+    "TestWebClient_HttpRetry"
+    # ConnectionResetError: [Errno 54] Connection reset by peer
+    "test_issue_690_oauth_access"
+    "test_issue_690_oauth_v2_access"
+    "test_error_response"
+    # Assertion Error: unexpectedly None (while accessing instance of slack store)
+    "test_issue_1441_mixing_user_and_bot_installations"
   ];
 
   disabledTestPaths = [

From 27fb6cc34957b6c4d033a773fe6cc77d85c03321 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 6 Nov 2025 15:45:52 -0800
Subject: [PATCH 6145/6226] python3Packages.func-timeout: remove 'with lib;'

---
 pkgs/development/python-modules/func-timeout/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/func-timeout/default.nix b/pkgs/development/python-modules/func-timeout/default.nix
index 33446197f52d..836ac9b6718d 100644
--- a/pkgs/development/python-modules/func-timeout/default.nix
+++ b/pkgs/development/python-modules/func-timeout/default.nix
@@ -20,10 +20,10 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "func_timeout" ];
 
-  meta = with lib; {
+  meta = {
     description = "Allows you to specify timeouts when calling any existing function. Also provides support for stoppable-threads";
     homepage = "https://github.com/kata198/func_timeout";
-    license = licenses.lgpl3Only;
+    license = lib.licenses.lgpl3Only;
     maintainers = [ ];
   };
 }

From 3914320ec01900e4fa616f1a352d3a5eca77e372 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 6 Nov 2025 15:50:53 -0800
Subject: [PATCH 6146/6226] python3Packages.func-timeout: disable
 timing-sensitive tests that fail under load

---
 pkgs/development/python-modules/func-timeout/default.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/func-timeout/default.nix b/pkgs/development/python-modules/func-timeout/default.nix
index 836ac9b6718d..8b6a09149f30 100644
--- a/pkgs/development/python-modules/func-timeout/default.nix
+++ b/pkgs/development/python-modules/func-timeout/default.nix
@@ -18,6 +18,15 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [ pytestCheckHook ];
 
+  disabledTests = [
+    # Calculates the amount of time the machine slept but doesn't account for heavy loads
+    "test_retry"
+    "test_funcSetTimeout"
+    "test_funcSetTimeCalculate"
+    "test_funcSetTimeCalculateWithOverride"
+    "test_setFuncTimeoutetry"
+  ];
+
   pythonImportsCheck = [ "func_timeout" ];
 
   meta = {

From 3cacec1157dbdf5c11428f9203572e2407f07a7a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 16:45:27 +0000
Subject: [PATCH 6147/6226] ipxe: 1.21.1-unstable-2025-10-29 ->
 1.21.1-unstable-2025-11-05

---
 pkgs/by-name/ip/ipxe/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix
index 106b0c87069e..49632d398755 100644
--- a/pkgs/by-name/ip/ipxe/package.nix
+++ b/pkgs/by-name/ip/ipxe/package.nix
@@ -48,7 +48,7 @@ in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "ipxe";
-  version = "1.21.1-unstable-2025-10-29";
+  version = "1.21.1-unstable-2025-11-05";
 
   nativeBuildInputs = [
     mtools
@@ -66,8 +66,8 @@ stdenv.mkDerivation (finalAttrs: {
   src = fetchFromGitHub {
     owner = "ipxe";
     repo = "ipxe";
-    rev = "fde35ff003a610eca04db0e11fb81e8dfee8a681";
-    hash = "sha256-wDdqP+EgZqAx+44oy/2x36ZuDJPbTSiiztAISbaVi3o=";
+    rev = "b41bda4413bf286d7b7a449bc05e1531da1eec2e";
+    hash = "sha256-uJzvmTzGg1gzquo09IyufwK77Kq6iQt+bhJecaTy6ts=";
   };
 
   # Calling syslinux on a FAT image isn't going to work on Aarch64.

From 37848f404ba5ce0c17ff3c5b12ebe4f76573477b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= <mail@nh2.me>
Date: Fri, 7 Nov 2025 16:46:43 +0000
Subject: [PATCH 6148/6226] nixos/frigate: Add comment to nginx general config
 referring to frigate

This way one can see which package/config it is that e.g. opens port
1935.
---
 nixos/modules/services/video/frigate.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nixos/modules/services/video/frigate.nix b/nixos/modules/services/video/frigate.nix
index 5d8d92b5cae8..efe9abd37a01 100644
--- a/nixos/modules/services/video/frigate.nix
+++ b/nixos/modules/services/video/frigate.nix
@@ -637,6 +637,7 @@ in
         '';
       };
       appendConfig = ''
+        # frigate
         rtmp {
             server {
                 listen 1935;
@@ -653,6 +654,7 @@ in
         }
       '';
       appendHttpConfig = ''
+        # frigate
         map $sent_http_content_type $should_not_cache {
           'application/json' 0;
           default 1;

From 02bb6d6d22dff3ff754ebbaad803cba9b3bcbb68 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 6 Nov 2025 10:48:52 -0800
Subject: [PATCH 6149/6226] python3Packages.yamlloader: cleanup

---
 pkgs/development/python-modules/yamlloader/default.nix | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix
index 0add590d5bfb..2836ab6c78e8 100644
--- a/pkgs/development/python-modules/yamlloader/default.nix
+++ b/pkgs/development/python-modules/yamlloader/default.nix
@@ -7,7 +7,6 @@
   pytestCheckHook,
   pyyaml,
   hypothesis,
-  pythonOlder,
 }:
 
 buildPythonPackage rec {
@@ -15,8 +14,6 @@ buildPythonPackage rec {
   version = "1.5.2";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
-
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-wQrBMhpiaxyosJ0/Ov6YVbgYORxZmSp2tl5KLZXqxBs=";
@@ -39,11 +36,11 @@ buildPythonPackage rec {
     "yamlloader"
   ];
 
-  meta = with lib; {
+  meta = {
     description = "Case-insensitive list for Python";
     homepage = "https://github.com/Phynix/yamlloader";
     changelog = "https://github.com/Phynix/yamlloader/releases/tag/${version}";
-    license = licenses.mit;
-    maintainers = with maintainers; [ freezeboy ];
+    license = lib.licenses.mit;
+    maintainers = with lib.maintainers; [ freezeboy ];
   };
 }

From 195b457d0017758b93cb313cfc8d7bc6884f6942 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 6 Nov 2025 10:52:23 -0800
Subject: [PATCH 6150/6226] python3Packages.yamlloader: build from GitHub
 source

---
 pkgs/development/python-modules/yamlloader/default.nix | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix
index 2836ab6c78e8..354c735461d3 100644
--- a/pkgs/development/python-modules/yamlloader/default.nix
+++ b/pkgs/development/python-modules/yamlloader/default.nix
@@ -1,7 +1,7 @@
 {
   lib,
   buildPythonPackage,
-  fetchPypi,
+  fetchFromGitHub,
   hatch-vcs,
   hatchling,
   pytestCheckHook,
@@ -14,9 +14,11 @@ buildPythonPackage rec {
   version = "1.5.2";
   pyproject = true;
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-wQrBMhpiaxyosJ0/Ov6YVbgYORxZmSp2tl5KLZXqxBs=";
+  src = fetchFromGitHub {
+    owner = "Phynix";
+    repo = "yamlloader";
+    tag = version;
+    hash = "sha256-SNb1iXao+TNW872qDtEldZj6S+yJxRlsnw6ye92RFSk=";
   };
 
   build-system = [

From a508472eb413ed9b5a2c0ec28c24f6e9d0803e4d Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 6 Nov 2025 10:55:03 -0800
Subject: [PATCH 6151/6226] python3Packages.yamlloader: disable broken test
 file due to pickling error

---
 pkgs/development/python-modules/yamlloader/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix
index 354c735461d3..207e3dd7151e 100644
--- a/pkgs/development/python-modules/yamlloader/default.nix
+++ b/pkgs/development/python-modules/yamlloader/default.nix
@@ -33,6 +33,12 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  disabledTestPaths = [
+    # TypeError: cannot pickle '_thread.RLock' object
+    # https://github.com/Phynix/yamlloader/issues/64
+    "tests/test_ordereddict.py"
+  ];
+
   pythonImportsCheck = [
     "yaml"
     "yamlloader"

From fd1431e8d70e3fd69c8edbe6e2d7cbc0306f70c1 Mon Sep 17 00:00:00 2001
From: Sarah Clark <seclark@nextquestion.net>
Date: Thu, 6 Nov 2025 11:10:57 -0800
Subject: [PATCH 6152/6226] python3Packages.yamlloader: add sarahec as
 maintainer

---
 pkgs/development/python-modules/yamlloader/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/yamlloader/default.nix b/pkgs/development/python-modules/yamlloader/default.nix
index 207e3dd7151e..d2e79d4d1bf0 100644
--- a/pkgs/development/python-modules/yamlloader/default.nix
+++ b/pkgs/development/python-modules/yamlloader/default.nix
@@ -49,6 +49,9 @@ buildPythonPackage rec {
     homepage = "https://github.com/Phynix/yamlloader";
     changelog = "https://github.com/Phynix/yamlloader/releases/tag/${version}";
     license = lib.licenses.mit;
-    maintainers = with lib.maintainers; [ freezeboy ];
+    maintainers = with lib.maintainers; [
+      freezeboy
+      sarahec
+    ];
   };
 }

From 3ba6ba1b354e65ceaa99e25809fe80e26524fee5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 16:59:16 +0000
Subject: [PATCH 6153/6226] enzyme: 0.0.206 -> 0.0.208

---
 pkgs/by-name/en/enzyme/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/en/enzyme/package.nix b/pkgs/by-name/en/enzyme/package.nix
index bf9d31ce1c5e..64bbf9b095c0 100644
--- a/pkgs/by-name/en/enzyme/package.nix
+++ b/pkgs/by-name/en/enzyme/package.nix
@@ -7,13 +7,13 @@
 }:
 llvmPackages.stdenv.mkDerivation rec {
   pname = "enzyme";
-  version = "0.0.206";
+  version = "0.0.208";
 
   src = fetchFromGitHub {
     owner = "EnzymeAD";
     repo = "Enzyme";
     rev = "v${version}";
-    hash = "sha256-eTRdigqNxCI9HvmKpFZUOWq6tHfldJoeNdmtd+i3aZU=";
+    hash = "sha256-/WNiGeKoEvKYlXIK4cU6z5gFGujQbAE13qyvnhMniXc=";
   };
 
   postPatch = ''

From b6222779475950b9b013fc6f4840dd7429decc6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Fri, 7 Nov 2025 17:06:49 +0000
Subject: [PATCH 6154/6226] hyprland: 0.51.1 -> 0.52.0

---
 pkgs/by-name/hy/hyprland/info.json   | 10 +++++-----
 pkgs/by-name/hy/hyprland/package.nix |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json
index c4fefeb7a047..4b6bf834beda 100644
--- a/pkgs/by-name/hy/hyprland/info.json
+++ b/pkgs/by-name/hy/hyprland/info.json
@@ -1,7 +1,7 @@
 {
-  "branch": "v0.51.1-b",
-  "commit_hash": "71a1216abcc7031776630a6d88f105605c4dc1c9",
-  "commit_message": "[gha] Nix: update inputs",
-  "date": "2025-09-22",
-  "tag": "v0.51.1"
+  "branch": "main",
+  "commit_hash": "f56ec180d3a03a5aa978391249ff8f40f949fb73",
+  "commit_message": "version: bump to 0.52.0",
+  "date": "2025-11-07",
+  "tag": "v0.52.0"
 }
diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix
index 2797a95b9e4e..21cf792817bd 100644
--- a/pkgs/by-name/hy/hyprland/package.nix
+++ b/pkgs/by-name/hy/hyprland/package.nix
@@ -91,14 +91,14 @@ assert assertMsg (
 
 customStdenv.mkDerivation (finalAttrs: {
   pname = "hyprland" + optionalString debug "-debug";
-  version = "0.51.1";
+  version = "0.52.0";
 
   src = fetchFromGitHub {
     owner = "hyprwm";
     repo = "hyprland";
     fetchSubmodules = true;
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TPlZf0urtvDH4Cb4By06szJmzR4sBlgQATuGQy8bH6U=";
+    hash = "sha256-5jYD01l95U/HTfZMAccAvhSnrWgHIRWEjLi9R4wPIVI=";
   };
 
   postPatch = ''

From e9250f684000ca09771521e018f119513cba89f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 17:13:12 +0000
Subject: [PATCH 6155/6226] badkeys: 0.0.14 -> 0.0.15

---
 pkgs/by-name/ba/badkeys/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ba/badkeys/package.nix b/pkgs/by-name/ba/badkeys/package.nix
index 9e48ffbf4064..8192fb1dda7f 100644
--- a/pkgs/by-name/ba/badkeys/package.nix
+++ b/pkgs/by-name/ba/badkeys/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "badkeys";
-  version = "0.0.14";
+  version = "0.0.15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "badkeys";
     repo = "badkeys";
     tag = "v${version}";
-    hash = "sha256-+vG0/RO36JPJQ6PB7y6PBAqs4KkMRR21GdTdx/UHHKE=";
+    hash = "sha256-unBPdNrXwWh1EkbTZKAy4E0aASpeyT+mz3liASTzj4o=";
   };
 
   build-system = with python3Packages; [

From d0cfb3936606954c3c352ba08846f127e8570de7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 17:28:40 +0000
Subject: [PATCH 6156/6226] cnquery: 12.7.1 -> 12.8.0

---
 pkgs/by-name/cn/cnquery/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix
index ad7293fc72c1..e23ad8c6bebd 100644
--- a/pkgs/by-name/cn/cnquery/package.nix
+++ b/pkgs/by-name/cn/cnquery/package.nix
@@ -6,18 +6,18 @@
 
 buildGoModule rec {
   pname = "cnquery";
-  version = "12.7.1";
+  version = "12.8.0";
 
   src = fetchFromGitHub {
     owner = "mondoohq";
     repo = "cnquery";
     tag = "v${version}";
-    hash = "sha256-LYEMJ1G+zr0LIeLGlWkoAEu+nwVrDrREBSwVH3BlIsE=";
+    hash = "sha256-tgussiogV9w7HR7QJ+XAq/kaMq0igFt+FhgfHLobG18=";
   };
 
   subPackages = [ "apps/cnquery" ];
 
-  vendorHash = "sha256-ZpyLln4YLPfZy/EXWMDAKy/jr7/wZqkvVclD8F4tEw4=";
+  vendorHash = "sha256-V2h+n6JVi3vPcNFVvnBTIq9+gorbTFi30mdBuraH/LU=";
 
   ldflags = [
     "-w"

From 83ad49b7a58711673c0bb2c74f13cd3358f7b0f8 Mon Sep 17 00:00:00 2001
From: Sandro <sandro.jaeckel@gmail.com>
Date: Fri, 7 Nov 2025 18:30:01 +0100
Subject: [PATCH 6157/6226] python3Packages.slack-sdk: remove error message
 variations for "no internet connection"

---
 pkgs/development/python-modules/slack-sdk/default.nix | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix
index e9b4f14bfbe2..ca5e3d9402f1 100644
--- a/pkgs/development/python-modules/slack-sdk/default.nix
+++ b/pkgs/development/python-modules/slack-sdk/default.nix
@@ -51,15 +51,11 @@ buildPythonPackage rec {
   disabledTests = [
     # Requires internet access (to slack API)
     "test_start_raises_an_error_if_rtm_ws_url_is_not_returned"
-    # Requires network access: [Errno 111] Connection refused
     "test_send_message_while_disconnection"
-    # [Errno 61] Connection refused
     "TestWebClient_HttpRetry"
-    # ConnectionResetError: [Errno 54] Connection reset by peer
     "test_issue_690_oauth_access"
     "test_issue_690_oauth_v2_access"
     "test_error_response"
-    # Assertion Error: unexpectedly None (while accessing instance of slack store)
     "test_issue_1441_mixing_user_and_bot_installations"
   ];
 

From bd9a0a8f5fb4fad24b58c9fdd5ec005116df39f3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 18:05:14 +0000
Subject: [PATCH 6158/6226] python3Packages.rendercanvas: 2.2.1 -> 2.3.0

---
 pkgs/development/python-modules/rendercanvas/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rendercanvas/default.nix b/pkgs/development/python-modules/rendercanvas/default.nix
index 336bac33a7d8..bea026401316 100644
--- a/pkgs/development/python-modules/rendercanvas/default.nix
+++ b/pkgs/development/python-modules/rendercanvas/default.nix
@@ -22,14 +22,14 @@
 }:
 buildPythonPackage rec {
   pname = "rendercanvas";
-  version = "2.2.1";
+  version = "2.3.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "pygfx";
     repo = "rendercanvas";
     tag = "v${version}";
-    hash = "sha256-6vvPIu+Zi+9ndcWHP43X0Qd+XCO7+tr8XCFm+bwCazE=";
+    hash = "sha256-Zk27gcUf4qHsIaL0TJJyB3dCej5xQnlKvHP9AfBPPiI=";
   };
 
   postPatch = ''

From a313b6c22c1e90a0d2f162cc4bb2324757a884ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 18:21:48 +0000
Subject: [PATCH 6159/6226] xlights: 2025.11 -> 2025.12

---
 pkgs/by-name/xl/xlights/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/xl/xlights/package.nix b/pkgs/by-name/xl/xlights/package.nix
index 98d31d1a47c1..7148d30d8373 100644
--- a/pkgs/by-name/xl/xlights/package.nix
+++ b/pkgs/by-name/xl/xlights/package.nix
@@ -6,11 +6,11 @@
 
 appimageTools.wrapType2 rec {
   pname = "xlights";
-  version = "2025.11";
+  version = "2025.12";
 
   src = fetchurl {
     url = "https://github.com/smeighan/xLights/releases/download/${version}/xLights-${version}-x86_64.AppImage";
-    hash = "sha256-k5HGk5t/ujPuOU/GlxhA+yKKXy0lq8YkxcQkTUVBYXM=";
+    hash = "sha256-INB4x2iCzjpURL7VhugCcYo+X6p6aKIY5Dx5dy1ZjJ8=";
   };
 
   meta = {

From 3061dfc88bed66f79a11f99fb73e4e14a00dfa32 Mon Sep 17 00:00:00 2001
From: Majiir Paktu <majiir@nabaal.net>
Date: Fri, 7 Nov 2025 12:45:09 -0500
Subject: [PATCH 6160/6226] nixos/wireguard-networkd: refresh peer endpoint
 without deleting link

As of systemd v257, netdevs can be reconfigured by modifying the netdev
config file and reloading (not restarting) networkd. This leaves the
interface index unchanged and should generally be less disruptive.
---
 .../services/networking/wireguard-networkd.nix     | 14 +++++++++++---
 nixos/modules/services/networking/wireguard.nix    |  9 ---------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/nixos/modules/services/networking/wireguard-networkd.nix b/nixos/modules/services/networking/wireguard-networkd.nix
index 0dc9f5b8d91c..08a5f635e331 100644
--- a/nixos/modules/services/networking/wireguard-networkd.nix
+++ b/nixos/modules/services/networking/wireguard-networkd.nix
@@ -101,15 +101,22 @@ let
         iproute2
         systemd
       ];
-      # networkd doesn't provide a mechanism for refreshing endpoints.
+      # networkd doesn't automatically refresh peer endpoints.
       # See: https://github.com/systemd/systemd/issues/9911
-      # This hack does the job but takes down the whole interface to do it.
       script = ''
-        ip link delete ${name} || :
+        touch /etc/systemd/network/40-${name}.netdev
         networkctl reload
       '';
     };
 
+  # netdev config must be a real file (not a symlink to a store file)
+  # so the refresh service can 'touch' it.
+  generateRefreshNetdevMode =
+    name: interface:
+    nameValuePair "systemd/network/40-${name}.netdev" {
+      mode = "0444";
+    };
+
 in
 {
   meta.maintainers = [ lib.maintainers.majiir ];
@@ -225,6 +232,7 @@ in
       networks = mapAttrs generateNetwork cfg.interfaces;
     };
 
+    environment.etc = mapAttrs' generateRefreshNetdevMode refreshEnabledInterfaces;
     systemd.timers = mapAttrs' generateRefreshTimer refreshEnabledInterfaces;
     systemd.services = (mapAttrs' generateRefreshService refreshEnabledInterfaces) // {
       systemd-networkd.serviceConfig.LoadCredential = flatten (
diff --git a/nixos/modules/services/networking/wireguard.nix b/nixos/modules/services/networking/wireguard.nix
index 7d266d483fb1..771301852745 100644
--- a/nixos/modules/services/networking/wireguard.nix
+++ b/nixos/modules/services/networking/wireguard.nix
@@ -215,15 +215,6 @@ let
             This option can be set or overridden for individual peers.
 
             Setting this to `0` disables periodic refresh.
-
-            ::: {.warning}
-            When {option}`networking.wireguard.useNetworkd` is enabled, this
-            option deletes the Wireguard interface and brings it back up by
-            reconfiguring the network with `networkctl reload` on every refresh.
-            This could have adverse effects on your network and cause brief
-            connectivity blips. See [systemd/systemd#9911](https://github.com/systemd/systemd/issues/9911)
-            for an upstream feature request that can make this less hacky.
-            :::
           '';
         };
 

From 96b08f16be8f5ddbf21134d651c02ae66fcba383 Mon Sep 17 00:00:00 2001
From: 0xda157 <da157@voidq.com>
Date: Fri, 7 Nov 2025 10:33:49 -0800
Subject: [PATCH 6161/6226] maintainers: update da157 matrix

---
 maintainers/maintainer-list.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index b02e5baababd..76cde1dde704 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -5563,7 +5563,7 @@
   };
   da157 = {
     email = "da157@voidq.com";
-    matrix = "@awwpotato:envs.net";
+    matrix = "@da157:catgirl.cloud";
     github = "0xda157";
     githubId = 153149335;
     name = "0xda157";

From ad624a924db33c66ea472c20403a94e6cd13c8a4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 18:35:46 +0000
Subject: [PATCH 6162/6226] opentrack: 2024.1.1-unstable-2025-10-29 ->
 2024.1.1-unstable-2025-11-06

---
 pkgs/by-name/op/opentrack/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/op/opentrack/package.nix b/pkgs/by-name/op/opentrack/package.nix
index 13e21edba534..3390f0d6d9d3 100644
--- a/pkgs/by-name/op/opentrack/package.nix
+++ b/pkgs/by-name/op/opentrack/package.nix
@@ -22,13 +22,13 @@
 }:
 stdenv.mkDerivation (finalAttrs: {
   pname = "opentrack";
-  version = "2024.1.1-unstable-2025-10-29";
+  version = "2024.1.1-unstable-2025-11-06";
 
   src = fetchFromGitHub {
     owner = "opentrack";
     repo = "opentrack";
-    rev = "766808196cf63ddf9ceb102fba193582daceb9de";
-    hash = "sha256-xS87LFAbnRg7uBbN7ARoGts3bNYkcpOm3xhojBepgIo=";
+    rev = "f7696e0b8515d53f0d0a7515cc27d3f80b3a5c28";
+    hash = "sha256-FhI6lem83STBWjFMlChy/hhletyBkVM3iUmJfAU91UE=";
   };
 
   aruco = callPackage ./aruco.nix { };

From dafad7fd83637218787e17f7aebef6dd17744511 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 18:47:07 +0000
Subject: [PATCH 6163/6226] texstudio: 4.8.9 -> 4.9.0

---
 pkgs/by-name/te/texstudio/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/te/texstudio/package.nix b/pkgs/by-name/te/texstudio/package.nix
index a1718d619f44..73214d143c3f 100644
--- a/pkgs/by-name/te/texstudio/package.nix
+++ b/pkgs/by-name/te/texstudio/package.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "texstudio";
-  version = "4.8.9";
+  version = "4.9.0";
 
   src = fetchFromGitHub {
     owner = "texstudio-org";
     repo = "texstudio";
     rev = finalAttrs.version;
-    hash = "sha256-nI7aNZ7/IAjgjmHRO78uwkah8l+3m+w1ZQ096177eAU=";
+    hash = "sha256-LHG+QFtUYf6gqF8WGUlAYd5LWNt2YlyXmQH2nwPV5MQ=";
   };
 
   nativeBuildInputs = [

From 2db5d487f15c28528f23d4004e98fa88efdf588f Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Fri, 7 Nov 2025 13:49:25 -0500
Subject: [PATCH 6164/6226] root: allow overriding clang and clad_src via
 finalAttrs

---
 pkgs/by-name/ro/root/package.nix | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/by-name/ro/root/package.nix b/pkgs/by-name/ro/root/package.nix
index c432784847e3..4d681421a1fc 100644
--- a/pkgs/by-name/ro/root/package.nix
+++ b/pkgs/by-name/ro/root/package.nix
@@ -50,7 +50,7 @@
   xrootd,
 }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation (finalAttrs: {
   pname = "root";
   version = "6.36.04";
 
@@ -59,7 +59,7 @@ stdenv.mkDerivation rec {
   };
 
   src = fetchurl {
-    url = "https://root.cern.ch/download/root_v${version}.source.tar.gz";
+    url = "https://root.cern.ch/download/root_v${finalAttrs.version}.source.tar.gz";
     hash = "sha256-zGNn2PVjxtSco0wJ0LU8sPQaUo22+GrxEf12dEzaRZY=";
   };
 
@@ -85,7 +85,7 @@ stdenv.mkDerivation rec {
     nlohmann_json # link interface of target "ROOT::ROOTEve"
   ];
   buildInputs = [
-    clang
+    finalAttrs.clang
     davix
     fftw
     ftgl
@@ -161,8 +161,8 @@ stdenv.mkDerivation rec {
       '';
 
   cmakeFlags = [
-    "-DCLAD_SOURCE_DIR=${clad_src}"
-    "-DClang_DIR=${clang}/lib/cmake/clang"
+    "-DCLAD_SOURCE_DIR=${finalAttrs.clad_src}"
+    "-DClang_DIR=${finalAttrs.clang}/lib/cmake/clang"
     "-Dbuiltin_clang=OFF"
     "-Dbuiltin_llvm=OFF"
     "-Dfail-on-missing=ON"
@@ -258,4 +258,4 @@ stdenv.mkDerivation rec {
     ];
     license = licenses.lgpl21;
   };
-}
+})

From bc3fc7e77b40d23149da655ee2bd691243e62d60 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 18:58:40 +0000
Subject: [PATCH 6165/6226] bilibili: 1.17.2-2 -> 1.17.3-1

---
 pkgs/by-name/bi/bilibili/sources.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/bi/bilibili/sources.nix b/pkgs/by-name/bi/bilibili/sources.nix
index 9231a87d3df7..0a55cfc7081c 100644
--- a/pkgs/by-name/bi/bilibili/sources.nix
+++ b/pkgs/by-name/bi/bilibili/sources.nix
@@ -1,6 +1,6 @@
 # Generated by ./update.sh - do not update manually!
 {
-  version = "1.17.2-2";
-  arm64-hash = "sha256-wKjbsuXDq9gsa6d0QgrOm2aBHcqDR23ZhH5Hl9cx0wM=";
-  x86_64-hash = "sha256-pVg1bXBD+tXbDEoKpd2KnL5jNE0Pi6SI+DIJE8Z5cHc=";
+  version = "1.17.3-1";
+  arm64-hash = "sha256-BzWByQ9ConOHZvyTRp5ogWo9esRiD5Ub/TOeuYJTggA=";
+  x86_64-hash = "sha256-FCc1NO8Law7fMBqyBxQB4NJR0ZN/ZYZ0wakGrnNw4DU=";
 }

From 68f6c8767473116285cc5d8b58382594e347f61f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 19:09:04 +0000
Subject: [PATCH 6166/6226] vacuum-go: 0.19.4 -> 0.20.1

---
 pkgs/by-name/va/vacuum-go/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/va/vacuum-go/package.nix b/pkgs/by-name/va/vacuum-go/package.nix
index 30edc97de040..5a37135f7841 100644
--- a/pkgs/by-name/va/vacuum-go/package.nix
+++ b/pkgs/by-name/va/vacuum-go/package.nix
@@ -7,17 +7,17 @@
 
 buildGoModule (finalAttrs: {
   pname = "vacuum-go";
-  version = "0.19.4";
+  version = "0.20.1";
 
   src = fetchFromGitHub {
     owner = "daveshanley";
     repo = "vacuum";
     # using refs/tags because simple version gives: 'the given path has multiple possibilities' error
     tag = "v${finalAttrs.version}";
-    hash = "sha256-TAnzsTa0143K5qHPBd00Plt6mmABIsbRmDf/k4dLU0M=";
+    hash = "sha256-BNm4daNfbVNFXFdeeJ6v+RqYOXidajS+kMURearUoOE=";
   };
 
-  vendorHash = "sha256-udFygHjA8Ygqs8YD97wwoUZqozVSs87Q1ss52Udq+nw=";
+  vendorHash = "sha256-smzYCcAlQnit4fdFIXHcJSbpf4CMcE5hkBXxYdVo4r0=";
 
   env.CGO_ENABLED = 0;
   ldflags = [

From c11cdba7200e64f458f95b2080409cd0c15fee54 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <sergei@zimmerman.foo>
Date: Fri, 7 Nov 2025 22:14:05 +0300
Subject: [PATCH 6167/6226] nixVersions.nix_2_32: 2.32.2 -> 2.32.3

Diff: https://github.com/NixOS/nix/compare/2.32.2...2.32.3
---
 pkgs/tools/package-management/nix/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index edcc45090f72..77b33e68a3d6 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -180,14 +180,14 @@ lib.makeExtensible (
       nix_2_31 = addTests "nix_2_31" self.nixComponents_2_31.nix-everything;
 
       nixComponents_2_32 = nixDependencies.callPackage ./modular/packages.nix rec {
-        version = "2.32.2";
+        version = "2.32.3";
         inherit (self.nix_2_31.meta) maintainers teams;
         otherSplices = generateSplicesForNixComponents "nixComponents_2_32";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
           tag = version;
-          hash = "sha256-zO5A57NT5WtSJ73O3uIQdkPoxW+qQfMPhMMPI1UHRjA=";
+          hash = "sha256-DrYVpBbff2zwtyrhll3fAHUYplJ8AEnd0aZa2VAY88I=";
         };
       };
 

From 68fcbb0fe89a9129a2e943089c03e76acc2cc3b4 Mon Sep 17 00:00:00 2001
From: Martin Weinelt <hexa@darmstadt.ccc.de>
Date: Fri, 7 Nov 2025 20:12:42 +0100
Subject: [PATCH 6168/6226] ctranslate2: 4.6.0 -> 4.6.1

https://github.com/OpenNMT/CTranslate2/blob/v4.6.1/CHANGELOG.md
---
 pkgs/by-name/ct/ctranslate2/package.nix                 | 4 ++--
 pkgs/development/python-modules/ctranslate2/default.nix | 5 +++++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ct/ctranslate2/package.nix b/pkgs/by-name/ct/ctranslate2/package.nix
index aaa3cbb13e27..f97a6e1e4658 100644
--- a/pkgs/by-name/ct/ctranslate2/package.nix
+++ b/pkgs/by-name/ct/ctranslate2/package.nix
@@ -28,14 +28,14 @@ let
 in
 stdenv'.mkDerivation (finalAttrs: {
   pname = "ctranslate2";
-  version = "4.6.0";
+  version = "4.6.1";
 
   src = fetchFromGitHub {
     owner = "OpenNMT";
     repo = "CTranslate2";
     tag = "v${finalAttrs.version}";
     fetchSubmodules = true;
-    hash = "sha256-EM2kunqtxo0BTIzrEomfaRsdav7sx6QEOhjDtjjSoYY=";
+    hash = "sha256-nnbBK1dIHwhq8n1mJe2wOLcDkIuScFbQwZvJ8x+knCk=";
   };
 
   # Fix CMake 4 compatibility
diff --git a/pkgs/development/python-modules/ctranslate2/default.nix b/pkgs/development/python-modules/ctranslate2/default.nix
index 018490ff8dac..26de059fba7b 100644
--- a/pkgs/development/python-modules/ctranslate2/default.nix
+++ b/pkgs/development/python-modules/ctranslate2/default.nix
@@ -27,6 +27,11 @@ buildPythonPackage rec {
   # https://github.com/OpenNMT/CTranslate2/tree/master/python
   sourceRoot = "${src.name}/python";
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "pybind11==" "pybind11>="
+  '';
+
   build-system = [
     pybind11
     setuptools

From ea92357c209c6667524f33854cf376ad2549f8de Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 19:22:42 +0000
Subject: [PATCH 6169/6226] pkgsite: 0-unstable-2025-10-29 ->
 0-unstable-2025-11-06

---
 pkgs/by-name/pk/pkgsite/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/pk/pkgsite/package.nix b/pkgs/by-name/pk/pkgsite/package.nix
index c185c8cf82d2..a8264699fc7c 100644
--- a/pkgs/by-name/pk/pkgsite/package.nix
+++ b/pkgs/by-name/pk/pkgsite/package.nix
@@ -7,13 +7,13 @@
 
 buildGoModule {
   pname = "pkgsite";
-  version = "0-unstable-2025-10-29";
+  version = "0-unstable-2025-11-06";
 
   src = fetchFromGitHub {
     owner = "golang";
     repo = "pkgsite";
-    rev = "950d5ec0f5e9dbe92b2d1b1301322ea7f75ca1de";
-    hash = "sha256-wclB22O0YEWwWA6zC7VByntmLeP9X5QLOb+hcFermko=";
+    rev = "0d7e29046a911358f7f5a5c4028a9db875187281";
+    hash = "sha256-2dHT/p0cImvaJGxf50SSebgq3eSkbX1A0kdi93rCJCE=";
   };
 
   vendorHash = "sha256-EbZ+38LLnp5aefiuBAOFHA3uPPUmPGLsDIEMln5Vh7c=";

From 0485e0897ce4b9306b6aed22b4c5cf717675e20e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 19:22:43 +0000
Subject: [PATCH 6170/6226] simplex-chat-desktop: 6.4.6 -> 6.4.7

---
 pkgs/by-name/si/simplex-chat-desktop/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/si/simplex-chat-desktop/package.nix b/pkgs/by-name/si/simplex-chat-desktop/package.nix
index ff0951bf5e84..ebdb1c3d3088 100644
--- a/pkgs/by-name/si/simplex-chat-desktop/package.nix
+++ b/pkgs/by-name/si/simplex-chat-desktop/package.nix
@@ -7,11 +7,11 @@
 
 let
   pname = "simplex-chat-desktop";
-  version = "6.4.6";
+  version = "6.4.7";
 
   src = fetchurl {
     url = "https://github.com/simplex-chat/simplex-chat/releases/download/v${version}/simplex-desktop-x86_64.AppImage";
-    hash = "sha256-Z36jWYiWP5PdiDHazXnZw9PbFC7sB2DV9c29YEjNDEc=";
+    hash = "sha256-zCkbQS99FNZS9Q6MgQuINcgWn+/JdfrLraEKWAGqguY=";
   };
 
   appimageContents = appimageTools.extract {

From 3a06c27603835d31f9b71f061f89a749412318e6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 19:23:26 +0000
Subject: [PATCH 6171/6226] 
 vscode-extensions.shd101wyy.markdown-preview-enhanced: 0.8.19 -> 0.8.20

---
 pkgs/applications/editors/vscode/extensions/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix
index b04d7fe3466f..4e9d657bdcbd 100644
--- a/pkgs/applications/editors/vscode/extensions/default.nix
+++ b/pkgs/applications/editors/vscode/extensions/default.nix
@@ -4170,8 +4170,8 @@ let
         mktplcRef = {
           publisher = "shd101wyy";
           name = "markdown-preview-enhanced";
-          version = "0.8.19";
-          hash = "sha256-F87YInLUkPUpB2oifCCq1xWD41LUdqg8cusGw2wEYg0=";
+          version = "0.8.20";
+          hash = "sha256-+dwLuqtEYirQaw/tuG5m5Ugk0crKQQZM43TmslJsBBc=";
         };
         meta = {
           description = "Provides a live preview of markdown using either markdown-it or pandoc";

From 4593db6e41aefef51674a2737b6b8ec1aec501bd Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 19:24:14 +0000
Subject: [PATCH 6172/6226] python3Packages.neo4j: 6.0.2 -> 6.0.3

---
 pkgs/development/python-modules/neo4j/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/neo4j/default.nix b/pkgs/development/python-modules/neo4j/default.nix
index 48ea82a7a9d6..82ff3aee6f8c 100644
--- a/pkgs/development/python-modules/neo4j/default.nix
+++ b/pkgs/development/python-modules/neo4j/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "neo4j";
-  version = "6.0.2";
+  version = "6.0.3";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "neo4j";
     repo = "neo4j-python-driver";
     tag = version;
-    hash = "sha256-0Idfa7hFrLSD26PpA/lJcVtYpAPcX+AF3wab092Sbzw=";
+    hash = "sha256-KhPxwj5MmhNpd4d64dN0d1wOP6nAac/DsRQ8zoT03/A=";
   };
 
   postPatch = ''

From 77cbbd05c20cf3e71b89e309a6ea7087aff5a9a0 Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Fri, 7 Nov 2025 20:33:22 +0100
Subject: [PATCH 6173/6226] apko: 0.30.18 -> 0.30.20

https://github.com/chainguard-dev/apko/releases/tag/v0.30.20

https://github.com/chainguard-dev/apko/releases/tag/v0.30.19

diff: https://github.com/chainguard-dev/apko/compare/v0.30.18...v0.30.20
---
 pkgs/by-name/ap/apko/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix
index b0977f024449..30c3b94bbda8 100644
--- a/pkgs/by-name/ap/apko/package.nix
+++ b/pkgs/by-name/ap/apko/package.nix
@@ -11,13 +11,13 @@
 
 buildGoModule (finalAttrs: {
   pname = "apko";
-  version = "0.30.18";
+  version = "0.30.20";
 
   src = fetchFromGitHub {
     owner = "chainguard-dev";
     repo = "apko";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-pOG2dDo1iHtS+ez7Crj78IpI2vuBkjpfI+W4MxJrPOI=";
+    hash = "sha256-ZmvEBWCtJ2GQO8sqjeSYMclMkVxjSiLBdrRf8N9zXiQ=";
     # populate values that require us to use git. By doing this in postFetch we
     # can delete .git afterwards and maintain better reproducibility of the src.
     leaveDotGit = true;
@@ -29,7 +29,7 @@ buildGoModule (finalAttrs: {
       find "$out" -name .git -print0 | xargs -0 rm -rf
     '';
   };
-  vendorHash = "sha256-F3b0mTSdPig8mDoqsusLTutfeMXM3Qfm5aosvHRO35k=";
+  vendorHash = "sha256-JFDwztOEupORbkhOm/Vl5SuTaLbdp8YXXRO0jVJI/Uk=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From bd031d4ab93419a6459e6d4d731c031643a5adcc Mon Sep 17 00:00:00 2001
From: emilylange <git@emilylange.de>
Date: Fri, 7 Nov 2025 20:48:36 +0100
Subject: [PATCH 6174/6226] forgejo-runner: 11.3.0 -> 11.3.1

https://code.forgejo.org/forgejo/runner/releases/tag/v11.3.1

diff: https://code.forgejo.org/forgejo/runner/compare/v11.3.0...v11.3.1
---
 pkgs/by-name/fo/forgejo-runner/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix
index ac198f9ccb1f..121c3ece070d 100644
--- a/pkgs/by-name/fo/forgejo-runner/package.nix
+++ b/pkgs/by-name/fo/forgejo-runner/package.nix
@@ -42,17 +42,17 @@ let
 in
 buildGoModule rec {
   pname = "forgejo-runner";
-  version = "11.3.0";
+  version = "11.3.1";
 
   src = fetchFromGitea {
     domain = "code.forgejo.org";
     owner = "forgejo";
     repo = "runner";
     rev = "v${version}";
-    hash = "sha256-tbP6S4suHT8eEIg+Gd2d7Su2cgwWNALcHnue9UpDnKU=";
+    hash = "sha256-jvHnTCkRvYaejeCiPpr18ldEmxcAkrEIaOLVVBY11eg=";
   };
 
-  vendorHash = "sha256-QokVTTfMGAJG4Jqfs7mfGXrC4QSZfOXesfF2OeN0L9M=";
+  vendorHash = "sha256-7Ybh5qzkqT3CvGtRXiPkc5ShTYGlyvckTxg4EFagM/c=";
 
   # See upstream Makefile
   # https://code.forgejo.org/forgejo/runner/src/branch/main/Makefile

From 5f72ce04cc101d080c0161e42f3263c00900e544 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Thu, 16 Oct 2025 14:56:55 -0300
Subject: [PATCH 6175/6226] lightning-loop: 0.31.2 -> 0.31.5

---
 pkgs/by-name/li/lightning-loop/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/li/lightning-loop/package.nix b/pkgs/by-name/li/lightning-loop/package.nix
index df3ad835f178..2a60bd978894 100644
--- a/pkgs/by-name/li/lightning-loop/package.nix
+++ b/pkgs/by-name/li/lightning-loop/package.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "lightning-loop";
-  version = "0.31.2-beta";
+  version = "0.31.5-beta";
 
   src = fetchFromGitHub {
     owner = "lightninglabs";
     repo = "loop";
     rev = "v${version}";
-    hash = "sha256-xhvGsAvcJqjSyf32Zo9jJUoHCN/5mWliLqcyN3GEjD0=";
+    hash = "sha256-pmZturc7b3wd+qgSQPNzeY0LoMTF82dqUgOe8NfPeZw=";
   };
 
-  vendorHash = "sha256-Rb0P2mPrvOII5Ck4rtB4/gpymVmwuM1rH8sxLt0zDhs=";
+  vendorHash = "sha256-X/+yi04FkN8hauqeFytagIdfigb6EGTvv8tVrlm7MGw=";
 
   subPackages = [
     "cmd/loop"

From c78c7782b14e006439513f42da6bf4684d7120cc Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Thu, 16 Oct 2025 16:44:10 -0300
Subject: [PATCH 6176/6226] lightning-loop: add man page

---
 pkgs/by-name/li/lightning-loop/package.nix | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/by-name/li/lightning-loop/package.nix b/pkgs/by-name/li/lightning-loop/package.nix
index 2a60bd978894..0e93b49c503c 100644
--- a/pkgs/by-name/li/lightning-loop/package.nix
+++ b/pkgs/by-name/li/lightning-loop/package.nix
@@ -1,6 +1,7 @@
 {
   buildGoModule,
   fetchFromGitHub,
+  installShellFiles,
   lib,
 }:
 
@@ -22,11 +23,17 @@ buildGoModule rec {
     "cmd/loopd"
   ];
 
+  nativeBuildInputs = [ installShellFiles ];
+
   ldflags = [
     "-s"
     "-w"
   ];
 
+  postInstall = ''
+    installManPage docs/loop.1
+  '';
+
   meta = with lib; {
     description = "Lightning Loop Client";
     homepage = "https://github.com/lightninglabs/loop";

From 708908c810c0d6b26df3876b1b38104a1e75c640 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Thu, 16 Oct 2025 16:46:59 -0300
Subject: [PATCH 6177/6226] lightning-loop: add starius to maintainers

---
 pkgs/by-name/li/lightning-loop/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/li/lightning-loop/package.nix b/pkgs/by-name/li/lightning-loop/package.nix
index 0e93b49c503c..0930b8025f1d 100644
--- a/pkgs/by-name/li/lightning-loop/package.nix
+++ b/pkgs/by-name/li/lightning-loop/package.nix
@@ -38,6 +38,9 @@ buildGoModule rec {
     description = "Lightning Loop Client";
     homepage = "https://github.com/lightninglabs/loop";
     license = licenses.mit;
-    maintainers = with maintainers; [ proofofkeags ];
+    maintainers = with maintainers; [
+      proofofkeags
+      starius
+    ];
   };
 }

From d956eef3fde8f9dcf9cee21527353d38ea272528 Mon Sep 17 00:00:00 2001
From: Boris Nagaev <bnagaev@gmail.com>
Date: Sun, 19 Oct 2025 19:31:45 -0300
Subject: [PATCH 6178/6226] lightning-loop: set CGO_ENABLED=0

Sync it with how upstream is built for release:
https://github.com/lightninglabs/loop/blob/v0.31.4-beta/release.sh#L270
---
 pkgs/by-name/li/lightning-loop/package.nix | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/pkgs/by-name/li/lightning-loop/package.nix b/pkgs/by-name/li/lightning-loop/package.nix
index 0930b8025f1d..8db5d3ba5dfd 100644
--- a/pkgs/by-name/li/lightning-loop/package.nix
+++ b/pkgs/by-name/li/lightning-loop/package.nix
@@ -23,6 +23,8 @@ buildGoModule rec {
     "cmd/loopd"
   ];
 
+  env.CGO_ENABLED = 0;
+
   nativeBuildInputs = [ installShellFiles ];
 
   ldflags = [

From aed0d01b3e924f1d4bf9918a7b47af9ed5cec26d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 20:04:50 +0000
Subject: [PATCH 6179/6226] python3Packages.fastcore: 1.8.14 -> 1.8.15

---
 pkgs/development/python-modules/fastcore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix
index 4a118b65acbc..11c6893092ae 100644
--- a/pkgs/development/python-modules/fastcore/default.nix
+++ b/pkgs/development/python-modules/fastcore/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "fastcore";
-  version = "1.8.14";
+  version = "1.8.15";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "fastai";
     repo = "fastcore";
     tag = version;
-    hash = "sha256-75HeMXzOYECh09ah+mvazQeEQOgcFuy8Cw9AYgu6Sz8=";
+    hash = "sha256-qMF0PWKtP2EKEUw/9FAOTo3scMYqyNWfydn2yble1jc=";
   };
 
   build-system = [ setuptools ];

From 5f38240a8edf6769f54f9f9881b932260e860eb8 Mon Sep 17 00:00:00 2001
From: transcaffeine <transcaffeine@finally.coffee>
Date: Thu, 6 Nov 2025 12:00:51 +0100
Subject: [PATCH 6180/6226] matrix-alertmanager-receiver: 2025.10.22 ->
 2025.11.5

Release notes: https://github.com/metio/matrix-alertmanager-receiver/releases/tag/2025.11.5
Full changelog: https://github.com/metio/matrix-alertmanager-receiver/compare/2025.10.22...2025.11.5
---
 pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
index 86ca596569df..e3d29b7ee553 100644
--- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
+++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix
@@ -8,16 +8,16 @@
 
 buildGoModule (finalAttrs: {
   pname = "matrix-alertmanager-receiver";
-  version = "2025.10.22";
+  version = "2025.11.5";
 
   src = fetchFromGitHub {
     owner = "metio";
     repo = "matrix-alertmanager-receiver";
     tag = finalAttrs.version;
-    hash = "sha256-TJDh1taboIRSBDyF1RV/NXKVvuT884+aU6wg6tC+YqI=";
+    hash = "sha256-vSnsPtUzoxpuV9/pZFhXwlRP6lGZPBzkdTbR1ASkdQA=";
   };
 
-  vendorHash = "sha256-8Ag/Xd4+TQBBNVJpYQfuelhaCy+3hatTZFIo2VMjXOs=";
+  vendorHash = "sha256-EcHocZhrYgh+cIg5Y+9rHf30aVkTK4BVk0NI3PzL3X4=";
 
   env.CGO_ENABLED = "0";
 

From 2bb20ead102f5074f56b92e7ce7de8711f9f14b3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 20:08:38 +0000
Subject: [PATCH 6181/6226] ytdl-sub: 2025.10.23 -> 2025.11.07.post1

---
 pkgs/by-name/yt/ytdl-sub/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/yt/ytdl-sub/package.nix b/pkgs/by-name/yt/ytdl-sub/package.nix
index 2bb128d8c9b2..2578b4b3fcd3 100644
--- a/pkgs/by-name/yt/ytdl-sub/package.nix
+++ b/pkgs/by-name/yt/ytdl-sub/package.nix
@@ -8,14 +8,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "ytdl-sub";
-  version = "2025.10.23";
+  version = "2025.11.07.post1";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "jmbannon";
     repo = "ytdl-sub";
     tag = version;
-    hash = "sha256-8BU0kTKPwCx/SFSONxGC3vXoBbcdX4ac+dlzoVpnkt0=";
+    hash = "sha256-gg4KcYLnHKpIJKhL8x1xUDf38LvmTIc/mgd0Py6Uoe4=";
   };
 
   postPatch = ''

From 5fcb55581f4c8c90819ac38e8454d4a18ecc1cc4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 20:09:10 +0000
Subject: [PATCH 6182/6226] flip-link: 0.1.10 -> 0.1.11

---
 pkgs/by-name/fl/flip-link/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/fl/flip-link/package.nix b/pkgs/by-name/fl/flip-link/package.nix
index c3799a709f13..05d2854bf437 100644
--- a/pkgs/by-name/fl/flip-link/package.nix
+++ b/pkgs/by-name/fl/flip-link/package.nix
@@ -8,16 +8,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "flip-link";
-  version = "0.1.10";
+  version = "0.1.11";
 
   src = fetchFromGitHub {
     owner = "knurling-rs";
     repo = "flip-link";
     rev = "v${version}";
-    hash = "sha256-Nw43I8EIlNGPptsLVxFBapFp6qdFoUOEicHc9FTcm2g=";
+    hash = "sha256-scAENBaZMWR6HgEnXDQPCVsZPo0m9khd3C+05hJhje8=";
   };
 
-  cargoHash = "sha256-LYIgMKXaXN5gh+MvHf03za7qPJ8N8Ww7ykWB5TYOqkw=";
+  cargoHash = "sha256-nyOLRBlC9tgEr4p8XEF4G4T3xhjQVgIx+D5Uwn/GENY=";
 
   buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv;
 

From 5abcdf7404b9ca67a1078d23b2deeb73313550ca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Fri, 7 Nov 2025 20:16:03 +0000
Subject: [PATCH 6183/6226] hyprland: add patch to fix plugins compilation

---
 pkgs/by-name/hy/hyprland/package.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix
index 21cf792817bd..f9193601996b 100644
--- a/pkgs/by-name/hy/hyprland/package.nix
+++ b/pkgs/by-name/hy/hyprland/package.nix
@@ -3,6 +3,7 @@
   stdenv,
   stdenvAdapters,
   fetchFromGitHub,
+  fetchpatch,
   pkg-config,
   makeWrapper,
   cmake,
@@ -101,6 +102,14 @@ customStdenv.mkDerivation (finalAttrs: {
     hash = "sha256-5jYD01l95U/HTfZMAccAvhSnrWgHIRWEjLi9R4wPIVI=";
   };
 
+  patches = [
+    # NOTE: this is required to make plugins compile. should be removed with the next release.
+    (fetchpatch {
+      url = "https://github.com/hyprwm/Hyprland/commit/522edc87126a48f3ce4891747b6a92a22385b1e7.patch";
+      hash = "sha256-0BAlAVW5isa8gd833PjZdqO/uEpDqdTlu0iZbLP4U9s=";
+    })
+  ];
+
   postPatch = ''
     # Fix hardcoded paths to /usr installation
     sed -i "s#/usr#$out#" src/render/OpenGL.cpp

From 4be99fb06b7f618a256fe811a1271d7e287d980a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Silva?= <andrerfosilva@gmail.com>
Date: Fri, 7 Nov 2025 20:16:18 +0000
Subject: [PATCH 6184/6226] hyprlandPlugins/hyprland-plugins: 0.51.0 -> 0.52.0

---
 .../hyprwm/hyprland-plugins/hyprland-plugins.nix              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix
index 1497950a082e..3bc837a2319d 100644
--- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix
+++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix
@@ -13,13 +13,13 @@ let
             mkHyprlandPlugin,
           }:
           let
-            version = "0.51.0";
+            version = "0.52.0";
 
             hyprland-plugins-src = fetchFromGitHub {
               owner = "hyprwm";
               repo = "hyprland-plugins";
               tag = "v${version}";
-              hash = "sha256-6jAtMjnWq8kty/dpPbIKxIupUG+WAE2AKMIKhxdLYNo=";
+              hash = "sha256-hr53AWO96ooLCwS1a2v416eT1/aWQZmuQV0ULqhaBTY=";
             };
           in
           mkHyprlandPlugin {

From bf076633a532d9241a744417c4fcb6d545c08fa5 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 20:47:07 +0000
Subject: [PATCH 6185/6226] androidStudioPackages.canary: 2025.2.2.3 ->
 2025.2.2.4

---
 pkgs/applications/editors/android-studio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix
index ce1c69460c0a..29407ea9f3e3 100644
--- a/pkgs/applications/editors/android-studio/default.nix
+++ b/pkgs/applications/editors/android-studio/default.nix
@@ -24,8 +24,8 @@ let
     sha256Hash = "sha256-l+bJ0AWIrJ3qNcKJWiE+onrl6ZpLb6YWFXE3HtIejUs=";
   };
   latestVersion = {
-    version = "2025.2.2.3"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 Canary 3"
-    sha256Hash = "sha256-lhqGfHUSUJw4IQryJprqvJuGMUVHHem3xf7CeeZ7kCo=";
+    version = "2025.2.2.4"; # "Android Studio Otter 2 Feature Drop | 2025.2.2 Canary 4"
+    sha256Hash = "sha256-i7IcD1/qOXJZM0Wzah9DIV9vsU6T2XemSvc5RK33jBI=";
   };
 in
 {

From 55f990a41b24bab8175e6ce0be5572723128f0f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 21:04:11 +0000
Subject: [PATCH 6186/6226] tailwindcss_4: 4.1.16 -> 4.1.17

---
 pkgs/by-name/ta/tailwindcss_4/package.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/by-name/ta/tailwindcss_4/package.nix b/pkgs/by-name/ta/tailwindcss_4/package.nix
index 107239a1850f..feba98214600 100644
--- a/pkgs/by-name/ta/tailwindcss_4/package.nix
+++ b/pkgs/by-name/ta/tailwindcss_4/package.nix
@@ -7,7 +7,7 @@
   makeWrapper,
 }:
 let
-  version = "4.1.16";
+  version = "4.1.17";
   inherit (stdenv.hostPlatform) system;
   throwSystem = throw "tailwindcss has not been packaged for ${system} yet.";
 
@@ -22,10 +22,10 @@ let
 
   hash =
     {
-      aarch64-darwin = "sha256-5s1EuBZ/V0bKMuVPahQR3RpsDdFdJqnCc7Oy7Z2H330=";
-      aarch64-linux = "sha256-ln60NPTWocDf2hBt7MZGy3QuBNdFqkhHJgI83Ua6jto=";
-      x86_64-darwin = "sha256-/eKu0JvyScq5+Yb9byCJ486anOHHhi/dv6gHxBfg9dM=";
-      x86_64-linux = "sha256-CeaHamPOsJzNflhn49uystxlw6Ly4v4hDWjqO8BDIFA=";
+      aarch64-darwin = "sha256-hSti2Rpt+laWloa8ikuuDkci3o9am0KxArtYm37OjP4=";
+      aarch64-linux = "sha256-JkaJmEMRzCyhBKnWpNA5tCZ67PRUPcnqC7wJTusMzI0=";
+      x86_64-darwin = "sha256-YzfIcYUyHAeSRN+9nCRQKjAGQBvRU50ZzcnfjekQGEM=";
+      x86_64-linux = "sha256-zBFdm2xO3k5CO/6mo8/D8D5sFwK32RA2m5VA4rTPOGA=";
     }
     .${system} or throwSystem;
 in

From f147c87570b87621c7209400287fa7111202d350 Mon Sep 17 00:00:00 2001
From: Elliot Berman <eberman@anduril.com>
Date: Fri, 7 Nov 2025 13:10:21 -0800
Subject: [PATCH 6187/6226] cudaPackages.cuda-samples: Build cuda-samples 13.0
 for CUDA 13

Add fixups for the 13.0 release of cuda-samples and build it when
targeting CUDA 13.
---
 .../cuda-modules/packages/cuda-samples.nix    | 33 ++++++++++++++++---
 1 file changed, 28 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/cuda-modules/packages/cuda-samples.nix b/pkgs/development/cuda-modules/packages/cuda-samples.nix
index e77ca8eda743..ff231c8c8c89 100644
--- a/pkgs/development/cuda-modules/packages/cuda-samples.nix
+++ b/pkgs/development/cuda-modules/packages/cuda-samples.nix
@@ -3,6 +3,7 @@
   _cuda,
   cmake,
   cuda_cccl,
+  cuda_culibos,
   cuda_cudart,
   cuda_nvcc,
   cuda_nvrtc,
@@ -29,7 +30,7 @@ backendStdenv.mkDerivation (finalAttrs: {
 
   name = "${cudaNamePrefix}-${finalAttrs.pname}-${finalAttrs.version}";
   pname = "cuda-samples";
-  version = "12.8";
+  version = if cudaAtLeast "13" then "13.0" else "12.8";
 
   # We should be able to use samples from the latest version of CUDA
   # on most of the CUDA package sets we have.
@@ -38,10 +39,17 @@ backendStdenv.mkDerivation (finalAttrs: {
     owner = "NVIDIA";
     repo = "cuda-samples";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-Ba0Fi0v/sQ+1iJ4mslgyIAE+oK5KO0lMoTQCC91vpiA=";
+    hash = lib.getAttr finalAttrs.version {
+      "13.0" = "sha256-bOcAE/OzOI6MWTh+bFZfq1en6Yawu+HI8W+xK+XaCqg=";
+      "12.8" = "sha256-Ba0Fi0v/sQ+1iJ4mslgyIAE+oK5KO0lMoTQCC91vpiA=";
+    };
   };
 
   prePatch =
+    let
+      samplesAtLeast = lib.versionAtLeast finalAttrs.version;
+      samplesOlder = lib.versionOlder finalAttrs.version;
+    in
     # https://github.com/NVIDIA/cuda-samples/issues/333
     ''
       nixLog "removing sample 0_Introduction/UnifiedMemoryStreams which requires OpenMP support for CUDA"
@@ -52,7 +60,7 @@ backendStdenv.mkDerivation (finalAttrs: {
           '# add_subdirectory(UnifiedMemoryStreams)'
     ''
     # This sample tries to use a relative path, which doesn't work for our splayed installation.
-    + ''
+    + lib.optionalString (samplesOlder "13") ''
       nixLog "patching sample 0_Introduction/matrixMul_nvrtc"
       substituteInPlace \
         "$NIX_BUILD_TOP/$sourceRoot/Samples/0_Introduction/matrixMul_nvrtc/CMakeLists.txt" \
@@ -66,6 +74,20 @@ backendStdenv.mkDerivation (finalAttrs: {
           "\''${CUDAToolkit_BIN_DIR}/../include/cuda" \
           "${lib.getOutput "include" cuda_cccl}/include/cuda"
     ''
+    + lib.optionalString (samplesAtLeast "13") ''
+      nixLog "patching sample 0_Introduction/matrixMul_nvrtc"
+      substituteInPlace \
+        "$NIX_BUILD_TOP/$sourceRoot/Samples/0_Introduction/matrixMul_nvrtc/CMakeLists.txt" \
+        --replace-fail \
+          "\''${CUDA_INCLUDE_DIR}/cooperative_groups" \
+          "${lib.getOutput "include" cuda_cudart}/include/cooperative_groups" \
+        --replace-fail \
+          "\''${CUDA_INCLUDE_DIR}/cccl/nv" \
+          "${lib.getOutput "include" cuda_cccl}/include/nv" \
+        --replace-fail \
+          "\''${CUDA_INCLUDE_DIR}/cccl/cuda" \
+          "${lib.getOutput "include" cuda_cccl}/include/cuda"
+    ''
     # These three samples give undefined references, like
     # nvlink error   : Undefined reference to '__cudaCDP2Free' in 'CMakeFiles/cdpBezierTessellation.dir/BezierLineCDP.cu.o'
     # nvlink error   : Undefined reference to '__cudaCDP2Malloc' in 'CMakeFiles/cdpBezierTessellation.dir/BezierLineCDP.cu.o'
@@ -108,7 +130,7 @@ backendStdenv.mkDerivation (finalAttrs: {
           "add_subdirectory(jitLto)" \
           "# add_subdirectory(jitLto)"
     ''
-    + lib.optionalString (cudaAtLeast "12.4") ''
+    + lib.optionalString (samplesOlder "13") ''
       nixLog "patching sample 4_CUDA_Libraries/jitLto to use correct path to libnvJitLink.so"
       substituteInPlace \
         "$NIX_BUILD_TOP/$sourceRoot/Samples/4_CUDA_Libraries/jitLto/CMakeLists.txt" \
@@ -172,7 +194,8 @@ backendStdenv.mkDerivation (finalAttrs: {
     libnpp
     libnvjitlink
     libnvjpeg
-  ];
+  ]
+  ++ lib.optionals (cudaAtLeast "13") [ cuda_culibos ];
 
   cmakeFlags = [
     (lib.cmakeFeature "CMAKE_CUDA_ARCHITECTURES" flags.cmakeCudaArchitecturesString)

From e84d638284d0f51e849bcb542c3eafde4c333084 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 21:17:13 +0000
Subject: [PATCH 6188/6226] direwolf-unstable: 1.7-unstable-2025-04-29 ->
 1.8-unstable-2025-11-07

---
 pkgs/by-name/di/direwolf-unstable/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/di/direwolf-unstable/package.nix b/pkgs/by-name/di/direwolf-unstable/package.nix
index 88a621623bcf..416314a1512c 100644
--- a/pkgs/by-name/di/direwolf-unstable/package.nix
+++ b/pkgs/by-name/di/direwolf-unstable/package.nix
@@ -12,13 +12,13 @@
   inherit hamlibSupport gpsdSupport extraScripts;
 }).overrideAttrs
   (oldAttrs: {
-    version = "1.7-unstable-2025-04-29";
+    version = "1.8-unstable-2025-11-07";
 
     src = fetchFromGitHub {
       owner = "wb2osz";
       repo = "direwolf";
-      rev = "486b3cf1f685502af7dc87b0f9c9cead6800d47b";
-      hash = "sha256-VFBkOWHGZP7GjekHL3GY3BGkVXQbtyD1YPmu0xaQ1ME=";
+      rev = "3658a878920803bbb69a4567579dcc4d6cb80a92";
+      hash = "sha256-EcQrNN0nRxEfhJc3AbYkxlRaBKpoHQRrZbExYBankMk=";
     };
 
     # drop upstreamed cmake-4 patch

From 036a1cb8563a6e81d733a9ec7624a99127e042a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 21:32:59 +0000
Subject: [PATCH 6189/6226] python3Packages.aioesphomeapi: 42.5.0 -> 42.7.0

---
 pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix
index 61266462b20e..4a1ab7dfa2d2 100644
--- a/pkgs/development/python-modules/aioesphomeapi/default.nix
+++ b/pkgs/development/python-modules/aioesphomeapi/default.nix
@@ -26,14 +26,14 @@
 
 buildPythonPackage rec {
   pname = "aioesphomeapi";
-  version = "42.5.0";
+  version = "42.7.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "esphome";
     repo = "aioesphomeapi";
     tag = "v${version}";
-    hash = "sha256-naYlRUJFYnxI3mOR+th+Sh2xSnAq67HSRdoopLLbqYo=";
+    hash = "sha256-dMpAlblqkmwYsXdMLkxGxpVxbbS/sBkRJR46BwXs2PM=";
   };
 
   build-system = [

From cd60f02b84d3b241f5e324dfeeda1f30b1b2922c Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 7 Nov 2025 21:48:08 +0000
Subject: [PATCH 6190/6226] cyan: fix `cmake-4` build failure

Without the change the build fails on `master` as
https://hydra.nixos.org/build/311319725:

    CMake Error at CMakeLists.txt:31 (cmake_minimum_required):
      Compatibility with CMake < 3.5 has been removed from CMake.

ZHF: #457852
---
 pkgs/by-name/cy/cyan/package.nix | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/pkgs/by-name/cy/cyan/package.nix b/pkgs/by-name/cy/cyan/package.nix
index 327994945850..7e3714a12476 100644
--- a/pkgs/by-name/cy/cyan/package.nix
+++ b/pkgs/by-name/cy/cyan/package.nix
@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch2,
   qt5,
   cmake,
   pkg-config,
@@ -20,6 +21,16 @@ stdenv.mkDerivation rec {
     hash = "sha256-R5sj8AN7UT9OIeUPNrdTIUQvtEitXp1A32l/Z2qRS94=";
   };
 
+  patches = [
+    # cmake-4 build fix:
+    #   https://github.com/rodlie/cyan/pull/123
+    (fetchpatch2 {
+      name = "cmake-4.patch";
+      url = "https://github.com/rodlie/cyan/commit/885e81310de8df7f32a5e1d2c722f89bcd969cd1.patch?full_index=1";
+      hash = "sha256-5VhXKamDNGeEvi86l+R3Lvzb4G5JFBq2dqqd6TdyxZ4=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config

From f6871f8d71088db1b9dc0a5c4c552d97e67d3664 Mon Sep 17 00:00:00 2001
From: Sergei Trofimovich <slyich@gmail.com>
Date: Fri, 7 Nov 2025 21:57:43 +0000
Subject: [PATCH 6191/6226] h2o.tests: fix the eval
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Without the change `h2o.tests` eval fails as:

    $ nix build --no-link -f. h2o.tests
    error:
       … while evaluating the attribute 'h2o'
         at pkgs/by-name/h2/h2o/package.nix:78:36:
           77|   passthru = {
           78|     tests = { inherit (nixosTests) h2o; };
             |                                    ^
           79|   };

       … in the left operand of the update (//) operator
         at pkgs/top-level/all-packages.nix:153:5:
          152|   nixosTests =
          153|     import ../../nixos/tests/all-tests.nix {
             |     ^
          154|       inherit pkgs;

       (stack trace truncated; use '--show-trace' to show the full, detailed trace)

       error: undefined variable 'lib'
       at nixos/tests/all-tests.nix:676:44:
          675|   gvisor = runTest ./gvisor.nix;
          676|   h2o = import ./web-servers/h2o { inherit lib runTest; };
             |                                            ^
          677|   hadoop = import ./hadoop {
---
 nixos/tests/all-tests.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix
index 511e2101fa7b..4a2bae095ad1 100644
--- a/nixos/tests/all-tests.nix
+++ b/nixos/tests/all-tests.nix
@@ -673,7 +673,10 @@ in
   guacamole-server = runTest ./guacamole-server.nix;
   guix = handleTest ./guix { };
   gvisor = runTest ./gvisor.nix;
-  h2o = import ./web-servers/h2o { inherit runTest; };
+  h2o = import ./web-servers/h2o {
+    inherit runTest;
+    inherit (pkgs) lib;
+  };
   hadoop = import ./hadoop {
     inherit handleTestOn;
     package = pkgs.hadoop;

From 754edf0e23035bf5c9fe4f1a5d35fc158fb58463 Mon Sep 17 00:00:00 2001
From: jamie <git@skilet.ro>
Date: Fri, 7 Nov 2025 22:12:27 +0000
Subject: [PATCH 6192/6226] limine: fix typo ('streched' to 'stretched')

---
 nixos/modules/system/boot/loader/limine/limine.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/nixos/modules/system/boot/loader/limine/limine.nix b/nixos/modules/system/boot/loader/limine/limine.nix
index 0c38e92f96a7..35e81d2afcfb 100644
--- a/nixos/modules/system/boot/loader/limine/limine.nix
+++ b/nixos/modules/system/boot/loader/limine/limine.nix
@@ -229,10 +229,10 @@ in
       };
 
       wallpaperStyle = lib.mkOption {
-        default = "streched";
+        default = "stretched";
         type = lib.types.enum [
           "centered"
-          "streched"
+          "stretched"
           "tiled"
         ];
         description = ''
@@ -375,7 +375,7 @@ in
     }
     (lib.mkIf (cfg.style.wallpapers == [ defaultWallpaper ]) {
       boot.loader.limine.style.backdrop = lib.mkDefault "2F302F";
-      boot.loader.limine.style.wallpaperStyle = lib.mkDefault "streched";
+      boot.loader.limine.style.wallpaperStyle = lib.mkDefault "stretched";
     })
     (lib.mkIf cfg.enable {
       assertions = [

From 7802da5812ddb0d606c03f45cd4274c38dffe522 Mon Sep 17 00:00:00 2001
From: aware70 <7832566+aware70@users.noreply.github.com>
Date: Fri, 7 Nov 2025 16:34:58 -0600
Subject: [PATCH 6193/6226] supercell-wx: fix build for Qt 6.10

---
 pkgs/by-name/su/supercell-wx/package.nix            |  3 ++-
 .../su/supercell-wx/patches/fix-qt-6.10.patch       | 13 +++++++++++++
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/by-name/su/supercell-wx/patches/fix-qt-6.10.patch

diff --git a/pkgs/by-name/su/supercell-wx/package.nix b/pkgs/by-name/su/supercell-wx/package.nix
index 8bddcb3a20b1..587444f6e36b 100644
--- a/pkgs/by-name/su/supercell-wx/package.nix
+++ b/pkgs/by-name/su/supercell-wx/package.nix
@@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: {
     maintainers = with lib.maintainers; [ aware70 ];
   };
 
-  env.CXXFLAGS = "-Wno-error=restrict -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=stringop-overflow";
+  env.CXXFLAGS = "-Wno-error=restrict -Wno-error=maybe-uninitialized -Wno-error=deprecated-declarations -Wno-error=stringop-overflow -DQT_NO_USE_NODISCARD_FILE_OPEN";
   env.GTEST_FILTER = "-${lib.concatStringsSep ":" gtestSkip}";
 
   doCheck = true;
@@ -104,6 +104,7 @@ stdenv.mkDerivation (finalAttrs: {
 
     # These may be or already are submitted upstream {{{
     ./patches/explicit-link-aws-crt.patch # fix missing symbols from aws-crt-cpp
+    ./patches/fix-qt-6.10.patch
     # }}}
   ];
 
diff --git a/pkgs/by-name/su/supercell-wx/patches/fix-qt-6.10.patch b/pkgs/by-name/su/supercell-wx/patches/fix-qt-6.10.patch
new file mode 100644
index 000000000000..d58710225f2d
--- /dev/null
+++ b/pkgs/by-name/su/supercell-wx/patches/fix-qt-6.10.patch
@@ -0,0 +1,13 @@
+diff --git a/external/qt6ct.cmake b/external/qt6ct.cmake
+index 665b5368..9e6ed0e9 100644
+--- a/external/qt6ct.cmake
++++ b/external/qt6ct.cmake
+@@ -5,7 +5,7 @@ find_package(QT NAMES Qt6
+              COMPONENTS Gui Widgets
+              REQUIRED)
+ find_package(Qt${QT_VERSION_MAJOR}
+-             COMPONENTS Gui Widgets
++             COMPONENTS Gui Widgets WidgetsPrivate
+              REQUIRED)
+ 
+ #extract version from qt6ct.h

From e0e6c5c67827c5678d51ae190ecb743c19fdf038 Mon Sep 17 00:00:00 2001
From: Sergei Zimmerman <sergei@zimmerman.foo>
Date: Sat, 8 Nov 2025 01:37:32 +0300
Subject: [PATCH 6194/6226] nixVersions.git: 2.32pre20250919_07b96c1d ->
 2.33pre20251107_479b6b73

Git version was lagging behind 2.32 a lot. A lot of commits to catch up on.
There are some notable changes like dropping the aws-sdk-cpp in favor of the much
lighter aws-crt-cpp.

Diff: https://github.com/NixOS/nix/compare/07b96c1d14ab8695e5071fb73e19049fce8f3b6b...479b6b73a9576452c14ca66b7f3cd4873969077e
---
 pkgs/tools/package-management/nix/default.nix             | 6 +++---
 .../package-management/nix/modular/doc/manual/package.nix | 4 ++++
 .../nix/modular/src/libstore/package.nix                  | 8 +++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix
index edcc45090f72..54131e6ecd51 100644
--- a/pkgs/tools/package-management/nix/default.nix
+++ b/pkgs/tools/package-management/nix/default.nix
@@ -194,14 +194,14 @@ lib.makeExtensible (
       nix_2_32 = addTests "nix_2_32" self.nixComponents_2_32.nix-everything;
 
       nixComponents_git = nixDependencies.callPackage ./modular/packages.nix rec {
-        version = "2.32pre20250919_${lib.substring 0 8 src.rev}";
+        version = "2.33pre20251107_${lib.substring 0 8 src.rev}";
         inherit maintainers teams;
         otherSplices = generateSplicesForNixComponents "nixComponents_git";
         src = fetchFromGitHub {
           owner = "NixOS";
           repo = "nix";
-          rev = "07b96c1d14ab8695e5071fb73e19049fce8f3b6b";
-          hash = "sha256-9tR08zFwQ9JNohdfeb40wcLfRnicXpKrHF+FHFva/WA=";
+          rev = "479b6b73a9576452c14ca66b7f3cd4873969077e";
+          hash = "sha256-eBjgsauQXFz2yeiNoPEzgkf7uyV+S8HYCQgZhPVx/9I=";
         };
       };
 
diff --git a/pkgs/tools/package-management/nix/modular/doc/manual/package.nix b/pkgs/tools/package-management/nix/modular/doc/manual/package.nix
index 75ca70ae8fbd..b6f58434bd8b 100644
--- a/pkgs/tools/package-management/nix/modular/doc/manual/package.nix
+++ b/pkgs/tools/package-management/nix/modular/doc/manual/package.nix
@@ -10,6 +10,7 @@
   jq,
   python3,
   rsync,
+  json-schema-for-humans,
   nix-cli,
 
   # Configuration Options
@@ -39,6 +40,9 @@ mkMesonDerivation (finalAttrs: {
     jq
     python3
     rsync
+  ]
+  ++ lib.optional (lib.versionAtLeast (lib.versions.majorMinor version) "2.33") [
+    json-schema-for-humans
   ];
 
   nativeBuildInputs = finalAttrs.passthru.externalNativeBuildInputs ++ [
diff --git a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix
index 988ed8d23370..fc24d6bccf59 100644
--- a/pkgs/tools/package-management/nix/modular/src/libstore/package.nix
+++ b/pkgs/tools/package-management/nix/modular/src/libstore/package.nix
@@ -9,6 +9,7 @@
   boost,
   curl,
   aws-sdk-cpp,
+  aws-crt-cpp,
   libseccomp,
   nlohmann_json,
   sqlite,
@@ -37,9 +38,10 @@ mkMesonLibrary (finalAttrs: {
   ]
   ++ lib.optional stdenv.hostPlatform.isLinux libseccomp
   # There have been issues building these dependencies
-  ++ lib.optional (
-    stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin)
-  ) aws-sdk-cpp;
+  ++
+    lib.optional (stdenv.hostPlatform == stdenv.buildPlatform && (stdenv.isLinux || stdenv.isDarwin))
+      # Nix >=2.33 doesn't depend on aws-sdk-cpp and only requires aws-crt-cpp for authenticated s3:// requests.
+      (if lib.versionAtLeast (lib.versions.majorMinor version) "2.33" then aws-crt-cpp else aws-sdk-cpp);
 
   propagatedBuildInputs = [
     nix-util

From b4741629576af65a1c8ff07169a13caa83030abc Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 7 Nov 2025 15:11:02 -0600
Subject: [PATCH 6195/6226] vimPlugins: update on 2025-11-07

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../editors/vim/plugins/generated.nix         | 960 +++++++++---------
 .../editors/vim/plugins/overrides.nix         |   7 +
 2 files changed, 487 insertions(+), 480 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index e4f4122c2e2c..901c207e894c 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -74,12 +74,12 @@ final: prev: {
 
   CopilotChat-nvim = buildVimPlugin {
     pname = "CopilotChat.nvim";
-    version = "2025-10-24";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "CopilotC-Nvim";
       repo = "CopilotChat.nvim";
-      rev = "a7138a0ee04d8af42c262554eccee168bbf1454f";
-      sha256 = "115hnj4mkpqkyal3d1w3drs1jrxp4lhiz0bfqpak5n58j2ly8678";
+      rev = "db56110b19c702053e86d54b48d8d570c59d0b6b";
+      sha256 = "1k980vbvdyaam9q6bp9wng7v5774rqn2lapns43fnxrmf9whnc0q";
     };
     meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/";
     meta.hydraPlatforms = [ ];
@@ -204,12 +204,12 @@ final: prev: {
 
   LazyVim = buildVimPlugin {
     pname = "LazyVim";
-    version = "2025-10-28";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "LazyVim";
       repo = "LazyVim";
-      rev = "064e61058b6bbaef02a6143662628d105695b8e5";
-      sha256 = "0lh0japff6lywy17kfa20aws9p81ig8g9fpzm6jxh6w0xhnhzzb1";
+      rev = "a507822c0f67df661d1411f9274a65ca9cc832f5";
+      sha256 = "16xzmyz7l64q2hfimvfqi8cwysw6vci919dmn5n7ydws6h5pijag";
     };
     meta.homepage = "https://github.com/LazyVim/LazyVim/";
     meta.hydraPlatforms = [ ];
@@ -217,12 +217,12 @@ final: prev: {
 
   LeaderF = buildVimPlugin {
     pname = "LeaderF";
-    version = "2025-10-23";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "Yggdroot";
       repo = "LeaderF";
-      rev = "37ef81678d288d21272ada4cb85b2c0769bcd50b";
-      sha256 = "1q1p6v9xarr2viyscrmg04j57dd298piraqz4xr75rh1w50lry3x";
+      rev = "682e251efc9c4e0545d1f6bbc8c8639b198ecb1b";
+      sha256 = "1hxy2rcx17kjxpi2yh1p1hy4q9g7yap3kwqsyc4gys0hzmjv3n6a";
     };
     meta.homepage = "https://github.com/Yggdroot/LeaderF/";
     meta.hydraPlatforms = [ ];
@@ -308,12 +308,12 @@ final: prev: {
 
   NrrwRgn = buildVimPlugin {
     pname = "NrrwRgn";
-    version = "2022-02-13";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "chrisbra";
       repo = "NrrwRgn";
-      rev = "e027db9d94f94947153cd7b5ac9abd04371ab2b0";
-      sha256 = "0mcwyqbfc2m865w44s96ra2k0v1mn5kkkxf8i71iqhvc7fvnrfah";
+      rev = "6a3f40bff37fcff7d4245932b47118f071b925f9";
+      sha256 = "1lc5wjwic8xvr3y746yny2a32d4p0lnxqj6ml1vyaszpidsimjih";
     };
     meta.homepage = "https://github.com/chrisbra/NrrwRgn/";
     meta.hydraPlatforms = [ ];
@@ -412,12 +412,12 @@ final: prev: {
 
   SchemaStore-nvim = buildVimPlugin {
     pname = "SchemaStore.nvim";
-    version = "2025-10-29";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "b0o";
       repo = "SchemaStore.nvim";
-      rev = "3b0d7d781589ce98ce577202d25d07741ffcf479";
-      sha256 = "0zswfigqlic5rn9l3762x9383qhhwcx6bvswgs0ak8srlbd5zwng";
+      rev = "976b31e094615b2c27009561b3c67a37c87c93c2";
+      sha256 = "1j51wbimw7fx30sx8rpc78aqx7j582lhywgb4vzd2d0r3irj3v10";
     };
     meta.homepage = "https://github.com/b0o/SchemaStore.nvim/";
     meta.hydraPlatforms = [ ];
@@ -660,12 +660,12 @@ final: prev: {
 
   advanced-git-search-nvim = buildVimPlugin {
     pname = "advanced-git-search.nvim";
-    version = "2025-08-18";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "aaronhallaert";
       repo = "advanced-git-search.nvim";
-      rev = "ec0dabe38857bc7ba2097677e80155a572e0dfbe";
-      sha256 = "04rsv04xndk60sibwq4xx9mzkbv4444nhpk15mxnk15hp2784149";
+      rev = "e6d0fa39c7b058b4f3019912c3e26f854c4e36af";
+      sha256 = "0knc41f4yzahzxqq112lgwism2jlm2sz58pian03lxkjgnvrylwb";
     };
     meta.homepage = "https://github.com/aaronhallaert/advanced-git-search.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1429,12 +1429,12 @@ final: prev: {
 
   base16-nvim = buildVimPlugin {
     pname = "base16-nvim";
-    version = "2025-09-12";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "RRethy";
       repo = "base16-nvim";
-      rev = "a2907cc3cd661e0f89f7db1f4fc304782a676a7d";
-      sha256 = "0acqa0b5n4l01ac9mbbxz2nbg8k8a50s0ajngg72l68q6m5z9mkm";
+      rev = "658bc3da344aa5e37efe10ec3ae4309a8035d102";
+      sha256 = "1gig4zqzm70msvl9achzr1gn90rmb670znc39jp7n66n45ifiq8j";
     };
     meta.homepage = "https://github.com/RRethy/base16-nvim/";
     meta.hydraPlatforms = [ ];
@@ -1455,12 +1455,12 @@ final: prev: {
 
   base46 = buildVimPlugin {
     pname = "base46";
-    version = "2025-09-27";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "base46";
-      rev = "db58475d3fd2a16f9b1467d6895e3c4c195ed7dd";
-      sha256 = "0q8s4215xmchi06lx0kqj1qw2f3svjq3yfdggyi065adm8di3k0r";
+      rev = "45b336ec52615dd1a3aa47848d894616dd6293a5";
+      sha256 = "14661jnzixfm62yf9nim8yh8j3rzqn101h9m5mb03ia37axdw5dy";
     };
     meta.homepage = "https://github.com/nvchad/base46/";
     meta.hydraPlatforms = [ ];
@@ -1572,12 +1572,12 @@ final: prev: {
 
   blink-cmp-conventional-commits = buildVimPlugin {
     pname = "blink-cmp-conventional-commits";
-    version = "2025-02-18";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "disrupted";
       repo = "blink-cmp-conventional-commits";
-      rev = "e7ce3ddcc6d4044067d6d77ab41d480202e814ad";
-      sha256 = "0m72nyg3pm1ig04hvch6lzd4hy77dnmdxxmbq154qwkjhbm0bs6m";
+      rev = "c6eea4ecb755dffb7b57f42a1259447de7984974";
+      sha256 = "1d4mqmk342pq8isaixwvyppbv1g5ddc2a448ifa8yp4vgc7lk95d";
     };
     meta.homepage = "https://github.com/disrupted/blink-cmp-conventional-commits/";
     meta.hydraPlatforms = [ ];
@@ -1728,12 +1728,12 @@ final: prev: {
 
   blink-ripgrep-nvim = buildVimPlugin {
     pname = "blink-ripgrep.nvim";
-    version = "2025-10-29";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "blink-ripgrep.nvim";
-      rev = "e6705fcfccc71636f93f7417296f6831303c30ac";
-      sha256 = "1qgr8ikhmg5x1wwhqianm8ijkk7ip1d16an1f3ljc0q8h2sr9pm6";
+      rev = "b0d25f47c3b50ccb4dbb26945f5e19d535701187";
+      sha256 = "1l96lg8qz6givg9l78bgdlxxnjj7nf9lz7c5s7clrvwcya1hhypq";
     };
     meta.homepage = "https://github.com/mikavilpas/blink-ripgrep.nvim/";
     meta.hydraPlatforms = [ ];
@@ -1949,12 +1949,12 @@ final: prev: {
 
   catppuccin-nvim = buildVimPlugin {
     pname = "catppuccin-nvim";
-    version = "2025-10-25";
+    version = "2025-11-01";
     src = fetchFromGitHub {
       owner = "catppuccin";
       repo = "nvim";
-      rev = "8c4125e3c746976ba025dc5d908fa22c6aa09486";
-      sha256 = "0gfsia8p9si1wh3430rl5pklw48c0h3zmx6q5bkvm1ajidndfgrp";
+      rev = "234fc048de931a0e42ebcad675bf6559d75e23df";
+      sha256 = "0m6lg9fifx6izj6572jp0a5klmdly019hg2parvlqfyxwlksxlsq";
     };
     meta.homepage = "https://github.com/catppuccin/nvim/";
     meta.hydraPlatforms = [ ];
@@ -3028,12 +3028,12 @@ final: prev: {
 
   coc-nvim = buildVimPlugin {
     pname = "coc.nvim";
-    version = "2025-10-27";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "neoclide";
       repo = "coc.nvim";
-      rev = "547b38eb42176194b326fdaa871685ec11d84c1d";
-      sha256 = "01ppa31ksfgwgx68xbm672xrzc7cihhvdjff1f31bb7cwy36q3v3";
+      rev = "2af9b441cb55ec4e2c54dace3f5fa8d581f2c884";
+      sha256 = "0zqx11054x5rrkjdwd5dzg00xjs9xhwbjf2qp7v6zy8nvy9hxscq";
     };
     meta.homepage = "https://github.com/neoclide/coc.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3106,12 +3106,12 @@ final: prev: {
 
   codecompanion-nvim = buildVimPlugin {
     pname = "codecompanion.nvim";
-    version = "2025-10-30";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "olimorris";
       repo = "codecompanion.nvim";
-      rev = "50ea30ec76e1a2695164991a7480f0fa0662e9db";
-      sha256 = "13dsgrwk6m9l35idcd5j6q0si6451yy66psr4wi97dzhw8lvfc41";
+      rev = "3e02000a14847aa49a90c297633d4be2f03702bc";
+      sha256 = "13bi04ryra8inzfaagh1l0vyh2x5zmxwxnww4pmax29z8cw7887j";
     };
     meta.homepage = "https://github.com/olimorris/codecompanion.nvim/";
     meta.hydraPlatforms = [ ];
@@ -3431,12 +3431,12 @@ final: prev: {
 
   conform-nvim = buildVimPlugin {
     pname = "conform.nvim";
-    version = "2025-10-22";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "conform.nvim";
-      rev = "9fd3d5e0b689ec1bf400c53cbbec72c6fdf24081";
-      sha256 = "1igspxqkqqv9f1fqh0sf6dlap1p8an8jl167a93v33c8ig2h6if9";
+      rev = "cde4da5c1083d3527776fee69536107d98dae6c9";
+      sha256 = "0109c6y5kfckys2ikn6lv1m5zkmv7f4jy0l64nw3gr1wja1zr5vl";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/conform.nvim/";
@@ -3445,12 +3445,12 @@ final: prev: {
 
   conjure = buildVimPlugin {
     pname = "conjure";
-    version = "2025-10-24";
+    version = "2025-11-02";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "conjure";
-      rev = "c5da84f291ec7d9f9f6e449c8aeb28b4c2d01562";
-      sha256 = "0cchd39g2hym8kmnrxqka84aj8cvhpv5x5syfysnirrkww8s6d9z";
+      rev = "dab027e0cb710beb070424a117b9065279f6083d";
+      sha256 = "0ra30mszsp4w128066isqxc4glc587gyd5sz76v0p0yh21l1kg9c";
     };
     meta.homepage = "https://github.com/Olical/conjure/";
     meta.hydraPlatforms = [ ];
@@ -3523,12 +3523,12 @@ final: prev: {
 
   copilot-lua = buildVimPlugin {
     pname = "copilot.lua";
-    version = "2025-10-27";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "zbirenbaum";
       repo = "copilot.lua";
-      rev = "93adf9844dcbe09a37e7a72eaa286d33d38bf628";
-      sha256 = "1b741nmj241ixqc3rik0w1d8mdgqy1q73vr8pblqcz5937dr8j1a";
+      rev = "5bde2cfe01f049f522eeb8b52c5c723407db8bdf";
+      sha256 = "09dwpn5siysyi86v49y9rb9sk3ghg9l4ws280wwd8r91j82xmipz";
     };
     meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
     meta.hydraPlatforms = [ ];
@@ -3536,12 +3536,12 @@ final: prev: {
 
   copilot-lualine = buildVimPlugin {
     pname = "copilot-lualine";
-    version = "2025-04-05";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "AndreM222";
       repo = "copilot-lualine";
-      rev = "6bc29ba1fcf8f0f9ba1f0eacec2f178d9be49333";
-      sha256 = "06kshzfzn3av27a1wrgaq93l6vz46a8084dd03addi2zw0rphaqn";
+      rev = "222e90bd8dcdf16ca1efc4e784416afb5f011c31";
+      sha256 = "0ngq7k2l31xinf5pza92ir472qyfja6yia216m9v7dhsvhynm0qx";
     };
     meta.homepage = "https://github.com/AndreM222/copilot-lualine/";
     meta.hydraPlatforms = [ ];
@@ -3627,12 +3627,12 @@ final: prev: {
 
   cornelis = buildVimPlugin {
     pname = "cornelis";
-    version = "2025-10-28";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "agda";
       repo = "cornelis";
-      rev = "d18cb7c13c73f429a80536dc4c4f96eed2ffb51b";
-      sha256 = "1lz3jzdzklhjx50z38vwz8ihhy38vwcxazvm1rx50z3adpwiw5mh";
+      rev = "8f7bdfe1a05dd3a310a9af3325bd4da2c78b567b";
+      sha256 = "1km6vni134pqh9izmqpdjs9wnff5k1fwbhy654ggnhsd7q9yjbqw";
     };
     meta.homepage = "https://github.com/agda/cornelis/";
     meta.hydraPlatforms = [ ];
@@ -3887,12 +3887,12 @@ final: prev: {
 
   dart-nvim = buildVimPlugin {
     pname = "dart.nvim";
-    version = "2025-10-23";
+    version = "2025-11-01";
     src = fetchFromGitHub {
       owner = "iofq";
       repo = "dart.nvim";
-      rev = "71421e7ef5aee8267e24dc562fdd07a83bda192e";
-      sha256 = "1jny6xq5ami3msa8b22hp7yrraljwg7vfkwj7rps8j7whrdxkfjh";
+      rev = "8822aabbfef95eda2b22a8f7ee08912c762ef941";
+      sha256 = "1rmh2ql1xx4s212mcmmgv63abagl2z20k2njin9c7y5kcdppcdh0";
     };
     meta.homepage = "https://github.com/iofq/dart.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4069,12 +4069,12 @@ final: prev: {
 
   debugprint-nvim = buildVimPlugin {
     pname = "debugprint.nvim";
-    version = "2025-10-13";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "andrewferrier";
       repo = "debugprint.nvim";
-      rev = "ece265d9a65b55511cce3aaa5e46f39d58b4340e";
-      sha256 = "19aqfv3hgbkxjv8rcc70bkrdh0pnd8myvsm7dcym1v6dgi4lzbl1";
+      rev = "6b21243add2195e0918e062d6be86ad1d01e6d66";
+      sha256 = "0pvyhgw520843lz5gmi1z1lc7lzs621wpzlxs8mn8qr8nq0djz0w";
     };
     meta.homepage = "https://github.com/andrewferrier/debugprint.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4656,12 +4656,12 @@ final: prev: {
 
   dracula-nvim = buildVimPlugin {
     pname = "dracula.nvim";
-    version = "2025-09-08";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "Mofiqul";
       repo = "dracula.nvim";
-      rev = "041d923368d540a1e438989ce8f915628081a56a";
-      sha256 = "0bl6hggv01pg5970nsi0vaf23mb46xzpjrkasi7134465lh0m1m3";
+      rev = "ae752c13e95fb7c5f58da4b5123cb804ea7568ee";
+      sha256 = "1bq0v2bf0wxz7l59rqr8n3mdg5sr7hh6zlddpm5p457qmrs90ic7";
     };
     meta.homepage = "https://github.com/Mofiqul/dracula.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4721,12 +4721,12 @@ final: prev: {
 
   easy-dotnet-nvim = buildVimPlugin {
     pname = "easy-dotnet.nvim";
-    version = "2025-10-22";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "GustavEikaas";
       repo = "easy-dotnet.nvim";
-      rev = "97cf26a039a10f53bb5474ba7bf32fbc67eac592";
-      sha256 = "1w9c595nhrdk5pxd510r0wrjzvnh68jj3i1r78v362llwm44j37q";
+      rev = "e9cf21828228b30bc3c59957c0a1e7898d473767";
+      sha256 = "1nx1ciz5ig9l8dw3dzgs4awlszlwi31ab91ikywjblm2xh7ymb0m";
     };
     meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/";
     meta.hydraPlatforms = [ ];
@@ -4760,12 +4760,12 @@ final: prev: {
 
   edge = buildVimPlugin {
     pname = "edge";
-    version = "2025-09-22";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "edge";
-      rev = "dfb013e84e8b8302d99ed75e664ccb2a05925ad3";
-      sha256 = "0hvyag79pqi52qiw0zxan9psc26ycmlbnxw6qr2v8mpzi666bgzq";
+      rev = "4145071bb0ea909511fa9a444eec80367b11296f";
+      sha256 = "09d64sbjsbl6lb42glni789scggz6h0smy7jm5rpq1h23k0iarsf";
     };
     meta.homepage = "https://github.com/sainnhe/edge/";
     meta.hydraPlatforms = [ ];
@@ -4812,12 +4812,12 @@ final: prev: {
 
   editorconfig-vim = buildVimPlugin {
     pname = "editorconfig-vim";
-    version = "2025-04-21";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "editorconfig";
       repo = "editorconfig-vim";
-      rev = "6a58b7c11f79c0e1d0f20533b3f42f2a11490cf8";
-      sha256 = "1rsifgfdfjs6pmbvl6631xizsrdm1vv8vx63ak8q4rkdwxrc8vnv";
+      rev = "13b86c5c691785ffbf2d6508c621dabb08e93df0";
+      sha256 = "020i94wrdmjqfzkkrgmcs0626n65jbylg5kyz14llr108v3yxa4j";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/editorconfig/editorconfig-vim/";
@@ -4826,12 +4826,12 @@ final: prev: {
 
   efmls-configs-nvim = buildVimPlugin {
     pname = "efmls-configs-nvim";
-    version = "2025-10-08";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "creativenull";
       repo = "efmls-configs-nvim";
-      rev = "9f82d2fe9919cd0c45c25d20c86c7728d3e162d3";
-      sha256 = "04733hb67kq99nq3xlni2pkdrlijw63fx36v559vs2i8majzxcpk";
+      rev = "11cc7a346f86b587a42a0348b41aa7c143e4ba1b";
+      sha256 = "1a740iqsc7l0cncg923g4h24lcg6rxziznx7yfzbczfgi9cqq9bw";
     };
     meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/";
     meta.hydraPlatforms = [ ];
@@ -4957,12 +4957,12 @@ final: prev: {
 
   everforest = buildVimPlugin {
     pname = "everforest";
-    version = "2025-10-27";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "everforest";
-      rev = "0909c23a2b8cbc337cffe91fda36381747e88506";
-      sha256 = "1m0mhqqmcicpyfmxzp57c7b7pcfm8vxy8iymsfq629xkdf2lqbqj";
+      rev = "17f101d7de851a7d3d705c22bc7c1760bce3cf6e";
+      sha256 = "03qwxhpx895vipqq6j85xp0j1il6xbsl9pvyn96x3yqmpyw1s7dc";
     };
     meta.homepage = "https://github.com/sainnhe/everforest/";
     meta.hydraPlatforms = [ ];
@@ -5648,12 +5648,12 @@ final: prev: {
 
   git-blame-nvim = buildVimPlugin {
     pname = "git-blame.nvim";
-    version = "2025-10-13";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "f-person";
       repo = "git-blame.nvim";
-      rev = "54da04264ec5313d602aebea7c5dc90141696ad7";
-      sha256 = "12b33k9nm5kyy50lwrqm3yfdx5hy89vayi7f303fi0kwasaaxw32";
+      rev = "5c536e2d4134d064aa3f41575280bc8a2a0e03d7";
+      sha256 = "1gd7l3qirq6s4y6bsgmsbbp48rlm1vx9afqj1kjmaa2m9jr5g9hh";
     };
     meta.homepage = "https://github.com/f-person/git-blame.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5817,12 +5817,12 @@ final: prev: {
 
   go-nvim = buildVimPlugin {
     pname = "go.nvim";
-    version = "2025-10-26";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "go.nvim";
-      rev = "eb92453bc049c156290ed402f90f74090aa86363";
-      sha256 = "194xwv39i0ml4400pc7j5wy613vfa33jfgaz6633wqd2xy4jf6ih";
+      rev = "81bb94c1d21648245eb14c69461f5c7f8c705752";
+      sha256 = "04xqsp0xp941yrskbdw3l003b9l81ar1c3vfjp0xbpwp6sgnz7as";
     };
     meta.homepage = "https://github.com/ray-x/go.nvim/";
     meta.hydraPlatforms = [ ];
@@ -5999,12 +5999,12 @@ final: prev: {
 
   gruvbox-material = buildVimPlugin {
     pname = "gruvbox-material";
-    version = "2025-09-22";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "gruvbox-material";
-      rev = "834dbf21836862300ced7444db4262b796330ab7";
-      sha256 = "0vlf94j9ijynvxyp0my2s9zz00c56cq4dp9039bcm6d059dkz3hf";
+      rev = "4bfc6983abc249c5943a60d8eb3980a3c2ababe1";
+      sha256 = "1s9kh1d8hbmdwsclb098lcr0rh5cj24wb5yrv217idn3bxypxf7z";
     };
     meta.homepage = "https://github.com/sainnhe/gruvbox-material/";
     meta.hydraPlatforms = [ ];
@@ -6051,12 +6051,12 @@ final: prev: {
 
   guard-nvim = buildVimPlugin {
     pname = "guard.nvim";
-    version = "2025-10-11";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "nvimdev";
       repo = "guard.nvim";
-      rev = "5fd971c4a4d6112f14dc4024a6abf1db82b63c7b";
-      sha256 = "1g6l0yyhplav607ryyql0760crvdgzg5pzy26dbjijz99c5a8k6x";
+      rev = "8c1f379640628ccb119cf77e0c7950dd222aaf79";
+      sha256 = "196fm6v41mgxasyqkj3q1jrw0iwl30l138cvfzbm5wrd6rignnws";
     };
     meta.homepage = "https://github.com/nvimdev/guard.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6156,12 +6156,12 @@ final: prev: {
 
   harpoon2 = buildVimPlugin {
     pname = "harpoon2";
-    version = "2025-02-10";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "ThePrimeagen";
       repo = "harpoon";
-      rev = "ed1f853847ffd04b2b61c314865665e1dadf22c7";
-      sha256 = "1dcpdlna2lff9dlsh6i4v16qmn5r9279wdvn0ry3xg4abqwnzc9g";
+      rev = "87b1a3506211538f460786c23f98ec63ad9af4e5";
+      sha256 = "1d6fbqs1813nyarw3a4lckw746szw9sbxn9kch6lnxk5qxa8y159";
     };
     meta.homepage = "https://github.com/ThePrimeagen/harpoon/";
     meta.hydraPlatforms = [ ];
@@ -6273,12 +6273,12 @@ final: prev: {
 
   helm-ls-nvim = buildVimPlugin {
     pname = "helm-ls.nvim";
-    version = "2025-10-26";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "qvalentin";
       repo = "helm-ls.nvim";
-      rev = "142777b0ad47f0b007051b187602fad13f00557f";
-      sha256 = "1c8lmq8gqv0zpw8a4bbbb3jpwk481a16hanav4yw88jnlvq3bm14";
+      rev = "d6f3a8d4ad59b4f54cd734267dfb5411679ea608";
+      sha256 = "0hkb7mhm4dvs0x151193hvr69k1czsk7l0zbv0x2pr15rrmm3lsv";
     };
     meta.homepage = "https://github.com/qvalentin/helm-ls.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6638,12 +6638,12 @@ final: prev: {
 
   inc-rename-nvim = buildVimPlugin {
     pname = "inc-rename.nvim";
-    version = "2025-09-28";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "smjonas";
       repo = "inc-rename.nvim";
-      rev = "7c79416330364976955ec8059fe3832b72ee1271";
-      sha256 = "1n64wf9c9bqi5lh76kv9a6ziv5i9p812mj5k8kg73i5c4z68www5";
+      rev = "2597bccb57d1b570fbdbd4adf88b955f7ade715b";
+      sha256 = "014hbrqwjlb5ij4ifgpbj6znp657k81yf7ws11hss5h3rx67m012";
     };
     meta.homepage = "https://github.com/smjonas/inc-rename.nvim/";
     meta.hydraPlatforms = [ ];
@@ -6977,12 +6977,12 @@ final: prev: {
 
   jule-nvim = buildVimPlugin {
     pname = "jule.nvim";
-    version = "2025-10-30";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "julelang";
       repo = "jule.nvim";
-      rev = "6c0b4ffed1c610d76bacaa91fdb09b501df5dada";
-      sha256 = "1p68k55mbps2s3f0k5dbw2a6c0f7jfg57kvx3gzdmp0lc1ph10if";
+      rev = "bf12f77901595b4ceea5de96e1aad6c353057411";
+      sha256 = "1ap5hkbxqiwbdkpcgf9hymgcx0zcy9irz0i4m3lx2827614ab12k";
     };
     meta.homepage = "https://github.com/julelang/jule.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7029,12 +7029,12 @@ final: prev: {
 
   kanagawa-paper-nvim = buildVimPlugin {
     pname = "kanagawa-paper.nvim";
-    version = "2025-10-30";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "thesimonho";
       repo = "kanagawa-paper.nvim";
-      rev = "f8d7de5293b6cb1ee0fb7833d10e277beae4966a";
-      sha256 = "0axbw3ngkdnclj344v0zdrvr8nd08xnwzsqywdpk5pii3khfkscb";
+      rev = "8423e164a0fd2d1117a2e18c229cfd9e0635c82d";
+      sha256 = "1zvg0sfq4prfwnczvizsl00qpipjhwi970q45ry9w3j02blv042i";
     };
     meta.homepage = "https://github.com/thesimonho/kanagawa-paper.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7042,12 +7042,12 @@ final: prev: {
 
   kanso-nvim = buildVimPlugin {
     pname = "kanso.nvim";
-    version = "2025-10-17";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "webhooked";
       repo = "kanso.nvim";
-      rev = "c2525ebafa73c1860301716d9a17e3f07f5038b8";
-      sha256 = "1ymqyvfmv4yicz8kscc7gk0rpw16amy28b6f0j1fi6r6gf0d8rd7";
+      rev = "81041940f469fba3c9eb6efe32eb3174281806df";
+      sha256 = "1vcmglqp5h202g81d83qlmzy6n76ml38qx06y6ifmmkvgq1g6070";
     };
     meta.homepage = "https://github.com/webhooked/kanso.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7159,12 +7159,12 @@ final: prev: {
 
   kulala-nvim = buildVimPlugin {
     pname = "kulala.nvim";
-    version = "2025-10-25";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "mistweaverco";
       repo = "kulala.nvim";
-      rev = "9a9308b664f71159f1c150e8cfb18541b143a9e9";
-      sha256 = "1vjyaav4cv89c5kr35x37fdd0avh2sy3kdvpg7lw226977iy0nvz";
+      rev = "c328aeb219c4b77106917dd2698c90ea9657281b";
+      sha256 = "1hzy2mvvlh5gmya88inymsjxm7n52siaz3cg9jjn130jhr76mmsg";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/mistweaverco/kulala.nvim/";
@@ -7251,12 +7251,12 @@ final: prev: {
 
   lazy-nvim = buildVimPlugin {
     pname = "lazy.nvim";
-    version = "2025-10-28";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "lazy.nvim";
-      rev = "f0f5bbb9e5bfae5e6468f9359ffea3d151418176";
-      sha256 = "08ki2mi4p1wdlkynapx8zrm36m7akvxybxxk7mg69ihdrkcrg6w1";
+      rev = "85c7ff3711b730b4030d03144f6db6375044ae82";
+      sha256 = "0hyh2dwh2ca7nf48cjsyrmbrnr1xyq530dsl4j6gl0fkg3i397l7";
     };
     meta.homepage = "https://github.com/folke/lazy.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7264,12 +7264,12 @@ final: prev: {
 
   lazydev-nvim = buildVimPlugin {
     pname = "lazydev.nvim";
-    version = "2025-10-30";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "lazydev.nvim";
-      rev = "faf46237f0df43a29e12abd143ff1a0bbac27b7e";
-      sha256 = "0xjsxpc4dilprms34yzkh845rd4fnlsirp5434xzi6yjrp1h4lax";
+      rev = "5231c62aa83c2f8dc8e7ba957aa77098cda1257d";
+      sha256 = "1sqy17m8lv4c1slpwyc7hnlp5iiqd0dav6r96szcyvbpahn4y3fn";
     };
     meta.homepage = "https://github.com/folke/lazydev.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7316,12 +7316,12 @@ final: prev: {
 
   lean-nvim = buildVimPlugin {
     pname = "lean.nvim";
-    version = "2025-10-30";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "Julian";
       repo = "lean.nvim";
-      rev = "4f2d243482fbf578db41c16f5c6b2dc34e0d1206";
-      sha256 = "1jfqfsab8rly9rrn1wgg46qpk9m91caxkk0xjvm1hmwmg6qm4lbs";
+      rev = "892a95683a8b037620235d330c6b83b9d617b332";
+      sha256 = "1rql217zwx5x4651ascy3ywkq369km190jrz9ad54vs2vicaqyq0";
     };
     meta.homepage = "https://github.com/Julian/lean.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7355,12 +7355,12 @@ final: prev: {
 
   leap-nvim = buildVimPlugin {
     pname = "leap.nvim";
-    version = "2025-10-24";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "ggandor";
       repo = "leap.nvim";
-      rev = "44e3a60a7a62069e5c9445b7a8104612d4f060cb";
-      sha256 = "0g9r5356p8azann21i2bxx7p6h63k4lnk9vwlip8j9psw9mgmr7s";
+      rev = "673517c316a0808a2f6948ed863e18c6cc03da21";
+      sha256 = "1zsr8c9zkbrb5gikijq0ag0496rpj4win5bdjizm8d73p1hfrrxc";
     };
     meta.homepage = "https://github.com/ggandor/leap.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7888,12 +7888,12 @@ final: prev: {
 
   lsp_signature-nvim = buildVimPlugin {
     pname = "lsp_signature.nvim";
-    version = "2025-07-31";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "ray-x";
       repo = "lsp_signature.nvim";
-      rev = "62cadce83aaceed677ffe7a2d6a57141af7131ea";
-      sha256 = "131l83vfaj5b1yrsscrlbgs7rxl5n77275c1mpfbvafyy59ypg8f";
+      rev = "1e56259e00c70959a1b3fba908b8583722fb96bf";
+      sha256 = "13zaqnjqfiq9vqan3sm8x7nqwr49nwbnxnfdyxy0smaf30cmhf3c";
     };
     meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/";
     meta.hydraPlatforms = [ ];
@@ -7953,12 +7953,12 @@ final: prev: {
 
   ltex_extra-nvim = buildVimPlugin {
     pname = "ltex_extra.nvim";
-    version = "2025-03-04";
+    version = "2025-11-01";
     src = fetchFromGitHub {
       owner = "barreiroleo";
       repo = "ltex_extra.nvim";
-      rev = "67dc3465af8d8caa49a00aaff066289a94eb753e";
-      sha256 = "00l7snw6ji9zx1x99ck4js4n4mfi2spyzssfkwmf56q7w8h2v63b";
+      rev = "49ea83c231139d98b7c9668c99e7b4591421b056";
+      sha256 = "0kk1m74vwsx80vjyndg1c3xliqbdhmphgn87g70mx7yi0xxwncpl";
     };
     meta.homepage = "https://github.com/barreiroleo/ltex_extra.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8070,12 +8070,12 @@ final: prev: {
 
   maple-nvim = buildVimPlugin {
     pname = "maple.nvim";
-    version = "2025-08-02";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "forest-nvim";
       repo = "maple.nvim";
-      rev = "c9525e84852197784de0d0203e73b8cb433297ff";
-      sha256 = "1idid6gv116yd8lrjzkyvhgw4lhd23gpaj326436mqndz7nwbaf9";
+      rev = "6fce52a264005884003567fd75978a4503ba8386";
+      sha256 = "0cpqf7a7cxf1xx62kxip0x7fzmsszzqymwr0087pj7n6ppwzb1f8";
     };
     meta.homepage = "https://github.com/forest-nvim/maple.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8148,12 +8148,12 @@ final: prev: {
 
   markview-nvim = buildVimPlugin {
     pname = "markview.nvim";
-    version = "2025-10-14";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "OXY2DEV";
       repo = "markview.nvim";
-      rev = "c93ea99d96b4bfda5b7c7d0dfca9c26edf6e78f0";
-      sha256 = "1h6yx5w464npnp205xwy73y82492ifqwkhzxhx9rb00qikxxvwqm";
+      rev = "5529dc4af26bbf00bf4ddcac797f8116baf6571e";
+      sha256 = "02rrrn1p71pcabfz4i9q59g295k69gxxm2clga2m4rdv92xjnzr7";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/OXY2DEV/markview.nvim/";
@@ -8162,12 +8162,12 @@ final: prev: {
 
   mason-lspconfig-nvim = buildVimPlugin {
     pname = "mason-lspconfig.nvim";
-    version = "2025-10-29";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "mason-org";
       repo = "mason-lspconfig.nvim";
-      rev = "3590d66effccc7376d8c3dbe45e8291f9fed2843";
-      sha256 = "018hvw7amg33j6iffaj9yw6csscr1cgxg2i7irzwyd8h3gm2s5k8";
+      rev = "d7b5feb6e769e995f7fcf44d92f49f811c51d10c";
+      sha256 = "1249asya0kkrql0hw0zxdw8lkvm997kskwn3mk4vjj9vvsfpp903";
     };
     meta.homepage = "https://github.com/mason-org/mason-lspconfig.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8175,12 +8175,12 @@ final: prev: {
 
   mason-null-ls-nvim = buildVimPlugin {
     pname = "mason-null-ls.nvim";
-    version = "2024-04-09";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "jay-babu";
       repo = "mason-null-ls.nvim";
-      rev = "de19726de7260c68d94691afb057fa73d3cc53e7";
-      sha256 = "1jxslvqp05hzsz3vrspg5yal94314agh15b2p9cimiwj955igbys";
+      rev = "8e7806acaa87fae64f0bfde25bb4b87c18bd19b4";
+      sha256 = "0lsimv7w9317df3idifqkxcg3r3dl30l7d3nlvna17dcpjkc0m1s";
     };
     meta.homepage = "https://github.com/jay-babu/mason-null-ls.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8370,12 +8370,12 @@ final: prev: {
 
   mini-ai = buildVimPlugin {
     pname = "mini.ai";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.ai";
-      rev = "11c57180bc9084089206e211ac7aa598bedc9673";
-      sha256 = "1j5gh95m3i85w5ygzdsswhs8skdbr5qjxl2frwzzi8qmvipiiip1";
+      rev = "0d3c9cf22e37b86b7a0dfbe7ef129ee7a5f4f93c";
+      sha256 = "1sapda1s8ddkx54cd9f4fmyzq3k2p32wql20a8v67mm2gniaxbdg";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.ai/";
     meta.hydraPlatforms = [ ];
@@ -8383,12 +8383,12 @@ final: prev: {
 
   mini-align = buildVimPlugin {
     pname = "mini.align";
-    version = "2025-10-12";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.align";
-      rev = "f42eeb70232fbc4761f2d895a173b117bfd11541";
-      sha256 = "1rqrx4bz4pwq25rz5h46fax0pp0ph31xjqz1ld3ncq4gi4mi6yx5";
+      rev = "60c61c8c63dca41b5ac6bfc36b52df69b1a03e6b";
+      sha256 = "1y8bkfl22h15jms5k4nphlyrpwxy8g61igxl2i2myxghwqag5rgb";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.align/";
     meta.hydraPlatforms = [ ];
@@ -8396,12 +8396,12 @@ final: prev: {
 
   mini-animate = buildVimPlugin {
     pname = "mini.animate";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.animate";
-      rev = "8ce6df739aa9d14c876bace722af28c3d09e9971";
-      sha256 = "1scq1r3v5k6qy2cgb8kzjp7xj86cq6ghji1wy42a6zqx85id4n0z";
+      rev = "0365de8b69331c25d0d0d7573407a7dc7719e578";
+      sha256 = "1c070l4mi8xj2cfx13z1p1qvc7gy0yizqq1yfn23widg8g9p8rzm";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.animate/";
     meta.hydraPlatforms = [ ];
@@ -8409,12 +8409,12 @@ final: prev: {
 
   mini-base16 = buildVimPlugin {
     pname = "mini.base16";
-    version = "2025-10-20";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.base16";
-      rev = "2a462667a9f9b9a04da8a2a35eac7577426b38ee";
-      sha256 = "1123vgb1avkr3fbxviw3c5ai2rgrfi7pzm38kvcj8db5xj0pxa7s";
+      rev = "67638505e36a8ffe335655af2fe104138f60ab3d";
+      sha256 = "0p9qy5f3j2vdnggfhfiz80ivr8bpkglsdip5hsk1q3m33y4x462x";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.base16/";
     meta.hydraPlatforms = [ ];
@@ -8422,12 +8422,12 @@ final: prev: {
 
   mini-basics = buildVimPlugin {
     pname = "mini.basics";
-    version = "2025-10-14";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.basics";
-      rev = "131a4f91387dd490eb9d40b262129ca9fec5ff97";
-      sha256 = "05wnbg8z0a118db1p76pn43z0d3a951vzx5dfk14zs204qcs6rss";
+      rev = "862b940b1ea67993893c6fd39ca1000beed1af46";
+      sha256 = "1ryl7ki67q2fphzrkxl8gpszsg7i8fqfvy6vrj82r2g152f66k8b";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.basics/";
     meta.hydraPlatforms = [ ];
@@ -8435,12 +8435,12 @@ final: prev: {
 
   mini-bracketed = buildVimPlugin {
     pname = "mini.bracketed";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.bracketed";
-      rev = "0ea3cb6478e5fdeca33b53fd08683eb2e622f6ce";
-      sha256 = "0k3gw4w891sck9hghhj8aw4pzv2ip4ch1xnga78ai17b6kj9askl";
+      rev = "e50e3abcf6a3a5d234f58e4a247dfb3035f30a65";
+      sha256 = "0fsjzkf35drizr5am30by3f9021pvcdbz2a5nv9q8i9nn2524fr5";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.bracketed/";
     meta.hydraPlatforms = [ ];
@@ -8448,12 +8448,12 @@ final: prev: {
 
   mini-bufremove = buildVimPlugin {
     pname = "mini.bufremove";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.bufremove";
-      rev = "1b5d7e7bc81cd02476bdd964c3d850c48eb91a07";
-      sha256 = "17g6m9cyfb2fhspyp43scxgp4kc5ylv1pfb23m1qljx25ysd0fp0";
+      rev = "10857aa39160c127694151828914df3131ba83b6";
+      sha256 = "12m9z1pzjgnpqi68rpa57sn95m0yj69mh0iy13w046r0pdcz0505";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.bufremove/";
     meta.hydraPlatforms = [ ];
@@ -8461,12 +8461,12 @@ final: prev: {
 
   mini-clue = buildVimPlugin {
     pname = "mini.clue";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.clue";
-      rev = "6a42206a734befeb697da27afdf05f55ac2303fc";
-      sha256 = "0n8l66nfiq3h61w5faqig5xqk0m48vdc2pg2n9maida8hqyyz0l0";
+      rev = "e806253398f631c0c05a3cfe54fe479477ef9f4d";
+      sha256 = "1hh8mmb3aarn67c409jhv9bfdwqhnmrdgayngwysn5d2px7mqjx1";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.clue/";
     meta.hydraPlatforms = [ ];
@@ -8474,12 +8474,12 @@ final: prev: {
 
   mini-colors = buildVimPlugin {
     pname = "mini.colors";
-    version = "2025-10-20";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.colors";
-      rev = "e0425ab4db1fb9b3059db89ab57e74d8ef0c2e52";
-      sha256 = "1dn4f55vi94g9s2b11mg6in7vz38yq5xhhza6yp6ipms8abxb747";
+      rev = "f43cab15ee0458acb13ac33a478b7e14fd4616eb";
+      sha256 = "13qqkdhhb48agf5nlx6sqx3z7177q3pq9pdj99p89cf1z6kna9is";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.colors/";
     meta.hydraPlatforms = [ ];
@@ -8487,12 +8487,12 @@ final: prev: {
 
   mini-comment = buildVimPlugin {
     pname = "mini.comment";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.comment";
-      rev = "c40bc46e72f41d3db265f6d86deb3dc259c0985d";
-      sha256 = "0hray8c4w0q167yz9j5nnpfh30h2ka1wgb7jwhc8dbnn94fvvbai";
+      rev = "a0c721115faff8d05505c0a12dab410084d9e536";
+      sha256 = "1r5hcq48b6hycmanlkrdv96zkahrwjqjgxgam0a1p8nx75jg9apa";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.comment/";
     meta.hydraPlatforms = [ ];
@@ -8500,12 +8500,12 @@ final: prev: {
 
   mini-completion = buildVimPlugin {
     pname = "mini.completion";
-    version = "2025-10-28";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.completion";
-      rev = "2ab1c8078061a647b0867581a1dcedb046b9ce27";
-      sha256 = "0gf5mfp0rafm534snd5np4zyqa3rk6d6izln3bzn9nqr370ba73d";
+      rev = "581934b58ff25cec7f68a3dfee66c9d1c42faf8e";
+      sha256 = "1spk0143n84l4382xc3ny6nw7qp9b6kdaj52svxzh82av0r030xy";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.completion/";
     meta.hydraPlatforms = [ ];
@@ -8513,12 +8513,12 @@ final: prev: {
 
   mini-cursorword = buildVimPlugin {
     pname = "mini.cursorword";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.cursorword";
-      rev = "d843392f739fcfd85969e2dadeb71c8e0221afb5";
-      sha256 = "1d52mdq1pi841hkln9qiirpkyzp9r3z10ff3ahyicb5mrb7czybp";
+      rev = "dda0f57d55bb1fa19423b7201b2ba892c7d2bb3c";
+      sha256 = "1qaq0xcaz8fc7sv7qdrm55z989jp6w24wbcl7qvc3a1hmgwz88ap";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.cursorword/";
     meta.hydraPlatforms = [ ];
@@ -8526,12 +8526,12 @@ final: prev: {
 
   mini-deps = buildVimPlugin {
     pname = "mini.deps";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.deps";
-      rev = "4c11a93f841e9bfb001321796dae339c8cb57e44";
-      sha256 = "0z2sg6zbvwajap1ww3mm0r6l3wrcs8044dgmngndkn0h6pr8f3w6";
+      rev = "8f6f74a8b68dbad02f1813dff4ddae5afeee92df";
+      sha256 = "0qx879gxyq60wnn9kys7df54rzw0pwfhd2mamk4hswsn613hc65y";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.deps/";
     meta.hydraPlatforms = [ ];
@@ -8539,12 +8539,12 @@ final: prev: {
 
   mini-diff = buildVimPlugin {
     pname = "mini.diff";
-    version = "2025-10-24";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.diff";
-      rev = "98fc732d5835eb7b6539f43534399b07b17f4e28";
-      sha256 = "04xalxirbxwlxay6i4vqvva661lrw0q4lplgxyinn8nmrabfr996";
+      rev = "fbb93ea1728e7c9d0944df8bd022a68402bd2e7e";
+      sha256 = "0jrndrfxasdrq0avgc1cic28646vn68mq4zz1w8kcy8f7jn3bgw4";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.diff/";
     meta.hydraPlatforms = [ ];
@@ -8552,12 +8552,12 @@ final: prev: {
 
   mini-doc = buildVimPlugin {
     pname = "mini.doc";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.doc";
-      rev = "16254b78d6cdb0e7c654b3d07dfed49a52df4ee0";
-      sha256 = "1kafd3zcvqnx25py7k30rpdkwgk0dkxb1kjzf6yhssmszssb94ms";
+      rev = "eb61bebe1d2b96835b1b67bb6e600cfc69ae4ad2";
+      sha256 = "0fcwgyxi3y6j8apcqhbgf8sz983bmriv5vyhwj9ix6qzpridvwj0";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.doc/";
     meta.hydraPlatforms = [ ];
@@ -8565,12 +8565,12 @@ final: prev: {
 
   mini-extra = buildVimPlugin {
     pname = "mini.extra";
-    version = "2025-10-16";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.extra";
-      rev = "188422c54ee770f14a634d9511e71e3b1e3686e2";
-      sha256 = "0pd7vivz4s4l79vsypfgvy383wxj93606rszakh3q2hbpgry0gp0";
+      rev = "7a5231ff48e715daad4fe94448de0639bc227fdb";
+      sha256 = "0h40hawk4lfl9v80hkk458cbjlpjc68li95ikq7pccg0kdylgl2p";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.extra/";
     meta.hydraPlatforms = [ ];
@@ -8578,12 +8578,12 @@ final: prev: {
 
   mini-files = buildVimPlugin {
     pname = "mini.files";
-    version = "2025-10-24";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.files";
-      rev = "d5c1337441aff47768288e8562eb66ae8b5171a9";
-      sha256 = "1fs75zshh1lkynm5wrs6y6g5c5wws8mibz1khvb7hh5v24gap383";
+      rev = "dce9a4e4f14b3bf469e83c78aef393a090f4d057";
+      sha256 = "1rmazylfy7j54ii3b6shrrd4g66r37hr2x0qdn670bhvrm3m6kg4";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.files/";
     meta.hydraPlatforms = [ ];
@@ -8591,12 +8591,12 @@ final: prev: {
 
   mini-fuzzy = buildVimPlugin {
     pname = "mini.fuzzy";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.fuzzy";
-      rev = "b8af7f3633b3039b3f14db246dac2412fd1335f0";
-      sha256 = "14kwh0f7s3b9j3cdcb2655rm9jvaklwrj1m77l2dzhgx3sd5rlla";
+      rev = "18e9cc3d7406f44a145d074ad18b10e472509a18";
+      sha256 = "0b5d80744gcjp6nyzidby569p8s6jy0vkk29lk9msq0flxyb1lgg";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.fuzzy/";
     meta.hydraPlatforms = [ ];
@@ -8604,12 +8604,12 @@ final: prev: {
 
   mini-git = buildVimPlugin {
     pname = "mini-git";
-    version = "2025-10-16";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini-git";
-      rev = "dcb13b6852b93382aa5c42446ab09748778e4a77";
-      sha256 = "07xcrcr2zr73qpvdqcdg9vi8blp00fnc2f1kacyygmhxbbx199hw";
+      rev = "832467238636e3dfa1db76de929996b6668c35ef";
+      sha256 = "1g59hk5y0p1mbmf8n279awiqm16c5bvl17082z71sk1faaq8z83r";
     };
     meta.homepage = "https://github.com/nvim-mini/mini-git/";
     meta.hydraPlatforms = [ ];
@@ -8617,12 +8617,12 @@ final: prev: {
 
   mini-hipatterns = buildVimPlugin {
     pname = "mini.hipatterns";
-    version = "2025-10-03";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.hipatterns";
-      rev = "5629d5fba132b4ab0b3f0039549308421f65ff45";
-      sha256 = "0wyibqfms98i1c02sssz4sva0kk9dlpv06lfpcghjy7jxvnajva6";
+      rev = "add8d8abad602787377ec5d81f6b248605828e0f";
+      sha256 = "0282zk18fnlhdl59d9hll67njpzd54h5cv9vvkgns35kw9h42jhn";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.hipatterns/";
     meta.hydraPlatforms = [ ];
@@ -8630,12 +8630,12 @@ final: prev: {
 
   mini-hues = buildVimPlugin {
     pname = "mini.hues";
-    version = "2025-10-23";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.hues";
-      rev = "902810225edbf68a76dbbdc6a03a54a540af380e";
-      sha256 = "18nciyjx5qlfj7x2q63ynyz8c9b3g9c7i33apgldc13lia1ysgrf";
+      rev = "83ad0612688241c5088fb1738a33a0503586d4be";
+      sha256 = "1dhl6d25ia6mf6lzvq2v74a0lizsxvxic23536cxmb3ygqis150p";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.hues/";
     meta.hydraPlatforms = [ ];
@@ -8643,12 +8643,12 @@ final: prev: {
 
   mini-icons = buildVimPlugin {
     pname = "mini.icons";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.icons";
-      rev = "284798619aed9f4c1ac1b9417b9a5e3b4b85ef3a";
-      sha256 = "0k049j68sdbr41fy50ifyzy25nkb0brhbpwkf2w6iz0z4x4kqd4j";
+      rev = "ff2e4f1d29f659cc2bad0f9256f2f6195c6b2428";
+      sha256 = "0360yf87zq1zlnhhzxnnljh6c2q0s7h8a2c4bqi0k5k4j4fknyya";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.icons/";
     meta.hydraPlatforms = [ ];
@@ -8656,12 +8656,12 @@ final: prev: {
 
   mini-indentscope = buildVimPlugin {
     pname = "mini.indentscope";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.indentscope";
-      rev = "e9fa0714fc753e1e737940577904e553ee340903";
-      sha256 = "0bv1bxqnkfkhwqphqy6mg6lp5038l5p08ljzx2zji2gkdckp5xk8";
+      rev = "0308f949f31769e509696af5d5f91cebb2159c69";
+      sha256 = "0z22icdlxa4d3bnc57inafd49lmpn3g6qj3y5qbcgrr3n2086asa";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.indentscope/";
     meta.hydraPlatforms = [ ];
@@ -8669,12 +8669,12 @@ final: prev: {
 
   mini-jump = buildVimPlugin {
     pname = "mini.jump";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.jump";
-      rev = "7574c48a707aedcf1ad428a9cdefb8fdf871a638";
-      sha256 = "087g65xg1zcbzax9mx1dg4nf7n7gyj0rha1ib4idw1c7960pkmf4";
+      rev = "99799e8ca33fe936b81a70b5ab9a081f8794c8a1";
+      sha256 = "1ig56zibrqplicy2f7b189s1af5sx4pc10922n2j046dr6vdcslx";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.jump/";
     meta.hydraPlatforms = [ ];
@@ -8682,12 +8682,12 @@ final: prev: {
 
   mini-jump2d = buildVimPlugin {
     pname = "mini.jump2d";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.jump2d";
-      rev = "5ff749990336e67195724d1dcddfea4e50057a19";
-      sha256 = "0cqqhm905an8daxw5pfy3jlywaqh71b200sgjd2mrb3rlnpbfg06";
+      rev = "7a089cb719adb7c2faa2a859038d69d58fcbee84";
+      sha256 = "1bslcspciqhdrsfqadij61i00jgaxklbx6q6gsd9i90j2yw9cndd";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.jump2d/";
     meta.hydraPlatforms = [ ];
@@ -8695,12 +8695,12 @@ final: prev: {
 
   mini-keymap = buildVimPlugin {
     pname = "mini.keymap";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.keymap";
-      rev = "8849b592ded4c1ca99fca681be955f532befc05e";
-      sha256 = "1z400g6i71n6bcnza9y8i1fdkp08fk74npbq152ykhv6dd0p4c6i";
+      rev = "9a1ee970f05b113b3ce9ee6f330fe862706b7e49";
+      sha256 = "19b0rzbd7svwss0hwhh4bcqsswngkhp4xp182hw7fcvv3gqvqv1a";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.keymap/";
     meta.hydraPlatforms = [ ];
@@ -8708,12 +8708,12 @@ final: prev: {
 
   mini-map = buildVimPlugin {
     pname = "mini.map";
-    version = "2025-10-10";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.map";
-      rev = "70578281b12e4f4dce535c9b0faa8345a70ff2a9";
-      sha256 = "08dy13nq2vsl9r322g6hlzl5v30qx088biqnhn4kxjwv8agz78c5";
+      rev = "234eaf5cbcaee320d87e96465fbb534aa05b301e";
+      sha256 = "10jhyi9jbw2b1wjxl6ab7xlcn37pkbkccy9pni7xbpxpbgwqjnr5";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.map/";
     meta.hydraPlatforms = [ ];
@@ -8721,12 +8721,12 @@ final: prev: {
 
   mini-misc = buildVimPlugin {
     pname = "mini.misc";
-    version = "2025-10-12";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.misc";
-      rev = "165c34e43de9ae62cf8b72bd33bc90f4edde8e67";
-      sha256 = "04ddxsa12b0r1q12gwpn2mkfbvjac90ny9wb3xsxkxnwqw09jhl4";
+      rev = "61f29f871c34cbc221666384723e4523907323e3";
+      sha256 = "1i12n7n11f0jhbc86scamnvvlgyh7z6cvrrw8ryihqb0rzzsbhr9";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.misc/";
     meta.hydraPlatforms = [ ];
@@ -8734,12 +8734,12 @@ final: prev: {
 
   mini-move = buildVimPlugin {
     pname = "mini.move";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.move";
-      rev = "f33406ae7d95b931c6a0d3ba11e50983fe800afb";
-      sha256 = "1gyqb5mg9xawz5y229psaw128iids33yizjh8wpff6ihnj1ymq18";
+      rev = "4d214202d71e0a4066b6288176bbe88f268f9777";
+      sha256 = "0hm9adfn4p3s4i97vqgpkbki6wz3r0g22l5mjyy0ffz8qdrdjvv5";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.move/";
     meta.hydraPlatforms = [ ];
@@ -8747,12 +8747,12 @@ final: prev: {
 
   mini-notify = buildVimPlugin {
     pname = "mini.notify";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.notify";
-      rev = "7f3c4f05bb647bd2b8cb216c18db1768afe39ee0";
-      sha256 = "0j7gilwgl7dqvq5mm25rz8m9frlnf0g4dmxhhydbaamcc8x54ciw";
+      rev = "895630bc03d461609cbf64329203e7e007bb0db0";
+      sha256 = "1r1395hpxscyhawxm7l1s8w7ijixficlqqicxh2m4xxqc5n09vv2";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.notify/";
     meta.hydraPlatforms = [ ];
@@ -8760,12 +8760,12 @@ final: prev: {
 
   mini-nvim = buildVimPlugin {
     pname = "mini.nvim";
-    version = "2025-10-28";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.nvim";
-      rev = "ee4a4a4abed25e3d108d985b0553c5271f2f71aa";
-      sha256 = "1bg5fkramwrx1d247x827rpigpmf83asqwj7ijffrp80djp15lwk";
+      rev = "42dbeaafb081a569b060b3b11101ca676a8f1193";
+      sha256 = "0yiydhkiwa4iw1w7sxsddc484af30590rmz06kbc0nj8lg679fnb";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.nvim/";
     meta.hydraPlatforms = [ ];
@@ -8773,12 +8773,12 @@ final: prev: {
 
   mini-operators = buildVimPlugin {
     pname = "mini.operators";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.operators";
-      rev = "1d0d1e1570e5bd22e6df3bcb068d0a2ac0d30710";
-      sha256 = "1mcbx1pvf5cqbn6m2nav5qaydx0pjycmh6cwr247ws2rpl4y40a7";
+      rev = "0670bfbfe492f630e37f240dbc31bdc652292e4e";
+      sha256 = "1c5p7hvxbbyqwa5dmg53i3pzni3da1d53x492pk8kv7qzzq4fhm5";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.operators/";
     meta.hydraPlatforms = [ ];
@@ -8786,12 +8786,12 @@ final: prev: {
 
   mini-pairs = buildVimPlugin {
     pname = "mini.pairs";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.pairs";
-      rev = "b9aada8c0e59f2b938e98fbf4eae0799eba96ad9";
-      sha256 = "01z80b55yg8sa1vfga8bq7jdl7glm93jxs8v390cyafshk4ajm98";
+      rev = "b316e68f2d242d5bd010deaab645daa27ed86297";
+      sha256 = "1x1a8z0r083mq529n4ryqa2s0vjzzjhmgl0j9l2ja3j09lwbv429";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.pairs/";
     meta.hydraPlatforms = [ ];
@@ -8799,12 +8799,12 @@ final: prev: {
 
   mini-pick = buildVimPlugin {
     pname = "mini.pick";
-    version = "2025-10-20";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.pick";
-      rev = "bb764a57b349ad3e8d5e7d8855b0c6104e2cc17c";
-      sha256 = "1ar02impd4fc23psyz7aj73kzyxzd4zigw23ndnvg5syxi004awi";
+      rev = "08a72201bd71d2ee2b2572e810cf09f0bc55a3cd";
+      sha256 = "0gkxl63xgv59nr828mk0hzr8mh3dvjwfib7vm96fq8kkrs938i01";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.pick/";
     meta.hydraPlatforms = [ ];
@@ -8812,12 +8812,12 @@ final: prev: {
 
   mini-sessions = buildVimPlugin {
     pname = "mini.sessions";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.sessions";
-      rev = "4ed3a6176e9f66915e4bf1ca66850e8c8073cfc2";
-      sha256 = "0b6q4ggcpmf4bpsadz7272awwp2yw52gh4ldk1paxrhqrgc52sm8";
+      rev = "6b69f4cf206ed8560669446a0310937d88e1c871";
+      sha256 = "0v229a2c2gl3a9gjl0fmb8xl9h52y96rdbvfhjzq4g2i3wplmw5c";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.sessions/";
     meta.hydraPlatforms = [ ];
@@ -8825,12 +8825,12 @@ final: prev: {
 
   mini-snippets = buildVimPlugin {
     pname = "mini.snippets";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.snippets";
-      rev = "7610dc3aaf7fb09b9cc428273a8ba15ef8aef495";
-      sha256 = "1agh9b60l2my96zspzwi3xgssnz4g36w3m6nwbrs9q2q36gmazxz";
+      rev = "66c041fb00ec007b7a7044751c7d3792d0e028a8";
+      sha256 = "01iqls99by2s8nsm1l7hi075m1b5wz22vwl5c48wk6hdavd77acr";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.snippets/";
     meta.hydraPlatforms = [ ];
@@ -8838,12 +8838,12 @@ final: prev: {
 
   mini-splitjoin = buildVimPlugin {
     pname = "mini.splitjoin";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.splitjoin";
-      rev = "b0d57bb5d1ed154e5902ae2745f1a320a7642443";
-      sha256 = "1amhhmm4kh84pl24mvjwybr6vyq5v4pr5kl521rd7ppbz8ikispc";
+      rev = "9fcd8856efb95a505090c3225726466494076127";
+      sha256 = "11jvr6szgj8w86s8nv6ggc75h56va8xcrwxf7lwqm3nyvql3p0q9";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.splitjoin/";
     meta.hydraPlatforms = [ ];
@@ -8851,12 +8851,12 @@ final: prev: {
 
   mini-starter = buildVimPlugin {
     pname = "mini.starter";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.starter";
-      rev = "b43df0b0c66b14802e28d4761ed902704e3796e3";
-      sha256 = "1c6x0nm6q4vx8vkm53gzfr01av0cy722g4zk88ma5rrr10ychzj1";
+      rev = "8ee6ce6a4c9be47682516908557cc062c4d595a2";
+      sha256 = "1nzs8x2v99fdi8mwy52qkzsrx4a562mpzhxmbygayvcsl11fngxd";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.starter/";
     meta.hydraPlatforms = [ ];
@@ -8864,12 +8864,12 @@ final: prev: {
 
   mini-statusline = buildVimPlugin {
     pname = "mini.statusline";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.statusline";
-      rev = "faa39777ca729c6dafe86041207ba8db9321cb29";
-      sha256 = "104wbg5cm4944j9axsq9wjwnhj01p6gd3z46v4hfmd2j672jppd7";
+      rev = "14919901649d20d020e659c63c03baa75cd94f33";
+      sha256 = "1sbh34s35cz7dyphh6ksk7sy8w7v43xrc8mrwjydbc6g805sw3jp";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.statusline/";
     meta.hydraPlatforms = [ ];
@@ -8877,12 +8877,12 @@ final: prev: {
 
   mini-surround = buildVimPlugin {
     pname = "mini.surround";
-    version = "2025-10-28";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.surround";
-      rev = "3c73e2a4d20f46f8bcb610020db2be5fde8319fb";
-      sha256 = "1b5anbvi5v7qpfpxk0rmz29lhxjjf18g5kaiy84gkfamwvd2y747";
+      rev = "88c52297ed3e69ecf9f8652837888ecc727a28ee";
+      sha256 = "0w7f6g2gkb6c36kinml1qqvgrv72yyd1p8qk29zb6dlnahi3cgwq";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.surround/";
     meta.hydraPlatforms = [ ];
@@ -8890,12 +8890,12 @@ final: prev: {
 
   mini-tabline = buildVimPlugin {
     pname = "mini.tabline";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.tabline";
-      rev = "40f0ec8ca166397a4f413d8396c56f5e01cc189c";
-      sha256 = "0yj5fzrs3w2y3k4mdcikl8my37z4lh0qj84i2mnmplylnamch0yv";
+      rev = "caf23615b9b99bacc79ecd60f61c4e6a8ec18c84";
+      sha256 = "09spn1qh91i9mdjpw72rxs8vi02pmr7pl6chz07rvmydf96jsqsa";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.tabline/";
     meta.hydraPlatforms = [ ];
@@ -8903,12 +8903,12 @@ final: prev: {
 
   mini-trailspace = buildVimPlugin {
     pname = "mini.trailspace";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.trailspace";
-      rev = "fab31f4955207cf84e28e7bed5cff35cccaf317f";
-      sha256 = "0gsrsp1jh5zdpw6j773w7hg4qfxfs4vl8r14975cnfczkrgjf2np";
+      rev = "f8083ca969e1b2098480c10f3c3c4d2ce3586680";
+      sha256 = "16n3vxqzg1ywc199xmh4l2x75cyi52xad380picbr5q4l7dda36g";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.trailspace/";
     meta.hydraPlatforms = [ ];
@@ -8916,12 +8916,12 @@ final: prev: {
 
   mini-visits = buildVimPlugin {
     pname = "mini.visits";
-    version = "2025-10-03";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "nvim-mini";
       repo = "mini.visits";
-      rev = "4796c453678ca11f4aab68ab33f4d534a2d84e6d";
-      sha256 = "0x0qrg3py0sj30ys9ffm33zh3f3f5zlckkydg7dhwbdqzcgla48y";
+      rev = "f6b86565acc690aa111627433906be3d38e2ba81";
+      sha256 = "1lnv5p8yd77n9z7ckrh2mgd10fn52y0hv4g9kha5fygpyfy64z19";
     };
     meta.homepage = "https://github.com/nvim-mini/mini.visits/";
     meta.hydraPlatforms = [ ];
@@ -9033,12 +9033,12 @@ final: prev: {
 
   molten-nvim = buildVimPlugin {
     pname = "molten-nvim";
-    version = "2025-09-20";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "benlubas";
       repo = "molten-nvim";
-      rev = "c98f8c6d7a8a801b46e4766e000c574e0402c491";
-      sha256 = "0ldxxmr9kkm7ih6ysgmb5razczf27sz4fjhg0pr5gmigywkf2vk8";
+      rev = "4fd7be6a12b5efda5179db642f13bad60893acca";
+      sha256 = "1x0lihygp6p03zps3mgs7s4jy6dvwjldyg4x2ggvjyrf0sdrgqzg";
     };
     meta.homepage = "https://github.com/benlubas/molten-nvim/";
     meta.hydraPlatforms = [ ];
@@ -9410,12 +9410,12 @@ final: prev: {
 
   neo-tree-nvim = buildVimPlugin {
     pname = "neo-tree.nvim";
-    version = "2025-10-29";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "nvim-neo-tree";
       repo = "neo-tree.nvim";
-      rev = "146408d801da2e9d917ca275f86b788fe612df85";
-      sha256 = "0ggyd84qslf6jpzv952g92jls2k7m1xd1h1p6ijs49ia0qd8gynd";
+      rev = "f3df514fff2bdd4318127c40470984137f87b62e";
+      sha256 = "1yic7slj074qb3mwgv7cra8d70xcdrhizvyd9nszb0q0brg02c79";
     };
     meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9436,12 +9436,12 @@ final: prev: {
 
   neoconf-nvim = buildVimPlugin {
     pname = "neoconf.nvim";
-    version = "2025-10-31";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "neoconf.nvim";
-      rev = "d2400cd4ba2efe9b3dc4e4b2a76f5fd362b7a136";
-      sha256 = "03kp8d4kb61jf6b4x1c6badqiv5qdj3l1i4fw4x5yiy8mr945vih";
+      rev = "d66e4a13013cf68d7a3fdcdcf3d98d69b266e4f7";
+      sha256 = "049garf306h03hy50c58dic51zq7lrzgjsi76rz524mr0pan2gb4";
     };
     meta.homepage = "https://github.com/folke/neoconf.nvim/";
     meta.hydraPlatforms = [ ];
@@ -9514,12 +9514,12 @@ final: prev: {
 
   neogit = buildVimPlugin {
     pname = "neogit";
-    version = "2025-10-23";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "NeogitOrg";
       repo = "neogit";
-      rev = "c6d00913f802acedfb93c01267e89185f25800ca";
-      sha256 = "03f440mc8d5q7clwjzrw8l3d71vsg8v4a47mf5k8kiacj0qbc5v5";
+      rev = "d2a2ae4415872fbddb2441920ab109ee52fd4916";
+      sha256 = "0ha5mz49gw5ck7ddb63raqg8874kavb82846lx66y0sw4y00wbl6";
     };
     meta.homepage = "https://github.com/NeogitOrg/neogit/";
     meta.hydraPlatforms = [ ];
@@ -9776,12 +9776,12 @@ final: prev: {
 
   neotest-go = buildVimPlugin {
     pname = "neotest-go";
-    version = "2024-05-19";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "nvim-neotest";
       repo = "neotest-go";
-      rev = "92950ad7be2ca02a41abca5c6600ff6ffaf5b5d6";
-      sha256 = "0wmxiv06zjjsr2fzp20p8lynn8wxqlx86r6zycan8v6kgs2vljh4";
+      rev = "59b50505053f9c45a9febb79e11a56206c3e3901";
+      sha256 = "0wl3xm7dq5mrin64h33lpq2yx0hiiwwkgxkvs49c1z14sz0c1nvf";
     };
     meta.homepage = "https://github.com/nvim-neotest/neotest-go/";
     meta.hydraPlatforms = [ ];
@@ -9789,12 +9789,12 @@ final: prev: {
 
   neotest-golang = buildVimPlugin {
     pname = "neotest-golang";
-    version = "2025-10-30";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "fredrikaverpil";
       repo = "neotest-golang";
-      rev = "525325d904416eeea1be9140263b0991e7f7ec0c";
-      sha256 = "0incbyxlnlh5msgyvpr0zzq7gcl7qlh6a0nyqj13kx167pmazh1k";
+      rev = "2806bc07066a734d6ed94d45d2d2557a0e2195d8";
+      sha256 = "044q6vpjm9hd6qxh3ynqmbr3vi4lr9crg21v2cby4fgcbyjs2jxd";
     };
     meta.homepage = "https://github.com/fredrikaverpil/neotest-golang/";
     meta.hydraPlatforms = [ ];
@@ -9829,12 +9829,12 @@ final: prev: {
 
   neotest-haskell = buildVimPlugin {
     pname = "neotest-haskell";
-    version = "2025-10-26";
+    version = "2025-11-02";
     src = fetchFromGitHub {
       owner = "MrcJkb";
       repo = "neotest-haskell";
-      rev = "122864eb2ceacf82a6354f3854443f2bcfca54d8";
-      sha256 = "18w8dqsvynjccqbgf7vavhdayyhl5p8w4z8rnn9nz5n1xn88bdjq";
+      rev = "1e93a6f35e6409751acf99c34461c1bd2b8edc57";
+      sha256 = "1cnypjsbg5h66c7nqd7f6c2drkbm7i8hxs3rckhfzka28gmkgdxg";
     };
     meta.homepage = "https://github.com/MrcJkb/neotest-haskell/";
     meta.hydraPlatforms = [ ];
@@ -10193,12 +10193,12 @@ final: prev: {
 
   nfnl = buildVimPlugin {
     pname = "nfnl";
-    version = "2025-10-24";
+    version = "2025-11-02";
     src = fetchFromGitHub {
       owner = "Olical";
       repo = "nfnl";
-      rev = "d439796e6ef940cca8c535559a9d204476e51633";
-      sha256 = "0bgxqla1ircwy95wqvil1h021xwrqym79qx1h3nrn8zxmkdk0jrl";
+      rev = "fecf731e02bc51d88372c4f992fe1ef0c19c02ae";
+      sha256 = "05223ynf2acvwqi6784b3dfvimdg5xxyqq1zd4l788ggafy1zil3";
     };
     meta.homepage = "https://github.com/Olical/nfnl/";
     meta.hydraPlatforms = [ ];
@@ -10310,12 +10310,12 @@ final: prev: {
 
   nlsp-settings-nvim = buildVimPlugin {
     pname = "nlsp-settings.nvim";
-    version = "2025-10-27";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "tamago324";
       repo = "nlsp-settings.nvim";
-      rev = "3e9ea1b897bb4419477bada535a7108bea76cf9c";
-      sha256 = "1phz299jhq63wczr793j8f5jzc1p0ka5g4faxba951fwcks5ivmc";
+      rev = "7d9a0496806cb206249eeb194b842865259d4e2c";
+      sha256 = "0nqw5snbjabh8w4ks8mh1plwd58r943b5kmsylkf9q8jfbx9p6zv";
     };
     meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
     meta.hydraPlatforms = [ ];
@@ -10375,12 +10375,12 @@ final: prev: {
 
   noice-nvim = buildVimPlugin {
     pname = "noice.nvim";
-    version = "2025-10-28";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "noice.nvim";
-      rev = "5099348591f7d3ba9e547b1e631c694c65bbe0b9";
-      sha256 = "12c28is03zyz8ba3qa33mmf9g0r6nb7iavxfqidbd2l0bmyqg79x";
+      rev = "7bfd942445fb63089b59f97ca487d605e715f155";
+      sha256 = "02mc75dqn7h4ylgynpd9vsjx3y51rcys95l9ax1wiilgb4ay3b0l";
     };
     meta.homepage = "https://github.com/folke/noice.nvim/";
     meta.hydraPlatforms = [ ];
@@ -10388,12 +10388,12 @@ final: prev: {
 
   none-ls-nvim = buildVimPlugin {
     pname = "none-ls.nvim";
-    version = "2025-10-14";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "nvimtools";
       repo = "none-ls.nvim";
-      rev = "a96172f673f720cd4f3572e1fcd08400ed3eb25d";
-      sha256 = "1gsd8bdcghzpc0isdp0s1mny695ppp75ylq8v56d4h7my1bpb2d8";
+      rev = "550197530c12b4838d685cf4e0d5eb4cca8d52c7";
+      sha256 = "1cqxacz6mz52qqflzh1p4fw2pm7vgpnw200c3z1xi9ysrr0k2pb9";
     };
     meta.homepage = "https://github.com/nvimtools/none-ls.nvim/";
     meta.hydraPlatforms = [ ];
@@ -10492,12 +10492,12 @@ final: prev: {
 
   nvchad = buildVimPlugin {
     pname = "nvchad";
-    version = "2025-09-20";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "nvchad";
       repo = "nvchad";
-      rev = "f107fabe11ac8013dc3435ecd5382bee872b1584";
-      sha256 = "0yaxwf1p1dkwagcbcag5hyrbam0gzsgla7wmk9w3cb9hy7l7iln2";
+      rev = "eb209a4a82aecabe609d8206b865e00a760fb644";
+      sha256 = "0acqyswcyw2606n4msk5anxqkzggqvsckvbkxdqdx562mqczyysz";
     };
     meta.homepage = "https://github.com/nvchad/nvchad/";
     meta.hydraPlatforms = [ ];
@@ -10661,12 +10661,12 @@ final: prev: {
 
   nvim-colorizer-lua = buildVimPlugin {
     pname = "nvim-colorizer.lua";
-    version = "2025-08-13";
+    version = "2025-11-02";
     src = fetchFromGitHub {
       owner = "catgoose";
       repo = "nvim-colorizer.lua";
-      rev = "51cf7c995ed1eb6642aecf19067ee634fa1b6ba2";
-      sha256 = "1gxjpdm4i4bylx9wlp1ldbs8sskjz79pfysk7avy8zbk7d2mwman";
+      rev = "81e676d3203c9eb6e4c0ccf1eba1679296ef923f";
+      sha256 = "0pm1bmsbcqz4q3238fhggxdlwbaqj4bbsf2pg6r10qpbc6381xnm";
     };
     meta.homepage = "https://github.com/catgoose/nvim-colorizer.lua/";
     meta.hydraPlatforms = [ ];
@@ -10739,12 +10739,12 @@ final: prev: {
 
   nvim-dap = buildVimPlugin {
     pname = "nvim-dap";
-    version = "2025-10-15";
+    version = "2025-10-17";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-dap";
-      rev = "6782b097af2417a4c3e33849b0a26ae2188bd7ea";
-      sha256 = "0wacs8hzwwdapfj9qqvkqm8mrc93gdlbxqsysbkjjf77j51g9snn";
+      rev = "e97dc47e134ffb33da008658fecfae8f8547c528";
+      sha256 = "1prkp8p1kkzgsrs5pwj4xbcdj3ncfhalhp5q332vci4qlk8qyb6a";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-dap/";
     meta.hydraPlatforms = [ ];
@@ -10843,12 +10843,12 @@ final: prev: {
 
   nvim-dap-view = buildVimPlugin {
     pname = "nvim-dap-view";
-    version = "2025-10-31";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "igorlfs";
       repo = "nvim-dap-view";
-      rev = "8f50aca151fb6f539ebc9e0ded9fa05b1f8cb69f";
-      sha256 = "00pamp59csgy8m3amwvydqlkbir5lq7z5cv29c11p2n4z2r6pz56";
+      rev = "170560c18866c0ecd7ba290d9246cae42ddee906";
+      sha256 = "0cmrrdj9hbg97ysfyd6kh8v2cn19vq90rn09m1w7pqfrpal2bk2m";
     };
     meta.homepage = "https://github.com/igorlfs/nvim-dap-view/";
     meta.hydraPlatforms = [ ];
@@ -10947,12 +10947,12 @@ final: prev: {
 
   nvim-gdb = buildVimPlugin {
     pname = "nvim-gdb";
-    version = "2025-01-21";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "sakhnik";
       repo = "nvim-gdb";
-      rev = "cf00140361cabcd4e55a987fd9770a92ee682301";
-      sha256 = "1y4m3m27bkzyjx8g2zd1ampgm84c2f10a7sd4v5qpirf9xiqhhqb";
+      rev = "4170767cbd43e3f4af2a160f2980fff5cd6ee962";
+      sha256 = "0xq5ci8bnr82a51brki1abifjc4ygwpm2mdy29mm7lsdzrjdv7bd";
     };
     meta.homepage = "https://github.com/sakhnik/nvim-gdb/";
     meta.hydraPlatforms = [ ];
@@ -11129,12 +11129,12 @@ final: prev: {
 
   nvim-jdtls = buildVimPlugin {
     pname = "nvim-jdtls";
-    version = "2025-10-08";
+    version = "2025-11-01";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-jdtls";
-      rev = "380ac148f989e1291aac002dc959ecc68c5243d0";
-      sha256 = "0kyrzxgzvf9y8imkrfnvzympfqm04xqsclmkz4adfgb64s5b3m0q";
+      rev = "38d265ee4d45da73a083ca83e41de7d37567be5c";
+      sha256 = "0g7vagxilq1fygrc62zashdkv25aask1akpm2rvmdkga6gpf4dki";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
     meta.hydraPlatforms = [ ];
@@ -11194,12 +11194,12 @@ final: prev: {
 
   nvim-lightline-lsp = buildVimPlugin {
     pname = "nvim-lightline-lsp";
-    version = "2022-05-30";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "josa42";
       repo = "nvim-lightline-lsp";
-      rev = "0fe34eed830b223770111c6333fe48d9fca158d5";
-      sha256 = "08qxyr998d7zwnk0czfq4hif0q801fm2ijpbwql32kd6a62bnhjf";
+      rev = "7fa5e1a89932e3da3ca68a0825e304ba43438ad1";
+      sha256 = "1fvfmhv796ilciwh82k3hwbqvrkld887pdjrz5qhhg416075nl97";
     };
     meta.homepage = "https://github.com/josa42/nvim-lightline-lsp/";
     meta.hydraPlatforms = [ ];
@@ -11220,12 +11220,12 @@ final: prev: {
 
   nvim-lint = buildVimPlugin {
     pname = "nvim-lint";
-    version = "2025-10-07";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "mfussenegger";
       repo = "nvim-lint";
-      rev = "9da1fb942dd0668d5182f9c8dee801b9c190e2bb";
-      sha256 = "0lkfhkld811gqki3bbcl1s1f22a3bdi7gp97q1pjlymia391flf1";
+      rev = "8b349e822a36e9480aed96c6dd2f757f80524a35";
+      sha256 = "0g1g6ry3h2xn5ps5kvjgzar3cipgy4l0yfjcpk85b86f4x69662d";
     };
     meta.homepage = "https://github.com/mfussenegger/nvim-lint/";
     meta.hydraPlatforms = [ ];
@@ -11272,12 +11272,12 @@ final: prev: {
 
   nvim-lspconfig = buildVimPlugin {
     pname = "nvim-lspconfig";
-    version = "2025-10-31";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "neovim";
       repo = "nvim-lspconfig";
-      rev = "e25994a1c2373784364852cd904cb39b6d75f227";
-      sha256 = "18s6ngglynajysmvp0975lnbhavd1dckj87g0hyzbydrj73f401m";
+      rev = "2010fc6ec03e2da552b4886fceb2f7bc0fc2e9c0";
+      sha256 = "1lb85magzq9kghp9xkcxr0lnz975qkfvczk5i4d1q2i7yxzfns9l";
     };
     meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
     meta.hydraPlatforms = [ ];
@@ -11688,12 +11688,12 @@ final: prev: {
 
   nvim-spider = buildVimPlugin {
     pname = "nvim-spider";
-    version = "2025-10-13";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "chrisgrieser";
       repo = "nvim-spider";
-      rev = "a7705d7233ac3c47f7a1e80172bbeaa11f1c722f";
-      sha256 = "1vx53qg4p2cj7hw2yxg60w018m4v7gibgdwhng5dici2nyfy49lj";
+      rev = "80fdcc53e236b23f2c71d628ea5121e6d782f898";
+      sha256 = "0xqlsivw49aki1ymy6jc6yar4kw8rs8wb45p7kmlvs3wn86akjbp";
     };
     meta.homepage = "https://github.com/chrisgrieser/nvim-spider/";
     meta.hydraPlatforms = [ ];
@@ -11961,12 +11961,12 @@ final: prev: {
 
   nvim-unity = buildVimPlugin {
     pname = "nvim-unity";
-    version = "2025-10-29";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "apyra";
       repo = "nvim-unity";
-      rev = "0305a5f21917ddf40d89a9467d8c153cf5cc82fa";
-      sha256 = "13g95p2nqs4wpg3201077rm9bhq1mdg43fx8621qw7svkw9f8gyi";
+      rev = "624b0532bc6971c06eb9ba162c7afef29bb6e87a";
+      sha256 = "1gjmcbn7vk2j4r79mvdqw8c9p8fq86chr8vlf3x0nfjy6cr46wiy";
     };
     meta.homepage = "https://github.com/apyra/nvim-unity/";
     meta.hydraPlatforms = [ ];
@@ -12130,12 +12130,12 @@ final: prev: {
 
   obsidian-nvim = buildVimPlugin {
     pname = "obsidian.nvim";
-    version = "2025-10-24";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "obsidian-nvim";
       repo = "obsidian.nvim";
-      rev = "1a1a475846a4cfa3cfedde1c59141d99b6212951";
-      sha256 = "1ianli3dqpgwiyfhbfxs866bxsqn4m0c09nd4s3048sj6ay6g6pj";
+      rev = "fcb33fb2ffccc8107b3d5ebbf93df4e0824ac8ce";
+      sha256 = "0cf9bibysjz14i990iqkzwb6zzf23z4pi6y37qxqb4xd9mxsa7x7";
     };
     meta.homepage = "https://github.com/obsidian-nvim/obsidian.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12169,12 +12169,12 @@ final: prev: {
 
   octo-nvim = buildVimPlugin {
     pname = "octo.nvim";
-    version = "2025-10-30";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "pwntester";
       repo = "octo.nvim";
-      rev = "4be7903a962875a47422110d0e9ff3e475db1d27";
-      sha256 = "0d4mzs4by6nzd3hr8hw513gpmvs387zzz9vs8amdydf9crplkf9f";
+      rev = "13ba3e8651ee02c52cb3e60ce78aff68acec97ea";
+      sha256 = "1av3z2n1w8p7pwp8c5dmpk02s8bk7l1k9zjbl1ik7s9j6ndpnvv8";
     };
     meta.homepage = "https://github.com/pwntester/octo.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12208,12 +12208,12 @@ final: prev: {
 
   oklch-color-picker-nvim = buildVimPlugin {
     pname = "oklch-color-picker.nvim";
-    version = "2025-10-04";
+    version = "2025-11-01";
     src = fetchFromGitHub {
       owner = "eero-lehtinen";
       repo = "oklch-color-picker.nvim";
-      rev = "da958405624e31336cc76ca0075f4a255e6c448a";
-      sha256 = "1x20bxdqyiygscxkn65vninai6p3pnr7q5cajps070kdjywg4gdn";
+      rev = "5ecc00741f6b7159af2d468c14e87a17715ab4c4";
+      sha256 = "1g4akgw13d17akd9xdmv9908l6j80w5idqd7621adfxmfa2h3cv7";
     };
     meta.homepage = "https://github.com/eero-lehtinen/oklch-color-picker.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12286,12 +12286,12 @@ final: prev: {
 
   onedark-nvim = buildVimPlugin {
     pname = "onedark.nvim";
-    version = "2025-07-30";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "navarasu";
       repo = "onedark.nvim";
-      rev = "de495fabe171d48aed5525f002d14414efcecbb2";
-      sha256 = "1qci3rslcmv79fsfq21vjad6zmk6qp59z1g531w2k85psj6hlz41";
+      rev = "918e89e6993b2901eea47b9f4eb666d53c2542a6";
+      sha256 = "164a8qamldk098x28wq8z87vkg3m6gi8pscvn3ccbyf9b5rplr07";
     };
     meta.homepage = "https://github.com/navarasu/onedark.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12390,12 +12390,12 @@ final: prev: {
 
   opencode-nvim = buildVimPlugin {
     pname = "opencode.nvim";
-    version = "2025-10-29";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "NickvanDyke";
       repo = "opencode.nvim";
-      rev = "c7594f8727541ca5ca3b44aa4796b8ffcb0d1bad";
-      sha256 = "0kc1bc39gp1d70va97270b1dp2brgnxb9j5g8qdan2mr51dhnzxs";
+      rev = "87cda19e743c0475f94bb5970dfe0d2816792c68";
+      sha256 = "03izfimswsdy5g7qlx3s0g25yn3yashnmz73a2miiz0r03645p6f";
     };
     meta.homepage = "https://github.com/NickvanDyke/opencode.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12429,12 +12429,12 @@ final: prev: {
 
   org-roam-nvim = buildVimPlugin {
     pname = "org-roam.nvim";
-    version = "2025-09-19";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "chipsenkbeil";
       repo = "org-roam.nvim";
-      rev = "946c3289d8aa5a84b84458b8c9aa869c2a10f836";
-      sha256 = "0jzlvlbaas4kb1ii0d7yr842awk1sv1i9jy997s2nd26vd9rk61w";
+      rev = "57ebbd05ef143b0ad09e6fae3cd3b8b584b3e5a6";
+      sha256 = "04z86r6v0qg5jj1swrjki6bn8cnd2yfmxfj8b6hzs1xm5hhzjn69";
     };
     meta.homepage = "https://github.com/chipsenkbeil/org-roam.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12612,12 +12612,12 @@ final: prev: {
 
   parrot-nvim = buildVimPlugin {
     pname = "parrot.nvim";
-    version = "2025-10-10";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "frankroeder";
       repo = "parrot.nvim";
-      rev = "e527fe9a89a3e958fbab9eac8ec9d52ca56bafcd";
-      sha256 = "1wl5rvsl7g0y4hy8fk1z1q512f4j5s7bp3x8c1ryw1hdv4276l0f";
+      rev = "ccb35e9fea98c1cc14ef5f8e8d0829bfbd1c103e";
+      sha256 = "0hmhkksmw0n7823r8ammymcqjnxj2cnjjlhjdrsbpxsnaz9mk9ka";
     };
     meta.homepage = "https://github.com/frankroeder/parrot.nvim/";
     meta.hydraPlatforms = [ ];
@@ -12990,12 +12990,12 @@ final: prev: {
 
   project-nvim = buildVimPlugin {
     pname = "project.nvim";
-    version = "2025-10-30";
+    version = "2025-11-01";
     src = fetchFromGitHub {
       owner = "DrKJeff16";
       repo = "project.nvim";
-      rev = "06b363b62587279dad7ab9365bc24f2f4d5b71ac";
-      sha256 = "0hw87j44j3vrx5irb3q3k2008if0ivmzhw0ihnkl8lyplxlan615";
+      rev = "deaec4c3606ade11f6ae89b4e9576065b3140d0e";
+      sha256 = "00iml75wgf05iy9cc8arxcsbbdzq218ryg23xkpf2x7jdc3810sm";
     };
     meta.homepage = "https://github.com/DrKJeff16/project.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13420,12 +13420,12 @@ final: prev: {
 
   render-markdown-nvim = buildVimPlugin {
     pname = "render-markdown.nvim";
-    version = "2025-10-28";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "MeanderingProgrammer";
       repo = "render-markdown.nvim";
-      rev = "10126effbafb74541b69219711dfb2c631e7ebf8";
-      sha256 = "02la4cclxsaz7fqf805v7kz089vrgpc91fzn1sr9j27cgh3jsn4g";
+      rev = "060c911c62f995a9db4467dde6fafd699cf94d55";
+      sha256 = "195gj8saaqb2mw8qnry9cix8wn34bkz8ifvwfa2lzp9f1mzb6ri7";
     };
     meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13459,12 +13459,12 @@ final: prev: {
 
   resession-nvim = buildVimPlugin {
     pname = "resession.nvim";
-    version = "2025-06-01";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "stevearc";
       repo = "resession.nvim";
-      rev = "84c81e5fd8a94dc85a60b97089536174e558e288";
-      sha256 = "1jhv172izp772fn07lf4a80kcd7sj2j5cq763h0xaafb4h03kjax";
+      rev = "05adc14db5c2d0eae064765101dd5e9c594c7851";
+      sha256 = "01r4bjvkl2bsi1rcrnk3y7k57jxy3giq908jja8yf4nn0hzvfrpd";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/stevearc/resession.nvim/";
@@ -13538,12 +13538,12 @@ final: prev: {
 
   rose-pine = buildVimPlugin {
     pname = "rose-pine";
-    version = "2025-08-24";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "rose-pine";
       repo = "neovim";
-      rev = "72a04c4065345b51b56aed4859ea1d884f734097";
-      sha256 = "144jffddwf727w4yqbikv2f46cny8r9z8mpkbc5ngzail5ldj0q8";
+      rev = "eb3ff49a4f2b4e8b06d27de529e44fa52a60ab8a";
+      sha256 = "110q4l61alp7jq8mv0zpcj655f04lkv6753f59rj4qdydrlgwi5z";
     };
     meta.homepage = "https://github.com/rose-pine/neovim/";
     meta.hydraPlatforms = [ ];
@@ -13876,12 +13876,12 @@ final: prev: {
 
   sidekick-nvim = buildVimPlugin {
     pname = "sidekick.nvim";
-    version = "2025-10-30";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "sidekick.nvim";
-      rev = "317ada137f2b34cccc872b68f0a29d987cbce438";
-      sha256 = "0bh948g2ggm6ic9n4b5m939hfxy8qw23i8mxywcricg673nvf7qr";
+      rev = "c2bdf8cfcd87a6be5f8b84322c1b5052e78e302e";
+      sha256 = "00vhdr01v1kak20z8vq4yf70p0w0m4knhiw1cri8az8a4wn8h6q0";
     };
     meta.homepage = "https://github.com/folke/sidekick.nvim/";
     meta.hydraPlatforms = [ ];
@@ -13955,12 +13955,12 @@ final: prev: {
 
   smart-splits-nvim = buildVimPlugin {
     pname = "smart-splits.nvim";
-    version = "2025-10-24";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "mrjones2014";
       repo = "smart-splits.nvim";
-      rev = "6c7c64b6e1be6eb95fd9583c0969e0df625c6cd6";
-      sha256 = "10bphggh0n9x81cc9yi33a2h0bb4vzxjmjkd7aw6l42sfgc1zvvd";
+      rev = "1611946e397a8b42807a9ad527088bf7ebc9ce33";
+      sha256 = "1k5nppad6f3rbl26c4p48zl0xxxryw5ykx44s11b86z9hf478wgg";
     };
     meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14020,12 +14020,12 @@ final: prev: {
 
   snacks-nvim = buildVimPlugin {
     pname = "snacks.nvim";
-    version = "2025-10-30";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "snacks.nvim";
-      rev = "0bc7c2631a3bb35a20e0e5938401765bb9516496";
-      sha256 = "1avi0za8r7bfvadcsx71wsjchbxd8rparhjnk85s4p73wvindwrg";
+      rev = "9a15b317495cda991d3b4990f18aed47a9a9a891";
+      sha256 = "0m2aj9lqz88r93gyn5gchaarpxfkwwnnfbf0x4d79icl9gcv9ivv";
     };
     meta.homepage = "https://github.com/folke/snacks.nvim/";
     meta.hydraPlatforms = [ ];
@@ -14098,12 +14098,12 @@ final: prev: {
 
   sonokai = buildVimPlugin {
     pname = "sonokai";
-    version = "2025-10-19";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "sainnhe";
       repo = "sonokai";
-      rev = "48c809c887ce7b7828f7ea27408fc2ef2179efb5";
-      sha256 = "104x2gl2d57sy91pkmzywpay5b9k9xqcssf04l9jfzsqm4vmmkpa";
+      rev = "ec07018013b4683cf33f80ee4bdf3eca2621da33";
+      sha256 = "13cs2bydz4gwdxpid8ikxijz794n59mvzpmlv6g1zcli7n9h36rl";
     };
     meta.homepage = "https://github.com/sainnhe/sonokai/";
     meta.hydraPlatforms = [ ];
@@ -14241,12 +14241,12 @@ final: prev: {
 
   splitjoin-vim = buildVimPlugin {
     pname = "splitjoin.vim";
-    version = "2025-10-25";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "AndrewRadev";
       repo = "splitjoin.vim";
-      rev = "cace6c962b67312fc1265d55337048e80d64ca90";
-      sha256 = "1p9lxglifb75lz2b0kgvj7ibd7901b8y4410v55mp0m9914armzy";
+      rev = "937f216a565ffd3345760b95bc6a0378234a76d0";
+      sha256 = "019lm4g94q020c7kpi8qacxnpvx0b5cc2a7vqfmvbzyd8ag5ardf";
       fetchSubmodules = true;
     };
     meta.homepage = "https://github.com/AndrewRadev/splitjoin.vim/";
@@ -14934,12 +14934,12 @@ final: prev: {
 
   telescope-fzf-native-nvim = buildVimPlugin {
     pname = "telescope-fzf-native.nvim";
-    version = "2025-03-12";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "nvim-telescope";
       repo = "telescope-fzf-native.nvim";
-      rev = "1f08ed60cafc8f6168b72b80be2b2ea149813e55";
-      sha256 = "137a05qwbpcrcrfj4az7dwx5a43yyfib4crx1hi8bhjx9j5gqav7";
+      rev = "6fea601bd2b694c6f2ae08a6c6fab14930c60e2c";
+      sha256 = "04x1zhfq24qglhfv3rk3s2j6arysxq27czvpm4w037386bi0q48a";
     };
     meta.homepage = "https://github.com/nvim-telescope/telescope-fzf-native.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15456,12 +15456,12 @@ final: prev: {
 
   tinted-nvim = buildVimPlugin {
     pname = "tinted-nvim";
-    version = "2025-09-13";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "tinted-theming";
       repo = "tinted-nvim";
-      rev = "930d1ba963f5224c20dba665fdf81ceded8c2745";
-      sha256 = "18xwbi7c6n890saq825k5lr1m1cjrjilxph7abi7aw0npf7r5whd";
+      rev = "6e4ec620befb7c9dd7ff26b092f33fc560cc1d73";
+      sha256 = "0fvvqb89mlg2k56h92v5igl0ha4j8rh036ib1j6s6ilxilv4z39i";
     };
     meta.homepage = "https://github.com/tinted-theming/tinted-nvim/";
     meta.hydraPlatforms = [ ];
@@ -15469,12 +15469,12 @@ final: prev: {
 
   tinted-vim = buildVimPlugin {
     pname = "tinted-vim";
-    version = "2025-09-13";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "tinted-theming";
       repo = "tinted-vim";
-      rev = "89a72d0451b74e374845f592033a154c4434a06e";
-      sha256 = "0khs36p9c36cqghwh6i0821ik926b6m70jbj7n1plvril9kdqr18";
+      rev = "bb2a3347ae5631db596ae134945032cfcb56268b";
+      sha256 = "1ik70p4ax9yafn30pp8xyqvsfqzlvwhg63q4mip7lf620apg2g9x";
     };
     meta.homepage = "https://github.com/tinted-theming/tinted-vim/";
     meta.hydraPlatforms = [ ];
@@ -15495,12 +15495,12 @@ final: prev: {
 
   tiny-glimmer-nvim = buildVimPlugin {
     pname = "tiny-glimmer.nvim";
-    version = "2025-09-04";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "rachartier";
       repo = "tiny-glimmer.nvim";
-      rev = "84f6b0d8d83b098141e67072ef8f2606820a4454";
-      sha256 = "05911xc3rjxypl1w3j6phj384irs6c4jgbywhq5mf8g0pf1yzxga";
+      rev = "73b17b8a41ac7a61bfdcbe1cd3743c29d28d376e";
+      sha256 = "0yli2ffppi01r85nhm23f8iddqmanipg4xaq555bx46271iy90xx";
     };
     meta.homepage = "https://github.com/rachartier/tiny-glimmer.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15508,12 +15508,12 @@ final: prev: {
 
   tiny-inline-diagnostic-nvim = buildVimPlugin {
     pname = "tiny-inline-diagnostic.nvim";
-    version = "2025-10-28";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "rachartier";
       repo = "tiny-inline-diagnostic.nvim";
-      rev = "994c13daf8e75011af82edf30fb0fd90c019a898";
-      sha256 = "1cz0ggdpahy4rdckdik94dgj4i8zl8dz95y3yvw902qmqw377wwf";
+      rev = "63dd87d195f28e01732e121c5ddfc0a74ccff54a";
+      sha256 = "08fcrccm1afpzbrkwy7q9nrs0l63jq9frprd0mr1d5vkq7ciy875";
     };
     meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15626,12 +15626,12 @@ final: prev: {
 
   tokyonight-nvim = buildVimPlugin {
     pname = "tokyonight.nvim";
-    version = "2025-10-28";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "tokyonight.nvim";
-      rev = "2642dbb83333e0575d1c3436e1d837926871c5fb";
-      sha256 = "0835zvgf1k6xszc4rz5pyb5cz1cyf95vj1q17nx48zz95p4vk0bl";
+      rev = "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd";
+      sha256 = "1s8qh9a8yajlfybcsky6rb31f0ihfhapm51531zn4xd0fyzy8dz3";
     };
     meta.homepage = "https://github.com/folke/tokyonight.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15705,12 +15705,12 @@ final: prev: {
 
   treewalker-nvim = buildVimPlugin {
     pname = "treewalker.nvim";
-    version = "2025-10-31";
+    version = "2025-11-01";
     src = fetchFromGitHub {
       owner = "aaronik";
       repo = "treewalker.nvim";
-      rev = "5895593a4bccadd0a91988cbd3fe0908508e7451";
-      sha256 = "0zwhivajzwf83n76zbpihy69qfpbxqy506m0z6m7cqgxj2yak9l7";
+      rev = "6b436021ccea7c3fde67cb42febfd4335ce3c73c";
+      sha256 = "1411yy2zy6sr39g0gn01sckn48zjwqghwbjvd1bs7ksvj09a5v42";
     };
     meta.homepage = "https://github.com/aaronik/treewalker.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15758,12 +15758,12 @@ final: prev: {
 
   trouble-nvim = buildVimPlugin {
     pname = "trouble.nvim";
-    version = "2025-10-28";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "folke";
       repo = "trouble.nvim";
-      rev = "d7494d8bc563f8ae8b3f35d78c7478cf842b0ab9";
-      sha256 = "1m5gv12dskjcd8y8dlrz3678dp51f0qdkv0yz10wlnryqm8sk8c2";
+      rev = "bd67efe408d4816e25e8491cc5ad4088e708a69a";
+      sha256 = "0cpwraxfvhnw0lvq26w58s15ynzyah9xn26bqn41acyi7ddclkz9";
     };
     meta.homepage = "https://github.com/folke/trouble.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15797,12 +15797,12 @@ final: prev: {
 
   ts-autotag-nvim = buildVimPlugin {
     pname = "ts-autotag.nvim";
-    version = "2025-10-02";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "tronikelis";
       repo = "ts-autotag.nvim";
-      rev = "bfa97e1bdfac00bc2c788edb20400cc51b9bb493";
-      sha256 = "00jaq51hvdqg2a6c755vvigc9r0dkm3wfjicjf8aj7gpsyr6h7fk";
+      rev = "35f79f6253dff5cc43cf943d74c4b2734370a81d";
+      sha256 = "1qk0c4wlgch41nrhq51smvykc1gbhxvm4kmq8r69xxznm31mmzwp";
     };
     meta.homepage = "https://github.com/tronikelis/ts-autotag.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15901,12 +15901,12 @@ final: prev: {
 
   typescript-tools-nvim = buildVimPlugin {
     pname = "typescript-tools.nvim";
-    version = "2025-08-31";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "pmizio";
       repo = "typescript-tools.nvim";
-      rev = "bf11d98ad5736e1cbc1082ca9a03196d45c701f1";
-      sha256 = "0lsiw5rd89gclb84pkzkkn9hf6pdgsjcm9gs3ax45g8szal8z7gg";
+      rev = "db26c05e267239581c89f5c825fdb8c3cf6da0c5";
+      sha256 = "1pacl309w06qr70077c1vg2xgk2jx57f75c0nvw5mr1zvhgh2wca";
     };
     meta.homepage = "https://github.com/pmizio/typescript-tools.nvim/";
     meta.hydraPlatforms = [ ];
@@ -15979,12 +15979,12 @@ final: prev: {
 
   ultimate-autopair-nvim = buildVimPlugin {
     pname = "ultimate-autopair.nvim";
-    version = "2025-10-21";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "altermo";
       repo = "ultimate-autopair.nvim";
-      rev = "6a51446c2c8f09a7c207d2dc2aaa5bbbda36e093";
-      sha256 = "05m9nz0gzk2cwik4ax8bhffgnv8xjvssfi4kimvwc3aghijr5z0h";
+      rev = "72e160cb1ce8c0db2ac4315f77d97420a2f4223d";
+      sha256 = "181x3v2a0ysynyd0gvqh1ddb2c8lk2fl91j1kv1zzhf5vx9g5bc0";
     };
     meta.homepage = "https://github.com/altermo/ultimate-autopair.nvim/";
     meta.hydraPlatforms = [ ];
@@ -16031,12 +16031,12 @@ final: prev: {
 
   unified-nvim = buildVimPlugin {
     pname = "unified.nvim";
-    version = "2025-06-23";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "axkirillov";
       repo = "unified.nvim";
-      rev = "5831251be3a4d552f15a32565fe1a3f07c6a4a94";
-      sha256 = "1jz256licjs3vmzx9bf3ambk23m770qqvz9x07h6z8ixyyw8hky4";
+      rev = "6442680a541cd0fa8290b7b8894a61eeae4b2e26";
+      sha256 = "1x1gmi26qx4nr885hdc9lghfcac6ar1m0q3k9i12rj2rqa0i337r";
     };
     meta.homepage = "https://github.com/axkirillov/unified.nvim/";
     meta.hydraPlatforms = [ ];
@@ -16070,12 +16070,12 @@ final: prev: {
 
   unison = buildVimPlugin {
     pname = "unison";
-    version = "2025-10-31";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "unisonweb";
       repo = "unison";
-      rev = "ba185505e1f7d61961c0c23966f692306f31d460";
-      sha256 = "0b1xlb2b4n24ykx3p6i3x4kw1lzdgg2bb4l283mf4qqc1zyavv9l";
+      rev = "6bb338e7b9a905a5c2750f28a5e46fb08e653d8c";
+      sha256 = "0fwxyn6vy0apy6shai7yrlmlrb38yzpr1ry9ylgmnynhyfzi87kb";
     };
     meta.homepage = "https://github.com/unisonweb/unison/";
     meta.hydraPlatforms = [ ];
@@ -16174,12 +16174,12 @@ final: prev: {
 
   vague-nvim = buildVimPlugin {
     pname = "vague.nvim";
-    version = "2025-10-24";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "vague-theme";
       repo = "vague.nvim";
-      rev = "5689afda42d60c8db12ff93dd6e1322f59e46a93";
-      sha256 = "10qvvsxa5v3g1891wgjg6ga63a4gjis38vga0fd4gv2va6j0wn8i";
+      rev = "dba28050887c2810b5ebf9e0143b4e919bd55757";
+      sha256 = "1zjbwaysdckllknp3xsa2wjyafic6aq0qygf1pf9l5lgp0hm6qqr";
     };
     meta.homepage = "https://github.com/vague-theme/vague.nvim/";
     meta.hydraPlatforms = [ ];
@@ -16200,12 +16200,12 @@ final: prev: {
 
   venv-selector-nvim = buildVimPlugin {
     pname = "venv-selector.nvim";
-    version = "2025-10-27";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "linux-cultist";
       repo = "venv-selector.nvim";
-      rev = "567dcd6cc555caf5163c99ca2ba6a86c661393e5";
-      sha256 = "11xxidmjwbpcq6apwzc7bqxdxyb1d596lfvczzh9j5q1y0jjbpig";
+      rev = "1ef6564d0bd0d9c4194711cfb696357a6119abd7";
+      sha256 = "1v8b9j4ysyiyjv7qy37sja4mmywfzil082llrjkw86lwglrjipja";
     };
     meta.homepage = "https://github.com/linux-cultist/venv-selector.nvim/";
     meta.hydraPlatforms = [ ];
@@ -16629,12 +16629,12 @@ final: prev: {
 
   vim-airline = buildVimPlugin {
     pname = "vim-airline";
-    version = "2025-09-22";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "vim-airline";
       repo = "vim-airline";
-      rev = "159573187e9996d06cf26e49a533f424f4d70b43";
-      sha256 = "051h32i6mxnqjshnplm1n562jpi2z3ym6cf9nk093h28y24p0bw1";
+      rev = "6b51799f26c5fe262ebb04742ce7cdb011082ed7";
+      sha256 = "05cdf3nrphy6mczkvmr62dllb0vn28b68yzi9k4msnw8iw6jyfa3";
     };
     meta.homepage = "https://github.com/vim-airline/vim-airline/";
     meta.hydraPlatforms = [ ];
@@ -16746,12 +16746,12 @@ final: prev: {
 
   vim-argwrap = buildVimPlugin {
     pname = "vim-argwrap";
-    version = "2023-12-26";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "FooSoft";
       repo = "vim-argwrap";
-      rev = "f3e26a5ad249d09467804b92e760d08b1cc457a1";
-      sha256 = "0qd9jzfilqr7kwgh251vcb9f4p55b9d73d90kxsa596b5wy5a494";
+      rev = "03615d1eed248408567bc8fa6a5a8c94ef3cd170";
+      sha256 = "1pydv9kh9l9f3dd9vn5llpx2c1zz8w6lrrcy3h244ixwawf9niy7";
     };
     meta.homepage = "https://github.com/FooSoft/vim-argwrap/";
     meta.hydraPlatforms = [ ];
@@ -17474,12 +17474,12 @@ final: prev: {
 
   vim-dadbod-ui = buildVimPlugin {
     pname = "vim-dadbod-ui";
-    version = "2025-10-15";
+    version = "2025-10-31";
     src = fetchFromGitHub {
       owner = "kristijanhusak";
       repo = "vim-dadbod-ui";
-      rev = "5a83ee1fdafcdedb03222bb46f7cfd70646025ee";
-      sha256 = "1nacskpx9d9p5bxknpf9ka42mfcp3b15rdp6b7wyjv44ndhfvm66";
+      rev = "236179fd6bdc2aabeb1326d428e6b29d41044d8e";
+      sha256 = "1gsg1nmsxzmv0hga68xg9j1v4qsknrgw8hhsp0flr167gmcy15w0";
     };
     meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/";
     meta.hydraPlatforms = [ ];
@@ -17786,12 +17786,12 @@ final: prev: {
 
   vim-endwise = buildVimPlugin {
     pname = "vim-endwise";
-    version = "2025-04-06";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "tpope";
       repo = "vim-endwise";
-      rev = "eab530110d7a0d985902a3964894816b50dbf31a";
-      sha256 = "1lj12b0qim0n1x6aqvz79wl6415x9yi96yx22v3iycn00s6awpmj";
+      rev = "4994afb0cdf956d9a665a14b9c834869e602c396";
+      sha256 = "1x1y99cqzzkf7a76w5ksd9qm96m078wx60lpjv6i2ifcn6m9yz0f";
     };
     meta.homepage = "https://github.com/tpope/vim-endwise/";
     meta.hydraPlatforms = [ ];
@@ -19062,12 +19062,12 @@ final: prev: {
 
   vim-latex-live-preview = buildVimPlugin {
     pname = "vim-latex-live-preview";
-    version = "2023-09-25";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "xuhdev";
       repo = "vim-latex-live-preview";
-      rev = "e1906cd4930a58ebaa5eb446436df23522eafb51";
-      sha256 = "1adfyk96prwbf8dmznnfqvz27jxq0fpjygdhbrcc8b2i93i2dia2";
+      rev = "9973568fc7275f70a4277d474821284128850034";
+      sha256 = "05ni1vc6scakhkaqv4vkxbzdpg2gji90c1qb6virk7jdsd8amqx5";
     };
     meta.homepage = "https://github.com/xuhdev/vim-latex-live-preview/";
     meta.hydraPlatforms = [ ];
@@ -19257,12 +19257,12 @@ final: prev: {
 
   vim-lsp = buildVimPlugin {
     pname = "vim-lsp";
-    version = "2025-10-06";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "prabirshrestha";
       repo = "vim-lsp";
-      rev = "04ef607075184e7b8481245a40a9010368511e98";
-      sha256 = "0pf5smslzs295dryl9zf640g8wsysjpx0dqa3dpijj38visi0i5q";
+      rev = "c0de72708afe7b90f54bd085933bf8b7eb9971a1";
+      sha256 = "1mj1kjfqa1v3rpr21mpvv6png3vk35jbchcyld3amz90l79hwhm9";
     };
     meta.homepage = "https://github.com/prabirshrestha/vim-lsp/";
     meta.hydraPlatforms = [ ];
@@ -19296,12 +19296,12 @@ final: prev: {
 
   vim-lsp-settings = buildVimPlugin {
     pname = "vim-lsp-settings";
-    version = "2025-10-30";
+    version = "2025-11-05";
     src = fetchFromGitHub {
       owner = "mattn";
       repo = "vim-lsp-settings";
-      rev = "fadc9609d2ccbf4ad6c70ab963e64176712d89f1";
-      sha256 = "07hjjbgdvark1v9vmgm7f6lf8d5bd1y02sg4djpgsvz9bpzga9nn";
+      rev = "19aef037e198fa5694b98a052f23e285bf113550";
+      sha256 = "0qbaspslipdkb7vflwd9qc50jl4qvsg4d8zjnkhm173dgq63czxc";
     };
     meta.homepage = "https://github.com/mattn/vim-lsp-settings/";
     meta.hydraPlatforms = [ ];
@@ -19426,12 +19426,12 @@ final: prev: {
 
   vim-matchup = buildVimPlugin {
     pname = "vim-matchup";
-    version = "2025-10-03";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "andymass";
       repo = "vim-matchup";
-      rev = "ca538c3bb02836510526ff7d07cf7e4c8e9a3b90";
-      sha256 = "0901b4pqnx3xwxm99ihy4yhp8dhfbb18ghj3d41whvbddc171zih";
+      rev = "1c276e12b49a83c1bdca74351187b8adea5da4b9";
+      sha256 = "1cb3y7kxa13nbzbsch8qz0qzdbhd46di2ds3yhx1hv5bcg500q5c";
     };
     meta.homepage = "https://github.com/andymass/vim-matchup/";
     meta.hydraPlatforms = [ ];
@@ -19972,12 +19972,12 @@ final: prev: {
 
   vim-pandoc = buildVimPlugin {
     pname = "vim-pandoc";
-    version = "2025-04-30";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "vim-pandoc";
       repo = "vim-pandoc";
-      rev = "a9896b7f7c09b7804dd9e200e7b96c18ecb5fa0b";
-      sha256 = "01282v4pfjzabixrnwlfrfy84d4xxczzgc38zgk4rz831ani3681";
+      rev = "c31d5c10b29c99cf1a344ae30e2ffa32cf2df743";
+      sha256 = "1xf4694592w8vhwybkag9bqvrd53wg8xcdmdafg1qsk9bbhq89gz";
     };
     meta.homepage = "https://github.com/vim-pandoc/vim-pandoc/";
     meta.hydraPlatforms = [ ];
@@ -20128,12 +20128,12 @@ final: prev: {
 
   vim-plug = buildVimPlugin {
     pname = "vim-plug";
-    version = "2025-09-03";
+    version = "2025-11-06";
     src = fetchFromGitHub {
       owner = "junegunn";
       repo = "vim-plug";
-      rev = "904dac1530cfec0880cd44e4f7f206eb2e9e3247";
-      sha256 = "0m6xgah7bsyppsm0g3zk3drapfymzlkbzkpl278byvnz3zqj6sy5";
+      rev = "3f17a5cc3d7b0b7699bb5963fef9435a839dada0";
+      sha256 = "1jh5iqq3qxsfqf1p2fr6gjjc3ri272b0qaf5i26ix5dvcl4jd55i";
     };
     meta.homepage = "https://github.com/junegunn/vim-plug/";
     meta.hydraPlatforms = [ ];
@@ -20648,12 +20648,12 @@ final: prev: {
 
   vim-sentence-chopper = buildVimPlugin {
     pname = "vim-sentence-chopper";
-    version = "2025-09-16";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "Konfekt";
       repo = "vim-sentence-chopper";
-      rev = "c855a92c12b6cb3accdb9535658720a6939d82ea";
-      sha256 = "0pbbg2k0xyyn890afsbvkwc3w1d3h4a3n452phj6hhg4z01kw6a8";
+      rev = "d2cd11c3ee08b8ab303b374af38a5671ec5007a0";
+      sha256 = "0yr6kb2znf72yh1kqk09r4hg4zjijy1g3g36jd0mbrbr1qqp6mbz";
     };
     meta.homepage = "https://github.com/Konfekt/vim-sentence-chopper/";
     meta.hydraPlatforms = [ ];
@@ -21728,12 +21728,12 @@ final: prev: {
 
   vim-wayland-clipboard = buildVimPlugin {
     pname = "vim-wayland-clipboard";
-    version = "2025-08-21";
+    version = "2025-11-02";
     src = fetchFromGitHub {
       owner = "jasonccox";
       repo = "vim-wayland-clipboard";
-      rev = "7e9fb4e66d345e9898045b52df544c9e553ef5e4";
-      sha256 = "1bb2yaq13l65p8k77a2bml0lvazhzjan4k7f4n43szkby1dvhdll";
+      rev = "dc37e83e7484fa2085cdaf37f84408e12006165a";
+      sha256 = "1gkhlb93w68cgrwydb5wby1zzczapzqidapk8q842bxadaypkdll";
     };
     meta.homepage = "https://github.com/jasonccox/vim-wayland-clipboard/";
     meta.hydraPlatforms = [ ];
@@ -21936,12 +21936,12 @@ final: prev: {
 
   vimade = buildVimPlugin {
     pname = "vimade";
-    version = "2025-10-30";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "TaDaa";
       repo = "vimade";
-      rev = "27279c2fccc3c490cc6ca31c28bb0f6d84089eb4";
-      sha256 = "0dplck7xfaxxgfphk1w9xfys04bsfijpbwxwm2cdkb48ihiva3g1";
+      rev = "bf0a44e2f1e985a1c3e70043891377d46125a8ab";
+      sha256 = "0b063sw12vv011l5021dc9fpfay8y1cc61lmxd4ig11lv6lcds5p";
     };
     meta.homepage = "https://github.com/TaDaa/vimade/";
     meta.hydraPlatforms = [ ];
@@ -22080,12 +22080,12 @@ final: prev: {
 
   vimux = buildVimPlugin {
     pname = "vimux";
-    version = "2025-10-26";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "preservim";
       repo = "vimux";
-      rev = "66d53eab51aa7d2c0f55f3ee2e381b923e705e37";
-      sha256 = "0kjr181j55f5wy468w6h2nyvvpq13aqf06vm2vsfvnwwzycgmsfq";
+      rev = "614f0bb1fb598f97accdcea71d5f7b18d7d62436";
+      sha256 = "17hbhqxcd31w5sd98cia88rsnrnsychdhbvpqjscr4k8mr2awhch";
     };
     meta.homepage = "https://github.com/preservim/vimux/";
     meta.hydraPlatforms = [ ];
@@ -22496,12 +22496,12 @@ final: prev: {
 
   wtf-nvim = buildVimPlugin {
     pname = "wtf.nvim";
-    version = "2025-10-24";
+    version = "2025-11-03";
     src = fetchFromGitHub {
       owner = "piersolenski";
       repo = "wtf.nvim";
-      rev = "0c53ebe0d8b74dc6c70632b3703eada3b74708ab";
-      sha256 = "18bigy34qijb4q44lw0wq81p3k9ac5w29sm2f8686pdzsblh1q7j";
+      rev = "0b46f96e07d1eaf9b495027be4caa1fab2ffe295";
+      sha256 = "0jz309cxyqv1i2pq123h18pnid14yxlrjqdvhyzwfhafjh8pzjs9";
     };
     meta.homepage = "https://github.com/piersolenski/wtf.nvim/";
     meta.hydraPlatforms = [ ];
@@ -22614,12 +22614,12 @@ final: prev: {
 
   yazi-nvim = buildVimPlugin {
     pname = "yazi.nvim";
-    version = "2025-10-30";
+    version = "2025-11-07";
     src = fetchFromGitHub {
       owner = "mikavilpas";
       repo = "yazi.nvim";
-      rev = "f710a9ebfa9aa6fdac9ee1bc636f8f92030c745c";
-      sha256 = "0nrj069f2sqkfdh02b0r2hwady6xnz9x064h8mci2mb0008mqkv4";
+      rev = "667028e28f03286aaf6aaca3d63653ff731a3381";
+      sha256 = "0jpdhbqqh79csa00bhw1532qlck5xnij8n2z724z5d2k5ng9fqa7";
     };
     meta.homepage = "https://github.com/mikavilpas/yazi.nvim/";
     meta.hydraPlatforms = [ ];
@@ -22796,12 +22796,12 @@ final: prev: {
 
   zotcite = buildVimPlugin {
     pname = "zotcite";
-    version = "2025-10-23";
+    version = "2025-11-04";
     src = fetchFromGitHub {
       owner = "jalvesaq";
       repo = "zotcite";
-      rev = "b4f5b0832311aa3b6ba624275d389ce8070f7aa6";
-      sha256 = "05qyjmyvgqnr3qm5il4h85xapaf7ya8739sxbrgyx00gzjkrxzcx";
+      rev = "11b0678865c2c0c6c0bc4054996b565c2cda4f75";
+      sha256 = "0ilf4n2wnja6li72ph2rs90w8hs54vys4kcicfh3cqx2038xp1c1";
     };
     meta.homepage = "https://github.com/jalvesaq/zotcite/";
     meta.hydraPlatforms = [ ];
diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix
index 73730fba3c33..2f9a1713aa2a 100644
--- a/pkgs/applications/editors/vim/plugins/overrides.nix
+++ b/pkgs/applications/editors/vim/plugins/overrides.nix
@@ -3195,6 +3195,11 @@ assertNoAdditions {
       "snacks.debug"
       "snacks.dim"
       "snacks.explorer.init"
+      "snacks.gh.actions"
+      "snacks.gh.buf"
+      "snacks.gh.init"
+      "snacks.gh.render"
+      "snacks.gh.render.init"
       "snacks.git"
       "snacks.image.convert"
       "snacks.image.image"
@@ -3207,6 +3212,8 @@ assertNoAdditions {
       "snacks.picker.actions"
       "snacks.picker.config.highlights"
       "snacks.picker.core.list"
+      "snacks.picker.source.gh"
+      "snacks.picker.util.diff"
       "snacks.scratch"
       "snacks.scroll"
       "snacks.terminal"

From e4bf01c92234fb9f43ed8d575f2279043cfa1d85 Mon Sep 17 00:00:00 2001
From: Austin Horstman <khaneliman12@gmail.com>
Date: Fri, 7 Nov 2025 16:41:20 -0600
Subject: [PATCH 6196/6226] vimPlugins.nvim-treesitter: update grammars

Signed-off-by: Austin Horstman <khaneliman12@gmail.com>
---
 .../vim/plugins/nvim-treesitter/generated.nix | 47 ++++++++++++-------
 1 file changed, 29 insertions(+), 18 deletions(-)

diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
index c2dd5c50f55f..5bae846989cb 100644
--- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
@@ -596,12 +596,12 @@
   };
   earthfile = buildGrammar {
     language = "earthfile";
-    version = "0.0.0+rev=a37c5ee";
+    version = "0.0.0+rev=5baef88";
     src = fetchFromGitHub {
       owner = "glehmann";
       repo = "tree-sitter-earthfile";
-      rev = "a37c5ee95ce401ca311c0ae1369d9cfb953e151d";
-      hash = "sha256-lYoS3RtHPYRrkfgo/qqAnT918FXeXnDUhG4l1TMXjb4=";
+      rev = "5baef88717ad0156fd29a8b12d0d8245bb1096a8";
+      hash = "sha256-eeXzc+thSPey7r59QkJd5jgchZRhSwT5isSljYLBQ8k=";
     };
     meta.homepage = "https://github.com/glehmann/tree-sitter-earthfile";
   };
@@ -619,12 +619,12 @@
   };
   editorconfig = buildGrammar {
     language = "editorconfig";
-    version = "0.0.0+rev=911d701";
+    version = "0.0.0+rev=439a3fc";
     src = fetchFromGitHub {
       owner = "ValdezFOmar";
       repo = "tree-sitter-editorconfig";
-      rev = "911d7017566116b15c4b2c339e1dbe11fcf03f63";
-      hash = "sha256-c/rg3qgUO7RfmFhFSIPyl6npNieztaVv58u10p9JH3o=";
+      rev = "439a3fcdbf239db35f587936a36f48b704ba8357";
+      hash = "sha256-GJv+JYpcsBmNEQoTViXS5Xu4jEYTBKFod14COoeCe9g=";
     };
     meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-editorconfig";
   };
@@ -1457,12 +1457,12 @@
   };
   javadoc = buildGrammar {
     language = "javadoc";
-    version = "0.0.0+rev=92f9d71";
+    version = "0.0.0+rev=3e9a823";
     src = fetchFromGitHub {
       owner = "rmuir";
       repo = "tree-sitter-javadoc";
-      rev = "92f9d7115598c1b012f5931a84ee5d50d46c0eb7";
-      hash = "sha256-A8aMgDKAPZ18qy7GMihBpNrmL52Zf/wAjsPQoMCL3oE=";
+      rev = "3e9a823a02d3115d74294f04c39bd2c958ec3da6";
+      hash = "sha256-qqkEGJn9ocHdr8SSeYcJ5kAZr11Ot7rvH1QVYYre8/Q=";
     };
     meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc";
   };
@@ -1891,12 +1891,12 @@
   };
   mlir = buildGrammar {
     language = "mlir";
-    version = "0.0.0+rev=6543579";
+    version = "0.0.0+rev=f1c4a94";
     src = fetchFromGitHub {
       owner = "artagnon";
       repo = "tree-sitter-mlir";
-      rev = "65435795eb4132d5eff66d62347050e863e5ebe5";
-      hash = "sha256-s7oNzU7rTjejwgW9F28GayuxEe/Gn51+yQi7iPqgFfw=";
+      rev = "f1c4a9445c65fb4668a87bfb344d762d0356781d";
+      hash = "sha256-YX5DaGtuXBcLbSP0L1C52fPW4oDqeMGqewU48bfFmuQ=";
     };
     generate = true;
     meta.homepage = "https://github.com/artagnon/tree-sitter-mlir";
@@ -2172,12 +2172,12 @@
   };
   pkl = buildGrammar {
     language = "pkl";
-    version = "0.0.0+rev=d62e832";
+    version = "0.0.0+rev=798222b";
     src = fetchFromGitHub {
       owner = "apple";
       repo = "tree-sitter-pkl";
-      rev = "d62e832b69a0aa3d4f87fc34ba62d931d6c23f55";
-      hash = "sha256-6sVPCbs3rLlEhK9Fj2sJGjNBmvaGrajSOoGo6G78buo=";
+      rev = "798222b4a29ba9a9715583e22242ab0f2ac6abc0";
+      hash = "sha256-BLm8KvzBZt6+ZvZ6umrdgs5E8D3rPTZNCx611s6h+kA=";
     };
     meta.homepage = "https://github.com/apple/tree-sitter-pkl";
   };
@@ -3541,12 +3541,12 @@
   };
   xresources = buildGrammar {
     language = "xresources";
-    version = "0.0.0+rev=321231f";
+    version = "0.0.0+rev=d1c0a65";
     src = fetchFromGitHub {
       owner = "ValdezFOmar";
       repo = "tree-sitter-xresources";
-      rev = "321231f99e3704f1555de14cda5dca93ee14a95b";
-      hash = "sha256-W7/eYAGC+usKoUdT4JgP+0d3/FykrK/lkBSvhy38qQE=";
+      rev = "d1c0a65348272ff235e5553fcd9171b151d251b4";
+      hash = "sha256-hu2lfluEA9r6LiC1NvvqaWVOinKK0QylbxI3rYz5DO8=";
     };
     meta.homepage = "https://github.com/ValdezFOmar/tree-sitter-xresources";
   };
@@ -3629,4 +3629,15 @@
     location = "tree-sitter-ziggy-schema";
     meta.homepage = "https://github.com/kristoff-it/ziggy";
   };
+  zsh = buildGrammar {
+    language = "zsh";
+    version = "0.0.0+rev=v0.34.0";
+    src = fetchFromGitHub {
+      owner = "georgeharker";
+      repo = "tree-sitter-zsh";
+      rev = "v0.34.0";
+      hash = "sha256-rMOLASmlXaCxEI7ZLXbBU0BMLZle++U0HzEqdVF5qyg=";
+    };
+    meta.homepage = "https://github.com/georgeharker/tree-sitter-zsh";
+  };
 }

From 73dec402d589bea6098798ef9b80531f83dba5da Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Fri, 7 Nov 2025 19:47:38 -0300
Subject: [PATCH 6197/6226] _1password-gui-beta: 8.11.18-30.BETA ->
 8.11.18-34.BETA

---
 pkgs/by-name/_1/_1password-gui/sources.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json
index c9dab6f3bf8a..dff1ac361bb6 100644
--- a/pkgs/by-name/_1/_1password-gui/sources.json
+++ b/pkgs/by-name/_1/_1password-gui/sources.json
@@ -29,28 +29,28 @@
   },
   "beta": {
     "linux": {
-      "version": "8.11.18-30.BETA",
+      "version": "8.11.18-34.BETA",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.18-30.BETA.x64.tar.gz",
-          "hash": "sha256-rCb54NhczM5Us6DRd1DgA7xGem4Ri4GIcJ0FFCiNAvo="
+          "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.11.18-34.BETA.x64.tar.gz",
+          "hash": "sha256-1x0FwxQ6oWGdcJ7Up9S+f423IpFAMEJ08WQnbgaesVU="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.18-30.BETA.arm64.tar.gz",
-          "hash": "sha256-qL6Xa8g2qgyl+UfDThH18rbaXxkt+bN0y2TcQ8C214Y="
+          "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.11.18-34.BETA.arm64.tar.gz",
+          "hash": "sha256-ita34logGU5zd6USi4XgOQosWooebHssyIobPZ8wlVg="
         }
       }
     },
     "darwin": {
-      "version": "8.11.18-30.BETA",
+      "version": "8.11.18-34.BETA",
       "sources": {
         "x86_64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.18-30.BETA-x86_64.zip",
-          "hash": "sha256-xkCTyFxZhCKsCTTyWz3SPA9XKhR5p7GT3hwBwXQVb40="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.18-34.BETA-x86_64.zip",
+          "hash": "sha256-NONcgqasLQd9nQnEQfibcYLPagvt2VuIFUxgkTMVRxE="
         },
         "aarch64": {
-          "url": "https://downloads.1password.com/mac/1Password-8.11.18-30.BETA-aarch64.zip",
-          "hash": "sha256-Ou3GSMTNmaz+sbYCYqmxH9qrQMDmUBfTUPVcvdNDt6k="
+          "url": "https://downloads.1password.com/mac/1Password-8.11.18-34.BETA-aarch64.zip",
+          "hash": "sha256-SVPXpEFBI0mutj/J5vvb2o20za+5d/zzB7altIHADYw="
         }
       }
     }

From 3a4f9aa50d3ef91b781a560d54ab9dbf1f30a5ed Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 7 Nov 2025 22:54:31 +0000
Subject: [PATCH 6198/6226] bottles-unwrapped: 51.25 -> 52.0

---
 pkgs/by-name/bo/bottles-unwrapped/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bo/bottles-unwrapped/package.nix b/pkgs/by-name/bo/bottles-unwrapped/package.nix
index 49c8d15fcf77..5aec3d925137 100644
--- a/pkgs/by-name/bo/bottles-unwrapped/package.nix
+++ b/pkgs/by-name/bo/bottles-unwrapped/package.nix
@@ -32,13 +32,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "bottles-unwrapped";
-  version = "51.25";
+  version = "52.0";
 
   src = fetchFromGitHub {
     owner = "bottlesdevs";
     repo = "bottles";
     tag = version;
-    hash = "sha256-W25MpdXLO+vcMvvCJmA87lB9WiBOJHsWp8D/LU0xjAY=";
+    hash = "sha256-nly5DldxJtgBLpXdVpfQwu3qTQm9E0MmC3i4QGYbOEw=";
   };
 
   patches = [

From 211b24db2fb08692f719ae42bc583d30171b17a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 00:08:14 +0000
Subject: [PATCH 6199/6226] nakama: 3.33.0 -> 3.33.1

---
 pkgs/by-name/na/nakama/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/na/nakama/package.nix b/pkgs/by-name/na/nakama/package.nix
index 7790fe196058..684d11a43604 100644
--- a/pkgs/by-name/na/nakama/package.nix
+++ b/pkgs/by-name/na/nakama/package.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "nakama";
-  version = "3.33.0";
+  version = "3.33.1";
 
   src = fetchFromGitHub {
     owner = "heroiclabs";
     repo = "nakama";
     tag = "v${version}";
-    hash = "sha256-GiUufoWLwWBuZxId+vMkJPaJIb/FWLJAJLb7WKoyn5M=";
+    hash = "sha256-e+Z8BmEbBJazSorIYuVIbrwKHATN9SWTBOh60ol/c8g=";
   };
 
   vendorHash = null;

From 4b0b54a907878cafd51584f305c4422736af5e05 Mon Sep 17 00:00:00 2001
From: Tristan Ross <tristan.ross@midstall.com>
Date: Fri, 7 Nov 2025 16:08:58 -0800
Subject: [PATCH 6200/6226] bash: fix cpe eval

---
 pkgs/shells/bash/5.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix
index 0ca4ca768b5d..017edfe2613e 100644
--- a/pkgs/shells/bash/5.nix
+++ b/pkgs/shells/bash/5.nix
@@ -278,7 +278,7 @@ lib.warnIf (withDocs != null)
       mainProgram = "bash";
       identifiers.cpeParts =
         let
-          versionSplit = lib.split "p" version;
+          versionSplit = lib.split "p" fa.version;
         in
         {
           vendor = "gnu";

From a6c7b19721120727184c795391537d0a28fb8f47 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 00:44:07 +0000
Subject: [PATCH 6201/6226] slepc: 3.24.0 -> 3.24.1

---
 pkgs/by-name/sl/slepc/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/sl/slepc/package.nix b/pkgs/by-name/sl/slepc/package.nix
index 357a7cb6a5de..4d236fc16121 100644
--- a/pkgs/by-name/sl/slepc/package.nix
+++ b/pkgs/by-name/sl/slepc/package.nix
@@ -21,13 +21,13 @@ let
 in
 stdenv.mkDerivation (finalAttrs: {
   pname = "slepc";
-  version = "3.24.0";
+  version = "3.24.1";
 
   src = fetchFromGitLab {
     owner = "slepc";
     repo = "slepc";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-nvzX0p/H3EYR8+7jD+I4FdvU+WstxR/U4Upcn7yZULk=";
+    hash = "sha256-Eg0GLPM1AbgUl2/c2+F012LjZweuBNAWjY1WtlghjeY=";
   };
 
   postPatch = ''

From da8712fc073d7e3bfb6e06c62b30a36ed67638ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Sat, 8 Nov 2025 01:58:25 +0100
Subject: [PATCH 6202/6226] cygwin.w32api: fix meta maintainers

---
 pkgs/os-specific/cygwin/w32api/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/os-specific/cygwin/w32api/default.nix b/pkgs/os-specific/cygwin/w32api/default.nix
index 4950da53116d..1fcb6d607066 100644
--- a/pkgs/os-specific/cygwin/w32api/default.nix
+++ b/pkgs/os-specific/cygwin/w32api/default.nix
@@ -39,7 +39,7 @@
         license
         ;
       platforms = lib.platforms.unix ++ lib.platforms.windows;
-      teams = [ lib.maintainers.corngood ];
+      maintainers = [ lib.maintainers.corngood ];
     };
   }
   // (

From ac579c670831aa427dce4270e82e5ef5441e74d2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 01:03:19 +0000
Subject: [PATCH 6203/6226] lux-cli: 0.18.8 -> 0.20.0

---
 pkgs/by-name/lu/lux-cli/package.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix
index dd7c01bfeca8..6923cd52e476 100644
--- a/pkgs/by-name/lu/lux-cli/package.nix
+++ b/pkgs/by-name/lu/lux-cli/package.nix
@@ -18,18 +18,18 @@
 rustPlatform.buildRustPackage (finalAttrs: {
   pname = "lux-cli";
 
-  version = "0.18.8";
+  version = "0.20.0";
 
   src = fetchFromGitHub {
     owner = "lumen-oss";
     repo = "lux";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-AHmIdVkU4a+zmJPWfGkmRI7Mc/NdX+KokKHn9CZ9tOM=";
+    hash = "sha256-cQ7kgg4pv7j47cvhhHV9885M1hlknZJI2FRWxX5SmCc=";
   };
 
   buildAndTestSubdir = "lux-cli";
 
-  cargoHash = "sha256-noOyrKNxfndkq7VlyxLs8R8FG+1xkwM7MbKu0vO4Nh8=";
+  cargoHash = "sha256-x4cLC+UeoSI4yYdEJb26vnj9JvZ5t31J0mcnQJjZabk=";
 
   nativeInstallCheckInputs = [
     versionCheckHook

From c83e7752ddc66d26587fbe98dc72190c7020b354 Mon Sep 17 00:00:00 2001
From: Zaechus <zaechus@pm.me>
Date: Thu, 30 Oct 2025 14:01:10 -0600
Subject: [PATCH 6204/6226] devilutionx: 1.5.4 -> 1.5.5

---
 pkgs/by-name/de/devilutionx/package.nix | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/pkgs/by-name/de/devilutionx/package.nix b/pkgs/by-name/de/devilutionx/package.nix
index a3f8d21ba257..cf9ff5ebb9a3 100644
--- a/pkgs/by-name/de/devilutionx/package.nix
+++ b/pkgs/by-name/de/devilutionx/package.nix
@@ -12,7 +12,9 @@
   SDL2_image,
   SDL_audiolib,
   simpleini,
+  flac,
   fmt,
+  libogg,
   libpng,
   libtiff,
   libwebp,
@@ -45,20 +47,20 @@ let
     owner = "diasurgical";
     repo = "libzt";
     fetchSubmodules = true;
-    rev = "d6c6a069a5041a3e89594c447ced3f15d77618b8";
-    sha256 = "sha256-ttRJLfaGHzhS4jd8db7BNPWROCti3ZxuRouqsL/M5ew=";
+    rev = "1a9d83b8c4c2bdcd7ea6d8ab1dd2771b16eb4e13";
+    sha256 = "sha256-/A77ZM4s+br1hYa0OBdjXcWXUXYG+GiEYcW8VB+UJHo=";
   };
 in
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "devilutionx";
-  version = "1.5.4";
+  version = "1.5.5";
 
   src = fetchFromGitHub {
     owner = "diasurgical";
     repo = "devilutionX";
     tag = finalAttrs.version;
-    hash = "sha256-F23MTe7vMOgIBH6qm7X1+8gIMmN9E+d/GZnFsQZt2cM=";
+    hash = "sha256-XfHpKERYZ+VCeWx95568FEEZ4UZg3Z4abA8mG4kHjy0=";
   };
 
   patches = [ ./add-nix-share-path-to-mpq-search.patch ];
@@ -83,7 +85,9 @@ stdenv.mkDerivation (finalAttrs: {
 
   buildInputs = [
     bzip2
+    flac
     fmt
+    libogg
     libpng
     libtiff
     libwebp

From 296e29eb9ffd1c04ea7914c474e7092ecb8be190 Mon Sep 17 00:00:00 2001
From: Aaron Andersen <aaron@fosslib.net>
Date: Fri, 7 Nov 2025 20:47:07 -0500
Subject: [PATCH 6205/6226] devilutionx, smpq, stormlib: add cmake fix

---
 pkgs/by-name/de/devilutionx/package.nix | 4 ++++
 pkgs/by-name/sm/smpq/package.nix        | 1 +
 pkgs/by-name/st/stormlib/package.nix    | 1 +
 3 files changed, 6 insertions(+)

diff --git a/pkgs/by-name/de/devilutionx/package.nix b/pkgs/by-name/de/devilutionx/package.nix
index cf9ff5ebb9a3..a65c8c68011d 100644
--- a/pkgs/by-name/de/devilutionx/package.nix
+++ b/pkgs/by-name/de/devilutionx/package.nix
@@ -76,6 +76,10 @@ stdenv.mkDerivation (finalAttrs: {
       --replace-fail "@assets@" "$out/share/diasurgical/devilutionx/"
   '';
 
+  cmakeFlags = [
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
diff --git a/pkgs/by-name/sm/smpq/package.nix b/pkgs/by-name/sm/smpq/package.nix
index 817b2077d04b..0048797bfe04 100644
--- a/pkgs/by-name/sm/smpq/package.nix
+++ b/pkgs/by-name/sm/smpq/package.nix
@@ -17,6 +17,7 @@ stdenv.mkDerivation (finalAttrs: {
 
   cmakeFlags = [
     (lib.cmakeBool "WITH_KDE" false)
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
   ];
 
   nativeBuildInputs = [ cmake ];
diff --git a/pkgs/by-name/st/stormlib/package.nix b/pkgs/by-name/st/stormlib/package.nix
index cf7f4d7ebcf2..99a4ee90d9af 100644
--- a/pkgs/by-name/st/stormlib/package.nix
+++ b/pkgs/by-name/st/stormlib/package.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: {
   cmakeFlags = [
     (lib.cmakeBool "BUILD_SHARED_LIBS" (!stdenv.hostPlatform.isStatic))
     (lib.cmakeBool "WITH_LIBTOMCRYPT" true)
+    "-DCMAKE_POLICY_VERSION_MINIMUM=3.5"
   ];
 
   strictDeps = true;

From 2e6c73c34e7f01fa05ab06ce908aed8070be0946 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Fri, 7 Nov 2025 21:19:43 -0500
Subject: [PATCH 6206/6226] nodePackages.npm-merge-driver: drop

Upstream repo is archived.
---
 pkgs/development/node-packages/aliases.nix     |  1 +
 .../node-packages/node-packages.json           |  1 -
 .../node-packages/node-packages.nix            | 18 ------------------
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 0a5ff76f605f..f5a94b70e1b1 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -219,6 +219,7 @@ mapAliases {
     };
   }); # added 2024-10-04
   inherit (pkgs) npm-check-updates; # added 2023-08-22
+  npm-merge-driver = throw "'npm-merge-driver' has been removed, since the upstream repo was archived on Aug 11, 2021"; # Added 2025-11-07
   ocaml-language-server = throw "ocaml-language-server was removed because it was abandoned upstream"; # added 2023-09-04
   orval = throw "orval has been removed because it was broken"; # added 2025-03-23
   parcel = throw "parcel has been removed because it was broken"; # added 2025-03-12
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 93dc30789725..41ba101d9ee1 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -66,7 +66,6 @@
 , "node-gyp-build"
 , "node2nix"
 , "np"
-, "npm-merge-driver"
 , "nrm"
 , "parsoid"
 , "peerflix"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index d8daeb941a20..522a63354ee8 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -41175,24 +41175,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  npm-merge-driver = nodeEnv.buildNodePackage {
-    name = "npm-merge-driver";
-    packageName = "npm-merge-driver";
-    version = "2.3.6";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/npm-merge-driver/-/npm-merge-driver-2.3.6.tgz";
-      sha512 = "uPjCEWZ93f379zw0AMEgFtZIlpSSnpXc8BEIcs8yYHEZs5Y3d85OZHisLjNhjbYnbdAznxTq+VbyBWAQZDEm9w==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "git merge driver for automatically merging lockfiles";
-      homepage = "https://github.com/npm/npm-merge-driver#readme";
-      license = "ISC";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   nrm = nodeEnv.buildNodePackage {
     name = "nrm";
     packageName = "nrm";

From f58316e04715bf57c56bb53a560d80b42374d531 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Fri, 7 Nov 2025 21:25:20 -0500
Subject: [PATCH 6207/6226] nodePackages.csslint: drop

Per https://github.com/CSSLint/csslint/issues/754, upstream considers it
abandoned
---
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 31 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  2 --
 5 files changed, 2 insertions(+), 34 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index f5a94b70e1b1..e035e5540c69 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -130,6 +130,7 @@ mapAliases {
   create-cycle-app = throw "create-cycle-app has been removed because it is unmaintained and has issues installing with recent nodejs versions."; # Added 2025-11-01
   create-react-native-app = throw "create-react-native-app was removed because it was deprecated. Upstream suggests using a framework for React Native."; # added 2024-12-08
   inherit (pkgs) cspell;
+  csslint = throw "'csslint' has been removed as upstream considers it abandoned."; # Addeed 2025-11-07
   dat = throw "dat was removed because it was broken"; # added 2023-08-21
   inherit (pkgs) degit; # added 2023-08-18
   inherit (pkgs) diagnostic-languageserver; # added 2024-06-25
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 41ba101d9ee1..ff8c0016dab5 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -27,7 +27,6 @@
 , "code-theme-converter"
 , "conventional-changelog-cli"
 , "cpy-cli"
-, "csslint"
 , "dhcp"
 , "diff2html-cli"
 , "dotenv-vault"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 522a63354ee8..2797a4c22f76 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -22326,15 +22326,6 @@ let
         sha512 = "jeAGzMDbfSHHA091hr0r31eYfTig+29g3GKKE/PPbEQ65X0lmMwlEoqmhzu0iztID5uJpZsFlUPDP8ThPL7M8w==";
       };
     };
-    "parserlib-1.1.1" = {
-      name = "parserlib";
-      packageName = "parserlib";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parserlib/-/parserlib-1.1.1.tgz";
-        sha512 = "e1HbF3+7ASJ/uOZirg5/8ZfPljTh100auNterbHB8TUs5egciuWQ2eX/2al8ko0RdV9Xh/5jDei3jqJAmbTDcg==";
-      };
-    };
     "parseuri-0.0.6" = {
       name = "parseuri";
       packageName = "parseuri";
@@ -35893,28 +35884,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  csslint = nodeEnv.buildNodePackage {
-    name = "csslint";
-    packageName = "csslint";
-    version = "1.0.5";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/csslint/-/csslint-1.0.5.tgz";
-      sha512 = "GXGpPqGIuEBKesM4bt2IKFrzDKpemh9wVZRHVuculUErar554QrXHOonhgkBOP3uiZzbAETz0N2A4oWlIoxPuw==";
-    };
-    dependencies = [
-      sources."clone-2.1.2"
-      sources."parserlib-1.1.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "CSSLint";
-      homepage = "http://csslint.net/";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   dhcp = nodeEnv.buildNodePackage {
     name = "dhcp";
     packageName = "dhcp";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 07f90ae7de94..87bdade1571e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -454,6 +454,7 @@ mapAliases {
   cromite = throw "'cromite' has been removed from nixpkgs due to it not being maintained"; # Added 2025-06-12
   crossLibcStdenv = throw "'crossLibcStdenv' has been renamed to/replaced by 'stdenvNoLibc'"; # Converted to throw 2025-10-27
   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
   cstore_fdw = throw "'cstore_fdw' has been removed. Use 'postgresqlPackages.cstore_fdw' instead."; # Added 2025-07-19
   cudaPackages_11 = throw "CUDA 11 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
   cudaPackages_11_0 = throw "CUDA 11.0 has been removed from Nixpkgs, as it is unmaintained upstream and depends on unsupported compilers"; # Added 2025-08-08
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 1f696fdac2c7..4db94cf2e714 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6403,8 +6403,6 @@ with pkgs;
     inherit (llvmPackages_18) llvm libclang;
   };
 
-  inherit (nodePackages) csslint;
-
   css-html-js-minify = with python3Packages; toPythonApplication css-html-js-minify;
 
   cvise = python3Packages.callPackage ../development/tools/misc/cvise {

From 6e50819df059da4c3b303232a018e9b3fa40fbae Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Fri, 7 Nov 2025 21:30:22 -0500
Subject: [PATCH 6208/6226] nodePackages.elm-oracle: drop

Per https://github.com/ElmCast/elm-oracle/issues/26, it doesn't support
elm 0.19+ so it's not suitable for use today.
---
 pkgs/development/node-packages/aliases.nix     |  1 +
 .../node-packages/node-packages.json           |  1 -
 .../node-packages/node-packages.nix            | 18 ------------------
 3 files changed, 1 insertion(+), 19 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index e035e5540c69..88df9e94825a 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -139,6 +139,7 @@ mapAliases {
   eask = pkgs.eask; # added 2023-08-17
   inherit (pkgs.elmPackages) elm-test;
   inherit (pkgs.elmPackages) elm-review;
+  elm-oracle = throw "'elm-oracle' has been removed, since it doesn't work with modern versions of Elm."; # Added 2025-11-07
   emojione = throw "emojione was archived and abandoned upstream, so it has been removed"; # Added 2025-11-06
   escape-string-regexp = throw "escape-string-regexp was removed because it provides no executable"; # added 2025-03-12
   inherit (pkgs) eslint; # Added 2024-08-28
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index ff8c0016dab5..56286fa21a41 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -31,7 +31,6 @@
 , "diff2html-cli"
 , "dotenv-vault"
 , "elasticdump"
-, "elm-oracle"
 , "emoj"
 , "esy"
 , "fast-cli"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 2797a4c22f76..c7656243341c 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -36487,24 +36487,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  elm-oracle = nodeEnv.buildNodePackage {
-    name = "elm-oracle";
-    packageName = "elm-oracle";
-    version = "1.1.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/elm-oracle/-/elm-oracle-1.1.1.tgz";
-      sha512 = "DUtF7aAlrrgijSRB4tGMgx6qp1NAVJpUGL4cjret1f57DEf41s+iPLPHxEkPbLrIdYjtEBzvRP8mMph37quqmQ==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Query for information about values in elm source files";
-      homepage = "https://github.com/ElmCast/elm-oracle#readme";
-      license = "BSD-3-Clause";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   emoj = nodeEnv.buildNodePackage {
     name = "emoj";
     packageName = "emoj";

From 3fd513480b7b82e08d380b7d17aab35e8d3ccf42 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Fri, 7 Nov 2025 21:41:08 -0500
Subject: [PATCH 6209/6226] nodePackages.fleek-cli: drop

Upstream repo was removed, and upstream suggests using
@fleekplatform/cli instead.
---
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/main-programs.nix           |   1 -
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 516 ------------------
 4 files changed, 1 insertion(+), 518 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 88df9e94825a..a243f6601516 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -148,6 +148,7 @@ mapAliases {
   expo-cli = throw "expo-cli was removed because it was deprecated upstream. Use `npx expo` or eas-cli instead."; # added 2024-12-02
   inherit (pkgs) firebase-tools; # added 2023-08-18
   inherit (pkgs) fixjson; # added 2024-06-26
+  fleek-cli = throw "'fleek-cli' was removed because the upstream source code repo has been deleted."; # Added 2025-11-07
   flood = pkgs.flood; # Added 2023-07-25
   inherit (pkgs) fx; # Added 2025-11-06
   ganache = throw "ganache was removed because it was deprecated upstream"; # added 2024-12-02
diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix
index f9b6ba23fbe8..a76a0b724ac8 100644
--- a/pkgs/development/node-packages/main-programs.nix
+++ b/pkgs/development/node-packages/main-programs.nix
@@ -21,7 +21,6 @@
   fast-cli = "fast";
   fauna-shell = "fauna";
   fkill-cli = "fkill";
-  fleek-cli = "fleek";
   grunt-cli = "grunt";
   gulp-cli = "gulp";
   jsonlint = "jsonlint";
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 56286fa21a41..5f6b001fcaf4 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -36,7 +36,6 @@
 , "fast-cli"
 , "fauna-shell"
 , "fkill-cli"
-, "fleek-cli"
 , "forever"
 , "grunt-cli"
 , "makam"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index c7656243341c..c517d8aad594 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -741,24 +741,6 @@ let
         sha512 = "JubJ5B2pJ4k4yGxaNLdbjrnk9d/iDz6/q8wOilpIowd6PJPgaxCuHBnBszq7Ce2TyMrywm5r4PnKm6V3iiZF+g==";
       };
     };
-    "@ethereumjs/rlp-4.0.1" = {
-      name = "_at_ethereumjs_slash_rlp";
-      packageName = "@ethereumjs/rlp";
-      version = "4.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@ethereumjs/rlp/-/rlp-4.0.1.tgz";
-        sha512 = "tqsQiBQDQdmPWE1xkkBq4rlSW5QZpLOUJ5RJh2/9fug+q9tnUhuZoVLk7s0scUIKTOzEtR72DFBXI4WiZcMpvw==";
-      };
-    };
-    "@ethereumjs/util-8.1.0" = {
-      name = "_at_ethereumjs_slash_util";
-      packageName = "@ethereumjs/util";
-      version = "8.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@ethereumjs/util/-/util-8.1.0.tgz";
-        sha512 = "zQ0IqbdX8FZ9aw11vP+dZkKDkS+kgIvQPHnSAXzP9pLu+Rfu3D3XEeLbicvoXJTYnhZiPmsZUxgdzXwNKxRPbA==";
-      };
-    };
     "@ewoudenberg/difflib-0.1.0" = {
       name = "_at_ewoudenberg_slash_difflib";
       packageName = "@ewoudenberg/difflib";
@@ -1641,24 +1623,6 @@ let
         sha512 = "2SBN7A/iCVufTmuXdS+W1wY0MZaEyhxlme/NQTlXbTaYWaMGZJMso3YRBNKJJLE1T7NkxsvCVCp7/2QSh8k+JA==";
       };
     };
-    "@noble/curves-1.4.2" = {
-      name = "_at_noble_slash_curves";
-      packageName = "@noble/curves";
-      version = "1.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@noble/curves/-/curves-1.4.2.tgz";
-        sha512 = "TavHr8qycMChk8UwMld0ZDRvatedkzWfH8IiaeGCfymOP5i0hSCozz9vHOL0nkwk7HRMlFnAiKpS2jrUmSybcw==";
-      };
-    };
-    "@noble/hashes-1.4.0" = {
-      name = "_at_noble_slash_hashes";
-      packageName = "@noble/hashes";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@noble/hashes/-/hashes-1.4.0.tgz";
-        sha512 = "V1JJ1WTRUqHHrOSh597hURcMqVKVGL/ea3kv0gSnEdsEZ0/+VyPghM1lMNGc00z7CIQorSvbKpuJkxvuHbvdbg==";
-      };
-    };
     "@nodelib/fs.scandir-2.1.5" = {
       name = "_at_nodelib_slash_fs.scandir";
       packageName = "@nodelib/fs.scandir";
@@ -2433,33 +2397,6 @@ let
         sha512 = "bhtGJtetkiqyB/OR506ftC+o98xLQXnOlvFO/zbkTddkLgMdPpyOt2A9Fuu+z4OVigqBiLBkzmR8i0w8xUUAmw==";
       };
     };
-    "@scure/base-1.1.9" = {
-      name = "_at_scure_slash_base";
-      packageName = "@scure/base";
-      version = "1.1.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@scure/base/-/base-1.1.9.tgz";
-        sha512 = "8YKhl8GHiNI/pU2VMaofa2Tor7PJRAjwQLBBuilkJ9L5+13yVbC7JO/wS7piioAvPSwR3JKM1IJ/u4xQzbcXKg==";
-      };
-    };
-    "@scure/bip32-1.4.0" = {
-      name = "_at_scure_slash_bip32";
-      packageName = "@scure/bip32";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@scure/bip32/-/bip32-1.4.0.tgz";
-        sha512 = "sVUpc0Vq3tXCkDGYVWGIZTRfnvu8LoTDaev7vbwh0omSvVORONr960MQWdKqJDCReIEmTj3PAr73O3aoxz7OPg==";
-      };
-    };
-    "@scure/bip39-1.3.0" = {
-      name = "_at_scure_slash_bip39";
-      packageName = "@scure/bip39";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@scure/bip39/-/bip39-1.3.0.tgz";
-        sha512 = "disdg7gHuTDZtY+ZdkmLpPCk7fxZSu3gBiEGuoC1XYxv9cGx3Z6cpTggCgW6odSOOIXCiDjuGejW+aJKCY/pIQ==";
-      };
-    };
     "@sec-ant/readable-stream-0.4.1" = {
       name = "_at_sec-ant_slash_readable-stream";
       packageName = "@sec-ant/readable-stream";
@@ -3081,15 +3018,6 @@ let
         sha512 = "ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==";
       };
     };
-    "@types/atob-2.1.4" = {
-      name = "_at_types_slash_atob";
-      packageName = "@types/atob";
-      version = "2.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/atob/-/atob-2.1.4.tgz";
-        sha512 = "FisOhG87cCFqzCgq6FUtSYsTMOHCB/p28zJbSN1QBo4ZGJfg9PEhMjdIV++NDeOnloUUe0Gz6jwBV+L1Ac00Mw==";
-      };
-    };
     "@types/cli-progress-3.11.6" = {
       name = "_at_types_slash_cli-progress";
       packageName = "@types/cli-progress";
@@ -3234,15 +3162,6 @@ let
         sha512 = "1m0bIFVc7eJWyve9S0RnuRgcQqF/Xd5QsUZAZeQFr1Q3/p9JWoQQEqmVy+DPTNpGXwhgIetAoYF8JSc33q29QA==";
       };
     };
-    "@types/inquirer-6.5.0" = {
-      name = "_at_types_slash_inquirer";
-      packageName = "@types/inquirer";
-      version = "6.5.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/inquirer/-/inquirer-6.5.0.tgz";
-        sha512 = "rjaYQ9b9y/VFGOpqBEXRavc3jh0a+e6evAbI31tMda8VlPaSy0AZJfXsvmIe3wklc7W6C3zCSfleuMXR7NOyXw==";
-      };
-    };
     "@types/is-empty-1.2.3" = {
       name = "_at_types_slash_is-empty";
       packageName = "@types/is-empty";
@@ -3504,15 +3423,6 @@ let
         sha512 = "Hy6UMpxhE3j1tLpl27exp1XqHD7n8chAiNPzWfz16LPZoMMoSc4dzLl6w9qijkEb/r5O1ozdu1CWGA2L83ZeZg==";
       };
     };
-    "@types/through-0.0.33" = {
-      name = "_at_types_slash_through";
-      packageName = "@types/through";
-      version = "0.0.33";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/through/-/through-0.0.33.tgz";
-        sha512 = "HsJ+z3QuETzP3cswwtzt2vEIiHBk/dCcHGhbmG5X3ecnwFD/lPrMpliGXxSCg03L9AhrdwA4Oz/qfspkDW+xGQ==";
-      };
-    };
     "@types/triple-beam-1.3.5" = {
       name = "_at_types_slash_triple-beam";
       packageName = "@types/triple-beam";
@@ -5871,15 +5781,6 @@ let
         sha512 = "Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==";
       };
     };
-    "binary-search-tree-0.2.5" = {
-      name = "binary-search-tree";
-      packageName = "binary-search-tree";
-      version = "0.2.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/binary-search-tree/-/binary-search-tree-0.2.5.tgz";
-        sha512 = "CvNVKS6iXagL1uGwLagSXz1hzSMezxOuGnFi5FHGKqaTO3nPPWrAbyALUzK640j+xOTVm7lzD9YP8W1f/gvUdw==";
-      };
-    };
     "bindings-1.5.0" = {
       name = "bindings";
       packageName = "bindings";
@@ -5997,15 +5898,6 @@ let
         sha512 = "vHdS19CnY3hwiNdkaqk93DvjVLfbEcI8mys4UjuWrlX1haDmroo8o4xCzh4wD6DGV6HxRCyauwhHRqMTfERtjw==";
       };
     };
-    "bn.js-4.11.6" = {
-      name = "bn.js";
-      packageName = "bn.js";
-      version = "4.11.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bn.js/-/bn.js-4.11.6.tgz";
-        sha512 = "XWwnNNFCuuSQ0m3r3C4LE3EiORltHd9M05pq6FOlVeiophzRbMo50Sbz1ehl8K3Z+jw9+vmgnXefY1hz8X+2wA==";
-      };
-    };
     "bn.js-4.12.1" = {
       name = "bn.js";
       packageName = "bn.js";
@@ -7896,15 +7788,6 @@ let
         sha512 = "Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==";
       };
     };
-    "command-exists-1.2.9" = {
-      name = "command-exists";
-      packageName = "command-exists";
-      version = "1.2.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz";
-        sha512 = "LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==";
-      };
-    };
     "commander-11.1.0" = {
       name = "commander";
       packageName = "commander";
@@ -11371,33 +11254,6 @@ let
         sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==";
       };
     };
-    "ethereum-bloom-filters-1.2.0" = {
-      name = "ethereum-bloom-filters";
-      packageName = "ethereum-bloom-filters";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ethereum-bloom-filters/-/ethereum-bloom-filters-1.2.0.tgz";
-        sha512 = "28hyiE7HVsWubqhpVLVmZXFd4ITeHi+BUu05o9isf0GUpMtzBUi+8/gFrGaGYzvGAJQmJ3JKj77Mk9G98T84rA==";
-      };
-    };
-    "ethereum-cryptography-2.2.1" = {
-      name = "ethereum-cryptography";
-      packageName = "ethereum-cryptography";
-      version = "2.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ethereum-cryptography/-/ethereum-cryptography-2.2.1.tgz";
-        sha512 = "r/W8lkHSiTLxUxW8Rf3u4HGB0xQweG2RyETjywylKZSzLWoWAijRz8WCuOtJ6wah+avllXBqZuk29HCCvhEIRg==";
-      };
-    };
-    "ethjs-unit-0.1.6" = {
-      name = "ethjs-unit";
-      packageName = "ethjs-unit";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ethjs-unit/-/ethjs-unit-0.1.6.tgz";
-        sha512 = "/Sn9Y0oKl0uqQuvgFk/zQgR7aw1g36qX/jzSQ5lSwlO0GigPymk4eGQfeNTD03w1dPOqfz8V77Cy43jH56pagw==";
-      };
-    };
     "event-emitter-0.3.5" = {
       name = "event-emitter";
       packageName = "event-emitter";
@@ -15070,15 +14926,6 @@ let
         sha512 = "6xwYfHbajpoF0xLW+iwLkhwgvLoZDfjYfoFNu8ftMoXINzwuymNLd9u/KmwtdT2GbR+/Cz66otEGEVVUHX9QLQ==";
       };
     };
-    "inversify-5.1.1" = {
-      name = "inversify";
-      packageName = "inversify";
-      version = "5.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inversify/-/inversify-5.1.1.tgz";
-        sha512 = "j8grHGDzv1v+8T1sAQ+3boTCntFPfvxLCkNcxB1J8qA0lUN+fAlSyYd+RXKvaPRL4AGyPxViutBEJHNXOyUdFQ==";
-      };
-    };
     "ip-1.1.9" = {
       name = "ip";
       packageName = "ip";
@@ -15547,15 +15394,6 @@ let
         sha512 = "xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==";
       };
     };
-    "is-hex-prefixed-1.0.0" = {
-      name = "is-hex-prefixed";
-      packageName = "is-hex-prefixed";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-hex-prefixed/-/is-hex-prefixed-1.0.0.tgz";
-        sha512 = "WvtOiug1VFrE9v1Cydwm+FnXd3+w9GaeVUss5W4v/SLy3UW00vP+6iNF2SdnfiBoLy4bTqVdkftNGTUeOFVsbA==";
-      };
-    };
     "is-hexadecimal-2.0.1" = {
       name = "is-hexadecimal";
       packageName = "is-hexadecimal";
@@ -16960,15 +16798,6 @@ let
         sha512 = "KDncfTmOZoOMTFG4mBlG0qUIOlc03fmzH+ru6RgYVZhPkyiy/92Owlt/8UEN+a4TXR1FQetfIpJE8ApdvdVxTg==";
       };
     };
-    "jwt-decode-2.2.0" = {
-      name = "jwt-decode";
-      packageName = "jwt-decode";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jwt-decode/-/jwt-decode-2.2.0.tgz";
-        sha512 = "86GgN2vzfUu7m9Wcj63iUkuDzFNYFVmjeDm2GzWpUk+opB0pEpMsw6ePCMrhYkumz2C1ihqtZzOMAg7FiXcNoQ==";
-      };
-    };
     "k-bucket-0.6.0" = {
       name = "k-bucket";
       packageName = "k-bucket";
@@ -17230,15 +17059,6 @@ let
         sha512 = "+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==";
       };
     };
-    "lie-3.1.1" = {
-      name = "lie";
-      packageName = "lie";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz";
-        sha512 = "RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==";
-      };
-    };
     "lie-3.3.0" = {
       name = "lie";
       packageName = "lie";
@@ -17446,15 +17266,6 @@ let
         sha512 = "uxKD2HIj042/HBx77NBcmEPsD+hxCgAtjEWlYNScuUjIsh/62Uyu39GOR68TBR68v+jqDL9zfftCWoUo4y03sQ==";
       };
     };
-    "localforage-1.10.0" = {
-      name = "localforage";
-      packageName = "localforage";
-      version = "1.10.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz";
-        sha512 = "14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==";
-      };
-    };
     "locate-character-3.0.0" = {
       name = "locate-character";
       packageName = "locate-character";
@@ -19094,15 +18905,6 @@ let
         sha512 = "viYIo9PefV+w9dvoIBh1gI44Mvx1BOk67B4BpC2QK77qdY0xZF0Q+vWLt/BII6cLkIc8rLmSIcJaB/OrXXKe1g==";
       };
     };
-    "micro-ftch-0.3.1" = {
-      name = "micro-ftch";
-      packageName = "micro-ftch";
-      version = "0.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/micro-ftch/-/micro-ftch-0.3.1.tgz";
-        sha512 = "/0LLxhzP0tfiR5hcQebtudP56gUurs2CLkGarnCiB/OqEyUFQ6U3paQi/tgLv0hBJYt2rnr9MNpxz4fiiugstg==";
-      };
-    };
     "micromark-3.2.0" = {
       name = "micromark";
       packageName = "micromark";
@@ -20426,15 +20228,6 @@ let
         sha512 = "zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==";
       };
     };
-    "nedb-1.8.0" = {
-      name = "nedb";
-      packageName = "nedb";
-      version = "1.8.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/nedb/-/nedb-1.8.0.tgz";
-        sha512 = "ip7BJdyb5m+86ZbSb4y10FCCW9g35+U8bDRrZlAfCI6m4dKwEsQ5M52grcDcVK4Vm/vnPlDLywkyo3GliEkb5A==";
-      };
-    };
     "negotiator-0.5.3" = {
       name = "negotiator";
       packageName = "negotiator";
@@ -21183,15 +20976,6 @@ let
         sha512 = "4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ==";
       };
     };
-    "number-to-bn-1.7.0" = {
-      name = "number-to-bn";
-      packageName = "number-to-bn";
-      version = "1.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/number-to-bn/-/number-to-bn-1.7.0.tgz";
-        sha512 = "wsJ9gfSz1/s4ZsJN01lyonwuxA1tml6X1yBDnfpMglypcBRFZZkus26EdPSlqS5GJfYddVZa22p3VNb3z5m5Ig==";
-      };
-    };
     "numeral-2.0.6" = {
       name = "numeral";
       packageName = "numeral";
@@ -21570,15 +21354,6 @@ let
         sha512 = "mnkeQ1qP5Ue2wd+aivTD3NHd/lZ96Lu0jgf0pwktLPtx6cTZiH7tyeGRRHs0zX0rbrahXPnXlUnbeXyaBBuIaw==";
       };
     };
-    "open-7.4.2" = {
-      name = "open";
-      packageName = "open";
-      version = "7.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/open/-/open-7.4.2.tgz";
-        sha512 = "MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==";
-      };
-    };
     "open-8.4.2" = {
       name = "open";
       packageName = "open";
@@ -23559,15 +23334,6 @@ let
         sha512 = "X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==";
       };
     };
-    "querystring-0.2.1" = {
-      name = "querystring";
-      packageName = "querystring";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/querystring/-/querystring-0.2.1.tgz";
-        sha512 = "wkvS7mL/JMugcup3/rMitHmd9ecIGd2lhFhK9N3UUQ450h66d1r3Y9nvXzQAW1Lq+wyx61k/1pfKS5KuKiyEbg==";
-      };
-    };
     "querystring-es3-0.2.1" = {
       name = "querystring-es3";
       packageName = "querystring-es3";
@@ -24189,15 +23955,6 @@ let
         sha512 = "LAUYz4lc+Do8/g7aeRa8JkyDErK6ekstQaqWQrNRW//MY1TvCEpMtpTWvlQ+FPbWCx+Xixu/6SHt5N0HR+SB4w==";
       };
     };
-    "reflect-metadata-0.1.14" = {
-      name = "reflect-metadata";
-      packageName = "reflect-metadata";
-      version = "0.1.14";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/reflect-metadata/-/reflect-metadata-0.1.14.tgz";
-        sha512 = "ZhYeb6nRaXCfhnndflDK8qI6ZQ/YcWZCISRAWICW9XYqMUwjZM9Z0DveWX/ABN01oxSHwVxKQmxeYZSsm0jh5A==";
-      };
-    };
     "reftools-1.1.9" = {
       name = "reftools";
       packageName = "reftools";
@@ -24954,24 +24711,6 @@ let
         sha512 = "fimzjIVw506FBZLspTAXHdpvgvQebyjpNyLRd0e6drPPRq7gcrROeGWRyF81wLqFg5ijPgnOQbmfck5wdTqpSA==";
       };
     };
-    "request-promise-4.2.6" = {
-      name = "request-promise";
-      packageName = "request-promise";
-      version = "4.2.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request-promise/-/request-promise-4.2.6.tgz";
-        sha512 = "HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ==";
-      };
-    };
-    "request-promise-core-1.1.4" = {
-      name = "request-promise-core";
-      packageName = "request-promise-core";
-      version = "1.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz";
-        sha512 = "TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==";
-      };
-    };
     "requestretry-7.1.0" = {
       name = "requestretry";
       packageName = "requestretry";
@@ -27114,15 +26853,6 @@ let
         sha512 = "UhDfHmA92YAlNnCfhmq0VeNL5bDbiZGg7sZ2IvPsXubGkiNa9EC+tUTsjBRsYUAz87btI6/1wf4XoVvQ3uRnmQ==";
       };
     };
-    "stealthy-require-1.1.1" = {
-      name = "stealthy-require";
-      packageName = "stealthy-require";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz";
-        sha512 = "ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g==";
-      };
-    };
     "stop-iteration-iterator-1.1.0" = {
       name = "stop-iteration-iterator";
       packageName = "stop-iteration-iterator";
@@ -27564,15 +27294,6 @@ let
         sha512 = "aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==";
       };
     };
-    "strip-hex-prefix-1.0.0" = {
-      name = "strip-hex-prefix";
-      packageName = "strip-hex-prefix";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/strip-hex-prefix/-/strip-hex-prefix-1.0.0.tgz";
-        sha512 = "q8d4ue7JGEiVcypji1bALTos+0pWtyGlivAWyPuTkHzuTCJqrK9sWxYQZUq6Nq3cuyv3bm734IhHvHtGGURU6A==";
-      };
-    };
     "strip-indent-1.0.1" = {
       name = "strip-indent";
       packageName = "strip-indent";
@@ -28977,15 +28698,6 @@ let
         sha512 = "GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==";
       };
     };
-    "underscore-1.4.4" = {
-      name = "underscore";
-      packageName = "underscore";
-      version = "1.4.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/underscore/-/underscore-1.4.4.tgz";
-        sha512 = "ZqGrAgaqqZM7LGRzNjLnw5elevWb5M8LEoDMadxIW3OWbcv72wMMgKdwOKpd5Fqxe8choLD8HN3iSj3TUh/giQ==";
-      };
-    };
     "underscore-1.6.0" = {
       name = "underscore";
       packageName = "underscore";
@@ -29598,15 +29310,6 @@ let
         sha512 = "PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ==";
       };
     };
-    "untildify-4.0.0" = {
-      name = "untildify";
-      packageName = "untildify";
-      version = "4.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/untildify/-/untildify-4.0.0.tgz";
-        sha512 = "KK8xQ1mkzZeg9inewmFVDNkg3l5LUhoq9kN6iWYB/CC9YMG8HA+c1Q8HwDe6dEX7kErrEVNVBO3fWsVq5iDgtw==";
-      };
-    };
     "unzip-response-2.0.1" = {
       name = "unzip-response";
       packageName = "unzip-response";
@@ -29796,15 +29499,6 @@ let
         sha512 = "qQrPtYLLLl12NF4DrM9CvfkxkYI97xOb5dsnGZHE3teFr0tWiEZ9UdgMPczv24vl708cYMpe6mGXGHrotIp3Bw==";
       };
     };
-    "utf8-3.0.0" = {
-      name = "utf8";
-      packageName = "utf8";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz";
-        sha512 = "E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ==";
-      };
-    };
     "utif-2.0.1" = {
       name = "utif";
       packageName = "utif";
@@ -30705,15 +30399,6 @@ let
         sha512 = "6BjspCO9VriYy12z356nL6JBS0GYeEcA457YyRzD+dD6XYCQ75NKhcOHUMHentOE7OcVCIXXDvOm0jKFfQG2Gg==";
       };
     };
-    "web3-utils-1.10.4" = {
-      name = "web3-utils";
-      packageName = "web3-utils";
-      version = "1.10.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/web3-utils/-/web3-utils-1.10.4.tgz";
-        sha512 = "tsu8FiKJLk2PzhDl9fXbGUWTkkVXYhtTA+SmEFkKft+9BgwLxfCRpU96sWv7ICC8zixBNd3JURVoiR3dUXgP8A==";
-      };
-    };
     "webassemblyjs-1.11.1" = {
       name = "webassemblyjs";
       packageName = "webassemblyjs";
@@ -37479,207 +37164,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  fleek-cli = nodeEnv.buildNodePackage {
-    name = "fleek-cli";
-    packageName = "fleek-cli";
-    version = "0.0.1";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/fleek-cli/-/fleek-cli-0.0.1.tgz";
-      sha512 = "6TL8NcVoGh7q+1qO/uQ4d/YDAG+x8ddQctZILObjdNmztf9Dv8JI9X0l0U+fsDPTcytYjkw910UwW7uzzWGclA==";
-    };
-    dependencies = [
-      sources."@ethereumjs/rlp-4.0.1"
-      sources."@ethereumjs/util-8.1.0"
-      sources."@noble/curves-1.4.2"
-      sources."@noble/hashes-1.4.0"
-      sources."@scure/base-1.1.9"
-      sources."@scure/bip32-1.4.0"
-      sources."@scure/bip39-1.3.0"
-      sources."@types/atob-2.1.4"
-      sources."@types/inquirer-6.5.0"
-      sources."@types/node-22.13.10"
-      sources."@types/through-0.0.33"
-      sources."ajv-6.12.6"
-      sources."ansi-escapes-4.3.2"
-      sources."ansi-regex-5.0.1"
-      sources."ansi-styles-4.3.0"
-      sources."argparse-1.0.10"
-      sources."asn1-0.2.6"
-      sources."assert-plus-1.0.0"
-      sources."async-0.2.10"
-      sources."asynckit-0.4.0"
-      sources."at-least-node-1.0.0"
-      sources."atob-2.1.2"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.13.2"
-      sources."bcrypt-pbkdf-1.0.2"
-      sources."binary-search-tree-0.2.5"
-      sources."bluebird-3.7.2"
-      sources."bn.js-5.2.1"
-      sources."camelcase-5.3.1"
-      sources."caseless-0.12.0"
-      sources."chalk-4.1.2"
-      sources."chardet-0.7.0"
-      sources."cli-cursor-3.1.0"
-      sources."cli-width-3.0.0"
-      sources."cliui-6.0.0"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."colors-1.4.0"
-      sources."combined-stream-1.0.8"
-      sources."command-exists-1.2.9"
-      sources."core-util-is-1.0.2"
-      sources."dashdash-1.14.1"
-      sources."decamelize-1.2.0"
-      sources."delayed-stream-1.0.0"
-      sources."dotenv-8.6.0"
-      sources."ecc-jsbn-0.1.2"
-      sources."emoji-regex-8.0.0"
-      (
-        sources."encoding-0.1.13"
-        // {
-          dependencies = [
-            sources."iconv-lite-0.6.3"
-          ];
-        }
-      )
-      sources."escape-string-regexp-1.0.5"
-      sources."esprima-4.0.1"
-      sources."ethereum-bloom-filters-1.2.0"
-      sources."ethereum-cryptography-2.2.1"
-      (
-        sources."ethjs-unit-0.1.6"
-        // {
-          dependencies = [
-            sources."bn.js-4.11.6"
-          ];
-        }
-      )
-      sources."extend-3.0.2"
-      sources."external-editor-3.1.0"
-      sources."extsprintf-1.3.0"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-json-stable-stringify-2.1.0"
-      sources."figures-3.2.0"
-      sources."find-up-4.1.0"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.3"
-      sources."fs-extra-9.1.0"
-      sources."get-caller-file-2.0.5"
-      sources."getpass-0.1.7"
-      sources."graceful-fs-4.2.11"
-      sources."har-schema-2.0.0"
-      sources."har-validator-5.1.5"
-      sources."has-flag-4.0.0"
-      sources."http-signature-1.2.0"
-      sources."iconv-lite-0.4.24"
-      sources."immediate-3.0.6"
-      sources."inquirer-7.3.3"
-      sources."inversify-5.1.1"
-      sources."is-docker-2.2.1"
-      sources."is-fullwidth-code-point-3.0.0"
-      sources."is-hex-prefixed-1.0.0"
-      sources."is-typedarray-1.0.0"
-      sources."is-wsl-2.2.0"
-      sources."isstream-0.1.2"
-      sources."js-yaml-3.14.1"
-      sources."jsbn-0.1.1"
-      sources."json-schema-0.4.0"
-      sources."json-schema-traverse-0.4.1"
-      sources."json-stringify-safe-5.0.1"
-      sources."jsonfile-6.1.0"
-      sources."jsprim-1.4.2"
-      sources."jwt-decode-2.2.0"
-      sources."lie-3.1.1"
-      sources."localforage-1.10.0"
-      sources."locate-path-5.0.0"
-      sources."lodash-4.17.21"
-      sources."micro-ftch-0.3.1"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."mimic-fn-2.1.0"
-      sources."minimist-1.2.8"
-      sources."mkdirp-0.5.6"
-      sources."mute-stream-0.0.8"
-      sources."nedb-1.8.0"
-      sources."node-fetch-2.7.0"
-      (
-        sources."number-to-bn-1.7.0"
-        // {
-          dependencies = [
-            sources."bn.js-4.11.6"
-          ];
-        }
-      )
-      sources."oauth-sign-0.9.0"
-      sources."onetime-5.1.2"
-      sources."open-7.4.2"
-      sources."os-tmpdir-1.0.2"
-      sources."p-limit-2.3.0"
-      sources."p-locate-4.1.0"
-      sources."p-try-2.2.0"
-      sources."path-exists-4.0.0"
-      sources."performance-now-2.1.0"
-      sources."psl-1.15.0"
-      sources."punycode-2.3.1"
-      sources."qs-6.5.3"
-      sources."querystring-0.2.1"
-      sources."randombytes-2.1.0"
-      sources."reflect-metadata-0.1.14"
-      sources."request-2.88.2"
-      sources."request-promise-4.2.6"
-      sources."request-promise-core-1.1.4"
-      sources."require-directory-2.1.1"
-      sources."require-main-filename-2.0.0"
-      sources."restore-cursor-3.1.0"
-      sources."run-async-2.4.1"
-      sources."rxjs-6.6.7"
-      sources."safe-buffer-5.2.1"
-      sources."safer-buffer-2.1.2"
-      sources."set-blocking-2.0.0"
-      sources."signal-exit-3.0.7"
-      sources."sprintf-js-1.0.3"
-      sources."sshpk-1.18.0"
-      sources."stealthy-require-1.1.1"
-      sources."string-width-4.2.3"
-      sources."strip-ansi-6.0.1"
-      sources."strip-hex-prefix-1.0.0"
-      sources."supports-color-7.2.0"
-      sources."through-2.3.8"
-      sources."tmp-0.0.33"
-      sources."tough-cookie-2.5.0"
-      sources."tr46-0.0.3"
-      sources."tslib-1.14.1"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
-      sources."type-fest-0.21.3"
-      sources."underscore-1.4.4"
-      sources."undici-types-6.20.0"
-      sources."universalify-2.0.1"
-      sources."untildify-4.0.0"
-      sources."uri-js-4.4.1"
-      sources."utf8-3.0.0"
-      sources."uuid-3.4.0"
-      sources."verror-1.10.0"
-      sources."web3-utils-1.10.4"
-      sources."webidl-conversions-3.0.1"
-      sources."whatwg-url-5.0.0"
-      sources."which-module-2.0.1"
-      sources."wrap-ansi-6.2.0"
-      sources."y18n-4.0.3"
-      sources."yargs-15.4.1"
-      sources."yargs-parser-18.1.3"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Fleek command line utilities";
-      homepage = "https://github.com/fleekhq/fleek-cli#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   forever = nodeEnv.buildNodePackage {
     name = "forever";
     packageName = "forever";

From 12581902ee344c2dac8b1f5de7dc176ab6a31c69 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Fri, 7 Nov 2025 21:59:17 -0500
Subject: [PATCH 6210/6226] nodePackages.lua-fmt: drop

Has critical issues like https://github.com/trixnz/lua-fmt/issues/40
unresolved
---
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/main-programs.nix           |  1 -
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 57 -------------------
 4 files changed, 1 insertion(+), 59 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index a243f6601516..6cdd91a76d8f 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -197,6 +197,7 @@ mapAliases {
   less = pkgs.lessc; # added 2024-06-15
   less-plugin-clean-css = pkgs.lessc.plugins.clean-css; # added 2024-06-15
   lodash = throw "lodash was removed because it provides no executable"; # added 2025-03-18
+  lua-fmt = throw "'lua-fmt' has been removed because it has critical bugs that break formatting"; # Added 2025-11-07
   inherit (pkgs) lv_font_conv; # added 2024-06-28
   manta = pkgs.node-manta; # Added 2023-05-06
   inherit (pkgs) markdown-link-check; # added 2024-06-28
diff --git a/pkgs/development/node-packages/main-programs.nix b/pkgs/development/node-packages/main-programs.nix
index a76a0b724ac8..d14d6c6d4f76 100644
--- a/pkgs/development/node-packages/main-programs.nix
+++ b/pkgs/development/node-packages/main-programs.nix
@@ -25,7 +25,6 @@
   gulp-cli = "gulp";
   jsonlint = "jsonlint";
   localtunnel = "lt";
-  lua-fmt = "luafmt";
   parsoid = "parse.js";
   poor-mans-t-sql-formatter-cli = "sqlformat";
   pulp = "pulp";
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 5f6b001fcaf4..a31bd4338de3 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -54,7 +54,6 @@
 , "live-server"
 , "livedown"
 , "localtunnel"
-, "lua-fmt"
 , "madoko"
 , "mastodon-bot"
 , "mathjax"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index c517d8aad594..1fd49733541d 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -3027,15 +3027,6 @@ let
         sha512 = "cE3+jb9WRlu+uOSAugewNpITJDt1VF8dHOopPO4IABFc3SXYL5WE/+PTz/FCdZRRfIujiWW3n3aMbv1eIGVRWA==";
       };
     };
-    "@types/commander-2.12.5" = {
-      name = "_at_types_slash_commander";
-      packageName = "@types/commander";
-      version = "2.12.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/commander/-/commander-2.12.5.tgz";
-        sha512 = "YXGZ/rz+s57VbzcvEV9fUoXeJlBt5HaKu5iUheiIWNsJs23bz6AnRuRiZBRVBLYyPnixNvVnuzM5pSaxr8Yp/g==";
-      };
-    };
     "@types/concat-stream-2.0.3" = {
       name = "_at_types_slash_concat-stream";
       packageName = "@types/concat-stream";
@@ -3072,15 +3063,6 @@ let
         sha512 = "vIChWdVG3LG1SMxEvI/AK+FWJthlrqlTu7fbrlywTkkaONwk/UAGaULXRlf8vkzFBLVm0zkMdCquhL5aOjhXPQ==";
       };
     };
-    "@types/diff-3.5.8" = {
-      name = "_at_types_slash_diff";
-      packageName = "@types/diff";
-      version = "3.5.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/@types/diff/-/diff-3.5.8.tgz";
-        sha512 = "CZ5vepL87+M8PxRIvJjR181Erahch2w7Jev/XJm+Iot/SOvJh8QqH/N79b+vsKtYF6fFzoPieiiq2c5tzmXR9A==";
-      };
-    };
     "@types/es-aggregate-error-1.0.6" = {
       name = "_at_types_slash_es-aggregate-error";
       packageName = "@types/es-aggregate-error";
@@ -18157,16 +18139,6 @@ let
         sha512 = "jumlc0BIUrS3qJGgIkWZsyfAM7NCWiBcCDhnd+3NNM5KbBmLTgHVfWBcg6W+rLUsIpzpERPsvwUP7CckAQSOoA==";
       };
     };
-    "luaparse-git+https://github.com/oxyc/luaparse#ac42a00ebf4020b8c9d3219e4b0f84bf7ce6e802" = {
-      name = "luaparse";
-      packageName = "luaparse";
-      version = "0.2.1";
-      src = fetchgit {
-        url = "https://github.com/oxyc/luaparse";
-        rev = "ac42a00ebf4020b8c9d3219e4b0f84bf7ce6e802";
-        sha256 = "f813d671f8f8088d70d29f7a7770bdd5ed41ed97240ae9346d7ced0c094ee049";
-      };
-    };
     "lunr-2.3.9" = {
       name = "lunr";
       packageName = "lunr";
@@ -39267,35 +39239,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  lua-fmt = nodeEnv.buildNodePackage {
-    name = "lua-fmt";
-    packageName = "lua-fmt";
-    version = "2.6.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/lua-fmt/-/lua-fmt-2.6.0.tgz";
-      sha512 = "J4D7TK+BhSJ9ePQPpZPlu/aHE3X9ojN+D7DNv1HXZPryBJ74XWVmXpRX+qceXdE15TUsQRCj9w81waVOOFhfWA==";
-    };
-    dependencies = [
-      sources."@types/commander-2.12.5"
-      sources."@types/diff-3.5.8"
-      sources."@types/get-stdin-5.0.1"
-      sources."@types/node-22.13.10"
-      sources."commander-2.20.3"
-      sources."diff-3.5.0"
-      sources."get-stdin-5.0.1"
-      sources."luaparse-git+https://github.com/oxyc/luaparse#ac42a00ebf4020b8c9d3219e4b0f84bf7ce6e802"
-      sources."undici-types-6.20.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Format Lua code";
-      homepage = "https://github.com/trixnz/lua-fmt";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   madoko = nodeEnv.buildNodePackage {
     name = "madoko";
     packageName = "madoko";

From c1fca80784c9b484652decc7468eebc4913dfbf1 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Fri, 7 Nov 2025 22:18:11 -0500
Subject: [PATCH 6211/6226] nodePackages.mastodon-bot: drop

Upstream repo is archived
---
 pkgs/development/node-packages/aliases.nix    |    1 +
 .../node-packages/node-packages.json          |    1 -
 .../node-packages/node-packages.nix           | 1354 -----------------
 pkgs/top-level/aliases.nix                    |    1 +
 pkgs/top-level/all-packages.nix               |    2 -
 5 files changed, 2 insertions(+), 1357 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 6cdd91a76d8f..564ae2e7e67b 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -204,6 +204,7 @@ mapAliases {
   markdownlint-cli = pkgs.markdownlint-cli; # added 2023-07-29
   inherit (pkgs) markdownlint-cli2; # added 2023-08-22
   inherit (pkgs) mathjax-node-cli; # added 2023-11-02
+  mastodon-bot = throw "'mastodon-bot' has been removed because it was archived by upstream in 2021."; # Added 2025-11-07
   mdctl-cli = self."@medable/mdctl-cli"; # added 2023-08-21
   meat = throw "meat was removed because it was abandoned upstream."; # Added 2025-10-20
   inherit (pkgs) mermaid-cli; # added 2023-10-01
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index a31bd4338de3..3bbfa908f887 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -55,7 +55,6 @@
 , "livedown"
 , "localtunnel"
 , "madoko"
-, "mastodon-bot"
 , "mathjax"
 , "multi-file-swagger"
 , "nijs"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 1fd49733541d..5bff2d74950f 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -4125,24 +4125,6 @@ let
         sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==";
       };
     };
-    "acorn-3.3.0" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "3.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz";
-        sha512 = "OLUyIIZ7mF5oaAUT1w0TFqQS81q3saT46x8t7ukpPjMNk+nbs4ZHhs7ToV8EWnLYLepjETXd4XaCE4uxkMeqUw==";
-      };
-    };
-    "acorn-5.7.4" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "5.7.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz";
-        sha512 = "1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg==";
-      };
-    };
     "acorn-6.4.2" = {
       name = "acorn";
       packageName = "acorn";
@@ -4179,15 +4161,6 @@ let
         sha512 = "n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==";
       };
     };
-    "acorn-jsx-3.0.1" = {
-      name = "acorn-jsx";
-      packageName = "acorn-jsx";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-3.0.1.tgz";
-        sha512 = "AU7pnZkguthwBjKgCg6998ByQNIMjbuDQZ8bb78QAFZwPfmKia8AIzgY/gWgqCjnht8JLdXmB4YxA0KaV60ncQ==";
-      };
-    };
     "acorn-jsx-5.3.2" = {
       name = "acorn-jsx";
       packageName = "acorn-jsx";
@@ -4350,15 +4323,6 @@ let
         sha512 = "oQFi0K+TLDpw8vTeDnkX1opLEGPJ03OeT5dKzYqPHf6JjuaYmXoNdc5GQhZDF+IzX8ypWvYZ/NbftabNU02dkA==";
       };
     };
-    "ajv-4.11.8" = {
-      name = "ajv";
-      packageName = "ajv";
-      version = "4.11.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv/-/ajv-4.11.8.tgz";
-        sha512 = "I/bSHSNEcFFqXLf91nchoNB9D1Kie3QKcWdchYUaoIg1+1bdWDkdfdlvdIOJbi9U8xR0y+MWc5D+won9v95WlQ==";
-      };
-    };
     "ajv-6.12.6" = {
       name = "ajv";
       packageName = "ajv";
@@ -4440,15 +4404,6 @@ let
         sha512 = "8iUql50EUR+uUcdRQ3HDqa6EVyo3docL8g5WJ3FNcWmu62IbkGUue/pEyLBW8VGKKucTPgqeks4fIU1DA4yowQ==";
       };
     };
-    "ajv-keywords-1.5.1" = {
-      name = "ajv-keywords";
-      packageName = "ajv-keywords";
-      version = "1.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-1.5.1.tgz";
-        sha512 = "vuBv+fm2s6cqUyey2A7qYcvsik+GMDJsw8BARP2sDE76cqmaZVarsvHf7Vx6VJ0Xk8gLl+u3MoAPf6gKzJefeA==";
-      };
-    };
     "amdefine-1.0.1" = {
       name = "amdefine";
       packageName = "amdefine";
@@ -4476,15 +4431,6 @@ let
         sha512 = "IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==";
       };
     };
-    "ansi-escapes-1.4.0" = {
-      name = "ansi-escapes";
-      packageName = "ansi-escapes";
-      version = "1.4.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-1.4.0.tgz";
-        sha512 = "wiXutNjDUlNEDWHcYH3jtZUhd3c4/VojassD8zHdHCY13xbZy2XbW+NKQwA0tWGBVzDA9qEzYwfoSsWmviidhw==";
-      };
-    };
     "ansi-escapes-3.2.0" = {
       name = "ansi-escapes";
       packageName = "ansi-escapes";
@@ -4530,15 +4476,6 @@ let
         sha512 = "GdYO7a61mR0fOlAsvC9/rIHf7L96sBc6dEWzeOu+KAea5bZyQRPIpojrVoI4AXGJS/ycu/fBTdLrUkA4ODrvjw==";
       };
     };
-    "ansi-gray-0.1.1" = {
-      name = "ansi-gray";
-      packageName = "ansi-gray";
-      version = "0.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-gray/-/ansi-gray-0.1.1.tgz";
-        sha512 = "HrgGIZUl8h2EHuZaU9hTR/cU5nhKxpVE1V6kdGsQ8e4zirElJ5fvtfc8N7Q1oq1aatO275i8pUFUCpNWCAnVWw==";
-      };
-    };
     "ansi-regex-2.1.1" = {
       name = "ansi-regex";
       packageName = "ansi-regex";
@@ -4629,15 +4566,6 @@ let
         sha512 = "bN798gFfQX+viw3R7yrGWRqnrN2oRkEkUjjl4JNn4E8GxxbjtG3FbrEIIY3l8/hrwUwIeCZvi4QuOTP4MErVug==";
       };
     };
-    "ansi-wrap-0.1.0" = {
-      name = "ansi-wrap";
-      packageName = "ansi-wrap";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ansi-wrap/-/ansi-wrap-0.1.0.tgz";
-        sha512 = "ZyznvL8k/FZeQHr2T6LzcJ/+vBApDnMNZvfVFy3At0knswWd6rJ3/0Hhmpu8oqa6C92npmozs890sX9Dl6q+Qw==";
-      };
-    };
     "ansicolors-0.3.2" = {
       name = "ansicolors";
       packageName = "ansicolors";
@@ -4935,15 +4863,6 @@ let
         sha512 = "LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==";
       };
     };
-    "array-differ-1.0.0" = {
-      name = "array-differ";
-      packageName = "array-differ";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-differ/-/array-differ-1.0.0.tgz";
-        sha512 = "LeZY+DZDRnvP7eMuQ6LHfCzUGxAAIViUBliK24P3hWXL6y4SortgR6Nim6xrkfSLlmH0+k+9NYNwVC2s53ZrYQ==";
-      };
-    };
     "array-differ-3.0.0" = {
       name = "array-differ";
       packageName = "array-differ";
@@ -5052,15 +4971,6 @@ let
         sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==";
       };
     };
-    "array-uniq-1.0.3" = {
-      name = "array-uniq";
-      packageName = "array-uniq";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz";
-        sha512 = "MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==";
-      };
-    };
     "array-unique-0.2.1" = {
       name = "array-unique";
       packageName = "array-unique";
@@ -5502,15 +5412,6 @@ let
         sha512 = "OnAYlL5b7LEkALw87fUVafQw5rVR9RjwGd4KUwNQ6DrrNmaVaUCgLipfVlzrPQ4tWOR9P0IXGNOx50jYCCdSJg==";
       };
     };
-    "babel-code-frame-6.26.0" = {
-      name = "babel-code-frame";
-      packageName = "babel-code-frame";
-      version = "6.26.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/babel-code-frame/-/babel-code-frame-6.26.0.tgz";
-        sha512 = "XqYMR2dfdGMW+hd0IUZ2PwK+fGeFkOxZJ0wY+JaQAHzt1Zx8LcvpiZD2NiGkEG8qx0CfkAOr5xt76d1e8vG90g==";
-      };
-    };
     "babybird-0.0.1" = {
       name = "babybird";
       packageName = "babybird";
@@ -5664,15 +5565,6 @@ let
         sha512 = "KDX2CR29o6ZoqpQndcCxFZAtYA1jDMnXU3jmCfzP44g++Cu7AHHtZN/JbrN/MXAg9SLvtQ8XISG+eVD9zH1+Jg==";
       };
     };
-    "beeper-1.1.1" = {
-      name = "beeper";
-      packageName = "beeper";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/beeper/-/beeper-1.1.1.tgz";
-        sha512 = "3vqtKL1N45I5dV0RdssXZG7X6pCqQrWPNOlBPZPrd+QkE2HEhR57Z04m0KtpbsZH73j+a3F8UD1TQnn+ExTvIA==";
-      };
-    };
     "bencode-0.7.0" = {
       name = "bencode";
       packageName = "bencode";
@@ -6375,15 +6267,6 @@ let
         sha512 = "571s0T7nZWK6vB67HI5dyUF7wXiNcfaPPPTl6zYCNApANjIvYJTg7hlud/+cJpdAhS7dVzqMLmfhfHR3rAcOjQ==";
       };
     };
-    "bufferstreams-1.1.3" = {
-      name = "bufferstreams";
-      packageName = "bufferstreams";
-      version = "1.1.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bufferstreams/-/bufferstreams-1.1.3.tgz";
-        sha512 = "HaJnVuslRF4g2kSDeyl++AaVizoitCpL9PglzCYwy0uHHyvWerfvEb8jWmYbF1z4kiVFolGomnxSGl+GUQp2jg==";
-      };
-    };
     "bufferutil-4.0.9" = {
       name = "bufferutil";
       packageName = "bufferutil";
@@ -6627,15 +6510,6 @@ let
         sha512 = "n+21IZC3j06YpCWaxmUy5AnVqhmCIM2bQtqQyy00HJlmStRt6kwDX5F9Z97pqwAB+G/tgSz6q/kUBbNyQzIubw==";
       };
     };
-    "caller-path-0.1.0" = {
-      name = "caller-path";
-      packageName = "caller-path";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/caller-path/-/caller-path-0.1.0.tgz";
-        sha512 = "UJiE1otjXPF5/x+T3zTnSFiTOEmJoGTD9HmBoxnCUwho61a2eSNn/VwtwuIBDAo2SEOv1AJ7ARI5gCmohFLu/g==";
-      };
-    };
     "callsite-1.0.0" = {
       name = "callsite";
       packageName = "callsite";
@@ -6654,15 +6528,6 @@ let
         sha512 = "OqeheDucGKifjQRx524URgV4z4NaKjocGhygTptDea+DLROre4ZEecA4KXDq+P7qlGCohYVNOh3qr+y5XH5Ftg==";
       };
     };
-    "callsites-0.2.0" = {
-      name = "callsites";
-      packageName = "callsites";
-      version = "0.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/callsites/-/callsites-0.2.0.tgz";
-        sha512 = "Zv4Dns9IbXXmPkgRRUjAaJQgfN4xX5p6+RQFhWUqscdvvK2xK/ZL8b3IXIJsj+4sD+f24NwnWy2BY8AJ82JB0A==";
-      };
-    };
     "callsites-3.1.0" = {
       name = "callsites";
       packageName = "callsites";
@@ -7149,15 +7014,6 @@ let
         sha512 = "3Ek9H3X6pj5TgenXYtNWdaBon1tgYCaebd+XPg0keyjEbEfkD4KkmAxkQ/i1vYvxdcT5nscLBfq9VJRmCBcFSw==";
       };
     };
-    "circular-json-0.3.3" = {
-      name = "circular-json";
-      packageName = "circular-json";
-      version = "0.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/circular-json/-/circular-json-0.3.3.tgz";
-        sha512 = "UZK3NBx2Mca+b5LsG7bY183pHWt5Y1xts4P3Pz7ENTwGVnJOUWbRb3ocjvX7hx9tq/yTAdclXm9sZ38gNuem4A==";
-      };
-    };
     "cjs-module-lexer-1.2.3" = {
       name = "cjs-module-lexer";
       packageName = "cjs-module-lexer";
@@ -7239,15 +7095,6 @@ let
         sha512 = "/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==";
       };
     };
-    "cli-cursor-1.0.2" = {
-      name = "cli-cursor";
-      packageName = "cli-cursor";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/cli-cursor/-/cli-cursor-1.0.2.tgz";
-        sha512 = "25tABq090YNKkF6JH7lcwO0zFJTRke4Jcq9iX2nr/Sz0Cjjv4gckmwlW6Ty/aoyFd6z3ysR2hMGC2GFugmBo6A==";
-      };
-    };
     "cli-cursor-2.1.0" = {
       name = "cli-cursor";
       packageName = "cli-cursor";
@@ -7491,15 +7338,6 @@ let
         sha512 = "ROoL94jJH2dUVML2Y/5PEDNaSHgeOdSDicUyS7izcF63G6sTc/FTjLub4b8Il9S8S0beOfYt0TaA5qvFK+w0wA==";
       };
     };
-    "clone-stats-0.0.1" = {
-      name = "clone-stats";
-      packageName = "clone-stats";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/clone-stats/-/clone-stats-0.0.1.tgz";
-        sha512 = "dhUqc57gSMCo6TX85FLfe51eC/s+Im2MLkAgJwfaRRexR2tA4dd3eLEW4L6efzHc2iNorrRRXITifnDLlRrhaA==";
-      };
-    };
     "clsx-2.1.1" = {
       name = "clsx";
       packageName = "clsx";
@@ -8860,15 +8698,6 @@ let
         sha512 = "w8a8nQk9YSCkMmH2wDbFqpH1XMz7l409mSvWnnG6Iu6D0Ydhvq61XASE7QIaA46FxfG2Ag524ZuGgAy2cXPfsw==";
       };
     };
-    "d-1.0.2" = {
-      name = "d";
-      packageName = "d";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/d/-/d-1.0.2.tgz";
-        sha512 = "MOqHvMWF9/9MX6nza0KgvFH4HpMU0EF5uUDXqX/BtxtU8NfB0QzRtJ8Oe/6SuS4kbhyzVJwjd97EA4PKrzJ8bw==";
-      };
-    };
     "d3-array-3.2.4" = {
       name = "d3-array";
       packageName = "d3-array";
@@ -9121,24 +8950,6 @@ let
         sha512 = "39BOQLs9ZjKh0/patS9nrT8wc3ioX3/eA/zgbKNopnF2wCqJEoxywwwElATYvRsXdnOxA/OQeQoFZ3rFjVajhg==";
       };
     };
-    "dateformat-2.2.0" = {
-      name = "dateformat";
-      packageName = "dateformat";
-      version = "2.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/dateformat/-/dateformat-2.2.0.tgz";
-        sha512 = "GODcnWq3YGoTnygPfi02ygEiRxqUxpJwuRHjdhJYuxpcZmDq4rjBiXYmbCCzStxo176ixfLT6i4NPwQooRySnw==";
-      };
-    };
-    "deasync-0.1.20" = {
-      name = "deasync";
-      packageName = "deasync";
-      version = "0.1.20";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/deasync/-/deasync-0.1.20.tgz";
-        sha512 = "E1GI7jMI57hL30OX6Ht/hfQU8DO4AuB9m72WFm4c38GNbUD4Q03//XZaOIHZiY+H1xUaomcot5yk2q/qIZQkGQ==";
-      };
-    };
     "debounce-fn-5.1.2" = {
       name = "debounce-fn";
       packageName = "debounce-fn";
@@ -9364,15 +9175,6 @@ let
         sha512 = "ZIwpnevOurS8bpT4192sqAowWM76JDKSHYzMLty3BZGSswgq6pBaH3DhCSW5xVAZICZyKdOBPjwww5wfgT/6PA==";
       };
     };
-    "deep-extend-0.5.1" = {
-      name = "deep-extend";
-      packageName = "deep-extend";
-      version = "0.5.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz";
-        sha512 = "N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==";
-      };
-    };
     "deep-extend-0.6.0" = {
       name = "deep-extend";
       packageName = "deep-extend";
@@ -9904,15 +9706,6 @@ let
         sha512 = "6GYP/EdzEY50HaOxTVTJ2p+mB5xDHTMJhS+UoGrVyS6VC+iQRh7kZ4FRpUYq6nziby7hPqWhOrFFUFTMUZJJ5w==";
       };
     };
-    "doctrine-2.1.0" = {
-      name = "doctrine";
-      packageName = "doctrine";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz";
-        sha512 = "35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==";
-      };
-    };
     "dom-serializer-0.2.2" = {
       name = "dom-serializer";
       packageName = "dom-serializer";
@@ -10138,15 +9931,6 @@ let
         sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==";
       };
     };
-    "duplexer2-0.0.2" = {
-      name = "duplexer2";
-      packageName = "duplexer2";
-      version = "0.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/duplexer2/-/duplexer2-0.0.2.tgz";
-        sha512 = "+AWBwjGadtksxjOQSFDhPNQbed7icNXApT4+2BNpsXzcCBiInq2H9XW0O8sfHFaPmnQRs7cg/P0fAr2IWQSW0g==";
-      };
-    };
     "duplexer2-0.1.4" = {
       name = "duplexer2";
       packageName = "duplexer2";
@@ -10642,33 +10426,6 @@ let
         sha512 = "X13Q/ZSc+vsO1q600bvNK4bxgXMkHcf//RxCmYDaRY5DAcT+eoXjY5hoAPGMdRnWQjvyLEcyauG3b6hz76LNqg==";
       };
     };
-    "es5-ext-0.10.64" = {
-      name = "es5-ext";
-      packageName = "es5-ext";
-      version = "0.10.64";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.64.tgz";
-        sha512 = "p2snDhiLaXe6dahss1LddxqEm+SkuDvV8dnIQG0MWjyHpcMNfXKPE+/Cc0y+PhxJX3A4xGNeFCj5oc0BUh6deg==";
-      };
-    };
-    "es6-iterator-2.0.3" = {
-      name = "es6-iterator";
-      packageName = "es6-iterator";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz";
-        sha512 = "zw4SRzoUkd+cl+ZoE15A9o1oQd920Bb0iOJMQkQhl3jNc03YqVjAhG7scf9C5KWRU/R13Orf588uCC6525o02g==";
-      };
-    };
-    "es6-map-0.1.5" = {
-      name = "es6-map";
-      packageName = "es6-map";
-      version = "0.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-map/-/es6-map-0.1.5.tgz";
-        sha512 = "mz3UqCh0uPCIqsw1SSAkB/p0rOzF/M0V++vyN7JqlPtSW/VsYgQBvVvqMLmfBuyMzTpLnNqi6JmcSizs4jy19A==";
-      };
-    };
     "es6-promise-3.3.1" = {
       name = "es6-promise";
       packageName = "es6-promise";
@@ -10696,33 +10453,6 @@ let
         sha512 = "C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==";
       };
     };
-    "es6-set-0.1.6" = {
-      name = "es6-set";
-      packageName = "es6-set";
-      version = "0.1.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-set/-/es6-set-0.1.6.tgz";
-        sha512 = "TE3LgGLDIBX332jq3ypv6bcOpkLO0AslAQo7p2VqX/1N46YNsvIWgvjojjSEnWEGWMhr1qUbYeTSir5J6mFHOw==";
-      };
-    };
-    "es6-symbol-3.1.4" = {
-      name = "es6-symbol";
-      packageName = "es6-symbol";
-      version = "3.1.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.4.tgz";
-        sha512 = "U9bFFjX8tFiATgtkJ1zg25+KviIXpgRvRHS8sau3GfhVzThRQrOeksPeT0BWW2MNZs1OEWJ1DPXOQMn0KKRkvg==";
-      };
-    };
-    "es6-weak-map-2.0.3" = {
-      name = "es6-weak-map";
-      packageName = "es6-weak-map";
-      version = "2.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-2.0.3.tgz";
-        sha512 = "p5um32HOTO1kP+w7PRnB+5lQ43Z6muuMuIMffvDN8ZB4GcnjLBV6zGStpbASIMk4DCAvEaamhe2zhyCb/QXXsA==";
-      };
-    };
     "esbuild-0.14.47" = {
       name = "esbuild";
       packageName = "esbuild";
@@ -11029,24 +10759,6 @@ let
         sha512 = "2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==";
       };
     };
-    "escope-3.6.0" = {
-      name = "escope";
-      packageName = "escope";
-      version = "3.6.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/escope/-/escope-3.6.0.tgz";
-        sha512 = "75IUQsusDdalQEW/G/2esa87J7raqdJF+Ca0/Xm5C3Q58Nr4yVYjZGp/P1+2xiEVgXRrA39dpRb8LcshajbqDQ==";
-      };
-    };
-    "eslint-3.19.0" = {
-      name = "eslint";
-      packageName = "eslint";
-      version = "3.19.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/eslint/-/eslint-3.19.0.tgz";
-        sha512 = "x6LJGXWCGB/4YOBhL48yeppZTo+YQUNC37N5qqCpC1b1kkNzydlQHQAtPuUSFoZSxgIadrysQoW2Hq602P+uEA==";
-      };
-    };
     "eslint-9.22.0" = {
       name = "eslint";
       packageName = "eslint";
@@ -11110,15 +10822,6 @@ let
         sha512 = "Epxrv+Nr/CaL4ZcFGPJIYLWFom+YeV1DqMLHJoEd9SYRxNbaFruBwfEX/kkHUJf55j2+TUbmDcmuilbP1TmXHA==";
       };
     };
-    "esniff-2.0.1" = {
-      name = "esniff";
-      packageName = "esniff";
-      version = "2.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/esniff/-/esniff-2.0.1.tgz";
-        sha512 = "kTUIGKQ/mDPFoJ0oVfcmyJn4iBDRptjNVIzwIFR7tqWXdVI9xfA2RMwY/gbSpJG3lkdWNEjLap/NqVHZiJsdfg==";
-      };
-    };
     "espree-10.3.0" = {
       name = "espree";
       packageName = "espree";
@@ -11128,15 +10831,6 @@ let
         sha512 = "0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==";
       };
     };
-    "espree-3.5.4" = {
-      name = "espree";
-      packageName = "espree";
-      version = "3.5.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/espree/-/espree-3.5.4.tgz";
-        sha512 = "yAcIQxtmMiB/jL32dzEp2enBeidsB7xWPLNiw3IIkpVds1P+h7qF9YwJq1yUNzp2OKXgAprs4F61ih66UsoD1A==";
-      };
-    };
     "esprima-4.0.1" = {
       name = "esprima";
       packageName = "esprima";
@@ -11173,15 +10867,6 @@ let
         sha512 = "KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==";
       };
     };
-    "estraverse-4.3.0" = {
-      name = "estraverse";
-      packageName = "estraverse";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz";
-        sha512 = "39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==";
-      };
-    };
     "estraverse-5.3.0" = {
       name = "estraverse";
       packageName = "estraverse";
@@ -11236,15 +10921,6 @@ let
         sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==";
       };
     };
-    "event-emitter-0.3.5" = {
-      name = "event-emitter";
-      packageName = "event-emitter";
-      version = "0.3.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz";
-        sha512 = "D9rRn9y7kLPnJ+hMq7S/nhvoKwwvVJahBi2BPmx3bvbsEdK3W9ii8cBSGjP+72/LnM4n6fo3+dkCX5FeTQruXA==";
-      };
-    };
     "event-stream-3.1.7" = {
       name = "event-stream";
       packageName = "event-stream";
@@ -11407,15 +11083,6 @@ let
         sha512 = "c2bQfLNbMzLPmzQuOr8fy0csy84WmwnER81W88DzTp9CYNPJ6yzOj2EZAh9pywYpqHnshVLHQJ8WzldAyfY+Iw==";
       };
     };
-    "exit-hook-1.1.1" = {
-      name = "exit-hook";
-      packageName = "exit-hook";
-      version = "1.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/exit-hook/-/exit-hook-1.1.1.tgz";
-        sha512 = "MsG3prOVw1WtLXAZbM3KiYtooKR1LvxHh3VHsVtIy0uiUu8usxgB/94DP2HxtD/661lLdB6yzQ09lGJSQr6nkg==";
-      };
-    };
     "exit-hook-4.0.0" = {
       name = "exit-hook";
       packageName = "exit-hook";
@@ -11497,15 +11164,6 @@ let
         sha512 = "7QlaXnSREMmN5P2o4gmpUZDfJlLtfBka9d6r7/ccXaU7rPp76odw9YYtwZYdIiha2JqwiaG6o2Wu6NZJQ0u7Fg==";
       };
     };
-    "ext-1.7.0" = {
-      name = "ext";
-      packageName = "ext";
-      version = "1.7.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ext/-/ext-1.7.0.tgz";
-        sha512 = "6hxeJYaL110a9b5TEJSj0gojyHQAmA2ch5Os+ySCiA1QGdS697XWY1pzsrSjqA9LDEEgdB/KypIlR59RcLuHYw==";
-      };
-    };
     "extend-3.0.2" = {
       name = "extend";
       packageName = "extend";
@@ -11632,15 +11290,6 @@ let
         sha512 = "GipyPsXO1anza0AOZdy69Im7hGFCNB7Y/NGjDlZGJ3GJJLtwNSb2vrzYrTYJRrRloVx7pl+bhUaTB8yiccPvFQ==";
       };
     };
-    "fancy-log-1.3.3" = {
-      name = "fancy-log";
-      packageName = "fancy-log";
-      version = "1.3.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/fancy-log/-/fancy-log-1.3.3.tgz";
-        sha512 = "k9oEhlyc0FrVh25qYuSELjr8oxsCoc4/LEZfg2iJJrfEk/tZL9bCoJE47gqAvI2m/AUjluCS4+3I0eTx8n3AEw==";
-      };
-    };
     "fast-csv-4.3.6" = {
       name = "fast-csv";
       packageName = "fast-csv";
@@ -11911,15 +11560,6 @@ let
         sha512 = "d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==";
       };
     };
-    "file-entry-cache-2.0.0" = {
-      name = "file-entry-cache";
-      packageName = "file-entry-cache";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-2.0.0.tgz";
-        sha512 = "uXP/zGzxxFvFfcZGgBIwotm+Tdc55ddPAzF7iHshP4YGaXMww7rSF9peD9D1sui5ebONg5UobsZv+FfgEpGv/w==";
-      };
-    };
     "file-entry-cache-8.0.0" = {
       name = "file-entry-cache";
       packageName = "file-entry-cache";
@@ -12226,15 +11866,6 @@ let
         sha512 = "Gq/a6YCi8zexmGHMuJwahTGzXlAZAOsbCVKduWXC6TlLCjjFRlExMJc4GC2NYPYZ0r/brw9P7CpRgQmlPVeOoA==";
       };
     };
-    "flat-cache-1.3.4" = {
-      name = "flat-cache";
-      packageName = "flat-cache";
-      version = "1.3.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/flat-cache/-/flat-cache-1.3.4.tgz";
-        sha512 = "VwyB3Lkgacfik2vhqR4uv2rvebqmDvFu4jlN/C1RzWoJEo8I7z4Q404oiqYCkq41mni8EzQnm95emU9seckwtg==";
-      };
-    };
     "flat-cache-4.0.1" = {
       name = "flat-cache";
       packageName = "flat-cache";
@@ -12694,24 +12325,6 @@ let
         sha512 = "vli3D2RYpLW6XhryNrv7HMjFNbj+ks/CCVDjokxOtZ+p6QYRadj8Zc0ps+LolSsh/I97XO0OduP/ShOej08clA==";
       };
     };
-    "generate-function-2.3.1" = {
-      name = "generate-function";
-      packageName = "generate-function";
-      version = "2.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/generate-function/-/generate-function-2.3.1.tgz";
-        sha512 = "eeB5GfMNeevm/GRYq20ShmsaGcmI81kIX2K9XQx5miC8KdHaC6Jm0qQ8ZNeGOi7wYB8OsdxKs+Y2oVuTFuVwKQ==";
-      };
-    };
-    "generate-object-property-1.2.0" = {
-      name = "generate-object-property";
-      packageName = "generate-object-property";
-      version = "1.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz";
-        sha512 = "TuOwZWgJ2VAMEGJvAyPWvpqxSANF0LDpmyHauMjFYzaACvn+QTT/AZomvPCzVBV7yDN3OmwHQ5OvHaeLKre3JQ==";
-      };
-    };
     "generic-pool-3.4.2" = {
       name = "generic-pool";
       packageName = "generic-pool";
@@ -13243,15 +12856,6 @@ let
         sha512 = "oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==";
       };
     };
-    "globals-9.18.0" = {
-      name = "globals";
-      packageName = "globals";
-      version = "9.18.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/globals/-/globals-9.18.0.tgz";
-        sha512 = "S0nG3CLEQiY/ILxqtztTWH/3iRRdyBLw6KMDxnKMchrtbj2OFmehVh0WUCfW3DUrIgx/qFrJPICrq4Z4sTR9UQ==";
-      };
-    };
     "globby-11.1.0" = {
       name = "globby";
       packageName = "globby";
@@ -13288,15 +12892,6 @@ let
         sha512 = "OPTIfhMBh7JbBYDpa5b+Q5ptmMWKwcNcFSR/0c6t8V4f3ZAVBEsKNY37QdVqmLRYSMhOUGYrY0QhSoEpzGr/Eg==";
       };
     };
-    "glogg-1.0.2" = {
-      name = "glogg";
-      packageName = "glogg";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/glogg/-/glogg-1.0.2.tgz";
-        sha512 = "5mwUoSuBk44Y4EshyiqcH95ZntbDdTQqA3QYSrxmzj28Ai0vXBGMH1ApSANH14j2sIRtqCEyg6PfsuP7ElOEDA==";
-      };
-    };
     "glogg-2.2.0" = {
       name = "glogg";
       packageName = "glogg";
@@ -13423,33 +13018,6 @@ let
         sha512 = "GD7cTz0I4SAede1/+pAbmJRG44zFLPipVtdL9o3vqx9IEyb7b4/Y3s7r6ofI3CchR5GvYJ+8buCSioDv5dQLiA==";
       };
     };
-    "gulp-eslint-3.0.1" = {
-      name = "gulp-eslint";
-      packageName = "gulp-eslint";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gulp-eslint/-/gulp-eslint-3.0.1.tgz";
-        sha512 = "lNEEIgxKyzbjlq/kDfdS06KI+rEhfnWGd6xbMaiCP20jF5sZ/quQsuK7LZRMnQrAuUQ6MbyuYWamtgGp65440Q==";
-      };
-    };
-    "gulp-util-3.0.8" = {
-      name = "gulp-util";
-      packageName = "gulp-util";
-      version = "3.0.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gulp-util/-/gulp-util-3.0.8.tgz";
-        sha512 = "q5oWPc12lwSFS9h/4VIjG+1NuNDlJ48ywV2JKItY4Ycc/n1fXJeYPVQsfu5ZrhQi7FGSDBalwUCLar/GyHXKGw==";
-      };
-    };
-    "gulplog-1.0.0" = {
-      name = "gulplog";
-      packageName = "gulplog";
-      version = "1.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/gulplog/-/gulplog-1.0.0.tgz";
-        sha512 = "hm6N8nrm3Y08jXie48jsC55eCZz9mnb4OirAStEk2deqeyhXU3C1otDVh+ccttMuc1sBi6RX6ZJ720hs9RCvgw==";
-      };
-    };
     "gulplog-2.2.0" = {
       name = "gulplog";
       packageName = "gulplog";
@@ -13576,15 +13144,6 @@ let
         sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==";
       };
     };
-    "has-gulplog-0.1.0" = {
-      name = "has-gulplog";
-      packageName = "has-gulplog";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/has-gulplog/-/has-gulplog-0.1.0.tgz";
-        sha512 = "+F4GzLjwHNNDEAJW2DC1xXfEoPkRDmUdJ7CBYw4MpqtDwOnqdImJl7GWlpqx+Wko6//J8uKTnIe4wZSv7yCqmw==";
-      };
-    };
     "has-own-prop-2.0.0" = {
       name = "has-own-prop";
       packageName = "has-own-prop";
@@ -14323,15 +13882,6 @@ let
         sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==";
       };
     };
-    "ignore-3.3.10" = {
-      name = "ignore";
-      packageName = "ignore";
-      version = "3.3.10";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz";
-        sha512 = "Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==";
-      };
-    };
     "ignore-5.1.9" = {
       name = "ignore";
       packageName = "ignore";
@@ -14746,15 +14296,6 @@ let
         sha512 = "ZC410b7IbrTrmt8bQb27xUOJgXkJu+XL6MVncb9FGyxjRIHyQqNjpSDY20zvSUttkAiYj0dait/67/sXyWvwYg==";
       };
     };
-    "inquirer-0.12.0" = {
-      name = "inquirer";
-      packageName = "inquirer";
-      version = "0.12.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/inquirer/-/inquirer-0.12.0.tgz";
-        sha512 = "bOetEz5+/WpgaW4D1NYOk1aD+JCqRjqu/FwRFgnIfiP7FC/zinsrfyO1vlS3nyH/R7S0IH3BIHBu4DBIDSqiGQ==";
-      };
-    };
     "inquirer-12.4.3" = {
       name = "inquirer";
       packageName = "inquirer";
@@ -15448,24 +14989,6 @@ let
         sha512 = "1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==";
       };
     };
-    "is-my-ip-valid-1.0.1" = {
-      name = "is-my-ip-valid";
-      packageName = "is-my-ip-valid";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.1.tgz";
-        sha512 = "jxc8cBcOWbNK2i2aTkCZP6i7wkHF1bqKFrwEHuN5Jtg5BSaZHUZQ/JTOJwoV41YvHnOaRyWWh72T/KvfNz9DJg==";
-      };
-    };
-    "is-my-json-valid-2.20.6" = {
-      name = "is-my-json-valid";
-      packageName = "is-my-json-valid";
-      version = "2.20.6";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.20.6.tgz";
-        sha512 = "1JQwulVNjx8UqkPE/bqDaxtH4PXCe/2VRh/y3p99heOV87HG4Id5/VfDswd+YiAfHcRTfDlWgISycnHuhZq1aw==";
-      };
-    };
     "is-natural-number-4.0.1" = {
       name = "is-natural-number";
       packageName = "is-natural-number";
@@ -15691,15 +15214,6 @@ let
         sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==";
       };
     };
-    "is-property-1.0.2" = {
-      name = "is-property";
-      packageName = "is-property";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz";
-        sha512 = "Ks/IoX00TtClbGQr4TWXemAnktAQvYB7HzcCxDGqEZU6oCmb2INHuOoKxbtR+HFkmYWBKv/dOZtGRiAjDhj92g==";
-      };
-    };
     "is-redirect-1.0.0" = {
       name = "is-redirect";
       packageName = "is-redirect";
@@ -15736,15 +15250,6 @@ let
         sha512 = "Kw/ReK0iqwKeu0MITLFuj0jbPAmEiOsIwyIXvvbfa6QfmN9pkD1M+8pdk7Rl/dTKbH34/XBFMbgD4iMJhLQbGA==";
       };
     };
-    "is-resolvable-1.1.0" = {
-      name = "is-resolvable";
-      packageName = "is-resolvable";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/is-resolvable/-/is-resolvable-1.1.0.tgz";
-        sha512 = "qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==";
-      };
-    };
     "is-retry-allowed-1.2.0" = {
       name = "is-retry-allowed";
       packageName = "is-retry-allowed";
@@ -16537,15 +16042,6 @@ let
         sha512 = "nKtD/Qxm7tWdZqJoldEC7fF0S41v0mWbeaXG3637stOWfyGxTgWTYE2wtfKmjzpvxv2MA2xzxsXOIiwUpkX6Qw==";
       };
     };
-    "json-stable-stringify-1.2.1" = {
-      name = "json-stable-stringify";
-      packageName = "json-stable-stringify";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.2.1.tgz";
-        sha512 = "Lp6HbbBgosLmJbjx0pBLbgvx68FaFU1sdkmBuckmhhJ88kL13OA51CDtR2yJB50eCNMH9wRqtQNNiAqQH4YXnA==";
-      };
-    };
     "json-stable-stringify-without-jsonify-1.0.1" = {
       name = "json-stable-stringify-without-jsonify";
       packageName = "json-stable-stringify-without-jsonify";
@@ -16672,15 +16168,6 @@ let
         sha512 = "8TNmfeTCk2Le33A3vRRwtuworG/L5RrgMvdjhKZxvyShO+mBu2fP50OWUjRLNtvw344DdDarFh9buFAZs5ujeA==";
       };
     };
-    "jsonpointer-5.0.1" = {
-      name = "jsonpointer";
-      packageName = "jsonpointer";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/jsonpointer/-/jsonpointer-5.0.1.tgz";
-        sha512 = "p/nXbhSEcu3pZRdkW1OfJhpsVtW1gd4Wa1fnQc9YLiTfAjn0312eMKimbdIQzuZl9aa9xUGaRlP9T/CJE/ditQ==";
-      };
-    };
     "jsonschema-1.5.0" = {
       name = "jsonschema";
       packageName = "jsonschema";
@@ -17023,15 +16510,6 @@ let
         sha512 = "qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==";
       };
     };
-    "levn-0.3.0" = {
-      name = "levn";
-      packageName = "levn";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz";
-        sha512 = "0OO4y2iOHix2W6ujICbKIaEQXvFQHue65vUG3pb5EUomzPI90z9hsA1VsO/dbIIpC53J8gxM9Q4Oho0jrCM/yA==";
-      };
-    };
     "levn-0.4.1" = {
       name = "levn";
       packageName = "levn";
@@ -17311,15 +16789,6 @@ let
         sha512 = "v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==";
       };
     };
-    "lodash._basecopy-3.0.1" = {
-      name = "lodash._basecopy";
-      packageName = "lodash._basecopy";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz";
-        sha512 = "rFR6Vpm4HeCK1WPGvjZSJ+7yik8d8PVUdCJx5rT2pogG4Ve/2ZS7kfmO5l5T2o5V2mqlNIfSF5MZlr1+xOoYQQ==";
-      };
-    };
     "lodash._baseiteratee-4.7.0" = {
       name = "lodash._baseiteratee";
       packageName = "lodash._baseiteratee";
@@ -17329,15 +16798,6 @@ let
         sha512 = "nqB9M+wITz0BX/Q2xg6fQ8mLkyfF7MU7eE+MNBNjTHFKeKaZAPEzEg+E8LWxKWf1DQVflNEn9N49yAuqKh2mWQ==";
       };
     };
-    "lodash._basetostring-3.0.1" = {
-      name = "lodash._basetostring";
-      packageName = "lodash._basetostring";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._basetostring/-/lodash._basetostring-3.0.1.tgz";
-        sha512 = "mTzAr1aNAv/i7W43vOR/uD/aJ4ngbtsRaCubp2BfZhlGU/eORUjg/7F6X0orNMdv33JOrdgGybtvMN/po3EWrA==";
-      };
-    };
     "lodash._basetostring-4.12.0" = {
       name = "lodash._basetostring";
       packageName = "lodash._basetostring";
@@ -17356,15 +16816,6 @@ let
         sha512 = "Ja1YevpHZctlI5beLA7oc5KNDhGcPixFhcqSiORHNsp/1QTv7amAXzw+gu4YOvErqVlMVyIJGgtzeepCnnur0A==";
       };
     };
-    "lodash._basevalues-3.0.0" = {
-      name = "lodash._basevalues";
-      packageName = "lodash._basevalues";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._basevalues/-/lodash._basevalues-3.0.0.tgz";
-        sha512 = "H94wl5P13uEqlCg7OcNNhMQ8KvWSIyqXzOPusRgHC9DK3o54P6P3xtbXlVbRABG4q5gSmp7EDdJ0MSuW9HX6Mg==";
-      };
-    };
     "lodash._createset-4.0.3" = {
       name = "lodash._createset";
       packageName = "lodash._createset";
@@ -17374,42 +16825,6 @@ let
         sha512 = "GTkC6YMprrJZCYU3zcqZj+jkXkrXzq3IPBcF/fIPpNEAB4hZEtXU8zp/RwKOvZl43NUmwDbyRk3+ZTbeRdEBXA==";
       };
     };
-    "lodash._getnative-3.9.1" = {
-      name = "lodash._getnative";
-      packageName = "lodash._getnative";
-      version = "3.9.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz";
-        sha512 = "RrL9VxMEPyDMHOd9uFbvMe8X55X16/cGM5IgOKgRElQZutpX89iS6vwl64duTV1/16w5JY7tuFNXqoekmh1EmA==";
-      };
-    };
-    "lodash._isiterateecall-3.0.9" = {
-      name = "lodash._isiterateecall";
-      packageName = "lodash._isiterateecall";
-      version = "3.0.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz";
-        sha512 = "De+ZbrMu6eThFti/CSzhRvTKMgQToLxbij58LMfM8JnYDNSOjkjTCIaa8ixglOeGh2nyPlakbt5bJWJ7gvpYlQ==";
-      };
-    };
-    "lodash._reescape-3.0.0" = {
-      name = "lodash._reescape";
-      packageName = "lodash._reescape";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._reescape/-/lodash._reescape-3.0.0.tgz";
-        sha512 = "Sjlavm5y+FUVIF3vF3B75GyXrzsfYV8Dlv3L4mEpuB9leg8N6yf/7rU06iLPx9fY0Mv3khVp9p7Dx0mGV6V5OQ==";
-      };
-    };
-    "lodash._reevaluate-3.0.0" = {
-      name = "lodash._reevaluate";
-      packageName = "lodash._reevaluate";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._reevaluate/-/lodash._reevaluate-3.0.0.tgz";
-        sha512 = "OrPwdDc65iJiBeUe5n/LIjd7Viy99bKwDdk7Z5ljfZg0uFRFlfQaCy9tZ4YMAag9WAZmlVpe1iZrkIMMSMHD3w==";
-      };
-    };
     "lodash._reinterpolate-3.0.0" = {
       name = "lodash._reinterpolate";
       packageName = "lodash._reinterpolate";
@@ -17419,15 +16834,6 @@ let
         sha512 = "xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA==";
       };
     };
-    "lodash._root-3.0.1" = {
-      name = "lodash._root";
-      packageName = "lodash._root";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash._root/-/lodash._root-3.0.1.tgz";
-        sha512 = "O0pWuFSK6x4EXhM1dhZ8gchNtG7JMqBtrHdoUFUWXD7dJnNSUze1GuyQr5sOs0aCvgGeI3o/OJW8f4ca7FDxmQ==";
-      };
-    };
     "lodash._stringtopath-4.8.0" = {
       name = "lodash._stringtopath";
       packageName = "lodash._stringtopath";
@@ -17491,15 +16897,6 @@ let
         sha512 = "dS2j+W26TQ7taQBGN8Lbbq04ssV3emRw4NY58WErlTO29pIqS0HmoT5aJ9+TUQ1N3G+JOZSji4eugsWwGp9yPA==";
       };
     };
-    "lodash.escape-3.2.0" = {
-      name = "lodash.escape";
-      packageName = "lodash.escape";
-      version = "3.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.escape/-/lodash.escape-3.2.0.tgz";
-        sha512 = "n1PZMXgaaDWZDSvuNZ/8XOcYO2hOKDqZel5adtR30VKQAtoWs/5AOeFA0vPV8moiPzlqe7F4cP2tzpFewQyelQ==";
-      };
-    };
     "lodash.escaperegexp-4.1.2" = {
       name = "lodash.escaperegexp";
       packageName = "lodash.escaperegexp";
@@ -17536,24 +16933,6 @@ let
         sha512 = "W3Bx6mdkRTGtlJISOvVD/lbqjTlPPUDTMnlXZFnVwi9NKJ6tiAk6LVdlhZMm17VZisqhKcgzpO5Wz91PCt5b0w==";
       };
     };
-    "lodash.isarguments-3.1.0" = {
-      name = "lodash.isarguments";
-      packageName = "lodash.isarguments";
-      version = "3.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz";
-        sha512 = "chi4NHZlZqZD18a0imDHnZPrDeBbTtVN7GXMwuGdRH9qotxAjYs3aVLKc7zNOG9eddR5Ksd8rvFEBc9SsggPpg==";
-      };
-    };
-    "lodash.isarray-3.0.4" = {
-      name = "lodash.isarray";
-      packageName = "lodash.isarray";
-      version = "3.0.4";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz";
-        sha512 = "JwObCrNJuT0Nnbuecmqr5DgtuBppuCvGD9lxjFpAzwnVtdGoDQ1zig+5W8k5/6Gcn0gZ3936HDAlGd28i7sOGQ==";
-      };
-    };
     "lodash.isboolean-3.0.3" = {
       name = "lodash.isboolean";
       packageName = "lodash.isboolean";
@@ -17671,15 +17050,6 @@ let
         sha512 = "N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==";
       };
     };
-    "lodash.keys-3.1.2" = {
-      name = "lodash.keys";
-      packageName = "lodash.keys";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz";
-        sha512 = "CuBsapFjcubOGMn3VD+24HOAPxM79tH+V6ivJL3CHYjtrawauDJHUk//Yew9Hvc6e9rbCrURGk8z6PC+8WJBfQ==";
-      };
-    };
     "lodash.memoize-3.0.4" = {
       name = "lodash.memoize";
       packageName = "lodash.memoize";
@@ -17725,15 +17095,6 @@ let
         sha512 = "Sb487aTOCr9drQVL8pIxOzVhafOjZN9UU54hiN8PU3uAiSV7lx1yYNpbNmex2PK6dSJoNTSJUUswT651yww3Mg==";
       };
     };
-    "lodash.restparam-3.6.1" = {
-      name = "lodash.restparam";
-      packageName = "lodash.restparam";
-      version = "3.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.restparam/-/lodash.restparam-3.6.1.tgz";
-        sha512 = "L4/arjjuq4noiUJpt3yS6KIKDtJwNe2fIYgMqyYYKoeIfV1iEqvPwhCx23o+R9dzouGihDAPN1dTIRWa7zk8tw==";
-      };
-    };
     "lodash.snakecase-4.1.1" = {
       name = "lodash.snakecase";
       packageName = "lodash.snakecase";
@@ -17752,15 +17113,6 @@ let
         sha512 = "+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==";
       };
     };
-    "lodash.template-3.6.2" = {
-      name = "lodash.template";
-      packageName = "lodash.template";
-      version = "3.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.template/-/lodash.template-3.6.2.tgz";
-        sha512 = "0B4Y53I0OgHUJkt+7RmlDFWKjVAI/YUpWNiL9GQz5ORDr4ttgfQGo+phBWKFLJbBdtOwgMuUkdOHOnPg45jKmQ==";
-      };
-    };
     "lodash.template-4.5.0" = {
       name = "lodash.template";
       packageName = "lodash.template";
@@ -17770,15 +17122,6 @@ let
         sha512 = "84vYFxIkmidUiFxidA/KjjH9pAycqW+h980j7Fuz5qxRtO9pgB7MDFTdys1N7A5mcucRiDyEq4fusljItR1T/A==";
       };
     };
-    "lodash.templatesettings-3.1.1" = {
-      name = "lodash.templatesettings";
-      packageName = "lodash.templatesettings";
-      version = "3.1.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/lodash.templatesettings/-/lodash.templatesettings-3.1.1.tgz";
-        sha512 = "TcrlEr31tDYnWkHFWDCV3dHYroKEXpJZ2YJYvJdhN+y4AkWMDZ5I4I8XDtUKqSAyG81N7w+I1mFEJtcED+tGqQ==";
-      };
-    };
     "lodash.templatesettings-4.2.0" = {
       name = "lodash.templatesettings";
       packageName = "lodash.templatesettings";
@@ -18364,15 +17707,6 @@ let
         sha512 = "PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==";
       };
     };
-    "mastodon-api-1.3.0" = {
-      name = "mastodon-api";
-      packageName = "mastodon-api";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mastodon-api/-/mastodon-api-1.3.0.tgz";
-        sha512 = "h1S0f3HzPtaNTaIBXu/3PVsXhKgZGk9DYrqp+bNZwp1wjYhJnEKggossj+DCCQ72+2y3Kcd7fNP2cEkp9jK6Ig==";
-      };
-    };
     "math-intrinsics-1.1.0" = {
       name = "math-intrinsics";
       packageName = "math-intrinsics";
@@ -20020,15 +19354,6 @@ let
         sha512 = "Ak6EUJZuhGS8hJ3c2fY6UW5MbkGUPMBEGd13djUzoY/BHqV/gTuFWtC6IuVA7A2+v3yjBS6c4or50xhzTQZImQ==";
       };
     };
-    "multipipe-0.1.2" = {
-      name = "multipipe";
-      packageName = "multipipe";
-      version = "0.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/multipipe/-/multipipe-0.1.2.tgz";
-        sha512 = "7ZxrUybYv9NonoXgwoOqtStIu18D1c3eFZj27hqgf5kBrBF8Q+tE8V0MW8dKM5QLkQPh1JhhbKgHLY9kifov4Q==";
-      };
-    };
     "mute-stdout-2.0.0" = {
       name = "mute-stdout";
       packageName = "mute-stdout";
@@ -20038,15 +19363,6 @@ let
         sha512 = "32GSKM3Wyc8dg/p39lWPKYu8zci9mJFzV1Np9Of0ZEpe6Fhssn/FbI7ywAMd40uX+p3ZKh3T5EeCFv81qS3HmQ==";
       };
     };
-    "mute-stream-0.0.5" = {
-      name = "mute-stream";
-      packageName = "mute-stream";
-      version = "0.0.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.5.tgz";
-        sha512 = "EbrziT4s8cWPmzr47eYVW3wimS4HsvlnV5ri1xw1aR6JQo/OrJX5rkl32K/QQHdxeabJETtfeaROGhd8W7uBgg==";
-      };
-    };
     "mute-stream-0.0.7" = {
       name = "mute-stream";
       packageName = "mute-stream";
@@ -20309,15 +19625,6 @@ let
         sha512 = "+I10J3wKNoKddNxn0CNpoZ3eTZuqxjNM3b1GImVx22+ePI+Y15P8g/j3WsbP0fhzzrFzrtjOAoq5NCCucswXOQ==";
       };
     };
-    "next-tick-1.1.0" = {
-      name = "next-tick";
-      packageName = "next-tick";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/next-tick/-/next-tick-1.1.0.tgz";
-        sha512 = "CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ==";
-      };
-    };
     "nice-try-1.0.5" = {
       name = "nice-try";
       packageName = "nice-try";
@@ -20417,15 +19724,6 @@ let
         sha512 = "AGK2yQKIjRuqnc6VkX2Xj5d+QW8xZ87pa1UK6yA6ouUyuxfHuMP6umE5QK7UmTeOAymo+Zx1Fxiuw9rVx8taHQ==";
       };
     };
-    "node-addon-api-1.7.2" = {
-      name = "node-addon-api";
-      packageName = "node-addon-api";
-      version = "1.7.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.2.tgz";
-        sha512 = "ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg==";
-      };
-    };
     "node-addon-api-4.3.0" = {
       name = "node-addon-api";
       packageName = "node-addon-api";
@@ -20462,15 +19760,6 @@ let
         sha512 = "wo2DpQkQp7Sjm2A0cq+sN7EHKO6Sl0ctXeBdFZrL9T9+UywORbufTcTZxom8YqpLQt/FqNMUkOpkZrJVYSKD3A==";
       };
     };
-    "node-fetch-2.6.1" = {
-      name = "node-fetch";
-      packageName = "node-fetch";
-      version = "2.6.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.1.tgz";
-        sha512 = "V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==";
-      };
-    };
     "node-fetch-2.6.7" = {
       name = "node-fetch";
       packageName = "node-fetch";
@@ -21002,15 +20291,6 @@ let
         sha512 = "cu20/HE5N5HKqVygs3dt94eYJfBi0TsZvPVXDhbXQHiEityDN+RROTleefoKRKKJ9dFAF2JBkDHgvWj0sjKGmw==";
       };
     };
-    "oauth-0.9.15" = {
-      name = "oauth";
-      packageName = "oauth";
-      version = "0.9.15";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/oauth/-/oauth-0.9.15.tgz";
-        sha512 = "a5ERWK1kh38ExDEfoO6qUHJb32rd7aYmPHuyCu3Fta/cnICvYmgd2uhuKXvPD+PXB+gCEYYEaQdIRAjCOwAKNA==";
-      };
-    };
     "oauth-sign-0.9.0" = {
       name = "oauth-sign";
       packageName = "oauth-sign";
@@ -21020,15 +20300,6 @@ let
         sha512 = "fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==";
       };
     };
-    "object-assign-3.0.0" = {
-      name = "object-assign";
-      packageName = "object-assign";
-      version = "3.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/object-assign/-/object-assign-3.0.0.tgz";
-        sha512 = "jHP15vXVGeVh1HuaA2wY6lxk+whK/x4KBG88VXeRma7CCun7iGD5qPc4eYykQ9sdQvg8jkwFKsSxHln2ybW3xQ==";
-      };
-    };
     "object-assign-4.1.1" = {
       name = "object-assign";
       packageName = "object-assign";
@@ -21236,15 +20507,6 @@ let
         sha512 = "5DXOiRKwuSEcQ/l0kGCF6Q3jcADFv5tSmRaJck/OqkVFcOzutB134KRSfF0xDrL39MNnqxbHBbUUcjZIhTgb2g==";
       };
     };
-    "onetime-1.1.0" = {
-      name = "onetime";
-      packageName = "onetime";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/onetime/-/onetime-1.1.0.tgz";
-        sha512 = "GZ+g4jayMqzCRMgB2sol7GiCLjKfS1PINkjmx8spcKce1LiVqcbQreXwqs2YAFXC6R03VIG28ZS31t8M866v6A==";
-      };
-    };
     "onetime-2.0.1" = {
       name = "onetime";
       packageName = "onetime";
@@ -21416,15 +20678,6 @@ let
         sha512 = "snN4O4TkigujZphWLN0E//nQmm7790RYaE53DdL7ZYwee2D8DDo9/EyYiKUfN3rneWUjhJnueija3G9I2i0h3g==";
       };
     };
-    "optionator-0.8.3" = {
-      name = "optionator";
-      packageName = "optionator";
-      version = "0.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz";
-        sha512 = "+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==";
-      };
-    };
     "optionator-0.9.4" = {
       name = "optionator";
       packageName = "optionator";
@@ -22010,15 +21263,6 @@ let
         sha512 = "TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==";
       };
     };
-    "parse-node-version-1.0.1" = {
-      name = "parse-node-version";
-      packageName = "parse-node-version";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/parse-node-version/-/parse-node-version-1.0.1.tgz";
-        sha512 = "3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA==";
-      };
-    };
     "parse-passwd-1.0.0" = {
       name = "parse-passwd";
       packageName = "parse-passwd";
@@ -22208,15 +21452,6 @@ let
         sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==";
       };
     };
-    "path-is-inside-1.0.2" = {
-      name = "path-is-inside";
-      packageName = "path-is-inside";
-      version = "1.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz";
-        sha512 = "DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w==";
-      };
-    };
     "path-key-2.0.1" = {
       name = "path-key";
       packageName = "path-key";
@@ -22658,15 +21893,6 @@ let
         sha512 = "4UGewrYgqDFw9vV6zNV+ADmPAUAfJPKtGvb/VdpQAx25X5f3xXdGdyOEVFwkl8Hl/tl7+xbeHqSEM+D5/TirUg==";
       };
     };
-    "pluralize-1.2.1" = {
-      name = "pluralize";
-      packageName = "pluralize";
-      version = "1.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/pluralize/-/pluralize-1.2.1.tgz";
-        sha512 = "TH+BeeL6Ct98C7as35JbZLf8lgsRzlNJb5gklRIGHKaPkGl1esOKBc5ALUMd+q08Sr6tiEKM+Icbsxg5vuhMKQ==";
-      };
-    };
     "pluralize-8.0.0" = {
       name = "pluralize";
       packageName = "pluralize";
@@ -22802,15 +22028,6 @@ let
         sha512 = "lEHd+yEm22jXdCphDrkvIJQU66EuLojPPtvZkpKIkiD+l0DMThF/niqZKJSoU8Vl7iuvtmzyMhir9LdVy5WMnA==";
       };
     };
-    "prelude-ls-1.1.2" = {
-      name = "prelude-ls";
-      packageName = "prelude-ls";
-      version = "1.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz";
-        sha512 = "ESF23V4SKG6lVSGZgYNpbsiaAkdab6ZgOxe52p7+Kid3W3u3bxR4Vfd/o21dmN7jSt0IwgZ4v5MUd26FEtXE9w==";
-      };
-    };
     "prelude-ls-1.2.1" = {
       name = "prelude-ls";
       packageName = "prelude-ls";
@@ -22964,15 +22181,6 @@ let
         sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==";
       };
     };
-    "progress-1.1.8" = {
-      name = "progress";
-      packageName = "progress";
-      version = "1.1.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz";
-        sha512 = "UdA8mJ4weIkUBO224tIarHzuHs4HuYiJvsuGT7j/SPQiUJVjYvNDBIPa0hAorduOfjGohB/qHWRa/lrrWX/mXw==";
-      };
-    };
     "progress-2.0.3" = {
       name = "progress";
       packageName = "progress";
@@ -23837,24 +23045,6 @@ let
         sha512 = "GDhwkLfywWL2s6vEjyhri+eXmfH6j1L7JE27WhqLeYzoh/A3DBaYGEj2H/HFZCn/kMfim73FXxEJTw06WtxQwg==";
       };
     };
-    "readline-1.3.0" = {
-      name = "readline";
-      packageName = "readline";
-      version = "1.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readline/-/readline-1.3.0.tgz";
-        sha512 = "k2d6ACCkiNYz222Fs/iNze30rRJ1iIicW7JuX/7/cozvih6YCkFZH+J6mAFDVgv0dRBaAyr4jDqC95R2y4IADg==";
-      };
-    };
-    "readline2-1.0.1" = {
-      name = "readline2";
-      packageName = "readline2";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/readline2/-/readline2-1.0.1.tgz";
-        sha512 = "8/td4MmwUB6PkZUbV25uKz7dfrmjYWxsW8DVfibWdlHRk/l/DfHKn4pU+dfcoGLFgWOdyGCzINRQD7jn+Bv+/g==";
-      };
-    };
     "rechoir-0.6.2" = {
       name = "rechoir";
       packageName = "rechoir";
@@ -24638,15 +23828,6 @@ let
         sha512 = "ZqtSMuVybkISo2OWvqvm7iHSWngvdaW3IpsT9/uP8v4gMi591LY6h35wdOfvQdWCKFWZWm2Y1Opp4kV7vQKT6A==";
       };
     };
-    "replace-ext-0.0.1" = {
-      name = "replace-ext";
-      packageName = "replace-ext";
-      version = "0.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/replace-ext/-/replace-ext-0.0.1.tgz";
-        sha512 = "AFBWBy9EVRTa/LhEcG8QDP3FvpwZqmvN2QFDuJswFeaVhWnZMp8q3E6Zd90SR04PlIwfGdyVjNyLPyen/ek5CQ==";
-      };
-    };
     "replace-homedir-2.0.0" = {
       name = "replace-homedir";
       packageName = "replace-homedir";
@@ -24656,15 +23837,6 @@ let
         sha512 = "bgEuQQ/BHW0XkkJtawzrfzHFSN70f/3cNOiHa2QsYxqrjaC30X1k74FJ6xswVBP0sr0SpGIdVFuPwfrYziVeyw==";
       };
     };
-    "request-2.88.0" = {
-      name = "request";
-      packageName = "request";
-      version = "2.88.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/request/-/request-2.88.0.tgz";
-        sha512 = "NAqBSrijGLZdM0WZNsInLJpkJokL72XYjUpnB0iwsRgxh7dB6COrHnTBNwN0E+lHDAJzu7kLAkDeY08z2/A0hg==";
-      };
-    };
     "request-2.88.2" = {
       name = "request";
       packageName = "request";
@@ -24728,15 +23900,6 @@ let
         sha512 = "uuoJ1hU/k6M0779t3VMVIYpb2VMJk05cehCaABFhXaibcbvfgR8wKiozLjVFSzJPmQMRqIcO0HMyTFqfV09V6Q==";
       };
     };
-    "require-uncached-1.0.3" = {
-      name = "require-uncached";
-      packageName = "require-uncached";
-      version = "1.0.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/require-uncached/-/require-uncached-1.0.3.tgz";
-        sha512 = "Xct+41K3twrbBHdxAgMoOS+cNcoqIjfM2/VxBF4LL2hVph7YsF8VSKyQ3BDFZwEVbok9yeDl2le/qo0S77WG2w==";
-      };
-    };
     "requirejs-2.3.7" = {
       name = "requirejs";
       packageName = "requirejs";
@@ -24809,15 +23972,6 @@ let
         sha512 = "R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==";
       };
     };
-    "resolve-from-1.0.1" = {
-      name = "resolve-from";
-      packageName = "resolve-from";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve-from/-/resolve-from-1.0.1.tgz";
-        sha512 = "kT10v4dhrlLNcnO084hEjvXCI1wUG9qZLoz2RogxqDQQYy7IxjI/iMUkOtQTNEh6rzHxvdQWHsJyel1pKOVCxg==";
-      };
-    };
     "resolve-from-2.0.0" = {
       name = "resolve-from";
       packageName = "resolve-from";
@@ -24899,15 +24053,6 @@ let
         sha512 = "Wj+p3Y+5KFv+bzb7X+4H+RKaITS7y84xhR8KH1BfytpX6K1mnUVDqq2Kp0/jk/awSDQrWrkLtf0gzWfsmT1zcg==";
       };
     };
-    "restore-cursor-1.0.1" = {
-      name = "restore-cursor";
-      packageName = "restore-cursor";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-1.0.1.tgz";
-        sha512 = "reSjH4HuiFlxlaBaFCiS6O76ZGG2ygKoSlCsipKdaZuKSPx/+bt9mULkn4l0asVzbEfQQmXRg6Wp6gv6m0wElw==";
-      };
-    };
     "restore-cursor-2.0.0" = {
       name = "restore-cursor";
       packageName = "restore-cursor";
@@ -25142,15 +24287,6 @@ let
         sha512 = "jFvBgyRueGU0QVa7EqXZOkarkzrqEnF3VTCzATRcBkzxXJ4/+pzDf1iouqOqGsx6ZpnIIu5gvFDGnyzoX58ldQ==";
       };
     };
-    "rss-parser-3.7.1" = {
-      name = "rss-parser";
-      packageName = "rss-parser";
-      version = "3.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rss-parser/-/rss-parser-3.7.1.tgz";
-        sha512 = "1JKFzLHeteNandmlVBUWgLPmipFEllhdUQlmNvkXd6ju4VFOlGr0VmtlQaxzZoVysG2nbGb8eAtzNqQTxzQ+AQ==";
-      };
-    };
     "run-applescript-7.0.0" = {
       name = "run-applescript";
       packageName = "run-applescript";
@@ -25160,15 +24296,6 @@ let
         sha512 = "9by4Ij99JUr/MCFBUkDKLWK3G9HVXmabKz9U5MlIAIuvuzkiOicRYs8XJLxX+xahD+mLiiCYDqF9dKAgtzKP1A==";
       };
     };
-    "run-async-0.1.0" = {
-      name = "run-async";
-      packageName = "run-async";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/run-async/-/run-async-0.1.0.tgz";
-        sha512 = "qOX+w+IxFgpUpJfkv2oGN0+ExPs68F4sZHfaRRx4dDexAQkG83atugKVEylyT5ARees3HBbfmuvnjbrd8j9Wjw==";
-      };
-    };
     "run-async-2.4.1" = {
       name = "run-async";
       packageName = "run-async";
@@ -25232,15 +24359,6 @@ let
         sha512 = "CiaiuN6gapkdl+cZUr67W6I8jquN4lkak3vtIsIWCl4XIPP8ffsoyN6/+PuGXnQy8Cu8W2y9Xxh31Rq4M6wUug==";
       };
     };
-    "rx-lite-3.1.2" = {
-      name = "rx-lite";
-      packageName = "rx-lite";
-      version = "3.1.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/rx-lite/-/rx-lite-3.1.2.tgz";
-        sha512 = "1I1+G2gteLB8Tkt8YI1sJvSIfa0lWuRtC8GjvtyPBcLSF5jBCCJJqKrpER5JU5r6Bhe+i9/pK3VMuUcXu0kdwQ==";
-      };
-    };
     "rxjs-5.5.12" = {
       name = "rxjs";
       packageName = "rxjs";
@@ -25817,15 +24935,6 @@ let
         sha512 = "AzqKpGKjrj7EM6rKVQEPpB288oCfnrEIuyoT9cyF4nmGa7V8Zk6f7RRqYisX8X9m+Q7bd632aZW4ky7EhbQztA==";
       };
     };
-    "shelljs-0.7.8" = {
-      name = "shelljs";
-      packageName = "shelljs";
-      version = "0.7.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/shelljs/-/shelljs-0.7.8.tgz";
-        sha512 = "/YF5Uk8hcwi7ima04ppkbA4RaRMdPMBfwAvAf8sufYOxsJRtbdoBsT8vGvlb+799BrlGdYrd+oczIA2eN2JdWA==";
-      };
-    };
     "shelljs-0.8.5" = {
       name = "shelljs";
       packageName = "shelljs";
@@ -26474,15 +25583,6 @@ let
         sha512 = "PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==";
       };
     };
-    "sparkles-1.0.1" = {
-      name = "sparkles";
-      packageName = "sparkles";
-      version = "1.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/sparkles/-/sparkles-1.0.1.tgz";
-        sha512 = "dSO0DDYUahUt/0/pD/Is3VIm5TGJjludZ0HVymmhYF6eNA53PVLhnUk0znSYbH8IYBuJdCE+1luR22jNLMaQdw==";
-      };
-    };
     "sparkles-2.1.0" = {
       name = "sparkles";
       packageName = "sparkles";
@@ -27518,15 +26618,6 @@ let
         sha512 = "ulAk51I9UVUyJgxlv9M6lFot2WP3e7t8Kz9+IS6D4rVba1tR9kON+Ey69f+1R4Q8cd45Lod6a4IcJIxnzGc/zA==";
       };
     };
-    "table-3.8.3" = {
-      name = "table";
-      packageName = "table";
-      version = "3.8.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/table/-/table-3.8.3.tgz";
-        sha512 = "RZuzIOtzFbprLCE0AXhkI0Xi42ZJLZhCC+qkwuMLf/Vjz3maWpA8gz1qMdbmNoI9cOROT2Am/DxeRyXenrL11g==";
-      };
-    };
     "table-6.9.0" = {
       name = "table";
       packageName = "table";
@@ -27869,15 +26960,6 @@ let
         sha512 = "MyqZCTGLDZ77u4k+jqg4UlrzPTPZ49NDlaekU6uuFaJLzPIN1woaRXCbGeqOfxwc3Y37ZROGAJ614Rdv7Olt+g==";
       };
     };
-    "time-stamp-1.1.0" = {
-      name = "time-stamp";
-      packageName = "time-stamp";
-      version = "1.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/time-stamp/-/time-stamp-1.1.0.tgz";
-        sha512 = "gLCeArryy2yNTRzTGKbZbloctj64jkZ57hj5zdraXue6aFgd6PmvVtEyiUU+hvU0v7q08oVv8r8ev0tRo6bvgw==";
-      };
-    };
     "timed-out-4.0.1" = {
       name = "timed-out";
       packageName = "timed-out";
@@ -28076,15 +27158,6 @@ let
         sha512 = "F+3tYmXnpO2gyhZQ7o8yakELJH3FtKISI/FU0iWvchOWFUXiFnjbEBoumSzfcK1P71Qxzx2az4lVK4Dkq4KSew==";
       };
     };
-    "tough-cookie-2.4.3" = {
-      name = "tough-cookie";
-      packageName = "tough-cookie";
-      version = "2.4.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.4.3.tgz";
-        sha512 = "Q5srk/4vDM54WJsJio3XNn6K2sCG+CQ8G5Wz6bZhRZoAe/+TxjWB/GlFAnYEbkYVlON9FMk/fE3h2RLpPXo4lQ==";
-      };
-    };
     "tough-cookie-2.5.0" = {
       name = "tough-cookie";
       packageName = "tough-cookie";
@@ -28283,15 +27356,6 @@ let
         sha512 = "+68OP1ZzSF84rTckf3FA95vJ1Zlx/uaXyiiKyPd1pA4rZNkpEvDAKmsu1xUSmbF/chCRYgZ6UZkDwC7PmzmAyA==";
       };
     };
-    "tumblr-0.4.1" = {
-      name = "tumblr";
-      packageName = "tumblr";
-      version = "0.4.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tumblr/-/tumblr-0.4.1.tgz";
-        sha512 = "MB/C4h4n43kq8SpHtwIL/DlUXJfTWR7lG9AUJVJsLeW38q0mTXHoHtlnAqt27CsLFZC864i9P508pRXW3fjkJA==";
-      };
-    };
     "tunnel-agent-0.4.3" = {
       name = "tunnel-agent";
       packageName = "tunnel-agent";
@@ -28319,33 +27383,6 @@ let
         sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA==";
       };
     };
-    "twitter-1.7.1" = {
-      name = "twitter";
-      packageName = "twitter";
-      version = "1.7.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/twitter/-/twitter-1.7.1.tgz";
-        sha512 = "Do7l/WzFnUZC14ABtZfDiOHKl6M9Ft5tE4YF0ev9XLm4yh7m8R98D82rzeDAMjbjMZk2R/tb6sgXXb3sPKoaVw==";
-      };
-    };
-    "type-2.7.3" = {
-      name = "type";
-      packageName = "type";
-      version = "2.7.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type/-/type-2.7.3.tgz";
-        sha512 = "8j+1QmAbPvLZow5Qpi6NCaN8FB60p/6x8/vfNqOk/hC+HuvFZhL4+WfekuhQLiqFZXOgQdrs3B+XxEmCc6b3FQ==";
-      };
-    };
-    "type-check-0.3.2" = {
-      name = "type-check";
-      packageName = "type-check";
-      version = "0.3.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz";
-        sha512 = "ZCmOJdvOWDBYJlzAoFkC+Q0+bUyEOS1ltgp1MGU03fqHG+dbi9tBFU2Rd9QKiDZFAYrhPh2JUf7rZRIuHRKtOg==";
-      };
-    };
     "type-check-0.4.0" = {
       name = "type-check";
       packageName = "type-check";
@@ -29435,15 +28472,6 @@ let
         sha512 = "cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==";
       };
     };
-    "user-home-2.0.0" = {
-      name = "user-home";
-      packageName = "user-home";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/user-home/-/user-home-2.0.0.tgz";
-        sha512 = "KMWqdlOcjCYdtIJpicDSFBQ8nFwS2i9sslAd6f4+CBGcU4gist2REnr2fxj2YocvJFxSF3ZOHLYLVZnUxv4BZQ==";
-      };
-    };
     "utf-8-validate-5.0.10" = {
       name = "utf-8-validate";
       packageName = "utf-8-validate";
@@ -30137,15 +29165,6 @@ let
         sha512 = "BOMkqUnIghW/SZEVOUKC3p5lUZ8QzavLksEEMKR9Yr7jBuu0noiQVfyB7csOStFVFgpWzx+ApcZjkyFHQkJjmQ==";
       };
     };
-    "vinyl-0.5.3" = {
-      name = "vinyl";
-      packageName = "vinyl";
-      version = "0.5.3";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/vinyl/-/vinyl-0.5.3.tgz";
-        sha512 = "P5zdf3WB9uzr7IFoVQ2wZTmUwHL8cMZWJGzLBNCHNZ3NB6HTMsYABtt7z8tAGIINLXyAob9B9a1yzVGMFOYKEA==";
-      };
-    };
     "vm-browserify-1.1.2" = {
       name = "vm-browserify";
       packageName = "vm-browserify";
@@ -30749,15 +29768,6 @@ let
         sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==";
       };
     };
-    "write-0.2.1" = {
-      name = "write";
-      packageName = "write";
-      version = "0.2.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/write/-/write-0.2.1.tgz";
-        sha512 = "CJ17OoULEKXpA5pef3qLj5AxTJ6mSt7g84he2WIskKwqFO4T97d5V7Tadl0DYDk7qyUOQD5WlUlOMChaYrhxeA==";
-      };
-    };
     "write-file-atomic-2.4.3" = {
       name = "write-file-atomic";
       packageName = "write-file-atomic";
@@ -39273,370 +38283,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  mastodon-bot = nodeEnv.buildNodePackage {
-    name = "mastodon-bot";
-    packageName = "mastodon-bot";
-    version = "1.13.8-20220129172727";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/mastodon-bot/-/mastodon-bot-1.13.8-20220129172727.tgz";
-      sha512 = "uBYlTnpHrVQ6+K9qQHaoLfvUKL8W5RLjdPmIzSC48+F0TSwDv+zAq19Sv5kx4Rxv4K+3c9j15xMI+mEs3bD7Lg==";
-    };
-    dependencies = [
-      sources."acorn-5.7.4"
-      (
-        sources."acorn-jsx-3.0.1"
-        // {
-          dependencies = [
-            sources."acorn-3.3.0"
-          ];
-        }
-      )
-      sources."ajv-4.11.8"
-      sources."ajv-keywords-1.5.1"
-      sources."ansi-escapes-1.4.0"
-      sources."ansi-gray-0.1.1"
-      sources."ansi-regex-2.1.1"
-      sources."ansi-styles-2.2.1"
-      sources."ansi-wrap-0.1.0"
-      sources."argparse-1.0.10"
-      sources."array-differ-1.0.0"
-      sources."array-uniq-1.0.3"
-      sources."asn1-0.2.6"
-      sources."assert-plus-1.0.0"
-      sources."asynckit-0.4.0"
-      sources."aws-sign2-0.7.0"
-      sources."aws4-1.13.2"
-      sources."babel-code-frame-6.26.0"
-      sources."balanced-match-1.0.2"
-      sources."bcrypt-pbkdf-1.0.2"
-      sources."beeper-1.1.1"
-      sources."bindings-1.5.0"
-      sources."brace-expansion-1.1.11"
-      sources."buffer-from-1.1.2"
-      sources."bufferstreams-1.1.3"
-      sources."call-bind-1.0.8"
-      sources."call-bind-apply-helpers-1.0.2"
-      sources."call-bound-1.0.4"
-      sources."caller-path-0.1.0"
-      sources."callsites-0.2.0"
-      sources."caseless-0.12.0"
-      sources."chalk-1.1.3"
-      sources."circular-json-0.3.3"
-      sources."cli-cursor-1.0.2"
-      sources."cli-width-2.2.1"
-      sources."clone-1.0.4"
-      sources."clone-stats-0.0.1"
-      sources."co-4.6.0"
-      sources."code-point-at-1.1.0"
-      sources."color-support-1.1.3"
-      sources."combined-stream-1.0.8"
-      sources."concat-map-0.0.1"
-      sources."concat-stream-1.6.2"
-      sources."core-util-is-1.0.3"
-      sources."d-1.0.2"
-      sources."dashdash-1.14.1"
-      sources."dateformat-2.2.0"
-      sources."deasync-0.1.20"
-      sources."debug-2.6.9"
-      sources."deep-extend-0.5.1"
-      sources."deep-is-0.1.4"
-      sources."define-data-property-1.1.4"
-      sources."delayed-stream-1.0.0"
-      sources."doctrine-2.1.0"
-      sources."dunder-proto-1.0.1"
-      (
-        sources."duplexer2-0.0.2"
-        // {
-          dependencies = [
-            sources."isarray-0.0.1"
-            sources."readable-stream-1.1.14"
-            sources."string_decoder-0.10.31"
-          ];
-        }
-      )
-      sources."ecc-jsbn-0.1.2"
-      sources."entities-1.1.2"
-      sources."es-define-property-1.0.1"
-      sources."es-errors-1.3.0"
-      sources."es-object-atoms-1.1.1"
-      sources."es5-ext-0.10.64"
-      sources."es6-iterator-2.0.3"
-      sources."es6-map-0.1.5"
-      sources."es6-set-0.1.6"
-      sources."es6-symbol-3.1.4"
-      sources."es6-weak-map-2.0.3"
-      sources."escape-string-regexp-1.0.5"
-      sources."escope-3.6.0"
-      sources."eslint-3.19.0"
-      sources."esniff-2.0.1"
-      sources."espree-3.5.4"
-      sources."esprima-4.0.1"
-      (
-        sources."esquery-1.6.0"
-        // {
-          dependencies = [
-            sources."estraverse-5.3.0"
-          ];
-        }
-      )
-      (
-        sources."esrecurse-4.3.0"
-        // {
-          dependencies = [
-            sources."estraverse-5.3.0"
-          ];
-        }
-      )
-      sources."estraverse-4.3.0"
-      sources."esutils-2.0.3"
-      sources."event-emitter-0.3.5"
-      sources."exit-hook-1.1.1"
-      sources."ext-1.7.0"
-      sources."extend-3.0.2"
-      sources."extsprintf-1.3.0"
-      sources."fancy-log-1.3.3"
-      sources."fast-deep-equal-3.1.3"
-      sources."fast-json-stable-stringify-2.1.0"
-      sources."fast-levenshtein-2.0.6"
-      sources."figures-1.7.0"
-      sources."file-entry-cache-2.0.0"
-      sources."file-uri-to-path-1.0.0"
-      sources."flat-cache-1.3.4"
-      sources."forever-agent-0.6.1"
-      sources."form-data-2.3.3"
-      sources."fs.realpath-1.0.0"
-      sources."function-bind-1.1.2"
-      sources."generate-function-2.3.1"
-      sources."generate-object-property-1.2.0"
-      sources."get-intrinsic-1.3.0"
-      sources."get-proto-1.0.1"
-      sources."getpass-0.1.7"
-      sources."glob-7.2.3"
-      sources."globals-9.18.0"
-      sources."glogg-1.0.2"
-      sources."gopd-1.2.0"
-      sources."graceful-fs-4.2.11"
-      sources."gulp-eslint-3.0.1"
-      (
-        sources."gulp-util-3.0.8"
-        // {
-          dependencies = [
-            sources."object-assign-3.0.0"
-          ];
-        }
-      )
-      sources."gulplog-1.0.0"
-      sources."har-schema-2.0.0"
-      (
-        sources."har-validator-5.1.5"
-        // {
-          dependencies = [
-            sources."ajv-6.12.6"
-          ];
-        }
-      )
-      sources."has-ansi-2.0.0"
-      sources."has-gulplog-0.1.0"
-      sources."has-property-descriptors-1.0.2"
-      sources."has-symbols-1.1.0"
-      sources."hasown-2.0.2"
-      sources."http-signature-1.2.0"
-      sources."ignore-3.3.10"
-      sources."imurmurhash-0.1.4"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      (
-        sources."inquirer-0.12.0"
-        // {
-          dependencies = [
-            sources."is-fullwidth-code-point-1.0.0"
-            sources."string-width-1.0.2"
-          ];
-        }
-      )
-      sources."interpret-1.4.0"
-      sources."is-core-module-2.16.1"
-      sources."is-fullwidth-code-point-2.0.0"
-      sources."is-my-ip-valid-1.0.1"
-      sources."is-my-json-valid-2.20.6"
-      sources."is-property-1.0.2"
-      sources."is-resolvable-1.1.0"
-      sources."is-typedarray-1.0.0"
-      sources."isarray-1.0.0"
-      sources."isstream-0.1.2"
-      sources."js-tokens-3.0.2"
-      sources."js-yaml-3.14.1"
-      sources."jsbn-0.1.1"
-      sources."json-schema-0.4.0"
-      sources."json-schema-traverse-0.4.1"
-      (
-        sources."json-stable-stringify-1.2.1"
-        // {
-          dependencies = [
-            sources."isarray-2.0.5"
-          ];
-        }
-      )
-      sources."json-stringify-safe-5.0.1"
-      sources."jsonify-0.0.1"
-      sources."jsonpointer-5.0.1"
-      sources."jsprim-1.4.2"
-      sources."levn-0.3.0"
-      sources."lodash-4.17.21"
-      sources."lodash._basecopy-3.0.1"
-      sources."lodash._basetostring-3.0.1"
-      sources."lodash._basevalues-3.0.0"
-      sources."lodash._getnative-3.9.1"
-      sources."lodash._isiterateecall-3.0.9"
-      sources."lodash._reescape-3.0.0"
-      sources."lodash._reevaluate-3.0.0"
-      sources."lodash._reinterpolate-3.0.0"
-      sources."lodash._root-3.0.1"
-      sources."lodash.escape-3.2.0"
-      sources."lodash.isarguments-3.1.0"
-      sources."lodash.isarray-3.0.4"
-      sources."lodash.keys-3.1.2"
-      sources."lodash.restparam-3.6.1"
-      sources."lodash.template-3.6.2"
-      sources."lodash.templatesettings-3.1.1"
-      sources."mastodon-api-1.3.0"
-      sources."math-intrinsics-1.1.0"
-      sources."mime-1.6.0"
-      sources."mime-db-1.52.0"
-      sources."mime-types-2.1.35"
-      sources."minimatch-3.1.2"
-      sources."minimist-1.2.8"
-      sources."mkdirp-0.5.6"
-      sources."ms-2.0.0"
-      sources."multipipe-0.1.2"
-      sources."mute-stream-0.0.5"
-      sources."natural-compare-1.4.0"
-      sources."next-tick-1.1.0"
-      sources."node-addon-api-1.7.2"
-      sources."node-fetch-2.6.1"
-      sources."number-is-nan-1.0.1"
-      sources."oauth-0.9.15"
-      sources."oauth-sign-0.9.0"
-      sources."object-assign-4.1.1"
-      sources."object-keys-1.1.1"
-      sources."once-1.4.0"
-      sources."onetime-1.1.0"
-      sources."optionator-0.8.3"
-      sources."os-homedir-1.0.2"
-      sources."parse-node-version-1.0.1"
-      sources."path-is-absolute-1.0.1"
-      sources."path-is-inside-1.0.2"
-      sources."path-parse-1.0.7"
-      sources."performance-now-2.1.0"
-      sources."pluralize-1.2.1"
-      sources."prelude-ls-1.1.2"
-      sources."process-nextick-args-2.0.1"
-      sources."progress-1.1.8"
-      (
-        sources."psl-1.15.0"
-        // {
-          dependencies = [
-            sources."punycode-2.3.1"
-          ];
-        }
-      )
-      sources."punycode-1.4.1"
-      sources."qs-6.5.3"
-      sources."readable-stream-2.3.8"
-      sources."readline-1.3.0"
-      (
-        sources."readline2-1.0.1"
-        // {
-          dependencies = [
-            sources."is-fullwidth-code-point-1.0.0"
-          ];
-        }
-      )
-      sources."rechoir-0.6.2"
-      sources."replace-ext-0.0.1"
-      sources."request-2.88.0"
-      sources."require-uncached-1.0.3"
-      sources."resolve-1.22.10"
-      sources."resolve-from-1.0.1"
-      sources."restore-cursor-1.0.1"
-      sources."rimraf-2.6.3"
-      sources."rss-parser-3.7.1"
-      sources."run-async-0.1.0"
-      sources."rx-lite-3.1.2"
-      sources."safe-buffer-5.1.2"
-      sources."safer-buffer-2.1.2"
-      sources."sax-1.4.1"
-      sources."set-function-length-1.2.2"
-      sources."shelljs-0.7.8"
-      sources."slice-ansi-0.0.4"
-      sources."sparkles-1.0.1"
-      sources."sprintf-js-1.0.3"
-      sources."sshpk-1.18.0"
-      (
-        sources."string-width-2.1.1"
-        // {
-          dependencies = [
-            sources."ansi-regex-3.0.1"
-            sources."strip-ansi-4.0.0"
-          ];
-        }
-      )
-      sources."string_decoder-1.1.1"
-      sources."strip-ansi-3.0.1"
-      sources."strip-bom-3.0.0"
-      sources."strip-json-comments-2.0.1"
-      sources."supports-color-2.0.0"
-      sources."supports-preserve-symlinks-flag-1.0.0"
-      sources."table-3.8.3"
-      sources."text-table-0.2.0"
-      sources."through-2.3.8"
-      sources."through2-2.0.5"
-      sources."time-stamp-1.1.0"
-      sources."tough-cookie-2.4.3"
-      sources."tumblr-0.4.1"
-      sources."tunnel-agent-0.6.0"
-      sources."tweetnacl-0.14.5"
-      sources."twitter-1.7.1"
-      sources."type-2.7.3"
-      sources."type-check-0.3.2"
-      sources."typedarray-0.0.6"
-      (
-        sources."uri-js-4.4.1"
-        // {
-          dependencies = [
-            sources."punycode-2.3.1"
-          ];
-        }
-      )
-      sources."user-home-2.0.0"
-      sources."util-deprecate-1.0.2"
-      sources."uuid-3.4.0"
-      (
-        sources."verror-1.10.0"
-        // {
-          dependencies = [
-            sources."core-util-is-1.0.2"
-          ];
-        }
-      )
-      sources."vinyl-0.5.3"
-      sources."word-wrap-1.2.5"
-      sources."wrappy-1.0.2"
-      sources."write-0.2.1"
-      sources."xml2js-0.4.23"
-      sources."xmlbuilder-11.0.1"
-      sources."xtend-4.0.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Bot to publish twitter, tumblr or rss posts to an mastodon account";
-      homepage = "https://github.com/yogthos/mastodon-bot";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   mathjax = nodeEnv.buildNodePackage {
     name = "mathjax";
     packageName = "mathjax";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 87bdade1571e..42547aae966c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -998,6 +998,7 @@ mapAliases {
   marwaita-peppermint = throw "'marwaita-peppermint' has been renamed to/replaced by 'marwaita-red'"; # Converted to throw 2025-10-27
   marwaita-pop_os = throw "'marwaita-pop_os' has been renamed to/replaced by 'marwaita-yellow'"; # Converted to throw 2025-10-27
   marwaita-ubuntu = throw "'marwaita-ubuntu' has been renamed to/replaced by 'marwaita-orange'"; # Converted to throw 2025-10-27
+  mastodon-bot = throw "'mastodon-bot' has been removed because it was archived by upstream in 2021."; # Added 2025-11-07
   material-kwin-decoration = throw "'material-kwin-decoration' has been removed, as it is only compatible with Plasma 5, which is EOL"; # Added 2025-08-20
   mathlibtools = throw "mathlibtools has been removed as it was archived upstream in 2023"; # Added 2025-07-09
   matomo_5 = throw "'matomo_5' has been renamed to/replaced by 'matomo'"; # Converted to throw 2025-10-27
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 4db94cf2e714..8a0e82da8a9b 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -11665,8 +11665,6 @@ with pkgs;
     shelfMultiBand = callPackage ../applications/audio/magnetophonDSP/shelfMultiBand { };
   };
 
-  mastodon-bot = nodePackages.mastodon-bot;
-
   matrix-commander =
     python3Packages.callPackage ../applications/networking/instant-messengers/matrix-commander
       { };

From 7a42ab9d428ad5e414c6e9b018a3958d1446f9e4 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 03:36:29 +0000
Subject: [PATCH 6212/6226] bcachefs-tools: 1.31.12 -> 1.31.13

---
 pkgs/by-name/bc/bcachefs-tools/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix
index 385ec6b5d620..338a0451683b 100644
--- a/pkgs/by-name/bc/bcachefs-tools/package.nix
+++ b/pkgs/by-name/bc/bcachefs-tools/package.nix
@@ -28,13 +28,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "bcachefs-tools";
-  version = "1.31.12";
+  version = "1.31.13";
 
   src = fetchFromGitHub {
     owner = "koverstreet";
     repo = "bcachefs-tools";
     tag = "v${finalAttrs.version}";
-    hash = "sha256-gbSyybWTG38mI3r6kdOHFaEx7S82x25OMPEAWZql7Mo=";
+    hash = "sha256-IHc4tsEqXbxOLQXu75A3WtFqhv6NS0AlPsWt0pM8LdU=";
   };
 
   cargoDeps = rustPlatform.fetchCargoVendor {

From f878615421afffeecc6c799bcbf0f566cbc593b9 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Fri, 7 Nov 2025 22:44:52 -0500
Subject: [PATCH 6213/6226] nodePackages.speed-test: drop

Has a critical
issue(https://github.com/sindresorhus/speed-test/issues/74) open with no
resolution for many years now, so safe to remove since it doesn't even
work(I confirmed this is still the case)
---
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 334 ------------------
 3 files changed, 1 insertion(+), 335 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 564ae2e7e67b..2c2c1e2af7a7 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -257,6 +257,7 @@ mapAliases {
   shout = throw "shout was removed because it was deprecated upstream in favor of thelounge."; # Added 2024-10-19
   inherit (pkgs) snyk; # Added 2023-08-30
   "socket.io" = throw "socket.io was removed because it provides no executable"; # added 2025-03-23
+  speed-test = throw "'speed-test' has been removed because it was broken"; # Added 2025-11-07
   inherit (pkgs) sql-formatter; # added 2024-06-29
   "@squoosh/cli" = throw "@squoosh/cli was removed because it was abandoned upstream"; # added 2023-09-02
   ssb-server = throw "ssb-server was removed because it was broken"; # added 2023-08-21
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 3bbfa908f887..0c23f5dc94de 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -78,7 +78,6 @@
 , "semver"
 , "sloc"
 , "smartdc"
-, "speed-test"
 , "svelte-check"
 , "tern"
 , "tiddlywiki"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 5bff2d74950f..292adde37c5e 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -4251,15 +4251,6 @@ let
         sha512 = "QbJ0NTQ/I9DI3uSJA4cbexiwQeRAfjPScqIbSjUDd9TOrcg6pTkdgziesOqxBMBzit8vFCTwrP27t13vFOORRA==";
       };
     };
-    "agent-base-4.3.0" = {
-      name = "agent-base";
-      packageName = "agent-base";
-      version = "4.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/agent-base/-/agent-base-4.3.0.tgz";
-        sha512 = "salcGninV0nPrwpGNn4VTXBb1SOuXQBiqbrNXoeizJsHrsL6ERFM2Ne3JUSBWRE6aeNJI2ROP/WEEIDUiDe3cg==";
-      };
-    };
     "agent-base-6.0.2" = {
       name = "agent-base";
       packageName = "agent-base";
@@ -5727,15 +5718,6 @@ let
         sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==";
       };
     };
-    "bl-5.1.0" = {
-      name = "bl";
-      packageName = "bl";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/bl/-/bl-5.1.0.tgz";
-        sha512 = "tv1ZJHLfTDnXE6tMHv73YgSJaWR2AFuPwMntBe7XL/GBFHnT0CLnsHMogfk5+GzCDC5ZWarSCYaIGATZt9dNsQ==";
-      };
-    };
     "blob-0.0.5" = {
       name = "blob";
       packageName = "blob";
@@ -6609,15 +6591,6 @@ let
         sha512 = "YrwaA0vEKazPBkn0ipTiMpSajYDSe+KjQfrjhcBMxJt/znbvlHd8Pw/Vamaz5EB4Wfhs3SUR3Z9mwRu/P3s3Yg==";
       };
     };
-    "camelcase-keys-7.0.2" = {
-      name = "camelcase-keys";
-      packageName = "camelcase-keys";
-      version = "7.0.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-7.0.2.tgz";
-        sha512 = "Rjs1H+A9R+Ig+4E/9oyB66UC5Mj9Xq3N//vcLf2WzgdTi/3gUu3Z9KoqmlrEG4VuuLK8wJHofxzdQXz/knhiYg==";
-      };
-    };
     "camelcase-keys-8.0.2" = {
       name = "camelcase-keys";
       packageName = "camelcase-keys";
@@ -9877,15 +9850,6 @@ let
         sha512 = "yXcCvhkPKmq5M2cQXss6Qbig+LZnzRIT40XCYm/QCRnJaPG867StB1qnsBLxOGrPH1YEIRWW2gJq7LLMyw+NmA==";
       };
     };
-    "draftlog-1.0.13" = {
-      name = "draftlog";
-      packageName = "draftlog";
-      version = "1.0.13";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/draftlog/-/draftlog-1.0.13.tgz";
-        sha512 = "GeMWOpXERBpfVDK6v7m0x1hPg8+g8ZsZWqJl2T17wHqrm4h8fnjiZmXcnCrmwogAc6R3YTxFXax15wezfuyCUw==";
-      };
-    };
     "dreamopt-0.8.0" = {
       name = "dreamopt";
       packageName = "dreamopt";
@@ -10435,24 +10399,6 @@ let
         sha512 = "SOp9Phqvqn7jtEUxPWdWfWoLmyt2VaJ6MpvP9Comy1MceMXqE6bxvaTu4iaxpYYPzhny28Lc+M87/c2cPK6lDg==";
       };
     };
-    "es6-promise-4.2.8" = {
-      name = "es6-promise";
-      packageName = "es6-promise";
-      version = "4.2.8";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.8.tgz";
-        sha512 = "HJDGx5daxeIvxdBxvG2cb9g4tEvwIk3i8+nhX0yGrYmZUzbkdg8QbDevheDB8gd0//uPj4c1EQua8Q+MViT0/w==";
-      };
-    };
-    "es6-promisify-5.0.0" = {
-      name = "es6-promisify";
-      packageName = "es6-promisify";
-      version = "5.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz";
-        sha512 = "C+d6UdsYDk0lMebHNR4S2NybQMMngAOnOwYBQjTOiv0MkoJMP0Myw2mgpDLBcpfCmRLxyFqYhS/CfOENq4SJhQ==";
-      };
-    };
     "esbuild-0.14.47" = {
       name = "esbuild";
       packageName = "esbuild";
@@ -13675,15 +13621,6 @@ let
         sha512 = "7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==";
       };
     };
-    "http-proxy-agent-2.1.0" = {
-      name = "http-proxy-agent";
-      packageName = "http-proxy-agent";
-      version = "2.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz";
-        sha512 = "qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==";
-      };
-    };
     "http-proxy-agent-7.0.2" = {
       name = "http-proxy-agent";
       packageName = "http-proxy-agent";
@@ -13765,15 +13702,6 @@ let
         sha512 = "OmvfoQ53WLjtA9HeYP9RNrWMJzzAz1JGaSFr1nijg0PVR1JaD/xbJq1mdEIIlxGpXp9eSe/O2LgU9DJmTPd0Eg==";
       };
     };
-    "https-proxy-agent-3.0.1" = {
-      name = "https-proxy-agent";
-      packageName = "https-proxy-agent";
-      version = "3.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-3.0.1.tgz";
-        sha512 = "+ML2Rbh6DAuee7d07tYGEKOEi2voWPUGan+ExdPbPW6Z3svq+JCqr0v8WmKPOkz1vOVykPCBSuobe7G8GJUtVg==";
-      };
-    };
     "https-proxy-agent-5.0.1" = {
       name = "https-proxy-agent";
       packageName = "https-proxy-agent";
@@ -17248,15 +17176,6 @@ let
         sha512 = "8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==";
       };
     };
-    "log-symbols-5.1.0" = {
-      name = "log-symbols";
-      packageName = "log-symbols";
-      version = "5.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/log-symbols/-/log-symbols-5.1.0.tgz";
-        sha512 = "l0x2DvrW294C9uDCoQe1VSU4gf529FkSZ6leBl4TiqZH/e+0R7hSfHQBNut2mNygDgHwvYHfFLn6Oxb3VWj2rA==";
-      };
-    };
     "log-symbols-6.0.0" = {
       name = "log-symbols";
       packageName = "log-symbols";
@@ -17284,15 +17203,6 @@ let
         sha512 = "vlP11XfFGyeNQlmEn9tJ66rEW1coA/79m5z6BCkudjbAGE83uhAcGYrBFwfs3AdLiLzGRusRPAbSPK9xZteCmg==";
       };
     };
-    "log-update-5.0.1" = {
-      name = "log-update";
-      packageName = "log-update";
-      version = "5.0.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/log-update/-/log-update-5.0.1.tgz";
-        sha512 = "5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw==";
-      };
-    };
     "log-update-6.1.0" = {
       name = "log-update";
       packageName = "log-update";
@@ -18103,15 +18013,6 @@ let
         sha512 = "QTNXnl79X97kZ9jJk/meJrtDuvgvRakX5LU7HZW1L7MsXHuSTwoMIzN9tOLLH3Xfsj/gbsSqX/ovnsqz246zKQ==";
       };
     };
-    "meow-10.1.5" = {
-      name = "meow";
-      packageName = "meow";
-      version = "10.1.5";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/meow/-/meow-10.1.5.tgz";
-        sha512 = "/d+PQ4GKmGvM9Bee/DPa8z3mXs/pkvJE2KEThngVNOqtmljC6K7NMPxtc2JeZYTmpWb9k/TmxjeL18ez3h7vCw==";
-      };
-    };
     "meow-11.0.0" = {
       name = "meow";
       packageName = "meow";
@@ -20714,15 +20615,6 @@ let
         sha512 = "5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==";
       };
     };
-    "ora-6.3.1" = {
-      name = "ora";
-      packageName = "ora";
-      version = "6.3.1";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/ora/-/ora-6.3.1.tgz";
-        sha512 = "ERAyNnZOfqM+Ao3RAvIXkYh5joP220yf59gVe2X/cI6SiCxIdi4c9HZKZD8R6q/RDXEje1THBju6iExiSsgJaQ==";
-      };
-    };
     "ora-8.2.0" = {
       name = "ora";
       packageName = "ora";
@@ -22856,15 +22748,6 @@ let
         sha512 = "Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==";
       };
     };
-    "read-pkg-6.0.0" = {
-      name = "read-pkg";
-      packageName = "read-pkg";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg/-/read-pkg-6.0.0.tgz";
-        sha512 = "X1Fu3dPuk/8ZLsMhEj5f4wFAF0DWoK7qhGJvgaijocXxBmSToKfbFtqbxMO7bVjNA1dmE5huAzjXj/ey86iw9Q==";
-      };
-    };
     "read-pkg-7.1.0" = {
       name = "read-pkg";
       packageName = "read-pkg";
@@ -22901,15 +22784,6 @@ let
         sha512 = "zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==";
       };
     };
-    "read-pkg-up-8.0.0" = {
-      name = "read-pkg-up";
-      packageName = "read-pkg-up";
-      version = "8.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-8.0.0.tgz";
-        sha512 = "snVCqPczksT0HS2EC+SxUndvSzn6LRCwpfSvLrIfR5BKDQQZMaI6jPRC9dYvYFDRAuFEAnkwww8kBBNE/3VvzQ==";
-      };
-    };
     "read-pkg-up-9.1.0" = {
       name = "read-pkg-up";
       packageName = "read-pkg-up";
@@ -24278,15 +24152,6 @@ let
         sha512 = "kg6oI4g+vc41vePJyO6dHt/yl0Rz3Thv0kJeVQ3D1kS3E5XSuKbPc29G4IpT/Kv1KQwgHVcN+HtyS+HYLNSvQg==";
       };
     };
-    "round-to-6.0.0" = {
-      name = "round-to";
-      packageName = "round-to";
-      version = "6.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/round-to/-/round-to-6.0.0.tgz";
-        sha512 = "jFvBgyRueGU0QVa7EqXZOkarkzrqEnF3VTCzATRcBkzxXJ4/+pzDf1iouqOqGsx6ZpnIIu5gvFDGnyzoX58ldQ==";
-      };
-    };
     "run-applescript-7.0.0" = {
       name = "run-applescript";
       packageName = "run-applescript";
@@ -25664,15 +25529,6 @@ let
         sha512 = "phdEoDlA6EUIVtzwq1UiNMXDUogczp204aYF/yfOhjNePWFfIpBJ1k5wLMuXQhEOOMjuTJEcc4vdZa+vuP+n/Q==";
       };
     };
-    "speedtest-net-1.6.2" = {
-      name = "speedtest-net";
-      packageName = "speedtest-net";
-      version = "1.6.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/speedtest-net/-/speedtest-net-1.6.2.tgz";
-        sha512 = "0rfBDPVLzvDbMUKrFWvF6kvtXxllXGZRkFL0aCWJ5y8uXlEfZDo6IEPACZwJbKt/fGqFjJLJRHnG62vJmLLpRA==";
-      };
-    };
     "split-0.2.10" = {
       name = "split";
       packageName = "split";
@@ -25907,15 +25763,6 @@ let
         sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==";
       };
     };
-    "stdin-discarder-0.1.0" = {
-      name = "stdin-discarder";
-      packageName = "stdin-discarder";
-      version = "0.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/stdin-discarder/-/stdin-discarder-0.1.0.tgz";
-        sha512 = "xhV7w8S+bUwlPTb4bAOUQhv8/cSS5offJuX8GQGq32ONF0ZtDWKfkdomM3HMRA+LhX6um/FZ0COqlwsjD53LeQ==";
-      };
-    };
     "stdin-discarder-0.2.2" = {
       name = "stdin-discarder";
       packageName = "stdin-discarder";
@@ -29921,15 +29768,6 @@ let
         sha512 = "ErcKwJTF54uRzzNMXq2X5sMIy88zJvfN2DmdoQvy7PAFJ+tPRU6ydWuOKNMyfmOjdyBQTFREi60s0Y0SyI0G0g==";
       };
     };
-    "xml2js-0.4.23" = {
-      name = "xml2js";
-      packageName = "xml2js";
-      version = "0.4.23";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz";
-        sha512 = "ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==";
-      };
-    };
     "xml2js-0.5.0" = {
       name = "xml2js";
       packageName = "xml2js";
@@ -41352,178 +41190,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  speed-test = nodeEnv.buildNodePackage {
-    name = "speed-test";
-    packageName = "speed-test";
-    version = "3.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/speed-test/-/speed-test-3.0.0.tgz";
-      sha512 = "CIlLQsG8ffQ2B+2A/s3rXiaTXDWlEKBMya64ajzDcpDZ8bpB5dOyznWQJB+lyUn6/lJ8P+5xe4jKO60S6yLoMw==";
-    };
-    dependencies = [
-      sources."@babel/code-frame-7.26.2"
-      sources."@babel/helper-validator-identifier-7.25.9"
-      sources."@types/minimist-1.2.5"
-      sources."@types/normalize-package-data-2.4.4"
-      sources."agent-base-4.3.0"
-      sources."ansi-escapes-5.0.0"
-      sources."ansi-regex-6.1.0"
-      sources."ansi-styles-4.3.0"
-      sources."arrify-1.0.1"
-      sources."base64-js-1.5.1"
-      sources."bl-5.1.0"
-      sources."buffer-6.0.3"
-      sources."camelcase-6.3.0"
-      sources."camelcase-keys-7.0.2"
-      sources."chalk-4.1.2"
-      sources."cli-cursor-4.0.0"
-      sources."cli-spinners-2.9.2"
-      sources."clone-1.0.4"
-      sources."color-convert-2.0.1"
-      sources."color-name-1.1.4"
-      sources."debug-3.1.0"
-      sources."decamelize-5.0.1"
-      (
-        sources."decamelize-keys-1.1.1"
-        // {
-          dependencies = [
-            sources."decamelize-1.2.0"
-            sources."map-obj-1.0.1"
-          ];
-        }
-      )
-      sources."defaults-1.0.4"
-      sources."draftlog-1.0.13"
-      sources."eastasianwidth-0.2.0"
-      sources."emoji-regex-9.2.2"
-      sources."error-ex-1.3.2"
-      sources."es6-promise-4.2.8"
-      sources."es6-promisify-5.0.0"
-      sources."escape-string-regexp-1.0.5"
-      sources."find-up-5.0.0"
-      sources."function-bind-1.1.2"
-      sources."hard-rejection-2.1.0"
-      sources."has-flag-4.0.0"
-      sources."hasown-2.0.2"
-      sources."hosted-git-info-4.1.0"
-      sources."http-proxy-agent-2.1.0"
-      sources."https-proxy-agent-3.0.1"
-      sources."ieee754-1.2.1"
-      sources."indent-string-5.0.0"
-      sources."inherits-2.0.4"
-      sources."is-arrayish-0.2.1"
-      sources."is-core-module-2.16.1"
-      sources."is-fullwidth-code-point-4.0.0"
-      sources."is-interactive-2.0.0"
-      sources."is-plain-obj-1.1.0"
-      sources."is-unicode-supported-1.3.0"
-      sources."js-tokens-4.0.0"
-      sources."json-parse-even-better-errors-2.3.1"
-      sources."kind-of-6.0.3"
-      sources."lines-and-columns-1.2.4"
-      sources."locate-path-6.0.0"
-      (
-        sources."log-symbols-5.1.0"
-        // {
-          dependencies = [
-            sources."chalk-5.4.1"
-          ];
-        }
-      )
-      sources."log-update-5.0.1"
-      sources."lru-cache-6.0.0"
-      sources."map-obj-4.3.0"
-      sources."meow-10.1.5"
-      sources."mimic-fn-2.1.0"
-      sources."min-indent-1.0.1"
-      sources."minimist-options-4.1.0"
-      sources."ms-2.0.0"
-      sources."normalize-package-data-3.0.3"
-      sources."onetime-5.1.2"
-      (
-        sources."ora-6.3.1"
-        // {
-          dependencies = [
-            sources."chalk-5.4.1"
-          ];
-        }
-      )
-      sources."p-limit-3.1.0"
-      sources."p-locate-5.0.0"
-      sources."parse-json-5.2.0"
-      sources."path-exists-4.0.0"
-      sources."picocolors-1.1.1"
-      sources."quick-lru-5.1.1"
-      sources."read-pkg-6.0.0"
-      sources."read-pkg-up-8.0.0"
-      sources."readable-stream-3.6.2"
-      sources."redent-4.0.0"
-      sources."restore-cursor-4.0.0"
-      sources."round-to-6.0.0"
-      sources."safe-buffer-5.2.1"
-      sources."sax-1.4.1"
-      sources."semver-7.7.1"
-      sources."signal-exit-3.0.7"
-      (
-        sources."slice-ansi-5.0.0"
-        // {
-          dependencies = [
-            sources."ansi-styles-6.2.1"
-          ];
-        }
-      )
-      sources."spdx-correct-3.2.0"
-      sources."spdx-exceptions-2.5.0"
-      sources."spdx-expression-parse-3.0.1"
-      sources."spdx-license-ids-3.0.21"
-      (
-        sources."speedtest-net-1.6.2"
-        // {
-          dependencies = [
-            sources."ansi-styles-3.2.1"
-            sources."chalk-2.4.2"
-            sources."color-convert-1.9.3"
-            sources."color-name-1.1.3"
-            sources."has-flag-3.0.0"
-            sources."supports-color-5.5.0"
-          ];
-        }
-      )
-      sources."stdin-discarder-0.1.0"
-      sources."string-width-5.1.2"
-      sources."string_decoder-1.3.0"
-      sources."strip-ansi-7.1.0"
-      sources."strip-indent-4.0.0"
-      sources."supports-color-7.2.0"
-      sources."trim-newlines-4.1.1"
-      sources."type-fest-1.4.0"
-      sources."util-deprecate-1.0.2"
-      sources."validate-npm-package-license-3.0.4"
-      sources."wcwidth-1.0.1"
-      (
-        sources."wrap-ansi-8.1.0"
-        // {
-          dependencies = [
-            sources."ansi-styles-6.2.1"
-          ];
-        }
-      )
-      sources."xml2js-0.4.23"
-      sources."xmlbuilder-11.0.1"
-      sources."yallist-4.0.0"
-      sources."yargs-parser-20.2.9"
-      sources."yocto-queue-0.1.0"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Test your internet connection speed and ping using speedtest.net from the CLI";
-      homepage = "https://github.com/sindresorhus/speed-test#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   svelte-check = nodeEnv.buildNodePackage {
     name = "svelte-check";
     packageName = "svelte-check";

From eba630a08f3480533c4f4eba545eea017d70797a Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Fri, 7 Nov 2025 22:53:18 -0500
Subject: [PATCH 6214/6226] nodePackages.tern: drop

Upstream is unmaintained and it isn't clear if it will work with new
ECMAScript versions(open issues upstream suggest it doesn't even support
current ECMAScript), so drop it
---
 pkgs/development/node-packages/aliases.nix    |   1 +
 .../node-packages/node-packages.json          |   1 -
 .../node-packages/node-packages.nix           | 112 ------------------
 3 files changed, 1 insertion(+), 113 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 2c2c1e2af7a7..4679a9e3b4ac 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -271,6 +271,7 @@ mapAliases {
   inherit (pkgs) tailwindcss; # added 2024-12-04
   teck-programmer = throw "teck-programmer was removed because it was broken and unmaintained"; # added 2024-08-23
   tedicross = throw "tedicross was removed because it was broken"; # added 2023-09-09
+  tern = throw "'tern' was removed because it has been unmaintained upstream for several years"; # Added 2025-11-07
   inherit (pkgs) terser; # Added 2023-08-31
   inherit (pkgs) textlint; # Added 2024-05-13
   textlint-plugin-latex = throw "textlint-plugin-latex was removed because it is unmaintained for years. Please use textlint-plugin-latex2e instead."; # Added 2024-05-17
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 0c23f5dc94de..498da824ee90 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -79,7 +79,6 @@
 , "sloc"
 , "smartdc"
 , "svelte-check"
-, "tern"
 , "tiddlywiki"
 , "tsun"
 , "ts-node"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 292adde37c5e..fc39b02ff2f9 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -4125,15 +4125,6 @@ let
         sha512 = "PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==";
       };
     };
-    "acorn-6.4.2" = {
-      name = "acorn";
-      packageName = "acorn";
-      version = "6.4.2";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn/-/acorn-6.4.2.tgz";
-        sha512 = "XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==";
-      };
-    };
     "acorn-7.4.1" = {
       name = "acorn";
       packageName = "acorn";
@@ -4170,15 +4161,6 @@ let
         sha512 = "rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==";
       };
     };
-    "acorn-loose-6.1.0" = {
-      name = "acorn-loose";
-      packageName = "acorn-loose";
-      version = "6.1.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-loose/-/acorn-loose-6.1.0.tgz";
-        sha512 = "FHhXoiF0Uch3IqsrnPpWwCtiv5PYvipTpT1k9lDMgQVVYc9iDuSl5zdJV358aI8twfHCYMFBRVYvAVki9wC/ng==";
-      };
-    };
     "acorn-node-1.8.2" = {
       name = "acorn-node";
       packageName = "acorn-node";
@@ -4188,15 +4170,6 @@ let
         sha512 = "8mt+fslDufLYntIoPAaIMUe/lrbrehIiwmR3t2k9LljIzoigEPF27eLk2hy8zSGzmR/ogr7zbRKINMo1u0yh5A==";
       };
     };
-    "acorn-walk-6.2.0" = {
-      name = "acorn-walk";
-      packageName = "acorn-walk";
-      version = "6.2.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz";
-        sha512 = "7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==";
-      };
-    };
     "acorn-walk-7.2.0" = {
       name = "acorn-walk";
       packageName = "acorn-walk";
@@ -10219,15 +10192,6 @@ let
         sha512 = "HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==";
       };
     };
-    "enhanced-resolve-2.3.0" = {
-      name = "enhanced-resolve";
-      packageName = "enhanced-resolve";
-      version = "2.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-2.3.0.tgz";
-        sha512 = "n6e4bsCpzsP0OB76X+vEWhySUQI8GHPVFVK+3QkX35tbryy2WoeGeK5kQ+oxzgDVHjIZyz5fyS60Mi3EpQLc0Q==";
-      };
-    };
     "entities-1.1.2" = {
       name = "entities";
       packageName = "entities";
@@ -18004,15 +17968,6 @@ let
         sha512 = "F2t4YIv9XQUBHt6AOJ0y7lSmP1+cY7Fm1DRh9GClTGzKST7UWLMx6ly9WZdLH/G/ppM5RL4MlQfRT71ri9t19A==";
       };
     };
-    "memory-fs-0.3.0" = {
-      name = "memory-fs";
-      packageName = "memory-fs";
-      version = "0.3.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.3.0.tgz";
-        sha512 = "QTNXnl79X97kZ9jJk/meJrtDuvgvRakX5LU7HZW1L7MsXHuSTwoMIzN9tOLLH3Xfsj/gbsSqX/ovnsqz246zKQ==";
-      };
-    };
     "meow-11.0.0" = {
       name = "meow";
       packageName = "meow";
@@ -23846,15 +23801,6 @@ let
         sha512 = "R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==";
       };
     };
-    "resolve-from-2.0.0" = {
-      name = "resolve-from";
-      packageName = "resolve-from";
-      version = "2.0.0";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz";
-        sha512 = "qpFcKaXsq8+oRoLilkwyc7zHGF5i9Q2/25NIgLQQ/+VVv9rU4qvr6nXVAw1DsnXJyQkZsR4Ytfbtg5ehfcUssQ==";
-      };
-    };
     "resolve-from-4.0.0" = {
       name = "resolve-from";
       packageName = "resolve-from";
@@ -26483,15 +26429,6 @@ let
         sha512 = "92YT2dpt671tFiHH/e1ok9D987N9fHD5VWoly1CdPD/Cd1HMglvZwP3nx2yTj2lbXDAHt8QssZkxTLCCTNL+xw==";
       };
     };
-    "tapable-0.2.9" = {
-      name = "tapable";
-      packageName = "tapable";
-      version = "0.2.9";
-      src = fetchurl {
-        url = "https://registry.npmjs.org/tapable/-/tapable-0.2.9.tgz";
-        sha512 = "2wsvQ+4GwBvLPLWsNfLCDYGsW6xb7aeC6utq2Qh0PFwgEy7K7dsma9Jsmb2zSQj7GvYAyUGSntLtsv++GmgL1A==";
-      };
-    };
     "tapable-2.2.1" = {
       name = "tapable";
       packageName = "tapable";
@@ -41237,55 +41174,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  tern = nodeEnv.buildNodePackage {
-    name = "tern";
-    packageName = "tern";
-    version = "0.24.3";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/tern/-/tern-0.24.3.tgz";
-      sha512 = "Z8uvtdWIlFn1GWy0HW5FhZ8VDryZwoJUdnjZU25C7/PBOltLIn1uv+WF3rVq6S1761YbsmbZYRP/l0ZJBCkvrw==";
-    };
-    dependencies = [
-      sources."acorn-6.4.2"
-      sources."acorn-loose-6.1.0"
-      sources."acorn-walk-6.2.0"
-      sources."balanced-match-1.0.2"
-      sources."brace-expansion-1.1.11"
-      sources."concat-map-0.0.1"
-      sources."core-util-is-1.0.3"
-      sources."enhanced-resolve-2.3.0"
-      sources."errno-0.1.8"
-      sources."fs.realpath-1.0.0"
-      sources."glob-7.2.3"
-      sources."graceful-fs-4.2.11"
-      sources."inflight-1.0.6"
-      sources."inherits-2.0.4"
-      sources."isarray-1.0.0"
-      sources."memory-fs-0.3.0"
-      sources."minimatch-3.1.2"
-      sources."object-assign-4.1.1"
-      sources."once-1.4.0"
-      sources."path-is-absolute-1.0.1"
-      sources."process-nextick-args-2.0.1"
-      sources."prr-1.0.1"
-      sources."readable-stream-2.3.8"
-      sources."resolve-from-2.0.0"
-      sources."safe-buffer-5.1.2"
-      sources."string_decoder-1.1.1"
-      sources."tapable-0.2.9"
-      sources."util-deprecate-1.0.2"
-      sources."wrappy-1.0.2"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "A JavaScript code analyzer for deep, cross-editor language support";
-      homepage = "https://github.com/ternjs/tern#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   tiddlywiki = nodeEnv.buildNodePackage {
     name = "tiddlywiki";
     packageName = "tiddlywiki";

From 03a735459abb33b1d93c8757762bcd23621d196e Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Fri, 7 Nov 2025 23:00:31 -0500
Subject: [PATCH 6215/6226] nodePackages.ts-node: drop

Unmaintained per https://github.com/TypeStrong/ts-node/issues/2140, and
as mentioned in the issue, NodeJS now has experimental type stripping
support, so this shouldn't be needed in the future.
---
 pkgs/development/node-packages/aliases.nix    |  1 +
 .../node-packages/node-packages.json          |  1 -
 .../node-packages/node-packages.nix           | 45 -------------------
 pkgs/development/node-packages/overrides.nix  |  8 ----
 4 files changed, 1 insertion(+), 54 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 4679a9e3b4ac..8002736da157 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -329,6 +329,7 @@ mapAliases {
   thelounge-theme-zenburn-sourcecodepro = throw "thelounge-theme-zenburn-sourcecodepro has been removed because thelounge was moved out of nodePackages"; # added 2025-03-12
   three = throw "three was removed because it was no longer needed"; # Added 2023-09-08
   triton = pkgs.triton; # Added 2023-05-06
+  ts-node = throw "'ts-node' was removed because it is unmaintained, and since NodeJS 22.6.0+, experimental TypeScript support is built-in to NodeJS."; # Added 2025-11-07
   typescript = pkgs.typescript; # Added 2023-06-21
   inherit (pkgs) typescript-language-server; # added 2024-02-27
   inherit (pkgs) uglify-js; # added 2024-06-15
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 498da824ee90..6803fe32bf9b 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -81,7 +81,6 @@
 , "svelte-check"
 , "tiddlywiki"
 , "tsun"
-, "ts-node"
 , "ttf2eot"
 , "vega-cli"
 , "vercel"
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index fc39b02ff2f9..27f3fb47e91c 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -41242,51 +41242,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  ts-node = nodeEnv.buildNodePackage {
-    name = "ts-node";
-    packageName = "ts-node";
-    version = "10.9.2";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/ts-node/-/ts-node-10.9.2.tgz";
-      sha512 = "f0FFpIdcHgn8zcPSbf1dRevwt047YMnaiJM3u2w2RewrB+fob/zePZcrOyQoLMMO7aBIddLcQIEK5dYjkLnGrQ==";
-    };
-    dependencies = [
-      sources."@cspotcode/source-map-support-0.8.1"
-      sources."@jridgewell/resolve-uri-3.1.2"
-      sources."@jridgewell/sourcemap-codec-1.5.0"
-      sources."@jridgewell/trace-mapping-0.3.9"
-      sources."@swc/core-1.11.9"
-      sources."@swc/counter-0.1.3"
-      sources."@swc/helpers-0.5.15"
-      sources."@swc/types-0.1.19"
-      sources."@swc/wasm-1.11.9"
-      sources."@tsconfig/node10-1.0.11"
-      sources."@tsconfig/node12-1.0.11"
-      sources."@tsconfig/node14-1.0.3"
-      sources."@tsconfig/node16-1.0.4"
-      sources."@types/node-22.13.10"
-      sources."acorn-8.14.1"
-      sources."acorn-walk-8.3.4"
-      sources."arg-4.1.3"
-      sources."create-require-1.1.1"
-      sources."diff-4.0.2"
-      sources."make-error-1.3.6"
-      sources."tslib-2.8.1"
-      sources."typescript-5.8.2"
-      sources."undici-types-6.20.0"
-      sources."v8-compile-cache-lib-3.0.1"
-      sources."yn-3.1.1"
-    ];
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "TypeScript execution environment and REPL for node.js, with source map support";
-      homepage = "https://typestrong.org/ts-node";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   ttf2eot = nodeEnv.buildNodePackage {
     name = "ttf2eot";
     packageName = "ttf2eot";
diff --git a/pkgs/development/node-packages/overrides.nix b/pkgs/development/node-packages/overrides.nix
index 501cf9c62b88..2e68dbedfa34 100644
--- a/pkgs/development/node-packages/overrides.nix
+++ b/pkgs/development/node-packages/overrides.nix
@@ -115,14 +115,6 @@ final: prev: {
     name = "rush";
   };
 
-  ts-node = prev.ts-node.override {
-    nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
-    postInstall = ''
-      wrapProgram "$out/bin/ts-node" \
-      --prefix NODE_PATH : ${pkgs.typescript}/lib/node_modules
-    '';
-  };
-
   tsun = prev.tsun.override {
     nativeBuildInputs = [ pkgs.buildPackages.makeWrapper ];
     postInstall = ''

From 337b74b10f37f1d557f6296a7bb6d56bc59e5ce9 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Fri, 7 Nov 2025 23:04:41 -0500
Subject: [PATCH 6216/6226] nodePackages.wring: drop

Unmaintained in the last 9 years, and also relies on PhantomJS, which
has ceased development and is archived.
---
 pkgs/development/node-packages/aliases.nix     |  1 +
 .../node-packages/node-packages.json           |  1 -
 .../node-packages/node-packages.nix            | 18 ------------------
 pkgs/top-level/aliases.nix                     |  1 +
 pkgs/top-level/all-packages.nix                |  2 --
 5 files changed, 2 insertions(+), 21 deletions(-)

diff --git a/pkgs/development/node-packages/aliases.nix b/pkgs/development/node-packages/aliases.nix
index 8002736da157..ece40c1c57ba 100644
--- a/pkgs/development/node-packages/aliases.nix
+++ b/pkgs/development/node-packages/aliases.nix
@@ -354,6 +354,7 @@ mapAliases {
   webpack-dev-server = throw "webpack-dev-server has been removed. You should install it in your JS project instead."; # added 2024-12-05
   webtorrent-cli = throw "webtorrent-cli has been removed because it was broken"; # added 2025-03-12
   inherit (pkgs) wrangler; # added 2024-07-01
+  wring = throw "'wring' has been removed since it has been abandoned upstream"; # Added 2025-11-07
   inherit (pkgs) write-good; # added 2023-08-20
   inherit (pkgs) yalc; # added 2024-06-29
   inherit (pkgs) yaml-language-server; # added 2023-09-05
diff --git a/pkgs/development/node-packages/node-packages.json b/pkgs/development/node-packages/node-packages.json
index 6803fe32bf9b..5ca242ab9d0b 100644
--- a/pkgs/development/node-packages/node-packages.json
+++ b/pkgs/development/node-packages/node-packages.json
@@ -85,6 +85,5 @@
 , "vega-cli"
 , "vercel"
 , "wavedrom-cli"
-, "wring"
 , "@yaegassy/coc-nginx"
 ]
diff --git a/pkgs/development/node-packages/node-packages.nix b/pkgs/development/node-packages/node-packages.nix
index 27f3fb47e91c..35904c330ad4 100644
--- a/pkgs/development/node-packages/node-packages.nix
+++ b/pkgs/development/node-packages/node-packages.nix
@@ -41985,24 +41985,6 @@ in
     bypassCache = true;
     reconstructLock = true;
   };
-  wring = nodeEnv.buildNodePackage {
-    name = "wring";
-    packageName = "wring";
-    version = "1.0.0";
-    src = fetchurl {
-      url = "https://registry.npmjs.org/wring/-/wring-1.0.0.tgz";
-      sha512 = "XoFoUf9gxnQkergF+FK+AuaI/iaSh9P0N1hqIGTTs1V3rjexH1ZZKuxuDUbdVGrwxvoTW4xpeZrNhBw6WJIIag==";
-    };
-    buildInputs = globalBuildInputs;
-    meta = {
-      description = "Extract content from websites using CSS Selectors and XPath";
-      homepage = "https://github.com/osener/wring#readme";
-      license = "MIT";
-    };
-    production = true;
-    bypassCache = true;
-    reconstructLock = true;
-  };
   "@yaegassy/coc-nginx" = nodeEnv.buildNodePackage {
     name = "_at_yaegassy_slash_coc-nginx";
     packageName = "@yaegassy/coc-nginx";
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 42547aae966c..7b648852e189 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1615,6 +1615,7 @@ mapAliases {
   wpa_supplicant_ro_ssids = throw "'wpa_supplicant_ro_ssids' has been renamed to/replaced by 'wpa_supplicant'"; # Converted to throw 2025-10-27
   wrapGAppsHook = throw "'wrapGAppsHook' has been renamed to/replaced by 'wrapGAppsHook3'"; # Converted to throw 2025-10-27
   wrapGradle = throw "'wrapGradle' has been removed; use `gradle-packages.wrapGradle` or `(gradle-packages.mkGradle { ... }).wrapped` instead"; # Added 2025-11-02
+  wring = throw "'wring' has been removed since it has been abandoned upstream"; # Added 2025-11-07
   write_stylus = throw "'write_stylus' has been renamed to/replaced by 'styluslabs-write-bin'"; # Converted to throw 2025-10-27
   wxGTK33 = wxwidgets_3_3; # Added 2025-07-20
   xbrightness = throw "'xbrightness' has been removed as it is unmaintained"; # Added 2025-08-28
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 8a0e82da8a9b..15d09eb83e9d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4227,8 +4227,6 @@ with pkgs;
     wlroots = wlroots_0_19;
   };
 
-  wring = nodePackages.wring;
-
   wyrd = callPackage ../tools/misc/wyrd {
     ocamlPackages = ocaml-ng.ocamlPackages_4_14;
   };

From c2d1ffcc3d2412a279e8050b4108d783581422f0 Mon Sep 17 00:00:00 2001
From: dish <pyrox@pyrox.dev>
Date: Fri, 7 Nov 2025 23:26:09 -0500
Subject: [PATCH 6217/6226] go-away: fix updateScript

---
 pkgs/by-name/go/go-away/package.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/by-name/go/go-away/package.nix b/pkgs/by-name/go/go-away/package.nix
index 612fe330b962..55b31be7e04b 100644
--- a/pkgs/by-name/go/go-away/package.nix
+++ b/pkgs/by-name/go/go-away/package.nix
@@ -61,7 +61,10 @@ buildGoModule (finalAttrs: {
   passthru.updateScript = nix-update-script {
     # the main repository does not have the releases feed enabled, so use the
     # codeberg mirror
-    url = "https://codeberg.org/gone/go-away";
+    extraArgs = [
+      "--url"
+      "https://codeberg.org/gone/go-away"
+    ];
   };
 
   meta = {

From 9953e93da15547d9e89fe1d04c114866051bae39 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 04:31:20 +0000
Subject: [PATCH 6218/6226] hydrus: 644 -> 646

---
 pkgs/by-name/hy/hydrus/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/hy/hydrus/package.nix b/pkgs/by-name/hy/hydrus/package.nix
index 3d166acf5ba5..e7ba489e65e3 100644
--- a/pkgs/by-name/hy/hydrus/package.nix
+++ b/pkgs/by-name/hy/hydrus/package.nix
@@ -16,14 +16,14 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "hydrus";
-  version = "644";
+  version = "646";
   format = "other";
 
   src = fetchFromGitHub {
     owner = "hydrusnetwork";
     repo = "hydrus";
     tag = "v${version}";
-    hash = "sha256-dEYKei7wu0lOhA/10c1sTOo0HH0HturrW8dje89skis=";
+    hash = "sha256-0vnX39OcONN2j7Xyae/Hb1QhH4o5WlJ6serYIPrjBUk=";
   };
 
   nativeBuildInputs = [

From 08f76cbad628fe6fbfca4d4e2efe15f108670750 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 04:36:08 +0000
Subject: [PATCH 6219/6226] terraform-providers.scaleway_scaleway: 2.61.0 ->
 2.62.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 6b094731b9e2..ff684a272e72 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1174,13 +1174,13 @@
     "vendorHash": "sha256-OqbnkuEy9w6F1DxmlYhRNYhBaYhWV0FtMK4wdwSybh8="
   },
   "scaleway_scaleway": {
-    "hash": "sha256-E0nhKVAJavR7ZEz65p4fE2Iwtchmzs9Fu/UqrVFmnIA=",
+    "hash": "sha256-dZWoqco5C/QMBek+m+kLe1cl86NLe9EHMh6XV+TOFf4=",
     "homepage": "https://registry.terraform.io/providers/scaleway/scaleway",
     "owner": "scaleway",
     "repo": "terraform-provider-scaleway",
-    "rev": "v2.61.0",
+    "rev": "v2.62.0",
     "spdx": "MPL-2.0",
-    "vendorHash": "sha256-QzFIhUMJqslwir+fa50vMZvROJfp4j2SCUKjlXLTs8s="
+    "vendorHash": "sha256-SUGyDQ23ZgRbf2yGm+ih3nwMp90ckadG6Zeu6Am/fU8="
   },
   "scottwinkler_shell": {
     "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=",

From 56b5c8169e525bed665a22c5d52051246c46db6d Mon Sep 17 00:00:00 2001
From: Bazinga9000 <bazonkidonk@gmail.com>
Date: Fri, 7 Nov 2025 23:42:32 -0500
Subject: [PATCH 6220/6226] archipelago: 0.6.3 -> 0.6.4

---
 pkgs/by-name/ar/archipelago/package.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ar/archipelago/package.nix b/pkgs/by-name/ar/archipelago/package.nix
index 60e8c67760ab..01a345330bb9 100644
--- a/pkgs/by-name/ar/archipelago/package.nix
+++ b/pkgs/by-name/ar/archipelago/package.nix
@@ -17,10 +17,10 @@
 }:
 stdenvNoCC.mkDerivation (finalAttrs: {
   pname = "archipelago";
-  version = "0.6.3";
+  version = "0.6.4";
   src = fetchurl {
     url = "https://github.com/ArchipelagoMW/Archipelago/releases/download/${finalAttrs.version}/Archipelago_${finalAttrs.version}_linux-x86_64.AppImage";
-    hash = "sha256-PetlGYsdhyvThIFqy+7wbPLAXDcgN2Kcl2WF3rta8PA=";
+    hash = "sha256-7yzRYLmrOuiubXOu/ljuBsWvphdJ+07v0LJD0Ae8BTQ=";
   };
 
   dontUnpack = true;

From eee1a5507862367aad10bb6c61eb7a728149bffa Mon Sep 17 00:00:00 2001
From: Rafael Ieda <git@ieda.me>
Date: Sun, 2 Nov 2025 09:06:15 -0300
Subject: [PATCH 6221/6226] backrest: fix build on darwin

---
 pkgs/by-name/ba/backrest/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix
index 2ab3f13341b0..2a4f0b1a5f8b 100644
--- a/pkgs/by-name/ba/backrest/package.nix
+++ b/pkgs/by-name/ba/backrest/package.nix
@@ -93,6 +93,7 @@ buildGoModule {
       ++ lib.optionals stdenv.hostPlatform.isDarwin [
         "TestBackup" # relies on ionice
         "TestCancelBackup"
+        "TestFirstRun" # e2e test requires networking
       ];
     in
     [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ];

From 6b41514c760862a1fefd4d00683cb011f6b656d2 Mon Sep 17 00:00:00 2001
From: jaysa68 <jaysagarcia@berkeley.edu>
Date: Fri, 7 Nov 2025 21:42:14 -0800
Subject: [PATCH 6222/6226] python3Packages.mkdocs-material: 9.6.22 -> 9.6.23

Diff: https://github.com/squidfunk/mkdocs-material/compare/refs/tags/9.6.22...refs/tags/9.6.23

Changelog: https://github.com/squidfunk/mkdocs-material/blob/9.6.23/CHANGELOG
---
 pkgs/development/python-modules/mkdocs-material/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix
index 490a355a78ec..e94f596e43d4 100644
--- a/pkgs/development/python-modules/mkdocs-material/default.nix
+++ b/pkgs/development/python-modules/mkdocs-material/default.nix
@@ -28,14 +28,14 @@
 
 buildPythonPackage rec {
   pname = "mkdocs-material";
-  version = "9.6.22";
+  version = "9.6.23";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "squidfunk";
     repo = "mkdocs-material";
     tag = version;
-    hash = "sha256-64+9cIxMA0Kloe0XEycWxjz+ghkcWYc6DZ+LuJN/5Tc=";
+    hash = "sha256-k9xoysCbmWqdu1hNUTbWbTvPCuo8gcyvXEDecHiOpEw=";
   };
 
   build-system = [

From 4202814f8599c1b37c0aeeaf8d07824641469e04 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 8 Nov 2025 05:42:38 +0000
Subject: [PATCH 6223/6226] python3Packages.bosch-alarm-mode2: 0.4.6 -> 0.4.7

---
 pkgs/development/python-modules/bosch-alarm-mode2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bosch-alarm-mode2/default.nix b/pkgs/development/python-modules/bosch-alarm-mode2/default.nix
index bbbf81d71d18..f5e833f1f844 100644
--- a/pkgs/development/python-modules/bosch-alarm-mode2/default.nix
+++ b/pkgs/development/python-modules/bosch-alarm-mode2/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "bosch-alarm-mode2";
-  version = "0.4.6";
+  version = "0.4.7";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mag1024";
     repo = "bosch-alarm-mode2";
     tag = "v${version}";
-    hash = "sha256-oTGkEguN4EFJI5+UhqxKBN1x2Ppf9wQ0AeYbiLi1fhk=";
+    hash = "sha256-3eb9Exhu3ME++m+JRCVNpiUVIE3QSb9NRmvi+wZf/QY=";
   };
 
   build-system = [

From c8ecc1228eae290d6b15562d69fea191c70fa727 Mon Sep 17 00:00:00 2001
From: jaysa68 <jaysagarcia@berkeley.edu>
Date: Fri, 7 Nov 2025 22:00:01 -0800
Subject: [PATCH 6224/6226] maintainers: add jaysa68

---
 maintainers/maintainer-list.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 97aad0f32f0e..535ef1d43934 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -11750,6 +11750,12 @@
     githubId = 29395089;
     name = "Jay Rovacsek";
   };
+  jaysa68 = {
+    email = "gh@jaysa.net";
+    github = "jaysa68";
+    githubId = 114126812;
+    name = "Jaysa Maria Garcia";
+  };
   jb55 = {
     email = "jb55@jb55.com";
     github = "jb55";

From 77b08002aa8fc43163bae985704dd06310015d8b Mon Sep 17 00:00:00 2001
From: jaysa68 <jaysagarcia@berkeley.edu>
Date: Fri, 7 Nov 2025 22:01:39 -0800
Subject: [PATCH 6225/6226] python3Packages.mkdocs-material: add jaysa68 to
 maintainers

---
 pkgs/development/python-modules/mkdocs-material/default.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/mkdocs-material/default.nix b/pkgs/development/python-modules/mkdocs-material/default.nix
index e94f596e43d4..47a5a2d005b5 100644
--- a/pkgs/development/python-modules/mkdocs-material/default.nix
+++ b/pkgs/development/python-modules/mkdocs-material/default.nix
@@ -89,6 +89,9 @@ buildPythonPackage rec {
     downloadPage = "https://github.com/squidfunk/mkdocs-material";
     homepage = "https://squidfunk.github.io/mkdocs-material/";
     license = licenses.mit;
-    maintainers = with maintainers; [ dandellion ];
+    maintainers = with maintainers; [
+      dandellion
+      jaysa68
+    ];
   };
 }

From e2d8a70246fb4fb955ebb333ebabd8d7900d0aa1 Mon Sep 17 00:00:00 2001
From: Shelvacu <git@shelvacu.com>
Date: Sun, 2 Nov 2025 09:39:23 -0800
Subject: [PATCH 6226/6226] copyparty: init at 1.19.20

This makes #422127 obselete
---
 .../co/copyparty-full-buggy/package.nix       |  17 ++
 pkgs/by-name/co/copyparty-min/package.nix     |  17 ++
 pkgs/by-name/co/copyparty-most/package.nix    |  17 ++
 pkgs/by-name/co/copyparty/package.nix         | 174 ++++++++++++++++++
 4 files changed, 225 insertions(+)
 create mode 100644 pkgs/by-name/co/copyparty-full-buggy/package.nix
 create mode 100644 pkgs/by-name/co/copyparty-min/package.nix
 create mode 100644 pkgs/by-name/co/copyparty-most/package.nix
 create mode 100644 pkgs/by-name/co/copyparty/package.nix

diff --git a/pkgs/by-name/co/copyparty-full-buggy/package.nix b/pkgs/by-name/co/copyparty-full-buggy/package.nix
new file mode 100644
index 000000000000..d717d141a832
--- /dev/null
+++ b/pkgs/by-name/co/copyparty-full-buggy/package.nix
@@ -0,0 +1,17 @@
+{ copyparty }:
+copyparty.override {
+  withHashedPasswords = true;
+  withCertgen = true;
+  withThumbnails = true;
+  withFastThumbnails = true;
+  withMediaProcessing = true;
+  withBasicAudioMetadata = true;
+  withZeroMQ = true;
+  withFTP = true;
+  withFTPS = true;
+  withTFTP = true;
+  withMagic = true;
+  withSMB = true;
+  nameSuffix = "-full-buggy";
+  longDescription = "Full variant, all dependencies and features including those marked buggy";
+}
diff --git a/pkgs/by-name/co/copyparty-min/package.nix b/pkgs/by-name/co/copyparty-min/package.nix
new file mode 100644
index 000000000000..b2bd2b42ce53
--- /dev/null
+++ b/pkgs/by-name/co/copyparty-min/package.nix
@@ -0,0 +1,17 @@
+{ copyparty }:
+copyparty.override {
+  withHashedPasswords = false;
+  withCertgen = false;
+  withThumbnails = false;
+  withFastThumbnails = false;
+  withMediaProcessing = false;
+  withBasicAudioMetadata = false;
+  withZeroMQ = false;
+  withFTP = false;
+  withFTPS = false;
+  withTFTP = false;
+  withSMB = false;
+  withMagic = false;
+  nameSuffix = "-min";
+  longDescription = "Minimal variant, minimal dependencies and fewest features";
+}
diff --git a/pkgs/by-name/co/copyparty-most/package.nix b/pkgs/by-name/co/copyparty-most/package.nix
new file mode 100644
index 000000000000..6e8fa8e8b205
--- /dev/null
+++ b/pkgs/by-name/co/copyparty-most/package.nix
@@ -0,0 +1,17 @@
+{ copyparty }:
+copyparty.override {
+  withHashedPasswords = true;
+  withCertgen = true;
+  withThumbnails = true;
+  withFastThumbnails = true;
+  withMediaProcessing = true;
+  withBasicAudioMetadata = true;
+  withZeroMQ = true;
+  withFTP = true;
+  withFTPS = true;
+  withTFTP = true;
+  withSMB = false;
+  withMagic = true;
+  nameSuffix = "-most";
+  longDescription = "Almost-full variant, all dependencies and features except those marked buggy";
+}
diff --git a/pkgs/by-name/co/copyparty/package.nix b/pkgs/by-name/co/copyparty/package.nix
new file mode 100644
index 000000000000..558b476480be
--- /dev/null
+++ b/pkgs/by-name/co/copyparty/package.nix
@@ -0,0 +1,174 @@
+# partially sourced from https://github.com/9001/copyparty/blob/hovudstraum/contrib/package/nix/copyparty/default.nix
+{
+  lib,
+
+  fetchurl,
+
+  python3Packages,
+
+  # non-python deps
+  cfssl,
+  ffmpeg,
+  util-linux,
+
+  # options
+  # use argon2id-hashed passwords in config files (sha2 is always available)
+  withHashedPasswords ? true,
+
+  # generate TLS certificates on startup (pointless when reverse-proxied)
+  withCertgen ? true,
+
+  # create thumbnails with Pillow; faster than FFmpeg / MediaProcessing
+  withThumbnails ? true,
+
+  # create thumbnails with PyVIPS; even faster, uses more memory
+  # -- can be combined with Pillow to support more filetypes
+  withFastThumbnails ? false,
+
+  # enable FFmpeg; thumbnails for most filetypes (also video and audio), extract audio metadata, transcode audio to opus
+  # -- possibly dangerous if you allow anonymous uploads, since FFmpeg has a huge attack surface
+  # -- can be combined with Thumbnails and/or FastThumbnails, since FFmpeg is slower than both
+  withMediaProcessing ? true,
+
+  # if MediaProcessing is not enabled, you probably want this instead (less accurate, but much safer and faster)
+  withBasicAudioMetadata ? false,
+
+  # send ZeroMQ messages from event-hooks
+  withZeroMQ ? true,
+
+  # enable FTP server
+  withFTP ? true,
+
+  # enable FTPS support in the FTP server
+  withFTPS ? false,
+
+  # enable TFTP server
+  withTFTP ? false,
+
+  # samba/cifs server; dangerous and buggy, enable if you really need it
+  withSMB ? false,
+
+  # enables filetype detection for nameless uploads
+  withMagic ? false,
+
+  # extra packages to add to the PATH
+  extraPackages ? [ ],
+
+  # function that accepts a python packageset and returns a list of packages to
+  # be added to the python venv. useful for scripts and such that require
+  # additional dependencies
+  extraPythonPackages ? (_p: [ ]),
+
+  nameSuffix ? "",
+
+  # this goes directly into meta.longDescription
+  longDescription ? "Default build",
+}:
+
+let
+  runtimeDeps = ([ util-linux ] ++ extraPackages ++ lib.optional withMediaProcessing ffmpeg);
+in
+
+python3Packages.buildPythonApplication rec {
+  pname = "copyparty${nameSuffix}";
+  version = "1.19.20";
+
+  src = fetchurl {
+    url = "https://github.com/9001/copyparty/releases/download/v${version}/copyparty-${version}.tar.gz";
+    hash = "sha256-BQzMNFVOWSEKynpn2HoYbmmz9NvgE9XuLxGiLCWagqY=";
+  };
+
+  pyproject = true;
+
+  build-system = [
+    python3Packages.setuptools
+  ];
+
+  dependencies =
+    with python3Packages;
+    [
+      jinja2
+      fusepy
+    ]
+    ++ lib.optional withSMB impacket
+    ++ lib.optional withFTP pyftpdlib
+    ++ lib.optional withFTPS pyopenssl
+    ++ lib.optional withTFTP partftpy
+    ++ lib.optional withCertgen cfssl
+    ++ (lib.optionals withThumbnails [
+      pillow
+      pillow-jpls
+      pillow-heif
+      rawpy
+    ])
+    ++ lib.optional withFastThumbnails pyvips
+    ++ lib.optional withMediaProcessing ffmpeg
+    ++ lib.optional withBasicAudioMetadata mutagen
+    ++ lib.optional withHashedPasswords argon2-cffi
+    ++ lib.optional withZeroMQ pyzmq
+    ++ lib.optional withMagic magic
+    ++ (extraPythonPackages python3Packages);
+
+  makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath runtimeDeps}" ];
+
+  meta = {
+    description = "turn almost any device into a file server over http(s), webdav, ftp(s), and tftp";
+    inherit longDescription;
+    homepage = "https://github.com/9001/copyparty";
+    license =
+      let
+        # list from https://github.com/9001/copyparty/blob/hovudstraum/scripts/deps-docker/Dockerfile
+        includedLibraryLicenses = with lib.licenses; {
+          # https://github.com/openpgpjs/asmcrypto.js
+          asmcrypto = mit;
+          # https://github.com/markedjs/marked
+          marked = [
+            # https://github.com/markedjs/marked/blob/master/LICENSE.md
+            mit
+            bsd3
+          ];
+          # https://github.com/Ionaru/easy-markdown-editor
+          easy-markdown-editor = lib.licenses.mit;
+          # https://github.com/codemirror/codemirror5
+          codemirror = lib.licenses.mit;
+          # https://github.com/cure53/DOMPurify
+          dompurify = [
+            asl20 # or
+            mpl20
+          ];
+          # https://github.com/FortAwesome/Font-Awesome
+          font-awesome = [
+            cc-by-40
+            ofl
+            mit
+          ];
+          # https://github.com/PrismJS/prism/blob/v2/LICENSE
+          prism = mit;
+          # https://files.pythonhosted.org/packages/04/0b/4506cb2e831cea4b0214d3625430e921faaa05a7fb520458c75a2dbd2152/fusepy-3.0.1.tar.gz
+          # https://pypi.org/project/fusepy
+          # https://github.com/fusepy/fusepy
+          fusepy = isc;
+        };
+        copypartyLicense = lib.licenses.mit;
+        res = lib.pipe includedLibraryLicenses [
+          builtins.attrValues
+          (a: a ++ [ copypartyLicense ])
+          lib.flatten
+          lib.unique
+        ];
+      in
+      res;
+    sourceProvenance = with lib.sourceTypes; [
+      fromSource
+      # the javascript deps come pre-built
+      # see https://github.com/9001/copyparty/blob/hovudstraum/scripts/deps-docker/Dockerfile
+      binaryBytecode
+      binaryNativeCode
+    ];
+    maintainers = with lib.maintainers; [
+      shelvacu
+    ];
+    mainProgram = "copyparty";
+    platforms = lib.platforms.all;
+  };
+}